// SPDX-License-Identifier: GPL-2.0-only
/*
 * FPGA Manager Driver for Altera Arria/Cyclone/Stratix CvP
 *
 * Copyright (C) 2017 DENX Software Engineering
 *
 * Anatolij Gustschin <agust@denx.de>
 *
 * Manage Altera FPGA firmware using PCIe CvP.
 * Firmware must be in binary "rbf" format.
 */

#include <linux/delay.h>
#include <linux/device.h>
#include <linux/fpga/fpga-mgr.h>
#include <linux/module.h>
#include <linux/pci.h>
#include <linux/sizes.h>

#define CVP_BAR		0	/* BAR used for data transfer in memory mode */
#define CVP_DUMMY_WR	244	/* dummy writes to clear CvP state machine */
#define TIMEOUT_US	2000	/* CVP STATUS timeout for USERMODE polling */

/* Vendor Specific Extended Capability Registers */
#define VSE_PCIE_EXT_CAP_ID		0x0
#define VSE_PCIE_EXT_CAP_ID_VAL		0x000b	/* 16bit */

#define VSE_CVP_STATUS			0x1c	/* 32bit */
#define VSE_CVP_STATUS_CFG_RDY		BIT(18)	/* CVP_CONFIG_READY */
#define VSE_CVP_STATUS_CFG_ERR		BIT(19)	/* CVP_CONFIG_ERROR */
#define VSE_CVP_STATUS_CVP_EN		BIT(20)	/* ctrl block is enabling CVP */
#define VSE_CVP_STATUS_USERMODE		BIT(21)	/* USERMODE */
#define VSE_CVP_STATUS_CFG_DONE		BIT(23)	/* CVP_CONFIG_DONE */
#define VSE_CVP_STATUS_PLD_CLK_IN_USE	BIT(24)	/* PLD_CLK_IN_USE */

#define VSE_CVP_MODE_CTRL		0x20	/* 32bit */
#define VSE_CVP_MODE_CTRL_CVP_MODE	BIT(0)	/* CVP (1) or normal mode (0) */
#define VSE_CVP_MODE_CTRL_HIP_CLK_SEL	BIT(1) /* PMA (1) or fabric clock (0) */
#define VSE_CVP_MODE_CTRL_NUMCLKS_OFF	8	/* NUMCLKS bits offset */
#define VSE_CVP_MODE_CTRL_NUMCLKS_MASK	GENMASK(15, 8)

#define VSE_CVP_DATA			0x28	/* 32bit */
#define VSE_CVP_PROG_CTRL		0x2c	/* 32bit */
#define VSE_CVP_PROG_CTRL_CONFIG	BIT(0)
#define VSE_CVP_PROG_CTRL_START_XFER	BIT(1)
#define VSE_CVP_PROG_CTRL_MASK		GENMASK(1, 0)

#define VSE_UNCOR_ERR_STATUS		0x34	/* 32bit */
#define VSE_UNCOR_ERR_CVP_CFG_ERR	BIT(5)	/* CVP_CONFIG_ERROR_LATCHED */

#define V1_VSEC_OFFSET			0x200	/* Vendor Specific Offset V1 */
/* V2 Defines */
#define VSE_CVP_TX_CREDITS		0x49	/* 8bit */

#define V2_CREDIT_TIMEOUT_US		20000
#define V2_CHECK_CREDIT_US		10
#define V2_POLL_TIMEOUT_US		1000000
#define V2_USER_TIMEOUT_US		500000

#define V1_POLL_TIMEOUT_US		10

#define DRV_NAME		"altera-cvp"
#define ALTERA_CVP_MGR_NAME	"Altera CvP FPGA Manager"

/* Write block sizes */
#define ALTERA_CVP_V1_SIZE	4
#define ALTERA_CVP_V2_SIZE	4096

/* Optional CvP config error status check for debugging */
static bool altera_cvp_chkcfg;

struct cvp_priv;

struct altera_cvp_conf {
	struct fpga_manager	*mgr;
	struct pci_dev		*pci_dev;
	void __iomem		*map;
	void			(*write_data)(struct altera_cvp_conf *conf,
					      u32 data);
	char			mgr_name[64];
	u8			numclks;
	u32			sent_packets;
	u32			vsec_offset;
	const struct cvp_priv	*priv;
};

struct cvp_priv {
	void	(*switch_clk)(struct altera_cvp_conf *conf);
	int	(*clear_state)(struct altera_cvp_conf *conf);
	int	(*wait_credit)(struct fpga_manager *mgr, u32 blocks);
	size_t	block_size;
	int	poll_time_us;
	int	user_time_us;
};

static int altera_read_config_byte(struct altera_cvp_conf *conf,
				   int where, u8 *val)
{
	return pci_read_config_byte(conf->pci_dev, conf->vsec_offset + where,
				    val);
}

static int altera_read_config_dword(struct altera_cvp_conf *conf,
				    int where, u32 *val)
{
	return pci_read_config_dword(conf->pci_dev, conf->vsec_offset + where,
				     val);
}

static int altera_write_config_dword(struct altera_cvp_conf *conf,
				     int where, u32 val)
{
	return pci_write_config_dword(conf->pci_dev, conf->vsec_offset + where,
				      val);
}

static enum fpga_mgr_states altera_cvp_state(struct fpga_manager *mgr)
{
	struct altera_cvp_conf *conf = mgr->priv;
	u32 status;

	altera_read_config_dword(conf, VSE_CVP_STATUS, &status);

	if (status & VSE_CVP_STATUS_CFG_DONE)
		return FPGA_MGR_STATE_OPERATING;

	if (status & VSE_CVP_STATUS_CVP_EN)
		return FPGA_MGR_STATE_POWER_UP;

	return FPGA_MGR_STATE_UNKNOWN;
}

static void altera_cvp_write_data_iomem(struct altera_cvp_conf *conf, u32 val)
{
	writel(val, conf->map);
}

static void altera_cvp_write_data_config(struct altera_cvp_conf *conf, u32 val)
{
	pci_write_config_dword(conf->pci_dev, conf->vsec_offset + VSE_CVP_DATA,
			       val);
}

/* switches between CvP clock and internal clock */
static void altera_cvp_dummy_write(struct altera_cvp_conf *conf)
{
	unsigned int i;
	u32 val;

	/* set 1 CVP clock cycle for every CVP Data Register Write */
	altera_read_config_dword(conf, VSE_CVP_MODE_CTRL, &val);
	val &= ~VSE_CVP_MODE_CTRL_NUMCLKS_MASK;
	val |= 1 << VSE_CVP_MODE_CTRL_NUMCLKS_OFF;
	altera_write_config_dword(conf, VSE_CVP_MODE_CTRL, val);

	for (i = 0; i < CVP_DUMMY_WR; i++)
		conf->write_data(conf, 0); /* dummy data, could be any value */
}

static int altera_cvp_wait_status(struct altera_cvp_conf *conf, u32 status_mask,
				  u32 status_val, int timeout_us)
{
	unsigned int retries;
	u32 val;

	retries = timeout_us / 10;
	if (timeout_us % 10)
		retries++;

	do {
		altera_read_config_dword(conf, VSE_CVP_STATUS, &val);
		if ((val & status_mask) == status_val)
			return 0;

		/* use small usleep value to re-check and break early */
		usleep_range(10, 11);
	} while (--retries);

	return -ETIMEDOUT;
}

static int altera_cvp_chk_error(struct fpga_manager *mgr, size_t bytes)
{
	struct altera_cvp_conf *conf = mgr->priv;
	u32 val;
	int ret;

	/* STEP 10 (optional) - check CVP_CONFIG_ERROR flag */
	ret = altera_read_config_dword(conf, VSE_CVP_STATUS, &val);
	if (ret || (val & VSE_CVP_STATUS_CFG_ERR)) {
		dev_err(&mgr->dev, "CVP_CONFIG_ERROR after %zu bytes!\n",
			bytes);
		return -EPROTO;
	}
	return 0;
}

/*
 * CvP Version2 Functions
 * Recent Intel FPGAs use a credit mechanism to throttle incoming
 * bitstreams and a different method of clearing the state.
 */

static int altera_cvp_v2_clear_state(struct altera_cvp_conf *conf)
{
	u32 val;
	int ret;

	/* Clear the START_XFER and CVP_CONFIG bits */
	ret = altera_read_config_dword(conf, VSE_CVP_PROG_CTRL, &val);
	if (ret) {
		dev_err(&conf->pci_dev->dev,
			"Error reading CVP Program Control Register\n");
		return ret;
	}

	val &= ~VSE_CVP_PROG_CTRL_MASK;
	ret = altera_write_config_dword(conf, VSE_CVP_PROG_CTRL, val);
	if (ret) {
		dev_err(&conf->pci_dev->dev,
			"Error writing CVP Program Control Register\n");
		return ret;
	}

	return altera_cvp_wait_status(conf, VSE_CVP_STATUS_CFG_RDY, 0,
				      conf->priv->poll_time_us);
}

static int altera_cvp_v2_wait_for_credit(struct fpga_manager *mgr,
					 u32 blocks)
{
	u32 timeout = V2_CREDIT_TIMEOUT_US / V2_CHECK_CREDIT_US;
	struct altera_cvp_conf *conf = mgr->priv;
	int ret;
	u8 val;

	do {
		ret = altera_read_config_byte(conf, VSE_CVP_TX_CREDITS, &val);
		if (ret) {
			dev_err(&conf->pci_dev->dev,
				"Error reading CVP Credit Register\n");
			return ret;
		}

		/* Return if there is space in FIFO */
		if (val - (u8)conf->sent_packets)
			return 0;

		ret = altera_cvp_chk_error(mgr, blocks * ALTERA_CVP_V2_SIZE);
		if (ret) {
			dev_err(&conf->pci_dev->dev,
				"CE Bit error credit reg[0x%x]:sent[0x%x]\n",
				val, conf->sent_packets);
			return -EAGAIN;
		}

		/* Limit the check credit byte traffic */
		usleep_range(V2_CHECK_CREDIT_US, V2_CHECK_CREDIT_US + 1);
	} while (timeout--);

	dev_err(&conf->pci_dev->dev, "Timeout waiting for credit\n");
	return -ETIMEDOUT;
}

static int altera_cvp_send_block(struct altera_cvp_conf *conf,
				 const u32 *data, size_t len)
{
	u32 mask, words = len / sizeof(u32);
	int i, remainder;

	for (i = 0; i < words; i++)
		conf->write_data(conf, *data++);

	/* write up to 3 trailing bytes, if any */
	remainder = len % sizeof(u32);
	if (remainder) {
		mask = BIT(remainder * 8) - 1;
		if (mask)
			conf->write_data(conf, *data & mask);
	}

	return 0;
}

static int altera_cvp_teardown(struct fpga_manager *mgr,
			       struct fpga_image_info *info)
{
	struct altera_cvp_conf *conf = mgr->priv;
	int ret;
	u32 val;

	/* STEP 12 - reset START_XFER bit */
	altera_read_config_dword(conf, VSE_CVP_PROG_CTRL, &val);
	val &= ~VSE_CVP_PROG_CTRL_START_XFER;
	altera_write_config_dword(conf, VSE_CVP_PROG_CTRL, val);

	/* STEP 13 - reset CVP_CONFIG bit */
	val &= ~VSE_CVP_PROG_CTRL_CONFIG;
	altera_write_config_dword(conf, VSE_CVP_PROG_CTRL, val);

	/*
	 * STEP 14
	 * - set CVP_NUMCLKS to 1 and then issue CVP_DUMMY_WR dummy
	 *   writes to the HIP
	 */
	if (conf->priv->switch_clk)
		conf->priv->switch_clk(conf);

	/* STEP 15 - poll CVP_CONFIG_READY bit for 0 with 10us timeout */
	ret = altera_cvp_wait_status(conf, VSE_CVP_STATUS_CFG_RDY, 0,
				     conf->priv->poll_time_us);
	if (ret)
		dev_err(&mgr->dev, "CFG_RDY == 0 timeout\n");

	return ret;
}

static int altera_cvp_write_init(struct fpga_manager *mgr,
				 struct fpga_image_info *info,
				 const char *buf, size_t count)
{
	struct altera_cvp_conf *conf = mgr->priv;
	u32 iflags, val;
	int ret;

	iflags = info ? info->flags : 0;

	if (iflags & FPGA_MGR_PARTIAL_RECONFIG) {
		dev_err(&mgr->dev, "Partial reconfiguration not supported.\n");
		return -EINVAL;
	}

	/* Determine allowed clock to data ratio */
	if (iflags & FPGA_MGR_COMPRESSED_BITSTREAM)
		conf->numclks = 8; /* ratio for all compressed images */
	else if (iflags & FPGA_MGR_ENCRYPTED_BITSTREAM)
		conf->numclks = 4; /* for uncompressed and encrypted images */
	else
		conf->numclks = 1; /* for uncompressed and unencrypted images */

	/* STEP 1 - read CVP status and check CVP_EN flag */
	altera_read_config_dword(conf, VSE_CVP_STATUS, &val);
	if (!(val & VSE_CVP_STATUS_CVP_EN)) {
		dev_err(&mgr->dev, "CVP mode off: 0x%04x\n", val);
		return -ENODEV;
	}

	if (val & VSE_CVP_STATUS_CFG_RDY) {
		dev_warn(&mgr->dev, "CvP already started, teardown first\n");
		ret = altera_cvp_teardown(mgr, info);
		if (ret)
			return ret;
	}

	/*
	 * STEP 2
	 * - set HIP_CLK_SEL and CVP_MODE (must be set in the order mentioned)
	 */
	/* switch from fabric to PMA clock */
	altera_read_config_dword(conf, VSE_CVP_MODE_CTRL, &val);
	val |= VSE_CVP_MODE_CTRL_HIP_CLK_SEL;
	altera_write_config_dword(conf, VSE_CVP_MODE_CTRL, val);

	/* set CVP mode */
	altera_read_config_dword(conf, VSE_CVP_MODE_CTRL, &val);
	val |= VSE_CVP_MODE_CTRL_CVP_MODE;
	altera_write_config_dword(conf, VSE_CVP_MODE_CTRL, val);

	/*
	 * STEP 3
	 * - set CVP_NUMCLKS to 1 and issue CVP_DUMMY_WR dummy writes to the HIP
	 */
	if (conf->priv->switch_clk)
		conf->priv->switch_clk(conf);

	if (conf->priv->clear_state) {
		ret = conf->priv->clear_state(conf);
		if (ret) {
			dev_err(&mgr->dev, "Problem clearing out state\n");
			return ret;
		}
	}

	conf->sent_packets = 0;

	/* STEP 4 - set CVP_CONFIG bit */
	altera_read_config_dword(conf, VSE_CVP_PROG_CTRL, &val);
	/* request control block to begin transfer using CVP */
	val |= VSE_CVP_PROG_CTRL_CONFIG;
	altera_write_config_dword(conf, VSE_CVP_PROG_CTRL, val);

	/* STEP 5 - poll CVP_CONFIG READY for 1 with timeout */
	ret = altera_cvp_wait_status(conf, VSE_CVP_STATUS_CFG_RDY,
				     VSE_CVP_STATUS_CFG_RDY,
				     conf->priv->poll_time_us);
	if (ret) {
		dev_warn(&mgr->dev, "CFG_RDY == 1 timeout\n");
		return ret;
	}

	/*
	 * STEP 6
	 * - set CVP_NUMCLKS to 1 and issue CVP_DUMMY_WR dummy writes to the HIP
	 */
	if (conf->priv->switch_clk)
		conf->priv->switch_clk(conf);

	if (altera_cvp_chkcfg) {
		ret = altera_cvp_chk_error(mgr, 0);
		if (ret) {
			dev_warn(&mgr->dev, "CFG_RDY == 1 timeout\n");
			return ret;
		}
	}

	/* STEP 7 - set START_XFER */
	altera_read_config_dword(conf, VSE_CVP_PROG_CTRL, &val);
	val |= VSE_CVP_PROG_CTRL_START_XFER;
	altera_write_config_dword(conf, VSE_CVP_PROG_CTRL, val);

	/* STEP 8 - start transfer (set CVP_NUMCLKS for bitstream) */
	if (conf->priv->switch_clk) {
		altera_read_config_dword(conf, VSE_CVP_MODE_CTRL, &val);
		val &= ~VSE_CVP_MODE_CTRL_NUMCLKS_MASK;
		val |= conf->numclks << VSE_CVP_MODE_CTRL_NUMCLKS_OFF;
		altera_write_config_dword(conf, VSE_CVP_MODE_CTRL, val);
	}
	return 0;
}

static int altera_cvp_write(struct fpga_manager *mgr, const char *buf,
			    size_t count)
{
	struct altera_cvp_conf *conf = mgr->priv;
	size_t done, remaining, len;
	const u32 *data;
	int status = 0;

	/* STEP 9 - write 32-bit data from RBF file to CVP data register */
	data = (u32 *)buf;
	remaining = count;
	done = 0;

	while (remaining) {
		/* Use credit throttling if available */
		if (conf->priv->wait_credit) {
			status = conf->priv->wait_credit(mgr, done);
			if (status) {
				dev_err(&conf->pci_dev->dev,
					"Wait Credit ERR: 0x%x\n", status);
				return status;
			}
		}

		len = min(conf->priv->block_size, remaining);
		altera_cvp_send_block(conf, data, len);
		data += len / sizeof(u32);
		done += len;
		remaining -= len;
		conf->sent_packets++;

		/*
		 * STEP 10 (optional) and STEP 11
		 * - check error flag
		 * - loop until data transfer completed
		 * Config images can be huge (more than 40 MiB), so
		 * only check after a new 4k data block has been written.
		 * This reduces the number of checks and speeds up the
		 * configuration process.
		 */
		if (altera_cvp_chkcfg && !(done % SZ_4K)) {
			status = altera_cvp_chk_error(mgr, done);
			if (status < 0)
				return status;
		}
	}

	if (altera_cvp_chkcfg)
		status = altera_cvp_chk_error(mgr, count);

	return status;
}

static int altera_cvp_write_complete(struct fpga_manager *mgr,
				     struct fpga_image_info *info)
{
	struct altera_cvp_conf *conf = mgr->priv;
	u32 mask, val;
	int ret;

	ret = altera_cvp_teardown(mgr, info);
	if (ret)
		return ret;

	/* STEP 16 - check CVP_CONFIG_ERROR_LATCHED bit */
	altera_read_config_dword(conf, VSE_UNCOR_ERR_STATUS, &val);
	if (val & VSE_UNCOR_ERR_CVP_CFG_ERR) {
		dev_err(&mgr->dev, "detected CVP_CONFIG_ERROR_LATCHED!\n");
		return -EPROTO;
	}

	/* STEP 17 - reset CVP_MODE and HIP_CLK_SEL bit */
	altera_read_config_dword(conf, VSE_CVP_MODE_CTRL, &val);
	val &= ~VSE_CVP_MODE_CTRL_HIP_CLK_SEL;
	val &= ~VSE_CVP_MODE_CTRL_CVP_MODE;
	altera_write_config_dword(conf, VSE_CVP_MODE_CTRL, val);

	/* STEP 18 - poll PLD_CLK_IN_USE and USER_MODE bits */
	mask = VSE_CVP_STATUS_PLD_CLK_IN_USE | VSE_CVP_STATUS_USERMODE;
	ret = altera_cvp_wait_status(conf, mask, mask,
				     conf->priv->user_time_us);
	if (ret)
		dev_err(&mgr->dev, "PLD_CLK_IN_USE|USERMODE timeout\n");

	return ret;
}

static const struct fpga_manager_ops altera_cvp_ops = {
	.state		= altera_cvp_state,
	.write_init	= altera_cvp_write_init,
	.write		= altera_cvp_write,
	.write_complete	= altera_cvp_write_complete,
};

static const struct cvp_priv cvp_priv_v1 = {
	.switch_clk	= altera_cvp_dummy_write,
	.block_size	= ALTERA_CVP_V1_SIZE,
	.poll_time_us	= V1_POLL_TIMEOUT_US,
	.user_time_us	= TIMEOUT_US,
};

static const struct cvp_priv cvp_priv_v2 = {
	.clear_state	= altera_cvp_v2_clear_state,
	.wait_credit	= altera_cvp_v2_wait_for_credit,
	.block_size	= ALTERA_CVP_V2_SIZE,
	.poll_time_us	= V2_POLL_TIMEOUT_US,
	.user_time_us	= V2_USER_TIMEOUT_US,
};

static ssize_t chkcfg_show(struct device_driver *dev, char *buf)
{
	return snprintf(buf, 3, "%d\n", altera_cvp_chkcfg);
}

static ssize_t chkcfg_store(struct device_driver *drv, const char *buf,
			    size_t count)
{
	int ret;

	ret = kstrtobool(buf, &altera_cvp_chkcfg);
	if (ret)
		return ret;

	return count;
}

static DRIVER_ATTR_RW(chkcfg);

static int altera_cvp_probe(struct pci_dev *pdev,
			    const struct pci_device_id *dev_id);
static void altera_cvp_remove(struct pci_dev *pdev);

static struct pci_device_id altera_cvp_id_tbl[] = {
	{ PCI_VDEVICE(ALTERA, PCI_ANY_ID) },
	{ }
};
MODULE_DEVICE_TABLE(pci, altera_cvp_id_tbl);

static struct pci_driver altera_cvp_driver = {
	.name   = DRV_NAME,
	.id_table = altera_cvp_id_tbl,
	.probe  = altera_cvp_probe,
	.remove = altera_cvp_remove,
};

static int altera_cvp_probe(struct pci_dev *pdev,
			    const struct pci_device_id *dev_id)
{
	struct altera_cvp_conf *conf;
	struct fpga_manager *mgr;
	int ret, offset;
	u16 cmd, val;
	u32 regval;

	/* Discover the Vendor Specific Offset for this device */
	offset = pci_find_next_ext_capability(pdev, 0, PCI_EXT_CAP_ID_VNDR);
	if (!offset) {
		dev_err(&pdev->dev, "No Vendor Specific Offset.\n");
		return -ENODEV;
	}

	/*
	 * First check if this is the expected FPGA device. PCI config
	 * space access works without enabling the PCI device, memory
	 * space access is enabled further down.
	 */
	pci_read_config_word(pdev, offset + VSE_PCIE_EXT_CAP_ID, &val);
	if (val != VSE_PCIE_EXT_CAP_ID_VAL) {
		dev_err(&pdev->dev, "Wrong EXT_CAP_ID value 0x%x\n", val);
		return -ENODEV;
	}

	pci_read_config_dword(pdev, offset + VSE_CVP_STATUS, &regval);
	if (!(regval & VSE_CVP_STATUS_CVP_EN)) {
		dev_err(&pdev->dev,
			"CVP is disabled for this device: CVP_STATUS Reg 0x%x\n",
			regval);
		return -ENODEV;
	}

	conf = devm_kzalloc(&pdev->dev, sizeof(*conf), GFP_KERNEL);
	if (!conf)
		return -ENOMEM;

	conf->vsec_offset = offset;

	/*
	 * Enable memory BAR access. We cannot use pci_enable_device() here
	 * because it will make the driver unusable with FPGA devices that
	 * have additional big IOMEM resources (e.g. 4GiB BARs) on 32-bit
	 * platform. Such BARs will not have an assigned address range and
	 * pci_enable_device() will fail, complaining about not claimed BAR,
	 * even if the concerned BAR is not needed for FPGA configuration
	 * at all. Thus, enable the device via PCI config space command.
	 */
	pci_read_config_word(pdev, PCI_COMMAND, &cmd);
	if (!(cmd & PCI_COMMAND_MEMORY)) {
		cmd |= PCI_COMMAND_MEMORY;
		pci_write_config_word(pdev, PCI_COMMAND, cmd);
	}

	ret = pci_request_region(pdev, CVP_BAR, "CVP");
	if (ret) {
		dev_err(&pdev->dev, "Requesting CVP BAR region failed\n");
		goto err_disable;
	}

	conf->pci_dev = pdev;
	conf->write_data = altera_cvp_write_data_iomem;

	if (conf->vsec_offset == V1_VSEC_OFFSET)
		conf->priv = &cvp_priv_v1;
	else
		conf->priv = &cvp_priv_v2;

	conf->map = pci_iomap(pdev, CVP_BAR, 0);
	if (!conf->map) {
		dev_warn(&pdev->dev, "Mapping CVP BAR failed\n");
		conf->write_data = altera_cvp_write_data_config;
	}

	snprintf(conf->mgr_name, sizeof(conf->mgr_name), "%s @%s",
		 ALTERA_CVP_MGR_NAME, pci_name(pdev));

	mgr = devm_fpga_mgr_create(&pdev->dev, conf->mgr_name,
				   &altera_cvp_ops, conf);
	if (!mgr) {
		ret = -ENOMEM;
		goto err_unmap;
	}

	pci_set_drvdata(pdev, mgr);

	ret = fpga_mgr_register(mgr);
	if (ret)
		goto err_unmap;

	return 0;

err_unmap:
	if (conf->map)
		pci_iounmap(pdev, conf->map);
	pci_release_region(pdev, CVP_BAR);
err_disable:
	cmd &= ~PCI_COMMAND_MEMORY;
	pci_write_config_word(pdev, PCI_COMMAND, cmd);
	return ret;
}

static void altera_cvp_remove(struct pci_dev *pdev)
{
	struct fpga_manager *mgr = pci_get_drvdata(pdev);
	struct altera_cvp_conf *conf = mgr->priv;
	u16 cmd;

	fpga_mgr_unregister(mgr);
	if (conf->map)
		pci_iounmap(pdev, conf->map);
	pci_release_region(pdev, CVP_BAR);
	pci_read_config_word(pdev, PCI_COMMAND, &cmd);
	cmd &= ~PCI_COMMAND_MEMORY;
	pci_write_config_word(pdev, PCI_COMMAND, cmd);
}

static int __init altera_cvp_init(void)
{
	int ret;

	ret = pci_register_driver(&altera_cvp_driver);
	if (ret)
		return ret;

	ret = driver_create_file(&altera_cvp_driver.driver,
				 &driver_attr_chkcfg);
	if (ret)
		pr_warn("Can't create sysfs chkcfg file\n");

	return 0;
}

static void __exit altera_cvp_exit(void)
{
	driver_remove_file(&altera_cvp_driver.driver, &driver_attr_chkcfg);
	pci_unregister_driver(&altera_cvp_driver);
}

module_init(altera_cvp_init);
module_exit(altera_cvp_exit);

MODULE_LICENSE("GPL v2");
MODULE_AUTHOR("Anatolij Gustschin <agust@denx.de>");
MODULE_DESCRIPTION("Module to load Altera FPGA over CvP");
<td class='right'>173</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/development-process/8.Conclusion?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/development-process/8.Conclusion</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/devices.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/devices.txt</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/dontdiff?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/dontdiff</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/fb/intelfb.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/fb/intelfb.txt</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/fb/uvesafb.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/fb/uvesafb.txt</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/fb/viafb.modes?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/fb/viafb.modes</a></td><td class='right'>870</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/fb/viafb.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/fb/viafb.txt</a></td><td class='right'>214</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/feature-removal-schedule.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/feature-removal-schedule.txt</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/filesystems/autofs4-mount-control.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/filesystems/autofs4-mount-control.txt</a></td><td class='right'>393</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/filesystems/ext3.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/filesystems/ext3.txt</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/filesystems/ext4.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/filesystems/ext4.txt</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/filesystems/fiemap.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/filesystems/fiemap.txt</a></td><td class='right'>228</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/filesystems/nfsroot.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/filesystems/nfsroot.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/filesystems/ocfs2.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/filesystems/ocfs2.txt</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/filesystems/proc.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/filesystems/proc.txt</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/filesystems/ramfs-rootfs-initramfs.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/filesystems/ramfs-rootfs-initramfs.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/gpio.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/gpio.txt</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/hwmon/adt7470?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/hwmon/adt7470</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/hwmon/it87?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/hwmon/it87</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/hwmon/lm85?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/hwmon/lm85</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/hwmon/lm87?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/hwmon/lm87</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/hwmon/lm90?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/hwmon/lm90</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/hwmon/pc87360?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/hwmon/pc87360</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/hwmon/pc87427?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/hwmon/pc87427</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/hwmon/w83781d?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/hwmon/w83781d</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/hwmon/w83791d?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/hwmon/w83791d</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/i2c/busses/i2c-viapro?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/i2c/busses/i2c-viapro</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/i2c/dev-interface?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/i2c/dev-interface</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/i2c/smbus-protocol?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/i2c/smbus-protocol</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/i2c/writing-clients?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/i2c/writing-clients</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/ia64/kvm.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/ia64/kvm.txt</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/ioctl-number.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/ioctl-number.txt</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/kernel-doc-nano-HOWTO.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/kernel-doc-nano-HOWTO.txt</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/kernel-parameters.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/kernel-parameters.txt</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/kobject.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/kobject.txt</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/laptops/disk-shock-protection.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/laptops/disk-shock-protection.txt</a></td><td class='right'>149</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/networking/LICENSE.qlge?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/networking/LICENSE.qlge</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/networking/can.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/networking/can.txt</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/networking/cs89x0.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/networking/cs89x0.txt</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/networking/multiqueue.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/networking/multiqueue.txt</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/networking/phonet.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/networking/phonet.txt</a></td><td class='right'>175</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/networking/regulatory.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/networking/regulatory.txt</a></td><td class='right'>194</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/networking/tproxy.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/networking/tproxy.txt</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/networking/vortex.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/networking/vortex.txt</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/pcmcia/driver-changes.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/pcmcia/driver-changes.txt</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/power/regulator/machine.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/power/regulator/machine.txt</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/power/regulator/regulator.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/power/regulator/regulator.txt</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/power/s2ram.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/power/s2ram.txt</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/powerpc/00-INDEX?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/powerpc/00-INDEX</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/powerpc/dts-bindings/fsl/83xx-512x-pci.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/powerpc/dts-bindings/fsl/83xx-512x-pci.txt</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/powerpc/dts-bindings/fsl/8xxx_gpio.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/powerpc/dts-bindings/fsl/8xxx_gpio.txt</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/powerpc/dts-bindings/fsl/dma.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/powerpc/dts-bindings/fsl/dma.txt</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/powerpc/dts-bindings/fsl/ssi.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/powerpc/dts-bindings/fsl/ssi.txt</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/powerpc/ppc_htab.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/powerpc/ppc_htab.txt</a></td><td class='right'>118</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/powerpc/smp.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/powerpc/smp.txt</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/rfkill.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/rfkill.txt</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/s390/CommonIO?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/s390/CommonIO</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/scheduler/sched-design-CFS.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/scheduler/sched-design-CFS.txt</a></td><td class='right'>395</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/scsi/ChangeLog.megaraid?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/scsi/ChangeLog.megaraid</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/scsi/scsi_fc_transport.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/scsi/scsi_fc_transport.txt</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/sound/alsa/ALSA-Configuration.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/sound/alsa/ALSA-Configuration.txt</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/sound/alsa/soc/dapm.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/sound/alsa/soc/dapm.txt</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/sparc/sbus_drivers.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/sparc/sbus_drivers.txt</a></td><td class='right'>309</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.1%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/spi/pxa2xx?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/spi/pxa2xx</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/sysctl/kernel.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/sysctl/kernel.txt</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/timers/00-INDEX?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/timers/00-INDEX</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/timers/hpet.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/timers/hpet.txt</a> (renamed from Documentation/hpet.txt)</td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/usb/anchors.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/usb/anchors.txt</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/usb/misc_usbsevseg.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/usb/misc_usbsevseg.txt</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/usb/power-management.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/usb/power-management.txt</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/video4linux/CARDLIST.au0828?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/video4linux/CARDLIST.au0828</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/video4linux/CARDLIST.bttv?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/video4linux/CARDLIST.bttv</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/video4linux/CARDLIST.cx23885?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/video4linux/CARDLIST.cx23885</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/video4linux/CARDLIST.cx88?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/video4linux/CARDLIST.cx88</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/video4linux/CARDLIST.em28xx?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/video4linux/CARDLIST.em28xx</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/video4linux/CARDLIST.saa7134?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/video4linux/CARDLIST.saa7134</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/video4linux/CARDLIST.tuner?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/video4linux/CARDLIST.tuner</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/video4linux/gspca.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/video4linux/gspca.txt</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/video4linux/m5602.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/video4linux/m5602.txt</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/video4linux/soc-camera.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/video4linux/soc-camera.txt</a></td><td class='right'>120</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/w1/00-INDEX?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/w1/00-INDEX</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/w1/masters/ds2490?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/w1/masters/ds2490</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/w1/slaves/00-INDEX?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/w1/slaves/00-INDEX</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/w1/slaves/w1_therm?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/w1/slaves/w1_therm</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/w1/w1.generic?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/w1/w1.generic</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/x86/00-INDEX?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/x86/00-INDEX</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/x86/boot.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/x86/boot.txt</a> (renamed from Documentation/x86/i386/boot.txt)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/x86/mtrr.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/x86/mtrr.txt</a> (renamed from Documentation/mtrr.txt)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/x86/pat.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/x86/pat.txt</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/x86/usb-legacy-support.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/x86/usb-legacy-support.txt</a> (renamed from Documentation/x86/i386/usb-legacy-support.txt)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/x86/x86_64/boot-options.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/x86/x86_64/boot-options.txt</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/Documentation/x86/zero-page.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/x86/zero-page.txt</a> (renamed from Documentation/x86/i386/zero-page.txt)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/MAINTAINERS?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>MAINTAINERS</a></td><td class='right'>952</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.2%;'/><td class='rem' style='width: 4.3%;'/><td class='none' style='width: 90.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/Kconfig</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/alpha/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/alpha/Kconfig</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/alpha/include/asm/a.out.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/alpha/include/asm/a.out.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/alpha/include/asm/elf.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/alpha/include/asm/elf.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/alpha/include/asm/statfs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/alpha/include/asm/statfs.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/alpha/kernel/pci_iommu.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/alpha/kernel/pci_iommu.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/alpha/kernel/smp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/alpha/kernel/smp.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/Kconfig</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/boot/compressed/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/boot/compressed/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/boot/compressed/head.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/boot/compressed/head.S</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/common/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/common/Kconfig</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/common/dmabounce.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/common/dmabounce.c</a></td><td class='right'>287</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/common/gic.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/common/gic.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/common/it8152.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/common/it8152.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/common/locomo.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/common/locomo.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/common/sa1111.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/common/sa1111.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/common/scoop.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/common/scoop.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/common/sharpsl_param.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/common/sharpsl_param.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/common/time-acorn.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/common/time-acorn.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/common/uengine.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/common/uengine.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/common/via82c505.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/common/via82c505.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/common/vic.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/common/vic.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/configs/afeb9260_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/configs/afeb9260_defconfig</a></td><td class='right'>1259</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 87.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/configs/at91sam9rlek_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/configs/at91sam9rlek_defconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/configs/cm_x300_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/configs/cm_x300_defconfig</a></td><td class='right'>1466</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 14.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 85.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/configs/jornada720_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/configs/jornada720_defconfig</a></td><td class='right'>1057</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.1%;'/><td class='rem' style='width: 4.4%;'/><td class='none' style='width: 89.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/configs/omap3_beagle_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/configs/omap3_beagle_defconfig</a></td><td class='right'>1321</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 86.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/configs/omap_ldp_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/configs/omap_ldp_defconfig</a></td><td class='right'>1044</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/configs/orion5x_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/configs/orion5x_defconfig</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/configs/overo_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/configs/overo_defconfig</a></td><td class='right'>1885</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 18.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 81.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/configs/palmz72_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/configs/palmz72_defconfig</a></td><td class='right'>951</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/configs/viper_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/configs/viper_defconfig</a></td><td class='right'>1678</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 16.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 83.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/configs/xm_x2xx_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/configs/xm_x2xx_defconfig</a> (renamed from arch/arm/configs/xm_x270_defconfig)</td><td class='right'>237</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/include/asm/bug.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/include/asm/bug.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/include/asm/cacheflush.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/include/asm/cacheflush.h</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/include/asm/cachetype.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/include/asm/cachetype.h</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/include/asm/cputype.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/include/asm/cputype.h</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/include/asm/dma-mapping.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/include/asm/dma-mapping.h</a></td><td class='right'>378</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/include/asm/elf.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/include/asm/elf.h</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/include/asm/futex.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/include/asm/futex.h</a></td><td class='right'>124</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/include/asm/io.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/include/asm/io.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/include/asm/irq.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/include/asm/irq.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/include/asm/kprobes.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/include/asm/kprobes.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/include/asm/mach/map.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/include/asm/mach/map.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/include/asm/mach/udc_pxa2xx.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/include/asm/mach/udc_pxa2xx.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/include/asm/mc146818rtc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/include/asm/mc146818rtc.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/include/asm/memory.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/include/asm/memory.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/include/asm/mmu_context.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/include/asm/mmu_context.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/include/asm/page.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/include/asm/page.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/include/asm/pgtable.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/include/asm/pgtable.h</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/include/asm/ptrace.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/include/asm/ptrace.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/include/asm/setup.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/include/asm/setup.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/include/asm/sparsemem.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/include/asm/sparsemem.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/include/asm/statfs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/include/asm/statfs.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/include/asm/system.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/include/asm/system.h</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/include/asm/thread_info.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/include/asm/thread_info.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/include/asm/uaccess.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/include/asm/uaccess.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/include/asm/vga.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/include/asm/vga.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/kernel/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/kernel/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/kernel/armksyms.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/kernel/armksyms.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/kernel/bios32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/kernel/bios32.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/kernel/crunch.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/kernel/crunch.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/kernel/debug.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/kernel/debug.S</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/kernel/dma-isa.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/kernel/dma-isa.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/kernel/dma.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/kernel/dma.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/kernel/ecard.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/kernel/ecard.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/kernel/elf.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/kernel/elf.c</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/kernel/entry-armv.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/kernel/entry-armv.S</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/kernel/entry-common.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/kernel/entry-common.S</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/kernel/fiq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/kernel/fiq.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/kernel/head-common.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/kernel/head-common.S</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/kernel/head-nommu.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/kernel/head-nommu.S</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/kernel/head.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/kernel/head.S</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/kernel/init_task.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/kernel/init_task.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/kernel/io.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/kernel/io.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/kernel/irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/kernel/irq.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/kernel/kprobes-decode.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/kernel/kprobes-decode.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/kernel/kprobes.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/kernel/kprobes.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/kernel/machine_kexec.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/kernel/machine_kexec.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/kernel/module.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/kernel/module.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/kernel/process.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/kernel/process.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/kernel/ptrace.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/kernel/ptrace.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/kernel/setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/kernel/setup.c</a></td><td class='right'>279</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/kernel/signal.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/kernel/signal.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/kernel/smp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/kernel/smp.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/kernel/sys_arm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/kernel/sys_arm.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/kernel/sys_oabi-compat.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/kernel/sys_oabi-compat.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/kernel/time.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/kernel/time.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/kernel/traps.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/kernel/traps.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/kernel/xscale-cp0.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/kernel/xscale-cp0.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/lib/ashldi3.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/ashldi3.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/lib/ashrdi3.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/ashrdi3.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/lib/backtrace.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/backtrace.S</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/lib/changebit.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/changebit.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/lib/clear_user.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/clear_user.S</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/lib/clearbit.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/clearbit.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/lib/copy_from_user.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/copy_from_user.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/lib/copy_page.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/copy_page.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/lib/copy_to_user.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/copy_to_user.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/lib/csumipv6.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/csumipv6.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/lib/csumpartial.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/csumpartial.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/lib/csumpartialcopy.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/csumpartialcopy.S</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/lib/csumpartialcopygeneric.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/csumpartialcopygeneric.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/lib/csumpartialcopyuser.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/csumpartialcopyuser.S</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/lib/delay.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/delay.S</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/lib/div64.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/div64.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/lib/findbit.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/findbit.S</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/lib/getuser.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/getuser.S</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/lib/io-readsb.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/io-readsb.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/lib/io-readsl.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/io-readsl.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/lib/io-readsw-armv4.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/io-readsw-armv4.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/lib/io-writesb.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/io-writesb.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/lib/io-writesl.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/io-writesl.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/lib/io-writesw-armv4.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/io-writesw-armv4.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/lib/lib1funcs.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/lib1funcs.S</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/lib/lshrdi3.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/lshrdi3.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/lib/memchr.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/memchr.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/lib/memcpy.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/memcpy.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/lib/memmove.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/memmove.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/lib/memset.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/memset.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/lib/memzero.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/memzero.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/lib/muldi3.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/muldi3.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/lib/putuser.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/putuser.S</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/lib/setbit.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/setbit.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/lib/sha1.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/sha1.S</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/lib/strchr.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/strchr.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/lib/strncpy_from_user.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/strncpy_from_user.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/lib/strnlen_user.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/strnlen_user.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/lib/strrchr.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/strrchr.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/lib/testchangebit.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/testchangebit.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/lib/testclearbit.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/testclearbit.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/lib/testsetbit.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/testsetbit.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/lib/uaccess.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/uaccess.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/lib/ucmpdi2.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/ucmpdi2.S</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-at91/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/Kconfig</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-at91/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-at91/at91cap9.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/at91cap9.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-at91/at91cap9_devices.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/at91cap9_devices.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-at91/at91sam9263.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/at91sam9263.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-at91/at91sam9263_devices.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/at91sam9263_devices.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-at91/at91sam9rl.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/at91sam9rl.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-at91/at91sam9rl_devices.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/at91sam9rl_devices.c</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-at91/at91x40_time.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/at91x40_time.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-at91/board-afeb-9260v1.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/board-afeb-9260v1.c</a></td><td class='right'>210</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-at91/board-cap9adk.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/board-cap9adk.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-at91/board-carmeva.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/board-carmeva.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-at91/board-csb337.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/board-csb337.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-at91/board-csb637.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/board-csb637.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-at91/board-dk.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/board-dk.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-at91/board-ecbat91.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/board-ecbat91.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-at91/board-ek.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/board-ek.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-at91/board-picotux200.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/board-picotux200.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-at91/board-qil-a9260.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/board-qil-a9260.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-at91/board-sam9-l9260.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/board-sam9-l9260.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-at91/board-sam9260ek.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/board-sam9260ek.c</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-at91/board-sam9261ek.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/board-sam9261ek.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-at91/board-sam9263ek.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/board-sam9263ek.c</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-at91/board-sam9g20ek.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/board-sam9g20ek.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-at91/board-sam9rlek.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/board-sam9rlek.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-at91/board-usb-a9260.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/board-usb-a9260.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-at91/board-usb-a9263.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/board-usb-a9263.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-at91/board-yl-9200.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/board-yl-9200.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-at91/clock.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/clock.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-at91/gpio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/gpio.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-at91/include/mach/at91_pit.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/include/mach/at91_pit.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-at91/include/mach/at91_rstc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/include/mach/at91_rstc.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-at91/include/mach/at91_rtt.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/include/mach/at91_rtt.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-at91/include/mach/at91_shdwc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/include/mach/at91_shdwc.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-at91/include/mach/at91_wdt.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/include/mach/at91_wdt.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-at91/include/mach/at91cap9_ddrsdr.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/include/mach/at91cap9_ddrsdr.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-at91/include/mach/at91sam9260_matrix.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/include/mach/at91sam9260_matrix.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-at91/include/mach/at91sam9261_matrix.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/include/mach/at91sam9261_matrix.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-at91/include/mach/at91sam9_sdramc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/include/mach/at91sam9_sdramc.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-at91/include/mach/at91sam9_smc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/include/mach/at91sam9_smc.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-at91/include/mach/board.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/include/mach/board.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-at91/include/mach/irqs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/include/mach/irqs.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-at91/include/mach/uncompress.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/include/mach/uncompress.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-at91/leds.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/leds.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-at91/pm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/pm.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-at91/pm_slowclock.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/pm_slowclock.S</a></td><td class='right'>283</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-clps711x/autcpu12.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-clps711x/autcpu12.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-clps711x/cdb89712.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-clps711x/cdb89712.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-clps711x/include/mach/system.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-clps711x/include/mach/system.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-clps711x/irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-clps711x/irq.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-clps711x/p720t-leds.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-clps711x/p720t-leds.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-clps711x/p720t.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-clps711x/p720t.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-clps711x/time.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-clps711x/time.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-clps7500/core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-clps7500/core.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-clps7500/include/mach/irq.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-clps7500/include/mach/irq.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-clps7500/include/mach/memory.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-clps7500/include/mach/memory.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-clps7500/include/mach/system.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-clps7500/include/mach/system.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-davinci/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-davinci/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-davinci/board-evm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-davinci/board-evm.c</a></td><td class='right'>341</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-davinci/clock.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-davinci/clock.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-davinci/devices.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-davinci/devices.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-davinci/gpio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-davinci/gpio.c</a></td><td class='right'>138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-davinci/id.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-davinci/id.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-davinci/include/mach/common.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-davinci/include/mach/common.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-davinci/include/mach/gpio.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-davinci/include/mach/gpio.h</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-davinci/include/mach/i2c.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-davinci/include/mach/i2c.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-davinci/include/mach/io.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-davinci/include/mach/io.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-davinci/include/mach/system.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-davinci/include/mach/system.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-davinci/io.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-davinci/io.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-davinci/irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-davinci/irq.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-davinci/psc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-davinci/psc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-davinci/serial.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-davinci/serial.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-davinci/time.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-davinci/time.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-davinci/usb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-davinci/usb.c</a></td><td class='right'>116</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-ebsa110/core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ebsa110/core.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-ebsa110/io.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ebsa110/io.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-ep93xx/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ep93xx/Kconfig</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-ep93xx/adssphere.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ep93xx/adssphere.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-ep93xx/clock.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ep93xx/clock.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-ep93xx/core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ep93xx/core.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-ep93xx/edb9302.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ep93xx/edb9302.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-ep93xx/edb9302a.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ep93xx/edb9302a.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-ep93xx/edb9307.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ep93xx/edb9307.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-ep93xx/edb9312.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ep93xx/edb9312.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-ep93xx/edb9315.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ep93xx/edb9315.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-ep93xx/edb9315a.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ep93xx/edb9315a.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-ep93xx/gesbc9312.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ep93xx/gesbc9312.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-ep93xx/gpio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ep93xx/gpio.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-ep93xx/include/mach/platform.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ep93xx/include/mach/platform.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-ep93xx/include/mach/ts72xx.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ep93xx/include/mach/ts72xx.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-ep93xx/include/mach/uncompress.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ep93xx/include/mach/uncompress.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-ep93xx/micro9.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ep93xx/micro9.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-ep93xx/ts72xx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ep93xx/ts72xx.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-footbridge/cats-hw.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-footbridge/cats-hw.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-footbridge/common.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-footbridge/common.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-footbridge/dc21285.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-footbridge/dc21285.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-footbridge/dma.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-footbridge/dma.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-footbridge/include/mach/memory.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-footbridge/include/mach/memory.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-footbridge/include/mach/system.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-footbridge/include/mach/system.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-footbridge/isa-irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-footbridge/isa-irq.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-footbridge/isa-timer.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-footbridge/isa-timer.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-footbridge/netwinder-hw.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-footbridge/netwinder-hw.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-footbridge/time.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-footbridge/time.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-h720x/common.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-h720x/common.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-h720x/cpu-h7202.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-h720x/cpu-h7202.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-imx/clock.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-imx/clock.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-imx/include/mach/irqs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-imx/include/mach/irqs.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-imx/irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-imx/irq.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-imx/leds-mx1ads.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-imx/leds-mx1ads.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-imx/time.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-imx/time.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-integrator/core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-integrator/core.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-integrator/cpu.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-integrator/cpu.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-integrator/impd1.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-integrator/impd1.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-integrator/integrator_ap.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-integrator/integrator_ap.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-integrator/integrator_cp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-integrator/integrator_cp.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-integrator/leds.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-integrator/leds.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-integrator/pci_v3.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-integrator/pci_v3.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-iop13xx/include/mach/memory.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-iop13xx/include/mach/memory.h</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-iop13xx/include/mach/pci.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-iop13xx/include/mach/pci.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-iop13xx/io.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-iop13xx/io.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-iop13xx/msi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-iop13xx/msi.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-iop13xx/setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-iop13xx/setup.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-iop13xx/tpmi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-iop13xx/tpmi.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-iop32x/glantank.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-iop32x/glantank.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-iop32x/iq31244.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-iop32x/iq31244.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-iop32x/iq80321.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-iop32x/iq80321.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-iop32x/n2100.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-iop32x/n2100.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-iop33x/iq80331.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-iop33x/iq80331.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-iop33x/iq80332.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-iop33x/iq80332.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-iop33x/uart.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-iop33x/uart.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-ixp2000/core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ixp2000/core.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-ixp2000/enp2611.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ixp2000/enp2611.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-ixp2000/include/mach/ixp2000-regs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ixp2000/include/mach/ixp2000-regs.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-ixp2000/ixdp2400.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ixp2000/ixdp2400.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-ixp2000/ixdp2800.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ixp2000/ixdp2800.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-ixp2000/ixdp2x00.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ixp2000/ixdp2x00.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-ixp2000/ixdp2x01.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ixp2000/ixdp2x01.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-ixp2000/pci.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ixp2000/pci.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-ixp23xx/core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ixp23xx/core.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-ixp23xx/ixdp2351.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ixp23xx/ixdp2351.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-ixp23xx/pci.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ixp23xx/pci.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-ixp4xx/common-pci.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ixp4xx/common-pci.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-ixp4xx/common.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ixp4xx/common.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-ixp4xx/fsg-setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ixp4xx/fsg-setup.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-ixp4xx/include/mach/cpu.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ixp4xx/include/mach/cpu.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-ixp4xx/ixdp425-setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ixp4xx/ixdp425-setup.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-ixp4xx/nas100d-setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ixp4xx/nas100d-setup.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-ixp4xx/nslu2-setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ixp4xx/nslu2-setup.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-kirkwood/addr-map.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-kirkwood/addr-map.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-kirkwood/common.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-kirkwood/common.c</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-kirkwood/common.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-kirkwood/common.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-kirkwood/db88f6281-bp-setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-kirkwood/db88f6281-bp-setup.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-kirkwood/include/mach/irqs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-kirkwood/include/mach/irqs.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-kirkwood/include/mach/kirkwood.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-kirkwood/include/mach/kirkwood.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-kirkwood/include/mach/timex.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-kirkwood/include/mach/timex.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-kirkwood/pcie.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-kirkwood/pcie.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-kirkwood/rd88f6192-nas-setup.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-kirkwood/rd88f6281-setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-kirkwood/rd88f6281-setup.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-ks8695/cpu.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ks8695/cpu.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-ks8695/gpio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ks8695/gpio.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-ks8695/include/mach/memory.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ks8695/include/mach/memory.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-ks8695/include/mach/regs-gpio.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ks8695/include/mach/regs-gpio.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-ks8695/include/mach/regs-lan.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ks8695/include/mach/regs-lan.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-ks8695/include/mach/regs-wan.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ks8695/include/mach/regs-wan.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-ks8695/include/mach/system.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ks8695/include/mach/system.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-ks8695/include/mach/uncompress.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ks8695/include/mach/uncompress.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-ks8695/irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ks8695/irq.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-ks8695/pci.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ks8695/pci.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-ks8695/time.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ks8695/time.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-lh7a40x/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-lh7a40x/Kconfig</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-lh7a40x/arch-kev7a400.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-lh7a40x/arch-kev7a400.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-lh7a40x/arch-lpd7a40x.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-lh7a40x/arch-lpd7a40x.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-lh7a40x/common.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-lh7a40x/common.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-lh7a40x/include/mach/memory.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-lh7a40x/include/mach/memory.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-lh7a40x/irq-lpd7a40x.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-lh7a40x/irq-lpd7a40x.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-lh7a40x/ssp-cpld.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-lh7a40x/ssp-cpld.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-lh7a40x/time.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-lh7a40x/time.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-loki/addr-map.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-loki/addr-map.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-loki/irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-loki/irq.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-loki/lb88rc8480-setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-loki/lb88rc8480-setup.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-msm/board-halibut.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-msm/board-halibut.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-msm/common.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-msm/common.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-msm/dma.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-msm/dma.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-msm/io.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-msm/io.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-msm/irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-msm/irq.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-msm/timer.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-msm/timer.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-mv78xx0/addr-map.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-mv78xx0/addr-map.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-mv78xx0/common.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-mv78xx0/common.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-mv78xx0/db78x00-bp-setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-mv78xx0/db78x00-bp-setup.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-mv78xx0/include/mach/entry-macro.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-mv78xx0/include/mach/entry-macro.S</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-mv78xx0/include/mach/irqs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-mv78xx0/include/mach/irqs.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-mv78xx0/include/mach/mv78xx0.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-mv78xx0/include/mach/mv78xx0.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-mv78xx0/irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-mv78xx0/irq.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-mx2/devices.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-mx2/devices.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-mx2/mx27ads.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-mx2/mx27ads.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-mx2/pcm038.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-mx2/pcm038.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-mx2/serial.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-mx2/serial.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-mx3/devices.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-mx3/devices.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-mx3/devices.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-mx3/devices.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-mx3/iomux.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-mx3/iomux.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-mx3/mm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-mx3/mm.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-mx3/mx31ads.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-mx3/mx31ads.c</a></td><td class='right'>120</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-mx3/mx31lite.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-mx3/mx31lite.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-mx3/pcm037.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-mx3/pcm037.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-netx/generic.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-netx/generic.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-netx/include/mach/system.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-netx/include/mach/system.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-netx/pfifo.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-netx/pfifo.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-netx/time.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-netx/time.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-netx/xc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-netx/xc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-ns9xxx/board-a9m9750dev.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ns9xxx/board-a9m9750dev.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-ns9xxx/gpio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ns9xxx/gpio.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-ns9xxx/include/mach/uncompress.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ns9xxx/include/mach/uncompress.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-ns9xxx/irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ns9xxx/irq.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-omap1/board-h3.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap1/board-h3.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-omap1/board-voiceblue.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap1/board-voiceblue.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-omap1/clock.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap1/clock.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-omap1/clock.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap1/clock.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-omap1/devices.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap1/devices.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-omap1/fpga.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap1/fpga.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-omap1/id.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap1/id.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-omap1/io.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap1/io.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-omap1/irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap1/irq.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-omap1/leds-h2p2-debug.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap1/leds-h2p2-debug.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-omap1/mailbox.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap1/mailbox.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-omap1/mcbsp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap1/mcbsp.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-omap1/mux.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap1/mux.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-omap1/pm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap1/pm.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-omap1/serial.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap1/serial.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-omap1/time.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap1/time.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-omap1/timer32k.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap1/timer32k.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-omap2/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/Kconfig</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-omap2/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/Makefile</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-omap2/board-2430sdp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/board-2430sdp.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-omap2/board-h4.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/board-h4.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-omap2/board-ldp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/board-ldp.c</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-omap2/board-omap3beagle.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/board-omap3beagle.c</a></td><td class='right'>244</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-omap2/board-overo.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/board-overo.c</a></td><td class='right'>242</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-omap2/clock.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/clock.c</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-omap2/clock.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/clock.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-omap2/clock24xx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/clock24xx.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-omap2/clock24xx.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/clock24xx.h</a></td><td class='right'>238</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-omap2/clock34xx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/clock34xx.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-omap2/clock34xx.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/clock34xx.h</a></td><td class='right'>248</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-omap2/clockdomain.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/clockdomain.c</a></td><td class='right'>623</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-omap2/clockdomains.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/clockdomains.h</a></td><td class='right'>305</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-omap2/cm-regbits-24xx.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/cm-regbits-24xx.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-omap2/cm-regbits-34xx.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/cm-regbits-34xx.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-omap2/cm.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/cm.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-omap2/devices.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/devices.c</a></td><td class='right'>227</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-omap2/gpmc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/gpmc.c</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-omap2/id.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/id.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-omap2/io.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/io.c</a></td><td class='right'>154</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-omap2/irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/irq.c</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-omap2/mailbox.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/mailbox.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-omap2/mcbsp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/mcbsp.c</a></td><td class='right'>151</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-omap2/memory.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/memory.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-omap2/memory.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/memory.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-omap2/mux.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/mux.c</a></td><td class='right'>250</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-omap2/pm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/pm.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-omap2/powerdomain.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/powerdomain.c</a></td><td class='right'>1113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 88.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-omap2/powerdomains.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/powerdomains.h</a></td><td class='right'>187</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-omap2/powerdomains24xx.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/powerdomains24xx.h</a></td><td class='right'>200</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-omap2/powerdomains34xx.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/powerdomains34xx.h</a></td><td class='right'>327</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-omap2/prcm-common.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/prcm-common.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-omap2/prm-regbits-24xx.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/prm-regbits-24xx.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-omap2/prm-regbits-34xx.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/prm-regbits-34xx.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-omap2/prm.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/prm.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-omap2/serial.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/serial.c</a></td><td class='right'>119</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-omap2/sleep24xx.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/sleep24xx.S</a> (renamed from arch/arm/mach-omap2/sleep.S)</td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-omap2/sram34xx.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/sram34xx.S</a></td><td class='right'>179</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-orion5x/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-orion5x/Kconfig</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-orion5x/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-orion5x/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-orion5x/addr-map.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-orion5x/addr-map.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-orion5x/common.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-orion5x/common.c</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-orion5x/common.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-orion5x/common.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-orion5x/db88f5281-setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-orion5x/db88f5281-setup.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-orion5x/dns323-setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-orion5x/dns323-setup.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-orion5x/edmini_v2-setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-orion5x/edmini_v2-setup.c</a></td><td class='right'>262</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-orion5x/gpio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-orion5x/gpio.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-orion5x/include/mach/orion5x.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-orion5x/include/mach/orion5x.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-orion5x/include/mach/timex.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-orion5x/include/mach/timex.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-orion5x/irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-orion5x/irq.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-orion5x/kurobox_pro-setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-orion5x/kurobox_pro-setup.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-orion5x/lsmini-setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-orion5x/lsmini-setup.c</a></td><td class='right'>279</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-orion5x/mpp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-orion5x/mpp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-orion5x/mss2-setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-orion5x/mss2-setup.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-orion5x/mv2120-setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-orion5x/mv2120-setup.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-orion5x/rd88f5181l-ge-setup.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-orion5x/rd88f5182-setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-orion5x/rd88f5182-setup.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-orion5x/terastation_pro2-setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-orion5x/terastation_pro2-setup.c</a></td><td class='right'>369</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-orion5x/ts78xx-setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-orion5x/ts78xx-setup.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-orion5x/tsx09-common.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-orion5x/tsx09-common.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-orion5x/wnr854t-setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-orion5x/wnr854t-setup.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-orion5x/wrt350n-v2-setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-orion5x/wrt350n-v2-setup.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pnx4008/clock.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pnx4008/clock.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pnx4008/core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pnx4008/core.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pnx4008/dma.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pnx4008/dma.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pnx4008/gpio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pnx4008/gpio.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pnx4008/include/mach/system.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pnx4008/include/mach/system.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pnx4008/include/mach/timex.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pnx4008/include/mach/timex.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pnx4008/irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pnx4008/irq.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pnx4008/pm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pnx4008/pm.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pnx4008/serial.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pnx4008/serial.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pnx4008/time.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pnx4008/time.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/Kconfig</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/Makefile</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/akita-ioexp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/akita-ioexp.c</a></td><td class='right'>222</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/am200epd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/am200epd.c</a></td><td class='right'>374</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/cm-x255.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/cm-x255.c</a></td><td class='right'>258</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/cm-x270-pci.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/cm-x270-pci.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/cm-x270.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/cm-x270.c</a></td><td class='right'>470</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.7%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/cm-x2xx-pci.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/cm-x2xx-pci.c</a> (renamed from arch/arm/mach-pxa/cm-x270-pci.c)</td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/cm-x2xx-pci.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/cm-x2xx-pci.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/cm-x2xx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/cm-x2xx.c</a></td><td class='right'>531</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/cm-x300.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/cm-x300.c</a></td><td class='right'>465</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/colibri.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/colibri.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/corgi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/corgi.c</a></td><td class='right'>478</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/corgi_lcd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/corgi_lcd.c</a></td><td class='right'>290</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.9%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/corgi_pm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/corgi_pm.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/corgi_ssp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/corgi_ssp.c</a></td><td class='right'>276</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.8%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/cpufreq-pxa2xx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/cpufreq-pxa2xx.c</a> (renamed from arch/arm/mach-pxa/cpu-pxa.c)</td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/cpufreq-pxa3xx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/cpufreq-pxa3xx.c</a></td><td class='right'>257</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/devices.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/devices.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/e330.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/e330.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/e350.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/e350.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/e400.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/e400.c</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/e400_lcd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/e400_lcd.c</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/e740.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/e740.c</a></td><td class='right'>169</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/e740_lcd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/e740_lcd.c</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/e750.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/e750.c</a> (renamed from arch/arm/mach-pxa/e750_lcd.c)</td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/e800.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/e800.c</a> (renamed from arch/arm/mach-pxa/e800_lcd.c)</td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/em-x270.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/em-x270.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/eseries.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/eseries.c</a></td><td class='right'>157</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/eseries.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/eseries.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/eseries_udc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/eseries_udc.c</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/generic.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/generic.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/generic.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/generic.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/gpio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/gpio.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/gumstix.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/gumstix.c</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/idp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/idp.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/include/mach/akita.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/include/mach/akita.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/include/mach/camera.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/include/mach/camera.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/include/mach/corgi.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/include/mach/corgi.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/include/mach/entry-macro.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/include/mach/entry-macro.S</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/include/mach/hardware.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/include/mach/hardware.h</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/include/mach/i2c.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/include/mach/i2c.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/include/mach/irqs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/include/mach/irqs.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/include/mach/littleton.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/include/mach/littleton.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/include/mach/memory.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/include/mach/memory.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/include/mach/mfp-pxa25x.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/include/mach/mfp-pxa25x.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/include/mach/mfp-pxa320.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/include/mach/mfp-pxa320.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/include/mach/mfp.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/include/mach/mfp.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/include/mach/mioa701.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/include/mach/mioa701.h</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/include/mach/ohci.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/include/mach/ohci.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/include/mach/palmz72.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/include/mach/palmz72.h</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/include/mach/pm.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/include/mach/pm.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/include/mach/poodle.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/include/mach/poodle.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/include/mach/pxa-regs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/include/mach/pxa-regs.h</a></td><td class='right'>320</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 3.1%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/include/mach/pxa3xx-regs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/include/mach/pxa3xx-regs.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/include/mach/reset.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/include/mach/reset.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/include/mach/spitz.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/include/mach/spitz.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/include/mach/ssp.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/include/mach/ssp.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/include/mach/trizeps4.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/include/mach/trizeps4.h</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/include/mach/viper.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/include/mach/viper.h</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/irq.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/leds-trizeps4.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/leds-trizeps4.c</a></td><td class='right'>134</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/leds.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/leds.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/littleton.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/littleton.c</a></td><td class='right'>205</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/lpd270.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/lpd270.c</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/lubbock.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/lubbock.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/magician.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/magician.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/mainstone.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/mainstone.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/mfp-pxa2xx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/mfp-pxa2xx.c</a></td><td class='right'>225</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/mioa701.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/mioa701.c</a></td><td class='right'>905</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/mioa701_bootresume.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/mioa701_bootresume.S</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/mp900.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/mp900.c</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/palmtx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/palmtx.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/palmz72.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/palmz72.c</a></td><td class='right'>554</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/pcm027.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/pcm027.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/pcm990-baseboard.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/pcm990-baseboard.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/pm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/pm.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/poodle.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/poodle.c</a></td><td class='right'>353</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/pxa25x.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/pxa25x.c</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/pxa27x.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/pxa27x.c</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/pxa3xx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/pxa3xx.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/reset.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/reset.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/sharpsl_pm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/sharpsl_pm.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/spitz.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/spitz.c</a></td><td class='right'>537</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 2.6%;'/><td class='none' style='width: 94.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/spitz_pm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/spitz_pm.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/ssp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/ssp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/time.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/time.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/tosa.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/tosa.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/trizeps4.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/trizeps4.c</a></td><td class='right'>551</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 94.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/viper.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/viper.c</a></td><td class='right'>983</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/zylonite.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/zylonite.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/zylonite_pxa300.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/zylonite_pxa300.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-pxa/zylonite_pxa320.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/zylonite_pxa320.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-realview/core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-realview/core.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-realview/core.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-realview/core.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-realview/include/mach/system.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-realview/include/mach/system.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-realview/localtimer.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-realview/localtimer.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-realview/platsmp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-realview/platsmp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-realview/realview_eb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-realview/realview_eb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-realview/realview_pb1176.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-realview/realview_pb1176.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-realview/realview_pb11mp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-realview/realview_pb11mp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-rpc/dma.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-rpc/dma.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-rpc/include/mach/memory.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-rpc/include/mach/memory.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-rpc/include/mach/system.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-rpc/include/mach/system.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-rpc/include/mach/uncompress.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-rpc/include/mach/uncompress.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-rpc/irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-rpc/irq.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-rpc/riscpc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-rpc/riscpc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-s3c2400/gpio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2400/gpio.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-s3c2410/bast-irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2410/bast-irq.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-s3c2410/clock.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2410/clock.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-s3c2410/dma.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2410/dma.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-s3c2410/gpio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2410/gpio.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-s3c2410/include/mach/debug-macro.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2410/include/mach/debug-macro.S</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-s3c2410/include/mach/map.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2410/include/mach/map.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-s3c2410/include/mach/spi.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2410/include/mach/spi.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-s3c2410/include/mach/system-reset.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2410/include/mach/system-reset.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-s3c2410/include/mach/system.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2410/include/mach/system.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-s3c2410/include/mach/uncompress.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2410/include/mach/uncompress.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-s3c2410/irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2410/irq.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-s3c2410/mach-amlm5900.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2410/mach-amlm5900.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-s3c2410/mach-bast.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2410/mach-bast.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-s3c2410/mach-h1940.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2410/mach-h1940.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-s3c2410/mach-n30.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2410/mach-n30.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-s3c2410/mach-otom.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2410/mach-otom.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-s3c2410/mach-qt2410.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2410/mach-qt2410.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-s3c2410/mach-smdk2410.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2410/mach-smdk2410.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-s3c2410/mach-tct_hammer.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2410/mach-tct_hammer.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-s3c2410/mach-vr1000.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2410/mach-vr1000.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-s3c2410/pm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2410/pm.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-s3c2410/s3c2410.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2410/s3c2410.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-s3c2410/sleep.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2410/sleep.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-s3c2410/usb-simtec.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2410/usb-simtec.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-s3c2412/clock.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2412/clock.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-s3c2412/dma.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2412/dma.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-s3c2412/irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2412/irq.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-s3c2412/mach-jive.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2412/mach-jive.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-s3c2412/mach-smdk2413.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2412/mach-smdk2413.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-s3c2412/mach-vstms.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2412/mach-vstms.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-s3c2412/pm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2412/pm.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-s3c2412/s3c2412.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2412/s3c2412.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-s3c2440/clock.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2440/clock.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-s3c2440/dma.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2440/dma.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-s3c2440/dsc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2440/dsc.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-s3c2440/irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2440/irq.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-s3c2440/mach-anubis.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2440/mach-anubis.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-s3c2440/mach-at2440evb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2440/mach-at2440evb.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-s3c2440/mach-nexcoder.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2440/mach-nexcoder.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-s3c2440/mach-osiris.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2440/mach-osiris.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-s3c2440/mach-rx3715.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2440/mach-rx3715.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-s3c2440/mach-smdk2440.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2440/mach-smdk2440.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-s3c2440/s3c2440.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2440/s3c2440.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-s3c2442/clock.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2442/clock.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-s3c2442/s3c2442.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2442/s3c2442.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-s3c2443/clock.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2443/clock.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-s3c2443/dma.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2443/dma.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-s3c2443/irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2443/irq.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-s3c2443/mach-smdk2443.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2443/mach-smdk2443.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-s3c2443/s3c2443.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2443/s3c2443.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-sa1100/badge4.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-sa1100/badge4.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-sa1100/cpu-sa1100.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-sa1100/cpu-sa1100.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-sa1100/cpu-sa1110.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-sa1100/cpu-sa1110.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-sa1100/generic.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-sa1100/generic.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-sa1100/include/mach/SA-1100.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-sa1100/include/mach/SA-1100.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-sa1100/include/mach/hardware.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-sa1100/include/mach/hardware.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-sa1100/include/mach/memory.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-sa1100/include/mach/memory.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-sa1100/irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-sa1100/irq.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-sa1100/neponset.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-sa1100/neponset.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-sa1100/pleb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-sa1100/pleb.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-sa1100/simpad.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-sa1100/simpad.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-sa1100/ssp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-sa1100/ssp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-shark/core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-shark/core.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-shark/include/mach/system.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-shark/include/mach/system.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-shark/irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-shark/irq.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-shark/leds.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-shark/leds.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-versatile/core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-versatile/core.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-versatile/include/mach/system.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-versatile/include/mach/system.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-versatile/pci.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-versatile/pci.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-versatile/versatile_ab.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-versatile/versatile_ab.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mach-versatile/versatile_pb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-versatile/versatile_pb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mm/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/Kconfig</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mm/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mm/abort-ev7.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/abort-ev7.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mm/abort-nommu.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/abort-nommu.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mm/alignment.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/alignment.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mm/cache-feroceon-l2.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/cache-feroceon-l2.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mm/cache-l2x0.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/cache-l2x0.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mm/cache-v7.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/cache-v7.S</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mm/cache-xsc3l2.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/cache-xsc3l2.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mm/copypage-v4mc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/copypage-v4mc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mm/copypage-v6.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/copypage-v6.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mm/copypage-xscale.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/copypage-xscale.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mm/dma-mapping.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/dma-mapping.c</a> (renamed from arch/arm/mm/consistent.c)</td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mm/extable.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/extable.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mm/fault-armv.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/fault-armv.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mm/fault.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/fault.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mm/flush.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/flush.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mm/init.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/init.c</a></td><td class='right'>193</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mm/iomap.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/iomap.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mm/ioremap.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/ioremap.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mm/mm.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/mm.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mm/mmap.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/mmap.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mm/mmu.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/mmu.c</a></td><td class='right'>106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mm/nommu.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/nommu.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mm/proc-arm1020.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/proc-arm1020.S</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mm/proc-arm1020e.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/proc-arm1020e.S</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mm/proc-arm1022.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/proc-arm1022.S</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mm/proc-arm1026.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/proc-arm1026.S</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mm/proc-arm6_7.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/proc-arm6_7.S</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mm/proc-arm720.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/proc-arm720.S</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mm/proc-arm740.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/proc-arm740.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mm/proc-arm7tdmi.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/proc-arm7tdmi.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mm/proc-arm920.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/proc-arm920.S</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mm/proc-arm922.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/proc-arm922.S</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mm/proc-arm925.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/proc-arm925.S</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mm/proc-arm926.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/proc-arm926.S</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mm/proc-arm940.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/proc-arm940.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mm/proc-arm946.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/proc-arm946.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mm/proc-arm9tdmi.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/proc-arm9tdmi.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mm/proc-feroceon.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/proc-feroceon.S</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mm/proc-macros.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/proc-macros.S</a></td><td class='right'>170</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mm/proc-sa110.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/proc-sa110.S</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mm/proc-sa1100.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/proc-sa1100.S</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mm/proc-v6.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/proc-v6.S</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mm/proc-v7.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/proc-v7.S</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mm/proc-xsc3.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/proc-xsc3.S</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mm/proc-xscale.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/proc-xscale.S</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/mm/tlb-v7.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/tlb-v7.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/nwfpe/fpa11_cpdt.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/nwfpe/fpa11_cpdt.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/oprofile/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/oprofile/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/oprofile/backtrace.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/oprofile/backtrace.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/oprofile/common.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/oprofile/common.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/oprofile/op_arm_model.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/oprofile/op_arm_model.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/oprofile/op_model_mpcore.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/oprofile/op_model_mpcore.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/oprofile/op_model_v7.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/oprofile/op_model_v7.c</a></td><td class='right'>411</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/oprofile/op_model_v7.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/oprofile/op_model_v7.h</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/oprofile/op_model_xscale.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/oprofile/op_model_xscale.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-iop/i2c.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-iop/i2c.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-iop/io.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-iop/io.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-iop/pci.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-iop/pci.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-iop/time.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-iop/time.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-mxc/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-mxc/Kconfig</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-mxc/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-mxc/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-mxc/devices.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-mxc/devices.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-mxc/dma-mx1-mx2.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-mxc/dma-mx1-mx2.c</a></td><td class='right'>840</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-mxc/include/mach/board-mx31ads.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-mxc/include/mach/board-mx31ads.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-mxc/include/mach/clock.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-mxc/include/mach/clock.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-mxc/include/mach/common.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-mxc/include/mach/common.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-mxc/include/mach/dma-mx1-mx2.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-mxc/include/mach/dma-mx1-mx2.h</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-mxc/include/mach/entry-macro.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-mxc/include/mach/entry-macro.S</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-mxc/include/mach/iomux-mx1-mx2.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-mxc/include/mach/iomux-mx1-mx2.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-mxc/include/mach/iomux-mx3.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-mxc/include/mach/iomux-mx3.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-mxc/include/mach/irqs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-mxc/include/mach/irqs.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-mxc/include/mach/mx27.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-mxc/include/mach/mx27.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-mxc/include/mach/mx31.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-mxc/include/mach/mx31.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-mxc/include/mach/mxc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-mxc/include/mach/mxc.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-mxc/irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-mxc/irq.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-omap/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/Kconfig</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-omap/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-omap/clock.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/clock.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-omap/common.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/common.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-omap/cpu-omap.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/cpu-omap.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-omap/debug-devices.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/debug-devices.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-omap/debug-leds.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/debug-leds.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-omap/devices.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/devices.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-omap/dma.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/dma.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-omap/dmtimer.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/dmtimer.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-omap/fb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/fb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-omap/gpio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/gpio.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-omap/include/mach/board-2430sdp.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/include/mach/board-2430sdp.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-omap/include/mach/board-apollon.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/include/mach/board-apollon.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-omap/include/mach/board-h4.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/include/mach/board-h4.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-omap/include/mach/board-ldp.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/include/mach/board-ldp.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-omap/include/mach/board-omap3beagle.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/include/mach/board-omap3beagle.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-omap/include/mach/board-overo.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/include/mach/board-overo.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-omap/include/mach/board.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/include/mach/board.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-omap/include/mach/clock.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/include/mach/clock.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-omap/include/mach/clockdomain.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/include/mach/clockdomain.h</a></td><td class='right'>106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-omap/include/mach/common.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/include/mach/common.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-omap/include/mach/control.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/include/mach/control.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-omap/include/mach/cpu.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/include/mach/cpu.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-omap/include/mach/debug-macro.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/include/mach/debug-macro.S</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-omap/include/mach/entry-macro.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/include/mach/entry-macro.S</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-omap/include/mach/fpga.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/include/mach/fpga.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-omap/include/mach/gpio.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/include/mach/gpio.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-omap/include/mach/gpmc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/include/mach/gpmc.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-omap/include/mach/hardware.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/include/mach/hardware.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-omap/include/mach/io.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/include/mach/io.h</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-omap/include/mach/irqs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/include/mach/irqs.h</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-omap/include/mach/mcbsp.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/include/mach/mcbsp.h</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-omap/include/mach/memory.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/include/mach/memory.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-omap/include/mach/mtd-xip.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/include/mach/mtd-xip.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-omap/include/mach/mux.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/include/mach/mux.h</a></td><td class='right'>180</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-omap/include/mach/omap1510.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/include/mach/omap1510.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-omap/include/mach/omap16xx.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/include/mach/omap16xx.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-omap/include/mach/omap24xx.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/include/mach/omap24xx.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-omap/include/mach/omapfb.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/include/mach/omapfb.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-omap/include/mach/pm.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/include/mach/pm.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-omap/include/mach/powerdomain.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/include/mach/powerdomain.h</a></td><td class='right'>166</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-omap/include/mach/sdrc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/include/mach/sdrc.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-omap/include/mach/serial.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/include/mach/serial.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-omap/include/mach/sram.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/include/mach/sram.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-omap/include/mach/system.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/include/mach/system.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-omap/io.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/io.c</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-omap/mailbox.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/mailbox.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-omap/mcbsp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/mcbsp.c</a></td><td class='right'>431</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-omap/mux.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/mux.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-omap/ocpi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/ocpi.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-omap/sram.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/sram.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-omap/usb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/usb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-s3c/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-s3c/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-s3c/include/plat/debug-macro.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-s3c/include/plat/debug-macro.S</a> (renamed from include/asm-arm/plat-s3c/debug-macro.S)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-s3c/include/plat/map.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-s3c/include/plat/map.h</a> (renamed from include/asm-arm/plat-s3c/map.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-s3c/include/plat/regs-adc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-s3c/include/plat/regs-adc.h</a> (renamed from include/asm-arm/plat-s3c/regs-adc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-s3c/include/plat/regs-serial.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-s3c/include/plat/regs-serial.h</a> (renamed from include/asm-arm/plat-s3c/regs-serial.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-s3c/include/plat/regs-timer.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-s3c/include/plat/regs-timer.h</a> (renamed from include/asm-arm/plat-s3c/regs-timer.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-s3c/include/plat/uncompress.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-s3c/include/plat/uncompress.h</a> (renamed from include/asm-arm/plat-s3c/uncompress.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-s3c24xx/clock.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-s3c24xx/clock.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-s3c24xx/common-smdk.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-s3c24xx/common-smdk.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-s3c24xx/cpu.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-s3c24xx/cpu.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-s3c24xx/devs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-s3c24xx/devs.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-s3c24xx/dma.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-s3c24xx/dma.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-s3c24xx/gpio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-s3c24xx/gpio.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-s3c24xx/include/plat/clock.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-s3c24xx/include/plat/clock.h</a> (renamed from include/asm-arm/plat-s3c24xx/clock.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-s3c24xx/include/plat/common-smdk.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-s3c24xx/include/plat/common-smdk.h</a> (renamed from include/asm-arm/plat-s3c24xx/common-smdk.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-s3c24xx/include/plat/cpu.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-s3c24xx/include/plat/cpu.h</a> (renamed from include/asm-arm/plat-s3c24xx/cpu.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-s3c24xx/include/plat/devs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-s3c24xx/include/plat/devs.h</a> (renamed from include/asm-arm/plat-s3c24xx/devs.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-s3c24xx/include/plat/dma.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-s3c24xx/include/plat/dma.h</a> (renamed from include/asm-arm/plat-s3c24xx/dma.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-s3c24xx/include/plat/irq.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-s3c24xx/include/plat/irq.h</a> (renamed from include/asm-arm/plat-s3c24xx/irq.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-s3c24xx/include/plat/pm.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-s3c24xx/include/plat/pm.h</a> (renamed from include/asm-arm/plat-s3c24xx/pm.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-s3c24xx/include/plat/s3c2400.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-s3c24xx/include/plat/s3c2400.h</a> (renamed from include/asm-arm/plat-s3c24xx/s3c2400.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-s3c24xx/include/plat/s3c2410.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-s3c24xx/include/plat/s3c2410.h</a> (renamed from include/asm-arm/plat-s3c24xx/s3c2410.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-s3c24xx/include/plat/s3c2412.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-s3c24xx/include/plat/s3c2412.h</a> (renamed from include/asm-arm/plat-s3c24xx/s3c2412.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-s3c24xx/include/plat/s3c2440.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-s3c24xx/include/plat/s3c2440.h</a> (renamed from include/asm-arm/plat-s3c24xx/s3c2440.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-s3c24xx/include/plat/s3c2442.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-s3c24xx/include/plat/s3c2442.h</a> (renamed from include/asm-arm/plat-s3c24xx/s3c2442.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-s3c24xx/include/plat/s3c2443.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-s3c24xx/include/plat/s3c2443.h</a> (renamed from include/asm-arm/plat-s3c24xx/s3c2443.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-s3c24xx/irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-s3c24xx/irq.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-s3c24xx/pm-simtec.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-s3c24xx/pm-simtec.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-s3c24xx/pm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-s3c24xx/pm.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-s3c24xx/pwm-clock.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-s3c24xx/pwm-clock.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-s3c24xx/pwm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-s3c24xx/pwm.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-s3c24xx/s3c244x-clock.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-s3c24xx/s3c244x-clock.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-s3c24xx/s3c244x-irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-s3c24xx/s3c244x-irq.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-s3c24xx/s3c244x.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-s3c24xx/s3c244x.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-s3c24xx/sleep.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-s3c24xx/sleep.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/plat-s3c24xx/time.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-s3c24xx/time.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/tools/mach-types?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/tools/mach-types</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/vfp/entry.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/vfp/entry.S</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/arm/vfp/vfphw.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/vfp/vfphw.S</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/avr32/boards/atngw100/setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/avr32/boards/atngw100/setup.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/avr32/boards/atstk1000/atstk1002.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/avr32/boards/atstk1000/atstk1002.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/avr32/boards/atstk1000/atstk1003.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/avr32/boards/atstk1000/atstk1003.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/avr32/boards/atstk1000/atstk1004.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/avr32/boards/atstk1000/atstk1004.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/avr32/include/asm/a.out.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/avr32/include/asm/a.out.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/avr32/include/asm/atmel-mci.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/avr32/include/asm/atmel-mci.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/avr32/include/asm/byteorder.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/avr32/include/asm/byteorder.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/avr32/include/asm/elf.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/avr32/include/asm/elf.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/avr32/include/asm/io.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/avr32/include/asm/io.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/avr32/kernel/process.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/avr32/kernel/process.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/avr32/kernel/setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/avr32/kernel/setup.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/avr32/mach-at32ap/at32ap700x.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/avr32/mach-at32ap/at32ap700x.c</a></td><td class='right'>460</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/avr32/mach-at32ap/clock.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/avr32/mach-at32ap/clock.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/avr32/mach-at32ap/clock.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/avr32/mach-at32ap/clock.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/avr32/mach-at32ap/cpufreq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/avr32/mach-at32ap/cpufreq.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/avr32/mach-at32ap/include/mach/at32ap700x.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/avr32/mach-at32ap/include/mach/at32ap700x.h</a></td><td class='right'>128</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/avr32/mach-at32ap/include/mach/board.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/avr32/mach-at32ap/include/mach/board.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/avr32/mach-at32ap/include/mach/io.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/avr32/mach-at32ap/include/mach/io.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/avr32/mach-at32ap/include/mach/portmux.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/avr32/mach-at32ap/include/mach/portmux.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/avr32/mach-at32ap/pdc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/avr32/mach-at32ap/pdc.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/avr32/mach-at32ap/pio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/avr32/mach-at32ap/pio.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/avr32/oprofile/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/avr32/oprofile/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/avr32/oprofile/backtrace.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/avr32/oprofile/backtrace.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/avr32/oprofile/op_model_avr32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/avr32/oprofile/op_model_avr32.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/Kconfig</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/Kconfig.debug?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/Kconfig.debug</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/configs/BF526-EZBRD_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/configs/BF526-EZBRD_defconfig</a></td><td class='right'>1427</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 14.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 85.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/configs/BF527-EZKIT_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/configs/BF527-EZKIT_defconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/configs/BF533-EZKIT_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/configs/BF533-EZKIT_defconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/configs/BF533-STAMP_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/configs/BF533-STAMP_defconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/configs/BF537-STAMP_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/configs/BF537-STAMP_defconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/configs/BF548-EZKIT_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/configs/BF548-EZKIT_defconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/configs/BF561-EZKIT_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/configs/BF561-EZKIT_defconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/configs/CM-BF527_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/configs/CM-BF527_defconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/configs/CM-BF533_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/configs/CM-BF533_defconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/configs/CM-BF537E_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/configs/CM-BF537E_defconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/configs/CM-BF537U_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/configs/CM-BF537U_defconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/configs/CM-BF548_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/configs/CM-BF548_defconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/configs/CM-BF561_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/configs/CM-BF561_defconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/configs/H8606_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/configs/H8606_defconfig</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/include/asm/a.out.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/include/asm/a.out.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/include/asm/bfin-global.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/include/asm/bfin-global.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/include/asm/bfrom.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/include/asm/bfrom.h</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/include/asm/cacheflush.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/include/asm/cacheflush.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/include/asm/cplb.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/include/asm/cplb.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/include/asm/cplbinit.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/include/asm/cplbinit.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/include/asm/cpumask.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/include/asm/cpumask.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/include/asm/dma-mapping.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/include/asm/dma-mapping.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/include/asm/elf.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/include/asm/elf.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/include/asm/io.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/include/asm/io.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/include/asm/kgdb.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/include/asm/kgdb.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/include/asm/mmu_context.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/include/asm/mmu_context.h</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/include/asm/processor.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/include/asm/processor.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/include/asm/ptrace.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/include/asm/ptrace.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/include/asm/timex.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/include/asm/timex.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/include/asm/traps.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/include/asm/traps.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/kernel/asm-offsets.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/kernel/asm-offsets.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/kernel/bfin_dma_5xx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/kernel/bfin_dma_5xx.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/kernel/bfin_gpio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/kernel/bfin_gpio.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/kernel/cplb-mpu/cplbinit.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/kernel/cplb-mpu/cplbinit.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/kernel/cplb-mpu/cplbmgr.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/kernel/cplb-mpu/cplbmgr.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/kernel/cplb-nompu/cplbinit.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/kernel/cplb-nompu/cplbinit.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/kernel/early_printk.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/kernel/early_printk.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/kernel/kgdb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/kernel/kgdb.c</a></td><td class='right'>711</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.5%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 92.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/kernel/ptrace.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/kernel/ptrace.c</a></td><td class='right'>215</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/kernel/reboot.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/kernel/reboot.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/kernel/setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/kernel/setup.c</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/kernel/traps.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/kernel/traps.c</a></td><td class='right'>367</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/mach-bf527/boards/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-bf527/boards/Kconfig</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/mach-bf527/boards/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-bf527/boards/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/mach-bf527/boards/cm_bf527.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-bf527/boards/cm_bf527.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/mach-bf527/boards/ezbrd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-bf527/boards/ezbrd.c</a></td><td class='right'>734</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/mach-bf527/boards/ezkit.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-bf527/boards/ezkit.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/mach-bf527/head.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-bf527/head.S</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/mach-bf527/include/mach/anomaly.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-bf527/include/mach/anomaly.h</a></td><td class='right'>160</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/mach-bf527/include/mach/bf527.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-bf527/include/mach/bf527.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/mach-bf527/include/mach/bfin_serial_5xx.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-bf527/include/mach/bfin_serial_5xx.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/mach-bf527/include/mach/defBF52x_base.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-bf527/include/mach/defBF52x_base.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/mach-bf527/include/mach/portmux.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-bf527/include/mach/portmux.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/mach-bf533/boards/H8606.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-bf533/boards/H8606.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/mach-bf533/head.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-bf533/head.S</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/mach-bf533/include/mach/anomaly.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-bf533/include/mach/anomaly.h</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/mach-bf533/include/mach/bf533.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-bf533/include/mach/bf533.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/mach-bf533/include/mach/bfin_serial_5xx.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-bf533/include/mach/bfin_serial_5xx.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/mach-bf537/boards/stamp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-bf537/boards/stamp.c</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/mach-bf537/head.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-bf537/head.S</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/mach-bf537/include/mach/anomaly.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-bf537/include/mach/anomaly.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/mach-bf537/include/mach/bf537.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-bf537/include/mach/bf537.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/mach-bf537/include/mach/bfin_serial_5xx.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-bf537/include/mach/bfin_serial_5xx.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/mach-bf548/boards/cm_bf548.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-bf548/boards/cm_bf548.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/mach-bf548/boards/ezkit.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-bf548/boards/ezkit.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/mach-bf548/head.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-bf548/head.S</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/mach-bf548/include/mach/anomaly.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-bf548/include/mach/anomaly.h</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/mach-bf548/include/mach/bf548.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-bf548/include/mach/bf548.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/mach-bf548/include/mach/bfin_serial_5xx.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-bf548/include/mach/bfin_serial_5xx.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/mach-bf548/include/mach/mem_map.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-bf548/include/mach/mem_map.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/mach-bf561/head.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-bf561/head.S</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/mach-bf561/include/mach/anomaly.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-bf561/include/mach/anomaly.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/mach-bf561/include/mach/bf561.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-bf561/include/mach/bf561.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/mach-bf561/include/mach/bfin_serial_5xx.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-bf561/include/mach/bfin_serial_5xx.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/mach-bf561/include/mach/mem_map.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-bf561/include/mach/mem_map.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/mach-common/cache.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-common/cache.S</a></td><td class='right'>173</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/mach-common/cpufreq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-common/cpufreq.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/mach-common/entry.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-common/entry.S</a></td><td class='right'>219</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/mach-common/head.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-common/head.S</a></td><td class='right'>106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/mach-common/interrupt.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-common/interrupt.S</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/mach-common/ints-priority.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-common/ints-priority.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/mm/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mm/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/mm/isram-driver.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mm/isram-driver.c</a></td><td class='right'>201</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/blackfin/mm/sram-alloc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mm/sram-alloc.c</a> (renamed from arch/blackfin/mm/blackfin_sram.c)</td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/cris/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/cris/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/cris/arch-v10/boot/compressed/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/cris/arch-v10/boot/compressed/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/cris/arch-v10/boot/compressed/decompress.lds?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/cris/arch-v10/boot/compressed/decompress.lds</a> (renamed from arch/cris/arch-v10/boot/compressed/decompress.ld)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/cris/arch-v10/boot/rescue/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/cris/arch-v10/boot/rescue/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/cris/arch-v10/boot/rescue/rescue.lds?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/cris/arch-v10/boot/rescue/rescue.lds</a> (renamed from arch/cris/arch-v10/boot/rescue/rescue.ld)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/cris/arch-v10/boot/tools/build.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/cris/arch-v10/boot/tools/build.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/cris/arch-v32/boot/compressed/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/cris/arch-v32/boot/compressed/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/cris/arch-v32/boot/compressed/decompress.lds?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/cris/arch-v32/boot/compressed/decompress.lds</a> (renamed from arch/cris/arch-v32/boot/compressed/decompress.ld)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/cris/arch-v32/boot/rescue/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/cris/arch-v32/boot/rescue/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/cris/arch-v32/boot/rescue/rescue.lds?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/cris/arch-v32/boot/rescue/rescue.lds</a> (renamed from arch/cris/arch-v32/boot/rescue/rescue.ld)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/cris/arch-v32/kernel/smp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/cris/arch-v32/kernel/smp.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/cris/arch-v32/mach-a3/cpufreq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/cris/arch-v32/mach-a3/cpufreq.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/cris/arch-v32/mach-fs/cpufreq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/cris/arch-v32/mach-fs/cpufreq.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/cris/configs/artpec_3_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/cris/configs/artpec_3_defconfig</a> (renamed from arch/cris/artpec_3_defconfig)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/cris/configs/etrax-100lx_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/cris/configs/etrax-100lx_defconfig</a> (renamed from arch/cris/arch-v10/defconfig)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/cris/configs/etrax-100lx_v2_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/cris/configs/etrax-100lx_v2_defconfig</a> (renamed from arch/cris/defconfig)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/cris/configs/etraxfs_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/cris/configs/etraxfs_defconfig</a> (renamed from arch/cris/etraxfs_defconfig)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/frv/kernel/pm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/frv/kernel/pm.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/frv/mb93090-mb00/pci-dma-nommu.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/frv/mb93090-mb00/pci-dma-nommu.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/frv/mb93090-mb00/pci-dma.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/frv/mb93090-mb00/pci-dma.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/frv/mb93090-mb00/pci-frv.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/frv/mb93090-mb00/pci-frv.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/frv/mb93090-mb00/pci-frv.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/frv/mb93090-mb00/pci-frv.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/frv/mb93090-mb00/pci-vdk.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/frv/mb93090-mb00/pci-vdk.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/frv/mm/init.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/frv/mm/init.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/h8300/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/h8300/Kconfig</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/h8300/Kconfig.cpu?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/h8300/Kconfig.cpu</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/h8300/include/asm/a.out.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/h8300/include/asm/a.out.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/h8300/include/asm/bug.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/h8300/include/asm/bug.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/h8300/include/asm/elf.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/h8300/include/asm/elf.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/h8300/include/asm/io.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/h8300/include/asm/io.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/h8300/include/asm/md.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/h8300/include/asm/md.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/h8300/include/asm/system.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/h8300/include/asm/system.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/h8300/kernel/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/h8300/kernel/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/h8300/kernel/module.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/h8300/kernel/module.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/h8300/kernel/process.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/h8300/kernel/process.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/h8300/kernel/time.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/h8300/kernel/time.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/h8300/kernel/timer/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/h8300/kernel/timer/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/h8300/kernel/timer/itu.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/h8300/kernel/timer/itu.c</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/h8300/kernel/timer/timer16.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/h8300/kernel/timer/timer16.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/h8300/kernel/timer/timer8.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/h8300/kernel/timer/timer8.c</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/h8300/kernel/timer/tpu.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/h8300/kernel/timer/tpu.c</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/h8300/kernel/traps.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/h8300/kernel/traps.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/h8300/mm/fault.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/h8300/mm/fault.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/h8300/platform/h8300h/aki3068net/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/h8300/platform/h8300h/aki3068net/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/h8300/platform/h8300h/aki3068net/timer.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/h8300/platform/h8300h/aki3068net/timer.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/h8300/platform/h8300h/generic/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/h8300/platform/h8300h/generic/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/h8300/platform/h8300h/generic/timer.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/h8300/platform/h8300h/generic/timer.c</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/h8300/platform/h8300h/h8max/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/h8300/platform/h8300h/h8max/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/h8300/platform/h8300h/h8max/timer.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/h8300/platform/h8300h/h8max/timer.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/h8300/platform/h8s/edosk2674/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/h8300/platform/h8s/edosk2674/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/h8300/platform/h8s/edosk2674/timer.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/h8300/platform/h8s/edosk2674/timer.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/h8300/platform/h8s/generic/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/h8300/platform/h8s/generic/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/h8300/platform/h8s/generic/timer.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/h8300/platform/h8s/generic/timer.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/ia64/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/ia64/Kconfig</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/ia64/ia32/binfmt_elf32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/ia64/ia32/binfmt_elf32.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/ia64/ia32/ia32_entry.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/ia64/ia32/ia32_entry.S</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/ia64/ia32/ia32priv.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/ia64/ia32/ia32priv.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/ia64/ia32/sys_ia32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/ia64/ia32/sys_ia32.c</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/ia64/include/asm/a.out.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/ia64/include/asm/a.out.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/ia64/include/asm/dma-mapping.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/ia64/include/asm/dma-mapping.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/ia64/include/asm/elf.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/ia64/include/asm/elf.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/ia64/include/asm/kvm_host.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/ia64/include/asm/kvm_host.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/ia64/include/asm/siginfo.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/ia64/include/asm/siginfo.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/ia64/include/asm/statfs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/ia64/include/asm/statfs.h</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/ia64/kernel/smpboot.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/ia64/kernel/smpboot.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/ia64/kvm/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/ia64/kvm/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/ia64/kvm/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/ia64/kvm/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/ia64/kvm/irq.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/ia64/kvm/irq.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/ia64/kvm/kvm-ia64.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/ia64/kvm/kvm-ia64.c</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/ia64/kvm/kvm_minstate.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/ia64/kvm/kvm_minstate.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/ia64/kvm/optvfault.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/ia64/kvm/optvfault.S</a></td><td class='right'>181</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/ia64/kvm/process.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/ia64/kvm/process.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/ia64/kvm/vcpu.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/ia64/kvm/vcpu.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/ia64/kvm/vmm_ivt.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/ia64/kvm/vmm_ivt.S</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/ia64/kvm/vtlb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/ia64/kvm/vtlb.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/ia64/mm/init.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/ia64/mm/init.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/m32r/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/m32r/Kconfig</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/m32r/kernel/process.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/m32r/kernel/process.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/m32r/kernel/smpboot.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/m32r/kernel/smpboot.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/m32r/mm/discontig.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/m32r/mm/discontig.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/m68k/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/m68k/Kconfig</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/m68k/amiga/config.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/m68k/amiga/config.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/m68k/atari/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/m68k/atari/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/m68k/atari/ataints.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/m68k/atari/ataints.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/m68k/atari/atakeyb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/m68k/atari/atakeyb.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/m68k/atari/config.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/m68k/atari/config.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/m68k/atari/hades-pci.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/m68k/atari/hades-pci.c</a></td><td class='right'>440</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.4%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/m68k/atari/time.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/m68k/atari/time.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/m68k/bvme6000/config.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/m68k/bvme6000/config.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/m68k/bvme6000/rtc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/m68k/bvme6000/rtc.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/m68k/kernel/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/m68k/kernel/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/m68k/kernel/bios32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/m68k/kernel/bios32.c</a></td><td class='right'>514</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.1%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/m68k/kernel/dma.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/m68k/kernel/dma.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/m68k/kernel/ints.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/m68k/kernel/ints.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/m68k/kernel/process.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/m68k/kernel/process.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/m68k/kernel/traps.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/m68k/kernel/traps.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/m68k/kernel/vmlinux-std.lds?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/m68k/kernel/vmlinux-std.lds</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/m68k/mm/kmap.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/m68k/mm/kmap.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/m68k/mvme16x/rtc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/m68k/mvme16x/rtc.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/m68k/q40/config.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/m68k/q40/config.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/m68k/sun3x/time.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/m68k/sun3x/time.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/m68knommu/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/m68knommu/Kconfig</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/m68knommu/include/asm/a.out.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/m68knommu/include/asm/a.out.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/m68knommu/include/asm/elf.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/m68knommu/include/asm/elf.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/m68knommu/kernel/process.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/m68knommu/kernel/process.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/m68knommu/kernel/traps.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/m68knommu/kernel/traps.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/Kconfig</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/Makefile</a></td><td class='right'>122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/alchemy/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/Kconfig</a> (renamed from arch/mips/au1000/Kconfig)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/alchemy/common/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/common/Makefile</a> (renamed from arch/mips/au1000/common/Makefile)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/alchemy/common/au1xxx_irqmap.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/common/au1xxx_irqmap.c</a> (renamed from arch/mips/au1000/common/au1xxx_irqmap.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/alchemy/common/clocks.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/common/clocks.c</a> (renamed from arch/mips/au1000/common/clocks.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/alchemy/common/cputable.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/common/cputable.c</a> (renamed from arch/mips/au1000/common/cputable.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/alchemy/common/dbdma.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/common/dbdma.c</a> (renamed from arch/mips/au1000/common/dbdma.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/alchemy/common/dma.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/common/dma.c</a> (renamed from arch/mips/au1000/common/dma.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/alchemy/common/gpio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/common/gpio.c</a> (renamed from arch/mips/au1000/common/gpio.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/alchemy/common/irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/common/irq.c</a> (renamed from arch/mips/au1000/common/irq.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/alchemy/common/pci.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/common/pci.c</a> (renamed from arch/mips/au1000/common/pci.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/alchemy/common/platform.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/common/platform.c</a> (renamed from arch/mips/au1000/common/platform.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/alchemy/common/power.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/common/power.c</a> (renamed from arch/mips/au1000/common/power.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/alchemy/common/prom.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/common/prom.c</a> (renamed from arch/mips/au1000/common/prom.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/alchemy/common/puts.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/common/puts.c</a> (renamed from arch/mips/au1000/common/puts.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/alchemy/common/reset.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/common/reset.c</a> (renamed from arch/mips/au1000/common/reset.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/alchemy/common/setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/common/setup.c</a> (renamed from arch/mips/au1000/common/setup.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/alchemy/common/sleeper.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/common/sleeper.S</a> (renamed from arch/mips/au1000/common/sleeper.S)</td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/alchemy/common/time.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/common/time.c</a> (renamed from arch/mips/au1000/common/time.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/alchemy/db1x00/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/db1x00/Makefile</a> (renamed from arch/mips/au1000/db1x00/Makefile)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/alchemy/db1x00/board_setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/db1x00/board_setup.c</a> (renamed from arch/mips/au1000/db1x00/board_setup.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/alchemy/db1x00/init.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/db1x00/init.c</a> (renamed from arch/mips/au1000/db1x00/init.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/alchemy/db1x00/irqmap.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/db1x00/irqmap.c</a> (renamed from arch/mips/au1000/db1x00/irqmap.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/alchemy/mtx-1/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/mtx-1/Makefile</a> (renamed from arch/mips/au1000/mtx-1/Makefile)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/alchemy/mtx-1/board_setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/mtx-1/board_setup.c</a> (renamed from arch/mips/au1000/mtx-1/board_setup.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/alchemy/mtx-1/init.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/mtx-1/init.c</a> (renamed from arch/mips/au1000/mtx-1/init.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/alchemy/mtx-1/irqmap.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/mtx-1/irqmap.c</a> (renamed from arch/mips/au1000/mtx-1/irqmap.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/alchemy/mtx-1/platform.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/mtx-1/platform.c</a> (renamed from arch/mips/au1000/mtx-1/platform.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/alchemy/pb1000/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/pb1000/Makefile</a> (renamed from arch/mips/au1000/pb1000/Makefile)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/alchemy/pb1000/board_setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/pb1000/board_setup.c</a> (renamed from arch/mips/au1000/pb1000/board_setup.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/alchemy/pb1000/init.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/pb1000/init.c</a> (renamed from arch/mips/au1000/pb1000/init.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/alchemy/pb1000/irqmap.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/pb1000/irqmap.c</a> (renamed from arch/mips/au1000/pb1000/irqmap.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/alchemy/pb1100/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/pb1100/Makefile</a> (renamed from arch/mips/au1000/pb1100/Makefile)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/alchemy/pb1100/board_setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/pb1100/board_setup.c</a> (renamed from arch/mips/au1000/pb1100/board_setup.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/alchemy/pb1100/init.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/pb1100/init.c</a> (renamed from arch/mips/au1000/pb1100/init.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/alchemy/pb1100/irqmap.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/pb1100/irqmap.c</a> (renamed from arch/mips/au1000/pb1100/irqmap.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/alchemy/pb1200/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/pb1200/Makefile</a> (renamed from arch/mips/au1000/pb1200/Makefile)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/alchemy/pb1200/board_setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/pb1200/board_setup.c</a> (renamed from arch/mips/au1000/pb1200/board_setup.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/alchemy/pb1200/init.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/pb1200/init.c</a> (renamed from arch/mips/au1000/pb1200/init.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/alchemy/pb1200/irqmap.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/pb1200/irqmap.c</a> (renamed from arch/mips/au1000/pb1200/irqmap.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/alchemy/pb1200/platform.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/pb1200/platform.c</a> (renamed from arch/mips/au1000/pb1200/platform.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/alchemy/pb1500/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/pb1500/Makefile</a> (renamed from arch/mips/au1000/pb1500/Makefile)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/alchemy/pb1500/board_setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/pb1500/board_setup.c</a> (renamed from arch/mips/au1000/pb1500/board_setup.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/alchemy/pb1500/init.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/pb1500/init.c</a> (renamed from arch/mips/au1000/pb1500/init.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/alchemy/pb1500/irqmap.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/pb1500/irqmap.c</a> (renamed from arch/mips/au1000/pb1500/irqmap.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/alchemy/pb1550/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/pb1550/Makefile</a> (renamed from arch/mips/au1000/pb1550/Makefile)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/alchemy/pb1550/board_setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/pb1550/board_setup.c</a> (renamed from arch/mips/au1000/pb1550/board_setup.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/alchemy/pb1550/init.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/pb1550/init.c</a> (renamed from arch/mips/au1000/pb1550/init.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/alchemy/pb1550/irqmap.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/pb1550/irqmap.c</a> (renamed from arch/mips/au1000/pb1550/irqmap.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/alchemy/xxs1500/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/xxs1500/Makefile</a> (renamed from arch/mips/au1000/xxs1500/Makefile)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/alchemy/xxs1500/board_setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/xxs1500/board_setup.c</a> (renamed from arch/mips/au1000/xxs1500/board_setup.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/alchemy/xxs1500/init.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/xxs1500/init.c</a> (renamed from arch/mips/au1000/xxs1500/init.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/alchemy/xxs1500/irqmap.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/xxs1500/irqmap.c</a> (renamed from arch/mips/au1000/xxs1500/irqmap.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/bcm47xx/gpio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/bcm47xx/gpio.c</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/bcm47xx/setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/bcm47xx/setup.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/bcm47xx/wgt634u.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/bcm47xx/wgt634u.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/emma2rh/common/irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/emma2rh/common/irq.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/emma2rh/common/prom.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/emma2rh/common/prom.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/emma2rh/markeins/platform.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/emma2rh/markeins/platform.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/Kbuild?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/Kbuild</a> (renamed from include/asm-mips/Kbuild)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/abi.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/abi.h</a> (renamed from include/asm-mips/abi.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/addrspace.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/addrspace.h</a> (renamed from include/asm-mips/addrspace.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/asm.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/asm.h</a> (renamed from include/asm-mips/asm.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/asmmacro-32.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/asmmacro-32.h</a> (renamed from include/asm-mips/asmmacro-32.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/asmmacro-64.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/asmmacro-64.h</a> (renamed from include/asm-mips/asmmacro-64.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/asmmacro.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/asmmacro.h</a> (renamed from include/asm-mips/asmmacro.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/atomic.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/atomic.h</a> (renamed from include/asm-mips/atomic.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/auxvec.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/auxvec.h</a> (renamed from include/asm-mips/auxvec.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/barrier.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/barrier.h</a> (renamed from include/asm-mips/barrier.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/bcache.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/bcache.h</a> (renamed from include/asm-mips/bcache.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/bitops.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/bitops.h</a> (renamed from include/asm-mips/bitops.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/bootinfo.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/bootinfo.h</a> (renamed from include/asm-mips/bootinfo.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/branch.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/branch.h</a> (renamed from include/asm-mips/branch.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/break.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/break.h</a> (renamed from include/asm-mips/break.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/bug.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/bug.h</a> (renamed from include/asm-mips/bug.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/bugs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/bugs.h</a> (renamed from include/asm-mips/bugs.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/byteorder.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/byteorder.h</a> (renamed from include/asm-mips/byteorder.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/cache.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/cache.h</a> (renamed from include/asm-mips/cache.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/cachectl.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/cachectl.h</a> (renamed from include/asm-mips/cachectl.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/cacheflush.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/cacheflush.h</a> (renamed from include/asm-mips/cacheflush.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/cacheops.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/cacheops.h</a> (renamed from include/asm-mips/cacheops.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/cevt-r4k.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/cevt-r4k.h</a> (renamed from include/asm-mips/cevt-r4k.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/checksum.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/checksum.h</a> (renamed from include/asm-mips/checksum.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/cmp.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/cmp.h</a> (renamed from include/asm-mips/cmp.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/cmpxchg.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/cmpxchg.h</a> (renamed from include/asm-mips/cmpxchg.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/compat-signal.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/compat-signal.h</a> (renamed from include/asm-mips/compat-signal.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/compat.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/compat.h</a> (renamed from include/asm-mips/compat.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/compiler.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/compiler.h</a> (renamed from include/asm-mips/compiler.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/cpu-features.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/cpu-features.h</a> (renamed from include/asm-mips/cpu-features.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/cpu-info.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/cpu-info.h</a> (renamed from include/asm-mips/cpu-info.h)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/cpu.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/cpu.h</a> (renamed from include/asm-mips/cpu.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/cputime.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/cputime.h</a> (renamed from include/asm-mips/cputime.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/current.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/current.h</a> (renamed from include/asm-mips/current.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/debug.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/debug.h</a> (renamed from include/asm-mips/debug.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/dec/ecc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/dec/ecc.h</a> (renamed from include/asm-mips/dec/ecc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/dec/interrupts.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/dec/interrupts.h</a> (renamed from include/asm-mips/dec/interrupts.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/dec/ioasic.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/dec/ioasic.h</a> (renamed from include/asm-mips/dec/ioasic.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/dec/ioasic_addrs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/dec/ioasic_addrs.h</a> (renamed from include/asm-mips/dec/ioasic_addrs.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/dec/ioasic_ints.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/dec/ioasic_ints.h</a> (renamed from include/asm-mips/dec/ioasic_ints.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/dec/kn01.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/dec/kn01.h</a> (renamed from include/asm-mips/dec/kn01.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/dec/kn02.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/dec/kn02.h</a> (renamed from include/asm-mips/dec/kn02.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/dec/kn02ba.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/dec/kn02ba.h</a> (renamed from include/asm-mips/dec/kn02ba.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/dec/kn02ca.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/dec/kn02ca.h</a> (renamed from include/asm-mips/dec/kn02ca.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/dec/kn02xa.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/dec/kn02xa.h</a> (renamed from include/asm-mips/dec/kn02xa.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/dec/kn03.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/dec/kn03.h</a> (renamed from include/asm-mips/dec/kn03.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/dec/kn05.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/dec/kn05.h</a> (renamed from include/asm-mips/dec/kn05.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/dec/kn230.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/dec/kn230.h</a> (renamed from include/asm-mips/dec/kn230.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/dec/machtype.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/dec/machtype.h</a> (renamed from include/asm-mips/dec/machtype.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/dec/prom.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/dec/prom.h</a> (renamed from include/asm-mips/dec/prom.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/dec/system.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/dec/system.h</a> (renamed from include/asm-mips/dec/system.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/delay.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/delay.h</a> (renamed from include/asm-mips/delay.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/device.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/device.h</a> (renamed from include/asm-mips/device.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/div64.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/div64.h</a> (renamed from include/asm-mips/div64.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/dma-mapping.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/dma-mapping.h</a> (renamed from include/asm-mips/dma-mapping.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/dma.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/dma.h</a> (renamed from include/asm-mips/dma.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/ds1286.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/ds1286.h</a> (renamed from include/asm-mips/ds1286.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/ds1287.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/ds1287.h</a> (renamed from include/asm-mips/ds1287.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/dsp.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/dsp.h</a> (renamed from include/asm-mips/dsp.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/edac.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/edac.h</a> (renamed from include/asm-mips/edac.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/elf.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/elf.h</a> (renamed from include/asm-mips/elf.h)</td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/emergency-restart.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/emergency-restart.h</a> (renamed from include/asm-mips/emergency-restart.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/emma2rh/emma2rh.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/emma2rh/emma2rh.h</a> (renamed from include/asm-mips/emma2rh/emma2rh.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/emma2rh/markeins.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/emma2rh/markeins.h</a> (renamed from include/asm-mips/emma2rh/markeins.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/errno.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/errno.h</a> (renamed from include/asm-mips/errno.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/fb.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/fb.h</a> (renamed from include/asm-mips/fb.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/fcntl.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/fcntl.h</a> (renamed from include/asm-mips/fcntl.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/fixmap.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/fixmap.h</a> (renamed from include/asm-mips/fixmap.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/floppy.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/floppy.h</a> (renamed from include/asm-mips/floppy.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/fpregdef.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/fpregdef.h</a> (renamed from include/asm-mips/fpregdef.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/fpu.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/fpu.h</a> (renamed from include/asm-mips/fpu.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/fpu_emulator.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/fpu_emulator.h</a> (renamed from include/asm-mips/fpu_emulator.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/futex.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/futex.h</a> (renamed from include/asm-mips/futex.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/fw/arc/hinv.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/fw/arc/hinv.h</a> (renamed from include/asm-mips/fw/arc/hinv.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/fw/arc/types.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/fw/arc/types.h</a> (renamed from include/asm-mips/fw/arc/types.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/fw/cfe/cfe_api.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/fw/cfe/cfe_api.h</a> (renamed from include/asm-mips/fw/cfe/cfe_api.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/fw/cfe/cfe_error.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/fw/cfe/cfe_error.h</a> (renamed from include/asm-mips/fw/cfe/cfe_error.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/gcmpregs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/gcmpregs.h</a> (renamed from include/asm-mips/gcmpregs.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/gic.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/gic.h</a> (renamed from include/asm-mips/gic.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/gpio.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/gpio.h</a> (renamed from include/asm-mips/gpio.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/gt64120.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/gt64120.h</a> (renamed from include/asm-mips/gt64120.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/hardirq.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/hardirq.h</a> (renamed from include/asm-mips/hardirq.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/hazards.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/hazards.h</a> (renamed from include/asm-mips/hazards.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/highmem.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/highmem.h</a> (renamed from include/asm-mips/highmem.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/hw_irq.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/hw_irq.h</a> (renamed from include/asm-mips/hw_irq.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/i8253.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/i8253.h</a> (renamed from include/asm-mips/i8253.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/i8259.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/i8259.h</a> (renamed from include/asm-mips/i8259.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/ide.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/ide.h</a> (renamed from include/asm-mips/ide.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/inst.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/inst.h</a> (renamed from include/asm-mips/inst.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/io.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/io.h</a> (renamed from include/asm-mips/io.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/ioctl.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/ioctl.h</a> (renamed from include/asm-mips/ioctl.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/ioctls.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/ioctls.h</a> (renamed from include/asm-mips/ioctls.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/ip32/crime.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/ip32/crime.h</a> (renamed from include/asm-mips/ip32/crime.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/ip32/ip32_ints.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/ip32/ip32_ints.h</a> (renamed from include/asm-mips/ip32/ip32_ints.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/ip32/mace.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/ip32/mace.h</a> (renamed from include/asm-mips/ip32/mace.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/ipcbuf.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/ipcbuf.h</a> (renamed from include/asm-mips/ipcbuf.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/irq.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/irq.h</a> (renamed from include/asm-mips/irq.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/irq_cpu.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/irq_cpu.h</a> (renamed from include/asm-mips/irq_cpu.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/irq_gt641xx.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/irq_gt641xx.h</a> (renamed from include/asm-mips/irq_gt641xx.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/irq_regs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/irq_regs.h</a> (renamed from include/asm-mips/irq_regs.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/irqflags.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/irqflags.h</a> (renamed from include/asm-mips/irqflags.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/isadep.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/isadep.h</a> (renamed from include/asm-mips/isadep.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/jazz.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/jazz.h</a> (renamed from include/asm-mips/jazz.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/jazzdma.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/jazzdma.h</a> (renamed from include/asm-mips/jazzdma.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/kdebug.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/kdebug.h</a> (renamed from include/asm-mips/kdebug.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/kexec.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/kexec.h</a> (renamed from include/asm-mips/kexec.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/kgdb.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/kgdb.h</a> (renamed from include/asm-mips/kgdb.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/kmap_types.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/kmap_types.h</a> (renamed from include/asm-mips/kmap_types.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/kspd.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/kspd.h</a> (renamed from include/asm-mips/kspd.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/lasat/ds1603.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/lasat/ds1603.h</a> (renamed from include/asm-mips/lasat/ds1603.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/lasat/eeprom.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/lasat/eeprom.h</a> (renamed from include/asm-mips/lasat/eeprom.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/lasat/head.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/lasat/head.h</a> (renamed from include/asm-mips/lasat/head.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/lasat/lasat.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/lasat/lasat.h</a> (renamed from include/asm-mips/lasat/lasat.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/lasat/lasatint.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/lasat/lasatint.h</a> (renamed from include/asm-mips/lasat/lasatint.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/lasat/picvue.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/lasat/picvue.h</a> (renamed from include/asm-mips/lasat/picvue.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/lasat/serial.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/lasat/serial.h</a> (renamed from include/asm-mips/lasat/serial.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/linkage.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/linkage.h</a> (renamed from include/asm-mips/linkage.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/local.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/local.h</a> (renamed from include/asm-mips/local.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/m48t35.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/m48t35.h</a> (renamed from include/asm-mips/m48t35.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/m48t37.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/m48t37.h</a> (renamed from include/asm-mips/m48t37.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-au1x00/au1000.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-au1x00/au1000.h</a> (renamed from include/asm-mips/mach-au1x00/au1000.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-au1x00/au1000_dma.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-au1x00/au1000_dma.h</a> (renamed from include/asm-mips/mach-au1x00/au1000_dma.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-au1x00/au1000_gpio.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-au1x00/au1000_gpio.h</a> (renamed from include/asm-mips/mach-au1x00/au1000_gpio.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-au1x00/au1100_mmc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-au1x00/au1100_mmc.h</a> (renamed from include/asm-mips/mach-au1x00/au1100_mmc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-au1x00/au1550_spi.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-au1x00/au1550_spi.h</a> (renamed from include/asm-mips/mach-au1x00/au1550_spi.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-au1x00/au1xxx.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-au1x00/au1xxx.h</a> (renamed from include/asm-mips/mach-au1x00/au1xxx.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-au1x00/au1xxx_dbdma.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-au1x00/au1xxx_dbdma.h</a> (renamed from include/asm-mips/mach-au1x00/au1xxx_dbdma.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-au1x00/au1xxx_ide.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-au1x00/au1xxx_ide.h</a> (renamed from include/asm-mips/mach-au1x00/au1xxx_ide.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-au1x00/au1xxx_psc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-au1x00/au1xxx_psc.h</a> (renamed from include/asm-mips/mach-au1x00/au1xxx_psc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-au1x00/gpio.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-au1x00/gpio.h</a> (renamed from include/asm-mips/mach-au1x00/gpio.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-au1x00/ioremap.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-au1x00/ioremap.h</a> (renamed from include/asm-mips/mach-au1x00/ioremap.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-au1x00/prom.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-au1x00/prom.h</a> (renamed from include/asm-mips/mach-au1x00/prom.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-au1x00/war.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-au1x00/war.h</a> (renamed from include/asm-mips/mach-au1x00/war.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-bcm47xx/bcm47xx.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-bcm47xx/bcm47xx.h</a> (renamed from include/asm-mips/mach-bcm47xx/bcm47xx.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-bcm47xx/gpio.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-bcm47xx/gpio.h</a> (renamed from include/asm-mips/mach-bcm47xx/gpio.h)</td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-bcm47xx/war.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-bcm47xx/war.h</a> (renamed from include/asm-mips/mach-bcm47xx/war.h)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-cobalt/cobalt.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-cobalt/cobalt.h</a> (renamed from include/asm-mips/mach-cobalt/cobalt.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-cobalt/cpu-feature-overrides.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-cobalt/cpu-feature-overrides.h</a> (renamed from include/asm-mips/mach-cobalt/cpu-feature-overrides.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-cobalt/irq.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-cobalt/irq.h</a> (renamed from include/asm-mips/mach-cobalt/irq.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-cobalt/mach-gt64120.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-cobalt/mach-gt64120.h</a> (renamed from include/asm-mips/mach-cobalt/mach-gt64120.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-cobalt/war.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-cobalt/war.h</a> (renamed from include/asm-mips/mach-cobalt/war.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-db1x00/db1200.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-db1x00/db1200.h</a> (renamed from include/asm-mips/mach-db1x00/db1200.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-db1x00/db1x00.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-db1x00/db1x00.h</a> (renamed from include/asm-mips/mach-db1x00/db1x00.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-dec/mc146818rtc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-dec/mc146818rtc.h</a> (renamed from include/asm-mips/mach-dec/mc146818rtc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-dec/war.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-dec/war.h</a> (renamed from include/asm-mips/mach-dec/war.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-emma2rh/irq.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-emma2rh/irq.h</a> (renamed from include/asm-mips/mach-emma2rh/irq.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-emma2rh/war.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-emma2rh/war.h</a> (renamed from include/asm-mips/mach-emma2rh/war.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-excite/cpu-feature-overrides.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-excite/cpu-feature-overrides.h</a> (renamed from include/asm-mips/mach-excite/cpu-feature-overrides.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-excite/excite.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-excite/excite.h</a> (renamed from include/asm-mips/mach-excite/excite.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-excite/excite_fpga.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-excite/excite_fpga.h</a> (renamed from include/asm-mips/mach-excite/excite_fpga.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-excite/excite_nandflash.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-excite/excite_nandflash.h</a> (renamed from include/asm-mips/mach-excite/excite_nandflash.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-excite/rm9k_eth.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-excite/rm9k_eth.h</a> (renamed from include/asm-mips/mach-excite/rm9k_eth.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-excite/rm9k_wdt.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-excite/rm9k_wdt.h</a> (renamed from include/asm-mips/mach-excite/rm9k_wdt.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-excite/rm9k_xicap.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-excite/rm9k_xicap.h</a> (renamed from include/asm-mips/mach-excite/rm9k_xicap.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-excite/war.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-excite/war.h</a> (renamed from include/asm-mips/mach-excite/war.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-generic/cpu-feature-overrides.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-generic/cpu-feature-overrides.h</a> (renamed from include/asm-mips/mach-generic/cpu-feature-overrides.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-generic/dma-coherence.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-generic/dma-coherence.h</a> (renamed from include/asm-mips/mach-generic/dma-coherence.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-generic/floppy.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-generic/floppy.h</a> (renamed from include/asm-mips/mach-generic/floppy.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-generic/gpio.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-generic/gpio.h</a> (renamed from include/asm-mips/mach-generic/gpio.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-generic/ide.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-generic/ide.h</a> (renamed from include/asm-mips/mach-generic/ide.h)</td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-generic/ioremap.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-generic/ioremap.h</a> (renamed from include/asm-mips/mach-generic/ioremap.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-generic/irq.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-generic/irq.h</a> (renamed from include/asm-mips/mach-generic/irq.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-generic/kernel-entry-init.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-generic/kernel-entry-init.h</a> (renamed from include/asm-mips/mach-generic/kernel-entry-init.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-generic/kmalloc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-generic/kmalloc.h</a> (renamed from include/asm-mips/mach-generic/kmalloc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-generic/mangle-port.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-generic/mangle-port.h</a> (renamed from include/asm-mips/mach-generic/mangle-port.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-generic/mc146818rtc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-generic/mc146818rtc.h</a> (renamed from include/asm-mips/mach-generic/mc146818rtc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-generic/spaces.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-generic/spaces.h</a> (renamed from include/asm-mips/mach-generic/spaces.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-generic/topology.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-generic/topology.h</a> (renamed from include/asm-mips/mach-generic/topology.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-ip22/cpu-feature-overrides.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-ip22/cpu-feature-overrides.h</a> (renamed from include/asm-mips/mach-ip22/cpu-feature-overrides.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-ip22/spaces.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-ip22/spaces.h</a> (renamed from include/asm-mips/mach-ip22/spaces.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-ip22/war.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-ip22/war.h</a> (renamed from include/asm-mips/mach-ip22/war.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-ip27/cpu-feature-overrides.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-ip27/cpu-feature-overrides.h</a> (renamed from include/asm-mips/mach-ip27/cpu-feature-overrides.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-ip27/dma-coherence.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-ip27/dma-coherence.h</a> (renamed from include/asm-mips/mach-ip27/dma-coherence.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-ip27/irq.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-ip27/irq.h</a> (renamed from include/asm-mips/mach-ip27/irq.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-ip27/kernel-entry-init.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-ip27/kernel-entry-init.h</a> (renamed from include/asm-mips/mach-ip27/kernel-entry-init.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-ip27/kmalloc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-ip27/kmalloc.h</a> (renamed from include/asm-mips/mach-ip27/kmalloc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-ip27/mangle-port.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-ip27/mangle-port.h</a> (renamed from include/asm-mips/mach-ip27/mangle-port.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-ip27/mmzone.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-ip27/mmzone.h</a> (renamed from include/asm-mips/mach-ip27/mmzone.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-ip27/spaces.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-ip27/spaces.h</a> (renamed from include/asm-mips/mach-ip27/spaces.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-ip27/topology.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-ip27/topology.h</a> (renamed from include/asm-mips/mach-ip27/topology.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-ip27/war.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-ip27/war.h</a> (renamed from include/asm-mips/mach-ip27/war.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-ip28/cpu-feature-overrides.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-ip28/cpu-feature-overrides.h</a> (renamed from include/asm-mips/mach-ip28/cpu-feature-overrides.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-ip28/spaces.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-ip28/spaces.h</a> (renamed from include/asm-mips/mach-ip28/spaces.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-ip28/war.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-ip28/war.h</a> (renamed from include/asm-mips/mach-ip28/war.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-ip32/cpu-feature-overrides.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-ip32/cpu-feature-overrides.h</a> (renamed from include/asm-mips/mach-ip32/cpu-feature-overrides.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-ip32/dma-coherence.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-ip32/dma-coherence.h</a> (renamed from include/asm-mips/mach-ip32/dma-coherence.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-ip32/kmalloc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-ip32/kmalloc.h</a> (renamed from include/asm-mips/mach-ip32/kmalloc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-ip32/mangle-port.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-ip32/mangle-port.h</a> (renamed from include/asm-mips/mach-ip32/mangle-port.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-ip32/mc146818rtc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-ip32/mc146818rtc.h</a> (renamed from include/asm-mips/mach-ip32/mc146818rtc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-ip32/war.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-ip32/war.h</a> (renamed from include/asm-mips/mach-ip32/war.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-jazz/dma-coherence.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-jazz/dma-coherence.h</a> (renamed from include/asm-mips/mach-jazz/dma-coherence.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-jazz/floppy.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-jazz/floppy.h</a> (renamed from include/asm-mips/mach-jazz/floppy.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-jazz/mc146818rtc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-jazz/mc146818rtc.h</a> (renamed from include/asm-mips/mach-jazz/mc146818rtc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-jazz/war.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-jazz/war.h</a> (renamed from include/asm-mips/mach-jazz/war.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-lasat/irq.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-lasat/irq.h</a> (renamed from include/asm-mips/mach-lasat/irq.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-lasat/mach-gt64120.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-lasat/mach-gt64120.h</a> (renamed from include/asm-mips/mach-lasat/mach-gt64120.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-lasat/war.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-lasat/war.h</a> (renamed from include/asm-mips/mach-lasat/war.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-lemote/dma-coherence.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-lemote/dma-coherence.h</a> (renamed from include/asm-mips/mach-lemote/dma-coherence.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-lemote/mc146818rtc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-lemote/mc146818rtc.h</a> (renamed from include/asm-mips/mach-lemote/mc146818rtc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-lemote/war.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-lemote/war.h</a> (renamed from include/asm-mips/mach-lemote/war.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-malta/cpu-feature-overrides.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-malta/cpu-feature-overrides.h</a> (renamed from include/asm-mips/mach-malta/cpu-feature-overrides.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-malta/irq.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-malta/irq.h</a> (renamed from include/asm-mips/mach-malta/irq.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-malta/kernel-entry-init.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-malta/kernel-entry-init.h</a> (renamed from include/asm-mips/mach-malta/kernel-entry-init.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-malta/mach-gt64120.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-malta/mach-gt64120.h</a> (renamed from include/asm-mips/mach-malta/mach-gt64120.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-malta/mc146818rtc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-malta/mc146818rtc.h</a> (renamed from include/asm-mips/mach-malta/mc146818rtc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-malta/war.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-malta/war.h</a> (renamed from include/asm-mips/mach-malta/war.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-mipssim/cpu-feature-overrides.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-mipssim/cpu-feature-overrides.h</a> (renamed from include/asm-mips/mach-mipssim/cpu-feature-overrides.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-mipssim/war.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-mipssim/war.h</a> (renamed from include/asm-mips/mach-mipssim/war.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-pb1x00/mc146818rtc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-pb1x00/mc146818rtc.h</a> (renamed from include/asm-mips/mach-pb1x00/mc146818rtc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-pb1x00/pb1000.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-pb1x00/pb1000.h</a> (renamed from include/asm-mips/mach-pb1x00/pb1000.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-pb1x00/pb1100.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-pb1x00/pb1100.h</a> (renamed from include/asm-mips/mach-pb1x00/pb1100.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-pb1x00/pb1200.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-pb1x00/pb1200.h</a> (renamed from include/asm-mips/mach-pb1x00/pb1200.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-pb1x00/pb1500.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-pb1x00/pb1500.h</a> (renamed from include/asm-mips/mach-pb1x00/pb1500.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-pb1x00/pb1550.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-pb1x00/pb1550.h</a> (renamed from include/asm-mips/mach-pb1x00/pb1550.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-pnx8550/cm.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-pnx8550/cm.h</a> (renamed from include/asm-mips/mach-pnx8550/cm.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-pnx8550/glb.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-pnx8550/glb.h</a> (renamed from include/asm-mips/mach-pnx8550/glb.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-pnx8550/int.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-pnx8550/int.h</a> (renamed from include/asm-mips/mach-pnx8550/int.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-pnx8550/kernel-entry-init.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-pnx8550/kernel-entry-init.h</a> (renamed from include/asm-mips/mach-pnx8550/kernel-entry-init.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-pnx8550/nand.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-pnx8550/nand.h</a> (renamed from include/asm-mips/mach-pnx8550/nand.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-pnx8550/pci.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-pnx8550/pci.h</a> (renamed from include/asm-mips/mach-pnx8550/pci.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-pnx8550/uart.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-pnx8550/uart.h</a> (renamed from include/asm-mips/mach-pnx8550/uart.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-pnx8550/usb.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-pnx8550/usb.h</a> (renamed from include/asm-mips/mach-pnx8550/usb.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-pnx8550/war.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-pnx8550/war.h</a> (renamed from include/asm-mips/mach-pnx8550/war.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-rc32434/cpu-feature-overrides.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-rc32434/cpu-feature-overrides.h</a> (renamed from include/asm-mips/mach-rc32434/cpu-feature-overrides.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-rc32434/ddr.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-rc32434/ddr.h</a> (renamed from include/asm-mips/mach-rc32434/ddr.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-rc32434/dma.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-rc32434/dma.h</a> (renamed from include/asm-mips/mach-rc32434/dma.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-rc32434/dma_v.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-rc32434/dma_v.h</a> (renamed from include/asm-mips/mach-rc32434/dma_v.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-rc32434/eth.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-rc32434/eth.h</a> (renamed from include/asm-mips/mach-rc32434/eth.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-rc32434/gpio.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-rc32434/gpio.h</a> (renamed from include/asm-mips/mach-rc32434/gpio.h)</td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-rc32434/integ.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-rc32434/integ.h</a> (renamed from include/asm-mips/mach-rc32434/integ.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-rc32434/irq.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-rc32434/irq.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-rc32434/pci.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-rc32434/pci.h</a> (renamed from include/asm-mips/mach-rc32434/pci.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-rc32434/prom.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-rc32434/prom.h</a> (renamed from include/asm-mips/mach-rc32434/prom.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-rc32434/rb.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-rc32434/rb.h</a> (renamed from include/asm-mips/mach-rc32434/rb.h)</td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-rc32434/rc32434.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-rc32434/rc32434.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-rc32434/timer.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-rc32434/timer.h</a> (renamed from include/asm-mips/mach-rc32434/timer.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-rc32434/war.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-rc32434/war.h</a> (renamed from include/asm-mips/mach-rc32434/war.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-rm/cpu-feature-overrides.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-rm/cpu-feature-overrides.h</a> (renamed from include/asm-mips/mach-rm/cpu-feature-overrides.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-rm/mc146818rtc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-rm/mc146818rtc.h</a> (renamed from include/asm-mips/mach-rm/mc146818rtc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-rm/war.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-rm/war.h</a> (renamed from include/asm-mips/mach-rm/war.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-sibyte/cpu-feature-overrides.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-sibyte/cpu-feature-overrides.h</a> (renamed from include/asm-mips/mach-sibyte/cpu-feature-overrides.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-sibyte/war.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-sibyte/war.h</a> (renamed from include/asm-mips/mach-sibyte/war.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-tx39xx/ioremap.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-tx39xx/ioremap.h</a> (renamed from include/asm-mips/mach-tx39xx/ioremap.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-tx39xx/mangle-port.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-tx39xx/mangle-port.h</a> (renamed from include/asm-mips/mach-tx39xx/mangle-port.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-tx39xx/war.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-tx39xx/war.h</a> (renamed from include/asm-mips/mach-tx39xx/war.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-tx49xx/cpu-feature-overrides.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-tx49xx/cpu-feature-overrides.h</a> (renamed from include/asm-mips/mach-tx49xx/cpu-feature-overrides.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-tx49xx/ioremap.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-tx49xx/ioremap.h</a> (renamed from include/asm-mips/mach-tx49xx/ioremap.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-tx49xx/kmalloc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-tx49xx/kmalloc.h</a> (renamed from include/asm-mips/mach-tx49xx/kmalloc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-tx49xx/war.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-tx49xx/war.h</a> (renamed from include/asm-mips/mach-tx49xx/war.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-vr41xx/irq.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-vr41xx/irq.h</a> (renamed from include/asm-mips/mach-vr41xx/irq.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-vr41xx/war.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-vr41xx/war.h</a> (renamed from include/asm-mips/mach-vr41xx/war.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-wrppmc/mach-gt64120.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-wrppmc/mach-gt64120.h</a> (renamed from include/asm-mips/mach-wrppmc/mach-gt64120.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-wrppmc/war.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-wrppmc/war.h</a> (renamed from include/asm-mips/mach-wrppmc/war.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-yosemite/cpu-feature-overrides.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-yosemite/cpu-feature-overrides.h</a> (renamed from include/asm-mips/mach-yosemite/cpu-feature-overrides.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mach-yosemite/war.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-yosemite/war.h</a> (renamed from include/asm-mips/mach-yosemite/war.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mc146818-time.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mc146818-time.h</a> (renamed from include/asm-mips/mc146818-time.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mc146818rtc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mc146818rtc.h</a> (renamed from include/asm-mips/mc146818rtc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mips-boards/bonito64.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mips-boards/bonito64.h</a> (renamed from include/asm-mips/mips-boards/bonito64.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mips-boards/generic.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mips-boards/generic.h</a> (renamed from include/asm-mips/mips-boards/generic.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mips-boards/launch.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mips-boards/launch.h</a> (renamed from include/asm-mips/mips-boards/launch.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mips-boards/malta.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mips-boards/malta.h</a> (renamed from include/asm-mips/mips-boards/malta.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mips-boards/maltaint.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mips-boards/maltaint.h</a> (renamed from include/asm-mips/mips-boards/maltaint.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mips-boards/msc01_pci.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mips-boards/msc01_pci.h</a> (renamed from include/asm-mips/mips-boards/msc01_pci.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mips-boards/piix4.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mips-boards/piix4.h</a> (renamed from include/asm-mips/mips-boards/piix4.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mips-boards/prom.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mips-boards/prom.h</a> (renamed from include/asm-mips/mips-boards/prom.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mips-boards/sim.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mips-boards/sim.h</a> (renamed from include/asm-mips/mips-boards/sim.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mips-boards/simint.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mips-boards/simint.h</a> (renamed from include/asm-mips/mips-boards/simint.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mips_mt.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mips_mt.h</a> (renamed from include/asm-mips/mips_mt.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mipsmtregs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mipsmtregs.h</a> (renamed from include/asm-mips/mipsmtregs.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mipsprom.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mipsprom.h</a> (renamed from include/asm-mips/mipsprom.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mipsregs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mipsregs.h</a> (renamed from include/asm-mips/mipsregs.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mman.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mman.h</a> (renamed from include/asm-mips/mman.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mmu.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mmu.h</a> (renamed from include/asm-mips/mmu.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mmu_context.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mmu_context.h</a> (renamed from include/asm-mips/mmu_context.h)</td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mmzone.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mmzone.h</a> (renamed from include/asm-mips/mmzone.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/module.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/module.h</a> (renamed from include/asm-mips/module.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/msc01_ic.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/msc01_ic.h</a> (renamed from include/asm-mips/msc01_ic.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/msgbuf.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/msgbuf.h</a> (renamed from include/asm-mips/msgbuf.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/mutex.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mutex.h</a> (renamed from include/asm-mips/mutex.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/nile4.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/nile4.h</a> (renamed from include/asm-mips/nile4.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/paccess.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/paccess.h</a> (renamed from include/asm-mips/paccess.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/page.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/page.h</a> (renamed from include/asm-mips/page.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/param.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/param.h</a> (renamed from include/asm-mips/param.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/parport.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/parport.h</a> (renamed from include/asm-mips/parport.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/pci.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/pci.h</a> (renamed from include/asm-mips/pci.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/pci/bridge.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/pci/bridge.h</a> (renamed from include/asm-mips/pci/bridge.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/percpu.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/percpu.h</a> (renamed from include/asm-mips/percpu.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/pgalloc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/pgalloc.h</a> (renamed from include/asm-mips/pgalloc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/pgtable-32.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/pgtable-32.h</a> (renamed from include/asm-mips/pgtable-32.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/pgtable-64.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/pgtable-64.h</a> (renamed from include/asm-mips/pgtable-64.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/pgtable-bits.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/pgtable-bits.h</a> (renamed from include/asm-mips/pgtable-bits.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/pgtable.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/pgtable.h</a> (renamed from include/asm-mips/pgtable.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/pmc-sierra/msp71xx/gpio.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/pmc-sierra/msp71xx/gpio.h</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/pmc-sierra/msp71xx/msp_cic_int.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/pmc-sierra/msp71xx/msp_cic_int.h</a> (renamed from include/asm-mips/pmc-sierra/msp71xx/msp_cic_int.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/pmc-sierra/msp71xx/msp_int.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/pmc-sierra/msp71xx/msp_int.h</a> (renamed from include/asm-mips/pmc-sierra/msp71xx/msp_int.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/pmc-sierra/msp71xx/msp_pci.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/pmc-sierra/msp71xx/msp_pci.h</a> (renamed from include/asm-mips/pmc-sierra/msp71xx/msp_pci.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/pmc-sierra/msp71xx/msp_prom.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/pmc-sierra/msp71xx/msp_prom.h</a> (renamed from include/asm-mips/pmc-sierra/msp71xx/msp_prom.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/pmc-sierra/msp71xx/msp_regops.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/pmc-sierra/msp71xx/msp_regops.h</a> (renamed from include/asm-mips/pmc-sierra/msp71xx/msp_regops.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/pmc-sierra/msp71xx/msp_regs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/pmc-sierra/msp71xx/msp_regs.h</a> (renamed from include/asm-mips/pmc-sierra/msp71xx/msp_regs.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/pmc-sierra/msp71xx/msp_slp_int.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/pmc-sierra/msp71xx/msp_slp_int.h</a> (renamed from include/asm-mips/pmc-sierra/msp71xx/msp_slp_int.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/pmc-sierra/msp71xx/war.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/pmc-sierra/msp71xx/war.h</a> (renamed from include/asm-mips/pmc-sierra/msp71xx/war.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/pmon.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/pmon.h</a> (renamed from include/asm-mips/pmon.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/poll.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/poll.h</a> (renamed from include/asm-mips/poll.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/posix_types.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/posix_types.h</a> (renamed from include/asm-mips/posix_types.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/prefetch.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/prefetch.h</a> (renamed from include/asm-mips/prefetch.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/processor.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/processor.h</a> (renamed from include/asm-mips/processor.h)</td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/ptrace.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/ptrace.h</a> (renamed from include/asm-mips/ptrace.h)</td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/r4k-timer.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/r4k-timer.h</a> (renamed from include/asm-mips/r4k-timer.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/r4kcache.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/r4kcache.h</a> (renamed from include/asm-mips/r4kcache.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/reboot.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/reboot.h</a> (renamed from include/asm-mips/reboot.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/reg.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/reg.h</a> (renamed from include/asm-mips/reg.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/regdef.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/regdef.h</a> (renamed from include/asm-mips/regdef.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/resource.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/resource.h</a> (renamed from include/asm-mips/resource.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/rm9k-ocd.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/rm9k-ocd.h</a> (renamed from include/asm-mips/rm9k-ocd.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/rtlx.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/rtlx.h</a> (renamed from include/asm-mips/rtlx.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/scatterlist.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/scatterlist.h</a> (renamed from include/asm-mips/scatterlist.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/seccomp.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/seccomp.h</a> (renamed from include/asm-mips/seccomp.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/sections.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sections.h</a> (renamed from include/asm-mips/sections.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/segment.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/segment.h</a> (renamed from include/asm-mips/segment.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/sembuf.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sembuf.h</a> (renamed from include/asm-mips/sembuf.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/serial.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/serial.h</a> (renamed from include/asm-mips/serial.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/setup.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/setup.h</a> (renamed from include/asm-mips/setup.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/sgi/gio.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sgi/gio.h</a> (renamed from include/asm-mips/sgi/gio.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/sgi/hpc3.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sgi/hpc3.h</a> (renamed from include/asm-mips/sgi/hpc3.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/sgi/ioc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sgi/ioc.h</a> (renamed from include/asm-mips/sgi/ioc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/sgi/ip22.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sgi/ip22.h</a> (renamed from include/asm-mips/sgi/ip22.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/sgi/mc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sgi/mc.h</a> (renamed from include/asm-mips/sgi/mc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/sgi/pi1.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sgi/pi1.h</a> (renamed from include/asm-mips/sgi/pi1.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/sgi/seeq.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sgi/seeq.h</a> (renamed from include/asm-mips/sgi/seeq.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/sgi/sgi.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sgi/sgi.h</a> (renamed from include/asm-mips/sgi/sgi.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/sgi/wd.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sgi/wd.h</a> (renamed from include/asm-mips/sgi/wd.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/sgialib.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sgialib.h</a> (renamed from include/asm-mips/sgialib.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/sgiarcs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sgiarcs.h</a> (renamed from include/asm-mips/sgiarcs.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/sgidefs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sgidefs.h</a> (renamed from include/asm-mips/sgidefs.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/shmbuf.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/shmbuf.h</a> (renamed from include/asm-mips/shmbuf.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/shmparam.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/shmparam.h</a> (renamed from include/asm-mips/shmparam.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/sibyte/bcm1480_int.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sibyte/bcm1480_int.h</a> (renamed from include/asm-mips/sibyte/bcm1480_int.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/sibyte/bcm1480_l2c.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sibyte/bcm1480_l2c.h</a> (renamed from include/asm-mips/sibyte/bcm1480_l2c.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/sibyte/bcm1480_mc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sibyte/bcm1480_mc.h</a> (renamed from include/asm-mips/sibyte/bcm1480_mc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/sibyte/bcm1480_regs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sibyte/bcm1480_regs.h</a> (renamed from include/asm-mips/sibyte/bcm1480_regs.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/sibyte/bcm1480_scd.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sibyte/bcm1480_scd.h</a> (renamed from include/asm-mips/sibyte/bcm1480_scd.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/sibyte/bigsur.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sibyte/bigsur.h</a> (renamed from include/asm-mips/sibyte/bigsur.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/sibyte/board.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sibyte/board.h</a> (renamed from include/asm-mips/sibyte/board.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/sibyte/carmel.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sibyte/carmel.h</a> (renamed from include/asm-mips/sibyte/carmel.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/sibyte/sb1250.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sibyte/sb1250.h</a> (renamed from include/asm-mips/sibyte/sb1250.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/sibyte/sb1250_defs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sibyte/sb1250_defs.h</a> (renamed from include/asm-mips/sibyte/sb1250_defs.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/sibyte/sb1250_dma.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sibyte/sb1250_dma.h</a> (renamed from include/asm-mips/sibyte/sb1250_dma.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/sibyte/sb1250_genbus.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sibyte/sb1250_genbus.h</a> (renamed from include/asm-mips/sibyte/sb1250_genbus.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/sibyte/sb1250_int.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sibyte/sb1250_int.h</a> (renamed from include/asm-mips/sibyte/sb1250_int.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/sibyte/sb1250_l2c.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sibyte/sb1250_l2c.h</a> (renamed from include/asm-mips/sibyte/sb1250_l2c.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/sibyte/sb1250_ldt.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sibyte/sb1250_ldt.h</a> (renamed from include/asm-mips/sibyte/sb1250_ldt.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/sibyte/sb1250_mac.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sibyte/sb1250_mac.h</a> (renamed from include/asm-mips/sibyte/sb1250_mac.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/sibyte/sb1250_mc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sibyte/sb1250_mc.h</a> (renamed from include/asm-mips/sibyte/sb1250_mc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/sibyte/sb1250_regs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sibyte/sb1250_regs.h</a> (renamed from include/asm-mips/sibyte/sb1250_regs.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/sibyte/sb1250_scd.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sibyte/sb1250_scd.h</a> (renamed from include/asm-mips/sibyte/sb1250_scd.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/sibyte/sb1250_smbus.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sibyte/sb1250_smbus.h</a> (renamed from include/asm-mips/sibyte/sb1250_smbus.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/sibyte/sb1250_syncser.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sibyte/sb1250_syncser.h</a> (renamed from include/asm-mips/sibyte/sb1250_syncser.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/sibyte/sb1250_uart.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sibyte/sb1250_uart.h</a> (renamed from include/asm-mips/sibyte/sb1250_uart.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/sibyte/sentosa.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sibyte/sentosa.h</a> (renamed from include/asm-mips/sibyte/sentosa.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/sibyte/swarm.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sibyte/swarm.h</a> (renamed from include/asm-mips/sibyte/swarm.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/sigcontext.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sigcontext.h</a> (renamed from include/asm-mips/sigcontext.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/siginfo.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/siginfo.h</a> (renamed from include/asm-mips/siginfo.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/signal.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/signal.h</a> (renamed from include/asm-mips/signal.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/sim.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sim.h</a> (renamed from include/asm-mips/sim.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/smp-ops.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/smp-ops.h</a> (renamed from include/asm-mips/smp-ops.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/smp.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/smp.h</a> (renamed from include/asm-mips/smp.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/smtc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/smtc.h</a> (renamed from include/asm-mips/smtc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/smtc_ipi.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/smtc_ipi.h</a> (renamed from include/asm-mips/smtc_ipi.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/smtc_proc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/smtc_proc.h</a> (renamed from include/asm-mips/smtc_proc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/smvp.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/smvp.h</a> (renamed from include/asm-mips/smvp.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/sn/addrs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sn/addrs.h</a> (renamed from include/asm-mips/sn/addrs.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/sn/agent.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sn/agent.h</a> (renamed from include/asm-mips/sn/agent.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/sn/arch.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sn/arch.h</a> (renamed from include/asm-mips/sn/arch.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/sn/fru.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sn/fru.h</a> (renamed from include/asm-mips/sn/fru.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/sn/gda.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sn/gda.h</a> (renamed from include/asm-mips/sn/gda.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/sn/hub.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sn/hub.h</a> (renamed from include/asm-mips/sn/hub.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/sn/intr.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sn/intr.h</a> (renamed from include/asm-mips/sn/intr.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/sn/io.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sn/io.h</a> (renamed from include/asm-mips/sn/io.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/sn/ioc3.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sn/ioc3.h</a> (renamed from include/asm-mips/sn/ioc3.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/sn/klconfig.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sn/klconfig.h</a> (renamed from include/asm-mips/sn/klconfig.h)</td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/sn/kldir.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sn/kldir.h</a> (renamed from include/asm-mips/sn/kldir.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/sn/klkernvars.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sn/klkernvars.h</a> (renamed from include/asm-mips/sn/klkernvars.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/sn/launch.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sn/launch.h</a> (renamed from include/asm-mips/sn/launch.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/sn/mapped_kernel.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sn/mapped_kernel.h</a> (renamed from include/asm-mips/sn/mapped_kernel.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/sn/nmi.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sn/nmi.h</a> (renamed from include/asm-mips/sn/nmi.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/sn/sn0/addrs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sn/sn0/addrs.h</a> (renamed from include/asm-mips/sn/sn0/addrs.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/sn/sn0/arch.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sn/sn0/arch.h</a> (renamed from include/asm-mips/sn/sn0/arch.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/sn/sn0/hub.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sn/sn0/hub.h</a> (renamed from include/asm-mips/sn/sn0/hub.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/sn/sn0/hubio.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sn/sn0/hubio.h</a> (renamed from include/asm-mips/sn/sn0/hubio.h)</td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/sn/sn0/hubmd.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sn/sn0/hubmd.h</a> (renamed from include/asm-mips/sn/sn0/hubmd.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/sn/sn0/hubni.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sn/sn0/hubni.h</a> (renamed from include/asm-mips/sn/sn0/hubni.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/sn/sn0/hubpi.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sn/sn0/hubpi.h</a> (renamed from include/asm-mips/sn/sn0/hubpi.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/sn/sn0/ip27.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sn/sn0/ip27.h</a> (renamed from include/asm-mips/sn/sn0/ip27.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/sn/sn_private.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sn/sn_private.h</a> (renamed from include/asm-mips/sn/sn_private.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/sn/types.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sn/types.h</a> (renamed from include/asm-mips/sn/types.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/sni.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sni.h</a> (renamed from include/asm-mips/sni.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/socket.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/socket.h</a> (renamed from include/asm-mips/socket.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/sockios.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sockios.h</a> (renamed from include/asm-mips/sockios.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/sparsemem.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sparsemem.h</a> (renamed from include/asm-mips/sparsemem.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/spinlock.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/spinlock.h</a> (renamed from include/asm-mips/spinlock.h)</td><td class='right'>253</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/spinlock_types.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/spinlock_types.h</a> (renamed from include/asm-mips/spinlock_types.h)</td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/stackframe.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/stackframe.h</a> (renamed from include/asm-mips/stackframe.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/stacktrace.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/stacktrace.h</a> (renamed from include/asm-mips/stacktrace.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/stat.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/stat.h</a> (renamed from include/asm-mips/stat.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/statfs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/statfs.h</a> (renamed from include/asm-mips/statfs.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/string.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/string.h</a> (renamed from include/asm-mips/string.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/suspend.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/suspend.h</a> (renamed from include/asm-mips/suspend.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/sysmips.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sysmips.h</a> (renamed from include/asm-mips/sysmips.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/system.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/system.h</a> (renamed from include/asm-mips/system.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/termbits.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/termbits.h</a> (renamed from include/asm-mips/termbits.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/termios.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/termios.h</a> (renamed from include/asm-mips/termios.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/thread_info.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/thread_info.h</a> (renamed from include/asm-mips/thread_info.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/time.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/time.h</a> (renamed from include/asm-mips/time.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/timex.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/timex.h</a> (renamed from include/asm-mips/timex.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/titan_dep.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/titan_dep.h</a> (renamed from include/asm-mips/titan_dep.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/tlb.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/tlb.h</a> (renamed from include/asm-mips/tlb.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/tlbdebug.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/tlbdebug.h</a> (renamed from include/asm-mips/tlbdebug.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/tlbflush.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/tlbflush.h</a> (renamed from include/asm-mips/tlbflush.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/topology.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/topology.h</a> (renamed from include/asm-mips/topology.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/traps.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/traps.h</a> (renamed from include/asm-mips/traps.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/txx9/boards.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/txx9/boards.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/txx9/generic.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/txx9/generic.h</a> (renamed from include/asm-mips/txx9/generic.h)</td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/txx9/jmr3927.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/txx9/jmr3927.h</a> (renamed from include/asm-mips/txx9/jmr3927.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/txx9/pci.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/txx9/pci.h</a> (renamed from include/asm-mips/txx9/pci.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/txx9/rbtx4927.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/txx9/rbtx4927.h</a> (renamed from include/asm-mips/txx9/rbtx4927.h)</td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/txx9/rbtx4938.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/txx9/rbtx4938.h</a> (renamed from include/asm-mips/txx9/rbtx4938.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/txx9/rbtx4939.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/txx9/rbtx4939.h</a></td><td class='right'>133</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/txx9/smsc_fdc37m81x.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/txx9/smsc_fdc37m81x.h</a> (renamed from include/asm-mips/txx9/smsc_fdc37m81x.h)</td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/txx9/spi.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/txx9/spi.h</a> (renamed from include/asm-mips/txx9/spi.h)</td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/txx9/tx3927.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/txx9/tx3927.h</a> (renamed from include/asm-mips/txx9/tx3927.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/txx9/tx4927.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/txx9/tx4927.h</a> (renamed from include/asm-mips/txx9/tx4927.h)</td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/txx9/tx4927pcic.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/txx9/tx4927pcic.h</a> (renamed from include/asm-mips/txx9/tx4927pcic.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/txx9/tx4938.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/txx9/tx4938.h</a> (renamed from include/asm-mips/txx9/tx4938.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/txx9/tx4939.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/txx9/tx4939.h</a></td><td class='right'>545</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/txx9irq.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/txx9irq.h</a> (renamed from include/asm-mips/txx9irq.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/txx9pio.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/txx9pio.h</a> (renamed from include/asm-mips/txx9pio.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/txx9tmr.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/txx9tmr.h</a> (renamed from include/asm-mips/txx9tmr.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/types.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/types.h</a> (renamed from include/asm-mips/types.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/uaccess.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/uaccess.h</a> (renamed from include/asm-mips/uaccess.h)</td><td class='right'>272</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/ucontext.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/ucontext.h</a> (renamed from include/asm-mips/ucontext.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/unaligned.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/unaligned.h</a> (renamed from include/asm-mips/unaligned.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/unistd.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/unistd.h</a> (renamed from include/asm-mips/unistd.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/user.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/user.h</a> (renamed from include/asm-mips/user.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/vga.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/vga.h</a> (renamed from include/asm-mips/vga.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/vpe.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/vpe.h</a> (renamed from include/asm-mips/vpe.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/vr41xx/capcella.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/vr41xx/capcella.h</a> (renamed from include/asm-mips/vr41xx/capcella.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/vr41xx/giu.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/vr41xx/giu.h</a> (renamed from include/asm-mips/vr41xx/giu.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/vr41xx/irq.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/vr41xx/irq.h</a> (renamed from include/asm-mips/vr41xx/irq.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/vr41xx/mpc30x.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/vr41xx/mpc30x.h</a> (renamed from include/asm-mips/vr41xx/mpc30x.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/vr41xx/pci.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/vr41xx/pci.h</a> (renamed from include/asm-mips/vr41xx/pci.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/vr41xx/siu.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/vr41xx/siu.h</a> (renamed from include/asm-mips/vr41xx/siu.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/vr41xx/tb0219.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/vr41xx/tb0219.h</a> (renamed from include/asm-mips/vr41xx/tb0219.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/vr41xx/tb0226.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/vr41xx/tb0226.h</a> (renamed from include/asm-mips/vr41xx/tb0226.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/vr41xx/tb0287.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/vr41xx/tb0287.h</a> (renamed from include/asm-mips/vr41xx/tb0287.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/vr41xx/vr41xx.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/vr41xx/vr41xx.h</a> (renamed from include/asm-mips/vr41xx/vr41xx.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/war.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/war.h</a> (renamed from include/asm-mips/war.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/watch.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/watch.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/wbflush.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/wbflush.h</a> (renamed from include/asm-mips/wbflush.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/xor.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/xor.h</a> (renamed from include/asm-mips/xor.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/xtalk/xtalk.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/xtalk/xtalk.h</a> (renamed from include/asm-mips/xtalk/xtalk.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/include/asm/xtalk/xwidget.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/xtalk/xwidget.h</a> (renamed from include/asm-mips/xtalk/xwidget.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/kernel/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/kernel/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/kernel/cpu-probe.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/kernel/cpu-probe.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/kernel/genex.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/kernel/genex.S</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/kernel/linux32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/kernel/linux32.c</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/kernel/proc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/kernel/proc.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/kernel/process.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/kernel/process.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/kernel/ptrace.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/kernel/ptrace.c</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/kernel/ptrace32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/kernel/ptrace32.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/kernel/rtlx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/kernel/rtlx.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/kernel/scall64-n32.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/kernel/scall64-n32.S</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/kernel/scall64-o32.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/kernel/scall64-o32.S</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/kernel/signal32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/kernel/signal32.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/kernel/smp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/kernel/smp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/kernel/syscall.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/kernel/syscall.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/kernel/traps.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/kernel/traps.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/kernel/vmlinux.lds.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/kernel/vmlinux.lds.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/kernel/watch.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/kernel/watch.c</a></td><td class='right'>188</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/lasat/sysctl.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/lasat/sysctl.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/lib/csum_partial.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/lib/csum_partial.S</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/pci/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/pci/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/pci/fixup-emma2rh.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/pci/fixup-emma2rh.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/pci/ops-pnx8550.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/pci/ops-pnx8550.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/pci/pci-emma2rh.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/pci/pci-emma2rh.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/pci/pci-tx4938.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/pci/pci-tx4938.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/pci/pci-tx4939.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/pci/pci-tx4939.c</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/pci/pci.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/pci/pci.c</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/pmc-sierra/msp71xx/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/pmc-sierra/msp71xx/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/pmc-sierra/msp71xx/gpio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/pmc-sierra/msp71xx/gpio.c</a></td><td class='right'>218</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/pmc-sierra/msp71xx/gpio_extended.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/pmc-sierra/msp71xx/gpio_extended.c</a></td><td class='right'>148</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/rb532/devices.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/rb532/devices.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/rb532/gpio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/rb532/gpio.c</a></td><td class='right'>238</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/rb532/irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/rb532/irq.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/rb532/prom.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/rb532/prom.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/rb532/serial.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/rb532/serial.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/rb532/setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/rb532/setup.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/rb532/time.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/rb532/time.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/sgi-ip22/ip22-platform.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/sgi-ip22/ip22-platform.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/sgi-ip22/ip22-setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/sgi-ip22/ip22-setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/sgi-ip22/ip22-time.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/sgi-ip22/ip22-time.c</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/sgi-ip27/ip27-timer.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/sgi-ip27/ip27-timer.c</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/sgi-ip32/ip32-platform.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/sgi-ip32/ip32-platform.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/sgi-ip32/ip32-setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/sgi-ip32/ip32-setup.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/sibyte/common/sb_tbprof.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/sibyte/common/sb_tbprof.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/txx9/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/txx9/Kconfig</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/txx9/generic/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/txx9/generic/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/txx9/generic/irq_tx4927.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/txx9/generic/irq_tx4927.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/txx9/generic/irq_tx4938.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/txx9/generic/irq_tx4938.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/txx9/generic/irq_tx4939.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/txx9/generic/irq_tx4939.c</a></td><td class='right'>215</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/txx9/generic/setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/txx9/generic/setup.c</a></td><td class='right'>431</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/txx9/generic/setup_tx3927.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/txx9/generic/setup_tx3927.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/txx9/generic/setup_tx4927.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/txx9/generic/setup_tx4927.c</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/txx9/generic/setup_tx4938.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/txx9/generic/setup_tx4938.c</a></td><td class='right'>122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/txx9/generic/setup_tx4939.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/txx9/generic/setup_tx4939.c</a></td><td class='right'>506</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/txx9/generic/spi_eeprom.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/txx9/generic/spi_eeprom.c</a> (renamed from arch/mips/txx9/rbtx4938/spi_eeprom.c)</td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/txx9/jmr3927/prom.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/txx9/jmr3927/prom.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/txx9/jmr3927/setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/txx9/jmr3927/setup.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/txx9/rbtx4927/irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/txx9/rbtx4927/irq.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/txx9/rbtx4927/prom.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/txx9/rbtx4927/prom.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/txx9/rbtx4927/setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/txx9/rbtx4927/setup.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/txx9/rbtx4938/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/txx9/rbtx4938/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/txx9/rbtx4938/irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/txx9/rbtx4938/irq.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/txx9/rbtx4938/prom.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/txx9/rbtx4938/prom.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/txx9/rbtx4938/setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/txx9/rbtx4938/setup.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/txx9/rbtx4939/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/txx9/rbtx4939/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/txx9/rbtx4939/irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/txx9/rbtx4939/irq.c</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/txx9/rbtx4939/prom.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/txx9/rbtx4939/prom.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mips/txx9/rbtx4939/setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/txx9/rbtx4939/setup.c</a></td><td class='right'>307</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/mn10300/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mn10300/Kconfig</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/parisc/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/parisc/Kconfig</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/parisc/kernel/binfmt_elf32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/parisc/kernel/binfmt_elf32.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/parisc/kernel/sys_parisc32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/parisc/kernel/sys_parisc32.c</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/parisc/kernel/syscall_table.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/parisc/kernel/syscall_table.S</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/Kconfig</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/Kconfig.debug?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/Kconfig.debug</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/Makefile</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/boot/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/boot/addnote.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/addnote.c</a></td><td class='right'>144</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/boot/dtc-src/Makefile.dtc?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dtc-src/Makefile.dtc</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/boot/dtc-src/checks.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dtc-src/checks.c</a></td><td class='right'>305</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/boot/dtc-src/data.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dtc-src/data.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/boot/dtc-src/dtc-lexer.l?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dtc-src/dtc-lexer.l</a></td><td class='right'>120</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/boot/dtc-src/dtc-lexer.lex.c_shipped?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dtc-src/dtc-lexer.lex.c_shipped</a></td><td class='right'>445</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/boot/dtc-src/dtc-parser.tab.c_shipped?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dtc-src/dtc-parser.tab.c_shipped</a></td><td class='right'>387</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/boot/dtc-src/dtc-parser.tab.h_shipped?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dtc-src/dtc-parser.tab.h_shipped</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/boot/dtc-src/dtc-parser.y?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dtc-src/dtc-parser.y</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/boot/dtc-src/dtc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dtc-src/dtc.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/boot/dtc-src/dtc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dtc-src/dtc.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/boot/dtc-src/flattree.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dtc-src/flattree.c</a></td><td class='right'>232</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/boot/dtc-src/fstree.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dtc-src/fstree.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/boot/dtc-src/libfdt_env.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dtc-src/libfdt_env.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/boot/dtc-src/livetree.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dtc-src/livetree.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/boot/dtc-src/srcpos.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dtc-src/srcpos.c</a></td><td class='right'>121</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/boot/dtc-src/srcpos.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dtc-src/srcpos.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/boot/dtc-src/treesource.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dtc-src/treesource.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/boot/dtc-src/version_gen.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dtc-src/version_gen.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/boot/dts/arches.dts?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dts/arches.dts</a></td><td class='right'>293</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/boot/dts/asp834x-redboot.dts?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dts/asp834x-redboot.dts</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/boot/dts/gef_sbc610.dts?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dts/gef_sbc610.dts</a></td><td class='right'>293</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/boot/dts/glacier.dts?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dts/glacier.dts</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/boot/dts/mgcoge.dts?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dts/mgcoge.dts</a></td><td class='right'>174</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/boot/dts/mgsuvd.dts?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dts/mgsuvd.dts</a></td><td class='right'>163</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/boot/dts/mpc5121ads.dts?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dts/mpc5121ads.dts</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/boot/dts/mpc8313erdb.dts?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dts/mpc8313erdb.dts</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/boot/dts/mpc8315erdb.dts?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dts/mpc8315erdb.dts</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/boot/dts/mpc832x_mds.dts?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dts/mpc832x_mds.dts</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/boot/dts/mpc832x_rdb.dts?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dts/mpc832x_rdb.dts</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/boot/dts/mpc8349emitx.dts?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dts/mpc8349emitx.dts</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/boot/dts/mpc8349emitxgp.dts?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dts/mpc8349emitxgp.dts</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/boot/dts/mpc834x_mds.dts?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dts/mpc834x_mds.dts</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/boot/dts/mpc836x_mds.dts?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dts/mpc836x_mds.dts</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/boot/dts/mpc836x_rdk.dts?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dts/mpc836x_rdk.dts</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/boot/dts/mpc8377_mds.dts?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dts/mpc8377_mds.dts</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/boot/dts/mpc8377_rdb.dts?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dts/mpc8377_rdb.dts</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/boot/dts/mpc8378_mds.dts?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dts/mpc8378_mds.dts</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/boot/dts/mpc8378_rdb.dts?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dts/mpc8378_rdb.dts</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/boot/dts/mpc8379_mds.dts?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dts/mpc8379_mds.dts</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/boot/dts/mpc8379_rdb.dts?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dts/mpc8379_rdb.dts</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/boot/dts/mpc8536ds.dts?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dts/mpc8536ds.dts</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/boot/dts/mpc8610_hpcd.dts?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dts/mpc8610_hpcd.dts</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/boot/dts/sbc8349.dts?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dts/sbc8349.dts</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/boot/dts/sequoia.dts?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dts/sequoia.dts</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/boot/dts/yosemite.dts?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dts/yosemite.dts</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/boot/elf_util.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/elf_util.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/boot/libfdt/Makefile.libfdt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/libfdt/Makefile.libfdt</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/boot/libfdt/fdt.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/libfdt/fdt.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/boot/libfdt/fdt_ro.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/libfdt/fdt_ro.c</a></td><td class='right'>329</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/boot/libfdt/fdt_rw.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/libfdt/fdt_rw.c</a></td><td class='right'>200</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/boot/libfdt/fdt_strerror.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/libfdt/fdt_strerror.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/boot/libfdt/fdt_sw.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/libfdt/fdt_sw.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/boot/libfdt/fdt_wip.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/libfdt/fdt_wip.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/boot/libfdt/libfdt.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/libfdt/libfdt.h</a></td><td class='right'>383</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/boot/libfdt/libfdt_internal.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/libfdt/libfdt_internal.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/boot/libfdt_env.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/libfdt_env.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/boot/wrapper?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/wrapper</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/configs/44x/arches_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/configs/44x/arches_defconfig</a></td><td class='right'>767</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/configs/83xx/asp8347_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/configs/83xx/asp8347_defconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/configs/83xx/mpc8313_rdb_defconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/configs/83xx/mpc8315_rdb_defconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/configs/83xx/mpc832x_mds_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/configs/83xx/mpc832x_mds_defconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/configs/83xx/mpc832x_rdb_defconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/configs/83xx/mpc834x_itx_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/configs/83xx/mpc834x_itx_defconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/configs/83xx/mpc834x_mds_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/configs/83xx/mpc834x_mds_defconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/configs/83xx/mpc836x_mds_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/configs/83xx/mpc836x_mds_defconfig</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/configs/83xx/mpc836x_rdk_defconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/configs/83xx/mpc837x_mds_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/configs/83xx/mpc837x_mds_defconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/configs/83xx/mpc837x_rdb_defconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/configs/83xx/sbc834x_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/configs/83xx/sbc834x_defconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/configs/86xx/gef_sbc610_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/configs/86xx/gef_sbc610_defconfig</a></td><td class='right'>1657</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 16.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 83.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig</a> (renamed from arch/powerpc/configs/mpc8610_hpcd_defconfig)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig</a> (renamed from arch/powerpc/configs/mpc8641_hpcn_defconfig)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/configs/86xx/sbc8641d_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/configs/86xx/sbc8641d_defconfig</a> (renamed from arch/powerpc/configs/sbc8641d_defconfig)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/configs/ep8248e_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/configs/ep8248e_defconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/configs/mgcoge_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/configs/mgcoge_defconfig</a></td><td class='right'>900</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/configs/mgsuvd_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/configs/mgsuvd_defconfig</a></td><td class='right'>872</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/configs/mpc8272_ads_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/configs/mpc8272_ads_defconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/configs/mpc83xx_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/configs/mpc83xx_defconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/configs/mpc86xx_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/configs/mpc86xx_defconfig</a></td><td class='right'>1646</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 16.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 83.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/configs/pq2fads_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/configs/pq2fads_defconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/include/asm/a.out.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/include/asm/a.out.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/include/asm/cputable.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/include/asm/cputable.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/include/asm/dcr-regs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/include/asm/dcr-regs.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/include/asm/device.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/include/asm/device.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/include/asm/dma-mapping.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/include/asm/dma-mapping.h</a></td><td class='right'>187</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/include/asm/elf.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/include/asm/elf.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/include/asm/exception.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/include/asm/exception.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/include/asm/fsl_lbc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/include/asm/fsl_lbc.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/include/asm/highmem.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/include/asm/highmem.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/include/asm/io.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/include/asm/io.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/include/asm/irq.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/include/asm/irq.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/include/asm/kvm_host.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/include/asm/kvm_host.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/include/asm/kvm_ppc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/include/asm/kvm_ppc.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/include/asm/machdep.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/include/asm/machdep.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/include/asm/mman.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/include/asm/mman.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/include/asm/mmu-hash64.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/include/asm/mmu-hash64.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/include/asm/mpic.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/include/asm/mpic.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/include/asm/msi_bitmap.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/include/asm/msi_bitmap.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/include/asm/of_device.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/include/asm/of_device.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/include/asm/of_platform.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/include/asm/of_platform.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/include/asm/paca.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/include/asm/paca.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/include/asm/page.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/include/asm/page.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/include/asm/page_32.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/include/asm/page_32.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/include/asm/pci.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/include/asm/pci.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/include/asm/pgtable-ppc32.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/include/asm/pgtable-ppc32.h</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/include/asm/pgtable-ppc64.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/include/asm/pgtable-ppc64.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/include/asm/ppc_asm.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/include/asm/ppc_asm.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/include/asm/reg_booke.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/include/asm/reg_booke.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/include/asm/sections.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/include/asm/sections.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/include/asm/sfp-machine.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/include/asm/sfp-machine.h</a> (renamed from arch/powerpc/math-emu/sfp-machine.h)</td><td class='right'>114</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/include/asm/siginfo.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/include/asm/siginfo.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/include/asm/smp.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/include/asm/smp.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/include/asm/statfs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/include/asm/statfs.h</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/include/asm/systbl.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/include/asm/systbl.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/include/asm/tlbflush.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/include/asm/tlbflush.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/include/asm/types.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/include/asm/types.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/kernel/.gitignore?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kernel/.gitignore</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/kernel/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kernel/Makefile</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/kernel/asm-offsets.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kernel/asm-offsets.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/kernel/btext.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kernel/btext.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/kernel/cpu_setup_ppc970.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kernel/cpu_setup_ppc970.S</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/kernel/cputable.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kernel/cputable.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/kernel/dma-iommu.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kernel/dma-iommu.c</a> (renamed from arch/powerpc/kernel/dma_64.c)</td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/kernel/dma.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kernel/dma.c</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/kernel/entry_64.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kernel/entry_64.S</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/kernel/head_32.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kernel/head_32.S</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/kernel/head_64.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kernel/head_64.S</a></td><td class='right'>473</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/kernel/head_fsl_booke.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kernel/head_fsl_booke.S</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/kernel/iommu.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kernel/iommu.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/kernel/irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kernel/irq.c</a></td><td class='right'>169</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/kernel/lparcfg.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kernel/lparcfg.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/kernel/misc.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kernel/misc.S</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/kernel/misc_32.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kernel/misc_32.S</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/kernel/misc_64.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kernel/misc_64.S</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/kernel/of_device.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kernel/of_device.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/kernel/paca.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kernel/paca.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/kernel/pci-common.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kernel/pci-common.c</a></td><td class='right'>216</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/kernel/pci_32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kernel/pci_32.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/kernel/pci_64.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kernel/pci_64.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/kernel/ppc_ksyms.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kernel/ppc_ksyms.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/kernel/prom.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kernel/prom.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/kernel/prom_init.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kernel/prom_init.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/kernel/reloc_64.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kernel/reloc_64.S</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/kernel/setup-common.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kernel/setup-common.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/kernel/setup_32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kernel/setup_32.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/kernel/setup_64.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kernel/setup_64.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/kernel/smp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kernel/smp.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/kernel/softemu8xx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kernel/softemu8xx.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/kernel/swsusp_asm64.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kernel/swsusp_asm64.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/kernel/sys_ppc32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kernel/sys_ppc32.c</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/kernel/sysfs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kernel/sysfs.c</a></td><td class='right'>119</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/kernel/traps.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kernel/traps.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/kernel/vio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kernel/vio.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/kernel/vmlinux.lds.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kernel/vmlinux.lds.S</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/kvm/44x_tlb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kvm/44x_tlb.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/kvm/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kvm/Kconfig</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/kvm/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kvm/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/kvm/booke_guest.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kvm/booke_guest.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/kvm/booke_interrupts.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kvm/booke_interrupts.S</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/kvm/emulate.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kvm/emulate.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/kvm/powerpc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kvm/powerpc.c</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/lib/copypage_64.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/lib/copypage_64.S</a></td><td class='right'>198</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/lib/dma-noncoherent.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/lib/dma-noncoherent.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/math-emu/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/Makefile</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/math-emu/double.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/double.h</a></td><td class='right'>129</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/math-emu/fadd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/fadd.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/math-emu/fadds.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/fadds.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/math-emu/fcmpo.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/fcmpo.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/math-emu/fcmpu.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/fcmpu.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/math-emu/fctiw.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/fctiw.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/math-emu/fctiwz.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/fctiwz.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/math-emu/fdiv.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/fdiv.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/math-emu/fdivs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/fdivs.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/math-emu/fmadd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/fmadd.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/math-emu/fmadds.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/fmadds.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/math-emu/fmsub.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/fmsub.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/math-emu/fmsubs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/fmsubs.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/math-emu/fmul.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/fmul.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/math-emu/fmuls.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/fmuls.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/math-emu/fnmadd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/fnmadd.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/math-emu/fnmadds.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/fnmadds.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/math-emu/fnmsub.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/fnmsub.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/math-emu/fnmsubs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/fnmsubs.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/math-emu/frsp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/frsp.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/math-emu/fsel.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/fsel.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/math-emu/fsqrt.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/fsqrt.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/math-emu/fsqrts.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/fsqrts.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/math-emu/fsub.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/fsub.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/math-emu/fsubs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/fsubs.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/math-emu/lfd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/lfd.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/math-emu/lfs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/lfs.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/math-emu/math.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/math.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/math-emu/mcrfs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/mcrfs.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/math-emu/mffs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/mffs.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/math-emu/mtfsb0.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/mtfsb0.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/math-emu/mtfsb1.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/mtfsb1.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/math-emu/mtfsf.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/mtfsf.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/math-emu/mtfsfi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/mtfsfi.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/math-emu/op-1.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/op-1.h</a></td><td class='right'>245</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/math-emu/op-2.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/op-2.h</a></td><td class='right'>434</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.3%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/math-emu/op-4.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/op-4.h</a></td><td class='right'>317</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.2%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/math-emu/op-common.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/op-common.h</a></td><td class='right'>688</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 6.9%;'/><td class='none' style='width: 93.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/math-emu/single.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/single.h</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/math-emu/soft-fp.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/soft-fp.h</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/math-emu/stfs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/stfs.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/math-emu/types.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/types.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/math-emu/udivmodti4.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/udivmodti4.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/mm/fsl_booke_mmu.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/mm/fsl_booke_mmu.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/mm/gup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/mm/gup.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/mm/hash_low_32.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/mm/hash_low_32.S</a></td><td class='right'>122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/mm/hash_utils_64.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/mm/hash_utils_64.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/mm/hugetlbpage.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/mm/hugetlbpage.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/mm/init_64.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/mm/init_64.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/mm/mem.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/mm/mem.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/mm/numa.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/mm/numa.c</a></td><td class='right'>185</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/mm/pgtable_32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/mm/pgtable_32.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/mm/tlb_32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/mm/tlb_32.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/oprofile/cell/vma_map.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/oprofile/cell/vma_map.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/oprofile/op_model_power4.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/oprofile/op_model_power4.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/platforms/44x/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/44x/Kconfig</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/platforms/44x/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/44x/Makefile</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/platforms/44x/bamboo.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/44x/bamboo.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/platforms/44x/canyonlands.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/44x/canyonlands.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/platforms/44x/katmai.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/44x/katmai.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/platforms/44x/ppc44x_simple.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/44x/ppc44x_simple.c</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/platforms/44x/rainier.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/44x/rainier.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/platforms/44x/sequoia.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/44x/sequoia.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/platforms/44x/taishan.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/44x/taishan.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/platforms/512x/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/512x/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/platforms/512x/mpc5121_ads.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/512x/mpc5121_ads.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/platforms/52xx/mpc52xx_common.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/52xx/mpc52xx_common.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/platforms/52xx/mpc52xx_pci.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/52xx/mpc52xx_pci.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/platforms/82xx/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/82xx/Kconfig</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/platforms/82xx/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/82xx/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/platforms/82xx/ep8248e.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/82xx/ep8248e.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/platforms/82xx/mgcoge.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/82xx/mgcoge.c</a></td><td class='right'>129</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/platforms/83xx/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/83xx/Kconfig</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/platforms/83xx/mpc837x_mds.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/83xx/mpc837x_mds.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/platforms/85xx/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/85xx/Kconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/platforms/85xx/mpc85xx_ads.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/85xx/mpc85xx_ads.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/platforms/85xx/sbc8560.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/85xx/sbc8560.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/platforms/86xx/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/86xx/Kconfig</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/platforms/86xx/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/86xx/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/platforms/86xx/gef_pic.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/86xx/gef_pic.c</a></td><td class='right'>258</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/platforms/86xx/gef_pic.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/86xx/gef_pic.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/platforms/86xx/gef_sbc610.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/86xx/gef_sbc610.c</a></td><td class='right'>221</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/platforms/86xx/mpc8610_hpcd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/86xx/mpc8610_hpcd.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/86xx/mpc86xx_hpcn.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/platforms/86xx/sbc8641d.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/86xx/sbc8641d.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/platforms/8xx/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/8xx/Kconfig</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/platforms/8xx/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/8xx/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/platforms/8xx/mgsuvd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/8xx/mgsuvd.c</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/platforms/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/Kconfig</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/platforms/Kconfig.cputype?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/Kconfig.cputype</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/platforms/cell/iommu.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/cell/iommu.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/platforms/cell/spufs/inode.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/cell/spufs/inode.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/platforms/chrp/pci.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/chrp/pci.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/platforms/chrp/setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/chrp/setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/platforms/chrp/time.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/chrp/time.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/platforms/iseries/exception.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/iseries/exception.S</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/platforms/iseries/mf.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/iseries/mf.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/platforms/maple/setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/maple/setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/platforms/maple/time.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/maple/time.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/platforms/pasemi/gpio_mdio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/pasemi/gpio_mdio.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/platforms/powermac/feature.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/powermac/feature.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/platforms/powermac/setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/powermac/setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/platforms/powermac/smp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/powermac/smp.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/platforms/powermac/time.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/powermac/time.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/platforms/ps3/system-bus.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/ps3/system-bus.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/platforms/pseries/cmm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/pseries/cmm.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/platforms/pseries/eeh_driver.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/pseries/eeh_driver.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/platforms/pseries/hotplug-memory.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/pseries/hotplug-memory.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/platforms/pseries/reconfig.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/pseries/reconfig.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/platforms/pseries/rtasd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/pseries/rtasd.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/platforms/pseries/setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/pseries/setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/platforms/pseries/smp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/pseries/smp.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/platforms/pseries/xics.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/pseries/xics.c</a></td><td class='right'>550</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 2.6%;'/><td class='none' style='width: 94.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/platforms/pseries/xics.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/pseries/xics.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/sysdev/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/sysdev/Kconfig</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/sysdev/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/sysdev/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/sysdev/cpm1.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/sysdev/cpm1.c</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/sysdev/fsl_lbc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/sysdev/fsl_lbc.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/sysdev/fsl_msi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/sysdev/fsl_msi.c</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/sysdev/fsl_msi.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/sysdev/fsl_msi.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/sysdev/fsl_pci.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/sysdev/fsl_pci.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/sysdev/fsl_soc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/sysdev/fsl_soc.c</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/sysdev/fsl_soc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/sysdev/fsl_soc.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/sysdev/mpc8xxx_gpio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/sysdev/mpc8xxx_gpio.c</a></td><td class='right'>171</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/sysdev/mpic.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/sysdev/mpic.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/sysdev/mpic_msi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/sysdev/mpic_msi.c</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/sysdev/mpic_pasemi_msi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/sysdev/mpic_pasemi_msi.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/sysdev/mpic_u3msi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/sysdev/mpic_u3msi.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/sysdev/msi_bitmap.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/sysdev/msi_bitmap.c</a></td><td class='right'>247</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/sysdev/mv64x60_dev.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/sysdev/mv64x60_dev.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/sysdev/ppc4xx_pci.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/sysdev/ppc4xx_pci.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/powerpc/sysdev/qe_lib/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/sysdev/qe_lib/Kconfig</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/s390/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/s390/Kconfig</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/s390/hypfs/inode.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/s390/hypfs/inode.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/s390/include/asm/dasd.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/s390/include/asm/dasd.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/s390/include/asm/delay.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/s390/include/asm/delay.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/s390/include/asm/elf.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/s390/include/asm/elf.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/s390/include/asm/pgtable.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/s390/include/asm/pgtable.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/s390/include/asm/ptrace.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/s390/include/asm/ptrace.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/s390/include/asm/qdio.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/s390/include/asm/qdio.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/s390/include/asm/statfs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/s390/include/asm/statfs.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/s390/include/asm/syscall.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/s390/include/asm/syscall.h</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/s390/include/asm/thread_info.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/s390/include/asm/thread_info.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/s390/kernel/compat_linux.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/s390/kernel/compat_linux.c</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/s390/kernel/compat_linux.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/s390/kernel/compat_linux.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/s390/kernel/compat_wrapper.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/s390/kernel/compat_wrapper.S</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/s390/kernel/entry.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/s390/kernel/entry.S</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/s390/kernel/entry64.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/s390/kernel/entry64.S</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/s390/kernel/ptrace.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/s390/kernel/ptrace.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/s390/kernel/signal.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/s390/kernel/signal.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/s390/kernel/smp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/s390/kernel/smp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/s390/kernel/syscalls.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/s390/kernel/syscalls.S</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/s390/kernel/time.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/s390/kernel/time.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/s390/kvm/priv.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/s390/kvm/priv.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/s390/lib/delay.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/s390/lib/delay.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/s390/mm/extmem.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/s390/mm/extmem.c</a></td><td class='right'>251</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sh/include/asm/elf.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sh/include/asm/elf.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sh/kernel/smp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sh/kernel/smp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/Kconfig</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/include/asm/Kbuild?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/Kbuild</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/include/asm/asmmacro.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/asmmacro.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/include/asm/bpp.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/bpp.h</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/include/asm/bugs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/bugs.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/include/asm/cpudata_64.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/cpudata_64.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/include/asm/dma-mapping_32.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/dma-mapping_32.h</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/include/asm/dma.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/dma.h</a></td><td class='right'>141</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/include/asm/dma_32.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/dma_32.h</a></td><td class='right'>288</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.9%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/include/asm/dma_64.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/dma_64.h</a></td><td class='right'>205</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/include/asm/ebus.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/ebus.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/include/asm/ebus_32.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/ebus_32.h</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/include/asm/ebus_64.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/ebus_64.h</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/include/asm/ebus_dma.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/ebus_dma.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/include/asm/elf_32.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/elf_32.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/include/asm/elf_64.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/elf_64.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/include/asm/fhc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/fhc.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/include/asm/floppy_32.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/floppy_32.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/include/asm/floppy_64.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/floppy_64.h</a></td><td class='right'>130</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/include/asm/gpio.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/gpio.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/include/asm/io-unit.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/io-unit.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/include/asm/io_32.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/io_32.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/include/asm/io_64.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/io_64.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/include/asm/iommu_64.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/iommu_64.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/include/asm/irq_64.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/irq_64.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/include/asm/mc146818rtc_64.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/mc146818rtc_64.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/include/asm/memctrl.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/memctrl.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/include/asm/mostek.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/mostek.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/include/asm/mostek_32.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/mostek_32.h</a></td><td class='right'>171</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/include/asm/mostek_64.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/mostek_64.h</a></td><td class='right'>143</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/include/asm/obio.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/obio.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/include/asm/of_device.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/of_device.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/include/asm/of_platform.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/of_platform.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/include/asm/oplib_32.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/oplib_32.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/include/asm/page_32.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/page_32.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/include/asm/page_64.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/page_64.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/include/asm/parport.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/parport.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/include/asm/pci_32.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/pci_32.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/include/asm/pgtable_32.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/pgtable_32.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/include/asm/pgtable_64.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/pgtable_64.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/include/asm/prom.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/prom.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/include/asm/ptrace_64.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/ptrace_64.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/include/asm/reboot.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/reboot.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/include/asm/rtc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/rtc.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/include/asm/sbus.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/sbus.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/include/asm/sbus_32.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/sbus_32.h</a></td><td class='right'>153</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/include/asm/sbus_64.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/sbus_64.h</a></td><td class='right'>190</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/include/asm/serial.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/serial.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/include/asm/spinlock_32.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/spinlock_32.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/include/asm/spinlock_64.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/spinlock_64.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/include/asm/sstate.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/sstate.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/include/asm/starfire.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/starfire.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/include/asm/statfs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/statfs.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/include/asm/statfs_32.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/statfs_32.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/include/asm/statfs_64.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/statfs_64.h</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/include/asm/sun4paddr.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/sun4paddr.h</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/include/asm/sun4prom.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/sun4prom.h</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/include/asm/system_32.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/system_32.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/include/asm/system_64.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/system_64.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/include/asm/thread_info_32.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/thread_info_32.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/include/asm/timer_32.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/timer_32.h</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/include/asm/vac-ops.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/vac-ops.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/include/asm/vfc_ioctls.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/vfc_ioctls.h</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/include/asm/visasm.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/visasm.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/kernel/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/kernel/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/kernel/apc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/kernel/apc.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/kernel/auxio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/kernel/auxio.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/kernel/devices.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/kernel/devices.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/kernel/dma.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/kernel/dma.c</a></td><td class='right'>227</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/kernel/dma.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/kernel/dma.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/kernel/ebus.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/kernel/ebus.c</a></td><td class='right'>393</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.9%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/kernel/entry.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/kernel/entry.S</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/kernel/head.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/kernel/head.S</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/kernel/idprom.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/kernel/idprom.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/kernel/ioport.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/kernel/ioport.c</a></td><td class='right'>227</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/kernel/irq.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/kernel/irq.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/kernel/of_device.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/kernel/of_device.c</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/kernel/pcic.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/kernel/pcic.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/kernel/pmc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/kernel/pmc.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/kernel/process.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/kernel/process.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/kernel/prom.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/kernel/prom.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/kernel/setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/kernel/setup.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/kernel/sparc_ksyms.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/kernel/sparc_ksyms.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/kernel/sun4c_irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/kernel/sun4c_irq.c</a></td><td class='right'>156</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/kernel/sun4d_irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/kernel/sun4d_irq.c</a></td><td class='right'>286</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/kernel/sun4d_smp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/kernel/sun4d_smp.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/kernel/sun4m_irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/kernel/sun4m_irq.c</a></td><td class='right'>495</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/kernel/sun4m_smp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/kernel/sun4m_smp.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/kernel/sun4setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/kernel/sun4setup.c</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/kernel/sys_sparc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/kernel/sys_sparc.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/kernel/tick14.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/kernel/tick14.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/kernel/time.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/kernel/time.c</a></td><td class='right'>382</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 3.2%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/kernel/traps.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/kernel/traps.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/mm/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/mm/Makefile</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/mm/btfixup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/mm/btfixup.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/mm/fault.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/mm/fault.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/mm/init.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/mm/init.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/mm/io-unit.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/mm/io-unit.c</a></td><td class='right'>136</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/mm/iommu.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/mm/iommu.c</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/mm/nosrmmu.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/mm/nosrmmu.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/mm/srmmu.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/mm/srmmu.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/mm/sun4c.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/mm/sun4c.c</a></td><td class='right'>204</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/prom/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/prom/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/prom/bootstr.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/prom/bootstr.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/prom/console.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/prom/console.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/prom/init.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/prom/init.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/prom/memory.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/prom/memory.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/prom/ranges.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/prom/ranges.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc/prom/sun4prom.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/prom/sun4prom.c</a></td><td class='right'>161</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc64/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/Kconfig</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc64/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc64/kernel/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/Makefile</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc64/kernel/auxio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/auxio.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc64/kernel/central.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/central.c</a></td><td class='right'>617</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 4.0%;'/><td class='none' style='width: 93.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc64/kernel/chmc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/chmc.c</a></td><td class='right'>817</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.2%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 91.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc64/kernel/cpu.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/cpu.c</a></td><td class='right'>208</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc64/kernel/ds.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/ds.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc64/kernel/ebus.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/ebus.c</a></td><td class='right'>299</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc64/kernel/entry.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/entry.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc64/kernel/head.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/head.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc64/kernel/hvapi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/hvapi.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc64/kernel/hvcalls.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/hvcalls.S</a></td><td class='right'>354</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc64/kernel/iommu.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/iommu.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc64/kernel/iommu_common.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/iommu_common.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc64/kernel/irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/irq.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc64/kernel/of_device.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/of_device.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc64/kernel/pci.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/pci.c</a></td><td class='right'>172</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc64/kernel/pci_common.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/pci_common.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc64/kernel/pci_fire.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/pci_fire.c</a></td><td class='right'>254</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc64/kernel/pci_impl.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/pci_impl.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc64/kernel/pci_msi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/pci_msi.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc64/kernel/pci_psycho.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/pci_psycho.c</a></td><td class='right'>750</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 6.0%;'/><td class='none' style='width: 92.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc64/kernel/pci_sabre.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/pci_sabre.c</a></td><td class='right'>507</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 3.8%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc64/kernel/pci_schizo.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/pci_schizo.c</a></td><td class='right'>368</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc64/kernel/pci_sun4v.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/pci_sun4v.c</a></td><td class='right'>204</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc64/kernel/pci_sun4v_asm.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/pci_sun4v_asm.S</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc64/kernel/power.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/power.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc64/kernel/process.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/process.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc64/kernel/prom.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/prom.c</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc64/kernel/psycho_common.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/psycho_common.c</a></td><td class='right'>470</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc64/kernel/psycho_common.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/psycho_common.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc64/kernel/ptrace.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/ptrace.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc64/kernel/reboot.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/reboot.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc64/kernel/sbus.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/sbus.c</a></td><td class='right'>166</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc64/kernel/smp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/smp.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc64/kernel/sparc64_ksyms.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/sparc64_ksyms.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc64/kernel/sstate.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/sstate.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc64/kernel/starfire.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/starfire.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc64/kernel/sys_sparc32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/sys_sparc32.c</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc64/kernel/syscalls.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/syscalls.S</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc64/kernel/systbls.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/systbls.S</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc64/kernel/time.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/time.c</a></td><td class='right'>1187</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 10.2%;'/><td class='none' style='width: 88.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc64/kernel/traps.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/traps.c</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc64/kernel/us3_cpufreq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/us3_cpufreq.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc64/kernel/vio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/vio.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc64/kernel/visemul.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/visemul.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc64/mm/fault.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/mm/fault.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc64/mm/init.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/mm/init.c</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc64/mm/init.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/mm/init.h</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/sparc64/mm/tlb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/mm/tlb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/um/Kconfig.char?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/um/Kconfig.char</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/um/Kconfig.i386?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/um/Kconfig.i386</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/um/Kconfig.x86_64?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/um/Kconfig.x86_64</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/um/drivers/line.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/um/drivers/line.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/um/kernel/exec.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/um/kernel/exec.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/um/kernel/smp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/um/kernel/smp.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/um/os-Linux/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/um/os-Linux/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/um/os-Linux/tty_log.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/um/os-Linux/tty_log.c</a></td><td class='right'>217</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/um/sys-x86_64/syscall_table.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/um/sys-x86_64/syscall_table.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/Kconfig</a></td><td class='right'>207</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/Kconfig.cpu?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/Kconfig.cpu</a></td><td class='right'>149</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/Kconfig.debug?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/Kconfig.debug</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/Makefile_32.cpu?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/Makefile_32.cpu</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/boot/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/boot/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/boot/compressed/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/boot/compressed/Makefile</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/boot/compressed/head_32.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/boot/compressed/head_32.S</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/boot/compressed/misc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/boot/compressed/misc.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/boot/cpu.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/boot/cpu.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/boot/edd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/boot/edd.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/boot/header.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/boot/header.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/boot/mkcpustr.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/boot/mkcpustr.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/boot/video-vesa.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/boot/video-vesa.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/configs/i386_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/configs/i386_defconfig</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/configs/x86_64_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/configs/x86_64_defconfig</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/crypto/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/crypto/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/crypto/crc32c-intel.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/crypto/crc32c-intel.c</a></td><td class='right'>197</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/ia32/ia32_aout.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/ia32/ia32_aout.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/ia32/ia32_signal.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/ia32/ia32_signal.c</a></td><td class='right'>138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/ia32/ia32entry.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/ia32/ia32entry.S</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/ia32/sys_ia32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/ia32/sys_ia32.c</a></td><td class='right'>108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/Makefile</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/acpi/boot.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/acpi/boot.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/alternative.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/alternative.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/amd_iommu.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/amd_iommu.c</a></td><td class='right'>337</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/amd_iommu_init.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/amd_iommu_init.c</a></td><td class='right'>194</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/aperture_64.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/aperture_64.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/apic_32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/apic_32.c</a></td><td class='right'>441</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/apic_64.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/apic_64.c</a></td><td class='right'>630</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.4%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 93.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/apm_32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/apm_32.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/asm-offsets_64.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/asm-offsets_64.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/bios_uv.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/bios_uv.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/cpu/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/cpu/Makefile</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/cpu/addon_cpuid_features.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/cpu/addon_cpuid_features.c</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/cpu/amd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/cpu/amd.c</a></td><td class='right'>548</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 94.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/cpu/amd_64.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/cpu/amd_64.c</a></td><td class='right'>224</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/cpu/centaur.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/cpu/centaur.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/cpu/centaur_64.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/cpu/centaur_64.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/cpu/cmpxchg.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/cpu/cmpxchg.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/cpu/common.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/cpu/common.c</a></td><td class='right'>1001</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.0%;'/><td class='rem' style='width: 3.0%;'/><td class='none' style='width: 90.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/cpu/common_64.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/cpu/common_64.c</a></td><td class='right'>712</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 7.1%;'/><td class='none' style='width: 92.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/cpu/cpu.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/cpu/cpu.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/cpu/cpufreq/elanfreq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/cpu/cpufreq/elanfreq.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/cpu/cpufreq/powernow-k6.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/cpu/cpufreq/powernow-k6.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/cpu/cyrix.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/cpu/cyrix.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/cpu/feature_names.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/cpu/feature_names.c</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/cpu/intel.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/cpu/intel.c</a></td><td class='right'>365</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/cpu/intel_64.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/cpu/intel_64.c</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/cpu/intel_cacheinfo.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/cpu/intel_cacheinfo.c</a></td><td class='right'>169</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/cpu/mcheck/mce_64.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/cpu/mcheck/mce_64.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/cpu/mkcapflags.pl?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/cpu/mkcapflags.pl</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/cpu/mtrr/generic.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/cpu/mtrr/generic.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/cpu/mtrr/if.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/cpu/mtrr/if.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/cpu/mtrr/main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/cpu/mtrr/main.c</a></td><td class='right'>274</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/cpu/perfctr-watchdog.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/cpu/perfctr-watchdog.c</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/cpu/powerflags.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/cpu/powerflags.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/cpu/transmeta.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/cpu/transmeta.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/cpu/umc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/cpu/umc.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/cpuid.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/cpuid.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/crash_dump_64.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/crash_dump_64.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/doublefault_32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/doublefault_32.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/ds.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/ds.c</a></td><td class='right'>954</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.7%;'/><td class='rem' style='width: 2.8%;'/><td class='none' style='width: 90.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/dumpstack_32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/dumpstack_32.c</a></td><td class='right'>449</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/dumpstack_64.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/dumpstack_64.c</a></td><td class='right'>575</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/e820.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/e820.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/early-quirks.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/early-quirks.c</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/early_printk.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/early_printk.c</a></td><td class='right'>748</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/efi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/efi.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/entry_32.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/entry_32.S</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/entry_64.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/entry_64.S</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/es7000_32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/es7000_32.c</a> (renamed from arch/x86/mach-es7000/es7000plat.c)</td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/genapic_64.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/genapic_64.c</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/genapic_flat_64.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/genapic_flat_64.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/genx2apic_cluster.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/genx2apic_cluster.c</a></td><td class='right'>159</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/genx2apic_phys.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/genx2apic_phys.c</a></td><td class='right'>154</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/genx2apic_uv_x.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/genx2apic_uv_x.c</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/head.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/head.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/head64.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/head64.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/head_32.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/head_32.S</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/head_64.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/head_64.S</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/hpet.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/hpet.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/i387.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/i387.c</a></td><td class='right'>168</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/i8259.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/i8259.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/io_apic_32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/io_apic_32.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/io_apic_64.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/io_apic_64.c</a></td><td class='right'>639</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.9%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 93.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/ioport.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/ioport.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/ipi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/ipi.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/irq_32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/irq_32.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/irq_64.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/irq_64.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/irqinit_32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/irqinit_32.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/irqinit_64.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/irqinit_64.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/k8.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/k8.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/kvm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/kvm.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/kvmclock.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/kvmclock.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/ldt.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/ldt.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/microcode.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/microcode.c</a></td><td class='right'>853</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 8.5%;'/><td class='none' style='width: 91.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/microcode_amd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/microcode_amd.c</a></td><td class='right'>435</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/microcode_core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/microcode_core.c</a></td><td class='right'>508</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/microcode_intel.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/microcode_intel.c</a></td><td class='right'>480</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/mpparse.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/mpparse.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/msr.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/msr.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/nmi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/nmi.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/numaq_32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/numaq_32.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/olpc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/olpc.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/paravirt-spinlocks.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/paravirt-spinlocks.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/paravirt.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/paravirt.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/paravirt_patch_32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/paravirt_patch_32.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/pci-calgary_64.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/pci-calgary_64.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/pci-dma.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/pci-dma.c</a></td><td class='right'>183</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/pci-gart_64.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/pci-gart_64.c</a></td><td class='right'>150</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/pci-nommu.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/pci-nommu.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/pcspeaker.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/pcspeaker.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/process.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/process.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/process_32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/process_32.c</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/process_64.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/process_64.c</a></td><td class='right'>199</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/ptrace.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/ptrace.c</a></td><td class='right'>522</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/pvclock.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/pvclock.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/quirks.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/quirks.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/reboot.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/reboot.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/rtc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/rtc.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/setup.c</a></td><td class='right'>224</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/setup_percpu.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/setup_percpu.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/sigframe.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/sigframe.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/signal_32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/signal_32.c</a></td><td class='right'>273</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/signal_64.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/signal_64.c</a></td><td class='right'>362</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/smp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/smp.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/smpboot.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/smpboot.c</a></td><td class='right'>224</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/summit_32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/summit_32.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/sys_i386_32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/sys_i386_32.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/sys_x86_64.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/sys_x86_64.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/syscall_64.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/syscall_64.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/time_32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/time_32.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/time_64.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/time_64.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/tlb_32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/tlb_32.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/tls.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/tls.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/traps.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/traps.c</a> (renamed from arch/x86/kernel/traps_32.c)</td><td class='right'>896</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 5.6%;'/><td class='none' style='width: 91.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/traps_64.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/traps_64.c</a></td><td class='right'>1212</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 12.1%;'/><td class='none' style='width: 87.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/tsc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/tsc.c</a></td><td class='right'>290</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/visws_quirks.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/visws_quirks.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/vm86_32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/vm86_32.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/vmi_32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/vmi_32.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/vmlinux_32.lds.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/vmlinux_32.lds.S</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/vmlinux_64.lds.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/vmlinux_64.lds.S</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kernel/xsave.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/xsave.c</a></td><td class='right'>345</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kvm/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kvm/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kvm/i8254.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kvm/i8254.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kvm/i8254.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kvm/i8254.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kvm/i8259.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kvm/i8259.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kvm/irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kvm/irq.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kvm/irq.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kvm/irq.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kvm/kvm_cache_regs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kvm/kvm_cache_regs.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kvm/lapic.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kvm/lapic.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kvm/mmu.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kvm/mmu.c</a></td><td class='right'>680</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.4%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 93.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kvm/paging_tmpl.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kvm/paging_tmpl.h</a></td><td class='right'>249</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kvm/svm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kvm/svm.c</a></td><td class='right'>156</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kvm/vmx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kvm/vmx.c</a></td><td class='right'>712</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.9%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 92.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kvm/vmx.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kvm/vmx.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kvm/x86.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kvm/x86.c</a></td><td class='right'>554</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 94.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kvm/x86.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kvm/x86.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/kvm/x86_emulate.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kvm/x86_emulate.c</a></td><td class='right'>170</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/lguest/boot.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/lguest/boot.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/lib/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/lib/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/lib/msr-on-cpu.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/lib/msr-on-cpu.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/lib/string_32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/lib/string_32.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/lib/strstr_32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/lib/strstr_32.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/lib/usercopy_32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/lib/usercopy_32.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/mach-default/setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/mach-default/setup.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/mach-es7000/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/mach-es7000/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/mach-es7000/es7000.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/mach-es7000/es7000.h</a></td><td class='right'>114</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/mach-generic/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/mach-generic/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/mach-generic/bigsmp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/mach-generic/bigsmp.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/mach-generic/es7000.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/mach-generic/es7000.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/mach-generic/numaq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/mach-generic/numaq.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/mach-generic/summit.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/mach-generic/summit.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/mach-voyager/voyager_smp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/mach-voyager/voyager_smp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/mm/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/mm/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/mm/dump_pagetables.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/mm/dump_pagetables.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/mm/fault.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/mm/fault.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/mm/gup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/mm/gup.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/mm/highmem_32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/mm/highmem_32.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/mm/init_32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/mm/init_32.c</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/mm/init_64.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/mm/init_64.c</a></td><td class='right'>184</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/mm/ioremap.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/mm/ioremap.c</a></td><td class='right'>197</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/mm/numa_32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/mm/numa_32.c</a> (renamed from arch/x86/mm/discontig_32.c)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/mm/numa_64.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/mm/numa_64.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/mm/pageattr-test.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/mm/pageattr-test.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/mm/pageattr.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/mm/pageattr.c</a></td><td class='right'>463</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/mm/pat.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/mm/pat.c</a></td><td class='right'>132</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/mm/pgtable.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/mm/pgtable.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/mm/pgtable_32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/mm/pgtable_32.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/mm/srat_64.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/mm/srat_64.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/oprofile/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/oprofile/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/oprofile/nmi_int.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/oprofile/nmi_int.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/oprofile/op_model_amd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/oprofile/op_model_amd.c</a></td><td class='right'>543</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/oprofile/op_model_athlon.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/oprofile/op_model_athlon.c</a></td><td class='right'>190</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/oprofile/op_model_p4.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/oprofile/op_model_p4.c</a></td><td class='right'>175</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/oprofile/op_x86_model.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/oprofile/op_x86_model.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/pci/acpi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/pci/acpi.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/pci/amd_bus.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/pci/amd_bus.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/pci/fixup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/pci/fixup.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/pci/i386.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/pci/i386.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/pci/irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/pci/irq.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/pci/mmconfig-shared.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/pci/mmconfig-shared.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/power/cpu_32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/power/cpu_32.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/power/cpu_64.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/power/cpu_64.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/power/hibernate_asm_32.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/power/hibernate_asm_32.S</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/xen/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/xen/Kconfig</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/xen/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/xen/Makefile</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/xen/debugfs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/xen/debugfs.c</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/xen/debugfs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/xen/debugfs.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/xen/enlighten.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/xen/enlighten.c</a></td><td class='right'>317</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/xen/irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/xen/irq.c</a></td><td class='right'>143</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/xen/mmu.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/xen/mmu.c</a></td><td class='right'>314</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/xen/mmu.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/xen/mmu.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/xen/multicalls.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/xen/multicalls.c</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/xen/smp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/xen/smp.c</a></td><td class='right'>245</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/xen/spinlock.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/xen/spinlock.c</a></td><td class='right'>428</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/xen/time.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/xen/time.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/xen/xen-asm_32.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/xen/xen-asm_32.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/xen/xen-asm_64.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/xen/xen-asm_64.S</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/x86/xen/xen-ops.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/xen/xen-ops.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/arch/xtensa/kernel/setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/xtensa/kernel/setup.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/block/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>block/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/block/as-iosched.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>block/as-iosched.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/block/blk-barrier.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>block/blk-barrier.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/block/blk-core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>block/blk-core.c</a></td><td class='right'>640</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 2.9%;'/><td class='none' style='width: 93.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/block/blk-exec.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>block/blk-exec.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/block/blk-integrity.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>block/blk-integrity.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/block/blk-map.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>block/blk-map.c</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/block/blk-merge.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>block/blk-merge.c</a></td><td class='right'>145</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/block/blk-settings.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>block/blk-settings.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/block/blk-softirq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>block/blk-softirq.c</a></td><td class='right'>175</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/block/blk-sysfs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>block/blk-sysfs.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/block/blk-tag.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>block/blk-tag.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/block/blk-timeout.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>block/blk-timeout.c</a></td><td class='right'>238</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/block/blk.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>block/blk.h</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/block/blktrace.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>block/blktrace.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/block/bsg.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>block/bsg.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/block/cfq-iosched.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>block/cfq-iosched.c</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/block/cmd-filter.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>block/cmd-filter.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/block/compat_ioctl.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>block/compat_ioctl.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/block/deadline-iosched.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>block/deadline-iosched.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/block/elevator.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>block/elevator.c</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/block/genhd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>block/genhd.c</a></td><td class='right'>964</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.3%;'/><td class='rem' style='width: 3.3%;'/><td class='none' style='width: 90.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/block/ioctl.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>block/ioctl.c</a></td><td class='right'>124</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/block/scsi_ioctl.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>block/scsi_ioctl.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/crypto/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>crypto/Kconfig</a></td><td class='right'>127</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/crypto/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>crypto/Makefile</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/crypto/algapi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>crypto/algapi.c</a></td><td class='right'>147</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/crypto/algboss.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>crypto/algboss.c</a> (renamed from crypto/cryptomgr.c)</td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/crypto/ansi_cprng.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>crypto/ansi_cprng.c</a></td><td class='right'>417</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/crypto/api.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>crypto/api.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/crypto/blkcipher.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>crypto/blkcipher.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/crypto/chainiv.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>crypto/chainiv.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/crypto/eseqiv.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>crypto/eseqiv.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/crypto/fips.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>crypto/fips.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/crypto/internal.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>crypto/internal.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/crypto/krng.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>crypto/krng.c</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/crypto/proc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>crypto/proc.c</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/crypto/rng.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>crypto/rng.c</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/crypto/seqiv.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>crypto/seqiv.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/crypto/tcrypt.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>crypto/tcrypt.c</a></td><td class='right'>1347</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 12.0%;'/><td class='none' style='width: 86.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/crypto/tcrypt.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>crypto/tcrypt.h</a></td><td class='right'>8709</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 86.7%;'/><td class='none' style='width: 13.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/crypto/testmgr.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>crypto/testmgr.c</a></td><td class='right'>1868</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 18.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 81.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/crypto/testmgr.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>crypto/testmgr.h</a></td><td class='right'>8738</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 87.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 12.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/acpi/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/acpi/Kconfig</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/acpi/glue.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/acpi/glue.c</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/acpi/toshiba_acpi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/acpi/toshiba_acpi.c</a></td><td class='right'>261</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ata/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ata/Kconfig</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ata/ahci.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ata/ahci.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ata/ata_piix.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ata/ata_piix.c</a></td><td class='right'>184</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ata/libata-core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ata/libata-core.c</a></td><td class='right'>252</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ata/libata-eh.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ata/libata-eh.c</a></td><td class='right'>375</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ata/libata-scsi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ata/libata-scsi.c</a></td><td class='right'>114</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ata/libata.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ata/libata.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ata/pata_bf54x.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ata/pata_bf54x.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ata/pata_of_platform.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ata/pata_of_platform.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ata/pata_pcmcia.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ata/pata_pcmcia.c</a></td><td class='right'>168</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ata/pata_sil680.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ata/pata_sil680.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ata/sata_fsl.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ata/sata_fsl.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ata/sata_inic162x.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ata/sata_inic162x.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ata/sata_mv.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ata/sata_mv.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ata/sata_nv.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ata/sata_nv.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ata/sata_promise.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ata/sata_promise.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ata/sata_qstor.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ata/sata_qstor.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ata/sata_sil.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ata/sata_sil.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ata/sata_sil24.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ata/sata_sil24.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ata/sata_sis.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ata/sata_sis.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ata/sata_svw.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ata/sata_svw.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ata/sata_uli.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ata/sata_uli.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ata/sata_via.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ata/sata_via.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ata/sata_vsc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ata/sata_vsc.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/atm/eni.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/atm/eni.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/atm/fore200e.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/atm/fore200e.c</a></td><td class='right'>410</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/atm/fore200e.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/atm/fore200e.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/atm/horizon.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/atm/horizon.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/atm/idt77252.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/atm/idt77252.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/atm/idt77252.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/atm/idt77252.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/atm/zatm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/atm/zatm.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/base/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/base/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/base/base.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/base/base.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/base/bus.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/base/bus.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/base/class.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/base/class.c</a></td><td class='right'>136</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/base/core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/base/core.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/base/dd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/base/dd.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/base/firmware_class.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/base/firmware_class.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/base/platform.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/base/platform.c</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/base/power/main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/base/power/main.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/block/aoe/aoe.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/block/aoe/aoe.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/block/aoe/aoeblk.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/block/aoe/aoeblk.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/block/aoe/aoechr.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/block/aoe/aoechr.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/block/aoe/aoecmd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/block/aoe/aoecmd.c</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/block/aoe/aoedev.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/block/aoe/aoedev.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/block/aoe/aoemain.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/block/aoe/aoemain.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/block/aoe/aoenet.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/block/aoe/aoenet.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/block/ataflop.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/block/ataflop.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/block/cciss.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/block/cciss.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/block/cciss_scsi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/block/cciss_scsi.c</a></td><td class='right'>151</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/block/cciss_scsi.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/block/cciss_scsi.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/block/cpqarray.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/block/cpqarray.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/block/floppy.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/block/floppy.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/block/hd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/block/hd.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/block/nbd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/block/nbd.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/block/paride/pg.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/block/paride/pg.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/block/paride/pt.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/block/paride/pt.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/block/pktcdvd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/block/pktcdvd.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/block/ps3disk.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/block/ps3disk.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/block/sunvdc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/block/sunvdc.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/block/ub.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/block/ub.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/block/viodasd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/block/viodasd.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/block/virtio_blk.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/block/virtio_blk.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/block/xen-blkfront.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/block/xen-blkfront.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/bluetooth/bluecard_cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/bluetooth/bluecard_cs.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/bluetooth/bt3c_cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/bluetooth/bt3c_cs.c</a></td><td class='right'>125</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/bluetooth/btuart_cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/bluetooth/btuart_cs.c</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/bluetooth/dtl1_cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/bluetooth/dtl1_cs.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/bluetooth/hci_bcsp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/bluetooth/hci_bcsp.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/bluetooth/hci_ldisc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/bluetooth/hci_ldisc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/bluetooth/hci_usb.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/bluetooth/hci_usb.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/cdrom/cdrom.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/cdrom/cdrom.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/cdrom/gdrom.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/cdrom/gdrom.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/Kconfig</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/agp/agp.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/agp/agp.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/agp/alpha-agp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/agp/alpha-agp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/agp/amd-k7-agp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/agp/amd-k7-agp.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/agp/amd64-agp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/agp/amd64-agp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/agp/ati-agp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/agp/ati-agp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/agp/efficeon-agp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/agp/efficeon-agp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/agp/generic.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/agp/generic.c</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/agp/hp-agp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/agp/hp-agp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/agp/i460-agp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/agp/i460-agp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/agp/intel-agp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/agp/intel-agp.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/agp/nvidia-agp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/agp/nvidia-agp.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/agp/parisc-agp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/agp/parisc-agp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/agp/sis-agp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/agp/sis-agp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/agp/sworks-agp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/agp/sworks-agp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/agp/uninorth-agp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/agp/uninorth-agp.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/agp/via-agp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/agp/via-agp.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/amiserial.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/amiserial.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/applicom.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/applicom.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/bsr.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/bsr.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/cyclades.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/cyclades.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/ds1286.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/ds1286.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/dsp56k.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/dsp56k.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/epca.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/epca.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/generic_serial.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/generic_serial.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/hpet.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/hpet.c</a></td><td class='right'>159</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/hvc_console.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/hvc_console.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/hvc_xen.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/hvc_xen.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/hw_random/n2-drv.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/hw_random/n2-drv.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/hw_random/omap-rng.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/hw_random/omap-rng.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/ip2/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/ip2/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/ip2/i2ellis.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/ip2/i2ellis.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/ip2/i2ellis.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/ip2/i2ellis.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/ip2/ip2base.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/ip2/ip2base.c</a></td><td class='right'>108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/ip2/ip2main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/ip2/ip2main.c</a></td><td class='right'>550</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 2.6%;'/><td class='none' style='width: 94.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/ipmi/ipmi_devintf.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/ipmi/ipmi_devintf.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/ipmi/ipmi_si_intf.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/ipmi/ipmi_si_intf.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/isicom.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/isicom.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/istallion.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/istallion.c</a></td><td class='right'>118</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/keyboard.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/keyboard.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/lp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/lp.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/mem.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/mem.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/misc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/misc.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/moxa.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/moxa.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/mxser.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/mxser.c</a></td><td class='right'>193</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/n_hdlc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/n_hdlc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/n_r3964.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/n_r3964.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/n_tty.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/n_tty.c</a></td><td class='right'>125</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/nozomi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/nozomi.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/pcmcia/cm4000_cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/pcmcia/cm4000_cs.c</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/pcmcia/cm4040_cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/pcmcia/cm4040_cs.c</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/pcmcia/ipwireless/main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/pcmcia/ipwireless/main.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/pcmcia/ipwireless/tty.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/pcmcia/ipwireless/tty.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/pcmcia/synclink_cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/pcmcia/synclink_cs.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/ppdev.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/ppdev.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/pty.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/pty.c</a></td><td class='right'>335</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/random.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/random.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/raw.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/raw.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/rtc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/rtc.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/snsc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/snsc.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/stallion.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/stallion.c</a></td><td class='right'>143</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/sx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/sx.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/sysrq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/sysrq.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/tpm/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/tpm/Kconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/tpm/tpm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/tpm/tpm.c</a></td><td class='right'>132</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/tpm/tpm.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/tpm/tpm.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/tpm/tpm_tis.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/tpm/tpm_tis.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/tty_audit.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/tty_audit.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/tty_buffer.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/tty_buffer.c</a></td><td class='right'>511</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/tty_io.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/tty_io.c</a></td><td class='right'>1387</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 9.8%;'/><td class='none' style='width: 86.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/tty_ioctl.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/tty_ioctl.c</a></td><td class='right'>212</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/tty_port.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/tty_port.c</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/vc_screen.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/vc_screen.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/viotape.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/viotape.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/vt.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/vt.c</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/vt_ioctl.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/vt_ioctl.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/char/xilinx_hwicap/xilinx_hwicap.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/xilinx_hwicap/xilinx_hwicap.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/cpufreq/cpufreq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/cpufreq/cpufreq.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/cpufreq/cpufreq_conservative.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/cpufreq/cpufreq_conservative.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/cpufreq/cpufreq_ondemand.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/cpufreq/cpufreq_ondemand.c</a></td><td class='right'>147</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/cpufreq/cpufreq_performance.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/cpufreq/cpufreq_performance.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/cpufreq/cpufreq_powersave.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/cpufreq/cpufreq_powersave.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/cpufreq/cpufreq_userspace.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/cpufreq/cpufreq_userspace.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/dca/dca-sysfs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/dca/dca-sysfs.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/edac/i5000_edac.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/edac/i5000_edac.c</a></td><td class='right'>196</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/edac/i82443bxgx_edac.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/edac/i82443bxgx_edac.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/edac/mpc85xx_edac.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/edac/mpc85xx_edac.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/firewire/fw-card.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/firewire/fw-card.c</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/firewire/fw-cdev.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/firewire/fw-cdev.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/firewire/fw-device.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/firewire/fw-device.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/firewire/fw-sbp2.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/firewire/fw-sbp2.c</a></td><td class='right'>116</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/firewire/fw-transaction.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/firewire/fw-transaction.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/firewire/fw-transaction.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/firewire/fw-transaction.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/firmware/dmi_scan.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/firmware/dmi_scan.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/firmware/iscsi_ibft.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/firmware/iscsi_ibft.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/gpio/gpiolib.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpio/gpiolib.c</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/gpio/max7301.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpio/max7301.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/gpio/max732x.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpio/max732x.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/gpio/mcp23s08.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpio/mcp23s08.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/gpio/pca953x.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpio/pca953x.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/gpio/pcf857x.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpio/pcf857x.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/gpu/drm/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/Kconfig</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/gpu/drm/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/gpu/drm/drm_agpsupport.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/drm_agpsupport.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/gpu/drm/drm_cache.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/drm_cache.c</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/gpu/drm/drm_drv.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/drm_drv.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/gpu/drm/drm_fops.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/drm_fops.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/gpu/drm/drm_gem.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/drm_gem.c</a></td><td class='right'>421</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/gpu/drm/drm_irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/drm_irq.c</a></td><td class='right'>464</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/gpu/drm/drm_memory.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/drm_memory.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/gpu/drm/drm_mm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/drm_mm.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/gpu/drm/drm_proc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/drm_proc.c</a></td><td class='right'>135</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/gpu/drm/drm_stub.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/drm_stub.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/gpu/drm/drm_sysfs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/drm_sysfs.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/gpu/drm/i915/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/i915/Makefile</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/gpu/drm/i915/i915_dma.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/i915/i915_dma.c</a></td><td class='right'>336</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/gpu/drm/i915/i915_drv.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/i915/i915_drv.c</a></td><td class='right'>476</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 4.6%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/gpu/drm/i915/i915_drv.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/i915/i915_drv.h</a></td><td class='right'>1180</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 8.3%;'/><td class='none' style='width: 88.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/gpu/drm/i915/i915_gem.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/i915/i915_gem.c</a></td><td class='right'>2558</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 25.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 74.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/gpu/drm/i915/i915_gem_debug.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/i915/i915_gem_debug.c</a></td><td class='right'>201</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/gpu/drm/i915/i915_gem_proc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/i915/i915_gem_proc.c</a></td><td class='right'>292</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/gpu/drm/i915/i915_gem_tiling.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/i915/i915_gem_tiling.c</a></td><td class='right'>257</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/gpu/drm/i915/i915_irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/i915/i915_irq.c</a></td><td class='right'>514</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/gpu/drm/i915/i915_opregion.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/i915/i915_opregion.c</a></td><td class='right'>371</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/gpu/drm/i915/i915_reg.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/i915/i915_reg.h</a></td><td class='right'>1417</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 14.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 85.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/gpu/drm/i915/i915_suspend.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/i915/i915_suspend.c</a></td><td class='right'>509</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/gpu/drm/mga/mga_drv.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/mga/mga_drv.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/gpu/drm/mga/mga_drv.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/mga/mga_drv.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/gpu/drm/mga/mga_irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/mga/mga_irq.c</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/gpu/drm/mga/mga_state.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/mga/mga_state.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/gpu/drm/r128/r128_drv.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/r128/r128_drv.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/gpu/drm/r128/r128_drv.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/r128/r128_drv.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/gpu/drm/r128/r128_irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/r128/r128_irq.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/gpu/drm/r128/r128_state.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/r128/r128_state.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/gpu/drm/radeon/radeon_cp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/radeon/radeon_cp.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/gpu/drm/radeon/radeon_drv.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/radeon/radeon_drv.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/gpu/drm/radeon/radeon_drv.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/radeon/radeon_drv.h</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/gpu/drm/radeon/radeon_irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/radeon/radeon_irq.c</a></td><td class='right'>268</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/gpu/drm/radeon/radeon_state.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/radeon/radeon_state.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/gpu/drm/sis/sis_mm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/sis/sis_mm.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/gpu/drm/via/via_drv.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/via/via_drv.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/gpu/drm/via/via_drv.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/via/via_drv.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/gpu/drm/via/via_irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/via/via_irq.c</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/gpu/drm/via/via_mm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/via/via_mm.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/hid/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/Kconfig</a></td><td class='right'>197</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/hid/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/Makefile</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/hid/hid-a4tech.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/hid-a4tech.c</a></td><td class='right'>162</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/hid/hid-apple.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/hid-apple.c</a></td><td class='right'>484</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/hid/hid-belkin.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/hid-belkin.c</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/hid/hid-bright.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/hid-bright.c</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/hid/hid-cherry.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/hid-cherry.c</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/hid/hid-chicony.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/hid-chicony.c</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/hid/hid-core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/hid-core.c</a></td><td class='right'>1183</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.4%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 88.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/hid/hid-cypress.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/hid-cypress.c</a></td><td class='right'>158</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/hid/hid-dell.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/hid-dell.c</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/hid/hid-dummy.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/hid-dummy.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/hid/hid-ezkey.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/hid-ezkey.c</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/hid/hid-gyration.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/hid-gyration.c</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/hid/hid-ids.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/hid-ids.h</a></td><td class='right'>406</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/hid/hid-input-quirks.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/hid-input-quirks.c</a></td><td class='right'>484</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.8%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/hid/hid-input.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/hid-input.c</a></td><td class='right'>915</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 5.9%;'/><td class='none' style='width: 90.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/hid/hid-lg.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/hid-lg.c</a></td><td class='right'>342</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/hid/hid-lg.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/hid-lg.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/hid/hid-lg2ff.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/hid-lg2ff.c</a> (renamed from drivers/hid/usbhid/hid-lg2ff.c)</td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/hid/hid-lgff.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/hid-lgff.c</a> (renamed from drivers/hid/usbhid/hid-lgff.c)</td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/hid/hid-microsoft.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/hid-microsoft.c</a></td><td class='right'>219</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/hid/hid-monterey.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/hid-monterey.c</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/hid/hid-petalynx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/hid-petalynx.c</a></td><td class='right'>122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/hid/hid-pl.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/hid-pl.c</a> (renamed from drivers/hid/usbhid/hid-plff.c)</td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/hid/hid-samsung.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/hid-samsung.c</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/hid/hid-sony.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/hid-sony.c</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/hid/hid-sunplus.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/hid-sunplus.c</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/hid/hid-tmff.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/hid-tmff.c</a> (renamed from drivers/hid/usbhid/hid-tmff.c)</td><td class='right'>138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/hid/hid-zpff.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/hid-zpff.c</a> (renamed from drivers/hid/usbhid/hid-zpff.c)</td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/hid/hidraw.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/hidraw.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/hid/usbhid/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/usbhid/Kconfig</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/hid/usbhid/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/usbhid/Makefile</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/hid/usbhid/hid-core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/usbhid/hid-core.c</a></td><td class='right'>463</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/hid/usbhid/hid-ff.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/usbhid/hid-ff.c</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/hid/usbhid/hid-pidff.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/usbhid/hid-pidff.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/hid/usbhid/hid-quirks.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/usbhid/hid-quirks.c</a></td><td class='right'>934</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 9.3%;'/><td class='none' style='width: 90.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/hid/usbhid/hiddev.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/usbhid/hiddev.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/hid/usbhid/usbhid.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/usbhid/usbhid.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/hid/usbhid/usbkbd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/usbhid/usbkbd.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/hid/usbhid/usbmouse.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/usbhid/usbmouse.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/hwmon/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hwmon/Kconfig</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/hwmon/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hwmon/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/hwmon/adm1026.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hwmon/adm1026.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/hwmon/adm1029.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hwmon/adm1029.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/hwmon/ams/ams-core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hwmon/ams/ams-core.c</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/hwmon/ams/ams-i2c.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hwmon/ams/ams-i2c.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/hwmon/ams/ams-input.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hwmon/ams/ams-input.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/hwmon/ams/ams-pmu.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hwmon/ams/ams-pmu.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/hwmon/ams/ams.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hwmon/ams/ams.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/hwmon/dme1737.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hwmon/dme1737.c</a></td><td class='right'>320</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/hwmon/hwmon.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hwmon/hwmon.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/hwmon/ibmaem.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hwmon/ibmaem.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/hwmon/ibmpex.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hwmon/ibmpex.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/hwmon/it87.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hwmon/it87.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/hwmon/lm78.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hwmon/lm78.c</a></td><td class='right'>270</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/hwmon/lm85.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hwmon/lm85.c</a></td><td class='right'>352</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/hwmon/lm87.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hwmon/lm87.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/hwmon/lm90.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hwmon/lm90.c</a></td><td class='right'>444</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/hwmon/max1111.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hwmon/max1111.c</a></td><td class='right'>244</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/hwmon/max1619.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hwmon/max1619.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/hwmon/ultra45_env.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hwmon/ultra45_env.c</a></td><td class='right'>320</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/hwmon/w83781d.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hwmon/w83781d.c</a></td><td class='right'>976</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.3%;'/><td class='rem' style='width: 4.4%;'/><td class='none' style='width: 90.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/hwmon/w83791d.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hwmon/w83791d.c</a></td><td class='right'>324</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/i2c/busses/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/i2c/busses/Kconfig</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/i2c/busses/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/i2c/busses/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/i2c/busses/i2c-highlander.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/i2c/busses/i2c-highlander.c</a></td><td class='right'>498</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/i2c/busses/i2c-mpc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/i2c/busses/i2c-mpc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/i2c/busses/i2c-omap.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/i2c/busses/i2c-omap.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/i2c/busses/i2c-parport-light.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/i2c/busses/i2c-parport-light.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/i2c/busses/i2c-pca-isa.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/i2c/busses/i2c-pca-isa.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/i2c/busses/i2c-powermac.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/i2c/busses/i2c-powermac.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/i2c/busses/i2c-pxa.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/i2c/busses/i2c-pxa.c</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/i2c/busses/i2c-viapro.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/i2c/busses/i2c-viapro.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/i2c/chips/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/i2c/chips/Kconfig</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/i2c/chips/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/i2c/chips/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/i2c/chips/isp1301_omap.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/i2c/chips/isp1301_omap.c</a></td><td class='right'>141</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/i2c/chips/mcu_mpc8349emitx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/i2c/chips/mcu_mpc8349emitx.c</a></td><td class='right'>209</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/i2c/chips/tps65010.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/i2c/chips/tps65010.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/i2c/i2c-core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/i2c/i2c-core.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/i2c/i2c-dev.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/i2c/i2c-dev.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/Kconfig</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/Makefile</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/arm/icside.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/arm/icside.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/arm/palm_bk3710.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/arm/palm_bk3710.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/h8300/ide-h8300.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/h8300/ide-h8300.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/ide-acpi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/ide-acpi.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/ide-atapi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/ide-atapi.c</a></td><td class='right'>405</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/ide-cd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/ide-cd.c</a></td><td class='right'>331</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/ide-cd.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/ide-cd.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/ide-disk.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/ide-disk.c</a></td><td class='right'>572</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 3.9%;'/><td class='none' style='width: 94.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/ide-disk.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/ide-disk.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/ide-disk_ioctl.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/ide-disk_ioctl.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/ide-disk_proc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/ide-disk_proc.c</a></td><td class='right'>129</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/ide-dma-sff.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/ide-dma-sff.c</a></td><td class='right'>356</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/ide-dma.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/ide-dma.c</a></td><td class='right'>519</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 4.5%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/ide-floppy.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/ide-floppy.c</a></td><td class='right'>954</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 7.8%;'/><td class='none' style='width: 90.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/ide-floppy.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/ide-floppy.h</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/ide-floppy_ioctl.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/ide-floppy_ioctl.c</a></td><td class='right'>293</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/ide-floppy_proc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/ide-floppy_proc.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/ide-generic.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/ide-generic.c</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/ide-io.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/ide-io.c</a></td><td class='right'>344</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/ide-ioctls.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/ide-ioctls.c</a></td><td class='right'>299</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/ide-iops.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/ide-iops.c</a></td><td class='right'>318</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/ide-lib.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/ide-lib.c</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/ide-park.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/ide-park.c</a></td><td class='right'>121</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/ide-probe.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/ide-probe.c</a></td><td class='right'>461</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/ide-proc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/ide-proc.c</a></td><td class='right'>310</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/ide-tape.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/ide-tape.c</a></td><td class='right'>612</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 4.4%;'/><td class='none' style='width: 93.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/ide-taskfile.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/ide-taskfile.c</a></td><td class='right'>250</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/ide-timings.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/ide-timings.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/ide.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/ide.c</a></td><td class='right'>351</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/legacy/ali14xx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/legacy/ali14xx.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/legacy/buddha.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/legacy/buddha.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/legacy/dtc2278.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/legacy/dtc2278.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/legacy/falconide.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/legacy/falconide.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/legacy/gayle.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/legacy/gayle.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/legacy/ht6560b.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/legacy/ht6560b.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/legacy/ide-4drives.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/legacy/ide-4drives.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/legacy/ide-cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/legacy/ide-cs.c</a></td><td class='right'>159</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/legacy/macide.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/legacy/macide.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/legacy/q40ide.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/legacy/q40ide.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/legacy/qd65xx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/legacy/qd65xx.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/legacy/umc8672.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/legacy/umc8672.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/mips/au1xxx-ide.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/mips/au1xxx-ide.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/pci/aec62xx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/pci/aec62xx.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/pci/alim15x3.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/pci/alim15x3.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/pci/amd74xx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/pci/amd74xx.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/pci/atiixp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/pci/atiixp.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/pci/cmd640.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/pci/cmd640.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/pci/cmd64x.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/pci/cmd64x.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/pci/cs5520.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/pci/cs5520.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/pci/cs5530.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/pci/cs5530.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/pci/cs5535.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/pci/cs5535.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/pci/cy82c693.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/pci/cy82c693.c</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/pci/delkin_cb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/pci/delkin_cb.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/pci/generic.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/pci/generic.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/pci/hpt34x.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/pci/hpt34x.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/pci/hpt366.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/pci/hpt366.c</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/pci/it8213.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/pci/it8213.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/pci/it821x.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/pci/it821x.c</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/pci/jmicron.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/pci/jmicron.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/pci/ns87415.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/pci/ns87415.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/pci/opti621.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/pci/opti621.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/pci/pdc202xx_new.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/pci/pdc202xx_new.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/pci/pdc202xx_old.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/pci/pdc202xx_old.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/pci/piix.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/pci/piix.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/pci/rz1000.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/pci/rz1000.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/pci/sc1200.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/pci/sc1200.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/pci/scc_pata.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/pci/scc_pata.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/pci/serverworks.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/pci/serverworks.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/pci/sgiioc4.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/pci/sgiioc4.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/pci/siimage.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/pci/siimage.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/pci/sis5513.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/pci/sis5513.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/pci/sl82c105.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/pci/sl82c105.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/pci/slc90e66.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/pci/slc90e66.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/pci/tc86c001.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/pci/tc86c001.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/pci/triflex.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/pci/triflex.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/pci/trm290.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/pci/trm290.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/pci/via82cxxx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/pci/via82cxxx.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/ppc/pmac.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/ppc/pmac.c</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ide/setup-pci.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/setup-pci.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ieee1394/csr1212.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ieee1394/csr1212.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ieee1394/dv1394.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ieee1394/dv1394.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ieee1394/eth1394.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ieee1394/eth1394.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ieee1394/nodemgr.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ieee1394/nodemgr.c</a></td><td class='right'>279</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ieee1394/nodemgr.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ieee1394/nodemgr.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ieee1394/raw1394-private.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ieee1394/raw1394-private.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ieee1394/raw1394.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ieee1394/raw1394.c</a></td><td class='right'>238</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ieee1394/sbp2.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ieee1394/sbp2.c</a></td><td class='right'>218</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ieee1394/sbp2.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ieee1394/sbp2.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ieee1394/video1394.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ieee1394/video1394.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/infiniband/core/cm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/infiniband/core/cm.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/infiniband/core/mad.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/infiniband/core/mad.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/infiniband/core/user_mad.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/infiniband/core/user_mad.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/infiniband/core/uverbs_main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/infiniband/core/uverbs_main.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/infiniband/hw/amso1100/c2_provider.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/infiniband/hw/amso1100/c2_provider.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/infiniband/hw/cxgb3/iwch_provider.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/infiniband/hw/cxgb3/iwch_provider.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/infiniband/hw/ehca/ehca_classes.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/infiniband/hw/ehca/ehca_classes.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/infiniband/hw/ehca/ehca_cq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/infiniband/hw/ehca/ehca_cq.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/infiniband/hw/ehca/ehca_iverbs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/infiniband/hw/ehca/ehca_iverbs.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/infiniband/hw/ehca/ehca_qp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/infiniband/hw/ehca/ehca_qp.c</a></td><td class='right'>225</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/infiniband/hw/ehca/ehca_reqs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/infiniband/hw/ehca/ehca_reqs.c</a></td><td class='right'>211</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/infiniband/hw/ipath/ipath_file_ops.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/infiniband/hw/ipath/ipath_file_ops.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/infiniband/hw/ipath/ipath_rc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/infiniband/hw/ipath/ipath_rc.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/infiniband/hw/ipath/ipath_ruc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/infiniband/hw/ipath/ipath_ruc.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/infiniband/hw/ipath/ipath_verbs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/infiniband/hw/ipath/ipath_verbs.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/infiniband/hw/mlx4/qp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/infiniband/hw/mlx4/qp.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/infiniband/hw/mthca/mthca_catas.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/infiniband/hw/mthca/mthca_catas.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/infiniband/hw/mthca/mthca_eq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/infiniband/hw/mthca/mthca_eq.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/infiniband/hw/mthca/mthca_main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/infiniband/hw/mthca/mthca_main.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/infiniband/hw/nes/nes.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/infiniband/hw/nes/nes.c</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/infiniband/hw/nes/nes.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/infiniband/hw/nes/nes.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/infiniband/hw/nes/nes_cm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/infiniband/hw/nes/nes_cm.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/infiniband/hw/nes/nes_hw.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/infiniband/hw/nes/nes_hw.c</a></td><td class='right'>205</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/infiniband/hw/nes/nes_hw.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/infiniband/hw/nes/nes_hw.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/infiniband/hw/nes/nes_nic.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/infiniband/hw/nes/nes_nic.c</a></td><td class='right'>122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/infiniband/hw/nes/nes_verbs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/infiniband/hw/nes/nes_verbs.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/infiniband/ulp/ipoib/ipoib.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/infiniband/ulp/ipoib/ipoib.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/infiniband/ulp/ipoib/ipoib_cm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/infiniband/ulp/ipoib/ipoib_cm.c</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/infiniband/ulp/ipoib/ipoib_ib.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/infiniband/ulp/ipoib/ipoib_ib.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/infiniband/ulp/ipoib/ipoib_main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/infiniband/ulp/ipoib/ipoib_main.c</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/infiniband/ulp/ipoib/ipoib_multicast.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/infiniband/ulp/ipoib/ipoib_multicast.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/infiniband/ulp/iser/iscsi_iser.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/infiniband/ulp/iser/iscsi_iser.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/infiniband/ulp/srp/ib_srp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/infiniband/ulp/srp/ib_srp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/input/gameport/gameport.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/gameport/gameport.c</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/input/joystick/a3d.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/joystick/a3d.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/input/joystick/adi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/joystick/adi.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/input/joystick/analog.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/joystick/analog.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/input/joystick/cobra.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/joystick/cobra.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/input/joystick/gf2k.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/joystick/gf2k.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/input/joystick/grip.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/joystick/grip.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/input/joystick/grip_mp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/joystick/grip_mp.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/input/joystick/guillemot.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/joystick/guillemot.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/input/joystick/iforce/iforce-ff.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/joystick/iforce/iforce-ff.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/input/joystick/iforce/iforce-main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/joystick/iforce/iforce-main.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/input/joystick/iforce/iforce-packets.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/joystick/iforce/iforce-packets.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/input/joystick/iforce/iforce-usb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/joystick/iforce/iforce-usb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/input/joystick/interact.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/joystick/interact.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/input/joystick/joydump.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/joystick/joydump.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/input/joystick/sidewinder.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/joystick/sidewinder.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/input/joystick/tmdc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/joystick/tmdc.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/input/joystick/xpad.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/joystick/xpad.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/input/keyboard/atkbd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/keyboard/atkbd.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/input/keyboard/bf54x-keys.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/keyboard/bf54x-keys.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/input/keyboard/corgikbd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/keyboard/corgikbd.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/input/keyboard/gpio_keys.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/keyboard/gpio_keys.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/input/keyboard/omap-keypad.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/keyboard/omap-keypad.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/input/keyboard/spitzkbd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/keyboard/spitzkbd.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/input/keyboard/tosakbd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/keyboard/tosakbd.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/input/misc/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/misc/Kconfig</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/input/misc/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/misc/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/input/misc/ati_remote.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/misc/ati_remote.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/input/misc/ati_remote2.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/misc/ati_remote2.c</a></td><td class='right'>263</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/input/misc/cm109.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/misc/cm109.c</a></td><td class='right'>882</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/input/misc/hp_sdc_rtc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/misc/hp_sdc_rtc.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/input/misc/sparcspkr.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/misc/sparcspkr.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/input/misc/wistron_btns.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/misc/wistron_btns.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/input/misc/yealink.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/misc/yealink.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/input/mouse/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/mouse/Kconfig</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/input/mouse/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/mouse/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/input/mouse/alps.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/mouse/alps.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/input/mouse/appletouch.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/mouse/appletouch.c</a></td><td class='right'>299</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/input/mouse/hgpk.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/mouse/hgpk.c</a></td><td class='right'>477</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/input/mouse/hgpk.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/mouse/hgpk.h</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/input/mouse/logips2pp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/mouse/logips2pp.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/input/mouse/psmouse-base.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/mouse/psmouse-base.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/input/mouse/psmouse.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/mouse/psmouse.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/input/mouse/trackpoint.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/mouse/trackpoint.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/input/serio/hp_sdc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/serio/hp_sdc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/input/serio/i8042-io.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/serio/i8042-io.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/input/serio/i8042-sparcio.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/serio/i8042-sparcio.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/input/serio/i8042-x86ia64io.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/serio/i8042-x86ia64io.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/input/serio/serio_raw.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/serio/serio_raw.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/input/tablet/acecad.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/tablet/acecad.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/input/tablet/aiptek.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/tablet/aiptek.c</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/input/tablet/gtco.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/tablet/gtco.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/input/tablet/kbtab.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/tablet/kbtab.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/input/tablet/wacom_sys.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/tablet/wacom_sys.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/input/touchscreen/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/touchscreen/Kconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/input/touchscreen/ads7846.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/touchscreen/ads7846.c</a></td><td class='right'>162</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/input/touchscreen/atmel_tsadcc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/touchscreen/atmel_tsadcc.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/input/touchscreen/mainstone-wm97xx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/touchscreen/mainstone-wm97xx.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/input/touchscreen/ucb1400_ts.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/touchscreen/ucb1400_ts.c</a></td><td class='right'>382</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/input/touchscreen/wm9705.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/touchscreen/wm9705.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/input/touchscreen/wm9712.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/touchscreen/wm9712.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/input/touchscreen/wm9713.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/touchscreen/wm9713.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/input/touchscreen/wm97xx-core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/touchscreen/wm97xx-core.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/input/xen-kbdfront.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/xen-kbdfront.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/isdn/capi/capi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/isdn/capi/capi.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/isdn/capi/kcapi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/isdn/capi/kcapi.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/isdn/gigaset/ser-gigaset.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/isdn/gigaset/ser-gigaset.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/isdn/hardware/avm/avm_cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/isdn/hardware/avm/avm_cs.c</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/isdn/hardware/mISDN/hfc_pci.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/isdn/hardware/mISDN/hfc_pci.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/isdn/hardware/mISDN/hfcpci.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/isdn/hardware/mISDN/hfcpci.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/isdn/hisax/avma1_cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/isdn/hisax/avma1_cs.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/isdn/hisax/elsa_cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/isdn/hisax/elsa_cs.c</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/isdn/hisax/sedlbauer_cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/isdn/hisax/sedlbauer_cs.c</a></td><td class='right'>197</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/isdn/hisax/teles_cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/isdn/hisax/teles_cs.c</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/isdn/i4l/isdn_ppp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/isdn/i4l/isdn_ppp.c</a></td><td class='right'>352</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/isdn/mISDN/dsp_cmx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/isdn/mISDN/dsp_cmx.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/isdn/mISDN/timerdev.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/isdn/mISDN/timerdev.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/leds/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/leds/Kconfig</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/leds/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/leds/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/leds/led-class.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/leds/led-class.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/leds/leds-corgi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/leds/leds-corgi.c</a></td><td class='right'>124</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/leds/leds-spitz.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/leds/leds-spitz.c</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/leds/leds-sunfire.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/leds/leds-sunfire.c</a></td><td class='right'>273</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/macintosh/adb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/macintosh/adb.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/md/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/md/Kconfig</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/md/dm-crypt.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/md/dm-crypt.c</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/md/dm-exception-store.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/md/dm-exception-store.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/md/dm-ioctl.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/md/dm-ioctl.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/md/dm-mpath.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/md/dm-mpath.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/md/dm-mpath.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/md/dm-mpath.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/md/dm-raid1.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/md/dm-raid1.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/md/dm-stripe.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/md/dm-stripe.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/md/dm-table.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/md/dm-table.c</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/md/dm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/md/dm.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/md/dm.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/md/dm.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/md/faulty.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/md/faulty.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/md/linear.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/md/linear.c</a></td><td class='right'>143</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/md/md.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/md/md.c</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/md/multipath.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/md/multipath.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/md/raid0.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/md/raid0.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/md/raid1.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/md/raid1.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/md/raid10.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/md/raid10.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/md/raid5.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/md/raid5.c</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/md/raid6.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/md/raid6.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/common/ir-keymaps.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/common/ir-keymaps.c</a></td><td class='right'>280</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/common/saa7146_core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/common/saa7146_core.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/common/saa7146_fops.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/common/saa7146_fops.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/common/tuners/mt2060.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/common/tuners/mt2060.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/common/tuners/mxl5005s.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/common/tuners/mxl5005s.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/common/tuners/mxl5007t.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/common/tuners/mxl5007t.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/common/tuners/tda18271-fe.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/common/tuners/tda18271-fe.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/common/tuners/tda827x.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/common/tuners/tda827x.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/common/tuners/tda827x.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/common/tuners/tda827x.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/common/tuners/tda8290.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/common/tuners/tda8290.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/common/tuners/tda8290.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/common/tuners/tda8290.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/common/tuners/tda9887.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/common/tuners/tda9887.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/common/tuners/tuner-simple.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/common/tuners/tuner-simple.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/common/tuners/tuner-types.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/common/tuners/tuner-types.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/common/tuners/tuner-xc2028.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/common/tuners/tuner-xc2028.c</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/common/tuners/tuner-xc2028.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/common/tuners/tuner-xc2028.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/common/tuners/xc5000.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/common/tuners/xc5000.c</a></td><td class='right'>180</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/common/tuners/xc5000.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/common/tuners/xc5000.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/common/tuners/xc5000_priv.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/common/tuners/xc5000_priv.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/Kconfig</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/b2c2/flexcop-dma.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/b2c2/flexcop-dma.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/bt8xx/dvb-bt8xx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/bt8xx/dvb-bt8xx.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/cinergyT2/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/cinergyT2/Kconfig</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/cinergyT2/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/cinergyT2/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/cinergyT2/cinergyT2.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/cinergyT2/cinergyT2.c</a></td><td class='right'>1105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 11.0%;'/><td class='none' style='width: 89.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/dm1105/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/dm1105/Kconfig</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/dm1105/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/dm1105/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/dm1105/dm1105.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/dm1105/dm1105.c</a></td><td class='right'>923</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/dvb-core/dvb_frontend.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/dvb-core/dvb_frontend.c</a></td><td class='right'>726</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 92.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/dvb-core/dvb_frontend.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/dvb-core/dvb_frontend.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/dvb-core/dvbdev.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/dvb-core/dvbdev.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/dvb-core/dvbdev.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/dvb-core/dvbdev.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/dvb-usb/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/dvb-usb/Kconfig</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/dvb-usb/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/dvb-usb/Makefile</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/dvb-usb/af9005-remote.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/dvb-usb/af9005-remote.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/dvb-usb/af9005-script.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/dvb-usb/af9005-script.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/dvb-usb/af9005.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/dvb-usb/af9005.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/dvb-usb/af9015.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/dvb-usb/af9015.c</a></td><td class='right'>1474</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 14.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 85.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/dvb-usb/af9015.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/dvb-usb/af9015.h</a></td><td class='right'>524</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/dvb-usb/anysee.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/dvb-usb/anysee.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/dvb-usb/cinergyT2-core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/dvb-usb/cinergyT2-core.c</a></td><td class='right'>268</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/dvb-usb/cinergyT2-fe.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/dvb-usb/cinergyT2-fe.c</a></td><td class='right'>351</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/dvb-usb/cinergyT2.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/dvb-usb/cinergyT2.h</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/dvb-usb/cxusb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/dvb-usb/cxusb.c</a></td><td class='right'>504</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/dvb-usb/dib0700.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/dvb-usb/dib0700.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/dvb-usb/dib0700_core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/dvb-usb/dib0700_core.c</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/dvb-usb/dib0700_devices.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/dvb-usb/dib0700_devices.c</a></td><td class='right'>195</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/dvb-usb/dtv5100.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/dvb-usb/dtv5100.c</a></td><td class='right'>240</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/dvb-usb/dtv5100.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/dvb-usb/dtv5100.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/dvb-usb/dvb-usb-ids.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/dvb-usb/dvb-usb-ids.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/dvb-usb/dw2102.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/dvb-usb/dw2102.c</a></td><td class='right'>584</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.9%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 94.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/dvb-usb/dw2102.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/dvb-usb/dw2102.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/frontends/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/Kconfig</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/frontends/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/Makefile</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/frontends/af9013.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/af9013.c</a></td><td class='right'>1685</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 16.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 83.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/frontends/af9013.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/af9013.h</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/frontends/af9013_priv.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/af9013_priv.h</a></td><td class='right'>869</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/frontends/au8522.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/au8522.c</a></td><td class='right'>133</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/frontends/au8522.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/au8522.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/frontends/cx22702.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/cx22702.c</a></td><td class='right'>506</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 95.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/frontends/cx22702.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/cx22702.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/frontends/cx24110.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/cx24110.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/frontends/cx24116.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/cx24116.c</a></td><td class='right'>1470</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 14.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 85.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/frontends/cx24116.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/cx24116.h</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/frontends/cx24123.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/cx24123.c</a></td><td class='right'>228</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/frontends/cx24123.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/cx24123.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/frontends/dib0070.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/dib0070.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/frontends/dib7000m.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/dib7000m.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/frontends/dib7000p.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/dib7000p.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/frontends/dib7000p.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/dib7000p.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/frontends/drx397xD.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/drx397xD.c</a></td><td class='right'>288</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/frontends/drx397xD.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/drx397xD.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/frontends/dvb_dummy_fe.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/dvb_dummy_fe.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/frontends/eds1547.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/eds1547.h</a></td><td class='right'>133</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/frontends/lgs8gl5.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/lgs8gl5.c</a></td><td class='right'>454</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/frontends/lgs8gl5.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/lgs8gl5.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/frontends/nxt200x.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/nxt200x.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/frontends/or51211.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/or51211.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/frontends/s5h1409.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/s5h1409.c</a></td><td class='right'>138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/frontends/s5h1409.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/s5h1409.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/frontends/s5h1411.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/s5h1411.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/frontends/si21xx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/si21xx.c</a></td><td class='right'>974</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/frontends/si21xx.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/si21xx.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/frontends/sp887x.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/sp887x.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/frontends/stb6000.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/stb6000.c</a></td><td class='right'>255</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/frontends/stb6000.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/stb6000.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/frontends/stv0288.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/stv0288.c</a></td><td class='right'>618</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/frontends/stv0288.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/stv0288.h</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/frontends/stv0299.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/stv0299.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/frontends/stv0299.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/stv0299.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/frontends/tda10048.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/tda10048.c</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/frontends/tdhd1.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/tdhd1.h</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/frontends/z0194a.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/z0194a.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/siano/sms-cards.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/siano/sms-cards.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/ttpci/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/ttpci/Kconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/ttpci/av7110.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/ttpci/av7110.c</a></td><td class='right'>127</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/ttpci/av7110.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/ttpci/av7110.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/ttpci/av7110_av.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/ttpci/av7110_av.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/ttpci/budget-av.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/ttpci/budget-av.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/ttpci/budget-ci.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/ttpci/budget-ci.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/ttpci/budget-core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/ttpci/budget-core.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/ttpci/budget-patch.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/ttpci/budget-patch.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/ttpci/budget.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/ttpci/budget.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/ttpci/budget.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/ttpci/budget.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/ttusb-dec/ttusb_dec.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/ttusb-dec/ttusb_dec.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/dvb/ttusb-dec/ttusbdecfe.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/ttusb-dec/ttusbdecfe.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/radio/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/radio/Kconfig</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/radio/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/radio/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/radio/dsbr100.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/radio/dsbr100.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/radio/radio-aimslab.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/radio/radio-aimslab.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/radio/radio-aztech.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/radio/radio-aztech.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/radio/radio-cadet.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/radio/radio-cadet.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/radio/radio-gemtek-pci.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/radio/radio-gemtek-pci.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/radio/radio-gemtek.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/radio/radio-gemtek.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/radio/radio-maestro.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/radio/radio-maestro.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/radio/radio-maxiradio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/radio/radio-maxiradio.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/radio/radio-mr800.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/radio/radio-mr800.c</a></td><td class='right'>628</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/radio/radio-rtrack2.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/radio/radio-rtrack2.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/radio/radio-sf16fmi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/radio/radio-sf16fmi.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/radio/radio-sf16fmr2.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/radio/radio-sf16fmr2.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/radio/radio-si470x.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/radio/radio-si470x.c</a></td><td class='right'>258</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/radio/radio-terratec.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/radio/radio-terratec.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/radio/radio-trust.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/radio/radio-trust.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/radio/radio-typhoon.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/radio/radio-typhoon.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/radio/radio-zoltrix.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/radio/radio-zoltrix.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/Kconfig</a></td><td class='right'>235</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/Makefile</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/adv7170.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/adv7170.c</a></td><td class='right'>251</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/adv7175.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/adv7175.c</a></td><td class='right'>243</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/arv.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/arv.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/au0828/au0828-cards.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/au0828/au0828-cards.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/au0828/au0828-core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/au0828/au0828-core.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/au0828/au0828-dvb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/au0828/au0828-dvb.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/au0828/au0828.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/au0828/au0828.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/bt819.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/bt819.c</a></td><td class='right'>321</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/bt856.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/bt856.c</a></td><td class='right'>224</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/bt866.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/bt866.c</a></td><td class='right'>255</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/bt8xx/bttv-cards.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/bt8xx/bttv-cards.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/bt8xx/bttv-driver.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/bt8xx/bttv-driver.c</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/bt8xx/bttv-input.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/bt8xx/bttv-input.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/bt8xx/bttv.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/bt8xx/bttv.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/btcx-risc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/btcx-risc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/bw-qcam.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/bw-qcam.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/bw-qcam.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/bw-qcam.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/c-qcam.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/c-qcam.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/cafe_ccic.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cafe_ccic.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/cpia.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cpia.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/cpia2/cpia2_core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cpia2/cpia2_core.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/cpia2/cpia2_usb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cpia2/cpia2_usb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/cpia2/cpia2_v4l.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cpia2/cpia2_v4l.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/cx18/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx18/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/cx18/cx18-audio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx18/cx18-audio.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/cx18/cx18-av-core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx18/cx18-av-core.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/cx18/cx18-av-core.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx18/cx18-av-core.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/cx18/cx18-av-firmware.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx18/cx18-av-firmware.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/cx18/cx18-cards.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx18/cx18-cards.c</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/cx18/cx18-driver.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx18/cx18-driver.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/cx18/cx18-driver.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx18/cx18-driver.h</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/cx18/cx18-dvb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx18/cx18-dvb.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/cx18/cx18-fileops.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx18/cx18-fileops.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/cx18/cx18-firmware.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx18/cx18-firmware.c</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/cx18/cx18-gpio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx18/cx18-gpio.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/cx18/cx18-gpio.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx18/cx18-gpio.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/cx18/cx18-i2c.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx18/cx18-i2c.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/cx18/cx18-io.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx18/cx18-io.c</a></td><td class='right'>254</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/cx18/cx18-io.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx18/cx18-io.h</a></td><td class='right'>378</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/cx18/cx18-ioctl.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx18/cx18-ioctl.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/cx18/cx18-irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx18/cx18-irq.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/cx18/cx18-mailbox.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx18/cx18-mailbox.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/cx18/cx18-queue.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx18/cx18-queue.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/cx18/cx18-scb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx18/cx18-scb.c</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/cx18/cx18-streams.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx18/cx18-streams.c</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/cx18/cx18-version.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx18/cx18-version.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/cx18/cx23418.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx18/cx23418.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/cx2341x.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx2341x.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/cx23885/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx23885/Kconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/cx23885/cx23885-417.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx23885/cx23885-417.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/cx23885/cx23885-cards.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx23885/cx23885-cards.c</a></td><td class='right'>236</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/cx23885/cx23885-core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx23885/cx23885-core.c</a></td><td class='right'>278</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/cx23885/cx23885-dvb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx23885/cx23885-dvb.c</a></td><td class='right'>279</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/cx23885/cx23885-i2c.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx23885/cx23885-i2c.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/cx23885/cx23885-vbi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx23885/cx23885-vbi.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/cx23885/cx23885-video.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx23885/cx23885-video.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/cx23885/cx23885.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx23885/cx23885.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/cx25840/cx25840-vbi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx25840/cx25840-vbi.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/cx88/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx88/Kconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/cx88/cx88-blackbird.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx88/cx88-blackbird.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/cx88/cx88-cards.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx88/cx88-cards.c</a></td><td class='right'>358</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/cx88/cx88-core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx88/cx88-core.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/cx88/cx88-dvb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx88/cx88-dvb.c</a></td><td class='right'>547</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 94.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/cx88/cx88-i2c.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx88/cx88-i2c.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/cx88/cx88-input.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx88/cx88-input.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/cx88/cx88-mpeg.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx88/cx88-mpeg.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/cx88/cx88-tvaudio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx88/cx88-tvaudio.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/cx88/cx88-video.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx88/cx88-video.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/cx88/cx88.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx88/cx88.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/dabusb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/dabusb.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/dpc7146.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/dpc7146.c</a></td><td class='right'>408</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.1%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/em28xx/em28xx-cards.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/em28xx/em28xx-cards.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/em28xx/em28xx-dvb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/em28xx/em28xx-dvb.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/em28xx/em28xx-i2c.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/em28xx/em28xx-i2c.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/em28xx/em28xx-video.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/em28xx/em28xx-video.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/em28xx/em28xx.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/em28xx/em28xx.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/et61x251/et61x251_core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/et61x251/et61x251_core.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/gspca/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/Kconfig</a></td><td class='right'>215</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/gspca/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/Makefile</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/gspca/conex.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/conex.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/gspca/etoms.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/etoms.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/gspca/finepix.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/finepix.c</a></td><td class='right'>466</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/gspca/gspca.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/gspca.c</a></td><td class='right'>248</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/gspca/gspca.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/gspca.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/gspca/m5602/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/m5602/Kconfig</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/gspca/m5602/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/m5602/Makefile</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/gspca/m5602/m5602_bridge.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/m5602/m5602_bridge.h</a></td><td class='right'>143</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/gspca/m5602/m5602_core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/m5602/m5602_core.c</a></td><td class='right'>309</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/gspca/m5602/m5602_mt9m111.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/m5602/m5602_mt9m111.c</a></td><td class='right'>345</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/gspca/m5602/m5602_mt9m111.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/m5602/m5602_mt9m111.h</a></td><td class='right'>1019</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/gspca/m5602/m5602_ov9650.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/m5602/m5602_ov9650.c</a></td><td class='right'>546</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/gspca/m5602/m5602_ov9650.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/m5602/m5602_ov9650.h</a></td><td class='right'>502</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/gspca/m5602/m5602_po1030.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/m5602/m5602_po1030.c</a></td><td class='right'>400</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/gspca/m5602/m5602_po1030.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/m5602/m5602_po1030.h</a></td><td class='right'>508</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/gspca/m5602/m5602_s5k4aa.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/m5602/m5602_s5k4aa.c</a></td><td class='right'>463</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/gspca/m5602/m5602_s5k4aa.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/m5602/m5602_s5k4aa.h</a></td><td class='right'>369</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/gspca/m5602/m5602_s5k83a.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/m5602/m5602_s5k83a.c</a></td><td class='right'>423</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/gspca/m5602/m5602_s5k83a.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/m5602/m5602_s5k83a.h</a></td><td class='right'>482</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/gspca/m5602/m5602_sensor.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/m5602/m5602_sensor.h</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/gspca/mars.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/mars.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/gspca/ov519.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/ov519.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/gspca/pac207.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/pac207.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/gspca/pac7311.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/pac7311.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/gspca/sonixb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/sonixb.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/gspca/sonixj.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/sonixj.c</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/gspca/spca500.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/spca500.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/gspca/spca501.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/spca501.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/gspca/spca505.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/spca505.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/gspca/spca506.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/spca506.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/gspca/spca508.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/spca508.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/gspca/spca561.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/spca561.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/gspca/stk014.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/stk014.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/gspca/sunplus.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/sunplus.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/gspca/t613.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/t613.c</a></td><td class='right'>802</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.8%;'/><td class='rem' style='width: 3.2%;'/><td class='none' style='width: 92.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/gspca/tv8532.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/tv8532.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/gspca/vc032x.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/vc032x.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/gspca/zc3xx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/zc3xx.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/ir-kbd-i2c.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/ir-kbd-i2c.c</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/ivtv/ivtv-cards.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/ivtv/ivtv-cards.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/ivtv/ivtv-driver.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/ivtv/ivtv-driver.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/ivtv/ivtv-driver.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/ivtv/ivtv-driver.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/ivtv/ivtv-fileops.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/ivtv/ivtv-fileops.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/ivtv/ivtv-fileops.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/ivtv/ivtv-fileops.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/ivtv/ivtv-gpio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/ivtv/ivtv-gpio.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/ivtv/ivtv-gpio.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/ivtv/ivtv-gpio.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/ivtv/ivtv-i2c.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/ivtv/ivtv-i2c.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/ivtv/ivtv-ioctl.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/ivtv/ivtv-ioctl.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/ivtv/ivtv-irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/ivtv/ivtv-irq.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/ivtv/ivtv-streams.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/ivtv/ivtv-streams.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/ivtv/ivtv-vbi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/ivtv/ivtv-vbi.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/ivtv/ivtv-yuv.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/ivtv/ivtv-yuv.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/ivtv/ivtvfb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/ivtv/ivtvfb.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/ks0127.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/ks0127.c</a></td><td class='right'>476</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 2.6%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/meye.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/meye.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/meye.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/meye.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/mt9m001.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/mt9m001.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/mt9m111.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/mt9m111.c</a></td><td class='right'>973</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/mt9v022.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/mt9v022.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/mxb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/mxb.c</a></td><td class='right'>469</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 3.0%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/ov511.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/ov511.c</a></td><td class='right'>124</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/ov511.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/ov511.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/ovcamchip/ovcamchip_core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/ovcamchip/ovcamchip_core.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/ovcamchip/ovcamchip_priv.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/ovcamchip/ovcamchip_priv.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/pms.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/pms.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/pvrusb2/pvrusb2-ctrl.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/pvrusb2/pvrusb2-ctrl.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/pvrusb2/pvrusb2-ctrl.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/pvrusb2/pvrusb2-ctrl.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/pvrusb2/pvrusb2-hdw.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/pvrusb2/pvrusb2-hdw.c</a></td><td class='right'>340</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/pvrusb2/pvrusb2-hdw.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/pvrusb2/pvrusb2-hdw.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/pvrusb2/pvrusb2-i2c-core.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/pvrusb2/pvrusb2-main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/pvrusb2/pvrusb2-main.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/pvrusb2/pvrusb2-sysfs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/pvrusb2/pvrusb2-sysfs.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/pvrusb2/pvrusb2-v4l2.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/pvrusb2/pvrusb2-v4l2.c</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/pwc/pwc-ctrl.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/pwc/pwc-ctrl.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/pwc/pwc-if.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/pwc/pwc-if.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/pwc/pwc-v4l.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/pwc/pwc-v4l.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/pxa_camera.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/pxa_camera.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/s2255drv.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/s2255drv.c</a></td><td class='right'>572</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 94.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/saa5246a.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/saa5246a.c</a></td><td class='right'>556</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 94.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/saa5246a.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/saa5246a.h</a></td><td class='right'>359</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.6%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/saa5249.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/saa5249.c</a></td><td class='right'>704</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 3.9%;'/><td class='none' style='width: 93.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/saa7110.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/saa7110.c</a></td><td class='right'>242</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/saa7111.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/saa7111.c</a></td><td class='right'>224</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/saa7114.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/saa7114.c</a></td><td class='right'>364</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 2.6%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/saa7115.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/saa7115.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/saa7127.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/saa7127.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/saa7134/saa6752hs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/saa7134/saa6752hs.c</a></td><td class='right'>440</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/saa7134/saa7134-alsa.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/saa7134/saa7134-alsa.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/saa7134/saa7134-cards.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/saa7134/saa7134-cards.c</a></td><td class='right'>261</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/saa7134/saa7134-core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/saa7134/saa7134-core.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/saa7134/saa7134-dvb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/saa7134/saa7134-dvb.c</a></td><td class='right'>258</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/saa7134/saa7134-empress.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/saa7134/saa7134-empress.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/saa7134/saa7134-i2c.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/saa7134/saa7134-i2c.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/saa7134/saa7134-input.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/saa7134/saa7134-input.c</a></td><td class='right'>210</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/saa7134/saa7134-ts.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/saa7134/saa7134-ts.c</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/saa7134/saa7134-video.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/saa7134/saa7134-video.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/saa7134/saa7134.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/saa7134/saa7134.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/saa7185.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/saa7185.c</a></td><td class='right'>210</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/se401.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/se401.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/sh_mobile_ceu_camera.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/sh_mobile_ceu_camera.c</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/sn9c102/sn9c102_core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/sn9c102/sn9c102_core.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/sn9c102/sn9c102_devtable.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/sn9c102/sn9c102_devtable.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/sn9c102/sn9c102_hv7131d.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/sn9c102/sn9c102_hv7131d.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/sn9c102/sn9c102_hv7131r.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/sn9c102/sn9c102_hv7131r.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/sn9c102/sn9c102_mi0343.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/sn9c102/sn9c102_mi0343.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/sn9c102/sn9c102_mi0360.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/sn9c102/sn9c102_mi0360.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/sn9c102/sn9c102_mt9v111.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/sn9c102/sn9c102_mt9v111.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/sn9c102/sn9c102_ov7630.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/sn9c102/sn9c102_ov7630.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/sn9c102/sn9c102_ov7660.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/sn9c102/sn9c102_ov7660.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/sn9c102/sn9c102_pas106b.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/sn9c102/sn9c102_pas106b.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/sn9c102/sn9c102_pas202bcb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/sn9c102/sn9c102_pas202bcb.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/sn9c102/sn9c102_tas5110c1b.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/sn9c102/sn9c102_tas5110c1b.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/sn9c102/sn9c102_tas5110d.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/sn9c102/sn9c102_tas5110d.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/sn9c102/sn9c102_tas5130d1b.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/sn9c102/sn9c102_tas5130d1b.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/soc_camera_platform.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/soc_camera_platform.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/stk-webcam.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/stk-webcam.c</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/stk-webcam.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/stk-webcam.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/stradis.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/stradis.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/stv680.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/stv680.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/tda9840.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/tda9840.c</a></td><td class='right'>260</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/tda9840.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/tda9840.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/tea6415c.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/tea6415c.c</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/tea6420.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/tea6420.c</a></td><td class='right'>147</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/tuner-3036.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/tuner-3036.c</a></td><td class='right'>214</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/tuner-core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/tuner-core.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/tvaudio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/tvaudio.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/tveeprom.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/tveeprom.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/usbvideo/ibmcam.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/usbvideo/ibmcam.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/usbvideo/konicawc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/usbvideo/konicawc.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/usbvideo/quickcam_messenger.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/usbvideo/quickcam_messenger.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/usbvideo/ultracam.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/usbvideo/ultracam.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/usbvideo/usbvideo.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/usbvideo/usbvideo.c</a></td><td class='right'>166</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/usbvideo/vicam.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/usbvideo/vicam.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/usbvision/usbvision-core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/usbvision/usbvision-core.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/usbvision/usbvision-i2c.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/usbvision/usbvision-i2c.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/usbvision/usbvision-video.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/usbvision/usbvision-video.c</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/uvc/uvc_ctrl.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/uvc/uvc_ctrl.c</a></td><td class='right'>185</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/uvc/uvc_driver.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/uvc/uvc_driver.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/uvc/uvc_status.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/uvc/uvc_status.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/uvc/uvc_v4l2.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/uvc/uvc_v4l2.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/uvc/uvc_video.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/uvc/uvc_video.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/uvc/uvcvideo.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/uvc/uvcvideo.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/v4l1-compat.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/v4l1-compat.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/v4l2-common.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/v4l2-common.c</a></td><td class='right'>187</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/v4l2-dev.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/v4l2-dev.c</a></td><td class='right'>300</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/v4l2-ioctl.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/v4l2-ioctl.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/videobuf-dvb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/videobuf-dvb.c</a></td><td class='right'>201</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/vino.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/vino.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/vivi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/vivi.c</a></td><td class='right'>285</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/vpx3220.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/vpx3220.c</a></td><td class='right'>330</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/w9966.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/w9966.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/w9968cf.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/w9968cf.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/zc0301/zc0301_core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/zc0301/zc0301_core.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/zoran/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/zoran/Kconfig</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/zoran/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/zoran/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/zoran/videocodec.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/zoran/videocodec.c</a> (renamed from drivers/media/video/videocodec.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/zoran/videocodec.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/zoran/videocodec.h</a> (renamed from drivers/media/video/videocodec.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/zoran/zoran.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/zoran/zoran.h</a> (renamed from drivers/media/video/zoran.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/zoran/zoran_card.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/zoran/zoran_card.c</a> (renamed from drivers/media/video/zoran_card.c)</td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/zoran/zoran_card.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/zoran/zoran_card.h</a> (renamed from drivers/media/video/zoran_card.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/zoran/zoran_device.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/zoran/zoran_device.c</a> (renamed from drivers/media/video/zoran_device.c)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/zoran/zoran_device.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/zoran/zoran_device.h</a> (renamed from drivers/media/video/zoran_device.h)</td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/zoran/zoran_driver.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/zoran/zoran_driver.c</a> (renamed from drivers/media/video/zoran_driver.c)</td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/zoran/zoran_procfs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/zoran/zoran_procfs.c</a> (renamed from drivers/media/video/zoran_procfs.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/zoran/zoran_procfs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/zoran/zoran_procfs.h</a> (renamed from drivers/media/video/zoran_procfs.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/zoran/zr36016.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/zoran/zr36016.c</a> (renamed from drivers/media/video/zr36016.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/zoran/zr36016.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/zoran/zr36016.h</a> (renamed from drivers/media/video/zr36016.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/zoran/zr36050.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/zoran/zr36050.c</a> (renamed from drivers/media/video/zr36050.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/zoran/zr36050.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/zoran/zr36050.h</a> (renamed from drivers/media/video/zr36050.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/zoran/zr36057.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/zoran/zr36057.h</a> (renamed from drivers/media/video/zr36057.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/zoran/zr36060.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/zoran/zr36060.c</a> (renamed from drivers/media/video/zr36060.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/zoran/zr36060.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/zoran/zr36060.h</a> (renamed from drivers/media/video/zr36060.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/media/video/zr364xx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/zr364xx.c</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/memstick/core/mspro_block.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/memstick/core/mspro_block.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/message/i2o/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/message/i2o/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/message/i2o/device.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/message/i2o/device.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/message/i2o/exec-osm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/message/i2o/exec-osm.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/message/i2o/i2o_config.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/message/i2o/i2o_config.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/message/i2o/iop.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/message/i2o/iop.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/message/i2o/memory.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/message/i2o/memory.c</a></td><td class='right'>313</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/message/i2o/pci.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/message/i2o/pci.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/mfd/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/mfd/Kconfig</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/mfd/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/mfd/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/mfd/ucb1400_core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/mfd/ucb1400_core.c</a></td><td class='right'>106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/mfd/wm8350-core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/mfd/wm8350-core.c</a></td><td class='right'>1273</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 87.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/mfd/wm8350-gpio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/mfd/wm8350-gpio.c</a></td><td class='right'>222</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/mfd/wm8350-i2c.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/mfd/wm8350-i2c.c</a></td><td class='right'>120</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/mfd/wm8350-regmap.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/mfd/wm8350-regmap.c</a></td><td class='right'>1347</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 86.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/mfd/wm8400-core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/mfd/wm8400-core.c</a></td><td class='right'>455</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/misc/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/misc/Kconfig</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/misc/hp-wmi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/misc/hp-wmi.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/misc/phantom.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/misc/phantom.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/misc/sgi-gru/gru.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/misc/sgi-gru/gru.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/misc/sgi-gru/gru_instructions.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/misc/sgi-gru/gru_instructions.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/misc/sgi-gru/grufault.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/misc/sgi-gru/grufault.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/misc/sgi-gru/grufile.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/misc/sgi-gru/grufile.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/misc/sgi-gru/gruhandles.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/misc/sgi-gru/gruhandles.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/misc/sgi-gru/grukservices.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/misc/sgi-gru/grukservices.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/misc/sgi-gru/grumain.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/misc/sgi-gru/grumain.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/mmc/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/mmc/Kconfig</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/mmc/card/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/mmc/card/Kconfig</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/mmc/card/block.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/mmc/card/block.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/mmc/card/queue.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/mmc/card/queue.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/mmc/core/mmc_ops.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/mmc/core/mmc_ops.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/mmc/core/sdio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/mmc/core/sdio.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/mmc/core/sdio_irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/mmc/core/sdio_irq.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/mmc/host/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/mmc/host/Kconfig</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/mmc/host/atmel-mci-regs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/mmc/host/atmel-mci-regs.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/mmc/host/atmel-mci.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/mmc/host/atmel-mci.c</a></td><td class='right'>1352</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.7%;'/><td class='rem' style='width: 3.8%;'/><td class='none' style='width: 86.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/mmc/host/mmc_spi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/mmc/host/mmc_spi.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/mmc/host/omap.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/mmc/host/omap.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/mmc/host/pxamci.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/mmc/host/pxamci.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/mmc/host/sdhci-pci.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/mmc/host/sdhci-pci.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/mmc/host/sdhci.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/mmc/host/sdhci.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/mmc/host/sdhci.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/mmc/host/sdhci.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/mtd/ftl.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/mtd/ftl.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/mtd/maps/pcmciamtd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/mtd/maps/pcmciamtd.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/mtd/maps/sun_uflash.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/mtd/maps/sun_uflash.c</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/mtd/mtd_blkdevs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/mtd/mtd_blkdevs.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/mtd/mtdchar.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/mtd/mtdchar.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/mtd/mtdpart.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/mtd/mtdpart.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/mtd/nand/alauda.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/mtd/nand/alauda.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/mtd/nand/ams-delta.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/mtd/nand/ams-delta.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/mtd/nand/atmel_nand_ecc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/mtd/nand/atmel_nand_ecc.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/mtd/nand/cafe_nand.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/mtd/nand/cafe_nand.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/mtd/nand/cmx270_nand.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/mtd/nand/cmx270_nand.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/3c501.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/3c501.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/3c505.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/3c505.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/3c509.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/3c509.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/3c515.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/3c515.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/8139cp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/8139cp.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/8139too.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/8139too.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/Kconfig</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/appletalk/cops.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/appletalk/cops.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/arcnet/arcnet.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/arcnet/arcnet.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/arcnet/com20020.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/arcnet/com20020.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/atl1e/atl1e_hw.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/atl1e/atl1e_hw.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/atl1e/atl1e_main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/atl1e/atl1e_main.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/atlx/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/atlx/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/atlx/atl1.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/atlx/atl1.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/atlx/atl2.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/atlx/atl2.c</a></td><td class='right'>3119</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 31.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 68.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/atlx/atl2.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/atlx/atl2.h</a></td><td class='right'>529</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/atlx/atlx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/atlx/atlx.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/au1000_eth.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/au1000_eth.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/au1000_eth.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/au1000_eth.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/ax88796.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/ax88796.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/bfin_mac.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/bfin_mac.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/bfin_mac.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/bfin_mac.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/bnx2.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/bnx2.c</a></td><td class='right'>229</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/bnx2.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/bnx2.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/bnx2_fw.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/bnx2_fw.h</a></td><td class='right'>8654</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 42.9%;'/><td class='rem' style='width: 43.4%;'/><td class='none' style='width: 13.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/bnx2x_main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/bnx2x_main.c</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/bonding/bond_alb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/bonding/bond_alb.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/bonding/bond_main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/bonding/bond_main.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/bonding/bonding.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/bonding/bonding.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/cassini.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/cassini.c</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/cassini.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/cassini.h</a></td><td class='right'>1522</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 15.1%;'/><td class='none' style='width: 84.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/cpmac.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/cpmac.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/cs89x0.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/cs89x0.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/cxgb3/adapter.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/cxgb3/adapter.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/cxgb3/ael1002.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/cxgb3/ael1002.c</a></td><td class='right'>1074</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.1%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 89.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/cxgb3/common.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/cxgb3/common.h</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/cxgb3/cxgb3_ctl_defs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/cxgb3/cxgb3_ctl_defs.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/cxgb3/cxgb3_defs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/cxgb3/cxgb3_defs.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/cxgb3/cxgb3_ioctl.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/cxgb3/cxgb3_ioctl.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/cxgb3/cxgb3_main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/cxgb3/cxgb3_main.c</a></td><td class='right'>390</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/cxgb3/cxgb3_offload.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/cxgb3/cxgb3_offload.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/cxgb3/cxgb3_offload.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/cxgb3/cxgb3_offload.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/cxgb3/firmware_exports.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/cxgb3/firmware_exports.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/cxgb3/l2t.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/cxgb3/l2t.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/cxgb3/l2t.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/cxgb3/l2t.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/cxgb3/mc5.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/cxgb3/mc5.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/cxgb3/regs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/cxgb3/regs.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/cxgb3/sge.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/cxgb3/sge.c</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/cxgb3/t3_cpl.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/cxgb3/t3_cpl.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/cxgb3/t3_hw.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/cxgb3/t3_hw.c</a></td><td class='right'>243</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/cxgb3/t3cdev.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/cxgb3/t3cdev.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/cxgb3/version.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/cxgb3/version.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/cxgb3/vsc8211.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/cxgb3/vsc8211.c</a></td><td class='right'>208</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/cxgb3/xgmac.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/cxgb3/xgmac.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/e100.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/e100.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/e1000/e1000.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/e1000/e1000.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/e1000/e1000_main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/e1000/e1000_main.c</a></td><td class='right'>476</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 4.2%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/e1000e/82571.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/e1000e/82571.c</a></td><td class='right'>153</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/e1000e/defines.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/e1000e/defines.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/e1000e/e1000.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/e1000e/e1000.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/e1000e/es2lan.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/e1000e/es2lan.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/e1000e/ethtool.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/e1000e/ethtool.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/e1000e/hw.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/e1000e/hw.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/e1000e/ich8lan.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/e1000e/ich8lan.c</a></td><td class='right'>175</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/e1000e/lib.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/e1000e/lib.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/e1000e/netdev.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/e1000e/netdev.c</a></td><td class='right'>499</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.3%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 95.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/e1000e/param.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/e1000e/param.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/e1000e/phy.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/e1000e/phy.c</a></td><td class='right'>194</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/eexpress.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/eexpress.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/ehea/ehea.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/ehea/ehea.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/ehea/ehea_phyp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/ehea/ehea_phyp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/ehea/ehea_qmr.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/ehea/ehea_qmr.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/enc28j60.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/enc28j60.c</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/enic/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/enic/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/enic/cq_desc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/enic/cq_desc.h</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/enic/cq_enet_desc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/enic/cq_enet_desc.h</a></td><td class='right'>169</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/enic/enic.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/enic/enic.h</a></td><td class='right'>114</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/enic/enic_main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/enic/enic_main.c</a></td><td class='right'>1935</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 19.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 80.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/enic/enic_res.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/enic/enic_res.c</a></td><td class='right'>370</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/enic/enic_res.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/enic/enic_res.h</a></td><td class='right'>151</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/enic/rq_enet_desc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/enic/rq_enet_desc.h</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/enic/vnic_cq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/enic/vnic_cq.c</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/enic/vnic_cq.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/enic/vnic_cq.h</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/enic/vnic_dev.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/enic/vnic_dev.c</a></td><td class='right'>674</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/enic/vnic_dev.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/enic/vnic_dev.h</a></td><td class='right'>120</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/enic/vnic_devcmd.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/enic/vnic_devcmd.h</a></td><td class='right'>282</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/enic/vnic_enet.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/enic/vnic_enet.h</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/enic/vnic_intr.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/enic/vnic_intr.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/enic/vnic_intr.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/enic/vnic_intr.h</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/enic/vnic_nic.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/enic/vnic_nic.h</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/enic/vnic_resource.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/enic/vnic_resource.h</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/enic/vnic_rq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/enic/vnic_rq.c</a></td><td class='right'>199</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/enic/vnic_rq.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/enic/vnic_rq.h</a></td><td class='right'>204</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/enic/vnic_rss.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/enic/vnic_rss.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/enic/vnic_stats.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/enic/vnic_stats.h</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/enic/vnic_wq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/enic/vnic_wq.c</a></td><td class='right'>184</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/enic/vnic_wq.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/enic/vnic_wq.h</a></td><td class='right'>154</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/enic/wq_enet_desc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/enic/wq_enet_desc.h</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/fealnx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/fealnx.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/fec_mpc52xx_phy.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/fec_mpc52xx_phy.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/forcedeth.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/forcedeth.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/fs_enet/fs_enet-main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/fs_enet/fs_enet-main.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/fs_enet/fs_enet.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/fs_enet/fs_enet.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/fs_enet/mac-fcc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/fs_enet/mac-fcc.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/fs_enet/mac-fec.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/fs_enet/mac-fec.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/fs_enet/mac-scc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/fs_enet/mac-scc.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/fs_enet/mii-bitbang.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/fs_enet/mii-bitbang.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/fs_enet/mii-fec.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/fs_enet/mii-fec.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/gianfar.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/gianfar.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/gianfar_mii.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/gianfar_mii.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/ibm_newemac/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/ibm_newemac/Kconfig</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/ibm_newemac/core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/ibm_newemac/core.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/ibm_newemac/core.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/ibm_newemac/core.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/ibm_newemac/mal.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/ibm_newemac/mal.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/ibm_newemac/mal.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/ibm_newemac/mal.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/ibm_newemac/phy.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/ibm_newemac/phy.c</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/ibm_newemac/phy.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/ibm_newemac/phy.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/ibmlana.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/ibmlana.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/igb/igb_main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/igb/igb_main.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/irda/kingsun-sir.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/irda/kingsun-sir.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/irda/ks959-sir.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/irda/ks959-sir.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/irda/ksdazzle-sir.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/irda/ksdazzle-sir.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/irda/pxaficp_ir.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/irda/pxaficp_ir.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/irda/sir_dongle.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/irda/sir_dongle.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/irda/stir4200.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/irda/stir4200.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/irda/vlsi_ir.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/irda/vlsi_ir.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/ixgb/ixgb.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/ixgb/ixgb.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/ixgb/ixgb_main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/ixgb/ixgb_main.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/ixgbe/ixgbe.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/ixgbe/ixgbe.h</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/ixgbe/ixgbe_82598.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/ixgbe/ixgbe_82598.c</a></td><td class='right'>628</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.2%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 93.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/ixgbe/ixgbe_common.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/ixgbe/ixgbe_common.c</a></td><td class='right'>1060</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.4%;'/><td class='rem' style='width: 3.2%;'/><td class='none' style='width: 89.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/ixgbe/ixgbe_common.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/ixgbe/ixgbe_common.h</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/ixgbe/ixgbe_ethtool.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/ixgbe/ixgbe_ethtool.c</a></td><td class='right'>302</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/ixgbe/ixgbe_main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/ixgbe/ixgbe_main.c</a></td><td class='right'>1940</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.0%;'/><td class='rem' style='width: 8.3%;'/><td class='none' style='width: 80.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/ixgbe/ixgbe_phy.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/ixgbe/ixgbe_phy.c</a></td><td class='right'>244</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/ixgbe/ixgbe_phy.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/ixgbe/ixgbe_phy.h</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/ixgbe/ixgbe_type.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/ixgbe/ixgbe_type.h</a></td><td class='right'>563</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 94.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/jme.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/jme.c</a></td><td class='right'>3038</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 30.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 69.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/jme.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/jme.h</a></td><td class='right'>1229</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 87.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/lib8390.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/lib8390.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/macb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/macb.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/macb.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/macb.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/macmace.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/macmace.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/meth.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/meth.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/mipsnet.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/mipsnet.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/mlx4/alloc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/mlx4/alloc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/mv643xx_eth.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/mv643xx_eth.c</a></td><td class='right'>1471</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.7%;'/><td class='rem' style='width: 7.0%;'/><td class='none' style='width: 85.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/myri10ge/myri10ge.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/myri10ge/myri10ge.c</a></td><td class='right'>185</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/myri_sbus.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/myri_sbus.c</a></td><td class='right'>198</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/myri_sbus.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/myri_sbus.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/natsemi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/natsemi.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/ne.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/ne.c</a></td><td class='right'>281</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/netx-eth.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/netx-eth.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/netxen/netxen_nic.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/netxen/netxen_nic.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/netxen/netxen_nic_main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/netxen/netxen_nic_main.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/niu.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/niu.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/pci-skeleton.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/pci-skeleton.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/pcmcia/3c574_cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/pcmcia/3c574_cs.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/pcmcia/3c589_cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/pcmcia/3c589_cs.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/pcmcia/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/pcmcia/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/pcmcia/axnet_cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/pcmcia/axnet_cs.c</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/pcmcia/com20020_cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/pcmcia/com20020_cs.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/pcmcia/fmvj18x_cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/pcmcia/fmvj18x_cs.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/pcmcia/ibmtr_cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/pcmcia/ibmtr_cs.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/pcmcia/nmclan_cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/pcmcia/nmclan_cs.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/pcmcia/pcnet_cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/pcmcia/pcnet_cs.c</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/pcmcia/smc91c92_cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/pcmcia/smc91c92_cs.c</a></td><td class='right'>151</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/pcmcia/xirc2ps_cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/pcmcia/xirc2ps_cs.c</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/phy/fixed.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/phy/fixed.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/phy/mdio-bitbang.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/phy/mdio-bitbang.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/phy/mdio-ofgpio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/phy/mdio-ofgpio.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/phy/mdio_bus.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/phy/mdio_bus.c</a></td><td class='right'>232</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/phy/phy.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/phy/phy.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/phy/phy_device.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/phy/phy_device.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/ppp_generic.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/ppp_generic.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/pppol2tp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/pppol2tp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/pppox.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/pppox.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/qlge/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/qlge/Makefile</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/qlge/qlge.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/qlge/qlge.h</a></td><td class='right'>1593</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 15.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 84.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/qlge/qlge_dbg.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/qlge/qlge_dbg.c</a></td><td class='right'>858</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/qlge/qlge_ethtool.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/qlge/qlge_ethtool.c</a></td><td class='right'>414</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/qlge/qlge_main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/qlge/qlge_main.c</a></td><td class='right'>3956</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 39.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 60.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/qlge/qlge_mpi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/qlge/qlge_mpi.c</a></td><td class='right'>150</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/r6040.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/r6040.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/r8169.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/r8169.c</a></td><td class='right'>966</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.6%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 90.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/s2io.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/s2io.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/s2io.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/s2io.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/sb1250-mac.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sb1250-mac.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/sfc/bitfield.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sfc/bitfield.h</a></td><td class='right'>178</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/sfc/boards.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sfc/boards.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/sfc/boards.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sfc/boards.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/sfc/efx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sfc/efx.c</a></td><td class='right'>489</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 2.8%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/sfc/efx.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sfc/efx.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/sfc/enum.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sfc/enum.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/sfc/ethtool.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sfc/ethtool.c</a></td><td class='right'>184</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/sfc/falcon.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sfc/falcon.c</a></td><td class='right'>1019</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.8%;'/><td class='rem' style='width: 3.3%;'/><td class='none' style='width: 89.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/sfc/falcon.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sfc/falcon.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/sfc/falcon_hwdefs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sfc/falcon_hwdefs.h</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/sfc/falcon_io.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sfc/falcon_io.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/sfc/falcon_xmac.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sfc/falcon_xmac.c</a></td><td class='right'>346</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/sfc/mac.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sfc/mac.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/sfc/mdio_10g.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sfc/mdio_10g.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/sfc/mdio_10g.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sfc/mdio_10g.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/sfc/net_driver.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sfc/net_driver.h</a></td><td class='right'>144</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/sfc/phy.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sfc/phy.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/sfc/rx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sfc/rx.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/sfc/rx.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sfc/rx.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/sfc/selftest.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sfc/selftest.c</a></td><td class='right'>391</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/sfc/selftest.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sfc/selftest.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/sfc/sfe4001.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sfc/sfe4001.c</a></td><td class='right'>248</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/sfc/spi.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sfc/spi.h</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/sfc/tenxpress.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sfc/tenxpress.c</a></td><td class='right'>149</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/sfc/tx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sfc/tx.c</a></td><td class='right'>385</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/sfc/tx.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sfc/tx.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/sfc/workarounds.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sfc/workarounds.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/sfc/xfp_phy.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sfc/xfp_phy.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/sh_eth.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sh_eth.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/skfp/pmf.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/skfp/pmf.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/skge.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/skge.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/sky2.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sky2.c</a></td><td class='right'>181</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/smc911x.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/smc911x.c</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/smc911x.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/smc911x.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/smc91x.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/smc91x.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/smc91x.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/smc91x.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/sunbmac.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sunbmac.c</a></td><td class='right'>206</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/sunbmac.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sunbmac.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/sundance.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sundance.c</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/sunhme.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sunhme.c</a></td><td class='right'>322</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/sunhme.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sunhme.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/sunlance.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sunlance.c</a></td><td class='right'>180</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/sunqe.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sunqe.c</a></td><td class='right'>162</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/sunqe.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sunqe.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/sunvnet.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sunvnet.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/tc35815.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/tc35815.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/tehuti.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/tehuti.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/tg3.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/tg3.c</a></td><td class='right'>157</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/tg3.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/tg3.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/tlan.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/tlan.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/tokenring/smctr.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/tokenring/smctr.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/tsi108_eth.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/tsi108_eth.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/tulip/de2104x.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/tulip/de2104x.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/tulip/de4x5.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/tulip/de4x5.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/tulip/dmfe.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/tulip/dmfe.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/ucc_geth.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/ucc_geth.c</a></td><td class='right'>116</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/ucc_geth_mii.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/ucc_geth_mii.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/usb/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/usb/Kconfig</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/usb/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/usb/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/usb/catc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/usb/catc.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/usb/hso.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/usb/hso.c</a></td><td class='right'>335</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/usb/kaweth.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/usb/kaweth.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/usb/mcs7830.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/usb/mcs7830.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/usb/pegasus.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/usb/pegasus.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/usb/rtl8150.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/usb/rtl8150.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/usb/smsc95xx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/usb/smsc95xx.c</a></td><td class='right'>1225</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 87.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/usb/smsc95xx.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/usb/smsc95xx.h</a></td><td class='right'>253</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/usb/usbnet.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/usb/usbnet.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/via-rhine.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/via-rhine.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/via-velocity.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/via-velocity.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/via-velocity.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/via-velocity.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wan/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wan/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wan/cosa.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wan/cosa.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wan/cycx_drv.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wan/cycx_drv.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wan/cycx_x25.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wan/cycx_x25.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wan/dscc4.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wan/dscc4.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wan/hdlc_x25.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wan/hdlc_x25.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wan/lmc/lmc_main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wan/lmc/lmc_main.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wan/pc300_tty.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wan/pc300_tty.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wan/sbni.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wan/sbni.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wan/z85230.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wan/z85230.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wan/z85230.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wan/z85230.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/Kconfig</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/adm8211.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/adm8211.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/airo.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/airo.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/airo_cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/airo_cs.c</a></td><td class='right'>224</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/airport.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/airport.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/ath5k/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/ath5k/Makefile</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/ath5k/ath5k.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/ath5k/ath5k.h</a></td><td class='right'>619</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 93.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/ath5k/attach.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/ath5k/attach.c</a></td><td class='right'>359</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/ath5k/base.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/ath5k/base.c</a></td><td class='right'>574</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 2.9%;'/><td class='none' style='width: 94.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/ath5k/base.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/ath5k/base.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/ath5k/caps.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/ath5k/caps.c</a></td><td class='right'>193</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/ath5k/debug.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/ath5k/debug.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/ath5k/desc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/ath5k/desc.c</a></td><td class='right'>692</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/ath5k/desc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/ath5k/desc.h</a> (renamed from drivers/net/wireless/ath5k/hw.h)</td><td class='right'>400</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 3.4%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/ath5k/dma.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/ath5k/dma.c</a></td><td class='right'>605</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/ath5k/eeprom.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/ath5k/eeprom.c</a></td><td class='right'>466</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/ath5k/eeprom.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/ath5k/eeprom.h</a></td><td class='right'>215</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/ath5k/gpio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/ath5k/gpio.c</a></td><td class='right'>176</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/ath5k/hw.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/ath5k/hw.c</a></td><td class='right'>4529</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 45.1%;'/><td class='none' style='width: 54.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/ath5k/initvals.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/ath5k/initvals.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/ath5k/pcu.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/ath5k/pcu.c</a></td><td class='right'>1014</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/ath5k/phy.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/ath5k/phy.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/ath5k/qcu.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/ath5k/qcu.c</a></td><td class='right'>488</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/ath5k/reg.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/ath5k/reg.h</a></td><td class='right'>679</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 2.7%;'/><td class='none' style='width: 93.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/ath5k/reset.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/ath5k/reset.c</a></td><td class='right'>931</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/ath9k/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/ath9k/Kconfig</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/ath9k/ath9k.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/ath9k/ath9k.h</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/ath9k/beacon.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/ath9k/beacon.c</a></td><td class='right'>383</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/ath9k/core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/ath9k/core.c</a></td><td class='right'>426</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/ath9k/core.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/ath9k/core.h</a></td><td class='right'>294</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/ath9k/hw.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/ath9k/hw.c</a></td><td class='right'>312</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/ath9k/hw.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/ath9k/hw.h</a></td><td class='right'>120</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/ath9k/main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/ath9k/main.c</a></td><td class='right'>1273</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.4%;'/><td class='rem' style='width: 4.3%;'/><td class='none' style='width: 87.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/ath9k/phy.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/ath9k/phy.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/ath9k/rc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/ath9k/rc.c</a></td><td class='right'>280</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/ath9k/rc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/ath9k/rc.h</a></td><td class='right'>222</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/ath9k/recv.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/ath9k/recv.c</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/ath9k/reg.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/ath9k/reg.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/ath9k/xmit.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/ath9k/xmit.c</a></td><td class='right'>412</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/atmel.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/atmel.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/atmel_cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/atmel_cs.c</a></td><td class='right'>121</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/b43/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/b43/Kconfig</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/b43/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/b43/Makefile</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/b43/b43.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/b43/b43.h</a></td><td class='right'>146</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/b43/debugfs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/b43/debugfs.c</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/b43/lo.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/b43/lo.c</a></td><td class='right'>120</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/b43/lo.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/b43/lo.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/b43/main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/b43/main.c</a></td><td class='right'>404</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/b43/pcmcia.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/b43/pcmcia.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/b43/phy.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/b43/phy.h</a></td><td class='right'>340</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.4%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/b43/phy_a.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/b43/phy_a.c</a></td><td class='right'>643</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/b43/phy_a.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/b43/phy_a.h</a></td><td class='right'>130</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/b43/phy_common.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/b43/phy_common.c</a></td><td class='right'>381</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/b43/phy_common.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/b43/phy_common.h</a></td><td class='right'>413</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/b43/phy_g.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/b43/phy_g.c</a> (renamed from drivers/net/wireless/b43/phy.c)</td><td class='right'>4420</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 18.9%;'/><td class='rem' style='width: 25.1%;'/><td class='none' style='width: 55.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/b43/phy_g.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/b43/phy_g.h</a></td><td class='right'>209</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/b43/phy_lp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/b43/phy_lp.c</a></td><td class='right'>155</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/b43/phy_lp.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/b43/phy_lp.h</a></td><td class='right'>540</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/b43/phy_n.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/b43/phy_n.c</a> (renamed from drivers/net/wireless/b43/nphy.c)</td><td class='right'>154</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/b43/phy_n.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/b43/phy_n.h</a> (renamed from drivers/net/wireless/b43/nphy.h)</td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/b43/rfkill.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/b43/rfkill.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/b43/sysfs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/b43/sysfs.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/b43/tables.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/b43/tables.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/b43/tables_nphy.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/b43/tables_nphy.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/b43/wa.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/b43/wa.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/b43/xmit.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/b43/xmit.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/b43legacy/main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/b43legacy/main.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/b43legacy/phy.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/b43legacy/phy.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/b43legacy/xmit.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/b43legacy/xmit.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/hermes.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/hermes.c</a></td><td class='right'>124</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/hermes.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/hermes.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/hermes_dld.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/hermes_dld.c</a></td><td class='right'>730</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/hermes_dld.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/hermes_dld.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/hermes_rid.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/hermes_rid.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/hostap/hostap_cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/hostap/hostap_cs.c</a></td><td class='right'>237</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/ipw2100.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/ipw2100.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/ipw2200.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/ipw2200.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-3945-debug.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/iwlwifi/iwl-3945-debug.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-3945-io.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/iwlwifi/iwl-3945-io.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-3945-rs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/iwlwifi/iwl-3945-rs.c</a></td><td class='right'>200</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-3945-rs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/iwlwifi/iwl-3945-rs.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-3945.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/iwlwifi/iwl-3945.c</a></td><td class='right'>205</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-3945.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/iwlwifi/iwl-3945.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-4965-hw.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/iwlwifi/iwl-4965-hw.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-4965.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/iwlwifi/iwl-4965.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-5000-hw.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/iwlwifi/iwl-5000-hw.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-5000.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/iwlwifi/iwl-5000.c</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-agn-rs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/iwlwifi/iwl-agn-rs.c</a></td><td class='right'>331</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-agn-rs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/iwlwifi/iwl-agn-rs.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-agn.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/iwlwifi/iwl-agn.c</a></td><td class='right'>275</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-calib.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/iwlwifi/iwl-calib.c</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-commands.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/iwlwifi/iwl-commands.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/iwlwifi/iwl-core.c</a></td><td class='right'>136</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-core.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/iwlwifi/iwl-core.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-csr.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/iwlwifi/iwl-csr.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-debug.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/iwlwifi/iwl-debug.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-dev.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/iwlwifi/iwl-dev.h</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-fh.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/iwlwifi/iwl-fh.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-hcmd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/iwlwifi/iwl-hcmd.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-io.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/iwlwifi/iwl-io.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-power.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/iwlwifi/iwl-power.c</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-power.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/iwlwifi/iwl-power.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-rx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/iwlwifi/iwl-rx.c</a></td><td class='right'>163</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-scan.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/iwlwifi/iwl-scan.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-sta.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/iwlwifi/iwl-sta.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-tx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/iwlwifi/iwl-tx.c</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/iwlwifi/iwl3945-base.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/iwlwifi/iwl3945-base.c</a></td><td class='right'>250</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/libertas/assoc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/libertas/assoc.c</a></td><td class='right'>750</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 4.2%;'/><td class='none' style='width: 92.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/libertas/assoc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/libertas/assoc.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/libertas/cmd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/libertas/cmd.c</a></td><td class='right'>432</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/libertas/cmd.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/libertas/cmd.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/libertas/cmdresp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/libertas/cmdresp.c</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/libertas/decl.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/libertas/decl.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/libertas/defs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/libertas/defs.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/libertas/dev.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/libertas/dev.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/libertas/host.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/libertas/host.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/libertas/hostcmd.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/libertas/hostcmd.h</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/libertas/if_cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/libertas/if_cs.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/libertas/if_usb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/libertas/if_usb.c</a></td><td class='right'>182</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/libertas/if_usb.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/libertas/if_usb.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/libertas/main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/libertas/main.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/libertas/scan.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/libertas/scan.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/libertas/wext.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/libertas/wext.c</a></td><td class='right'>363</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/libertas_tf/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/libertas_tf/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/libertas_tf/cmd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/libertas_tf/cmd.c</a></td><td class='right'>669</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/libertas_tf/if_usb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/libertas_tf/if_usb.c</a></td><td class='right'>766</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/libertas_tf/if_usb.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/libertas_tf/if_usb.h</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/libertas_tf/libertas_tf.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/libertas_tf/libertas_tf.h</a></td><td class='right'>514</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/libertas_tf/main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/libertas_tf/main.c</a></td><td class='right'>662</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/mac80211_hwsim.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/mac80211_hwsim.c</a></td><td class='right'>217</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/netwave_cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/netwave_cs.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/orinoco.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/orinoco.c</a></td><td class='right'>1951</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 17.7%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 80.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/orinoco.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/orinoco.h</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/orinoco_cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/orinoco_cs.c</a></td><td class='right'>175</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/orinoco_nortel.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/orinoco_nortel.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/orinoco_pci.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/orinoco_pci.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/orinoco_plx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/orinoco_plx.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/orinoco_tmd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/orinoco_tmd.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/p54/p54.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/p54/p54.h</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/p54/p54common.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/p54/p54common.c</a></td><td class='right'>696</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.4%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 93.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/p54/p54common.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/p54/p54common.h</a></td><td class='right'>124</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/p54/p54pci.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/p54/p54pci.c</a></td><td class='right'>427</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/p54/p54pci.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/p54/p54pci.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/p54/p54usb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/p54/p54usb.c</a></td><td class='right'>203</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/p54/p54usb.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/p54/p54usb.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/prism54/isl_ioctl.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/prism54/isl_ioctl.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/ray_cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/ray_cs.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/rndis_wlan.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/rndis_wlan.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/rt2x00/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/rt2x00/Kconfig</a></td><td class='right'>128</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/rt2x00/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/rt2x00/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/rt2x00/rt2400pci.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/rt2x00/rt2400pci.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/rt2x00/rt2400pci.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/rt2x00/rt2400pci.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/rt2x00/rt2500pci.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/rt2x00/rt2500pci.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/rt2x00/rt2500pci.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/rt2x00/rt2500pci.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/rt2x00/rt2500usb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/rt2x00/rt2500usb.c</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/rt2x00/rt2500usb.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/rt2x00/rt2500usb.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/rt2x00/rt2x00.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/rt2x00/rt2x00.h</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/rt2x00/rt2x00config.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/rt2x00/rt2x00config.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/rt2x00/rt2x00crypto.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/rt2x00/rt2x00crypto.c</a></td><td class='right'>215</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/rt2x00/rt2x00debug.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/rt2x00/rt2x00debug.c</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/rt2x00/rt2x00dev.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/rt2x00/rt2x00dev.c</a></td><td class='right'>129</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/rt2x00/rt2x00lib.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/rt2x00/rt2x00lib.h</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/rt2x00/rt2x00mac.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/rt2x00/rt2x00mac.c</a></td><td class='right'>245</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/rt2x00/rt2x00queue.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/rt2x00/rt2x00queue.c</a></td><td class='right'>137</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/rt2x00/rt2x00queue.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/rt2x00/rt2x00queue.h</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/rt2x00/rt2x00reg.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/rt2x00/rt2x00reg.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/rt2x00/rt2x00rfkill.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/rt2x00/rt2x00rfkill.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/rt2x00/rt2x00usb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/rt2x00/rt2x00usb.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/rt2x00/rt61pci.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/rt2x00/rt61pci.c</a></td><td class='right'>447</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/rt2x00/rt61pci.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/rt2x00/rt61pci.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/rt2x00/rt73usb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/rt2x00/rt73usb.c</a></td><td class='right'>457</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/rt2x00/rt73usb.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/rt2x00/rt73usb.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/rtl8180.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/rtl8180.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/rtl8180_dev.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/rtl8180_dev.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/rtl8187.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/rtl8187.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/rtl8187_dev.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/rtl8187_dev.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/rtl818x.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/rtl818x.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/spectrum_cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/spectrum_cs.c</a></td><td class='right'>595</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 5.1%;'/><td class='none' style='width: 94.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/wavelan.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/wavelan.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/wavelan.p.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/wavelan.p.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/wavelan_cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/wavelan_cs.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/wl3501_cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/wl3501_cs.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/zd1211rw/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/zd1211rw/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/zd1211rw/zd_chip.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/zd1211rw/zd_chip.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/zd1211rw/zd_ieee80211.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/zd1211rw/zd_ieee80211.c</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/zd1211rw/zd_ieee80211.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/zd1211rw/zd_ieee80211.h</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/zd1211rw/zd_mac.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/zd1211rw/zd_mac.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/zd1211rw/zd_mac.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/zd1211rw/zd_mac.h</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/wireless/zd1211rw/zd_rf.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/zd1211rw/zd_rf.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/net/xen-netfront.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/xen-netfront.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/nubus/nubus.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/nubus/nubus.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/of/base.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/of/base.c</a></td><td class='right'>136</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/of/gpio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/of/gpio.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/oprofile/buffer_sync.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/oprofile/buffer_sync.c</a></td><td class='right'>209</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/oprofile/cpu_buffer.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/oprofile/cpu_buffer.c</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/oprofile/cpu_buffer.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/oprofile/cpu_buffer.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/parport/ChangeLog?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/parport/ChangeLog</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/parport/ieee1284.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/parport/ieee1284.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/parport/parport_cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/parport/parport_cs.c</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/parport/parport_sunbpp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/parport/parport_sunbpp.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/parport/probe.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/parport/probe.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/parport/share.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/parport/share.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/pci/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pci/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/pci/dmar.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pci/dmar.c</a></td><td class='right'>401</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/pci/hotplug/ibmphp_ebda.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pci/hotplug/ibmphp_ebda.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/pci/hotplug/rpaphp_slot.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pci/hotplug/rpaphp_slot.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/pci/intel-iommu.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pci/intel-iommu.c</a></td><td class='right'>303</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/pci/intr_remapping.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pci/intr_remapping.c</a></td><td class='right'>471</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/pci/intr_remapping.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pci/intr_remapping.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/pci/iova.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pci/iova.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/pci/probe.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pci/probe.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/pci/quirks.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pci/quirks.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/pci/setup-bus.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pci/setup-bus.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/pcmcia/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pcmcia/Kconfig</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/pcmcia/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pcmcia/Makefile</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/pcmcia/au1000_generic.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pcmcia/au1000_generic.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/pcmcia/au1000_generic.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pcmcia/au1000_generic.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/pcmcia/au1000_pb1x00.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pcmcia/au1000_pb1x00.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/pcmcia/au1000_xxs1500.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pcmcia/au1000_xxs1500.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/pcmcia/cardbus.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pcmcia/cardbus.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/pcmcia/cistpl.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pcmcia/cistpl.c</a></td><td class='right'>297</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/pcmcia/cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pcmcia/cs.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/pcmcia/cs_internal.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pcmcia/cs_internal.h</a></td><td class='right'>226</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/pcmcia/ds.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pcmcia/ds.c</a></td><td class='right'>239</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/pcmcia/ds_internal.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pcmcia/ds_internal.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/pcmcia/hd64465_ss.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pcmcia/hd64465_ss.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/pcmcia/i82365.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pcmcia/i82365.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/pcmcia/m32r_cfc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pcmcia/m32r_cfc.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/pcmcia/m32r_pcc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pcmcia/m32r_pcc.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/pcmcia/m8xx_pcmcia.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pcmcia/m8xx_pcmcia.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/pcmcia/o2micro.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pcmcia/o2micro.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/pcmcia/pcmcia_ioctl.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pcmcia/pcmcia_ioctl.c</a></td><td class='right'>120</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/pcmcia/pcmcia_resource.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pcmcia/pcmcia_resource.c</a></td><td class='right'>381</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/pcmcia/pxa2xx_base.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pcmcia/pxa2xx_base.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/pcmcia/pxa2xx_cm_x255.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pcmcia/pxa2xx_cm_x255.c</a></td><td class='right'>154</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/pcmcia/pxa2xx_cm_x270.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pcmcia/pxa2xx_cm_x270.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/pcmcia/pxa2xx_cm_x2xx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pcmcia/pxa2xx_cm_x2xx.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/pcmcia/pxa2xx_palmld.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pcmcia/pxa2xx_palmld.c</a></td><td class='right'>151</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/pcmcia/pxa2xx_trizeps4.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pcmcia/pxa2xx_trizeps4.c</a></td><td class='right'>256</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/pcmcia/pxa2xx_viper.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pcmcia/pxa2xx_viper.c</a></td><td class='right'>179</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/pcmcia/rsrc_nonstatic.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pcmcia/rsrc_nonstatic.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/pcmcia/soc_common.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pcmcia/soc_common.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/pcmcia/soc_common.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pcmcia/soc_common.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/pcmcia/socket_sysfs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pcmcia/socket_sysfs.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/pcmcia/tcic.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pcmcia/tcic.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/pcmcia/ti113x.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pcmcia/ti113x.h</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/pcmcia/yenta_socket.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pcmcia/yenta_socket.c</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/pnp/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pnp/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/pnp/base.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pnp/base.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/pnp/core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pnp/core.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/pnp/driver.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pnp/driver.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/pnp/interface.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pnp/interface.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/pnp/isapnp/core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pnp/isapnp/core.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/pnp/pnpacpi/core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pnp/pnpacpi/core.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/pnp/pnpbios/core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pnp/pnpbios/core.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/pnp/quirks.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pnp/quirks.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/pnp/resource.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pnp/resource.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/power/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/power/Kconfig</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/power/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/power/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/power/olpc_battery.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/power/olpc_battery.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/power/palmtx_battery.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/power/palmtx_battery.c</a></td><td class='right'>198</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/power/power_supply_core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/power/power_supply_core.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/power/wm97xx_battery.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/power/wm97xx_battery.c</a></td><td class='right'>272</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/regulator/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/regulator/Kconfig</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/regulator/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/regulator/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/regulator/bq24022.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/regulator/bq24022.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/regulator/core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/regulator/core.c</a></td><td class='right'>508</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/regulator/da903x.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/regulator/da903x.c</a></td><td class='right'>513</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/regulator/wm8350-regulator.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/regulator/wm8350-regulator.c</a></td><td class='right'>1431</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 14.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 85.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/regulator/wm8400-regulator.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/regulator/wm8400-regulator.c</a></td><td class='right'>368</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/rtc/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/rtc/Kconfig</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/rtc/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/rtc/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/rtc/rtc-at91rm9200.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/rtc/rtc-at91rm9200.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/rtc/rtc-bq4802.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/rtc/rtc-bq4802.c</a></td><td class='right'>230</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/rtc/rtc-cmos.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/rtc/rtc-cmos.c</a></td><td class='right'>127</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/rtc/rtc-dev.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/rtc/rtc-dev.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/rtc/rtc-ds1286.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/rtc/rtc-ds1286.c</a></td><td class='right'>410</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/rtc/rtc-ds1307.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/rtc/rtc-ds1307.c</a></td><td class='right'>308</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/rtc/rtc-ds1374.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/rtc/rtc-ds1374.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/rtc/rtc-ds1511.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/rtc/rtc-ds1511.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/rtc/rtc-ds1553.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/rtc/rtc-ds1553.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/rtc/rtc-ds1672.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/rtc/rtc-ds1672.c</a></td><td class='right'>114</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/rtc/rtc-ds3234.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/rtc/rtc-ds3234.c</a></td><td class='right'>290</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/rtc/rtc-m41t80.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/rtc/rtc-m41t80.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/rtc/rtc-m48t35.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/rtc/rtc-m48t35.c</a></td><td class='right'>235</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/rtc/rtc-m48t59.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/rtc/rtc-m48t59.c</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/rtc/rtc-max6900.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/rtc/rtc-max6900.c</a></td><td class='right'>223</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/rtc/rtc-pcf8563.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/rtc/rtc-pcf8563.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/rtc/rtc-pl030.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/rtc/rtc-pl030.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/rtc/rtc-pl031.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/rtc/rtc-pl031.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/rtc/rtc-rs5c372.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/rtc/rtc-rs5c372.c</a></td><td class='right'>228</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/rtc/rtc-sh.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/rtc/rtc-sh.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/rtc/rtc-starfire.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/rtc/rtc-starfire.c</a></td><td class='right'>120</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/rtc/rtc-stk17ta8.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/rtc/rtc-stk17ta8.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/rtc/rtc-sun4v.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/rtc/rtc-sun4v.c</a></td><td class='right'>153</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/s390/block/dasd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/block/dasd.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/s390/block/dasd_3990_erp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/block/dasd_3990_erp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/s390/block/dasd_devmap.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/block/dasd_devmap.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/s390/block/dasd_diag.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/block/dasd_diag.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/s390/block/dasd_eckd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/block/dasd_eckd.c</a></td><td class='right'>134</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/s390/block/dasd_eer.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/block/dasd_eer.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/s390/block/dasd_fba.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/block/dasd_fba.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/s390/block/dasd_int.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/block/dasd_int.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/s390/block/dasd_proc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/block/dasd_proc.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/s390/block/dcssblk.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/block/dcssblk.c</a></td><td class='right'>520</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/s390/block/xpram.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/block/xpram.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/s390/char/con3215.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/char/con3215.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/s390/char/con3270.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/char/con3270.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/s390/char/fs3270.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/char/fs3270.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/s390/char/raw3270.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/char/raw3270.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/s390/char/sclp_con.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/char/sclp_con.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/s390/char/sclp_vt220.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/char/sclp_vt220.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/s390/char/tape_3590.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/char/tape_3590.c</a></td><td class='right'>132</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/s390/char/tape_block.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/char/tape_block.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/s390/char/tape_class.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/char/tape_class.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/s390/char/tape_core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/char/tape_core.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/s390/char/tape_proc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/char/tape_proc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/s390/char/tape_std.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/char/tape_std.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/s390/char/vmlogrdr.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/char/vmlogrdr.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/s390/char/vmur.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/char/vmur.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/s390/cio/blacklist.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/cio/blacklist.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/s390/cio/ccwgroup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/cio/ccwgroup.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/s390/cio/chp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/cio/chp.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/s390/cio/chsc_sch.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/cio/chsc_sch.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/s390/cio/cio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/cio/cio.c</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/s390/cio/cio.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/cio/cio.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/s390/cio/css.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/cio/css.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/s390/cio/device.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/cio/device.c</a></td><td class='right'>118</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/s390/cio/device.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/cio/device.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/s390/cio/device_fsm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/cio/device_fsm.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/s390/cio/device_ops.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/cio/device_ops.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/s390/cio/io_sch.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/cio/io_sch.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/s390/cio/ioasm.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/cio/ioasm.h</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/s390/cio/qdio.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/cio/qdio.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/s390/cio/qdio_debug.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/cio/qdio_debug.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/s390/cio/qdio_main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/cio/qdio_main.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/s390/crypto/ap_bus.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/crypto/ap_bus.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/s390/kvm/kvm_virtio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/kvm/kvm_virtio.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/s390/net/claw.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/net/claw.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/s390/net/claw.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/net/claw.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/s390/net/ctcm_main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/net/ctcm_main.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/s390/net/ctcm_main.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/net/ctcm_main.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/s390/net/ctcm_mpc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/net/ctcm_mpc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/s390/net/lcs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/net/lcs.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/s390/net/netiucv.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/net/netiucv.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/s390/net/qeth_core.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/net/qeth_core.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/s390/net/qeth_core_main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/net/qeth_core_main.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/s390/net/qeth_l2_main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/net/qeth_l2_main.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/s390/net/qeth_l3_main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/net/qeth_l3_main.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/s390/s390_rdev.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/s390_rdev.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/s390/scsi/zfcp_aux.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/scsi/zfcp_aux.c</a></td><td class='right'>149</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/s390/scsi/zfcp_ccw.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/scsi/zfcp_ccw.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/s390/scsi/zfcp_dbf.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/scsi/zfcp_dbf.c</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/s390/scsi/zfcp_dbf.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/scsi/zfcp_dbf.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/s390/scsi/zfcp_def.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/scsi/zfcp_def.h</a></td><td class='right'>185</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/s390/scsi/zfcp_erp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/scsi/zfcp_erp.c</a></td><td class='right'>231</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/s390/scsi/zfcp_ext.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/scsi/zfcp_ext.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/s390/scsi/zfcp_fc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/scsi/zfcp_fc.c</a></td><td class='right'>227</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/s390/scsi/zfcp_fsf.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/scsi/zfcp_fsf.c</a></td><td class='right'>618</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 2.6%;'/><td class='none' style='width: 93.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/s390/scsi/zfcp_fsf.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/scsi/zfcp_fsf.h</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/s390/scsi/zfcp_qdio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/scsi/zfcp_qdio.c</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/s390/scsi/zfcp_scsi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/scsi/zfcp_scsi.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/s390/scsi/zfcp_sysfs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/scsi/zfcp_sysfs.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/sbus/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/sbus/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/sbus/char/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/sbus/char/Kconfig</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/sbus/char/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/sbus/char/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/sbus/char/bbc_envctrl.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/sbus/char/bbc_envctrl.c</a></td><td class='right'>121</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/sbus/char/bbc_i2c.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/sbus/char/bbc_i2c.c</a></td><td class='right'>267</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/sbus/char/bbc_i2c.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/sbus/char/bbc_i2c.h</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/sbus/char/bpp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/sbus/char/bpp.c</a></td><td class='right'>1055</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 10.5%;'/><td class='none' style='width: 89.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/sbus/char/cpwatchdog.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/sbus/char/cpwatchdog.c</a></td><td class='right'>858</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 8.6%;'/><td class='none' style='width: 91.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/sbus/char/display7seg.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/sbus/char/display7seg.c</a></td><td class='right'>251</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/sbus/char/envctrl.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/sbus/char/envctrl.c</a></td><td class='right'>147</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/sbus/char/flash.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/sbus/char/flash.c</a></td><td class='right'>130</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/sbus/char/rtc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/sbus/char/rtc.c</a></td><td class='right'>275</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.7%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/sbus/char/uctrl.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/sbus/char/uctrl.c</a></td><td class='right'>216</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/sbus/char/vfc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/sbus/char/vfc.h</a></td><td class='right'>171</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/sbus/char/vfc_dev.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/sbus/char/vfc_dev.c</a></td><td class='right'>736</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 7.3%;'/><td class='none' style='width: 92.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/sbus/char/vfc_i2c.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/sbus/char/vfc_i2c.c</a></td><td class='right'>335</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.3%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/sbus/char/vfc_i2c.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/sbus/char/vfc_i2c.h</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/sbus/dvma.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/sbus/dvma.c</a></td><td class='right'>136</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/sbus/sbus.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/sbus/sbus.c</a></td><td class='right'>316</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.1%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/Kconfig</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/aacraid/aachba.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/aacraid/aachba.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/atari_dma_emul.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/atari_dma_emul.c</a></td><td class='right'>468</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.7%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/atari_scsi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/atari_scsi.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/ch.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/ch.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/constants.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/constants.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/device_handler/scsi_dh_alua.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/device_handler/scsi_dh_alua.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/device_handler/scsi_dh_emc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/device_handler/scsi_dh_emc.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/device_handler/scsi_dh_hp_sw.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/device_handler/scsi_dh_hp_sw.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/device_handler/scsi_dh_rdac.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/device_handler/scsi_dh_rdac.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/dpt_i2o.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/dpt_i2o.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/esp_scsi.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/esp_scsi.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/gdth.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/gdth.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/gdth.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/gdth.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/gdth_proc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/gdth_proc.c</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/gdth_proc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/gdth_proc.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/hosts.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/hosts.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/ibmvscsi/ibmvfc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/ibmvscsi/ibmvfc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/ibmvscsi/ibmvscsi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/ibmvscsi/ibmvscsi.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/ide-scsi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/ide-scsi.c</a></td><td class='right'>220</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/ipr.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/ipr.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/ips.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/ips.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/iscsi_tcp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/iscsi_tcp.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/libiscsi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/libiscsi.c</a></td><td class='right'>202</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/libsas/sas_ata.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/libsas/sas_ata.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/libsas/sas_internal.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/libsas/sas_internal.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/libsas/sas_scsi_host.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/libsas/sas_scsi_host.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/lpfc/lpfc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/lpfc/lpfc.h</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/lpfc/lpfc_attr.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/lpfc/lpfc_attr.c</a></td><td class='right'>1375</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 86.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/lpfc/lpfc_crtn.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/lpfc/lpfc_crtn.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/lpfc/lpfc_ct.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/lpfc/lpfc_ct.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/lpfc/lpfc_debugfs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/lpfc/lpfc_debugfs.c</a></td><td class='right'>400</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/lpfc/lpfc_disc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/lpfc/lpfc_disc.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/lpfc/lpfc_els.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/lpfc/lpfc_els.c</a></td><td class='right'>1712</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 15.8%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 82.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/lpfc/lpfc_hbadisc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/lpfc/lpfc_hbadisc.c</a></td><td class='right'>241</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/lpfc/lpfc_hw.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/lpfc/lpfc_hw.h</a></td><td class='right'>183</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/lpfc/lpfc_init.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/lpfc/lpfc_init.c</a></td><td class='right'>924</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.2%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 90.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/lpfc/lpfc_mbox.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/lpfc/lpfc_mbox.c</a></td><td class='right'>624</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.2%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 93.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/lpfc/lpfc_mem.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/lpfc/lpfc_mem.c</a></td><td class='right'>116</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/lpfc/lpfc_nl.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/lpfc/lpfc_nl.h</a></td><td class='right'>163</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/lpfc/lpfc_nportdisc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/lpfc/lpfc_nportdisc.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/lpfc/lpfc_scsi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/lpfc/lpfc_scsi.c</a></td><td class='right'>514</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/lpfc/lpfc_scsi.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/lpfc/lpfc_scsi.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/lpfc/lpfc_sli.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/lpfc/lpfc_sli.c</a></td><td class='right'>1715</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 15.1%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 82.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/lpfc/lpfc_sli.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/lpfc/lpfc_sli.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/lpfc/lpfc_version.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/lpfc/lpfc_version.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/lpfc/lpfc_vport.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/lpfc/lpfc_vport.c</a></td><td class='right'>168</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/lpfc/lpfc_vport.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/lpfc/lpfc_vport.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/megaraid/megaraid_sas.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/megaraid/megaraid_sas.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/ncr53c8xx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/ncr53c8xx.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/osst.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/osst.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/pcmcia/aha152x_stub.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/pcmcia/aha152x_stub.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/pcmcia/fdomain_stub.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/pcmcia/fdomain_stub.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/pcmcia/nsp_cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/pcmcia/nsp_cs.c</a></td><td class='right'>194</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/pcmcia/qlogic_stub.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/pcmcia/qlogic_stub.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/pcmcia/sym53c500_cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/pcmcia/sym53c500_cs.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/qla1280.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/qla1280.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/qla2xxx/qla_attr.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/qla2xxx/qla_attr.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/qla2xxx/qla_def.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/qla2xxx/qla_def.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/qla2xxx/qla_fw.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/qla2xxx/qla_fw.h</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/qla2xxx/qla_gbl.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/qla2xxx/qla_gbl.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/qla2xxx/qla_init.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/qla2xxx/qla_init.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/qla2xxx/qla_inline.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/qla2xxx/qla_inline.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/qla2xxx/qla_iocb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/qla2xxx/qla_iocb.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/qla2xxx/qla_isr.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/qla2xxx/qla_isr.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/qla2xxx/qla_mbx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/qla2xxx/qla_mbx.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/qla2xxx/qla_os.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/qla2xxx/qla_os.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/qla2xxx/qla_sup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/qla2xxx/qla_sup.c</a></td><td class='right'>338</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/qla2xxx/qla_version.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/qla2xxx/qla_version.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/qla4xxx/ql4_isr.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/qla4xxx/ql4_isr.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/qla4xxx/ql4_os.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/qla4xxx/ql4_os.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/qlogicpti.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/qlogicpti.c</a></td><td class='right'>146</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/qlogicpti.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/qlogicpti.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/scsi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/scsi.c</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/scsi_error.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/scsi_error.c</a></td><td class='right'>162</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/scsi_lib.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/scsi_lib.c</a></td><td class='right'>162</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/scsi_netlink.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/scsi_netlink.c</a></td><td class='right'>523</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/scsi_priv.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/scsi_priv.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/scsi_proc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/scsi_proc.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/scsi_scan.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/scsi_scan.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/scsi_sysfs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/scsi_sysfs.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/scsi_tgt_lib.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/scsi_tgt_lib.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/scsi_transport_fc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/scsi_transport_fc.c</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/scsi_transport_iscsi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/scsi_transport_iscsi.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/scsi_transport_spi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/scsi_transport_spi.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/sd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/sd.c</a></td><td class='right'>139</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/sd.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/sd.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/sd_dif.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/sd_dif.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/sg.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/sg.c</a></td><td class='right'>677</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 5.1%;'/><td class='none' style='width: 93.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/sr.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/sr.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/st.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/st.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/sun_esp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/sun_esp.c</a></td><td class='right'>267</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/sym53c8xx_2/sym_glue.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/sym53c8xx_2/sym_glue.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/scsi/tmscsim.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/tmscsim.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/serial/8250.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/serial/8250.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/serial/8250_pci.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/serial/8250_pci.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/serial/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/serial/Kconfig</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/serial/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/serial/Makefile</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/serial/bfin_5xx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/serial/bfin_5xx.c</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/serial/cpm_uart/cpm_uart_core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/serial/cpm_uart/cpm_uart_core.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/serial/cpm_uart/cpm_uart_cpm1.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/serial/cpm_uart/cpm_uart_cpm1.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/serial/cpm_uart/cpm_uart_cpm2.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/serial/cpm_uart/cpm_uart_cpm2.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/serial/crisv10.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/serial/crisv10.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/serial/mcfserial.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/serial/mcfserial.c</a></td><td class='right'>1965</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 19.6%;'/><td class='none' style='width: 80.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/serial/mcfserial.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/serial/mcfserial.h</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/serial/mpc52xx_uart.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/serial/mpc52xx_uart.c</a></td><td class='right'>181</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/serial/pxa.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/serial/pxa.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/serial/s3c2400.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/serial/s3c2400.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/serial/s3c2410.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/serial/s3c2410.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/serial/s3c2412.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/serial/s3c2412.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/serial/s3c2440.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/serial/s3c2440.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/serial/samsung.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/serial/samsung.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/serial/serial_core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/serial/serial_core.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/serial/serial_cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/serial/serial_cs.c</a></td><td class='right'>302</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/serial/serial_ks8695.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/serial/serial_ks8695.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/serial/sunhv.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/serial/sunhv.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/serial/sunsab.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/serial/sunsab.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/serial/sunsu.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/serial/sunsu.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/serial/sunzilog.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/serial/sunzilog.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/serial/ucc_uart.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/serial/ucc_uart.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/spi/mpc52xx_psc_spi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/spi/mpc52xx_psc_spi.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/spi/omap2_mcspi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/spi/omap2_mcspi.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/spi/omap_uwire.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/spi/omap_uwire.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/spi/orion_spi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/spi/orion_spi.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/spi/pxa2xx_spi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/spi/pxa2xx_spi.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/spi/spi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/spi/spi.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/spi/spi_s3c24xx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/spi/spi_s3c24xx.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/spi/spidev.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/spi/spidev.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ssb/pci.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ssb/pci.c</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/ssb/pcmcia.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ssb/pcmcia.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/Kconfig</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/Makefile</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/at76_usb/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/at76_usb/Kconfig</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/at76_usb/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/at76_usb/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/at76_usb/TODO?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/at76_usb/TODO</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/at76_usb/at76_usb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/at76_usb/at76_usb.c</a></td><td class='right'>5559</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 55.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 44.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/at76_usb/at76_usb.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/at76_usb/at76_usb.h</a></td><td class='right'>619</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/echo/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/echo/Kconfig</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/echo/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/echo/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/echo/TODO?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/echo/TODO</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/echo/bit_operations.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/echo/bit_operations.h</a></td><td class='right'>253</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/echo/echo.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/echo/echo.c</a></td><td class='right'>632</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/echo/echo.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/echo/echo.h</a></td><td class='right'>220</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/echo/fir.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/echo/fir.h</a></td><td class='right'>369</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/echo/mmx.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/echo/mmx.h</a></td><td class='right'>288</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/et131x/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/et131x/Kconfig</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/et131x/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/et131x/Makefile</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/et131x/README?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/et131x/README</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/et131x/et1310_address_map.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/et131x/et1310_address_map.h</a></td><td class='right'>2399</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 23.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 76.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/et131x/et1310_eeprom.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/et131x/et1310_eeprom.c</a></td><td class='right'>480</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/et131x/et1310_eeprom.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/et131x/et1310_eeprom.h</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/et131x/et1310_jagcore.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/et131x/et1310_jagcore.c</a></td><td class='right'>220</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/et131x/et1310_jagcore.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/et131x/et1310_jagcore.h</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/et131x/et1310_mac.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/et131x/et1310_mac.c</a></td><td class='right'>792</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/et131x/et1310_mac.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/et131x/et1310_mac.h</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/et131x/et1310_phy.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/et131x/et1310_phy.c</a></td><td class='right'>1281</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 87.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/et131x/et1310_phy.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/et131x/et1310_phy.h</a></td><td class='right'>910</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/et131x/et1310_pm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/et131x/et1310_pm.c</a></td><td class='right'>207</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/et131x/et1310_pm.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/et131x/et1310_pm.h</a></td><td class='right'>125</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/et131x/et1310_rx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/et131x/et1310_rx.c</a></td><td class='right'>1391</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 86.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/et131x/et1310_rx.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/et131x/et1310_rx.h</a></td><td class='right'>373</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/et131x/et1310_tx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/et131x/et1310_tx.c</a></td><td class='right'>1525</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 15.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 84.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/et131x/et1310_tx.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/et131x/et1310_tx.h</a></td><td class='right'>242</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/et131x/et131x_adapter.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/et131x/et131x_adapter.h</a></td><td class='right'>347</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/et131x/et131x_config.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/et131x/et131x_config.c</a></td><td class='right'>325</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/et131x/et131x_config.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/et131x/et131x_config.h</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/et131x/et131x_debug.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/et131x/et131x_debug.c</a></td><td class='right'>218</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/et131x/et131x_debug.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/et131x/et131x_debug.h</a></td><td class='right'>201</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/et131x/et131x_defs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/et131x/et131x_defs.h</a></td><td class='right'>128</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/et131x/et131x_initpci.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/et131x/et131x_initpci.c</a></td><td class='right'>1046</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/et131x/et131x_initpci.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/et131x/et131x_initpci.h</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/et131x/et131x_isr.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/et131x/et131x_isr.c</a></td><td class='right'>488</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/et131x/et131x_isr.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/et131x/et131x_isr.h</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/et131x/et131x_netdev.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/et131x/et131x_netdev.c</a></td><td class='right'>856</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/et131x/et131x_netdev.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/et131x/et131x_netdev.h</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/et131x/et131x_version.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/et131x/et131x_version.h</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/go7007/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/go7007/Kconfig</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/go7007/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/go7007/Makefile</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/go7007/README?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/go7007/README</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/go7007/go7007-driver.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/go7007/go7007-driver.c</a></td><td class='right'>688</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/go7007/go7007-fw.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/go7007/go7007-fw.c</a></td><td class='right'>1639</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 16.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 83.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/go7007/go7007-i2c.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/go7007/go7007-i2c.c</a></td><td class='right'>309</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/go7007/go7007-priv.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/go7007/go7007-priv.h</a></td><td class='right'>279</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/go7007/go7007-usb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/go7007/go7007-usb.c</a></td><td class='right'>1229</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 87.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/go7007/go7007-v4l2.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/go7007/go7007-v4l2.c</a></td><td class='right'>1499</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 14.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 85.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/go7007/go7007.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/go7007/go7007.h</a></td><td class='right'>114</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/go7007/saa7134-go7007.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/go7007/saa7134-go7007.c</a></td><td class='right'>484</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/go7007/snd-go7007.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/go7007/snd-go7007.c</a></td><td class='right'>305</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/go7007/wis-i2c.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/go7007/wis-i2c.h</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/go7007/wis-ov7640.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/go7007/wis-ov7640.c</a></td><td class='right'>130</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/go7007/wis-saa7113.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/go7007/wis-saa7113.c</a></td><td class='right'>358</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/go7007/wis-saa7115.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/go7007/wis-saa7115.c</a></td><td class='right'>491</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/go7007/wis-sony-tuner.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/go7007/wis-sony-tuner.c</a></td><td class='right'>742</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/go7007/wis-tw2804.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/go7007/wis-tw2804.c</a></td><td class='right'>380</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/go7007/wis-tw9903.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/go7007/wis-tw9903.c</a></td><td class='right'>362</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/go7007/wis-uda1342.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/go7007/wis-uda1342.c</a></td><td class='right'>136</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/me4000/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/me4000/Kconfig</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/me4000/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/me4000/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/me4000/README?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/me4000/README</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/me4000/me4000.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/me4000/me4000.c</a></td><td class='right'>6133</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 61.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 38.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/me4000/me4000.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/me4000/me4000.h</a></td><td class='right'>954</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/me4000/me4000_firmware.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/me4000/me4000_firmware.h</a></td><td class='right'>10033</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 100.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 0.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/me4000/me4610_firmware.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/me4000/me4610_firmware.h</a></td><td class='right'>5409</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 53.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 46.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/slicoss/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/slicoss/Kconfig</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/slicoss/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/slicoss/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/slicoss/README?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/slicoss/README</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/slicoss/gbdownload.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/slicoss/gbdownload.h</a></td><td class='right'>8215</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 81.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 18.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/slicoss/gbrcvucode.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/slicoss/gbrcvucode.h</a></td><td class='right'>238</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/slicoss/oasisdbgdownload.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/slicoss/oasisdbgdownload.h</a></td><td class='right'>6850</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 68.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 31.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/slicoss/oasisdownload.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/slicoss/oasisdownload.h</a></td><td class='right'>6848</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 68.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 31.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/slicoss/oasisrcvucode.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/slicoss/oasisrcvucode.h</a></td><td class='right'>205</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/slicoss/slic.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/slicoss/slic.h</a></td><td class='right'>598</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/slicoss/slic_os.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/slicoss/slic_os.h</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/slicoss/slicbuild.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/slicoss/slicbuild.h</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/slicoss/slicdbg.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/slicoss/slicdbg.h</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/slicoss/slicdump.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/slicoss/slicdump.h</a></td><td class='right'>278</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/slicoss/slichw.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/slicoss/slichw.h</a></td><td class='right'>845</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/slicoss/slicinc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/slicoss/slicinc.h</a></td><td class='right'>185</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/slicoss/slicoss.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/slicoss/slicoss.c</a></td><td class='right'>5936</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 59.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 40.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/staging.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/staging.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/sxg/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/sxg/Kconfig</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/sxg/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/sxg/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/sxg/README?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/sxg/README</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/sxg/saharadbgdownload.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/sxg/saharadbgdownload.h</a></td><td class='right'>4854</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 48.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 51.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/sxg/sxg.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/sxg/sxg.c</a></td><td class='right'>3624</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 36.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 63.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/sxg/sxg.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/sxg/sxg.h</a></td><td class='right'>773</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/sxg/sxg_os.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/sxg/sxg_os.h</a></td><td class='right'>154</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/sxg/sxgdbg.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/sxg/sxgdbg.h</a></td><td class='right'>190</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/sxg/sxghif.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/sxg/sxghif.h</a></td><td class='right'>861</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/sxg/sxghw.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/sxg/sxghw.h</a></td><td class='right'>734</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/sxg/sxgphycode.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/sxg/sxgphycode.h</a></td><td class='right'>349</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/usbip/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/usbip/Kconfig</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/usbip/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/usbip/Makefile</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/usbip/README?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/usbip/README</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/usbip/stub.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/usbip/stub.h</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/usbip/stub_dev.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/usbip/stub_dev.c</a></td><td class='right'>483</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/usbip/stub_main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/usbip/stub_main.c</a></td><td class='right'>300</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/usbip/stub_rx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/usbip/stub_rx.c</a></td><td class='right'>615</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/usbip/stub_tx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/usbip/stub_tx.c</a></td><td class='right'>371</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/usbip/usbip_common.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/usbip/usbip_common.c</a></td><td class='right'>997</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/usbip/usbip_common.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/usbip/usbip_common.h</a></td><td class='right'>406</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/usbip/usbip_event.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/usbip/usbip_event.c</a></td><td class='right'>141</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/usbip/vhci.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/usbip/vhci.h</a></td><td class='right'>142</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/usbip/vhci_hcd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/usbip/vhci_hcd.c</a></td><td class='right'>1275</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 87.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/usbip/vhci_rx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/usbip/vhci_rx.c</a></td><td class='right'>251</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/usbip/vhci_sysfs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/usbip/vhci_sysfs.c</a></td><td class='right'>250</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/usbip/vhci_tx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/usbip/vhci_tx.c</a></td><td class='right'>239</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/winbond/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/Kconfig</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/winbond/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/Makefile</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/winbond/README?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/README</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/winbond/adapter.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/adapter.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/winbond/bss_f.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/bss_f.h</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/winbond/bssdscpt.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/bssdscpt.h</a></td><td class='right'>156</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/winbond/ds_tkip.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/ds_tkip.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/winbond/gl_80211.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/gl_80211.h</a></td><td class='right'>125</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/winbond/ioctls.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/ioctls.h</a></td><td class='right'>678</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/winbond/linux/common.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/linux/common.h</a></td><td class='right'>143</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/winbond/linux/sysdef.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/linux/sysdef.h</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/winbond/linux/wb35reg.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/linux/wb35reg.c</a></td><td class='right'>747</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/winbond/linux/wb35reg_f.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/linux/wb35reg_f.h</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/winbond/linux/wb35reg_s.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/linux/wb35reg_s.h</a></td><td class='right'>170</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/winbond/linux/wb35rx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/linux/wb35rx.c</a></td><td class='right'>337</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/winbond/linux/wb35rx_f.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/linux/wb35rx_f.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/winbond/linux/wb35rx_s.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/linux/wb35rx_s.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/winbond/linux/wb35tx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/linux/wb35tx.c</a></td><td class='right'>313</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/winbond/linux/wb35tx_f.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/linux/wb35tx_f.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/winbond/linux/wb35tx_s.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/linux/wb35tx_s.h</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/winbond/linux/wbusb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/linux/wbusb.c</a></td><td class='right'>404</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/winbond/linux/wbusb_f.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/linux/wbusb_f.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/winbond/linux/wbusb_s.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/linux/wbusb_s.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/winbond/localpara.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/localpara.h</a></td><td class='right'>275</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/winbond/mac_structures.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/mac_structures.h</a></td><td class='right'>670</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/winbond/mds.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/mds.c</a></td><td class='right'>630</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/winbond/mds_f.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/mds_f.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/winbond/mds_s.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/mds_s.h</a></td><td class='right'>183</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/winbond/mlme_mib.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/mlme_mib.h</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/winbond/mlme_s.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/mlme_s.h</a></td><td class='right'>195</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/winbond/mlmetxrx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/mlmetxrx.c</a></td><td class='right'>150</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/winbond/mlmetxrx_f.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/mlmetxrx_f.h</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/winbond/mto.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/mto.c</a></td><td class='right'>1229</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 87.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/winbond/mto.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/mto.h</a></td><td class='right'>265</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/winbond/mto_f.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/mto_f.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/winbond/os_common.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/os_common.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/winbond/phy_calibration.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/phy_calibration.c</a></td><td class='right'>1759</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 17.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 82.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/winbond/phy_calibration.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/phy_calibration.h</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/winbond/reg.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/reg.c</a></td><td class='right'>2683</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 26.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 73.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/winbond/rxisr.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/rxisr.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/winbond/scan_s.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/scan_s.h</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/winbond/sme_api.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/sme_api.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/winbond/sme_api.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/sme_api.h</a></td><td class='right'>265</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/winbond/sme_s.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/sme_s.h</a></td><td class='right'>228</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/winbond/wb35_ver.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/wb35_ver.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/winbond/wbhal.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/wbhal.c</a></td><td class='right'>878</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/winbond/wbhal_f.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/wbhal_f.h</a></td><td class='right'>122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/winbond/wbhal_s.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/wbhal_s.h</a></td><td class='right'>615</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/winbond/wblinux.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/wblinux.c</a></td><td class='right'>277</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/winbond/wblinux_f.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/wblinux_f.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/winbond/wblinux_s.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/wblinux_s.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/wlan-ng/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/wlan-ng/Kconfig</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/wlan-ng/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/wlan-ng/Makefile</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/wlan-ng/README?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/wlan-ng/README</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/wlan-ng/hfa384x.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/wlan-ng/hfa384x.c</a></td><td class='right'>4018</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 40.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 60.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/wlan-ng/hfa384x.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/wlan-ng/hfa384x.h</a></td><td class='right'>3067</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 30.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 69.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/wlan-ng/hfa384x_usb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/wlan-ng/hfa384x_usb.c</a></td><td class='right'>5027</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 50.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 49.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/wlan-ng/p80211conv.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/wlan-ng/p80211conv.c</a></td><td class='right'>683</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/wlan-ng/p80211conv.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/wlan-ng/p80211conv.h</a></td><td class='right'>186</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/wlan-ng/p80211hdr.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/wlan-ng/p80211hdr.h</a></td><td class='right'>299</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/wlan-ng/p80211ioctl.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/wlan-ng/p80211ioctl.h</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/wlan-ng/p80211meta.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/wlan-ng/p80211meta.h</a></td><td class='right'>169</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/wlan-ng/p80211metadef.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/wlan-ng/p80211metadef.h</a></td><td class='right'>2524</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 25.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 74.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/wlan-ng/p80211metamib.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/wlan-ng/p80211metamib.h</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/wlan-ng/p80211metamsg.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/wlan-ng/p80211metamsg.h</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/wlan-ng/p80211metastruct.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/wlan-ng/p80211metastruct.h</a></td><td class='right'>644</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/wlan-ng/p80211mgmt.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/wlan-ng/p80211mgmt.h</a></td><td class='right'>575</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/wlan-ng/p80211mod.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/wlan-ng/p80211mod.c</a></td><td class='right'>216</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/wlan-ng/p80211msg.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/wlan-ng/p80211msg.h</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/wlan-ng/p80211netdev.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/wlan-ng/p80211netdev.c</a></td><td class='right'>1502</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 15.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 85.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/wlan-ng/p80211netdev.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/wlan-ng/p80211netdev.h</a></td><td class='right'>336</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/wlan-ng/p80211req.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/wlan-ng/p80211req.c</a></td><td class='right'>329</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/wlan-ng/p80211req.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/wlan-ng/p80211req.h</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/wlan-ng/p80211types.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/wlan-ng/p80211types.h</a></td><td class='right'>675</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/wlan-ng/p80211wep.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/wlan-ng/p80211wep.c</a></td><td class='right'>317</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/wlan-ng/p80211wext.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/wlan-ng/p80211wext.c</a></td><td class='right'>2048</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 20.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 79.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/wlan-ng/prism2_cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/wlan-ng/prism2_cs.c</a></td><td class='right'>1487</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 14.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 85.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/wlan-ng/prism2_pci.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/wlan-ng/prism2_pci.c</a></td><td class='right'>332</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/wlan-ng/prism2_plx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/wlan-ng/prism2_plx.c</a></td><td class='right'>472</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/wlan-ng/prism2_usb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/wlan-ng/prism2_usb.c</a></td><td class='right'>361</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/wlan-ng/prism2mgmt.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/wlan-ng/prism2mgmt.c</a></td><td class='right'>2956</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 29.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 70.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/wlan-ng/prism2mgmt.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/wlan-ng/prism2mgmt.h</a></td><td class='right'>182</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/wlan-ng/prism2mib.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/wlan-ng/prism2mib.c</a></td><td class='right'>3799</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 37.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 62.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/wlan-ng/prism2sta.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/wlan-ng/prism2sta.c</a></td><td class='right'>2502</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 24.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 75.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/wlan-ng/version.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/wlan-ng/version.h</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/staging/wlan-ng/wlan_compat.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/wlan-ng/wlan_compat.h</a></td><td class='right'>757</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/telephony/ixj.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/telephony/ixj.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/telephony/ixj_pcmcia.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/telephony/ixj_pcmcia.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/uio/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/uio/Kconfig</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/uio/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/uio/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/uio/uio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/uio/uio.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/uio/uio_pdrv.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/uio/uio_pdrv.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/uio/uio_sercos3.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/uio/uio_sercos3.c</a></td><td class='right'>243</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/atm/usbatm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/atm/usbatm.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/atm/usbatm.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/atm/usbatm.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/atm/xusbatm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/atm/xusbatm.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/class/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/class/Kconfig</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/class/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/class/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/class/cdc-acm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/class/cdc-acm.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/class/cdc-wdm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/class/cdc-wdm.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/class/usblp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/class/usblp.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/class/usbtmc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/class/usbtmc.c</a></td><td class='right'>1087</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/core/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/core/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/core/devio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/core/devio.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/core/driver.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/core/driver.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/core/endpoint.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/core/endpoint.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/core/file.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/core/file.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/core/hcd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/core/hcd.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/core/hcd.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/core/hcd.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/core/hub.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/core/hub.c</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/core/inode.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/core/inode.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/core/message.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/core/message.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/core/sysfs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/core/sysfs.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/core/urb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/core/urb.c</a></td><td class='right'>169</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/gadget/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/gadget/Kconfig</a></td><td class='right'>315</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/gadget/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/gadget/Makefile</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/gadget/cdc2.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/gadget/cdc2.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/gadget/composite.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/gadget/composite.c</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/gadget/dummy_hcd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/gadget/dummy_hcd.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/gadget/ether.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/gadget/ether.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/gadget/f_ecm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/gadget/f_ecm.c</a></td><td class='right'>108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/gadget/f_loopback.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/gadget/f_loopback.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/gadget/f_obex.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/gadget/f_obex.c</a></td><td class='right'>493</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/gadget/f_sourcesink.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/gadget/f_sourcesink.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/gadget/f_subset.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/gadget/f_subset.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/gadget/file_storage.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/gadget/file_storage.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/gadget/fsl_qe_udc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/gadget/fsl_qe_udc.c</a></td><td class='right'>2760</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 27.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 72.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/gadget/fsl_qe_udc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/gadget/fsl_qe_udc.h</a></td><td class='right'>437</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/gadget/fsl_usb2_udc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/gadget/fsl_usb2_udc.c</a></td><td class='right'>176</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/gadget/fsl_usb2_udc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/gadget/fsl_usb2_udc.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/gadget/gadget_chips.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/gadget/gadget_chips.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/gadget/gmidi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/gadget/gmidi.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/gadget/net2280.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/gadget/net2280.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/gadget/net2280.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/gadget/net2280.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/gadget/omap_udc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/gadget/omap_udc.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/gadget/printer.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/gadget/printer.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/gadget/pxa27x_udc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/gadget/pxa27x_udc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/gadget/rndis.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/gadget/rndis.c</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/gadget/s3c2410_udc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/gadget/s3c2410_udc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/gadget/serial.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/gadget/serial.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/gadget/u_ether.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/gadget/u_ether.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/gadget/u_serial.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/gadget/u_serial.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/gadget/zero.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/gadget/zero.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/host/ehci-dbg.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/host/ehci-dbg.c</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/host/ehci-hcd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/host/ehci-hcd.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/host/ehci-hub.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/host/ehci-hub.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/host/ehci-ixp4xx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/host/ehci-ixp4xx.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/host/ehci-ppc-soc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/host/ehci-ppc-soc.c</a></td><td class='right'>201</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/host/ehci.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/host/ehci.h</a></td><td class='right'>161</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/host/isp116x-hcd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/host/isp116x-hcd.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/host/isp1760-if.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/host/isp1760-if.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/host/ohci-dbg.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/host/ohci-dbg.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/host/ohci-hcd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/host/ohci-hcd.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/host/ohci-hub.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/host/ohci-hub.c</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/host/ohci-omap.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/host/ohci-omap.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/host/ohci-pnx4008.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/host/ohci-pnx4008.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/host/ohci-pxa27x.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/host/ohci-pxa27x.c</a></td><td class='right'>259</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/host/ohci.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/host/ohci.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/host/r8a66597-hcd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/host/r8a66597-hcd.c</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/host/sl811-hcd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/host/sl811-hcd.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/host/sl811_cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/host/sl811_cs.c</a></td><td class='right'>133</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/host/uhci-hcd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/host/uhci-hcd.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/host/uhci-q.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/host/uhci-q.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/image/mdc800.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/image/mdc800.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/misc/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/misc/Kconfig</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/misc/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/misc/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/misc/adutux.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/misc/adutux.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/misc/appledisplay.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/misc/appledisplay.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/misc/cypress_cy7c63.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/misc/cypress_cy7c63.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/misc/cytherm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/misc/cytherm.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/misc/emi26.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/misc/emi26.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/misc/emi62.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/misc/emi62.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/misc/ftdi-elan.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/misc/ftdi-elan.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/misc/idmouse.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/misc/idmouse.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/misc/legousbtower.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/misc/legousbtower.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/misc/phidgetkit.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/misc/phidgetkit.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/misc/phidgetmotorcontrol.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/misc/phidgetmotorcontrol.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/misc/phidgetservo.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/misc/phidgetservo.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/misc/rio500.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/misc/rio500.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/misc/trancevibrator.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/misc/trancevibrator.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/misc/usblcd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/misc/usblcd.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/misc/usbsevseg.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/misc/usbsevseg.c</a></td><td class='right'>394</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/misc/uss720.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/misc/uss720.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/misc/vstusb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/misc/vstusb.c</a></td><td class='right'>782</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/mon/mon_bin.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/mon/mon_bin.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/mon/mon_main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/mon/mon_main.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/musb/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/musb/Kconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/musb/cppi_dma.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/musb/cppi_dma.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/musb/davinci.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/musb/davinci.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/musb/musb_core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/musb/musb_core.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/musb/musb_gadget_ep0.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/musb/musb_gadget_ep0.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/musb/musb_host.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/musb/musb_host.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/musb/musb_io.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/musb/musb_io.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/musb/musbhsdma.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/musb/musbhsdma.c</a></td><td class='right'>306</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/serial/aircable.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/aircable.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/serial/belkin_sa.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/belkin_sa.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/serial/console.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/console.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/serial/cp2101.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/cp2101.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/serial/cyberjack.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/cyberjack.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/serial/cypress_m8.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/cypress_m8.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/serial/digi_acceleport.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/digi_acceleport.c</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/serial/empeg.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/empeg.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/serial/ezusb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/ezusb.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/serial/ftdi_sio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/ftdi_sio.c</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/serial/ftdi_sio.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/ftdi_sio.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/serial/garmin_gps.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/garmin_gps.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/serial/generic.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/generic.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/serial/hp4x.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/hp4x.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/serial/io_edgeport.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/io_edgeport.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/serial/io_ti.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/io_ti.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/serial/ipaq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/ipaq.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/serial/ipw.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/ipw.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/serial/ir-usb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/ir-usb.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/serial/iuu_phoenix.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/iuu_phoenix.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/serial/keyspan.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/keyspan.c</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/serial/keyspan_pda.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/keyspan_pda.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/serial/kl5kusb105.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/kl5kusb105.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/serial/kobil_sct.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/kobil_sct.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/serial/mct_u232.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/mct_u232.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/serial/mos7720.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/mos7720.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/serial/mos7840.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/mos7840.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/serial/navman.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/navman.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/serial/omninet.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/omninet.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/serial/option.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/option.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/serial/oti6858.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/oti6858.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/serial/pl2303.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/pl2303.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/serial/safe_serial.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/safe_serial.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/serial/sierra.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/sierra.c</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/serial/spcp8x5.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/spcp8x5.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/serial/ti_usb_3410_5052.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/ti_usb_3410_5052.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/serial/usb-serial.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/usb-serial.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/serial/visor.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/visor.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/serial/whiteheat.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/whiteheat.c</a></td><td class='right'>129</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/storage/onetouch.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/storage/onetouch.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/usb/storage/transport.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/storage/transport.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/Kconfig</a></td><td class='right'>142</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/am200epd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/am200epd.c</a></td><td class='right'>295</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.9%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/atmel_lcdfb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/atmel_lcdfb.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/aty/radeon_accel.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/aty/radeon_accel.c</a></td><td class='right'>313</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/aty/radeon_backlight.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/aty/radeon_backlight.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/aty/radeon_base.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/aty/radeon_base.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/aty/radeon_i2c.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/aty/radeon_i2c.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/aty/radeon_pm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/aty/radeon_pm.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/aty/radeonfb.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/aty/radeonfb.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/backlight/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/backlight/Kconfig</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/backlight/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/backlight/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/backlight/corgi_lcd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/backlight/corgi_lcd.c</a></td><td class='right'>641</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/backlight/lcd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/backlight/lcd.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/backlight/mbp_nvidia_bl.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/backlight/mbp_nvidia_bl.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/backlight/tdo24m.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/backlight/tdo24m.c</a></td><td class='right'>396</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/bw2.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/bw2.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/carminefb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/carminefb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/cg14.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/cg14.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/cg3.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/cg3.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/cg6.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/cg6.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/cirrusfb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/cirrusfb.c</a></td><td class='right'>577</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 3.6%;'/><td class='none' style='width: 94.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/console/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/console/Kconfig</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/console/fbcon.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/console/fbcon.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/console/mdacon.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/console/mdacon.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/console/sticon.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/console/sticon.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/console/vgacon.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/console/vgacon.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/display/display-sysfs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/display/display-sysfs.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/efifb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/efifb.c</a></td><td class='right'>191</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/fbmem.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/fbmem.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/fbmon.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/fbmon.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/ffb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/ffb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/imacfb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/imacfb.c</a></td><td class='right'>376</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.7%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/intelfb/intelfb.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/intelfb/intelfb.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/intelfb/intelfb_i2c.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/intelfb/intelfb_i2c.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/intelfb/intelfbdrv.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/intelfb/intelfbdrv.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/intelfb/intelfbhw.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/intelfb/intelfbhw.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/leo.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/leo.c</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/matrox/matroxfb_base.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/matrox/matroxfb_base.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/metronomefb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/metronomefb.c</a></td><td class='right'>288</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/neofb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/neofb.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/omap/dispc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/omap/dispc.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/omap/dispc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/omap/dispc.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/omap/lcd_h4.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/omap/lcd_h4.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/omap/lcd_inn1610.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/omap/lcd_inn1610.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/omap/lcd_osk.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/omap/lcd_osk.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/omap/lcd_sx1.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/omap/lcd_sx1.c</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/omap/lcdc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/omap/lcdc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/omap/lcdc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/omap/lcdc.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/omap/omapfb_main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/omap/omapfb_main.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/omap/rfbi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/omap/rfbi.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/omap/sossi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/omap/sossi.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/p9100.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/p9100.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/s1d13xxxfb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/s1d13xxxfb.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/tcx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/tcx.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/tdfxfb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/tdfxfb.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/tmiofb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/tmiofb.c</a></td><td class='right'>1050</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/uvesafb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/uvesafb.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/vga16fb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/vga16fb.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/via/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/via/Makefile</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/via/accel.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/via/accel.c</a></td><td class='right'>279</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/via/accel.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/via/accel.h</a></td><td class='right'>169</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/via/chip.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/via/chip.h</a></td><td class='right'>190</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/via/debug.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/via/debug.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/via/dvi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/via/dvi.c</a></td><td class='right'>682</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/via/dvi.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/via/dvi.h</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/via/global.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/via/global.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/via/global.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/via/global.h</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/via/hw.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/via/hw.c</a></td><td class='right'>2865</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 28.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 71.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/via/hw.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/via/hw.h</a></td><td class='right'>933</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/via/iface.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/via/iface.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/via/iface.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/via/iface.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/via/ioctl.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/via/ioctl.c</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/via/ioctl.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/via/ioctl.h</a></td><td class='right'>210</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/via/lcd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/via/lcd.c</a></td><td class='right'>1821</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 18.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 81.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/via/lcd.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/via/lcd.h</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/via/lcdtbl.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/via/lcdtbl.h</a></td><td class='right'>591</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/via/share.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/via/share.h</a></td><td class='right'>1105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/via/tbl1636.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/via/tbl1636.c</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/via/tbl1636.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/via/tbl1636.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/via/tblDPASetting.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/via/tblDPASetting.c</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/via/tblDPASetting.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/via/tblDPASetting.h</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/via/via_i2c.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/via/via_i2c.c</a></td><td class='right'>177</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/via/via_i2c.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/via/via_i2c.h</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/via/via_utility.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/via/via_utility.c</a></td><td class='right'>253</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/via/via_utility.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/via/via_utility.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/via/viafbdev.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/via/viafbdev.c</a></td><td class='right'>2571</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 25.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 74.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/via/viafbdev.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/via/viafbdev.h</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/via/viamode.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/via/viamode.c</a></td><td class='right'>1086</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/via/viamode.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/via/viamode.h</a></td><td class='right'>177</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/via/vt1636.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/via/vt1636.c</a></td><td class='right'>306</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/via/vt1636.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/via/vt1636.h</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/video/xen-fbfront.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/xen-fbfront.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/w1/masters/ds1wm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/w1/masters/ds1wm.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/w1/masters/ds2490.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/w1/masters/ds2490.c</a></td><td class='right'>348</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/w1/slaves/w1_ds2431.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/w1/slaves/w1_ds2431.c</a></td><td class='right'>312</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/w1/slaves/w1_therm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/w1/slaves/w1_therm.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/w1/w1.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/w1/w1.c</a></td><td class='right'>423</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/w1/w1.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/w1/w1.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/w1/w1_family.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/w1/w1_family.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/w1/w1_family.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/w1/w1_family.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/w1/w1_int.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/w1/w1_int.c</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/w1/w1_io.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/w1/w1_io.c</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/watchdog/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/watchdog/Kconfig</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/watchdog/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/watchdog/Makefile</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/watchdog/at91sam9_wdt.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/watchdog/at91sam9_wdt.c</a></td><td class='right'>328</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/watchdog/cpwd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/watchdog/cpwd.c</a></td><td class='right'>695</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/watchdog/it87_wdt.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/watchdog/it87_wdt.c</a></td><td class='right'>725</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/watchdog/ixp4xx_wdt.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/watchdog/ixp4xx_wdt.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/watchdog/omap_wdt.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/watchdog/omap_wdt.c</a></td><td class='right'>337</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/watchdog/omap_wdt.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/watchdog/omap_wdt.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/watchdog/orion5x_wdt.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/watchdog/orion5x_wdt.c</a></td><td class='right'>245</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/watchdog/riowd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/watchdog/riowd.c</a> (renamed from drivers/sbus/char/riowatchdog.c)</td><td class='right'>236</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/watchdog/w83697ug_wdt.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/watchdog/w83697ug_wdt.c</a></td><td class='right'>392</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/xen/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/xen/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/xen/balloon.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/xen/balloon.c</a></td><td class='right'>175</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/xen/cpu_hotplug.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/xen/cpu_hotplug.c</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/xen/events.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/xen/events.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/xen/grant-table.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/xen/grant-table.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/drivers/xen/xenbus/xenbus_probe.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/xen/xenbus/xenbus_probe.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/firmware/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>firmware/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/firmware/WHENCE?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>firmware/WHENCE</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/firmware/sun/cassini.bin.ihex?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>firmware/sun/cassini.bin.ihex</a></td><td class='right'>143</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/9p/v9fs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/9p/v9fs.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/Kconfig</a></td><td class='right'>146</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/Kconfig.binfmt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/Kconfig.binfmt</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/Makefile</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/adfs/super.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/adfs/super.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/affs/super.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/affs/super.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/afs/file.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/afs/file.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/afs/internal.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/afs/internal.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/afs/super.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/afs/super.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/afs/write.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/afs/write.c</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/autofs/inode.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/autofs/inode.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/autofs4/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/autofs4/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/autofs4/autofs_i.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/autofs4/autofs_i.h</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/autofs4/dev-ioctl.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/autofs4/dev-ioctl.c</a></td><td class='right'>863</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/autofs4/expire.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/autofs4/expire.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/autofs4/init.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/autofs4/init.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/autofs4/inode.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/autofs4/inode.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/autofs4/waitq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/autofs4/waitq.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/befs/befs_fs_types.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/befs/befs_fs_types.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/befs/linuxvfs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/befs/linuxvfs.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/befs/super.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/befs/super.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/binfmt_elf.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/binfmt_elf.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/binfmt_elf_fdpic.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/binfmt_elf_fdpic.c</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/binfmt_em86.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/binfmt_em86.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/binfmt_flat.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/binfmt_flat.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/binfmt_misc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/binfmt_misc.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/binfmt_script.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/binfmt_script.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/binfmt_som.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/binfmt_som.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/bio-integrity.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/bio-integrity.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/bio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/bio.c</a></td><td class='right'>297</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/block_dev.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/block_dev.c</a></td><td class='right'>180</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/char_dev.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/char_dev.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/cifs/cifs_spnego.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/cifs/cifs_spnego.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/cifs/cifsfs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/cifs/cifsfs.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/cifs/cifsglob.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/cifs/cifsglob.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/cifs/cifsproto.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/cifs/cifsproto.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/cifs/cifssmb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/cifs/cifssmb.c</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/cifs/dns_resolve.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/cifs/dns_resolve.c</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/cifs/file.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/cifs/file.c</a></td><td class='right'>130</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/cifs/inode.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/cifs/inode.c</a></td><td class='right'>644</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 3.0%;'/><td class='none' style='width: 93.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/cifs/misc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/cifs/misc.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/cifs/readdir.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/cifs/readdir.c</a></td><td class='right'>128</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/cifs/sess.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/cifs/sess.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/cifs/transport.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/cifs/transport.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/coda/psdev.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/coda/psdev.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/compat.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/compat.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/debugfs/inode.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/debugfs/inode.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/devpts/inode.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/devpts/inode.c</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/direct-io.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/direct-io.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/dlm/config.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/dlm/config.c</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/dlm/dlm_internal.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/dlm/dlm_internal.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/dlm/lockspace.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/dlm/lockspace.c</a></td><td class='right'>158</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/dlm/lockspace.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/dlm/lockspace.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/dlm/user.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/dlm/user.c</a></td><td class='right'>124</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/dlm/user.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/dlm/user.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/dquot.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/dquot.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ecryptfs/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ecryptfs/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ecryptfs/ecryptfs_kernel.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ecryptfs/ecryptfs_kernel.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ecryptfs/file.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ecryptfs/file.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ecryptfs/keystore.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ecryptfs/keystore.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ecryptfs/main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ecryptfs/main.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ecryptfs/messaging.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ecryptfs/messaging.c</a></td><td class='right'>118</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ecryptfs/mmap.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ecryptfs/mmap.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ecryptfs/netlink.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ecryptfs/netlink.c</a></td><td class='right'>249</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/efs/super.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/efs/super.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/eventpoll.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/eventpoll.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/exec.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/exec.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ext2/balloc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ext2/balloc.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ext2/dir.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ext2/dir.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ext2/ext2.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ext2/ext2.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ext2/file.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ext2/file.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ext2/inode.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ext2/inode.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ext2/super.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ext2/super.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ext3/file.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ext3/file.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ext3/inode.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ext3/inode.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ext3/super.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ext3/super.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ext4/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ext4/Makefile</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ext4/acl.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ext4/acl.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ext4/balloc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ext4/balloc.c</a></td><td class='right'>1469</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 13.6%;'/><td class='none' style='width: 85.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ext4/bitmap.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ext4/bitmap.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ext4/dir.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ext4/dir.c</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ext4/ext4.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ext4/ext4.h</a></td><td class='right'>134</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ext4/ext4_extents.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ext4/ext4_extents.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ext4/ext4_i.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ext4/ext4_i.h</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ext4/ext4_sb.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ext4/ext4_sb.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ext4/extents.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ext4/extents.c</a></td><td class='right'>281</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ext4/file.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ext4/file.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ext4/fsync.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ext4/fsync.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ext4/hash.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ext4/hash.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ext4/ialloc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ext4/ialloc.c</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ext4/inode.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ext4/inode.c</a></td><td class='right'>747</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.4%;'/><td class='rem' style='width: 3.0%;'/><td class='none' style='width: 92.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ext4/ioctl.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ext4/ioctl.c</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ext4/mballoc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ext4/mballoc.c</a></td><td class='right'>483</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 2.8%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ext4/mballoc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ext4/mballoc.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ext4/migrate.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ext4/migrate.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ext4/namei.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ext4/namei.c</a></td><td class='right'>402</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ext4/resize.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ext4/resize.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ext4/super.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ext4/super.c</a></td><td class='right'>437</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ext4/symlink.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ext4/symlink.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ext4/xattr.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ext4/xattr.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ext4/xattr.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ext4/xattr.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/fat/fatent.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/fat/fatent.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/fat/inode.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/fat/inode.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/fs-writeback.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/fs-writeback.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/fuse/inode.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/fuse/inode.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/gfs2/glock.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/gfs2/glock.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/gfs2/glock.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/gfs2/glock.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/gfs2/incore.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/gfs2/incore.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/gfs2/inode.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/gfs2/inode.c</a></td><td class='right'>159</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/gfs2/inode.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/gfs2/inode.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/gfs2/locking/dlm/mount.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/gfs2/locking/dlm/mount.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/gfs2/log.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/gfs2/log.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/gfs2/mount.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/gfs2/mount.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/gfs2/ops_address.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/gfs2/ops_address.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/gfs2/ops_file.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/gfs2/ops_file.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/gfs2/ops_fstype.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/gfs2/ops_fstype.c</a></td><td class='right'>578</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 94.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/gfs2/ops_inode.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/gfs2/ops_inode.c</a></td><td class='right'>127</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/gfs2/ops_super.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/gfs2/ops_super.c</a></td><td class='right'>108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/gfs2/super.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/gfs2/super.c</a></td><td class='right'>340</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.4%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/gfs2/super.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/gfs2/super.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/gfs2/sys.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/gfs2/sys.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/hfs/catalog.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/hfs/catalog.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/hfs/super.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/hfs/super.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/hfsplus/bitmap.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/hfsplus/bitmap.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/hfsplus/catalog.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/hfsplus/catalog.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/hfsplus/options.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/hfsplus/options.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/hfsplus/super.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/hfsplus/super.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/hpfs/super.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/hpfs/super.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/hugetlbfs/inode.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/hugetlbfs/inode.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ioctl.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ioctl.c</a></td><td class='right'>277</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/isofs/inode.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/isofs/inode.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/jbd2/checkpoint.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/jbd2/checkpoint.c</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/jbd2/commit.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/jbd2/commit.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/jbd2/journal.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/jbd2/journal.c</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/jbd2/recovery.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/jbd2/recovery.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/jbd2/transaction.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/jbd2/transaction.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/jfs/super.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/jfs/super.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/lockd/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/lockd/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/lockd/clntlock.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/lockd/clntlock.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/lockd/grace.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/lockd/grace.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/lockd/host.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/lockd/host.c</a></td><td class='right'>350</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/lockd/mon.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/lockd/mon.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/lockd/svc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/lockd/svc.c</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/lockd/svc4proc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/lockd/svc4proc.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/lockd/svclock.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/lockd/svclock.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/lockd/svcproc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/lockd/svcproc.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/lockd/svcsubs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/lockd/svcsubs.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/lockd/xdr.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/lockd/xdr.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/lockd/xdr4.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/lockd/xdr4.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/mpage.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/mpage.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/nfs/callback.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/nfs/callback.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/nfs/client.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/nfs/client.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/nfs/dir.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/nfs/dir.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/nfs/file.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/nfs/file.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/nfs/inode.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/nfs/inode.c</a></td><td class='right'>183</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/nfs/internal.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/nfs/internal.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/nfs/mount_clnt.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/nfs/mount_clnt.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/nfs/namespace.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/nfs/namespace.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/nfs/nfs3acl.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/nfs/nfs3acl.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/nfs/nfs3proc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/nfs/nfs3proc.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/nfs/nfs4namespace.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/nfs/nfs4namespace.c</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/nfs/nfsroot.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/nfs/nfsroot.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/nfs/proc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/nfs/proc.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/nfs/super.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/nfs/super.c</a></td><td class='right'>132</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/nfs/unlink.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/nfs/unlink.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/nfs/write.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/nfs/write.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/nfsd/lockd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/nfsd/lockd.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/nfsd/nfs3proc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/nfsd/nfs3proc.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/nfsd/nfs4callback.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/nfsd/nfs4callback.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/nfsd/nfs4proc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/nfsd/nfs4proc.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/nfsd/nfs4state.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/nfsd/nfs4state.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/nfsd/nfs4xdr.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/nfsd/nfs4xdr.c</a></td><td class='right'>171</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/nfsd/nfsctl.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/nfsd/nfsctl.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/nfsd/nfsfh.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/nfsd/nfsfh.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/nfsd/nfsproc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/nfsd/nfsproc.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/nfsd/nfssvc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/nfsd/nfssvc.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/nfsd/vfs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/nfsd/vfs.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/nls/nls_base.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/nls/nls_base.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ocfs2/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ocfs2/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ocfs2/alloc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ocfs2/alloc.c</a></td><td class='right'>922</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.6%;'/><td class='rem' style='width: 2.6%;'/><td class='none' style='width: 90.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ocfs2/alloc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ocfs2/alloc.h</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ocfs2/aops.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ocfs2/aops.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ocfs2/buffer_head_io.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ocfs2/buffer_head_io.c</a></td><td class='right'>134</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ocfs2/buffer_head_io.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ocfs2/buffer_head_io.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ocfs2/cluster/masklog.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ocfs2/cluster/masklog.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ocfs2/cluster/masklog.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ocfs2/cluster/masklog.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ocfs2/dir.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ocfs2/dir.c</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ocfs2/dlmglue.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ocfs2/dlmglue.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ocfs2/extent_map.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ocfs2/extent_map.c</a></td><td class='right'>386</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ocfs2/extent_map.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ocfs2/extent_map.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ocfs2/file.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ocfs2/file.c</a></td><td class='right'>334</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ocfs2/file.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ocfs2/file.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ocfs2/inode.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ocfs2/inode.c</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ocfs2/inode.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ocfs2/inode.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ocfs2/ioctl.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ocfs2/ioctl.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ocfs2/journal.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ocfs2/journal.c</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ocfs2/journal.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ocfs2/journal.h</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ocfs2/localalloc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ocfs2/localalloc.c</a></td><td class='right'>384</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ocfs2/localalloc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ocfs2/localalloc.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ocfs2/locks.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ocfs2/locks.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ocfs2/locks.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ocfs2/locks.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ocfs2/namei.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ocfs2/namei.c</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ocfs2/ocfs2.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ocfs2/ocfs2.h</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ocfs2/ocfs2_fs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ocfs2/ocfs2_fs.h</a></td><td class='right'>220</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ocfs2/ocfs2_jbd_compat.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ocfs2/ocfs2_jbd_compat.h</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ocfs2/resize.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ocfs2/resize.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ocfs2/slot_map.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ocfs2/slot_map.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ocfs2/stack_user.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ocfs2/stack_user.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ocfs2/stackglue.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ocfs2/stackglue.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ocfs2/stackglue.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ocfs2/stackglue.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ocfs2/suballoc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ocfs2/suballoc.c</a></td><td class='right'>248</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ocfs2/suballoc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ocfs2/suballoc.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ocfs2/super.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ocfs2/super.c</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ocfs2/symlink.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ocfs2/symlink.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ocfs2/uptodate.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ocfs2/uptodate.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ocfs2/uptodate.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ocfs2/uptodate.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ocfs2/xattr.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ocfs2/xattr.c</a></td><td class='right'>4832</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 48.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 51.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ocfs2/xattr.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ocfs2/xattr.h</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/omfs/inode.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/omfs/inode.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/open.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/open.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/partitions/acorn.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/partitions/acorn.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/partitions/check.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/partitions/check.c</a></td><td class='right'>295</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/partitions/check.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/partitions/check.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/proc/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/proc/Kconfig</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/proc/array.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/proc/array.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/proc/base.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/proc/base.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/proc/inode.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/proc/inode.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/proc/internal.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/proc/internal.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/proc/proc_misc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/proc/proc_misc.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/proc/proc_sysctl.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/proc/proc_sysctl.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/proc/task_mmu.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/proc/task_mmu.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/proc/task_nommu.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/proc/task_nommu.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/proc/vmcore.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/proc/vmcore.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/reiserfs/procfs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/reiserfs/procfs.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/reiserfs/xattr.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/reiserfs/xattr.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/sysfs/bin.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/sysfs/bin.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/sysfs/dir.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/sysfs/dir.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/sysfs/file.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/sysfs/file.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/sysfs/mount.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/sysfs/mount.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/sysfs/sysfs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/sysfs/sysfs.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ubifs/super.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ubifs/super.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/udf/super.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/udf/super.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/ufs/super.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ufs/super.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/xfs/linux-2.6/xfs_buf.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/xfs/linux-2.6/xfs_buf.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/xfs/linux-2.6/xfs_buf.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/xfs/linux-2.6/xfs_buf.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/xfs/linux-2.6/xfs_super.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/xfs/linux-2.6/xfs_super.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/fs/xfs/xfs_log.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/xfs/xfs_log.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/acpi/acmacros.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/acpi/acmacros.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/acpi/platform/acgcc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/acpi/platform/acgcc.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-cris/a.out.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-cris/a.out.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-cris/elf.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-cris/elf.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-frv/elf.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-frv/elf.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-frv/unaligned.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-frv/unaligned.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-generic/bug.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-generic/bug.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-generic/gpio.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-generic/gpio.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-generic/siginfo.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-generic/siginfo.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-generic/statfs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-generic/statfs.h</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-generic/vmlinux.lds.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-generic/vmlinux.lds.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-h8300/timer.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-h8300/timer.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-m32r/a.out.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-m32r/a.out.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-m32r/elf.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-m32r/elf.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-m68k/atarihw.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-m68k/atarihw.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-m68k/dma-mapping.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-m68k/dma-mapping.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-m68k/dma.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-m68k/dma.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-m68k/elf.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-m68k/elf.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-m68k/entry.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-m68k/entry.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-m68k/io.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-m68k/io.h</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-m68k/pci.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-m68k/pci.h</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-m68k/virtconvert.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-m68k/virtconvert.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-mips/a.out.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-mips/a.out.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-mips/mach-ip22/ds1286.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-mips/mach-ip22/ds1286.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-mips/mach-ip28/ds1286.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-mips/mach-ip28/ds1286.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-mips/mach-rc32434/irq.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-mips/mach-rc32434/irq.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-mips/mach-rc32434/rc32434.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-mips/mach-rc32434/rc32434.h</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-mn10300/elf.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-mn10300/elf.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-parisc/a.out.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-parisc/a.out.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-parisc/elf.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-parisc/elf.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-parisc/siginfo.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-parisc/siginfo.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-parisc/statfs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-parisc/statfs.h</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-um/dma-mapping.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-um/dma-mapping.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-um/elf-i386.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-um/elf-i386.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-um/elf-ppc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-um/elf-ppc.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-um/elf-x86_64.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-um/elf-x86_64.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/a.out-core.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/a.out-core.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/a.out.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/a.out.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/acpi.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/acpi.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/agp.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/agp.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/alternative.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/alternative.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/amd_iommu.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/amd_iommu.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/amd_iommu_types.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/amd_iommu_types.h</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/apic.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/apic.h</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/apicdef.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/apicdef.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/arch_hooks.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/arch_hooks.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/asm.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/asm.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/atomic_32.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/atomic_32.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/atomic_64.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/atomic_64.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/auxvec.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/auxvec.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/bigsmp/apic.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/bigsmp/apic.h</a> (renamed from include/asm-x86/mach-bigsmp/mach_apic.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/bigsmp/apicdef.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/bigsmp/apicdef.h</a> (renamed from include/asm-x86/mach-es7000/mach_apicdef.h)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/bigsmp/ipi.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/bigsmp/ipi.h</a> (renamed from include/asm-x86/mach-bigsmp/mach_ipi.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/bios_ebda.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/bios_ebda.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/bitops.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/bitops.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/boot.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/boot.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/bootparam.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/bootparam.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/bug.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/bug.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/bugs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/bugs.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/byteorder.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/byteorder.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/cache.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/cache.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/cacheflush.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/cacheflush.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/calgary.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/calgary.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/checksum_32.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/checksum_32.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/checksum_64.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/checksum_64.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/cmpxchg_32.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/cmpxchg_32.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/cmpxchg_64.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/cmpxchg_64.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/compat.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/compat.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/cpu.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/cpu.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/cpufeature.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/cpufeature.h</a></td><td class='right'>124</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/current.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/current.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/debugreg.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/debugreg.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/delay.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/delay.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/desc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/desc.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/desc_defs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/desc_defs.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/device.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/device.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/div64.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/div64.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/dma-mapping.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/dma-mapping.h</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/dma.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/dma.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/dmi.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/dmi.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/ds.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/ds.h</a></td><td class='right'>266</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/dwarf2.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/dwarf2.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/e820.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/e820.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/edac.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/edac.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/efi.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/efi.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/elf.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/elf.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/emergency-restart.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/emergency-restart.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/es7000/apic.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/es7000/apic.h</a> (renamed from include/asm-x86/mach-es7000/mach_apic.h)</td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/es7000/apicdef.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/es7000/apicdef.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/es7000/ipi.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/es7000/ipi.h</a> (renamed from include/asm-x86/mach-es7000/mach_ipi.h)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/es7000/mpparse.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/es7000/mpparse.h</a> (renamed from include/asm-x86/mach-es7000/mach_mpparse.h)</td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/es7000/wakecpu.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/es7000/wakecpu.h</a> (renamed from include/asm-x86/mach-es7000/mach_wakecpu.h)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/fb.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/fb.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/fixmap.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/fixmap.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/fixmap_32.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/fixmap_32.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/fixmap_64.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/fixmap_64.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/floppy.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/floppy.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/ftrace.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/ftrace.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/futex.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/futex.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/gart.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/gart.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/genapic_32.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/genapic_32.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/genapic_64.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/genapic_64.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/geode.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/geode.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/gpio.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/gpio.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/hardirq_32.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/hardirq_32.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/hardirq_64.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/hardirq_64.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/highmem.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/highmem.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/hpet.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/hpet.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/hugetlb.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/hugetlb.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/hw_irq.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/hw_irq.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/hypertransport.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/hypertransport.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/i387.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/i387.h</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/i8253.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/i8253.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/i8259.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/i8259.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/ia32.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/ia32.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/ia32_unistd.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/ia32_unistd.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/idle.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/idle.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/intel_arch_perfmon.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/intel_arch_perfmon.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/io.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/io.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/io_32.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/io_32.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/io_64.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/io_64.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/io_apic.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/io_apic.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/ioctls.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/ioctls.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/iommu.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/iommu.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/ipcbuf.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/ipcbuf.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/ipi.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/ipi.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/irq.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/irq.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/irq_regs_32.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/irq_regs_32.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/irq_remapping.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/irq_remapping.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/irq_vectors.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/irq_vectors.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/irqflags.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/irqflags.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/ist.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/ist.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/k8.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/k8.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/kdebug.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/kdebug.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/kexec.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/kexec.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/kgdb.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/kgdb.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/kmap_types.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/kmap_types.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/kprobes.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/kprobes.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/kvm.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/kvm.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/kvm_host.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/kvm_host.h</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/kvm_para.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/kvm_para.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/kvm_x86_emulate.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/kvm_x86_emulate.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/ldt.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/ldt.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/lguest.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/lguest.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/lguest_hcall.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/lguest_hcall.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/linkage.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/linkage.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/local.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/local.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/mach-bigsmp/mach_apicdef.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/mach-bigsmp/mach_apicdef.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/mach-default/apm.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/mach-default/apm.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/mach-default/mach_apic.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/mach-default/mach_apic.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/mach-default/mach_apicdef.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/mach-default/mach_apicdef.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/mach-default/mach_ipi.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/mach-default/mach_ipi.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/mach-default/mach_mpparse.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/mach-default/mach_mpparse.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/mach-default/mach_mpspec.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/mach-default/mach_mpspec.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/mach-default/mach_timer.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/mach-default/mach_timer.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/mach-default/mach_traps.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/mach-default/mach_traps.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/mach-default/mach_wakecpu.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/mach-default/mach_wakecpu.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/mach-generic/gpio.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/mach-generic/gpio.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/mach-generic/irq_vectors_limits.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/mach-generic/irq_vectors_limits.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/mach-generic/mach_apic.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/mach-generic/mach_apic.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/mach-generic/mach_apicdef.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/mach-generic/mach_apicdef.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/mach-generic/mach_ipi.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/mach-generic/mach_ipi.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/mach-generic/mach_mpparse.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/mach-generic/mach_mpparse.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/mach-generic/mach_mpspec.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/mach-generic/mach_mpspec.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/mach-rdc321x/gpio.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/mach-rdc321x/gpio.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/mach-summit/mach_apicdef.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/mach-summit/mach_apicdef.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/math_emu.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/math_emu.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/mc146818rtc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/mc146818rtc.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/mca.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/mca.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/mca_dma.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/mca_dma.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/mce.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/mce.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/microcode.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/microcode.h</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/mman.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/mman.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/mmconfig.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/mmconfig.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/mmu.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/mmu.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/mmu_context.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/mmu_context.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/mmu_context_32.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/mmu_context_32.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/mmu_context_64.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/mmu_context_64.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/mmx.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/mmx.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/mmzone_32.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/mmzone_32.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/mmzone_64.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/mmzone_64.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/module.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/module.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/mpspec.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/mpspec.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/mpspec_def.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/mpspec_def.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/msgbuf.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/msgbuf.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/msidef.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/msidef.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/msr-index.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/msr-index.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/msr.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/msr.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/mtrr.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/mtrr.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/mutex_32.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/mutex_32.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/mutex_64.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/mutex_64.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/nmi.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/nmi.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/nops.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/nops.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/numa_32.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/numa_32.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/numa_64.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/numa_64.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/numaq.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/numaq.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/numaq/apic.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/numaq/apic.h</a> (renamed from include/asm-x86/mach-numaq/mach_apic.h)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/numaq/apicdef.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/numaq/apicdef.h</a> (renamed from include/asm-x86/mach-numaq/mach_apicdef.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/numaq/ipi.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/numaq/ipi.h</a> (renamed from include/asm-x86/mach-numaq/mach_ipi.h)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/numaq/mpparse.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/numaq/mpparse.h</a> (renamed from include/asm-x86/mach-numaq/mach_mpparse.h)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/numaq/wakecpu.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/numaq/wakecpu.h</a> (renamed from include/asm-x86/mach-numaq/mach_wakecpu.h)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/olpc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/olpc.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/page.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/page.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/page_32.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/page_32.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/page_64.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/page_64.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/param.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/param.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/paravirt.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/paravirt.h</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/parport.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/parport.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/pat.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/pat.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/pci-direct.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/pci-direct.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/pci.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/pci.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/pci_32.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/pci_32.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/pci_64.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/pci_64.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/pda.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/pda.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/percpu.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/percpu.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/pgalloc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/pgalloc.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/pgtable-2level-defs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/pgtable-2level-defs.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/pgtable-2level.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/pgtable-2level.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/pgtable-3level-defs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/pgtable-3level-defs.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/pgtable-3level.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/pgtable-3level.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/pgtable.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/pgtable.h</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/pgtable_32.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/pgtable_32.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/pgtable_64.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/pgtable_64.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/posix_types_32.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/posix_types_32.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/posix_types_64.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/posix_types_64.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/prctl.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/prctl.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/processor-cyrix.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/processor-cyrix.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/processor-flags.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/processor-flags.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/processor.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/processor.h</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/proto.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/proto.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/ptrace-abi.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/ptrace-abi.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/ptrace.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/ptrace.h</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/pvclock-abi.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/pvclock-abi.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/pvclock.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/pvclock.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/reboot.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/reboot.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/reboot_fixups.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/reboot_fixups.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/required-features.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/required-features.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/resume-trace.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/resume-trace.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/rio.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/rio.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/rwlock.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/rwlock.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/rwsem.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/rwsem.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/scatterlist.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/scatterlist.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/seccomp_32.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/seccomp_32.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/seccomp_64.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/seccomp_64.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/segment.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/segment.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/sembuf.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/sembuf.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/serial.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/serial.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/setup.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/setup.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/shmbuf.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/shmbuf.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/shmparam.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/shmparam.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/sigcontext.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/sigcontext.h</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/sigcontext32.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/sigcontext32.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/siginfo.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/siginfo.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/signal.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/signal.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/smp.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/smp.h</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/socket.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/socket.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/sockios.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/sockios.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/sparsemem.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/sparsemem.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/spinlock.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/spinlock.h</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/spinlock_types.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/spinlock_types.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/srat.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/srat.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/stacktrace.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/stacktrace.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/stat.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/stat.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/statfs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/statfs.h</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/string_32.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/string_32.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/string_64.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/string_64.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/summit/apic.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/summit/apic.h</a> (renamed from include/asm-x86/mach-summit/mach_apic.h)</td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/summit/apicdef.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/summit/apicdef.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/summit/ipi.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/summit/ipi.h</a> (renamed from include/asm-x86/mach-summit/mach_ipi.h)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/summit/irq_vectors_limits.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/summit/irq_vectors_limits.h</a> (renamed from include/asm-x86/mach-summit/irq_vectors_limits.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/summit/mpparse.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/summit/mpparse.h</a> (renamed from include/asm-x86/mach-summit/mach_mpparse.h)</td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/suspend_32.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/suspend_32.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/suspend_64.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/suspend_64.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/swiotlb.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/swiotlb.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/sync_bitops.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/sync_bitops.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/syscall.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/syscall.h</a></td><td class='right'>211</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/syscalls.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/syscalls.h</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/system.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/system.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/system_64.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/system_64.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/tce.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/tce.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/termbits.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/termbits.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/termios.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/termios.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/therm_throt.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/therm_throt.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/thread_info.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/thread_info.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/time.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/time.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/timer.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/timer.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/timex.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/timex.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/tlb.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/tlb.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/tlbflush.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/tlbflush.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/topology.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/topology.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/trampoline.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/trampoline.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/traps.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/traps.h</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/tsc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/tsc.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/types.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/types.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/uaccess.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/uaccess.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/uaccess_32.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/uaccess_32.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/uaccess_64.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/uaccess_64.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/ucontext.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/ucontext.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/unaligned.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/unaligned.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/unistd_32.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/unistd_32.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/unistd_64.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/unistd_64.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/unwind.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/unwind.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/user32.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/user32.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/user_32.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/user_32.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/user_64.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/user_64.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/uv/bios.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/uv/bios.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/uv/uv_bau.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/uv/uv_bau.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/uv/uv_hub.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/uv/uv_hub.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/uv/uv_mmrs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/uv/uv_mmrs.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/vdso.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/vdso.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/vga.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/vga.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/vgtod.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/vgtod.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/visws/cobalt.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/visws/cobalt.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/visws/lithium.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/visws/lithium.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/visws/piix4.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/visws/piix4.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/vm86.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/vm86.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/vmi_time.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/vmi_time.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/vsyscall.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/vsyscall.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/xcr.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/xcr.h</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/xen/events.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/xen/events.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/xen/grant_table.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/xen/grant_table.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/xen/hypercall.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/xen/hypercall.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/xen/hypervisor.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/xen/hypervisor.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/xen/interface.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/xen/interface.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/xen/interface_32.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/xen/interface_32.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/xen/interface_64.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/xen/interface_64.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/xen/page.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/xen/page.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-x86/xsave.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-x86/xsave.h</a></td><td class='right'>118</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-xtensa/a.out.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-xtensa/a.out.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/asm-xtensa/elf.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/asm-xtensa/elf.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/crypto/internal/rng.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/crypto/internal/rng.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/crypto/internal/skcipher.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/crypto/internal/skcipher.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/crypto/rng.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/crypto/rng.h</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/drm/drm.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/drm/drm.h</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/drm/drmP.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/drm/drmP.h</a></td><td class='right'>249</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/drm/drm_pciids.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/drm/drm_pciids.h</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/drm/i915_drm.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/drm/i915_drm.h</a></td><td class='right'>333</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/Kbuild?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/Kbuild</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/aio.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/aio.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/ata.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/ata.h</a></td><td class='right'>127</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/auto_dev-ioctl.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/auto_dev-ioctl.h</a></td><td class='right'>157</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/auto_fs4.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/auto_fs4.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/binfmts.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/binfmts.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/bio.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/bio.h</a></td><td class='right'>129</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/blkdev.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/blkdev.h</a></td><td class='right'>167</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/blktrace_api.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/blktrace_api.h</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/cgroup.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/cgroup.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/clk.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/clk.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/compat.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/compat.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/compiler.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/compiler.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/completion.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/completion.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/console_struct.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/console_struct.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/cpu.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/cpu.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/cpufreq.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/cpufreq.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/crypto.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/crypto.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/device-mapper.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/device-mapper.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/device.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/device.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/devpts_fs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/devpts_fs.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/dlm.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/dlm.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/dlm_device.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/dlm_device.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/dma-mapping.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/dma-mapping.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/dma_remapping.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/dma_remapping.h</a></td><td class='right'>157</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/dmar.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/dmar.h</a></td><td class='right'>127</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/dmi.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/dmi.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/ds1286.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/ds1286.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/dvb/frontend.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/dvb/frontend.h</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/dvb/version.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/dvb/version.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/dynamic_printk.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/dynamic_printk.h</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/elevator.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/elevator.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/elf.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/elf.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/ext2_fs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/ext2_fs.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/ext3_fs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/ext3_fs.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/ext3_jbd.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/ext3_jbd.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/fd.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/fd.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/fiemap.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/fiemap.h</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/firewire-cdev.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/firewire-cdev.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/fs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/fs.h</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/gameport.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/gameport.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/genhd.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/genhd.h</a></td><td class='right'>363</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/gfs2_ondisk.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/gfs2_ondisk.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/gpio.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/gpio.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/hid.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/hid.h</a></td><td class='right'>373</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/hiddev.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/hiddev.h</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/hpet.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/hpet.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/i2c-id.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/i2c-id.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/i2o.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/i2o.h</a></td><td class='right'>292</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 2.8%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/icmpv6.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/icmpv6.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/ide.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/ide.h</a></td><td class='right'>901</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.3%;'/><td class='rem' style='width: 3.7%;'/><td class='none' style='width: 91.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/ieee80211.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/ieee80211.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/if.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/if.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/if_ether.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/if_ether.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/if_fddi.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/if_fddi.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/if_hippi.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/if_hippi.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/if_link.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/if_link.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/if_phonet.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/if_phonet.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/if_tunnel.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/if_tunnel.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/igmp.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/igmp.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/in.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/in.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/inetdevice.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/inetdevice.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/init.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/init.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/input.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/input.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/intel-iommu.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/intel-iommu.h</a> (renamed from drivers/pci/intel-iommu.h)</td><td class='right'>255</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/interrupt.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/interrupt.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/iommu-helper.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/iommu-helper.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/ioport.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/ioport.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/iova.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/iova.h</a> (renamed from drivers/pci/iova.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/ip_vs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/ip_vs.h</a></td><td class='right'>160</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/irq.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/irq.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/isdn_ppp.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/isdn_ppp.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/ivtv.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/ivtv.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/jbd.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/jbd.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/jbd2.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/jbd2.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/journal-head.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/journal-head.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/kallsyms.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/kallsyms.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/kernel.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/kernel.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/key.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/key.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/klist.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/klist.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/kmod.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/kmod.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/kvm.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/kvm.h</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/kvm_host.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/kvm_host.h</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/lcd.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/lcd.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/libata.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/libata.h</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/lockd/bind.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/lockd/bind.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/lockd/lockd.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/lockd/lockd.h</a></td><td class='right'>137</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/lockd/xdr.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/lockd/xdr.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/magic.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/magic.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/major.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/major.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/map_to_7segment.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/map_to_7segment.h</a> (renamed from drivers/input/misc/map_to_7segment.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/mfd/tmio.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/mfd/tmio.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/mfd/wm8350/audio.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/mfd/wm8350/audio.h</a></td><td class='right'>598</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/mfd/wm8350/comparator.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/mfd/wm8350/comparator.h</a></td><td class='right'>167</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/mfd/wm8350/core.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/mfd/wm8350/core.h</a></td><td class='right'>631</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/mfd/wm8350/gpio.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/mfd/wm8350/gpio.h</a></td><td class='right'>342</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/mfd/wm8350/pmic.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/mfd/wm8350/pmic.h</a></td><td class='right'>741</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/mfd/wm8350/rtc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/mfd/wm8350/rtc.h</a></td><td class='right'>266</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/mfd/wm8350/supply.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/mfd/wm8350/supply.h</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/mfd/wm8350/wdt.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/mfd/wm8350/wdt.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/mfd/wm8400-audio.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/mfd/wm8400-audio.h</a></td><td class='right'>1186</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 88.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/mfd/wm8400-private.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/mfd/wm8400-private.h</a></td><td class='right'>936</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/mfd/wm8400.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/mfd/wm8400.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/mm.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/mm.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/mm_types.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/mm_types.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/mmc/host.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/mmc/host.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/mmdebug.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/mmdebug.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/mod_devicetable.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/mod_devicetable.h</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/module.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/module.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/mount.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/mount.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/mtd/blktrans.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/mtd/blktrans.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/mv643xx_eth.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/mv643xx_eth.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/netdevice.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/netdevice.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/netfilter.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/netfilter.h</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/netfilter/Kbuild?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/netfilter/Kbuild</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/netfilter/nf_conntrack_proto_gre.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/netfilter/nf_conntrack_proto_gre.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/netfilter/nfnetlink.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/netfilter/nfnetlink.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/netfilter/x_tables.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/netfilter/x_tables.h</a></td><td class='right'>161</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/netfilter/xt_TPROXY.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/netfilter/xt_TPROXY.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/netfilter/xt_recent.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/netfilter/xt_recent.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/netfilter_bridge/ebtables.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/netfilter_bridge/ebtables.h</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/netfilter_ipv4/ipt_recent.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/netfilter_ipv4/ipt_recent.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/nfs_fs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/nfs_fs.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/nfs_fs_sb.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/nfs_fs_sb.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/nfs_mount.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/nfs_mount.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/nfs_xdr.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/nfs_xdr.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/nfsd/nfsd.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/nfsd/nfsd.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/nl80211.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/nl80211.h</a></td><td class='right'>133</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/notifier.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/notifier.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/of.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/of.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/oprofile.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/oprofile.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/parport.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/parport.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/parser.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/parser.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/pci_ids.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/pci_ids.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/percpu.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/percpu.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/percpu_counter.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/percpu_counter.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/pfkeyv2.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/pfkeyv2.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/pfn.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/pfn.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/phonet.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/phonet.h</a></td><td class='right'>170</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/phy.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/phy.h</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/pid_namespace.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/pid_namespace.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/pkt_sched.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/pkt_sched.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/platform_device.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/platform_device.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/pm.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/pm.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/pnp.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/pnp.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/proc_fs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/proc_fs.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/profile.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/profile.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/proportions.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/proportions.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/quota.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/quota.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/quotaops.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/quotaops.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/raid/linear.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/raid/linear.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/raid/md.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/raid/md.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/rcuclassic.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/rcuclassic.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/rculist.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/rculist.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/rcupdate.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/rcupdate.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/rcupreempt.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/rcupreempt.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/regulator/driver.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/regulator/driver.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/regulator/machine.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/regulator/machine.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/reiserfs_fs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/reiserfs_fs.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/rfkill.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/rfkill.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/rtc/m48t59.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/rtc/m48t59.h</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/rtmutex.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/rtmutex.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/rtnetlink.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/rtnetlink.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/sched.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/sched.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/security.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/security.h</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/serial.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/serial.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/serial_core.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/serial_core.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/skbuff.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/skbuff.h</a></td><td class='right'>175</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/smc91x.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/smc91x.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/smp.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/smp.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/socket.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/socket.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/spi/ads7846.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/spi/ads7846.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/spi/corgi_lcd.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/spi/corgi_lcd.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/spi/orion_spi.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/spi/orion_spi.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/ssb/ssb_regs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/ssb/ssb_regs.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/string_helpers.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/string_helpers.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/sunrpc/clnt.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/sunrpc/clnt.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/sunrpc/svc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/sunrpc/svc.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/sunrpc/svc_rdma.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/sunrpc/svc_rdma.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/sunrpc/svcsock.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/sunrpc/svcsock.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/sunrpc/xprtrdma.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/sunrpc/xprtrdma.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/swiotlb.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/swiotlb.h</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/sysctl.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/sysctl.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/sysfs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/sysfs.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/task_io_accounting.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/task_io_accounting.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/tc_act/Kbuild?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/tc_act/Kbuild</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/tc_act/tc_skbedit.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/tc_act/tc_skbedit.h</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/tcp.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/tcp.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/telephony.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/telephony.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/termios.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/termios.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/tick.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/tick.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/time.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/time.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/tty.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/tty.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/tty_driver.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/tty_driver.h</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/types.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/types.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/ucb1400.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/ucb1400.h</a></td><td class='right'>161</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/usb.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/usb.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/usb/Kbuild?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/usb/Kbuild</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/usb/cdc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/usb/cdc.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/usb/composite.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/usb/composite.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/usb/ehci_def.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/usb/ehci_def.h</a></td><td class='right'>160</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/usb/serial.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/usb/serial.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/usb/tmc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/usb/tmc.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/usb/vstusb.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/usb/vstusb.h</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/videodev2.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/videodev2.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/vt_kern.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/vt_kern.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/wait.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/wait.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/wm97xx_batt.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/wm97xx_batt.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/writeback.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/writeback.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/linux/xfrm.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/linux/xfrm.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/math-emu/op-2.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/math-emu/op-2.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/math-emu/op-common.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/math-emu/op-common.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/math-emu/soft-fp.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/math-emu/soft-fp.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/media/ir-common.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/media/ir-common.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/media/saa7115.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/media/saa7115.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/media/saa7146.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/media/saa7146.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/media/sh_mobile_ceu.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/media/sh_mobile_ceu.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/media/soc_camera.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/media/soc_camera.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/media/soc_camera_platform.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/media/soc_camera_platform.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/media/tuner.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/media/tuner.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/media/v4l2-chip-ident.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/media/v4l2-chip-ident.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/media/v4l2-common.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/media/v4l2-common.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/media/v4l2-dev.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/media/v4l2-dev.h</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/media/v4l2-i2c-drv-legacy.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/media/v4l2-i2c-drv-legacy.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/media/v4l2-i2c-drv.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/media/v4l2-i2c-drv.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/media/v4l2-ioctl.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/media/v4l2-ioctl.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/media/videobuf-dvb.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/media/videobuf-dvb.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/net/9p/9p.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/net/9p/9p.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/net/bluetooth/bluetooth.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/net/bluetooth/bluetooth.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/net/cfg80211.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/net/cfg80211.h</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/net/cipso_ipv4.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/net/cipso_ipv4.h</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/net/dsa.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/net/dsa.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/net/flow.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/net/flow.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/net/ieee80211.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/net/ieee80211.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/net/inet6_hashtables.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/net/inet6_hashtables.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/net/inet_connection_sock.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/net/inet_connection_sock.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/net/inet_hashtables.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/net/inet_hashtables.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/net/inet_sock.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/net/inet_sock.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/net/inet_timewait_sock.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/net/inet_timewait_sock.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/net/ip.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/net/ip.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/net/ip_vs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/net/ip_vs.h</a></td><td class='right'>315</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/net/ipip.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/net/ipip.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/net/ipv6.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/net/ipv6.h</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/net/irda/irda.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/net/irda/irda.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/net/mac80211.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/net/mac80211.h</a></td><td class='right'>242</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/net/ndisc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/net/ndisc.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/net/net_namespace.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/net/net_namespace.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/net/netfilter/ipv4/nf_defrag_ipv4.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/net/netfilter/ipv4/nf_defrag_ipv4.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/net/netfilter/nf_conntrack.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/net/netfilter/nf_conntrack.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/net/netfilter/nf_conntrack_acct.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/net/netfilter/nf_conntrack_acct.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/net/netfilter/nf_conntrack_core.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/net/netfilter/nf_conntrack_core.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/net/netfilter/nf_conntrack_ecache.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/net/netfilter/nf_conntrack_ecache.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/net/netfilter/nf_conntrack_expect.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/net/netfilter/nf_conntrack_expect.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/net/netfilter/nf_conntrack_l4proto.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/net/netfilter/nf_conntrack_l4proto.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/net/netfilter/nf_log.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/net/netfilter/nf_log.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/net/netfilter/nf_nat_core.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/net/netfilter/nf_nat_core.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/net/netfilter/nf_queue.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/net/netfilter/nf_queue.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/net/netfilter/nf_tproxy_core.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/net/netfilter/nf_tproxy_core.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/net/netlabel.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/net/netlabel.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/net/netlink.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/net/netlink.h</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/net/netns/conntrack.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/net/netns/conntrack.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/net/netns/ipv4.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/net/netns/ipv4.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/net/netns/mib.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/net/netns/mib.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/net/phonet/gprs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/net/phonet/gprs.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/net/phonet/pep.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/net/phonet/pep.h</a></td><td class='right'>160</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/net/phonet/phonet.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/net/phonet/phonet.h</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/net/phonet/pn_dev.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/net/phonet/pn_dev.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/net/pkt_sched.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/net/pkt_sched.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/net/route.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/net/route.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/net/sch_generic.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/net/sch_generic.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/net/sctp/constants.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/net/sctp/constants.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/net/sctp/sctp.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/net/sctp/sctp.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/net/sctp/structs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/net/sctp/structs.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/net/sctp/tsnmap.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/net/sctp/tsnmap.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/net/sock.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/net/sock.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/net/tc_act/tc_skbedit.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/net/tc_act/tc_skbedit.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/net/tcp.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/net/tcp.h</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/net/udp.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/net/udp.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/net/wireless.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/net/wireless.h</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/net/xfrm.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/net/xfrm.h</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/pcmcia/ciscode.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/pcmcia/ciscode.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/pcmcia/cistpl.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/pcmcia/cistpl.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/pcmcia/cs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/pcmcia/cs.h</a></td><td class='right'>165</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/pcmcia/cs_types.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/pcmcia/cs_types.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/pcmcia/device_id.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/pcmcia/device_id.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/pcmcia/ds.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/pcmcia/ds.h</a></td><td class='right'>411</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/pcmcia/ss.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/pcmcia/ss.h</a></td><td class='right'>202</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/scsi/iscsi_if.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/scsi/iscsi_if.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/scsi/libiscsi.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/scsi/libiscsi.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/scsi/scsi.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/scsi/scsi.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/scsi/scsi_cmnd.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/scsi/scsi_cmnd.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/scsi/scsi_device.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/scsi/scsi_device.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/scsi/scsi_host.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/scsi/scsi_host.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/scsi/scsi_netlink.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/scsi/scsi_netlink.h</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/scsi/scsi_transport.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/scsi/scsi_transport.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/scsi/scsi_transport_fc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/scsi/scsi_transport_fc.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/scsi/scsi_transport_iscsi.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/scsi/scsi_transport_iscsi.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/sound/ad1848.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/sound/ad1848.h</a></td><td class='right'>218</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/sound/asound.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/sound/asound.h</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/sound/asoundef.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/sound/asoundef.h</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/sound/core.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/sound/core.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/sound/cs4231.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/sound/cs4231.h</a></td><td class='right'>175</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/sound/jack.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/sound/jack.h</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/sound/memalloc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/sound/memalloc.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/sound/minors.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/sound/minors.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/sound/pcm.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/sound/pcm.h</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/sound/pxa2xx-lib.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/sound/pxa2xx-lib.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/sound/sb.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/sound/sb.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/sound/snd_wavefront.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/sound/snd_wavefront.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/sound/soc-dapm.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/sound/soc-dapm.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/sound/soc-of-simple.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/sound/soc-of-simple.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/sound/soc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/sound/soc.h</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/sound/tea575x-tuner.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/sound/tea575x-tuner.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/sound/version.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/sound/version.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/sound/vx_core.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/sound/vx_core.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/sound/wss.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/sound/wss.h</a></td><td class='right'>235</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/video/atmel_lcdc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/video/atmel_lcdc.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/video/cyblafb.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/video/cyblafb.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/video/metronomefb.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/video/metronomefb.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/video/neomagic.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/video/neomagic.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/video/radeon.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/video/radeon.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/video/s1d13xxxfb.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/video/s1d13xxxfb.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/xen/balloon.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/xen/balloon.h</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/include/xen/events.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>include/xen/events.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/init/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>init/Kconfig</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/init/do_mounts.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>init/do_mounts.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/init/do_mounts_md.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>init/do_mounts_md.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/init/do_mounts_rd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>init/do_mounts_rd.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/init/initramfs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>init/initramfs.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/init/main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>init/main.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/ipc/ipc_sysctl.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>ipc/ipc_sysctl.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/ipc/sem.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>ipc/sem.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/kernel/acct.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>kernel/acct.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/kernel/auditsc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>kernel/auditsc.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/kernel/cgroup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>kernel/cgroup.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/kernel/compat.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>kernel/compat.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/kernel/cpu.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>kernel/cpu.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/kernel/cpuset.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>kernel/cpuset.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/kernel/dma-coherent.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>kernel/dma-coherent.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/kernel/dma.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>kernel/dma.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/kernel/exit.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>kernel/exit.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/kernel/fork.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>kernel/fork.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/kernel/irq/manage.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>kernel/irq/manage.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/kernel/kallsyms.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>kernel/kallsyms.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/kernel/kmod.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>kernel/kmod.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/kernel/kprobes.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>kernel/kprobes.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/kernel/ksysfs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>kernel/ksysfs.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/kernel/module.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>kernel/module.c</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/kernel/panic.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>kernel/panic.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/kernel/power/disk.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>kernel/power/disk.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/kernel/power/main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>kernel/power/main.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/kernel/power/user.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>kernel/power/user.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/kernel/printk.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>kernel/printk.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/kernel/profile.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>kernel/profile.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/kernel/rcuclassic.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>kernel/rcuclassic.c</a></td><td class='right'>337</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/kernel/rcupreempt.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>kernel/rcupreempt.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/kernel/rcupreempt_trace.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>kernel/rcupreempt_trace.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/kernel/resource.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>kernel/resource.c</a></td><td class='right'>150</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/kernel/sched.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>kernel/sched.c</a></td><td class='right'>377</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/kernel/sched_clock.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>kernel/sched_clock.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/kernel/sched_debug.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>kernel/sched_debug.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/kernel/sched_fair.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>kernel/sched_fair.c</a></td><td class='right'>234</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/kernel/sched_features.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>kernel/sched_features.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/kernel/sched_idletask.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>kernel/sched_idletask.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/kernel/sched_rt.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>kernel/sched_rt.c</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/kernel/softirq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>kernel/softirq.c</a></td><td class='right'>142</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/kernel/softlockup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>kernel/softlockup.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/kernel/sys.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>kernel/sys.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/kernel/sys_ni.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>kernel/sys_ni.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/kernel/sysctl.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>kernel/sysctl.c</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/kernel/time/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>kernel/time/Kconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/kernel/time/tick-sched.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>kernel/time/tick-sched.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/kernel/timer.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>kernel/timer.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/kernel/user.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>kernel/user.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/kernel/utsname_sysctl.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>kernel/utsname_sysctl.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/kernel/wait.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>kernel/wait.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/kernel/workqueue.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>kernel/workqueue.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/lib/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>lib/Kconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/lib/Kconfig.debug?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>lib/Kconfig.debug</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/lib/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>lib/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/lib/cmdline.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>lib/cmdline.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/lib/dynamic_printk.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>lib/dynamic_printk.c</a></td><td class='right'>418</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/lib/iommu-helper.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>lib/iommu-helper.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/lib/klist.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>lib/klist.c</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/lib/kobject.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>lib/kobject.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/lib/parser.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>lib/parser.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/lib/percpu_counter.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>lib/percpu_counter.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/lib/string_helpers.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>lib/string_helpers.c</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/lib/swiotlb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>lib/swiotlb.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/lib/vsprintf.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>lib/vsprintf.c</a></td><td class='right'>235</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/mm/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>mm/Kconfig</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/mm/bootmem.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>mm/bootmem.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/mm/bounce.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>mm/bounce.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/mm/fadvise.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>mm/fadvise.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/mm/filemap.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>mm/filemap.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/mm/highmem.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>mm/highmem.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/mm/hugetlb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>mm/hugetlb.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/mm/page-writeback.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>mm/page-writeback.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/mm/page_alloc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>mm/page_alloc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/mm/pdflush.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>mm/pdflush.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/mm/readahead.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>mm/readahead.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/mm/shmem.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>mm/shmem.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/mm/truncate.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>mm/truncate.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/mm/vmalloc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>mm/vmalloc.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/802/fc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/802/fc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/802/psnap.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/802/psnap.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/8021q/vlan.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/8021q/vlan.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/8021q/vlan_dev.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/8021q/vlan_dev.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/9p/client.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/9p/client.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/9p/trans_fd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/9p/trans_fd.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/Kconfig</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/appletalk/ddp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/appletalk/ddp.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/atm/br2684.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/atm/br2684.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/atm/lec.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/atm/lec.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/bluetooth/af_bluetooth.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/bluetooth/af_bluetooth.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/bluetooth/hidp/core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/bluetooth/hidp/core.c</a></td><td class='right'>214</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/bluetooth/hidp/hidp.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/bluetooth/hidp/hidp.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/bridge/br.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/bridge/br.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/bridge/br_device.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/bridge/br_device.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/bridge/br_if.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/bridge/br_if.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/bridge/br_ioctl.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/bridge/br_ioctl.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/bridge/br_netfilter.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/bridge/br_netfilter.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/bridge/br_netlink.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/bridge/br_netlink.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/bridge/br_notify.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/bridge/br_notify.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/bridge/br_private.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/bridge/br_private.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/bridge/br_stp_bpdu.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/bridge/br_stp_bpdu.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/bridge/netfilter/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/bridge/netfilter/Kconfig</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/bridge/netfilter/ebt_802_3.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/bridge/netfilter/ebt_802_3.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/bridge/netfilter/ebt_among.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/bridge/netfilter/ebt_among.c</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/bridge/netfilter/ebt_arp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/bridge/netfilter/ebt_arp.c</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/bridge/netfilter/ebt_arpreply.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/bridge/netfilter/ebt_arpreply.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/bridge/netfilter/ebt_dnat.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/bridge/netfilter/ebt_dnat.c</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/bridge/netfilter/ebt_ip.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/bridge/netfilter/ebt_ip.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/bridge/netfilter/ebt_ip6.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/bridge/netfilter/ebt_ip6.c</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/bridge/netfilter/ebt_limit.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/bridge/netfilter/ebt_limit.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/bridge/netfilter/ebt_log.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/bridge/netfilter/ebt_log.c</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/bridge/netfilter/ebt_mark.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/bridge/netfilter/ebt_mark.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/bridge/netfilter/ebt_mark_m.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/bridge/netfilter/ebt_mark_m.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/bridge/netfilter/ebt_nflog.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/bridge/netfilter/ebt_nflog.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/bridge/netfilter/ebt_pkttype.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/bridge/netfilter/ebt_pkttype.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/bridge/netfilter/ebt_redirect.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/bridge/netfilter/ebt_redirect.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/bridge/netfilter/ebt_snat.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/bridge/netfilter/ebt_snat.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/bridge/netfilter/ebt_stp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/bridge/netfilter/ebt_stp.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/bridge/netfilter/ebt_ulog.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/bridge/netfilter/ebt_ulog.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/bridge/netfilter/ebt_vlan.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/bridge/netfilter/ebt_vlan.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/bridge/netfilter/ebtables.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/bridge/netfilter/ebtables.c</a></td><td class='right'>328</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/can/af_can.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/can/af_can.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/core/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/core/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/core/datagram.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/core/datagram.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/core/dev.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/core/dev.c</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/core/dev_mcast.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/core/dev_mcast.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/core/dst.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/core/dst.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/core/neighbour.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/core/neighbour.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/core/net-sysfs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/core/net-sysfs.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/core/net_namespace.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/core/net_namespace.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/core/pktgen.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/core/pktgen.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/core/rtnetlink.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/core/rtnetlink.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/core/skb_dma_map.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/core/skb_dma_map.c</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/core/skbuff.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/core/skbuff.c</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/core/sock.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/core/sock.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/core/stream.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/core/stream.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/dccp/ccid.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/dccp/ccid.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/dccp/ccids/ccid2.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/dccp/ccids/ccid2.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/dccp/ccids/ccid3.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/dccp/ccids/ccid3.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/dccp/ccids/lib/loss_interval.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/dccp/ccids/lib/loss_interval.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/dccp/ccids/lib/tfrc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/dccp/ccids/lib/tfrc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/dccp/input.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/dccp/input.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/dccp/ipv4.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/dccp/ipv4.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/dccp/ipv6.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/dccp/ipv6.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/dccp/options.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/dccp/options.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/dccp/proto.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/dccp/proto.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/decnet/dn_dev.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/decnet/dn_dev.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/decnet/sysctl_net_decnet.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/decnet/sysctl_net_decnet.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/dsa/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/dsa/Kconfig</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/dsa/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/dsa/Makefile</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/dsa/dsa.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/dsa/dsa.c</a></td><td class='right'>392</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/dsa/dsa_priv.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/dsa/dsa_priv.h</a></td><td class='right'>116</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/dsa/mv88e6060.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/dsa/mv88e6060.c</a></td><td class='right'>287</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/dsa/mv88e6123_61_65.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/dsa/mv88e6123_61_65.c</a></td><td class='right'>421</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/dsa/mv88e6131.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/dsa/mv88e6131.c</a></td><td class='right'>380</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/dsa/mv88e6xxx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/dsa/mv88e6xxx.c</a></td><td class='right'>522</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/dsa/mv88e6xxx.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/dsa/mv88e6xxx.h</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/dsa/slave.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/dsa/slave.c</a></td><td class='right'>298</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/dsa/tag_dsa.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/dsa/tag_dsa.c</a></td><td class='right'>194</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/dsa/tag_edsa.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/dsa/tag_edsa.c</a></td><td class='right'>213</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/dsa/tag_trailer.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/dsa/tag_trailer.c</a></td><td class='right'>130</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ethernet/eth.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ethernet/eth.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ieee80211/ieee80211_module.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ieee80211/ieee80211_module.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv4/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv4/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv4/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv4/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv4/af_inet.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv4/af_inet.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv4/cipso_ipv4.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv4/cipso_ipv4.c</a></td><td class='right'>656</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.6%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 93.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv4/devinet.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv4/devinet.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv4/icmp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv4/icmp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv4/igmp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv4/igmp.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv4/inet_connection_sock.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv4/inet_connection_sock.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv4/inet_diag.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv4/inet_diag.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv4/inet_timewait_sock.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv4/inet_timewait_sock.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv4/ip_fragment.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv4/ip_fragment.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv4/ip_gre.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv4/ip_gre.c</a></td><td class='right'>487</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv4/ip_input.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv4/ip_input.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv4/ip_options.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv4/ip_options.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv4/ip_output.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv4/ip_output.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv4/ip_sockglue.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv4/ip_sockglue.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv4/ipip.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv4/ipip.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv4/ipmr.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv4/ipmr.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv4/ipvs/ip_vs_proto_ah.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv4/ipvs/ip_vs_proto_ah.c</a></td><td class='right'>178</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv4/ipvs/ip_vs_proto_esp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv4/ipvs/ip_vs_proto_esp.c</a></td><td class='right'>176</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv4/netfilter.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv4/netfilter.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv4/netfilter/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv4/netfilter/Kconfig</a></td><td class='right'>128</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv4/netfilter/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv4/netfilter/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv4/netfilter/arp_tables.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv4/netfilter/arp_tables.c</a></td><td class='right'>116</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv4/netfilter/arpt_mangle.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv4/netfilter/arpt_mangle.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv4/netfilter/arptable_filter.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv4/netfilter/arptable_filter.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv4/netfilter/ip_tables.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv4/netfilter/ip_tables.c</a></td><td class='right'>177</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv4/netfilter/ipt_CLUSTERIP.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv4/netfilter/ipt_CLUSTERIP.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv4/netfilter/ipt_ECN.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv4/netfilter/ipt_ECN.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv4/netfilter/ipt_LOG.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv4/netfilter/ipt_LOG.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv4/netfilter/ipt_MASQUERADE.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv4/netfilter/ipt_MASQUERADE.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv4/netfilter/ipt_NETMAP.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv4/netfilter/ipt_NETMAP.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv4/netfilter/ipt_REDIRECT.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv4/netfilter/ipt_REDIRECT.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv4/netfilter/ipt_REJECT.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv4/netfilter/ipt_REJECT.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv4/netfilter/ipt_TTL.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv4/netfilter/ipt_TTL.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv4/netfilter/ipt_ULOG.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv4/netfilter/ipt_ULOG.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv4/netfilter/ipt_addrtype.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv4/netfilter/ipt_addrtype.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv4/netfilter/ipt_ah.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv4/netfilter/ipt_ah.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv4/netfilter/ipt_ecn.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv4/netfilter/ipt_ecn.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv4/netfilter/ipt_ttl.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv4/netfilter/ipt_ttl.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv4/netfilter/iptable_filter.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv4/netfilter/iptable_filter.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv4/netfilter/iptable_mangle.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv4/netfilter/iptable_mangle.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv4/netfilter/iptable_raw.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv4/netfilter/iptable_raw.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv4/netfilter/iptable_security.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv4/netfilter/iptable_security.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv4/netfilter/nf_conntrack_proto_icmp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv4/netfilter/nf_conntrack_proto_icmp.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv4/netfilter/nf_defrag_ipv4.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv4/netfilter/nf_defrag_ipv4.c</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv4/netfilter/nf_nat_core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv4/netfilter/nf_nat_core.c</a></td><td class='right'>169</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv4/netfilter/nf_nat_helper.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv4/netfilter/nf_nat_helper.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv4/netfilter/nf_nat_pptp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv4/netfilter/nf_nat_pptp.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv4/netfilter/nf_nat_rule.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv4/netfilter/nf_nat_rule.c</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv4/route.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv4/route.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv4/syncookies.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv4/syncookies.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv4/sysctl_net_ipv4.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv4/sysctl_net_ipv4.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv4/tcp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv4/tcp.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv4/tcp_cong.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv4/tcp_cong.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv4/tcp_input.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv4/tcp_input.c</a></td><td class='right'>329</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv4/tcp_ipv4.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv4/tcp_ipv4.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv4/tcp_minisocks.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv4/tcp_minisocks.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv4/tcp_output.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv4/tcp_output.c</a></td><td class='right'>222</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv4/tcp_timer.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv4/tcp_timer.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv4/udp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv4/udp.c</a></td><td class='right'>125</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv6/addrconf.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv6/addrconf.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv6/af_inet6.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv6/af_inet6.c</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv6/exthdrs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv6/exthdrs.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv6/icmp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv6/icmp.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv6/ip6_input.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv6/ip6_input.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv6/ip6_output.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv6/ip6_output.c</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv6/ip6_tunnel.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv6/ip6_tunnel.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv6/ip6mr.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv6/ip6mr.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv6/mcast.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv6/mcast.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv6/ndisc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv6/ndisc.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv6/netfilter.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv6/netfilter.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv6/netfilter/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv6/netfilter/Kconfig</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv6/netfilter/ip6_tables.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv6/netfilter/ip6_tables.c</a></td><td class='right'>173</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv6/netfilter/ip6t_HL.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv6/netfilter/ip6t_HL.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv6/netfilter/ip6t_LOG.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv6/netfilter/ip6t_LOG.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv6/netfilter/ip6t_REJECT.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv6/netfilter/ip6t_REJECT.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv6/netfilter/ip6t_ah.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv6/netfilter/ip6t_ah.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv6/netfilter/ip6t_eui64.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv6/netfilter/ip6t_eui64.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv6/netfilter/ip6t_frag.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv6/netfilter/ip6t_frag.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv6/netfilter/ip6t_hbh.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv6/netfilter/ip6t_hbh.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv6/netfilter/ip6t_hl.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv6/netfilter/ip6t_hl.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv6/netfilter/ip6t_ipv6header.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv6/netfilter/ip6t_ipv6header.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv6/netfilter/ip6t_mh.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv6/netfilter/ip6t_mh.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv6/netfilter/ip6t_rt.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv6/netfilter/ip6t_rt.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv6/netfilter/ip6table_filter.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv6/netfilter/ip6table_filter.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv6/netfilter/ip6table_mangle.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv6/netfilter/ip6table_mangle.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv6/netfilter/ip6table_raw.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv6/netfilter/ip6table_raw.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv6/netfilter/ip6table_security.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv6/netfilter/ip6table_security.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv6/netfilter/nf_conntrack_reasm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv6/netfilter/nf_conntrack_reasm.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv6/proc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv6/proc.c</a></td><td class='right'>121</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv6/raw.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv6/raw.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv6/reassembly.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv6/reassembly.c</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv6/route.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv6/route.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv6/tcp_ipv6.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv6/tcp_ipv6.c</a></td><td class='right'>166</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv6/udp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv6/udp.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/ipv6/udplite.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/ipv6/udplite.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/key/af_key.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/key/af_key.c</a></td><td class='right'>125</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/mac80211/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/mac80211/Kconfig</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/mac80211/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/mac80211/Makefile</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/mac80211/cfg.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/mac80211/cfg.c</a></td><td class='right'>201</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/mac80211/debugfs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/mac80211/debugfs.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/mac80211/debugfs_key.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/mac80211/debugfs_key.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/mac80211/debugfs_netdev.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/mac80211/debugfs_netdev.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/mac80211/debugfs_sta.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/mac80211/debugfs_sta.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/mac80211/event.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/mac80211/event.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/mac80211/ht.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/mac80211/ht.c</a></td><td class='right'>992</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/mac80211/ieee80211_i.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/mac80211/ieee80211_i.h</a></td><td class='right'>399</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/mac80211/iface.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/mac80211/iface.c</a></td><td class='right'>620</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.7%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 93.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/mac80211/key.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/mac80211/key.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/mac80211/main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/mac80211/main.c</a></td><td class='right'>1003</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 9.1%;'/><td class='none' style='width: 90.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/mac80211/mesh.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/mac80211/mesh.c</a></td><td class='right'>368</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/mac80211/mesh.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/mac80211/mesh.h</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/mac80211/mesh_hwmp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/mac80211/mesh_hwmp.c</a></td><td class='right'>230</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/mac80211/mesh_pathtbl.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/mac80211/mesh_pathtbl.c</a></td><td class='right'>211</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/mac80211/mesh_plink.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/mac80211/mesh_plink.c</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/mac80211/mlme.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/mac80211/mlme.c</a></td><td class='right'>3923</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.1%;'/><td class='rem' style='width: 29.0%;'/><td class='none' style='width: 60.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/mac80211/rate.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/mac80211/rate.c</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/mac80211/rate.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/mac80211/rate.h</a></td><td class='right'>116</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/mac80211/rc80211_minstrel.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/mac80211/rc80211_minstrel.c</a></td><td class='right'>583</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/mac80211/rc80211_minstrel.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/mac80211/rc80211_minstrel.h</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/mac80211/rc80211_minstrel_debugfs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/mac80211/rc80211_minstrel_debugfs.c</a></td><td class='right'>164</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/mac80211/rc80211_pid.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/mac80211/rc80211_pid.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/mac80211/rc80211_pid_algo.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/mac80211/rc80211_pid_algo.c</a></td><td class='right'>191</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/mac80211/rx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/mac80211/rx.c</a></td><td class='right'>372</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/mac80211/scan.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/mac80211/scan.c</a></td><td class='right'>938</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/mac80211/spectmgmt.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/mac80211/spectmgmt.c</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/mac80211/sta_info.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/mac80211/sta_info.c</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/mac80211/sta_info.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/mac80211/sta_info.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/mac80211/tkip.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/mac80211/tkip.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/mac80211/tx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/mac80211/tx.c</a></td><td class='right'>334</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/mac80211/util.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/mac80211/util.c</a></td><td class='right'>365</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/mac80211/wep.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/mac80211/wep.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/mac80211/wext.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/mac80211/wext.c</a></td><td class='right'>167</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/mac80211/wme.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/mac80211/wme.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/mac80211/wme.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/mac80211/wme.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/mac80211/wpa.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/mac80211/wpa.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/Kconfig</a></td><td class='right'>236</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/Makefile</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/core.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/ipvs/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/ipvs/Kconfig</a> (renamed from net/ipv4/ipvs/Kconfig)</td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/ipvs/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/ipvs/Makefile</a> (renamed from net/ipv4/ipvs/Makefile)</td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/ipvs/ip_vs_app.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/ipvs/ip_vs_app.c</a> (renamed from net/ipv4/ipvs/ip_vs_app.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/ipvs/ip_vs_conn.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/ipvs/ip_vs_conn.c</a> (renamed from net/ipv4/ipvs/ip_vs_conn.c)</td><td class='right'>249</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/ipvs/ip_vs_core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/ipvs/ip_vs_core.c</a> (renamed from net/ipv4/ipvs/ip_vs_core.c)</td><td class='right'>817</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.1%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 91.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/ipvs/ip_vs_ctl.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/ipvs/ip_vs_ctl.c</a> (renamed from net/ipv4/ipvs/ip_vs_ctl.c)</td><td class='right'>1372</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.2%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 86.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/ipvs/ip_vs_dh.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/ipvs/ip_vs_dh.c</a> (renamed from net/ipv4/ipvs/ip_vs_dh.c)</td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/ipvs/ip_vs_est.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/ipvs/ip_vs_est.c</a> (renamed from net/ipv4/ipvs/ip_vs_est.c)</td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/ipvs/ip_vs_ftp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/ipvs/ip_vs_ftp.c</a> (renamed from net/ipv4/ipvs/ip_vs_ftp.c)</td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/ipvs/ip_vs_lblc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/ipvs/ip_vs_lblc.c</a> (renamed from net/ipv4/ipvs/ip_vs_lblc.c)</td><td class='right'>220</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/ipvs/ip_vs_lblcr.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/ipvs/ip_vs_lblcr.c</a> (renamed from net/ipv4/ipvs/ip_vs_lblcr.c)</td><td class='right'>249</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/ipvs/ip_vs_lc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/ipvs/ip_vs_lc.c</a> (renamed from net/ipv4/ipvs/ip_vs_lc.c)</td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/ipvs/ip_vs_nq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/ipvs/ip_vs_nq.c</a> (renamed from net/ipv4/ipvs/ip_vs_nq.c)</td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/ipvs/ip_vs_proto.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/ipvs/ip_vs_proto.c</a> (renamed from net/ipv4/ipvs/ip_vs_proto.c)</td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/ipvs/ip_vs_proto_ah_esp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/ipvs/ip_vs_proto_ah_esp.c</a></td><td class='right'>235</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/ipvs/ip_vs_proto_tcp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/ipvs/ip_vs_proto_tcp.c</a> (renamed from net/ipv4/ipvs/ip_vs_proto_tcp.c)</td><td class='right'>254</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/ipvs/ip_vs_proto_udp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/ipvs/ip_vs_proto_udp.c</a> (renamed from net/ipv4/ipvs/ip_vs_proto_udp.c)</td><td class='right'>227</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/ipvs/ip_vs_rr.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/ipvs/ip_vs_rr.c</a> (renamed from net/ipv4/ipvs/ip_vs_rr.c)</td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/ipvs/ip_vs_sched.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/ipvs/ip_vs_sched.c</a> (renamed from net/ipv4/ipvs/ip_vs_sched.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/ipvs/ip_vs_sed.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/ipvs/ip_vs_sed.c</a> (renamed from net/ipv4/ipvs/ip_vs_sed.c)</td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/ipvs/ip_vs_sh.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/ipvs/ip_vs_sh.c</a> (renamed from net/ipv4/ipvs/ip_vs_sh.c)</td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/ipvs/ip_vs_sync.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/ipvs/ip_vs_sync.c</a> (renamed from net/ipv4/ipvs/ip_vs_sync.c)</td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/ipvs/ip_vs_wlc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/ipvs/ip_vs_wlc.c</a> (renamed from net/ipv4/ipvs/ip_vs_wlc.c)</td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/ipvs/ip_vs_wrr.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/ipvs/ip_vs_wrr.c</a> (renamed from net/ipv4/ipvs/ip_vs_wrr.c)</td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/ipvs/ip_vs_xmit.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/ipvs/ip_vs_xmit.c</a> (renamed from net/ipv4/ipvs/ip_vs_xmit.c)</td><td class='right'>471</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/nf_conntrack_acct.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/nf_conntrack_acct.c</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/nf_conntrack_core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/nf_conntrack_core.c</a></td><td class='right'>351</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/nf_conntrack_ecache.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/nf_conntrack_ecache.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/nf_conntrack_expect.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/nf_conntrack_expect.c</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/nf_conntrack_ftp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/nf_conntrack_ftp.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/nf_conntrack_h323_main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/nf_conntrack_h323_main.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/nf_conntrack_helper.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/nf_conntrack_helper.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/nf_conntrack_netlink.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/nf_conntrack_netlink.c</a></td><td class='right'>182</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/nf_conntrack_pptp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/nf_conntrack_pptp.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/nf_conntrack_proto.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/nf_conntrack_proto.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/nf_conntrack_proto_dccp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/nf_conntrack_proto_dccp.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/nf_conntrack_proto_generic.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/nf_conntrack_proto_generic.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/nf_conntrack_proto_gre.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/nf_conntrack_proto_gre.c</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/nf_conntrack_proto_sctp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/nf_conntrack_proto_sctp.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/nf_conntrack_proto_tcp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/nf_conntrack_proto_tcp.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/nf_conntrack_proto_udp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/nf_conntrack_proto_udp.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/nf_conntrack_proto_udplite.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/nf_conntrack_proto_udplite.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/nf_conntrack_sip.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/nf_conntrack_sip.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/nf_conntrack_standalone.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/nf_conntrack_standalone.c</a></td><td class='right'>146</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/nf_internals.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/nf_internals.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/nf_log.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/nf_log.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/nf_queue.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/nf_queue.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/nf_sockopt.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/nf_sockopt.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/nf_tproxy_core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/nf_tproxy_core.c</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/nfnetlink.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/nfnetlink.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/nfnetlink_log.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/nfnetlink_log.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/x_tables.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/x_tables.c</a></td><td class='right'>145</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/xt_CLASSIFY.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/xt_CLASSIFY.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/xt_CONNMARK.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/xt_CONNMARK.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/xt_CONNSECMARK.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/xt_CONNSECMARK.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/xt_DSCP.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/xt_DSCP.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/xt_MARK.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/xt_MARK.c</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/xt_NFLOG.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/xt_NFLOG.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/xt_NFQUEUE.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/xt_NFQUEUE.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/xt_NOTRACK.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/xt_NOTRACK.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/xt_RATEEST.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/xt_RATEEST.c</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/xt_SECMARK.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/xt_SECMARK.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/xt_TCPMSS.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/xt_TCPMSS.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/xt_TCPOPTSTRIP.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/xt_TCPOPTSTRIP.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/xt_TPROXY.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/xt_TPROXY.c</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/xt_TRACE.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/xt_TRACE.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/xt_comment.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/xt_comment.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/xt_connbytes.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/xt_connbytes.c</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/xt_connlimit.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/xt_connlimit.c</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/xt_connmark.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/xt_connmark.c</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/xt_conntrack.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/xt_conntrack.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/xt_dccp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/xt_dccp.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/xt_dscp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/xt_dscp.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/xt_esp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/xt_esp.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/xt_hashlimit.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/xt_hashlimit.c</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/xt_helper.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/xt_helper.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/xt_iprange.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/xt_iprange.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/xt_length.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/xt_length.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/xt_limit.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/xt_limit.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/xt_mac.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/xt_mac.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/xt_mark.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/xt_mark.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/xt_multiport.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/xt_multiport.c</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/xt_owner.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/xt_owner.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/xt_physdev.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/xt_physdev.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/xt_pkttype.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/xt_pkttype.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/xt_policy.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/xt_policy.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/xt_quota.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/xt_quota.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/xt_rateest.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/xt_rateest.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/xt_realm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/xt_realm.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/xt_recent.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/xt_recent.c</a> (renamed from net/ipv4/netfilter/ipt_recent.c)</td><td class='right'>348</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/xt_sctp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/xt_sctp.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/xt_socket.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/xt_socket.c</a></td><td class='right'>185</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/xt_state.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/xt_state.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/xt_statistic.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/xt_statistic.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/xt_string.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/xt_string.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/xt_tcpmss.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/xt_tcpmss.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/xt_tcpudp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/xt_tcpudp.c</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/xt_time.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/xt_time.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netfilter/xt_u32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netfilter/xt_u32.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netlabel/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netlabel/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netlabel/netlabel_addrlist.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netlabel/netlabel_addrlist.c</a></td><td class='right'>388</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netlabel/netlabel_addrlist.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netlabel/netlabel_addrlist.h</a></td><td class='right'>189</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netlabel/netlabel_cipso_v4.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netlabel/netlabel_cipso_v4.c</a></td><td class='right'>136</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netlabel/netlabel_cipso_v4.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netlabel/netlabel_cipso_v4.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netlabel/netlabel_domainhash.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netlabel/netlabel_domainhash.c</a></td><td class='right'>393</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netlabel/netlabel_domainhash.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netlabel/netlabel_domainhash.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netlabel/netlabel_kapi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netlabel/netlabel_kapi.c</a></td><td class='right'>272</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netlabel/netlabel_mgmt.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netlabel/netlabel_mgmt.c</a></td><td class='right'>410</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netlabel/netlabel_mgmt.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netlabel/netlabel_mgmt.h</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netlabel/netlabel_unlabeled.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netlabel/netlabel_unlabeled.c</a></td><td class='right'>456</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 3.0%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/netlink/af_netlink.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/netlink/af_netlink.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/phonet/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/phonet/Kconfig</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/phonet/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/phonet/Makefile</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/phonet/af_phonet.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/phonet/af_phonet.c</a></td><td class='right'>476</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/phonet/datagram.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/phonet/datagram.c</a></td><td class='right'>197</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/phonet/pep-gprs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/phonet/pep-gprs.c</a></td><td class='right'>347</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/phonet/pep.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/phonet/pep.c</a></td><td class='right'>1076</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/phonet/pn_dev.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/phonet/pn_dev.c</a></td><td class='right'>208</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/phonet/pn_netlink.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/phonet/pn_netlink.c</a></td><td class='right'>165</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/phonet/socket.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/phonet/socket.c</a></td><td class='right'>411</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/phonet/sysctl.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/phonet/sysctl.c</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/rfkill/rfkill-input.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/rfkill/rfkill-input.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/rfkill/rfkill-input.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/rfkill/rfkill-input.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/rfkill/rfkill.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/rfkill/rfkill.c</a></td><td class='right'>259</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/sched/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/sched/Kconfig</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/sched/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/sched/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/sched/act_api.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/sched/act_api.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/sched/act_ipt.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/sched/act_ipt.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/sched/act_skbedit.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/sched/act_skbedit.c</a></td><td class='right'>203</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/sched/cls_api.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/sched/cls_api.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/sched/cls_flow.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/sched/cls_flow.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/sched/em_cmp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/sched/em_cmp.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/sched/ematch.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/sched/ematch.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/sched/sch_api.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/sched/sch_api.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/sched/sch_dsmark.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/sched/sch_dsmark.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/sched/sch_generic.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/sched/sch_generic.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/sched/sch_multiq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/sched/sch_multiq.c</a></td><td class='right'>477</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/sched/sch_netem.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/sched/sch_netem.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/sched/sch_prio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/sched/sch_prio.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/sched/sch_sfq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/sched/sch_sfq.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/sctp/associola.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/sctp/associola.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/sctp/bind_addr.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/sctp/bind_addr.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/sctp/ipv6.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/sctp/ipv6.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/sctp/output.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/sctp/output.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/sctp/outqueue.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/sctp/outqueue.c</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/sctp/sm_make_chunk.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/sctp/sm_make_chunk.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/sctp/sm_sideeffect.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/sctp/sm_sideeffect.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/sctp/sm_statefuns.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/sctp/sm_statefuns.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/sctp/sm_statetable.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/sctp/sm_statetable.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/sctp/socket.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/sctp/socket.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/sctp/tsnmap.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/sctp/tsnmap.c</a></td><td class='right'>346</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/sctp/ulpevent.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/sctp/ulpevent.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/sctp/ulpqueue.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/sctp/ulpqueue.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/socket.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/socket.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/sunrpc/auth.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/sunrpc/auth.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/sunrpc/clnt.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/sunrpc/clnt.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/sunrpc/rpcb_clnt.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/sunrpc/rpcb_clnt.c</a></td><td class='right'>121</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/sunrpc/svc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/sunrpc/svc.c</a></td><td class='right'>251</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/sunrpc/svc_xprt.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/sunrpc/svc_xprt.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/sunrpc/svcsock.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/sunrpc/svcsock.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/sunrpc/xprt.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/sunrpc/xprt.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/sunrpc/xprtrdma/rpc_rdma.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/sunrpc/xprtrdma/rpc_rdma.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/sunrpc/xprtrdma/svc_rdma_recvfrom.c</a></td><td class='right'>187</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/sunrpc/xprtrdma/svc_rdma_sendto.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/sunrpc/xprtrdma/svc_rdma_sendto.c</a></td><td class='right'>255</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/sunrpc/xprtrdma/svc_rdma_transport.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/sunrpc/xprtrdma/svc_rdma_transport.c</a></td><td class='right'>364</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/sunrpc/xprtrdma/transport.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/sunrpc/xprtrdma/transport.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/sunrpc/xprtrdma/verbs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/sunrpc/xprtrdma/verbs.c</a></td><td class='right'>741</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.1%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 92.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/sunrpc/xprtrdma/xprt_rdma.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/sunrpc/xprtrdma/xprt_rdma.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/sunrpc/xprtsock.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/sunrpc/xprtsock.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/unix/af_unix.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/unix/af_unix.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/wireless/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/wireless/Kconfig</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/wireless/core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/wireless/core.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/wireless/core.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/wireless/core.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/wireless/nl80211.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/wireless/nl80211.c</a></td><td class='right'>280</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/wireless/reg.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/wireless/reg.c</a></td><td class='right'>910</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 90.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/wireless/reg.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/wireless/reg.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/xfrm/xfrm_policy.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/xfrm/xfrm_policy.c</a></td><td class='right'>118</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/xfrm/xfrm_state.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/xfrm/xfrm_state.c</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/net/xfrm/xfrm_user.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>net/xfrm/xfrm_user.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/scripts/Kbuild.include?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>scripts/Kbuild.include</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/scripts/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>scripts/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/scripts/Makefile.lib?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>scripts/Makefile.lib</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/scripts/basic/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>scripts/basic/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/scripts/basic/hash.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>scripts/basic/hash.c</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/scripts/bootgraph.pl?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>scripts/bootgraph.pl</a></td><td class='right'>147</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/scripts/checkpatch.pl?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>scripts/checkpatch.pl</a></td><td class='right'>388</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/scripts/checkstack.pl?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>scripts/checkstack.pl</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/scripts/mod/file2alias.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>scripts/mod/file2alias.c</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/scripts/mod/modpost.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>scripts/mod/modpost.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/scripts/selinux/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>scripts/selinux/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/scripts/selinux/README?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>scripts/selinux/README</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/scripts/selinux/install_policy.sh?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>scripts/selinux/install_policy.sh</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/scripts/selinux/mdp/.gitignore?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>scripts/selinux/mdp/.gitignore</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/scripts/selinux/mdp/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>scripts/selinux/mdp/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/scripts/selinux/mdp/dbus_contexts?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>scripts/selinux/mdp/dbus_contexts</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/scripts/selinux/mdp/mdp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>scripts/selinux/mdp/mdp.c</a></td><td class='right'>242</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/security/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>security/Kconfig</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/security/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>security/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/security/commoncap.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>security/commoncap.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/security/inode.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>security/inode.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/security/security.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>security/security.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/security/selinux/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>security/selinux/Kconfig</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/security/selinux/avc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>security/selinux/avc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/security/selinux/hooks.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>security/selinux/hooks.c</a></td><td class='right'>296</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/security/selinux/include/avc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>security/selinux/include/avc.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/security/selinux/include/netlabel.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>security/selinux/include/netlabel.h</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/security/selinux/include/objsec.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>security/selinux/include/objsec.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/security/selinux/include/security.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>security/selinux/include/security.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/security/selinux/netlabel.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>security/selinux/netlabel.c</a></td><td class='right'>280</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/security/selinux/ss/avtab.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>security/selinux/ss/avtab.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/security/selinux/ss/conditional.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>security/selinux/ss/conditional.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/security/selinux/ss/conditional.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>security/selinux/ss/conditional.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/security/selinux/ss/ebitmap.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>security/selinux/ss/ebitmap.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/security/selinux/ss/hashtab.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>security/selinux/ss/hashtab.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/security/selinux/ss/mls.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>security/selinux/ss/mls.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/security/selinux/ss/policydb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>security/selinux/ss/policydb.c</a></td><td class='right'>225</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/security/selinux/ss/policydb.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>security/selinux/ss/policydb.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/security/selinux/ss/services.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>security/selinux/ss/services.c</a></td><td class='right'>193</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/security/selinux/ss/sidtab.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>security/selinux/ss/sidtab.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/security/smack/smack.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>security/smack/smack.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/security/smack/smack_access.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>security/smack/smack_access.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/security/smack/smack_lsm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>security/smack/smack_lsm.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/security/smack/smackfs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>security/smack/smackfs.c</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/Kconfig</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/aoa/codecs/snd-aoa-codec-tas.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/aoa/codecs/snd-aoa-codec-tas.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/aoa/soundbus/soundbus.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/aoa/soundbus/soundbus.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/arm/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/arm/Kconfig</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/arm/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/arm/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/arm/aaci.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/arm/aaci.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/arm/pxa2xx-ac97-lib.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/arm/pxa2xx-ac97-lib.c</a></td><td class='right'>384</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/arm/pxa2xx-ac97.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/arm/pxa2xx-ac97.c</a></td><td class='right'>251</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/arm/pxa2xx-pcm-lib.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/arm/pxa2xx-pcm-lib.c</a></td><td class='right'>278</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/arm/pxa2xx-pcm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/arm/pxa2xx-pcm.c</a></td><td class='right'>252</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/arm/pxa2xx-pcm.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/arm/pxa2xx-pcm.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/arm/sa11xx-uda1341.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/arm/sa11xx-uda1341.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/core/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/core/Kconfig</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/core/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/core/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/core/control.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/core/control.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/core/control_compat.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/core/control_compat.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/core/device.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/core/device.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/core/hwdep.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/core/hwdep.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/core/info.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/core/info.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/core/info_oss.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/core/info_oss.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/core/init.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/core/init.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/core/jack.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/core/jack.c</a></td><td class='right'>166</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/core/memalloc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/core/memalloc.c</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/core/oss/copy.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/core/oss/copy.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/core/oss/io.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/core/oss/io.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/core/oss/linear.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/core/oss/linear.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/core/oss/mixer_oss.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/core/oss/mixer_oss.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/core/oss/mulaw.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/core/oss/mulaw.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/core/oss/pcm_oss.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/core/oss/pcm_oss.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/core/oss/pcm_plugin.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/core/oss/pcm_plugin.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/core/oss/rate.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/core/oss/rate.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/core/oss/route.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/core/oss/route.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/core/pcm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/core/pcm.c</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/core/pcm_compat.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/core/pcm_compat.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/core/pcm_lib.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/core/pcm_lib.c</a></td><td class='right'>150</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/core/pcm_memory.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/core/pcm_memory.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/core/pcm_native.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/core/pcm_native.c</a></td><td class='right'>164</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/core/pcm_timer.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/core/pcm_timer.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/core/rawmidi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/core/rawmidi.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/core/rtctimer.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/core/rtctimer.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/core/seq/oss/seq_oss.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/core/seq/oss/seq_oss.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/core/seq/oss/seq_oss_synth.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/core/seq/oss/seq_oss_synth.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/core/seq/seq_clientmgr.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/core/seq/seq_clientmgr.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/core/seq/seq_compat.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/core/seq/seq_compat.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/core/seq/seq_device.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/core/seq/seq_device.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/core/seq/seq_fifo.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/core/seq/seq_fifo.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/core/seq/seq_memory.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/core/seq/seq_memory.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/core/seq/seq_midi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/core/seq/seq_midi.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/core/seq/seq_ports.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/core/seq/seq_ports.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/core/seq/seq_prioq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/core/seq/seq_prioq.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/core/seq/seq_queue.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/core/seq/seq_queue.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/core/seq/seq_timer.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/core/seq/seq_timer.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/core/sgbuf.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/core/sgbuf.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/core/sound.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/core/sound.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/core/sound_oss.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/core/sound_oss.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/core/timer.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/core/timer.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/core/timer_compat.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/core/timer_compat.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/drivers/dummy.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/drivers/dummy.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/drivers/mtpav.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/drivers/mtpav.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/drivers/opl3/opl3_lib.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/drivers/opl3/opl3_lib.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/drivers/opl3/opl3_midi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/drivers/opl3/opl3_midi.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/drivers/opl3/opl3_oss.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/drivers/opl3/opl3_oss.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/drivers/opl3/opl3_synth.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/drivers/opl3/opl3_synth.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/drivers/opl4/opl4_synth.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/drivers/opl4/opl4_synth.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/drivers/vx/vx_cmd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/drivers/vx/vx_cmd.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/drivers/vx/vx_core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/drivers/vx/vx_core.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/drivers/vx/vx_hwdep.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/drivers/vx/vx_hwdep.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/drivers/vx/vx_mixer.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/drivers/vx/vx_mixer.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/drivers/vx/vx_pcm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/drivers/vx/vx_pcm.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/drivers/vx/vx_uer.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/drivers/vx/vx_uer.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/i2c/cs8427.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/i2c/cs8427.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/i2c/i2c.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/i2c/i2c.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/i2c/l3/uda1341.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/i2c/l3/uda1341.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/i2c/other/ak4114.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/i2c/other/ak4114.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/i2c/other/ak4117.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/i2c/other/ak4117.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/i2c/other/ak4xxx-adda.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/i2c/other/ak4xxx-adda.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/i2c/other/tea575x-tuner.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/i2c/other/tea575x-tuner.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/isa/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/isa/Kconfig</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/isa/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/isa/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/isa/ad1816a/ad1816a.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/isa/ad1816a/ad1816a.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/isa/ad1816a/ad1816a_lib.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/isa/ad1816a/ad1816a_lib.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/isa/ad1848/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/isa/ad1848/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/isa/ad1848/ad1848.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/isa/ad1848/ad1848.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/isa/ad1848/ad1848_lib.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/isa/ad1848/ad1848_lib.c</a></td><td class='right'>1267</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 12.6%;'/><td class='none' style='width: 87.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/isa/azt2320.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/isa/azt2320.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/isa/cmi8330.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/isa/cmi8330.c</a></td><td class='right'>106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/isa/cs423x/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/isa/cs423x/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/isa/cs423x/cs4231.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/isa/cs423x/cs4231.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/isa/cs423x/cs4231_lib.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/isa/cs423x/cs4231_lib.c</a></td><td class='right'>1945</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 19.4%;'/><td class='none' style='width: 80.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/isa/cs423x/cs4236.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/isa/cs423x/cs4236.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/isa/cs423x/cs4236_lib.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/isa/cs423x/cs4236_lib.c</a></td><td class='right'>349</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/isa/es1688/es1688_lib.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/isa/es1688/es1688_lib.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/isa/gus/gus_main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/isa/gus/gus_main.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/isa/gus/gus_mixer.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/isa/gus/gus_mixer.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/isa/gus/gus_pcm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/isa/gus/gus_pcm.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/isa/gus/gusmax.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/isa/gus/gusmax.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/isa/gus/interwave.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/isa/gus/interwave.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/isa/opl3sa2.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/isa/opl3sa2.c</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/isa/opti9xx/miro.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/isa/opti9xx/miro.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/isa/opti9xx/opti92x-ad1848.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/isa/opti9xx/opti92x-ad1848.c</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/isa/sb/emu8000.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/isa/sb/emu8000.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/isa/sb/emu8000_patch.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/isa/sb/emu8000_patch.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/isa/sb/sb16_csp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/isa/sb/sb16_csp.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/isa/sb/sb16_main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/isa/sb/sb16_main.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/isa/sb/sb8_main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/isa/sb/sb8_main.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/isa/sb/sb_common.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/isa/sb/sb_common.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/isa/sb/sb_mixer.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/isa/sb/sb_mixer.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/isa/sc6000.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/isa/sc6000.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/isa/sgalaxy.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/isa/sgalaxy.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/isa/sscape.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/isa/sscape.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/isa/wavefront/wavefront.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/isa/wavefront/wavefront.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/isa/wavefront/wavefront_fx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/isa/wavefront/wavefront_fx.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/isa/wavefront/wavefront_midi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/isa/wavefront/wavefront_midi.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/isa/wavefront/wavefront_synth.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/isa/wavefront/wavefront_synth.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/isa/wss/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/isa/wss/Makefile</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/isa/wss/wss_lib.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/isa/wss/wss_lib.c</a></td><td class='right'>2322</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 23.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 76.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/mips/au1x00.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/mips/au1x00.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/oss/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/oss/Kconfig</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/oss/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/oss/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/oss/ac97_codec.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/oss/ac97_codec.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/oss/aedsp16.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/oss/aedsp16.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/oss/dmasound/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/oss/dmasound/Kconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/oss/hal2.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/oss/hal2.c</a></td><td class='right'>1558</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 15.5%;'/><td class='none' style='width: 84.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/oss/hal2.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/oss/hal2.h</a></td><td class='right'>248</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/oss/mpu401.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/oss/mpu401.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/oss/soundcard.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/oss/soundcard.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/parisc/harmony.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/parisc/harmony.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/Kconfig</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/ac97/ac97_codec.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/ac97/ac97_codec.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/ac97/ac97_patch.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/ac97/ac97_patch.c</a></td><td class='right'>210</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/ad1889.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/ad1889.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/ak4531_codec.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/ak4531_codec.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/als4000.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/als4000.c</a></td><td class='right'>391</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/atiixp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/atiixp.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/atiixp_modem.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/atiixp_modem.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/au88x0/au88x0.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/au88x0/au88x0.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/au88x0/au88x0_core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/au88x0/au88x0_core.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/au88x0/au88x0_pcm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/au88x0/au88x0_pcm.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/azt3328.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/azt3328.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/bt87x.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/bt87x.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/ca0106/ca0106_main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/ca0106/ca0106_main.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/ca0106/ca_midi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/ca0106/ca_midi.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/cmipci.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/cmipci.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/cs4281.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/cs4281.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/cs46xx/cs46xx_lib.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/cs46xx/cs46xx_lib.c</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/cs46xx/dsp_spos.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/cs46xx/dsp_spos.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/cs46xx/dsp_spos_scb_lib.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/cs46xx/dsp_spos_scb_lib.c</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/echoaudio/darla20_dsp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/echoaudio/darla20_dsp.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/echoaudio/darla24_dsp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/echoaudio/darla24_dsp.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/echoaudio/echo3g_dsp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/echoaudio/echo3g_dsp.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/echoaudio/echoaudio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/echoaudio/echoaudio.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/echoaudio/echoaudio_3g.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/echoaudio/echoaudio_3g.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/echoaudio/echoaudio_dsp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/echoaudio/echoaudio_dsp.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/echoaudio/echoaudio_gml.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/echoaudio/echoaudio_gml.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/echoaudio/gina20_dsp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/echoaudio/gina20_dsp.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/echoaudio/gina24_dsp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/echoaudio/gina24_dsp.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/echoaudio/indigo_dsp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/echoaudio/indigo_dsp.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/echoaudio/indigodj_dsp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/echoaudio/indigodj_dsp.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/echoaudio/indigoio_dsp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/echoaudio/indigoio_dsp.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/echoaudio/layla20_dsp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/echoaudio/layla20_dsp.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/echoaudio/layla24_dsp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/echoaudio/layla24_dsp.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/echoaudio/mia_dsp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/echoaudio/mia_dsp.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/echoaudio/midi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/echoaudio/midi.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/echoaudio/mona_dsp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/echoaudio/mona_dsp.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/emu10k1/emu10k1_callback.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/emu10k1/emu10k1_callback.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/emu10k1/emu10k1_patch.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/emu10k1/emu10k1_patch.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/emu10k1/emu10k1x.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/emu10k1/emu10k1x.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/emu10k1/emufx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/emu10k1/emufx.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/emu10k1/emumpu401.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/emu10k1/emumpu401.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/emu10k1/memory.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/emu10k1/memory.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/emu10k1/voice.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/emu10k1/voice.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/es1938.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/es1938.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/es1968.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/es1968.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/hda/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/hda/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/hda/hda_beep.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/hda/hda_beep.c</a></td><td class='right'>134</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/hda/hda_beep.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/hda/hda_beep.h</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/hda/hda_codec.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/hda/hda_codec.c</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/hda/hda_codec.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/hda/hda_codec.h</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/hda/hda_generic.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/hda/hda_generic.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/hda/hda_intel.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/hda/hda_intel.c</a></td><td class='right'>146</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/hda/hda_local.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/hda/hda_local.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/hda/hda_patch.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/hda/hda_patch.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/hda/hda_proc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/hda/hda_proc.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/hda/patch_analog.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/hda/patch_analog.c</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/hda/patch_atihdmi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/hda/patch_atihdmi.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/hda/patch_nvhdmi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/hda/patch_nvhdmi.c</a></td><td class='right'>165</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/hda/patch_realtek.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/hda/patch_realtek.c</a></td><td class='right'>1900</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 16.8%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 81.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/hda/patch_sigmatel.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/hda/patch_sigmatel.c</a></td><td class='right'>1008</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 90.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/hda/patch_via.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/hda/patch_via.c</a></td><td class='right'>1407</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 86.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/ice1712/ak4xxx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/ice1712/ak4xxx.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/ice1712/aureon.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/ice1712/aureon.c</a></td><td class='right'>699</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 3.3%;'/><td class='none' style='width: 93.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/ice1712/delta.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/ice1712/delta.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/ice1712/delta.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/ice1712/delta.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/ice1712/ews.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/ice1712/ews.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/ice1712/ice1712.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/ice1712/ice1712.c</a></td><td class='right'>240</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/ice1712/ice1712.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/ice1712/ice1712.h</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/ice1712/ice1724.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/ice1712/ice1724.c</a></td><td class='right'>188</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/ice1712/juli.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/ice1712/juli.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/ice1712/phase.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/ice1712/phase.c</a></td><td class='right'>277</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/ice1712/phase.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/ice1712/phase.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/ice1712/pontis.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/ice1712/pontis.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/ice1712/revo.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/ice1712/revo.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/ice1712/wtm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/ice1712/wtm.c</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/ice1712/wtm.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/ice1712/wtm.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/intel8x0.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/intel8x0.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/intel8x0m.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/intel8x0m.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/korg1212/korg1212.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/korg1212/korg1212.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/maestro3.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/maestro3.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/mixart/mixart.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/mixart/mixart.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/mixart/mixart_core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/mixart/mixart_core.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/mixart/mixart_hwdep.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/mixart/mixart_hwdep.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/mixart/mixart_mixer.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/mixart/mixart_mixer.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/nm256/nm256.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/nm256/nm256.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/oxygen/hifier.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/oxygen/hifier.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/oxygen/oxygen.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/oxygen/oxygen.c</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/oxygen/oxygen.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/oxygen/oxygen.h</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/oxygen/oxygen_io.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/oxygen/oxygen_io.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/oxygen/oxygen_lib.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/oxygen/oxygen_lib.c</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/oxygen/oxygen_mixer.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/oxygen/oxygen_mixer.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/oxygen/oxygen_pcm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/oxygen/oxygen_pcm.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/oxygen/virtuoso.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/oxygen/virtuoso.c</a></td><td class='right'>594</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 94.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/pcxhr/pcxhr.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/pcxhr/pcxhr.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/pcxhr/pcxhr_core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/pcxhr/pcxhr_core.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/pcxhr/pcxhr_hwdep.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/pcxhr/pcxhr_hwdep.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/riptide/riptide.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/riptide/riptide.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/rme9652/hdsp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/rme9652/hdsp.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/rme9652/hdspm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/rme9652/hdspm.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/rme9652/rme9652.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/rme9652/rme9652.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/sonicvibes.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/sonicvibes.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/trident/trident_main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/trident/trident_main.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/trident/trident_memory.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/trident/trident_memory.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/via82xx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/via82xx.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/via82xx_modem.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/via82xx_modem.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/vx222/vx222_ops.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/vx222/vx222_ops.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pci/ymfpci/ymfpci_main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pci/ymfpci/ymfpci_main.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/pcmcia/vx/vxp_ops.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/pcmcia/vx/vxp_ops.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/ppc/awacs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/ppc/awacs.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/ppc/beep.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/ppc/beep.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/ppc/tumbler.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/ppc/tumbler.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/sh/aica.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/sh/aica.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/at32/playpaq_wm8510.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/at32/playpaq_wm8510.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/at91/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/at91/Kconfig</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/at91/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/at91/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/at91/at91-ssc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/at91/at91-ssc.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/at91/eti_b1_wm8731.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/at91/eti_b1_wm8731.c</a></td><td class='right'>348</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.5%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/blackfin/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/blackfin/Kconfig</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/blackfin/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/blackfin/Makefile</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/blackfin/bf5xx-ac97-pcm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/blackfin/bf5xx-ac97-pcm.c</a></td><td class='right'>457</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/blackfin/bf5xx-ac97-pcm.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/blackfin/bf5xx-ac97-pcm.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/blackfin/bf5xx-ac97.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/blackfin/bf5xx-ac97.c</a></td><td class='right'>406</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/blackfin/bf5xx-ac97.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/blackfin/bf5xx-ac97.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/blackfin/bf5xx-ad1980.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/blackfin/bf5xx-ad1980.c</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/blackfin/bf5xx-ad73311.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/blackfin/bf5xx-ad73311.c</a></td><td class='right'>240</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/blackfin/bf5xx-i2s-pcm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/blackfin/bf5xx-i2s-pcm.c</a></td><td class='right'>288</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/blackfin/bf5xx-i2s-pcm.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/blackfin/bf5xx-i2s-pcm.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/blackfin/bf5xx-i2s.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/blackfin/bf5xx-i2s.c</a></td><td class='right'>311</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/blackfin/bf5xx-i2s.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/blackfin/bf5xx-i2s.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/blackfin/bf5xx-sport.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/blackfin/bf5xx-sport.c</a></td><td class='right'>1032</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/blackfin/bf5xx-sport.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/blackfin/bf5xx-sport.h</a></td><td class='right'>194</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/blackfin/bf5xx-ssm2602.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/blackfin/bf5xx-ssm2602.c</a></td><td class='right'>186</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/codecs/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/codecs/Kconfig</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/codecs/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/codecs/Makefile</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/codecs/ac97.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/codecs/ac97.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/codecs/ad1980.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/codecs/ad1980.c</a></td><td class='right'>308</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/codecs/ad1980.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/codecs/ad1980.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/codecs/ad73311.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/codecs/ad73311.c</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/codecs/ad73311.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/codecs/ad73311.h</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/codecs/ak4535.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/codecs/ak4535.c</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/codecs/ak4535.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/codecs/ak4535.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/codecs/ssm2602.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/codecs/ssm2602.c</a></td><td class='right'>775</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/codecs/ssm2602.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/codecs/ssm2602.h</a></td><td class='right'>130</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/codecs/tlv320aic23.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/codecs/tlv320aic23.c</a></td><td class='right'>714</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/codecs/tlv320aic23.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/codecs/tlv320aic23.h</a></td><td class='right'>122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/codecs/tlv320aic26.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/codecs/tlv320aic26.c</a></td><td class='right'>520</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/codecs/tlv320aic26.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/codecs/tlv320aic26.h</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/codecs/tlv320aic3x.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/codecs/tlv320aic3x.c</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/codecs/tlv320aic3x.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/codecs/tlv320aic3x.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/codecs/uda1380.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/codecs/uda1380.c</a></td><td class='right'>116</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/codecs/uda1380.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/codecs/uda1380.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/codecs/wm8510.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/codecs/wm8510.c</a></td><td class='right'>221</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/codecs/wm8510.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/codecs/wm8510.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/codecs/wm8580.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/codecs/wm8580.c</a></td><td class='right'>1053</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/codecs/wm8580.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/codecs/wm8580.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/codecs/wm8731.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/codecs/wm8731.c</a></td><td class='right'>179</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/codecs/wm8731.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/codecs/wm8731.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/codecs/wm8750.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/codecs/wm8750.c</a></td><td class='right'>178</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/codecs/wm8750.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/codecs/wm8750.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/codecs/wm8753.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/codecs/wm8753.c</a></td><td class='right'>177</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/codecs/wm8753.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/codecs/wm8753.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/codecs/wm8900.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/codecs/wm8900.c</a></td><td class='right'>1541</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 15.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 84.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/codecs/wm8900.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/codecs/wm8900.h</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/codecs/wm8903.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/codecs/wm8903.c</a></td><td class='right'>1813</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 18.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 81.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/codecs/wm8903.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/codecs/wm8903.h</a></td><td class='right'>1463</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 14.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 85.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/codecs/wm8971.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/codecs/wm8971.c</a></td><td class='right'>941</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/codecs/wm8971.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/codecs/wm8971.h</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/codecs/wm8990.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/codecs/wm8990.c</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/codecs/wm8990.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/codecs/wm8990.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/codecs/wm9712.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/codecs/wm9712.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/codecs/wm9713.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/codecs/wm9713.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/davinci/davinci-evm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/davinci/davinci-evm.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/davinci/davinci-i2s.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/davinci/davinci-i2s.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/davinci/davinci-i2s.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/davinci/davinci-i2s.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/davinci/davinci-pcm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/davinci/davinci-pcm.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/davinci/davinci-pcm.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/davinci/davinci-pcm.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/fsl/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/fsl/Kconfig</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/fsl/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/fsl/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/fsl/mpc5200_psc_i2s.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/fsl/mpc5200_psc_i2s.c</a></td><td class='right'>884</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/fsl/mpc8610_hpcd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/fsl/mpc8610_hpcd.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/fsl/soc-of-simple.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/fsl/soc-of-simple.c</a></td><td class='right'>171</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/omap/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/omap/Kconfig</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/omap/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/omap/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/omap/n810.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/omap/n810.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/omap/omap-mcbsp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/omap/omap-mcbsp.c</a></td><td class='right'>181</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/omap/omap-mcbsp.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/omap/omap-mcbsp.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/omap/omap-pcm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/omap/omap-pcm.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/omap/osk5912.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/omap/osk5912.c</a></td><td class='right'>232</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/pxa/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/pxa/Kconfig</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/pxa/corgi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/pxa/corgi.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/pxa/em-x270.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/pxa/em-x270.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/pxa/poodle.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/pxa/poodle.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/pxa/pxa2xx-ac97.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/pxa/pxa2xx-ac97.c</a></td><td class='right'>282</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 2.7%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/pxa/pxa2xx-i2s.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/pxa/pxa2xx-i2s.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/pxa/pxa2xx-pcm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/pxa/pxa2xx-pcm.c</a></td><td class='right'>265</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 2.6%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/pxa/pxa2xx-pcm.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/pxa/pxa2xx-pcm.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/pxa/spitz.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/pxa/spitz.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/pxa/tosa.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/pxa/tosa.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/s3c24xx/neo1973_wm8753.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/s3c24xx/neo1973_wm8753.c</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/soc-core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/soc-core.c</a></td><td class='right'>143</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/soc/soc-dapm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/soc/soc-dapm.c</a></td><td class='right'>152</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/sound_core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/sound_core.c</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/sparc/amd7930.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/sparc/amd7930.c</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/sparc/cs4231.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/sparc/cs4231.c</a></td><td class='right'>202</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/sparc/dbri.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/sparc/dbri.c</a></td><td class='right'>106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/synth/emux/emux.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/synth/emux/emux.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/synth/emux/emux_nrpn.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/synth/emux/emux_nrpn.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/synth/emux/emux_oss.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/synth/emux/emux_oss.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/synth/emux/emux_seq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/synth/emux/emux_seq.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/synth/emux/emux_synth.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/synth/emux/emux_synth.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/synth/util_mem.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/synth/util_mem.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/usb/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/usb/Kconfig</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/usb/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/usb/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/usb/usbaudio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/usb/usbaudio.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/usb/usbaudio.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/usb/usbaudio.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/usb/usbmidi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/usb/usbmidi.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/usb/usbmixer.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/usb/usbmixer.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/usb/usbquirks.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/usb/usbquirks.h</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/usb/usx2y/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/usb/usx2y/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/usb/usx2y/us122l.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/usb/usx2y/us122l.c</a></td><td class='right'>693</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/usb/usx2y/us122l.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/usb/usx2y/us122l.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/usb/usx2y/usb_stream.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/usb/usx2y/usb_stream.c</a></td><td class='right'>761</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/sound/usb/usx2y/usb_stream.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>sound/usb/usx2y/usb_stream.h</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/virt/kvm/ioapic.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>virt/kvm/ioapic.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/virt/kvm/ioapic.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>virt/kvm/ioapic.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/virt/kvm/irq_comm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>virt/kvm/irq_comm.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/virt/kvm/kvm_main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>virt/kvm/kvm_main.c</a></td><td class='right'>382</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/virt/kvm/kvm_trace.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>virt/kvm/kvm_trace.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/git.armlinux.org.uk/linux.git/diff/virt/kvm/vtd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>virt/kvm/vtd.c</a></td><td class='right'>191</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
</table><div class='diffstat-summary'>6522 files changed, 531772 insertions, 167248 deletions</div><table summary='diff' class='diff'><tr><td><div class='head'>diff --git a/Documentation/00-INDEX b/Documentation/00-INDEX<br/>index 5b5aba404aac..7286ad090db7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/00-INDEX?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/00-INDEX</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/00-INDEX?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/00-INDEX</a></div><div class='hunk'>@@ -21,6 +21,9 @@ Changes</div><div class='ctx'> 	- list of changes that break older software packages.</div><div class='ctx'> CodingStyle</div><div class='ctx'> 	- how the boss likes the C code in the kernel to look.</div><div class='add'>+development-process/</div><div class='add'>+	- An extended tutorial on how to work with the kernel development</div><div class='add'>+	  process.</div><div class='ctx'> DMA-API.txt</div><div class='ctx'> 	- DMA API, pci_ API &amp; extensions for non-consistent memory machines.</div><div class='ctx'> DMA-ISA-LPC.txt</div><div class='hunk'>@@ -159,8 +162,6 @@ hayes-esp.txt</div><div class='ctx'> 	- info on using the Hayes ESP serial driver.</div><div class='ctx'> highuid.txt</div><div class='ctx'> 	- notes on the change from 16 bit to 32 bit user/group IDs.</div><div class='del'>-hpet.txt</div><div class='del'>-	- High Precision Event Timer Driver for Linux.</div><div class='ctx'> timers/</div><div class='ctx'> 	- info on the timer related topics</div><div class='ctx'> hw_random.txt</div><div class='hunk'>@@ -251,8 +252,6 @@ mono.txt</div><div class='ctx'> 	- how to execute Mono-based .NET binaries with the help of BINFMT_MISC.</div><div class='ctx'> moxa-smartio</div><div class='ctx'> 	- file with info on installing/using Moxa multiport serial driver.</div><div class='del'>-mtrr.txt</div><div class='del'>-	- how to use PPro Memory Type Range Registers to increase performance.</div><div class='ctx'> mutex-design.txt</div><div class='ctx'> 	- info on the generic mutex subsystem.</div><div class='ctx'> namespaces/</div><div class='head'>diff --git a/Documentation/ABI/stable/sysfs-driver-usb-usbtmc b/Documentation/ABI/stable/sysfs-driver-usb-usbtmc<br/>new file mode 100644<br/>index 000000000000..9a75fb22187d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/ABI/stable/sysfs-driver-usb-usbtmc?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/ABI/stable/sysfs-driver-usb-usbtmc</a></div><div class='hunk'>@@ -0,0 +1,62 @@</div><div class='add'>+What:		/sys/bus/usb/drivers/usbtmc/devices/*/interface_capabilities</div><div class='add'>+What:		/sys/bus/usb/drivers/usbtmc/devices/*/device_capabilities</div><div class='add'>+Date:		August 2008</div><div class='add'>+Contact:	Greg Kroah-Hartman &lt;gregkh@suse.de&gt;</div><div class='add'>+Description:</div><div class='add'>+		These files show the various USB TMC capabilities as described</div><div class='add'>+		by the device itself.  The full description of the bitfields</div><div class='add'>+		can be found in the USB TMC documents from the USB-IF entitled</div><div class='add'>+		"Universal Serial Bus Test and Measurement Class Specification</div><div class='add'>+		(USBTMC) Revision 1.0" section 4.2.1.8.</div><div class='add'>+</div><div class='add'>+		The files are read only.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+What:		/sys/bus/usb/drivers/usbtmc/devices/*/usb488_interface_capabilities</div><div class='add'>+What:		/sys/bus/usb/drivers/usbtmc/devices/*/usb488_device_capabilities</div><div class='add'>+Date:		August 2008</div><div class='add'>+Contact:	Greg Kroah-Hartman &lt;gregkh@suse.de&gt;</div><div class='add'>+Description:</div><div class='add'>+		These files show the various USB TMC capabilities as described</div><div class='add'>+		by the device itself.  The full description of the bitfields</div><div class='add'>+		can be found in the USB TMC documents from the USB-IF entitled</div><div class='add'>+		"Universal Serial Bus Test and Measurement Class, Subclass</div><div class='add'>+		USB488 Specification (USBTMC-USB488) Revision 1.0" section</div><div class='add'>+		4.2.2.</div><div class='add'>+</div><div class='add'>+		The files are read only.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+What:		/sys/bus/usb/drivers/usbtmc/devices/*/TermChar</div><div class='add'>+Date:		August 2008</div><div class='add'>+Contact:	Greg Kroah-Hartman &lt;gregkh@suse.de&gt;</div><div class='add'>+Description:</div><div class='add'>+		This file is the TermChar value to be sent to the USB TMC</div><div class='add'>+		device as described by the document, "Universal Serial Bus Test</div><div class='add'>+		and Measurement Class Specification</div><div class='add'>+		(USBTMC) Revision 1.0" as published by the USB-IF.</div><div class='add'>+</div><div class='add'>+		Note that the TermCharEnabled file determines if this value is</div><div class='add'>+		sent to the device or not.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+What:		/sys/bus/usb/drivers/usbtmc/devices/*/TermCharEnabled</div><div class='add'>+Date:		August 2008</div><div class='add'>+Contact:	Greg Kroah-Hartman &lt;gregkh@suse.de&gt;</div><div class='add'>+Description:</div><div class='add'>+		This file determines if the TermChar is to be sent to the</div><div class='add'>+		device on every transaction or not.  For more details about</div><div class='add'>+		this, please see the document, "Universal Serial Bus Test and</div><div class='add'>+		Measurement Class Specification (USBTMC) Revision 1.0" as</div><div class='add'>+		published by the USB-IF.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+What:		/sys/bus/usb/drivers/usbtmc/devices/*/auto_abort</div><div class='add'>+Date:		August 2008</div><div class='add'>+Contact:	Greg Kroah-Hartman &lt;gregkh@suse.de&gt;</div><div class='add'>+Description:</div><div class='add'>+		This file determines if the the transaction of the USB TMC</div><div class='add'>+		device is to be automatically aborted if there is any error.</div><div class='add'>+		For more details about this, please see the document,</div><div class='add'>+		"Universal Serial Bus Test and Measurement Class Specification</div><div class='add'>+		(USBTMC) Revision 1.0" as published by the USB-IF.</div><div class='head'>diff --git a/Documentation/ABI/testing/sysfs-bus-usb b/Documentation/ABI/testing/sysfs-bus-usb<br/>index 273a7f099f46..7772928ee48f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/ABI/testing/sysfs-bus-usb?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/ABI/testing/sysfs-bus-usb</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/ABI/testing/sysfs-bus-usb?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/ABI/testing/sysfs-bus-usb</a></div><div class='hunk'>@@ -86,6 +86,22 @@ Users:</div><div class='ctx'> 		PowerTOP &lt;power@bughost.org&gt;</div><div class='ctx'> 		http://www.lesswatts.org/projects/powertop/</div><div class='ctx'> </div><div class='add'>+What:		/sys/bus/usb/device/&lt;busnum&gt;-&lt;devnum&gt;...:&lt;config num&gt;-&lt;interface num&gt;/supports_autosuspend</div><div class='add'>+Date:		January 2008</div><div class='add'>+KernelVersion:	2.6.27</div><div class='add'>+Contact:	Sarah Sharp &lt;sarah.a.sharp@intel.com&gt;</div><div class='add'>+Description:</div><div class='add'>+		When read, this file returns 1 if the interface driver</div><div class='add'>+		for this interface supports autosuspend.  It also</div><div class='add'>+		returns 1 if no driver has claimed this interface, as an</div><div class='add'>+		unclaimed interface will not stop the device from being</div><div class='add'>+		autosuspended if all other interface drivers are idle.</div><div class='add'>+		The file returns 0 if autosuspend support has not been</div><div class='add'>+		added to the driver.</div><div class='add'>+Users:</div><div class='add'>+		USB PM tool</div><div class='add'>+		git://git.moblin.org/users/sarah/usb-pm-tool/</div><div class='add'>+</div><div class='ctx'> What:		/sys/bus/usb/device/.../authorized</div><div class='ctx'> Date:		July 2008</div><div class='ctx'> KernelVersion:	2.6.26</div><div class='head'>diff --git a/Documentation/ABI/testing/sysfs-bus-usb-devices-usbsevseg b/Documentation/ABI/testing/sysfs-bus-usb-devices-usbsevseg<br/>new file mode 100644<br/>index 000000000000..cb830df8777c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/ABI/testing/sysfs-bus-usb-devices-usbsevseg?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/ABI/testing/sysfs-bus-usb-devices-usbsevseg</a></div><div class='hunk'>@@ -0,0 +1,43 @@</div><div class='add'>+Where:		/sys/bus/usb/.../powered</div><div class='add'>+Date:		August 2008</div><div class='add'>+Kernel Version:	2.6.26</div><div class='add'>+Contact:	Harrison Metzger &lt;harrisonmetz@gmail.com&gt;</div><div class='add'>+Description:	Controls whether the device's display will powered.</div><div class='add'>+		A value of 0 is off and a non-zero value is on.</div><div class='add'>+</div><div class='add'>+Where:		/sys/bus/usb/.../mode_msb</div><div class='add'>+Where:		/sys/bus/usb/.../mode_lsb</div><div class='add'>+Date:		August 2008</div><div class='add'>+Kernel Version:	2.6.26</div><div class='add'>+Contact:	Harrison Metzger &lt;harrisonmetz@gmail.com&gt;</div><div class='add'>+Description:	Controls the devices display mode.</div><div class='add'>+		For a 6 character display the values are</div><div class='add'>+			MSB 0x06; LSB 0x3F, and</div><div class='add'>+		for an 8 character display the values are</div><div class='add'>+			MSB 0x08; LSB 0xFF.</div><div class='add'>+</div><div class='add'>+Where:		/sys/bus/usb/.../textmode</div><div class='add'>+Date:		August 2008</div><div class='add'>+Kernel Version:	2.6.26</div><div class='add'>+Contact:	Harrison Metzger &lt;harrisonmetz@gmail.com&gt;</div><div class='add'>+Description:	Controls the way the device interprets its text buffer.</div><div class='add'>+		raw:	each character controls its segment manually</div><div class='add'>+		hex:	each character is between 0-15</div><div class='add'>+		ascii:	each character is between '0'-'9' and 'A'-'F'.</div><div class='add'>+</div><div class='add'>+Where:		/sys/bus/usb/.../text</div><div class='add'>+Date:		August 2008</div><div class='add'>+Kernel Version:	2.6.26</div><div class='add'>+Contact:	Harrison Metzger &lt;harrisonmetz@gmail.com&gt;</div><div class='add'>+Description:	The text (or data) for the device to display</div><div class='add'>+</div><div class='add'>+Where:		/sys/bus/usb/.../decimals</div><div class='add'>+Date:		August 2008</div><div class='add'>+Kernel Version:	2.6.26</div><div class='add'>+Contact:	Harrison Metzger &lt;harrisonmetz@gmail.com&gt;</div><div class='add'>+Description:	Controls the decimal places on the device.</div><div class='add'>+		To set the nth decimal place, give this field</div><div class='add'>+		the value of 10 ** n. Assume this field has</div><div class='add'>+		the value k and has 1 or more decimal places set,</div><div class='add'>+		to set the mth place (where m is not already set),</div><div class='add'>+		change this fields value to k + 10 ** m.
\ No newline at end of file</div><div class='head'>diff --git a/Documentation/ABI/testing/sysfs-class-regulator b/Documentation/ABI/testing/sysfs-class-regulator<br/>index 79a4a75b2d2c..3731f6f29bcb 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/ABI/testing/sysfs-class-regulator?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/ABI/testing/sysfs-class-regulator</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/ABI/testing/sysfs-class-regulator?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/ABI/testing/sysfs-class-regulator</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> What:		/sys/class/regulator/.../state</div><div class='ctx'> Date:		April 2008</div><div class='ctx'> KernelVersion:	2.6.26</div><div class='del'>-Contact:	Liam Girdwood &lt;lg@opensource.wolfsonmicro.com&gt;</div><div class='add'>+Contact:	Liam Girdwood &lt;lrg@slimlogic.co.uk&gt;</div><div class='ctx'> Description:</div><div class='ctx'> 		Each regulator directory will contain a field called</div><div class='ctx'> 		state. This holds the regulator output state.</div><div class='hunk'>@@ -27,7 +27,7 @@ Description:</div><div class='ctx'> What:		/sys/class/regulator/.../type</div><div class='ctx'> Date:		April 2008</div><div class='ctx'> KernelVersion:	2.6.26</div><div class='del'>-Contact:	Liam Girdwood &lt;lg@opensource.wolfsonmicro.com&gt;</div><div class='add'>+Contact:	Liam Girdwood &lt;lrg@slimlogic.co.uk&gt;</div><div class='ctx'> Description:</div><div class='ctx'> 		Each regulator directory will contain a field called</div><div class='ctx'> 		type. This holds the regulator type.</div><div class='hunk'>@@ -51,7 +51,7 @@ Description:</div><div class='ctx'> What:		/sys/class/regulator/.../microvolts</div><div class='ctx'> Date:		April 2008</div><div class='ctx'> KernelVersion:	2.6.26</div><div class='del'>-Contact:	Liam Girdwood &lt;lg@opensource.wolfsonmicro.com&gt;</div><div class='add'>+Contact:	Liam Girdwood &lt;lrg@slimlogic.co.uk&gt;</div><div class='ctx'> Description:</div><div class='ctx'> 		Each regulator directory will contain a field called</div><div class='ctx'> 		microvolts. This holds the regulator output voltage setting</div><div class='hunk'>@@ -65,7 +65,7 @@ Description:</div><div class='ctx'> What:		/sys/class/regulator/.../microamps</div><div class='ctx'> Date:		April 2008</div><div class='ctx'> KernelVersion:	2.6.26</div><div class='del'>-Contact:	Liam Girdwood &lt;lg@opensource.wolfsonmicro.com&gt;</div><div class='add'>+Contact:	Liam Girdwood &lt;lrg@slimlogic.co.uk&gt;</div><div class='ctx'> Description:</div><div class='ctx'> 		Each regulator directory will contain a field called</div><div class='ctx'> 		microamps. This holds the regulator output current limit</div><div class='hunk'>@@ -79,7 +79,7 @@ Description:</div><div class='ctx'> What:		/sys/class/regulator/.../opmode</div><div class='ctx'> Date:		April 2008</div><div class='ctx'> KernelVersion:	2.6.26</div><div class='del'>-Contact:	Liam Girdwood &lt;lg@opensource.wolfsonmicro.com&gt;</div><div class='add'>+Contact:	Liam Girdwood &lt;lrg@slimlogic.co.uk&gt;</div><div class='ctx'> Description:</div><div class='ctx'> 		Each regulator directory will contain a field called</div><div class='ctx'> 		opmode. This holds the regulator operating mode setting.</div><div class='hunk'>@@ -102,7 +102,7 @@ Description:</div><div class='ctx'> What:		/sys/class/regulator/.../min_microvolts</div><div class='ctx'> Date:		April 2008</div><div class='ctx'> KernelVersion:	2.6.26</div><div class='del'>-Contact:	Liam Girdwood &lt;lg@opensource.wolfsonmicro.com&gt;</div><div class='add'>+Contact:	Liam Girdwood &lt;lrg@slimlogic.co.uk&gt;</div><div class='ctx'> Description:</div><div class='ctx'> 		Each regulator directory will contain a field called</div><div class='ctx'> 		min_microvolts. This holds the minimum safe working regulator</div><div class='hunk'>@@ -116,7 +116,7 @@ Description:</div><div class='ctx'> What:		/sys/class/regulator/.../max_microvolts</div><div class='ctx'> Date:		April 2008</div><div class='ctx'> KernelVersion:	2.6.26</div><div class='del'>-Contact:	Liam Girdwood &lt;lg@opensource.wolfsonmicro.com&gt;</div><div class='add'>+Contact:	Liam Girdwood &lt;lrg@slimlogic.co.uk&gt;</div><div class='ctx'> Description:</div><div class='ctx'> 		Each regulator directory will contain a field called</div><div class='ctx'> 		max_microvolts. This holds the maximum safe working regulator</div><div class='hunk'>@@ -130,7 +130,7 @@ Description:</div><div class='ctx'> What:		/sys/class/regulator/.../min_microamps</div><div class='ctx'> Date:		April 2008</div><div class='ctx'> KernelVersion:	2.6.26</div><div class='del'>-Contact:	Liam Girdwood &lt;lg@opensource.wolfsonmicro.com&gt;</div><div class='add'>+Contact:	Liam Girdwood &lt;lrg@slimlogic.co.uk&gt;</div><div class='ctx'> Description:</div><div class='ctx'> 		Each regulator directory will contain a field called</div><div class='ctx'> 		min_microamps. This holds the minimum safe working regulator</div><div class='hunk'>@@ -145,7 +145,7 @@ Description:</div><div class='ctx'> What:		/sys/class/regulator/.../max_microamps</div><div class='ctx'> Date:		April 2008</div><div class='ctx'> KernelVersion:	2.6.26</div><div class='del'>-Contact:	Liam Girdwood &lt;lg@opensource.wolfsonmicro.com&gt;</div><div class='add'>+Contact:	Liam Girdwood &lt;lrg@slimlogic.co.uk&gt;</div><div class='ctx'> Description:</div><div class='ctx'> 		Each regulator directory will contain a field called</div><div class='ctx'> 		max_microamps. This holds the maximum safe working regulator</div><div class='hunk'>@@ -157,10 +157,23 @@ Description:</div><div class='ctx'> 		platform code.</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+What:		/sys/class/regulator/.../name</div><div class='add'>+Date:		October 2008</div><div class='add'>+KernelVersion:	2.6.28</div><div class='add'>+Contact:	Liam Girdwood &lt;lrg@slimlogic.co.uk&gt;</div><div class='add'>+Description:</div><div class='add'>+		Each regulator directory will contain a field called</div><div class='add'>+		name. This holds a string identifying the regulator for</div><div class='add'>+		display purposes.</div><div class='add'>+</div><div class='add'>+		NOTE: this will be empty if no suitable name is provided</div><div class='add'>+		by platform or regulator drivers.</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> What:		/sys/class/regulator/.../num_users</div><div class='ctx'> Date:		April 2008</div><div class='ctx'> KernelVersion:	2.6.26</div><div class='del'>-Contact:	Liam Girdwood &lt;lg@opensource.wolfsonmicro.com&gt;</div><div class='add'>+Contact:	Liam Girdwood &lt;lrg@slimlogic.co.uk&gt;</div><div class='ctx'> Description:</div><div class='ctx'> 		Each regulator directory will contain a field called</div><div class='ctx'> 		num_users. This holds the number of consumer devices that</div><div class='hunk'>@@ -170,7 +183,7 @@ Description:</div><div class='ctx'> What:		/sys/class/regulator/.../requested_microamps</div><div class='ctx'> Date:		April 2008</div><div class='ctx'> KernelVersion:	2.6.26</div><div class='del'>-Contact:	Liam Girdwood &lt;lg@opensource.wolfsonmicro.com&gt;</div><div class='add'>+Contact:	Liam Girdwood &lt;lrg@slimlogic.co.uk&gt;</div><div class='ctx'> Description:</div><div class='ctx'> 		Each regulator directory will contain a field called</div><div class='ctx'> 		requested_microamps. This holds the total requested load</div><div class='hunk'>@@ -181,7 +194,7 @@ Description:</div><div class='ctx'> What:		/sys/class/regulator/.../parent</div><div class='ctx'> Date:		April 2008</div><div class='ctx'> KernelVersion:	2.6.26</div><div class='del'>-Contact:	Liam Girdwood &lt;lg@opensource.wolfsonmicro.com&gt;</div><div class='add'>+Contact:	Liam Girdwood &lt;lrg@slimlogic.co.uk&gt;</div><div class='ctx'> Description:</div><div class='ctx'> 		Some regulator directories will contain a link called parent.</div><div class='ctx'> 		This points to the parent or supply regulator if one exists.</div><div class='hunk'>@@ -189,7 +202,7 @@ Description:</div><div class='ctx'> What:		/sys/class/regulator/.../suspend_mem_microvolts</div><div class='ctx'> Date:		May 2008</div><div class='ctx'> KernelVersion:	2.6.26</div><div class='del'>-Contact:	Liam Girdwood &lt;lg@opensource.wolfsonmicro.com&gt;</div><div class='add'>+Contact:	Liam Girdwood &lt;lrg@slimlogic.co.uk&gt;</div><div class='ctx'> Description:</div><div class='ctx'> 		Each regulator directory will contain a field called</div><div class='ctx'> 		suspend_mem_microvolts. This holds the regulator output</div><div class='hunk'>@@ -203,7 +216,7 @@ Description:</div><div class='ctx'> What:		/sys/class/regulator/.../suspend_disk_microvolts</div><div class='ctx'> Date:		May 2008</div><div class='ctx'> KernelVersion:	2.6.26</div><div class='del'>-Contact:	Liam Girdwood &lt;lg@opensource.wolfsonmicro.com&gt;</div><div class='add'>+Contact:	Liam Girdwood &lt;lrg@slimlogic.co.uk&gt;</div><div class='ctx'> Description:</div><div class='ctx'> 		Each regulator directory will contain a field called</div><div class='ctx'> 		suspend_disk_microvolts. This holds the regulator output</div><div class='hunk'>@@ -217,7 +230,7 @@ Description:</div><div class='ctx'> What:		/sys/class/regulator/.../suspend_standby_microvolts</div><div class='ctx'> Date:		May 2008</div><div class='ctx'> KernelVersion:	2.6.26</div><div class='del'>-Contact:	Liam Girdwood &lt;lg@opensource.wolfsonmicro.com&gt;</div><div class='add'>+Contact:	Liam Girdwood &lt;lrg@slimlogic.co.uk&gt;</div><div class='ctx'> Description:</div><div class='ctx'> 		Each regulator directory will contain a field called</div><div class='ctx'> 		suspend_standby_microvolts. This holds the regulator output</div><div class='hunk'>@@ -231,7 +244,7 @@ Description:</div><div class='ctx'> What:		/sys/class/regulator/.../suspend_mem_mode</div><div class='ctx'> Date:		May 2008</div><div class='ctx'> KernelVersion:	2.6.26</div><div class='del'>-Contact:	Liam Girdwood &lt;lg@opensource.wolfsonmicro.com&gt;</div><div class='add'>+Contact:	Liam Girdwood &lt;lrg@slimlogic.co.uk&gt;</div><div class='ctx'> Description:</div><div class='ctx'> 		Each regulator directory will contain a field called</div><div class='ctx'> 		suspend_mem_mode. This holds the regulator operating mode</div><div class='hunk'>@@ -245,7 +258,7 @@ Description:</div><div class='ctx'> What:		/sys/class/regulator/.../suspend_disk_mode</div><div class='ctx'> Date:		May 2008</div><div class='ctx'> KernelVersion:	2.6.26</div><div class='del'>-Contact:	Liam Girdwood &lt;lg@opensource.wolfsonmicro.com&gt;</div><div class='add'>+Contact:	Liam Girdwood &lt;lrg@slimlogic.co.uk&gt;</div><div class='ctx'> Description:</div><div class='ctx'> 		Each regulator directory will contain a field called</div><div class='ctx'> 		suspend_disk_mode. This holds the regulator operating mode</div><div class='hunk'>@@ -258,7 +271,7 @@ Description:</div><div class='ctx'> What:		/sys/class/regulator/.../suspend_standby_mode</div><div class='ctx'> Date:		May 2008</div><div class='ctx'> KernelVersion:	2.6.26</div><div class='del'>-Contact:	Liam Girdwood &lt;lg@opensource.wolfsonmicro.com&gt;</div><div class='add'>+Contact:	Liam Girdwood &lt;lrg@slimlogic.co.uk&gt;</div><div class='ctx'> Description:</div><div class='ctx'> 		Each regulator directory will contain a field called</div><div class='ctx'> 		suspend_standby_mode. This holds the regulator operating mode</div><div class='hunk'>@@ -272,7 +285,7 @@ Description:</div><div class='ctx'> What:		/sys/class/regulator/.../suspend_mem_state</div><div class='ctx'> Date:		May 2008</div><div class='ctx'> KernelVersion:	2.6.26</div><div class='del'>-Contact:	Liam Girdwood &lt;lg@opensource.wolfsonmicro.com&gt;</div><div class='add'>+Contact:	Liam Girdwood &lt;lrg@slimlogic.co.uk&gt;</div><div class='ctx'> Description:</div><div class='ctx'> 		Each regulator directory will contain a field called</div><div class='ctx'> 		suspend_mem_state. This holds the regulator operating state</div><div class='hunk'>@@ -287,7 +300,7 @@ Description:</div><div class='ctx'> What:		/sys/class/regulator/.../suspend_disk_state</div><div class='ctx'> Date:		May 2008</div><div class='ctx'> KernelVersion:	2.6.26</div><div class='del'>-Contact:	Liam Girdwood &lt;lg@opensource.wolfsonmicro.com&gt;</div><div class='add'>+Contact:	Liam Girdwood &lt;lrg@slimlogic.co.uk&gt;</div><div class='ctx'> Description:</div><div class='ctx'> 		Each regulator directory will contain a field called</div><div class='ctx'> 		suspend_disk_state. This holds the regulator operating state</div><div class='hunk'>@@ -302,7 +315,7 @@ Description:</div><div class='ctx'> What:		/sys/class/regulator/.../suspend_standby_state</div><div class='ctx'> Date:		May 2008</div><div class='ctx'> KernelVersion:	2.6.26</div><div class='del'>-Contact:	Liam Girdwood &lt;lg@opensource.wolfsonmicro.com&gt;</div><div class='add'>+Contact:	Liam Girdwood &lt;lrg@slimlogic.co.uk&gt;</div><div class='ctx'> Description:</div><div class='ctx'> 		Each regulator directory will contain a field called</div><div class='ctx'> 		suspend_standby_state. This holds the regulator operating</div><div class='head'>diff --git a/Documentation/ABI/testing/sysfs-profiling b/Documentation/ABI/testing/sysfs-profiling<br/>new file mode 100644<br/>index 000000000000..b02d8b8c173a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/ABI/testing/sysfs-profiling?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/ABI/testing/sysfs-profiling</a></div><div class='hunk'>@@ -0,0 +1,13 @@</div><div class='add'>+What:		/sys/kernel/profile</div><div class='add'>+Date:		September 2008</div><div class='add'>+Contact:	Dave Hansen &lt;dave@linux.vnet.ibm.com&gt;</div><div class='add'>+Description:</div><div class='add'>+		/sys/kernel/profile is the runtime equivalent</div><div class='add'>+		of the boot-time profile= option.</div><div class='add'>+</div><div class='add'>+		You can get the same effect running:</div><div class='add'>+</div><div class='add'>+			echo 2 &gt; /sys/kernel/profile</div><div class='add'>+</div><div class='add'>+		as you would by issuing profile=2 on the boot</div><div class='add'>+		command line.</div><div class='head'>diff --git a/Documentation/DMA-API.txt b/Documentation/DMA-API.txt<br/>index d8b63d164e41..b8e86460046e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/DMA-API.txt?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/DMA-API.txt</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/DMA-API.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/DMA-API.txt</a></div><div class='hunk'>@@ -337,7 +337,7 @@ With scatterlists, you use the resulting mapping like this:</div><div class='ctx'> 	int i, count = dma_map_sg(dev, sglist, nents, direction);</div><div class='ctx'> 	struct scatterlist *sg;</div><div class='ctx'> </div><div class='del'>-	for (i = 0, sg = sglist; i &lt; count; i++, sg++) {</div><div class='add'>+	for_each_sg(sglist, sg, count, i) {</div><div class='ctx'> 		hw_address[i] = sg_dma_address(sg);</div><div class='ctx'> 		hw_len[i] = sg_dma_len(sg);</div><div class='ctx'> 	}</div><div class='head'>diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile<br/>index 1615350b7b53..fabc06466b93 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/DocBook/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/DocBook/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/DocBook/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/DocBook/Makefile</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'> # To add a new book the only step required is to add the book to the</div><div class='ctx'> # list of DOCBOOKS.</div><div class='ctx'> </div><div class='del'>-DOCBOOKS := wanbook.xml z8530book.xml mcabook.xml videobook.xml \</div><div class='add'>+DOCBOOKS := wanbook.xml z8530book.xml mcabook.xml \</div><div class='ctx'> 	    kernel-hacking.xml kernel-locking.xml deviceiobook.xml \</div><div class='ctx'> 	    procfs-guide.xml writing_usb_driver.xml networking.xml \</div><div class='ctx'> 	    kernel-api.xml filesystems.xml lsm.xml usb.xml kgdb.xml \</div><div class='head'>diff --git a/Documentation/DocBook/gadget.tmpl b/Documentation/DocBook/gadget.tmpl<br/>index ea3bc9565e6a..6ef2f0073e5a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/DocBook/gadget.tmpl?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/DocBook/gadget.tmpl</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/DocBook/gadget.tmpl?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/DocBook/gadget.tmpl</a></div><div class='hunk'>@@ -557,6 +557,9 @@ Near-term plans include converting all of them, except for "gadgetfs".</div><div class='ctx'> &lt;/para&gt;</div><div class='ctx'> </div><div class='ctx'> !Edrivers/usb/gadget/f_acm.c</div><div class='add'>+!Edrivers/usb/gadget/f_ecm.c</div><div class='add'>+!Edrivers/usb/gadget/f_subset.c</div><div class='add'>+!Edrivers/usb/gadget/f_obex.c</div><div class='ctx'> !Edrivers/usb/gadget/f_serial.c</div><div class='ctx'> </div><div class='ctx'> &lt;/sect1&gt;</div><div class='head'>diff --git a/Documentation/DocBook/kernel-api.tmpl b/Documentation/DocBook/kernel-api.tmpl<br/>index b7b1482f6e04..9d0058e788e5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/DocBook/kernel-api.tmpl?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/DocBook/kernel-api.tmpl</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/DocBook/kernel-api.tmpl?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/DocBook/kernel-api.tmpl</a></div><div class='hunk'>@@ -283,6 +283,7 @@ X!Earch/x86/kernel/mca_32.c</div><div class='ctx'>   &lt;chapter id="security"&gt;</div><div class='ctx'>      &lt;title&gt;Security Framework&lt;/title&gt;</div><div class='ctx'> !Isecurity/security.c</div><div class='add'>+!Esecurity/inode.c</div><div class='ctx'>   &lt;/chapter&gt;</div><div class='ctx'> </div><div class='ctx'>   &lt;chapter id="audit"&gt;</div><div class='hunk'>@@ -364,6 +365,10 @@ X!Edrivers/pnp/system.c</div><div class='ctx'> !Eblock/blk-barrier.c</div><div class='ctx'> !Eblock/blk-tag.c</div><div class='ctx'> !Iblock/blk-tag.c</div><div class='add'>+!Eblock/blk-integrity.c</div><div class='add'>+!Iblock/blktrace.c</div><div class='add'>+!Iblock/genhd.c</div><div class='add'>+!Eblock/genhd.c</div><div class='ctx'>   &lt;/chapter&gt;</div><div class='ctx'> </div><div class='ctx'>   &lt;chapter id="chrdev"&gt;</div><div class='head'>diff --git a/Documentation/DocBook/mac80211.tmpl b/Documentation/DocBook/mac80211.tmpl<br/>index b651e0a4b1c0..77c3c202991b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/DocBook/mac80211.tmpl?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/DocBook/mac80211.tmpl</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/DocBook/mac80211.tmpl?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/DocBook/mac80211.tmpl</a></div><div class='hunk'>@@ -145,7 +145,6 @@ usage should require reading the full document.</div><div class='ctx'>         this though and the recommendation to allow only a single</div><div class='ctx'>         interface in STA mode at first!</div><div class='ctx'>       &lt;/para&gt;</div><div class='del'>-!Finclude/net/mac80211.h ieee80211_if_types</div><div class='ctx'> !Finclude/net/mac80211.h ieee80211_if_init_conf</div><div class='ctx'> !Finclude/net/mac80211.h ieee80211_if_conf</div><div class='ctx'>     &lt;/chapter&gt;</div><div class='hunk'>@@ -177,8 +176,7 @@ usage should require reading the full document.</div><div class='ctx'>         &lt;title&gt;functions/definitions&lt;/title&gt;</div><div class='ctx'> !Finclude/net/mac80211.h ieee80211_rx_status</div><div class='ctx'> !Finclude/net/mac80211.h mac80211_rx_flags</div><div class='del'>-!Finclude/net/mac80211.h ieee80211_tx_control</div><div class='del'>-!Finclude/net/mac80211.h ieee80211_tx_status_flags</div><div class='add'>+!Finclude/net/mac80211.h ieee80211_tx_info</div><div class='ctx'> !Finclude/net/mac80211.h ieee80211_rx</div><div class='ctx'> !Finclude/net/mac80211.h ieee80211_rx_irqsafe</div><div class='ctx'> !Finclude/net/mac80211.h ieee80211_tx_status</div><div class='hunk'>@@ -189,12 +187,11 @@ usage should require reading the full document.</div><div class='ctx'> !Finclude/net/mac80211.h ieee80211_ctstoself_duration</div><div class='ctx'> !Finclude/net/mac80211.h ieee80211_generic_frame_duration</div><div class='ctx'> !Finclude/net/mac80211.h ieee80211_get_hdrlen_from_skb</div><div class='del'>-!Finclude/net/mac80211.h ieee80211_get_hdrlen</div><div class='add'>+!Finclude/net/mac80211.h ieee80211_hdrlen</div><div class='ctx'> !Finclude/net/mac80211.h ieee80211_wake_queue</div><div class='ctx'> !Finclude/net/mac80211.h ieee80211_stop_queue</div><div class='del'>-!Finclude/net/mac80211.h ieee80211_start_queues</div><div class='del'>-!Finclude/net/mac80211.h ieee80211_stop_queues</div><div class='ctx'> !Finclude/net/mac80211.h ieee80211_wake_queues</div><div class='add'>+!Finclude/net/mac80211.h ieee80211_stop_queues</div><div class='ctx'>       &lt;/sect1&gt;</div><div class='ctx'>     &lt;/chapter&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -230,8 +227,7 @@ usage should require reading the full document.</div><div class='ctx'>       &lt;title&gt;Multiple queues and QoS support&lt;/title&gt;</div><div class='ctx'>       &lt;para&gt;TBD&lt;/para&gt;</div><div class='ctx'> !Finclude/net/mac80211.h ieee80211_tx_queue_params</div><div class='del'>-!Finclude/net/mac80211.h ieee80211_tx_queue_stats_data</div><div class='del'>-!Finclude/net/mac80211.h ieee80211_tx_queue</div><div class='add'>+!Finclude/net/mac80211.h ieee80211_tx_queue_stats</div><div class='ctx'>     &lt;/chapter&gt;</div><div class='ctx'> </div><div class='ctx'>     &lt;chapter id="AP"&gt;</div><div class='head'>diff --git a/Documentation/DocBook/procfs-guide.tmpl b/Documentation/DocBook/procfs-guide.tmpl<br/>index 8a5dc6e021ff..9eba4b7af73d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/DocBook/procfs-guide.tmpl?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/DocBook/procfs-guide.tmpl</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/DocBook/procfs-guide.tmpl?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/DocBook/procfs-guide.tmpl</a></div><div class='hunk'>@@ -14,17 +14,20 @@</div><div class='ctx'> 	&lt;othername&gt;(J.A.K.)&lt;/othername&gt;</div><div class='ctx'> 	&lt;surname&gt;Mouw&lt;/surname&gt;</div><div class='ctx'> 	&lt;affiliation&gt;</div><div class='del'>-	  &lt;orgname&gt;Delft University of Technology&lt;/orgname&gt;</div><div class='del'>-	  &lt;orgdiv&gt;Faculty of Information Technology and Systems&lt;/orgdiv&gt;</div><div class='ctx'> 	  &lt;address&gt;</div><div class='del'>-            &lt;email&gt;J.A.K.Mouw@its.tudelft.nl&lt;/email&gt;</div><div class='del'>-            &lt;pob&gt;PO BOX 5031&lt;/pob&gt;</div><div class='del'>-            &lt;postcode&gt;2600 GA&lt;/postcode&gt;</div><div class='del'>-            &lt;city&gt;Delft&lt;/city&gt;</div><div class='del'>-            &lt;country&gt;The Netherlands&lt;/country&gt;</div><div class='add'>+            &lt;email&gt;mouw@nl.linux.org&lt;/email&gt;</div><div class='ctx'>           &lt;/address&gt;</div><div class='ctx'> 	&lt;/affiliation&gt;</div><div class='ctx'>       &lt;/author&gt;</div><div class='add'>+      &lt;othercredit&gt;</div><div class='add'>+	&lt;contrib&gt;</div><div class='add'>+	This software and documentation were written while working on the</div><div class='add'>+	LART computing board</div><div class='add'>+	(&lt;ulink url="http://www.lartmaker.nl/"&gt;http://www.lartmaker.nl/&lt;/ulink&gt;),</div><div class='add'>+	which was sponsored by the Delt University of Technology projects</div><div class='add'>+	Mobile Multi-media Communications and Ubiquitous Communications.</div><div class='add'>+	&lt;/contrib&gt;</div><div class='add'>+      &lt;/othercredit&gt;</div><div class='ctx'>     &lt;/authorgroup&gt;</div><div class='ctx'> </div><div class='ctx'>     &lt;revhistory&gt;</div><div class='hunk'>@@ -109,18 +112,6 @@</div><div class='ctx'>     &lt;/para&gt;</div><div class='ctx'> </div><div class='ctx'>     &lt;para&gt;</div><div class='del'>-      This documentation was written while working on the LART</div><div class='del'>-      computing board (&lt;ulink</div><div class='del'>-      url="http://www.lart.tudelft.nl/"&gt;http://www.lart.tudelft.nl/&lt;/ulink&gt;),</div><div class='del'>-      which is sponsored by the Mobile Multi-media Communications</div><div class='del'>-      (&lt;ulink</div><div class='del'>-      url="http://www.mmc.tudelft.nl/"&gt;http://www.mmc.tudelft.nl/&lt;/ulink&gt;)</div><div class='del'>-      and Ubiquitous Communications (&lt;ulink</div><div class='del'>-      url="http://www.ubicom.tudelft.nl/"&gt;http://www.ubicom.tudelft.nl/&lt;/ulink&gt;)</div><div class='del'>-      projects.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='ctx'>       Erik</div><div class='ctx'>     &lt;/para&gt;</div><div class='ctx'>   &lt;/preface&gt;</div><div class='head'>diff --git a/Documentation/DocBook/procfs_example.c b/Documentation/DocBook/procfs_example.c<br/>index 2f3de0fb8365..8c6396e4bf31 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/DocBook/procfs_example.c?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/DocBook/procfs_example.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/DocBook/procfs_example.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/DocBook/procfs_example.c</a></div><div class='hunk'>@@ -1,28 +1,16 @@</div><div class='ctx'> /*</div><div class='ctx'>  * procfs_example.c: an example proc interface</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2001, Erik Mouw (J.A.K.Mouw@its.tudelft.nl)</div><div class='add'>+ * Copyright (C) 2001, Erik Mouw (mouw@nl.linux.org)</div><div class='ctx'>  *</div><div class='ctx'>  * This file accompanies the procfs-guide in the Linux kernel</div><div class='ctx'>  * source. Its main use is to demonstrate the concepts and</div><div class='ctx'>  * functions described in the guide.</div><div class='ctx'>  *</div><div class='ctx'>  * This software has been developed while working on the LART</div><div class='del'>- * computing board (http://www.lart.tudelft.nl/), which is</div><div class='del'>- * sponsored by the Mobile Multi-media Communications</div><div class='del'>- * (http://www.mmc.tudelft.nl/) and Ubiquitous Communications </div><div class='del'>- * (http://www.ubicom.tudelft.nl/) projects.</div><div class='del'>- *</div><div class='del'>- * The author can be reached at:</div><div class='del'>- *</div><div class='del'>- *  Erik Mouw</div><div class='del'>- *  Information and Communication Theory Group</div><div class='del'>- *  Faculty of Information Technology and Systems</div><div class='del'>- *  Delft University of Technology</div><div class='del'>- *  P.O. Box 5031</div><div class='del'>- *  2600 GA Delft</div><div class='del'>- *  The Netherlands</div><div class='del'>- *</div><div class='add'>+ * computing board (http://www.lartmaker.nl), which was sponsored</div><div class='add'>+ * by the Delt University of Technology projects Mobile Multi-media</div><div class='add'>+ * Communications and Ubiquitous Communications.</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute</div><div class='ctx'>  * it and/or modify it under the terms of the GNU General</div><div class='head'>diff --git a/Documentation/DocBook/videobook.tmpl b/Documentation/DocBook/videobook.tmpl<br/>deleted file mode 100644<br/>index 0bc25949b668..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/DocBook/videobook.tmpl?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/DocBook/videobook.tmpl</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1654 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0" encoding="UTF-8"?&gt;</div><div class='del'>-&lt;!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"</div><div class='del'>-	"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" []&gt;</div><div class='del'>-</div><div class='del'>-&lt;book id="V4LGuide"&gt;</div><div class='del'>- &lt;bookinfo&gt;</div><div class='del'>-  &lt;title&gt;Video4Linux Programming&lt;/title&gt;</div><div class='del'>-  </div><div class='del'>-  &lt;authorgroup&gt;</div><div class='del'>-   &lt;author&gt;</div><div class='del'>-    &lt;firstname&gt;Alan&lt;/firstname&gt;</div><div class='del'>-    &lt;surname&gt;Cox&lt;/surname&gt;</div><div class='del'>-    &lt;affiliation&gt;</div><div class='del'>-     &lt;address&gt;</div><div class='del'>-      &lt;email&gt;alan@redhat.com&lt;/email&gt;</div><div class='del'>-     &lt;/address&gt;</div><div class='del'>-    &lt;/affiliation&gt;</div><div class='del'>-   &lt;/author&gt;</div><div class='del'>-  &lt;/authorgroup&gt;</div><div class='del'>-</div><div class='del'>-  &lt;copyright&gt;</div><div class='del'>-   &lt;year&gt;2000&lt;/year&gt;</div><div class='del'>-   &lt;holder&gt;Alan Cox&lt;/holder&gt;</div><div class='del'>-  &lt;/copyright&gt;</div><div class='del'>-</div><div class='del'>-  &lt;legalnotice&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-     This documentation is free software; you can redistribute</div><div class='del'>-     it and/or modify it under the terms of the GNU General Public</div><div class='del'>-     License as published by the Free Software Foundation; either</div><div class='del'>-     version 2 of the License, or (at your option) any later</div><div class='del'>-     version.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-      </div><div class='del'>-   &lt;para&gt;</div><div class='del'>-     This program is distributed in the hope that it will be</div><div class='del'>-     useful, but WITHOUT ANY WARRANTY; without even the implied</div><div class='del'>-     warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.</div><div class='del'>-     See the GNU General Public License for more details.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-      </div><div class='del'>-   &lt;para&gt;</div><div class='del'>-     You should have received a copy of the GNU General Public</div><div class='del'>-     License along with this program; if not, write to the Free</div><div class='del'>-     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,</div><div class='del'>-     MA 02111-1307 USA</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-      </div><div class='del'>-   &lt;para&gt;</div><div class='del'>-     For more details see the file COPYING in the source</div><div class='del'>-     distribution of Linux.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-  &lt;/legalnotice&gt;</div><div class='del'>- &lt;/bookinfo&gt;</div><div class='del'>-</div><div class='del'>-&lt;toc&gt;&lt;/toc&gt;</div><div class='del'>-</div><div class='del'>-  &lt;chapter id="intro"&gt;</div><div class='del'>-      &lt;title&gt;Introduction&lt;/title&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        Parts of this document first appeared in Linux Magazine under a</div><div class='del'>-        ninety day exclusivity.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        Video4Linux is intended to provide a common programming interface</div><div class='del'>-        for the many TV and capture cards now on the market, as well as</div><div class='del'>-        parallel port and USB video cameras. Radio, teletext decoders and</div><div class='del'>-        vertical blanking data interfaces are also provided.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;/chapter&gt;</div><div class='del'>-  &lt;chapter id="radio"&gt;</div><div class='del'>-        &lt;title&gt;Radio Devices&lt;/title&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        There are a wide variety of radio interfaces available for PC's, and these</div><div class='del'>-        are generally very simple to program. The biggest problem with supporting</div><div class='del'>-        such devices is normally extracting documentation from the vendor.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        The radio interface supports a simple set of control ioctls standardised</div><div class='del'>-        across all radio and tv interfaces. It does not support read or write, which</div><div class='del'>-        are used for video streams. The reason radio cards do not allow you to read</div><div class='del'>-        the audio stream into an application is that without exception they provide</div><div class='del'>-        a connection on to a soundcard. Soundcards can be used to read the radio</div><div class='del'>-        data just fine. </div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;sect1 id="registerradio"&gt;</div><div class='del'>-  &lt;title&gt;Registering Radio Devices&lt;/title&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        The Video4linux core provides an interface for registering devices. The</div><div class='del'>-        first step in writing our radio card driver is to register it.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;programlisting&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static struct video_device my_radio</div><div class='del'>-{</div><div class='del'>-        "My radio",</div><div class='del'>-        VID_TYPE_TUNER,</div><div class='del'>-        radio_open.</div><div class='del'>-        radio_close,</div><div class='del'>-        NULL,                /* no read */</div><div class='del'>-        NULL,                 /* no write */</div><div class='del'>-        NULL,                /* no poll */</div><div class='del'>-        radio_ioctl,</div><div class='del'>-        NULL,                /* no special init function */</div><div class='del'>-        NULL                /* no private data */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-  &lt;/programlisting&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        This declares our video4linux device driver interface. The VID_TYPE_ value</div><div class='del'>-        defines what kind of an interface we are, and defines basic capabilities.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        The only defined value relevant for a radio card is VID_TYPE_TUNER which</div><div class='del'>-        indicates that the device can be tuned. Clearly our radio is going to have some</div><div class='del'>-        way to change channel so it is tuneable.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        We declare an open and close routine, but we do not need read or write,</div><div class='del'>-        which are used to read and write video data to or from the card itself. As</div><div class='del'>-        we have no read or write there is no poll function.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        The private initialise function is run when the device is registered. In</div><div class='del'>-        this driver we've already done all the work needed. The final pointer is a</div><div class='del'>-        private data pointer that can be used by the device driver to attach and</div><div class='del'>-        retrieve private data structures. We set this field "priv" to NULL for</div><div class='del'>-        the moment.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        Having the structure defined is all very well but we now need to register it</div><div class='del'>-        with the kernel. </div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;programlisting&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int io = 0x320;</div><div class='del'>-</div><div class='del'>-int __init myradio_init(struct video_init *v)</div><div class='del'>-{</div><div class='del'>-        if(!request_region(io, MY_IO_SIZE, "myradio"))</div><div class='del'>-        {</div><div class='del'>-                printk(KERN_ERR </div><div class='del'>-                    "myradio: port 0x%03X is in use.\n", io);</div><div class='del'>-                return -EBUSY;</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-        if(video_device_register(&amp;amp;my_radio, VFL_TYPE_RADIO)==-1) {</div><div class='del'>-                release_region(io, MY_IO_SIZE);</div><div class='del'>-                return -EINVAL;</div><div class='del'>-        }		</div><div class='del'>-        return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-  &lt;/programlisting&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        The first stage of the initialisation, as is normally the case, is to check </div><div class='del'>-        that the I/O space we are about to fiddle with doesn't belong to some other </div><div class='del'>-        driver. If it is we leave well alone. If the user gives the address of the </div><div class='del'>-        wrong device then we will spot this. These policies will generally avoid </div><div class='del'>-        crashing the machine.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        Now we ask the Video4Linux layer to register the device for us. We hand it</div><div class='del'>-        our carefully designed video_device structure and also tell it which group</div><div class='del'>-        of devices we want it registered with. In this case VFL_TYPE_RADIO.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        The types available are</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-   &lt;table frame="all" id="Device_Types"&gt;&lt;title&gt;Device Types&lt;/title&gt;</div><div class='del'>-   &lt;tgroup cols="3" align="left"&gt;</div><div class='del'>-   &lt;tbody&gt;</div><div class='del'>-   &lt;row&gt;</div><div class='del'>-        &lt;entry&gt;VFL_TYPE_RADIO&lt;/entry&gt;&lt;entry&gt;/dev/radio{n}&lt;/entry&gt;&lt;entry&gt;</div><div class='del'>-</div><div class='del'>-        Radio devices are assigned in this block. As with all of these</div><div class='del'>-        selections the actual number assignment is done by the video layer</div><div class='del'>-        accordijng to what is free.&lt;/entry&gt;</div><div class='del'>-	&lt;/row&gt;&lt;row&gt;</div><div class='del'>-        &lt;entry&gt;VFL_TYPE_GRABBER&lt;/entry&gt;&lt;entry&gt;/dev/video{n}&lt;/entry&gt;&lt;entry&gt;</div><div class='del'>-        Video capture devices and also -- counter-intuitively for the name --</div><div class='del'>-        hardware video playback devices such as MPEG2 cards.&lt;/entry&gt;</div><div class='del'>-	&lt;/row&gt;&lt;row&gt;</div><div class='del'>-        &lt;entry&gt;VFL_TYPE_VBI&lt;/entry&gt;&lt;entry&gt;/dev/vbi{n}&lt;/entry&gt;&lt;entry&gt;</div><div class='del'>-        The VBI devices capture the hidden lines on a television picture</div><div class='del'>-        that carry further information like closed caption data, teletext</div><div class='del'>-        (primarily in Europe) and now Intercast and the ATVEC internet</div><div class='del'>-        television encodings.&lt;/entry&gt;</div><div class='del'>-	&lt;/row&gt;&lt;row&gt;</div><div class='del'>-        &lt;entry&gt;VFL_TYPE_VTX&lt;/entry&gt;&lt;entry&gt;/dev/vtx[n}&lt;/entry&gt;&lt;entry&gt;</div><div class='del'>-        VTX is 'Videotext' also known as 'Teletext'. This is a system for</div><div class='del'>-        sending numbered, 40x25, mostly textual page images over the hidden</div><div class='del'>-        lines. Unlike the /dev/vbi interfaces, this is for 'smart' decoder </div><div class='del'>-        chips. (The use of the word smart here has to be taken in context,</div><div class='del'>-        the smartest teletext chips are fairly dumb pieces of technology).</div><div class='del'>-	&lt;/entry&gt;</div><div class='del'>-    &lt;/row&gt;</div><div class='del'>-    &lt;/tbody&gt;</div><div class='del'>-    &lt;/tgroup&gt;</div><div class='del'>-    &lt;/table&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        We are most definitely a radio.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        Finally we allocate our I/O space so that nobody treads on us and return 0</div><div class='del'>-        to signify general happiness with the state of the universe.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-  &lt;sect1 id="openradio"&gt;</div><div class='del'>-  &lt;title&gt;Opening And Closing The Radio&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        The functions we declared in our video_device are mostly very simple.</div><div class='del'>-        Firstly we can drop in what is basically standard code for open and close. </div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;programlisting&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int users = 0;</div><div class='del'>-</div><div class='del'>-static int radio_open(struct video_device *dev, int flags)</div><div class='del'>-{</div><div class='del'>-        if(users)</div><div class='del'>-                return -EBUSY;</div><div class='del'>-        users++;</div><div class='del'>-        return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-  &lt;/programlisting&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        At open time we need to do nothing but check if someone else is also using</div><div class='del'>-        the radio card. If nobody is using it we make a note that we are using it,</div><div class='del'>-        then we ensure that nobody unloads our driver on us.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;programlisting&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int radio_close(struct video_device *dev)</div><div class='del'>-{</div><div class='del'>-        users--;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-  &lt;/programlisting&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        At close time we simply need to reduce the user count and allow the module</div><div class='del'>-        to become unloadable.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        If you are sharp you will have noticed neither the open nor the close</div><div class='del'>-        routines attempt to reset or change the radio settings. This is intentional.</div><div class='del'>-        It allows an application to set up the radio and exit. It avoids a user</div><div class='del'>-        having to leave an application running all the time just to listen to the</div><div class='del'>-        radio. </div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-  &lt;sect1 id="ioctlradio"&gt;</div><div class='del'>-  &lt;title&gt;The Ioctl Interface&lt;/title&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        This leaves the ioctl routine, without which the driver will not be</div><div class='del'>-        terribly useful to anyone.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;programlisting&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int radio_ioctl(struct video_device *dev, unsigned int cmd, void *arg)</div><div class='del'>-{</div><div class='del'>-        switch(cmd)</div><div class='del'>-        {</div><div class='del'>-                case VIDIOCGCAP:</div><div class='del'>-                {</div><div class='del'>-                        struct video_capability v;</div><div class='del'>-                        v.type = VID_TYPE_TUNER;</div><div class='del'>-                        v.channels = 1;</div><div class='del'>-                        v.audios = 1;</div><div class='del'>-                        v.maxwidth = 0;</div><div class='del'>-                        v.minwidth = 0;</div><div class='del'>-                        v.maxheight = 0;</div><div class='del'>-                        v.minheight = 0;</div><div class='del'>-                        strcpy(v.name, "My Radio");</div><div class='del'>-                        if(copy_to_user(arg, &amp;amp;v, sizeof(v)))</div><div class='del'>-                                return -EFAULT;</div><div class='del'>-                        return 0;</div><div class='del'>-                }</div><div class='del'>-</div><div class='del'>-  &lt;/programlisting&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        VIDIOCGCAP is the first ioctl all video4linux devices must support. It</div><div class='del'>-        allows the applications to find out what sort of a card they have found and</div><div class='del'>-        to figure out what they want to do about it. The fields in the structure are</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-   &lt;table frame="all" id="video_capability_fields"&gt;&lt;title&gt;struct video_capability fields&lt;/title&gt;</div><div class='del'>-   &lt;tgroup cols="2" align="left"&gt;</div><div class='del'>-   &lt;tbody&gt;</div><div class='del'>-   &lt;row&gt;</div><div class='del'>-        &lt;entry&gt;name&lt;/entry&gt;&lt;entry&gt;The device text name. This is intended for the user.&lt;/entry&gt;</div><div class='del'>-	&lt;/row&gt;&lt;row&gt;</div><div class='del'>-        &lt;entry&gt;channels&lt;/entry&gt;&lt;entry&gt;The number of different channels you can tune on</div><div class='del'>-                        this card. It could even by zero for a card that has</div><div class='del'>-                        no tuning capability. For our simple FM radio it is 1. </div><div class='del'>-                        An AM/FM radio would report 2.&lt;/entry&gt;</div><div class='del'>-	&lt;/row&gt;&lt;row&gt;</div><div class='del'>-        &lt;entry&gt;audios&lt;/entry&gt;&lt;entry&gt;The number of audio inputs on this device. For our</div><div class='del'>-                        radio there is only one audio input.&lt;/entry&gt;</div><div class='del'>-	&lt;/row&gt;&lt;row&gt;</div><div class='del'>-        &lt;entry&gt;minwidth,minheight&lt;/entry&gt;&lt;entry&gt;The smallest size the card is capable of capturing</div><div class='del'>-		        images in. We set these to zero. Radios do not</div><div class='del'>-                        capture pictures&lt;/entry&gt;</div><div class='del'>-	&lt;/row&gt;&lt;row&gt;</div><div class='del'>-        &lt;entry&gt;maxwidth,maxheight&lt;/entry&gt;&lt;entry&gt;The largest image size the card is capable of</div><div class='del'>-                                      capturing. For our radio we report 0.</div><div class='del'>-				&lt;/entry&gt;</div><div class='del'>-	&lt;/row&gt;&lt;row&gt;</div><div class='del'>-        &lt;entry&gt;type&lt;/entry&gt;&lt;entry&gt;This reports the capabilities of the device, and</div><div class='del'>-                        matches the field we filled in in the struct</div><div class='del'>-                        video_device when registering.&lt;/entry&gt;</div><div class='del'>-    &lt;/row&gt;</div><div class='del'>-    &lt;/tbody&gt;</div><div class='del'>-    &lt;/tgroup&gt;</div><div class='del'>-    &lt;/table&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        Having filled in the fields, we use copy_to_user to copy the structure into</div><div class='del'>-        the users buffer. If the copy fails we return an EFAULT to the application</div><div class='del'>-        so that it knows it tried to feed us garbage.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        The next pair of ioctl operations select which tuner is to be used and let</div><div class='del'>-        the application find the tuner properties. We have only a single FM band</div><div class='del'>-        tuner in our example device.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;programlisting&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-                case VIDIOCGTUNER:</div><div class='del'>-                {</div><div class='del'>-                        struct video_tuner v;</div><div class='del'>-                        if(copy_from_user(&amp;amp;v, arg, sizeof(v))!=0)</div><div class='del'>-                                return -EFAULT;</div><div class='del'>-                        if(v.tuner)</div><div class='del'>-                                return -EINVAL;</div><div class='del'>-                        v.rangelow=(87*16000);</div><div class='del'>-                        v.rangehigh=(108*16000);</div><div class='del'>-                        v.flags = VIDEO_TUNER_LOW;</div><div class='del'>-                        v.mode = VIDEO_MODE_AUTO;</div><div class='del'>-                        v.signal = 0xFFFF;</div><div class='del'>-                        strcpy(v.name, "FM");</div><div class='del'>-                        if(copy_to_user(&amp;amp;v, arg, sizeof(v))!=0)</div><div class='del'>-                                return -EFAULT;</div><div class='del'>-                        return 0;</div><div class='del'>-                }</div><div class='del'>-</div><div class='del'>-  &lt;/programlisting&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        The VIDIOCGTUNER ioctl allows applications to query a tuner. The application</div><div class='del'>-        sets the tuner field to the tuner number it wishes to query. The query does</div><div class='del'>-        not change the tuner that is being used, it merely enquires about the tuner</div><div class='del'>-        in question.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        We have exactly one tuner so after copying the user buffer to our temporary</div><div class='del'>-        structure we complain if they asked for a tuner other than tuner 0. </div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        The video_tuner structure has the following fields</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-   &lt;table frame="all" id="video_tuner_fields"&gt;&lt;title&gt;struct video_tuner fields&lt;/title&gt;</div><div class='del'>-   &lt;tgroup cols="2" align="left"&gt;</div><div class='del'>-   &lt;tbody&gt;</div><div class='del'>-   &lt;row&gt;</div><div class='del'>-        &lt;entry&gt;int tuner&lt;/entry&gt;&lt;entry&gt;The number of the tuner in question&lt;/entry&gt;</div><div class='del'>-   &lt;/row&gt;&lt;row&gt;</div><div class='del'>-        &lt;entry&gt;char name[32]&lt;/entry&gt;&lt;entry&gt;A text description of this tuner. "FM" will do fine.</div><div class='del'>-                        This is intended for the application.&lt;/entry&gt;</div><div class='del'>-   &lt;/row&gt;&lt;row&gt;</div><div class='del'>-        &lt;entry&gt;u32 flags&lt;/entry&gt;</div><div class='del'>-        &lt;entry&gt;Tuner capability flags&lt;/entry&gt;</div><div class='del'>-   &lt;/row&gt;</div><div class='del'>-   &lt;row&gt;</div><div class='del'>-        &lt;entry&gt;u16 mode&lt;/entry&gt;&lt;entry&gt;The current reception mode&lt;/entry&gt;</div><div class='del'>-</div><div class='del'>-   &lt;/row&gt;&lt;row&gt;</div><div class='del'>-        &lt;entry&gt;u16 signal&lt;/entry&gt;&lt;entry&gt;The signal strength scaled between 0 and 65535. If</div><div class='del'>-                        a device cannot tell the signal strength it should</div><div class='del'>-                        report 65535. Many simple cards contain only a </div><div class='del'>-                        signal/no signal bit. Such cards will report either</div><div class='del'>-                        0 or 65535.&lt;/entry&gt;</div><div class='del'>-</div><div class='del'>-   &lt;/row&gt;&lt;row&gt;</div><div class='del'>-        &lt;entry&gt;u32 rangelow, rangehigh&lt;/entry&gt;&lt;entry&gt;</div><div class='del'>-                        The range of frequencies supported by the radio</div><div class='del'>-                        or TV. It is scaled according to the VIDEO_TUNER_LOW</div><div class='del'>-                        flag.&lt;/entry&gt;</div><div class='del'>-</div><div class='del'>-    &lt;/row&gt;</div><div class='del'>-    &lt;/tbody&gt;</div><div class='del'>-    &lt;/tgroup&gt;</div><div class='del'>-    &lt;/table&gt;</div><div class='del'>-</div><div class='del'>-   &lt;table frame="all" id="video_tuner_flags"&gt;&lt;title&gt;struct video_tuner flags&lt;/title&gt;</div><div class='del'>-   &lt;tgroup cols="2" align="left"&gt;</div><div class='del'>-   &lt;tbody&gt;</div><div class='del'>-   &lt;row&gt;</div><div class='del'>-	&lt;entry&gt;VIDEO_TUNER_PAL&lt;/entry&gt;&lt;entry&gt;A PAL TV tuner&lt;/entry&gt;</div><div class='del'>-	&lt;/row&gt;&lt;row&gt;</div><div class='del'>-        &lt;entry&gt;VIDEO_TUNER_NTSC&lt;/entry&gt;&lt;entry&gt;An NTSC (US) TV tuner&lt;/entry&gt;</div><div class='del'>-	&lt;/row&gt;&lt;row&gt;</div><div class='del'>-        &lt;entry&gt;VIDEO_TUNER_SECAM&lt;/entry&gt;&lt;entry&gt;A SECAM (French) TV tuner&lt;/entry&gt;</div><div class='del'>-	&lt;/row&gt;&lt;row&gt;</div><div class='del'>-        &lt;entry&gt;VIDEO_TUNER_LOW&lt;/entry&gt;&lt;entry&gt;</div><div class='del'>-             The tuner frequency is scaled in 1/16th of a KHz</div><div class='del'>-             steps. If not it is in 1/16th of a MHz steps</div><div class='del'>-	&lt;/entry&gt;</div><div class='del'>-	&lt;/row&gt;&lt;row&gt;</div><div class='del'>-        &lt;entry&gt;VIDEO_TUNER_NORM&lt;/entry&gt;&lt;entry&gt;The tuner can set its format&lt;/entry&gt;</div><div class='del'>-	&lt;/row&gt;&lt;row&gt;</div><div class='del'>-        &lt;entry&gt;VIDEO_TUNER_STEREO_ON&lt;/entry&gt;&lt;entry&gt;The tuner is currently receiving a stereo signal&lt;/entry&gt;</div><div class='del'>-        &lt;/row&gt;</div><div class='del'>-    &lt;/tbody&gt;</div><div class='del'>-    &lt;/tgroup&gt;</div><div class='del'>-    &lt;/table&gt;</div><div class='del'>-</div><div class='del'>-   &lt;table frame="all" id="video_tuner_modes"&gt;&lt;title&gt;struct video_tuner modes&lt;/title&gt;</div><div class='del'>-   &lt;tgroup cols="2" align="left"&gt;</div><div class='del'>-   &lt;tbody&gt;</div><div class='del'>-   &lt;row&gt;</div><div class='del'>-                &lt;entry&gt;VIDEO_MODE_PAL&lt;/entry&gt;&lt;entry&gt;PAL Format&lt;/entry&gt;</div><div class='del'>-   &lt;/row&gt;&lt;row&gt;</div><div class='del'>-                &lt;entry&gt;VIDEO_MODE_NTSC&lt;/entry&gt;&lt;entry&gt;NTSC Format (USA)&lt;/entry&gt;</div><div class='del'>-   &lt;/row&gt;&lt;row&gt;</div><div class='del'>-                &lt;entry&gt;VIDEO_MODE_SECAM&lt;/entry&gt;&lt;entry&gt;French Format&lt;/entry&gt;</div><div class='del'>-   &lt;/row&gt;&lt;row&gt;</div><div class='del'>-                &lt;entry&gt;VIDEO_MODE_AUTO&lt;/entry&gt;&lt;entry&gt;A device that does not need to do</div><div class='del'>-                                        TV format switching&lt;/entry&gt;</div><div class='del'>-   &lt;/row&gt;</div><div class='del'>-    &lt;/tbody&gt;</div><div class='del'>-    &lt;/tgroup&gt;</div><div class='del'>-    &lt;/table&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        The settings for the radio card are thus fairly simple. We report that we</div><div class='del'>-        are a tuner called "FM" for FM radio. In order to get the best tuning</div><div class='del'>-        resolution we report VIDEO_TUNER_LOW and select tuning to 1/16th of KHz. Its</div><div class='del'>-        unlikely our card can do that resolution but it is a fair bet the card can</div><div class='del'>-        do better than 1/16th of a MHz. VIDEO_TUNER_LOW is appropriate to almost all</div><div class='del'>-        radio usage.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        We report that the tuner automatically handles deciding what format it is</div><div class='del'>-        receiving - true enough as it only handles FM radio. Our example card is</div><div class='del'>-        also incapable of detecting stereo or signal strengths so it reports a</div><div class='del'>-        strength of 0xFFFF (maximum) and no stereo detected.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        To finish off we set the range that can be tuned to be 87-108Mhz, the normal</div><div class='del'>-        FM broadcast radio range. It is important to find out what the card is</div><div class='del'>-        actually capable of tuning. It is easy enough to simply use the FM broadcast</div><div class='del'>-        range. Unfortunately if you do this you will discover the FM broadcast</div><div class='del'>-        ranges in the USA, Europe and Japan are all subtly different and some users</div><div class='del'>-        cannot receive all the stations they wish.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        The application also needs to be able to set the tuner it wishes to use. In</div><div class='del'>-        our case, with a single tuner this is rather simple to arrange.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;programlisting&gt;</div><div class='del'>-</div><div class='del'>-                case VIDIOCSTUNER:</div><div class='del'>-                {</div><div class='del'>-                        struct video_tuner v;</div><div class='del'>-                        if(copy_from_user(&amp;amp;v, arg, sizeof(v)))</div><div class='del'>-                                return -EFAULT;</div><div class='del'>-                        if(v.tuner != 0)</div><div class='del'>-                                return -EINVAL;</div><div class='del'>-                        return 0;</div><div class='del'>-                }</div><div class='del'>-</div><div class='del'>-  &lt;/programlisting&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        We copy the user supplied structure into kernel memory so we can examine it. </div><div class='del'>-        If the user has selected a tuner other than zero we reject the request. If </div><div class='del'>-        they wanted tuner 0 then, surprisingly enough, that is the current tuner already.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        The next two ioctls we need to provide are to get and set the frequency of</div><div class='del'>-        the radio. These both use an unsigned long argument which is the frequency.</div><div class='del'>-        The scale of the frequency depends on the VIDEO_TUNER_LOW flag as I</div><div class='del'>-        mentioned earlier on. Since we have VIDEO_TUNER_LOW set this will be in</div><div class='del'>-        1/16ths of a KHz.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;programlisting&gt;</div><div class='del'>-</div><div class='del'>-static unsigned long current_freq;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-                case VIDIOCGFREQ:</div><div class='del'>-                        if(copy_to_user(arg, &amp;amp;current_freq, </div><div class='del'>-                                sizeof(unsigned long))</div><div class='del'>-                                return -EFAULT;</div><div class='del'>-                        return 0;</div><div class='del'>-</div><div class='del'>-  &lt;/programlisting&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        Querying the frequency in our case is relatively simple. Our radio card is</div><div class='del'>-        too dumb to let us query the signal strength so we remember our setting if </div><div class='del'>-        we know it. All we have to do is copy it to the user.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;programlisting&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-                case VIDIOCSFREQ:</div><div class='del'>-                {</div><div class='del'>-                        u32 freq;</div><div class='del'>-                        if(copy_from_user(arg, &amp;amp;freq, </div><div class='del'>-                                sizeof(unsigned long))!=0)</div><div class='del'>-                                return -EFAULT;</div><div class='del'>-                        if(hardware_set_freq(freq)&amp;lt;0)</div><div class='del'>-                                return -EINVAL;</div><div class='del'>-                        current_freq = freq;</div><div class='del'>-                        return 0;</div><div class='del'>-                }</div><div class='del'>-</div><div class='del'>-  &lt;/programlisting&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        Setting the frequency is a little more complex. We begin by copying the</div><div class='del'>-        desired frequency into kernel space. Next we call a hardware specific routine</div><div class='del'>-        to set the radio up. This might be as simple as some scaling and a few</div><div class='del'>-        writes to an I/O port. For most radio cards it turns out a good deal more</div><div class='del'>-        complicated and may involve programming things like a phase locked loop on</div><div class='del'>-        the card. This is what documentation is for. </div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        The final set of operations we need to provide for our radio are the </div><div class='del'>-        volume controls. Not all radio cards can even do volume control. After all</div><div class='del'>-        there is a perfectly good volume control on the sound card. We will assume</div><div class='del'>-        our radio card has a simple 4 step volume control.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        There are two ioctls with audio we need to support</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;programlisting&gt;</div><div class='del'>-</div><div class='del'>-static int current_volume=0;</div><div class='del'>-</div><div class='del'>-                case VIDIOCGAUDIO:</div><div class='del'>-                {</div><div class='del'>-                        struct video_audio v;</div><div class='del'>-                        if(copy_from_user(&amp;amp;v, arg, sizeof(v)))</div><div class='del'>-                                return -EFAULT;</div><div class='del'>-                        if(v.audio != 0)</div><div class='del'>-                                return -EINVAL;</div><div class='del'>-                        v.volume = 16384*current_volume;</div><div class='del'>-                        v.step = 16384;</div><div class='del'>-                        strcpy(v.name, "Radio");</div><div class='del'>-                        v.mode = VIDEO_SOUND_MONO;</div><div class='del'>-                        v.balance = 0;</div><div class='del'>-                        v.base = 0;</div><div class='del'>-                        v.treble = 0;</div><div class='del'>-                        </div><div class='del'>-                        if(copy_to_user(arg. &amp;amp;v, sizeof(v)))</div><div class='del'>-                                return -EFAULT;</div><div class='del'>-                        return 0;</div><div class='del'>-                }</div><div class='del'>-</div><div class='del'>-  &lt;/programlisting&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        Much like the tuner we start by copying the user structure into kernel</div><div class='del'>-        space. Again we check if the user has asked for a valid audio input. We have</div><div class='del'>-        only input 0 and we punt if they ask for another input.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        Then we fill in the video_audio structure. This has the following format</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-   &lt;table frame="all" id="video_audio_fields"&gt;&lt;title&gt;struct video_audio fields&lt;/title&gt;</div><div class='del'>-   &lt;tgroup cols="2" align="left"&gt;</div><div class='del'>-   &lt;tbody&gt;</div><div class='del'>-   &lt;row&gt;</div><div class='del'>-   &lt;entry&gt;audio&lt;/entry&gt;&lt;entry&gt;The input the user wishes to query&lt;/entry&gt;</div><div class='del'>-   &lt;/row&gt;&lt;row&gt;</div><div class='del'>-   &lt;entry&gt;volume&lt;/entry&gt;&lt;entry&gt;The volume setting on a scale of 0-65535&lt;/entry&gt;</div><div class='del'>-   &lt;/row&gt;&lt;row&gt;</div><div class='del'>-   &lt;entry&gt;base&lt;/entry&gt;&lt;entry&gt;The base level on a scale of 0-65535&lt;/entry&gt;</div><div class='del'>-   &lt;/row&gt;&lt;row&gt;</div><div class='del'>-   &lt;entry&gt;treble&lt;/entry&gt;&lt;entry&gt;The treble level on a scale of 0-65535&lt;/entry&gt;</div><div class='del'>-   &lt;/row&gt;&lt;row&gt;</div><div class='del'>-   &lt;entry&gt;flags&lt;/entry&gt;&lt;entry&gt;The features this audio device supports</div><div class='del'>-   &lt;/entry&gt;</div><div class='del'>-   &lt;/row&gt;&lt;row&gt;</div><div class='del'>-   &lt;entry&gt;name&lt;/entry&gt;&lt;entry&gt;A text name to display to the user. We picked</div><div class='del'>-                        "Radio" as it explains things quite nicely.&lt;/entry&gt;</div><div class='del'>-   &lt;/row&gt;&lt;row&gt;</div><div class='del'>-   &lt;entry&gt;mode&lt;/entry&gt;&lt;entry&gt;The current reception mode for the audio</div><div class='del'>-</div><div class='del'>-                We report MONO because our card is too stupid to know if it is in</div><div class='del'>-                mono or stereo. </div><div class='del'>-   &lt;/entry&gt;</div><div class='del'>-   &lt;/row&gt;&lt;row&gt;</div><div class='del'>-   &lt;entry&gt;balance&lt;/entry&gt;&lt;entry&gt;The stereo balance on a scale of 0-65535, 32768 is</div><div class='del'>-                        middle.&lt;/entry&gt;</div><div class='del'>-   &lt;/row&gt;&lt;row&gt;</div><div class='del'>-   &lt;entry&gt;step&lt;/entry&gt;&lt;entry&gt;The step by which the volume control jumps. This is</div><div class='del'>-                        used to help make it easy for applications to set </div><div class='del'>-                        slider behaviour.&lt;/entry&gt;</div><div class='del'>-   &lt;/row&gt;</div><div class='del'>-   &lt;/tbody&gt;</div><div class='del'>-   &lt;/tgroup&gt;</div><div class='del'>-   &lt;/table&gt;</div><div class='del'>-</div><div class='del'>-   &lt;table frame="all" id="video_audio_flags"&gt;&lt;title&gt;struct video_audio flags&lt;/title&gt;</div><div class='del'>-   &lt;tgroup cols="2" align="left"&gt;</div><div class='del'>-   &lt;tbody&gt;</div><div class='del'>-   &lt;row&gt;</div><div class='del'>-                &lt;entry&gt;VIDEO_AUDIO_MUTE&lt;/entry&gt;&lt;entry&gt;The audio is currently muted. We</div><div class='del'>-                                        could fake this in our driver but we</div><div class='del'>-                                        choose not to bother.&lt;/entry&gt;</div><div class='del'>-   &lt;/row&gt;&lt;row&gt;</div><div class='del'>-                &lt;entry&gt;VIDEO_AUDIO_MUTABLE&lt;/entry&gt;&lt;entry&gt;The input has a mute option&lt;/entry&gt;</div><div class='del'>-   &lt;/row&gt;&lt;row&gt;</div><div class='del'>-                &lt;entry&gt;VIDEO_AUDIO_TREBLE&lt;/entry&gt;&lt;entry&gt;The  input has a treble control&lt;/entry&gt;</div><div class='del'>-   &lt;/row&gt;&lt;row&gt;</div><div class='del'>-                &lt;entry&gt;VIDEO_AUDIO_BASS&lt;/entry&gt;&lt;entry&gt;The input has a base control&lt;/entry&gt;</div><div class='del'>-   &lt;/row&gt;</div><div class='del'>-   &lt;/tbody&gt;</div><div class='del'>-   &lt;/tgroup&gt;</div><div class='del'>-   &lt;/table&gt;</div><div class='del'>-</div><div class='del'>-   &lt;table frame="all" id="video_audio_modes"&gt;&lt;title&gt;struct video_audio modes&lt;/title&gt;</div><div class='del'>-   &lt;tgroup cols="2" align="left"&gt;</div><div class='del'>-   &lt;tbody&gt;</div><div class='del'>-   &lt;row&gt;</div><div class='del'>-                &lt;entry&gt;VIDEO_SOUND_MONO&lt;/entry&gt;&lt;entry&gt;Mono sound&lt;/entry&gt;</div><div class='del'>-   &lt;/row&gt;&lt;row&gt;</div><div class='del'>-                &lt;entry&gt;VIDEO_SOUND_STEREO&lt;/entry&gt;&lt;entry&gt;Stereo sound&lt;/entry&gt;</div><div class='del'>-   &lt;/row&gt;&lt;row&gt;</div><div class='del'>-                &lt;entry&gt;VIDEO_SOUND_LANG1&lt;/entry&gt;&lt;entry&gt;Alternative language 1 (TV specific)&lt;/entry&gt;</div><div class='del'>-   &lt;/row&gt;&lt;row&gt;</div><div class='del'>-                &lt;entry&gt;VIDEO_SOUND_LANG2&lt;/entry&gt;&lt;entry&gt;Alternative language 2 (TV specific)&lt;/entry&gt;</div><div class='del'>-   &lt;/row&gt;</div><div class='del'>-   &lt;/tbody&gt;</div><div class='del'>-   &lt;/tgroup&gt;</div><div class='del'>-   &lt;/table&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        Having filled in the structure we copy it back to user space.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        The VIDIOCSAUDIO ioctl allows the user to set the audio parameters in the</div><div class='del'>-        video_audio structure. The driver does its best to honour the request.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;programlisting&gt;</div><div class='del'>-</div><div class='del'>-                case VIDIOCSAUDIO:</div><div class='del'>-                {</div><div class='del'>-                        struct video_audio v;</div><div class='del'>-                        if(copy_from_user(&amp;amp;v, arg, sizeof(v)))</div><div class='del'>-                                return -EFAULT;</div><div class='del'>-                        if(v.audio)</div><div class='del'>-                                return -EINVAL;</div><div class='del'>-                        current_volume = v/16384;</div><div class='del'>-                        hardware_set_volume(current_volume);</div><div class='del'>-                        return 0;</div><div class='del'>-                }</div><div class='del'>-</div><div class='del'>-  &lt;/programlisting&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        In our case there is very little that the user can set. The volume is</div><div class='del'>-        basically the limit. Note that we could pretend to have a mute feature</div><div class='del'>-        by rewriting this to </div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;programlisting&gt;</div><div class='del'>-</div><div class='del'>-                case VIDIOCSAUDIO:</div><div class='del'>-                {</div><div class='del'>-                        struct video_audio v;</div><div class='del'>-                        if(copy_from_user(&amp;amp;v, arg, sizeof(v)))</div><div class='del'>-                                return -EFAULT;</div><div class='del'>-                        if(v.audio)</div><div class='del'>-                                return -EINVAL;</div><div class='del'>-                        current_volume = v/16384;</div><div class='del'>-                        if(v.flags&amp;amp;VIDEO_AUDIO_MUTE)</div><div class='del'>-                                hardware_set_volume(0);</div><div class='del'>-                        else</div><div class='del'>-                                hardware_set_volume(current_volume);</div><div class='del'>-                        current_muted = v.flags &amp;amp; </div><div class='del'>-                                              VIDEO_AUDIO_MUTE;</div><div class='del'>-                        return 0;</div><div class='del'>-                }</div><div class='del'>-</div><div class='del'>-  &lt;/programlisting&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        This with the corresponding changes to the VIDIOCGAUDIO code to report the</div><div class='del'>-        state of the mute flag we save and to report the card has a mute function,</div><div class='del'>-        will allow applications to use a mute facility with this card. It is</div><div class='del'>-        questionable whether this is a good idea however. User applications can already</div><div class='del'>-        fake this themselves and kernel space is precious.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        We now have a working radio ioctl handler. So we just wrap up the function</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;programlisting&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-        }</div><div class='del'>-        return -ENOIOCTLCMD;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-  &lt;/programlisting&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        and pass the Video4Linux layer back an error so that it knows we did not</div><div class='del'>-        understand the request we got passed.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-  &lt;sect1 id="modradio"&gt;</div><div class='del'>-  &lt;title&gt;Module Wrapper&lt;/title&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        Finally we add in the usual module wrapping and the driver is done.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;programlisting&gt;</div><div class='del'>-</div><div class='del'>-#ifndef MODULE</div><div class='del'>-</div><div class='del'>-static int io = 0x300;</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-</div><div class='del'>-static int io = -1;</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-MODULE_AUTHOR("Alan Cox");</div><div class='del'>-MODULE_DESCRIPTION("A driver for an imaginary radio card.");</div><div class='del'>-module_param(io, int, 0444);</div><div class='del'>-MODULE_PARM_DESC(io, "I/O address of the card.");</div><div class='del'>-</div><div class='del'>-static int __init init(void)</div><div class='del'>-{</div><div class='del'>-        if(io==-1)</div><div class='del'>-        {</div><div class='del'>-                printk(KERN_ERR </div><div class='del'>-         "You must set an I/O address with io=0x???\n");</div><div class='del'>-                return -EINVAL;</div><div class='del'>-        }</div><div class='del'>-        return myradio_init(NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit cleanup(void)</div><div class='del'>-{</div><div class='del'>-        video_unregister_device(&amp;amp;my_radio);</div><div class='del'>-        release_region(io, MY_IO_SIZE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(init);</div><div class='del'>-module_exit(cleanup);</div><div class='del'>-</div><div class='del'>-  &lt;/programlisting&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        In this example we set the IO base by default if the driver is compiled into</div><div class='del'>-        the kernel: you can still set it using "my_radio.irq" if this file is called &lt;filename&gt;my_radio.c&lt;/filename&gt;. For the module we require the</div><div class='del'>-        user sets the parameter. We set io to a nonsense port (-1) so that we can</div><div class='del'>-        tell if the user supplied an io parameter or not.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        We use MODULE_ defines to give an author for the card driver and a</div><div class='del'>-        description. We also use them to declare that io is an integer and it is the</div><div class='del'>-        address of the card, and can be read by anyone from sysfs.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        The clean-up routine unregisters the video_device we registered, and frees</div><div class='del'>-        up the I/O space. Note that the unregister takes the actual video_device</div><div class='del'>-        structure as its argument. Unlike the file operations structure which can be</div><div class='del'>-        shared by all instances of a device a video_device structure as an actual</div><div class='del'>-        instance of the device. If you are registering multiple radio devices you</div><div class='del'>-        need to fill in one structure per device (most likely by setting up a</div><div class='del'>-        template and copying it to each of the actual device structures).</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-  &lt;/chapter&gt;</div><div class='del'>-  &lt;chapter id="Video_Capture_Devices"&gt;</div><div class='del'>-        &lt;title&gt;Video Capture Devices&lt;/title&gt;</div><div class='del'>-  &lt;sect1 id="introvid"&gt;</div><div class='del'>-  &lt;title&gt;Video Capture Device Types&lt;/title&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        The video capture devices share the same interfaces as radio devices. In</div><div class='del'>-        order to explain the video capture interface I will use the example of a</div><div class='del'>-        camera that has no tuners or audio input. This keeps the example relatively</div><div class='del'>-        clean. To get both combine the two driver examples.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        Video capture devices divide into four categories. A little technology</div><div class='del'>-        backgrounder. Full motion video even at television resolution (which is</div><div class='del'>-        actually fairly low) is pretty resource-intensive. You are continually</div><div class='del'>-        passing megabytes of data every second from the capture card to the display. </div><div class='del'>-        several alternative approaches have emerged because copying this through the </div><div class='del'>-        processor and the user program is a particularly bad idea .</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        The first is to add the television image onto the video output directly.</div><div class='del'>-        This is also how some 3D cards work. These basic cards can generally drop the</div><div class='del'>-        video into any chosen rectangle of the display. Cards like this, which</div><div class='del'>-        include most mpeg1 cards that used the feature connector,  aren't very</div><div class='del'>-        friendly in a windowing environment. They don't understand windows or</div><div class='del'>-        clipping. The video window is always on the top of the display.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        Chroma keying is a technique used by cards to get around this. It is an old</div><div class='del'>-        television mixing trick where you mark all the areas you wish to replace</div><div class='del'>-        with a single clear colour that isn't used in the image - TV people use an</div><div class='del'>-        incredibly bright blue while computing people often use a particularly</div><div class='del'>-        virulent purple. Bright blue occurs on the desktop. Anyone with virulent</div><div class='del'>-        purple windows has another problem besides their TV overlay.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        The third approach is to copy the data from the capture card to the video</div><div class='del'>-        card, but to do it directly across the PCI bus. This relieves the processor</div><div class='del'>-        from doing the work but does require some smartness on the part of the video</div><div class='del'>-        capture chip, as well as a suitable video card. Programming this kind of</div><div class='del'>-        card and more so debugging it can be extremely tricky. There are some quite</div><div class='del'>-        complicated interactions with the display and you may also have to cope with</div><div class='del'>-        various chipset bugs that show up when PCI cards start talking to each</div><div class='del'>-        other. </div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        To keep our example fairly simple we will assume a card that supports</div><div class='del'>-        overlaying a flat rectangular image onto the frame buffer output, and which</div><div class='del'>-        can also capture stuff into processor memory.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-  &lt;sect1 id="regvid"&gt;</div><div class='del'>-  &lt;title&gt;Registering Video Capture Devices&lt;/title&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        This time we need to add more functions for our camera device.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;programlisting&gt;</div><div class='del'>-static struct video_device my_camera</div><div class='del'>-{</div><div class='del'>-        "My Camera",</div><div class='del'>-        VID_TYPE_OVERLAY|VID_TYPE_SCALES|\</div><div class='del'>-        VID_TYPE_CAPTURE|VID_TYPE_CHROMAKEY,</div><div class='del'>-        camera_open.</div><div class='del'>-        camera_close,</div><div class='del'>-        camera_read,      /* no read */</div><div class='del'>-        NULL,             /* no write */</div><div class='del'>-        camera_poll,      /* no poll */</div><div class='del'>-        camera_ioctl,</div><div class='del'>-        NULL,             /* no special init function */</div><div class='del'>-        NULL              /* no private data */</div><div class='del'>-};</div><div class='del'>-  &lt;/programlisting&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        We need a read() function which is used for capturing data from</div><div class='del'>-        the card, and we need a poll function so that a driver can wait for the next</div><div class='del'>-        frame to be captured.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        We use the extra video capability flags that did not apply to the</div><div class='del'>-        radio interface. The video related flags are</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-   &lt;table frame="all" id="Capture_Capabilities"&gt;&lt;title&gt;Capture Capabilities&lt;/title&gt;</div><div class='del'>-   &lt;tgroup cols="2" align="left"&gt;</div><div class='del'>-   &lt;tbody&gt;</div><div class='del'>-   &lt;row&gt;</div><div class='del'>-&lt;entry&gt;VID_TYPE_CAPTURE&lt;/entry&gt;&lt;entry&gt;We support image capture&lt;/entry&gt;</div><div class='del'>-&lt;/row&gt;&lt;row&gt;</div><div class='del'>-&lt;entry&gt;VID_TYPE_TELETEXT&lt;/entry&gt;&lt;entry&gt;A teletext capture device (vbi{n])&lt;/entry&gt;</div><div class='del'>-&lt;/row&gt;&lt;row&gt;</div><div class='del'>-&lt;entry&gt;VID_TYPE_OVERLAY&lt;/entry&gt;&lt;entry&gt;The image can be directly overlaid onto the</div><div class='del'>-                                frame buffer&lt;/entry&gt;</div><div class='del'>-&lt;/row&gt;&lt;row&gt;</div><div class='del'>-&lt;entry&gt;VID_TYPE_CHROMAKEY&lt;/entry&gt;&lt;entry&gt;Chromakey can be used to select which parts</div><div class='del'>-                                of the image to display&lt;/entry&gt;</div><div class='del'>-&lt;/row&gt;&lt;row&gt;</div><div class='del'>-&lt;entry&gt;VID_TYPE_CLIPPING&lt;/entry&gt;&lt;entry&gt;It is possible to give the board a list of</div><div class='del'>-                                rectangles to draw around. &lt;/entry&gt;</div><div class='del'>-&lt;/row&gt;&lt;row&gt;</div><div class='del'>-&lt;entry&gt;VID_TYPE_FRAMERAM&lt;/entry&gt;&lt;entry&gt;The video capture goes into the video memory</div><div class='del'>-                                and actually changes it. Applications need</div><div class='del'>-                                to know this so they can clean up after the</div><div class='del'>-                                card&lt;/entry&gt;</div><div class='del'>-&lt;/row&gt;&lt;row&gt;</div><div class='del'>-&lt;entry&gt;VID_TYPE_SCALES&lt;/entry&gt;&lt;entry&gt;The image can be scaled to various sizes,</div><div class='del'>-                                rather than being a single fixed size.&lt;/entry&gt;</div><div class='del'>-&lt;/row&gt;&lt;row&gt;</div><div class='del'>-&lt;entry&gt;VID_TYPE_MONOCHROME&lt;/entry&gt;&lt;entry&gt;The capture will be monochrome. This isn't a</div><div class='del'>-                                complete answer to the question since a mono</div><div class='del'>-                                camera on a colour capture card will still</div><div class='del'>-                                produce mono output.&lt;/entry&gt;</div><div class='del'>-&lt;/row&gt;&lt;row&gt;</div><div class='del'>-&lt;entry&gt;VID_TYPE_SUBCAPTURE&lt;/entry&gt;&lt;entry&gt;The card allows only part of its field of</div><div class='del'>-                                view to be captured. This enables</div><div class='del'>-                                applications to avoid copying all of a large</div><div class='del'>-                                image into memory when only some section is</div><div class='del'>-                                relevant.&lt;/entry&gt;</div><div class='del'>-    &lt;/row&gt;</div><div class='del'>-    &lt;/tbody&gt;</div><div class='del'>-    &lt;/tgroup&gt;</div><div class='del'>-    &lt;/table&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        We set VID_TYPE_CAPTURE so that we are seen as a capture card,</div><div class='del'>-        VID_TYPE_CHROMAKEY so the application knows it is time to draw in virulent</div><div class='del'>-        purple, and VID_TYPE_SCALES because we can be resized.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        Our setup is fairly similar. This time we also want an interrupt line</div><div class='del'>-        for the 'frame captured' signal. Not all cards have this so some of them</div><div class='del'>-        cannot handle poll().</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;programlisting&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int io = 0x320;</div><div class='del'>-static int irq = 11;</div><div class='del'>-</div><div class='del'>-int __init mycamera_init(struct video_init *v)</div><div class='del'>-{</div><div class='del'>-        if(!request_region(io, MY_IO_SIZE, "mycamera"))</div><div class='del'>-        {</div><div class='del'>-                printk(KERN_ERR </div><div class='del'>-                      "mycamera: port 0x%03X is in use.\n", io);</div><div class='del'>-                return -EBUSY;</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-        if(video_device_register(&amp;amp;my_camera, </div><div class='del'>-            VFL_TYPE_GRABBER)==-1) {</div><div class='del'>-                release_region(io, MY_IO_SIZE);</div><div class='del'>-                return -EINVAL;</div><div class='del'>-        }</div><div class='del'>-        return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-  &lt;/programlisting&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        This is little changed from the needs of the radio card. We specify</div><div class='del'>-        VFL_TYPE_GRABBER this time as we want to be allocated a /dev/video name.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-  &lt;sect1 id="opvid"&gt;</div><div class='del'>-  &lt;title&gt;Opening And Closing The Capture Device&lt;/title&gt;</div><div class='del'>-  &lt;programlisting&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int users = 0;</div><div class='del'>-</div><div class='del'>-static int camera_open(struct video_device *dev, int flags)</div><div class='del'>-{</div><div class='del'>-        if(users)</div><div class='del'>-                return -EBUSY;</div><div class='del'>-        if(request_irq(irq, camera_irq, 0, "camera", dev)&amp;lt;0)</div><div class='del'>-                return -EBUSY;</div><div class='del'>-        users++;</div><div class='del'>-        return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int camera_close(struct video_device *dev)</div><div class='del'>-{</div><div class='del'>-        users--;</div><div class='del'>-        free_irq(irq, dev);</div><div class='del'>-}</div><div class='del'>-  &lt;/programlisting&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        The open and close routines are also quite similar. The only real change is</div><div class='del'>-        that we now request an interrupt for the camera device interrupt line. If we</div><div class='del'>-        cannot get the interrupt we report EBUSY to the application and give up.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-  &lt;sect1 id="irqvid"&gt;</div><div class='del'>-  &lt;title&gt;Interrupt Handling&lt;/title&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        Our example handler is for an ISA bus device. If it was PCI you would be</div><div class='del'>-        able to share the interrupt and would have set IRQF_SHARED to indicate a</div><div class='del'>-        shared IRQ. We pass the device pointer as the interrupt routine argument. We</div><div class='del'>-        don't need to since we only support one card but doing this will make it</div><div class='del'>-        easier to upgrade the driver for multiple devices in the future.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        Our interrupt routine needs to do little if we assume the card can simply</div><div class='del'>-        queue one frame to be read after it captures it. </div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;programlisting&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static struct wait_queue *capture_wait;</div><div class='del'>-static int capture_ready = 0;</div><div class='del'>-</div><div class='del'>-static void camera_irq(int irq, void *dev_id, </div><div class='del'>-                          struct pt_regs *regs)</div><div class='del'>-{</div><div class='del'>-        capture_ready=1;</div><div class='del'>-        wake_up_interruptible(&amp;amp;capture_wait);</div><div class='del'>-}</div><div class='del'>-  &lt;/programlisting&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        The interrupt handler is nice and simple for this card as we are assuming</div><div class='del'>-        the card is buffering the frame for us. This means we have little to do but</div><div class='del'>-        wake up        anybody interested. We also set a capture_ready flag, as we may</div><div class='del'>-        capture a frame before an application needs it. In this case we need to know</div><div class='del'>-        that a frame is ready. If we had to collect the frame on the interrupt life</div><div class='del'>-        would be more complex.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        The two new routines we need to supply are camera_read which returns a</div><div class='del'>-        frame, and camera_poll which waits for a frame to become ready.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;programlisting&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int camera_poll(struct video_device *dev, </div><div class='del'>-	struct file *file, struct poll_table *wait)</div><div class='del'>-{</div><div class='del'>-        poll_wait(file, &amp;amp;capture_wait, wait);</div><div class='del'>-        if(capture_read)</div><div class='del'>-                return POLLIN|POLLRDNORM;</div><div class='del'>-        return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-  &lt;/programlisting&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        Our wait queue for polling is the capture_wait queue. This will cause the</div><div class='del'>-        task to be woken up by our camera_irq routine. We check capture_read to see</div><div class='del'>-        if there is an image present and if so report that it is readable.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-  &lt;sect1 id="rdvid"&gt;</div><div class='del'>-  &lt;title&gt;Reading The Video Image&lt;/title&gt;</div><div class='del'>-  &lt;programlisting&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static long camera_read(struct video_device *dev, char *buf,</div><div class='del'>-                                unsigned long count)</div><div class='del'>-{</div><div class='del'>-        struct wait_queue wait = { current, NULL };</div><div class='del'>-        u8 *ptr;</div><div class='del'>-        int len;</div><div class='del'>-        int i;</div><div class='del'>-</div><div class='del'>-        add_wait_queue(&amp;amp;capture_wait, &amp;amp;wait);</div><div class='del'>-</div><div class='del'>-        while(!capture_ready)</div><div class='del'>-        {</div><div class='del'>-                if(file-&gt;flags&amp;amp;O_NDELAY)</div><div class='del'>-                {</div><div class='del'>-                        remove_wait_queue(&amp;amp;capture_wait, &amp;amp;wait);</div><div class='del'>-                        current-&gt;state = TASK_RUNNING;</div><div class='del'>-                        return -EWOULDBLOCK;</div><div class='del'>-                }</div><div class='del'>-                if(signal_pending(current))</div><div class='del'>-                {</div><div class='del'>-                        remove_wait_queue(&amp;amp;capture_wait, &amp;amp;wait);</div><div class='del'>-                        current-&gt;state = TASK_RUNNING;</div><div class='del'>-                        return -ERESTARTSYS;</div><div class='del'>-                }</div><div class='del'>-                schedule();</div><div class='del'>-                current-&gt;state = TASK_INTERRUPTIBLE;</div><div class='del'>-        }</div><div class='del'>-        remove_wait_queue(&amp;amp;capture_wait, &amp;amp;wait);</div><div class='del'>-        current-&gt;state = TASK_RUNNING;</div><div class='del'>-</div><div class='del'>-  &lt;/programlisting&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        The first thing we have to do is to ensure that the application waits until</div><div class='del'>-        the next frame is ready. The code here is almost identical to the mouse code</div><div class='del'>-        we used earlier in this chapter. It is one of the common building blocks of</div><div class='del'>-        Linux device driver code and probably one which you will find occurs in any</div><div class='del'>-        drivers you write.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        We wait for a frame to be ready, or for a signal to interrupt our waiting. If a</div><div class='del'>-        signal occurs we need to return from the system call so that the signal can</div><div class='del'>-        be sent to the application itself. We also check to see if the user actually</div><div class='del'>-        wanted to avoid waiting - ie  if they are using non-blocking I/O and have other things </div><div class='del'>-        to get on with.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        Next we copy the data from the card to the user application. This is rarely</div><div class='del'>-        as easy as our example makes out. We will add capture_w, and capture_h here</div><div class='del'>-        to hold the width and height of the captured image. We assume the card only</div><div class='del'>-        supports 24bit RGB for now.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;programlisting&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-        capture_ready = 0;</div><div class='del'>-</div><div class='del'>-        ptr=(u8 *)buf;</div><div class='del'>-        len = capture_w * 3 * capture_h; /* 24bit RGB */</div><div class='del'>-</div><div class='del'>-        if(len&gt;count)</div><div class='del'>-                len=count;  /* Doesn't all fit */</div><div class='del'>-</div><div class='del'>-        for(i=0; i&amp;lt;len; i++)</div><div class='del'>-        {</div><div class='del'>-                put_user(inb(io+IMAGE_DATA), ptr);</div><div class='del'>-                ptr++;</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-        hardware_restart_capture();</div><div class='del'>-                </div><div class='del'>-        return i;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-  &lt;/programlisting&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        For a real hardware device you would try to avoid the loop with put_user().</div><div class='del'>-        Each call to put_user() has a time overhead checking whether the accesses to user</div><div class='del'>-        space are allowed. It would be better to read a line into a temporary buffer</div><div class='del'>-        then copy this to user space in one go.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        Having captured the image and put it into user space we can kick the card to</div><div class='del'>-        get the next frame acquired.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-  &lt;sect1 id="iocvid"&gt;</div><div class='del'>-  &lt;title&gt;Video Ioctl Handling&lt;/title&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        As with the radio driver the major control interface is via the ioctl()</div><div class='del'>-        function. Video capture devices support the same tuner calls as a radio</div><div class='del'>-        device and also support additional calls to control how the video functions</div><div class='del'>-        are handled. In this simple example the card has no tuners to avoid making</div><div class='del'>-        the code complex. </div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;programlisting&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int camera_ioctl(struct video_device *dev, unsigned int cmd, void *arg)</div><div class='del'>-{</div><div class='del'>-        switch(cmd)</div><div class='del'>-        {</div><div class='del'>-                case VIDIOCGCAP:</div><div class='del'>-                {</div><div class='del'>-                        struct video_capability v;</div><div class='del'>-                        v.type = VID_TYPE_CAPTURE|\</div><div class='del'>-                                 VID_TYPE_CHROMAKEY|\</div><div class='del'>-                                 VID_TYPE_SCALES|\</div><div class='del'>-                                 VID_TYPE_OVERLAY;</div><div class='del'>-                        v.channels = 1;</div><div class='del'>-                        v.audios = 0;</div><div class='del'>-                        v.maxwidth = 640;</div><div class='del'>-                        v.minwidth = 16;</div><div class='del'>-                        v.maxheight = 480;</div><div class='del'>-                        v.minheight = 16;</div><div class='del'>-                        strcpy(v.name, "My Camera");</div><div class='del'>-                        if(copy_to_user(arg, &amp;amp;v, sizeof(v)))</div><div class='del'>-                                return -EFAULT;</div><div class='del'>-                        return 0;</div><div class='del'>-                }</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-  &lt;/programlisting&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        The first ioctl we must support and which all video capture and radio</div><div class='del'>-        devices are required to support is VIDIOCGCAP. This behaves exactly the same</div><div class='del'>-        as with a radio device. This time, however, we report the extra capabilities</div><div class='del'>-        we outlined earlier on when defining our video_dev structure.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        We now set the video flags saying that we support overlay, capture,</div><div class='del'>-        scaling and chromakey. We also report size limits - our smallest image is</div><div class='del'>-        16x16 pixels, our largest is 640x480. </div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        To keep things simple we report no audio and no tuning capabilities at all.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;programlisting&gt;        </div><div class='del'>-</div><div class='del'>-                case VIDIOCGCHAN:</div><div class='del'>-                {</div><div class='del'>-                        struct video_channel v;</div><div class='del'>-                        if(copy_from_user(&amp;amp;v, arg, sizeof(v)))</div><div class='del'>-                                return -EFAULT;</div><div class='del'>-                        if(v.channel != 0)</div><div class='del'>-                                return -EINVAL;</div><div class='del'>-                        v.flags = 0;</div><div class='del'>-                        v.tuners = 0;</div><div class='del'>-                        v.type = VIDEO_TYPE_CAMERA;</div><div class='del'>-                        v.norm = VIDEO_MODE_AUTO;</div><div class='del'>-                        strcpy(v.name, "Camera Input");break;</div><div class='del'>-                        if(copy_to_user(&amp;amp;v, arg, sizeof(v)))</div><div class='del'>-                                return -EFAULT;</div><div class='del'>-                        return 0;</div><div class='del'>-                }</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-  &lt;/programlisting&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        This follows what is very much the standard way an ioctl handler looks</div><div class='del'>-        in Linux. We copy the data into a kernel space variable and we check that the</div><div class='del'>-        request is valid (in this case that the input is 0). Finally we copy the</div><div class='del'>-        camera info back to the user.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        The VIDIOCGCHAN ioctl allows a user to ask about video channels (that is</div><div class='del'>-        inputs to the video card). Our example card has a single camera input. The</div><div class='del'>-        fields in the structure are</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-   &lt;table frame="all" id="video_channel_fields"&gt;&lt;title&gt;struct video_channel fields&lt;/title&gt;</div><div class='del'>-   &lt;tgroup cols="2" align="left"&gt;</div><div class='del'>-   &lt;tbody&gt;</div><div class='del'>-   &lt;row&gt;</div><div class='del'>-</div><div class='del'>-   &lt;entry&gt;channel&lt;/entry&gt;&lt;entry&gt;The channel number we are selecting&lt;/entry&gt;</div><div class='del'>-   &lt;/row&gt;&lt;row&gt;</div><div class='del'>-   &lt;entry&gt;name&lt;/entry&gt;&lt;entry&gt;The name for this channel. This is intended</div><div class='del'>-                   to describe the port to the user.</div><div class='del'>-                   Appropriate names are therefore things like</div><div class='del'>-                   "Camera" "SCART input"&lt;/entry&gt;</div><div class='del'>-   &lt;/row&gt;&lt;row&gt;</div><div class='del'>-   &lt;entry&gt;flags&lt;/entry&gt;&lt;entry&gt;Channel properties&lt;/entry&gt;</div><div class='del'>-   &lt;/row&gt;&lt;row&gt;</div><div class='del'>-   &lt;entry&gt;type&lt;/entry&gt;&lt;entry&gt;Input type&lt;/entry&gt;</div><div class='del'>-   &lt;/row&gt;&lt;row&gt;</div><div class='del'>-   &lt;entry&gt;norm&lt;/entry&gt;&lt;entry&gt;The current television encoding being used</div><div class='del'>-                   if relevant for this channel.</div><div class='del'>-    &lt;/entry&gt;</div><div class='del'>-    &lt;/row&gt;</div><div class='del'>-    &lt;/tbody&gt;</div><div class='del'>-    &lt;/tgroup&gt;</div><div class='del'>-    &lt;/table&gt;</div><div class='del'>-    &lt;table frame="all" id="video_channel_flags"&gt;&lt;title&gt;struct video_channel flags&lt;/title&gt;</div><div class='del'>-    &lt;tgroup cols="2" align="left"&gt;</div><div class='del'>-    &lt;tbody&gt;</div><div class='del'>-    &lt;row&gt;</div><div class='del'>-        &lt;entry&gt;VIDEO_VC_TUNER&lt;/entry&gt;&lt;entry&gt;Channel has a tuner.&lt;/entry&gt;</div><div class='del'>-   &lt;/row&gt;&lt;row&gt;</div><div class='del'>-        &lt;entry&gt;VIDEO_VC_AUDIO&lt;/entry&gt;&lt;entry&gt;Channel has audio.&lt;/entry&gt;</div><div class='del'>-    &lt;/row&gt;</div><div class='del'>-    &lt;/tbody&gt;</div><div class='del'>-    &lt;/tgroup&gt;</div><div class='del'>-    &lt;/table&gt;</div><div class='del'>-    &lt;table frame="all" id="video_channel_types"&gt;&lt;title&gt;struct video_channel types&lt;/title&gt;</div><div class='del'>-    &lt;tgroup cols="2" align="left"&gt;</div><div class='del'>-    &lt;tbody&gt;</div><div class='del'>-    &lt;row&gt;</div><div class='del'>-        &lt;entry&gt;VIDEO_TYPE_TV&lt;/entry&gt;&lt;entry&gt;Television input.&lt;/entry&gt;</div><div class='del'>-   &lt;/row&gt;&lt;row&gt;</div><div class='del'>-        &lt;entry&gt;VIDEO_TYPE_CAMERA&lt;/entry&gt;&lt;entry&gt;Fixed camera input.&lt;/entry&gt;</div><div class='del'>-   &lt;/row&gt;&lt;row&gt;</div><div class='del'>-	&lt;entry&gt;0&lt;/entry&gt;&lt;entry&gt;Type is unknown.&lt;/entry&gt;</div><div class='del'>-    &lt;/row&gt;</div><div class='del'>-    &lt;/tbody&gt;</div><div class='del'>-    &lt;/tgroup&gt;</div><div class='del'>-    &lt;/table&gt;</div><div class='del'>-    &lt;table frame="all" id="video_channel_norms"&gt;&lt;title&gt;struct video_channel norms&lt;/title&gt;</div><div class='del'>-    &lt;tgroup cols="2" align="left"&gt;</div><div class='del'>-    &lt;tbody&gt;</div><div class='del'>-    &lt;row&gt;</div><div class='del'>-        &lt;entry&gt;VIDEO_MODE_PAL&lt;/entry&gt;&lt;entry&gt;PAL encoded Television&lt;/entry&gt;</div><div class='del'>-   &lt;/row&gt;&lt;row&gt;</div><div class='del'>-        &lt;entry&gt;VIDEO_MODE_NTSC&lt;/entry&gt;&lt;entry&gt;NTSC (US) encoded Television&lt;/entry&gt;</div><div class='del'>-   &lt;/row&gt;&lt;row&gt;</div><div class='del'>-        &lt;entry&gt;VIDEO_MODE_SECAM&lt;/entry&gt;&lt;entry&gt;SECAM (French) Television &lt;/entry&gt;</div><div class='del'>-   &lt;/row&gt;&lt;row&gt;</div><div class='del'>-        &lt;entry&gt;VIDEO_MODE_AUTO&lt;/entry&gt;&lt;entry&gt;Automatic switching, or format does not</div><div class='del'>-                                matter&lt;/entry&gt;</div><div class='del'>-    &lt;/row&gt;</div><div class='del'>-    &lt;/tbody&gt;</div><div class='del'>-    &lt;/tgroup&gt;</div><div class='del'>-    &lt;/table&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-        The corresponding VIDIOCSCHAN ioctl allows a user to change channel and to</div><div class='del'>-        request the norm is changed - for example to switch between a PAL or an NTSC</div><div class='del'>-        format camera.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;programlisting&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-                case VIDIOCSCHAN:</div><div class='del'>-                {</div><div class='del'>-                        struct video_channel v;</div><div class='del'>-                        if(copy_from_user(&amp;amp;v, arg, sizeof(v)))</div><div class='del'>-                                return -EFAULT;</div><div class='del'>-                        if(v.channel != 0)</div><div class='del'>-                                return -EINVAL;</div><div class='del'>-                        if(v.norm != VIDEO_MODE_AUTO)</div><div class='del'>-                                return -EINVAL;</div><div class='del'>-                        return 0;</div><div class='del'>-                }</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-  &lt;/programlisting&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        The implementation of this call in our driver is remarkably easy. Because we</div><div class='del'>-        are assuming fixed format hardware we need only check that the user has not</div><div class='del'>-        tried to change anything. </div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        The user also needs to be able to configure and adjust the picture they are</div><div class='del'>-        seeing. This is much like adjusting a television set. A user application</div><div class='del'>-        also needs to know the palette being used so that it knows how to display</div><div class='del'>-        the image that has been captured. The VIDIOCGPICT and VIDIOCSPICT ioctl</div><div class='del'>-        calls provide this information.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;programlisting&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-                case VIDIOCGPICT</div><div class='del'>-                {</div><div class='del'>-                        struct video_picture v;</div><div class='del'>-                        v.brightness = hardware_brightness();</div><div class='del'>-                        v.hue = hardware_hue();</div><div class='del'>-                        v.colour = hardware_saturation();</div><div class='del'>-                        v.contrast = hardware_brightness();</div><div class='del'>-                        /* Not settable */</div><div class='del'>-                        v.whiteness = 32768;</div><div class='del'>-                        v.depth = 24;           /* 24bit */</div><div class='del'>-                        v.palette = VIDEO_PALETTE_RGB24;</div><div class='del'>-                        if(copy_to_user(&amp;amp;v, arg, </div><div class='del'>-                             sizeof(v)))</div><div class='del'>-                                return -EFAULT;</div><div class='del'>-                        return 0;</div><div class='del'>-                }</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-  &lt;/programlisting&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        The brightness, hue, color, and contrast provide the picture controls that</div><div class='del'>-        are akin to a conventional television. Whiteness provides additional</div><div class='del'>-        control for greyscale images. All of these values are scaled between 0-65535</div><div class='del'>-        and have 32768 as the mid point setting. The scaling means that applications</div><div class='del'>-        do not have to worry about the capability range of the hardware but can let</div><div class='del'>-        it make a best effort attempt.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        Our depth is 24, as this is in bits. We will be returning RGB24 format. This</div><div class='del'>-        has one byte of red, then one of green, then one of blue. This then repeats</div><div class='del'>-        for every other pixel in the image. The other common formats the interface </div><div class='del'>-        defines are</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-   &lt;table frame="all" id="Framebuffer_Encodings"&gt;&lt;title&gt;Framebuffer Encodings&lt;/title&gt;</div><div class='del'>-   &lt;tgroup cols="2" align="left"&gt;</div><div class='del'>-   &lt;tbody&gt;</div><div class='del'>-   &lt;row&gt;</div><div class='del'>-   &lt;entry&gt;GREY&lt;/entry&gt;&lt;entry&gt;Linear greyscale. This is for simple cameras and the</div><div class='del'>-                        like&lt;/entry&gt;</div><div class='del'>-   &lt;/row&gt;&lt;row&gt;</div><div class='del'>-   &lt;entry&gt;RGB565&lt;/entry&gt;&lt;entry&gt;The top 5 bits hold 32 red levels, the next six bits</div><div class='del'>-                        hold green and the low 5 bits hold blue. &lt;/entry&gt;</div><div class='del'>-   &lt;/row&gt;&lt;row&gt;</div><div class='del'>-   &lt;entry&gt;RGB555&lt;/entry&gt;&lt;entry&gt;The top bit is clear. The red green and blue levels</div><div class='del'>-                        each occupy five bits.&lt;/entry&gt;</div><div class='del'>-    &lt;/row&gt;</div><div class='del'>-    &lt;/tbody&gt;</div><div class='del'>-    &lt;/tgroup&gt;</div><div class='del'>-    &lt;/table&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        Additional modes are support for YUV capture formats. These are common for</div><div class='del'>-        TV and video conferencing applications.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        The VIDIOCSPICT ioctl allows a user to set some of the picture parameters.</div><div class='del'>-        Exactly which ones are supported depends heavily on the card itself. It is</div><div class='del'>-        possible to support many modes and effects in software. In general doing</div><div class='del'>-        this in the kernel is a bad idea. Video capture is a performance-sensitive</div><div class='del'>-        application and the programs can often do better if they aren't being</div><div class='del'>-        'helped' by an overkeen driver writer. Thus for our device we will report</div><div class='del'>-        RGB24 only and refuse to allow a change.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;programlisting&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-                case VIDIOCSPICT:</div><div class='del'>-                {</div><div class='del'>-                        struct video_picture v;</div><div class='del'>-                        if(copy_from_user(&amp;amp;v, arg, sizeof(v)))</div><div class='del'>-                                return -EFAULT;</div><div class='del'>-                        if(v.depth!=24 || </div><div class='del'>-                           v.palette != VIDEO_PALETTE_RGB24)</div><div class='del'>-                                return -EINVAL;</div><div class='del'>-                        set_hardware_brightness(v.brightness);</div><div class='del'>-                        set_hardware_hue(v.hue);</div><div class='del'>-                        set_hardware_saturation(v.colour);</div><div class='del'>-                        set_hardware_brightness(v.contrast);</div><div class='del'>-                        return 0;</div><div class='del'>-                }</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-  &lt;/programlisting&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        We check the user has not tried to change the palette or the depth. We do</div><div class='del'>-        not want to carry out some of the changes and then return an error. This may</div><div class='del'>-        confuse the application which will be assuming no change occurred.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        In much the same way as you need to be able to set the picture controls to</div><div class='del'>-        get the right capture images, many cards need to know what they are</div><div class='del'>-        displaying onto when generating overlay output. In some cases getting this</div><div class='del'>-        wrong even makes a nasty mess or may crash the computer. For that reason</div><div class='del'>-        the VIDIOCSBUF ioctl used to set up the frame buffer information may well</div><div class='del'>-        only be usable by root.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        We will assume our card is one of the old ISA devices with feature connector</div><div class='del'>-        and only supports a couple of standard video modes. Very common for older</div><div class='del'>-        cards although the PCI devices are way smarter than this.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;programlisting&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static struct video_buffer capture_fb;</div><div class='del'>-</div><div class='del'>-                case VIDIOCGFBUF:</div><div class='del'>-                {</div><div class='del'>-                        if(copy_to_user(arg, &amp;amp;capture_fb, </div><div class='del'>-                             sizeof(capture_fb)))</div><div class='del'>-                                return -EFAULT;</div><div class='del'>-                        return 0;</div><div class='del'>-                        </div><div class='del'>-                }</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-  &lt;/programlisting&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        We keep the frame buffer information in the format the ioctl uses. This</div><div class='del'>-        makes it nice and easy to work with in the ioctl calls.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;programlisting&gt;</div><div class='del'>-</div><div class='del'>-                case VIDIOCSFBUF:</div><div class='del'>-                {</div><div class='del'>-                        struct video_buffer v;</div><div class='del'>-</div><div class='del'>-                        if(!capable(CAP_SYS_ADMIN))</div><div class='del'>-                                return -EPERM;</div><div class='del'>-</div><div class='del'>-                        if(copy_from_user(&amp;amp;v, arg, sizeof(v)))</div><div class='del'>-                                return -EFAULT;</div><div class='del'>-                        if(v.width!=320 &amp;amp;&amp;amp; v.width!=640)</div><div class='del'>-                                return -EINVAL;</div><div class='del'>-                        if(v.height!=200 &amp;amp;&amp;amp; v.height!=240 </div><div class='del'>-                                &amp;amp;&amp;amp; v.height!=400</div><div class='del'>-                                &amp;amp;&amp;amp; v.height !=480)</div><div class='del'>-                                return -EINVAL;</div><div class='del'>-                        memcpy(&amp;amp;capture_fb, &amp;amp;v, sizeof(v));</div><div class='del'>-                        hardware_set_fb(&amp;amp;v);</div><div class='del'>-                        return 0;</div><div class='del'>-                }</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-  &lt;/programlisting&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        The capable() function checks a user has the required capability. The Linux</div><div class='del'>-        operating system has a set of about 30 capabilities indicating privileged</div><div class='del'>-        access to services. The default set up gives the superuser (uid 0) all of</div><div class='del'>-        them and nobody else has any.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        We check that the user has the SYS_ADMIN capability, that is they are</div><div class='del'>-        allowed to operate as the machine administrator. We don't want anyone but</div><div class='del'>-        the administrator making a mess of the display.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        Next we check for standard PC video modes (320 or 640 wide with either</div><div class='del'>-        EGA or VGA depths). If the mode is not a standard video mode we reject it as</div><div class='del'>-        not supported by our card. If the mode is acceptable we save it so that</div><div class='del'>-        VIDIOCFBUF will give the right answer next time it is called.  The</div><div class='del'>-        hardware_set_fb() function is some undescribed card specific function to</div><div class='del'>-        program the card for the desired mode.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        Before the driver can display an overlay window it needs to know where the</div><div class='del'>-        window should be placed, and also how large it should be. If the card</div><div class='del'>-        supports clipping it needs to know which rectangles to omit from the</div><div class='del'>-        display. The video_window structure is used to describe the way the image </div><div class='del'>-        should be displayed. </div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-   &lt;table frame="all" id="video_window_fields"&gt;&lt;title&gt;struct video_window fields&lt;/title&gt;</div><div class='del'>-   &lt;tgroup cols="2" align="left"&gt;</div><div class='del'>-   &lt;tbody&gt;</div><div class='del'>-   &lt;row&gt;</div><div class='del'>-        &lt;entry&gt;width&lt;/entry&gt;&lt;entry&gt;The width in pixels of the desired image. The card</div><div class='del'>-                        may use a smaller size if this size is not available&lt;/entry&gt;</div><div class='del'>-	&lt;/row&gt;&lt;row&gt;</div><div class='del'>-        &lt;entry&gt;height&lt;/entry&gt;&lt;entry&gt;The height of the image. The card may use a smaller</div><div class='del'>-                        size if this size is not available.&lt;/entry&gt;</div><div class='del'>-	&lt;/row&gt;&lt;row&gt;</div><div class='del'>-        &lt;entry&gt;x&lt;/entry&gt;&lt;entry&gt;   The X position of the top left of the window. This</div><div class='del'>-                        is in pixels relative to the left hand edge of the</div><div class='del'>-                        picture. Not all cards can display images aligned on</div><div class='del'>-                        any pixel boundary. If the position is unsuitable</div><div class='del'>-                        the card adjusts the image right and reduces the</div><div class='del'>-                        width.&lt;/entry&gt;</div><div class='del'>-	&lt;/row&gt;&lt;row&gt;</div><div class='del'>-        &lt;entry&gt;y&lt;/entry&gt;&lt;entry&gt;   The Y position of the top left of the window. This</div><div class='del'>-                        is counted in pixels relative to the top edge of the</div><div class='del'>-                        picture. As with the width if the card cannot</div><div class='del'>-                        display  starting on this line it will adjust the</div><div class='del'>-                        values.&lt;/entry&gt;</div><div class='del'>-	&lt;/row&gt;&lt;row&gt;</div><div class='del'>-        &lt;entry&gt;chromakey&lt;/entry&gt;&lt;entry&gt;The colour (expressed in RGB32 format) for the</div><div class='del'>-                        chromakey colour if chroma keying is being used. &lt;/entry&gt;</div><div class='del'>-	&lt;/row&gt;&lt;row&gt;</div><div class='del'>-        &lt;entry&gt;clips&lt;/entry&gt;&lt;entry&gt;An array of rectangles that must not be drawn</div><div class='del'>-			over.&lt;/entry&gt;</div><div class='del'>-	&lt;/row&gt;&lt;row&gt;</div><div class='del'>-        &lt;entry&gt;clipcount&lt;/entry&gt;&lt;entry&gt;The number of clips in this array.&lt;/entry&gt;</div><div class='del'>-    &lt;/row&gt;</div><div class='del'>-    &lt;/tbody&gt;</div><div class='del'>-    &lt;/tgroup&gt;</div><div class='del'>-    &lt;/table&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-        Each clip is a struct video_clip which has the following fields</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-   &lt;table frame="all" id="video_clip_fields"&gt;&lt;title&gt;video_clip fields&lt;/title&gt;</div><div class='del'>-   &lt;tgroup cols="2" align="left"&gt;</div><div class='del'>-   &lt;tbody&gt;</div><div class='del'>-   &lt;row&gt;</div><div class='del'>-        &lt;entry&gt;x, y&lt;/entry&gt;&lt;entry&gt;Co-ordinates relative to the display&lt;/entry&gt;</div><div class='del'>-	&lt;/row&gt;&lt;row&gt;</div><div class='del'>-        &lt;entry&gt;width, height&lt;/entry&gt;&lt;entry&gt;Width and height in pixels&lt;/entry&gt;</div><div class='del'>-	&lt;/row&gt;&lt;row&gt;</div><div class='del'>-        &lt;entry&gt;next&lt;/entry&gt;&lt;entry&gt;A spare field for the application to use&lt;/entry&gt;</div><div class='del'>-    &lt;/row&gt;</div><div class='del'>-    &lt;/tbody&gt;</div><div class='del'>-    &lt;/tgroup&gt;</div><div class='del'>-    &lt;/table&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-        The driver is required to ensure it always draws in the area requested or a        smaller area, and that it never draws in any of the areas that are clipped.</div><div class='del'>-        This may well mean it has to leave alone. small areas the application wished to be</div><div class='del'>-        drawn.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        Our example card uses chromakey so does not have to address most of the</div><div class='del'>-        clipping.  We will add a video_window structure to our global variables to</div><div class='del'>-        remember our parameters, as we did with the frame buffer.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;programlisting&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-                case VIDIOCGWIN:</div><div class='del'>-                {</div><div class='del'>-                        if(copy_to_user(arg, &amp;amp;capture_win, </div><div class='del'>-                            sizeof(capture_win)))</div><div class='del'>-                                return -EFAULT;</div><div class='del'>-                        return 0;</div><div class='del'>-                }</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-                case VIDIOCSWIN:</div><div class='del'>-                {</div><div class='del'>-                        struct video_window v;</div><div class='del'>-                        if(copy_from_user(&amp;amp;v, arg, sizeof(v)))</div><div class='del'>-                                return -EFAULT;</div><div class='del'>-                        if(v.width &amp;gt; 640 || v.height &amp;gt; 480)</div><div class='del'>-                                return -EINVAL;</div><div class='del'>-                        if(v.width &amp;lt; 16 || v.height &amp;lt; 16)</div><div class='del'>-                                return -EINVAL;</div><div class='del'>-                        hardware_set_key(v.chromakey);</div><div class='del'>-                        hardware_set_window(v);</div><div class='del'>-                        memcpy(&amp;amp;capture_win, &amp;amp;v, sizeof(v));</div><div class='del'>-                        capture_w = v.width;</div><div class='del'>-                        capture_h = v.height;</div><div class='del'>-                        return 0;</div><div class='del'>-                }</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-  &lt;/programlisting&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        Because we are using Chromakey our setup is fairly simple. Mostly we have to</div><div class='del'>-        check the values are sane and load them into the capture card.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        With all the setup done we can now turn on the actual capture/overlay. This</div><div class='del'>-        is done with the VIDIOCCAPTURE ioctl. This takes a single integer argument</div><div class='del'>-        where 0 is on and 1 is off.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;programlisting&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-                case VIDIOCCAPTURE:</div><div class='del'>-                {</div><div class='del'>-                        int v;</div><div class='del'>-                        if(get_user(v, (int *)arg))</div><div class='del'>-                                return -EFAULT;</div><div class='del'>-                        if(v==0)</div><div class='del'>-                                hardware_capture_off();</div><div class='del'>-                        else</div><div class='del'>-                        {</div><div class='del'>-                                if(capture_fb.width == 0 </div><div class='del'>-                                    || capture_w == 0)</div><div class='del'>-                                        return -EINVAL;</div><div class='del'>-                                hardware_capture_on();</div><div class='del'>-                        }</div><div class='del'>-                        return 0;</div><div class='del'>-                }</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-  &lt;/programlisting&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        We grab the flag from user space and either enable or disable according to</div><div class='del'>-        its value. There is one small corner case we have to consider here. Suppose</div><div class='del'>-        that the capture was requested before the video window or the frame buffer</div><div class='del'>-        had been set up. In those cases there will be unconfigured fields in our</div><div class='del'>-        card data, as well as unconfigured hardware settings. We check for this case and</div><div class='del'>-        return an error if the frame buffer or the capture window width is zero.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;programlisting&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-                default:</div><div class='del'>-                        return -ENOIOCTLCMD;</div><div class='del'>-        }</div><div class='del'>-}</div><div class='del'>-  &lt;/programlisting&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-</div><div class='del'>-        We don't need to support any other ioctls, so if we get this far, it is time</div><div class='del'>-        to tell the video layer that we don't now what the user is talking about.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-  &lt;sect1 id="endvid"&gt;</div><div class='del'>-  &lt;title&gt;Other Functionality&lt;/title&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-        The Video4Linux layer supports additional features, including a high</div><div class='del'>-        performance mmap() based capture mode and capturing part of the image. </div><div class='del'>-        These features are out of the scope of the book.  You should however have enough </div><div class='del'>-        example code to implement most simple video4linux devices for radio and TV</div><div class='del'>-        cards.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-  &lt;/chapter&gt;</div><div class='del'>-  &lt;chapter id="bugs"&gt;</div><div class='del'>-     &lt;title&gt;Known Bugs And Assumptions&lt;/title&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-  &lt;variablelist&gt;</div><div class='del'>-    &lt;varlistentry&gt;&lt;term&gt;Multiple Opens&lt;/term&gt;</div><div class='del'>-    &lt;listitem&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-        The driver assumes multiple opens should not be allowed. A driver</div><div class='del'>-        can work around this but not cleanly.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    &lt;/listitem&gt;&lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-    &lt;varlistentry&gt;&lt;term&gt;API Deficiencies&lt;/term&gt;</div><div class='del'>-    &lt;listitem&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-        The existing API poorly reflects compression capable devices. There</div><div class='del'>-        are plans afoot to merge V4L, V4L2 and some other ideas into a</div><div class='del'>-        better interface.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    &lt;/listitem&gt;&lt;/varlistentry&gt;</div><div class='del'>-  &lt;/variablelist&gt;</div><div class='del'>-</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;/chapter&gt;</div><div class='del'>-</div><div class='del'>-  &lt;chapter id="pubfunctions"&gt;</div><div class='del'>-     &lt;title&gt;Public Functions Provided&lt;/title&gt;</div><div class='del'>-!Edrivers/media/video/v4l2-dev.c</div><div class='del'>-  &lt;/chapter&gt;</div><div class='del'>-</div><div class='del'>-&lt;/book&gt;</div><div class='head'>diff --git a/Documentation/HOWTO b/Documentation/HOWTO<br/>index 48a3955f05fc..8495fc970391 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/HOWTO?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/HOWTO</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/HOWTO?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/HOWTO</a></div><div class='hunk'>@@ -112,7 +112,7 @@ required reading:</div><div class='ctx'> </div><div class='ctx'>     Other excellent descriptions of how to create patches properly are:</div><div class='ctx'> 	"The Perfect Patch"</div><div class='del'>-		http://www.zip.com.au/~akpm/linux/patches/stuff/tpp.txt</div><div class='add'>+		http://userweb.kernel.org/~akpm/stuff/tpp.txt</div><div class='ctx'> 	"Linux kernel patch submission format"</div><div class='ctx'> 		http://linux.yyz.us/patch-format.html</div><div class='ctx'> </div><div class='hunk'>@@ -620,7 +620,7 @@ all time.  It should describe the patch completely, containing:</div><div class='ctx'> For more details on what this should all look like, please see the</div><div class='ctx'> ChangeLog section of the document:</div><div class='ctx'>   "The Perfect Patch"</div><div class='del'>-      http://www.zip.com.au/~akpm/linux/patches/stuff/tpp.txt</div><div class='add'>+      http://userweb.kernel.org/~akpm/stuff/tpp.txt</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/RCU/checklist.txt b/Documentation/RCU/checklist.txt<br/>index cf5562cbe356..6e253407b3dc 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/RCU/checklist.txt?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/RCU/checklist.txt</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/RCU/checklist.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/RCU/checklist.txt</a></div><div class='hunk'>@@ -210,7 +210,7 @@ over a rather long period of time, but improvements are always welcome!</div><div class='ctx'> 		number of updates per grace period.</div><div class='ctx'> </div><div class='ctx'> 9.	All RCU list-traversal primitives, which include</div><div class='del'>-	rcu_dereference(), list_for_each_rcu(), list_for_each_entry_rcu(),</div><div class='add'>+	rcu_dereference(), list_for_each_entry_rcu(),</div><div class='ctx'> 	list_for_each_continue_rcu(), and list_for_each_safe_rcu(),</div><div class='ctx'> 	must be either within an RCU read-side critical section or</div><div class='ctx'> 	must be protected by appropriate update-side locks.  RCU</div><div class='head'>diff --git a/Documentation/RCU/rcuref.txt b/Documentation/RCU/rcuref.txt<br/>index 451de2ad8329..4202ad093130 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/RCU/rcuref.txt?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/RCU/rcuref.txt</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/RCU/rcuref.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/RCU/rcuref.txt</a></div><div class='hunk'>@@ -29,9 +29,9 @@ release_referenced()			delete()</div><div class='ctx'> 					}</div><div class='ctx'> </div><div class='ctx'> If this list/array is made lock free using RCU as in changing the</div><div class='del'>-write_lock() in add() and delete() to spin_lock and changing read_lock</div><div class='del'>-in search_and_reference to rcu_read_lock(), the atomic_get in</div><div class='del'>-search_and_reference could potentially hold reference to an element which</div><div class='add'>+write_lock() in add() and delete() to spin_lock() and changing read_lock()</div><div class='add'>+in search_and_reference() to rcu_read_lock(), the atomic_inc() in</div><div class='add'>+search_and_reference() could potentially hold reference to an element which</div><div class='ctx'> has already been deleted from the list/array.  Use atomic_inc_not_zero()</div><div class='ctx'> in this scenario as follows:</div><div class='ctx'> </div><div class='hunk'>@@ -40,20 +40,20 @@ add()					search_and_reference()</div><div class='ctx'> {					{</div><div class='ctx'>     alloc_object			    rcu_read_lock();</div><div class='ctx'>     ...					    search_for_element</div><div class='del'>-    atomic_set(&amp;el-&gt;rc, 1);		    if (atomic_inc_not_zero(&amp;el-&gt;rc)) {</div><div class='del'>-    write_lock(&amp;list_lock);		        rcu_read_unlock();</div><div class='add'>+    atomic_set(&amp;el-&gt;rc, 1);		    if (!atomic_inc_not_zero(&amp;el-&gt;rc)) {</div><div class='add'>+    spin_lock(&amp;list_lock);		        rcu_read_unlock();</div><div class='ctx'> 					        return FAIL;</div><div class='ctx'>     add_element				    }</div><div class='ctx'>     ...					    ...</div><div class='del'>-    write_unlock(&amp;list_lock);		    rcu_read_unlock();</div><div class='add'>+    spin_unlock(&amp;list_lock);		    rcu_read_unlock();</div><div class='ctx'> }					}</div><div class='ctx'> 3.					4.</div><div class='ctx'> release_referenced()			delete()</div><div class='ctx'> {					{</div><div class='del'>-    ...					    write_lock(&amp;list_lock);</div><div class='add'>+    ...					    spin_lock(&amp;list_lock);</div><div class='ctx'>     if (atomic_dec_and_test(&amp;el-&gt;rc))       ...</div><div class='ctx'>         call_rcu(&amp;el-&gt;head, el_free);       delete_element</div><div class='del'>-    ...                                     write_unlock(&amp;list_lock);</div><div class='add'>+    ...                                     spin_unlock(&amp;list_lock);</div><div class='ctx'> } 					    ...</div><div class='ctx'> 					    if (atomic_dec_and_test(&amp;el-&gt;rc))</div><div class='ctx'> 					        call_rcu(&amp;el-&gt;head, el_free);</div><div class='head'>diff --git a/Documentation/RCU/whatisRCU.txt b/Documentation/RCU/whatisRCU.txt<br/>index e04d643a9f57..96170824a717 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/RCU/whatisRCU.txt?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/RCU/whatisRCU.txt</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/RCU/whatisRCU.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/RCU/whatisRCU.txt</a></div><div class='hunk'>@@ -786,8 +786,6 @@ RCU pointer/list traversal:</div><div class='ctx'> 	list_for_each_entry_rcu</div><div class='ctx'> 	hlist_for_each_entry_rcu</div><div class='ctx'> </div><div class='del'>-	list_for_each_rcu		(to be deprecated in favor of</div><div class='del'>-					 list_for_each_entry_rcu)</div><div class='ctx'> 	list_for_each_continue_rcu	(to be deprecated in favor of new</div><div class='ctx'> 					 list_for_each_entry_continue_rcu)</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/SAK.txt b/Documentation/SAK.txt<br/>index b9019ca872ea..74be14679ed8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/SAK.txt?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/SAK.txt</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/SAK.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/SAK.txt</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> Linux 2.4.2 Secure Attention Key (SAK) handling</div><div class='del'>-18 March 2001, Andrew Morton &lt;akpm@osdl.org&gt;</div><div class='add'>+18 March 2001, Andrew Morton</div><div class='ctx'> </div><div class='ctx'> An operating system's Secure Attention Key is a security tool which is</div><div class='ctx'> provided as protection against trojan password capturing programs.  It</div><div class='head'>diff --git a/Documentation/SELinux.txt b/Documentation/SELinux.txt<br/>new file mode 100644<br/>index 000000000000..07eae00f3314<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/SELinux.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/SELinux.txt</a></div><div class='hunk'>@@ -0,0 +1,27 @@</div><div class='add'>+If you want to use SELinux, chances are you will want</div><div class='add'>+to use the distro-provided policies, or install the</div><div class='add'>+latest reference policy release from</div><div class='add'>+	http://oss.tresys.com/projects/refpolicy</div><div class='add'>+</div><div class='add'>+However, if you want to install a dummy policy for</div><div class='add'>+testing, you can do using 'mdp' provided under</div><div class='add'>+scripts/selinux.  Note that this requires the selinux</div><div class='add'>+userspace to be installed - in particular you will</div><div class='add'>+need checkpolicy to compile a kernel, and setfiles and</div><div class='add'>+fixfiles to label the filesystem.</div><div class='add'>+</div><div class='add'>+	1. Compile the kernel with selinux enabled.</div><div class='add'>+	2. Type 'make' to compile mdp.</div><div class='add'>+	3. Make sure that you are not running with</div><div class='add'>+	   SELinux enabled and a real policy.  If</div><div class='add'>+	   you are, reboot with selinux disabled</div><div class='add'>+	   before continuing.</div><div class='add'>+	4. Run install_policy.sh:</div><div class='add'>+		cd scripts/selinux</div><div class='add'>+		sh install_policy.sh</div><div class='add'>+</div><div class='add'>+Step 4 will create a new dummy policy valid for your</div><div class='add'>+kernel, with a single selinux user, role, and type.</div><div class='add'>+It will compile the policy, will set your SELINUXTYPE to</div><div class='add'>+dummy in /etc/selinux/config, install the compiled policy</div><div class='add'>+as 'dummy', and relabel your filesystem.</div><div class='head'>diff --git a/Documentation/SubmitChecklist b/Documentation/SubmitChecklist<br/>index 21f0795af20f..ac5e0b2f1097 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/SubmitChecklist?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/SubmitChecklist</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/SubmitChecklist?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/SubmitChecklist</a></div><div class='hunk'>@@ -85,3 +85,6 @@ kernel patches.</div><div class='ctx'> 23: Tested after it has been merged into the -mm patchset to make sure</div><div class='ctx'>     that it still works with all of the other queued patches and various</div><div class='ctx'>     changes in the VM, VFS, and other subsystems.</div><div class='add'>+</div><div class='add'>+24: All memory barriers {e.g., barrier(), rmb(), wmb()} need a comment in the</div><div class='add'>+    source code that explains the logic of what they are doing and why.</div><div class='head'>diff --git a/Documentation/SubmittingDrivers b/Documentation/SubmittingDrivers<br/>index 24f2eb40cae5..99e72a81fa2f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/SubmittingDrivers?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/SubmittingDrivers</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/SubmittingDrivers?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/SubmittingDrivers</a></div><div class='hunk'>@@ -41,7 +41,7 @@ Linux 2.4:</div><div class='ctx'> Linux 2.6:</div><div class='ctx'> 	The same rules apply as 2.4 except that you should follow linux-kernel</div><div class='ctx'> 	to track changes in API's. The final contact point for Linux 2.6</div><div class='del'>-	submissions is Andrew Morton &lt;akpm@osdl.org&gt;.</div><div class='add'>+	submissions is Andrew Morton.</div><div class='ctx'> </div><div class='ctx'> What Criteria Determine Acceptance</div><div class='ctx'> ----------------------------------</div><div class='head'>diff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches<br/>index f79ad9ff6031..f309d3c6221c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/SubmittingPatches?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/SubmittingPatches</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/SubmittingPatches?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/SubmittingPatches</a></div><div class='hunk'>@@ -77,7 +77,7 @@ Quilt:</div><div class='ctx'> http://savannah.nongnu.org/projects/quilt</div><div class='ctx'> </div><div class='ctx'> Andrew Morton's patch scripts:</div><div class='del'>-http://www.zip.com.au/~akpm/linux/patches/</div><div class='add'>+http://userweb.kernel.org/~akpm/stuff/patch-scripts.tar.gz</div><div class='ctx'> Instead of these scripts, quilt is the recommended patch management</div><div class='ctx'> tool (see above).</div><div class='ctx'> </div><div class='hunk'>@@ -405,7 +405,7 @@ person it names.  This tag documents that potentially interested parties</div><div class='ctx'> have been included in the discussion</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-14) Using Test-by: and Reviewed-by:</div><div class='add'>+14) Using Tested-by: and Reviewed-by:</div><div class='ctx'> </div><div class='ctx'> A Tested-by: tag indicates that the patch has been successfully tested (in</div><div class='ctx'> some environment) by the person named.  This tag informs maintainers that</div><div class='hunk'>@@ -653,7 +653,7 @@ SECTION 3 - REFERENCES</div><div class='ctx'> ----------------------</div><div class='ctx'> </div><div class='ctx'> Andrew Morton, "The perfect patch" (tpp).</div><div class='del'>-  &lt;http://www.zip.com.au/~akpm/linux/patches/stuff/tpp.txt&gt;</div><div class='add'>+  &lt;http://userweb.kernel.org/~akpm/stuff/tpp.txt&gt;</div><div class='ctx'> </div><div class='ctx'> Jeff Garzik, "Linux kernel patch submission format".</div><div class='ctx'>   &lt;http://linux.yyz.us/patch-format.html&gt;</div><div class='hunk'>@@ -672,4 +672,9 @@ Kernel Documentation/CodingStyle:</div><div class='ctx'> </div><div class='ctx'> Linus Torvalds's mail on the canonical patch format:</div><div class='ctx'>   &lt;http://lkml.org/lkml/2005/4/7/183&gt;</div><div class='add'>+</div><div class='add'>+Andi Kleen, "On submitting kernel patches"</div><div class='add'>+  Some strategies to get difficult or controversal changes in.</div><div class='add'>+  http://halobates.de/on-submitting-patches.pdf</div><div class='add'>+</div><div class='ctx'> --</div><div class='head'>diff --git a/Documentation/blackfin/kgdb.txt b/Documentation/blackfin/kgdb.txt<br/>deleted file mode 100644<br/>index 84f6a484ae9a..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/blackfin/kgdb.txt?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/blackfin/kgdb.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,155 +0,0 @@</div><div class='del'>-			A Simple Guide to Configure KGDB</div><div class='del'>-</div><div class='del'>-			Sonic Zhang &lt;sonic.zhang@analog.com&gt;</div><div class='del'>-				Aug. 24th 2006</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-This KGDB patch enables the kernel developer to do source level debugging on</div><div class='del'>-the kernel for the Blackfin architecture.  The debugging works over either the</div><div class='del'>-ethernet interface or one of the uarts.  Both software breakpoints and</div><div class='del'>-hardware breakpoints are supported in this version.</div><div class='del'>-http://docs.blackfin.uclinux.org/doku.php?id=kgdb</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-2 known issues:</div><div class='del'>-1. This bug:</div><div class='del'>-       http://blackfin.uclinux.org/tracker/index.php?func=detail&amp;aid=544&amp;group_id=18&amp;atid=145</div><div class='del'>-   The GDB client for Blackfin uClinux causes incorrect values of local</div><div class='del'>-   variables to be displayed when the user breaks the running of kernel in GDB.</div><div class='del'>-2. Because of a hardware bug in Blackfin 533 v1.0.3:</div><div class='del'>-       05000067 - Watchpoints (Hardware Breakpoints) are not supported</div><div class='del'>-   Hardware breakpoints cannot be set properly.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Debug over Ethernet:</div><div class='del'>- </div><div class='del'>-1. Compile and install the cross platform version of gdb for blackfin, which</div><div class='del'>-   can be found at $(BINROOT)/bfin-elf-gdb.</div><div class='del'>-</div><div class='del'>-2. Apply this patch to the 2.6.x kernel.  Select the menuconfig option under</div><div class='del'>-   "Kernel hacking" -&gt; "Kernel debugging" -&gt; "KGDB: kernel debug with remote gdb".</div><div class='del'>-   With this selected, option "Full Symbolic/Source Debugging support" and </div><div class='del'>-   "Compile the kernel with frame pointers" are also selected.</div><div class='del'>-</div><div class='del'>-3. Select option "KGDB: connect over (Ethernet)".  Add "kgdboe=@target-IP/,@host-IP/" to</div><div class='del'>-   the option "Compiled-in Kernel Boot Parameter" under "Kernel hacking".</div><div class='del'>-</div><div class='del'>-4. Connect minicom to the serial port and boot the kernel image.</div><div class='del'>-</div><div class='del'>-5. Configure the IP "/&gt; ifconfig eth0 target-IP"</div><div class='del'>-</div><div class='del'>-6. Start GDB client "bfin-elf-gdb vmlinux".</div><div class='del'>-</div><div class='del'>-7. Connect to the target "(gdb) target remote udp:target-IP:6443".</div><div class='del'>-</div><div class='del'>-8. Set software breakpoint "(gdb) break sys_open".</div><div class='del'>-</div><div class='del'>-9. Continue "(gdb) c".</div><div class='del'>-</div><div class='del'>-10. Run ls in the target console "/&gt; ls".</div><div class='del'>-</div><div class='del'>-11. Breakpoint hits. "Breakpoint 1: sys_open(..."</div><div class='del'>-</div><div class='del'>-12. Display local variables and function paramters.</div><div class='del'>-    (*) This operation gives wrong results, see known issue 1.</div><div class='del'>-</div><div class='del'>-13. Single stepping "(gdb) si".</div><div class='del'>-</div><div class='del'>-14. Remove breakpoint 1. "(gdb) del 1"</div><div class='del'>-</div><div class='del'>-15. Set hardware breakpoint "(gdb) hbreak sys_open".</div><div class='del'>-</div><div class='del'>-16. Continue "(gdb) c".</div><div class='del'>-</div><div class='del'>-17. Run ls in the target console "/&gt; ls".</div><div class='del'>-</div><div class='del'>-18. Hardware breakpoint hits. "Breakpoint 1: sys_open(...".</div><div class='del'>-    (*) This hardware breakpoint will not be hit, see known issue 2.</div><div class='del'>-</div><div class='del'>-19. Continue "(gdb) c".</div><div class='del'>-</div><div class='del'>-20. Interrupt the target in GDB "Ctrl+C".</div><div class='del'>-</div><div class='del'>-21. Detach from the target "(gdb) detach".</div><div class='del'>-</div><div class='del'>-22. Exit GDB "(gdb) quit".</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Debug over the UART:</div><div class='del'>-</div><div class='del'>-1. Compile and install the cross platform version of gdb for blackfin, which</div><div class='del'>-   can be found at $(BINROOT)/bfin-elf-gdb.</div><div class='del'>-</div><div class='del'>-2. Apply this patch to the 2.6.x kernel.  Select the menuconfig option under</div><div class='del'>-   "Kernel hacking" -&gt; "Kernel debugging" -&gt; "KGDB: kernel debug with remote gdb".</div><div class='del'>-   With this selected, option "Full Symbolic/Source Debugging support" and </div><div class='del'>-   "Compile the kernel with frame pointers" are also selected.</div><div class='del'>-</div><div class='del'>-3. Select option "KGDB: connect over (UART)".  Set "KGDB: UART port number" to be</div><div class='del'>-   a different one from the console.  Don't forget to change the mode of</div><div class='del'>-   blackfin serial driver to PIO.  Otherwise kgdb works incorrectly on UART.</div><div class='del'>- </div><div class='del'>-4. If you want connect to kgdb when the kernel boots, enable</div><div class='del'>-   "KGDB: Wait for gdb connection early" </div><div class='del'>-</div><div class='del'>-5. Compile kernel.</div><div class='del'>-</div><div class='del'>-6. Connect minicom to the serial port of the console and boot the kernel image.</div><div class='del'>-</div><div class='del'>-7. Start GDB client "bfin-elf-gdb vmlinux".</div><div class='del'>-</div><div class='del'>-8. Set the baud rate in GDB "(gdb) set remotebaud 57600".</div><div class='del'>-</div><div class='del'>-9. Connect to the target on the second serial port "(gdb) target remote /dev/ttyS1".</div><div class='del'>-</div><div class='del'>-10. Set software breakpoint "(gdb) break sys_open".</div><div class='del'>-</div><div class='del'>-11. Continue "(gdb) c". </div><div class='del'>-</div><div class='del'>-12. Run ls in the target console "/&gt; ls". </div><div class='del'>-</div><div class='del'>-13. A breakpoint is hit. "Breakpoint 1: sys_open(..."</div><div class='del'>-</div><div class='del'>-14. All other operations are the same as that in KGDB over Ethernet. </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Debug over the same UART as console:</div><div class='del'>-</div><div class='del'>-1. Compile and install the cross platform version of gdb for blackfin, which</div><div class='del'>-   can be found at $(BINROOT)/bfin-elf-gdb.</div><div class='del'>-</div><div class='del'>-2. Apply this patch to the 2.6.x kernel.  Select the menuconfig option under</div><div class='del'>-   "Kernel hacking" -&gt; "Kernel debugging" -&gt; "KGDB: kernel debug with remote gdb".</div><div class='del'>-   With this selected, option "Full Symbolic/Source Debugging support" and </div><div class='del'>-   "Compile the kernel with frame pointers" are also selected.</div><div class='del'>-</div><div class='del'>-3. Select option "KGDB: connect over UART".  Set "KGDB: UART port number" to console.</div><div class='del'>-   Don't forget to change the mode of blackfin serial driver to PIO.</div><div class='del'>-   Otherwise kgdb works incorrectly on UART.</div><div class='del'>- </div><div class='del'>-4. If you want connect to kgdb when the kernel boots, enable</div><div class='del'>-   "KGDB: Wait for gdb connection early" </div><div class='del'>-</div><div class='del'>-5. Connect minicom to the serial port and boot the kernel image. </div><div class='del'>-</div><div class='del'>-6. (Optional) Ask target to wait for gdb connection by entering Ctrl+A. In minicom, you should enter Ctrl+A+A.</div><div class='del'>-</div><div class='del'>-7. Start GDB client "bfin-elf-gdb vmlinux".</div><div class='del'>-</div><div class='del'>-8. Set the baud rate in GDB "(gdb) set remotebaud 57600".</div><div class='del'>-</div><div class='del'>-9. Connect to the target "(gdb) target remote /dev/ttyS0".</div><div class='del'>-</div><div class='del'>-10. Set software breakpoint "(gdb) break sys_open".</div><div class='del'>-</div><div class='del'>-11. Continue "(gdb) c". Then enter Ctrl+C twice to stop GDB connection.</div><div class='del'>-</div><div class='del'>-12. Run ls in the target console "/&gt; ls". Dummy string can be seen on the console.</div><div class='del'>-</div><div class='del'>-13. Then connect the gdb to target again. "(gdb) target remote /dev/ttyS0".</div><div class='del'>-    Now you will find a breakpoint is hit. "Breakpoint 1: sys_open(..."</div><div class='del'>-</div><div class='del'>-14. All other operations are the same as that in KGDB over Ethernet.  The only</div><div class='del'>-    difference is that after continue command in GDB, please stop GDB</div><div class='del'>-    connection by 2 "Ctrl+C"s and connect again after breakpoints are hit or</div><div class='del'>-    Ctrl+A is entered.</div><div class='head'>diff --git a/Documentation/block/data-integrity.txt b/Documentation/block/data-integrity.txt<br/>index e9dc8d86adc7..e8ca040ba2cf 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/block/data-integrity.txt?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/block/data-integrity.txt</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/block/data-integrity.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/block/data-integrity.txt</a></div><div class='hunk'>@@ -246,7 +246,7 @@ will require extra work due to the application tag.</div><div class='ctx'>       retrieve the tag buffer using bio_integrity_get_tag().</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-6.3 PASSING EXISTING INTEGRITY METADATA</div><div class='add'>+5.3 PASSING EXISTING INTEGRITY METADATA</div><div class='ctx'> </div><div class='ctx'>     Filesystems that either generate their own integrity metadata or</div><div class='ctx'>     are capable of transferring IMD from user space can use the</div><div class='hunk'>@@ -283,7 +283,7 @@ will require extra work due to the application tag.</div><div class='ctx'>       integrity upon completion.</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-6.4 REGISTERING A BLOCK DEVICE AS CAPABLE OF EXCHANGING INTEGRITY</div><div class='add'>+5.4 REGISTERING A BLOCK DEVICE AS CAPABLE OF EXCHANGING INTEGRITY</div><div class='ctx'>     METADATA</div><div class='ctx'> </div><div class='ctx'>     To enable integrity exchange on a block device the gendisk must be</div><div class='head'>diff --git a/Documentation/block/deadline-iosched.txt b/Documentation/block/deadline-iosched.txt<br/>index c23cab13c3d1..72576769e0f4 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/block/deadline-iosched.txt?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/block/deadline-iosched.txt</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/block/deadline-iosched.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/block/deadline-iosched.txt</a></div><div class='hunk'>@@ -30,12 +30,18 @@ write_expire	(in ms)</div><div class='ctx'> Similar to read_expire mentioned above, but for writes.</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-fifo_batch</div><div class='add'>+fifo_batch	(number of requests)</div><div class='ctx'> ----------</div><div class='ctx'> </div><div class='del'>-When a read request expires its deadline, we must move some requests from</div><div class='del'>-the sorted io scheduler list to the block device dispatch queue. fifo_batch</div><div class='del'>-controls how many requests we move.</div><div class='add'>+Requests are grouped into ``batches'' of a particular data direction (read or</div><div class='add'>+write) which are serviced in increasing sector order.  To limit extra seeking,</div><div class='add'>+deadline expiries are only checked between batches.  fifo_batch controls the</div><div class='add'>+maximum number of requests per batch.</div><div class='add'>+</div><div class='add'>+This parameter tunes the balance between per-request latency and aggregate</div><div class='add'>+throughput.  When low latency is the primary concern, smaller is better (where</div><div class='add'>+a value of 1 yields first-come first-served behaviour).  Increasing fifo_batch</div><div class='add'>+generally improves throughput, at the cost of latency variation.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> writes_starved	(number of dispatches)</div><div class='head'>diff --git a/Documentation/cdrom/ide-cd b/Documentation/cdrom/ide-cd<br/>index 91c0dcc6fa5c..2c558cd6c1ef 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/cdrom/ide-cd?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/cdrom/ide-cd</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/cdrom/ide-cd?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/cdrom/ide-cd</a></div><div class='hunk'>@@ -145,8 +145,7 @@ useful for reading photocds.</div><div class='ctx'> </div><div class='ctx'> To play an audio CD, you should first unmount and remove any data</div><div class='ctx'> CDROM.  Any of the CDROM player programs should then work (workman,</div><div class='del'>-workbone, cdplayer, etc.).  Lacking anything else, you could use the</div><div class='del'>-cdtester program in Documentation/cdrom/sbpcd.</div><div class='add'>+workbone, cdplayer, etc.).</div><div class='ctx'> </div><div class='ctx'> On a few drives, you can read digital audio directly using a program</div><div class='ctx'> such as cdda2wav.  The only types of drive which I've heard support</div><div class='head'>diff --git a/Documentation/cris/README b/Documentation/cris/README<br/>index 795a1dabe6c7..d9b086869a60 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/cris/README?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/cris/README</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/cris/README?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/cris/README</a></div><div class='hunk'>@@ -27,7 +27,7 @@ operating system.</div><div class='ctx'> The ETRAX 100LX chip</div><div class='ctx'> --------------------</div><div class='ctx'> </div><div class='del'>-For reference, plase see the press-release:</div><div class='add'>+For reference, please see the press-release:</div><div class='ctx'> </div><div class='ctx'> http://www.axis.com/news/us/001101_etrax.htm</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/development-process/1.Intro b/Documentation/development-process/1.Intro<br/>new file mode 100644<br/>index 000000000000..8cc2cba2b10d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/development-process/1.Intro?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/development-process/1.Intro</a></div><div class='hunk'>@@ -0,0 +1,274 @@</div><div class='add'>+1: A GUIDE TO THE KERNEL DEVELOPMENT PROCESS</div><div class='add'>+</div><div class='add'>+The purpose of this document is to help developers (and their managers)</div><div class='add'>+work with the development community with a minimum of frustration.  It is</div><div class='add'>+an attempt to document how this community works in a way which is</div><div class='add'>+accessible to those who are not intimately familiar with Linux kernel</div><div class='add'>+development (or, indeed, free software development in general).  While</div><div class='add'>+there is some technical material here, this is very much a process-oriented</div><div class='add'>+discussion which does not require a deep knowledge of kernel programming to</div><div class='add'>+understand.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+1.1: EXECUTIVE SUMMARY</div><div class='add'>+</div><div class='add'>+The rest of this section covers the scope of the kernel development process</div><div class='add'>+and the kinds of frustrations that developers and their employers can</div><div class='add'>+encounter there.  There are a great many reasons why kernel code should be</div><div class='add'>+merged into the official ("mainline") kernel, including automatic</div><div class='add'>+availability to users, community support in many forms, and the ability to</div><div class='add'>+influence the direction of kernel development.  Code contributed to the</div><div class='add'>+Linux kernel must be made available under a GPL-compatible license.</div><div class='add'>+</div><div class='add'>+Section 2 introduces the development process, the kernel release cycle, and</div><div class='add'>+the mechanics of the merge window.  The various phases in the patch</div><div class='add'>+development, review, and merging cycle are covered.  There is some</div><div class='add'>+discussion of tools and mailing lists.  Developers wanting to get started</div><div class='add'>+with kernel development are encouraged to track down and fix bugs as an</div><div class='add'>+initial exercise.</div><div class='add'>+</div><div class='add'>+Section 3 covers early-stage project planning, with an emphasis on</div><div class='add'>+involving the development community as soon as possible.</div><div class='add'>+</div><div class='add'>+Section 4 is about the coding process; several pitfalls which have been</div><div class='add'>+encountered by other developers are discussed.  Some requirements for</div><div class='add'>+patches are covered, and there is an introduction to some of the tools</div><div class='add'>+which can help to ensure that kernel patches are correct.</div><div class='add'>+</div><div class='add'>+Section 5 talks about the process of posting patches for review.  To be</div><div class='add'>+taken seriously by the development community, patches must be properly</div><div class='add'>+formatted and described, and they must be sent to the right place.</div><div class='add'>+Following the advice in this section should help to ensure the best</div><div class='add'>+possible reception for your work.</div><div class='add'>+</div><div class='add'>+Section 6 covers what happens after posting patches; the job is far from</div><div class='add'>+done at that point.  Working with reviewers is a crucial part of the</div><div class='add'>+development process; this section offers a number of tips on how to avoid</div><div class='add'>+problems at this important stage.  Developers are cautioned against</div><div class='add'>+assuming that the job is done when a patch is merged into the mainline.</div><div class='add'>+</div><div class='add'>+Section 7 introduces a couple of "advanced" topics: managing patches with</div><div class='add'>+git and reviewing patches posted by others.</div><div class='add'>+</div><div class='add'>+Section 8 concludes the document with pointers to sources for more</div><div class='add'>+information on kernel development.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+1.2: WHAT THIS DOCUMENT IS ABOUT</div><div class='add'>+</div><div class='add'>+The Linux kernel, at over 6 million lines of code and well over 1000 active</div><div class='add'>+contributors, is one of the largest and most active free software projects</div><div class='add'>+in existence.  Since its humble beginning in 1991, this kernel has evolved</div><div class='add'>+into a best-of-breed operating system component which runs on pocket-sized</div><div class='add'>+digital music players, desktop PCs, the largest supercomputers in</div><div class='add'>+existence, and all types of systems in between.  It is a robust, efficient,</div><div class='add'>+and scalable solution for almost any situation.</div><div class='add'>+</div><div class='add'>+With the growth of Linux has come an increase in the number of developers</div><div class='add'>+(and companies) wishing to participate in its development.  Hardware</div><div class='add'>+vendors want to ensure that Linux supports their products well, making</div><div class='add'>+those products attractive to Linux users.  Embedded systems vendors, who</div><div class='add'>+use Linux as a component in an integrated product, want Linux to be as</div><div class='add'>+capable and well-suited to the task at hand as possible.  Distributors and</div><div class='add'>+other software vendors who base their products on Linux have a clear</div><div class='add'>+interest in the capabilities, performance, and reliability of the Linux</div><div class='add'>+kernel.  And end users, too, will often wish to change Linux to make it</div><div class='add'>+better suit their needs.</div><div class='add'>+</div><div class='add'>+One of the most compelling features of Linux is that it is accessible to</div><div class='add'>+these developers; anybody with the requisite skills can improve Linux and</div><div class='add'>+influence the direction of its development.  Proprietary products cannot</div><div class='add'>+offer this kind of openness, which is a characteristic of the free software</div><div class='add'>+process.  But, if anything, the kernel is even more open than most other</div><div class='add'>+free software projects.  A typical three-month kernel development cycle can</div><div class='add'>+involve over 1000 developers working for more than 100 different companies</div><div class='add'>+(or for no company at all).</div><div class='add'>+</div><div class='add'>+Working with the kernel development community is not especially hard.  But,</div><div class='add'>+that notwithstanding, many potential contributors have experienced</div><div class='add'>+difficulties when trying to do kernel work.  The kernel community has</div><div class='add'>+evolved its own distinct ways of operating which allow it to function</div><div class='add'>+smoothly (and produce a high-quality product) in an environment where</div><div class='add'>+thousands of lines of code are being changed every day.  So it is not</div><div class='add'>+surprising that Linux kernel development process differs greatly from</div><div class='add'>+proprietary development methods.</div><div class='add'>+</div><div class='add'>+The kernel's development process may come across as strange and</div><div class='add'>+intimidating to new developers, but there are good reasons and solid</div><div class='add'>+experience behind it.  A developer who does not understand the kernel</div><div class='add'>+community's ways (or, worse, who tries to flout or circumvent them) will</div><div class='add'>+have a frustrating experience in store.  The development community, while</div><div class='add'>+being helpful to those who are trying to learn, has little time for those</div><div class='add'>+who will not listen or who do not care about the development process.</div><div class='add'>+</div><div class='add'>+It is hoped that those who read this document will be able to avoid that</div><div class='add'>+frustrating experience.  There is a lot of material here, but the effort</div><div class='add'>+involved in reading it will be repaid in short order.  The development</div><div class='add'>+community is always in need of developers who will help to make the kernel</div><div class='add'>+better; the following text should help you - or those who work for you -</div><div class='add'>+join our community.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+1.3: CREDITS</div><div class='add'>+</div><div class='add'>+This document was written by Jonathan Corbet, corbet@lwn.net.  It has been</div><div class='add'>+improved by comments from Johannes Berg, James Berry, Alex Chiang, Roland</div><div class='add'>+Dreier, Randy Dunlap, Jake Edge, Jiri Kosina, Matt Mackall, Arthur Marsh,</div><div class='add'>+Amanda McPherson, Andrew Morton, Andrew Price, Tsugikazu Shibata, and</div><div class='add'>+Jochen Voß. </div><div class='add'>+</div><div class='add'>+This work was supported by the Linux Foundation; thanks especially to</div><div class='add'>+Amanda McPherson, who saw the value of this effort and made it all happen.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+1.4: THE IMPORTANCE OF GETTING CODE INTO THE MAINLINE</div><div class='add'>+</div><div class='add'>+Some companies and developers occasionally wonder why they should bother</div><div class='add'>+learning how to work with the kernel community and get their code into the</div><div class='add'>+mainline kernel (the "mainline" being the kernel maintained by Linus</div><div class='add'>+Torvalds and used as a base by Linux distributors).  In the short term,</div><div class='add'>+contributing code can look like an avoidable expense; it seems easier to</div><div class='add'>+just keep the code separate and support users directly.  The truth of the</div><div class='add'>+matter is that keeping code separate ("out of tree") is a false economy.</div><div class='add'>+</div><div class='add'>+As a way of illustrating the costs of out-of-tree code, here are a few</div><div class='add'>+relevant aspects of the kernel development process; most of these will be</div><div class='add'>+discussed in greater detail later in this document.  Consider:</div><div class='add'>+</div><div class='add'>+- Code which has been merged into the mainline kernel is available to all</div><div class='add'>+  Linux users.  It will automatically be present on all distributions which</div><div class='add'>+  enable it.  There is no need for driver disks, downloads, or the hassles</div><div class='add'>+  of supporting multiple versions of multiple distributions; it all just</div><div class='add'>+  works, for the developer and for the user.  Incorporation into the</div><div class='add'>+  mainline solves a large number of distribution and support problems.</div><div class='add'>+</div><div class='add'>+- While kernel developers strive to maintain a stable interface to user</div><div class='add'>+  space, the internal kernel API is in constant flux.  The lack of a stable</div><div class='add'>+  internal interface is a deliberate design decision; it allows fundamental</div><div class='add'>+  improvements to be made at any time and results in higher-quality code.</div><div class='add'>+  But one result of that policy is that any out-of-tree code requires</div><div class='add'>+  constant upkeep if it is to work with new kernels.  Maintaining</div><div class='add'>+  out-of-tree code requires significant amounts of work just to keep that</div><div class='add'>+  code working.</div><div class='add'>+</div><div class='add'>+  Code which is in the mainline, instead, does not require this work as the</div><div class='add'>+  result of a simple rule requiring any developer who makes an API change</div><div class='add'>+  to also fix any code that breaks as the result of that change.  So code</div><div class='add'>+  which has been merged into the mainline has significantly lower</div><div class='add'>+  maintenance costs.</div><div class='add'>+</div><div class='add'>+- Beyond that, code which is in the kernel will often be improved by other</div><div class='add'>+  developers.  Surprising results can come from empowering your user</div><div class='add'>+  community and customers to improve your product.</div><div class='add'>+</div><div class='add'>+- Kernel code is subjected to review, both before and after merging into</div><div class='add'>+  the mainline.  No matter how strong the original developer's skills are,</div><div class='add'>+  this review process invariably finds ways in which the code can be</div><div class='add'>+  improved.  Often review finds severe bugs and security problems.  This is</div><div class='add'>+  especially true for code which has been developed in a closed</div><div class='add'>+  environment; such code benefits strongly from review by outside</div><div class='add'>+  developers.  Out-of-tree code is lower-quality code.</div><div class='add'>+</div><div class='add'>+- Participation in the development process is your way to influence the</div><div class='add'>+  direction of kernel development.  Users who complain from the sidelines</div><div class='add'>+  are heard, but active developers have a stronger voice - and the ability</div><div class='add'>+  to implement changes which make the kernel work better for their needs.</div><div class='add'>+</div><div class='add'>+- When code is maintained separately, the possibility that a third party</div><div class='add'>+  will contribute a different implementation of a similar feature always</div><div class='add'>+  exists.  Should that happen, getting your code merged will become much</div><div class='add'>+  harder - to the point of impossibility.  Then you will be faced with the</div><div class='add'>+  unpleasant alternatives of either (1) maintaining a nonstandard feature</div><div class='add'>+  out of tree indefinitely, or (2) abandoning your code and migrating your</div><div class='add'>+  users over to the in-tree version.</div><div class='add'>+</div><div class='add'>+- Contribution of code is the fundamental action which makes the whole</div><div class='add'>+  process work.  By contributing your code you can add new functionality to</div><div class='add'>+  the kernel and provide capabilities and examples which are of use to</div><div class='add'>+  other kernel developers.  If you have developed code for Linux (or are</div><div class='add'>+  thinking about doing so), you clearly have an interest in the continued</div><div class='add'>+  success of this platform; contributing code is one of the best ways to</div><div class='add'>+  help ensure that success.</div><div class='add'>+</div><div class='add'>+All of the reasoning above applies to any out-of-tree kernel code,</div><div class='add'>+including code which is distributed in proprietary, binary-only form.</div><div class='add'>+There are, however, additional factors which should be taken into account</div><div class='add'>+before considering any sort of binary-only kernel code distribution.  These</div><div class='add'>+include:</div><div class='add'>+</div><div class='add'>+- The legal issues around the distribution of proprietary kernel modules</div><div class='add'>+  are cloudy at best; quite a few kernel copyright holders believe that</div><div class='add'>+  most binary-only modules are derived products of the kernel and that, as</div><div class='add'>+  a result, their distribution is a violation of the GNU General Public</div><div class='add'>+  license (about which more will be said below).  Your author is not a</div><div class='add'>+  lawyer, and nothing in this document can possibly be considered to be</div><div class='add'>+  legal advice.  The true legal status of closed-source modules can only be</div><div class='add'>+  determined by the courts.  But the uncertainty which haunts those modules</div><div class='add'>+  is there regardless.</div><div class='add'>+</div><div class='add'>+- Binary modules greatly increase the difficulty of debugging kernel</div><div class='add'>+  problems, to the point that most kernel developers will not even try.  So</div><div class='add'>+  the distribution of binary-only modules will make it harder for your</div><div class='add'>+  users to get support from the community.</div><div class='add'>+</div><div class='add'>+- Support is also harder for distributors of binary-only modules, who must</div><div class='add'>+  provide a version of the module for every distribution and every kernel</div><div class='add'>+  version they wish to support.  Dozens of builds of a single module can</div><div class='add'>+  be required to provide reasonably comprehensive coverage, and your users</div><div class='add'>+  will have to upgrade your module separately every time they upgrade their</div><div class='add'>+  kernel.</div><div class='add'>+</div><div class='add'>+- Everything that was said above about code review applies doubly to</div><div class='add'>+  closed-source code.  Since this code is not available at all, it cannot</div><div class='add'>+  have been reviewed by the community and will, beyond doubt, have serious</div><div class='add'>+  problems. </div><div class='add'>+</div><div class='add'>+Makers of embedded systems, in particular, may be tempted to disregard much</div><div class='add'>+of what has been said in this section in the belief that they are shipping</div><div class='add'>+a self-contained product which uses a frozen kernel version and requires no</div><div class='add'>+more development after its release.  This argument misses the value of</div><div class='add'>+widespread code review and the value of allowing your users to add</div><div class='add'>+capabilities to your product.  But these products, too, have a limited</div><div class='add'>+commercial life, after which a new version must be released.  At that</div><div class='add'>+point, vendors whose code is in the mainline and well maintained will be</div><div class='add'>+much better positioned to get the new product ready for market quickly.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+1.5: LICENSING</div><div class='add'>+</div><div class='add'>+Code is contributed to the Linux kernel under a number of licenses, but all</div><div class='add'>+code must be compatible with version 2 of the GNU General Public License</div><div class='add'>+(GPLv2), which is the license covering the kernel distribution as a whole.</div><div class='add'>+In practice, that means that all code contributions are covered either by</div><div class='add'>+GPLv2 (with, optionally, language allowing distribution under later</div><div class='add'>+versions of the GPL) or the three-clause BSD license.  Any contributions</div><div class='add'>+which are not covered by a compatible license will not be accepted into the</div><div class='add'>+kernel.</div><div class='add'>+</div><div class='add'>+Copyright assignments are not required (or requested) for code contributed</div><div class='add'>+to the kernel.  All code merged into the mainline kernel retains its</div><div class='add'>+original ownership; as a result, the kernel now has thousands of owners.</div><div class='add'>+</div><div class='add'>+One implication of this ownership structure is that any attempt to change</div><div class='add'>+the licensing of the kernel is doomed to almost certain failure.  There are</div><div class='add'>+few practical scenarios where the agreement of all copyright holders could</div><div class='add'>+be obtained (or their code removed from the kernel).  So, in particular,</div><div class='add'>+there is no prospect of a migration to version 3 of the GPL in the</div><div class='add'>+foreseeable future.</div><div class='add'>+</div><div class='add'>+It is imperative that all code contributed to the kernel be legitimately</div><div class='add'>+free software.  For that reason, code from anonymous (or pseudonymous)</div><div class='add'>+contributors will not be accepted.  All contributors are required to "sign</div><div class='add'>+off" on their code, stating that the code can be distributed with the</div><div class='add'>+kernel under the GPL.  Code which has not been licensed as free software by</div><div class='add'>+its owner, or which risks creating copyright-related problems for the</div><div class='add'>+kernel (such as code which derives from reverse-engineering efforts lacking</div><div class='add'>+proper safeguards) cannot be contributed.</div><div class='add'>+</div><div class='add'>+Questions about copyright-related issues are common on Linux development</div><div class='add'>+mailing lists.  Such questions will normally receive no shortage of</div><div class='add'>+answers, but one should bear in mind that the people answering those</div><div class='add'>+questions are not lawyers and cannot provide legal advice.  If you have</div><div class='add'>+legal questions relating to Linux source code, there is no substitute for</div><div class='add'>+talking with a lawyer who understands this field.  Relying on answers</div><div class='add'>+obtained on technical mailing lists is a risky affair.</div><div class='head'>diff --git a/Documentation/development-process/2.Process b/Documentation/development-process/2.Process<br/>new file mode 100644<br/>index 000000000000..d750321acd5a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/development-process/2.Process?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/development-process/2.Process</a></div><div class='hunk'>@@ -0,0 +1,459 @@</div><div class='add'>+2: HOW THE DEVELOPMENT PROCESS WORKS</div><div class='add'>+</div><div class='add'>+Linux kernel development in the early 1990's was a pretty loose affair,</div><div class='add'>+with relatively small numbers of users and developers involved.  With a</div><div class='add'>+user base in the millions and with some 2,000 developers involved over the</div><div class='add'>+course of one year, the kernel has since had to evolve a number of</div><div class='add'>+processes to keep development happening smoothly.  A solid understanding of</div><div class='add'>+how the process works is required in order to be an effective part of it.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+2.1: THE BIG PICTURE</div><div class='add'>+</div><div class='add'>+The kernel developers use a loosely time-based release process, with a new</div><div class='add'>+major kernel release happening every two or three months.  The recent</div><div class='add'>+release history looks like this:</div><div class='add'>+</div><div class='add'>+	2.6.26	July 13, 2008</div><div class='add'>+	2.6.25	April 16, 2008</div><div class='add'>+	2.6.24	January 24, 2008</div><div class='add'>+	2.6.23	October 9, 2007</div><div class='add'>+	2.6.22	July 8, 2007</div><div class='add'>+	2.6.21	April 25, 2007</div><div class='add'>+	2.6.20	February 4, 2007</div><div class='add'>+</div><div class='add'>+Every 2.6.x release is a major kernel release with new features, internal</div><div class='add'>+API changes, and more.  A typical 2.6 release can contain over 10,000</div><div class='add'>+changesets with changes to several hundred thousand lines of code.  2.6 is</div><div class='add'>+thus the leading edge of Linux kernel development; the kernel uses a</div><div class='add'>+rolling development model which is continually integrating major changes.</div><div class='add'>+</div><div class='add'>+A relatively straightforward discipline is followed with regard to the</div><div class='add'>+merging of patches for each release.  At the beginning of each development</div><div class='add'>+cycle, the "merge window" is said to be open.  At that time, code which is</div><div class='add'>+deemed to be sufficiently stable (and which is accepted by the development</div><div class='add'>+community) is merged into the mainline kernel.  The bulk of changes for a</div><div class='add'>+new development cycle (and all of the major changes) will be merged during</div><div class='add'>+this time, at a rate approaching 1,000 changes ("patches," or "changesets")</div><div class='add'>+per day.</div><div class='add'>+</div><div class='add'>+(As an aside, it is worth noting that the changes integrated during the</div><div class='add'>+merge window do not come out of thin air; they have been collected, tested,</div><div class='add'>+and staged ahead of time.  How that process works will be described in</div><div class='add'>+detail later on).</div><div class='add'>+</div><div class='add'>+The merge window lasts for two weeks.  At the end of this time, Linus</div><div class='add'>+Torvalds will declare that the window is closed and release the first of</div><div class='add'>+the "rc" kernels.  For the kernel which is destined to be 2.6.26, for</div><div class='add'>+example, the release which happens at the end of the merge window will be</div><div class='add'>+called 2.6.26-rc1.  The -rc1 release is the signal that the time to merge</div><div class='add'>+new features has passed, and that the time to stabilize the next kernel has</div><div class='add'>+begun.</div><div class='add'>+</div><div class='add'>+Over the next six to ten weeks, only patches which fix problems should be</div><div class='add'>+submitted to the mainline.  On occasion a more significant change will be</div><div class='add'>+allowed, but such occasions are rare; developers who try to merge new</div><div class='add'>+features outside of the merge window tend to get an unfriendly reception.</div><div class='add'>+As a general rule, if you miss the merge window for a given feature, the</div><div class='add'>+best thing to do is to wait for the next development cycle.  (An occasional</div><div class='add'>+exception is made for drivers for previously-unsupported hardware; if they</div><div class='add'>+touch no in-tree code, they cannot cause regressions and should be safe to</div><div class='add'>+add at any time).</div><div class='add'>+</div><div class='add'>+As fixes make their way into the mainline, the patch rate will slow over</div><div class='add'>+time.  Linus releases new -rc kernels about once a week; a normal series</div><div class='add'>+will get up to somewhere between -rc6 and -rc9 before the kernel is</div><div class='add'>+considered to be sufficiently stable and the final 2.6.x release is made.</div><div class='add'>+At that point the whole process starts over again.</div><div class='add'>+</div><div class='add'>+As an example, here is how the 2.6.25 development cycle went (all dates in</div><div class='add'>+2008): </div><div class='add'>+</div><div class='add'>+	January 24	2.6.24 stable release</div><div class='add'>+	February 10	2.6.25-rc1, merge window closes</div><div class='add'>+	February 15	2.6.25-rc2</div><div class='add'>+	February 24	2.6.25-rc3</div><div class='add'>+	March 4	 	2.6.25-rc4</div><div class='add'>+	March 9		2.6.25-rc5</div><div class='add'>+	March 16	2.6.25-rc6</div><div class='add'>+	March 25	2.6.25-rc7</div><div class='add'>+	April 1		2.6.25-rc8</div><div class='add'>+	April 11	2.6.25-rc9</div><div class='add'>+	April 16	2.6.25 stable release</div><div class='add'>+</div><div class='add'>+How do the developers decide when to close the development cycle and create</div><div class='add'>+the stable release?  The most significant metric used is the list of</div><div class='add'>+regressions from previous releases.  No bugs are welcome, but those which</div><div class='add'>+break systems which worked in the past are considered to be especially</div><div class='add'>+serious.  For this reason, patches which cause regressions are looked upon</div><div class='add'>+unfavorably and are quite likely to be reverted during the stabilization</div><div class='add'>+period. </div><div class='add'>+</div><div class='add'>+The developers' goal is to fix all known regressions before the stable</div><div class='add'>+release is made.  In the real world, this kind of perfection is hard to</div><div class='add'>+achieve; there are just too many variables in a project of this size.</div><div class='add'>+There comes a point where delaying the final release just makes the problem</div><div class='add'>+worse; the pile of changes waiting for the next merge window will grow</div><div class='add'>+larger, creating even more regressions the next time around.  So most 2.6.x</div><div class='add'>+kernels go out with a handful of known regressions though, hopefully, none</div><div class='add'>+of them are serious.</div><div class='add'>+</div><div class='add'>+Once a stable release is made, its ongoing maintenance is passed off to the</div><div class='add'>+"stable team," currently comprised of Greg Kroah-Hartman and Chris Wright.</div><div class='add'>+The stable team will release occasional updates to the stable release using</div><div class='add'>+the 2.6.x.y numbering scheme.  To be considered for an update release, a</div><div class='add'>+patch must (1) fix a significant bug, and (2) already be merged into the</div><div class='add'>+mainline for the next development kernel.  Continuing our 2.6.25 example,</div><div class='add'>+the history (as of this writing) is:</div><div class='add'>+</div><div class='add'>+	May 1		2.6.25.1</div><div class='add'>+	May 6		2.6.25.2 </div><div class='add'>+	May 9		2.6.25.3 </div><div class='add'>+	May 15		2.6.25.4</div><div class='add'>+	June 7		2.6.25.5</div><div class='add'>+	June 9		2.6.25.6</div><div class='add'>+	June 16		2.6.25.7</div><div class='add'>+	June 21		2.6.25.8</div><div class='add'>+	June 24		2.6.25.9</div><div class='add'>+</div><div class='add'>+Stable updates for a given kernel are made for approximately six months;</div><div class='add'>+after that, the maintenance of stable releases is solely the responsibility</div><div class='add'>+of the distributors which have shipped that particular kernel.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+2.2: THE LIFECYCLE OF A PATCH</div><div class='add'>+</div><div class='add'>+Patches do not go directly from the developer's keyboard into the mainline</div><div class='add'>+kernel.  There is, instead, a somewhat involved (if somewhat informal)</div><div class='add'>+process designed to ensure that each patch is reviewed for quality and that</div><div class='add'>+each patch implements a change which is desirable to have in the mainline.</div><div class='add'>+This process can happen quickly for minor fixes, or, in the case of large</div><div class='add'>+and controversial changes, go on for years.  Much developer frustration</div><div class='add'>+comes from a lack of understanding of this process or from attempts to</div><div class='add'>+circumvent it.  </div><div class='add'>+</div><div class='add'>+In the hopes of reducing that frustration, this document will describe how</div><div class='add'>+a patch gets into the kernel.  What follows below is an introduction which</div><div class='add'>+describes the process in a somewhat idealized way.  A much more detailed</div><div class='add'>+treatment will come in later sections.</div><div class='add'>+</div><div class='add'>+The stages that a patch goes through are, generally:</div><div class='add'>+</div><div class='add'>+ - Design.  This is where the real requirements for the patch - and the way</div><div class='add'>+   those requirements will be met - are laid out.  Design work is often</div><div class='add'>+   done without involving the community, but it is better to do this work</div><div class='add'>+   in the open if at all possible; it can save a lot of time redesigning</div><div class='add'>+   things later.</div><div class='add'>+</div><div class='add'>+ - Early review.  Patches are posted to the relevant mailing list, and</div><div class='add'>+   developers on that list reply with any comments they may have.  This</div><div class='add'>+   process should turn up any major problems with a patch if all goes</div><div class='add'>+   well.</div><div class='add'>+</div><div class='add'>+ - Wider review.  When the patch is getting close to ready for mainline</div><div class='add'>+   inclusion, it will be accepted by a relevant subsystem maintainer -</div><div class='add'>+   though this acceptance is not a guarantee that the patch will make it</div><div class='add'>+   all the way to the mainline.  The patch will show up in the maintainer's</div><div class='add'>+   subsystem tree and into the staging trees (described below).  When the</div><div class='add'>+   process works, this step leads to more extensive review of the patch and</div><div class='add'>+   the discovery of any problems resulting from the integration of this</div><div class='add'>+   patch with work being done by others.</div><div class='add'>+</div><div class='add'>+ - Merging into the mainline.  Eventually, a successful patch will be</div><div class='add'>+   merged into the mainline repository managed by Linus Torvalds.  More</div><div class='add'>+   comments and/or problems may surface at this time; it is important that</div><div class='add'>+   the developer be responsive to these and fix any issues which arise.</div><div class='add'>+</div><div class='add'>+ - Stable release.  The number of users potentially affected by the patch</div><div class='add'>+   is now large, so, once again, new problems may arise.</div><div class='add'>+</div><div class='add'>+ - Long-term maintenance.  While it is certainly possible for a developer</div><div class='add'>+   to forget about code after merging it, that sort of behavior tends to</div><div class='add'>+   leave a poor impression in the development community.  Merging code</div><div class='add'>+   eliminates some of the maintenance burden, in that others will fix</div><div class='add'>+   problems caused by API changes.  But the original developer should</div><div class='add'>+   continue to take responsibility for the code if it is to remain useful</div><div class='add'>+   in the longer term.</div><div class='add'>+</div><div class='add'>+One of the largest mistakes made by kernel developers (or their employers)</div><div class='add'>+is to try to cut the process down to a single "merging into the mainline"</div><div class='add'>+step.  This approach invariably leads to frustration for everybody</div><div class='add'>+involved.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+2.3: HOW PATCHES GET INTO THE KERNEL</div><div class='add'>+</div><div class='add'>+There is exactly one person who can merge patches into the mainline kernel</div><div class='add'>+repository: Linus Torvalds.  But, of the over 12,000 patches which went</div><div class='add'>+into the 2.6.25 kernel, only 250 (around 2%) were directly chosen by Linus</div><div class='add'>+himself.  The kernel project has long since grown to a size where no single</div><div class='add'>+developer could possibly inspect and select every patch unassisted.  The</div><div class='add'>+way the kernel developers have addressed this growth is through the use of</div><div class='add'>+a lieutenant system built around a chain of trust.</div><div class='add'>+</div><div class='add'>+The kernel code base is logically broken down into a set of subsystems:</div><div class='add'>+networking, specific architecture support, memory management, video</div><div class='add'>+devices, etc.  Most subsystems have a designated maintainer, a developer</div><div class='add'>+who has overall responsibility for the code within that subsystem.  These</div><div class='add'>+subsystem maintainers are the gatekeepers (in a loose way) for the portion</div><div class='add'>+of the kernel they manage; they are the ones who will (usually) accept a</div><div class='add'>+patch for inclusion into the mainline kernel.</div><div class='add'>+</div><div class='add'>+Subsystem maintainers each manage their own version of the kernel source</div><div class='add'>+tree, usually (but certainly not always) using the git source management</div><div class='add'>+tool.  Tools like git (and related tools like quilt or mercurial) allow</div><div class='add'>+maintainers to track a list of patches, including authorship information</div><div class='add'>+and other metadata.  At any given time, the maintainer can identify which</div><div class='add'>+patches in his or her repository are not found in the mainline.</div><div class='add'>+</div><div class='add'>+When the merge window opens, top-level maintainers will ask Linus to "pull"</div><div class='add'>+the patches they have selected for merging from their repositories.  If</div><div class='add'>+Linus agrees, the stream of patches will flow up into his repository,</div><div class='add'>+becoming part of the mainline kernel.  The amount of attention that Linus</div><div class='add'>+pays to specific patches received in a pull operation varies.  It is clear</div><div class='add'>+that, sometimes, he looks quite closely.  But, as a general rule, Linus</div><div class='add'>+trusts the subsystem maintainers to not send bad patches upstream.</div><div class='add'>+</div><div class='add'>+Subsystem maintainers, in turn, can pull patches from other maintainers.</div><div class='add'>+For example, the networking tree is built from patches which accumulated</div><div class='add'>+first in trees dedicated to network device drivers, wireless networking,</div><div class='add'>+etc.  This chain of repositories can be arbitrarily long, though it rarely</div><div class='add'>+exceeds two or three links.  Since each maintainer in the chain trusts</div><div class='add'>+those managing lower-level trees, this process is known as the "chain of</div><div class='add'>+trust." </div><div class='add'>+</div><div class='add'>+Clearly, in a system like this, getting patches into the kernel depends on</div><div class='add'>+finding the right maintainer.  Sending patches directly to Linus is not</div><div class='add'>+normally the right way to go.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+2.4: STAGING TREES</div><div class='add'>+</div><div class='add'>+The chain of subsystem trees guides the flow of patches into the kernel,</div><div class='add'>+but it also raises an interesting question: what if somebody wants to look</div><div class='add'>+at all of the patches which are being prepared for the next merge window?</div><div class='add'>+Developers will be interested in what other changes are pending to see</div><div class='add'>+whether there are any conflicts to worry about; a patch which changes a</div><div class='add'>+core kernel function prototype, for example, will conflict with any other</div><div class='add'>+patches which use the older form of that function.  Reviewers and testers</div><div class='add'>+want access to the changes in their integrated form before all of those</div><div class='add'>+changes land in the mainline kernel.  One could pull changes from all of</div><div class='add'>+the interesting subsystem trees, but that would be a big and error-prone</div><div class='add'>+job.</div><div class='add'>+</div><div class='add'>+The answer comes in the form of staging trees, where subsystem trees are</div><div class='add'>+collected for testing and review.  The older of these trees, maintained by</div><div class='add'>+Andrew Morton, is called "-mm" (for memory management, which is how it got</div><div class='add'>+started).  The -mm tree integrates patches from a long list of subsystem</div><div class='add'>+trees; it also has some patches aimed at helping with debugging.  </div><div class='add'>+</div><div class='add'>+Beyond that, -mm contains a significant collection of patches which have</div><div class='add'>+been selected by Andrew directly.  These patches may have been posted on a</div><div class='add'>+mailing list, or they may apply to a part of the kernel for which there is</div><div class='add'>+no designated subsystem tree.  As a result, -mm operates as a sort of</div><div class='add'>+subsystem tree of last resort; if there is no other obvious path for a</div><div class='add'>+patch into the mainline, it is likely to end up in -mm.  Miscellaneous</div><div class='add'>+patches which accumulate in -mm will eventually either be forwarded on to</div><div class='add'>+an appropriate subsystem tree or be sent directly to Linus.  In a typical</div><div class='add'>+development cycle, approximately 10% of the patches going into the mainline</div><div class='add'>+get there via -mm.</div><div class='add'>+</div><div class='add'>+The current -mm patch can always be found from the front page of</div><div class='add'>+</div><div class='add'>+	http://kernel.org/</div><div class='add'>+</div><div class='add'>+Those who want to see the current state of -mm can get the "-mm of the</div><div class='add'>+moment" tree, found at:</div><div class='add'>+</div><div class='add'>+	http://userweb.kernel.org/~akpm/mmotm/</div><div class='add'>+</div><div class='add'>+Use of the MMOTM tree is likely to be a frustrating experience, though;</div><div class='add'>+there is a definite chance that it will not even compile.</div><div class='add'>+</div><div class='add'>+The other staging tree, started more recently, is linux-next, maintained by</div><div class='add'>+Stephen Rothwell.  The linux-next tree is, by design, a snapshot of what</div><div class='add'>+the mainline is expected to look like after the next merge window closes.</div><div class='add'>+Linux-next trees are announced on the linux-kernel and linux-next mailing</div><div class='add'>+lists when they are assembled; they can be downloaded from:</div><div class='add'>+</div><div class='add'>+	http://www.kernel.org/pub/linux/kernel/people/sfr/linux-next/</div><div class='add'>+</div><div class='add'>+Some information about linux-next has been gathered at:</div><div class='add'>+</div><div class='add'>+	http://linux.f-seidel.de/linux-next/pmwiki/</div><div class='add'>+</div><div class='add'>+How the linux-next tree will fit into the development process is still</div><div class='add'>+changing.  As of this writing, the first full development cycle involving</div><div class='add'>+linux-next (2.6.26) is coming to an end; thus far, it has proved to be a</div><div class='add'>+valuable resource for finding and fixing integration problems before the</div><div class='add'>+beginning of the merge window.  See http://lwn.net/Articles/287155/ for</div><div class='add'>+more information on how linux-next has worked to set up the 2.6.27 merge</div><div class='add'>+window.</div><div class='add'>+</div><div class='add'>+Some developers have begun to suggest that linux-next should be used as the</div><div class='add'>+target for future development as well.  The linux-next tree does tend to be</div><div class='add'>+far ahead of the mainline and is more representative of the tree into which</div><div class='add'>+any new work will be merged.  The downside to this idea is that the</div><div class='add'>+volatility of linux-next tends to make it a difficult development target.</div><div class='add'>+See http://lwn.net/Articles/289013/ for more information on this topic, and</div><div class='add'>+stay tuned; much is still in flux where linux-next is involved.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+2.5: TOOLS</div><div class='add'>+</div><div class='add'>+As can be seen from the above text, the kernel development process depends</div><div class='add'>+heavily on the ability to herd collections of patches in various</div><div class='add'>+directions.  The whole thing would not work anywhere near as well as it</div><div class='add'>+does without suitably powerful tools.  Tutorials on how to use these tools</div><div class='add'>+are well beyond the scope of this document, but there is space for a few</div><div class='add'>+pointers.</div><div class='add'>+</div><div class='add'>+By far the dominant source code management system used by the kernel</div><div class='add'>+community is git.  Git is one of a number of distributed version control</div><div class='add'>+systems being developed in the free software community.  It is well tuned</div><div class='add'>+for kernel development, in that it performs quite well when dealing with</div><div class='add'>+large repositories and large numbers of patches.  It also has a reputation</div><div class='add'>+for being difficult to learn and use, though it has gotten better over</div><div class='add'>+time.  Some sort of familiarity with git is almost a requirement for kernel</div><div class='add'>+developers; even if they do not use it for their own work, they'll need git</div><div class='add'>+to keep up with what other developers (and the mainline) are doing.</div><div class='add'>+</div><div class='add'>+Git is now packaged by almost all Linux distributions.  There is a home</div><div class='add'>+page at </div><div class='add'>+</div><div class='add'>+	http://git.or.cz/</div><div class='add'>+</div><div class='add'>+That page has pointers to documentation and tutorials.  One should be</div><div class='add'>+aware, in particular, of the Kernel Hacker's Guide to git, which has</div><div class='add'>+information specific to kernel development:</div><div class='add'>+</div><div class='add'>+	http://linux.yyz.us/git-howto.html</div><div class='add'>+</div><div class='add'>+Among the kernel developers who do not use git, the most popular choice is</div><div class='add'>+almost certainly Mercurial:</div><div class='add'>+</div><div class='add'>+	http://www.selenic.com/mercurial/</div><div class='add'>+</div><div class='add'>+Mercurial shares many features with git, but it provides an interface which</div><div class='add'>+many find easier to use.</div><div class='add'>+</div><div class='add'>+The other tool worth knowing about is Quilt:</div><div class='add'>+</div><div class='add'>+	http://savannah.nongnu.org/projects/quilt/</div><div class='add'>+</div><div class='add'>+Quilt is a patch management system, rather than a source code management</div><div class='add'>+system.  It does not track history over time; it is, instead, oriented</div><div class='add'>+toward tracking a specific set of changes against an evolving code base.</div><div class='add'>+Some major subsystem maintainers use quilt to manage patches intended to go</div><div class='add'>+upstream.  For the management of certain kinds of trees (-mm, for example),</div><div class='add'>+quilt is the best tool for the job.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+2.6: MAILING LISTS</div><div class='add'>+</div><div class='add'>+A great deal of Linux kernel development work is done by way of mailing</div><div class='add'>+lists.  It is hard to be a fully-functioning member of the community</div><div class='add'>+without joining at least one list somewhere.  But Linux mailing lists also</div><div class='add'>+represent a potential hazard to developers, who risk getting buried under a</div><div class='add'>+load of electronic mail, running afoul of the conventions used on the Linux</div><div class='add'>+lists, or both.</div><div class='add'>+</div><div class='add'>+Most kernel mailing lists are run on vger.kernel.org; the master list can</div><div class='add'>+be found at:</div><div class='add'>+</div><div class='add'>+	http://vger.kernel.org/vger-lists.html</div><div class='add'>+</div><div class='add'>+There are lists hosted elsewhere, though; a number of them are at</div><div class='add'>+lists.redhat.com.</div><div class='add'>+</div><div class='add'>+The core mailing list for kernel development is, of course, linux-kernel.</div><div class='add'>+This list is an intimidating place to be; volume can reach 500 messages per</div><div class='add'>+day, the amount of noise is high, the conversation can be severely</div><div class='add'>+technical, and participants are not always concerned with showing a high</div><div class='add'>+degree of politeness.  But there is no other place where the kernel</div><div class='add'>+development community comes together as a whole; developers who avoid this</div><div class='add'>+list will miss important information.</div><div class='add'>+</div><div class='add'>+There are a few hints which can help with linux-kernel survival:</div><div class='add'>+</div><div class='add'>+- Have the list delivered to a separate folder, rather than your main</div><div class='add'>+  mailbox.  One must be able to ignore the stream for sustained periods of</div><div class='add'>+  time.</div><div class='add'>+</div><div class='add'>+- Do not try to follow every conversation - nobody else does.  It is</div><div class='add'>+  important to filter on both the topic of interest (though note that</div><div class='add'>+  long-running conversations can drift away from the original subject</div><div class='add'>+  without changing the email subject line) and the people who are</div><div class='add'>+  participating.  </div><div class='add'>+</div><div class='add'>+- Do not feed the trolls.  If somebody is trying to stir up an angry</div><div class='add'>+  response, ignore them.</div><div class='add'>+</div><div class='add'>+- When responding to linux-kernel email (or that on other lists) preserve</div><div class='add'>+  the Cc: header for all involved.  In the absence of a strong reason (such</div><div class='add'>+  as an explicit request), you should never remove recipients.  Always make</div><div class='add'>+  sure that the person you are responding to is in the Cc: list.  This</div><div class='add'>+  convention also makes it unnecessary to explicitly ask to be copied on</div><div class='add'>+  replies to your postings.</div><div class='add'>+</div><div class='add'>+- Search the list archives (and the net as a whole) before asking</div><div class='add'>+  questions.  Some developers can get impatient with people who clearly</div><div class='add'>+  have not done their homework.</div><div class='add'>+</div><div class='add'>+- Avoid top-posting (the practice of putting your answer above the quoted</div><div class='add'>+  text you are responding to).  It makes your response harder to read and</div><div class='add'>+  makes a poor impression.</div><div class='add'>+</div><div class='add'>+- Ask on the correct mailing list.  Linux-kernel may be the general meeting</div><div class='add'>+  point, but it is not the best place to find developers from all</div><div class='add'>+  subsystems.</div><div class='add'>+</div><div class='add'>+The last point - finding the correct mailing list - is a common place for</div><div class='add'>+beginning developers to go wrong.  Somebody who asks a networking-related</div><div class='add'>+question on linux-kernel will almost certainly receive a polite suggestion</div><div class='add'>+to ask on the netdev list instead, as that is the list frequented by most</div><div class='add'>+networking developers.  Other lists exist for the SCSI, video4linux, IDE,</div><div class='add'>+filesystem, etc. subsystems.  The best place to look for mailing lists is</div><div class='add'>+in the MAINTAINERS file packaged with the kernel source.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+2.7: GETTING STARTED WITH KERNEL DEVELOPMENT</div><div class='add'>+</div><div class='add'>+Questions about how to get started with the kernel development process are</div><div class='add'>+common - from both individuals and companies.  Equally common are missteps</div><div class='add'>+which make the beginning of the relationship harder than it has to be.</div><div class='add'>+</div><div class='add'>+Companies often look to hire well-known developers to get a development</div><div class='add'>+group started.  This can, in fact, be an effective technique.  But it also</div><div class='add'>+tends to be expensive and does not do much to grow the pool of experienced</div><div class='add'>+kernel developers.  It is possible to bring in-house developers up to speed</div><div class='add'>+on Linux kernel development, given the investment of a bit of time.  Taking</div><div class='add'>+this time can endow an employer with a group of developers who understand</div><div class='add'>+the kernel and the company both, and who can help to train others as well.</div><div class='add'>+Over the medium term, this is often the more profitable approach.</div><div class='add'>+</div><div class='add'>+Individual developers are often, understandably, at a loss for a place to</div><div class='add'>+start.  Beginning with a large project can be intimidating; one often wants</div><div class='add'>+to test the waters with something smaller first.  This is the point where</div><div class='add'>+some developers jump into the creation of patches fixing spelling errors or</div><div class='add'>+minor coding style issues.  Unfortunately, such patches create a level of</div><div class='add'>+noise which is distracting for the development community as a whole, so,</div><div class='add'>+increasingly, they are looked down upon.  New developers wishing to</div><div class='add'>+introduce themselves to the community will not get the sort of reception</div><div class='add'>+they wish for by these means.</div><div class='add'>+</div><div class='add'>+Andrew Morton gives this advice for aspiring kernel developers</div><div class='add'>+</div><div class='add'>+	The #1 project for all kernel beginners should surely be "make sure</div><div class='add'>+	that the kernel runs perfectly at all times on all machines which</div><div class='add'>+	you can lay your hands on".  Usually the way to do this is to work</div><div class='add'>+	with others on getting things fixed up (this can require</div><div class='add'>+	persistence!) but that's fine - it's a part of kernel development.</div><div class='add'>+</div><div class='add'>+(http://lwn.net/Articles/283982/).</div><div class='add'>+</div><div class='add'>+In the absence of obvious problems to fix, developers are advised to look</div><div class='add'>+at the current lists of regressions and open bugs in general.  There is</div><div class='add'>+never any shortage of issues in need of fixing; by addressing these issues,</div><div class='add'>+developers will gain experience with the process while, at the same time,</div><div class='add'>+building respect with the rest of the development community.</div><div class='head'>diff --git a/Documentation/development-process/3.Early-stage b/Documentation/development-process/3.Early-stage<br/>new file mode 100644<br/>index 000000000000..307a159a70ca<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/development-process/3.Early-stage?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/development-process/3.Early-stage</a></div><div class='hunk'>@@ -0,0 +1,195 @@</div><div class='add'>+3: EARLY-STAGE PLANNING</div><div class='add'>+</div><div class='add'>+When contemplating a Linux kernel development project, it can be tempting</div><div class='add'>+to jump right in and start coding.  As with any significant project,</div><div class='add'>+though, much of the groundwork for success is best laid before the first</div><div class='add'>+line of code is written.  Some time spent in early planning and</div><div class='add'>+communication can save far more time later on.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+3.1: SPECIFYING THE PROBLEM</div><div class='add'>+</div><div class='add'>+Like any engineering project, a successful kernel enhancement starts with a</div><div class='add'>+clear description of the problem to be solved.  In some cases, this step is</div><div class='add'>+easy: when a driver is needed for a specific piece of hardware, for</div><div class='add'>+example.  In others, though, it is tempting to confuse the real problem</div><div class='add'>+with the proposed solution, and that can lead to difficulties.</div><div class='add'>+</div><div class='add'>+Consider an example: some years ago, developers working with Linux audio</div><div class='add'>+sought a way to run applications without dropouts or other artifacts caused</div><div class='add'>+by excessive latency in the system.  The solution they arrived at was a</div><div class='add'>+kernel module intended to hook into the Linux Security Module (LSM)</div><div class='add'>+framework; this module could be configured to give specific applications</div><div class='add'>+access to the realtime scheduler.  This module was implemented and sent to</div><div class='add'>+the linux-kernel mailing list, where it immediately ran into problems.</div><div class='add'>+</div><div class='add'>+To the audio developers, this security module was sufficient to solve their</div><div class='add'>+immediate problem.  To the wider kernel community, though, it was seen as a</div><div class='add'>+misuse of the LSM framework (which is not intended to confer privileges</div><div class='add'>+onto processes which they would not otherwise have) and a risk to system</div><div class='add'>+stability.  Their preferred solutions involved realtime scheduling access</div><div class='add'>+via the rlimit mechanism for the short term, and ongoing latency reduction</div><div class='add'>+work in the long term.</div><div class='add'>+</div><div class='add'>+The audio community, however, could not see past the particular solution</div><div class='add'>+they had implemented; they were unwilling to accept alternatives.  The</div><div class='add'>+resulting disagreement left those developers feeling disillusioned with the</div><div class='add'>+entire kernel development process; one of them went back to an audio list</div><div class='add'>+and posted this:</div><div class='add'>+</div><div class='add'>+	There are a number of very good Linux kernel developers, but they</div><div class='add'>+	tend to get outshouted by a large crowd of arrogant fools. Trying</div><div class='add'>+	to communicate user requirements to these people is a waste of</div><div class='add'>+	time. They are much too "intelligent" to listen to lesser mortals.</div><div class='add'>+</div><div class='add'>+(http://lwn.net/Articles/131776/).</div><div class='add'>+</div><div class='add'>+The reality of the situation was different; the kernel developers were far</div><div class='add'>+more concerned about system stability, long-term maintenance, and finding</div><div class='add'>+the right solution to the problem than they were with a specific module.</div><div class='add'>+The moral of the story is to focus on the problem - not a specific solution</div><div class='add'>+- and to discuss it with the development community before investing in the</div><div class='add'>+creation of a body of code.</div><div class='add'>+</div><div class='add'>+So, when contemplating a kernel development project, one should obtain</div><div class='add'>+answers to a short set of questions:</div><div class='add'>+</div><div class='add'>+ - What, exactly, is the problem which needs to be solved?</div><div class='add'>+</div><div class='add'>+ - Who are the users affected by this problem?  Which use cases should the</div><div class='add'>+   solution address?</div><div class='add'>+</div><div class='add'>+ - How does the kernel fall short in addressing that problem now?</div><div class='add'>+</div><div class='add'>+Only then does it make sense to start considering possible solutions.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+3.2: EARLY DISCUSSION</div><div class='add'>+</div><div class='add'>+When planning a kernel development project, it makes great sense to hold</div><div class='add'>+discussions with the community before launching into implementation.  Early</div><div class='add'>+communication can save time and trouble in a number of ways:</div><div class='add'>+</div><div class='add'>+ - It may well be that the problem is addressed by the kernel in ways which</div><div class='add'>+   you have not understood.  The Linux kernel is large and has a number of</div><div class='add'>+   features and capabilities which are not immediately obvious.  Not all</div><div class='add'>+   kernel capabilities are documented as well as one might like, and it is</div><div class='add'>+   easy to miss things.  Your author has seen the posting of a complete</div><div class='add'>+   driver which duplicated an existing driver that the new author had been</div><div class='add'>+   unaware of.  Code which reinvents existing wheels is not only wasteful;</div><div class='add'>+   it will also not be accepted into the mainline kernel.</div><div class='add'>+</div><div class='add'>+ - There may be elements of the proposed solution which will not be</div><div class='add'>+   acceptable for mainline merging.  It is better to find out about</div><div class='add'>+   problems like this before writing the code.</div><div class='add'>+</div><div class='add'>+ - It's entirely possible that other developers have thought about the</div><div class='add'>+   problem; they may have ideas for a better solution, and may be willing</div><div class='add'>+   to help in the creation of that solution.</div><div class='add'>+</div><div class='add'>+Years of experience with the kernel development community have taught a</div><div class='add'>+clear lesson: kernel code which is designed and developed behind closed</div><div class='add'>+doors invariably has problems which are only revealed when the code is</div><div class='add'>+released into the community.  Sometimes these problems are severe,</div><div class='add'>+requiring months or years of effort before the code can be brought up to</div><div class='add'>+the kernel community's standards.  Some examples include:</div><div class='add'>+</div><div class='add'>+ - The Devicescape network stack was designed and implemented for</div><div class='add'>+   single-processor systems.  It could not be merged into the mainline</div><div class='add'>+   until it was made suitable for multiprocessor systems.  Retrofitting</div><div class='add'>+   locking and such into code is a difficult task; as a result, the merging</div><div class='add'>+   of this code (now called mac80211) was delayed for over a year.</div><div class='add'>+</div><div class='add'>+ - The Reiser4 filesystem included a number of capabilities which, in the</div><div class='add'>+   core kernel developers' opinion, should have been implemented in the</div><div class='add'>+   virtual filesystem layer instead.  It also included features which could</div><div class='add'>+   not easily be implemented without exposing the system to user-caused</div><div class='add'>+   deadlocks.  The late revelation of these problems - and refusal to</div><div class='add'>+   address some of them - has caused Reiser4 to stay out of the mainline</div><div class='add'>+   kernel.</div><div class='add'>+</div><div class='add'>+ - The AppArmor security module made use of internal virtual filesystem</div><div class='add'>+   data structures in ways which were considered to be unsafe and</div><div class='add'>+   unreliable.  This code has since been significantly reworked, but</div><div class='add'>+   remains outside of the mainline.</div><div class='add'>+</div><div class='add'>+In each of these cases, a great deal of pain and extra work could have been</div><div class='add'>+avoided with some early discussion with the kernel developers.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+3.3: WHO DO YOU TALK TO?</div><div class='add'>+</div><div class='add'>+When developers decide to take their plans public, the next question will</div><div class='add'>+be: where do we start?  The answer is to find the right mailing list(s) and</div><div class='add'>+the right maintainer.  For mailing lists, the best approach is to look in</div><div class='add'>+the MAINTAINERS file for a relevant place to post.  If there is a suitable</div><div class='add'>+subsystem list, posting there is often preferable to posting on</div><div class='add'>+linux-kernel; you are more likely to reach developers with expertise in the</div><div class='add'>+relevant subsystem and the environment may be more supportive.</div><div class='add'>+</div><div class='add'>+Finding maintainers can be a bit harder.  Again, the MAINTAINERS file is</div><div class='add'>+the place to start.  That file tends to not always be up to date, though,</div><div class='add'>+and not all subsystems are represented there.  The person listed in the</div><div class='add'>+MAINTAINERS file may, in fact, not be the person who is actually acting in</div><div class='add'>+that role currently.  So, when there is doubt about who to contact, a</div><div class='add'>+useful trick is to use git (and "git log" in particular) to see who is</div><div class='add'>+currently active within the subsystem of interest.  Look at who is writing</div><div class='add'>+patches, and who, if anybody, is attaching Signed-off-by lines to those</div><div class='add'>+patches.  Those are the people who will be best placed to help with a new</div><div class='add'>+development project.</div><div class='add'>+</div><div class='add'>+If all else fails, talking to Andrew Morton can be an effective way to</div><div class='add'>+track down a maintainer for a specific piece of code.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+3.4: WHEN TO POST?</div><div class='add'>+</div><div class='add'>+If possible, posting your plans during the early stages can only be</div><div class='add'>+helpful.  Describe the problem being solved and any plans that have been</div><div class='add'>+made on how the implementation will be done.  Any information you can</div><div class='add'>+provide can help the development community provide useful input on the</div><div class='add'>+project.</div><div class='add'>+</div><div class='add'>+One discouraging thing which can happen at this stage is not a hostile</div><div class='add'>+reaction, but, instead, little or no reaction at all.  The sad truth of the</div><div class='add'>+matter is (1) kernel developers tend to be busy, (2) there is no shortage</div><div class='add'>+of people with grand plans and little code (or even prospect of code) to</div><div class='add'>+back them up, and (3) nobody is obligated to review or comment on ideas</div><div class='add'>+posted by others.  If a request-for-comments posting yields little in the</div><div class='add'>+way of comments, do not assume that it means there is no interest in the</div><div class='add'>+project.  Unfortunately, you also cannot assume that there are no problems</div><div class='add'>+with your idea.  The best thing to do in this situation is to proceed,</div><div class='add'>+keeping the community informed as you go.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+3.5: GETTING OFFICIAL BUY-IN</div><div class='add'>+</div><div class='add'>+If your work is being done in a corporate environment - as most Linux</div><div class='add'>+kernel work is - you must, obviously, have permission from suitably</div><div class='add'>+empowered managers before you can post your company's plans or code to a</div><div class='add'>+public mailing list.  The posting of code which has not been cleared for</div><div class='add'>+release under a GPL-compatible license can be especially problematic; the</div><div class='add'>+sooner that a company's management and legal staff can agree on the posting</div><div class='add'>+of a kernel development project, the better off everybody involved will be.</div><div class='add'>+</div><div class='add'>+Some readers may be thinking at this point that their kernel work is</div><div class='add'>+intended to support a product which does not yet have an officially</div><div class='add'>+acknowledged existence.  Revealing their employer's plans on a public</div><div class='add'>+mailing list may not be a viable option.  In cases like this, it is worth</div><div class='add'>+considering whether the secrecy is really necessary; there is often no real</div><div class='add'>+need to keep development plans behind closed doors.</div><div class='add'>+</div><div class='add'>+That said, there are also cases where a company legitimately cannot</div><div class='add'>+disclose its plans early in the development process.  Companies with</div><div class='add'>+experienced kernel developers may choose to proceed in an open-loop manner</div><div class='add'>+on the assumption that they will be able to avoid serious integration</div><div class='add'>+problems later.  For companies without that sort of in-house expertise, the</div><div class='add'>+best option is often to hire an outside developer to review the plans under</div><div class='add'>+a non-disclosure agreement.  The Linux Foundation operates an NDA program</div><div class='add'>+designed to help with this sort of situation; more information can be found</div><div class='add'>+at:</div><div class='add'>+</div><div class='add'>+    http://www.linuxfoundation.org/en/NDA_program</div><div class='add'>+</div><div class='add'>+This kind of review is often enough to avoid serious problems later on</div><div class='add'>+without requiring public disclosure of the project.</div><div class='head'>diff --git a/Documentation/development-process/4.Coding b/Documentation/development-process/4.Coding<br/>new file mode 100644<br/>index 000000000000..014aca8f14e2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/development-process/4.Coding?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/development-process/4.Coding</a></div><div class='hunk'>@@ -0,0 +1,384 @@</div><div class='add'>+4: GETTING THE CODE RIGHT</div><div class='add'>+</div><div class='add'>+While there is much to be said for a solid and community-oriented design</div><div class='add'>+process, the proof of any kernel development project is in the resulting</div><div class='add'>+code.  It is the code which will be examined by other developers and merged</div><div class='add'>+(or not) into the mainline tree.  So it is the quality of this code which</div><div class='add'>+will determine the ultimate success of the project.</div><div class='add'>+</div><div class='add'>+This section will examine the coding process.  We'll start with a look at a</div><div class='add'>+number of ways in which kernel developers can go wrong.  Then the focus</div><div class='add'>+will shift toward doing things right and the tools which can help in that</div><div class='add'>+quest.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+4.1: PITFALLS</div><div class='add'>+</div><div class='add'>+* Coding style</div><div class='add'>+</div><div class='add'>+The kernel has long had a standard coding style, described in</div><div class='add'>+Documentation/CodingStyle.  For much of that time, the policies described</div><div class='add'>+in that file were taken as being, at most, advisory.  As a result, there is</div><div class='add'>+a substantial amount of code in the kernel which does not meet the coding</div><div class='add'>+style guidelines.  The presence of that code leads to two independent</div><div class='add'>+hazards for kernel developers.</div><div class='add'>+</div><div class='add'>+The first of these is to believe that the kernel coding standards do not</div><div class='add'>+matter and are not enforced.  The truth of the matter is that adding new</div><div class='add'>+code to the kernel is very difficult if that code is not coded according to</div><div class='add'>+the standard; many developers will request that the code be reformatted</div><div class='add'>+before they will even review it.  A code base as large as the kernel</div><div class='add'>+requires some uniformity of code to make it possible for developers to</div><div class='add'>+quickly understand any part of it.  So there is no longer room for</div><div class='add'>+strangely-formatted code.</div><div class='add'>+</div><div class='add'>+Occasionally, the kernel's coding style will run into conflict with an</div><div class='add'>+employer's mandated style.  In such cases, the kernel's style will have to</div><div class='add'>+win before the code can be merged.  Putting code into the kernel means</div><div class='add'>+giving up a degree of control in a number of ways - including control over</div><div class='add'>+how the code is formatted.</div><div class='add'>+</div><div class='add'>+The other trap is to assume that code which is already in the kernel is</div><div class='add'>+urgently in need of coding style fixes.  Developers may start to generate</div><div class='add'>+reformatting patches as a way of gaining familiarity with the process, or</div><div class='add'>+as a way of getting their name into the kernel changelogs - or both.  But</div><div class='add'>+pure coding style fixes are seen as noise by the development community;</div><div class='add'>+they tend to get a chilly reception.  So this type of patch is best</div><div class='add'>+avoided.  It is natural to fix the style of a piece of code while working</div><div class='add'>+on it for other reasons, but coding style changes should not be made for</div><div class='add'>+their own sake.</div><div class='add'>+</div><div class='add'>+The coding style document also should not be read as an absolute law which</div><div class='add'>+can never be transgressed.  If there is a good reason to go against the</div><div class='add'>+style (a line which becomes far less readable if split to fit within the</div><div class='add'>+80-column limit, for example), just do it.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+* Abstraction layers</div><div class='add'>+</div><div class='add'>+Computer Science professors teach students to make extensive use of</div><div class='add'>+abstraction layers in the name of flexibility and information hiding.</div><div class='add'>+Certainly the kernel makes extensive use of abstraction; no project</div><div class='add'>+involving several million lines of code could do otherwise and survive.</div><div class='add'>+But experience has shown that excessive or premature abstraction can be</div><div class='add'>+just as harmful as premature optimization.  Abstraction should be used to</div><div class='add'>+the level required and no further.</div><div class='add'>+</div><div class='add'>+At a simple level, consider a function which has an argument which is</div><div class='add'>+always passed as zero by all callers.  One could retain that argument just</div><div class='add'>+in case somebody eventually needs to use the extra flexibility that it</div><div class='add'>+provides.  By that time, though, chances are good that the code which</div><div class='add'>+implements this extra argument has been broken in some subtle way which was</div><div class='add'>+never noticed - because it has never been used.  Or, when the need for</div><div class='add'>+extra flexibility arises, it does not do so in a way which matches the</div><div class='add'>+programmer's early expectation.  Kernel developers will routinely submit</div><div class='add'>+patches to remove unused arguments; they should, in general, not be added</div><div class='add'>+in the first place.</div><div class='add'>+</div><div class='add'>+Abstraction layers which hide access to hardware - often to allow the bulk</div><div class='add'>+of a driver to be used with multiple operating systems - are especially</div><div class='add'>+frowned upon.  Such layers obscure the code and may impose a performance</div><div class='add'>+penalty; they do not belong in the Linux kernel.</div><div class='add'>+</div><div class='add'>+On the other hand, if you find yourself copying significant amounts of code</div><div class='add'>+from another kernel subsystem, it is time to ask whether it would, in fact,</div><div class='add'>+make sense to pull out some of that code into a separate library or to</div><div class='add'>+implement that functionality at a higher level.  There is no value in</div><div class='add'>+replicating the same code throughout the kernel.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+* #ifdef and preprocessor use in general</div><div class='add'>+</div><div class='add'>+The C preprocessor seems to present a powerful temptation to some C</div><div class='add'>+programmers, who see it as a way to efficiently encode a great deal of</div><div class='add'>+flexibility into a source file.  But the preprocessor is not C, and heavy</div><div class='add'>+use of it results in code which is much harder for others to read and</div><div class='add'>+harder for the compiler to check for correctness.  Heavy preprocessor use</div><div class='add'>+is almost always a sign of code which needs some cleanup work.</div><div class='add'>+</div><div class='add'>+Conditional compilation with #ifdef is, indeed, a powerful feature, and it</div><div class='add'>+is used within the kernel.  But there is little desire to see code which is</div><div class='add'>+sprinkled liberally with #ifdef blocks.  As a general rule, #ifdef use</div><div class='add'>+should be confined to header files whenever possible.</div><div class='add'>+Conditionally-compiled code can be confined to functions which, if the code</div><div class='add'>+is not to be present, simply become empty.  The compiler will then quietly</div><div class='add'>+optimize out the call to the empty function.  The result is far cleaner</div><div class='add'>+code which is easier to follow.</div><div class='add'>+</div><div class='add'>+C preprocessor macros present a number of hazards, including possible</div><div class='add'>+multiple evaluation of expressions with side effects and no type safety.</div><div class='add'>+If you are tempted to define a macro, consider creating an inline function</div><div class='add'>+instead.  The code which results will be the same, but inline functions are</div><div class='add'>+easier to read, do not evaluate their arguments multiple times, and allow</div><div class='add'>+the compiler to perform type checking on the arguments and return value.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+* Inline functions</div><div class='add'>+</div><div class='add'>+Inline functions present a hazard of their own, though.  Programmers can</div><div class='add'>+become enamored of the perceived efficiency inherent in avoiding a function</div><div class='add'>+call and fill a source file with inline functions.  Those functions,</div><div class='add'>+however, can actually reduce performance.  Since their code is replicated</div><div class='add'>+at each call site, they end up bloating the size of the compiled kernel.</div><div class='add'>+That, in turn, creates pressure on the processor's memory caches, which can</div><div class='add'>+slow execution dramatically.  Inline functions, as a rule, should be quite</div><div class='add'>+small and relatively rare.  The cost of a function call, after all, is not</div><div class='add'>+that high; the creation of large numbers of inline functions is a classic</div><div class='add'>+example of premature optimization.</div><div class='add'>+</div><div class='add'>+In general, kernel programmers ignore cache effects at their peril.  The</div><div class='add'>+classic time/space tradeoff taught in beginning data structures classes</div><div class='add'>+often does not apply to contemporary hardware.  Space *is* time, in that a</div><div class='add'>+larger program will run slower than one which is more compact.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+* Locking</div><div class='add'>+</div><div class='add'>+In May, 2006, the "Devicescape" networking stack was, with great</div><div class='add'>+fanfare, released under the GPL and made available for inclusion in the</div><div class='add'>+mainline kernel.  This donation was welcome news; support for wireless</div><div class='add'>+networking in Linux was considered substandard at best, and the Devicescape</div><div class='add'>+stack offered the promise of fixing that situation.  Yet, this code did not</div><div class='add'>+actually make it into the mainline until June, 2007 (2.6.22).  What</div><div class='add'>+happened?</div><div class='add'>+</div><div class='add'>+This code showed a number of signs of having been developed behind</div><div class='add'>+corporate doors.  But one large problem in particular was that it was not</div><div class='add'>+designed to work on multiprocessor systems.  Before this networking stack</div><div class='add'>+(now called mac80211) could be merged, a locking scheme needed to be</div><div class='add'>+retrofitted onto it.  </div><div class='add'>+</div><div class='add'>+Once upon a time, Linux kernel code could be developed without thinking</div><div class='add'>+about the concurrency issues presented by multiprocessor systems.  Now,</div><div class='add'>+however, this document is being written on a dual-core laptop.  Even on</div><div class='add'>+single-processor systems, work being done to improve responsiveness will</div><div class='add'>+raise the level of concurrency within the kernel.  The days when kernel</div><div class='add'>+code could be written without thinking about locking are long past.</div><div class='add'>+</div><div class='add'>+Any resource (data structures, hardware registers, etc.) which could be</div><div class='add'>+accessed concurrently by more than one thread must be protected by a lock.</div><div class='add'>+New code should be written with this requirement in mind; retrofitting</div><div class='add'>+locking after the fact is a rather more difficult task.  Kernel developers</div><div class='add'>+should take the time to understand the available locking primitives well</div><div class='add'>+enough to pick the right tool for the job.  Code which shows a lack of</div><div class='add'>+attention to concurrency will have a difficult path into the mainline.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+* Regressions</div><div class='add'>+</div><div class='add'>+One final hazard worth mentioning is this: it can be tempting to make a</div><div class='add'>+change (which may bring big improvements) which causes something to break</div><div class='add'>+for existing users.  This kind of change is called a "regression," and</div><div class='add'>+regressions have become most unwelcome in the mainline kernel.  With few</div><div class='add'>+exceptions, changes which cause regressions will be backed out if the</div><div class='add'>+regression cannot be fixed in a timely manner.  Far better to avoid the</div><div class='add'>+regression in the first place.</div><div class='add'>+</div><div class='add'>+It is often argued that a regression can be justified if it causes things</div><div class='add'>+to work for more people than it creates problems for.  Why not make a</div><div class='add'>+change if it brings new functionality to ten systems for each one it</div><div class='add'>+breaks?  The best answer to this question was expressed by Linus in July,</div><div class='add'>+2007:</div><div class='add'>+</div><div class='add'>+	So we don't fix bugs by introducing new problems.  That way lies</div><div class='add'>+	madness, and nobody ever knows if you actually make any real</div><div class='add'>+	progress at all. Is it two steps forwards, one step back, or one</div><div class='add'>+	step forward and two steps back?</div><div class='add'>+</div><div class='add'>+(http://lwn.net/Articles/243460/).</div><div class='add'>+</div><div class='add'>+An especially unwelcome type of regression is any sort of change to the</div><div class='add'>+user-space ABI.  Once an interface has been exported to user space, it must</div><div class='add'>+be supported indefinitely.  This fact makes the creation of user-space</div><div class='add'>+interfaces particularly challenging: since they cannot be changed in</div><div class='add'>+incompatible ways, they must be done right the first time.  For this</div><div class='add'>+reason, a great deal of thought, clear documentation, and wide review for</div><div class='add'>+user-space interfaces is always required.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+4.2: CODE CHECKING TOOLS</div><div class='add'>+</div><div class='add'>+For now, at least, the writing of error-free code remains an ideal that few</div><div class='add'>+of us can reach.  What we can hope to do, though, is to catch and fix as</div><div class='add'>+many of those errors as possible before our code goes into the mainline</div><div class='add'>+kernel.  To that end, the kernel developers have put together an impressive</div><div class='add'>+array of tools which can catch a wide variety of obscure problems in an</div><div class='add'>+automated way.  Any problem caught by the computer is a problem which will</div><div class='add'>+not afflict a user later on, so it stands to reason that the automated</div><div class='add'>+tools should be used whenever possible.</div><div class='add'>+</div><div class='add'>+The first step is simply to heed the warnings produced by the compiler.</div><div class='add'>+Contemporary versions of gcc can detect (and warn about) a large number of</div><div class='add'>+potential errors.  Quite often, these warnings point to real problems.</div><div class='add'>+Code submitted for review should, as a rule, not produce any compiler</div><div class='add'>+warnings.  When silencing warnings, take care to understand the real cause</div><div class='add'>+and try to avoid "fixes" which make the warning go away without addressing</div><div class='add'>+its cause.</div><div class='add'>+</div><div class='add'>+Note that not all compiler warnings are enabled by default.  Build the</div><div class='add'>+kernel with "make EXTRA_CFLAGS=-W" to get the full set.</div><div class='add'>+</div><div class='add'>+The kernel provides several configuration options which turn on debugging</div><div class='add'>+features; most of these are found in the "kernel hacking" submenu.  Several</div><div class='add'>+of these options should be turned on for any kernel used for development or</div><div class='add'>+testing purposes.  In particular, you should turn on:</div><div class='add'>+</div><div class='add'>+ - ENABLE_WARN_DEPRECATED, ENABLE_MUST_CHECK, and FRAME_WARN to get an</div><div class='add'>+   extra set of warnings for problems like the use of deprecated interfaces</div><div class='add'>+   or ignoring an important return value from a function.  The output</div><div class='add'>+   generated by these warnings can be verbose, but one need not worry about</div><div class='add'>+   warnings from other parts of the kernel.</div><div class='add'>+</div><div class='add'>+ - DEBUG_OBJECTS will add code to track the lifetime of various objects</div><div class='add'>+   created by the kernel and warn when things are done out of order.  If</div><div class='add'>+   you are adding a subsystem which creates (and exports) complex objects</div><div class='add'>+   of its own, consider adding support for the object debugging</div><div class='add'>+   infrastructure.</div><div class='add'>+</div><div class='add'>+ - DEBUG_SLAB can find a variety of memory allocation and use errors; it</div><div class='add'>+   should be used on most development kernels.</div><div class='add'>+</div><div class='add'>+ - DEBUG_SPINLOCK, DEBUG_SPINLOCK_SLEEP, and DEBUG_MUTEXES will find a</div><div class='add'>+   number of common locking errors.</div><div class='add'>+</div><div class='add'>+There are quite a few other debugging options, some of which will be</div><div class='add'>+discussed below.  Some of them have a significant performance impact and</div><div class='add'>+should not be used all of the time.  But some time spent learning the</div><div class='add'>+available options will likely be paid back many times over in short order. </div><div class='add'>+</div><div class='add'>+One of the heavier debugging tools is the locking checker, or "lockdep."</div><div class='add'>+This tool will track the acquisition and release of every lock (spinlock or</div><div class='add'>+mutex) in the system, the order in which locks are acquired relative to</div><div class='add'>+each other, the current interrupt environment, and more.  It can then</div><div class='add'>+ensure that locks are always acquired in the same order, that the same</div><div class='add'>+interrupt assumptions apply in all situations, and so on.  In other words,</div><div class='add'>+lockdep can find a number of scenarios in which the system could, on rare</div><div class='add'>+occasion, deadlock.  This kind of problem can be painful (for both</div><div class='add'>+developers and users) in a deployed system; lockdep allows them to be found</div><div class='add'>+in an automated manner ahead of time.  Code with any sort of non-trivial</div><div class='add'>+locking should be run with lockdep enabled before being submitted for</div><div class='add'>+inclusion. </div><div class='add'>+</div><div class='add'>+As a diligent kernel programmer, you will, beyond doubt, check the return</div><div class='add'>+status of any operation (such as a memory allocation) which can fail.  The</div><div class='add'>+fact of the matter, though, is that the resulting failure recovery paths</div><div class='add'>+are, probably, completely untested.  Untested code tends to be broken code;</div><div class='add'>+you could be much more confident of your code if all those error-handling</div><div class='add'>+paths had been exercised a few times.</div><div class='add'>+</div><div class='add'>+The kernel provides a fault injection framework which can do exactly that,</div><div class='add'>+especially where memory allocations are involved.  With fault injection</div><div class='add'>+enabled, a configurable percentage of memory allocations will be made to</div><div class='add'>+fail; these failures can be restricted to a specific range of code.</div><div class='add'>+Running with fault injection enabled allows the programmer to see how the</div><div class='add'>+code responds when things go badly.  See</div><div class='add'>+Documentation/fault-injection/fault-injection.text for more information on</div><div class='add'>+how to use this facility.</div><div class='add'>+</div><div class='add'>+Other kinds of errors can be found with the "sparse" static analysis tool.</div><div class='add'>+With sparse, the programmer can be warned about confusion between</div><div class='add'>+user-space and kernel-space addresses, mixture of big-endian and</div><div class='add'>+small-endian quantities, the passing of integer values where a set of bit</div><div class='add'>+flags is expected, and so on.  Sparse must be installed separately (it can</div><div class='add'>+be found at http://www.kernel.org/pub/software/devel/sparse/ if your</div><div class='add'>+distributor does not package it); it can then be run on the code by adding</div><div class='add'>+"C=1" to your make command.</div><div class='add'>+</div><div class='add'>+Other kinds of portability errors are best found by compiling your code for</div><div class='add'>+other architectures.  If you do not happen to have an S/390 system or a</div><div class='add'>+Blackfin development board handy, you can still perform the compilation</div><div class='add'>+step.  A large set of cross compilers for x86 systems can be found at </div><div class='add'>+</div><div class='add'>+	http://www.kernel.org/pub/tools/crosstool/</div><div class='add'>+</div><div class='add'>+Some time spent installing and using these compilers will help avoid</div><div class='add'>+embarrassment later.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+4.3: DOCUMENTATION</div><div class='add'>+</div><div class='add'>+Documentation has often been more the exception than the rule with kernel</div><div class='add'>+development.  Even so, adequate documentation will help to ease the merging</div><div class='add'>+of new code into the kernel, make life easier for other developers, and</div><div class='add'>+will be helpful for your users.  In many cases, the addition of</div><div class='add'>+documentation has become essentially mandatory.</div><div class='add'>+</div><div class='add'>+The first piece of documentation for any patch is its associated</div><div class='add'>+changelog.  Log entries should describe the problem being solved, the form</div><div class='add'>+of the solution, the people who worked on the patch, any relevant</div><div class='add'>+effects on performance, and anything else that might be needed to</div><div class='add'>+understand the patch.</div><div class='add'>+</div><div class='add'>+Any code which adds a new user-space interface - including new sysfs or</div><div class='add'>+/proc files - should include documentation of that interface which enables</div><div class='add'>+user-space developers to know what they are working with.  See</div><div class='add'>+Documentation/ABI/README for a description of how this documentation should</div><div class='add'>+be formatted and what information needs to be provided.</div><div class='add'>+</div><div class='add'>+The file Documentation/kernel-parameters.txt describes all of the kernel's</div><div class='add'>+boot-time parameters.  Any patch which adds new parameters should add the</div><div class='add'>+appropriate entries to this file.</div><div class='add'>+</div><div class='add'>+Any new configuration options must be accompanied by help text which</div><div class='add'>+clearly explains the options and when the user might want to select them. </div><div class='add'>+</div><div class='add'>+Internal API information for many subsystems is documented by way of</div><div class='add'>+specially-formatted comments; these comments can be extracted and formatted</div><div class='add'>+in a number of ways by the "kernel-doc" script.  If you are working within</div><div class='add'>+a subsystem which has kerneldoc comments, you should maintain them and add</div><div class='add'>+them, as appropriate, for externally-available functions.  Even in areas</div><div class='add'>+which have not been so documented, there is no harm in adding kerneldoc</div><div class='add'>+comments for the future; indeed, this can be a useful activity for</div><div class='add'>+beginning kernel developers.  The format of these comments, along with some</div><div class='add'>+information on how to create kerneldoc templates can be found in the file</div><div class='add'>+Documentation/kernel-doc-nano-HOWTO.txt.</div><div class='add'>+</div><div class='add'>+Anybody who reads through a significant amount of existing kernel code will</div><div class='add'>+note that, often, comments are most notable by their absence.  Once again,</div><div class='add'>+the expectations for new code are higher than they were in the past;</div><div class='add'>+merging uncommented code will be harder.  That said, there is little desire</div><div class='add'>+for verbosely-commented code.  The code should, itself, be readable, with</div><div class='add'>+comments explaining the more subtle aspects.</div><div class='add'>+</div><div class='add'>+Certain things should always be commented.  Uses of memory barriers should</div><div class='add'>+be accompanied by a line explaining why the barrier is necessary.  The</div><div class='add'>+locking rules for data structures generally need to be explained somewhere.</div><div class='add'>+Major data structures need comprehensive documentation in general.</div><div class='add'>+Non-obvious dependencies between separate bits of code should be pointed</div><div class='add'>+out.  Anything which might tempt a code janitor to make an incorrect</div><div class='add'>+"cleanup" needs a comment saying why it is done the way it is.  And so on.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+4.4: INTERNAL API CHANGES</div><div class='add'>+</div><div class='add'>+The binary interface provided by the kernel to user space cannot be broken</div><div class='add'>+except under the most severe circumstances.  The kernel's internal</div><div class='add'>+programming interfaces, instead, are highly fluid and can be changed when</div><div class='add'>+the need arises.  If you find yourself having to work around a kernel API,</div><div class='add'>+or simply not using a specific functionality because it does not meet your</div><div class='add'>+needs, that may be a sign that the API needs to change.  As a kernel</div><div class='add'>+developer, you are empowered to make such changes.</div><div class='add'>+</div><div class='add'>+There are, of course, some catches.  API changes can be made, but they need</div><div class='add'>+to be well justified.  So any patch making an internal API change should be</div><div class='add'>+accompanied by a description of what the change is and why it is</div><div class='add'>+necessary.  This kind of change should also be broken out into a separate</div><div class='add'>+patch, rather than buried within a larger patch.</div><div class='add'>+</div><div class='add'>+The other catch is that a developer who changes an internal API is</div><div class='add'>+generally charged with the task of fixing any code within the kernel tree</div><div class='add'>+which is broken by the change.  For a widely-used function, this duty can</div><div class='add'>+lead to literally hundreds or thousands of changes - many of which are</div><div class='add'>+likely to conflict with work being done by other developers.  Needless to</div><div class='add'>+say, this can be a large job, so it is best to be sure that the</div><div class='add'>+justification is solid.</div><div class='add'>+</div><div class='add'>+When making an incompatible API change, one should, whenever possible,</div><div class='add'>+ensure that code which has not been updated is caught by the compiler.  </div><div class='add'>+This will help you to be sure that you have found all in-tree uses of that</div><div class='add'>+interface.  It will also alert developers of out-of-tree code that there is</div><div class='add'>+a change that they need to respond to.  Supporting out-of-tree code is not</div><div class='add'>+something that kernel developers need to be worried about, but we also do</div><div class='add'>+not have to make life harder for out-of-tree developers than it it needs to</div><div class='add'>+be. </div><div class='head'>diff --git a/Documentation/development-process/5.Posting b/Documentation/development-process/5.Posting<br/>new file mode 100644<br/>index 000000000000..dd48132a74dd<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/development-process/5.Posting?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/development-process/5.Posting</a></div><div class='hunk'>@@ -0,0 +1,278 @@</div><div class='add'>+5: POSTING PATCHES</div><div class='add'>+</div><div class='add'>+Sooner or later, the time comes when your work is ready to be presented to</div><div class='add'>+the community for review and, eventually, inclusion into the mainline</div><div class='add'>+kernel.  Unsurprisingly, the kernel development community has evolved a set</div><div class='add'>+of conventions and procedures which are used in the posting of patches;</div><div class='add'>+following them will make life much easier for everybody involved.  This</div><div class='add'>+document will attempt to cover these expectations in reasonable detail;</div><div class='add'>+more information can also be found in the files SubmittingPatches,</div><div class='add'>+SubmittingDrivers, and SubmitChecklist in the kernel documentation</div><div class='add'>+directory.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+5.1: WHEN TO POST</div><div class='add'>+</div><div class='add'>+There is a constant temptation to avoid posting patches before they are</div><div class='add'>+completely "ready."  For simple patches, that is not a problem.  If the</div><div class='add'>+work being done is complex, though, there is a lot to be gained by getting</div><div class='add'>+feedback from the community before the work is complete.  So you should</div><div class='add'>+consider posting in-progress work, or even making a git tree available so</div><div class='add'>+that interested developers can catch up with your work at any time.</div><div class='add'>+</div><div class='add'>+When posting code which is not yet considered ready for inclusion, it is a</div><div class='add'>+good idea to say so in the posting itself.  Also mention any major work</div><div class='add'>+which remains to be done and any known problems.  Fewer people will look at</div><div class='add'>+patches which are known to be half-baked, but those who do will come in</div><div class='add'>+with the idea that they can help you drive the work in the right direction.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+5.2: BEFORE CREATING PATCHES</div><div class='add'>+</div><div class='add'>+There are a number of things which should be done before you consider</div><div class='add'>+sending patches to the development community.  These include:</div><div class='add'>+</div><div class='add'>+ - Test the code to the extent that you can.  Make use of the kernel's</div><div class='add'>+   debugging tools, ensure that the kernel will build with all reasonable</div><div class='add'>+   combinations of configuration options, use cross-compilers to build for</div><div class='add'>+   different architectures, etc.</div><div class='add'>+</div><div class='add'>+ - Make sure your code is compliant with the kernel coding style</div><div class='add'>+   guidelines.</div><div class='add'>+</div><div class='add'>+ - Does your change have performance implications?  If so, you should run</div><div class='add'>+   benchmarks showing what the impact (or benefit) of your change is; a</div><div class='add'>+   summary of the results should be included with the patch.</div><div class='add'>+</div><div class='add'>+ - Be sure that you have the right to post the code.  If this work was done</div><div class='add'>+   for an employer, the employer likely has a right to the work and must be</div><div class='add'>+   agreeable with its release under the GPL.</div><div class='add'>+</div><div class='add'>+As a general rule, putting in some extra thought before posting code almost</div><div class='add'>+always pays back the effort in short order.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+5.3: PATCH PREPARATION</div><div class='add'>+</div><div class='add'>+The preparation of patches for posting can be a surprising amount of work,</div><div class='add'>+but, once again, attempting to save time here is not generally advisable</div><div class='add'>+even in the short term.</div><div class='add'>+</div><div class='add'>+Patches must be prepared against a specific version of the kernel.  As a</div><div class='add'>+general rule, a patch should be based on the current mainline as found in</div><div class='add'>+Linus's git tree.  It may become necessary to make versions against -mm,</div><div class='add'>+linux-next, or a subsystem tree, though, to facilitate wider testing and</div><div class='add'>+review.  Depending on the area of your patch and what is going on</div><div class='add'>+elsewhere, basing a patch against these other trees can require a</div><div class='add'>+significant amount of work resolving conflicts and dealing with API</div><div class='add'>+changes.</div><div class='add'>+</div><div class='add'>+Only the most simple changes should be formatted as a single patch;</div><div class='add'>+everything else should be made as a logical series of changes.  Splitting</div><div class='add'>+up patches is a bit of an art; some developers spend a long time figuring</div><div class='add'>+out how to do it in the way that the community expects.  There are a few</div><div class='add'>+rules of thumb, however, which can help considerably:</div><div class='add'>+</div><div class='add'>+ - The patch series you post will almost certainly not be the series of</div><div class='add'>+   changes found in your working revision control system.  Instead, the</div><div class='add'>+   changes you have made need to be considered in their final form, then</div><div class='add'>+   split apart in ways which make sense.  The developers are interested in</div><div class='add'>+   discrete, self-contained changes, not the path you took to get to those</div><div class='add'>+   changes.</div><div class='add'>+</div><div class='add'>+ - Each logically independent change should be formatted as a separate</div><div class='add'>+   patch.  These changes can be small ("add a field to this structure") or</div><div class='add'>+   large (adding a significant new driver, for example), but they should be</div><div class='add'>+   conceptually small and amenable to a one-line description.  Each patch</div><div class='add'>+   should make a specific change which can be reviewed on its own and</div><div class='add'>+   verified to do what it says it does.</div><div class='add'>+</div><div class='add'>+ - As a way of restating the guideline above: do not mix different types of</div><div class='add'>+   changes in the same patch.  If a single patch fixes a critical security</div><div class='add'>+   bug, rearranges a few structures, and reformats the code, there is a</div><div class='add'>+   good chance that it will be passed over and the important fix will be</div><div class='add'>+   lost.</div><div class='add'>+</div><div class='add'>+ - Each patch should yield a kernel which builds and runs properly; if your</div><div class='add'>+   patch series is interrupted in the middle, the result should still be a</div><div class='add'>+   working kernel.  Partial application of a patch series is a common</div><div class='add'>+   scenario when the "git bisect" tool is used to find regressions; if the</div><div class='add'>+   result is a broken kernel, you will make life harder for developers and</div><div class='add'>+   users who are engaging in the noble work of tracking down problems.</div><div class='add'>+</div><div class='add'>+ - Do not overdo it, though.  One developer recently posted a set of edits</div><div class='add'>+   to a single file as 500 separate patches - an act which did not make him</div><div class='add'>+   the most popular person on the kernel mailing list.  A single patch can</div><div class='add'>+   be reasonably large as long as it still contains a single *logical*</div><div class='add'>+   change. </div><div class='add'>+</div><div class='add'>+ - It can be tempting to add a whole new infrastructure with a series of</div><div class='add'>+   patches, but to leave that infrastructure unused until the final patch</div><div class='add'>+   in the series enables the whole thing.  This temptation should be</div><div class='add'>+   avoided if possible; if that series adds regressions, bisection will</div><div class='add'>+   finger the last patch as the one which caused the problem, even though</div><div class='add'>+   the real bug is elsewhere.  Whenever possible, a patch which adds new</div><div class='add'>+   code should make that code active immediately.</div><div class='add'>+</div><div class='add'>+Working to create the perfect patch series can be a frustrating process</div><div class='add'>+which takes quite a bit of time and thought after the "real work" has been</div><div class='add'>+done.  When done properly, though, it is time well spent.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+5.4: PATCH FORMATTING</div><div class='add'>+</div><div class='add'>+So now you have a perfect series of patches for posting, but the work is</div><div class='add'>+not done quite yet.  Each patch needs to be formatted into a message which</div><div class='add'>+quickly and clearly communicates its purpose to the rest of the world.  To</div><div class='add'>+that end, each patch will be composed of the following:</div><div class='add'>+</div><div class='add'>+ - An optional "From" line naming the author of the patch.  This line is</div><div class='add'>+   only necessary if you are passing on somebody else's patch via email,</div><div class='add'>+   but it never hurts to add it when in doubt.</div><div class='add'>+</div><div class='add'>+ - A one-line description of what the patch does.  This message should be</div><div class='add'>+   enough for a reader who sees it with no other context to figure out the</div><div class='add'>+   scope of the patch; it is the line that will show up in the "short form"</div><div class='add'>+   changelogs.  This message is usually formatted with the relevant</div><div class='add'>+   subsystem name first, followed by the purpose of the patch.  For</div><div class='add'>+   example:</div><div class='add'>+</div><div class='add'>+	gpio: fix build on CONFIG_GPIO_SYSFS=n</div><div class='add'>+</div><div class='add'>+ - A blank line followed by a detailed description of the contents of the</div><div class='add'>+   patch.  This description can be as long as is required; it should say</div><div class='add'>+   what the patch does and why it should be applied to the kernel.</div><div class='add'>+</div><div class='add'>+ - One or more tag lines, with, at a minimum, one Signed-off-by: line from</div><div class='add'>+   the author of the patch.  Tags will be described in more detail below.</div><div class='add'>+</div><div class='add'>+The above three items should, normally, be the text used when committing</div><div class='add'>+the change to a revision control system.  They are followed by:</div><div class='add'>+</div><div class='add'>+ - The patch itself, in the unified ("-u") patch format.  Using the "-p"</div><div class='add'>+   option to diff will associate function names with changes, making the</div><div class='add'>+   resulting patch easier for others to read.</div><div class='add'>+</div><div class='add'>+You should avoid including changes to irrelevant files (those generated by</div><div class='add'>+the build process, for example, or editor backup files) in the patch.  The</div><div class='add'>+file "dontdiff" in the Documentation directory can help in this regard;</div><div class='add'>+pass it to diff with the "-X" option.</div><div class='add'>+</div><div class='add'>+The tags mentioned above are used to describe how various developers have</div><div class='add'>+been associated with the development of this patch.  They are described in</div><div class='add'>+detail in the SubmittingPatches document; what follows here is a brief</div><div class='add'>+summary.  Each of these lines has the format:</div><div class='add'>+</div><div class='add'>+	tag: Full Name &lt;email address&gt;  optional-other-stuff</div><div class='add'>+</div><div class='add'>+The tags in common use are:</div><div class='add'>+</div><div class='add'>+ - Signed-off-by: this is a developer's certification that he or she has</div><div class='add'>+   the right to submit the patch for inclusion into the kernel.  It is an</div><div class='add'>+   agreement to the Developer's Certificate of Origin, the full text of</div><div class='add'>+   which can be found in Documentation/SubmittingPatches.  Code without a</div><div class='add'>+   proper signoff cannot be merged into the mainline.</div><div class='add'>+</div><div class='add'>+ - Acked-by: indicates an agreement by another developer (often a</div><div class='add'>+   maintainer of the relevant code) that the patch is appropriate for</div><div class='add'>+   inclusion into the kernel.</div><div class='add'>+</div><div class='add'>+ - Tested-by: states that the named person has tested the patch and found</div><div class='add'>+   it to work.</div><div class='add'>+</div><div class='add'>+ - Reviewed-by: the named developer has reviewed the patch for correctness;</div><div class='add'>+   see the reviewer's statement in Documentation/SubmittingPatches for more</div><div class='add'>+   detail.</div><div class='add'>+</div><div class='add'>+ - Reported-by: names a user who reported a problem which is fixed by this</div><div class='add'>+   patch; this tag is used to give credit to the (often underappreciated)</div><div class='add'>+   people who test our code and let us know when things do not work</div><div class='add'>+   correctly.</div><div class='add'>+</div><div class='add'>+ - Cc: the named person received a copy of the patch and had the</div><div class='add'>+   opportunity to comment on it.</div><div class='add'>+</div><div class='add'>+Be careful in the addition of tags to your patches: only Cc: is appropriate</div><div class='add'>+for addition without the explicit permission of the person named.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+5.5: SENDING THE PATCH</div><div class='add'>+</div><div class='add'>+Before you mail your patches, there are a couple of other things you should</div><div class='add'>+take care of:</div><div class='add'>+</div><div class='add'>+ - Are you sure that your mailer will not corrupt the patches?  Patches</div><div class='add'>+   which have had gratuitous white-space changes or line wrapping performed</div><div class='add'>+   by the mail client will not apply at the other end, and often will not</div><div class='add'>+   be examined in any detail.  If there is any doubt at all, mail the patch</div><div class='add'>+   to yourself and convince yourself that it shows up intact.  </div><div class='add'>+</div><div class='add'>+   Documentation/email-clients.txt has some helpful hints on making</div><div class='add'>+   specific mail clients work for sending patches.</div><div class='add'>+</div><div class='add'>+ - Are you sure your patch is free of silly mistakes?  You should always</div><div class='add'>+   run patches through scripts/checkpatch.pl and address the complaints it</div><div class='add'>+   comes up with.  Please bear in mind that checkpatch.pl, while being the</div><div class='add'>+   embodiment of a fair amount of thought about what kernel patches should</div><div class='add'>+   look like, is not smarter than you.  If fixing a checkpatch.pl complaint</div><div class='add'>+   would make the code worse, don't do it.</div><div class='add'>+</div><div class='add'>+Patches should always be sent as plain text.  Please do not send them as</div><div class='add'>+attachments; that makes it much harder for reviewers to quote sections of</div><div class='add'>+the patch in their replies.  Instead, just put the patch directly into your</div><div class='add'>+message.</div><div class='add'>+</div><div class='add'>+When mailing patches, it is important to send copies to anybody who might</div><div class='add'>+be interested in it.  Unlike some other projects, the kernel encourages</div><div class='add'>+people to err on the side of sending too many copies; don't assume that the</div><div class='add'>+relevant people will see your posting on the mailing lists.  In particular,</div><div class='add'>+copies should go to:</div><div class='add'>+</div><div class='add'>+ - The maintainer(s) of the affected subsystem(s).  As described earlier,</div><div class='add'>+   the MAINTAINERS file is the first place to look for these people.</div><div class='add'>+</div><div class='add'>+ - Other developers who have been working in the same area - especially</div><div class='add'>+   those who might be working there now.  Using git to see who else has</div><div class='add'>+   modified the files you are working on can be helpful.</div><div class='add'>+</div><div class='add'>+ - If you are responding to a bug report or a feature request, copy the</div><div class='add'>+   original poster as well.</div><div class='add'>+</div><div class='add'>+ - Send a copy to the relevant mailing list, or, if nothing else applies,</div><div class='add'>+   the linux-kernel list.</div><div class='add'>+</div><div class='add'>+ - If you are fixing a bug, think about whether the fix should go into the</div><div class='add'>+   next stable update.  If so, stable@kernel.org should get a copy of the</div><div class='add'>+   patch.  Also add a "Cc: stable@kernel.org" to the tags within the patch</div><div class='add'>+   itself; that will cause the stable team to get a notification when your</div><div class='add'>+   fix goes into the mainline.</div><div class='add'>+</div><div class='add'>+When selecting recipients for a patch, it is good to have an idea of who</div><div class='add'>+you think will eventually accept the patch and get it merged.  While it</div><div class='add'>+is possible to send patches directly to Linus Torvalds and have him merge</div><div class='add'>+them, things are not normally done that way.  Linus is busy, and there are</div><div class='add'>+subsystem maintainers who watch over specific parts of the kernel.  Usually</div><div class='add'>+you will be wanting that maintainer to merge your patches.  If there is no</div><div class='add'>+obvious maintainer, Andrew Morton is often the patch target of last resort.</div><div class='add'>+</div><div class='add'>+Patches need good subject lines.  The canonical format for a patch line is</div><div class='add'>+something like:</div><div class='add'>+</div><div class='add'>+	[PATCH nn/mm] subsys: one-line description of the patch</div><div class='add'>+</div><div class='add'>+where "nn" is the ordinal number of the patch, "mm" is the total number of</div><div class='add'>+patches in the series, and "subsys" is the name of the affected subsystem.</div><div class='add'>+Clearly, nn/mm can be omitted for a single, standalone patch.  </div><div class='add'>+</div><div class='add'>+If you have a significant series of patches, it is customary to send an</div><div class='add'>+introductory description as part zero.  This convention is not universally</div><div class='add'>+followed though; if you use it, remember that information in the</div><div class='add'>+introduction does not make it into the kernel changelogs.  So please ensure</div><div class='add'>+that the patches, themselves, have complete changelog information.</div><div class='add'>+</div><div class='add'>+In general, the second and following parts of a multi-part patch should be</div><div class='add'>+sent as a reply to the first part so that they all thread together at the</div><div class='add'>+receiving end.  Tools like git and quilt have commands to mail out a set of</div><div class='add'>+patches with the proper threading.  If you have a long series, though, and</div><div class='add'>+are using git, please provide the --no-chain-reply-to option to avoid</div><div class='add'>+creating exceptionally deep nesting.</div><div class='head'>diff --git a/Documentation/development-process/6.Followthrough b/Documentation/development-process/6.Followthrough<br/>new file mode 100644<br/>index 000000000000..a8fba3d83a85<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/development-process/6.Followthrough?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/development-process/6.Followthrough</a></div><div class='hunk'>@@ -0,0 +1,202 @@</div><div class='add'>+6: FOLLOWTHROUGH</div><div class='add'>+</div><div class='add'>+At this point, you have followed the guidelines given so far and, with the</div><div class='add'>+addition of your own engineering skills, have posted a perfect series of</div><div class='add'>+patches.  One of the biggest mistakes that even experienced kernel</div><div class='add'>+developers can make is to conclude that their work is now done.  In truth,</div><div class='add'>+posting patches indicates a transition into the next stage of the process,</div><div class='add'>+with, possibly, quite a bit of work yet to be done.</div><div class='add'>+</div><div class='add'>+It is a rare patch which is so good at its first posting that there is no</div><div class='add'>+room for improvement.  The kernel development process recognizes this fact,</div><div class='add'>+and, as a result, is heavily oriented toward the improvement of posted</div><div class='add'>+code.  You, as the author of that code, will be expected to work with the</div><div class='add'>+kernel community to ensure that your code is up to the kernel's quality</div><div class='add'>+standards.  A failure to participate in this process is quite likely to</div><div class='add'>+prevent the inclusion of your patches into the mainline.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+6.1: WORKING WITH REVIEWERS</div><div class='add'>+</div><div class='add'>+A patch of any significance will result in a number of comments from other</div><div class='add'>+developers as they review the code.  Working with reviewers can be, for</div><div class='add'>+many developers, the most intimidating part of the kernel development</div><div class='add'>+process.  Life can be made much easier, though, if you keep a few things in</div><div class='add'>+mind:</div><div class='add'>+</div><div class='add'>+ - If you have explained your patch well, reviewers will understand its</div><div class='add'>+   value and why you went to the trouble of writing it.  But that value</div><div class='add'>+   will not keep them from asking a fundamental question: what will it be</div><div class='add'>+   like to maintain a kernel with this code in it five or ten years later?</div><div class='add'>+   Many of the changes you may be asked to make - from coding style tweaks</div><div class='add'>+   to substantial rewrites - come from the understanding that Linux will</div><div class='add'>+   still be around and under development a decade from now.</div><div class='add'>+</div><div class='add'>+ - Code review is hard work, and it is a relatively thankless occupation;</div><div class='add'>+   people remember who wrote kernel code, but there is little lasting fame</div><div class='add'>+   for those who reviewed it.  So reviewers can get grumpy, especially when</div><div class='add'>+   they see the same mistakes being made over and over again.  If you get a</div><div class='add'>+   review which seems angry, insulting, or outright offensive, resist the</div><div class='add'>+   impulse to respond in kind.  Code review is about the code, not about</div><div class='add'>+   the people, and code reviewers are not attacking you personally.</div><div class='add'>+</div><div class='add'>+ - Similarly, code reviewers are not trying to promote their employers'</div><div class='add'>+   agendas at the expense of your own.  Kernel developers often expect to</div><div class='add'>+   be working on the kernel years from now, but they understand that their</div><div class='add'>+   employer could change.  They truly are, almost without exception,</div><div class='add'>+   working toward the creation of the best kernel they can; they are not</div><div class='add'>+   trying to create discomfort for their employers' competitors.</div><div class='add'>+</div><div class='add'>+What all of this comes down to is that, when reviewers send you comments,</div><div class='add'>+you need to pay attention to the technical observations that they are</div><div class='add'>+making.  Do not let their form of expression or your own pride keep that</div><div class='add'>+from happening.  When you get review comments on a patch, take the time to</div><div class='add'>+understand what the reviewer is trying to say.  If possible, fix the things</div><div class='add'>+that the reviewer is asking you to fix.  And respond back to the reviewer:</div><div class='add'>+thank them, and describe how you will answer their questions.</div><div class='add'>+</div><div class='add'>+Note that you do not have to agree with every change suggested by</div><div class='add'>+reviewers.  If you believe that the reviewer has misunderstood your code,</div><div class='add'>+explain what is really going on.  If you have a technical objection to a</div><div class='add'>+suggested change, describe it and justify your solution to the problem.  If</div><div class='add'>+your explanations make sense, the reviewer will accept them.  Should your</div><div class='add'>+explanation not prove persuasive, though, especially if others start to</div><div class='add'>+agree with the reviewer, take some time to think things over again.  It can</div><div class='add'>+be easy to become blinded by your own solution to a problem to the point</div><div class='add'>+that you don't realize that something is fundamentally wrong or, perhaps,</div><div class='add'>+you're not even solving the right problem.</div><div class='add'>+</div><div class='add'>+One fatal mistake is to ignore review comments in the hope that they will</div><div class='add'>+go away.  They will not go away.  If you repost code without having</div><div class='add'>+responded to the comments you got the time before, you're likely to find</div><div class='add'>+that your patches go nowhere.</div><div class='add'>+</div><div class='add'>+Speaking of reposting code: please bear in mind that reviewers are not</div><div class='add'>+going to remember all the details of the code you posted the last time</div><div class='add'>+around.  So it is always a good idea to remind reviewers of previously</div><div class='add'>+raised issues and how you dealt with them; the patch changelog is a good</div><div class='add'>+place for this kind of information.  Reviewers should not have to search</div><div class='add'>+through list archives to familiarize themselves with what was said last</div><div class='add'>+time; if you help them get a running start, they will be in a better mood</div><div class='add'>+when they revisit your code.</div><div class='add'>+</div><div class='add'>+What if you've tried to do everything right and things still aren't going</div><div class='add'>+anywhere?  Most technical disagreements can be resolved through discussion,</div><div class='add'>+but there are times when somebody simply has to make a decision.  If you</div><div class='add'>+honestly believe that this decision is going against you wrongly, you can</div><div class='add'>+always try appealing to a higher power.  As of this writing, that higher</div><div class='add'>+power tends to be Andrew Morton.  Andrew has a great deal of respect in the</div><div class='add'>+kernel development community; he can often unjam a situation which seems to</div><div class='add'>+be hopelessly blocked.  Appealing to Andrew should not be done lightly,</div><div class='add'>+though, and not before all other alternatives have been explored.  And bear</div><div class='add'>+in mind, of course, that he may not agree with you either.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+6.2: WHAT HAPPENS NEXT</div><div class='add'>+</div><div class='add'>+If a patch is considered to be a good thing to add to the kernel, and once</div><div class='add'>+most of the review issues have been resolved, the next step is usually</div><div class='add'>+entry into a subsystem maintainer's tree.  How that works varies from one</div><div class='add'>+subsystem to the next; each maintainer has his or her own way of doing</div><div class='add'>+things.  In particular, there may be more than one tree - one, perhaps,</div><div class='add'>+dedicated to patches planned for the next merge window, and another for</div><div class='add'>+longer-term work.  </div><div class='add'>+</div><div class='add'>+For patches applying to areas for which there is no obvious subsystem tree</div><div class='add'>+(memory management patches, for example), the default tree often ends up</div><div class='add'>+being -mm.  Patches which affect multiple subsystems can also end up going</div><div class='add'>+through the -mm tree.</div><div class='add'>+</div><div class='add'>+Inclusion into a subsystem tree can bring a higher level of visibility to a</div><div class='add'>+patch.  Now other developers working with that tree will get the patch by</div><div class='add'>+default.  Subsystem trees typically feed into -mm and linux-next as well,</div><div class='add'>+making their contents visible to the development community as a whole.  At</div><div class='add'>+this point, there's a good chance that you will get more comments from a</div><div class='add'>+new set of reviewers; these comments need to be answered as in the previous</div><div class='add'>+round.</div><div class='add'>+</div><div class='add'>+What may also happen at this point, depending on the nature of your patch,</div><div class='add'>+is that conflicts with work being done by others turn up.  In the worst</div><div class='add'>+case, heavy patch conflicts can result in some work being put on the back</div><div class='add'>+burner so that the remaining patches can be worked into shape and merged.</div><div class='add'>+Other times, conflict resolution will involve working with the other</div><div class='add'>+developers and, possibly, moving some patches between trees to ensure that</div><div class='add'>+everything applies cleanly.  This work can be a pain, but count your</div><div class='add'>+blessings: before the advent of the linux-next tree, these conflicts often</div><div class='add'>+only turned up during the merge window and had to be addressed in a hurry.</div><div class='add'>+Now they can be resolved at leisure, before the merge window opens.</div><div class='add'>+</div><div class='add'>+Some day, if all goes well, you'll log on and see that your patch has been</div><div class='add'>+merged into the mainline kernel.  Congratulations!  Once the celebration is</div><div class='add'>+complete (and you have added yourself to the MAINTAINERS file), though, it</div><div class='add'>+is worth remembering an important little fact: the job still is not done.</div><div class='add'>+Merging into the mainline brings its own challenges.</div><div class='add'>+</div><div class='add'>+To begin with, the visibility of your patch has increased yet again.  There</div><div class='add'>+may be a new round of comments from developers who had not been aware of</div><div class='add'>+the patch before.  It may be tempting to ignore them, since there is no</div><div class='add'>+longer any question of your code being merged.  Resist that temptation,</div><div class='add'>+though; you still need to be responsive to developers who have questions or</div><div class='add'>+suggestions.</div><div class='add'>+</div><div class='add'>+More importantly, though: inclusion into the mainline puts your code into</div><div class='add'>+the hands of a much larger group of testers.  Even if you have contributed</div><div class='add'>+a driver for hardware which is not yet available, you will be surprised by</div><div class='add'>+how many people will build your code into their kernels.  And, of course,</div><div class='add'>+where there are testers, there will be bug reports.</div><div class='add'>+</div><div class='add'>+The worst sort of bug reports are regressions.  If your patch causes a</div><div class='add'>+regression, you'll find an uncomfortable number of eyes upon you;</div><div class='add'>+regressions need to be fixed as soon as possible.  If you are unwilling or</div><div class='add'>+unable to fix the regression (and nobody else does it for you), your patch</div><div class='add'>+will almost certainly be removed during the stabilization period.  Beyond</div><div class='add'>+negating all of the work you have done to get your patch into the mainline,</div><div class='add'>+having a patch pulled as the result of a failure to fix a regression could</div><div class='add'>+well make it harder for you to get work merged in the future.</div><div class='add'>+</div><div class='add'>+After any regressions have been dealt with, there may be other, ordinary</div><div class='add'>+bugs to deal with.  The stabilization period is your best opportunity to</div><div class='add'>+fix these bugs and ensure that your code's debut in a mainline kernel</div><div class='add'>+release is as solid as possible.  So, please, answer bug reports, and fix</div><div class='add'>+the problems if at all possible.  That's what the stabilization period is</div><div class='add'>+for; you can start creating cool new patches once any problems with the old</div><div class='add'>+ones have been taken care of.</div><div class='add'>+</div><div class='add'>+And don't forget that there are other milestones which may also create bug</div><div class='add'>+reports: the next mainline stable release, when prominent distributors pick</div><div class='add'>+up a version of the kernel containing your patch, etc.  Continuing to</div><div class='add'>+respond to these reports is a matter of basic pride in your work.  If that</div><div class='add'>+is insufficient motivation, though, it's also worth considering that the</div><div class='add'>+development community remembers developers who lose interest in their code</div><div class='add'>+after it's merged.  The next time you post a patch, they will be evaluating</div><div class='add'>+it with the assumption that you will not be around to maintain it</div><div class='add'>+afterward.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+6.3: OTHER THINGS THAT CAN HAPPEN</div><div class='add'>+</div><div class='add'>+One day, you may open your mail client and see that somebody has mailed you</div><div class='add'>+a patch to your code.  That is one of the advantages of having your code</div><div class='add'>+out there in the open, after all.  If you agree with the patch, you can</div><div class='add'>+either forward it on to the subsystem maintainer (be sure to include a</div><div class='add'>+proper From: line so that the attribution is correct, and add a signoff of</div><div class='add'>+your own), or send an Acked-by: response back and let the original poster</div><div class='add'>+send it upward.</div><div class='add'>+</div><div class='add'>+If you disagree with the patch, send a polite response explaining why.  If</div><div class='add'>+possible, tell the author what changes need to be made to make the patch</div><div class='add'>+acceptable to you.  There is a certain resistance to merging patches which</div><div class='add'>+are opposed by the author and maintainer of the code, but it only goes so</div><div class='add'>+far.  If you are seen as needlessly blocking good work, those patches will</div><div class='add'>+eventually flow around you and get into the mainline anyway.  In the Linux</div><div class='add'>+kernel, nobody has absolute veto power over any code.  Except maybe Linus.</div><div class='add'>+</div><div class='add'>+On very rare occasion, you may see something completely different: another</div><div class='add'>+developer posts a different solution to your problem.  At that point,</div><div class='add'>+chances are that one of the two patches will not be merged, and "mine was</div><div class='add'>+here first" is not considered to be a compelling technical argument.  If</div><div class='add'>+somebody else's patch displaces yours and gets into the mainline, there is</div><div class='add'>+really only one way to respond: be pleased that your problem got solved and</div><div class='add'>+get on with your work.  Having one's work shoved aside in this manner can</div><div class='add'>+be hurtful and discouraging, but the community will remember your reaction</div><div class='add'>+long after they have forgotten whose patch actually got merged.</div><div class='head'>diff --git a/Documentation/development-process/7.AdvancedTopics b/Documentation/development-process/7.AdvancedTopics<br/>new file mode 100644<br/>index 000000000000..a2cf74093aa1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/development-process/7.AdvancedTopics?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/development-process/7.AdvancedTopics</a></div><div class='hunk'>@@ -0,0 +1,173 @@</div><div class='add'>+7: ADVANCED TOPICS</div><div class='add'>+</div><div class='add'>+At this point, hopefully, you have a handle on how the development process</div><div class='add'>+works.  There is still more to learn, however!  This section will cover a</div><div class='add'>+number of topics which can be helpful for developers wanting to become a</div><div class='add'>+regular part of the Linux kernel development process.</div><div class='add'>+</div><div class='add'>+7.1: MANAGING PATCHES WITH GIT</div><div class='add'>+</div><div class='add'>+The use of distributed version control for the kernel began in early 2002,</div><div class='add'>+when Linus first started playing with the proprietary BitKeeper</div><div class='add'>+application.  While BitKeeper was controversial, the approach to software</div><div class='add'>+version management it embodied most certainly was not.  Distributed version</div><div class='add'>+control enabled an immediate acceleration of the kernel development</div><div class='add'>+project.  In current times, there are several free alternatives to</div><div class='add'>+BitKeeper.  For better or for worse, the kernel project has settled on git</div><div class='add'>+as its tool of choice.</div><div class='add'>+</div><div class='add'>+Managing patches with git can make life much easier for the developer,</div><div class='add'>+especially as the volume of those patches grows.  Git also has its rough</div><div class='add'>+edges and poses certain hazards; it is a young and powerful tool which is</div><div class='add'>+still being civilized by its developers.  This document will not attempt to</div><div class='add'>+teach the reader how to use git; that would be sufficient material for a</div><div class='add'>+long document in its own right.  Instead, the focus here will be on how git</div><div class='add'>+fits into the kernel development process in particular.  Developers who</div><div class='add'>+wish to come up to speed with git will find more information at:</div><div class='add'>+</div><div class='add'>+	http://git.or.cz/</div><div class='add'>+</div><div class='add'>+	http://www.kernel.org/pub/software/scm/git/docs/user-manual.html</div><div class='add'>+</div><div class='add'>+and on various tutorials found on the web.</div><div class='add'>+</div><div class='add'>+The first order of business is to read the above sites and get a solid</div><div class='add'>+understanding of how git works before trying to use it to make patches</div><div class='add'>+available to others.  A git-using developer should be able to obtain a copy</div><div class='add'>+of the mainline repository, explore the revision history, commit changes to</div><div class='add'>+the tree, use branches, etc.  An understanding of git's tools for the</div><div class='add'>+rewriting of history (such as rebase) is also useful.  Git comes with its</div><div class='add'>+own terminology and concepts; a new user of git should know about refs,</div><div class='add'>+remote branches, the index, fast-forward merges, pushes and pulls, detached</div><div class='add'>+heads, etc.  It can all be a little intimidating at the outset, but the</div><div class='add'>+concepts are not that hard to grasp with a bit of study.</div><div class='add'>+</div><div class='add'>+Using git to generate patches for submission by email can be a good</div><div class='add'>+exercise while coming up to speed.</div><div class='add'>+</div><div class='add'>+When you are ready to start putting up git trees for others to look at, you</div><div class='add'>+will, of course, need a server that can be pulled from.  Setting up such a</div><div class='add'>+server with git-daemon is relatively straightforward if you have a system</div><div class='add'>+which is accessible to the Internet.  Otherwise, free, public hosting sites</div><div class='add'>+(Github, for example) are starting to appear on the net.  Established</div><div class='add'>+developers can get an account on kernel.org, but those are not easy to come</div><div class='add'>+by; see http://kernel.org/faq/ for more information.</div><div class='add'>+</div><div class='add'>+The normal git workflow involves the use of a lot of branches.  Each line</div><div class='add'>+of development can be separated into a separate "topic branch" and</div><div class='add'>+maintained independently.  Branches in git are cheap, there is no reason to</div><div class='add'>+not make free use of them.  And, in any case, you should not do your</div><div class='add'>+development in any branch which you intend to ask others to pull from.</div><div class='add'>+Publicly-available branches should be created with care; merge in patches</div><div class='add'>+from development branches when they are in complete form and ready to go -</div><div class='add'>+not before.</div><div class='add'>+</div><div class='add'>+Git provides some powerful tools which can allow you to rewrite your</div><div class='add'>+development history.  An inconvenient patch (one which breaks bisection,</div><div class='add'>+say, or which has some other sort of obvious bug) can be fixed in place or</div><div class='add'>+made to disappear from the history entirely.  A patch series can be</div><div class='add'>+rewritten as if it had been written on top of today's mainline, even though</div><div class='add'>+you have been working on it for months.  Changes can be transparently</div><div class='add'>+shifted from one branch to another.  And so on.  Judicious use of git's</div><div class='add'>+ability to revise history can help in the creation of clean patch sets with</div><div class='add'>+fewer problems.</div><div class='add'>+</div><div class='add'>+Excessive use of this capability can lead to other problems, though, beyond</div><div class='add'>+a simple obsession for the creation of the perfect project history.</div><div class='add'>+Rewriting history will rewrite the changes contained in that history,</div><div class='add'>+turning a tested (hopefully) kernel tree into an untested one.  But, beyond</div><div class='add'>+that, developers cannot easily collaborate if they do not have a shared</div><div class='add'>+view of the project history; if you rewrite history which other developers</div><div class='add'>+have pulled into their repositories, you will make life much more difficult</div><div class='add'>+for those developers.  So a simple rule of thumb applies here: history</div><div class='add'>+which has been exported to others should generally be seen as immutable</div><div class='add'>+thereafter.</div><div class='add'>+</div><div class='add'>+So, once you push a set of changes to your publicly-available server, those</div><div class='add'>+changes should not be rewritten.  Git will attempt to enforce this rule if</div><div class='add'>+you try to push changes which do not result in a fast-forward merge</div><div class='add'>+(i.e. changes which do not share the same history).  It is possible to</div><div class='add'>+override this check, and there may be times when it is necessary to rewrite</div><div class='add'>+an exported tree.  Moving changesets between trees to avoid conflicts in</div><div class='add'>+linux-next is one example.  But such actions should be rare.  This is one</div><div class='add'>+of the reasons why development should be done in private branches (which</div><div class='add'>+can be rewritten if necessary) and only moved into public branches when</div><div class='add'>+it's in a reasonably advanced state.</div><div class='add'>+</div><div class='add'>+As the mainline (or other tree upon which a set of changes is based)</div><div class='add'>+advances, it is tempting to merge with that tree to stay on the leading</div><div class='add'>+edge.  For a private branch, rebasing can be an easy way to keep up with</div><div class='add'>+another tree, but rebasing is not an option once a tree is exported to the</div><div class='add'>+world.  Once that happens, a full merge must be done.  Merging occasionally</div><div class='add'>+makes good sense, but overly frequent merges can clutter the history</div><div class='add'>+needlessly.  Suggested technique in this case is to merge infrequently, and</div><div class='add'>+generally only at specific release points (such as a mainline -rc</div><div class='add'>+release).  If you are nervous about specific changes, you can always</div><div class='add'>+perform test merges in a private branch.  The git "rerere" tool can be</div><div class='add'>+useful in such situations; it remembers how merge conflicts were resolved</div><div class='add'>+so that you don't have to do the same work twice.</div><div class='add'>+</div><div class='add'>+One of the biggest recurring complaints about tools like git is this: the</div><div class='add'>+mass movement of patches from one repository to another makes it easy to</div><div class='add'>+slip in ill-advised changes which go into the mainline below the review</div><div class='add'>+radar.  Kernel developers tend to get unhappy when they see that kind of</div><div class='add'>+thing happening; putting up a git tree with unreviewed or off-topic patches</div><div class='add'>+can affect your ability to get trees pulled in the future.  Quoting Linus:</div><div class='add'>+</div><div class='add'>+	You can send me patches, but for me to pull a git patch from you, I</div><div class='add'>+	need to know that you know what you're doing, and I need to be able</div><div class='add'>+	to trust things *without* then having to go and check every</div><div class='add'>+	individual change by hand.</div><div class='add'>+</div><div class='add'>+(http://lwn.net/Articles/224135/).  </div><div class='add'>+</div><div class='add'>+To avoid this kind of situation, ensure that all patches within a given</div><div class='add'>+branch stick closely to the associated topic; a "driver fixes" branch</div><div class='add'>+should not be making changes to the core memory management code.  And, most</div><div class='add'>+importantly, do not use a git tree to bypass the review process.  Post an</div><div class='add'>+occasional summary of the tree to the relevant list, and, when the time is</div><div class='add'>+right, request that the tree be included in linux-next.</div><div class='add'>+</div><div class='add'>+If and when others start to send patches for inclusion into your tree,</div><div class='add'>+don't forget to review them.  Also ensure that you maintain the correct</div><div class='add'>+authorship information; the git "am" tool does its best in this regard, but</div><div class='add'>+you may have to add a "From:" line to the patch if it has been relayed to</div><div class='add'>+you via a third party.</div><div class='add'>+</div><div class='add'>+When requesting a pull, be sure to give all the relevant information: where</div><div class='add'>+your tree is, what branch to pull, and what changes will result from the</div><div class='add'>+pull.  The git request-pull command can be helpful in this regard; it will</div><div class='add'>+format the request as other developers expect, and will also check to be</div><div class='add'>+sure that you have remembered to push those changes to the public server. </div><div class='add'>+</div><div class='add'>+</div><div class='add'>+7.2: REVIEWING PATCHES</div><div class='add'>+</div><div class='add'>+Some readers will certainly object to putting this section with "advanced</div><div class='add'>+topics" on the grounds that even beginning kernel developers should be</div><div class='add'>+reviewing patches.  It is certainly true that there is no better way to</div><div class='add'>+learn how to program in the kernel environment than by looking at code</div><div class='add'>+posted by others.  In addition, reviewers are forever in short supply; by</div><div class='add'>+looking at code you can make a significant contribution to the process as a</div><div class='add'>+whole.</div><div class='add'>+</div><div class='add'>+Reviewing code can be an intimidating prospect, especially for a new kernel</div><div class='add'>+developer who may well feel nervous about questioning code - in public -</div><div class='add'>+which has been posted by those with more experience.  Even code written by</div><div class='add'>+the most experienced developers can be improved, though.  Perhaps the best</div><div class='add'>+piece of advice for reviewers (all reviewers) is this: phrase review</div><div class='add'>+comments as questions rather than criticisms.  Asking "how does the lock</div><div class='add'>+get released in this path?" will always work better than stating "the</div><div class='add'>+locking here is wrong."</div><div class='add'>+</div><div class='add'>+Different developers will review code from different points of view.  Some</div><div class='add'>+are mostly concerned with coding style and whether code lines have trailing</div><div class='add'>+white space.  Others will focus primarily on whether the change implemented</div><div class='add'>+by the patch as a whole is a good thing for the kernel or not.  Yet others</div><div class='add'>+will check for problematic locking, excessive stack usage, possible</div><div class='add'>+security issues, duplication of code found elsewhere, adequate</div><div class='add'>+documentation, adverse effects on performance, user-space ABI changes, etc.</div><div class='add'>+All types of review, if they lead to better code going into the kernel, are</div><div class='add'>+welcome and worthwhile.</div><div class='add'>+</div><div class='add'>+</div><div class='head'>diff --git a/Documentation/development-process/8.Conclusion b/Documentation/development-process/8.Conclusion<br/>new file mode 100644<br/>index 000000000000..1990ab4b4949<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/development-process/8.Conclusion?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/development-process/8.Conclusion</a></div><div class='hunk'>@@ -0,0 +1,74 @@</div><div class='add'>+8: FOR MORE INFORMATION</div><div class='add'>+</div><div class='add'>+There are numerous sources of information on Linux kernel development and</div><div class='add'>+related topics.  First among those will always be the Documentation</div><div class='add'>+directory found in the kernel source distribution.  The top-level HOWTO</div><div class='add'>+file is an important starting point; SubmittingPatches and</div><div class='add'>+SubmittingDrivers are also something which all kernel developers should</div><div class='add'>+read.  Many internal kernel APIs are documented using the kerneldoc</div><div class='add'>+mechanism; "make htmldocs" or "make pdfdocs" can be used to generate those</div><div class='add'>+documents in HTML or PDF format (though the version of TeX shipped by some</div><div class='add'>+distributions runs into internal limits and fails to process the documents</div><div class='add'>+properly).</div><div class='add'>+</div><div class='add'>+Various web sites discuss kernel development at all levels of detail.  Your</div><div class='add'>+author would like to humbly suggest http://lwn.net/ as a source;</div><div class='add'>+information on many specific kernel topics can be found via the LWN kernel</div><div class='add'>+index at:</div><div class='add'>+</div><div class='add'>+	http://lwn.net/Kernel/Index/</div><div class='add'>+</div><div class='add'>+Beyond that, a valuable resource for kernel developers is:</div><div class='add'>+</div><div class='add'>+	http://kernelnewbies.org/</div><div class='add'>+</div><div class='add'>+Information about the linux-next tree gathers at:</div><div class='add'>+</div><div class='add'>+	http://linux.f-seidel.de/linux-next/pmwiki/</div><div class='add'>+</div><div class='add'>+And, of course, one should not forget http://kernel.org/, the definitive</div><div class='add'>+location for kernel release information.</div><div class='add'>+</div><div class='add'>+There are a number of books on kernel development:</div><div class='add'>+</div><div class='add'>+	Linux Device Drivers, 3rd Edition (Jonathan Corbet, Alessandro</div><div class='add'>+	Rubini, and Greg Kroah-Hartman).  Online at</div><div class='add'>+	http://lwn.net/Kernel/LDD3/.</div><div class='add'>+</div><div class='add'>+	Linux Kernel Development (Robert Love).</div><div class='add'>+</div><div class='add'>+	Understanding the Linux Kernel (Daniel Bovet and Marco Cesati).</div><div class='add'>+</div><div class='add'>+All of these books suffer from a common fault, though: they tend to be</div><div class='add'>+somewhat obsolete by the time they hit the shelves, and they have been on</div><div class='add'>+the shelves for a while now.  Still, there is quite a bit of good</div><div class='add'>+information to be found there.</div><div class='add'>+</div><div class='add'>+Documentation for git can be found at:</div><div class='add'>+</div><div class='add'>+	http://www.kernel.org/pub/software/scm/git/docs/</div><div class='add'>+</div><div class='add'>+	http://www.kernel.org/pub/software/scm/git/docs/user-manual.html</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+9: CONCLUSION</div><div class='add'>+</div><div class='add'>+Congratulations to anybody who has made it through this long-winded</div><div class='add'>+document.  Hopefully it has provided a helpful understanding of how the</div><div class='add'>+Linux kernel is developed and how you can participate in that process.</div><div class='add'>+</div><div class='add'>+In the end, it's the participation that matters.  Any open source software</div><div class='add'>+project is no more than the sum of what its contributors put into it.  The</div><div class='add'>+Linux kernel has progressed as quickly and as well as it has because it has</div><div class='add'>+been helped by an impressively large group of developers, all of whom are</div><div class='add'>+working to make it better.  The kernel is a premier example of what can be</div><div class='add'>+done when thousands of people work together toward a common goal.</div><div class='add'>+</div><div class='add'>+The kernel can always benefit from a larger developer base, though.  There</div><div class='add'>+is always more work to do.  But, just as importantly, most other</div><div class='add'>+participants in the Linux ecosystem can benefit through contributing to the</div><div class='add'>+kernel.  Getting code into the mainline is the key to higher code quality,</div><div class='add'>+lower maintenance and distribution costs, a higher level of influence over</div><div class='add'>+the direction of kernel development, and more.  It is a situation where</div><div class='add'>+everybody involved wins.  Fire up your editor and come join us; you will be</div><div class='add'>+more than welcome.</div><div class='head'>diff --git a/Documentation/devices.txt b/Documentation/devices.txt<br/>index 05c80645e4ee..2be08240ee80 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/devices.txt?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/devices.txt</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/devices.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/devices.txt</a></div><div class='hunk'>@@ -2571,6 +2571,9 @@ Your cooperation is appreciated.</div><div class='ctx'> 		160 = /dev/usb/legousbtower0	1st USB Legotower device</div><div class='ctx'> 		    ...</div><div class='ctx'> 		175 = /dev/usb/legousbtower15	16th USB Legotower device</div><div class='add'>+		176 = /dev/usb/usbtmc1	First USB TMC device</div><div class='add'>+		   ...</div><div class='add'>+		192 = /dev/usb/usbtmc16	16th USB TMC device</div><div class='ctx'> 		240 = /dev/usb/dabusb0	First daubusb device</div><div class='ctx'> 		    ...</div><div class='ctx'> 		243 = /dev/usb/dabusb3	Fourth dabusb device</div><div class='head'>diff --git a/Documentation/dontdiff b/Documentation/dontdiff<br/>index 27809357da58..1e89a51ea49b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/dontdiff?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/dontdiff</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/dontdiff?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/dontdiff</a></div><div class='hunk'>@@ -2,11 +2,13 @@</div><div class='ctx'> *.aux</div><div class='ctx'> *.bin</div><div class='ctx'> *.cpio</div><div class='del'>-*.css</div><div class='add'>+*.csp</div><div class='add'>+*.dsp</div><div class='ctx'> *.dvi</div><div class='add'>+*.elf</div><div class='ctx'> *.eps</div><div class='del'>-*.fw.gen.S</div><div class='ctx'> *.fw</div><div class='add'>+*.gen.S</div><div class='ctx'> *.gif</div><div class='ctx'> *.grep</div><div class='ctx'> *.grp</div><div class='hunk'>@@ -30,6 +32,7 @@</div><div class='ctx'> *.s</div><div class='ctx'> *.sgml</div><div class='ctx'> *.so</div><div class='add'>+*.so.dbg</div><div class='ctx'> *.symtypes</div><div class='ctx'> *.tab.c</div><div class='ctx'> *.tab.h</div><div class='hunk'>@@ -38,24 +41,17 @@</div><div class='ctx'> *.xml</div><div class='ctx'> *_MODULES</div><div class='ctx'> *_vga16.c</div><div class='del'>-*cscope*</div><div class='ctx'> *~</div><div class='ctx'> *.9</div><div class='ctx'> *.9.gz</div><div class='ctx'> .*</div><div class='del'>-.cscope</div><div class='del'>-.gitignore</div><div class='del'>-.mailmap</div><div class='ctx'> .mm</div><div class='ctx'> 53c700_d.h</div><div class='del'>-53c8xx_d.h*</div><div class='del'>-COPYING</div><div class='del'>-CREDITS</div><div class='ctx'> CVS</div><div class='ctx'> ChangeSet</div><div class='ctx'> Image</div><div class='ctx'> Kerntypes</div><div class='del'>-MODS.txt</div><div class='add'>+Module.markers</div><div class='ctx'> Module.symvers</div><div class='ctx'> PENDING</div><div class='ctx'> SCCS</div><div class='hunk'>@@ -73,7 +69,9 @@ autoconf.h*</div><div class='ctx'> bbootsect</div><div class='ctx'> bin2c</div><div class='ctx'> binkernel.spec</div><div class='add'>+binoffset</div><div class='ctx'> bootsect</div><div class='add'>+bounds.h</div><div class='ctx'> bsetup</div><div class='ctx'> btfixupprep</div><div class='ctx'> build</div><div class='hunk'>@@ -89,39 +87,36 @@ config_data.h*</div><div class='ctx'> config_data.gz*</div><div class='ctx'> conmakehash</div><div class='ctx'> consolemap_deftbl.c*</div><div class='add'>+cpustr.h</div><div class='ctx'> crc32table.h*</div><div class='ctx'> cscope.*</div><div class='del'>-defkeymap.c*</div><div class='add'>+defkeymap.c</div><div class='ctx'> devlist.h*</div><div class='ctx'> docproc</div><div class='del'>-dummy_sym.c*</div><div class='ctx'> elf2ecoff</div><div class='ctx'> elfconfig.h*</div><div class='del'>-filelist</div><div class='ctx'> fixdep</div><div class='ctx'> fore200e_mkfirm</div><div class='ctx'> fore200e_pca_fw.c*</div><div class='ctx'> gconf</div><div class='ctx'> gen-devlist</div><div class='del'>-gen-kdb_cmds.c*</div><div class='ctx'> gen_crc32table</div><div class='ctx'> gen_init_cpio</div><div class='ctx'> genksyms</div><div class='del'>-gentbl</div><div class='ctx'> *_gray256.c</div><div class='add'>+ihex2fw</div><div class='ctx'> ikconfig.h*</div><div class='ctx'> initramfs_data.cpio</div><div class='ctx'> initramfs_data.cpio.gz</div><div class='ctx'> initramfs_list</div><div class='ctx'> kallsyms</div><div class='ctx'> kconfig</div><div class='del'>-kconfig.tk</div><div class='del'>-keywords.c*</div><div class='add'>+keywords.c</div><div class='ctx'> ksym.c*</div><div class='ctx'> ksym.h*</div><div class='ctx'> kxgettext</div><div class='ctx'> lkc_defs.h</div><div class='del'>-lex.c*</div><div class='add'>+lex.c</div><div class='ctx'> lex.*.c</div><div class='ctx'> logo_*.c</div><div class='ctx'> logo_*_clut224.c</div><div class='hunk'>@@ -130,7 +125,6 @@ lxdialog</div><div class='ctx'> mach-types</div><div class='ctx'> mach-types.h</div><div class='ctx'> machtypes.h</div><div class='del'>-make_times_h</div><div class='ctx'> map</div><div class='ctx'> maui_boot.h</div><div class='ctx'> mconf</div><div class='hunk'>@@ -138,6 +132,7 @@ miboot*</div><div class='ctx'> mk_elfconfig</div><div class='ctx'> mkboot</div><div class='ctx'> mkbugboot</div><div class='add'>+mkcpustr</div><div class='ctx'> mkdep</div><div class='ctx'> mkprep</div><div class='ctx'> mktables</div><div class='hunk'>@@ -145,11 +140,12 @@ mktree</div><div class='ctx'> modpost</div><div class='ctx'> modules.order</div><div class='ctx'> modversions.h*</div><div class='add'>+ncscope.*</div><div class='ctx'> offset.h</div><div class='ctx'> offsets.h</div><div class='ctx'> oui.c*</div><div class='del'>-parse.c*</div><div class='del'>-parse.h*</div><div class='add'>+parse.c</div><div class='add'>+parse.h</div><div class='ctx'> patches*</div><div class='ctx'> pca200e.bin</div><div class='ctx'> pca200e_ecd.bin2</div><div class='hunk'>@@ -157,7 +153,7 @@ piggy.gz</div><div class='ctx'> piggyback</div><div class='ctx'> pnmtologo</div><div class='ctx'> ppc_defs.h*</div><div class='del'>-promcon_tbl.c*</div><div class='add'>+promcon_tbl.c</div><div class='ctx'> pss_boot.h</div><div class='ctx'> qconf</div><div class='ctx'> raid6altivec*.c</div><div class='hunk'>@@ -168,27 +164,38 @@ series</div><div class='ctx'> setup</div><div class='ctx'> setup.bin</div><div class='ctx'> setup.elf</div><div class='del'>-sim710_d.h*</div><div class='ctx'> sImage</div><div class='ctx'> sm_tbl*</div><div class='ctx'> split-include</div><div class='add'>+syscalltab.h</div><div class='ctx'> tags</div><div class='ctx'> tftpboot.img</div><div class='ctx'> timeconst.h</div><div class='ctx'> times.h*</div><div class='del'>-tkparse</div><div class='ctx'> trix_boot.h</div><div class='ctx'> utsrelease.h*</div><div class='add'>+vdso-syms.lds</div><div class='ctx'> vdso.lds</div><div class='add'>+vdso32-int80-syms.lds</div><div class='add'>+vdso32-syms.lds</div><div class='add'>+vdso32-syscall-syms.lds</div><div class='add'>+vdso32-sysenter-syms.lds</div><div class='add'>+vdso32.lds</div><div class='add'>+vdso32.so.dbg</div><div class='add'>+vdso64.lds</div><div class='add'>+vdso64.so.dbg</div><div class='ctx'> version.h*</div><div class='ctx'> vmlinux</div><div class='ctx'> vmlinux-*</div><div class='ctx'> vmlinux.aout</div><div class='del'>-vmlinux*.lds*</div><div class='del'>-vmlinux*.scr</div><div class='add'>+vmlinux.lds</div><div class='ctx'> vsyscall.lds</div><div class='add'>+vsyscall_32.lds</div><div class='ctx'> wanxlfw.inc</div><div class='ctx'> uImage</div><div class='ctx'> unifdef</div><div class='add'>+wakeup.bin</div><div class='add'>+wakeup.elf</div><div class='add'>+wakeup.lds</div><div class='ctx'> zImage*</div><div class='ctx'> zconf.hash.c</div><div class='head'>diff --git a/Documentation/fb/intelfb.txt b/Documentation/fb/intelfb.txt<br/>index 27a3160650a4..dd9e944ea628 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/fb/intelfb.txt?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/fb/intelfb.txt</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/fb/intelfb.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/fb/intelfb.txt</a></div><div class='hunk'>@@ -14,6 +14,7 @@ graphics devices.  These would include:</div><div class='ctx'> 	Intel 915GM</div><div class='ctx'> 	Intel 945G</div><div class='ctx'> 	Intel 945GM</div><div class='add'>+	Intel 945GME</div><div class='ctx'> 	Intel 965G</div><div class='ctx'> 	Intel 965GM</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/fb/uvesafb.txt b/Documentation/fb/uvesafb.txt<br/>index bcfc233a0080..7ac3c4078ff9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/fb/uvesafb.txt?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/fb/uvesafb.txt</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/fb/uvesafb.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/fb/uvesafb.txt</a></div><div class='hunk'>@@ -52,7 +52,7 @@ are either given on the kernel command line or as module parameters, e.g.:</div><div class='ctx'> </div><div class='ctx'>  video=uvesafb:1024x768-32,mtrr:3,ywrap (compiled into the kernel)</div><div class='ctx'> </div><div class='del'>- # modprobe uvesafb mode=1024x768-32 mtrr=3 scroll=ywrap  (module)</div><div class='add'>+ # modprobe uvesafb mode_option=1024x768-32 mtrr=3 scroll=ywrap  (module)</div><div class='ctx'> </div><div class='ctx'> Accepted options:</div><div class='ctx'> </div><div class='hunk'>@@ -105,7 +105,7 @@ vtotal:n</div><div class='ctx'> &lt;mode&gt;  The mode you want to set, in the standard modedb format.  Refer to</div><div class='ctx'>         modedb.txt for a detailed description.  When uvesafb is compiled as</div><div class='ctx'>         a module, the mode string should be provided as a value of the</div><div class='del'>-        'mode' option.</div><div class='add'>+        'mode_option' option.</div><div class='ctx'> </div><div class='ctx'> vbemode:x</div><div class='ctx'>         Force the use of VBE mode x.  The mode will only be set if it's</div><div class='head'>diff --git a/Documentation/fb/viafb.modes b/Documentation/fb/viafb.modes<br/>new file mode 100644<br/>index 000000000000..02e5b487f00e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/fb/viafb.modes?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/fb/viafb.modes</a></div><div class='hunk'>@@ -0,0 +1,870 @@</div><div class='add'>+#</div><div class='add'>+#</div><div class='add'>+#   These data are based on the CRTC parameters in</div><div class='add'>+#</div><div class='add'>+#       VIA Integration Graphics Chip</div><div class='add'>+#       (C) 2004 VIA Technologies Inc.</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+#   640x480, 60 Hz, Non-Interlaced (25.175 MHz dotclock)</div><div class='add'>+#</div><div class='add'>+#               Horizontal  Vertical</div><div class='add'>+#   Resolution      640     480</div><div class='add'>+#   Scan Frequency      31.469 kHz  59.94 Hz</div><div class='add'>+#   Sync Width      3.813 us    0.064 ms</div><div class='add'>+#               12 chars    2 lines</div><div class='add'>+#   Front Porch     0.636 us    0.318  ms</div><div class='add'>+#               2 chars     10 lines</div><div class='add'>+#   Back Porch      1.907 us    1.048  ms</div><div class='add'>+#               6 chars     33 lines</div><div class='add'>+#   Active Time     25.422 us   15.253 ms</div><div class='add'>+#               80 chars    480 lines</div><div class='add'>+#   Blank Time      6.356 us    1.430 ms</div><div class='add'>+#               20 chars    45 lines</div><div class='add'>+#   Polarity        negative    negative</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+mode "640x480-60"</div><div class='add'>+# D: 25.175 MHz, H: 31.469 kHz, V: 59.94 Hz</div><div class='add'>+    geometry 640 480 640 480 32</div><div class='add'>+    timings 39722 48 16 33 10 96 2 endmode mode "480x640-60"</div><div class='add'>+# D: 24.823 MHz, H: 39.780 kHz, V: 60.00 Hz</div><div class='add'>+    geometry 480 640 480 640 32 timings 39722 72 24 19 1 48 3 endmode</div><div class='add'>+#</div><div class='add'>+#   640x480, 75 Hz, Non-Interlaced (31.50 MHz dotclock)</div><div class='add'>+#</div><div class='add'>+#               Horizontal  Vertical</div><div class='add'>+#   Resolution      640     480</div><div class='add'>+#   Scan Frequency      37.500 kHz  75.00 Hz</div><div class='add'>+#   Sync Width      2.032 us    0.080 ms</div><div class='add'>+#               8 chars     3 lines</div><div class='add'>+#   Front Porch     0.508 us    0.027 ms</div><div class='add'>+#               2 chars     1 lines</div><div class='add'>+#   Back Porch      3.810 us    0.427 ms</div><div class='add'>+#               15 chars    16 lines</div><div class='add'>+#   Active Time     20.317 us   12.800 ms</div><div class='add'>+#               80 chars    480 lines</div><div class='add'>+#   Blank Time      6.349 us    0.533 ms</div><div class='add'>+#               25 chars    20 lines</div><div class='add'>+#   Polarity        negative    negative</div><div class='add'>+#</div><div class='add'>+    mode "640x480-75"</div><div class='add'>+# D: 31.50 MHz, H: 37.500 kHz, V: 75.00 Hz</div><div class='add'>+    geometry 640 480 640 480 32 timings 31747 120 16 16 1 64 3 endmode</div><div class='add'>+#</div><div class='add'>+#   640x480, 85 Hz, Non-Interlaced (36.000 MHz dotclock)</div><div class='add'>+#</div><div class='add'>+#               Horizontal  Vertical</div><div class='add'>+#   Resolution      640     480</div><div class='add'>+#   Scan Frequency  43.269 kHz  85.00 Hz</div><div class='add'>+#   Sync Width      1.556 us    0.069 ms</div><div class='add'>+#               7 chars     3 lines</div><div class='add'>+#   Front Porch     1.556 us    0.023 ms</div><div class='add'>+#               7 chars     1 lines</div><div class='add'>+#   Back Porch      2.222 us    0.578 ms</div><div class='add'>+#               10 chars    25 lines</div><div class='add'>+#   Active Time     17.778 us   11.093 ms</div><div class='add'>+#               80 chars    480 lines</div><div class='add'>+#   Blank Time      5.333 us    0.670 ms</div><div class='add'>+#               24 chars    29 lines</div><div class='add'>+#   Polarity        negative    negative</div><div class='add'>+#</div><div class='add'>+    mode "640x480-85"</div><div class='add'>+# D: 36.000 MHz, H: 43.269 kHz, V: 85.00 Hz</div><div class='add'>+    geometry 640 480 640 480 32 timings 27777 80 56 25 1 56 3 endmode</div><div class='add'>+#</div><div class='add'>+#   640x480, 100 Hz, Non-Interlaced (43.163 MHz dotclock)</div><div class='add'>+#</div><div class='add'>+#               Horizontal  Vertical</div><div class='add'>+#   Resolution      640     480</div><div class='add'>+#   Scan Frequency      50.900 kHz  100.00 Hz</div><div class='add'>+#   Sync Width      1.483 us    0.058 ms</div><div class='add'>+#               8 chars     3 lines</div><div class='add'>+#   Front Porch     0.927 us    0.019 ms</div><div class='add'>+#               5 chars     1 lines</div><div class='add'>+#   Back Porch      2.409 us    0.475 ms</div><div class='add'>+#               13 chars    25 lines</div><div class='add'>+#   Active Time     14.827 us   9.430 ms</div><div class='add'>+#               80 chars    480 lines</div><div class='add'>+#   Blank Time      4.819 us    0.570 ms</div><div class='add'>+#               26 chars    29 lines</div><div class='add'>+#   Polarity        positive    positive</div><div class='add'>+#</div><div class='add'>+    mode "640x480-100"</div><div class='add'>+# D: 43.163 MHz, H: 50.900 kHz, V: 100.00 Hz</div><div class='add'>+    geometry 640 480 640 480 32 timings 23168 104 40 25 1 64 3 endmode</div><div class='add'>+#</div><div class='add'>+#   640x480, 120 Hz, Non-Interlaced (52.406 MHz dotclock)</div><div class='add'>+#</div><div class='add'>+#               Horizontal  Vertical</div><div class='add'>+#   Resolution      640     480</div><div class='add'>+#   Scan Frequency      61.800 kHz  120.00 Hz</div><div class='add'>+#   Sync Width      1.221 us    0.048 ms</div><div class='add'>+#               8 chars         3 lines</div><div class='add'>+#   Front Porch     0.763 us    0.016 ms</div><div class='add'>+#               5 chars     1 lines</div><div class='add'>+#   Back Porch      1.984 us    0.496 ms</div><div class='add'>+#               13 chars    31 lines</div><div class='add'>+#   Active Time     12.212 us   7.767 ms</div><div class='add'>+#               80 chars    480 lines</div><div class='add'>+#   Blank Time      3.969 us    0.566 ms</div><div class='add'>+#               26 chars    35 lines</div><div class='add'>+#   Polarity        positive    positive</div><div class='add'>+#</div><div class='add'>+    mode "640x480-120"</div><div class='add'>+# D: 52.406 MHz, H: 61.800 kHz, V: 120.00 Hz</div><div class='add'>+    geometry 640 480 640 480 32 timings 19081 104 40 31 1 64 3 endmode</div><div class='add'>+#</div><div class='add'>+#   720x480, 60 Hz, Non-Interlaced (26.880 MHz dotclock)</div><div class='add'>+#</div><div class='add'>+#               Horizontal  Vertical</div><div class='add'>+#   Resolution      720     480</div><div class='add'>+#   Scan Frequency      30.000 kHz  60.241 Hz</div><div class='add'>+#   Sync Width      2.679 us    0.099 ms</div><div class='add'>+#               9 chars     3 lines</div><div class='add'>+#   Front Porch     0.595 us    0.033 ms</div><div class='add'>+#               2 chars     1 lines</div><div class='add'>+#   Back Porch      3.274 us    0.462 ms</div><div class='add'>+#               11 chars    14 lines</div><div class='add'>+#   Active Time     26.786 us   16.000 ms</div><div class='add'>+#               90 chars    480 lines</div><div class='add'>+#   Blank Time      6.548 us    0.600 ms</div><div class='add'>+#               22 chars    18 lines</div><div class='add'>+#   Polarity        positive    positive</div><div class='add'>+#</div><div class='add'>+    mode "720x480-60"</div><div class='add'>+# D: 26.880 MHz, H: 30.000 kHz, V: 60.24 Hz</div><div class='add'>+    geometry 720 480 720 480 32 timings 37202 88 16 14 1 72 3 endmode</div><div class='add'>+#</div><div class='add'>+#   800x480, 60 Hz, Non-Interlaced (29.581 MHz dotclock)</div><div class='add'>+#</div><div class='add'>+#               Horizontal    Vertical</div><div class='add'>+#   Resolution      800         480</div><div class='add'>+#   Scan Frequency  29.892 kHz  60.00 Hz</div><div class='add'>+#   Sync Width      2.704 us    100.604 us</div><div class='add'>+#                   10 chars    3 lines</div><div class='add'>+#   Front Porch     0.541 us    33.535 us</div><div class='add'>+#                   2 chars     1 lines</div><div class='add'>+#   Back Porch      3.245 us    435.949 us</div><div class='add'>+#                   12 chars    13 lines</div><div class='add'>+#   Active Time     27.044 us   16.097 ms</div><div class='add'>+#                   100 chars   480 lines</div><div class='add'>+#   Blank Time      6.491 us    0.570 ms</div><div class='add'>+#                   24 chars    17 lines</div><div class='add'>+#   Polarity        positive    positive</div><div class='add'>+#</div><div class='add'>+    mode "800x480-60"</div><div class='add'>+# D: 29.500 MHz, H: 29.738 kHz, V: 60.00 Hz</div><div class='add'>+    geometry 800 480 800 480 32 timings 33805 96 24 10 3 72 7 endmode</div><div class='add'>+#</div><div class='add'>+#   720x576, 60 Hz, Non-Interlaced (32.668 MHz dotclock)</div><div class='add'>+#</div><div class='add'>+#               Horizontal  Vertical</div><div class='add'>+#   Resolution      720     576</div><div class='add'>+#   Scan Frequency      35.820 kHz  60.00 Hz</div><div class='add'>+#   Sync Width      2.204 us    0.083 ms</div><div class='add'>+#               9 chars     3 lines</div><div class='add'>+#   Front Porch     0.735 us    0.027 ms</div><div class='add'>+#               3 chars     1 lines</div><div class='add'>+#   Back Porch      2.939 us    0.459 ms</div><div class='add'>+#               12 chars    17 lines</div><div class='add'>+#   Active Time     22.040 us   16.080 ms</div><div class='add'>+#               90 chars    476 lines</div><div class='add'>+#   Blank Time      5.877 us    0.586 ms</div><div class='add'>+#               24 chars    21 lines</div><div class='add'>+#   Polarity        positive    positive</div><div class='add'>+#</div><div class='add'>+    mode "720x576-60"</div><div class='add'>+# D: 32.668 MHz, H: 35.820 kHz, V: 60.00 Hz</div><div class='add'>+    geometry 720 576 720 576 32 timings 30611 96 24 17 1 72 3 endmode</div><div class='add'>+#</div><div class='add'>+#   800x600, 60 Hz, Non-Interlaced (40.00 MHz dotclock)</div><div class='add'>+#</div><div class='add'>+#               Horizontal  Vertical</div><div class='add'>+#   Resolution      800     600</div><div class='add'>+#   Scan Frequency      37.879 kHz  60.32 Hz</div><div class='add'>+#   Sync Width      3.200 us    0.106 ms</div><div class='add'>+#               16 chars    4 lines</div><div class='add'>+#   Front Porch     1.000 us    0.026 ms</div><div class='add'>+#               5 chars     1 lines</div><div class='add'>+#   Back Porch      2.200 us    0.607 ms</div><div class='add'>+#               11 chars    23 lines</div><div class='add'>+#   Active Time     20.000 us   15.840 ms</div><div class='add'>+#               100 chars   600 lines</div><div class='add'>+#   Blank Time      6.400 us    0.739 ms</div><div class='add'>+#               32 chars    28 lines</div><div class='add'>+#   Polarity        positive    positive</div><div class='add'>+#</div><div class='add'>+    mode "800x600-60"</div><div class='add'>+# D: 40.00 MHz, H: 37.879 kHz, V: 60.32 Hz</div><div class='add'>+    geometry 800 600 800 600 32</div><div class='add'>+    timings 25000 88 40 23 1 128 4 hsync high vsync high endmode</div><div class='add'>+#</div><div class='add'>+#   800x600, 75 Hz, Non-Interlaced (49.50 MHz dotclock)</div><div class='add'>+#</div><div class='add'>+#               Horizontal  Vertical</div><div class='add'>+#   Resolution      800     600</div><div class='add'>+#   Scan Frequency      46.875 kHz  75.00 Hz</div><div class='add'>+#   Sync Width      1.616 us    0.064 ms</div><div class='add'>+#               10 chars    3 lines</div><div class='add'>+#   Front Porch     0.323 us    0.021 ms</div><div class='add'>+#               2 chars     1 lines</div><div class='add'>+#   Back Porch      3.232 us    0.448 ms</div><div class='add'>+#               20 chars    21 lines</div><div class='add'>+#   Active Time     16.162 us   12.800 ms</div><div class='add'>+#               100 chars   600 lines</div><div class='add'>+#   Blank Time      5.172 us    0.533 ms</div><div class='add'>+#               32 chars    25 lines</div><div class='add'>+#   Polarity        positive    positive</div><div class='add'>+#</div><div class='add'>+    mode "800x600-75"</div><div class='add'>+# D: 49.50 MHz, H: 46.875 kHz, V: 75.00 Hz</div><div class='add'>+    geometry 800 600 800 600 32</div><div class='add'>+    timings 20203 160 16 21 1 80 3 hsync high vsync high endmode</div><div class='add'>+#</div><div class='add'>+#   800x600, 85 Hz, Non-Interlaced (56.25 MHz dotclock)</div><div class='add'>+#</div><div class='add'>+#               Horizontal  Vertical</div><div class='add'>+#   Resolution      800     600</div><div class='add'>+#   Scan Frequency      53.674 kHz  85.061 Hz</div><div class='add'>+#   Sync Width      1.138 us    0.056 ms</div><div class='add'>+#               8 chars     3 lines</div><div class='add'>+#   Front Porch     0.569 us    0.019 ms</div><div class='add'>+#               4 chars     1 lines</div><div class='add'>+#   Back Porch      2.702 us    0.503 ms</div><div class='add'>+#               19 chars    27 lines</div><div class='add'>+#   Active Time     14.222 us   11.179 ms</div><div class='add'>+#               100 chars   600 lines</div><div class='add'>+#   Blank Time      4.409 us    0.578 ms</div><div class='add'>+#               31 chars    31 lines</div><div class='add'>+#   Polarity        positive    positive</div><div class='add'>+#</div><div class='add'>+    mode "800x600-85"</div><div class='add'>+# D: 56.25 MHz, H: 53.674 kHz, V: 85.061 Hz</div><div class='add'>+    geometry 800 600 800 600 32</div><div class='add'>+    timings 17777 152 32 27 1 64 3 hsync high vsync high endmode</div><div class='add'>+#</div><div class='add'>+#   800x600, 100 Hz, Non-Interlaced (67.50 MHz dotclock)</div><div class='add'>+#</div><div class='add'>+#               Horizontal  Vertical</div><div class='add'>+#   Resolution      800     600</div><div class='add'>+#   Scan Frequency      62.500 kHz  100.00 Hz</div><div class='add'>+#   Sync Width      0.948 us    0.064 ms</div><div class='add'>+#               8 chars     4 lines</div><div class='add'>+#   Front Porch     0.000 us    0.112 ms</div><div class='add'>+#               0 chars     7 lines</div><div class='add'>+#   Back Porch      3.200 us    0.224 ms</div><div class='add'>+#               27 chars    14 lines</div><div class='add'>+#   Active Time     11.852 us   9.600 ms</div><div class='add'>+#               100 chars   600 lines</div><div class='add'>+#   Blank Time      4.148 us    0.400 ms</div><div class='add'>+#               35 chars    25 lines</div><div class='add'>+#   Polarity        positive    positive</div><div class='add'>+#</div><div class='add'>+    mode "800x600-100"</div><div class='add'>+# D: 67.50 MHz, H: 62.500 kHz, V: 100.00 Hz</div><div class='add'>+    geometry 800 600 800 600 32</div><div class='add'>+    timings 14667 216 0 14 7 64 4 hsync high vsync high endmode</div><div class='add'>+#</div><div class='add'>+#   800x600, 120 Hz, Non-Interlaced (83.950 MHz dotclock)</div><div class='add'>+#</div><div class='add'>+#               Horizontal  Vertical</div><div class='add'>+#   Resolution      800     600</div><div class='add'>+#   Scan Frequency  77.160 kHz  120.00 Hz</div><div class='add'>+#   Sync Width      1.048 us    0.039 ms</div><div class='add'>+#               11 chars    3 lines</div><div class='add'>+#   Front Porch     0.667 us    0.013 ms</div><div class='add'>+#               7 chars     1 lines</div><div class='add'>+#   Back Porch      1.715 us    0.507 ms</div><div class='add'>+#               18 chars    39 lines</div><div class='add'>+#   Active Time     9.529 us    7.776 ms</div><div class='add'>+#               100 chars   600 lines</div><div class='add'>+#   Blank Time      3.431 us    0.557 ms</div><div class='add'>+#               36 chars    43 lines</div><div class='add'>+#   Polarity        positive    positive</div><div class='add'>+#</div><div class='add'>+    mode "800x600-120"</div><div class='add'>+# D: 83.950 MHz, H: 77.160 kHz, V: 120.00 Hz</div><div class='add'>+    geometry 800 600 800 600 32</div><div class='add'>+    timings 11912 144 56 39 1 88 3 hsync high vsync high endmode</div><div class='add'>+#</div><div class='add'>+#   848x480, 60 Hz, Non-Interlaced (31.490 MHz dotclock)</div><div class='add'>+#</div><div class='add'>+#               Horizontal  Vertical</div><div class='add'>+#   Resolution      848     480</div><div class='add'>+#   Scan Frequency  29.820 kHz  60.00 Hz</div><div class='add'>+#   Sync Width      2.795 us    0.099 ms</div><div class='add'>+#               11 chars    3 lines</div><div class='add'>+#   Front Porch     0.508 us    0.033 ms</div><div class='add'>+#               2 chars     1 lines</div><div class='add'>+#   Back Porch      3.303 us    0.429 ms</div><div class='add'>+#               13 chars    13 lines</div><div class='add'>+#   Active Time     26.929 us   16.097 ms</div><div class='add'>+#               106 chars   480 lines</div><div class='add'>+#   Blank Time      6.605 us    0.570 ms</div><div class='add'>+#               26 chars    17 lines</div><div class='add'>+#   Polarity        positive    positive</div><div class='add'>+#</div><div class='add'>+    mode "848x480-60"</div><div class='add'>+# D: 31.500 MHz, H: 29.830 kHz, V: 60.00 Hz</div><div class='add'>+    geometry 848 480 848 480 32</div><div class='add'>+    timings 31746 104 24 12 3 80 5 hsync high vsync high endmode</div><div class='add'>+#</div><div class='add'>+#   856x480, 60 Hz, Non-Interlaced (31.728 MHz dotclock)</div><div class='add'>+#</div><div class='add'>+#               Horizontal  Vertical</div><div class='add'>+#   Resolution      856     480</div><div class='add'>+#   Scan Frequency  29.820 kHz  60.00 Hz</div><div class='add'>+#   Sync Width      2.774 us    0.099 ms</div><div class='add'>+#               11 chars    3 lines</div><div class='add'>+#   Front Porch     0.504 us    0.033 ms</div><div class='add'>+#               2 chars     1 lines</div><div class='add'>+#   Back Porch      3.728 us    0.429 ms</div><div class='add'>+#               13 chars    13 lines</div><div class='add'>+#   Active Time     26.979 us   16.097 ms</div><div class='add'>+#               107 chars   480 lines</div><div class='add'>+#   Blank Time      6.556 us    0.570 ms</div><div class='add'>+#               26 chars    17 lines</div><div class='add'>+#   Polarity        positive    positive</div><div class='add'>+#</div><div class='add'>+    mode "856x480-60"</div><div class='add'>+# D: 31.728 MHz, H: 29.820 kHz, V: 60.00 Hz</div><div class='add'>+    geometry 856 480 856 480 32</div><div class='add'>+    timings 31518 104 16 13 1 88 3</div><div class='add'>+    hsync high vsync high endmode mode "960x600-60"</div><div class='add'>+# D: 45.250 MHz, H: 37.212 kHz, V: 60.00 Hz</div><div class='add'>+    geometry 960 600 960 600 32 timings 22099 128 32 15 3 96 6 endmode</div><div class='add'>+#</div><div class='add'>+#   1000x600, 60 Hz, Non-Interlaced (48.068 MHz dotclock)</div><div class='add'>+#</div><div class='add'>+#               Horizontal  Vertical</div><div class='add'>+#   Resolution      1000     600</div><div class='add'>+#   Scan Frequency  37.320 kHz  60.00 Hz</div><div class='add'>+#   Sync Width      2.164 us    0.080 ms</div><div class='add'>+#               13 chars    3 lines</div><div class='add'>+#   Front Porch     0.832 us    0.027 ms</div><div class='add'>+#               5 chars     1 lines</div><div class='add'>+#   Back Porch      2.996 us    0.483 ms</div><div class='add'>+#               18 chars    18 lines</div><div class='add'>+#   Active Time     20.804 us   16.077 ms</div><div class='add'>+#               125 chars   600 lines</div><div class='add'>+#   Blank Time      5.991 us    0.589 ms</div><div class='add'>+#               36 chars    22 lines</div><div class='add'>+#   Polarity        negative    positive</div><div class='add'>+#</div><div class='add'>+    mode "1000x600-60"</div><div class='add'>+# D: 48.068 MHz, H: 37.320 kHz, V: 60.00 Hz</div><div class='add'>+    geometry 1000 600 1000 600 32</div><div class='add'>+    timings 20834 144 40 18 1 104 3 endmode mode "1024x576-60"</div><div class='add'>+# D: 46.996 MHz, H: 35.820 kHz, V: 60.00 Hz</div><div class='add'>+    geometry 1024 576 1024 576 32</div><div class='add'>+    timings 21278 144 40 17 1 104 3 endmode mode "1024x600-60"</div><div class='add'>+# D: 48.964 MHz, H: 37.320 kHz, V: 60.00 Hz</div><div class='add'>+    geometry 1024 600 1024 600 32</div><div class='add'>+    timings 20461 144 40 18 1 104 3 endmode mode "1088x612-60"</div><div class='add'>+# D: 52.952 MHz, H: 38.040 kHz, V: 60.00 Hz</div><div class='add'>+    geometry 1088 612 1088 612 32 timings 18877 152 48 16 3 104 5 endmode</div><div class='add'>+#</div><div class='add'>+#   1024x512, 60 Hz, Non-Interlaced (41.291 MHz dotclock)</div><div class='add'>+#</div><div class='add'>+#               Horizontal  Vertical</div><div class='add'>+#   Resolution      1024    512</div><div class='add'>+#   Scan Frequency  31.860 kHz  60.00 Hz</div><div class='add'>+#   Sync Width      2.519 us    0.094 ms</div><div class='add'>+#               13 chars    3 lines</div><div class='add'>+#   Front Porch     0.775 us    0.031 ms</div><div class='add'>+#               4 chars     1 lines</div><div class='add'>+#   Back Porch      3.294 us    0.465 ms</div><div class='add'>+#               17 chars    15 lines</div><div class='add'>+#   Active Time     24.800 us   16.070 ms</div><div class='add'>+#               128 chars   512 lines</div><div class='add'>+#   Blank Time      6.587 us    0.596 ms</div><div class='add'>+#               34 chars    19 lines</div><div class='add'>+#   Polarity        positive    positive</div><div class='add'>+#</div><div class='add'>+    mode "1024x512-60"</div><div class='add'>+# D: 41.291 MHz, H: 31.860 kHz, V: 60.00 Hz</div><div class='add'>+    geometry 1024 512 1024 512 32</div><div class='add'>+    timings 24218 126 32 15 1 104 3 hsync high vsync high endmode</div><div class='add'>+#</div><div class='add'>+#   1024x600, 60 Hz, Non-Interlaced (48.875 MHz dotclock)</div><div class='add'>+#</div><div class='add'>+#                     Horizontal  Vertical</div><div class='add'>+#   Resolution          1024        768</div><div class='add'>+#   Scan Frequency      37.252 kHz  60.00 Hz</div><div class='add'>+#   Sync Width          2.128 us    80.532us</div><div class='add'>+#                       13 chars    3 lines</div><div class='add'>+#   Front Porch        0.818 us     26.844 us</div><div class='add'>+#                       5 chars     1 lines</div><div class='add'>+#   Back Porch          2.946 us    483.192 us</div><div class='add'>+#                       18 chars    18 lines</div><div class='add'>+#   Active Time         20.951 us   16.697 ms</div><div class='add'>+#                       128 chars   622 lines</div><div class='add'>+#   Blank Time          5.893 us    0.591 ms</div><div class='add'>+#                       36 chars    22 lines</div><div class='add'>+#   Polarity            negative    positive</div><div class='add'>+#</div><div class='add'>+#mode "1024x600-60"</div><div class='add'>+#     # D: 48.875 MHz, H: 37.252 kHz, V: 60.00 Hz</div><div class='add'>+#     geometry 1024 600 1024 600 32</div><div class='add'>+#    timings 20460  144 40 18 1 104  3</div><div class='add'>+# endmode</div><div class='add'>+#</div><div class='add'>+#   1024x768, 60 Hz, Non-Interlaced (65.00 MHz dotclock)</div><div class='add'>+#</div><div class='add'>+#               Horizontal  Vertical</div><div class='add'>+#   Resolution      1024        768</div><div class='add'>+#   Scan Frequency      48.363 kHz  60.00 Hz</div><div class='add'>+#   Sync Width      2.092 us    0.124 ms</div><div class='add'>+#               17 chars    6 lines</div><div class='add'>+#   Front Porch     0.369 us    0.062 ms</div><div class='add'>+#               3 chars     3 lines</div><div class='add'>+#   Back Porch      2.462 us    0.601 ms</div><div class='add'>+#               20 chars    29 lines</div><div class='add'>+#   Active Time     15.754 us   15.880 ms</div><div class='add'>+#               128 chars   768 lines</div><div class='add'>+#   Blank Time      4.923 us    0.786 ms</div><div class='add'>+#               40 chars    38 lines</div><div class='add'>+#   Polarity        negative    negative</div><div class='add'>+#</div><div class='add'>+    mode "1024x768-60"</div><div class='add'>+# D: 65.00 MHz, H: 48.363 kHz, V: 60.00 Hz</div><div class='add'>+    geometry 1024 768 1024 768 32 timings 15385 160 24 29 3 136 6 endmode</div><div class='add'>+#</div><div class='add'>+#   1024x768, 75 Hz, Non-Interlaced (78.75 MHz dotclock)</div><div class='add'>+#</div><div class='add'>+#               Horizontal  Vertical</div><div class='add'>+#   Resolution      1024        768</div><div class='add'>+#   Scan Frequency      60.023 kHz  75.03 Hz</div><div class='add'>+#   Sync Width      1.219 us    0.050 ms</div><div class='add'>+#               12 chars    3 lines</div><div class='add'>+#   Front Porch     0.203 us    0.017 ms</div><div class='add'>+#               2 chars     1 lines</div><div class='add'>+#   Back Porch      2.235 us    0.466 ms</div><div class='add'>+#               22 chars    28 lines</div><div class='add'>+#   Active Time     13.003 us   12.795 ms</div><div class='add'>+#               128 chars   768 lines</div><div class='add'>+#   Blank Time      3.657 us    0.533 ms</div><div class='add'>+#               36 chars    32 lines</div><div class='add'>+#   Polarity        positive    positive</div><div class='add'>+#</div><div class='add'>+    mode "1024x768-75"</div><div class='add'>+# D: 78.75 MHz, H: 60.023 kHz, V: 75.03 Hz</div><div class='add'>+    geometry 1024 768 1024 768 32</div><div class='add'>+    timings 12699 176 16 28 1 96 3 hsync high vsync high endmode</div><div class='add'>+#</div><div class='add'>+#   1024x768, 85 Hz, Non-Interlaced (94.50 MHz dotclock)</div><div class='add'>+#</div><div class='add'>+#               Horizontal  Vertical</div><div class='add'>+#   Resolution      1024        768</div><div class='add'>+#   Scan Frequency  68.677 kHz  85.00 Hz</div><div class='add'>+#   Sync Width      1.016 us    0.044 ms</div><div class='add'>+#               12 chars    3 lines</div><div class='add'>+#   Front Porch     0.508 us    0.015 ms</div><div class='add'>+#               6 chars     1 lines</div><div class='add'>+#   Back Porch      2.201 us    0.524 ms</div><div class='add'>+#               26 chars    36 lines</div><div class='add'>+#   Active Time     10.836 us   11.183 ms</div><div class='add'>+#               128 chars   768 lines</div><div class='add'>+#   Blank Time      3.725 us    0.582 ms</div><div class='add'>+#               44 chars    40 lines</div><div class='add'>+#   Polarity        positive    positive</div><div class='add'>+#</div><div class='add'>+    mode "1024x768-85"</div><div class='add'>+# D: 94.50 MHz, H: 68.677 kHz, V: 85.00 Hz</div><div class='add'>+    geometry 1024 768 1024 768 32</div><div class='add'>+    timings 10582 208 48 36 1 96 3 hsync high vsync high endmode</div><div class='add'>+#</div><div class='add'>+#   1024x768, 100 Hz, Non-Interlaced (110.0 MHz dotclock)</div><div class='add'>+#</div><div class='add'>+#               Horizontal  Vertical</div><div class='add'>+#   Resolution      1024        768</div><div class='add'>+#   Scan Frequency      79.023 kHz  99.78 Hz</div><div class='add'>+#   Sync Width      0.800 us    0.101 ms</div><div class='add'>+#               11 chars    8 lines</div><div class='add'>+#   Front Porch     0.000 us    0.000 ms</div><div class='add'>+#               0 chars     0 lines</div><div class='add'>+#   Back Porch      2.545 us    0.202 ms</div><div class='add'>+#               35 chars    16 lines</div><div class='add'>+#   Active Time     9.309 us    9.719 ms</div><div class='add'>+#               128 chars   768 lines</div><div class='add'>+#   Blank Time      3.345 us    0.304 ms</div><div class='add'>+#               46 chars    24 lines</div><div class='add'>+#   Polarity        negative    negative</div><div class='add'>+#</div><div class='add'>+    mode "1024x768-100"</div><div class='add'>+# D: 113.3 MHz, H: 79.023 kHz, V: 99.78 Hz</div><div class='add'>+    geometry 1024 768 1024 768 32</div><div class='add'>+    timings 8825 280 0 16 0 88 8 endmode mode "1152x720-60"</div><div class='add'>+# D: 66.750 MHz, H: 44.859 kHz, V: 60.00 Hz</div><div class='add'>+    geometry 1152 720 1152 720 32 timings 14981 168 56 19 3 112 6 endmode</div><div class='add'>+#</div><div class='add'>+#   1152x864, 75 Hz, Non-Interlaced (110.0 MHz dotclock)</div><div class='add'>+#</div><div class='add'>+#               Horizontal  Vertical</div><div class='add'>+#   Resolution      1152        864</div><div class='add'>+#   Scan Frequency      75.137 kHz  74.99 Hz</div><div class='add'>+#   Sync Width      1.309 us    0.106 ms</div><div class='add'>+#               18 chars    8 lines</div><div class='add'>+#   Front Porch     0.245 us    0.599 ms</div><div class='add'>+#               3 chars     45 lines</div><div class='add'>+#   Back Porch      1.282 us    1.132 ms</div><div class='add'>+#               18 chars    85 lines</div><div class='add'>+#   Active Time     10.473 us   11.499 ms</div><div class='add'>+#               144 chars   864 lines</div><div class='add'>+#   Blank Time      2.836 us    1.837 ms</div><div class='add'>+#               39 chars    138 lines</div><div class='add'>+#   Polarity        positive    positive</div><div class='add'>+#</div><div class='add'>+    mode "1152x864-75"</div><div class='add'>+# D: 110.0 MHz, H: 75.137 kHz, V: 74.99 Hz</div><div class='add'>+    geometry 1152 864 1152 864 32</div><div class='add'>+    timings 9259 144 24 85 45 144 8</div><div class='add'>+    hsync high vsync high endmode mode "1200x720-60"</div><div class='add'>+# D: 70.184 MHz, H: 44.760 kHz, V: 60.00 Hz</div><div class='add'>+    geometry 1200 720 1200 720 32</div><div class='add'>+    timings 14253 184 28 22 1 128 3 endmode mode "1280x600-60"</div><div class='add'>+# D: 61.503 MHz, H: 37.320 kHz, V: 60.00 Hz</div><div class='add'>+    geometry 1280 600 1280 600 32</div><div class='add'>+    timings 16260 184 28 18 1 128 3 endmode mode "1280x720-50"</div><div class='add'>+# D: 60.466 MHz, H: 37.050 kHz, V: 50.00 Hz</div><div class='add'>+    geometry 1280 720 1280 720 32</div><div class='add'>+    timings 16538 176 48 17 1 128 3 endmode mode "1280x768-50"</div><div class='add'>+# D: 65.178 MHz, H: 39.550 kHz, V: 50.00 Hz</div><div class='add'>+    geometry 1280 768 1280 768 32 timings 15342 184 28 19 1 128 3 endmode</div><div class='add'>+#</div><div class='add'>+#   1280x768, 60 Hz, Non-Interlaced (80.136 MHz dotclock)</div><div class='add'>+#</div><div class='add'>+#               Horizontal  Vertical</div><div class='add'>+#   Resolution      1280    768</div><div class='add'>+#   Scan Frequency  47.700 kHz  60.00 Hz</div><div class='add'>+#   Sync Width      1.697 us    0.063 ms</div><div class='add'>+#               17 chars    3 lines</div><div class='add'>+#   Front Porch     0.799 us    0.021 ms</div><div class='add'>+#               8 chars     1 lines</div><div class='add'>+#   Back Porch      2.496 us    0.483 ms</div><div class='add'>+#               25 chars    23 lines</div><div class='add'>+#   Active Time     15.973 us   16.101 ms</div><div class='add'>+#               160 chars   768 lines</div><div class='add'>+#   Blank Time      4.992 us    0.566 ms</div><div class='add'>+#               50 chars    27 lines</div><div class='add'>+#   Polarity        positive    positive</div><div class='add'>+#</div><div class='add'>+    mode "1280x768-60"</div><div class='add'>+# D: 80.13 MHz, H: 47.700 kHz, V: 60.00 Hz</div><div class='add'>+    geometry 1280 768 1280 768 32</div><div class='add'>+    timings 12480 200 48 23 1 126 3 hsync high vsync high endmode</div><div class='add'>+#</div><div class='add'>+#   1280x800, 60 Hz, Non-Interlaced (83.375 MHz dotclock)</div><div class='add'>+#</div><div class='add'>+#               Horizontal  Vertical</div><div class='add'>+#   Resolution      1280    800</div><div class='add'>+#   Scan Frequency  49.628 kHz  60.00 Hz</div><div class='add'>+#   Sync Width      1.631 us    60.450 us</div><div class='add'>+#                   17 chars    3 lines</div><div class='add'>+#   Front Porch     0.768 us    20.15 us</div><div class='add'>+#                   8 chars     1 lines</div><div class='add'>+#   Back Porch      2.399 us    0.483 ms</div><div class='add'>+#                   25 chars    24 lines</div><div class='add'>+#   Active Time     15.352 us   16.120 ms</div><div class='add'>+#                   160 chars   800 lines</div><div class='add'>+#   Blank Time      4.798 us    0.564 ms</div><div class='add'>+#                   50 chars    28 lines</div><div class='add'>+#   Polarity        negtive    positive</div><div class='add'>+#</div><div class='add'>+    mode "1280x800-60"</div><div class='add'>+# D: 83.500 MHz, H: 49.702 kHz, V: 60.00 Hz</div><div class='add'>+    geometry 1280 800 1280 800 32 timings 11994 200 72 22 3 128 6 endmode</div><div class='add'>+#</div><div class='add'>+#   1280x960, 60 Hz, Non-Interlaced (108.00 MHz dotclock)</div><div class='add'>+#</div><div class='add'>+#               Horizontal  Vertical</div><div class='add'>+#   Resolution      1280    960</div><div class='add'>+#   Scan Frequency  60.000 kHz  60.00 Hz</div><div class='add'>+#   Sync Width      1.037 us    0.050 ms</div><div class='add'>+#               14 chars    3 lines</div><div class='add'>+#   Front Porch     0.889 us    0.017 ms</div><div class='add'>+#               12 chars    1 lines</div><div class='add'>+#   Back Porch      2.889 us    0.600 ms</div><div class='add'>+#               39 chars    36 lines</div><div class='add'>+#   Active Time     11.852 us   16.000 ms</div><div class='add'>+#               160 chars   960 lines</div><div class='add'>+#   Blank Time      4.815 us    0.667 ms</div><div class='add'>+#               65 chars    40 lines</div><div class='add'>+#   Polarity        positive    positive</div><div class='add'>+#</div><div class='add'>+    mode "1280x960-60"</div><div class='add'>+# D: 108.00 MHz, H: 60.000 kHz, V: 60.00 Hz</div><div class='add'>+    geometry 1280 960 1280 960 32</div><div class='add'>+    timings 9259 312 96 36 1 112 3 hsync high vsync high endmode</div><div class='add'>+#</div><div class='add'>+#   1280x1024, 60 Hz, Non-Interlaced (108.00 MHz dotclock)</div><div class='add'>+#</div><div class='add'>+#               Horizontal  Vertical</div><div class='add'>+#   Resolution      1280        1024</div><div class='add'>+#   Scan Frequency      63.981 kHz  60.02 Hz</div><div class='add'>+#   Sync Width      1.037 us    0.047 ms</div><div class='add'>+#               14 chars    3 lines</div><div class='add'>+#   Front Porch     0.444 us    0.015 ms</div><div class='add'>+#               6 chars     1 lines</div><div class='add'>+#   Back Porch      2.297 us    0.594 ms</div><div class='add'>+#               31 chars    38 lines</div><div class='add'>+#   Active Time     11.852 us   16.005 ms</div><div class='add'>+#               160 chars   1024 lines</div><div class='add'>+#   Blank Time      3.778 us    0.656 ms</div><div class='add'>+#               51 chars    42 lines</div><div class='add'>+#   Polarity        positive    positive</div><div class='add'>+#</div><div class='add'>+    mode "1280x1024-60"</div><div class='add'>+# D: 108.00 MHz, H: 63.981 kHz, V: 60.02 Hz</div><div class='add'>+    geometry 1280 1024 1280 1024 32</div><div class='add'>+    timings 9260 248 48 38 1 112 3 hsync high vsync high endmode</div><div class='add'>+#</div><div class='add'>+#   1280x1024, 75 Hz, Non-Interlaced (135.00 MHz dotclock)</div><div class='add'>+#</div><div class='add'>+#               Horizontal  Vertical</div><div class='add'>+#   Resolution      1280        1024</div><div class='add'>+#   Scan Frequency      79.976 kHz  75.02 Hz</div><div class='add'>+#   Sync Width      1.067 us    0.038 ms</div><div class='add'>+#               18 chars    3 lines</div><div class='add'>+#   Front Porch     0.119 us    0.012 ms</div><div class='add'>+#               2 chars     1 lines</div><div class='add'>+#   Back Porch      1.837 us    0.475 ms</div><div class='add'>+#               31 chars    38 lines</div><div class='add'>+#   Active Time     9.481 us    12.804 ms</div><div class='add'>+#               160 chars   1024 lines</div><div class='add'>+#   Blank Time      3.022 us    0.525 ms</div><div class='add'>+#               51 chars    42 lines</div><div class='add'>+#   Polarity        positive    positive</div><div class='add'>+#</div><div class='add'>+    mode "1280x1024-75"</div><div class='add'>+# D: 135.00 MHz, H: 79.976 kHz, V: 75.02 Hz</div><div class='add'>+    geometry 1280 1024 1280 1024 32</div><div class='add'>+    timings 7408 248 16 38 1 144 3 hsync high vsync high endmode</div><div class='add'>+#</div><div class='add'>+#   1280x1024, 85 Hz, Non-Interlaced (157.50 MHz dotclock)</div><div class='add'>+#</div><div class='add'>+#               Horizontal  Vertical</div><div class='add'>+#   Resolution      1280        1024</div><div class='add'>+#   Scan Frequency  91.146 kHz  85.02 Hz</div><div class='add'>+#   Sync Width      1.016 us    0.033 ms</div><div class='add'>+#               20 chars    3 lines</div><div class='add'>+#   Front Porch     0.406 us    0.011 ms</div><div class='add'>+#               8 chars     1 lines</div><div class='add'>+#   Back Porch      1.422 us    0.483 ms</div><div class='add'>+#               28 chars    44 lines</div><div class='add'>+#   Active Time     8.127 us    11.235 ms</div><div class='add'>+#               160 chars   1024 lines</div><div class='add'>+#   Blank Time      2.844 us    0.527 ms</div><div class='add'>+#               56 chars    48 lines</div><div class='add'>+#   Polarity        positive    positive</div><div class='add'>+#</div><div class='add'>+    mode "1280x1024-85"</div><div class='add'>+# D: 157.50 MHz, H: 91.146 kHz, V: 85.02 Hz</div><div class='add'>+    geometry 1280 1024 1280 1024 32</div><div class='add'>+    timings 6349 224 64 44 1 160 3</div><div class='add'>+    hsync high vsync high endmode mode "1440x900-60"</div><div class='add'>+# D: 106.500 MHz, H: 55.935 kHz, V: 60.00 Hz</div><div class='add'>+    geometry 1440 900 1440 900 32</div><div class='add'>+    timings 9390 232 80 25 3 152 6</div><div class='add'>+    hsync high vsync high endmode mode "1440x900-75"</div><div class='add'>+# D: 136.750 MHz, H: 70.635 kHz, V: 75.00 Hz</div><div class='add'>+    geometry 1440 900 1440 900 32</div><div class='add'>+    timings 7315 248 96 33 3 152 6 hsync high vsync high endmode</div><div class='add'>+#</div><div class='add'>+#   1440x1050, 60 Hz, Non-Interlaced (125.10 MHz dotclock)</div><div class='add'>+#</div><div class='add'>+#               Horizontal  Vertical</div><div class='add'>+#   Resolution      1440        1050</div><div class='add'>+#   Scan Frequency      65.220 kHz  60.00 Hz</div><div class='add'>+#   Sync Width      1.204 us    0.046 ms</div><div class='add'>+#               19 chars    3 lines</div><div class='add'>+#   Front Porch     0.760 us    0.015 ms</div><div class='add'>+#               12 chars    1 lines</div><div class='add'>+#   Back Porch      1.964 us    0.495 ms</div><div class='add'>+#               31 chars    33 lines</div><div class='add'>+#   Active Time     11.405 us   16.099 ms</div><div class='add'>+#               180 chars   1050 lines</div><div class='add'>+#   Blank Time      3.928 us    0.567 ms</div><div class='add'>+#               62 chars    37 lines</div><div class='add'>+#   Polarity        positive    positive</div><div class='add'>+#</div><div class='add'>+    mode "1440x1050-60"</div><div class='add'>+# D: 125.10 MHz, H: 65.220 kHz, V: 60.00 Hz</div><div class='add'>+    geometry 1440 1050 1440 1050 32</div><div class='add'>+    timings 7993 248 96 33 1 152 3</div><div class='add'>+    hsync high vsync high endmode mode "1600x900-60"</div><div class='add'>+# D: 118.250 MHz, H: 55.990 kHz, V: 60.00 Hz</div><div class='add'>+    geometry 1600 900 1600 900 32</div><div class='add'>+    timings 8415 256 88 26 3 168 5 endmode mode "1600x1024-60"</div><div class='add'>+# D: 136.358 MHz, H: 63.600 kHz, V: 60.00 Hz</div><div class='add'>+    geometry 1600 1024 1600 1024 32 timings 7315 272 104 32 1 168 3 endmode</div><div class='add'>+#</div><div class='add'>+#   1600x1200, 60 Hz, Non-Interlaced (156.00 MHz dotclock)</div><div class='add'>+#</div><div class='add'>+#               Horizontal  Vertical</div><div class='add'>+#   Resolution      1600        1200</div><div class='add'>+#   Scan Frequency      76.200 kHz  60.00 Hz</div><div class='add'>+#   Sync Width      1.026 us    0.105 ms</div><div class='add'>+#               20 chars    8 lines</div><div class='add'>+#   Front Porch     0.205 us    0.131 ms</div><div class='add'>+#               4 chars     10 lines</div><div class='add'>+#   Back Porch      1.636 us    0.682 ms</div><div class='add'>+#               32 chars    52 lines</div><div class='add'>+#   Active Time     10.256 us   15.748 ms</div><div class='add'>+#               200 chars   1200 lines</div><div class='add'>+#   Blank Time      2.872 us    0.866 ms</div><div class='add'>+#               56 chars    66 lines</div><div class='add'>+#   Polarity        negative    negative</div><div class='add'>+#</div><div class='add'>+    mode "1600x1200-60"</div><div class='add'>+# D: 156.00 MHz, H: 76.200 kHz, V: 60.00 Hz</div><div class='add'>+    geometry 1600 1200 1600 1200 32 timings 6172 256 32 52 10 160 8 endmode</div><div class='add'>+#</div><div class='add'>+#   1600x1200, 75 Hz, Non-Interlaced (202.50 MHz dotclock)</div><div class='add'>+#</div><div class='add'>+#               Horizontal  Vertical</div><div class='add'>+#   Resolution      1600        1200</div><div class='add'>+#   Scan Frequency  93.750 kHz  75.00 Hz</div><div class='add'>+#   Sync Width      0.948 us    0.032 ms</div><div class='add'>+#               24 chars    3 lines</div><div class='add'>+#   Front Porch     0.316 us    0.011 ms</div><div class='add'>+#               8 chars     1 lines</div><div class='add'>+#   Back Porch      1.501 us    0.491 ms</div><div class='add'>+#               38 chars    46 lines</div><div class='add'>+#   Active Time     7.901 us    12.800 ms</div><div class='add'>+#               200 chars   1200 lines</div><div class='add'>+#   Blank Time      2.765 us    0.533 ms</div><div class='add'>+#               70 chars    50 lines</div><div class='add'>+#   Polarity    positive    positive</div><div class='add'>+#</div><div class='add'>+    mode "1600x1200-75"</div><div class='add'>+# D: 202.50 MHz, H: 93.750 kHz, V: 75.00 Hz</div><div class='add'>+    geometry 1600 1200 1600 1200 32</div><div class='add'>+    timings 4938 304 64 46 1 192 3</div><div class='add'>+    hsync high vsync high endmode mode "1680x1050-60"</div><div class='add'>+# D: 146.250 MHz, H: 65.290 kHz, V: 59.954 Hz</div><div class='add'>+    geometry 1680 1050 1680 1050 32</div><div class='add'>+    timings 6814 280 104 30 3 176 6</div><div class='add'>+    hsync high vsync high endmode mode "1680x1050-75"</div><div class='add'>+# D: 187.000 MHz, H: 82.306 kHz, V: 74.892 Hz</div><div class='add'>+    geometry 1680 1050 1680 1050 32</div><div class='add'>+    timings 5348 296 120 40 3 176 6</div><div class='add'>+    hsync high vsync high endmode mode "1792x1344-60"</div><div class='add'>+# D: 202.975 MHz, H: 83.460 kHz, V: 60.00 Hz</div><div class='add'>+    geometry 1792 1344 1792 1344 32</div><div class='add'>+    timings 4902 320 128 43 1 192 3</div><div class='add'>+    hsync high vsync high endmode mode "1856x1392-60"</div><div class='add'>+# D: 218.571 MHz, H: 86.460 kHz, V: 60.00 Hz</div><div class='add'>+    geometry 1856 1392 1856 1392 32</div><div class='add'>+    timings 4577 336 136 45 1 200 3</div><div class='add'>+    hsync high vsync high endmode mode "1920x1200-60"</div><div class='add'>+# D: 193.250 MHz, H: 74.556 kHz, V: 60.00 Hz</div><div class='add'>+    geometry 1920 1200 1920 1200 32</div><div class='add'>+    timings 5173 336 136 36 3 200 6</div><div class='add'>+    hsync high vsync high endmode mode "1920x1440-60"</div><div class='add'>+# D: 234.000 MHz, H:90.000 kHz, V: 60.00 Hz</div><div class='add'>+    geometry 1920 1440 1920 1440 32</div><div class='add'>+    timings 4274 344 128 56 1 208 3</div><div class='add'>+    hsync high vsync high endmode mode "1920x1440-75"</div><div class='add'>+# D: 297.000 MHz, H:112.500 kHz, V: 75.00 Hz</div><div class='add'>+    geometry 1920 1440 1920 1440 32</div><div class='add'>+    timings 3367 352 144 56 1 224 3</div><div class='add'>+    hsync high vsync high endmode mode "2048x1536-60"</div><div class='add'>+# D: 267.250 MHz, H: 95.446 kHz, V: 60.00 Hz</div><div class='add'>+    geometry 2048 1536 2048 1536 32</div><div class='add'>+    timings 3742 376 152 49 3 224 4 hsync high vsync high endmode</div><div class='add'>+#</div><div class='add'>+#   1280x720, 60 Hz, Non-Interlaced (74.481 MHz dotclock)</div><div class='add'>+#</div><div class='add'>+#               Horizontal  Vertical</div><div class='add'>+#   Resolution      1280        720</div><div class='add'>+#   Scan Frequency      44.760 kHz  60.00 Hz</div><div class='add'>+#   Sync Width      1.826 us    67.024 ms</div><div class='add'>+#               17 chars    3 lines</div><div class='add'>+#   Front Porch     0.752 us    22.341 ms</div><div class='add'>+#               7 chars     1 lines</div><div class='add'>+#   Back Porch      2.578 us    491.510 ms</div><div class='add'>+#               24 chars    22 lines</div><div class='add'>+#   Active Time     17.186 us   16.086 ms</div><div class='add'>+#               160 chars   720 lines</div><div class='add'>+#   Blank Time      5.156 us    0.581 ms</div><div class='add'>+#               48 chars    26 lines</div><div class='add'>+#   Polarity        negative    negative</div><div class='add'>+#</div><div class='add'>+    mode "1280x720-60"</div><div class='add'>+# D: 74.481 MHz, H: 44.760 kHz, V: 60.00 Hz</div><div class='add'>+    geometry 1280 720 1280 720 32 timings 13426 192 64 22 1 136 3 endmode</div><div class='add'>+#</div><div class='add'>+#   1920x1080, 60 Hz, Non-Interlaced (172.798 MHz dotclock)</div><div class='add'>+#</div><div class='add'>+#               Horizontal  Vertical</div><div class='add'>+#   Resolution      1920        1080</div><div class='add'>+#   Scan Frequency      67.080 kHz  60.00 Hz</div><div class='add'>+#   Sync Width      1.204 us    44.723 ms</div><div class='add'>+#               26 chars    3 lines</div><div class='add'>+#   Front Porch     0.694 us    14.908 ms</div><div class='add'>+#               15 chars     1 lines</div><div class='add'>+#   Back Porch      1.898 us    506.857 ms</div><div class='add'>+#               41 chars    34 lines</div><div class='add'>+#   Active Time     11.111 us   16.100 ms</div><div class='add'>+#               240 chars   1080 lines</div><div class='add'>+#   Blank Time      3.796 us    0.566 ms</div><div class='add'>+#               82 chars    38 lines</div><div class='add'>+#   Polarity        negative    negative</div><div class='add'>+#</div><div class='add'>+    mode "1920x1080-60"</div><div class='add'>+# D: 74.481 MHz, H: 67.080 kHz, V: 60.00 Hz</div><div class='add'>+    geometry 1920 1080 1920 1080 32 timings 5787 328 120 34 1 208 3 endmode</div><div class='add'>+#</div><div class='add'>+#   1400x1050, 60 Hz, Non-Interlaced (122.61 MHz dotclock)</div><div class='add'>+#</div><div class='add'>+#               Horizontal  Vertical</div><div class='add'>+#   Resolution      1400        1050</div><div class='add'>+#   Scan Frequency      65.218 kHz  59.99 Hz</div><div class='add'>+#   Sync Width      1.037 us    0.047 ms</div><div class='add'>+#               19 chars    3 lines</div><div class='add'>+#   Front Porch     0.444 us    0.015 ms</div><div class='add'>+#               11 chars     1 lines</div><div class='add'>+#   Back Porch      1.185 us    0.188 ms</div><div class='add'>+#               30 chars    33 lines</div><div class='add'>+#   Active Time     12.963 us   16.411 ms</div><div class='add'>+#               175 chars   1050 lines</div><div class='add'>+#   Blank Time      2.667 us    0.250 ms</div><div class='add'>+#               60 chars    37 lines</div><div class='add'>+#   Polarity        negative    positive</div><div class='add'>+#</div><div class='add'>+    mode "1400x1050-60"</div><div class='add'>+# D: 122.750 MHz, H: 65.317 kHz, V: 59.99 Hz</div><div class='add'>+    geometry 1400 1050 1408 1050 32</div><div class='add'>+    timings 8214 232 88 32 3 144 4 endmode mode "1400x1050-75"</div><div class='add'>+# D: 156.000 MHz, H: 82.278 kHz, V: 74.867 Hz</div><div class='add'>+    geometry 1400 1050 1408 1050 32 timings 6410 248 104 42 3 144 4 endmode</div><div class='add'>+#</div><div class='add'>+#   1366x768, 60 Hz, Non-Interlaced (85.86 MHz dotclock)</div><div class='add'>+#</div><div class='add'>+#               Horizontal  Vertical</div><div class='add'>+#   Resolution      1366        768</div><div class='add'>+#   Scan Frequency      47.700 kHz  60.00 Hz</div><div class='add'>+#   Sync Width      1.677 us    0.063 ms</div><div class='add'>+#               18 chars    3 lines</div><div class='add'>+#   Front Porch     0.839 us    0.021 ms</div><div class='add'>+#               9 chars     1 lines</div><div class='add'>+#   Back Porch      2.516 us    0.482 ms</div><div class='add'>+#               27 chars    23 lines</div><div class='add'>+#   Active Time     15.933 us   16.101 ms</div><div class='add'>+#               171 chars   768 lines</div><div class='add'>+#   Blank Time      5.031 us    0.566 ms</div><div class='add'>+#               54 chars    27 lines</div><div class='add'>+#   Polarity        negative    positive</div><div class='add'>+#</div><div class='add'>+    mode "1360x768-60"</div><div class='add'>+# D: 84.750 MHz, H: 47.720 kHz, V: 60.00 Hz</div><div class='add'>+    geometry 1360 768 1360 768 32</div><div class='add'>+    timings 11799 208 72 22 3 136 5 endmode mode "1366x768-60"</div><div class='add'>+# D: 85.86 MHz, H: 47.700 kHz, V: 60.00 Hz</div><div class='add'>+    geometry 1366 768 1366 768 32</div><div class='add'>+    timings 11647 216 72 23 1 144 3 endmode mode "1366x768-50"</div><div class='add'>+# D: 69,924 MHz, H: 39.550 kHz, V: 50.00 Hz</div><div class='add'>+    geometry 1366 768 1366 768 32 timings 14301 200 56 19 1 144 3 endmode</div><div class='head'>diff --git a/Documentation/fb/viafb.txt b/Documentation/fb/viafb.txt<br/>new file mode 100644<br/>index 000000000000..67dbf442b0b6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/fb/viafb.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/fb/viafb.txt</a></div><div class='hunk'>@@ -0,0 +1,214 @@</div><div class='add'>+</div><div class='add'>+        VIA Integration Graphic Chip Console Framebuffer Driver</div><div class='add'>+</div><div class='add'>+[Platform]</div><div class='add'>+-----------------------</div><div class='add'>+    The console framebuffer driver is for graphics chips of</div><div class='add'>+    VIA UniChrome Family(CLE266, PM800 / CN400 / CN300,</div><div class='add'>+                        P4M800CE / P4M800Pro / CN700 / VN800,</div><div class='add'>+                        CX700 / VX700, K8M890, P4M890,</div><div class='add'>+                        CN896 / P4M900, VX800)</div><div class='add'>+</div><div class='add'>+[Driver features]</div><div class='add'>+------------------------</div><div class='add'>+    Device: CRT, LCD, DVI</div><div class='add'>+</div><div class='add'>+    Support viafb_mode:</div><div class='add'>+        CRT:</div><div class='add'>+            640x480(60, 75, 85, 100, 120 Hz), 720x480(60 Hz),</div><div class='add'>+            720x576(60 Hz), 800x600(60, 75, 85, 100, 120 Hz),</div><div class='add'>+            848x480(60 Hz), 856x480(60 Hz), 1024x512(60 Hz),</div><div class='add'>+            1024x768(60, 75, 85, 100 Hz), 1152x864(75 Hz),</div><div class='add'>+            1280x768(60 Hz), 1280x960(60 Hz), 1280x1024(60, 75, 85 Hz),</div><div class='add'>+            1440x1050(60 Hz), 1600x1200(60, 75 Hz), 1280x720(60 Hz),</div><div class='add'>+            1920x1080(60 Hz), 1400x1050(60 Hz), 800x480(60 Hz)</div><div class='add'>+</div><div class='add'>+    color depth: 8 bpp, 16 bpp, 32 bpp supports.</div><div class='add'>+</div><div class='add'>+    Support 2D hardware accelerator.</div><div class='add'>+</div><div class='add'>+[Using the viafb module]</div><div class='add'>+-- -- --------------------</div><div class='add'>+    Start viafb with default settings:</div><div class='add'>+        #modprobe viafb</div><div class='add'>+</div><div class='add'>+    Start viafb with with user options:</div><div class='add'>+        #modprobe viafb viafb_mode=800x600 viafb_bpp=16 viafb_refresh=60</div><div class='add'>+                  viafb_active_dev=CRT+DVI viafb_dvi_port=DVP1</div><div class='add'>+                  viafb_mode1=1024x768 viafb_bpp=16 viafb_refresh1=60</div><div class='add'>+                  viafb_SAMM_ON=1</div><div class='add'>+</div><div class='add'>+    viafb_mode:</div><div class='add'>+        640x480 (default)</div><div class='add'>+        720x480</div><div class='add'>+        800x600</div><div class='add'>+        1024x768</div><div class='add'>+        ......</div><div class='add'>+</div><div class='add'>+    viafb_bpp:</div><div class='add'>+        8, 16, 32 (default:32)</div><div class='add'>+</div><div class='add'>+    viafb_refresh:</div><div class='add'>+        60, 75, 85, 100, 120 (default:60)</div><div class='add'>+</div><div class='add'>+    viafb_lcd_dsp_method:</div><div class='add'>+        0 : expansion (default)</div><div class='add'>+        1 : centering</div><div class='add'>+</div><div class='add'>+    viafb_lcd_mode:</div><div class='add'>+        0 : LCD panel with LSB data format input (default)</div><div class='add'>+        1 : LCD panel with MSB data format input</div><div class='add'>+</div><div class='add'>+    viafb_lcd_panel_id:</div><div class='add'>+        0 : Resolution: 640x480, Channel: single, Dithering: Enable</div><div class='add'>+        1 : Resolution: 800x600, Channel: single, Dithering: Enable</div><div class='add'>+        2 : Resolution: 1024x768, Channel: single, Dithering: Enable (default)</div><div class='add'>+        3 : Resolution: 1280x768, Channel: single, Dithering: Enable</div><div class='add'>+        4 : Resolution: 1280x1024, Channel: dual, Dithering: Enable</div><div class='add'>+        5 : Resolution: 1400x1050, Channel: dual, Dithering: Enable</div><div class='add'>+        6 : Resolution: 1600x1200, Channel: dual, Dithering: Enable</div><div class='add'>+</div><div class='add'>+        8 : Resolution: 800x480, Channel: single, Dithering: Enable</div><div class='add'>+        9 : Resolution: 1024x768, Channel: dual, Dithering: Enable</div><div class='add'>+        10: Resolution: 1024x768, Channel: single, Dithering: Disable</div><div class='add'>+        11: Resolution: 1024x768, Channel: dual, Dithering: Disable</div><div class='add'>+        12: Resolution: 1280x768, Channel: single, Dithering: Disable</div><div class='add'>+        13: Resolution: 1280x1024, Channel: dual, Dithering: Disable</div><div class='add'>+        14: Resolution: 1400x1050, Channel: dual, Dithering: Disable</div><div class='add'>+        15: Resolution: 1600x1200, Channel: dual, Dithering: Disable</div><div class='add'>+        16: Resolution: 1366x768, Channel: single, Dithering: Disable</div><div class='add'>+        17: Resolution: 1024x600, Channel: single, Dithering: Enable</div><div class='add'>+        18: Resolution: 1280x768, Channel: dual, Dithering: Enable</div><div class='add'>+        19: Resolution: 1280x800, Channel: single, Dithering: Enable</div><div class='add'>+</div><div class='add'>+    viafb_accel:</div><div class='add'>+        0 : No 2D Hardware Acceleration</div><div class='add'>+        1 : 2D Hardware Acceleration (default)</div><div class='add'>+</div><div class='add'>+    viafb_SAMM_ON:</div><div class='add'>+        0 : viafb_SAMM_ON disable (default)</div><div class='add'>+        1 : viafb_SAMM_ON enable</div><div class='add'>+</div><div class='add'>+    viafb_mode1: (secondary display device)</div><div class='add'>+        640x480 (default)</div><div class='add'>+        720x480</div><div class='add'>+        800x600</div><div class='add'>+        1024x768</div><div class='add'>+        ... ...</div><div class='add'>+</div><div class='add'>+    viafb_bpp1: (secondary display device)</div><div class='add'>+        8, 16, 32 (default:32)</div><div class='add'>+</div><div class='add'>+    viafb_refresh1: (secondary display device)</div><div class='add'>+        60, 75, 85, 100, 120 (default:60)</div><div class='add'>+</div><div class='add'>+    viafb_active_dev:</div><div class='add'>+        This option is used to specify active devices.(CRT, DVI, CRT+LCD...)</div><div class='add'>+        DVI stands for DVI or HDMI, E.g., If you want to enable HDMI,</div><div class='add'>+        set viafb_active_dev=DVI. In SAMM case, the previous of</div><div class='add'>+        viafb_active_dev is primary device, and the following is</div><div class='add'>+        secondary device.</div><div class='add'>+</div><div class='add'>+        For example:</div><div class='add'>+        To enable one device, such as DVI only, we can use:</div><div class='add'>+            modprobe viafb viafb_active_dev=DVI</div><div class='add'>+        To enable two devices, such as CRT+DVI:</div><div class='add'>+            modprobe viafb viafb_active_dev=CRT+DVI;</div><div class='add'>+</div><div class='add'>+        For DuoView case, we can use:</div><div class='add'>+            modprobe viafb viafb_active_dev=CRT+DVI</div><div class='add'>+            OR</div><div class='add'>+            modprobe viafb viafb_active_dev=DVI+CRT...</div><div class='add'>+</div><div class='add'>+        For SAMM case:</div><div class='add'>+        If CRT is primary and DVI is secondary, we should use:</div><div class='add'>+            modprobe viafb viafb_active_dev=CRT+DVI viafb_SAMM_ON=1...</div><div class='add'>+        If DVI is primary and CRT is secondary, we should use:</div><div class='add'>+            modprobe viafb viafb_active_dev=DVI+CRT viafb_SAMM_ON=1...</div><div class='add'>+</div><div class='add'>+    viafb_display_hardware_layout:</div><div class='add'>+        This option is used to specify display hardware layout for CX700 chip.</div><div class='add'>+        1 : LCD only</div><div class='add'>+        2 : DVI only</div><div class='add'>+        3 : LCD+DVI (default)</div><div class='add'>+        4 : LCD1+LCD2 (internal + internal)</div><div class='add'>+        16: LCD1+ExternalLCD2 (internal + external)</div><div class='add'>+</div><div class='add'>+    viafb_second_size:</div><div class='add'>+        This option is used to set second device memory size(MB) in SAMM case.</div><div class='add'>+        The minimal size is 16.</div><div class='add'>+</div><div class='add'>+    viafb_platform_epia_dvi:</div><div class='add'>+        This option is used to enable DVI on EPIA - M</div><div class='add'>+        0 : No DVI on EPIA - M (default)</div><div class='add'>+        1 : DVI on EPIA - M</div><div class='add'>+</div><div class='add'>+    viafb_bus_width:</div><div class='add'>+        When using 24 - Bit Bus Width Digital Interface,</div><div class='add'>+        this option should be set.</div><div class='add'>+        12: 12-Bit LVDS or 12-Bit TMDS (default)</div><div class='add'>+        24: 24-Bit LVDS or 24-Bit TMDS</div><div class='add'>+</div><div class='add'>+    viafb_device_lcd_dualedge:</div><div class='add'>+        When using Dual Edge Panel, this option should be set.</div><div class='add'>+        0 : No Dual Edge Panel (default)</div><div class='add'>+        1 : Dual Edge Panel</div><div class='add'>+</div><div class='add'>+    viafb_video_dev:</div><div class='add'>+        This option is used to specify video output devices(CRT, DVI, LCD) for</div><div class='add'>+        duoview case.</div><div class='add'>+        For example:</div><div class='add'>+        To output video on DVI, we should use:</div><div class='add'>+            modprobe viafb viafb_video_dev=DVI...</div><div class='add'>+</div><div class='add'>+    viafb_lcd_port:</div><div class='add'>+        This option is used to specify LCD output port,</div><div class='add'>+        available values are "DVP0" "DVP1" "DFP_HIGHLOW" "DFP_HIGH" "DFP_LOW".</div><div class='add'>+        for external LCD + external DVI on CX700(External LCD is on DVP0),</div><div class='add'>+        we should use:</div><div class='add'>+            modprobe viafb viafb_lcd_port=DVP0...</div><div class='add'>+</div><div class='add'>+Notes:</div><div class='add'>+    1. CRT may not display properly for DuoView CRT &amp; DVI display at</div><div class='add'>+       the "640x480" PAL mode with DVI overscan enabled.</div><div class='add'>+    2. SAMM stands for single adapter multi monitors. It is different from</div><div class='add'>+       multi-head since SAMM support multi monitor at driver layers, thus fbcon</div><div class='add'>+       layer doesn't even know about it; SAMM's second screen doesn't have a</div><div class='add'>+       device node file, thus a user mode application can't access it directly.</div><div class='add'>+       When SAMM is enabled, viafb_mode and viafb_mode1, viafb_bpp and</div><div class='add'>+       viafb_bpp1, viafb_refresh and viafb_refresh1 can be different.</div><div class='add'>+    3. When console is depending on viafbinfo1, dynamically change resolution</div><div class='add'>+       and bpp, need to call VIAFB specified ioctl interface VIAFB_SET_DEVICE</div><div class='add'>+       instead of calling common ioctl function FBIOPUT_VSCREENINFO since</div><div class='add'>+       viafb doesn't support multi-head well, or it will cause screen crush.</div><div class='add'>+    4. VX800 2D accelerator hasn't been supported in this driver yet. When</div><div class='add'>+       using driver on VX800, the driver will disable the acceleration</div><div class='add'>+       function as default.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+[Configure viafb with "fbset" tool]</div><div class='add'>+-----------------------------------</div><div class='add'>+    "fbset" is an inbox utility of Linux.</div><div class='add'>+    1. Inquire current viafb information, type,</div><div class='add'>+           # fbset -i</div><div class='add'>+</div><div class='add'>+    2. Set various resolutions and viafb_refresh rates,</div><div class='add'>+           # fbset &lt;resolution-vertical_sync&gt;</div><div class='add'>+</div><div class='add'>+       example,</div><div class='add'>+           # fbset "1024x768-75"</div><div class='add'>+       or</div><div class='add'>+           # fbset -g 1024 768 1024 768 32</div><div class='add'>+       Check the file "/etc/fb.modes" to find display modes available.</div><div class='add'>+</div><div class='add'>+    3. Set the color depth,</div><div class='add'>+           # fbset -depth &lt;value&gt;</div><div class='add'>+</div><div class='add'>+       example,</div><div class='add'>+           # fbset -depth 16</div><div class='add'>+</div><div class='add'>+[Bootup with viafb]:</div><div class='add'>+--------------------</div><div class='add'>+    Add the following line to your grub.conf:</div><div class='add'>+    append = "video=viafb:viafb_mode=1024x768,viafb_bpp=32,viafb_refresh=85"</div><div class='add'>+</div><div class='head'>diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt<br/>index 83c88cae1eda..f5f812daf9f4 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/feature-removal-schedule.txt?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/feature-removal-schedule.txt</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/feature-removal-schedule.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/feature-removal-schedule.txt</a></div><div class='hunk'>@@ -6,6 +6,24 @@ be removed from this file.</div><div class='ctx'> </div><div class='ctx'> ---------------------------</div><div class='ctx'> </div><div class='add'>+What:	old static regulatory information and ieee80211_regdom module parameter</div><div class='add'>+When:	2.6.29</div><div class='add'>+Why:	The old regulatory infrastructure has been replaced with a new one</div><div class='add'>+	which does not require statically defined regulatory domains. We do</div><div class='add'>+	not want to keep static regulatory domains in the kernel due to the</div><div class='add'>+	the dynamic nature of regulatory law and localization. We kept around</div><div class='add'>+	the old static definitions for the regulatory domains of:</div><div class='add'>+		* US</div><div class='add'>+		* JP</div><div class='add'>+		* EU</div><div class='add'>+	and used by default the US when CONFIG_WIRELESS_OLD_REGULATORY was</div><div class='add'>+	set. We also kept around the ieee80211_regdom module parameter in case</div><div class='add'>+	some applications were relying on it. Changing regulatory domains</div><div class='add'>+	can now be done instead by using nl80211, as is done with iw.</div><div class='add'>+Who:	Luis R. Rodriguez &lt;lrodriguez@atheros.com&gt;</div><div class='add'>+</div><div class='add'>+---------------------------</div><div class='add'>+</div><div class='ctx'> What:	dev-&gt;power.power_state</div><div class='ctx'> When:	July 2007</div><div class='ctx'> Why:	Broken design for runtime control over driver power states, confusing</div><div class='hunk'>@@ -232,6 +250,9 @@ What (Why):</div><div class='ctx'> 	- xt_mark match revision 0</div><div class='ctx'> 	  (superseded by xt_mark match revision 1)</div><div class='ctx'> </div><div class='add'>+	- xt_recent: the old ipt_recent proc dir</div><div class='add'>+	  (superseded by /proc/net/xt_recent)</div><div class='add'>+</div><div class='ctx'> When:	January 2009 or Linux 2.7.0, whichever comes first</div><div class='ctx'> Why:	Superseded by newer revisions or modules</div><div class='ctx'> Who:	Jan Engelhardt &lt;jengelh@computergmbh.de&gt;</div><div class='hunk'>@@ -266,11 +287,19 @@ Who:	Glauber Costa &lt;gcosta@redhat.com&gt;</div><div class='ctx'> </div><div class='ctx'> ---------------------------</div><div class='ctx'> </div><div class='del'>-What:	old style serial driver for ColdFire (CONFIG_SERIAL_COLDFIRE)</div><div class='del'>-When:	2.6.28</div><div class='del'>-Why:	This driver still uses the old interface and has been replaced</div><div class='del'>-	by CONFIG_SERIAL_MCF.</div><div class='del'>-Who:	Sebastian Siewior &lt;sebastian@breakpoint.cc&gt;</div><div class='add'>+What:	remove HID compat support</div><div class='add'>+When:	2.6.29</div><div class='add'>+Why:	needed only as a temporary solution until distros fix themselves up</div><div class='add'>+Who:	Jiri Slaby &lt;jirislaby@gmail.com&gt;</div><div class='add'>+</div><div class='add'>+---------------------------</div><div class='add'>+</div><div class='add'>+What: print_fn_descriptor_symbol()</div><div class='add'>+When: October 2009</div><div class='add'>+Why:  The %pF vsprintf format provides the same functionality in a</div><div class='add'>+      simpler way.  print_fn_descriptor_symbol() is deprecated but</div><div class='add'>+      still present to give out-of-tree modules time to change.</div><div class='add'>+Who:  Bjorn Helgaas &lt;bjorn.helgaas@hp.com&gt;</div><div class='ctx'> </div><div class='ctx'> ---------------------------</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/filesystems/autofs4-mount-control.txt b/Documentation/filesystems/autofs4-mount-control.txt<br/>new file mode 100644<br/>index 000000000000..c6341745df37<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/filesystems/autofs4-mount-control.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/filesystems/autofs4-mount-control.txt</a></div><div class='hunk'>@@ -0,0 +1,393 @@</div><div class='add'>+</div><div class='add'>+Miscellaneous Device control operations for the autofs4 kernel module</div><div class='add'>+====================================================================</div><div class='add'>+</div><div class='add'>+The problem</div><div class='add'>+===========</div><div class='add'>+</div><div class='add'>+There is a problem with active restarts in autofs (that is to say</div><div class='add'>+restarting autofs when there are busy mounts).</div><div class='add'>+</div><div class='add'>+During normal operation autofs uses a file descriptor opened on the</div><div class='add'>+directory that is being managed in order to be able to issue control</div><div class='add'>+operations. Using a file descriptor gives ioctl operations access to</div><div class='add'>+autofs specific information stored in the super block. The operations</div><div class='add'>+are things such as setting an autofs mount catatonic, setting the</div><div class='add'>+expire timeout and requesting expire checks. As is explained below,</div><div class='add'>+certain types of autofs triggered mounts can end up covering an autofs</div><div class='add'>+mount itself which prevents us being able to use open(2) to obtain a</div><div class='add'>+file descriptor for these operations if we don't already have one open.</div><div class='add'>+</div><div class='add'>+Currently autofs uses "umount -l" (lazy umount) to clear active mounts</div><div class='add'>+at restart. While using lazy umount works for most cases, anything that</div><div class='add'>+needs to walk back up the mount tree to construct a path, such as</div><div class='add'>+getcwd(2) and the proc file system /proc/&lt;pid&gt;/cwd, no longer works</div><div class='add'>+because the point from which the path is constructed has been detached</div><div class='add'>+from the mount tree.</div><div class='add'>+</div><div class='add'>+The actual problem with autofs is that it can't reconnect to existing</div><div class='add'>+mounts. Immediately one thinks of just adding the ability to remount</div><div class='add'>+autofs file systems would solve it, but alas, that can't work. This is</div><div class='add'>+because autofs direct mounts and the implementation of "on demand mount</div><div class='add'>+and expire" of nested mount trees have the file system mounted directly</div><div class='add'>+on top of the mount trigger directory dentry.</div><div class='add'>+</div><div class='add'>+For example, there are two types of automount maps, direct (in the kernel</div><div class='add'>+module source you will see a third type called an offset, which is just</div><div class='add'>+a direct mount in disguise) and indirect.</div><div class='add'>+</div><div class='add'>+Here is a master map with direct and indirect map entries:</div><div class='add'>+</div><div class='add'>+/-      /etc/auto.direct</div><div class='add'>+/test   /etc/auto.indirect</div><div class='add'>+</div><div class='add'>+and the corresponding map files:</div><div class='add'>+</div><div class='add'>+/etc/auto.direct:</div><div class='add'>+</div><div class='add'>+/automount/dparse/g6  budgie:/autofs/export1</div><div class='add'>+/automount/dparse/g1  shark:/autofs/export1</div><div class='add'>+and so on.</div><div class='add'>+</div><div class='add'>+/etc/auto.indirect:</div><div class='add'>+</div><div class='add'>+g1    shark:/autofs/export1</div><div class='add'>+g6    budgie:/autofs/export1</div><div class='add'>+and so on.</div><div class='add'>+</div><div class='add'>+For the above indirect map an autofs file system is mounted on /test and</div><div class='add'>+mounts are triggered for each sub-directory key by the inode lookup</div><div class='add'>+operation. So we see a mount of shark:/autofs/export1 on /test/g1, for</div><div class='add'>+example.</div><div class='add'>+</div><div class='add'>+The way that direct mounts are handled is by making an autofs mount on</div><div class='add'>+each full path, such as /automount/dparse/g1, and using it as a mount</div><div class='add'>+trigger. So when we walk on the path we mount shark:/autofs/export1 "on</div><div class='add'>+top of this mount point". Since these are always directories we can</div><div class='add'>+use the follow_link inode operation to trigger the mount.</div><div class='add'>+</div><div class='add'>+But, each entry in direct and indirect maps can have offsets (making</div><div class='add'>+them multi-mount map entries).</div><div class='add'>+</div><div class='add'>+For example, an indirect mount map entry could also be:</div><div class='add'>+</div><div class='add'>+g1  \</div><div class='add'>+   /        shark:/autofs/export5/testing/test \</div><div class='add'>+   /s1      shark:/autofs/export/testing/test/s1 \</div><div class='add'>+   /s2      shark:/autofs/export5/testing/test/s2 \</div><div class='add'>+   /s1/ss1  shark:/autofs/export1 \</div><div class='add'>+   /s2/ss2  shark:/autofs/export2</div><div class='add'>+</div><div class='add'>+and a similarly a direct mount map entry could also be:</div><div class='add'>+</div><div class='add'>+/automount/dparse/g1 \</div><div class='add'>+    /       shark:/autofs/export5/testing/test \</div><div class='add'>+    /s1     shark:/autofs/export/testing/test/s1 \</div><div class='add'>+    /s2     shark:/autofs/export5/testing/test/s2 \</div><div class='add'>+    /s1/ss1 shark:/autofs/export2 \</div><div class='add'>+    /s2/ss2 shark:/autofs/export2</div><div class='add'>+</div><div class='add'>+One of the issues with version 4 of autofs was that, when mounting an</div><div class='add'>+entry with a large number of offsets, possibly with nesting, we needed</div><div class='add'>+to mount and umount all of the offsets as a single unit. Not really a</div><div class='add'>+problem, except for people with a large number of offsets in map entries.</div><div class='add'>+This mechanism is used for the well known "hosts" map and we have seen</div><div class='add'>+cases (in 2.4) where the available number of mounts are exhausted or</div><div class='add'>+where the number of privileged ports available is exhausted.</div><div class='add'>+</div><div class='add'>+In version 5 we mount only as we go down the tree of offsets and</div><div class='add'>+similarly for expiring them which resolves the above problem. There is</div><div class='add'>+somewhat more detail to the implementation but it isn't needed for the</div><div class='add'>+sake of the problem explanation. The one important detail is that these</div><div class='add'>+offsets are implemented using the same mechanism as the direct mounts</div><div class='add'>+above and so the mount points can be covered by a mount.</div><div class='add'>+</div><div class='add'>+The current autofs implementation uses an ioctl file descriptor opened</div><div class='add'>+on the mount point for control operations. The references held by the</div><div class='add'>+descriptor are accounted for in checks made to determine if a mount is</div><div class='add'>+in use and is also used to access autofs file system information held</div><div class='add'>+in the mount super block. So the use of a file handle needs to be</div><div class='add'>+retained.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+The Solution</div><div class='add'>+============</div><div class='add'>+</div><div class='add'>+To be able to restart autofs leaving existing direct, indirect and</div><div class='add'>+offset mounts in place we need to be able to obtain a file handle</div><div class='add'>+for these potentially covered autofs mount points. Rather than just</div><div class='add'>+implement an isolated operation it was decided to re-implement the</div><div class='add'>+existing ioctl interface and add new operations to provide this</div><div class='add'>+functionality.</div><div class='add'>+</div><div class='add'>+In addition, to be able to reconstruct a mount tree that has busy mounts,</div><div class='add'>+the uid and gid of the last user that triggered the mount needs to be</div><div class='add'>+available because these can be used as macro substitution variables in</div><div class='add'>+autofs maps. They are recorded at mount request time and an operation</div><div class='add'>+has been added to retrieve them.</div><div class='add'>+</div><div class='add'>+Since we're re-implementing the control interface, a couple of other</div><div class='add'>+problems with the existing interface have been addressed. First, when</div><div class='add'>+a mount or expire operation completes a status is returned to the</div><div class='add'>+kernel by either a "send ready" or a "send fail" operation. The</div><div class='add'>+"send fail" operation of the ioctl interface could only ever send</div><div class='add'>+ENOENT so the re-implementation allows user space to send an actual</div><div class='add'>+status. Another expensive operation in user space, for those using</div><div class='add'>+very large maps, is discovering if a mount is present. Usually this</div><div class='add'>+involves scanning /proc/mounts and since it needs to be done quite</div><div class='add'>+often it can introduce significant overhead when there are many entries</div><div class='add'>+in the mount table. An operation to lookup the mount status of a mount</div><div class='add'>+point dentry (covered or not) has also been added.</div><div class='add'>+</div><div class='add'>+Current kernel development policy recommends avoiding the use of the</div><div class='add'>+ioctl mechanism in favor of systems such as Netlink. An implementation</div><div class='add'>+using this system was attempted to evaluate its suitability and it was</div><div class='add'>+found to be inadequate, in this case. The Generic Netlink system was</div><div class='add'>+used for this as raw Netlink would lead to a significant increase in</div><div class='add'>+complexity. There's no question that the Generic Netlink system is an</div><div class='add'>+elegant solution for common case ioctl functions but it's not a complete</div><div class='add'>+replacement probably because it's primary purpose in life is to be a</div><div class='add'>+message bus implementation rather than specifically an ioctl replacement.</div><div class='add'>+While it would be possible to work around this there is one concern</div><div class='add'>+that lead to the decision to not use it. This is that the autofs</div><div class='add'>+expire in the daemon has become far to complex because umount</div><div class='add'>+candidates are enumerated, almost for no other reason than to "count"</div><div class='add'>+the number of times to call the expire ioctl. This involves scanning</div><div class='add'>+the mount table which has proved to be a big overhead for users with</div><div class='add'>+large maps. The best way to improve this is try and get back to the</div><div class='add'>+way the expire was done long ago. That is, when an expire request is</div><div class='add'>+issued for a mount (file handle) we should continually call back to</div><div class='add'>+the daemon until we can't umount any more mounts, then return the</div><div class='add'>+appropriate status to the daemon. At the moment we just expire one</div><div class='add'>+mount at a time. A Generic Netlink implementation would exclude this</div><div class='add'>+possibility for future development due to the requirements of the</div><div class='add'>+message bus architecture.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+autofs4 Miscellaneous Device mount control interface</div><div class='add'>+====================================================</div><div class='add'>+</div><div class='add'>+The control interface is opening a device node, typically /dev/autofs.</div><div class='add'>+</div><div class='add'>+All the ioctls use a common structure to pass the needed parameter</div><div class='add'>+information and return operation results:</div><div class='add'>+</div><div class='add'>+struct autofs_dev_ioctl {</div><div class='add'>+	__u32 ver_major;</div><div class='add'>+	__u32 ver_minor;</div><div class='add'>+	__u32 size;             /* total size of data passed in</div><div class='add'>+				 * including this struct */</div><div class='add'>+	__s32 ioctlfd;          /* automount command fd */</div><div class='add'>+</div><div class='add'>+	__u32 arg1;             /* Command parameters */</div><div class='add'>+	__u32 arg2;</div><div class='add'>+</div><div class='add'>+	char path[0];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+The ioctlfd field is a mount point file descriptor of an autofs mount</div><div class='add'>+point. It is returned by the open call and is used by all calls except</div><div class='add'>+the check for whether a given path is a mount point, where it may</div><div class='add'>+optionally be used to check a specific mount corresponding to a given</div><div class='add'>+mount point file descriptor, and when requesting the uid and gid of the</div><div class='add'>+last successful mount on a directory within the autofs file system.</div><div class='add'>+</div><div class='add'>+The fields arg1 and arg2 are used to communicate parameters and results of</div><div class='add'>+calls made as described below.</div><div class='add'>+</div><div class='add'>+The path field is used to pass a path where it is needed and the size field</div><div class='add'>+is used account for the increased structure length when translating the</div><div class='add'>+structure sent from user space.</div><div class='add'>+</div><div class='add'>+This structure can be initialized before setting specific fields by using</div><div class='add'>+the void function call init_autofs_dev_ioctl(struct autofs_dev_ioctl *).</div><div class='add'>+</div><div class='add'>+All of the ioctls perform a copy of this structure from user space to</div><div class='add'>+kernel space and return -EINVAL if the size parameter is smaller than</div><div class='add'>+the structure size itself, -ENOMEM if the kernel memory allocation fails</div><div class='add'>+or -EFAULT if the copy itself fails. Other checks include a version check</div><div class='add'>+of the compiled in user space version against the module version and a</div><div class='add'>+mismatch results in a -EINVAL return. If the size field is greater than</div><div class='add'>+the structure size then a path is assumed to be present and is checked to</div><div class='add'>+ensure it begins with a "/" and is NULL terminated, otherwise -EINVAL is</div><div class='add'>+returned. Following these checks, for all ioctl commands except</div><div class='add'>+AUTOFS_DEV_IOCTL_VERSION_CMD, AUTOFS_DEV_IOCTL_OPENMOUNT_CMD and</div><div class='add'>+AUTOFS_DEV_IOCTL_CLOSEMOUNT_CMD the ioctlfd is validated and if it is</div><div class='add'>+not a valid descriptor or doesn't correspond to an autofs mount point</div><div class='add'>+an error of -EBADF, -ENOTTY or -EINVAL (not an autofs descriptor) is</div><div class='add'>+returned.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+The ioctls</div><div class='add'>+==========</div><div class='add'>+</div><div class='add'>+An example of an implementation which uses this interface can be seen</div><div class='add'>+in autofs version 5.0.4 and later in file lib/dev-ioctl-lib.c of the</div><div class='add'>+distribution tar available for download from kernel.org in directory</div><div class='add'>+/pub/linux/daemons/autofs/v5.</div><div class='add'>+</div><div class='add'>+The device node ioctl operations implemented by this interface are:</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+AUTOFS_DEV_IOCTL_VERSION</div><div class='add'>+------------------------</div><div class='add'>+</div><div class='add'>+Get the major and minor version of the autofs4 device ioctl kernel module</div><div class='add'>+implementation. It requires an initialized struct autofs_dev_ioctl as an</div><div class='add'>+input parameter and sets the version information in the passed in structure.</div><div class='add'>+It returns 0 on success or the error -EINVAL if a version mismatch is</div><div class='add'>+detected.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+AUTOFS_DEV_IOCTL_PROTOVER_CMD and AUTOFS_DEV_IOCTL_PROTOSUBVER_CMD</div><div class='add'>+------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Get the major and minor version of the autofs4 protocol version understood</div><div class='add'>+by loaded module. This call requires an initialized struct autofs_dev_ioctl</div><div class='add'>+with the ioctlfd field set to a valid autofs mount point descriptor</div><div class='add'>+and sets the requested version number in structure field arg1. These</div><div class='add'>+commands return 0 on success or one of the negative error codes if</div><div class='add'>+validation fails.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+AUTOFS_DEV_IOCTL_OPENMOUNT and AUTOFS_DEV_IOCTL_CLOSEMOUNT</div><div class='add'>+----------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Obtain and release a file descriptor for an autofs managed mount point</div><div class='add'>+path. The open call requires an initialized struct autofs_dev_ioctl with</div><div class='add'>+the the path field set and the size field adjusted appropriately as well</div><div class='add'>+as the arg1 field set to the device number of the autofs mount. The</div><div class='add'>+device number can be obtained from the mount options shown in</div><div class='add'>+/proc/mounts. The close call requires an initialized struct</div><div class='add'>+autofs_dev_ioct with the ioctlfd field set to the descriptor obtained</div><div class='add'>+from the open call. The release of the file descriptor can also be done</div><div class='add'>+with close(2) so any open descriptors will also be closed at process exit.</div><div class='add'>+The close call is included in the implemented operations largely for</div><div class='add'>+completeness and to provide for a consistent user space implementation.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+AUTOFS_DEV_IOCTL_READY_CMD and AUTOFS_DEV_IOCTL_FAIL_CMD</div><div class='add'>+--------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Return mount and expire result status from user space to the kernel.</div><div class='add'>+Both of these calls require an initialized struct autofs_dev_ioctl</div><div class='add'>+with the ioctlfd field set to the descriptor obtained from the open</div><div class='add'>+call and the arg1 field set to the wait queue token number, received</div><div class='add'>+by user space in the foregoing mount or expire request. The arg2 field</div><div class='add'>+is set to the status to be returned. For the ready call this is always</div><div class='add'>+0 and for the fail call it is set to the errno of the operation.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+AUTOFS_DEV_IOCTL_SETPIPEFD_CMD</div><div class='add'>+------------------------------</div><div class='add'>+</div><div class='add'>+Set the pipe file descriptor used for kernel communication to the daemon.</div><div class='add'>+Normally this is set at mount time using an option but when reconnecting</div><div class='add'>+to a existing mount we need to use this to tell the autofs mount about</div><div class='add'>+the new kernel pipe descriptor. In order to protect mounts against</div><div class='add'>+incorrectly setting the pipe descriptor we also require that the autofs</div><div class='add'>+mount be catatonic (see next call).</div><div class='add'>+</div><div class='add'>+The call requires an initialized struct autofs_dev_ioctl with the</div><div class='add'>+ioctlfd field set to the descriptor obtained from the open call and</div><div class='add'>+the arg1 field set to descriptor of the pipe. On success the call</div><div class='add'>+also sets the process group id used to identify the controlling process</div><div class='add'>+(eg. the owning automount(8) daemon) to the process group of the caller.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+AUTOFS_DEV_IOCTL_CATATONIC_CMD</div><div class='add'>+------------------------------</div><div class='add'>+</div><div class='add'>+Make the autofs mount point catatonic. The autofs mount will no longer</div><div class='add'>+issue mount requests, the kernel communication pipe descriptor is released</div><div class='add'>+and any remaining waits in the queue released.</div><div class='add'>+</div><div class='add'>+The call requires an initialized struct autofs_dev_ioctl with the</div><div class='add'>+ioctlfd field set to the descriptor obtained from the open call.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+AUTOFS_DEV_IOCTL_TIMEOUT_CMD</div><div class='add'>+----------------------------</div><div class='add'>+</div><div class='add'>+Set the expire timeout for mounts withing an autofs mount point.</div><div class='add'>+</div><div class='add'>+The call requires an initialized struct autofs_dev_ioctl with the</div><div class='add'>+ioctlfd field set to the descriptor obtained from the open call.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+AUTOFS_DEV_IOCTL_REQUESTER_CMD</div><div class='add'>+------------------------------</div><div class='add'>+</div><div class='add'>+Return the uid and gid of the last process to successfully trigger a the</div><div class='add'>+mount on the given path dentry.</div><div class='add'>+</div><div class='add'>+The call requires an initialized struct autofs_dev_ioctl with the path</div><div class='add'>+field set to the mount point in question and the size field adjusted</div><div class='add'>+appropriately as well as the arg1 field set to the device number of the</div><div class='add'>+containing autofs mount. Upon return the struct field arg1 contains the</div><div class='add'>+uid and arg2 the gid.</div><div class='add'>+</div><div class='add'>+When reconstructing an autofs mount tree with active mounts we need to</div><div class='add'>+re-connect to mounts that may have used the original process uid and</div><div class='add'>+gid (or string variations of them) for mount lookups within the map entry.</div><div class='add'>+This call provides the ability to obtain this uid and gid so they may be</div><div class='add'>+used by user space for the mount map lookups.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+AUTOFS_DEV_IOCTL_EXPIRE_CMD</div><div class='add'>+---------------------------</div><div class='add'>+</div><div class='add'>+Issue an expire request to the kernel for an autofs mount. Typically</div><div class='add'>+this ioctl is called until no further expire candidates are found.</div><div class='add'>+</div><div class='add'>+The call requires an initialized struct autofs_dev_ioctl with the</div><div class='add'>+ioctlfd field set to the descriptor obtained from the open call. In</div><div class='add'>+addition an immediate expire, independent of the mount timeout, can be</div><div class='add'>+requested by setting the arg1 field to 1. If no expire candidates can</div><div class='add'>+be found the ioctl returns -1 with errno set to EAGAIN.</div><div class='add'>+</div><div class='add'>+This call causes the kernel module to check the mount corresponding</div><div class='add'>+to the given ioctlfd for mounts that can be expired, issues an expire</div><div class='add'>+request back to the daemon and waits for completion.</div><div class='add'>+</div><div class='add'>+AUTOFS_DEV_IOCTL_ASKUMOUNT_CMD</div><div class='add'>+------------------------------</div><div class='add'>+</div><div class='add'>+Checks if an autofs mount point is in use.</div><div class='add'>+</div><div class='add'>+The call requires an initialized struct autofs_dev_ioctl with the</div><div class='add'>+ioctlfd field set to the descriptor obtained from the open call and</div><div class='add'>+it returns the result in the arg1 field, 1 for busy and 0 otherwise.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+AUTOFS_DEV_IOCTL_ISMOUNTPOINT_CMD</div><div class='add'>+---------------------------------</div><div class='add'>+</div><div class='add'>+Check if the given path is a mountpoint.</div><div class='add'>+</div><div class='add'>+The call requires an initialized struct autofs_dev_ioctl. There are two</div><div class='add'>+possible variations. Both use the path field set to the path of the mount</div><div class='add'>+point to check and the size field adjusted appropriately. One uses the</div><div class='add'>+ioctlfd field to identify a specific mount point to check while the other</div><div class='add'>+variation uses the path and optionaly arg1 set to an autofs mount type.</div><div class='add'>+The call returns 1 if this is a mount point and sets arg1 to the device</div><div class='add'>+number of the mount and field arg2 to the relevant super block magic</div><div class='add'>+number (described below) or 0 if it isn't a mountpoint. In both cases</div><div class='add'>+the the device number (as returned by new_encode_dev()) is returned</div><div class='add'>+in field arg1.</div><div class='add'>+</div><div class='add'>+If supplied with a file descriptor we're looking for a specific mount,</div><div class='add'>+not necessarily at the top of the mounted stack. In this case the path</div><div class='add'>+the descriptor corresponds to is considered a mountpoint if it is itself</div><div class='add'>+a mountpoint or contains a mount, such as a multi-mount without a root</div><div class='add'>+mount. In this case we return 1 if the descriptor corresponds to a mount</div><div class='add'>+point and and also returns the super magic of the covering mount if there</div><div class='add'>+is one or 0 if it isn't a mountpoint.</div><div class='add'>+</div><div class='add'>+If a path is supplied (and the ioctlfd field is set to -1) then the path</div><div class='add'>+is looked up and is checked to see if it is the root of a mount. If a</div><div class='add'>+type is also given we are looking for a particular autofs mount and if</div><div class='add'>+a match isn't found a fail is returned. If the the located path is the</div><div class='add'>+root of a mount 1 is returned along with the super magic of the mount</div><div class='add'>+or 0 otherwise.</div><div class='add'>+</div><div class='head'>diff --git a/Documentation/filesystems/ext3.txt b/Documentation/filesystems/ext3.txt<br/>index b45f3c1b8b43..295f26cd895a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/filesystems/ext3.txt?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/filesystems/ext3.txt</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/filesystems/ext3.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/filesystems/ext3.txt</a></div><div class='hunk'>@@ -193,6 +193,5 @@ kernel source:	&lt;file:fs/ext3/&gt;</div><div class='ctx'> programs: 	http://e2fsprogs.sourceforge.net/</div><div class='ctx'> 		http://ext2resize.sourceforge.net</div><div class='ctx'> </div><div class='del'>-useful links:	http://www.zip.com.au/~akpm/linux/ext3/ext3-usage.html</div><div class='del'>-		http://www-106.ibm.com/developerworks/linux/library/l-fs7/</div><div class='add'>+useful links:	http://www-106.ibm.com/developerworks/linux/library/l-fs7/</div><div class='ctx'> 		http://www-106.ibm.com/developerworks/linux/library/l-fs8/</div><div class='head'>diff --git a/Documentation/filesystems/ext4.txt b/Documentation/filesystems/ext4.txt<br/>index 0d5394920a31..174eaff7ded9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/filesystems/ext4.txt?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/filesystems/ext4.txt</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/filesystems/ext4.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/filesystems/ext4.txt</a></div><div class='hunk'>@@ -2,19 +2,24 @@</div><div class='ctx'> Ext4 Filesystem</div><div class='ctx'> ===============</div><div class='ctx'> </div><div class='del'>-This is a development version of the ext4 filesystem, an advanced level</div><div class='del'>-of the ext3 filesystem which incorporates scalability and reliability</div><div class='del'>-enhancements for supporting large filesystems (64 bit) in keeping with</div><div class='del'>-increasing disk capacities and state-of-the-art feature requirements.</div><div class='add'>+Ext4 is an an advanced level of the ext3 filesystem which incorporates</div><div class='add'>+scalability and reliability enhancements for supporting large filesystems</div><div class='add'>+(64 bit) in keeping with increasing disk capacities and state-of-the-art</div><div class='add'>+feature requirements.</div><div class='ctx'> </div><div class='del'>-Mailing list: linux-ext4@vger.kernel.org</div><div class='add'>+Mailing list:	linux-ext4@vger.kernel.org</div><div class='add'>+Web site:	http://ext4.wiki.kernel.org</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 1. Quick usage instructions:</div><div class='ctx'> ===========================</div><div class='ctx'> </div><div class='add'>+Note: More extensive information for getting started with ext4 can be</div><div class='add'>+      found at the ext4 wiki site at the URL:</div><div class='add'>+      http://ext4.wiki.kernel.org/index.php/Ext4_Howto</div><div class='add'>+</div><div class='ctx'>   - Compile and install the latest version of e2fsprogs (as of this</div><div class='del'>-    writing version 1.41) from:</div><div class='add'>+    writing version 1.41.3) from:</div><div class='ctx'> </div><div class='ctx'>     http://sourceforge.net/project/showfiles.php?group_id=2406</div><div class='ctx'> 	</div><div class='hunk'>@@ -32,28 +37,26 @@ Mailing list: linux-ext4@vger.kernel.org</div><div class='ctx'>     you will need to merge your changes with the version from e2fsprogs</div><div class='ctx'>     1.41.x.</div><div class='ctx'> </div><div class='del'>-  - Create a new filesystem using the ext4dev filesystem type:</div><div class='add'>+  - Create a new filesystem using the ext4 filesystem type:</div><div class='ctx'> </div><div class='del'>-    	# mke2fs -t ext4dev /dev/hda1</div><div class='add'>+    	# mke2fs -t ext4 /dev/hda1</div><div class='ctx'> </div><div class='del'>-    Or configure an existing ext3 filesystem to support extents and set</div><div class='del'>-    the test_fs flag to indicate that it's ok for an in-development</div><div class='del'>-    filesystem to touch this filesystem:</div><div class='add'>+    Or to configure an existing ext3 filesystem to support extents: </div><div class='ctx'> </div><div class='del'>-	# tune2fs -O extents -E test_fs /dev/hda1</div><div class='add'>+	# tune2fs -O extents /dev/hda1</div><div class='ctx'> </div><div class='ctx'>     If the filesystem was created with 128 byte inodes, it can be</div><div class='ctx'>     converted to use 256 byte for greater efficiency via:</div><div class='ctx'> </div><div class='ctx'>         # tune2fs -I 256 /dev/hda1</div><div class='ctx'> </div><div class='del'>-    (Note: we currently do not have tools to convert an ext4dev</div><div class='add'>+    (Note: we currently do not have tools to convert an ext4</div><div class='ctx'>     filesystem back to ext3; so please do not do try this on production</div><div class='ctx'>     filesystems.)</div><div class='ctx'> </div><div class='ctx'>   - Mounting:</div><div class='ctx'> </div><div class='del'>-	# mount -t ext4dev /dev/hda1 /wherever</div><div class='add'>+	# mount -t ext4 /dev/hda1 /wherever</div><div class='ctx'> </div><div class='ctx'>   - When comparing performance with other filesystems, remember that</div><div class='ctx'>     ext3/4 by default offers higher data integrity guarantees than most.</div><div class='hunk'>@@ -104,8 +107,8 @@ exist yet so I'm not sure they're in the near-term roadmap.</div><div class='ctx'> The big performance win will come with mballoc, delalloc and flex_bg</div><div class='ctx'> grouping of bitmaps and inode tables.  Some test results available here:</div><div class='ctx'> </div><div class='del'>- - http://www.bullopensource.org/ext4/20080530/ffsb-write-2.6.26-rc2.html</div><div class='del'>- - http://www.bullopensource.org/ext4/20080530/ffsb-readwrite-2.6.26-rc2.html</div><div class='add'>+ - http://www.bullopensource.org/ext4/20080818-ffsb/ffsb-write-2.6.27-rc1.html</div><div class='add'>+ - http://www.bullopensource.org/ext4/20080818-ffsb/ffsb-readwrite-2.6.27-rc1.html</div><div class='ctx'> </div><div class='ctx'> 3. Options</div><div class='ctx'> ==========</div><div class='hunk'>@@ -177,6 +180,11 @@ barrier=&lt;0|1(*)&gt;	This enables/disables the use of write barriers in</div><div class='ctx'> 			your disks are battery-backed in one way or another,</div><div class='ctx'> 			disabling barriers may safely improve performance.</div><div class='ctx'> </div><div class='add'>+inode_readahead=n	This tuning parameter controls the maximum</div><div class='add'>+			number of inode table blocks that ext4's inode</div><div class='add'>+			table readahead algorithm will pre-read into</div><div class='add'>+			the buffer cache.  The default value is 32 blocks.</div><div class='add'>+</div><div class='ctx'> orlov		(*)	This enables the new Orlov block allocator. It is</div><div class='ctx'> 			enabled by default.</div><div class='ctx'> </div><div class='hunk'>@@ -209,15 +217,17 @@ noreservation</div><div class='ctx'> bsddf		(*)	Make 'df' act like BSD.</div><div class='ctx'> minixdf			Make 'df' act like Minix.</div><div class='ctx'> </div><div class='del'>-check=none		Don't do extra checking of bitmaps on mount.</div><div class='del'>-nocheck</div><div class='del'>-</div><div class='ctx'> debug			Extra debugging information is sent to syslog.</div><div class='ctx'> </div><div class='ctx'> errors=remount-ro(*)	Remount the filesystem read-only on an error.</div><div class='ctx'> errors=continue		Keep going on a filesystem error.</div><div class='ctx'> errors=panic		Panic and halt the machine if an error occurs.</div><div class='ctx'> </div><div class='add'>+data_err=ignore(*)	Just print an error message if an error occurs</div><div class='add'>+			in a file data buffer in ordered mode.</div><div class='add'>+data_err=abort		Abort the journal if an error occurs in a file</div><div class='add'>+			data buffer in ordered mode.</div><div class='add'>+</div><div class='ctx'> grpid			Give objects the same group ID as their creator.</div><div class='ctx'> bsdgroups</div><div class='ctx'> </div><div class='hunk'>@@ -243,8 +253,6 @@ nobh			(a) cache disk block mapping information</div><div class='ctx'> 			"nobh" option tries to avoid associating buffer</div><div class='ctx'> 			heads (supported only for "writeback" mode).</div><div class='ctx'> </div><div class='del'>-mballoc		(*)	Use the multiple block allocator for block allocation</div><div class='del'>-nomballoc		disabled multiple block allocator for block allocation.</div><div class='ctx'> stripe=n		Number of filesystem blocks that mballoc will try</div><div class='ctx'> 			to use for allocation size and alignment. For RAID5/6</div><div class='ctx'> 			systems this should be the number of data</div><div class='hunk'>@@ -252,6 +260,7 @@ stripe=n		Number of filesystem blocks that mballoc will try</div><div class='ctx'> delalloc	(*)	Deferring block allocation until write-out time.</div><div class='ctx'> nodelalloc		Disable delayed allocation. Blocks are allocation</div><div class='ctx'> 			when data is copied from user to page cache.</div><div class='add'>+</div><div class='ctx'> Data Mode</div><div class='ctx'> =========</div><div class='ctx'> There are 3 different data modes:</div><div class='head'>diff --git a/Documentation/filesystems/fiemap.txt b/Documentation/filesystems/fiemap.txt<br/>new file mode 100644<br/>index 000000000000..1e3defcfe50b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/filesystems/fiemap.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/filesystems/fiemap.txt</a></div><div class='hunk'>@@ -0,0 +1,228 @@</div><div class='add'>+============</div><div class='add'>+Fiemap Ioctl</div><div class='add'>+============</div><div class='add'>+</div><div class='add'>+The fiemap ioctl is an efficient method for userspace to get file</div><div class='add'>+extent mappings. Instead of block-by-block mapping (such as bmap), fiemap</div><div class='add'>+returns a list of extents.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Request Basics</div><div class='add'>+--------------</div><div class='add'>+</div><div class='add'>+A fiemap request is encoded within struct fiemap:</div><div class='add'>+</div><div class='add'>+struct fiemap {</div><div class='add'>+	__u64	fm_start;	 /* logical offset (inclusive) at</div><div class='add'>+				  * which to start mapping (in) */</div><div class='add'>+	__u64	fm_length;	 /* logical length of mapping which</div><div class='add'>+				  * userspace cares about (in) */</div><div class='add'>+	__u32	fm_flags;	 /* FIEMAP_FLAG_* flags for request (in/out) */</div><div class='add'>+	__u32	fm_mapped_extents; /* number of extents that were</div><div class='add'>+				    * mapped (out) */</div><div class='add'>+	__u32	fm_extent_count; /* size of fm_extents array (in) */</div><div class='add'>+	__u32	fm_reserved;</div><div class='add'>+	struct fiemap_extent fm_extents[0]; /* array of mapped extents (out) */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+fm_start, and fm_length specify the logical range within the file</div><div class='add'>+which the process would like mappings for. Extents returned mirror</div><div class='add'>+those on disk - that is, the logical offset of the 1st returned extent</div><div class='add'>+may start before fm_start, and the range covered by the last returned</div><div class='add'>+extent may end after fm_length. All offsets and lengths are in bytes.</div><div class='add'>+</div><div class='add'>+Certain flags to modify the way in which mappings are looked up can be</div><div class='add'>+set in fm_flags. If the kernel doesn't understand some particular</div><div class='add'>+flags, it will return EBADR and the contents of fm_flags will contain</div><div class='add'>+the set of flags which caused the error. If the kernel is compatible</div><div class='add'>+with all flags passed, the contents of fm_flags will be unmodified.</div><div class='add'>+It is up to userspace to determine whether rejection of a particular</div><div class='add'>+flag is fatal to it's operation. This scheme is intended to allow the</div><div class='add'>+fiemap interface to grow in the future but without losing</div><div class='add'>+compatibility with old software.</div><div class='add'>+</div><div class='add'>+fm_extent_count specifies the number of elements in the fm_extents[] array</div><div class='add'>+that can be used to return extents.  If fm_extent_count is zero, then the</div><div class='add'>+fm_extents[] array is ignored (no extents will be returned), and the</div><div class='add'>+fm_mapped_extents count will hold the number of extents needed in</div><div class='add'>+fm_extents[] to hold the file's current mapping.  Note that there is</div><div class='add'>+nothing to prevent the file from changing between calls to FIEMAP.</div><div class='add'>+</div><div class='add'>+The following flags can be set in fm_flags:</div><div class='add'>+</div><div class='add'>+* FIEMAP_FLAG_SYNC</div><div class='add'>+If this flag is set, the kernel will sync the file before mapping extents.</div><div class='add'>+</div><div class='add'>+* FIEMAP_FLAG_XATTR</div><div class='add'>+If this flag is set, the extents returned will describe the inodes</div><div class='add'>+extended attribute lookup tree, instead of it's data tree.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Extent Mapping</div><div class='add'>+--------------</div><div class='add'>+</div><div class='add'>+Extent information is returned within the embedded fm_extents array</div><div class='add'>+which userspace must allocate along with the fiemap structure. The</div><div class='add'>+number of elements in the fiemap_extents[] array should be passed via</div><div class='add'>+fm_extent_count. The number of extents mapped by kernel will be</div><div class='add'>+returned via fm_mapped_extents. If the number of fiemap_extents</div><div class='add'>+allocated is less than would be required to map the requested range,</div><div class='add'>+the maximum number of extents that can be mapped in the fm_extent[]</div><div class='add'>+array will be returned and fm_mapped_extents will be equal to</div><div class='add'>+fm_extent_count. In that case, the last extent in the array will not</div><div class='add'>+complete the requested range and will not have the FIEMAP_EXTENT_LAST</div><div class='add'>+flag set (see the next section on extent flags).</div><div class='add'>+</div><div class='add'>+Each extent is described by a single fiemap_extent structure as</div><div class='add'>+returned in fm_extents.</div><div class='add'>+</div><div class='add'>+struct fiemap_extent {</div><div class='add'>+	__u64	fe_logical;  /* logical offset in bytes for the start of</div><div class='add'>+			      * the extent */</div><div class='add'>+	__u64	fe_physical; /* physical offset in bytes for the start</div><div class='add'>+			      * of the extent */</div><div class='add'>+	__u64	fe_length;   /* length in bytes for the extent */</div><div class='add'>+	__u64	fe_reserved64[2];</div><div class='add'>+	__u32	fe_flags;    /* FIEMAP_EXTENT_* flags for this extent */</div><div class='add'>+	__u32	fe_reserved[3];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+All offsets and lengths are in bytes and mirror those on disk.  It is valid</div><div class='add'>+for an extents logical offset to start before the request or it's logical</div><div class='add'>+length to extend past the request.  Unless FIEMAP_EXTENT_NOT_ALIGNED is</div><div class='add'>+returned, fe_logical, fe_physical, and fe_length will be aligned to the</div><div class='add'>+block size of the file system.  With the exception of extents flagged as</div><div class='add'>+FIEMAP_EXTENT_MERGED, adjacent extents will not be merged.</div><div class='add'>+</div><div class='add'>+The fe_flags field contains flags which describe the extent returned.</div><div class='add'>+A special flag, FIEMAP_EXTENT_LAST is always set on the last extent in</div><div class='add'>+the file so that the process making fiemap calls can determine when no</div><div class='add'>+more extents are available, without having to call the ioctl again.</div><div class='add'>+</div><div class='add'>+Some flags are intentionally vague and will always be set in the</div><div class='add'>+presence of other more specific flags. This way a program looking for</div><div class='add'>+a general property does not have to know all existing and future flags</div><div class='add'>+which imply that property.</div><div class='add'>+</div><div class='add'>+For example, if FIEMAP_EXTENT_DATA_INLINE or FIEMAP_EXTENT_DATA_TAIL</div><div class='add'>+are set, FIEMAP_EXTENT_NOT_ALIGNED will also be set. A program looking</div><div class='add'>+for inline or tail-packed data can key on the specific flag. Software</div><div class='add'>+which simply cares not to try operating on non-aligned extents</div><div class='add'>+however, can just key on FIEMAP_EXTENT_NOT_ALIGNED, and not have to</div><div class='add'>+worry about all present and future flags which might imply unaligned</div><div class='add'>+data. Note that the opposite is not true - it would be valid for</div><div class='add'>+FIEMAP_EXTENT_NOT_ALIGNED to appear alone.</div><div class='add'>+</div><div class='add'>+* FIEMAP_EXTENT_LAST</div><div class='add'>+This is the last extent in the file. A mapping attempt past this</div><div class='add'>+extent will return nothing.</div><div class='add'>+</div><div class='add'>+* FIEMAP_EXTENT_UNKNOWN</div><div class='add'>+The location of this extent is currently unknown. This may indicate</div><div class='add'>+the data is stored on an inaccessible volume or that no storage has</div><div class='add'>+been allocated for the file yet.</div><div class='add'>+</div><div class='add'>+* FIEMAP_EXTENT_DELALLOC</div><div class='add'>+  - This will also set FIEMAP_EXTENT_UNKNOWN.</div><div class='add'>+Delayed allocation - while there is data for this extent, it's</div><div class='add'>+physical location has not been allocated yet.</div><div class='add'>+</div><div class='add'>+* FIEMAP_EXTENT_ENCODED</div><div class='add'>+This extent does not consist of plain filesystem blocks but is</div><div class='add'>+encoded (e.g. encrypted or compressed).  Reading the data in this</div><div class='add'>+extent via I/O to the block device will have undefined results.</div><div class='add'>+</div><div class='add'>+Note that it is *always* undefined to try to update the data</div><div class='add'>+in-place by writing to the indicated location without the</div><div class='add'>+assistance of the filesystem, or to access the data using the</div><div class='add'>+information returned by the FIEMAP interface while the filesystem</div><div class='add'>+is mounted.  In other words, user applications may only read the</div><div class='add'>+extent data via I/O to the block device while the filesystem is</div><div class='add'>+unmounted, and then only if the FIEMAP_EXTENT_ENCODED flag is</div><div class='add'>+clear; user applications must not try reading or writing to the</div><div class='add'>+filesystem via the block device under any other circumstances.</div><div class='add'>+</div><div class='add'>+* FIEMAP_EXTENT_DATA_ENCRYPTED</div><div class='add'>+  - This will also set FIEMAP_EXTENT_ENCODED</div><div class='add'>+The data in this extent has been encrypted by the file system.</div><div class='add'>+</div><div class='add'>+* FIEMAP_EXTENT_NOT_ALIGNED</div><div class='add'>+Extent offsets and length are not guaranteed to be block aligned.</div><div class='add'>+</div><div class='add'>+* FIEMAP_EXTENT_DATA_INLINE</div><div class='add'>+  This will also set FIEMAP_EXTENT_NOT_ALIGNED</div><div class='add'>+Data is located within a meta data block.</div><div class='add'>+</div><div class='add'>+* FIEMAP_EXTENT_DATA_TAIL</div><div class='add'>+  This will also set FIEMAP_EXTENT_NOT_ALIGNED</div><div class='add'>+Data is packed into a block with data from other files.</div><div class='add'>+</div><div class='add'>+* FIEMAP_EXTENT_UNWRITTEN</div><div class='add'>+Unwritten extent - the extent is allocated but it's data has not been</div><div class='add'>+initialized.  This indicates the extent's data will be all zero if read</div><div class='add'>+through the filesystem but the contents are undefined if read directly from</div><div class='add'>+the device.</div><div class='add'>+</div><div class='add'>+* FIEMAP_EXTENT_MERGED</div><div class='add'>+This will be set when a file does not support extents, i.e., it uses a block</div><div class='add'>+based addressing scheme.  Since returning an extent for each block back to</div><div class='add'>+userspace would be highly inefficient, the kernel will try to merge most</div><div class='add'>+adjacent blocks into 'extents'.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+VFS -&gt; File System Implementation</div><div class='add'>+---------------------------------</div><div class='add'>+</div><div class='add'>+File systems wishing to support fiemap must implement a -&gt;fiemap callback on</div><div class='add'>+their inode_operations structure. The fs -&gt;fiemap call is responsible for</div><div class='add'>+defining it's set of supported fiemap flags, and calling a helper function on</div><div class='add'>+each discovered extent:</div><div class='add'>+</div><div class='add'>+struct inode_operations {</div><div class='add'>+       ...</div><div class='add'>+</div><div class='add'>+       int (*fiemap)(struct inode *, struct fiemap_extent_info *, u64 start,</div><div class='add'>+                     u64 len);</div><div class='add'>+</div><div class='add'>+-&gt;fiemap is passed struct fiemap_extent_info which describes the</div><div class='add'>+fiemap request:</div><div class='add'>+</div><div class='add'>+struct fiemap_extent_info {</div><div class='add'>+	unsigned int fi_flags;		/* Flags as passed from user */</div><div class='add'>+	unsigned int fi_extents_mapped;	/* Number of mapped extents */</div><div class='add'>+	unsigned int fi_extents_max;	/* Size of fiemap_extent array */</div><div class='add'>+	struct fiemap_extent *fi_extents_start;	/* Start of fiemap_extent array */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+It is intended that the file system should not need to access any of this</div><div class='add'>+structure directly.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Flag checking should be done at the beginning of the -&gt;fiemap callback via the</div><div class='add'>+fiemap_check_flags() helper:</div><div class='add'>+</div><div class='add'>+int fiemap_check_flags(struct fiemap_extent_info *fieinfo, u32 fs_flags);</div><div class='add'>+</div><div class='add'>+The struct fieinfo should be passed in as recieved from ioctl_fiemap(). The</div><div class='add'>+set of fiemap flags which the fs understands should be passed via fs_flags. If</div><div class='add'>+fiemap_check_flags finds invalid user flags, it will place the bad values in</div><div class='add'>+fieinfo-&gt;fi_flags and return -EBADR. If the file system gets -EBADR, from</div><div class='add'>+fiemap_check_flags(), it should immediately exit, returning that error back to</div><div class='add'>+ioctl_fiemap().</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+For each extent in the request range, the file system should call</div><div class='add'>+the helper function, fiemap_fill_next_extent():</div><div class='add'>+</div><div class='add'>+int fiemap_fill_next_extent(struct fiemap_extent_info *info, u64 logical,</div><div class='add'>+			    u64 phys, u64 len, u32 flags, u32 dev);</div><div class='add'>+</div><div class='add'>+fiemap_fill_next_extent() will use the passed values to populate the</div><div class='add'>+next free extent in the fm_extents array. 'General' extent flags will</div><div class='add'>+automatically be set from specific flags on behalf of the calling file</div><div class='add'>+system so that the userspace API is not broken.</div><div class='add'>+</div><div class='add'>+fiemap_fill_next_extent() returns 0 on success, and 1 when the</div><div class='add'>+user-supplied fm_extents array is full. If an error is encountered</div><div class='add'>+while copying the extent to user memory, -EFAULT will be returned.</div><div class='head'>diff --git a/Documentation/filesystems/nfsroot.txt b/Documentation/filesystems/nfsroot.txt<br/>index 31b329172343..68baddf3c3e0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/filesystems/nfsroot.txt?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/filesystems/nfsroot.txt</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/filesystems/nfsroot.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/filesystems/nfsroot.txt</a></div><div class='hunk'>@@ -169,7 +169,7 @@ They depend on various facilities being available:</div><div class='ctx'> 3.1)  Booting from a floppy using syslinux</div><div class='ctx'> </div><div class='ctx'> 	When building kernels, an easy way to create a boot floppy that uses</div><div class='del'>-	syslinux is to use the zdisk or bzdisk make targets which use</div><div class='add'>+	syslinux is to use the zdisk or bzdisk make targets which use zimage</div><div class='ctx'>       	and bzimage images respectively. Both targets accept the</div><div class='ctx'>      	FDARGS parameter which can be used to set the kernel command line.</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/filesystems/ocfs2.txt b/Documentation/filesystems/ocfs2.txt<br/>index c318a8bbb1ef..4340cc825796 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/filesystems/ocfs2.txt?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/filesystems/ocfs2.txt</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/filesystems/ocfs2.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/filesystems/ocfs2.txt</a></div><div class='hunk'>@@ -76,3 +76,9 @@ localalloc=8(*)		Allows custom localalloc size in MB. If the value is too</div><div class='ctx'> 			large, the fs will silently revert it to the default.</div><div class='ctx'> 			Localalloc is not enabled for local mounts.</div><div class='ctx'> localflocks		This disables cluster aware flock.</div><div class='add'>+inode64			Indicates that Ocfs2 is allowed to create inodes at</div><div class='add'>+			any location in the filesystem, including those which</div><div class='add'>+			will result in inode numbers occupying more than 32</div><div class='add'>+			bits of significance.</div><div class='add'>+user_xattr	(*)	Enables Extended User Attributes.</div><div class='add'>+nouser_xattr		Disables Extended User Attributes.</div><div class='head'>diff --git a/Documentation/filesystems/proc.txt b/Documentation/filesystems/proc.txt<br/>index f566ad9bcb7b..c032bf39e8b9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/filesystems/proc.txt?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/filesystems/proc.txt</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/filesystems/proc.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/filesystems/proc.txt</a></div><div class='hunk'>@@ -923,45 +923,44 @@ CPUs.</div><div class='ctx'> The   "procs_blocked" line gives  the  number of  processes currently blocked,</div><div class='ctx'> waiting for I/O to complete.</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> 1.9 Ext4 file system parameters</div><div class='ctx'> ------------------------------</div><div class='del'>-Ext4 file system have one directory per partition under /proc/fs/ext4/</div><div class='del'>-# ls /proc/fs/ext4/hdc/</div><div class='del'>-group_prealloc  max_to_scan  mb_groups  mb_history  min_to_scan  order2_req</div><div class='del'>-stats  stream_req</div><div class='del'>-</div><div class='del'>-mb_groups:</div><div class='del'>-This file gives the details of multiblock allocator buddy cache of free blocks</div><div class='del'>-</div><div class='del'>-mb_history:</div><div class='del'>-Multiblock allocation history.</div><div class='del'>-</div><div class='del'>-stats:</div><div class='del'>-This file indicate whether the multiblock allocator should start collecting</div><div class='del'>-statistics. The statistics are shown during unmount</div><div class='ctx'> </div><div class='del'>-group_prealloc:</div><div class='del'>-The multiblock allocator normalize the block allocation request to</div><div class='del'>-group_prealloc filesystem blocks if we don't have strip value set.</div><div class='del'>-The stripe value can be specified at mount time or during mke2fs.</div><div class='add'>+Information about mounted ext4 file systems can be found in</div><div class='add'>+/proc/fs/ext4.  Each mounted filesystem will have a directory in</div><div class='add'>+/proc/fs/ext4 based on its device name (i.e., /proc/fs/ext4/hdc or</div><div class='add'>+/proc/fs/ext4/dm-0).   The files in each per-device directory are shown</div><div class='add'>+in Table 1-10, below.</div><div class='ctx'> </div><div class='del'>-max_to_scan:</div><div class='del'>-How long multiblock allocator can look for a best extent (in found extents)</div><div class='del'>-</div><div class='del'>-min_to_scan:</div><div class='del'>-How long multiblock allocator  must look for a best extent</div><div class='del'>-</div><div class='del'>-order2_req:</div><div class='del'>-Multiblock allocator use  2^N search using buddies only for requests greater</div><div class='del'>-than or equal to order2_req. The request size is specfied in file system</div><div class='del'>-blocks. A value of 2 indicate only if the requests are greater than or equal</div><div class='del'>-to 4 blocks.</div><div class='add'>+Table 1-10: Files in /proc/fs/ext4/&lt;devname&gt;</div><div class='add'>+..............................................................................</div><div class='add'>+ File            Content                                        </div><div class='add'>+ mb_groups       details of multiblock allocator buddy cache of free blocks</div><div class='add'>+ mb_history      multiblock allocation history</div><div class='add'>+ stats           controls whether the multiblock allocator should start</div><div class='add'>+                 collecting statistics, which are shown during the unmount</div><div class='add'>+ group_prealloc  the multiblock allocator will round up allocation</div><div class='add'>+                 requests to a multiple of this tuning parameter if the</div><div class='add'>+                 stripe size is not set in the ext4 superblock</div><div class='add'>+ max_to_scan     The maximum number of extents the multiblock allocator</div><div class='add'>+                 will search to find the best extent</div><div class='add'>+ min_to_scan     The minimum number of extents the multiblock allocator</div><div class='add'>+                 will search to find the best extent</div><div class='add'>+ order2_req      Tuning parameter which controls the minimum size for </div><div class='add'>+                 requests (as a power of 2) where the buddy cache is</div><div class='add'>+                 used</div><div class='add'>+ stream_req      Files which have fewer blocks than this tunable</div><div class='add'>+                 parameter will have their blocks allocated out of a</div><div class='add'>+                 block group specific preallocation pool, so that small</div><div class='add'>+                 files are packed closely together.  Each large file</div><div class='add'>+                 will have its blocks allocated out of its own unique</div><div class='add'>+                 preallocation pool.</div><div class='add'>+inode_readahead  Tuning parameter which controls the maximum number of</div><div class='add'>+                 inode table blocks that ext4's inode table readahead</div><div class='add'>+                 algorithm will pre-read into the buffer cache</div><div class='add'>+..............................................................................</div><div class='ctx'> </div><div class='del'>-stream_req:</div><div class='del'>-Files smaller than stream_req are served by the stream allocator, whose</div><div class='del'>-purpose is to pack requests as close each to other as possible to</div><div class='del'>-produce smooth I/O traffic. Avalue of 16 indicate that file smaller than 16</div><div class='del'>-filesystem block size will use group based preallocation.</div><div class='ctx'> </div><div class='ctx'> ------------------------------------------------------------------------------</div><div class='ctx'> Summary</div><div class='hunk'>@@ -1322,6 +1321,18 @@ debugging information is displayed on console.</div><div class='ctx'> NMI switch that most IA32 servers have fires unknown NMI up, for example.</div><div class='ctx'> If a system hangs up, try pressing the NMI switch.</div><div class='ctx'> </div><div class='add'>+panic_on_unrecovered_nmi</div><div class='add'>+------------------------</div><div class='add'>+</div><div class='add'>+The default Linux behaviour on an NMI of either memory or unknown is to continue</div><div class='add'>+operation. For many environments such as scientific computing it is preferable</div><div class='add'>+that the box is taken out and the error dealt with than an uncorrected</div><div class='add'>+parity/ECC error get propogated.</div><div class='add'>+</div><div class='add'>+A small number of systems do generate NMI's for bizarre random reasons such as</div><div class='add'>+power management so the default is off. That sysctl works like the existing</div><div class='add'>+panic controls already in that directory.</div><div class='add'>+</div><div class='ctx'> nmi_watchdog</div><div class='ctx'> ------------</div><div class='ctx'> </div><div class='hunk'>@@ -1332,13 +1343,6 @@ determine whether or not they are still functioning properly.</div><div class='ctx'> Because the NMI watchdog shares registers with oprofile, by disabling the NMI</div><div class='ctx'> watchdog, oprofile may have more registers to utilize.</div><div class='ctx'> </div><div class='del'>-maps_protect</div><div class='del'>-------------</div><div class='del'>-</div><div class='del'>-Enables/Disables the protection of the per-process proc entries "maps" and</div><div class='del'>-"smaps".  When enabled, the contents of these files are visible only to</div><div class='del'>-readers that are allowed to ptrace() the given process.</div><div class='del'>-</div><div class='ctx'> msgmni</div><div class='ctx'> ------</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/filesystems/ramfs-rootfs-initramfs.txt b/Documentation/filesystems/ramfs-rootfs-initramfs.txt<br/>index 7be232b44ee4..62fe9b1e0890 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/filesystems/ramfs-rootfs-initramfs.txt?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/filesystems/ramfs-rootfs-initramfs.txt</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/filesystems/ramfs-rootfs-initramfs.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/filesystems/ramfs-rootfs-initramfs.txt</a></div><div class='hunk'>@@ -263,7 +263,7 @@ User Mode Linux, like so:</div><div class='ctx'>     sleep(999999999);</div><div class='ctx'>   }</div><div class='ctx'>   EOF</div><div class='del'>-  gcc -static hello2.c -o init</div><div class='add'>+  gcc -static hello.c -o init</div><div class='ctx'>   echo init | cpio -o -H newc | gzip &gt; test.cpio.gz</div><div class='ctx'>   # Testing external initramfs using the initrd loading mechanism.</div><div class='ctx'>   qemu -kernel /boot/vmlinuz -initrd test.cpio.gz /dev/zero</div><div class='head'>diff --git a/Documentation/gpio.txt b/Documentation/gpio.txt<br/>index 18022e249c53..b1b988701247 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/gpio.txt?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/gpio.txt</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/gpio.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/gpio.txt</a></div><div class='hunk'>@@ -240,6 +240,10 @@ signal, or (b) something wrongly believes it's safe to remove drivers</div><div class='ctx'> needed to manage a signal that's in active use.  That is, requesting a</div><div class='ctx'> GPIO can serve as a kind of lock.</div><div class='ctx'> </div><div class='add'>+Some platforms may also use knowledge about what GPIOs are active for</div><div class='add'>+power management, such as by powering down unused chip sectors and, more</div><div class='add'>+easily, gating off unused clocks.</div><div class='add'>+</div><div class='ctx'> These two calls are optional because not not all current Linux platforms</div><div class='ctx'> offer such functionality in their GPIO support; a valid implementation</div><div class='ctx'> could return success for all gpio_request() calls.  Unlike the other calls,</div><div class='hunk'>@@ -264,7 +268,7 @@ map between them using calls like:</div><div class='ctx'> 	/* map GPIO numbers to IRQ numbers */</div><div class='ctx'> 	int gpio_to_irq(unsigned gpio);</div><div class='ctx'> </div><div class='del'>-	/* map IRQ numbers to GPIO numbers */</div><div class='add'>+	/* map IRQ numbers to GPIO numbers (avoid using this) */</div><div class='ctx'> 	int irq_to_gpio(unsigned irq);</div><div class='ctx'> </div><div class='ctx'> Those return either the corresponding number in the other namespace, or</div><div class='hunk'>@@ -284,7 +288,8 @@ system wakeup capabilities.</div><div class='ctx'> </div><div class='ctx'> Non-error values returned from irq_to_gpio() would most commonly be used</div><div class='ctx'> with gpio_get_value(), for example to initialize or update driver state</div><div class='del'>-when the IRQ is edge-triggered.</div><div class='add'>+when the IRQ is edge-triggered.  Note that some platforms don't support</div><div class='add'>+this reverse mapping, so you should avoid using it.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Emulating Open Drain Signals</div><div class='head'>diff --git a/Documentation/hwmon/adt7470 b/Documentation/hwmon/adt7470<br/>new file mode 100644<br/>index 000000000000..75d13ca147cc<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/hwmon/adt7470?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/hwmon/adt7470</a></div><div class='hunk'>@@ -0,0 +1,76 @@</div><div class='add'>+Kernel driver adt7470</div><div class='add'>+=====================</div><div class='add'>+</div><div class='add'>+Supported chips:</div><div class='add'>+  * Analog Devices ADT7470</div><div class='add'>+    Prefix: 'adt7470'</div><div class='add'>+    Addresses scanned: I2C 0x2C, 0x2E, 0x2F</div><div class='add'>+    Datasheet: Publicly available at the Analog Devices website</div><div class='add'>+</div><div class='add'>+Author: Darrick J. Wong</div><div class='add'>+</div><div class='add'>+Description</div><div class='add'>+-----------</div><div class='add'>+</div><div class='add'>+This driver implements support for the Analog Devices ADT7470 chip.  There may</div><div class='add'>+be other chips that implement this interface.</div><div class='add'>+</div><div class='add'>+The ADT7470 uses the 2-wire interface compatible with the SMBus 2.0</div><div class='add'>+specification. Using an analog to digital converter it measures up to ten (10)</div><div class='add'>+external temperatures. It has four (4) 16-bit counters for measuring fan speed.</div><div class='add'>+There are four (4) PWM outputs that can be used to control fan speed.</div><div class='add'>+</div><div class='add'>+A sophisticated control system for the PWM outputs is designed into the ADT7470</div><div class='add'>+that allows fan speed to be adjusted automatically based on any of the ten</div><div class='add'>+temperature sensors. Each PWM output is individually adjustable and</div><div class='add'>+programmable. Once configured, the ADT7470 will adjust the PWM outputs in</div><div class='add'>+response to the measured temperatures with further host intervention.  This</div><div class='add'>+feature can also be disabled for manual control of the PWM's.</div><div class='add'>+</div><div class='add'>+Each of the measured inputs (temperature, fan speed) has corresponding high/low</div><div class='add'>+limit values. The ADT7470 will signal an ALARM if any measured value exceeds</div><div class='add'>+either limit.</div><div class='add'>+</div><div class='add'>+The ADT7470 DOES NOT sample all inputs continuously.  A single pin on the</div><div class='add'>+ADT7470 is connected to a multitude of thermal diodes, but the chip must be</div><div class='add'>+instructed explicitly to read the multitude of diodes.  If you want to use</div><div class='add'>+automatic fan control mode, you must manually read any of the temperature</div><div class='add'>+sensors or the fan control algorithm will not run.  The chip WILL NOT DO THIS</div><div class='add'>+AUTOMATICALLY; this must be done from userspace.  This may be a bug in the chip</div><div class='add'>+design, given that many other AD chips take care of this.  The driver will not</div><div class='add'>+read the registers more often than once every 5 seconds.  Further,</div><div class='add'>+configuration data is only read once per minute.</div><div class='add'>+</div><div class='add'>+Special Features</div><div class='add'>+----------------</div><div class='add'>+</div><div class='add'>+The ADT7470 has a 8-bit ADC and is capable of measuring temperatures with 1</div><div class='add'>+degC resolution.</div><div class='add'>+</div><div class='add'>+The Analog Devices datasheet is very detailed and describes a procedure for</div><div class='add'>+determining an optimal configuration for the automatic PWM control.</div><div class='add'>+</div><div class='add'>+Configuration Notes</div><div class='add'>+-------------------</div><div class='add'>+</div><div class='add'>+Besides standard interfaces driver adds the following:</div><div class='add'>+</div><div class='add'>+* PWM Control</div><div class='add'>+</div><div class='add'>+* pwm#_auto_point1_pwm and pwm#_auto_point1_temp and</div><div class='add'>+* pwm#_auto_point2_pwm and pwm#_auto_point2_temp -</div><div class='add'>+</div><div class='add'>+point1: Set the pwm speed at a lower temperature bound.</div><div class='add'>+point2: Set the pwm speed at a higher temperature bound.</div><div class='add'>+</div><div class='add'>+The ADT7470 will scale the pwm between the lower and higher pwm speed when</div><div class='add'>+the temperature is between the two temperature boundaries.  PWM values range</div><div class='add'>+from 0 (off) to 255 (full speed).  Fan speed will be set to maximum when the</div><div class='add'>+temperature sensor associated with the PWM control exceeds</div><div class='add'>+pwm#_auto_point2_temp.</div><div class='add'>+</div><div class='add'>+Notes</div><div class='add'>+-----</div><div class='add'>+</div><div class='add'>+As stated above, the temperature inputs must be read periodically from</div><div class='add'>+userspace in order for the automatic pwm algorithm to run.</div><div class='head'>diff --git a/Documentation/hwmon/it87 b/Documentation/hwmon/it87<br/>index 3496b7020e7c..042c0415140b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/hwmon/it87?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/hwmon/it87</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/hwmon/it87?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/hwmon/it87</a></div><div class='hunk'>@@ -136,10 +136,10 @@ once-only alarms.</div><div class='ctx'> The IT87xx only updates its values each 1.5 seconds; reading it more often</div><div class='ctx'> will do no harm, but will return 'old' values.</div><div class='ctx'> </div><div class='del'>-To change sensor N to a thermistor, 'echo 2 &gt; tempN_type' where N is 1, 2,</div><div class='add'>+To change sensor N to a thermistor, 'echo 4 &gt; tempN_type' where N is 1, 2,</div><div class='ctx'> or 3. To change sensor N to a thermal diode, 'echo 3 &gt; tempN_type'.</div><div class='ctx'> Give 0 for unused sensor. Any other value is invalid. To configure this at</div><div class='del'>-startup, consult lm_sensors's /etc/sensors.conf. (2 = thermistor;</div><div class='add'>+startup, consult lm_sensors's /etc/sensors.conf. (4 = thermistor;</div><div class='ctx'> 3 = thermal diode)</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/hwmon/lm85 b/Documentation/hwmon/lm85<br/>index 6d41db7f17f8..400620741290 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/hwmon/lm85?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/hwmon/lm85</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/hwmon/lm85?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/hwmon/lm85</a></div><div class='hunk'>@@ -163,16 +163,6 @@ configured individually according to the following options.</div><div class='ctx'> * pwm#_auto_pwm_min - this specifies the PWM value for temp#_auto_temp_off</div><div class='ctx'>                       temperature. (PWM value from 0 to 255)</div><div class='ctx'> </div><div class='del'>-* pwm#_auto_pwm_freq - select base frequency of PWM output. You can select</div><div class='del'>-                       in range of 10.0 to 94.0 Hz in .1 Hz units.</div><div class='del'>-		       (Values 100 to 940).</div><div class='del'>-</div><div class='del'>-The pwm#_auto_pwm_freq can be set to one of the following 8 values. Setting the</div><div class='del'>-frequency to a value not on this list, will result in the next higher frequency</div><div class='del'>-being selected. The actual device frequency may vary slightly from this</div><div class='del'>-specification as designed by the manufacturer. Consult the datasheet for more</div><div class='del'>-details. (PWM Frequency values:  100, 150, 230, 300, 380, 470, 620, 940)</div><div class='del'>-</div><div class='ctx'> * pwm#_auto_pwm_minctl - this flags selects for temp#_auto_temp_off temperature</div><div class='ctx'>                          the bahaviour of fans. Write 1 to let fans spinning at</div><div class='ctx'> 			 pwm#_auto_pwm_min or write 0 to let them off.</div><div class='head'>diff --git a/Documentation/hwmon/lm87 b/Documentation/hwmon/lm87<br/>index ec27aa1b94cb..6b47b67fd968 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/hwmon/lm87?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/hwmon/lm87</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/hwmon/lm87?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/hwmon/lm87</a></div><div class='hunk'>@@ -65,11 +65,10 @@ The LM87 has four pins which can serve one of two possible functions,</div><div class='ctx'> depending on the hardware configuration.</div><div class='ctx'> </div><div class='ctx'> Some functions share pins, so not all functions are available at the same</div><div class='del'>-time. Which are depends on the hardware setup. This driver assumes that</div><div class='del'>-the BIOS configured the chip correctly. In that respect, it differs from</div><div class='del'>-the original driver (from lm_sensors for Linux 2.4), which would force the</div><div class='del'>-LM87 to an arbitrary, compile-time chosen mode, regardless of the actual</div><div class='del'>-chipset wiring.</div><div class='add'>+time. Which are depends on the hardware setup. This driver normally</div><div class='add'>+assumes that firmware configured the chip correctly. Where this is not</div><div class='add'>+the case, platform code must set the I2C client's platform_data to point</div><div class='add'>+to a u8 value to be written to the channel register.</div><div class='ctx'> </div><div class='ctx'> For reference, here is the list of exclusive functions:</div><div class='ctx'>  - in0+in5 (default) or temp3</div><div class='head'>diff --git a/Documentation/hwmon/lm90 b/Documentation/hwmon/lm90<br/>index aa4a0ec20081..e0d5206d1de3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/hwmon/lm90?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/hwmon/lm90</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/hwmon/lm90?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/hwmon/lm90</a></div><div class='hunk'>@@ -11,7 +11,7 @@ Supported chips:</div><div class='ctx'>     Prefix: 'lm99'</div><div class='ctx'>     Addresses scanned: I2C 0x4c and 0x4d</div><div class='ctx'>     Datasheet: Publicly available at the National Semiconductor website</div><div class='del'>-               http://www.national.com/pf/LM/LM89.html</div><div class='add'>+               http://www.national.com/mpf/LM/LM89.html</div><div class='ctx'>   * National Semiconductor LM99</div><div class='ctx'>     Prefix: 'lm99'</div><div class='ctx'>     Addresses scanned: I2C 0x4c and 0x4d</div><div class='hunk'>@@ -21,18 +21,32 @@ Supported chips:</div><div class='ctx'>     Prefix: 'lm86'</div><div class='ctx'>     Addresses scanned: I2C 0x4c</div><div class='ctx'>     Datasheet: Publicly available at the National Semiconductor website</div><div class='del'>-               http://www.national.com/pf/LM/LM86.html</div><div class='add'>+               http://www.national.com/mpf/LM/LM86.html</div><div class='ctx'>   * Analog Devices ADM1032</div><div class='ctx'>     Prefix: 'adm1032'</div><div class='ctx'>     Addresses scanned: I2C 0x4c and 0x4d</div><div class='del'>-    Datasheet: Publicly available at the Analog Devices website</div><div class='del'>-               http://www.analog.com/en/prod/0,2877,ADM1032,00.html</div><div class='add'>+    Datasheet: Publicly available at the ON Semiconductor website</div><div class='add'>+               http://www.onsemi.com/PowerSolutions/product.do?id=ADM1032</div><div class='ctx'>   * Analog Devices ADT7461</div><div class='ctx'>     Prefix: 'adt7461'</div><div class='ctx'>     Addresses scanned: I2C 0x4c and 0x4d</div><div class='del'>-    Datasheet: Publicly available at the Analog Devices website</div><div class='del'>-               http://www.analog.com/en/prod/0,2877,ADT7461,00.html</div><div class='del'>-    Note: Only if in ADM1032 compatibility mode</div><div class='add'>+    Datasheet: Publicly available at the ON Semiconductor website</div><div class='add'>+               http://www.onsemi.com/PowerSolutions/product.do?id=ADT7461</div><div class='add'>+  * Maxim MAX6646</div><div class='add'>+    Prefix: 'max6646'</div><div class='add'>+    Addresses scanned: I2C 0x4d</div><div class='add'>+    Datasheet: Publicly available at the Maxim website</div><div class='add'>+               http://www.maxim-ic.com/quick_view2.cfm/qv_pk/3497</div><div class='add'>+  * Maxim MAX6647</div><div class='add'>+    Prefix: 'max6646'</div><div class='add'>+    Addresses scanned: I2C 0x4e</div><div class='add'>+    Datasheet: Publicly available at the Maxim website</div><div class='add'>+               http://www.maxim-ic.com/quick_view2.cfm/qv_pk/3497</div><div class='add'>+  * Maxim MAX6649</div><div class='add'>+    Prefix: 'max6646'</div><div class='add'>+    Addresses scanned: I2C 0x4c</div><div class='add'>+    Datasheet: Publicly available at the Maxim website</div><div class='add'>+               http://www.maxim-ic.com/quick_view2.cfm/qv_pk/3497</div><div class='ctx'>   * Maxim MAX6657</div><div class='ctx'>     Prefix: 'max6657'</div><div class='ctx'>     Addresses scanned: I2C 0x4c</div><div class='hunk'>@@ -70,25 +84,21 @@ Description</div><div class='ctx'> </div><div class='ctx'> The LM90 is a digital temperature sensor. It senses its own temperature as</div><div class='ctx'> well as the temperature of up to one external diode. It is compatible</div><div class='del'>-with many other devices such as the LM86, the LM89, the LM99, the ADM1032,</div><div class='del'>-the MAX6657, MAX6658, MAX6659, MAX6680 and the MAX6681 all of which are</div><div class='del'>-supported by this driver.</div><div class='add'>+with many other devices, many of which are supported by this driver.</div><div class='ctx'> </div><div class='ctx'> Note that there is no easy way to differentiate between the MAX6657,</div><div class='ctx'> MAX6658 and MAX6659 variants. The extra address and features of the</div><div class='ctx'> MAX6659 are not supported by this driver. The MAX6680 and MAX6681 only</div><div class='ctx'> differ in their pinout, therefore they obviously can't (and don't need to)</div><div class='del'>-be distinguished. Additionally, the ADT7461 is supported if found in</div><div class='del'>-ADM1032 compatibility mode.</div><div class='add'>+be distinguished.</div><div class='ctx'> </div><div class='ctx'> The specificity of this family of chipsets over the ADM1021/LM84</div><div class='ctx'> family is that it features critical limits with hysteresis, and an</div><div class='ctx'> increased resolution of the remote temperature measurement.</div><div class='ctx'> </div><div class='ctx'> The different chipsets of the family are not strictly identical, although</div><div class='del'>-very similar. This driver doesn't handle any specific feature for now,</div><div class='del'>-with the exception of SMBus PEC. For reference, here comes a non-exhaustive</div><div class='del'>-list of specific features:</div><div class='add'>+very similar. For reference, here comes a non-exhaustive list of specific</div><div class='add'>+features:</div><div class='ctx'> </div><div class='ctx'> LM90:</div><div class='ctx'>   * Filter and alert configuration register at 0xBF.</div><div class='hunk'>@@ -114,9 +124,11 @@ ADT7461:</div><div class='ctx'>   * Lower resolution for remote temperature</div><div class='ctx'> </div><div class='ctx'> MAX6657 and MAX6658:</div><div class='add'>+  * Better local resolution</div><div class='ctx'>   * Remote sensor type selection</div><div class='ctx'> </div><div class='ctx'> MAX6659:</div><div class='add'>+  * Better local resolution</div><div class='ctx'>   * Selectable address</div><div class='ctx'>   * Second critical temperature limit</div><div class='ctx'>   * Remote sensor type selection</div><div class='hunk'>@@ -127,7 +139,8 @@ MAX6680 and MAX6681:</div><div class='ctx'> </div><div class='ctx'> All temperature values are given in degrees Celsius. Resolution</div><div class='ctx'> is 1.0 degree for the local temperature, 0.125 degree for the remote</div><div class='del'>-temperature.</div><div class='add'>+temperature, except for the MAX6657, MAX6658 and MAX6659 which have a</div><div class='add'>+resolution of 0.125 degree for both temperatures.</div><div class='ctx'> </div><div class='ctx'> Each sensor has its own high and low limits, plus a critical limit.</div><div class='ctx'> Additionally, there is a relative hysteresis value common to both critical</div><div class='head'>diff --git a/Documentation/hwmon/pc87360 b/Documentation/hwmon/pc87360<br/>index 89a8fcfa78df..cbac32b59c8c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/hwmon/pc87360?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/hwmon/pc87360</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/hwmon/pc87360?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/hwmon/pc87360</a></div><div class='hunk'>@@ -5,12 +5,7 @@ Supported chips:</div><div class='ctx'>   * National Semiconductor PC87360, PC87363, PC87364, PC87365 and PC87366</div><div class='ctx'>     Prefixes: 'pc87360', 'pc87363', 'pc87364', 'pc87365', 'pc87366'</div><div class='ctx'>     Addresses scanned: none, address read from Super I/O config space</div><div class='del'>-    Datasheets:</div><div class='del'>-        http://www.national.com/pf/PC/PC87360.html</div><div class='del'>-        http://www.national.com/pf/PC/PC87363.html</div><div class='del'>-        http://www.national.com/pf/PC/PC87364.html</div><div class='del'>-        http://www.national.com/pf/PC/PC87365.html</div><div class='del'>-        http://www.national.com/pf/PC/PC87366.html</div><div class='add'>+    Datasheets: No longer available</div><div class='ctx'> </div><div class='ctx'> Authors: Jean Delvare &lt;khali@linux-fr.org&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/hwmon/pc87427 b/Documentation/hwmon/pc87427<br/>index 9a0708f9f49e..d1ebbe510f35 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/hwmon/pc87427?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/hwmon/pc87427</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/hwmon/pc87427?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/hwmon/pc87427</a></div><div class='hunk'>@@ -5,7 +5,7 @@ Supported chips:</div><div class='ctx'>   * National Semiconductor PC87427</div><div class='ctx'>     Prefix: 'pc87427'</div><div class='ctx'>     Addresses scanned: none, address read from Super I/O config space</div><div class='del'>-    Datasheet: http://www.winbond.com.tw/E-WINBONDHTM/partner/apc_007.html</div><div class='add'>+    Datasheet: No longer available</div><div class='ctx'> </div><div class='ctx'> Author: Jean Delvare &lt;khali@linux-fr.org&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/hwmon/w83781d b/Documentation/hwmon/w83781d<br/>index 6f800a0283e9..c91e0b63ea1d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/hwmon/w83781d?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/hwmon/w83781d</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/hwmon/w83781d?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/hwmon/w83781d</a></div><div class='hunk'>@@ -353,7 +353,7 @@ in6=255</div><div class='ctx'> </div><div class='ctx'> # PWM</div><div class='ctx'> </div><div class='del'>-Additional info about PWM on the AS99127F (may apply to other Asus</div><div class='add'>+* Additional info about PWM on the AS99127F (may apply to other Asus</div><div class='ctx'> chips as well) by Jean Delvare as of 2004-04-09:</div><div class='ctx'> </div><div class='ctx'> AS99127F revision 2 seems to have two PWM registers at 0x59 and 0x5A,</div><div class='hunk'>@@ -396,7 +396,7 @@ Please contact us if you can figure out how it is supposed to work. As</div><div class='ctx'> long as we don't know more, the w83781d driver doesn't handle PWM on</div><div class='ctx'> AS99127F chips at all.</div><div class='ctx'> </div><div class='del'>-Additional info about PWM on the AS99127F rev.1 by Hector Martin:</div><div class='add'>+* Additional info about PWM on the AS99127F rev.1 by Hector Martin:</div><div class='ctx'> </div><div class='ctx'> I've been fiddling around with the (in)famous 0x59 register and</div><div class='ctx'> found out the following values do work as a form of coarse pwm:</div><div class='hunk'>@@ -418,3 +418,36 @@ change.</div><div class='ctx'> My mobo is an ASUS A7V266-E. This behavior is similar to what I got</div><div class='ctx'> with speedfan under Windows, where 0-15% would be off, 15-2x% (can't</div><div class='ctx'> remember the exact value) would be 70% and higher would be full on.</div><div class='add'>+</div><div class='add'>+* Additional info about PWM on the AS99127F rev.1 from lm-sensors</div><div class='add'>+  ticket #2350:</div><div class='add'>+</div><div class='add'>+I conducted some experiment on Asus P3B-F motherboard with AS99127F</div><div class='add'>+(Ver. 1).</div><div class='add'>+</div><div class='add'>+I confirm that 0x59 register control the CPU_Fan Header on this</div><div class='add'>+motherboard, and 0x5a register control PWR_Fan.</div><div class='add'>+</div><div class='add'>+In order to reduce the dependency of specific fan, the measurement is</div><div class='add'>+conducted with a digital scope without fan connected. I found out that</div><div class='add'>+P3B-F actually output variable DC voltage on fan header center pin,</div><div class='add'>+looks like PWM is filtered on this motherboard.</div><div class='add'>+</div><div class='add'>+Here are some of measurements:</div><div class='add'>+</div><div class='add'>+0x80     20 mV</div><div class='add'>+0x81     20 mV</div><div class='add'>+0x82    232 mV</div><div class='add'>+0x83   1.2  V</div><div class='add'>+0x84   2.31 V</div><div class='add'>+0x85   3.44 V</div><div class='add'>+0x86   4.62 V</div><div class='add'>+0x87   5.81 V</div><div class='add'>+0x88   7.01 V</div><div class='add'>+9x89   8.22 V</div><div class='add'>+0x8a   9.42 V</div><div class='add'>+0x8b  10.6  V</div><div class='add'>+0x8c  11.9  V</div><div class='add'>+0x8d  12.4  V</div><div class='add'>+0x8e  12.4  V</div><div class='add'>+0x8f  12.4  V</div><div class='head'>diff --git a/Documentation/hwmon/w83791d b/Documentation/hwmon/w83791d<br/>index a67d3b7a7098..5663e491655c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/hwmon/w83791d?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/hwmon/w83791d</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/hwmon/w83791d?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/hwmon/w83791d</a></div><div class='hunk'>@@ -58,29 +58,35 @@ internal state that allows no clean access (Bank with ID register is not</div><div class='ctx'> currently selected). If you know the address of the chip, use a 'force'</div><div class='ctx'> parameter; this will put it into a more well-behaved state first.</div><div class='ctx'> </div><div class='del'>-The driver implements three temperature sensors, five fan rotation speed</div><div class='del'>-sensors, and ten voltage sensors.</div><div class='add'>+The driver implements three temperature sensors, ten voltage sensors,</div><div class='add'>+five fan rotation speed sensors and manual PWM control of each fan.</div><div class='ctx'> </div><div class='ctx'> Temperatures are measured in degrees Celsius and measurement resolution is 1</div><div class='ctx'> degC for temp1 and 0.5 degC for temp2 and temp3. An alarm is triggered when</div><div class='ctx'> the temperature gets higher than the Overtemperature Shutdown value; it stays</div><div class='ctx'> on until the temperature falls below the Hysteresis value.</div><div class='ctx'> </div><div class='add'>+Voltage sensors (also known as IN sensors) report their values in millivolts.</div><div class='add'>+An alarm is triggered if the voltage has crossed a programmable minimum</div><div class='add'>+or maximum limit.</div><div class='add'>+</div><div class='ctx'> Fan rotation speeds are reported in RPM (rotations per minute). An alarm is</div><div class='ctx'> triggered if the rotation speed has dropped below a programmable limit. Fan</div><div class='ctx'> readings can be divided by a programmable divider (1, 2, 4, 8, 16,</div><div class='ctx'> 32, 64 or 128 for all fans) to give the readings more range or accuracy.</div><div class='ctx'> </div><div class='del'>-Voltage sensors (also known as IN sensors) report their values in millivolts.</div><div class='del'>-An alarm is triggered if the voltage has crossed a programmable minimum</div><div class='del'>-or maximum limit.</div><div class='add'>+Each fan controlled is controlled by PWM. The PWM duty cycle can be read and</div><div class='add'>+set for each fan separately. Valid values range from 0 (stop) to 255 (full).</div><div class='add'>+PWM 1-3 support Thermal Cruise mode, in which the PWMs are automatically</div><div class='add'>+regulated to keep respectively temp 1-3 at a certain target temperature.</div><div class='add'>+See below for the description of the sysfs-interface.</div><div class='ctx'> </div><div class='ctx'> The w83791d has a global bit used to enable beeping from the speaker when an</div><div class='ctx'> alarm is triggered as well as a bitmask to enable or disable the beep for</div><div class='ctx'> specific alarms. You need both the global beep enable bit and the</div><div class='ctx'> corresponding beep bit to be on for a triggered alarm to sound a beep.</div><div class='ctx'> </div><div class='del'>-The sysfs interface to the gloabal enable is via the sysfs beep_enable file.</div><div class='add'>+The sysfs interface to the global enable is via the sysfs beep_enable file.</div><div class='ctx'> This file is used for both legacy and new code.</div><div class='ctx'> </div><div class='ctx'> The sysfs interface to the beep bitmask has migrated from the original legacy</div><div class='hunk'>@@ -105,6 +111,27 @@ going forward.</div><div class='ctx'> The driver reads the hardware chip values at most once every three seconds.</div><div class='ctx'> User mode code requesting values more often will receive cached values.</div><div class='ctx'> </div><div class='add'>+/sys files</div><div class='add'>+----------</div><div class='add'>+The sysfs-interface is documented in the 'sysfs-interface' file. Only</div><div class='add'>+chip-specific options are documented here.</div><div class='add'>+</div><div class='add'>+pwm[1-3]_enable -	this file controls mode of fan/temperature control for</div><div class='add'>+			fan 1-3. Fan/PWM 4-5 only support manual mode.</div><div class='add'>+		            * 1 Manual mode</div><div class='add'>+		            * 2 Thermal Cruise mode</div><div class='add'>+		            * 3 Fan Speed Cruise mode (no further support)</div><div class='add'>+</div><div class='add'>+temp[1-3]_target -	defines the target temperature for Thermal Cruise mode.</div><div class='add'>+			Unit: millidegree Celsius</div><div class='add'>+			RW</div><div class='add'>+</div><div class='add'>+temp[1-3]_tolerance -	temperature tolerance for Thermal Cruise mode.</div><div class='add'>+			Specifies an interval around the target temperature</div><div class='add'>+			in which the fan speed is not changed.</div><div class='add'>+			Unit: millidegree Celsius</div><div class='add'>+			RW</div><div class='add'>+</div><div class='ctx'> Alarms bitmap vs. beep_mask bitmask</div><div class='ctx'> ------------------------------------</div><div class='ctx'> For legacy code using the alarms and beep_mask files:</div><div class='hunk'>@@ -132,7 +159,3 @@ tart2        :  alarms: 0x020000 beep_mask: 0x080000 &lt;== mismatch</div><div class='ctx'> tart3        :  alarms: 0x040000 beep_mask: 0x100000 &lt;== mismatch</div><div class='ctx'> case_open    :  alarms: 0x001000 beep_mask: 0x001000</div><div class='ctx'> global_enable:  alarms: -------- beep_mask: 0x800000 (modified via beep_enable)</div><div class='del'>-</div><div class='del'>-W83791D TODO:</div><div class='del'>----------------</div><div class='del'>-Provide a patch for smart-fan control (still need appropriate motherboard/fans)</div><div class='head'>diff --git a/Documentation/i2c/busses/i2c-viapro b/Documentation/i2c/busses/i2c-viapro<br/>index 1405fb69984c..22efedf60c87 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/i2c/busses/i2c-viapro?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/i2c/busses/i2c-viapro</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/i2c/busses/i2c-viapro?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/i2c/busses/i2c-viapro</a></div><div class='hunk'>@@ -16,6 +16,9 @@ Supported adapters:</div><div class='ctx'>   * VIA Technologies, Inc. CX700</div><div class='ctx'>     Datasheet: available on request and under NDA from VIA</div><div class='ctx'> </div><div class='add'>+  * VIA Technologies, Inc. VX800/VX820</div><div class='add'>+    Datasheet: available on http://linux.via.com.tw</div><div class='add'>+</div><div class='ctx'> Authors:</div><div class='ctx'> 	Kyösti Mälkki &lt;kmalkki@cc.hut.fi&gt;,</div><div class='ctx'> 	Mark D. Studebaker &lt;mdsxyz123@yahoo.com&gt;,</div><div class='hunk'>@@ -49,6 +52,7 @@ Your lspci -n listing must show one of these :</div><div class='ctx'>  device 1106:3372   (VT8237S)</div><div class='ctx'>  device 1106:3287   (VT8251)</div><div class='ctx'>  device 1106:8324   (CX700)</div><div class='add'>+ device 1106:8353   (VX800/VX820)</div><div class='ctx'> </div><div class='ctx'> If none of these show up, you should look in the BIOS for settings like</div><div class='ctx'> enable ACPI / SMBus or even USB.</div><div class='hunk'>@@ -57,5 +61,5 @@ Except for the oldest chips (VT82C596A/B, VT82C686A and most probably</div><div class='ctx'> VT8231), this driver supports I2C block transactions. Such transactions</div><div class='ctx'> are mainly useful to read from and write to EEPROMs.</div><div class='ctx'> </div><div class='del'>-The CX700 additionally appears to support SMBus PEC, although this driver</div><div class='del'>-doesn't implement it yet.</div><div class='add'>+The CX700/VX800/VX820 additionally appears to support SMBus PEC, although</div><div class='add'>+this driver doesn't implement it yet.</div><div class='head'>diff --git a/Documentation/i2c/dev-interface b/Documentation/i2c/dev-interface<br/>index 9dd79123ddd9..3e742ba25536 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/i2c/dev-interface?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/i2c/dev-interface</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/i2c/dev-interface?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/i2c/dev-interface</a></div><div class='hunk'>@@ -4,6 +4,10 @@ the /dev interface. You need to load module i2c-dev for this.</div><div class='ctx'> </div><div class='ctx'> Each registered i2c adapter gets a number, counting from 0. You can</div><div class='ctx'> examine /sys/class/i2c-dev/ to see what number corresponds to which adapter.</div><div class='add'>+Alternatively, you can run "i2cdetect -l" to obtain a formated list of all</div><div class='add'>+i2c adapters present on your system at a given time. i2cdetect is part of</div><div class='add'>+the i2c-tools package.</div><div class='add'>+</div><div class='ctx'> I2C device files are character device files with major device number 89</div><div class='ctx'> and a minor device number corresponding to the number assigned as </div><div class='ctx'> explained above. They should be called "i2c-%d" (i2c-0, i2c-1, ..., </div><div class='hunk'>@@ -17,30 +21,34 @@ So let's say you want to access an i2c adapter from a C program. The</div><div class='ctx'> first thing to do is "#include &lt;linux/i2c-dev.h&gt;". Please note that</div><div class='ctx'> there are two files named "i2c-dev.h" out there, one is distributed</div><div class='ctx'> with the Linux kernel and is meant to be included from kernel</div><div class='del'>-driver code, the other one is distributed with lm_sensors and is</div><div class='add'>+driver code, the other one is distributed with i2c-tools and is</div><div class='ctx'> meant to be included from user-space programs. You obviously want</div><div class='ctx'> the second one here.</div><div class='ctx'> </div><div class='ctx'> Now, you have to decide which adapter you want to access. You should</div><div class='del'>-inspect /sys/class/i2c-dev/ to decide this. Adapter numbers are assigned</div><div class='del'>-somewhat dynamically, so you can not even assume /dev/i2c-0 is the</div><div class='del'>-first adapter.</div><div class='add'>+inspect /sys/class/i2c-dev/ or run "i2cdetect -l" to decide this.</div><div class='add'>+Adapter numbers are assigned somewhat dynamically, so you can not</div><div class='add'>+assume much about them. They can even change from one boot to the next.</div><div class='ctx'> </div><div class='ctx'> Next thing, open the device file, as follows:</div><div class='add'>+</div><div class='ctx'>   int file;</div><div class='ctx'>   int adapter_nr = 2; /* probably dynamically determined */</div><div class='ctx'>   char filename[20];</div><div class='ctx'>   </div><div class='del'>-  sprintf(filename,"/dev/i2c-%d",adapter_nr);</div><div class='del'>-  if ((file = open(filename,O_RDWR)) &lt; 0) {</div><div class='add'>+  snprintf(filename, 19, "/dev/i2c-%d", adapter_nr);</div><div class='add'>+  file = open(filename, O_RDWR);</div><div class='add'>+  if (file &lt; 0) {</div><div class='ctx'>     /* ERROR HANDLING; you can check errno to see what went wrong */</div><div class='ctx'>     exit(1);</div><div class='ctx'>   }</div><div class='ctx'> </div><div class='ctx'> When you have opened the device, you must specify with what device</div><div class='ctx'> address you want to communicate:</div><div class='add'>+</div><div class='ctx'>   int addr = 0x40; /* The I2C address */</div><div class='del'>-  if (ioctl(file,I2C_SLAVE,addr) &lt; 0) {</div><div class='add'>+</div><div class='add'>+  if (ioctl(file, I2C_SLAVE, addr) &lt; 0) {</div><div class='ctx'>     /* ERROR HANDLING; you can check errno to see what went wrong */</div><div class='ctx'>     exit(1);</div><div class='ctx'>   }</div><div class='hunk'>@@ -48,31 +56,41 @@ address you want to communicate:</div><div class='ctx'> Well, you are all set up now. You can now use SMBus commands or plain</div><div class='ctx'> I2C to communicate with your device. SMBus commands are preferred if</div><div class='ctx'> the device supports them. Both are illustrated below.</div><div class='add'>+</div><div class='ctx'>   __u8 register = 0x10; /* Device register to access */</div><div class='ctx'>   __s32 res;</div><div class='ctx'>   char buf[10];</div><div class='add'>+</div><div class='ctx'>   /* Using SMBus commands */</div><div class='del'>-  res = i2c_smbus_read_word_data(file,register);</div><div class='add'>+  res = i2c_smbus_read_word_data(file, register);</div><div class='ctx'>   if (res &lt; 0) {</div><div class='ctx'>     /* ERROR HANDLING: i2c transaction failed */</div><div class='ctx'>   } else {</div><div class='ctx'>     /* res contains the read word */</div><div class='ctx'>   }</div><div class='add'>+</div><div class='ctx'>   /* Using I2C Write, equivalent of </div><div class='del'>-           i2c_smbus_write_word_data(file,register,0x6543) */</div><div class='add'>+     i2c_smbus_write_word_data(file, register, 0x6543) */</div><div class='ctx'>   buf[0] = register;</div><div class='ctx'>   buf[1] = 0x43;</div><div class='ctx'>   buf[2] = 0x65;</div><div class='del'>-  if ( write(file,buf,3) != 3) {</div><div class='add'>+  if (write(file, buf, 3) ! =3) {</div><div class='ctx'>     /* ERROR HANDLING: i2c transaction failed */</div><div class='ctx'>   }</div><div class='add'>+</div><div class='ctx'>   /* Using I2C Read, equivalent of i2c_smbus_read_byte(file) */</div><div class='del'>-  if (read(file,buf,1) != 1) {</div><div class='add'>+  if (read(file, buf, 1) != 1) {</div><div class='ctx'>     /* ERROR HANDLING: i2c transaction failed */</div><div class='ctx'>   } else {</div><div class='ctx'>     /* buf[0] contains the read byte */</div><div class='ctx'>   }</div><div class='ctx'> </div><div class='add'>+Note that only a subset of the I2C and SMBus protocols can be achieved by</div><div class='add'>+the means of read() and write() calls. In particular, so-called combined</div><div class='add'>+transactions (mixing read and write messages in the same transaction)</div><div class='add'>+aren't supported. For this reason, this interface is almost never used by</div><div class='add'>+user-space programs.</div><div class='add'>+</div><div class='ctx'> IMPORTANT: because of the use of inline functions, you *have* to use</div><div class='ctx'> '-O' or some variation when you compile your program!</div><div class='ctx'> </div><div class='hunk'>@@ -80,31 +98,29 @@ IMPORTANT: because of the use of inline functions, you *have* to use</div><div class='ctx'> Full interface description</div><div class='ctx'> ==========================</div><div class='ctx'> </div><div class='del'>-The following IOCTLs are defined and fully supported </div><div class='del'>-(see also i2c-dev.h):</div><div class='add'>+The following IOCTLs are defined:</div><div class='ctx'> </div><div class='del'>-ioctl(file,I2C_SLAVE,long addr)</div><div class='add'>+ioctl(file, I2C_SLAVE, long addr)</div><div class='ctx'>   Change slave address. The address is passed in the 7 lower bits of the</div><div class='ctx'>   argument (except for 10 bit addresses, passed in the 10 lower bits in this</div><div class='ctx'>   case).</div><div class='ctx'> </div><div class='del'>-ioctl(file,I2C_TENBIT,long select)</div><div class='add'>+ioctl(file, I2C_TENBIT, long select)</div><div class='ctx'>   Selects ten bit addresses if select not equals 0, selects normal 7 bit</div><div class='ctx'>   addresses if select equals 0. Default 0.  This request is only valid</div><div class='ctx'>   if the adapter has I2C_FUNC_10BIT_ADDR.</div><div class='ctx'> </div><div class='del'>-ioctl(file,I2C_PEC,long select)</div><div class='add'>+ioctl(file, I2C_PEC, long select)</div><div class='ctx'>   Selects SMBus PEC (packet error checking) generation and verification</div><div class='ctx'>   if select not equals 0, disables if select equals 0. Default 0.</div><div class='ctx'>   Used only for SMBus transactions.  This request only has an effect if the</div><div class='ctx'>   the adapter has I2C_FUNC_SMBUS_PEC; it is still safe if not, it just</div><div class='ctx'>   doesn't have any effect.</div><div class='ctx'> </div><div class='del'>-ioctl(file,I2C_FUNCS,unsigned long *funcs)</div><div class='add'>+ioctl(file, I2C_FUNCS, unsigned long *funcs)</div><div class='ctx'>   Gets the adapter functionality and puts it in *funcs.</div><div class='ctx'> </div><div class='del'>-ioctl(file,I2C_RDWR,struct i2c_rdwr_ioctl_data *msgset)</div><div class='del'>-</div><div class='add'>+ioctl(file, I2C_RDWR, struct i2c_rdwr_ioctl_data *msgset)</div><div class='ctx'>   Do combined read/write transaction without stop in between.</div><div class='ctx'>   Only valid if the adapter has I2C_FUNC_I2C.  The argument is</div><div class='ctx'>   a pointer to a</div><div class='hunk'>@@ -120,10 +136,9 @@ ioctl(file,I2C_RDWR,struct i2c_rdwr_ioctl_data *msgset)</div><div class='ctx'>   The slave address and whether to use ten bit address mode has to be</div><div class='ctx'>   set in each message, overriding the values set with the above ioctl's.</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-Other values are NOT supported at this moment, except for I2C_SMBUS,</div><div class='del'>-which you should never directly call; instead, use the access functions</div><div class='del'>-below.</div><div class='add'>+ioctl(file, I2C_SMBUS, struct i2c_smbus_ioctl_data *args)</div><div class='add'>+  Not meant to be called  directly; instead, use the access functions</div><div class='add'>+  below.</div><div class='ctx'> </div><div class='ctx'> You can do plain i2c transactions by using read(2) and write(2) calls.</div><div class='ctx'> You do not need to pass the address byte; instead, set it through</div><div class='hunk'>@@ -148,7 +163,52 @@ what happened. The 'write' transactions return 0 on success; the</div><div class='ctx'> returns the number of values read. The block buffers need not be longer</div><div class='ctx'> than 32 bytes.</div><div class='ctx'> </div><div class='del'>-The above functions are all macros, that resolve to calls to the</div><div class='del'>-i2c_smbus_access function, that on its turn calls a specific ioctl</div><div class='add'>+The above functions are all inline functions, that resolve to calls to</div><div class='add'>+the i2c_smbus_access function, that on its turn calls a specific ioctl</div><div class='ctx'> with the data in a specific format. Read the source code if you</div><div class='ctx'> want to know what happens behind the screens.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Implementation details</div><div class='add'>+======================</div><div class='add'>+</div><div class='add'>+For the interested, here's the code flow which happens inside the kernel</div><div class='add'>+when you use the /dev interface to I2C:</div><div class='add'>+</div><div class='add'>+1* Your program opens /dev/i2c-N and calls ioctl() on it, as described in</div><div class='add'>+section "C example" above.</div><div class='add'>+</div><div class='add'>+2* These open() and ioctl() calls are handled by the i2c-dev kernel</div><div class='add'>+driver: see i2c-dev.c:i2cdev_open() and i2c-dev.c:i2cdev_ioctl(),</div><div class='add'>+respectively. You can think of i2c-dev as a generic I2C chip driver</div><div class='add'>+that can be programmed from user-space.</div><div class='add'>+</div><div class='add'>+3* Some ioctl() calls are for administrative tasks and are handled by</div><div class='add'>+i2c-dev directly. Examples include I2C_SLAVE (set the address of the</div><div class='add'>+device you want to access) and I2C_PEC (enable or disable SMBus error</div><div class='add'>+checking on future transactions.)</div><div class='add'>+</div><div class='add'>+4* Other ioctl() calls are converted to in-kernel function calls by</div><div class='add'>+i2c-dev. Examples include I2C_FUNCS, which queries the I2C adapter</div><div class='add'>+functionality using i2c.h:i2c_get_functionality(), and I2C_SMBUS, which</div><div class='add'>+performs an SMBus transaction using i2c-core.c:i2c_smbus_xfer().</div><div class='add'>+</div><div class='add'>+The i2c-dev driver is responsible for checking all the parameters that</div><div class='add'>+come from user-space for validity. After this point, there is no</div><div class='add'>+difference between these calls that came from user-space through i2c-dev</div><div class='add'>+and calls that would have been performed by kernel I2C chip drivers</div><div class='add'>+directly. This means that I2C bus drivers don't need to implement</div><div class='add'>+anything special to support access from user-space.</div><div class='add'>+</div><div class='add'>+5* These i2c-core.c/i2c.h functions are wrappers to the actual</div><div class='add'>+implementation of your I2C bus driver. Each adapter must declare</div><div class='add'>+callback functions implementing these standard calls.</div><div class='add'>+i2c.h:i2c_get_functionality() calls i2c_adapter.algo-&gt;functionality(),</div><div class='add'>+while i2c-core.c:i2c_smbus_xfer() calls either</div><div class='add'>+adapter.algo-&gt;smbus_xfer() if it is implemented, or if not,</div><div class='add'>+i2c-core.c:i2c_smbus_xfer_emulated() which in turn calls</div><div class='add'>+i2c_adapter.algo-&gt;master_xfer().</div><div class='add'>+</div><div class='add'>+After your I2C bus driver has processed these requests, execution runs</div><div class='add'>+up the call chain, with almost no processing done, except by i2c-dev to</div><div class='add'>+package the returned data, if any, in suitable format for the ioctl.</div><div class='head'>diff --git a/Documentation/i2c/smbus-protocol b/Documentation/i2c/smbus-protocol<br/>index 24bfb65da17d..9df47441f0e7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/i2c/smbus-protocol?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/i2c/smbus-protocol</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/i2c/smbus-protocol?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/i2c/smbus-protocol</a></div><div class='hunk'>@@ -109,8 +109,8 @@ specified through the Comm byte.</div><div class='ctx'> S Addr Wr [A] Comm [A] DataLow [A] DataHigh [A] P</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-SMBus Process Call</div><div class='del'>-==================</div><div class='add'>+SMBus Process Call:  i2c_smbus_process_call()</div><div class='add'>+=============================================</div><div class='ctx'> </div><div class='ctx'> This command selects a device register (through the Comm byte), sends</div><div class='ctx'> 16 bits of data to it, and reads 16 bits of data in return.</div><div class='head'>diff --git a/Documentation/i2c/writing-clients b/Documentation/i2c/writing-clients<br/>index 6b61b3a2e90b..d73ee117a8ca 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/i2c/writing-clients?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/i2c/writing-clients</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/i2c/writing-clients?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/i2c/writing-clients</a></div><div class='hunk'>@@ -606,6 +606,8 @@ SMBus communication</div><div class='ctx'>   extern s32 i2c_smbus_read_word_data(struct i2c_client * client, u8 command);</div><div class='ctx'>   extern s32 i2c_smbus_write_word_data(struct i2c_client * client,</div><div class='ctx'>                                        u8 command, u16 value);</div><div class='add'>+  extern s32 i2c_smbus_process_call(struct i2c_client *client,</div><div class='add'>+                                    u8 command, u16 value);</div><div class='ctx'>   extern s32 i2c_smbus_read_block_data(struct i2c_client * client,</div><div class='ctx'>                                        u8 command, u8 *values);</div><div class='ctx'>   extern s32 i2c_smbus_write_block_data(struct i2c_client * client,</div><div class='hunk'>@@ -621,8 +623,6 @@ These ones were removed from i2c-core because they had no users, but could</div><div class='ctx'> be added back later if needed:</div><div class='ctx'> </div><div class='ctx'>   extern s32 i2c_smbus_write_quick(struct i2c_client * client, u8 value);</div><div class='del'>-  extern s32 i2c_smbus_process_call(struct i2c_client * client,</div><div class='del'>-                                    u8 command, u16 value);</div><div class='ctx'>   extern s32 i2c_smbus_block_process_call(struct i2c_client *client,</div><div class='ctx'>                                           u8 command, u8 length,</div><div class='ctx'>                                           u8 *values)</div><div class='head'>diff --git a/Documentation/ia64/kvm.txt b/Documentation/ia64/kvm.txt<br/>index 914d07f49268..84f7cb3d5bec 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/ia64/kvm.txt?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/ia64/kvm.txt</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/ia64/kvm.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/ia64/kvm.txt</a></div><div class='hunk'>@@ -1,7 +1,8 @@</div><div class='del'>-Currently, kvm module in EXPERIMENTAL stage on IA64. This means that</div><div class='del'>-interfaces are not stable enough to use. So, plase had better don't run</div><div class='del'>-critical applications in virtual machine. We will try our best to make it</div><div class='del'>-strong in future versions!</div><div class='add'>+Currently, kvm module is in EXPERIMENTAL stage on IA64. This means that</div><div class='add'>+interfaces are not stable enough to use. So, please don't run critical</div><div class='add'>+applications in virtual machine.</div><div class='add'>+We will try our best to improve it in future versions!</div><div class='add'>+</div><div class='ctx'> 				Guide: How to boot up guests on kvm/ia64</div><div class='ctx'> </div><div class='ctx'> This guide is to describe how to enable kvm support for IA-64 systems.</div><div class='head'>diff --git a/Documentation/ioctl-number.txt b/Documentation/ioctl-number.txt<br/>index 1c6b545635a2..b880ce5dbd33 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/ioctl-number.txt?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/ioctl-number.txt</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/ioctl-number.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/ioctl-number.txt</a></div><div class='hunk'>@@ -92,6 +92,7 @@ Code	Seq#	Include File		Comments</div><div class='ctx'> 'J'	00-1F	drivers/scsi/gdth_ioctl.h</div><div class='ctx'> 'K'	all	linux/kd.h</div><div class='ctx'> 'L'	00-1F	linux/loop.h</div><div class='add'>+'L'	20-2F	driver/usb/misc/vstusb.h</div><div class='ctx'> 'L'	E0-FF	linux/ppdd.h		encrypted disk device driver</div><div class='ctx'> 					&lt;http://linux01.gwdg.de/~alatham/ppdd.html&gt;</div><div class='ctx'> 'M'	all	linux/soundcard.h</div><div class='hunk'>@@ -110,6 +111,8 @@ Code	Seq#	Include File		Comments</div><div class='ctx'> 'W'	00-1F	linux/wanrouter.h	conflict!</div><div class='ctx'> 'X'	all	linux/xfs_fs.h</div><div class='ctx'> 'Y'	all	linux/cyclades.h</div><div class='add'>+'['	00-07	linux/usb/usbtmc.h	USB Test and Measurement Devices</div><div class='add'>+					&lt;mailto:gregkh@suse.de&gt;</div><div class='ctx'> 'a'	all				ATM on linux</div><div class='ctx'> 					&lt;http://lrcwww.epfl.ch/linux-atm/magic.html&gt;</div><div class='ctx'> 'b'	00-FF				bit3 vme host bridge</div><div class='head'>diff --git a/Documentation/kernel-doc-nano-HOWTO.txt b/Documentation/kernel-doc-nano-HOWTO.txt<br/>index 0bd32748a467..c6841eee9598 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/kernel-doc-nano-HOWTO.txt?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/kernel-doc-nano-HOWTO.txt</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/kernel-doc-nano-HOWTO.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/kernel-doc-nano-HOWTO.txt</a></div><div class='hunk'>@@ -168,10 +168,10 @@ if ($#ARGV &lt; 0) {</div><div class='ctx'> mkdir $ARGV[0],0777;</div><div class='ctx'> $state = 0;</div><div class='ctx'> while (&lt;STDIN&gt;) {</div><div class='del'>-    if (/^\.TH \"[^\"]*\" 4 \"([^\"]*)\"/) {</div><div class='add'>+    if (/^\.TH \"[^\"]*\" 9 \"([^\"]*)\"/) {</div><div class='ctx'> 	if ($state == 1) { close OUT }</div><div class='ctx'> 	$state = 1;</div><div class='del'>-	$fn = "$ARGV[0]/$1.4";</div><div class='add'>+	$fn = "$ARGV[0]/$1.9";</div><div class='ctx'> 	print STDERR "Creating $fn\n";</div><div class='ctx'> 	open OUT, "&gt;$fn" or die "can't open $fn: $!\n";</div><div class='ctx'> 	print OUT $_;</div><div class='head'>diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt<br/>index 1150444a21ab..d4f4875fc7c6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/kernel-parameters.txt?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/kernel-parameters.txt</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/kernel-parameters.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/kernel-parameters.txt</a></div><div class='hunk'>@@ -284,6 +284,11 @@ and is between 256 and 4096 characters. It is defined in the file</div><div class='ctx'> 			isolate - enable device isolation (each device, as far</div><div class='ctx'> 			          as possible, will get its own protection</div><div class='ctx'> 			          domain)</div><div class='add'>+			fullflush - enable flushing of IO/TLB entries when</div><div class='add'>+				    they are unmapped. Otherwise they are</div><div class='add'>+				    flushed before they will be reused, which</div><div class='add'>+				    is a lot of faster</div><div class='add'>+</div><div class='ctx'> 	amd_iommu_size= [HW,X86-64]</div><div class='ctx'> 			Define the size of the aperture for the AMD IOMMU</div><div class='ctx'> 			driver. Possible values are:</div><div class='hunk'>@@ -463,12 +468,6 @@ and is between 256 and 4096 characters. It is defined in the file</div><div class='ctx'> 			Range: 0 - 8192</div><div class='ctx'> 			Default: 64</div><div class='ctx'> </div><div class='del'>-	disable_8254_timer</div><div class='del'>-	enable_8254_timer</div><div class='del'>-			[IA32/X86_64] Disable/Enable interrupt 0 timer routing</div><div class='del'>-			over the 8254 in addition to over the IO-APIC. The</div><div class='del'>-			kernel tries to set a sensible default.</div><div class='del'>-</div><div class='ctx'> 	hpet=		[X86-32,HPET] option to control HPET usage</div><div class='ctx'> 			Format: { enable (default) | disable | force }</div><div class='ctx'> 			disable: disable HPET and use PIT instead</div><div class='hunk'>@@ -659,11 +658,12 @@ and is between 256 and 4096 characters. It is defined in the file</div><div class='ctx'> 	earlyprintk=	[X86-32,X86-64,SH,BLACKFIN]</div><div class='ctx'> 			earlyprintk=vga</div><div class='ctx'> 			earlyprintk=serial[,ttySn[,baudrate]]</div><div class='add'>+			earlyprintk=dbgp</div><div class='ctx'> </div><div class='ctx'> 			Append ",keep" to not disable it when the real console</div><div class='ctx'> 			takes over.</div><div class='ctx'> </div><div class='del'>-			Only vga or serial at a time, not both.</div><div class='add'>+			Only vga or serial or usb debug port at a time.</div><div class='ctx'> </div><div class='ctx'> 			Currently only ttyS0 and ttyS1 are supported.</div><div class='ctx'> </div><div class='hunk'>@@ -796,6 +796,7 @@ and is between 256 and 4096 characters. It is defined in the file</div><div class='ctx'> 			Defaults to the default architecture's huge page size</div><div class='ctx'> 			if not specified.</div><div class='ctx'> </div><div class='add'>+	i8042.debug	[HW] Toggle i8042 debug mode</div><div class='ctx'> 	i8042.direct	[HW] Put keyboard port into non-translated mode</div><div class='ctx'> 	i8042.dumbkbd	[HW] Pretend that controller can only read data from</div><div class='ctx'> 			     keyboard and cannot control its state</div><div class='hunk'>@@ -1020,6 +1021,10 @@ and is between 256 and 4096 characters. It is defined in the file</div><div class='ctx'> 			(only serial suported for now)</div><div class='ctx'> 			Format: &lt;serial_device&gt;[,baud]</div><div class='ctx'> </div><div class='add'>+	kmac=		[MIPS] korina ethernet MAC address.</div><div class='add'>+			Configure the RouterBoard 532 series on-chip</div><div class='add'>+			Ethernet adapter MAC address.</div><div class='add'>+</div><div class='ctx'> 	l2cr=		[PPC]</div><div class='ctx'> </div><div class='ctx'> 	l3cr=		[PPC]</div><div class='hunk'>@@ -1228,6 +1233,29 @@ and is between 256 and 4096 characters. It is defined in the file</div><div class='ctx'> 			         or</div><div class='ctx'> 			         memmap=0x10000$0x18690000</div><div class='ctx'> </div><div class='add'>+	memory_corruption_check=0/1 [X86]</div><div class='add'>+			Some BIOSes seem to corrupt the first 64k of</div><div class='add'>+			memory when doing things like suspend/resume.</div><div class='add'>+			Setting this option will scan the memory</div><div class='add'>+			looking for corruption.  Enabling this will</div><div class='add'>+			both detect corruption and prevent the kernel</div><div class='add'>+			from using the memory being corrupted.</div><div class='add'>+			However, its intended as a diagnostic tool; if</div><div class='add'>+			repeatable BIOS-originated corruption always</div><div class='add'>+			affects the same memory, you can use memmap=</div><div class='add'>+			to prevent the kernel from using that memory.</div><div class='add'>+</div><div class='add'>+	memory_corruption_check_size=size [X86]</div><div class='add'>+			By default it checks for corruption in the low</div><div class='add'>+			64k, making this memory unavailable for normal</div><div class='add'>+			use.  Use this parameter to scan for</div><div class='add'>+			corruption in more or less memory.</div><div class='add'>+</div><div class='add'>+	memory_corruption_check_period=seconds [X86]</div><div class='add'>+			By default it checks for corruption every 60</div><div class='add'>+			seconds.  Use this parameter to check at some</div><div class='add'>+			other rate.  0 disables periodic checking.</div><div class='add'>+</div><div class='ctx'> 	memtest=	[KNL,X86] Enable memtest</div><div class='ctx'> 			Format: &lt;integer&gt;</div><div class='ctx'> 			range: 0,4 : pattern number</div><div class='hunk'>@@ -1425,6 +1453,12 @@ and is between 256 and 4096 characters. It is defined in the file</div><div class='ctx'> </div><div class='ctx'> 	nolapic_timer	[X86-32,APIC] Do not use the local APIC timer.</div><div class='ctx'> </div><div class='add'>+	nox2apic	[X86-64,APIC] Do not enable x2APIC mode.</div><div class='add'>+</div><div class='add'>+	x2apic_phys	[X86-64,APIC] Use x2apic physical mode instead of</div><div class='add'>+			default x2apic cluster mode on platforms</div><div class='add'>+			supporting x2apic.</div><div class='add'>+</div><div class='ctx'> 	noltlbs		[PPC] Do not use large page/tlb entries for kernel</div><div class='ctx'> 			lowmem mapping on PPC40x.</div><div class='ctx'> </div><div class='hunk'>@@ -1680,6 +1714,11 @@ and is between 256 and 4096 characters. It is defined in the file</div><div class='ctx'> 			autoconfiguration.</div><div class='ctx'> 			Ranges are in pairs (memory base and size).</div><div class='ctx'> </div><div class='add'>+	dynamic_printk</div><div class='add'>+			Enables pr_debug()/dev_dbg() calls if</div><div class='add'>+			CONFIG_DYNAMIC_PRINTK_DEBUG has been enabled. These can also</div><div class='add'>+			be switched on/off via &lt;debugfs&gt;/dynamic_printk/modules</div><div class='add'>+</div><div class='ctx'> 	print-fatal-signals=</div><div class='ctx'> 			[KNL] debug: print fatal signals</div><div class='ctx'> 			print-fatal-signals=1: print segfault info to</div><div class='hunk'>@@ -1882,6 +1921,12 @@ and is between 256 and 4096 characters. It is defined in the file</div><div class='ctx'> 	shapers=	[NET]</div><div class='ctx'> 			Maximal number of shapers.</div><div class='ctx'> </div><div class='add'>+	show_msr=	[x86] show boot-time MSR settings</div><div class='add'>+			Format: { &lt;integer&gt; }</div><div class='add'>+			Show boot-time (BIOS-initialized) MSR settings.</div><div class='add'>+			The parameter means the number of CPUs to show,</div><div class='add'>+			for example 1 means boot CPU only.</div><div class='add'>+</div><div class='ctx'> 	sim710=		[SCSI,HW]</div><div class='ctx'> 			See header of drivers/scsi/sim710.c.</div><div class='ctx'> </div><div class='hunk'>@@ -2208,6 +2253,25 @@ and is between 256 and 4096 characters. It is defined in the file</div><div class='ctx'> 			autosuspended.  Devices for which the delay is set</div><div class='ctx'> 			to a negative value won't be autosuspended at all.</div><div class='ctx'> </div><div class='add'>+	usbcore.usbfs_snoop=</div><div class='add'>+			[USB] Set to log all usbfs traffic (default 0 = off).</div><div class='add'>+</div><div class='add'>+	usbcore.blinkenlights=</div><div class='add'>+			[USB] Set to cycle leds on hubs (default 0 = off).</div><div class='add'>+</div><div class='add'>+	usbcore.old_scheme_first=</div><div class='add'>+			[USB] Start with the old device initialization</div><div class='add'>+			scheme (default 0 = off).</div><div class='add'>+</div><div class='add'>+	usbcore.use_both_schemes=</div><div class='add'>+			[USB] Try the other device initialization scheme</div><div class='add'>+			if the first one fails (default 1 = enabled).</div><div class='add'>+</div><div class='add'>+	usbcore.initial_descriptor_timeout=</div><div class='add'>+			[USB] Specifies timeout for the initial 64-byte</div><div class='add'>+                        USB_REQ_GET_DESCRIPTOR request in milliseconds</div><div class='add'>+			(default 5000 = 5.0 seconds).</div><div class='add'>+</div><div class='ctx'> 	usbhid.mousepoll=</div><div class='ctx'> 			[USBHID] The interval which mice are to be polled at.</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/kobject.txt b/Documentation/kobject.txt<br/>index 51a8021ee532..f5d2aad65a67 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/kobject.txt?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/kobject.txt</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/kobject.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/kobject.txt</a></div><div class='hunk'>@@ -118,6 +118,10 @@ the name of the kobject, call kobject_rename():</div><div class='ctx'> </div><div class='ctx'>     int kobject_rename(struct kobject *kobj, const char *new_name);</div><div class='ctx'> </div><div class='add'>+Note kobject_rename does perform any locking or have a solid notion of</div><div class='add'>+what names are valid so the provide must provide their own sanity checking</div><div class='add'>+and serialization.</div><div class='add'>+</div><div class='ctx'> There is a function called kobject_set_name() but that is legacy cruft and</div><div class='ctx'> is being removed.  If your code needs to call this function, it is</div><div class='ctx'> incorrect and needs to be fixed.</div><div class='head'>diff --git a/Documentation/laptops/disk-shock-protection.txt b/Documentation/laptops/disk-shock-protection.txt<br/>new file mode 100644<br/>index 000000000000..0e6ba2663834<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/laptops/disk-shock-protection.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/laptops/disk-shock-protection.txt</a></div><div class='hunk'>@@ -0,0 +1,149 @@</div><div class='add'>+Hard disk shock protection</div><div class='add'>+==========================</div><div class='add'>+</div><div class='add'>+Author: Elias Oltmanns &lt;eo@nebensachen.de&gt;</div><div class='add'>+Last modified: 2008-10-03</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+0. Contents</div><div class='add'>+-----------</div><div class='add'>+</div><div class='add'>+1. Intro</div><div class='add'>+2. The interface</div><div class='add'>+3. References</div><div class='add'>+4. CREDITS</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+1. Intro</div><div class='add'>+--------</div><div class='add'>+</div><div class='add'>+ATA/ATAPI-7 specifies the IDLE IMMEDIATE command with unload feature.</div><div class='add'>+Issuing this command should cause the drive to switch to idle mode and</div><div class='add'>+unload disk heads. This feature is being used in modern laptops in</div><div class='add'>+conjunction with accelerometers and appropriate software to implement</div><div class='add'>+a shock protection facility. The idea is to stop all I/O operations on</div><div class='add'>+the internal hard drive and park its heads on the ramp when critical</div><div class='add'>+situations are anticipated. The desire to have such a feature</div><div class='add'>+available on GNU/Linux systems has been the original motivation to</div><div class='add'>+implement a generic disk head parking interface in the Linux kernel.</div><div class='add'>+Please note, however, that other components have to be set up on your</div><div class='add'>+system in order to get disk shock protection working (see</div><div class='add'>+section 3. References below for pointers to more information about</div><div class='add'>+that).</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+2. The interface</div><div class='add'>+----------------</div><div class='add'>+</div><div class='add'>+For each ATA device, the kernel exports the file</div><div class='add'>+block/*/device/unload_heads in sysfs (here assumed to be mounted under</div><div class='add'>+/sys). Access to /sys/block/*/device/unload_heads is denied with</div><div class='add'>+-EOPNOTSUPP if the device does not support the unload feature.</div><div class='add'>+Otherwise, writing an integer value to this file will take the heads</div><div class='add'>+of the respective drive off the platter and block all I/O operations</div><div class='add'>+for the specified number of milliseconds. When the timeout expires and</div><div class='add'>+no further disk head park request has been issued in the meantime,</div><div class='add'>+normal operation will be resumed. The maximal value accepted for a</div><div class='add'>+timeout is 30000 milliseconds. Exceeding this limit will return</div><div class='add'>+-EOVERFLOW, but heads will be parked anyway and the timeout will be</div><div class='add'>+set to 30 seconds. However, you can always change a timeout to any</div><div class='add'>+value between 0 and 30000 by issuing a subsequent head park request</div><div class='add'>+before the timeout of the previous one has expired. In particular, the</div><div class='add'>+total timeout can exceed 30 seconds and, more importantly, you can</div><div class='add'>+cancel a previously set timeout and resume normal operation</div><div class='add'>+immediately by specifying a timeout of 0. Values below -2 are rejected</div><div class='add'>+with -EINVAL (see below for the special meaning of -1 and -2). If the</div><div class='add'>+timeout specified for a recent head park request has not yet expired,</div><div class='add'>+reading from /sys/block/*/device/unload_heads will report the number</div><div class='add'>+of milliseconds remaining until normal operation will be resumed;</div><div class='add'>+otherwise, reading the unload_heads attribute will return 0.</div><div class='add'>+</div><div class='add'>+For example, do the following in order to park the heads of drive</div><div class='add'>+/dev/sda and stop all I/O operations for five seconds:</div><div class='add'>+</div><div class='add'>+# echo 5000 &gt; /sys/block/sda/device/unload_heads</div><div class='add'>+</div><div class='add'>+A simple</div><div class='add'>+</div><div class='add'>+# cat /sys/block/sda/device/unload_heads</div><div class='add'>+</div><div class='add'>+will show you how many milliseconds are left before normal operation</div><div class='add'>+will be resumed.</div><div class='add'>+</div><div class='add'>+A word of caution: The fact that the interface operates on a basis of</div><div class='add'>+milliseconds may raise expectations that cannot be satisfied in</div><div class='add'>+reality. In fact, the ATA specs clearly state that the time for an</div><div class='add'>+unload operation to complete is vendor specific. The hint in ATA-7</div><div class='add'>+that this will typically be within 500 milliseconds apparently has</div><div class='add'>+been dropped in ATA-8.</div><div class='add'>+</div><div class='add'>+There is a technical detail of this implementation that may cause some</div><div class='add'>+confusion and should be discussed here. When a head park request has</div><div class='add'>+been issued to a device successfully, all I/O operations on the</div><div class='add'>+controller port this device is attached to will be deferred. That is</div><div class='add'>+to say, any other device that may be connected to the same port will</div><div class='add'>+be affected too. The only exception is that a subsequent head unload</div><div class='add'>+request to that other device will be executed immediately. Further</div><div class='add'>+operations on that port will be deferred until the timeout specified</div><div class='add'>+for either device on the port has expired. As far as PATA (old style</div><div class='add'>+IDE) configurations are concerned, there can only be two devices</div><div class='add'>+attached to any single port. In SATA world we have port multipliers</div><div class='add'>+which means that a user-issued head parking request to one device may</div><div class='add'>+actually result in stopping I/O to a whole bunch of devices. However,</div><div class='add'>+since this feature is supposed to be used on laptops and does not seem</div><div class='add'>+to be very useful in any other environment, there will be mostly one</div><div class='add'>+device per port. Even if the CD/DVD writer happens to be connected to</div><div class='add'>+the same port as the hard drive, it generally *should* recover just</div><div class='add'>+fine from the occasional buffer under-run incurred by a head park</div><div class='add'>+request to the HD. Actually, when you are using an ide driver rather</div><div class='add'>+than its libata counterpart (i.e. your disk is called /dev/hda</div><div class='add'>+instead of /dev/sda), then parking the heads of one drive (drive X)</div><div class='add'>+will generally not affect the mode of operation of another drive</div><div class='add'>+(drive Y) on the same port as described above. It is only when a port</div><div class='add'>+reset is required to recover from an exception on drive Y that further</div><div class='add'>+I/O operations on that drive (and the reset itself) will be delayed</div><div class='add'>+until drive X is no longer in the parked state.</div><div class='add'>+</div><div class='add'>+Finally, there are some hard drives that only comply with an earlier</div><div class='add'>+version of the ATA standard than ATA-7, but do support the unload</div><div class='add'>+feature nonetheless. Unfortunately, there is no safe way Linux can</div><div class='add'>+detect these devices, so you won't be able to write to the</div><div class='add'>+unload_heads attribute. If you know that your device really does</div><div class='add'>+support the unload feature (for instance, because the vendor of your</div><div class='add'>+laptop or the hard drive itself told you so), then you can tell the</div><div class='add'>+kernel to enable the usage of this feature for that drive by writing</div><div class='add'>+the special value -1 to the unload_heads attribute:</div><div class='add'>+</div><div class='add'>+# echo -1 &gt; /sys/block/sda/device/unload_heads</div><div class='add'>+</div><div class='add'>+will enable the feature for /dev/sda, and giving -2 instead of -1 will</div><div class='add'>+disable it again.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+3. References</div><div class='add'>+-------------</div><div class='add'>+</div><div class='add'>+There are several laptops from different vendors featuring shock</div><div class='add'>+protection capabilities. As manufacturers have refused to support open</div><div class='add'>+source development of the required software components so far, Linux</div><div class='add'>+support for shock protection varies considerably between different</div><div class='add'>+hardware implementations. Ideally, this section should contain a list</div><div class='add'>+of pointers at different projects aiming at an implementation of shock</div><div class='add'>+protection on different systems. Unfortunately, I only know of a</div><div class='add'>+single project which, although still considered experimental, is fit</div><div class='add'>+for use. Please feel free to add projects that have been the victims</div><div class='add'>+of my ignorance.</div><div class='add'>+</div><div class='add'>+- http://www.thinkwiki.org/wiki/HDAPS</div><div class='add'>+  See this page for information about Linux support of the hard disk</div><div class='add'>+  active protection system as implemented in IBM/Lenovo Thinkpads.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+4. CREDITS</div><div class='add'>+----------</div><div class='add'>+</div><div class='add'>+This implementation of disk head parking has been inspired by a patch</div><div class='add'>+originally published by Jon Escombe &lt;lists@dresco.co.uk&gt;. My efforts</div><div class='add'>+to develop an implementation of this feature that is fit to be merged</div><div class='add'>+into mainline have been aided by various kernel developers, in</div><div class='add'>+particular by Tejun Heo and Bartlomiej Zolnierkiewicz.</div><div class='head'>diff --git a/Documentation/networking/LICENSE.qlge b/Documentation/networking/LICENSE.qlge<br/>new file mode 100644<br/>index 000000000000..123b6edd7f18<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/networking/LICENSE.qlge?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/networking/LICENSE.qlge</a></div><div class='hunk'>@@ -0,0 +1,46 @@</div><div class='add'>+Copyright (c)  2003-2008 QLogic Corporation</div><div class='add'>+QLogic Linux Networking HBA Driver</div><div class='add'>+</div><div class='add'>+This program includes a device driver for Linux 2.6 that may be</div><div class='add'>+distributed with QLogic hardware specific firmware binary file.</div><div class='add'>+You may modify and redistribute the device driver code under the</div><div class='add'>+GNU General Public License as published by the Free Software</div><div class='add'>+Foundation (version 2 or a later version).</div><div class='add'>+</div><div class='add'>+You may redistribute the hardware specific firmware binary file</div><div class='add'>+under the following terms:</div><div class='add'>+</div><div class='add'>+	1. Redistribution of source code (only if applicable),</div><div class='add'>+	   must retain the above copyright notice, this list of</div><div class='add'>+	   conditions and the following disclaimer.</div><div class='add'>+</div><div class='add'>+	2. Redistribution in binary form must reproduce the above</div><div class='add'>+	   copyright notice, this list of conditions and the</div><div class='add'>+	   following disclaimer in the documentation and/or other</div><div class='add'>+	   materials provided with the distribution.</div><div class='add'>+</div><div class='add'>+	3. The name of QLogic Corporation may not be used to</div><div class='add'>+	   endorse or promote products derived from this software</div><div class='add'>+	   without specific prior written permission</div><div class='add'>+</div><div class='add'>+REGARDLESS OF WHAT LICENSING MECHANISM IS USED OR APPLICABLE,</div><div class='add'>+THIS PROGRAM IS PROVIDED BY QLOGIC CORPORATION "AS IS'' AND ANY</div><div class='add'>+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE</div><div class='add'>+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A</div><div class='add'>+PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR</div><div class='add'>+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,</div><div class='add'>+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED</div><div class='add'>+TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,</div><div class='add'>+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON</div><div class='add'>+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,</div><div class='add'>+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY</div><div class='add'>+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE</div><div class='add'>+POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+</div><div class='add'>+USER ACKNOWLEDGES AND AGREES THAT USE OF THIS PROGRAM WILL NOT</div><div class='add'>+CREATE OR GIVE GROUNDS FOR A LICENSE BY IMPLICATION, ESTOPPEL, OR</div><div class='add'>+OTHERWISE IN ANY INTELLECTUAL PROPERTY RIGHTS (PATENT, COPYRIGHT,</div><div class='add'>+TRADE SECRET, MASK WORK, OR OTHER PROPRIETARY RIGHT) EMBODIED IN</div><div class='add'>+ANY OTHER QLOGIC HARDWARE OR SOFTWARE EITHER SOLELY OR IN</div><div class='add'>+COMBINATION WITH THIS PROGRAM.</div><div class='add'>+</div><div class='head'>diff --git a/Documentation/networking/can.txt b/Documentation/networking/can.txt<br/>index 297ba7b1ccaf..2035bc4932f2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/networking/can.txt?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/networking/can.txt</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/networking/can.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/networking/can.txt</a></div><div class='hunk'>@@ -35,8 +35,9 @@ This file contains</div><div class='ctx'>     6.1 general settings</div><div class='ctx'>     6.2 local loopback of sent frames</div><div class='ctx'>     6.3 CAN controller hardware filters</div><div class='del'>-    6.4 currently supported CAN hardware</div><div class='del'>-    6.5 todo</div><div class='add'>+    6.4 The virtual CAN driver (vcan)</div><div class='add'>+    6.5 currently supported CAN hardware</div><div class='add'>+    6.6 todo</div><div class='ctx'> </div><div class='ctx'>   7 Credits</div><div class='ctx'> </div><div class='hunk'>@@ -584,7 +585,42 @@ solution for a couple of reasons:</div><div class='ctx'>   @133MHz with four SJA1000 CAN controllers from 2002 under heavy bus</div><div class='ctx'>   load without any problems ...</div><div class='ctx'> </div><div class='del'>-  6.4 currently supported CAN hardware (September 2007)</div><div class='add'>+  6.4 The virtual CAN driver (vcan)</div><div class='add'>+</div><div class='add'>+  Similar to the network loopback devices, vcan offers a virtual local</div><div class='add'>+  CAN interface. A full qualified address on CAN consists of</div><div class='add'>+</div><div class='add'>+  - a unique CAN Identifier (CAN ID)</div><div class='add'>+  - the CAN bus this CAN ID is transmitted on (e.g. can0)</div><div class='add'>+</div><div class='add'>+  so in common use cases more than one virtual CAN interface is needed.</div><div class='add'>+</div><div class='add'>+  The virtual CAN interfaces allow the transmission and reception of CAN</div><div class='add'>+  frames without real CAN controller hardware. Virtual CAN network</div><div class='add'>+  devices are usually named 'vcanX', like vcan0 vcan1 vcan2 ...</div><div class='add'>+  When compiled as a module the virtual CAN driver module is called vcan.ko</div><div class='add'>+</div><div class='add'>+  Since Linux Kernel version 2.6.24 the vcan driver supports the Kernel</div><div class='add'>+  netlink interface to create vcan network devices. The creation and</div><div class='add'>+  removal of vcan network devices can be managed with the ip(8) tool:</div><div class='add'>+</div><div class='add'>+  - Create a virtual CAN network interface:</div><div class='add'>+       ip link add type vcan</div><div class='add'>+</div><div class='add'>+  - Create a virtual CAN network interface with a specific name 'vcan42':</div><div class='add'>+       ip link add dev vcan42 type vcan</div><div class='add'>+</div><div class='add'>+  - Remove a (virtual CAN) network interface 'vcan42':</div><div class='add'>+       ip link del vcan42</div><div class='add'>+</div><div class='add'>+  The tool 'vcan' from the SocketCAN SVN repository on BerliOS is obsolete.</div><div class='add'>+</div><div class='add'>+  Virtual CAN network device creation in older Kernels:</div><div class='add'>+  In Linux Kernel versions &lt; 2.6.24 the vcan driver creates 4 vcan</div><div class='add'>+  netdevices at module load time by default. This value can be changed</div><div class='add'>+  with the module parameter 'numdev'. E.g. 'modprobe vcan numdev=8'</div><div class='add'>+</div><div class='add'>+  6.5 currently supported CAN hardware</div><div class='ctx'> </div><div class='ctx'>   On the project website http://developer.berlios.de/projects/socketcan</div><div class='ctx'>   there are different drivers available:</div><div class='hunk'>@@ -603,7 +639,7 @@ solution for a couple of reasons:</div><div class='ctx'> </div><div class='ctx'>   Please check the Mailing Lists on the berlios OSS project website.</div><div class='ctx'> </div><div class='del'>-  6.5 todo (September 2007)</div><div class='add'>+  6.6 todo</div><div class='ctx'> </div><div class='ctx'>   The configuration interface for CAN network drivers is still an open</div><div class='ctx'>   issue that has not been finalized in the socketcan project. Also the</div><div class='head'>diff --git a/Documentation/networking/cs89x0.txt b/Documentation/networking/cs89x0.txt<br/>index 6387d3decf85..c725d33b316f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/networking/cs89x0.txt?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/networking/cs89x0.txt</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/networking/cs89x0.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/networking/cs89x0.txt</a></div><div class='hunk'>@@ -3,7 +3,7 @@ NOTE</div><div class='ctx'> ----</div><div class='ctx'> </div><div class='ctx'> This document was contributed by Cirrus Logic for kernel 2.2.5.  This version</div><div class='del'>-has been updated for 2.3.48 by Andrew Morton &lt;andrewm@uow.edu.au&gt;</div><div class='add'>+has been updated for 2.3.48 by Andrew Morton.</div><div class='ctx'> </div><div class='ctx'> Cirrus make a copy of this driver available at their website, as</div><div class='ctx'> described below.  In general, you should use the driver version which</div><div class='hunk'>@@ -690,7 +690,7 @@ latest drivers and technical publications.</div><div class='ctx'> 6.4 Current maintainer</div><div class='ctx'> </div><div class='ctx'> In February 2000 the maintenance of this driver was assumed by Andrew</div><div class='del'>-Morton &lt;akpm@zip.com.au&gt;</div><div class='add'>+Morton.</div><div class='ctx'> </div><div class='ctx'> 6.5 Kernel module parameters</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/networking/multiqueue.txt b/Documentation/networking/multiqueue.txt<br/>index d391ea631141..4caa0e314cc2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/networking/multiqueue.txt?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/networking/multiqueue.txt</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/networking/multiqueue.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/networking/multiqueue.txt</a></div><div class='hunk'>@@ -24,4 +24,56 @@ netif_{start|stop|wake}_subqueue() functions to manage each queue while the</div><div class='ctx'> device is still operational.  netdev-&gt;queue_lock is still used when the device</div><div class='ctx'> comes online or when it's completely shut down (unregister_netdev(), etc.).</div><div class='ctx'> </div><div class='del'>-Author: Peter P. Waskiewicz Jr. &lt;peter.p.waskiewicz.jr@intel.com&gt;</div><div class='add'>+</div><div class='add'>+Section 2: Qdisc support for multiqueue devices</div><div class='add'>+</div><div class='add'>+-----------------------------------------------</div><div class='add'>+</div><div class='add'>+Currently two qdiscs are optimized for multiqueue devices.  The first is the</div><div class='add'>+default pfifo_fast qdisc.  This qdisc supports one qdisc per hardware queue.</div><div class='add'>+A new round-robin qdisc, sch_multiq also supports multiple hardware queues. The</div><div class='add'>+qdisc is responsible for classifying the skb's and then directing the skb's to</div><div class='add'>+bands and queues based on the value in skb-&gt;queue_mapping.  Use this field in</div><div class='add'>+the base driver to determine which queue to send the skb to.</div><div class='add'>+</div><div class='add'>+sch_multiq has been added for hardware that wishes to avoid head-of-line</div><div class='add'>+blocking.  It will cycle though the bands and verify that the hardware queue</div><div class='add'>+associated with the band is not stopped prior to dequeuing a packet.</div><div class='add'>+</div><div class='add'>+On qdisc load, the number of bands is based on the number of queues on the</div><div class='add'>+hardware.  Once the association is made, any skb with skb-&gt;queue_mapping set,</div><div class='add'>+will be queued to the band associated with the hardware queue.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Section 3: Brief howto using MULTIQ for multiqueue devices</div><div class='add'>+---------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+The userspace command 'tc,' part of the iproute2 package, is used to configure</div><div class='add'>+qdiscs.  To add the MULTIQ qdisc to your network device, assuming the device</div><div class='add'>+is called eth0, run the following command:</div><div class='add'>+</div><div class='add'>+# tc qdisc add dev eth0 root handle 1: multiq</div><div class='add'>+</div><div class='add'>+The qdisc will allocate the number of bands to equal the number of queues that</div><div class='add'>+the device reports, and bring the qdisc online.  Assuming eth0 has 4 Tx</div><div class='add'>+queues, the band mapping would look like:</div><div class='add'>+</div><div class='add'>+band 0 =&gt; queue 0</div><div class='add'>+band 1 =&gt; queue 1</div><div class='add'>+band 2 =&gt; queue 2</div><div class='add'>+band 3 =&gt; queue 3</div><div class='add'>+</div><div class='add'>+Traffic will begin flowing through each queue based on either the simple_tx_hash</div><div class='add'>+function or based on netdev-&gt;select_queue() if you have it defined.</div><div class='add'>+</div><div class='add'>+The behavior of tc filters remains the same.  However a new tc action,</div><div class='add'>+skbedit, has been added.  Assuming you wanted to route all traffic to a</div><div class='add'>+specific host, for example 192.168.0.3, through a specific queue you could use</div><div class='add'>+this action and establish a filter such as:</div><div class='add'>+</div><div class='add'>+tc filter add dev eth0 parent 1: protocol ip prio 1 u32 \</div><div class='add'>+	match ip dst 192.168.0.3 \</div><div class='add'>+	action skbedit queue_mapping 3</div><div class='add'>+</div><div class='add'>+Author: Alexander Duyck &lt;alexander.h.duyck@intel.com&gt;</div><div class='add'>+Original Author: Peter P. Waskiewicz Jr. &lt;peter.p.waskiewicz.jr@intel.com&gt;</div><div class='head'>diff --git a/Documentation/networking/phonet.txt b/Documentation/networking/phonet.txt<br/>new file mode 100644<br/>index 000000000000..6a07e45d4a93<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/networking/phonet.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/networking/phonet.txt</a></div><div class='hunk'>@@ -0,0 +1,175 @@</div><div class='add'>+Linux Phonet protocol family</div><div class='add'>+============================</div><div class='add'>+</div><div class='add'>+Introduction</div><div class='add'>+------------</div><div class='add'>+</div><div class='add'>+Phonet is a packet protocol used by Nokia cellular modems for both IPC</div><div class='add'>+and RPC. With the Linux Phonet socket family, Linux host processes can</div><div class='add'>+receive and send messages from/to the modem, or any other external</div><div class='add'>+device attached to the modem. The modem takes care of routing.</div><div class='add'>+</div><div class='add'>+Phonet packets can be exchanged through various hardware connections</div><div class='add'>+depending on the device, such as:</div><div class='add'>+  - USB with the CDC Phonet interface,</div><div class='add'>+  - infrared,</div><div class='add'>+  - Bluetooth,</div><div class='add'>+  - an RS232 serial port (with a dedicated "FBUS" line discipline),</div><div class='add'>+  - the SSI bus with some TI OMAP processors.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Packets format</div><div class='add'>+--------------</div><div class='add'>+</div><div class='add'>+Phonet packets have a common header as follows:</div><div class='add'>+</div><div class='add'>+  struct phonethdr {</div><div class='add'>+    uint8_t  pn_media;  /* Media type (link-layer identifier) */</div><div class='add'>+    uint8_t  pn_rdev;   /* Receiver device ID */</div><div class='add'>+    uint8_t  pn_sdev;   /* Sender device ID */</div><div class='add'>+    uint8_t  pn_res;    /* Resource ID or function */</div><div class='add'>+    uint16_t pn_length; /* Big-endian message byte length (minus 6) */</div><div class='add'>+    uint8_t  pn_robj;   /* Receiver object ID */</div><div class='add'>+    uint8_t  pn_sobj;   /* Sender object ID */</div><div class='add'>+  };</div><div class='add'>+</div><div class='add'>+On Linux, the link-layer header includes the pn_media byte (see below).</div><div class='add'>+The next 7 bytes are part of the network-layer header.</div><div class='add'>+</div><div class='add'>+The device ID is split: the 6 higher-order bits consitute the device</div><div class='add'>+address, while the 2 lower-order bits are used for multiplexing, as are</div><div class='add'>+the 8-bit object identifiers. As such, Phonet can be considered as a</div><div class='add'>+network layer with 6 bits of address space and 10 bits for transport</div><div class='add'>+protocol (much like port numbers in IP world).</div><div class='add'>+</div><div class='add'>+The modem always has address number zero. All other device have a their</div><div class='add'>+own 6-bit address.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Link layer</div><div class='add'>+----------</div><div class='add'>+</div><div class='add'>+Phonet links are always point-to-point links. The link layer header</div><div class='add'>+consists of a single Phonet media type byte. It uniquely identifies the</div><div class='add'>+link through which the packet is transmitted, from the modem's</div><div class='add'>+perspective. Each Phonet network device shall prepend and set the media</div><div class='add'>+type byte as appropriate. For convenience, a common phonet_header_ops</div><div class='add'>+link-layer header operations structure is provided. It sets the</div><div class='add'>+media type according to the network device hardware address.</div><div class='add'>+</div><div class='add'>+Linux Phonet network interfaces support a dedicated link layer packets</div><div class='add'>+type (ETH_P_PHONET) which is out of the Ethernet type range. They can</div><div class='add'>+only send and receive Phonet packets.</div><div class='add'>+</div><div class='add'>+The virtual TUN tunnel device driver can also be used for Phonet. This</div><div class='add'>+requires IFF_TUN mode, _without_ the IFF_NO_PI flag. In this case,</div><div class='add'>+there is no link-layer header, so there is no Phonet media type byte.</div><div class='add'>+</div><div class='add'>+Note that Phonet interfaces are not allowed to re-order packets, so</div><div class='add'>+only the (default) Linux FIFO qdisc should be used with them.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Network layer</div><div class='add'>+-------------</div><div class='add'>+</div><div class='add'>+The Phonet socket address family maps the Phonet packet header:</div><div class='add'>+</div><div class='add'>+  struct sockaddr_pn {</div><div class='add'>+    sa_family_t spn_family;    /* AF_PHONET */</div><div class='add'>+    uint8_t     spn_obj;       /* Object ID */</div><div class='add'>+    uint8_t     spn_dev;       /* Device ID */</div><div class='add'>+    uint8_t     spn_resource;  /* Resource or function */</div><div class='add'>+    uint8_t     spn_zero[...]; /* Padding */</div><div class='add'>+  };</div><div class='add'>+</div><div class='add'>+The resource field is only used when sending and receiving;</div><div class='add'>+It is ignored by bind() and getsockname().</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Low-level datagram protocol</div><div class='add'>+---------------------------</div><div class='add'>+</div><div class='add'>+Applications can send Phonet messages using the Phonet datagram socket</div><div class='add'>+protocol from the PF_PHONET family. Each socket is bound to one of the</div><div class='add'>+2^10 object IDs available, and can send and receive packets with any</div><div class='add'>+other peer.</div><div class='add'>+</div><div class='add'>+  struct sockaddr_pn addr = { .spn_family = AF_PHONET, };</div><div class='add'>+  ssize_t len;</div><div class='add'>+  socklen_t addrlen = sizeof(addr);</div><div class='add'>+  int fd;</div><div class='add'>+</div><div class='add'>+  fd = socket(PF_PHONET, SOCK_DGRAM, 0);</div><div class='add'>+  bind(fd, (struct sockaddr *)&amp;addr, sizeof(addr));</div><div class='add'>+  /* ... */</div><div class='add'>+</div><div class='add'>+  sendto(fd, msg, msglen, 0, (struct sockaddr *)&amp;addr, sizeof(addr));</div><div class='add'>+  len = recvfrom(fd, buf, sizeof(buf), 0,</div><div class='add'>+                 (struct sockaddr *)&amp;addr, &amp;addrlen);</div><div class='add'>+</div><div class='add'>+This protocol follows the SOCK_DGRAM connection-less semantics.</div><div class='add'>+However, connect() and getpeername() are not supported, as they did</div><div class='add'>+not seem useful with Phonet usages (could be added easily).</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Phonet Pipe protocol</div><div class='add'>+--------------------</div><div class='add'>+</div><div class='add'>+The Phonet Pipe protocol is a simple sequenced packets protocol</div><div class='add'>+with end-to-end congestion control. It uses the passive listening</div><div class='add'>+socket paradigm. The listening socket is bound to an unique free object</div><div class='add'>+ID. Each listening socket can handle up to 255 simultaneous</div><div class='add'>+connections, one per accept()'d socket.</div><div class='add'>+</div><div class='add'>+  int lfd, cfd;</div><div class='add'>+</div><div class='add'>+  lfd = socket(PF_PHONET, SOCK_SEQPACKET, PN_PROTO_PIPE);</div><div class='add'>+  listen (lfd, INT_MAX);</div><div class='add'>+</div><div class='add'>+  /* ... */</div><div class='add'>+  cfd = accept(lfd, NULL, NULL);</div><div class='add'>+  for (;;)</div><div class='add'>+  {</div><div class='add'>+    char buf[...];</div><div class='add'>+    ssize_t len = read(cfd, buf, sizeof(buf));</div><div class='add'>+</div><div class='add'>+    /* ... */</div><div class='add'>+</div><div class='add'>+    write(cfd, msg, msglen);</div><div class='add'>+  }</div><div class='add'>+</div><div class='add'>+Connections are established between two endpoints by a "third party"</div><div class='add'>+application. This means that both endpoints are passive; so connect()</div><div class='add'>+is not possible.</div><div class='add'>+</div><div class='add'>+WARNING:</div><div class='add'>+When polling a connected pipe socket for writability, there is an</div><div class='add'>+intrinsic race condition whereby writability might be lost between the</div><div class='add'>+polling and the writing system calls. In this case, the socket will</div><div class='add'>+block until write becomes possible again, unless non-blocking mode</div><div class='add'>+is enabled.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+The pipe protocol provides two socket options at the SOL_PNPIPE level:</div><div class='add'>+</div><div class='add'>+  PNPIPE_ENCAP accepts one integer value (int) of:</div><div class='add'>+</div><div class='add'>+    PNPIPE_ENCAP_NONE: The socket operates normally (default).</div><div class='add'>+</div><div class='add'>+    PNPIPE_ENCAP_IP: The socket is used as a backend for a virtual IP</div><div class='add'>+      interface. This requires CAP_NET_ADMIN capability. GPRS data</div><div class='add'>+      support on Nokia modems can use this. Note that the socket cannot</div><div class='add'>+      be reliably poll()'d or read() from while in this mode.</div><div class='add'>+</div><div class='add'>+  PNPIPE_IFINDEX is a read-only integer value. It contains the</div><div class='add'>+    interface index of the network interface created by PNPIPE_ENCAP,</div><div class='add'>+    or zero if encapsulation is off.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Authors</div><div class='add'>+-------</div><div class='add'>+</div><div class='add'>+Linux Phonet was initially written by Sakari Ailus.</div><div class='add'>+Other contributors include Mikä Liljeberg, Andras Domokos,</div><div class='add'>+Carlos Chinea and Rémi Denis-Courmont.</div><div class='add'>+Copyright (C) 2008 Nokia Corporation.</div><div class='head'>diff --git a/Documentation/networking/regulatory.txt b/Documentation/networking/regulatory.txt<br/>new file mode 100644<br/>index 000000000000..a96989a8ff35<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/networking/regulatory.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/networking/regulatory.txt</a></div><div class='hunk'>@@ -0,0 +1,194 @@</div><div class='add'>+Linux wireless regulatory documentation</div><div class='add'>+---------------------------------------</div><div class='add'>+</div><div class='add'>+This document gives a brief review over how the Linux wireless</div><div class='add'>+regulatory infrastructure works.</div><div class='add'>+</div><div class='add'>+More up to date information can be obtained at the project's web page:</div><div class='add'>+</div><div class='add'>+http://wireless.kernel.org/en/developers/Regulatory</div><div class='add'>+</div><div class='add'>+Keeping regulatory domains in userspace</div><div class='add'>+---------------------------------------</div><div class='add'>+</div><div class='add'>+Due to the dynamic nature of regulatory domains we keep them</div><div class='add'>+in userspace and provide a framework for userspace to upload</div><div class='add'>+to the kernel one regulatory domain to be used as the central</div><div class='add'>+core regulatory domain all wireless devices should adhere to.</div><div class='add'>+</div><div class='add'>+How to get regulatory domains to the kernel</div><div class='add'>+-------------------------------------------</div><div class='add'>+</div><div class='add'>+Userspace gets a regulatory domain in the kernel by having</div><div class='add'>+a userspace agent build it and send it via nl80211. Only</div><div class='add'>+expected regulatory domains will be respected by the kernel.</div><div class='add'>+</div><div class='add'>+A currently available userspace agent which can accomplish this</div><div class='add'>+is CRDA - central regulatory domain agent. Its documented here:</div><div class='add'>+</div><div class='add'>+http://wireless.kernel.org/en/developers/Regulatory/CRDA</div><div class='add'>+</div><div class='add'>+Essentially the kernel will send a udev event when it knows</div><div class='add'>+it needs a new regulatory domain. A udev rule can be put in place</div><div class='add'>+to trigger crda to send the respective regulatory domain for a</div><div class='add'>+specific ISO/IEC 3166 alpha2.</div><div class='add'>+</div><div class='add'>+Below is an example udev rule which can be used:</div><div class='add'>+</div><div class='add'>+# Example file, should be put in /etc/udev/rules.d/regulatory.rules</div><div class='add'>+KERNEL=="regulatory*", ACTION=="change", SUBSYSTEM=="platform", RUN+="/sbin/crda"</div><div class='add'>+</div><div class='add'>+The alpha2 is passed as an environment variable under the variable COUNTRY.</div><div class='add'>+</div><div class='add'>+Who asks for regulatory domains?</div><div class='add'>+--------------------------------</div><div class='add'>+</div><div class='add'>+* Users</div><div class='add'>+</div><div class='add'>+Users can use iw:</div><div class='add'>+</div><div class='add'>+http://wireless.kernel.org/en/users/Documentation/iw</div><div class='add'>+</div><div class='add'>+An example:</div><div class='add'>+</div><div class='add'>+  # set regulatory domain to "Costa Rica"</div><div class='add'>+  iw reg set CR</div><div class='add'>+</div><div class='add'>+This will request the kernel to set the regulatory domain to</div><div class='add'>+the specificied alpha2. The kernel in turn will then ask userspace</div><div class='add'>+to provide a regulatory domain for the alpha2 specified by the user</div><div class='add'>+by sending a uevent.</div><div class='add'>+</div><div class='add'>+* Wireless subsystems for Country Information elements</div><div class='add'>+</div><div class='add'>+The kernel will send a uevent to inform userspace a new</div><div class='add'>+regulatory domain is required. More on this to be added</div><div class='add'>+as its integration is added.</div><div class='add'>+</div><div class='add'>+* Drivers</div><div class='add'>+</div><div class='add'>+If drivers determine they need a specific regulatory domain</div><div class='add'>+set they can inform the wireless core using regulatory_hint().</div><div class='add'>+They have two options -- they either provide an alpha2 so that</div><div class='add'>+crda can provide back a regulatory domain for that country or</div><div class='add'>+they can build their own regulatory domain based on internal</div><div class='add'>+custom knowledge so the wireless core can respect it.</div><div class='add'>+</div><div class='add'>+*Most* drivers will rely on the first mechanism of providing a</div><div class='add'>+regulatory hint with an alpha2. For these drivers there is an additional</div><div class='add'>+check that can be used to ensure compliance based on custom EEPROM</div><div class='add'>+regulatory data. This additional check can be used by drivers by</div><div class='add'>+registering on its struct wiphy a reg_notifier() callback. This notifier</div><div class='add'>+is called when the core's regulatory domain has been changed. The driver</div><div class='add'>+can use this to review the changes made and also review who made them</div><div class='add'>+(driver, user, country IE) and determine what to allow based on its</div><div class='add'>+internal EEPROM data. Devices drivers wishing to be capable of world</div><div class='add'>+roaming should use this callback. More on world roaming will be</div><div class='add'>+added to this document when its support is enabled.</div><div class='add'>+</div><div class='add'>+Device drivers who provide their own built regulatory domain</div><div class='add'>+do not need a callback as the channels registered by them are</div><div class='add'>+the only ones that will be allowed and therefore *additional*</div><div class='add'>+cannels cannot be enabled.</div><div class='add'>+</div><div class='add'>+Example code - drivers hinting an alpha2:</div><div class='add'>+------------------------------------------</div><div class='add'>+</div><div class='add'>+This example comes from the zd1211rw device driver. You can start</div><div class='add'>+by having a mapping of your device's EEPROM country/regulatory</div><div class='add'>+domain value to to a specific alpha2 as follows:</div><div class='add'>+</div><div class='add'>+static struct zd_reg_alpha2_map reg_alpha2_map[] = {</div><div class='add'>+	{ ZD_REGDOMAIN_FCC, "US" },</div><div class='add'>+	{ ZD_REGDOMAIN_IC, "CA" },</div><div class='add'>+	{ ZD_REGDOMAIN_ETSI, "DE" }, /* Generic ETSI, use most restrictive */</div><div class='add'>+	{ ZD_REGDOMAIN_JAPAN, "JP" },</div><div class='add'>+	{ ZD_REGDOMAIN_JAPAN_ADD, "JP" },</div><div class='add'>+	{ ZD_REGDOMAIN_SPAIN, "ES" },</div><div class='add'>+	{ ZD_REGDOMAIN_FRANCE, "FR" },</div><div class='add'>+</div><div class='add'>+Then you can define a routine to map your read EEPROM value to an alpha2,</div><div class='add'>+as follows:</div><div class='add'>+</div><div class='add'>+static int zd_reg2alpha2(u8 regdomain, char *alpha2)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+	struct zd_reg_alpha2_map *reg_map;</div><div class='add'>+		for (i = 0; i &lt; ARRAY_SIZE(reg_alpha2_map); i++) {</div><div class='add'>+			reg_map = &amp;reg_alpha2_map[i];</div><div class='add'>+			if (regdomain == reg_map-&gt;reg) {</div><div class='add'>+			alpha2[0] = reg_map-&gt;alpha2[0];</div><div class='add'>+			alpha2[1] = reg_map-&gt;alpha2[1];</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+Lastly, you can then hint to the core of your discovered alpha2, if a match</div><div class='add'>+was found. You need to do this after you have registered your wiphy. You</div><div class='add'>+are expected to do this during initialization.</div><div class='add'>+</div><div class='add'>+	r = zd_reg2alpha2(mac-&gt;regdomain, alpha2);</div><div class='add'>+	if (!r)</div><div class='add'>+		regulatory_hint(hw-&gt;wiphy, alpha2, NULL);</div><div class='add'>+</div><div class='add'>+Example code - drivers providing a built in regulatory domain:</div><div class='add'>+--------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+If you have regulatory information you can obtain from your</div><div class='add'>+driver and you *need* to use this we let you build a regulatory domain</div><div class='add'>+structure and pass it to the wireless core. To do this you should</div><div class='add'>+kmalloc() a structure big enough to hold your regulatory domain</div><div class='add'>+structure and you should then fill it with your data. Finally you simply</div><div class='add'>+call regulatory_hint() with the regulatory domain structure in it.</div><div class='add'>+</div><div class='add'>+Bellow is a simple example, with a regulatory domain cached using the stack.</div><div class='add'>+Your implementation may vary (read EEPROM cache instead, for example).</div><div class='add'>+</div><div class='add'>+Example cache of some regulatory domain</div><div class='add'>+</div><div class='add'>+struct ieee80211_regdomain mydriver_jp_regdom = {</div><div class='add'>+	.n_reg_rules = 3,</div><div class='add'>+	.alpha2 =  "JP",</div><div class='add'>+	//.alpha2 =  "99", /* If I have no alpha2 to map it to */</div><div class='add'>+	.reg_rules = {</div><div class='add'>+		/* IEEE 802.11b/g, channels 1..14 */</div><div class='add'>+		REG_RULE(2412-20, 2484+20, 40, 6, 20, 0),</div><div class='add'>+		/* IEEE 802.11a, channels 34..48 */</div><div class='add'>+		REG_RULE(5170-20, 5240+20, 40, 6, 20,</div><div class='add'>+			NL80211_RRF_PASSIVE_SCAN),</div><div class='add'>+		/* IEEE 802.11a, channels 52..64 */</div><div class='add'>+		REG_RULE(5260-20, 5320+20, 40, 6, 20,</div><div class='add'>+			NL80211_RRF_NO_IBSS |</div><div class='add'>+			NL80211_RRF_DFS),</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+Then in some part of your code after your wiphy has been registered:</div><div class='add'>+</div><div class='add'>+	int r;</div><div class='add'>+	struct ieee80211_regdomain *rd;</div><div class='add'>+	int size_of_regd;</div><div class='add'>+	int num_rules = mydriver_jp_regdom.n_reg_rules;</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	size_of_regd = sizeof(struct ieee80211_regdomain) +</div><div class='add'>+		(num_rules * sizeof(struct ieee80211_reg_rule));</div><div class='add'>+</div><div class='add'>+	rd = kzalloc(size_of_regd, GFP_KERNEL);</div><div class='add'>+	if (!rd)</div><div class='add'>+	return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	memcpy(rd, &amp;mydriver_jp_regdom, sizeof(struct ieee80211_regdomain));</div><div class='add'>+</div><div class='add'>+	for (i=0; i &lt; num_rules; i++) {</div><div class='add'>+		memcpy(&amp;rd-&gt;reg_rules[i], &amp;mydriver_jp_regdom.reg_rules[i],</div><div class='add'>+			sizeof(struct ieee80211_reg_rule));</div><div class='add'>+	}</div><div class='add'>+	r = regulatory_hint(hw-&gt;wiphy, NULL, rd);</div><div class='add'>+	if (r) {</div><div class='add'>+		kfree(rd);</div><div class='add'>+		return r;</div><div class='add'>+	}</div><div class='add'>+</div><div class='head'>diff --git a/Documentation/networking/tproxy.txt b/Documentation/networking/tproxy.txt<br/>new file mode 100644<br/>index 000000000000..7b5996d9357e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/networking/tproxy.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/networking/tproxy.txt</a></div><div class='hunk'>@@ -0,0 +1,85 @@</div><div class='add'>+Transparent proxy support</div><div class='add'>+=========================</div><div class='add'>+</div><div class='add'>+This feature adds Linux 2.2-like transparent proxy support to current kernels.</div><div class='add'>+To use it, enable NETFILTER_TPROXY, the socket match and the TPROXY target in</div><div class='add'>+your kernel config. You will need policy routing too, so be sure to enable that</div><div class='add'>+as well.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+1. Making non-local sockets work</div><div class='add'>+================================</div><div class='add'>+</div><div class='add'>+The idea is that you identify packets with destination address matching a local</div><div class='add'>+socket on your box, set the packet mark to a certain value, and then match on that</div><div class='add'>+value using policy routing to have those packets delivered locally:</div><div class='add'>+</div><div class='add'>+# iptables -t mangle -N DIVERT</div><div class='add'>+# iptables -t mangle -A PREROUTING -p tcp -m socket -j DIVERT</div><div class='add'>+# iptables -t mangle -A DIVERT -j MARK --set-mark 1</div><div class='add'>+# iptables -t mangle -A DIVERT -j ACCEPT</div><div class='add'>+</div><div class='add'>+# ip rule add fwmark 1 lookup 100</div><div class='add'>+# ip route add local 0.0.0.0/0 dev lo table 100</div><div class='add'>+</div><div class='add'>+Because of certain restrictions in the IPv4 routing output code you'll have to</div><div class='add'>+modify your application to allow it to send datagrams _from_ non-local IP</div><div class='add'>+addresses. All you have to do is enable the (SOL_IP, IP_TRANSPARENT) socket</div><div class='add'>+option before calling bind:</div><div class='add'>+</div><div class='add'>+fd = socket(AF_INET, SOCK_STREAM, 0);</div><div class='add'>+/* - 8&lt; -*/</div><div class='add'>+int value = 1;</div><div class='add'>+setsockopt(fd, SOL_IP, IP_TRANSPARENT, &amp;value, sizeof(value));</div><div class='add'>+/* - 8&lt; -*/</div><div class='add'>+name.sin_family = AF_INET;</div><div class='add'>+name.sin_port = htons(0xCAFE);</div><div class='add'>+name.sin_addr.s_addr = htonl(0xDEADBEEF);</div><div class='add'>+bind(fd, &amp;name, sizeof(name));</div><div class='add'>+</div><div class='add'>+A trivial patch for netcat is available here:</div><div class='add'>+http://people.netfilter.org/hidden/tproxy/netcat-ip_transparent-support.patch</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+2. Redirecting traffic</div><div class='add'>+======================</div><div class='add'>+</div><div class='add'>+Transparent proxying often involves "intercepting" traffic on a router. This is</div><div class='add'>+usually done with the iptables REDIRECT target; however, there are serious</div><div class='add'>+limitations of that method. One of the major issues is that it actually</div><div class='add'>+modifies the packets to change the destination address -- which might not be</div><div class='add'>+acceptable in certain situations. (Think of proxying UDP for example: you won't</div><div class='add'>+be able to find out the original destination address. Even in case of TCP</div><div class='add'>+getting the original destination address is racy.)</div><div class='add'>+</div><div class='add'>+The 'TPROXY' target provides similar functionality without relying on NAT. Simply</div><div class='add'>+add rules like this to the iptables ruleset above:</div><div class='add'>+</div><div class='add'>+# iptables -t mangle -A PREROUTING -p tcp --dport 80 -j TPROXY \</div><div class='add'>+  --tproxy-mark 0x1/0x1 --on-port 50080</div><div class='add'>+</div><div class='add'>+Note that for this to work you'll have to modify the proxy to enable (SOL_IP,</div><div class='add'>+IP_TRANSPARENT) for the listening socket.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+3. Iptables extensions</div><div class='add'>+======================</div><div class='add'>+</div><div class='add'>+To use tproxy you'll need to have the 'socket' and 'TPROXY' modules</div><div class='add'>+compiled for iptables. A patched version of iptables is available</div><div class='add'>+here: http://git.balabit.hu/?p=bazsi/iptables-tproxy.git</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+4. Application support</div><div class='add'>+======================</div><div class='add'>+</div><div class='add'>+4.1. Squid</div><div class='add'>+----------</div><div class='add'>+</div><div class='add'>+Squid 3.HEAD has support built-in. To use it, pass</div><div class='add'>+'--enable-linux-netfilter' to configure and set the 'tproxy' option on</div><div class='add'>+the HTTP listener you redirect traffic to with the TPROXY iptables</div><div class='add'>+target.</div><div class='add'>+</div><div class='add'>+For more information please consult the following page on the Squid</div><div class='add'>+wiki: http://wiki.squid-cache.org/Features/Tproxy4</div><div class='head'>diff --git a/Documentation/networking/vortex.txt b/Documentation/networking/vortex.txt<br/>index 6356d3faed36..bd70976b8160 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/networking/vortex.txt?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/networking/vortex.txt</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/networking/vortex.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/networking/vortex.txt</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> Documentation/networking/vortex.txt</div><div class='del'>-Andrew Morton &lt;andrewm@uow.edu.au&gt;</div><div class='add'>+Andrew Morton</div><div class='ctx'> 30 April 2000</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -11,7 +11,7 @@ The driver was written by Donald Becker &lt;becker@scyld.com&gt;</div><div class='ctx'> Don is no longer the prime maintainer of this version of the driver. </div><div class='ctx'> Please report problems to one or more of:</div><div class='ctx'> </div><div class='del'>-  Andrew Morton &lt;akpm@osdl.org&gt;</div><div class='add'>+  Andrew Morton</div><div class='ctx'>   Netdev mailing list &lt;netdev@vger.kernel.org&gt;</div><div class='ctx'>   Linux kernel mailing list &lt;linux-kernel@vger.kernel.org&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -305,11 +305,6 @@ Donald's wake-on-LAN page:</div><div class='ctx'> </div><div class='ctx'> 	ftp://ftp.3com.com/pub/nic/3c90x/3c90xx2.exe</div><div class='ctx'> </div><div class='del'>-Driver updates and a detailed changelog for the modifications which</div><div class='del'>-were made for the 2.3/2,4 series kernel is available at</div><div class='del'>-</div><div class='del'>-     http://www.zip.com.au/~akpm/linux/#3c59x-bc</div><div class='del'>-</div><div class='ctx'> </div><div class='ctx'> Autonegotiation notes</div><div class='ctx'> ---------------------</div><div class='head'>diff --git a/Documentation/pcmcia/driver-changes.txt b/Documentation/pcmcia/driver-changes.txt<br/>index 96f155e68750..059934363caf 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/pcmcia/driver-changes.txt?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/pcmcia/driver-changes.txt</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/pcmcia/driver-changes.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/pcmcia/driver-changes.txt</a></div><div class='hunk'>@@ -1,5 +1,11 @@</div><div class='ctx'> This file details changes in 2.6 which affect PCMCIA card driver authors:</div><div class='ctx'> </div><div class='add'>+* New configuration loop helper (as of 2.6.28)</div><div class='add'>+   By calling pcmcia_loop_config(), a driver can iterate over all available</div><div class='add'>+   configuration options. During a driver's probe() phase, one doesn't need</div><div class='add'>+   to use pcmcia_get_{first,next}_tuple, pcmcia_get_tuple_data and</div><div class='add'>+   pcmcia_parse_tuple directly in most if not all cases.</div><div class='add'>+</div><div class='ctx'> * New release helper (as of 2.6.17)</div><div class='ctx'>    Instead of calling pcmcia_release_{configuration,io,irq,win}, all that's</div><div class='ctx'>    necessary now is calling pcmcia_disable_device. As there is no valid</div><div class='head'>diff --git a/Documentation/power/regulator/machine.txt b/Documentation/power/regulator/machine.txt<br/>index c9a35665cf70..ce3487d99abe 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/power/regulator/machine.txt?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/power/regulator/machine.txt</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/power/regulator/machine.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/power/regulator/machine.txt</a></div><div class='hunk'>@@ -2,17 +2,8 @@ Regulator Machine Driver Interface</div><div class='ctx'> ===================================</div><div class='ctx'> </div><div class='ctx'> The regulator machine driver interface is intended for board/machine specific</div><div class='del'>-initialisation code to configure the regulator subsystem. Typical things that</div><div class='del'>-machine drivers would do are :-</div><div class='add'>+initialisation code to configure the regulator subsystem.</div><div class='ctx'> </div><div class='del'>- 1. Regulator -&gt; Device mapping.</div><div class='del'>- 2. Regulator supply configuration.</div><div class='del'>- 3. Power Domain constraint setting.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-1. Regulator -&gt; device mapping</div><div class='del'>-==============================</div><div class='ctx'> Consider the following machine :-</div><div class='ctx'> </div><div class='ctx'>   Regulator-1 -+-&gt; Regulator-2 --&gt; [Consumer A @ 1.8 - 2.0V]</div><div class='hunk'>@@ -21,81 +12,82 @@ Consider the following machine :-</div><div class='ctx'> </div><div class='ctx'> The drivers for consumers A &amp; B must be mapped to the correct regulator in</div><div class='ctx'> order to control their power supply. This mapping can be achieved in machine</div><div class='del'>-initialisation code by calling :-</div><div class='add'>+initialisation code by creating a struct regulator_consumer_supply for</div><div class='add'>+each regulator.</div><div class='add'>+</div><div class='add'>+struct regulator_consumer_supply {</div><div class='add'>+	struct device *dev;	/* consumer */</div><div class='add'>+	const char *supply;	/* consumer supply - e.g. "vcc" */</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-int regulator_set_device_supply(const char *regulator, struct device *dev,</div><div class='del'>-				const char *supply);</div><div class='add'>+e.g. for the machine above</div><div class='ctx'> </div><div class='del'>-and is shown with the following code :-</div><div class='add'>+static struct regulator_consumer_supply regulator1_consumers[] = {</div><div class='add'>+{</div><div class='add'>+	.dev	= &amp;platform_consumerB_device.dev,</div><div class='add'>+	.supply	= "Vcc",</div><div class='add'>+},};</div><div class='ctx'> </div><div class='del'>-regulator_set_device_supply("Regulator-1", devB, "Vcc");</div><div class='del'>-regulator_set_device_supply("Regulator-2", devA, "Vcc");</div><div class='add'>+static struct regulator_consumer_supply regulator2_consumers[] = {</div><div class='add'>+{</div><div class='add'>+	.dev	= &amp;platform_consumerA_device.dev,</div><div class='add'>+	.supply	= "Vcc",</div><div class='add'>+},};</div><div class='ctx'> </div><div class='ctx'> This maps Regulator-1 to the 'Vcc' supply for Consumer B and maps Regulator-2</div><div class='ctx'> to the 'Vcc' supply for Consumer A.</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-2. Regulator supply configuration.</div><div class='del'>-==================================</div><div class='del'>-Consider the following machine (again) :-</div><div class='del'>-</div><div class='del'>-  Regulator-1 -+-&gt; Regulator-2 --&gt; [Consumer A @ 1.8 - 2.0V]</div><div class='del'>-               |</div><div class='del'>-               +-&gt; [Consumer B @ 3.3V]</div><div class='add'>+Constraints can now be registered by defining a struct regulator_init_data</div><div class='add'>+for each regulator power domain. This structure also maps the consumers</div><div class='add'>+to their supply regulator :-</div><div class='add'>+</div><div class='add'>+static struct regulator_init_data regulator1_data = {</div><div class='add'>+	.constraints = {</div><div class='add'>+		.min_uV = 3300000,</div><div class='add'>+		.max_uV = 3300000,</div><div class='add'>+		.valid_modes_mask = REGULATOR_MODE_NORMAL,</div><div class='add'>+	},</div><div class='add'>+	.num_consumer_supplies = ARRAY_SIZE(regulator1_consumers),</div><div class='add'>+	.consumer_supplies = regulator1_consumers,</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> Regulator-1 supplies power to Regulator-2. This relationship must be registered</div><div class='ctx'> with the core so that Regulator-1 is also enabled when Consumer A enables it's</div><div class='del'>-supply (Regulator-2).</div><div class='del'>-</div><div class='del'>-This relationship can be register with the core via :-</div><div class='del'>-</div><div class='del'>-int regulator_set_supply(const char *regulator, const char *regulator_supply);</div><div class='del'>-</div><div class='del'>-In this example we would use the following code :-</div><div class='del'>-</div><div class='del'>-regulator_set_supply("Regulator-2", "Regulator-1");</div><div class='del'>-</div><div class='del'>-Relationships can be queried by calling :-</div><div class='del'>-</div><div class='del'>-const char *regulator_get_supply(const char *regulator);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-3. Power Domain constraint setting.</div><div class='del'>-===================================</div><div class='del'>-Each power domain within a system has physical constraints on voltage and</div><div class='del'>-current. This must be defined in software so that the power domain is always</div><div class='del'>-operated within specifications.</div><div class='del'>-</div><div class='del'>-Consider the following machine (again) :-</div><div class='del'>-</div><div class='del'>-  Regulator-1 -+-&gt; Regulator-2 --&gt; [Consumer A @ 1.8 - 2.0V]</div><div class='del'>-               |</div><div class='del'>-               +-&gt; [Consumer B @ 3.3V]</div><div class='del'>-</div><div class='del'>-This gives us two regulators and two power domains:</div><div class='del'>-</div><div class='del'>-                   Domain 1: Regulator-2, Consumer B.</div><div class='del'>-                   Domain 2: Consumer A.</div><div class='del'>-</div><div class='del'>-Constraints can be registered by calling :-</div><div class='del'>-</div><div class='del'>-int regulator_set_platform_constraints(const char *regulator,</div><div class='del'>-	struct regulation_constraints *constraints);</div><div class='del'>-</div><div class='del'>-The example is defined as follows :-</div><div class='del'>-</div><div class='del'>-struct regulation_constraints domain_1 = {</div><div class='del'>-	.min_uV = 3300000,</div><div class='del'>-	.max_uV = 3300000,</div><div class='del'>-	.valid_modes_mask = REGULATOR_MODE_NORMAL,</div><div class='add'>+supply (Regulator-2). The supply regulator is set by the supply_regulator_dev</div><div class='add'>+field below:-</div><div class='add'>+</div><div class='add'>+static struct regulator_init_data regulator2_data = {</div><div class='add'>+	.supply_regulator_dev = &amp;platform_regulator1_device.dev,</div><div class='add'>+	.constraints = {</div><div class='add'>+		.min_uV = 1800000,</div><div class='add'>+		.max_uV = 2000000,</div><div class='add'>+		.valid_ops_mask = REGULATOR_CHANGE_VOLTAGE,</div><div class='add'>+		.valid_modes_mask = REGULATOR_MODE_NORMAL,</div><div class='add'>+	},</div><div class='add'>+	.num_consumer_supplies = ARRAY_SIZE(regulator2_consumers),</div><div class='add'>+	.consumer_supplies = regulator2_consumers,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct regulation_constraints domain_2 = {</div><div class='del'>-	.min_uV = 1800000,</div><div class='del'>-	.max_uV = 2000000,</div><div class='del'>-	.valid_ops_mask = REGULATOR_CHANGE_VOLTAGE,</div><div class='del'>-	.valid_modes_mask = REGULATOR_MODE_NORMAL,</div><div class='add'>+Finally the regulator devices must be registered in the usual manner.</div><div class='add'>+</div><div class='add'>+static struct platform_device regulator_devices[] = {</div><div class='add'>+{</div><div class='add'>+	.name = "regulator",</div><div class='add'>+	.id = DCDC_1,</div><div class='add'>+	.dev = {</div><div class='add'>+		.platform_data = &amp;regulator1_data,</div><div class='add'>+	},</div><div class='add'>+},</div><div class='add'>+{</div><div class='add'>+	.name = "regulator",</div><div class='add'>+	.id = DCDC_2,</div><div class='add'>+	.dev = {</div><div class='add'>+		.platform_data = &amp;regulator2_data,</div><div class='add'>+	},</div><div class='add'>+},</div><div class='ctx'> };</div><div class='add'>+/* register regulator 1 device */</div><div class='add'>+platform_device_register(&amp;wm8350_regulator_devices[0]);</div><div class='ctx'> </div><div class='del'>-regulator_set_platform_constraints("Regulator-1", &amp;domain_1);</div><div class='del'>-regulator_set_platform_constraints("Regulator-2", &amp;domain_2);</div><div class='add'>+/* register regulator 2 device */</div><div class='add'>+platform_device_register(&amp;wm8350_regulator_devices[1]);</div><div class='head'>diff --git a/Documentation/power/regulator/regulator.txt b/Documentation/power/regulator/regulator.txt<br/>index a69050143592..4200accb9bba 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/power/regulator/regulator.txt?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/power/regulator/regulator.txt</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/power/regulator/regulator.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/power/regulator/regulator.txt</a></div><div class='hunk'>@@ -10,11 +10,11 @@ Registration</div><div class='ctx'> </div><div class='ctx'> Drivers can register a regulator by calling :-</div><div class='ctx'> </div><div class='del'>-struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc,</div><div class='del'>-					  void *reg_data);</div><div class='add'>+struct regulator_dev *regulator_register(struct device *dev,</div><div class='add'>+	struct regulator_desc *regulator_desc);</div><div class='ctx'> </div><div class='del'>-This will register the regulators capabilities and operations the regulator</div><div class='del'>-core. The core does not touch reg_data (private to regulator driver).</div><div class='add'>+This will register the regulators capabilities and operations to the regulator</div><div class='add'>+core.</div><div class='ctx'> </div><div class='ctx'> Regulators can be unregistered by calling :-</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/power/s2ram.txt b/Documentation/power/s2ram.txt<br/>index b05f512130ea..2ebdc6091ce1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/power/s2ram.txt?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/power/s2ram.txt</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/power/s2ram.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/power/s2ram.txt</a></div><div class='hunk'>@@ -54,3 +54,21 @@ used to run with "radeonfb" (it's an ATI Radeon mobility). It turns out</div><div class='ctx'> that "radeonfb" simply cannot resume that device - it tries to set the</div><div class='ctx'> PLL's, and it just _hangs_. Using the regular VGA console and letting X</div><div class='ctx'> resume it instead works fine.</div><div class='add'>+</div><div class='add'>+NOTE</div><div class='add'>+====</div><div class='add'>+pm_trace uses the system's Real Time Clock (RTC) to save the magic number.</div><div class='add'>+Reason for this is that the RTC is the only reliably available piece of</div><div class='add'>+hardware during resume operations where a value can be set that will</div><div class='add'>+survive a reboot.</div><div class='add'>+</div><div class='add'>+Consequence is that after a resume (even if it is successful) your system</div><div class='add'>+clock will have a value corresponding to the magic mumber instead of the</div><div class='add'>+correct date/time! It is therefore advisable to use a program like ntp-date</div><div class='add'>+or rdate to reset the correct date/time from an external time source when</div><div class='add'>+using this trace option.</div><div class='add'>+</div><div class='add'>+As the clock keeps ticking it is also essential that the reboot is done</div><div class='add'>+quickly after the resume failure. The trace option does not use the seconds</div><div class='add'>+or the low order bits of the minutes of the RTC, but a too long delay will</div><div class='add'>+corrupt the magic value.</div><div class='head'>diff --git a/Documentation/powerpc/00-INDEX b/Documentation/powerpc/00-INDEX<br/>index 29d839ce7327..e3960b8c8689 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/powerpc/00-INDEX?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/powerpc/00-INDEX</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/powerpc/00-INDEX?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/powerpc/00-INDEX</a></div><div class='hunk'>@@ -18,10 +18,6 @@ mpc52xx.txt</div><div class='ctx'> 	- Linux 2.6.x on MPC52xx family</div><div class='ctx'> mpc52xx-device-tree-bindings.txt</div><div class='ctx'> 	- MPC5200 Device Tree Bindings</div><div class='del'>-ppc_htab.txt</div><div class='del'>-	- info about the Linux/PPC /proc/ppc_htab entry</div><div class='del'>-smp.txt</div><div class='del'>-	- use and state info about Linux/PPC on MP machines</div><div class='ctx'> sound.txt</div><div class='ctx'> 	- info on sound support under Linux/PPC</div><div class='ctx'> zImage_layout.txt</div><div class='head'>diff --git a/Documentation/powerpc/dts-bindings/fsl/83xx-512x-pci.txt b/Documentation/powerpc/dts-bindings/fsl/83xx-512x-pci.txt<br/>new file mode 100644<br/>index 000000000000..35a465362408<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/powerpc/dts-bindings/fsl/83xx-512x-pci.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/powerpc/dts-bindings/fsl/83xx-512x-pci.txt</a></div><div class='hunk'>@@ -0,0 +1,40 @@</div><div class='add'>+* Freescale 83xx and 512x PCI bridges</div><div class='add'>+</div><div class='add'>+Freescale 83xx and 512x SOCs include the same pci bridge core.</div><div class='add'>+</div><div class='add'>+83xx/512x specific notes:</div><div class='add'>+- reg: should contain two address length tuples</div><div class='add'>+    The first is for the internal pci bridge registers</div><div class='add'>+    The second is for the pci config space access registers</div><div class='add'>+</div><div class='add'>+Example (MPC8313ERDB)</div><div class='add'>+	pci0: pci@e0008500 {</div><div class='add'>+		cell-index = &lt;1&gt;;</div><div class='add'>+		interrupt-map-mask = &lt;0xf800 0x0 0x0 0x7&gt;;</div><div class='add'>+		interrupt-map = &lt;</div><div class='add'>+				/* IDSEL 0x0E -mini PCI */</div><div class='add'>+				 0x7000 0x0 0x0 0x1 &amp;ipic 18 0x8</div><div class='add'>+				 0x7000 0x0 0x0 0x2 &amp;ipic 18 0x8</div><div class='add'>+				 0x7000 0x0 0x0 0x3 &amp;ipic 18 0x8</div><div class='add'>+				 0x7000 0x0 0x0 0x4 &amp;ipic 18 0x8</div><div class='add'>+</div><div class='add'>+				/* IDSEL 0x0F - PCI slot */</div><div class='add'>+				 0x7800 0x0 0x0 0x1 &amp;ipic 17 0x8</div><div class='add'>+				 0x7800 0x0 0x0 0x2 &amp;ipic 18 0x8</div><div class='add'>+				 0x7800 0x0 0x0 0x3 &amp;ipic 17 0x8</div><div class='add'>+				 0x7800 0x0 0x0 0x4 &amp;ipic 18 0x8&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='add'>+		interrupts = &lt;66 0x8&gt;;</div><div class='add'>+		bus-range = &lt;0x0 0x0&gt;;</div><div class='add'>+		ranges = &lt;0x02000000 0x0 0x90000000 0x90000000 0x0 0x10000000</div><div class='add'>+			  0x42000000 0x0 0x80000000 0x80000000 0x0 0x10000000</div><div class='add'>+			  0x01000000 0x0 0x00000000 0xe2000000 0x0 0x00100000&gt;;</div><div class='add'>+		clock-frequency = &lt;66666666&gt;;</div><div class='add'>+		#interrupt-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		#address-cells = &lt;3&gt;;</div><div class='add'>+		reg = &lt;0xe0008500 0x100		/* internal registers */</div><div class='add'>+		       0xe0008300 0x8&gt;;		/* config space access registers */</div><div class='add'>+		compatible = "fsl,mpc8349-pci";</div><div class='add'>+		device_type = "pci";</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/powerpc/dts-bindings/fsl/8xxx_gpio.txt b/Documentation/powerpc/dts-bindings/fsl/8xxx_gpio.txt<br/>new file mode 100644<br/>index 000000000000..d015dcec4011<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/powerpc/dts-bindings/fsl/8xxx_gpio.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/powerpc/dts-bindings/fsl/8xxx_gpio.txt</a></div><div class='hunk'>@@ -0,0 +1,40 @@</div><div class='add'>+GPIO controllers on MPC8xxx SoCs</div><div class='add'>+</div><div class='add'>+This is for the non-QE/CPM/GUTs GPIO controllers as found on</div><div class='add'>+8349, 8572, 8610 and compatible.</div><div class='add'>+</div><div class='add'>+Every GPIO controller node must have #gpio-cells property defined,</div><div class='add'>+this information will be used to translate gpio-specifiers.</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible : "fsl,&lt;CHIP&gt;-gpio" followed by "fsl,mpc8349-gpio" for</div><div class='add'>+  83xx, "fsl,mpc8572-gpio" for 85xx and "fsl,mpc8610-gpio" for 86xx.</div><div class='add'>+- #gpio-cells : Should be two. The first cell is the pin number and the</div><div class='add'>+  second cell is used to specify optional parameters (currently unused).</div><div class='add'>+ - interrupts : Interrupt mapping for GPIO IRQ (currently unused).</div><div class='add'>+ - interrupt-parent : Phandle for the interrupt controller that</div><div class='add'>+   services interrupts for this device.</div><div class='add'>+- gpio-controller : Marks the port as GPIO controller.</div><div class='add'>+</div><div class='add'>+Example of gpio-controller nodes for a MPC8347 SoC:</div><div class='add'>+</div><div class='add'>+	gpio1: gpio-controller@c00 {</div><div class='add'>+		#gpio-cells = &lt;2&gt;;</div><div class='add'>+		compatible = "fsl,mpc8347-gpio", "fsl,mpc8349-gpio";</div><div class='add'>+		reg = &lt;0xc00 0x100&gt;;</div><div class='add'>+		interrupts = &lt;74 0x8&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='add'>+		gpio-controller;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	gpio2: gpio-controller@d00 {</div><div class='add'>+		#gpio-cells = &lt;2&gt;;</div><div class='add'>+		compatible = "fsl,mpc8347-gpio", "fsl,mpc8349-gpio";</div><div class='add'>+		reg = &lt;0xd00 0x100&gt;;</div><div class='add'>+		interrupts = &lt;75 0x8&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='add'>+		gpio-controller;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+See booting-without-of.txt for details of how to specify GPIO</div><div class='add'>+information for devices.</div><div class='head'>diff --git a/Documentation/powerpc/dts-bindings/fsl/dma.txt b/Documentation/powerpc/dts-bindings/fsl/dma.txt<br/>index 86826df00e64..cc453110fc46 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/powerpc/dts-bindings/fsl/dma.txt?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/powerpc/dts-bindings/fsl/dma.txt</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/powerpc/dts-bindings/fsl/dma.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/powerpc/dts-bindings/fsl/dma.txt</a></div><div class='hunk'>@@ -20,7 +20,7 @@ Required properties:</div><div class='ctx'>         - compatible        : compatible list, contains 2 entries, first is</div><div class='ctx'> 			 "fsl,CHIP-dma-channel", where CHIP is the processor</div><div class='ctx'> 			 (mpc8349, mpc8350, etc.) and the second is</div><div class='del'>-			 "fsl,elo-dma-channel"</div><div class='add'>+			 "fsl,elo-dma-channel". However, see note below.</div><div class='ctx'>         - reg               : &lt;registers mapping for channel&gt;</div><div class='ctx'>         - cell-index        : dma channel index starts at 0.</div><div class='ctx'> </div><div class='hunk'>@@ -82,7 +82,7 @@ Required properties:</div><div class='ctx'>         - compatible        : compatible list, contains 2 entries, first is</div><div class='ctx'> 			 "fsl,CHIP-dma-channel", where CHIP is the processor</div><div class='ctx'> 			 (mpc8540, mpc8560, etc.) and the second is</div><div class='del'>-			 "fsl,eloplus-dma-channel"</div><div class='add'>+			 "fsl,eloplus-dma-channel". However, see note below.</div><div class='ctx'>         - cell-index        : dma channel index starts at 0.</div><div class='ctx'>         - reg               : &lt;registers mapping for channel&gt;</div><div class='ctx'>         - interrupts        : &lt;interrupt mapping for DMA channel IRQ&gt;</div><div class='hunk'>@@ -125,3 +125,12 @@ Example:</div><div class='ctx'> 			interrupts = &lt;17 2&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='add'>+</div><div class='add'>+Note on DMA channel compatible properties: The compatible property must say</div><div class='add'>+"fsl,elo-dma-channel" or "fsl,eloplus-dma-channel" to be used by the Elo DMA</div><div class='add'>+driver (fsldma).  Any DMA channel used by fsldma cannot be used by another</div><div class='add'>+DMA driver, such as the SSI sound drivers for the MPC8610.  Therefore, any DMA</div><div class='add'>+channel that should be used for another driver should not use</div><div class='add'>+"fsl,elo-dma-channel" or "fsl,eloplus-dma-channel".  For the SSI drivers, for</div><div class='add'>+example, the compatible property should be "fsl,ssi-dma-channel".  See ssi.txt</div><div class='add'>+for more information.</div><div class='head'>diff --git a/Documentation/powerpc/dts-bindings/fsl/ssi.txt b/Documentation/powerpc/dts-bindings/fsl/ssi.txt<br/>index d100555d488a..a2d963998a65 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/powerpc/dts-bindings/fsl/ssi.txt?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/powerpc/dts-bindings/fsl/ssi.txt</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/powerpc/dts-bindings/fsl/ssi.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/powerpc/dts-bindings/fsl/ssi.txt</a></div><div class='hunk'>@@ -24,6 +24,12 @@ Required properties:</div><div class='ctx'> 		    "rj-master" - r.j., SSI is clock master</div><div class='ctx'> 		    "ac97-slave" - AC97 mode, SSI is clock slave</div><div class='ctx'> 		    "ac97-master" - AC97 mode, SSI is clock master</div><div class='add'>+- fsl,playback-dma: phandle to a node for the DMA channel to use for</div><div class='add'>+                    playback of audio.  This is typically dictated by SOC</div><div class='add'>+                    design.  See the notes below.</div><div class='add'>+- fsl,capture-dma:  phandle to a node for the DMA channel to use for</div><div class='add'>+                    capture (recording) of audio.  This is typically dictated</div><div class='add'>+                    by SOC design.  See the notes below.</div><div class='ctx'> </div><div class='ctx'> Optional properties:</div><div class='ctx'> - codec-handle	  : phandle to a 'codec' node that defines an audio</div><div class='hunk'>@@ -36,3 +42,20 @@ Child 'codec' node required properties:</div><div class='ctx'> Child 'codec' node optional properties:</div><div class='ctx'> - clock-frequency  : The frequency of the input clock, which typically</div><div class='ctx'>                      comes from an on-board dedicated oscillator.</div><div class='add'>+</div><div class='add'>+Notes on fsl,playback-dma and fsl,capture-dma:</div><div class='add'>+</div><div class='add'>+On SOCs that have an SSI, specific DMA channels are hard-wired for playback</div><div class='add'>+and capture.  On the MPC8610, for example, SSI1 must use DMA channel 0 for</div><div class='add'>+playback and DMA channel 1 for capture.  SSI2 must use DMA channel 2 for</div><div class='add'>+playback and DMA channel 3 for capture.  The developer can choose which</div><div class='add'>+DMA controller to use, but the channels themselves are hard-wired.  The</div><div class='add'>+purpose of these two properties is to represent this hardware design.</div><div class='add'>+</div><div class='add'>+The device tree nodes for the DMA channels that are referenced by</div><div class='add'>+"fsl,playback-dma" and "fsl,capture-dma" must be marked as compatible with</div><div class='add'>+"fsl,ssi-dma-channel".  The SOC-specific compatible string (e.g.</div><div class='add'>+"fsl,mpc8610-dma-channel") can remain.  If these nodes are left as</div><div class='add'>+"fsl,elo-dma-channel" or "fsl,eloplus-dma-channel", then the generic Elo DMA</div><div class='add'>+drivers (fsldma) will attempt to use them, and it will conflict with the</div><div class='add'>+sound drivers.</div><div class='head'>diff --git a/Documentation/powerpc/ppc_htab.txt b/Documentation/powerpc/ppc_htab.txt<br/>deleted file mode 100644<br/>index 8b8c7df29fa9..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/powerpc/ppc_htab.txt?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/powerpc/ppc_htab.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,118 +0,0 @@</div><div class='del'>-                 Information about /proc/ppc_htab</div><div class='del'>-=====================================================================</div><div class='del'>-</div><div class='del'>-This document and the related code was written by me (Cort Dougan), please</div><div class='del'>-email me (cort@fsmlabs.com) if you have questions, comments or corrections.</div><div class='del'>-</div><div class='del'>-Last Change: 2.16.98</div><div class='del'>-</div><div class='del'>-This entry in the proc directory is readable by all users but only</div><div class='del'>-writable by root.</div><div class='del'>-</div><div class='del'>-The ppc_htab interface is a user level way of accessing the</div><div class='del'>-performance monitoring registers as well as providing information</div><div class='del'>-about the PTE hash table.</div><div class='del'>-</div><div class='del'>-1. Reading</div><div class='del'>-</div><div class='del'>-  Reading this file will give you information about the memory management</div><div class='del'>-  hash table that serves as an extended tlb for page translation on the</div><div class='del'>-  powerpc.  It will also give you information about performance measurement</div><div class='del'>-  specific to the cpu that you are using.</div><div class='del'>-</div><div class='del'>-  Explanation of the 604 Performance Monitoring Fields:</div><div class='del'>-    MMCR0 - the current value of the MMCR0 register</div><div class='del'>-    PMC1</div><div class='del'>-    PMC2 - the value of the performance counters and a</div><div class='del'>-           description of what events they are counting</div><div class='del'>-           which are based on MMCR0 bit settings.</div><div class='del'>-  Explanation of the PTE Hash Table fields:</div><div class='del'>-</div><div class='del'>-    Size - hash table size in Kb.</div><div class='del'>-    Buckets -  number of buckets in the table.</div><div class='del'>-    Address - the virtual kernel address of the hash table base.</div><div class='del'>-    Entries - the number of ptes that can be stored in the hash table.</div><div class='del'>-    User/Kernel - how many pte's are in use by the kernel or user at that time.</div><div class='del'>-    Overflows - How many of the entries are in their secondary hash location.</div><div class='del'>-    Percent full - ratio of free pte entries to in use entries.</div><div class='del'>-    Reloads - Count of how many hash table misses have occurred</div><div class='del'>-              that were fixed with a reload from the linux tables.</div><div class='del'>-              Should always be 0 on 603 based machines.</div><div class='del'>-    Non-error Misses - Count of how many hash table misses have occurred</div><div class='del'>-              that were completed with the creation of a pte in the linux</div><div class='del'>-              tables with a call to do_page_fault().</div><div class='del'>-    Error Misses - Number of misses due to errors such as bad address</div><div class='del'>-              and permission violations.  This includes kernel access of</div><div class='del'>-              bad user addresses that are fixed up by the trap handler.</div><div class='del'>-</div><div class='del'>-  Note that calculation of the data displayed from /proc/ppc_htab takes</div><div class='del'>-  a long time and spends a great deal of time in the kernel.  It would</div><div class='del'>-  be quite hard on performance to read this file constantly.  In time</div><div class='del'>-  there may be a counter in the kernel that allows successive reads from</div><div class='del'>-  this file only after a given amount of time has passed to reduce the</div><div class='del'>-  possibility of a user slowing the system by reading this file.</div><div class='del'>-</div><div class='del'>-2. Writing</div><div class='del'>-</div><div class='del'>-  Writing to the ppc_htab allows you to change the characteristics of</div><div class='del'>-  the powerpc PTE hash table and setup performance monitoring.</div><div class='del'>-</div><div class='del'>-  Resizing the PTE hash table is not enabled right now due to many</div><div class='del'>-  complications with moving the hash table, rehashing the entries</div><div class='del'>-  and many many SMP issues that would have to be dealt with.</div><div class='del'>-</div><div class='del'>-  Write options to ppc_htab:</div><div class='del'>-  </div><div class='del'>-   - To set the size of the hash table to 64Kb:</div><div class='del'>-</div><div class='del'>-      echo 'size 64' &gt; /proc/ppc_htab</div><div class='del'>-</div><div class='del'>-     The size must be a multiple of 64 and must be greater than or equal to</div><div class='del'>-     64.</div><div class='del'>-</div><div class='del'>-   - To turn off performance monitoring:</div><div class='del'>-</div><div class='del'>-      echo 'off' &gt; /proc/ppc_htab</div><div class='del'>-</div><div class='del'>-   - To reset the counters without changing what they're counting:</div><div class='del'>-</div><div class='del'>-      echo 'reset' &gt; /proc/ppc_htab</div><div class='del'>-</div><div class='del'>-     Note that counting will continue after the reset if it is enabled.</div><div class='del'>-</div><div class='del'>-   - To count only events in user mode or only in kernel mode:</div><div class='del'>-</div><div class='del'>-      echo 'user' &gt; /proc/ppc_htab</div><div class='del'>-       ...or...</div><div class='del'>-      echo 'kernel' &gt; /proc/ppc_htab</div><div class='del'>-</div><div class='del'>-     Note that these two options are exclusive of one another and the</div><div class='del'>-     lack of either of these options counts user and kernel.</div><div class='del'>-     Using 'reset' and 'off' reset these flags.</div><div class='del'>-</div><div class='del'>-   - The 604 has 2 performance counters which can each count events from</div><div class='del'>-     a specific set of events.  These sets are disjoint so it is not</div><div class='del'>-     possible to count _any_ combination of 2 events.  One event can</div><div class='del'>-     be counted by PMC1 and one by PMC2.</div><div class='del'>-</div><div class='del'>-     To start counting a particular event use:</div><div class='del'>-</div><div class='del'>-      echo 'event' &gt; /proc/ppc_htab</div><div class='del'>-</div><div class='del'>-     and choose from these events:</div><div class='del'>-</div><div class='del'>-     PMC1</div><div class='del'>-     ----</div><div class='del'>-      'ic miss' - instruction cache misses</div><div class='del'>-      'dtlb' - data tlb misses (not hash table misses)</div><div class='del'>-</div><div class='del'>-     PMC2</div><div class='del'>-     ----</div><div class='del'>-      'dc miss' - data cache misses</div><div class='del'>-      'itlb' - instruction tlb misses (not hash table misses)</div><div class='del'>-      'load miss time' - cycles to complete a load miss</div><div class='del'>-</div><div class='del'>-3. Bugs</div><div class='del'>-</div><div class='del'>-  The PMC1 and PMC2 counters can overflow and give no indication of that</div><div class='del'>-  in /proc/ppc_htab.</div><div class='head'>diff --git a/Documentation/powerpc/smp.txt b/Documentation/powerpc/smp.txt<br/>deleted file mode 100644<br/>index 5b581b849ff7..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/powerpc/smp.txt?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/powerpc/smp.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,34 +0,0 @@</div><div class='del'>-                 Information about Linux/PPC SMP mode</div><div class='del'>-=====================================================================</div><div class='del'>-</div><div class='del'>-This document and the related code was written by me</div><div class='del'>-(Cort Dougan, cort@fsmlabs.com) please email me if you have questions,</div><div class='del'>-comments or corrections.</div><div class='del'>-</div><div class='del'>-Last Change: 3.31.99</div><div class='del'>-</div><div class='del'>-If you want to help by writing code or testing different hardware please</div><div class='del'>-email me!</div><div class='del'>-</div><div class='del'>-1. State of Supported Hardware</div><div class='del'>-</div><div class='del'>-  PowerSurge Architecture - tested on UMAX s900, Apple 9600</div><div class='del'>-    The second processor on this machine boots up just fine and</div><div class='del'>-    enters its idle loop.  Hopefully a completely working SMP kernel</div><div class='del'>-    on this machine will be done shortly.</div><div class='del'>-</div><div class='del'>-    The code makes the assumption of only two processors.  The changes</div><div class='del'>-    necessary to work with any number would not be overly difficult but</div><div class='del'>-    I don't have any machines with &gt;2 processors so it's not high on my</div><div class='del'>-    list of priorities.  If anyone else would like do to the work email</div><div class='del'>-    me and I can point out the places that need changed.  If you have &gt;2</div><div class='del'>-    processors and don't want to add support yourself let me know and I</div><div class='del'>-    can take a look into it.</div><div class='del'>-</div><div class='del'>-  BeBox</div><div class='del'>-    BeBox support hasn't been added to the 2.1.X kernels from 2.0.X</div><div class='del'>-    but work is being done and SMP support for BeBox is in the works.</div><div class='del'>-</div><div class='del'>-  CHRP</div><div class='del'>-    CHRP SMP works and is fairly solid.  It's been tested on the IBM F50</div><div class='del'>-    with 4 processors for quite some time now.</div><div class='head'>diff --git a/Documentation/rfkill.txt b/Documentation/rfkill.txt<br/>index 6fcb3060dec5..b65f0799df48 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/rfkill.txt?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/rfkill.txt</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/rfkill.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/rfkill.txt</a></div><div class='hunk'>@@ -341,6 +341,8 @@ key that does nothing by itself, as well as any hot key that is type-specific</div><div class='ctx'> 3.1 Guidelines for wireless device drivers</div><div class='ctx'> ------------------------------------------</div><div class='ctx'> </div><div class='add'>+(in this text, rfkill-&gt;foo means the foo field of struct rfkill).</div><div class='add'>+</div><div class='ctx'> 1. Each independent transmitter in a wireless device (usually there is only one</div><div class='ctx'> transmitter per device) should have a SINGLE rfkill class attached to it.</div><div class='ctx'> </div><div class='hunk'>@@ -363,10 +365,32 @@ This rule exists because users of the rfkill subsystem expect to get (and set,</div><div class='ctx'> when possible) the overall transmitter rfkill state, not of a particular rfkill</div><div class='ctx'> line.</div><div class='ctx'> </div><div class='del'>-5. During suspend, the rfkill class will attempt to soft-block the radio</div><div class='del'>-through a call to rfkill-&gt;toggle_radio, and will try to restore its previous</div><div class='del'>-state during resume.  After a rfkill class is suspended, it will *not* call</div><div class='del'>-rfkill-&gt;toggle_radio until it is resumed.</div><div class='add'>+5. The wireless device driver MUST NOT leave the transmitter enabled during</div><div class='add'>+suspend and hibernation unless:</div><div class='add'>+</div><div class='add'>+	5.1. The transmitter has to be enabled for some sort of functionality</div><div class='add'>+	like wake-on-wireless-packet or autonomous packed forwarding in a mesh</div><div class='add'>+	network, and that functionality is enabled for this suspend/hibernation</div><div class='add'>+	cycle.</div><div class='add'>+</div><div class='add'>+AND</div><div class='add'>+</div><div class='add'>+	5.2. The device was not on a user-requested BLOCKED state before</div><div class='add'>+	the suspend (i.e. the driver must NOT unblock a device, not even</div><div class='add'>+	to support wake-on-wireless-packet or remain in the mesh).</div><div class='add'>+</div><div class='add'>+In other words, there is absolutely no allowed scenario where a driver can</div><div class='add'>+automatically take action to unblock a rfkill controller (obviously, this deals</div><div class='add'>+with scenarios where soft-blocking or both soft and hard blocking is happening.</div><div class='add'>+Scenarios where hardware rfkill lines are the only ones blocking the</div><div class='add'>+transmitter are outside of this rule, since the wireless device driver does not</div><div class='add'>+control its input hardware rfkill lines in the first place).</div><div class='add'>+</div><div class='add'>+6. During resume, rfkill will try to restore its previous state.</div><div class='add'>+</div><div class='add'>+7. After a rfkill class is suspended, it will *not* call rfkill-&gt;toggle_radio</div><div class='add'>+until it is resumed.</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> Example of a WLAN wireless driver connected to the rfkill subsystem:</div><div class='ctx'> --------------------------------------------------------------------</div><div class='head'>diff --git a/Documentation/s390/CommonIO b/Documentation/s390/CommonIO<br/>index bf0baa19ec24..339207d11d95 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/s390/CommonIO?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/s390/CommonIO</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/s390/CommonIO?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/s390/CommonIO</a></div><div class='hunk'>@@ -70,13 +70,19 @@ Command line parameters</div><div class='ctx'> </div><div class='ctx'>   Note: While already known devices can be added to the list of devices to be</div><div class='ctx'>         ignored, there will be no effect on then. However, if such a device</div><div class='del'>-	disappears and then reappears, it will then be ignored.</div><div class='add'>+	disappears and then reappears, it will then be ignored. To make</div><div class='add'>+	known devices go away, you need the "purge" command (see below).</div><div class='ctx'> </div><div class='ctx'>   For example,</div><div class='ctx'> 	"echo add 0.0.a000-0.0.accc, 0.0.af00-0.0.afff &gt; /proc/cio_ignore"</div><div class='ctx'>   will add 0.0.a000-0.0.accc and 0.0.af00-0.0.afff to the list of ignored</div><div class='ctx'>   devices.</div><div class='ctx'> </div><div class='add'>+  You can remove already known but now ignored devices via</div><div class='add'>+	"echo purge &gt; /proc/cio_ignore"</div><div class='add'>+  All devices ignored but still registered and not online (= not in use)</div><div class='add'>+  will be deregistered and thus removed from the system.</div><div class='add'>+</div><div class='ctx'>   The devices can be specified either by bus id (0.x.abcd) or, for 2.4 backward</div><div class='ctx'>   compatibility, by the device number in hexadecimal (0xabcd or abcd). Device</div><div class='ctx'>   numbers given as 0xabcd will be interpreted as 0.0.abcd.</div><div class='hunk'>@@ -98,8 +104,7 @@ debugfs entries</div><div class='ctx'>     handling).</div><div class='ctx'> </div><div class='ctx'>   - /sys/kernel/debug/s390dbf/cio_msg/sprintf</div><div class='del'>-    Various debug messages from the common I/O-layer, including messages</div><div class='del'>-    printed when cio_msg=yes.</div><div class='add'>+    Various debug messages from the common I/O-layer.</div><div class='ctx'> </div><div class='ctx'>   - /sys/kernel/debug/s390dbf/cio_trace/hex_ascii</div><div class='ctx'>     Logs the calling of functions in the common I/O-layer and, if applicable, </div><div class='head'>diff --git a/Documentation/scheduler/sched-design-CFS.txt b/Documentation/scheduler/sched-design-CFS.txt<br/>index 88bcb8767335..9d8eb553884c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/scheduler/sched-design-CFS.txt?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/scheduler/sched-design-CFS.txt</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/scheduler/sched-design-CFS.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/scheduler/sched-design-CFS.txt</a></div><div class='hunk'>@@ -1,151 +1,242 @@</div><div class='add'>+                      =============</div><div class='add'>+                      CFS Scheduler</div><div class='add'>+                      =============</div><div class='ctx'> </div><div class='del'>-This is the CFS scheduler.</div><div class='del'>-</div><div class='del'>-80% of CFS's design can be summed up in a single sentence: CFS basically</div><div class='del'>-models an "ideal, precise multi-tasking CPU" on real hardware.</div><div class='del'>-</div><div class='del'>-"Ideal multi-tasking CPU" is a (non-existent  :-))  CPU that has 100%</div><div class='del'>-physical power and which can run each task at precise equal speed, in</div><div class='del'>-parallel, each at 1/nr_running speed. For example: if there are 2 tasks</div><div class='del'>-running then it runs each at 50% physical power - totally in parallel.</div><div class='del'>-</div><div class='del'>-On real hardware, we can run only a single task at once, so while that</div><div class='del'>-one task runs, the other tasks that are waiting for the CPU are at a</div><div class='del'>-disadvantage - the current task gets an unfair amount of CPU time. In</div><div class='del'>-CFS this fairness imbalance is expressed and tracked via the per-task</div><div class='del'>-p-&gt;wait_runtime (nanosec-unit) value. "wait_runtime" is the amount of</div><div class='del'>-time the task should now run on the CPU for it to become completely fair</div><div class='del'>-and balanced.</div><div class='del'>-</div><div class='del'>-( small detail: on 'ideal' hardware, the p-&gt;wait_runtime value would</div><div class='del'>-  always be zero - no task would ever get 'out of balance' from the</div><div class='del'>-  'ideal' share of CPU time. )</div><div class='del'>-</div><div class='del'>-CFS's task picking logic is based on this p-&gt;wait_runtime value and it</div><div class='del'>-is thus very simple: it always tries to run the task with the largest</div><div class='del'>-p-&gt;wait_runtime value. In other words, CFS tries to run the task with</div><div class='del'>-the 'gravest need' for more CPU time. So CFS always tries to split up</div><div class='del'>-CPU time between runnable tasks as close to 'ideal multitasking</div><div class='del'>-hardware' as possible.</div><div class='del'>-</div><div class='del'>-Most of the rest of CFS's design just falls out of this really simple</div><div class='del'>-concept, with a few add-on embellishments like nice levels,</div><div class='del'>-multiprocessing and various algorithm variants to recognize sleepers.</div><div class='del'>-</div><div class='del'>-In practice it works like this: the system runs a task a bit, and when</div><div class='del'>-the task schedules (or a scheduler tick happens) the task's CPU usage is</div><div class='del'>-'accounted for': the (small) time it just spent using the physical CPU</div><div class='del'>-is deducted from p-&gt;wait_runtime. [minus the 'fair share' it would have</div><div class='del'>-gotten anyway]. Once p-&gt;wait_runtime gets low enough so that another</div><div class='del'>-task becomes the 'leftmost task' of the time-ordered rbtree it maintains</div><div class='del'>-(plus a small amount of 'granularity' distance relative to the leftmost</div><div class='del'>-task so that we do not over-schedule tasks and trash the cache) then the</div><div class='del'>-new leftmost task is picked and the current task is preempted.</div><div class='del'>-</div><div class='del'>-The rq-&gt;fair_clock value tracks the 'CPU time a runnable task would have</div><div class='del'>-fairly gotten, had it been runnable during that time'. So by using</div><div class='del'>-rq-&gt;fair_clock values we can accurately timestamp and measure the</div><div class='del'>-'expected CPU time' a task should have gotten. All runnable tasks are</div><div class='del'>-sorted in the rbtree by the "rq-&gt;fair_clock - p-&gt;wait_runtime" key, and</div><div class='del'>-CFS picks the 'leftmost' task and sticks to it. As the system progresses</div><div class='del'>-forwards, newly woken tasks are put into the tree more and more to the</div><div class='del'>-right - slowly but surely giving a chance for every task to become the</div><div class='del'>-'leftmost task' and thus get on the CPU within a deterministic amount of</div><div class='del'>-time.</div><div class='del'>-</div><div class='del'>-Some implementation details:</div><div class='del'>-</div><div class='del'>- - the introduction of Scheduling Classes: an extensible hierarchy of</div><div class='del'>-   scheduler modules. These modules encapsulate scheduling policy</div><div class='del'>-   details and are handled by the scheduler core without the core</div><div class='del'>-   code assuming about them too much.</div><div class='del'>-</div><div class='del'>- - sched_fair.c implements the 'CFS desktop scheduler': it is a</div><div class='del'>-   replacement for the vanilla scheduler's SCHED_OTHER interactivity</div><div class='del'>-   code.</div><div class='del'>-</div><div class='del'>-   I'd like to give credit to Con Kolivas for the general approach here:</div><div class='del'>-   he has proven via RSDL/SD that 'fair scheduling' is possible and that</div><div class='del'>-   it results in better desktop scheduling. Kudos Con!</div><div class='del'>-</div><div class='del'>-   The CFS patch uses a completely different approach and implementation</div><div class='del'>-   from RSDL/SD. My goal was to make CFS's interactivity quality exceed</div><div class='del'>-   that of RSDL/SD, which is a high standard to meet :-) Testing</div><div class='del'>-   feedback is welcome to decide this one way or another. [ and, in any</div><div class='del'>-   case, all of SD's logic could be added via a kernel/sched_sd.c module</div><div class='del'>-   as well, if Con is interested in such an approach. ]</div><div class='del'>-</div><div class='del'>-   CFS's design is quite radical: it does not use runqueues, it uses a</div><div class='del'>-   time-ordered rbtree to build a 'timeline' of future task execution,</div><div class='del'>-   and thus has no 'array switch' artifacts (by which both the vanilla</div><div class='del'>-   scheduler and RSDL/SD are affected).</div><div class='del'>-</div><div class='del'>-   CFS uses nanosecond granularity accounting and does not rely on any</div><div class='del'>-   jiffies or other HZ detail. Thus the CFS scheduler has no notion of</div><div class='del'>-   'timeslices' and has no heuristics whatsoever. There is only one</div><div class='del'>-   central tunable (you have to switch on CONFIG_SCHED_DEBUG):</div><div class='del'>-</div><div class='del'>-         /proc/sys/kernel/sched_granularity_ns</div><div class='del'>-</div><div class='del'>-   which can be used to tune the scheduler from 'desktop' (low</div><div class='del'>-   latencies) to 'server' (good batching) workloads. It defaults to a</div><div class='del'>-   setting suitable for desktop workloads. SCHED_BATCH is handled by the</div><div class='del'>-   CFS scheduler module too.</div><div class='del'>-</div><div class='del'>-   Due to its design, the CFS scheduler is not prone to any of the</div><div class='del'>-   'attacks' that exist today against the heuristics of the stock</div><div class='del'>-   scheduler: fiftyp.c, thud.c, chew.c, ring-test.c, massive_intr.c all</div><div class='del'>-   work fine and do not impact interactivity and produce the expected</div><div class='del'>-   behavior.</div><div class='del'>-</div><div class='del'>-   the CFS scheduler has a much stronger handling of nice levels and</div><div class='del'>-   SCHED_BATCH: both types of workloads should be isolated much more</div><div class='del'>-   agressively than under the vanilla scheduler.</div><div class='del'>-</div><div class='del'>-   ( another detail: due to nanosec accounting and timeline sorting,</div><div class='del'>-     sched_yield() support is very simple under CFS, and in fact under</div><div class='del'>-     CFS sched_yield() behaves much better than under any other</div><div class='del'>-     scheduler i have tested so far. )</div><div class='del'>-</div><div class='del'>- - sched_rt.c implements SCHED_FIFO and SCHED_RR semantics, in a simpler</div><div class='del'>-   way than the vanilla scheduler does. It uses 100 runqueues (for all</div><div class='del'>-   100 RT priority levels, instead of 140 in the vanilla scheduler)</div><div class='del'>-   and it needs no expired array.</div><div class='del'>-</div><div class='del'>- - reworked/sanitized SMP load-balancing: the runqueue-walking</div><div class='del'>-   assumptions are gone from the load-balancing code now, and</div><div class='del'>-   iterators of the scheduling modules are used. The balancing code got</div><div class='del'>-   quite a bit simpler as a result.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Group scheduler extension to CFS</div><div class='del'>-================================</div><div class='del'>-</div><div class='del'>-Normally the scheduler operates on individual tasks and strives to provide</div><div class='del'>-fair CPU time to each task. Sometimes, it may be desirable to group tasks</div><div class='del'>-and provide fair CPU time to each such task group. For example, it may</div><div class='del'>-be desirable to first provide fair CPU time to each user on the system</div><div class='del'>-and then to each task belonging to a user.</div><div class='del'>-</div><div class='del'>-CONFIG_FAIR_GROUP_SCHED strives to achieve exactly that. It lets</div><div class='del'>-SCHED_NORMAL/BATCH tasks be be grouped and divides CPU time fairly among such</div><div class='del'>-groups. At present, there are two (mutually exclusive) mechanisms to group</div><div class='del'>-tasks for CPU bandwidth control purpose:</div><div class='del'>-</div><div class='del'>-	- Based on user id (CONFIG_FAIR_USER_SCHED)</div><div class='del'>-		In this option, tasks are grouped according to their user id.</div><div class='del'>-	- Based on "cgroup" pseudo filesystem (CONFIG_FAIR_CGROUP_SCHED)</div><div class='del'>-		This options lets the administrator create arbitrary groups</div><div class='del'>-		of tasks, using the "cgroup" pseudo filesystem. See</div><div class='del'>-		Documentation/cgroups.txt for more information about this</div><div class='del'>-		filesystem.</div><div class='ctx'> </div><div class='del'>-Only one of these options to group tasks can be chosen and not both.</div><div class='add'>+1.  OVERVIEW</div><div class='add'>+</div><div class='add'>+CFS stands for "Completely Fair Scheduler," and is the new "desktop" process</div><div class='add'>+scheduler implemented by Ingo Molnar and merged in Linux 2.6.23.  It is the</div><div class='add'>+replacement for the previous vanilla scheduler's SCHED_OTHER interactivity</div><div class='add'>+code.</div><div class='add'>+</div><div class='add'>+80% of CFS's design can be summed up in a single sentence: CFS basically models</div><div class='add'>+an "ideal, precise multi-tasking CPU" on real hardware.</div><div class='add'>+</div><div class='add'>+"Ideal multi-tasking CPU" is a (non-existent  :-)) CPU that has 100% physical</div><div class='add'>+power and which can run each task at precise equal speed, in parallel, each at</div><div class='add'>+1/nr_running speed.  For example: if there are 2 tasks running, then it runs</div><div class='add'>+each at 50% physical power --- i.e., actually in parallel.</div><div class='add'>+</div><div class='add'>+On real hardware, we can run only a single task at once, so we have to</div><div class='add'>+introduce the concept of "virtual runtime."  The virtual runtime of a task</div><div class='add'>+specifies when its next timeslice would start execution on the ideal</div><div class='add'>+multi-tasking CPU described above.  In practice, the virtual runtime of a task</div><div class='add'>+is its actual runtime normalized to the total number of running tasks.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+2.  FEW IMPLEMENTATION DETAILS</div><div class='add'>+</div><div class='add'>+In CFS the virtual runtime is expressed and tracked via the per-task</div><div class='add'>+p-&gt;se.vruntime (nanosec-unit) value.  This way, it's possible to accurately</div><div class='add'>+timestamp and measure the "expected CPU time" a task should have gotten.</div><div class='add'>+</div><div class='add'>+[ small detail: on "ideal" hardware, at any time all tasks would have the same</div><div class='add'>+  p-&gt;se.vruntime value --- i.e., tasks would execute simultaneously and no task</div><div class='add'>+  would ever get "out of balance" from the "ideal" share of CPU time.  ]</div><div class='add'>+</div><div class='add'>+CFS's task picking logic is based on this p-&gt;se.vruntime value and it is thus</div><div class='add'>+very simple: it always tries to run the task with the smallest p-&gt;se.vruntime</div><div class='add'>+value (i.e., the task which executed least so far).  CFS always tries to split</div><div class='add'>+up CPU time between runnable tasks as close to "ideal multitasking hardware" as</div><div class='add'>+possible.</div><div class='add'>+</div><div class='add'>+Most of the rest of CFS's design just falls out of this really simple concept,</div><div class='add'>+with a few add-on embellishments like nice levels, multiprocessing and various</div><div class='add'>+algorithm variants to recognize sleepers.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+3.  THE RBTREE</div><div class='add'>+</div><div class='add'>+CFS's design is quite radical: it does not use the old data structures for the</div><div class='add'>+runqueues, but it uses a time-ordered rbtree to build a "timeline" of future</div><div class='add'>+task execution, and thus has no "array switch" artifacts (by which both the</div><div class='add'>+previous vanilla scheduler and RSDL/SD are affected).</div><div class='add'>+</div><div class='add'>+CFS also maintains the rq-&gt;cfs.min_vruntime value, which is a monotonic</div><div class='add'>+increasing value tracking the smallest vruntime among all tasks in the</div><div class='add'>+runqueue.  The total amount of work done by the system is tracked using</div><div class='add'>+min_vruntime; that value is used to place newly activated entities on the left</div><div class='add'>+side of the tree as much as possible.</div><div class='add'>+</div><div class='add'>+The total number of running tasks in the runqueue is accounted through the</div><div class='add'>+rq-&gt;cfs.load value, which is the sum of the weights of the tasks queued on the</div><div class='add'>+runqueue.</div><div class='add'>+</div><div class='add'>+CFS maintains a time-ordered rbtree, where all runnable tasks are sorted by the</div><div class='add'>+p-&gt;se.vruntime key (there is a subtraction using rq-&gt;cfs.min_vruntime to</div><div class='add'>+account for possible wraparounds).  CFS picks the "leftmost" task from this</div><div class='add'>+tree and sticks to it.</div><div class='add'>+As the system progresses forwards, the executed tasks are put into the tree</div><div class='add'>+more and more to the right --- slowly but surely giving a chance for every task</div><div class='add'>+to become the "leftmost task" and thus get on the CPU within a deterministic</div><div class='add'>+amount of time.</div><div class='add'>+</div><div class='add'>+Summing up, CFS works like this: it runs a task a bit, and when the task</div><div class='add'>+schedules (or a scheduler tick happens) the task's CPU usage is "accounted</div><div class='add'>+for": the (small) time it just spent using the physical CPU is added to</div><div class='add'>+p-&gt;se.vruntime.  Once p-&gt;se.vruntime gets high enough so that another task</div><div class='add'>+becomes the "leftmost task" of the time-ordered rbtree it maintains (plus a</div><div class='add'>+small amount of "granularity" distance relative to the leftmost task so that we</div><div class='add'>+do not over-schedule tasks and trash the cache), then the new leftmost task is</div><div class='add'>+picked and the current task is preempted.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+4.  SOME FEATURES OF CFS</div><div class='add'>+</div><div class='add'>+CFS uses nanosecond granularity accounting and does not rely on any jiffies or</div><div class='add'>+other HZ detail.  Thus the CFS scheduler has no notion of "timeslices" in the</div><div class='add'>+way the previous scheduler had, and has no heuristics whatsoever.  There is</div><div class='add'>+only one central tunable (you have to switch on CONFIG_SCHED_DEBUG):</div><div class='add'>+</div><div class='add'>+   /proc/sys/kernel/sched_granularity_ns</div><div class='add'>+</div><div class='add'>+which can be used to tune the scheduler from "desktop" (i.e., low latencies) to</div><div class='add'>+"server" (i.e., good batching) workloads.  It defaults to a setting suitable</div><div class='add'>+for desktop workloads.  SCHED_BATCH is handled by the CFS scheduler module too.</div><div class='add'>+</div><div class='add'>+Due to its design, the CFS scheduler is not prone to any of the "attacks" that</div><div class='add'>+exist today against the heuristics of the stock scheduler: fiftyp.c, thud.c,</div><div class='add'>+chew.c, ring-test.c, massive_intr.c all work fine and do not impact</div><div class='add'>+interactivity and produce the expected behavior.</div><div class='add'>+</div><div class='add'>+The CFS scheduler has a much stronger handling of nice levels and SCHED_BATCH</div><div class='add'>+than the previous vanilla scheduler: both types of workloads are isolated much</div><div class='add'>+more aggressively.</div><div class='add'>+</div><div class='add'>+SMP load-balancing has been reworked/sanitized: the runqueue-walking</div><div class='add'>+assumptions are gone from the load-balancing code now, and iterators of the</div><div class='add'>+scheduling modules are used.  The balancing code got quite a bit simpler as a</div><div class='add'>+result.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+5. Scheduling policies</div><div class='add'>+</div><div class='add'>+CFS implements three scheduling policies:</div><div class='add'>+</div><div class='add'>+  - SCHED_NORMAL (traditionally called SCHED_OTHER): The scheduling</div><div class='add'>+    policy that is used for regular tasks.</div><div class='add'>+</div><div class='add'>+  - SCHED_BATCH: Does not preempt nearly as often as regular tasks</div><div class='add'>+    would, thereby allowing tasks to run longer and make better use of</div><div class='add'>+    caches but at the cost of interactivity. This is well suited for</div><div class='add'>+    batch jobs.</div><div class='add'>+</div><div class='add'>+  - SCHED_IDLE: This is even weaker than nice 19, but its not a true</div><div class='add'>+    idle timer scheduler in order to avoid to get into priority</div><div class='add'>+    inversion problems which would deadlock the machine.</div><div class='add'>+</div><div class='add'>+SCHED_FIFO/_RR are implemented in sched_rt.c and are as specified by</div><div class='add'>+POSIX.</div><div class='add'>+</div><div class='add'>+The command chrt from util-linux-ng 2.13.1.1 can set all of these except</div><div class='add'>+SCHED_IDLE.</div><div class='ctx'> </div><div class='del'>-Group scheduler tunables:</div><div class='ctx'> </div><div class='del'>-When CONFIG_FAIR_USER_SCHED is defined, a directory is created in sysfs for</div><div class='del'>-each new user and a "cpu_share" file is added in that directory.</div><div class='add'>+</div><div class='add'>+6.  SCHEDULING CLASSES</div><div class='add'>+</div><div class='add'>+The new CFS scheduler has been designed in such a way to introduce "Scheduling</div><div class='add'>+Classes," an extensible hierarchy of scheduler modules.  These modules</div><div class='add'>+encapsulate scheduling policy details and are handled by the scheduler core</div><div class='add'>+without the core code assuming too much about them.</div><div class='add'>+</div><div class='add'>+sched_fair.c implements the CFS scheduler described above.</div><div class='add'>+</div><div class='add'>+sched_rt.c implements SCHED_FIFO and SCHED_RR semantics, in a simpler way than</div><div class='add'>+the previous vanilla scheduler did.  It uses 100 runqueues (for all 100 RT</div><div class='add'>+priority levels, instead of 140 in the previous scheduler) and it needs no</div><div class='add'>+expired array.</div><div class='add'>+</div><div class='add'>+Scheduling classes are implemented through the sched_class structure, which</div><div class='add'>+contains hooks to functions that must be called whenever an interesting event</div><div class='add'>+occurs.</div><div class='add'>+</div><div class='add'>+This is the (partial) list of the hooks:</div><div class='add'>+</div><div class='add'>+ - enqueue_task(...)</div><div class='add'>+</div><div class='add'>+   Called when a task enters a runnable state.</div><div class='add'>+   It puts the scheduling entity (task) into the red-black tree and</div><div class='add'>+   increments the nr_running variable.</div><div class='add'>+</div><div class='add'>+ - dequeue_tree(...)</div><div class='add'>+</div><div class='add'>+   When a task is no longer runnable, this function is called to keep the</div><div class='add'>+   corresponding scheduling entity out of the red-black tree.  It decrements</div><div class='add'>+   the nr_running variable.</div><div class='add'>+</div><div class='add'>+ - yield_task(...)</div><div class='add'>+</div><div class='add'>+   This function is basically just a dequeue followed by an enqueue, unless the</div><div class='add'>+   compat_yield sysctl is turned on; in that case, it places the scheduling</div><div class='add'>+   entity at the right-most end of the red-black tree.</div><div class='add'>+</div><div class='add'>+ - check_preempt_curr(...)</div><div class='add'>+</div><div class='add'>+   This function checks if a task that entered the runnable state should</div><div class='add'>+   preempt the currently running task.</div><div class='add'>+</div><div class='add'>+ - pick_next_task(...)</div><div class='add'>+</div><div class='add'>+   This function chooses the most appropriate task eligible to run next.</div><div class='add'>+</div><div class='add'>+ - set_curr_task(...)</div><div class='add'>+</div><div class='add'>+   This function is called when a task changes its scheduling class or changes</div><div class='add'>+   its task group.</div><div class='add'>+</div><div class='add'>+ - task_tick(...)</div><div class='add'>+</div><div class='add'>+   This function is mostly called from time tick functions; it might lead to</div><div class='add'>+   process switch.  This drives the running preemption.</div><div class='add'>+</div><div class='add'>+ - task_new(...)</div><div class='add'>+</div><div class='add'>+   The core scheduler gives the scheduling module an opportunity to manage new</div><div class='add'>+   task startup.  The CFS scheduling module uses it for group scheduling, while</div><div class='add'>+   the scheduling module for a real-time task does not use it.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+7.  GROUP SCHEDULER EXTENSIONS TO CFS</div><div class='add'>+</div><div class='add'>+Normally, the scheduler operates on individual tasks and strives to provide</div><div class='add'>+fair CPU time to each task.  Sometimes, it may be desirable to group tasks and</div><div class='add'>+provide fair CPU time to each such task group.  For example, it may be</div><div class='add'>+desirable to first provide fair CPU time to each user on the system and then to</div><div class='add'>+each task belonging to a user.</div><div class='add'>+</div><div class='add'>+CONFIG_GROUP_SCHED strives to achieve exactly that.  It lets tasks to be</div><div class='add'>+grouped and divides CPU time fairly among such groups.</div><div class='add'>+</div><div class='add'>+CONFIG_RT_GROUP_SCHED permits to group real-time (i.e., SCHED_FIFO and</div><div class='add'>+SCHED_RR) tasks.</div><div class='add'>+</div><div class='add'>+CONFIG_FAIR_GROUP_SCHED permits to group CFS (i.e., SCHED_NORMAL and</div><div class='add'>+SCHED_BATCH) tasks.</div><div class='add'>+</div><div class='add'>+At present, there are two (mutually exclusive) mechanisms to group tasks for</div><div class='add'>+CPU bandwidth control purposes:</div><div class='add'>+</div><div class='add'>+ - Based on user id (CONFIG_USER_SCHED)</div><div class='add'>+</div><div class='add'>+   With this option, tasks are grouped according to their user id.</div><div class='add'>+</div><div class='add'>+ - Based on "cgroup" pseudo filesystem (CONFIG_CGROUP_SCHED)</div><div class='add'>+</div><div class='add'>+   This options needs CONFIG_CGROUPS to be defined, and lets the administrator</div><div class='add'>+   create arbitrary groups of tasks, using the "cgroup" pseudo filesystem.  See</div><div class='add'>+   Documentation/cgroups.txt for more information about this filesystem.</div><div class='add'>+</div><div class='add'>+Only one of these options to group tasks can be chosen and not both.</div><div class='add'>+</div><div class='add'>+When CONFIG_USER_SCHED is defined, a directory is created in sysfs for each new</div><div class='add'>+user and a "cpu_share" file is added in that directory.</div><div class='ctx'> </div><div class='ctx'> 	# cd /sys/kernel/uids</div><div class='ctx'> 	# cat 512/cpu_share		# Display user 512's CPU share</div><div class='hunk'>@@ -155,16 +246,14 @@ each new user and a "cpu_share" file is added in that directory.</div><div class='ctx'> 	2048</div><div class='ctx'> 	#</div><div class='ctx'> </div><div class='del'>-CPU bandwidth between two users are divided in the ratio of their CPU shares.</div><div class='del'>-For ex: if you would like user "root" to get twice the bandwidth of user</div><div class='del'>-"guest", then set the cpu_share for both the users such that "root"'s</div><div class='del'>-cpu_share is twice "guest"'s cpu_share</div><div class='del'>-</div><div class='add'>+CPU bandwidth between two users is divided in the ratio of their CPU shares.</div><div class='add'>+For example: if you would like user "root" to get twice the bandwidth of user</div><div class='add'>+"guest," then set the cpu_share for both the users such that "root"'s cpu_share</div><div class='add'>+is twice "guest"'s cpu_share.</div><div class='ctx'> </div><div class='del'>-When CONFIG_FAIR_CGROUP_SCHED is defined, a "cpu.shares" file is created</div><div class='del'>-for each group created using the pseudo filesystem. See example steps</div><div class='del'>-below to create task groups and modify their CPU share using the "cgroups"</div><div class='del'>-pseudo filesystem</div><div class='add'>+When CONFIG_CGROUP_SCHED is defined, a "cpu.shares" file is created for each</div><div class='add'>+group created using the pseudo filesystem.  See example steps below to create</div><div class='add'>+task groups and modify their CPU share using the "cgroups" pseudo filesystem.</div><div class='ctx'> </div><div class='ctx'> 	# mkdir /dev/cpuctl</div><div class='ctx'> 	# mount -t cgroup -ocpu none /dev/cpuctl</div><div class='head'>diff --git a/Documentation/scsi/ChangeLog.megaraid b/Documentation/scsi/ChangeLog.megaraid<br/>index 37796fe45bd0..eaa4801f2ce6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/scsi/ChangeLog.megaraid?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/scsi/ChangeLog.megaraid</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/scsi/ChangeLog.megaraid?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/scsi/ChangeLog.megaraid</a></div><div class='hunk'>@@ -409,7 +409,7 @@ i.	Function reordering so that inline functions are defined before they</div><div class='ctx'> 	megaraid_mbox_prepare_pthru, megaraid_mbox_prepare_epthru,</div><div class='ctx'> 	megaraid_busywait_mbox</div><div class='ctx'> </div><div class='del'>-		- Andrew Morton &lt;akpm@osdl.org&gt;, 08.19.2004</div><div class='add'>+		- Andrew Morton, 08.19.2004</div><div class='ctx'> 		linux-scsi mailing list</div><div class='ctx'> </div><div class='ctx'> 	"Something else to clean up after inclusion: every instance of an</div><div class='hunk'>@@ -471,13 +471,13 @@ vi.	Add support for 64-bit applications. Current drivers assume only</div><div class='ctx'> vii.	Move the function declarations for the management module from</div><div class='ctx'> 	megaraid_mm.h to megaraid_mm.c</div><div class='ctx'> </div><div class='del'>-		- Andrew Morton &lt;akpm@osdl.org&gt;, 08.19.2004</div><div class='add'>+		- Andrew Morton, 08.19.2004</div><div class='ctx'> 		linux-scsi mailing list</div><div class='ctx'> </div><div class='ctx'> viii.	Change default values for MEGARAID_NEWGEN, MEGARAID_MM, and</div><div class='ctx'> 	MEGARAID_MAILBOX to 'n' in Kconfig.megaraid</div><div class='ctx'> </div><div class='del'>-		- Andrew Morton &lt;akpm@osdl.org&gt;, 08.19.2004</div><div class='add'>+		- Andrew Morton, 08.19.2004</div><div class='ctx'> 		linux-scsi mailing list</div><div class='ctx'> </div><div class='ctx'> ix.	replace udelay with msleep</div><div class='head'>diff --git a/Documentation/scsi/scsi_fc_transport.txt b/Documentation/scsi/scsi_fc_transport.txt<br/>index 75143f0c23b6..38d324d62b25 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/scsi/scsi_fc_transport.txt?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/scsi/scsi_fc_transport.txt</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/scsi/scsi_fc_transport.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/scsi/scsi_fc_transport.txt</a></div><div class='hunk'>@@ -436,6 +436,42 @@ Other:</div><div class='ctx'>     was updated to remove all vports for the fc_host as well.</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+Transport supplied functions</div><div class='add'>+----------------------------</div><div class='add'>+</div><div class='add'>+The following functions are supplied by the FC-transport for use by LLDs.</div><div class='add'>+</div><div class='add'>+   fc_vport_create - create a vport</div><div class='add'>+   fc_vport_terminate - detach and remove a vport</div><div class='add'>+</div><div class='add'>+Details:</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * fc_vport_create - Admin App or LLDD requests creation of a vport</div><div class='add'>+ * @shost:     scsi host the virtual port is connected to.</div><div class='add'>+ * @ids:       The world wide names, FC4 port roles, etc for</div><div class='add'>+ *              the virtual port.</div><div class='add'>+ *</div><div class='add'>+ * Notes:</div><div class='add'>+ *     This routine assumes no locks are held on entry.</div><div class='add'>+ */</div><div class='add'>+struct fc_vport *</div><div class='add'>+fc_vport_create(struct Scsi_Host *shost, struct fc_vport_identifiers *ids)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * fc_vport_terminate - Admin App or LLDD requests termination of a vport</div><div class='add'>+ * @vport:      fc_vport to be terminated</div><div class='add'>+ *</div><div class='add'>+ * Calls the LLDD vport_delete() function, then deallocates and removes</div><div class='add'>+ * the vport from the shost and object tree.</div><div class='add'>+ *</div><div class='add'>+ * Notes:</div><div class='add'>+ *      This routine assumes no locks are held on entry.</div><div class='add'>+ */</div><div class='add'>+int</div><div class='add'>+fc_vport_terminate(struct fc_vport *vport)</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> Credits</div><div class='ctx'> =======</div><div class='ctx'> The following people have contributed to this document:</div><div class='head'>diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt<br/>index b117e42a6166..e0e54a27fc10 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/sound/alsa/ALSA-Configuration.txt?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/sound/alsa/ALSA-Configuration.txt</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/sound/alsa/ALSA-Configuration.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/sound/alsa/ALSA-Configuration.txt</a></div><div class='hunk'>@@ -746,8 +746,10 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.</div><div class='ctx'>   Module snd-hda-intel</div><div class='ctx'>   --------------------</div><div class='ctx'> </div><div class='del'>-    Module for Intel HD Audio (ICH6, ICH6M, ESB2, ICH7, ICH8),</div><div class='del'>-		ATI SB450, SB600, RS600,</div><div class='add'>+    Module for Intel HD Audio (ICH6, ICH6M, ESB2, ICH7, ICH8, ICH9, ICH10,</div><div class='add'>+			PCH, SCH),</div><div class='add'>+		ATI SB450, SB600, R600, RS600, RS690, RS780, RV610, RV620,</div><div class='add'>+			RV630, RV635, RV670, RV770,</div><div class='ctx'> 		VIA VT8251/VT8237A,</div><div class='ctx'> 		SIS966, ULI M5461</div><div class='ctx'> </div><div class='hunk'>@@ -807,6 +809,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.</div><div class='ctx'> 	ALC260</div><div class='ctx'> 	  hp		HP machines</div><div class='ctx'> 	  hp-3013	HP machines (3013-variant)</div><div class='add'>+	  hp-dc7600	HP DC7600</div><div class='ctx'> 	  fujitsu	Fujitsu S7020</div><div class='ctx'> 	  acer		Acer TravelMate</div><div class='ctx'> 	  will		Will laptops (PB V7900)</div><div class='hunk'>@@ -828,8 +831,11 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.</div><div class='ctx'> 	  hippo		Hippo (ATI) with jack detection, Sony UX-90s</div><div class='ctx'> 	  hippo_1	Hippo (Benq) with jack detection</div><div class='ctx'> 	  sony-assamd	Sony ASSAMD</div><div class='add'>+	  toshiba-s06	Toshiba S06</div><div class='add'>+	  toshiba-rx1	Toshiba RX1</div><div class='ctx'> 	  ultra		Samsung Q1 Ultra Vista model</div><div class='ctx'> 	  lenovo-3000	Lenovo 3000 y410</div><div class='add'>+	  nec		NEC Versa S9100</div><div class='ctx'> 	  basic		fixed pin assignment w/o SPDIF</div><div class='ctx'> 	  auto		auto-config reading BIOS (default)</div><div class='ctx'> </div><div class='hunk'>@@ -838,6 +844,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.</div><div class='ctx'> 	  3stack	3-stack model</div><div class='ctx'> 	  toshiba	Toshiba A205</div><div class='ctx'> 	  acer		Acer laptops</div><div class='add'>+	  acer-aspire	Acer Aspire One</div><div class='ctx'> 	  dell		Dell OEM laptops (Vostro 1200)</div><div class='ctx'> 	  zepto		Zepto laptops</div><div class='ctx'> 	  test		for testing/debugging purpose, almost all controls can</div><div class='hunk'>@@ -847,6 +854,9 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.</div><div class='ctx'> </div><div class='ctx'> 	ALC269</div><div class='ctx'> 	  basic		Basic preset</div><div class='add'>+	  quanta	Quanta FL1</div><div class='add'>+	  eeepc-p703	ASUS Eeepc P703 P900A</div><div class='add'>+	  eeepc-p901	ASUS Eeepc P901 S101</div><div class='ctx'> </div><div class='ctx'> 	ALC662/663</div><div class='ctx'> 	  3stack-dig	3-stack (2-channel) with SPDIF</div><div class='hunk'>@@ -856,10 +866,17 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.</div><div class='ctx'> 	  lenovo-101e	 Lenovo laptop</div><div class='ctx'> 	  eeepc-p701	ASUS Eeepc P701</div><div class='ctx'> 	  eeepc-ep20	ASUS Eeepc EP20</div><div class='add'>+	  ecs		ECS/Foxconn mobo</div><div class='ctx'> 	  m51va		ASUS M51VA</div><div class='ctx'> 	  g71v		ASUS G71V</div><div class='ctx'> 	  h13		ASUS H13</div><div class='ctx'> 	  g50v		ASUS G50V</div><div class='add'>+	  asus-mode1	ASUS</div><div class='add'>+	  asus-mode2	ASUS</div><div class='add'>+	  asus-mode3	ASUS</div><div class='add'>+	  asus-mode4	ASUS</div><div class='add'>+	  asus-mode5	ASUS</div><div class='add'>+	  asus-mode6	ASUS</div><div class='ctx'> 	  auto		auto-config reading BIOS (default)</div><div class='ctx'> </div><div class='ctx'> 	ALC882/885</div><div class='hunk'>@@ -891,12 +908,14 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.</div><div class='ctx'> 	  lenovo-101e	Lenovo 101E</div><div class='ctx'> 	  lenovo-nb0763	Lenovo NB0763</div><div class='ctx'> 	  lenovo-ms7195-dig Lenovo MS7195</div><div class='add'>+	  lenovo-sky	Lenovo Sky</div><div class='ctx'> 	  haier-w66	Haier W66</div><div class='ctx'> 	  3stack-hp	HP machines with 3stack (Lucknow, Samba boards)</div><div class='ctx'> 	  6stack-dell	Dell machines with 6stack (Inspiron 530)</div><div class='ctx'> 	  mitac		Mitac 8252D</div><div class='ctx'> 	  clevo-m720	Clevo M720 laptop series</div><div class='ctx'> 	  fujitsu-pi2515 Fujitsu AMILO Pi2515</div><div class='add'>+	  3stack-6ch-intel Intel DG33* boards</div><div class='ctx'> 	  auto		auto-config reading BIOS (default)</div><div class='ctx'> </div><div class='ctx'> 	ALC861/660</div><div class='hunk'>@@ -929,7 +948,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.</div><div class='ctx'> 	  allout	5-jack in back, 2-jack in front, SPDIF out</div><div class='ctx'> 	  auto		auto-config reading BIOS (default)</div><div class='ctx'> </div><div class='del'>-	AD1882</div><div class='add'>+	AD1882 / AD1882A</div><div class='ctx'> 	  3stack	3-stack mode (default)</div><div class='ctx'> 	  6stack	6-stack mode</div><div class='ctx'> </div><div class='hunk'>@@ -1079,7 +1098,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.</div><div class='ctx'> 	    register value without FIFO size correction as the current</div><div class='ctx'> 	    DMA pointer.  position_fix=2 will make the driver to use</div><div class='ctx'> 	    the position buffer instead of reading SD_LPIB register.</div><div class='del'>-	    (Usually SD_LPLIB register is more accurate than the</div><div class='add'>+	    (Usually SD_LPIB register is more accurate than the</div><div class='ctx'> 	    position buffer.)</div><div class='ctx'> </div><div class='ctx'>     NB: If you get many "azx_get_response timeout" messages at</div><div class='hunk'>@@ -1166,6 +1185,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.</div><div class='ctx'> 			* Event Electronics, EZ8</div><div class='ctx'>                         * Digigram VX442</div><div class='ctx'> 			* Lionstracs, Mediastaton</div><div class='add'>+			* Terrasoniq TS 88</div><div class='ctx'> </div><div class='ctx'>     model       - Use the given board model, one of the following:</div><div class='ctx'> 		  delta1010, dio2496, delta66, delta44, audiophile, delta410,</div><div class='hunk'>@@ -1200,7 +1220,10 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.</div><div class='ctx'> 			* TerraTec Phase 22</div><div class='ctx'> 			* TerraTec Phase 28</div><div class='ctx'> 			* AudioTrak Prodigy 7.1</div><div class='del'>-			* AudioTrak Prodigy 7.1LT</div><div class='add'>+			* AudioTrak Prodigy 7.1 LT</div><div class='add'>+			* AudioTrak Prodigy 7.1 XT</div><div class='add'>+			* AudioTrak Prodigy 7.1 HIFI</div><div class='add'>+			* AudioTrak Prodigy 7.1 HD2</div><div class='ctx'> 			* AudioTrak Prodigy 192</div><div class='ctx'> 			* Pontis MS300</div><div class='ctx'> 			* Albatron K8X800 Pro II </div><div class='hunk'>@@ -1211,12 +1234,16 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.</div><div class='ctx'> 			* Shuttle SN25P</div><div class='ctx'> 			* Onkyo SE-90PCI</div><div class='ctx'> 			* Onkyo SE-200PCI</div><div class='add'>+			* ESI Juli@</div><div class='add'>+			* Hercules Fortissimo IV</div><div class='add'>+			* EGO-SYS WaveTerminal 192M</div><div class='ctx'> </div><div class='ctx'>     model       - Use the given board model, one of the following:</div><div class='ctx'> 		  revo51, revo71, amp2000, prodigy71, prodigy71lt,</div><div class='del'>-		  prodigy192, aureon51, aureon71, universe, ap192,</div><div class='del'>-		  k8x800, phase22, phase28, ms300, av710, se200pci,</div><div class='del'>-		  se90pci</div><div class='add'>+		  prodigy71xt, prodigy71hifi, prodigyhd2, prodigy192,</div><div class='add'>+		  juli, aureon51, aureon71, universe, ap192, k8x800,</div><div class='add'>+		  phase22, phase28, ms300, av710, se200pci, se90pci,</div><div class='add'>+		  fortissimo4, sn25p, WT192M</div><div class='ctx'> </div><div class='ctx'>     This module supports multiple cards and autoprobe.</div><div class='ctx'> </div><div class='hunk'>@@ -1255,7 +1282,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.</div><div class='ctx'> </div><div class='ctx'>     Module for AC'97 motherboards from Intel and compatibles.</div><div class='ctx'> 			* Intel i810/810E, i815, i820, i830, i84x, MX440</div><div class='del'>-				ICH5, ICH6, ICH7, ESB2</div><div class='add'>+				ICH5, ICH6, ICH7, 6300ESB, ESB2</div><div class='ctx'> 			* SiS 7012 (SiS 735)</div><div class='ctx'> 			* NVidia NForce, NForce2, NForce3, MCP04, CK804</div><div class='ctx'> 				 CK8, CK8S, MCP501</div><div class='hunk'>@@ -1951,6 +1978,8 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.</div><div class='ctx'> 			* CHIC  True Sound 4Dwave</div><div class='ctx'> 			* Shark  Predator4D-PCI</div><div class='ctx'> 			* Jaton  SonicWave 4D</div><div class='add'>+			* SiS SI7018 PCI Audio</div><div class='add'>+			* Hoontech SoundTrack Digital 4DWave NX</div><div class='ctx'> </div><div class='ctx'>     pcm_channels   - max channels (voices) reserved for PCM</div><div class='ctx'>     wavetable_size - max wavetable size in kB (4-?kb)</div><div class='hunk'>@@ -1966,12 +1995,25 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.</div><div class='ctx'> </div><div class='ctx'>     vid             - Vendor ID for the device (optional)</div><div class='ctx'>     pid             - Product ID for the device (optional)</div><div class='add'>+    nrpacks	    - Max. number of packets per URB (default: 8)</div><div class='add'>+    async_unlink    - Use async unlink mode (default: yes)</div><div class='ctx'>     device_setup    - Device specific magic number (optional)</div><div class='ctx'>                     - Influence depends on the device</div><div class='ctx'>                     - Default: 0x0000 </div><div class='add'>+    ignore_ctl_error - Ignore any USB-controller regarding mixer</div><div class='add'>+    		       interface (default: no)</div><div class='ctx'> </div><div class='ctx'>     This module supports multiple devices, autoprobe and hotplugging.</div><div class='ctx'> </div><div class='add'>+    NB: nrpacks parameter can be modified dynamically via sysfs.</div><div class='add'>+        Don't put the value over 20.  Changing via sysfs has no sanity</div><div class='add'>+	check.</div><div class='add'>+    NB: async_unlink=0 would cause Oops.  It remains just for</div><div class='add'>+        debugging purpose (if any).</div><div class='add'>+    NB: ignore_ctl_error=1 may help when you get an error at accessing</div><div class='add'>+        the mixer element such as URB error -22.  This happens on some</div><div class='add'>+        buggy USB device or the controller.</div><div class='add'>+</div><div class='ctx'>   Module snd-usb-caiaq</div><div class='ctx'>   --------------------</div><div class='ctx'> </div><div class='hunk'>@@ -2078,7 +2120,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.</div><div class='ctx'>   -------------------</div><div class='ctx'> </div><div class='ctx'>     Module for sound cards based on the Asus AV100/AV200 chips,</div><div class='del'>-    i.e., Xonar D1, DX, D2 and D2X.</div><div class='add'>+    i.e., Xonar D1, DX, D2, D2X and HDAV1.3 (Deluxe).</div><div class='ctx'> </div><div class='ctx'>     This module supports autoprobe and multiple cards.</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl b/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl<br/>index e13c4e67029f..87a7c07ab658 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl</a></div><div class='hunk'>@@ -5073,8 +5073,7 @@ struct _snd_pcm_runtime {</div><div class='ctx'>       with &lt;constant&gt;SNDRV_DMA_TYPE_CONTINUOUS&lt;/constant&gt; type and the</div><div class='ctx'>       &lt;function&gt;snd_dma_continuous_data(GFP_KERNEL)&lt;/function&gt; device pointer,</div><div class='ctx'>       where &lt;constant&gt;GFP_KERNEL&lt;/constant&gt; is the kernel allocation flag to</div><div class='del'>-      use.  For the SBUS, &lt;constant&gt;SNDRV_DMA_TYPE_SBUS&lt;/constant&gt; and</div><div class='del'>-      &lt;function&gt;snd_dma_sbus_data(sbus_dev)&lt;/function&gt; are used instead.</div><div class='add'>+      use.</div><div class='ctx'>       For the PCI scatter-gather buffers, use</div><div class='ctx'>       &lt;constant&gt;SNDRV_DMA_TYPE_DEV_SG&lt;/constant&gt; with</div><div class='ctx'>       &lt;function&gt;snd_dma_pci_data(pci)&lt;/function&gt;</div><div class='hunk'>@@ -6135,44 +6134,58 @@ struct _snd_pcm_runtime {</div><div class='ctx'>       &lt;/para&gt;</div><div class='ctx'>     &lt;/section&gt;</div><div class='ctx'> </div><div class='del'>-    &lt;section id="useful-functions-snd-assert"&gt;</div><div class='del'>-      &lt;title&gt;&lt;function&gt;snd_assert()&lt;/function&gt;&lt;/title&gt;</div><div class='add'>+    &lt;section id="useful-functions-snd-bug"&gt;</div><div class='add'>+      &lt;title&gt;&lt;function&gt;snd_BUG()&lt;/function&gt;&lt;/title&gt;</div><div class='ctx'>       &lt;para&gt;</div><div class='del'>-        &lt;function&gt;snd_assert()&lt;/function&gt; macro is similar with the</div><div class='del'>-      normal &lt;function&gt;assert()&lt;/function&gt; macro. For example,  </div><div class='add'>+        It shows the &lt;computeroutput&gt;BUG?&lt;/computeroutput&gt; message and</div><div class='add'>+      stack trace as well as &lt;function&gt;snd_BUG_ON&lt;/function&gt; at the point.</div><div class='add'>+      It's useful to show that a fatal error happens there. </div><div class='add'>+      &lt;/para&gt;</div><div class='add'>+      &lt;para&gt;</div><div class='add'>+	 When no debug flag is set, this macro is ignored. </div><div class='add'>+      &lt;/para&gt;</div><div class='add'>+    &lt;/section&gt;</div><div class='add'>+</div><div class='add'>+    &lt;section id="useful-functions-snd-bug-on"&gt;</div><div class='add'>+      &lt;title&gt;&lt;function&gt;snd_BUG_ON()&lt;/function&gt;&lt;/title&gt;</div><div class='add'>+      &lt;para&gt;</div><div class='add'>+        &lt;function&gt;snd_BUG_ON()&lt;/function&gt; macro is similar with</div><div class='add'>+	&lt;function&gt;WARN_ON()&lt;/function&gt; macro. For example,  </div><div class='ctx'> </div><div class='ctx'>         &lt;informalexample&gt;</div><div class='ctx'>           &lt;programlisting&gt;</div><div class='ctx'> &lt;![CDATA[</div><div class='del'>-  snd_assert(pointer != NULL, return -EINVAL);</div><div class='add'>+  snd_BUG_ON(!pointer);</div><div class='ctx'> ]]&gt;</div><div class='ctx'>           &lt;/programlisting&gt;</div><div class='ctx'>         &lt;/informalexample&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='ctx'> </div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The first argument is the expression to evaluate, and the</div><div class='del'>-      second argument is the action if it fails. When</div><div class='del'>-      &lt;constant&gt;CONFIG_SND_DEBUG&lt;/constant&gt;, is set, it will show an</div><div class='del'>-      error message such as &lt;computeroutput&gt;BUG? (xxx)&lt;/computeroutput&gt;</div><div class='del'>-      together with stack trace.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	 When no debug flag is set, this macro is ignored. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/section&gt;</div><div class='add'>+	or it can be used as the condition,</div><div class='add'>+        &lt;informalexample&gt;</div><div class='add'>+          &lt;programlisting&gt;</div><div class='add'>+&lt;![CDATA[</div><div class='add'>+  if (snd_BUG_ON(non_zero_is_bug))</div><div class='add'>+          return -EINVAL;</div><div class='add'>+]]&gt;</div><div class='add'>+          &lt;/programlisting&gt;</div><div class='add'>+        &lt;/informalexample&gt;</div><div class='ctx'> </div><div class='del'>-    &lt;section id="useful-functions-snd-bug"&gt;</div><div class='del'>-      &lt;title&gt;&lt;function&gt;snd_BUG()&lt;/function&gt;&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        It shows the &lt;computeroutput&gt;BUG?&lt;/computeroutput&gt; message and</div><div class='del'>-      stack trace as well as &lt;function&gt;snd_assert&lt;/function&gt; at the point.</div><div class='del'>-      It's useful to show that a fatal error happens there. </div><div class='ctx'>       &lt;/para&gt;</div><div class='add'>+</div><div class='ctx'>       &lt;para&gt;</div><div class='del'>-	 When no debug flag is set, this macro is ignored. </div><div class='add'>+        The macro takes an conditional expression to evaluate.</div><div class='add'>+	When &lt;constant&gt;CONFIG_SND_DEBUG&lt;/constant&gt;, is set, the</div><div class='add'>+	expression is actually evaluated. If it's non-zero, it shows</div><div class='add'>+	the warning message such as</div><div class='add'>+	&lt;computeroutput&gt;BUG? (xxx)&lt;/computeroutput&gt;</div><div class='add'>+	normally followed by stack trace.  It returns the evaluated</div><div class='add'>+	value.</div><div class='add'>+	When no &lt;constant&gt;CONFIG_SND_DEBUG&lt;/constant&gt; is set, this</div><div class='add'>+	macro always returns zero.</div><div class='ctx'>       &lt;/para&gt;</div><div class='add'>+</div><div class='ctx'>     &lt;/section&gt;</div><div class='add'>+</div><div class='ctx'>   &lt;/chapter&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/sound/alsa/soc/dapm.txt b/Documentation/sound/alsa/soc/dapm.txt<br/>index b2ed6983f40d..46f9684d0b29 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/sound/alsa/soc/dapm.txt?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/sound/alsa/soc/dapm.txt</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/sound/alsa/soc/dapm.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/sound/alsa/soc/dapm.txt</a></div><div class='hunk'>@@ -135,11 +135,7 @@ when the Mic is inserted:-</div><div class='ctx'> </div><div class='ctx'> static int spitz_mic_bias(struct snd_soc_dapm_widget* w, int event)</div><div class='ctx'> {</div><div class='del'>-	if(SND_SOC_DAPM_EVENT_ON(event))</div><div class='del'>-		set_scoop_gpio(&amp;spitzscoop2_device.dev, SPITZ_SCP2_MIC_BIAS);</div><div class='del'>-	else</div><div class='del'>-		reset_scoop_gpio(&amp;spitzscoop2_device.dev, SPITZ_SCP2_MIC_BIAS);</div><div class='del'>-</div><div class='add'>+	gpio_set_value(SPITZ_GPIO_MIC_BIAS, SND_SOC_DAPM_EVENT_ON(event));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -269,11 +265,7 @@ powered only when the spk is in use.</div><div class='ctx'> /* turn speaker amplifier on/off depending on use */</div><div class='ctx'> static int corgi_amp_event(struct snd_soc_dapm_widget *w, int event)</div><div class='ctx'> {</div><div class='del'>-	if (SND_SOC_DAPM_EVENT_ON(event))</div><div class='del'>-		set_scoop_gpio(&amp;corgiscoop_device.dev, CORGI_SCP_APM_ON);</div><div class='del'>-	else</div><div class='del'>-		reset_scoop_gpio(&amp;corgiscoop_device.dev, CORGI_SCP_APM_ON);</div><div class='del'>-</div><div class='add'>+	gpio_set_value(CORGI_GPIO_APM_ON, SND_SOC_DAPM_EVENT_ON(event));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/sparc/sbus_drivers.txt b/Documentation/sparc/sbus_drivers.txt<br/>deleted file mode 100644<br/>index eb1e28ad8822..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/sparc/sbus_drivers.txt?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/sparc/sbus_drivers.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,309 +0,0 @@</div><div class='del'>-</div><div class='del'>-		Writing SBUS Drivers</div><div class='del'>-</div><div class='del'>-	    David S. Miller (davem@redhat.com)</div><div class='del'>-</div><div class='del'>-	The SBUS driver interfaces of the Linux kernel have been</div><div class='del'>-revamped completely for 2.4.x for several reasons.  Foremost were</div><div class='del'>-performance and complexity concerns.  This document details these</div><div class='del'>-new interfaces and how they are used to write an SBUS device driver.</div><div class='del'>-</div><div class='del'>-	SBUS drivers need to include &lt;asm/sbus.h&gt; to get access</div><div class='del'>-to functions and structures described here.</div><div class='del'>-</div><div class='del'>-		Probing and Detection</div><div class='del'>-</div><div class='del'>-	Each SBUS device inside the machine is described by a</div><div class='del'>-structure called "struct sbus_dev".  Likewise, each SBUS bus</div><div class='del'>-found in the system is described by a "struct sbus_bus".  For</div><div class='del'>-each SBUS bus, the devices underneath are hung in a tree-like</div><div class='del'>-fashion off of the bus structure.</div><div class='del'>-</div><div class='del'>-	The SBUS device structure contains enough information</div><div class='del'>-for you to implement your device probing algorithm and obtain</div><div class='del'>-the bits necessary to run your device.  The most commonly</div><div class='del'>-used members of this structure, and their typical usage,</div><div class='del'>-will be detailed below.</div><div class='del'>-</div><div class='del'>-	Here is a piece of skeleton code for performing a device</div><div class='del'>-probe in an SBUS driver under Linux:</div><div class='del'>-</div><div class='del'>-	static int __devinit mydevice_probe_one(struct sbus_dev *sdev)</div><div class='del'>-	{</div><div class='del'>-		struct mysdevice *mp = kzalloc(sizeof(*mp), GFP_KERNEL);</div><div class='del'>-</div><div class='del'>-		if (!mp)</div><div class='del'>-			return -ENODEV;</div><div class='del'>-</div><div class='del'>-		...</div><div class='del'>-		dev_set_drvdata(&amp;sdev-&gt;ofdev.dev, mp);</div><div class='del'>-		return 0;</div><div class='del'>-		...</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	static int __devinit mydevice_probe(struct of_device *dev,</div><div class='del'>-				            const struct of_device_id *match)</div><div class='del'>-	{</div><div class='del'>-		struct sbus_dev *sdev = to_sbus_device(&amp;dev-&gt;dev);</div><div class='del'>-</div><div class='del'>-		return mydevice_probe_one(sdev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	static int __devexit mydevice_remove(struct of_device *dev)</div><div class='del'>-	{</div><div class='del'>-		struct sbus_dev *sdev = to_sbus_device(&amp;dev-&gt;dev);</div><div class='del'>-		struct mydevice *mp = dev_get_drvdata(&amp;dev-&gt;dev);</div><div class='del'>-</div><div class='del'>-		return mydevice_remove_one(sdev, mp);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	static struct of_device_id mydevice_match[] = {</div><div class='del'>-		{</div><div class='del'>-			.name = "mydevice",</div><div class='del'>-		},</div><div class='del'>-		{},</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	MODULE_DEVICE_TABLE(of, mydevice_match);</div><div class='del'>-</div><div class='del'>-	static struct of_platform_driver mydevice_driver = {</div><div class='del'>-		.match_table	= mydevice_match,</div><div class='del'>-		.probe		= mydevice_probe,</div><div class='del'>-		.remove		= __devexit_p(mydevice_remove),</div><div class='del'>-		.driver		= {</div><div class='del'>-			.name		= "mydevice",</div><div class='del'>-		},</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	static int __init mydevice_init(void)</div><div class='del'>-	{</div><div class='del'>-		return of_register_driver(&amp;mydevice_driver, &amp;sbus_bus_type);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	static void __exit mydevice_exit(void)</div><div class='del'>-	{</div><div class='del'>-		of_unregister_driver(&amp;mydevice_driver);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	module_init(mydevice_init);</div><div class='del'>-	module_exit(mydevice_exit);</div><div class='del'>-</div><div class='del'>-	The mydevice_match table is a series of entries which</div><div class='del'>-describes what SBUS devices your driver is meant for.  In the</div><div class='del'>-simplest case you specify a string for the 'name' field.  Every</div><div class='del'>-SBUS device with a 'name' property matching your string will</div><div class='del'>-be passed one-by-one to your .probe method.</div><div class='del'>-</div><div class='del'>-	You should store away your device private state structure</div><div class='del'>-pointer in the drvdata area so that you can retrieve it later on</div><div class='del'>-in your .remove method.</div><div class='del'>-</div><div class='del'>-	Any memory allocated, registers mapped, IRQs registered,</div><div class='del'>-etc. must be undone by your .remove method so that all resources</div><div class='del'>-of your device are released by the time it returns.</div><div class='del'>-</div><div class='del'>-	You should _NOT_ use the for_each_sbus(), for_each_sbusdev(),</div><div class='del'>-and for_all_sbusdev() interfaces.  They are deprecated, will be</div><div class='del'>-removed, and no new driver should reference them ever.</div><div class='del'>-</div><div class='del'>-		Mapping and Accessing I/O Registers</div><div class='del'>-</div><div class='del'>-	Each SBUS device structure contains an array of descriptors</div><div class='del'>-which describe each register set. We abuse struct resource for that.</div><div class='del'>-They each correspond to the "reg" properties provided by the OBP firmware.</div><div class='del'>-</div><div class='del'>-	Before you can access your device's registers you must map</div><div class='del'>-them.  And later if you wish to shutdown your driver (for module</div><div class='del'>-unload or similar) you must unmap them.  You must treat them as</div><div class='del'>-a resource, which you allocate (map) before using and free up</div><div class='del'>-(unmap) when you are done with it.</div><div class='del'>-</div><div class='del'>-	The mapping information is stored in an opaque value</div><div class='del'>-typed as an "unsigned long".  This is the type of the return value</div><div class='del'>-of the mapping interface, and the arguments to the unmapping</div><div class='del'>-interface.  Let's say you want to map the first set of registers.</div><div class='del'>-Perhaps part of your driver software state structure looks like:</div><div class='del'>-</div><div class='del'>-	struct mydevice {</div><div class='del'>-		unsigned long control_regs;</div><div class='del'>-	   ...</div><div class='del'>-		struct sbus_dev *sdev;</div><div class='del'>-	   ...</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	At initialization time you then use the sbus_ioremap</div><div class='del'>-interface to map in your registers, like so:</div><div class='del'>-</div><div class='del'>-	static void init_one_mydevice(struct sbus_dev *sdev)</div><div class='del'>-	{</div><div class='del'>-		struct mydevice *mp;</div><div class='del'>-		...</div><div class='del'>-</div><div class='del'>-		mp-&gt;control_regs = sbus_ioremap(&amp;sdev-&gt;resource[0], 0,</div><div class='del'>-					CONTROL_REGS_SIZE, "mydevice regs");</div><div class='del'>-		if (!mp-&gt;control_regs) {</div><div class='del'>-			/* Failure, cleanup and return. */</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	Second argument to sbus_ioremap is an offset for</div><div class='del'>-cranky devices with broken OBP PROM. The sbus_ioremap uses only</div><div class='del'>-a start address and flags from the resource structure.</div><div class='del'>-Therefore it is possible to use the same resource to map</div><div class='del'>-several sets of registers or even to fabricate a resource</div><div class='del'>-structure if driver gets physical address from some private place.</div><div class='del'>-This practice is discouraged though. Use whatever OBP PROM</div><div class='del'>-provided to you.</div><div class='del'>-</div><div class='del'>-	And here is how you might unmap these registers later at</div><div class='del'>-driver shutdown or module unload time, using the sbus_iounmap</div><div class='del'>-interface:</div><div class='del'>-</div><div class='del'>-	static void mydevice_unmap_regs(struct mydevice *mp)</div><div class='del'>-	{</div><div class='del'>-		sbus_iounmap(mp-&gt;control_regs, CONTROL_REGS_SIZE);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	Finally, to actually access your registers there are 6</div><div class='del'>-interface routines at your disposal.  Accesses are byte (8 bit),</div><div class='del'>-word (16 bit), or longword (32 bit) sized.  Here they are:</div><div class='del'>-</div><div class='del'>-	u8 sbus_readb(unsigned long reg)		/* read byte */</div><div class='del'>-	u16 sbus_readw(unsigned long reg)		/* read word */</div><div class='del'>-	u32 sbus_readl(unsigned long reg)		/* read longword */</div><div class='del'>-	void sbus_writeb(u8 value, unsigned long reg)	/* write byte */</div><div class='del'>-	void sbus_writew(u16 value, unsigned long reg)	/* write word */</div><div class='del'>-	void sbus_writel(u32 value, unsigned long reg)	/* write longword */</div><div class='del'>-</div><div class='del'>-	So, let's say your device has a control register of some sort</div><div class='del'>-at offset zero.  The following might implement resetting your device:</div><div class='del'>-</div><div class='del'>-	#define CONTROL		0x00UL</div><div class='del'>-</div><div class='del'>-	#define CONTROL_RESET	0x00000001	/* Reset hardware */</div><div class='del'>-</div><div class='del'>-	static void mydevice_reset(struct mydevice *mp)</div><div class='del'>-	{</div><div class='del'>-		sbus_writel(CONTROL_RESET, mp-&gt;regs + CONTROL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	Or perhaps there is a data port register at an offset of</div><div class='del'>-16 bytes which allows you to read bytes from a fifo in the device:</div><div class='del'>-</div><div class='del'>-	#define DATA		0x10UL</div><div class='del'>-</div><div class='del'>-	static u8 mydevice_get_byte(struct mydevice *mp)</div><div class='del'>-	{</div><div class='del'>-		return sbus_readb(mp-&gt;regs + DATA);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	It's pretty straightforward, and clueful readers may have</div><div class='del'>-noticed that these interfaces mimick the PCI interfaces of the</div><div class='del'>-Linux kernel.  This was not by accident.</div><div class='del'>-</div><div class='del'>-	WARNING:</div><div class='del'>-</div><div class='del'>-		DO NOT try to treat these opaque register mapping</div><div class='del'>-		values as a memory mapped pointer to some structure</div><div class='del'>-		which you can dereference.</div><div class='del'>-</div><div class='del'>-		It may be memory mapped, it may not be.  In fact it</div><div class='del'>-		could be a physical address, or it could be the time</div><div class='del'>-		of day xor'd with 0xdeadbeef.  :-)</div><div class='del'>-</div><div class='del'>-		Whatever it is, it's an implementation detail.  The</div><div class='del'>-		interface was done this way to shield the driver</div><div class='del'>-		author from such complexities.</div><div class='del'>-</div><div class='del'>-			Doing DVMA</div><div class='del'>-</div><div class='del'>-	SBUS devices can perform DMA transactions in a way similar</div><div class='del'>-to PCI but dissimilar to ISA, e.g. DMA masters supply address.</div><div class='del'>-In contrast to PCI, however, that address (a bus address) is</div><div class='del'>-translated by IOMMU before a memory access is performed and therefore</div><div class='del'>-it is virtual. Sun calls this procedure DVMA.</div><div class='del'>-</div><div class='del'>-	Linux supports two styles of using SBUS DVMA: "consistent memory"</div><div class='del'>-and "streaming DVMA". CPU view of consistent memory chunk is, well,</div><div class='del'>-consistent with a view of a device. Think of it as an uncached memory.</div><div class='del'>-Typically this way of doing DVMA is not very fast and drivers use it</div><div class='del'>-mostly for control blocks or queues. On some CPUs we cannot flush or</div><div class='del'>-invalidate individual pages or cache lines and doing explicit flushing</div><div class='del'>-over ever little byte in every control block would be wasteful.</div><div class='del'>-</div><div class='del'>-Streaming DVMA is a preferred way to transfer large amounts of data.</div><div class='del'>-This process works in the following way:</div><div class='del'>-1. a CPU stops accessing a certain part of memory,</div><div class='del'>-   flushes its caches covering that memory;</div><div class='del'>-2. a device does DVMA accesses, then posts an interrupt;</div><div class='del'>-3. CPU invalidates its caches and starts to access the memory.</div><div class='del'>-</div><div class='del'>-A single streaming DVMA operation can touch several discontiguous</div><div class='del'>-regions of a virtual bus address space. This is called a scatter-gather</div><div class='del'>-DVMA.</div><div class='del'>-</div><div class='del'>-[TBD: Why do not we neither Solaris attempt to map disjoint pages</div><div class='del'>-into a single virtual chunk with the help of IOMMU, so that non SG</div><div class='del'>-DVMA masters would do SG? It'd be very helpful for RAID.]</div><div class='del'>-</div><div class='del'>-	In order to perform a consistent DVMA a driver does something</div><div class='del'>-like the following:</div><div class='del'>-</div><div class='del'>-	char *mem;		/* Address in the CPU space */</div><div class='del'>-	u32 busa;		/* Address in the SBus space */</div><div class='del'>-</div><div class='del'>-	mem = (char *) sbus_alloc_consistent(sdev, MYMEMSIZE, &amp;busa);</div><div class='del'>-</div><div class='del'>-	Then mem is used when CPU accesses this memory and u32</div><div class='del'>-is fed to the device so that it can do DVMA. This is typically</div><div class='del'>-done with an sbus_writel() into some device register.</div><div class='del'>-</div><div class='del'>-	Do not forget to free the DVMA resources once you are done:</div><div class='del'>-</div><div class='del'>-	sbus_free_consistent(sdev, MYMEMSIZE, mem, busa);</div><div class='del'>-</div><div class='del'>-	Streaming DVMA is more interesting. First you allocate some</div><div class='del'>-memory suitable for it or pin down some user pages. Then it all works</div><div class='del'>-like this:</div><div class='del'>-</div><div class='del'>-	char *mem = argumen1;</div><div class='del'>-	unsigned int size = argument2;</div><div class='del'>-	u32 busa;		/* Address in the SBus space */</div><div class='del'>-</div><div class='del'>-	*mem = 1;		/* CPU can access */</div><div class='del'>-	busa = sbus_map_single(sdev, mem, size);</div><div class='del'>-	if (busa == 0) .......</div><div class='del'>-</div><div class='del'>-	/* Tell the device to use busa here */</div><div class='del'>-	/* CPU cannot access the memory without sbus_dma_sync_single() */</div><div class='del'>-</div><div class='del'>-	sbus_unmap_single(sdev, busa, size);</div><div class='del'>-	if (*mem == 0) ....	/* CPU can access again */</div><div class='del'>-</div><div class='del'>-	It is possible to retain mappings and ask the device to</div><div class='del'>-access data again and again without calling sbus_unmap_single.</div><div class='del'>-However, CPU caches must be invalidated with sbus_dma_sync_single</div><div class='del'>-before such access.</div><div class='del'>-</div><div class='del'>-[TBD but what about writeback caches here... do we have any?]</div><div class='del'>-</div><div class='del'>-	There is an equivalent set of functions doing the same thing</div><div class='del'>-only with several memory segments at once for devices capable of</div><div class='del'>-scatter-gather transfers. Use the Source, Luke.</div><div class='del'>-</div><div class='del'>-			Examples</div><div class='del'>-</div><div class='del'>-	drivers/net/sunhme.c</div><div class='del'>-	This is a complicated driver which illustrates many concepts</div><div class='del'>-discussed above and plus it handles both PCI and SBUS boards.</div><div class='del'>-</div><div class='del'>-	drivers/scsi/esp.c</div><div class='del'>-	Check it out for scatter-gather DVMA.</div><div class='del'>-</div><div class='del'>-	drivers/sbus/char/bpp.c</div><div class='del'>-	A non-DVMA device.</div><div class='del'>-</div><div class='del'>-	drivers/net/sunlance.c</div><div class='del'>-	Lance driver abuses consistent mappings for data transfer.</div><div class='del'>-It is a nifty trick which we do not particularly recommend...</div><div class='del'>-Just check it out and know that it's legal.</div><div class='head'>diff --git a/Documentation/spi/pxa2xx b/Documentation/spi/pxa2xx<br/>index bbe8dee681a5..6bb916d57c95 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/spi/pxa2xx?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/spi/pxa2xx</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/spi/pxa2xx?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/spi/pxa2xx</a></div><div class='hunk'>@@ -96,7 +96,7 @@ Each slave device attached to the PXA must provide slave specific configuration</div><div class='ctx'> information via the structure "pxa2xx_spi_chip" found in</div><div class='ctx'> "arch/arm/mach-pxa/include/mach/pxa2xx_spi.h".  The pxa2xx_spi master controller driver</div><div class='ctx'> will uses the configuration whenever the driver communicates with the slave</div><div class='del'>-device.</div><div class='add'>+device. All fields are optional.</div><div class='ctx'> </div><div class='ctx'> struct pxa2xx_spi_chip {</div><div class='ctx'> 	u8 tx_threshold;</div><div class='hunk'>@@ -112,14 +112,17 @@ used to configure the SSP hardware fifo.  These fields are critical to the</div><div class='ctx'> performance of pxa2xx_spi driver and misconfiguration will result in rx</div><div class='ctx'> fifo overruns (especially in PIO mode transfers). Good default values are</div><div class='ctx'> </div><div class='del'>-	.tx_threshold = 12,</div><div class='del'>-	.rx_threshold = 4,</div><div class='add'>+	.tx_threshold = 8,</div><div class='add'>+	.rx_threshold = 8,</div><div class='add'>+</div><div class='add'>+The range is 1 to 16 where zero indicates "use default".</div><div class='ctx'> </div><div class='ctx'> The "pxa2xx_spi_chip.dma_burst_size" field is used to configure PXA2xx DMA</div><div class='ctx'> engine and is related the "spi_device.bits_per_word" field.  Read and understand</div><div class='ctx'> the PXA2xx "Developer Manual" sections on the DMA controller and SSP Controllers</div><div class='ctx'> to determine the correct value. An SSP configured for byte-wide transfers would</div><div class='del'>-use a value of 8.</div><div class='add'>+use a value of 8. The driver will determine a reasonable default if</div><div class='add'>+dma_burst_size == 0.</div><div class='ctx'> </div><div class='ctx'> The "pxa2xx_spi_chip.timeout" fields is used to efficiently handle</div><div class='ctx'> trailing bytes in the SSP receiver fifo.  The correct value for this field is</div><div class='hunk'>@@ -137,7 +140,13 @@ function for asserting/deasserting a slave device chip select.  If the field is</div><div class='ctx'> NULL, the pxa2xx_spi master controller driver assumes that the SSP port is</div><div class='ctx'> configured to use SSPFRM instead.</div><div class='ctx'> </div><div class='del'>-NSSP SALVE SAMPLE</div><div class='add'>+NOTE: the SPI driver cannot control the chip select if SSPFRM is used, so the</div><div class='add'>+chipselect is dropped after each spi_transfer.  Most devices need chip select</div><div class='add'>+asserted around the complete message.  Use SSPFRM as a GPIO (through cs_control)</div><div class='add'>+to accomodate these chips.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+NSSP SLAVE SAMPLE</div><div class='ctx'> -----------------</div><div class='ctx'> The pxa2xx_spi_chip structure is passed to the pxa2xx_spi driver in the</div><div class='ctx'> "spi_board_info.controller_data" field. Below is a sample configuration using</div><div class='hunk'>@@ -206,18 +215,21 @@ static void __init streetracer_init(void)</div><div class='ctx'> </div><div class='ctx'> DMA and PIO I/O Support</div><div class='ctx'> -----------------------</div><div class='del'>-The pxa2xx_spi driver support both DMA and interrupt driven PIO message</div><div class='del'>-transfers.  The driver defaults to PIO mode and DMA transfers must enabled by</div><div class='del'>-setting the "enable_dma" flag in the "pxa2xx_spi_master" structure and</div><div class='del'>-ensuring that the "pxa2xx_spi_chip.dma_burst_size" field is non-zero.  The DMA</div><div class='del'>-mode support both coherent and stream based DMA mappings.</div><div class='add'>+The pxa2xx_spi driver supports both DMA and interrupt driven PIO message</div><div class='add'>+transfers.  The driver defaults to PIO mode and DMA transfers must be enabled</div><div class='add'>+by setting the "enable_dma" flag in the "pxa2xx_spi_master" structure.  The DMA</div><div class='add'>+mode supports both coherent and stream based DMA mappings.</div><div class='ctx'> </div><div class='ctx'> The following logic is used to determine the type of I/O to be used on</div><div class='ctx'> a per "spi_transfer" basis:</div><div class='ctx'> </div><div class='del'>-if !enable_dma or dma_burst_size == 0 then</div><div class='add'>+if !enable_dma then</div><div class='ctx'> 	always use PIO transfers</div><div class='ctx'> </div><div class='add'>+if spi_message.len &gt; 8191 then</div><div class='add'>+	print "rate limited" warning</div><div class='add'>+	use PIO transfers</div><div class='add'>+</div><div class='ctx'> if spi_message.is_dma_mapped and rx_dma_buf != 0 and tx_dma_buf != 0 then</div><div class='ctx'> 	use coherent DMA mode</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/sysctl/kernel.txt b/Documentation/sysctl/kernel.txt<br/>index e1ff0d920a5c..bde799e06598 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/sysctl/kernel.txt?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/sysctl/kernel.txt</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/sysctl/kernel.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/sysctl/kernel.txt</a></div><div class='hunk'>@@ -369,4 +369,5 @@ can be ORed together:</div><div class='ctx'>   2 - A module was force loaded by insmod -f.</div><div class='ctx'>       Set by modutils &gt;= 2.4.9 and module-init-tools.</div><div class='ctx'>   4 - Unsafe SMP processors: SMP with CPUs not designed for SMP.</div><div class='add'>+ 64 - A module from drivers/staging was loaded.</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/timers/00-INDEX b/Documentation/timers/00-INDEX<br/>new file mode 100644<br/>index 000000000000..397dc35e1323<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/timers/00-INDEX?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/timers/00-INDEX</a></div><div class='hunk'>@@ -0,0 +1,10 @@</div><div class='add'>+00-INDEX</div><div class='add'>+	- this file</div><div class='add'>+highres.txt</div><div class='add'>+	- High resolution timers and dynamic ticks design notes</div><div class='add'>+hpet.txt</div><div class='add'>+	- High Precision Event Timer Driver for Linux</div><div class='add'>+hrtimers.txt</div><div class='add'>+	- subsystem for high-resolution kernel timers</div><div class='add'>+timer_stats.txt</div><div class='add'>+	- timer usage statistics</div><div class='head'>diff --git a/Documentation/hpet.txt b/Documentation/timers/hpet.txt<br/>index 6ad52d9dad6c..e7c09abcfab4 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/hpet.txt?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/hpet.txt</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/timers/hpet.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/timers/hpet.txt</a></div><div class='hunk'>@@ -1,21 +1,32 @@</div><div class='ctx'> 		High Precision Event Timer Driver for Linux</div><div class='ctx'> </div><div class='del'>-The High Precision Event Timer (HPET) hardware is the future replacement</div><div class='del'>-for the 8254 and Real Time Clock (RTC) periodic timer functionality.</div><div class='del'>-Each HPET can have up to 32 timers.  It is possible to configure the</div><div class='del'>-first two timers as legacy replacements for 8254 and RTC periodic timers.</div><div class='del'>-A specification done by Intel and Microsoft can be found at</div><div class='del'>-&lt;http://www.intel.com/technology/architecture/hpetspec.htm&gt;.</div><div class='add'>+The High Precision Event Timer (HPET) hardware follows a specification</div><div class='add'>+by Intel and Microsoft which can be found at</div><div class='add'>+</div><div class='add'>+	http://www.intel.com/technology/architecture/hpetspec.htm</div><div class='add'>+</div><div class='add'>+Each HPET has one fixed-rate counter (at 10+ MHz, hence "High Precision")</div><div class='add'>+and up to 32 comparators.  Normally three or more comparators are provided,</div><div class='add'>+each of which can generate oneshot interupts and at least one of which has</div><div class='add'>+additional hardware to support periodic interrupts.  The comparators are</div><div class='add'>+also called "timers", which can be misleading since usually timers are</div><div class='add'>+independent of each other ... these share a counter, complicating resets.</div><div class='add'>+</div><div class='add'>+HPET devices can support two interrupt routing modes.  In one mode, the</div><div class='add'>+comparators are additional interrupt sources with no particular system</div><div class='add'>+role.  Many x86 BIOS writers don't route HPET interrupts at all, which</div><div class='add'>+prevents use of that mode.  They support the other "legacy replacement"</div><div class='add'>+mode where the first two comparators block interrupts from 8254 timers</div><div class='add'>+and from the RTC.</div><div class='ctx'> </div><div class='ctx'> The driver supports detection of HPET driver allocation and initialization</div><div class='ctx'> of the HPET before the driver module_init routine is called.  This enables</div><div class='ctx'> platform code which uses timer 0 or 1 as the main timer to intercept HPET</div><div class='ctx'> initialization.  An example of this initialization can be found in</div><div class='del'>-arch/i386/kernel/time_hpet.c.</div><div class='add'>+arch/x86/kernel/hpet.c.</div><div class='ctx'> </div><div class='del'>-The driver provides two APIs which are very similar to the API found in</div><div class='del'>-the rtc.c driver.  There is a user space API and a kernel space API.</div><div class='del'>-An example user space program is provided below.</div><div class='add'>+The driver provides a userspace API which resembles the API found in the</div><div class='add'>+RTC driver framework.  An example user space program is provided below.</div><div class='ctx'> </div><div class='ctx'> #include &lt;stdio.h&gt;</div><div class='ctx'> #include &lt;stdlib.h&gt;</div><div class='hunk'>@@ -286,15 +297,3 @@ out:</div><div class='ctx'> </div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-The kernel API has three interfaces exported from the driver:</div><div class='del'>-</div><div class='del'>-	hpet_register(struct hpet_task *tp, int periodic)</div><div class='del'>-	hpet_unregister(struct hpet_task *tp)</div><div class='del'>-	hpet_control(struct hpet_task *tp, unsigned int cmd, unsigned long arg)</div><div class='del'>-</div><div class='del'>-The kernel module using this interface fills in the ht_func and ht_data</div><div class='del'>-members of the hpet_task structure before calling hpet_register.</div><div class='del'>-hpet_control simply vectors to the hpet_ioctl routine and has the same</div><div class='del'>-commands and respective arguments as the user API.  hpet_unregister</div><div class='del'>-is used to terminate usage of the HPET timer reserved by hpet_register.</div><div class='head'>diff --git a/Documentation/usb/anchors.txt b/Documentation/usb/anchors.txt<br/>index 5e6b64c20d25..6f24f566955a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/usb/anchors.txt?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/usb/anchors.txt</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/usb/anchors.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/usb/anchors.txt</a></div><div class='hunk'>@@ -52,6 +52,11 @@ Therefore no guarantee is made that the URBs have been unlinked when</div><div class='ctx'> the call returns. They may be unlinked later but will be unlinked in</div><div class='ctx'> finite time.</div><div class='ctx'> </div><div class='add'>+usb_scuttle_anchored_urbs()</div><div class='add'>+---------------------------</div><div class='add'>+</div><div class='add'>+All URBs of an anchor are unanchored en masse.</div><div class='add'>+</div><div class='ctx'> usb_wait_anchor_empty_timeout()</div><div class='ctx'> -------------------------------</div><div class='ctx'> </div><div class='hunk'>@@ -59,4 +64,16 @@ This function waits for all URBs associated with an anchor to finish</div><div class='ctx'> or a timeout, whichever comes first. Its return value will tell you</div><div class='ctx'> whether the timeout was reached.</div><div class='ctx'> </div><div class='add'>+usb_anchor_empty()</div><div class='add'>+------------------</div><div class='add'>+</div><div class='add'>+Returns true if no URBs are associated with an anchor. Locking</div><div class='add'>+is the caller's responsibility.</div><div class='add'>+</div><div class='add'>+usb_get_from_anchor()</div><div class='add'>+---------------------</div><div class='ctx'> </div><div class='add'>+Returns the oldest anchored URB of an anchor. The URB is unanchored</div><div class='add'>+and returned with a reference. As you may mix URBs to several</div><div class='add'>+destinations in one anchor you have no guarantee the chronologically</div><div class='add'>+first submitted URB is returned.
\ No newline at end of file</div><div class='head'>diff --git a/Documentation/usb/misc_usbsevseg.txt b/Documentation/usb/misc_usbsevseg.txt<br/>new file mode 100644<br/>index 000000000000..0f6be4f9930b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/usb/misc_usbsevseg.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/usb/misc_usbsevseg.txt</a></div><div class='hunk'>@@ -0,0 +1,46 @@</div><div class='add'>+USB 7-Segment Numeric Display</div><div class='add'>+Manufactured by Delcom Engineering</div><div class='add'>+</div><div class='add'>+Device Information</div><div class='add'>+------------------</div><div class='add'>+USB VENDOR_ID	0x0fc5</div><div class='add'>+USB PRODUCT_ID	0x1227</div><div class='add'>+Both the 6 character and 8 character displays have PRODUCT_ID,</div><div class='add'>+and according to Delcom Engineering no queryable information</div><div class='add'>+can be obtained from the device to tell them apart.</div><div class='add'>+</div><div class='add'>+Device Modes</div><div class='add'>+------------</div><div class='add'>+By default, the driver assumes the display is only 6 characters</div><div class='add'>+The mode for 6 characters is:</div><div class='add'>+	MSB 0x06; LSB 0x3f</div><div class='add'>+For the 8 character display:</div><div class='add'>+	MSB 0x08; LSB 0xff</div><div class='add'>+The device can accept "text" either in raw, hex, or ascii textmode.</div><div class='add'>+raw controls each segment manually,</div><div class='add'>+hex expects a value between 0-15 per character,</div><div class='add'>+ascii expects a value between '0'-'9' and 'A'-'F'.</div><div class='add'>+The default is ascii.</div><div class='add'>+</div><div class='add'>+Device Operation</div><div class='add'>+----------------</div><div class='add'>+1.	Turn on the device:</div><div class='add'>+	echo 1 &gt; /sys/bus/usb/.../powered</div><div class='add'>+2.	Set the device's mode:</div><div class='add'>+	echo $mode_msb &gt; /sys/bus/usb/.../mode_msb</div><div class='add'>+	echo $mode_lsb &gt; /sys/bus/usb/.../mode_lsb</div><div class='add'>+3.	Set the textmode:</div><div class='add'>+	echo $textmode &gt; /sys/bus/usb/.../textmode</div><div class='add'>+4.	set the text (for example):</div><div class='add'>+	echo "123ABC" &gt; /sys/bus/usb/.../text (ascii)</div><div class='add'>+	echo "A1B2" &gt; /sys/bus/usb/.../text (ascii)</div><div class='add'>+	echo -ne "\x01\x02\x03" &gt; /sys/bus/usb/.../text (hex)</div><div class='add'>+5.	Set the decimal places.</div><div class='add'>+	The device has either 6 or 8 decimal points.</div><div class='add'>+	to set the nth decimal place calculate 10 ** n</div><div class='add'>+	and echo it in to /sys/bus/usb/.../decimals</div><div class='add'>+	To set multiple decimals points sum up each power.</div><div class='add'>+	For example, to set the 0th and 3rd decimal place</div><div class='add'>+	echo 1001 &gt; /sys/bus/usb/.../decimals</div><div class='add'>+</div><div class='add'>+</div><div class='head'>diff --git a/Documentation/usb/power-management.txt b/Documentation/usb/power-management.txt<br/>index 9d31140e3f5b..e48ea1d51010 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/usb/power-management.txt?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/usb/power-management.txt</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/usb/power-management.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/usb/power-management.txt</a></div><div class='hunk'>@@ -350,12 +350,12 @@ without holding the mutex.</div><div class='ctx'> </div><div class='ctx'> There also are a couple of utility routines drivers can use:</div><div class='ctx'> </div><div class='del'>-	usb_autopm_enable() sets pm_usage_cnt to 1 and then calls</div><div class='del'>-	usb_autopm_set_interface(), which will attempt an autoresume.</div><div class='del'>-</div><div class='del'>-	usb_autopm_disable() sets pm_usage_cnt to 0 and then calls</div><div class='add'>+	usb_autopm_enable() sets pm_usage_cnt to 0 and then calls</div><div class='ctx'> 	usb_autopm_set_interface(), which will attempt an autosuspend.</div><div class='ctx'> </div><div class='add'>+	usb_autopm_disable() sets pm_usage_cnt to 1 and then calls</div><div class='add'>+	usb_autopm_set_interface(), which will attempt an autoresume.</div><div class='add'>+</div><div class='ctx'> The conventional usage pattern is that a driver calls</div><div class='ctx'> usb_autopm_get_interface() in its open routine and</div><div class='ctx'> usb_autopm_put_interface() in its close or release routine.  But</div><div class='head'>diff --git a/Documentation/video4linux/CARDLIST.au0828 b/Documentation/video4linux/CARDLIST.au0828<br/>index aa05e5bb22fb..d5cb4ea287b2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/video4linux/CARDLIST.au0828?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/video4linux/CARDLIST.au0828</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/video4linux/CARDLIST.au0828?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/video4linux/CARDLIST.au0828</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'>   0 -&gt; Unknown board                            (au0828)</div><div class='del'>-  1 -&gt; Hauppauge HVR950Q                        (au0828)        [2040:7200,2040:7210,2040:7217,2040:721b,2040:721f,2040:7280,0fd9:0008]</div><div class='add'>+  1 -&gt; Hauppauge HVR950Q                        (au0828)        [2040:7200,2040:7210,2040:7217,2040:721b,2040:721e,2040:721f,2040:7280,0fd9:0008]</div><div class='ctx'>   2 -&gt; Hauppauge HVR850                         (au0828)        [2040:7240]</div><div class='ctx'>   3 -&gt; DViCO FusionHDTV USB                     (au0828)        [0fe9:d620]</div><div class='ctx'>   4 -&gt; Hauppauge HVR950Q rev xxF8               (au0828)        [2040:7201,2040:7211,2040:7281]</div><div class='head'>diff --git a/Documentation/video4linux/CARDLIST.bttv b/Documentation/video4linux/CARDLIST.bttv<br/>index f32efb6fb12c..60ba66836038 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/video4linux/CARDLIST.bttv?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/video4linux/CARDLIST.bttv</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/video4linux/CARDLIST.bttv?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/video4linux/CARDLIST.bttv</a></div><div class='hunk'>@@ -150,3 +150,4 @@</div><div class='ctx'> 149 -&gt; Typhoon TV-Tuner PCI (50684)</div><div class='ctx'> 150 -&gt; Geovision GV-600                                    [008a:763c]</div><div class='ctx'> 151 -&gt; Kozumi KTV-01C</div><div class='add'>+152 -&gt; Encore ENL TV-FM-2                                  [1000:1801]</div><div class='head'>diff --git a/Documentation/video4linux/CARDLIST.cx23885 b/Documentation/video4linux/CARDLIST.cx23885<br/>index f0e613ba55b8..64823ccacd69 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/video4linux/CARDLIST.cx23885?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/video4linux/CARDLIST.cx23885</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/video4linux/CARDLIST.cx23885?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/video4linux/CARDLIST.cx23885</a></div><div class='hunk'>@@ -9,3 +9,5 @@</div><div class='ctx'>   8 -&gt; Hauppauge WinTV-HVR1700                             [0070:8101]</div><div class='ctx'>   9 -&gt; Hauppauge WinTV-HVR1400                             [0070:8010]</div><div class='ctx'>  10 -&gt; DViCO FusionHDTV7 Dual Express                      [18ac:d618]</div><div class='add'>+ 11 -&gt; DViCO FusionHDTV DVB-T Dual Express                 [18ac:db78]</div><div class='add'>+ 12 -&gt; Leadtek Winfast PxDVR3200 H                         [107d:6681]</div><div class='head'>diff --git a/Documentation/video4linux/CARDLIST.cx88 b/Documentation/video4linux/CARDLIST.cx88<br/>index 7cf5685d3645..a5227e308f4a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/video4linux/CARDLIST.cx88?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/video4linux/CARDLIST.cx88</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/video4linux/CARDLIST.cx88?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/video4linux/CARDLIST.cx88</a></div><div class='hunk'>@@ -66,3 +66,11 @@</div><div class='ctx'>  65 -&gt; DViCO FusionHDTV 7 Gold                             [18ac:d610]</div><div class='ctx'>  66 -&gt; Prolink Pixelview MPEG 8000GT                       [1554:4935]</div><div class='ctx'>  67 -&gt; Kworld PlusTV HD PCI 120 (ATSC 120)                 [17de:08c1]</div><div class='add'>+ 68 -&gt; Hauppauge WinTV-HVR4000 DVB-S/S2/T/Hybrid           [0070:6900,0070:6904,0070:6902]</div><div class='add'>+ 69 -&gt; Hauppauge WinTV-HVR4000(Lite) DVB-S/S2              [0070:6905,0070:6906]</div><div class='add'>+ 70 -&gt; TeVii S460 DVB-S/S2                                 [d460:9022]</div><div class='add'>+ 71 -&gt; Omicom SS4 DVB-S/S2 PCI                             [A044:2011]</div><div class='add'>+ 72 -&gt; TBS 8920 DVB-S/S2                                   [8920:8888]</div><div class='add'>+ 73 -&gt; TeVii S420 DVB-S                                    [d420:9022]</div><div class='add'>+ 74 -&gt; Prolink Pixelview Global Extreme                    [1554:4976]</div><div class='add'>+ 75 -&gt; PROF 7300 DVB-S/S2                                  [B033:3033]</div><div class='head'>diff --git a/Documentation/video4linux/CARDLIST.em28xx b/Documentation/video4linux/CARDLIST.em28xx<br/>index 53449cb99b17..187cc48d0924 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/video4linux/CARDLIST.em28xx?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/video4linux/CARDLIST.em28xx</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/video4linux/CARDLIST.em28xx?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/video4linux/CARDLIST.em28xx</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'>   0 -&gt; Unknown EM2800 video grabber             (em2800)        [eb1a:2800]</div><div class='del'>-  1 -&gt; Unknown EM2750/28xx video grabber        (em2820/em2840) [eb1a:2820,eb1a:2821,eb1a:2860,eb1a:2861,eb1a:2870,eb1a:2881,eb1a:2883]</div><div class='add'>+  1 -&gt; Unknown EM2750/28xx video grabber        (em2820/em2840) [eb1a:2820,eb1a:2860,eb1a:2861,eb1a:2870,eb1a:2881,eb1a:2883]</div><div class='ctx'>   2 -&gt; Terratec Cinergy 250 USB                 (em2820/em2840) [0ccd:0036]</div><div class='ctx'>   3 -&gt; Pinnacle PCTV USB 2                      (em2820/em2840) [2304:0208]</div><div class='ctx'>   4 -&gt; Hauppauge WinTV USB 2                    (em2820/em2840) [2040:4200,2040:4201]</div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'>  11 -&gt; Terratec Hybrid XS                       (em2880)        [0ccd:0042]</div><div class='ctx'>  12 -&gt; Kworld PVR TV 2800 RF                    (em2820/em2840)</div><div class='ctx'>  13 -&gt; Terratec Prodigy XS                      (em2880)        [0ccd:0047]</div><div class='del'>- 14 -&gt; Pixelview Prolink PlayTV USB 2.0         (em2820/em2840)</div><div class='add'>+ 14 -&gt; Pixelview Prolink PlayTV USB 2.0         (em2820/em2840) [eb1a:2821]</div><div class='ctx'>  15 -&gt; V-Gear PocketTV                          (em2800)</div><div class='ctx'>  16 -&gt; Hauppauge WinTV HVR 950                  (em2883)        [2040:6513,2040:6517,2040:651b,2040:651f]</div><div class='ctx'>  17 -&gt; Pinnacle PCTV HD Pro Stick               (em2880)        [2304:0227]</div><div class='head'>diff --git a/Documentation/video4linux/CARDLIST.saa7134 b/Documentation/video4linux/CARDLIST.saa7134<br/>index 39868af9cf9f..dc67eef38ff9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/video4linux/CARDLIST.saa7134?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/video4linux/CARDLIST.saa7134</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/video4linux/CARDLIST.saa7134?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/video4linux/CARDLIST.saa7134</a></div><div class='hunk'>@@ -76,7 +76,7 @@</div><div class='ctx'>  75 -&gt; AVerMedia AVerTVHD MCE A180              [1461:1044]</div><div class='ctx'>  76 -&gt; SKNet MonsterTV Mobile                   [1131:4ee9]</div><div class='ctx'>  77 -&gt; Pinnacle PCTV 40i/50i/110i (saa7133)     [11bd:002e]</div><div class='del'>- 78 -&gt; ASUSTeK P7131 Dual                       [1043:4862,1043:4857]</div><div class='add'>+ 78 -&gt; ASUSTeK P7131 Dual                       [1043:4862]</div><div class='ctx'>  79 -&gt; Sedna/MuchTV PC TV Cardbus TV/Radio (ITO25 Rev:2B)</div><div class='ctx'>  80 -&gt; ASUS Digimatrix TV                       [1043:0210]</div><div class='ctx'>  81 -&gt; Philips Tiger reference design           [1131:2018]</div><div class='hunk'>@@ -145,3 +145,9 @@</div><div class='ctx'> 144 -&gt; Beholder BeholdTV M6 Extra               [5ace:6193]</div><div class='ctx'> 145 -&gt; AVerMedia MiniPCI DVB-T Hybrid M103      [1461:f636]</div><div class='ctx'> 146 -&gt; ASUSTeK P7131 Analog</div><div class='add'>+147 -&gt; Asus Tiger 3in1                          [1043:4878]</div><div class='add'>+148 -&gt; Encore ENLTV-FM v5.3                     [1a7f:2008]</div><div class='add'>+149 -&gt; Avermedia PCI pure analog (M135A)        [1461:f11d]</div><div class='add'>+150 -&gt; Zogis Real Angel 220</div><div class='add'>+151 -&gt; ADS Tech Instant HDTV                    [1421:0380]</div><div class='add'>+152 -&gt; Asus Tiger Rev:1.00                      [1043:4857]</div><div class='head'>diff --git a/Documentation/video4linux/CARDLIST.tuner b/Documentation/video4linux/CARDLIST.tuner<br/>index 0e2394695bb8..691d2f37dc57 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/video4linux/CARDLIST.tuner?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/video4linux/CARDLIST.tuner</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/video4linux/CARDLIST.tuner?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/video4linux/CARDLIST.tuner</a></div><div class='hunk'>@@ -74,3 +74,5 @@ tuner=72 - Thomson FE6600</div><div class='ctx'> tuner=73 - Samsung TCPG 6121P30A</div><div class='ctx'> tuner=75 - Philips TEA5761 FM Radio</div><div class='ctx'> tuner=76 - Xceive 5000 tuner</div><div class='add'>+tuner=77 - TCL tuner MF02GIP-5N-E</div><div class='add'>+tuner=78 - Philips FMD1216MEX MK3 Hybrid Tuner</div><div class='head'>diff --git a/Documentation/video4linux/gspca.txt b/Documentation/video4linux/gspca.txt<br/>index 9a3e4d797fa8..004818fab040 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/video4linux/gspca.txt?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/video4linux/gspca.txt</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/video4linux/gspca.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/video4linux/gspca.txt</a></div><div class='hunk'>@@ -7,6 +7,7 @@ The modules are:</div><div class='ctx'> xxxx		vend:prod</div><div class='ctx'> ----</div><div class='ctx'> spca501		0000:0000	MystFromOri Unknow Camera</div><div class='add'>+m5602		0402:5602	ALi Video Camera Controller</div><div class='ctx'> spca501		040a:0002	Kodak DVC-325</div><div class='ctx'> spca500		040a:0300	Kodak EZ200</div><div class='ctx'> zc3xx		041e:041e	Creative WebCam Live!</div><div class='hunk'>@@ -42,6 +43,7 @@ zc3xx		0458:7007	Genius VideoCam V2</div><div class='ctx'> zc3xx		0458:700c	Genius VideoCam V3</div><div class='ctx'> zc3xx		0458:700f	Genius VideoCam Web V2</div><div class='ctx'> sonixj		0458:7025	Genius Eye 311Q</div><div class='add'>+sonixj		0458:702e	Genius Slim 310 NB</div><div class='ctx'> sonixj		045e:00f5	MicroSoft VX3000</div><div class='ctx'> sonixj		045e:00f7	MicroSoft VX1000</div><div class='ctx'> ov519		045e:028c	Micro$oft xbox cam</div><div class='hunk'>@@ -81,7 +83,7 @@ spca561		046d:092b	Labtec Webcam Plus</div><div class='ctx'> spca561		046d:092c	Logitech QC chat Elch2</div><div class='ctx'> spca561		046d:092d	Logitech QC Elch2</div><div class='ctx'> spca561		046d:092e	Logitech QC Elch2</div><div class='del'>-spca561		046d:092f	Logitech QC Elch2</div><div class='add'>+spca561		046d:092f	Logitech  QuickCam Express Plus</div><div class='ctx'> sunplus		046d:0960	Logitech ClickSmart 420</div><div class='ctx'> sunplus		0471:0322	Philips DMVC1300K</div><div class='ctx'> zc3xx		0471:0325	Philips SPC 200 NC</div><div class='hunk'>@@ -96,6 +98,29 @@ sunplus		04a5:3003	Benq DC 1300</div><div class='ctx'> sunplus		04a5:3008	Benq DC 1500</div><div class='ctx'> sunplus		04a5:300a	Benq DC 3410</div><div class='ctx'> spca500		04a5:300c	Benq DC 1016</div><div class='add'>+finepix		04cb:0104	Fujifilm FinePix 4800</div><div class='add'>+finepix		04cb:0109	Fujifilm FinePix A202</div><div class='add'>+finepix		04cb:010b	Fujifilm FinePix A203</div><div class='add'>+finepix		04cb:010f	Fujifilm FinePix A204</div><div class='add'>+finepix		04cb:0111	Fujifilm FinePix A205</div><div class='add'>+finepix		04cb:0113	Fujifilm FinePix A210</div><div class='add'>+finepix		04cb:0115	Fujifilm FinePix A303</div><div class='add'>+finepix		04cb:0117	Fujifilm FinePix A310</div><div class='add'>+finepix		04cb:0119	Fujifilm FinePix F401</div><div class='add'>+finepix		04cb:011b	Fujifilm FinePix F402</div><div class='add'>+finepix		04cb:011d	Fujifilm FinePix F410</div><div class='add'>+finepix		04cb:0121	Fujifilm FinePix F601</div><div class='add'>+finepix		04cb:0123	Fujifilm FinePix F700</div><div class='add'>+finepix		04cb:0125	Fujifilm FinePix M603</div><div class='add'>+finepix		04cb:0127	Fujifilm FinePix S300</div><div class='add'>+finepix		04cb:0129	Fujifilm FinePix S304</div><div class='add'>+finepix		04cb:012b	Fujifilm FinePix S500</div><div class='add'>+finepix		04cb:012d	Fujifilm FinePix S602</div><div class='add'>+finepix		04cb:012f	Fujifilm FinePix S700</div><div class='add'>+finepix		04cb:0131	Fujifilm FinePix unknown model</div><div class='add'>+finepix		04cb:013b	Fujifilm FinePix unknown model</div><div class='add'>+finepix		04cb:013d	Fujifilm FinePix unknown model</div><div class='add'>+finepix		04cb:013f	Fujifilm FinePix F420</div><div class='ctx'> sunplus		04f1:1001	JVC GC A50</div><div class='ctx'> spca561		04fc:0561	Flexcam 100</div><div class='ctx'> sunplus		04fc:500c	Sunplus CA500C</div><div class='hunk'>@@ -181,6 +206,7 @@ pac207		093a:2468	PAC207</div><div class='ctx'> pac207		093a:2470	Genius GF112</div><div class='ctx'> pac207		093a:2471	Genius VideoCam ge111</div><div class='ctx'> pac207		093a:2472	Genius VideoCam ge110</div><div class='add'>+pac207		093a:2476	Genius e-Messenger 112</div><div class='ctx'> pac7311		093a:2600	PAC7311 Typhoon</div><div class='ctx'> pac7311		093a:2601	Philips SPC 610 NC</div><div class='ctx'> pac7311		093a:2603	PAC7312</div><div class='head'>diff --git a/Documentation/video4linux/m5602.txt b/Documentation/video4linux/m5602.txt<br/>new file mode 100644<br/>index 000000000000..4450ab13f37b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/video4linux/m5602.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/video4linux/m5602.txt</a></div><div class='hunk'>@@ -0,0 +1,12 @@</div><div class='add'>+This document describes the ALi m5602 bridge connected</div><div class='add'>+to the following supported sensors:</div><div class='add'>+OmniVision OV9650,</div><div class='add'>+Samsung s5k83a,</div><div class='add'>+Samsung s5k4aa,</div><div class='add'>+Micron mt9m111,</div><div class='add'>+Pixel plus PO1030</div><div class='add'>+</div><div class='add'>+This driver mimics the windows drivers, which have a braindead implementation sending bayer-encoded frames at VGA resolution.</div><div class='add'>+In a perfect world we should be able to reprogram the m5602 and the connected sensor in hardware instead, supporting a range of resolutions and pixelformats</div><div class='add'>+</div><div class='add'>+Anyway, have fun and please report any bugs to m560x-driver-devel@lists.sourceforge.net</div><div class='head'>diff --git a/Documentation/video4linux/soc-camera.txt b/Documentation/video4linux/soc-camera.txt<br/>new file mode 100644<br/>index 000000000000..178ef3c5e579<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/video4linux/soc-camera.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/video4linux/soc-camera.txt</a></div><div class='hunk'>@@ -0,0 +1,120 @@</div><div class='add'>+			Soc-Camera Subsystem</div><div class='add'>+			====================</div><div class='add'>+</div><div class='add'>+Terminology</div><div class='add'>+-----------</div><div class='add'>+</div><div class='add'>+The following terms are used in this document:</div><div class='add'>+ - camera / camera device / camera sensor - a video-camera sensor chip, capable</div><div class='add'>+   of connecting to a variety of systems and interfaces, typically uses i2c for</div><div class='add'>+   control and configuration, and a parallel or a serial bus for data.</div><div class='add'>+ - camera host - an interface, to which a camera is connected. Typically a</div><div class='add'>+   specialised interface, present on many SoCs, e.g., PXA27x and PXA3xx, SuperH,</div><div class='add'>+   AVR32, i.MX27, i.MX31.</div><div class='add'>+ - camera host bus - a connection between a camera host and a camera. Can be</div><div class='add'>+   parallel or serial, consists of data and control lines, e.g., clock, vertical</div><div class='add'>+   and horizontal synchronization signals.</div><div class='add'>+</div><div class='add'>+Purpose of the soc-camera subsystem</div><div class='add'>+-----------------------------------</div><div class='add'>+</div><div class='add'>+The soc-camera subsystem provides a unified API between camera host drivers and</div><div class='add'>+camera sensor drivers. It implements a V4L2 interface to the user, currently</div><div class='add'>+only the mmap method is supported.</div><div class='add'>+</div><div class='add'>+This subsystem has been written to connect drivers for System-on-Chip (SoC)</div><div class='add'>+video capture interfaces with drivers for CMOS camera sensor chips to enable</div><div class='add'>+the reuse of sensor drivers with various hosts. The subsystem has been designed</div><div class='add'>+to support multiple camera host interfaces and multiple cameras per interface,</div><div class='add'>+although most applications have only one camera sensor.</div><div class='add'>+</div><div class='add'>+Existing drivers</div><div class='add'>+----------------</div><div class='add'>+</div><div class='add'>+As of 2.6.27-rc4 there are two host drivers in the mainline: pxa_camera.c for</div><div class='add'>+PXA27x SoCs and sh_mobile_ceu_camera.c for SuperH SoCs, and four sensor drivers:</div><div class='add'>+mt9m001.c, mt9m111.c, mt9v022.c and a generic soc_camera_platform.c driver. This</div><div class='add'>+list is not supposed to be updated, look for more examples in your tree.</div><div class='add'>+</div><div class='add'>+Camera host API</div><div class='add'>+---------------</div><div class='add'>+</div><div class='add'>+A host camera driver is registered using the</div><div class='add'>+</div><div class='add'>+soc_camera_host_register(struct soc_camera_host *);</div><div class='add'>+</div><div class='add'>+function. The host object can be initialized as follows:</div><div class='add'>+</div><div class='add'>+static struct soc_camera_host pxa_soc_camera_host = {</div><div class='add'>+	.drv_name	= PXA_CAM_DRV_NAME,</div><div class='add'>+	.ops		= &amp;pxa_soc_camera_host_ops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+All camera host methods are passed in a struct soc_camera_host_ops:</div><div class='add'>+</div><div class='add'>+static struct soc_camera_host_ops pxa_soc_camera_host_ops = {</div><div class='add'>+	.owner		= THIS_MODULE,</div><div class='add'>+	.add		= pxa_camera_add_device,</div><div class='add'>+	.remove		= pxa_camera_remove_device,</div><div class='add'>+	.suspend	= pxa_camera_suspend,</div><div class='add'>+	.resume		= pxa_camera_resume,</div><div class='add'>+	.set_fmt_cap	= pxa_camera_set_fmt_cap,</div><div class='add'>+	.try_fmt_cap	= pxa_camera_try_fmt_cap,</div><div class='add'>+	.init_videobuf	= pxa_camera_init_videobuf,</div><div class='add'>+	.reqbufs	= pxa_camera_reqbufs,</div><div class='add'>+	.poll		= pxa_camera_poll,</div><div class='add'>+	.querycap	= pxa_camera_querycap,</div><div class='add'>+	.try_bus_param	= pxa_camera_try_bus_param,</div><div class='add'>+	.set_bus_param	= pxa_camera_set_bus_param,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+.add and .remove methods are called when a sensor is attached to or detached</div><div class='add'>+from the host, apart from performing host-internal tasks they shall also call</div><div class='add'>+sensor driver's .init and .release methods respectively. .suspend and .resume</div><div class='add'>+methods implement host's power-management functionality and its their</div><div class='add'>+responsibility to call respective sensor's methods. .try_bus_param and</div><div class='add'>+.set_bus_param are used to negotiate physical connection parameters between the</div><div class='add'>+host and the sensor. .init_videobuf is called by soc-camera core when a</div><div class='add'>+video-device is opened, further video-buffer management is implemented completely</div><div class='add'>+by the specific camera host driver. The rest of the methods are called from</div><div class='add'>+respective V4L2 operations.</div><div class='add'>+</div><div class='add'>+Camera API</div><div class='add'>+----------</div><div class='add'>+</div><div class='add'>+Sensor drivers can use struct soc_camera_link, typically provided by the</div><div class='add'>+platform, and used to specify to which camera host bus the sensor is connected,</div><div class='add'>+and arbitrarily provide platform .power and .reset methods for the camera.</div><div class='add'>+soc_camera_device_register() and soc_camera_device_unregister() functions are</div><div class='add'>+used to add a sensor driver to or remove one from the system. The registration</div><div class='add'>+function takes a pointer to struct soc_camera_device as the only parameter.</div><div class='add'>+This struct can be initialized as follows:</div><div class='add'>+</div><div class='add'>+	/* link to driver operations */</div><div class='add'>+	icd-&gt;ops	= &amp;mt9m001_ops;</div><div class='add'>+	/* link to the underlying physical (e.g., i2c) device */</div><div class='add'>+	icd-&gt;control	= &amp;client-&gt;dev;</div><div class='add'>+	/* window geometry */</div><div class='add'>+	icd-&gt;x_min	= 20;</div><div class='add'>+	icd-&gt;y_min	= 12;</div><div class='add'>+	icd-&gt;x_current	= 20;</div><div class='add'>+	icd-&gt;y_current	= 12;</div><div class='add'>+	icd-&gt;width_min	= 48;</div><div class='add'>+	icd-&gt;width_max	= 1280;</div><div class='add'>+	icd-&gt;height_min	= 32;</div><div class='add'>+	icd-&gt;height_max	= 1024;</div><div class='add'>+	icd-&gt;y_skip_top	= 1;</div><div class='add'>+	/* camera bus ID, typically obtained from platform data */</div><div class='add'>+	icd-&gt;iface	= icl-&gt;bus_id;</div><div class='add'>+</div><div class='add'>+struct soc_camera_ops provides .probe and .remove methods, which are called by</div><div class='add'>+the soc-camera core, when a camera is matched against or removed from a camera</div><div class='add'>+host bus, .init, .release, .suspend, and .resume are called from the camera host</div><div class='add'>+driver as discussed above. Other members of this struct provide respective V4L2</div><div class='add'>+functionality.</div><div class='add'>+</div><div class='add'>+struct soc_camera_device also links to an array of struct soc_camera_data_format,</div><div class='add'>+listing pixel formats, supported by the camera.</div><div class='add'>+</div><div class='add'>+--</div><div class='add'>+Author: Guennadi Liakhovetski &lt;g.liakhovetski@gmx.de&gt;</div><div class='head'>diff --git a/Documentation/w1/00-INDEX b/Documentation/w1/00-INDEX<br/>index 5270cf4cb109..cb49802745dc 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/w1/00-INDEX?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/w1/00-INDEX</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/w1/00-INDEX?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/w1/00-INDEX</a></div><div class='hunk'>@@ -1,5 +1,7 @@</div><div class='ctx'> 00-INDEX</div><div class='ctx'> 	- This file</div><div class='add'>+slaves/</div><div class='add'>+	- Drivers that provide support for specific family codes.</div><div class='ctx'> masters/</div><div class='ctx'> 	- Individual chips providing 1-wire busses.</div><div class='ctx'> w1.generic</div><div class='head'>diff --git a/Documentation/w1/masters/ds2490 b/Documentation/w1/masters/ds2490<br/>index 239f9ae01843..28176def3d6f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/w1/masters/ds2490?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/w1/masters/ds2490</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/w1/masters/ds2490?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/w1/masters/ds2490</a></div><div class='hunk'>@@ -16,3 +16,55 @@ which allows to build USB &lt;-&gt; W1 bridges.</div><div class='ctx'> DS9490(R) is a USB &lt;-&gt; W1 bus master device</div><div class='ctx'> which has 0x81 family ID integrated chip and DS2490</div><div class='ctx'> low-level operational chip.</div><div class='add'>+</div><div class='add'>+Notes and limitations.</div><div class='add'>+- The weak pullup current is a minimum of 0.9mA and maximum of 6.0mA.</div><div class='add'>+- The 5V strong pullup is supported with a minimum of 5.9mA and a</div><div class='add'>+  maximum of 30.4 mA.  (From DS2490.pdf)</div><div class='add'>+- While the ds2490 supports a hardware search the code doesn't take</div><div class='add'>+  advantage of it (in tested case it only returned first device).</div><div class='add'>+- The hardware will detect when devices are attached to the bus on the</div><div class='add'>+  next bus (reset?) operation, however only a message is printed as</div><div class='add'>+  the core w1 code doesn't make use of the information.  Connecting</div><div class='add'>+  one device tends to give multiple new device notifications.</div><div class='add'>+- The number of USB bus transactions could be reduced if w1_reset_send</div><div class='add'>+  was added to the API.  The name is just a suggestion.  It would take</div><div class='add'>+  a write buffer and a read buffer (along with sizes) as arguments.</div><div class='add'>+  The ds2490 block I/O command supports reset, write buffer, read</div><div class='add'>+  buffer, and strong pullup all in one command, instead of the current</div><div class='add'>+  1 reset bus, 2 write the match rom command and slave rom id, 3 block</div><div class='add'>+  write and read data.  The write buffer needs to have the match rom</div><div class='add'>+  command and slave rom id prepended to the front of the requested</div><div class='add'>+  write buffer, both of which are known to the driver.</div><div class='add'>+- The hardware supports normal, flexible, and overdrive bus</div><div class='add'>+  communication speeds, but only the normal is supported.</div><div class='add'>+- The registered w1_bus_master functions don't define error</div><div class='add'>+  conditions.  If a bus search is in progress and the ds2490 is</div><div class='add'>+  removed it can produce a good amount of error output before the bus</div><div class='add'>+  search finishes.</div><div class='add'>+- The hardware supports detecting some error conditions, such as</div><div class='add'>+  short, alarming presence on reset, and no presence on reset, but the</div><div class='add'>+  driver doesn't query those values.</div><div class='add'>+- The ds2490 specification doesn't cover short bulk in reads in</div><div class='add'>+  detail, but my observation is if fewer bytes are requested than are</div><div class='add'>+  available, the bulk read will return an error and the hardware will</div><div class='add'>+  clear the entire bulk in buffer.  It would be possible to read the</div><div class='add'>+  maximum buffer size to not run into this error condition, only extra</div><div class='add'>+  bytes in the buffer is a logic error in the driver.  The code should</div><div class='add'>+  should match reads and writes as well as data sizes.  Reads and</div><div class='add'>+  writes are serialized and the status verifies that the chip is idle</div><div class='add'>+  (and data is available) before the read is executed, so it should</div><div class='add'>+  not happen.</div><div class='add'>+- Running x86_64 2.6.24 UHCI under qemu 0.9.0 under x86_64 2.6.22-rc6</div><div class='add'>+  with a OHCI controller, ds2490 running in the guest would operate</div><div class='add'>+  normally the first time the module was loaded after qemu attached</div><div class='add'>+  the ds2490 hardware, but if the module was unloaded, then reloaded</div><div class='add'>+  most of the time one of the bulk out or in, and usually the bulk in</div><div class='add'>+  would fail.  qemu sets a 50ms timeout and the bulk in would timeout</div><div class='add'>+  even when the status shows data available.  A bulk out write would</div><div class='add'>+  show a successful completion, but the ds2490 status register would</div><div class='add'>+  show 0 bytes written.  Detaching qemu from the ds2490 hardware and</div><div class='add'>+  reattaching would clear the problem.  usbmon output in the guest and</div><div class='add'>+  host did not explain the problem.  My guess is a bug in either qemu</div><div class='add'>+  or the host OS and more likely the host OS.</div><div class='add'>+-- 03-06-2008 David Fries &lt;David@Fries.net&gt;</div><div class='head'>diff --git a/Documentation/w1/slaves/00-INDEX b/Documentation/w1/slaves/00-INDEX<br/>new file mode 100644<br/>index 000000000000..f8101d6b07b7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/w1/slaves/00-INDEX?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/w1/slaves/00-INDEX</a></div><div class='hunk'>@@ -0,0 +1,4 @@</div><div class='add'>+00-INDEX</div><div class='add'>+	- This file</div><div class='add'>+w1_therm</div><div class='add'>+	- The Maxim/Dallas Semiconductor ds18*20 temperature sensor.</div><div class='head'>diff --git a/Documentation/w1/slaves/w1_therm b/Documentation/w1/slaves/w1_therm<br/>new file mode 100644<br/>index 000000000000..0403aaaba878<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/w1/slaves/w1_therm?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/w1/slaves/w1_therm</a></div><div class='hunk'>@@ -0,0 +1,41 @@</div><div class='add'>+Kernel driver w1_therm</div><div class='add'>+====================</div><div class='add'>+</div><div class='add'>+Supported chips:</div><div class='add'>+  * Maxim ds18*20 based temperature sensors.</div><div class='add'>+</div><div class='add'>+Author: Evgeniy Polyakov &lt;johnpol@2ka.mipt.ru&gt;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Description</div><div class='add'>+-----------</div><div class='add'>+</div><div class='add'>+w1_therm provides basic temperature conversion for ds18*20 devices.</div><div class='add'>+supported family codes:</div><div class='add'>+W1_THERM_DS18S20	0x10</div><div class='add'>+W1_THERM_DS1822		0x22</div><div class='add'>+W1_THERM_DS18B20	0x28</div><div class='add'>+</div><div class='add'>+Support is provided through the sysfs w1_slave file.  Each open and</div><div class='add'>+read sequence will initiate a temperature conversion then provide two</div><div class='add'>+lines of ASCII output.  The first line contains the nine hex bytes</div><div class='add'>+read along with a calculated crc value and YES or NO if it matched.</div><div class='add'>+If the crc matched the returned values are retained.  The second line</div><div class='add'>+displays the retained values along with a temperature in millidegrees</div><div class='add'>+Centigrade after t=.</div><div class='add'>+</div><div class='add'>+Parasite powered devices are limited to one slave performing a</div><div class='add'>+temperature conversion at a time.  If none of the devices are parasite</div><div class='add'>+powered it would be possible to convert all the devices at the same</div><div class='add'>+time and then go back to read individual sensors.  That isn't</div><div class='add'>+currently supported.  The driver also doesn't support reduced</div><div class='add'>+precision (which would also reduce the conversion time).</div><div class='add'>+</div><div class='add'>+The module parameter strong_pullup can be set to 0 to disable the</div><div class='add'>+strong pullup or 1 to enable.  If enabled the 5V strong pullup will be</div><div class='add'>+enabled when the conversion is taking place provided the master driver</div><div class='add'>+must support the strong pullup (or it falls back to a pullup</div><div class='add'>+resistor).  The DS18b20 temperature sensor specification lists a</div><div class='add'>+maximum current draw of 1.5mA and that a 5k pullup resistor is not</div><div class='add'>+sufficient.  The strong pullup is designed to provide the additional</div><div class='add'>+current required.</div><div class='head'>diff --git a/Documentation/w1/w1.generic b/Documentation/w1/w1.generic<br/>index 4c6509dd4789..e3333eec4320 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/w1/w1.generic?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/w1/w1.generic</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/w1/w1.generic?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/w1/w1.generic</a></div><div class='hunk'>@@ -79,10 +79,13 @@ w1 master sysfs interface</div><div class='ctx'> &lt;xx-xxxxxxxxxxxxx&gt; - a directory for a found device. The format is family-serial</div><div class='ctx'> bus                - (standard) symlink to the w1 bus</div><div class='ctx'> driver             - (standard) symlink to the w1 driver</div><div class='add'>+w1_master_add      - Manually register a slave device</div><div class='ctx'> w1_master_attempts - the number of times a search was attempted</div><div class='ctx'> w1_master_max_slave_count</div><div class='ctx'>                    - the maximum slaves that may be attached to a master</div><div class='ctx'> w1_master_name     - the name of the device (w1_bus_masterX)</div><div class='add'>+w1_master_pullup   - 5V strong pullup 0 enabled, 1 disabled</div><div class='add'>+w1_master_remove   - Manually remove a slave device</div><div class='ctx'> w1_master_search   - the number of searches left to do, -1=continual (default)</div><div class='ctx'> w1_master_slave_count</div><div class='ctx'>                    - the number of slaves found</div><div class='hunk'>@@ -90,7 +93,13 @@ w1_master_slaves   - the names of the slaves, one per line</div><div class='ctx'> w1_master_timeout  - the delay in seconds between searches</div><div class='ctx'> </div><div class='ctx'> If you have a w1 bus that never changes (you don't add or remove devices),</div><div class='del'>-you can set w1_master_search to a positive value to disable searches.</div><div class='add'>+you can set the module parameter search_count to a small positive number</div><div class='add'>+for an initially small number of bus searches.  Alternatively it could be</div><div class='add'>+set to zero, then manually add the slave device serial numbers by</div><div class='add'>+w1_master_add device file.  The w1_master_add and w1_master_remove files</div><div class='add'>+generally only make sense when searching is disabled, as a search will</div><div class='add'>+redetect manually removed devices that are present and timeout manually</div><div class='add'>+added devices that aren't on the bus.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> w1 slave sysfs interface</div><div class='head'>diff --git a/Documentation/x86/00-INDEX b/Documentation/x86/00-INDEX<br/>new file mode 100644<br/>index 000000000000..dbe3377754af<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/x86/00-INDEX?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/x86/00-INDEX</a></div><div class='hunk'>@@ -0,0 +1,4 @@</div><div class='add'>+00-INDEX</div><div class='add'>+	- this file</div><div class='add'>+mtrr.txt</div><div class='add'>+	- how to use x86 Memory Type Range Registers to increase performance</div><div class='head'>diff --git a/Documentation/x86/i386/boot.txt b/Documentation/x86/boot.txt<br/>index 147bfe511cdd..83c0033ee9e0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/x86/i386/boot.txt?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/x86/i386/boot.txt</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/x86/boot.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/x86/boot.txt</a></div><div class='hunk'>@@ -308,7 +308,7 @@ Protocol:	2.00+</div><div class='ctx'> </div><div class='ctx'> Field name:	start_sys</div><div class='ctx'> Type:		read</div><div class='del'>-Offset/size:	0x20c/4</div><div class='add'>+Offset/size:	0x20c/2</div><div class='ctx'> Protocol:	2.00+</div><div class='ctx'> </div><div class='ctx'>   The load low segment (0x1000).  Obsolete.</div><div class='head'>diff --git a/Documentation/mtrr.txt b/Documentation/x86/mtrr.txt<br/>index c39ac395970e..cc071dc333c2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/mtrr.txt?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/mtrr.txt</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/x86/mtrr.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/x86/mtrr.txt</a></div><div class='hunk'>@@ -18,7 +18,7 @@ Richard Gooch</div><div class='ctx'>   The AMD K6-2 (stepping 8 and above) and K6-3 processors have two</div><div class='ctx'>   MTRRs. These are supported.  The AMD Athlon family provide 8 Intel</div><div class='ctx'>   style MTRRs.</div><div class='del'>-  </div><div class='add'>+</div><div class='ctx'>   The Centaur C6 (WinChip) has 8 MCRs, allowing write-combining. These</div><div class='ctx'>   are supported.</div><div class='ctx'> </div><div class='hunk'>@@ -87,7 +87,7 @@ reg00: base=0x00000000 (   0MB), size=  64MB: write-back, count=1</div><div class='ctx'> reg01: base=0xfb000000 (4016MB), size=  16MB: write-combining, count=1</div><div class='ctx'> reg02: base=0xfb000000 (4016MB), size=   4kB: uncachable, count=1</div><div class='ctx'> </div><div class='del'>-Some cards (especially Voodoo Graphics boards) need this 4 kB area </div><div class='add'>+Some cards (especially Voodoo Graphics boards) need this 4 kB area</div><div class='ctx'> excluded from the beginning of the region because it is used for</div><div class='ctx'> registers.</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/x86/pat.txt b/Documentation/x86/pat.txt<br/>index 17965f927c15..c93ff5f4c0dd 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/x86/pat.txt?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/x86/pat.txt</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/x86/pat.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/x86/pat.txt</a></div><div class='hunk'>@@ -14,6 +14,10 @@ PAT allows for different types of memory attributes. The most commonly used</div><div class='ctx'> ones that will be supported at this time are Write-back, Uncached,</div><div class='ctx'> Write-combined and Uncached Minus.</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+PAT APIs</div><div class='add'>+--------</div><div class='add'>+</div><div class='ctx'> There are many different APIs in the kernel that allows setting of memory</div><div class='ctx'> attributes at the page level. In order to avoid aliasing, these interfaces</div><div class='ctx'> should be used thoughtfully. Below is a table of interfaces available,</div><div class='hunk'>@@ -26,38 +30,38 @@ address range to avoid any aliasing.</div><div class='ctx'> API                    |    RAM   |  ACPI,...  |  Reserved/Holes  |</div><div class='ctx'> -----------------------|----------|------------|------------------|</div><div class='ctx'>                        |          |            |                  |</div><div class='del'>-ioremap                |    --    |    UC      |       UC         |</div><div class='add'>+ioremap                |    --    |    UC-     |       UC-        |</div><div class='ctx'>                        |          |            |                  |</div><div class='ctx'> ioremap_cache          |    --    |    WB      |       WB         |</div><div class='ctx'>                        |          |            |                  |</div><div class='del'>-ioremap_nocache        |    --    |    UC      |       UC         |</div><div class='add'>+ioremap_nocache        |    --    |    UC-     |       UC-        |</div><div class='ctx'>                        |          |            |                  |</div><div class='ctx'> ioremap_wc             |    --    |    --      |       WC         |</div><div class='ctx'>                        |          |            |                  |</div><div class='del'>-set_memory_uc          |    UC    |    --      |       --         |</div><div class='add'>+set_memory_uc          |    UC-   |    --      |       --         |</div><div class='ctx'>  set_memory_wb         |          |            |                  |</div><div class='ctx'>                        |          |            |                  |</div><div class='ctx'> set_memory_wc          |    WC    |    --      |       --         |</div><div class='ctx'>  set_memory_wb         |          |            |                  |</div><div class='ctx'>                        |          |            |                  |</div><div class='del'>-pci sysfs resource     |    --    |    --      |       UC         |</div><div class='add'>+pci sysfs resource     |    --    |    --      |       UC-        |</div><div class='ctx'>                        |          |            |                  |</div><div class='ctx'> pci sysfs resource_wc  |    --    |    --      |       WC         |</div><div class='ctx'>  is IORESOURCE_PREFETCH|          |            |                  |</div><div class='ctx'>                        |          |            |                  |</div><div class='del'>-pci proc               |    --    |    --      |       UC         |</div><div class='add'>+pci proc               |    --    |    --      |       UC-        |</div><div class='ctx'>  !PCIIOC_WRITE_COMBINE |          |            |                  |</div><div class='ctx'>                        |          |            |                  |</div><div class='ctx'> pci proc               |    --    |    --      |       WC         |</div><div class='ctx'>  PCIIOC_WRITE_COMBINE  |          |            |                  |</div><div class='ctx'>                        |          |            |                  |</div><div class='del'>-/dev/mem               |    --    |    UC      |       UC         |</div><div class='add'>+/dev/mem               |    --    |  WB/WC/UC- |    WB/WC/UC-     |</div><div class='ctx'>  read-write            |          |            |                  |</div><div class='ctx'>                        |          |            |                  |</div><div class='del'>-/dev/mem               |    --    |    UC      |       UC         |</div><div class='add'>+/dev/mem               |    --    |    UC-     |       UC-        |</div><div class='ctx'>  mmap SYNC flag        |          |            |                  |</div><div class='ctx'>                        |          |            |                  |</div><div class='del'>-/dev/mem               |    --    |  WB/WC/UC  |    WB/WC/UC      |</div><div class='add'>+/dev/mem               |    --    |  WB/WC/UC- |    WB/WC/UC-     |</div><div class='ctx'>  mmap !SYNC flag       |          |(from exist-|  (from exist-    |</div><div class='ctx'>  and                   |          |  ing alias)|    ing alias)    |</div><div class='ctx'>  any alias to this area|          |            |                  |</div><div class='hunk'>@@ -68,7 +72,7 @@ pci proc               |    --    |    --      |       WC         |</div><div class='ctx'>  and                   |          |            |                  |</div><div class='ctx'>  MTRR says WB          |          |            |                  |</div><div class='ctx'>                        |          |            |                  |</div><div class='del'>-/dev/mem               |    --    |    --      |    UC_MINUS      |</div><div class='add'>+/dev/mem               |    --    |    --      |       UC-        |</div><div class='ctx'>  mmap !SYNC flag       |          |            |                  |</div><div class='ctx'>  no alias to this area |          |            |                  |</div><div class='ctx'>  and                   |          |            |                  |</div><div class='hunk'>@@ -98,3 +102,35 @@ types.</div><div class='ctx'> </div><div class='ctx'> Drivers should use set_memory_[uc|wc] to set access type for RAM ranges.</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+PAT debugging</div><div class='add'>+-------------</div><div class='add'>+</div><div class='add'>+With CONFIG_DEBUG_FS enabled, PAT memtype list can be examined by</div><div class='add'>+</div><div class='add'>+# mount -t debugfs debugfs /sys/kernel/debug</div><div class='add'>+# cat /sys/kernel/debug/x86/pat_memtype_list</div><div class='add'>+PAT memtype list:</div><div class='add'>+uncached-minus @ 0x7fadf000-0x7fae0000</div><div class='add'>+uncached-minus @ 0x7fb19000-0x7fb1a000</div><div class='add'>+uncached-minus @ 0x7fb1a000-0x7fb1b000</div><div class='add'>+uncached-minus @ 0x7fb1b000-0x7fb1c000</div><div class='add'>+uncached-minus @ 0x7fb1c000-0x7fb1d000</div><div class='add'>+uncached-minus @ 0x7fb1d000-0x7fb1e000</div><div class='add'>+uncached-minus @ 0x7fb1e000-0x7fb25000</div><div class='add'>+uncached-minus @ 0x7fb25000-0x7fb26000</div><div class='add'>+uncached-minus @ 0x7fb26000-0x7fb27000</div><div class='add'>+uncached-minus @ 0x7fb27000-0x7fb28000</div><div class='add'>+uncached-minus @ 0x7fb28000-0x7fb2e000</div><div class='add'>+uncached-minus @ 0x7fb2e000-0x7fb2f000</div><div class='add'>+uncached-minus @ 0x7fb2f000-0x7fb30000</div><div class='add'>+uncached-minus @ 0x7fb31000-0x7fb32000</div><div class='add'>+uncached-minus @ 0x80000000-0x90000000</div><div class='add'>+</div><div class='add'>+This list shows physical address ranges and various PAT settings used to</div><div class='add'>+access those physical address ranges.</div><div class='add'>+</div><div class='add'>+Another, more verbose way of getting PAT related debug messages is with</div><div class='add'>+"debugpat" boot parameter. With this parameter, various debug messages are</div><div class='add'>+printed to dmesg log.</div><div class='add'>+</div><div class='head'>diff --git a/Documentation/x86/i386/usb-legacy-support.txt b/Documentation/x86/usb-legacy-support.txt<br/>index 1894cdfc69d9..1894cdfc69d9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/x86/i386/usb-legacy-support.txt?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/x86/i386/usb-legacy-support.txt</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/x86/usb-legacy-support.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/x86/usb-legacy-support.txt</a></div><div class='head'>diff --git a/Documentation/x86/x86_64/boot-options.txt b/Documentation/x86/x86_64/boot-options.txt<br/>index b0c7b6c4abda..72ffb5373ec7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/x86/x86_64/boot-options.txt?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/x86/x86_64/boot-options.txt</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/x86/x86_64/boot-options.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/x86/x86_64/boot-options.txt</a></div><div class='hunk'>@@ -54,10 +54,6 @@ APICs</div><div class='ctx'> 		 apicmaintimer. Useful when your PIT timer is totally</div><div class='ctx'> 		 broken.</div><div class='ctx'> </div><div class='del'>-   disable_8254_timer / enable_8254_timer</div><div class='del'>-		 Enable interrupt 0 timer routing over the 8254 in addition to over</div><div class='del'>-	         the IO-APIC. The kernel tries to set a sensible default.</div><div class='del'>-</div><div class='ctx'> Early Console</div><div class='ctx'> </div><div class='ctx'>    syntax: earlyprintk=vga</div><div class='head'>diff --git a/Documentation/x86/i386/zero-page.txt b/Documentation/x86/zero-page.txt<br/>index 169ad423a3d1..169ad423a3d1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/x86/i386/zero-page.txt?id=c15895ef30c2c03e99802951787183039a349d32'>Documentation/x86/i386/zero-page.txt</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/Documentation/x86/zero-page.txt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>Documentation/x86/zero-page.txt</a></div><div class='head'>diff --git a/MAINTAINERS b/MAINTAINERS<br/>index 4674c64308a4..208528621045 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/MAINTAINERS?id=c15895ef30c2c03e99802951787183039a349d32'>MAINTAINERS</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/MAINTAINERS?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>MAINTAINERS</a></div><div class='hunk'>@@ -72,6 +72,7 @@ M: Mail patches to</div><div class='ctx'> L: Mailing list that is relevant to this area</div><div class='ctx'> W: Web-page with status/info</div><div class='ctx'> T: SCM tree type and location.  Type is one of: git, hg, quilt.</div><div class='add'>+F: Applicable files and/or directories</div><div class='ctx'> S: Status, one of the following:</div><div class='ctx'> </div><div class='ctx'> 	Supported:	Someone is actually paid to look after this.</div><div class='hunk'>@@ -102,14 +103,14 @@ M:	dave@thedillows.org</div><div class='ctx'> L:	netdev@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='del'>-3W-XXXX ATA-RAID CONTROLLER DRIVER</div><div class='add'>+3W-9XXX SATA-RAID CONTROLLER DRIVER</div><div class='ctx'> P:	Adam Radford</div><div class='ctx'> M:	linuxraid@amcc.com</div><div class='ctx'> L:	linux-scsi@vger.kernel.org</div><div class='ctx'> W:	http://www.amcc.com</div><div class='ctx'> S:	Supported</div><div class='ctx'> </div><div class='del'>-3W-9XXX SATA-RAID CONTROLLER DRIVER</div><div class='add'>+3W-XXXX ATA-RAID CONTROLLER DRIVER</div><div class='ctx'> P:	Adam Radford</div><div class='ctx'> M:	linuxraid@amcc.com</div><div class='ctx'> L:	linux-scsi@vger.kernel.org</div><div class='hunk'>@@ -163,16 +164,11 @@ M:	A2232@gmx.net</div><div class='ctx'> L:	linux-m68k@lists.linux-m68k.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='del'>-AFS FILESYSTEM &amp; AF_RXRPC SOCKET DOMAIN</div><div class='del'>-P:	David Howells</div><div class='del'>-M:	dhowells@redhat.com</div><div class='del'>-L:	linux-afs@lists.infradead.org</div><div class='del'>-S:	Supported</div><div class='del'>-</div><div class='del'>-AIO</div><div class='del'>-P:	Benjamin LaHaise</div><div class='del'>-M:	bcrl@kvack.org</div><div class='del'>-L:	linux-aio@kvack.org</div><div class='add'>+AACRAID SCSI RAID DRIVER</div><div class='add'>+P:	Adaptec OEM Raid Solutions</div><div class='add'>+M:	aacraid@adaptec.com</div><div class='add'>+L:	linux-scsi@vger.kernel.org</div><div class='add'>+W:	http://www.adaptec.com/</div><div class='ctx'> S:	Supported</div><div class='ctx'> </div><div class='ctx'> ABIT UGURU 1,2 HARDWARE MONITOR DRIVER</div><div class='hunk'>@@ -193,27 +189,6 @@ M:	jes@trained-monkey.org</div><div class='ctx'> L:	linux-acenic@sunsite.dk</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='del'>-IPS SCSI RAID DRIVER</div><div class='del'>-P:	Adaptec OEM Raid Solutions</div><div class='del'>-M:	aacraid@adaptec.com</div><div class='del'>-L:	linux-scsi@vger.kernel.org</div><div class='del'>-W:	http://www.adaptec.com/</div><div class='del'>-S:	Maintained</div><div class='del'>-</div><div class='del'>-DPT_I2O SCSI RAID DRIVER</div><div class='del'>-P:	Adaptec OEM Raid Solutions</div><div class='del'>-M:	aacraid@adaptec.com</div><div class='del'>-L:	linux-scsi@vger.kernel.org</div><div class='del'>-W:	http://www.adaptec.com/</div><div class='del'>-S:	Maintained</div><div class='del'>-</div><div class='del'>-AACRAID SCSI RAID DRIVER</div><div class='del'>-P:	Adaptec OEM Raid Solutions</div><div class='del'>-M:	aacraid@adaptec.com</div><div class='del'>-L:	linux-scsi@vger.kernel.org</div><div class='del'>-W:	http://www.adaptec.com/</div><div class='del'>-S:	Supported</div><div class='del'>-</div><div class='ctx'> ACER WMI LAPTOP EXTRAS</div><div class='ctx'> P:	Carlos Corbacho</div><div class='ctx'> M:	carlos@strangeworlds.co.uk</div><div class='hunk'>@@ -327,6 +302,12 @@ P:	Roman Zippel</div><div class='ctx'> M:	zippel@linux-m68k.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='add'>+AFS FILESYSTEM &amp; AF_RXRPC SOCKET DOMAIN</div><div class='add'>+P:	David Howells</div><div class='add'>+M:	dhowells@redhat.com</div><div class='add'>+L:	linux-afs@lists.infradead.org</div><div class='add'>+S:	Supported</div><div class='add'>+</div><div class='ctx'> AGPGART DRIVER</div><div class='ctx'> P:	David Airlie</div><div class='ctx'> M:	airlied@linux.ie</div><div class='hunk'>@@ -345,6 +326,12 @@ M:	hare@suse.de</div><div class='ctx'> L:	linux-scsi@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='add'>+AIO</div><div class='add'>+P:	Benjamin LaHaise</div><div class='add'>+M:	bcrl@kvack.org</div><div class='add'>+L:	linux-aio@kvack.org</div><div class='add'>+S:	Supported</div><div class='add'>+</div><div class='ctx'> ALCATEL SPEEDTOUCH USB DRIVER</div><div class='ctx'> P:	Duncan Sands</div><div class='ctx'> M:	duncan.sands@free.fr</div><div class='hunk'>@@ -387,8 +374,14 @@ AMD IOMMU (AMD-VI)</div><div class='ctx'> P:	Joerg Roedel</div><div class='ctx'> M:	joerg.roedel@amd.com</div><div class='ctx'> L:	iommu@lists.linux-foundation.org</div><div class='add'>+T:	git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu.git</div><div class='ctx'> S:	Supported</div><div class='ctx'> </div><div class='add'>+AMD MICROCODE UPDATE SUPPORT</div><div class='add'>+P:      Peter Oruba</div><div class='add'>+M:      peter.oruba@amd.com</div><div class='add'>+S:      Supported</div><div class='add'>+</div><div class='ctx'> AMS (Apple Motion Sensor) DRIVER</div><div class='ctx'> P:	Stelian Pop</div><div class='ctx'> M:	stelian@popies.net</div><div class='hunk'>@@ -466,6 +459,12 @@ M:	kernel@wantstofly.org</div><div class='ctx'> L:	linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='add'>+ARM/AFEB9260 MACHINE SUPPORT</div><div class='add'>+P:	Sergey Lapin</div><div class='add'>+M:	slapin@ossfans.org</div><div class='add'>+L:	linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)</div><div class='add'>+S:	Maintained</div><div class='add'>+</div><div class='ctx'> ARM/AJECO 1ARM MACHINE SUPPORT</div><div class='ctx'> P:	Lennert Buytenhek</div><div class='ctx'> M:	kernel@wantstofly.org</div><div class='hunk'>@@ -491,7 +490,7 @@ M:	kernel@wantstofly.org</div><div class='ctx'> L:	linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='del'>-ARM/COMPULAB CM-X270/EM-X270 MACHINE SUPPORT</div><div class='add'>+ARM/COMPULAB CM-X270/EM-X270 and CM-X300 MACHINE SUPPORT</div><div class='ctx'> P:	Mike Rapoport</div><div class='ctx'> M:	mike@compulab.co.il</div><div class='ctx'> L:	linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)</div><div class='hunk'>@@ -623,6 +622,12 @@ M:	marek.vasut@gmail.com</div><div class='ctx'> W:	http://hackndev.com</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='add'>+ARM/PALMZ72 SUPPORT</div><div class='add'>+P:     Sergey Lapin</div><div class='add'>+M:     slapin@ossfans.org</div><div class='add'>+W:     http://hackndev.com</div><div class='add'>+S:     Maintained</div><div class='add'>+</div><div class='ctx'> ARM/PLEB SUPPORT</div><div class='ctx'> P:	Peter Chubb</div><div class='ctx'> M:	pleb@gelato.unsw.edu.au</div><div class='hunk'>@@ -719,7 +724,7 @@ L:	linux-kernel@vger.kernel.org</div><div class='ctx'> W:	http://sourceforge.net/projects/xscaleiop</div><div class='ctx'> S:	Supported</div><div class='ctx'> </div><div class='del'>-ATA OVER ETHERNET DRIVER</div><div class='add'>+ATA OVER ETHERNET (AOE) DRIVER</div><div class='ctx'> P:	Ed L. Cashin</div><div class='ctx'> M:	ecashin@coraid.com</div><div class='ctx'> W:	http://www.coraid.com/support/linux</div><div class='hunk'>@@ -852,11 +857,48 @@ L:	linux-hams@vger.kernel.org</div><div class='ctx'> W:	http://www.linux-ax25.org/</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='add'>+B43 WIRELESS DRIVER</div><div class='add'>+P:	Michael Buesch</div><div class='add'>+M:	mb@bu3sch.de</div><div class='add'>+P:	Stefano Brivio</div><div class='add'>+M:	stefano.brivio@polimi.it</div><div class='add'>+L:	linux-wireless@vger.kernel.org</div><div class='add'>+W:	http://linuxwireless.org/en/users/Drivers/b43</div><div class='add'>+S:	Maintained</div><div class='add'>+</div><div class='add'>+B43LEGACY WIRELESS DRIVER</div><div class='add'>+P:	Larry Finger</div><div class='add'>+M:	Larry.Finger@lwfinger.net</div><div class='add'>+P:	Stefano Brivio</div><div class='add'>+M:	stefano.brivio@polimi.it</div><div class='add'>+L:	linux-wireless@vger.kernel.org</div><div class='add'>+W:	http://linuxwireless.org/en/users/Drivers/b43</div><div class='add'>+S:	Maintained</div><div class='add'>+</div><div class='ctx'> BACKLIGHT CLASS/SUBSYSTEM</div><div class='ctx'> P:	Richard Purdie</div><div class='ctx'> M:	rpurdie@rpsys.net</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='add'>+BAYCOM/HDLCDRV DRIVERS FOR AX.25</div><div class='add'>+P:	Thomas Sailer</div><div class='add'>+M:	t.sailer@alumni.ethz.ch</div><div class='add'>+L:	linux-hams@vger.kernel.org</div><div class='add'>+W:	http://www.baycom.org/~tom/ham/ham.html</div><div class='add'>+S:	Maintained</div><div class='add'>+</div><div class='add'>+BEFS FILE SYSTEM</div><div class='add'>+P:	Sergey S. Kostyliov</div><div class='add'>+M:	rathamahata@php4.ru</div><div class='add'>+L:	linux-kernel@vger.kernel.org</div><div class='add'>+S:	Maintained</div><div class='add'>+</div><div class='add'>+BFS FILE SYSTEM</div><div class='add'>+P:	Tigran A. Aivazian</div><div class='add'>+M:	tigran@aivazian.fsnet.co.uk</div><div class='add'>+L:	linux-kernel@vger.kernel.org</div><div class='add'>+S:	Maintained</div><div class='add'>+</div><div class='ctx'> BLACKFIN ARCHITECTURE</div><div class='ctx'> P:	Bryan Wu</div><div class='ctx'> M:	cooloney@kernel.org</div><div class='hunk'>@@ -892,43 +934,6 @@ L:	uclinux-dist-devel@blackfin.uclinux.org (subscribers-only)</div><div class='ctx'> W:	http://blackfin.uclinux.org</div><div class='ctx'> S:	Supported</div><div class='ctx'> </div><div class='del'>-BAYCOM/HDLCDRV DRIVERS FOR AX.25</div><div class='del'>-P:	Thomas Sailer</div><div class='del'>-M:	t.sailer@alumni.ethz.ch</div><div class='del'>-L:	linux-hams@vger.kernel.org</div><div class='del'>-W:	http://www.baycom.org/~tom/ham/ham.html</div><div class='del'>-S:	Maintained</div><div class='del'>-</div><div class='del'>-B43 WIRELESS DRIVER</div><div class='del'>-P:	Michael Buesch</div><div class='del'>-M:	mb@bu3sch.de</div><div class='del'>-P:	Stefano Brivio</div><div class='del'>-M:	stefano.brivio@polimi.it</div><div class='del'>-L:	linux-wireless@vger.kernel.org</div><div class='del'>-W:	http://linuxwireless.org/en/users/Drivers/b43</div><div class='del'>-S:	Maintained</div><div class='del'>-</div><div class='del'>-B43LEGACY WIRELESS DRIVER</div><div class='del'>-P:	Larry Finger</div><div class='del'>-M:	Larry.Finger@lwfinger.net</div><div class='del'>-P:	Stefano Brivio</div><div class='del'>-M:	stefano.brivio@polimi.it</div><div class='del'>-L:	linux-wireless@vger.kernel.org</div><div class='del'>-W:	http://linuxwireless.org/en/users/Drivers/b43</div><div class='del'>-S:	Maintained</div><div class='del'>-</div><div class='del'>-BEFS FILE SYSTEM</div><div class='del'>-P:	Sergey S. Kostyliov</div><div class='del'>-M:	rathamahata@php4.ru</div><div class='del'>-L:	linux-kernel@vger.kernel.org</div><div class='del'>-S:	Maintained</div><div class='del'>-</div><div class='del'>-BFS FILE SYSTEM</div><div class='del'>-P:	Tigran A. Aivazian</div><div class='del'>-M:	tigran@aivazian.fsnet.co.uk</div><div class='del'>-L:	linux-kernel@vger.kernel.org</div><div class='del'>-S:	Maintained</div><div class='del'>-</div><div class='ctx'> BLACKFIN I2C TWI DRIVER</div><div class='ctx'> P:	Sonic Zhang</div><div class='ctx'> M:	sonic.zhang@analog.com</div><div class='hunk'>@@ -1022,15 +1027,6 @@ M:	corbet@lwn.net</div><div class='ctx'> L:	video4linux-list@redhat.com</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='del'>-CAN NETWORK LAYER</div><div class='del'>-P:	Urs Thuermann</div><div class='del'>-M:	urs.thuermann@volkswagen.de</div><div class='del'>-P:	Oliver Hartkopp</div><div class='del'>-M:	oliver.hartkopp@volkswagen.de</div><div class='del'>-L:	socketcan-core@lists.berlios.de (subscribers-only)</div><div class='del'>-W:	http://developer.berlios.de/projects/socketcan/</div><div class='del'>-S:	Maintained</div><div class='del'>-</div><div class='ctx'> CALGARY x86-64 IOMMU</div><div class='ctx'> P:	Muli Ben-Yehuda</div><div class='ctx'> M:	muli@il.ibm.com</div><div class='hunk'>@@ -1040,6 +1036,15 @@ L:	linux-kernel@vger.kernel.org</div><div class='ctx'> L:	discuss@x86-64.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='add'>+CAN NETWORK LAYER</div><div class='add'>+P:	Urs Thuermann</div><div class='add'>+M:	urs.thuermann@volkswagen.de</div><div class='add'>+P:	Oliver Hartkopp</div><div class='add'>+M:	oliver.hartkopp@volkswagen.de</div><div class='add'>+L:	socketcan-core@lists.berlios.de (subscribers-only)</div><div class='add'>+W:	http://developer.berlios.de/projects/socketcan/</div><div class='add'>+S:	Maintained</div><div class='add'>+</div><div class='ctx'> CELL BROADBAND ENGINE ARCHITECTURE</div><div class='ctx'> P:	Arnd Bergmann</div><div class='ctx'> M:	arnd@arndb.de</div><div class='hunk'>@@ -1085,19 +1090,11 @@ P:	Joel Schopp</div><div class='ctx'> M:	jschopp@austin.ibm.com</div><div class='ctx'> S:	Supported</div><div class='ctx'> </div><div class='del'>-COMMON INTERNET FILE SYSTEM (CIFS)</div><div class='del'>-P:	Steve French</div><div class='del'>-M:	sfrench@samba.org</div><div class='del'>-L:	linux-cifs-client@lists.samba.org</div><div class='del'>-L:	samba-technical@lists.samba.org</div><div class='del'>-W:	http://linux-cifs.samba.org/</div><div class='del'>-T:	git kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git</div><div class='del'>-S:	Supported</div><div class='del'>-</div><div class='del'>-CONFIGFS</div><div class='del'>-P:	Joel Becker</div><div class='del'>-M:	joel.becker@oracle.com</div><div class='del'>-L:	linux-kernel@vger.kernel.org</div><div class='add'>+CISCO 10G ETHERNET DRIVER</div><div class='add'>+P:	Scott Feldman</div><div class='add'>+M:	scofeldm@cisco.com</div><div class='add'>+P:	Joe Eykholt</div><div class='add'>+M:	jeykholt@cisco.com</div><div class='ctx'> S:	Supported</div><div class='ctx'> </div><div class='ctx'> CIRRUS LOGIC EP93XX ETHERNET DRIVER</div><div class='hunk'>@@ -1133,6 +1130,15 @@ L:	codalist@coda.cs.cmu.edu</div><div class='ctx'> W:	http://www.coda.cs.cmu.edu/</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='add'>+COMMON INTERNET FILE SYSTEM (CIFS)</div><div class='add'>+P:	Steve French</div><div class='add'>+M:	sfrench@samba.org</div><div class='add'>+L:	linux-cifs-client@lists.samba.org</div><div class='add'>+L:	samba-technical@lists.samba.org</div><div class='add'>+W:	http://linux-cifs.samba.org/</div><div class='add'>+T:	git kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git</div><div class='add'>+S:	Supported</div><div class='add'>+</div><div class='ctx'> COMPACTPCI HOTPLUG CORE</div><div class='ctx'> P:	Scott Murray</div><div class='ctx'> M:	scottm@somanetworks.com</div><div class='hunk'>@@ -1172,6 +1178,12 @@ L:	accessrunner-general@lists.sourceforge.net</div><div class='ctx'> W:	http://accessrunner.sourceforge.net/</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='add'>+CONFIGFS</div><div class='add'>+P:	Joel Becker</div><div class='add'>+M:	joel.becker@oracle.com</div><div class='add'>+L:	linux-kernel@vger.kernel.org</div><div class='add'>+S:	Supported</div><div class='add'>+</div><div class='ctx'> CONTROL GROUPS (CGROUPS)</div><div class='ctx'> P:	Paul Menage</div><div class='ctx'> M:	menage@google.com</div><div class='hunk'>@@ -1295,6 +1307,20 @@ W:	http://www.qsl.net/dl1bke/</div><div class='ctx'> L:	linux-hams@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='add'>+DAVICOM FAST ETHERNET (DMFE) NETWORK DRIVER</div><div class='add'>+P:	Tobias Ringstrom</div><div class='add'>+M:	tori@unhappy.mine.nu</div><div class='add'>+L:	netdev@vger.kernel.org</div><div class='add'>+S:	Maintained</div><div class='add'>+</div><div class='add'>+DC390/AM53C974 SCSI driver</div><div class='add'>+P:	Kurt Garloff</div><div class='add'>+M:	garloff@suse.de</div><div class='add'>+W:	http://www.garloff.de/kurt/linux/dc390/</div><div class='add'>+P:	Guennadi Liakhovetski</div><div class='add'>+M:	g.liakhovetski@gmx.de</div><div class='add'>+S:	Maintained</div><div class='add'>+</div><div class='ctx'> DC395x SCSI driver</div><div class='ctx'> P:	Oliver Neukum</div><div class='ctx'> M:	oliver@neukum.name</div><div class='hunk'>@@ -1307,14 +1333,6 @@ L:	dc395x@twibble.org</div><div class='ctx'> L:	http://lists.twibble.org/mailman/listinfo/dc395x/</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='del'>-DC390/AM53C974 SCSI driver</div><div class='del'>-P:	Kurt Garloff</div><div class='del'>-M:	garloff@suse.de</div><div class='del'>-W:	http://www.garloff.de/kurt/linux/dc390/</div><div class='del'>-P:	Guennadi Liakhovetski</div><div class='del'>-M:	g.liakhovetski@gmx.de</div><div class='del'>-S:	Maintained</div><div class='del'>-</div><div class='ctx'> DCCP PROTOCOL</div><div class='ctx'> P:	Arnaldo Carvalho de Melo</div><div class='ctx'> M:	acme@ghostprotocols.net</div><div class='hunk'>@@ -1345,12 +1363,6 @@ P:	Doug Warzecha</div><div class='ctx'> M:	Douglas_Warzecha@dell.com</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='del'>-DEVICE-MAPPER  (LVM)</div><div class='del'>-P:	Alasdair Kergon</div><div class='del'>-L:	dm-devel@redhat.com</div><div class='del'>-W:	http://sources.redhat.com/dm</div><div class='del'>-S:	Maintained</div><div class='del'>-</div><div class='ctx'> DEVICE NUMBER REGISTRY</div><div class='ctx'> P:	Torben Mathiasen</div><div class='ctx'> M:	device@lanana.org</div><div class='hunk'>@@ -1358,6 +1370,12 @@ W:	http://lanana.org/docs/device-list/index.html</div><div class='ctx'> L:	linux-kernel@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='add'>+DEVICE-MAPPER  (LVM)</div><div class='add'>+P:	Alasdair Kergon</div><div class='add'>+L:	dm-devel@redhat.com</div><div class='add'>+W:	http://sources.redhat.com/dm</div><div class='add'>+S:	Maintained</div><div class='add'>+</div><div class='ctx'> DIGI INTL. EPCA DRIVER</div><div class='ctx'> P:	Digi International, Inc</div><div class='ctx'> M:	Eng.Linux@digi.com</div><div class='hunk'>@@ -1365,7 +1383,7 @@ L:	Eng.Linux@digi.com</div><div class='ctx'> W:	http://www.digi.com</div><div class='ctx'> S:	Orphan</div><div class='ctx'> </div><div class='del'>-DIRECTORY NOTIFICATION</div><div class='add'>+DIRECTORY NOTIFICATION (DNOTIFY)</div><div class='ctx'> P:	Stephen Rothwell</div><div class='ctx'> M:	sfr@canb.auug.org.au</div><div class='ctx'> L:	linux-kernel@vger.kernel.org</div><div class='hunk'>@@ -1379,13 +1397,13 @@ W:	http://www.win.tue.nl/~aeb/linux/zip/zip-1.html</div><div class='ctx'> W:	http://www.win.tue.nl/~aeb/partitions/partition_types-1.html</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='del'>-DISKQUOTA:</div><div class='add'>+DISKQUOTA</div><div class='ctx'> P:	Jan Kara</div><div class='ctx'> M:	jack@suse.cz</div><div class='ctx'> L:	linux-kernel@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='del'>-DISTRIBUTED LOCK MANAGER</div><div class='add'>+DISTRIBUTED LOCK MANAGER (DLM)</div><div class='ctx'> P:	Christine Caulfield</div><div class='ctx'> M:	ccaulfie@redhat.com</div><div class='ctx'> P:	David Teigland</div><div class='hunk'>@@ -1395,12 +1413,6 @@ W:	http://sources.redhat.com/cluster/</div><div class='ctx'> T:	git kernel.org:/pub/scm/linux/kernel/git/teigland/dlm.git</div><div class='ctx'> S:	Supported</div><div class='ctx'> </div><div class='del'>-DAVICOM FAST ETHERNET (DMFE) NETWORK DRIVER</div><div class='del'>-P:	Tobias Ringstrom</div><div class='del'>-M:	tori@unhappy.mine.nu</div><div class='del'>-L:	netdev@vger.kernel.org</div><div class='del'>-S:	Maintained</div><div class='del'>-</div><div class='ctx'> DMA GENERIC OFFLOAD ENGINE SUBSYSTEM</div><div class='ctx'> P:	Maciej Sosnowski</div><div class='ctx'> M:	maciej.sosnowski@intel.com</div><div class='hunk'>@@ -1440,6 +1452,13 @@ M:	jrv@vanzandt.mv.com</div><div class='ctx'> L:	blinux-list@redhat.com</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='add'>+DPT_I2O SCSI RAID DRIVER</div><div class='add'>+P:	Adaptec OEM Raid Solutions</div><div class='add'>+M:	aacraid@adaptec.com</div><div class='add'>+L:	linux-scsi@vger.kernel.org</div><div class='add'>+W:	http://www.adaptec.com/</div><div class='add'>+S:	Maintained</div><div class='add'>+</div><div class='ctx'> DRIVER CORE, KOBJECTS, AND SYSFS</div><div class='ctx'> P:	Greg Kroah-Hartman</div><div class='ctx'> M:	gregkh@suse.de</div><div class='hunk'>@@ -1588,7 +1607,7 @@ EFS FILESYSTEM</div><div class='ctx'> W:	http://aeschi.ch.eu.org/efs/</div><div class='ctx'> S:	Orphan</div><div class='ctx'> </div><div class='del'>-EHCA (IBM GX bus InfiniBand adapter) DRIVER:</div><div class='add'>+EHCA (IBM GX bus InfiniBand adapter) DRIVER</div><div class='ctx'> P:	Hoang-Nam Nguyen</div><div class='ctx'> M:	hnguyen@de.ibm.com</div><div class='ctx'> P:	Christoph Raisch</div><div class='hunk'>@@ -1616,6 +1635,11 @@ P:	Christopher Hoover</div><div class='ctx'> M:	ch@murgatroid.com, ch@hpl.hp.com</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='add'>+EPSON S1D13XXX FRAMEBUFFER DRIVER</div><div class='add'>+P:	Kristoffer Ericson</div><div class='add'>+M:	kristoffer.ericson@gmail.com</div><div class='add'>+S:	Maintained</div><div class='add'>+</div><div class='ctx'> ETHEREXPRESS-16 NETWORK DRIVER</div><div class='ctx'> P:	Philip Blundell</div><div class='ctx'> M:	philb@gnu.org</div><div class='hunk'>@@ -1645,9 +1669,10 @@ L:	linux-ext4@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='ctx'> EXT4 FILE SYSTEM</div><div class='del'>-P:	Stephen Tweedie, Andrew Morton</div><div class='del'>-M:	sct@redhat.com, akpm@linux-foundation.org, adilger@sun.com</div><div class='add'>+P:	Theodore Ts'o</div><div class='add'>+M:	tytso@mit.edu, adilger@sun.com</div><div class='ctx'> L:	linux-ext4@vger.kernel.org</div><div class='add'>+W:	http://ext4.wiki.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='ctx'> F71805F HARDWARE MONITORING DRIVER</div><div class='hunk'>@@ -1667,6 +1692,42 @@ P:	Akinobu Mita</div><div class='ctx'> M:	akinobu.mita@gmail.com</div><div class='ctx'> S:	Supported</div><div class='ctx'> </div><div class='add'>+FILE LOCKING (flock() and fcntl()/lockf())</div><div class='add'>+P:	Matthew Wilcox</div><div class='add'>+M:	matthew@wil.cx</div><div class='add'>+L:	linux-fsdevel@vger.kernel.org</div><div class='add'>+S:	Maintained</div><div class='add'>+</div><div class='add'>+FILESYSTEMS (VFS and infrastructure)</div><div class='add'>+P:	Alexander Viro</div><div class='add'>+M:	viro@zeniv.linux.org.uk</div><div class='add'>+L:	linux-fsdevel@vger.kernel.org</div><div class='add'>+S:	Maintained</div><div class='add'>+</div><div class='add'>+FIREWIRE SUBSYSTEM (drivers/firewire, &lt;linux/firewire*.h&gt;)</div><div class='add'>+P:	Kristian Hoegsberg, Stefan Richter</div><div class='add'>+M:	krh@redhat.com, stefanr@s5r6.in-berlin.de</div><div class='add'>+L:	linux1394-devel@lists.sourceforge.net</div><div class='add'>+W:	http://www.linux1394.org/</div><div class='add'>+T:	git kernel.org:/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git</div><div class='add'>+S:	Maintained</div><div class='add'>+</div><div class='add'>+FIRMWARE LOADER (request_firmware)</div><div class='add'>+L:	linux-kernel@vger.kernel.org</div><div class='add'>+S:	Orphan</div><div class='add'>+</div><div class='add'>+FPU EMULATOR</div><div class='add'>+P:	Bill Metzenthen</div><div class='add'>+M:	billm@suburbia.net</div><div class='add'>+W:	http://suburbia.net/~billm/floating-point/emulator/</div><div class='add'>+S:	Maintained</div><div class='add'>+</div><div class='add'>+FRAME RELAY DLCI/FRAD (Sangoma drivers too)</div><div class='add'>+P:	Mike McLagan</div><div class='add'>+M:	mike.mclagan@linux.org</div><div class='add'>+L:	netdev@vger.kernel.org</div><div class='add'>+S:	Maintained</div><div class='add'>+</div><div class='ctx'> FRAMEBUFFER LAYER</div><div class='ctx'> P:	Antonino Daplas</div><div class='ctx'> M:	adaplas@gmail.com</div><div class='hunk'>@@ -1732,42 +1793,6 @@ L:	alsa-devel@alsa-project.org</div><div class='ctx'> L:	linuxppc-dev@ozlabs.org</div><div class='ctx'> S:	Supported</div><div class='ctx'> </div><div class='del'>-FILE LOCKING (flock() and fcntl()/lockf())</div><div class='del'>-P:	Matthew Wilcox</div><div class='del'>-M:	matthew@wil.cx</div><div class='del'>-L:	linux-fsdevel@vger.kernel.org</div><div class='del'>-S:	Maintained</div><div class='del'>-</div><div class='del'>-FILESYSTEMS (VFS and infrastructure)</div><div class='del'>-P:	Alexander Viro</div><div class='del'>-M:	viro@zeniv.linux.org.uk</div><div class='del'>-L:	linux-fsdevel@vger.kernel.org</div><div class='del'>-S:	Maintained</div><div class='del'>-</div><div class='del'>-FIREWIRE SUBSYSTEM (drivers/firewire, &lt;linux/firewire*.h&gt;)</div><div class='del'>-P:	Kristian Hoegsberg, Stefan Richter</div><div class='del'>-M:	krh@redhat.com, stefanr@s5r6.in-berlin.de</div><div class='del'>-L:	linux1394-devel@lists.sourceforge.net</div><div class='del'>-W:	http://www.linux1394.org/</div><div class='del'>-T:	git kernel.org:/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git</div><div class='del'>-S:	Maintained</div><div class='del'>-</div><div class='del'>-FIRMWARE LOADER (request_firmware)</div><div class='del'>-L:	linux-kernel@vger.kernel.org</div><div class='del'>-S:	Orphan</div><div class='del'>-</div><div class='del'>-FPU EMULATOR</div><div class='del'>-P:	Bill Metzenthen</div><div class='del'>-M:	billm@suburbia.net</div><div class='del'>-W:	http://suburbia.net/~billm/floating-point/emulator/</div><div class='del'>-S:	Maintained</div><div class='del'>-</div><div class='del'>-FRAME RELAY DLCI/FRAD (Sangoma drivers too)</div><div class='del'>-P:	Mike McLagan</div><div class='del'>-M:	mike.mclagan@linux.org</div><div class='del'>-L:	netdev@vger.kernel.org</div><div class='del'>-S:	Maintained</div><div class='del'>-</div><div class='ctx'> FREEVXFS FILESYSTEM</div><div class='ctx'> P:	Christoph Hellwig</div><div class='ctx'> M:	hch@infradead.org</div><div class='hunk'>@@ -1839,6 +1864,13 @@ L:	gigaset307x-common@lists.sourceforge.net</div><div class='ctx'> W:	http://gigaset307x.sourceforge.net/</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='add'>+HARD DRIVE ACTIVE PROTECTION SYSTEM (HDAPS) DRIVER</div><div class='add'>+P:	Robert Love</div><div class='add'>+M:	rlove@rlove.org</div><div class='add'>+M:	linux-kernel@vger.kernel.org</div><div class='add'>+W:	http://www.kernel.org/pub/linux/kernel/people/rml/hdaps/</div><div class='add'>+S:	Maintained</div><div class='add'>+</div><div class='ctx'> HARDWARE MONITORING</div><div class='ctx'> L:	lm-sensors@lm-sensors.org</div><div class='ctx'> W:	http://www.lm-sensors.org/</div><div class='hunk'>@@ -1847,13 +1879,6 @@ S:	Orphan</div><div class='ctx'> HARDWARE RANDOM NUMBER GENERATOR CORE</div><div class='ctx'> S:	Orphan</div><div class='ctx'> </div><div class='del'>-HARD DRIVE ACTIVE PROTECTION SYSTEM (HDAPS) DRIVER</div><div class='del'>-P:	Robert Love</div><div class='del'>-M:	rlove@rlove.org</div><div class='del'>-M:	linux-kernel@vger.kernel.org</div><div class='del'>-W:	http://www.kernel.org/pub/linux/kernel/people/rml/hdaps/</div><div class='del'>-S:	Maintained</div><div class='del'>-</div><div class='ctx'> HARMONY SOUND DRIVER</div><div class='ctx'> P:	Kyle McMartin</div><div class='ctx'> M:	kyle@mcmartin.ca</div><div class='hunk'>@@ -1867,6 +1892,24 @@ L:	linux-kernel@vger.kernel.org</div><div class='ctx'> W:	http://www.nyx.net/~arobinso</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='add'>+HEWLETT-PACKARD FIBRE CHANNEL 64-bit/66MHz PCI non-intelligent HBA</div><div class='add'>+P:	Chirag Kantharia</div><div class='add'>+M:	chirag.kantharia@hp.com</div><div class='add'>+L:	iss_storagedev@hp.com</div><div class='add'>+S:	Maintained</div><div class='add'>+</div><div class='add'>+HEWLETT-PACKARD SMART2 RAID DRIVER</div><div class='add'>+P:	Chirag Kantharia</div><div class='add'>+M:	chirag.kantharia@hp.com</div><div class='add'>+L:	iss_storagedev@hp.com</div><div class='add'>+S:	Maintained</div><div class='add'>+</div><div class='add'>+HEWLETT-PACKARD SMART CISS RAID DRIVER (cciss)</div><div class='add'>+P:	Mike Miller</div><div class='add'>+M:	mike.miller@hp.com</div><div class='add'>+L:	iss_storagedev@hp.com</div><div class='add'>+S:	Supported</div><div class='add'>+</div><div class='ctx'> HFS FILESYSTEM</div><div class='ctx'> P:	Roman Zippel</div><div class='ctx'> M:	zippel@linux-m68k.org</div><div class='hunk'>@@ -1880,6 +1923,14 @@ L:	linux-nvidia@lists.surfsouth.com</div><div class='ctx'> W:	http://drama.obuda.kando.hu/~fero/cgi-bin/hgafb.shtml</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='add'>+HIBERNATION (aka Software Suspend, aka swsusp)</div><div class='add'>+P:	Pavel Machek</div><div class='add'>+M:	pavel@suse.cz</div><div class='add'>+P:	Rafael J. Wysocki</div><div class='add'>+M:	rjw@sisk.pl</div><div class='add'>+L:	linux-pm@lists.linux-foundation.org</div><div class='add'>+S:	Supported</div><div class='add'>+</div><div class='ctx'> HID CORE LAYER</div><div class='ctx'> P:	Jiri Kosina</div><div class='ctx'> M:	jkosina@suse.cz</div><div class='hunk'>@@ -1912,24 +1963,6 @@ M:	jes@trained-monkey.org</div><div class='ctx'> L:	linux-hippi@sunsite.dk</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='del'>-HEWLETT-PACKARD FIBRE CHANNEL 64-bit/66MHz PCI non-intelligent HBA</div><div class='del'>-P:	Chirag Kantharia</div><div class='del'>-M:	chirag.kantharia@hp.com</div><div class='del'>-L:	iss_storagedev@hp.com</div><div class='del'>-S:	Maintained</div><div class='del'>-</div><div class='del'>-HEWLETT-PACKARD SMART2 RAID DRIVER</div><div class='del'>-P:	Chirag Kantharia</div><div class='del'>-M:	chirag.kantharia@hp.com</div><div class='del'>-L:	iss_storagedev@hp.com</div><div class='del'>-S:	Maintained</div><div class='del'>-</div><div class='del'>-HEWLETT-PACKARD SMART CISS RAID DRIVER (cciss)</div><div class='del'>-P:	Mike Miller</div><div class='del'>-M:	mike.miller@hp.com</div><div class='del'>-L:	iss_storagedev@hp.com</div><div class='del'>-S:	Supported</div><div class='del'>-</div><div class='ctx'> HOST AP DRIVER</div><div class='ctx'> P:	Jouni Malinen</div><div class='ctx'> M:	j@w1.fi</div><div class='hunk'>@@ -1938,16 +1971,16 @@ L:	linux-wireless@vger.kernel.org</div><div class='ctx'> W:	http://hostap.epitest.fi/</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='del'>-HP100:	Driver for HP 10/100 Mbit/s Voice Grade Network Adapter Series</div><div class='del'>-P:	Jaroslav Kysela</div><div class='del'>-M:	perex@perex.cz</div><div class='del'>-S:	Maintained</div><div class='del'>-</div><div class='ctx'> HP COMPAQ TC1100 TABLET WMI EXTRAS DRIVER</div><div class='ctx'> P:	Carlos Corbacho</div><div class='ctx'> M:	carlos@strangeworlds.co.uk</div><div class='ctx'> S:	Odd Fixes</div><div class='ctx'> </div><div class='add'>+HP100:	Driver for HP 10/100 Mbit/s Voice Grade Network Adapter Series</div><div class='add'>+P:	Jaroslav Kysela</div><div class='add'>+M:	perex@perex.cz</div><div class='add'>+S:	Maintained</div><div class='add'>+</div><div class='ctx'> HPET:	High Precision Event Timers driver (drivers/char/hpet.c)</div><div class='ctx'> P:	Clemens Ladisch</div><div class='ctx'> M:	clemens@ladisch.de</div><div class='hunk'>@@ -2027,14 +2060,6 @@ W:	http://www.ia64-linux.org/</div><div class='ctx'> T:	git kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6.git</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='del'>-SN-IA64 (Itanium) SUB-PLATFORM</div><div class='del'>-P:	Jes Sorensen</div><div class='del'>-M:	jes@sgi.com</div><div class='del'>-L:	linux-altix@sgi.com</div><div class='del'>-L:	linux-ia64@vger.kernel.org</div><div class='del'>-W:	http://www.sgi.com/altix</div><div class='del'>-S:	Maintained</div><div class='del'>-</div><div class='ctx'> IBM MCA SCSI SUBSYSTEM DRIVER</div><div class='ctx'> P:	Michael Lang</div><div class='ctx'> M:	langa2@kph.uni-mainz.de</div><div class='hunk'>@@ -2118,14 +2143,6 @@ W:	http://www.openib.org/</div><div class='ctx'> T:	git kernel.org:/pub/scm/linux/kernel/git/roland/infiniband.git</div><div class='ctx'> S:	Supported</div><div class='ctx'> </div><div class='del'>-INPUT (KEYBOARD, MOUSE, JOYSTICK, TOUCHSCREEN) DRIVERS</div><div class='del'>-P:	Dmitry Torokhov</div><div class='del'>-M:	dmitry.torokhov@gmail.com</div><div class='del'>-M:	dtor@mail.ru</div><div class='del'>-L:	linux-input@vger.kernel.org</div><div class='del'>-T:	git kernel.org:/pub/scm/linux/kernel/git/dtor/input.git</div><div class='del'>-S:	Maintained</div><div class='del'>-</div><div class='ctx'> INOTIFY</div><div class='ctx'> P:	John McCutchan</div><div class='ctx'> M:	ttb@tentacle.dhs.org</div><div class='hunk'>@@ -2134,6 +2151,14 @@ M:	rml@novell.com</div><div class='ctx'> L:	linux-kernel@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='add'>+INPUT (KEYBOARD, MOUSE, JOYSTICK, TOUCHSCREEN) DRIVERS</div><div class='add'>+P:	Dmitry Torokhov</div><div class='add'>+M:	dmitry.torokhov@gmail.com</div><div class='add'>+M:	dtor@mail.ru</div><div class='add'>+L:	linux-input@vger.kernel.org</div><div class='add'>+T:	git kernel.org:/pub/scm/linux/kernel/git/dtor/input.git</div><div class='add'>+S:	Maintained</div><div class='add'>+</div><div class='ctx'> INTEL FRAMEBUFFER DRIVER (excluding 810 and 815)</div><div class='ctx'> P:	Sylvain Meyer</div><div class='ctx'> M:	sylvain.meyer@worldonline.fr</div><div class='hunk'>@@ -2238,7 +2263,7 @@ M:	pfg@sgi.com</div><div class='ctx'> L:	linux-mips@linux-mips.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='del'>-IP MASQUERADING:</div><div class='add'>+IP MASQUERADING</div><div class='ctx'> P:	Juanjo Ciarlante</div><div class='ctx'> M:	jjciarla@raiz.uncu.edu.ar</div><div class='ctx'> S:	Maintained</div><div class='hunk'>@@ -2253,7 +2278,7 @@ M:	jesse@icplus.com.tw</div><div class='ctx'> L:	netdev@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='del'>-IPATH DRIVER:</div><div class='add'>+IPATH DRIVER</div><div class='ctx'> P:	Ralph Campbell</div><div class='ctx'> M:	infinipath@qlogic.com</div><div class='ctx'> L:	general@lists.openfabrics.org</div><div class='hunk'>@@ -2267,13 +2292,25 @@ L:	openipmi-developer@lists.sourceforge.net</div><div class='ctx'> W:	http://openipmi.sourceforge.net/</div><div class='ctx'> S:	Supported</div><div class='ctx'> </div><div class='del'>-IPX NETWORK LAYER</div><div class='del'>-P:	Arnaldo Carvalho de Melo</div><div class='del'>-M:	acme@ghostprotocols.net</div><div class='add'>+IPS SCSI RAID DRIVER</div><div class='add'>+P:	Adaptec OEM Raid Solutions</div><div class='add'>+M:	aacraid@adaptec.com</div><div class='add'>+L:	linux-scsi@vger.kernel.org</div><div class='add'>+W:	http://www.adaptec.com/</div><div class='add'>+S:	Maintained</div><div class='add'>+</div><div class='add'>+IPVS</div><div class='add'>+P:	Wensong Zhang</div><div class='add'>+M:	wensong@linux-vs.org</div><div class='add'>+P:	Simon Horman</div><div class='add'>+M:	horms@verge.net.au</div><div class='add'>+P:	Julian Anastasov</div><div class='add'>+M:	ja@ssi.bg</div><div class='ctx'> L:	netdev@vger.kernel.org</div><div class='add'>+L:	lvs-devel@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='del'>-IPWIRELES DRIVER</div><div class='add'>+IPWIRELESS DRIVER</div><div class='ctx'> P:	Jiri Kosina</div><div class='ctx'> M:	jkosina@suse.cz</div><div class='ctx'> P:	David Sterba</div><div class='hunk'>@@ -2281,6 +2318,12 @@ M:	dsterba@suse.cz</div><div class='ctx'> S:	Maintained</div><div class='ctx'> T:	git://git.kernel.org/pub/scm/linux/kernel/git/jikos/ipwireless_cs.git</div><div class='ctx'> </div><div class='add'>+IPX NETWORK LAYER</div><div class='add'>+P:	Arnaldo Carvalho de Melo</div><div class='add'>+M:	acme@ghostprotocols.net</div><div class='add'>+L:	netdev@vger.kernel.org</div><div class='add'>+S:	Maintained</div><div class='add'>+</div><div class='ctx'> IRDA SUBSYSTEM</div><div class='ctx'> P:	Samuel Ortiz</div><div class='ctx'> M:	samuel@sortiz.org</div><div class='hunk'>@@ -2288,6 +2331,11 @@ L:	irda-users@lists.sourceforge.net (subscribers-only)</div><div class='ctx'> W:	http://irda.sourceforge.net/</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='add'>+ISAPNP</div><div class='add'>+P:	Jaroslav Kysela</div><div class='add'>+M:	perex@perex.cz</div><div class='add'>+S:	Maintained</div><div class='add'>+</div><div class='ctx'> ISCSI</div><div class='ctx'> P:	Mike Christie</div><div class='ctx'> M:	michaelc@cs.wisc.edu</div><div class='hunk'>@@ -2296,11 +2344,6 @@ W:	www.open-iscsi.org</div><div class='ctx'> T:	git kernel.org:/pub/scm/linux/kernel/mnc/linux-2.6-iscsi.git</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='del'>-ISAPNP</div><div class='del'>-P:	Jaroslav Kysela</div><div class='del'>-M:	perex@perex.cz</div><div class='del'>-S:	Maintained</div><div class='del'>-</div><div class='ctx'> ISDN SUBSYSTEM</div><div class='ctx'> P:	Karsten Keil</div><div class='ctx'> M:	kkeil@suse.de</div><div class='hunk'>@@ -2325,23 +2368,6 @@ L:	video4linux-list@redhat.com</div><div class='ctx'> W:	http://www.ivtvdriver.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='del'>-JOURNALLING FLASH FILE SYSTEM V2 (JFFS2)</div><div class='del'>-P:	David Woodhouse</div><div class='del'>-M:	dwmw2@infradead.org</div><div class='del'>-L:	linux-mtd@lists.infradead.org</div><div class='del'>-W:	http://www.linux-mtd.infradead.org/doc/jffs2.html</div><div class='del'>-S:	Maintained</div><div class='del'>-</div><div class='del'>-UBI FILE SYSTEM (UBIFS)</div><div class='del'>-P:	Artem Bityutskiy</div><div class='del'>-M:	dedekind@infradead.org</div><div class='del'>-P:	Adrian Hunter</div><div class='del'>-M:	ext-adrian.hunter@nokia.com</div><div class='del'>-L:	linux-mtd@lists.infradead.org</div><div class='del'>-T:	git git://git.infradead.org/~dedekind/ubifs-2.6.git</div><div class='del'>-W:	http://www.linux-mtd.infradead.org/doc/ubifs.html</div><div class='del'>-S:	Maintained</div><div class='del'>-</div><div class='ctx'> JFS FILESYSTEM</div><div class='ctx'> P:	Dave Kleikamp</div><div class='ctx'> M:	shaggy@austin.ibm.com</div><div class='hunk'>@@ -2350,6 +2376,19 @@ W:	http://jfs.sourceforge.net/</div><div class='ctx'> T:	git kernel.org:/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git</div><div class='ctx'> S:	Supported</div><div class='ctx'> </div><div class='add'>+JME NETWORK DRIVER</div><div class='add'>+P:	Guo-Fu Tseng</div><div class='add'>+M:	cooldavid@cooldavid.org</div><div class='add'>+L:	netdev@vger.kernel.org</div><div class='add'>+S:	Maintained</div><div class='add'>+</div><div class='add'>+JOURNALLING FLASH FILE SYSTEM V2 (JFFS2)</div><div class='add'>+P:	David Woodhouse</div><div class='add'>+M:	dwmw2@infradead.org</div><div class='add'>+L:	linux-mtd@lists.infradead.org</div><div class='add'>+W:	http://www.linux-mtd.infradead.org/doc/jffs2.html</div><div class='add'>+S:	Maintained</div><div class='add'>+</div><div class='ctx'> JOURNALLING LAYER FOR BLOCK DEVICES (JBD)</div><div class='ctx'> P:	Stephen Tweedie, Andrew Morton</div><div class='ctx'> M:	sct@redhat.com, akpm@linux-foundation.org</div><div class='hunk'>@@ -2415,7 +2454,14 @@ S:	Supported</div><div class='ctx'> </div><div class='ctx'> KERNEL VIRTUAL MACHINE (KVM)</div><div class='ctx'> P:	Avi Kivity</div><div class='del'>-M:	avi@qumranet.com</div><div class='add'>+M:	avi@redhat.com</div><div class='add'>+L:	kvm@vger.kernel.org</div><div class='add'>+W:	http://kvm.qumranet.com</div><div class='add'>+S:	Supported</div><div class='add'>+</div><div class='add'>+KERNEL VIRTUAL MACHINE (KVM) FOR AMD-V</div><div class='add'>+P:	Joerg Roedel</div><div class='add'>+M:	joerg.roedel@amd.com</div><div class='ctx'> L:	kvm@vger.kernel.org</div><div class='ctx'> W:	http://kvm.qumranet.com</div><div class='ctx'> S:	Supported</div><div class='hunk'>@@ -2586,11 +2632,6 @@ W:	http://www.pasemi.com/</div><div class='ctx'> L:	linuxppc-dev@ozlabs.org</div><div class='ctx'> S:	Supported</div><div class='ctx'> </div><div class='del'>-LLC (802.2)</div><div class='del'>-P:	Arnaldo Carvalho de Melo</div><div class='del'>-M:	acme@ghostprotocols.net</div><div class='del'>-S:	Maintained</div><div class='del'>-</div><div class='ctx'> LINUX SECURITY MODULE (LSM) FRAMEWORK</div><div class='ctx'> P:	Chris Wright</div><div class='ctx'> M:	chrisw@sous-sol.org</div><div class='hunk'>@@ -2598,6 +2639,11 @@ L:	linux-security-module@vger.kernel.org</div><div class='ctx'> T:	git kernel.org:/pub/scm/linux/kernel/git/chrisw/lsm-2.6.git</div><div class='ctx'> S:	Supported</div><div class='ctx'> </div><div class='add'>+LLC (802.2)</div><div class='add'>+P:	Arnaldo Carvalho de Melo</div><div class='add'>+M:	acme@ghostprotocols.net</div><div class='add'>+S:	Maintained</div><div class='add'>+</div><div class='ctx'> LM83 HARDWARE MONITOR DRIVER</div><div class='ctx'> P:	Jean Delvare</div><div class='ctx'> M:	khali@linux-fr.org</div><div class='hunk'>@@ -2698,14 +2744,6 @@ M:	kaber@trash.net</div><div class='ctx'> L:	netdev@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='del'>-MARVELL YUKON / SYSKONNECT DRIVER</div><div class='del'>-P:	Mirko Lindner</div><div class='del'>-M:	mlindner@syskonnect.de</div><div class='del'>-P:	Ralph Roesler</div><div class='del'>-M:	rroesler@syskonnect.de</div><div class='del'>-W:	http://www.syskonnect.com</div><div class='del'>-S:	Supported</div><div class='del'>-</div><div class='ctx'> MAN-PAGES: MANUAL PAGES FOR LINUX -- Sections 2, 3, 4, 5, and 7</div><div class='ctx'> P:	Michael Kerrisk</div><div class='ctx'> M:	mtk.manpages@gmail.com</div><div class='hunk'>@@ -2725,6 +2763,14 @@ M:	buytenh@marvell.com</div><div class='ctx'> L:	netdev@vger.kernel.org</div><div class='ctx'> S:	Supported</div><div class='ctx'> </div><div class='add'>+MARVELL YUKON / SYSKONNECT DRIVER</div><div class='add'>+P:	Mirko Lindner</div><div class='add'>+M:	mlindner@syskonnect.de</div><div class='add'>+P:	Ralph Roesler</div><div class='add'>+M:	rroesler@syskonnect.de</div><div class='add'>+W:	http://www.syskonnect.com</div><div class='add'>+S:	Supported</div><div class='add'>+</div><div class='ctx'> MATROX FRAMEBUFFER DRIVER</div><div class='ctx'> P:	Petr Vandrovec</div><div class='ctx'> M:	vandrove@vc.cvut.cz</div><div class='hunk'>@@ -2761,15 +2807,6 @@ L:	linux-mm@kvack.org</div><div class='ctx'> L:	linux-kernel@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='del'>-MEI MN10300/AM33 PORT</div><div class='del'>-P:	David Howells</div><div class='del'>-M:	dhowells@redhat.com</div><div class='del'>-P:	Koichi Yasutake</div><div class='del'>-M:	yasutake.koichi@jp.panasonic.com</div><div class='del'>-L:	linux-am33-list@redhat.com (moderated for non-subscribers)</div><div class='del'>-W:	ftp://ftp.redhat.com/pub/redhat/gnupro/AM33/</div><div class='del'>-S:	Maintained</div><div class='del'>-</div><div class='ctx'> MEMORY TECHNOLOGY DEVICES (MTD)</div><div class='ctx'> P:	David Woodhouse</div><div class='ctx'> M:	dwmw2@infradead.org</div><div class='hunk'>@@ -2778,14 +2815,6 @@ L:	linux-mtd@lists.infradead.org</div><div class='ctx'> T:	git git://git.infradead.org/mtd-2.6.git</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='del'>-UNSORTED BLOCK IMAGES (UBI)</div><div class='del'>-P:	Artem Bityutskiy</div><div class='del'>-M:	dedekind@infradead.org</div><div class='del'>-W:	http://www.linux-mtd.infradead.org/</div><div class='del'>-L:	linux-mtd@lists.infradead.org</div><div class='del'>-T:	git git://git.infradead.org/~dedekind/ubi-2.6.git</div><div class='del'>-S:	Maintained</div><div class='del'>-</div><div class='ctx'> MICROTEK X6 SCANNER</div><div class='ctx'> P:	Oliver Neukum</div><div class='ctx'> M:	oliver@neukum.name</div><div class='hunk'>@@ -3017,17 +3046,6 @@ L:	netdev@vger.kernel.org</div><div class='ctx'> W:	http://www.netxen.com</div><div class='ctx'> S:	Supported</div><div class='ctx'> </div><div class='del'>-IPVS</div><div class='del'>-P:	Wensong Zhang</div><div class='del'>-M:	wensong@linux-vs.org</div><div class='del'>-P:	Simon Horman</div><div class='del'>-M:	horms@verge.net.au</div><div class='del'>-P:	Julian Anastasov</div><div class='del'>-M:	ja@ssi.bg</div><div class='del'>-L:	netdev@vger.kernel.org</div><div class='del'>-L:	lvs-devel@vger.kernel.org</div><div class='del'>-S:	Maintained</div><div class='del'>-</div><div class='ctx'> NFS, SUNRPC, AND LOCKD CLIENTS</div><div class='ctx'> P:	Trond Myklebust</div><div class='ctx'> M:	Trond.Myklebust@netapp.com</div><div class='hunk'>@@ -3073,22 +3091,6 @@ M:	adaplas@gmail.com</div><div class='ctx'> L:	linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='del'>-OPENCORES I2C BUS DRIVER</div><div class='del'>-P:	Peter Korsgaard</div><div class='del'>-M:	jacmet@sunsite.dk</div><div class='del'>-L:	i2c@lm-sensors.org</div><div class='del'>-S:	Maintained</div><div class='del'>-</div><div class='del'>-ORACLE CLUSTER FILESYSTEM 2 (OCFS2)</div><div class='del'>-P:	Mark Fasheh</div><div class='del'>-M:	mfasheh@suse.com</div><div class='del'>-P:	Joel Becker</div><div class='del'>-M:	joel.becker@oracle.com</div><div class='del'>-L:	ocfs2-devel@oss.oracle.com (moderated for non-subscribers)</div><div class='del'>-W:	http://oss.oracle.com/projects/ocfs2/</div><div class='del'>-T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2.git</div><div class='del'>-S:	Supported</div><div class='del'>-</div><div class='ctx'> OMFS FILESYSTEM</div><div class='ctx'> P:	Bob Copeland</div><div class='ctx'> M:	me@bobcopeland.com</div><div class='hunk'>@@ -3124,12 +3126,28 @@ L:	osst-users@lists.sourceforge.net</div><div class='ctx'> L:	linux-scsi@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='add'>+OPENCORES I2C BUS DRIVER</div><div class='add'>+P:	Peter Korsgaard</div><div class='add'>+M:	jacmet@sunsite.dk</div><div class='add'>+L:	i2c@lm-sensors.org</div><div class='add'>+S:	Maintained</div><div class='add'>+</div><div class='ctx'> OPROFILE</div><div class='ctx'> P:	Robert Richter</div><div class='ctx'> M:	robert.richter@amd.com</div><div class='ctx'> L:	oprofile-list@lists.sf.net</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='add'>+ORACLE CLUSTER FILESYSTEM 2 (OCFS2)</div><div class='add'>+P:	Mark Fasheh</div><div class='add'>+M:	mfasheh@suse.com</div><div class='add'>+P:	Joel Becker</div><div class='add'>+M:	joel.becker@oracle.com</div><div class='add'>+L:	ocfs2-devel@oss.oracle.com (moderated for non-subscribers)</div><div class='add'>+W:	http://oss.oracle.com/projects/ocfs2/</div><div class='add'>+T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2.git</div><div class='add'>+S:	Supported</div><div class='add'>+</div><div class='ctx'> ORINOCO DRIVER</div><div class='ctx'> P:	Pavel Roskin</div><div class='ctx'> M:	proski@gnu.org</div><div class='hunk'>@@ -3141,6 +3159,14 @@ L:	orinoco-devel@lists.sourceforge.net</div><div class='ctx'> W:	http://www.nongnu.org/orinoco/</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='add'>+P54 WIRELESS DRIVER</div><div class='add'>+P:	Michael Wu</div><div class='add'>+M:	flamingice@sourmilk.net</div><div class='add'>+L:	linux-wireless@vger.kernel.org</div><div class='add'>+W:	http://prism54.org</div><div class='add'>+T:	git kernel.org:/pub/scm/linux/kernel/git/mwu/mac80211-drivers.git</div><div class='add'>+S:	Maintained</div><div class='add'>+</div><div class='ctx'> PA SEMI ETHERNET DRIVER</div><div class='ctx'> P:	Olof Johansson</div><div class='ctx'> M:	olof@lixom.net</div><div class='hunk'>@@ -3153,10 +3179,32 @@ M:	olof@lixom.net</div><div class='ctx'> L:	i2c@lm-sensors.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='add'>+PANASONIC MN10300/AM33 PORT</div><div class='add'>+P:	David Howells</div><div class='add'>+M:	dhowells@redhat.com</div><div class='add'>+P:	Koichi Yasutake</div><div class='add'>+M:	yasutake.koichi@jp.panasonic.com</div><div class='add'>+L:	linux-am33-list@redhat.com (moderated for non-subscribers)</div><div class='add'>+W:	ftp://ftp.redhat.com/pub/redhat/gnupro/AM33/</div><div class='add'>+S:	Maintained</div><div class='add'>+</div><div class='ctx'> PARALLEL PORT SUPPORT</div><div class='ctx'> L:	linux-parport@lists.infradead.org (subscribers-only)</div><div class='ctx'> S:	Orphan</div><div class='ctx'> </div><div class='add'>+PARAVIRT_OPS INTERFACE</div><div class='add'>+P:	Jeremy Fitzhardinge</div><div class='add'>+M:	jeremy@xensource.com</div><div class='add'>+P:	Chris Wright</div><div class='add'>+M:	chrisw@sous-sol.org</div><div class='add'>+P:	Zachary Amsden</div><div class='add'>+M:	zach@vmware.com</div><div class='add'>+P:	Rusty Russell</div><div class='add'>+M:	rusty@rustcorp.com.au</div><div class='add'>+L:	virtualization@lists.osdl.org</div><div class='add'>+L:	linux-kernel@vger.kernel.org</div><div class='add'>+S:	Supported</div><div class='add'>+</div><div class='ctx'> PARIDE DRIVERS FOR PARALLEL PORT IDE DEVICES</div><div class='ctx'> P:	Tim Waugh</div><div class='ctx'> M:	tim@cyberelk.net</div><div class='hunk'>@@ -3176,19 +3224,6 @@ W:	http://www.parisc-linux.org/</div><div class='ctx'> T:	git kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6.git</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='del'>-PARAVIRT_OPS INTERFACE</div><div class='del'>-P:	Jeremy Fitzhardinge</div><div class='del'>-M:	jeremy@xensource.com</div><div class='del'>-P:	Chris Wright</div><div class='del'>-M:	chrisw@sous-sol.org</div><div class='del'>-P:	Zachary Amsden</div><div class='del'>-M:	zach@vmware.com</div><div class='del'>-P:	Rusty Russell</div><div class='del'>-M:	rusty@rustcorp.com.au</div><div class='del'>-L:	virtualization@lists.osdl.org</div><div class='del'>-L:	linux-kernel@vger.kernel.org</div><div class='del'>-S:	Supported</div><div class='del'>-</div><div class='ctx'> PC87360 HARDWARE MONITORING DRIVER</div><div class='ctx'> P:	Jim Cromie</div><div class='ctx'> M:	jim.cromie@gmail.com</div><div class='hunk'>@@ -3318,14 +3353,6 @@ L:	kpreempt-tech@lists.sourceforge.net</div><div class='ctx'> W:	ftp://ftp.kernel.org/pub/linux/kernel/people/rml/preempt-kernel</div><div class='ctx'> S:	Supported</div><div class='ctx'> </div><div class='del'>-P54 WIRELESS DRIVER</div><div class='del'>-P:	Michael Wu</div><div class='del'>-M:	flamingice@sourmilk.net</div><div class='del'>-L:	linux-wireless@vger.kernel.org</div><div class='del'>-W:	http://prism54.org</div><div class='del'>-T:	git kernel.org:/pub/scm/linux/kernel/git/mwu/mac80211-drivers.git</div><div class='del'>-S:	Maintained</div><div class='del'>-</div><div class='ctx'> PRISM54 WIRELESS DRIVER</div><div class='ctx'> P:	Luis R. Rodriguez</div><div class='ctx'> M:	mcgrof@gmail.com</div><div class='hunk'>@@ -3390,6 +3417,13 @@ M:	linux-driver@qlogic.com</div><div class='ctx'> L:	netdev@vger.kernel.org</div><div class='ctx'> S:	Supported</div><div class='ctx'> </div><div class='add'>+QLOGIC QLGE 10Gb ETHERNET DRIVER</div><div class='add'>+P:	Ron Mercer</div><div class='add'>+M:	linux-driver@qlogic.com</div><div class='add'>+M:	ron.mercer@qlogic.com</div><div class='add'>+L:	netdev@vger.kernel.org</div><div class='add'>+S:	Supported</div><div class='add'>+</div><div class='ctx'> QNX4 FILESYSTEM</div><div class='ctx'> P:	Anders Larsen</div><div class='ctx'> M:	al@alarsen.net</div><div class='hunk'>@@ -3409,13 +3443,7 @@ M:	paulus@samba.org</div><div class='ctx'> L:	linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='del'>-RAYLINK/WEBGEAR 802.11 WIRELESS LAN DRIVER</div><div class='del'>-P:	Corey Thomas</div><div class='del'>-M:	coreythomas@charter.net</div><div class='del'>-L:	linux-wireless@vger.kernel.org</div><div class='del'>-S:	Maintained</div><div class='del'>-</div><div class='del'>-RALINK RT2X00 WLAN DRIVER</div><div class='add'>+RALINK RT2X00 WIRELESS LAN DRIVER</div><div class='ctx'> P:	rt2x00 project</div><div class='ctx'> L:	linux-wireless@vger.kernel.org</div><div class='ctx'> L:	rt2400-devel@lists.sourceforge.net</div><div class='hunk'>@@ -3440,6 +3468,18 @@ M:	mporter@kernel.crashing.org</div><div class='ctx'> L:	linux-kernel@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='add'>+RAYLINK/WEBGEAR 802.11 WIRELESS LAN DRIVER</div><div class='add'>+P:	Corey Thomas</div><div class='add'>+M:	coreythomas@charter.net</div><div class='add'>+L:	linux-wireless@vger.kernel.org</div><div class='add'>+S:	Maintained</div><div class='add'>+</div><div class='add'>+RCUTORTURE MODULE</div><div class='add'>+P:	Josh Triplett</div><div class='add'>+M:	josh@freedesktop.org</div><div class='add'>+L:	linux-kernel@vger.kernel.org</div><div class='add'>+S:	Maintained</div><div class='add'>+</div><div class='ctx'> RDC R-321X SoC</div><div class='ctx'> P:	Florian Fainelli</div><div class='ctx'> M:	florian.fainelli@telecomint.eu</div><div class='hunk'>@@ -3459,12 +3499,6 @@ W:	http://www.rdrop.com/users/paulmck/rclock/</div><div class='ctx'> L:	linux-kernel@vger.kernel.org</div><div class='ctx'> S:	Supported</div><div class='ctx'> </div><div class='del'>-RCUTORTURE MODULE</div><div class='del'>-P:	Josh Triplett</div><div class='del'>-M:	josh@freedesktop.org</div><div class='del'>-L:	linux-kernel@vger.kernel.org</div><div class='del'>-S:	Maintained</div><div class='del'>-</div><div class='ctx'> REAL TIME CLOCK DRIVER</div><div class='ctx'> P:	Paul Gortmaker</div><div class='ctx'> M:	p_gortmaker@yahoo.com</div><div class='hunk'>@@ -3488,6 +3522,9 @@ L:	netdev@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	net/rfkill</div><div class='ctx'> </div><div class='add'>+RISCOM8 DRIVER</div><div class='add'>+S:	Orphan</div><div class='add'>+</div><div class='ctx'> ROCKETPORT DRIVER</div><div class='ctx'> P:	Comtrol Corp.</div><div class='ctx'> W:	http://www.comtrol.com</div><div class='hunk'>@@ -3500,9 +3537,6 @@ L:	linux-hams@vger.kernel.org</div><div class='ctx'> W:	http://www.linux-ax25.org/</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='del'>-RISCOM8 DRIVER</div><div class='del'>-S:	Orphan</div><div class='del'>-</div><div class='ctx'> RTL818X WIRELESS DRIVER</div><div class='ctx'> P:	Michael Wu</div><div class='ctx'> M:	flamingice@sourmilk.net</div><div class='hunk'>@@ -3642,6 +3676,12 @@ M:	saschasommer@freenet.de</div><div class='ctx'> L:	sdricohcs-devel@lists.sourceforge.net (subscribers-only)</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='add'>+SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) DRIVER</div><div class='add'>+P:	Pierre Ossman</div><div class='add'>+M:	drzeus-sdhci@drzeus.cx</div><div class='add'>+L:	sdhci-devel@list.drzeus.cx</div><div class='add'>+S:	Maintained</div><div class='add'>+</div><div class='ctx'> SECURITY CONTACT</div><div class='ctx'> P:	Security Officers</div><div class='ctx'> M:	security@kernel.org</div><div class='hunk'>@@ -3655,8 +3695,9 @@ M:	jmorris@namei.org</div><div class='ctx'> P:	Eric Paris</div><div class='ctx'> M:	eparis@parisplace.org</div><div class='ctx'> L:	linux-kernel@vger.kernel.org (kernel issues)</div><div class='del'>-L:	selinux@tycho.nsa.gov (subscribers-only, general discussion)</div><div class='del'>-W:	http://www.nsa.gov/selinux</div><div class='add'>+L: 	selinux@tycho.nsa.gov (subscribers-only, general discussion)</div><div class='add'>+W:	http://selinuxproject.org</div><div class='add'>+T:	git kernel.org:pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git</div><div class='ctx'> S:	Supported</div><div class='ctx'> </div><div class='ctx'> SENSABLE PHANTOM</div><div class='hunk'>@@ -3664,19 +3705,13 @@ P:	Jiri Slaby</div><div class='ctx'> M:	jirislaby@gmail.com</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='del'>-SERIAL ATA (SATA) SUBSYSTEM:</div><div class='add'>+SERIAL ATA (SATA) SUBSYSTEM</div><div class='ctx'> P:	Jeff Garzik</div><div class='ctx'> M:	jgarzik@pobox.com</div><div class='ctx'> L:	linux-ide@vger.kernel.org</div><div class='ctx'> T:	git kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git</div><div class='ctx'> S:	Supported</div><div class='ctx'> </div><div class='del'>-SGI SN-IA64 (Altix) SERIAL CONSOLE DRIVER</div><div class='del'>-P:	Pat Gefre</div><div class='del'>-M:	pfg@sgi.com</div><div class='del'>-L:	linux-ia64@vger.kernel.org</div><div class='del'>-S:	Supported</div><div class='del'>-</div><div class='ctx'> SFC NETWORK DRIVER</div><div class='ctx'> P:	Steve Hodgson</div><div class='ctx'> P:	Ben Hutchings</div><div class='hunk'>@@ -3684,6 +3719,17 @@ P:	Robert Stonehouse</div><div class='ctx'> M:	linux-net-drivers@solarflare.com</div><div class='ctx'> S:	Supported</div><div class='ctx'> </div><div class='add'>+SGI GRU DRIVER</div><div class='add'>+P:	Jack Steiner</div><div class='add'>+M:	steiner@sgi.com</div><div class='add'>+S:	Maintained</div><div class='add'>+</div><div class='add'>+SGI SN-IA64 (Altix) SERIAL CONSOLE DRIVER</div><div class='add'>+P:	Pat Gefre</div><div class='add'>+M:	pfg@sgi.com</div><div class='add'>+L:	linux-ia64@vger.kernel.org</div><div class='add'>+S:	Supported</div><div class='add'>+</div><div class='ctx'> SGI VISUAL WORKSTATION 320 AND 540</div><div class='ctx'> P:	Andrey Panin</div><div class='ctx'> M:	pazke@donpac.ru</div><div class='hunk'>@@ -3691,16 +3737,24 @@ L:	linux-visws-devel@lists.sf.net</div><div class='ctx'> W:	http://linux-visws.sf.net</div><div class='ctx'> S:	Maintained for 2.6.</div><div class='ctx'> </div><div class='del'>-SGI GRU DRIVER</div><div class='del'>-P:	Jack Steiner</div><div class='del'>-M:	steiner@sgi.com</div><div class='del'>-S:	Maintained</div><div class='del'>-</div><div class='ctx'> SGI XP/XPC/XPNET DRIVER</div><div class='ctx'> P:	Dean Nelson</div><div class='ctx'> M:	dcn@sgi.com</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='add'>+SHARP LH SUPPORT (LH7952X &amp; LH7A40X)</div><div class='add'>+P:	Marc Singer</div><div class='add'>+M:	elf@buici.com</div><div class='add'>+W:	http://projects.buici.com/arm</div><div class='add'>+L:	linux-arm-kernel@lists.arm.linux.org.uk	(subscribers-only)</div><div class='add'>+S:	Maintained</div><div class='add'>+</div><div class='add'>+SHPC HOTPLUG DRIVER</div><div class='add'>+P:	Kristen Carlson Accardi</div><div class='add'>+M:	kristen.c.accardi@intel.com</div><div class='add'>+L:	linux-pci@vger.kernel.org</div><div class='add'>+S:	Supported</div><div class='add'>+</div><div class='ctx'> SIMTEC EB110ATX (Chalice CATS)</div><div class='ctx'> P:	Ben Dooks</div><div class='ctx'> P:	Vincent Sanders</div><div class='hunk'>@@ -3746,6 +3800,12 @@ M:	thomas@winischhofer.net</div><div class='ctx'> W:	http://www.winischhofer.at/linuxsisusbvga.shtml</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='add'>+SKGE, SKY2 10/100/1000 GIGABIT ETHERNET DRIVERS</div><div class='add'>+P:	Stephen Hemminger</div><div class='add'>+M:	shemminger@linux-foundation.org</div><div class='add'>+L:	netdev@vger.kernel.org</div><div class='add'>+S:	Maintained</div><div class='add'>+</div><div class='ctx'> SLAB ALLOCATOR</div><div class='ctx'> P:	Christoph Lameter</div><div class='ctx'> M:	cl@linux-foundation.org</div><div class='hunk'>@@ -3772,12 +3832,25 @@ P:	Ben Nizette</div><div class='ctx'> M:	bn@niasdigital.com</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='add'>+SN-IA64 (Itanium) SUB-PLATFORM</div><div class='add'>+P:	Jes Sorensen</div><div class='add'>+M:	jes@sgi.com</div><div class='add'>+L:	linux-altix@sgi.com</div><div class='add'>+L:	linux-ia64@vger.kernel.org</div><div class='add'>+W:	http://www.sgi.com/altix</div><div class='add'>+S:	Maintained</div><div class='add'>+</div><div class='ctx'> SOC-CAMERA V4L2 SUBSYSTEM</div><div class='ctx'> P:	Guennadi Liakhovetski</div><div class='ctx'> M:	g.liakhovetski@gmx.de</div><div class='ctx'> L:	video4linux-list@redhat.com</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='add'>+SOEKRIS NET48XX LED SUPPORT</div><div class='add'>+P:	Chris Boot</div><div class='add'>+M:	bootc@bootc.net</div><div class='add'>+S:	Maintained</div><div class='add'>+</div><div class='ctx'> SOFTWARE RAID (Multiple Disks) SUPPORT</div><div class='ctx'> P:	Ingo Molnar</div><div class='ctx'> M:	mingo@redhat.com</div><div class='hunk'>@@ -3786,24 +3859,6 @@ M:	neilb@suse.de</div><div class='ctx'> L:	linux-raid@vger.kernel.org</div><div class='ctx'> S:	Supported</div><div class='ctx'> </div><div class='del'>-HIBERNATION (aka Software Suspend, aka swsusp):</div><div class='del'>-P:	Pavel Machek</div><div class='del'>-M:	pavel@suse.cz</div><div class='del'>-P:	Rafael J. Wysocki</div><div class='del'>-M:	rjw@sisk.pl</div><div class='del'>-L:	linux-pm@lists.linux-foundation.org</div><div class='del'>-S:	Supported</div><div class='del'>-</div><div class='del'>-SUSPEND TO RAM:</div><div class='del'>-P:	Len Brown</div><div class='del'>-M:	len.brown@intel.com</div><div class='del'>-P:	Pavel Machek</div><div class='del'>-M:	pavel@suse.cz</div><div class='del'>-P:	Rafael J. Wysocki</div><div class='del'>-M:	rjw@sisk.pl</div><div class='del'>-L:	linux-pm@lists.linux-foundation.org</div><div class='del'>-S:	Supported</div><div class='del'>-</div><div class='ctx'> SONIC NETWORK DRIVER</div><div class='ctx'> P:	Thomas Bogendoerfer</div><div class='ctx'> M:	tsbogend@alpha.franken.de</div><div class='hunk'>@@ -3833,6 +3888,8 @@ S:	Maintained</div><div class='ctx'> SOUND</div><div class='ctx'> P:	Jaroslav Kysela</div><div class='ctx'> M:	perex@perex.cz</div><div class='add'>+P:	Takashi Iwai</div><div class='add'>+M:	tiwai@suse.de</div><div class='ctx'> L:	alsa-devel@alsa-project.org (subscribers-only)</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='hunk'>@@ -3846,59 +3903,7 @@ L:	alsa-devel@alsa-project.org (subscribers-only)</div><div class='ctx'> W:	http://alsa-project.org/main/index.php/ASoC</div><div class='ctx'> S:	Supported</div><div class='ctx'> </div><div class='del'>-SPI SUBSYSTEM</div><div class='del'>-P:	David Brownell</div><div class='del'>-M:	dbrownell@users.sourceforge.net</div><div class='del'>-L:	spi-devel-general@lists.sourceforge.net</div><div class='del'>-S:	Maintained</div><div class='del'>-</div><div class='del'>-SPU FILE SYSTEM</div><div class='del'>-P:	Jeremy Kerr</div><div class='del'>-M:	jk@ozlabs.org</div><div class='del'>-L:	linuxppc-dev@ozlabs.org</div><div class='del'>-L:	cbe-oss-dev@ozlabs.org</div><div class='del'>-W:	http://www.ibm.com/developerworks/power/cell/</div><div class='del'>-S:	Supported</div><div class='del'>-</div><div class='del'>-STABLE BRANCH:</div><div class='del'>-P:	Greg Kroah-Hartman</div><div class='del'>-M:	greg@kroah.com</div><div class='del'>-P:	Chris Wright</div><div class='del'>-M:	chrisw@sous-sol.org</div><div class='del'>-L:	stable@kernel.org</div><div class='del'>-S:	Maintained</div><div class='del'>-</div><div class='del'>-SHARP LH SUPPORT (LH7952X &amp; LH7A40X)</div><div class='del'>-P:	Marc Singer</div><div class='del'>-M:	elf@buici.com</div><div class='del'>-W:	http://projects.buici.com/arm</div><div class='del'>-L:	linux-arm-kernel@lists.arm.linux.org.uk	(subscribers-only)</div><div class='del'>-S:	Maintained</div><div class='del'>-</div><div class='del'>-SHPC HOTPLUG DRIVER</div><div class='del'>-P:	Kristen Carlson Accardi</div><div class='del'>-M:	kristen.c.accardi@intel.com</div><div class='del'>-L:	linux-pci@vger.kernel.org</div><div class='del'>-S:	Supported</div><div class='del'>-</div><div class='del'>-SECURE DIGITAL HOST CONTROLLER INTERFACE DRIVER</div><div class='del'>-P:	Pierre Ossman</div><div class='del'>-M:	drzeus-sdhci@drzeus.cx</div><div class='del'>-L:	sdhci-devel@list.drzeus.cx</div><div class='del'>-S:	Maintained</div><div class='del'>-</div><div class='del'>-SKGE, SKY2 10/100/1000 GIGABIT ETHERNET DRIVERS</div><div class='del'>-P:	Stephen Hemminger</div><div class='del'>-M:	shemminger@linux-foundation.org</div><div class='del'>-L:	netdev@vger.kernel.org</div><div class='del'>-S:	Maintained</div><div class='del'>-</div><div class='del'>-SOEKRIS NET48XX LED SUPPORT</div><div class='del'>-P:	Chris Boot</div><div class='del'>-M:	bootc@bootc.net</div><div class='del'>-S:	Maintained</div><div class='del'>-</div><div class='del'>-SPARC (sparc32):</div><div class='add'>+SPARC (sparc32)</div><div class='ctx'> P:	William L. Irwin</div><div class='ctx'> M:	wli@holomorphy.com</div><div class='ctx'> L:	sparclinux@vger.kernel.org</div><div class='hunk'>@@ -3910,6 +3915,12 @@ M:	R.E.Wolff@BitWizard.nl</div><div class='ctx'> L:	linux-kernel@vger.kernel.org ?</div><div class='ctx'> S:	Supported</div><div class='ctx'> </div><div class='add'>+SPI SUBSYSTEM</div><div class='add'>+P:	David Brownell</div><div class='add'>+M:	dbrownell@users.sourceforge.net</div><div class='add'>+L:	spi-devel-general@lists.sourceforge.net</div><div class='add'>+S:	Maintained</div><div class='add'>+</div><div class='ctx'> SPIDERNET NETWORK DRIVER for CELL</div><div class='ctx'> P:	Ishizaki Kou</div><div class='ctx'> M:	kou.ishizaki@toshiba.co.jp</div><div class='hunk'>@@ -3918,12 +3929,35 @@ M:	jens@de.ibm.com</div><div class='ctx'> L:	netdev@vger.kernel.org</div><div class='ctx'> S:	Supported</div><div class='ctx'> </div><div class='add'>+SPU FILE SYSTEM</div><div class='add'>+P:	Jeremy Kerr</div><div class='add'>+M:	jk@ozlabs.org</div><div class='add'>+L:	linuxppc-dev@ozlabs.org</div><div class='add'>+L:	cbe-oss-dev@ozlabs.org</div><div class='add'>+W:	http://www.ibm.com/developerworks/power/cell/</div><div class='add'>+S:	Supported</div><div class='add'>+</div><div class='ctx'> SRM (Alpha) environment access</div><div class='ctx'> P:	Jan-Benedict Glaw</div><div class='ctx'> M:	jbglaw@lug-owl.de</div><div class='ctx'> L:	linux-kernel@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='add'>+STABLE BRANCH</div><div class='add'>+P:	Greg Kroah-Hartman</div><div class='add'>+M:	greg@kroah.com</div><div class='add'>+P:	Chris Wright</div><div class='add'>+M:	chrisw@sous-sol.org</div><div class='add'>+L:	stable@kernel.org</div><div class='add'>+S:	Maintained</div><div class='add'>+</div><div class='add'>+STAGING SUBSYSTEM</div><div class='add'>+P:	Greg Kroah-Hartman</div><div class='add'>+M:	gregkh@suse.de</div><div class='add'>+L:	linux-kernel@vger.kernel.org</div><div class='add'>+T:	quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/</div><div class='add'>+S:	Maintained</div><div class='add'>+</div><div class='ctx'> STARFIRE/DURALAN NETWORK DRIVER</div><div class='ctx'> P:	Ion Badulescu</div><div class='ctx'> M:	ionut@cs.columbia.edu</div><div class='hunk'>@@ -3939,6 +3973,12 @@ M:	laredo@gnu.org</div><div class='ctx'> W:	http://www.stradis.com/</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='add'>+SUN3/3X</div><div class='add'>+P:	Sam Creasey</div><div class='add'>+M:	sammy@sammy.net</div><div class='add'>+W:	http://sammy.net/sun3/</div><div class='add'>+S:	Maintained</div><div class='add'>+</div><div class='ctx'> SUPERH</div><div class='ctx'> P:	Paul Mundt</div><div class='ctx'> M:	lethal@linux-sh.org</div><div class='hunk'>@@ -3947,11 +3987,15 @@ W:	http://www.linux-sh.org</div><div class='ctx'> T:	git kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6.git</div><div class='ctx'> S:	Supported</div><div class='ctx'> </div><div class='del'>-SUN3/3X</div><div class='del'>-P:	Sam Creasey</div><div class='del'>-M:	sammy@sammy.net</div><div class='del'>-W:	http://sammy.net/sun3/</div><div class='del'>-S:	Maintained</div><div class='add'>+SUSPEND TO RAM</div><div class='add'>+P:	Len Brown</div><div class='add'>+M:	len.brown@intel.com</div><div class='add'>+P:	Pavel Machek</div><div class='add'>+M:	pavel@suse.cz</div><div class='add'>+P:	Rafael J. Wysocki</div><div class='add'>+M:	rjw@sisk.pl</div><div class='add'>+L:	linux-pm@lists.linux-foundation.org</div><div class='add'>+S:	Supported</div><div class='ctx'> </div><div class='ctx'> SVGA HANDLING</div><div class='ctx'> P:	Martin Mares</div><div class='hunk'>@@ -3997,7 +4041,7 @@ P:	Mark Gross</div><div class='ctx'> M:	mark.gross@intel.com</div><div class='ctx'> S:	Supported</div><div class='ctx'> </div><div class='del'>-TENSILICA XTENSA PORT (xtensa):</div><div class='add'>+TENSILICA XTENSA PORT (xtensa)</div><div class='ctx'> P:	Chris Zankel</div><div class='ctx'> M:	chris@zankel.net</div><div class='ctx'> S:	Maintained</div><div class='hunk'>@@ -4070,7 +4114,7 @@ W:	http://tpmdd.sourceforge.net</div><div class='ctx'> P:	Marcel Selhorst</div><div class='ctx'> M:	tpm@selhorst.net</div><div class='ctx'> W:	http://www.prosec.rub.de/tpm/</div><div class='del'>-L:	tpmdd-devel@lists.sourceforge.net</div><div class='add'>+L:	tpmdd-devel@lists.sourceforge.net (moderated for non-subscribers)</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='ctx'> TRIVIAL PATCHES</div><div class='hunk'>@@ -4111,6 +4155,16 @@ M:	ballabio_dario@emc.com</div><div class='ctx'> L:	linux-scsi@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='add'>+UBI FILE SYSTEM (UBIFS)</div><div class='add'>+P:	Artem Bityutskiy</div><div class='add'>+M:	dedekind@infradead.org</div><div class='add'>+P:	Adrian Hunter</div><div class='add'>+M:	ext-adrian.hunter@nokia.com</div><div class='add'>+L:	linux-mtd@lists.infradead.org</div><div class='add'>+T:	git git://git.infradead.org/~dedekind/ubifs-2.6.git</div><div class='add'>+W:	http://www.linux-mtd.infradead.org/doc/ubifs.html</div><div class='add'>+S:	Maintained</div><div class='add'>+</div><div class='ctx'> UCLINUX (AND M68KNOMMU)</div><div class='ctx'> P:	Greg Ungerer</div><div class='ctx'> M:	gerg@uclinux.org</div><div class='hunk'>@@ -4136,7 +4190,7 @@ M:	dushistov@mail.ru</div><div class='ctx'> L:	linux-kernel@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='del'>-UltraSPARC (sparc64):</div><div class='add'>+UltraSPARC (sparc64)</div><div class='ctx'> P:	David S. Miller</div><div class='ctx'> M:	davem@davemloft.net</div><div class='ctx'> L:	sparclinux@vger.kernel.org</div><div class='hunk'>@@ -4156,6 +4210,14 @@ L:	linux-kernel@vger.kernel.org</div><div class='ctx'> W:	http://www.kernel.dk</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='add'>+UNSORTED BLOCK IMAGES (UBI)</div><div class='add'>+P:	Artem Bityutskiy</div><div class='add'>+M:	dedekind@infradead.org</div><div class='add'>+W:	http://www.linux-mtd.infradead.org/</div><div class='add'>+L:	linux-mtd@lists.infradead.org</div><div class='add'>+T:	git git://git.infradead.org/~dedekind/ubi-2.6.git</div><div class='add'>+S:	Maintained</div><div class='add'>+</div><div class='ctx'> USB ACM DRIVER</div><div class='ctx'> P:	Oliver Neukum</div><div class='ctx'> M:	oliver@neukum.name</div><div class='hunk'>@@ -4345,6 +4407,12 @@ L:	linux-usb@vger.kernel.org</div><div class='ctx'> W:	http://www.connecttech.com</div><div class='ctx'> S:	Supported</div><div class='ctx'> </div><div class='add'>+USB SMSC95XX ETHERNET DRIVER</div><div class='add'>+P:	Steve Glendinning</div><div class='add'>+M:	steve.glendinning@smsc.com</div><div class='add'>+L:	netdev@vger.kernel.org</div><div class='add'>+S:	Supported</div><div class='add'>+</div><div class='ctx'> USB SN9C1xx DRIVER</div><div class='ctx'> P:	Luca Risolia</div><div class='ctx'> M:	luca.risolia@studio.unibo.it</div><div class='hunk'>@@ -4419,7 +4487,7 @@ L:	video4linux-list@redhat.com</div><div class='ctx'> W:	http://royale.zerezo.com/zr364xx/</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='del'>-USER-MODE LINUX</div><div class='add'>+USER-MODE LINUX (UML)</div><div class='ctx'> P:	Jeff Dike</div><div class='ctx'> M:	jdike@addtoit.com</div><div class='ctx'> L:	user-mode-linux-devel@lists.sourceforge.net</div><div class='hunk'>@@ -4443,7 +4511,14 @@ W:	http://kernel.org/~kzak/util-linux-ng/</div><div class='ctx'> T:	git://git.kernel.org/pub/scm/utils/util-linux-ng/util-linux-ng.git</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='del'>-VFAT/FAT/MSDOS FILESYSTEM:</div><div class='add'>+UVESAFB DRIVER</div><div class='add'>+P:	Michal Januszewski</div><div class='add'>+M:	spock@gentoo.org</div><div class='add'>+L:	linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)</div><div class='add'>+W:	http://dev.gentoo.org/~spock/projects/uvesafb/</div><div class='add'>+S:	Maintained</div><div class='add'>+</div><div class='add'>+VFAT/FAT/MSDOS FILESYSTEM</div><div class='ctx'> P:	OGAWA Hirofumi</div><div class='ctx'> M:	hirofumi@mail.parknet.co.jp</div><div class='ctx'> L:	linux-kernel@vger.kernel.org</div><div class='hunk'>@@ -4460,13 +4535,21 @@ M:	khali@linux-fr.org</div><div class='ctx'> L:	i2c@lm-sensors.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='add'>+VIA UNICHROME(PRO)/CHROME9 FRAMEBUFFER DRIVER</div><div class='add'>+P:	Joseph Chan</div><div class='add'>+M:	JosephChan@via.com.tw</div><div class='add'>+P:	Scott Fang</div><div class='add'>+M:	ScottFang@viatech.com.cn</div><div class='add'>+L:	linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)</div><div class='add'>+S:	Maintained</div><div class='add'>+</div><div class='ctx'> VIA VELOCITY NETWORK DRIVER</div><div class='ctx'> P:	Francois Romieu</div><div class='ctx'> M:	romieu@fr.zoreil.com</div><div class='ctx'> L:	netdev@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='del'>-VIDEO FOR LINUX</div><div class='add'>+VIDEO FOR LINUX (V4L)</div><div class='ctx'> P:	Mauro Carvalho Chehab</div><div class='ctx'> M:	mchehab@infradead.org</div><div class='ctx'> M:	v4l-dvb-maintainer@linuxtv.org</div><div class='hunk'>@@ -4483,10 +4566,11 @@ S:	Maintained</div><div class='ctx'> </div><div class='ctx'> VOLTAGE AND CURRENT REGULATOR FRAMEWORK</div><div class='ctx'> P:	Liam Girdwood</div><div class='del'>-M:	lg@opensource.wolfsonmicro.com</div><div class='add'>+M:	lrg@slimlogic.co.uk</div><div class='ctx'> P:	Mark Brown</div><div class='ctx'> M:	broonie@opensource.wolfsonmicro.com</div><div class='ctx'> W:	http://opensource.wolfsonmicro.com/node/15</div><div class='add'>+W:	http://www.slimlogic.co.uk/?page_id=5</div><div class='ctx'> T:	git kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6.git</div><div class='ctx'> S:	Supported</div><div class='ctx'> </div><div class='hunk'>@@ -4565,7 +4649,7 @@ WM97XX TOUCHSCREEN DRIVERS</div><div class='ctx'> P:	Mark Brown</div><div class='ctx'> M:	broonie@opensource.wolfsonmicro.com</div><div class='ctx'> P:	Liam Girdwood</div><div class='del'>-M:	liam.girdwood@wolfsonmicro.com</div><div class='add'>+M:	lrg@slimlogic.co.uk</div><div class='ctx'> L:	linux-input@vger.kernel.org</div><div class='ctx'> T:	git git://opensource.wolfsonmicro.com/linux-2.6-touch</div><div class='ctx'> W:	http://opensource.wolfsonmicro.com/node/7</div><div class='hunk'>@@ -4577,6 +4661,17 @@ M:	eis@baty.hanse.de</div><div class='ctx'> L:	linux-x25@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='add'>+X86 ARCHITECTURE (32-BIT AND 64-BIT)</div><div class='add'>+P:	Thomas Gleixner</div><div class='add'>+M:	tglx@linutronix.de</div><div class='add'>+P:	Ingo Molnar</div><div class='add'>+M:	mingo@redhat.com</div><div class='add'>+P:	H. Peter Anvin</div><div class='add'>+M:	hpa@zytor.com</div><div class='add'>+L:	linux-kernel@vger.kernel.org</div><div class='add'>+T:	git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86.git</div><div class='add'>+S:	Maintained</div><div class='add'>+</div><div class='ctx'> XEN HYPERVISOR INTERFACE</div><div class='ctx'> P:	Jeremy Fitzhardinge</div><div class='ctx'> M:	jeremy@xensource.com</div><div class='hunk'>@@ -4608,17 +4703,6 @@ M:	jacmet@sunsite.dk</div><div class='ctx'> L:	linux-serial@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='del'>-X86 ARCHITECTURE (32-BIT AND 64-BIT)</div><div class='del'>-P:	Thomas Gleixner</div><div class='del'>-M:	tglx@linutronix.de</div><div class='del'>-P:	Ingo Molnar</div><div class='del'>-M:	mingo@redhat.com</div><div class='del'>-P:	H. Peter Anvin</div><div class='del'>-M:	hpa@zytor.com</div><div class='del'>-L:	linux-kernel@vger.kernel.org</div><div class='del'>-T:	git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86.git</div><div class='del'>-S:	Maintained</div><div class='del'>-</div><div class='ctx'> YAM DRIVER FOR AX.25</div><div class='ctx'> P:	Jean-Paul Roubelat</div><div class='ctx'> M:	jpr@f6fbb.org</div><div class='head'>diff --git a/arch/Kconfig b/arch/Kconfig<br/>index 364c6dadde0a..e6ab550bceb3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/Kconfig</a></div><div class='hunk'>@@ -13,8 +13,22 @@ config OPROFILE</div><div class='ctx'> </div><div class='ctx'> 	  If unsure, say N.</div><div class='ctx'> </div><div class='add'>+config OPROFILE_IBS</div><div class='add'>+	bool "OProfile AMD IBS support (EXPERIMENTAL)"</div><div class='add'>+	default n</div><div class='add'>+	depends on OPROFILE &amp;&amp; SMP &amp;&amp; X86</div><div class='add'>+	help</div><div class='add'>+          Instruction-Based Sampling (IBS) is a new profiling</div><div class='add'>+          technique that provides rich, precise program performance</div><div class='add'>+          information. IBS is introduced by AMD Family10h processors</div><div class='add'>+          (AMD Opteron Quad-Core processor “Barcelona�) to overcome</div><div class='add'>+          the limitations of conventional performance counter</div><div class='add'>+          sampling.</div><div class='add'>+</div><div class='add'>+	  If unsure, say N.</div><div class='add'>+</div><div class='ctx'> config HAVE_OPROFILE</div><div class='del'>-	def_bool n</div><div class='add'>+	bool</div><div class='ctx'> </div><div class='ctx'> config KPROBES</div><div class='ctx'> 	bool "Kprobes"</div><div class='hunk'>@@ -28,7 +42,7 @@ config KPROBES</div><div class='ctx'> 	  If in doubt, say "N".</div><div class='ctx'> </div><div class='ctx'> config HAVE_EFFICIENT_UNALIGNED_ACCESS</div><div class='del'>-	def_bool n</div><div class='add'>+	bool</div><div class='ctx'> 	help</div><div class='ctx'> 	  Some architectures are unable to perform unaligned accesses</div><div class='ctx'> 	  without the use of get_unaligned/put_unaligned. Others are</div><div class='hunk'>@@ -51,13 +65,13 @@ config KRETPROBES</div><div class='ctx'> 	depends on KPROBES &amp;&amp; HAVE_KRETPROBES</div><div class='ctx'> </div><div class='ctx'> config HAVE_IOREMAP_PROT</div><div class='del'>-	def_bool n</div><div class='add'>+	bool</div><div class='ctx'> </div><div class='ctx'> config HAVE_KPROBES</div><div class='del'>-	def_bool n</div><div class='add'>+	bool</div><div class='ctx'> </div><div class='ctx'> config HAVE_KRETPROBES</div><div class='del'>-	def_bool n</div><div class='add'>+	bool</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # An arch should select this if it provides all these things:</div><div class='hunk'>@@ -75,16 +89,16 @@ config HAVE_KRETPROBES</div><div class='ctx'> #	signal delivery		calls tracehook_signal_handler()</div><div class='ctx'> #</div><div class='ctx'> config HAVE_ARCH_TRACEHOOK</div><div class='del'>-	def_bool n</div><div class='add'>+	bool</div><div class='ctx'> </div><div class='ctx'> config HAVE_DMA_ATTRS</div><div class='del'>-	def_bool n</div><div class='add'>+	bool</div><div class='ctx'> </div><div class='ctx'> config USE_GENERIC_SMP_HELPERS</div><div class='del'>-	def_bool n</div><div class='add'>+	bool</div><div class='ctx'> </div><div class='ctx'> config HAVE_CLK</div><div class='del'>-	def_bool n</div><div class='add'>+	bool</div><div class='ctx'> 	help</div><div class='ctx'> 	  The &lt;linux/clk.h&gt; calls support software clock gating and</div><div class='ctx'> 	  thus are a key power management tool on many systems.</div><div class='head'>diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig<br/>index 1bec55d63ef6..a0f642b6a4b9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/alpha/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/alpha/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/alpha/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/alpha/Kconfig</a></div><div class='hunk'>@@ -5,6 +5,7 @@</div><div class='ctx'> config ALPHA</div><div class='ctx'> 	bool</div><div class='ctx'> 	default y</div><div class='add'>+	select HAVE_AOUT</div><div class='ctx'> 	select HAVE_IDE</div><div class='ctx'> 	select HAVE_OPROFILE</div><div class='ctx'> 	help</div><div class='hunk'>@@ -68,9 +69,6 @@ config AUTO_IRQ_AFFINITY</div><div class='ctx'> 	depends on SMP</div><div class='ctx'> 	default y</div><div class='ctx'> </div><div class='del'>-config ARCH_SUPPORTS_AOUT</div><div class='del'>-	def_bool y</div><div class='del'>-</div><div class='ctx'> source "init/Kconfig"</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -224,8 +222,7 @@ config ALPHA_MIATA</div><div class='ctx'> 	bool "Miata"</div><div class='ctx'> 	help</div><div class='ctx'> 	  The Digital PersonalWorkStation (PWS 433a, 433au, 500a, 500au, 600a,</div><div class='del'>-	  or 600au).  There is an Installation HOWTO for this hardware at</div><div class='del'>-	  &lt;http://eijk.homelinux.org/~stefan/miata.html&gt;.</div><div class='add'>+	  or 600au).</div><div class='ctx'> </div><div class='ctx'> config ALPHA_MIKASA</div><div class='ctx'> 	bool "Mikasa"</div><div class='head'>diff --git a/arch/alpha/include/asm/a.out.h b/arch/alpha/include/asm/a.out.h<br/>index 02ce8473870a..acdc681231cb 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/alpha/include/asm/a.out.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/alpha/include/asm/a.out.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/alpha/include/asm/a.out.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/alpha/include/asm/a.out.h</a></div><div class='hunk'>@@ -95,7 +95,7 @@ struct exec</div><div class='ctx'>    Worse, we have to notice the start address before swapping to use</div><div class='ctx'>    /sbin/loader, which of course is _not_ a TASO application.  */</div><div class='ctx'> #define SET_AOUT_PERSONALITY(BFPM, EX) \</div><div class='del'>-	set_personality (((BFPM-&gt;sh_bang || EX.ah.entry &lt; 0x100000000L \</div><div class='add'>+	set_personality (((BFPM-&gt;taso || EX.ah.entry &lt; 0x100000000L \</div><div class='ctx'> 			   ? ADDR_LIMIT_32BIT : 0) | PER_OSF4))</div><div class='ctx'> </div><div class='ctx'> #endif /* __KERNEL__ */</div><div class='head'>diff --git a/arch/alpha/include/asm/elf.h b/arch/alpha/include/asm/elf.h<br/>index fc1002ea1e0c..5c75c1b2352a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/alpha/include/asm/elf.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/alpha/include/asm/elf.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/alpha/include/asm/elf.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/alpha/include/asm/elf.h</a></div><div class='hunk'>@@ -144,9 +144,9 @@ extern int dump_elf_task_fp(elf_fpreg_t *dest, struct task_struct *task);</div><div class='ctx'> 	: amask (AMASK_CIX) ? "ev6" : "ev67");	\</div><div class='ctx'> })</div><div class='ctx'> </div><div class='del'>-#define SET_PERSONALITY(EX, IBCS2)				\</div><div class='add'>+#define SET_PERSONALITY(EX)					\</div><div class='ctx'> 	set_personality(((EX).e_flags &amp; EF_ALPHA_32BIT)		\</div><div class='del'>-	   ? PER_LINUX_32BIT : (IBCS2) ? PER_SVR4 : PER_LINUX)</div><div class='add'>+	   ? PER_LINUX_32BIT : PER_LINUX)</div><div class='ctx'> </div><div class='ctx'> extern int alpha_l1i_cacheshape;</div><div class='ctx'> extern int alpha_l1d_cacheshape;</div><div class='head'>diff --git a/arch/alpha/include/asm/statfs.h b/arch/alpha/include/asm/statfs.h<br/>index ad15830baefe..de35cd438a10 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/alpha/include/asm/statfs.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/alpha/include/asm/statfs.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/alpha/include/asm/statfs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/alpha/include/asm/statfs.h</a></div><div class='hunk'>@@ -1,6 +1,10 @@</div><div class='ctx'> #ifndef _ALPHA_STATFS_H</div><div class='ctx'> #define _ALPHA_STATFS_H</div><div class='ctx'> </div><div class='add'>+/* Alpha is the only 64-bit platform with 32-bit statfs. And doesn't</div><div class='add'>+   even seem to implement statfs64 */</div><div class='add'>+#define __statfs_word __u32</div><div class='add'>+</div><div class='ctx'> #include &lt;asm-generic/statfs.h&gt;</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/alpha/kernel/pci_iommu.c b/arch/alpha/kernel/pci_iommu.c<br/>index 2179c602032a..b9094da05d7a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/alpha/kernel/pci_iommu.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/alpha/kernel/pci_iommu.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/alpha/kernel/pci_iommu.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/alpha/kernel/pci_iommu.c</a></div><div class='hunk'>@@ -41,13 +41,6 @@ mk_iommu_pte(unsigned long paddr)</div><div class='ctx'> 	return (paddr &gt;&gt; (PAGE_SHIFT-1)) | 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline long</div><div class='del'>-calc_npages(long bytes)</div><div class='del'>-{</div><div class='del'>-	return (bytes + PAGE_SIZE - 1) &gt;&gt; PAGE_SHIFT;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> /* Return the minimum of MAX or the first power of two larger</div><div class='ctx'>    than main memory.  */</div><div class='ctx'> </div><div class='hunk'>@@ -287,7 +280,7 @@ pci_map_single_1(struct pci_dev *pdev, void *cpu_addr, size_t size,</div><div class='ctx'> 	if (!arena || arena-&gt;dma_base + arena-&gt;size - 1 &gt; max_dma)</div><div class='ctx'> 		arena = hose-&gt;sg_isa;</div><div class='ctx'> </div><div class='del'>-	npages = calc_npages((paddr &amp; ~PAGE_MASK) + size);</div><div class='add'>+	npages = iommu_num_pages(paddr, size, PAGE_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	/* Force allocation to 64KB boundary for ISA bridges. */</div><div class='ctx'> 	if (pdev &amp;&amp; pdev == isa_bridge)</div><div class='hunk'>@@ -387,7 +380,7 @@ pci_unmap_single(struct pci_dev *pdev, dma_addr_t dma_addr, size_t size,</div><div class='ctx'> 		BUG();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	npages = calc_npages((dma_addr &amp; ~PAGE_MASK) + size);</div><div class='add'>+	npages = iommu_num_pages(dma_addr, size, PAGE_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;arena-&gt;lock, flags);</div><div class='ctx'> </div><div class='hunk'>@@ -580,7 +573,7 @@ sg_fill(struct device *dev, struct scatterlist *leader, struct scatterlist *end,</div><div class='ctx'> 	   contiguous.  */</div><div class='ctx'> </div><div class='ctx'> 	paddr &amp;= ~PAGE_MASK;</div><div class='del'>-	npages = calc_npages(paddr + size);</div><div class='add'>+	npages = iommu_num_pages(paddr, size, PAGE_SIZE);</div><div class='ctx'> 	dma_ofs = iommu_arena_alloc(dev, arena, npages, 0);</div><div class='ctx'> 	if (dma_ofs &lt; 0) {</div><div class='ctx'> 		/* If we attempted a direct map above but failed, die.  */</div><div class='hunk'>@@ -616,7 +609,7 @@ sg_fill(struct device *dev, struct scatterlist *leader, struct scatterlist *end,</div><div class='ctx'> 			sg++;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		npages = calc_npages((paddr &amp; ~PAGE_MASK) + size);</div><div class='add'>+		npages = iommu_num_pages(paddr, size, PAGE_SIZE);</div><div class='ctx'> </div><div class='ctx'> 		paddr &amp;= PAGE_MASK;</div><div class='ctx'> 		for (i = 0; i &lt; npages; ++i, paddr += PAGE_SIZE)</div><div class='hunk'>@@ -775,7 +768,7 @@ pci_unmap_sg(struct pci_dev *pdev, struct scatterlist *sg, int nents,</div><div class='ctx'> 		DBGA("    (%ld) sg [%lx,%lx]\n",</div><div class='ctx'> 		     sg - end + nents, addr, size);</div><div class='ctx'> </div><div class='del'>-		npages = calc_npages((addr &amp; ~PAGE_MASK) + size);</div><div class='add'>+		npages = iommu_num_pages(addr, size, PAGE_SIZE);</div><div class='ctx'> 		ofs = (addr - arena-&gt;dma_base) &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> 		iommu_arena_free(arena, ofs, npages);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/alpha/kernel/smp.c b/arch/alpha/kernel/smp.c<br/>index 83df541650fc..e657c45d91d2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/alpha/kernel/smp.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/alpha/kernel/smp.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/alpha/kernel/smp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/alpha/kernel/smp.c</a></div><div class='hunk'>@@ -27,6 +27,7 @@</div><div class='ctx'> #include &lt;linux/cache.h&gt;</div><div class='ctx'> #include &lt;linux/profile.h&gt;</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='add'>+#include &lt;linux/cpu.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/hwrpb.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='hunk'>@@ -149,6 +150,9 @@ smp_callin(void)</div><div class='ctx'> 	atomic_inc(&amp;init_mm.mm_count);</div><div class='ctx'> 	current-&gt;active_mm = &amp;init_mm;</div><div class='ctx'> </div><div class='add'>+	/* inform the notifiers about the new cpu */</div><div class='add'>+	notify_cpu_starting(cpuid);</div><div class='add'>+</div><div class='ctx'> 	/* Must have completely accurate bogos.  */</div><div class='ctx'> 	local_irq_enable();</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig<br/>index 8eedbfa52f00..e1521f32e554 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/Kconfig</a></div><div class='hunk'>@@ -8,6 +8,7 @@ mainmenu "Linux Kernel Configuration"</div><div class='ctx'> config ARM</div><div class='ctx'> 	bool</div><div class='ctx'> 	default y</div><div class='add'>+	select HAVE_AOUT</div><div class='ctx'> 	select HAVE_IDE</div><div class='ctx'> 	select RTC_LIB</div><div class='ctx'> 	select SYS_SUPPORTS_APM_EMULATION</div><div class='hunk'>@@ -140,15 +141,11 @@ config GENERIC_CALIBRATE_DELAY</div><div class='ctx'> 	bool</div><div class='ctx'> 	default y</div><div class='ctx'> </div><div class='del'>-config ARCH_SUPPORTS_AOUT</div><div class='del'>-	def_bool y</div><div class='del'>-</div><div class='ctx'> config ARCH_MAY_HAVE_PC_FDC</div><div class='ctx'> 	bool</div><div class='ctx'> </div><div class='ctx'> config ZONE_DMA</div><div class='ctx'> 	bool</div><div class='del'>-	default y</div><div class='ctx'> </div><div class='ctx'> config GENERIC_ISA_DMA</div><div class='ctx'> 	bool</div><div class='hunk'>@@ -178,6 +175,11 @@ config OPROFILE_MPCORE</div><div class='ctx'> config OPROFILE_ARM11_CORE</div><div class='ctx'> 	bool</div><div class='ctx'> </div><div class='add'>+config OPROFILE_ARMV7</div><div class='add'>+	def_bool y</div><div class='add'>+	depends on CPU_V7 &amp;&amp; !SMP</div><div class='add'>+	bool</div><div class='add'>+</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='ctx'> config VECTORS_BASE</div><div class='hunk'>@@ -245,6 +247,7 @@ config ARCH_CLPS7500</div><div class='ctx'> 	select TIMER_ACORN</div><div class='ctx'> 	select ISA</div><div class='ctx'> 	select NO_IOPORT</div><div class='add'>+	select ARCH_SPARSEMEM_ENABLE</div><div class='ctx'> 	help</div><div class='ctx'> 	  Support for the Cirrus Logic PS7500FE system-on-a-chip.</div><div class='ctx'> </div><div class='hunk'>@@ -306,6 +309,7 @@ config ARCH_IOP13XX</div><div class='ctx'> 	select PLAT_IOP</div><div class='ctx'> 	select PCI</div><div class='ctx'> 	select ARCH_SUPPORTS_MSI</div><div class='add'>+	select VMSPLIT_1G</div><div class='ctx'> 	help</div><div class='ctx'> 	  Support for Intel's IOP13XX (XScale) family of processors.</div><div class='ctx'> </div><div class='hunk'>@@ -350,6 +354,7 @@ config ARCH_IXP4XX</div><div class='ctx'> 	select GENERIC_GPIO</div><div class='ctx'> 	select GENERIC_TIME</div><div class='ctx'> 	select GENERIC_CLOCKEVENTS</div><div class='add'>+	select ZONE_DMA if PCI</div><div class='ctx'> 	help</div><div class='ctx'> 	  Support for Intel's IXP4XX (XScale) family of processors.</div><div class='ctx'> </div><div class='hunk'>@@ -434,7 +439,7 @@ config ARCH_ORION5X</div><div class='ctx'> 	help</div><div class='ctx'> 	  Support for the following Marvell Orion 5x series SoCs:</div><div class='ctx'> 	  Orion-1 (5181), Orion-VoIP (5181L), Orion-NAS (5182),</div><div class='del'>-	  Orion-2 (5281).</div><div class='add'>+	  Orion-2 (5281), Orion-1-90 (6183).</div><div class='ctx'> </div><div class='ctx'> config ARCH_PNX4008</div><div class='ctx'> 	bool "Philips Nexperia PNX4008 Mobile"</div><div class='hunk'>@@ -464,6 +469,7 @@ config ARCH_RPC</div><div class='ctx'> 	select HAVE_PATA_PLATFORM</div><div class='ctx'> 	select ISA_DMA_API</div><div class='ctx'> 	select NO_IOPORT</div><div class='add'>+	select ARCH_SPARSEMEM_ENABLE</div><div class='ctx'> 	help</div><div class='ctx'> 	  On the Acorn Risc-PC, Linux can support the internal IDE disk and</div><div class='ctx'> 	  CD-ROM interface, serial and parallel port, and the floppy drive.</div><div class='hunk'>@@ -471,9 +477,7 @@ config ARCH_RPC</div><div class='ctx'> config ARCH_SA1100</div><div class='ctx'> 	bool "SA1100-based"</div><div class='ctx'> 	select ISA</div><div class='del'>-	select ARCH_DISCONTIGMEM_ENABLE</div><div class='ctx'> 	select ARCH_SPARSEMEM_ENABLE</div><div class='del'>-	select ARCH_SELECT_MEMORY_MODEL</div><div class='ctx'> 	select ARCH_MTD_XIP</div><div class='ctx'> 	select GENERIC_GPIO</div><div class='ctx'> 	select GENERIC_TIME</div><div class='hunk'>@@ -497,6 +501,7 @@ config ARCH_SHARK</div><div class='ctx'> 	bool "Shark"</div><div class='ctx'> 	select ISA</div><div class='ctx'> 	select ISA_DMA</div><div class='add'>+	select ZONE_DMA</div><div class='ctx'> 	select PCI</div><div class='ctx'> 	help</div><div class='ctx'> 	  Support for the StrongARM based Digital DNARD machine, also known</div><div class='hunk'>@@ -504,6 +509,8 @@ config ARCH_SHARK</div><div class='ctx'> </div><div class='ctx'> config ARCH_LH7A40X</div><div class='ctx'> 	bool "Sharp LH7A40X"</div><div class='add'>+	select ARCH_DISCONTIGMEM_ENABLE if !LH7A40X_CONTIGMEM</div><div class='add'>+	select ARCH_SPARSEMEM_ENABLE if !LH7A40X_CONTIGMEM</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say Y here for systems based on one of the Sharp LH7A40X</div><div class='ctx'> 	  System on a Chip processors.  These CPUs include an ARM922T</div><div class='hunk'>@@ -515,7 +522,9 @@ config ARCH_DAVINCI</div><div class='ctx'> 	select GENERIC_TIME</div><div class='ctx'> 	select GENERIC_CLOCKEVENTS</div><div class='ctx'> 	select GENERIC_GPIO</div><div class='add'>+	select ARCH_REQUIRE_GPIOLIB</div><div class='ctx'> 	select HAVE_CLK</div><div class='add'>+	select ZONE_DMA</div><div class='ctx'> 	help</div><div class='ctx'> 	  Support for TI's DaVinci platform.</div><div class='ctx'> </div><div class='hunk'>@@ -734,6 +743,29 @@ config SMP</div><div class='ctx'> </div><div class='ctx'> 	  If you don't know what to do here, say N.</div><div class='ctx'> </div><div class='add'>+choice</div><div class='add'>+	prompt "Memory split"</div><div class='add'>+	default VMSPLIT_3G</div><div class='add'>+	help</div><div class='add'>+	  Select the desired split between kernel and user memory.</div><div class='add'>+</div><div class='add'>+	  If you are not absolutely sure what you are doing, leave this</div><div class='add'>+	  option alone!</div><div class='add'>+</div><div class='add'>+	config VMSPLIT_3G</div><div class='add'>+		bool "3G/1G user/kernel split"</div><div class='add'>+	config VMSPLIT_2G</div><div class='add'>+		bool "2G/2G user/kernel split"</div><div class='add'>+	config VMSPLIT_1G</div><div class='add'>+		bool "1G/3G user/kernel split"</div><div class='add'>+endchoice</div><div class='add'>+</div><div class='add'>+config PAGE_OFFSET</div><div class='add'>+	hex</div><div class='add'>+	default 0x40000000 if VMSPLIT_1G</div><div class='add'>+	default 0x80000000 if VMSPLIT_2G</div><div class='add'>+	default 0xC0000000</div><div class='add'>+</div><div class='ctx'> config NR_CPUS</div><div class='ctx'> 	int "Maximum number of CPUs (2-32)"</div><div class='ctx'> 	range 2 32</div><div class='hunk'>@@ -815,20 +847,18 @@ config ARCH_FLATMEM_HAS_HOLES</div><div class='ctx'> 	default y</div><div class='ctx'> 	depends on FLATMEM</div><div class='ctx'> </div><div class='add'>+# Discontigmem is deprecated</div><div class='ctx'> config ARCH_DISCONTIGMEM_ENABLE</div><div class='ctx'> 	bool</div><div class='del'>-	default (ARCH_LH7A40X &amp;&amp; !LH7A40X_CONTIGMEM)</div><div class='del'>-	help</div><div class='del'>-	  Say Y to support efficient handling of discontiguous physical memory,</div><div class='del'>-	  for architectures which are either NUMA (Non-Uniform Memory Access)</div><div class='del'>-	  or have huge holes in the physical address space for other reasons.</div><div class='del'>-	  See &lt;file:Documentation/vm/numa&gt; for more.</div><div class='ctx'> </div><div class='ctx'> config ARCH_SPARSEMEM_ENABLE</div><div class='ctx'> 	bool</div><div class='ctx'> </div><div class='add'>+config ARCH_SPARSEMEM_DEFAULT</div><div class='add'>+	def_bool ARCH_SPARSEMEM_ENABLE</div><div class='add'>+</div><div class='ctx'> config ARCH_SELECT_MEMORY_MODEL</div><div class='del'>-	bool</div><div class='add'>+	def_bool ARCH_DISCONTIGMEM_ENABLE &amp;&amp; ARCH_SPARSEMEM_ENABLE</div><div class='ctx'> </div><div class='ctx'> config NODES_SHIFT</div><div class='ctx'> 	int</div><div class='hunk'>@@ -845,7 +875,7 @@ config LEDS</div><div class='ctx'> 		   ARCH_LUBBOCK || MACH_MAINSTONE || ARCH_NETWINDER || \</div><div class='ctx'> 		   ARCH_OMAP || ARCH_P720T || ARCH_PXA_IDP || \</div><div class='ctx'> 		   ARCH_SA1100 || ARCH_SHARK || ARCH_VERSATILE || \</div><div class='del'>-		   ARCH_AT91 || MACH_TRIZEPS4 || ARCH_DAVINCI || \</div><div class='add'>+		   ARCH_AT91 || ARCH_DAVINCI || \</div><div class='ctx'> 		   ARCH_KS8695 || MACH_RD88F5182</div><div class='ctx'> 	help</div><div class='ctx'> 	  If you say Y here, the LEDs on your machine will be used</div><div class='hunk'>@@ -1005,9 +1035,9 @@ config ATAGS_PROC</div><div class='ctx'> </div><div class='ctx'> endmenu</div><div class='ctx'> </div><div class='del'>-if (ARCH_SA1100 || ARCH_INTEGRATOR || ARCH_OMAP || ARCH_IMX || ARCH_PXA)</div><div class='add'>+menu "CPU Power Management"</div><div class='ctx'> </div><div class='del'>-menu "CPU Frequency scaling"</div><div class='add'>+if (ARCH_SA1100 || ARCH_INTEGRATOR || ARCH_OMAP || ARCH_IMX || ARCH_PXA)</div><div class='ctx'> </div><div class='ctx'> source "drivers/cpufreq/Kconfig"</div><div class='ctx'> </div><div class='hunk'>@@ -1047,10 +1077,12 @@ config CPU_FREQ_PXA</div><div class='ctx'> 	default y</div><div class='ctx'> 	select CPU_FREQ_DEFAULT_GOV_USERSPACE</div><div class='ctx'> </div><div class='del'>-endmenu</div><div class='del'>-</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='add'>+source "drivers/cpuidle/Kconfig"</div><div class='add'>+</div><div class='add'>+endmenu</div><div class='add'>+</div><div class='ctx'> menu "Floating point emulation"</div><div class='ctx'> </div><div class='ctx'> comment "At least one emulation must be selected"</div><div class='hunk'>@@ -1202,6 +1234,8 @@ source "drivers/power/Kconfig"</div><div class='ctx'> </div><div class='ctx'> source "drivers/hwmon/Kconfig"</div><div class='ctx'> </div><div class='add'>+source "drivers/thermal/Kconfig"</div><div class='add'>+</div><div class='ctx'> source "drivers/watchdog/Kconfig"</div><div class='ctx'> </div><div class='ctx'> source "drivers/ssb/Kconfig"</div><div class='hunk'>@@ -1224,6 +1258,10 @@ source "drivers/uwb/Kconfig"</div><div class='ctx'> </div><div class='ctx'> source "drivers/mmc/Kconfig"</div><div class='ctx'> </div><div class='add'>+source "drivers/memstick/Kconfig"</div><div class='add'>+</div><div class='add'>+source "drivers/accessibility/Kconfig"</div><div class='add'>+</div><div class='ctx'> source "drivers/leds/Kconfig"</div><div class='ctx'> </div><div class='ctx'> source "drivers/rtc/Kconfig"</div><div class='hunk'>@@ -1232,6 +1270,8 @@ source "drivers/dma/Kconfig"</div><div class='ctx'> </div><div class='ctx'> source "drivers/dca/Kconfig"</div><div class='ctx'> </div><div class='add'>+source "drivers/auxdisplay/Kconfig"</div><div class='add'>+</div><div class='ctx'> source "drivers/regulator/Kconfig"</div><div class='ctx'> </div><div class='ctx'> source "drivers/uio/Kconfig"</div><div class='head'>diff --git a/arch/arm/Makefile b/arch/arm/Makefile<br/>index 703a44fa0f9b..7d5121260fda 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/Makefile</a></div><div class='hunk'>@@ -47,7 +47,7 @@ comma = ,</div><div class='ctx'> # Note that GCC does not numerically define an architecture version</div><div class='ctx'> # macro, but instead defines a whole series of macros which makes</div><div class='ctx'> # testing for a specific architecture or later rather impossible.</div><div class='del'>-arch-$(CONFIG_CPU_32v7)		:=-D__LINUX_ARM_ARCH__=7 $(call cc-option,-march=armv7a,-march=armv5t -Wa$(comma)-march=armv7a)</div><div class='add'>+arch-$(CONFIG_CPU_32v7)		:=-D__LINUX_ARM_ARCH__=7 $(call cc-option,-march=armv7-a,-march=armv5t -Wa$(comma)-march=armv7-a)</div><div class='ctx'> arch-$(CONFIG_CPU_32v6)		:=-D__LINUX_ARM_ARCH__=6 $(call cc-option,-march=armv6,-march=armv5t -Wa$(comma)-march=armv6)</div><div class='ctx'> # Only override the compiler option if ARMv6. The ARMv6K extensions are</div><div class='ctx'> # always available in ARMv7</div><div class='hunk'>@@ -118,9 +118,10 @@ endif</div><div class='ctx'>  machine-$(CONFIG_ARCH_IXP23XX)    := ixp23xx</div><div class='ctx'>  machine-$(CONFIG_ARCH_OMAP1)	   := omap1</div><div class='ctx'>  machine-$(CONFIG_ARCH_OMAP2)	   := omap2</div><div class='add'>+ machine-$(CONFIG_ARCH_OMAP3)	   := omap2</div><div class='ctx'>     plat-$(CONFIG_ARCH_OMAP)	   := omap</div><div class='ctx'>  machine-$(CONFIG_ARCH_S3C2410)	   := s3c2410 s3c2400 s3c2412 s3c2440 s3c2442 s3c2443</div><div class='del'>-    plat-$(CONFIG_PLAT_S3C24XX)	   := s3c24xx</div><div class='add'>+    plat-$(CONFIG_PLAT_S3C24XX)	   := s3c24xx s3c</div><div class='ctx'>  machine-$(CONFIG_ARCH_LH7A40X)	   := lh7a40x</div><div class='ctx'>  machine-$(CONFIG_ARCH_VERSATILE)  := versatile</div><div class='ctx'>  machine-$(CONFIG_ARCH_IMX)	   := imx</div><div class='head'>diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile<br/>index 94462a097f86..7a03f2007882 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/boot/compressed/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/boot/compressed/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/boot/compressed/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/boot/compressed/Makefile</a></div><div class='hunk'>@@ -76,7 +76,7 @@ KBUILD_CFLAGS = $(subst -pg, , $(ORIG_CFLAGS))</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='ctx'> EXTRA_CFLAGS  := -fpic -fno-builtin</div><div class='del'>-EXTRA_AFLAGS  :=</div><div class='add'>+EXTRA_AFLAGS  := -Wa,-march=all</div><div class='ctx'> </div><div class='ctx'> # Supply ZRELADDR, INITRD_PHYS and PARAMS_PHYS to the decompressor via</div><div class='ctx'> # linker symbols.  We only define initrd_phys and params_phys if the</div><div class='head'>diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S<br/>index d42f89b7760b..84a1e0496a3c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/boot/compressed/head.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/boot/compressed/head.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/boot/compressed/head.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/boot/compressed/head.S</a></div><div class='hunk'>@@ -421,6 +421,7 @@ __setup_mmu:	sub	r3, r4, #16384		@ Page directory size</div><div class='ctx'> 		add	r1, r1, #1048576</div><div class='ctx'> 		str	r1, [r0]</div><div class='ctx'> 		mov	pc, lr</div><div class='add'>+ENDPROC(__setup_mmu)</div><div class='ctx'> </div><div class='ctx'> __armv4_mmu_cache_on:</div><div class='ctx'> 		mov	r12, lr</div><div class='hunk'>@@ -801,7 +802,7 @@ loop1:</div><div class='ctx'> 		add	r2, r2, #4		@ add 4 (line length offset)</div><div class='ctx'> 		ldr	r4, =0x3ff</div><div class='ctx'> 		ands	r4, r4, r1, lsr #3	@ find maximum number on the way size</div><div class='del'>-		.word	0xe16f5f14		@ clz r5, r4 - find bit position of way size increment</div><div class='add'>+		clz	r5, r4			@ find bit position of way size increment</div><div class='ctx'> 		ldr	r7, =0x7fff</div><div class='ctx'> 		ands	r7, r7, r1, lsr #13	@ extract max number of the index size</div><div class='ctx'> loop2:</div><div class='head'>diff --git a/arch/arm/common/Kconfig b/arch/arm/common/Kconfig<br/>index 3e073467caca..2e32acca02fb 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/common/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/common/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/common/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/common/Kconfig</a></div><div class='hunk'>@@ -12,7 +12,8 @@ config ICST307</div><div class='ctx'> </div><div class='ctx'> config SA1111</div><div class='ctx'> 	bool</div><div class='del'>-	select DMABOUNCE</div><div class='add'>+	select DMABOUNCE if !ARCH_PXA</div><div class='add'>+	select ZONE_DMA if !ARCH_PXA</div><div class='ctx'> </div><div class='ctx'> config DMABOUNCE</div><div class='ctx'> 	bool</div><div class='head'>diff --git a/arch/arm/common/dmabounce.c b/arch/arm/common/dmabounce.c<br/>index aecc6c3f908f..f030f0775be7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/common/dmabounce.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/common/dmabounce.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/common/dmabounce.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/common/dmabounce.c</a></div><div class='hunk'>@@ -154,9 +154,7 @@ alloc_safe_buffer(struct dmabounce_device_info *device_info, void *ptr,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	write_lock_irqsave(&amp;device_info-&gt;lock, flags);</div><div class='del'>-</div><div class='ctx'> 	list_add(&amp;buf-&gt;node, &amp;device_info-&gt;safe_buffers);</div><div class='del'>-</div><div class='ctx'> 	write_unlock_irqrestore(&amp;device_info-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	return buf;</div><div class='hunk'>@@ -205,8 +203,22 @@ free_safe_buffer(struct dmabounce_device_info *device_info, struct safe_buffer *</div><div class='ctx'> </div><div class='ctx'> /* ************************************************** */</div><div class='ctx'> </div><div class='del'>-static inline dma_addr_t</div><div class='del'>-map_single(struct device *dev, void *ptr, size_t size,</div><div class='add'>+static struct safe_buffer *find_safe_buffer_dev(struct device *dev,</div><div class='add'>+		dma_addr_t dma_addr, const char *where)</div><div class='add'>+{</div><div class='add'>+	if (!dev || !dev-&gt;archdata.dmabounce)</div><div class='add'>+		return NULL;</div><div class='add'>+	if (dma_mapping_error(dev, dma_addr)) {</div><div class='add'>+		if (dev)</div><div class='add'>+			dev_err(dev, "Trying to %s invalid mapping\n", where);</div><div class='add'>+		else</div><div class='add'>+			pr_err("unknown device: Trying to %s invalid mapping\n", where);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+	return find_safe_buffer(dev-&gt;archdata.dmabounce, dma_addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline dma_addr_t map_single(struct device *dev, void *ptr, size_t size,</div><div class='ctx'> 		enum dma_data_direction dir)</div><div class='ctx'> {</div><div class='ctx'> 	struct dmabounce_device_info *device_info = dev-&gt;archdata.dmabounce;</div><div class='hunk'>@@ -270,33 +282,21 @@ map_single(struct device *dev, void *ptr, size_t size,</div><div class='ctx'> 	return dma_addr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void</div><div class='del'>-unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size,</div><div class='del'>-		enum dma_data_direction dir)</div><div class='add'>+static inline void unmap_single(struct device *dev, dma_addr_t dma_addr,</div><div class='add'>+		size_t size, enum dma_data_direction dir)</div><div class='ctx'> {</div><div class='del'>-	struct dmabounce_device_info *device_info = dev-&gt;archdata.dmabounce;</div><div class='del'>-	struct safe_buffer *buf = NULL;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Trying to unmap an invalid mapping</div><div class='del'>-	 */</div><div class='del'>-	if (dma_mapping_error(dev, dma_addr)) {</div><div class='del'>-		dev_err(dev, "Trying to unmap invalid mapping\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (device_info)</div><div class='del'>-		buf = find_safe_buffer(device_info, dma_addr);</div><div class='add'>+	struct safe_buffer *buf = find_safe_buffer_dev(dev, dma_addr, "unmap");</div><div class='ctx'> </div><div class='ctx'> 	if (buf) {</div><div class='ctx'> 		BUG_ON(buf-&gt;size != size);</div><div class='add'>+		BUG_ON(buf-&gt;direction != dir);</div><div class='ctx'> </div><div class='ctx'> 		dev_dbg(dev,</div><div class='ctx'> 			"%s: unsafe buffer %p (dma=%#x) mapped to %p (dma=%#x)\n",</div><div class='ctx'> 			__func__, buf-&gt;ptr, virt_to_dma(dev, buf-&gt;ptr),</div><div class='ctx'> 			buf-&gt;safe, buf-&gt;safe_dma_addr);</div><div class='ctx'> </div><div class='del'>-		DO_STATS ( device_info-&gt;bounce_count++ );</div><div class='add'>+		DO_STATS(dev-&gt;archdata.dmabounce-&gt;bounce_count++);</div><div class='ctx'> </div><div class='ctx'> 		if (dir == DMA_FROM_DEVICE || dir == DMA_BIDIRECTIONAL) {</div><div class='ctx'> 			void *ptr = buf-&gt;ptr;</div><div class='hunk'>@@ -317,74 +317,7 @@ unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size,</div><div class='ctx'> 			dmac_clean_range(ptr, ptr + size);</div><div class='ctx'> 			outer_clean_range(__pa(ptr), __pa(ptr) + size);</div><div class='ctx'> 		}</div><div class='del'>-		free_safe_buffer(device_info, buf);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int sync_single(struct device *dev, dma_addr_t dma_addr, size_t size,</div><div class='del'>-			enum dma_data_direction dir)</div><div class='del'>-{</div><div class='del'>-	struct dmabounce_device_info *device_info = dev-&gt;archdata.dmabounce;</div><div class='del'>-	struct safe_buffer *buf = NULL;</div><div class='del'>-</div><div class='del'>-	if (device_info)</div><div class='del'>-		buf = find_safe_buffer(device_info, dma_addr);</div><div class='del'>-</div><div class='del'>-	if (buf) {</div><div class='del'>-		/*</div><div class='del'>-		 * Both of these checks from original code need to be</div><div class='del'>-		 * commented out b/c some drivers rely on the following:</div><div class='del'>-		 *</div><div class='del'>-		 * 1) Drivers may map a large chunk of memory into DMA space</div><div class='del'>-		 *    but only sync a small portion of it. Good example is</div><div class='del'>-		 *    allocating a large buffer, mapping it, and then</div><div class='del'>-		 *    breaking it up into small descriptors. No point</div><div class='del'>-		 *    in syncing the whole buffer if you only have to</div><div class='del'>-		 *    touch one descriptor.</div><div class='del'>-		 *</div><div class='del'>-		 * 2) Buffers that are mapped as DMA_BIDIRECTIONAL are</div><div class='del'>-		 *    usually only synced in one dir at a time.</div><div class='del'>-		 *</div><div class='del'>-		 * See drivers/net/eepro100.c for examples of both cases.</div><div class='del'>-		 *</div><div class='del'>-		 * -ds</div><div class='del'>-		 *</div><div class='del'>-		 * BUG_ON(buf-&gt;size != size);</div><div class='del'>-		 * BUG_ON(buf-&gt;direction != dir);</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		dev_dbg(dev,</div><div class='del'>-			"%s: unsafe buffer %p (dma=%#x) mapped to %p (dma=%#x)\n",</div><div class='del'>-			__func__, buf-&gt;ptr, virt_to_dma(dev, buf-&gt;ptr),</div><div class='del'>-			buf-&gt;safe, buf-&gt;safe_dma_addr);</div><div class='del'>-</div><div class='del'>-		DO_STATS ( device_info-&gt;bounce_count++ );</div><div class='del'>-</div><div class='del'>-		switch (dir) {</div><div class='del'>-		case DMA_FROM_DEVICE:</div><div class='del'>-			dev_dbg(dev,</div><div class='del'>-				"%s: copy back safe %p to unsafe %p size %d\n",</div><div class='del'>-				__func__, buf-&gt;safe, buf-&gt;ptr, size);</div><div class='del'>-			memcpy(buf-&gt;ptr, buf-&gt;safe, size);</div><div class='del'>-			break;</div><div class='del'>-		case DMA_TO_DEVICE:</div><div class='del'>-			dev_dbg(dev,</div><div class='del'>-				"%s: copy out unsafe %p to safe %p, size %d\n",</div><div class='del'>-				__func__,buf-&gt;ptr, buf-&gt;safe, size);</div><div class='del'>-			memcpy(buf-&gt;safe, buf-&gt;ptr, size);</div><div class='del'>-			break;</div><div class='del'>-		case DMA_BIDIRECTIONAL:</div><div class='del'>-			BUG();	/* is this allowed?  what does it mean? */</div><div class='del'>-		default:</div><div class='del'>-			BUG();</div><div class='del'>-		}</div><div class='del'>-		/*</div><div class='del'>-		 * No need to sync the safe buffer - it was allocated</div><div class='del'>-		 * via the coherent allocators.</div><div class='del'>-		 */</div><div class='del'>-		return 0;</div><div class='del'>-	} else {</div><div class='del'>-		return 1;</div><div class='add'>+		free_safe_buffer(dev-&gt;archdata.dmabounce, buf);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -396,21 +329,29 @@ static int sync_single(struct device *dev, dma_addr_t dma_addr, size_t size,</div><div class='ctx'>  * substitute the safe buffer for the unsafe one.</div><div class='ctx'>  * (basically move the buffer from an unsafe area to a safe one)</div><div class='ctx'>  */</div><div class='del'>-dma_addr_t</div><div class='del'>-dma_map_single(struct device *dev, void *ptr, size_t size,</div><div class='add'>+dma_addr_t dma_map_single(struct device *dev, void *ptr, size_t size,</div><div class='ctx'> 		enum dma_data_direction dir)</div><div class='ctx'> {</div><div class='del'>-	dma_addr_t dma_addr;</div><div class='del'>-</div><div class='ctx'> 	dev_dbg(dev, "%s(ptr=%p,size=%d,dir=%x)\n",</div><div class='ctx'> 		__func__, ptr, size, dir);</div><div class='ctx'> </div><div class='del'>-	BUG_ON(dir == DMA_NONE);</div><div class='add'>+	BUG_ON(!valid_dma_direction(dir));</div><div class='ctx'> </div><div class='del'>-	dma_addr = map_single(dev, ptr, size, dir);</div><div class='add'>+	return map_single(dev, ptr, size, dir);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dma_map_single);</div><div class='ctx'> </div><div class='del'>-	return dma_addr;</div><div class='add'>+dma_addr_t dma_map_page(struct device *dev, struct page *page,</div><div class='add'>+		unsigned long offset, size_t size, enum dma_data_direction dir)</div><div class='add'>+{</div><div class='add'>+	dev_dbg(dev, "%s(page=%p,off=%#lx,size=%zx,dir=%x)\n",</div><div class='add'>+		__func__, page, offset, size, dir);</div><div class='add'>+</div><div class='add'>+	BUG_ON(!valid_dma_direction(dir));</div><div class='add'>+</div><div class='add'>+	return map_single(dev, page_address(page) + offset, size, dir);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(dma_map_page);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * see if a mapped address was really a "safe" buffer and if so, copy</div><div class='hunk'>@@ -419,126 +360,76 @@ dma_map_single(struct device *dev, void *ptr, size_t size,</div><div class='ctx'>  * should be)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-void</div><div class='del'>-dma_unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size,</div><div class='del'>-			enum dma_data_direction dir)</div><div class='add'>+void dma_unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size,</div><div class='add'>+		enum dma_data_direction dir)</div><div class='ctx'> {</div><div class='ctx'> 	dev_dbg(dev, "%s(ptr=%p,size=%d,dir=%x)\n",</div><div class='ctx'> 		__func__, (void *) dma_addr, size, dir);</div><div class='ctx'> </div><div class='del'>-	BUG_ON(dir == DMA_NONE);</div><div class='del'>-</div><div class='ctx'> 	unmap_single(dev, dma_addr, size, dir);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(dma_unmap_single);</div><div class='ctx'> </div><div class='del'>-int</div><div class='del'>-dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,</div><div class='del'>-		enum dma_data_direction dir)</div><div class='add'>+int dmabounce_sync_for_cpu(struct device *dev, dma_addr_t addr,</div><div class='add'>+		unsigned long off, size_t sz, enum dma_data_direction dir)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	dev_dbg(dev, "%s(sg=%p,nents=%d,dir=%x)\n",</div><div class='del'>-		__func__, sg, nents, dir);</div><div class='del'>-</div><div class='del'>-	BUG_ON(dir == DMA_NONE);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; nents; i++, sg++) {</div><div class='del'>-		struct page *page = sg_page(sg);</div><div class='del'>-		unsigned int offset = sg-&gt;offset;</div><div class='del'>-		unsigned int length = sg-&gt;length;</div><div class='del'>-		void *ptr = page_address(page) + offset;</div><div class='add'>+	struct safe_buffer *buf;</div><div class='ctx'> </div><div class='del'>-		sg-&gt;dma_address =</div><div class='del'>-			map_single(dev, ptr, length, dir);</div><div class='del'>-	}</div><div class='add'>+	dev_dbg(dev, "%s(dma=%#x,off=%#lx,sz=%zx,dir=%x)\n",</div><div class='add'>+		__func__, addr, off, sz, dir);</div><div class='ctx'> </div><div class='del'>-	return nents;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-dma_unmap_sg(struct device *dev, struct scatterlist *sg, int nents,</div><div class='del'>-		enum dma_data_direction dir)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='add'>+	buf = find_safe_buffer_dev(dev, addr, __func__);</div><div class='add'>+	if (!buf)</div><div class='add'>+		return 1;</div><div class='ctx'> </div><div class='del'>-	dev_dbg(dev, "%s(sg=%p,nents=%d,dir=%x)\n",</div><div class='del'>-		__func__, sg, nents, dir);</div><div class='add'>+	BUG_ON(buf-&gt;direction != dir);</div><div class='ctx'> </div><div class='del'>-	BUG_ON(dir == DMA_NONE);</div><div class='add'>+	dev_dbg(dev, "%s: unsafe buffer %p (dma=%#x) mapped to %p (dma=%#x)\n",</div><div class='add'>+		__func__, buf-&gt;ptr, virt_to_dma(dev, buf-&gt;ptr),</div><div class='add'>+		buf-&gt;safe, buf-&gt;safe_dma_addr);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; nents; i++, sg++) {</div><div class='del'>-		dma_addr_t dma_addr = sg-&gt;dma_address;</div><div class='del'>-		unsigned int length = sg-&gt;length;</div><div class='add'>+	DO_STATS(dev-&gt;archdata.dmabounce-&gt;bounce_count++);</div><div class='ctx'> </div><div class='del'>-		unmap_single(dev, dma_addr, length, dir);</div><div class='add'>+	if (dir == DMA_FROM_DEVICE || dir == DMA_BIDIRECTIONAL) {</div><div class='add'>+		dev_dbg(dev, "%s: copy back safe %p to unsafe %p size %d\n",</div><div class='add'>+			__func__, buf-&gt;safe + off, buf-&gt;ptr + off, sz);</div><div class='add'>+		memcpy(buf-&gt;ptr + off, buf-&gt;safe + off, sz);</div><div class='ctx'> 	}</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(dmabounce_sync_for_cpu);</div><div class='ctx'> </div><div class='del'>-void dma_sync_single_range_for_cpu(struct device *dev, dma_addr_t dma_addr,</div><div class='del'>-				   unsigned long offset, size_t size,</div><div class='del'>-				   enum dma_data_direction dir)</div><div class='del'>-{</div><div class='del'>-	dev_dbg(dev, "%s(dma=%#x,off=%#lx,size=%zx,dir=%x)\n",</div><div class='del'>-		__func__, dma_addr, offset, size, dir);</div><div class='del'>-</div><div class='del'>-	if (sync_single(dev, dma_addr, offset + size, dir))</div><div class='del'>-		dma_cache_maint(dma_to_virt(dev, dma_addr) + offset, size, dir);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(dma_sync_single_range_for_cpu);</div><div class='del'>-</div><div class='del'>-void dma_sync_single_range_for_device(struct device *dev, dma_addr_t dma_addr,</div><div class='del'>-				      unsigned long offset, size_t size,</div><div class='del'>-				      enum dma_data_direction dir)</div><div class='del'>-{</div><div class='del'>-	dev_dbg(dev, "%s(dma=%#x,off=%#lx,size=%zx,dir=%x)\n",</div><div class='del'>-		__func__, dma_addr, offset, size, dir);</div><div class='del'>-</div><div class='del'>-	if (sync_single(dev, dma_addr, offset + size, dir))</div><div class='del'>-		dma_cache_maint(dma_to_virt(dev, dma_addr) + offset, size, dir);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(dma_sync_single_range_for_device);</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg, int nents,</div><div class='del'>-			enum dma_data_direction dir)</div><div class='add'>+int dmabounce_sync_for_device(struct device *dev, dma_addr_t addr,</div><div class='add'>+		unsigned long off, size_t sz, enum dma_data_direction dir)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	dev_dbg(dev, "%s(sg=%p,nents=%d,dir=%x)\n",</div><div class='del'>-		__func__, sg, nents, dir);</div><div class='del'>-</div><div class='del'>-	BUG_ON(dir == DMA_NONE);</div><div class='add'>+	struct safe_buffer *buf;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; nents; i++, sg++) {</div><div class='del'>-		dma_addr_t dma_addr = sg-&gt;dma_address;</div><div class='del'>-		unsigned int length = sg-&gt;length;</div><div class='add'>+	dev_dbg(dev, "%s(dma=%#x,off=%#lx,sz=%zx,dir=%x)\n",</div><div class='add'>+		__func__, addr, off, sz, dir);</div><div class='ctx'> </div><div class='del'>-		sync_single(dev, dma_addr, length, dir);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg, int nents,</div><div class='del'>-			enum dma_data_direction dir)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='add'>+	buf = find_safe_buffer_dev(dev, addr, __func__);</div><div class='add'>+	if (!buf)</div><div class='add'>+		return 1;</div><div class='ctx'> </div><div class='del'>-	dev_dbg(dev, "%s(sg=%p,nents=%d,dir=%x)\n",</div><div class='del'>-		__func__, sg, nents, dir);</div><div class='add'>+	BUG_ON(buf-&gt;direction != dir);</div><div class='ctx'> </div><div class='del'>-	BUG_ON(dir == DMA_NONE);</div><div class='add'>+	dev_dbg(dev, "%s: unsafe buffer %p (dma=%#x) mapped to %p (dma=%#x)\n",</div><div class='add'>+		__func__, buf-&gt;ptr, virt_to_dma(dev, buf-&gt;ptr),</div><div class='add'>+		buf-&gt;safe, buf-&gt;safe_dma_addr);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; nents; i++, sg++) {</div><div class='del'>-		dma_addr_t dma_addr = sg-&gt;dma_address;</div><div class='del'>-		unsigned int length = sg-&gt;length;</div><div class='add'>+	DO_STATS(dev-&gt;archdata.dmabounce-&gt;bounce_count++);</div><div class='ctx'> </div><div class='del'>-		sync_single(dev, dma_addr, length, dir);</div><div class='add'>+	if (dir == DMA_TO_DEVICE || dir == DMA_BIDIRECTIONAL) {</div><div class='add'>+		dev_dbg(dev, "%s: copy out unsafe %p to safe %p, size %d\n",</div><div class='add'>+			__func__,buf-&gt;ptr + off, buf-&gt;safe + off, sz);</div><div class='add'>+		memcpy(buf-&gt;safe + off, buf-&gt;ptr + off, sz);</div><div class='ctx'> 	}</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(dmabounce_sync_for_device);</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-dmabounce_init_pool(struct dmabounce_pool *pool, struct device *dev, const char *name,</div><div class='del'>-		    unsigned long size)</div><div class='add'>+static int dmabounce_init_pool(struct dmabounce_pool *pool, struct device *dev,</div><div class='add'>+		const char *name, unsigned long size)</div><div class='ctx'> {</div><div class='ctx'> 	pool-&gt;size = size;</div><div class='ctx'> 	DO_STATS(pool-&gt;allocs = 0);</div><div class='hunk'>@@ -549,9 +440,8 @@ dmabounce_init_pool(struct dmabounce_pool *pool, struct device *dev, const char</div><div class='ctx'> 	return pool-&gt;pool ? 0 : -ENOMEM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int</div><div class='del'>-dmabounce_register_dev(struct device *dev, unsigned long small_buffer_size,</div><div class='del'>-			unsigned long large_buffer_size)</div><div class='add'>+int dmabounce_register_dev(struct device *dev, unsigned long small_buffer_size,</div><div class='add'>+		unsigned long large_buffer_size)</div><div class='ctx'> {</div><div class='ctx'> 	struct dmabounce_device_info *device_info;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -607,9 +497,9 @@ dmabounce_register_dev(struct device *dev, unsigned long small_buffer_size,</div><div class='ctx'> 	kfree(device_info);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(dmabounce_register_dev);</div><div class='ctx'> </div><div class='del'>-void</div><div class='del'>-dmabounce_unregister_dev(struct device *dev)</div><div class='add'>+void dmabounce_unregister_dev(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct dmabounce_device_info *device_info = dev-&gt;archdata.dmabounce;</div><div class='ctx'> </div><div class='hunk'>@@ -642,15 +532,6 @@ dmabounce_unregister_dev(struct device *dev)</div><div class='ctx'> </div><div class='ctx'> 	dev_info(dev, "dmabounce: device unregistered\n");</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(dma_map_single);</div><div class='del'>-EXPORT_SYMBOL(dma_unmap_single);</div><div class='del'>-EXPORT_SYMBOL(dma_map_sg);</div><div class='del'>-EXPORT_SYMBOL(dma_unmap_sg);</div><div class='del'>-EXPORT_SYMBOL(dma_sync_sg_for_cpu);</div><div class='del'>-EXPORT_SYMBOL(dma_sync_sg_for_device);</div><div class='del'>-EXPORT_SYMBOL(dmabounce_register_dev);</div><div class='ctx'> EXPORT_SYMBOL(dmabounce_unregister_dev);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Christopher Hoover &lt;ch@hpl.hp.com&gt;, Deepak Saxena &lt;dsaxena@plexity.net&gt;");</div><div class='head'>diff --git a/arch/arm/common/gic.c b/arch/arm/common/gic.c<br/>index 0c89bd35e06f..7fc9860a97d7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/common/gic.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/common/gic.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/common/gic.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/common/gic.c</a></div><div class='hunk'>@@ -27,9 +27,9 @@</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/cpumask.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/gic.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/common/it8152.c b/arch/arm/common/it8152.c<br/>index 5fe9588db077..2793447621c3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/common/it8152.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/common/it8152.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/common/it8152.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/common/it8152.c</a></div><div class='hunk'>@@ -66,14 +66,6 @@ static void it8152_unmask_irq(unsigned int irq)</div><div class='ctx'>        }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void it8152_irq(int irq)</div><div class='del'>-{</div><div class='del'>-	struct irq_desc *desc;</div><div class='del'>-</div><div class='del'>-	desc = irq_desc + irq;</div><div class='del'>-	desc_handle_irq(irq, desc);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static struct irq_chip it8152_irq_chip = {</div><div class='ctx'> 	.name		= "it8152",</div><div class='ctx'> 	.ack		= it8152_mask_irq,</div><div class='hunk'>@@ -128,21 +120,21 @@ void it8152_irq_demux(unsigned int irq, struct irq_desc *desc)</div><div class='ctx'> 	       bits_pd &amp;= ((1 &lt;&lt; IT8152_PD_IRQ_COUNT) - 1);</div><div class='ctx'> 	       while (bits_pd) {</div><div class='ctx'> 		       i = __ffs(bits_pd);</div><div class='del'>-		       it8152_irq(IT8152_PD_IRQ(i));</div><div class='add'>+		       generic_handle_irq(IT8152_PD_IRQ(i));</div><div class='ctx'> 		       bits_pd &amp;= ~(1 &lt;&lt; i);</div><div class='ctx'> 	       }</div><div class='ctx'> </div><div class='ctx'> 	       bits_lp &amp;= ((1 &lt;&lt; IT8152_LP_IRQ_COUNT) - 1);</div><div class='ctx'> 	       while (bits_lp) {</div><div class='ctx'> 		       i = __ffs(bits_lp);</div><div class='del'>-		       it8152_irq(IT8152_LP_IRQ(i));</div><div class='add'>+		       generic_handle_irq(IT8152_LP_IRQ(i));</div><div class='ctx'> 		       bits_lp &amp;= ~(1 &lt;&lt; i);</div><div class='ctx'> 	       }</div><div class='ctx'> </div><div class='ctx'> 	       bits_ld &amp;= ((1 &lt;&lt; IT8152_LD_IRQ_COUNT) - 1);</div><div class='ctx'> 	       while (bits_ld) {</div><div class='ctx'> 		       i = __ffs(bits_ld);</div><div class='del'>-		       it8152_irq(IT8152_LD_IRQ(i));</div><div class='add'>+		       generic_handle_irq(IT8152_LD_IRQ(i));</div><div class='ctx'> 		       bits_ld &amp;= ~(1 &lt;&lt; i);</div><div class='ctx'> 	       }</div><div class='ctx'>        }</div><div class='head'>diff --git a/arch/arm/common/locomo.c b/arch/arm/common/locomo.c<br/>index 283051eaf931..7c6b4b99a2df 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/common/locomo.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/common/locomo.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/common/locomo.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/common/locomo.c</a></div><div class='hunk'>@@ -24,9 +24,9 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -169,7 +169,6 @@ static struct locomo_dev_info locomo_devices[] = {</div><div class='ctx'> static void locomo_handler(unsigned int irq, struct irq_desc *desc)</div><div class='ctx'> {</div><div class='ctx'> 	int req, i;</div><div class='del'>-	struct irq_desc *d;</div><div class='ctx'> 	void __iomem *mapbase = get_irq_chip_data(irq);</div><div class='ctx'> </div><div class='ctx'> 	/* Acknowledge the parent IRQ */</div><div class='hunk'>@@ -181,10 +180,9 @@ static void locomo_handler(unsigned int irq, struct irq_desc *desc)</div><div class='ctx'> 	if (req) {</div><div class='ctx'> 		/* generate the next interrupt(s) */</div><div class='ctx'> 		irq = LOCOMO_IRQ_START;</div><div class='del'>-		d = irq_desc + irq;</div><div class='del'>-		for (i = 0; i &lt;= 3; i++, d++, irq++) {</div><div class='add'>+		for (i = 0; i &lt;= 3; i++, irq++) {</div><div class='ctx'> 			if (req &amp; (0x0100 &lt;&lt; i)) {</div><div class='del'>-				desc_handle_irq(irq, d);</div><div class='add'>+				generic_handle_irq(irq);</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 		}</div><div class='hunk'>@@ -222,12 +220,10 @@ static struct irq_chip locomo_chip = {</div><div class='ctx'> </div><div class='ctx'> static void locomo_key_handler(unsigned int irq, struct irq_desc *desc)</div><div class='ctx'> {</div><div class='del'>-	struct irq_desc *d;</div><div class='ctx'> 	void __iomem *mapbase = get_irq_chip_data(irq);</div><div class='ctx'> </div><div class='ctx'> 	if (locomo_readl(mapbase + LOCOMO_KEYBOARD + LOCOMO_KIC) &amp; 0x0001) {</div><div class='del'>-		d = irq_desc + LOCOMO_IRQ_KEY_START;</div><div class='del'>-		desc_handle_irq(LOCOMO_IRQ_KEY_START, d);</div><div class='add'>+		generic_handle_irq(LOCOMO_IRQ_KEY_START);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -268,7 +264,6 @@ static struct irq_chip locomo_key_chip = {</div><div class='ctx'> static void locomo_gpio_handler(unsigned int irq, struct irq_desc *desc)</div><div class='ctx'> {</div><div class='ctx'> 	int req, i;</div><div class='del'>-	struct irq_desc *d;</div><div class='ctx'> 	void __iomem *mapbase = get_irq_chip_data(irq);</div><div class='ctx'> </div><div class='ctx'> 	req = 	locomo_readl(mapbase + LOCOMO_GIR) &amp;</div><div class='hunk'>@@ -277,10 +272,9 @@ static void locomo_gpio_handler(unsigned int irq, struct irq_desc *desc)</div><div class='ctx'> </div><div class='ctx'> 	if (req) {</div><div class='ctx'> 		irq = LOCOMO_IRQ_GPIO_START;</div><div class='del'>-		d = irq_desc + LOCOMO_IRQ_GPIO_START;</div><div class='del'>-		for (i = 0; i &lt;= 15; i++, irq++, d++) {</div><div class='add'>+		for (i = 0; i &lt;= 15; i++, irq++) {</div><div class='ctx'> 			if (req &amp; (0x0001 &lt;&lt; i)) {</div><div class='del'>-				desc_handle_irq(irq, d);</div><div class='add'>+				generic_handle_irq(irq);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -361,12 +355,10 @@ static struct irq_chip locomo_gpio_chip = {</div><div class='ctx'> </div><div class='ctx'> static void locomo_lt_handler(unsigned int irq, struct irq_desc *desc)</div><div class='ctx'> {</div><div class='del'>-	struct irq_desc *d;</div><div class='ctx'> 	void __iomem *mapbase = get_irq_chip_data(irq);</div><div class='ctx'> </div><div class='ctx'> 	if (locomo_readl(mapbase + LOCOMO_LTINT) &amp; 0x0001) {</div><div class='del'>-		d = irq_desc + LOCOMO_IRQ_LT_START;</div><div class='del'>-		desc_handle_irq(LOCOMO_IRQ_LT_START, d);</div><div class='add'>+		generic_handle_irq(LOCOMO_IRQ_LT_START);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -407,17 +399,15 @@ static struct irq_chip locomo_lt_chip = {</div><div class='ctx'> static void locomo_spi_handler(unsigned int irq, struct irq_desc *desc)</div><div class='ctx'> {</div><div class='ctx'> 	int req, i;</div><div class='del'>-	struct irq_desc *d;</div><div class='ctx'> 	void __iomem *mapbase = get_irq_chip_data(irq);</div><div class='ctx'> </div><div class='ctx'> 	req = locomo_readl(mapbase + LOCOMO_SPI + LOCOMO_SPIIR) &amp; 0x000F;</div><div class='ctx'> 	if (req) {</div><div class='ctx'> 		irq = LOCOMO_IRQ_SPI_START;</div><div class='del'>-		d = irq_desc + irq;</div><div class='ctx'> </div><div class='del'>-		for (i = 0; i &lt;= 3; i++, irq++, d++) {</div><div class='add'>+		for (i = 0; i &lt;= 3; i++, irq++) {</div><div class='ctx'> 			if (req &amp; (0x0001 &lt;&lt; i)) {</div><div class='del'>-				desc_handle_irq(irq, d);</div><div class='add'>+				generic_handle_irq(irq);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c<br/>index ec8a5471bf06..fb86f248aab8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/common/sa1111.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/common/sa1111.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/common/sa1111.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/common/sa1111.c</a></div><div class='hunk'>@@ -25,10 +25,10 @@</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> #include &lt;asm/sizes.h&gt;</div><div class='head'>diff --git a/arch/arm/common/scoop.c b/arch/arm/common/scoop.c<br/>index ae39553589dd..697c64913990 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/common/scoop.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/common/scoop.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/common/scoop.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/common/scoop.c</a></div><div class='hunk'>@@ -15,7 +15,7 @@</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;asm/gpio.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/scoop.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/common/sharpsl_param.c b/arch/arm/common/sharpsl_param.c<br/>index aad4d94ba8f5..d56c932580eb 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/common/sharpsl_param.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/common/sharpsl_param.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/common/sharpsl_param.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/common/sharpsl_param.c</a></div><div class='hunk'>@@ -12,6 +12,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;asm/mach/sharpsl_param.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -36,6 +37,7 @@</div><div class='ctx'> #define PHAD_MAGIC	MAGIC_CHG('P','H','A','D')</div><div class='ctx'> </div><div class='ctx'> struct sharpsl_param_info sharpsl_param;</div><div class='add'>+EXPORT_SYMBOL(sharpsl_param);</div><div class='ctx'> </div><div class='ctx'> void sharpsl_save_param(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/arm/common/time-acorn.c b/arch/arm/common/time-acorn.c<br/>index df0983aafe69..deeed561b168 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/common/time-acorn.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/common/time-acorn.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/common/time-acorn.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/common/time-acorn.c</a></div><div class='hunk'>@@ -17,9 +17,9 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/ioc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='head'>diff --git a/arch/arm/common/uengine.c b/arch/arm/common/uengine.c<br/>index 7ecd3c0ab011..b520e56216a9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/common/uengine.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/common/uengine.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/common/uengine.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/common/uengine.c</a></div><div class='hunk'>@@ -16,9 +16,9 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/uengine.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_ARCH_IXP2000)</div><div class='ctx'> #define IXP_UENGINE_CSR_VIRT_BASE	IXP2000_UENGINE_CSR_VIRT_BASE</div><div class='head'>diff --git a/arch/arm/common/via82c505.c b/arch/arm/common/via82c505.c<br/>index 79a8206e62ac..8421d39109b3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/common/via82c505.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/common/via82c505.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/common/via82c505.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/common/via82c505.c</a></div><div class='hunk'>@@ -4,8 +4,8 @@</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/pci.h&gt;</div><div class='head'>diff --git a/arch/arm/common/vic.c b/arch/arm/common/vic.c<br/>index c026fa2214a3..f1e4b8f60cab 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/common/vic.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/common/vic.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/common/vic.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/common/vic.c</a></div><div class='hunk'>@@ -20,8 +20,8 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/vic.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/configs/afeb9260_defconfig b/arch/arm/configs/afeb9260_defconfig<br/>new file mode 100644<br/>index 000000000000..ce909586a34f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/configs/afeb9260_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/configs/afeb9260_defconfig</a></div><div class='hunk'>@@ -0,0 +1,1259 @@</div><div class='add'>+#</div><div class='add'>+# Automatically generated make config: don't edit</div><div class='add'>+# Linux kernel version: 2.6.27-rc2</div><div class='add'>+# Tue Aug 12 22:30:16 2008</div><div class='add'>+#</div><div class='add'>+CONFIG_ARM=y</div><div class='add'>+CONFIG_SYS_SUPPORTS_APM_EMULATION=y</div><div class='add'>+CONFIG_GENERIC_GPIO=y</div><div class='add'>+CONFIG_GENERIC_TIME=y</div><div class='add'>+CONFIG_GENERIC_CLOCKEVENTS=y</div><div class='add'>+CONFIG_MMU=y</div><div class='add'>+# CONFIG_NO_IOPORT is not set</div><div class='add'>+CONFIG_GENERIC_HARDIRQS=y</div><div class='add'>+CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='add'>+CONFIG_LOCKDEP_SUPPORT=y</div><div class='add'>+CONFIG_TRACE_IRQFLAGS_SUPPORT=y</div><div class='add'>+CONFIG_HARDIRQS_SW_RESEND=y</div><div class='add'>+CONFIG_GENERIC_IRQ_PROBE=y</div><div class='add'>+CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='add'>+# CONFIG_ARCH_HAS_ILOG2_U32 is not set</div><div class='add'>+# CONFIG_ARCH_HAS_ILOG2_U64 is not set</div><div class='add'>+CONFIG_GENERIC_HWEIGHT=y</div><div class='add'>+CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_ARCH_SUPPORTS_AOUT=y</div><div class='add'>+CONFIG_ZONE_DMA=y</div><div class='add'>+CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y</div><div class='add'>+CONFIG_VECTORS_BASE=0xffff0000</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# General setup</div><div class='add'>+#</div><div class='add'>+CONFIG_EXPERIMENTAL=y</div><div class='add'>+CONFIG_BROKEN_ON_SMP=y</div><div class='add'>+CONFIG_LOCK_KERNEL=y</div><div class='add'>+CONFIG_INIT_ENV_ARG_LIMIT=32</div><div class='add'>+CONFIG_LOCALVERSION=""</div><div class='add'>+# CONFIG_LOCALVERSION_AUTO is not set</div><div class='add'>+CONFIG_SWAP=y</div><div class='add'>+CONFIG_SYSVIPC=y</div><div class='add'>+CONFIG_SYSVIPC_SYSCTL=y</div><div class='add'>+# CONFIG_POSIX_MQUEUE is not set</div><div class='add'>+# CONFIG_BSD_PROCESS_ACCT is not set</div><div class='add'>+# CONFIG_TASKSTATS is not set</div><div class='add'>+# CONFIG_AUDIT is not set</div><div class='add'>+# CONFIG_IKCONFIG is not set</div><div class='add'>+CONFIG_LOG_BUF_SHIFT=14</div><div class='add'>+# CONFIG_CGROUPS is not set</div><div class='add'>+# CONFIG_GROUP_SCHED is not set</div><div class='add'>+CONFIG_SYSFS_DEPRECATED=y</div><div class='add'>+CONFIG_SYSFS_DEPRECATED_V2=y</div><div class='add'>+# CONFIG_RELAY is not set</div><div class='add'>+CONFIG_NAMESPACES=y</div><div class='add'>+# CONFIG_UTS_NS is not set</div><div class='add'>+# CONFIG_IPC_NS is not set</div><div class='add'>+# CONFIG_USER_NS is not set</div><div class='add'>+# CONFIG_PID_NS is not set</div><div class='add'>+CONFIG_BLK_DEV_INITRD=y</div><div class='add'>+CONFIG_INITRAMFS_SOURCE=""</div><div class='add'>+CONFIG_CC_OPTIMIZE_FOR_SIZE=y</div><div class='add'>+CONFIG_SYSCTL=y</div><div class='add'>+# CONFIG_EMBEDDED is not set</div><div class='add'>+CONFIG_UID16=y</div><div class='add'>+CONFIG_SYSCTL_SYSCALL=y</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='add'>+CONFIG_KALLSYMS=y</div><div class='add'>+# CONFIG_KALLSYMS_ALL is not set</div><div class='add'>+# CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='add'>+CONFIG_HOTPLUG=y</div><div class='add'>+CONFIG_PRINTK=y</div><div class='add'>+CONFIG_BUG=y</div><div class='add'>+CONFIG_ELF_CORE=y</div><div class='add'>+CONFIG_COMPAT_BRK=y</div><div class='add'>+CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_FUTEX=y</div><div class='add'>+CONFIG_ANON_INODES=y</div><div class='add'>+CONFIG_EPOLL=y</div><div class='add'>+CONFIG_SIGNALFD=y</div><div class='add'>+CONFIG_TIMERFD=y</div><div class='add'>+CONFIG_EVENTFD=y</div><div class='add'>+CONFIG_SHMEM=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='add'>+CONFIG_SLAB=y</div><div class='add'>+# CONFIG_SLUB is not set</div><div class='add'>+# CONFIG_SLOB is not set</div><div class='add'>+# CONFIG_PROFILING is not set</div><div class='add'>+# CONFIG_MARKERS is not set</div><div class='add'>+CONFIG_HAVE_OPROFILE=y</div><div class='add'>+# CONFIG_KPROBES is not set</div><div class='add'>+# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set</div><div class='add'>+# CONFIG_HAVE_IOREMAP_PROT is not set</div><div class='add'>+CONFIG_HAVE_KPROBES=y</div><div class='add'>+CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+# CONFIG_HAVE_ARCH_TRACEHOOK is not set</div><div class='add'>+# CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+CONFIG_HAVE_CLK=y</div><div class='add'>+CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+CONFIG_HAVE_GENERIC_DMA_COHERENT=y</div><div class='add'>+CONFIG_SLABINFO=y</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='add'>+# CONFIG_TINY_SHMEM is not set</div><div class='add'>+CONFIG_BASE_SMALL=0</div><div class='add'>+CONFIG_MODULES=y</div><div class='add'>+# CONFIG_MODULE_FORCE_LOAD is not set</div><div class='add'>+CONFIG_MODULE_UNLOAD=y</div><div class='add'>+# CONFIG_MODULE_FORCE_UNLOAD is not set</div><div class='add'>+# CONFIG_MODVERSIONS is not set</div><div class='add'>+# CONFIG_MODULE_SRCVERSION_ALL is not set</div><div class='add'>+CONFIG_KMOD=y</div><div class='add'>+CONFIG_BLOCK=y</div><div class='add'>+# CONFIG_LBD is not set</div><div class='add'>+# CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='add'>+# CONFIG_LSF is not set</div><div class='add'>+# CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IO Schedulers</div><div class='add'>+#</div><div class='add'>+CONFIG_IOSCHED_NOOP=y</div><div class='add'>+CONFIG_IOSCHED_AS=y</div><div class='add'>+# CONFIG_IOSCHED_DEADLINE is not set</div><div class='add'>+# CONFIG_IOSCHED_CFQ is not set</div><div class='add'>+CONFIG_DEFAULT_AS=y</div><div class='add'>+# CONFIG_DEFAULT_DEADLINE is not set</div><div class='add'>+# CONFIG_DEFAULT_CFQ is not set</div><div class='add'>+# CONFIG_DEFAULT_NOOP is not set</div><div class='add'>+CONFIG_DEFAULT_IOSCHED="anticipatory"</div><div class='add'>+CONFIG_CLASSIC_RCU=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# System Type</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARCH_AAEC2000 is not set</div><div class='add'>+# CONFIG_ARCH_INTEGRATOR is not set</div><div class='add'>+# CONFIG_ARCH_REALVIEW is not set</div><div class='add'>+# CONFIG_ARCH_VERSATILE is not set</div><div class='add'>+CONFIG_ARCH_AT91=y</div><div class='add'>+# CONFIG_ARCH_CLPS7500 is not set</div><div class='add'>+# CONFIG_ARCH_CLPS711X is not set</div><div class='add'>+# CONFIG_ARCH_EBSA110 is not set</div><div class='add'>+# CONFIG_ARCH_EP93XX is not set</div><div class='add'>+# CONFIG_ARCH_FOOTBRIDGE is not set</div><div class='add'>+# CONFIG_ARCH_NETX is not set</div><div class='add'>+# CONFIG_ARCH_H720X is not set</div><div class='add'>+# CONFIG_ARCH_IMX is not set</div><div class='add'>+# CONFIG_ARCH_IOP13XX is not set</div><div class='add'>+# CONFIG_ARCH_IOP32X is not set</div><div class='add'>+# CONFIG_ARCH_IOP33X is not set</div><div class='add'>+# CONFIG_ARCH_IXP23XX is not set</div><div class='add'>+# CONFIG_ARCH_IXP2000 is not set</div><div class='add'>+# CONFIG_ARCH_IXP4XX is not set</div><div class='add'>+# CONFIG_ARCH_L7200 is not set</div><div class='add'>+# CONFIG_ARCH_KIRKWOOD is not set</div><div class='add'>+# CONFIG_ARCH_KS8695 is not set</div><div class='add'>+# CONFIG_ARCH_NS9XXX is not set</div><div class='add'>+# CONFIG_ARCH_LOKI is not set</div><div class='add'>+# CONFIG_ARCH_MV78XX0 is not set</div><div class='add'>+# CONFIG_ARCH_MXC is not set</div><div class='add'>+# CONFIG_ARCH_ORION5X is not set</div><div class='add'>+# CONFIG_ARCH_PNX4008 is not set</div><div class='add'>+# CONFIG_ARCH_PXA is not set</div><div class='add'>+# CONFIG_ARCH_RPC is not set</div><div class='add'>+# CONFIG_ARCH_SA1100 is not set</div><div class='add'>+# CONFIG_ARCH_S3C2410 is not set</div><div class='add'>+# CONFIG_ARCH_SHARK is not set</div><div class='add'>+# CONFIG_ARCH_LH7A40X is not set</div><div class='add'>+# CONFIG_ARCH_DAVINCI is not set</div><div class='add'>+# CONFIG_ARCH_OMAP is not set</div><div class='add'>+# CONFIG_ARCH_MSM7X00A is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Boot options</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Power management</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Atmel AT91 System-on-Chip</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARCH_AT91RM9200 is not set</div><div class='add'>+CONFIG_ARCH_AT91SAM9260=y</div><div class='add'>+# CONFIG_ARCH_AT91SAM9261 is not set</div><div class='add'>+# CONFIG_ARCH_AT91SAM9263 is not set</div><div class='add'>+# CONFIG_ARCH_AT91SAM9RL is not set</div><div class='add'>+# CONFIG_ARCH_AT91SAM9G20 is not set</div><div class='add'>+# CONFIG_ARCH_AT91CAP9 is not set</div><div class='add'>+# CONFIG_ARCH_AT91X40 is not set</div><div class='add'>+CONFIG_AT91_PMC_UNIT=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# AT91SAM9260 Variants</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARCH_AT91SAM9260_SAM9XE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# AT91SAM9260 / AT91SAM9XE Board Type</div><div class='add'>+#</div><div class='add'>+# CONFIG_MACH_AT91SAM9260EK is not set</div><div class='add'>+# CONFIG_MACH_CAM60 is not set</div><div class='add'>+# CONFIG_MACH_SAM9_L9260 is not set</div><div class='add'>+CONFIG_MACH_AFEB9260=y</div><div class='add'>+# CONFIG_MACH_USB_A9260 is not set</div><div class='add'>+# CONFIG_MACH_QIL_A9260 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# AT91 Board Options</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# AT91 Feature Selections</div><div class='add'>+#</div><div class='add'>+CONFIG_AT91_PROGRAMMABLE_CLOCKS=y</div><div class='add'>+CONFIG_AT91_TIMER_HZ=100</div><div class='add'>+CONFIG_AT91_EARLY_DBGU=y</div><div class='add'>+# CONFIG_AT91_EARLY_USART0 is not set</div><div class='add'>+# CONFIG_AT91_EARLY_USART1 is not set</div><div class='add'>+# CONFIG_AT91_EARLY_USART2 is not set</div><div class='add'>+# CONFIG_AT91_EARLY_USART3 is not set</div><div class='add'>+# CONFIG_AT91_EARLY_USART4 is not set</div><div class='add'>+# CONFIG_AT91_EARLY_USART5 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Processor Type</div><div class='add'>+#</div><div class='add'>+CONFIG_CPU_32=y</div><div class='add'>+CONFIG_CPU_ARM926T=y</div><div class='add'>+CONFIG_CPU_32v5=y</div><div class='add'>+CONFIG_CPU_ABRT_EV5TJ=y</div><div class='add'>+CONFIG_CPU_PABRT_NOIFAR=y</div><div class='add'>+CONFIG_CPU_CACHE_VIVT=y</div><div class='add'>+CONFIG_CPU_COPY_V4WB=y</div><div class='add'>+CONFIG_CPU_TLB_V4WBI=y</div><div class='add'>+CONFIG_CPU_CP15=y</div><div class='add'>+CONFIG_CPU_CP15_MMU=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Processor Features</div><div class='add'>+#</div><div class='add'>+CONFIG_ARM_THUMB=y</div><div class='add'>+# CONFIG_CPU_ICACHE_DISABLE is not set</div><div class='add'>+# CONFIG_CPU_DCACHE_DISABLE is not set</div><div class='add'>+# CONFIG_CPU_DCACHE_WRITETHROUGH is not set</div><div class='add'>+# CONFIG_CPU_CACHE_ROUND_ROBIN is not set</div><div class='add'>+# CONFIG_OUTER_CACHE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Bus support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PCI_SYSCALL is not set</div><div class='add'>+# CONFIG_ARCH_SUPPORTS_MSI is not set</div><div class='add'>+# CONFIG_PCCARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel Features</div><div class='add'>+#</div><div class='add'>+# CONFIG_TICK_ONESHOT is not set</div><div class='add'>+# CONFIG_NO_HZ is not set</div><div class='add'>+# CONFIG_HIGH_RES_TIMERS is not set</div><div class='add'>+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y</div><div class='add'>+CONFIG_PREEMPT=y</div><div class='add'>+CONFIG_HZ=100</div><div class='add'>+CONFIG_AEABI=y</div><div class='add'>+CONFIG_OABI_COMPAT=y</div><div class='add'>+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set</div><div class='add'>+CONFIG_SELECT_MEMORY_MODEL=y</div><div class='add'>+CONFIG_FLATMEM_MANUAL=y</div><div class='add'>+# CONFIG_DISCONTIGMEM_MANUAL is not set</div><div class='add'>+# CONFIG_SPARSEMEM_MANUAL is not set</div><div class='add'>+CONFIG_FLATMEM=y</div><div class='add'>+CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='add'>+# CONFIG_SPARSEMEM_STATIC is not set</div><div class='add'>+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='add'>+CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='add'>+CONFIG_SPLIT_PTLOCK_CPUS=4096</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+CONFIG_ZONE_DMA_FLAG=1</div><div class='add'>+CONFIG_BOUNCE=y</div><div class='add'>+CONFIG_VIRT_TO_BUS=y</div><div class='add'>+# CONFIG_LEDS is not set</div><div class='add'>+CONFIG_ALIGNMENT_TRAP=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Boot options</div><div class='add'>+#</div><div class='add'>+CONFIG_ZBOOT_ROM_TEXT=0x0</div><div class='add'>+CONFIG_ZBOOT_ROM_BSS=0x0</div><div class='add'>+CONFIG_CMDLINE="mem=64M console=ttyS0,115200 initrd=0x21100000,3145728 root=/dev/ram0 rw"</div><div class='add'>+# CONFIG_XIP_KERNEL is not set</div><div class='add'>+# CONFIG_KEXEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Floating point emulation</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# At least one emulation must be selected</div><div class='add'>+#</div><div class='add'>+CONFIG_FPE_NWFPE=y</div><div class='add'>+# CONFIG_FPE_NWFPE_XP is not set</div><div class='add'>+# CONFIG_FPE_FASTFPE is not set</div><div class='add'>+# CONFIG_VFP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Userspace binary formats</div><div class='add'>+#</div><div class='add'>+CONFIG_BINFMT_ELF=y</div><div class='add'>+# CONFIG_BINFMT_AOUT is not set</div><div class='add'>+# CONFIG_BINFMT_MISC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Power management options</div><div class='add'>+#</div><div class='add'>+# CONFIG_PM is not set</div><div class='add'>+CONFIG_ARCH_SUSPEND_POSSIBLE=y</div><div class='add'>+CONFIG_NET=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking options</div><div class='add'>+#</div><div class='add'>+CONFIG_PACKET=y</div><div class='add'>+# CONFIG_PACKET_MMAP is not set</div><div class='add'>+CONFIG_UNIX=y</div><div class='add'>+# CONFIG_NET_KEY is not set</div><div class='add'>+CONFIG_INET=y</div><div class='add'>+# CONFIG_IP_MULTICAST is not set</div><div class='add'>+# CONFIG_IP_ADVANCED_ROUTER is not set</div><div class='add'>+CONFIG_IP_FIB_HASH=y</div><div class='add'>+CONFIG_IP_PNP=y</div><div class='add'>+# CONFIG_IP_PNP_DHCP is not set</div><div class='add'>+CONFIG_IP_PNP_BOOTP=y</div><div class='add'>+# CONFIG_IP_PNP_RARP is not set</div><div class='add'>+# CONFIG_NET_IPIP is not set</div><div class='add'>+# CONFIG_NET_IPGRE is not set</div><div class='add'>+# CONFIG_ARPD is not set</div><div class='add'>+# CONFIG_SYN_COOKIES is not set</div><div class='add'>+# CONFIG_INET_AH is not set</div><div class='add'>+# CONFIG_INET_ESP is not set</div><div class='add'>+# CONFIG_INET_IPCOMP is not set</div><div class='add'>+# CONFIG_INET_XFRM_TUNNEL is not set</div><div class='add'>+# CONFIG_INET_TUNNEL is not set</div><div class='add'>+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set</div><div class='add'>+# CONFIG_INET_XFRM_MODE_TUNNEL is not set</div><div class='add'>+# CONFIG_INET_XFRM_MODE_BEET is not set</div><div class='add'>+# CONFIG_INET_LRO is not set</div><div class='add'>+CONFIG_INET_DIAG=y</div><div class='add'>+CONFIG_INET_TCP_DIAG=y</div><div class='add'>+# CONFIG_TCP_CONG_ADVANCED is not set</div><div class='add'>+CONFIG_TCP_CONG_CUBIC=y</div><div class='add'>+CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='add'>+# CONFIG_TCP_MD5SIG is not set</div><div class='add'>+# CONFIG_IPV6 is not set</div><div class='add'>+# CONFIG_NETWORK_SECMARK is not set</div><div class='add'>+# CONFIG_NETFILTER is not set</div><div class='add'>+# CONFIG_IP_DCCP is not set</div><div class='add'>+# CONFIG_IP_SCTP is not set</div><div class='add'>+# CONFIG_TIPC is not set</div><div class='add'>+# CONFIG_ATM is not set</div><div class='add'>+# CONFIG_BRIDGE is not set</div><div class='add'>+# CONFIG_VLAN_8021Q is not set</div><div class='add'>+# CONFIG_DECNET is not set</div><div class='add'>+# CONFIG_LLC2 is not set</div><div class='add'>+# CONFIG_IPX is not set</div><div class='add'>+# CONFIG_ATALK is not set</div><div class='add'>+# CONFIG_X25 is not set</div><div class='add'>+# CONFIG_LAPB is not set</div><div class='add'>+# CONFIG_ECONET is not set</div><div class='add'>+# CONFIG_WAN_ROUTER is not set</div><div class='add'>+# CONFIG_NET_SCHED is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network testing</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_PKTGEN is not set</div><div class='add'>+# CONFIG_HAMRADIO is not set</div><div class='add'>+# CONFIG_CAN is not set</div><div class='add'>+# CONFIG_IRDA is not set</div><div class='add'>+# CONFIG_BT is not set</div><div class='add'>+# CONFIG_AF_RXRPC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless</div><div class='add'>+#</div><div class='add'>+# CONFIG_CFG80211 is not set</div><div class='add'>+# CONFIG_WIRELESS_EXT is not set</div><div class='add'>+# CONFIG_MAC80211 is not set</div><div class='add'>+# CONFIG_IEEE80211 is not set</div><div class='add'>+# CONFIG_RFKILL is not set</div><div class='add'>+# CONFIG_NET_9P is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Device Drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Generic Driver Options</div><div class='add'>+#</div><div class='add'>+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='add'>+CONFIG_STANDALONE=y</div><div class='add'>+CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='add'>+CONFIG_FW_LOADER=y</div><div class='add'>+CONFIG_FIRMWARE_IN_KERNEL=y</div><div class='add'>+CONFIG_EXTRA_FIRMWARE=""</div><div class='add'>+# CONFIG_DEBUG_DRIVER is not set</div><div class='add'>+# CONFIG_DEBUG_DEVRES is not set</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='add'>+# CONFIG_CONNECTOR is not set</div><div class='add'>+CONFIG_MTD=y</div><div class='add'>+# CONFIG_MTD_DEBUG is not set</div><div class='add'>+# CONFIG_MTD_CONCAT is not set</div><div class='add'>+CONFIG_MTD_PARTITIONS=y</div><div class='add'>+# CONFIG_MTD_REDBOOT_PARTS is not set</div><div class='add'>+# CONFIG_MTD_CMDLINE_PARTS is not set</div><div class='add'>+# CONFIG_MTD_AFS_PARTS is not set</div><div class='add'>+# CONFIG_MTD_AR7_PARTS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# User Modules And Translation Layers</div><div class='add'>+#</div><div class='add'>+CONFIG_MTD_CHAR=y</div><div class='add'>+CONFIG_MTD_BLKDEVS=y</div><div class='add'>+CONFIG_MTD_BLOCK=y</div><div class='add'>+# CONFIG_FTL is not set</div><div class='add'>+# CONFIG_NFTL is not set</div><div class='add'>+# CONFIG_INFTL is not set</div><div class='add'>+# CONFIG_RFD_FTL is not set</div><div class='add'>+# CONFIG_SSFDC is not set</div><div class='add'>+# CONFIG_MTD_OOPS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# RAM/ROM/Flash chip drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_CFI is not set</div><div class='add'>+# CONFIG_MTD_JEDECPROBE is not set</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_1=y</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_2=y</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_4=y</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set</div><div class='add'>+CONFIG_MTD_CFI_I1=y</div><div class='add'>+CONFIG_MTD_CFI_I2=y</div><div class='add'>+# CONFIG_MTD_CFI_I4 is not set</div><div class='add'>+# CONFIG_MTD_CFI_I8 is not set</div><div class='add'>+# CONFIG_MTD_RAM is not set</div><div class='add'>+# CONFIG_MTD_ROM is not set</div><div class='add'>+# CONFIG_MTD_ABSENT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Mapping drivers for chip access</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_COMPLEX_MAPPINGS is not set</div><div class='add'>+# CONFIG_MTD_PLATRAM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Self-contained MTD device drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_MTD_DATAFLASH=y</div><div class='add'>+# CONFIG_MTD_M25P80 is not set</div><div class='add'>+# CONFIG_MTD_SLRAM is not set</div><div class='add'>+# CONFIG_MTD_PHRAM is not set</div><div class='add'>+# CONFIG_MTD_MTDRAM is not set</div><div class='add'>+# CONFIG_MTD_BLOCK2MTD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Disk-On-Chip Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_DOC2000 is not set</div><div class='add'>+# CONFIG_MTD_DOC2001 is not set</div><div class='add'>+# CONFIG_MTD_DOC2001PLUS is not set</div><div class='add'>+CONFIG_MTD_NAND=y</div><div class='add'>+# CONFIG_MTD_NAND_VERIFY_WRITE is not set</div><div class='add'>+# CONFIG_MTD_NAND_ECC_SMC is not set</div><div class='add'>+# CONFIG_MTD_NAND_MUSEUM_IDS is not set</div><div class='add'>+CONFIG_MTD_NAND_IDS=y</div><div class='add'>+# CONFIG_MTD_NAND_DISKONCHIP is not set</div><div class='add'>+CONFIG_MTD_NAND_ATMEL=y</div><div class='add'>+# CONFIG_MTD_NAND_ATMEL_ECC_HW is not set</div><div class='add'>+CONFIG_MTD_NAND_ATMEL_ECC_SOFT=y</div><div class='add'>+# CONFIG_MTD_NAND_ATMEL_ECC_NONE is not set</div><div class='add'>+# CONFIG_MTD_NAND_NANDSIM is not set</div><div class='add'>+# CONFIG_MTD_NAND_PLATFORM is not set</div><div class='add'>+# CONFIG_MTD_ALAUDA is not set</div><div class='add'>+# CONFIG_MTD_ONENAND is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# UBI - Unsorted block images</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_UBI is not set</div><div class='add'>+# CONFIG_PARPORT is not set</div><div class='add'>+CONFIG_BLK_DEV=y</div><div class='add'>+# CONFIG_BLK_DEV_COW_COMMON is not set</div><div class='add'>+# CONFIG_BLK_DEV_LOOP is not set</div><div class='add'>+# CONFIG_BLK_DEV_NBD is not set</div><div class='add'>+# CONFIG_BLK_DEV_UB is not set</div><div class='add'>+CONFIG_BLK_DEV_RAM=y</div><div class='add'>+CONFIG_BLK_DEV_RAM_COUNT=16</div><div class='add'>+CONFIG_BLK_DEV_RAM_SIZE=8192</div><div class='add'>+# CONFIG_BLK_DEV_XIP is not set</div><div class='add'>+# CONFIG_CDROM_PKTCDVD is not set</div><div class='add'>+# CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+CONFIG_MISC_DEVICES=y</div><div class='add'>+# CONFIG_ATMEL_PWM is not set</div><div class='add'>+# CONFIG_ATMEL_TCLIB is not set</div><div class='add'>+# CONFIG_EEPROM_93CX6 is not set</div><div class='add'>+CONFIG_ATMEL_SSC=y</div><div class='add'>+# CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+CONFIG_HAVE_IDE=y</div><div class='add'>+# CONFIG_IDE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_RAID_ATTRS is not set</div><div class='add'>+CONFIG_SCSI=y</div><div class='add'>+CONFIG_SCSI_DMA=y</div><div class='add'>+# CONFIG_SCSI_TGT is not set</div><div class='add'>+# CONFIG_SCSI_NETLINK is not set</div><div class='add'>+CONFIG_SCSI_PROC_FS=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI support type (disk, tape, CD-ROM)</div><div class='add'>+#</div><div class='add'>+CONFIG_BLK_DEV_SD=y</div><div class='add'>+# CONFIG_CHR_DEV_ST is not set</div><div class='add'>+# CONFIG_CHR_DEV_OSST is not set</div><div class='add'>+# CONFIG_BLK_DEV_SR is not set</div><div class='add'>+# CONFIG_CHR_DEV_SG is not set</div><div class='add'>+# CONFIG_CHR_DEV_SCH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs</div><div class='add'>+#</div><div class='add'>+CONFIG_SCSI_MULTI_LUN=y</div><div class='add'>+# CONFIG_SCSI_CONSTANTS is not set</div><div class='add'>+# CONFIG_SCSI_LOGGING is not set</div><div class='add'>+# CONFIG_SCSI_SCAN_ASYNC is not set</div><div class='add'>+CONFIG_SCSI_WAIT_SCAN=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI Transports</div><div class='add'>+#</div><div class='add'>+# CONFIG_SCSI_SPI_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_FC_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_ISCSI_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_SAS_LIBSAS is not set</div><div class='add'>+# CONFIG_SCSI_SRP_ATTRS is not set</div><div class='add'>+CONFIG_SCSI_LOWLEVEL=y</div><div class='add'>+# CONFIG_ISCSI_TCP is not set</div><div class='add'>+# CONFIG_SCSI_DEBUG is not set</div><div class='add'>+# CONFIG_SCSI_DH is not set</div><div class='add'>+# CONFIG_ATA is not set</div><div class='add'>+# CONFIG_MD is not set</div><div class='add'>+CONFIG_NETDEVICES=y</div><div class='add'>+# CONFIG_DUMMY is not set</div><div class='add'>+# CONFIG_BONDING is not set</div><div class='add'>+# CONFIG_MACVLAN is not set</div><div class='add'>+# CONFIG_EQUALIZER is not set</div><div class='add'>+# CONFIG_TUN is not set</div><div class='add'>+# CONFIG_VETH is not set</div><div class='add'>+CONFIG_PHYLIB=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MII PHY device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MARVELL_PHY is not set</div><div class='add'>+# CONFIG_DAVICOM_PHY is not set</div><div class='add'>+# CONFIG_QSEMI_PHY is not set</div><div class='add'>+# CONFIG_LXT_PHY is not set</div><div class='add'>+# CONFIG_CICADA_PHY is not set</div><div class='add'>+# CONFIG_VITESSE_PHY is not set</div><div class='add'>+# CONFIG_SMSC_PHY is not set</div><div class='add'>+# CONFIG_BROADCOM_PHY is not set</div><div class='add'>+# CONFIG_ICPLUS_PHY is not set</div><div class='add'>+# CONFIG_REALTEK_PHY is not set</div><div class='add'>+# CONFIG_FIXED_PHY is not set</div><div class='add'>+# CONFIG_MDIO_BITBANG is not set</div><div class='add'>+CONFIG_NET_ETHERNET=y</div><div class='add'>+CONFIG_MII=y</div><div class='add'>+CONFIG_MACB=y</div><div class='add'>+# CONFIG_AX88796 is not set</div><div class='add'>+# CONFIG_SMC91X is not set</div><div class='add'>+# CONFIG_DM9000 is not set</div><div class='add'>+# CONFIG_ENC28J60 is not set</div><div class='add'>+# CONFIG_IBM_NEW_EMAC_ZMII is not set</div><div class='add'>+# CONFIG_IBM_NEW_EMAC_RGMII is not set</div><div class='add'>+# CONFIG_IBM_NEW_EMAC_TAH is not set</div><div class='add'>+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set</div><div class='add'>+# CONFIG_B44 is not set</div><div class='add'>+# CONFIG_NETDEV_1000 is not set</div><div class='add'>+# CONFIG_NETDEV_10000 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless LAN</div><div class='add'>+#</div><div class='add'>+# CONFIG_WLAN_PRE80211 is not set</div><div class='add'>+# CONFIG_WLAN_80211 is not set</div><div class='add'>+# CONFIG_IWLWIFI_LEDS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Network Adapters</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_CATC is not set</div><div class='add'>+# CONFIG_USB_KAWETH is not set</div><div class='add'>+# CONFIG_USB_PEGASUS is not set</div><div class='add'>+# CONFIG_USB_RTL8150 is not set</div><div class='add'>+# CONFIG_USB_USBNET is not set</div><div class='add'>+# CONFIG_WAN is not set</div><div class='add'>+# CONFIG_PPP is not set</div><div class='add'>+# CONFIG_SLIP is not set</div><div class='add'>+# CONFIG_NETCONSOLE is not set</div><div class='add'>+# CONFIG_NETPOLL is not set</div><div class='add'>+# CONFIG_NET_POLL_CONTROLLER is not set</div><div class='add'>+# CONFIG_ISDN is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input device support</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT=y</div><div class='add'>+# CONFIG_INPUT_FF_MEMLESS is not set</div><div class='add'>+# CONFIG_INPUT_POLLDEV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Userland interfaces</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT_MOUSEDEV=y</div><div class='add'>+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768</div><div class='add'>+# CONFIG_INPUT_JOYDEV is not set</div><div class='add'>+# CONFIG_INPUT_EVDEV is not set</div><div class='add'>+# CONFIG_INPUT_EVBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_INPUT_KEYBOARD is not set</div><div class='add'>+# CONFIG_INPUT_MOUSE is not set</div><div class='add'>+# CONFIG_INPUT_JOYSTICK is not set</div><div class='add'>+# CONFIG_INPUT_TABLET is not set</div><div class='add'>+# CONFIG_INPUT_TOUCHSCREEN is not set</div><div class='add'>+# CONFIG_INPUT_MISC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware I/O ports</div><div class='add'>+#</div><div class='add'>+# CONFIG_SERIO is not set</div><div class='add'>+# CONFIG_GAMEPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Character devices</div><div class='add'>+#</div><div class='add'>+CONFIG_VT=y</div><div class='add'>+CONFIG_CONSOLE_TRANSLATIONS=y</div><div class='add'>+CONFIG_VT_CONSOLE=y</div><div class='add'>+CONFIG_HW_CONSOLE=y</div><div class='add'>+# CONFIG_VT_HW_CONSOLE_BINDING is not set</div><div class='add'>+CONFIG_DEVKMEM=y</div><div class='add'>+# CONFIG_SERIAL_NONSTANDARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Serial drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_SERIAL_8250 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Non-8250 serial port support</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIAL_ATMEL=y</div><div class='add'>+CONFIG_SERIAL_ATMEL_CONSOLE=y</div><div class='add'>+CONFIG_SERIAL_ATMEL_PDC=y</div><div class='add'>+# CONFIG_SERIAL_ATMEL_TTYAT is not set</div><div class='add'>+CONFIG_SERIAL_CORE=y</div><div class='add'>+CONFIG_SERIAL_CORE_CONSOLE=y</div><div class='add'>+CONFIG_UNIX98_PTYS=y</div><div class='add'>+CONFIG_LEGACY_PTYS=y</div><div class='add'>+CONFIG_LEGACY_PTY_COUNT=256</div><div class='add'>+# CONFIG_IPMI_HANDLER is not set</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='add'>+# CONFIG_NVRAM is not set</div><div class='add'>+# CONFIG_R3964 is not set</div><div class='add'>+# CONFIG_RAW_DRIVER is not set</div><div class='add'>+# CONFIG_TCG_TPM is not set</div><div class='add'>+CONFIG_I2C=y</div><div class='add'>+CONFIG_I2C_BOARDINFO=y</div><div class='add'>+CONFIG_I2C_CHARDEV=y</div><div class='add'>+CONFIG_I2C_HELPER_AUTO=y</div><div class='add'>+CONFIG_I2C_ALGOBIT=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C Hardware Bus support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C system bus drivers (mostly embedded / system-on-chip)</div><div class='add'>+#</div><div class='add'>+CONFIG_I2C_GPIO=y</div><div class='add'>+# CONFIG_I2C_OCORES is not set</div><div class='add'>+# CONFIG_I2C_SIMTEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# External I2C/SMBus adapter drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='add'>+# CONFIG_I2C_TAOS_EVM is not set</div><div class='add'>+# CONFIG_I2C_TINY_USB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Other I2C/SMBus bus drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_PCA_PLATFORM is not set</div><div class='add'>+# CONFIG_I2C_STUB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous I2C Chip support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DS1682 is not set</div><div class='add'>+CONFIG_AT24=y</div><div class='add'>+# CONFIG_SENSORS_EEPROM is not set</div><div class='add'>+# CONFIG_SENSORS_PCF8574 is not set</div><div class='add'>+# CONFIG_PCF8575 is not set</div><div class='add'>+# CONFIG_SENSORS_PCA9539 is not set</div><div class='add'>+# CONFIG_SENSORS_PCF8591 is not set</div><div class='add'>+# CONFIG_SENSORS_MAX6875 is not set</div><div class='add'>+# CONFIG_SENSORS_TSL2550 is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_CORE is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_ALGO is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_BUS is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_CHIP is not set</div><div class='add'>+CONFIG_SPI=y</div><div class='add'>+CONFIG_SPI_DEBUG=y</div><div class='add'>+CONFIG_SPI_MASTER=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI Master Controller Drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_SPI_ATMEL=y</div><div class='add'>+# CONFIG_SPI_BITBANG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI Protocol Masters</div><div class='add'>+#</div><div class='add'>+# CONFIG_SPI_AT25 is not set</div><div class='add'>+CONFIG_SPI_SPIDEV=y</div><div class='add'>+# CONFIG_SPI_TLE62X0 is not set</div><div class='add'>+# CONFIG_W1 is not set</div><div class='add'>+# CONFIG_POWER_SUPPLY is not set</div><div class='add'>+# CONFIG_HWMON is not set</div><div class='add'>+CONFIG_WATCHDOG=y</div><div class='add'>+CONFIG_WATCHDOG_NOWAYOUT=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Watchdog Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_SOFT_WATCHDOG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB-based Watchdog Cards</div><div class='add'>+#</div><div class='add'>+# CONFIG_USBPCWATCHDOG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Sonics Silicon Backplane</div><div class='add'>+#</div><div class='add'>+CONFIG_SSB_POSSIBLE=y</div><div class='add'>+# CONFIG_SSB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multifunction device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='add'>+# CONFIG_MFD_SM501 is not set</div><div class='add'>+# CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='add'>+# CONFIG_MFD_T7L66XB is not set</div><div class='add'>+# CONFIG_MFD_TC6387XB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia core support</div><div class='add'>+#</div><div class='add'>+# CONFIG_VIDEO_DEV is not set</div><div class='add'>+# CONFIG_DVB_CORE is not set</div><div class='add'>+# CONFIG_VIDEO_MEDIA is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_DAB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics support</div><div class='add'>+#</div><div class='add'>+# CONFIG_VGASTATE is not set</div><div class='add'>+# CONFIG_VIDEO_OUTPUT_CONTROL is not set</div><div class='add'>+# CONFIG_FB is not set</div><div class='add'>+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Display device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DISPLAY_SUPPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Console display driver support</div><div class='add'>+#</div><div class='add'>+# CONFIG_VGA_CONSOLE is not set</div><div class='add'>+CONFIG_DUMMY_CONSOLE=y</div><div class='add'>+# CONFIG_SOUND is not set</div><div class='add'>+CONFIG_HID_SUPPORT=y</div><div class='add'>+CONFIG_HID=y</div><div class='add'>+# CONFIG_HID_DEBUG is not set</div><div class='add'>+# CONFIG_HIDRAW is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Input Devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_HID is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB HID Boot Protocol drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_KBD is not set</div><div class='add'>+# CONFIG_USB_MOUSE is not set</div><div class='add'>+CONFIG_USB_SUPPORT=y</div><div class='add'>+CONFIG_USB_ARCH_HAS_HCD=y</div><div class='add'>+CONFIG_USB_ARCH_HAS_OHCI=y</div><div class='add'>+# CONFIG_USB_ARCH_HAS_EHCI is not set</div><div class='add'>+CONFIG_USB=y</div><div class='add'>+# CONFIG_USB_DEBUG is not set</div><div class='add'>+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous USB options</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_DEVICEFS=y</div><div class='add'>+CONFIG_USB_DEVICE_CLASS=y</div><div class='add'>+# CONFIG_USB_DYNAMIC_MINORS is not set</div><div class='add'>+# CONFIG_USB_OTG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Host Controller Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_C67X00_HCD is not set</div><div class='add'>+# CONFIG_USB_ISP116X_HCD is not set</div><div class='add'>+# CONFIG_USB_ISP1760_HCD is not set</div><div class='add'>+CONFIG_USB_OHCI_HCD=y</div><div class='add'>+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set</div><div class='add'>+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set</div><div class='add'>+CONFIG_USB_OHCI_LITTLE_ENDIAN=y</div><div class='add'>+# CONFIG_USB_SL811_HCD is not set</div><div class='add'>+# CONFIG_USB_R8A66597_HCD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Device Class drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_ACM is not set</div><div class='add'>+# CONFIG_USB_PRINTER is not set</div><div class='add'>+# CONFIG_USB_WDM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# may also be needed; see USB_STORAGE Help for more information</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_STORAGE=y</div><div class='add'>+# CONFIG_USB_STORAGE_DEBUG is not set</div><div class='add'>+# CONFIG_USB_STORAGE_DATAFAB is not set</div><div class='add'>+# CONFIG_USB_STORAGE_FREECOM is not set</div><div class='add'>+# CONFIG_USB_STORAGE_ISD200 is not set</div><div class='add'>+# CONFIG_USB_STORAGE_DPCM is not set</div><div class='add'>+# CONFIG_USB_STORAGE_USBAT is not set</div><div class='add'>+# CONFIG_USB_STORAGE_SDDR09 is not set</div><div class='add'>+# CONFIG_USB_STORAGE_SDDR55 is not set</div><div class='add'>+# CONFIG_USB_STORAGE_JUMPSHOT is not set</div><div class='add'>+# CONFIG_USB_STORAGE_ALAUDA is not set</div><div class='add'>+# CONFIG_USB_STORAGE_ONETOUCH is not set</div><div class='add'>+# CONFIG_USB_STORAGE_KARMA is not set</div><div class='add'>+# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set</div><div class='add'>+# CONFIG_USB_LIBUSUAL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Imaging devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_MDC800 is not set</div><div class='add'>+# CONFIG_USB_MICROTEK is not set</div><div class='add'>+CONFIG_USB_MON=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB port drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_SERIAL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Miscellaneous drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_EMI62 is not set</div><div class='add'>+# CONFIG_USB_EMI26 is not set</div><div class='add'>+# CONFIG_USB_ADUTUX is not set</div><div class='add'>+# CONFIG_USB_AUERSWALD is not set</div><div class='add'>+# CONFIG_USB_RIO500 is not set</div><div class='add'>+# CONFIG_USB_LEGOTOWER is not set</div><div class='add'>+# CONFIG_USB_LCD is not set</div><div class='add'>+# CONFIG_USB_BERRY_CHARGE is not set</div><div class='add'>+# CONFIG_USB_LED is not set</div><div class='add'>+# CONFIG_USB_CYPRESS_CY7C63 is not set</div><div class='add'>+# CONFIG_USB_CYTHERM is not set</div><div class='add'>+# CONFIG_USB_PHIDGET is not set</div><div class='add'>+# CONFIG_USB_IDMOUSE is not set</div><div class='add'>+# CONFIG_USB_FTDI_ELAN is not set</div><div class='add'>+# CONFIG_USB_APPLEDISPLAY is not set</div><div class='add'>+# CONFIG_USB_LD is not set</div><div class='add'>+# CONFIG_USB_TRANCEVIBRATOR is not set</div><div class='add'>+# CONFIG_USB_IOWARRIOR is not set</div><div class='add'>+# CONFIG_USB_TEST is not set</div><div class='add'>+# CONFIG_USB_ISIGHTFW is not set</div><div class='add'>+CONFIG_USB_GADGET=y</div><div class='add'>+# CONFIG_USB_GADGET_DEBUG is not set</div><div class='add'>+# CONFIG_USB_GADGET_DEBUG_FILES is not set</div><div class='add'>+CONFIG_USB_GADGET_SELECTED=y</div><div class='add'>+# CONFIG_USB_GADGET_AMD5536UDC is not set</div><div class='add'>+# CONFIG_USB_GADGET_ATMEL_USBA is not set</div><div class='add'>+# CONFIG_USB_GADGET_FSL_USB2 is not set</div><div class='add'>+# CONFIG_USB_GADGET_NET2280 is not set</div><div class='add'>+# CONFIG_USB_GADGET_PXA25X is not set</div><div class='add'>+# CONFIG_USB_GADGET_M66592 is not set</div><div class='add'>+# CONFIG_USB_GADGET_PXA27X is not set</div><div class='add'>+# CONFIG_USB_GADGET_GOKU is not set</div><div class='add'>+# CONFIG_USB_GADGET_LH7A40X is not set</div><div class='add'>+# CONFIG_USB_GADGET_OMAP is not set</div><div class='add'>+# CONFIG_USB_GADGET_S3C2410 is not set</div><div class='add'>+CONFIG_USB_GADGET_AT91=y</div><div class='add'>+CONFIG_USB_AT91=y</div><div class='add'>+# CONFIG_USB_GADGET_DUMMY_HCD is not set</div><div class='add'>+# CONFIG_USB_GADGET_DUALSPEED is not set</div><div class='add'>+CONFIG_USB_ZERO=m</div><div class='add'>+# CONFIG_USB_ETH is not set</div><div class='add'>+CONFIG_USB_GADGETFS=m</div><div class='add'>+CONFIG_USB_FILE_STORAGE=m</div><div class='add'>+# CONFIG_USB_FILE_STORAGE_TEST is not set</div><div class='add'>+CONFIG_USB_G_SERIAL=m</div><div class='add'>+# CONFIG_USB_MIDI_GADGET is not set</div><div class='add'>+# CONFIG_USB_G_PRINTER is not set</div><div class='add'>+# CONFIG_USB_CDC_COMPOSITE is not set</div><div class='add'>+# CONFIG_MMC is not set</div><div class='add'>+# CONFIG_NEW_LEDS is not set</div><div class='add'>+CONFIG_RTC_LIB=y</div><div class='add'>+CONFIG_RTC_CLASS=y</div><div class='add'>+CONFIG_RTC_HCTOSYS=y</div><div class='add'>+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"</div><div class='add'>+CONFIG_RTC_DEBUG=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# RTC interfaces</div><div class='add'>+#</div><div class='add'>+CONFIG_RTC_INTF_SYSFS=y</div><div class='add'>+CONFIG_RTC_INTF_PROC=y</div><div class='add'>+CONFIG_RTC_INTF_DEV=y</div><div class='add'>+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set</div><div class='add'>+# CONFIG_RTC_DRV_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C RTC drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_RTC_DRV_DS1307 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1374 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1672 is not set</div><div class='add'>+# CONFIG_RTC_DRV_MAX6900 is not set</div><div class='add'>+# CONFIG_RTC_DRV_RS5C372 is not set</div><div class='add'>+# CONFIG_RTC_DRV_ISL1208 is not set</div><div class='add'>+# CONFIG_RTC_DRV_X1205 is not set</div><div class='add'>+# CONFIG_RTC_DRV_PCF8563 is not set</div><div class='add'>+# CONFIG_RTC_DRV_PCF8583 is not set</div><div class='add'>+# CONFIG_RTC_DRV_M41T80 is not set</div><div class='add'>+# CONFIG_RTC_DRV_S35390A is not set</div><div class='add'>+CONFIG_RTC_DRV_FM3130=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI RTC drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_RTC_DRV_M41T94 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1305 is not set</div><div class='add'>+# CONFIG_RTC_DRV_MAX6902 is not set</div><div class='add'>+# CONFIG_RTC_DRV_R9701 is not set</div><div class='add'>+# CONFIG_RTC_DRV_RS5C348 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Platform RTC drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_RTC_DRV_CMOS is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1511 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1553 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1742 is not set</div><div class='add'>+# CONFIG_RTC_DRV_STK17TA8 is not set</div><div class='add'>+# CONFIG_RTC_DRV_M48T86 is not set</div><div class='add'>+# CONFIG_RTC_DRV_M48T59 is not set</div><div class='add'>+# CONFIG_RTC_DRV_V3020 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# on-CPU RTC drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_RTC_DRV_AT91SAM9 is not set</div><div class='add'>+# CONFIG_DMADEVICES is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Voltage and Current regulators</div><div class='add'>+#</div><div class='add'>+# CONFIG_REGULATOR is not set</div><div class='add'>+# CONFIG_REGULATOR_FIXED_VOLTAGE is not set</div><div class='add'>+# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set</div><div class='add'>+# CONFIG_REGULATOR_BQ24022 is not set</div><div class='add'>+# CONFIG_UIO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# File systems</div><div class='add'>+#</div><div class='add'>+CONFIG_EXT2_FS=y</div><div class='add'>+# CONFIG_EXT2_FS_XATTR is not set</div><div class='add'>+# CONFIG_EXT2_FS_XIP is not set</div><div class='add'>+CONFIG_EXT3_FS=y</div><div class='add'>+CONFIG_EXT3_FS_XATTR=y</div><div class='add'>+# CONFIG_EXT3_FS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_EXT3_FS_SECURITY is not set</div><div class='add'>+# CONFIG_EXT4DEV_FS is not set</div><div class='add'>+CONFIG_JBD=y</div><div class='add'>+CONFIG_FS_MBCACHE=y</div><div class='add'>+# CONFIG_REISERFS_FS is not set</div><div class='add'>+# CONFIG_JFS_FS is not set</div><div class='add'>+# CONFIG_FS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_XFS_FS is not set</div><div class='add'>+# CONFIG_OCFS2_FS is not set</div><div class='add'>+CONFIG_DNOTIFY=y</div><div class='add'>+CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='add'>+# CONFIG_QUOTA is not set</div><div class='add'>+# CONFIG_AUTOFS_FS is not set</div><div class='add'>+# CONFIG_AUTOFS4_FS is not set</div><div class='add'>+# CONFIG_FUSE_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CD-ROM/DVD Filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ISO9660_FS is not set</div><div class='add'>+# CONFIG_UDF_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DOS/FAT/NT Filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_FAT_FS=y</div><div class='add'>+# CONFIG_MSDOS_FS is not set</div><div class='add'>+CONFIG_VFAT_FS=y</div><div class='add'>+CONFIG_FAT_DEFAULT_CODEPAGE=437</div><div class='add'>+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"</div><div class='add'>+# CONFIG_NTFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Pseudo filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_PROC_FS=y</div><div class='add'>+CONFIG_PROC_SYSCTL=y</div><div class='add'>+CONFIG_SYSFS=y</div><div class='add'>+CONFIG_TMPFS=y</div><div class='add'>+# CONFIG_TMPFS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_HUGETLB_PAGE is not set</div><div class='add'>+# CONFIG_CONFIGFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ADFS_FS is not set</div><div class='add'>+# CONFIG_AFFS_FS is not set</div><div class='add'>+# CONFIG_HFS_FS is not set</div><div class='add'>+# CONFIG_HFSPLUS_FS is not set</div><div class='add'>+# CONFIG_BEFS_FS is not set</div><div class='add'>+# CONFIG_BFS_FS is not set</div><div class='add'>+# CONFIG_EFS_FS is not set</div><div class='add'>+CONFIG_JFFS2_FS=y</div><div class='add'>+CONFIG_JFFS2_FS_DEBUG=0</div><div class='add'>+CONFIG_JFFS2_FS_WRITEBUFFER=y</div><div class='add'>+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set</div><div class='add'>+# CONFIG_JFFS2_SUMMARY is not set</div><div class='add'>+# CONFIG_JFFS2_FS_XATTR is not set</div><div class='add'>+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set</div><div class='add'>+CONFIG_JFFS2_ZLIB=y</div><div class='add'>+# CONFIG_JFFS2_LZO is not set</div><div class='add'>+CONFIG_JFFS2_RTIME=y</div><div class='add'>+# CONFIG_JFFS2_RUBIN is not set</div><div class='add'>+CONFIG_CRAMFS=y</div><div class='add'>+# CONFIG_VXFS_FS is not set</div><div class='add'>+# CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='add'>+# CONFIG_HPFS_FS is not set</div><div class='add'>+# CONFIG_QNX4FS_FS is not set</div><div class='add'>+# CONFIG_ROMFS_FS is not set</div><div class='add'>+# CONFIG_SYSV_FS is not set</div><div class='add'>+# CONFIG_UFS_FS is not set</div><div class='add'>+CONFIG_NETWORK_FILESYSTEMS=y</div><div class='add'>+CONFIG_NFS_FS=y</div><div class='add'>+CONFIG_NFS_V3=y</div><div class='add'>+# CONFIG_NFS_V3_ACL is not set</div><div class='add'>+# CONFIG_NFS_V4 is not set</div><div class='add'>+CONFIG_ROOT_NFS=y</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='add'>+CONFIG_LOCKD=y</div><div class='add'>+CONFIG_LOCKD_V4=y</div><div class='add'>+CONFIG_NFS_COMMON=y</div><div class='add'>+CONFIG_SUNRPC=y</div><div class='add'>+# CONFIG_RPCSEC_GSS_KRB5 is not set</div><div class='add'>+# CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='add'>+# CONFIG_SMB_FS is not set</div><div class='add'>+# CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_NCP_FS is not set</div><div class='add'>+# CONFIG_CODA_FS is not set</div><div class='add'>+# CONFIG_AFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Partition Types</div><div class='add'>+#</div><div class='add'>+# CONFIG_PARTITION_ADVANCED is not set</div><div class='add'>+CONFIG_MSDOS_PARTITION=y</div><div class='add'>+CONFIG_NLS=y</div><div class='add'>+CONFIG_NLS_DEFAULT="iso8859-1"</div><div class='add'>+CONFIG_NLS_CODEPAGE_437=y</div><div class='add'>+# CONFIG_NLS_CODEPAGE_737 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_775 is not set</div><div class='add'>+CONFIG_NLS_CODEPAGE_850=y</div><div class='add'>+# CONFIG_NLS_CODEPAGE_852 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_855 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_857 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_860 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_861 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_862 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_863 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_864 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_865 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_866 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_869 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_936 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_950 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_932 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_949 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_874 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_8 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_1250 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_1251 is not set</div><div class='add'>+# CONFIG_NLS_ASCII is not set</div><div class='add'>+CONFIG_NLS_ISO8859_1=y</div><div class='add'>+# CONFIG_NLS_ISO8859_2 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_3 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_4 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_5 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_6 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_7 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_9 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_13 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_14 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_15 is not set</div><div class='add'>+# CONFIG_NLS_KOI8_R is not set</div><div class='add'>+# CONFIG_NLS_KOI8_U is not set</div><div class='add'>+# CONFIG_NLS_UTF8 is not set</div><div class='add'>+# CONFIG_DLM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel hacking</div><div class='add'>+#</div><div class='add'>+# CONFIG_PRINTK_TIME is not set</div><div class='add'>+CONFIG_ENABLE_WARN_DEPRECATED=y</div><div class='add'>+CONFIG_ENABLE_MUST_CHECK=y</div><div class='add'>+CONFIG_FRAME_WARN=1024</div><div class='add'>+# CONFIG_MAGIC_SYSRQ is not set</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='add'>+# CONFIG_DEBUG_FS is not set</div><div class='add'>+# CONFIG_HEADERS_CHECK is not set</div><div class='add'>+CONFIG_DEBUG_KERNEL=y</div><div class='add'>+# CONFIG_DEBUG_SHIRQ is not set</div><div class='add'>+CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set</div><div class='add'>+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0</div><div class='add'>+CONFIG_SCHED_DEBUG=y</div><div class='add'>+# CONFIG_SCHEDSTATS is not set</div><div class='add'>+# CONFIG_TIMER_STATS is not set</div><div class='add'>+# CONFIG_DEBUG_OBJECTS is not set</div><div class='add'>+# CONFIG_DEBUG_SLAB is not set</div><div class='add'>+CONFIG_DEBUG_PREEMPT=y</div><div class='add'>+# CONFIG_DEBUG_RT_MUTEXES is not set</div><div class='add'>+# CONFIG_RT_MUTEX_TESTER is not set</div><div class='add'>+# CONFIG_DEBUG_SPINLOCK is not set</div><div class='add'>+# CONFIG_DEBUG_MUTEXES is not set</div><div class='add'>+# CONFIG_DEBUG_LOCK_ALLOC is not set</div><div class='add'>+# CONFIG_PROVE_LOCKING is not set</div><div class='add'>+# CONFIG_LOCK_STAT is not set</div><div class='add'>+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set</div><div class='add'>+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set</div><div class='add'>+# CONFIG_DEBUG_KOBJECT is not set</div><div class='add'>+CONFIG_DEBUG_BUGVERBOSE=y</div><div class='add'>+CONFIG_DEBUG_INFO=y</div><div class='add'>+# CONFIG_DEBUG_VM is not set</div><div class='add'>+# CONFIG_DEBUG_WRITECOUNT is not set</div><div class='add'>+CONFIG_DEBUG_MEMORY_INIT=y</div><div class='add'>+# CONFIG_DEBUG_LIST is not set</div><div class='add'>+# CONFIG_DEBUG_SG is not set</div><div class='add'>+CONFIG_FRAME_POINTER=y</div><div class='add'>+# CONFIG_BOOT_PRINTK_DELAY is not set</div><div class='add'>+# CONFIG_RCU_TORTURE_TEST is not set</div><div class='add'>+# CONFIG_BACKTRACE_SELF_TEST is not set</div><div class='add'>+# CONFIG_FAULT_INJECTION is not set</div><div class='add'>+# CONFIG_LATENCYTOP is not set</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_IRQSOFF_TRACER is not set</div><div class='add'>+# CONFIG_PREEMPT_TRACER is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='add'>+# CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='add'>+# CONFIG_KGDB is not set</div><div class='add'>+CONFIG_DEBUG_USER=y</div><div class='add'>+# CONFIG_DEBUG_ERRORS is not set</div><div class='add'>+# CONFIG_DEBUG_STACK_USAGE is not set</div><div class='add'>+CONFIG_DEBUG_LL=y</div><div class='add'>+# CONFIG_DEBUG_ICEDCC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Security options</div><div class='add'>+#</div><div class='add'>+# CONFIG_KEYS is not set</div><div class='add'>+# CONFIG_SECURITY is not set</div><div class='add'>+# CONFIG_SECURITY_FILE_CAPABILITIES is not set</div><div class='add'>+# CONFIG_CRYPTO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Library routines</div><div class='add'>+#</div><div class='add'>+CONFIG_BITREVERSE=y</div><div class='add'>+# CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='add'>+# CONFIG_GENERIC_FIND_NEXT_BIT is not set</div><div class='add'>+# CONFIG_CRC_CCITT is not set</div><div class='add'>+# CONFIG_CRC16 is not set</div><div class='add'>+CONFIG_CRC_T10DIF=y</div><div class='add'>+# CONFIG_CRC_ITU_T is not set</div><div class='add'>+CONFIG_CRC32=y</div><div class='add'>+# CONFIG_CRC7 is not set</div><div class='add'>+# CONFIG_LIBCRC32C is not set</div><div class='add'>+CONFIG_ZLIB_INFLATE=y</div><div class='add'>+CONFIG_ZLIB_DEFLATE=y</div><div class='add'>+CONFIG_PLIST=y</div><div class='add'>+CONFIG_HAS_IOMEM=y</div><div class='add'>+CONFIG_HAS_IOPORT=y</div><div class='add'>+CONFIG_HAS_DMA=y</div><div class='head'>diff --git a/arch/arm/configs/at91sam9rlek_defconfig b/arch/arm/configs/at91sam9rlek_defconfig<br/>index 1c76642272a1..811bebbdc784 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/configs/at91sam9rlek_defconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/configs/at91sam9rlek_defconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/configs/at91sam9rlek_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/configs/at91sam9rlek_defconfig</a></div><div class='hunk'>@@ -496,6 +496,7 @@ CONFIG_INPUT_TOUCHSCREEN=y</div><div class='ctx'> # CONFIG_TOUCHSCREEN_PENMOUNT is not set</div><div class='ctx'> # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set</div><div class='ctx'> # CONFIG_TOUCHSCREEN_TOUCHWIN is not set</div><div class='add'>+CONFIG_TOUCHSCREEN_ATMEL_TSADCC=y</div><div class='ctx'> # CONFIG_TOUCHSCREEN_UCB1400 is not set</div><div class='ctx'> # CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set</div><div class='ctx'> # CONFIG_INPUT_MISC is not set</div><div class='head'>diff --git a/arch/arm/configs/cm_x300_defconfig b/arch/arm/configs/cm_x300_defconfig<br/>new file mode 100644<br/>index 000000000000..46f1c9dc350c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/configs/cm_x300_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/configs/cm_x300_defconfig</a></div><div class='hunk'>@@ -0,0 +1,1466 @@</div><div class='add'>+#</div><div class='add'>+# Automatically generated make config: don't edit</div><div class='add'>+# Linux kernel version: 2.6.27-rc3</div><div class='add'>+# Tue Aug 19 11:26:54 2008</div><div class='add'>+#</div><div class='add'>+CONFIG_ARM=y</div><div class='add'>+CONFIG_SYS_SUPPORTS_APM_EMULATION=y</div><div class='add'>+CONFIG_GENERIC_GPIO=y</div><div class='add'>+CONFIG_GENERIC_TIME=y</div><div class='add'>+CONFIG_GENERIC_CLOCKEVENTS=y</div><div class='add'>+CONFIG_MMU=y</div><div class='add'>+# CONFIG_NO_IOPORT is not set</div><div class='add'>+CONFIG_GENERIC_HARDIRQS=y</div><div class='add'>+CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='add'>+CONFIG_LOCKDEP_SUPPORT=y</div><div class='add'>+CONFIG_TRACE_IRQFLAGS_SUPPORT=y</div><div class='add'>+CONFIG_HARDIRQS_SW_RESEND=y</div><div class='add'>+CONFIG_GENERIC_IRQ_PROBE=y</div><div class='add'>+CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='add'>+# CONFIG_ARCH_HAS_ILOG2_U32 is not set</div><div class='add'>+# CONFIG_ARCH_HAS_ILOG2_U64 is not set</div><div class='add'>+CONFIG_GENERIC_HWEIGHT=y</div><div class='add'>+CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_ARCH_SUPPORTS_AOUT=y</div><div class='add'>+CONFIG_ZONE_DMA=y</div><div class='add'>+CONFIG_ARCH_MTD_XIP=y</div><div class='add'>+CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y</div><div class='add'>+CONFIG_VECTORS_BASE=0xffff0000</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# General setup</div><div class='add'>+#</div><div class='add'>+CONFIG_EXPERIMENTAL=y</div><div class='add'>+CONFIG_BROKEN_ON_SMP=y</div><div class='add'>+CONFIG_INIT_ENV_ARG_LIMIT=32</div><div class='add'>+CONFIG_LOCALVERSION="-cm-x300"</div><div class='add'>+# CONFIG_LOCALVERSION_AUTO is not set</div><div class='add'>+CONFIG_SWAP=y</div><div class='add'>+CONFIG_SYSVIPC=y</div><div class='add'>+CONFIG_SYSVIPC_SYSCTL=y</div><div class='add'>+# CONFIG_POSIX_MQUEUE is not set</div><div class='add'>+# CONFIG_BSD_PROCESS_ACCT is not set</div><div class='add'>+# CONFIG_TASKSTATS is not set</div><div class='add'>+# CONFIG_AUDIT is not set</div><div class='add'>+CONFIG_IKCONFIG=y</div><div class='add'>+CONFIG_IKCONFIG_PROC=y</div><div class='add'>+CONFIG_LOG_BUF_SHIFT=18</div><div class='add'>+# CONFIG_CGROUPS is not set</div><div class='add'>+CONFIG_GROUP_SCHED=y</div><div class='add'>+CONFIG_FAIR_GROUP_SCHED=y</div><div class='add'>+# CONFIG_RT_GROUP_SCHED is not set</div><div class='add'>+CONFIG_USER_SCHED=y</div><div class='add'>+# CONFIG_CGROUP_SCHED is not set</div><div class='add'>+CONFIG_SYSFS_DEPRECATED=y</div><div class='add'>+CONFIG_SYSFS_DEPRECATED_V2=y</div><div class='add'>+# CONFIG_RELAY is not set</div><div class='add'>+CONFIG_NAMESPACES=y</div><div class='add'>+# CONFIG_UTS_NS is not set</div><div class='add'>+# CONFIG_IPC_NS is not set</div><div class='add'>+# CONFIG_USER_NS is not set</div><div class='add'>+# CONFIG_PID_NS is not set</div><div class='add'>+CONFIG_BLK_DEV_INITRD=y</div><div class='add'>+CONFIG_INITRAMFS_SOURCE=""</div><div class='add'>+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set</div><div class='add'>+CONFIG_SYSCTL=y</div><div class='add'>+# CONFIG_EMBEDDED is not set</div><div class='add'>+CONFIG_UID16=y</div><div class='add'>+CONFIG_SYSCTL_SYSCALL=y</div><div class='add'>+CONFIG_KALLSYMS=y</div><div class='add'>+# CONFIG_KALLSYMS_ALL is not set</div><div class='add'>+# CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='add'>+CONFIG_HOTPLUG=y</div><div class='add'>+CONFIG_PRINTK=y</div><div class='add'>+CONFIG_BUG=y</div><div class='add'>+CONFIG_ELF_CORE=y</div><div class='add'>+CONFIG_COMPAT_BRK=y</div><div class='add'>+CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_FUTEX=y</div><div class='add'>+CONFIG_ANON_INODES=y</div><div class='add'>+CONFIG_EPOLL=y</div><div class='add'>+CONFIG_SIGNALFD=y</div><div class='add'>+CONFIG_TIMERFD=y</div><div class='add'>+CONFIG_EVENTFD=y</div><div class='add'>+CONFIG_SHMEM=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='add'>+CONFIG_SLUB_DEBUG=y</div><div class='add'>+# CONFIG_SLAB is not set</div><div class='add'>+CONFIG_SLUB=y</div><div class='add'>+# CONFIG_SLOB is not set</div><div class='add'>+# CONFIG_PROFILING is not set</div><div class='add'>+# CONFIG_MARKERS is not set</div><div class='add'>+CONFIG_HAVE_OPROFILE=y</div><div class='add'>+# CONFIG_KPROBES is not set</div><div class='add'>+# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set</div><div class='add'>+# CONFIG_HAVE_IOREMAP_PROT is not set</div><div class='add'>+CONFIG_HAVE_KPROBES=y</div><div class='add'>+CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+# CONFIG_HAVE_ARCH_TRACEHOOK is not set</div><div class='add'>+# CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+CONFIG_HAVE_CLK=y</div><div class='add'>+CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+CONFIG_HAVE_GENERIC_DMA_COHERENT=y</div><div class='add'>+CONFIG_SLABINFO=y</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='add'>+# CONFIG_TINY_SHMEM is not set</div><div class='add'>+CONFIG_BASE_SMALL=0</div><div class='add'>+CONFIG_MODULES=y</div><div class='add'>+# CONFIG_MODULE_FORCE_LOAD is not set</div><div class='add'>+CONFIG_MODULE_UNLOAD=y</div><div class='add'>+# CONFIG_MODULE_FORCE_UNLOAD is not set</div><div class='add'>+# CONFIG_MODVERSIONS is not set</div><div class='add'>+# CONFIG_MODULE_SRCVERSION_ALL is not set</div><div class='add'>+CONFIG_KMOD=y</div><div class='add'>+CONFIG_BLOCK=y</div><div class='add'>+# CONFIG_LBD is not set</div><div class='add'>+# CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='add'>+# CONFIG_LSF is not set</div><div class='add'>+# CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IO Schedulers</div><div class='add'>+#</div><div class='add'>+CONFIG_IOSCHED_NOOP=y</div><div class='add'>+CONFIG_IOSCHED_AS=y</div><div class='add'>+CONFIG_IOSCHED_DEADLINE=y</div><div class='add'>+CONFIG_IOSCHED_CFQ=y</div><div class='add'>+# CONFIG_DEFAULT_AS is not set</div><div class='add'>+# CONFIG_DEFAULT_DEADLINE is not set</div><div class='add'>+CONFIG_DEFAULT_CFQ=y</div><div class='add'>+# CONFIG_DEFAULT_NOOP is not set</div><div class='add'>+CONFIG_DEFAULT_IOSCHED="cfq"</div><div class='add'>+CONFIG_CLASSIC_RCU=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# System Type</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARCH_AAEC2000 is not set</div><div class='add'>+# CONFIG_ARCH_INTEGRATOR is not set</div><div class='add'>+# CONFIG_ARCH_REALVIEW is not set</div><div class='add'>+# CONFIG_ARCH_VERSATILE is not set</div><div class='add'>+# CONFIG_ARCH_AT91 is not set</div><div class='add'>+# CONFIG_ARCH_CLPS7500 is not set</div><div class='add'>+# CONFIG_ARCH_CLPS711X is not set</div><div class='add'>+# CONFIG_ARCH_EBSA110 is not set</div><div class='add'>+# CONFIG_ARCH_EP93XX is not set</div><div class='add'>+# CONFIG_ARCH_FOOTBRIDGE is not set</div><div class='add'>+# CONFIG_ARCH_NETX is not set</div><div class='add'>+# CONFIG_ARCH_H720X is not set</div><div class='add'>+# CONFIG_ARCH_IMX is not set</div><div class='add'>+# CONFIG_ARCH_IOP13XX is not set</div><div class='add'>+# CONFIG_ARCH_IOP32X is not set</div><div class='add'>+# CONFIG_ARCH_IOP33X is not set</div><div class='add'>+# CONFIG_ARCH_IXP23XX is not set</div><div class='add'>+# CONFIG_ARCH_IXP2000 is not set</div><div class='add'>+# CONFIG_ARCH_IXP4XX is not set</div><div class='add'>+# CONFIG_ARCH_L7200 is not set</div><div class='add'>+# CONFIG_ARCH_KIRKWOOD is not set</div><div class='add'>+# CONFIG_ARCH_KS8695 is not set</div><div class='add'>+# CONFIG_ARCH_NS9XXX is not set</div><div class='add'>+# CONFIG_ARCH_LOKI is not set</div><div class='add'>+# CONFIG_ARCH_MV78XX0 is not set</div><div class='add'>+# CONFIG_ARCH_MXC is not set</div><div class='add'>+# CONFIG_ARCH_ORION5X is not set</div><div class='add'>+# CONFIG_ARCH_PNX4008 is not set</div><div class='add'>+CONFIG_ARCH_PXA=y</div><div class='add'>+# CONFIG_ARCH_RPC is not set</div><div class='add'>+# CONFIG_ARCH_SA1100 is not set</div><div class='add'>+# CONFIG_ARCH_S3C2410 is not set</div><div class='add'>+# CONFIG_ARCH_SHARK is not set</div><div class='add'>+# CONFIG_ARCH_LH7A40X is not set</div><div class='add'>+# CONFIG_ARCH_DAVINCI is not set</div><div class='add'>+# CONFIG_ARCH_OMAP is not set</div><div class='add'>+# CONFIG_ARCH_MSM7X00A is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Intel PXA2xx/PXA3xx Implementations</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Supported PXA3xx Processor Variants</div><div class='add'>+#</div><div class='add'>+CONFIG_CPU_PXA300=y</div><div class='add'>+# CONFIG_CPU_PXA310 is not set</div><div class='add'>+# CONFIG_CPU_PXA320 is not set</div><div class='add'>+# CONFIG_CPU_PXA930 is not set</div><div class='add'>+# CONFIG_ARCH_GUMSTIX is not set</div><div class='add'>+# CONFIG_ARCH_LUBBOCK is not set</div><div class='add'>+# CONFIG_MACH_LOGICPD_PXA270 is not set</div><div class='add'>+# CONFIG_MACH_MAINSTONE is not set</div><div class='add'>+# CONFIG_ARCH_PXA_IDP is not set</div><div class='add'>+# CONFIG_PXA_SHARPSL is not set</div><div class='add'>+# CONFIG_ARCH_PXA_ESERIES is not set</div><div class='add'>+# CONFIG_MACH_TRIZEPS4 is not set</div><div class='add'>+# CONFIG_MACH_EM_X270 is not set</div><div class='add'>+# CONFIG_MACH_COLIBRI is not set</div><div class='add'>+# CONFIG_MACH_ZYLONITE is not set</div><div class='add'>+# CONFIG_MACH_LITTLETON is not set</div><div class='add'>+# CONFIG_MACH_TAVOREVB is not set</div><div class='add'>+# CONFIG_MACH_SAAR is not set</div><div class='add'>+# CONFIG_MACH_ARMCORE is not set</div><div class='add'>+CONFIG_MACH_CM_X300=y</div><div class='add'>+# CONFIG_MACH_MAGICIAN is not set</div><div class='add'>+# CONFIG_MACH_PCM027 is not set</div><div class='add'>+# CONFIG_ARCH_PXA_PALM is not set</div><div class='add'>+# CONFIG_PXA_EZX is not set</div><div class='add'>+CONFIG_PXA3xx=y</div><div class='add'>+# CONFIG_PXA_PWM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Boot options</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Power management</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Processor Type</div><div class='add'>+#</div><div class='add'>+CONFIG_CPU_32=y</div><div class='add'>+CONFIG_CPU_XSC3=y</div><div class='add'>+CONFIG_CPU_32v5=y</div><div class='add'>+CONFIG_CPU_ABRT_EV5T=y</div><div class='add'>+CONFIG_CPU_PABRT_NOIFAR=y</div><div class='add'>+CONFIG_CPU_CACHE_VIVT=y</div><div class='add'>+CONFIG_CPU_TLB_V4WBI=y</div><div class='add'>+CONFIG_CPU_CP15=y</div><div class='add'>+CONFIG_CPU_CP15_MMU=y</div><div class='add'>+CONFIG_IO_36=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Processor Features</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARM_THUMB is not set</div><div class='add'>+# CONFIG_CPU_DCACHE_DISABLE is not set</div><div class='add'>+# CONFIG_CPU_BPREDICT_DISABLE is not set</div><div class='add'>+CONFIG_OUTER_CACHE=y</div><div class='add'>+CONFIG_CACHE_XSC3L2=y</div><div class='add'>+CONFIG_IWMMXT=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Bus support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PCI_SYSCALL is not set</div><div class='add'>+# CONFIG_ARCH_SUPPORTS_MSI is not set</div><div class='add'>+# CONFIG_PCCARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel Features</div><div class='add'>+#</div><div class='add'>+CONFIG_TICK_ONESHOT=y</div><div class='add'>+CONFIG_NO_HZ=y</div><div class='add'>+# CONFIG_HIGH_RES_TIMERS is not set</div><div class='add'>+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y</div><div class='add'>+# CONFIG_PREEMPT is not set</div><div class='add'>+CONFIG_HZ=100</div><div class='add'>+CONFIG_AEABI=y</div><div class='add'>+CONFIG_OABI_COMPAT=y</div><div class='add'>+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set</div><div class='add'>+CONFIG_SELECT_MEMORY_MODEL=y</div><div class='add'>+CONFIG_FLATMEM_MANUAL=y</div><div class='add'>+# CONFIG_DISCONTIGMEM_MANUAL is not set</div><div class='add'>+# CONFIG_SPARSEMEM_MANUAL is not set</div><div class='add'>+CONFIG_FLATMEM=y</div><div class='add'>+CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='add'>+# CONFIG_SPARSEMEM_STATIC is not set</div><div class='add'>+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='add'>+CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='add'>+CONFIG_SPLIT_PTLOCK_CPUS=4096</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+CONFIG_ZONE_DMA_FLAG=1</div><div class='add'>+CONFIG_BOUNCE=y</div><div class='add'>+CONFIG_VIRT_TO_BUS=y</div><div class='add'>+CONFIG_ALIGNMENT_TRAP=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Boot options</div><div class='add'>+#</div><div class='add'>+CONFIG_ZBOOT_ROM_TEXT=0x0</div><div class='add'>+CONFIG_ZBOOT_ROM_BSS=0x0</div><div class='add'>+CONFIG_CMDLINE="root=/dev/mtdblock5 rootfstype=jffs2 console=ttyS2,38400"</div><div class='add'>+# CONFIG_XIP_KERNEL is not set</div><div class='add'>+# CONFIG_KEXEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CPU Frequency scaling</div><div class='add'>+#</div><div class='add'>+CONFIG_CPU_FREQ=y</div><div class='add'>+CONFIG_CPU_FREQ_TABLE=y</div><div class='add'>+# CONFIG_CPU_FREQ_DEBUG is not set</div><div class='add'>+CONFIG_CPU_FREQ_STAT=y</div><div class='add'>+# CONFIG_CPU_FREQ_STAT_DETAILS is not set</div><div class='add'>+CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y</div><div class='add'>+# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set</div><div class='add'>+# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set</div><div class='add'>+# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set</div><div class='add'>+# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set</div><div class='add'>+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y</div><div class='add'>+# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set</div><div class='add'>+CONFIG_CPU_FREQ_GOV_USERSPACE=y</div><div class='add'>+# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set</div><div class='add'>+# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Floating point emulation</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# At least one emulation must be selected</div><div class='add'>+#</div><div class='add'>+CONFIG_FPE_NWFPE=y</div><div class='add'>+# CONFIG_FPE_NWFPE_XP is not set</div><div class='add'>+# CONFIG_FPE_FASTFPE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Userspace binary formats</div><div class='add'>+#</div><div class='add'>+CONFIG_BINFMT_ELF=y</div><div class='add'>+# CONFIG_BINFMT_AOUT is not set</div><div class='add'>+# CONFIG_BINFMT_MISC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Power management options</div><div class='add'>+#</div><div class='add'>+CONFIG_PM=y</div><div class='add'>+# CONFIG_PM_DEBUG is not set</div><div class='add'>+CONFIG_PM_SLEEP=y</div><div class='add'>+CONFIG_SUSPEND=y</div><div class='add'>+CONFIG_SUSPEND_FREEZER=y</div><div class='add'>+CONFIG_APM_EMULATION=y</div><div class='add'>+CONFIG_ARCH_SUSPEND_POSSIBLE=y</div><div class='add'>+CONFIG_NET=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking options</div><div class='add'>+#</div><div class='add'>+CONFIG_PACKET=y</div><div class='add'>+# CONFIG_PACKET_MMAP is not set</div><div class='add'>+CONFIG_UNIX=y</div><div class='add'>+# CONFIG_NET_KEY is not set</div><div class='add'>+CONFIG_INET=y</div><div class='add'>+# CONFIG_IP_MULTICAST is not set</div><div class='add'>+# CONFIG_IP_ADVANCED_ROUTER is not set</div><div class='add'>+CONFIG_IP_FIB_HASH=y</div><div class='add'>+CONFIG_IP_PNP=y</div><div class='add'>+CONFIG_IP_PNP_DHCP=y</div><div class='add'>+CONFIG_IP_PNP_BOOTP=y</div><div class='add'>+CONFIG_IP_PNP_RARP=y</div><div class='add'>+# CONFIG_NET_IPIP is not set</div><div class='add'>+# CONFIG_NET_IPGRE is not set</div><div class='add'>+# CONFIG_ARPD is not set</div><div class='add'>+# CONFIG_SYN_COOKIES is not set</div><div class='add'>+# CONFIG_INET_AH is not set</div><div class='add'>+# CONFIG_INET_ESP is not set</div><div class='add'>+# CONFIG_INET_IPCOMP is not set</div><div class='add'>+# CONFIG_INET_XFRM_TUNNEL is not set</div><div class='add'>+# CONFIG_INET_TUNNEL is not set</div><div class='add'>+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set</div><div class='add'>+# CONFIG_INET_XFRM_MODE_TUNNEL is not set</div><div class='add'>+# CONFIG_INET_XFRM_MODE_BEET is not set</div><div class='add'>+# CONFIG_INET_LRO is not set</div><div class='add'>+# CONFIG_INET_DIAG is not set</div><div class='add'>+# CONFIG_TCP_CONG_ADVANCED is not set</div><div class='add'>+CONFIG_TCP_CONG_CUBIC=y</div><div class='add'>+CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='add'>+# CONFIG_TCP_MD5SIG is not set</div><div class='add'>+# CONFIG_IPV6 is not set</div><div class='add'>+# CONFIG_NETWORK_SECMARK is not set</div><div class='add'>+# CONFIG_NETFILTER is not set</div><div class='add'>+# CONFIG_IP_DCCP is not set</div><div class='add'>+# CONFIG_IP_SCTP is not set</div><div class='add'>+# CONFIG_TIPC is not set</div><div class='add'>+# CONFIG_ATM is not set</div><div class='add'>+# CONFIG_BRIDGE is not set</div><div class='add'>+# CONFIG_VLAN_8021Q is not set</div><div class='add'>+# CONFIG_DECNET is not set</div><div class='add'>+# CONFIG_LLC2 is not set</div><div class='add'>+# CONFIG_IPX is not set</div><div class='add'>+# CONFIG_ATALK is not set</div><div class='add'>+# CONFIG_X25 is not set</div><div class='add'>+# CONFIG_LAPB is not set</div><div class='add'>+# CONFIG_ECONET is not set</div><div class='add'>+# CONFIG_WAN_ROUTER is not set</div><div class='add'>+# CONFIG_NET_SCHED is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network testing</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_PKTGEN is not set</div><div class='add'>+# CONFIG_HAMRADIO is not set</div><div class='add'>+# CONFIG_CAN is not set</div><div class='add'>+# CONFIG_IRDA is not set</div><div class='add'>+CONFIG_BT=m</div><div class='add'>+CONFIG_BT_L2CAP=m</div><div class='add'>+CONFIG_BT_SCO=m</div><div class='add'>+CONFIG_BT_RFCOMM=m</div><div class='add'>+CONFIG_BT_RFCOMM_TTY=y</div><div class='add'>+CONFIG_BT_BNEP=m</div><div class='add'>+CONFIG_BT_BNEP_MC_FILTER=y</div><div class='add'>+CONFIG_BT_BNEP_PROTO_FILTER=y</div><div class='add'>+CONFIG_BT_HIDP=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Bluetooth device drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_BT_HCIUSB=m</div><div class='add'>+CONFIG_BT_HCIUSB_SCO=y</div><div class='add'>+# CONFIG_BT_HCIBTSDIO is not set</div><div class='add'>+# CONFIG_BT_HCIUART is not set</div><div class='add'>+# CONFIG_BT_HCIBCM203X is not set</div><div class='add'>+# CONFIG_BT_HCIBPA10X is not set</div><div class='add'>+# CONFIG_BT_HCIBFUSB is not set</div><div class='add'>+# CONFIG_BT_HCIVHCI is not set</div><div class='add'>+# CONFIG_AF_RXRPC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless</div><div class='add'>+#</div><div class='add'>+# CONFIG_CFG80211 is not set</div><div class='add'>+CONFIG_WIRELESS_EXT=y</div><div class='add'>+CONFIG_WIRELESS_EXT_SYSFS=y</div><div class='add'>+# CONFIG_MAC80211 is not set</div><div class='add'>+CONFIG_IEEE80211=m</div><div class='add'>+# CONFIG_IEEE80211_DEBUG is not set</div><div class='add'>+CONFIG_IEEE80211_CRYPT_WEP=m</div><div class='add'>+CONFIG_IEEE80211_CRYPT_CCMP=m</div><div class='add'>+CONFIG_IEEE80211_CRYPT_TKIP=m</div><div class='add'>+# CONFIG_RFKILL is not set</div><div class='add'>+# CONFIG_NET_9P is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Device Drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Generic Driver Options</div><div class='add'>+#</div><div class='add'>+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='add'>+CONFIG_STANDALONE=y</div><div class='add'>+CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='add'>+CONFIG_FW_LOADER=y</div><div class='add'>+CONFIG_FIRMWARE_IN_KERNEL=y</div><div class='add'>+CONFIG_EXTRA_FIRMWARE=""</div><div class='add'>+# CONFIG_DEBUG_DRIVER is not set</div><div class='add'>+# CONFIG_DEBUG_DEVRES is not set</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='add'>+# CONFIG_CONNECTOR is not set</div><div class='add'>+CONFIG_MTD=y</div><div class='add'>+# CONFIG_MTD_DEBUG is not set</div><div class='add'>+# CONFIG_MTD_CONCAT is not set</div><div class='add'>+CONFIG_MTD_PARTITIONS=y</div><div class='add'>+# CONFIG_MTD_REDBOOT_PARTS is not set</div><div class='add'>+# CONFIG_MTD_CMDLINE_PARTS is not set</div><div class='add'>+# CONFIG_MTD_AFS_PARTS is not set</div><div class='add'>+# CONFIG_MTD_AR7_PARTS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# User Modules And Translation Layers</div><div class='add'>+#</div><div class='add'>+CONFIG_MTD_CHAR=y</div><div class='add'>+CONFIG_MTD_BLKDEVS=y</div><div class='add'>+CONFIG_MTD_BLOCK=y</div><div class='add'>+# CONFIG_FTL is not set</div><div class='add'>+# CONFIG_NFTL is not set</div><div class='add'>+# CONFIG_INFTL is not set</div><div class='add'>+# CONFIG_RFD_FTL is not set</div><div class='add'>+# CONFIG_SSFDC is not set</div><div class='add'>+# CONFIG_MTD_OOPS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# RAM/ROM/Flash chip drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_CFI is not set</div><div class='add'>+# CONFIG_MTD_JEDECPROBE is not set</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_1=y</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_2=y</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_4=y</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set</div><div class='add'>+CONFIG_MTD_CFI_I1=y</div><div class='add'>+CONFIG_MTD_CFI_I2=y</div><div class='add'>+# CONFIG_MTD_CFI_I4 is not set</div><div class='add'>+# CONFIG_MTD_CFI_I8 is not set</div><div class='add'>+# CONFIG_MTD_RAM is not set</div><div class='add'>+# CONFIG_MTD_ROM is not set</div><div class='add'>+# CONFIG_MTD_ABSENT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Mapping drivers for chip access</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_COMPLEX_MAPPINGS is not set</div><div class='add'>+# CONFIG_MTD_SHARP_SL is not set</div><div class='add'>+# CONFIG_MTD_PLATRAM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Self-contained MTD device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_SLRAM is not set</div><div class='add'>+# CONFIG_MTD_PHRAM is not set</div><div class='add'>+# CONFIG_MTD_MTDRAM is not set</div><div class='add'>+# CONFIG_MTD_BLOCK2MTD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Disk-On-Chip Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_DOC2000 is not set</div><div class='add'>+# CONFIG_MTD_DOC2001 is not set</div><div class='add'>+# CONFIG_MTD_DOC2001PLUS is not set</div><div class='add'>+CONFIG_MTD_NAND=y</div><div class='add'>+# CONFIG_MTD_NAND_VERIFY_WRITE is not set</div><div class='add'>+# CONFIG_MTD_NAND_ECC_SMC is not set</div><div class='add'>+# CONFIG_MTD_NAND_MUSEUM_IDS is not set</div><div class='add'>+# CONFIG_MTD_NAND_H1900 is not set</div><div class='add'>+CONFIG_MTD_NAND_IDS=y</div><div class='add'>+# CONFIG_MTD_NAND_DISKONCHIP is not set</div><div class='add'>+# CONFIG_MTD_NAND_SHARPSL is not set</div><div class='add'>+CONFIG_MTD_NAND_PXA3xx=y</div><div class='add'>+# CONFIG_MTD_NAND_NANDSIM is not set</div><div class='add'>+# CONFIG_MTD_NAND_PLATFORM is not set</div><div class='add'>+# CONFIG_MTD_ALAUDA is not set</div><div class='add'>+# CONFIG_MTD_ONENAND is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# UBI - Unsorted block images</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_UBI is not set</div><div class='add'>+# CONFIG_PARPORT is not set</div><div class='add'>+CONFIG_BLK_DEV=y</div><div class='add'>+# CONFIG_BLK_DEV_COW_COMMON is not set</div><div class='add'>+CONFIG_BLK_DEV_LOOP=y</div><div class='add'>+# CONFIG_BLK_DEV_CRYPTOLOOP is not set</div><div class='add'>+# CONFIG_BLK_DEV_NBD is not set</div><div class='add'>+# CONFIG_BLK_DEV_UB is not set</div><div class='add'>+CONFIG_BLK_DEV_RAM=y</div><div class='add'>+CONFIG_BLK_DEV_RAM_COUNT=16</div><div class='add'>+CONFIG_BLK_DEV_RAM_SIZE=4096</div><div class='add'>+# CONFIG_BLK_DEV_XIP is not set</div><div class='add'>+# CONFIG_CDROM_PKTCDVD is not set</div><div class='add'>+# CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+# CONFIG_MISC_DEVICES is not set</div><div class='add'>+CONFIG_HAVE_IDE=y</div><div class='add'>+# CONFIG_IDE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_RAID_ATTRS is not set</div><div class='add'>+CONFIG_SCSI=y</div><div class='add'>+CONFIG_SCSI_DMA=y</div><div class='add'>+# CONFIG_SCSI_TGT is not set</div><div class='add'>+# CONFIG_SCSI_NETLINK is not set</div><div class='add'>+CONFIG_SCSI_PROC_FS=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI support type (disk, tape, CD-ROM)</div><div class='add'>+#</div><div class='add'>+CONFIG_BLK_DEV_SD=y</div><div class='add'>+# CONFIG_CHR_DEV_ST is not set</div><div class='add'>+# CONFIG_CHR_DEV_OSST is not set</div><div class='add'>+# CONFIG_BLK_DEV_SR is not set</div><div class='add'>+# CONFIG_CHR_DEV_SG is not set</div><div class='add'>+# CONFIG_CHR_DEV_SCH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs</div><div class='add'>+#</div><div class='add'>+# CONFIG_SCSI_MULTI_LUN is not set</div><div class='add'>+# CONFIG_SCSI_CONSTANTS is not set</div><div class='add'>+# CONFIG_SCSI_LOGGING is not set</div><div class='add'>+# CONFIG_SCSI_SCAN_ASYNC is not set</div><div class='add'>+CONFIG_SCSI_WAIT_SCAN=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI Transports</div><div class='add'>+#</div><div class='add'>+# CONFIG_SCSI_SPI_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_FC_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_ISCSI_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_SAS_LIBSAS is not set</div><div class='add'>+# CONFIG_SCSI_SRP_ATTRS is not set</div><div class='add'>+CONFIG_SCSI_LOWLEVEL=y</div><div class='add'>+# CONFIG_ISCSI_TCP is not set</div><div class='add'>+# CONFIG_SCSI_DEBUG is not set</div><div class='add'>+# CONFIG_SCSI_DH is not set</div><div class='add'>+# CONFIG_ATA is not set</div><div class='add'>+# CONFIG_MD is not set</div><div class='add'>+CONFIG_NETDEVICES=y</div><div class='add'>+# CONFIG_DUMMY is not set</div><div class='add'>+# CONFIG_BONDING is not set</div><div class='add'>+# CONFIG_MACVLAN is not set</div><div class='add'>+# CONFIG_EQUALIZER is not set</div><div class='add'>+# CONFIG_TUN is not set</div><div class='add'>+# CONFIG_VETH is not set</div><div class='add'>+# CONFIG_PHYLIB is not set</div><div class='add'>+CONFIG_NET_ETHERNET=y</div><div class='add'>+CONFIG_MII=y</div><div class='add'>+# CONFIG_AX88796 is not set</div><div class='add'>+# CONFIG_SMC91X is not set</div><div class='add'>+CONFIG_DM9000=y</div><div class='add'>+CONFIG_DM9000_DEBUGLEVEL=0</div><div class='add'>+CONFIG_DM9000_FORCE_SIMPLE_PHY_POLL=y</div><div class='add'>+# CONFIG_SMC911X is not set</div><div class='add'>+# CONFIG_IBM_NEW_EMAC_ZMII is not set</div><div class='add'>+# CONFIG_IBM_NEW_EMAC_RGMII is not set</div><div class='add'>+# CONFIG_IBM_NEW_EMAC_TAH is not set</div><div class='add'>+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set</div><div class='add'>+# CONFIG_B44 is not set</div><div class='add'>+# CONFIG_NETDEV_1000 is not set</div><div class='add'>+# CONFIG_NETDEV_10000 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless LAN</div><div class='add'>+#</div><div class='add'>+# CONFIG_WLAN_PRE80211 is not set</div><div class='add'>+CONFIG_WLAN_80211=y</div><div class='add'>+CONFIG_LIBERTAS=m</div><div class='add'>+# CONFIG_LIBERTAS_USB is not set</div><div class='add'>+CONFIG_LIBERTAS_SDIO=m</div><div class='add'>+# CONFIG_LIBERTAS_DEBUG is not set</div><div class='add'>+# CONFIG_USB_ZD1201 is not set</div><div class='add'>+# CONFIG_USB_NET_RNDIS_WLAN is not set</div><div class='add'>+# CONFIG_IWLWIFI_LEDS is not set</div><div class='add'>+# CONFIG_HOSTAP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Network Adapters</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_CATC is not set</div><div class='add'>+# CONFIG_USB_KAWETH is not set</div><div class='add'>+# CONFIG_USB_PEGASUS is not set</div><div class='add'>+# CONFIG_USB_RTL8150 is not set</div><div class='add'>+# CONFIG_USB_USBNET is not set</div><div class='add'>+# CONFIG_WAN is not set</div><div class='add'>+# CONFIG_PPP is not set</div><div class='add'>+# CONFIG_SLIP is not set</div><div class='add'>+# CONFIG_NETCONSOLE is not set</div><div class='add'>+# CONFIG_NETPOLL is not set</div><div class='add'>+# CONFIG_NET_POLL_CONTROLLER is not set</div><div class='add'>+# CONFIG_ISDN is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input device support</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT=y</div><div class='add'>+# CONFIG_INPUT_FF_MEMLESS is not set</div><div class='add'>+# CONFIG_INPUT_POLLDEV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Userland interfaces</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT_MOUSEDEV=y</div><div class='add'>+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768</div><div class='add'>+# CONFIG_INPUT_JOYDEV is not set</div><div class='add'>+CONFIG_INPUT_EVDEV=y</div><div class='add'>+# CONFIG_INPUT_EVBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input Device Drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT_KEYBOARD=y</div><div class='add'>+# CONFIG_KEYBOARD_ATKBD is not set</div><div class='add'>+# CONFIG_KEYBOARD_SUNKBD is not set</div><div class='add'>+# CONFIG_KEYBOARD_LKKBD is not set</div><div class='add'>+# CONFIG_KEYBOARD_XTKBD is not set</div><div class='add'>+# CONFIG_KEYBOARD_NEWTON is not set</div><div class='add'>+# CONFIG_KEYBOARD_STOWAWAY is not set</div><div class='add'>+CONFIG_KEYBOARD_PXA27x=m</div><div class='add'>+# CONFIG_KEYBOARD_GPIO is not set</div><div class='add'>+# CONFIG_INPUT_MOUSE is not set</div><div class='add'>+# CONFIG_INPUT_JOYSTICK is not set</div><div class='add'>+# CONFIG_INPUT_TABLET is not set</div><div class='add'>+CONFIG_INPUT_TOUCHSCREEN=y</div><div class='add'>+# CONFIG_TOUCHSCREEN_FUJITSU is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_GUNZE is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_ELO is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_MTOUCH is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_INEXIO is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_MK712 is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_PENMOUNT is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_TOUCHWIN is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_UCB1400 is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set</div><div class='add'>+# CONFIG_INPUT_MISC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware I/O ports</div><div class='add'>+#</div><div class='add'>+# CONFIG_SERIO is not set</div><div class='add'>+# CONFIG_GAMEPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Character devices</div><div class='add'>+#</div><div class='add'>+CONFIG_VT=y</div><div class='add'>+CONFIG_CONSOLE_TRANSLATIONS=y</div><div class='add'>+CONFIG_VT_CONSOLE=y</div><div class='add'>+CONFIG_HW_CONSOLE=y</div><div class='add'>+# CONFIG_VT_HW_CONSOLE_BINDING is not set</div><div class='add'>+CONFIG_DEVKMEM=y</div><div class='add'>+# CONFIG_SERIAL_NONSTANDARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Serial drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_SERIAL_8250 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Non-8250 serial port support</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIAL_PXA=y</div><div class='add'>+CONFIG_SERIAL_PXA_CONSOLE=y</div><div class='add'>+CONFIG_SERIAL_CORE=y</div><div class='add'>+CONFIG_SERIAL_CORE_CONSOLE=y</div><div class='add'>+CONFIG_UNIX98_PTYS=y</div><div class='add'>+# CONFIG_LEGACY_PTYS is not set</div><div class='add'>+# CONFIG_IPMI_HANDLER is not set</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='add'>+# CONFIG_NVRAM is not set</div><div class='add'>+# CONFIG_R3964 is not set</div><div class='add'>+# CONFIG_RAW_DRIVER is not set</div><div class='add'>+# CONFIG_TCG_TPM is not set</div><div class='add'>+CONFIG_I2C=y</div><div class='add'>+CONFIG_I2C_BOARDINFO=y</div><div class='add'>+# CONFIG_I2C_CHARDEV is not set</div><div class='add'>+CONFIG_I2C_HELPER_AUTO=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C Hardware Bus support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C system bus drivers (mostly embedded / system-on-chip)</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_GPIO is not set</div><div class='add'>+# CONFIG_I2C_OCORES is not set</div><div class='add'>+CONFIG_I2C_PXA=y</div><div class='add'>+# CONFIG_I2C_PXA_SLAVE is not set</div><div class='add'>+# CONFIG_I2C_SIMTEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# External I2C/SMBus adapter drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='add'>+# CONFIG_I2C_TAOS_EVM is not set</div><div class='add'>+# CONFIG_I2C_TINY_USB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Other I2C/SMBus bus drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_PCA_PLATFORM is not set</div><div class='add'>+# CONFIG_I2C_STUB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous I2C Chip support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DS1682 is not set</div><div class='add'>+# CONFIG_AT24 is not set</div><div class='add'>+# CONFIG_SENSORS_EEPROM is not set</div><div class='add'>+# CONFIG_SENSORS_PCF8574 is not set</div><div class='add'>+# CONFIG_PCF8575 is not set</div><div class='add'>+# CONFIG_SENSORS_PCF8591 is not set</div><div class='add'>+# CONFIG_TPS65010 is not set</div><div class='add'>+# CONFIG_SENSORS_MAX6875 is not set</div><div class='add'>+# CONFIG_SENSORS_TSL2550 is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_CORE is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_ALGO is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_BUS is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_CHIP is not set</div><div class='add'>+# CONFIG_SPI is not set</div><div class='add'>+CONFIG_ARCH_REQUIRE_GPIOLIB=y</div><div class='add'>+CONFIG_GPIOLIB=y</div><div class='add'>+# CONFIG_DEBUG_GPIO is not set</div><div class='add'>+# CONFIG_GPIO_SYSFS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C GPIO expanders:</div><div class='add'>+#</div><div class='add'>+# CONFIG_GPIO_MAX732X is not set</div><div class='add'>+CONFIG_GPIO_PCA953X=y</div><div class='add'>+# CONFIG_GPIO_PCF857X is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCI GPIO expanders:</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI GPIO expanders:</div><div class='add'>+#</div><div class='add'>+# CONFIG_W1 is not set</div><div class='add'>+# CONFIG_POWER_SUPPLY is not set</div><div class='add'>+# CONFIG_HWMON is not set</div><div class='add'>+# CONFIG_WATCHDOG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Sonics Silicon Backplane</div><div class='add'>+#</div><div class='add'>+CONFIG_SSB_POSSIBLE=y</div><div class='add'>+# CONFIG_SSB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multifunction device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='add'>+# CONFIG_MFD_SM501 is not set</div><div class='add'>+# CONFIG_HTC_EGPIO is not set</div><div class='add'>+# CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='add'>+# CONFIG_MFD_T7L66XB is not set</div><div class='add'>+# CONFIG_MFD_TC6387XB is not set</div><div class='add'>+# CONFIG_MFD_TC6393XB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia core support</div><div class='add'>+#</div><div class='add'>+# CONFIG_VIDEO_DEV is not set</div><div class='add'>+# CONFIG_DVB_CORE is not set</div><div class='add'>+# CONFIG_VIDEO_MEDIA is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_DAB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics support</div><div class='add'>+#</div><div class='add'>+# CONFIG_VGASTATE is not set</div><div class='add'>+# CONFIG_VIDEO_OUTPUT_CONTROL is not set</div><div class='add'>+CONFIG_FB=y</div><div class='add'>+# CONFIG_FIRMWARE_EDID is not set</div><div class='add'>+# CONFIG_FB_DDC is not set</div><div class='add'>+CONFIG_FB_CFB_FILLRECT=y</div><div class='add'>+CONFIG_FB_CFB_COPYAREA=y</div><div class='add'>+CONFIG_FB_CFB_IMAGEBLIT=y</div><div class='add'>+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set</div><div class='add'>+# CONFIG_FB_SYS_FILLRECT is not set</div><div class='add'>+# CONFIG_FB_SYS_COPYAREA is not set</div><div class='add'>+# CONFIG_FB_SYS_IMAGEBLIT is not set</div><div class='add'>+# CONFIG_FB_FOREIGN_ENDIAN is not set</div><div class='add'>+# CONFIG_FB_SYS_FOPS is not set</div><div class='add'>+# CONFIG_FB_SVGALIB is not set</div><div class='add'>+# CONFIG_FB_MACMODES is not set</div><div class='add'>+# CONFIG_FB_BACKLIGHT is not set</div><div class='add'>+# CONFIG_FB_MODE_HELPERS is not set</div><div class='add'>+# CONFIG_FB_TILEBLITTING is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Frame buffer hardware drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_FB_S1D13XXX is not set</div><div class='add'>+CONFIG_FB_PXA=y</div><div class='add'>+# CONFIG_FB_PXA_SMARTPANEL is not set</div><div class='add'>+# CONFIG_FB_PXA_PARAMETERS is not set</div><div class='add'>+# CONFIG_FB_MBX is not set</div><div class='add'>+# CONFIG_FB_W100 is not set</div><div class='add'>+# CONFIG_FB_AM200EPD is not set</div><div class='add'>+# CONFIG_FB_VIRTUAL is not set</div><div class='add'>+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Display device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DISPLAY_SUPPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Console display driver support</div><div class='add'>+#</div><div class='add'>+# CONFIG_VGA_CONSOLE is not set</div><div class='add'>+CONFIG_DUMMY_CONSOLE=y</div><div class='add'>+CONFIG_FRAMEBUFFER_CONSOLE=y</div><div class='add'>+CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y</div><div class='add'>+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set</div><div class='add'>+CONFIG_FONTS=y</div><div class='add'>+# CONFIG_FONT_8x8 is not set</div><div class='add'>+# CONFIG_FONT_8x16 is not set</div><div class='add'>+CONFIG_FONT_6x11=y</div><div class='add'>+# CONFIG_FONT_7x14 is not set</div><div class='add'>+# CONFIG_FONT_PEARL_8x8 is not set</div><div class='add'>+# CONFIG_FONT_ACORN_8x8 is not set</div><div class='add'>+# CONFIG_FONT_MINI_4x6 is not set</div><div class='add'>+# CONFIG_FONT_SUN8x16 is not set</div><div class='add'>+# CONFIG_FONT_SUN12x22 is not set</div><div class='add'>+# CONFIG_FONT_10x18 is not set</div><div class='add'>+CONFIG_LOGO=y</div><div class='add'>+CONFIG_LOGO_LINUX_MONO=y</div><div class='add'>+CONFIG_LOGO_LINUX_VGA16=y</div><div class='add'>+CONFIG_LOGO_LINUX_CLUT224=y</div><div class='add'>+CONFIG_SOUND=m</div><div class='add'>+CONFIG_SND=m</div><div class='add'>+CONFIG_SND_TIMER=m</div><div class='add'>+CONFIG_SND_PCM=m</div><div class='add'>+# CONFIG_SND_SEQUENCER is not set</div><div class='add'>+# CONFIG_SND_MIXER_OSS is not set</div><div class='add'>+# CONFIG_SND_PCM_OSS is not set</div><div class='add'>+# CONFIG_SND_DYNAMIC_MINORS is not set</div><div class='add'>+CONFIG_SND_SUPPORT_OLD_API=y</div><div class='add'>+CONFIG_SND_VERBOSE_PROCFS=y</div><div class='add'>+# CONFIG_SND_VERBOSE_PRINTK is not set</div><div class='add'>+# CONFIG_SND_DEBUG is not set</div><div class='add'>+CONFIG_SND_DRIVERS=y</div><div class='add'>+# CONFIG_SND_DUMMY is not set</div><div class='add'>+# CONFIG_SND_MTPAV is not set</div><div class='add'>+# CONFIG_SND_SERIAL_U16550 is not set</div><div class='add'>+# CONFIG_SND_MPU401 is not set</div><div class='add'>+CONFIG_SND_ARM=y</div><div class='add'>+# CONFIG_SND_PXA2XX_AC97 is not set</div><div class='add'>+CONFIG_SND_USB=y</div><div class='add'>+# CONFIG_SND_USB_AUDIO is not set</div><div class='add'>+# CONFIG_SND_USB_CAIAQ is not set</div><div class='add'>+CONFIG_SND_SOC=m</div><div class='add'>+CONFIG_SND_PXA2XX_SOC=m</div><div class='add'>+# CONFIG_SOUND_PRIME is not set</div><div class='add'>+CONFIG_HID_SUPPORT=y</div><div class='add'>+CONFIG_HID=y</div><div class='add'>+CONFIG_HID_DEBUG=y</div><div class='add'>+# CONFIG_HIDRAW is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Input Devices</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_HID=y</div><div class='add'>+# CONFIG_USB_HIDINPUT_POWERBOOK is not set</div><div class='add'>+# CONFIG_HID_FF is not set</div><div class='add'>+# CONFIG_USB_HIDDEV is not set</div><div class='add'>+CONFIG_USB_SUPPORT=y</div><div class='add'>+CONFIG_USB_ARCH_HAS_HCD=y</div><div class='add'>+CONFIG_USB_ARCH_HAS_OHCI=y</div><div class='add'>+# CONFIG_USB_ARCH_HAS_EHCI is not set</div><div class='add'>+CONFIG_USB=y</div><div class='add'>+# CONFIG_USB_DEBUG is not set</div><div class='add'>+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous USB options</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_DEVICEFS=y</div><div class='add'>+# CONFIG_USB_DEVICE_CLASS is not set</div><div class='add'>+# CONFIG_USB_DYNAMIC_MINORS is not set</div><div class='add'>+# CONFIG_USB_SUSPEND is not set</div><div class='add'>+# CONFIG_USB_OTG is not set</div><div class='add'>+CONFIG_USB_MON=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Host Controller Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_C67X00_HCD is not set</div><div class='add'>+# CONFIG_USB_ISP116X_HCD is not set</div><div class='add'>+# CONFIG_USB_ISP1760_HCD is not set</div><div class='add'>+CONFIG_USB_OHCI_HCD=y</div><div class='add'>+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set</div><div class='add'>+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set</div><div class='add'>+CONFIG_USB_OHCI_LITTLE_ENDIAN=y</div><div class='add'>+# CONFIG_USB_SL811_HCD is not set</div><div class='add'>+# CONFIG_USB_R8A66597_HCD is not set</div><div class='add'>+# CONFIG_USB_MUSB_HDRC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Device Class drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_ACM is not set</div><div class='add'>+# CONFIG_USB_PRINTER is not set</div><div class='add'>+# CONFIG_USB_WDM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# may also be needed; see USB_STORAGE Help for more information</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_STORAGE=y</div><div class='add'>+# CONFIG_USB_STORAGE_DEBUG is not set</div><div class='add'>+# CONFIG_USB_STORAGE_DATAFAB is not set</div><div class='add'>+# CONFIG_USB_STORAGE_FREECOM is not set</div><div class='add'>+# CONFIG_USB_STORAGE_ISD200 is not set</div><div class='add'>+# CONFIG_USB_STORAGE_DPCM is not set</div><div class='add'>+# CONFIG_USB_STORAGE_USBAT is not set</div><div class='add'>+# CONFIG_USB_STORAGE_SDDR09 is not set</div><div class='add'>+# CONFIG_USB_STORAGE_SDDR55 is not set</div><div class='add'>+# CONFIG_USB_STORAGE_JUMPSHOT is not set</div><div class='add'>+# CONFIG_USB_STORAGE_ALAUDA is not set</div><div class='add'>+# CONFIG_USB_STORAGE_ONETOUCH is not set</div><div class='add'>+# CONFIG_USB_STORAGE_KARMA is not set</div><div class='add'>+# CONFIG_USB_STORAGE_SIERRA is not set</div><div class='add'>+# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set</div><div class='add'>+# CONFIG_USB_LIBUSUAL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Imaging devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_MDC800 is not set</div><div class='add'>+# CONFIG_USB_MICROTEK is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB port drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_SERIAL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Miscellaneous drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_EMI62 is not set</div><div class='add'>+# CONFIG_USB_EMI26 is not set</div><div class='add'>+# CONFIG_USB_ADUTUX is not set</div><div class='add'>+# CONFIG_USB_RIO500 is not set</div><div class='add'>+# CONFIG_USB_LEGOTOWER is not set</div><div class='add'>+# CONFIG_USB_LCD is not set</div><div class='add'>+# CONFIG_USB_BERRY_CHARGE is not set</div><div class='add'>+# CONFIG_USB_LED is not set</div><div class='add'>+# CONFIG_USB_CYPRESS_CY7C63 is not set</div><div class='add'>+# CONFIG_USB_CYTHERM is not set</div><div class='add'>+# CONFIG_USB_PHIDGET is not set</div><div class='add'>+# CONFIG_USB_IDMOUSE is not set</div><div class='add'>+# CONFIG_USB_FTDI_ELAN is not set</div><div class='add'>+# CONFIG_USB_APPLEDISPLAY is not set</div><div class='add'>+# CONFIG_USB_LD is not set</div><div class='add'>+# CONFIG_USB_TRANCEVIBRATOR is not set</div><div class='add'>+# CONFIG_USB_IOWARRIOR is not set</div><div class='add'>+# CONFIG_USB_TEST is not set</div><div class='add'>+# CONFIG_USB_ISIGHTFW is not set</div><div class='add'>+# CONFIG_USB_GADGET is not set</div><div class='add'>+CONFIG_MMC=m</div><div class='add'>+# CONFIG_MMC_DEBUG is not set</div><div class='add'>+# CONFIG_MMC_UNSAFE_RESUME is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MMC/SD Card Drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_MMC_BLOCK=m</div><div class='add'>+CONFIG_MMC_BLOCK_BOUNCE=y</div><div class='add'>+# CONFIG_SDIO_UART is not set</div><div class='add'>+# CONFIG_MMC_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MMC/SD Host Controller Drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_MMC_PXA=m</div><div class='add'>+# CONFIG_MMC_SDHCI is not set</div><div class='add'>+CONFIG_NEW_LEDS=y</div><div class='add'>+CONFIG_LEDS_CLASS=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# LED drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_LEDS_PCA9532 is not set</div><div class='add'>+CONFIG_LEDS_GPIO=y</div><div class='add'>+# CONFIG_LEDS_PCA955X is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# LED Triggers</div><div class='add'>+#</div><div class='add'>+CONFIG_LEDS_TRIGGERS=y</div><div class='add'>+# CONFIG_LEDS_TRIGGER_TIMER is not set</div><div class='add'>+CONFIG_LEDS_TRIGGER_HEARTBEAT=y</div><div class='add'>+# CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set</div><div class='add'>+CONFIG_RTC_LIB=y</div><div class='add'>+CONFIG_RTC_CLASS=y</div><div class='add'>+CONFIG_RTC_HCTOSYS=y</div><div class='add'>+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"</div><div class='add'>+# CONFIG_RTC_DEBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# RTC interfaces</div><div class='add'>+#</div><div class='add'>+CONFIG_RTC_INTF_SYSFS=y</div><div class='add'>+CONFIG_RTC_INTF_PROC=y</div><div class='add'>+CONFIG_RTC_INTF_DEV=y</div><div class='add'>+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set</div><div class='add'>+# CONFIG_RTC_DRV_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C RTC drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_RTC_DRV_DS1307 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1374 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1672 is not set</div><div class='add'>+# CONFIG_RTC_DRV_MAX6900 is not set</div><div class='add'>+# CONFIG_RTC_DRV_RS5C372 is not set</div><div class='add'>+# CONFIG_RTC_DRV_ISL1208 is not set</div><div class='add'>+# CONFIG_RTC_DRV_X1205 is not set</div><div class='add'>+# CONFIG_RTC_DRV_PCF8563 is not set</div><div class='add'>+# CONFIG_RTC_DRV_PCF8583 is not set</div><div class='add'>+# CONFIG_RTC_DRV_M41T80 is not set</div><div class='add'>+# CONFIG_RTC_DRV_S35390A is not set</div><div class='add'>+# CONFIG_RTC_DRV_FM3130 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI RTC drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Platform RTC drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_RTC_DRV_CMOS is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1511 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1553 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1742 is not set</div><div class='add'>+# CONFIG_RTC_DRV_STK17TA8 is not set</div><div class='add'>+# CONFIG_RTC_DRV_M48T86 is not set</div><div class='add'>+# CONFIG_RTC_DRV_M48T59 is not set</div><div class='add'>+# CONFIG_RTC_DRV_V3020 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# on-CPU RTC drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_RTC_DRV_SA1100=y</div><div class='add'>+# CONFIG_DMADEVICES is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Voltage and Current regulators</div><div class='add'>+#</div><div class='add'>+# CONFIG_REGULATOR is not set</div><div class='add'>+# CONFIG_REGULATOR_FIXED_VOLTAGE is not set</div><div class='add'>+# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set</div><div class='add'>+# CONFIG_REGULATOR_BQ24022 is not set</div><div class='add'>+# CONFIG_UIO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# File systems</div><div class='add'>+#</div><div class='add'>+CONFIG_EXT2_FS=y</div><div class='add'>+# CONFIG_EXT2_FS_XATTR is not set</div><div class='add'>+# CONFIG_EXT2_FS_XIP is not set</div><div class='add'>+CONFIG_EXT3_FS=y</div><div class='add'>+# CONFIG_EXT3_FS_XATTR is not set</div><div class='add'>+# CONFIG_EXT4DEV_FS is not set</div><div class='add'>+CONFIG_JBD=y</div><div class='add'>+# CONFIG_JBD_DEBUG is not set</div><div class='add'>+# CONFIG_REISERFS_FS is not set</div><div class='add'>+# CONFIG_JFS_FS is not set</div><div class='add'>+CONFIG_FS_POSIX_ACL=y</div><div class='add'>+# CONFIG_XFS_FS is not set</div><div class='add'>+# CONFIG_OCFS2_FS is not set</div><div class='add'>+CONFIG_DNOTIFY=y</div><div class='add'>+CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='add'>+# CONFIG_QUOTA is not set</div><div class='add'>+# CONFIG_AUTOFS_FS is not set</div><div class='add'>+# CONFIG_AUTOFS4_FS is not set</div><div class='add'>+# CONFIG_FUSE_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CD-ROM/DVD Filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ISO9660_FS is not set</div><div class='add'>+# CONFIG_UDF_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DOS/FAT/NT Filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_FAT_FS=m</div><div class='add'>+CONFIG_MSDOS_FS=m</div><div class='add'>+CONFIG_VFAT_FS=m</div><div class='add'>+CONFIG_FAT_DEFAULT_CODEPAGE=437</div><div class='add'>+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"</div><div class='add'>+# CONFIG_NTFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Pseudo filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_PROC_FS=y</div><div class='add'>+CONFIG_PROC_SYSCTL=y</div><div class='add'>+CONFIG_SYSFS=y</div><div class='add'>+CONFIG_TMPFS=y</div><div class='add'>+# CONFIG_TMPFS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_HUGETLB_PAGE is not set</div><div class='add'>+# CONFIG_CONFIGFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ADFS_FS is not set</div><div class='add'>+# CONFIG_AFFS_FS is not set</div><div class='add'>+# CONFIG_HFS_FS is not set</div><div class='add'>+# CONFIG_HFSPLUS_FS is not set</div><div class='add'>+# CONFIG_BEFS_FS is not set</div><div class='add'>+# CONFIG_BFS_FS is not set</div><div class='add'>+# CONFIG_EFS_FS is not set</div><div class='add'>+CONFIG_JFFS2_FS=y</div><div class='add'>+CONFIG_JFFS2_FS_DEBUG=0</div><div class='add'>+CONFIG_JFFS2_FS_WRITEBUFFER=y</div><div class='add'>+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set</div><div class='add'>+CONFIG_JFFS2_SUMMARY=y</div><div class='add'>+# CONFIG_JFFS2_FS_XATTR is not set</div><div class='add'>+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set</div><div class='add'>+CONFIG_JFFS2_ZLIB=y</div><div class='add'>+# CONFIG_JFFS2_LZO is not set</div><div class='add'>+CONFIG_JFFS2_RTIME=y</div><div class='add'>+# CONFIG_JFFS2_RUBIN is not set</div><div class='add'>+# CONFIG_CRAMFS is not set</div><div class='add'>+# CONFIG_VXFS_FS is not set</div><div class='add'>+# CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='add'>+# CONFIG_HPFS_FS is not set</div><div class='add'>+# CONFIG_QNX4FS_FS is not set</div><div class='add'>+# CONFIG_ROMFS_FS is not set</div><div class='add'>+# CONFIG_SYSV_FS is not set</div><div class='add'>+# CONFIG_UFS_FS is not set</div><div class='add'>+CONFIG_NETWORK_FILESYSTEMS=y</div><div class='add'>+CONFIG_NFS_FS=y</div><div class='add'>+CONFIG_NFS_V3=y</div><div class='add'>+CONFIG_NFS_V3_ACL=y</div><div class='add'>+CONFIG_NFS_V4=y</div><div class='add'>+CONFIG_ROOT_NFS=y</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='add'>+CONFIG_LOCKD=y</div><div class='add'>+CONFIG_LOCKD_V4=y</div><div class='add'>+CONFIG_NFS_ACL_SUPPORT=y</div><div class='add'>+CONFIG_NFS_COMMON=y</div><div class='add'>+CONFIG_SUNRPC=y</div><div class='add'>+CONFIG_SUNRPC_GSS=y</div><div class='add'>+CONFIG_RPCSEC_GSS_KRB5=y</div><div class='add'>+# CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='add'>+CONFIG_SMB_FS=m</div><div class='add'>+# CONFIG_SMB_NLS_DEFAULT is not set</div><div class='add'>+CONFIG_CIFS=m</div><div class='add'>+# CONFIG_CIFS_STATS is not set</div><div class='add'>+CONFIG_CIFS_WEAK_PW_HASH=y</div><div class='add'>+# CONFIG_CIFS_XATTR is not set</div><div class='add'>+# CONFIG_CIFS_DEBUG2 is not set</div><div class='add'>+# CONFIG_CIFS_EXPERIMENTAL is not set</div><div class='add'>+# CONFIG_NCP_FS is not set</div><div class='add'>+# CONFIG_CODA_FS is not set</div><div class='add'>+# CONFIG_AFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Partition Types</div><div class='add'>+#</div><div class='add'>+CONFIG_PARTITION_ADVANCED=y</div><div class='add'>+# CONFIG_ACORN_PARTITION is not set</div><div class='add'>+# CONFIG_OSF_PARTITION is not set</div><div class='add'>+# CONFIG_AMIGA_PARTITION is not set</div><div class='add'>+# CONFIG_ATARI_PARTITION is not set</div><div class='add'>+# CONFIG_MAC_PARTITION is not set</div><div class='add'>+CONFIG_MSDOS_PARTITION=y</div><div class='add'>+# CONFIG_BSD_DISKLABEL is not set</div><div class='add'>+# CONFIG_MINIX_SUBPARTITION is not set</div><div class='add'>+# CONFIG_SOLARIS_X86_PARTITION is not set</div><div class='add'>+# CONFIG_UNIXWARE_DISKLABEL is not set</div><div class='add'>+# CONFIG_LDM_PARTITION is not set</div><div class='add'>+# CONFIG_SGI_PARTITION is not set</div><div class='add'>+# CONFIG_ULTRIX_PARTITION is not set</div><div class='add'>+# CONFIG_SUN_PARTITION is not set</div><div class='add'>+# CONFIG_KARMA_PARTITION is not set</div><div class='add'>+# CONFIG_EFI_PARTITION is not set</div><div class='add'>+# CONFIG_SYSV68_PARTITION is not set</div><div class='add'>+CONFIG_NLS=m</div><div class='add'>+CONFIG_NLS_DEFAULT="iso8859-1"</div><div class='add'>+CONFIG_NLS_CODEPAGE_437=m</div><div class='add'>+# CONFIG_NLS_CODEPAGE_737 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_775 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_850 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_852 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_855 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_857 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_860 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_861 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_862 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_863 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_864 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_865 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_866 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_869 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_936 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_950 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_932 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_949 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_874 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_8 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_1250 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_1251 is not set</div><div class='add'>+# CONFIG_NLS_ASCII is not set</div><div class='add'>+CONFIG_NLS_ISO8859_1=m</div><div class='add'>+# CONFIG_NLS_ISO8859_2 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_3 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_4 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_5 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_6 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_7 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_9 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_13 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_14 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_15 is not set</div><div class='add'>+# CONFIG_NLS_KOI8_R is not set</div><div class='add'>+# CONFIG_NLS_KOI8_U is not set</div><div class='add'>+# CONFIG_NLS_UTF8 is not set</div><div class='add'>+# CONFIG_DLM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel hacking</div><div class='add'>+#</div><div class='add'>+# CONFIG_PRINTK_TIME is not set</div><div class='add'>+CONFIG_ENABLE_WARN_DEPRECATED=y</div><div class='add'>+CONFIG_ENABLE_MUST_CHECK=y</div><div class='add'>+CONFIG_FRAME_WARN=1024</div><div class='add'>+# CONFIG_MAGIC_SYSRQ is not set</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='add'>+CONFIG_DEBUG_FS=y</div><div class='add'>+# CONFIG_HEADERS_CHECK is not set</div><div class='add'>+CONFIG_DEBUG_KERNEL=y</div><div class='add'>+# CONFIG_DEBUG_SHIRQ is not set</div><div class='add'>+# CONFIG_DETECT_SOFTLOCKUP is not set</div><div class='add'>+# CONFIG_SCHED_DEBUG is not set</div><div class='add'>+# CONFIG_SCHEDSTATS is not set</div><div class='add'>+# CONFIG_TIMER_STATS is not set</div><div class='add'>+# CONFIG_DEBUG_OBJECTS is not set</div><div class='add'>+# CONFIG_SLUB_DEBUG_ON is not set</div><div class='add'>+# CONFIG_SLUB_STATS is not set</div><div class='add'>+# CONFIG_DEBUG_RT_MUTEXES is not set</div><div class='add'>+# CONFIG_RT_MUTEX_TESTER is not set</div><div class='add'>+# CONFIG_DEBUG_SPINLOCK is not set</div><div class='add'>+# CONFIG_DEBUG_MUTEXES is not set</div><div class='add'>+# CONFIG_DEBUG_LOCK_ALLOC is not set</div><div class='add'>+# CONFIG_PROVE_LOCKING is not set</div><div class='add'>+# CONFIG_LOCK_STAT is not set</div><div class='add'>+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set</div><div class='add'>+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set</div><div class='add'>+# CONFIG_DEBUG_KOBJECT is not set</div><div class='add'>+CONFIG_DEBUG_BUGVERBOSE=y</div><div class='add'>+# CONFIG_DEBUG_INFO is not set</div><div class='add'>+# CONFIG_DEBUG_VM is not set</div><div class='add'>+# CONFIG_DEBUG_WRITECOUNT is not set</div><div class='add'>+CONFIG_DEBUG_MEMORY_INIT=y</div><div class='add'>+# CONFIG_DEBUG_LIST is not set</div><div class='add'>+# CONFIG_DEBUG_SG is not set</div><div class='add'>+CONFIG_FRAME_POINTER=y</div><div class='add'>+# CONFIG_BOOT_PRINTK_DELAY is not set</div><div class='add'>+# CONFIG_RCU_TORTURE_TEST is not set</div><div class='add'>+# CONFIG_BACKTRACE_SELF_TEST is not set</div><div class='add'>+# CONFIG_FAULT_INJECTION is not set</div><div class='add'>+# CONFIG_LATENCYTOP is not set</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_IRQSOFF_TRACER is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='add'>+# CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='add'>+# CONFIG_KGDB is not set</div><div class='add'>+CONFIG_DEBUG_USER=y</div><div class='add'>+# CONFIG_DEBUG_ERRORS is not set</div><div class='add'>+# CONFIG_DEBUG_STACK_USAGE is not set</div><div class='add'>+CONFIG_DEBUG_LL=y</div><div class='add'>+# CONFIG_DEBUG_ICEDCC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Security options</div><div class='add'>+#</div><div class='add'>+# CONFIG_KEYS is not set</div><div class='add'>+# CONFIG_SECURITY is not set</div><div class='add'>+# CONFIG_SECURITY_FILE_CAPABILITIES is not set</div><div class='add'>+CONFIG_CRYPTO=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Crypto core or helper</div><div class='add'>+#</div><div class='add'>+CONFIG_CRYPTO_ALGAPI=y</div><div class='add'>+CONFIG_CRYPTO_BLKCIPHER=y</div><div class='add'>+CONFIG_CRYPTO_MANAGER=y</div><div class='add'>+# CONFIG_CRYPTO_GF128MUL is not set</div><div class='add'>+# CONFIG_CRYPTO_NULL is not set</div><div class='add'>+# CONFIG_CRYPTO_CRYPTD is not set</div><div class='add'>+# CONFIG_CRYPTO_AUTHENC is not set</div><div class='add'>+# CONFIG_CRYPTO_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Authenticated Encryption with Associated Data</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CCM is not set</div><div class='add'>+# CONFIG_CRYPTO_GCM is not set</div><div class='add'>+# CONFIG_CRYPTO_SEQIV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block modes</div><div class='add'>+#</div><div class='add'>+CONFIG_CRYPTO_CBC=y</div><div class='add'>+# CONFIG_CRYPTO_CTR is not set</div><div class='add'>+# CONFIG_CRYPTO_CTS is not set</div><div class='add'>+CONFIG_CRYPTO_ECB=m</div><div class='add'>+# CONFIG_CRYPTO_LRW is not set</div><div class='add'>+# CONFIG_CRYPTO_PCBC is not set</div><div class='add'>+# CONFIG_CRYPTO_XTS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hash modes</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_HMAC is not set</div><div class='add'>+# CONFIG_CRYPTO_XCBC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Digest</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CRC32C is not set</div><div class='add'>+# CONFIG_CRYPTO_MD4 is not set</div><div class='add'>+CONFIG_CRYPTO_MD5=y</div><div class='add'>+CONFIG_CRYPTO_MICHAEL_MIC=m</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='add'>+# CONFIG_CRYPTO_SHA1 is not set</div><div class='add'>+# CONFIG_CRYPTO_SHA256 is not set</div><div class='add'>+# CONFIG_CRYPTO_SHA512 is not set</div><div class='add'>+# CONFIG_CRYPTO_TGR192 is not set</div><div class='add'>+# CONFIG_CRYPTO_WP512 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ciphers</div><div class='add'>+#</div><div class='add'>+CONFIG_CRYPTO_AES=m</div><div class='add'>+# CONFIG_CRYPTO_ANUBIS is not set</div><div class='add'>+CONFIG_CRYPTO_ARC4=m</div><div class='add'>+# CONFIG_CRYPTO_BLOWFISH is not set</div><div class='add'>+# CONFIG_CRYPTO_CAMELLIA is not set</div><div class='add'>+# CONFIG_CRYPTO_CAST5 is not set</div><div class='add'>+# CONFIG_CRYPTO_CAST6 is not set</div><div class='add'>+CONFIG_CRYPTO_DES=y</div><div class='add'>+# CONFIG_CRYPTO_FCRYPT is not set</div><div class='add'>+# CONFIG_CRYPTO_KHAZAD is not set</div><div class='add'>+# CONFIG_CRYPTO_SALSA20 is not set</div><div class='add'>+# CONFIG_CRYPTO_SEED is not set</div><div class='add'>+# CONFIG_CRYPTO_SERPENT is not set</div><div class='add'>+# CONFIG_CRYPTO_TEA is not set</div><div class='add'>+# CONFIG_CRYPTO_TWOFISH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Compression</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_DEFLATE is not set</div><div class='add'>+# CONFIG_CRYPTO_LZO is not set</div><div class='add'>+# CONFIG_CRYPTO_HW is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Library routines</div><div class='add'>+#</div><div class='add'>+CONFIG_BITREVERSE=y</div><div class='add'>+# CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='add'>+# CONFIG_GENERIC_FIND_NEXT_BIT is not set</div><div class='add'>+# CONFIG_CRC_CCITT is not set</div><div class='add'>+# CONFIG_CRC16 is not set</div><div class='add'>+CONFIG_CRC_T10DIF=y</div><div class='add'>+# CONFIG_CRC_ITU_T is not set</div><div class='add'>+CONFIG_CRC32=y</div><div class='add'>+# CONFIG_CRC7 is not set</div><div class='add'>+# CONFIG_LIBCRC32C is not set</div><div class='add'>+CONFIG_ZLIB_INFLATE=y</div><div class='add'>+CONFIG_ZLIB_DEFLATE=y</div><div class='add'>+CONFIG_PLIST=y</div><div class='add'>+CONFIG_HAS_IOMEM=y</div><div class='add'>+CONFIG_HAS_IOPORT=y</div><div class='add'>+CONFIG_HAS_DMA=y</div><div class='head'>diff --git a/arch/arm/configs/jornada720_defconfig b/arch/arm/configs/jornada720_defconfig<br/>index 0c556289a3f4..81fadafae02d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/configs/jornada720_defconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/configs/jornada720_defconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/configs/jornada720_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/configs/jornada720_defconfig</a></div><div class='hunk'>@@ -1,84 +1,174 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.12-rc1-bk2</div><div class='del'>-# Sun Mar 27 23:10:35 2005</div><div class='add'>+# Linux kernel version: 2.6.27-rc6</div><div class='add'>+# Tue Sep 16 18:56:58 2008</div><div class='ctx'> #</div><div class='ctx'> CONFIG_ARM=y</div><div class='add'>+CONFIG_SYS_SUPPORTS_APM_EMULATION=y</div><div class='add'>+CONFIG_GENERIC_GPIO=y</div><div class='add'>+CONFIG_GENERIC_TIME=y</div><div class='add'>+CONFIG_GENERIC_CLOCKEVENTS=y</div><div class='ctx'> CONFIG_MMU=y</div><div class='del'>-CONFIG_UID16=y</div><div class='add'>+# CONFIG_NO_IOPORT is not set</div><div class='add'>+CONFIG_GENERIC_HARDIRQS=y</div><div class='add'>+CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='add'>+CONFIG_LOCKDEP_SUPPORT=y</div><div class='add'>+CONFIG_TRACE_IRQFLAGS_SUPPORT=y</div><div class='add'>+CONFIG_HARDIRQS_SW_RESEND=y</div><div class='add'>+CONFIG_GENERIC_IRQ_PROBE=y</div><div class='ctx'> CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='add'>+# CONFIG_ARCH_HAS_ILOG2_U32 is not set</div><div class='add'>+# CONFIG_ARCH_HAS_ILOG2_U64 is not set</div><div class='add'>+CONFIG_GENERIC_HWEIGHT=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='del'>-CONFIG_GENERIC_IOMAP=y</div><div class='add'>+CONFIG_ARCH_SUPPORTS_AOUT=y</div><div class='add'>+CONFIG_ZONE_DMA=y</div><div class='add'>+CONFIG_ARCH_MTD_XIP=y</div><div class='add'>+CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y</div><div class='add'>+CONFIG_VECTORS_BASE=0xffff0000</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Code maturity level options</div><div class='add'>+# General setup</div><div class='ctx'> #</div><div class='ctx'> CONFIG_EXPERIMENTAL=y</div><div class='del'>-CONFIG_CLEAN_COMPILE=y</div><div class='ctx'> CONFIG_BROKEN_ON_SMP=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# General setup</div><div class='del'>-#</div><div class='add'>+CONFIG_INIT_ENV_ARG_LIMIT=32</div><div class='ctx'> CONFIG_LOCALVERSION=""</div><div class='add'>+CONFIG_LOCALVERSION_AUTO=y</div><div class='ctx'> CONFIG_SWAP=y</div><div class='ctx'> CONFIG_SYSVIPC=y</div><div class='add'>+CONFIG_SYSVIPC_SYSCTL=y</div><div class='ctx'> # CONFIG_POSIX_MQUEUE is not set</div><div class='ctx'> # CONFIG_BSD_PROCESS_ACCT is not set</div><div class='del'>-CONFIG_SYSCTL=y</div><div class='add'>+# CONFIG_TASKSTATS is not set</div><div class='ctx'> # CONFIG_AUDIT is not set</div><div class='del'>-CONFIG_HOTPLUG=y</div><div class='del'>-CONFIG_KOBJECT_UEVENT=y</div><div class='ctx'> # CONFIG_IKCONFIG is not set</div><div class='add'>+CONFIG_LOG_BUF_SHIFT=14</div><div class='add'>+# CONFIG_CGROUPS is not set</div><div class='add'>+# CONFIG_GROUP_SCHED is not set</div><div class='add'>+CONFIG_SYSFS_DEPRECATED=y</div><div class='add'>+CONFIG_SYSFS_DEPRECATED_V2=y</div><div class='add'>+# CONFIG_RELAY is not set</div><div class='add'>+CONFIG_NAMESPACES=y</div><div class='add'>+# CONFIG_UTS_NS is not set</div><div class='add'>+# CONFIG_IPC_NS is not set</div><div class='add'>+# CONFIG_USER_NS is not set</div><div class='add'>+# CONFIG_PID_NS is not set</div><div class='add'>+# CONFIG_BLK_DEV_INITRD is not set</div><div class='add'>+CONFIG_CC_OPTIMIZE_FOR_SIZE=y</div><div class='add'>+CONFIG_SYSCTL=y</div><div class='ctx'> # CONFIG_EMBEDDED is not set</div><div class='add'>+CONFIG_UID16=y</div><div class='add'>+CONFIG_SYSCTL_SYSCALL=y</div><div class='ctx'> CONFIG_KALLSYMS=y</div><div class='ctx'> # CONFIG_KALLSYMS_ALL is not set</div><div class='ctx'> # CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='add'>+CONFIG_HOTPLUG=y</div><div class='add'>+CONFIG_PRINTK=y</div><div class='add'>+CONFIG_BUG=y</div><div class='add'>+CONFIG_ELF_CORE=y</div><div class='add'>+CONFIG_COMPAT_BRK=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='add'>+CONFIG_ANON_INODES=y</div><div class='ctx'> CONFIG_EPOLL=y</div><div class='del'>-CONFIG_CC_OPTIMIZE_FOR_SIZE=y</div><div class='add'>+CONFIG_SIGNALFD=y</div><div class='add'>+CONFIG_TIMERFD=y</div><div class='add'>+CONFIG_EVENTFD=y</div><div class='ctx'> CONFIG_SHMEM=y</div><div class='del'>-CONFIG_CC_ALIGN_FUNCTIONS=0</div><div class='del'>-CONFIG_CC_ALIGN_LABELS=0</div><div class='del'>-CONFIG_CC_ALIGN_LOOPS=0</div><div class='del'>-CONFIG_CC_ALIGN_JUMPS=0</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='add'>+CONFIG_SLUB_DEBUG=y</div><div class='add'>+# CONFIG_SLAB is not set</div><div class='add'>+CONFIG_SLUB=y</div><div class='add'>+# CONFIG_SLOB is not set</div><div class='add'>+# CONFIG_PROFILING is not set</div><div class='add'>+# CONFIG_MARKERS is not set</div><div class='add'>+CONFIG_HAVE_OPROFILE=y</div><div class='add'>+# CONFIG_KPROBES is not set</div><div class='add'>+# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set</div><div class='add'>+# CONFIG_HAVE_IOREMAP_PROT is not set</div><div class='add'>+CONFIG_HAVE_KPROBES=y</div><div class='add'>+CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+# CONFIG_HAVE_ARCH_TRACEHOOK is not set</div><div class='add'>+# CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+CONFIG_HAVE_CLK=y</div><div class='add'>+CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+CONFIG_HAVE_GENERIC_DMA_COHERENT=y</div><div class='add'>+CONFIG_SLABINFO=y</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Loadable module support</div><div class='del'>-#</div><div class='ctx'> CONFIG_MODULES=y</div><div class='add'>+# CONFIG_MODULE_FORCE_LOAD is not set</div><div class='ctx'> # CONFIG_MODULE_UNLOAD is not set</div><div class='del'>-CONFIG_OBSOLETE_MODPARM=y</div><div class='ctx'> # CONFIG_MODVERSIONS is not set</div><div class='ctx'> # CONFIG_MODULE_SRCVERSION_ALL is not set</div><div class='ctx'> CONFIG_KMOD=y</div><div class='add'>+CONFIG_BLOCK=y</div><div class='add'>+# CONFIG_LBD is not set</div><div class='add'>+# CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='add'>+# CONFIG_LSF is not set</div><div class='add'>+# CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IO Schedulers</div><div class='add'>+#</div><div class='add'>+CONFIG_IOSCHED_NOOP=y</div><div class='add'>+CONFIG_IOSCHED_AS=y</div><div class='add'>+CONFIG_IOSCHED_DEADLINE=y</div><div class='add'>+CONFIG_IOSCHED_CFQ=y</div><div class='add'>+# CONFIG_DEFAULT_AS is not set</div><div class='add'>+# CONFIG_DEFAULT_DEADLINE is not set</div><div class='add'>+CONFIG_DEFAULT_CFQ=y</div><div class='add'>+# CONFIG_DEFAULT_NOOP is not set</div><div class='add'>+CONFIG_DEFAULT_IOSCHED="cfq"</div><div class='add'>+CONFIG_CLASSIC_RCU=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # System Type</div><div class='ctx'> #</div><div class='add'>+# CONFIG_ARCH_AAEC2000 is not set</div><div class='add'>+# CONFIG_ARCH_INTEGRATOR is not set</div><div class='add'>+# CONFIG_ARCH_REALVIEW is not set</div><div class='add'>+# CONFIG_ARCH_VERSATILE is not set</div><div class='add'>+# CONFIG_ARCH_AT91 is not set</div><div class='ctx'> # CONFIG_ARCH_CLPS7500 is not set</div><div class='ctx'> # CONFIG_ARCH_CLPS711X is not set</div><div class='del'>-# CONFIG_ARCH_CO285 is not set</div><div class='ctx'> # CONFIG_ARCH_EBSA110 is not set</div><div class='add'>+# CONFIG_ARCH_EP93XX is not set</div><div class='ctx'> # CONFIG_ARCH_FOOTBRIDGE is not set</div><div class='del'>-# CONFIG_ARCH_INTEGRATOR is not set</div><div class='del'>-# CONFIG_ARCH_IOP3XX is not set</div><div class='del'>-# CONFIG_ARCH_IXP4XX is not set</div><div class='add'>+# CONFIG_ARCH_NETX is not set</div><div class='add'>+# CONFIG_ARCH_H720X is not set</div><div class='add'>+# CONFIG_ARCH_IMX is not set</div><div class='add'>+# CONFIG_ARCH_IOP13XX is not set</div><div class='add'>+# CONFIG_ARCH_IOP32X is not set</div><div class='add'>+# CONFIG_ARCH_IOP33X is not set</div><div class='add'>+# CONFIG_ARCH_IXP23XX is not set</div><div class='ctx'> # CONFIG_ARCH_IXP2000 is not set</div><div class='add'>+# CONFIG_ARCH_IXP4XX is not set</div><div class='ctx'> # CONFIG_ARCH_L7200 is not set</div><div class='add'>+# CONFIG_ARCH_KIRKWOOD is not set</div><div class='add'>+# CONFIG_ARCH_KS8695 is not set</div><div class='add'>+# CONFIG_ARCH_NS9XXX is not set</div><div class='add'>+# CONFIG_ARCH_LOKI is not set</div><div class='add'>+# CONFIG_ARCH_MV78XX0 is not set</div><div class='add'>+# CONFIG_ARCH_MXC is not set</div><div class='add'>+# CONFIG_ARCH_ORION5X is not set</div><div class='add'>+# CONFIG_ARCH_PNX4008 is not set</div><div class='ctx'> # CONFIG_ARCH_PXA is not set</div><div class='ctx'> # CONFIG_ARCH_RPC is not set</div><div class='ctx'> CONFIG_ARCH_SA1100=y</div><div class='ctx'> # CONFIG_ARCH_S3C2410 is not set</div><div class='ctx'> # CONFIG_ARCH_SHARK is not set</div><div class='ctx'> # CONFIG_ARCH_LH7A40X is not set</div><div class='add'>+# CONFIG_ARCH_DAVINCI is not set</div><div class='ctx'> # CONFIG_ARCH_OMAP is not set</div><div class='del'>-# CONFIG_ARCH_VERSATILE is not set</div><div class='del'>-# CONFIG_ARCH_IMX is not set</div><div class='del'>-# CONFIG_ARCH_H720X is not set</div><div class='add'>+# CONFIG_ARCH_MSM7X00A is not set</div><div class='add'>+CONFIG_DMABOUNCE=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # SA11x0 Implementations</div><div class='hunk'>@@ -91,12 +181,21 @@ CONFIG_ARCH_SA1100=y</div><div class='ctx'> # CONFIG_SA1100_H3800 is not set</div><div class='ctx'> # CONFIG_SA1100_BADGE4 is not set</div><div class='ctx'> CONFIG_SA1100_JORNADA720=y</div><div class='add'>+CONFIG_SA1100_JORNADA720_SSP=y</div><div class='ctx'> # CONFIG_SA1100_HACKKIT is not set</div><div class='ctx'> # CONFIG_SA1100_LART is not set</div><div class='ctx'> # CONFIG_SA1100_PLEB is not set</div><div class='ctx'> # CONFIG_SA1100_SHANNON is not set</div><div class='ctx'> # CONFIG_SA1100_SIMPAD is not set</div><div class='del'>-# CONFIG_SA1100_SSP is not set</div><div class='add'>+CONFIG_SA1100_SSP=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Boot options</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Power management</div><div class='add'>+#</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Processor Type</div><div class='hunk'>@@ -105,44 +204,71 @@ CONFIG_CPU_32=y</div><div class='ctx'> CONFIG_CPU_SA1100=y</div><div class='ctx'> CONFIG_CPU_32v4=y</div><div class='ctx'> CONFIG_CPU_ABRT_EV4=y</div><div class='add'>+CONFIG_CPU_PABRT_NOIFAR=y</div><div class='ctx'> CONFIG_CPU_CACHE_V4WB=y</div><div class='ctx'> CONFIG_CPU_CACHE_VIVT=y</div><div class='ctx'> CONFIG_CPU_TLB_V4WB=y</div><div class='del'>-CONFIG_CPU_MINICACHE=y</div><div class='add'>+CONFIG_CPU_CP15=y</div><div class='add'>+CONFIG_CPU_CP15_MMU=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Processor Features</div><div class='ctx'> #</div><div class='add'>+# CONFIG_CPU_ICACHE_DISABLE is not set</div><div class='add'>+# CONFIG_CPU_DCACHE_DISABLE is not set</div><div class='add'>+# CONFIG_OUTER_CACHE is not set</div><div class='ctx'> CONFIG_SA1111=y</div><div class='del'>-CONFIG_DMABOUNCE=y</div><div class='ctx'> CONFIG_FORCE_MAX_ZONEORDER=9</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Bus support</div><div class='ctx'> #</div><div class='ctx'> CONFIG_ISA=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# PCCARD (PCMCIA/CardBus) support</div><div class='del'>-#</div><div class='add'>+# CONFIG_PCI_SYSCALL is not set</div><div class='add'>+# CONFIG_ARCH_SUPPORTS_MSI is not set</div><div class='ctx'> CONFIG_PCCARD=y</div><div class='ctx'> # CONFIG_PCMCIA_DEBUG is not set</div><div class='ctx'> CONFIG_PCMCIA=y</div><div class='add'>+CONFIG_PCMCIA_LOAD_CIS=y</div><div class='add'>+CONFIG_PCMCIA_IOCTL=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # PC-card bridges</div><div class='ctx'> #</div><div class='del'>-CONFIG_I82365=y</div><div class='add'>+# CONFIG_I82365 is not set</div><div class='ctx'> # CONFIG_TCIC is not set</div><div class='ctx'> CONFIG_PCMCIA_SA1100=y</div><div class='ctx'> # CONFIG_PCMCIA_SA1111 is not set</div><div class='del'>-CONFIG_PCCARD_NONSTATIC=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Kernel Features</div><div class='ctx'> #</div><div class='add'>+CONFIG_TICK_ONESHOT=y</div><div class='add'>+# CONFIG_NO_HZ is not set</div><div class='add'>+# CONFIG_HIGH_RES_TIMERS is not set</div><div class='add'>+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='add'>+CONFIG_HZ=100</div><div class='add'>+# CONFIG_AEABI is not set</div><div class='add'>+CONFIG_ARCH_DISCONTIGMEM_ENABLE=y</div><div class='add'>+CONFIG_ARCH_SPARSEMEM_ENABLE=y</div><div class='add'>+CONFIG_ARCH_SELECT_MEMORY_MODEL=y</div><div class='add'>+CONFIG_NODES_SHIFT=2</div><div class='add'>+CONFIG_SELECT_MEMORY_MODEL=y</div><div class='add'>+# CONFIG_FLATMEM_MANUAL is not set</div><div class='add'>+CONFIG_DISCONTIGMEM_MANUAL=y</div><div class='add'>+# CONFIG_SPARSEMEM_MANUAL is not set</div><div class='ctx'> CONFIG_DISCONTIGMEM=y</div><div class='add'>+CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='add'>+CONFIG_NEED_MULTIPLE_NODES=y</div><div class='add'>+# CONFIG_SPARSEMEM_STATIC is not set</div><div class='add'>+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='add'>+CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='add'>+CONFIG_SPLIT_PTLOCK_CPUS=4096</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+CONFIG_ZONE_DMA_FLAG=1</div><div class='add'>+CONFIG_BOUNCE=y</div><div class='add'>+CONFIG_VIRT_TO_BUS=y</div><div class='ctx'> # CONFIG_LEDS is not set</div><div class='ctx'> CONFIG_ALIGNMENT_TRAP=y</div><div class='ctx'> </div><div class='hunk'>@@ -151,8 +277,9 @@ CONFIG_ALIGNMENT_TRAP=y</div><div class='ctx'> #</div><div class='ctx'> CONFIG_ZBOOT_ROM_TEXT=0x0</div><div class='ctx'> CONFIG_ZBOOT_ROM_BSS=0x0</div><div class='del'>-CONFIG_CMDLINE="keepinitrd mem=32M"</div><div class='add'>+CONFIG_CMDLINE=""</div><div class='ctx'> # CONFIG_XIP_KERNEL is not set</div><div class='add'>+# CONFIG_KEXEC is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # CPU Frequency scaling</div><div class='hunk'>@@ -174,7 +301,7 @@ CONFIG_FPE_FASTFPE=y</div><div class='ctx'> # Userspace binary formats</div><div class='ctx'> #</div><div class='ctx'> CONFIG_BINFMT_ELF=y</div><div class='del'>-CONFIG_BINFMT_AOUT=m</div><div class='add'>+CONFIG_BINFMT_AOUT=y</div><div class='ctx'> # CONFIG_BINFMT_MISC is not set</div><div class='ctx'> # CONFIG_ARTHUR is not set</div><div class='ctx'> </div><div class='hunk'>@@ -182,188 +309,12 @@ CONFIG_BINFMT_AOUT=m</div><div class='ctx'> # Power management options</div><div class='ctx'> #</div><div class='ctx'> CONFIG_PM=y</div><div class='del'>-# CONFIG_PM_LEGACY is not set</div><div class='del'>-# CONFIG_APM is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Device Drivers</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Generic Driver Options</div><div class='del'>-#</div><div class='del'>-CONFIG_STANDALONE=y</div><div class='del'>-CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='del'>-# CONFIG_FW_LOADER is not set</div><div class='del'>-# CONFIG_DEBUG_DRIVER is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Memory Technology Devices (MTD)</div><div class='del'>-#</div><div class='del'>-CONFIG_MTD=y</div><div class='del'>-CONFIG_MTD_DEBUG=y</div><div class='del'>-CONFIG_MTD_DEBUG_VERBOSE=1</div><div class='del'>-# CONFIG_MTD_CONCAT is not set</div><div class='del'>-CONFIG_MTD_PARTITIONS=y</div><div class='del'>-# CONFIG_MTD_REDBOOT_PARTS is not set</div><div class='del'>-# CONFIG_MTD_CMDLINE_PARTS is not set</div><div class='del'>-# CONFIG_MTD_AFS_PARTS is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# User Modules And Translation Layers</div><div class='del'>-#</div><div class='del'>-CONFIG_MTD_CHAR=m</div><div class='del'>-CONFIG_MTD_BLOCK=y</div><div class='del'>-# CONFIG_FTL is not set</div><div class='del'>-# CONFIG_NFTL is not set</div><div class='del'>-# CONFIG_INFTL is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# RAM/ROM/Flash chip drivers</div><div class='del'>-#</div><div class='del'>-CONFIG_MTD_CFI=y</div><div class='del'>-# CONFIG_MTD_JEDECPROBE is not set</div><div class='del'>-CONFIG_MTD_GEN_PROBE=y</div><div class='del'>-CONFIG_MTD_CFI_ADV_OPTIONS=y</div><div class='del'>-CONFIG_MTD_CFI_NOSWAP=y</div><div class='del'>-# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set</div><div class='del'>-# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set</div><div class='del'>-CONFIG_MTD_CFI_GEOMETRY=y</div><div class='del'>-CONFIG_MTD_MAP_BANK_WIDTH_1=y</div><div class='del'>-CONFIG_MTD_MAP_BANK_WIDTH_2=y</div><div class='del'>-CONFIG_MTD_MAP_BANK_WIDTH_4=y</div><div class='del'>-# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set</div><div class='del'>-# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set</div><div class='del'>-# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set</div><div class='del'>-CONFIG_MTD_CFI_I1=y</div><div class='del'>-CONFIG_MTD_CFI_I2=y</div><div class='del'>-# CONFIG_MTD_CFI_I4 is not set</div><div class='del'>-# CONFIG_MTD_CFI_I8 is not set</div><div class='del'>-CONFIG_MTD_CFI_INTELEXT=y</div><div class='del'>-# CONFIG_MTD_CFI_AMDSTD is not set</div><div class='del'>-# CONFIG_MTD_CFI_STAA is not set</div><div class='del'>-CONFIG_MTD_CFI_UTIL=y</div><div class='del'>-# CONFIG_MTD_RAM is not set</div><div class='del'>-# CONFIG_MTD_ROM is not set</div><div class='del'>-# CONFIG_MTD_ABSENT is not set</div><div class='del'>-# CONFIG_MTD_XIP is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Mapping drivers for chip access</div><div class='del'>-#</div><div class='del'>-# CONFIG_MTD_COMPLEX_MAPPINGS is not set</div><div class='del'>-# CONFIG_MTD_PHYSMAP is not set</div><div class='del'>-# CONFIG_MTD_ARM_INTEGRATOR is not set</div><div class='del'>-CONFIG_MTD_SA1100=y</div><div class='del'>-# CONFIG_MTD_EDB7312 is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Self-contained MTD device drivers</div><div class='del'>-#</div><div class='del'>-# CONFIG_MTD_SLRAM is not set</div><div class='del'>-# CONFIG_MTD_PHRAM is not set</div><div class='del'>-# CONFIG_MTD_MTDRAM is not set</div><div class='del'>-# CONFIG_MTD_BLKMTD is not set</div><div class='del'>-# CONFIG_MTD_BLOCK2MTD is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Disk-On-Chip Device Drivers</div><div class='del'>-#</div><div class='del'>-# CONFIG_MTD_DOC2000 is not set</div><div class='del'>-# CONFIG_MTD_DOC2001 is not set</div><div class='del'>-# CONFIG_MTD_DOC2001PLUS is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# NAND Flash Device Drivers</div><div class='del'>-#</div><div class='del'>-# CONFIG_MTD_NAND is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Parallel port support</div><div class='del'>-#</div><div class='del'>-# CONFIG_PARPORT is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Plug and Play support</div><div class='del'>-#</div><div class='del'>-# CONFIG_PNP is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Block devices</div><div class='del'>-#</div><div class='del'>-# CONFIG_BLK_DEV_FD is not set</div><div class='del'>-# CONFIG_BLK_DEV_XD is not set</div><div class='del'>-# CONFIG_BLK_DEV_COW_COMMON is not set</div><div class='del'>-CONFIG_BLK_DEV_LOOP=m</div><div class='del'>-# CONFIG_BLK_DEV_CRYPTOLOOP is not set</div><div class='del'>-CONFIG_BLK_DEV_NBD=m</div><div class='del'>-# CONFIG_BLK_DEV_RAM is not set</div><div class='del'>-CONFIG_BLK_DEV_RAM_COUNT=16</div><div class='del'>-CONFIG_INITRAMFS_SOURCE=""</div><div class='del'>-# CONFIG_CDROM_PKTCDVD is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# IO Schedulers</div><div class='del'>-#</div><div class='del'>-CONFIG_IOSCHED_NOOP=y</div><div class='del'>-CONFIG_IOSCHED_AS=y</div><div class='del'>-CONFIG_IOSCHED_DEADLINE=y</div><div class='del'>-CONFIG_IOSCHED_CFQ=y</div><div class='del'>-# CONFIG_ATA_OVER_ETH is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# ATA/ATAPI/MFM/RLL support</div><div class='del'>-#</div><div class='del'>-CONFIG_IDE=m</div><div class='del'>-CONFIG_BLK_DEV_IDE=m</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Please see Documentation/ide.txt for help/info on IDE drives</div><div class='del'>-#</div><div class='del'>-# CONFIG_BLK_DEV_IDE_SATA is not set</div><div class='del'>-CONFIG_BLK_DEV_IDEDISK=m</div><div class='del'>-# CONFIG_IDEDISK_MULTI_MODE is not set</div><div class='del'>-# CONFIG_BLK_DEV_IDECS is not set</div><div class='del'>-CONFIG_BLK_DEV_IDECD=m</div><div class='del'>-# CONFIG_BLK_DEV_IDETAPE is not set</div><div class='del'>-# CONFIG_BLK_DEV_IDEFLOPPY is not set</div><div class='del'>-# CONFIG_IDE_TASK_IOCTL is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# IDE chipset support/bugfixes</div><div class='del'>-#</div><div class='del'>-CONFIG_IDE_GENERIC=m</div><div class='del'>-# CONFIG_IDE_ARM is not set</div><div class='del'>-# CONFIG_IDE_CHIPSETS is not set</div><div class='del'>-# CONFIG_BLK_DEV_IDEDMA is not set</div><div class='del'>-# CONFIG_IDEDMA_AUTO is not set</div><div class='del'>-# CONFIG_BLK_DEV_HD is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SCSI device support</div><div class='del'>-#</div><div class='del'>-# CONFIG_SCSI is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Multi-device support (RAID and LVM)</div><div class='del'>-#</div><div class='del'>-# CONFIG_MD is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Fusion MPT device support</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# IEEE 1394 (FireWire) support</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# I2O device support</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking support</div><div class='del'>-#</div><div class='add'>+# CONFIG_PM_DEBUG is not set</div><div class='add'>+CONFIG_PM_SLEEP=y</div><div class='add'>+CONFIG_SUSPEND=y</div><div class='add'>+CONFIG_SUSPEND_FREEZER=y</div><div class='add'>+# CONFIG_APM_EMULATION is not set</div><div class='add'>+CONFIG_ARCH_SUSPEND_POSSIBLE=y</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -371,12 +322,17 @@ CONFIG_NET=y</div><div class='ctx'> #</div><div class='ctx'> CONFIG_PACKET=y</div><div class='ctx'> CONFIG_PACKET_MMAP=y</div><div class='del'>-# CONFIG_NETLINK_DEV is not set</div><div class='ctx'> CONFIG_UNIX=y</div><div class='add'>+CONFIG_XFRM=y</div><div class='add'>+# CONFIG_XFRM_USER is not set</div><div class='add'>+# CONFIG_XFRM_SUB_POLICY is not set</div><div class='add'>+# CONFIG_XFRM_MIGRATE is not set</div><div class='add'>+# CONFIG_XFRM_STATISTICS is not set</div><div class='ctx'> # CONFIG_NET_KEY is not set</div><div class='ctx'> CONFIG_INET=y</div><div class='ctx'> CONFIG_IP_MULTICAST=y</div><div class='ctx'> # CONFIG_IP_ADVANCED_ROUTER is not set</div><div class='add'>+CONFIG_IP_FIB_HASH=y</div><div class='ctx'> # CONFIG_IP_PNP is not set</div><div class='ctx'> # CONFIG_NET_IPIP is not set</div><div class='ctx'> # CONFIG_NET_IPGRE is not set</div><div class='hunk'>@@ -386,31 +342,42 @@ CONFIG_IP_MULTICAST=y</div><div class='ctx'> # CONFIG_INET_AH is not set</div><div class='ctx'> # CONFIG_INET_ESP is not set</div><div class='ctx'> # CONFIG_INET_IPCOMP is not set</div><div class='add'>+# CONFIG_INET_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET_TUNNEL is not set</div><div class='del'>-# CONFIG_IP_TCPDIAG is not set</div><div class='del'>-# CONFIG_IP_TCPDIAG_IPV6 is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# IP: Virtual Server Configuration</div><div class='del'>-#</div><div class='add'>+CONFIG_INET_XFRM_MODE_TRANSPORT=y</div><div class='add'>+CONFIG_INET_XFRM_MODE_TUNNEL=y</div><div class='add'>+CONFIG_INET_XFRM_MODE_BEET=y</div><div class='add'>+# CONFIG_INET_LRO is not set</div><div class='add'>+CONFIG_INET_DIAG=y</div><div class='add'>+CONFIG_INET_TCP_DIAG=y</div><div class='add'>+# CONFIG_TCP_CONG_ADVANCED is not set</div><div class='add'>+CONFIG_TCP_CONG_CUBIC=y</div><div class='add'>+CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='add'>+# CONFIG_TCP_MD5SIG is not set</div><div class='ctx'> # CONFIG_IP_VS is not set</div><div class='ctx'> # CONFIG_IPV6 is not set</div><div class='add'>+# CONFIG_NETWORK_SECMARK is not set</div><div class='ctx'> CONFIG_NETFILTER=y</div><div class='ctx'> # CONFIG_NETFILTER_DEBUG is not set</div><div class='add'>+CONFIG_NETFILTER_ADVANCED=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Core Netfilter Configuration</div><div class='add'>+#</div><div class='add'>+# CONFIG_NETFILTER_NETLINK_QUEUE is not set</div><div class='add'>+# CONFIG_NETFILTER_NETLINK_LOG is not set</div><div class='add'>+# CONFIG_NF_CONNTRACK is not set</div><div class='add'>+# CONFIG_NETFILTER_XTABLES is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IP: Netfilter Configuration</div><div class='ctx'> #</div><div class='del'>-# CONFIG_IP_NF_CONNTRACK is not set</div><div class='del'>-# CONFIG_IP_NF_CONNTRACK_MARK is not set</div><div class='ctx'> # CONFIG_IP_NF_QUEUE is not set</div><div class='ctx'> # CONFIG_IP_NF_IPTABLES is not set</div><div class='ctx'> # CONFIG_IP_NF_ARPTABLES is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SCTP Configuration (EXPERIMENTAL)</div><div class='del'>-#</div><div class='add'>+# CONFIG_IP_DCCP is not set</div><div class='ctx'> # CONFIG_IP_SCTP is not set</div><div class='add'>+# CONFIG_TIPC is not set</div><div class='ctx'> # CONFIG_ATM is not set</div><div class='ctx'> # CONFIG_BRIDGE is not set</div><div class='ctx'> # CONFIG_VLAN_8021Q is not set</div><div class='hunk'>@@ -420,30 +387,22 @@ CONFIG_NETFILTER=y</div><div class='ctx'> # CONFIG_ATALK is not set</div><div class='ctx'> # CONFIG_X25 is not set</div><div class='ctx'> # CONFIG_LAPB is not set</div><div class='del'>-# CONFIG_NET_DIVERT is not set</div><div class='ctx'> # CONFIG_ECONET is not set</div><div class='ctx'> # CONFIG_WAN_ROUTER is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# QoS and/or fair queueing</div><div class='del'>-#</div><div class='ctx'> # CONFIG_NET_SCHED is not set</div><div class='del'>-# CONFIG_NET_CLS_ROUTE is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Network testing</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_NET_PKTGEN is not set</div><div class='del'>-# CONFIG_NETPOLL is not set</div><div class='del'>-# CONFIG_NET_POLL_CONTROLLER is not set</div><div class='ctx'> # CONFIG_HAMRADIO is not set</div><div class='add'>+# CONFIG_CAN is not set</div><div class='ctx'> CONFIG_IRDA=m</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IrDA protocols</div><div class='ctx'> #</div><div class='ctx'> CONFIG_IRLAN=m</div><div class='del'>-# CONFIG_IRNET is not set</div><div class='ctx'> CONFIG_IRCOMM=m</div><div class='ctx'> # CONFIG_IRDA_ULTRA is not set</div><div class='ctx'> </div><div class='hunk'>@@ -468,89 +427,105 @@ CONFIG_IRCOMM=m</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Old SIR device drivers</div><div class='del'>-#</div><div class='del'>-# CONFIG_IRPORT_SIR is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Old Serial dongle support</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='ctx'> # FIR device drivers</div><div class='ctx'> #</div><div class='del'>-# CONFIG_NSC_FIR is not set</div><div class='del'>-# CONFIG_WINBOND_FIR is not set</div><div class='del'>-# CONFIG_SMC_IRCC_FIR is not set</div><div class='del'>-# CONFIG_ALI_FIR is not set</div><div class='ctx'> CONFIG_SA1100_FIR=m</div><div class='ctx'> # CONFIG_BT is not set</div><div class='del'>-CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_DUMMY is not set</div><div class='del'>-# CONFIG_BONDING is not set</div><div class='del'>-# CONFIG_EQUALIZER is not set</div><div class='del'>-# CONFIG_TUN is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# ARCnet devices</div><div class='del'>-#</div><div class='del'>-# CONFIG_ARCNET is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Ethernet (10 or 100Mbit)</div><div class='del'>-#</div><div class='del'>-# CONFIG_NET_ETHERNET is not set</div><div class='del'>-CONFIG_MII=m</div><div class='add'>+# CONFIG_AF_RXRPC is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Ethernet (1000 Mbit)</div><div class='add'>+# Wireless</div><div class='ctx'> #</div><div class='add'>+# CONFIG_CFG80211 is not set</div><div class='add'>+# CONFIG_WIRELESS_EXT is not set</div><div class='add'>+# CONFIG_MAC80211 is not set</div><div class='add'>+# CONFIG_IEEE80211 is not set</div><div class='add'>+# CONFIG_RFKILL is not set</div><div class='add'>+# CONFIG_NET_9P is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Ethernet (10000 Mbit)</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Token Ring devices</div><div class='del'>-#</div><div class='del'>-# CONFIG_TR is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Wireless LAN (non-hamradio)</div><div class='add'>+# Device Drivers</div><div class='ctx'> #</div><div class='del'>-CONFIG_NET_RADIO=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Obsolete Wireless cards support (pre-802.11)</div><div class='add'>+# Generic Driver Options</div><div class='ctx'> #</div><div class='del'>-# CONFIG_STRIP is not set</div><div class='del'>-CONFIG_ARLAN=m</div><div class='del'>-CONFIG_WAVELAN=m</div><div class='del'>-CONFIG_PCMCIA_WAVELAN=m</div><div class='del'>-# CONFIG_PCMCIA_NETWAVE is not set</div><div class='add'>+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='add'>+CONFIG_STANDALONE=y</div><div class='add'>+CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='add'>+CONFIG_FW_LOADER=y</div><div class='add'>+CONFIG_FIRMWARE_IN_KERNEL=y</div><div class='add'>+CONFIG_EXTRA_FIRMWARE=""</div><div class='add'>+# CONFIG_DEBUG_DRIVER is not set</div><div class='add'>+# CONFIG_DEBUG_DEVRES is not set</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='add'>+# CONFIG_CONNECTOR is not set</div><div class='add'>+# CONFIG_MTD is not set</div><div class='add'>+# CONFIG_PARPORT is not set</div><div class='add'>+# CONFIG_PNP is not set</div><div class='add'>+CONFIG_BLK_DEV=y</div><div class='add'>+# CONFIG_BLK_DEV_COW_COMMON is not set</div><div class='add'>+CONFIG_BLK_DEV_LOOP=m</div><div class='add'>+# CONFIG_BLK_DEV_CRYPTOLOOP is not set</div><div class='add'>+CONFIG_BLK_DEV_NBD=m</div><div class='add'>+# CONFIG_BLK_DEV_RAM is not set</div><div class='add'>+# CONFIG_CDROM_PKTCDVD is not set</div><div class='add'>+# CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+CONFIG_MISC_DEVICES=y</div><div class='add'>+# CONFIG_EEPROM_93CX6 is not set</div><div class='add'>+# CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+CONFIG_HAVE_IDE=y</div><div class='add'>+CONFIG_IDE=y</div><div class='add'>+CONFIG_BLK_DEV_IDE=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Wireless 802.11 Frequency Hopping cards support</div><div class='add'>+# Please see Documentation/ide/ide.txt for help/info on IDE drives</div><div class='ctx'> #</div><div class='del'>-# CONFIG_PCMCIA_RAYCS is not set</div><div class='add'>+# CONFIG_BLK_DEV_IDE_SATA is not set</div><div class='add'>+CONFIG_BLK_DEV_IDEDISK=y</div><div class='add'>+# CONFIG_IDEDISK_MULTI_MODE is not set</div><div class='add'>+CONFIG_BLK_DEV_IDECS=y</div><div class='add'>+# CONFIG_BLK_DEV_IDECD is not set</div><div class='add'>+# CONFIG_BLK_DEV_IDETAPE is not set</div><div class='add'>+# CONFIG_BLK_DEV_IDEFLOPPY is not set</div><div class='add'>+# CONFIG_IDE_TASK_IOCTL is not set</div><div class='add'>+CONFIG_IDE_PROC_FS=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Wireless 802.11b ISA/PCI cards support</div><div class='add'>+# IDE chipset support/bugfixes</div><div class='ctx'> #</div><div class='del'>-CONFIG_HERMES=m</div><div class='del'>-# CONFIG_ATMEL is not set</div><div class='add'>+# CONFIG_BLK_DEV_PLATFORM is not set</div><div class='add'>+# CONFIG_BLK_DEV_IDEDMA is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Wireless 802.11b Pcmcia/Cardbus cards support</div><div class='add'>+# SCSI device support</div><div class='ctx'> #</div><div class='del'>-CONFIG_PCMCIA_HERMES=m</div><div class='del'>-CONFIG_AIRO_CS=m</div><div class='del'>-# CONFIG_PCMCIA_WL3501 is not set</div><div class='del'>-CONFIG_NET_WIRELESS=y</div><div class='add'>+# CONFIG_RAID_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI is not set</div><div class='add'>+# CONFIG_SCSI_DMA is not set</div><div class='add'>+# CONFIG_SCSI_NETLINK is not set</div><div class='add'>+# CONFIG_ATA is not set</div><div class='add'>+# CONFIG_MD is not set</div><div class='add'>+CONFIG_NETDEVICES=y</div><div class='add'>+CONFIG_DUMMY=y</div><div class='add'>+# CONFIG_BONDING is not set</div><div class='add'>+# CONFIG_MACVLAN is not set</div><div class='add'>+# CONFIG_EQUALIZER is not set</div><div class='add'>+# CONFIG_TUN is not set</div><div class='add'>+# CONFIG_VETH is not set</div><div class='add'>+# CONFIG_ARCNET is not set</div><div class='add'>+# CONFIG_NET_ETHERNET is not set</div><div class='add'>+CONFIG_MII=m</div><div class='add'>+# CONFIG_NETDEV_1000 is not set</div><div class='add'>+# CONFIG_NETDEV_10000 is not set</div><div class='add'>+# CONFIG_TR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# PCMCIA network device support</div><div class='add'>+# Wireless LAN</div><div class='ctx'> #</div><div class='add'>+# CONFIG_WLAN_PRE80211 is not set</div><div class='add'>+# CONFIG_WLAN_80211 is not set</div><div class='add'>+# CONFIG_IWLWIFI_LEDS is not set</div><div class='ctx'> CONFIG_NET_PCMCIA=y</div><div class='ctx'> CONFIG_PCMCIA_3C589=m</div><div class='ctx'> CONFIG_PCMCIA_3C574=m</div><div class='hunk'>@@ -560,32 +535,20 @@ CONFIG_PCMCIA_NMCLAN=m</div><div class='ctx'> CONFIG_PCMCIA_SMC91C92=m</div><div class='ctx'> CONFIG_PCMCIA_XIRC2PS=m</div><div class='ctx'> CONFIG_PCMCIA_AXNET=m</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Wan interfaces</div><div class='del'>-#</div><div class='ctx'> # CONFIG_WAN is not set</div><div class='del'>-CONFIG_PPP=m</div><div class='del'>-# CONFIG_PPP_MULTILINK is not set</div><div class='del'>-# CONFIG_PPP_FILTER is not set</div><div class='del'>-CONFIG_PPP_ASYNC=m</div><div class='del'>-# CONFIG_PPP_SYNC_TTY is not set</div><div class='del'>-CONFIG_PPP_DEFLATE=m</div><div class='del'>-CONFIG_PPP_BSDCOMP=m</div><div class='del'>-# CONFIG_PPPOE is not set</div><div class='add'>+# CONFIG_PPP is not set</div><div class='ctx'> # CONFIG_SLIP is not set</div><div class='del'>-# CONFIG_SHAPER is not set</div><div class='ctx'> # CONFIG_NETCONSOLE is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# ISDN subsystem</div><div class='del'>-#</div><div class='add'>+# CONFIG_NETPOLL is not set</div><div class='add'>+# CONFIG_NET_POLL_CONTROLLER is not set</div><div class='ctx'> # CONFIG_ISDN is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Input device support</div><div class='ctx'> #</div><div class='ctx'> CONFIG_INPUT=y</div><div class='add'>+# CONFIG_INPUT_FF_MEMLESS is not set</div><div class='add'>+# CONFIG_INPUT_POLLDEV is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Userland interfaces</div><div class='hunk'>@@ -595,7 +558,6 @@ CONFIG_INPUT_MOUSEDEV_PSAUX=y</div><div class='ctx'> CONFIG_INPUT_MOUSEDEV_SCREEN_X=640</div><div class='ctx'> CONFIG_INPUT_MOUSEDEV_SCREEN_Y=240</div><div class='ctx'> # CONFIG_INPUT_JOYDEV is not set</div><div class='del'>-# CONFIG_INPUT_TSDEV is not set</div><div class='ctx'> # CONFIG_INPUT_EVDEV is not set</div><div class='ctx'> # CONFIG_INPUT_EVBUG is not set</div><div class='ctx'> </div><div class='hunk'>@@ -603,20 +565,31 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=240</div><div class='ctx'> # Input Device Drivers</div><div class='ctx'> #</div><div class='ctx'> CONFIG_INPUT_KEYBOARD=y</div><div class='del'>-CONFIG_KEYBOARD_ATKBD=y</div><div class='add'>+# CONFIG_KEYBOARD_ATKBD is not set</div><div class='ctx'> # CONFIG_KEYBOARD_SUNKBD is not set</div><div class='ctx'> # CONFIG_KEYBOARD_LKKBD is not set</div><div class='ctx'> # CONFIG_KEYBOARD_XTKBD is not set</div><div class='ctx'> # CONFIG_KEYBOARD_NEWTON is not set</div><div class='del'>-CONFIG_INPUT_MOUSE=y</div><div class='del'>-CONFIG_MOUSE_PS2=y</div><div class='del'>-# CONFIG_MOUSE_SERIAL is not set</div><div class='del'>-# CONFIG_MOUSE_INPORT is not set</div><div class='del'>-# CONFIG_MOUSE_LOGIBM is not set</div><div class='del'>-# CONFIG_MOUSE_PC110PAD is not set</div><div class='del'>-# CONFIG_MOUSE_VSXXXAA is not set</div><div class='add'>+# CONFIG_KEYBOARD_STOWAWAY is not set</div><div class='add'>+CONFIG_KEYBOARD_HP7XX=y</div><div class='add'>+# CONFIG_KEYBOARD_GPIO is not set</div><div class='add'>+# CONFIG_INPUT_MOUSE is not set</div><div class='ctx'> # CONFIG_INPUT_JOYSTICK is not set</div><div class='del'>-# CONFIG_INPUT_TOUCHSCREEN is not set</div><div class='add'>+# CONFIG_INPUT_TABLET is not set</div><div class='add'>+CONFIG_INPUT_TOUCHSCREEN=y</div><div class='add'>+# CONFIG_TOUCHSCREEN_FUJITSU is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_GUNZE is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_ELO is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_MTOUCH is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_INEXIO is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_MK712 is not set</div><div class='add'>+CONFIG_TOUCHSCREEN_HP7XX=y</div><div class='add'>+# CONFIG_TOUCHSCREEN_HTCPEN is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_PENMOUNT is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_TOUCHWIN is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_UCB1400 is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set</div><div class='ctx'> # CONFIG_INPUT_MISC is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -625,17 +598,18 @@ CONFIG_MOUSE_PS2=y</div><div class='ctx'> CONFIG_SERIO=y</div><div class='ctx'> CONFIG_SERIO_SERPORT=y</div><div class='ctx'> # CONFIG_SERIO_SA1111 is not set</div><div class='del'>-CONFIG_SERIO_LIBPS2=y</div><div class='ctx'> # CONFIG_SERIO_RAW is not set</div><div class='ctx'> # CONFIG_GAMEPORT is not set</div><div class='del'>-CONFIG_SOUND_GAMEPORT=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Character devices</div><div class='ctx'> #</div><div class='ctx'> CONFIG_VT=y</div><div class='add'>+CONFIG_CONSOLE_TRANSLATIONS=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='add'>+# CONFIG_VT_HW_CONSOLE_BINDING is not set</div><div class='add'>+CONFIG_DEVKMEM=y</div><div class='ctx'> # CONFIG_SERIAL_NONSTANDARD is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -652,69 +626,120 @@ CONFIG_SERIAL_CORE=y</div><div class='ctx'> CONFIG_SERIAL_CORE_CONSOLE=y</div><div class='ctx'> CONFIG_UNIX98_PTYS=y</div><div class='ctx'> CONFIG_LEGACY_PTYS=y</div><div class='del'>-CONFIG_LEGACY_PTY_COUNT=256</div><div class='add'>+CONFIG_LEGACY_PTY_COUNT=32</div><div class='add'>+# CONFIG_IPMI_HANDLER is not set</div><div class='add'>+CONFIG_HW_RANDOM=m</div><div class='add'>+# CONFIG_NVRAM is not set</div><div class='add'>+# CONFIG_DTLK is not set</div><div class='add'>+# CONFIG_R3964 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# IPMI</div><div class='add'>+# PCMCIA character devices</div><div class='ctx'> #</div><div class='del'>-# CONFIG_IPMI_HANDLER is not set</div><div class='add'>+# CONFIG_SYNCLINK_CS is not set</div><div class='add'>+# CONFIG_CARDMAN_4000 is not set</div><div class='add'>+# CONFIG_CARDMAN_4040 is not set</div><div class='add'>+# CONFIG_IPWIRELESS is not set</div><div class='add'>+# CONFIG_RAW_DRIVER is not set</div><div class='add'>+# CONFIG_TCG_TPM is not set</div><div class='add'>+CONFIG_DEVPORT=y</div><div class='add'>+# CONFIG_I2C is not set</div><div class='add'>+# CONFIG_SPI is not set</div><div class='add'>+CONFIG_ARCH_REQUIRE_GPIOLIB=y</div><div class='add'>+CONFIG_GPIOLIB=y</div><div class='add'>+# CONFIG_DEBUG_GPIO is not set</div><div class='add'>+# CONFIG_GPIO_SYSFS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Watchdog Cards</div><div class='add'>+# I2C GPIO expanders:</div><div class='ctx'> #</div><div class='del'>-# CONFIG_WATCHDOG is not set</div><div class='del'>-# CONFIG_NVRAM is not set</div><div class='del'>-# CONFIG_RTC is not set</div><div class='del'>-# CONFIG_DTLK is not set</div><div class='del'>-# CONFIG_R3964 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Ftape, the floppy tape device driver</div><div class='add'>+# PCI GPIO expanders:</div><div class='ctx'> #</div><div class='del'>-# CONFIG_DRM is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# PCMCIA character devices</div><div class='add'>+# SPI GPIO expanders:</div><div class='ctx'> #</div><div class='del'>-# CONFIG_SYNCLINK_CS is not set</div><div class='del'>-# CONFIG_RAW_DRIVER is not set</div><div class='add'>+# CONFIG_W1 is not set</div><div class='add'>+# CONFIG_POWER_SUPPLY is not set</div><div class='add'>+# CONFIG_HWMON is not set</div><div class='add'>+# CONFIG_WATCHDOG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# TPM devices</div><div class='add'>+# Sonics Silicon Backplane</div><div class='ctx'> #</div><div class='del'>-# CONFIG_TCG_TPM is not set</div><div class='add'>+CONFIG_SSB_POSSIBLE=y</div><div class='add'>+# CONFIG_SSB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# I2C support</div><div class='add'>+# Multifunction device drivers</div><div class='ctx'> #</div><div class='del'>-# CONFIG_I2C is not set</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='add'>+# CONFIG_MFD_SM501 is not set</div><div class='add'>+# CONFIG_HTC_EGPIO is not set</div><div class='add'>+# CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='add'>+# CONFIG_MFD_T7L66XB is not set</div><div class='add'>+# CONFIG_MFD_TC6387XB is not set</div><div class='add'>+# CONFIG_MFD_TC6393XB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Misc devices</div><div class='add'>+# Multimedia Capabilities Port drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MCP_SA11X0 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia core support</div><div class='add'>+#</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='add'>+# CONFIG_DVB_CORE is not set</div><div class='add'>+# CONFIG_VIDEO_MEDIA is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Digital Video Broadcasting Devices</div><div class='add'>+# Multimedia drivers</div><div class='ctx'> #</div><div class='del'>-# CONFIG_DVB is not set</div><div class='add'>+# CONFIG_DAB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Graphics support</div><div class='ctx'> #</div><div class='add'>+# CONFIG_VGASTATE is not set</div><div class='add'>+# CONFIG_VIDEO_OUTPUT_CONTROL is not set</div><div class='ctx'> CONFIG_FB=y</div><div class='del'>-# CONFIG_FB_CFB_FILLRECT is not set</div><div class='del'>-# CONFIG_FB_CFB_COPYAREA is not set</div><div class='del'>-# CONFIG_FB_CFB_IMAGEBLIT is not set</div><div class='del'>-# CONFIG_FB_SOFT_CURSOR is not set</div><div class='add'>+# CONFIG_FIRMWARE_EDID is not set</div><div class='add'>+# CONFIG_FB_DDC is not set</div><div class='add'>+CONFIG_FB_CFB_FILLRECT=y</div><div class='add'>+CONFIG_FB_CFB_COPYAREA=y</div><div class='add'>+CONFIG_FB_CFB_IMAGEBLIT=y</div><div class='add'>+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set</div><div class='add'>+# CONFIG_FB_SYS_FILLRECT is not set</div><div class='add'>+# CONFIG_FB_SYS_COPYAREA is not set</div><div class='add'>+# CONFIG_FB_SYS_IMAGEBLIT is not set</div><div class='add'>+# CONFIG_FB_FOREIGN_ENDIAN is not set</div><div class='add'>+# CONFIG_FB_SYS_FOPS is not set</div><div class='add'>+# CONFIG_FB_SVGALIB is not set</div><div class='add'>+# CONFIG_FB_MACMODES is not set</div><div class='add'>+# CONFIG_FB_BACKLIGHT is not set</div><div class='ctx'> # CONFIG_FB_MODE_HELPERS is not set</div><div class='ctx'> # CONFIG_FB_TILEBLITTING is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Frame buffer hardware drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_FB_SA1100 is not set</div><div class='add'>+CONFIG_FB_S1D13XXX=y</div><div class='ctx'> # CONFIG_FB_VIRTUAL is not set</div><div class='add'>+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Display device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DISPLAY_SUPPORT is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Console display driver support</div><div class='hunk'>@@ -722,94 +747,110 @@ CONFIG_FB=y</div><div class='ctx'> # CONFIG_VGA_CONSOLE is not set</div><div class='ctx'> # CONFIG_MDA_CONSOLE is not set</div><div class='ctx'> CONFIG_DUMMY_CONSOLE=y</div><div class='del'>-# CONFIG_FRAMEBUFFER_CONSOLE is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Logo configuration</div><div class='del'>-#</div><div class='add'>+CONFIG_FRAMEBUFFER_CONSOLE=y</div><div class='add'>+CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y</div><div class='add'>+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set</div><div class='add'>+# CONFIG_FONTS is not set</div><div class='add'>+CONFIG_FONT_8x8=y</div><div class='add'>+CONFIG_FONT_8x16=y</div><div class='ctx'> # CONFIG_LOGO is not set</div><div class='del'>-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='del'>-CONFIG_SOUND=m</div><div class='add'>+# CONFIG_SOUND is not set</div><div class='add'>+# CONFIG_HID_SUPPORT is not set</div><div class='add'>+# CONFIG_USB_SUPPORT is not set</div><div class='add'>+# CONFIG_MMC is not set</div><div class='add'>+# CONFIG_NEW_LEDS is not set</div><div class='add'>+CONFIG_RTC_LIB=y</div><div class='add'>+CONFIG_RTC_CLASS=y</div><div class='add'>+CONFIG_RTC_HCTOSYS=y</div><div class='add'>+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"</div><div class='add'>+# CONFIG_RTC_DEBUG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Advanced Linux Sound Architecture</div><div class='add'>+# RTC interfaces</div><div class='ctx'> #</div><div class='del'>-# CONFIG_SND is not set</div><div class='add'>+CONFIG_RTC_INTF_SYSFS=y</div><div class='add'>+CONFIG_RTC_INTF_PROC=y</div><div class='add'>+CONFIG_RTC_INTF_DEV=y</div><div class='add'>+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set</div><div class='add'>+# CONFIG_RTC_DRV_TEST is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Open Sound System</div><div class='add'>+# SPI RTC drivers</div><div class='ctx'> #</div><div class='del'>-# CONFIG_SOUND_PRIME is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# USB support</div><div class='add'>+# Platform RTC drivers</div><div class='ctx'> #</div><div class='del'>-CONFIG_USB_ARCH_HAS_HCD=y</div><div class='del'>-CONFIG_USB_ARCH_HAS_OHCI=y</div><div class='del'>-# CONFIG_USB is not set</div><div class='add'>+# CONFIG_RTC_DRV_CMOS is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1511 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1553 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1742 is not set</div><div class='add'>+# CONFIG_RTC_DRV_STK17TA8 is not set</div><div class='add'>+# CONFIG_RTC_DRV_M48T86 is not set</div><div class='add'>+# CONFIG_RTC_DRV_M48T59 is not set</div><div class='add'>+# CONFIG_RTC_DRV_V3020 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# USB Gadget Support</div><div class='add'>+# on-CPU RTC drivers</div><div class='ctx'> #</div><div class='del'>-# CONFIG_USB_GADGET is not set</div><div class='add'>+CONFIG_RTC_DRV_SA1100=y</div><div class='add'>+# CONFIG_DMADEVICES is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# MMC/SD Card support</div><div class='add'>+# Voltage and Current regulators</div><div class='ctx'> #</div><div class='del'>-# CONFIG_MMC is not set</div><div class='add'>+# CONFIG_REGULATOR is not set</div><div class='add'>+# CONFIG_REGULATOR_FIXED_VOLTAGE is not set</div><div class='add'>+# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set</div><div class='add'>+# CONFIG_REGULATOR_BQ24022 is not set</div><div class='add'>+# CONFIG_UIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # File systems</div><div class='ctx'> #</div><div class='ctx'> CONFIG_EXT2_FS=y</div><div class='ctx'> # CONFIG_EXT2_FS_XATTR is not set</div><div class='add'>+# CONFIG_EXT2_FS_XIP is not set</div><div class='ctx'> # CONFIG_EXT3_FS is not set</div><div class='del'>-# CONFIG_JBD is not set</div><div class='add'>+# CONFIG_EXT4DEV_FS is not set</div><div class='ctx'> # CONFIG_REISERFS_FS is not set</div><div class='ctx'> # CONFIG_JFS_FS is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# XFS support</div><div class='del'>-#</div><div class='add'>+# CONFIG_FS_POSIX_ACL is not set</div><div class='ctx'> # CONFIG_XFS_FS is not set</div><div class='del'>-# CONFIG_MINIX_FS is not set</div><div class='del'>-# CONFIG_ROMFS_FS is not set</div><div class='del'>-# CONFIG_QUOTA is not set</div><div class='add'>+# CONFIG_OCFS2_FS is not set</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='add'>+CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='add'>+# CONFIG_QUOTA is not set</div><div class='ctx'> # CONFIG_AUTOFS_FS is not set</div><div class='ctx'> # CONFIG_AUTOFS4_FS is not set</div><div class='add'>+# CONFIG_FUSE_FS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # CD-ROM/DVD Filesystems</div><div class='ctx'> #</div><div class='del'>-CONFIG_ISO9660_FS=m</div><div class='del'>-# CONFIG_JOLIET is not set</div><div class='del'>-# CONFIG_ZISOFS is not set</div><div class='add'>+# CONFIG_ISO9660_FS is not set</div><div class='ctx'> # CONFIG_UDF_FS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # DOS/FAT/NT Filesystems</div><div class='ctx'> #</div><div class='del'>-# CONFIG_MSDOS_FS is not set</div><div class='del'>-# CONFIG_VFAT_FS is not set</div><div class='add'>+CONFIG_FAT_FS=y</div><div class='add'>+CONFIG_MSDOS_FS=y</div><div class='add'>+CONFIG_VFAT_FS=y</div><div class='add'>+CONFIG_FAT_DEFAULT_CODEPAGE=437</div><div class='add'>+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"</div><div class='ctx'> # CONFIG_NTFS_FS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Pseudo filesystems</div><div class='ctx'> #</div><div class='ctx'> CONFIG_PROC_FS=y</div><div class='add'>+CONFIG_PROC_SYSCTL=y</div><div class='ctx'> CONFIG_SYSFS=y</div><div class='del'>-CONFIG_DEVFS_FS=y</div><div class='del'>-CONFIG_DEVFS_MOUNT=y</div><div class='del'>-CONFIG_DEVFS_DEBUG=y</div><div class='del'>-# CONFIG_DEVPTS_FS_XATTR is not set</div><div class='ctx'> # CONFIG_TMPFS is not set</div><div class='ctx'> # CONFIG_HUGETLB_PAGE is not set</div><div class='del'>-CONFIG_RAMFS=y</div><div class='add'>+# CONFIG_CONFIGFS_FS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Miscellaneous filesystems</div><div class='hunk'>@@ -821,75 +862,122 @@ CONFIG_RAMFS=y</div><div class='ctx'> # CONFIG_BEFS_FS is not set</div><div class='ctx'> # CONFIG_BFS_FS is not set</div><div class='ctx'> # CONFIG_EFS_FS is not set</div><div class='del'>-# CONFIG_JFFS_FS is not set</div><div class='del'>-CONFIG_JFFS2_FS=y</div><div class='del'>-CONFIG_JFFS2_FS_DEBUG=2</div><div class='del'>-# CONFIG_JFFS2_FS_NAND is not set</div><div class='del'>-# CONFIG_JFFS2_FS_NOR_ECC is not set</div><div class='del'>-# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set</div><div class='del'>-CONFIG_JFFS2_ZLIB=y</div><div class='del'>-CONFIG_JFFS2_RTIME=y</div><div class='del'>-# CONFIG_JFFS2_RUBIN is not set</div><div class='ctx'> # CONFIG_CRAMFS is not set</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='add'>+# CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='add'>+# CONFIG_ROMFS_FS is not set</div><div class='ctx'> # CONFIG_SYSV_FS is not set</div><div class='ctx'> # CONFIG_UFS_FS is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Network File Systems</div><div class='del'>-#</div><div class='del'>-CONFIG_NFS_FS=m</div><div class='del'>-CONFIG_NFS_V3=y</div><div class='del'>-# CONFIG_NFS_V4 is not set</div><div class='del'>-# CONFIG_NFS_DIRECTIO is not set</div><div class='del'>-# CONFIG_NFSD is not set</div><div class='del'>-CONFIG_LOCKD=m</div><div class='del'>-CONFIG_LOCKD_V4=y</div><div class='del'>-CONFIG_SUNRPC=m</div><div class='del'>-# CONFIG_RPCSEC_GSS_KRB5 is not set</div><div class='del'>-# CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='del'>-# CONFIG_SMB_FS is not set</div><div class='del'>-# CONFIG_CIFS is not set</div><div class='del'>-# CONFIG_NCP_FS is not set</div><div class='del'>-# CONFIG_CODA_FS is not set</div><div class='del'>-# CONFIG_AFS_FS is not set</div><div class='add'>+# CONFIG_NETWORK_FILESYSTEMS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Partition Types</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PARTITION_ADVANCED is not set</div><div class='ctx'> CONFIG_MSDOS_PARTITION=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Native Language Support</div><div class='del'>-#</div><div class='del'>-# CONFIG_NLS is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Profiling support</div><div class='del'>-#</div><div class='del'>-# CONFIG_PROFILING is not set</div><div class='add'>+CONFIG_NLS=y</div><div class='add'>+CONFIG_NLS_DEFAULT="iso8859-1"</div><div class='add'>+CONFIG_NLS_CODEPAGE_437=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_737=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_775=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_850=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_852=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_855=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_857=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_860=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_861=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_862=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_863=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_864=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_865=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_866=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_869=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_936=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_950=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_932=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_949=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_874=m</div><div class='add'>+CONFIG_NLS_ISO8859_8=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_1250=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_1251=m</div><div class='add'>+CONFIG_NLS_ASCII=m</div><div class='add'>+CONFIG_NLS_ISO8859_1=m</div><div class='add'>+CONFIG_NLS_ISO8859_2=m</div><div class='add'>+CONFIG_NLS_ISO8859_3=m</div><div class='add'>+CONFIG_NLS_ISO8859_4=m</div><div class='add'>+CONFIG_NLS_ISO8859_5=m</div><div class='add'>+CONFIG_NLS_ISO8859_6=m</div><div class='add'>+CONFIG_NLS_ISO8859_7=m</div><div class='add'>+CONFIG_NLS_ISO8859_9=m</div><div class='add'>+CONFIG_NLS_ISO8859_13=m</div><div class='add'>+CONFIG_NLS_ISO8859_14=m</div><div class='add'>+CONFIG_NLS_ISO8859_15=m</div><div class='add'>+CONFIG_NLS_KOI8_R=m</div><div class='add'>+CONFIG_NLS_KOI8_U=m</div><div class='add'>+CONFIG_NLS_UTF8=m</div><div class='add'>+# CONFIG_DLM is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Kernel hacking</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='del'>-CONFIG_DEBUG_KERNEL=y</div><div class='add'>+CONFIG_ENABLE_WARN_DEPRECATED=y</div><div class='add'>+CONFIG_ENABLE_MUST_CHECK=y</div><div class='add'>+CONFIG_FRAME_WARN=1024</div><div class='ctx'> # CONFIG_MAGIC_SYSRQ is not set</div><div class='del'>-CONFIG_LOG_BUF_SHIFT=14</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='add'>+# CONFIG_DEBUG_FS is not set</div><div class='add'>+# CONFIG_HEADERS_CHECK is not set</div><div class='add'>+CONFIG_DEBUG_KERNEL=y</div><div class='add'>+# CONFIG_DEBUG_SHIRQ is not set</div><div class='add'>+CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set</div><div class='add'>+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0</div><div class='add'>+CONFIG_SCHED_DEBUG=y</div><div class='ctx'> # CONFIG_SCHEDSTATS is not set</div><div class='del'>-CONFIG_DEBUG_SLAB=y</div><div class='add'>+# CONFIG_TIMER_STATS is not set</div><div class='add'>+# CONFIG_DEBUG_OBJECTS is not set</div><div class='add'>+# CONFIG_SLUB_DEBUG_ON is not set</div><div class='add'>+# CONFIG_SLUB_STATS is not set</div><div class='add'>+# CONFIG_DEBUG_RT_MUTEXES is not set</div><div class='add'>+# CONFIG_RT_MUTEX_TESTER is not set</div><div class='ctx'> # CONFIG_DEBUG_SPINLOCK is not set</div><div class='add'>+# CONFIG_DEBUG_MUTEXES is not set</div><div class='add'>+# CONFIG_DEBUG_LOCK_ALLOC is not set</div><div class='add'>+# CONFIG_PROVE_LOCKING is not set</div><div class='add'>+# CONFIG_LOCK_STAT is not set</div><div class='ctx'> # CONFIG_DEBUG_SPINLOCK_SLEEP is not set</div><div class='add'>+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set</div><div class='ctx'> # CONFIG_DEBUG_KOBJECT is not set</div><div class='ctx'> CONFIG_DEBUG_BUGVERBOSE=y</div><div class='ctx'> # CONFIG_DEBUG_INFO is not set</div><div class='del'>-# CONFIG_DEBUG_FS is not set</div><div class='add'>+# CONFIG_DEBUG_VM is not set</div><div class='add'>+# CONFIG_DEBUG_WRITECOUNT is not set</div><div class='add'>+CONFIG_DEBUG_MEMORY_INIT=y</div><div class='add'>+# CONFIG_DEBUG_LIST is not set</div><div class='add'>+# CONFIG_DEBUG_SG is not set</div><div class='ctx'> CONFIG_FRAME_POINTER=y</div><div class='add'>+# CONFIG_BOOT_PRINTK_DELAY is not set</div><div class='add'>+# CONFIG_RCU_TORTURE_TEST is not set</div><div class='add'>+# CONFIG_BACKTRACE_SELF_TEST is not set</div><div class='add'>+# CONFIG_FAULT_INJECTION is not set</div><div class='add'>+# CONFIG_LATENCYTOP is not set</div><div class='add'>+# CONFIG_SYSCTL_SYSCALL_CHECK is not set</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_IRQSOFF_TRACER is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='add'>+# CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='add'>+# CONFIG_KGDB is not set</div><div class='ctx'> # CONFIG_DEBUG_USER is not set</div><div class='ctx'> CONFIG_DEBUG_ERRORS=y</div><div class='add'>+# CONFIG_DEBUG_STACK_USAGE is not set</div><div class='ctx'> CONFIG_DEBUG_LL=y</div><div class='ctx'> # CONFIG_DEBUG_ICEDCC is not set</div><div class='ctx'> </div><div class='hunk'>@@ -898,21 +986,100 @@ CONFIG_DEBUG_LL=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_KEYS is not set</div><div class='ctx'> # CONFIG_SECURITY is not set</div><div class='add'>+# CONFIG_SECURITY_FILE_CAPABILITIES is not set</div><div class='add'>+CONFIG_CRYPTO=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Crypto core or helper</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_MANAGER is not set</div><div class='add'>+# CONFIG_CRYPTO_GF128MUL is not set</div><div class='add'>+# CONFIG_CRYPTO_NULL is not set</div><div class='add'>+# CONFIG_CRYPTO_CRYPTD is not set</div><div class='add'>+# CONFIG_CRYPTO_AUTHENC is not set</div><div class='add'>+# CONFIG_CRYPTO_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Authenticated Encryption with Associated Data</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CCM is not set</div><div class='add'>+# CONFIG_CRYPTO_GCM is not set</div><div class='add'>+# CONFIG_CRYPTO_SEQIV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block modes</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CBC is not set</div><div class='add'>+# CONFIG_CRYPTO_CTR is not set</div><div class='add'>+# CONFIG_CRYPTO_CTS is not set</div><div class='add'>+# CONFIG_CRYPTO_ECB is not set</div><div class='add'>+# CONFIG_CRYPTO_LRW is not set</div><div class='add'>+# CONFIG_CRYPTO_PCBC is not set</div><div class='add'>+# CONFIG_CRYPTO_XTS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hash modes</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_HMAC is not set</div><div class='add'>+# CONFIG_CRYPTO_XCBC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Digest</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CRC32C is not set</div><div class='add'>+# CONFIG_CRYPTO_MD4 is not set</div><div class='add'>+# CONFIG_CRYPTO_MD5 is not set</div><div class='add'>+# CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='add'>+# CONFIG_CRYPTO_SHA1 is not set</div><div class='add'>+# CONFIG_CRYPTO_SHA256 is not set</div><div class='add'>+# CONFIG_CRYPTO_SHA512 is not set</div><div class='add'>+# CONFIG_CRYPTO_TGR192 is not set</div><div class='add'>+# CONFIG_CRYPTO_WP512 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Cryptographic options</div><div class='add'>+# Ciphers</div><div class='ctx'> #</div><div class='del'>-# CONFIG_CRYPTO is not set</div><div class='add'>+# CONFIG_CRYPTO_AES is not set</div><div class='add'>+# CONFIG_CRYPTO_ANUBIS is not set</div><div class='add'>+# CONFIG_CRYPTO_ARC4 is not set</div><div class='add'>+# CONFIG_CRYPTO_BLOWFISH is not set</div><div class='add'>+# CONFIG_CRYPTO_CAMELLIA is not set</div><div class='add'>+# CONFIG_CRYPTO_CAST5 is not set</div><div class='add'>+# CONFIG_CRYPTO_CAST6 is not set</div><div class='add'>+# CONFIG_CRYPTO_DES is not set</div><div class='add'>+# CONFIG_CRYPTO_FCRYPT is not set</div><div class='add'>+# CONFIG_CRYPTO_KHAZAD is not set</div><div class='add'>+# CONFIG_CRYPTO_SALSA20 is not set</div><div class='add'>+# CONFIG_CRYPTO_SEED is not set</div><div class='add'>+# CONFIG_CRYPTO_SERPENT is not set</div><div class='add'>+# CONFIG_CRYPTO_TEA is not set</div><div class='add'>+# CONFIG_CRYPTO_TWOFISH is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Hardware crypto devices</div><div class='add'>+# Compression</div><div class='ctx'> #</div><div class='add'>+# CONFIG_CRYPTO_DEFLATE is not set</div><div class='add'>+# CONFIG_CRYPTO_LZO is not set</div><div class='add'>+CONFIG_CRYPTO_HW=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Library routines</div><div class='ctx'> #</div><div class='add'>+CONFIG_BITREVERSE=y</div><div class='add'>+# CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='add'>+# CONFIG_GENERIC_FIND_NEXT_BIT is not set</div><div class='ctx'> CONFIG_CRC_CCITT=m</div><div class='add'>+# CONFIG_CRC16 is not set</div><div class='add'>+# CONFIG_CRC_T10DIF is not set</div><div class='add'>+# CONFIG_CRC_ITU_T is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='add'>+# CONFIG_CRC7 is not set</div><div class='ctx'> # CONFIG_LIBCRC32C is not set</div><div class='del'>-CONFIG_ZLIB_INFLATE=y</div><div class='del'>-CONFIG_ZLIB_DEFLATE=y</div><div class='add'>+CONFIG_PLIST=y</div><div class='add'>+CONFIG_HAS_IOMEM=y</div><div class='add'>+CONFIG_HAS_IOPORT=y</div><div class='add'>+CONFIG_HAS_DMA=y</div><div class='head'>diff --git a/arch/arm/configs/omap3_beagle_defconfig b/arch/arm/configs/omap3_beagle_defconfig<br/>new file mode 100644<br/>index 000000000000..e042d27eae16<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/configs/omap3_beagle_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/configs/omap3_beagle_defconfig</a></div><div class='hunk'>@@ -0,0 +1,1321 @@</div><div class='add'>+#</div><div class='add'>+# Automatically generated make config: don't edit</div><div class='add'>+# Linux kernel version: 2.6.27-rc8</div><div class='add'>+# Wed Oct  1 17:14:22 2008</div><div class='add'>+#</div><div class='add'>+CONFIG_ARM=y</div><div class='add'>+CONFIG_SYS_SUPPORTS_APM_EMULATION=y</div><div class='add'>+CONFIG_GENERIC_GPIO=y</div><div class='add'>+CONFIG_GENERIC_TIME=y</div><div class='add'>+CONFIG_GENERIC_CLOCKEVENTS=y</div><div class='add'>+CONFIG_MMU=y</div><div class='add'>+# CONFIG_NO_IOPORT is not set</div><div class='add'>+CONFIG_GENERIC_HARDIRQS=y</div><div class='add'>+CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='add'>+CONFIG_LOCKDEP_SUPPORT=y</div><div class='add'>+CONFIG_TRACE_IRQFLAGS_SUPPORT=y</div><div class='add'>+CONFIG_HARDIRQS_SW_RESEND=y</div><div class='add'>+CONFIG_GENERIC_IRQ_PROBE=y</div><div class='add'>+CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='add'>+# CONFIG_ARCH_HAS_ILOG2_U32 is not set</div><div class='add'>+# CONFIG_ARCH_HAS_ILOG2_U64 is not set</div><div class='add'>+CONFIG_GENERIC_HWEIGHT=y</div><div class='add'>+CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_ARCH_SUPPORTS_AOUT=y</div><div class='add'>+CONFIG_ZONE_DMA=y</div><div class='add'>+CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y</div><div class='add'>+CONFIG_VECTORS_BASE=0xffff0000</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# General setup</div><div class='add'>+#</div><div class='add'>+CONFIG_EXPERIMENTAL=y</div><div class='add'>+CONFIG_BROKEN_ON_SMP=y</div><div class='add'>+CONFIG_INIT_ENV_ARG_LIMIT=32</div><div class='add'>+CONFIG_LOCALVERSION=""</div><div class='add'>+CONFIG_LOCALVERSION_AUTO=y</div><div class='add'>+CONFIG_SWAP=y</div><div class='add'>+CONFIG_SYSVIPC=y</div><div class='add'>+CONFIG_SYSVIPC_SYSCTL=y</div><div class='add'>+# CONFIG_POSIX_MQUEUE is not set</div><div class='add'>+CONFIG_BSD_PROCESS_ACCT=y</div><div class='add'>+# CONFIG_BSD_PROCESS_ACCT_V3 is not set</div><div class='add'>+# CONFIG_TASKSTATS is not set</div><div class='add'>+# CONFIG_AUDIT is not set</div><div class='add'>+# CONFIG_IKCONFIG is not set</div><div class='add'>+CONFIG_LOG_BUF_SHIFT=14</div><div class='add'>+# CONFIG_CGROUPS is not set</div><div class='add'>+CONFIG_GROUP_SCHED=y</div><div class='add'>+CONFIG_FAIR_GROUP_SCHED=y</div><div class='add'>+# CONFIG_RT_GROUP_SCHED is not set</div><div class='add'>+CONFIG_USER_SCHED=y</div><div class='add'>+# CONFIG_CGROUP_SCHED is not set</div><div class='add'>+CONFIG_SYSFS_DEPRECATED=y</div><div class='add'>+CONFIG_SYSFS_DEPRECATED_V2=y</div><div class='add'>+# CONFIG_RELAY is not set</div><div class='add'>+# CONFIG_NAMESPACES is not set</div><div class='add'>+CONFIG_BLK_DEV_INITRD=y</div><div class='add'>+CONFIG_INITRAMFS_SOURCE=""</div><div class='add'>+CONFIG_CC_OPTIMIZE_FOR_SIZE=y</div><div class='add'>+CONFIG_SYSCTL=y</div><div class='add'>+CONFIG_EMBEDDED=y</div><div class='add'>+CONFIG_UID16=y</div><div class='add'>+# CONFIG_SYSCTL_SYSCALL is not set</div><div class='add'>+CONFIG_KALLSYMS=y</div><div class='add'>+# CONFIG_KALLSYMS_ALL is not set</div><div class='add'>+CONFIG_KALLSYMS_EXTRA_PASS=y</div><div class='add'>+CONFIG_HOTPLUG=y</div><div class='add'>+CONFIG_PRINTK=y</div><div class='add'>+CONFIG_BUG=y</div><div class='add'>+CONFIG_ELF_CORE=y</div><div class='add'>+CONFIG_COMPAT_BRK=y</div><div class='add'>+CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_FUTEX=y</div><div class='add'>+CONFIG_ANON_INODES=y</div><div class='add'>+CONFIG_EPOLL=y</div><div class='add'>+CONFIG_SIGNALFD=y</div><div class='add'>+CONFIG_TIMERFD=y</div><div class='add'>+CONFIG_EVENTFD=y</div><div class='add'>+CONFIG_SHMEM=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='add'>+CONFIG_SLAB=y</div><div class='add'>+# CONFIG_SLUB is not set</div><div class='add'>+# CONFIG_SLOB is not set</div><div class='add'>+# CONFIG_PROFILING is not set</div><div class='add'>+# CONFIG_MARKERS is not set</div><div class='add'>+CONFIG_HAVE_OPROFILE=y</div><div class='add'>+# CONFIG_KPROBES is not set</div><div class='add'>+# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set</div><div class='add'>+# CONFIG_HAVE_IOREMAP_PROT is not set</div><div class='add'>+CONFIG_HAVE_KPROBES=y</div><div class='add'>+CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+# CONFIG_HAVE_ARCH_TRACEHOOK is not set</div><div class='add'>+# CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+CONFIG_HAVE_CLK=y</div><div class='add'>+CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+CONFIG_HAVE_GENERIC_DMA_COHERENT=y</div><div class='add'>+CONFIG_SLABINFO=y</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='add'>+# CONFIG_TINY_SHMEM is not set</div><div class='add'>+CONFIG_BASE_SMALL=0</div><div class='add'>+CONFIG_MODULES=y</div><div class='add'>+# CONFIG_MODULE_FORCE_LOAD is not set</div><div class='add'>+CONFIG_MODULE_UNLOAD=y</div><div class='add'>+# CONFIG_MODULE_FORCE_UNLOAD is not set</div><div class='add'>+CONFIG_MODVERSIONS=y</div><div class='add'>+CONFIG_MODULE_SRCVERSION_ALL=y</div><div class='add'>+CONFIG_KMOD=y</div><div class='add'>+CONFIG_BLOCK=y</div><div class='add'>+# CONFIG_LBD is not set</div><div class='add'>+# CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='add'>+# CONFIG_LSF is not set</div><div class='add'>+# CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IO Schedulers</div><div class='add'>+#</div><div class='add'>+CONFIG_IOSCHED_NOOP=y</div><div class='add'>+CONFIG_IOSCHED_AS=y</div><div class='add'>+CONFIG_IOSCHED_DEADLINE=y</div><div class='add'>+CONFIG_IOSCHED_CFQ=y</div><div class='add'>+CONFIG_DEFAULT_AS=y</div><div class='add'>+# CONFIG_DEFAULT_DEADLINE is not set</div><div class='add'>+# CONFIG_DEFAULT_CFQ is not set</div><div class='add'>+# CONFIG_DEFAULT_NOOP is not set</div><div class='add'>+CONFIG_DEFAULT_IOSCHED="anticipatory"</div><div class='add'>+CONFIG_CLASSIC_RCU=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# System Type</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARCH_AAEC2000 is not set</div><div class='add'>+# CONFIG_ARCH_INTEGRATOR is not set</div><div class='add'>+# CONFIG_ARCH_REALVIEW is not set</div><div class='add'>+# CONFIG_ARCH_VERSATILE is not set</div><div class='add'>+# CONFIG_ARCH_AT91 is not set</div><div class='add'>+# CONFIG_ARCH_CLPS7500 is not set</div><div class='add'>+# CONFIG_ARCH_CLPS711X is not set</div><div class='add'>+# CONFIG_ARCH_EBSA110 is not set</div><div class='add'>+# CONFIG_ARCH_EP93XX is not set</div><div class='add'>+# CONFIG_ARCH_FOOTBRIDGE is not set</div><div class='add'>+# CONFIG_ARCH_NETX is not set</div><div class='add'>+# CONFIG_ARCH_H720X is not set</div><div class='add'>+# CONFIG_ARCH_IMX is not set</div><div class='add'>+# CONFIG_ARCH_IOP13XX is not set</div><div class='add'>+# CONFIG_ARCH_IOP32X is not set</div><div class='add'>+# CONFIG_ARCH_IOP33X is not set</div><div class='add'>+# CONFIG_ARCH_IXP23XX is not set</div><div class='add'>+# CONFIG_ARCH_IXP2000 is not set</div><div class='add'>+# CONFIG_ARCH_IXP4XX is not set</div><div class='add'>+# CONFIG_ARCH_L7200 is not set</div><div class='add'>+# CONFIG_ARCH_KIRKWOOD is not set</div><div class='add'>+# CONFIG_ARCH_KS8695 is not set</div><div class='add'>+# CONFIG_ARCH_NS9XXX is not set</div><div class='add'>+# CONFIG_ARCH_LOKI is not set</div><div class='add'>+# CONFIG_ARCH_MV78XX0 is not set</div><div class='add'>+# CONFIG_ARCH_MXC is not set</div><div class='add'>+# CONFIG_ARCH_ORION5X is not set</div><div class='add'>+# CONFIG_ARCH_PNX4008 is not set</div><div class='add'>+# CONFIG_ARCH_PXA is not set</div><div class='add'>+# CONFIG_ARCH_RPC is not set</div><div class='add'>+# CONFIG_ARCH_SA1100 is not set</div><div class='add'>+# CONFIG_ARCH_S3C2410 is not set</div><div class='add'>+# CONFIG_ARCH_SHARK is not set</div><div class='add'>+# CONFIG_ARCH_LH7A40X is not set</div><div class='add'>+# CONFIG_ARCH_DAVINCI is not set</div><div class='add'>+CONFIG_ARCH_OMAP=y</div><div class='add'>+# CONFIG_ARCH_MSM7X00A is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# TI OMAP Implementations</div><div class='add'>+#</div><div class='add'>+CONFIG_ARCH_OMAP_OTG=y</div><div class='add'>+# CONFIG_ARCH_OMAP1 is not set</div><div class='add'>+# CONFIG_ARCH_OMAP2 is not set</div><div class='add'>+CONFIG_ARCH_OMAP3=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OMAP Feature Selections</div><div class='add'>+#</div><div class='add'>+# CONFIG_OMAP_DEBUG_POWERDOMAIN is not set</div><div class='add'>+# CONFIG_OMAP_DEBUG_CLOCKDOMAIN is not set</div><div class='add'>+# CONFIG_OMAP_RESET_CLOCKS is not set</div><div class='add'>+# CONFIG_OMAP_MUX is not set</div><div class='add'>+# CONFIG_OMAP_MCBSP is not set</div><div class='add'>+# CONFIG_OMAP_MPU_TIMER is not set</div><div class='add'>+CONFIG_OMAP_32K_TIMER=y</div><div class='add'>+CONFIG_OMAP_32K_TIMER_HZ=128</div><div class='add'>+CONFIG_OMAP_DM_TIMER=y</div><div class='add'>+# CONFIG_OMAP_LL_DEBUG_UART1 is not set</div><div class='add'>+# CONFIG_OMAP_LL_DEBUG_UART2 is not set</div><div class='add'>+CONFIG_OMAP_LL_DEBUG_UART3=y</div><div class='add'>+CONFIG_ARCH_OMAP34XX=y</div><div class='add'>+CONFIG_ARCH_OMAP3430=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OMAP Board Type</div><div class='add'>+#</div><div class='add'>+CONFIG_MACH_OMAP3_BEAGLE=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Boot options</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Power management</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Processor Type</div><div class='add'>+#</div><div class='add'>+CONFIG_CPU_32=y</div><div class='add'>+CONFIG_CPU_32v6K=y</div><div class='add'>+CONFIG_CPU_V7=y</div><div class='add'>+CONFIG_CPU_32v7=y</div><div class='add'>+CONFIG_CPU_ABRT_EV7=y</div><div class='add'>+CONFIG_CPU_PABRT_IFAR=y</div><div class='add'>+CONFIG_CPU_CACHE_V7=y</div><div class='add'>+CONFIG_CPU_CACHE_VIPT=y</div><div class='add'>+CONFIG_CPU_COPY_V6=y</div><div class='add'>+CONFIG_CPU_TLB_V7=y</div><div class='add'>+CONFIG_CPU_HAS_ASID=y</div><div class='add'>+CONFIG_CPU_CP15=y</div><div class='add'>+CONFIG_CPU_CP15_MMU=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Processor Features</div><div class='add'>+#</div><div class='add'>+CONFIG_ARM_THUMB=y</div><div class='add'>+# CONFIG_ARM_THUMBEE is not set</div><div class='add'>+# CONFIG_CPU_ICACHE_DISABLE is not set</div><div class='add'>+# CONFIG_CPU_DCACHE_DISABLE is not set</div><div class='add'>+# CONFIG_CPU_BPREDICT_DISABLE is not set</div><div class='add'>+CONFIG_HAS_TLS_REG=y</div><div class='add'>+# CONFIG_OUTER_CACHE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Bus support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PCI_SYSCALL is not set</div><div class='add'>+# CONFIG_ARCH_SUPPORTS_MSI is not set</div><div class='add'>+# CONFIG_PCCARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel Features</div><div class='add'>+#</div><div class='add'>+CONFIG_TICK_ONESHOT=y</div><div class='add'>+CONFIG_NO_HZ=y</div><div class='add'>+CONFIG_HIGH_RES_TIMERS=y</div><div class='add'>+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y</div><div class='add'>+CONFIG_VMSPLIT_3G=y</div><div class='add'>+# CONFIG_VMSPLIT_2G is not set</div><div class='add'>+# CONFIG_VMSPLIT_1G is not set</div><div class='add'>+CONFIG_PAGE_OFFSET=0xC0000000</div><div class='add'>+# CONFIG_PREEMPT is not set</div><div class='add'>+CONFIG_HZ=128</div><div class='add'>+CONFIG_AEABI=y</div><div class='add'>+CONFIG_OABI_COMPAT=y</div><div class='add'>+CONFIG_ARCH_FLATMEM_HAS_HOLES=y</div><div class='add'>+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set</div><div class='add'>+CONFIG_SELECT_MEMORY_MODEL=y</div><div class='add'>+CONFIG_FLATMEM_MANUAL=y</div><div class='add'>+# CONFIG_DISCONTIGMEM_MANUAL is not set</div><div class='add'>+# CONFIG_SPARSEMEM_MANUAL is not set</div><div class='add'>+CONFIG_FLATMEM=y</div><div class='add'>+CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='add'>+# CONFIG_SPARSEMEM_STATIC is not set</div><div class='add'>+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='add'>+CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='add'>+CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+CONFIG_ZONE_DMA_FLAG=1</div><div class='add'>+CONFIG_BOUNCE=y</div><div class='add'>+CONFIG_VIRT_TO_BUS=y</div><div class='add'>+# CONFIG_LEDS is not set</div><div class='add'>+CONFIG_ALIGNMENT_TRAP=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Boot options</div><div class='add'>+#</div><div class='add'>+CONFIG_ZBOOT_ROM_TEXT=0x0</div><div class='add'>+CONFIG_ZBOOT_ROM_BSS=0x0</div><div class='add'>+CONFIG_CMDLINE="root=/dev/nfs nfsroot=192.168.0.1:/home/user/buildroot ip=192.168.0.2:192.168.0.1:192.168.0.1:255.255.255.0:tgt:eth0:off rw console=ttyS2,115200n8"</div><div class='add'>+# CONFIG_XIP_KERNEL is not set</div><div class='add'>+# CONFIG_KEXEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CPU Power Management</div><div class='add'>+#</div><div class='add'>+# CONFIG_CPU_FREQ is not set</div><div class='add'>+# CONFIG_CPU_IDLE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Floating point emulation</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# At least one emulation must be selected</div><div class='add'>+#</div><div class='add'>+CONFIG_FPE_NWFPE=y</div><div class='add'>+# CONFIG_FPE_NWFPE_XP is not set</div><div class='add'>+# CONFIG_FPE_FASTFPE is not set</div><div class='add'>+CONFIG_VFP=y</div><div class='add'>+CONFIG_VFPv3=y</div><div class='add'>+# CONFIG_NEON is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Userspace binary formats</div><div class='add'>+#</div><div class='add'>+CONFIG_BINFMT_ELF=y</div><div class='add'>+# CONFIG_BINFMT_AOUT is not set</div><div class='add'>+CONFIG_BINFMT_MISC=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Power management options</div><div class='add'>+#</div><div class='add'>+# CONFIG_PM is not set</div><div class='add'>+CONFIG_ARCH_SUSPEND_POSSIBLE=y</div><div class='add'>+CONFIG_NET=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking options</div><div class='add'>+#</div><div class='add'>+CONFIG_PACKET=y</div><div class='add'>+# CONFIG_PACKET_MMAP is not set</div><div class='add'>+CONFIG_UNIX=y</div><div class='add'>+CONFIG_XFRM=y</div><div class='add'>+# CONFIG_XFRM_USER is not set</div><div class='add'>+# CONFIG_XFRM_SUB_POLICY is not set</div><div class='add'>+# CONFIG_XFRM_MIGRATE is not set</div><div class='add'>+# CONFIG_XFRM_STATISTICS is not set</div><div class='add'>+CONFIG_NET_KEY=y</div><div class='add'>+# CONFIG_NET_KEY_MIGRATE is not set</div><div class='add'>+CONFIG_INET=y</div><div class='add'>+# CONFIG_IP_MULTICAST is not set</div><div class='add'>+# CONFIG_IP_ADVANCED_ROUTER is not set</div><div class='add'>+CONFIG_IP_FIB_HASH=y</div><div class='add'>+CONFIG_IP_PNP=y</div><div class='add'>+CONFIG_IP_PNP_DHCP=y</div><div class='add'>+CONFIG_IP_PNP_BOOTP=y</div><div class='add'>+CONFIG_IP_PNP_RARP=y</div><div class='add'>+# CONFIG_NET_IPIP is not set</div><div class='add'>+# CONFIG_NET_IPGRE is not set</div><div class='add'>+# CONFIG_ARPD is not set</div><div class='add'>+# CONFIG_SYN_COOKIES is not set</div><div class='add'>+# CONFIG_INET_AH is not set</div><div class='add'>+# CONFIG_INET_ESP is not set</div><div class='add'>+# CONFIG_INET_IPCOMP is not set</div><div class='add'>+# CONFIG_INET_XFRM_TUNNEL is not set</div><div class='add'>+# CONFIG_INET_TUNNEL is not set</div><div class='add'>+CONFIG_INET_XFRM_MODE_TRANSPORT=y</div><div class='add'>+CONFIG_INET_XFRM_MODE_TUNNEL=y</div><div class='add'>+CONFIG_INET_XFRM_MODE_BEET=y</div><div class='add'>+# CONFIG_INET_LRO is not set</div><div class='add'>+CONFIG_INET_DIAG=y</div><div class='add'>+CONFIG_INET_TCP_DIAG=y</div><div class='add'>+# CONFIG_TCP_CONG_ADVANCED is not set</div><div class='add'>+CONFIG_TCP_CONG_CUBIC=y</div><div class='add'>+CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='add'>+# CONFIG_TCP_MD5SIG is not set</div><div class='add'>+# CONFIG_IPV6 is not set</div><div class='add'>+# CONFIG_NETWORK_SECMARK is not set</div><div class='add'>+# CONFIG_NETFILTER is not set</div><div class='add'>+# CONFIG_IP_DCCP is not set</div><div class='add'>+# CONFIG_IP_SCTP is not set</div><div class='add'>+# CONFIG_TIPC is not set</div><div class='add'>+# CONFIG_ATM is not set</div><div class='add'>+# CONFIG_BRIDGE is not set</div><div class='add'>+# CONFIG_VLAN_8021Q is not set</div><div class='add'>+# CONFIG_DECNET is not set</div><div class='add'>+# CONFIG_LLC2 is not set</div><div class='add'>+# CONFIG_IPX is not set</div><div class='add'>+# CONFIG_ATALK is not set</div><div class='add'>+# CONFIG_X25 is not set</div><div class='add'>+# CONFIG_LAPB is not set</div><div class='add'>+# CONFIG_ECONET is not set</div><div class='add'>+# CONFIG_WAN_ROUTER is not set</div><div class='add'>+# CONFIG_NET_SCHED is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network testing</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_PKTGEN is not set</div><div class='add'>+# CONFIG_HAMRADIO is not set</div><div class='add'>+# CONFIG_CAN is not set</div><div class='add'>+# CONFIG_IRDA is not set</div><div class='add'>+# CONFIG_BT is not set</div><div class='add'>+# CONFIG_AF_RXRPC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless</div><div class='add'>+#</div><div class='add'>+# CONFIG_CFG80211 is not set</div><div class='add'>+# CONFIG_WIRELESS_EXT is not set</div><div class='add'>+# CONFIG_MAC80211 is not set</div><div class='add'>+# CONFIG_IEEE80211 is not set</div><div class='add'>+# CONFIG_RFKILL is not set</div><div class='add'>+# CONFIG_NET_9P is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Device Drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Generic Driver Options</div><div class='add'>+#</div><div class='add'>+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='add'>+CONFIG_STANDALONE=y</div><div class='add'>+CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='add'>+# CONFIG_FW_LOADER is not set</div><div class='add'>+# CONFIG_DEBUG_DRIVER is not set</div><div class='add'>+# CONFIG_DEBUG_DEVRES is not set</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='add'>+# CONFIG_CONNECTOR is not set</div><div class='add'>+CONFIG_MTD=y</div><div class='add'>+# CONFIG_MTD_DEBUG is not set</div><div class='add'>+# CONFIG_MTD_CONCAT is not set</div><div class='add'>+CONFIG_MTD_PARTITIONS=y</div><div class='add'>+# CONFIG_MTD_REDBOOT_PARTS is not set</div><div class='add'>+# CONFIG_MTD_CMDLINE_PARTS is not set</div><div class='add'>+# CONFIG_MTD_AFS_PARTS is not set</div><div class='add'>+# CONFIG_MTD_AR7_PARTS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# User Modules And Translation Layers</div><div class='add'>+#</div><div class='add'>+CONFIG_MTD_CHAR=y</div><div class='add'>+CONFIG_MTD_BLKDEVS=y</div><div class='add'>+CONFIG_MTD_BLOCK=y</div><div class='add'>+# CONFIG_FTL is not set</div><div class='add'>+# CONFIG_NFTL is not set</div><div class='add'>+# CONFIG_INFTL is not set</div><div class='add'>+# CONFIG_RFD_FTL is not set</div><div class='add'>+# CONFIG_SSFDC is not set</div><div class='add'>+# CONFIG_MTD_OOPS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# RAM/ROM/Flash chip drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_CFI is not set</div><div class='add'>+# CONFIG_MTD_JEDECPROBE is not set</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_1=y</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_2=y</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_4=y</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set</div><div class='add'>+CONFIG_MTD_CFI_I1=y</div><div class='add'>+CONFIG_MTD_CFI_I2=y</div><div class='add'>+# CONFIG_MTD_CFI_I4 is not set</div><div class='add'>+# CONFIG_MTD_CFI_I8 is not set</div><div class='add'>+# CONFIG_MTD_RAM is not set</div><div class='add'>+# CONFIG_MTD_ROM is not set</div><div class='add'>+# CONFIG_MTD_ABSENT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Mapping drivers for chip access</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_COMPLEX_MAPPINGS is not set</div><div class='add'>+# CONFIG_MTD_PLATRAM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Self-contained MTD device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_SLRAM is not set</div><div class='add'>+# CONFIG_MTD_PHRAM is not set</div><div class='add'>+# CONFIG_MTD_MTDRAM is not set</div><div class='add'>+# CONFIG_MTD_BLOCK2MTD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Disk-On-Chip Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_DOC2000 is not set</div><div class='add'>+# CONFIG_MTD_DOC2001 is not set</div><div class='add'>+# CONFIG_MTD_DOC2001PLUS is not set</div><div class='add'>+CONFIG_MTD_NAND=y</div><div class='add'>+# CONFIG_MTD_NAND_VERIFY_WRITE is not set</div><div class='add'>+# CONFIG_MTD_NAND_ECC_SMC is not set</div><div class='add'>+# CONFIG_MTD_NAND_MUSEUM_IDS is not set</div><div class='add'>+CONFIG_MTD_NAND_IDS=y</div><div class='add'>+# CONFIG_MTD_NAND_DISKONCHIP is not set</div><div class='add'>+# CONFIG_MTD_NAND_NANDSIM is not set</div><div class='add'>+# CONFIG_MTD_NAND_PLATFORM is not set</div><div class='add'>+# CONFIG_MTD_ALAUDA is not set</div><div class='add'>+# CONFIG_MTD_ONENAND is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# UBI - Unsorted block images</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_UBI is not set</div><div class='add'>+# CONFIG_PARPORT is not set</div><div class='add'>+CONFIG_BLK_DEV=y</div><div class='add'>+# CONFIG_BLK_DEV_COW_COMMON is not set</div><div class='add'>+CONFIG_BLK_DEV_LOOP=y</div><div class='add'>+# CONFIG_BLK_DEV_CRYPTOLOOP is not set</div><div class='add'>+# CONFIG_BLK_DEV_NBD is not set</div><div class='add'>+# CONFIG_BLK_DEV_UB is not set</div><div class='add'>+CONFIG_BLK_DEV_RAM=y</div><div class='add'>+CONFIG_BLK_DEV_RAM_COUNT=16</div><div class='add'>+CONFIG_BLK_DEV_RAM_SIZE=16384</div><div class='add'>+# CONFIG_BLK_DEV_XIP is not set</div><div class='add'>+# CONFIG_CDROM_PKTCDVD is not set</div><div class='add'>+# CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+# CONFIG_MISC_DEVICES is not set</div><div class='add'>+CONFIG_HAVE_IDE=y</div><div class='add'>+# CONFIG_IDE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_RAID_ATTRS is not set</div><div class='add'>+CONFIG_SCSI=y</div><div class='add'>+CONFIG_SCSI_DMA=y</div><div class='add'>+# CONFIG_SCSI_TGT is not set</div><div class='add'>+# CONFIG_SCSI_NETLINK is not set</div><div class='add'>+CONFIG_SCSI_PROC_FS=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI support type (disk, tape, CD-ROM)</div><div class='add'>+#</div><div class='add'>+CONFIG_BLK_DEV_SD=y</div><div class='add'>+# CONFIG_CHR_DEV_ST is not set</div><div class='add'>+# CONFIG_CHR_DEV_OSST is not set</div><div class='add'>+# CONFIG_BLK_DEV_SR is not set</div><div class='add'>+# CONFIG_CHR_DEV_SG is not set</div><div class='add'>+# CONFIG_CHR_DEV_SCH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs</div><div class='add'>+#</div><div class='add'>+# CONFIG_SCSI_MULTI_LUN is not set</div><div class='add'>+# CONFIG_SCSI_CONSTANTS is not set</div><div class='add'>+# CONFIG_SCSI_LOGGING is not set</div><div class='add'>+# CONFIG_SCSI_SCAN_ASYNC is not set</div><div class='add'>+CONFIG_SCSI_WAIT_SCAN=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI Transports</div><div class='add'>+#</div><div class='add'>+# CONFIG_SCSI_SPI_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_FC_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_ISCSI_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_SAS_LIBSAS is not set</div><div class='add'>+# CONFIG_SCSI_SRP_ATTRS is not set</div><div class='add'>+CONFIG_SCSI_LOWLEVEL=y</div><div class='add'>+# CONFIG_ISCSI_TCP is not set</div><div class='add'>+# CONFIG_SCSI_DEBUG is not set</div><div class='add'>+# CONFIG_SCSI_DH is not set</div><div class='add'>+# CONFIG_ATA is not set</div><div class='add'>+# CONFIG_MD is not set</div><div class='add'>+CONFIG_NETDEVICES=y</div><div class='add'>+# CONFIG_DUMMY is not set</div><div class='add'>+# CONFIG_BONDING is not set</div><div class='add'>+# CONFIG_MACVLAN is not set</div><div class='add'>+# CONFIG_EQUALIZER is not set</div><div class='add'>+# CONFIG_TUN is not set</div><div class='add'>+# CONFIG_VETH is not set</div><div class='add'>+# CONFIG_NET_ETHERNET is not set</div><div class='add'>+# CONFIG_NETDEV_1000 is not set</div><div class='add'>+# CONFIG_NETDEV_10000 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless LAN</div><div class='add'>+#</div><div class='add'>+# CONFIG_WLAN_PRE80211 is not set</div><div class='add'>+# CONFIG_WLAN_80211 is not set</div><div class='add'>+# CONFIG_IWLWIFI_LEDS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Network Adapters</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_CATC is not set</div><div class='add'>+# CONFIG_USB_KAWETH is not set</div><div class='add'>+# CONFIG_USB_PEGASUS is not set</div><div class='add'>+# CONFIG_USB_RTL8150 is not set</div><div class='add'>+# CONFIG_USB_USBNET is not set</div><div class='add'>+# CONFIG_WAN is not set</div><div class='add'>+# CONFIG_PPP is not set</div><div class='add'>+# CONFIG_SLIP is not set</div><div class='add'>+# CONFIG_NETCONSOLE is not set</div><div class='add'>+# CONFIG_NETPOLL is not set</div><div class='add'>+# CONFIG_NET_POLL_CONTROLLER is not set</div><div class='add'>+# CONFIG_ISDN is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input device support</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT=y</div><div class='add'>+# CONFIG_INPUT_FF_MEMLESS is not set</div><div class='add'>+# CONFIG_INPUT_POLLDEV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Userland interfaces</div><div class='add'>+#</div><div class='add'>+# CONFIG_INPUT_MOUSEDEV is not set</div><div class='add'>+# CONFIG_INPUT_JOYDEV is not set</div><div class='add'>+# CONFIG_INPUT_EVDEV is not set</div><div class='add'>+# CONFIG_INPUT_EVBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_INPUT_KEYBOARD is not set</div><div class='add'>+# CONFIG_INPUT_MOUSE is not set</div><div class='add'>+# CONFIG_INPUT_JOYSTICK is not set</div><div class='add'>+# CONFIG_INPUT_TABLET is not set</div><div class='add'>+# CONFIG_INPUT_TOUCHSCREEN is not set</div><div class='add'>+# CONFIG_INPUT_MISC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware I/O ports</div><div class='add'>+#</div><div class='add'>+# CONFIG_SERIO is not set</div><div class='add'>+# CONFIG_GAMEPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Character devices</div><div class='add'>+#</div><div class='add'>+CONFIG_VT=y</div><div class='add'>+CONFIG_CONSOLE_TRANSLATIONS=y</div><div class='add'>+CONFIG_VT_CONSOLE=y</div><div class='add'>+CONFIG_HW_CONSOLE=y</div><div class='add'>+# CONFIG_VT_HW_CONSOLE_BINDING is not set</div><div class='add'>+CONFIG_DEVKMEM=y</div><div class='add'>+# CONFIG_SERIAL_NONSTANDARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Serial drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIAL_8250=y</div><div class='add'>+CONFIG_SERIAL_8250_CONSOLE=y</div><div class='add'>+CONFIG_SERIAL_8250_NR_UARTS=32</div><div class='add'>+CONFIG_SERIAL_8250_RUNTIME_UARTS=4</div><div class='add'>+CONFIG_SERIAL_8250_EXTENDED=y</div><div class='add'>+CONFIG_SERIAL_8250_MANY_PORTS=y</div><div class='add'>+CONFIG_SERIAL_8250_SHARE_IRQ=y</div><div class='add'>+CONFIG_SERIAL_8250_DETECT_IRQ=y</div><div class='add'>+CONFIG_SERIAL_8250_RSA=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Non-8250 serial port support</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIAL_CORE=y</div><div class='add'>+CONFIG_SERIAL_CORE_CONSOLE=y</div><div class='add'>+CONFIG_UNIX98_PTYS=y</div><div class='add'>+# CONFIG_LEGACY_PTYS is not set</div><div class='add'>+# CONFIG_IPMI_HANDLER is not set</div><div class='add'>+CONFIG_HW_RANDOM=y</div><div class='add'>+# CONFIG_NVRAM is not set</div><div class='add'>+# CONFIG_R3964 is not set</div><div class='add'>+# CONFIG_RAW_DRIVER is not set</div><div class='add'>+# CONFIG_TCG_TPM is not set</div><div class='add'>+CONFIG_I2C=y</div><div class='add'>+CONFIG_I2C_BOARDINFO=y</div><div class='add'>+CONFIG_I2C_CHARDEV=y</div><div class='add'>+CONFIG_I2C_HELPER_AUTO=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C Hardware Bus support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C system bus drivers (mostly embedded / system-on-chip)</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_GPIO is not set</div><div class='add'>+# CONFIG_I2C_OCORES is not set</div><div class='add'>+CONFIG_I2C_OMAP=y</div><div class='add'>+# CONFIG_I2C_SIMTEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# External I2C/SMBus adapter drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='add'>+# CONFIG_I2C_TAOS_EVM is not set</div><div class='add'>+# CONFIG_I2C_TINY_USB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Other I2C/SMBus bus drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_PCA_PLATFORM is not set</div><div class='add'>+# CONFIG_I2C_STUB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous I2C Chip support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DS1682 is not set</div><div class='add'>+# CONFIG_AT24 is not set</div><div class='add'>+# CONFIG_SENSORS_EEPROM is not set</div><div class='add'>+# CONFIG_SENSORS_PCF8574 is not set</div><div class='add'>+# CONFIG_PCF8575 is not set</div><div class='add'>+# CONFIG_SENSORS_PCA9539 is not set</div><div class='add'>+# CONFIG_SENSORS_PCF8591 is not set</div><div class='add'>+# CONFIG_ISP1301_OMAP is not set</div><div class='add'>+# CONFIG_TPS65010 is not set</div><div class='add'>+# CONFIG_SENSORS_MAX6875 is not set</div><div class='add'>+# CONFIG_SENSORS_TSL2550 is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_CORE is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_ALGO is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_BUS is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_CHIP is not set</div><div class='add'>+# CONFIG_SPI is not set</div><div class='add'>+CONFIG_ARCH_REQUIRE_GPIOLIB=y</div><div class='add'>+CONFIG_GPIOLIB=y</div><div class='add'>+# CONFIG_DEBUG_GPIO is not set</div><div class='add'>+# CONFIG_GPIO_SYSFS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C GPIO expanders:</div><div class='add'>+#</div><div class='add'>+# CONFIG_GPIO_MAX732X is not set</div><div class='add'>+# CONFIG_GPIO_PCA953X is not set</div><div class='add'>+# CONFIG_GPIO_PCF857X is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCI GPIO expanders:</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI GPIO expanders:</div><div class='add'>+#</div><div class='add'>+# CONFIG_W1 is not set</div><div class='add'>+# CONFIG_POWER_SUPPLY is not set</div><div class='add'>+# CONFIG_HWMON is not set</div><div class='add'>+# CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='add'>+# CONFIG_WATCHDOG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Sonics Silicon Backplane</div><div class='add'>+#</div><div class='add'>+CONFIG_SSB_POSSIBLE=y</div><div class='add'>+# CONFIG_SSB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multifunction device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='add'>+# CONFIG_MFD_SM501 is not set</div><div class='add'>+# CONFIG_HTC_EGPIO is not set</div><div class='add'>+# CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_UCB1400_CORE is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='add'>+# CONFIG_MFD_T7L66XB is not set</div><div class='add'>+# CONFIG_MFD_TC6387XB is not set</div><div class='add'>+# CONFIG_MFD_TC6393XB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia core support</div><div class='add'>+#</div><div class='add'>+# CONFIG_VIDEO_DEV is not set</div><div class='add'>+# CONFIG_DVB_CORE is not set</div><div class='add'>+# CONFIG_VIDEO_MEDIA is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_DAB=y</div><div class='add'>+# CONFIG_USB_DABUSB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics support</div><div class='add'>+#</div><div class='add'>+# CONFIG_VGASTATE is not set</div><div class='add'>+# CONFIG_VIDEO_OUTPUT_CONTROL is not set</div><div class='add'>+# CONFIG_FB is not set</div><div class='add'>+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Display device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DISPLAY_SUPPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Console display driver support</div><div class='add'>+#</div><div class='add'>+# CONFIG_VGA_CONSOLE is not set</div><div class='add'>+CONFIG_DUMMY_CONSOLE=y</div><div class='add'>+# CONFIG_SOUND is not set</div><div class='add'>+# CONFIG_HID_SUPPORT is not set</div><div class='add'>+CONFIG_USB_SUPPORT=y</div><div class='add'>+CONFIG_USB_ARCH_HAS_HCD=y</div><div class='add'>+CONFIG_USB_ARCH_HAS_OHCI=y</div><div class='add'>+# CONFIG_USB_ARCH_HAS_EHCI is not set</div><div class='add'>+CONFIG_USB=y</div><div class='add'>+# CONFIG_USB_DEBUG is not set</div><div class='add'>+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous USB options</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_DEVICEFS=y</div><div class='add'>+CONFIG_USB_DEVICE_CLASS=y</div><div class='add'>+# CONFIG_USB_DYNAMIC_MINORS is not set</div><div class='add'>+# CONFIG_USB_OTG is not set</div><div class='add'>+# CONFIG_USB_OTG_WHITELIST is not set</div><div class='add'>+# CONFIG_USB_OTG_BLACKLIST_HUB is not set</div><div class='add'>+CONFIG_USB_MON=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Host Controller Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_C67X00_HCD is not set</div><div class='add'>+# CONFIG_USB_ISP116X_HCD is not set</div><div class='add'>+# CONFIG_USB_ISP1760_HCD is not set</div><div class='add'>+# CONFIG_USB_OHCI_HCD is not set</div><div class='add'>+# CONFIG_USB_SL811_HCD is not set</div><div class='add'>+# CONFIG_USB_R8A66597_HCD is not set</div><div class='add'>+CONFIG_USB_MUSB_HDRC=y</div><div class='add'>+CONFIG_USB_MUSB_SOC=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OMAP 343x high speed USB support</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_MUSB_HOST=y</div><div class='add'>+# CONFIG_USB_MUSB_PERIPHERAL is not set</div><div class='add'>+# CONFIG_USB_MUSB_OTG is not set</div><div class='add'>+# CONFIG_USB_GADGET_MUSB_HDRC is not set</div><div class='add'>+CONFIG_USB_MUSB_HDRC_HCD=y</div><div class='add'>+# CONFIG_MUSB_PIO_ONLY is not set</div><div class='add'>+CONFIG_USB_INVENTRA_DMA=y</div><div class='add'>+# CONFIG_USB_TI_CPPI_DMA is not set</div><div class='add'>+# CONFIG_USB_MUSB_DEBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Device Class drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_ACM is not set</div><div class='add'>+# CONFIG_USB_PRINTER is not set</div><div class='add'>+# CONFIG_USB_WDM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# may also be needed; see USB_STORAGE Help for more information</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_STORAGE is not set</div><div class='add'>+# CONFIG_USB_LIBUSUAL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Imaging devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_MDC800 is not set</div><div class='add'>+# CONFIG_USB_MICROTEK is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB port drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_SERIAL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Miscellaneous drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_EMI62 is not set</div><div class='add'>+# CONFIG_USB_EMI26 is not set</div><div class='add'>+# CONFIG_USB_ADUTUX is not set</div><div class='add'>+# CONFIG_USB_RIO500 is not set</div><div class='add'>+# CONFIG_USB_LEGOTOWER is not set</div><div class='add'>+# CONFIG_USB_LCD is not set</div><div class='add'>+# CONFIG_USB_BERRY_CHARGE is not set</div><div class='add'>+# CONFIG_USB_LED is not set</div><div class='add'>+# CONFIG_USB_CYPRESS_CY7C63 is not set</div><div class='add'>+# CONFIG_USB_CYTHERM is not set</div><div class='add'>+# CONFIG_USB_PHIDGET is not set</div><div class='add'>+# CONFIG_USB_IDMOUSE is not set</div><div class='add'>+# CONFIG_USB_FTDI_ELAN is not set</div><div class='add'>+# CONFIG_USB_APPLEDISPLAY is not set</div><div class='add'>+# CONFIG_USB_LD is not set</div><div class='add'>+# CONFIG_USB_TRANCEVIBRATOR is not set</div><div class='add'>+# CONFIG_USB_IOWARRIOR is not set</div><div class='add'>+# CONFIG_USB_TEST is not set</div><div class='add'>+# CONFIG_USB_ISIGHTFW is not set</div><div class='add'>+CONFIG_USB_GADGET=y</div><div class='add'>+# CONFIG_USB_GADGET_DEBUG is not set</div><div class='add'>+# CONFIG_USB_GADGET_DEBUG_FILES is not set</div><div class='add'>+CONFIG_USB_GADGET_SELECTED=y</div><div class='add'>+# CONFIG_USB_GADGET_AMD5536UDC is not set</div><div class='add'>+# CONFIG_USB_GADGET_ATMEL_USBA is not set</div><div class='add'>+# CONFIG_USB_GADGET_FSL_USB2 is not set</div><div class='add'>+# CONFIG_USB_GADGET_NET2280 is not set</div><div class='add'>+# CONFIG_USB_GADGET_PXA25X is not set</div><div class='add'>+CONFIG_USB_GADGET_M66592=y</div><div class='add'>+CONFIG_USB_M66592=y</div><div class='add'>+# CONFIG_USB_GADGET_PXA27X is not set</div><div class='add'>+# CONFIG_USB_GADGET_GOKU is not set</div><div class='add'>+# CONFIG_USB_GADGET_LH7A40X is not set</div><div class='add'>+# CONFIG_USB_GADGET_OMAP is not set</div><div class='add'>+# CONFIG_USB_GADGET_S3C2410 is not set</div><div class='add'>+# CONFIG_USB_GADGET_AT91 is not set</div><div class='add'>+# CONFIG_USB_GADGET_DUMMY_HCD is not set</div><div class='add'>+CONFIG_USB_GADGET_DUALSPEED=y</div><div class='add'>+# CONFIG_USB_ZERO is not set</div><div class='add'>+CONFIG_USB_ETH=m</div><div class='add'>+CONFIG_USB_ETH_RNDIS=y</div><div class='add'>+# CONFIG_USB_GADGETFS is not set</div><div class='add'>+# CONFIG_USB_FILE_STORAGE is not set</div><div class='add'>+# CONFIG_USB_G_SERIAL is not set</div><div class='add'>+# CONFIG_USB_MIDI_GADGET is not set</div><div class='add'>+# CONFIG_USB_G_PRINTER is not set</div><div class='add'>+# CONFIG_USB_CDC_COMPOSITE is not set</div><div class='add'>+CONFIG_MMC=y</div><div class='add'>+# CONFIG_MMC_DEBUG is not set</div><div class='add'>+# CONFIG_MMC_UNSAFE_RESUME is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MMC/SD Card Drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_MMC_BLOCK=y</div><div class='add'>+CONFIG_MMC_BLOCK_BOUNCE=y</div><div class='add'>+# CONFIG_SDIO_UART is not set</div><div class='add'>+# CONFIG_MMC_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MMC/SD Host Controller Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MMC_SDHCI is not set</div><div class='add'>+# CONFIG_MMC_OMAP is not set</div><div class='add'>+# CONFIG_MEMSTICK is not set</div><div class='add'>+# CONFIG_ACCESSIBILITY is not set</div><div class='add'>+# CONFIG_NEW_LEDS is not set</div><div class='add'>+CONFIG_RTC_LIB=y</div><div class='add'>+CONFIG_RTC_CLASS=y</div><div class='add'>+CONFIG_RTC_HCTOSYS=y</div><div class='add'>+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"</div><div class='add'>+# CONFIG_RTC_DEBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# RTC interfaces</div><div class='add'>+#</div><div class='add'>+CONFIG_RTC_INTF_SYSFS=y</div><div class='add'>+CONFIG_RTC_INTF_PROC=y</div><div class='add'>+CONFIG_RTC_INTF_DEV=y</div><div class='add'>+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set</div><div class='add'>+# CONFIG_RTC_DRV_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C RTC drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_RTC_DRV_DS1307 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1374 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1672 is not set</div><div class='add'>+# CONFIG_RTC_DRV_MAX6900 is not set</div><div class='add'>+# CONFIG_RTC_DRV_RS5C372 is not set</div><div class='add'>+# CONFIG_RTC_DRV_ISL1208 is not set</div><div class='add'>+# CONFIG_RTC_DRV_X1205 is not set</div><div class='add'>+# CONFIG_RTC_DRV_PCF8563 is not set</div><div class='add'>+# CONFIG_RTC_DRV_PCF8583 is not set</div><div class='add'>+# CONFIG_RTC_DRV_M41T80 is not set</div><div class='add'>+# CONFIG_RTC_DRV_S35390A is not set</div><div class='add'>+# CONFIG_RTC_DRV_FM3130 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI RTC drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Platform RTC drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_RTC_DRV_CMOS is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1511 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1553 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1742 is not set</div><div class='add'>+# CONFIG_RTC_DRV_STK17TA8 is not set</div><div class='add'>+# CONFIG_RTC_DRV_M48T86 is not set</div><div class='add'>+# CONFIG_RTC_DRV_M48T59 is not set</div><div class='add'>+# CONFIG_RTC_DRV_V3020 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# on-CPU RTC drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_DMADEVICES is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Voltage and Current regulators</div><div class='add'>+#</div><div class='add'>+# CONFIG_REGULATOR is not set</div><div class='add'>+# CONFIG_REGULATOR_FIXED_VOLTAGE is not set</div><div class='add'>+# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set</div><div class='add'>+# CONFIG_REGULATOR_BQ24022 is not set</div><div class='add'>+# CONFIG_UIO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# File systems</div><div class='add'>+#</div><div class='add'>+CONFIG_EXT2_FS=y</div><div class='add'>+# CONFIG_EXT2_FS_XATTR is not set</div><div class='add'>+# CONFIG_EXT2_FS_XIP is not set</div><div class='add'>+CONFIG_EXT3_FS=y</div><div class='add'>+# CONFIG_EXT3_FS_XATTR is not set</div><div class='add'>+# CONFIG_EXT4DEV_FS is not set</div><div class='add'>+CONFIG_JBD=y</div><div class='add'>+# CONFIG_REISERFS_FS is not set</div><div class='add'>+# CONFIG_JFS_FS is not set</div><div class='add'>+# CONFIG_FS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_XFS_FS is not set</div><div class='add'>+# CONFIG_OCFS2_FS is not set</div><div class='add'>+CONFIG_DNOTIFY=y</div><div class='add'>+CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='add'>+CONFIG_QUOTA=y</div><div class='add'>+# CONFIG_QUOTA_NETLINK_INTERFACE is not set</div><div class='add'>+CONFIG_PRINT_QUOTA_WARNING=y</div><div class='add'>+# CONFIG_QFMT_V1 is not set</div><div class='add'>+CONFIG_QFMT_V2=y</div><div class='add'>+CONFIG_QUOTACTL=y</div><div class='add'>+# CONFIG_AUTOFS_FS is not set</div><div class='add'>+# CONFIG_AUTOFS4_FS is not set</div><div class='add'>+# CONFIG_FUSE_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CD-ROM/DVD Filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ISO9660_FS is not set</div><div class='add'>+# CONFIG_UDF_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DOS/FAT/NT Filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_FAT_FS=y</div><div class='add'>+CONFIG_MSDOS_FS=y</div><div class='add'>+CONFIG_VFAT_FS=y</div><div class='add'>+CONFIG_FAT_DEFAULT_CODEPAGE=437</div><div class='add'>+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"</div><div class='add'>+# CONFIG_NTFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Pseudo filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_PROC_FS=y</div><div class='add'>+CONFIG_PROC_SYSCTL=y</div><div class='add'>+CONFIG_SYSFS=y</div><div class='add'>+CONFIG_TMPFS=y</div><div class='add'>+# CONFIG_TMPFS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_HUGETLB_PAGE is not set</div><div class='add'>+# CONFIG_CONFIGFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ADFS_FS is not set</div><div class='add'>+# CONFIG_AFFS_FS is not set</div><div class='add'>+# CONFIG_HFS_FS is not set</div><div class='add'>+# CONFIG_HFSPLUS_FS is not set</div><div class='add'>+# CONFIG_BEFS_FS is not set</div><div class='add'>+# CONFIG_BFS_FS is not set</div><div class='add'>+# CONFIG_EFS_FS is not set</div><div class='add'>+CONFIG_JFFS2_FS=y</div><div class='add'>+CONFIG_JFFS2_FS_DEBUG=0</div><div class='add'>+CONFIG_JFFS2_FS_WRITEBUFFER=y</div><div class='add'>+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set</div><div class='add'>+# CONFIG_JFFS2_SUMMARY is not set</div><div class='add'>+# CONFIG_JFFS2_FS_XATTR is not set</div><div class='add'>+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set</div><div class='add'>+CONFIG_JFFS2_ZLIB=y</div><div class='add'>+# CONFIG_JFFS2_LZO is not set</div><div class='add'>+CONFIG_JFFS2_RTIME=y</div><div class='add'>+# CONFIG_JFFS2_RUBIN is not set</div><div class='add'>+# CONFIG_CRAMFS is not set</div><div class='add'>+# CONFIG_VXFS_FS is not set</div><div class='add'>+# CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='add'>+# CONFIG_HPFS_FS is not set</div><div class='add'>+# CONFIG_QNX4FS_FS is not set</div><div class='add'>+# CONFIG_ROMFS_FS is not set</div><div class='add'>+# CONFIG_SYSV_FS is not set</div><div class='add'>+# CONFIG_UFS_FS is not set</div><div class='add'>+CONFIG_NETWORK_FILESYSTEMS=y</div><div class='add'>+CONFIG_NFS_FS=y</div><div class='add'>+CONFIG_NFS_V3=y</div><div class='add'>+# CONFIG_NFS_V3_ACL is not set</div><div class='add'>+CONFIG_NFS_V4=y</div><div class='add'>+CONFIG_ROOT_NFS=y</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='add'>+CONFIG_LOCKD=y</div><div class='add'>+CONFIG_LOCKD_V4=y</div><div class='add'>+CONFIG_NFS_COMMON=y</div><div class='add'>+CONFIG_SUNRPC=y</div><div class='add'>+CONFIG_SUNRPC_GSS=y</div><div class='add'>+CONFIG_RPCSEC_GSS_KRB5=y</div><div class='add'>+# CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='add'>+# CONFIG_SMB_FS is not set</div><div class='add'>+# CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_NCP_FS is not set</div><div class='add'>+# CONFIG_CODA_FS is not set</div><div class='add'>+# CONFIG_AFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Partition Types</div><div class='add'>+#</div><div class='add'>+CONFIG_PARTITION_ADVANCED=y</div><div class='add'>+# CONFIG_ACORN_PARTITION is not set</div><div class='add'>+# CONFIG_OSF_PARTITION is not set</div><div class='add'>+# CONFIG_AMIGA_PARTITION is not set</div><div class='add'>+# CONFIG_ATARI_PARTITION is not set</div><div class='add'>+# CONFIG_MAC_PARTITION is not set</div><div class='add'>+CONFIG_MSDOS_PARTITION=y</div><div class='add'>+# CONFIG_BSD_DISKLABEL is not set</div><div class='add'>+# CONFIG_MINIX_SUBPARTITION is not set</div><div class='add'>+# CONFIG_SOLARIS_X86_PARTITION is not set</div><div class='add'>+# CONFIG_UNIXWARE_DISKLABEL is not set</div><div class='add'>+# CONFIG_LDM_PARTITION is not set</div><div class='add'>+# CONFIG_SGI_PARTITION is not set</div><div class='add'>+# CONFIG_ULTRIX_PARTITION is not set</div><div class='add'>+# CONFIG_SUN_PARTITION is not set</div><div class='add'>+# CONFIG_KARMA_PARTITION is not set</div><div class='add'>+# CONFIG_EFI_PARTITION is not set</div><div class='add'>+# CONFIG_SYSV68_PARTITION is not set</div><div class='add'>+CONFIG_NLS=y</div><div class='add'>+CONFIG_NLS_DEFAULT="iso8859-1"</div><div class='add'>+CONFIG_NLS_CODEPAGE_437=y</div><div class='add'>+# CONFIG_NLS_CODEPAGE_737 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_775 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_850 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_852 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_855 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_857 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_860 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_861 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_862 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_863 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_864 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_865 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_866 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_869 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_936 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_950 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_932 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_949 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_874 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_8 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_1250 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_1251 is not set</div><div class='add'>+# CONFIG_NLS_ASCII is not set</div><div class='add'>+CONFIG_NLS_ISO8859_1=y</div><div class='add'>+# CONFIG_NLS_ISO8859_2 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_3 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_4 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_5 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_6 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_7 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_9 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_13 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_14 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_15 is not set</div><div class='add'>+# CONFIG_NLS_KOI8_R is not set</div><div class='add'>+# CONFIG_NLS_KOI8_U is not set</div><div class='add'>+# CONFIG_NLS_UTF8 is not set</div><div class='add'>+# CONFIG_DLM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel hacking</div><div class='add'>+#</div><div class='add'>+# CONFIG_PRINTK_TIME is not set</div><div class='add'>+CONFIG_ENABLE_WARN_DEPRECATED=y</div><div class='add'>+CONFIG_ENABLE_MUST_CHECK=y</div><div class='add'>+CONFIG_FRAME_WARN=1024</div><div class='add'>+CONFIG_MAGIC_SYSRQ=y</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='add'>+# CONFIG_DEBUG_FS is not set</div><div class='add'>+# CONFIG_HEADERS_CHECK is not set</div><div class='add'>+CONFIG_DEBUG_KERNEL=y</div><div class='add'>+# CONFIG_DEBUG_SHIRQ is not set</div><div class='add'>+CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set</div><div class='add'>+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0</div><div class='add'>+CONFIG_SCHED_DEBUG=y</div><div class='add'>+# CONFIG_SCHEDSTATS is not set</div><div class='add'>+# CONFIG_TIMER_STATS is not set</div><div class='add'>+# CONFIG_DEBUG_OBJECTS is not set</div><div class='add'>+# CONFIG_DEBUG_SLAB is not set</div><div class='add'>+# CONFIG_DEBUG_RT_MUTEXES is not set</div><div class='add'>+# CONFIG_RT_MUTEX_TESTER is not set</div><div class='add'>+# CONFIG_DEBUG_SPINLOCK is not set</div><div class='add'>+CONFIG_DEBUG_MUTEXES=y</div><div class='add'>+# CONFIG_DEBUG_LOCK_ALLOC is not set</div><div class='add'>+# CONFIG_PROVE_LOCKING is not set</div><div class='add'>+# CONFIG_LOCK_STAT is not set</div><div class='add'>+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set</div><div class='add'>+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set</div><div class='add'>+# CONFIG_DEBUG_KOBJECT is not set</div><div class='add'>+# CONFIG_DEBUG_BUGVERBOSE is not set</div><div class='add'>+CONFIG_DEBUG_INFO=y</div><div class='add'>+# CONFIG_DEBUG_VM is not set</div><div class='add'>+# CONFIG_DEBUG_WRITECOUNT is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='add'>+# CONFIG_DEBUG_LIST is not set</div><div class='add'>+# CONFIG_DEBUG_SG is not set</div><div class='add'>+CONFIG_FRAME_POINTER=y</div><div class='add'>+# CONFIG_BOOT_PRINTK_DELAY is not set</div><div class='add'>+# CONFIG_RCU_TORTURE_TEST is not set</div><div class='add'>+# CONFIG_BACKTRACE_SELF_TEST is not set</div><div class='add'>+# CONFIG_FAULT_INJECTION is not set</div><div class='add'>+# CONFIG_LATENCYTOP is not set</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_IRQSOFF_TRACER is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='add'>+# CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='add'>+# CONFIG_KGDB is not set</div><div class='add'>+# CONFIG_DEBUG_USER is not set</div><div class='add'>+# CONFIG_DEBUG_ERRORS is not set</div><div class='add'>+# CONFIG_DEBUG_STACK_USAGE is not set</div><div class='add'>+# CONFIG_DEBUG_LL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Security options</div><div class='add'>+#</div><div class='add'>+# CONFIG_KEYS is not set</div><div class='add'>+# CONFIG_SECURITY is not set</div><div class='add'>+# CONFIG_SECURITY_FILE_CAPABILITIES is not set</div><div class='add'>+CONFIG_CRYPTO=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Crypto core or helper</div><div class='add'>+#</div><div class='add'>+CONFIG_CRYPTO_ALGAPI=y</div><div class='add'>+CONFIG_CRYPTO_BLKCIPHER=y</div><div class='add'>+CONFIG_CRYPTO_MANAGER=y</div><div class='add'>+# CONFIG_CRYPTO_GF128MUL is not set</div><div class='add'>+# CONFIG_CRYPTO_NULL is not set</div><div class='add'>+# CONFIG_CRYPTO_CRYPTD is not set</div><div class='add'>+# CONFIG_CRYPTO_AUTHENC is not set</div><div class='add'>+# CONFIG_CRYPTO_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Authenticated Encryption with Associated Data</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CCM is not set</div><div class='add'>+# CONFIG_CRYPTO_GCM is not set</div><div class='add'>+# CONFIG_CRYPTO_SEQIV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block modes</div><div class='add'>+#</div><div class='add'>+CONFIG_CRYPTO_CBC=y</div><div class='add'>+# CONFIG_CRYPTO_CTR is not set</div><div class='add'>+# CONFIG_CRYPTO_CTS is not set</div><div class='add'>+CONFIG_CRYPTO_ECB=m</div><div class='add'>+# CONFIG_CRYPTO_LRW is not set</div><div class='add'>+CONFIG_CRYPTO_PCBC=m</div><div class='add'>+# CONFIG_CRYPTO_XTS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hash modes</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_HMAC is not set</div><div class='add'>+# CONFIG_CRYPTO_XCBC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Digest</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CRC32C is not set</div><div class='add'>+# CONFIG_CRYPTO_MD4 is not set</div><div class='add'>+CONFIG_CRYPTO_MD5=y</div><div class='add'>+# CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='add'>+# CONFIG_CRYPTO_SHA1 is not set</div><div class='add'>+# CONFIG_CRYPTO_SHA256 is not set</div><div class='add'>+# CONFIG_CRYPTO_SHA512 is not set</div><div class='add'>+# CONFIG_CRYPTO_TGR192 is not set</div><div class='add'>+# CONFIG_CRYPTO_WP512 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ciphers</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_AES is not set</div><div class='add'>+# CONFIG_CRYPTO_ANUBIS is not set</div><div class='add'>+# CONFIG_CRYPTO_ARC4 is not set</div><div class='add'>+# CONFIG_CRYPTO_BLOWFISH is not set</div><div class='add'>+# CONFIG_CRYPTO_CAMELLIA is not set</div><div class='add'>+# CONFIG_CRYPTO_CAST5 is not set</div><div class='add'>+# CONFIG_CRYPTO_CAST6 is not set</div><div class='add'>+CONFIG_CRYPTO_DES=y</div><div class='add'>+# CONFIG_CRYPTO_FCRYPT is not set</div><div class='add'>+# CONFIG_CRYPTO_KHAZAD is not set</div><div class='add'>+# CONFIG_CRYPTO_SALSA20 is not set</div><div class='add'>+# CONFIG_CRYPTO_SEED is not set</div><div class='add'>+# CONFIG_CRYPTO_SERPENT is not set</div><div class='add'>+# CONFIG_CRYPTO_TEA is not set</div><div class='add'>+# CONFIG_CRYPTO_TWOFISH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Compression</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_DEFLATE is not set</div><div class='add'>+# CONFIG_CRYPTO_LZO is not set</div><div class='add'>+CONFIG_CRYPTO_HW=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Library routines</div><div class='add'>+#</div><div class='add'>+CONFIG_BITREVERSE=y</div><div class='add'>+# CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='add'>+# CONFIG_GENERIC_FIND_NEXT_BIT is not set</div><div class='add'>+CONFIG_CRC_CCITT=y</div><div class='add'>+# CONFIG_CRC16 is not set</div><div class='add'>+# CONFIG_CRC_T10DIF is not set</div><div class='add'>+# CONFIG_CRC_ITU_T is not set</div><div class='add'>+CONFIG_CRC32=y</div><div class='add'>+# CONFIG_CRC7 is not set</div><div class='add'>+CONFIG_LIBCRC32C=y</div><div class='add'>+CONFIG_ZLIB_INFLATE=y</div><div class='add'>+CONFIG_ZLIB_DEFLATE=y</div><div class='add'>+CONFIG_PLIST=y</div><div class='add'>+CONFIG_HAS_IOMEM=y</div><div class='add'>+CONFIG_HAS_IOPORT=y</div><div class='add'>+CONFIG_HAS_DMA=y</div><div class='head'>diff --git a/arch/arm/configs/omap_ldp_defconfig b/arch/arm/configs/omap_ldp_defconfig<br/>new file mode 100644<br/>index 000000000000..948a212fb1cc<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/configs/omap_ldp_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/configs/omap_ldp_defconfig</a></div><div class='hunk'>@@ -0,0 +1,1044 @@</div><div class='add'>+#</div><div class='add'>+# Automatically generated make config: don't edit</div><div class='add'>+# Linux kernel version: 2.6.27-rc5</div><div class='add'>+# Fri Oct 10 11:49:41 2008</div><div class='add'>+#</div><div class='add'>+CONFIG_ARM=y</div><div class='add'>+CONFIG_SYS_SUPPORTS_APM_EMULATION=y</div><div class='add'>+CONFIG_GENERIC_GPIO=y</div><div class='add'>+CONFIG_GENERIC_TIME=y</div><div class='add'>+CONFIG_GENERIC_CLOCKEVENTS=y</div><div class='add'>+CONFIG_MMU=y</div><div class='add'>+# CONFIG_NO_IOPORT is not set</div><div class='add'>+CONFIG_GENERIC_HARDIRQS=y</div><div class='add'>+CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='add'>+CONFIG_LOCKDEP_SUPPORT=y</div><div class='add'>+CONFIG_TRACE_IRQFLAGS_SUPPORT=y</div><div class='add'>+CONFIG_HARDIRQS_SW_RESEND=y</div><div class='add'>+CONFIG_GENERIC_IRQ_PROBE=y</div><div class='add'>+CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='add'>+# CONFIG_ARCH_HAS_ILOG2_U32 is not set</div><div class='add'>+# CONFIG_ARCH_HAS_ILOG2_U64 is not set</div><div class='add'>+CONFIG_GENERIC_HWEIGHT=y</div><div class='add'>+CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_ARCH_SUPPORTS_AOUT=y</div><div class='add'>+CONFIG_ZONE_DMA=y</div><div class='add'>+CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y</div><div class='add'>+CONFIG_VECTORS_BASE=0xffff0000</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# General setup</div><div class='add'>+#</div><div class='add'>+CONFIG_EXPERIMENTAL=y</div><div class='add'>+CONFIG_BROKEN_ON_SMP=y</div><div class='add'>+CONFIG_INIT_ENV_ARG_LIMIT=32</div><div class='add'>+CONFIG_LOCALVERSION=""</div><div class='add'>+CONFIG_LOCALVERSION_AUTO=y</div><div class='add'>+CONFIG_SWAP=y</div><div class='add'>+CONFIG_SYSVIPC=y</div><div class='add'>+CONFIG_SYSVIPC_SYSCTL=y</div><div class='add'>+CONFIG_BSD_PROCESS_ACCT=y</div><div class='add'>+# CONFIG_BSD_PROCESS_ACCT_V3 is not set</div><div class='add'>+# CONFIG_IKCONFIG is not set</div><div class='add'>+CONFIG_LOG_BUF_SHIFT=14</div><div class='add'>+# CONFIG_CGROUPS is not set</div><div class='add'>+CONFIG_GROUP_SCHED=y</div><div class='add'>+CONFIG_FAIR_GROUP_SCHED=y</div><div class='add'>+# CONFIG_RT_GROUP_SCHED is not set</div><div class='add'>+CONFIG_USER_SCHED=y</div><div class='add'>+# CONFIG_CGROUP_SCHED is not set</div><div class='add'>+CONFIG_SYSFS_DEPRECATED=y</div><div class='add'>+CONFIG_SYSFS_DEPRECATED_V2=y</div><div class='add'>+# CONFIG_RELAY is not set</div><div class='add'>+# CONFIG_NAMESPACES is not set</div><div class='add'>+CONFIG_BLK_DEV_INITRD=y</div><div class='add'>+CONFIG_INITRAMFS_SOURCE=""</div><div class='add'>+CONFIG_CC_OPTIMIZE_FOR_SIZE=y</div><div class='add'>+CONFIG_SYSCTL=y</div><div class='add'>+CONFIG_EMBEDDED=y</div><div class='add'>+CONFIG_UID16=y</div><div class='add'>+# CONFIG_SYSCTL_SYSCALL is not set</div><div class='add'>+CONFIG_KALLSYMS=y</div><div class='add'>+# CONFIG_KALLSYMS_ALL is not set</div><div class='add'>+CONFIG_KALLSYMS_EXTRA_PASS=y</div><div class='add'>+CONFIG_HOTPLUG=y</div><div class='add'>+CONFIG_PRINTK=y</div><div class='add'>+CONFIG_BUG=y</div><div class='add'>+CONFIG_ELF_CORE=y</div><div class='add'>+CONFIG_COMPAT_BRK=y</div><div class='add'>+CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_FUTEX=y</div><div class='add'>+CONFIG_ANON_INODES=y</div><div class='add'>+CONFIG_EPOLL=y</div><div class='add'>+CONFIG_SIGNALFD=y</div><div class='add'>+CONFIG_TIMERFD=y</div><div class='add'>+CONFIG_EVENTFD=y</div><div class='add'>+CONFIG_SHMEM=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='add'>+CONFIG_SLAB=y</div><div class='add'>+# CONFIG_SLUB is not set</div><div class='add'>+# CONFIG_SLOB is not set</div><div class='add'>+# CONFIG_PROFILING is not set</div><div class='add'>+# CONFIG_MARKERS is not set</div><div class='add'>+CONFIG_HAVE_OPROFILE=y</div><div class='add'>+# CONFIG_KPROBES is not set</div><div class='add'>+# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set</div><div class='add'>+# CONFIG_HAVE_IOREMAP_PROT is not set</div><div class='add'>+CONFIG_HAVE_KPROBES=y</div><div class='add'>+CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+# CONFIG_HAVE_ARCH_TRACEHOOK is not set</div><div class='add'>+# CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+CONFIG_HAVE_CLK=y</div><div class='add'>+CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+CONFIG_HAVE_GENERIC_DMA_COHERENT=y</div><div class='add'>+CONFIG_SLABINFO=y</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='add'>+# CONFIG_TINY_SHMEM is not set</div><div class='add'>+CONFIG_BASE_SMALL=0</div><div class='add'>+CONFIG_MODULES=y</div><div class='add'>+# CONFIG_MODULE_FORCE_LOAD is not set</div><div class='add'>+CONFIG_MODULE_UNLOAD=y</div><div class='add'>+# CONFIG_MODULE_FORCE_UNLOAD is not set</div><div class='add'>+CONFIG_MODVERSIONS=y</div><div class='add'>+CONFIG_MODULE_SRCVERSION_ALL=y</div><div class='add'>+CONFIG_KMOD=y</div><div class='add'>+CONFIG_BLOCK=y</div><div class='add'>+# CONFIG_LBD is not set</div><div class='add'>+# CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='add'>+# CONFIG_LSF is not set</div><div class='add'>+# CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IO Schedulers</div><div class='add'>+#</div><div class='add'>+CONFIG_IOSCHED_NOOP=y</div><div class='add'>+CONFIG_IOSCHED_AS=y</div><div class='add'>+CONFIG_IOSCHED_DEADLINE=y</div><div class='add'>+CONFIG_IOSCHED_CFQ=y</div><div class='add'>+CONFIG_DEFAULT_AS=y</div><div class='add'>+# CONFIG_DEFAULT_DEADLINE is not set</div><div class='add'>+# CONFIG_DEFAULT_CFQ is not set</div><div class='add'>+# CONFIG_DEFAULT_NOOP is not set</div><div class='add'>+CONFIG_DEFAULT_IOSCHED="anticipatory"</div><div class='add'>+CONFIG_CLASSIC_RCU=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# System Type</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARCH_AAEC2000 is not set</div><div class='add'>+# CONFIG_ARCH_INTEGRATOR is not set</div><div class='add'>+# CONFIG_ARCH_REALVIEW is not set</div><div class='add'>+# CONFIG_ARCH_VERSATILE is not set</div><div class='add'>+# CONFIG_ARCH_AT91 is not set</div><div class='add'>+# CONFIG_ARCH_CLPS7500 is not set</div><div class='add'>+# CONFIG_ARCH_CLPS711X is not set</div><div class='add'>+# CONFIG_ARCH_EBSA110 is not set</div><div class='add'>+# CONFIG_ARCH_EP93XX is not set</div><div class='add'>+# CONFIG_ARCH_FOOTBRIDGE is not set</div><div class='add'>+# CONFIG_ARCH_NETX is not set</div><div class='add'>+# CONFIG_ARCH_H720X is not set</div><div class='add'>+# CONFIG_ARCH_IMX is not set</div><div class='add'>+# CONFIG_ARCH_IOP13XX is not set</div><div class='add'>+# CONFIG_ARCH_IOP32X is not set</div><div class='add'>+# CONFIG_ARCH_IOP33X is not set</div><div class='add'>+# CONFIG_ARCH_IXP23XX is not set</div><div class='add'>+# CONFIG_ARCH_IXP2000 is not set</div><div class='add'>+# CONFIG_ARCH_IXP4XX is not set</div><div class='add'>+# CONFIG_ARCH_L7200 is not set</div><div class='add'>+# CONFIG_ARCH_KIRKWOOD is not set</div><div class='add'>+# CONFIG_ARCH_KS8695 is not set</div><div class='add'>+# CONFIG_ARCH_NS9XXX is not set</div><div class='add'>+# CONFIG_ARCH_LOKI is not set</div><div class='add'>+# CONFIG_ARCH_MV78XX0 is not set</div><div class='add'>+# CONFIG_ARCH_MXC is not set</div><div class='add'>+# CONFIG_ARCH_ORION5X is not set</div><div class='add'>+# CONFIG_ARCH_PNX4008 is not set</div><div class='add'>+# CONFIG_ARCH_PXA is not set</div><div class='add'>+# CONFIG_ARCH_RPC is not set</div><div class='add'>+# CONFIG_ARCH_SA1100 is not set</div><div class='add'>+# CONFIG_ARCH_S3C2410 is not set</div><div class='add'>+# CONFIG_ARCH_SHARK is not set</div><div class='add'>+# CONFIG_ARCH_LH7A40X is not set</div><div class='add'>+# CONFIG_ARCH_DAVINCI is not set</div><div class='add'>+CONFIG_ARCH_OMAP=y</div><div class='add'>+# CONFIG_ARCH_MSM7X00A is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# TI OMAP Implementations</div><div class='add'>+#</div><div class='add'>+CONFIG_ARCH_OMAP_OTG=y</div><div class='add'>+# CONFIG_ARCH_OMAP1 is not set</div><div class='add'>+# CONFIG_ARCH_OMAP2 is not set</div><div class='add'>+CONFIG_ARCH_OMAP3=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OMAP Feature Selections</div><div class='add'>+#</div><div class='add'>+# CONFIG_OMAP_DEBUG_POWERDOMAIN is not set</div><div class='add'>+# CONFIG_OMAP_DEBUG_CLOCKDOMAIN is not set</div><div class='add'>+# CONFIG_OMAP_RESET_CLOCKS is not set</div><div class='add'>+CONFIG_OMAP_MUX=y</div><div class='add'>+CONFIG_OMAP_MUX_DEBUG=y</div><div class='add'>+CONFIG_OMAP_MUX_WARNINGS=y</div><div class='add'>+CONFIG_OMAP_MCBSP=y</div><div class='add'>+# CONFIG_OMAP_MPU_TIMER is not set</div><div class='add'>+CONFIG_OMAP_32K_TIMER=y</div><div class='add'>+CONFIG_OMAP_32K_TIMER_HZ=128</div><div class='add'>+CONFIG_OMAP_DM_TIMER=y</div><div class='add'>+# CONFIG_OMAP_LL_DEBUG_UART1 is not set</div><div class='add'>+# CONFIG_OMAP_LL_DEBUG_UART2 is not set</div><div class='add'>+CONFIG_OMAP_LL_DEBUG_UART3=y</div><div class='add'>+CONFIG_OMAP_SERIAL_WAKE=y</div><div class='add'>+CONFIG_ARCH_OMAP34XX=y</div><div class='add'>+CONFIG_ARCH_OMAP3430=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OMAP Board Type</div><div class='add'>+#</div><div class='add'>+# CONFIG_MACH_OMAP3_BEAGLE is not set</div><div class='add'>+CONFIG_MACH_OMAP_LDP=y</div><div class='add'>+# CONFIG_MACH_OVERO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Boot options</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Power management</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Processor Type</div><div class='add'>+#</div><div class='add'>+CONFIG_CPU_32=y</div><div class='add'>+CONFIG_CPU_32v6K=y</div><div class='add'>+CONFIG_CPU_V7=y</div><div class='add'>+CONFIG_CPU_32v7=y</div><div class='add'>+CONFIG_CPU_ABRT_EV7=y</div><div class='add'>+CONFIG_CPU_PABRT_IFAR=y</div><div class='add'>+CONFIG_CPU_CACHE_V7=y</div><div class='add'>+CONFIG_CPU_CACHE_VIPT=y</div><div class='add'>+CONFIG_CPU_COPY_V6=y</div><div class='add'>+CONFIG_CPU_TLB_V7=y</div><div class='add'>+CONFIG_CPU_HAS_ASID=y</div><div class='add'>+CONFIG_CPU_CP15=y</div><div class='add'>+CONFIG_CPU_CP15_MMU=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Processor Features</div><div class='add'>+#</div><div class='add'>+CONFIG_ARM_THUMB=y</div><div class='add'>+# CONFIG_ARM_THUMBEE is not set</div><div class='add'>+# CONFIG_CPU_ICACHE_DISABLE is not set</div><div class='add'>+# CONFIG_CPU_DCACHE_DISABLE is not set</div><div class='add'>+# CONFIG_CPU_BPREDICT_DISABLE is not set</div><div class='add'>+CONFIG_HAS_TLS_REG=y</div><div class='add'>+# CONFIG_OUTER_CACHE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Bus support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PCI_SYSCALL is not set</div><div class='add'>+# CONFIG_ARCH_SUPPORTS_MSI is not set</div><div class='add'>+# CONFIG_PCCARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel Features</div><div class='add'>+#</div><div class='add'>+CONFIG_TICK_ONESHOT=y</div><div class='add'>+CONFIG_NO_HZ=y</div><div class='add'>+CONFIG_HIGH_RES_TIMERS=y</div><div class='add'>+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y</div><div class='add'>+# CONFIG_PREEMPT is not set</div><div class='add'>+CONFIG_HZ=128</div><div class='add'>+CONFIG_AEABI=y</div><div class='add'>+CONFIG_OABI_COMPAT=y</div><div class='add'>+CONFIG_ARCH_FLATMEM_HAS_HOLES=y</div><div class='add'>+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set</div><div class='add'>+CONFIG_SELECT_MEMORY_MODEL=y</div><div class='add'>+CONFIG_FLATMEM_MANUAL=y</div><div class='add'>+# CONFIG_DISCONTIGMEM_MANUAL is not set</div><div class='add'>+# CONFIG_SPARSEMEM_MANUAL is not set</div><div class='add'>+CONFIG_FLATMEM=y</div><div class='add'>+CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='add'>+# CONFIG_SPARSEMEM_STATIC is not set</div><div class='add'>+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='add'>+CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='add'>+CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+CONFIG_ZONE_DMA_FLAG=1</div><div class='add'>+CONFIG_BOUNCE=y</div><div class='add'>+CONFIG_VIRT_TO_BUS=y</div><div class='add'>+# CONFIG_LEDS is not set</div><div class='add'>+CONFIG_ALIGNMENT_TRAP=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Boot options</div><div class='add'>+#</div><div class='add'>+CONFIG_ZBOOT_ROM_TEXT=0x0</div><div class='add'>+CONFIG_ZBOOT_ROM_BSS=0x0</div><div class='add'>+CONFIG_CMDLINE="root=/dev/nfs nfsroot=192.168.0.1:/home/user/buildroot ip=192.168.0.2:192.168.0.1:192.168.0.1:255.255.255.0:tgt:eth0:off rw console=ttyS2,115200n8"</div><div class='add'>+# CONFIG_XIP_KERNEL is not set</div><div class='add'>+# CONFIG_KEXEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CPU Frequency scaling</div><div class='add'>+#</div><div class='add'>+# CONFIG_CPU_FREQ is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Floating point emulation</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# At least one emulation must be selected</div><div class='add'>+#</div><div class='add'>+CONFIG_FPE_NWFPE=y</div><div class='add'>+# CONFIG_FPE_NWFPE_XP is not set</div><div class='add'>+# CONFIG_FPE_FASTFPE is not set</div><div class='add'>+CONFIG_VFP=y</div><div class='add'>+CONFIG_VFPv3=y</div><div class='add'>+# CONFIG_NEON is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Userspace binary formats</div><div class='add'>+#</div><div class='add'>+CONFIG_BINFMT_ELF=y</div><div class='add'>+# CONFIG_BINFMT_AOUT is not set</div><div class='add'>+CONFIG_BINFMT_MISC=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Power management options</div><div class='add'>+#</div><div class='add'>+# CONFIG_PM is not set</div><div class='add'>+CONFIG_ARCH_SUSPEND_POSSIBLE=y</div><div class='add'>+# CONFIG_NET is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Device Drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Generic Driver Options</div><div class='add'>+#</div><div class='add'>+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='add'>+CONFIG_STANDALONE=y</div><div class='add'>+CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='add'>+# CONFIG_FW_LOADER is not set</div><div class='add'>+# CONFIG_DEBUG_DRIVER is not set</div><div class='add'>+# CONFIG_DEBUG_DEVRES is not set</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='add'>+# CONFIG_MTD is not set</div><div class='add'>+# CONFIG_PARPORT is not set</div><div class='add'>+CONFIG_BLK_DEV=y</div><div class='add'>+# CONFIG_BLK_DEV_COW_COMMON is not set</div><div class='add'>+CONFIG_BLK_DEV_LOOP=y</div><div class='add'>+# CONFIG_BLK_DEV_CRYPTOLOOP is not set</div><div class='add'>+CONFIG_BLK_DEV_RAM=y</div><div class='add'>+CONFIG_BLK_DEV_RAM_COUNT=16</div><div class='add'>+CONFIG_BLK_DEV_RAM_SIZE=16384</div><div class='add'>+# CONFIG_BLK_DEV_XIP is not set</div><div class='add'>+# CONFIG_CDROM_PKTCDVD is not set</div><div class='add'>+CONFIG_MISC_DEVICES=y</div><div class='add'>+# CONFIG_EEPROM_93CX6 is not set</div><div class='add'>+# CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+CONFIG_HAVE_IDE=y</div><div class='add'>+# CONFIG_IDE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_RAID_ATTRS is not set</div><div class='add'>+CONFIG_SCSI=y</div><div class='add'>+CONFIG_SCSI_DMA=y</div><div class='add'>+# CONFIG_SCSI_TGT is not set</div><div class='add'>+# CONFIG_SCSI_NETLINK is not set</div><div class='add'>+CONFIG_SCSI_PROC_FS=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI support type (disk, tape, CD-ROM)</div><div class='add'>+#</div><div class='add'>+CONFIG_BLK_DEV_SD=y</div><div class='add'>+# CONFIG_CHR_DEV_ST is not set</div><div class='add'>+# CONFIG_CHR_DEV_OSST is not set</div><div class='add'>+# CONFIG_BLK_DEV_SR is not set</div><div class='add'>+# CONFIG_CHR_DEV_SG is not set</div><div class='add'>+# CONFIG_CHR_DEV_SCH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs</div><div class='add'>+#</div><div class='add'>+# CONFIG_SCSI_MULTI_LUN is not set</div><div class='add'>+# CONFIG_SCSI_CONSTANTS is not set</div><div class='add'>+# CONFIG_SCSI_LOGGING is not set</div><div class='add'>+# CONFIG_SCSI_SCAN_ASYNC is not set</div><div class='add'>+CONFIG_SCSI_WAIT_SCAN=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI Transports</div><div class='add'>+#</div><div class='add'>+# CONFIG_SCSI_SPI_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_FC_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_SAS_LIBSAS is not set</div><div class='add'>+# CONFIG_SCSI_SRP_ATTRS is not set</div><div class='add'>+CONFIG_SCSI_LOWLEVEL=y</div><div class='add'>+# CONFIG_SCSI_DEBUG is not set</div><div class='add'>+# CONFIG_SCSI_DH is not set</div><div class='add'>+# CONFIG_ATA is not set</div><div class='add'>+# CONFIG_MD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input device support</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT=y</div><div class='add'>+# CONFIG_INPUT_FF_MEMLESS is not set</div><div class='add'>+# CONFIG_INPUT_POLLDEV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Userland interfaces</div><div class='add'>+#</div><div class='add'>+# CONFIG_INPUT_MOUSEDEV is not set</div><div class='add'>+# CONFIG_INPUT_JOYDEV is not set</div><div class='add'>+CONFIG_INPUT_EVDEV=y</div><div class='add'>+# CONFIG_INPUT_EVBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_INPUT_KEYBOARD is not set</div><div class='add'>+# CONFIG_INPUT_MOUSE is not set</div><div class='add'>+# CONFIG_INPUT_JOYSTICK is not set</div><div class='add'>+# CONFIG_INPUT_TABLET is not set</div><div class='add'>+CONFIG_INPUT_TOUCHSCREEN=y</div><div class='add'>+CONFIG_TOUCHSCREEN_ADS7846=y</div><div class='add'>+# CONFIG_TOUCHSCREEN_FUJITSU is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_GUNZE is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_ELO is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_MTOUCH is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_INEXIO is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_MK712 is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_PENMOUNT is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_TOUCHWIN is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_UCB1400 is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set</div><div class='add'>+# CONFIG_INPUT_MISC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware I/O ports</div><div class='add'>+#</div><div class='add'>+# CONFIG_SERIO is not set</div><div class='add'>+# CONFIG_GAMEPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Character devices</div><div class='add'>+#</div><div class='add'>+CONFIG_VT=y</div><div class='add'>+CONFIG_CONSOLE_TRANSLATIONS=y</div><div class='add'>+CONFIG_VT_CONSOLE=y</div><div class='add'>+CONFIG_HW_CONSOLE=y</div><div class='add'>+# CONFIG_VT_HW_CONSOLE_BINDING is not set</div><div class='add'>+CONFIG_DEVKMEM=y</div><div class='add'>+# CONFIG_SERIAL_NONSTANDARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Serial drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIAL_8250=y</div><div class='add'>+CONFIG_SERIAL_8250_CONSOLE=y</div><div class='add'>+CONFIG_SERIAL_8250_NR_UARTS=32</div><div class='add'>+CONFIG_SERIAL_8250_RUNTIME_UARTS=4</div><div class='add'>+CONFIG_SERIAL_8250_EXTENDED=y</div><div class='add'>+CONFIG_SERIAL_8250_MANY_PORTS=y</div><div class='add'>+CONFIG_SERIAL_8250_SHARE_IRQ=y</div><div class='add'>+CONFIG_SERIAL_8250_DETECT_IRQ=y</div><div class='add'>+CONFIG_SERIAL_8250_RSA=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Non-8250 serial port support</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIAL_CORE=y</div><div class='add'>+CONFIG_SERIAL_CORE_CONSOLE=y</div><div class='add'>+CONFIG_UNIX98_PTYS=y</div><div class='add'>+# CONFIG_LEGACY_PTYS is not set</div><div class='add'>+# CONFIG_IPMI_HANDLER is not set</div><div class='add'>+CONFIG_HW_RANDOM=y</div><div class='add'>+# CONFIG_NVRAM is not set</div><div class='add'>+# CONFIG_R3964 is not set</div><div class='add'>+# CONFIG_RAW_DRIVER is not set</div><div class='add'>+# CONFIG_TCG_TPM is not set</div><div class='add'>+CONFIG_I2C=y</div><div class='add'>+CONFIG_I2C_BOARDINFO=y</div><div class='add'>+CONFIG_I2C_CHARDEV=y</div><div class='add'>+CONFIG_I2C_HELPER_AUTO=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C Hardware Bus support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C system bus drivers (mostly embedded / system-on-chip)</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_GPIO is not set</div><div class='add'>+# CONFIG_I2C_OCORES is not set</div><div class='add'>+CONFIG_I2C_OMAP=y</div><div class='add'>+# CONFIG_I2C_SIMTEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# External I2C/SMBus adapter drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='add'>+# CONFIG_I2C_TAOS_EVM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Other I2C/SMBus bus drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_PCA_PLATFORM is not set</div><div class='add'>+# CONFIG_I2C_STUB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous I2C Chip support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DS1682 is not set</div><div class='add'>+# CONFIG_AT24 is not set</div><div class='add'>+# CONFIG_SENSORS_EEPROM is not set</div><div class='add'>+# CONFIG_SENSORS_PCF8574 is not set</div><div class='add'>+# CONFIG_PCF8575 is not set</div><div class='add'>+# CONFIG_SENSORS_PCA9539 is not set</div><div class='add'>+# CONFIG_SENSORS_PCF8591 is not set</div><div class='add'>+# CONFIG_ISP1301_OMAP is not set</div><div class='add'>+# CONFIG_TPS65010 is not set</div><div class='add'>+# CONFIG_SENSORS_MAX6875 is not set</div><div class='add'>+# CONFIG_SENSORS_TSL2550 is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_CORE is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_ALGO is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_BUS is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_CHIP is not set</div><div class='add'>+CONFIG_SPI=y</div><div class='add'>+# CONFIG_SPI_DEBUG is not set</div><div class='add'>+CONFIG_SPI_MASTER=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI Master Controller Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_SPI_BITBANG is not set</div><div class='add'>+CONFIG_SPI_OMAP24XX=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI Protocol Masters</div><div class='add'>+#</div><div class='add'>+# CONFIG_SPI_AT25 is not set</div><div class='add'>+# CONFIG_SPI_SPIDEV is not set</div><div class='add'>+# CONFIG_SPI_TLE62X0 is not set</div><div class='add'>+CONFIG_ARCH_REQUIRE_GPIOLIB=y</div><div class='add'>+CONFIG_GPIOLIB=y</div><div class='add'>+# CONFIG_DEBUG_GPIO is not set</div><div class='add'>+# CONFIG_GPIO_SYSFS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C GPIO expanders:</div><div class='add'>+#</div><div class='add'>+# CONFIG_GPIO_MAX732X is not set</div><div class='add'>+# CONFIG_GPIO_PCA953X is not set</div><div class='add'>+# CONFIG_GPIO_PCF857X is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCI GPIO expanders:</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI GPIO expanders:</div><div class='add'>+#</div><div class='add'>+# CONFIG_GPIO_MAX7301 is not set</div><div class='add'>+# CONFIG_GPIO_MCP23S08 is not set</div><div class='add'>+CONFIG_W1=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# 1-wire Bus Masters</div><div class='add'>+#</div><div class='add'>+# CONFIG_W1_MASTER_DS2482 is not set</div><div class='add'>+# CONFIG_W1_MASTER_DS1WM is not set</div><div class='add'>+# CONFIG_W1_MASTER_GPIO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# 1-wire Slaves</div><div class='add'>+#</div><div class='add'>+# CONFIG_W1_SLAVE_THERM is not set</div><div class='add'>+# CONFIG_W1_SLAVE_SMEM is not set</div><div class='add'>+# CONFIG_W1_SLAVE_DS2433 is not set</div><div class='add'>+# CONFIG_W1_SLAVE_DS2760 is not set</div><div class='add'>+CONFIG_POWER_SUPPLY=y</div><div class='add'>+# CONFIG_POWER_SUPPLY_DEBUG is not set</div><div class='add'>+# CONFIG_PDA_POWER is not set</div><div class='add'>+# CONFIG_BATTERY_DS2760 is not set</div><div class='add'>+# CONFIG_HWMON is not set</div><div class='add'>+CONFIG_WATCHDOG=y</div><div class='add'>+CONFIG_WATCHDOG_NOWAYOUT=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Watchdog Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_SOFT_WATCHDOG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Sonics Silicon Backplane</div><div class='add'>+#</div><div class='add'>+CONFIG_SSB_POSSIBLE=y</div><div class='add'>+# CONFIG_SSB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multifunction device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='add'>+# CONFIG_MFD_SM501 is not set</div><div class='add'>+# CONFIG_HTC_EGPIO is not set</div><div class='add'>+# CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='add'>+# CONFIG_MFD_T7L66XB is not set</div><div class='add'>+# CONFIG_MFD_TC6387XB is not set</div><div class='add'>+# CONFIG_MFD_TC6393XB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia core support</div><div class='add'>+#</div><div class='add'>+# CONFIG_VIDEO_DEV is not set</div><div class='add'>+# CONFIG_VIDEO_MEDIA is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_DAB=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics support</div><div class='add'>+#</div><div class='add'>+# CONFIG_VGASTATE is not set</div><div class='add'>+CONFIG_VIDEO_OUTPUT_CONTROL=m</div><div class='add'>+# CONFIG_FB is not set</div><div class='add'>+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Display device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DISPLAY_SUPPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Console display driver support</div><div class='add'>+#</div><div class='add'>+# CONFIG_VGA_CONSOLE is not set</div><div class='add'>+CONFIG_DUMMY_CONSOLE=y</div><div class='add'>+CONFIG_SOUND=y</div><div class='add'>+CONFIG_SND=y</div><div class='add'>+# CONFIG_SND_SEQUENCER is not set</div><div class='add'>+# CONFIG_SND_MIXER_OSS is not set</div><div class='add'>+# CONFIG_SND_PCM_OSS is not set</div><div class='add'>+# CONFIG_SND_DYNAMIC_MINORS is not set</div><div class='add'>+CONFIG_SND_SUPPORT_OLD_API=y</div><div class='add'>+CONFIG_SND_VERBOSE_PROCFS=y</div><div class='add'>+# CONFIG_SND_VERBOSE_PRINTK is not set</div><div class='add'>+# CONFIG_SND_DEBUG is not set</div><div class='add'>+CONFIG_SND_DRIVERS=y</div><div class='add'>+# CONFIG_SND_DUMMY is not set</div><div class='add'>+# CONFIG_SND_MTPAV is not set</div><div class='add'>+# CONFIG_SND_SERIAL_U16550 is not set</div><div class='add'>+# CONFIG_SND_MPU401 is not set</div><div class='add'>+CONFIG_SND_ARM=y</div><div class='add'>+CONFIG_SND_SPI=y</div><div class='add'>+# CONFIG_SND_SOC is not set</div><div class='add'>+# CONFIG_SOUND_PRIME is not set</div><div class='add'>+CONFIG_HID_SUPPORT=y</div><div class='add'>+CONFIG_HID=y</div><div class='add'>+# CONFIG_HID_DEBUG is not set</div><div class='add'>+# CONFIG_HIDRAW is not set</div><div class='add'>+# CONFIG_USB_SUPPORT is not set</div><div class='add'>+CONFIG_MMC=y</div><div class='add'>+# CONFIG_MMC_DEBUG is not set</div><div class='add'>+# CONFIG_MMC_UNSAFE_RESUME is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MMC/SD Card Drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_MMC_BLOCK=y</div><div class='add'>+CONFIG_MMC_BLOCK_BOUNCE=y</div><div class='add'>+# CONFIG_SDIO_UART is not set</div><div class='add'>+# CONFIG_MMC_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MMC/SD Host Controller Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MMC_SDHCI is not set</div><div class='add'>+# CONFIG_MMC_OMAP is not set</div><div class='add'>+# CONFIG_MMC_SPI is not set</div><div class='add'>+# CONFIG_NEW_LEDS is not set</div><div class='add'>+CONFIG_RTC_LIB=y</div><div class='add'>+CONFIG_RTC_CLASS=y</div><div class='add'>+CONFIG_RTC_HCTOSYS=y</div><div class='add'>+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"</div><div class='add'>+# CONFIG_RTC_DEBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# RTC interfaces</div><div class='add'>+#</div><div class='add'>+CONFIG_RTC_INTF_SYSFS=y</div><div class='add'>+CONFIG_RTC_INTF_PROC=y</div><div class='add'>+CONFIG_RTC_INTF_DEV=y</div><div class='add'>+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set</div><div class='add'>+# CONFIG_RTC_DRV_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C RTC drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_RTC_DRV_DS1307 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1374 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1672 is not set</div><div class='add'>+# CONFIG_RTC_DRV_MAX6900 is not set</div><div class='add'>+# CONFIG_RTC_DRV_RS5C372 is not set</div><div class='add'>+# CONFIG_RTC_DRV_ISL1208 is not set</div><div class='add'>+# CONFIG_RTC_DRV_X1205 is not set</div><div class='add'>+# CONFIG_RTC_DRV_PCF8563 is not set</div><div class='add'>+# CONFIG_RTC_DRV_PCF8583 is not set</div><div class='add'>+# CONFIG_RTC_DRV_M41T80 is not set</div><div class='add'>+# CONFIG_RTC_DRV_S35390A is not set</div><div class='add'>+# CONFIG_RTC_DRV_FM3130 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI RTC drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_RTC_DRV_M41T94 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1305 is not set</div><div class='add'>+# CONFIG_RTC_DRV_MAX6902 is not set</div><div class='add'>+# CONFIG_RTC_DRV_R9701 is not set</div><div class='add'>+# CONFIG_RTC_DRV_RS5C348 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Platform RTC drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_RTC_DRV_CMOS is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1511 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1553 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1742 is not set</div><div class='add'>+# CONFIG_RTC_DRV_STK17TA8 is not set</div><div class='add'>+# CONFIG_RTC_DRV_M48T86 is not set</div><div class='add'>+# CONFIG_RTC_DRV_M48T59 is not set</div><div class='add'>+# CONFIG_RTC_DRV_V3020 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# on-CPU RTC drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_DMADEVICES is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Voltage and Current regulators</div><div class='add'>+#</div><div class='add'>+# CONFIG_REGULATOR is not set</div><div class='add'>+# CONFIG_REGULATOR_FIXED_VOLTAGE is not set</div><div class='add'>+# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set</div><div class='add'>+# CONFIG_REGULATOR_BQ24022 is not set</div><div class='add'>+# CONFIG_UIO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# File systems</div><div class='add'>+#</div><div class='add'>+CONFIG_EXT2_FS=y</div><div class='add'>+# CONFIG_EXT2_FS_XATTR is not set</div><div class='add'>+# CONFIG_EXT2_FS_XIP is not set</div><div class='add'>+CONFIG_EXT3_FS=y</div><div class='add'>+# CONFIG_EXT3_FS_XATTR is not set</div><div class='add'>+# CONFIG_EXT4DEV_FS is not set</div><div class='add'>+CONFIG_JBD=y</div><div class='add'>+# CONFIG_REISERFS_FS is not set</div><div class='add'>+# CONFIG_JFS_FS is not set</div><div class='add'>+# CONFIG_FS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_XFS_FS is not set</div><div class='add'>+CONFIG_DNOTIFY=y</div><div class='add'>+CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='add'>+CONFIG_QUOTA=y</div><div class='add'>+CONFIG_PRINT_QUOTA_WARNING=y</div><div class='add'>+# CONFIG_QFMT_V1 is not set</div><div class='add'>+CONFIG_QFMT_V2=y</div><div class='add'>+CONFIG_QUOTACTL=y</div><div class='add'>+# CONFIG_AUTOFS_FS is not set</div><div class='add'>+# CONFIG_AUTOFS4_FS is not set</div><div class='add'>+# CONFIG_FUSE_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CD-ROM/DVD Filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ISO9660_FS is not set</div><div class='add'>+# CONFIG_UDF_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DOS/FAT/NT Filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_FAT_FS=y</div><div class='add'>+CONFIG_MSDOS_FS=y</div><div class='add'>+CONFIG_VFAT_FS=y</div><div class='add'>+CONFIG_FAT_DEFAULT_CODEPAGE=437</div><div class='add'>+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"</div><div class='add'>+# CONFIG_NTFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Pseudo filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_PROC_FS=y</div><div class='add'>+CONFIG_PROC_SYSCTL=y</div><div class='add'>+CONFIG_SYSFS=y</div><div class='add'>+CONFIG_TMPFS=y</div><div class='add'>+# CONFIG_TMPFS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_HUGETLB_PAGE is not set</div><div class='add'>+# CONFIG_CONFIGFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ADFS_FS is not set</div><div class='add'>+# CONFIG_AFFS_FS is not set</div><div class='add'>+# CONFIG_HFS_FS is not set</div><div class='add'>+# CONFIG_HFSPLUS_FS is not set</div><div class='add'>+# CONFIG_BEFS_FS is not set</div><div class='add'>+# CONFIG_BFS_FS is not set</div><div class='add'>+# CONFIG_EFS_FS is not set</div><div class='add'>+# CONFIG_CRAMFS is not set</div><div class='add'>+# CONFIG_VXFS_FS is not set</div><div class='add'>+# CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='add'>+# CONFIG_HPFS_FS is not set</div><div class='add'>+# CONFIG_QNX4FS_FS is not set</div><div class='add'>+# CONFIG_ROMFS_FS is not set</div><div class='add'>+# CONFIG_SYSV_FS is not set</div><div class='add'>+# CONFIG_UFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Partition Types</div><div class='add'>+#</div><div class='add'>+CONFIG_PARTITION_ADVANCED=y</div><div class='add'>+# CONFIG_ACORN_PARTITION is not set</div><div class='add'>+# CONFIG_OSF_PARTITION is not set</div><div class='add'>+# CONFIG_AMIGA_PARTITION is not set</div><div class='add'>+# CONFIG_ATARI_PARTITION is not set</div><div class='add'>+# CONFIG_MAC_PARTITION is not set</div><div class='add'>+CONFIG_MSDOS_PARTITION=y</div><div class='add'>+# CONFIG_BSD_DISKLABEL is not set</div><div class='add'>+# CONFIG_MINIX_SUBPARTITION is not set</div><div class='add'>+# CONFIG_SOLARIS_X86_PARTITION is not set</div><div class='add'>+# CONFIG_UNIXWARE_DISKLABEL is not set</div><div class='add'>+# CONFIG_LDM_PARTITION is not set</div><div class='add'>+# CONFIG_SGI_PARTITION is not set</div><div class='add'>+# CONFIG_ULTRIX_PARTITION is not set</div><div class='add'>+# CONFIG_SUN_PARTITION is not set</div><div class='add'>+# CONFIG_KARMA_PARTITION is not set</div><div class='add'>+# CONFIG_EFI_PARTITION is not set</div><div class='add'>+# CONFIG_SYSV68_PARTITION is not set</div><div class='add'>+CONFIG_NLS=y</div><div class='add'>+CONFIG_NLS_DEFAULT="iso8859-1"</div><div class='add'>+CONFIG_NLS_CODEPAGE_437=y</div><div class='add'>+# CONFIG_NLS_CODEPAGE_737 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_775 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_850 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_852 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_855 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_857 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_860 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_861 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_862 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_863 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_864 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_865 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_866 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_869 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_936 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_950 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_932 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_949 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_874 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_8 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_1250 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_1251 is not set</div><div class='add'>+# CONFIG_NLS_ASCII is not set</div><div class='add'>+CONFIG_NLS_ISO8859_1=y</div><div class='add'>+# CONFIG_NLS_ISO8859_2 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_3 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_4 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_5 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_6 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_7 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_9 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_13 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_14 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_15 is not set</div><div class='add'>+# CONFIG_NLS_KOI8_R is not set</div><div class='add'>+# CONFIG_NLS_KOI8_U is not set</div><div class='add'>+# CONFIG_NLS_UTF8 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel hacking</div><div class='add'>+#</div><div class='add'>+# CONFIG_PRINTK_TIME is not set</div><div class='add'>+CONFIG_ENABLE_WARN_DEPRECATED=y</div><div class='add'>+CONFIG_ENABLE_MUST_CHECK=y</div><div class='add'>+CONFIG_FRAME_WARN=1024</div><div class='add'>+CONFIG_MAGIC_SYSRQ=y</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='add'>+# CONFIG_DEBUG_FS is not set</div><div class='add'>+# CONFIG_HEADERS_CHECK is not set</div><div class='add'>+CONFIG_DEBUG_KERNEL=y</div><div class='add'>+# CONFIG_DEBUG_SHIRQ is not set</div><div class='add'>+CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set</div><div class='add'>+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0</div><div class='add'>+CONFIG_SCHED_DEBUG=y</div><div class='add'>+# CONFIG_SCHEDSTATS is not set</div><div class='add'>+# CONFIG_TIMER_STATS is not set</div><div class='add'>+# CONFIG_DEBUG_OBJECTS is not set</div><div class='add'>+# CONFIG_DEBUG_SLAB is not set</div><div class='add'>+# CONFIG_DEBUG_RT_MUTEXES is not set</div><div class='add'>+# CONFIG_RT_MUTEX_TESTER is not set</div><div class='add'>+# CONFIG_DEBUG_SPINLOCK is not set</div><div class='add'>+CONFIG_DEBUG_MUTEXES=y</div><div class='add'>+# CONFIG_DEBUG_LOCK_ALLOC is not set</div><div class='add'>+# CONFIG_PROVE_LOCKING is not set</div><div class='add'>+# CONFIG_LOCK_STAT is not set</div><div class='add'>+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set</div><div class='add'>+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set</div><div class='add'>+# CONFIG_DEBUG_KOBJECT is not set</div><div class='add'>+# CONFIG_DEBUG_BUGVERBOSE is not set</div><div class='add'>+CONFIG_DEBUG_INFO=y</div><div class='add'>+# CONFIG_DEBUG_VM is not set</div><div class='add'>+# CONFIG_DEBUG_WRITECOUNT is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='add'>+# CONFIG_DEBUG_LIST is not set</div><div class='add'>+# CONFIG_DEBUG_SG is not set</div><div class='add'>+CONFIG_FRAME_POINTER=y</div><div class='add'>+# CONFIG_BOOT_PRINTK_DELAY is not set</div><div class='add'>+# CONFIG_RCU_TORTURE_TEST is not set</div><div class='add'>+# CONFIG_BACKTRACE_SELF_TEST is not set</div><div class='add'>+# CONFIG_FAULT_INJECTION is not set</div><div class='add'>+# CONFIG_LATENCYTOP is not set</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_IRQSOFF_TRACER is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='add'>+# CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='add'>+# CONFIG_KGDB is not set</div><div class='add'>+# CONFIG_DEBUG_USER is not set</div><div class='add'>+# CONFIG_DEBUG_ERRORS is not set</div><div class='add'>+# CONFIG_DEBUG_STACK_USAGE is not set</div><div class='add'>+CONFIG_DEBUG_LL=y</div><div class='add'>+# CONFIG_DEBUG_ICEDCC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Security options</div><div class='add'>+#</div><div class='add'>+# CONFIG_KEYS is not set</div><div class='add'>+# CONFIG_SECURITY is not set</div><div class='add'>+# CONFIG_SECURITY_FILE_CAPABILITIES is not set</div><div class='add'>+CONFIG_CRYPTO=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Crypto core or helper</div><div class='add'>+#</div><div class='add'>+CONFIG_CRYPTO_ALGAPI=y</div><div class='add'>+CONFIG_CRYPTO_BLKCIPHER=y</div><div class='add'>+CONFIG_CRYPTO_MANAGER=y</div><div class='add'>+# CONFIG_CRYPTO_GF128MUL is not set</div><div class='add'>+# CONFIG_CRYPTO_NULL is not set</div><div class='add'>+# CONFIG_CRYPTO_CRYPTD is not set</div><div class='add'>+# CONFIG_CRYPTO_AUTHENC is not set</div><div class='add'>+# CONFIG_CRYPTO_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Authenticated Encryption with Associated Data</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CCM is not set</div><div class='add'>+# CONFIG_CRYPTO_GCM is not set</div><div class='add'>+# CONFIG_CRYPTO_SEQIV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block modes</div><div class='add'>+#</div><div class='add'>+CONFIG_CRYPTO_CBC=y</div><div class='add'>+# CONFIG_CRYPTO_CTR is not set</div><div class='add'>+# CONFIG_CRYPTO_CTS is not set</div><div class='add'>+CONFIG_CRYPTO_ECB=m</div><div class='add'>+# CONFIG_CRYPTO_LRW is not set</div><div class='add'>+CONFIG_CRYPTO_PCBC=m</div><div class='add'>+# CONFIG_CRYPTO_XTS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hash modes</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_HMAC is not set</div><div class='add'>+# CONFIG_CRYPTO_XCBC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Digest</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CRC32C is not set</div><div class='add'>+# CONFIG_CRYPTO_MD4 is not set</div><div class='add'>+CONFIG_CRYPTO_MD5=y</div><div class='add'>+# CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='add'>+# CONFIG_CRYPTO_SHA1 is not set</div><div class='add'>+# CONFIG_CRYPTO_SHA256 is not set</div><div class='add'>+# CONFIG_CRYPTO_SHA512 is not set</div><div class='add'>+# CONFIG_CRYPTO_TGR192 is not set</div><div class='add'>+# CONFIG_CRYPTO_WP512 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ciphers</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_AES is not set</div><div class='add'>+# CONFIG_CRYPTO_ANUBIS is not set</div><div class='add'>+# CONFIG_CRYPTO_ARC4 is not set</div><div class='add'>+# CONFIG_CRYPTO_BLOWFISH is not set</div><div class='add'>+# CONFIG_CRYPTO_CAMELLIA is not set</div><div class='add'>+# CONFIG_CRYPTO_CAST5 is not set</div><div class='add'>+# CONFIG_CRYPTO_CAST6 is not set</div><div class='add'>+CONFIG_CRYPTO_DES=y</div><div class='add'>+# CONFIG_CRYPTO_FCRYPT is not set</div><div class='add'>+# CONFIG_CRYPTO_KHAZAD is not set</div><div class='add'>+# CONFIG_CRYPTO_SALSA20 is not set</div><div class='add'>+# CONFIG_CRYPTO_SEED is not set</div><div class='add'>+# CONFIG_CRYPTO_SERPENT is not set</div><div class='add'>+# CONFIG_CRYPTO_TEA is not set</div><div class='add'>+# CONFIG_CRYPTO_TWOFISH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Compression</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_DEFLATE is not set</div><div class='add'>+# CONFIG_CRYPTO_LZO is not set</div><div class='add'>+CONFIG_CRYPTO_HW=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Library routines</div><div class='add'>+#</div><div class='add'>+CONFIG_BITREVERSE=y</div><div class='add'>+# CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='add'>+# CONFIG_GENERIC_FIND_NEXT_BIT is not set</div><div class='add'>+CONFIG_CRC_CCITT=y</div><div class='add'>+# CONFIG_CRC16 is not set</div><div class='add'>+CONFIG_CRC_T10DIF=y</div><div class='add'>+# CONFIG_CRC_ITU_T is not set</div><div class='add'>+CONFIG_CRC32=y</div><div class='add'>+# CONFIG_CRC7 is not set</div><div class='add'>+CONFIG_LIBCRC32C=y</div><div class='add'>+CONFIG_PLIST=y</div><div class='add'>+CONFIG_HAS_IOMEM=y</div><div class='add'>+CONFIG_HAS_IOPORT=y</div><div class='add'>+CONFIG_HAS_DMA=y</div><div class='head'>diff --git a/arch/arm/configs/orion5x_defconfig b/arch/arm/configs/orion5x_defconfig<br/>index 4017d83c9d2d..b2456ca544c9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/configs/orion5x_defconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/configs/orion5x_defconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/configs/orion5x_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/configs/orion5x_defconfig</a></div><div class='hunk'>@@ -176,14 +176,17 @@ CONFIG_MACH_KUROBOX_PRO=y</div><div class='ctx'> CONFIG_MACH_DNS323=y</div><div class='ctx'> CONFIG_MACH_TS209=y</div><div class='ctx'> CONFIG_MACH_LINKSTATION_PRO=y</div><div class='add'>+CONFIG_MACH_LINKSTATION_MINI=y</div><div class='ctx'> CONFIG_MACH_TS409=y</div><div class='ctx'> CONFIG_MACH_WRT350N_V2=y</div><div class='ctx'> CONFIG_MACH_TS78XX=y</div><div class='ctx'> CONFIG_MACH_MV2120=y</div><div class='add'>+CONFIG_MACH_EDMINI_V2=y</div><div class='ctx'> CONFIG_MACH_MSS2=y</div><div class='ctx'> CONFIG_MACH_WNR854T=y</div><div class='ctx'> CONFIG_MACH_RD88F5181L_GE=y</div><div class='ctx'> CONFIG_MACH_RD88F5181L_FXO=y</div><div class='add'>+CONFIG_MACH_RD88F6183AP_GE=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Boot options</div><div class='head'>diff --git a/arch/arm/configs/overo_defconfig b/arch/arm/configs/overo_defconfig<br/>new file mode 100644<br/>index 000000000000..49200967a153<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/configs/overo_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/configs/overo_defconfig</a></div><div class='hunk'>@@ -0,0 +1,1885 @@</div><div class='add'>+#</div><div class='add'>+# Automatically generated make config: don't edit</div><div class='add'>+# Linux kernel version: 2.6.27-rc8</div><div class='add'>+# Fri Oct  3 11:50:34 2008</div><div class='add'>+#</div><div class='add'>+CONFIG_ARM=y</div><div class='add'>+CONFIG_SYS_SUPPORTS_APM_EMULATION=y</div><div class='add'>+CONFIG_GENERIC_GPIO=y</div><div class='add'>+CONFIG_GENERIC_TIME=y</div><div class='add'>+CONFIG_GENERIC_CLOCKEVENTS=y</div><div class='add'>+CONFIG_MMU=y</div><div class='add'>+# CONFIG_NO_IOPORT is not set</div><div class='add'>+CONFIG_GENERIC_HARDIRQS=y</div><div class='add'>+CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='add'>+CONFIG_LOCKDEP_SUPPORT=y</div><div class='add'>+CONFIG_TRACE_IRQFLAGS_SUPPORT=y</div><div class='add'>+CONFIG_HARDIRQS_SW_RESEND=y</div><div class='add'>+CONFIG_GENERIC_IRQ_PROBE=y</div><div class='add'>+CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='add'>+# CONFIG_ARCH_HAS_ILOG2_U32 is not set</div><div class='add'>+# CONFIG_ARCH_HAS_ILOG2_U64 is not set</div><div class='add'>+CONFIG_GENERIC_HWEIGHT=y</div><div class='add'>+CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_ARCH_SUPPORTS_AOUT=y</div><div class='add'>+CONFIG_ZONE_DMA=y</div><div class='add'>+CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y</div><div class='add'>+CONFIG_OPROFILE_ARMV7=y</div><div class='add'>+CONFIG_VECTORS_BASE=0xffff0000</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# General setup</div><div class='add'>+#</div><div class='add'>+CONFIG_EXPERIMENTAL=y</div><div class='add'>+CONFIG_BROKEN_ON_SMP=y</div><div class='add'>+CONFIG_INIT_ENV_ARG_LIMIT=32</div><div class='add'>+CONFIG_LOCALVERSION=""</div><div class='add'>+CONFIG_LOCALVERSION_AUTO=y</div><div class='add'>+CONFIG_SWAP=y</div><div class='add'>+CONFIG_SYSVIPC=y</div><div class='add'>+CONFIG_SYSVIPC_SYSCTL=y</div><div class='add'>+# CONFIG_POSIX_MQUEUE is not set</div><div class='add'>+CONFIG_BSD_PROCESS_ACCT=y</div><div class='add'>+# CONFIG_BSD_PROCESS_ACCT_V3 is not set</div><div class='add'>+# CONFIG_TASKSTATS is not set</div><div class='add'>+# CONFIG_AUDIT is not set</div><div class='add'>+CONFIG_IKCONFIG=y</div><div class='add'>+CONFIG_IKCONFIG_PROC=y</div><div class='add'>+CONFIG_LOG_BUF_SHIFT=14</div><div class='add'>+# CONFIG_CGROUPS is not set</div><div class='add'>+CONFIG_GROUP_SCHED=y</div><div class='add'>+CONFIG_FAIR_GROUP_SCHED=y</div><div class='add'>+# CONFIG_RT_GROUP_SCHED is not set</div><div class='add'>+CONFIG_USER_SCHED=y</div><div class='add'>+# CONFIG_CGROUP_SCHED is not set</div><div class='add'>+CONFIG_SYSFS_DEPRECATED=y</div><div class='add'>+CONFIG_SYSFS_DEPRECATED_V2=y</div><div class='add'>+# CONFIG_RELAY is not set</div><div class='add'>+# CONFIG_NAMESPACES is not set</div><div class='add'>+CONFIG_BLK_DEV_INITRD=y</div><div class='add'>+CONFIG_INITRAMFS_SOURCE=""</div><div class='add'>+CONFIG_CC_OPTIMIZE_FOR_SIZE=y</div><div class='add'>+CONFIG_SYSCTL=y</div><div class='add'>+CONFIG_EMBEDDED=y</div><div class='add'>+CONFIG_UID16=y</div><div class='add'>+# CONFIG_SYSCTL_SYSCALL is not set</div><div class='add'>+CONFIG_KALLSYMS=y</div><div class='add'>+# CONFIG_KALLSYMS_ALL is not set</div><div class='add'>+# CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='add'>+CONFIG_HOTPLUG=y</div><div class='add'>+CONFIG_PRINTK=y</div><div class='add'>+CONFIG_BUG=y</div><div class='add'>+# CONFIG_ELF_CORE is not set</div><div class='add'>+# CONFIG_COMPAT_BRK is not set</div><div class='add'>+CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_FUTEX=y</div><div class='add'>+CONFIG_ANON_INODES=y</div><div class='add'>+CONFIG_EPOLL=y</div><div class='add'>+CONFIG_SIGNALFD=y</div><div class='add'>+CONFIG_TIMERFD=y</div><div class='add'>+CONFIG_EVENTFD=y</div><div class='add'>+CONFIG_SHMEM=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='add'>+CONFIG_SLUB_DEBUG=y</div><div class='add'>+# CONFIG_SLAB is not set</div><div class='add'>+CONFIG_SLUB=y</div><div class='add'>+# CONFIG_SLOB is not set</div><div class='add'>+CONFIG_PROFILING=y</div><div class='add'>+# CONFIG_MARKERS is not set</div><div class='add'>+CONFIG_OPROFILE=y</div><div class='add'>+CONFIG_HAVE_OPROFILE=y</div><div class='add'>+# CONFIG_KPROBES is not set</div><div class='add'>+# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set</div><div class='add'>+# CONFIG_HAVE_IOREMAP_PROT is not set</div><div class='add'>+CONFIG_HAVE_KPROBES=y</div><div class='add'>+CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+# CONFIG_HAVE_ARCH_TRACEHOOK is not set</div><div class='add'>+# CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+CONFIG_HAVE_CLK=y</div><div class='add'>+CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+CONFIG_HAVE_GENERIC_DMA_COHERENT=y</div><div class='add'>+CONFIG_SLABINFO=y</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='add'>+# CONFIG_TINY_SHMEM is not set</div><div class='add'>+CONFIG_BASE_SMALL=0</div><div class='add'>+CONFIG_MODULES=y</div><div class='add'>+# CONFIG_MODULE_FORCE_LOAD is not set</div><div class='add'>+CONFIG_MODULE_UNLOAD=y</div><div class='add'>+CONFIG_MODULE_FORCE_UNLOAD=y</div><div class='add'>+CONFIG_MODVERSIONS=y</div><div class='add'>+CONFIG_MODULE_SRCVERSION_ALL=y</div><div class='add'>+CONFIG_KMOD=y</div><div class='add'>+CONFIG_BLOCK=y</div><div class='add'>+CONFIG_LBD=y</div><div class='add'>+# CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='add'>+CONFIG_LSF=y</div><div class='add'>+# CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IO Schedulers</div><div class='add'>+#</div><div class='add'>+CONFIG_IOSCHED_NOOP=y</div><div class='add'>+CONFIG_IOSCHED_AS=y</div><div class='add'>+CONFIG_IOSCHED_DEADLINE=y</div><div class='add'>+CONFIG_IOSCHED_CFQ=y</div><div class='add'>+# CONFIG_DEFAULT_AS is not set</div><div class='add'>+# CONFIG_DEFAULT_DEADLINE is not set</div><div class='add'>+CONFIG_DEFAULT_CFQ=y</div><div class='add'>+# CONFIG_DEFAULT_NOOP is not set</div><div class='add'>+CONFIG_DEFAULT_IOSCHED="cfq"</div><div class='add'>+CONFIG_CLASSIC_RCU=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# System Type</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARCH_AAEC2000 is not set</div><div class='add'>+# CONFIG_ARCH_INTEGRATOR is not set</div><div class='add'>+# CONFIG_ARCH_REALVIEW is not set</div><div class='add'>+# CONFIG_ARCH_VERSATILE is not set</div><div class='add'>+# CONFIG_ARCH_AT91 is not set</div><div class='add'>+# CONFIG_ARCH_CLPS7500 is not set</div><div class='add'>+# CONFIG_ARCH_CLPS711X is not set</div><div class='add'>+# CONFIG_ARCH_EBSA110 is not set</div><div class='add'>+# CONFIG_ARCH_EP93XX is not set</div><div class='add'>+# CONFIG_ARCH_FOOTBRIDGE is not set</div><div class='add'>+# CONFIG_ARCH_NETX is not set</div><div class='add'>+# CONFIG_ARCH_H720X is not set</div><div class='add'>+# CONFIG_ARCH_IMX is not set</div><div class='add'>+# CONFIG_ARCH_IOP13XX is not set</div><div class='add'>+# CONFIG_ARCH_IOP32X is not set</div><div class='add'>+# CONFIG_ARCH_IOP33X is not set</div><div class='add'>+# CONFIG_ARCH_IXP23XX is not set</div><div class='add'>+# CONFIG_ARCH_IXP2000 is not set</div><div class='add'>+# CONFIG_ARCH_IXP4XX is not set</div><div class='add'>+# CONFIG_ARCH_L7200 is not set</div><div class='add'>+# CONFIG_ARCH_KIRKWOOD is not set</div><div class='add'>+# CONFIG_ARCH_KS8695 is not set</div><div class='add'>+# CONFIG_ARCH_NS9XXX is not set</div><div class='add'>+# CONFIG_ARCH_LOKI is not set</div><div class='add'>+# CONFIG_ARCH_MV78XX0 is not set</div><div class='add'>+# CONFIG_ARCH_MXC is not set</div><div class='add'>+# CONFIG_ARCH_ORION5X is not set</div><div class='add'>+# CONFIG_ARCH_PNX4008 is not set</div><div class='add'>+# CONFIG_ARCH_PXA is not set</div><div class='add'>+# CONFIG_ARCH_RPC is not set</div><div class='add'>+# CONFIG_ARCH_SA1100 is not set</div><div class='add'>+# CONFIG_ARCH_S3C2410 is not set</div><div class='add'>+# CONFIG_ARCH_SHARK is not set</div><div class='add'>+# CONFIG_ARCH_LH7A40X is not set</div><div class='add'>+# CONFIG_ARCH_DAVINCI is not set</div><div class='add'>+CONFIG_ARCH_OMAP=y</div><div class='add'>+# CONFIG_ARCH_MSM7X00A is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# TI OMAP Implementations</div><div class='add'>+#</div><div class='add'>+CONFIG_ARCH_OMAP_OTG=y</div><div class='add'>+# CONFIG_ARCH_OMAP1 is not set</div><div class='add'>+# CONFIG_ARCH_OMAP2 is not set</div><div class='add'>+CONFIG_ARCH_OMAP3=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OMAP Feature Selections</div><div class='add'>+#</div><div class='add'>+# CONFIG_OMAP_DEBUG_POWERDOMAIN is not set</div><div class='add'>+# CONFIG_OMAP_DEBUG_CLOCKDOMAIN is not set</div><div class='add'>+# CONFIG_OMAP_RESET_CLOCKS is not set</div><div class='add'>+# CONFIG_OMAP_MUX is not set</div><div class='add'>+CONFIG_OMAP_MCBSP=y</div><div class='add'>+# CONFIG_OMAP_MPU_TIMER is not set</div><div class='add'>+CONFIG_OMAP_32K_TIMER=y</div><div class='add'>+CONFIG_OMAP_32K_TIMER_HZ=128</div><div class='add'>+CONFIG_OMAP_DM_TIMER=y</div><div class='add'>+# CONFIG_OMAP_LL_DEBUG_UART1 is not set</div><div class='add'>+# CONFIG_OMAP_LL_DEBUG_UART2 is not set</div><div class='add'>+CONFIG_OMAP_LL_DEBUG_UART3=y</div><div class='add'>+CONFIG_ARCH_OMAP34XX=y</div><div class='add'>+CONFIG_ARCH_OMAP3430=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OMAP Board Type</div><div class='add'>+#</div><div class='add'>+# CONFIG_MACH_OMAP3_BEAGLE is not set</div><div class='add'>+CONFIG_MACH_OVERO=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Boot options</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Power management</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Processor Type</div><div class='add'>+#</div><div class='add'>+CONFIG_CPU_32=y</div><div class='add'>+CONFIG_CPU_32v6K=y</div><div class='add'>+CONFIG_CPU_V7=y</div><div class='add'>+CONFIG_CPU_32v7=y</div><div class='add'>+CONFIG_CPU_ABRT_EV7=y</div><div class='add'>+CONFIG_CPU_PABRT_IFAR=y</div><div class='add'>+CONFIG_CPU_CACHE_V7=y</div><div class='add'>+CONFIG_CPU_CACHE_VIPT=y</div><div class='add'>+CONFIG_CPU_COPY_V6=y</div><div class='add'>+CONFIG_CPU_TLB_V7=y</div><div class='add'>+CONFIG_CPU_HAS_ASID=y</div><div class='add'>+CONFIG_CPU_CP15=y</div><div class='add'>+CONFIG_CPU_CP15_MMU=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Processor Features</div><div class='add'>+#</div><div class='add'>+CONFIG_ARM_THUMB=y</div><div class='add'>+CONFIG_ARM_THUMBEE=y</div><div class='add'>+# CONFIG_CPU_ICACHE_DISABLE is not set</div><div class='add'>+# CONFIG_CPU_DCACHE_DISABLE is not set</div><div class='add'>+# CONFIG_CPU_BPREDICT_DISABLE is not set</div><div class='add'>+CONFIG_HAS_TLS_REG=y</div><div class='add'>+# CONFIG_OUTER_CACHE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Bus support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PCI_SYSCALL is not set</div><div class='add'>+# CONFIG_ARCH_SUPPORTS_MSI is not set</div><div class='add'>+# CONFIG_PCCARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel Features</div><div class='add'>+#</div><div class='add'>+CONFIG_TICK_ONESHOT=y</div><div class='add'>+CONFIG_NO_HZ=y</div><div class='add'>+CONFIG_HIGH_RES_TIMERS=y</div><div class='add'>+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y</div><div class='add'>+CONFIG_VMSPLIT_3G=y</div><div class='add'>+# CONFIG_VMSPLIT_2G is not set</div><div class='add'>+# CONFIG_VMSPLIT_1G is not set</div><div class='add'>+CONFIG_PAGE_OFFSET=0xC0000000</div><div class='add'>+# CONFIG_PREEMPT is not set</div><div class='add'>+CONFIG_HZ=128</div><div class='add'>+CONFIG_AEABI=y</div><div class='add'>+# CONFIG_OABI_COMPAT is not set</div><div class='add'>+CONFIG_ARCH_FLATMEM_HAS_HOLES=y</div><div class='add'>+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set</div><div class='add'>+CONFIG_SELECT_MEMORY_MODEL=y</div><div class='add'>+CONFIG_FLATMEM_MANUAL=y</div><div class='add'>+# CONFIG_DISCONTIGMEM_MANUAL is not set</div><div class='add'>+# CONFIG_SPARSEMEM_MANUAL is not set</div><div class='add'>+CONFIG_FLATMEM=y</div><div class='add'>+CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='add'>+# CONFIG_SPARSEMEM_STATIC is not set</div><div class='add'>+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='add'>+CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='add'>+CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+CONFIG_ZONE_DMA_FLAG=1</div><div class='add'>+CONFIG_BOUNCE=y</div><div class='add'>+CONFIG_VIRT_TO_BUS=y</div><div class='add'>+CONFIG_LEDS=y</div><div class='add'>+CONFIG_ALIGNMENT_TRAP=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Boot options</div><div class='add'>+#</div><div class='add'>+CONFIG_ZBOOT_ROM_TEXT=0x0</div><div class='add'>+CONFIG_ZBOOT_ROM_BSS=0x0</div><div class='add'>+CONFIG_CMDLINE=" debug "</div><div class='add'>+# CONFIG_XIP_KERNEL is not set</div><div class='add'>+CONFIG_KEXEC=y</div><div class='add'>+CONFIG_ATAGS_PROC=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CPU Power Management</div><div class='add'>+#</div><div class='add'>+CONFIG_CPU_FREQ=y</div><div class='add'>+CONFIG_CPU_FREQ_TABLE=y</div><div class='add'>+# CONFIG_CPU_FREQ_DEBUG is not set</div><div class='add'>+CONFIG_CPU_FREQ_STAT=y</div><div class='add'>+CONFIG_CPU_FREQ_STAT_DETAILS=y</div><div class='add'>+CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y</div><div class='add'>+# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set</div><div class='add'>+# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set</div><div class='add'>+# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set</div><div class='add'>+# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set</div><div class='add'>+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y</div><div class='add'>+# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set</div><div class='add'>+CONFIG_CPU_FREQ_GOV_USERSPACE=y</div><div class='add'>+CONFIG_CPU_FREQ_GOV_ONDEMAND=y</div><div class='add'>+# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set</div><div class='add'>+# CONFIG_CPU_IDLE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Floating point emulation</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# At least one emulation must be selected</div><div class='add'>+#</div><div class='add'>+CONFIG_VFP=y</div><div class='add'>+CONFIG_VFPv3=y</div><div class='add'>+CONFIG_NEON=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Userspace binary formats</div><div class='add'>+#</div><div class='add'>+CONFIG_BINFMT_ELF=y</div><div class='add'>+CONFIG_BINFMT_AOUT=m</div><div class='add'>+CONFIG_BINFMT_MISC=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Power management options</div><div class='add'>+#</div><div class='add'>+# CONFIG_PM is not set</div><div class='add'>+CONFIG_ARCH_SUSPEND_POSSIBLE=y</div><div class='add'>+CONFIG_NET=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking options</div><div class='add'>+#</div><div class='add'>+CONFIG_PACKET=y</div><div class='add'>+CONFIG_PACKET_MMAP=y</div><div class='add'>+CONFIG_UNIX=y</div><div class='add'>+CONFIG_XFRM=y</div><div class='add'>+# CONFIG_XFRM_USER is not set</div><div class='add'>+# CONFIG_XFRM_SUB_POLICY is not set</div><div class='add'>+# CONFIG_XFRM_MIGRATE is not set</div><div class='add'>+# CONFIG_XFRM_STATISTICS is not set</div><div class='add'>+CONFIG_NET_KEY=y</div><div class='add'>+# CONFIG_NET_KEY_MIGRATE is not set</div><div class='add'>+CONFIG_INET=y</div><div class='add'>+# CONFIG_IP_MULTICAST is not set</div><div class='add'>+# CONFIG_IP_ADVANCED_ROUTER is not set</div><div class='add'>+CONFIG_IP_FIB_HASH=y</div><div class='add'>+CONFIG_IP_PNP=y</div><div class='add'>+CONFIG_IP_PNP_DHCP=y</div><div class='add'>+CONFIG_IP_PNP_BOOTP=y</div><div class='add'>+CONFIG_IP_PNP_RARP=y</div><div class='add'>+# CONFIG_NET_IPIP is not set</div><div class='add'>+# CONFIG_NET_IPGRE is not set</div><div class='add'>+# CONFIG_ARPD is not set</div><div class='add'>+# CONFIG_SYN_COOKIES is not set</div><div class='add'>+# CONFIG_INET_AH is not set</div><div class='add'>+# CONFIG_INET_ESP is not set</div><div class='add'>+# CONFIG_INET_IPCOMP is not set</div><div class='add'>+# CONFIG_INET_XFRM_TUNNEL is not set</div><div class='add'>+CONFIG_INET_TUNNEL=m</div><div class='add'>+CONFIG_INET_XFRM_MODE_TRANSPORT=y</div><div class='add'>+CONFIG_INET_XFRM_MODE_TUNNEL=y</div><div class='add'>+CONFIG_INET_XFRM_MODE_BEET=y</div><div class='add'>+# CONFIG_INET_LRO is not set</div><div class='add'>+CONFIG_INET_DIAG=y</div><div class='add'>+CONFIG_INET_TCP_DIAG=y</div><div class='add'>+# CONFIG_TCP_CONG_ADVANCED is not set</div><div class='add'>+CONFIG_TCP_CONG_CUBIC=y</div><div class='add'>+CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='add'>+# CONFIG_TCP_MD5SIG is not set</div><div class='add'>+CONFIG_IPV6=m</div><div class='add'>+# CONFIG_IPV6_PRIVACY is not set</div><div class='add'>+# CONFIG_IPV6_ROUTER_PREF is not set</div><div class='add'>+# CONFIG_IPV6_OPTIMISTIC_DAD is not set</div><div class='add'>+# CONFIG_INET6_AH is not set</div><div class='add'>+# CONFIG_INET6_ESP is not set</div><div class='add'>+# CONFIG_INET6_IPCOMP is not set</div><div class='add'>+# CONFIG_IPV6_MIP6 is not set</div><div class='add'>+# CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='add'>+# CONFIG_INET6_TUNNEL is not set</div><div class='add'>+CONFIG_INET6_XFRM_MODE_TRANSPORT=m</div><div class='add'>+CONFIG_INET6_XFRM_MODE_TUNNEL=m</div><div class='add'>+CONFIG_INET6_XFRM_MODE_BEET=m</div><div class='add'>+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set</div><div class='add'>+CONFIG_IPV6_SIT=m</div><div class='add'>+CONFIG_IPV6_NDISC_NODETYPE=y</div><div class='add'>+# CONFIG_IPV6_TUNNEL is not set</div><div class='add'>+# CONFIG_IPV6_MULTIPLE_TABLES is not set</div><div class='add'>+# CONFIG_IPV6_MROUTE is not set</div><div class='add'>+# CONFIG_NETWORK_SECMARK is not set</div><div class='add'>+# CONFIG_NETFILTER is not set</div><div class='add'>+# CONFIG_IP_DCCP is not set</div><div class='add'>+# CONFIG_IP_SCTP is not set</div><div class='add'>+# CONFIG_TIPC is not set</div><div class='add'>+# CONFIG_ATM is not set</div><div class='add'>+# CONFIG_BRIDGE is not set</div><div class='add'>+# CONFIG_VLAN_8021Q is not set</div><div class='add'>+# CONFIG_DECNET is not set</div><div class='add'>+# CONFIG_LLC2 is not set</div><div class='add'>+# CONFIG_IPX is not set</div><div class='add'>+# CONFIG_ATALK is not set</div><div class='add'>+# CONFIG_X25 is not set</div><div class='add'>+# CONFIG_LAPB is not set</div><div class='add'>+# CONFIG_ECONET is not set</div><div class='add'>+# CONFIG_WAN_ROUTER is not set</div><div class='add'>+# CONFIG_NET_SCHED is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network testing</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_PKTGEN is not set</div><div class='add'>+# CONFIG_HAMRADIO is not set</div><div class='add'>+# CONFIG_CAN is not set</div><div class='add'>+# CONFIG_IRDA is not set</div><div class='add'>+CONFIG_BT=y</div><div class='add'>+CONFIG_BT_L2CAP=y</div><div class='add'>+CONFIG_BT_SCO=y</div><div class='add'>+CONFIG_BT_RFCOMM=y</div><div class='add'>+CONFIG_BT_RFCOMM_TTY=y</div><div class='add'>+CONFIG_BT_BNEP=y</div><div class='add'>+CONFIG_BT_BNEP_MC_FILTER=y</div><div class='add'>+CONFIG_BT_BNEP_PROTO_FILTER=y</div><div class='add'>+CONFIG_BT_HIDP=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Bluetooth device drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_BT_HCIUSB=m</div><div class='add'>+CONFIG_BT_HCIUSB_SCO=y</div><div class='add'>+# CONFIG_BT_HCIBTUSB is not set</div><div class='add'>+# CONFIG_BT_HCIBTSDIO is not set</div><div class='add'>+CONFIG_BT_HCIUART=y</div><div class='add'>+CONFIG_BT_HCIUART_H4=y</div><div class='add'>+CONFIG_BT_HCIUART_BCSP=y</div><div class='add'>+# CONFIG_BT_HCIUART_LL is not set</div><div class='add'>+CONFIG_BT_HCIBCM203X=y</div><div class='add'>+CONFIG_BT_HCIBPA10X=y</div><div class='add'>+# CONFIG_BT_HCIBFUSB is not set</div><div class='add'>+# CONFIG_BT_HCIVHCI is not set</div><div class='add'>+# CONFIG_AF_RXRPC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless</div><div class='add'>+#</div><div class='add'>+CONFIG_CFG80211=y</div><div class='add'>+CONFIG_NL80211=y</div><div class='add'>+CONFIG_WIRELESS_EXT=y</div><div class='add'>+CONFIG_WIRELESS_EXT_SYSFS=y</div><div class='add'>+CONFIG_MAC80211=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Rate control algorithm selection</div><div class='add'>+#</div><div class='add'>+CONFIG_MAC80211_RC_PID=y</div><div class='add'>+CONFIG_MAC80211_RC_DEFAULT_PID=y</div><div class='add'>+CONFIG_MAC80211_RC_DEFAULT="pid"</div><div class='add'>+# CONFIG_MAC80211_MESH is not set</div><div class='add'>+CONFIG_MAC80211_LEDS=y</div><div class='add'>+# CONFIG_MAC80211_DEBUGFS is not set</div><div class='add'>+# CONFIG_MAC80211_DEBUG_MENU is not set</div><div class='add'>+CONFIG_IEEE80211=y</div><div class='add'>+# CONFIG_IEEE80211_DEBUG is not set</div><div class='add'>+CONFIG_IEEE80211_CRYPT_WEP=y</div><div class='add'>+CONFIG_IEEE80211_CRYPT_CCMP=y</div><div class='add'>+CONFIG_IEEE80211_CRYPT_TKIP=y</div><div class='add'>+# CONFIG_RFKILL is not set</div><div class='add'>+# CONFIG_NET_9P is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Device Drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Generic Driver Options</div><div class='add'>+#</div><div class='add'>+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='add'>+CONFIG_STANDALONE=y</div><div class='add'>+CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='add'>+CONFIG_FW_LOADER=y</div><div class='add'>+CONFIG_FIRMWARE_IN_KERNEL=y</div><div class='add'>+CONFIG_EXTRA_FIRMWARE=""</div><div class='add'>+# CONFIG_DEBUG_DRIVER is not set</div><div class='add'>+# CONFIG_DEBUG_DEVRES is not set</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='add'>+# CONFIG_CONNECTOR is not set</div><div class='add'>+CONFIG_MTD=y</div><div class='add'>+# CONFIG_MTD_DEBUG is not set</div><div class='add'>+CONFIG_MTD_CONCAT=y</div><div class='add'>+CONFIG_MTD_PARTITIONS=y</div><div class='add'>+# CONFIG_MTD_REDBOOT_PARTS is not set</div><div class='add'>+# CONFIG_MTD_CMDLINE_PARTS is not set</div><div class='add'>+# CONFIG_MTD_AFS_PARTS is not set</div><div class='add'>+# CONFIG_MTD_AR7_PARTS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# User Modules And Translation Layers</div><div class='add'>+#</div><div class='add'>+CONFIG_MTD_CHAR=y</div><div class='add'>+CONFIG_MTD_BLKDEVS=y</div><div class='add'>+CONFIG_MTD_BLOCK=y</div><div class='add'>+# CONFIG_FTL is not set</div><div class='add'>+# CONFIG_NFTL is not set</div><div class='add'>+# CONFIG_INFTL is not set</div><div class='add'>+# CONFIG_RFD_FTL is not set</div><div class='add'>+# CONFIG_SSFDC is not set</div><div class='add'>+# CONFIG_MTD_OOPS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# RAM/ROM/Flash chip drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_CFI is not set</div><div class='add'>+# CONFIG_MTD_JEDECPROBE is not set</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_1=y</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_2=y</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_4=y</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set</div><div class='add'>+CONFIG_MTD_CFI_I1=y</div><div class='add'>+CONFIG_MTD_CFI_I2=y</div><div class='add'>+# CONFIG_MTD_CFI_I4 is not set</div><div class='add'>+# CONFIG_MTD_CFI_I8 is not set</div><div class='add'>+# CONFIG_MTD_RAM is not set</div><div class='add'>+# CONFIG_MTD_ROM is not set</div><div class='add'>+# CONFIG_MTD_ABSENT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Mapping drivers for chip access</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_COMPLEX_MAPPINGS is not set</div><div class='add'>+# CONFIG_MTD_PLATRAM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Self-contained MTD device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_DATAFLASH is not set</div><div class='add'>+# CONFIG_MTD_M25P80 is not set</div><div class='add'>+# CONFIG_MTD_SLRAM is not set</div><div class='add'>+# CONFIG_MTD_PHRAM is not set</div><div class='add'>+# CONFIG_MTD_MTDRAM is not set</div><div class='add'>+# CONFIG_MTD_BLOCK2MTD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Disk-On-Chip Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_DOC2000 is not set</div><div class='add'>+# CONFIG_MTD_DOC2001 is not set</div><div class='add'>+# CONFIG_MTD_DOC2001PLUS is not set</div><div class='add'>+CONFIG_MTD_NAND=y</div><div class='add'>+# CONFIG_MTD_NAND_VERIFY_WRITE is not set</div><div class='add'>+# CONFIG_MTD_NAND_ECC_SMC is not set</div><div class='add'>+# CONFIG_MTD_NAND_MUSEUM_IDS is not set</div><div class='add'>+CONFIG_MTD_NAND_IDS=y</div><div class='add'>+# CONFIG_MTD_NAND_DISKONCHIP is not set</div><div class='add'>+# CONFIG_MTD_NAND_NANDSIM is not set</div><div class='add'>+# CONFIG_MTD_NAND_PLATFORM is not set</div><div class='add'>+# CONFIG_MTD_ALAUDA is not set</div><div class='add'>+# CONFIG_MTD_ONENAND is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# UBI - Unsorted block images</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_UBI is not set</div><div class='add'>+# CONFIG_PARPORT is not set</div><div class='add'>+CONFIG_BLK_DEV=y</div><div class='add'>+# CONFIG_BLK_DEV_COW_COMMON is not set</div><div class='add'>+CONFIG_BLK_DEV_LOOP=y</div><div class='add'>+CONFIG_BLK_DEV_CRYPTOLOOP=m</div><div class='add'>+# CONFIG_BLK_DEV_NBD is not set</div><div class='add'>+# CONFIG_BLK_DEV_UB is not set</div><div class='add'>+CONFIG_BLK_DEV_RAM=y</div><div class='add'>+CONFIG_BLK_DEV_RAM_COUNT=16</div><div class='add'>+CONFIG_BLK_DEV_RAM_SIZE=16384</div><div class='add'>+# CONFIG_BLK_DEV_XIP is not set</div><div class='add'>+CONFIG_CDROM_PKTCDVD=m</div><div class='add'>+CONFIG_CDROM_PKTCDVD_BUFFERS=8</div><div class='add'>+# CONFIG_CDROM_PKTCDVD_WCACHE is not set</div><div class='add'>+# CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+CONFIG_MISC_DEVICES=y</div><div class='add'>+CONFIG_EEPROM_93CX6=m</div><div class='add'>+# CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+CONFIG_HAVE_IDE=y</div><div class='add'>+# CONFIG_IDE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI device support</div><div class='add'>+#</div><div class='add'>+CONFIG_RAID_ATTRS=m</div><div class='add'>+CONFIG_SCSI=y</div><div class='add'>+CONFIG_SCSI_DMA=y</div><div class='add'>+# CONFIG_SCSI_TGT is not set</div><div class='add'>+# CONFIG_SCSI_NETLINK is not set</div><div class='add'>+CONFIG_SCSI_PROC_FS=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI support type (disk, tape, CD-ROM)</div><div class='add'>+#</div><div class='add'>+CONFIG_BLK_DEV_SD=y</div><div class='add'>+# CONFIG_CHR_DEV_ST is not set</div><div class='add'>+# CONFIG_CHR_DEV_OSST is not set</div><div class='add'>+# CONFIG_BLK_DEV_SR is not set</div><div class='add'>+CONFIG_CHR_DEV_SG=m</div><div class='add'>+# CONFIG_CHR_DEV_SCH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs</div><div class='add'>+#</div><div class='add'>+CONFIG_SCSI_MULTI_LUN=y</div><div class='add'>+# CONFIG_SCSI_CONSTANTS is not set</div><div class='add'>+# CONFIG_SCSI_LOGGING is not set</div><div class='add'>+# CONFIG_SCSI_SCAN_ASYNC is not set</div><div class='add'>+CONFIG_SCSI_WAIT_SCAN=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI Transports</div><div class='add'>+#</div><div class='add'>+# CONFIG_SCSI_SPI_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_FC_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_ISCSI_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_SAS_LIBSAS is not set</div><div class='add'>+# CONFIG_SCSI_SRP_ATTRS is not set</div><div class='add'>+CONFIG_SCSI_LOWLEVEL=y</div><div class='add'>+# CONFIG_ISCSI_TCP is not set</div><div class='add'>+# CONFIG_SCSI_DEBUG is not set</div><div class='add'>+# CONFIG_SCSI_DH is not set</div><div class='add'>+# CONFIG_ATA is not set</div><div class='add'>+CONFIG_MD=y</div><div class='add'>+CONFIG_BLK_DEV_MD=m</div><div class='add'>+CONFIG_MD_LINEAR=m</div><div class='add'>+CONFIG_MD_RAID0=m</div><div class='add'>+CONFIG_MD_RAID1=m</div><div class='add'>+CONFIG_MD_RAID10=m</div><div class='add'>+CONFIG_MD_RAID456=m</div><div class='add'>+CONFIG_MD_RAID5_RESHAPE=y</div><div class='add'>+CONFIG_MD_MULTIPATH=m</div><div class='add'>+CONFIG_MD_FAULTY=m</div><div class='add'>+CONFIG_BLK_DEV_DM=m</div><div class='add'>+# CONFIG_DM_DEBUG is not set</div><div class='add'>+CONFIG_DM_CRYPT=m</div><div class='add'>+CONFIG_DM_SNAPSHOT=m</div><div class='add'>+CONFIG_DM_MIRROR=m</div><div class='add'>+CONFIG_DM_ZERO=m</div><div class='add'>+CONFIG_DM_MULTIPATH=m</div><div class='add'>+CONFIG_DM_DELAY=m</div><div class='add'>+# CONFIG_DM_UEVENT is not set</div><div class='add'>+CONFIG_NETDEVICES=y</div><div class='add'>+CONFIG_DUMMY=m</div><div class='add'>+# CONFIG_BONDING is not set</div><div class='add'>+# CONFIG_MACVLAN is not set</div><div class='add'>+# CONFIG_EQUALIZER is not set</div><div class='add'>+CONFIG_TUN=m</div><div class='add'>+# CONFIG_VETH is not set</div><div class='add'>+# CONFIG_NET_ETHERNET is not set</div><div class='add'>+CONFIG_MII=y</div><div class='add'>+# CONFIG_NETDEV_1000 is not set</div><div class='add'>+# CONFIG_NETDEV_10000 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless LAN</div><div class='add'>+#</div><div class='add'>+# CONFIG_WLAN_PRE80211 is not set</div><div class='add'>+CONFIG_WLAN_80211=y</div><div class='add'>+CONFIG_LIBERTAS=y</div><div class='add'>+CONFIG_LIBERTAS_USB=y</div><div class='add'>+CONFIG_LIBERTAS_SDIO=y</div><div class='add'>+CONFIG_LIBERTAS_DEBUG=y</div><div class='add'>+CONFIG_USB_ZD1201=m</div><div class='add'>+# CONFIG_USB_NET_RNDIS_WLAN is not set</div><div class='add'>+CONFIG_RTL8187=m</div><div class='add'>+# CONFIG_MAC80211_HWSIM is not set</div><div class='add'>+CONFIG_P54_COMMON=m</div><div class='add'>+CONFIG_P54_USB=m</div><div class='add'>+# CONFIG_IWLWIFI_LEDS is not set</div><div class='add'>+CONFIG_HOSTAP=m</div><div class='add'>+CONFIG_HOSTAP_FIRMWARE=y</div><div class='add'>+CONFIG_HOSTAP_FIRMWARE_NVRAM=y</div><div class='add'>+# CONFIG_B43 is not set</div><div class='add'>+# CONFIG_B43LEGACY is not set</div><div class='add'>+# CONFIG_ZD1211RW is not set</div><div class='add'>+# CONFIG_RT2X00 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Network Adapters</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_CATC=m</div><div class='add'>+CONFIG_USB_KAWETH=m</div><div class='add'>+CONFIG_USB_PEGASUS=m</div><div class='add'>+CONFIG_USB_RTL8150=m</div><div class='add'>+CONFIG_USB_USBNET=y</div><div class='add'>+CONFIG_USB_NET_AX8817X=y</div><div class='add'>+CONFIG_USB_NET_CDCETHER=y</div><div class='add'>+CONFIG_USB_NET_DM9601=m</div><div class='add'>+CONFIG_USB_NET_GL620A=m</div><div class='add'>+CONFIG_USB_NET_NET1080=m</div><div class='add'>+CONFIG_USB_NET_PLUSB=m</div><div class='add'>+CONFIG_USB_NET_MCS7830=m</div><div class='add'>+CONFIG_USB_NET_RNDIS_HOST=m</div><div class='add'>+CONFIG_USB_NET_CDC_SUBSET=m</div><div class='add'>+CONFIG_USB_ALI_M5632=y</div><div class='add'>+CONFIG_USB_AN2720=y</div><div class='add'>+CONFIG_USB_BELKIN=y</div><div class='add'>+CONFIG_USB_ARMLINUX=y</div><div class='add'>+CONFIG_USB_EPSON2888=y</div><div class='add'>+CONFIG_USB_KC2190=y</div><div class='add'>+CONFIG_USB_NET_ZAURUS=m</div><div class='add'>+# CONFIG_WAN is not set</div><div class='add'>+CONFIG_PPP=m</div><div class='add'>+# CONFIG_PPP_MULTILINK is not set</div><div class='add'>+# CONFIG_PPP_FILTER is not set</div><div class='add'>+CONFIG_PPP_ASYNC=m</div><div class='add'>+CONFIG_PPP_SYNC_TTY=m</div><div class='add'>+CONFIG_PPP_DEFLATE=m</div><div class='add'>+CONFIG_PPP_BSDCOMP=m</div><div class='add'>+CONFIG_PPP_MPPE=m</div><div class='add'>+CONFIG_PPPOE=m</div><div class='add'>+# CONFIG_PPPOL2TP is not set</div><div class='add'>+# CONFIG_SLIP is not set</div><div class='add'>+CONFIG_SLHC=m</div><div class='add'>+# CONFIG_NETCONSOLE is not set</div><div class='add'>+# CONFIG_NETPOLL is not set</div><div class='add'>+# CONFIG_NET_POLL_CONTROLLER is not set</div><div class='add'>+# CONFIG_ISDN is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input device support</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT=y</div><div class='add'>+# CONFIG_INPUT_FF_MEMLESS is not set</div><div class='add'>+# CONFIG_INPUT_POLLDEV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Userland interfaces</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT_MOUSEDEV=y</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_PSAUX=y</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768</div><div class='add'>+# CONFIG_INPUT_JOYDEV is not set</div><div class='add'>+CONFIG_INPUT_EVDEV=y</div><div class='add'>+# CONFIG_INPUT_EVBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input Device Drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT_KEYBOARD=y</div><div class='add'>+# CONFIG_KEYBOARD_ATKBD is not set</div><div class='add'>+# CONFIG_KEYBOARD_SUNKBD is not set</div><div class='add'>+# CONFIG_KEYBOARD_LKKBD is not set</div><div class='add'>+# CONFIG_KEYBOARD_XTKBD is not set</div><div class='add'>+# CONFIG_KEYBOARD_NEWTON is not set</div><div class='add'>+# CONFIG_KEYBOARD_STOWAWAY is not set</div><div class='add'>+# CONFIG_KEYBOARD_GPIO is not set</div><div class='add'>+CONFIG_INPUT_MOUSE=y</div><div class='add'>+CONFIG_MOUSE_PS2=y</div><div class='add'>+CONFIG_MOUSE_PS2_ALPS=y</div><div class='add'>+CONFIG_MOUSE_PS2_LOGIPS2PP=y</div><div class='add'>+CONFIG_MOUSE_PS2_SYNAPTICS=y</div><div class='add'>+CONFIG_MOUSE_PS2_LIFEBOOK=y</div><div class='add'>+CONFIG_MOUSE_PS2_TRACKPOINT=y</div><div class='add'>+# CONFIG_MOUSE_PS2_TOUCHKIT is not set</div><div class='add'>+# CONFIG_MOUSE_SERIAL is not set</div><div class='add'>+# CONFIG_MOUSE_APPLETOUCH is not set</div><div class='add'>+# CONFIG_MOUSE_BCM5974 is not set</div><div class='add'>+# CONFIG_MOUSE_VSXXXAA is not set</div><div class='add'>+# CONFIG_MOUSE_GPIO is not set</div><div class='add'>+# CONFIG_INPUT_JOYSTICK is not set</div><div class='add'>+# CONFIG_INPUT_TABLET is not set</div><div class='add'>+# CONFIG_INPUT_TOUCHSCREEN is not set</div><div class='add'>+# CONFIG_INPUT_MISC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware I/O ports</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIO=y</div><div class='add'>+CONFIG_SERIO_SERPORT=y</div><div class='add'>+CONFIG_SERIO_LIBPS2=y</div><div class='add'>+# CONFIG_SERIO_RAW is not set</div><div class='add'>+# CONFIG_GAMEPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Character devices</div><div class='add'>+#</div><div class='add'>+CONFIG_VT=y</div><div class='add'>+CONFIG_CONSOLE_TRANSLATIONS=y</div><div class='add'>+CONFIG_VT_CONSOLE=y</div><div class='add'>+CONFIG_HW_CONSOLE=y</div><div class='add'>+CONFIG_VT_HW_CONSOLE_BINDING=y</div><div class='add'>+CONFIG_DEVKMEM=y</div><div class='add'>+# CONFIG_SERIAL_NONSTANDARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Serial drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIAL_8250=y</div><div class='add'>+CONFIG_SERIAL_8250_CONSOLE=y</div><div class='add'>+CONFIG_SERIAL_8250_NR_UARTS=32</div><div class='add'>+CONFIG_SERIAL_8250_RUNTIME_UARTS=4</div><div class='add'>+CONFIG_SERIAL_8250_EXTENDED=y</div><div class='add'>+CONFIG_SERIAL_8250_MANY_PORTS=y</div><div class='add'>+CONFIG_SERIAL_8250_SHARE_IRQ=y</div><div class='add'>+CONFIG_SERIAL_8250_DETECT_IRQ=y</div><div class='add'>+CONFIG_SERIAL_8250_RSA=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Non-8250 serial port support</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIAL_CORE=y</div><div class='add'>+CONFIG_SERIAL_CORE_CONSOLE=y</div><div class='add'>+CONFIG_UNIX98_PTYS=y</div><div class='add'>+# CONFIG_LEGACY_PTYS is not set</div><div class='add'>+# CONFIG_IPMI_HANDLER is not set</div><div class='add'>+CONFIG_HW_RANDOM=y</div><div class='add'>+# CONFIG_NVRAM is not set</div><div class='add'>+# CONFIG_R3964 is not set</div><div class='add'>+# CONFIG_RAW_DRIVER is not set</div><div class='add'>+# CONFIG_TCG_TPM is not set</div><div class='add'>+CONFIG_I2C=y</div><div class='add'>+CONFIG_I2C_BOARDINFO=y</div><div class='add'>+CONFIG_I2C_CHARDEV=y</div><div class='add'>+CONFIG_I2C_HELPER_AUTO=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C Hardware Bus support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C system bus drivers (mostly embedded / system-on-chip)</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_GPIO is not set</div><div class='add'>+# CONFIG_I2C_OCORES is not set</div><div class='add'>+CONFIG_I2C_OMAP=y</div><div class='add'>+# CONFIG_I2C_SIMTEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# External I2C/SMBus adapter drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='add'>+# CONFIG_I2C_TAOS_EVM is not set</div><div class='add'>+# CONFIG_I2C_TINY_USB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Other I2C/SMBus bus drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_PCA_PLATFORM is not set</div><div class='add'>+# CONFIG_I2C_STUB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous I2C Chip support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DS1682 is not set</div><div class='add'>+# CONFIG_AT24 is not set</div><div class='add'>+CONFIG_SENSORS_EEPROM=y</div><div class='add'>+# CONFIG_SENSORS_PCF8574 is not set</div><div class='add'>+# CONFIG_PCF8575 is not set</div><div class='add'>+# CONFIG_SENSORS_PCA9539 is not set</div><div class='add'>+# CONFIG_SENSORS_PCF8591 is not set</div><div class='add'>+# CONFIG_ISP1301_OMAP is not set</div><div class='add'>+# CONFIG_TPS65010 is not set</div><div class='add'>+# CONFIG_SENSORS_MAX6875 is not set</div><div class='add'>+# CONFIG_SENSORS_TSL2550 is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_CORE is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_ALGO is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_BUS is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_CHIP is not set</div><div class='add'>+CONFIG_SPI=y</div><div class='add'>+# CONFIG_SPI_DEBUG is not set</div><div class='add'>+CONFIG_SPI_MASTER=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI Master Controller Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_SPI_BITBANG is not set</div><div class='add'>+CONFIG_SPI_OMAP24XX=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI Protocol Masters</div><div class='add'>+#</div><div class='add'>+# CONFIG_SPI_AT25 is not set</div><div class='add'>+# CONFIG_SPI_SPIDEV is not set</div><div class='add'>+# CONFIG_SPI_TLE62X0 is not set</div><div class='add'>+CONFIG_ARCH_REQUIRE_GPIOLIB=y</div><div class='add'>+CONFIG_GPIOLIB=y</div><div class='add'>+CONFIG_DEBUG_GPIO=y</div><div class='add'>+CONFIG_GPIO_SYSFS=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C GPIO expanders:</div><div class='add'>+#</div><div class='add'>+# CONFIG_GPIO_MAX732X is not set</div><div class='add'>+# CONFIG_GPIO_PCA953X is not set</div><div class='add'>+# CONFIG_GPIO_PCF857X is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCI GPIO expanders:</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI GPIO expanders:</div><div class='add'>+#</div><div class='add'>+# CONFIG_GPIO_MAX7301 is not set</div><div class='add'>+# CONFIG_GPIO_MCP23S08 is not set</div><div class='add'>+# CONFIG_W1 is not set</div><div class='add'>+CONFIG_POWER_SUPPLY=m</div><div class='add'>+# CONFIG_POWER_SUPPLY_DEBUG is not set</div><div class='add'>+# CONFIG_PDA_POWER is not set</div><div class='add'>+# CONFIG_BATTERY_DS2760 is not set</div><div class='add'>+CONFIG_HWMON=y</div><div class='add'>+# CONFIG_HWMON_VID is not set</div><div class='add'>+# CONFIG_SENSORS_AD7414 is not set</div><div class='add'>+# CONFIG_SENSORS_AD7418 is not set</div><div class='add'>+# CONFIG_SENSORS_ADCXX is not set</div><div class='add'>+# CONFIG_SENSORS_ADM1021 is not set</div><div class='add'>+# CONFIG_SENSORS_ADM1025 is not set</div><div class='add'>+# CONFIG_SENSORS_ADM1026 is not set</div><div class='add'>+# CONFIG_SENSORS_ADM1029 is not set</div><div class='add'>+# CONFIG_SENSORS_ADM1031 is not set</div><div class='add'>+# CONFIG_SENSORS_ADM9240 is not set</div><div class='add'>+# CONFIG_SENSORS_ADT7470 is not set</div><div class='add'>+# CONFIG_SENSORS_ADT7473 is not set</div><div class='add'>+# CONFIG_SENSORS_ATXP1 is not set</div><div class='add'>+# CONFIG_SENSORS_DS1621 is not set</div><div class='add'>+# CONFIG_SENSORS_F71805F is not set</div><div class='add'>+# CONFIG_SENSORS_F71882FG is not set</div><div class='add'>+# CONFIG_SENSORS_F75375S is not set</div><div class='add'>+# CONFIG_SENSORS_GL518SM is not set</div><div class='add'>+# CONFIG_SENSORS_GL520SM is not set</div><div class='add'>+# CONFIG_SENSORS_IT87 is not set</div><div class='add'>+# CONFIG_SENSORS_LM63 is not set</div><div class='add'>+# CONFIG_SENSORS_LM70 is not set</div><div class='add'>+# CONFIG_SENSORS_LM75 is not set</div><div class='add'>+# CONFIG_SENSORS_LM77 is not set</div><div class='add'>+# CONFIG_SENSORS_LM78 is not set</div><div class='add'>+# CONFIG_SENSORS_LM80 is not set</div><div class='add'>+# CONFIG_SENSORS_LM83 is not set</div><div class='add'>+# CONFIG_SENSORS_LM85 is not set</div><div class='add'>+# CONFIG_SENSORS_LM87 is not set</div><div class='add'>+# CONFIG_SENSORS_LM90 is not set</div><div class='add'>+# CONFIG_SENSORS_LM92 is not set</div><div class='add'>+# CONFIG_SENSORS_LM93 is not set</div><div class='add'>+# CONFIG_SENSORS_MAX1111 is not set</div><div class='add'>+# CONFIG_SENSORS_MAX1619 is not set</div><div class='add'>+# CONFIG_SENSORS_MAX6650 is not set</div><div class='add'>+# CONFIG_SENSORS_PC87360 is not set</div><div class='add'>+# CONFIG_SENSORS_PC87427 is not set</div><div class='add'>+# CONFIG_SENSORS_DME1737 is not set</div><div class='add'>+# CONFIG_SENSORS_SMSC47M1 is not set</div><div class='add'>+# CONFIG_SENSORS_SMSC47M192 is not set</div><div class='add'>+# CONFIG_SENSORS_SMSC47B397 is not set</div><div class='add'>+# CONFIG_SENSORS_ADS7828 is not set</div><div class='add'>+# CONFIG_SENSORS_THMC50 is not set</div><div class='add'>+# CONFIG_SENSORS_VT1211 is not set</div><div class='add'>+# CONFIG_SENSORS_W83781D is not set</div><div class='add'>+# CONFIG_SENSORS_W83791D is not set</div><div class='add'>+# CONFIG_SENSORS_W83792D is not set</div><div class='add'>+# CONFIG_SENSORS_W83793 is not set</div><div class='add'>+# CONFIG_SENSORS_W83L785TS is not set</div><div class='add'>+# CONFIG_SENSORS_W83L786NG is not set</div><div class='add'>+# CONFIG_SENSORS_W83627HF is not set</div><div class='add'>+# CONFIG_SENSORS_W83627EHF is not set</div><div class='add'>+# CONFIG_HWMON_DEBUG_CHIP is not set</div><div class='add'>+# CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='add'>+CONFIG_WATCHDOG=y</div><div class='add'>+CONFIG_WATCHDOG_NOWAYOUT=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Watchdog Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_SOFT_WATCHDOG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB-based Watchdog Cards</div><div class='add'>+#</div><div class='add'>+# CONFIG_USBPCWATCHDOG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Sonics Silicon Backplane</div><div class='add'>+#</div><div class='add'>+CONFIG_SSB_POSSIBLE=y</div><div class='add'>+# CONFIG_SSB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multifunction device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='add'>+# CONFIG_MFD_SM501 is not set</div><div class='add'>+# CONFIG_HTC_EGPIO is not set</div><div class='add'>+# CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_UCB1400_CORE is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='add'>+# CONFIG_MFD_T7L66XB is not set</div><div class='add'>+# CONFIG_MFD_TC6387XB is not set</div><div class='add'>+# CONFIG_MFD_TC6393XB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia core support</div><div class='add'>+#</div><div class='add'>+CONFIG_VIDEO_DEV=m</div><div class='add'>+CONFIG_VIDEO_V4L2_COMMON=m</div><div class='add'>+CONFIG_VIDEO_ALLOW_V4L1=y</div><div class='add'>+CONFIG_VIDEO_V4L1_COMPAT=y</div><div class='add'>+CONFIG_DVB_CORE=m</div><div class='add'>+CONFIG_VIDEO_MEDIA=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_MEDIA_ATTACH=y</div><div class='add'>+CONFIG_MEDIA_TUNER=m</div><div class='add'>+# CONFIG_MEDIA_TUNER_CUSTOMIZE is not set</div><div class='add'>+CONFIG_MEDIA_TUNER_SIMPLE=m</div><div class='add'>+CONFIG_MEDIA_TUNER_TDA8290=m</div><div class='add'>+CONFIG_MEDIA_TUNER_TDA827X=m</div><div class='add'>+CONFIG_MEDIA_TUNER_TDA18271=m</div><div class='add'>+CONFIG_MEDIA_TUNER_TDA9887=m</div><div class='add'>+CONFIG_MEDIA_TUNER_TEA5761=m</div><div class='add'>+CONFIG_MEDIA_TUNER_TEA5767=m</div><div class='add'>+CONFIG_MEDIA_TUNER_MT20XX=m</div><div class='add'>+CONFIG_MEDIA_TUNER_MT2060=m</div><div class='add'>+CONFIG_MEDIA_TUNER_MT2266=m</div><div class='add'>+CONFIG_MEDIA_TUNER_QT1010=m</div><div class='add'>+CONFIG_MEDIA_TUNER_XC2028=m</div><div class='add'>+CONFIG_MEDIA_TUNER_XC5000=m</div><div class='add'>+CONFIG_MEDIA_TUNER_MXL5005S=m</div><div class='add'>+CONFIG_VIDEO_V4L2=m</div><div class='add'>+CONFIG_VIDEO_V4L1=m</div><div class='add'>+CONFIG_VIDEO_TVEEPROM=m</div><div class='add'>+CONFIG_VIDEO_TUNER=m</div><div class='add'>+CONFIG_VIDEO_CAPTURE_DRIVERS=y</div><div class='add'>+# CONFIG_VIDEO_ADV_DEBUG is not set</div><div class='add'>+CONFIG_VIDEO_HELPER_CHIPS_AUTO=y</div><div class='add'>+CONFIG_VIDEO_MSP3400=m</div><div class='add'>+CONFIG_VIDEO_CS53L32A=m</div><div class='add'>+CONFIG_VIDEO_WM8775=m</div><div class='add'>+CONFIG_VIDEO_SAA711X=m</div><div class='add'>+CONFIG_VIDEO_CX25840=m</div><div class='add'>+CONFIG_VIDEO_CX2341X=m</div><div class='add'>+# CONFIG_VIDEO_VIVI is not set</div><div class='add'>+# CONFIG_VIDEO_CPIA is not set</div><div class='add'>+# CONFIG_VIDEO_CPIA2 is not set</div><div class='add'>+# CONFIG_VIDEO_SAA5246A is not set</div><div class='add'>+# CONFIG_VIDEO_SAA5249 is not set</div><div class='add'>+# CONFIG_TUNER_3036 is not set</div><div class='add'>+# CONFIG_VIDEO_AU0828 is not set</div><div class='add'>+CONFIG_V4L_USB_DRIVERS=y</div><div class='add'>+CONFIG_USB_VIDEO_CLASS=m</div><div class='add'>+CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y</div><div class='add'>+# CONFIG_USB_GSPCA is not set</div><div class='add'>+CONFIG_VIDEO_PVRUSB2=m</div><div class='add'>+CONFIG_VIDEO_PVRUSB2_SYSFS=y</div><div class='add'>+CONFIG_VIDEO_PVRUSB2_DVB=y</div><div class='add'>+# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set</div><div class='add'>+# CONFIG_VIDEO_EM28XX is not set</div><div class='add'>+CONFIG_VIDEO_USBVISION=m</div><div class='add'>+CONFIG_VIDEO_USBVIDEO=m</div><div class='add'>+CONFIG_USB_VICAM=m</div><div class='add'>+CONFIG_USB_IBMCAM=m</div><div class='add'>+CONFIG_USB_KONICAWC=m</div><div class='add'>+CONFIG_USB_QUICKCAM_MESSENGER=m</div><div class='add'>+# CONFIG_USB_ET61X251 is not set</div><div class='add'>+CONFIG_VIDEO_OVCAMCHIP=m</div><div class='add'>+CONFIG_USB_W9968CF=m</div><div class='add'>+CONFIG_USB_OV511=m</div><div class='add'>+CONFIG_USB_SE401=m</div><div class='add'>+CONFIG_USB_SN9C102=m</div><div class='add'>+CONFIG_USB_STV680=m</div><div class='add'>+# CONFIG_USB_ZC0301 is not set</div><div class='add'>+CONFIG_USB_PWC=m</div><div class='add'>+# CONFIG_USB_PWC_DEBUG is not set</div><div class='add'>+CONFIG_USB_ZR364XX=m</div><div class='add'>+# CONFIG_USB_STKWEBCAM is not set</div><div class='add'>+# CONFIG_USB_S2255 is not set</div><div class='add'>+# CONFIG_SOC_CAMERA is not set</div><div class='add'>+# CONFIG_VIDEO_SH_MOBILE_CEU is not set</div><div class='add'>+CONFIG_RADIO_ADAPTERS=y</div><div class='add'>+# CONFIG_USB_DSBR is not set</div><div class='add'>+# CONFIG_USB_SI470X is not set</div><div class='add'>+CONFIG_DVB_CAPTURE_DRIVERS=y</div><div class='add'>+# CONFIG_TTPCI_EEPROM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Supported USB Adapters</div><div class='add'>+#</div><div class='add'>+CONFIG_DVB_USB=m</div><div class='add'>+# CONFIG_DVB_USB_DEBUG is not set</div><div class='add'>+CONFIG_DVB_USB_A800=m</div><div class='add'>+CONFIG_DVB_USB_DIBUSB_MB=m</div><div class='add'>+# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set</div><div class='add'>+CONFIG_DVB_USB_DIBUSB_MC=m</div><div class='add'>+CONFIG_DVB_USB_DIB0700=m</div><div class='add'>+CONFIG_DVB_USB_UMT_010=m</div><div class='add'>+CONFIG_DVB_USB_CXUSB=m</div><div class='add'>+CONFIG_DVB_USB_M920X=m</div><div class='add'>+CONFIG_DVB_USB_GL861=m</div><div class='add'>+CONFIG_DVB_USB_AU6610=m</div><div class='add'>+CONFIG_DVB_USB_DIGITV=m</div><div class='add'>+CONFIG_DVB_USB_VP7045=m</div><div class='add'>+CONFIG_DVB_USB_VP702X=m</div><div class='add'>+CONFIG_DVB_USB_GP8PSK=m</div><div class='add'>+CONFIG_DVB_USB_NOVA_T_USB2=m</div><div class='add'>+CONFIG_DVB_USB_TTUSB2=m</div><div class='add'>+CONFIG_DVB_USB_DTT200U=m</div><div class='add'>+CONFIG_DVB_USB_OPERA1=m</div><div class='add'>+CONFIG_DVB_USB_AF9005=m</div><div class='add'>+CONFIG_DVB_USB_AF9005_REMOTE=m</div><div class='add'>+# CONFIG_DVB_USB_DW2102 is not set</div><div class='add'>+# CONFIG_DVB_USB_ANYSEE is not set</div><div class='add'>+CONFIG_DVB_TTUSB_BUDGET=m</div><div class='add'>+CONFIG_DVB_TTUSB_DEC=m</div><div class='add'>+CONFIG_DVB_CINERGYT2=m</div><div class='add'>+# CONFIG_DVB_CINERGYT2_TUNING is not set</div><div class='add'>+# CONFIG_DVB_SIANO_SMS1XXX is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Supported FlexCopII (B2C2) Adapters</div><div class='add'>+#</div><div class='add'>+# CONFIG_DVB_B2C2_FLEXCOP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Supported DVB Frontends</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Customise DVB Frontends</div><div class='add'>+#</div><div class='add'>+# CONFIG_DVB_FE_CUSTOMISE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DVB-S (satellite) frontends</div><div class='add'>+#</div><div class='add'>+CONFIG_DVB_CX24110=m</div><div class='add'>+CONFIG_DVB_CX24123=m</div><div class='add'>+CONFIG_DVB_MT312=m</div><div class='add'>+CONFIG_DVB_S5H1420=m</div><div class='add'>+CONFIG_DVB_STV0299=m</div><div class='add'>+CONFIG_DVB_TDA8083=m</div><div class='add'>+CONFIG_DVB_TDA10086=m</div><div class='add'>+CONFIG_DVB_VES1X93=m</div><div class='add'>+CONFIG_DVB_TUNER_ITD1000=m</div><div class='add'>+CONFIG_DVB_TDA826X=m</div><div class='add'>+CONFIG_DVB_TUA6100=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DVB-T (terrestrial) frontends</div><div class='add'>+#</div><div class='add'>+CONFIG_DVB_SP8870=m</div><div class='add'>+CONFIG_DVB_SP887X=m</div><div class='add'>+CONFIG_DVB_CX22700=m</div><div class='add'>+CONFIG_DVB_CX22702=m</div><div class='add'>+# CONFIG_DVB_DRX397XD is not set</div><div class='add'>+CONFIG_DVB_L64781=m</div><div class='add'>+CONFIG_DVB_TDA1004X=m</div><div class='add'>+CONFIG_DVB_NXT6000=m</div><div class='add'>+CONFIG_DVB_MT352=m</div><div class='add'>+CONFIG_DVB_ZL10353=m</div><div class='add'>+CONFIG_DVB_DIB3000MB=m</div><div class='add'>+CONFIG_DVB_DIB3000MC=m</div><div class='add'>+CONFIG_DVB_DIB7000M=m</div><div class='add'>+CONFIG_DVB_DIB7000P=m</div><div class='add'>+CONFIG_DVB_TDA10048=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DVB-C (cable) frontends</div><div class='add'>+#</div><div class='add'>+CONFIG_DVB_VES1820=m</div><div class='add'>+CONFIG_DVB_TDA10021=m</div><div class='add'>+CONFIG_DVB_TDA10023=m</div><div class='add'>+CONFIG_DVB_STV0297=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# ATSC (North American/Korean Terrestrial/Cable DTV) frontends</div><div class='add'>+#</div><div class='add'>+CONFIG_DVB_NXT200X=m</div><div class='add'>+# CONFIG_DVB_OR51211 is not set</div><div class='add'>+# CONFIG_DVB_OR51132 is not set</div><div class='add'>+CONFIG_DVB_BCM3510=m</div><div class='add'>+CONFIG_DVB_LGDT330X=m</div><div class='add'>+CONFIG_DVB_S5H1409=m</div><div class='add'>+CONFIG_DVB_AU8522=m</div><div class='add'>+CONFIG_DVB_S5H1411=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Digital terrestrial only tuners/PLL</div><div class='add'>+#</div><div class='add'>+CONFIG_DVB_PLL=m</div><div class='add'>+CONFIG_DVB_TUNER_DIB0070=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SEC control devices for DVB-S</div><div class='add'>+#</div><div class='add'>+CONFIG_DVB_LNBP21=m</div><div class='add'>+# CONFIG_DVB_ISL6405 is not set</div><div class='add'>+CONFIG_DVB_ISL6421=m</div><div class='add'>+# CONFIG_DAB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics support</div><div class='add'>+#</div><div class='add'>+# CONFIG_VGASTATE is not set</div><div class='add'>+# CONFIG_VIDEO_OUTPUT_CONTROL is not set</div><div class='add'>+# CONFIG_FB is not set</div><div class='add'>+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Display device support</div><div class='add'>+#</div><div class='add'>+CONFIG_DISPLAY_SUPPORT=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Display hardware drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Console display driver support</div><div class='add'>+#</div><div class='add'>+# CONFIG_VGA_CONSOLE is not set</div><div class='add'>+CONFIG_DUMMY_CONSOLE=y</div><div class='add'>+CONFIG_SOUND=y</div><div class='add'>+CONFIG_SND=y</div><div class='add'>+CONFIG_SND_TIMER=y</div><div class='add'>+CONFIG_SND_PCM=y</div><div class='add'>+CONFIG_SND_HWDEP=y</div><div class='add'>+CONFIG_SND_RAWMIDI=y</div><div class='add'>+CONFIG_SND_SEQUENCER=m</div><div class='add'>+# CONFIG_SND_SEQ_DUMMY is not set</div><div class='add'>+CONFIG_SND_OSSEMUL=y</div><div class='add'>+CONFIG_SND_MIXER_OSS=y</div><div class='add'>+CONFIG_SND_PCM_OSS=y</div><div class='add'>+CONFIG_SND_PCM_OSS_PLUGINS=y</div><div class='add'>+CONFIG_SND_SEQUENCER_OSS=y</div><div class='add'>+# CONFIG_SND_DYNAMIC_MINORS is not set</div><div class='add'>+CONFIG_SND_SUPPORT_OLD_API=y</div><div class='add'>+CONFIG_SND_VERBOSE_PROCFS=y</div><div class='add'>+CONFIG_SND_VERBOSE_PRINTK=y</div><div class='add'>+CONFIG_SND_DEBUG=y</div><div class='add'>+# CONFIG_SND_DEBUG_VERBOSE is not set</div><div class='add'>+# CONFIG_SND_PCM_XRUN_DEBUG is not set</div><div class='add'>+CONFIG_SND_DRIVERS=y</div><div class='add'>+# CONFIG_SND_DUMMY is not set</div><div class='add'>+# CONFIG_SND_VIRMIDI is not set</div><div class='add'>+# CONFIG_SND_MTPAV is not set</div><div class='add'>+# CONFIG_SND_SERIAL_U16550 is not set</div><div class='add'>+# CONFIG_SND_MPU401 is not set</div><div class='add'>+CONFIG_SND_ARM=y</div><div class='add'>+CONFIG_SND_SPI=y</div><div class='add'>+CONFIG_SND_USB=y</div><div class='add'>+CONFIG_SND_USB_AUDIO=y</div><div class='add'>+CONFIG_SND_USB_CAIAQ=m</div><div class='add'>+CONFIG_SND_USB_CAIAQ_INPUT=y</div><div class='add'>+CONFIG_SND_SOC=y</div><div class='add'>+CONFIG_SND_OMAP_SOC=y</div><div class='add'>+# CONFIG_SOUND_PRIME is not set</div><div class='add'>+CONFIG_HID_SUPPORT=y</div><div class='add'>+CONFIG_HID=y</div><div class='add'>+CONFIG_HID_DEBUG=y</div><div class='add'>+# CONFIG_HIDRAW is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Input Devices</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_HID=y</div><div class='add'>+# CONFIG_USB_HIDINPUT_POWERBOOK is not set</div><div class='add'>+# CONFIG_HID_FF is not set</div><div class='add'>+# CONFIG_USB_HIDDEV is not set</div><div class='add'>+CONFIG_USB_SUPPORT=y</div><div class='add'>+CONFIG_USB_ARCH_HAS_HCD=y</div><div class='add'>+CONFIG_USB_ARCH_HAS_OHCI=y</div><div class='add'>+# CONFIG_USB_ARCH_HAS_EHCI is not set</div><div class='add'>+CONFIG_USB=y</div><div class='add'>+CONFIG_USB_DEBUG=y</div><div class='add'>+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous USB options</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_DEVICEFS=y</div><div class='add'>+CONFIG_USB_DEVICE_CLASS=y</div><div class='add'>+# CONFIG_USB_DYNAMIC_MINORS is not set</div><div class='add'>+# CONFIG_USB_OTG is not set</div><div class='add'>+# CONFIG_USB_OTG_WHITELIST is not set</div><div class='add'>+# CONFIG_USB_OTG_BLACKLIST_HUB is not set</div><div class='add'>+CONFIG_USB_MON=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Host Controller Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_C67X00_HCD is not set</div><div class='add'>+# CONFIG_USB_ISP116X_HCD is not set</div><div class='add'>+# CONFIG_USB_ISP1760_HCD is not set</div><div class='add'>+# CONFIG_USB_OHCI_HCD is not set</div><div class='add'>+# CONFIG_USB_SL811_HCD is not set</div><div class='add'>+# CONFIG_USB_R8A66597_HCD is not set</div><div class='add'>+CONFIG_USB_MUSB_HDRC=y</div><div class='add'>+CONFIG_USB_MUSB_SOC=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OMAP 343x high speed USB support</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_MUSB_HOST=y</div><div class='add'>+# CONFIG_USB_MUSB_PERIPHERAL is not set</div><div class='add'>+# CONFIG_USB_MUSB_OTG is not set</div><div class='add'>+CONFIG_USB_MUSB_HDRC_HCD=y</div><div class='add'>+CONFIG_MUSB_PIO_ONLY=y</div><div class='add'>+# CONFIG_USB_MUSB_DEBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Device Class drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_ACM=m</div><div class='add'>+CONFIG_USB_PRINTER=m</div><div class='add'>+CONFIG_USB_WDM=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# may also be needed; see USB_STORAGE Help for more information</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_STORAGE=y</div><div class='add'>+# CONFIG_USB_STORAGE_DEBUG is not set</div><div class='add'>+# CONFIG_USB_STORAGE_DATAFAB is not set</div><div class='add'>+# CONFIG_USB_STORAGE_FREECOM is not set</div><div class='add'>+# CONFIG_USB_STORAGE_ISD200 is not set</div><div class='add'>+# CONFIG_USB_STORAGE_DPCM is not set</div><div class='add'>+# CONFIG_USB_STORAGE_USBAT is not set</div><div class='add'>+# CONFIG_USB_STORAGE_SDDR09 is not set</div><div class='add'>+# CONFIG_USB_STORAGE_SDDR55 is not set</div><div class='add'>+# CONFIG_USB_STORAGE_JUMPSHOT is not set</div><div class='add'>+# CONFIG_USB_STORAGE_ALAUDA is not set</div><div class='add'>+# CONFIG_USB_STORAGE_ONETOUCH is not set</div><div class='add'>+# CONFIG_USB_STORAGE_KARMA is not set</div><div class='add'>+# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set</div><div class='add'>+# CONFIG_USB_LIBUSUAL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Imaging devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_MDC800 is not set</div><div class='add'>+# CONFIG_USB_MICROTEK is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB port drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_SERIAL=m</div><div class='add'>+# CONFIG_USB_EZUSB is not set</div><div class='add'>+# CONFIG_USB_SERIAL_GENERIC is not set</div><div class='add'>+# CONFIG_USB_SERIAL_AIRCABLE is not set</div><div class='add'>+# CONFIG_USB_SERIAL_ARK3116 is not set</div><div class='add'>+# CONFIG_USB_SERIAL_BELKIN is not set</div><div class='add'>+# CONFIG_USB_SERIAL_CH341 is not set</div><div class='add'>+# CONFIG_USB_SERIAL_WHITEHEAT is not set</div><div class='add'>+# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set</div><div class='add'>+# CONFIG_USB_SERIAL_CP2101 is not set</div><div class='add'>+# CONFIG_USB_SERIAL_CYPRESS_M8 is not set</div><div class='add'>+# CONFIG_USB_SERIAL_EMPEG is not set</div><div class='add'>+# CONFIG_USB_SERIAL_FTDI_SIO is not set</div><div class='add'>+# CONFIG_USB_SERIAL_FUNSOFT is not set</div><div class='add'>+# CONFIG_USB_SERIAL_VISOR is not set</div><div class='add'>+# CONFIG_USB_SERIAL_IPAQ is not set</div><div class='add'>+# CONFIG_USB_SERIAL_IR is not set</div><div class='add'>+# CONFIG_USB_SERIAL_EDGEPORT is not set</div><div class='add'>+# CONFIG_USB_SERIAL_EDGEPORT_TI is not set</div><div class='add'>+# CONFIG_USB_SERIAL_GARMIN is not set</div><div class='add'>+# CONFIG_USB_SERIAL_IPW is not set</div><div class='add'>+# CONFIG_USB_SERIAL_IUU is not set</div><div class='add'>+# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set</div><div class='add'>+# CONFIG_USB_SERIAL_KEYSPAN is not set</div><div class='add'>+# CONFIG_USB_SERIAL_KLSI is not set</div><div class='add'>+# CONFIG_USB_SERIAL_KOBIL_SCT is not set</div><div class='add'>+# CONFIG_USB_SERIAL_MCT_U232 is not set</div><div class='add'>+# CONFIG_USB_SERIAL_MOS7720 is not set</div><div class='add'>+# CONFIG_USB_SERIAL_MOS7840 is not set</div><div class='add'>+# CONFIG_USB_SERIAL_MOTOROLA is not set</div><div class='add'>+# CONFIG_USB_SERIAL_NAVMAN is not set</div><div class='add'>+# CONFIG_USB_SERIAL_PL2303 is not set</div><div class='add'>+# CONFIG_USB_SERIAL_OTI6858 is not set</div><div class='add'>+# CONFIG_USB_SERIAL_SPCP8X5 is not set</div><div class='add'>+# CONFIG_USB_SERIAL_HP4X is not set</div><div class='add'>+# CONFIG_USB_SERIAL_SAFE is not set</div><div class='add'>+# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set</div><div class='add'>+# CONFIG_USB_SERIAL_TI is not set</div><div class='add'>+# CONFIG_USB_SERIAL_CYBERJACK is not set</div><div class='add'>+# CONFIG_USB_SERIAL_XIRCOM is not set</div><div class='add'>+# CONFIG_USB_SERIAL_OPTION is not set</div><div class='add'>+# CONFIG_USB_SERIAL_OMNINET is not set</div><div class='add'>+# CONFIG_USB_SERIAL_DEBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Miscellaneous drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_EMI62=m</div><div class='add'>+CONFIG_USB_EMI26=m</div><div class='add'>+# CONFIG_USB_ADUTUX is not set</div><div class='add'>+# CONFIG_USB_RIO500 is not set</div><div class='add'>+CONFIG_USB_LEGOTOWER=m</div><div class='add'>+CONFIG_USB_LCD=m</div><div class='add'>+# CONFIG_USB_BERRY_CHARGE is not set</div><div class='add'>+CONFIG_USB_LED=m</div><div class='add'>+# CONFIG_USB_CYPRESS_CY7C63 is not set</div><div class='add'>+# CONFIG_USB_CYTHERM is not set</div><div class='add'>+# CONFIG_USB_PHIDGET is not set</div><div class='add'>+# CONFIG_USB_IDMOUSE is not set</div><div class='add'>+# CONFIG_USB_FTDI_ELAN is not set</div><div class='add'>+# CONFIG_USB_APPLEDISPLAY is not set</div><div class='add'>+# CONFIG_USB_LD is not set</div><div class='add'>+# CONFIG_USB_TRANCEVIBRATOR is not set</div><div class='add'>+# CONFIG_USB_IOWARRIOR is not set</div><div class='add'>+# CONFIG_USB_TEST is not set</div><div class='add'>+# CONFIG_USB_ISIGHTFW is not set</div><div class='add'>+# CONFIG_USB_GADGET is not set</div><div class='add'>+CONFIG_MMC=y</div><div class='add'>+# CONFIG_MMC_DEBUG is not set</div><div class='add'>+CONFIG_MMC_UNSAFE_RESUME=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MMC/SD Card Drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_MMC_BLOCK=y</div><div class='add'>+CONFIG_MMC_BLOCK_BOUNCE=y</div><div class='add'>+CONFIG_SDIO_UART=y</div><div class='add'>+# CONFIG_MMC_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MMC/SD Host Controller Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MMC_SDHCI is not set</div><div class='add'>+# CONFIG_MMC_OMAP is not set</div><div class='add'>+# CONFIG_MMC_SPI is not set</div><div class='add'>+# CONFIG_MEMSTICK is not set</div><div class='add'>+# CONFIG_ACCESSIBILITY is not set</div><div class='add'>+CONFIG_NEW_LEDS=y</div><div class='add'>+CONFIG_LEDS_CLASS=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# LED drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_LEDS_PCA9532 is not set</div><div class='add'>+CONFIG_LEDS_GPIO=y</div><div class='add'>+# CONFIG_LEDS_PCA955X is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# LED Triggers</div><div class='add'>+#</div><div class='add'>+CONFIG_LEDS_TRIGGERS=y</div><div class='add'>+CONFIG_LEDS_TRIGGER_TIMER=y</div><div class='add'>+CONFIG_LEDS_TRIGGER_HEARTBEAT=y</div><div class='add'>+# CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set</div><div class='add'>+CONFIG_RTC_LIB=y</div><div class='add'>+CONFIG_RTC_CLASS=y</div><div class='add'>+CONFIG_RTC_HCTOSYS=y</div><div class='add'>+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"</div><div class='add'>+# CONFIG_RTC_DEBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# RTC interfaces</div><div class='add'>+#</div><div class='add'>+CONFIG_RTC_INTF_SYSFS=y</div><div class='add'>+CONFIG_RTC_INTF_PROC=y</div><div class='add'>+CONFIG_RTC_INTF_DEV=y</div><div class='add'>+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set</div><div class='add'>+# CONFIG_RTC_DRV_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C RTC drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_RTC_DRV_DS1307 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1374 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1672 is not set</div><div class='add'>+# CONFIG_RTC_DRV_MAX6900 is not set</div><div class='add'>+# CONFIG_RTC_DRV_RS5C372 is not set</div><div class='add'>+# CONFIG_RTC_DRV_ISL1208 is not set</div><div class='add'>+# CONFIG_RTC_DRV_X1205 is not set</div><div class='add'>+# CONFIG_RTC_DRV_PCF8563 is not set</div><div class='add'>+# CONFIG_RTC_DRV_PCF8583 is not set</div><div class='add'>+# CONFIG_RTC_DRV_M41T80 is not set</div><div class='add'>+# CONFIG_RTC_DRV_S35390A is not set</div><div class='add'>+# CONFIG_RTC_DRV_FM3130 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI RTC drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_RTC_DRV_M41T94 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1305 is not set</div><div class='add'>+# CONFIG_RTC_DRV_MAX6902 is not set</div><div class='add'>+# CONFIG_RTC_DRV_R9701 is not set</div><div class='add'>+# CONFIG_RTC_DRV_RS5C348 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Platform RTC drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_RTC_DRV_CMOS is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1511 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1553 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1742 is not set</div><div class='add'>+# CONFIG_RTC_DRV_STK17TA8 is not set</div><div class='add'>+# CONFIG_RTC_DRV_M48T86 is not set</div><div class='add'>+# CONFIG_RTC_DRV_M48T59 is not set</div><div class='add'>+# CONFIG_RTC_DRV_V3020 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# on-CPU RTC drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_DMADEVICES is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Voltage and Current regulators</div><div class='add'>+#</div><div class='add'>+# CONFIG_REGULATOR is not set</div><div class='add'>+# CONFIG_REGULATOR_FIXED_VOLTAGE is not set</div><div class='add'>+# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set</div><div class='add'>+# CONFIG_REGULATOR_BQ24022 is not set</div><div class='add'>+# CONFIG_UIO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# File systems</div><div class='add'>+#</div><div class='add'>+CONFIG_EXT2_FS=y</div><div class='add'>+# CONFIG_EXT2_FS_XATTR is not set</div><div class='add'>+# CONFIG_EXT2_FS_XIP is not set</div><div class='add'>+CONFIG_EXT3_FS=y</div><div class='add'>+# CONFIG_EXT3_FS_XATTR is not set</div><div class='add'>+# CONFIG_EXT4DEV_FS is not set</div><div class='add'>+CONFIG_JBD=y</div><div class='add'>+# CONFIG_JBD_DEBUG is not set</div><div class='add'>+# CONFIG_REISERFS_FS is not set</div><div class='add'>+# CONFIG_JFS_FS is not set</div><div class='add'>+CONFIG_FS_POSIX_ACL=y</div><div class='add'>+CONFIG_XFS_FS=m</div><div class='add'>+# CONFIG_XFS_QUOTA is not set</div><div class='add'>+# CONFIG_XFS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_XFS_RT is not set</div><div class='add'>+# CONFIG_XFS_DEBUG is not set</div><div class='add'>+# CONFIG_GFS2_FS is not set</div><div class='add'>+# CONFIG_OCFS2_FS is not set</div><div class='add'>+CONFIG_DNOTIFY=y</div><div class='add'>+CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='add'>+CONFIG_QUOTA=y</div><div class='add'>+# CONFIG_QUOTA_NETLINK_INTERFACE is not set</div><div class='add'>+CONFIG_PRINT_QUOTA_WARNING=y</div><div class='add'>+# CONFIG_QFMT_V1 is not set</div><div class='add'>+CONFIG_QFMT_V2=y</div><div class='add'>+CONFIG_QUOTACTL=y</div><div class='add'>+# CONFIG_AUTOFS_FS is not set</div><div class='add'>+# CONFIG_AUTOFS4_FS is not set</div><div class='add'>+CONFIG_FUSE_FS=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CD-ROM/DVD Filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_ISO9660_FS=m</div><div class='add'>+CONFIG_JOLIET=y</div><div class='add'>+CONFIG_ZISOFS=y</div><div class='add'>+CONFIG_UDF_FS=m</div><div class='add'>+CONFIG_UDF_NLS=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DOS/FAT/NT Filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_FAT_FS=y</div><div class='add'>+CONFIG_MSDOS_FS=y</div><div class='add'>+CONFIG_VFAT_FS=y</div><div class='add'>+CONFIG_FAT_DEFAULT_CODEPAGE=437</div><div class='add'>+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"</div><div class='add'>+# CONFIG_NTFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Pseudo filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_PROC_FS=y</div><div class='add'>+CONFIG_PROC_SYSCTL=y</div><div class='add'>+CONFIG_SYSFS=y</div><div class='add'>+CONFIG_TMPFS=y</div><div class='add'>+# CONFIG_TMPFS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_HUGETLB_PAGE is not set</div><div class='add'>+# CONFIG_CONFIGFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ADFS_FS is not set</div><div class='add'>+# CONFIG_AFFS_FS is not set</div><div class='add'>+# CONFIG_HFS_FS is not set</div><div class='add'>+# CONFIG_HFSPLUS_FS is not set</div><div class='add'>+# CONFIG_BEFS_FS is not set</div><div class='add'>+# CONFIG_BFS_FS is not set</div><div class='add'>+# CONFIG_EFS_FS is not set</div><div class='add'>+CONFIG_JFFS2_FS=y</div><div class='add'>+CONFIG_JFFS2_FS_DEBUG=0</div><div class='add'>+CONFIG_JFFS2_FS_WRITEBUFFER=y</div><div class='add'>+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set</div><div class='add'>+CONFIG_JFFS2_SUMMARY=y</div><div class='add'>+CONFIG_JFFS2_FS_XATTR=y</div><div class='add'>+CONFIG_JFFS2_FS_POSIX_ACL=y</div><div class='add'>+CONFIG_JFFS2_FS_SECURITY=y</div><div class='add'>+CONFIG_JFFS2_COMPRESSION_OPTIONS=y</div><div class='add'>+CONFIG_JFFS2_ZLIB=y</div><div class='add'>+CONFIG_JFFS2_LZO=y</div><div class='add'>+CONFIG_JFFS2_RTIME=y</div><div class='add'>+CONFIG_JFFS2_RUBIN=y</div><div class='add'>+# CONFIG_JFFS2_CMODE_NONE is not set</div><div class='add'>+CONFIG_JFFS2_CMODE_PRIORITY=y</div><div class='add'>+# CONFIG_JFFS2_CMODE_SIZE is not set</div><div class='add'>+# CONFIG_JFFS2_CMODE_FAVOURLZO is not set</div><div class='add'>+# CONFIG_CRAMFS is not set</div><div class='add'>+# CONFIG_VXFS_FS is not set</div><div class='add'>+# CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='add'>+# CONFIG_HPFS_FS is not set</div><div class='add'>+# CONFIG_QNX4FS_FS is not set</div><div class='add'>+# CONFIG_ROMFS_FS is not set</div><div class='add'>+# CONFIG_SYSV_FS is not set</div><div class='add'>+# CONFIG_UFS_FS is not set</div><div class='add'>+CONFIG_NETWORK_FILESYSTEMS=y</div><div class='add'>+CONFIG_NFS_FS=y</div><div class='add'>+CONFIG_NFS_V3=y</div><div class='add'>+# CONFIG_NFS_V3_ACL is not set</div><div class='add'>+CONFIG_NFS_V4=y</div><div class='add'>+CONFIG_ROOT_NFS=y</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='add'>+CONFIG_LOCKD=y</div><div class='add'>+CONFIG_LOCKD_V4=y</div><div class='add'>+CONFIG_NFS_COMMON=y</div><div class='add'>+CONFIG_SUNRPC=y</div><div class='add'>+CONFIG_SUNRPC_GSS=y</div><div class='add'>+CONFIG_RPCSEC_GSS_KRB5=y</div><div class='add'>+# CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='add'>+# CONFIG_SMB_FS is not set</div><div class='add'>+# CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_NCP_FS is not set</div><div class='add'>+# CONFIG_CODA_FS is not set</div><div class='add'>+# CONFIG_AFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Partition Types</div><div class='add'>+#</div><div class='add'>+CONFIG_PARTITION_ADVANCED=y</div><div class='add'>+# CONFIG_ACORN_PARTITION is not set</div><div class='add'>+# CONFIG_OSF_PARTITION is not set</div><div class='add'>+# CONFIG_AMIGA_PARTITION is not set</div><div class='add'>+# CONFIG_ATARI_PARTITION is not set</div><div class='add'>+# CONFIG_MAC_PARTITION is not set</div><div class='add'>+CONFIG_MSDOS_PARTITION=y</div><div class='add'>+# CONFIG_BSD_DISKLABEL is not set</div><div class='add'>+# CONFIG_MINIX_SUBPARTITION is not set</div><div class='add'>+# CONFIG_SOLARIS_X86_PARTITION is not set</div><div class='add'>+# CONFIG_UNIXWARE_DISKLABEL is not set</div><div class='add'>+# CONFIG_LDM_PARTITION is not set</div><div class='add'>+# CONFIG_SGI_PARTITION is not set</div><div class='add'>+# CONFIG_ULTRIX_PARTITION is not set</div><div class='add'>+# CONFIG_SUN_PARTITION is not set</div><div class='add'>+# CONFIG_KARMA_PARTITION is not set</div><div class='add'>+# CONFIG_EFI_PARTITION is not set</div><div class='add'>+# CONFIG_SYSV68_PARTITION is not set</div><div class='add'>+CONFIG_NLS=y</div><div class='add'>+CONFIG_NLS_DEFAULT="iso8859-1"</div><div class='add'>+CONFIG_NLS_CODEPAGE_437=y</div><div class='add'>+# CONFIG_NLS_CODEPAGE_737 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_775 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_850 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_852 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_855 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_857 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_860 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_861 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_862 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_863 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_864 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_865 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_866 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_869 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_936 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_950 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_932 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_949 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_874 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_8 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_1250 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_1251 is not set</div><div class='add'>+# CONFIG_NLS_ASCII is not set</div><div class='add'>+CONFIG_NLS_ISO8859_1=y</div><div class='add'>+# CONFIG_NLS_ISO8859_2 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_3 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_4 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_5 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_6 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_7 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_9 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_13 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_14 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_15 is not set</div><div class='add'>+# CONFIG_NLS_KOI8_R is not set</div><div class='add'>+# CONFIG_NLS_KOI8_U is not set</div><div class='add'>+# CONFIG_NLS_UTF8 is not set</div><div class='add'>+# CONFIG_DLM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel hacking</div><div class='add'>+#</div><div class='add'>+# CONFIG_PRINTK_TIME is not set</div><div class='add'>+CONFIG_ENABLE_WARN_DEPRECATED=y</div><div class='add'>+CONFIG_ENABLE_MUST_CHECK=y</div><div class='add'>+CONFIG_FRAME_WARN=1024</div><div class='add'>+CONFIG_MAGIC_SYSRQ=y</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='add'>+CONFIG_DEBUG_FS=y</div><div class='add'>+# CONFIG_HEADERS_CHECK is not set</div><div class='add'>+CONFIG_DEBUG_KERNEL=y</div><div class='add'>+# CONFIG_DEBUG_SHIRQ is not set</div><div class='add'>+CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set</div><div class='add'>+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0</div><div class='add'>+CONFIG_SCHED_DEBUG=y</div><div class='add'>+CONFIG_SCHEDSTATS=y</div><div class='add'>+CONFIG_TIMER_STATS=y</div><div class='add'>+# CONFIG_DEBUG_OBJECTS is not set</div><div class='add'>+# CONFIG_SLUB_DEBUG_ON is not set</div><div class='add'>+# CONFIG_SLUB_STATS is not set</div><div class='add'>+# CONFIG_DEBUG_RT_MUTEXES is not set</div><div class='add'>+# CONFIG_RT_MUTEX_TESTER is not set</div><div class='add'>+# CONFIG_DEBUG_SPINLOCK is not set</div><div class='add'>+CONFIG_DEBUG_MUTEXES=y</div><div class='add'>+# CONFIG_DEBUG_LOCK_ALLOC is not set</div><div class='add'>+# CONFIG_PROVE_LOCKING is not set</div><div class='add'>+# CONFIG_LOCK_STAT is not set</div><div class='add'>+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set</div><div class='add'>+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set</div><div class='add'>+# CONFIG_DEBUG_KOBJECT is not set</div><div class='add'>+# CONFIG_DEBUG_BUGVERBOSE is not set</div><div class='add'>+# CONFIG_DEBUG_INFO is not set</div><div class='add'>+# CONFIG_DEBUG_VM is not set</div><div class='add'>+# CONFIG_DEBUG_WRITECOUNT is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='add'>+# CONFIG_DEBUG_LIST is not set</div><div class='add'>+# CONFIG_DEBUG_SG is not set</div><div class='add'>+CONFIG_FRAME_POINTER=y</div><div class='add'>+# CONFIG_BOOT_PRINTK_DELAY is not set</div><div class='add'>+# CONFIG_RCU_TORTURE_TEST is not set</div><div class='add'>+# CONFIG_BACKTRACE_SELF_TEST is not set</div><div class='add'>+# CONFIG_FAULT_INJECTION is not set</div><div class='add'>+# CONFIG_LATENCYTOP is not set</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_IRQSOFF_TRACER is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='add'>+# CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='add'>+# CONFIG_KGDB is not set</div><div class='add'>+# CONFIG_DEBUG_USER is not set</div><div class='add'>+# CONFIG_DEBUG_ERRORS is not set</div><div class='add'>+# CONFIG_DEBUG_STACK_USAGE is not set</div><div class='add'>+# CONFIG_DEBUG_LL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Security options</div><div class='add'>+#</div><div class='add'>+# CONFIG_KEYS is not set</div><div class='add'>+# CONFIG_SECURITY is not set</div><div class='add'>+# CONFIG_SECURITY_FILE_CAPABILITIES is not set</div><div class='add'>+CONFIG_XOR_BLOCKS=m</div><div class='add'>+CONFIG_ASYNC_CORE=m</div><div class='add'>+CONFIG_ASYNC_MEMCPY=m</div><div class='add'>+CONFIG_ASYNC_XOR=m</div><div class='add'>+CONFIG_CRYPTO=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Crypto core or helper</div><div class='add'>+#</div><div class='add'>+CONFIG_CRYPTO_ALGAPI=y</div><div class='add'>+CONFIG_CRYPTO_AEAD=m</div><div class='add'>+CONFIG_CRYPTO_BLKCIPHER=y</div><div class='add'>+CONFIG_CRYPTO_HASH=m</div><div class='add'>+CONFIG_CRYPTO_MANAGER=y</div><div class='add'>+CONFIG_CRYPTO_GF128MUL=m</div><div class='add'>+CONFIG_CRYPTO_NULL=m</div><div class='add'>+CONFIG_CRYPTO_CRYPTD=m</div><div class='add'>+# CONFIG_CRYPTO_AUTHENC is not set</div><div class='add'>+CONFIG_CRYPTO_TEST=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Authenticated Encryption with Associated Data</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CCM is not set</div><div class='add'>+# CONFIG_CRYPTO_GCM is not set</div><div class='add'>+# CONFIG_CRYPTO_SEQIV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block modes</div><div class='add'>+#</div><div class='add'>+CONFIG_CRYPTO_CBC=y</div><div class='add'>+# CONFIG_CRYPTO_CTR is not set</div><div class='add'>+# CONFIG_CRYPTO_CTS is not set</div><div class='add'>+CONFIG_CRYPTO_ECB=y</div><div class='add'>+CONFIG_CRYPTO_LRW=m</div><div class='add'>+CONFIG_CRYPTO_PCBC=m</div><div class='add'>+# CONFIG_CRYPTO_XTS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hash modes</div><div class='add'>+#</div><div class='add'>+CONFIG_CRYPTO_HMAC=m</div><div class='add'>+CONFIG_CRYPTO_XCBC=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Digest</div><div class='add'>+#</div><div class='add'>+CONFIG_CRYPTO_CRC32C=m</div><div class='add'>+CONFIG_CRYPTO_MD4=m</div><div class='add'>+CONFIG_CRYPTO_MD5=y</div><div class='add'>+CONFIG_CRYPTO_MICHAEL_MIC=y</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='add'>+CONFIG_CRYPTO_SHA1=m</div><div class='add'>+CONFIG_CRYPTO_SHA256=m</div><div class='add'>+CONFIG_CRYPTO_SHA512=m</div><div class='add'>+CONFIG_CRYPTO_TGR192=m</div><div class='add'>+CONFIG_CRYPTO_WP512=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ciphers</div><div class='add'>+#</div><div class='add'>+CONFIG_CRYPTO_AES=y</div><div class='add'>+CONFIG_CRYPTO_ANUBIS=m</div><div class='add'>+CONFIG_CRYPTO_ARC4=y</div><div class='add'>+CONFIG_CRYPTO_BLOWFISH=m</div><div class='add'>+CONFIG_CRYPTO_CAMELLIA=m</div><div class='add'>+CONFIG_CRYPTO_CAST5=m</div><div class='add'>+CONFIG_CRYPTO_CAST6=m</div><div class='add'>+CONFIG_CRYPTO_DES=y</div><div class='add'>+CONFIG_CRYPTO_FCRYPT=m</div><div class='add'>+CONFIG_CRYPTO_KHAZAD=m</div><div class='add'>+# CONFIG_CRYPTO_SALSA20 is not set</div><div class='add'>+# CONFIG_CRYPTO_SEED is not set</div><div class='add'>+CONFIG_CRYPTO_SERPENT=m</div><div class='add'>+CONFIG_CRYPTO_TEA=m</div><div class='add'>+CONFIG_CRYPTO_TWOFISH=m</div><div class='add'>+CONFIG_CRYPTO_TWOFISH_COMMON=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Compression</div><div class='add'>+#</div><div class='add'>+CONFIG_CRYPTO_DEFLATE=m</div><div class='add'>+# CONFIG_CRYPTO_LZO is not set</div><div class='add'>+CONFIG_CRYPTO_HW=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Library routines</div><div class='add'>+#</div><div class='add'>+CONFIG_BITREVERSE=y</div><div class='add'>+# CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='add'>+# CONFIG_GENERIC_FIND_NEXT_BIT is not set</div><div class='add'>+CONFIG_CRC_CCITT=y</div><div class='add'>+CONFIG_CRC16=m</div><div class='add'>+CONFIG_CRC_T10DIF=y</div><div class='add'>+CONFIG_CRC_ITU_T=y</div><div class='add'>+CONFIG_CRC32=y</div><div class='add'>+CONFIG_CRC7=y</div><div class='add'>+CONFIG_LIBCRC32C=y</div><div class='add'>+CONFIG_ZLIB_INFLATE=y</div><div class='add'>+CONFIG_ZLIB_DEFLATE=y</div><div class='add'>+CONFIG_LZO_COMPRESS=y</div><div class='add'>+CONFIG_LZO_DECOMPRESS=y</div><div class='add'>+CONFIG_PLIST=y</div><div class='add'>+CONFIG_HAS_IOMEM=y</div><div class='add'>+CONFIG_HAS_IOPORT=y</div><div class='add'>+CONFIG_HAS_DMA=y</div><div class='head'>diff --git a/arch/arm/configs/palmz72_defconfig b/arch/arm/configs/palmz72_defconfig<br/>new file mode 100644<br/>index 000000000000..3245f8f33e0a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/configs/palmz72_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/configs/palmz72_defconfig</a></div><div class='hunk'>@@ -0,0 +1,951 @@</div><div class='add'>+#</div><div class='add'>+# Automatically generated make config: don't edit</div><div class='add'>+# Linux kernel version: 2.6.27-rc4</div><div class='add'>+# Sun Aug 24 02:29:27 2008</div><div class='add'>+#</div><div class='add'>+CONFIG_ARM=y</div><div class='add'>+CONFIG_HAVE_PWM=y</div><div class='add'>+CONFIG_SYS_SUPPORTS_APM_EMULATION=y</div><div class='add'>+CONFIG_GENERIC_GPIO=y</div><div class='add'>+CONFIG_GENERIC_TIME=y</div><div class='add'>+CONFIG_GENERIC_CLOCKEVENTS=y</div><div class='add'>+CONFIG_MMU=y</div><div class='add'>+# CONFIG_NO_IOPORT is not set</div><div class='add'>+CONFIG_GENERIC_HARDIRQS=y</div><div class='add'>+CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='add'>+CONFIG_LOCKDEP_SUPPORT=y</div><div class='add'>+CONFIG_TRACE_IRQFLAGS_SUPPORT=y</div><div class='add'>+CONFIG_HARDIRQS_SW_RESEND=y</div><div class='add'>+CONFIG_GENERIC_IRQ_PROBE=y</div><div class='add'>+CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='add'>+# CONFIG_ARCH_HAS_ILOG2_U32 is not set</div><div class='add'>+# CONFIG_ARCH_HAS_ILOG2_U64 is not set</div><div class='add'>+CONFIG_GENERIC_HWEIGHT=y</div><div class='add'>+CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_ARCH_SUPPORTS_AOUT=y</div><div class='add'>+CONFIG_ZONE_DMA=y</div><div class='add'>+CONFIG_ARCH_MTD_XIP=y</div><div class='add'>+CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y</div><div class='add'>+CONFIG_VECTORS_BASE=0xffff0000</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# General setup</div><div class='add'>+#</div><div class='add'>+CONFIG_EXPERIMENTAL=y</div><div class='add'>+CONFIG_BROKEN_ON_SMP=y</div><div class='add'>+CONFIG_LOCK_KERNEL=y</div><div class='add'>+CONFIG_INIT_ENV_ARG_LIMIT=32</div><div class='add'>+CONFIG_LOCALVERSION=""</div><div class='add'>+# CONFIG_LOCALVERSION_AUTO is not set</div><div class='add'>+CONFIG_SWAP=y</div><div class='add'>+CONFIG_SYSVIPC=y</div><div class='add'>+CONFIG_SYSVIPC_SYSCTL=y</div><div class='add'>+# CONFIG_POSIX_MQUEUE is not set</div><div class='add'>+# CONFIG_BSD_PROCESS_ACCT is not set</div><div class='add'>+# CONFIG_TASKSTATS is not set</div><div class='add'>+# CONFIG_AUDIT is not set</div><div class='add'>+# CONFIG_IKCONFIG is not set</div><div class='add'>+CONFIG_LOG_BUF_SHIFT=14</div><div class='add'>+# CONFIG_CGROUPS is not set</div><div class='add'>+# CONFIG_GROUP_SCHED is not set</div><div class='add'>+CONFIG_SYSFS_DEPRECATED=y</div><div class='add'>+CONFIG_SYSFS_DEPRECATED_V2=y</div><div class='add'>+# CONFIG_RELAY is not set</div><div class='add'>+CONFIG_NAMESPACES=y</div><div class='add'>+# CONFIG_UTS_NS is not set</div><div class='add'>+# CONFIG_IPC_NS is not set</div><div class='add'>+# CONFIG_USER_NS is not set</div><div class='add'>+# CONFIG_PID_NS is not set</div><div class='add'>+CONFIG_BLK_DEV_INITRD=y</div><div class='add'>+CONFIG_INITRAMFS_SOURCE=""</div><div class='add'>+CONFIG_CC_OPTIMIZE_FOR_SIZE=y</div><div class='add'>+CONFIG_SYSCTL=y</div><div class='add'>+# CONFIG_EMBEDDED is not set</div><div class='add'>+CONFIG_UID16=y</div><div class='add'>+CONFIG_SYSCTL_SYSCALL=y</div><div class='add'>+CONFIG_KALLSYMS=y</div><div class='add'>+# CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='add'>+CONFIG_HOTPLUG=y</div><div class='add'>+CONFIG_PRINTK=y</div><div class='add'>+CONFIG_BUG=y</div><div class='add'>+CONFIG_ELF_CORE=y</div><div class='add'>+CONFIG_COMPAT_BRK=y</div><div class='add'>+CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_FUTEX=y</div><div class='add'>+CONFIG_ANON_INODES=y</div><div class='add'>+CONFIG_EPOLL=y</div><div class='add'>+CONFIG_SIGNALFD=y</div><div class='add'>+CONFIG_TIMERFD=y</div><div class='add'>+CONFIG_EVENTFD=y</div><div class='add'>+CONFIG_SHMEM=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='add'>+CONFIG_SLAB=y</div><div class='add'>+# CONFIG_SLUB is not set</div><div class='add'>+# CONFIG_SLOB is not set</div><div class='add'>+# CONFIG_PROFILING is not set</div><div class='add'>+# CONFIG_MARKERS is not set</div><div class='add'>+CONFIG_HAVE_OPROFILE=y</div><div class='add'>+# CONFIG_KPROBES is not set</div><div class='add'>+# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set</div><div class='add'>+# CONFIG_HAVE_IOREMAP_PROT is not set</div><div class='add'>+CONFIG_HAVE_KPROBES=y</div><div class='add'>+CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+# CONFIG_HAVE_ARCH_TRACEHOOK is not set</div><div class='add'>+# CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+CONFIG_HAVE_CLK=y</div><div class='add'>+CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+CONFIG_HAVE_GENERIC_DMA_COHERENT=y</div><div class='add'>+CONFIG_SLABINFO=y</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='add'>+# CONFIG_TINY_SHMEM is not set</div><div class='add'>+CONFIG_BASE_SMALL=0</div><div class='add'>+CONFIG_MODULES=y</div><div class='add'>+# CONFIG_MODULE_FORCE_LOAD is not set</div><div class='add'>+CONFIG_MODULE_UNLOAD=y</div><div class='add'>+# CONFIG_MODULE_FORCE_UNLOAD is not set</div><div class='add'>+# CONFIG_MODVERSIONS is not set</div><div class='add'>+# CONFIG_MODULE_SRCVERSION_ALL is not set</div><div class='add'>+CONFIG_KMOD=y</div><div class='add'>+CONFIG_BLOCK=y</div><div class='add'>+# CONFIG_LBD is not set</div><div class='add'>+# CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='add'>+# CONFIG_LSF is not set</div><div class='add'>+# CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IO Schedulers</div><div class='add'>+#</div><div class='add'>+CONFIG_IOSCHED_NOOP=y</div><div class='add'>+CONFIG_IOSCHED_AS=y</div><div class='add'>+# CONFIG_IOSCHED_DEADLINE is not set</div><div class='add'>+# CONFIG_IOSCHED_CFQ is not set</div><div class='add'>+CONFIG_DEFAULT_AS=y</div><div class='add'>+# CONFIG_DEFAULT_DEADLINE is not set</div><div class='add'>+# CONFIG_DEFAULT_CFQ is not set</div><div class='add'>+# CONFIG_DEFAULT_NOOP is not set</div><div class='add'>+CONFIG_DEFAULT_IOSCHED="anticipatory"</div><div class='add'>+CONFIG_CLASSIC_RCU=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# System Type</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARCH_AAEC2000 is not set</div><div class='add'>+# CONFIG_ARCH_INTEGRATOR is not set</div><div class='add'>+# CONFIG_ARCH_REALVIEW is not set</div><div class='add'>+# CONFIG_ARCH_VERSATILE is not set</div><div class='add'>+# CONFIG_ARCH_AT91 is not set</div><div class='add'>+# CONFIG_ARCH_CLPS7500 is not set</div><div class='add'>+# CONFIG_ARCH_CLPS711X is not set</div><div class='add'>+# CONFIG_ARCH_EBSA110 is not set</div><div class='add'>+# CONFIG_ARCH_EP93XX is not set</div><div class='add'>+# CONFIG_ARCH_FOOTBRIDGE is not set</div><div class='add'>+# CONFIG_ARCH_NETX is not set</div><div class='add'>+# CONFIG_ARCH_H720X is not set</div><div class='add'>+# CONFIG_ARCH_IMX is not set</div><div class='add'>+# CONFIG_ARCH_IOP13XX is not set</div><div class='add'>+# CONFIG_ARCH_IOP32X is not set</div><div class='add'>+# CONFIG_ARCH_IOP33X is not set</div><div class='add'>+# CONFIG_ARCH_IXP23XX is not set</div><div class='add'>+# CONFIG_ARCH_IXP2000 is not set</div><div class='add'>+# CONFIG_ARCH_IXP4XX is not set</div><div class='add'>+# CONFIG_ARCH_L7200 is not set</div><div class='add'>+# CONFIG_ARCH_KIRKWOOD is not set</div><div class='add'>+# CONFIG_ARCH_KS8695 is not set</div><div class='add'>+# CONFIG_ARCH_NS9XXX is not set</div><div class='add'>+# CONFIG_ARCH_LOKI is not set</div><div class='add'>+# CONFIG_ARCH_MV78XX0 is not set</div><div class='add'>+# CONFIG_ARCH_MXC is not set</div><div class='add'>+# CONFIG_ARCH_ORION5X is not set</div><div class='add'>+# CONFIG_ARCH_PNX4008 is not set</div><div class='add'>+CONFIG_ARCH_PXA=y</div><div class='add'>+# CONFIG_ARCH_RPC is not set</div><div class='add'>+# CONFIG_ARCH_SA1100 is not set</div><div class='add'>+# CONFIG_ARCH_S3C2410 is not set</div><div class='add'>+# CONFIG_ARCH_SHARK is not set</div><div class='add'>+# CONFIG_ARCH_LH7A40X is not set</div><div class='add'>+# CONFIG_ARCH_DAVINCI is not set</div><div class='add'>+# CONFIG_ARCH_OMAP is not set</div><div class='add'>+# CONFIG_ARCH_MSM7X00A is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Intel PXA2xx/PXA3xx Implementations</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARCH_GUMSTIX is not set</div><div class='add'>+# CONFIG_ARCH_LUBBOCK is not set</div><div class='add'>+# CONFIG_MACH_LOGICPD_PXA270 is not set</div><div class='add'>+# CONFIG_MACH_MAINSTONE is not set</div><div class='add'>+# CONFIG_ARCH_PXA_IDP is not set</div><div class='add'>+# CONFIG_PXA_SHARPSL is not set</div><div class='add'>+# CONFIG_ARCH_PXA_ESERIES is not set</div><div class='add'>+# CONFIG_MACH_TRIZEPS4 is not set</div><div class='add'>+# CONFIG_MACH_EM_X270 is not set</div><div class='add'>+# CONFIG_MACH_COLIBRI is not set</div><div class='add'>+# CONFIG_MACH_ZYLONITE is not set</div><div class='add'>+# CONFIG_MACH_LITTLETON is not set</div><div class='add'>+# CONFIG_MACH_TAVOREVB is not set</div><div class='add'>+# CONFIG_MACH_SAAR is not set</div><div class='add'>+# CONFIG_MACH_ARMCORE is not set</div><div class='add'>+# CONFIG_MACH_MAGICIAN is not set</div><div class='add'>+# CONFIG_MACH_PCM027 is not set</div><div class='add'>+CONFIG_ARCH_PXA_PALM=y</div><div class='add'>+# CONFIG_MACH_PALMTX is not set</div><div class='add'>+CONFIG_MACH_PALMZ72=y</div><div class='add'>+# CONFIG_PXA_EZX is not set</div><div class='add'>+CONFIG_PXA27x=y</div><div class='add'>+CONFIG_PXA_PWM=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Boot options</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Power management</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Processor Type</div><div class='add'>+#</div><div class='add'>+CONFIG_CPU_32=y</div><div class='add'>+CONFIG_CPU_XSCALE=y</div><div class='add'>+CONFIG_CPU_32v5=y</div><div class='add'>+CONFIG_CPU_ABRT_EV5T=y</div><div class='add'>+CONFIG_CPU_PABRT_NOIFAR=y</div><div class='add'>+CONFIG_CPU_CACHE_VIVT=y</div><div class='add'>+CONFIG_CPU_TLB_V4WBI=y</div><div class='add'>+CONFIG_CPU_CP15=y</div><div class='add'>+CONFIG_CPU_CP15_MMU=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Processor Features</div><div class='add'>+#</div><div class='add'>+CONFIG_ARM_THUMB=y</div><div class='add'>+# CONFIG_CPU_DCACHE_DISABLE is not set</div><div class='add'>+# CONFIG_OUTER_CACHE is not set</div><div class='add'>+CONFIG_IWMMXT=y</div><div class='add'>+CONFIG_XSCALE_PMU=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Bus support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PCI_SYSCALL is not set</div><div class='add'>+# CONFIG_ARCH_SUPPORTS_MSI is not set</div><div class='add'>+# CONFIG_PCCARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel Features</div><div class='add'>+#</div><div class='add'>+CONFIG_TICK_ONESHOT=y</div><div class='add'>+# CONFIG_NO_HZ is not set</div><div class='add'>+# CONFIG_HIGH_RES_TIMERS is not set</div><div class='add'>+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y</div><div class='add'>+CONFIG_PREEMPT=y</div><div class='add'>+CONFIG_HZ=100</div><div class='add'>+CONFIG_AEABI=y</div><div class='add'>+CONFIG_OABI_COMPAT=y</div><div class='add'>+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set</div><div class='add'>+CONFIG_SELECT_MEMORY_MODEL=y</div><div class='add'>+CONFIG_FLATMEM_MANUAL=y</div><div class='add'>+# CONFIG_DISCONTIGMEM_MANUAL is not set</div><div class='add'>+# CONFIG_SPARSEMEM_MANUAL is not set</div><div class='add'>+CONFIG_FLATMEM=y</div><div class='add'>+CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='add'>+# CONFIG_SPARSEMEM_STATIC is not set</div><div class='add'>+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='add'>+CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='add'>+CONFIG_SPLIT_PTLOCK_CPUS=4096</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+CONFIG_ZONE_DMA_FLAG=1</div><div class='add'>+CONFIG_BOUNCE=y</div><div class='add'>+CONFIG_VIRT_TO_BUS=y</div><div class='add'>+CONFIG_ALIGNMENT_TRAP=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Boot options</div><div class='add'>+#</div><div class='add'>+CONFIG_ZBOOT_ROM_TEXT=0x0</div><div class='add'>+CONFIG_ZBOOT_ROM_BSS=0x0</div><div class='add'>+CONFIG_CMDLINE="mem=32M console=tty root=/dev/mmcblk0"</div><div class='add'>+# CONFIG_XIP_KERNEL is not set</div><div class='add'>+# CONFIG_KEXEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CPU Frequency scaling</div><div class='add'>+#</div><div class='add'>+# CONFIG_CPU_FREQ is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Floating point emulation</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# At least one emulation must be selected</div><div class='add'>+#</div><div class='add'>+CONFIG_FPE_NWFPE=y</div><div class='add'>+# CONFIG_FPE_NWFPE_XP is not set</div><div class='add'>+# CONFIG_FPE_FASTFPE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Userspace binary formats</div><div class='add'>+#</div><div class='add'>+CONFIG_BINFMT_ELF=y</div><div class='add'>+# CONFIG_BINFMT_AOUT is not set</div><div class='add'>+# CONFIG_BINFMT_MISC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Power management options</div><div class='add'>+#</div><div class='add'>+CONFIG_PM=y</div><div class='add'>+# CONFIG_PM_DEBUG is not set</div><div class='add'>+CONFIG_PM_SLEEP=y</div><div class='add'>+CONFIG_SUSPEND=y</div><div class='add'>+CONFIG_SUSPEND_FREEZER=y</div><div class='add'>+CONFIG_APM_EMULATION=y</div><div class='add'>+CONFIG_ARCH_SUSPEND_POSSIBLE=y</div><div class='add'>+CONFIG_NET=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking options</div><div class='add'>+#</div><div class='add'>+CONFIG_PACKET=y</div><div class='add'>+# CONFIG_PACKET_MMAP is not set</div><div class='add'>+CONFIG_UNIX=y</div><div class='add'>+# CONFIG_NET_KEY is not set</div><div class='add'>+CONFIG_INET=y</div><div class='add'>+# CONFIG_IP_MULTICAST is not set</div><div class='add'>+# CONFIG_IP_ADVANCED_ROUTER is not set</div><div class='add'>+CONFIG_IP_FIB_HASH=y</div><div class='add'>+CONFIG_IP_PNP=y</div><div class='add'>+# CONFIG_IP_PNP_DHCP is not set</div><div class='add'>+CONFIG_IP_PNP_BOOTP=y</div><div class='add'>+# CONFIG_IP_PNP_RARP is not set</div><div class='add'>+# CONFIG_NET_IPIP is not set</div><div class='add'>+# CONFIG_NET_IPGRE is not set</div><div class='add'>+# CONFIG_ARPD is not set</div><div class='add'>+# CONFIG_SYN_COOKIES is not set</div><div class='add'>+# CONFIG_INET_AH is not set</div><div class='add'>+# CONFIG_INET_ESP is not set</div><div class='add'>+# CONFIG_INET_IPCOMP is not set</div><div class='add'>+# CONFIG_INET_XFRM_TUNNEL is not set</div><div class='add'>+# CONFIG_INET_TUNNEL is not set</div><div class='add'>+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set</div><div class='add'>+# CONFIG_INET_XFRM_MODE_TUNNEL is not set</div><div class='add'>+# CONFIG_INET_XFRM_MODE_BEET is not set</div><div class='add'>+# CONFIG_INET_LRO is not set</div><div class='add'>+CONFIG_INET_DIAG=y</div><div class='add'>+CONFIG_INET_TCP_DIAG=y</div><div class='add'>+# CONFIG_TCP_CONG_ADVANCED is not set</div><div class='add'>+CONFIG_TCP_CONG_CUBIC=y</div><div class='add'>+CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='add'>+# CONFIG_TCP_MD5SIG is not set</div><div class='add'>+# CONFIG_IPV6 is not set</div><div class='add'>+# CONFIG_NETWORK_SECMARK is not set</div><div class='add'>+# CONFIG_NETFILTER is not set</div><div class='add'>+# CONFIG_IP_DCCP is not set</div><div class='add'>+# CONFIG_IP_SCTP is not set</div><div class='add'>+# CONFIG_TIPC is not set</div><div class='add'>+# CONFIG_ATM is not set</div><div class='add'>+# CONFIG_BRIDGE is not set</div><div class='add'>+# CONFIG_VLAN_8021Q is not set</div><div class='add'>+# CONFIG_DECNET is not set</div><div class='add'>+# CONFIG_LLC2 is not set</div><div class='add'>+# CONFIG_IPX is not set</div><div class='add'>+# CONFIG_ATALK is not set</div><div class='add'>+# CONFIG_X25 is not set</div><div class='add'>+# CONFIG_LAPB is not set</div><div class='add'>+# CONFIG_ECONET is not set</div><div class='add'>+# CONFIG_WAN_ROUTER is not set</div><div class='add'>+# CONFIG_NET_SCHED is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network testing</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_PKTGEN is not set</div><div class='add'>+# CONFIG_HAMRADIO is not set</div><div class='add'>+# CONFIG_CAN is not set</div><div class='add'>+# CONFIG_IRDA is not set</div><div class='add'>+# CONFIG_BT is not set</div><div class='add'>+# CONFIG_AF_RXRPC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless</div><div class='add'>+#</div><div class='add'>+# CONFIG_CFG80211 is not set</div><div class='add'>+# CONFIG_WIRELESS_EXT is not set</div><div class='add'>+# CONFIG_MAC80211 is not set</div><div class='add'>+# CONFIG_IEEE80211 is not set</div><div class='add'>+# CONFIG_RFKILL is not set</div><div class='add'>+# CONFIG_NET_9P is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Device Drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Generic Driver Options</div><div class='add'>+#</div><div class='add'>+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='add'>+CONFIG_STANDALONE=y</div><div class='add'>+CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='add'>+CONFIG_FW_LOADER=y</div><div class='add'>+CONFIG_FIRMWARE_IN_KERNEL=y</div><div class='add'>+CONFIG_EXTRA_FIRMWARE=""</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='add'>+# CONFIG_CONNECTOR is not set</div><div class='add'>+# CONFIG_MTD is not set</div><div class='add'>+# CONFIG_PARPORT is not set</div><div class='add'>+CONFIG_BLK_DEV=y</div><div class='add'>+# CONFIG_BLK_DEV_COW_COMMON is not set</div><div class='add'>+CONFIG_BLK_DEV_LOOP=y</div><div class='add'>+# CONFIG_BLK_DEV_CRYPTOLOOP is not set</div><div class='add'>+# CONFIG_BLK_DEV_NBD is not set</div><div class='add'>+# CONFIG_BLK_DEV_RAM is not set</div><div class='add'>+# CONFIG_CDROM_PKTCDVD is not set</div><div class='add'>+# CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+# CONFIG_MISC_DEVICES is not set</div><div class='add'>+CONFIG_HAVE_IDE=y</div><div class='add'>+# CONFIG_IDE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_RAID_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI is not set</div><div class='add'>+# CONFIG_SCSI_DMA is not set</div><div class='add'>+# CONFIG_SCSI_NETLINK is not set</div><div class='add'>+# CONFIG_ATA is not set</div><div class='add'>+# CONFIG_MD is not set</div><div class='add'>+# CONFIG_NETDEVICES is not set</div><div class='add'>+# CONFIG_ISDN is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input device support</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT=y</div><div class='add'>+# CONFIG_INPUT_FF_MEMLESS is not set</div><div class='add'>+# CONFIG_INPUT_POLLDEV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Userland interfaces</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT_MOUSEDEV=y</div><div class='add'>+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768</div><div class='add'>+# CONFIG_INPUT_JOYDEV is not set</div><div class='add'>+CONFIG_INPUT_EVDEV=y</div><div class='add'>+# CONFIG_INPUT_EVBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input Device Drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT_KEYBOARD=y</div><div class='add'>+# CONFIG_KEYBOARD_ATKBD is not set</div><div class='add'>+# CONFIG_KEYBOARD_SUNKBD is not set</div><div class='add'>+# CONFIG_KEYBOARD_LKKBD is not set</div><div class='add'>+# CONFIG_KEYBOARD_XTKBD is not set</div><div class='add'>+# CONFIG_KEYBOARD_NEWTON is not set</div><div class='add'>+# CONFIG_KEYBOARD_STOWAWAY is not set</div><div class='add'>+CONFIG_KEYBOARD_PXA27x=y</div><div class='add'>+# CONFIG_KEYBOARD_GPIO is not set</div><div class='add'>+# CONFIG_KEYBOARD_MATRIX is not set</div><div class='add'>+# CONFIG_INPUT_MOUSE is not set</div><div class='add'>+# CONFIG_INPUT_JOYSTICK is not set</div><div class='add'>+# CONFIG_INPUT_TABLET is not set</div><div class='add'>+# CONFIG_INPUT_TOUCHSCREEN is not set</div><div class='add'>+# CONFIG_INPUT_MISC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware I/O ports</div><div class='add'>+#</div><div class='add'>+# CONFIG_SERIO is not set</div><div class='add'>+# CONFIG_GAMEPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Character devices</div><div class='add'>+#</div><div class='add'>+CONFIG_VT=y</div><div class='add'>+CONFIG_CONSOLE_TRANSLATIONS=y</div><div class='add'>+CONFIG_VT_CONSOLE=y</div><div class='add'>+CONFIG_HW_CONSOLE=y</div><div class='add'>+# CONFIG_VT_HW_CONSOLE_BINDING is not set</div><div class='add'>+CONFIG_DEVKMEM=y</div><div class='add'>+# CONFIG_SERIAL_NONSTANDARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Serial drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_SERIAL_8250 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Non-8250 serial port support</div><div class='add'>+#</div><div class='add'>+# CONFIG_SERIAL_PXA is not set</div><div class='add'>+CONFIG_UNIX98_PTYS=y</div><div class='add'>+CONFIG_LEGACY_PTYS=y</div><div class='add'>+CONFIG_LEGACY_PTY_COUNT=256</div><div class='add'>+# CONFIG_IPMI_HANDLER is not set</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='add'>+# CONFIG_NVRAM is not set</div><div class='add'>+# CONFIG_R3964 is not set</div><div class='add'>+# CONFIG_RAW_DRIVER is not set</div><div class='add'>+# CONFIG_TCG_TPM is not set</div><div class='add'>+CONFIG_I2C=y</div><div class='add'>+CONFIG_I2C_BOARDINFO=y</div><div class='add'>+# CONFIG_I2C_CHARDEV is not set</div><div class='add'>+CONFIG_I2C_HELPER_AUTO=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C Hardware Bus support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C system bus drivers (mostly embedded / system-on-chip)</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_GPIO is not set</div><div class='add'>+# CONFIG_I2C_OCORES is not set</div><div class='add'>+CONFIG_I2C_PXA=y</div><div class='add'>+# CONFIG_I2C_PXA_SLAVE is not set</div><div class='add'>+# CONFIG_I2C_SIMTEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# External I2C/SMBus adapter drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='add'>+# CONFIG_I2C_TAOS_EVM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Other I2C/SMBus bus drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_PCA_PLATFORM is not set</div><div class='add'>+# CONFIG_I2C_STUB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous I2C Chip support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DS1682 is not set</div><div class='add'>+# CONFIG_AT24 is not set</div><div class='add'>+# CONFIG_SENSORS_EEPROM is not set</div><div class='add'>+# CONFIG_SENSORS_PCF8574 is not set</div><div class='add'>+# CONFIG_PCF8575 is not set</div><div class='add'>+# CONFIG_SENSORS_PCA9539 is not set</div><div class='add'>+# CONFIG_SENSORS_PCF8591 is not set</div><div class='add'>+# CONFIG_TPS65010 is not set</div><div class='add'>+# CONFIG_SENSORS_MAX6875 is not set</div><div class='add'>+# CONFIG_SENSORS_TSL2550 is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_CORE is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_ALGO is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_BUS is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_CHIP is not set</div><div class='add'>+CONFIG_SPI=y</div><div class='add'>+CONFIG_SPI_MASTER=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI Master Controller Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_SPI_BITBANG is not set</div><div class='add'>+# CONFIG_SPI_PXA2XX is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI Protocol Masters</div><div class='add'>+#</div><div class='add'>+# CONFIG_SPI_AT25 is not set</div><div class='add'>+CONFIG_SPI_SPIDEV=y</div><div class='add'>+# CONFIG_SPI_TLE62X0 is not set</div><div class='add'>+CONFIG_ARCH_REQUIRE_GPIOLIB=y</div><div class='add'>+CONFIG_GPIOLIB=y</div><div class='add'>+CONFIG_GPIO_SYSFS=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C GPIO expanders:</div><div class='add'>+#</div><div class='add'>+# CONFIG_GPIO_MAX732X is not set</div><div class='add'>+# CONFIG_GPIO_PCA953X is not set</div><div class='add'>+# CONFIG_GPIO_PCF857X is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCI GPIO expanders:</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI GPIO expanders:</div><div class='add'>+#</div><div class='add'>+# CONFIG_GPIO_MAX7301 is not set</div><div class='add'>+# CONFIG_GPIO_MCP23S08 is not set</div><div class='add'>+# CONFIG_W1 is not set</div><div class='add'>+CONFIG_POWER_SUPPLY=y</div><div class='add'>+# CONFIG_POWER_SUPPLY_DEBUG is not set</div><div class='add'>+CONFIG_PDA_POWER=y</div><div class='add'>+# CONFIG_APM_POWER is not set</div><div class='add'>+# CONFIG_BATTERY_DS2760 is not set</div><div class='add'>+# CONFIG_HWMON is not set</div><div class='add'>+# CONFIG_WATCHDOG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Sonics Silicon Backplane</div><div class='add'>+#</div><div class='add'>+CONFIG_SSB_POSSIBLE=y</div><div class='add'>+# CONFIG_SSB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multifunction device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='add'>+# CONFIG_MFD_SM501 is not set</div><div class='add'>+# CONFIG_HTC_EGPIO is not set</div><div class='add'>+# CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='add'>+# CONFIG_MFD_T7L66XB is not set</div><div class='add'>+# CONFIG_MFD_TC6387XB is not set</div><div class='add'>+# CONFIG_MFD_TC6393XB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia core support</div><div class='add'>+#</div><div class='add'>+# CONFIG_VIDEO_DEV is not set</div><div class='add'>+# CONFIG_DVB_CORE is not set</div><div class='add'>+# CONFIG_VIDEO_MEDIA is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_DAB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics support</div><div class='add'>+#</div><div class='add'>+# CONFIG_VGASTATE is not set</div><div class='add'>+# CONFIG_VIDEO_OUTPUT_CONTROL is not set</div><div class='add'>+CONFIG_FB=y</div><div class='add'>+# CONFIG_FIRMWARE_EDID is not set</div><div class='add'>+# CONFIG_FB_DDC is not set</div><div class='add'>+CONFIG_FB_CFB_FILLRECT=y</div><div class='add'>+CONFIG_FB_CFB_COPYAREA=y</div><div class='add'>+CONFIG_FB_CFB_IMAGEBLIT=y</div><div class='add'>+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set</div><div class='add'>+# CONFIG_FB_SYS_FILLRECT is not set</div><div class='add'>+# CONFIG_FB_SYS_COPYAREA is not set</div><div class='add'>+# CONFIG_FB_SYS_IMAGEBLIT is not set</div><div class='add'>+# CONFIG_FB_FOREIGN_ENDIAN is not set</div><div class='add'>+# CONFIG_FB_SYS_FOPS is not set</div><div class='add'>+# CONFIG_FB_SVGALIB is not set</div><div class='add'>+# CONFIG_FB_MACMODES is not set</div><div class='add'>+# CONFIG_FB_BACKLIGHT is not set</div><div class='add'>+# CONFIG_FB_MODE_HELPERS is not set</div><div class='add'>+# CONFIG_FB_TILEBLITTING is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Frame buffer hardware drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_FB_S1D13XXX is not set</div><div class='add'>+CONFIG_FB_PXA=y</div><div class='add'>+# CONFIG_FB_PXA_SMARTPANEL is not set</div><div class='add'>+# CONFIG_FB_PXA_PARAMETERS is not set</div><div class='add'>+# CONFIG_FB_MBX is not set</div><div class='add'>+# CONFIG_FB_W100 is not set</div><div class='add'>+# CONFIG_FB_AM200EPD is not set</div><div class='add'>+# CONFIG_FB_VIRTUAL is not set</div><div class='add'>+CONFIG_BACKLIGHT_LCD_SUPPORT=y</div><div class='add'>+# CONFIG_LCD_CLASS_DEVICE is not set</div><div class='add'>+CONFIG_BACKLIGHT_CLASS_DEVICE=y</div><div class='add'>+# CONFIG_BACKLIGHT_CORGI is not set</div><div class='add'>+CONFIG_BACKLIGHT_PWM=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Display device support</div><div class='add'>+#</div><div class='add'>+CONFIG_DISPLAY_SUPPORT=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Display hardware drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Console display driver support</div><div class='add'>+#</div><div class='add'>+# CONFIG_VGA_CONSOLE is not set</div><div class='add'>+CONFIG_DUMMY_CONSOLE=y</div><div class='add'>+CONFIG_FRAMEBUFFER_CONSOLE=y</div><div class='add'>+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set</div><div class='add'>+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set</div><div class='add'>+CONFIG_FONTS=y</div><div class='add'>+CONFIG_FONT_8x8=y</div><div class='add'>+# CONFIG_FONT_8x16 is not set</div><div class='add'>+# CONFIG_FONT_6x11 is not set</div><div class='add'>+# CONFIG_FONT_7x14 is not set</div><div class='add'>+# CONFIG_FONT_PEARL_8x8 is not set</div><div class='add'>+# CONFIG_FONT_ACORN_8x8 is not set</div><div class='add'>+# CONFIG_FONT_MINI_4x6 is not set</div><div class='add'>+# CONFIG_FONT_SUN8x16 is not set</div><div class='add'>+# CONFIG_FONT_SUN12x22 is not set</div><div class='add'>+# CONFIG_FONT_10x18 is not set</div><div class='add'>+# CONFIG_LOGO is not set</div><div class='add'>+# CONFIG_SOUND is not set</div><div class='add'>+# CONFIG_HID_SUPPORT is not set</div><div class='add'>+# CONFIG_USB_SUPPORT is not set</div><div class='add'>+CONFIG_MMC=y</div><div class='add'>+CONFIG_MMC_DEBUG=y</div><div class='add'>+# CONFIG_MMC_UNSAFE_RESUME is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MMC/SD Card Drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_MMC_BLOCK=y</div><div class='add'>+CONFIG_MMC_BLOCK_BOUNCE=y</div><div class='add'>+# CONFIG_SDIO_UART is not set</div><div class='add'>+# CONFIG_MMC_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MMC/SD Host Controller Drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_MMC_PXA=y</div><div class='add'>+# CONFIG_MMC_SDHCI is not set</div><div class='add'>+# CONFIG_MMC_SPI is not set</div><div class='add'>+# CONFIG_NEW_LEDS is not set</div><div class='add'>+CONFIG_RTC_LIB=y</div><div class='add'>+CONFIG_RTC_CLASS=y</div><div class='add'>+CONFIG_RTC_HCTOSYS=y</div><div class='add'>+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"</div><div class='add'>+# CONFIG_RTC_DEBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# RTC interfaces</div><div class='add'>+#</div><div class='add'>+CONFIG_RTC_INTF_SYSFS=y</div><div class='add'>+CONFIG_RTC_INTF_PROC=y</div><div class='add'>+CONFIG_RTC_INTF_DEV=y</div><div class='add'>+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set</div><div class='add'>+# CONFIG_RTC_DRV_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C RTC drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_RTC_DRV_DS1307 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1374 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1672 is not set</div><div class='add'>+# CONFIG_RTC_DRV_MAX6900 is not set</div><div class='add'>+# CONFIG_RTC_DRV_RS5C372 is not set</div><div class='add'>+# CONFIG_RTC_DRV_ISL1208 is not set</div><div class='add'>+# CONFIG_RTC_DRV_X1205 is not set</div><div class='add'>+# CONFIG_RTC_DRV_PCF8563 is not set</div><div class='add'>+# CONFIG_RTC_DRV_PCF8583 is not set</div><div class='add'>+# CONFIG_RTC_DRV_M41T80 is not set</div><div class='add'>+# CONFIG_RTC_DRV_S35390A is not set</div><div class='add'>+# CONFIG_RTC_DRV_FM3130 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI RTC drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_RTC_DRV_M41T94 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1305 is not set</div><div class='add'>+# CONFIG_RTC_DRV_MAX6902 is not set</div><div class='add'>+# CONFIG_RTC_DRV_R9701 is not set</div><div class='add'>+# CONFIG_RTC_DRV_RS5C348 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Platform RTC drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_RTC_DRV_CMOS is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1511 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1553 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1742 is not set</div><div class='add'>+# CONFIG_RTC_DRV_STK17TA8 is not set</div><div class='add'>+# CONFIG_RTC_DRV_M48T86 is not set</div><div class='add'>+# CONFIG_RTC_DRV_M48T59 is not set</div><div class='add'>+# CONFIG_RTC_DRV_V3020 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# on-CPU RTC drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_RTC_DRV_SA1100=y</div><div class='add'>+# CONFIG_DMADEVICES is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Voltage and Current regulators</div><div class='add'>+#</div><div class='add'>+# CONFIG_REGULATOR is not set</div><div class='add'>+# CONFIG_REGULATOR_FIXED_VOLTAGE is not set</div><div class='add'>+# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set</div><div class='add'>+# CONFIG_REGULATOR_BQ24022 is not set</div><div class='add'>+# CONFIG_UIO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# File systems</div><div class='add'>+#</div><div class='add'>+CONFIG_EXT2_FS=y</div><div class='add'>+# CONFIG_EXT2_FS_XATTR is not set</div><div class='add'>+# CONFIG_EXT2_FS_XIP is not set</div><div class='add'>+CONFIG_EXT3_FS=y</div><div class='add'>+CONFIG_EXT3_FS_XATTR=y</div><div class='add'>+# CONFIG_EXT3_FS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_EXT3_FS_SECURITY is not set</div><div class='add'>+# CONFIG_EXT4DEV_FS is not set</div><div class='add'>+CONFIG_JBD=y</div><div class='add'>+CONFIG_FS_MBCACHE=y</div><div class='add'>+# CONFIG_REISERFS_FS is not set</div><div class='add'>+# CONFIG_JFS_FS is not set</div><div class='add'>+# CONFIG_FS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_XFS_FS is not set</div><div class='add'>+# CONFIG_OCFS2_FS is not set</div><div class='add'>+# CONFIG_DNOTIFY is not set</div><div class='add'>+# CONFIG_INOTIFY is not set</div><div class='add'>+# CONFIG_QUOTA is not set</div><div class='add'>+# CONFIG_AUTOFS_FS is not set</div><div class='add'>+# CONFIG_AUTOFS4_FS is not set</div><div class='add'>+# CONFIG_FUSE_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CD-ROM/DVD Filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ISO9660_FS is not set</div><div class='add'>+# CONFIG_UDF_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DOS/FAT/NT Filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_FAT_FS=y</div><div class='add'>+CONFIG_MSDOS_FS=y</div><div class='add'>+CONFIG_VFAT_FS=y</div><div class='add'>+CONFIG_FAT_DEFAULT_CODEPAGE=866</div><div class='add'>+CONFIG_FAT_DEFAULT_IOCHARSET="utf8"</div><div class='add'>+# CONFIG_NTFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Pseudo filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_PROC_FS=y</div><div class='add'>+CONFIG_PROC_SYSCTL=y</div><div class='add'>+CONFIG_SYSFS=y</div><div class='add'>+CONFIG_TMPFS=y</div><div class='add'>+# CONFIG_TMPFS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_HUGETLB_PAGE is not set</div><div class='add'>+# CONFIG_CONFIGFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ADFS_FS is not set</div><div class='add'>+# CONFIG_AFFS_FS is not set</div><div class='add'>+# CONFIG_HFS_FS is not set</div><div class='add'>+# CONFIG_HFSPLUS_FS is not set</div><div class='add'>+# CONFIG_BEFS_FS is not set</div><div class='add'>+# CONFIG_BFS_FS is not set</div><div class='add'>+# CONFIG_EFS_FS is not set</div><div class='add'>+# CONFIG_CRAMFS is not set</div><div class='add'>+# CONFIG_VXFS_FS is not set</div><div class='add'>+# CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='add'>+# CONFIG_HPFS_FS is not set</div><div class='add'>+# CONFIG_QNX4FS_FS is not set</div><div class='add'>+# CONFIG_ROMFS_FS is not set</div><div class='add'>+# CONFIG_SYSV_FS is not set</div><div class='add'>+# CONFIG_UFS_FS is not set</div><div class='add'>+# CONFIG_NETWORK_FILESYSTEMS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Partition Types</div><div class='add'>+#</div><div class='add'>+# CONFIG_PARTITION_ADVANCED is not set</div><div class='add'>+CONFIG_MSDOS_PARTITION=y</div><div class='add'>+CONFIG_NLS=y</div><div class='add'>+CONFIG_NLS_DEFAULT="utf8"</div><div class='add'>+# CONFIG_NLS_CODEPAGE_437 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_737 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_775 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_850 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_852 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_855 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_857 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_860 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_861 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_862 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_863 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_864 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_865 is not set</div><div class='add'>+CONFIG_NLS_CODEPAGE_866=y</div><div class='add'>+# CONFIG_NLS_CODEPAGE_869 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_936 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_950 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_932 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_949 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_874 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_8 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_1250 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_1251 is not set</div><div class='add'>+# CONFIG_NLS_ASCII is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_1 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_2 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_3 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_4 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_5 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_6 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_7 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_9 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_13 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_14 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_15 is not set</div><div class='add'>+# CONFIG_NLS_KOI8_R is not set</div><div class='add'>+# CONFIG_NLS_KOI8_U is not set</div><div class='add'>+CONFIG_NLS_UTF8=y</div><div class='add'>+# CONFIG_DLM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel hacking</div><div class='add'>+#</div><div class='add'>+# CONFIG_PRINTK_TIME is not set</div><div class='add'>+CONFIG_ENABLE_WARN_DEPRECATED=y</div><div class='add'>+CONFIG_ENABLE_MUST_CHECK=y</div><div class='add'>+CONFIG_FRAME_WARN=1024</div><div class='add'>+# CONFIG_MAGIC_SYSRQ is not set</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='add'>+# CONFIG_DEBUG_FS is not set</div><div class='add'>+# CONFIG_HEADERS_CHECK is not set</div><div class='add'>+# CONFIG_DEBUG_KERNEL is not set</div><div class='add'>+CONFIG_DEBUG_BUGVERBOSE=y</div><div class='add'>+CONFIG_DEBUG_MEMORY_INIT=y</div><div class='add'>+CONFIG_FRAME_POINTER=y</div><div class='add'>+# CONFIG_LATENCYTOP is not set</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_IRQSOFF_TRACER is not set</div><div class='add'>+# CONFIG_PREEMPT_TRACER is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='add'>+# CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='add'>+CONFIG_DEBUG_USER=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Security options</div><div class='add'>+#</div><div class='add'>+# CONFIG_KEYS is not set</div><div class='add'>+# CONFIG_SECURITY is not set</div><div class='add'>+# CONFIG_SECURITY_FILE_CAPABILITIES is not set</div><div class='add'>+# CONFIG_CRYPTO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Library routines</div><div class='add'>+#</div><div class='add'>+CONFIG_BITREVERSE=y</div><div class='add'>+# CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='add'>+# CONFIG_GENERIC_FIND_NEXT_BIT is not set</div><div class='add'>+# CONFIG_CRC_CCITT is not set</div><div class='add'>+# CONFIG_CRC16 is not set</div><div class='add'>+CONFIG_CRC_T10DIF=y</div><div class='add'>+# CONFIG_CRC_ITU_T is not set</div><div class='add'>+CONFIG_CRC32=y</div><div class='add'>+# CONFIG_CRC7 is not set</div><div class='add'>+# CONFIG_LIBCRC32C is not set</div><div class='add'>+CONFIG_PLIST=y</div><div class='add'>+CONFIG_HAS_IOMEM=y</div><div class='add'>+CONFIG_HAS_IOPORT=y</div><div class='add'>+CONFIG_HAS_DMA=y</div><div class='head'>diff --git a/arch/arm/configs/viper_defconfig b/arch/arm/configs/viper_defconfig<br/>new file mode 100644<br/>index 000000000000..d01fecb8673e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/configs/viper_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/configs/viper_defconfig</a></div><div class='hunk'>@@ -0,0 +1,1678 @@</div><div class='add'>+#</div><div class='add'>+# Automatically generated make config: don't edit</div><div class='add'>+# Linux kernel version: 2.6.27-rc4</div><div class='add'>+# Thu Aug 21 17:12:07 2008</div><div class='add'>+#</div><div class='add'>+CONFIG_ARM=y</div><div class='add'>+CONFIG_HAVE_PWM=y</div><div class='add'>+CONFIG_SYS_SUPPORTS_APM_EMULATION=y</div><div class='add'>+CONFIG_GENERIC_GPIO=y</div><div class='add'>+CONFIG_GENERIC_TIME=y</div><div class='add'>+CONFIG_GENERIC_CLOCKEVENTS=y</div><div class='add'>+CONFIG_MMU=y</div><div class='add'>+# CONFIG_NO_IOPORT is not set</div><div class='add'>+CONFIG_GENERIC_HARDIRQS=y</div><div class='add'>+CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='add'>+CONFIG_LOCKDEP_SUPPORT=y</div><div class='add'>+CONFIG_TRACE_IRQFLAGS_SUPPORT=y</div><div class='add'>+CONFIG_HARDIRQS_SW_RESEND=y</div><div class='add'>+CONFIG_GENERIC_IRQ_PROBE=y</div><div class='add'>+CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='add'>+# CONFIG_ARCH_HAS_ILOG2_U32 is not set</div><div class='add'>+# CONFIG_ARCH_HAS_ILOG2_U64 is not set</div><div class='add'>+CONFIG_GENERIC_HWEIGHT=y</div><div class='add'>+CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_ARCH_SUPPORTS_AOUT=y</div><div class='add'>+CONFIG_ZONE_DMA=y</div><div class='add'>+CONFIG_ARCH_MTD_XIP=y</div><div class='add'>+CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y</div><div class='add'>+CONFIG_VECTORS_BASE=0xffff0000</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# General setup</div><div class='add'>+#</div><div class='add'>+CONFIG_EXPERIMENTAL=y</div><div class='add'>+CONFIG_BROKEN_ON_SMP=y</div><div class='add'>+CONFIG_INIT_ENV_ARG_LIMIT=32</div><div class='add'>+CONFIG_LOCALVERSION=""</div><div class='add'>+CONFIG_LOCALVERSION_AUTO=y</div><div class='add'>+# CONFIG_SWAP is not set</div><div class='add'>+CONFIG_SYSVIPC=y</div><div class='add'>+CONFIG_SYSVIPC_SYSCTL=y</div><div class='add'>+# CONFIG_POSIX_MQUEUE is not set</div><div class='add'>+# CONFIG_BSD_PROCESS_ACCT is not set</div><div class='add'>+# CONFIG_TASKSTATS is not set</div><div class='add'>+# CONFIG_AUDIT is not set</div><div class='add'>+# CONFIG_IKCONFIG is not set</div><div class='add'>+CONFIG_LOG_BUF_SHIFT=13</div><div class='add'>+# CONFIG_CGROUPS is not set</div><div class='add'>+# CONFIG_GROUP_SCHED is not set</div><div class='add'>+CONFIG_SYSFS_DEPRECATED=y</div><div class='add'>+CONFIG_SYSFS_DEPRECATED_V2=y</div><div class='add'>+# CONFIG_RELAY is not set</div><div class='add'>+# CONFIG_NAMESPACES is not set</div><div class='add'>+# CONFIG_BLK_DEV_INITRD is not set</div><div class='add'>+CONFIG_CC_OPTIMIZE_FOR_SIZE=y</div><div class='add'>+CONFIG_SYSCTL=y</div><div class='add'>+CONFIG_EMBEDDED=y</div><div class='add'>+CONFIG_UID16=y</div><div class='add'>+CONFIG_SYSCTL_SYSCALL=y</div><div class='add'>+CONFIG_KALLSYMS=y</div><div class='add'>+# CONFIG_KALLSYMS_ALL is not set</div><div class='add'>+# CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='add'>+CONFIG_HOTPLUG=y</div><div class='add'>+CONFIG_PRINTK=y</div><div class='add'>+CONFIG_BUG=y</div><div class='add'>+# CONFIG_ELF_CORE is not set</div><div class='add'>+CONFIG_COMPAT_BRK=y</div><div class='add'>+CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_FUTEX=y</div><div class='add'>+CONFIG_ANON_INODES=y</div><div class='add'>+CONFIG_EPOLL=y</div><div class='add'>+CONFIG_SIGNALFD=y</div><div class='add'>+CONFIG_TIMERFD=y</div><div class='add'>+CONFIG_EVENTFD=y</div><div class='add'>+# CONFIG_SHMEM is not set</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='add'>+CONFIG_SLAB=y</div><div class='add'>+# CONFIG_SLUB is not set</div><div class='add'>+# CONFIG_SLOB is not set</div><div class='add'>+# CONFIG_PROFILING is not set</div><div class='add'>+# CONFIG_MARKERS is not set</div><div class='add'>+CONFIG_HAVE_OPROFILE=y</div><div class='add'>+# CONFIG_KPROBES is not set</div><div class='add'>+# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set</div><div class='add'>+# CONFIG_HAVE_IOREMAP_PROT is not set</div><div class='add'>+CONFIG_HAVE_KPROBES=y</div><div class='add'>+CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+# CONFIG_HAVE_ARCH_TRACEHOOK is not set</div><div class='add'>+# CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+CONFIG_HAVE_CLK=y</div><div class='add'>+CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+CONFIG_HAVE_GENERIC_DMA_COHERENT=y</div><div class='add'>+CONFIG_SLABINFO=y</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='add'>+CONFIG_TINY_SHMEM=y</div><div class='add'>+CONFIG_BASE_SMALL=0</div><div class='add'>+CONFIG_MODULES=y</div><div class='add'>+# CONFIG_MODULE_FORCE_LOAD is not set</div><div class='add'>+CONFIG_MODULE_UNLOAD=y</div><div class='add'>+# CONFIG_MODULE_FORCE_UNLOAD is not set</div><div class='add'>+# CONFIG_MODVERSIONS is not set</div><div class='add'>+# CONFIG_MODULE_SRCVERSION_ALL is not set</div><div class='add'>+CONFIG_KMOD=y</div><div class='add'>+CONFIG_BLOCK=y</div><div class='add'>+# CONFIG_LBD is not set</div><div class='add'>+# CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='add'>+# CONFIG_LSF is not set</div><div class='add'>+# CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IO Schedulers</div><div class='add'>+#</div><div class='add'>+CONFIG_IOSCHED_NOOP=y</div><div class='add'>+# CONFIG_IOSCHED_AS is not set</div><div class='add'>+CONFIG_IOSCHED_DEADLINE=y</div><div class='add'>+# CONFIG_IOSCHED_CFQ is not set</div><div class='add'>+# CONFIG_DEFAULT_AS is not set</div><div class='add'>+CONFIG_DEFAULT_DEADLINE=y</div><div class='add'>+# CONFIG_DEFAULT_CFQ is not set</div><div class='add'>+# CONFIG_DEFAULT_NOOP is not set</div><div class='add'>+CONFIG_DEFAULT_IOSCHED="deadline"</div><div class='add'>+CONFIG_CLASSIC_RCU=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# System Type</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARCH_AAEC2000 is not set</div><div class='add'>+# CONFIG_ARCH_INTEGRATOR is not set</div><div class='add'>+# CONFIG_ARCH_REALVIEW is not set</div><div class='add'>+# CONFIG_ARCH_VERSATILE is not set</div><div class='add'>+# CONFIG_ARCH_AT91 is not set</div><div class='add'>+# CONFIG_ARCH_CLPS7500 is not set</div><div class='add'>+# CONFIG_ARCH_CLPS711X is not set</div><div class='add'>+# CONFIG_ARCH_EBSA110 is not set</div><div class='add'>+# CONFIG_ARCH_EP93XX is not set</div><div class='add'>+# CONFIG_ARCH_FOOTBRIDGE is not set</div><div class='add'>+# CONFIG_ARCH_NETX is not set</div><div class='add'>+# CONFIG_ARCH_H720X is not set</div><div class='add'>+# CONFIG_ARCH_IMX is not set</div><div class='add'>+# CONFIG_ARCH_IOP13XX is not set</div><div class='add'>+# CONFIG_ARCH_IOP32X is not set</div><div class='add'>+# CONFIG_ARCH_IOP33X is not set</div><div class='add'>+# CONFIG_ARCH_IXP23XX is not set</div><div class='add'>+# CONFIG_ARCH_IXP2000 is not set</div><div class='add'>+# CONFIG_ARCH_IXP4XX is not set</div><div class='add'>+# CONFIG_ARCH_L7200 is not set</div><div class='add'>+# CONFIG_ARCH_KIRKWOOD is not set</div><div class='add'>+# CONFIG_ARCH_KS8695 is not set</div><div class='add'>+# CONFIG_ARCH_NS9XXX is not set</div><div class='add'>+# CONFIG_ARCH_LOKI is not set</div><div class='add'>+# CONFIG_ARCH_MV78XX0 is not set</div><div class='add'>+# CONFIG_ARCH_MXC is not set</div><div class='add'>+# CONFIG_ARCH_ORION5X is not set</div><div class='add'>+# CONFIG_ARCH_PNX4008 is not set</div><div class='add'>+CONFIG_ARCH_PXA=y</div><div class='add'>+# CONFIG_ARCH_RPC is not set</div><div class='add'>+# CONFIG_ARCH_SA1100 is not set</div><div class='add'>+# CONFIG_ARCH_S3C2410 is not set</div><div class='add'>+# CONFIG_ARCH_SHARK is not set</div><div class='add'>+# CONFIG_ARCH_LH7A40X is not set</div><div class='add'>+# CONFIG_ARCH_DAVINCI is not set</div><div class='add'>+# CONFIG_ARCH_OMAP is not set</div><div class='add'>+# CONFIG_ARCH_MSM7X00A is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Intel PXA2xx/PXA3xx Implementations</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARCH_GUMSTIX is not set</div><div class='add'>+# CONFIG_ARCH_LUBBOCK is not set</div><div class='add'>+# CONFIG_MACH_LOGICPD_PXA270 is not set</div><div class='add'>+# CONFIG_MACH_MAINSTONE is not set</div><div class='add'>+# CONFIG_ARCH_PXA_IDP is not set</div><div class='add'>+# CONFIG_PXA_SHARPSL is not set</div><div class='add'>+CONFIG_ARCH_VIPER=y</div><div class='add'>+# CONFIG_ARCH_PXA_ESERIES is not set</div><div class='add'>+# CONFIG_MACH_TRIZEPS4 is not set</div><div class='add'>+# CONFIG_MACH_EM_X270 is not set</div><div class='add'>+# CONFIG_MACH_COLIBRI is not set</div><div class='add'>+# CONFIG_MACH_ZYLONITE is not set</div><div class='add'>+# CONFIG_MACH_LITTLETON is not set</div><div class='add'>+# CONFIG_MACH_TAVOREVB is not set</div><div class='add'>+# CONFIG_MACH_SAAR is not set</div><div class='add'>+# CONFIG_MACH_ARMCORE is not set</div><div class='add'>+# CONFIG_MACH_MAGICIAN is not set</div><div class='add'>+# CONFIG_MACH_PCM027 is not set</div><div class='add'>+# CONFIG_ARCH_PXA_PALM is not set</div><div class='add'>+# CONFIG_PXA_EZX is not set</div><div class='add'>+CONFIG_PXA25x=y</div><div class='add'>+CONFIG_PXA_PWM=m</div><div class='add'>+CONFIG_PXA_HAVE_ISA_IRQS=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Boot options</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Power management</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Processor Type</div><div class='add'>+#</div><div class='add'>+CONFIG_CPU_32=y</div><div class='add'>+CONFIG_CPU_XSCALE=y</div><div class='add'>+CONFIG_CPU_32v5=y</div><div class='add'>+CONFIG_CPU_ABRT_EV5T=y</div><div class='add'>+CONFIG_CPU_PABRT_NOIFAR=y</div><div class='add'>+CONFIG_CPU_CACHE_VIVT=y</div><div class='add'>+CONFIG_CPU_TLB_V4WBI=y</div><div class='add'>+CONFIG_CPU_CP15=y</div><div class='add'>+CONFIG_CPU_CP15_MMU=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Processor Features</div><div class='add'>+#</div><div class='add'>+CONFIG_ARM_THUMB=y</div><div class='add'>+# CONFIG_CPU_DCACHE_DISABLE is not set</div><div class='add'>+# CONFIG_OUTER_CACHE is not set</div><div class='add'>+CONFIG_IWMMXT=y</div><div class='add'>+CONFIG_XSCALE_PMU=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Bus support</div><div class='add'>+#</div><div class='add'>+CONFIG_ISA=y</div><div class='add'>+# CONFIG_PCI_SYSCALL is not set</div><div class='add'>+# CONFIG_ARCH_SUPPORTS_MSI is not set</div><div class='add'>+CONFIG_PCCARD=m</div><div class='add'>+# CONFIG_PCMCIA_DEBUG is not set</div><div class='add'>+CONFIG_PCMCIA=m</div><div class='add'>+CONFIG_PCMCIA_LOAD_CIS=y</div><div class='add'>+CONFIG_PCMCIA_IOCTL=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PC-card bridges</div><div class='add'>+#</div><div class='add'>+# CONFIG_I82365 is not set</div><div class='add'>+# CONFIG_TCIC is not set</div><div class='add'>+CONFIG_PCMCIA_PXA2XX=m</div><div class='add'>+CONFIG_PCMCIA_PROBE=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel Features</div><div class='add'>+#</div><div class='add'>+CONFIG_TICK_ONESHOT=y</div><div class='add'>+# CONFIG_NO_HZ is not set</div><div class='add'>+# CONFIG_HIGH_RES_TIMERS is not set</div><div class='add'>+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y</div><div class='add'>+# CONFIG_PREEMPT is not set</div><div class='add'>+CONFIG_HZ=100</div><div class='add'>+CONFIG_AEABI=y</div><div class='add'>+CONFIG_OABI_COMPAT=y</div><div class='add'>+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set</div><div class='add'>+CONFIG_SELECT_MEMORY_MODEL=y</div><div class='add'>+CONFIG_FLATMEM_MANUAL=y</div><div class='add'>+# CONFIG_DISCONTIGMEM_MANUAL is not set</div><div class='add'>+# CONFIG_SPARSEMEM_MANUAL is not set</div><div class='add'>+CONFIG_FLATMEM=y</div><div class='add'>+CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='add'>+# CONFIG_SPARSEMEM_STATIC is not set</div><div class='add'>+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='add'>+CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='add'>+CONFIG_SPLIT_PTLOCK_CPUS=4096</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+CONFIG_ZONE_DMA_FLAG=1</div><div class='add'>+CONFIG_BOUNCE=y</div><div class='add'>+CONFIG_VIRT_TO_BUS=y</div><div class='add'>+CONFIG_ALIGNMENT_TRAP=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Boot options</div><div class='add'>+#</div><div class='add'>+CONFIG_ZBOOT_ROM_TEXT=0x0</div><div class='add'>+CONFIG_ZBOOT_ROM_BSS=0x0</div><div class='add'>+CONFIG_CMDLINE="root=31:02 rootfstype=jffs2 ro console=ttyS0,115200"</div><div class='add'>+# CONFIG_XIP_KERNEL is not set</div><div class='add'>+# CONFIG_KEXEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CPU Frequency scaling</div><div class='add'>+#</div><div class='add'>+CONFIG_CPU_FREQ=y</div><div class='add'>+CONFIG_CPU_FREQ_TABLE=y</div><div class='add'>+# CONFIG_CPU_FREQ_DEBUG is not set</div><div class='add'>+CONFIG_CPU_FREQ_STAT=y</div><div class='add'>+# CONFIG_CPU_FREQ_STAT_DETAILS is not set</div><div class='add'>+CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y</div><div class='add'>+# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set</div><div class='add'>+# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set</div><div class='add'>+# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set</div><div class='add'>+# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set</div><div class='add'>+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y</div><div class='add'>+CONFIG_CPU_FREQ_GOV_POWERSAVE=m</div><div class='add'>+CONFIG_CPU_FREQ_GOV_USERSPACE=m</div><div class='add'>+CONFIG_CPU_FREQ_GOV_ONDEMAND=m</div><div class='add'>+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m</div><div class='add'>+CONFIG_CPU_FREQ_PXA=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Floating point emulation</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# At least one emulation must be selected</div><div class='add'>+#</div><div class='add'>+# CONFIG_FPE_NWFPE is not set</div><div class='add'>+CONFIG_FPE_FASTFPE=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Userspace binary formats</div><div class='add'>+#</div><div class='add'>+CONFIG_BINFMT_ELF=y</div><div class='add'>+# CONFIG_BINFMT_AOUT is not set</div><div class='add'>+# CONFIG_BINFMT_MISC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Power management options</div><div class='add'>+#</div><div class='add'>+CONFIG_PM=y</div><div class='add'>+# CONFIG_PM_DEBUG is not set</div><div class='add'>+CONFIG_PM_SLEEP=y</div><div class='add'>+CONFIG_SUSPEND=y</div><div class='add'>+CONFIG_SUSPEND_FREEZER=y</div><div class='add'>+# CONFIG_APM_EMULATION is not set</div><div class='add'>+CONFIG_ARCH_SUSPEND_POSSIBLE=y</div><div class='add'>+CONFIG_NET=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking options</div><div class='add'>+#</div><div class='add'>+CONFIG_PACKET=y</div><div class='add'>+# CONFIG_PACKET_MMAP is not set</div><div class='add'>+CONFIG_UNIX=y</div><div class='add'>+CONFIG_XFRM=y</div><div class='add'>+# CONFIG_XFRM_USER is not set</div><div class='add'>+# CONFIG_XFRM_SUB_POLICY is not set</div><div class='add'>+# CONFIG_XFRM_MIGRATE is not set</div><div class='add'>+# CONFIG_XFRM_STATISTICS is not set</div><div class='add'>+# CONFIG_NET_KEY is not set</div><div class='add'>+CONFIG_INET=y</div><div class='add'>+# CONFIG_IP_MULTICAST is not set</div><div class='add'>+# CONFIG_IP_ADVANCED_ROUTER is not set</div><div class='add'>+CONFIG_IP_FIB_HASH=y</div><div class='add'>+CONFIG_IP_PNP=y</div><div class='add'>+CONFIG_IP_PNP_DHCP=y</div><div class='add'>+# CONFIG_IP_PNP_BOOTP is not set</div><div class='add'>+# CONFIG_IP_PNP_RARP is not set</div><div class='add'>+# CONFIG_NET_IPIP is not set</div><div class='add'>+# CONFIG_NET_IPGRE is not set</div><div class='add'>+# CONFIG_ARPD is not set</div><div class='add'>+CONFIG_SYN_COOKIES=y</div><div class='add'>+# CONFIG_INET_AH is not set</div><div class='add'>+# CONFIG_INET_ESP is not set</div><div class='add'>+# CONFIG_INET_IPCOMP is not set</div><div class='add'>+# CONFIG_INET_XFRM_TUNNEL is not set</div><div class='add'>+# CONFIG_INET_TUNNEL is not set</div><div class='add'>+CONFIG_INET_XFRM_MODE_TRANSPORT=y</div><div class='add'>+CONFIG_INET_XFRM_MODE_TUNNEL=y</div><div class='add'>+CONFIG_INET_XFRM_MODE_BEET=y</div><div class='add'>+# CONFIG_INET_LRO is not set</div><div class='add'>+CONFIG_INET_DIAG=y</div><div class='add'>+CONFIG_INET_TCP_DIAG=y</div><div class='add'>+# CONFIG_TCP_CONG_ADVANCED is not set</div><div class='add'>+CONFIG_TCP_CONG_CUBIC=y</div><div class='add'>+CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='add'>+# CONFIG_TCP_MD5SIG is not set</div><div class='add'>+# CONFIG_IPV6 is not set</div><div class='add'>+# CONFIG_NETWORK_SECMARK is not set</div><div class='add'>+# CONFIG_NETFILTER is not set</div><div class='add'>+# CONFIG_IP_DCCP is not set</div><div class='add'>+# CONFIG_IP_SCTP is not set</div><div class='add'>+# CONFIG_TIPC is not set</div><div class='add'>+# CONFIG_ATM is not set</div><div class='add'>+# CONFIG_BRIDGE is not set</div><div class='add'>+# CONFIG_VLAN_8021Q is not set</div><div class='add'>+# CONFIG_DECNET is not set</div><div class='add'>+# CONFIG_LLC2 is not set</div><div class='add'>+# CONFIG_IPX is not set</div><div class='add'>+# CONFIG_ATALK is not set</div><div class='add'>+# CONFIG_X25 is not set</div><div class='add'>+# CONFIG_LAPB is not set</div><div class='add'>+# CONFIG_ECONET is not set</div><div class='add'>+# CONFIG_WAN_ROUTER is not set</div><div class='add'>+# CONFIG_NET_SCHED is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network testing</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_PKTGEN is not set</div><div class='add'>+# CONFIG_HAMRADIO is not set</div><div class='add'>+# CONFIG_CAN is not set</div><div class='add'>+# CONFIG_IRDA is not set</div><div class='add'>+CONFIG_BT=m</div><div class='add'>+CONFIG_BT_L2CAP=m</div><div class='add'>+# CONFIG_BT_SCO is not set</div><div class='add'>+CONFIG_BT_RFCOMM=m</div><div class='add'>+CONFIG_BT_RFCOMM_TTY=y</div><div class='add'>+CONFIG_BT_BNEP=m</div><div class='add'>+# CONFIG_BT_BNEP_MC_FILTER is not set</div><div class='add'>+# CONFIG_BT_BNEP_PROTO_FILTER is not set</div><div class='add'>+# CONFIG_BT_HIDP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Bluetooth device drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_BT_HCIUSB=m</div><div class='add'>+# CONFIG_BT_HCIUSB_SCO is not set</div><div class='add'>+# CONFIG_BT_HCIBTUSB is not set</div><div class='add'>+CONFIG_BT_HCIUART=m</div><div class='add'>+CONFIG_BT_HCIUART_H4=y</div><div class='add'>+CONFIG_BT_HCIUART_BCSP=y</div><div class='add'>+# CONFIG_BT_HCIUART_LL is not set</div><div class='add'>+# CONFIG_BT_HCIBCM203X is not set</div><div class='add'>+# CONFIG_BT_HCIBPA10X is not set</div><div class='add'>+# CONFIG_BT_HCIBFUSB is not set</div><div class='add'>+# CONFIG_BT_HCIDTL1 is not set</div><div class='add'>+# CONFIG_BT_HCIBT3C is not set</div><div class='add'>+# CONFIG_BT_HCIBLUECARD is not set</div><div class='add'>+# CONFIG_BT_HCIBTUART is not set</div><div class='add'>+# CONFIG_BT_HCIVHCI is not set</div><div class='add'>+# CONFIG_AF_RXRPC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless</div><div class='add'>+#</div><div class='add'>+# CONFIG_CFG80211 is not set</div><div class='add'>+# CONFIG_WIRELESS_EXT is not set</div><div class='add'>+# CONFIG_MAC80211 is not set</div><div class='add'>+CONFIG_IEEE80211=m</div><div class='add'>+# CONFIG_IEEE80211_DEBUG is not set</div><div class='add'>+CONFIG_IEEE80211_CRYPT_WEP=m</div><div class='add'>+# CONFIG_IEEE80211_CRYPT_CCMP is not set</div><div class='add'>+# CONFIG_IEEE80211_CRYPT_TKIP is not set</div><div class='add'>+# CONFIG_RFKILL is not set</div><div class='add'>+# CONFIG_NET_9P is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Device Drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Generic Driver Options</div><div class='add'>+#</div><div class='add'>+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='add'>+CONFIG_STANDALONE=y</div><div class='add'>+CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='add'>+CONFIG_FW_LOADER=m</div><div class='add'>+CONFIG_FIRMWARE_IN_KERNEL=y</div><div class='add'>+CONFIG_EXTRA_FIRMWARE=""</div><div class='add'>+# CONFIG_DEBUG_DRIVER is not set</div><div class='add'>+# CONFIG_DEBUG_DEVRES is not set</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='add'>+# CONFIG_CONNECTOR is not set</div><div class='add'>+CONFIG_MTD=y</div><div class='add'>+# CONFIG_MTD_DEBUG is not set</div><div class='add'>+# CONFIG_MTD_CONCAT is not set</div><div class='add'>+CONFIG_MTD_PARTITIONS=y</div><div class='add'>+CONFIG_MTD_REDBOOT_PARTS=y</div><div class='add'>+CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=0</div><div class='add'>+# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set</div><div class='add'>+# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set</div><div class='add'>+# CONFIG_MTD_CMDLINE_PARTS is not set</div><div class='add'>+# CONFIG_MTD_AFS_PARTS is not set</div><div class='add'>+# CONFIG_MTD_AR7_PARTS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# User Modules And Translation Layers</div><div class='add'>+#</div><div class='add'>+CONFIG_MTD_CHAR=m</div><div class='add'>+CONFIG_MTD_BLKDEVS=y</div><div class='add'>+CONFIG_MTD_BLOCK=y</div><div class='add'>+# CONFIG_FTL is not set</div><div class='add'>+# CONFIG_NFTL is not set</div><div class='add'>+# CONFIG_INFTL is not set</div><div class='add'>+# CONFIG_RFD_FTL is not set</div><div class='add'>+# CONFIG_SSFDC is not set</div><div class='add'>+# CONFIG_MTD_OOPS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# RAM/ROM/Flash chip drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_MTD_CFI=y</div><div class='add'>+CONFIG_MTD_JEDECPROBE=y</div><div class='add'>+CONFIG_MTD_GEN_PROBE=y</div><div class='add'>+CONFIG_MTD_CFI_ADV_OPTIONS=y</div><div class='add'>+CONFIG_MTD_CFI_NOSWAP=y</div><div class='add'>+# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set</div><div class='add'>+# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set</div><div class='add'>+CONFIG_MTD_CFI_GEOMETRY=y</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_1=y</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_2=y</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_4 is not set</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set</div><div class='add'>+CONFIG_MTD_CFI_I1=y</div><div class='add'>+# CONFIG_MTD_CFI_I2 is not set</div><div class='add'>+# CONFIG_MTD_CFI_I4 is not set</div><div class='add'>+# CONFIG_MTD_CFI_I8 is not set</div><div class='add'>+# CONFIG_MTD_OTP is not set</div><div class='add'>+CONFIG_MTD_CFI_INTELEXT=y</div><div class='add'>+CONFIG_MTD_CFI_AMDSTD=y</div><div class='add'>+# CONFIG_MTD_CFI_STAA is not set</div><div class='add'>+CONFIG_MTD_CFI_UTIL=y</div><div class='add'>+CONFIG_MTD_RAM=y</div><div class='add'>+# CONFIG_MTD_ROM is not set</div><div class='add'>+# CONFIG_MTD_ABSENT is not set</div><div class='add'>+# CONFIG_MTD_XIP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Mapping drivers for chip access</div><div class='add'>+#</div><div class='add'>+CONFIG_MTD_COMPLEX_MAPPINGS=y</div><div class='add'>+CONFIG_MTD_PHYSMAP=y</div><div class='add'>+CONFIG_MTD_PHYSMAP_START=0x8000000</div><div class='add'>+CONFIG_MTD_PHYSMAP_LEN=0</div><div class='add'>+CONFIG_MTD_PHYSMAP_BANKWIDTH=2</div><div class='add'>+CONFIG_MTD_PXA2XX=y</div><div class='add'>+# CONFIG_MTD_ARM_INTEGRATOR is not set</div><div class='add'>+# CONFIG_MTD_IMPA7 is not set</div><div class='add'>+# CONFIG_MTD_SHARP_SL is not set</div><div class='add'>+# CONFIG_MTD_PLATRAM is not set</div><div class='add'>+CONFIG_MTD_SPARSE_RAM=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Self-contained MTD device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_SLRAM is not set</div><div class='add'>+# CONFIG_MTD_PHRAM is not set</div><div class='add'>+# CONFIG_MTD_MTDRAM is not set</div><div class='add'>+# CONFIG_MTD_BLOCK2MTD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Disk-On-Chip Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_DOC2000 is not set</div><div class='add'>+# CONFIG_MTD_DOC2001 is not set</div><div class='add'>+# CONFIG_MTD_DOC2001PLUS is not set</div><div class='add'>+# CONFIG_MTD_NAND is not set</div><div class='add'>+# CONFIG_MTD_ONENAND is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# UBI - Unsorted block images</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_UBI is not set</div><div class='add'>+# CONFIG_PARPORT is not set</div><div class='add'>+# CONFIG_PNP is not set</div><div class='add'>+CONFIG_BLK_DEV=y</div><div class='add'>+# CONFIG_BLK_DEV_COW_COMMON is not set</div><div class='add'>+CONFIG_BLK_DEV_LOOP=m</div><div class='add'>+# CONFIG_BLK_DEV_CRYPTOLOOP is not set</div><div class='add'>+# CONFIG_BLK_DEV_NBD is not set</div><div class='add'>+# CONFIG_BLK_DEV_UB is not set</div><div class='add'>+# CONFIG_BLK_DEV_RAM is not set</div><div class='add'>+# CONFIG_CDROM_PKTCDVD is not set</div><div class='add'>+# CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+CONFIG_MISC_DEVICES=y</div><div class='add'>+# CONFIG_EEPROM_93CX6 is not set</div><div class='add'>+# CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+CONFIG_HAVE_IDE=y</div><div class='add'>+# CONFIG_IDE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_RAID_ATTRS is not set</div><div class='add'>+CONFIG_SCSI=m</div><div class='add'>+CONFIG_SCSI_DMA=y</div><div class='add'>+# CONFIG_SCSI_TGT is not set</div><div class='add'>+# CONFIG_SCSI_NETLINK is not set</div><div class='add'>+# CONFIG_SCSI_PROC_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI support type (disk, tape, CD-ROM)</div><div class='add'>+#</div><div class='add'>+CONFIG_BLK_DEV_SD=m</div><div class='add'>+# CONFIG_CHR_DEV_ST is not set</div><div class='add'>+# CONFIG_CHR_DEV_OSST is not set</div><div class='add'>+# CONFIG_BLK_DEV_SR is not set</div><div class='add'>+# CONFIG_CHR_DEV_SG is not set</div><div class='add'>+# CONFIG_CHR_DEV_SCH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs</div><div class='add'>+#</div><div class='add'>+# CONFIG_SCSI_MULTI_LUN is not set</div><div class='add'>+# CONFIG_SCSI_CONSTANTS is not set</div><div class='add'>+# CONFIG_SCSI_LOGGING is not set</div><div class='add'>+# CONFIG_SCSI_SCAN_ASYNC is not set</div><div class='add'>+CONFIG_SCSI_WAIT_SCAN=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI Transports</div><div class='add'>+#</div><div class='add'>+# CONFIG_SCSI_SPI_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_FC_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_ISCSI_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_SAS_LIBSAS is not set</div><div class='add'>+# CONFIG_SCSI_SRP_ATTRS is not set</div><div class='add'>+CONFIG_SCSI_LOWLEVEL=y</div><div class='add'>+# CONFIG_ISCSI_TCP is not set</div><div class='add'>+# CONFIG_SCSI_AHA152X is not set</div><div class='add'>+# CONFIG_SCSI_AIC7XXX_OLD is not set</div><div class='add'>+# CONFIG_SCSI_ADVANSYS is not set</div><div class='add'>+# CONFIG_SCSI_IN2000 is not set</div><div class='add'>+# CONFIG_SCSI_DTC3280 is not set</div><div class='add'>+# CONFIG_SCSI_FUTURE_DOMAIN is not set</div><div class='add'>+# CONFIG_SCSI_GENERIC_NCR5380 is not set</div><div class='add'>+# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set</div><div class='add'>+# CONFIG_SCSI_NCR53C406A is not set</div><div class='add'>+# CONFIG_SCSI_PAS16 is not set</div><div class='add'>+# CONFIG_SCSI_QLOGIC_FAS is not set</div><div class='add'>+# CONFIG_SCSI_SYM53C416 is not set</div><div class='add'>+# CONFIG_SCSI_T128 is not set</div><div class='add'>+# CONFIG_SCSI_DEBUG is not set</div><div class='add'>+# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set</div><div class='add'>+# CONFIG_SCSI_DH is not set</div><div class='add'>+CONFIG_ATA=m</div><div class='add'>+# CONFIG_ATA_NONSTANDARD is not set</div><div class='add'>+# CONFIG_SATA_PMP is not set</div><div class='add'>+CONFIG_ATA_SFF=y</div><div class='add'>+# CONFIG_SATA_MV is not set</div><div class='add'>+# CONFIG_PATA_LEGACY is not set</div><div class='add'>+CONFIG_PATA_PCMCIA=m</div><div class='add'>+# CONFIG_PATA_QDI is not set</div><div class='add'>+# CONFIG_PATA_WINBOND_VLB is not set</div><div class='add'>+# CONFIG_PATA_PLATFORM is not set</div><div class='add'>+# CONFIG_MD is not set</div><div class='add'>+CONFIG_NETDEVICES=y</div><div class='add'>+# CONFIG_DUMMY is not set</div><div class='add'>+# CONFIG_BONDING is not set</div><div class='add'>+# CONFIG_MACVLAN is not set</div><div class='add'>+# CONFIG_EQUALIZER is not set</div><div class='add'>+# CONFIG_TUN is not set</div><div class='add'>+# CONFIG_VETH is not set</div><div class='add'>+# CONFIG_ARCNET is not set</div><div class='add'>+# CONFIG_PHYLIB is not set</div><div class='add'>+CONFIG_NET_ETHERNET=y</div><div class='add'>+CONFIG_MII=y</div><div class='add'>+# CONFIG_AX88796 is not set</div><div class='add'>+# CONFIG_NET_VENDOR_3COM is not set</div><div class='add'>+# CONFIG_NET_VENDOR_SMC is not set</div><div class='add'>+CONFIG_SMC91X=y</div><div class='add'>+# CONFIG_DM9000 is not set</div><div class='add'>+# CONFIG_SMC911X is not set</div><div class='add'>+# CONFIG_NET_VENDOR_RACAL is not set</div><div class='add'>+# CONFIG_AT1700 is not set</div><div class='add'>+# CONFIG_DEPCA is not set</div><div class='add'>+# CONFIG_HP100 is not set</div><div class='add'>+# CONFIG_NET_ISA is not set</div><div class='add'>+# CONFIG_IBM_NEW_EMAC_ZMII is not set</div><div class='add'>+# CONFIG_IBM_NEW_EMAC_RGMII is not set</div><div class='add'>+# CONFIG_IBM_NEW_EMAC_TAH is not set</div><div class='add'>+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set</div><div class='add'>+# CONFIG_NET_PCI is not set</div><div class='add'>+# CONFIG_B44 is not set</div><div class='add'>+# CONFIG_NETDEV_1000 is not set</div><div class='add'>+# CONFIG_NETDEV_10000 is not set</div><div class='add'>+# CONFIG_TR is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless LAN</div><div class='add'>+#</div><div class='add'>+# CONFIG_WLAN_PRE80211 is not set</div><div class='add'>+# CONFIG_WLAN_80211 is not set</div><div class='add'>+# CONFIG_IWLWIFI_LEDS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Network Adapters</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_CATC is not set</div><div class='add'>+# CONFIG_USB_KAWETH is not set</div><div class='add'>+CONFIG_USB_PEGASUS=m</div><div class='add'>+# CONFIG_USB_RTL8150 is not set</div><div class='add'>+CONFIG_USB_USBNET=m</div><div class='add'>+CONFIG_USB_NET_AX8817X=m</div><div class='add'>+CONFIG_USB_NET_CDCETHER=m</div><div class='add'>+# CONFIG_USB_NET_DM9601 is not set</div><div class='add'>+# CONFIG_USB_NET_GL620A is not set</div><div class='add'>+CONFIG_USB_NET_NET1080=m</div><div class='add'>+# CONFIG_USB_NET_PLUSB is not set</div><div class='add'>+# CONFIG_USB_NET_MCS7830 is not set</div><div class='add'>+# CONFIG_USB_NET_RNDIS_HOST is not set</div><div class='add'>+# CONFIG_USB_NET_CDC_SUBSET is not set</div><div class='add'>+CONFIG_USB_NET_ZAURUS=m</div><div class='add'>+CONFIG_NET_PCMCIA=y</div><div class='add'>+# CONFIG_PCMCIA_3C589 is not set</div><div class='add'>+# CONFIG_PCMCIA_3C574 is not set</div><div class='add'>+# CONFIG_PCMCIA_FMVJ18X is not set</div><div class='add'>+# CONFIG_PCMCIA_PCNET is not set</div><div class='add'>+# CONFIG_PCMCIA_NMCLAN is not set</div><div class='add'>+# CONFIG_PCMCIA_SMC91C92 is not set</div><div class='add'>+# CONFIG_PCMCIA_XIRC2PS is not set</div><div class='add'>+# CONFIG_PCMCIA_AXNET is not set</div><div class='add'>+# CONFIG_WAN is not set</div><div class='add'>+CONFIG_PPP=m</div><div class='add'>+# CONFIG_PPP_MULTILINK is not set</div><div class='add'>+# CONFIG_PPP_FILTER is not set</div><div class='add'>+CONFIG_PPP_ASYNC=m</div><div class='add'>+# CONFIG_PPP_SYNC_TTY is not set</div><div class='add'>+CONFIG_PPP_DEFLATE=m</div><div class='add'>+CONFIG_PPP_BSDCOMP=m</div><div class='add'>+# CONFIG_PPP_MPPE is not set</div><div class='add'>+# CONFIG_PPPOE is not set</div><div class='add'>+# CONFIG_PPPOL2TP is not set</div><div class='add'>+# CONFIG_SLIP is not set</div><div class='add'>+CONFIG_SLHC=m</div><div class='add'>+# CONFIG_NETCONSOLE is not set</div><div class='add'>+# CONFIG_NETPOLL is not set</div><div class='add'>+# CONFIG_NET_POLL_CONTROLLER is not set</div><div class='add'>+# CONFIG_ISDN is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input device support</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT=y</div><div class='add'>+# CONFIG_INPUT_FF_MEMLESS is not set</div><div class='add'>+# CONFIG_INPUT_POLLDEV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Userland interfaces</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT_MOUSEDEV=m</div><div class='add'>+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768</div><div class='add'>+# CONFIG_INPUT_JOYDEV is not set</div><div class='add'>+CONFIG_INPUT_EVDEV=m</div><div class='add'>+# CONFIG_INPUT_EVBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_INPUT_KEYBOARD is not set</div><div class='add'>+# CONFIG_INPUT_MOUSE is not set</div><div class='add'>+# CONFIG_INPUT_JOYSTICK is not set</div><div class='add'>+# CONFIG_INPUT_TABLET is not set</div><div class='add'>+CONFIG_INPUT_TOUCHSCREEN=y</div><div class='add'>+CONFIG_TOUCHSCREEN_FUJITSU=m</div><div class='add'>+# CONFIG_TOUCHSCREEN_GUNZE is not set</div><div class='add'>+CONFIG_TOUCHSCREEN_ELO=m</div><div class='add'>+CONFIG_TOUCHSCREEN_MTOUCH=m</div><div class='add'>+CONFIG_TOUCHSCREEN_INEXIO=m</div><div class='add'>+# CONFIG_TOUCHSCREEN_MK712 is not set</div><div class='add'>+CONFIG_TOUCHSCREEN_HTCPEN=m</div><div class='add'>+CONFIG_TOUCHSCREEN_PENMOUNT=m</div><div class='add'>+CONFIG_TOUCHSCREEN_TOUCHRIGHT=m</div><div class='add'>+CONFIG_TOUCHSCREEN_TOUCHWIN=m</div><div class='add'>+# CONFIG_TOUCHSCREEN_UCB1400 is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_WM97XX is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set</div><div class='add'>+CONFIG_TOUCHSCREEN_TOUCHIT213=m</div><div class='add'>+CONFIG_INPUT_MISC=y</div><div class='add'>+# CONFIG_INPUT_ATI_REMOTE is not set</div><div class='add'>+# CONFIG_INPUT_ATI_REMOTE2 is not set</div><div class='add'>+# CONFIG_INPUT_KEYSPAN_REMOTE is not set</div><div class='add'>+# CONFIG_INPUT_POWERMATE is not set</div><div class='add'>+# CONFIG_INPUT_YEALINK is not set</div><div class='add'>+CONFIG_INPUT_UINPUT=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware I/O ports</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIO=y</div><div class='add'>+CONFIG_SERIO_SERPORT=y</div><div class='add'>+# CONFIG_SERIO_LIBPS2 is not set</div><div class='add'>+# CONFIG_SERIO_RAW is not set</div><div class='add'>+# CONFIG_GAMEPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Character devices</div><div class='add'>+#</div><div class='add'>+CONFIG_VT=y</div><div class='add'>+# CONFIG_CONSOLE_TRANSLATIONS is not set</div><div class='add'>+# CONFIG_VT_CONSOLE is not set</div><div class='add'>+CONFIG_HW_CONSOLE=y</div><div class='add'>+# CONFIG_VT_HW_CONSOLE_BINDING is not set</div><div class='add'>+CONFIG_DEVKMEM=y</div><div class='add'>+# CONFIG_SERIAL_NONSTANDARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Serial drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIAL_8250=m</div><div class='add'>+# CONFIG_SERIAL_8250_CS is not set</div><div class='add'>+CONFIG_SERIAL_8250_NR_UARTS=5</div><div class='add'>+CONFIG_SERIAL_8250_RUNTIME_UARTS=5</div><div class='add'>+# CONFIG_SERIAL_8250_EXTENDED is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Non-8250 serial port support</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIAL_PXA=y</div><div class='add'>+CONFIG_SERIAL_PXA_CONSOLE=y</div><div class='add'>+CONFIG_SERIAL_CORE=y</div><div class='add'>+CONFIG_SERIAL_CORE_CONSOLE=y</div><div class='add'>+CONFIG_UNIX98_PTYS=y</div><div class='add'>+# CONFIG_LEGACY_PTYS is not set</div><div class='add'>+# CONFIG_IPMI_HANDLER is not set</div><div class='add'>+CONFIG_HW_RANDOM=m</div><div class='add'>+# CONFIG_NVRAM is not set</div><div class='add'>+# CONFIG_DTLK is not set</div><div class='add'>+# CONFIG_R3964 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCMCIA character devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_SYNCLINK_CS is not set</div><div class='add'>+# CONFIG_CARDMAN_4000 is not set</div><div class='add'>+# CONFIG_CARDMAN_4040 is not set</div><div class='add'>+# CONFIG_IPWIRELESS is not set</div><div class='add'>+# CONFIG_RAW_DRIVER is not set</div><div class='add'>+# CONFIG_TCG_TPM is not set</div><div class='add'>+CONFIG_DEVPORT=y</div><div class='add'>+CONFIG_I2C=y</div><div class='add'>+CONFIG_I2C_BOARDINFO=y</div><div class='add'>+CONFIG_I2C_CHARDEV=y</div><div class='add'>+# CONFIG_I2C_HELPER_AUTO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C Algorithms</div><div class='add'>+#</div><div class='add'>+CONFIG_I2C_ALGOBIT=y</div><div class='add'>+# CONFIG_I2C_ALGOPCF is not set</div><div class='add'>+# CONFIG_I2C_ALGOPCA is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C Hardware Bus support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C system bus drivers (mostly embedded / system-on-chip)</div><div class='add'>+#</div><div class='add'>+CONFIG_I2C_GPIO=y</div><div class='add'>+# CONFIG_I2C_OCORES is not set</div><div class='add'>+CONFIG_I2C_PXA=y</div><div class='add'>+# CONFIG_I2C_PXA_SLAVE is not set</div><div class='add'>+# CONFIG_I2C_SIMTEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# External I2C/SMBus adapter drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='add'>+# CONFIG_I2C_TAOS_EVM is not set</div><div class='add'>+# CONFIG_I2C_TINY_USB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Other I2C/SMBus bus drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_ELEKTOR is not set</div><div class='add'>+# CONFIG_I2C_PCA_ISA is not set</div><div class='add'>+# CONFIG_I2C_PCA_PLATFORM is not set</div><div class='add'>+# CONFIG_I2C_STUB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous I2C Chip support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DS1682 is not set</div><div class='add'>+# CONFIG_AT24 is not set</div><div class='add'>+# CONFIG_SENSORS_EEPROM is not set</div><div class='add'>+# CONFIG_SENSORS_PCF8574 is not set</div><div class='add'>+# CONFIG_PCF8575 is not set</div><div class='add'>+# CONFIG_SENSORS_PCA9539 is not set</div><div class='add'>+# CONFIG_SENSORS_PCF8591 is not set</div><div class='add'>+# CONFIG_TPS65010 is not set</div><div class='add'>+# CONFIG_SENSORS_MAX6875 is not set</div><div class='add'>+# CONFIG_SENSORS_TSL2550 is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_CORE is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_ALGO is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_BUS is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_CHIP is not set</div><div class='add'>+# CONFIG_SPI is not set</div><div class='add'>+CONFIG_ARCH_REQUIRE_GPIOLIB=y</div><div class='add'>+CONFIG_GPIOLIB=y</div><div class='add'>+# CONFIG_DEBUG_GPIO is not set</div><div class='add'>+CONFIG_GPIO_SYSFS=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C GPIO expanders:</div><div class='add'>+#</div><div class='add'>+# CONFIG_GPIO_MAX732X is not set</div><div class='add'>+# CONFIG_GPIO_PCA953X is not set</div><div class='add'>+# CONFIG_GPIO_PCF857X is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCI GPIO expanders:</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI GPIO expanders:</div><div class='add'>+#</div><div class='add'>+# CONFIG_W1 is not set</div><div class='add'>+# CONFIG_POWER_SUPPLY is not set</div><div class='add'>+CONFIG_HWMON=y</div><div class='add'>+# CONFIG_HWMON_VID is not set</div><div class='add'>+# CONFIG_SENSORS_AD7414 is not set</div><div class='add'>+# CONFIG_SENSORS_AD7418 is not set</div><div class='add'>+# CONFIG_SENSORS_ADM1021 is not set</div><div class='add'>+# CONFIG_SENSORS_ADM1025 is not set</div><div class='add'>+# CONFIG_SENSORS_ADM1026 is not set</div><div class='add'>+# CONFIG_SENSORS_ADM1029 is not set</div><div class='add'>+# CONFIG_SENSORS_ADM1031 is not set</div><div class='add'>+# CONFIG_SENSORS_ADM9240 is not set</div><div class='add'>+# CONFIG_SENSORS_ADT7470 is not set</div><div class='add'>+# CONFIG_SENSORS_ADT7473 is not set</div><div class='add'>+# CONFIG_SENSORS_ATXP1 is not set</div><div class='add'>+# CONFIG_SENSORS_DS1621 is not set</div><div class='add'>+# CONFIG_SENSORS_F71805F is not set</div><div class='add'>+# CONFIG_SENSORS_F71882FG is not set</div><div class='add'>+# CONFIG_SENSORS_F75375S is not set</div><div class='add'>+# CONFIG_SENSORS_GL518SM is not set</div><div class='add'>+# CONFIG_SENSORS_GL520SM is not set</div><div class='add'>+# CONFIG_SENSORS_IT87 is not set</div><div class='add'>+# CONFIG_SENSORS_LM63 is not set</div><div class='add'>+# CONFIG_SENSORS_LM75 is not set</div><div class='add'>+# CONFIG_SENSORS_LM77 is not set</div><div class='add'>+# CONFIG_SENSORS_LM78 is not set</div><div class='add'>+# CONFIG_SENSORS_LM80 is not set</div><div class='add'>+# CONFIG_SENSORS_LM83 is not set</div><div class='add'>+# CONFIG_SENSORS_LM85 is not set</div><div class='add'>+# CONFIG_SENSORS_LM87 is not set</div><div class='add'>+# CONFIG_SENSORS_LM90 is not set</div><div class='add'>+# CONFIG_SENSORS_LM92 is not set</div><div class='add'>+# CONFIG_SENSORS_LM93 is not set</div><div class='add'>+# CONFIG_SENSORS_MAX1619 is not set</div><div class='add'>+# CONFIG_SENSORS_MAX6650 is not set</div><div class='add'>+# CONFIG_SENSORS_PC87360 is not set</div><div class='add'>+# CONFIG_SENSORS_PC87427 is not set</div><div class='add'>+# CONFIG_SENSORS_DME1737 is not set</div><div class='add'>+# CONFIG_SENSORS_SMSC47M1 is not set</div><div class='add'>+# CONFIG_SENSORS_SMSC47M192 is not set</div><div class='add'>+# CONFIG_SENSORS_SMSC47B397 is not set</div><div class='add'>+# CONFIG_SENSORS_ADS7828 is not set</div><div class='add'>+# CONFIG_SENSORS_THMC50 is not set</div><div class='add'>+# CONFIG_SENSORS_VT1211 is not set</div><div class='add'>+# CONFIG_SENSORS_W83781D is not set</div><div class='add'>+# CONFIG_SENSORS_W83791D is not set</div><div class='add'>+# CONFIG_SENSORS_W83792D is not set</div><div class='add'>+# CONFIG_SENSORS_W83793 is not set</div><div class='add'>+# CONFIG_SENSORS_W83L785TS is not set</div><div class='add'>+# CONFIG_SENSORS_W83L786NG is not set</div><div class='add'>+# CONFIG_SENSORS_W83627HF is not set</div><div class='add'>+# CONFIG_SENSORS_W83627EHF is not set</div><div class='add'>+# CONFIG_HWMON_DEBUG_CHIP is not set</div><div class='add'>+CONFIG_WATCHDOG=y</div><div class='add'>+# CONFIG_WATCHDOG_NOWAYOUT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Watchdog Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_SOFT_WATCHDOG is not set</div><div class='add'>+# CONFIG_SA1100_WATCHDOG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# ISA-based Watchdog Cards</div><div class='add'>+#</div><div class='add'>+# CONFIG_PCWATCHDOG is not set</div><div class='add'>+# CONFIG_MIXCOMWD is not set</div><div class='add'>+# CONFIG_WDT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB-based Watchdog Cards</div><div class='add'>+#</div><div class='add'>+# CONFIG_USBPCWATCHDOG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Sonics Silicon Backplane</div><div class='add'>+#</div><div class='add'>+CONFIG_SSB_POSSIBLE=y</div><div class='add'>+# CONFIG_SSB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multifunction device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='add'>+# CONFIG_MFD_SM501 is not set</div><div class='add'>+# CONFIG_HTC_EGPIO is not set</div><div class='add'>+# CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='add'>+# CONFIG_MFD_T7L66XB is not set</div><div class='add'>+# CONFIG_MFD_TC6387XB is not set</div><div class='add'>+# CONFIG_MFD_TC6393XB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia core support</div><div class='add'>+#</div><div class='add'>+# CONFIG_VIDEO_DEV is not set</div><div class='add'>+# CONFIG_DVB_CORE is not set</div><div class='add'>+# CONFIG_VIDEO_MEDIA is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_DAB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics support</div><div class='add'>+#</div><div class='add'>+# CONFIG_VGASTATE is not set</div><div class='add'>+# CONFIG_VIDEO_OUTPUT_CONTROL is not set</div><div class='add'>+CONFIG_FB=y</div><div class='add'>+# CONFIG_FIRMWARE_EDID is not set</div><div class='add'>+# CONFIG_FB_DDC is not set</div><div class='add'>+CONFIG_FB_CFB_FILLRECT=m</div><div class='add'>+CONFIG_FB_CFB_COPYAREA=m</div><div class='add'>+CONFIG_FB_CFB_IMAGEBLIT=m</div><div class='add'>+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set</div><div class='add'>+# CONFIG_FB_SYS_FILLRECT is not set</div><div class='add'>+# CONFIG_FB_SYS_COPYAREA is not set</div><div class='add'>+# CONFIG_FB_SYS_IMAGEBLIT is not set</div><div class='add'>+# CONFIG_FB_FOREIGN_ENDIAN is not set</div><div class='add'>+# CONFIG_FB_SYS_FOPS is not set</div><div class='add'>+# CONFIG_FB_SVGALIB is not set</div><div class='add'>+# CONFIG_FB_MACMODES is not set</div><div class='add'>+# CONFIG_FB_BACKLIGHT is not set</div><div class='add'>+# CONFIG_FB_MODE_HELPERS is not set</div><div class='add'>+# CONFIG_FB_TILEBLITTING is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Frame buffer hardware drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_FB_S1D13XXX is not set</div><div class='add'>+CONFIG_FB_PXA=m</div><div class='add'>+# CONFIG_FB_PXA_SMARTPANEL is not set</div><div class='add'>+CONFIG_FB_PXA_PARAMETERS=y</div><div class='add'>+# CONFIG_FB_MBX is not set</div><div class='add'>+# CONFIG_FB_W100 is not set</div><div class='add'>+# CONFIG_FB_AM200EPD is not set</div><div class='add'>+# CONFIG_FB_VIRTUAL is not set</div><div class='add'>+CONFIG_BACKLIGHT_LCD_SUPPORT=y</div><div class='add'>+CONFIG_LCD_CLASS_DEVICE=m</div><div class='add'>+# CONFIG_LCD_ILI9320 is not set</div><div class='add'>+# CONFIG_LCD_PLATFORM is not set</div><div class='add'>+CONFIG_BACKLIGHT_CLASS_DEVICE=m</div><div class='add'>+# CONFIG_BACKLIGHT_CORGI is not set</div><div class='add'>+CONFIG_BACKLIGHT_PWM=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Display device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DISPLAY_SUPPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Console display driver support</div><div class='add'>+#</div><div class='add'>+# CONFIG_VGA_CONSOLE is not set</div><div class='add'>+# CONFIG_MDA_CONSOLE is not set</div><div class='add'>+CONFIG_DUMMY_CONSOLE=y</div><div class='add'>+CONFIG_FRAMEBUFFER_CONSOLE=m</div><div class='add'>+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set</div><div class='add'>+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set</div><div class='add'>+# CONFIG_FONTS is not set</div><div class='add'>+CONFIG_FONT_8x8=y</div><div class='add'>+CONFIG_FONT_8x16=y</div><div class='add'>+CONFIG_LOGO=y</div><div class='add'>+CONFIG_LOGO_LINUX_MONO=y</div><div class='add'>+CONFIG_LOGO_LINUX_VGA16=y</div><div class='add'>+CONFIG_LOGO_LINUX_CLUT224=y</div><div class='add'>+CONFIG_SOUND=m</div><div class='add'>+CONFIG_SND=m</div><div class='add'>+CONFIG_SND_TIMER=m</div><div class='add'>+CONFIG_SND_PCM=m</div><div class='add'>+# CONFIG_SND_SEQUENCER is not set</div><div class='add'>+CONFIG_SND_OSSEMUL=y</div><div class='add'>+CONFIG_SND_MIXER_OSS=m</div><div class='add'>+CONFIG_SND_PCM_OSS=m</div><div class='add'>+CONFIG_SND_PCM_OSS_PLUGINS=y</div><div class='add'>+# CONFIG_SND_DYNAMIC_MINORS is not set</div><div class='add'>+CONFIG_SND_SUPPORT_OLD_API=y</div><div class='add'>+CONFIG_SND_VERBOSE_PROCFS=y</div><div class='add'>+# CONFIG_SND_VERBOSE_PRINTK is not set</div><div class='add'>+# CONFIG_SND_DEBUG is not set</div><div class='add'>+CONFIG_SND_VMASTER=y</div><div class='add'>+CONFIG_SND_AC97_CODEC=m</div><div class='add'>+CONFIG_SND_DRIVERS=y</div><div class='add'>+# CONFIG_SND_DUMMY is not set</div><div class='add'>+# CONFIG_SND_MTPAV is not set</div><div class='add'>+# CONFIG_SND_SERIAL_U16550 is not set</div><div class='add'>+# CONFIG_SND_MPU401 is not set</div><div class='add'>+# CONFIG_SND_AC97_POWER_SAVE is not set</div><div class='add'>+CONFIG_SND_ARM=y</div><div class='add'>+CONFIG_SND_PXA2XX_PCM=m</div><div class='add'>+CONFIG_SND_PXA2XX_AC97=m</div><div class='add'>+CONFIG_SND_USB=y</div><div class='add'>+# CONFIG_SND_USB_AUDIO is not set</div><div class='add'>+# CONFIG_SND_USB_CAIAQ is not set</div><div class='add'>+CONFIG_SND_PCMCIA=y</div><div class='add'>+# CONFIG_SND_VXPOCKET is not set</div><div class='add'>+# CONFIG_SND_PDAUDIOCF is not set</div><div class='add'>+# CONFIG_SND_SOC is not set</div><div class='add'>+# CONFIG_SOUND_PRIME is not set</div><div class='add'>+CONFIG_AC97_BUS=m</div><div class='add'>+CONFIG_HID_SUPPORT=y</div><div class='add'>+CONFIG_HID=y</div><div class='add'>+# CONFIG_HID_DEBUG is not set</div><div class='add'>+# CONFIG_HIDRAW is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Input Devices</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_HID=m</div><div class='add'>+# CONFIG_USB_HIDINPUT_POWERBOOK is not set</div><div class='add'>+# CONFIG_HID_FF is not set</div><div class='add'>+# CONFIG_USB_HIDDEV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB HID Boot Protocol drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_KBD is not set</div><div class='add'>+# CONFIG_USB_MOUSE is not set</div><div class='add'>+CONFIG_USB_SUPPORT=y</div><div class='add'>+CONFIG_USB_ARCH_HAS_HCD=y</div><div class='add'>+# CONFIG_USB_ARCH_HAS_OHCI is not set</div><div class='add'>+# CONFIG_USB_ARCH_HAS_EHCI is not set</div><div class='add'>+CONFIG_USB=m</div><div class='add'>+# CONFIG_USB_DEBUG is not set</div><div class='add'>+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous USB options</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_DEVICEFS=y</div><div class='add'>+CONFIG_USB_DEVICE_CLASS=y</div><div class='add'>+# CONFIG_USB_DYNAMIC_MINORS is not set</div><div class='add'>+CONFIG_USB_SUSPEND=y</div><div class='add'>+# CONFIG_USB_OTG is not set</div><div class='add'>+# CONFIG_USB_OTG_WHITELIST is not set</div><div class='add'>+# CONFIG_USB_OTG_BLACKLIST_HUB is not set</div><div class='add'>+# CONFIG_USB_MON is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Host Controller Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_C67X00_HCD is not set</div><div class='add'>+CONFIG_USB_ISP116X_HCD=m</div><div class='add'>+# CONFIG_USB_ISP1760_HCD is not set</div><div class='add'>+CONFIG_USB_SL811_HCD=m</div><div class='add'>+# CONFIG_USB_SL811_CS is not set</div><div class='add'>+CONFIG_USB_R8A66597_HCD=m</div><div class='add'>+# CONFIG_USB_MUSB_HDRC is not set</div><div class='add'>+# CONFIG_USB_GADGET_MUSB_HDRC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Device Class drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_ACM=m</div><div class='add'>+# CONFIG_USB_PRINTER is not set</div><div class='add'>+# CONFIG_USB_WDM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# may also be needed; see USB_STORAGE Help for more information</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_STORAGE=m</div><div class='add'>+# CONFIG_USB_STORAGE_DEBUG is not set</div><div class='add'>+# CONFIG_USB_STORAGE_DATAFAB is not set</div><div class='add'>+# CONFIG_USB_STORAGE_FREECOM is not set</div><div class='add'>+# CONFIG_USB_STORAGE_ISD200 is not set</div><div class='add'>+# CONFIG_USB_STORAGE_DPCM is not set</div><div class='add'>+# CONFIG_USB_STORAGE_USBAT is not set</div><div class='add'>+# CONFIG_USB_STORAGE_SDDR09 is not set</div><div class='add'>+# CONFIG_USB_STORAGE_SDDR55 is not set</div><div class='add'>+# CONFIG_USB_STORAGE_JUMPSHOT is not set</div><div class='add'>+# CONFIG_USB_STORAGE_ALAUDA is not set</div><div class='add'>+# CONFIG_USB_STORAGE_ONETOUCH is not set</div><div class='add'>+# CONFIG_USB_STORAGE_KARMA is not set</div><div class='add'>+# CONFIG_USB_STORAGE_SIERRA is not set</div><div class='add'>+# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set</div><div class='add'>+# CONFIG_USB_LIBUSUAL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Imaging devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_MDC800 is not set</div><div class='add'>+# CONFIG_USB_MICROTEK is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB port drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_SERIAL=m</div><div class='add'>+# CONFIG_USB_EZUSB is not set</div><div class='add'>+CONFIG_USB_SERIAL_GENERIC=y</div><div class='add'>+# CONFIG_USB_SERIAL_AIRCABLE is not set</div><div class='add'>+# CONFIG_USB_SERIAL_ARK3116 is not set</div><div class='add'>+# CONFIG_USB_SERIAL_BELKIN is not set</div><div class='add'>+# CONFIG_USB_SERIAL_CH341 is not set</div><div class='add'>+# CONFIG_USB_SERIAL_WHITEHEAT is not set</div><div class='add'>+# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set</div><div class='add'>+# CONFIG_USB_SERIAL_CP2101 is not set</div><div class='add'>+# CONFIG_USB_SERIAL_CYPRESS_M8 is not set</div><div class='add'>+# CONFIG_USB_SERIAL_EMPEG is not set</div><div class='add'>+# CONFIG_USB_SERIAL_FTDI_SIO is not set</div><div class='add'>+# CONFIG_USB_SERIAL_FUNSOFT is not set</div><div class='add'>+# CONFIG_USB_SERIAL_VISOR is not set</div><div class='add'>+# CONFIG_USB_SERIAL_IPAQ is not set</div><div class='add'>+# CONFIG_USB_SERIAL_IR is not set</div><div class='add'>+# CONFIG_USB_SERIAL_EDGEPORT is not set</div><div class='add'>+# CONFIG_USB_SERIAL_EDGEPORT_TI is not set</div><div class='add'>+# CONFIG_USB_SERIAL_GARMIN is not set</div><div class='add'>+# CONFIG_USB_SERIAL_IPW is not set</div><div class='add'>+# CONFIG_USB_SERIAL_IUU is not set</div><div class='add'>+# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set</div><div class='add'>+# CONFIG_USB_SERIAL_KEYSPAN is not set</div><div class='add'>+# CONFIG_USB_SERIAL_KLSI is not set</div><div class='add'>+# CONFIG_USB_SERIAL_KOBIL_SCT is not set</div><div class='add'>+CONFIG_USB_SERIAL_MCT_U232=m</div><div class='add'>+# CONFIG_USB_SERIAL_MOS7720 is not set</div><div class='add'>+# CONFIG_USB_SERIAL_MOS7840 is not set</div><div class='add'>+# CONFIG_USB_SERIAL_MOTOROLA is not set</div><div class='add'>+# CONFIG_USB_SERIAL_NAVMAN is not set</div><div class='add'>+# CONFIG_USB_SERIAL_PL2303 is not set</div><div class='add'>+# CONFIG_USB_SERIAL_OTI6858 is not set</div><div class='add'>+# CONFIG_USB_SERIAL_SPCP8X5 is not set</div><div class='add'>+# CONFIG_USB_SERIAL_HP4X is not set</div><div class='add'>+# CONFIG_USB_SERIAL_SAFE is not set</div><div class='add'>+# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set</div><div class='add'>+# CONFIG_USB_SERIAL_TI is not set</div><div class='add'>+# CONFIG_USB_SERIAL_CYBERJACK is not set</div><div class='add'>+# CONFIG_USB_SERIAL_XIRCOM is not set</div><div class='add'>+# CONFIG_USB_SERIAL_OPTION is not set</div><div class='add'>+# CONFIG_USB_SERIAL_OMNINET is not set</div><div class='add'>+# CONFIG_USB_SERIAL_DEBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Miscellaneous drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_EMI62 is not set</div><div class='add'>+# CONFIG_USB_EMI26 is not set</div><div class='add'>+# CONFIG_USB_ADUTUX is not set</div><div class='add'>+# CONFIG_USB_RIO500 is not set</div><div class='add'>+# CONFIG_USB_LEGOTOWER is not set</div><div class='add'>+# CONFIG_USB_LCD is not set</div><div class='add'>+# CONFIG_USB_BERRY_CHARGE is not set</div><div class='add'>+# CONFIG_USB_LED is not set</div><div class='add'>+# CONFIG_USB_CYPRESS_CY7C63 is not set</div><div class='add'>+# CONFIG_USB_CYTHERM is not set</div><div class='add'>+# CONFIG_USB_PHIDGET is not set</div><div class='add'>+# CONFIG_USB_IDMOUSE is not set</div><div class='add'>+# CONFIG_USB_FTDI_ELAN is not set</div><div class='add'>+# CONFIG_USB_APPLEDISPLAY is not set</div><div class='add'>+# CONFIG_USB_LD is not set</div><div class='add'>+# CONFIG_USB_TRANCEVIBRATOR is not set</div><div class='add'>+# CONFIG_USB_IOWARRIOR is not set</div><div class='add'>+# CONFIG_USB_TEST is not set</div><div class='add'>+# CONFIG_USB_ISIGHTFW is not set</div><div class='add'>+CONFIG_USB_GADGET=m</div><div class='add'>+# CONFIG_USB_GADGET_DEBUG is not set</div><div class='add'>+# CONFIG_USB_GADGET_DEBUG_FILES is not set</div><div class='add'>+CONFIG_USB_GADGET_SELECTED=y</div><div class='add'>+# CONFIG_USB_GADGET_AMD5536UDC is not set</div><div class='add'>+# CONFIG_USB_GADGET_ATMEL_USBA is not set</div><div class='add'>+# CONFIG_USB_GADGET_FSL_USB2 is not set</div><div class='add'>+# CONFIG_USB_GADGET_NET2280 is not set</div><div class='add'>+CONFIG_USB_GADGET_PXA25X=y</div><div class='add'>+CONFIG_USB_PXA25X=m</div><div class='add'>+# CONFIG_USB_PXA25X_SMALL is not set</div><div class='add'>+# CONFIG_USB_GADGET_M66592 is not set</div><div class='add'>+# CONFIG_USB_GADGET_PXA27X is not set</div><div class='add'>+# CONFIG_USB_GADGET_GOKU is not set</div><div class='add'>+# CONFIG_USB_GADGET_LH7A40X is not set</div><div class='add'>+# CONFIG_USB_GADGET_OMAP is not set</div><div class='add'>+# CONFIG_USB_GADGET_S3C2410 is not set</div><div class='add'>+# CONFIG_USB_GADGET_AT91 is not set</div><div class='add'>+# CONFIG_USB_GADGET_DUMMY_HCD is not set</div><div class='add'>+# CONFIG_USB_GADGET_DUALSPEED is not set</div><div class='add'>+# CONFIG_USB_ZERO is not set</div><div class='add'>+CONFIG_USB_ETH=m</div><div class='add'>+CONFIG_USB_ETH_RNDIS=y</div><div class='add'>+CONFIG_USB_GADGETFS=m</div><div class='add'>+CONFIG_USB_FILE_STORAGE=m</div><div class='add'>+# CONFIG_USB_FILE_STORAGE_TEST is not set</div><div class='add'>+CONFIG_USB_G_SERIAL=m</div><div class='add'>+# CONFIG_USB_MIDI_GADGET is not set</div><div class='add'>+CONFIG_USB_G_PRINTER=m</div><div class='add'>+# CONFIG_USB_CDC_COMPOSITE is not set</div><div class='add'>+# CONFIG_MMC is not set</div><div class='add'>+# CONFIG_NEW_LEDS is not set</div><div class='add'>+CONFIG_RTC_LIB=y</div><div class='add'>+CONFIG_RTC_CLASS=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# RTC interfaces</div><div class='add'>+#</div><div class='add'>+CONFIG_RTC_INTF_SYSFS=y</div><div class='add'>+CONFIG_RTC_INTF_PROC=y</div><div class='add'>+CONFIG_RTC_INTF_DEV=y</div><div class='add'>+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set</div><div class='add'>+# CONFIG_RTC_DRV_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C RTC drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_RTC_DRV_DS1307=m</div><div class='add'>+# CONFIG_RTC_DRV_DS1374 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1672 is not set</div><div class='add'>+# CONFIG_RTC_DRV_MAX6900 is not set</div><div class='add'>+# CONFIG_RTC_DRV_RS5C372 is not set</div><div class='add'>+# CONFIG_RTC_DRV_ISL1208 is not set</div><div class='add'>+# CONFIG_RTC_DRV_X1205 is not set</div><div class='add'>+# CONFIG_RTC_DRV_PCF8563 is not set</div><div class='add'>+# CONFIG_RTC_DRV_PCF8583 is not set</div><div class='add'>+# CONFIG_RTC_DRV_M41T80 is not set</div><div class='add'>+# CONFIG_RTC_DRV_S35390A is not set</div><div class='add'>+# CONFIG_RTC_DRV_FM3130 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI RTC drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Platform RTC drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_RTC_DRV_CMOS is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1511 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1553 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1742 is not set</div><div class='add'>+# CONFIG_RTC_DRV_STK17TA8 is not set</div><div class='add'>+# CONFIG_RTC_DRV_M48T86 is not set</div><div class='add'>+# CONFIG_RTC_DRV_M48T59 is not set</div><div class='add'>+# CONFIG_RTC_DRV_V3020 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# on-CPU RTC drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_RTC_DRV_SA1100=m</div><div class='add'>+# CONFIG_DMADEVICES is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Voltage and Current regulators</div><div class='add'>+#</div><div class='add'>+# CONFIG_REGULATOR is not set</div><div class='add'>+# CONFIG_REGULATOR_FIXED_VOLTAGE is not set</div><div class='add'>+# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set</div><div class='add'>+# CONFIG_REGULATOR_BQ24022 is not set</div><div class='add'>+# CONFIG_UIO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# File systems</div><div class='add'>+#</div><div class='add'>+CONFIG_EXT2_FS=m</div><div class='add'>+# CONFIG_EXT2_FS_XATTR is not set</div><div class='add'>+# CONFIG_EXT2_FS_XIP is not set</div><div class='add'>+CONFIG_EXT3_FS=m</div><div class='add'>+# CONFIG_EXT3_FS_XATTR is not set</div><div class='add'>+# CONFIG_EXT4DEV_FS is not set</div><div class='add'>+CONFIG_JBD=m</div><div class='add'>+# CONFIG_REISERFS_FS is not set</div><div class='add'>+# CONFIG_JFS_FS is not set</div><div class='add'>+# CONFIG_FS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_XFS_FS is not set</div><div class='add'>+# CONFIG_OCFS2_FS is not set</div><div class='add'>+# CONFIG_DNOTIFY is not set</div><div class='add'>+CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='add'>+# CONFIG_QUOTA is not set</div><div class='add'>+# CONFIG_AUTOFS_FS is not set</div><div class='add'>+# CONFIG_AUTOFS4_FS is not set</div><div class='add'>+# CONFIG_FUSE_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CD-ROM/DVD Filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ISO9660_FS is not set</div><div class='add'>+# CONFIG_UDF_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DOS/FAT/NT Filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_FAT_FS=m</div><div class='add'>+# CONFIG_MSDOS_FS is not set</div><div class='add'>+CONFIG_VFAT_FS=m</div><div class='add'>+CONFIG_FAT_DEFAULT_CODEPAGE=437</div><div class='add'>+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"</div><div class='add'>+# CONFIG_NTFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Pseudo filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_PROC_FS=y</div><div class='add'>+CONFIG_PROC_SYSCTL=y</div><div class='add'>+CONFIG_SYSFS=y</div><div class='add'>+CONFIG_TMPFS=y</div><div class='add'>+# CONFIG_TMPFS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_HUGETLB_PAGE is not set</div><div class='add'>+# CONFIG_CONFIGFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ADFS_FS is not set</div><div class='add'>+# CONFIG_AFFS_FS is not set</div><div class='add'>+# CONFIG_HFS_FS is not set</div><div class='add'>+# CONFIG_HFSPLUS_FS is not set</div><div class='add'>+# CONFIG_BEFS_FS is not set</div><div class='add'>+# CONFIG_BFS_FS is not set</div><div class='add'>+# CONFIG_EFS_FS is not set</div><div class='add'>+CONFIG_JFFS2_FS=y</div><div class='add'>+CONFIG_JFFS2_FS_DEBUG=0</div><div class='add'>+CONFIG_JFFS2_FS_WRITEBUFFER=y</div><div class='add'>+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set</div><div class='add'>+# CONFIG_JFFS2_SUMMARY is not set</div><div class='add'>+# CONFIG_JFFS2_FS_XATTR is not set</div><div class='add'>+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set</div><div class='add'>+CONFIG_JFFS2_ZLIB=y</div><div class='add'>+# CONFIG_JFFS2_LZO is not set</div><div class='add'>+CONFIG_JFFS2_RTIME=y</div><div class='add'>+# CONFIG_JFFS2_RUBIN is not set</div><div class='add'>+# CONFIG_CRAMFS is not set</div><div class='add'>+# CONFIG_VXFS_FS is not set</div><div class='add'>+# CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='add'>+# CONFIG_HPFS_FS is not set</div><div class='add'>+# CONFIG_QNX4FS_FS is not set</div><div class='add'>+# CONFIG_ROMFS_FS is not set</div><div class='add'>+# CONFIG_SYSV_FS is not set</div><div class='add'>+# CONFIG_UFS_FS is not set</div><div class='add'>+CONFIG_NETWORK_FILESYSTEMS=y</div><div class='add'>+CONFIG_NFS_FS=y</div><div class='add'>+CONFIG_NFS_V3=y</div><div class='add'>+# CONFIG_NFS_V3_ACL is not set</div><div class='add'>+# CONFIG_NFS_V4 is not set</div><div class='add'>+CONFIG_ROOT_NFS=y</div><div class='add'>+CONFIG_NFSD=m</div><div class='add'>+CONFIG_NFSD_V3=y</div><div class='add'>+# CONFIG_NFSD_V3_ACL is not set</div><div class='add'>+# CONFIG_NFSD_V4 is not set</div><div class='add'>+CONFIG_LOCKD=y</div><div class='add'>+CONFIG_LOCKD_V4=y</div><div class='add'>+CONFIG_EXPORTFS=m</div><div class='add'>+CONFIG_NFS_COMMON=y</div><div class='add'>+CONFIG_SUNRPC=y</div><div class='add'>+# CONFIG_RPCSEC_GSS_KRB5 is not set</div><div class='add'>+# CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='add'>+# CONFIG_SMB_FS is not set</div><div class='add'>+# CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_NCP_FS is not set</div><div class='add'>+# CONFIG_CODA_FS is not set</div><div class='add'>+# CONFIG_AFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Partition Types</div><div class='add'>+#</div><div class='add'>+CONFIG_PARTITION_ADVANCED=y</div><div class='add'>+# CONFIG_ACORN_PARTITION is not set</div><div class='add'>+# CONFIG_OSF_PARTITION is not set</div><div class='add'>+# CONFIG_AMIGA_PARTITION is not set</div><div class='add'>+# CONFIG_ATARI_PARTITION is not set</div><div class='add'>+# CONFIG_MAC_PARTITION is not set</div><div class='add'>+CONFIG_MSDOS_PARTITION=y</div><div class='add'>+# CONFIG_BSD_DISKLABEL is not set</div><div class='add'>+# CONFIG_MINIX_SUBPARTITION is not set</div><div class='add'>+# CONFIG_SOLARIS_X86_PARTITION is not set</div><div class='add'>+# CONFIG_UNIXWARE_DISKLABEL is not set</div><div class='add'>+# CONFIG_LDM_PARTITION is not set</div><div class='add'>+# CONFIG_SGI_PARTITION is not set</div><div class='add'>+# CONFIG_ULTRIX_PARTITION is not set</div><div class='add'>+# CONFIG_SUN_PARTITION is not set</div><div class='add'>+# CONFIG_KARMA_PARTITION is not set</div><div class='add'>+# CONFIG_EFI_PARTITION is not set</div><div class='add'>+# CONFIG_SYSV68_PARTITION is not set</div><div class='add'>+CONFIG_NLS=m</div><div class='add'>+CONFIG_NLS_DEFAULT="iso8859-1"</div><div class='add'>+CONFIG_NLS_CODEPAGE_437=m</div><div class='add'>+# CONFIG_NLS_CODEPAGE_737 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_775 is not set</div><div class='add'>+CONFIG_NLS_CODEPAGE_850=m</div><div class='add'>+# CONFIG_NLS_CODEPAGE_852 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_855 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_857 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_860 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_861 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_862 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_863 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_864 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_865 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_866 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_869 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_936 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_950 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_932 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_949 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_874 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_8 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_1250 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_1251 is not set</div><div class='add'>+# CONFIG_NLS_ASCII is not set</div><div class='add'>+CONFIG_NLS_ISO8859_1=m</div><div class='add'>+# CONFIG_NLS_ISO8859_2 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_3 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_4 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_5 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_6 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_7 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_9 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_13 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_14 is not set</div><div class='add'>+CONFIG_NLS_ISO8859_15=m</div><div class='add'>+# CONFIG_NLS_KOI8_R is not set</div><div class='add'>+# CONFIG_NLS_KOI8_U is not set</div><div class='add'>+CONFIG_NLS_UTF8=m</div><div class='add'>+# CONFIG_DLM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel hacking</div><div class='add'>+#</div><div class='add'>+# CONFIG_PRINTK_TIME is not set</div><div class='add'>+CONFIG_ENABLE_WARN_DEPRECATED=y</div><div class='add'>+CONFIG_ENABLE_MUST_CHECK=y</div><div class='add'>+CONFIG_FRAME_WARN=1024</div><div class='add'>+CONFIG_MAGIC_SYSRQ=y</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='add'>+# CONFIG_DEBUG_FS is not set</div><div class='add'>+# CONFIG_HEADERS_CHECK is not set</div><div class='add'>+CONFIG_DEBUG_KERNEL=y</div><div class='add'>+# CONFIG_DEBUG_SHIRQ is not set</div><div class='add'>+CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set</div><div class='add'>+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0</div><div class='add'>+CONFIG_SCHED_DEBUG=y</div><div class='add'>+# CONFIG_SCHEDSTATS is not set</div><div class='add'>+# CONFIG_TIMER_STATS is not set</div><div class='add'>+# CONFIG_DEBUG_OBJECTS is not set</div><div class='add'>+# CONFIG_DEBUG_SLAB is not set</div><div class='add'>+# CONFIG_DEBUG_RT_MUTEXES is not set</div><div class='add'>+# CONFIG_RT_MUTEX_TESTER is not set</div><div class='add'>+# CONFIG_DEBUG_SPINLOCK is not set</div><div class='add'>+CONFIG_DEBUG_MUTEXES=y</div><div class='add'>+# CONFIG_DEBUG_LOCK_ALLOC is not set</div><div class='add'>+# CONFIG_PROVE_LOCKING is not set</div><div class='add'>+# CONFIG_LOCK_STAT is not set</div><div class='add'>+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set</div><div class='add'>+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set</div><div class='add'>+# CONFIG_DEBUG_KOBJECT is not set</div><div class='add'>+CONFIG_DEBUG_BUGVERBOSE=y</div><div class='add'>+# CONFIG_DEBUG_INFO is not set</div><div class='add'>+# CONFIG_DEBUG_VM is not set</div><div class='add'>+# CONFIG_DEBUG_WRITECOUNT is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='add'>+# CONFIG_DEBUG_LIST is not set</div><div class='add'>+# CONFIG_DEBUG_SG is not set</div><div class='add'>+CONFIG_FRAME_POINTER=y</div><div class='add'>+# CONFIG_BOOT_PRINTK_DELAY is not set</div><div class='add'>+# CONFIG_RCU_TORTURE_TEST is not set</div><div class='add'>+# CONFIG_BACKTRACE_SELF_TEST is not set</div><div class='add'>+# CONFIG_FAULT_INJECTION is not set</div><div class='add'>+# CONFIG_LATENCYTOP is not set</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_IRQSOFF_TRACER is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='add'>+# CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='add'>+# CONFIG_KGDB is not set</div><div class='add'>+# CONFIG_DEBUG_USER is not set</div><div class='add'>+CONFIG_DEBUG_ERRORS=y</div><div class='add'>+# CONFIG_DEBUG_STACK_USAGE is not set</div><div class='add'>+# CONFIG_DEBUG_LL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Security options</div><div class='add'>+#</div><div class='add'>+# CONFIG_KEYS is not set</div><div class='add'>+# CONFIG_SECURITY is not set</div><div class='add'>+# CONFIG_SECURITY_FILE_CAPABILITIES is not set</div><div class='add'>+CONFIG_CRYPTO=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Crypto core or helper</div><div class='add'>+#</div><div class='add'>+CONFIG_CRYPTO_ALGAPI=m</div><div class='add'>+CONFIG_CRYPTO_BLKCIPHER=m</div><div class='add'>+CONFIG_CRYPTO_MANAGER=m</div><div class='add'>+# CONFIG_CRYPTO_GF128MUL is not set</div><div class='add'>+# CONFIG_CRYPTO_NULL is not set</div><div class='add'>+# CONFIG_CRYPTO_CRYPTD is not set</div><div class='add'>+# CONFIG_CRYPTO_AUTHENC is not set</div><div class='add'>+# CONFIG_CRYPTO_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Authenticated Encryption with Associated Data</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CCM is not set</div><div class='add'>+# CONFIG_CRYPTO_GCM is not set</div><div class='add'>+# CONFIG_CRYPTO_SEQIV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block modes</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CBC is not set</div><div class='add'>+# CONFIG_CRYPTO_CTR is not set</div><div class='add'>+# CONFIG_CRYPTO_CTS is not set</div><div class='add'>+CONFIG_CRYPTO_ECB=m</div><div class='add'>+# CONFIG_CRYPTO_LRW is not set</div><div class='add'>+# CONFIG_CRYPTO_PCBC is not set</div><div class='add'>+# CONFIG_CRYPTO_XTS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hash modes</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_HMAC is not set</div><div class='add'>+# CONFIG_CRYPTO_XCBC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Digest</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CRC32C is not set</div><div class='add'>+# CONFIG_CRYPTO_MD4 is not set</div><div class='add'>+# CONFIG_CRYPTO_MD5 is not set</div><div class='add'>+# CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='add'>+# CONFIG_CRYPTO_SHA1 is not set</div><div class='add'>+# CONFIG_CRYPTO_SHA256 is not set</div><div class='add'>+# CONFIG_CRYPTO_SHA512 is not set</div><div class='add'>+# CONFIG_CRYPTO_TGR192 is not set</div><div class='add'>+# CONFIG_CRYPTO_WP512 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ciphers</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_AES is not set</div><div class='add'>+# CONFIG_CRYPTO_ANUBIS is not set</div><div class='add'>+CONFIG_CRYPTO_ARC4=m</div><div class='add'>+# CONFIG_CRYPTO_BLOWFISH is not set</div><div class='add'>+# CONFIG_CRYPTO_CAMELLIA is not set</div><div class='add'>+# CONFIG_CRYPTO_CAST5 is not set</div><div class='add'>+# CONFIG_CRYPTO_CAST6 is not set</div><div class='add'>+# CONFIG_CRYPTO_DES is not set</div><div class='add'>+# CONFIG_CRYPTO_FCRYPT is not set</div><div class='add'>+# CONFIG_CRYPTO_KHAZAD is not set</div><div class='add'>+# CONFIG_CRYPTO_SALSA20 is not set</div><div class='add'>+# CONFIG_CRYPTO_SEED is not set</div><div class='add'>+# CONFIG_CRYPTO_SERPENT is not set</div><div class='add'>+# CONFIG_CRYPTO_TEA is not set</div><div class='add'>+# CONFIG_CRYPTO_TWOFISH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Compression</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_DEFLATE is not set</div><div class='add'>+# CONFIG_CRYPTO_LZO is not set</div><div class='add'>+CONFIG_CRYPTO_HW=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Library routines</div><div class='add'>+#</div><div class='add'>+CONFIG_BITREVERSE=y</div><div class='add'>+# CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='add'>+# CONFIG_GENERIC_FIND_NEXT_BIT is not set</div><div class='add'>+CONFIG_CRC_CCITT=m</div><div class='add'>+# CONFIG_CRC16 is not set</div><div class='add'>+CONFIG_CRC_T10DIF=m</div><div class='add'>+# CONFIG_CRC_ITU_T is not set</div><div class='add'>+CONFIG_CRC32=y</div><div class='add'>+# CONFIG_CRC7 is not set</div><div class='add'>+# CONFIG_LIBCRC32C is not set</div><div class='add'>+CONFIG_ZLIB_INFLATE=y</div><div class='add'>+CONFIG_ZLIB_DEFLATE=y</div><div class='add'>+CONFIG_PLIST=y</div><div class='add'>+CONFIG_HAS_IOMEM=y</div><div class='add'>+CONFIG_HAS_IOPORT=y</div><div class='add'>+CONFIG_HAS_DMA=y</div><div class='head'>diff --git a/arch/arm/configs/xm_x270_defconfig b/arch/arm/configs/xm_x2xx_defconfig<br/>index aa40d91ce599..f891364deceb 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/configs/xm_x270_defconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/configs/xm_x270_defconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/configs/xm_x2xx_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/configs/xm_x2xx_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.25</div><div class='del'>-# Sun May 11 15:12:52 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc8</div><div class='add'>+# Sun Oct  5 11:05:36 2008</div><div class='ctx'> #</div><div class='ctx'> CONFIG_ARM=y</div><div class='ctx'> CONFIG_SYS_SUPPORTS_APM_EMULATION=y</div><div class='hunk'>@@ -12,6 +12,7 @@ CONFIG_MMU=y</div><div class='ctx'> # CONFIG_NO_IOPORT is not set</div><div class='ctx'> CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='ctx'> CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> CONFIG_TRACE_IRQFLAGS_SUPPORT=y</div><div class='ctx'> CONFIG_HARDIRQS_SW_RESEND=y</div><div class='hunk'>@@ -24,6 +25,7 @@ CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='ctx'> CONFIG_ARCH_SUPPORTS_AOUT=y</div><div class='ctx'> CONFIG_ZONE_DMA=y</div><div class='ctx'> CONFIG_ARCH_MTD_XIP=y</div><div class='add'>+CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y</div><div class='ctx'> CONFIG_VECTORS_BASE=0xffff0000</div><div class='ctx'> CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='ctx'> </div><div class='hunk'>@@ -62,7 +64,6 @@ CONFIG_SYSCTL=y</div><div class='ctx'> CONFIG_EMBEDDED=y</div><div class='ctx'> CONFIG_UID16=y</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='del'>-CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> CONFIG_KALLSYMS=y</div><div class='ctx'> # CONFIG_KALLSYMS_ALL is not set</div><div class='ctx'> # CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='hunk'>@@ -88,14 +89,21 @@ CONFIG_SLUB=y</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='ctx'> # CONFIG_KPROBES is not set</div><div class='add'>+# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set</div><div class='add'>+# CONFIG_HAVE_IOREMAP_PROT is not set</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='ctx'> CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+# CONFIG_HAVE_ARCH_TRACEHOOK is not set</div><div class='ctx'> # CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+CONFIG_HAVE_CLK=y</div><div class='ctx'> # CONFIG_PROC_PAGE_MONITOR is not set</div><div class='add'>+CONFIG_HAVE_GENERIC_DMA_COHERENT=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> CONFIG_MODULES=y</div><div class='add'>+# CONFIG_MODULE_FORCE_LOAD is not set</div><div class='ctx'> CONFIG_MODULE_UNLOAD=y</div><div class='ctx'> # CONFIG_MODULE_FORCE_UNLOAD is not set</div><div class='ctx'> # CONFIG_MODVERSIONS is not set</div><div class='hunk'>@@ -106,6 +114,7 @@ CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -131,7 +140,6 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> # CONFIG_ARCH_AT91 is not set</div><div class='ctx'> # CONFIG_ARCH_CLPS7500 is not set</div><div class='ctx'> # CONFIG_ARCH_CLPS711X is not set</div><div class='del'>-# CONFIG_ARCH_CO285 is not set</div><div class='ctx'> # CONFIG_ARCH_EBSA110 is not set</div><div class='ctx'> # CONFIG_ARCH_EP93XX is not set</div><div class='ctx'> # CONFIG_ARCH_FOOTBRIDGE is not set</div><div class='hunk'>@@ -145,8 +153,11 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> # CONFIG_ARCH_IXP2000 is not set</div><div class='ctx'> # CONFIG_ARCH_IXP4XX is not set</div><div class='ctx'> # CONFIG_ARCH_L7200 is not set</div><div class='add'>+# CONFIG_ARCH_KIRKWOOD is not set</div><div class='ctx'> # CONFIG_ARCH_KS8695 is not set</div><div class='ctx'> # CONFIG_ARCH_NS9XXX is not set</div><div class='add'>+# CONFIG_ARCH_LOKI is not set</div><div class='add'>+# CONFIG_ARCH_MV78XX0 is not set</div><div class='ctx'> # CONFIG_ARCH_MXC is not set</div><div class='ctx'> # CONFIG_ARCH_ORION5X is not set</div><div class='ctx'> # CONFIG_ARCH_PNX4008 is not set</div><div class='hunk'>@@ -164,26 +175,32 @@ CONFIG_DMABOUNCE=y</div><div class='ctx'> #</div><div class='ctx'> # Intel PXA2xx/PXA3xx Implementations</div><div class='ctx'> #</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Select target boards</div><div class='del'>-#</div><div class='ctx'> # CONFIG_ARCH_GUMSTIX is not set</div><div class='ctx'> # CONFIG_ARCH_LUBBOCK is not set</div><div class='ctx'> # CONFIG_MACH_LOGICPD_PXA270 is not set</div><div class='ctx'> # CONFIG_MACH_MAINSTONE is not set</div><div class='add'>+# CONFIG_MACH_MP900C is not set</div><div class='ctx'> # CONFIG_ARCH_PXA_IDP is not set</div><div class='ctx'> # CONFIG_PXA_SHARPSL is not set</div><div class='add'>+# CONFIG_ARCH_VIPER is not set</div><div class='ctx'> # CONFIG_ARCH_PXA_ESERIES is not set</div><div class='del'>-# CONFIG_MACH_TRIZEPS4 is not set</div><div class='add'>+# CONFIG_TRIZEPS_PXA is not set</div><div class='ctx'> CONFIG_MACH_EM_X270=y</div><div class='ctx'> # CONFIG_MACH_COLIBRI is not set</div><div class='ctx'> # CONFIG_MACH_ZYLONITE is not set</div><div class='ctx'> # CONFIG_MACH_LITTLETON is not set</div><div class='add'>+# CONFIG_MACH_TAVOREVB is not set</div><div class='add'>+# CONFIG_MACH_SAAR is not set</div><div class='ctx'> CONFIG_MACH_ARMCORE=y</div><div class='add'>+# CONFIG_MACH_CM_X300 is not set</div><div class='ctx'> # CONFIG_MACH_MAGICIAN is not set</div><div class='add'>+# CONFIG_MACH_MIOA701 is not set</div><div class='ctx'> # CONFIG_MACH_PCM027 is not set</div><div class='add'>+# CONFIG_ARCH_PXA_PALM is not set</div><div class='add'>+# CONFIG_PXA_EZX is not set</div><div class='add'>+CONFIG_PXA25x=y</div><div class='ctx'> CONFIG_PXA27x=y</div><div class='add'>+CONFIG_PXA_SSP=y</div><div class='ctx'> # CONFIG_PXA_PWM is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -253,11 +270,17 @@ CONFIG_TICK_ONESHOT=y</div><div class='ctx'> CONFIG_NO_HZ=y</div><div class='ctx'> # CONFIG_HIGH_RES_TIMERS is not set</div><div class='ctx'> CONFIG_GENERIC_CLOCKEVENTS_BUILD=y</div><div class='add'>+CONFIG_VMSPLIT_3G=y</div><div class='add'>+# CONFIG_VMSPLIT_2G is not set</div><div class='add'>+# CONFIG_VMSPLIT_1G is not set</div><div class='add'>+CONFIG_PAGE_OFFSET=0xC0000000</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='ctx'> CONFIG_HZ=100</div><div class='ctx'> CONFIG_AEABI=y</div><div class='ctx'> CONFIG_OABI_COMPAT=y</div><div class='del'>-# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set</div><div class='add'>+CONFIG_ARCH_FLATMEM_HAS_HOLES=y</div><div class='add'>+# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set</div><div class='add'>+# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set</div><div class='ctx'> CONFIG_SELECT_MEMORY_MODEL=y</div><div class='ctx'> CONFIG_FLATMEM_MANUAL=y</div><div class='ctx'> # CONFIG_DISCONTIGMEM_MANUAL is not set</div><div class='hunk'>@@ -284,9 +307,10 @@ CONFIG_CMDLINE="root=1f03 mem=32M"</div><div class='ctx'> # CONFIG_KEXEC is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# CPU Frequency scaling</div><div class='add'>+# CPU Power Management</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_CPU_FREQ is not set</div><div class='add'>+# CONFIG_CPU_IDLE is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Floating point emulation</div><div class='hunk'>@@ -316,10 +340,6 @@ CONFIG_SUSPEND=y</div><div class='ctx'> CONFIG_SUSPEND_FREEZER=y</div><div class='ctx'> CONFIG_APM_EMULATION=m</div><div class='ctx'> CONFIG_ARCH_SUSPEND_POSSIBLE=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -402,6 +422,7 @@ CONFIG_BT_HIDP=m</div><div class='ctx'> #</div><div class='ctx'> CONFIG_BT_HCIUSB=m</div><div class='ctx'> CONFIG_BT_HCIUSB_SCO=y</div><div class='add'>+# CONFIG_BT_HCIBTUSB is not set</div><div class='ctx'> # CONFIG_BT_HCIBTSDIO is not set</div><div class='ctx'> # CONFIG_BT_HCIUART is not set</div><div class='ctx'> # CONFIG_BT_HCIBCM203X is not set</div><div class='hunk'>@@ -419,6 +440,7 @@ CONFIG_BT_HCIUSB_SCO=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_CFG80211 is not set</div><div class='ctx'> CONFIG_WIRELESS_EXT=y</div><div class='add'>+CONFIG_WIRELESS_EXT_SYSFS=y</div><div class='ctx'> # CONFIG_MAC80211 is not set</div><div class='ctx'> # CONFIG_IEEE80211 is not set</div><div class='ctx'> # CONFIG_RFKILL is not set</div><div class='hunk'>@@ -435,6 +457,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> CONFIG_FW_LOADER=m</div><div class='add'>+CONFIG_FIRMWARE_IN_KERNEL=y</div><div class='add'>+CONFIG_EXTRA_FIRMWARE=""</div><div class='ctx'> # CONFIG_DEBUG_DRIVER is not set</div><div class='ctx'> # CONFIG_DEBUG_DEVRES is not set</div><div class='ctx'> # CONFIG_SYS_HYPERVISOR is not set</div><div class='hunk'>@@ -527,6 +551,7 @@ CONFIG_MTD_NAND=y</div><div class='ctx'> # CONFIG_MTD_NAND_ECC_SMC is not set</div><div class='ctx'> # CONFIG_MTD_NAND_MUSEUM_IDS is not set</div><div class='ctx'> # CONFIG_MTD_NAND_H1900 is not set</div><div class='add'>+CONFIG_MTD_NAND_GPIO=m</div><div class='ctx'> CONFIG_MTD_NAND_IDS=y</div><div class='ctx'> # CONFIG_MTD_NAND_DISKONCHIP is not set</div><div class='ctx'> # CONFIG_MTD_NAND_SHARPSL is not set</div><div class='hunk'>@@ -636,6 +661,7 @@ CONFIG_SCSI_LOWLEVEL=y</div><div class='ctx'> # CONFIG_SCSI_DEBUG is not set</div><div class='ctx'> # CONFIG_SCSI_SRP is not set</div><div class='ctx'> # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set</div><div class='add'>+# CONFIG_SCSI_DH is not set</div><div class='ctx'> CONFIG_ATA=m</div><div class='ctx'> # CONFIG_ATA_NONSTANDARD is not set</div><div class='ctx'> # CONFIG_SATA_PMP is not set</div><div class='hunk'>@@ -696,17 +722,21 @@ CONFIG_PATA_PCMCIA=m</div><div class='ctx'> # CONFIG_PATA_VIA is not set</div><div class='ctx'> # CONFIG_PATA_WINBOND is not set</div><div class='ctx'> # CONFIG_PATA_PLATFORM is not set</div><div class='add'>+# CONFIG_PATA_SCH is not set</div><div class='ctx'> # CONFIG_MD is not set</div><div class='ctx'> # CONFIG_FUSION is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IEEE 1394 (FireWire) support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Enable only one of the two stacks, unless you know what you are doing</div><div class='add'>+#</div><div class='ctx'> # CONFIG_FIREWIRE is not set</div><div class='ctx'> # CONFIG_IEEE1394 is not set</div><div class='ctx'> # CONFIG_I2O is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='hunk'>@@ -725,6 +755,7 @@ CONFIG_MII=y</div><div class='ctx'> # CONFIG_SMC91X is not set</div><div class='ctx'> CONFIG_DM9000=y</div><div class='ctx'> CONFIG_DM9000_DEBUGLEVEL=1</div><div class='add'>+# CONFIG_DM9000_FORCE_SIMPLE_PHY_POLL is not set</div><div class='ctx'> # CONFIG_SMC911X is not set</div><div class='ctx'> # CONFIG_NET_TULIP is not set</div><div class='ctx'> # CONFIG_HP100 is not set</div><div class='hunk'>@@ -780,7 +811,6 @@ CONFIG_LIBERTAS_SDIO=m</div><div class='ctx'> # CONFIG_PRISM54 is not set</div><div class='ctx'> # CONFIG_USB_ZD1201 is not set</div><div class='ctx'> # CONFIG_USB_NET_RNDIS_WLAN is not set</div><div class='del'>-# CONFIG_IWLWIFI is not set</div><div class='ctx'> # CONFIG_IWLWIFI_LEDS is not set</div><div class='ctx'> # CONFIG_HOSTAP is not set</div><div class='ctx'> </div><div class='hunk'>@@ -853,17 +883,18 @@ CONFIG_INPUT_TOUCHSCREEN=y</div><div class='ctx'> # CONFIG_TOUCHSCREEN_GUNZE is not set</div><div class='ctx'> # CONFIG_TOUCHSCREEN_ELO is not set</div><div class='ctx'> # CONFIG_TOUCHSCREEN_MTOUCH is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_INEXIO is not set</div><div class='ctx'> # CONFIG_TOUCHSCREEN_MK712 is not set</div><div class='ctx'> # CONFIG_TOUCHSCREEN_PENMOUNT is not set</div><div class='ctx'> # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set</div><div class='ctx'> # CONFIG_TOUCHSCREEN_TOUCHWIN is not set</div><div class='del'>-CONFIG_TOUCHSCREEN_UCB1400=m</div><div class='ctx'> CONFIG_TOUCHSCREEN_WM97XX=m</div><div class='ctx'> # CONFIG_TOUCHSCREEN_WM9705 is not set</div><div class='ctx'> CONFIG_TOUCHSCREEN_WM9712=y</div><div class='ctx'> # CONFIG_TOUCHSCREEN_WM9713 is not set</div><div class='ctx'> # CONFIG_TOUCHSCREEN_WM97XX_MAINSTONE is not set</div><div class='ctx'> # CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set</div><div class='ctx'> # CONFIG_INPUT_MISC is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -880,6 +911,7 @@ CONFIG_SERIO_LIBPS2=y</div><div class='ctx'> # Character devices</div><div class='ctx'> #</div><div class='ctx'> CONFIG_VT=y</div><div class='add'>+CONFIG_CONSOLE_TRANSLATIONS=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='ctx'> # CONFIG_VT_HW_CONSOLE_BINDING is not set</div><div class='hunk'>@@ -922,45 +954,66 @@ CONFIG_DEVPORT=y</div><div class='ctx'> CONFIG_I2C=y</div><div class='ctx'> CONFIG_I2C_BOARDINFO=y</div><div class='ctx'> CONFIG_I2C_CHARDEV=m</div><div class='add'>+CONFIG_I2C_HELPER_AUTO=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # I2C Hardware Bus support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PC SMBus host controller drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_ALI1535 is not set</div><div class='ctx'> # CONFIG_I2C_ALI1563 is not set</div><div class='ctx'> # CONFIG_I2C_ALI15X3 is not set</div><div class='ctx'> # CONFIG_I2C_AMD756 is not set</div><div class='ctx'> # CONFIG_I2C_AMD8111 is not set</div><div class='del'>-# CONFIG_I2C_GPIO is not set</div><div class='ctx'> # CONFIG_I2C_I801 is not set</div><div class='del'>-# CONFIG_I2C_I810 is not set</div><div class='del'>-CONFIG_I2C_PXA=y</div><div class='del'>-# CONFIG_I2C_PXA_SLAVE is not set</div><div class='add'>+# CONFIG_I2C_ISCH is not set</div><div class='ctx'> # CONFIG_I2C_PIIX4 is not set</div><div class='ctx'> # CONFIG_I2C_NFORCE2 is not set</div><div class='del'>-# CONFIG_I2C_OCORES is not set</div><div class='del'>-# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='del'>-# CONFIG_I2C_PROSAVAGE is not set</div><div class='del'>-# CONFIG_I2C_SAVAGE4 is not set</div><div class='del'>-# CONFIG_I2C_SIMTEC is not set</div><div class='ctx'> # CONFIG_I2C_SIS5595 is not set</div><div class='ctx'> # CONFIG_I2C_SIS630 is not set</div><div class='ctx'> # CONFIG_I2C_SIS96X is not set</div><div class='del'>-# CONFIG_I2C_TAOS_EVM is not set</div><div class='del'>-# CONFIG_I2C_STUB is not set</div><div class='del'>-# CONFIG_I2C_TINY_USB is not set</div><div class='ctx'> # CONFIG_I2C_VIA is not set</div><div class='ctx'> # CONFIG_I2C_VIAPRO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C system bus drivers (mostly embedded / system-on-chip)</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_GPIO is not set</div><div class='add'>+# CONFIG_I2C_OCORES is not set</div><div class='add'>+CONFIG_I2C_PXA=y</div><div class='add'>+# CONFIG_I2C_PXA_SLAVE is not set</div><div class='add'>+# CONFIG_I2C_SIMTEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# External I2C/SMBus adapter drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='add'>+# CONFIG_I2C_TAOS_EVM is not set</div><div class='add'>+# CONFIG_I2C_TINY_USB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics adapter I2C/DDC channel drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_VOODOO3 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Other I2C/SMBus bus drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_PCA_PLATFORM is not set</div><div class='add'>+# CONFIG_I2C_STUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Miscellaneous I2C Chip support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DS1682 is not set</div><div class='add'>+# CONFIG_AT24 is not set</div><div class='ctx'> # CONFIG_SENSORS_EEPROM is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8574 is not set</div><div class='ctx'> # CONFIG_PCF8575 is not set</div><div class='add'>+# CONFIG_SENSORS_PCA9539 is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8591 is not set</div><div class='ctx'> # CONFIG_TPS65010 is not set</div><div class='ctx'> # CONFIG_SENSORS_MAX6875 is not set</div><div class='hunk'>@@ -970,25 +1023,31 @@ CONFIG_I2C_PXA=y</div><div class='ctx'> # CONFIG_I2C_DEBUG_BUS is not set</div><div class='ctx'> # CONFIG_I2C_DEBUG_CHIP is not set</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='del'>-CONFIG_HAVE_GPIO_LIB=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# GPIO Support</div><div class='del'>-#</div><div class='add'>+CONFIG_ARCH_REQUIRE_GPIOLIB=y</div><div class='add'>+CONFIG_GPIOLIB=y</div><div class='ctx'> # CONFIG_DEBUG_GPIO is not set</div><div class='add'>+# CONFIG_GPIO_SYSFS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # I2C GPIO expanders:</div><div class='ctx'> #</div><div class='add'>+# CONFIG_GPIO_MAX732X is not set</div><div class='ctx'> # CONFIG_GPIO_PCA953X is not set</div><div class='ctx'> # CONFIG_GPIO_PCF857X is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# PCI GPIO expanders:</div><div class='add'>+#</div><div class='add'>+# CONFIG_GPIO_BT8XX is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # SPI GPIO expanders:</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='add'>+# CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -1000,10 +1059,16 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_MFD_ASIC3 is not set</div><div class='ctx'> # CONFIG_HTC_EGPIO is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_UCB1400_CORE is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='add'>+# CONFIG_MFD_T7L66XB is not set</div><div class='add'>+# CONFIG_MFD_TC6387XB is not set</div><div class='add'>+# CONFIG_MFD_TC6393XB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='hunk'>@@ -1014,6 +1079,7 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='ctx'> # CONFIG_DVB_CORE is not set</div><div class='add'>+# CONFIG_VIDEO_MEDIA is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia drivers</div><div class='hunk'>@@ -1038,7 +1104,6 @@ CONFIG_FB_CFB_IMAGEBLIT=y</div><div class='ctx'> # CONFIG_FB_SYS_IMAGEBLIT is not set</div><div class='ctx'> # CONFIG_FB_FOREIGN_ENDIAN is not set</div><div class='ctx'> # CONFIG_FB_SYS_FOPS is not set</div><div class='del'>-CONFIG_FB_DEFERRED_IO=y</div><div class='ctx'> # CONFIG_FB_SVGALIB is not set</div><div class='ctx'> # CONFIG_FB_MACMODES is not set</div><div class='ctx'> # CONFIG_FB_BACKLIGHT is not set</div><div class='hunk'>@@ -1071,12 +1136,14 @@ CONFIG_FB_DEFERRED_IO=y</div><div class='ctx'> # CONFIG_FB_TRIDENT is not set</div><div class='ctx'> # CONFIG_FB_ARK is not set</div><div class='ctx'> # CONFIG_FB_PM3 is not set</div><div class='add'>+# CONFIG_FB_CARMINE is not set</div><div class='ctx'> CONFIG_FB_PXA=y</div><div class='ctx'> # CONFIG_FB_PXA_SMARTPANEL is not set</div><div class='ctx'> CONFIG_FB_PXA_PARAMETERS=y</div><div class='ctx'> CONFIG_FB_MBX=m</div><div class='del'>-# CONFIG_FB_AM200EPD is not set</div><div class='add'>+# CONFIG_FB_W100 is not set</div><div class='ctx'> # CONFIG_FB_VIRTUAL is not set</div><div class='add'>+# CONFIG_FB_METRONOME is not set</div><div class='ctx'> # CONFIG_BACKLIGHT_LCD_SUPPORT is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -1099,15 +1166,7 @@ CONFIG_LOGO=y</div><div class='ctx'> CONFIG_LOGO_LINUX_MONO=y</div><div class='ctx'> CONFIG_LOGO_LINUX_VGA16=y</div><div class='ctx'> CONFIG_LOGO_LINUX_CLUT224=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> CONFIG_SOUND=m</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Advanced Linux Sound Architecture</div><div class='del'>-#</div><div class='ctx'> CONFIG_SND=m</div><div class='ctx'> CONFIG_SND_TIMER=m</div><div class='ctx'> CONFIG_SND_PCM=m</div><div class='hunk'>@@ -1121,19 +1180,15 @@ CONFIG_SND_SUPPORT_OLD_API=y</div><div class='ctx'> CONFIG_SND_VERBOSE_PROCFS=y</div><div class='ctx'> # CONFIG_SND_VERBOSE_PRINTK is not set</div><div class='ctx'> # CONFIG_SND_DEBUG is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Generic devices</div><div class='del'>-#</div><div class='add'>+CONFIG_SND_VMASTER=y</div><div class='ctx'> CONFIG_SND_AC97_CODEC=m</div><div class='add'>+CONFIG_SND_DRIVERS=y</div><div class='ctx'> # CONFIG_SND_DUMMY is not set</div><div class='ctx'> # CONFIG_SND_MTPAV is not set</div><div class='ctx'> # CONFIG_SND_SERIAL_U16550 is not set</div><div class='ctx'> # CONFIG_SND_MPU401 is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# PCI devices</div><div class='del'>-#</div><div class='add'>+# CONFIG_SND_AC97_POWER_SAVE is not set</div><div class='add'>+CONFIG_SND_PCI=y</div><div class='ctx'> # CONFIG_SND_AD1889 is not set</div><div class='ctx'> # CONFIG_SND_ALS300 is not set</div><div class='ctx'> # CONFIG_SND_ALI5451 is not set</div><div class='hunk'>@@ -1193,42 +1248,16 @@ CONFIG_SND_AC97_CODEC=m</div><div class='ctx'> # CONFIG_SND_VIRTUOSO is not set</div><div class='ctx'> # CONFIG_SND_VX222 is not set</div><div class='ctx'> # CONFIG_SND_YMFPCI is not set</div><div class='del'>-# CONFIG_SND_AC97_POWER_SAVE is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# ALSA ARM devices</div><div class='del'>-#</div><div class='add'>+CONFIG_SND_ARM=y</div><div class='ctx'> CONFIG_SND_PXA2XX_PCM=m</div><div class='ctx'> CONFIG_SND_PXA2XX_AC97=m</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# USB devices</div><div class='del'>-#</div><div class='add'>+CONFIG_SND_USB=y</div><div class='ctx'> # CONFIG_SND_USB_AUDIO is not set</div><div class='ctx'> # CONFIG_SND_USB_CAIAQ is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# PCMCIA devices</div><div class='del'>-#</div><div class='add'>+CONFIG_SND_PCMCIA=y</div><div class='ctx'> # CONFIG_SND_VXPOCKET is not set</div><div class='ctx'> # CONFIG_SND_PDAUDIOCF is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# System on Chip audio support</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SND_SOC is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# ALSA SoC audio for Freescale SOCs</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SoC Audio for the Texas Instruments OMAP</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Open Sound System</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND_PRIME is not set</div><div class='ctx'> CONFIG_AC97_BUS=m</div><div class='ctx'> CONFIG_HID_SUPPORT=y</div><div class='hunk'>@@ -1261,12 +1290,15 @@ CONFIG_USB_DEVICEFS=y</div><div class='ctx'> # CONFIG_USB_OTG is not set</div><div class='ctx'> # CONFIG_USB_OTG_WHITELIST is not set</div><div class='ctx'> # CONFIG_USB_OTG_BLACKLIST_HUB is not set</div><div class='add'>+CONFIG_USB_MON=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB Host Controller Drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_USB_C67X00_HCD is not set</div><div class='ctx'> # CONFIG_USB_EHCI_HCD is not set</div><div class='ctx'> # CONFIG_USB_ISP116X_HCD is not set</div><div class='add'>+# CONFIG_USB_ISP1760_HCD is not set</div><div class='ctx'> CONFIG_USB_OHCI_HCD=y</div><div class='ctx'> # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set</div><div class='ctx'> # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set</div><div class='hunk'>@@ -1274,12 +1306,14 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y</div><div class='ctx'> # CONFIG_USB_UHCI_HCD is not set</div><div class='ctx'> # CONFIG_USB_SL811_HCD is not set</div><div class='ctx'> # CONFIG_USB_R8A66597_HCD is not set</div><div class='add'>+# CONFIG_USB_MUSB_HDRC is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB Device Class drivers</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USB_ACM is not set</div><div class='ctx'> # CONFIG_USB_PRINTER is not set</div><div class='add'>+# CONFIG_USB_WDM is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='hunk'>@@ -1309,7 +1343,6 @@ CONFIG_USB_STORAGE=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USB_MDC800 is not set</div><div class='ctx'> # CONFIG_USB_MICROTEK is not set</div><div class='del'>-CONFIG_USB_MON=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB port drivers</div><div class='hunk'>@@ -1322,7 +1355,6 @@ CONFIG_USB_MON=y</div><div class='ctx'> # CONFIG_USB_EMI62 is not set</div><div class='ctx'> # CONFIG_USB_EMI26 is not set</div><div class='ctx'> # CONFIG_USB_ADUTUX is not set</div><div class='del'>-# CONFIG_USB_AUERSWALD is not set</div><div class='ctx'> # CONFIG_USB_RIO500 is not set</div><div class='ctx'> # CONFIG_USB_LEGOTOWER is not set</div><div class='ctx'> # CONFIG_USB_LCD is not set</div><div class='hunk'>@@ -1338,6 +1370,7 @@ CONFIG_USB_MON=y</div><div class='ctx'> # CONFIG_USB_TRANCEVIBRATOR is not set</div><div class='ctx'> # CONFIG_USB_IOWARRIOR is not set</div><div class='ctx'> # CONFIG_USB_TEST is not set</div><div class='add'>+# CONFIG_USB_ISIGHTFW is not set</div><div class='ctx'> # CONFIG_USB_GADGET is not set</div><div class='ctx'> CONFIG_MMC=m</div><div class='ctx'> # CONFIG_MMC_DEBUG is not set</div><div class='hunk'>@@ -1349,6 +1382,7 @@ CONFIG_MMC=m</div><div class='ctx'> CONFIG_MMC_BLOCK=m</div><div class='ctx'> CONFIG_MMC_BLOCK_BOUNCE=y</div><div class='ctx'> # CONFIG_SDIO_UART is not set</div><div class='add'>+# CONFIG_MMC_TEST is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # MMC/SD Host Controller Drivers</div><div class='hunk'>@@ -1356,14 +1390,19 @@ CONFIG_MMC_BLOCK_BOUNCE=y</div><div class='ctx'> CONFIG_MMC_PXA=m</div><div class='ctx'> # CONFIG_MMC_SDHCI is not set</div><div class='ctx'> # CONFIG_MMC_TIFM_SD is not set</div><div class='add'>+# CONFIG_MMC_SDRICOH_CS is not set</div><div class='add'>+# CONFIG_MEMSTICK is not set</div><div class='add'>+# CONFIG_ACCESSIBILITY is not set</div><div class='ctx'> CONFIG_NEW_LEDS=y</div><div class='ctx'> CONFIG_LEDS_CLASS=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # LED drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_LEDS_PCA9532 is not set</div><div class='ctx'> # CONFIG_LEDS_GPIO is not set</div><div class='ctx'> CONFIG_LEDS_CM_X270=y</div><div class='add'>+# CONFIG_LEDS_PCA955X is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # LED Triggers</div><div class='hunk'>@@ -1401,6 +1440,7 @@ CONFIG_RTC_INTF_DEV=y</div><div class='ctx'> # CONFIG_RTC_DRV_PCF8583 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_M41T80 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_S35390A is not set</div><div class='add'>+# CONFIG_RTC_DRV_FM3130 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # SPI RTC drivers</div><div class='hunk'>@@ -1422,6 +1462,15 @@ CONFIG_RTC_DRV_V3020=y</div><div class='ctx'> # on-CPU RTC drivers</div><div class='ctx'> #</div><div class='ctx'> CONFIG_RTC_DRV_SA1100=y</div><div class='add'>+# CONFIG_DMADEVICES is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Voltage and Current regulators</div><div class='add'>+#</div><div class='add'>+# CONFIG_REGULATOR is not set</div><div class='add'>+# CONFIG_REGULATOR_FIXED_VOLTAGE is not set</div><div class='add'>+# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set</div><div class='add'>+# CONFIG_REGULATOR_BQ24022 is not set</div><div class='ctx'> # CONFIG_UIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -1501,6 +1550,7 @@ CONFIG_JFFS2_RTIME=y</div><div class='ctx'> # CONFIG_CRAMFS is not set</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -1511,13 +1561,12 @@ CONFIG_NFS_FS=y</div><div class='ctx'> CONFIG_NFS_V3=y</div><div class='ctx'> # CONFIG_NFS_V3_ACL is not set</div><div class='ctx'> # CONFIG_NFS_V4 is not set</div><div class='del'>-# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_ROOT_NFS=y</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_LOCKD_V4=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_KRB5 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='hunk'>@@ -1626,6 +1675,7 @@ CONFIG_DEBUG_KERNEL=y</div><div class='ctx'> # CONFIG_DEBUG_INFO is not set</div><div class='ctx'> # CONFIG_DEBUG_VM is not set</div><div class='ctx'> # CONFIG_DEBUG_WRITECOUNT is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='ctx'> # CONFIG_DEBUG_LIST is not set</div><div class='ctx'> # CONFIG_DEBUG_SG is not set</div><div class='ctx'> CONFIG_FRAME_POINTER=y</div><div class='hunk'>@@ -1633,7 +1683,17 @@ CONFIG_FRAME_POINTER=y</div><div class='ctx'> # CONFIG_RCU_TORTURE_TEST is not set</div><div class='ctx'> # CONFIG_BACKTRACE_SELF_TEST is not set</div><div class='ctx'> # CONFIG_FAULT_INJECTION is not set</div><div class='add'>+# CONFIG_LATENCYTOP is not set</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_IRQSOFF_TRACER is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='add'>+# CONFIG_KGDB is not set</div><div class='ctx'> CONFIG_DEBUG_USER=y</div><div class='ctx'> CONFIG_DEBUG_ERRORS=y</div><div class='ctx'> # CONFIG_DEBUG_STACK_USAGE is not set</div><div class='hunk'>@@ -1689,6 +1749,10 @@ CONFIG_CRYPTO=y</div><div class='ctx'> # CONFIG_CRYPTO_MD4 is not set</div><div class='ctx'> # CONFIG_CRYPTO_MD5 is not set</div><div class='ctx'> # CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA1 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA256 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA512 is not set</div><div class='hunk'>@@ -1729,6 +1793,7 @@ CONFIG_BITREVERSE=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_NEXT_BIT is not set</div><div class='ctx'> CONFIG_CRC_CCITT=m</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+# CONFIG_CRC_T10DIF is not set</div><div class='ctx'> # CONFIG_CRC_ITU_T is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='head'>diff --git a/arch/arm/include/asm/bug.h b/arch/arm/include/asm/bug.h<br/>index 7b62351f097d..4d88425a4169 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/include/asm/bug.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/include/asm/bug.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/include/asm/bug.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/include/asm/bug.h</a></div><div class='hunk'>@@ -12,7 +12,7 @@ extern void __bug(const char *file, int line) __attribute__((noreturn));</div><div class='ctx'> #else</div><div class='ctx'> </div><div class='ctx'> /* this just causes an oops */</div><div class='del'>-#define BUG()		(*(int *)0 = 0)</div><div class='add'>+#define BUG()		do { *(int *)0 = 0; } while (1)</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/include/asm/cacheflush.h b/arch/arm/include/asm/cacheflush.h<br/>index 9073d9c6567e..de6c59f814a1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/include/asm/cacheflush.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/include/asm/cacheflush.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/include/asm/cacheflush.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/include/asm/cacheflush.h</a></div><div class='hunk'>@@ -444,94 +444,4 @@ static inline void flush_ioremap_region(unsigned long phys, void __iomem *virt,</div><div class='ctx'> 	dmac_inv_range(start, start + size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define __cacheid_present(val)			(val != read_cpuid(CPUID_ID))</div><div class='del'>-#define __cacheid_type_v7(val)			((val &amp; (7 &lt;&lt; 29)) == (4 &lt;&lt; 29))</div><div class='del'>-</div><div class='del'>-#define __cacheid_vivt_prev7(val)		((val &amp; (15 &lt;&lt; 25)) != (14 &lt;&lt; 25))</div><div class='del'>-#define __cacheid_vipt_prev7(val)		((val &amp; (15 &lt;&lt; 25)) == (14 &lt;&lt; 25))</div><div class='del'>-#define __cacheid_vipt_nonaliasing_prev7(val)	((val &amp; (15 &lt;&lt; 25 | 1 &lt;&lt; 23)) == (14 &lt;&lt; 25))</div><div class='del'>-#define __cacheid_vipt_aliasing_prev7(val)	((val &amp; (15 &lt;&lt; 25 | 1 &lt;&lt; 23)) == (14 &lt;&lt; 25 | 1 &lt;&lt; 23))</div><div class='del'>-</div><div class='del'>-#define __cacheid_vivt(val)			(__cacheid_type_v7(val) ? 0 : __cacheid_vivt_prev7(val))</div><div class='del'>-#define __cacheid_vipt(val)			(__cacheid_type_v7(val) ? 1 : __cacheid_vipt_prev7(val))</div><div class='del'>-#define __cacheid_vipt_nonaliasing(val)		(__cacheid_type_v7(val) ? 1 : __cacheid_vipt_nonaliasing_prev7(val))</div><div class='del'>-#define __cacheid_vipt_aliasing(val)		(__cacheid_type_v7(val) ? 0 : __cacheid_vipt_aliasing_prev7(val))</div><div class='del'>-#define __cacheid_vivt_asid_tagged_instr(val)	(__cacheid_type_v7(val) ? ((val &amp; (3 &lt;&lt; 14)) == (1 &lt;&lt; 14)) : 0)</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_CPU_CACHE_VIVT) &amp;&amp; !defined(CONFIG_CPU_CACHE_VIPT)</div><div class='del'>-/*</div><div class='del'>- * VIVT caches only</div><div class='del'>- */</div><div class='del'>-#define cache_is_vivt()			1</div><div class='del'>-#define cache_is_vipt()			0</div><div class='del'>-#define cache_is_vipt_nonaliasing()	0</div><div class='del'>-#define cache_is_vipt_aliasing()	0</div><div class='del'>-#define icache_is_vivt_asid_tagged()	0</div><div class='del'>-</div><div class='del'>-#elif !defined(CONFIG_CPU_CACHE_VIVT) &amp;&amp; defined(CONFIG_CPU_CACHE_VIPT)</div><div class='del'>-/*</div><div class='del'>- * VIPT caches only</div><div class='del'>- */</div><div class='del'>-#define cache_is_vivt()			0</div><div class='del'>-#define cache_is_vipt()			1</div><div class='del'>-#define cache_is_vipt_nonaliasing()					\</div><div class='del'>-	({								\</div><div class='del'>-		unsigned int __val = read_cpuid(CPUID_CACHETYPE);	\</div><div class='del'>-		__cacheid_vipt_nonaliasing(__val);			\</div><div class='del'>-	})</div><div class='del'>-</div><div class='del'>-#define cache_is_vipt_aliasing()					\</div><div class='del'>-	({								\</div><div class='del'>-		unsigned int __val = read_cpuid(CPUID_CACHETYPE);	\</div><div class='del'>-		__cacheid_vipt_aliasing(__val);				\</div><div class='del'>-	})</div><div class='del'>-</div><div class='del'>-#define icache_is_vivt_asid_tagged()					\</div><div class='del'>-	({								\</div><div class='del'>-		unsigned int __val = read_cpuid(CPUID_CACHETYPE);	\</div><div class='del'>-		__cacheid_vivt_asid_tagged_instr(__val);		\</div><div class='del'>-	})</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-/*</div><div class='del'>- * VIVT or VIPT caches.  Note that this is unreliable since ARM926</div><div class='del'>- * and V6 CPUs satisfy the "(val &amp; (15 &lt;&lt; 25)) == (14 &lt;&lt; 25)" test.</div><div class='del'>- * There's no way to tell from the CacheType register what type (!)</div><div class='del'>- * the cache is.</div><div class='del'>- */</div><div class='del'>-#define cache_is_vivt()							\</div><div class='del'>-	({								\</div><div class='del'>-		unsigned int __val = read_cpuid(CPUID_CACHETYPE);	\</div><div class='del'>-		(!__cacheid_present(__val)) || __cacheid_vivt(__val);	\</div><div class='del'>-	})</div><div class='del'>-		</div><div class='del'>-#define cache_is_vipt()							\</div><div class='del'>-	({								\</div><div class='del'>-		unsigned int __val = read_cpuid(CPUID_CACHETYPE);	\</div><div class='del'>-		__cacheid_present(__val) &amp;&amp; __cacheid_vipt(__val);	\</div><div class='del'>-	})</div><div class='del'>-</div><div class='del'>-#define cache_is_vipt_nonaliasing()					\</div><div class='del'>-	({								\</div><div class='del'>-		unsigned int __val = read_cpuid(CPUID_CACHETYPE);	\</div><div class='del'>-		__cacheid_present(__val) &amp;&amp;				\</div><div class='del'>-		 __cacheid_vipt_nonaliasing(__val);			\</div><div class='del'>-	})</div><div class='del'>-</div><div class='del'>-#define cache_is_vipt_aliasing()					\</div><div class='del'>-	({								\</div><div class='del'>-		unsigned int __val = read_cpuid(CPUID_CACHETYPE);	\</div><div class='del'>-		__cacheid_present(__val) &amp;&amp;				\</div><div class='del'>-		 __cacheid_vipt_aliasing(__val);			\</div><div class='del'>-	})</div><div class='del'>-</div><div class='del'>-#define icache_is_vivt_asid_tagged()					\</div><div class='del'>-	({								\</div><div class='del'>-		unsigned int __val = read_cpuid(CPUID_CACHETYPE);	\</div><div class='del'>-		__cacheid_present(__val) &amp;&amp;				\</div><div class='del'>-		 __cacheid_vivt_asid_tagged_instr(__val);		\</div><div class='del'>-	})</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/include/asm/cachetype.h b/arch/arm/include/asm/cachetype.h<br/>new file mode 100644<br/>index 000000000000..d3a4c2cb9f2f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/include/asm/cachetype.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/include/asm/cachetype.h</a></div><div class='hunk'>@@ -0,0 +1,52 @@</div><div class='add'>+#ifndef __ASM_ARM_CACHETYPE_H</div><div class='add'>+#define __ASM_ARM_CACHETYPE_H</div><div class='add'>+</div><div class='add'>+#define CACHEID_VIVT			(1 &lt;&lt; 0)</div><div class='add'>+#define CACHEID_VIPT_NONALIASING	(1 &lt;&lt; 1)</div><div class='add'>+#define CACHEID_VIPT_ALIASING		(1 &lt;&lt; 2)</div><div class='add'>+#define CACHEID_VIPT			(CACHEID_VIPT_ALIASING|CACHEID_VIPT_NONALIASING)</div><div class='add'>+#define CACHEID_ASID_TAGGED		(1 &lt;&lt; 3)</div><div class='add'>+</div><div class='add'>+extern unsigned int cacheid;</div><div class='add'>+</div><div class='add'>+#define cache_is_vivt()			cacheid_is(CACHEID_VIVT)</div><div class='add'>+#define cache_is_vipt()			cacheid_is(CACHEID_VIPT)</div><div class='add'>+#define cache_is_vipt_nonaliasing()	cacheid_is(CACHEID_VIPT_NONALIASING)</div><div class='add'>+#define cache_is_vipt_aliasing()	cacheid_is(CACHEID_VIPT_ALIASING)</div><div class='add'>+#define icache_is_vivt_asid_tagged()	cacheid_is(CACHEID_ASID_TAGGED)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * __LINUX_ARM_ARCH__ is the minimum supported CPU architecture</div><div class='add'>+ * Mask out support which will never be present on newer CPUs.</div><div class='add'>+ * - v6+ is never VIVT</div><div class='add'>+ * - v7+ VIPT never aliases</div><div class='add'>+ */</div><div class='add'>+#if __LINUX_ARM_ARCH__ &gt;= 7</div><div class='add'>+#define __CACHEID_ARCH_MIN	(CACHEID_VIPT_NONALIASING | CACHEID_ASID_TAGGED)</div><div class='add'>+#elif __LINUX_ARM_ARCH__ &gt;= 6</div><div class='add'>+#define	__CACHEID_ARCH_MIN	(~CACHEID_VIVT)</div><div class='add'>+#else</div><div class='add'>+#define __CACHEID_ARCH_MIN	(~0)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Mask out support which isn't configured</div><div class='add'>+ */</div><div class='add'>+#if defined(CONFIG_CPU_CACHE_VIVT) &amp;&amp; !defined(CONFIG_CPU_CACHE_VIPT)</div><div class='add'>+#define __CACHEID_ALWAYS	(CACHEID_VIVT)</div><div class='add'>+#define __CACHEID_NEVER		(~CACHEID_VIVT)</div><div class='add'>+#elif !defined(CONFIG_CPU_CACHE_VIVT) &amp;&amp; defined(CONFIG_CPU_CACHE_VIPT)</div><div class='add'>+#define __CACHEID_ALWAYS	(0)</div><div class='add'>+#define __CACHEID_NEVER		(CACHEID_VIVT)</div><div class='add'>+#else</div><div class='add'>+#define __CACHEID_ALWAYS	(0)</div><div class='add'>+#define __CACHEID_NEVER		(0)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static inline unsigned int __attribute__((pure)) cacheid_is(unsigned int mask)</div><div class='add'>+{</div><div class='add'>+	return (__CACHEID_ALWAYS &amp; mask) |</div><div class='add'>+	       (~__CACHEID_NEVER &amp; __CACHEID_ARCH_MIN &amp; mask &amp; cacheid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/arm/include/asm/cputype.h b/arch/arm/include/asm/cputype.h<br/>new file mode 100644<br/>index 000000000000..7b9d27e749b8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/include/asm/cputype.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/include/asm/cputype.h</a></div><div class='hunk'>@@ -0,0 +1,64 @@</div><div class='add'>+#ifndef __ASM_ARM_CPUTYPE_H</div><div class='add'>+#define __ASM_ARM_CPUTYPE_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/stringify.h&gt;</div><div class='add'>+</div><div class='add'>+#define CPUID_ID	0</div><div class='add'>+#define CPUID_CACHETYPE	1</div><div class='add'>+#define CPUID_TCM	2</div><div class='add'>+#define CPUID_TLBTYPE	3</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_CPU_CP15</div><div class='add'>+#define read_cpuid(reg)							\</div><div class='add'>+	({								\</div><div class='add'>+		unsigned int __val;					\</div><div class='add'>+		asm("mrc	p15, 0, %0, c0, c0, " __stringify(reg)	\</div><div class='add'>+		    : "=r" (__val)					\</div><div class='add'>+		    :							\</div><div class='add'>+		    : "cc");						\</div><div class='add'>+		__val;							\</div><div class='add'>+	})</div><div class='add'>+#else</div><div class='add'>+extern unsigned int processor_id;</div><div class='add'>+#define read_cpuid(reg) (processor_id)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The CPU ID never changes at run time, so we might as well tell the</div><div class='add'>+ * compiler that it's constant.  Use this function to read the CPU ID</div><div class='add'>+ * rather than directly reading processor_id or read_cpuid() directly.</div><div class='add'>+ */</div><div class='add'>+static inline unsigned int __attribute_const__ read_cpuid_id(void)</div><div class='add'>+{</div><div class='add'>+	return read_cpuid(CPUID_ID);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned int __attribute_const__ read_cpuid_cachetype(void)</div><div class='add'>+{</div><div class='add'>+	return read_cpuid(CPUID_CACHETYPE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Intel's XScale3 core supports some v6 features (supersections, L2)</div><div class='add'>+ * but advertises itself as v5 as it does not support the v6 ISA.  For</div><div class='add'>+ * this reason, we need a way to explicitly test for this type of CPU.</div><div class='add'>+ */</div><div class='add'>+#ifndef CONFIG_CPU_XSC3</div><div class='add'>+#define cpu_is_xsc3()	0</div><div class='add'>+#else</div><div class='add'>+static inline int cpu_is_xsc3(void)</div><div class='add'>+{</div><div class='add'>+	if ((read_cpuid_id() &amp; 0xffffe000) == 0x69056000)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if !defined(CONFIG_CPU_XSCALE) &amp;&amp; !defined(CONFIG_CPU_XSC3)</div><div class='add'>+#define	cpu_is_xscale()	0</div><div class='add'>+#else</div><div class='add'>+#define	cpu_is_xscale()	1</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/arm/include/asm/dma-mapping.h b/arch/arm/include/asm/dma-mapping.h<br/>index 7b95d2058395..1cb8602dd9d5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/include/asm/dma-mapping.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/include/asm/dma-mapping.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/include/asm/dma-mapping.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/include/asm/dma-mapping.h</a></div><div class='hunk'>@@ -104,15 +104,14 @@ static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)</div><div class='ctx'>  * Dummy noncoherent implementation.  We don't provide a dma_cache_sync</div><div class='ctx'>  * function so drivers using this API are highlighted with build warnings.</div><div class='ctx'>  */</div><div class='del'>-static inline void *</div><div class='del'>-dma_alloc_noncoherent(struct device *dev, size_t size, dma_addr_t *handle, gfp_t gfp)</div><div class='add'>+static inline void *dma_alloc_noncoherent(struct device *dev, size_t size,</div><div class='add'>+		dma_addr_t *handle, gfp_t gfp)</div><div class='ctx'> {</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void</div><div class='del'>-dma_free_noncoherent(struct device *dev, size_t size, void *cpu_addr,</div><div class='del'>-		     dma_addr_t handle)</div><div class='add'>+static inline void dma_free_noncoherent(struct device *dev, size_t size,</div><div class='add'>+		void *cpu_addr, dma_addr_t handle)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -127,8 +126,7 @@ dma_free_noncoherent(struct device *dev, size_t size, void *cpu_addr,</div><div class='ctx'>  * return the CPU-viewed address, and sets @handle to be the</div><div class='ctx'>  * device-viewed address.</div><div class='ctx'>  */</div><div class='del'>-extern void *</div><div class='del'>-dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *handle, gfp_t gfp);</div><div class='add'>+extern void *dma_alloc_coherent(struct device *, size_t, dma_addr_t *, gfp_t);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * dma_free_coherent - free memory allocated by dma_alloc_coherent</div><div class='hunk'>@@ -143,9 +141,7 @@ dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *handle, gfp_t gf</div><div class='ctx'>  * References to memory and mappings associated with cpu_addr/handle</div><div class='ctx'>  * during and after this call executing are illegal.</div><div class='ctx'>  */</div><div class='del'>-extern void</div><div class='del'>-dma_free_coherent(struct device *dev, size_t size, void *cpu_addr,</div><div class='del'>-		  dma_addr_t handle);</div><div class='add'>+extern void dma_free_coherent(struct device *, size_t, void *, dma_addr_t);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * dma_mmap_coherent - map a coherent DMA allocation into user space</div><div class='hunk'>@@ -159,8 +155,8 @@ dma_free_coherent(struct device *dev, size_t size, void *cpu_addr,</div><div class='ctx'>  * into user space.  The coherent DMA buffer must not be freed by the</div><div class='ctx'>  * driver until the user space mapping has been released.</div><div class='ctx'>  */</div><div class='del'>-int dma_mmap_coherent(struct device *dev, struct vm_area_struct *vma,</div><div class='del'>-		      void *cpu_addr, dma_addr_t handle, size_t size);</div><div class='add'>+int dma_mmap_coherent(struct device *, struct vm_area_struct *,</div><div class='add'>+		void *, dma_addr_t, size_t);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -174,14 +170,94 @@ int dma_mmap_coherent(struct device *dev, struct vm_area_struct *vma,</div><div class='ctx'>  * return the CPU-viewed address, and sets @handle to be the</div><div class='ctx'>  * device-viewed address.</div><div class='ctx'>  */</div><div class='del'>-extern void *</div><div class='del'>-dma_alloc_writecombine(struct device *dev, size_t size, dma_addr_t *handle, gfp_t gfp);</div><div class='add'>+extern void *dma_alloc_writecombine(struct device *, size_t, dma_addr_t *,</div><div class='add'>+		gfp_t);</div><div class='ctx'> </div><div class='ctx'> #define dma_free_writecombine(dev,size,cpu_addr,handle) \</div><div class='ctx'> 	dma_free_coherent(dev,size,cpu_addr,handle)</div><div class='ctx'> </div><div class='del'>-int dma_mmap_writecombine(struct device *dev, struct vm_area_struct *vma,</div><div class='del'>-			  void *cpu_addr, dma_addr_t handle, size_t size);</div><div class='add'>+int dma_mmap_writecombine(struct device *, struct vm_area_struct *,</div><div class='add'>+		void *, dma_addr_t, size_t);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_DMABOUNCE</div><div class='add'>+/*</div><div class='add'>+ * For SA-1111, IXP425, and ADI systems  the dma-mapping functions are "magic"</div><div class='add'>+ * and utilize bounce buffers as needed to work around limited DMA windows.</div><div class='add'>+ *</div><div class='add'>+ * On the SA-1111, a bug limits DMA to only certain regions of RAM.</div><div class='add'>+ * On the IXP425, the PCI inbound window is 64MB (256MB total RAM)</div><div class='add'>+ * On some ADI engineering systems, PCI inbound window is 32MB (12MB total RAM)</div><div class='add'>+ *</div><div class='add'>+ * The following are helper functions used by the dmabounce subystem</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dmabounce_register_dev</div><div class='add'>+ *</div><div class='add'>+ * @dev: valid struct device pointer</div><div class='add'>+ * @small_buf_size: size of buffers to use with small buffer pool</div><div class='add'>+ * @large_buf_size: size of buffers to use with large buffer pool (can be 0)</div><div class='add'>+ *</div><div class='add'>+ * This function should be called by low-level platform code to register</div><div class='add'>+ * a device as requireing DMA buffer bouncing. The function will allocate</div><div class='add'>+ * appropriate DMA pools for the device.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+extern int dmabounce_register_dev(struct device *, unsigned long,</div><div class='add'>+		unsigned long);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dmabounce_unregister_dev</div><div class='add'>+ *</div><div class='add'>+ * @dev: valid struct device pointer</div><div class='add'>+ *</div><div class='add'>+ * This function should be called by low-level platform code when device</div><div class='add'>+ * that was previously registered with dmabounce_register_dev is removed</div><div class='add'>+ * from the system.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+extern void dmabounce_unregister_dev(struct device *);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dma_needs_bounce</div><div class='add'>+ *</div><div class='add'>+ * @dev: valid struct device pointer</div><div class='add'>+ * @dma_handle: dma_handle of unbounced buffer</div><div class='add'>+ * @size: size of region being mapped</div><div class='add'>+ *</div><div class='add'>+ * Platforms that utilize the dmabounce mechanism must implement</div><div class='add'>+ * this function.</div><div class='add'>+ *</div><div class='add'>+ * The dmabounce routines call this function whenever a dma-mapping</div><div class='add'>+ * is requested to determine whether a given buffer needs to be bounced</div><div class='add'>+ * or not. The function must return 0 if the buffer is OK for</div><div class='add'>+ * DMA access and 1 if the buffer needs to be bounced.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+extern int dma_needs_bounce(struct device*, dma_addr_t, size_t);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The DMA API, implemented by dmabounce.c.  See below for descriptions.</div><div class='add'>+ */</div><div class='add'>+extern dma_addr_t dma_map_single(struct device *, void *, size_t,</div><div class='add'>+		enum dma_data_direction);</div><div class='add'>+extern dma_addr_t dma_map_page(struct device *, struct page *,</div><div class='add'>+		unsigned long, size_t, enum dma_data_direction);</div><div class='add'>+extern void dma_unmap_single(struct device *, dma_addr_t, size_t,</div><div class='add'>+		enum dma_data_direction);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Private functions</div><div class='add'>+ */</div><div class='add'>+int dmabounce_sync_for_cpu(struct device *, dma_addr_t, unsigned long,</div><div class='add'>+		size_t, enum dma_data_direction);</div><div class='add'>+int dmabounce_sync_for_device(struct device *, dma_addr_t, unsigned long,</div><div class='add'>+		size_t, enum dma_data_direction);</div><div class='add'>+#else</div><div class='add'>+#define dmabounce_sync_for_cpu(dev,dma,off,sz,dir)	(1)</div><div class='add'>+#define dmabounce_sync_for_device(dev,dma,off,sz,dir)	(1)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -198,19 +274,16 @@ int dma_mmap_writecombine(struct device *dev, struct vm_area_struct *vma,</div><div class='ctx'>  * can regain ownership by calling dma_unmap_single() or</div><div class='ctx'>  * dma_sync_single_for_cpu().</div><div class='ctx'>  */</div><div class='del'>-#ifndef CONFIG_DMABOUNCE</div><div class='del'>-static inline dma_addr_t</div><div class='del'>-dma_map_single(struct device *dev, void *cpu_addr, size_t size,</div><div class='del'>-	       enum dma_data_direction dir)</div><div class='add'>+static inline dma_addr_t dma_map_single(struct device *dev, void *cpu_addr,</div><div class='add'>+		size_t size, enum dma_data_direction dir)</div><div class='ctx'> {</div><div class='add'>+	BUG_ON(!valid_dma_direction(dir));</div><div class='add'>+</div><div class='ctx'> 	if (!arch_is_coherent())</div><div class='ctx'> 		dma_cache_maint(cpu_addr, size, dir);</div><div class='ctx'> </div><div class='ctx'> 	return virt_to_dma(dev, cpu_addr);</div><div class='ctx'> }</div><div class='del'>-#else</div><div class='del'>-extern dma_addr_t dma_map_single(struct device *,void *, size_t, enum dma_data_direction);</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * dma_map_page - map a portion of a page for streaming DMA</div><div class='hunk'>@@ -224,23 +297,25 @@ extern dma_addr_t dma_map_single(struct device *,void *, size_t, enum dma_data_d</div><div class='ctx'>  * or written back.</div><div class='ctx'>  *</div><div class='ctx'>  * The device owns this memory once this call has completed.  The CPU</div><div class='del'>- * can regain ownership by calling dma_unmap_page() or</div><div class='del'>- * dma_sync_single_for_cpu().</div><div class='add'>+ * can regain ownership by calling dma_unmap_page().</div><div class='ctx'>  */</div><div class='del'>-static inline dma_addr_t</div><div class='del'>-dma_map_page(struct device *dev, struct page *page,</div><div class='del'>-	     unsigned long offset, size_t size,</div><div class='del'>-	     enum dma_data_direction dir)</div><div class='add'>+static inline dma_addr_t dma_map_page(struct device *dev, struct page *page,</div><div class='add'>+	     unsigned long offset, size_t size, enum dma_data_direction dir)</div><div class='ctx'> {</div><div class='del'>-	return dma_map_single(dev, page_address(page) + offset, size, dir);</div><div class='add'>+	BUG_ON(!valid_dma_direction(dir));</div><div class='add'>+</div><div class='add'>+	if (!arch_is_coherent())</div><div class='add'>+		dma_cache_maint(page_address(page) + offset, size, dir);</div><div class='add'>+</div><div class='add'>+	return page_to_dma(dev, page) + offset;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * dma_unmap_single - unmap a single buffer previously mapped</div><div class='ctx'>  * @dev: valid struct device pointer, or NULL for ISA and EISA-like devices</div><div class='ctx'>  * @handle: DMA address of buffer</div><div class='del'>- * @size: size of buffer to map</div><div class='del'>- * @dir: DMA transfer direction</div><div class='add'>+ * @size: size of buffer (same as passed to dma_map_single)</div><div class='add'>+ * @dir: DMA transfer direction (same as passed to dma_map_single)</div><div class='ctx'>  *</div><div class='ctx'>  * Unmap a single streaming mode DMA translation.  The handle and size</div><div class='ctx'>  * must match what was provided in the previous dma_map_single() call.</div><div class='hunk'>@@ -249,108 +324,34 @@ dma_map_page(struct device *dev, struct page *page,</div><div class='ctx'>  * After this call, reads by the CPU to the buffer are guaranteed to see</div><div class='ctx'>  * whatever the device wrote there.</div><div class='ctx'>  */</div><div class='del'>-#ifndef CONFIG_DMABOUNCE</div><div class='del'>-static inline void</div><div class='del'>-dma_unmap_single(struct device *dev, dma_addr_t handle, size_t size,</div><div class='del'>-		 enum dma_data_direction dir)</div><div class='add'>+static inline void dma_unmap_single(struct device *dev, dma_addr_t handle,</div><div class='add'>+		size_t size, enum dma_data_direction dir)</div><div class='ctx'> {</div><div class='ctx'> 	/* nothing to do */</div><div class='ctx'> }</div><div class='del'>-#else</div><div class='del'>-extern void dma_unmap_single(struct device *, dma_addr_t, size_t, enum dma_data_direction);</div><div class='del'>-#endif</div><div class='add'>+#endif /* CONFIG_DMABOUNCE */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * dma_unmap_page - unmap a buffer previously mapped through dma_map_page()</div><div class='ctx'>  * @dev: valid struct device pointer, or NULL for ISA and EISA-like devices</div><div class='ctx'>  * @handle: DMA address of buffer</div><div class='del'>- * @size: size of buffer to map</div><div class='del'>- * @dir: DMA transfer direction</div><div class='add'>+ * @size: size of buffer (same as passed to dma_map_page)</div><div class='add'>+ * @dir: DMA transfer direction (same as passed to dma_map_page)</div><div class='ctx'>  *</div><div class='del'>- * Unmap a single streaming mode DMA translation.  The handle and size</div><div class='del'>- * must match what was provided in the previous dma_map_single() call.</div><div class='add'>+ * Unmap a page streaming mode DMA translation.  The handle and size</div><div class='add'>+ * must match what was provided in the previous dma_map_page() call.</div><div class='ctx'>  * All other usages are undefined.</div><div class='ctx'>  *</div><div class='ctx'>  * After this call, reads by the CPU to the buffer are guaranteed to see</div><div class='ctx'>  * whatever the device wrote there.</div><div class='ctx'>  */</div><div class='del'>-static inline void</div><div class='del'>-dma_unmap_page(struct device *dev, dma_addr_t handle, size_t size,</div><div class='del'>-	       enum dma_data_direction dir)</div><div class='add'>+static inline void dma_unmap_page(struct device *dev, dma_addr_t handle,</div><div class='add'>+		size_t size, enum dma_data_direction dir)</div><div class='ctx'> {</div><div class='ctx'> 	dma_unmap_single(dev, handle, size, dir);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * dma_map_sg - map a set of SG buffers for streaming mode DMA</div><div class='del'>- * @dev: valid struct device pointer, or NULL for ISA and EISA-like devices</div><div class='del'>- * @sg: list of buffers</div><div class='del'>- * @nents: number of buffers to map</div><div class='del'>- * @dir: DMA transfer direction</div><div class='del'>- *</div><div class='del'>- * Map a set of buffers described by scatterlist in streaming</div><div class='del'>- * mode for DMA.  This is the scatter-gather version of the</div><div class='del'>- * above dma_map_single interface.  Here the scatter gather list</div><div class='del'>- * elements are each tagged with the appropriate dma address</div><div class='del'>- * and length.  They are obtained via sg_dma_{address,length}(SG).</div><div class='del'>- *</div><div class='del'>- * NOTE: An implementation may be able to use a smaller number of</div><div class='del'>- *       DMA address/length pairs than there are SG table elements.</div><div class='del'>- *       (for example via virtual mapping capabilities)</div><div class='del'>- *       The routine returns the number of addr/length pairs actually</div><div class='del'>- *       used, at most nents.</div><div class='del'>- *</div><div class='del'>- * Device ownership issues as mentioned above for dma_map_single are</div><div class='del'>- * the same here.</div><div class='del'>- */</div><div class='del'>-#ifndef CONFIG_DMABOUNCE</div><div class='del'>-static inline int</div><div class='del'>-dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,</div><div class='del'>-	   enum dma_data_direction dir)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; nents; i++, sg++) {</div><div class='del'>-		char *virt;</div><div class='del'>-</div><div class='del'>-		sg-&gt;dma_address = page_to_dma(dev, sg_page(sg)) + sg-&gt;offset;</div><div class='del'>-		virt = sg_virt(sg);</div><div class='del'>-</div><div class='del'>-		if (!arch_is_coherent())</div><div class='del'>-			dma_cache_maint(virt, sg-&gt;length, dir);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return nents;</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-extern int dma_map_sg(struct device *, struct scatterlist *, int, enum dma_data_direction);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * dma_unmap_sg - unmap a set of SG buffers mapped by dma_map_sg</div><div class='del'>- * @dev: valid struct device pointer, or NULL for ISA and EISA-like devices</div><div class='del'>- * @sg: list of buffers</div><div class='del'>- * @nents: number of buffers to map</div><div class='del'>- * @dir: DMA transfer direction</div><div class='del'>- *</div><div class='del'>- * Unmap a set of streaming mode DMA translations.</div><div class='del'>- * Again, CPU read rules concerning calls here are the same as for</div><div class='del'>- * dma_unmap_single() above.</div><div class='del'>- */</div><div class='del'>-#ifndef CONFIG_DMABOUNCE</div><div class='del'>-static inline void</div><div class='del'>-dma_unmap_sg(struct device *dev, struct scatterlist *sg, int nents,</div><div class='del'>-	     enum dma_data_direction dir)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	/* nothing to do */</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-extern void dma_unmap_sg(struct device *, struct scatterlist *, int, enum dma_data_direction);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * dma_sync_single_range_for_cpu</div><div class='ctx'>  * @dev: valid struct device pointer, or NULL for ISA and EISA-like devices</div><div class='ctx'>  * @handle: DMA address of buffer</div><div class='hunk'>@@ -368,145 +369,52 @@ extern void dma_unmap_sg(struct device *, struct scatterlist *, int, enum dma_da</div><div class='ctx'>  * must first the perform a dma_sync_for_device, and then the</div><div class='ctx'>  * device again owns the buffer.</div><div class='ctx'>  */</div><div class='del'>-#ifndef CONFIG_DMABOUNCE</div><div class='del'>-static inline void</div><div class='del'>-dma_sync_single_range_for_cpu(struct device *dev, dma_addr_t handle,</div><div class='del'>-			      unsigned long offset, size_t size,</div><div class='del'>-			      enum dma_data_direction dir)</div><div class='add'>+static inline void dma_sync_single_range_for_cpu(struct device *dev,</div><div class='add'>+		dma_addr_t handle, unsigned long offset, size_t size,</div><div class='add'>+		enum dma_data_direction dir)</div><div class='ctx'> {</div><div class='del'>-	if (!arch_is_coherent())</div><div class='del'>-		dma_cache_maint(dma_to_virt(dev, handle) + offset, size, dir);</div><div class='add'>+	BUG_ON(!valid_dma_direction(dir));</div><div class='add'>+</div><div class='add'>+	dmabounce_sync_for_cpu(dev, handle, offset, size, dir);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void</div><div class='del'>-dma_sync_single_range_for_device(struct device *dev, dma_addr_t handle,</div><div class='del'>-				 unsigned long offset, size_t size,</div><div class='del'>-				 enum dma_data_direction dir)</div><div class='add'>+static inline void dma_sync_single_range_for_device(struct device *dev,</div><div class='add'>+		dma_addr_t handle, unsigned long offset, size_t size,</div><div class='add'>+		enum dma_data_direction dir)</div><div class='ctx'> {</div><div class='add'>+	BUG_ON(!valid_dma_direction(dir));</div><div class='add'>+</div><div class='add'>+	if (!dmabounce_sync_for_device(dev, handle, offset, size, dir))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	if (!arch_is_coherent())</div><div class='ctx'> 		dma_cache_maint(dma_to_virt(dev, handle) + offset, size, dir);</div><div class='ctx'> }</div><div class='del'>-#else</div><div class='del'>-extern void dma_sync_single_range_for_cpu(struct device *, dma_addr_t, unsigned long, size_t, enum dma_data_direction);</div><div class='del'>-extern void dma_sync_single_range_for_device(struct device *, dma_addr_t, unsigned long, size_t, enum dma_data_direction);</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='del'>-static inline void</div><div class='del'>-dma_sync_single_for_cpu(struct device *dev, dma_addr_t handle, size_t size,</div><div class='del'>-			enum dma_data_direction dir)</div><div class='add'>+static inline void dma_sync_single_for_cpu(struct device *dev,</div><div class='add'>+		dma_addr_t handle, size_t size, enum dma_data_direction dir)</div><div class='ctx'> {</div><div class='ctx'> 	dma_sync_single_range_for_cpu(dev, handle, 0, size, dir);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void</div><div class='del'>-dma_sync_single_for_device(struct device *dev, dma_addr_t handle, size_t size,</div><div class='del'>-			   enum dma_data_direction dir)</div><div class='add'>+static inline void dma_sync_single_for_device(struct device *dev,</div><div class='add'>+		dma_addr_t handle, size_t size, enum dma_data_direction dir)</div><div class='ctx'> {</div><div class='ctx'> 	dma_sync_single_range_for_device(dev, handle, 0, size, dir);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * dma_sync_sg_for_cpu</div><div class='del'>- * @dev: valid struct device pointer, or NULL for ISA and EISA-like devices</div><div class='del'>- * @sg: list of buffers</div><div class='del'>- * @nents: number of buffers to map</div><div class='del'>- * @dir: DMA transfer direction</div><div class='del'>- *</div><div class='del'>- * Make physical memory consistent for a set of streaming</div><div class='del'>- * mode DMA translations after a transfer.</div><div class='del'>- *</div><div class='del'>- * The same as dma_sync_single_for_* but for a scatter-gather list,</div><div class='del'>- * same rules and usage.</div><div class='del'>- */</div><div class='del'>-#ifndef CONFIG_DMABOUNCE</div><div class='del'>-static inline void</div><div class='del'>-dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg, int nents,</div><div class='del'>-		    enum dma_data_direction dir)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; nents; i++, sg++) {</div><div class='del'>-		char *virt = sg_virt(sg);</div><div class='del'>-		if (!arch_is_coherent())</div><div class='del'>-			dma_cache_maint(virt, sg-&gt;length, dir);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg, int nents,</div><div class='del'>-		       enum dma_data_direction dir)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; nents; i++, sg++) {</div><div class='del'>-		char *virt = sg_virt(sg);</div><div class='del'>-		if (!arch_is_coherent())</div><div class='del'>-			dma_cache_maint(virt, sg-&gt;length, dir);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-extern void dma_sync_sg_for_cpu(struct device*, struct scatterlist*, int, enum dma_data_direction);</div><div class='del'>-extern void dma_sync_sg_for_device(struct device*, struct scatterlist*, int, enum dma_data_direction);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_DMABOUNCE</div><div class='ctx'> /*</div><div class='del'>- * For SA-1111, IXP425, and ADI systems  the dma-mapping functions are "magic"</div><div class='del'>- * and utilize bounce buffers as needed to work around limited DMA windows.</div><div class='del'>- *</div><div class='del'>- * On the SA-1111, a bug limits DMA to only certain regions of RAM.</div><div class='del'>- * On the IXP425, the PCI inbound window is 64MB (256MB total RAM)</div><div class='del'>- * On some ADI engineering systems, PCI inbound window is 32MB (12MB total RAM)</div><div class='del'>- *</div><div class='del'>- * The following are helper functions used by the dmabounce subystem</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * dmabounce_register_dev</div><div class='del'>- *</div><div class='del'>- * @dev: valid struct device pointer</div><div class='del'>- * @small_buf_size: size of buffers to use with small buffer pool</div><div class='del'>- * @large_buf_size: size of buffers to use with large buffer pool (can be 0)</div><div class='del'>- *</div><div class='del'>- * This function should be called by low-level platform code to register</div><div class='del'>- * a device as requireing DMA buffer bouncing. The function will allocate</div><div class='del'>- * appropriate DMA pools for the device.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-extern int dmabounce_register_dev(struct device *, unsigned long, unsigned long);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * dmabounce_unregister_dev</div><div class='del'>- *</div><div class='del'>- * @dev: valid struct device pointer</div><div class='del'>- *</div><div class='del'>- * This function should be called by low-level platform code when device</div><div class='del'>- * that was previously registered with dmabounce_register_dev is removed</div><div class='del'>- * from the system.</div><div class='del'>- *</div><div class='add'>+ * The scatter list versions of the above methods.</div><div class='ctx'>  */</div><div class='del'>-extern void dmabounce_unregister_dev(struct device *);</div><div class='add'>+extern int dma_map_sg(struct device *, struct scatterlist *, int,</div><div class='add'>+		enum dma_data_direction);</div><div class='add'>+extern void dma_unmap_sg(struct device *, struct scatterlist *, int,</div><div class='add'>+		enum dma_data_direction);</div><div class='add'>+extern void dma_sync_sg_for_cpu(struct device *, struct scatterlist *, int,</div><div class='add'>+		enum dma_data_direction);</div><div class='add'>+extern void dma_sync_sg_for_device(struct device *, struct scatterlist *, int,</div><div class='add'>+		enum dma_data_direction);</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * dma_needs_bounce</div><div class='del'>- *</div><div class='del'>- * @dev: valid struct device pointer</div><div class='del'>- * @dma_handle: dma_handle of unbounced buffer</div><div class='del'>- * @size: size of region being mapped</div><div class='del'>- *</div><div class='del'>- * Platforms that utilize the dmabounce mechanism must implement</div><div class='del'>- * this function.</div><div class='del'>- *</div><div class='del'>- * The dmabounce routines call this function whenever a dma-mapping</div><div class='del'>- * is requested to determine whether a given buffer needs to be bounced</div><div class='del'>- * or not. The function must return 0 if the buffer is OK for</div><div class='del'>- * DMA access and 1 if the buffer needs to be bounced.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-extern int dma_needs_bounce(struct device*, dma_addr_t, size_t);</div><div class='del'>-#endif /* CONFIG_DMABOUNCE */</div><div class='ctx'> </div><div class='ctx'> #endif /* __KERNEL__ */</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/include/asm/elf.h b/arch/arm/include/asm/elf.h<br/>index 4ca751627489..a58378c343b9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/include/asm/elf.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/include/asm/elf.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/include/asm/elf.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/include/asm/elf.h</a></div><div class='hunk'>@@ -3,7 +3,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/hwcap.h&gt;</div><div class='ctx'> </div><div class='del'>-#ifndef __ASSEMBLY__</div><div class='ctx'> /*</div><div class='ctx'>  * ELF register definitions..</div><div class='ctx'>  */</div><div class='hunk'>@@ -17,12 +16,34 @@ typedef unsigned long elf_freg_t[3];</div><div class='ctx'> typedef elf_greg_t elf_gregset_t[ELF_NGREG];</div><div class='ctx'> </div><div class='ctx'> typedef struct user_fp elf_fpregset_t;</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> #define EM_ARM	40</div><div class='del'>-#define EF_ARM_APCS26 0x08</div><div class='del'>-#define EF_ARM_SOFT_FLOAT 0x200</div><div class='del'>-#define EF_ARM_EABI_MASK 0xFF000000</div><div class='add'>+</div><div class='add'>+#define EF_ARM_EABI_MASK	0xff000000</div><div class='add'>+#define EF_ARM_EABI_UNKNOWN	0x00000000</div><div class='add'>+#define EF_ARM_EABI_VER1	0x01000000</div><div class='add'>+#define EF_ARM_EABI_VER2	0x02000000</div><div class='add'>+#define EF_ARM_EABI_VER3	0x03000000</div><div class='add'>+#define EF_ARM_EABI_VER4	0x04000000</div><div class='add'>+#define EF_ARM_EABI_VER5	0x05000000</div><div class='add'>+</div><div class='add'>+#define EF_ARM_BE8		0x00800000	/* ABI 4,5 */</div><div class='add'>+#define EF_ARM_LE8		0x00400000	/* ABI 4,5 */</div><div class='add'>+#define EF_ARM_MAVERICK_FLOAT	0x00000800	/* ABI 0 */</div><div class='add'>+#define EF_ARM_VFP_FLOAT	0x00000400	/* ABI 0 */</div><div class='add'>+#define EF_ARM_SOFT_FLOAT	0x00000200	/* ABI 0 */</div><div class='add'>+#define EF_ARM_OLD_ABI		0x00000100	/* ABI 0 */</div><div class='add'>+#define EF_ARM_NEW_ABI		0x00000080	/* ABI 0 */</div><div class='add'>+#define EF_ARM_ALIGN8		0x00000040	/* ABI 0 */</div><div class='add'>+#define EF_ARM_PIC		0x00000020	/* ABI 0 */</div><div class='add'>+#define EF_ARM_MAPSYMSFIRST	0x00000010	/* ABI 2 */</div><div class='add'>+#define EF_ARM_APCS_FLOAT	0x00000010	/* ABI 0, floats in fp regs */</div><div class='add'>+#define EF_ARM_DYNSYMSUSESEGIDX	0x00000008	/* ABI 2 */</div><div class='add'>+#define EF_ARM_APCS_26		0x00000008	/* ABI 0 */</div><div class='add'>+#define EF_ARM_SYMSARESORTED	0x00000004	/* ABI 1,2 */</div><div class='add'>+#define EF_ARM_INTERWORK	0x00000004	/* ABI 0 */</div><div class='add'>+#define EF_ARM_HASENTRY		0x00000002	/* All */</div><div class='add'>+#define EF_ARM_RELEXEC		0x00000001	/* All */</div><div class='ctx'> </div><div class='ctx'> #define R_ARM_NONE	0</div><div class='ctx'> #define R_ARM_PC24	1</div><div class='hunk'>@@ -41,7 +62,6 @@ typedef struct user_fp elf_fpregset_t;</div><div class='ctx'> #endif</div><div class='ctx'> #define ELF_ARCH	EM_ARM</div><div class='ctx'> </div><div class='del'>-#ifndef __ASSEMBLY__</div><div class='ctx'> /*</div><div class='ctx'>  * This yields a string that ld.so will use to load implementation</div><div class='ctx'>  * specific libraries for optimization.  This is more specific in</div><div class='hunk'>@@ -59,25 +79,17 @@ typedef struct user_fp elf_fpregset_t;</div><div class='ctx'> #define ELF_PLATFORM	(elf_platform)</div><div class='ctx'> </div><div class='ctx'> extern char elf_platform[];</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * This is used to ensure we don't load something for the wrong architecture.</div><div class='del'>- */</div><div class='del'>-#define elf_check_arch(x) ((x)-&gt;e_machine == EM_ARM &amp;&amp; ELF_PROC_OK(x))</div><div class='add'>+struct elf32_hdr;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * 32-bit code is always OK.  Some cpus can do 26-bit, some can't.</div><div class='add'>+ * This is used to ensure we don't load something for the wrong architecture.</div><div class='ctx'>  */</div><div class='del'>-#define ELF_PROC_OK(x)	(ELF_THUMB_OK(x) &amp;&amp; ELF_26BIT_OK(x))</div><div class='del'>-</div><div class='del'>-#define ELF_THUMB_OK(x) \</div><div class='del'>-	((elf_hwcap &amp; HWCAP_THUMB &amp;&amp; ((x)-&gt;e_entry &amp; 1) == 1) || \</div><div class='del'>-	 ((x)-&gt;e_entry &amp; 3) == 0)</div><div class='add'>+extern int elf_check_arch(const struct elf32_hdr *);</div><div class='add'>+#define elf_check_arch elf_check_arch</div><div class='ctx'> </div><div class='del'>-#define ELF_26BIT_OK(x) \</div><div class='del'>-	((elf_hwcap &amp; HWCAP_26BIT &amp;&amp; (x)-&gt;e_flags &amp; EF_ARM_APCS26) || \</div><div class='del'>-	  ((x)-&gt;e_flags &amp; EF_ARM_APCS26) == 0)</div><div class='add'>+extern int arm_elf_read_implies_exec(const struct elf32_hdr *, int);</div><div class='add'>+#define elf_read_implies_exec(ex,stk) arm_elf_read_implies_exec(&amp;(ex), stk)</div><div class='ctx'> </div><div class='ctx'> #define USE_ELF_CORE_DUMP</div><div class='ctx'> #define ELF_EXEC_PAGESIZE	4096</div><div class='hunk'>@@ -94,23 +106,7 @@ extern char elf_platform[];</div><div class='ctx'>    have no such handler.  */</div><div class='ctx'> #define ELF_PLAT_INIT(_r, load_addr)	(_r)-&gt;ARM_r0 = 0</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Since the FPA coprocessor uses CP1 and CP2, and iWMMXt uses CP0</div><div class='del'>- * and CP1, we only enable access to the iWMMXt coprocessor if the</div><div class='del'>- * binary is EABI or softfloat (and thus, guaranteed not to use</div><div class='del'>- * FPA instructions.)</div><div class='del'>- */</div><div class='del'>-#define SET_PERSONALITY(ex, ibcs2)					\</div><div class='del'>-	do {								\</div><div class='del'>-		if ((ex).e_flags &amp; EF_ARM_APCS26) {			\</div><div class='del'>-			set_personality(PER_LINUX);			\</div><div class='del'>-		} else {						\</div><div class='del'>-			set_personality(PER_LINUX_32BIT);		\</div><div class='del'>-			if (elf_hwcap &amp; HWCAP_IWMMXT &amp;&amp; (ex).e_flags &amp; (EF_ARM_EABI_MASK | EF_ARM_SOFT_FLOAT)) \</div><div class='del'>-				set_thread_flag(TIF_USING_IWMMXT);	\</div><div class='del'>-			else						\</div><div class='del'>-				clear_thread_flag(TIF_USING_IWMMXT);	\</div><div class='del'>-		}							\</div><div class='del'>-	} while (0)</div><div class='add'>+extern void elf_set_personality(const struct elf32_hdr *);</div><div class='add'>+#define SET_PERSONALITY(ex)	elf_set_personality(&amp;(ex))</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/include/asm/futex.h b/arch/arm/include/asm/futex.h<br/>index 6a332a9f099c..9ee743b95de8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/include/asm/futex.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/include/asm/futex.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/include/asm/futex.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/include/asm/futex.h</a></div><div class='hunk'>@@ -1,6 +1,124 @@</div><div class='del'>-#ifndef _ASM_FUTEX_H</div><div class='del'>-#define _ASM_FUTEX_H</div><div class='add'>+#ifndef _ASM_ARM_FUTEX_H</div><div class='add'>+#define _ASM_ARM_FUTEX_H</div><div class='add'>+</div><div class='add'>+#ifdef __KERNEL__</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SMP</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm-generic/futex.h&gt;</div><div class='ctx'> </div><div class='del'>-#endif</div><div class='add'>+#else /* !SMP, we can work around lack of atomic ops by disabling preemption */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/futex.h&gt;</div><div class='add'>+#include &lt;linux/preempt.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='add'>+#include &lt;asm/errno.h&gt;</div><div class='add'>+</div><div class='add'>+#define __futex_atomic_op(insn, ret, oldval, uaddr, oparg)	\</div><div class='add'>+	__asm__ __volatile__(					\</div><div class='add'>+	"1:	ldrt	%1, [%2]\n"				\</div><div class='add'>+	"	" insn "\n"					\</div><div class='add'>+	"2:	strt	%0, [%2]\n"				\</div><div class='add'>+	"	mov	%0, #0\n"				\</div><div class='add'>+	"3:\n"							\</div><div class='add'>+	"	.section __ex_table,\"a\"\n"			\</div><div class='add'>+	"	.align	3\n"					\</div><div class='add'>+	"	.long	1b, 4f, 2b, 4f\n"			\</div><div class='add'>+	"	.previous\n"					\</div><div class='add'>+	"	.section .fixup,\"ax\"\n"			\</div><div class='add'>+	"4:	mov	%0, %4\n"				\</div><div class='add'>+	"	b	3b\n"					\</div><div class='add'>+	"	.previous"					\</div><div class='add'>+	: "=&amp;r" (ret), "=&amp;r" (oldval)				\</div><div class='add'>+	: "r" (uaddr), "r" (oparg), "Ir" (-EFAULT)		\</div><div class='add'>+	: "cc", "memory")</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+futex_atomic_op_inuser (int encoded_op, int __user *uaddr)</div><div class='add'>+{</div><div class='add'>+	int op = (encoded_op &gt;&gt; 28) &amp; 7;</div><div class='add'>+	int cmp = (encoded_op &gt;&gt; 24) &amp; 15;</div><div class='add'>+	int oparg = (encoded_op &lt;&lt; 8) &gt;&gt; 20;</div><div class='add'>+	int cmparg = (encoded_op &lt;&lt; 20) &gt;&gt; 20;</div><div class='add'>+	int oldval = 0, ret;</div><div class='add'>+</div><div class='add'>+	if (encoded_op &amp; (FUTEX_OP_OPARG_SHIFT &lt;&lt; 28))</div><div class='add'>+		oparg = 1 &lt;&lt; oparg;</div><div class='add'>+</div><div class='add'>+	if (!access_ok(VERIFY_WRITE, uaddr, sizeof(int)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	pagefault_disable();	/* implies preempt_disable() */</div><div class='add'>+</div><div class='add'>+	switch (op) {</div><div class='add'>+	case FUTEX_OP_SET:</div><div class='add'>+		__futex_atomic_op("mov	%0, %3", ret, oldval, uaddr, oparg);</div><div class='add'>+		break;</div><div class='add'>+	case FUTEX_OP_ADD:</div><div class='add'>+		__futex_atomic_op("add	%0, %1, %3", ret, oldval, uaddr, oparg);</div><div class='add'>+		break;</div><div class='add'>+	case FUTEX_OP_OR:</div><div class='add'>+		__futex_atomic_op("orr	%0, %1, %3", ret, oldval, uaddr, oparg);</div><div class='add'>+		break;</div><div class='add'>+	case FUTEX_OP_ANDN:</div><div class='add'>+		__futex_atomic_op("and	%0, %1, %3", ret, oldval, uaddr, ~oparg);</div><div class='add'>+		break;</div><div class='add'>+	case FUTEX_OP_XOR:</div><div class='add'>+		__futex_atomic_op("eor	%0, %1, %3", ret, oldval, uaddr, oparg);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ret = -ENOSYS;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pagefault_enable();	/* subsumes preempt_enable() */</div><div class='add'>+</div><div class='add'>+	if (!ret) {</div><div class='add'>+		switch (cmp) {</div><div class='add'>+		case FUTEX_OP_CMP_EQ: ret = (oldval == cmparg); break;</div><div class='add'>+		case FUTEX_OP_CMP_NE: ret = (oldval != cmparg); break;</div><div class='add'>+		case FUTEX_OP_CMP_LT: ret = (oldval &lt; cmparg); break;</div><div class='add'>+		case FUTEX_OP_CMP_GE: ret = (oldval &gt;= cmparg); break;</div><div class='add'>+		case FUTEX_OP_CMP_LE: ret = (oldval &lt;= cmparg); break;</div><div class='add'>+		case FUTEX_OP_CMP_GT: ret = (oldval &gt; cmparg); break;</div><div class='add'>+		default: ret = -ENOSYS;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+futex_atomic_cmpxchg_inatomic(int __user *uaddr, int oldval, int newval)</div><div class='add'>+{</div><div class='add'>+	int val;</div><div class='add'>+</div><div class='add'>+	if (!access_ok(VERIFY_WRITE, uaddr, sizeof(int)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	pagefault_disable();	/* implies preempt_disable() */</div><div class='add'>+</div><div class='add'>+	__asm__ __volatile__("@futex_atomic_cmpxchg_inatomic\n"</div><div class='add'>+	"1:	ldrt	%0, [%3]\n"</div><div class='add'>+	"	teq	%0, %1\n"</div><div class='add'>+	"2:	streqt	%2, [%3]\n"</div><div class='add'>+	"3:\n"</div><div class='add'>+	"	.section __ex_table,\"a\"\n"</div><div class='add'>+	"	.align	3\n"</div><div class='add'>+	"	.long	1b, 4f, 2b, 4f\n"</div><div class='add'>+	"	.previous\n"</div><div class='add'>+	"	.section .fixup,\"ax\"\n"</div><div class='add'>+	"4:	mov	%0, %4\n"</div><div class='add'>+	"	b	3b\n"</div><div class='add'>+	"	.previous"</div><div class='add'>+	: "=&amp;r" (val)</div><div class='add'>+	: "r" (oldval), "r" (newval), "r" (uaddr), "Ir" (-EFAULT)</div><div class='add'>+	: "cc", "memory");</div><div class='add'>+</div><div class='add'>+	pagefault_enable();	/* subsumes preempt_enable() */</div><div class='add'>+</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* !SMP */</div><div class='add'>+</div><div class='add'>+#endif /* __KERNEL__ */</div><div class='add'>+#endif /* _ASM_ARM_FUTEX_H */</div><div class='head'>diff --git a/arch/arm/include/asm/io.h b/arch/arm/include/asm/io.h<br/>index 71934856fc22..a8094451be57 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/include/asm/io.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/include/asm/io.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/include/asm/io.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/include/asm/io.h</a></div><div class='hunk'>@@ -60,10 +60,9 @@ extern void __raw_readsl(const void __iomem *addr, void *data, int longlen);</div><div class='ctx'> #define MT_DEVICE		0</div><div class='ctx'> #define MT_DEVICE_NONSHARED	1</div><div class='ctx'> #define MT_DEVICE_CACHED	2</div><div class='del'>-#define MT_DEVICE_IXP2000	3</div><div class='del'>-#define MT_DEVICE_WC		4</div><div class='add'>+#define MT_DEVICE_WC		3</div><div class='ctx'> /*</div><div class='del'>- * types 5 onwards can be found in asm/mach/map.h and are undefined</div><div class='add'>+ * types 4 onwards can be found in asm/mach/map.h and are undefined</div><div class='ctx'>  * for ioremap</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/include/asm/irq.h b/arch/arm/include/asm/irq.h<br/>index d6786090d02c..a0009aa5d157 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/include/asm/irq.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/include/asm/irq.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/include/asm/irq.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/include/asm/irq.h</a></div><div class='hunk'>@@ -22,6 +22,10 @@</div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='ctx'> struct irqaction;</div><div class='ctx'> extern void migrate_irqs(void);</div><div class='add'>+</div><div class='add'>+extern void asm_do_IRQ(unsigned int, struct pt_regs *);</div><div class='add'>+void init_IRQ(void);</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/include/asm/kprobes.h b/arch/arm/include/asm/kprobes.h<br/>index a5d0d99ad387..bb8a19bd5822 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/include/asm/kprobes.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/include/asm/kprobes.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/include/asm/kprobes.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/include/asm/kprobes.h</a></div><div class='hunk'>@@ -61,7 +61,6 @@ struct kprobe_ctlblk {</div><div class='ctx'> void arch_remove_kprobe(struct kprobe *);</div><div class='ctx'> void kretprobe_trampoline(void);</div><div class='ctx'> </div><div class='del'>-int kprobe_trap_handler(struct pt_regs *regs, unsigned int instr);</div><div class='ctx'> int kprobe_fault_handler(struct pt_regs *regs, unsigned int fsr);</div><div class='ctx'> int kprobe_exceptions_notify(struct notifier_block *self,</div><div class='ctx'> 			     unsigned long val, void *data);</div><div class='head'>diff --git a/arch/arm/include/asm/mach/map.h b/arch/arm/include/asm/mach/map.h<br/>index 9eb936e49cc3..cb1139ac1943 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/include/asm/mach/map.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/include/asm/mach/map.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/include/asm/mach/map.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/include/asm/mach/map.h</a></div><div class='hunk'>@@ -18,16 +18,13 @@ struct map_desc {</div><div class='ctx'> 	unsigned int type;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* types 0-4 are defined in asm/io.h */</div><div class='del'>-#define MT_CACHECLEAN		5</div><div class='del'>-#define MT_MINICLEAN		6</div><div class='del'>-#define MT_LOW_VECTORS		7</div><div class='del'>-#define MT_HIGH_VECTORS		8</div><div class='del'>-#define MT_MEMORY		9</div><div class='del'>-#define MT_ROM			10</div><div class='del'>-</div><div class='del'>-#define MT_NONSHARED_DEVICE	MT_DEVICE_NONSHARED</div><div class='del'>-#define MT_IXP2000_DEVICE	MT_DEVICE_IXP2000</div><div class='add'>+/* types 0-3 are defined in asm/io.h */</div><div class='add'>+#define MT_CACHECLEAN		4</div><div class='add'>+#define MT_MINICLEAN		5</div><div class='add'>+#define MT_LOW_VECTORS		6</div><div class='add'>+#define MT_HIGH_VECTORS		7</div><div class='add'>+#define MT_MEMORY		8</div><div class='add'>+#define MT_ROM			9</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MMU</div><div class='ctx'> extern void iotable_init(struct map_desc *, int);</div><div class='head'>diff --git a/arch/arm/include/asm/mach/udc_pxa2xx.h b/arch/arm/include/asm/mach/udc_pxa2xx.h<br/>index 270902c353fd..f3eabf1ecec3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/include/asm/mach/udc_pxa2xx.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/include/asm/mach/udc_pxa2xx.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/include/asm/mach/udc_pxa2xx.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/include/asm/mach/udc_pxa2xx.h</a></div><div class='hunk'>@@ -18,8 +18,7 @@ struct pxa2xx_udc_mach_info {</div><div class='ctx'> 	/* Boards following the design guidelines in the developer's manual,</div><div class='ctx'> 	 * with on-chip GPIOs not Lubbock's weird hardware, can have a sane</div><div class='ctx'> 	 * VBUS IRQ and omit the methods above.  Store the GPIO number</div><div class='del'>-	 * here; for GPIO 0, also mask in one of the pxa_gpio_mode() bits.</div><div class='del'>-	 * Note that sometimes the signals go through inverters...</div><div class='add'>+	 * here.  Note that sometimes the signals go through inverters...</div><div class='ctx'> 	 */</div><div class='ctx'> 	bool	gpio_vbus_inverted;</div><div class='ctx'> 	u16	gpio_vbus;			/* high == vbus present */</div><div class='head'>diff --git a/arch/arm/include/asm/mc146818rtc.h b/arch/arm/include/asm/mc146818rtc.h<br/>index e1ca48a9e973..6b884d2b0b69 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/include/asm/mc146818rtc.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/include/asm/mc146818rtc.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/include/asm/mc146818rtc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/include/asm/mc146818rtc.h</a></div><div class='hunk'>@@ -4,8 +4,8 @@</div><div class='ctx'> #ifndef _ASM_MC146818RTC_H</div><div class='ctx'> #define _ASM_MC146818RTC_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;mach/irqs.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifndef RTC_PORT</div><div class='ctx'> #define RTC_PORT(x)	(0x70 + (x))</div><div class='head'>diff --git a/arch/arm/include/asm/memory.h b/arch/arm/include/asm/memory.h<br/>index bf7c737c9226..809ff9ab853a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/include/asm/memory.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/include/asm/memory.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/include/asm/memory.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/include/asm/memory.h</a></div><div class='hunk'>@@ -13,30 +13,27 @@</div><div class='ctx'> #ifndef __ASM_ARM_MEMORY_H</div><div class='ctx'> #define __ASM_ARM_MEMORY_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/compiler.h&gt;</div><div class='add'>+#include &lt;linux/const.h&gt;</div><div class='add'>+#include &lt;mach/memory.h&gt;</div><div class='add'>+#include &lt;asm/sizes.h&gt;</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Allow for constants defined here to be used from assembly code</div><div class='ctx'>  * by prepending the UL suffix only with actual C code compilation.</div><div class='ctx'>  */</div><div class='del'>-#ifndef __ASSEMBLY__</div><div class='del'>-#define UL(x) (x##UL)</div><div class='del'>-#else</div><div class='del'>-#define UL(x) (x)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;linux/compiler.h&gt;</div><div class='del'>-#include &lt;mach/memory.h&gt;</div><div class='del'>-#include &lt;asm/sizes.h&gt;</div><div class='add'>+#define UL(x) _AC(x, UL)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MMU</div><div class='ctx'> </div><div class='del'>-#ifndef TASK_SIZE</div><div class='ctx'> /*</div><div class='add'>+ * PAGE_OFFSET - the virtual address of the start of the kernel image</div><div class='ctx'>  * TASK_SIZE - the maximum size of a user space task.</div><div class='ctx'>  * TASK_UNMAPPED_BASE - the lower boundary of the mmap VM area</div><div class='ctx'>  */</div><div class='del'>-#define TASK_SIZE		UL(0xbf000000)</div><div class='del'>-#define TASK_UNMAPPED_BASE	UL(0x40000000)</div><div class='del'>-#endif</div><div class='add'>+#define PAGE_OFFSET		UL(CONFIG_PAGE_OFFSET)</div><div class='add'>+#define TASK_SIZE		(UL(CONFIG_PAGE_OFFSET) - UL(0x01000000))</div><div class='add'>+#define TASK_UNMAPPED_BASE	(UL(CONFIG_PAGE_OFFSET) / 3)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * The maximum size of a 26-bit user space task.</div><div class='hunk'>@@ -44,13 +41,6 @@</div><div class='ctx'> #define TASK_SIZE_26		UL(0x04000000)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Page offset: 3GB</div><div class='del'>- */</div><div class='del'>-#ifndef PAGE_OFFSET</div><div class='del'>-#define PAGE_OFFSET		UL(0xc0000000)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * The module space lives between the addresses given by TASK_SIZE</div><div class='ctx'>  * and PAGE_OFFSET - it must be within 32MB of the kernel text.</div><div class='ctx'>  */</div><div class='hunk'>@@ -147,17 +137,11 @@</div><div class='ctx'> </div><div class='ctx'> #ifndef arch_adjust_zones</div><div class='ctx'> #define arch_adjust_zones(node,size,holes) do { } while (0)</div><div class='add'>+#elif !defined(CONFIG_ZONE_DMA)</div><div class='add'>+#error "custom arch_adjust_zones() requires CONFIG_ZONE_DMA"</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Amount of memory reserved for the vmalloc() area, and minimum</div><div class='del'>- * address for vmalloc mappings.</div><div class='del'>- */</div><div class='del'>-extern unsigned long vmalloc_reserve;</div><div class='del'>-</div><div class='del'>-#define VMALLOC_MIN		(void *)(VMALLOC_END - vmalloc_reserve)</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * PFNs are used to describe any physical page; this means</div><div class='ctx'>  * PFN 0 == physical address 0.</div><div class='ctx'>  *</div><div class='head'>diff --git a/arch/arm/include/asm/mmu_context.h b/arch/arm/include/asm/mmu_context.h<br/>index a301e446007f..0559f37c2a27 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/include/asm/mmu_context.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/include/asm/mmu_context.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/include/asm/mmu_context.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/include/asm/mmu_context.h</a></div><div class='hunk'>@@ -15,6 +15,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='add'>+#include &lt;asm/cachetype.h&gt;</div><div class='ctx'> #include &lt;asm/proc-fns.h&gt;</div><div class='ctx'> #include &lt;asm-generic/mm_hooks.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/include/asm/page.h b/arch/arm/include/asm/page.h<br/>index cf2e2680daaa..bed1c0a00368 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/include/asm/page.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/include/asm/page.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/include/asm/page.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/include/asm/page.h</a></div><div class='hunk'>@@ -184,8 +184,9 @@ typedef struct page *pgtable_t;</div><div class='ctx'> </div><div class='ctx'> #endif /* !__ASSEMBLY__ */</div><div class='ctx'> </div><div class='del'>-#define VM_DATA_DEFAULT_FLAGS	(VM_READ | VM_WRITE | VM_EXEC | \</div><div class='del'>-				 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)</div><div class='add'>+#define VM_DATA_DEFAULT_FLAGS \</div><div class='add'>+	(((current-&gt;personality &amp; READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \</div><div class='add'>+	 VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * With EABI on ARMv5 and above we must have 64-bit aligned slab pointers.</div><div class='head'>diff --git a/arch/arm/include/asm/pgtable.h b/arch/arm/include/asm/pgtable.h<br/>index 8e21ef15bd74..110295c5461d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/include/asm/pgtable.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/include/asm/pgtable.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/include/asm/pgtable.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/include/asm/pgtable.h</a></div><div class='hunk'>@@ -164,14 +164,30 @@ extern void __pgd_error(const char *file, int line, unsigned long val);</div><div class='ctx'> #define L_PTE_PRESENT		(1 &lt;&lt; 0)</div><div class='ctx'> #define L_PTE_FILE		(1 &lt;&lt; 1)	/* only when !PRESENT */</div><div class='ctx'> #define L_PTE_YOUNG		(1 &lt;&lt; 1)</div><div class='del'>-#define L_PTE_BUFFERABLE	(1 &lt;&lt; 2)	/* matches PTE */</div><div class='del'>-#define L_PTE_CACHEABLE		(1 &lt;&lt; 3)	/* matches PTE */</div><div class='del'>-#define L_PTE_USER		(1 &lt;&lt; 4)</div><div class='del'>-#define L_PTE_WRITE		(1 &lt;&lt; 5)</div><div class='del'>-#define L_PTE_EXEC		(1 &lt;&lt; 6)</div><div class='del'>-#define L_PTE_DIRTY		(1 &lt;&lt; 7)</div><div class='add'>+#define L_PTE_BUFFERABLE	(1 &lt;&lt; 2)	/* obsolete, matches PTE */</div><div class='add'>+#define L_PTE_CACHEABLE		(1 &lt;&lt; 3)	/* obsolete, matches PTE */</div><div class='add'>+#define L_PTE_DIRTY		(1 &lt;&lt; 6)</div><div class='add'>+#define L_PTE_WRITE		(1 &lt;&lt; 7)</div><div class='add'>+#define L_PTE_USER		(1 &lt;&lt; 8)</div><div class='add'>+#define L_PTE_EXEC		(1 &lt;&lt; 9)</div><div class='ctx'> #define L_PTE_SHARED		(1 &lt;&lt; 10)	/* shared(v6), coherent(xsc3) */</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * These are the memory types, defined to be compatible with</div><div class='add'>+ * pre-ARMv6 CPUs cacheable and bufferable bits:   XXCB</div><div class='add'>+ */</div><div class='add'>+#define L_PTE_MT_UNCACHED	(0x00 &lt;&lt; 2)	/* 0000 */</div><div class='add'>+#define L_PTE_MT_BUFFERABLE	(0x01 &lt;&lt; 2)	/* 0001 */</div><div class='add'>+#define L_PTE_MT_WRITETHROUGH	(0x02 &lt;&lt; 2)	/* 0010 */</div><div class='add'>+#define L_PTE_MT_WRITEBACK	(0x03 &lt;&lt; 2)	/* 0011 */</div><div class='add'>+#define L_PTE_MT_MINICACHE	(0x06 &lt;&lt; 2)	/* 0110 (sa1100, xscale) */</div><div class='add'>+#define L_PTE_MT_WRITEALLOC	(0x07 &lt;&lt; 2)	/* 0111 */</div><div class='add'>+#define L_PTE_MT_DEV_SHARED	(0x04 &lt;&lt; 2)	/* 0100 */</div><div class='add'>+#define L_PTE_MT_DEV_NONSHARED	(0x0c &lt;&lt; 2)	/* 1100 */</div><div class='add'>+#define L_PTE_MT_DEV_WC		(0x09 &lt;&lt; 2)	/* 1001 */</div><div class='add'>+#define L_PTE_MT_DEV_CACHED	(0x0b &lt;&lt; 2)	/* 1011 */</div><div class='add'>+#define L_PTE_MT_MASK		(0x0f &lt;&lt; 2)</div><div class='add'>+</div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -180,23 +196,30 @@ extern void __pgd_error(const char *file, int line, unsigned long val);</div><div class='ctx'>  * as well as any architecture dependent bits like global/ASID and SMP</div><div class='ctx'>  * shared mapping bits.</div><div class='ctx'>  */</div><div class='del'>-#define _L_PTE_DEFAULT	L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_CACHEABLE | L_PTE_BUFFERABLE</div><div class='del'>-#define _L_PTE_READ	L_PTE_USER | L_PTE_EXEC</div><div class='add'>+#define _L_PTE_DEFAULT	L_PTE_PRESENT | L_PTE_YOUNG</div><div class='ctx'> </div><div class='ctx'> extern pgprot_t		pgprot_user;</div><div class='ctx'> extern pgprot_t		pgprot_kernel;</div><div class='ctx'> </div><div class='del'>-#define PAGE_NONE	pgprot_user</div><div class='del'>-#define PAGE_COPY	__pgprot(pgprot_val(pgprot_user) | _L_PTE_READ)</div><div class='del'>-#define PAGE_SHARED	__pgprot(pgprot_val(pgprot_user) | _L_PTE_READ | \</div><div class='del'>-				 L_PTE_WRITE)</div><div class='del'>-#define PAGE_READONLY	__pgprot(pgprot_val(pgprot_user) | _L_PTE_READ)</div><div class='del'>-#define PAGE_KERNEL	pgprot_kernel</div><div class='del'>-</div><div class='del'>-#define __PAGE_NONE	__pgprot(_L_PTE_DEFAULT)</div><div class='del'>-#define __PAGE_COPY	__pgprot(_L_PTE_DEFAULT | _L_PTE_READ)</div><div class='del'>-#define __PAGE_SHARED	__pgprot(_L_PTE_DEFAULT | _L_PTE_READ | L_PTE_WRITE)</div><div class='del'>-#define __PAGE_READONLY	__pgprot(_L_PTE_DEFAULT | _L_PTE_READ)</div><div class='add'>+#define _MOD_PROT(p, b)	__pgprot(pgprot_val(p) | (b))</div><div class='add'>+</div><div class='add'>+#define PAGE_NONE		pgprot_user</div><div class='add'>+#define PAGE_SHARED		_MOD_PROT(pgprot_user, L_PTE_USER | L_PTE_WRITE)</div><div class='add'>+#define PAGE_SHARED_EXEC	_MOD_PROT(pgprot_user, L_PTE_USER | L_PTE_WRITE | L_PTE_EXEC)</div><div class='add'>+#define PAGE_COPY		_MOD_PROT(pgprot_user, L_PTE_USER)</div><div class='add'>+#define PAGE_COPY_EXEC		_MOD_PROT(pgprot_user, L_PTE_USER | L_PTE_EXEC)</div><div class='add'>+#define PAGE_READONLY		_MOD_PROT(pgprot_user, L_PTE_USER)</div><div class='add'>+#define PAGE_READONLY_EXEC	_MOD_PROT(pgprot_user, L_PTE_USER | L_PTE_EXEC)</div><div class='add'>+#define PAGE_KERNEL		pgprot_kernel</div><div class='add'>+#define PAGE_KERNEL_EXEC	_MOD_PROT(pgprot_kernel, L_PTE_EXEC)</div><div class='add'>+</div><div class='add'>+#define __PAGE_NONE		__pgprot(_L_PTE_DEFAULT)</div><div class='add'>+#define __PAGE_SHARED		__pgprot(_L_PTE_DEFAULT | L_PTE_USER | L_PTE_WRITE)</div><div class='add'>+#define __PAGE_SHARED_EXEC	__pgprot(_L_PTE_DEFAULT | L_PTE_USER | L_PTE_WRITE | L_PTE_EXEC)</div><div class='add'>+#define __PAGE_COPY		__pgprot(_L_PTE_DEFAULT | L_PTE_USER)</div><div class='add'>+#define __PAGE_COPY_EXEC	__pgprot(_L_PTE_DEFAULT | L_PTE_USER | L_PTE_EXEC)</div><div class='add'>+#define __PAGE_READONLY		__pgprot(_L_PTE_DEFAULT | L_PTE_USER)</div><div class='add'>+#define __PAGE_READONLY_EXEC	__pgprot(_L_PTE_DEFAULT | L_PTE_USER | L_PTE_EXEC)</div><div class='ctx'> </div><div class='ctx'> #endif /* __ASSEMBLY__ */</div><div class='ctx'> </div><div class='hunk'>@@ -212,19 +235,19 @@ extern pgprot_t		pgprot_kernel;</div><div class='ctx'> #define __P001  __PAGE_READONLY</div><div class='ctx'> #define __P010  __PAGE_COPY</div><div class='ctx'> #define __P011  __PAGE_COPY</div><div class='del'>-#define __P100  __PAGE_READONLY</div><div class='del'>-#define __P101  __PAGE_READONLY</div><div class='del'>-#define __P110  __PAGE_COPY</div><div class='del'>-#define __P111  __PAGE_COPY</div><div class='add'>+#define __P100  __PAGE_READONLY_EXEC</div><div class='add'>+#define __P101  __PAGE_READONLY_EXEC</div><div class='add'>+#define __P110  __PAGE_COPY_EXEC</div><div class='add'>+#define __P111  __PAGE_COPY_EXEC</div><div class='ctx'> </div><div class='ctx'> #define __S000  __PAGE_NONE</div><div class='ctx'> #define __S001  __PAGE_READONLY</div><div class='ctx'> #define __S010  __PAGE_SHARED</div><div class='ctx'> #define __S011  __PAGE_SHARED</div><div class='del'>-#define __S100  __PAGE_READONLY</div><div class='del'>-#define __S101  __PAGE_READONLY</div><div class='del'>-#define __S110  __PAGE_SHARED</div><div class='del'>-#define __S111  __PAGE_SHARED</div><div class='add'>+#define __S100  __PAGE_READONLY_EXEC</div><div class='add'>+#define __S101  __PAGE_READONLY_EXEC</div><div class='add'>+#define __S110  __PAGE_SHARED_EXEC</div><div class='add'>+#define __S111  __PAGE_SHARED_EXEC</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='ctx'> /*</div><div class='hunk'>@@ -286,8 +309,10 @@ static inline pte_t pte_mkspecial(pte_t pte) { return pte; }</div><div class='ctx'> /*</div><div class='ctx'>  * Mark the prot value as uncacheable and unbufferable.</div><div class='ctx'>  */</div><div class='del'>-#define pgprot_noncached(prot)	__pgprot(pgprot_val(prot) &amp; ~(L_PTE_CACHEABLE | L_PTE_BUFFERABLE))</div><div class='del'>-#define pgprot_writecombine(prot) __pgprot(pgprot_val(prot) &amp; ~L_PTE_CACHEABLE)</div><div class='add'>+#define pgprot_noncached(prot) \</div><div class='add'>+	__pgprot((pgprot_val(prot) &amp; ~L_PTE_MT_MASK) | L_PTE_MT_UNCACHED)</div><div class='add'>+#define pgprot_writecombine(prot) \</div><div class='add'>+	__pgprot((pgprot_val(prot) &amp; ~L_PTE_MT_MASK) | L_PTE_MT_BUFFERABLE)</div><div class='ctx'> </div><div class='ctx'> #define pmd_none(pmd)		(!pmd_val(pmd))</div><div class='ctx'> #define pmd_present(pmd)	(pmd_val(pmd))</div><div class='hunk'>@@ -320,11 +345,6 @@ static inline pte_t *pmd_page_vaddr(pmd_t pmd)</div><div class='ctx'> #define pmd_page(pmd) virt_to_page(__va(pmd_val(pmd)))</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Permanent address of a page. We never have highmem, so this is trivial.</div><div class='del'>- */</div><div class='del'>-#define pages_to_mb(x)		((x) &gt;&gt; (20 - PAGE_SHIFT))</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * Conversion functions: convert a page and protection to a page entry,</div><div class='ctx'>  * and a page entry and page directory to the page they refer to.</div><div class='ctx'>  */</div><div class='head'>diff --git a/arch/arm/include/asm/ptrace.h b/arch/arm/include/asm/ptrace.h<br/>index b415c0e85458..73192618f1c2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/include/asm/ptrace.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/include/asm/ptrace.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/include/asm/ptrace.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/include/asm/ptrace.h</a></div><div class='hunk'>@@ -54,7 +54,6 @@</div><div class='ctx'> #define PSR_C_BIT	0x20000000</div><div class='ctx'> #define PSR_Z_BIT	0x40000000</div><div class='ctx'> #define PSR_N_BIT	0x80000000</div><div class='del'>-#define PCMASK		0</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Groups of PSR bits</div><div class='hunk'>@@ -139,11 +138,7 @@ static inline int valid_user_regs(struct pt_regs *regs)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define pc_pointer(v) \</div><div class='del'>-	((v) &amp; ~PCMASK)</div><div class='del'>-</div><div class='del'>-#define instruction_pointer(regs) \</div><div class='del'>-	(pc_pointer((regs)-&gt;ARM_pc))</div><div class='add'>+#define instruction_pointer(regs)	(regs)-&gt;ARM_pc</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> extern unsigned long profile_pc(struct pt_regs *regs);</div><div class='head'>diff --git a/arch/arm/include/asm/setup.h b/arch/arm/include/asm/setup.h<br/>index 7bbf105463f1..a65413ba121d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/include/asm/setup.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/include/asm/setup.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/include/asm/setup.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/include/asm/setup.h</a></div><div class='hunk'>@@ -209,6 +209,17 @@ struct meminfo {</div><div class='ctx'> 	struct membank bank[NR_BANKS];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define for_each_nodebank(iter,mi,no)			\</div><div class='add'>+	for (iter = 0; iter &lt; mi-&gt;nr_banks; iter++)	\</div><div class='add'>+		if (mi-&gt;bank[iter].node == no)</div><div class='add'>+</div><div class='add'>+#define bank_pfn_start(bank)	__phys_to_pfn((bank)-&gt;start)</div><div class='add'>+#define bank_pfn_end(bank)	__phys_to_pfn((bank)-&gt;start + (bank)-&gt;size)</div><div class='add'>+#define bank_pfn_size(bank)	((bank)-&gt;size &gt;&gt; PAGE_SHIFT)</div><div class='add'>+#define bank_phys_start(bank)	(bank)-&gt;start</div><div class='add'>+#define bank_phys_end(bank)	((bank)-&gt;start + (bank)-&gt;size)</div><div class='add'>+#define bank_phys_size(bank)	(bank)-&gt;size</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Early command line parameters.</div><div class='ctx'>  */</div><div class='head'>diff --git a/arch/arm/include/asm/sparsemem.h b/arch/arm/include/asm/sparsemem.h<br/>index 277158191a0d..00098615c6f0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/include/asm/sparsemem.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/include/asm/sparsemem.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/include/asm/sparsemem.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/include/asm/sparsemem.h</a></div><div class='hunk'>@@ -3,8 +3,22 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/memory.h&gt;</div><div class='ctx'> </div><div class='del'>-#define MAX_PHYSADDR_BITS	32</div><div class='del'>-#define MAX_PHYSMEM_BITS	32</div><div class='del'>-#define SECTION_SIZE_BITS	NODE_MEM_SIZE_BITS</div><div class='add'>+/*</div><div class='add'>+ * Two definitions are required for sparsemem:</div><div class='add'>+ *</div><div class='add'>+ * MAX_PHYSMEM_BITS: The number of physical address bits required</div><div class='add'>+ *   to address the last byte of memory.</div><div class='add'>+ *</div><div class='add'>+ * SECTION_SIZE_BITS: The number of physical address bits to cover</div><div class='add'>+ *   the maximum amount of memory in a section.</div><div class='add'>+ *</div><div class='add'>+ * Eg, if you have 2 banks of up to 64MB at 0x80000000, 0x84000000,</div><div class='add'>+ * then MAX_PHYSMEM_BITS is 32, SECTION_SIZE_BITS is 26.</div><div class='add'>+ *</div><div class='add'>+ * Define these in your mach/memory.h.</div><div class='add'>+ */</div><div class='add'>+#if !defined(SECTION_SIZE_BITS) || !defined(MAX_PHYSMEM_BITS)</div><div class='add'>+#error Sparsemem is not supported on this platform</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/include/asm/statfs.h b/arch/arm/include/asm/statfs.h<br/>index a02e6a8c3d70..079447c05ba7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/include/asm/statfs.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/include/asm/statfs.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/include/asm/statfs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/include/asm/statfs.h</a></div><div class='hunk'>@@ -1,42 +1,12 @@</div><div class='ctx'> #ifndef _ASMARM_STATFS_H</div><div class='ctx'> #define _ASMARM_STATFS_H</div><div class='ctx'> </div><div class='del'>-#ifndef __KERNEL_STRICT_NAMES</div><div class='del'>-# include &lt;linux/types.h&gt;</div><div class='del'>-typedef __kernel_fsid_t	fsid_t;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-struct statfs {</div><div class='del'>-	__u32 f_type;</div><div class='del'>-	__u32 f_bsize;</div><div class='del'>-	__u32 f_blocks;</div><div class='del'>-	__u32 f_bfree;</div><div class='del'>-	__u32 f_bavail;</div><div class='del'>-	__u32 f_files;</div><div class='del'>-	__u32 f_ffree;</div><div class='del'>-	__kernel_fsid_t f_fsid;</div><div class='del'>-	__u32 f_namelen;</div><div class='del'>-	__u32 f_frsize;</div><div class='del'>-	__u32 f_spare[5];</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * With EABI there is 4 bytes of padding added to this structure.</div><div class='ctx'>  * Let's pack it so the padding goes away to simplify dual ABI support.</div><div class='ctx'>  * Note that user space does NOT have to pack this structure.</div><div class='ctx'>  */</div><div class='del'>-struct statfs64 {</div><div class='del'>-	__u32 f_type;</div><div class='del'>-	__u32 f_bsize;</div><div class='del'>-	__u64 f_blocks;</div><div class='del'>-	__u64 f_bfree;</div><div class='del'>-	__u64 f_bavail;</div><div class='del'>-	__u64 f_files;</div><div class='del'>-	__u64 f_ffree;</div><div class='del'>-	__kernel_fsid_t f_fsid;</div><div class='del'>-	__u32 f_namelen;</div><div class='del'>-	__u32 f_frsize;</div><div class='del'>-	__u32 f_spare[5];</div><div class='del'>-} __attribute__ ((packed,aligned(4)));</div><div class='add'>+#define ARCH_PACK_STATFS64 __attribute__((packed,aligned(4)))</div><div class='ctx'> </div><div class='add'>+#include &lt;asm-generic/statfs.h&gt;</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/include/asm/system.h b/arch/arm/include/asm/system.h<br/>index 514af792a598..7aad78420f18 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/include/asm/system.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/include/asm/system.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/include/asm/system.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/include/asm/system.h</a></div><div class='hunk'>@@ -43,11 +43,6 @@</div><div class='ctx'> #define CR_XP	(1 &lt;&lt; 23)	/* Extended page tables			*/</div><div class='ctx'> #define CR_VE	(1 &lt;&lt; 24)	/* Vectored interrupts			*/</div><div class='ctx'> </div><div class='del'>-#define CPUID_ID	0</div><div class='del'>-#define CPUID_CACHETYPE	1</div><div class='del'>-#define CPUID_TCM	2</div><div class='del'>-#define CPUID_TLBTYPE	3</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * This is used to ensure the compiler did actually allocate the register we</div><div class='ctx'>  * asked it for some inline assembly sequences.  Apparently we can't trust</div><div class='hunk'>@@ -61,36 +56,8 @@</div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='del'>-#include &lt;linux/stringify.h&gt;</div><div class='ctx'> #include &lt;linux/irqflags.h&gt;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_CPU_CP15</div><div class='del'>-#define read_cpuid(reg)							\</div><div class='del'>-	({								\</div><div class='del'>-		unsigned int __val;					\</div><div class='del'>-		asm("mrc	p15, 0, %0, c0, c0, " __stringify(reg)	\</div><div class='del'>-		    : "=r" (__val)					\</div><div class='del'>-		    :							\</div><div class='del'>-		    : "cc");						\</div><div class='del'>-		__val;							\</div><div class='del'>-	})</div><div class='del'>-#else</div><div class='del'>-extern unsigned int processor_id;</div><div class='del'>-#define read_cpuid(reg) (processor_id)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The CPU ID never changes at run time, so we might as well tell the</div><div class='del'>- * compiler that it's constant.  Use this function to read the CPU ID</div><div class='del'>- * rather than directly reading processor_id or read_cpuid() directly.</div><div class='del'>- */</div><div class='del'>-static inline unsigned int read_cpuid_id(void) __attribute_const__;</div><div class='del'>-</div><div class='del'>-static inline unsigned int read_cpuid_id(void)</div><div class='del'>-{</div><div class='del'>-	return read_cpuid(CPUID_ID);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #define __exception	__attribute__((section(".exception.text")))</div><div class='ctx'> </div><div class='ctx'> struct thread_info;</div><div class='hunk'>@@ -131,31 +98,6 @@ extern void cpu_init(void);</div><div class='ctx'> void arm_machine_restart(char mode);</div><div class='ctx'> extern void (*arm_pm_restart)(char str);</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Intel's XScale3 core supports some v6 features (supersections, L2)</div><div class='del'>- * but advertises itself as v5 as it does not support the v6 ISA.  For</div><div class='del'>- * this reason, we need a way to explicitly test for this type of CPU.</div><div class='del'>- */</div><div class='del'>-#ifndef CONFIG_CPU_XSC3</div><div class='del'>-#define cpu_is_xsc3()	0</div><div class='del'>-#else</div><div class='del'>-static inline int cpu_is_xsc3(void)</div><div class='del'>-{</div><div class='del'>-	extern unsigned int processor_id;</div><div class='del'>-</div><div class='del'>-	if ((processor_id &amp; 0xffffe000) == 0x69056000)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#if !defined(CONFIG_CPU_XSCALE) &amp;&amp; !defined(CONFIG_CPU_XSC3)</div><div class='del'>-#define	cpu_is_xscale()	0</div><div class='del'>-#else</div><div class='del'>-#define	cpu_is_xscale()	1</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #define UDBG_UNDEFINED	(1 &lt;&lt; 0)</div><div class='ctx'> #define UDBG_SYSCALL	(1 &lt;&lt; 1)</div><div class='ctx'> #define UDBG_BADABORT	(1 &lt;&lt; 2)</div><div class='head'>diff --git a/arch/arm/include/asm/thread_info.h b/arch/arm/include/asm/thread_info.h<br/>index e56fa48e4ae7..68b9ec82a37f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/include/asm/thread_info.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/include/asm/thread_info.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/include/asm/thread_info.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/include/asm/thread_info.h</a></div><div class='hunk'>@@ -98,7 +98,7 @@ static inline struct thread_info *current_thread_info(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define thread_saved_pc(tsk)	\</div><div class='del'>-	((unsigned long)(pc_pointer(task_thread_info(tsk)-&gt;cpu_context.pc)))</div><div class='add'>+	((unsigned long)(task_thread_info(tsk)-&gt;cpu_context.pc))</div><div class='ctx'> #define thread_saved_fp(tsk)	\</div><div class='ctx'> 	((unsigned long)(task_thread_info(tsk)-&gt;cpu_context.fp))</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h<br/>index d0f51ff900b5..e98ec60b3400 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/include/asm/uaccess.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/include/asm/uaccess.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/include/asm/uaccess.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/include/asm/uaccess.h</a></div><div class='hunk'>@@ -225,7 +225,7 @@ do {									\</div><div class='ctx'> </div><div class='ctx'> #define __get_user_asm_byte(x,addr,err)				\</div><div class='ctx'> 	__asm__ __volatile__(					\</div><div class='del'>-	"1:	ldrbt	%1,[%2],#0\n"				\</div><div class='add'>+	"1:	ldrbt	%1,[%2]\n"				\</div><div class='ctx'> 	"2:\n"							\</div><div class='ctx'> 	"	.section .fixup,\"ax\"\n"			\</div><div class='ctx'> 	"	.align	2\n"					\</div><div class='hunk'>@@ -261,7 +261,7 @@ do {									\</div><div class='ctx'> </div><div class='ctx'> #define __get_user_asm_word(x,addr,err)				\</div><div class='ctx'> 	__asm__ __volatile__(					\</div><div class='del'>-	"1:	ldrt	%1,[%2],#0\n"				\</div><div class='add'>+	"1:	ldrt	%1,[%2]\n"				\</div><div class='ctx'> 	"2:\n"							\</div><div class='ctx'> 	"	.section .fixup,\"ax\"\n"			\</div><div class='ctx'> 	"	.align	2\n"					\</div><div class='hunk'>@@ -306,7 +306,7 @@ do {									\</div><div class='ctx'> </div><div class='ctx'> #define __put_user_asm_byte(x,__pu_addr,err)			\</div><div class='ctx'> 	__asm__ __volatile__(					\</div><div class='del'>-	"1:	strbt	%1,[%2],#0\n"				\</div><div class='add'>+	"1:	strbt	%1,[%2]\n"				\</div><div class='ctx'> 	"2:\n"							\</div><div class='ctx'> 	"	.section .fixup,\"ax\"\n"			\</div><div class='ctx'> 	"	.align	2\n"					\</div><div class='hunk'>@@ -339,7 +339,7 @@ do {									\</div><div class='ctx'> </div><div class='ctx'> #define __put_user_asm_word(x,__pu_addr,err)			\</div><div class='ctx'> 	__asm__ __volatile__(					\</div><div class='del'>-	"1:	strt	%1,[%2],#0\n"				\</div><div class='add'>+	"1:	strt	%1,[%2]\n"				\</div><div class='ctx'> 	"2:\n"							\</div><div class='ctx'> 	"	.section .fixup,\"ax\"\n"			\</div><div class='ctx'> 	"	.align	2\n"					\</div><div class='hunk'>@@ -365,7 +365,7 @@ do {									\</div><div class='ctx'> #define __put_user_asm_dword(x,__pu_addr,err)			\</div><div class='ctx'> 	__asm__ __volatile__(					\</div><div class='ctx'> 	"1:	strt	" __reg_oper1 ", [%1], #4\n"		\</div><div class='del'>-	"2:	strt	" __reg_oper0 ", [%1], #0\n"		\</div><div class='add'>+	"2:	strt	" __reg_oper0 ", [%1]\n"		\</div><div class='ctx'> 	"3:\n"							\</div><div class='ctx'> 	"	.section .fixup,\"ax\"\n"			\</div><div class='ctx'> 	"	.align	2\n"					\</div><div class='head'>diff --git a/arch/arm/include/asm/vga.h b/arch/arm/include/asm/vga.h<br/>index 6a3cd2a2f670..250a4dd00630 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/include/asm/vga.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/include/asm/vga.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/include/asm/vga.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/include/asm/vga.h</a></div><div class='hunk'>@@ -1,8 +1,8 @@</div><div class='ctx'> #ifndef ASMARM_VGA_H</div><div class='ctx'> #define ASMARM_VGA_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define VGA_MAP_MEM(x,s)	(PCIMEM_BASE + (x))</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile<br/>index 1d296fc8494e..4305345987d3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/kernel/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/kernel/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/kernel/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/kernel/Makefile</a></div><div class='hunk'>@@ -10,7 +10,7 @@ endif</div><div class='ctx'> </div><div class='ctx'> # Object file lists.</div><div class='ctx'> </div><div class='del'>-obj-y		:= compat.o entry-armv.o entry-common.o irq.o \</div><div class='add'>+obj-y		:= compat.o elf.o entry-armv.o entry-common.o irq.o \</div><div class='ctx'> 		   process.o ptrace.o setup.o signal.o \</div><div class='ctx'> 		   sys_arm.o stacktrace.o time.o traps.o</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/kernel/armksyms.c b/arch/arm/kernel/armksyms.c<br/>index cc7b246e9652..2357b1cf1cf9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/kernel/armksyms.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/kernel/armksyms.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/kernel/armksyms.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/kernel/armksyms.c</a></div><div class='hunk'>@@ -13,11 +13,11 @@</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/in6.h&gt;</div><div class='ctx'> #include &lt;linux/syscalls.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/checksum.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/ftrace.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c<br/>index e5747547b44c..17a59b6e521f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/kernel/bios32.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/kernel/bios32.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/kernel/bios32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/kernel/bios32.c</a></div><div class='hunk'>@@ -10,8 +10,8 @@</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/pci.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/kernel/crunch.c b/arch/arm/kernel/crunch.c<br/>index 3b6a1c293ee4..99995c2b2312 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/kernel/crunch.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/kernel/crunch.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/kernel/crunch.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/kernel/crunch.c</a></div><div class='hunk'>@@ -15,9 +15,9 @@</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;mach/ep93xx-regs.h&gt;</div><div class='ctx'> #include &lt;asm/thread_notify.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct crunch_state *crunch_owner;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/kernel/debug.S b/arch/arm/kernel/debug.S<br/>index 9550ff0ddde4..f53c58290543 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/kernel/debug.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/kernel/debug.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/kernel/debug.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/kernel/debug.S</a></div><div class='hunk'>@@ -89,10 +89,12 @@</div><div class='ctx'> ENTRY(printhex8)</div><div class='ctx'> 		mov	r1, #8</div><div class='ctx'> 		b	printhex</div><div class='add'>+ENDPROC(printhex8)</div><div class='ctx'> </div><div class='ctx'> ENTRY(printhex4)</div><div class='ctx'> 		mov	r1, #4</div><div class='ctx'> 		b	printhex</div><div class='add'>+ENDPROC(printhex4)</div><div class='ctx'> </div><div class='ctx'> ENTRY(printhex2)</div><div class='ctx'> 		mov	r1, #2</div><div class='hunk'>@@ -110,6 +112,7 @@ printhex:	adr	r2, hexbuf</div><div class='ctx'> 		bne	1b</div><div class='ctx'> 		mov	r0, r2</div><div class='ctx'> 		b	printascii</div><div class='add'>+ENDPROC(printhex2)</div><div class='ctx'> </div><div class='ctx'> 		.ltorg</div><div class='ctx'> </div><div class='hunk'>@@ -127,11 +130,13 @@ ENTRY(printascii)</div><div class='ctx'> 		teqne	r1, #0</div><div class='ctx'> 		bne	1b</div><div class='ctx'> 		mov	pc, lr</div><div class='add'>+ENDPROC(printascii)</div><div class='ctx'> </div><div class='ctx'> ENTRY(printch)</div><div class='ctx'> 		addruart r3</div><div class='ctx'> 		mov	r1, r0</div><div class='ctx'> 		mov	r0, #0</div><div class='ctx'> 		b	1b</div><div class='add'>+ENDPROC(printch)</div><div class='ctx'> </div><div class='ctx'> hexbuf:		.space 16</div><div class='head'>diff --git a/arch/arm/kernel/dma-isa.c b/arch/arm/kernel/dma-isa.c<br/>index 2f080a35a2d9..4a3a50495c60 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/kernel/dma-isa.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/kernel/dma-isa.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/kernel/dma-isa.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/kernel/dma-isa.c</a></div><div class='hunk'>@@ -19,10 +19,9 @@</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-</div><div class='ctx'> #include &lt;asm/mach/dma.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define ISA_DMA_MODE_READ	0x44</div><div class='head'>diff --git a/arch/arm/kernel/dma.c b/arch/arm/kernel/dma.c<br/>index ba99a2035523..d006085ed7e7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/kernel/dma.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/kernel/dma.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/kernel/dma.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/kernel/dma.c</a></div><div class='hunk'>@@ -26,23 +26,6 @@ EXPORT_SYMBOL(dma_spin_lock);</div><div class='ctx'> static dma_t dma_chan[MAX_DMA_CHANNELS];</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Get dma list for /proc/dma</div><div class='del'>- */</div><div class='del'>-int get_dma_list(char *buf)</div><div class='del'>-{</div><div class='del'>-	dma_t *dma;</div><div class='del'>-	char *p = buf;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0, dma = dma_chan; i &lt; MAX_DMA_CHANNELS; i++, dma++)</div><div class='del'>-		if (dma-&gt;lock)</div><div class='del'>-			p += sprintf(p, "%2d: %14s %s\n", i,</div><div class='del'>-				     dma-&gt;d_ops-&gt;type, dma-&gt;device_id);</div><div class='del'>-</div><div class='del'>-	return p - buf;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * Request DMA channel</div><div class='ctx'>  *</div><div class='ctx'>  * On certain platforms, we have to allocate an interrupt as well...</div><div class='head'>diff --git a/arch/arm/kernel/ecard.c b/arch/arm/kernel/ecard.c<br/>index 7a50575a8d4d..60c079d85355 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/kernel/ecard.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/kernel/ecard.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/kernel/ecard.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/kernel/ecard.c</a></div><div class='hunk'>@@ -587,8 +587,7 @@ ecard_irq_handler(unsigned int irq, struct irq_desc *desc)</div><div class='ctx'> 			pending = ecard_default_ops.irqpending(ec);</div><div class='ctx'> </div><div class='ctx'> 		if (pending) {</div><div class='del'>-			struct irq_desc *d = irq_desc + ec-&gt;irq;</div><div class='del'>-			desc_handle_irq(ec-&gt;irq, d);</div><div class='add'>+			generic_handle_irq(ec-&gt;irq);</div><div class='ctx'> 			called ++;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -622,7 +621,6 @@ ecard_irqexp_handler(unsigned int irq, struct irq_desc *desc)</div><div class='ctx'> 		ecard_t *ec = slot_to_ecard(slot);</div><div class='ctx'> </div><div class='ctx'> 		if (ec-&gt;claimed) {</div><div class='del'>-			struct irq_desc *d = irq_desc + ec-&gt;irq;</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * this ugly code is so that we can operate a</div><div class='ctx'> 			 * prioritorising system:</div><div class='hunk'>@@ -635,7 +633,7 @@ ecard_irqexp_handler(unsigned int irq, struct irq_desc *desc)</div><div class='ctx'> 			 * Serial cards should go in 0/1, ethernet/scsi in 2/3</div><div class='ctx'> 			 * otherwise you will lose serial data at high speeds!</div><div class='ctx'> 			 */</div><div class='del'>-			desc_handle_irq(ec-&gt;irq, d);</div><div class='add'>+			generic_handle_irq(ec-&gt;irq);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			printk(KERN_WARNING "card%d: interrupt from unclaimed "</div><div class='ctx'> 			       "card???\n", slot);</div><div class='head'>diff --git a/arch/arm/kernel/elf.c b/arch/arm/kernel/elf.c<br/>new file mode 100644<br/>index 000000000000..513f332f040d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/kernel/elf.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/kernel/elf.c</a></div><div class='hunk'>@@ -0,0 +1,79 @@</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/personality.h&gt;</div><div class='add'>+#include &lt;linux/binfmts.h&gt;</div><div class='add'>+#include &lt;linux/elf.h&gt;</div><div class='add'>+</div><div class='add'>+int elf_check_arch(const struct elf32_hdr *x)</div><div class='add'>+{</div><div class='add'>+	unsigned int eflags;</div><div class='add'>+</div><div class='add'>+	/* Make sure it's an ARM executable */</div><div class='add'>+	if (x-&gt;e_machine != EM_ARM)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Make sure the entry address is reasonable */</div><div class='add'>+	if (x-&gt;e_entry &amp; 1) {</div><div class='add'>+		if (!(elf_hwcap &amp; HWCAP_THUMB))</div><div class='add'>+			return 0;</div><div class='add'>+	} else if (x-&gt;e_entry &amp; 3)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	eflags = x-&gt;e_flags;</div><div class='add'>+	if ((eflags &amp; EF_ARM_EABI_MASK) == EF_ARM_EABI_UNKNOWN) {</div><div class='add'>+		/* APCS26 is only allowed if the CPU supports it */</div><div class='add'>+		if ((eflags &amp; EF_ARM_APCS_26) &amp;&amp; !(elf_hwcap &amp; HWCAP_26BIT))</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		/* VFP requires the supporting code */</div><div class='add'>+		if ((eflags &amp; EF_ARM_VFP_FLOAT) &amp;&amp; !(elf_hwcap &amp; HWCAP_VFP))</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(elf_check_arch);</div><div class='add'>+</div><div class='add'>+void elf_set_personality(const struct elf32_hdr *x)</div><div class='add'>+{</div><div class='add'>+	unsigned int eflags = x-&gt;e_flags;</div><div class='add'>+	unsigned int personality = PER_LINUX_32BIT;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * APCS-26 is only valid for OABI executables</div><div class='add'>+	 */</div><div class='add'>+	if ((eflags &amp; EF_ARM_EABI_MASK) == EF_ARM_EABI_UNKNOWN) {</div><div class='add'>+		if (eflags &amp; EF_ARM_APCS_26)</div><div class='add'>+			personality = PER_LINUX;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	set_personality(personality);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Since the FPA coprocessor uses CP1 and CP2, and iWMMXt uses CP0</div><div class='add'>+	 * and CP1, we only enable access to the iWMMXt coprocessor if the</div><div class='add'>+	 * binary is EABI or softfloat (and thus, guaranteed not to use</div><div class='add'>+	 * FPA instructions.)</div><div class='add'>+	 */</div><div class='add'>+	if (elf_hwcap &amp; HWCAP_IWMMXT &amp;&amp;</div><div class='add'>+	    eflags &amp; (EF_ARM_EABI_MASK | EF_ARM_SOFT_FLOAT)) {</div><div class='add'>+		set_thread_flag(TIF_USING_IWMMXT);</div><div class='add'>+	} else {</div><div class='add'>+		clear_thread_flag(TIF_USING_IWMMXT);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(elf_set_personality);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Set READ_IMPLIES_EXEC if:</div><div class='add'>+ *  - the binary requires an executable stack</div><div class='add'>+ *  - we're running on a CPU which doesn't support NX.</div><div class='add'>+ */</div><div class='add'>+int arm_elf_read_implies_exec(const struct elf32_hdr *x, int executable_stack)</div><div class='add'>+{</div><div class='add'>+	if (executable_stack != EXSTACK_ENABLE_X)</div><div class='add'>+		return 1;</div><div class='add'>+	if (cpu_architecture() &lt;= CPU_ARCH_ARMv6)</div><div class='add'>+		return 1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(arm_elf_read_implies_exec);</div><div class='head'>diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S<br/>index 617e509d60df..77b047475539 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/kernel/entry-armv.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/kernel/entry-armv.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/kernel/entry-armv.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/kernel/entry-armv.S</a></div><div class='hunk'>@@ -76,14 +76,17 @@</div><div class='ctx'> __pabt_invalid:</div><div class='ctx'> 	inv_entry BAD_PREFETCH</div><div class='ctx'> 	b	common_invalid</div><div class='add'>+ENDPROC(__pabt_invalid)</div><div class='ctx'> </div><div class='ctx'> __dabt_invalid:</div><div class='ctx'> 	inv_entry BAD_DATA</div><div class='ctx'> 	b	common_invalid</div><div class='add'>+ENDPROC(__dabt_invalid)</div><div class='ctx'> </div><div class='ctx'> __irq_invalid:</div><div class='ctx'> 	inv_entry BAD_IRQ</div><div class='ctx'> 	b	common_invalid</div><div class='add'>+ENDPROC(__irq_invalid)</div><div class='ctx'> </div><div class='ctx'> __und_invalid:</div><div class='ctx'> 	inv_entry BAD_UNDEFINSTR</div><div class='hunk'>@@ -107,6 +110,7 @@ common_invalid:</div><div class='ctx'> </div><div class='ctx'> 	mov	r0, sp</div><div class='ctx'> 	b	bad_mode</div><div class='add'>+ENDPROC(__und_invalid)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * SVC mode handlers</div><div class='hunk'>@@ -192,6 +196,7 @@ __dabt_svc:</div><div class='ctx'> 	ldr	r0, [sp, #S_PSR]</div><div class='ctx'> 	msr	spsr_cxsf, r0</div><div class='ctx'> 	ldmia	sp, {r0 - pc}^			@ load r0 - pc, cpsr</div><div class='add'>+ENDPROC(__dabt_svc)</div><div class='ctx'> </div><div class='ctx'> 	.align	5</div><div class='ctx'> __irq_svc:</div><div class='hunk'>@@ -223,6 +228,7 @@ __irq_svc:</div><div class='ctx'> 	bleq	trace_hardirqs_on</div><div class='ctx'> #endif</div><div class='ctx'> 	ldmia	sp, {r0 - pc}^			@ load r0 - pc, cpsr</div><div class='add'>+ENDPROC(__irq_svc)</div><div class='ctx'> </div><div class='ctx'> 	.ltorg</div><div class='ctx'> </div><div class='hunk'>@@ -272,6 +278,7 @@ __und_svc:</div><div class='ctx'> 	ldr	lr, [sp, #S_PSR]		@ Get SVC cpsr</div><div class='ctx'> 	msr	spsr_cxsf, lr</div><div class='ctx'> 	ldmia	sp, {r0 - pc}^			@ Restore SVC registers</div><div class='add'>+ENDPROC(__und_svc)</div><div class='ctx'> </div><div class='ctx'> 	.align	5</div><div class='ctx'> __pabt_svc:</div><div class='hunk'>@@ -313,6 +320,7 @@ __pabt_svc:</div><div class='ctx'> 	ldr	r0, [sp, #S_PSR]</div><div class='ctx'> 	msr	spsr_cxsf, r0</div><div class='ctx'> 	ldmia	sp, {r0 - pc}^			@ load r0 - pc, cpsr</div><div class='add'>+ENDPROC(__pabt_svc)</div><div class='ctx'> </div><div class='ctx'> 	.align	5</div><div class='ctx'> .LCcralign:</div><div class='hunk'>@@ -412,6 +420,7 @@ __dabt_usr:</div><div class='ctx'> 	mov	r2, sp</div><div class='ctx'> 	adr	lr, ret_from_exception</div><div class='ctx'> 	b	do_DataAbort</div><div class='add'>+ENDPROC(__dabt_usr)</div><div class='ctx'> </div><div class='ctx'> 	.align	5</div><div class='ctx'> __irq_usr:</div><div class='hunk'>@@ -441,6 +450,7 @@ __irq_usr:</div><div class='ctx'> </div><div class='ctx'> 	mov	why, #0</div><div class='ctx'> 	b	ret_to_user</div><div class='add'>+ENDPROC(__irq_usr)</div><div class='ctx'> </div><div class='ctx'> 	.ltorg</div><div class='ctx'> </div><div class='hunk'>@@ -474,6 +484,7 @@ __und_usr:</div><div class='ctx'> #else</div><div class='ctx'> 	b	__und_usr_unknown</div><div class='ctx'> #endif</div><div class='add'>+ENDPROC(__und_usr)</div><div class='ctx'> </div><div class='ctx'> 	@</div><div class='ctx'> 	@ fallthrough to call_fpe</div><div class='hunk'>@@ -642,6 +653,7 @@ __und_usr_unknown:</div><div class='ctx'> 	mov	r0, sp</div><div class='ctx'> 	adr	lr, ret_from_exception</div><div class='ctx'> 	b	do_undefinstr</div><div class='add'>+ENDPROC(__und_usr_unknown)</div><div class='ctx'> </div><div class='ctx'> 	.align	5</div><div class='ctx'> __pabt_usr:</div><div class='hunk'>@@ -666,6 +678,8 @@ ENTRY(ret_from_exception)</div><div class='ctx'> 	get_thread_info tsk</div><div class='ctx'> 	mov	why, #0</div><div class='ctx'> 	b	ret_to_user</div><div class='add'>+ENDPROC(__pabt_usr)</div><div class='add'>+ENDPROC(ret_from_exception)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Register switch for ARMv3 and ARMv4 processors</div><div class='hunk'>@@ -702,6 +716,7 @@ ENTRY(__switch_to)</div><div class='ctx'> 	bl	atomic_notifier_call_chain</div><div class='ctx'> 	mov	r0, r5</div><div class='ctx'> 	ldmia	r4, {r4 - sl, fp, sp, pc}	@ Load all regs saved previously</div><div class='add'>+ENDPROC(__switch_to)</div><div class='ctx'> </div><div class='ctx'> 	__INIT</div><div class='ctx'> </div><div class='hunk'>@@ -1029,6 +1044,7 @@ vector_\name:</div><div class='ctx'> 	mov	r0, sp</div><div class='ctx'> 	ldr	lr, [pc, lr, lsl #2]</div><div class='ctx'> 	movs	pc, lr			@ branch to handler in SVC mode</div><div class='add'>+ENDPROC(vector_\name)</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='ctx'> 	.globl	__stubs_start</div><div class='head'>diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S<br/>index 060d7e2e9f64..3aa14dcc5bab 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/kernel/entry-common.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/kernel/entry-common.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/kernel/entry-common.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/kernel/entry-common.S</a></div><div class='hunk'>@@ -77,6 +77,7 @@ no_work_pending:</div><div class='ctx'> 	mov	r0, r0</div><div class='ctx'> 	add	sp, sp, #S_FRAME_SIZE - S_PC</div><div class='ctx'> 	movs	pc, lr				@ return &amp; move spsr_svc into cpsr</div><div class='add'>+ENDPROC(ret_to_user)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * This is how we return from a fork.</div><div class='hunk'>@@ -92,7 +93,7 @@ ENTRY(ret_from_fork)</div><div class='ctx'> 	mov	r0, #1				@ trace exit [IP = 1]</div><div class='ctx'> 	bl	syscall_trace</div><div class='ctx'> 	b	ret_slow_syscall</div><div class='del'>-	</div><div class='add'>+ENDPROC(ret_from_fork)</div><div class='ctx'> </div><div class='ctx'> 	.equ NR_syscalls,0</div><div class='ctx'> #define CALL(x) .equ NR_syscalls,NR_syscalls+1</div><div class='hunk'>@@ -269,6 +270,7 @@ ENTRY(vector_swi)</div><div class='ctx'> 	eor	r0, scno, #__NR_SYSCALL_BASE	@ put OS number back</div><div class='ctx'> 	bcs	arm_syscall	</div><div class='ctx'> 	b	sys_ni_syscall			@ not private func</div><div class='add'>+ENDPROC(vector_swi)</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * This is the really slow path.  We're going to be doing</div><div class='hunk'>@@ -326,7 +328,6 @@ ENTRY(sys_call_table)</div><div class='ctx'>  */</div><div class='ctx'> @ r0 = syscall number</div><div class='ctx'> @ r8 = syscall table</div><div class='del'>-		.type	sys_syscall, #function</div><div class='ctx'> sys_syscall:</div><div class='ctx'> 		bic	scno, r0, #__NR_OABI_SYSCALL_BASE</div><div class='ctx'> 		cmp	scno, #__NR_syscall - __NR_SYSCALL_BASE</div><div class='hunk'>@@ -338,53 +339,65 @@ sys_syscall:</div><div class='ctx'> 		movlo	r3, r4</div><div class='ctx'> 		ldrlo	pc, [tbl, scno, lsl #2]</div><div class='ctx'> 		b	sys_ni_syscall</div><div class='add'>+ENDPROC(sys_syscall)</div><div class='ctx'> </div><div class='ctx'> sys_fork_wrapper:</div><div class='ctx'> 		add	r0, sp, #S_OFF</div><div class='ctx'> 		b	sys_fork</div><div class='add'>+ENDPROC(sys_fork_wrapper)</div><div class='ctx'> </div><div class='ctx'> sys_vfork_wrapper:</div><div class='ctx'> 		add	r0, sp, #S_OFF</div><div class='ctx'> 		b	sys_vfork</div><div class='add'>+ENDPROC(sys_vfork_wrapper)</div><div class='ctx'> </div><div class='ctx'> sys_execve_wrapper:</div><div class='ctx'> 		add	r3, sp, #S_OFF</div><div class='ctx'> 		b	sys_execve</div><div class='add'>+ENDPROC(sys_execve_wrapper)</div><div class='ctx'> </div><div class='ctx'> sys_clone_wrapper:</div><div class='ctx'> 		add	ip, sp, #S_OFF</div><div class='ctx'> 		str	ip, [sp, #4]</div><div class='ctx'> 		b	sys_clone</div><div class='add'>+ENDPROC(sys_clone_wrapper)</div><div class='ctx'> </div><div class='ctx'> sys_sigsuspend_wrapper:</div><div class='ctx'> 		add	r3, sp, #S_OFF</div><div class='ctx'> 		b	sys_sigsuspend</div><div class='add'>+ENDPROC(sys_sigsuspend_wrapper)</div><div class='ctx'> </div><div class='ctx'> sys_rt_sigsuspend_wrapper:</div><div class='ctx'> 		add	r2, sp, #S_OFF</div><div class='ctx'> 		b	sys_rt_sigsuspend</div><div class='add'>+ENDPROC(sys_rt_sigsuspend_wrapper)</div><div class='ctx'> </div><div class='ctx'> sys_sigreturn_wrapper:</div><div class='ctx'> 		add	r0, sp, #S_OFF</div><div class='ctx'> 		b	sys_sigreturn</div><div class='add'>+ENDPROC(sys_sigreturn_wrapper)</div><div class='ctx'> </div><div class='ctx'> sys_rt_sigreturn_wrapper:</div><div class='ctx'> 		add	r0, sp, #S_OFF</div><div class='ctx'> 		b	sys_rt_sigreturn</div><div class='add'>+ENDPROC(sys_rt_sigreturn_wrapper)</div><div class='ctx'> </div><div class='ctx'> sys_sigaltstack_wrapper:</div><div class='ctx'> 		ldr	r2, [sp, #S_OFF + S_SP]</div><div class='ctx'> 		b	do_sigaltstack</div><div class='add'>+ENDPROC(sys_sigaltstack_wrapper)</div><div class='ctx'> </div><div class='ctx'> sys_statfs64_wrapper:</div><div class='ctx'> 		teq	r1, #88</div><div class='ctx'> 		moveq	r1, #84</div><div class='ctx'> 		b	sys_statfs64</div><div class='add'>+ENDPROC(sys_statfs64_wrapper)</div><div class='ctx'> </div><div class='ctx'> sys_fstatfs64_wrapper:</div><div class='ctx'> 		teq	r1, #88</div><div class='ctx'> 		moveq	r1, #84</div><div class='ctx'> 		b	sys_fstatfs64</div><div class='add'>+ENDPROC(sys_fstatfs64_wrapper)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Note: off_4k (r5) is always units of 4K.  If we can't do the requested</div><div class='hunk'>@@ -402,11 +415,14 @@ sys_mmap2:</div><div class='ctx'> 		str	r5, [sp, #4]</div><div class='ctx'> 		b	do_mmap2</div><div class='ctx'> #endif</div><div class='add'>+ENDPROC(sys_mmap2)</div><div class='ctx'> </div><div class='ctx'> ENTRY(pabort_ifar)</div><div class='ctx'> 		mrc	p15, 0, r0, cr6, cr0, 2</div><div class='ctx'> ENTRY(pabort_noifar)</div><div class='ctx'> 		mov	pc, lr</div><div class='add'>+ENDPROC(pabort_ifar)</div><div class='add'>+ENDPROC(pabort_noifar)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_OABI_COMPAT</div><div class='ctx'> </div><div class='hunk'>@@ -417,26 +433,31 @@ ENTRY(pabort_noifar)</div><div class='ctx'> sys_oabi_pread64:</div><div class='ctx'> 		stmia	sp, {r3, r4}</div><div class='ctx'> 		b	sys_pread64</div><div class='add'>+ENDPROC(sys_oabi_pread64)</div><div class='ctx'> </div><div class='ctx'> sys_oabi_pwrite64:</div><div class='ctx'> 		stmia	sp, {r3, r4}</div><div class='ctx'> 		b	sys_pwrite64</div><div class='add'>+ENDPROC(sys_oabi_pwrite64)</div><div class='ctx'> </div><div class='ctx'> sys_oabi_truncate64:</div><div class='ctx'> 		mov	r3, r2</div><div class='ctx'> 		mov	r2, r1</div><div class='ctx'> 		b	sys_truncate64</div><div class='add'>+ENDPROC(sys_oabi_truncate64)</div><div class='ctx'> </div><div class='ctx'> sys_oabi_ftruncate64:</div><div class='ctx'> 		mov	r3, r2</div><div class='ctx'> 		mov	r2, r1</div><div class='ctx'> 		b	sys_ftruncate64</div><div class='add'>+ENDPROC(sys_oabi_ftruncate64)</div><div class='ctx'> </div><div class='ctx'> sys_oabi_readahead:</div><div class='ctx'> 		str	r3, [sp]</div><div class='ctx'> 		mov	r3, r2</div><div class='ctx'> 		mov	r2, r1</div><div class='ctx'> 		b	sys_readahead</div><div class='add'>+ENDPROC(sys_oabi_readahead)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Let's declare a second syscall table for old ABI binaries</div><div class='head'>diff --git a/arch/arm/kernel/fiq.c b/arch/arm/kernel/fiq.c<br/>index e8e90346f11c..36f81d967979 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/kernel/fiq.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/kernel/fiq.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/kernel/fiq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/kernel/fiq.c</a></div><div class='hunk'>@@ -45,7 +45,6 @@</div><div class='ctx'> #include &lt;asm/fiq.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> static unsigned long no_fiq_insn;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/kernel/head-common.S b/arch/arm/kernel/head-common.S<br/>index 1c3c6ea5f9e7..bde52df1c668 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/kernel/head-common.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/kernel/head-common.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/kernel/head-common.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/kernel/head-common.S</a></div><div class='hunk'>@@ -36,7 +36,6 @@ __switch_data:</div><div class='ctx'>  *  r2  = atags pointer</div><div class='ctx'>  *  r9  = processor ID</div><div class='ctx'>  */</div><div class='del'>-	.type	__mmap_switched, %function</div><div class='ctx'> __mmap_switched:</div><div class='ctx'> 	adr	r3, __switch_data + 4</div><div class='ctx'> </div><div class='hunk'>@@ -59,6 +58,7 @@ __mmap_switched:</div><div class='ctx'> 	bic	r4, r0, #CR_A			@ Clear 'A' bit</div><div class='ctx'> 	stmia	r7, {r0, r4}			@ Save control register values</div><div class='ctx'> 	b	start_kernel</div><div class='add'>+ENDPROC(__mmap_switched)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Exception handling.  Something went wrong and we can't proceed.  We</div><div class='hunk'>@@ -69,8 +69,6 @@ __mmap_switched:</div><div class='ctx'>  * and hope for the best (useful if bootloader fails to pass a proper</div><div class='ctx'>  * machine ID for example).</div><div class='ctx'>  */</div><div class='del'>-</div><div class='del'>-	.type	__error_p, %function</div><div class='ctx'> __error_p:</div><div class='ctx'> #ifdef CONFIG_DEBUG_LL</div><div class='ctx'> 	adr	r0, str_p1</div><div class='hunk'>@@ -84,8 +82,8 @@ str_p1:	.asciz	"\nError: unrecognized/unsupported processor variant (0x"</div><div class='ctx'> str_p2:	.asciz	").\n"</div><div class='ctx'> 	.align</div><div class='ctx'> #endif</div><div class='add'>+ENDPROC(__error_p)</div><div class='ctx'> </div><div class='del'>-	.type	__error_a, %function</div><div class='ctx'> __error_a:</div><div class='ctx'> #ifdef CONFIG_DEBUG_LL</div><div class='ctx'> 	mov	r4, r1				@ preserve machine ID</div><div class='hunk'>@@ -115,13 +113,14 @@ __error_a:</div><div class='ctx'> 	adr	r0, str_a3</div><div class='ctx'> 	bl	printascii</div><div class='ctx'> 	b	__error</div><div class='add'>+ENDPROC(__error_a)</div><div class='add'>+</div><div class='ctx'> str_a1:	.asciz	"\nError: unrecognized/unsupported machine ID (r1 = 0x"</div><div class='ctx'> str_a2:	.asciz	").\n\nAvailable machine support:\n\nID (hex)\tNAME\n"</div><div class='ctx'> str_a3:	.asciz	"\nPlease check your kernel config and/or bootloader.\n"</div><div class='ctx'> 	.align</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	.type	__error, %function</div><div class='ctx'> __error:</div><div class='ctx'> #ifdef CONFIG_ARCH_RPC</div><div class='ctx'> /*</div><div class='hunk'>@@ -138,6 +137,7 @@ __error:</div><div class='ctx'> #endif</div><div class='ctx'> 1:	mov	r0, r0</div><div class='ctx'> 	b	1b</div><div class='add'>+ENDPROC(__error)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -153,7 +153,6 @@ __error:</div><div class='ctx'>  *	r5 = proc_info pointer in physical address space</div><div class='ctx'>  *	r9 = cpuid (preserved)</div><div class='ctx'>  */</div><div class='del'>-	.type	__lookup_processor_type, %function</div><div class='ctx'> __lookup_processor_type:</div><div class='ctx'> 	adr	r3, 3f</div><div class='ctx'> 	ldmda	r3, {r5 - r7}</div><div class='hunk'>@@ -169,6 +168,7 @@ __lookup_processor_type:</div><div class='ctx'> 	blo	1b</div><div class='ctx'> 	mov	r5, #0				@ unknown processor</div><div class='ctx'> 2:	mov	pc, lr</div><div class='add'>+ENDPROC(__lookup_processor_type)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * This provides a C-API version of the above function.</div><div class='hunk'>@@ -179,6 +179,7 @@ ENTRY(lookup_processor_type)</div><div class='ctx'> 	bl	__lookup_processor_type</div><div class='ctx'> 	mov	r0, r5</div><div class='ctx'> 	ldmfd	sp!, {r4 - r7, r9, pc}</div><div class='add'>+ENDPROC(lookup_processor_type)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Look in &lt;asm/procinfo.h&gt; and arch/arm/kernel/arch.[ch] for</div><div class='hunk'>@@ -201,7 +202,6 @@ ENTRY(lookup_processor_type)</div><div class='ctx'>  *  r3, r4, r6 corrupted</div><div class='ctx'>  *  r5 = mach_info pointer in physical address space</div><div class='ctx'>  */</div><div class='del'>-	.type	__lookup_machine_type, %function</div><div class='ctx'> __lookup_machine_type:</div><div class='ctx'> 	adr	r3, 3b</div><div class='ctx'> 	ldmia	r3, {r4, r5, r6}</div><div class='hunk'>@@ -216,6 +216,7 @@ __lookup_machine_type:</div><div class='ctx'> 	blo	1b</div><div class='ctx'> 	mov	r5, #0				@ unknown machine</div><div class='ctx'> 2:	mov	pc, lr</div><div class='add'>+ENDPROC(__lookup_machine_type)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * This provides a C-API version of the above function.</div><div class='hunk'>@@ -226,6 +227,7 @@ ENTRY(lookup_machine_type)</div><div class='ctx'> 	bl	__lookup_machine_type</div><div class='ctx'> 	mov	r0, r5</div><div class='ctx'> 	ldmfd	sp!, {r4 - r6, pc}</div><div class='add'>+ENDPROC(lookup_machine_type)</div><div class='ctx'> </div><div class='ctx'> /* Determine validity of the r2 atags pointer.  The heuristic requires</div><div class='ctx'>  * that the pointer be aligned, in the first 16k of physical RAM and</div><div class='hunk'>@@ -239,8 +241,6 @@ ENTRY(lookup_machine_type)</div><div class='ctx'>  *  r2 either valid atags pointer, or zero</div><div class='ctx'>  *  r5, r6 corrupted</div><div class='ctx'>  */</div><div class='del'>-</div><div class='del'>-	.type	__vet_atags, %function</div><div class='ctx'> __vet_atags:</div><div class='ctx'> 	tst	r2, #0x3			@ aligned?</div><div class='ctx'> 	bne	1f</div><div class='hunk'>@@ -257,3 +257,4 @@ __vet_atags:</div><div class='ctx'> </div><div class='ctx'> 1:	mov	r2, #0</div><div class='ctx'> 	mov	pc, lr</div><div class='add'>+ENDPROC(__vet_atags)</div><div class='head'>diff --git a/arch/arm/kernel/head-nommu.S b/arch/arm/kernel/head-nommu.S<br/>index 27329bd32037..cc87e1765ed2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/kernel/head-nommu.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/kernel/head-nommu.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/kernel/head-nommu.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/kernel/head-nommu.S</a></div><div class='hunk'>@@ -33,7 +33,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> 	.section ".text.head", "ax"</div><div class='del'>-	.type	stext, %function</div><div class='ctx'> ENTRY(stext)</div><div class='ctx'> 	msr	cpsr_c, #PSR_F_BIT | PSR_I_BIT | SVC_MODE @ ensure svc mode</div><div class='ctx'> 						@ and irqs disabled</div><div class='hunk'>@@ -53,11 +52,11 @@ ENTRY(stext)</div><div class='ctx'> 						@ the initialization is done</div><div class='ctx'> 	adr	lr, __after_proc_init		@ return (PIC) address</div><div class='ctx'> 	add	pc, r10, #PROCINFO_INITFUNC</div><div class='add'>+ENDPROC(stext)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Set the Control Register and Read the process ID.</div><div class='ctx'>  */</div><div class='del'>-	.type	__after_proc_init, %function</div><div class='ctx'> __after_proc_init:</div><div class='ctx'> #ifdef CONFIG_CPU_CP15</div><div class='ctx'> 	mrc	p15, 0, r0, c1, c0, 0		@ read control reg</div><div class='hunk'>@@ -85,6 +84,7 @@ __after_proc_init:</div><div class='ctx'> </div><div class='ctx'> 	mov	pc, r13				@ clear the BSS and jump</div><div class='ctx'> 						@ to start_kernel</div><div class='add'>+ENDPROC(__after_proc_init)</div><div class='ctx'> 	.ltorg</div><div class='ctx'> </div><div class='ctx'> #include "head-common.S"</div><div class='head'>diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S<br/>index bff4c6e90dd5..21e17dc94cb5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/kernel/head.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/kernel/head.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/kernel/head.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/kernel/head.S</a></div><div class='hunk'>@@ -75,7 +75,6 @@</div><div class='ctx'>  * circumstances, zImage) is for.</div><div class='ctx'>  */</div><div class='ctx'> 	.section ".text.head", "ax"</div><div class='del'>-	.type	stext, %function</div><div class='ctx'> ENTRY(stext)</div><div class='ctx'> 	msr	cpsr_c, #PSR_F_BIT | PSR_I_BIT | SVC_MODE @ ensure svc mode</div><div class='ctx'> 						@ and irqs disabled</div><div class='hunk'>@@ -100,9 +99,9 @@ ENTRY(stext)</div><div class='ctx'> 						@ mmu has been enabled</div><div class='ctx'> 	adr	lr, __enable_mmu		@ return (PIC) address</div><div class='ctx'> 	add	pc, r10, #PROCINFO_INITFUNC</div><div class='add'>+ENDPROC(stext)</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_SMP)</div><div class='del'>-	.type   secondary_startup, #function</div><div class='ctx'> ENTRY(secondary_startup)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Common entry point for secondary CPUs.</div><div class='hunk'>@@ -128,6 +127,7 @@ ENTRY(secondary_startup)</div><div class='ctx'> 	adr	lr, __enable_mmu		@ return address</div><div class='ctx'> 	add	pc, r10, #PROCINFO_INITFUNC	@ initialise processor</div><div class='ctx'> 						@ (return control reg)</div><div class='add'>+ENDPROC(secondary_startup)</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * r6  = &amp;secondary_data</div><div class='hunk'>@@ -136,6 +136,7 @@ ENTRY(__secondary_switched)</div><div class='ctx'> 	ldr	sp, [r7, #4]			@ get secondary_data.stack</div><div class='ctx'> 	mov	fp, #0</div><div class='ctx'> 	b	secondary_start_kernel</div><div class='add'>+ENDPROC(__secondary_switched)</div><div class='ctx'> </div><div class='ctx'> 	.type	__secondary_data, %object</div><div class='ctx'> __secondary_data:</div><div class='hunk'>@@ -151,7 +152,6 @@ __secondary_data:</div><div class='ctx'>  * this is just loading the page table pointer and domain access</div><div class='ctx'>  * registers.</div><div class='ctx'>  */</div><div class='del'>-	.type	__enable_mmu, %function</div><div class='ctx'> __enable_mmu:</div><div class='ctx'> #ifdef CONFIG_ALIGNMENT_TRAP</div><div class='ctx'> 	orr	r0, r0, #CR_A</div><div class='hunk'>@@ -174,6 +174,7 @@ __enable_mmu:</div><div class='ctx'> 	mcr	p15, 0, r5, c3, c0, 0		@ load domain access register</div><div class='ctx'> 	mcr	p15, 0, r4, c2, c0, 0		@ load page table pointer</div><div class='ctx'> 	b	__turn_mmu_on</div><div class='add'>+ENDPROC(__enable_mmu)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Enable the MMU.  This completely changes the structure of the visible</div><div class='hunk'>@@ -187,7 +188,6 @@ __enable_mmu:</div><div class='ctx'>  * other registers depend on the function called upon completion</div><div class='ctx'>  */</div><div class='ctx'> 	.align	5</div><div class='del'>-	.type	__turn_mmu_on, %function</div><div class='ctx'> __turn_mmu_on:</div><div class='ctx'> 	mov	r0, r0</div><div class='ctx'> 	mcr	p15, 0, r0, c1, c0, 0		@ write control reg</div><div class='hunk'>@@ -195,7 +195,7 @@ __turn_mmu_on:</div><div class='ctx'> 	mov	r3, r3</div><div class='ctx'> 	mov	r3, r3</div><div class='ctx'> 	mov	pc, r13</div><div class='del'>-</div><div class='add'>+ENDPROC(__turn_mmu_on)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -211,7 +211,6 @@ __turn_mmu_on:</div><div class='ctx'>  *  r0, r3, r6, r7 corrupted</div><div class='ctx'>  *  r4 = physical page table address</div><div class='ctx'>  */</div><div class='del'>-	.type	__create_page_tables, %function</div><div class='ctx'> __create_page_tables:</div><div class='ctx'> 	pgtbl	r4				@ page table address</div><div class='ctx'> </div><div class='hunk'>@@ -325,6 +324,7 @@ __create_page_tables:</div><div class='ctx'> #endif</div><div class='ctx'> #endif</div><div class='ctx'> 	mov	pc, lr</div><div class='add'>+ENDPROC(__create_page_tables)</div><div class='ctx'> 	.ltorg</div><div class='ctx'> </div><div class='ctx'> #include "head-common.S"</div><div class='head'>diff --git a/arch/arm/kernel/init_task.c b/arch/arm/kernel/init_task.c<br/>index 8b8c9d38a761..0bbf80625395 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/kernel/init_task.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/kernel/init_task.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/kernel/init_task.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/kernel/init_task.c</a></div><div class='hunk'>@@ -8,8 +8,8 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/init_task.h&gt;</div><div class='ctx'> #include &lt;linux/mqueue.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct fs_struct init_fs = INIT_FS;</div><div class='head'>diff --git a/arch/arm/kernel/io.c b/arch/arm/kernel/io.c<br/>index 1f6822dfae74..f4470307edb8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/kernel/io.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/kernel/io.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/kernel/io.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/kernel/io.c</a></div><div class='hunk'>@@ -1,7 +1,6 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Copy data from IO memory space to "real" memory space.</div><div class='head'>diff --git a/arch/arm/kernel/irq.c b/arch/arm/kernel/irq.c<br/>index f88efb135b70..2f3eb795fa6e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/kernel/irq.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/kernel/irq.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/kernel/irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/kernel/irq.c</a></div><div class='hunk'>@@ -112,18 +112,17 @@ static struct irq_desc bad_irq_desc = {</div><div class='ctx'> asmlinkage void __exception asm_do_IRQ(unsigned int irq, struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	struct pt_regs *old_regs = set_irq_regs(regs);</div><div class='del'>-	struct irq_desc *desc = irq_desc + irq;</div><div class='add'>+</div><div class='add'>+	irq_enter();</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Some hardware gives randomly wrong interrupts.  Rather</div><div class='ctx'> 	 * than crashing, do something sensible.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (irq &gt;= NR_IRQS)</div><div class='del'>-		desc = &amp;bad_irq_desc;</div><div class='del'>-</div><div class='del'>-	irq_enter();</div><div class='del'>-</div><div class='del'>-	desc_handle_irq(irq, desc);</div><div class='add'>+		handle_bad_irq(irq, &amp;bad_irq_desc);</div><div class='add'>+	else</div><div class='add'>+		generic_handle_irq(irq);</div><div class='ctx'> </div><div class='ctx'> 	/* AT91 specific workaround */</div><div class='ctx'> 	irq_finish(irq);</div><div class='head'>diff --git a/arch/arm/kernel/kprobes-decode.c b/arch/arm/kernel/kprobes-decode.c<br/>index b4565bb133c1..da1f94906a4e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/kernel/kprobes-decode.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/kernel/kprobes-decode.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/kernel/kprobes-decode.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/kernel/kprobes-decode.c</a></div><div class='hunk'>@@ -488,7 +488,7 @@ static void __kprobes simulate_ldm1stm1(struct kprobe *p, struct pt_regs *regs)</div><div class='ctx'> </div><div class='ctx'> 	if (!ubit)</div><div class='ctx'> 		addr -= reg_count;</div><div class='del'>-	addr += (!pbit ^ !ubit);</div><div class='add'>+	addr += (!pbit == !ubit);</div><div class='ctx'> </div><div class='ctx'> 	reg_bit_vector = insn &amp; 0xffff;</div><div class='ctx'> 	while (reg_bit_vector) {</div><div class='hunk'>@@ -503,7 +503,7 @@ static void __kprobes simulate_ldm1stm1(struct kprobe *p, struct pt_regs *regs)</div><div class='ctx'> 	if (wbit) {</div><div class='ctx'> 		if (!ubit)</div><div class='ctx'> 			addr -= reg_count;</div><div class='del'>-		addr -= (!pbit ^ !ubit);</div><div class='add'>+		addr -= (!pbit == !ubit);</div><div class='ctx'> 		regs-&gt;uregs[rn] = (long)addr;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/kernel/kprobes.c b/arch/arm/kernel/kprobes.c<br/>index d28513f14d05..3f9abe0e9aff 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/kernel/kprobes.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/kernel/kprobes.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/kernel/kprobes.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/kernel/kprobes.c</a></div><div class='hunk'>@@ -200,9 +200,12 @@ void __kprobes kprobe_handler(struct pt_regs *regs)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int kprobe_trap_handler(struct pt_regs *regs, unsigned int instr)</div><div class='add'>+static int __kprobes kprobe_trap_handler(struct pt_regs *regs, unsigned int instr)</div><div class='ctx'> {</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	local_irq_save(flags);</div><div class='ctx'> 	kprobe_handler(regs);</div><div class='add'>+	local_irq_restore(flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/kernel/machine_kexec.c b/arch/arm/kernel/machine_kexec.c<br/>index fae5beb3c3d6..440dc62cdc3a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/kernel/machine_kexec.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/kernel/machine_kexec.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/kernel/machine_kexec.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/kernel/machine_kexec.c</a></div><div class='hunk'>@@ -6,10 +6,10 @@</div><div class='ctx'> #include &lt;linux/kexec.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/reboot.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/pgalloc.h&gt;</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/kernel/module.c b/arch/arm/kernel/module.c<br/>index a68259a0cccd..9203ba7d58ee 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/kernel/module.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/kernel/module.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/kernel/module.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/kernel/module.c</a></div><div class='hunk'>@@ -47,7 +47,7 @@ void *module_alloc(unsigned long size)</div><div class='ctx'> 	if (!area)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	return __vmalloc_area(area, GFP_KERNEL, PAGE_KERNEL);</div><div class='add'>+	return __vmalloc_area(area, GFP_KERNEL, PAGE_KERNEL_EXEC);</div><div class='ctx'> }</div><div class='ctx'> #else /* CONFIG_MMU */</div><div class='ctx'> void *module_alloc(unsigned long size)</div><div class='head'>diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c<br/>index 3fd882337064..d3ea6fa89521 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/kernel/process.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/kernel/process.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/kernel/process.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/kernel/process.c</a></div><div class='hunk'>@@ -28,12 +28,12 @@</div><div class='ctx'> #include &lt;linux/pm.h&gt;</div><div class='ctx'> #include &lt;linux/tick.h&gt;</div><div class='ctx'> #include &lt;linux/utsname.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/leds.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/thread_notify.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='ctx'> </div><div class='ctx'> static const char *processor_modes[] = {</div><div class='hunk'>@@ -267,35 +267,6 @@ void show_regs(struct pt_regs * regs)</div><div class='ctx'> 	__backtrace();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void show_fpregs(struct user_fp *regs)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 8; i++) {</div><div class='del'>-		unsigned long *p;</div><div class='del'>-		char type;</div><div class='del'>-</div><div class='del'>-		p = (unsigned long *)(regs-&gt;fpregs + i);</div><div class='del'>-</div><div class='del'>-		switch (regs-&gt;ftype[i]) {</div><div class='del'>-			case 1: type = 'f'; break;</div><div class='del'>-			case 2: type = 'd'; break;</div><div class='del'>-			case 3: type = 'e'; break;</div><div class='del'>-			default: type = '?'; break;</div><div class='del'>-		}</div><div class='del'>-		if (regs-&gt;init_flag)</div><div class='del'>-			type = '?';</div><div class='del'>-</div><div class='del'>-		printk("  f%d(%c): %08lx %08lx %08lx%c",</div><div class='del'>-			i, type, p[0], p[1], p[2], i &amp; 1 ? '\n' : ' ');</div><div class='del'>-	}</div><div class='del'>-			</div><div class='del'>-</div><div class='del'>-	printk("FPSR: %08lx FPCR: %08lx\n",</div><div class='del'>-		(unsigned long)regs-&gt;fpsr,</div><div class='del'>-		(unsigned long)regs-&gt;fpcr);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Free current thread data structures etc..</div><div class='ctx'>  */</div><div class='hunk'>@@ -414,7 +385,7 @@ unsigned long get_wchan(struct task_struct *p)</div><div class='ctx'> 	do {</div><div class='ctx'> 		if (fp &lt; stack_start || fp &gt; stack_end)</div><div class='ctx'> 			return 0;</div><div class='del'>-		lr = pc_pointer (((unsigned long *)fp)[-1]);</div><div class='add'>+		lr = ((unsigned long *)fp)[-1];</div><div class='ctx'> 		if (!in_sched_functions(lr))</div><div class='ctx'> 			return lr;</div><div class='ctx'> 		fp = *(unsigned long *) (fp - 12);</div><div class='head'>diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c<br/>index 4b05dc5c1023..df653ea59250 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/kernel/ptrace.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/kernel/ptrace.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/kernel/ptrace.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/kernel/ptrace.c</a></div><div class='hunk'>@@ -18,8 +18,8 @@</div><div class='ctx'> #include &lt;linux/security.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/traps.h&gt;</div><div class='hunk'>@@ -126,7 +126,7 @@ ptrace_getrn(struct task_struct *child, unsigned long insn)</div><div class='ctx'> </div><div class='ctx'> 	val = get_user_reg(child, reg);</div><div class='ctx'> 	if (reg == 15)</div><div class='del'>-		val = pc_pointer(val + 8);</div><div class='add'>+		val += 8;</div><div class='ctx'> </div><div class='ctx'> 	return val;</div><div class='ctx'> }</div><div class='hunk'>@@ -278,8 +278,7 @@ get_branch_address(struct task_struct *child, unsigned long pc, unsigned long in</div><div class='ctx'> 				else</div><div class='ctx'> 					base -= aluop2;</div><div class='ctx'> 			}</div><div class='del'>-			if (read_u32(child, base, &amp;alt) == 0)</div><div class='del'>-				alt = pc_pointer(alt);</div><div class='add'>+			read_u32(child, base, &amp;alt);</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='hunk'>@@ -305,8 +304,7 @@ get_branch_address(struct task_struct *child, unsigned long pc, unsigned long in</div><div class='ctx'> </div><div class='ctx'> 			base = ptrace_getrn(child, insn);</div><div class='ctx'> </div><div class='del'>-			if (read_u32(child, base + nr_regs, &amp;alt) == 0)</div><div class='del'>-				alt = pc_pointer(alt);</div><div class='add'>+			read_u32(child, base + nr_regs, &amp;alt);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='head'>diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c<br/>index 2ca7038b67a7..1f1eecca7f55 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/kernel/setup.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/kernel/setup.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/kernel/setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/kernel/setup.c</a></div><div class='hunk'>@@ -26,11 +26,13 @@</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/cpu.h&gt;</div><div class='add'>+#include &lt;asm/cputype.h&gt;</div><div class='ctx'> #include &lt;asm/elf.h&gt;</div><div class='ctx'> #include &lt;asm/procinfo.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='add'>+#include &lt;asm/cachetype.h&gt;</div><div class='ctx'> #include &lt;asm/tlbflush.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='hunk'>@@ -59,13 +61,14 @@ __setup("fpe=", fpe_setup);</div><div class='ctx'> </div><div class='ctx'> extern void paging_init(struct meminfo *, struct machine_desc *desc);</div><div class='ctx'> extern void reboot_setup(char *str);</div><div class='del'>-extern int root_mountflags;</div><div class='del'>-extern void _stext, _text, _etext, __data_start, _edata, _end;</div><div class='add'>+extern void _text, _etext, __data_start, _edata, _end;</div><div class='ctx'> </div><div class='ctx'> unsigned int processor_id;</div><div class='ctx'> EXPORT_SYMBOL(processor_id);</div><div class='ctx'> unsigned int __machine_arch_type;</div><div class='ctx'> EXPORT_SYMBOL(__machine_arch_type);</div><div class='add'>+unsigned int cacheid;</div><div class='add'>+EXPORT_SYMBOL(cacheid);</div><div class='ctx'> </div><div class='ctx'> unsigned int __atags_pointer __initdata;</div><div class='ctx'> </div><div class='hunk'>@@ -81,8 +84,6 @@ EXPORT_SYMBOL(system_serial_high);</div><div class='ctx'> unsigned int elf_hwcap;</div><div class='ctx'> EXPORT_SYMBOL(elf_hwcap);</div><div class='ctx'> </div><div class='del'>-unsigned long __initdata vmalloc_reserve = 128 &lt;&lt; 20;</div><div class='del'>-</div><div class='ctx'> </div><div class='ctx'> #ifdef MULTI_CPU</div><div class='ctx'> struct processor processor;</div><div class='hunk'>@@ -111,9 +112,6 @@ static struct stack stacks[NR_CPUS];</div><div class='ctx'> char elf_platform[ELF_PLATFORM_SIZE];</div><div class='ctx'> EXPORT_SYMBOL(elf_platform);</div><div class='ctx'> </div><div class='del'>-unsigned long phys_initrd_start __initdata = 0;</div><div class='del'>-unsigned long phys_initrd_size __initdata = 0;</div><div class='del'>-</div><div class='ctx'> static struct meminfo meminfo __initdata = { 0, };</div><div class='ctx'> static const char *cpu_name;</div><div class='ctx'> static const char *machine_name;</div><div class='hunk'>@@ -178,63 +176,6 @@ static struct resource io_res[] = {</div><div class='ctx'> #define lp1 io_res[1]</div><div class='ctx'> #define lp2 io_res[2]</div><div class='ctx'> </div><div class='del'>-static const char *cache_types[16] = {</div><div class='del'>-	"write-through",</div><div class='del'>-	"write-back",</div><div class='del'>-	"write-back",</div><div class='del'>-	"undefined 3",</div><div class='del'>-	"undefined 4",</div><div class='del'>-	"undefined 5",</div><div class='del'>-	"write-back",</div><div class='del'>-	"write-back",</div><div class='del'>-	"undefined 8",</div><div class='del'>-	"undefined 9",</div><div class='del'>-	"undefined 10",</div><div class='del'>-	"undefined 11",</div><div class='del'>-	"undefined 12",</div><div class='del'>-	"undefined 13",</div><div class='del'>-	"write-back",</div><div class='del'>-	"undefined 15",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const char *cache_clean[16] = {</div><div class='del'>-	"not required",</div><div class='del'>-	"read-block",</div><div class='del'>-	"cp15 c7 ops",</div><div class='del'>-	"undefined 3",</div><div class='del'>-	"undefined 4",</div><div class='del'>-	"undefined 5",</div><div class='del'>-	"cp15 c7 ops",</div><div class='del'>-	"cp15 c7 ops",</div><div class='del'>-	"undefined 8",</div><div class='del'>-	"undefined 9",</div><div class='del'>-	"undefined 10",</div><div class='del'>-	"undefined 11",</div><div class='del'>-	"undefined 12",</div><div class='del'>-	"undefined 13",</div><div class='del'>-	"cp15 c7 ops",</div><div class='del'>-	"undefined 15",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const char *cache_lockdown[16] = {</div><div class='del'>-	"not supported",</div><div class='del'>-	"not supported",</div><div class='del'>-	"not supported",</div><div class='del'>-	"undefined 3",</div><div class='del'>-	"undefined 4",</div><div class='del'>-	"undefined 5",</div><div class='del'>-	"format A",</div><div class='del'>-	"format B",</div><div class='del'>-	"undefined 8",</div><div class='del'>-	"undefined 9",</div><div class='del'>-	"undefined 10",</div><div class='del'>-	"undefined 11",</div><div class='del'>-	"undefined 12",</div><div class='del'>-	"undefined 13",</div><div class='del'>-	"format C",</div><div class='del'>-	"undefined 15",</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static const char *proc_arch[] = {</div><div class='ctx'> 	"undefined/unknown",</div><div class='ctx'> 	"3",</div><div class='hunk'>@@ -255,61 +196,19 @@ static const char *proc_arch[] = {</div><div class='ctx'> 	"?(17)",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define CACHE_TYPE(x)	(((x) &gt;&gt; 25) &amp; 15)</div><div class='del'>-#define CACHE_S(x)	((x) &amp; (1 &lt;&lt; 24))</div><div class='del'>-#define CACHE_DSIZE(x)	(((x) &gt;&gt; 12) &amp; 4095)	/* only if S=1 */</div><div class='del'>-#define CACHE_ISIZE(x)	((x) &amp; 4095)</div><div class='del'>-</div><div class='del'>-#define CACHE_SIZE(y)	(((y) &gt;&gt; 6) &amp; 7)</div><div class='del'>-#define CACHE_ASSOC(y)	(((y) &gt;&gt; 3) &amp; 7)</div><div class='del'>-#define CACHE_M(y)	((y) &amp; (1 &lt;&lt; 2))</div><div class='del'>-#define CACHE_LINE(y)	((y) &amp; 3)</div><div class='del'>-</div><div class='del'>-static inline void dump_cache(const char *prefix, int cpu, unsigned int cache)</div><div class='del'>-{</div><div class='del'>-	unsigned int mult = 2 + (CACHE_M(cache) ? 1 : 0);</div><div class='del'>-</div><div class='del'>-	printk("CPU%u: %s: %d bytes, associativity %d, %d byte lines, %d sets\n",</div><div class='del'>-		cpu, prefix,</div><div class='del'>-		mult &lt;&lt; (8 + CACHE_SIZE(cache)),</div><div class='del'>-		(mult &lt;&lt; CACHE_ASSOC(cache)) &gt;&gt; 1,</div><div class='del'>-		8 &lt;&lt; CACHE_LINE(cache),</div><div class='del'>-		1 &lt;&lt; (6 + CACHE_SIZE(cache) - CACHE_ASSOC(cache) -</div><div class='del'>-			CACHE_LINE(cache)));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __init dump_cpu_info(int cpu)</div><div class='del'>-{</div><div class='del'>-	unsigned int info = read_cpuid(CPUID_CACHETYPE);</div><div class='del'>-</div><div class='del'>-	if (info != processor_id) {</div><div class='del'>-		printk("CPU%u: D %s %s cache\n", cpu, cache_is_vivt() ? "VIVT" : "VIPT",</div><div class='del'>-		       cache_types[CACHE_TYPE(info)]);</div><div class='del'>-		if (CACHE_S(info)) {</div><div class='del'>-			dump_cache("I cache", cpu, CACHE_ISIZE(info));</div><div class='del'>-			dump_cache("D cache", cpu, CACHE_DSIZE(info));</div><div class='del'>-		} else {</div><div class='del'>-			dump_cache("cache", cpu, CACHE_ISIZE(info));</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (arch_is_coherent())</div><div class='del'>-		printk("Cache coherency enabled\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> int cpu_architecture(void)</div><div class='ctx'> {</div><div class='ctx'> 	int cpu_arch;</div><div class='ctx'> </div><div class='del'>-	if ((processor_id &amp; 0x0008f000) == 0) {</div><div class='add'>+	if ((read_cpuid_id() &amp; 0x0008f000) == 0) {</div><div class='ctx'> 		cpu_arch = CPU_ARCH_UNKNOWN;</div><div class='del'>-	} else if ((processor_id &amp; 0x0008f000) == 0x00007000) {</div><div class='del'>-		cpu_arch = (processor_id &amp; (1 &lt;&lt; 23)) ? CPU_ARCH_ARMv4T : CPU_ARCH_ARMv3;</div><div class='del'>-	} else if ((processor_id &amp; 0x00080000) == 0x00000000) {</div><div class='del'>-		cpu_arch = (processor_id &gt;&gt; 16) &amp; 7;</div><div class='add'>+	} else if ((read_cpuid_id() &amp; 0x0008f000) == 0x00007000) {</div><div class='add'>+		cpu_arch = (read_cpuid_id() &amp; (1 &lt;&lt; 23)) ? CPU_ARCH_ARMv4T : CPU_ARCH_ARMv3;</div><div class='add'>+	} else if ((read_cpuid_id() &amp; 0x00080000) == 0x00000000) {</div><div class='add'>+		cpu_arch = (read_cpuid_id() &gt;&gt; 16) &amp; 7;</div><div class='ctx'> 		if (cpu_arch)</div><div class='ctx'> 			cpu_arch += CPU_ARCH_ARMv3;</div><div class='del'>-	} else if ((processor_id &amp; 0x000f0000) == 0x000f0000) {</div><div class='add'>+	} else if ((read_cpuid_id() &amp; 0x000f0000) == 0x000f0000) {</div><div class='ctx'> 		unsigned int mmfr0;</div><div class='ctx'> </div><div class='ctx'> 		/* Revised CPUID format. Read the Memory Model Feature</div><div class='hunk'>@@ -330,6 +229,34 @@ int cpu_architecture(void)</div><div class='ctx'> 	return cpu_arch;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void __init cacheid_init(void)</div><div class='add'>+{</div><div class='add'>+	unsigned int cachetype = read_cpuid_cachetype();</div><div class='add'>+	unsigned int arch = cpu_architecture();</div><div class='add'>+</div><div class='add'>+	if (arch &gt;= CPU_ARCH_ARMv7) {</div><div class='add'>+		cacheid = CACHEID_VIPT_NONALIASING;</div><div class='add'>+		if ((cachetype &amp; (3 &lt;&lt; 14)) == 1 &lt;&lt; 14)</div><div class='add'>+			cacheid |= CACHEID_ASID_TAGGED;</div><div class='add'>+	} else if (arch &gt;= CPU_ARCH_ARMv6) {</div><div class='add'>+		if (cachetype &amp; (1 &lt;&lt; 23))</div><div class='add'>+			cacheid = CACHEID_VIPT_ALIASING;</div><div class='add'>+		else</div><div class='add'>+			cacheid = CACHEID_VIPT_NONALIASING;</div><div class='add'>+	} else {</div><div class='add'>+		cacheid = CACHEID_VIVT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	printk("CPU: %s data cache, %s instruction cache\n",</div><div class='add'>+		cache_is_vivt() ? "VIVT" :</div><div class='add'>+		cache_is_vipt_aliasing() ? "VIPT aliasing" :</div><div class='add'>+		cache_is_vipt_nonaliasing() ? "VIPT nonaliasing" : "unknown",</div><div class='add'>+		cache_is_vivt() ? "VIVT" :</div><div class='add'>+		icache_is_vivt_asid_tagged() ? "VIVT ASID tagged" :</div><div class='add'>+		cache_is_vipt_aliasing() ? "VIPT aliasing" :</div><div class='add'>+		cache_is_vipt_nonaliasing() ? "VIPT nonaliasing" : "unknown");</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * These functions re-use the assembly code in head.S, which</div><div class='ctx'>  * already provide the required functionality.</div><div class='hunk'>@@ -346,10 +273,10 @@ static void __init setup_processor(void)</div><div class='ctx'> 	 * types.  The linker builds this table for us from the</div><div class='ctx'> 	 * entries in arch/arm/mm/proc-*.S</div><div class='ctx'> 	 */</div><div class='del'>-	list = lookup_processor_type(processor_id);</div><div class='add'>+	list = lookup_processor_type(read_cpuid_id());</div><div class='ctx'> 	if (!list) {</div><div class='ctx'> 		printk("CPU configuration botched (ID %08x), unable "</div><div class='del'>-		       "to continue.\n", processor_id);</div><div class='add'>+		       "to continue.\n", read_cpuid_id());</div><div class='ctx'> 		while (1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -369,7 +296,7 @@ static void __init setup_processor(void)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	printk("CPU: %s [%08x] revision %d (ARMv%s), cr=%08lx\n",</div><div class='del'>-	       cpu_name, processor_id, (int)processor_id &amp; 15,</div><div class='add'>+	       cpu_name, read_cpuid_id(), read_cpuid_id() &amp; 15,</div><div class='ctx'> 	       proc_arch[cpu_architecture()], cr_alignment);</div><div class='ctx'> </div><div class='ctx'> 	sprintf(init_utsname()-&gt;machine, "%s%c", list-&gt;arch_name, ENDIANNESS);</div><div class='hunk'>@@ -379,14 +306,14 @@ static void __init setup_processor(void)</div><div class='ctx'> 	elf_hwcap &amp;= ~HWCAP_THUMB;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+	cacheid_init();</div><div class='ctx'> 	cpu_proc_init();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * cpu_init - initialise one CPU.</div><div class='ctx'>  *</div><div class='del'>- * cpu_init dumps the cache information, initialises SMP specific</div><div class='del'>- * information, and sets up the per-CPU stacks.</div><div class='add'>+ * cpu_init sets up the per-CPU stacks.</div><div class='ctx'>  */</div><div class='ctx'> void cpu_init(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -398,9 +325,6 @@ void cpu_init(void)</div><div class='ctx'> 		BUG();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (system_state == SYSTEM_BOOTING)</div><div class='del'>-		dump_cpu_info(cpu);</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * setup stacks for re-entrant exception handlers</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -443,20 +367,6 @@ static struct machine_desc * __init setup_machine(unsigned int nr)</div><div class='ctx'> 	return list;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __init early_initrd(char **p)</div><div class='del'>-{</div><div class='del'>-	unsigned long start, size;</div><div class='del'>-</div><div class='del'>-	start = memparse(*p, p);</div><div class='del'>-	if (**p == ',') {</div><div class='del'>-		size = memparse((*p) + 1, p);</div><div class='del'>-</div><div class='del'>-		phys_initrd_start = start;</div><div class='del'>-		phys_initrd_size = size;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-__early_param("initrd=", early_initrd);</div><div class='del'>-</div><div class='ctx'> static void __init arm_add_memory(unsigned long start, unsigned long size)</div><div class='ctx'> {</div><div class='ctx'> 	struct membank *bank;</div><div class='hunk'>@@ -503,17 +413,6 @@ static void __init early_mem(char **p)</div><div class='ctx'> __early_param("mem=", early_mem);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * vmalloc=size forces the vmalloc area to be exactly 'size'</div><div class='del'>- * bytes. This can be used to increase (or decrease) the vmalloc</div><div class='del'>- * area - the default is 128m.</div><div class='del'>- */</div><div class='del'>-static void __init early_vmalloc(char **arg)</div><div class='del'>-{</div><div class='del'>-	vmalloc_reserve = memparse(*arg, arg);</div><div class='del'>-}</div><div class='del'>-__early_param("vmalloc=", early_vmalloc);</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * Initial parsing of the command line.</div><div class='ctx'>  */</div><div class='ctx'> static void __init parse_cmdline(char **cmdline_p, char *from)</div><div class='hunk'>@@ -527,12 +426,12 @@ static void __init parse_cmdline(char **cmdline_p, char *from)</div><div class='ctx'> 			struct early_params *p;</div><div class='ctx'> </div><div class='ctx'> 			for (p = &amp;__early_begin; p &lt; &amp;__early_end; p++) {</div><div class='del'>-				int len = strlen(p-&gt;arg);</div><div class='add'>+				int arglen = strlen(p-&gt;arg);</div><div class='ctx'> </div><div class='del'>-				if (memcmp(from, p-&gt;arg, len) == 0) {</div><div class='add'>+				if (memcmp(from, p-&gt;arg, arglen) == 0) {</div><div class='ctx'> 					if (to != command_line)</div><div class='ctx'> 						to -= 1;</div><div class='del'>-					from += len;</div><div class='add'>+					from += arglen;</div><div class='ctx'> 					p-&gt;fn(&amp;from);</div><div class='ctx'> </div><div class='ctx'> 					while (*from != ' ' &amp;&amp; *from != '\0')</div><div class='hunk'>@@ -579,18 +478,13 @@ request_standard_resources(struct meminfo *mi, struct machine_desc *mdesc)</div><div class='ctx'> 	kernel_data.end     = virt_to_phys(&amp;_end - 1);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; mi-&gt;nr_banks; i++) {</div><div class='del'>-		unsigned long virt_start, virt_end;</div><div class='del'>-</div><div class='ctx'> 		if (mi-&gt;bank[i].size == 0)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		virt_start = __phys_to_virt(mi-&gt;bank[i].start);</div><div class='del'>-		virt_end   = virt_start + mi-&gt;bank[i].size - 1;</div><div class='del'>-</div><div class='ctx'> 		res = alloc_bootmem_low(sizeof(*res));</div><div class='ctx'> 		res-&gt;name  = "System RAM";</div><div class='del'>-		res-&gt;start = __virt_to_phys(virt_start);</div><div class='del'>-		res-&gt;end   = __virt_to_phys(virt_end);</div><div class='add'>+		res-&gt;start = mi-&gt;bank[i].start;</div><div class='add'>+		res-&gt;end   = mi-&gt;bank[i].start + mi-&gt;bank[i].size - 1;</div><div class='ctx'> 		res-&gt;flags = IORESOURCE_MEM | IORESOURCE_BUSY;</div><div class='ctx'> </div><div class='ctx'> 		request_resource(&amp;iomem_resource, res);</div><div class='hunk'>@@ -694,26 +588,6 @@ static int __init parse_tag_ramdisk(const struct tag *tag)</div><div class='ctx'> </div><div class='ctx'> __tagtable(ATAG_RAMDISK, parse_tag_ramdisk);</div><div class='ctx'> </div><div class='del'>-static int __init parse_tag_initrd(const struct tag *tag)</div><div class='del'>-{</div><div class='del'>-	printk(KERN_WARNING "ATAG_INITRD is deprecated; "</div><div class='del'>-		"please update your bootloader.\n");</div><div class='del'>-	phys_initrd_start = __virt_to_phys(tag-&gt;u.initrd.start);</div><div class='del'>-	phys_initrd_size = tag-&gt;u.initrd.size;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-__tagtable(ATAG_INITRD, parse_tag_initrd);</div><div class='del'>-</div><div class='del'>-static int __init parse_tag_initrd2(const struct tag *tag)</div><div class='del'>-{</div><div class='del'>-	phys_initrd_start = tag-&gt;u.initrd.start;</div><div class='del'>-	phys_initrd_size = tag-&gt;u.initrd.size;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-__tagtable(ATAG_INITRD2, parse_tag_initrd2);</div><div class='del'>-</div><div class='ctx'> static int __init parse_tag_serialnr(const struct tag *tag)</div><div class='ctx'> {</div><div class='ctx'> 	system_serial_low = tag-&gt;u.serialnr.low;</div><div class='hunk'>@@ -901,28 +775,12 @@ static const char *hwcap_str[] = {</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-c_show_cache(struct seq_file *m, const char *type, unsigned int cache)</div><div class='del'>-{</div><div class='del'>-	unsigned int mult = 2 + (CACHE_M(cache) ? 1 : 0);</div><div class='del'>-</div><div class='del'>-	seq_printf(m, "%s size\t\t: %d\n"</div><div class='del'>-		      "%s assoc\t\t: %d\n"</div><div class='del'>-		      "%s line length\t: %d\n"</div><div class='del'>-		      "%s sets\t\t: %d\n",</div><div class='del'>-		type, mult &lt;&lt; (8 + CACHE_SIZE(cache)),</div><div class='del'>-		type, (mult &lt;&lt; CACHE_ASSOC(cache)) &gt;&gt; 1,</div><div class='del'>-		type, 8 &lt;&lt; CACHE_LINE(cache),</div><div class='del'>-		type, 1 &lt;&lt; (6 + CACHE_SIZE(cache) - CACHE_ASSOC(cache) -</div><div class='del'>-			    CACHE_LINE(cache)));</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int c_show(struct seq_file *m, void *v)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	seq_printf(m, "Processor\t: %s rev %d (%s)\n",</div><div class='del'>-		   cpu_name, (int)processor_id &amp; 15, elf_platform);</div><div class='add'>+		   cpu_name, read_cpuid_id() &amp; 15, elf_platform);</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_SMP)</div><div class='ctx'> 	for_each_online_cpu(i) {</div><div class='hunk'>@@ -949,47 +807,26 @@ static int c_show(struct seq_file *m, void *v)</div><div class='ctx'> 		if (elf_hwcap &amp; (1 &lt;&lt; i))</div><div class='ctx'> 			seq_printf(m, "%s ", hwcap_str[i]);</div><div class='ctx'> </div><div class='del'>-	seq_printf(m, "\nCPU implementer\t: 0x%02x\n", processor_id &gt;&gt; 24);</div><div class='add'>+	seq_printf(m, "\nCPU implementer\t: 0x%02x\n", read_cpuid_id() &gt;&gt; 24);</div><div class='ctx'> 	seq_printf(m, "CPU architecture: %s\n", proc_arch[cpu_architecture()]);</div><div class='ctx'> </div><div class='del'>-	if ((processor_id &amp; 0x0008f000) == 0x00000000) {</div><div class='add'>+	if ((read_cpuid_id() &amp; 0x0008f000) == 0x00000000) {</div><div class='ctx'> 		/* pre-ARM7 */</div><div class='del'>-		seq_printf(m, "CPU part\t: %07x\n", processor_id &gt;&gt; 4);</div><div class='add'>+		seq_printf(m, "CPU part\t: %07x\n", read_cpuid_id() &gt;&gt; 4);</div><div class='ctx'> 	} else {</div><div class='del'>-		if ((processor_id &amp; 0x0008f000) == 0x00007000) {</div><div class='add'>+		if ((read_cpuid_id() &amp; 0x0008f000) == 0x00007000) {</div><div class='ctx'> 			/* ARM7 */</div><div class='ctx'> 			seq_printf(m, "CPU variant\t: 0x%02x\n",</div><div class='del'>-				   (processor_id &gt;&gt; 16) &amp; 127);</div><div class='add'>+				   (read_cpuid_id() &gt;&gt; 16) &amp; 127);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* post-ARM7 */</div><div class='ctx'> 			seq_printf(m, "CPU variant\t: 0x%x\n",</div><div class='del'>-				   (processor_id &gt;&gt; 20) &amp; 15);</div><div class='add'>+				   (read_cpuid_id() &gt;&gt; 20) &amp; 15);</div><div class='ctx'> 		}</div><div class='ctx'> 		seq_printf(m, "CPU part\t: 0x%03x\n",</div><div class='del'>-			   (processor_id &gt;&gt; 4) &amp; 0xfff);</div><div class='del'>-	}</div><div class='del'>-	seq_printf(m, "CPU revision\t: %d\n", processor_id &amp; 15);</div><div class='del'>-</div><div class='del'>-	{</div><div class='del'>-		unsigned int cache_info = read_cpuid(CPUID_CACHETYPE);</div><div class='del'>-		if (cache_info != processor_id) {</div><div class='del'>-			seq_printf(m, "Cache type\t: %s\n"</div><div class='del'>-				      "Cache clean\t: %s\n"</div><div class='del'>-				      "Cache lockdown\t: %s\n"</div><div class='del'>-				      "Cache format\t: %s\n",</div><div class='del'>-				   cache_types[CACHE_TYPE(cache_info)],</div><div class='del'>-				   cache_clean[CACHE_TYPE(cache_info)],</div><div class='del'>-				   cache_lockdown[CACHE_TYPE(cache_info)],</div><div class='del'>-				   CACHE_S(cache_info) ? "Harvard" : "Unified");</div><div class='del'>-</div><div class='del'>-			if (CACHE_S(cache_info)) {</div><div class='del'>-				c_show_cache(m, "I", CACHE_ISIZE(cache_info));</div><div class='del'>-				c_show_cache(m, "D", CACHE_DSIZE(cache_info));</div><div class='del'>-			} else {</div><div class='del'>-				c_show_cache(m, "Cache", CACHE_ISIZE(cache_info));</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='add'>+			   (read_cpuid_id() &gt;&gt; 4) &amp; 0xfff);</div><div class='ctx'> 	}</div><div class='add'>+	seq_printf(m, "CPU revision\t: %d\n", read_cpuid_id() &amp; 15);</div><div class='ctx'> </div><div class='ctx'> 	seq_puts(m, "\n");</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c<br/>index ef2f86a5e78a..80b8b5c7e07a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/kernel/signal.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/kernel/signal.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/kernel/signal.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/kernel/signal.c</a></div><div class='hunk'>@@ -11,11 +11,11 @@</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/personality.h&gt;</div><div class='ctx'> #include &lt;linux/freezer.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/elf.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #include &lt;asm/ucontext.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/unistd.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "ptrace.h"</div><div class='head'>diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c<br/>index e9842f6767f9..e42a749a56dd 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/kernel/smp.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/kernel/smp.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/kernel/smp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/kernel/smp.c</a></div><div class='hunk'>@@ -277,6 +277,7 @@ asmlinkage void __cpuinit secondary_start_kernel(void)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Enable local interrupts.</div><div class='ctx'> 	 */</div><div class='add'>+	notify_cpu_starting(cpu);</div><div class='ctx'> 	local_irq_enable();</div><div class='ctx'> 	local_fiq_enable();</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/kernel/sys_arm.c b/arch/arm/kernel/sys_arm.c<br/>index 0128687ba0f7..b3ec641b5cf8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/kernel/sys_arm.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/kernel/sys_arm.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/kernel/sys_arm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/kernel/sys_arm.c</a></div><div class='hunk'>@@ -27,8 +27,7 @@</div><div class='ctx'> #include &lt;linux/file.h&gt;</div><div class='ctx'> #include &lt;linux/utsname.h&gt;</div><div class='ctx'> #include &lt;linux/ipc.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> extern unsigned long do_mremap(unsigned long addr, unsigned long old_len,</div><div class='ctx'> 			       unsigned long new_len, unsigned long flags,</div><div class='head'>diff --git a/arch/arm/kernel/sys_oabi-compat.c b/arch/arm/kernel/sys_oabi-compat.c<br/>index 96ab5f52949c..42623db7f870 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/kernel/sys_oabi-compat.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/kernel/sys_oabi-compat.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/kernel/sys_oabi-compat.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/kernel/sys_oabi-compat.c</a></div><div class='hunk'>@@ -82,7 +82,7 @@</div><div class='ctx'> #include &lt;linux/socket.h&gt;</div><div class='ctx'> #include &lt;linux/net.h&gt;</div><div class='ctx'> #include &lt;linux/ipc.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct oldabi_stat64 {</div><div class='ctx'> 	unsigned long long st_dev;</div><div class='head'>diff --git a/arch/arm/kernel/time.c b/arch/arm/kernel/time.c<br/>index 368d171754cf..c68b44aa88d2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/kernel/time.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/kernel/time.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/kernel/time.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/kernel/time.c</a></div><div class='hunk'>@@ -59,7 +59,7 @@ unsigned long profile_pc(struct pt_regs *regs)</div><div class='ctx'> </div><div class='ctx'> 	if (in_lock_functions(pc)) {</div><div class='ctx'> 		fp = regs-&gt;ARM_fp;</div><div class='del'>-		pc = pc_pointer(((unsigned long *)fp)[-1]);</div><div class='add'>+		pc = ((unsigned long *)fp)[-1];</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return pc;</div><div class='head'>diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c<br/>index 872f1f8fbb57..57e6874d0b80 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/kernel/traps.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/kernel/traps.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/kernel/traps.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/kernel/traps.c</a></div><div class='hunk'>@@ -19,15 +19,13 @@</div><div class='ctx'> #include &lt;linux/kallsyms.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/kprobes.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/atomic.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/unistd.h&gt;</div><div class='ctx'> #include &lt;asm/traps.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "ptrace.h"</div><div class='ctx'> #include "signal.h"</div><div class='hunk'>@@ -69,7 +67,8 @@ void dump_backtrace_entry(unsigned long where, unsigned long from, unsigned long</div><div class='ctx'>  */</div><div class='ctx'> static int verify_stack(unsigned long sp)</div><div class='ctx'> {</div><div class='del'>-	if (sp &lt; PAGE_OFFSET || (sp &gt; (unsigned long)high_memory &amp;&amp; high_memory != 0))</div><div class='add'>+	if (sp &lt; PAGE_OFFSET ||</div><div class='add'>+	    (sp &gt; (unsigned long)high_memory &amp;&amp; high_memory != NULL))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -328,17 +327,6 @@ asmlinkage void __exception do_undefinstr(struct pt_regs *regs)</div><div class='ctx'> 		get_user(instr, (u32 __user *)pc);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_KPROBES</div><div class='del'>-	/*</div><div class='del'>-	 * It is possible to have recursive kprobes, so we can't call</div><div class='del'>-	 * the kprobe trap handler with the undef_lock held.</div><div class='del'>-	 */</div><div class='del'>-	if (instr == KPROBE_BREAKPOINT_INSTRUCTION &amp;&amp; !user_mode(regs)) {</div><div class='del'>-		kprobe_trap_handler(regs, instr);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	if (call_undef_hook(regs, instr) == 0)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/kernel/xscale-cp0.c b/arch/arm/kernel/xscale-cp0.c<br/>index 180000bfdc8f..17127db906fa 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/kernel/xscale-cp0.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/kernel/xscale-cp0.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/kernel/xscale-cp0.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/kernel/xscale-cp0.c</a></div><div class='hunk'>@@ -14,8 +14,8 @@</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;asm/thread_notify.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> static inline void dsp_save_state(u32 *state)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/arm/lib/ashldi3.S b/arch/arm/lib/ashldi3.S<br/>index 55e57a1c2e6d..1154d924080b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/ashldi3.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/lib/ashldi3.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/ashldi3.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/ashldi3.S</a></div><div class='hunk'>@@ -47,3 +47,5 @@ ENTRY(__aeabi_llsl)</div><div class='ctx'> 	mov	al, al, lsl r2</div><div class='ctx'> 	mov	pc, lr</div><div class='ctx'> </div><div class='add'>+ENDPROC(__ashldi3)</div><div class='add'>+ENDPROC(__aeabi_llsl)</div><div class='head'>diff --git a/arch/arm/lib/ashrdi3.S b/arch/arm/lib/ashrdi3.S<br/>index 0b31398f89b2..9f8b35572f8c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/ashrdi3.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/lib/ashrdi3.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/ashrdi3.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/ashrdi3.S</a></div><div class='hunk'>@@ -47,3 +47,5 @@ ENTRY(__aeabi_lasr)</div><div class='ctx'> 	mov	ah, ah, asr r2</div><div class='ctx'> 	mov	pc, lr</div><div class='ctx'> </div><div class='add'>+ENDPROC(__ashrdi3)</div><div class='add'>+ENDPROC(__aeabi_lasr)</div><div class='head'>diff --git a/arch/arm/lib/backtrace.S b/arch/arm/lib/backtrace.S<br/>index 84dc890d2bf3..b0951d0e8b2c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/backtrace.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/lib/backtrace.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/backtrace.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/backtrace.S</a></div><div class='hunk'>@@ -30,6 +30,8 @@ ENTRY(c_backtrace)</div><div class='ctx'> </div><div class='ctx'> #if !defined(CONFIG_FRAME_POINTER) || !defined(CONFIG_PRINTK)</div><div class='ctx'> 		mov	pc, lr</div><div class='add'>+ENDPROC(__backtrace)</div><div class='add'>+ENDPROC(c_backtrace)</div><div class='ctx'> #else</div><div class='ctx'> 		stmfd	sp!, {r4 - r8, lr}	@ Save an extra register so we have a location...</div><div class='ctx'> 		movs	frame, r0		@ if frame pointer is zero</div><div class='hunk'>@@ -103,6 +105,8 @@ for_each_frame:	tst	frame, mask		@ Check for address exceptions</div><div class='ctx'> 		mov	r1, frame</div><div class='ctx'> 		bl	printk</div><div class='ctx'> no_frame:	ldmfd	sp!, {r4 - r8, pc}</div><div class='add'>+ENDPROC(__backtrace)</div><div class='add'>+ENDPROC(c_backtrace)</div><div class='ctx'> 		</div><div class='ctx'> 		.section __ex_table,"a"</div><div class='ctx'> 		.align	3</div><div class='head'>diff --git a/arch/arm/lib/changebit.S b/arch/arm/lib/changebit.S<br/>index 389567c24090..80f3115cbee2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/changebit.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/lib/changebit.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/changebit.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/changebit.S</a></div><div class='hunk'>@@ -19,3 +19,5 @@ ENTRY(_change_bit_be)</div><div class='ctx'> 		eor	r0, r0, #0x18		@ big endian byte ordering</div><div class='ctx'> ENTRY(_change_bit_le)</div><div class='ctx'> 	bitop	eor</div><div class='add'>+ENDPROC(_change_bit_be)</div><div class='add'>+ENDPROC(_change_bit_le)</div><div class='head'>diff --git a/arch/arm/lib/clear_user.S b/arch/arm/lib/clear_user.S<br/>index ecb28dcdaf7b..4d6bc71231f3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/clear_user.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/lib/clear_user.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/clear_user.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/clear_user.S</a></div><div class='hunk'>@@ -41,9 +41,10 @@ USER(		strplt	r2, [r0], #4)</div><div class='ctx'> USER(		strnebt	r2, [r0], #1)</div><div class='ctx'> USER(		strnebt	r2, [r0], #1)</div><div class='ctx'> 		tst	r1, #1			@ x1 x0 x1 x0 x1 x0 x1</div><div class='del'>-USER(		strnebt	r2, [r0], #1)</div><div class='add'>+USER(		strnebt	r2, [r0])</div><div class='ctx'> 		mov	r0, #0</div><div class='ctx'> 		ldmfd	sp!, {r1, pc}</div><div class='add'>+ENDPROC(__clear_user)</div><div class='ctx'> </div><div class='ctx'> 		.section .fixup,"ax"</div><div class='ctx'> 		.align	0</div><div class='head'>diff --git a/arch/arm/lib/clearbit.S b/arch/arm/lib/clearbit.S<br/>index 347516533025..1a63e43a1df0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/clearbit.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/lib/clearbit.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/clearbit.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/clearbit.S</a></div><div class='hunk'>@@ -20,3 +20,5 @@ ENTRY(_clear_bit_be)</div><div class='ctx'> 		eor	r0, r0, #0x18		@ big endian byte ordering</div><div class='ctx'> ENTRY(_clear_bit_le)</div><div class='ctx'> 	bitop	bic</div><div class='add'>+ENDPROC(_clear_bit_be)</div><div class='add'>+ENDPROC(_clear_bit_le)</div><div class='head'>diff --git a/arch/arm/lib/copy_from_user.S b/arch/arm/lib/copy_from_user.S<br/>index 6b7363ce749c..56799a165cc4 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/copy_from_user.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/lib/copy_from_user.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/copy_from_user.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/copy_from_user.S</a></div><div class='hunk'>@@ -87,6 +87,8 @@ ENTRY(__copy_from_user)</div><div class='ctx'> </div><div class='ctx'> #include "copy_template.S"</div><div class='ctx'> </div><div class='add'>+ENDPROC(__copy_from_user)</div><div class='add'>+</div><div class='ctx'> 	.section .fixup,"ax"</div><div class='ctx'> 	.align 0</div><div class='ctx'> 	copy_abort_preamble</div><div class='head'>diff --git a/arch/arm/lib/copy_page.S b/arch/arm/lib/copy_page.S<br/>index 666c99cc0744..6ae04db1ca4f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/copy_page.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/lib/copy_page.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/copy_page.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/copy_page.S</a></div><div class='hunk'>@@ -44,3 +44,4 @@ ENTRY(copy_page)</div><div class='ctx'> 	PLD(	ldmeqia r1!, {r3, r4, ip, lr}	)</div><div class='ctx'> 	PLD(	beq	2b			)</div><div class='ctx'> 		ldmfd	sp!, {r4, pc}			@	3</div><div class='add'>+ENDPROC(copy_page)</div><div class='head'>diff --git a/arch/arm/lib/copy_to_user.S b/arch/arm/lib/copy_to_user.S<br/>index 5224d94688d9..22f968bbdffd 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/copy_to_user.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/lib/copy_to_user.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/copy_to_user.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/copy_to_user.S</a></div><div class='hunk'>@@ -90,6 +90,8 @@ ENTRY(__copy_to_user)</div><div class='ctx'> </div><div class='ctx'> #include "copy_template.S"</div><div class='ctx'> </div><div class='add'>+ENDPROC(__copy_to_user)</div><div class='add'>+</div><div class='ctx'> 	.section .fixup,"ax"</div><div class='ctx'> 	.align 0</div><div class='ctx'> 	copy_abort_preamble</div><div class='head'>diff --git a/arch/arm/lib/csumipv6.S b/arch/arm/lib/csumipv6.S<br/>index 9621469beec1..3ac6ef01bc43 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/csumipv6.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/lib/csumipv6.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/csumipv6.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/csumipv6.S</a></div><div class='hunk'>@@ -29,4 +29,5 @@ ENTRY(__csum_ipv6_magic)</div><div class='ctx'> 		adcs	r0, r0, r2</div><div class='ctx'> 		adcs	r0, r0, #0</div><div class='ctx'> 		ldmfd	sp!, {pc}</div><div class='add'>+ENDPROC(__csum_ipv6_magic)</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/lib/csumpartial.S b/arch/arm/lib/csumpartial.S<br/>index a78dae5a7b28..31d3cb34740d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/csumpartial.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/lib/csumpartial.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/csumpartial.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/csumpartial.S</a></div><div class='hunk'>@@ -139,3 +139,4 @@ ENTRY(csum_partial)</div><div class='ctx'> 		tst	len, #0x1c</div><div class='ctx'> 		bne	4b</div><div class='ctx'> 		b	.Lless4</div><div class='add'>+ENDPROC(csum_partial)</div><div class='head'>diff --git a/arch/arm/lib/csumpartialcopy.S b/arch/arm/lib/csumpartialcopy.S<br/>index 21effe0dbf97..d03fc71fc88c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/csumpartialcopy.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/lib/csumpartialcopy.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/csumpartialcopy.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/csumpartialcopy.S</a></div><div class='hunk'>@@ -18,13 +18,11 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> 		.macro	save_regs</div><div class='del'>-		mov	ip, sp</div><div class='del'>-		stmfd	sp!, {r1, r4 - r8, fp, ip, lr, pc}</div><div class='del'>-		sub	fp, ip, #4</div><div class='add'>+		stmfd	sp!, {r1, r4 - r8, lr}</div><div class='ctx'> 		.endm</div><div class='ctx'> </div><div class='ctx'> 		.macro	load_regs</div><div class='del'>-		ldmfd	sp, {r1, r4 - r8, fp, sp, pc}</div><div class='add'>+		ldmfd	sp!, {r1, r4 - r8, pc}</div><div class='ctx'> 		.endm</div><div class='ctx'> </div><div class='ctx'> 		.macro	load1b, reg1</div><div class='hunk'>@@ -50,5 +48,6 @@</div><div class='ctx'> 		.endm</div><div class='ctx'> </div><div class='ctx'> #define FN_ENTRY	ENTRY(csum_partial_copy_nocheck)</div><div class='add'>+#define FN_EXIT		ENDPROC(csum_partial_copy_nocheck)</div><div class='ctx'> </div><div class='ctx'> #include "csumpartialcopygeneric.S"</div><div class='head'>diff --git a/arch/arm/lib/csumpartialcopygeneric.S b/arch/arm/lib/csumpartialcopygeneric.S<br/>index c50e8f5285d1..d620a5f22a09 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/csumpartialcopygeneric.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/lib/csumpartialcopygeneric.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/csumpartialcopygeneric.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/csumpartialcopygeneric.S</a></div><div class='hunk'>@@ -329,3 +329,4 @@ FN_ENTRY</div><div class='ctx'> 		adcs	sum, sum, r4, push #24</div><div class='ctx'> 		mov	r5, r4, get_byte_1</div><div class='ctx'> 		b	.Lexit</div><div class='add'>+FN_EXIT</div><div class='head'>diff --git a/arch/arm/lib/csumpartialcopyuser.S b/arch/arm/lib/csumpartialcopyuser.S<br/>index c3b93e22ea25..14677fb4b0c4 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/csumpartialcopyuser.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/lib/csumpartialcopyuser.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/csumpartialcopyuser.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/csumpartialcopyuser.S</a></div><div class='hunk'>@@ -18,13 +18,11 @@</div><div class='ctx'> 		.text</div><div class='ctx'> </div><div class='ctx'> 		.macro	save_regs</div><div class='del'>-		mov	ip, sp</div><div class='del'>-		stmfd	sp!, {r1 - r2, r4 - r8, fp, ip, lr, pc}</div><div class='del'>-		sub	fp, ip, #4</div><div class='add'>+		stmfd	sp!, {r1, r2, r4 - r8, lr}</div><div class='ctx'> 		.endm</div><div class='ctx'> </div><div class='ctx'> 		.macro	load_regs</div><div class='del'>-		ldmfd	sp, {r1, r2, r4-r8, fp, sp, pc}</div><div class='add'>+		ldmfd	sp!, {r1, r2, r4 - r8, pc}</div><div class='ctx'> 		.endm</div><div class='ctx'> </div><div class='ctx'> 		.macro	load1b,	reg1</div><div class='hunk'>@@ -82,6 +80,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define FN_ENTRY	ENTRY(csum_partial_copy_from_user)</div><div class='add'>+#define FN_EXIT		ENDPROC(csum_partial_copy_from_user)</div><div class='ctx'> </div><div class='ctx'> #include "csumpartialcopygeneric.S"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/lib/delay.S b/arch/arm/lib/delay.S<br/>index 930a70259220..8d6a8762ab88 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/delay.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/lib/delay.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/delay.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/delay.S</a></div><div class='hunk'>@@ -60,3 +60,6 @@ ENTRY(__delay)</div><div class='ctx'> #endif</div><div class='ctx'> 		bhi	__delay</div><div class='ctx'> 		mov	pc, lr</div><div class='add'>+ENDPROC(__udelay)</div><div class='add'>+ENDPROC(__const_udelay)</div><div class='add'>+ENDPROC(__delay)</div><div class='head'>diff --git a/arch/arm/lib/div64.S b/arch/arm/lib/div64.S<br/>index 58eef6607629..1425e789ba86 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/div64.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/lib/div64.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/div64.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/div64.S</a></div><div class='hunk'>@@ -198,3 +198,4 @@ ENTRY(__do_div64)</div><div class='ctx'> 	mov	xh, #0</div><div class='ctx'> 	ldr	pc, [sp], #8</div><div class='ctx'> </div><div class='add'>+ENDPROC(__do_div64)</div><div class='head'>diff --git a/arch/arm/lib/findbit.S b/arch/arm/lib/findbit.S<br/>index a5ca0248aa4e..8c4defc4f3c4 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/findbit.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/lib/findbit.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/findbit.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/findbit.S</a></div><div class='hunk'>@@ -33,6 +33,7 @@ ENTRY(_find_first_zero_bit_le)</div><div class='ctx'> 		blo	1b</div><div class='ctx'> 3:		mov	r0, r1			@ no free bits</div><div class='ctx'> 		mov	pc, lr</div><div class='add'>+ENDPROC(_find_first_zero_bit_le)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Purpose  : Find next 'zero' bit</div><div class='hunk'>@@ -50,6 +51,7 @@ ENTRY(_find_next_zero_bit_le)</div><div class='ctx'> 		orr	r2, r2, #7		@ if zero, then no bits here</div><div class='ctx'> 		add	r2, r2, #1		@ align bit pointer</div><div class='ctx'> 		b	2b			@ loop for next bit</div><div class='add'>+ENDPROC(_find_next_zero_bit_le)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Purpose  : Find a 'one' bit</div><div class='hunk'>@@ -67,6 +69,7 @@ ENTRY(_find_first_bit_le)</div><div class='ctx'> 		blo	1b</div><div class='ctx'> 3:		mov	r0, r1			@ no free bits</div><div class='ctx'> 		mov	pc, lr</div><div class='add'>+ENDPROC(_find_first_bit_le)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Purpose  : Find next 'one' bit</div><div class='hunk'>@@ -83,6 +86,7 @@ ENTRY(_find_next_bit_le)</div><div class='ctx'> 		orr	r2, r2, #7		@ if zero, then no bits here</div><div class='ctx'> 		add	r2, r2, #1		@ align bit pointer</div><div class='ctx'> 		b	2b			@ loop for next bit</div><div class='add'>+ENDPROC(_find_next_bit_le)</div><div class='ctx'> </div><div class='ctx'> #ifdef __ARMEB__</div><div class='ctx'> </div><div class='hunk'>@@ -99,6 +103,7 @@ ENTRY(_find_first_zero_bit_be)</div><div class='ctx'> 		blo	1b</div><div class='ctx'> 3:		mov	r0, r1			@ no free bits</div><div class='ctx'> 		mov	pc, lr</div><div class='add'>+ENDPROC(_find_first_zero_bit_be)</div><div class='ctx'> </div><div class='ctx'> ENTRY(_find_next_zero_bit_be)</div><div class='ctx'> 		teq	r1, #0</div><div class='hunk'>@@ -113,6 +118,7 @@ ENTRY(_find_next_zero_bit_be)</div><div class='ctx'> 		orr	r2, r2, #7		@ if zero, then no bits here</div><div class='ctx'> 		add	r2, r2, #1		@ align bit pointer</div><div class='ctx'> 		b	2b			@ loop for next bit</div><div class='add'>+ENDPROC(_find_next_zero_bit_be)</div><div class='ctx'> </div><div class='ctx'> ENTRY(_find_first_bit_be)</div><div class='ctx'> 		teq	r1, #0</div><div class='hunk'>@@ -127,6 +133,7 @@ ENTRY(_find_first_bit_be)</div><div class='ctx'> 		blo	1b</div><div class='ctx'> 3:		mov	r0, r1			@ no free bits</div><div class='ctx'> 		mov	pc, lr</div><div class='add'>+ENDPROC(_find_first_bit_be)</div><div class='ctx'> </div><div class='ctx'> ENTRY(_find_next_bit_be)</div><div class='ctx'> 		teq	r1, #0</div><div class='hunk'>@@ -140,6 +147,7 @@ ENTRY(_find_next_bit_be)</div><div class='ctx'> 		orr	r2, r2, #7		@ if zero, then no bits here</div><div class='ctx'> 		add	r2, r2, #1		@ align bit pointer</div><div class='ctx'> 		b	2b			@ loop for next bit</div><div class='add'>+ENDPROC(_find_next_bit_be)</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/lib/getuser.S b/arch/arm/lib/getuser.S<br/>index 2034d4dbe6ad..6763088b7607 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/getuser.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/lib/getuser.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/getuser.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/getuser.S</a></div><div class='hunk'>@@ -26,16 +26,16 @@</div><div class='ctx'>  * Note that ADDR_LIMIT is either 0 or 0xc0000000.</div><div class='ctx'>  * Note also that it is intended that __get_user_bad is not global.</div><div class='ctx'>  */</div><div class='add'>+#include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/errno.h&gt;</div><div class='ctx'> </div><div class='del'>-	.global	__get_user_1</div><div class='del'>-__get_user_1:</div><div class='add'>+ENTRY(__get_user_1)</div><div class='ctx'> 1:	ldrbt	r2, [r0]</div><div class='ctx'> 	mov	r0, #0</div><div class='ctx'> 	mov	pc, lr</div><div class='add'>+ENDPROC(__get_user_1)</div><div class='ctx'> </div><div class='del'>-	.global	__get_user_2</div><div class='del'>-__get_user_2:</div><div class='add'>+ENTRY(__get_user_2)</div><div class='ctx'> 2:	ldrbt	r2, [r0], #1</div><div class='ctx'> 3:	ldrbt	r3, [r0]</div><div class='ctx'> #ifndef __ARMEB__</div><div class='hunk'>@@ -45,17 +45,19 @@ __get_user_2:</div><div class='ctx'> #endif</div><div class='ctx'> 	mov	r0, #0</div><div class='ctx'> 	mov	pc, lr</div><div class='add'>+ENDPROC(__get_user_2)</div><div class='ctx'> </div><div class='del'>-	.global	__get_user_4</div><div class='del'>-__get_user_4:</div><div class='add'>+ENTRY(__get_user_4)</div><div class='ctx'> 4:	ldrt	r2, [r0]</div><div class='ctx'> 	mov	r0, #0</div><div class='ctx'> 	mov	pc, lr</div><div class='add'>+ENDPROC(__get_user_4)</div><div class='ctx'> </div><div class='ctx'> __get_user_bad:</div><div class='ctx'> 	mov	r2, #0</div><div class='ctx'> 	mov	r0, #-EFAULT</div><div class='ctx'> 	mov	pc, lr</div><div class='add'>+ENDPROC(__get_user_bad)</div><div class='ctx'> </div><div class='ctx'> .section __ex_table, "a"</div><div class='ctx'> 	.long	1b, __get_user_bad</div><div class='head'>diff --git a/arch/arm/lib/io-readsb.S b/arch/arm/lib/io-readsb.S<br/>index fb966ad0276f..9f4238987fe9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/io-readsb.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/lib/io-readsb.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/io-readsb.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/io-readsb.S</a></div><div class='hunk'>@@ -120,3 +120,4 @@ ENTRY(__raw_readsb)</div><div class='ctx'> 		strgtb	r3, [r1]</div><div class='ctx'> </div><div class='ctx'> 		ldmfd	sp!, {r4 - r6, pc}</div><div class='add'>+ENDPROC(__raw_readsb)</div><div class='head'>diff --git a/arch/arm/lib/io-readsl.S b/arch/arm/lib/io-readsl.S<br/>index 75a9121cb23f..5fb97e7f9f4b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/io-readsl.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/lib/io-readsl.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/io-readsl.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/io-readsl.S</a></div><div class='hunk'>@@ -76,3 +76,4 @@ ENTRY(__raw_readsl)</div><div class='ctx'> 8:		mov	r3, ip, get_byte_0</div><div class='ctx'> 		strb	r3, [r1, #0]</div><div class='ctx'> 		mov	pc, lr</div><div class='add'>+ENDPROC(__raw_readsl)</div><div class='head'>diff --git a/arch/arm/lib/io-readsw-armv4.S b/arch/arm/lib/io-readsw-armv4.S<br/>index 4db1c5f0b219..1f393d42593d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/io-readsw-armv4.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/lib/io-readsw-armv4.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/io-readsw-armv4.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/io-readsw-armv4.S</a></div><div class='hunk'>@@ -128,3 +128,4 @@ ENTRY(__raw_readsw)</div><div class='ctx'>    _BE_ONLY_(	movne	ip, ip, lsr #24		)</div><div class='ctx'> 		strneb	ip, [r1]</div><div class='ctx'> 		ldmfd	sp!, {r4, pc}</div><div class='add'>+ENDPROC(__raw_readsw)</div><div class='head'>diff --git a/arch/arm/lib/io-writesb.S b/arch/arm/lib/io-writesb.S<br/>index 7eba2b6cc69f..68b92f4acaeb 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/io-writesb.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/lib/io-writesb.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/io-writesb.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/io-writesb.S</a></div><div class='hunk'>@@ -91,3 +91,4 @@ ENTRY(__raw_writesb)</div><div class='ctx'> 		strgtb	r3, [r0]</div><div class='ctx'> </div><div class='ctx'> 		ldmfd	sp!, {r4, r5, pc}</div><div class='add'>+ENDPROC(__raw_writesb)</div><div class='head'>diff --git a/arch/arm/lib/io-writesl.S b/arch/arm/lib/io-writesl.S<br/>index f8f14dd227ca..8d3b7813725c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/io-writesl.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/lib/io-writesl.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/io-writesl.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/io-writesl.S</a></div><div class='hunk'>@@ -64,3 +64,4 @@ ENTRY(__raw_writesl)</div><div class='ctx'> 		str	ip, [r0]</div><div class='ctx'> 		bne	6b</div><div class='ctx'> 		mov	pc, lr</div><div class='add'>+ENDPROC(__raw_writesl)</div><div class='head'>diff --git a/arch/arm/lib/io-writesw-armv4.S b/arch/arm/lib/io-writesw-armv4.S<br/>index c8e85bd653b7..d6585612c86b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/io-writesw-armv4.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/lib/io-writesw-armv4.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/io-writesw-armv4.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/io-writesw-armv4.S</a></div><div class='hunk'>@@ -94,3 +94,4 @@ ENTRY(__raw_writesw)</div><div class='ctx'> 3:		movne	ip, r3, lsr #8</div><div class='ctx'> 		strneh	ip, [r0]</div><div class='ctx'> 		mov	pc, lr</div><div class='add'>+ENDPROC(__raw_writesw)</div><div class='head'>diff --git a/arch/arm/lib/lib1funcs.S b/arch/arm/lib/lib1funcs.S<br/>index 4e492f4b3f0e..67964bcfc854 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/lib1funcs.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/lib/lib1funcs.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/lib1funcs.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/lib1funcs.S</a></div><div class='hunk'>@@ -230,6 +230,8 @@ ENTRY(__aeabi_uidiv)</div><div class='ctx'> 	mov	r0, r0, lsr r2</div><div class='ctx'> 	mov	pc, lr</div><div class='ctx'> </div><div class='add'>+ENDPROC(__udivsi3)</div><div class='add'>+ENDPROC(__aeabi_uidiv)</div><div class='ctx'> </div><div class='ctx'> ENTRY(__umodsi3)</div><div class='ctx'> </div><div class='hunk'>@@ -245,6 +247,7 @@ ENTRY(__umodsi3)</div><div class='ctx'> </div><div class='ctx'> 	mov	pc, lr</div><div class='ctx'> </div><div class='add'>+ENDPROC(__umodsi3)</div><div class='ctx'> </div><div class='ctx'> ENTRY(__divsi3)</div><div class='ctx'> ENTRY(__aeabi_idiv)</div><div class='hunk'>@@ -284,6 +287,8 @@ ENTRY(__aeabi_idiv)</div><div class='ctx'> 	rsbmi	r0, r0, #0</div><div class='ctx'> 	mov	pc, lr</div><div class='ctx'> </div><div class='add'>+ENDPROC(__divsi3)</div><div class='add'>+ENDPROC(__aeabi_idiv)</div><div class='ctx'> </div><div class='ctx'> ENTRY(__modsi3)</div><div class='ctx'> </div><div class='hunk'>@@ -305,6 +310,8 @@ ENTRY(__modsi3)</div><div class='ctx'> 	rsbmi	r0, r0, #0</div><div class='ctx'> 	mov	pc, lr</div><div class='ctx'> </div><div class='add'>+ENDPROC(__modsi3)</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_AEABI</div><div class='ctx'> </div><div class='ctx'> ENTRY(__aeabi_uidivmod)</div><div class='hunk'>@@ -316,6 +323,8 @@ ENTRY(__aeabi_uidivmod)</div><div class='ctx'> 	sub	r1, r1, r3</div><div class='ctx'> 	mov	pc, lr</div><div class='ctx'> </div><div class='add'>+ENDPROC(__aeabi_uidivmod)</div><div class='add'>+</div><div class='ctx'> ENTRY(__aeabi_idivmod)</div><div class='ctx'> </div><div class='ctx'> 	stmfd	sp!, {r0, r1, ip, lr}</div><div class='hunk'>@@ -325,6 +334,8 @@ ENTRY(__aeabi_idivmod)</div><div class='ctx'> 	sub	r1, r1, r3</div><div class='ctx'> 	mov	pc, lr</div><div class='ctx'> </div><div class='add'>+ENDPROC(__aeabi_idivmod)</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> Ldiv0:</div><div class='head'>diff --git a/arch/arm/lib/lshrdi3.S b/arch/arm/lib/lshrdi3.S<br/>index a86dbdd59cc4..99ea338bf87c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/lshrdi3.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/lib/lshrdi3.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/lshrdi3.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/lshrdi3.S</a></div><div class='hunk'>@@ -47,3 +47,5 @@ ENTRY(__aeabi_llsr)</div><div class='ctx'> 	mov	ah, ah, lsr r2</div><div class='ctx'> 	mov	pc, lr</div><div class='ctx'> </div><div class='add'>+ENDPROC(__lshrdi3)</div><div class='add'>+ENDPROC(__aeabi_llsr)</div><div class='head'>diff --git a/arch/arm/lib/memchr.S b/arch/arm/lib/memchr.S<br/>index e7ab1ea8ebaa..1da86991d700 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/memchr.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/lib/memchr.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/memchr.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/memchr.S</a></div><div class='hunk'>@@ -23,3 +23,4 @@ ENTRY(memchr)</div><div class='ctx'> 	sub	r0, r0, #1</div><div class='ctx'> 2:	movne	r0, #0</div><div class='ctx'> 	mov	pc, lr</div><div class='add'>+ENDPROC(memchr)</div><div class='head'>diff --git a/arch/arm/lib/memcpy.S b/arch/arm/lib/memcpy.S<br/>index 7e71d6708a8d..e0d002641d3f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/memcpy.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/lib/memcpy.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/memcpy.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/memcpy.S</a></div><div class='hunk'>@@ -57,3 +57,4 @@ ENTRY(memcpy)</div><div class='ctx'> </div><div class='ctx'> #include "copy_template.S"</div><div class='ctx'> </div><div class='add'>+ENDPROC(memcpy)</div><div class='head'>diff --git a/arch/arm/lib/memmove.S b/arch/arm/lib/memmove.S<br/>index 2e301b7bd8f1..12549187088c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/memmove.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/lib/memmove.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/memmove.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/memmove.S</a></div><div class='hunk'>@@ -196,3 +196,4 @@ ENTRY(memmove)</div><div class='ctx'> </div><div class='ctx'> 18:		backward_copy_shift	push=24	pull=8</div><div class='ctx'> </div><div class='add'>+ENDPROC(memmove)</div><div class='head'>diff --git a/arch/arm/lib/memset.S b/arch/arm/lib/memset.S<br/>index b477d4ac88ef..761eefa76243 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/memset.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/lib/memset.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/memset.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/memset.S</a></div><div class='hunk'>@@ -124,3 +124,4 @@ ENTRY(memset)</div><div class='ctx'> 	tst	r2, #1</div><div class='ctx'> 	strneb	r1, [r0], #1</div><div class='ctx'> 	mov	pc, lr</div><div class='add'>+ENDPROC(memset)</div><div class='head'>diff --git a/arch/arm/lib/memzero.S b/arch/arm/lib/memzero.S<br/>index b8f79d80ee9b..3fbdef5f802a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/memzero.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/lib/memzero.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/memzero.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/memzero.S</a></div><div class='hunk'>@@ -122,3 +122,4 @@ ENTRY(__memzero)</div><div class='ctx'> 	tst	r1, #1			@ 1 a byte left over</div><div class='ctx'> 	strneb	r2, [r0], #1		@ 1</div><div class='ctx'> 	mov	pc, lr			@ 1</div><div class='add'>+ENDPROC(__memzero)</div><div class='head'>diff --git a/arch/arm/lib/muldi3.S b/arch/arm/lib/muldi3.S<br/>index d89c60615794..36c91b4957e2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/muldi3.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/lib/muldi3.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/muldi3.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/muldi3.S</a></div><div class='hunk'>@@ -43,3 +43,5 @@ ENTRY(__aeabi_lmul)</div><div class='ctx'> 	adc	xh, xh, ip, lsr #16</div><div class='ctx'> 	mov	pc, lr</div><div class='ctx'> </div><div class='add'>+ENDPROC(__muldi3)</div><div class='add'>+ENDPROC(__aeabi_lmul)</div><div class='head'>diff --git a/arch/arm/lib/putuser.S b/arch/arm/lib/putuser.S<br/>index 08ec7dffa52e..864f3c1c4f18 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/putuser.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/lib/putuser.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/putuser.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/putuser.S</a></div><div class='hunk'>@@ -26,16 +26,16 @@</div><div class='ctx'>  * Note that ADDR_LIMIT is either 0 or 0xc0000000</div><div class='ctx'>  * Note also that it is intended that __put_user_bad is not global.</div><div class='ctx'>  */</div><div class='add'>+#include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/errno.h&gt;</div><div class='ctx'> </div><div class='del'>-	.global	__put_user_1</div><div class='del'>-__put_user_1:</div><div class='add'>+ENTRY(__put_user_1)</div><div class='ctx'> 1:	strbt	r2, [r0]</div><div class='ctx'> 	mov	r0, #0</div><div class='ctx'> 	mov	pc, lr</div><div class='add'>+ENDPROC(__put_user_1)</div><div class='ctx'> </div><div class='del'>-	.global	__put_user_2</div><div class='del'>-__put_user_2:</div><div class='add'>+ENTRY(__put_user_2)</div><div class='ctx'> 	mov	ip, r2, lsr #8</div><div class='ctx'> #ifndef __ARMEB__</div><div class='ctx'> 2:	strbt	r2, [r0], #1</div><div class='hunk'>@@ -46,23 +46,25 @@ __put_user_2:</div><div class='ctx'> #endif</div><div class='ctx'> 	mov	r0, #0</div><div class='ctx'> 	mov	pc, lr</div><div class='add'>+ENDPROC(__put_user_2)</div><div class='ctx'> </div><div class='del'>-	.global	__put_user_4</div><div class='del'>-__put_user_4:</div><div class='add'>+ENTRY(__put_user_4)</div><div class='ctx'> 4:	strt	r2, [r0]</div><div class='ctx'> 	mov	r0, #0</div><div class='ctx'> 	mov	pc, lr</div><div class='add'>+ENDPROC(__put_user_4)</div><div class='ctx'> </div><div class='del'>-	.global	__put_user_8</div><div class='del'>-__put_user_8:</div><div class='add'>+ENTRY(__put_user_8)</div><div class='ctx'> 5:	strt	r2, [r0], #4</div><div class='ctx'> 6:	strt	r3, [r0]</div><div class='ctx'> 	mov	r0, #0</div><div class='ctx'> 	mov	pc, lr</div><div class='add'>+ENDPROC(__put_user_8)</div><div class='ctx'> </div><div class='ctx'> __put_user_bad:</div><div class='ctx'> 	mov	r0, #-EFAULT</div><div class='ctx'> 	mov	pc, lr</div><div class='add'>+ENDPROC(__put_user_bad)</div><div class='ctx'> </div><div class='ctx'> .section __ex_table, "a"</div><div class='ctx'> 	.long	1b, __put_user_bad</div><div class='head'>diff --git a/arch/arm/lib/setbit.S b/arch/arm/lib/setbit.S<br/>index 83bc23d5b037..1dd7176c4b2b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/setbit.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/lib/setbit.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/setbit.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/setbit.S</a></div><div class='hunk'>@@ -20,3 +20,5 @@ ENTRY(_set_bit_be)</div><div class='ctx'> 		eor	r0, r0, #0x18		@ big endian byte ordering</div><div class='ctx'> ENTRY(_set_bit_le)</div><div class='ctx'> 	bitop	orr</div><div class='add'>+ENDPROC(_set_bit_be)</div><div class='add'>+ENDPROC(_set_bit_le)</div><div class='head'>diff --git a/arch/arm/lib/sha1.S b/arch/arm/lib/sha1.S<br/>index 67c2bf4774b7..a16fb208c841 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/sha1.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/lib/sha1.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/sha1.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/sha1.S</a></div><div class='hunk'>@@ -185,6 +185,8 @@ ENTRY(sha_transform)</div><div class='ctx'> </div><div class='ctx'> 	ldmfd	sp!, {r4 - r8, pc}</div><div class='ctx'> </div><div class='add'>+ENDPROC(sha_transform)</div><div class='add'>+</div><div class='ctx'> .L_sha_K:</div><div class='ctx'> 	.word	0x5a827999, 0x6ed9eba1, 0x8f1bbcdc, 0xca62c1d6</div><div class='ctx'> </div><div class='hunk'>@@ -204,3 +206,4 @@ ENTRY(sha_init)</div><div class='ctx'> 	stmia	r0, {r1, r2, r3, ip, lr}</div><div class='ctx'> 	ldr	pc, [sp], #4</div><div class='ctx'> </div><div class='add'>+ENDPROC(sha_init)</div><div class='head'>diff --git a/arch/arm/lib/strchr.S b/arch/arm/lib/strchr.S<br/>index 9f18d6fdee6a..d8f2a1c1aea4 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/strchr.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/lib/strchr.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/strchr.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/strchr.S</a></div><div class='hunk'>@@ -24,3 +24,4 @@ ENTRY(strchr)</div><div class='ctx'> 		movne	r0, #0</div><div class='ctx'> 		subeq	r0, r0, #1</div><div class='ctx'> 		mov	pc, lr</div><div class='add'>+ENDPROC(strchr)</div><div class='head'>diff --git a/arch/arm/lib/strncpy_from_user.S b/arch/arm/lib/strncpy_from_user.S<br/>index 36e3741a3772..330373c26dd9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/strncpy_from_user.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/lib/strncpy_from_user.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/strncpy_from_user.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/strncpy_from_user.S</a></div><div class='hunk'>@@ -31,6 +31,7 @@ USER(	ldrplbt	r3, [r1], #1)</div><div class='ctx'> 	sub	r1, r1, #1	@ take NUL character out of count</div><div class='ctx'> 2:	sub	r0, r1, ip</div><div class='ctx'> 	mov	pc, lr</div><div class='add'>+ENDPROC(__strncpy_from_user)</div><div class='ctx'> </div><div class='ctx'> 	.section .fixup,"ax"</div><div class='ctx'> 	.align	0</div><div class='head'>diff --git a/arch/arm/lib/strnlen_user.S b/arch/arm/lib/strnlen_user.S<br/>index 18d8fa4f925a..90bb9d020836 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/strnlen_user.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/lib/strnlen_user.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/strnlen_user.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/strnlen_user.S</a></div><div class='hunk'>@@ -31,6 +31,7 @@ USER(	ldrbt	r3, [r0], #1)</div><div class='ctx'> 	add	r0, r0, #1</div><div class='ctx'> 2:	sub	r0, r0, r2</div><div class='ctx'> 	mov	pc, lr</div><div class='add'>+ENDPROC(__strnlen_user)</div><div class='ctx'> </div><div class='ctx'> 	.section .fixup,"ax"</div><div class='ctx'> 	.align	0</div><div class='head'>diff --git a/arch/arm/lib/strrchr.S b/arch/arm/lib/strrchr.S<br/>index 538df220aa48..302f20cd2423 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/strrchr.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/lib/strrchr.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/strrchr.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/strrchr.S</a></div><div class='hunk'>@@ -23,3 +23,4 @@ ENTRY(strrchr)</div><div class='ctx'> 		bne	1b</div><div class='ctx'> 		mov	r0, r3</div><div class='ctx'> 		mov	pc, lr</div><div class='add'>+ENDPROC(strrchr)</div><div class='head'>diff --git a/arch/arm/lib/testchangebit.S b/arch/arm/lib/testchangebit.S<br/>index b25dcd2be53e..5c98dc567f0f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/testchangebit.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/lib/testchangebit.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/testchangebit.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/testchangebit.S</a></div><div class='hunk'>@@ -16,3 +16,5 @@ ENTRY(_test_and_change_bit_be)</div><div class='ctx'> 		eor	r0, r0, #0x18		@ big endian byte ordering</div><div class='ctx'> ENTRY(_test_and_change_bit_le)</div><div class='ctx'> 	testop	eor, strb</div><div class='add'>+ENDPROC(_test_and_change_bit_be)</div><div class='add'>+ENDPROC(_test_and_change_bit_le)</div><div class='head'>diff --git a/arch/arm/lib/testclearbit.S b/arch/arm/lib/testclearbit.S<br/>index 2dcc4b16b68e..543d7094d18e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/testclearbit.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/lib/testclearbit.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/testclearbit.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/testclearbit.S</a></div><div class='hunk'>@@ -16,3 +16,5 @@ ENTRY(_test_and_clear_bit_be)</div><div class='ctx'> 		eor	r0, r0, #0x18		@ big endian byte ordering</div><div class='ctx'> ENTRY(_test_and_clear_bit_le)</div><div class='ctx'> 	testop	bicne, strneb</div><div class='add'>+ENDPROC(_test_and_clear_bit_be)</div><div class='add'>+ENDPROC(_test_and_clear_bit_le)</div><div class='head'>diff --git a/arch/arm/lib/testsetbit.S b/arch/arm/lib/testsetbit.S<br/>index 9011c969761a..0b3f390401ce 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/testsetbit.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/lib/testsetbit.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/testsetbit.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/testsetbit.S</a></div><div class='hunk'>@@ -16,3 +16,5 @@ ENTRY(_test_and_set_bit_be)</div><div class='ctx'> 		eor	r0, r0, #0x18		@ big endian byte ordering</div><div class='ctx'> ENTRY(_test_and_set_bit_le)</div><div class='ctx'> 	testop	orreq, streqb</div><div class='add'>+ENDPROC(_test_and_set_bit_be)</div><div class='add'>+ENDPROC(_test_and_set_bit_le)</div><div class='head'>diff --git a/arch/arm/lib/uaccess.S b/arch/arm/lib/uaccess.S<br/>index b48bd6d5fd83..ffdd27498cee 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/uaccess.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/lib/uaccess.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/uaccess.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/uaccess.S</a></div><div class='hunk'>@@ -277,6 +277,7 @@ USER(		strgebt	r3, [r0], #1)			@ May fault</div><div class='ctx'> 		ldrgtb	r3, [r1], #0</div><div class='ctx'> USER(		strgtbt	r3, [r0], #1)			@ May fault</div><div class='ctx'> 		b	.Lc2u_finished</div><div class='add'>+ENDPROC(__copy_to_user)</div><div class='ctx'> </div><div class='ctx'> 		.section .fixup,"ax"</div><div class='ctx'> 		.align	0</div><div class='hunk'>@@ -542,6 +543,7 @@ USER(		ldrgebt	r3, [r1], #1)			@ May fault</div><div class='ctx'> USER(		ldrgtbt	r3, [r1], #1)			@ May fault</div><div class='ctx'> 		strgtb	r3, [r0], #1</div><div class='ctx'> 		b	.Lcfu_finished</div><div class='add'>+ENDPROC(__copy_from_user)</div><div class='ctx'> </div><div class='ctx'> 		.section .fixup,"ax"</div><div class='ctx'> 		.align	0</div><div class='head'>diff --git a/arch/arm/lib/ucmpdi2.S b/arch/arm/lib/ucmpdi2.S<br/>index f76de07ac182..f0df6a91db04 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/ucmpdi2.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/lib/ucmpdi2.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/lib/ucmpdi2.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/lib/ucmpdi2.S</a></div><div class='hunk'>@@ -33,6 +33,8 @@ ENTRY(__ucmpdi2)</div><div class='ctx'> 	movhi	r0, #2</div><div class='ctx'> 	mov	pc, lr</div><div class='ctx'> </div><div class='add'>+ENDPROC(__ucmpdi2)</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_AEABI</div><div class='ctx'> </div><div class='ctx'> ENTRY(__aeabi_ulcmp)</div><div class='hunk'>@@ -44,5 +46,7 @@ ENTRY(__aeabi_ulcmp)</div><div class='ctx'> 	movhi	r0, #1</div><div class='ctx'> 	mov	pc, lr</div><div class='ctx'> </div><div class='add'>+ENDPROC(__aeabi_ulcmp)</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig<br/>index a048b92cb407..5aafb2e2ca7a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-at91/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/Kconfig</a></div><div class='hunk'>@@ -175,6 +175,15 @@ config MACH_SAM9_L9260</div><div class='ctx'> 	  Select this if you are using Olimex's SAM9-L9260 board based on the Atmel AT91SAM9260.</div><div class='ctx'> 	  &lt;http://www.olimex.com/dev/sam9-L9260.html&gt;</div><div class='ctx'> </div><div class='add'>+config MACH_AFEB9260</div><div class='add'>+	bool "Custom afeb9260 board v1"</div><div class='add'>+	depends on ARCH_AT91SAM9260</div><div class='add'>+	help</div><div class='add'>+	  Select this if you are using custom afeb9260 board based on</div><div class='add'>+	  open hardware design. Select this for revision 1 of the board.</div><div class='add'>+	  &lt;svn://194.85.238.22/home/users/george/svn/arm9eb&gt;</div><div class='add'>+	  &lt;http://groups.google.com/group/arm9fpga-evolution-board&gt;</div><div class='add'>+</div><div class='ctx'> config MACH_USB_A9260</div><div class='ctx'> 	bool "CALAO USB-A9260"</div><div class='ctx'> 	depends on ARCH_AT91SAM9260</div><div class='hunk'>@@ -314,6 +323,19 @@ config AT91_PROGRAMMABLE_CLOCKS</div><div class='ctx'> 	  Select this if you need to program one or more of the PCK0..PCK3</div><div class='ctx'> 	  programmable clock outputs.</div><div class='ctx'> </div><div class='add'>+config AT91_SLOW_CLOCK</div><div class='add'>+	bool "Suspend-to-RAM disables main oscillator"</div><div class='add'>+	depends on SUSPEND</div><div class='add'>+	help</div><div class='add'>+	  Select this if you want Suspend-to-RAM to save the most power</div><div class='add'>+	  possible (without powering off the CPU) by disabling the PLLs</div><div class='add'>+	  and main oscillator so that only the 32 KiHz clock is available.</div><div class='add'>+</div><div class='add'>+	  When only that slow-clock is available, some peripherals lose</div><div class='add'>+	  functionality.  Many can't issue wakeup events unless faster</div><div class='add'>+	  clocks are available.  Some lose their operating state and</div><div class='add'>+	  need to be completely re-initialized.</div><div class='add'>+</div><div class='ctx'> config AT91_TIMER_HZ</div><div class='ctx'>        int "Kernel HZ (jiffies per second)"</div><div class='ctx'>        range 32 1024</div><div class='head'>diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile<br/>index 7d641f97516b..cca612d97ca2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-at91/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/Makefile</a></div><div class='hunk'>@@ -39,6 +39,7 @@ obj-$(CONFIG_MACH_CAM60)	+= board-cam60.o</div><div class='ctx'> obj-$(CONFIG_MACH_SAM9_L9260)	+= board-sam9-l9260.o</div><div class='ctx'> obj-$(CONFIG_MACH_USB_A9260)	+= board-usb-a9260.o</div><div class='ctx'> obj-$(CONFIG_MACH_QIL_A9260)	+= board-qil-a9260.o</div><div class='add'>+obj-$(CONFIG_MACH_AFEB9260)	+= board-afeb-9260v1.o</div><div class='ctx'> </div><div class='ctx'> # AT91SAM9261 board-specific support</div><div class='ctx'> obj-$(CONFIG_MACH_AT91SAM9261EK) += board-sam9261ek.o</div><div class='hunk'>@@ -64,6 +65,7 @@ obj-y				+= leds.o</div><div class='ctx'> </div><div class='ctx'> # Power Management</div><div class='ctx'> obj-$(CONFIG_PM)		+= pm.o</div><div class='add'>+obj-$(CONFIG_AT91_SLOW_CLOCK)	+= pm_slowclock.o</div><div class='ctx'> </div><div class='ctx'> ifeq ($(CONFIG_PM_DEBUG),y)</div><div class='ctx'> CFLAGS_pm.o += -DDEBUG</div><div class='head'>diff --git a/arch/arm/mach-at91/at91cap9.c b/arch/arm/mach-at91/at91cap9.c<br/>index 638948c16770..0fc0adaebd58 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/at91cap9.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-at91/at91cap9.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/at91cap9.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/at91cap9.c</a></div><div class='hunk'>@@ -141,8 +141,8 @@ static struct clk tcb_clk = {</div><div class='ctx'> 	.pmc_mask	= 1 &lt;&lt; AT91CAP9_ID_TCB,</div><div class='ctx'> 	.type		= CLK_TYPE_PERIPHERAL,</div><div class='ctx'> };</div><div class='del'>-static struct clk pwmc_clk = {</div><div class='del'>-	.name		= "pwmc_clk",</div><div class='add'>+static struct clk pwm_clk = {</div><div class='add'>+	.name		= "pwm_clk",</div><div class='ctx'> 	.pmc_mask	= 1 &lt;&lt; AT91CAP9_ID_PWMC,</div><div class='ctx'> 	.type		= CLK_TYPE_PERIPHERAL,</div><div class='ctx'> };</div><div class='hunk'>@@ -207,7 +207,7 @@ static struct clk *periph_clocks[] __initdata = {</div><div class='ctx'> 	&amp;ssc1_clk,</div><div class='ctx'> 	&amp;ac97_clk,</div><div class='ctx'> 	&amp;tcb_clk,</div><div class='del'>-	&amp;pwmc_clk,</div><div class='add'>+	&amp;pwm_clk,</div><div class='ctx'> 	&amp;macb_clk,</div><div class='ctx'> 	&amp;aestdes_clk,</div><div class='ctx'> 	&amp;adc_clk,</div><div class='head'>diff --git a/arch/arm/mach-at91/at91cap9_devices.c b/arch/arm/mach-at91/at91cap9_devices.c<br/>index abb4aac8fa98..5ebd4273d353 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/at91cap9_devices.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-at91/at91cap9_devices.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/at91cap9_devices.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/at91cap9_devices.c</a></div><div class='hunk'>@@ -719,6 +719,60 @@ static void __init at91_add_device_watchdog(void) {}</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* --------------------------------------------------------------------</div><div class='add'>+ *  PWM</div><div class='add'>+ * --------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_ATMEL_PWM)</div><div class='add'>+static u32 pwm_mask;</div><div class='add'>+</div><div class='add'>+static struct resource pwm_resources[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start	= AT91CAP9_BASE_PWMC,</div><div class='add'>+		.end	= AT91CAP9_BASE_PWMC + SZ_16K - 1,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.start	= AT91CAP9_ID_PWMC,</div><div class='add'>+		.end	= AT91CAP9_ID_PWMC,</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device at91cap9_pwm0_device = {</div><div class='add'>+	.name	= "atmel_pwm",</div><div class='add'>+	.id	= -1,</div><div class='add'>+	.dev	= {</div><div class='add'>+		.platform_data		= &amp;pwm_mask,</div><div class='add'>+	},</div><div class='add'>+	.resource	= pwm_resources,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(pwm_resources),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void __init at91_add_device_pwm(u32 mask)</div><div class='add'>+{</div><div class='add'>+	if (mask &amp; (1 &lt;&lt; AT91_PWM0))</div><div class='add'>+		at91_set_A_periph(AT91_PIN_PB19, 1);	/* enable PWM0 */</div><div class='add'>+</div><div class='add'>+	if (mask &amp; (1 &lt;&lt; AT91_PWM1))</div><div class='add'>+		at91_set_B_periph(AT91_PIN_PB8, 1);	/* enable PWM1 */</div><div class='add'>+</div><div class='add'>+	if (mask &amp; (1 &lt;&lt; AT91_PWM2))</div><div class='add'>+		at91_set_B_periph(AT91_PIN_PC29, 1);	/* enable PWM2 */</div><div class='add'>+</div><div class='add'>+	if (mask &amp; (1 &lt;&lt; AT91_PWM3))</div><div class='add'>+		at91_set_B_periph(AT91_PIN_PA11, 1);	/* enable PWM3 */</div><div class='add'>+</div><div class='add'>+	pwm_mask = mask;</div><div class='add'>+</div><div class='add'>+	platform_device_register(&amp;at91cap9_pwm0_device);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+void __init at91_add_device_pwm(u32 mask) {}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* --------------------------------------------------------------------</div><div class='ctx'>  *  AC97</div><div class='ctx'>  * -------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-at91/at91sam9263.c b/arch/arm/mach-at91/at91sam9263.c<br/>index 80bfab5680e2..ada4b6769107 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/at91sam9263.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-at91/at91sam9263.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/at91sam9263.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/at91sam9263.c</a></div><div class='hunk'>@@ -129,8 +129,8 @@ static struct clk tcb_clk = {</div><div class='ctx'> 	.pmc_mask	= 1 &lt;&lt; AT91SAM9263_ID_TCB,</div><div class='ctx'> 	.type		= CLK_TYPE_PERIPHERAL,</div><div class='ctx'> };</div><div class='del'>-static struct clk pwmc_clk = {</div><div class='del'>-	.name		= "pwmc_clk",</div><div class='add'>+static struct clk pwm_clk = {</div><div class='add'>+	.name		= "pwm_clk",</div><div class='ctx'> 	.pmc_mask	= 1 &lt;&lt; AT91SAM9263_ID_PWMC,</div><div class='ctx'> 	.type		= CLK_TYPE_PERIPHERAL,</div><div class='ctx'> };</div><div class='hunk'>@@ -187,7 +187,7 @@ static struct clk *periph_clocks[] __initdata = {</div><div class='ctx'> 	&amp;ssc1_clk,</div><div class='ctx'> 	&amp;ac97_clk,</div><div class='ctx'> 	&amp;tcb_clk,</div><div class='del'>-	&amp;pwmc_clk,</div><div class='add'>+	&amp;pwm_clk,</div><div class='ctx'> 	&amp;macb_clk,</div><div class='ctx'> 	&amp;twodge_clk,</div><div class='ctx'> 	&amp;udc_clk,</div><div class='head'>diff --git a/arch/arm/mach-at91/at91sam9263_devices.c b/arch/arm/mach-at91/at91sam9263_devices.c<br/>index c93992f55dc9..8b884083f76d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/at91sam9263_devices.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-at91/at91sam9263_devices.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/at91sam9263_devices.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/at91sam9263_devices.c</a></div><div class='hunk'>@@ -886,6 +886,59 @@ static void __init at91_add_device_watchdog(void) {}</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* --------------------------------------------------------------------</div><div class='add'>+ *  PWM</div><div class='add'>+ * --------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_ATMEL_PWM)</div><div class='add'>+static u32 pwm_mask;</div><div class='add'>+</div><div class='add'>+static struct resource pwm_resources[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start	= AT91SAM9263_BASE_PWMC,</div><div class='add'>+		.end	= AT91SAM9263_BASE_PWMC + SZ_16K - 1,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.start	= AT91SAM9263_ID_PWMC,</div><div class='add'>+		.end	= AT91SAM9263_ID_PWMC,</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device at91sam9263_pwm0_device = {</div><div class='add'>+	.name	= "atmel_pwm",</div><div class='add'>+	.id	= -1,</div><div class='add'>+	.dev	= {</div><div class='add'>+		.platform_data		= &amp;pwm_mask,</div><div class='add'>+	},</div><div class='add'>+	.resource	= pwm_resources,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(pwm_resources),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void __init at91_add_device_pwm(u32 mask)</div><div class='add'>+{</div><div class='add'>+	if (mask &amp; (1 &lt;&lt; AT91_PWM0))</div><div class='add'>+		at91_set_B_periph(AT91_PIN_PB7, 1);	/* enable PWM0 */</div><div class='add'>+</div><div class='add'>+	if (mask &amp; (1 &lt;&lt; AT91_PWM1))</div><div class='add'>+		at91_set_B_periph(AT91_PIN_PB8, 1);	/* enable PWM1 */</div><div class='add'>+</div><div class='add'>+	if (mask &amp; (1 &lt;&lt; AT91_PWM2))</div><div class='add'>+		at91_set_B_periph(AT91_PIN_PC29, 1);	/* enable PWM2 */</div><div class='add'>+</div><div class='add'>+	if (mask &amp; (1 &lt;&lt; AT91_PWM3))</div><div class='add'>+		at91_set_B_periph(AT91_PIN_PB29, 1);	/* enable PWM3 */</div><div class='add'>+</div><div class='add'>+	pwm_mask = mask;</div><div class='add'>+</div><div class='add'>+	platform_device_register(&amp;at91sam9263_pwm0_device);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+void __init at91_add_device_pwm(u32 mask) {}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* --------------------------------------------------------------------</div><div class='ctx'>  *  SSC -- Synchronous Serial Controller</div><div class='ctx'>  * -------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-at91/at91sam9rl.c b/arch/arm/mach-at91/at91sam9rl.c<br/>index 556bddf35b45..252e954b49fd 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/at91sam9rl.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-at91/at91sam9rl.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/at91sam9rl.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/at91sam9rl.c</a></div><div class='hunk'>@@ -131,8 +131,8 @@ static struct clk tc2_clk = {</div><div class='ctx'> 	.pmc_mask	= 1 &lt;&lt; AT91SAM9RL_ID_TC2,</div><div class='ctx'> 	.type		= CLK_TYPE_PERIPHERAL,</div><div class='ctx'> };</div><div class='del'>-static struct clk pwmc_clk = {</div><div class='del'>-	.name		= "pwmc_clk",</div><div class='add'>+static struct clk pwm_clk = {</div><div class='add'>+	.name		= "pwm_clk",</div><div class='ctx'> 	.pmc_mask	= 1 &lt;&lt; AT91SAM9RL_ID_PWMC,</div><div class='ctx'> 	.type		= CLK_TYPE_PERIPHERAL,</div><div class='ctx'> };</div><div class='hunk'>@@ -180,7 +180,7 @@ static struct clk *periph_clocks[] __initdata = {</div><div class='ctx'> 	&amp;tc0_clk,</div><div class='ctx'> 	&amp;tc1_clk,</div><div class='ctx'> 	&amp;tc2_clk,</div><div class='del'>-	&amp;pwmc_clk,</div><div class='add'>+	&amp;pwm_clk,</div><div class='ctx'> 	&amp;tsc_clk,</div><div class='ctx'> 	&amp;dma_clk,</div><div class='ctx'> 	&amp;udphs_clk,</div><div class='head'>diff --git a/arch/arm/mach-at91/at91sam9rl_devices.c b/arch/arm/mach-at91/at91sam9rl_devices.c<br/>index 620886341fb5..87deb1e1b529 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/at91sam9rl_devices.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-at91/at91sam9rl_devices.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/at91sam9rl_devices.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/at91sam9rl_devices.c</a></div><div class='hunk'>@@ -527,6 +527,51 @@ static void __init at91_add_device_tc(void) { }</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* --------------------------------------------------------------------</div><div class='add'>+ *  Touchscreen</div><div class='add'>+ * -------------------------------------------------------------------- */</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_TOUCHSCREEN_ATMEL_TSADCC) || defined(CONFIG_TOUCHSCREEN_ATMEL_TSADCC_MODULE)</div><div class='add'>+static u64 tsadcc_dmamask = DMA_BIT_MASK(32);</div><div class='add'>+</div><div class='add'>+static struct resource tsadcc_resources[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start	= AT91SAM9RL_BASE_TSC,</div><div class='add'>+		.end	= AT91SAM9RL_BASE_TSC + SZ_16K - 1,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.start	= AT91SAM9RL_ID_TSC,</div><div class='add'>+		.end	= AT91SAM9RL_ID_TSC,</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device at91sam9rl_tsadcc_device = {</div><div class='add'>+	.name		= "atmel_tsadcc",</div><div class='add'>+	.id		= -1,</div><div class='add'>+	.dev		= {</div><div class='add'>+				.dma_mask		= &amp;tsadcc_dmamask,</div><div class='add'>+				.coherent_dma_mask	= DMA_BIT_MASK(32),</div><div class='add'>+	},</div><div class='add'>+	.resource	= tsadcc_resources,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(tsadcc_resources),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void __init at91_add_device_tsadcc(void)</div><div class='add'>+{</div><div class='add'>+	at91_set_A_periph(AT91_PIN_PA17, 0);	/* AD0_XR */</div><div class='add'>+	at91_set_A_periph(AT91_PIN_PA18, 0);	/* AD1_XL */</div><div class='add'>+	at91_set_A_periph(AT91_PIN_PA19, 0);	/* AD2_YT */</div><div class='add'>+	at91_set_A_periph(AT91_PIN_PA20, 0);	/* AD3_TB */</div><div class='add'>+</div><div class='add'>+	platform_device_register(&amp;at91sam9rl_tsadcc_device);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+void __init at91_add_device_tsadcc(void) {}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* --------------------------------------------------------------------</div><div class='ctx'>  *  RTC</div><div class='ctx'>  * -------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='hunk'>@@ -592,6 +637,59 @@ static void __init at91_add_device_watchdog(void) {}</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* --------------------------------------------------------------------</div><div class='add'>+ *  PWM</div><div class='add'>+ * --------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_ATMEL_PWM)</div><div class='add'>+static u32 pwm_mask;</div><div class='add'>+</div><div class='add'>+static struct resource pwm_resources[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start	= AT91SAM9RL_BASE_PWMC,</div><div class='add'>+		.end	= AT91SAM9RL_BASE_PWMC + SZ_16K - 1,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.start	= AT91SAM9RL_ID_PWMC,</div><div class='add'>+		.end	= AT91SAM9RL_ID_PWMC,</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device at91sam9rl_pwm0_device = {</div><div class='add'>+	.name	= "atmel_pwm",</div><div class='add'>+	.id	= -1,</div><div class='add'>+	.dev	= {</div><div class='add'>+		.platform_data		= &amp;pwm_mask,</div><div class='add'>+	},</div><div class='add'>+	.resource	= pwm_resources,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(pwm_resources),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void __init at91_add_device_pwm(u32 mask)</div><div class='add'>+{</div><div class='add'>+	if (mask &amp; (1 &lt;&lt; AT91_PWM0))</div><div class='add'>+		at91_set_B_periph(AT91_PIN_PB8, 1);	/* enable PWM0 */</div><div class='add'>+</div><div class='add'>+	if (mask &amp; (1 &lt;&lt; AT91_PWM1))</div><div class='add'>+		at91_set_B_periph(AT91_PIN_PB9, 1);	/* enable PWM1 */</div><div class='add'>+</div><div class='add'>+	if (mask &amp; (1 &lt;&lt; AT91_PWM2))</div><div class='add'>+		at91_set_B_periph(AT91_PIN_PD5, 1);	/* enable PWM2 */</div><div class='add'>+</div><div class='add'>+	if (mask &amp; (1 &lt;&lt; AT91_PWM3))</div><div class='add'>+		at91_set_B_periph(AT91_PIN_PD8, 1);	/* enable PWM3 */</div><div class='add'>+</div><div class='add'>+	pwm_mask = mask;</div><div class='add'>+</div><div class='add'>+	platform_device_register(&amp;at91sam9rl_pwm0_device);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+void __init at91_add_device_pwm(u32 mask) {}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* --------------------------------------------------------------------</div><div class='ctx'>  *  SSC -- Synchronous Serial Controller</div><div class='ctx'>  * -------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-at91/at91x40_time.c b/arch/arm/mach-at91/at91x40_time.c<br/>index 869b5e28d195..dfff2895f4b2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/at91x40_time.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-at91/at91x40_time.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/at91x40_time.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/at91x40_time.c</a></div><div class='hunk'>@@ -23,8 +23,8 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='ctx'> #include &lt;mach/at91_tc.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-at91/board-afeb-9260v1.c b/arch/arm/mach-at91/board-afeb-9260v1.c<br/>new file mode 100644<br/>index 000000000000..9c040c78889a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/board-afeb-9260v1.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/board-afeb-9260v1.c</a></div><div class='hunk'>@@ -0,0 +1,210 @@</div><div class='add'>+/*</div><div class='add'>+ * linux/arch/arm/mach-at91/board-afeb-9260v1.c</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2005 SAN People</div><div class='add'>+ *  Copyright (C) 2006 Atmel</div><div class='add'>+ *  Copyright (C) 2008 Sergey Lapin</div><div class='add'>+ *</div><div class='add'>+ * A custom board designed as open hardware; PCBs and various information</div><div class='add'>+ * is available at http://groups.google.com/group/arm9fpga-evolution-board/</div><div class='add'>+ * Subversion repository: svn://194.85.238.22/home/users/george/svn/arm9eb</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/spi/spi.h&gt;</div><div class='add'>+#include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;asm/setup.h&gt;</div><div class='add'>+#include &lt;asm/mach-types.h&gt;</div><div class='add'>+#include &lt;asm/irq.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/mach/arch.h&gt;</div><div class='add'>+#include &lt;asm/mach/map.h&gt;</div><div class='add'>+#include &lt;asm/mach/irq.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='add'>+</div><div class='add'>+#include "generic.h"</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void __init afeb9260_map_io(void)</div><div class='add'>+{</div><div class='add'>+	/* Initialize processor: 18.432 MHz crystal */</div><div class='add'>+	at91sam9260_initialize(18432000);</div><div class='add'>+</div><div class='add'>+	/* DGBU on ttyS0. (Rx &amp; Tx only) */</div><div class='add'>+	at91_register_uart(0, 0, 0);</div><div class='add'>+</div><div class='add'>+	/* USART0 on ttyS1. (Rx, Tx, CTS, RTS, DTR, DSR, DCD, RI) */</div><div class='add'>+	at91_register_uart(AT91SAM9260_ID_US0, 1,</div><div class='add'>+			     ATMEL_UART_CTS | ATMEL_UART_RTS</div><div class='add'>+			   | ATMEL_UART_DTR | ATMEL_UART_DSR</div><div class='add'>+			   | ATMEL_UART_DCD | ATMEL_UART_RI);</div><div class='add'>+</div><div class='add'>+	/* USART1 on ttyS2. (Rx, Tx, RTS, CTS) */</div><div class='add'>+	at91_register_uart(AT91SAM9260_ID_US1, 2,</div><div class='add'>+			ATMEL_UART_CTS | ATMEL_UART_RTS);</div><div class='add'>+</div><div class='add'>+	/* set serial console to ttyS0 (ie, DBGU) */</div><div class='add'>+	at91_set_serial_console(0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init afeb9260_init_irq(void)</div><div class='add'>+{</div><div class='add'>+	at91sam9260_init_interrupts(NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * USB Host port</div><div class='add'>+ */</div><div class='add'>+static struct at91_usbh_data __initdata afeb9260_usbh_data = {</div><div class='add'>+	.ports		= 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * USB Device port</div><div class='add'>+ */</div><div class='add'>+static struct at91_udc_data __initdata afeb9260_udc_data = {</div><div class='add'>+	.vbus_pin	= AT91_PIN_PC5,</div><div class='add'>+	.pullup_pin	= 0,		/* pull-up driven by UDC */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * SPI devices.</div><div class='add'>+ */</div><div class='add'>+static struct spi_board_info afeb9260_spi_devices[] = {</div><div class='add'>+	{	/* DataFlash chip */</div><div class='add'>+		.modalias	= "mtd_dataflash",</div><div class='add'>+		.chip_select	= 1,</div><div class='add'>+		.max_speed_hz	= 15 * 1000 * 1000,</div><div class='add'>+		.bus_num	= 0,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * MACB Ethernet device</div><div class='add'>+ */</div><div class='add'>+static struct at91_eth_data __initdata afeb9260_macb_data = {</div><div class='add'>+	.phy_irq_pin	= AT91_PIN_PA9,</div><div class='add'>+	.is_rmii	= 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * NAND flash</div><div class='add'>+ */</div><div class='add'>+static struct mtd_partition __initdata afeb9260_nand_partition[] = {</div><div class='add'>+	{</div><div class='add'>+		.name	= "bootloader",</div><div class='add'>+		.offset	= 0,</div><div class='add'>+		.size	= (640 * SZ_1K),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name	= "kernel",</div><div class='add'>+		.offset	= MTDPART_OFS_NXTBLK,</div><div class='add'>+		.size	= SZ_2M,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name	= "rootfs",</div><div class='add'>+		.offset	= MTDPART_OFS_NXTBLK,</div><div class='add'>+		.size	= MTDPART_SIZ_FULL,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct mtd_partition * __init nand_partitions(int size, int *num_partitions)</div><div class='add'>+{</div><div class='add'>+	*num_partitions = ARRAY_SIZE(afeb9260_nand_partition);</div><div class='add'>+	return afeb9260_nand_partition;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct atmel_nand_data __initdata afeb9260_nand_data = {</div><div class='add'>+	.ale		= 21,</div><div class='add'>+	.cle		= 22,</div><div class='add'>+	.rdy_pin	= AT91_PIN_PC13,</div><div class='add'>+	.enable_pin	= AT91_PIN_PC14,</div><div class='add'>+	.partition_info	= nand_partitions,</div><div class='add'>+	.bus_width_16	= 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * MCI (SD/MMC)</div><div class='add'>+ */</div><div class='add'>+static struct at91_mmc_data __initdata afeb9260_mmc_data = {</div><div class='add'>+	.slot_b		= 1,</div><div class='add'>+	.wire4		= 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static struct i2c_board_info __initdata afeb9260_i2c_devices[] = {</div><div class='add'>+	{</div><div class='add'>+		I2C_BOARD_INFO("fm3130", 0x68),</div><div class='add'>+		I2C_BOARD_INFO("24c64", 0x50),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init afeb9260_board_init(void)</div><div class='add'>+{</div><div class='add'>+	/* Serial */</div><div class='add'>+	at91_add_device_serial();</div><div class='add'>+	/* USB Host */</div><div class='add'>+	at91_add_device_usbh(&amp;afeb9260_usbh_data);</div><div class='add'>+	/* USB Device */</div><div class='add'>+	at91_add_device_udc(&amp;afeb9260_udc_data);</div><div class='add'>+	/* SPI */</div><div class='add'>+	at91_add_device_spi(afeb9260_spi_devices,</div><div class='add'>+			ARRAY_SIZE(afeb9260_spi_devices));</div><div class='add'>+	/* NAND */</div><div class='add'>+	at91_add_device_nand(&amp;afeb9260_nand_data);</div><div class='add'>+	/* Ethernet */</div><div class='add'>+	at91_add_device_eth(&amp;afeb9260_macb_data);</div><div class='add'>+</div><div class='add'>+	/* Standard function's pin assignments are not</div><div class='add'>+	 * appropriate for us and generic code provide</div><div class='add'>+	 * no API to configure these pins any other way */</div><div class='add'>+	at91_set_B_periph(AT91_PIN_PA10, 0);	/* ETX2 */</div><div class='add'>+	at91_set_B_periph(AT91_PIN_PA11, 0);	/* ETX3 */</div><div class='add'>+	/* MMC */</div><div class='add'>+	at91_add_device_mmc(0, &amp;afeb9260_mmc_data);</div><div class='add'>+	/* I2C */</div><div class='add'>+	at91_add_device_i2c(afeb9260_i2c_devices,</div><div class='add'>+			ARRAY_SIZE(afeb9260_i2c_devices));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+MACHINE_START(AFEB9260, "Custom afeb9260 board")</div><div class='add'>+	/* Maintainer: Sergey Lapin &lt;slapin@ossfans.org&gt; */</div><div class='add'>+	.phys_io	= AT91_BASE_SYS,</div><div class='add'>+	.io_pg_offst	= (AT91_VA_BASE_SYS &gt;&gt; 18) &amp; 0xfffc,</div><div class='add'>+	.boot_params	= AT91_SDRAM_BASE + 0x100,</div><div class='add'>+	.timer		= &amp;at91sam926x_timer,</div><div class='add'>+	.map_io		= afeb9260_map_io,</div><div class='add'>+	.init_irq	= afeb9260_init_irq,</div><div class='add'>+	.init_machine	= afeb9260_board_init,</div><div class='add'>+MACHINE_END</div><div class='add'>+</div><div class='head'>diff --git a/arch/arm/mach-at91/board-cap9adk.c b/arch/arm/mach-at91/board-cap9adk.c<br/>index 196199552eb6..201b89392dcc 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/board-cap9adk.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-at91/board-cap9adk.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/board-cap9adk.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/board-cap9adk.c</a></div><div class='hunk'>@@ -214,7 +214,7 @@ static struct physmap_flash_data cap9adk_nor_data = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define NOR_BASE	AT91_CHIPSELECT_0</div><div class='del'>-#define NOR_SIZE	0x800000</div><div class='add'>+#define NOR_SIZE	SZ_8M</div><div class='ctx'> </div><div class='ctx'> static struct resource nor_flash_resources[] = {</div><div class='ctx'> 	{</div><div class='head'>diff --git a/arch/arm/mach-at91/board-carmeva.c b/arch/arm/mach-at91/board-carmeva.c<br/>index afa1ff0e9577..db1f9544d2e0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/board-carmeva.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-at91/board-carmeva.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/board-carmeva.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/board-carmeva.c</a></div><div class='hunk'>@@ -25,7 +25,6 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='hunk'>@@ -34,6 +33,7 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;mach/board.h&gt;</div><div class='ctx'> #include &lt;mach/gpio.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -114,6 +114,30 @@ static struct spi_board_info carmeva_spi_devices[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct gpio_led carmeva_leds[] = {</div><div class='add'>+	{ /* "user led 1", LED9 */</div><div class='add'>+		.name			= "led9",</div><div class='add'>+		.gpio			= AT91_PIN_PA21,</div><div class='add'>+		.active_low		= 1,</div><div class='add'>+		.default_trigger	= "heartbeat",</div><div class='add'>+	},</div><div class='add'>+	{ /* "user led 2", LED10 */</div><div class='add'>+		.name			= "led10",</div><div class='add'>+		.gpio			= AT91_PIN_PA25,</div><div class='add'>+		.active_low		= 1,</div><div class='add'>+	},</div><div class='add'>+	{ /* "user led 3", LED11 */</div><div class='add'>+		.name			= "led11",</div><div class='add'>+		.gpio			= AT91_PIN_PA26,</div><div class='add'>+		.active_low		= 1,</div><div class='add'>+	},</div><div class='add'>+	{ /* "user led 4", LED12 */</div><div class='add'>+		.name			= "led12",</div><div class='add'>+		.gpio			= AT91_PIN_PA18,</div><div class='add'>+		.active_low		= 1,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static void __init carmeva_board_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* Serial */</div><div class='hunk'>@@ -132,6 +156,8 @@ static void __init carmeva_board_init(void)</div><div class='ctx'> //	at91_add_device_cf(&amp;carmeva_cf_data);</div><div class='ctx'> 	/* MMC */</div><div class='ctx'> 	at91_add_device_mmc(0, &amp;carmeva_mmc_data);</div><div class='add'>+	/* LEDs */</div><div class='add'>+	at91_gpio_leds(carmeva_leds, ARRAY_SIZE(carmeva_leds));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> MACHINE_START(CARMEVA, "Carmeva")</div><div class='head'>diff --git a/arch/arm/mach-at91/board-csb337.c b/arch/arm/mach-at91/board-csb337.c<br/>index cb7c9a8fa487..fea2529ebcf9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/board-csb337.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-at91/board-csb337.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/board-csb337.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/board-csb337.c</a></div><div class='hunk'>@@ -28,7 +28,6 @@</div><div class='ctx'> #include &lt;linux/input.h&gt;</div><div class='ctx'> #include &lt;linux/gpio_keys.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='hunk'>@@ -37,6 +36,7 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;mach/board.h&gt;</div><div class='ctx'> #include &lt;mach/gpio.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -114,7 +114,7 @@ static struct spi_board_info csb337_spi_devices[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define CSB_FLASH_BASE	AT91_CHIPSELECT_0</div><div class='del'>-#define CSB_FLASH_SIZE	0x800000</div><div class='add'>+#define CSB_FLASH_SIZE	SZ_8M</div><div class='ctx'> </div><div class='ctx'> static struct mtd_partition csb_flash_partitions[] = {</div><div class='ctx'> 	{</div><div class='hunk'>@@ -193,11 +193,11 @@ static struct platform_device csb300_button_device = {</div><div class='ctx'> </div><div class='ctx'> static void __init csb300_add_device_buttons(void)</div><div class='ctx'> {</div><div class='del'>-	at91_set_gpio_input(AT91_PIN_PB29, 0);	/* sw0 */</div><div class='add'>+	at91_set_gpio_input(AT91_PIN_PB29, 1);	/* sw0 */</div><div class='ctx'> 	at91_set_deglitch(AT91_PIN_PB29, 1);</div><div class='del'>-	at91_set_gpio_input(AT91_PIN_PB28, 0);	/* sw1 */</div><div class='add'>+	at91_set_gpio_input(AT91_PIN_PB28, 1);	/* sw1 */</div><div class='ctx'> 	at91_set_deglitch(AT91_PIN_PB28, 1);</div><div class='del'>-	at91_set_gpio_input(AT91_PIN_PA21, 0);	/* sw2 */</div><div class='add'>+	at91_set_gpio_input(AT91_PIN_PA21, 1);	/* sw2 */</div><div class='ctx'> 	at91_set_deglitch(AT91_PIN_PA21, 1);</div><div class='ctx'> </div><div class='ctx'> 	platform_device_register(&amp;csb300_button_device);</div><div class='hunk'>@@ -224,7 +224,7 @@ static struct gpio_led csb_leds[] = {</div><div class='ctx'> 		.gpio			= AT91_PIN_PB0,</div><div class='ctx'> 		.active_low		= 1,</div><div class='ctx'> 		.default_trigger	= "ide-disk",</div><div class='del'>-	},</div><div class='add'>+	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-at91/board-csb637.c b/arch/arm/mach-at91/board-csb637.c<br/>index 8db8bd8babd9..cfa3f04b2205 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/board-csb637.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-at91/board-csb637.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/board-csb637.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/board-csb637.c</a></div><div class='hunk'>@@ -25,7 +25,6 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/physmap.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='hunk'>@@ -34,6 +33,7 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;mach/board.h&gt;</div><div class='ctx'> #include &lt;mach/gpio.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -72,7 +72,7 @@ static struct at91_udc_data __initdata csb637_udc_data = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define CSB_FLASH_BASE	AT91_CHIPSELECT_0</div><div class='del'>-#define CSB_FLASH_SIZE	0x1000000</div><div class='add'>+#define CSB_FLASH_SIZE	SZ_16M</div><div class='ctx'> </div><div class='ctx'> static struct mtd_partition csb_flash_partitions[] = {</div><div class='ctx'> 	{</div><div class='head'>diff --git a/arch/arm/mach-at91/board-dk.c b/arch/arm/mach-at91/board-dk.c<br/>index 43e1aa7ecef7..0fd0f5bc77ea 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/board-dk.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-at91/board-dk.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/board-dk.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/board-dk.c</a></div><div class='hunk'>@@ -29,7 +29,6 @@</div><div class='ctx'> #include &lt;linux/spi/spi.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/physmap.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='hunk'>@@ -38,6 +37,7 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;mach/board.h&gt;</div><div class='ctx'> #include &lt;mach/gpio.h&gt;</div><div class='ctx'> #include &lt;mach/at91rm9200_mc.h&gt;</div><div class='hunk'>@@ -157,7 +157,7 @@ static struct atmel_nand_data __initdata dk_nand_data = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define DK_FLASH_BASE	AT91_CHIPSELECT_0</div><div class='del'>-#define DK_FLASH_SIZE	0x200000</div><div class='add'>+#define DK_FLASH_SIZE	SZ_2M</div><div class='ctx'> </div><div class='ctx'> static struct physmap_flash_data dk_flash_data = {</div><div class='ctx'> 	.width		= 2,</div><div class='head'>diff --git a/arch/arm/mach-at91/board-ecbat91.c b/arch/arm/mach-at91/board-ecbat91.c<br/>index bfeee8a2af28..1d69908617f0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/board-ecbat91.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-at91/board-ecbat91.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/board-ecbat91.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/board-ecbat91.c</a></div><div class='hunk'>@@ -86,7 +86,7 @@ static struct mtd_partition __initdata my_flash0_partitions[] =</div><div class='ctx'> 	{	/* 0x8400 */</div><div class='ctx'> 		.name	= "Darrell-loader",</div><div class='ctx'> 		.offset	= 0,</div><div class='del'>-		.size	= 12* 1056,</div><div class='add'>+		.size	= 12 * 1056,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.name	= "U-boot",</div><div class='head'>diff --git a/arch/arm/mach-at91/board-ek.c b/arch/arm/mach-at91/board-ek.c<br/>index 60626e7a3490..4cdfaac8e590 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/board-ek.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-at91/board-ek.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/board-ek.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/board-ek.c</a></div><div class='hunk'>@@ -29,7 +29,6 @@</div><div class='ctx'> #include &lt;linux/spi/spi.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/physmap.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='hunk'>@@ -38,6 +37,7 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;mach/board.h&gt;</div><div class='ctx'> #include &lt;mach/gpio.h&gt;</div><div class='ctx'> #include &lt;mach/at91rm9200_mc.h&gt;</div><div class='hunk'>@@ -116,7 +116,7 @@ static struct i2c_board_info __initdata ek_i2c_devices[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define EK_FLASH_BASE	AT91_CHIPSELECT_0</div><div class='del'>-#define EK_FLASH_SIZE	0x200000</div><div class='add'>+#define EK_FLASH_SIZE	SZ_2M</div><div class='ctx'> </div><div class='ctx'> static struct physmap_flash_data ek_flash_data = {</div><div class='ctx'> 	.width		= 2,</div><div class='head'>diff --git a/arch/arm/mach-at91/board-picotux200.c b/arch/arm/mach-at91/board-picotux200.c<br/>index dbc912d633c7..859727e7ea30 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/board-picotux200.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-at91/board-picotux200.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/board-picotux200.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/board-picotux200.c</a></div><div class='hunk'>@@ -105,7 +105,7 @@ static struct at91_mmc_data __initdata picotux200_mmc_data = {</div><div class='ctx'> // };</div><div class='ctx'> </div><div class='ctx'> #define PICOTUX200_FLASH_BASE	AT91_CHIPSELECT_0</div><div class='del'>-#define PICOTUX200_FLASH_SIZE	0x400000</div><div class='add'>+#define PICOTUX200_FLASH_SIZE	SZ_4M</div><div class='ctx'> </div><div class='ctx'> static struct physmap_flash_data picotux200_flash_data = {</div><div class='ctx'> 	.width	= 2,</div><div class='head'>diff --git a/arch/arm/mach-at91/board-qil-a9260.c b/arch/arm/mach-at91/board-qil-a9260.c<br/>index 4c28413426c2..cfb4571a2e27 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/board-qil-a9260.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-at91/board-qil-a9260.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/board-qil-a9260.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/board-qil-a9260.c</a></div><div class='hunk'>@@ -30,7 +30,6 @@</div><div class='ctx'> #include &lt;linux/input.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='hunk'>@@ -39,6 +38,7 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;mach/board.h&gt;</div><div class='ctx'> #include &lt;mach/gpio.h&gt;</div><div class='ctx'> #include &lt;mach/at91_shdwc.h&gt;</div><div class='hunk'>@@ -119,18 +119,18 @@ static struct at91_eth_data __initdata ek_macb_data = {</div><div class='ctx'> static struct mtd_partition __initdata ek_nand_partition[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.name	= "Uboot &amp; Kernel",</div><div class='del'>-		.offset	= 0x00000000,</div><div class='del'>-		.size	= 16 * 1024 * 1024,</div><div class='add'>+		.offset	= 0,</div><div class='add'>+		.size	= SZ_16M,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.name	= "Root FS",</div><div class='del'>-		.offset	= 0x01000000,</div><div class='del'>-		.size	= 120 * 1024 * 1024,</div><div class='add'>+		.offset	= MTDPART_OFS_NXTBLK,</div><div class='add'>+		.size	= 120 * SZ_1M,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.name	= "FS",</div><div class='del'>-		.offset	= 0x08800000,</div><div class='del'>-		.size	= 120 * 1024 * 1024,</div><div class='add'>+		.offset	= MTDPART_OFS_NXTBLK,</div><div class='add'>+		.size	= 120 * SZ_1M,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-at91/board-sam9-l9260.c b/arch/arm/mach-at91/board-sam9-l9260.c<br/>index e4910cb26c16..99bb4cc23a09 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/board-sam9-l9260.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-at91/board-sam9-l9260.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/board-sam9-l9260.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/board-sam9-l9260.c</a></div><div class='hunk'>@@ -126,11 +126,11 @@ static struct mtd_partition __initdata ek_nand_partition[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.name	= "Bootloader Area",</div><div class='ctx'> 		.offset	= 0,</div><div class='del'>-		.size	= 10 * 1024 * 1024,</div><div class='add'>+		.size	= 10 * SZ_1M,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.name	= "User Area",</div><div class='del'>-		.offset	= 10 * 1024 * 1024,</div><div class='add'>+		.offset	= MTDPART_OFS_NXTBLK,</div><div class='ctx'> 		.size	= MTDPART_SIZ_FULL,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/mach-at91/board-sam9260ek.c b/arch/arm/mach-at91/board-sam9260ek.c<br/>index cb20e70b3b06..b49eb6e4918a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/board-sam9260ek.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-at91/board-sam9260ek.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/board-sam9260ek.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/board-sam9260ek.c</a></div><div class='hunk'>@@ -27,8 +27,10 @@</div><div class='ctx'> #include &lt;linux/spi/spi.h&gt;</div><div class='ctx'> #include &lt;linux/spi/at73c213.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/i2c/at24.h&gt;</div><div class='add'>+#include &lt;linux/gpio_keys.h&gt;</div><div class='add'>+#include &lt;linux/input.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='hunk'>@@ -37,6 +39,7 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;mach/board.h&gt;</div><div class='ctx'> #include &lt;mach/gpio.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -163,11 +166,11 @@ static struct mtd_partition __initdata ek_nand_partition[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.name	= "Partition 1",</div><div class='ctx'> 		.offset	= 0,</div><div class='del'>-		.size	= 256 * 1024,</div><div class='add'>+		.size	= SZ_256K,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.name	= "Partition 2",</div><div class='del'>-		.offset	= 256 * 1024,</div><div class='add'>+		.offset	= MTDPART_OFS_NXTBLK,</div><div class='ctx'> 		.size	= MTDPART_SIZ_FULL,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='hunk'>@@ -222,6 +225,73 @@ static struct gpio_led ek_leds[] = {</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * I2C devices</div><div class='add'>+ */</div><div class='add'>+static struct at24_platform_data at24c512 = {</div><div class='add'>+	.byte_len	= SZ_512K / 8,</div><div class='add'>+	.page_size	= 128,</div><div class='add'>+	.flags		= AT24_FLAG_ADDR16,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct i2c_board_info __initdata ek_i2c_devices[] = {</div><div class='add'>+	{</div><div class='add'>+		I2C_BOARD_INFO("24c512", 0x50),</div><div class='add'>+		.platform_data = &amp;at24c512,</div><div class='add'>+	},</div><div class='add'>+	/* more devices can be added using expansion connectors */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * GPIO Buttons</div><div class='add'>+ */</div><div class='add'>+#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)</div><div class='add'>+static struct gpio_keys_button ek_buttons[] = {</div><div class='add'>+	{</div><div class='add'>+		.gpio		= AT91_PIN_PA30,</div><div class='add'>+		.code		= BTN_3,</div><div class='add'>+		.desc		= "Button 3",</div><div class='add'>+		.active_low	= 1,</div><div class='add'>+		.wakeup		= 1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.gpio		= AT91_PIN_PA31,</div><div class='add'>+		.code		= BTN_4,</div><div class='add'>+		.desc		= "Button 4",</div><div class='add'>+		.active_low	= 1,</div><div class='add'>+		.wakeup		= 1,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct gpio_keys_platform_data ek_button_data = {</div><div class='add'>+	.buttons	= ek_buttons,</div><div class='add'>+	.nbuttons	= ARRAY_SIZE(ek_buttons),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device ek_button_device = {</div><div class='add'>+	.name		= "gpio-keys",</div><div class='add'>+	.id		= -1,</div><div class='add'>+	.num_resources	= 0,</div><div class='add'>+	.dev		= {</div><div class='add'>+		.platform_data	= &amp;ek_button_data,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init ek_add_device_buttons(void)</div><div class='add'>+{</div><div class='add'>+	at91_set_gpio_input(AT91_PIN_PA30, 1);	/* btn3 */</div><div class='add'>+	at91_set_deglitch(AT91_PIN_PA30, 1);</div><div class='add'>+	at91_set_gpio_input(AT91_PIN_PA31, 1);	/* btn4 */</div><div class='add'>+	at91_set_deglitch(AT91_PIN_PA31, 1);</div><div class='add'>+</div><div class='add'>+	platform_device_register(&amp;ek_button_device);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static void __init ek_add_device_buttons(void) {}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> static void __init ek_board_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* Serial */</div><div class='hunk'>@@ -239,12 +309,14 @@ static void __init ek_board_init(void)</div><div class='ctx'> 	/* MMC */</div><div class='ctx'> 	at91_add_device_mmc(0, &amp;ek_mmc_data);</div><div class='ctx'> 	/* I2C */</div><div class='del'>-	at91_add_device_i2c(NULL, 0);</div><div class='add'>+	at91_add_device_i2c(ek_i2c_devices, ARRAY_SIZE(ek_i2c_devices));</div><div class='ctx'> 	/* SSC (to AT73C213) */</div><div class='ctx'> 	at73c213_set_clk(&amp;at73c213_data);</div><div class='ctx'> 	at91_add_device_ssc(AT91SAM9260_ID_SSC, ATMEL_SSC_TX);</div><div class='ctx'> 	/* LEDs */</div><div class='ctx'> 	at91_gpio_leds(ek_leds, ARRAY_SIZE(ek_leds));</div><div class='add'>+	/* Push Buttons */</div><div class='add'>+	ek_add_device_buttons();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> MACHINE_START(AT91SAM9260EK, "Atmel AT91SAM9260-EK")</div><div class='head'>diff --git a/arch/arm/mach-at91/board-sam9261ek.c b/arch/arm/mach-at91/board-sam9261ek.c<br/>index 1a9963b811c7..4977409d4fc6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/board-sam9261ek.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-at91/board-sam9261ek.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/board-sam9261ek.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/board-sam9261ek.c</a></div><div class='hunk'>@@ -35,7 +35,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;video/atmel_lcdc.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='hunk'>@@ -44,6 +43,7 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;mach/board.h&gt;</div><div class='ctx'> #include &lt;mach/gpio.h&gt;</div><div class='ctx'> #include &lt;mach/at91sam9_smc.h&gt;</div><div class='hunk'>@@ -168,11 +168,11 @@ static struct mtd_partition __initdata ek_nand_partition[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.name	= "Partition 1",</div><div class='ctx'> 		.offset	= 0,</div><div class='del'>-		.size	= 256 * 1024,</div><div class='add'>+		.size	= SZ_256K,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.name	= "Partition 2",</div><div class='del'>-		.offset	= 256 * 1024 ,</div><div class='add'>+		.offset	= MTDPART_OFS_NXTBLK,</div><div class='ctx'> 		.size	= MTDPART_SIZ_FULL,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='hunk'>@@ -435,24 +435,28 @@ static struct gpio_keys_button ek_buttons[] = {</div><div class='ctx'> 		.code		= BTN_0,</div><div class='ctx'> 		.desc		= "Button 0",</div><div class='ctx'> 		.active_low	= 1,</div><div class='add'>+		.wakeup		= 1,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.gpio		= AT91_PIN_PA26,</div><div class='ctx'> 		.code		= BTN_1,</div><div class='ctx'> 		.desc		= "Button 1",</div><div class='ctx'> 		.active_low	= 1,</div><div class='add'>+		.wakeup		= 1,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.gpio		= AT91_PIN_PA25,</div><div class='ctx'> 		.code		= BTN_2,</div><div class='ctx'> 		.desc		= "Button 2",</div><div class='ctx'> 		.active_low	= 1,</div><div class='add'>+		.wakeup		= 1,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.gpio		= AT91_PIN_PA24,</div><div class='ctx'> 		.code		= BTN_3,</div><div class='ctx'> 		.desc		= "Button 3",</div><div class='ctx'> 		.active_low	= 1,</div><div class='add'>+		.wakeup		= 1,</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -472,13 +476,13 @@ static struct platform_device ek_button_device = {</div><div class='ctx'> </div><div class='ctx'> static void __init ek_add_device_buttons(void)</div><div class='ctx'> {</div><div class='del'>-	at91_set_gpio_input(AT91_PIN_PA27, 0);	/* btn0 */</div><div class='add'>+	at91_set_gpio_input(AT91_PIN_PA27, 1);	/* btn0 */</div><div class='ctx'> 	at91_set_deglitch(AT91_PIN_PA27, 1);</div><div class='del'>-	at91_set_gpio_input(AT91_PIN_PA26, 0);	/* btn1 */</div><div class='add'>+	at91_set_gpio_input(AT91_PIN_PA26, 1);	/* btn1 */</div><div class='ctx'> 	at91_set_deglitch(AT91_PIN_PA26, 1);</div><div class='del'>-	at91_set_gpio_input(AT91_PIN_PA25, 0);	/* btn2 */</div><div class='add'>+	at91_set_gpio_input(AT91_PIN_PA25, 1);	/* btn2 */</div><div class='ctx'> 	at91_set_deglitch(AT91_PIN_PA25, 1);</div><div class='del'>-	at91_set_gpio_input(AT91_PIN_PA24, 0);	/* btn3 */</div><div class='add'>+	at91_set_gpio_input(AT91_PIN_PA24, 1);	/* btn3 */</div><div class='ctx'> 	at91_set_deglitch(AT91_PIN_PA24, 1);</div><div class='ctx'> </div><div class='ctx'> 	platform_device_register(&amp;ek_button_device);</div><div class='head'>diff --git a/arch/arm/mach-at91/board-sam9263ek.c b/arch/arm/mach-at91/board-sam9263ek.c<br/>index b1d11960a735..8354015c6a23 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/board-sam9263ek.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-at91/board-sam9263ek.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/board-sam9263ek.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/board-sam9263ek.c</a></div><div class='hunk'>@@ -26,13 +26,14 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/spi/spi.h&gt;</div><div class='ctx'> #include &lt;linux/spi/ads7846.h&gt;</div><div class='add'>+#include &lt;linux/i2c/at24.h&gt;</div><div class='ctx'> #include &lt;linux/fb.h&gt;</div><div class='ctx'> #include &lt;linux/gpio_keys.h&gt;</div><div class='ctx'> #include &lt;linux/input.h&gt;</div><div class='add'>+#include &lt;linux/leds.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;video/atmel_lcdc.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='hunk'>@@ -41,6 +42,7 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;mach/board.h&gt;</div><div class='ctx'> #include &lt;mach/gpio.h&gt;</div><div class='ctx'> #include &lt;mach/at91sam9_smc.h&gt;</div><div class='hunk'>@@ -172,11 +174,11 @@ static struct mtd_partition __initdata ek_nand_partition[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.name	= "Partition 1",</div><div class='ctx'> 		.offset	= 0,</div><div class='del'>-		.size	= 64 * 1024 * 1024,</div><div class='add'>+		.size	= SZ_64M,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.name	= "Partition 2",</div><div class='del'>-		.offset	= 64 * 1024 * 1024,</div><div class='add'>+		.offset	= MTDPART_OFS_NXTBLK,</div><div class='ctx'> 		.size	= MTDPART_SIZ_FULL,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='hunk'>@@ -203,12 +205,30 @@ static struct atmel_nand_data __initdata ek_nand_data = {</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * I2C devices</div><div class='add'>+ */</div><div class='add'>+static struct at24_platform_data at24c512 = {</div><div class='add'>+	.byte_len	= SZ_512K / 8,</div><div class='add'>+	.page_size	= 128,</div><div class='add'>+	.flags		= AT24_FLAG_ADDR16,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static struct i2c_board_info __initdata ek_i2c_devices[] = {</div><div class='add'>+	{</div><div class='add'>+		I2C_BOARD_INFO("24c512", 0x50),</div><div class='add'>+		.platform_data = &amp;at24c512,</div><div class='add'>+	},</div><div class='add'>+	/* more devices can be added using expansion connectors */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * LCD Controller</div><div class='ctx'>  */</div><div class='ctx'> #if defined(CONFIG_FB_ATMEL) || defined(CONFIG_FB_ATMEL_MODULE)</div><div class='ctx'> static struct fb_videomode at91_tft_vga_modes[] = {</div><div class='ctx'> 	{</div><div class='del'>-	        .name           = "TX09D50VM1CCA @ 60",</div><div class='add'>+		.name		= "TX09D50VM1CCA @ 60",</div><div class='ctx'> 		.refresh	= 60,</div><div class='ctx'> 		.xres		= 240,		.yres		= 320,</div><div class='ctx'> 		.pixclock	= KHZ2PICOS(4965),</div><div class='hunk'>@@ -224,7 +244,7 @@ static struct fb_videomode at91_tft_vga_modes[] = {</div><div class='ctx'> </div><div class='ctx'> static struct fb_monspecs at91fb_default_monspecs = {</div><div class='ctx'> 	.manufacturer	= "HIT",</div><div class='del'>-	.monitor        = "TX09D70VM1CCA",</div><div class='add'>+	.monitor	= "TX09D70VM1CCA",</div><div class='ctx'> </div><div class='ctx'> 	.modedb		= at91_tft_vga_modes,</div><div class='ctx'> 	.modedb_len	= ARRAY_SIZE(at91_tft_vga_modes),</div><div class='hunk'>@@ -235,7 +255,7 @@ static struct fb_monspecs at91fb_default_monspecs = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define AT91SAM9263_DEFAULT_LCDCON2 	(ATMEL_LCDC_MEMOR_LITTLE \</div><div class='del'>-					| ATMEL_LCDC_DISTYPE_TFT    \</div><div class='add'>+					| ATMEL_LCDC_DISTYPE_TFT \</div><div class='ctx'> 					| ATMEL_LCDC_CLKMOD_ALWAYSACTIVE)</div><div class='ctx'> </div><div class='ctx'> static void at91_lcdc_power_control(int on)</div><div class='hunk'>@@ -277,7 +297,7 @@ static struct gpio_keys_button ek_buttons[] = {</div><div class='ctx'> 		.active_low	= 1,</div><div class='ctx'> 		.desc		= "right_click",</div><div class='ctx'> 		.wakeup		= 1,</div><div class='del'>-	},</div><div class='add'>+	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct gpio_keys_platform_data ek_button_data = {</div><div class='hunk'>@@ -296,9 +316,9 @@ static struct platform_device ek_button_device = {</div><div class='ctx'> </div><div class='ctx'> static void __init ek_add_device_buttons(void)</div><div class='ctx'> {</div><div class='del'>-	at91_set_GPIO_periph(AT91_PIN_PC5, 0);	/* left button */</div><div class='add'>+	at91_set_GPIO_periph(AT91_PIN_PC5, 1);	/* left button */</div><div class='ctx'> 	at91_set_deglitch(AT91_PIN_PC5, 1);</div><div class='del'>-	at91_set_GPIO_periph(AT91_PIN_PC4, 0);	/* right button */</div><div class='add'>+	at91_set_GPIO_periph(AT91_PIN_PC4, 1);	/* right button */</div><div class='ctx'> 	at91_set_deglitch(AT91_PIN_PC4, 1);</div><div class='ctx'> </div><div class='ctx'> 	platform_device_register(&amp;ek_button_device);</div><div class='hunk'>@@ -320,25 +340,32 @@ static struct atmel_ac97_data ek_ac97_data = {</div><div class='ctx'>  * LEDs ... these could all be PWM-driven, for variable brightness</div><div class='ctx'>  */</div><div class='ctx'> static struct gpio_led ek_leds[] = {</div><div class='del'>-	{	/* "left" led, green, userled1, pwm1 */</div><div class='del'>-		.name			= "ds1",</div><div class='del'>-		.gpio			= AT91_PIN_PB8,</div><div class='del'>-		.active_low		= 1,</div><div class='del'>-		.default_trigger	= "mmc0",</div><div class='del'>-	},</div><div class='del'>-	{	/* "right" led, green, userled2, pwm2 */</div><div class='add'>+	{	/* "right" led, green, userled2 (could be driven by pwm2) */</div><div class='ctx'> 		.name			= "ds2",</div><div class='ctx'> 		.gpio			= AT91_PIN_PC29,</div><div class='ctx'> 		.active_low		= 1,</div><div class='ctx'> 		.default_trigger	= "nand-disk",</div><div class='ctx'> 	},</div><div class='del'>-	{	/* "power" led, yellow, pwm0 */</div><div class='add'>+	{	/* "power" led, yellow (could be driven by pwm0) */</div><div class='ctx'> 		.name			= "ds3",</div><div class='ctx'> 		.gpio			= AT91_PIN_PB7,</div><div class='ctx'> 		.default_trigger	= "heartbeat",</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * PWM Leds</div><div class='add'>+ */</div><div class='add'>+static struct gpio_led ek_pwm_led[] = {</div><div class='add'>+	/* For now only DS1 is PWM-driven (by pwm1) */</div><div class='add'>+	{</div><div class='add'>+		.name			= "ds1",</div><div class='add'>+		.gpio			= 1,	/* is PWM channel number */</div><div class='add'>+		.active_low		= 1,</div><div class='add'>+		.default_trigger	= "none",</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> static void __init ek_board_init(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -360,7 +387,7 @@ static void __init ek_board_init(void)</div><div class='ctx'> 	/* NAND */</div><div class='ctx'> 	at91_add_device_nand(&amp;ek_nand_data);</div><div class='ctx'> 	/* I2C */</div><div class='del'>-	at91_add_device_i2c(NULL, 0);</div><div class='add'>+	at91_add_device_i2c(ek_i2c_devices, ARRAY_SIZE(ek_i2c_devices));</div><div class='ctx'> 	/* LCD Controller */</div><div class='ctx'> 	at91_add_device_lcdc(&amp;ek_lcdc_data);</div><div class='ctx'> 	/* Push Buttons */</div><div class='hunk'>@@ -369,6 +396,7 @@ static void __init ek_board_init(void)</div><div class='ctx'> 	at91_add_device_ac97(&amp;ek_ac97_data);</div><div class='ctx'> 	/* LEDs */</div><div class='ctx'> 	at91_gpio_leds(ek_leds, ARRAY_SIZE(ek_leds));</div><div class='add'>+	at91_pwm_leds(ek_pwm_led, ARRAY_SIZE(ek_pwm_led));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> MACHINE_START(AT91SAM9263EK, "Atmel AT91SAM9263-EK")</div><div class='head'>diff --git a/arch/arm/mach-at91/board-sam9g20ek.c b/arch/arm/mach-at91/board-sam9g20ek.c<br/>index d4eba5c0ce02..b588ead14d68 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/board-sam9g20ek.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-at91/board-sam9g20ek.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/board-sam9g20ek.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/board-sam9g20ek.c</a></div><div class='hunk'>@@ -122,16 +122,16 @@ static struct mtd_partition __initdata ek_nand_partition[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.name   = "Bootstrap",</div><div class='ctx'> 		.offset = 0,</div><div class='del'>-		.size   = 4 * 1024 * 1024,</div><div class='add'>+		.size   = 4 * SZ_1M,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.name	= "Partition 1",</div><div class='del'>-		.offset	= 4 * 1024 * 1024,</div><div class='del'>-		.size	= 60 * 1024 * 1024,</div><div class='add'>+		.offset	= MTDPART_OFS_NXTBLK,</div><div class='add'>+		.size	= 60 * SZ_1M,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.name	= "Partition 2",</div><div class='del'>-		.offset	= 64 * 1024 * 1024,</div><div class='add'>+		.offset	= MTDPART_OFS_NXTBLK,</div><div class='ctx'> 		.size	= MTDPART_SIZ_FULL,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/mach-at91/board-sam9rlek.c b/arch/arm/mach-at91/board-sam9rlek.c<br/>index c6dce49c388c..270851864308 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/board-sam9rlek.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-at91/board-sam9rlek.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/board-sam9rlek.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/board-sam9rlek.c</a></div><div class='hunk'>@@ -18,7 +18,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;video/atmel_lcdc.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='hunk'>@@ -27,6 +26,7 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;mach/board.h&gt;</div><div class='ctx'> #include &lt;mach/gpio.h&gt;</div><div class='ctx'> #include &lt;mach/at91sam9_smc.h&gt;</div><div class='hunk'>@@ -81,11 +81,11 @@ static struct mtd_partition __initdata ek_nand_partition[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.name	= "Partition 1",</div><div class='ctx'> 		.offset	= 0,</div><div class='del'>-		.size	= 256 * 1024,</div><div class='add'>+		.size	= SZ_256K,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.name	= "Partition 2",</div><div class='del'>-		.offset	= 256 * 1024 ,</div><div class='add'>+		.offset	= MTDPART_OFS_NXTBLK,</div><div class='ctx'> 		.size	= MTDPART_SIZ_FULL,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='hunk'>@@ -195,6 +195,8 @@ static void __init ek_board_init(void)</div><div class='ctx'> 	at91_add_device_mmc(0, &amp;ek_mmc_data);</div><div class='ctx'> 	/* LCD Controller */</div><div class='ctx'> 	at91_add_device_lcdc(&amp;ek_lcdc_data);</div><div class='add'>+	/* Touch Screen Controller */</div><div class='add'>+	at91_add_device_tsadcc();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> MACHINE_START(AT91SAM9RLEK, "Atmel AT91SAM9RL-EK")</div><div class='head'>diff --git a/arch/arm/mach-at91/board-usb-a9260.c b/arch/arm/mach-at91/board-usb-a9260.c<br/>index f9d0b65da40b..7c350357333a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/board-usb-a9260.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-at91/board-usb-a9260.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/board-usb-a9260.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/board-usb-a9260.c</a></div><div class='hunk'>@@ -30,7 +30,6 @@</div><div class='ctx'> #include &lt;linux/input.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='hunk'>@@ -39,6 +38,7 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;mach/board.h&gt;</div><div class='ctx'> #include &lt;mach/gpio.h&gt;</div><div class='ctx'> #include &lt;mach/at91_shdwc.h&gt;</div><div class='hunk'>@@ -93,18 +93,18 @@ static struct at91_eth_data __initdata ek_macb_data = {</div><div class='ctx'> static struct mtd_partition __initdata ek_nand_partition[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.name	= "Uboot &amp; Kernel",</div><div class='del'>-		.offset	= 0x00000000,</div><div class='del'>-		.size	= 16 * 1024 * 1024,</div><div class='add'>+		.offset	= 0,</div><div class='add'>+		.size	= SZ_16M,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.name	= "Root FS",</div><div class='del'>-		.offset	= 0x01000000,</div><div class='del'>-		.size	= 120 * 1024 * 1024,</div><div class='add'>+		.offset	= MTDPART_OFS_NXTBLK,</div><div class='add'>+		.size	= 120 * SZ_1M,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.name	= "FS",</div><div class='del'>-		.offset	= 0x08800000,</div><div class='del'>-		.size	= 120 * 1024 * 1024,</div><div class='add'>+		.offset	= MTDPART_OFS_NXTBLK,</div><div class='add'>+		.size	= 120 * SZ_1M,</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-at91/board-usb-a9263.c b/arch/arm/mach-at91/board-usb-a9263.c<br/>index 673e5c27214d..391b566c4571 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/board-usb-a9263.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-at91/board-usb-a9263.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/board-usb-a9263.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/board-usb-a9263.c</a></div><div class='hunk'>@@ -29,7 +29,6 @@</div><div class='ctx'> #include &lt;linux/gpio_keys.h&gt;</div><div class='ctx'> #include &lt;linux/input.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='hunk'>@@ -38,6 +37,7 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;mach/board.h&gt;</div><div class='ctx'> #include &lt;mach/gpio.h&gt;</div><div class='ctx'> #include &lt;mach/at91_shdwc.h&gt;</div><div class='hunk'>@@ -106,18 +106,18 @@ static struct at91_eth_data __initdata ek_macb_data = {</div><div class='ctx'> static struct mtd_partition __initdata ek_nand_partition[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.name	= "Linux Kernel",</div><div class='del'>-		.offset	= 0x00000000,</div><div class='del'>-		.size	= 16 * 1024 * 1024,</div><div class='add'>+		.offset	= 0,</div><div class='add'>+		.size	= SZ_16M,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.name	= "Root FS",</div><div class='del'>-		.offset	= 0x01000000,</div><div class='del'>-		.size	= 120 * 1024 * 1024,</div><div class='add'>+		.offset	= MTDPART_OFS_NXTBLK,</div><div class='add'>+		.size	= 120 * SZ_1M,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.name	= "FS",</div><div class='del'>-		.offset	= 0x08800000,</div><div class='del'>-		.size	= 120 * 1024 * 1024,</div><div class='add'>+		.offset	= MTDPART_OFS_NXTBLK,</div><div class='add'>+		.size	= 120 * SZ_1M,</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-at91/board-yl-9200.c b/arch/arm/mach-at91/board-yl-9200.c<br/>index 36b380aad006..e22bf051f835 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/board-yl-9200.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-at91/board-yl-9200.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/board-yl-9200.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/board-yl-9200.c</a></div><div class='hunk'>@@ -33,7 +33,6 @@</div><div class='ctx'> #include &lt;linux/gpio_keys.h&gt;</div><div class='ctx'> #include &lt;linux/input.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='hunk'>@@ -42,6 +41,7 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;mach/board.h&gt;</div><div class='ctx'> #include &lt;mach/gpio.h&gt;</div><div class='ctx'> #include &lt;mach/at91rm9200_mc.h&gt;</div><div class='hunk'>@@ -150,27 +150,27 @@ static struct mtd_partition __initdata yl9200_nand_partition[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.name	= "AT91 NAND partition 1, boot",</div><div class='ctx'> 		.offset	= 0,</div><div class='del'>-		.size	= 1 * SZ_256K</div><div class='add'>+		.size	= SZ_256K</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.name	= "AT91 NAND partition 2, kernel",</div><div class='del'>-		.offset	= 1 * SZ_256K,</div><div class='del'>-		.size	= 2 * SZ_1M - 1 * SZ_256K</div><div class='add'>+		.offset	= MTDPART_OFS_NXTBLK,</div><div class='add'>+		.size	= (2 * SZ_1M) - SZ_256K</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.name	= "AT91 NAND partition 3, filesystem",</div><div class='del'>-		.offset	= 2 * SZ_1M,</div><div class='add'>+		.offset	= MTDPART_OFS_NXTBLK,</div><div class='ctx'> 		.size	= 14 * SZ_1M</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.name	= "AT91 NAND partition 4, storage",</div><div class='del'>-		.offset	= 16 * SZ_1M,</div><div class='del'>-		.size	= 16 * SZ_1M</div><div class='add'>+		.offset	= MTDPART_OFS_NXTBLK,</div><div class='add'>+		.size	= SZ_16M</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.name	= "AT91 NAND partition 5, ext-fs",</div><div class='del'>-		.offset	= 32 * SZ_1M,</div><div class='del'>-		.size	= 32 * SZ_1M</div><div class='add'>+		.offset	= MTDPART_OFS_NXTBLK,</div><div class='add'>+		.size	= SZ_32M</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -193,24 +193,24 @@ static struct atmel_nand_data __initdata yl9200_nand_data = {</div><div class='ctx'>  * NOR Flash</div><div class='ctx'>  */</div><div class='ctx'> #define YL9200_FLASH_BASE	AT91_CHIPSELECT_0</div><div class='del'>-#define YL9200_FLASH_SIZE	0x1000000</div><div class='add'>+#define YL9200_FLASH_SIZE	SZ_16M</div><div class='ctx'> </div><div class='ctx'> static struct mtd_partition yl9200_flash_partitions[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.name		= "Bootloader",</div><div class='del'>-		.size		= 0x00040000,</div><div class='ctx'> 		.offset		= 0,</div><div class='add'>+		.size		= SZ_256K,</div><div class='ctx'> 		.mask_flags	= MTD_WRITEABLE,	/* force read-only */</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.name		= "Kernel",</div><div class='del'>-		.size		= 0x001C0000,</div><div class='del'>-		.offset		= 0x00040000,</div><div class='add'>+		.offset		= MTDPART_OFS_NXTBLK,</div><div class='add'>+		.size		= (2 * SZ_1M) - SZ_256K</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.name		= "Filesystem",</div><div class='del'>-		.size		= MTDPART_SIZ_FULL,</div><div class='del'>-		.offset		= 0x00200000</div><div class='add'>+		.offset		= MTDPART_OFS_NXTBLK,</div><div class='add'>+		.size		= MTDPART_SIZ_FULL</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -390,10 +390,6 @@ static struct spi_board_info yl9200_spi_devices[] = {</div><div class='ctx'> #if defined(CONFIG_FB_S1D135XX) || defined(CONFIG_FB_S1D13XXX_MODULE)</div><div class='ctx'> #include &lt;video/s1d13xxxfb.h&gt;</div><div class='ctx'> </div><div class='del'>-#define AT91_FB_REG_BASE	0x80000000L</div><div class='del'>-#define AT91_FB_REG_SIZE	0x200</div><div class='del'>-#define AT91_FB_VMEM_BASE	0x80200000L</div><div class='del'>-#define AT91_FB_VMEM_SIZE	0x200000L</div><div class='ctx'> </div><div class='ctx'> static void __init yl9200_init_video(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -516,29 +512,33 @@ static struct s1d13xxxfb_regval yl9200_s1dfb_initregs[] =</div><div class='ctx'> 	{S1DREG_COM_DISP_MODE,		0x01},	/* Display Mode Register, LCD only*/</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static u64 s1dfb_dmamask = DMA_BIT_MASK(32);</div><div class='del'>-</div><div class='ctx'> static struct s1d13xxxfb_pdata yl9200_s1dfb_pdata = {</div><div class='ctx'> 	.initregs		= yl9200_s1dfb_initregs,</div><div class='ctx'> 	.initregssize		= ARRAY_SIZE(yl9200_s1dfb_initregs),</div><div class='ctx'> 	.platform_init_video	= yl9200_init_video,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define YL9200_FB_REG_BASE	AT91_CHIPSELECT_7</div><div class='add'>+#define YL9200_FB_VMEM_BASE	YL9200_FB_REG_BASE + SZ_2M</div><div class='add'>+#define YL9200_FB_VMEM_SIZE	SZ_2M</div><div class='add'>+</div><div class='ctx'> static struct resource yl9200_s1dfb_resource[] = {</div><div class='ctx'> 	[0] = {	/* video mem */</div><div class='ctx'> 		.name	= "s1d13xxxfb memory",</div><div class='del'>-		.start	= AT91_FB_VMEM_BASE,</div><div class='del'>-		.end	= AT91_FB_VMEM_BASE + AT91_FB_VMEM_SIZE -1,</div><div class='add'>+		.start	= YL9200_FB_VMEM_BASE,</div><div class='add'>+		.end	= YL9200_FB_VMEM_BASE + YL9200_FB_VMEM_SIZE -1,</div><div class='ctx'> 		.flags	= IORESOURCE_MEM,</div><div class='ctx'> 	},</div><div class='ctx'> 	[1] = {	/* video registers */</div><div class='ctx'> 		.name	= "s1d13xxxfb registers",</div><div class='del'>-		.start	= AT91_FB_REG_BASE,</div><div class='del'>-		.end	= AT91_FB_REG_BASE + AT91_FB_REG_SIZE -1,</div><div class='add'>+		.start	= YL9200_FB_REG_BASE,</div><div class='add'>+		.end	= YL9200_FB_REG_BASE + SZ_512 -1,</div><div class='ctx'> 		.flags	= IORESOURCE_MEM,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static u64 s1dfb_dmamask = DMA_BIT_MASK(32);</div><div class='add'>+</div><div class='ctx'> static struct platform_device yl9200_s1dfb_device = {</div><div class='ctx'> 	.name		= "s1d13806fb",</div><div class='ctx'> 	.id		= -1,</div><div class='head'>diff --git a/arch/arm/mach-at91/clock.c b/arch/arm/mach-at91/clock.c<br/>index f5c2847161f5..e4345106ee57 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/clock.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-at91/clock.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/clock.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/clock.c</a></div><div class='hunk'>@@ -22,8 +22,7 @@</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;mach/at91_pmc.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-at91/gpio.c b/arch/arm/mach-at91/gpio.c<br/>index 8392d5b517f1..7e5ebb5bdd17 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/gpio.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-at91/gpio.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/gpio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/gpio.c</a></div><div class='hunk'>@@ -18,8 +18,8 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;mach/at91_pio.h&gt;</div><div class='ctx'> #include &lt;mach/gpio.h&gt;</div><div class='hunk'>@@ -404,7 +404,6 @@ static void gpio_irq_handler(unsigned irq, struct irq_desc *desc)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		pin = bank-&gt;chipbase;</div><div class='del'>-		gpio = &amp;irq_desc[pin];</div><div class='ctx'> </div><div class='ctx'> 		while (isr) {</div><div class='ctx'> 			if (isr &amp; 1) {</div><div class='hunk'>@@ -417,7 +416,7 @@ static void gpio_irq_handler(unsigned irq, struct irq_desc *desc)</div><div class='ctx'> 					gpio_irq_mask(pin);</div><div class='ctx'> 				}</div><div class='ctx'> 				else</div><div class='del'>-					desc_handle_irq(pin, gpio);</div><div class='add'>+					generic_handle_irq(pin);</div><div class='ctx'> 			}</div><div class='ctx'> 			pin++;</div><div class='ctx'> 			gpio++;</div><div class='head'>diff --git a/arch/arm/mach-at91/include/mach/at91_pit.h b/arch/arm/mach-at91/include/mach/at91_pit.h<br/>index 0448ac36eadb..974d0bd05b5b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/include/mach/at91_pit.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-at91/include/mach/at91_pit.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/include/mach/at91_pit.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/include/mach/at91_pit.h</a></div><div class='hunk'>@@ -1,6 +1,9 @@</div><div class='ctx'> /*</div><div class='ctx'>  * arch/arm/mach-at91/include/mach/at91_pit.h</div><div class='ctx'>  *</div><div class='add'>+ * Copyright (C) 2007 Andrew Victor</div><div class='add'>+ * Copyright (C) 2007 Atmel Corporation.</div><div class='add'>+ *</div><div class='ctx'>  * Periodic Interval Timer (PIT) - System peripherals regsters.</div><div class='ctx'>  * Based on AT91SAM9261 datasheet revision D.</div><div class='ctx'>  *</div><div class='head'>diff --git a/arch/arm/mach-at91/include/mach/at91_rstc.h b/arch/arm/mach-at91/include/mach/at91_rstc.h<br/>index 7cd1b39aaa43..cbd2bf052c1f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/include/mach/at91_rstc.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-at91/include/mach/at91_rstc.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/include/mach/at91_rstc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/include/mach/at91_rstc.h</a></div><div class='hunk'>@@ -1,6 +1,9 @@</div><div class='ctx'> /*</div><div class='ctx'>  * arch/arm/mach-at91/include/mach/at91_rstc.h</div><div class='ctx'>  *</div><div class='add'>+ * Copyright (C) 2007 Andrew Victor</div><div class='add'>+ * Copyright (C) 2007 Atmel Corporation.</div><div class='add'>+ *</div><div class='ctx'>  * Reset Controller (RSTC) - System peripherals regsters.</div><div class='ctx'>  * Based on AT91SAM9261 datasheet revision D.</div><div class='ctx'>  *</div><div class='head'>diff --git a/arch/arm/mach-at91/include/mach/at91_rtt.h b/arch/arm/mach-at91/include/mach/at91_rtt.h<br/>index 71782e5d2159..7ec75de8bbb6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/include/mach/at91_rtt.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-at91/include/mach/at91_rtt.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/include/mach/at91_rtt.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/include/mach/at91_rtt.h</a></div><div class='hunk'>@@ -1,6 +1,9 @@</div><div class='ctx'> /*</div><div class='ctx'>  * arch/arm/mach-at91/include/mach/at91_rtt.h</div><div class='ctx'>  *</div><div class='add'>+ * Copyright (C) 2007 Andrew Victor</div><div class='add'>+ * Copyright (C) 2007 Atmel Corporation.</div><div class='add'>+ *</div><div class='ctx'>  * Real-time Timer (RTT) - System peripherals regsters.</div><div class='ctx'>  * Based on AT91SAM9261 datasheet revision D.</div><div class='ctx'>  *</div><div class='head'>diff --git a/arch/arm/mach-at91/include/mach/at91_shdwc.h b/arch/arm/mach-at91/include/mach/at91_shdwc.h<br/>index 60be5ae624f1..c4ce07e8a8fa 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/include/mach/at91_shdwc.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-at91/include/mach/at91_shdwc.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/include/mach/at91_shdwc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/include/mach/at91_shdwc.h</a></div><div class='hunk'>@@ -1,6 +1,9 @@</div><div class='ctx'> /*</div><div class='ctx'>  * arch/arm/mach-at91/include/mach/at91_shdwc.h</div><div class='ctx'>  *</div><div class='add'>+ * Copyright (C) 2007 Andrew Victor</div><div class='add'>+ * Copyright (C) 2007 Atmel Corporation.</div><div class='add'>+ *</div><div class='ctx'>  * Shutdown Controller (SHDWC) - System peripherals regsters.</div><div class='ctx'>  * Based on AT91SAM9261 datasheet revision D.</div><div class='ctx'>  *</div><div class='head'>diff --git a/arch/arm/mach-at91/include/mach/at91_wdt.h b/arch/arm/mach-at91/include/mach/at91_wdt.h<br/>index 973b4526a98e..fecc2e9f0ca8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/include/mach/at91_wdt.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-at91/include/mach/at91_wdt.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/include/mach/at91_wdt.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/include/mach/at91_wdt.h</a></div><div class='hunk'>@@ -1,6 +1,9 @@</div><div class='ctx'> /*</div><div class='ctx'>  * arch/arm/mach-at91/include/mach/at91_wdt.h</div><div class='ctx'>  *</div><div class='add'>+ * Copyright (C) 2007 Andrew Victor</div><div class='add'>+ * Copyright (C) 2007 Atmel Corporation.</div><div class='add'>+ *</div><div class='ctx'>  * Watchdog Timer (WDT) - System peripherals regsters.</div><div class='ctx'>  * Based on AT91SAM9261 datasheet revision D.</div><div class='ctx'>  *</div><div class='head'>diff --git a/arch/arm/mach-at91/include/mach/at91cap9_ddrsdr.h b/arch/arm/mach-at91/include/mach/at91cap9_ddrsdr.h<br/>index bca878f3bd87..1499b1cbffdd 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/include/mach/at91cap9_ddrsdr.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-at91/include/mach/at91cap9_ddrsdr.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/include/mach/at91cap9_ddrsdr.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/include/mach/at91cap9_ddrsdr.h</a></div><div class='hunk'>@@ -1,6 +1,8 @@</div><div class='ctx'> /*</div><div class='ctx'>  * arch/arm/mach-at91/include/mach/at91cap9_ddrsdr.h</div><div class='ctx'>  *</div><div class='add'>+ *  (C) 2008 Andrew Victor</div><div class='add'>+ *</div><div class='ctx'>  * DDR/SDR Controller (DDRSDRC) - System peripherals registers.</div><div class='ctx'>  * Based on AT91CAP9 datasheet revision B.</div><div class='ctx'>  *</div><div class='head'>diff --git a/arch/arm/mach-at91/include/mach/at91sam9260_matrix.h b/arch/arm/mach-at91/include/mach/at91sam9260_matrix.h<br/>index f027de5df956..020f02ed921a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/include/mach/at91sam9260_matrix.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-at91/include/mach/at91sam9260_matrix.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/include/mach/at91sam9260_matrix.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/include/mach/at91sam9260_matrix.h</a></div><div class='hunk'>@@ -1,6 +1,8 @@</div><div class='ctx'> /*</div><div class='ctx'>  * arch/arm/mach-at91/include/mach/at91sam9260_matrix.h</div><div class='ctx'>  *</div><div class='add'>+ *  Copyright (C) 2007 Atmel Corporation.</div><div class='add'>+ *</div><div class='ctx'>  * Memory Controllers (MATRIX, EBI) - System peripherals registers.</div><div class='ctx'>  * Based on AT91SAM9260 datasheet revision B.</div><div class='ctx'>  *</div><div class='head'>diff --git a/arch/arm/mach-at91/include/mach/at91sam9261_matrix.h b/arch/arm/mach-at91/include/mach/at91sam9261_matrix.h<br/>index db62b1f18300..69c6501915d9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/include/mach/at91sam9261_matrix.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-at91/include/mach/at91sam9261_matrix.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/include/mach/at91sam9261_matrix.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/include/mach/at91sam9261_matrix.h</a></div><div class='hunk'>@@ -1,6 +1,8 @@</div><div class='ctx'> /*</div><div class='ctx'>  * arch/arm/mach-at91/include/mach/at91sam9261_matrix.h</div><div class='ctx'>  *</div><div class='add'>+ *  Copyright (C) 2007 Atmel Corporation.</div><div class='add'>+ *</div><div class='ctx'>  * Memory Controllers (MATRIX, EBI) - System peripherals registers.</div><div class='ctx'>  * Based on AT91SAM9261 datasheet revision D.</div><div class='ctx'>  *</div><div class='head'>diff --git a/arch/arm/mach-at91/include/mach/at91sam9_sdramc.h b/arch/arm/mach-at91/include/mach/at91sam9_sdramc.h<br/>index 1921181c63ca..b7260389f7ca 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/include/mach/at91sam9_sdramc.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-at91/include/mach/at91sam9_sdramc.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/include/mach/at91sam9_sdramc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/include/mach/at91sam9_sdramc.h</a></div><div class='hunk'>@@ -1,6 +1,9 @@</div><div class='ctx'> /*</div><div class='ctx'>  * arch/arm/mach-at91/include/mach/at91sam9_sdramc.h</div><div class='ctx'>  *</div><div class='add'>+ * Copyright (C) 2007 Andrew Victor</div><div class='add'>+ * Copyright (C) 2007 Atmel Corporation.</div><div class='add'>+ *</div><div class='ctx'>  * SDRAM Controllers (SDRAMC) - System peripherals registers.</div><div class='ctx'>  * Based on AT91SAM9261 datasheet revision D.</div><div class='ctx'>  *</div><div class='head'>diff --git a/arch/arm/mach-at91/include/mach/at91sam9_smc.h b/arch/arm/mach-at91/include/mach/at91sam9_smc.h<br/>index ec6ad1338b5a..57de6207e57e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/include/mach/at91sam9_smc.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-at91/include/mach/at91sam9_smc.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/include/mach/at91sam9_smc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/include/mach/at91sam9_smc.h</a></div><div class='hunk'>@@ -1,6 +1,9 @@</div><div class='ctx'> /*</div><div class='ctx'>  * arch/arm/mach-at91/include/mach/at91sam9_smc.h</div><div class='ctx'>  *</div><div class='add'>+ * Copyright (C) 2007 Andrew Victor</div><div class='add'>+ * Copyright (C) 2007 Atmel Corporation.</div><div class='add'>+ *</div><div class='ctx'>  * Static Memory Controllers (SMC) - System peripherals registers.</div><div class='ctx'>  * Based on AT91SAM9261 datasheet revision D.</div><div class='ctx'>  *</div><div class='head'>diff --git a/arch/arm/mach-at91/include/mach/board.h b/arch/arm/mach-at91/include/mach/board.h<br/>index acd60f2a0724..fb51f0e0a83f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/include/mach/board.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-at91/include/mach/board.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/include/mach/board.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/include/mach/board.h</a></div><div class='hunk'>@@ -133,6 +133,16 @@ struct atmel_uart_data {</div><div class='ctx'> extern void __init at91_add_device_serial(void);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * PWM</div><div class='add'>+ */</div><div class='add'>+#define AT91_PWM0	0</div><div class='add'>+#define AT91_PWM1	1</div><div class='add'>+#define AT91_PWM2	2</div><div class='add'>+#define AT91_PWM3	3</div><div class='add'>+</div><div class='add'>+extern void __init at91_add_device_pwm(u32 mask);</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * SSC -- accessed through ssc_request(id).  Drivers don't bind to SSC</div><div class='ctx'>  * platform devices.  Their SSC ID is part of their configuration data,</div><div class='ctx'>  * along with information about which SSC signals they should use.</div><div class='hunk'>@@ -162,9 +172,13 @@ extern void __init at91_add_device_ac97(struct atmel_ac97_data *data);</div><div class='ctx'>  /* ISI */</div><div class='ctx'> extern void __init at91_add_device_isi(void);</div><div class='ctx'> </div><div class='add'>+ /* Touchscreen Controller */</div><div class='add'>+extern void __init at91_add_device_tsadcc(void);</div><div class='add'>+</div><div class='ctx'>  /* LEDs */</div><div class='ctx'> extern void __init at91_init_leds(u8 cpu_led, u8 timer_led);</div><div class='ctx'> extern void __init at91_gpio_leds(struct gpio_led *leds, int nr);</div><div class='add'>+extern void __init at91_pwm_leds(struct gpio_led *leds, int nr);</div><div class='ctx'> </div><div class='ctx'> /* FIXME: this needs a better location, but gets stuff building again */</div><div class='ctx'> extern int at91_suspend_entering_slow_clock(void);</div><div class='head'>diff --git a/arch/arm/mach-at91/include/mach/irqs.h b/arch/arm/mach-at91/include/mach/irqs.h<br/>index bda29ccbcd94..36bd55f3fc6e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/include/mach/irqs.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-at91/include/mach/irqs.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/include/mach/irqs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/include/mach/irqs.h</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> #ifndef __ASM_ARCH_IRQS_H</div><div class='ctx'> #define __ASM_ARCH_IRQS_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;mach/at91_aic.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define NR_AIC_IRQS 32</div><div class='head'>diff --git a/arch/arm/mach-at91/include/mach/uncompress.h b/arch/arm/mach-at91/include/mach/uncompress.h<br/>index 0410d548e9b1..18bdcdeb474f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/include/mach/uncompress.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-at91/include/mach/uncompress.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/include/mach/uncompress.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/include/mach/uncompress.h</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> #ifndef __ASM_ARCH_UNCOMPRESS_H</div><div class='ctx'> #define __ASM_ARCH_UNCOMPRESS_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/atmel_serial.h&gt;</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_AT91_EARLY_DBGU)</div><div class='head'>diff --git a/arch/arm/mach-at91/leds.c b/arch/arm/mach-at91/leds.c<br/>index fec03c59ff94..0415a839e1ad 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/leds.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-at91/leds.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/leds.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/leds.c</a></div><div class='hunk'>@@ -12,6 +12,7 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/board.h&gt;</div><div class='ctx'> #include &lt;mach/gpio.h&gt;</div><div class='hunk'>@@ -21,15 +22,13 @@</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_NEW_LEDS)</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/platform_device.h&gt;</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * New cross-platform LED support.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static struct gpio_led_platform_data led_data;</div><div class='ctx'> </div><div class='del'>-static struct platform_device at91_leds = {</div><div class='add'>+static struct platform_device at91_gpio_leds_device = {</div><div class='ctx'> 	.name			= "leds-gpio",</div><div class='ctx'> 	.id			= -1,</div><div class='ctx'> 	.dev.platform_data	= &amp;led_data,</div><div class='hunk'>@@ -47,7 +46,7 @@ void __init at91_gpio_leds(struct gpio_led *leds, int nr)</div><div class='ctx'> </div><div class='ctx'> 	led_data.leds = leds;</div><div class='ctx'> 	led_data.num_leds = nr;</div><div class='del'>-	platform_device_register(&amp;at91_leds);</div><div class='add'>+	platform_device_register(&amp;at91_gpio_leds_device);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='hunk'>@@ -57,6 +56,44 @@ void __init at91_gpio_leds(struct gpio_led *leds, int nr) {}</div><div class='ctx'> </div><div class='ctx'> /* ------------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='add'>+#if defined (CONFIG_LEDS_ATMEL_PWM)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * PWM Leds</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static struct gpio_led_platform_data pwm_led_data;</div><div class='add'>+</div><div class='add'>+static struct platform_device at91_pwm_leds_device = {</div><div class='add'>+	.name			= "leds-atmel-pwm",</div><div class='add'>+	.id			= -1,</div><div class='add'>+	.dev.platform_data	= &amp;pwm_led_data,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void __init at91_pwm_leds(struct gpio_led *leds, int nr)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	u32 pwm_mask = 0;</div><div class='add'>+</div><div class='add'>+	if (!nr)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; nr; i++)</div><div class='add'>+		pwm_mask |= (1 &lt;&lt; leds[i].gpio);</div><div class='add'>+</div><div class='add'>+	pwm_led_data.leds = leds;</div><div class='add'>+	pwm_led_data.num_leds = nr;</div><div class='add'>+</div><div class='add'>+	at91_add_device_pwm(pwm_mask);</div><div class='add'>+	platform_device_register(&amp;at91_pwm_leds_device);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+void __init at91_pwm_leds(struct gpio_led *leds, int nr){}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* ------------------------------------------------------------------------- */</div><div class='add'>+</div><div class='ctx'> #if defined(CONFIG_LEDS)</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/leds.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c<br/>index ec2fe4ca1e27..9bb4f043aa22 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/pm.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-at91/pm.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/pm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/pm.c</a></div><div class='hunk'>@@ -17,8 +17,8 @@</div><div class='ctx'> #include &lt;linux/sysfs.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/atomic.h&gt;</div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-at91/pm_slowclock.S b/arch/arm/mach-at91/pm_slowclock.S<br/>new file mode 100644<br/>index 000000000000..987fab3d846a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-at91/pm_slowclock.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-at91/pm_slowclock.S</a></div><div class='hunk'>@@ -0,0 +1,283 @@</div><div class='add'>+/*</div><div class='add'>+ * arch/arm/mach-at91/pm_slow_clock.S</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2006 Savin Zlobec</div><div class='add'>+ *</div><div class='add'>+ * AT91SAM9 support:</div><div class='add'>+ *  Copyright (C) 2007 Anti Sullin &lt;anti.sullin@artecdesign.ee</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/linkage.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/at91_pmc.h&gt;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ARCH_AT91RM9200</div><div class='add'>+#include &lt;mach/at91rm9200_mc.h&gt;</div><div class='add'>+#elif defined(CONFIG_ARCH_AT91CAP9)</div><div class='add'>+#include &lt;mach/at91cap9_ddrsdr.h&gt;</div><div class='add'>+#else</div><div class='add'>+#include &lt;mach/at91sam9_sdramc.h&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ARCH_AT91SAM9263</div><div class='add'>+/*</div><div class='add'>+ * FIXME either or both the SDRAM controllers (EB0, EB1) might be in use;</div><div class='add'>+ * handle those cases both here and in the Suspend-To-RAM support.</div><div class='add'>+ */</div><div class='add'>+#define AT91_SDRAMC	AT91_SDRAMC0</div><div class='add'>+#warning Assuming EB1 SDRAM controller is *NOT* used</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * When SLOWDOWN_MASTER_CLOCK is defined we will also slow down the Master</div><div class='add'>+ * clock during suspend by adjusting its prescalar and divisor.</div><div class='add'>+ * NOTE: This hasn't been shown to be stable on SAM9s; and on the RM9200 there</div><div class='add'>+ *       are errata regarding adjusting the prescalar and divisor.</div><div class='add'>+ */</div><div class='add'>+#undef SLOWDOWN_MASTER_CLOCK</div><div class='add'>+</div><div class='add'>+#define MCKRDY_TIMEOUT		1000</div><div class='add'>+#define MOSCRDY_TIMEOUT 	1000</div><div class='add'>+#define PLLALOCK_TIMEOUT	1000</div><div class='add'>+#define PLLBLOCK_TIMEOUT	1000</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Wait until master clock is ready (after switching master clock source)</div><div class='add'>+ */</div><div class='add'>+	.macro wait_mckrdy</div><div class='add'>+	mov	r4, #MCKRDY_TIMEOUT</div><div class='add'>+1:	sub	r4, r4, #1</div><div class='add'>+	cmp	r4, #0</div><div class='add'>+	beq	2f</div><div class='add'>+	ldr	r3, [r1, #(AT91_PMC_SR - AT91_PMC)]</div><div class='add'>+	tst	r3, #AT91_PMC_MCKRDY</div><div class='add'>+	beq	1b</div><div class='add'>+2:</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Wait until master oscillator has stabilized.</div><div class='add'>+ */</div><div class='add'>+	.macro wait_moscrdy</div><div class='add'>+	mov	r4, #MOSCRDY_TIMEOUT</div><div class='add'>+1:	sub	r4, r4, #1</div><div class='add'>+	cmp	r4, #0</div><div class='add'>+	beq	2f</div><div class='add'>+	ldr	r3, [r1, #(AT91_PMC_SR - AT91_PMC)]</div><div class='add'>+	tst	r3, #AT91_PMC_MOSCS</div><div class='add'>+	beq	1b</div><div class='add'>+2:</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Wait until PLLA has locked.</div><div class='add'>+ */</div><div class='add'>+	.macro wait_pllalock</div><div class='add'>+	mov	r4, #PLLALOCK_TIMEOUT</div><div class='add'>+1:	sub	r4, r4, #1</div><div class='add'>+	cmp	r4, #0</div><div class='add'>+	beq	2f</div><div class='add'>+	ldr	r3, [r1, #(AT91_PMC_SR - AT91_PMC)]</div><div class='add'>+	tst	r3, #AT91_PMC_LOCKA</div><div class='add'>+	beq	1b</div><div class='add'>+2:</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Wait until PLLB has locked.</div><div class='add'>+ */</div><div class='add'>+	.macro wait_pllblock</div><div class='add'>+	mov	r4, #PLLBLOCK_TIMEOUT</div><div class='add'>+1:	sub	r4, r4, #1</div><div class='add'>+	cmp	r4, #0</div><div class='add'>+	beq	2f</div><div class='add'>+	ldr	r3, [r1, #(AT91_PMC_SR - AT91_PMC)]</div><div class='add'>+	tst	r3, #AT91_PMC_LOCKB</div><div class='add'>+	beq	1b</div><div class='add'>+2:</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.text</div><div class='add'>+</div><div class='add'>+ENTRY(at91_slow_clock)</div><div class='add'>+	/* Save registers on stack */</div><div class='add'>+	stmfd	sp!, {r0 - r12, lr}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Register usage:</div><div class='add'>+	 *  R1 = Base address of AT91_PMC</div><div class='add'>+	 *  R2 = Base address of AT91_SDRAMC (or AT91_SYS on AT91RM9200)</div><div class='add'>+	 *  R3 = temporary register</div><div class='add'>+	 *  R4 = temporary register</div><div class='add'>+	 */</div><div class='add'>+	ldr	r1, .at91_va_base_pmc</div><div class='add'>+	ldr	r2, .at91_va_base_sdramc</div><div class='add'>+</div><div class='add'>+	/* Drain write buffer */</div><div class='add'>+	mcr	p15, 0, r0, c7, c10, 4</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ARCH_AT91RM9200</div><div class='add'>+	/* Put SDRAM in self-refresh mode */</div><div class='add'>+	mov	r3, #1</div><div class='add'>+	str	r3, [r2, #AT91_SDRAMC_SRR]</div><div class='add'>+#elif defined(CONFIG_ARCH_AT91CAP9)</div><div class='add'>+	/* Enable SDRAM self-refresh mode */</div><div class='add'>+	ldr	r3, [r2, #AT91_DDRSDRC_LPR - AT91_DDRSDRC]</div><div class='add'>+	str	r3, .saved_sam9_lpr</div><div class='add'>+</div><div class='add'>+	mov	r3, #AT91_DDRSDRC_LPCB_SELF_REFRESH</div><div class='add'>+	str	r3, [r2, #AT91_DDRSDRC_LPR - AT91_DDRSDRC]</div><div class='add'>+#else</div><div class='add'>+	/* Enable SDRAM self-refresh mode */</div><div class='add'>+	ldr	r3, [r2, #AT91_SDRAMC_LPR - AT91_SDRAMC]</div><div class='add'>+	str	r3, .saved_sam9_lpr</div><div class='add'>+</div><div class='add'>+	mov	r3, #AT91_SDRAMC_LPCB_SELF_REFRESH</div><div class='add'>+	str	r3, [r2, #AT91_SDRAMC_LPR - AT91_SDRAMC]</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* Save Master clock setting */</div><div class='add'>+	ldr	r3, [r1, #(AT91_PMC_MCKR - AT91_PMC)]</div><div class='add'>+	str	r3, .saved_mckr</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Set the Master clock source to slow clock</div><div class='add'>+	 */</div><div class='add'>+	bic	r3, r3, #AT91_PMC_CSS</div><div class='add'>+	str	r3, [r1, #(AT91_PMC_MCKR - AT91_PMC)]</div><div class='add'>+</div><div class='add'>+	wait_mckrdy</div><div class='add'>+</div><div class='add'>+#ifdef SLOWDOWN_MASTER_CLOCK</div><div class='add'>+	/*</div><div class='add'>+	 * Set the Master Clock PRES and MDIV fields.</div><div class='add'>+	 *</div><div class='add'>+	 * See AT91RM9200 errata #27 and #28 for details.</div><div class='add'>+	 */</div><div class='add'>+	mov	r3, #0</div><div class='add'>+	str	r3, [r1, #(AT91_PMC_MCKR - AT91_PMC)]</div><div class='add'>+</div><div class='add'>+	wait_mckrdy</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* Save PLLA setting and disable it */</div><div class='add'>+	ldr	r3, [r1, #(AT91_CKGR_PLLAR - AT91_PMC)]</div><div class='add'>+	str	r3, .saved_pllar</div><div class='add'>+</div><div class='add'>+	mov	r3, #AT91_PMC_PLLCOUNT</div><div class='add'>+	orr	r3, r3, #(1 &lt;&lt; 29)		/* bit 29 always set */</div><div class='add'>+	str	r3, [r1, #(AT91_CKGR_PLLAR - AT91_PMC)]</div><div class='add'>+</div><div class='add'>+	wait_pllalock</div><div class='add'>+</div><div class='add'>+	/* Save PLLB setting and disable it */</div><div class='add'>+	ldr	r3, [r1, #(AT91_CKGR_PLLBR - AT91_PMC)]</div><div class='add'>+	str	r3, .saved_pllbr</div><div class='add'>+</div><div class='add'>+	mov	r3, #AT91_PMC_PLLCOUNT</div><div class='add'>+	str	r3, [r1, #(AT91_CKGR_PLLBR - AT91_PMC)]</div><div class='add'>+</div><div class='add'>+	wait_pllblock</div><div class='add'>+</div><div class='add'>+	/* Turn off the main oscillator */</div><div class='add'>+	ldr	r3, [r1, #(AT91_CKGR_MOR - AT91_PMC)]</div><div class='add'>+	bic	r3, r3, #AT91_PMC_MOSCEN</div><div class='add'>+	str	r3, [r1, #(AT91_CKGR_MOR - AT91_PMC)]</div><div class='add'>+</div><div class='add'>+	/* Wait for interrupt */</div><div class='add'>+	mcr	p15, 0, r0, c7, c0, 4</div><div class='add'>+</div><div class='add'>+	/* Turn on the main oscillator */</div><div class='add'>+	ldr	r3, [r1, #(AT91_CKGR_MOR - AT91_PMC)]</div><div class='add'>+	orr	r3, r3, #AT91_PMC_MOSCEN</div><div class='add'>+	str	r3, [r1, #(AT91_CKGR_MOR - AT91_PMC)]</div><div class='add'>+</div><div class='add'>+	wait_moscrdy</div><div class='add'>+</div><div class='add'>+	/* Restore PLLB setting */</div><div class='add'>+	ldr	r3, .saved_pllbr</div><div class='add'>+	str	r3, [r1, #(AT91_CKGR_PLLBR - AT91_PMC)]</div><div class='add'>+</div><div class='add'>+	wait_pllblock</div><div class='add'>+</div><div class='add'>+	/* Restore PLLA setting */</div><div class='add'>+	ldr	r3, .saved_pllar</div><div class='add'>+	str	r3, [r1, #(AT91_CKGR_PLLAR - AT91_PMC)]</div><div class='add'>+</div><div class='add'>+	wait_pllalock</div><div class='add'>+</div><div class='add'>+#ifdef SLOWDOWN_MASTER_CLOCK</div><div class='add'>+	/*</div><div class='add'>+	 * First set PRES if it was not 0,</div><div class='add'>+	 * than set CSS and MDIV fields.</div><div class='add'>+	 *</div><div class='add'>+	 * See AT91RM9200 errata #27 and #28 for details.</div><div class='add'>+	 */</div><div class='add'>+	ldr	r3, .saved_mckr</div><div class='add'>+	tst	r3, #AT91_PMC_PRES</div><div class='add'>+	beq	2f</div><div class='add'>+	and	r3, r3, #AT91_PMC_PRES</div><div class='add'>+	str	r3, [r1, #(AT91_PMC_MCKR - AT91_PMC)]</div><div class='add'>+</div><div class='add'>+	wait_mckrdy</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Restore master clock setting</div><div class='add'>+	 */</div><div class='add'>+2:	ldr	r3, .saved_mckr</div><div class='add'>+	str	r3, [r1, #(AT91_PMC_MCKR - AT91_PMC)]</div><div class='add'>+</div><div class='add'>+	wait_mckrdy</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ARCH_AT91RM9200</div><div class='add'>+	/* Do nothing - self-refresh is automatically disabled. */</div><div class='add'>+#elif defined(CONFIG_ARCH_AT91CAP9)</div><div class='add'>+	/* Restore LPR on AT91CAP9 */</div><div class='add'>+	ldr	r3, .saved_sam9_lpr</div><div class='add'>+	str	r3, [r2, #AT91_DDRSDRC_LPR - AT91_DDRSDRC]</div><div class='add'>+#else</div><div class='add'>+	/* Restore LPR on AT91SAM9 */</div><div class='add'>+	ldr	r3, .saved_sam9_lpr</div><div class='add'>+	str	r3, [r2, #AT91_SDRAMC_LPR - AT91_SDRAMC]</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* Restore registers, and return */</div><div class='add'>+	ldmfd	sp!, {r0 - r12, pc}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+.saved_mckr:</div><div class='add'>+	.word 0</div><div class='add'>+</div><div class='add'>+.saved_pllar:</div><div class='add'>+	.word 0</div><div class='add'>+</div><div class='add'>+.saved_pllbr:</div><div class='add'>+	.word 0</div><div class='add'>+</div><div class='add'>+.saved_sam9_lpr:</div><div class='add'>+	.word 0</div><div class='add'>+</div><div class='add'>+.at91_va_base_pmc:</div><div class='add'>+	.word AT91_VA_BASE_SYS + AT91_PMC</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ARCH_AT91RM9200</div><div class='add'>+.at91_va_base_sdramc:</div><div class='add'>+	.word AT91_VA_BASE_SYS</div><div class='add'>+#elif defined(CONFIG_ARCH_AT91CAP9)</div><div class='add'>+.at91_va_base_sdramc:</div><div class='add'>+	.word AT91_VA_BASE_SYS + AT91_DDRSDRC</div><div class='add'>+#else</div><div class='add'>+.at91_va_base_sdramc:</div><div class='add'>+	.word AT91_VA_BASE_SYS + AT91_SDRAMC</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+ENTRY(at91_slow_clock_sz)</div><div class='add'>+	.word .-at91_slow_clock</div><div class='head'>diff --git a/arch/arm/mach-clps711x/autcpu12.c b/arch/arm/mach-clps711x/autcpu12.c<br/>index 474616dcd7a6..5f18eccdc725 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-clps711x/autcpu12.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-clps711x/autcpu12.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-clps711x/autcpu12.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-clps711x/autcpu12.c</a></div><div class='hunk'>@@ -22,10 +22,10 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/sizes.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-clps711x/cdb89712.c b/arch/arm/mach-clps711x/cdb89712.c<br/>index aa02aa5a01f4..71a80b5b8ad6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-clps711x/cdb89712.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-clps711x/cdb89712.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-clps711x/cdb89712.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-clps711x/cdb89712.c</a></div><div class='hunk'>@@ -22,9 +22,9 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-clps711x/include/mach/system.h b/arch/arm/mach-clps711x/include/mach/system.h<br/>index a8eade40317f..24e96159e3e7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-clps711x/include/mach/system.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-clps711x/include/mach/system.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-clps711x/include/mach/system.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-clps711x/include/mach/system.h</a></div><div class='hunk'>@@ -20,9 +20,9 @@</div><div class='ctx'> #ifndef __ASM_ARCH_SYSTEM_H</div><div class='ctx'> #define __ASM_ARCH_SYSTEM_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/clps7111.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> static inline void arch_idle(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/arm/mach-clps711x/irq.c b/arch/arm/mach-clps711x/irq.c<br/>index 38623cfcac5a..9a12d8562284 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-clps711x/irq.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-clps711x/irq.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-clps711x/irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-clps711x/irq.c</a></div><div class='hunk'>@@ -19,10 +19,10 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/hardware/clps7111.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-clps711x/p720t-leds.c b/arch/arm/mach-clps711x/p720t-leds.c<br/>index 262c3c361453..15121446efc8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-clps711x/p720t-leds.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-clps711x/p720t-leds.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-clps711x/p720t-leds.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-clps711x/p720t-leds.c</a></div><div class='hunk'>@@ -21,9 +21,9 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/leds.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-clps711x/p720t.c b/arch/arm/mach-clps711x/p720t.c<br/>index f51f97d4f212..0d94a30fd6fc 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-clps711x/p720t.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-clps711x/p720t.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-clps711x/p720t.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-clps711x/p720t.c</a></div><div class='hunk'>@@ -22,9 +22,9 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-clps711x/time.c b/arch/arm/mach-clps711x/time.c<br/>index ef1fcd17189e..d581ef0bcd24 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-clps711x/time.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-clps711x/time.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-clps711x/time.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-clps711x/time.c</a></div><div class='hunk'>@@ -21,11 +21,11 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/leds.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/clps7111.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-clps7500/core.c b/arch/arm/mach-clps7500/core.c<br/>index cc1b82179e83..c3a33b8a5aac 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-clps7500/core.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-clps7500/core.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-clps7500/core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-clps7500/core.c</a></div><div class='hunk'>@@ -15,6 +15,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/serial_8250.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='hunk'>@@ -23,7 +24,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/iomd.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-clps7500/include/mach/irq.h b/arch/arm/mach-clps7500/include/mach/irq.h<br/>index e8da3c58df76..d02fcf28ee05 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-clps7500/include/mach/irq.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-clps7500/include/mach/irq.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-clps7500/include/mach/irq.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-clps7500/include/mach/irq.h</a></div><div class='hunk'>@@ -10,8 +10,8 @@</div><div class='ctx'>  *   11-08-1999	PJB	Created ARM7500 version, derived from RiscPC code</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/iomd.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> static inline int fixup_irq(unsigned int irq)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/arm/mach-clps7500/include/mach/memory.h b/arch/arm/mach-clps7500/include/mach/memory.h<br/>index 3326aa99d3ec..87b32db470c8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-clps7500/include/mach/memory.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-clps7500/include/mach/memory.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-clps7500/include/mach/memory.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-clps7500/include/mach/memory.h</a></div><div class='hunk'>@@ -32,4 +32,12 @@</div><div class='ctx'> #define FLUSH_BASE_PHYS		0x00000000</div><div class='ctx'> #define FLUSH_BASE		0xdf000000</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Sparsemem support.  Each section is a maximum of 64MB.  The sections</div><div class='add'>+ * are offset by 128MB and can cover 128MB, so that gives us a maximum</div><div class='add'>+ * of 29 physmem bits.</div><div class='add'>+ */</div><div class='add'>+#define MAX_PHYSMEM_BITS	29</div><div class='add'>+#define SECTION_SIZE_BITS	26</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-clps7500/include/mach/system.h b/arch/arm/mach-clps7500/include/mach/system.h<br/>index 624fc2830ae0..6d325fbe8b08 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-clps7500/include/mach/system.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-clps7500/include/mach/system.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-clps7500/include/mach/system.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-clps7500/include/mach/system.h</a></div><div class='hunk'>@@ -6,8 +6,8 @@</div><div class='ctx'> #ifndef __ASM_ARCH_SYSTEM_H</div><div class='ctx'> #define __ASM_ARCH_SYSTEM_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/iomd.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> static inline void arch_idle(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/arm/mach-davinci/Makefile b/arch/arm/mach-davinci/Makefile<br/>index 99ac2e55774d..4dc458597f40 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-davinci/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-davinci/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-davinci/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-davinci/Makefile</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'> </div><div class='ctx'> # Common objects</div><div class='ctx'> obj-y 			:= time.o irq.o clock.o serial.o io.o id.o psc.o \</div><div class='del'>-			   gpio.o mux.o</div><div class='add'>+			   gpio.o mux.o devices.o usb.o</div><div class='ctx'> </div><div class='ctx'> # Board specific</div><div class='ctx'> obj-$(CONFIG_MACH_DAVINCI_EVM)  += board-evm.o</div><div class='head'>diff --git a/arch/arm/mach-davinci/board-evm.c b/arch/arm/mach-davinci/board-evm.c<br/>index 134355787814..a957d239a683 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-davinci/board-evm.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-davinci/board-evm.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-davinci/board-evm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-davinci/board-evm.c</a></div><div class='hunk'>@@ -13,20 +13,28 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/gpio.h&gt;</div><div class='add'>+#include &lt;linux/leds.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/i2c/pcf857x.h&gt;</div><div class='add'>+#include &lt;linux/i2c/at24.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;linux/mtd/mtd.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/physmap.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='del'>-#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/flash.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;mach/common.h&gt;</div><div class='add'>+#include &lt;mach/i2c.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* other misc. init functions */</div><div class='ctx'> void __init davinci_psc_init(void);</div><div class='hunk'>@@ -34,10 +42,10 @@ void __init davinci_irq_init(void);</div><div class='ctx'> void __init davinci_map_common_io(void);</div><div class='ctx'> void __init davinci_init_common_hw(void);</div><div class='ctx'> </div><div class='del'>-/* NOR Flash base address set to CS0 by default */</div><div class='del'>-#define NOR_FLASH_PHYS 0x02000000</div><div class='add'>+#if defined(CONFIG_MTD_PHYSMAP) || \</div><div class='add'>+    defined(CONFIG_MTD_PHYSMAP_MODULE)</div><div class='ctx'> </div><div class='del'>-static struct mtd_partition davinci_evm_partitions[] = {</div><div class='add'>+static struct mtd_partition davinci_evm_norflash_partitions[] = {</div><div class='ctx'> 	/* bootloader (U-Boot, etc) in first 4 sectors */</div><div class='ctx'> 	{</div><div class='ctx'> 		.name		= "bootloader",</div><div class='hunk'>@@ -68,32 +76,323 @@ static struct mtd_partition davinci_evm_partitions[] = {</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct physmap_flash_data davinci_evm_flash_data = {</div><div class='add'>+static struct physmap_flash_data davinci_evm_norflash_data = {</div><div class='ctx'> 	.width		= 2,</div><div class='del'>-	.parts		= davinci_evm_partitions,</div><div class='del'>-	.nr_parts	= ARRAY_SIZE(davinci_evm_partitions),</div><div class='add'>+	.parts		= davinci_evm_norflash_partitions,</div><div class='add'>+	.nr_parts	= ARRAY_SIZE(davinci_evm_norflash_partitions),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* NOTE: CFI probe will correctly detect flash part as 32M, but EMIF</div><div class='ctx'>  * limits addresses to 16M, so using addresses past 16M will wrap */</div><div class='del'>-static struct resource davinci_evm_flash_resource = {</div><div class='del'>-	.start		= NOR_FLASH_PHYS,</div><div class='del'>-	.end		= NOR_FLASH_PHYS + SZ_16M - 1,</div><div class='add'>+static struct resource davinci_evm_norflash_resource = {</div><div class='add'>+	.start		= DAVINCI_ASYNC_EMIF_DATA_CE0_BASE,</div><div class='add'>+	.end		= DAVINCI_ASYNC_EMIF_DATA_CE0_BASE + SZ_16M - 1,</div><div class='ctx'> 	.flags		= IORESOURCE_MEM,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct platform_device davinci_evm_flash_device = {</div><div class='add'>+static struct platform_device davinci_evm_norflash_device = {</div><div class='ctx'> 	.name		= "physmap-flash",</div><div class='ctx'> 	.id		= 0,</div><div class='ctx'> 	.dev		= {</div><div class='del'>-		.platform_data	= &amp;davinci_evm_flash_data,</div><div class='add'>+		.platform_data	= &amp;davinci_evm_norflash_data,</div><div class='ctx'> 	},</div><div class='ctx'> 	.num_resources	= 1,</div><div class='del'>-	.resource	= &amp;davinci_evm_flash_resource,</div><div class='add'>+	.resource	= &amp;davinci_evm_norflash_resource,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_BLK_DEV_PALMCHIP_BK3710) || \</div><div class='add'>+    defined(CONFIG_BLK_DEV_PALMCHIP_BK3710_MODULE)</div><div class='add'>+</div><div class='add'>+static struct resource ide_resources[] = {</div><div class='add'>+	{</div><div class='add'>+		.start          = DAVINCI_CFC_ATA_BASE,</div><div class='add'>+		.end            = DAVINCI_CFC_ATA_BASE + 0x7ff,</div><div class='add'>+		.flags          = IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.start          = IRQ_IDE,</div><div class='add'>+		.end            = IRQ_IDE,</div><div class='add'>+		.flags          = IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u64 ide_dma_mask = DMA_32BIT_MASK;</div><div class='add'>+</div><div class='add'>+static struct platform_device ide_dev = {</div><div class='add'>+	.name           = "palm_bk3710",</div><div class='add'>+	.id             = -1,</div><div class='add'>+	.resource       = ide_resources,</div><div class='add'>+	.num_resources  = ARRAY_SIZE(ide_resources),</div><div class='add'>+	.dev = {</div><div class='add'>+		.dma_mask		= &amp;ide_dma_mask,</div><div class='add'>+		.coherent_dma_mask      = DMA_32BIT_MASK,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * I2C GPIO expanders</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define PCF_Uxx_BASE(x)	(DAVINCI_N_GPIO + ((x) * 8))</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* U2 -- LEDs */</div><div class='add'>+</div><div class='add'>+static struct gpio_led evm_leds[] = {</div><div class='add'>+	{ .name = "DS8", .active_low = 1,</div><div class='add'>+		.default_trigger = "heartbeat", },</div><div class='add'>+	{ .name = "DS7", .active_low = 1, },</div><div class='add'>+	{ .name = "DS6", .active_low = 1, },</div><div class='add'>+	{ .name = "DS5", .active_low = 1, },</div><div class='add'>+	{ .name = "DS4", .active_low = 1, },</div><div class='add'>+	{ .name = "DS3", .active_low = 1, },</div><div class='add'>+	{ .name = "DS2", .active_low = 1,</div><div class='add'>+		.default_trigger = "mmc0", },</div><div class='add'>+	{ .name = "DS1", .active_low = 1,</div><div class='add'>+		.default_trigger = "ide-disk", },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct gpio_led_platform_data evm_led_data = {</div><div class='add'>+	.num_leds	= ARRAY_SIZE(evm_leds),</div><div class='add'>+	.leds		= evm_leds,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device *evm_led_dev;</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+evm_led_setup(struct i2c_client *client, int gpio, unsigned ngpio, void *c)</div><div class='add'>+{</div><div class='add'>+	struct gpio_led *leds = evm_leds;</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	while (ngpio--) {</div><div class='add'>+		leds-&gt;gpio = gpio++;</div><div class='add'>+		leds++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* what an extremely annoying way to be forced to handle</div><div class='add'>+	 * device unregistration ...</div><div class='add'>+	 */</div><div class='add'>+	evm_led_dev = platform_device_alloc("leds-gpio", 0);</div><div class='add'>+	platform_device_add_data(evm_led_dev,</div><div class='add'>+			&amp;evm_led_data, sizeof evm_led_data);</div><div class='add'>+</div><div class='add'>+	evm_led_dev-&gt;dev.parent = &amp;client-&gt;dev;</div><div class='add'>+	status = platform_device_add(evm_led_dev);</div><div class='add'>+	if (status &lt; 0) {</div><div class='add'>+		platform_device_put(evm_led_dev);</div><div class='add'>+		evm_led_dev = NULL;</div><div class='add'>+	}</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+evm_led_teardown(struct i2c_client *client, int gpio, unsigned ngpio, void *c)</div><div class='add'>+{</div><div class='add'>+	if (evm_led_dev) {</div><div class='add'>+		platform_device_unregister(evm_led_dev);</div><div class='add'>+		evm_led_dev = NULL;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct pcf857x_platform_data pcf_data_u2 = {</div><div class='add'>+	.gpio_base	= PCF_Uxx_BASE(0),</div><div class='add'>+	.setup		= evm_led_setup,</div><div class='add'>+	.teardown	= evm_led_teardown,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* U18 - A/V clock generator and user switch */</div><div class='add'>+</div><div class='add'>+static int sw_gpio;</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+sw_show(struct device *d, struct device_attribute *a, char *buf)</div><div class='add'>+{</div><div class='add'>+	char *s = gpio_get_value_cansleep(sw_gpio) ? "on\n" : "off\n";</div><div class='add'>+</div><div class='add'>+	strcpy(buf, s);</div><div class='add'>+	return strlen(s);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static DEVICE_ATTR(user_sw, S_IRUGO, sw_show, NULL);</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+evm_u18_setup(struct i2c_client *client, int gpio, unsigned ngpio, void *c)</div><div class='add'>+{</div><div class='add'>+	int	status;</div><div class='add'>+</div><div class='add'>+	/* export dip switch option */</div><div class='add'>+	sw_gpio = gpio + 7;</div><div class='add'>+	status = gpio_request(sw_gpio, "user_sw");</div><div class='add'>+	if (status == 0)</div><div class='add'>+		status = gpio_direction_input(sw_gpio);</div><div class='add'>+	if (status == 0)</div><div class='add'>+		status = device_create_file(&amp;client-&gt;dev, &amp;dev_attr_user_sw);</div><div class='add'>+	else</div><div class='add'>+		gpio_free(sw_gpio);</div><div class='add'>+	if (status != 0)</div><div class='add'>+		sw_gpio = -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* audio PLL:  48 kHz (vs 44.1 or 32), single rate (vs double) */</div><div class='add'>+	gpio_request(gpio + 3, "pll_fs2");</div><div class='add'>+	gpio_direction_output(gpio + 3, 0);</div><div class='add'>+</div><div class='add'>+	gpio_request(gpio + 2, "pll_fs1");</div><div class='add'>+	gpio_direction_output(gpio + 2, 0);</div><div class='add'>+</div><div class='add'>+	gpio_request(gpio + 1, "pll_sr");</div><div class='add'>+	gpio_direction_output(gpio + 1, 0);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+evm_u18_teardown(struct i2c_client *client, int gpio, unsigned ngpio, void *c)</div><div class='add'>+{</div><div class='add'>+	gpio_free(gpio + 1);</div><div class='add'>+	gpio_free(gpio + 2);</div><div class='add'>+	gpio_free(gpio + 3);</div><div class='add'>+</div><div class='add'>+	if (sw_gpio &gt; 0) {</div><div class='add'>+		device_remove_file(&amp;client-&gt;dev, &amp;dev_attr_user_sw);</div><div class='add'>+		gpio_free(sw_gpio);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct pcf857x_platform_data pcf_data_u18 = {</div><div class='add'>+	.gpio_base	= PCF_Uxx_BASE(1),</div><div class='add'>+	.n_latch	= (1 &lt;&lt; 3) | (1 &lt;&lt; 2) | (1 &lt;&lt; 1),</div><div class='add'>+	.setup		= evm_u18_setup,</div><div class='add'>+	.teardown	= evm_u18_teardown,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+/* U35 - various I/O signals used to manage USB, CF, ATA, etc */</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+evm_u35_setup(struct i2c_client *client, int gpio, unsigned ngpio, void *c)</div><div class='add'>+{</div><div class='add'>+	/* p0 = nDRV_VBUS (initial:  don't supply it) */</div><div class='add'>+	gpio_request(gpio + 0, "nDRV_VBUS");</div><div class='add'>+	gpio_direction_output(gpio + 0, 1);</div><div class='add'>+</div><div class='add'>+	/* p1 = VDDIMX_EN */</div><div class='add'>+	gpio_request(gpio + 1, "VDDIMX_EN");</div><div class='add'>+	gpio_direction_output(gpio + 1, 1);</div><div class='add'>+</div><div class='add'>+	/* p2 = VLYNQ_EN */</div><div class='add'>+	gpio_request(gpio + 2, "VLYNQ_EN");</div><div class='add'>+	gpio_direction_output(gpio + 2, 1);</div><div class='add'>+</div><div class='add'>+	/* p3 = n3V3_CF_RESET (initial: stay in reset) */</div><div class='add'>+	gpio_request(gpio + 3, "nCF_RESET");</div><div class='add'>+	gpio_direction_output(gpio + 3, 0);</div><div class='add'>+</div><div class='add'>+	/* (p4 unused) */</div><div class='add'>+</div><div class='add'>+	/* p5 = 1V8_WLAN_RESET (initial: stay in reset) */</div><div class='add'>+	gpio_request(gpio + 5, "WLAN_RESET");</div><div class='add'>+	gpio_direction_output(gpio + 5, 1);</div><div class='add'>+</div><div class='add'>+	/* p6 = nATA_SEL (initial: select) */</div><div class='add'>+	gpio_request(gpio + 6, "nATA_SEL");</div><div class='add'>+	gpio_direction_output(gpio + 6, 0);</div><div class='add'>+</div><div class='add'>+	/* p7 = nCF_SEL (initial: deselect) */</div><div class='add'>+	gpio_request(gpio + 7, "nCF_SEL");</div><div class='add'>+	gpio_direction_output(gpio + 7, 1);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+evm_u35_teardown(struct i2c_client *client, int gpio, unsigned ngpio, void *c)</div><div class='add'>+{</div><div class='add'>+	gpio_free(gpio + 7);</div><div class='add'>+	gpio_free(gpio + 6);</div><div class='add'>+	gpio_free(gpio + 5);</div><div class='add'>+	gpio_free(gpio + 3);</div><div class='add'>+	gpio_free(gpio + 2);</div><div class='add'>+	gpio_free(gpio + 1);</div><div class='add'>+	gpio_free(gpio + 0);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct pcf857x_platform_data pcf_data_u35 = {</div><div class='add'>+	.gpio_base	= PCF_Uxx_BASE(2),</div><div class='add'>+	.setup		= evm_u35_setup,</div><div class='add'>+	.teardown	= evm_u35_teardown,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+/* Most of this EEPROM is unused, but U-Boot uses some data:</div><div class='add'>+ *  - 0x7f00, 6 bytes Ethernet Address</div><div class='add'>+ *  - 0x0039, 1 byte NTSC vs PAL (bit 0x80 == PAL)</div><div class='add'>+ *  - ... newer boards may have more</div><div class='add'>+ */</div><div class='add'>+static struct at24_platform_data eeprom_info = {</div><div class='add'>+	.byte_len	= (256*1024) / 8,</div><div class='add'>+	.page_size	= 64,</div><div class='add'>+	.flags		= AT24_FLAG_ADDR16,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct i2c_board_info __initdata i2c_info[] =  {</div><div class='add'>+	{</div><div class='add'>+		I2C_BOARD_INFO("pcf8574", 0x38),</div><div class='add'>+		.platform_data	= &amp;pcf_data_u2,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		I2C_BOARD_INFO("pcf8574", 0x39),</div><div class='add'>+		.platform_data	= &amp;pcf_data_u18,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		I2C_BOARD_INFO("pcf8574", 0x3a),</div><div class='add'>+		.platform_data	= &amp;pcf_data_u35,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		I2C_BOARD_INFO("24c256", 0x50),</div><div class='add'>+		.platform_data	= &amp;eeprom_info,</div><div class='add'>+	},</div><div class='add'>+	/* ALSO:</div><div class='add'>+	 * - tvl320aic33 audio codec (0x1b)</div><div class='add'>+	 * - msp430 microcontroller (0x23)</div><div class='add'>+	 * - tvp5146 video decoder (0x5d)</div><div class='add'>+	 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* The msp430 uses a slow bitbanged I2C implementation (ergo 20 KHz),</div><div class='add'>+ * which requires 100 usec of idle bus after i2c writes sent to it.</div><div class='add'>+ */</div><div class='add'>+static struct davinci_i2c_platform_data i2c_pdata = {</div><div class='add'>+	.bus_freq	= 20 /* kHz */,</div><div class='add'>+	.bus_delay	= 100 /* usec */,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init evm_init_i2c(void)</div><div class='add'>+{</div><div class='add'>+	davinci_init_i2c(&amp;i2c_pdata);</div><div class='add'>+	i2c_register_board_info(1, i2c_info, ARRAY_SIZE(i2c_info));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct platform_device *davinci_evm_devices[] __initdata = {</div><div class='del'>-	&amp;davinci_evm_flash_device,</div><div class='add'>+#if defined(CONFIG_MTD_PHYSMAP) || \</div><div class='add'>+    defined(CONFIG_MTD_PHYSMAP_MODULE)</div><div class='add'>+	&amp;davinci_evm_norflash_device,</div><div class='add'>+#endif</div><div class='add'>+#if defined(CONFIG_BLK_DEV_PALMCHIP_BK3710) || \</div><div class='add'>+    defined(CONFIG_BLK_DEV_PALMCHIP_BK3710_MODULE)</div><div class='add'>+	&amp;ide_dev,</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void __init</div><div class='hunk'>@@ -106,13 +405,21 @@ static __init void davinci_evm_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	davinci_psc_init();</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_BLK_DEV_DAVINCI) || defined(CONFIG_BLK_DEV_DAVINCI_MODULE)</div><div class='add'>+#if defined(CONFIG_BLK_DEV_PALMCHIP_BK3710) || \</div><div class='add'>+    defined(CONFIG_BLK_DEV_PALMCHIP_BK3710_MODULE)</div><div class='add'>+#if defined(CONFIG_MTD_PHYSMAP) || \</div><div class='add'>+    defined(CONFIG_MTD_PHYSMAP_MODULE)</div><div class='ctx'> 	printk(KERN_WARNING "WARNING: both IDE and NOR flash are enabled, "</div><div class='ctx'> 	       "but share pins.\n\t Disable IDE for NOR support.\n");</div><div class='ctx'> #endif</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	platform_add_devices(davinci_evm_devices,</div><div class='ctx'> 			     ARRAY_SIZE(davinci_evm_devices));</div><div class='add'>+	evm_init_i2c();</div><div class='add'>+</div><div class='add'>+	/* irlml6401 sustains over 3A, switches 5V in under 8 msec */</div><div class='add'>+	setup_usb(500, 8);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static __init void davinci_evm_irq_init(void)</div><div class='hunk'>@@ -124,7 +431,7 @@ static __init void davinci_evm_irq_init(void)</div><div class='ctx'> MACHINE_START(DAVINCI_EVM, "DaVinci EVM")</div><div class='ctx'> 	/* Maintainer: MontaVista Software &lt;source@mvista.com&gt; */</div><div class='ctx'> 	.phys_io      = IO_PHYS,</div><div class='del'>-	.io_pg_offst  = (io_p2v(IO_PHYS) &gt;&gt; 18) &amp; 0xfffc,</div><div class='add'>+	.io_pg_offst  = (__IO_ADDRESS(IO_PHYS) &gt;&gt; 18) &amp; 0xfffc,</div><div class='ctx'> 	.boot_params  = (DAVINCI_DDR_BASE + 0x100),</div><div class='ctx'> 	.map_io	      = davinci_evm_map_io,</div><div class='ctx'> 	.init_irq     = davinci_evm_irq_init,</div><div class='head'>diff --git a/arch/arm/mach-davinci/clock.c b/arch/arm/mach-davinci/clock.c<br/>index d46c69b55aaa..28f6dbc95bd7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-davinci/clock.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-davinci/clock.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-davinci/clock.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-davinci/clock.c</a></div><div class='hunk'>@@ -16,9 +16,9 @@</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/psc.h&gt;</div><div class='ctx'> #include "clock.h"</div><div class='head'>diff --git a/arch/arm/mach-davinci/devices.c b/arch/arm/mach-davinci/devices.c<br/>new file mode 100644<br/>index 000000000000..3d4b1de8f898<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-davinci/devices.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-davinci/devices.c</a></div><div class='hunk'>@@ -0,0 +1,48 @@</div><div class='add'>+/*</div><div class='add'>+ * mach-davinci/devices.c</div><div class='add'>+ *</div><div class='add'>+ * DaVinci platform device setup/initialization</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/mach/map.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/i2c.h&gt;</div><div class='add'>+</div><div class='add'>+static struct resource i2c_resources[] = {</div><div class='add'>+	{</div><div class='add'>+		.start		= DAVINCI_I2C_BASE,</div><div class='add'>+		.end		= DAVINCI_I2C_BASE + 0x40,</div><div class='add'>+		.flags		= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.start		= IRQ_I2C,</div><div class='add'>+		.flags		= IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device davinci_i2c_device = {</div><div class='add'>+	.name           = "i2c_davinci",</div><div class='add'>+	.id             = 1,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(i2c_resources),</div><div class='add'>+	.resource	= i2c_resources,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void __init davinci_init_i2c(struct davinci_i2c_platform_data *pdata)</div><div class='add'>+{</div><div class='add'>+	davinci_i2c_device.dev.platform_data = pdata;</div><div class='add'>+	(void) platform_device_register(&amp;davinci_i2c_device);</div><div class='add'>+}</div><div class='add'>+</div><div class='head'>diff --git a/arch/arm/mach-davinci/gpio.c b/arch/arm/mach-davinci/gpio.c<br/>index c9cb4f09b18f..b49e9d092aab 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-davinci/gpio.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-davinci/gpio.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-davinci/gpio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-davinci/gpio.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  * TI DaVinci GPIO Support</div><div class='ctx'>  *</div><div class='del'>- * Copyright (c) 2006 David Brownell</div><div class='add'>+ * Copyright (c) 2006-2007 David Brownell</div><div class='ctx'>  * Copyright (c) 2007, MontaVista Software, Inc. &lt;source@mvista.com&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='hunk'>@@ -26,47 +26,45 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-static DEFINE_SPINLOCK(gpio_lock);</div><div class='del'>-static DECLARE_BITMAP(gpio_in_use, DAVINCI_N_GPIO);</div><div class='ctx'> </div><div class='del'>-int gpio_request(unsigned gpio, const char *tag)</div><div class='del'>-{</div><div class='del'>-	if (gpio &gt;= DAVINCI_N_GPIO)</div><div class='del'>-		return -EINVAL;</div><div class='add'>+static DEFINE_SPINLOCK(gpio_lock);</div><div class='ctx'> </div><div class='del'>-	if (test_and_set_bit(gpio, gpio_in_use))</div><div class='del'>-		return -EBUSY;</div><div class='add'>+struct davinci_gpio {</div><div class='add'>+	struct gpio_chip	chip;</div><div class='add'>+	struct gpio_controller	*__iomem regs;</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(gpio_request);</div><div class='add'>+static struct davinci_gpio chips[DIV_ROUND_UP(DAVINCI_N_GPIO, 32)];</div><div class='ctx'> </div><div class='del'>-void gpio_free(unsigned gpio)</div><div class='del'>-{</div><div class='del'>-	if (gpio &gt;= DAVINCI_N_GPIO)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	clear_bit(gpio, gpio_in_use);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(gpio_free);</div><div class='ctx'> </div><div class='ctx'> /* create a non-inlined version */</div><div class='del'>-static struct gpio_controller *__iomem gpio2controller(unsigned gpio)</div><div class='add'>+static struct gpio_controller *__iomem __init gpio2controller(unsigned gpio)</div><div class='ctx'> {</div><div class='ctx'> 	return __gpio_to_controller(gpio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+/*--------------------------------------------------------------------------*/</div><div class='add'>+</div><div class='ctx'> /*</div><div class='del'>- * Assuming the pin is muxed as a gpio output, set its output value.</div><div class='add'>+ * board setup code *MUST* set PINMUX0 and PINMUX1 as</div><div class='add'>+ * needed, and enable the GPIO clock.</div><div class='ctx'>  */</div><div class='del'>-void __gpio_set(unsigned gpio, int value)</div><div class='add'>+</div><div class='add'>+static int davinci_direction_in(struct gpio_chip *chip, unsigned offset)</div><div class='ctx'> {</div><div class='del'>-	struct gpio_controller *__iomem g = gpio2controller(gpio);</div><div class='add'>+	struct davinci_gpio *d = container_of(chip, struct davinci_gpio, chip);</div><div class='add'>+	struct gpio_controller *__iomem g = d-&gt;regs;</div><div class='add'>+	u32 temp;</div><div class='ctx'> </div><div class='del'>-	__raw_writel(__gpio_mask(gpio), value ? &amp;g-&gt;set_data : &amp;g-&gt;clr_data);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(__gpio_set);</div><div class='add'>+	spin_lock(&amp;gpio_lock);</div><div class='add'>+	temp = __raw_readl(&amp;g-&gt;dir);</div><div class='add'>+	temp |= (1 &lt;&lt; offset);</div><div class='add'>+	__raw_writel(temp, &amp;g-&gt;dir);</div><div class='add'>+	spin_unlock(&amp;gpio_lock);</div><div class='ctx'> </div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Read the pin's value (works even if it's set up as output);</div><div class='hunk'>@@ -75,61 +73,72 @@ EXPORT_SYMBOL(__gpio_set);</div><div class='ctx'>  * Note that changes are synched to the GPIO clock, so reading values back</div><div class='ctx'>  * right after you've set them may give old values.</div><div class='ctx'>  */</div><div class='del'>-int __gpio_get(unsigned gpio)</div><div class='add'>+static int davinci_gpio_get(struct gpio_chip *chip, unsigned offset)</div><div class='ctx'> {</div><div class='del'>-	struct gpio_controller *__iomem g = gpio2controller(gpio);</div><div class='add'>+	struct davinci_gpio *d = container_of(chip, struct davinci_gpio, chip);</div><div class='add'>+	struct gpio_controller *__iomem g = d-&gt;regs;</div><div class='ctx'> </div><div class='del'>-	return !!(__gpio_mask(gpio) &amp; __raw_readl(&amp;g-&gt;in_data));</div><div class='add'>+	return (1 &lt;&lt; offset) &amp; __raw_readl(&amp;g-&gt;in_data);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(__gpio_get);</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-/*--------------------------------------------------------------------------*/</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * board setup code *MUST* set PINMUX0 and PINMUX1 as</div><div class='del'>- * needed, and enable the GPIO clock.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-int gpio_direction_input(unsigned gpio)</div><div class='add'>+static int</div><div class='add'>+davinci_direction_out(struct gpio_chip *chip, unsigned offset, int value)</div><div class='ctx'> {</div><div class='del'>-	struct gpio_controller *__iomem g = gpio2controller(gpio);</div><div class='add'>+	struct davinci_gpio *d = container_of(chip, struct davinci_gpio, chip);</div><div class='add'>+	struct gpio_controller *__iomem g = d-&gt;regs;</div><div class='ctx'> 	u32 temp;</div><div class='del'>-	u32 mask;</div><div class='del'>-</div><div class='del'>-	if (!g)</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	u32 mask = 1 &lt;&lt; offset;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;gpio_lock);</div><div class='del'>-	mask = __gpio_mask(gpio);</div><div class='ctx'> 	temp = __raw_readl(&amp;g-&gt;dir);</div><div class='del'>-	temp |= mask;</div><div class='add'>+	temp &amp;= ~mask;</div><div class='add'>+	__raw_writel(mask, value ? &amp;g-&gt;set_data : &amp;g-&gt;clr_data);</div><div class='ctx'> 	__raw_writel(temp, &amp;g-&gt;dir);</div><div class='ctx'> 	spin_unlock(&amp;gpio_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(gpio_direction_input);</div><div class='ctx'> </div><div class='del'>-int gpio_direction_output(unsigned gpio, int value)</div><div class='add'>+/*</div><div class='add'>+ * Assuming the pin is muxed as a gpio output, set its output value.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+davinci_gpio_set(struct gpio_chip *chip, unsigned offset, int value)</div><div class='ctx'> {</div><div class='del'>-	struct gpio_controller *__iomem g = gpio2controller(gpio);</div><div class='del'>-	u32 temp;</div><div class='del'>-	u32 mask;</div><div class='add'>+	struct davinci_gpio *d = container_of(chip, struct davinci_gpio, chip);</div><div class='add'>+	struct gpio_controller *__iomem g = d-&gt;regs;</div><div class='ctx'> </div><div class='del'>-	if (!g)</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	__raw_writel((1 &lt;&lt; offset), value ? &amp;g-&gt;set_data : &amp;g-&gt;clr_data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init davinci_gpio_setup(void)</div><div class='add'>+{</div><div class='add'>+	int i, base;</div><div class='add'>+</div><div class='add'>+	for (i = 0, base = 0;</div><div class='add'>+			i &lt; ARRAY_SIZE(chips);</div><div class='add'>+			i++, base += 32) {</div><div class='add'>+		chips[i].chip.label = "DaVinci";</div><div class='add'>+</div><div class='add'>+		chips[i].chip.direction_input = davinci_direction_in;</div><div class='add'>+		chips[i].chip.get = davinci_gpio_get;</div><div class='add'>+		chips[i].chip.direction_output = davinci_direction_out;</div><div class='add'>+		chips[i].chip.set = davinci_gpio_set;</div><div class='add'>+</div><div class='add'>+		chips[i].chip.base = base;</div><div class='add'>+		chips[i].chip.ngpio = DAVINCI_N_GPIO - base;</div><div class='add'>+		if (chips[i].chip.ngpio &gt; 32)</div><div class='add'>+			chips[i].chip.ngpio = 32;</div><div class='add'>+</div><div class='add'>+		chips[i].regs = gpio2controller(base);</div><div class='add'>+</div><div class='add'>+		gpiochip_add(&amp;chips[i].chip);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;gpio_lock);</div><div class='del'>-	mask = __gpio_mask(gpio);</div><div class='del'>-	temp = __raw_readl(&amp;g-&gt;dir);</div><div class='del'>-	temp &amp;= ~mask;</div><div class='del'>-	__raw_writel(mask, value ? &amp;g-&gt;set_data : &amp;g-&gt;clr_data);</div><div class='del'>-	__raw_writel(temp, &amp;g-&gt;dir);</div><div class='del'>-	spin_unlock(&amp;gpio_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(gpio_direction_output);</div><div class='add'>+pure_initcall(davinci_gpio_setup);</div><div class='ctx'> </div><div class='add'>+/*--------------------------------------------------------------------------*/</div><div class='ctx'> /*</div><div class='ctx'>  * We expect irqs will normally be set up as input pins, but they can also be</div><div class='ctx'>  * used as output pins ... which is convenient for testing.</div><div class='hunk'>@@ -201,7 +210,6 @@ gpio_irq_handler(unsigned irq, struct irq_desc *desc)</div><div class='ctx'> 	desc-&gt;chip-&gt;ack(irq);</div><div class='ctx'> 	while (1) {</div><div class='ctx'> 		u32		status;</div><div class='del'>-		struct irq_desc	*gpio;</div><div class='ctx'> 		int		n;</div><div class='ctx'> 		int		res;</div><div class='ctx'> </div><div class='hunk'>@@ -215,12 +223,10 @@ gpio_irq_handler(unsigned irq, struct irq_desc *desc)</div><div class='ctx'> </div><div class='ctx'> 		/* now demux them to the right lowlevel handler */</div><div class='ctx'> 		n = (int)get_irq_data(irq);</div><div class='del'>-		gpio = &amp;irq_desc[n];</div><div class='ctx'> 		while (status) {</div><div class='ctx'> 			res = ffs(status);</div><div class='ctx'> 			n += res;</div><div class='del'>-			gpio += res;</div><div class='del'>-			desc_handle_irq(n - 1, gpio - 1);</div><div class='add'>+			generic_handle_irq(n - 1);</div><div class='ctx'> 			status &gt;&gt;= res;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/arm/mach-davinci/id.c b/arch/arm/mach-davinci/id.c<br/>index 70608f76aed8..bf067d604918 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-davinci/id.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-davinci/id.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-davinci/id.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-davinci/id.c</a></div><div class='hunk'>@@ -13,8 +13,7 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define JTAG_ID_BASE		0x01c40028</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-davinci/include/mach/common.h b/arch/arm/mach-davinci/include/mach/common.h<br/>index a97dfbb15e57..4b522e5c70ec 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-davinci/include/mach/common.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-davinci/include/mach/common.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-davinci/include/mach/common.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-davinci/include/mach/common.h</a></div><div class='hunk'>@@ -16,4 +16,7 @@ struct sys_timer;</div><div class='ctx'> </div><div class='ctx'> extern struct sys_timer davinci_timer;</div><div class='ctx'> </div><div class='add'>+/* parameters describe VBUS sourcing for host mode */</div><div class='add'>+extern void setup_usb(unsigned mA, unsigned potpgt_msec);</div><div class='add'>+</div><div class='ctx'> #endif /* __ARCH_ARM_MACH_DAVINCI_COMMON_H */</div><div class='head'>diff --git a/arch/arm/mach-davinci/include/mach/gpio.h b/arch/arm/mach-davinci/include/mach/gpio.h<br/>index ec151ccf1e8f..b3a2961f0f46 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-davinci/include/mach/gpio.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-davinci/include/mach/gpio.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-davinci/include/mach/gpio.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-davinci/include/mach/gpio.h</a></div><div class='hunk'>@@ -14,6 +14,7 @@</div><div class='ctx'> #define	__DAVINCI_GPIO_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;asm-generic/gpio.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -27,13 +28,16 @@</div><div class='ctx'>  * need to pay attention to PINMUX0 and PINMUX1 to be sure those pins are</div><div class='ctx'>  * used as gpios, not with other peripherals.</div><div class='ctx'>  *</div><div class='del'>- * GPIOs are numbered 0..(DAVINCI_N_GPIO-1).  For documentation, and maybe</div><div class='del'>- * for later updates, code should write GPIO(N) or:</div><div class='add'>+ * On-chip GPIOs are numbered 0..(DAVINCI_N_GPIO-1).  For documentation,</div><div class='add'>+ * and maybe for later updates, code should write GPIO(N) or:</div><div class='ctx'>  *  - GPIOV18(N) for 1.8V pins, N in 0..53; same as GPIO(0)..GPIO(53)</div><div class='ctx'>  *  - GPIOV33(N) for 3.3V pins, N in 0..17; same as GPIO(54)..GPIO(70)</div><div class='ctx'>  *</div><div class='ctx'>  * For GPIO IRQs use gpio_to_irq(GPIO(N)) or gpio_to_irq(GPIOV33(N)) etc</div><div class='ctx'>  * for now, that's != GPIO(N)</div><div class='add'>+ *</div><div class='add'>+ * GPIOs can also be on external chips, numbered after the ones built-in</div><div class='add'>+ * to the DaVinci chip.  For now, they won't be usable as IRQ sources.</div><div class='ctx'>  */</div><div class='ctx'> #define	GPIO(X)		(X)		/* 0 &lt;= X &lt;= 70 */</div><div class='ctx'> #define	GPIOV18(X)	(X)		/* 1.8V i/o; 0 &lt;= X &lt;= 53 */</div><div class='hunk'>@@ -67,11 +71,11 @@ __gpio_to_controller(unsigned gpio)</div><div class='ctx'> 	void *__iomem ptr;</div><div class='ctx'> </div><div class='ctx'> 	if (gpio &lt; 32)</div><div class='del'>-		ptr = (void *__iomem)IO_ADDRESS(DAVINCI_GPIO_BASE + 0x10);</div><div class='add'>+		ptr = IO_ADDRESS(DAVINCI_GPIO_BASE + 0x10);</div><div class='ctx'> 	else if (gpio &lt; 64)</div><div class='del'>-		ptr = (void *__iomem)IO_ADDRESS(DAVINCI_GPIO_BASE + 0x38);</div><div class='add'>+		ptr = IO_ADDRESS(DAVINCI_GPIO_BASE + 0x38);</div><div class='ctx'> 	else if (gpio &lt; DAVINCI_N_GPIO)</div><div class='del'>-		ptr = (void *__iomem)IO_ADDRESS(DAVINCI_GPIO_BASE + 0x60);</div><div class='add'>+		ptr = IO_ADDRESS(DAVINCI_GPIO_BASE + 0x60);</div><div class='ctx'> 	else</div><div class='ctx'> 		ptr = NULL;</div><div class='ctx'> 	return ptr;</div><div class='hunk'>@@ -83,25 +87,17 @@ static inline u32 __gpio_mask(unsigned gpio)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* The get/set/clear functions will inline when called with constant</div><div class='del'>- * parameters, for low-overhead bitbanging.  Illegal constant parameters</div><div class='del'>- * cause link-time errors.</div><div class='add'>+ * parameters referencing built-in GPIOs, for low-overhead bitbanging.</div><div class='ctx'>  *</div><div class='del'>- * Otherwise, calls with variable parameters use outlined functions.</div><div class='add'>+ * Otherwise, calls with variable parameters or referencing external</div><div class='add'>+ * GPIOs (e.g. on GPIO expander chips) use outlined functions.</div><div class='ctx'>  */</div><div class='del'>-extern int __error_inval_gpio(void);</div><div class='del'>-</div><div class='del'>-extern void __gpio_set(unsigned gpio, int value);</div><div class='del'>-extern int __gpio_get(unsigned gpio);</div><div class='del'>-</div><div class='ctx'> static inline void gpio_set_value(unsigned gpio, int value)</div><div class='ctx'> {</div><div class='del'>-	if (__builtin_constant_p(value)) {</div><div class='add'>+	if (__builtin_constant_p(value) &amp;&amp; gpio &lt; DAVINCI_N_GPIO) {</div><div class='ctx'> 		struct gpio_controller	*__iomem g;</div><div class='ctx'> 		u32			mask;</div><div class='ctx'> </div><div class='del'>-		if (gpio &gt;= DAVINCI_N_GPIO)</div><div class='del'>-			__error_inval_gpio();</div><div class='del'>-</div><div class='ctx'> 		g = __gpio_to_controller(gpio);</div><div class='ctx'> 		mask = __gpio_mask(gpio);</div><div class='ctx'> 		if (value)</div><div class='hunk'>@@ -111,48 +107,47 @@ static inline void gpio_set_value(unsigned gpio, int value)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	__gpio_set(gpio, value);</div><div class='add'>+	__gpio_set_value(gpio, value);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Returns zero or nonzero; works for gpios configured as inputs OR</div><div class='del'>- * as outputs.</div><div class='add'>+ * as outputs, at least for built-in GPIOs.</div><div class='ctx'>  *</div><div class='del'>- * NOTE: changes in reported values are synchronized to the GPIO clock.</div><div class='del'>- * This is most easily seen after calling gpio_set_value() and then immediatly</div><div class='del'>- * gpio_get_value(), where the gpio_get_value() would return the old value</div><div class='del'>- * until the GPIO clock ticks and the new value gets latched.</div><div class='add'>+ * NOTE: for built-in GPIOs, changes in reported values are synchronized</div><div class='add'>+ * to the GPIO clock.  This is easily seen after calling gpio_set_value()</div><div class='add'>+ * and then immediately gpio_get_value(), where the gpio_get_value() will</div><div class='add'>+ * return the old value until the GPIO clock ticks and the new value gets</div><div class='add'>+ * latched.</div><div class='ctx'>  */</div><div class='del'>-</div><div class='ctx'> static inline int gpio_get_value(unsigned gpio)</div><div class='ctx'> {</div><div class='del'>-	struct gpio_controller *__iomem g;</div><div class='del'>-</div><div class='del'>-	if (!__builtin_constant_p(gpio))</div><div class='del'>-		return __gpio_get(gpio);</div><div class='add'>+	struct gpio_controller	*__iomem g;</div><div class='ctx'> </div><div class='del'>-	if (gpio &gt;= DAVINCI_N_GPIO)</div><div class='del'>-		return __error_inval_gpio();</div><div class='add'>+	if (!__builtin_constant_p(gpio) || gpio &gt;= DAVINCI_N_GPIO)</div><div class='add'>+		return __gpio_get_value(gpio);</div><div class='ctx'> </div><div class='ctx'> 	g = __gpio_to_controller(gpio);</div><div class='del'>-	return !!(__gpio_mask(gpio) &amp; __raw_readl(&amp;g-&gt;in_data));</div><div class='add'>+	return __gpio_mask(gpio) &amp; __raw_readl(&amp;g-&gt;in_data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* powerup default direction is IN */</div><div class='del'>-extern int gpio_direction_input(unsigned gpio);</div><div class='del'>-extern int gpio_direction_output(unsigned gpio, int value);</div><div class='del'>-</div><div class='del'>-#include &lt;asm-generic/gpio.h&gt;	/* cansleep wrappers */</div><div class='del'>-</div><div class='del'>-extern int gpio_request(unsigned gpio, const char *tag);</div><div class='del'>-extern void gpio_free(unsigned gpio);</div><div class='add'>+static inline int gpio_cansleep(unsigned gpio)</div><div class='add'>+{</div><div class='add'>+	if (__builtin_constant_p(gpio) &amp;&amp; gpio &lt; DAVINCI_N_GPIO)</div><div class='add'>+		return 0;</div><div class='add'>+	else</div><div class='add'>+		return __gpio_cansleep(gpio);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static inline int gpio_to_irq(unsigned gpio)</div><div class='ctx'> {</div><div class='add'>+	if (gpio &gt;= DAVINCI_N_GPIO)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	return DAVINCI_N_AINTC_IRQ + gpio;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int irq_to_gpio(unsigned irq)</div><div class='ctx'> {</div><div class='add'>+	/* caller guarantees gpio_to_irq() succeeded */</div><div class='ctx'> 	return irq - DAVINCI_N_AINTC_IRQ;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-davinci/include/mach/i2c.h b/arch/arm/mach-davinci/include/mach/i2c.h<br/>index e2f54168abd1..c248e9b7e825 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-davinci/include/mach/i2c.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-davinci/include/mach/i2c.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-davinci/include/mach/i2c.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-davinci/include/mach/i2c.h</a></div><div class='hunk'>@@ -14,8 +14,11 @@</div><div class='ctx'> </div><div class='ctx'> /* All frequencies are expressed in kHz */</div><div class='ctx'> struct davinci_i2c_platform_data {</div><div class='del'>-	unsigned int	bus_freq;	/* standard bus frequency */</div><div class='del'>-	unsigned int	bus_delay;	/* transaction delay */</div><div class='add'>+	unsigned int	bus_freq;	/* standard bus frequency (kHz) */</div><div class='add'>+	unsigned int	bus_delay;	/* post-transaction delay (usec) */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* for board setup code */</div><div class='add'>+void davinci_init_i2c(struct davinci_i2c_platform_data *);</div><div class='add'>+</div><div class='ctx'> #endif /* __ASM_ARCH_I2C_H */</div><div class='head'>diff --git a/arch/arm/mach-davinci/include/mach/io.h b/arch/arm/mach-davinci/include/mach/io.h<br/>index e7accb910864..b78ee9140496 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-davinci/include/mach/io.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-davinci/include/mach/io.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-davinci/include/mach/io.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-davinci/include/mach/io.h</a></div><div class='hunk'>@@ -22,9 +22,8 @@</div><div class='ctx'> #define IO_OFFSET	0xfd000000 /* Virtual IO = 0xfec00000 */</div><div class='ctx'> #define IO_SIZE		0x00400000</div><div class='ctx'> #define IO_VIRT		(IO_PHYS + IO_OFFSET)</div><div class='del'>-#define io_p2v(pa)	((pa) + IO_OFFSET)</div><div class='ctx'> #define io_v2p(va)	((va) - IO_OFFSET)</div><div class='del'>-#define IO_ADDRESS(x)	io_p2v(x)</div><div class='add'>+#define __IO_ADDRESS(x)	((x) + IO_OFFSET)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * We don't actually have real ISA nor PCI buses, but there is so many</div><div class='hunk'>@@ -35,7 +34,12 @@</div><div class='ctx'> #define __mem_pci(a)		(a)</div><div class='ctx'> #define __mem_isa(a)		(a)</div><div class='ctx'> </div><div class='del'>-#ifndef __ASSEMBLER__</div><div class='add'>+#define IO_ADDRESS(pa)          IOMEM(__IO_ADDRESS(pa))</div><div class='add'>+</div><div class='add'>+#ifdef __ASSEMBLER__</div><div class='add'>+#define IOMEM(x)                x</div><div class='add'>+#else</div><div class='add'>+#define IOMEM(x)                ((void __force __iomem *)(x))</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Functions to access the DaVinci IO region</div><div class='hunk'>@@ -46,34 +50,13 @@</div><div class='ctx'>  *	 - DO NOT use hardcoded virtual addresses to allow changing the</div><div class='ctx'>  *	   IO address space again if needed</div><div class='ctx'>  */</div><div class='del'>-#define davinci_readb(a)	(*(volatile unsigned char  *)IO_ADDRESS(a))</div><div class='del'>-#define davinci_readw(a)	(*(volatile unsigned short *)IO_ADDRESS(a))</div><div class='del'>-#define davinci_readl(a)	(*(volatile unsigned int   *)IO_ADDRESS(a))</div><div class='del'>-</div><div class='del'>-#define davinci_writeb(v,a)	(*(volatile unsigned char  *)IO_ADDRESS(a) = (v))</div><div class='del'>-#define davinci_writew(v,a)	(*(volatile unsigned short *)IO_ADDRESS(a) = (v))</div><div class='del'>-#define davinci_writel(v,a)	(*(volatile unsigned int   *)IO_ADDRESS(a) = (v))</div><div class='del'>-</div><div class='del'>-/* 16 bit uses LDRH/STRH, base +/- offset_8 */</div><div class='del'>-typedef struct { volatile u16 offset[256]; } __regbase16;</div><div class='del'>-#define __REGV16(vaddr)		((__regbase16 *)((vaddr)&amp;~0xff)) \</div><div class='del'>-					-&gt;offset[((vaddr)&amp;0xff)&gt;&gt;1]</div><div class='del'>-#define __REG16(paddr)          __REGV16(io_p2v(paddr))</div><div class='del'>-</div><div class='del'>-/* 8/32 bit uses LDR/STR, base +/- offset_12 */</div><div class='del'>-typedef struct { volatile u8 offset[4096]; } __regbase8;</div><div class='del'>-#define __REGV8(vaddr)		((__regbase8  *)((vaddr)&amp;~4095)) \</div><div class='del'>-					-&gt;offset[((vaddr)&amp;4095)&gt;&gt;0]</div><div class='del'>-#define __REG8(paddr)		__REGV8(io_p2v(paddr))</div><div class='del'>-</div><div class='del'>-typedef struct { volatile u32 offset[4096]; } __regbase32;</div><div class='del'>-#define __REGV32(vaddr)		((__regbase32 *)((vaddr)&amp;~4095)) \</div><div class='del'>-					-&gt;offset[((vaddr)&amp;4095)&gt;&gt;2]</div><div class='del'>-</div><div class='del'>-#define __REG(paddr)		__REGV32(io_p2v(paddr))</div><div class='del'>-#else</div><div class='add'>+#define davinci_readb(a)	__raw_readb(IO_ADDRESS(a))</div><div class='add'>+#define davinci_readw(a)	__raw_readw(IO_ADDRESS(a))</div><div class='add'>+#define davinci_readl(a)	__raw_readl(IO_ADDRESS(a))</div><div class='ctx'> </div><div class='del'>-#define __REG(x)	(*((volatile unsigned long *)io_p2v(x)))</div><div class='add'>+#define davinci_writeb(v, a)	__raw_writeb(v, IO_ADDRESS(a))</div><div class='add'>+#define davinci_writew(v, a)	__raw_writew(v, IO_ADDRESS(a))</div><div class='add'>+#define davinci_writel(v, a)	__raw_writel(v, IO_ADDRESS(a))</div><div class='ctx'> </div><div class='ctx'> #endif /* __ASSEMBLER__ */</div><div class='ctx'> #endif /* __ASM_ARCH_IO_H */</div><div class='head'>diff --git a/arch/arm/mach-davinci/include/mach/system.h b/arch/arm/mach-davinci/include/mach/system.h<br/>index 84ff77aeb738..17ca41dc2c53 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-davinci/include/mach/system.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-davinci/include/mach/system.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-davinci/include/mach/system.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-davinci/include/mach/system.h</a></div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> #ifndef __ASM_ARCH_SYSTEM_H</div><div class='ctx'> #define __ASM_ARCH_SYSTEM_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> extern void davinci_watchdog_reset(void);</div><div class='head'>diff --git a/arch/arm/mach-davinci/io.c b/arch/arm/mach-davinci/io.c<br/>index 5bb66b61c1a3..299515f70b8b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-davinci/io.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-davinci/io.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-davinci/io.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-davinci/io.c</a></div><div class='hunk'>@@ -11,9 +11,9 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/tlb.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/memory.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-davinci/irq.c b/arch/arm/mach-davinci/irq.c<br/>index 12ca9f29f847..38021af8359a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-davinci/irq.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-davinci/irq.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-davinci/irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-davinci/irq.c</a></div><div class='hunk'>@@ -22,9 +22,9 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define IRQ_BIT(irq)		((irq) &amp; 0x1f)</div><div class='head'>diff --git a/arch/arm/mach-davinci/psc.c b/arch/arm/mach-davinci/psc.c<br/>index aa2fc375a325..58754f066d5b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-davinci/psc.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-davinci/psc.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-davinci/psc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-davinci/psc.c</a></div><div class='hunk'>@@ -21,8 +21,8 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;mach/psc.h&gt;</div><div class='ctx'> #include &lt;mach/mux.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-davinci/serial.c b/arch/arm/mach-davinci/serial.c<br/>index caf101e2cc62..3010f9971255 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-davinci/serial.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-davinci/serial.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-davinci/serial.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-davinci/serial.c</a></div><div class='hunk'>@@ -26,8 +26,8 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;mach/serial.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-davinci/time.c b/arch/arm/mach-davinci/time.c<br/>index 206e80d41717..3b9a296b5c4b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-davinci/time.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-davinci/time.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-davinci/time.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-davinci/time.c</a></div><div class='hunk'>@@ -15,8 +15,8 @@</div><div class='ctx'> #include &lt;linux/clocksource.h&gt;</div><div class='ctx'> #include &lt;linux/clockchips.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-davinci/usb.c b/arch/arm/mach-davinci/usb.c<br/>new file mode 100644<br/>index 000000000000..fe182a85159c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-davinci/usb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-davinci/usb.c</a></div><div class='hunk'>@@ -0,0 +1,116 @@</div><div class='add'>+/*</div><div class='add'>+ * USB</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/usb/musb.h&gt;</div><div class='add'>+#include &lt;linux/usb/otg.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;mach/common.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_USB_MUSB_HDRC) || defined(CONFIG_USB_MUSB_HDRC_MODULE)</div><div class='add'>+static struct musb_hdrc_eps_bits musb_eps[] = {</div><div class='add'>+	{ "ep1_tx", 8, },</div><div class='add'>+	{ "ep1_rx", 8, },</div><div class='add'>+	{ "ep2_tx", 8, },</div><div class='add'>+	{ "ep2_rx", 8, },</div><div class='add'>+	{ "ep3_tx", 5, },</div><div class='add'>+	{ "ep3_rx", 5, },</div><div class='add'>+	{ "ep4_tx", 5, },</div><div class='add'>+	{ "ep4_rx", 5, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct musb_hdrc_config musb_config = {</div><div class='add'>+	.multipoint	= true,</div><div class='add'>+	.dyn_fifo	= true,</div><div class='add'>+	.soft_con	= true,</div><div class='add'>+	.dma		= true,</div><div class='add'>+</div><div class='add'>+	.num_eps	= 5,</div><div class='add'>+	.dma_channels	= 8,</div><div class='add'>+	.ram_bits	= 10,</div><div class='add'>+	.eps_bits	= musb_eps,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct musb_hdrc_platform_data usb_data = {</div><div class='add'>+#if defined(CONFIG_USB_MUSB_OTG)</div><div class='add'>+	/* OTG requires a Mini-AB connector */</div><div class='add'>+	.mode           = MUSB_OTG,</div><div class='add'>+#elif defined(CONFIG_USB_MUSB_PERIPHERAL)</div><div class='add'>+	.mode           = MUSB_PERIPHERAL,</div><div class='add'>+#elif defined(CONFIG_USB_MUSB_HOST)</div><div class='add'>+	.mode           = MUSB_HOST,</div><div class='add'>+#endif</div><div class='add'>+	.config		= &amp;musb_config,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource usb_resources[] = {</div><div class='add'>+	{</div><div class='add'>+		/* physical address */</div><div class='add'>+		.start          = DAVINCI_USB_OTG_BASE,</div><div class='add'>+		.end            = DAVINCI_USB_OTG_BASE + 0x5ff,</div><div class='add'>+		.flags          = IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.start          = IRQ_USBINT,</div><div class='add'>+		.flags          = IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u64 usb_dmamask = DMA_32BIT_MASK;</div><div class='add'>+</div><div class='add'>+static struct platform_device usb_dev = {</div><div class='add'>+	.name           = "musb_hdrc",</div><div class='add'>+	.id             = -1,</div><div class='add'>+	.dev = {</div><div class='add'>+		.platform_data		= &amp;usb_data,</div><div class='add'>+		.dma_mask		= &amp;usb_dmamask,</div><div class='add'>+		.coherent_dma_mask      = DMA_32BIT_MASK,</div><div class='add'>+	},</div><div class='add'>+	.resource       = usb_resources,</div><div class='add'>+	.num_resources  = ARRAY_SIZE(usb_resources),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_USB_MUSB_OTG</div><div class='add'>+</div><div class='add'>+static struct otg_transceiver *xceiv;</div><div class='add'>+</div><div class='add'>+struct otg_transceiver *otg_get_transceiver(void)</div><div class='add'>+{</div><div class='add'>+	if (xceiv)</div><div class='add'>+		get_device(xceiv-&gt;dev);</div><div class='add'>+	return xceiv;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(otg_get_transceiver);</div><div class='add'>+</div><div class='add'>+int otg_set_transceiver(struct otg_transceiver *x)</div><div class='add'>+{</div><div class='add'>+	if (xceiv &amp;&amp; x)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	xceiv = x;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(otg_set_transceiver);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+void __init setup_usb(unsigned mA, unsigned potpgt_msec)</div><div class='add'>+{</div><div class='add'>+	usb_data.power = mA / 2;</div><div class='add'>+	usb_data.potpgt = potpgt_msec / 2;</div><div class='add'>+	platform_device_register(&amp;usb_dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+void __init setup_usb(unsigned mA, unsigned potpgt_msec)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif  /* CONFIG_USB_MUSB_HDRC */</div><div class='add'>+</div><div class='head'>diff --git a/arch/arm/mach-ebsa110/core.c b/arch/arm/mach-ebsa110/core.c<br/>index 65cc7c271917..c7bc7fbb11a6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ebsa110/core.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-ebsa110/core.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ebsa110/core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ebsa110/core.c</a></div><div class='hunk'>@@ -14,10 +14,10 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/serial_8250.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-ebsa110/io.c b/arch/arm/mach-ebsa110/io.c<br/>index 53748f5462e9..c52e3047a7eb 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ebsa110/io.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-ebsa110/io.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ebsa110/io.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ebsa110/io.c</a></div><div class='hunk'>@@ -23,9 +23,9 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> </div><div class='ctx'> static void __iomem *__isamem_convert_addr(const volatile void __iomem *addr)</div><div class='head'>diff --git a/arch/arm/mach-ep93xx/Kconfig b/arch/arm/mach-ep93xx/Kconfig<br/>index ea8549bfbef2..5a1b8c05c958 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ep93xx/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-ep93xx/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ep93xx/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ep93xx/Kconfig</a></div><div class='hunk'>@@ -88,6 +88,20 @@ config MACH_TS72XX</div><div class='ctx'> 	  Say 'Y' here if you want your kernel to support the</div><div class='ctx'> 	  Technologic Systems TS-72xx board.</div><div class='ctx'> </div><div class='add'>+choice</div><div class='add'>+	prompt "Select a UART for early kernel messages"</div><div class='add'>+</div><div class='add'>+config EP93XX_EARLY_UART1</div><div class='add'>+	bool "UART1"</div><div class='add'>+</div><div class='add'>+config EP93XX_EARLY_UART2</div><div class='add'>+	bool "UART2"</div><div class='add'>+</div><div class='add'>+config EP93XX_EARLY_UART3</div><div class='add'>+	bool "UART3"</div><div class='add'>+</div><div class='add'>+endchoice</div><div class='add'>+</div><div class='ctx'> endmenu</div><div class='ctx'> </div><div class='ctx'> endif</div><div class='head'>diff --git a/arch/arm/mach-ep93xx/adssphere.c b/arch/arm/mach-ep93xx/adssphere.c<br/>index aa1fb352fb8f..561db73ec1ae 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ep93xx/adssphere.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-ep93xx/adssphere.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ep93xx/adssphere.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ep93xx/adssphere.c</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/physmap.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='hunk'>@@ -47,36 +47,12 @@ static struct ep93xx_eth_data adssphere_eth_data = {</div><div class='ctx'> 	.phy_id		= 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct resource adssphere_eth_resource[] = {</div><div class='del'>-	{</div><div class='del'>-		.start	= EP93XX_ETHERNET_PHYS_BASE,</div><div class='del'>-		.end	= EP93XX_ETHERNET_PHYS_BASE + 0xffff,</div><div class='del'>-		.flags	= IORESOURCE_MEM,</div><div class='del'>-	}, {</div><div class='del'>-		.start	= IRQ_EP93XX_ETHERNET,</div><div class='del'>-		.end	= IRQ_EP93XX_ETHERNET,</div><div class='del'>-		.flags	= IORESOURCE_IRQ,</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct platform_device adssphere_eth_device = {</div><div class='del'>-	.name		= "ep93xx-eth",</div><div class='del'>-	.id		= -1,</div><div class='del'>-	.dev		= {</div><div class='del'>-		.platform_data	= &amp;adssphere_eth_data,</div><div class='del'>-	},</div><div class='del'>-	.num_resources	= 2,</div><div class='del'>-	.resource	= adssphere_eth_resource,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static void __init adssphere_init_machine(void)</div><div class='ctx'> {</div><div class='ctx'> 	ep93xx_init_devices();</div><div class='ctx'> 	platform_device_register(&amp;adssphere_flash);</div><div class='ctx'> </div><div class='del'>-	memcpy(adssphere_eth_data.dev_addr,</div><div class='del'>-		(void *)(EP93XX_ETHERNET_BASE + 0x50), 6);</div><div class='del'>-	platform_device_register(&amp;adssphere_eth_device);</div><div class='add'>+	ep93xx_register_eth(&amp;adssphere_eth_data, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> MACHINE_START(ADSSPHERE, "ADS Sphere board")</div><div class='head'>diff --git a/arch/arm/mach-ep93xx/clock.c b/arch/arm/mach-ep93xx/clock.c<br/>index 6062e47f2043..8c9f2491dccc 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ep93xx/clock.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-ep93xx/clock.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ep93xx/clock.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ep93xx/clock.c</a></div><div class='hunk'>@@ -15,9 +15,9 @@</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;asm/div64.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct clk {</div><div class='ctx'> 	char		*name;</div><div class='head'>diff --git a/arch/arm/mach-ep93xx/core.c b/arch/arm/mach-ep93xx/core.c<br/>index f99f43669392..de53f0be71b9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ep93xx/core.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-ep93xx/core.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ep93xx/core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ep93xx/core.c</a></div><div class='hunk'>@@ -32,6 +32,7 @@</div><div class='ctx'> #include &lt;linux/termios.h&gt;</div><div class='ctx'> #include &lt;linux/amba/bus.h&gt;</div><div class='ctx'> #include &lt;linux/amba/serial.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/types.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='hunk'>@@ -41,7 +42,6 @@</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/tlbflush.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='hunk'>@@ -157,7 +157,7 @@ static unsigned char gpio_int_type2[3];</div><div class='ctx'> static const u8 int_type1_register_offset[3]	= { 0x90, 0xac, 0x4c };</div><div class='ctx'> static const u8 int_type2_register_offset[3]	= { 0x94, 0xb0, 0x50 };</div><div class='ctx'> static const u8 eoi_register_offset[3]		= { 0x98, 0xb4, 0x54 };</div><div class='del'>-static const u8 int_en_register_offset[3]	= { 0x9c, 0xb8, 0x5c };</div><div class='add'>+static const u8 int_en_register_offset[3]	= { 0x9c, 0xb8, 0x58 };</div><div class='ctx'> </div><div class='ctx'> void ep93xx_gpio_update_int_params(unsigned port)</div><div class='ctx'> {</div><div class='hunk'>@@ -192,8 +192,7 @@ static void ep93xx_gpio_ab_irq_handler(unsigned int irq, struct irq_desc *desc)</div><div class='ctx'> 	for (i = 0; i &lt; 8; i++) {</div><div class='ctx'> 		if (status &amp; (1 &lt;&lt; i)) {</div><div class='ctx'> 			int gpio_irq = gpio_to_irq(EP93XX_GPIO_LINE_A(0)) + i;</div><div class='del'>-			desc = irq_desc + gpio_irq;</div><div class='del'>-			desc_handle_irq(gpio_irq, desc);</div><div class='add'>+			generic_handle_irq(gpio_irq);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -202,7 +201,7 @@ static void ep93xx_gpio_ab_irq_handler(unsigned int irq, struct irq_desc *desc)</div><div class='ctx'> 		if (status &amp; (1 &lt;&lt; i)) {</div><div class='ctx'> 			int gpio_irq = gpio_to_irq(EP93XX_GPIO_LINE_B(0)) + i;</div><div class='ctx'> 			desc = irq_desc + gpio_irq;</div><div class='del'>-			desc_handle_irq(gpio_irq, desc);</div><div class='add'>+			generic_handle_irq(gpio_irq);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -217,7 +216,7 @@ static void ep93xx_gpio_f_irq_handler(unsigned int irq, struct irq_desc *desc)</div><div class='ctx'> 	int port_f_idx = ((irq + 1) &amp; 7) ^ 4; /* {19..22,47..50} -&gt; {0..7} */</div><div class='ctx'> 	int gpio_irq = gpio_to_irq(EP93XX_GPIO_LINE_F(0)) + port_f_idx;</div><div class='ctx'> </div><div class='del'>-	desc_handle_irq(gpio_irq, irq_desc + gpio_irq);</div><div class='add'>+	generic_handle_irq(gpio_irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ep93xx_gpio_irq_ack(unsigned int irq)</div><div class='hunk'>@@ -461,6 +460,41 @@ static struct platform_device ep93xx_ohci_device = {</div><div class='ctx'> 	.resource	= ep93xx_ohci_resources,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct ep93xx_eth_data ep93xx_eth_data;</div><div class='add'>+</div><div class='add'>+static struct resource ep93xx_eth_resource[] = {</div><div class='add'>+	{</div><div class='add'>+		.start	= EP93XX_ETHERNET_PHYS_BASE,</div><div class='add'>+		.end	= EP93XX_ETHERNET_PHYS_BASE + 0xffff,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	}, {</div><div class='add'>+		.start	= IRQ_EP93XX_ETHERNET,</div><div class='add'>+		.end	= IRQ_EP93XX_ETHERNET,</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device ep93xx_eth_device = {</div><div class='add'>+	.name		= "ep93xx-eth",</div><div class='add'>+	.id		= -1,</div><div class='add'>+	.dev		= {</div><div class='add'>+		.platform_data	= &amp;ep93xx_eth_data,</div><div class='add'>+	},</div><div class='add'>+	.num_resources	= ARRAY_SIZE(ep93xx_eth_resource),</div><div class='add'>+	.resource	= ep93xx_eth_resource,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void __init ep93xx_register_eth(struct ep93xx_eth_data *data, int copy_addr)</div><div class='add'>+{</div><div class='add'>+	if (copy_addr) {</div><div class='add'>+		memcpy(data-&gt;dev_addr,</div><div class='add'>+			(void *)(EP93XX_ETHERNET_BASE + 0x50), 6);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ep93xx_eth_data = *data;</div><div class='add'>+	platform_device_register(&amp;ep93xx_eth_device);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> extern void ep93xx_gpio_init(void);</div><div class='ctx'> </div><div class='ctx'> void __init ep93xx_init_devices(void)</div><div class='head'>diff --git a/arch/arm/mach-ep93xx/edb9302.c b/arch/arm/mach-ep93xx/edb9302.c<br/>index 97550c0ad7b0..e4add5bdccfd 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ep93xx/edb9302.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-ep93xx/edb9302.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ep93xx/edb9302.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ep93xx/edb9302.c</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/physmap.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='hunk'>@@ -43,10 +43,16 @@ static struct platform_device edb9302_flash = {</div><div class='ctx'> 	.resource	= &amp;edb9302_flash_resource,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct ep93xx_eth_data edb9302_eth_data = {</div><div class='add'>+	.phy_id		= 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static void __init edb9302_init_machine(void)</div><div class='ctx'> {</div><div class='ctx'> 	ep93xx_init_devices();</div><div class='ctx'> 	platform_device_register(&amp;edb9302_flash);</div><div class='add'>+</div><div class='add'>+	ep93xx_register_eth(&amp;edb9302_eth_data, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> MACHINE_START(EDB9302, "Cirrus Logic EDB9302 Evaluation Board")</div><div class='head'>diff --git a/arch/arm/mach-ep93xx/edb9302a.c b/arch/arm/mach-ep93xx/edb9302a.c<br/>index 99b01d44bf1c..02c4405afed7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ep93xx/edb9302a.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-ep93xx/edb9302a.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ep93xx/edb9302a.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ep93xx/edb9302a.c</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/physmap.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='hunk'>@@ -47,36 +47,12 @@ static struct ep93xx_eth_data edb9302a_eth_data = {</div><div class='ctx'> 	.phy_id			= 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct resource edb9302a_eth_resource[] = {</div><div class='del'>-	{</div><div class='del'>-		.start	= EP93XX_ETHERNET_PHYS_BASE,</div><div class='del'>-		.end	= EP93XX_ETHERNET_PHYS_BASE + 0xffff,</div><div class='del'>-		.flags	= IORESOURCE_MEM,</div><div class='del'>-	}, {</div><div class='del'>-		.start	= IRQ_EP93XX_ETHERNET,</div><div class='del'>-		.end	= IRQ_EP93XX_ETHERNET,</div><div class='del'>-		.flags	= IORESOURCE_IRQ,</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct platform_device edb9302a_eth_device = {</div><div class='del'>-	.name		= "ep93xx-eth",</div><div class='del'>-	.id		= -1,</div><div class='del'>-	.dev		= {</div><div class='del'>-		.platform_data	= &amp;edb9302a_eth_data,</div><div class='del'>-	},</div><div class='del'>-	.num_resources	= 2,</div><div class='del'>-	.resource	= edb9302a_eth_resource,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static void __init edb9302a_init_machine(void)</div><div class='ctx'> {</div><div class='ctx'> 	ep93xx_init_devices();</div><div class='ctx'> 	platform_device_register(&amp;edb9302a_flash);</div><div class='ctx'> </div><div class='del'>-	memcpy(edb9302a_eth_data.dev_addr,</div><div class='del'>-		(void *)(EP93XX_ETHERNET_BASE + 0x50), 6);</div><div class='del'>-	platform_device_register(&amp;edb9302a_eth_device);</div><div class='add'>+	ep93xx_register_eth(&amp;edb9302a_eth_data, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> MACHINE_START(EDB9302A, "Cirrus Logic EDB9302A Evaluation Board")</div><div class='head'>diff --git a/arch/arm/mach-ep93xx/edb9307.c b/arch/arm/mach-ep93xx/edb9307.c<br/>index 9fb72d01a36c..040edbd2ea05 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ep93xx/edb9307.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-ep93xx/edb9307.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ep93xx/edb9307.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ep93xx/edb9307.c</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/physmap.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='hunk'>@@ -47,36 +47,12 @@ static struct ep93xx_eth_data edb9307_eth_data = {</div><div class='ctx'> 	.phy_id			= 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct resource edb9307_eth_resource[] = {</div><div class='del'>-	{</div><div class='del'>-		.start	= EP93XX_ETHERNET_PHYS_BASE,</div><div class='del'>-		.end	= EP93XX_ETHERNET_PHYS_BASE + 0xffff,</div><div class='del'>-		.flags	= IORESOURCE_MEM,</div><div class='del'>-	}, {</div><div class='del'>-		.start	= IRQ_EP93XX_ETHERNET,</div><div class='del'>-		.end	= IRQ_EP93XX_ETHERNET,</div><div class='del'>-		.flags	= IORESOURCE_IRQ,</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct platform_device edb9307_eth_device = {</div><div class='del'>-	.name		= "ep93xx-eth",</div><div class='del'>-	.id		= -1,</div><div class='del'>-	.dev		= {</div><div class='del'>-		.platform_data	= &amp;edb9307_eth_data,</div><div class='del'>-	},</div><div class='del'>-	.num_resources	= 2,</div><div class='del'>-	.resource	= edb9307_eth_resource,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static void __init edb9307_init_machine(void)</div><div class='ctx'> {</div><div class='ctx'> 	ep93xx_init_devices();</div><div class='ctx'> 	platform_device_register(&amp;edb9307_flash);</div><div class='ctx'> </div><div class='del'>-	memcpy(edb9307_eth_data.dev_addr,</div><div class='del'>-		(void *)(EP93XX_ETHERNET_BASE + 0x50), 6);</div><div class='del'>-	platform_device_register(&amp;edb9307_eth_device);</div><div class='add'>+	ep93xx_register_eth(&amp;edb9307_eth_data, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> MACHINE_START(EDB9307, "Cirrus Logic EDB9307 Evaluation Board")</div><div class='head'>diff --git a/arch/arm/mach-ep93xx/edb9312.c b/arch/arm/mach-ep93xx/edb9312.c<br/>index 87267a574f5e..6853e302bc3a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ep93xx/edb9312.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-ep93xx/edb9312.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ep93xx/edb9312.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ep93xx/edb9312.c</a></div><div class='hunk'>@@ -19,7 +19,7 @@</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/physmap.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='hunk'>@@ -44,10 +44,16 @@ static struct platform_device edb9312_flash = {</div><div class='ctx'> 	.resource	= &amp;edb9312_flash_resource,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct ep93xx_eth_data edb9312_eth_data = {</div><div class='add'>+	.phy_id			= 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static void __init edb9312_init_machine(void)</div><div class='ctx'> {</div><div class='ctx'> 	ep93xx_init_devices();</div><div class='ctx'> 	platform_device_register(&amp;edb9312_flash);</div><div class='add'>+</div><div class='add'>+	ep93xx_register_eth(&amp;edb9312_eth_data, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> MACHINE_START(EDB9312, "Cirrus Logic EDB9312 Evaluation Board")</div><div class='head'>diff --git a/arch/arm/mach-ep93xx/edb9315.c b/arch/arm/mach-ep93xx/edb9315.c<br/>index 7e373950be4d..9469b350d253 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ep93xx/edb9315.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-ep93xx/edb9315.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ep93xx/edb9315.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ep93xx/edb9315.c</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/physmap.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='hunk'>@@ -43,10 +43,16 @@ static struct platform_device edb9315_flash = {</div><div class='ctx'> 	.resource	= &amp;edb9315_flash_resource,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct ep93xx_eth_data edb9315_eth_data = {</div><div class='add'>+	.phy_id			= 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static void __init edb9315_init_machine(void)</div><div class='ctx'> {</div><div class='ctx'> 	ep93xx_init_devices();</div><div class='ctx'> 	platform_device_register(&amp;edb9315_flash);</div><div class='add'>+</div><div class='add'>+	ep93xx_register_eth(&amp;edb9315_eth_data, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> MACHINE_START(EDB9315, "Cirrus Logic EDB9315 Evaluation Board")</div><div class='head'>diff --git a/arch/arm/mach-ep93xx/edb9315a.c b/arch/arm/mach-ep93xx/edb9315a.c<br/>index 08a7c9bfb689..584457ce7c80 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ep93xx/edb9315a.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-ep93xx/edb9315a.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ep93xx/edb9315a.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ep93xx/edb9315a.c</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/physmap.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='hunk'>@@ -47,36 +47,12 @@ static struct ep93xx_eth_data edb9315a_eth_data = {</div><div class='ctx'> 	.phy_id			= 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct resource edb9315a_eth_resource[] = {</div><div class='del'>-	{</div><div class='del'>-		.start	= EP93XX_ETHERNET_PHYS_BASE,</div><div class='del'>-		.end	= EP93XX_ETHERNET_PHYS_BASE + 0xffff,</div><div class='del'>-		.flags	= IORESOURCE_MEM,</div><div class='del'>-	}, {</div><div class='del'>-		.start	= IRQ_EP93XX_ETHERNET,</div><div class='del'>-		.end	= IRQ_EP93XX_ETHERNET,</div><div class='del'>-		.flags	= IORESOURCE_IRQ,</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct platform_device edb9315a_eth_device = {</div><div class='del'>-	.name		= "ep93xx-eth",</div><div class='del'>-	.id		= -1,</div><div class='del'>-	.dev		= {</div><div class='del'>-		.platform_data	= &amp;edb9315a_eth_data,</div><div class='del'>-	},</div><div class='del'>-	.num_resources	= 2,</div><div class='del'>-	.resource	= edb9315a_eth_resource,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static void __init edb9315a_init_machine(void)</div><div class='ctx'> {</div><div class='ctx'> 	ep93xx_init_devices();</div><div class='ctx'> 	platform_device_register(&amp;edb9315a_flash);</div><div class='ctx'> </div><div class='del'>-	memcpy(edb9315a_eth_data.dev_addr,</div><div class='del'>-		(void *)(EP93XX_ETHERNET_BASE + 0x50), 6);</div><div class='del'>-	platform_device_register(&amp;edb9315a_eth_device);</div><div class='add'>+	ep93xx_register_eth(&amp;edb9315a_eth_data, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> MACHINE_START(EDB9315A, "Cirrus Logic EDB9315A Evaluation Board")</div><div class='head'>diff --git a/arch/arm/mach-ep93xx/gesbc9312.c b/arch/arm/mach-ep93xx/gesbc9312.c<br/>index 9b41ec1f089e..035b24e31b64 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ep93xx/gesbc9312.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-ep93xx/gesbc9312.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ep93xx/gesbc9312.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ep93xx/gesbc9312.c</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/physmap.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='hunk'>@@ -44,36 +44,15 @@ static struct platform_device gesbc9312_flash = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct ep93xx_eth_data gesbc9312_eth_data = {</div><div class='del'>-	.phy_id			= 1,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct resource gesbc9312_eth_resource[] = {</div><div class='del'>-	{</div><div class='del'>-		.start	= EP93XX_ETHERNET_PHYS_BASE,</div><div class='del'>-		.end	= EP93XX_ETHERNET_PHYS_BASE + 0xffff,</div><div class='del'>-		.flags	= IORESOURCE_MEM,</div><div class='del'>-	}, {</div><div class='del'>-		.start	= IRQ_EP93XX_ETHERNET,</div><div class='del'>-		.end	= IRQ_EP93XX_ETHERNET,</div><div class='del'>-		.flags	= IORESOURCE_IRQ,</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct platform_device gesbc9312_eth_device = {</div><div class='del'>-	.name		= "ep93xx-eth",</div><div class='del'>-	.id		= -1,</div><div class='del'>-	.dev		= {</div><div class='del'>-		.platform_data	= &amp;gesbc9312_eth_data,</div><div class='del'>-	},</div><div class='del'>-	.num_resources	= 2,</div><div class='del'>-	.resource	= gesbc9312_eth_resource,</div><div class='add'>+	.phy_id		= 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void __init gesbc9312_init_machine(void)</div><div class='ctx'> {</div><div class='ctx'> 	ep93xx_init_devices();</div><div class='ctx'> 	platform_device_register(&amp;gesbc9312_flash);</div><div class='del'>-	platform_device_register(&amp;gesbc9312_eth_device);</div><div class='add'>+</div><div class='add'>+	ep93xx_register_eth(&amp;gesbc9312_eth_data, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> MACHINE_START(GESBC9312, "Glomation GESBC-9312-sx")</div><div class='head'>diff --git a/arch/arm/mach-ep93xx/gpio.c b/arch/arm/mach-ep93xx/gpio.c<br/>index 0f3fb87ca4be..482cf3d2fbcd 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ep93xx/gpio.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-ep93xx/gpio.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ep93xx/gpio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ep93xx/gpio.c</a></div><div class='hunk'>@@ -16,9 +16,9 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/ep93xx-regs.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct ep93xx_gpio_chip {</div><div class='hunk'>@@ -141,10 +141,10 @@ static void ep93xx_gpio_dbg_show(struct seq_file *s, struct gpio_chip *chip)</div><div class='ctx'> static struct ep93xx_gpio_chip ep93xx_gpio_banks[] = {</div><div class='ctx'> 	EP93XX_GPIO_BANK("A", 0x00, 0x10, 0),</div><div class='ctx'> 	EP93XX_GPIO_BANK("B", 0x04, 0x14, 8),</div><div class='del'>-	EP93XX_GPIO_BANK("C", 0x30, 0x34, 40),</div><div class='add'>+	EP93XX_GPIO_BANK("C", 0x08, 0x18, 40),</div><div class='ctx'> 	EP93XX_GPIO_BANK("D", 0x0c, 0x1c, 24),</div><div class='ctx'> 	EP93XX_GPIO_BANK("E", 0x20, 0x24, 32),</div><div class='del'>-	EP93XX_GPIO_BANK("F", 0x08, 0x18, 16),</div><div class='add'>+	EP93XX_GPIO_BANK("F", 0x30, 0x34, 16),</div><div class='ctx'> 	EP93XX_GPIO_BANK("G", 0x38, 0x3c, 48),</div><div class='ctx'> 	EP93XX_GPIO_BANK("H", 0x40, 0x44, 56),</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h b/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h<br/>index 9f4458c8e070..22d6c9a6e4ca 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h</a></div><div class='hunk'>@@ -6,6 +6,40 @@</div><div class='ctx'> #define __ASM_ARCH_EP93XX_REGS_H</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * EP93xx Physical Memory Map:</div><div class='add'>+ *</div><div class='add'>+ * The ASDO pin is sampled at system reset to select a synchronous or</div><div class='add'>+ * asynchronous boot configuration.  When ASDO is "1" (i.e. pulled-up)</div><div class='add'>+ * the synchronous boot mode is selected.  When ASDO is "0" (i.e</div><div class='add'>+ * pulled-down) the asynchronous boot mode is selected.</div><div class='add'>+ *</div><div class='add'>+ * In synchronous boot mode nSDCE3 is decoded starting at physical address</div><div class='add'>+ * 0x00000000 and nCS0 is decoded starting at 0xf0000000.  For asynchronous</div><div class='add'>+ * boot mode they are swapped with nCS0 decoded at 0x00000000 ann nSDCE3</div><div class='add'>+ * decoded at 0xf0000000.</div><div class='add'>+ *</div><div class='add'>+ * There is known errata for the EP93xx dealing with External Memory</div><div class='add'>+ * Configurations.  Please refer to "AN273: EP93xx Silicon Rev E Design</div><div class='add'>+ * Guidelines" for more information.  This document can be found at:</div><div class='add'>+ *</div><div class='add'>+ *	http://www.cirrus.com/en/pubs/appNote/AN273REV4.pdf</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define EP93XX_CS0_PHYS_BASE_ASYNC	0x00000000	/* ASDO Pin = 0 */</div><div class='add'>+#define EP93XX_SDCE3_PHYS_BASE_SYNC	0x00000000	/* ASDO Pin = 1 */</div><div class='add'>+#define EP93XX_CS1_PHYS_BASE		0x10000000</div><div class='add'>+#define EP93XX_CS2_PHYS_BASE		0x20000000</div><div class='add'>+#define EP93XX_CS3_PHYS_BASE		0x30000000</div><div class='add'>+#define EP93XX_PCMCIA_PHYS_BASE		0x40000000</div><div class='add'>+#define EP93XX_CS6_PHYS_BASE		0x60000000</div><div class='add'>+#define EP93XX_CS7_PHYS_BASE		0x70000000</div><div class='add'>+#define EP93XX_SDCE0_PHYS_BASE		0xc0000000</div><div class='add'>+#define EP93XX_SDCE1_PHYS_BASE		0xd0000000</div><div class='add'>+#define EP93XX_SDCE2_PHYS_BASE		0xe0000000</div><div class='add'>+#define EP93XX_SDCE3_PHYS_BASE_ASYNC	0xf0000000	/* ASDO Pin = 0 */</div><div class='add'>+#define EP93XX_CS0_PHYS_BASE_SYNC	0xf0000000	/* ASDO Pin = 1 */</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * EP93xx linux memory map:</div><div class='ctx'>  *</div><div class='ctx'>  * virt		phys		size</div><div class='head'>diff --git a/arch/arm/mach-ep93xx/include/mach/platform.h b/arch/arm/mach-ep93xx/include/mach/platform.h<br/>index b5c182473f5d..db2489d3bda7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ep93xx/include/mach/platform.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-ep93xx/include/mach/platform.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ep93xx/include/mach/platform.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ep93xx/include/mach/platform.h</a></div><div class='hunk'>@@ -4,17 +4,17 @@</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='ctx'> </div><div class='del'>-void ep93xx_map_io(void);</div><div class='del'>-void ep93xx_init_irq(void);</div><div class='del'>-void ep93xx_init_time(unsigned long);</div><div class='del'>-void ep93xx_init_devices(void);</div><div class='del'>-extern struct sys_timer ep93xx_timer;</div><div class='del'>-</div><div class='ctx'> struct ep93xx_eth_data</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char	dev_addr[6];</div><div class='ctx'> 	unsigned char	phy_id;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+void ep93xx_map_io(void);</div><div class='add'>+void ep93xx_init_irq(void);</div><div class='add'>+void ep93xx_init_time(unsigned long);</div><div class='add'>+void ep93xx_register_eth(struct ep93xx_eth_data *data, int copy_addr);</div><div class='add'>+void ep93xx_init_devices(void);</div><div class='add'>+extern struct sys_timer ep93xx_timer;</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-ep93xx/include/mach/ts72xx.h b/arch/arm/mach-ep93xx/include/mach/ts72xx.h<br/>index 30b318aa1a1f..34ddec081c40 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ep93xx/include/mach/ts72xx.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-ep93xx/include/mach/ts72xx.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ep93xx/include/mach/ts72xx.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ep93xx/include/mach/ts72xx.h</a></div><div class='hunk'>@@ -70,7 +70,7 @@</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> static inline int board_is_ts7200(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/arm/mach-ep93xx/include/mach/uncompress.h b/arch/arm/mach-ep93xx/include/mach/uncompress.h<br/>index 1fd2f17de325..16026c2b1c8c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ep93xx/include/mach/uncompress.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-ep93xx/include/mach/uncompress.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ep93xx/include/mach/uncompress.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ep93xx/include/mach/uncompress.h</a></div><div class='hunk'>@@ -31,10 +31,19 @@ static void __raw_writel(unsigned int value, unsigned int ptr)</div><div class='ctx'> 	*((volatile unsigned int *)ptr) = value;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-#define PHYS_UART1_DATA		0x808c0000</div><div class='del'>-#define PHYS_UART1_FLAG		0x808c0018</div><div class='del'>-#define UART1_FLAG_TXFF		0x20</div><div class='add'>+#if defined(CONFIG_EP93XX_EARLY_UART1)</div><div class='add'>+#define UART_BASE		EP93XX_UART1_PHYS_BASE</div><div class='add'>+#elif defined(CONFIG_EP93XX_EARLY_UART2)</div><div class='add'>+#define UART_BASE		EP93XX_UART2_PHYS_BASE</div><div class='add'>+#elif defined(CONFIG_EP93XX_EARLY_UART3)</div><div class='add'>+#define UART_BASE		EP93XX_UART3_PHYS_BASE</div><div class='add'>+#else</div><div class='add'>+#define UART_BASE		EP93XX_UART1_PHYS_BASE</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define PHYS_UART_DATA		(UART_BASE + 0x00)</div><div class='add'>+#define PHYS_UART_FLAG		(UART_BASE + 0x18)</div><div class='add'>+#define UART_FLAG_TXFF		0x20</div><div class='ctx'> </div><div class='ctx'> static inline void putc(int c)</div><div class='ctx'> {</div><div class='hunk'>@@ -42,11 +51,11 @@ static inline void putc(int c)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 1000; i++) {</div><div class='ctx'> 		/* Transmit fifo not full?  */</div><div class='del'>-		if (!(__raw_readb(PHYS_UART1_FLAG) &amp; UART1_FLAG_TXFF))</div><div class='add'>+		if (!(__raw_readb(PHYS_UART_FLAG) &amp; UART_FLAG_TXFF))</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	__raw_writeb(c, PHYS_UART1_DATA);</div><div class='add'>+	__raw_writeb(c, PHYS_UART_DATA);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void flush(void)</div><div class='head'>diff --git a/arch/arm/mach-ep93xx/micro9.c b/arch/arm/mach-ep93xx/micro9.c<br/>index de047a5c8112..c2197236b632 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ep93xx/micro9.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-ep93xx/micro9.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ep93xx/micro9.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ep93xx/micro9.c</a></div><div class='hunk'>@@ -16,10 +16,9 @@</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='del'>-</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/physmap.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='hunk'>@@ -29,38 +28,9 @@ static struct ep93xx_eth_data micro9_eth_data = {</div><div class='ctx'>        .phy_id                 = 0x1f,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct resource micro9_eth_resource[] = {</div><div class='del'>-       {</div><div class='del'>-               .start  = EP93XX_ETHERNET_PHYS_BASE,</div><div class='del'>-               .end    = EP93XX_ETHERNET_PHYS_BASE + 0xffff,</div><div class='del'>-               .flags  = IORESOURCE_MEM,</div><div class='del'>-       }, {</div><div class='del'>-               .start  = IRQ_EP93XX_ETHERNET,</div><div class='del'>-               .end    = IRQ_EP93XX_ETHERNET,</div><div class='del'>-               .flags  = IORESOURCE_IRQ,</div><div class='del'>-       }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct platform_device micro9_eth_device = {</div><div class='del'>-       .name           = "ep93xx-eth",</div><div class='del'>-       .id             = -1,</div><div class='del'>-       .dev            = {</div><div class='del'>-               .platform_data  = &amp;micro9_eth_data,</div><div class='del'>-       },</div><div class='del'>-       .num_resources = ARRAY_SIZE(micro9_eth_resource),</div><div class='del'>-       .resource       = micro9_eth_resource,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void __init micro9_eth_init(void)</div><div class='del'>-{</div><div class='del'>-       memcpy(micro9_eth_data.dev_addr,</div><div class='del'>-               (void *)(EP93XX_ETHERNET_BASE + 0x50), 6);</div><div class='del'>-       platform_device_register(&amp;micro9_eth_device);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void __init micro9_init(void)</div><div class='ctx'> {</div><div class='del'>-       micro9_eth_init();</div><div class='add'>+	ep93xx_register_eth(&amp;micro9_eth_data, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/arm/mach-ep93xx/ts72xx.c b/arch/arm/mach-ep93xx/ts72xx.c<br/>index c3cbff126d0c..b4aa4c054276 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ep93xx/ts72xx.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-ep93xx/ts72xx.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ep93xx/ts72xx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ep93xx/ts72xx.c</a></div><div class='hunk'>@@ -19,7 +19,7 @@</div><div class='ctx'> #include &lt;linux/mtd/physmap.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/m48t86.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='hunk'>@@ -161,28 +161,6 @@ static struct ep93xx_eth_data ts72xx_eth_data = {</div><div class='ctx'> 	.phy_id			= 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct resource ts72xx_eth_resource[] = {</div><div class='del'>-	{</div><div class='del'>-		.start	= EP93XX_ETHERNET_PHYS_BASE,</div><div class='del'>-		.end	= EP93XX_ETHERNET_PHYS_BASE + 0xffff,</div><div class='del'>-		.flags	= IORESOURCE_MEM,</div><div class='del'>-	}, {</div><div class='del'>-		.start	= IRQ_EP93XX_ETHERNET,</div><div class='del'>-		.end	= IRQ_EP93XX_ETHERNET,</div><div class='del'>-		.flags	= IORESOURCE_IRQ,</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct platform_device ts72xx_eth_device = {</div><div class='del'>-	.name		= "ep93xx-eth",</div><div class='del'>-	.id		= -1,</div><div class='del'>-	.dev		= {</div><div class='del'>-		.platform_data	= &amp;ts72xx_eth_data,</div><div class='del'>-	},</div><div class='del'>-	.num_resources	= 2,</div><div class='del'>-	.resource	= ts72xx_eth_resource,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static void __init ts72xx_init_machine(void)</div><div class='ctx'> {</div><div class='ctx'> 	ep93xx_init_devices();</div><div class='hunk'>@@ -190,9 +168,7 @@ static void __init ts72xx_init_machine(void)</div><div class='ctx'> 		platform_device_register(&amp;ts72xx_flash);</div><div class='ctx'> 	platform_device_register(&amp;ts72xx_rtc_device);</div><div class='ctx'> </div><div class='del'>-	memcpy(ts72xx_eth_data.dev_addr,</div><div class='del'>-		(void *)(EP93XX_ETHERNET_BASE + 0x50), 6);</div><div class='del'>-	platform_device_register(&amp;ts72xx_eth_device);</div><div class='add'>+	ep93xx_register_eth(&amp;ts72xx_eth_data, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> MACHINE_START(TS72XX, "Technologic Systems TS-72xx SBC")</div><div class='head'>diff --git a/arch/arm/mach-footbridge/cats-hw.c b/arch/arm/mach-footbridge/cats-hw.c<br/>index c261472208cb..6a5b437ab86f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-footbridge/cats-hw.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-footbridge/cats-hw.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-footbridge/cats-hw.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-footbridge/cats-hw.c</a></div><div class='hunk'>@@ -9,9 +9,9 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/screen_info.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/hardware/dec21285.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-footbridge/common.c b/arch/arm/mach-footbridge/common.c<br/>index b08ab507c052..818014e09f4a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-footbridge/common.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-footbridge/common.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-footbridge/common.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-footbridge/common.c</a></div><div class='hunk'>@@ -13,11 +13,11 @@</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'>  </div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/dec21285.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-footbridge/dc21285.c b/arch/arm/mach-footbridge/dc21285.c<br/>index d0dc51e81338..d4c1e526f59c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-footbridge/dc21285.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-footbridge/dc21285.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-footbridge/dc21285.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-footbridge/dc21285.c</a></div><div class='hunk'>@@ -16,8 +16,8 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/mach/pci.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-footbridge/dma.c b/arch/arm/mach-footbridge/dma.c<br/>index 1f9b09b8ed88..b653e9cfa3f7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-footbridge/dma.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-footbridge/dma.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-footbridge/dma.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-footbridge/dma.c</a></div><div class='hunk'>@@ -11,9 +11,9 @@</div><div class='ctx'>  *			ISA DMA controllers.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/scatterlist.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/dma.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-footbridge/include/mach/memory.h b/arch/arm/mach-footbridge/include/mach/memory.h<br/>index e9cae99dd1f9..6ae2f1a07ab9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-footbridge/include/mach/memory.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-footbridge/include/mach/memory.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-footbridge/include/mach/memory.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-footbridge/include/mach/memory.h</a></div><div class='hunk'>@@ -42,10 +42,6 @@ extern unsigned long __bus_to_virt(unsigned long);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-/* Task size and page offset at 3GB */</div><div class='del'>-#define TASK_SIZE		UL(0xbf000000)</div><div class='del'>-#define PAGE_OFFSET		UL(0xc0000000)</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Cache flushing area.</div><div class='ctx'>  */</div><div class='hunk'>@@ -56,12 +52,6 @@ extern unsigned long __bus_to_virt(unsigned long);</div><div class='ctx'>  */</div><div class='ctx'> #define PHYS_OFFSET		UL(0x00000000)</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * This decides where the kernel will search for a free chunk of vm</div><div class='del'>- * space during mmap's.</div><div class='del'>- */</div><div class='del'>-#define TASK_UNMAPPED_BASE ((TASK_SIZE + 0x01000000) / 3)</div><div class='del'>-</div><div class='ctx'> #define FLUSH_BASE_PHYS		0x50000000</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-footbridge/include/mach/system.h b/arch/arm/mach-footbridge/include/mach/system.h<br/>index 01c9f407f498..2db7f36bd6ca 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-footbridge/include/mach/system.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-footbridge/include/mach/system.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-footbridge/include/mach/system.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-footbridge/include/mach/system.h</a></div><div class='hunk'>@@ -7,8 +7,8 @@</div><div class='ctx'>  * it under the terms of the GNU General Public License version 2 as</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/dec21285.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/leds.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-footbridge/isa-irq.c b/arch/arm/mach-footbridge/isa-irq.c<br/>index 7132e522c366..54fec9ae28b9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-footbridge/isa-irq.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-footbridge/isa-irq.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-footbridge/isa-irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-footbridge/isa-irq.c</a></div><div class='hunk'>@@ -18,13 +18,13 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/dec21285.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='ctx'> static void isa_mask_pic_lo_irq(unsigned int irq)</div><div class='hunk'>@@ -94,8 +94,7 @@ isa_irq_handler(unsigned int irq, struct irq_desc *desc)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	desc = irq_desc + isa_irq;</div><div class='del'>-	desc_handle_irq(isa_irq, desc);</div><div class='add'>+	generic_handle_irq(isa_irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct irqaction irq_cascade = {</div><div class='head'>diff --git a/arch/arm/mach-footbridge/isa-timer.c b/arch/arm/mach-footbridge/isa-timer.c<br/>index a764e01d3573..0c8390082fa8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-footbridge/isa-timer.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-footbridge/isa-timer.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-footbridge/isa-timer.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-footbridge/isa-timer.c</a></div><div class='hunk'>@@ -7,8 +7,8 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-footbridge/netwinder-hw.c b/arch/arm/mach-footbridge/netwinder-hw.c<br/>index a1f381c64a30..00b0ddcac283 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-footbridge/netwinder-hw.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-footbridge/netwinder-hw.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-footbridge/netwinder-hw.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-footbridge/netwinder-hw.c</a></div><div class='hunk'>@@ -10,9 +10,9 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/hardware/dec21285.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/leds.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-footbridge/time.c b/arch/arm/mach-footbridge/time.c<br/>index 004819ea85c8..cd1b54ff9fe2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-footbridge/time.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-footbridge/time.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-footbridge/time.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-footbridge/time.c</a></div><div class='hunk'>@@ -22,9 +22,9 @@</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/mc146818rtc.h&gt;</div><div class='ctx'> #include &lt;linux/bcd.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='ctx'> #include "common.h"</div><div class='head'>diff --git a/arch/arm/mach-h720x/common.c b/arch/arm/mach-h720x/common.c<br/>index b5f9741ae13c..7a2614828217 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-h720x/common.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-h720x/common.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-h720x/common.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-h720x/common.c</a></div><div class='hunk'>@@ -18,11 +18,11 @@</div><div class='ctx'> #include &lt;linux/mman.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='hunk'>@@ -104,14 +104,12 @@ h720x_gpio_handler(unsigned int mask, unsigned int irq,</div><div class='ctx'>                  struct irq_desc *desc)</div><div class='ctx'> {</div><div class='ctx'> 	IRQDBG("%s irq: %d\n", __func__, irq);</div><div class='del'>-	desc = irq_desc + irq;</div><div class='ctx'> 	while (mask) {</div><div class='ctx'> 		if (mask &amp; 1) {</div><div class='ctx'> 			IRQDBG("handling irq %d\n", irq);</div><div class='del'>-			desc_handle_irq(irq, desc);</div><div class='add'>+			generic_handle_irq(irq);</div><div class='ctx'> 		}</div><div class='ctx'> 		irq++;</div><div class='del'>-		desc++;</div><div class='ctx'> 		mask &gt;&gt;= 1;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-h720x/cpu-h7202.c b/arch/arm/mach-h720x/cpu-h7202.c<br/>index 53e1f62f2e79..fd33a19c813a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-h720x/cpu-h7202.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-h720x/cpu-h7202.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-h720x/cpu-h7202.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-h720x/cpu-h7202.c</a></div><div class='hunk'>@@ -120,12 +120,10 @@ h7202_timerx_demux_handler(unsigned int irq_unused, struct irq_desc *desc)</div><div class='ctx'> </div><div class='ctx'> 	mask &gt;&gt;= 1;</div><div class='ctx'> 	irq = IRQ_TIMER1;</div><div class='del'>-	desc = irq_desc + irq;</div><div class='ctx'> 	while (mask) {</div><div class='ctx'> 		if (mask &amp; 1)</div><div class='del'>-			desc_handle_irq(irq, desc);</div><div class='add'>+			generic_handle_irq(irq);</div><div class='ctx'> 		irq++;</div><div class='del'>-		desc++;</div><div class='ctx'> 		mask &gt;&gt;= 1;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-imx/clock.c b/arch/arm/mach-imx/clock.c<br/>index 4b4230db3765..7ec60fc91565 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-imx/clock.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-imx/clock.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-imx/clock.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-imx/clock.c</a></div><div class='hunk'>@@ -21,8 +21,8 @@</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/math64.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;mach/imx-regs.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/arm/mach-imx/include/mach/irqs.h b/arch/arm/mach-imx/include/mach/irqs.h<br/>index eb8d5bd05d56..67812c5ac1f9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-imx/include/mach/irqs.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-imx/include/mach/irqs.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-imx/include/mach/irqs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-imx/include/mach/irqs.h</a></div><div class='hunk'>@@ -111,6 +111,11 @@</div><div class='ctx'> /* decode irq number to use with IMR(x), ISR(x) and friends */</div><div class='ctx'> #define IRQ_TO_REG(irq) ((irq - IMX_IRQS) &gt;&gt; 5)</div><div class='ctx'> </div><div class='add'>+/* all normal IRQs can be FIQs */</div><div class='add'>+#define FIQ_START	0</div><div class='add'>+/* switch betwean IRQ and FIQ */</div><div class='add'>+extern int imx_set_irq_fiq(unsigned int irq, unsigned int type);</div><div class='add'>+</div><div class='ctx'> #define NR_IRQS (IRQ_GPIOD(32) + 1)</div><div class='ctx'> #define IRQ_GPIO(x)</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-imx/irq.c b/arch/arm/mach-imx/irq.c<br/>index 798f221eb3b7..531b95deadc0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-imx/irq.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-imx/irq.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-imx/irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-imx/irq.c</a></div><div class='hunk'>@@ -26,20 +26,17 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/timer.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *</div><div class='ctx'>  * We simply use the ENABLE DISABLE registers inside of the IMX</div><div class='del'>- * to turn on/off specific interrupts.  FIXME- We should</div><div class='del'>- * also add support for the accelerated interrupt controller</div><div class='del'>- * by putting offets to irq jump code in the appropriate</div><div class='del'>- * places.</div><div class='add'>+ * to turn on/off specific interrupts.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -102,6 +99,28 @@ imx_unmask_irq(unsigned int irq)</div><div class='ctx'> 	__raw_writel(irq, IMX_AITC_INTENNUM);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_FIQ</div><div class='add'>+int imx_set_irq_fiq(unsigned int irq, unsigned int type)</div><div class='add'>+{</div><div class='add'>+	unsigned int irqt;</div><div class='add'>+</div><div class='add'>+	if (irq &gt;= IMX_IRQS)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (irq &lt; IMX_IRQS / 2) {</div><div class='add'>+		irqt = __raw_readl(IMX_AITC_INTTYPEL) &amp; ~(1 &lt;&lt; irq);</div><div class='add'>+		__raw_writel(irqt | (!!type &lt;&lt; irq), IMX_AITC_INTTYPEL);</div><div class='add'>+	} else {</div><div class='add'>+		irq -= IMX_IRQS / 2;</div><div class='add'>+		irqt = __raw_readl(IMX_AITC_INTTYPEH) &amp; ~(1 &lt;&lt; irq);</div><div class='add'>+		__raw_writel(irqt | (!!type &lt;&lt; irq), IMX_AITC_INTTYPEH);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(imx_set_irq_fiq);</div><div class='add'>+#endif /* CONFIG_FIQ */</div><div class='add'>+</div><div class='ctx'> static int</div><div class='ctx'> imx_gpio_irq_type(unsigned int _irq, unsigned int type)</div><div class='ctx'> {</div><div class='hunk'>@@ -182,14 +201,12 @@ static void</div><div class='ctx'> imx_gpio_handler(unsigned int mask, unsigned int irq,</div><div class='ctx'>                  struct irq_desc *desc)</div><div class='ctx'> {</div><div class='del'>-	desc = irq_desc + irq;</div><div class='ctx'> 	while (mask) {</div><div class='ctx'> 		if (mask &amp; 1) {</div><div class='ctx'> 			DEBUG_IRQ("handling irq %d\n", irq);</div><div class='del'>-			desc_handle_irq(irq, desc);</div><div class='add'>+			generic_handle_irq(irq);</div><div class='ctx'> 		}</div><div class='ctx'> 		irq++;</div><div class='del'>-		desc++;</div><div class='ctx'> 		mask &gt;&gt;= 1;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -286,4 +303,9 @@ imx_init_irq(void)</div><div class='ctx'> </div><div class='ctx'> 	/* Release masking of interrupts according to priority */</div><div class='ctx'> 	__raw_writel(-1, IMX_AITC_NIMASK);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_FIQ</div><div class='add'>+	/* Initialize FIQ */</div><div class='add'>+	init_FIQ();</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-imx/leds-mx1ads.c b/arch/arm/mach-imx/leds-mx1ads.c<br/>index af81621f689b..1d48f2762cbc 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-imx/leds-mx1ads.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-imx/leds-mx1ads.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-imx/leds-mx1ads.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-imx/leds-mx1ads.c</a></div><div class='hunk'>@@ -13,9 +13,9 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/leds.h&gt;</div><div class='ctx'> #include "leds.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-imx/time.c b/arch/arm/mach-imx/time.c<br/>index 08be3875c59e..a11765f5f23b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-imx/time.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-imx/time.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-imx/time.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-imx/time.c</a></div><div class='hunk'>@@ -18,9 +18,9 @@</div><div class='ctx'> #include &lt;linux/clocksource.h&gt;</div><div class='ctx'> #include &lt;linux/clockchips.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/leds.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-integrator/core.c b/arch/arm/mach-integrator/core.c<br/>index 8bacf6d4d097..595b7392ee4e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-integrator/core.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-integrator/core.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-integrator/core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-integrator/core.c</a></div><div class='hunk'>@@ -19,10 +19,10 @@</div><div class='ctx'> #include &lt;linux/termios.h&gt;</div><div class='ctx'> #include &lt;linux/amba/bus.h&gt;</div><div class='ctx'> #include &lt;linux/amba/serial.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/arm_timer.h&gt;</div><div class='ctx'> #include &lt;mach/cm.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-integrator/cpu.c b/arch/arm/mach-integrator/cpu.c<br/>index 7c49d55e6b27..44d4c2e8207b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-integrator/cpu.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-integrator/cpu.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-integrator/cpu.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-integrator/cpu.c</a></div><div class='hunk'>@@ -17,9 +17,9 @@</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/icst525.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -184,7 +184,6 @@ static int integrator_cpufreq_init(struct cpufreq_policy *policy)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='ctx'> 	/* set default policy and cpuinfo */</div><div class='del'>-	policy-&gt;governor = CPUFREQ_DEFAULT_GOVERNOR;</div><div class='ctx'> 	policy-&gt;cpuinfo.max_freq = 160000;</div><div class='ctx'> 	policy-&gt;cpuinfo.min_freq = 12000;</div><div class='ctx'> 	policy-&gt;cpuinfo.transition_latency = 1000000; /* 1 ms, assumed */</div><div class='head'>diff --git a/arch/arm/mach-integrator/impd1.c b/arch/arm/mach-integrator/impd1.c<br/>index 3c8383dbe9e6..172299a78302 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-integrator/impd1.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-integrator/impd1.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-integrator/impd1.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-integrator/impd1.c</a></div><div class='hunk'>@@ -20,8 +20,8 @@</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/amba/bus.h&gt;</div><div class='ctx'> #include &lt;linux/amba/clcd.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/icst525.h&gt;</div><div class='ctx'> #include &lt;mach/lm.h&gt;</div><div class='ctx'> #include &lt;mach/impd1.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-integrator/integrator_ap.c b/arch/arm/mach-integrator/integrator_ap.c<br/>index 6e472b5f8f26..8138a7e24562 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-integrator/integrator_ap.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-integrator/integrator_ap.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-integrator/integrator_ap.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-integrator/integrator_ap.c</a></div><div class='hunk'>@@ -27,9 +27,9 @@</div><div class='ctx'> #include &lt;linux/sysdev.h&gt;</div><div class='ctx'> #include &lt;linux/amba/bus.h&gt;</div><div class='ctx'> #include &lt;linux/amba/kmi.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/param.h&gt;		/* HZ */</div><div class='head'>diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c<br/>index 6b99e9c258bd..88026ccd5ac9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-integrator/integrator_cp.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-integrator/integrator_cp.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-integrator/integrator_cp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-integrator/integrator_cp.c</a></div><div class='hunk'>@@ -19,9 +19,9 @@</div><div class='ctx'> #include &lt;linux/amba/bus.h&gt;</div><div class='ctx'> #include &lt;linux/amba/kmi.h&gt;</div><div class='ctx'> #include &lt;linux/amba/clcd.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='hunk'>@@ -217,8 +217,7 @@ sic_handle_irq(unsigned int irq, struct irq_desc *desc)</div><div class='ctx'> </div><div class='ctx'> 		irq += IRQ_SIC_START;</div><div class='ctx'> </div><div class='del'>-		desc = irq_desc + irq;</div><div class='del'>-		desc_handle_irq(irq, desc);</div><div class='add'>+		generic_handle_irq(irq);</div><div class='ctx'> 	} while (status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-integrator/leds.c b/arch/arm/mach-integrator/leds.c<br/>index 7bc6881434ec..8dcc823f4135 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-integrator/leds.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-integrator/leds.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-integrator/leds.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-integrator/leds.c</a></div><div class='hunk'>@@ -24,9 +24,9 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/leds.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-integrator/pci_v3.c b/arch/arm/mach-integrator/pci_v3.c<br/>index 9f2b1ea8fb20..f1d72b225450 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-integrator/pci_v3.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-integrator/pci_v3.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-integrator/pci_v3.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-integrator/pci_v3.c</a></div><div class='hunk'>@@ -27,9 +27,9 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/mach/pci.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-iop13xx/include/mach/memory.h b/arch/arm/mach-iop13xx/include/mach/memory.h<br/>index e8b59d8f1bb9..b82602d529bf 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-iop13xx/include/mach/memory.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-iop13xx/include/mach/memory.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-iop13xx/include/mach/memory.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-iop13xx/include/mach/memory.h</a></div><div class='hunk'>@@ -7,9 +7,6 @@</div><div class='ctx'>  * Physical DRAM offset.</div><div class='ctx'>  */</div><div class='ctx'> #define PHYS_OFFSET	UL(0x00000000)</div><div class='del'>-#define TASK_SIZE  	UL(0x3f000000)</div><div class='del'>-#define PAGE_OFFSET	UL(0x40000000)</div><div class='del'>-#define TASK_UNMAPPED_BASE ((TASK_SIZE + 0x01000000) / 3)</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='ctx'> </div><div class='hunk'>@@ -29,32 +26,52 @@</div><div class='ctx'> </div><div class='ctx'> /* RAM has 1:1 mapping on the PCIe/x Busses */</div><div class='ctx'> #define __virt_to_bus(x)	(__virt_to_phys(x))</div><div class='del'>-#define __bus_to_virt(x)    (__phys_to_virt(x))</div><div class='add'>+#define __bus_to_virt(x)	(__phys_to_virt(x))</div><div class='ctx'> </div><div class='del'>-#define virt_to_lbus(x) 					   \</div><div class='del'>-(( ((void*)(x) &gt;= (void*)IOP13XX_PMMR_V_START) &amp;&amp;		   \</div><div class='del'>-((void*)(x) &lt; (void*)IOP13XX_PMMR_V_END) ) ? 			   \</div><div class='del'>-((x) - IOP13XX_PMMR_VIRT_MEM_BASE + IOP13XX_PMMR_PHYS_MEM_BASE) : \</div><div class='del'>-((x) - PAGE_OFFSET + PHYS_OFFSET))</div><div class='add'>+static inline dma_addr_t __virt_to_lbus(unsigned long x)</div><div class='add'>+{</div><div class='add'>+	return x + IOP13XX_PMMR_PHYS_MEM_BASE - IOP13XX_PMMR_VIRT_MEM_BASE;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-#define lbus_to_virt(x)                                            \</div><div class='del'>-(( ((x) &gt;= IOP13XX_PMMR_P_START) &amp;&amp; ((x) &lt; IOP13XX_PMMR_P_END) ) ? \</div><div class='del'>-((x) - IOP13XX_PMMR_PHYS_MEM_BASE + IOP13XX_PMMR_VIRT_MEM_BASE ) : \</div><div class='del'>-((x) - PHYS_OFFSET + PAGE_OFFSET))</div><div class='add'>+static inline unsigned long __lbus_to_virt(dma_addr_t x)</div><div class='add'>+{</div><div class='add'>+	return x + IOP13XX_PMMR_VIRT_MEM_BASE - IOP13XX_PMMR_PHYS_MEM_BASE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define __is_lbus_dma(a)				\</div><div class='add'>+	((a) &gt;= IOP13XX_PMMR_P_START &amp;&amp; (a) &lt; IOP13XX_PMMR_P_END)</div><div class='add'>+</div><div class='add'>+#define __is_lbus_virt(a)				\</div><div class='add'>+	((a) &gt;= IOP13XX_PMMR_V_START &amp;&amp; (a) &lt; IOP13XX_PMMR_V_END)</div><div class='ctx'> </div><div class='ctx'> /* Device is an lbus device if it is on the platform bus of the IOP13XX */</div><div class='del'>-#define is_lbus_device(dev) (dev &amp;&amp;\</div><div class='del'>-			     (strncmp(dev-&gt;bus-&gt;name, "platform", 8) == 0))</div><div class='add'>+#define is_lbus_device(dev) 				\</div><div class='add'>+	(dev &amp;&amp; strncmp(dev-&gt;bus-&gt;name, "platform", 8) == 0)</div><div class='ctx'> </div><div class='del'>-#define __arch_page_to_dma(dev, page)					\</div><div class='del'>-({is_lbus_device(dev) ? (dma_addr_t)virt_to_lbus(page_address(page)) : \</div><div class='del'>-(dma_addr_t)__virt_to_bus(page_address(page));})</div><div class='add'>+#define __arch_dma_to_virt(dev, addr)					\</div><div class='add'>+	({								\</div><div class='add'>+		unsigned long __virt;					\</div><div class='add'>+		dma_addr_t __dma = addr;				\</div><div class='add'>+		if (is_lbus_device(dev) &amp;&amp; __is_lbus_dma(__dma))	\</div><div class='add'>+			__virt = __lbus_to_virt(__dma);			\</div><div class='add'>+		else							\</div><div class='add'>+			__virt = __bus_to_virt(__dma);			\</div><div class='add'>+		(void *)__virt;						\</div><div class='add'>+	})</div><div class='ctx'> </div><div class='del'>-#define __arch_dma_to_virt(dev, addr) \</div><div class='del'>-({is_lbus_device(dev) ? lbus_to_virt(addr) : __bus_to_virt(addr);})</div><div class='add'>+#define __arch_virt_to_dma(dev, addr)					\</div><div class='add'>+	({								\</div><div class='add'>+		unsigned long __virt = (unsigned long)addr;		\</div><div class='add'>+		dma_addr_t __dma;					\</div><div class='add'>+		if (is_lbus_device(dev) &amp;&amp; __is_lbus_virt(__virt))	\</div><div class='add'>+			__dma = __virt_to_lbus(__virt);			\</div><div class='add'>+		else							\</div><div class='add'>+			__dma = __virt_to_bus(__virt);			\</div><div class='add'>+		__dma;							\</div><div class='add'>+	})</div><div class='ctx'> </div><div class='del'>-#define __arch_virt_to_dma(dev, addr) \</div><div class='del'>-({is_lbus_device(dev) ? virt_to_lbus(addr) : __virt_to_bus(addr);})</div><div class='add'>+#define __arch_page_to_dma(dev, page)					\</div><div class='add'>+	__arch_virt_to_dma(dev, page_address(page))</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_ARCH_IOP13XX */</div><div class='ctx'> #endif /* !ASSEMBLY */</div><div class='head'>diff --git a/arch/arm/mach-iop13xx/include/mach/pci.h b/arch/arm/mach-iop13xx/include/mach/pci.h<br/>index 17b5515af8b1..59f42b535572 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-iop13xx/include/mach/pci.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-iop13xx/include/mach/pci.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-iop13xx/include/mach/pci.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-iop13xx/include/mach/pci.h</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #ifndef _IOP13XX_PCI_H_</div><div class='ctx'> #define _IOP13XX_PCI_H_</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;mach/irqs.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct pci_sys_data;</div><div class='ctx'> struct hw_pci;</div><div class='head'>diff --git a/arch/arm/mach-iop13xx/io.c b/arch/arm/mach-iop13xx/io.c<br/>index 26cfa318142c..529580997814 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-iop13xx/io.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-iop13xx/io.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-iop13xx/io.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-iop13xx/io.c</a></div><div class='hunk'>@@ -18,8 +18,8 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> void * __iomem __iop13xx_io(unsigned long io_addr)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/arm/mach-iop13xx/msi.c b/arch/arm/mach-iop13xx/msi.c<br/>index 63ef1124ca5c..f34b0ed80630 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-iop13xx/msi.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-iop13xx/msi.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-iop13xx/msi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-iop13xx/msi.c</a></div><div class='hunk'>@@ -110,8 +110,7 @@ static void iop13xx_msi_handler(unsigned int irq, struct irq_desc *desc)</div><div class='ctx'> 		do {</div><div class='ctx'> 			j = find_first_bit(&amp;status, 32);</div><div class='ctx'> 			(write_imipr[i])(1 &lt;&lt; j); /* write back to clear bit */</div><div class='del'>-			desc = irq_desc + IRQ_IOP13XX_MSI_0 + j + (32*i);</div><div class='del'>-			desc_handle_irq(IRQ_IOP13XX_MSI_0 + j + (32*i),	desc);</div><div class='add'>+			generic_handle_irq(IRQ_IOP13XX_MSI_0 + j + (32*i));</div><div class='ctx'> 			status = (read_imipr[i])();</div><div class='ctx'> 		} while (status);</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/arm/mach-iop13xx/setup.c b/arch/arm/mach-iop13xx/setup.c<br/>index b17ccc8cb471..cfd4d2e6dacd 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-iop13xx/setup.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-iop13xx/setup.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-iop13xx/setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-iop13xx/setup.c</a></div><div class='hunk'>@@ -18,13 +18,13 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/serial_8250.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #ifdef CONFIG_MTD_PHYSMAP</div><div class='ctx'> #include &lt;linux/mtd/physmap.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/iop_adma.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define IOP13XX_UART_XTAL 33334000</div><div class='head'>diff --git a/arch/arm/mach-iop13xx/tpmi.c b/arch/arm/mach-iop13xx/tpmi.c<br/>index 2476347ea62f..c6af1e1bee32 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-iop13xx/tpmi.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-iop13xx/tpmi.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-iop13xx/tpmi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-iop13xx/tpmi.c</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/sizes.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-iop32x/glantank.c b/arch/arm/mach-iop32x/glantank.c<br/>index 45d61276d233..a9c2dfdb2507 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-iop32x/glantank.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-iop32x/glantank.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-iop32x/glantank.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-iop32x/glantank.c</a></div><div class='hunk'>@@ -25,8 +25,8 @@</div><div class='ctx'> #include &lt;linux/mtd/physmap.h&gt;</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-iop32x/iq31244.c b/arch/arm/mach-iop32x/iq31244.c<br/>index 082818aaa205..dd1cd9904518 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-iop32x/iq31244.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-iop32x/iq31244.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-iop32x/iq31244.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-iop32x/iq31244.c</a></div><div class='hunk'>@@ -26,8 +26,9 @@</div><div class='ctx'> #include &lt;linux/serial_8250.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/physmap.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/cputype.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='hunk'>@@ -49,8 +50,7 @@ static int force_ep80219;</div><div class='ctx'> </div><div class='ctx'> static int is_80219(void)</div><div class='ctx'> {</div><div class='del'>-	extern int processor_id;</div><div class='del'>-	return !!((processor_id &amp; 0xffffffe0) == 0x69052e20);</div><div class='add'>+	return !!((read_cpuid_id() &amp; 0xffffffe0) == 0x69052e20);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int is_ep80219(void)</div><div class='head'>diff --git a/arch/arm/mach-iop32x/iq80321.c b/arch/arm/mach-iop32x/iq80321.c<br/>index d735539808b4..fbe27798759d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-iop32x/iq80321.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-iop32x/iq80321.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-iop32x/iq80321.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-iop32x/iq80321.c</a></div><div class='hunk'>@@ -23,8 +23,8 @@</div><div class='ctx'> #include &lt;linux/serial_8250.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/physmap.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-iop32x/n2100.c b/arch/arm/mach-iop32x/n2100.c<br/>index 3173f9c5835d..d2e427899729 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-iop32x/n2100.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-iop32x/n2100.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-iop32x/n2100.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-iop32x/n2100.c</a></div><div class='hunk'>@@ -30,8 +30,8 @@</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/reboot.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-iop33x/iq80331.c b/arch/arm/mach-iop33x/iq80331.c<br/>index c7d99f9fafed..d51e10cddf20 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-iop33x/iq80331.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-iop33x/iq80331.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-iop33x/iq80331.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-iop33x/iq80331.c</a></div><div class='hunk'>@@ -22,8 +22,8 @@</div><div class='ctx'> #include &lt;linux/serial_8250.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/physmap.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-iop33x/iq80332.c b/arch/arm/mach-iop33x/iq80332.c<br/>index af616c5f4fb2..92fb44cdbcad 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-iop33x/iq80332.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-iop33x/iq80332.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-iop33x/iq80332.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-iop33x/iq80332.c</a></div><div class='hunk'>@@ -22,8 +22,8 @@</div><div class='ctx'> #include &lt;linux/serial_8250.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/physmap.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-iop33x/uart.c b/arch/arm/mach-iop33x/uart.c<br/>index 8c21870fa808..cdae24e46eea 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-iop33x/uart.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-iop33x/uart.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-iop33x/uart.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-iop33x/uart.c</a></div><div class='hunk'>@@ -17,7 +17,7 @@</div><div class='ctx'> #include &lt;linux/serial.h&gt;</div><div class='ctx'> #include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/serial_8250.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-ixp2000/core.c b/arch/arm/mach-ixp2000/core.c<br/>index a6a4f93085fd..babb22597163 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ixp2000/core.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-ixp2000/core.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ixp2000/core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ixp2000/core.c</a></div><div class='hunk'>@@ -84,64 +84,57 @@ static struct map_desc ixp2000_io_desc[] __initdata = {</div><div class='ctx'> 		.virtual	= IXP2000_CAP_VIRT_BASE,</div><div class='ctx'> 		.pfn		= __phys_to_pfn(IXP2000_CAP_PHYS_BASE),</div><div class='ctx'> 		.length		= IXP2000_CAP_SIZE,</div><div class='del'>-		.type		= MT_DEVICE_IXP2000,</div><div class='add'>+		.type		= MT_DEVICE,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.virtual	= IXP2000_INTCTL_VIRT_BASE,</div><div class='ctx'> 		.pfn		= __phys_to_pfn(IXP2000_INTCTL_PHYS_BASE),</div><div class='ctx'> 		.length		= IXP2000_INTCTL_SIZE,</div><div class='del'>-		.type		= MT_DEVICE_IXP2000,</div><div class='add'>+		.type		= MT_DEVICE,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.virtual	= IXP2000_PCI_CREG_VIRT_BASE,</div><div class='ctx'> 		.pfn		= __phys_to_pfn(IXP2000_PCI_CREG_PHYS_BASE),</div><div class='ctx'> 		.length		= IXP2000_PCI_CREG_SIZE,</div><div class='del'>-		.type		= MT_DEVICE_IXP2000,</div><div class='add'>+		.type		= MT_DEVICE,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.virtual	= IXP2000_PCI_CSR_VIRT_BASE,</div><div class='ctx'> 		.pfn		= __phys_to_pfn(IXP2000_PCI_CSR_PHYS_BASE),</div><div class='ctx'> 		.length		= IXP2000_PCI_CSR_SIZE,</div><div class='del'>-		.type		= MT_DEVICE_IXP2000,</div><div class='add'>+		.type		= MT_DEVICE,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.virtual	= IXP2000_MSF_VIRT_BASE,</div><div class='ctx'> 		.pfn		= __phys_to_pfn(IXP2000_MSF_PHYS_BASE),</div><div class='ctx'> 		.length		= IXP2000_MSF_SIZE,</div><div class='del'>-		.type		= MT_DEVICE_IXP2000,</div><div class='add'>+		.type		= MT_DEVICE,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.virtual	= IXP2000_SCRATCH_RING_VIRT_BASE,</div><div class='ctx'> 		.pfn		= __phys_to_pfn(IXP2000_SCRATCH_RING_PHYS_BASE),</div><div class='ctx'> 		.length		= IXP2000_SCRATCH_RING_SIZE,</div><div class='del'>-		.type		= MT_DEVICE_IXP2000,</div><div class='add'>+		.type		= MT_DEVICE,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.virtual	= IXP2000_SRAM0_VIRT_BASE,</div><div class='ctx'> 		.pfn		= __phys_to_pfn(IXP2000_SRAM0_PHYS_BASE),</div><div class='ctx'> 		.length		= IXP2000_SRAM0_SIZE,</div><div class='del'>-		.type		= MT_DEVICE_IXP2000,</div><div class='add'>+		.type		= MT_DEVICE,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.virtual	= IXP2000_PCI_IO_VIRT_BASE,</div><div class='ctx'> 		.pfn		= __phys_to_pfn(IXP2000_PCI_IO_PHYS_BASE),</div><div class='ctx'> 		.length		= IXP2000_PCI_IO_SIZE,</div><div class='del'>-		.type		= MT_DEVICE_IXP2000,</div><div class='add'>+		.type		= MT_DEVICE,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.virtual	= IXP2000_PCI_CFG0_VIRT_BASE,</div><div class='ctx'> 		.pfn		= __phys_to_pfn(IXP2000_PCI_CFG0_PHYS_BASE),</div><div class='ctx'> 		.length		= IXP2000_PCI_CFG0_SIZE,</div><div class='del'>-		.type		= MT_DEVICE_IXP2000,</div><div class='add'>+		.type		= MT_DEVICE,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.virtual	= IXP2000_PCI_CFG1_VIRT_BASE,</div><div class='ctx'> 		.pfn		= __phys_to_pfn(IXP2000_PCI_CFG1_PHYS_BASE),</div><div class='ctx'> 		.length		= IXP2000_PCI_CFG1_SIZE,</div><div class='del'>-		.type		= MT_DEVICE_IXP2000,</div><div class='add'>+		.type		= MT_DEVICE,</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void __init ixp2000_map_io(void)</div><div class='ctx'> {</div><div class='del'>-	/*</div><div class='del'>-	 * On IXP2400 CPUs we need to use MT_DEVICE_IXP2000 so that</div><div class='del'>-	 * XCB=101 (to avoid triggering erratum #66), and given that</div><div class='del'>-	 * this mode speeds up I/O accesses and we have write buffer</div><div class='del'>-	 * flushes in the right places anyway, it doesn't hurt to use</div><div class='del'>-	 * XCB=101 for all IXP2000s.</div><div class='del'>-	 */</div><div class='ctx'> 	iotable_init(ixp2000_io_desc, ARRAY_SIZE(ixp2000_io_desc));</div><div class='ctx'> </div><div class='ctx'> 	/* Set slowport to 8-bit mode.  */</div><div class='hunk'>@@ -311,8 +304,7 @@ static void ixp2000_GPIO_irq_handler(unsigned int irq, struct irq_desc *desc)</div><div class='ctx'> 		   </div><div class='ctx'> 	for (i = 0; i &lt;= 7; i++) {</div><div class='ctx'> 		if (status &amp; (1&lt;&lt;i)) {</div><div class='del'>-			desc = irq_desc + i + IRQ_IXP2000_GPIO0;</div><div class='del'>-			desc_handle_irq(i + IRQ_IXP2000_GPIO0, desc);</div><div class='add'>+			generic_handle_irq(i + IRQ_IXP2000_GPIO0);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -404,8 +396,7 @@ static void ixp2000_err_irq_handler(unsigned int irq, struct irq_desc *desc)</div><div class='ctx'> </div><div class='ctx'> 	for(i = 31; i &gt;= 0; i--) {</div><div class='ctx'> 		if(status &amp; (1 &lt;&lt; i)) {</div><div class='del'>-			desc = irq_desc + IRQ_IXP2000_DRAM0_MIN_ERR + i;</div><div class='del'>-			desc_handle_irq(IRQ_IXP2000_DRAM0_MIN_ERR + i, desc);</div><div class='add'>+			generic_handle_irq(IRQ_IXP2000_DRAM0_MIN_ERR + i);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-ixp2000/enp2611.c b/arch/arm/mach-ixp2000/enp2611.c<br/>index c62ed655c1a7..c84dfac13882 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ixp2000/enp2611.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-ixp2000/enp2611.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ixp2000/enp2611.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ixp2000/enp2611.c</a></div><div class='hunk'>@@ -32,8 +32,8 @@</div><div class='ctx'> #include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/serial_core.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='hunk'>@@ -70,17 +70,17 @@ static struct map_desc enp2611_io_desc[] __initdata = {</div><div class='ctx'> 		.virtual	= ENP2611_CALEB_VIRT_BASE,</div><div class='ctx'> 		.pfn		= __phys_to_pfn(ENP2611_CALEB_PHYS_BASE),</div><div class='ctx'> 		.length		= ENP2611_CALEB_SIZE,</div><div class='del'>-		.type		= MT_DEVICE_IXP2000,</div><div class='add'>+		.type		= MT_DEVICE,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.virtual	= ENP2611_PM3386_0_VIRT_BASE,</div><div class='ctx'> 		.pfn		= __phys_to_pfn(ENP2611_PM3386_0_PHYS_BASE),</div><div class='ctx'> 		.length		= ENP2611_PM3386_0_SIZE,</div><div class='del'>-		.type		= MT_DEVICE_IXP2000,</div><div class='add'>+		.type		= MT_DEVICE,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.virtual	= ENP2611_PM3386_1_VIRT_BASE,</div><div class='ctx'> 		.pfn		= __phys_to_pfn(ENP2611_PM3386_1_PHYS_BASE),</div><div class='ctx'> 		.length		= ENP2611_PM3386_1_SIZE,</div><div class='del'>-		.type		= MT_DEVICE_IXP2000,</div><div class='add'>+		.type		= MT_DEVICE,</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-ixp2000/include/mach/ixp2000-regs.h b/arch/arm/mach-ixp2000/include/mach/ixp2000-regs.h<br/>index 19d80379a3e3..822f63f2f4a2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ixp2000/include/mach/ixp2000-regs.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-ixp2000/include/mach/ixp2000-regs.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ixp2000/include/mach/ixp2000-regs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ixp2000/include/mach/ixp2000-regs.h</a></div><div class='hunk'>@@ -41,13 +41,7 @@</div><div class='ctx'>  * Most of the registers are clumped in 4K regions spread throughout</div><div class='ctx'>  * the 0xc0000000 -&gt; 0xc0100000 address range, but we just map in</div><div class='ctx'>  * the whole range using a single 1 MB section instead of small</div><div class='del'>- * 4K pages.  This has two advantages for us:</div><div class='del'>- *</div><div class='del'>- * 1) We use only one TLB entry for large number of on-chip I/O devices.</div><div class='del'>- *</div><div class='del'>- * 2) We can easily set the Section attributes to XCB=101 on the IXP2400</div><div class='del'>- *    as required per erratum #66.  We accomplish this by using a</div><div class='del'>- *    new MT_IXP2000_DEVICE memory type with the bits set as required.</div><div class='add'>+ * 4K pages.</div><div class='ctx'>  *</div><div class='ctx'>  * CAP stands for CSR Access Proxy.</div><div class='ctx'>  *</div><div class='head'>diff --git a/arch/arm/mach-ixp2000/ixdp2400.c b/arch/arm/mach-ixp2000/ixdp2400.c<br/>index c673b9ef9f69..4467c4224d73 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ixp2000/ixdp2400.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-ixp2000/ixdp2400.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ixp2000/ixdp2400.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ixp2000/ixdp2400.c</a></div><div class='hunk'>@@ -25,8 +25,8 @@</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-ixp2000/ixdp2800.c b/arch/arm/mach-ixp2000/ixdp2800.c<br/>index 6715b50829a6..94f68ba9ea50 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ixp2000/ixdp2800.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-ixp2000/ixdp2800.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ixp2000/ixdp2800.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ixp2000/ixdp2800.c</a></div><div class='hunk'>@@ -25,8 +25,8 @@</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-ixp2000/ixdp2x00.c b/arch/arm/mach-ixp2000/ixdp2x00.c<br/>index 5a781fd9757a..b0653a87159a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ixp2000/ixdp2x00.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-ixp2000/ixdp2x00.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ixp2000/ixdp2x00.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ixp2000/ixdp2x00.c</a></div><div class='hunk'>@@ -25,8 +25,8 @@</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='hunk'>@@ -129,10 +129,8 @@ static void ixdp2x00_irq_handler(unsigned int irq, struct irq_desc *desc)</div><div class='ctx'> </div><div class='ctx'> 	for(i = 0; i &lt; board_irq_count; i++) {</div><div class='ctx'> 		if(ex_interrupt &amp; (1 &lt;&lt; i))  {</div><div class='del'>-			struct irq_desc *cpld_desc;</div><div class='ctx'> 			int cpld_irq = IXP2000_BOARD_IRQ(0) + i;</div><div class='del'>-			cpld_desc = irq_desc + cpld_irq;</div><div class='del'>-			desc_handle_irq(cpld_irq, cpld_desc);</div><div class='add'>+			generic_handle_irq(cpld_irq);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-ixp2000/ixdp2x01.c b/arch/arm/mach-ixp2000/ixdp2x01.c<br/>index 78a2341dee2c..4a12327a09a3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ixp2000/ixdp2x01.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-ixp2000/ixdp2x01.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ixp2000/ixdp2x01.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ixp2000/ixdp2x01.c</a></div><div class='hunk'>@@ -30,8 +30,8 @@</div><div class='ctx'> #include &lt;linux/serial_core.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/serial_8250.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='hunk'>@@ -79,10 +79,8 @@ static void ixdp2x01_irq_handler(unsigned int irq, struct irq_desc *desc)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; IXP2000_BOARD_IRQS; i++) {</div><div class='ctx'> 		if (ex_interrupt &amp; (1 &lt;&lt; i)) {</div><div class='del'>-			struct irq_desc *cpld_desc;</div><div class='ctx'> 			int cpld_irq = IXP2000_BOARD_IRQ(0) + i;</div><div class='del'>-			cpld_desc = irq_desc + cpld_irq;</div><div class='del'>-			desc_handle_irq(cpld_irq, cpld_desc);</div><div class='add'>+			generic_handle_irq(cpld_irq);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-ixp2000/pci.c b/arch/arm/mach-ixp2000/pci.c<br/>index 03d916fbe531..60e9fd08ab80 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ixp2000/pci.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-ixp2000/pci.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ixp2000/pci.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ixp2000/pci.c</a></div><div class='hunk'>@@ -24,8 +24,8 @@</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-ixp23xx/core.c b/arch/arm/mach-ixp23xx/core.c<br/>index 68b4ac5b2481..aa4c4420ff3d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ixp23xx/core.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-ixp23xx/core.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ixp23xx/core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ixp23xx/core.c</a></div><div class='hunk'>@@ -253,7 +253,6 @@ static void pci_handler(unsigned int irq, struct irq_desc *desc)</div><div class='ctx'> {</div><div class='ctx'> 	u32 pci_interrupt;</div><div class='ctx'> 	unsigned int irqno;</div><div class='del'>-	struct irq_desc *int_desc;</div><div class='ctx'> </div><div class='ctx'> 	pci_interrupt = *IXP23XX_PCI_XSCALE_INT_STATUS;</div><div class='ctx'> </div><div class='hunk'>@@ -268,8 +267,7 @@ static void pci_handler(unsigned int irq, struct irq_desc *desc)</div><div class='ctx'> 		BUG();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	int_desc = irq_desc + irqno;</div><div class='del'>-	desc_handle_irq(irqno, int_desc);</div><div class='add'>+	generic_handle_irq(irqno);</div><div class='ctx'> </div><div class='ctx'> 	desc-&gt;chip-&gt;unmask(irq);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-ixp23xx/ixdp2351.c b/arch/arm/mach-ixp23xx/ixdp2351.c<br/>index b6e0bfa44df9..f1b124a709ab 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ixp23xx/ixdp2351.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-ixp23xx/ixdp2351.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ixp23xx/ixdp2351.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ixp23xx/ixdp2351.c</a></div><div class='hunk'>@@ -68,11 +68,9 @@ static void ixdp2351_inta_handler(unsigned int irq, struct irq_desc *desc)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; IXDP2351_INTA_IRQ_NUM; i++) {</div><div class='ctx'> 		if (ex_interrupt &amp; (1 &lt;&lt; i)) {</div><div class='del'>-			struct irq_desc *cpld_desc;</div><div class='ctx'> 			int cpld_irq =</div><div class='ctx'> 				IXP23XX_MACH_IRQ(IXDP2351_INTA_IRQ_BASE + i);</div><div class='del'>-			cpld_desc = irq_desc + cpld_irq;</div><div class='del'>-			desc_handle_irq(cpld_irq, cpld_desc);</div><div class='add'>+			generic_handle_irq(cpld_irq);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -105,11 +103,9 @@ static void ixdp2351_intb_handler(unsigned int irq, struct irq_desc *desc)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; IXDP2351_INTB_IRQ_NUM; i++) {</div><div class='ctx'> 		if (ex_interrupt &amp; (1 &lt;&lt; i)) {</div><div class='del'>-			struct irq_desc *cpld_desc;</div><div class='ctx'> 			int cpld_irq =</div><div class='ctx'> 				IXP23XX_MACH_IRQ(IXDP2351_INTB_IRQ_BASE + i);</div><div class='del'>-			cpld_desc = irq_desc + cpld_irq;</div><div class='del'>-			desc_handle_irq(cpld_irq, cpld_desc);</div><div class='add'>+			generic_handle_irq(cpld_irq);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-ixp23xx/pci.c b/arch/arm/mach-ixp23xx/pci.c<br/>index 701d60aa0efd..59022becb134 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ixp23xx/pci.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-ixp23xx/pci.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ixp23xx/pci.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ixp23xx/pci.c</a></div><div class='hunk'>@@ -25,8 +25,8 @@</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/sizes.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-ixp4xx/common-pci.c b/arch/arm/mach-ixp4xx/common-pci.c<br/>index 192538a04575..d816c51320c7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ixp4xx/common-pci.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-ixp4xx/common-pci.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ixp4xx/common-pci.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ixp4xx/common-pci.c</a></div><div class='hunk'>@@ -25,9 +25,10 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;asm/dma-mapping.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/cputype.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/sizes.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='hunk'>@@ -366,15 +367,13 @@ void __init ixp4xx_adjust_zones(int node, unsigned long *zone_size,</div><div class='ctx'> </div><div class='ctx'> void __init ixp4xx_pci_preinit(void)</div><div class='ctx'> {  </div><div class='del'>-	unsigned long processor_id;</div><div class='del'>-</div><div class='del'>-	asm("mrc p15, 0, %0, cr0, cr0, 0;" : "=r"(processor_id) :);</div><div class='add'>+	unsigned long cpuid = read_cpuid_id();</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Determine which PCI read method to use.</div><div class='ctx'> 	 * Rev 0 IXP425 requires workaround.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!(processor_id &amp; 0xf) &amp;&amp; cpu_is_ixp42x()) {</div><div class='add'>+	if (!(cpuid &amp; 0xf) &amp;&amp; cpu_is_ixp42x()) {</div><div class='ctx'> 		printk("PCI: IXP42x A0 silicon detected - "</div><div class='ctx'> 			"PCI Non-Prefetch Workaround Enabled\n");</div><div class='ctx'> 		ixp4xx_pci_read = ixp4xx_pci_read_errata;</div><div class='head'>diff --git a/arch/arm/mach-ixp4xx/common.c b/arch/arm/mach-ixp4xx/common.c<br/>index 58bd2842a6f1..7766f469456b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ixp4xx/common.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-ixp4xx/common.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ixp4xx/common.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ixp4xx/common.c</a></div><div class='hunk'>@@ -28,11 +28,11 @@</div><div class='ctx'> #include &lt;linux/timex.h&gt;</div><div class='ctx'> #include &lt;linux/clocksource.h&gt;</div><div class='ctx'> #include &lt;linux/clockchips.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/udc.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-ixp4xx/fsg-setup.c b/arch/arm/mach-ixp4xx/fsg-setup.c<br/>index 501dfdcc39fe..e7c6386782ed 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ixp4xx/fsg-setup.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-ixp4xx/fsg-setup.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ixp4xx/fsg-setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ixp4xx/fsg-setup.c</a></div><div class='hunk'>@@ -23,11 +23,11 @@</div><div class='ctx'> #include &lt;linux/reboot.h&gt;</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='ctx'> #include &lt;linux/i2c-gpio.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/flash.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct flash_platform_data fsg_flash_data = {</div><div class='head'>diff --git a/arch/arm/mach-ixp4xx/include/mach/cpu.h b/arch/arm/mach-ixp4xx/include/mach/cpu.h<br/>index ff8aa2393bf9..51bd69c46d94 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ixp4xx/include/mach/cpu.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-ixp4xx/include/mach/cpu.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ixp4xx/include/mach/cpu.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ixp4xx/include/mach/cpu.h</a></div><div class='hunk'>@@ -14,18 +14,19 @@</div><div class='ctx'> #ifndef __ASM_ARCH_CPU_H__</div><div class='ctx'> #define __ASM_ARCH_CPU_H__</div><div class='ctx'> </div><div class='del'>-extern unsigned int processor_id;</div><div class='add'>+#include &lt;asm/cputype.h&gt;</div><div class='add'>+</div><div class='ctx'> /* Processor id value in CP15 Register 0 */</div><div class='ctx'> #define IXP425_PROCESSOR_ID_VALUE	0x690541c0</div><div class='ctx'> #define IXP435_PROCESSOR_ID_VALUE	0x69054040</div><div class='ctx'> #define IXP465_PROCESSOR_ID_VALUE	0x69054200</div><div class='ctx'> #define IXP4XX_PROCESSOR_ID_MASK	0xfffffff0</div><div class='ctx'> </div><div class='del'>-#define cpu_is_ixp42x()	((processor_id &amp; IXP4XX_PROCESSOR_ID_MASK) == \</div><div class='add'>+#define cpu_is_ixp42x()	((read_cpuid_id() &amp; IXP4XX_PROCESSOR_ID_MASK) == \</div><div class='ctx'> 			  IXP425_PROCESSOR_ID_VALUE)</div><div class='del'>-#define cpu_is_ixp43x()	((processor_id &amp; IXP4XX_PROCESSOR_ID_MASK) == \</div><div class='add'>+#define cpu_is_ixp43x()	((read_cpuid_id() &amp; IXP4XX_PROCESSOR_ID_MASK) == \</div><div class='ctx'> 			  IXP435_PROCESSOR_ID_VALUE)</div><div class='del'>-#define cpu_is_ixp46x()	((processor_id &amp; IXP4XX_PROCESSOR_ID_MASK) == \</div><div class='add'>+#define cpu_is_ixp46x()	((read_cpuid_id() &amp; IXP4XX_PROCESSOR_ID_MASK) == \</div><div class='ctx'> 			  IXP465_PROCESSOR_ID_VALUE)</div><div class='ctx'> </div><div class='ctx'> static inline u32 ixp4xx_read_feature_bits(void)</div><div class='head'>diff --git a/arch/arm/mach-ixp4xx/ixdp425-setup.c b/arch/arm/mach-ixp4xx/ixdp425-setup.c<br/>index 9b2d2ec14c80..f4a0c1bc1331 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ixp4xx/ixdp425-setup.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-ixp4xx/ixdp425-setup.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ixp4xx/ixdp425-setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ixp4xx/ixdp425-setup.c</a></div><div class='hunk'>@@ -20,6 +20,7 @@</div><div class='ctx'> #include &lt;linux/mtd/mtd.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/nand.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/types.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='hunk'>@@ -29,7 +30,6 @@</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/flash.h&gt;</div><div class='del'>-#include &lt;asm/delay.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct flash_platform_data ixdp425_flash_data = {</div><div class='ctx'> 	.map_name	= "cfi_probe",</div><div class='head'>diff --git a/arch/arm/mach-ixp4xx/nas100d-setup.c b/arch/arm/mach-ixp4xx/nas100d-setup.c<br/>index 84b5e62a9c0a..0acd95ecf27e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ixp4xx/nas100d-setup.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-ixp4xx/nas100d-setup.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ixp4xx/nas100d-setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ixp4xx/nas100d-setup.c</a></div><div class='hunk'>@@ -28,11 +28,11 @@</div><div class='ctx'> #include &lt;linux/reboot.h&gt;</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='ctx'> #include &lt;linux/i2c-gpio.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/flash.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct flash_platform_data nas100d_flash_data = {</div><div class='head'>diff --git a/arch/arm/mach-ixp4xx/nslu2-setup.c b/arch/arm/mach-ixp4xx/nslu2-setup.c<br/>index a48a6655b887..bc9d920ae54f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ixp4xx/nslu2-setup.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-ixp4xx/nslu2-setup.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ixp4xx/nslu2-setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ixp4xx/nslu2-setup.c</a></div><div class='hunk'>@@ -25,12 +25,12 @@</div><div class='ctx'> #include &lt;linux/reboot.h&gt;</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='ctx'> #include &lt;linux/i2c-gpio.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/flash.h&gt;</div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct flash_platform_data nslu2_flash_data = {</div><div class='head'>diff --git a/arch/arm/mach-kirkwood/addr-map.c b/arch/arm/mach-kirkwood/addr-map.c<br/>index c79f492072f9..5db4f0bbe5ee 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-kirkwood/addr-map.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-kirkwood/addr-map.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-kirkwood/addr-map.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-kirkwood/addr-map.c</a></div><div class='hunk'>@@ -48,6 +48,7 @@</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> struct mbus_dram_target_info kirkwood_mbus_dram_info;</div><div class='add'>+static int __initdata win_alloc_count;</div><div class='ctx'> </div><div class='ctx'> static int __init cpu_win_can_remap(int win)</div><div class='ctx'> {</div><div class='hunk'>@@ -111,6 +112,8 @@ void __init kirkwood_setup_cpu_mbus(void)</div><div class='ctx'> 	setup_cpu_win(2, KIRKWOOD_NAND_MEM_PHYS_BASE, KIRKWOOD_NAND_MEM_SIZE,</div><div class='ctx'> 		      TARGET_DEV_BUS, ATTR_DEV_NAND, -1);</div><div class='ctx'> </div><div class='add'>+	win_alloc_count = 3;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Setup MBUS dram target info.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -137,3 +140,8 @@ void __init kirkwood_setup_cpu_mbus(void)</div><div class='ctx'> 	}</div><div class='ctx'> 	kirkwood_mbus_dram_info.num_cs = cs;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+void __init kirkwood_setup_sram_win(u32 base, u32 size)</div><div class='add'>+{</div><div class='add'>+	setup_cpu_win(win_alloc_count++, base, size, 0x03, 0x00, -1);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c<br/>index 189f16f3619d..85cad05d8c5b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-kirkwood/common.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-kirkwood/common.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-kirkwood/common.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-kirkwood/common.c</a></div><div class='hunk'>@@ -98,7 +98,6 @@ void __init kirkwood_ehci_init(void)</div><div class='ctx'>  * GE00</div><div class='ctx'>  ****************************************************************************/</div><div class='ctx'> struct mv643xx_eth_shared_platform_data kirkwood_ge00_shared_data = {</div><div class='del'>-	.t_clk		= KIRKWOOD_TCLK,</div><div class='ctx'> 	.dram		= &amp;kirkwood_mbus_dram_info,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -108,6 +107,11 @@ static struct resource kirkwood_ge00_shared_resources[] = {</div><div class='ctx'> 		.start	= GE00_PHYS_BASE + 0x2000,</div><div class='ctx'> 		.end	= GE00_PHYS_BASE + 0x3fff,</div><div class='ctx'> 		.flags	= IORESOURCE_MEM,</div><div class='add'>+	}, {</div><div class='add'>+		.name	= "ge00 err irq",</div><div class='add'>+		.start	= IRQ_KIRKWOOD_GE00_ERR,</div><div class='add'>+		.end	= IRQ_KIRKWOOD_GE00_ERR,</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -117,7 +121,7 @@ static struct platform_device kirkwood_ge00_shared = {</div><div class='ctx'> 	.dev		= {</div><div class='ctx'> 		.platform_data	= &amp;kirkwood_ge00_shared_data,</div><div class='ctx'> 	},</div><div class='del'>-	.num_resources	= 1,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(kirkwood_ge00_shared_resources),</div><div class='ctx'> 	.resource	= kirkwood_ge00_shared_resources,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -201,7 +205,6 @@ void __init kirkwood_sata_init(struct mv_sata_platform_data *sata_data)</div><div class='ctx'>  * SPI</div><div class='ctx'>  ****************************************************************************/</div><div class='ctx'> static struct orion_spi_info kirkwood_spi_plat_data = {</div><div class='del'>-	.tclk		= KIRKWOOD_TCLK,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct resource kirkwood_spi_resources[] = {</div><div class='hunk'>@@ -239,7 +242,7 @@ static struct plat_serial8250_port kirkwood_uart0_data[] = {</div><div class='ctx'> 		.flags		= UPF_SKIP_TEST | UPF_BOOT_AUTOCONF,</div><div class='ctx'> 		.iotype		= UPIO_MEM,</div><div class='ctx'> 		.regshift	= 2,</div><div class='del'>-		.uartclk	= KIRKWOOD_TCLK,</div><div class='add'>+		.uartclk	= 0,</div><div class='ctx'> 	}, {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='hunk'>@@ -283,7 +286,7 @@ static struct plat_serial8250_port kirkwood_uart1_data[] = {</div><div class='ctx'> 		.flags		= UPF_SKIP_TEST | UPF_BOOT_AUTOCONF,</div><div class='ctx'> 		.iotype		= UPIO_MEM,</div><div class='ctx'> 		.regshift	= 2,</div><div class='del'>-		.uartclk	= KIRKWOOD_TCLK,</div><div class='add'>+		.uartclk	= 0,</div><div class='ctx'> 	}, {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='hunk'>@@ -525,9 +528,23 @@ void __init kirkwood_xor1_init(void)</div><div class='ctx'> /*****************************************************************************</div><div class='ctx'>  * Time handling</div><div class='ctx'>  ****************************************************************************/</div><div class='add'>+int kirkwood_tclk;</div><div class='add'>+</div><div class='add'>+int __init kirkwood_find_tclk(void)</div><div class='add'>+{</div><div class='add'>+	u32 dev, rev;</div><div class='add'>+</div><div class='add'>+	kirkwood_pcie_id(&amp;dev, &amp;rev);</div><div class='add'>+	if (dev == MV88F6281_DEV_ID &amp;&amp; rev == MV88F6281_REV_A0)</div><div class='add'>+		return 200000000;</div><div class='add'>+</div><div class='add'>+	return 166666667;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void kirkwood_timer_init(void)</div><div class='ctx'> {</div><div class='del'>-	orion_time_init(IRQ_KIRKWOOD_BRIDGE, KIRKWOOD_TCLK);</div><div class='add'>+	kirkwood_tclk = kirkwood_find_tclk();</div><div class='add'>+	orion_time_init(IRQ_KIRKWOOD_BRIDGE, kirkwood_tclk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct sys_timer kirkwood_timer = {</div><div class='hunk'>@@ -538,33 +555,62 @@ struct sys_timer kirkwood_timer = {</div><div class='ctx'> /*****************************************************************************</div><div class='ctx'>  * General</div><div class='ctx'>  ****************************************************************************/</div><div class='add'>+/*</div><div class='add'>+ * Identify device ID and revision.</div><div class='add'>+ */</div><div class='ctx'> static char * __init kirkwood_id(void)</div><div class='ctx'> {</div><div class='del'>-	switch (readl(DEVICE_ID) &amp; 0x3) {</div><div class='del'>-	case 0:</div><div class='del'>-		return "88F6180";</div><div class='del'>-	case 1:</div><div class='del'>-		return "88F6192";</div><div class='del'>-	case 2:</div><div class='del'>-		return "88F6281";</div><div class='add'>+	u32 dev, rev;</div><div class='add'>+</div><div class='add'>+	kirkwood_pcie_id(&amp;dev, &amp;rev);</div><div class='add'>+</div><div class='add'>+	if (dev == MV88F6281_DEV_ID) {</div><div class='add'>+		if (rev == MV88F6281_REV_Z0)</div><div class='add'>+			return "MV88F6281-Z0";</div><div class='add'>+		else if (rev == MV88F6281_REV_A0)</div><div class='add'>+			return "MV88F6281-A0";</div><div class='add'>+		else</div><div class='add'>+			return "MV88F6281-Rev-Unsupported";</div><div class='add'>+	} else if (dev == MV88F6192_DEV_ID) {</div><div class='add'>+		if (rev == MV88F6192_REV_Z0)</div><div class='add'>+			return "MV88F6192-Z0";</div><div class='add'>+		else if (rev == MV88F6192_REV_A0)</div><div class='add'>+			return "MV88F6192-A0";</div><div class='add'>+		else</div><div class='add'>+			return "MV88F6192-Rev-Unsupported";</div><div class='add'>+	} else if (dev == MV88F6180_DEV_ID) {</div><div class='add'>+		if (rev == MV88F6180_REV_A0)</div><div class='add'>+			return "MV88F6180-Rev-A0";</div><div class='add'>+		else</div><div class='add'>+			return "MV88F6180-Rev-Unsupported";</div><div class='add'>+	} else {</div><div class='add'>+		return "Device-Unknown";</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	return "unknown 88F6000 variant";</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init is_l2_writethrough(void)</div><div class='add'>+static void __init kirkwood_l2_init(void)</div><div class='ctx'> {</div><div class='del'>-	return !!(readl(L2_CONFIG_REG) &amp; L2_WRITETHROUGH);</div><div class='add'>+#ifdef CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH</div><div class='add'>+	writel(readl(L2_CONFIG_REG) | L2_WRITETHROUGH, L2_CONFIG_REG);</div><div class='add'>+	feroceon_l2_init(1);</div><div class='add'>+#else</div><div class='add'>+	writel(readl(L2_CONFIG_REG) &amp; ~L2_WRITETHROUGH, L2_CONFIG_REG);</div><div class='add'>+	feroceon_l2_init(0);</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __init kirkwood_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	printk(KERN_INFO "Kirkwood: %s, TCLK=%d.\n",</div><div class='del'>-		kirkwood_id(), KIRKWOOD_TCLK);</div><div class='add'>+		kirkwood_id(), kirkwood_tclk);</div><div class='add'>+	kirkwood_ge00_shared_data.t_clk = kirkwood_tclk;</div><div class='add'>+	kirkwood_spi_plat_data.tclk = kirkwood_tclk;</div><div class='add'>+	kirkwood_uart0_data[0].uartclk = kirkwood_tclk;</div><div class='add'>+	kirkwood_uart1_data[0].uartclk = kirkwood_tclk;</div><div class='ctx'> </div><div class='ctx'> 	kirkwood_setup_cpu_mbus();</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_CACHE_FEROCEON_L2</div><div class='del'>-	feroceon_l2_init(is_l2_writethrough());</div><div class='add'>+	kirkwood_l2_init();</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-kirkwood/common.h b/arch/arm/mach-kirkwood/common.h<br/>index 69cd113af03a..8fa0f6a27635 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-kirkwood/common.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-kirkwood/common.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-kirkwood/common.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-kirkwood/common.h</a></div><div class='hunk'>@@ -23,10 +23,9 @@ void kirkwood_init_irq(void);</div><div class='ctx'> </div><div class='ctx'> extern struct mbus_dram_target_info kirkwood_mbus_dram_info;</div><div class='ctx'> void kirkwood_setup_cpu_mbus(void);</div><div class='del'>-void kirkwood_setup_pcie_io_win(int window, u32 base, u32 size,</div><div class='del'>-				int maj, int min);</div><div class='del'>-void kirkwood_setup_pcie_mem_win(int window, u32 base, u32 size,</div><div class='del'>-				 int maj, int min);</div><div class='add'>+void kirkwood_setup_sram_win(u32 base, u32 size);</div><div class='add'>+</div><div class='add'>+void kirkwood_pcie_id(u32 *dev, u32 *rev);</div><div class='ctx'> </div><div class='ctx'> void kirkwood_ehci_init(void);</div><div class='ctx'> void kirkwood_ge00_init(struct mv643xx_eth_platform_data *eth_data);</div><div class='head'>diff --git a/arch/arm/mach-kirkwood/db88f6281-bp-setup.c b/arch/arm/mach-kirkwood/db88f6281-bp-setup.c<br/>index 610fb24d8ae2..a14c2948c62a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-kirkwood/db88f6281-bp-setup.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-kirkwood/db88f6281-bp-setup.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-kirkwood/db88f6281-bp-setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-kirkwood/db88f6281-bp-setup.c</a></div><div class='hunk'>@@ -25,7 +25,7 @@</div><div class='ctx'> #include "common.h"</div><div class='ctx'> </div><div class='ctx'> static struct mv643xx_eth_platform_data db88f6281_ge00_data = {</div><div class='del'>-	.phy_addr	= 8,</div><div class='add'>+	.phy_addr	= MV643XX_ETH_PHY_ADDR(8),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct mv_sata_platform_data db88f6281_sata_data = {</div><div class='hunk'>@@ -44,7 +44,6 @@ static void __init db88f6281_init(void)</div><div class='ctx'> 	kirkwood_rtc_init();</div><div class='ctx'> 	kirkwood_sata_init(&amp;db88f6281_sata_data);</div><div class='ctx'> 	kirkwood_uart0_init();</div><div class='del'>-	kirkwood_uart1_init();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init db88f6281_pci_init(void)</div><div class='head'>diff --git a/arch/arm/mach-kirkwood/include/mach/irqs.h b/arch/arm/mach-kirkwood/include/mach/irqs.h<br/>index 6fd05838c72d..ffab89f21c11 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-kirkwood/include/mach/irqs.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-kirkwood/include/mach/irqs.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-kirkwood/include/mach/irqs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-kirkwood/include/mach/irqs.h</a></div><div class='hunk'>@@ -50,6 +50,7 @@</div><div class='ctx'> #define IRQ_KIRKWOOD_GPIO_HIGH_0_7	39</div><div class='ctx'> #define IRQ_KIRKWOOD_GPIO_HIGH_8_15	40</div><div class='ctx'> #define IRQ_KIRKWOOD_GPIO_HIGH_16_23	41</div><div class='add'>+#define IRQ_KIRKWOOD_GE00_ERR	46</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * KIRKWOOD General Purpose Pins</div><div class='head'>diff --git a/arch/arm/mach-kirkwood/include/mach/kirkwood.h b/arch/arm/mach-kirkwood/include/mach/kirkwood.h<br/>index 5c69992295e8..eae42406fd86 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-kirkwood/include/mach/kirkwood.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-kirkwood/include/mach/kirkwood.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-kirkwood/include/mach/kirkwood.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-kirkwood/include/mach/kirkwood.h</a></div><div class='hunk'>@@ -68,6 +68,20 @@</div><div class='ctx'> #define   L2_WRITETHROUGH	0x00000010</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Supported devices and revisions.</div><div class='add'>+ */</div><div class='add'>+#define MV88F6281_DEV_ID	0x6281</div><div class='add'>+#define MV88F6281_REV_Z0	0</div><div class='add'>+#define MV88F6281_REV_A0	2</div><div class='add'>+</div><div class='add'>+#define MV88F6192_DEV_ID	0x6192</div><div class='add'>+#define MV88F6192_REV_Z0	0</div><div class='add'>+#define MV88F6192_REV_A0	2</div><div class='add'>+</div><div class='add'>+#define MV88F6180_DEV_ID	0x6180</div><div class='add'>+#define MV88F6180_REV_A0	2</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Register Map</div><div class='ctx'>  */</div><div class='ctx'> #define DDR_VIRT_BASE		(KIRKWOOD_REGS_VIRT_BASE | 0x00000)</div><div class='head'>diff --git a/arch/arm/mach-kirkwood/include/mach/timex.h b/arch/arm/mach-kirkwood/include/mach/timex.h<br/>index f77ef4a32c5f..c923cd169b9c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-kirkwood/include/mach/timex.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-kirkwood/include/mach/timex.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-kirkwood/include/mach/timex.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-kirkwood/include/mach/timex.h</a></div><div class='hunk'>@@ -8,4 +8,3 @@</div><div class='ctx'> </div><div class='ctx'> #define CLOCK_TICK_RATE		(100 * HZ)</div><div class='ctx'> </div><div class='del'>-#define KIRKWOOD_TCLK		166666667</div><div class='head'>diff --git a/arch/arm/mach-kirkwood/pcie.c b/arch/arm/mach-kirkwood/pcie.c<br/>index 2195fa31f6b7..f6b08f207c89 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-kirkwood/pcie.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-kirkwood/pcie.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-kirkwood/pcie.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-kirkwood/pcie.c</a></div><div class='hunk'>@@ -18,6 +18,12 @@</div><div class='ctx'> </div><div class='ctx'> #define PCIE_BASE	((void __iomem *)PCIE_VIRT_BASE)</div><div class='ctx'> </div><div class='add'>+void __init kirkwood_pcie_id(u32 *dev, u32 *rev)</div><div class='add'>+{</div><div class='add'>+	*dev = orion_pcie_dev_id(PCIE_BASE);</div><div class='add'>+	*rev = orion_pcie_rev(PCIE_BASE);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int pcie_valid_config(int bus, int dev)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='head'>diff --git a/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c b/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c<br/>index a3012d445971..b1d1a87a6821 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-kirkwood/rd88f6192-nas-setup.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-kirkwood/rd88f6192-nas-setup.c</a></div><div class='hunk'>@@ -30,7 +30,7 @@</div><div class='ctx'> #define RD88F6192_GPIO_USB_VBUS		10</div><div class='ctx'> </div><div class='ctx'> static struct mv643xx_eth_platform_data rd88f6192_ge00_data = {</div><div class='del'>-	.phy_addr	= 8,</div><div class='add'>+	.phy_addr	= MV643XX_ETH_PHY_ADDR(8),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct mv_sata_platform_data rd88f6192_sata_data = {</div><div class='head'>diff --git a/arch/arm/mach-kirkwood/rd88f6281-setup.c b/arch/arm/mach-kirkwood/rd88f6281-setup.c<br/>index d96487a0f18b..f785093e433f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-kirkwood/rd88f6281-setup.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-kirkwood/rd88f6281-setup.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-kirkwood/rd88f6281-setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-kirkwood/rd88f6281-setup.c</a></div><div class='hunk'>@@ -69,7 +69,7 @@ static struct platform_device rd88f6281_nand_flash = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct mv643xx_eth_platform_data rd88f6281_ge00_data = {</div><div class='del'>-	.phy_addr	= -1,</div><div class='add'>+	.phy_addr	= MV643XX_ETH_PHY_NONE,</div><div class='ctx'> 	.speed		= SPEED_1000,</div><div class='ctx'> 	.duplex		= DUPLEX_FULL,</div><div class='ctx'> };</div><div class='hunk'>@@ -90,7 +90,6 @@ static void __init rd88f6281_init(void)</div><div class='ctx'> 	kirkwood_rtc_init();</div><div class='ctx'> 	kirkwood_sata_init(&amp;rd88f6281_sata_data);</div><div class='ctx'> 	kirkwood_uart0_init();</div><div class='del'>-	kirkwood_uart1_init();</div><div class='ctx'> </div><div class='ctx'> 	platform_device_register(&amp;rd88f6281_nand_flash);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-ks8695/cpu.c b/arch/arm/mach-ks8695/cpu.c<br/>index c6c08e800233..7f3f24053a00 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ks8695/cpu.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-ks8695/cpu.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ks8695/cpu.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ks8695/cpu.c</a></div><div class='hunk'>@@ -24,9 +24,9 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-ks8695/gpio.c b/arch/arm/mach-ks8695/gpio.c<br/>index 3624e65cd89b..9aecf0c4b8b1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ks8695/gpio.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-ks8695/gpio.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ks8695/gpio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ks8695/gpio.c</a></div><div class='hunk'>@@ -23,8 +23,8 @@</div><div class='ctx'> #include &lt;linux/debugfs.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -72,7 +72,7 @@ int __init_or_module ks8695_gpio_interrupt(unsigned int pin, unsigned int type)</div><div class='ctx'> </div><div class='ctx'> 	/* set pin as input */</div><div class='ctx'> 	x = __raw_readl(KS8695_GPIO_VA + KS8695_IOPM);</div><div class='del'>-	x &amp;= ~IOPM_(pin);</div><div class='add'>+	x &amp;= ~IOPM(pin);</div><div class='ctx'> 	__raw_writel(x, KS8695_GPIO_VA + KS8695_IOPM);</div><div class='ctx'> </div><div class='ctx'> 	local_irq_restore(flags);</div><div class='hunk'>@@ -108,7 +108,7 @@ int __init_or_module gpio_direction_input(unsigned int pin)</div><div class='ctx'> </div><div class='ctx'> 	/* set pin as input */</div><div class='ctx'> 	x = __raw_readl(KS8695_GPIO_VA + KS8695_IOPM);</div><div class='del'>-	x &amp;= ~IOPM_(pin);</div><div class='add'>+	x &amp;= ~IOPM(pin);</div><div class='ctx'> 	__raw_writel(x, KS8695_GPIO_VA + KS8695_IOPM);</div><div class='ctx'> </div><div class='ctx'> 	local_irq_restore(flags);</div><div class='hunk'>@@ -136,14 +136,14 @@ int __init_or_module gpio_direction_output(unsigned int pin, unsigned int state)</div><div class='ctx'> 	/* set line state */</div><div class='ctx'> 	x = __raw_readl(KS8695_GPIO_VA + KS8695_IOPD);</div><div class='ctx'> 	if (state)</div><div class='del'>-		x |= (1 &lt;&lt; pin);</div><div class='add'>+		x |= IOPD(pin);</div><div class='ctx'> 	else</div><div class='del'>-		x &amp;= ~(1 &lt;&lt; pin);</div><div class='add'>+		x &amp;= ~IOPD(pin);</div><div class='ctx'> 	__raw_writel(x, KS8695_GPIO_VA + KS8695_IOPD);</div><div class='ctx'> </div><div class='ctx'> 	/* set pin as output */</div><div class='ctx'> 	x = __raw_readl(KS8695_GPIO_VA + KS8695_IOPM);</div><div class='del'>-	x |= IOPM_(pin);</div><div class='add'>+	x |= IOPM(pin);</div><div class='ctx'> 	__raw_writel(x, KS8695_GPIO_VA + KS8695_IOPM);</div><div class='ctx'> </div><div class='ctx'> 	local_irq_restore(flags);</div><div class='hunk'>@@ -168,9 +168,9 @@ void gpio_set_value(unsigned int pin, unsigned int state)</div><div class='ctx'> 	/* set output line state */</div><div class='ctx'> 	x = __raw_readl(KS8695_GPIO_VA + KS8695_IOPD);</div><div class='ctx'> 	if (state)</div><div class='del'>-		x |= (1 &lt;&lt; pin);</div><div class='add'>+		x |= IOPD(pin);</div><div class='ctx'> 	else</div><div class='del'>-		x &amp;= ~(1 &lt;&lt; pin);</div><div class='add'>+		x &amp;= ~IOPD(pin);</div><div class='ctx'> 	__raw_writel(x, KS8695_GPIO_VA + KS8695_IOPD);</div><div class='ctx'> </div><div class='ctx'> 	local_irq_restore(flags);</div><div class='hunk'>@@ -189,7 +189,7 @@ int gpio_get_value(unsigned int pin)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	x = __raw_readl(KS8695_GPIO_VA + KS8695_IOPD);</div><div class='del'>-	return (x &amp; (1 &lt;&lt; pin)) != 0;</div><div class='add'>+	return (x &amp; IOPD(pin)) != 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(gpio_get_value);</div><div class='ctx'> </div><div class='hunk'>@@ -240,7 +240,7 @@ static int ks8695_gpio_show(struct seq_file *s, void *unused)</div><div class='ctx'> 	for (i = KS8695_GPIO_0; i &lt;= KS8695_GPIO_15 ; i++) {</div><div class='ctx'> 		seq_printf(s, "%i:\t", i);</div><div class='ctx'> </div><div class='del'>-		seq_printf(s, "%s\t", (mode &amp; IOPM_(i)) ? "Output" : "Input");</div><div class='add'>+		seq_printf(s, "%s\t", (mode &amp; IOPM(i)) ? "Output" : "Input");</div><div class='ctx'> </div><div class='ctx'> 		if (i &lt;= KS8695_GPIO_3) {</div><div class='ctx'> 			if (ctrl &amp; enable[i]) {</div><div class='hunk'>@@ -273,7 +273,7 @@ static int ks8695_gpio_show(struct seq_file *s, void *unused)</div><div class='ctx'> </div><div class='ctx'> 		seq_printf(s, "\t");</div><div class='ctx'> </div><div class='del'>-		seq_printf(s, "%i\n", (data &amp; IOPD_(i)) ? 1 : 0);</div><div class='add'>+		seq_printf(s, "%i\n", (data &amp; IOPD(i)) ? 1 : 0);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-ks8695/include/mach/memory.h b/arch/arm/mach-ks8695/include/mach/memory.h<br/>index dadbe66cb75c..8fbc4c76c38b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ks8695/include/mach/memory.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-ks8695/include/mach/memory.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ks8695/include/mach/memory.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ks8695/include/mach/memory.h</a></div><div class='hunk'>@@ -31,8 +31,8 @@</div><div class='ctx'> /* Platform-bus mapping */</div><div class='ctx'> extern struct bus_type platform_bus_type;</div><div class='ctx'> #define is_lbus_device(dev)		(dev &amp;&amp; dev-&gt;bus == &amp;platform_bus_type)</div><div class='del'>-#define __arch_dma_to_virt(dev, x)	({ is_lbus_device(dev) ? \</div><div class='del'>-					__phys_to_virt(x) : __bus_to_virt(x); })</div><div class='add'>+#define __arch_dma_to_virt(dev, x)	({ (void *) (is_lbus_device(dev) ? \</div><div class='add'>+					__phys_to_virt(x) : __bus_to_virt(x)); })</div><div class='ctx'> #define __arch_virt_to_dma(dev, x)	({ is_lbus_device(dev) ? \</div><div class='ctx'> 					(dma_addr_t)__virt_to_phys(x) : (dma_addr_t)__virt_to_bus(x); })</div><div class='ctx'> #define __arch_page_to_dma(dev, x)	__arch_virt_to_dma(dev, page_address(x))</div><div class='head'>diff --git a/arch/arm/mach-ks8695/include/mach/regs-gpio.h b/arch/arm/mach-ks8695/include/mach/regs-gpio.h<br/>index 0df6fe61d1ce..90614a7d0548 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ks8695/include/mach/regs-gpio.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-ks8695/include/mach/regs-gpio.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ks8695/include/mach/regs-gpio.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ks8695/include/mach/regs-gpio.h</a></div><div class='hunk'>@@ -24,7 +24,7 @@</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* Port Mode Register */</div><div class='del'>-#define IOPM_(x)		(1 &lt;&lt; (x))	/* Mode for GPIO Pin x */</div><div class='add'>+#define IOPM(x)			(1 &lt;&lt; (x))	/* Mode for GPIO Pin x */</div><div class='ctx'> </div><div class='ctx'> /* Port Control Register */</div><div class='ctx'> #define IOPC_IOTIM1EN		(1 &lt;&lt; 17)	/* GPIO Pin for Timer1 Enable */</div><div class='hunk'>@@ -50,6 +50,6 @@</div><div class='ctx'> #define IOPC_TM_EDGE		(6)		/* Both Edge Detection */</div><div class='ctx'> </div><div class='ctx'> /* Port Data Register */</div><div class='del'>-#define IOPD_(x)		(1 &lt;&lt; (x))	/* Signal Level of GPIO Pin x */</div><div class='add'>+#define IOPD(x)			(1 &lt;&lt; (x))	/* Signal Level of GPIO Pin x */</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-ks8695/include/mach/regs-lan.h b/arch/arm/mach-ks8695/include/mach/regs-lan.h<br/>index 9ef409901e76..82c5f3791afb 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ks8695/include/mach/regs-lan.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-ks8695/include/mach/regs-lan.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ks8695/include/mach/regs-lan.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ks8695/include/mach/regs-lan.h</a></div><div class='hunk'>@@ -29,8 +29,8 @@</div><div class='ctx'> #define KS8695_LRDLB		(0x14)		/* Receive Descriptor List Base Address */</div><div class='ctx'> #define KS8695_LMAL		(0x18)		/* MAC Station Address Low */</div><div class='ctx'> #define KS8695_LMAH		(0x1c)		/* MAC Station Address High */</div><div class='del'>-#define KS8695_LMAAL_(n)	(0x80 + ((n)*8))	/* MAC Additional Station Address (0..15) Low */</div><div class='del'>-#define KS8695_LMAAH_(n)	(0x84 + ((n)*8))	/* MAC Additional Station Address (0..15) High */</div><div class='add'>+#define KS8695_LMAAL(n)		(0x80 + ((n)*8))	/* MAC Additional Station Address (0..15) Low */</div><div class='add'>+#define KS8695_LMAAH(n)		(0x84 + ((n)*8))	/* MAC Additional Station Address (0..15) High */</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* DMA Transmit Control Register */</div><div class='head'>diff --git a/arch/arm/mach-ks8695/include/mach/regs-wan.h b/arch/arm/mach-ks8695/include/mach/regs-wan.h<br/>index eb494ec6e956..c475bed22b8e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ks8695/include/mach/regs-wan.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-ks8695/include/mach/regs-wan.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ks8695/include/mach/regs-wan.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ks8695/include/mach/regs-wan.h</a></div><div class='hunk'>@@ -29,8 +29,8 @@</div><div class='ctx'> #define KS8695_WRDLB		(0x14)		/* Receive Descriptor List Base Address */</div><div class='ctx'> #define KS8695_WMAL		(0x18)		/* MAC Station Address Low */</div><div class='ctx'> #define KS8695_WMAH		(0x1c)		/* MAC Station Address High */</div><div class='del'>-#define KS8695_WMAAL_(n)	(0x80 + ((n)*8))	/* MAC Additional Station Address (0..15) Low */</div><div class='del'>-#define KS8695_WMAAH_(n)	(0x84 + ((n)*8))	/* MAC Additional Station Address (0..15) High */</div><div class='add'>+#define KS8695_WMAAL(n)		(0x80 + ((n)*8))	/* MAC Additional Station Address (0..15) Low */</div><div class='add'>+#define KS8695_WMAAH(n)		(0x84 + ((n)*8))	/* MAC Additional Station Address (0..15) High */</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* DMA Transmit Control Register */</div><div class='head'>diff --git a/arch/arm/mach-ks8695/include/mach/system.h b/arch/arm/mach-ks8695/include/mach/system.h<br/>index 2a6f91869056..5a9b032bdbeb 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ks8695/include/mach/system.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-ks8695/include/mach/system.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ks8695/include/mach/system.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ks8695/include/mach/system.h</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'> #ifndef __ASM_ARCH_SYSTEM_H</div><div class='ctx'> #define __ASM_ARCH_SYSTEM_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;mach/regs-timer.h&gt;</div><div class='ctx'> </div><div class='ctx'> static void arch_idle(void)</div><div class='head'>diff --git a/arch/arm/mach-ks8695/include/mach/uncompress.h b/arch/arm/mach-ks8695/include/mach/uncompress.h<br/>index 0eee37a69075..9495cb4d701a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ks8695/include/mach/uncompress.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-ks8695/include/mach/uncompress.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ks8695/include/mach/uncompress.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ks8695/include/mach/uncompress.h</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'> #ifndef __ASM_ARCH_UNCOMPRESS_H</div><div class='ctx'> #define __ASM_ARCH_UNCOMPRESS_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;mach/regs-uart.h&gt;</div><div class='ctx'> </div><div class='ctx'> static void putc(char c)</div><div class='head'>diff --git a/arch/arm/mach-ks8695/irq.c b/arch/arm/mach-ks8695/irq.c<br/>index e5e71f4dbb84..e375c1d53f81 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ks8695/irq.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-ks8695/irq.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ks8695/irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ks8695/irq.c</a></div><div class='hunk'>@@ -24,10 +24,10 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-ks8695/pci.c b/arch/arm/mach-ks8695/pci.c<br/>index 1746c67af176..f5ebcc0fcab9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ks8695/pci.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-ks8695/pci.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ks8695/pci.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ks8695/pci.c</a></div><div class='hunk'>@@ -27,8 +27,8 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/signal.h&gt;</div><div class='ctx'> #include &lt;asm/mach/pci.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='hunk'>@@ -141,7 +141,7 @@ static struct pci_ops ks8695_pci_ops = {</div><div class='ctx'> 	.write	= ks8695_pci_writeconfig,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct pci_bus *ks8695_pci_scan_bus(int nr, struct pci_sys_data *sys)</div><div class='add'>+static struct pci_bus* __init ks8695_pci_scan_bus(int nr, struct pci_sys_data *sys)</div><div class='ctx'> {</div><div class='ctx'> 	return pci_scan_bus(sys-&gt;busnr, &amp;ks8695_pci_ops, sys);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-ks8695/time.c b/arch/arm/mach-ks8695/time.c<br/>index 940888dffc16..69c072c2c0f9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ks8695/time.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-ks8695/time.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ks8695/time.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ks8695/time.c</a></div><div class='hunk'>@@ -24,8 +24,8 @@</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/regs-timer.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-lh7a40x/Kconfig b/arch/arm/mach-lh7a40x/Kconfig<br/>index 6f4c6a1798c1..9be7466e346c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-lh7a40x/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-lh7a40x/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-lh7a40x/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-lh7a40x/Kconfig</a></div><div class='hunk'>@@ -40,23 +40,22 @@ config LPD7A40X_CPLD_SSP</div><div class='ctx'> 	bool</div><div class='ctx'> </div><div class='ctx'> config LH7A40X_CONTIGMEM</div><div class='del'>-	bool "Disable NUMA Support"</div><div class='del'>-	depends on ARCH_LH7A40X</div><div class='add'>+	bool "Disable NUMA/SparseMEM Support"</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say Y here if your bootloader sets the SROMLL bit(s) in</div><div class='ctx'> 	  the SDRAM controller, organizing memory as a contiguous</div><div class='del'>-	  array.  This option will disable CONFIG_DISCONTIGMEM and</div><div class='del'>-          force the kernel to manage all memory in one node.</div><div class='add'>+	  array.  This option will disable sparse memory support</div><div class='add'>+          and force the kernel to manage all memory in one node.</div><div class='ctx'> </div><div class='del'>-	  Setting this option incorrectly may prevent the kernel from</div><div class='del'>-	  booting.  It is OK to leave it N.</div><div class='add'>+	  Setting this option incorrectly may prevent the kernel</div><div class='add'>+	  from booting.  It is OK to leave it N.</div><div class='ctx'> </div><div class='ctx'> 	  For more information, consult</div><div class='ctx'> 	    &lt;file:Documentation/arm/Sharp-LH/SDRAM&gt;.</div><div class='ctx'> </div><div class='ctx'> config LH7A40X_ONE_BANK_PER_NODE</div><div class='ctx'> 	bool "Optimize NUMA Node Tables for Size"</div><div class='del'>-	depends on ARCH_LH7A40X &amp;&amp; !LH7A40X_CONTIGMEM</div><div class='add'>+	depends on !LH7A40X_CONTIGMEM</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say Y here to produce compact memory node tables.  By</div><div class='ctx'> 	  default pairs of adjacent physical RAM banks are managed</div><div class='head'>diff --git a/arch/arm/mach-lh7a40x/arch-kev7a400.c b/arch/arm/mach-lh7a40x/arch-kev7a400.c<br/>index 551b97261826..3d7bd50b9095 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-lh7a40x/arch-kev7a400.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-lh7a40x/arch-kev7a400.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-lh7a40x/arch-kev7a400.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-lh7a40x/arch-kev7a400.c</a></div><div class='hunk'>@@ -77,7 +77,7 @@ static void kev7a400_cpld_handler (unsigned int irq, struct irq_desc *desc)</div><div class='ctx'> 	irq = IRQ_KEV7A400_CPLD;</div><div class='ctx'> 	for (; mask; mask &gt;&gt;= 1, ++irq)</div><div class='ctx'> 		if (mask &amp; 1)</div><div class='del'>-			desc_handle_irq(irq, desc);</div><div class='add'>+			generic_handle_irq(irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __init lh7a40x_init_board_irq (void)</div><div class='head'>diff --git a/arch/arm/mach-lh7a40x/arch-lpd7a40x.c b/arch/arm/mach-lh7a40x/arch-lpd7a40x.c<br/>index e373fb8e2699..cb15e5d32120 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-lh7a40x/arch-lpd7a40x.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-lh7a40x/arch-lpd7a40x.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-lh7a40x/arch-lpd7a40x.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-lh7a40x/arch-lpd7a40x.c</a></div><div class='hunk'>@@ -214,11 +214,11 @@ static void lpd7a40x_cpld_handler (unsigned int irq, struct irq_desc *desc)</div><div class='ctx'> 	desc-&gt;chip-&gt;ack (irq);</div><div class='ctx'> </div><div class='ctx'> 	if ((mask &amp; (1&lt;&lt;0)) == 0)	/* WLAN */</div><div class='del'>-		IRQ_DISPATCH (IRQ_LPD7A40X_ETH_INT);</div><div class='add'>+		generic_handle_irq(IRQ_LPD7A40X_ETH_INT);</div><div class='ctx'> </div><div class='ctx'> #if defined (IRQ_TOUCH)</div><div class='ctx'> 	if ((mask &amp; (1&lt;&lt;1)) == 0)	/* Touch */</div><div class='del'>-		IRQ_DISPATCH (IRQ_TOUCH);</div><div class='add'>+		generic_handle_irq(IRQ_TOUCH);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	desc-&gt;chip-&gt;unmask (irq); /* Level-triggered need this */</div><div class='head'>diff --git a/arch/arm/mach-lh7a40x/common.h b/arch/arm/mach-lh7a40x/common.h<br/>index 0ca20c6c83b7..6ed3f6b6db76 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-lh7a40x/common.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-lh7a40x/common.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-lh7a40x/common.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-lh7a40x/common.h</a></div><div class='hunk'>@@ -15,4 +15,3 @@ extern void lh7a404_init_irq (void);</div><div class='ctx'> extern void lh7a40x_clcd_init (void);</div><div class='ctx'> extern void lh7a40x_init_board_irq (void);</div><div class='ctx'> </div><div class='del'>-#define IRQ_DISPATCH(irq) desc_handle_irq((irq),(irq_desc + irq))</div><div class='head'>diff --git a/arch/arm/mach-lh7a40x/include/mach/memory.h b/arch/arm/mach-lh7a40x/include/mach/memory.h<br/>index f7107b4c197a..1da14ff66c93 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-lh7a40x/include/mach/memory.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-lh7a40x/include/mach/memory.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-lh7a40x/include/mach/memory.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-lh7a40x/include/mach/memory.h</a></div><div class='hunk'>@@ -73,4 +73,10 @@</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Sparsemem version of the above</div><div class='add'>+ */</div><div class='add'>+#define MAX_PHYSMEM_BITS	32</div><div class='add'>+#define SECTION_SIZE_BITS	24</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-lh7a40x/irq-lpd7a40x.c b/arch/arm/mach-lh7a40x/irq-lpd7a40x.c<br/>index 0d5063ebda10..fd033bb4342f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-lh7a40x/irq-lpd7a40x.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-lh7a40x/irq-lpd7a40x.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-lh7a40x/irq-lpd7a40x.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-lh7a40x/irq-lpd7a40x.c</a></div><div class='hunk'>@@ -63,10 +63,10 @@ static void lh7a40x_cpld_handler (unsigned int irq, struct irq_desc *desc)</div><div class='ctx'> 	desc-&gt;chip-&gt;ack (irq);</div><div class='ctx'> </div><div class='ctx'> 	if ((mask &amp; 0x1) == 0)	/* WLAN */</div><div class='del'>-		IRQ_DISPATCH (IRQ_LPD7A40X_ETH_INT);</div><div class='add'>+		generic_handle_irq(IRQ_LPD7A40X_ETH_INT);</div><div class='ctx'> </div><div class='ctx'> 	if ((mask &amp; 0x2) == 0)	/* Touch */</div><div class='del'>-		IRQ_DISPATCH (IRQ_LPD7A400_TS);</div><div class='add'>+		generic_handle_irq(IRQ_LPD7A400_TS);</div><div class='ctx'> </div><div class='ctx'> 	desc-&gt;chip-&gt;unmask (irq); /* Level-triggered need this */</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-lh7a40x/ssp-cpld.c b/arch/arm/mach-lh7a40x/ssp-cpld.c<br/>index 51fbef9601b9..2901d49d1484 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-lh7a40x/ssp-cpld.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-lh7a40x/ssp-cpld.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-lh7a40x/ssp-cpld.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-lh7a40x/ssp-cpld.c</a></div><div class='hunk'>@@ -43,8 +43,8 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-lh7a40x/time.c b/arch/arm/mach-lh7a40x/time.c<br/>index 7fe9e06cf662..4601e425bae3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-lh7a40x/time.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-lh7a40x/time.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-lh7a40x/time.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-lh7a40x/time.c</a></div><div class='hunk'>@@ -13,9 +13,9 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/leds.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-loki/addr-map.c b/arch/arm/mach-loki/addr-map.c<br/>index 70ca56bb6f33..0332d8f5c18c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-loki/addr-map.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-loki/addr-map.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-loki/addr-map.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-loki/addr-map.c</a></div><div class='hunk'>@@ -11,8 +11,8 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/mbus.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include "common.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/arm/mach-loki/irq.c b/arch/arm/mach-loki/irq.c<br/>index 5a487930cb2f..e1f97338d5b7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-loki/irq.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-loki/irq.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-loki/irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-loki/irq.c</a></div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;plat/irq.h&gt;</div><div class='ctx'> #include "common.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-loki/lb88rc8480-setup.c b/arch/arm/mach-loki/lb88rc8480-setup.c<br/>index 2cc9ac9b488f..85f9c1296aa0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-loki/lb88rc8480-setup.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-loki/lb88rc8480-setup.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-loki/lb88rc8480-setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-loki/lb88rc8480-setup.c</a></div><div class='hunk'>@@ -67,7 +67,7 @@ static struct platform_device lb88rc8480_boot_flash = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct mv643xx_eth_platform_data lb88rc8480_ge0_data = {</div><div class='del'>-	.phy_addr	= 1,</div><div class='add'>+	.phy_addr	= MV643XX_ETH_PHY_ADDR(1),</div><div class='ctx'> 	.mac_addr	= { 0x00, 0x50, 0x43, 0x11, 0x22, 0x33 },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-msm/board-halibut.c b/arch/arm/mach-msm/board-halibut.c<br/>index 995afc4ade4b..a24259133e07 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-msm/board-halibut.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-msm/board-halibut.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-msm/board-halibut.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-msm/board-halibut.c</a></div><div class='hunk'>@@ -18,6 +18,8 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/input.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='hunk'>@@ -28,9 +30,6 @@</div><div class='ctx'> #include &lt;mach/board.h&gt;</div><div class='ctx'> #include &lt;mach/msm_iomap.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/delay.h&gt;</div><div class='del'>-</div><div class='ctx'> #include &lt;linux/mtd/nand.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-msm/common.c b/arch/arm/mach-msm/common.c<br/>index 3a511368a5d8..604f8ade9587 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-msm/common.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-msm/common.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-msm/common.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-msm/common.c</a></div><div class='hunk'>@@ -19,9 +19,9 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/flash.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-msm/dma.c b/arch/arm/mach-msm/dma.c<br/>index 9de08265d974..0c8f252637e1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-msm/dma.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-msm/dma.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-msm/dma.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-msm/dma.c</a></div><div class='hunk'>@@ -13,7 +13,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;mach/dma.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-msm/io.c b/arch/arm/mach-msm/io.c<br/>index 5976200de99b..7999e4ba8e20 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-msm/io.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-msm/io.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-msm/io.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-msm/io.c</a></div><div class='hunk'>@@ -18,9 +18,9 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;mach/msm_iomap.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-msm/irq.c b/arch/arm/mach-msm/irq.c<br/>index 66901baf8c8e..04b8d182ff8a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-msm/irq.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-msm/irq.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-msm/irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-msm/irq.c</a></div><div class='hunk'>@@ -19,11 +19,10 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='ctx'> #include &lt;linux/timer.h&gt;</div><div class='del'>-</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='del'>-#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/msm_iomap.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-msm/timer.c b/arch/arm/mach-msm/timer.c<br/>index 9f02d7dca985..2bffe9b7e9fe 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-msm/timer.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-msm/timer.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-msm/timer.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-msm/timer.c</a></div><div class='hunk'>@@ -20,12 +20,11 @@</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/clockchips.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='ctx'> #include &lt;mach/msm_iomap.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-</div><div class='ctx'> #define MSM_DGT_BASE (MSM_GPT_BASE + 0x10)</div><div class='ctx'> #define MSM_DGT_SHIFT (5)</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-mv78xx0/addr-map.c b/arch/arm/mach-mv78xx0/addr-map.c<br/>index 4004b672a2eb..311d5b0e9bc7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-mv78xx0/addr-map.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-mv78xx0/addr-map.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-mv78xx0/addr-map.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-mv78xx0/addr-map.c</a></div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/mbus.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include "common.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/arm/mach-mv78xx0/common.c b/arch/arm/mach-mv78xx0/common.c<br/>index 953a26c469cb..238a2f8c2d52 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-mv78xx0/common.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-mv78xx0/common.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-mv78xx0/common.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-mv78xx0/common.c</a></div><div class='hunk'>@@ -285,6 +285,11 @@ static struct resource mv78xx0_ge00_shared_resources[] = {</div><div class='ctx'> 		.start	= GE00_PHYS_BASE + 0x2000,</div><div class='ctx'> 		.end	= GE00_PHYS_BASE + 0x3fff,</div><div class='ctx'> 		.flags	= IORESOURCE_MEM,</div><div class='add'>+	}, {</div><div class='add'>+		.name	= "ge err irq",</div><div class='add'>+		.start	= IRQ_MV78XX0_GE_ERR,</div><div class='add'>+		.end	= IRQ_MV78XX0_GE_ERR,</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -294,7 +299,7 @@ static struct platform_device mv78xx0_ge00_shared = {</div><div class='ctx'> 	.dev		= {</div><div class='ctx'> 		.platform_data	= &amp;mv78xx0_ge00_shared_data,</div><div class='ctx'> 	},</div><div class='del'>-	.num_resources	= 1,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(mv78xx0_ge00_shared_resources),</div><div class='ctx'> 	.resource	= mv78xx0_ge00_shared_resources,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -330,6 +335,7 @@ void __init mv78xx0_ge00_init(struct mv643xx_eth_platform_data *eth_data)</div><div class='ctx'> struct mv643xx_eth_shared_platform_data mv78xx0_ge01_shared_data = {</div><div class='ctx'> 	.t_clk		= 0,</div><div class='ctx'> 	.dram		= &amp;mv78xx0_mbus_dram_info,</div><div class='add'>+	.shared_smi	= &amp;mv78xx0_ge00_shared,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct resource mv78xx0_ge01_shared_resources[] = {</div><div class='hunk'>@@ -370,7 +376,6 @@ static struct platform_device mv78xx0_ge01 = {</div><div class='ctx'> void __init mv78xx0_ge01_init(struct mv643xx_eth_platform_data *eth_data)</div><div class='ctx'> {</div><div class='ctx'> 	eth_data-&gt;shared = &amp;mv78xx0_ge01_shared;</div><div class='del'>-	eth_data-&gt;shared_smi = &amp;mv78xx0_ge00_shared;</div><div class='ctx'> 	mv78xx0_ge01.dev.platform_data = eth_data;</div><div class='ctx'> </div><div class='ctx'> 	platform_device_register(&amp;mv78xx0_ge01_shared);</div><div class='hunk'>@@ -384,6 +389,7 @@ void __init mv78xx0_ge01_init(struct mv643xx_eth_platform_data *eth_data)</div><div class='ctx'> struct mv643xx_eth_shared_platform_data mv78xx0_ge10_shared_data = {</div><div class='ctx'> 	.t_clk		= 0,</div><div class='ctx'> 	.dram		= &amp;mv78xx0_mbus_dram_info,</div><div class='add'>+	.shared_smi	= &amp;mv78xx0_ge00_shared,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct resource mv78xx0_ge10_shared_resources[] = {</div><div class='hunk'>@@ -424,7 +430,6 @@ static struct platform_device mv78xx0_ge10 = {</div><div class='ctx'> void __init mv78xx0_ge10_init(struct mv643xx_eth_platform_data *eth_data)</div><div class='ctx'> {</div><div class='ctx'> 	eth_data-&gt;shared = &amp;mv78xx0_ge10_shared;</div><div class='del'>-	eth_data-&gt;shared_smi = &amp;mv78xx0_ge00_shared;</div><div class='ctx'> 	mv78xx0_ge10.dev.platform_data = eth_data;</div><div class='ctx'> </div><div class='ctx'> 	platform_device_register(&amp;mv78xx0_ge10_shared);</div><div class='hunk'>@@ -438,6 +443,7 @@ void __init mv78xx0_ge10_init(struct mv643xx_eth_platform_data *eth_data)</div><div class='ctx'> struct mv643xx_eth_shared_platform_data mv78xx0_ge11_shared_data = {</div><div class='ctx'> 	.t_clk		= 0,</div><div class='ctx'> 	.dram		= &amp;mv78xx0_mbus_dram_info,</div><div class='add'>+	.shared_smi	= &amp;mv78xx0_ge00_shared,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct resource mv78xx0_ge11_shared_resources[] = {</div><div class='hunk'>@@ -478,7 +484,6 @@ static struct platform_device mv78xx0_ge11 = {</div><div class='ctx'> void __init mv78xx0_ge11_init(struct mv643xx_eth_platform_data *eth_data)</div><div class='ctx'> {</div><div class='ctx'> 	eth_data-&gt;shared = &amp;mv78xx0_ge11_shared;</div><div class='del'>-	eth_data-&gt;shared_smi = &amp;mv78xx0_ge00_shared;</div><div class='ctx'> 	mv78xx0_ge11.dev.platform_data = eth_data;</div><div class='ctx'> </div><div class='ctx'> 	platform_device_register(&amp;mv78xx0_ge11_shared);</div><div class='head'>diff --git a/arch/arm/mach-mv78xx0/db78x00-bp-setup.c b/arch/arm/mach-mv78xx0/db78x00-bp-setup.c<br/>index a2d0c9783604..49f434c39eb7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-mv78xx0/db78x00-bp-setup.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-mv78xx0/db78x00-bp-setup.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-mv78xx0/db78x00-bp-setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-mv78xx0/db78x00-bp-setup.c</a></div><div class='hunk'>@@ -19,19 +19,19 @@</div><div class='ctx'> #include "common.h"</div><div class='ctx'> </div><div class='ctx'> static struct mv643xx_eth_platform_data db78x00_ge00_data = {</div><div class='del'>-	.phy_addr	= 8,</div><div class='add'>+	.phy_addr	= MV643XX_ETH_PHY_ADDR(8),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct mv643xx_eth_platform_data db78x00_ge01_data = {</div><div class='del'>-	.phy_addr	= 9,</div><div class='add'>+	.phy_addr	= MV643XX_ETH_PHY_ADDR(9),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct mv643xx_eth_platform_data db78x00_ge10_data = {</div><div class='del'>-	.phy_addr	= -1,</div><div class='add'>+	.phy_addr	= MV643XX_ETH_PHY_NONE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct mv643xx_eth_platform_data db78x00_ge11_data = {</div><div class='del'>-	.phy_addr	= -1,</div><div class='add'>+	.phy_addr	= MV643XX_ETH_PHY_NONE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct mv_sata_platform_data db78x00_sata_data = {</div><div class='head'>diff --git a/arch/arm/mach-mv78xx0/include/mach/entry-macro.S b/arch/arm/mach-mv78xx0/include/mach/entry-macro.S<br/>index ed4a46bcd3b0..fbfb2693ce6c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-mv78xx0/include/mach/entry-macro.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-mv78xx0/include/mach/entry-macro.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-mv78xx0/include/mach/entry-macro.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-mv78xx0/include/mach/entry-macro.S</a></div><div class='hunk'>@@ -26,14 +26,22 @@</div><div class='ctx'> 	ldr	\tmp, [\base, #IRQ_MASK_LOW_OFF]</div><div class='ctx'> 	mov	\irqnr, #31</div><div class='ctx'> 	ands	\irqstat, \irqstat, \tmp</div><div class='add'>+	bne	1001f</div><div class='ctx'> </div><div class='ctx'> 	@ if no low interrupts set, check high interrupts</div><div class='del'>-	ldreq	\irqstat, [\base, #IRQ_CAUSE_HIGH_OFF]</div><div class='del'>-	ldreq	\tmp, [\base, #IRQ_MASK_HIGH_OFF]</div><div class='del'>-	moveq	\irqnr, #63</div><div class='del'>-	andeqs	\irqstat, \irqstat, \tmp</div><div class='add'>+	ldr	\irqstat, [\base, #IRQ_CAUSE_HIGH_OFF]</div><div class='add'>+	ldr	\tmp, [\base, #IRQ_MASK_HIGH_OFF]</div><div class='add'>+	mov	\irqnr, #63</div><div class='add'>+	ands	\irqstat, \irqstat, \tmp</div><div class='add'>+	bne	1001f</div><div class='add'>+</div><div class='add'>+	@ if no high interrupts set, check error interrupts</div><div class='add'>+	ldr	\irqstat, [\base, #IRQ_CAUSE_ERR_OFF]</div><div class='add'>+	ldr	\tmp, [\base, #IRQ_MASK_ERR_OFF]</div><div class='add'>+	mov	\irqnr, #95</div><div class='add'>+	ands	\irqstat, \irqstat, \tmp</div><div class='ctx'> </div><div class='ctx'> 	@ find first active interrupt source</div><div class='del'>-	clzne	\irqstat, \irqstat</div><div class='add'>+1001:	clzne	\irqstat, \irqstat</div><div class='ctx'> 	subne	\irqnr, \irqnr, \irqstat</div><div class='ctx'> 	.endm</div><div class='head'>diff --git a/arch/arm/mach-mv78xx0/include/mach/irqs.h b/arch/arm/mach-mv78xx0/include/mach/irqs.h<br/>index 995d7fb8d06f..bebc330281ec 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-mv78xx0/include/mach/irqs.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-mv78xx0/include/mach/irqs.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-mv78xx0/include/mach/irqs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-mv78xx0/include/mach/irqs.h</a></div><div class='hunk'>@@ -80,9 +80,14 @@</div><div class='ctx'> #define IRQ_MV78XX0_DB_OUT	61</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * MV78xx0 Error Interrupt Controller</div><div class='add'>+ */</div><div class='add'>+#define IRQ_MV78XX0_GE_ERR	70</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * MV78XX0 General Purpose Pins</div><div class='ctx'>  */</div><div class='del'>-#define IRQ_MV78XX0_GPIO_START	64</div><div class='add'>+#define IRQ_MV78XX0_GPIO_START	96</div><div class='ctx'> #define NR_GPIO_IRQS		GPIO_MAX</div><div class='ctx'> </div><div class='ctx'> #define NR_IRQS			(IRQ_MV78XX0_GPIO_START + NR_GPIO_IRQS)</div><div class='head'>diff --git a/arch/arm/mach-mv78xx0/include/mach/mv78xx0.h b/arch/arm/mach-mv78xx0/include/mach/mv78xx0.h<br/>index ad664178d6e1..ee9c5593ee92 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-mv78xx0/include/mach/mv78xx0.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-mv78xx0/include/mach/mv78xx0.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-mv78xx0/include/mach/mv78xx0.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-mv78xx0/include/mach/mv78xx0.h</a></div><div class='hunk'>@@ -71,8 +71,10 @@</div><div class='ctx'> #define   BRIDGE_INT_TIMER1	0x0004</div><div class='ctx'> #define   BRIDGE_INT_TIMER1_CLR	(~0x0004)</div><div class='ctx'> #define  IRQ_VIRT_BASE		(BRIDGE_VIRT_BASE | 0x0200)</div><div class='add'>+#define   IRQ_CAUSE_ERR_OFF	0x0000</div><div class='ctx'> #define   IRQ_CAUSE_LOW_OFF	0x0004</div><div class='ctx'> #define   IRQ_CAUSE_HIGH_OFF	0x0008</div><div class='add'>+#define   IRQ_MASK_ERR_OFF	0x000c</div><div class='ctx'> #define   IRQ_MASK_LOW_OFF	0x0010</div><div class='ctx'> #define   IRQ_MASK_HIGH_OFF	0x0014</div><div class='ctx'> #define  TIMER_VIRT_BASE	(BRIDGE_VIRT_BASE | 0x0300)</div><div class='head'>diff --git a/arch/arm/mach-mv78xx0/irq.c b/arch/arm/mach-mv78xx0/irq.c<br/>index 28248d37b999..503e5d195ae5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-mv78xx0/irq.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-mv78xx0/irq.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-mv78xx0/irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-mv78xx0/irq.c</a></div><div class='hunk'>@@ -19,4 +19,5 @@ void __init mv78xx0_init_irq(void)</div><div class='ctx'> {</div><div class='ctx'> 	orion_irq_init(0, (void __iomem *)(IRQ_VIRT_BASE + IRQ_MASK_LOW_OFF));</div><div class='ctx'> 	orion_irq_init(32, (void __iomem *)(IRQ_VIRT_BASE + IRQ_MASK_HIGH_OFF));</div><div class='add'>+	orion_irq_init(64, (void __iomem *)(IRQ_VIRT_BASE + IRQ_MASK_ERR_OFF));</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-mx2/devices.h b/arch/arm/mach-mx2/devices.h<br/>new file mode 100644<br/>index 000000000000..c77a4b8f73b4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-mx2/devices.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-mx2/devices.h</a></div><div class='hunk'>@@ -0,0 +1,15 @@</div><div class='add'>+</div><div class='add'>+extern struct platform_device mxc_gpt1;</div><div class='add'>+extern struct platform_device mxc_gpt2;</div><div class='add'>+extern struct platform_device mxc_gpt3;</div><div class='add'>+extern struct platform_device mxc_gpt4;</div><div class='add'>+extern struct platform_device mxc_gpt5;</div><div class='add'>+extern struct platform_device mxc_wdt;</div><div class='add'>+extern struct platform_device mxc_irda_device;</div><div class='add'>+extern struct platform_device mxc_uart_device0;</div><div class='add'>+extern struct platform_device mxc_uart_device1;</div><div class='add'>+extern struct platform_device mxc_uart_device2;</div><div class='add'>+extern struct platform_device mxc_uart_device3;</div><div class='add'>+extern struct platform_device mxc_uart_device4;</div><div class='add'>+extern struct platform_device mxc_uart_device5;</div><div class='add'>+</div><div class='head'>diff --git a/arch/arm/mach-mx2/mx27ads.c b/arch/arm/mach-mx2/mx27ads.c<br/>index 4ce56ef4d8d3..56e22d3ca075 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-mx2/mx27ads.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-mx2/mx27ads.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-mx2/mx27ads.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-mx2/mx27ads.c</a></div><div class='hunk'>@@ -34,6 +34,8 @@</div><div class='ctx'> #include &lt;mach/iomux-mx1-mx2.h&gt;</div><div class='ctx'> #include &lt;mach/board-mx27ads.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "devices.h"</div><div class='add'>+</div><div class='ctx'> /* ADS's NOR flash */</div><div class='ctx'> static struct physmap_flash_data mx27ads_flash_data = {</div><div class='ctx'> 	.width = 2,</div><div class='hunk'>@@ -251,12 +253,14 @@ static struct imxuart_platform_data uart_pdata[] = {</div><div class='ctx'> </div><div class='ctx'> static void __init mx27ads_board_init(void)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='ctx'> 	gpio_fec_active();</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; 6; i++)</div><div class='del'>-		imx_init_uart(i, &amp;uart_pdata[i]);</div><div class='add'>+	mxc_register_device(&amp;mxc_uart_device0, &amp;uart_pdata[0]);</div><div class='add'>+	mxc_register_device(&amp;mxc_uart_device1, &amp;uart_pdata[1]);</div><div class='add'>+	mxc_register_device(&amp;mxc_uart_device2, &amp;uart_pdata[2]);</div><div class='add'>+	mxc_register_device(&amp;mxc_uart_device3, &amp;uart_pdata[3]);</div><div class='add'>+	mxc_register_device(&amp;mxc_uart_device4, &amp;uart_pdata[4]);</div><div class='add'>+	mxc_register_device(&amp;mxc_uart_device5, &amp;uart_pdata[5]);</div><div class='ctx'> </div><div class='ctx'> 	platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices));</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-mx2/pcm038.c b/arch/arm/mach-mx2/pcm038.c<br/>index 1028f453cfc8..7f55746e2591 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-mx2/pcm038.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-mx2/pcm038.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-mx2/pcm038.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-mx2/pcm038.c</a></div><div class='hunk'>@@ -28,6 +28,8 @@</div><div class='ctx'> #include &lt;mach/imx-uart.h&gt;</div><div class='ctx'> #include &lt;mach/board-pcm038.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "devices.h"</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Phytec's phyCORE-i.MX27 comes with 32MiB flash,</div><div class='ctx'>  * 16 bit width</div><div class='hunk'>@@ -170,11 +172,11 @@ static struct platform_device *platform_devices[] __initdata = {</div><div class='ctx'> </div><div class='ctx'> static void __init pcm038_init(void)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='ctx'> 	gpio_fec_active();</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; 3; i++)</div><div class='del'>-		imx_init_uart(i, &amp;uart_pdata[i]);</div><div class='add'>+	mxc_register_device(&amp;mxc_uart_device0, &amp;uart_pdata[0]);</div><div class='add'>+	mxc_register_device(&amp;mxc_uart_device1, &amp;uart_pdata[1]);</div><div class='add'>+	mxc_register_device(&amp;mxc_uart_device2, &amp;uart_pdata[2]);</div><div class='ctx'> </div><div class='ctx'> 	platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices));</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-mx2/serial.c b/arch/arm/mach-mx2/serial.c<br/>index e31fd44f7941..16debc296dad 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-mx2/serial.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-mx2/serial.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-mx2/serial.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-mx2/serial.c</a></div><div class='hunk'>@@ -35,7 +35,7 @@ static struct resource uart0[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct platform_device mxc_uart_device0 = {</div><div class='add'>+struct platform_device mxc_uart_device0 = {</div><div class='ctx'> 	.name = "imx-uart",</div><div class='ctx'> 	.id = 0,</div><div class='ctx'> 	.resource = uart0,</div><div class='hunk'>@@ -54,7 +54,7 @@ static struct resource uart1[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct platform_device mxc_uart_device1 = {</div><div class='add'>+struct platform_device mxc_uart_device1 = {</div><div class='ctx'> 	.name = "imx-uart",</div><div class='ctx'> 	.id = 1,</div><div class='ctx'> 	.resource = uart1,</div><div class='hunk'>@@ -73,7 +73,7 @@ static struct resource uart2[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct platform_device mxc_uart_device2 = {</div><div class='add'>+struct platform_device mxc_uart_device2 = {</div><div class='ctx'> 	.name = "imx-uart",</div><div class='ctx'> 	.id = 2,</div><div class='ctx'> 	.resource = uart2,</div><div class='hunk'>@@ -92,7 +92,7 @@ static struct resource uart3[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct platform_device mxc_uart_device3 = {</div><div class='add'>+struct platform_device mxc_uart_device3 = {</div><div class='ctx'> 	.name = "imx-uart",</div><div class='ctx'> 	.id = 3,</div><div class='ctx'> 	.resource = uart3,</div><div class='hunk'>@@ -111,7 +111,7 @@ static struct resource uart4[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct platform_device mxc_uart_device4 = {</div><div class='add'>+struct platform_device mxc_uart_device4 = {</div><div class='ctx'> 	.name = "imx-uart",</div><div class='ctx'> 	.id = 4,</div><div class='ctx'> 	.resource = uart4,</div><div class='hunk'>@@ -130,48 +130,9 @@ static struct resource uart5[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct platform_device mxc_uart_device5 = {</div><div class='add'>+struct platform_device mxc_uart_device5 = {</div><div class='ctx'> 	.name = "imx-uart",</div><div class='ctx'> 	.id = 5,</div><div class='ctx'> 	.resource = uart5,</div><div class='ctx'> 	.num_resources = ARRAY_SIZE(uart5),</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Register only those UARTs that physically exists</div><div class='del'>- */</div><div class='del'>-int __init imx_init_uart(int uart_no, struct imxuart_platform_data *pdata)</div><div class='del'>-{</div><div class='del'>-	switch (uart_no) {</div><div class='del'>-	case 0:</div><div class='del'>-		mxc_uart_device0.dev.platform_data = pdata;</div><div class='del'>-		platform_device_register(&amp;mxc_uart_device0);</div><div class='del'>-		break;</div><div class='del'>-	case 1:</div><div class='del'>-		mxc_uart_device1.dev.platform_data = pdata;</div><div class='del'>-		platform_device_register(&amp;mxc_uart_device1);</div><div class='del'>-		break;</div><div class='del'>-#ifndef CONFIG_MXC_IRDA</div><div class='del'>-	case 2:</div><div class='del'>-		mxc_uart_device2.dev.platform_data = pdata;</div><div class='del'>-		platform_device_register(&amp;mxc_uart_device2);</div><div class='del'>-		break;</div><div class='del'>-#endif</div><div class='del'>-	case 3:</div><div class='del'>-		mxc_uart_device3.dev.platform_data = pdata;</div><div class='del'>-		platform_device_register(&amp;mxc_uart_device3);</div><div class='del'>-		break;</div><div class='del'>-	case 4:</div><div class='del'>-		mxc_uart_device4.dev.platform_data = pdata;</div><div class='del'>-		platform_device_register(&amp;mxc_uart_device4);</div><div class='del'>-		break;</div><div class='del'>-	case 5:</div><div class='del'>-		mxc_uart_device5.dev.platform_data = pdata;</div><div class='del'>-		platform_device_register(&amp;mxc_uart_device5);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/arch/arm/mach-mx3/devices.c b/arch/arm/mach-mx3/devices.c<br/>index e08c6a8ac56b..a6bdcc07f3c9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-mx3/devices.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-mx3/devices.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-mx3/devices.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-mx3/devices.c</a></div><div class='hunk'>@@ -36,7 +36,7 @@ static struct resource uart0[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct platform_device mxc_uart_device0 = {</div><div class='add'>+struct platform_device mxc_uart_device0 = {</div><div class='ctx'> 	.name = "imx-uart",</div><div class='ctx'> 	.id = 0,</div><div class='ctx'> 	.resource = uart0,</div><div class='hunk'>@@ -55,7 +55,7 @@ static struct resource uart1[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct platform_device mxc_uart_device1 = {</div><div class='add'>+struct platform_device mxc_uart_device1 = {</div><div class='ctx'> 	.name = "imx-uart",</div><div class='ctx'> 	.id = 1,</div><div class='ctx'> 	.resource = uart1,</div><div class='hunk'>@@ -74,7 +74,7 @@ static struct resource uart2[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct platform_device mxc_uart_device2 = {</div><div class='add'>+struct platform_device mxc_uart_device2 = {</div><div class='ctx'> 	.name = "imx-uart",</div><div class='ctx'> 	.id = 2,</div><div class='ctx'> 	.resource = uart2,</div><div class='hunk'>@@ -93,7 +93,7 @@ static struct resource uart3[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct platform_device mxc_uart_device3 = {</div><div class='add'>+struct platform_device mxc_uart_device3 = {</div><div class='ctx'> 	.name = "imx-uart",</div><div class='ctx'> 	.id = 3,</div><div class='ctx'> 	.resource = uart3,</div><div class='hunk'>@@ -112,46 +112,13 @@ static struct resource uart4[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct platform_device mxc_uart_device4 = {</div><div class='add'>+struct platform_device mxc_uart_device4 = {</div><div class='ctx'> 	.name = "imx-uart",</div><div class='ctx'> 	.id = 4,</div><div class='ctx'> 	.resource = uart4,</div><div class='ctx'> 	.num_resources = ARRAY_SIZE(uart4),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Register only those UARTs that physically exist</div><div class='del'>- */</div><div class='del'>-int __init imx_init_uart(int uart_no, struct imxuart_platform_data *pdata)</div><div class='del'>-{</div><div class='del'>-	switch (uart_no) {</div><div class='del'>-	case 0:</div><div class='del'>-		mxc_uart_device0.dev.platform_data = pdata;</div><div class='del'>-		platform_device_register(&amp;mxc_uart_device0);</div><div class='del'>-		break;</div><div class='del'>-	case 1:</div><div class='del'>-		mxc_uart_device1.dev.platform_data = pdata;</div><div class='del'>-		platform_device_register(&amp;mxc_uart_device1);</div><div class='del'>-		break;</div><div class='del'>-	case 2:</div><div class='del'>-		mxc_uart_device2.dev.platform_data = pdata;</div><div class='del'>-		platform_device_register(&amp;mxc_uart_device2);</div><div class='del'>-		break;</div><div class='del'>-	case 3:</div><div class='del'>-		mxc_uart_device3.dev.platform_data = pdata;</div><div class='del'>-		platform_device_register(&amp;mxc_uart_device3);</div><div class='del'>-		break;</div><div class='del'>-	case 4:</div><div class='del'>-		mxc_uart_device4.dev.platform_data = pdata;</div><div class='del'>-		platform_device_register(&amp;mxc_uart_device4);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* GPIO port description */</div><div class='ctx'> static struct mxc_gpio_port imx_gpio_ports[] = {</div><div class='ctx'> 	[0] = {</div><div class='head'>diff --git a/arch/arm/mach-mx3/devices.h b/arch/arm/mach-mx3/devices.h<br/>new file mode 100644<br/>index 000000000000..4dc03f9e6001<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-mx3/devices.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-mx3/devices.h</a></div><div class='hunk'>@@ -0,0 +1,6 @@</div><div class='add'>+</div><div class='add'>+extern struct platform_device mxc_uart_device0;</div><div class='add'>+extern struct platform_device mxc_uart_device1;</div><div class='add'>+extern struct platform_device mxc_uart_device2;</div><div class='add'>+extern struct platform_device mxc_uart_device3;</div><div class='add'>+extern struct platform_device mxc_uart_device4;</div><div class='head'>diff --git a/arch/arm/mach-mx3/iomux.c b/arch/arm/mach-mx3/iomux.c<br/>index 3dda1fe23cbf..6e664be8cc13 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-mx3/iomux.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-mx3/iomux.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-mx3/iomux.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-mx3/iomux.c</a></div><div class='hunk'>@@ -43,7 +43,8 @@ static DEFINE_SPINLOCK(gpio_mux_lock);</div><div class='ctx'>  */</div><div class='ctx'> int mxc_iomux_mode(unsigned int pin_mode)</div><div class='ctx'> {</div><div class='del'>-	u32 reg, field, l, mode, ret = 0;</div><div class='add'>+	u32 field, l, mode, ret = 0;</div><div class='add'>+	void __iomem *reg;</div><div class='ctx'> </div><div class='ctx'> 	reg = IOMUXSW_MUX_CTL + (pin_mode &amp; IOMUX_REG_MASK);</div><div class='ctx'> 	field = pin_mode &amp; 0x3;</div><div class='hunk'>@@ -70,7 +71,8 @@ EXPORT_SYMBOL(mxc_iomux_mode);</div><div class='ctx'>  */</div><div class='ctx'> void mxc_iomux_set_pad(enum iomux_pins pin, u32 config)</div><div class='ctx'> {</div><div class='del'>-	u32 reg, field, l;</div><div class='add'>+	u32 field, l;</div><div class='add'>+	void __iomem *reg;</div><div class='ctx'> </div><div class='ctx'> 	reg = IOMUXSW_PAD_CTL + (pin + 2) / 3;</div><div class='ctx'> 	field = (pin + 2) % 3;</div><div class='head'>diff --git a/arch/arm/mach-mx3/mm.c b/arch/arm/mach-mx3/mm.c<br/>index 30d842bd4d64..0589b5cd33c7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-mx3/mm.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-mx3/mm.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-mx3/mm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-mx3/mm.c</a></div><div class='hunk'>@@ -49,7 +49,7 @@ static struct map_desc mxc_io_desc[] __initdata = {</div><div class='ctx'> 		.virtual	= AVIC_BASE_ADDR_VIRT,</div><div class='ctx'> 		.pfn		= __phys_to_pfn(AVIC_BASE_ADDR),</div><div class='ctx'> 		.length		= AVIC_SIZE,</div><div class='del'>-		.type		= MT_NONSHARED_DEVICE</div><div class='add'>+		.type		= MT_DEVICE_NONSHARED</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-mx3/mx31ads.c b/arch/arm/mach-mx3/mx31ads.c<br/>index 60fb4e0d5acd..1be4a390c63f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-mx3/mx31ads.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-mx3/mx31ads.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-mx3/mx31ads.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-mx3/mx31ads.c</a></div><div class='hunk'>@@ -22,6 +22,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/serial_8250.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='hunk'>@@ -31,6 +32,8 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;mach/common.h&gt;</div><div class='ctx'> #include &lt;mach/board-mx31ads.h&gt;</div><div class='add'>+#include &lt;mach/imx-uart.h&gt;</div><div class='add'>+#include &lt;mach/iomux-mx3.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='ctx'>  * @file mx31ads.c</div><div class='hunk'>@@ -84,6 +87,108 @@ static inline int mxc_init_extuart(void)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_SERIAL_IMX) || defined(CONFIG_SERIAL_IMX_MODULE)</div><div class='add'>+static struct imxuart_platform_data uart_pdata = {</div><div class='add'>+	.flags = IMXUART_HAVE_RTSCTS,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline void mxc_init_imx_uart(void)</div><div class='add'>+{</div><div class='add'>+	mxc_iomux_mode(MX31_PIN_CTS1__CTS1);</div><div class='add'>+	mxc_iomux_mode(MX31_PIN_RTS1__RTS1);</div><div class='add'>+	mxc_iomux_mode(MX31_PIN_TXD1__TXD1);</div><div class='add'>+	mxc_iomux_mode(MX31_PIN_RXD1__RXD1);</div><div class='add'>+</div><div class='add'>+	mxc_register_device(&amp;mxc_uart_device0, &amp;uart_pdata);</div><div class='add'>+}</div><div class='add'>+#else /* !SERIAL_IMX */</div><div class='add'>+static inline void mxc_init_imx_uart(void)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif /* !SERIAL_IMX */</div><div class='add'>+</div><div class='add'>+static void mx31ads_expio_irq_handler(u32 irq, struct irq_desc *desc)</div><div class='add'>+{</div><div class='add'>+	u32 imr_val;</div><div class='add'>+	u32 int_valid;</div><div class='add'>+	u32 expio_irq;</div><div class='add'>+</div><div class='add'>+	imr_val = __raw_readw(PBC_INTMASK_SET_REG);</div><div class='add'>+	int_valid = __raw_readw(PBC_INTSTATUS_REG) &amp; imr_val;</div><div class='add'>+</div><div class='add'>+	expio_irq = MXC_EXP_IO_BASE;</div><div class='add'>+	for (; int_valid != 0; int_valid &gt;&gt;= 1, expio_irq++) {</div><div class='add'>+		if ((int_valid &amp; 1) == 0)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		generic_handle_irq(expio_irq);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Disable an expio pin's interrupt by setting the bit in the imr.</div><div class='add'>+ * @param irq           an expio virtual irq number</div><div class='add'>+ */</div><div class='add'>+static void expio_mask_irq(u32 irq)</div><div class='add'>+{</div><div class='add'>+	u32 expio = MXC_IRQ_TO_EXPIO(irq);</div><div class='add'>+	/* mask the interrupt */</div><div class='add'>+	__raw_writew(1 &lt;&lt; expio, PBC_INTMASK_CLEAR_REG);</div><div class='add'>+	__raw_readw(PBC_INTMASK_CLEAR_REG);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Acknowledge an expanded io pin's interrupt by clearing the bit in the isr.</div><div class='add'>+ * @param irq           an expanded io virtual irq number</div><div class='add'>+ */</div><div class='add'>+static void expio_ack_irq(u32 irq)</div><div class='add'>+{</div><div class='add'>+	u32 expio = MXC_IRQ_TO_EXPIO(irq);</div><div class='add'>+	/* clear the interrupt status */</div><div class='add'>+	__raw_writew(1 &lt;&lt; expio, PBC_INTSTATUS_REG);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Enable a expio pin's interrupt by clearing the bit in the imr.</div><div class='add'>+ * @param irq           a expio virtual irq number</div><div class='add'>+ */</div><div class='add'>+static void expio_unmask_irq(u32 irq)</div><div class='add'>+{</div><div class='add'>+	u32 expio = MXC_IRQ_TO_EXPIO(irq);</div><div class='add'>+	/* unmask the interrupt */</div><div class='add'>+	__raw_writew(1 &lt;&lt; expio, PBC_INTMASK_SET_REG);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct irq_chip expio_irq_chip = {</div><div class='add'>+	.ack = expio_ack_irq,</div><div class='add'>+	.mask = expio_mask_irq,</div><div class='add'>+	.unmask = expio_unmask_irq,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init mx31ads_init_expio(void)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "MX31ADS EXPIO(CPLD) hardware\n");</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Configure INT line as GPIO input</div><div class='add'>+	 */</div><div class='add'>+	mxc_iomux_mode(IOMUX_MODE(MX31_PIN_GPIO1_4, IOMUX_CONFIG_GPIO));</div><div class='add'>+</div><div class='add'>+	/* disable the interrupt and clear the status */</div><div class='add'>+	__raw_writew(0xFFFF, PBC_INTMASK_CLEAR_REG);</div><div class='add'>+	__raw_writew(0xFFFF, PBC_INTSTATUS_REG);</div><div class='add'>+	for (i = MXC_EXP_IO_BASE; i &lt; (MXC_EXP_IO_BASE + MXC_MAX_EXP_IO_LINES);</div><div class='add'>+	     i++) {</div><div class='add'>+		set_irq_chip(i, &amp;expio_irq_chip);</div><div class='add'>+		set_irq_handler(i, handle_level_irq);</div><div class='add'>+		set_irq_flags(i, IRQF_VALID);</div><div class='add'>+	}</div><div class='add'>+	set_irq_type(EXPIO_PARENT_INT, IRQ_TYPE_LEVEL_HIGH);</div><div class='add'>+	set_irq_chained_handler(EXPIO_PARENT_INT, mx31ads_expio_irq_handler);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*!</div><div class='ctx'>  * This structure defines static mappings for the i.MX31ADS board.</div><div class='ctx'>  */</div><div class='hunk'>@@ -92,17 +197,17 @@ static struct map_desc mx31ads_io_desc[] __initdata = {</div><div class='ctx'> 		.virtual	= AIPS1_BASE_ADDR_VIRT,</div><div class='ctx'> 		.pfn		= __phys_to_pfn(AIPS1_BASE_ADDR),</div><div class='ctx'> 		.length		= AIPS1_SIZE,</div><div class='del'>-		.type		= MT_NONSHARED_DEVICE</div><div class='add'>+		.type		= MT_DEVICE_NONSHARED</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.virtual	= SPBA0_BASE_ADDR_VIRT,</div><div class='ctx'> 		.pfn		= __phys_to_pfn(SPBA0_BASE_ADDR),</div><div class='ctx'> 		.length		= SPBA0_SIZE,</div><div class='del'>-		.type		= MT_NONSHARED_DEVICE</div><div class='add'>+		.type		= MT_DEVICE_NONSHARED</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.virtual	= AIPS2_BASE_ADDR_VIRT,</div><div class='ctx'> 		.pfn		= __phys_to_pfn(AIPS2_BASE_ADDR),</div><div class='ctx'> 		.length		= AIPS2_SIZE,</div><div class='del'>-		.type		= MT_NONSHARED_DEVICE</div><div class='add'>+		.type		= MT_DEVICE_NONSHARED</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.virtual	= CS4_BASE_ADDR_VIRT,</div><div class='ctx'> 		.pfn		= __phys_to_pfn(CS4_BASE_ADDR),</div><div class='hunk'>@@ -120,12 +225,19 @@ void __init mx31ads_map_io(void)</div><div class='ctx'> 	iotable_init(mx31ads_io_desc, ARRAY_SIZE(mx31ads_io_desc));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void __init mx31ads_init_irq(void)</div><div class='add'>+{</div><div class='add'>+	mxc_init_irq();</div><div class='add'>+	mx31ads_init_expio();</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*!</div><div class='ctx'>  * Board specific initialization.</div><div class='ctx'>  */</div><div class='ctx'> static void __init mxc_board_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	mxc_init_extuart();</div><div class='add'>+	mxc_init_imx_uart();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __init mx31ads_timer_init(void)</div><div class='hunk'>@@ -148,7 +260,7 @@ MACHINE_START(MX31ADS, "Freescale MX31ADS")</div><div class='ctx'> 	.io_pg_offst	= ((AIPS1_BASE_ADDR_VIRT) &gt;&gt; 18) &amp; 0xfffc,</div><div class='ctx'> 	.boot_params    = PHYS_OFFSET + 0x100,</div><div class='ctx'> 	.map_io         = mx31ads_map_io,</div><div class='del'>-	.init_irq       = mxc_init_irq,</div><div class='add'>+	.init_irq       = mx31ads_init_irq,</div><div class='ctx'> 	.init_machine   = mxc_board_init,</div><div class='ctx'> 	.timer          = &amp;mx31ads_timer,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-mx3/mx31lite.c b/arch/arm/mach-mx3/mx31lite.c<br/>index d363a6e79f80..c43440070143 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-mx3/mx31lite.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-mx3/mx31lite.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-mx3/mx31lite.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-mx3/mx31lite.c</a></div><div class='hunk'>@@ -45,17 +45,17 @@ static struct map_desc mx31lite_io_desc[] __initdata = {</div><div class='ctx'> 		.virtual = AIPS1_BASE_ADDR_VIRT,</div><div class='ctx'> 		.pfn = __phys_to_pfn(AIPS1_BASE_ADDR),</div><div class='ctx'> 		.length = AIPS1_SIZE,</div><div class='del'>-		.type = MT_NONSHARED_DEVICE</div><div class='add'>+		.type = MT_DEVICE_NONSHARED</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.virtual = SPBA0_BASE_ADDR_VIRT,</div><div class='ctx'> 		.pfn = __phys_to_pfn(SPBA0_BASE_ADDR),</div><div class='ctx'> 		.length = SPBA0_SIZE,</div><div class='del'>-		.type = MT_NONSHARED_DEVICE</div><div class='add'>+		.type = MT_DEVICE_NONSHARED</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.virtual = AIPS2_BASE_ADDR_VIRT,</div><div class='ctx'> 		.pfn = __phys_to_pfn(AIPS2_BASE_ADDR),</div><div class='ctx'> 		.length = AIPS2_SIZE,</div><div class='del'>-		.type = MT_NONSHARED_DEVICE</div><div class='add'>+		.type = MT_DEVICE_NONSHARED</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.virtual = CS4_BASE_ADDR_VIRT,</div><div class='ctx'> 		.pfn = __phys_to_pfn(CS4_BASE_ADDR),</div><div class='head'>diff --git a/arch/arm/mach-mx3/pcm037.c b/arch/arm/mach-mx3/pcm037.c<br/>index df8582a6231b..11fda95c86a5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-mx3/pcm037.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-mx3/pcm037.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-mx3/pcm037.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-mx3/pcm037.c</a></div><div class='hunk'>@@ -33,6 +33,8 @@</div><div class='ctx'> #include &lt;mach/iomux-mx3.h&gt;</div><div class='ctx'> #include &lt;mach/board-pcm037.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "devices.h"</div><div class='add'>+</div><div class='ctx'> static struct physmap_flash_data pcm037_flash_data = {</div><div class='ctx'> 	.width  = 2,</div><div class='ctx'> };</div><div class='hunk'>@@ -73,12 +75,12 @@ static void __init mxc_board_init(void)</div><div class='ctx'> 	mxc_iomux_mode(MX31_PIN_TXD1__TXD1);</div><div class='ctx'> 	mxc_iomux_mode(MX31_PIN_RXD1__RXD1);</div><div class='ctx'> </div><div class='del'>-	imx_init_uart(0, &amp;uart_pdata);</div><div class='add'>+	mxc_register_device(&amp;mxc_uart_device0, &amp;uart_pdata);</div><div class='ctx'> </div><div class='ctx'> 	mxc_iomux_mode(MX31_PIN_CSPI3_MOSI__RXD3);</div><div class='ctx'> 	mxc_iomux_mode(MX31_PIN_CSPI3_MISO__TXD3);</div><div class='ctx'> </div><div class='del'>-	imx_init_uart(2, &amp;uart_pdata);</div><div class='add'>+	mxc_register_device(&amp;mxc_uart_device2, &amp;uart_pdata);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/arm/mach-netx/generic.c b/arch/arm/mach-netx/generic.c<br/>index 1b40483ea753..79df60c20e70 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-netx/generic.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-netx/generic.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-netx/generic.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-netx/generic.c</a></div><div class='hunk'>@@ -22,10 +22,10 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/vic.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;mach/netx-regs.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -77,15 +77,12 @@ netx_hif_demux_handler(unsigned int irq_unused, struct irq_desc *desc)</div><div class='ctx'> 	stat = ((readl(NETX_DPMAS_INT_EN) &amp;</div><div class='ctx'> 		readl(NETX_DPMAS_INT_STAT)) &gt;&gt; 24) &amp; 0x1f;</div><div class='ctx'> </div><div class='del'>-	desc = irq_desc + NETX_IRQ_HIF_CHAINED(0);</div><div class='del'>-</div><div class='ctx'> 	while (stat) {</div><div class='ctx'> 		if (stat &amp; 1) {</div><div class='ctx'> 			DEBUG_IRQ("handling irq %d\n", irq);</div><div class='del'>-			desc_handle_irq(irq, desc);</div><div class='add'>+			generic_handle_irq(irq);</div><div class='ctx'> 		}</div><div class='ctx'> 		irq++;</div><div class='del'>-		desc++;</div><div class='ctx'> 		stat &gt;&gt;= 1;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-netx/include/mach/system.h b/arch/arm/mach-netx/include/mach/system.h<br/>index 27d8ef8e8e29..6c1023b8a9ab 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-netx/include/mach/system.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-netx/include/mach/system.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-netx/include/mach/system.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-netx/include/mach/system.h</a></div><div class='hunk'>@@ -19,7 +19,7 @@</div><div class='ctx'> #ifndef __ASM_ARCH_SYSTEM_H</div><div class='ctx'> #define __ASM_ARCH_SYSTEM_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include "netx-regs.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-netx/pfifo.c b/arch/arm/mach-netx/pfifo.c<br/>index 19ae0a72bea3..03984943e16d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-netx/pfifo.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-netx/pfifo.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-netx/pfifo.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-netx/pfifo.c</a></div><div class='hunk'>@@ -20,8 +20,8 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;mach/netx-regs.h&gt;</div><div class='ctx'> #include &lt;mach/pfifo.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-netx/time.c b/arch/arm/mach-netx/time.c<br/>index ac8e5bfed691..7c540c1f01fa 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-netx/time.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-netx/time.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-netx/time.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-netx/time.c</a></div><div class='hunk'>@@ -21,9 +21,9 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/clocksource.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='ctx'> #include &lt;mach/netx-regs.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-netx/xc.c b/arch/arm/mach-netx/xc.c<br/>index 04c34e82fe6d..32eabf5dfa4f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-netx/xc.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-netx/xc.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-netx/xc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-netx/xc.c</a></div><div class='hunk'>@@ -21,8 +21,8 @@</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/firmware.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;mach/netx-regs.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-ns9xxx/board-a9m9750dev.c b/arch/arm/mach-ns9xxx/board-a9m9750dev.c<br/>index a22a608a7aba..b45bb3b802f1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ns9xxx/board-a9m9750dev.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-ns9xxx/board-a9m9750dev.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ns9xxx/board-a9m9750dev.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ns9xxx/board-a9m9750dev.c</a></div><div class='hunk'>@@ -86,13 +86,10 @@ static void a9m9750dev_fpga_demux_handler(unsigned int irq,</div><div class='ctx'> </div><div class='ctx'> 	while (stat != 0) {</div><div class='ctx'> 		int irqno = fls(stat) - 1;</div><div class='del'>-		struct irq_desc *fpgadesc;</div><div class='ctx'> </div><div class='ctx'> 		stat &amp;= ~(1 &lt;&lt; irqno);</div><div class='ctx'> </div><div class='del'>-		fpgadesc = irq_desc + FPGA_IRQ(irqno);</div><div class='del'>-</div><div class='del'>-		desc_handle_irq(FPGA_IRQ(irqno), fpgadesc);</div><div class='add'>+		generic_handle_irq(FPGA_IRQ(irqno));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	desc-&gt;chip-&gt;unmask(irq);</div><div class='head'>diff --git a/arch/arm/mach-ns9xxx/gpio.c b/arch/arm/mach-ns9xxx/gpio.c<br/>index 804c30075960..5241e6a286cc 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ns9xxx/gpio.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-ns9xxx/gpio.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ns9xxx/gpio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ns9xxx/gpio.c</a></div><div class='hunk'>@@ -12,13 +12,13 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/bitops.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/gpio.h&gt;</div><div class='ctx'> #include &lt;mach/processor.h&gt;</div><div class='ctx'> #include &lt;mach/processor-ns9360.h&gt;</div><div class='ctx'> #include &lt;asm/bug.h&gt;</div><div class='ctx'> #include &lt;asm/types.h&gt;</div><div class='del'>-#include &lt;asm/bitops.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "gpio-ns9360.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-ns9xxx/include/mach/uncompress.h b/arch/arm/mach-ns9xxx/include/mach/uncompress.h<br/>index 5dbc3c5167c8..1b12d324b087 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ns9xxx/include/mach/uncompress.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-ns9xxx/include/mach/uncompress.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ns9xxx/include/mach/uncompress.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ns9xxx/include/mach/uncompress.h</a></div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> #ifndef __ASM_ARCH_UNCOMPRESS_H</div><div class='ctx'> #define __ASM_ARCH_UNCOMPRESS_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define __REG(x)	((void __iomem __force *)(x))</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-ns9xxx/irq.c b/arch/arm/mach-ns9xxx/irq.c<br/>index 38260d5f849b..22e0eb6e9ec4 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ns9xxx/irq.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-ns9xxx/irq.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-ns9xxx/irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-ns9xxx/irq.c</a></div><div class='hunk'>@@ -10,7 +10,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/kernel_stat.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> #include &lt;mach/regs-sys-common.h&gt;</div><div class='ctx'> #include &lt;mach/irqs.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-omap1/board-h3.c b/arch/arm/mach-omap1/board-h3.c<br/>index 2ced6d9984d2..adfcd7b51393 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap1/board-h3.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-omap1/board-h3.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap1/board-h3.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap1/board-h3.c</a></div><div class='hunk'>@@ -476,6 +476,10 @@ static struct i2c_board_info __initdata h3_i2c_board_info[] = {</div><div class='ctx'> 		I2C_BOARD_INFO("tps65013", 0x48),</div><div class='ctx'>                /* .irq         = OMAP_GPIO_IRQ(??), */</div><div class='ctx'>        },</div><div class='add'>+	{</div><div class='add'>+		I2C_BOARD_INFO("isp1301_omap", 0x2d),</div><div class='add'>+		.irq		= OMAP_GPIO_IRQ(14),</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct omap_gpio_switch h3_gpio_switches[] __initdata = {</div><div class='head'>diff --git a/arch/arm/mach-omap1/board-voiceblue.c b/arch/arm/mach-omap1/board-voiceblue.c<br/>index 213b48787102..45a01311669a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap1/board-voiceblue.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-omap1/board-voiceblue.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap1/board-voiceblue.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap1/board-voiceblue.c</a></div><div class='hunk'>@@ -21,6 +21,7 @@</div><div class='ctx'> #include &lt;linux/reboot.h&gt;</div><div class='ctx'> #include &lt;linux/serial_8250.h&gt;</div><div class='ctx'> #include &lt;linux/serial_reg.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-omap1/clock.c b/arch/arm/mach-omap1/clock.c<br/>index 5965cf09f8c4..5fba20731710 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap1/clock.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-omap1/clock.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap1/clock.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap1/clock.c</a></div><div class='hunk'>@@ -17,8 +17,8 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/cpu.h&gt;</div><div class='hunk'>@@ -201,7 +201,7 @@ static int calc_dsor_exp(struct clk *clk, unsigned long rate)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	parent = clk-&gt;parent;</div><div class='del'>-	if (unlikely(parent == 0))</div><div class='add'>+	if (unlikely(parent == NULL))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='ctx'> 	realrate = parent-&gt;rate;</div><div class='hunk'>@@ -499,7 +499,7 @@ static int omap1_clk_enable_generic(struct clk *clk)</div><div class='ctx'> 	if (clk-&gt;flags &amp; ALWAYS_ENABLED)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(clk-&gt;enable_reg == 0)) {</div><div class='add'>+	if (unlikely(clk-&gt;enable_reg == NULL)) {</div><div class='ctx'> 		printk(KERN_ERR "clock.c: Enable for %s without enable code\n",</div><div class='ctx'> 		       clk-&gt;name);</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -535,7 +535,7 @@ static void omap1_clk_disable_generic(struct clk *clk)</div><div class='ctx'> 	__u16 regval16;</div><div class='ctx'> 	__u32 regval32;</div><div class='ctx'> </div><div class='del'>-	if (clk-&gt;enable_reg == 0)</div><div class='add'>+	if (clk-&gt;enable_reg == NULL)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (clk-&gt;flags &amp; ENABLE_REG_32BIT) {</div><div class='hunk'>@@ -577,7 +577,7 @@ static long omap1_clk_round_rate(struct clk *clk, unsigned long rate)</div><div class='ctx'> 		return clk-&gt;parent-&gt;rate / (1 &lt;&lt; dsor_exp);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if(clk-&gt;round_rate != 0)</div><div class='add'>+	if (clk-&gt;round_rate != NULL)</div><div class='ctx'> 		return clk-&gt;round_rate(clk, rate);</div><div class='ctx'> </div><div class='ctx'> 	return clk-&gt;rate;</div><div class='hunk'>@@ -625,7 +625,7 @@ static void __init omap1_clk_disable_unused(struct clk *clk)</div><div class='ctx'> </div><div class='ctx'> 	/* Clocks in the DSP domain need api_ck. Just assume bootloader</div><div class='ctx'> 	 * has not enabled any DSP clocks */</div><div class='del'>-	if ((u32)clk-&gt;enable_reg == DSP_IDLECT2) {</div><div class='add'>+	if (clk-&gt;enable_reg == DSP_IDLECT2) {</div><div class='ctx'> 		printk(KERN_INFO "Skipping reset check for DSP domain "</div><div class='ctx'> 		       "clock \"%s\"\n", clk-&gt;name);</div><div class='ctx'> 		return;</div><div class='head'>diff --git a/arch/arm/mach-omap1/clock.h b/arch/arm/mach-omap1/clock.h<br/>index 6eadf72828d8..5635b511ab6f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap1/clock.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-omap1/clock.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap1/clock.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap1/clock.h</a></div><div class='hunk'>@@ -324,7 +324,7 @@ static struct clk dspper_ck = {</div><div class='ctx'> 	.parent		= &amp;ck_dpll1,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP310 | CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX |</div><div class='ctx'> 			  RATE_CKCTL | VIRTUAL_IO_ADDRESS,</div><div class='del'>-	.enable_reg	= (void __iomem *)DSP_IDLECT2,</div><div class='add'>+	.enable_reg	= DSP_IDLECT2,</div><div class='ctx'> 	.enable_bit	= EN_PERCK,</div><div class='ctx'> 	.rate_offset	= CKCTL_PERDIV_OFFSET,</div><div class='ctx'> 	.recalc		= &amp;omap1_ckctl_recalc_dsp_domain,</div><div class='hunk'>@@ -338,7 +338,7 @@ static struct clk dspxor_ck = {</div><div class='ctx'> 	.parent		= &amp;ck_ref,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP310 | CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX |</div><div class='ctx'> 			  VIRTUAL_IO_ADDRESS,</div><div class='del'>-	.enable_reg	= (void __iomem *)DSP_IDLECT2,</div><div class='add'>+	.enable_reg	= DSP_IDLECT2,</div><div class='ctx'> 	.enable_bit	= EN_XORPCK,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> 	.enable		= &amp;omap1_clk_enable_dsp_domain,</div><div class='hunk'>@@ -350,7 +350,7 @@ static struct clk dsptim_ck = {</div><div class='ctx'> 	.parent		= &amp;ck_ref,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP310 | CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX |</div><div class='ctx'> 			  VIRTUAL_IO_ADDRESS,</div><div class='del'>-	.enable_reg	= (void __iomem *)DSP_IDLECT2,</div><div class='add'>+	.enable_reg	= DSP_IDLECT2,</div><div class='ctx'> 	.enable_bit	= EN_DSPTIMCK,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> 	.enable		= &amp;omap1_clk_enable_dsp_domain,</div><div class='head'>diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c<br/>index ab708d4c597e..e382b438c64e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap1/devices.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-omap1/devices.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap1/devices.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap1/devices.c</a></div><div class='hunk'>@@ -13,9 +13,9 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/tc.h&gt;</div><div class='hunk'>@@ -101,7 +101,7 @@ static inline void omap_init_mbox(void) { }</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_OMAP_STI)</div><div class='ctx'> </div><div class='del'>-#define OMAP1_STI_BASE		IO_ADDRESS(0xfffea000)</div><div class='add'>+#define OMAP1_STI_BASE		0xfffea000</div><div class='ctx'> #define OMAP1_STI_CHANNEL_BASE	(OMAP1_STI_BASE + 0x400)</div><div class='ctx'> </div><div class='ctx'> static struct resource sti_resources[] = {</div><div class='head'>diff --git a/arch/arm/mach-omap1/fpga.c b/arch/arm/mach-omap1/fpga.c<br/>index 4449d86095f6..04995381aa5c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap1/fpga.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-omap1/fpga.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap1/fpga.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap1/fpga.c</a></div><div class='hunk'>@@ -21,9 +21,9 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -86,7 +86,6 @@ static void fpga_mask_ack_irq(unsigned int irq)</div><div class='ctx'> </div><div class='ctx'> void innovator_fpga_IRQ_demux(unsigned int irq, struct irq_desc *desc)</div><div class='ctx'> {</div><div class='del'>-	struct irq_desc *d;</div><div class='ctx'> 	u32 stat;</div><div class='ctx'> 	int fpga_irq;</div><div class='ctx'> </div><div class='hunk'>@@ -99,8 +98,7 @@ void innovator_fpga_IRQ_demux(unsigned int irq, struct irq_desc *desc)</div><div class='ctx'> 	     (fpga_irq &lt; OMAP_FPGA_IRQ_END) &amp;&amp; stat;</div><div class='ctx'> 	     fpga_irq++, stat &gt;&gt;= 1) {</div><div class='ctx'> 		if (stat &amp; 1) {</div><div class='del'>-			d = irq_desc + fpga_irq;</div><div class='del'>-			desc_handle_irq(fpga_irq, d);</div><div class='add'>+			generic_handle_irq(fpga_irq);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-omap1/id.c b/arch/arm/mach-omap1/id.c<br/>index da13c3e82850..13083d7e692d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap1/id.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-omap1/id.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap1/id.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap1/id.c</a></div><div class='hunk'>@@ -14,8 +14,7 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define OMAP_DIE_ID_0		0xfffe1800</div><div class='ctx'> #define OMAP_DIE_ID_1		0xfffe1804</div><div class='head'>diff --git a/arch/arm/mach-omap1/io.c b/arch/arm/mach-omap1/io.c<br/>index 2b9750b200ce..b3bd8ca85118 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap1/io.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-omap1/io.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap1/io.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap1/io.c</a></div><div class='hunk'>@@ -11,10 +11,10 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/tlb.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;mach/mux.h&gt;</div><div class='ctx'> #include &lt;mach/tc.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-omap1/irq.c b/arch/arm/mach-omap1/irq.c<br/>index 0ec6c1ec4250..9ad5197075ff 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap1/irq.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-omap1/irq.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap1/irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap1/irq.c</a></div><div class='hunk'>@@ -40,6 +40,7 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='hunk'>@@ -47,8 +48,6 @@</div><div class='ctx'> #include &lt;mach/gpio.h&gt;</div><div class='ctx'> #include &lt;mach/cpu.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-</div><div class='ctx'> #define IRQ_BANK(irq) ((irq) &gt;&gt; 5)</div><div class='ctx'> #define IRQ_BIT(irq)  ((irq) &amp; 0x1f)</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-omap1/leds-h2p2-debug.c b/arch/arm/mach-omap1/leds-h2p2-debug.c<br/>index 610f51f18741..71fe2cc7f7cf 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap1/leds-h2p2-debug.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-omap1/leds-h2p2-debug.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap1/leds-h2p2-debug.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap1/leds-h2p2-debug.c</a></div><div class='hunk'>@@ -12,8 +12,8 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel_stat.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/leds.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-omap1/mailbox.c b/arch/arm/mach-omap1/mailbox.c<br/>index af44eab1ed24..59abbf331a96 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap1/mailbox.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-omap1/mailbox.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap1/mailbox.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap1/mailbox.c</a></div><div class='hunk'>@@ -13,9 +13,9 @@</div><div class='ctx'> #include &lt;linux/resource.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;mach/mailbox.h&gt;</div><div class='ctx'> #include &lt;mach/irqs.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define MAILBOX_ARM2DSP1		0x00</div><div class='ctx'> #define MAILBOX_ARM2DSP1b		0x04</div><div class='head'>diff --git a/arch/arm/mach-omap1/mcbsp.c b/arch/arm/mach-omap1/mcbsp.c<br/>index 2baeaeb0c900..7de7c6915584 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap1/mcbsp.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-omap1/mcbsp.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap1/mcbsp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap1/mcbsp.c</a></div><div class='hunk'>@@ -103,30 +103,6 @@ static inline void omap_mcbsp_clk_init(struct mcbsp_internal_clk *mclk)</div><div class='ctx'> { }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static int omap1_mcbsp_check(unsigned int id)</div><div class='del'>-{</div><div class='del'>-	/* REVISIT: Check correctly for number of registered McBSPs */</div><div class='del'>-	if (cpu_is_omap730()) {</div><div class='del'>-		if (id &gt; OMAP_MAX_MCBSP_COUNT - 2) {</div><div class='del'>-		       printk(KERN_ERR "OMAP-McBSP: McBSP%d doesn't exist\n",</div><div class='del'>-				id + 1);</div><div class='del'>-		       return -ENODEV;</div><div class='del'>-		}</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (cpu_is_omap15xx() || cpu_is_omap16xx()) {</div><div class='del'>-		if (id &gt; OMAP_MAX_MCBSP_COUNT - 1) {</div><div class='del'>-			printk(KERN_ERR "OMAP-McBSP: McBSP%d doesn't exist\n",</div><div class='del'>-				id + 1);</div><div class='del'>-			return -ENODEV;</div><div class='del'>-		}</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return -ENODEV;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void omap1_mcbsp_request(unsigned int id)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -151,7 +127,6 @@ static void omap1_mcbsp_free(unsigned int id)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct omap_mcbsp_ops omap1_mcbsp_ops = {</div><div class='del'>-	.check		= omap1_mcbsp_check,</div><div class='ctx'> 	.request	= omap1_mcbsp_request,</div><div class='ctx'> 	.free		= omap1_mcbsp_free,</div><div class='ctx'> };</div><div class='hunk'>@@ -160,7 +135,6 @@ static struct omap_mcbsp_ops omap1_mcbsp_ops = {</div><div class='ctx'> static struct omap_mcbsp_platform_data omap730_mcbsp_pdata[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.phys_base	= OMAP730_MCBSP1_BASE,</div><div class='del'>-		.virt_base	= io_p2v(OMAP730_MCBSP1_BASE),</div><div class='ctx'> 		.dma_rx_sync	= OMAP_DMA_MCBSP1_RX,</div><div class='ctx'> 		.dma_tx_sync	= OMAP_DMA_MCBSP1_TX,</div><div class='ctx'> 		.rx_irq		= INT_730_McBSP1RX,</div><div class='hunk'>@@ -169,7 +143,6 @@ static struct omap_mcbsp_platform_data omap730_mcbsp_pdata[] = {</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.phys_base	= OMAP730_MCBSP2_BASE,</div><div class='del'>-		.virt_base	= io_p2v(OMAP730_MCBSP2_BASE),</div><div class='ctx'> 		.dma_rx_sync	= OMAP_DMA_MCBSP3_RX,</div><div class='ctx'> 		.dma_tx_sync	= OMAP_DMA_MCBSP3_TX,</div><div class='ctx'> 		.rx_irq		= INT_730_McBSP2RX,</div><div class='hunk'>@@ -187,7 +160,6 @@ static struct omap_mcbsp_platform_data omap730_mcbsp_pdata[] = {</div><div class='ctx'> static struct omap_mcbsp_platform_data omap15xx_mcbsp_pdata[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.phys_base	= OMAP1510_MCBSP1_BASE,</div><div class='del'>-		.virt_base	= OMAP1510_MCBSP1_BASE,</div><div class='ctx'> 		.dma_rx_sync	= OMAP_DMA_MCBSP1_RX,</div><div class='ctx'> 		.dma_tx_sync	= OMAP_DMA_MCBSP1_TX,</div><div class='ctx'> 		.rx_irq		= INT_McBSP1RX,</div><div class='hunk'>@@ -197,7 +169,6 @@ static struct omap_mcbsp_platform_data omap15xx_mcbsp_pdata[] = {</div><div class='ctx'> 		},</div><div class='ctx'> 	{</div><div class='ctx'> 		.phys_base	= OMAP1510_MCBSP2_BASE,</div><div class='del'>-		.virt_base	= io_p2v(OMAP1510_MCBSP2_BASE),</div><div class='ctx'> 		.dma_rx_sync	= OMAP_DMA_MCBSP2_RX,</div><div class='ctx'> 		.dma_tx_sync	= OMAP_DMA_MCBSP2_TX,</div><div class='ctx'> 		.rx_irq		= INT_1510_SPI_RX,</div><div class='hunk'>@@ -206,7 +177,6 @@ static struct omap_mcbsp_platform_data omap15xx_mcbsp_pdata[] = {</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.phys_base	= OMAP1510_MCBSP3_BASE,</div><div class='del'>-		.virt_base	= OMAP1510_MCBSP3_BASE,</div><div class='ctx'> 		.dma_rx_sync	= OMAP_DMA_MCBSP3_RX,</div><div class='ctx'> 		.dma_tx_sync	= OMAP_DMA_MCBSP3_TX,</div><div class='ctx'> 		.rx_irq		= INT_McBSP3RX,</div><div class='hunk'>@@ -225,7 +195,6 @@ static struct omap_mcbsp_platform_data omap15xx_mcbsp_pdata[] = {</div><div class='ctx'> static struct omap_mcbsp_platform_data omap16xx_mcbsp_pdata[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.phys_base	= OMAP1610_MCBSP1_BASE,</div><div class='del'>-		.virt_base	= OMAP1610_MCBSP1_BASE,</div><div class='ctx'> 		.dma_rx_sync	= OMAP_DMA_MCBSP1_RX,</div><div class='ctx'> 		.dma_tx_sync	= OMAP_DMA_MCBSP1_TX,</div><div class='ctx'> 		.rx_irq		= INT_McBSP1RX,</div><div class='hunk'>@@ -235,7 +204,6 @@ static struct omap_mcbsp_platform_data omap16xx_mcbsp_pdata[] = {</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.phys_base	= OMAP1610_MCBSP2_BASE,</div><div class='del'>-		.virt_base	= io_p2v(OMAP1610_MCBSP2_BASE),</div><div class='ctx'> 		.dma_rx_sync	= OMAP_DMA_MCBSP2_RX,</div><div class='ctx'> 		.dma_tx_sync	= OMAP_DMA_MCBSP2_TX,</div><div class='ctx'> 		.rx_irq		= INT_1610_McBSP2_RX,</div><div class='hunk'>@@ -244,7 +212,6 @@ static struct omap_mcbsp_platform_data omap16xx_mcbsp_pdata[] = {</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.phys_base	= OMAP1610_MCBSP3_BASE,</div><div class='del'>-		.virt_base	= OMAP1610_MCBSP3_BASE,</div><div class='ctx'> 		.dma_rx_sync	= OMAP_DMA_MCBSP3_RX,</div><div class='ctx'> 		.dma_tx_sync	= OMAP_DMA_MCBSP3_TX,</div><div class='ctx'> 		.rx_irq		= INT_McBSP3RX,</div><div class='hunk'>@@ -271,6 +238,18 @@ int __init omap1_mcbsp_init(void)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (cpu_is_omap730())</div><div class='add'>+		omap_mcbsp_count = OMAP730_MCBSP_PDATA_SZ;</div><div class='add'>+	if (cpu_is_omap15xx())</div><div class='add'>+		omap_mcbsp_count = OMAP15XX_MCBSP_PDATA_SZ;</div><div class='add'>+	if (cpu_is_omap16xx())</div><div class='add'>+		omap_mcbsp_count = OMAP16XX_MCBSP_PDATA_SZ;</div><div class='add'>+</div><div class='add'>+	mcbsp_ptr = kzalloc(omap_mcbsp_count * sizeof(struct omap_mcbsp *),</div><div class='add'>+								GFP_KERNEL);</div><div class='add'>+	if (!mcbsp_ptr)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (cpu_is_omap730())</div><div class='ctx'> 		omap_mcbsp_register_board_cfg(omap730_mcbsp_pdata,</div><div class='ctx'> 						OMAP730_MCBSP_PDATA_SZ);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-omap1/mux.c b/arch/arm/mach-omap1/mux.c<br/>index 898516e362e7..062c905c2ba6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap1/mux.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-omap1/mux.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap1/mux.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap1/mux.c</a></div><div class='hunk'>@@ -24,10 +24,11 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;asm/system.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/system.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;mach/mux.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_OMAP_MUX</div><div class='head'>diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c<br/>index 63c4ea18b1ca..770d256c790b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap1/pm.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-omap1/pm.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap1/pm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap1/pm.c</a></div><div class='hunk'>@@ -41,8 +41,8 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/sysfs.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/atomic.h&gt;</div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-omap1/serial.c b/arch/arm/mach-omap1/serial.c<br/>index 0e25a996bb4c..528691d5cb51 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap1/serial.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-omap1/serial.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap1/serial.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap1/serial.c</a></div><div class='hunk'>@@ -18,8 +18,8 @@</div><div class='ctx'> #include &lt;linux/serial_8250.h&gt;</div><div class='ctx'> #include &lt;linux/serial_reg.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/board.h&gt;</div><div class='hunk'>@@ -67,8 +67,8 @@ static void __init omap_serial_reset(struct plat_serial8250_port *p)</div><div class='ctx'> </div><div class='ctx'> static struct plat_serial8250_port serial_platform_data[] = {</div><div class='ctx'> 	{</div><div class='del'>-		.membase	= (char*)IO_ADDRESS(OMAP_UART1_BASE),</div><div class='del'>-		.mapbase	= (unsigned long)OMAP_UART1_BASE,</div><div class='add'>+		.membase	= IO_ADDRESS(OMAP_UART1_BASE),</div><div class='add'>+		.mapbase	= OMAP_UART1_BASE,</div><div class='ctx'> 		.irq		= INT_UART1,</div><div class='ctx'> 		.flags		= UPF_BOOT_AUTOCONF,</div><div class='ctx'> 		.iotype		= UPIO_MEM,</div><div class='hunk'>@@ -76,8 +76,8 @@ static struct plat_serial8250_port serial_platform_data[] = {</div><div class='ctx'> 		.uartclk	= OMAP16XX_BASE_BAUD * 16,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='del'>-		.membase	= (char*)IO_ADDRESS(OMAP_UART2_BASE),</div><div class='del'>-		.mapbase	= (unsigned long)OMAP_UART2_BASE,</div><div class='add'>+		.membase	= IO_ADDRESS(OMAP_UART2_BASE),</div><div class='add'>+		.mapbase	= OMAP_UART2_BASE,</div><div class='ctx'> 		.irq		= INT_UART2,</div><div class='ctx'> 		.flags		= UPF_BOOT_AUTOCONF,</div><div class='ctx'> 		.iotype		= UPIO_MEM,</div><div class='hunk'>@@ -85,8 +85,8 @@ static struct plat_serial8250_port serial_platform_data[] = {</div><div class='ctx'> 		.uartclk	= OMAP16XX_BASE_BAUD * 16,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='del'>-		.membase	= (char*)IO_ADDRESS(OMAP_UART3_BASE),</div><div class='del'>-		.mapbase	= (unsigned long)OMAP_UART3_BASE,</div><div class='add'>+		.membase	= IO_ADDRESS(OMAP_UART3_BASE),</div><div class='add'>+		.mapbase	= OMAP_UART3_BASE,</div><div class='ctx'> 		.irq		= INT_UART3,</div><div class='ctx'> 		.flags		= UPF_BOOT_AUTOCONF,</div><div class='ctx'> 		.iotype		= UPIO_MEM,</div><div class='head'>diff --git a/arch/arm/mach-omap1/time.c b/arch/arm/mach-omap1/time.c<br/>index e54708595ecf..2cf7e32bd293 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap1/time.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-omap1/time.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap1/time.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap1/time.c</a></div><div class='hunk'>@@ -43,10 +43,10 @@</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/clocksource.h&gt;</div><div class='ctx'> #include &lt;linux/clockchips.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/leds.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-omap1/timer32k.c b/arch/arm/mach-omap1/timer32k.c<br/>index e67760189d14..705367ece174 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap1/timer32k.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-omap1/timer32k.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap1/timer32k.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap1/timer32k.c</a></div><div class='hunk'>@@ -44,10 +44,10 @@</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/clocksource.h&gt;</div><div class='ctx'> #include &lt;linux/clockchips.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/leds.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig<br/>index 7069c9d536f1..4832fcc7d04a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap2/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-omap2/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap2/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/Kconfig</a></div><div class='hunk'>@@ -15,8 +15,17 @@ config ARCH_OMAP2430</div><div class='ctx'> 	bool "OMAP2430 support"</div><div class='ctx'> 	depends on ARCH_OMAP24XX</div><div class='ctx'> </div><div class='add'>+config ARCH_OMAP34XX</div><div class='add'>+	bool "OMAP34xx Based System"</div><div class='add'>+	depends on ARCH_OMAP3</div><div class='add'>+</div><div class='add'>+config ARCH_OMAP3430</div><div class='add'>+	bool "OMAP3430 support"</div><div class='add'>+	depends on ARCH_OMAP3 &amp;&amp; ARCH_OMAP34XX</div><div class='add'>+	select ARCH_OMAP_OTG</div><div class='add'>+</div><div class='ctx'> comment "OMAP Board Type"</div><div class='del'>-	depends on ARCH_OMAP2</div><div class='add'>+	depends on ARCH_OMAP2 || ARCH_OMAP3</div><div class='ctx'> </div><div class='ctx'> config MACH_OMAP_GENERIC</div><div class='ctx'> 	bool "Generic OMAP board"</div><div class='hunk'>@@ -35,3 +44,14 @@ config MACH_OMAP_2430SDP</div><div class='ctx'> 	bool "OMAP 2430 SDP board"</div><div class='ctx'> 	depends on ARCH_OMAP2 &amp;&amp; ARCH_OMAP24XX</div><div class='ctx'> </div><div class='add'>+config MACH_OMAP3_BEAGLE</div><div class='add'>+	bool "OMAP3 BEAGLE board"</div><div class='add'>+	depends on ARCH_OMAP3 &amp;&amp; ARCH_OMAP34XX</div><div class='add'>+</div><div class='add'>+config MACH_OMAP_LDP</div><div class='add'>+	bool "OMAP3 LDP board"</div><div class='add'>+	depends on ARCH_OMAP3 &amp;&amp; ARCH_OMAP34XX</div><div class='add'>+</div><div class='add'>+config MACH_OVERO</div><div class='add'>+	bool "Gumstix Overo board"</div><div class='add'>+	depends on ARCH_OMAP3 &amp;&amp; ARCH_OMAP34XX</div><div class='head'>diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile<br/>index 93ee990618ef..c69392372c99 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap2/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-omap2/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap2/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/Makefile</a></div><div class='hunk'>@@ -4,16 +4,21 @@</div><div class='ctx'> </div><div class='ctx'> # Common support</div><div class='ctx'> obj-y := irq.o id.o io.o memory.o control.o prcm.o clock.o mux.o \</div><div class='del'>-		devices.o serial.o gpmc.o timer-gp.o</div><div class='add'>+		devices.o serial.o gpmc.o timer-gp.o powerdomain.o \</div><div class='add'>+		clockdomain.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o</div><div class='ctx'> </div><div class='ctx'> # Functions loaded to SRAM</div><div class='ctx'> obj-$(CONFIG_ARCH_OMAP2420)		+= sram242x.o</div><div class='ctx'> obj-$(CONFIG_ARCH_OMAP2430)		+= sram243x.o</div><div class='add'>+obj-$(CONFIG_ARCH_OMAP3)		+= sram34xx.o</div><div class='ctx'> </div><div class='ctx'> # Power Management</div><div class='del'>-obj-$(CONFIG_PM) += pm.o sleep.o</div><div class='add'>+ifeq ($(CONFIG_PM),y)</div><div class='add'>+obj-y					+= pm.o</div><div class='add'>+obj-$(CONFIG_ARCH_OMAP24XX)		+= sleep24xx.o</div><div class='add'>+endif</div><div class='ctx'> </div><div class='ctx'> # Clock framework</div><div class='ctx'> obj-$(CONFIG_ARCH_OMAP2)		+= clock24xx.o</div><div class='hunk'>@@ -24,4 +29,7 @@ obj-$(CONFIG_MACH_OMAP_GENERIC)		+= board-generic.o</div><div class='ctx'> obj-$(CONFIG_MACH_OMAP_H4)		+= board-h4.o</div><div class='ctx'> obj-$(CONFIG_MACH_OMAP_2430SDP)		+= board-2430sdp.o</div><div class='ctx'> obj-$(CONFIG_MACH_OMAP_APOLLON)		+= board-apollon.o</div><div class='add'>+obj-$(CONFIG_MACH_OMAP3_BEAGLE)		+= board-omap3beagle.o</div><div class='add'>+obj-$(CONFIG_MACH_OMAP_LDP)		+= board-ldp.o</div><div class='add'>+obj-$(CONFIG_MACH_OVERO)		+= board-overo.o</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-omap2/board-2430sdp.c b/arch/arm/mach-omap2/board-2430sdp.c<br/>index b72ca13b3acb..24688efaa445 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap2/board-2430sdp.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-omap2/board-2430sdp.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap2/board-2430sdp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/board-2430sdp.c</a></div><div class='hunk'>@@ -21,6 +21,7 @@</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='hunk'>@@ -34,8 +35,6 @@</div><div class='ctx'> #include &lt;mach/common.h&gt;</div><div class='ctx'> #include &lt;mach/gpmc.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-</div><div class='ctx'> </div><div class='ctx'> #define	SDP2430_FLASH_CS	0</div><div class='ctx'> #define	SDP2430_SMC91X_CS	5</div><div class='head'>diff --git a/arch/arm/mach-omap2/board-h4.c b/arch/arm/mach-omap2/board-h4.c<br/>index 9e2624ca70a2..2fef2c845083 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap2/board-h4.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-omap2/board-h4.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap2/board-h4.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/board-h4.c</a></div><div class='hunk'>@@ -18,9 +18,11 @@</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='ctx'> #include &lt;linux/input.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='hunk'>@@ -41,8 +43,6 @@</div><div class='ctx'> #include &lt;mach/dma.h&gt;</div><div class='ctx'> #include &lt;mach/gpmc.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-</div><div class='ctx'> #define H4_FLASH_CS	0</div><div class='ctx'> #define H4_SMC91X_CS	1</div><div class='ctx'> </div><div class='hunk'>@@ -392,6 +392,13 @@ static struct omap_board_config_kernel h4_config[] = {</div><div class='ctx'> 	{ OMAP_TAG_LCD,		&amp;h4_lcd_config },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct i2c_board_info __initdata h4_i2c_board_info[] = {</div><div class='add'>+	{</div><div class='add'>+		I2C_BOARD_INFO("isp1301_omap", 0x2d),</div><div class='add'>+		.irq		= OMAP_GPIO_IRQ(125),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static void __init omap_h4_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -412,6 +419,9 @@ static void __init omap_h4_init(void)</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+	i2c_register_board_info(1, h4_i2c_board_info,</div><div class='add'>+			ARRAY_SIZE(h4_i2c_board_info));</div><div class='add'>+</div><div class='ctx'> 	platform_add_devices(h4_devices, ARRAY_SIZE(h4_devices));</div><div class='ctx'> 	omap_board_config = h4_config;</div><div class='ctx'> 	omap_board_config_size = ARRAY_SIZE(h4_config);</div><div class='head'>diff --git a/arch/arm/mach-omap2/board-ldp.c b/arch/arm/mach-omap2/board-ldp.c<br/>new file mode 100644<br/>index 000000000000..1ea59986aa7a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap2/board-ldp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/board-ldp.c</a></div><div class='hunk'>@@ -0,0 +1,86 @@</div><div class='add'>+/*</div><div class='add'>+ * linux/arch/arm/mach-omap2/board-ldp.c</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2008 Texas Instruments Inc.</div><div class='add'>+ * Nishant Kamat &lt;nskamat@ti.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * Modified from mach-omap2/board-3430sdp.c</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/input.h&gt;</div><div class='add'>+#include &lt;linux/workqueue.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/spi/spi.h&gt;</div><div class='add'>+#include &lt;linux/spi/ads7846.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;asm/mach-types.h&gt;</div><div class='add'>+#include &lt;asm/mach/arch.h&gt;</div><div class='add'>+#include &lt;asm/mach/map.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;mach/board-ldp.h&gt;</div><div class='add'>+#include &lt;mach/mcspi.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='add'>+#include &lt;mach/common.h&gt;</div><div class='add'>+#include &lt;mach/gpmc.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/delay.h&gt;</div><div class='add'>+#include &lt;mach/control.h&gt;</div><div class='add'>+</div><div class='add'>+static void __init omap_ldp_init_irq(void)</div><div class='add'>+{</div><div class='add'>+	omap2_init_common_hw();</div><div class='add'>+	omap_init_irq();</div><div class='add'>+	omap_gpio_init();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct omap_uart_config ldp_uart_config __initdata = {</div><div class='add'>+	.enabled_uarts	= ((1 &lt;&lt; 0) | (1 &lt;&lt; 1) | (1 &lt;&lt; 2)),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct omap_board_config_kernel ldp_config[] __initdata = {</div><div class='add'>+	{ OMAP_TAG_UART,	&amp;ldp_uart_config },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init omap_i2c_init(void)</div><div class='add'>+{</div><div class='add'>+	omap_register_i2c_bus(1, 2600, NULL, 0);</div><div class='add'>+	omap_register_i2c_bus(2, 400, NULL, 0);</div><div class='add'>+	omap_register_i2c_bus(3, 400, NULL, 0);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init omap_ldp_init(void)</div><div class='add'>+{</div><div class='add'>+	omap_i2c_init();</div><div class='add'>+	omap_board_config = ldp_config;</div><div class='add'>+	omap_board_config_size = ARRAY_SIZE(ldp_config);</div><div class='add'>+	omap_serial_init();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init omap_ldp_map_io(void)</div><div class='add'>+{</div><div class='add'>+	omap2_set_globals_343x();</div><div class='add'>+	omap2_map_common_io();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+MACHINE_START(OMAP_LDP, "OMAP LDP board")</div><div class='add'>+	.phys_io	= 0x48000000,</div><div class='add'>+	.io_pg_offst	= ((0xd8000000) &gt;&gt; 18) &amp; 0xfffc,</div><div class='add'>+	.boot_params	= 0x80000100,</div><div class='add'>+	.map_io		= omap_ldp_map_io,</div><div class='add'>+	.init_irq	= omap_ldp_init_irq,</div><div class='add'>+	.init_machine	= omap_ldp_init,</div><div class='add'>+	.timer		= &amp;omap_timer,</div><div class='add'>+MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c<br/>new file mode 100644<br/>index 000000000000..baa79674e9d5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap2/board-omap3beagle.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/board-omap3beagle.c</a></div><div class='hunk'>@@ -0,0 +1,244 @@</div><div class='add'>+/*</div><div class='add'>+ * linux/arch/arm/mach-omap2/board-omap3beagle.c</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2008 Texas Instruments</div><div class='add'>+ *</div><div class='add'>+ * Modified from mach-omap2/board-3430sdp.c</div><div class='add'>+ *</div><div class='add'>+ * Initial code: Syed Mohammed Khasim</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/leds.h&gt;</div><div class='add'>+#include &lt;linux/gpio.h&gt;</div><div class='add'>+#include &lt;linux/input.h&gt;</div><div class='add'>+#include &lt;linux/gpio_keys.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/mtd/mtd.h&gt;</div><div class='add'>+#include &lt;linux/mtd/partitions.h&gt;</div><div class='add'>+#include &lt;linux/mtd/nand.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;asm/mach-types.h&gt;</div><div class='add'>+#include &lt;asm/mach/arch.h&gt;</div><div class='add'>+#include &lt;asm/mach/map.h&gt;</div><div class='add'>+#include &lt;asm/mach/flash.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='add'>+#include &lt;mach/common.h&gt;</div><div class='add'>+#include &lt;mach/gpmc.h&gt;</div><div class='add'>+#include &lt;mach/nand.h&gt;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define GPMC_CS0_BASE  0x60</div><div class='add'>+#define GPMC_CS_SIZE   0x30</div><div class='add'>+</div><div class='add'>+#define NAND_BLOCK_SIZE		SZ_128K</div><div class='add'>+</div><div class='add'>+static struct mtd_partition omap3beagle_nand_partitions[] = {</div><div class='add'>+	/* All the partition sizes are listed in terms of NAND block size */</div><div class='add'>+	{</div><div class='add'>+		.name		= "X-Loader",</div><div class='add'>+		.offset		= 0,</div><div class='add'>+		.size		= 4 * NAND_BLOCK_SIZE,</div><div class='add'>+		.mask_flags	= MTD_WRITEABLE,	/* force read-only */</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name		= "U-Boot",</div><div class='add'>+		.offset		= MTDPART_OFS_APPEND,	/* Offset = 0x80000 */</div><div class='add'>+		.size		= 15 * NAND_BLOCK_SIZE,</div><div class='add'>+		.mask_flags	= MTD_WRITEABLE,	/* force read-only */</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name		= "U-Boot Env",</div><div class='add'>+		.offset		= MTDPART_OFS_APPEND,	/* Offset = 0x260000 */</div><div class='add'>+		.size		= 1 * NAND_BLOCK_SIZE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name		= "Kernel",</div><div class='add'>+		.offset		= MTDPART_OFS_APPEND,	/* Offset = 0x280000 */</div><div class='add'>+		.size		= 32 * NAND_BLOCK_SIZE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name		= "File System",</div><div class='add'>+		.offset		= MTDPART_OFS_APPEND,	/* Offset = 0x680000 */</div><div class='add'>+		.size		= MTDPART_SIZ_FULL,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct omap_nand_platform_data omap3beagle_nand_data = {</div><div class='add'>+	.options	= NAND_BUSWIDTH_16,</div><div class='add'>+	.parts		= omap3beagle_nand_partitions,</div><div class='add'>+	.nr_parts	= ARRAY_SIZE(omap3beagle_nand_partitions),</div><div class='add'>+	.dma_channel	= -1,		/* disable DMA in OMAP NAND driver */</div><div class='add'>+	.nand_setup	= NULL,</div><div class='add'>+	.dev_ready	= NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource omap3beagle_nand_resource = {</div><div class='add'>+	.flags		= IORESOURCE_MEM,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device omap3beagle_nand_device = {</div><div class='add'>+	.name		= "omap2-nand",</div><div class='add'>+	.id		= -1,</div><div class='add'>+	.dev		= {</div><div class='add'>+		.platform_data	= &amp;omap3beagle_nand_data,</div><div class='add'>+	},</div><div class='add'>+	.num_resources	= 1,</div><div class='add'>+	.resource	= &amp;omap3beagle_nand_resource,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct omap_uart_config omap3_beagle_uart_config __initdata = {</div><div class='add'>+	.enabled_uarts	= ((1 &lt;&lt; 0) | (1 &lt;&lt; 1) | (1 &lt;&lt; 2)),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init omap3_beagle_init_irq(void)</div><div class='add'>+{</div><div class='add'>+	omap2_init_common_hw();</div><div class='add'>+	omap_init_irq();</div><div class='add'>+	omap_gpio_init();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct platform_device omap3_beagle_lcd_device = {</div><div class='add'>+	.name		= "omap3beagle_lcd",</div><div class='add'>+	.id		= -1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct omap_lcd_config omap3_beagle_lcd_config __initdata = {</div><div class='add'>+	.ctrl_name	= "internal",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct gpio_led gpio_leds[] = {</div><div class='add'>+	{</div><div class='add'>+		.name			= "beagleboard::usr0",</div><div class='add'>+		.default_trigger	= "heartbeat",</div><div class='add'>+		.gpio			= 150,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name			= "beagleboard::usr1",</div><div class='add'>+		.default_trigger	= "mmc0",</div><div class='add'>+		.gpio			= 149,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct gpio_led_platform_data gpio_led_info = {</div><div class='add'>+	.leds		= gpio_leds,</div><div class='add'>+	.num_leds	= ARRAY_SIZE(gpio_leds),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device leds_gpio = {</div><div class='add'>+	.name	= "leds-gpio",</div><div class='add'>+	.id	= -1,</div><div class='add'>+	.dev	= {</div><div class='add'>+		.platform_data	= &amp;gpio_led_info,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct gpio_keys_button gpio_buttons[] = {</div><div class='add'>+	{</div><div class='add'>+		.code			= BTN_EXTRA,</div><div class='add'>+		.gpio			= 7,</div><div class='add'>+		.desc			= "user",</div><div class='add'>+		.wakeup			= 1,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct gpio_keys_platform_data gpio_key_info = {</div><div class='add'>+	.buttons	= gpio_buttons,</div><div class='add'>+	.nbuttons	= ARRAY_SIZE(gpio_buttons),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device keys_gpio = {</div><div class='add'>+	.name	= "gpio-keys",</div><div class='add'>+	.id	= -1,</div><div class='add'>+	.dev	= {</div><div class='add'>+		.platform_data	= &amp;gpio_key_info,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct omap_board_config_kernel omap3_beagle_config[] __initdata = {</div><div class='add'>+	{ OMAP_TAG_UART,	&amp;omap3_beagle_uart_config },</div><div class='add'>+	{ OMAP_TAG_LCD,		&amp;omap3_beagle_lcd_config },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device *omap3_beagle_devices[] __initdata = {</div><div class='add'>+	&amp;omap3_beagle_lcd_device,</div><div class='add'>+	&amp;leds_gpio,</div><div class='add'>+	&amp;keys_gpio,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init omap3beagle_flash_init(void)</div><div class='add'>+{</div><div class='add'>+	u8 cs = 0;</div><div class='add'>+	u8 nandcs = GPMC_CS_NUM + 1;</div><div class='add'>+</div><div class='add'>+	u32 gpmc_base_add = OMAP34XX_GPMC_VIRT;</div><div class='add'>+</div><div class='add'>+	/* find out the chip-select on which NAND exists */</div><div class='add'>+	while (cs &lt; GPMC_CS_NUM) {</div><div class='add'>+		u32 ret = 0;</div><div class='add'>+		ret = gpmc_cs_read_reg(cs, GPMC_CS_CONFIG1);</div><div class='add'>+</div><div class='add'>+		if ((ret &amp; 0xC00) == 0x800) {</div><div class='add'>+			printk(KERN_INFO "Found NAND on CS%d\n", cs);</div><div class='add'>+			if (nandcs &gt; GPMC_CS_NUM)</div><div class='add'>+				nandcs = cs;</div><div class='add'>+		}</div><div class='add'>+		cs++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (nandcs &gt; GPMC_CS_NUM) {</div><div class='add'>+		printk(KERN_INFO "NAND: Unable to find configuration "</div><div class='add'>+				 "in GPMC\n ");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (nandcs &lt; GPMC_CS_NUM) {</div><div class='add'>+		omap3beagle_nand_data.cs = nandcs;</div><div class='add'>+		omap3beagle_nand_data.gpmc_cs_baseaddr = (void *)</div><div class='add'>+			(gpmc_base_add + GPMC_CS0_BASE + nandcs * GPMC_CS_SIZE);</div><div class='add'>+		omap3beagle_nand_data.gpmc_baseaddr = (void *) (gpmc_base_add);</div><div class='add'>+</div><div class='add'>+		printk(KERN_INFO "Registering NAND on CS%d\n", nandcs);</div><div class='add'>+		if (platform_device_register(&amp;omap3beagle_nand_device) &lt; 0)</div><div class='add'>+			printk(KERN_ERR "Unable to register NAND device\n");</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init omap3_beagle_init(void)</div><div class='add'>+{</div><div class='add'>+	platform_add_devices(omap3_beagle_devices,</div><div class='add'>+			ARRAY_SIZE(omap3_beagle_devices));</div><div class='add'>+	omap_board_config = omap3_beagle_config;</div><div class='add'>+	omap_board_config_size = ARRAY_SIZE(omap3_beagle_config);</div><div class='add'>+	omap_serial_init();</div><div class='add'>+	omap3beagle_flash_init();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init omap3_beagle_map_io(void)</div><div class='add'>+{</div><div class='add'>+	omap2_set_globals_343x();</div><div class='add'>+	omap2_map_common_io();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+MACHINE_START(OMAP3_BEAGLE, "OMAP3 Beagle Board")</div><div class='add'>+	/* Maintainer: Syed Mohammed Khasim - http://beagleboard.org */</div><div class='add'>+	.phys_io	= 0x48000000,</div><div class='add'>+	.io_pg_offst	= ((0xd8000000) &gt;&gt; 18) &amp; 0xfffc,</div><div class='add'>+	.boot_params	= 0x80000100,</div><div class='add'>+	.map_io		= omap3_beagle_map_io,</div><div class='add'>+	.init_irq	= omap3_beagle_init_irq,</div><div class='add'>+	.init_machine	= omap3_beagle_init,</div><div class='add'>+	.timer		= &amp;omap_timer,</div><div class='add'>+MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-omap2/board-overo.c b/arch/arm/mach-omap2/board-overo.c<br/>new file mode 100644<br/>index 000000000000..e09aa59a399c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap2/board-overo.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/board-overo.c</a></div><div class='hunk'>@@ -0,0 +1,242 @@</div><div class='add'>+/*</div><div class='add'>+ * board-overo.c (Gumstix Overo)</div><div class='add'>+ *</div><div class='add'>+ * Initial code: Steve Sakoman &lt;steve@sakoman.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public License</div><div class='add'>+ * version 2 as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful, but</div><div class='add'>+ * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='add'>+ * General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA</div><div class='add'>+ * 02110-1301 USA</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/mtd/mtd.h&gt;</div><div class='add'>+#include &lt;linux/mtd/nand.h&gt;</div><div class='add'>+#include &lt;linux/mtd/partitions.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/mach-types.h&gt;</div><div class='add'>+#include &lt;asm/mach/arch.h&gt;</div><div class='add'>+#include &lt;asm/mach/flash.h&gt;</div><div class='add'>+#include &lt;asm/mach/map.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;mach/board-overo.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='add'>+#include &lt;mach/common.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='add'>+#include &lt;mach/gpmc.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/nand.h&gt;</div><div class='add'>+</div><div class='add'>+#define NAND_BLOCK_SIZE SZ_128K</div><div class='add'>+#define GPMC_CS0_BASE  0x60</div><div class='add'>+#define GPMC_CS_SIZE   0x30</div><div class='add'>+</div><div class='add'>+static struct mtd_partition overo_nand_partitions[] = {</div><div class='add'>+	{</div><div class='add'>+		.name           = "xloader",</div><div class='add'>+		.offset         = 0,			/* Offset = 0x00000 */</div><div class='add'>+		.size           = 4 * NAND_BLOCK_SIZE,</div><div class='add'>+		.mask_flags     = MTD_WRITEABLE</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name           = "uboot",</div><div class='add'>+		.offset         = MTDPART_OFS_APPEND,	/* Offset = 0x80000 */</div><div class='add'>+		.size           = 14 * NAND_BLOCK_SIZE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name           = "uboot environment",</div><div class='add'>+		.offset         = MTDPART_OFS_APPEND,	/* Offset = 0x240000 */</div><div class='add'>+		.size           = 2 * NAND_BLOCK_SIZE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name           = "linux",</div><div class='add'>+		.offset         = MTDPART_OFS_APPEND,	/* Offset = 0x280000 */</div><div class='add'>+		.size           = 32 * NAND_BLOCK_SIZE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name           = "rootfs",</div><div class='add'>+		.offset         = MTDPART_OFS_APPEND,	/* Offset = 0x680000 */</div><div class='add'>+		.size           = MTDPART_SIZ_FULL,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct omap_nand_platform_data overo_nand_data = {</div><div class='add'>+	.parts = overo_nand_partitions,</div><div class='add'>+	.nr_parts = ARRAY_SIZE(overo_nand_partitions),</div><div class='add'>+	.dma_channel = -1,	/* disable DMA in OMAP NAND driver */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource overo_nand_resource = {</div><div class='add'>+	.flags		= IORESOURCE_MEM,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device overo_nand_device = {</div><div class='add'>+	.name		= "omap2-nand",</div><div class='add'>+	.id		= -1,</div><div class='add'>+	.dev		= {</div><div class='add'>+		.platform_data	= &amp;overo_nand_data,</div><div class='add'>+	},</div><div class='add'>+	.num_resources	= 1,</div><div class='add'>+	.resource	= &amp;overo_nand_resource,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void __init overo_flash_init(void)</div><div class='add'>+{</div><div class='add'>+	u8 cs = 0;</div><div class='add'>+	u8 nandcs = GPMC_CS_NUM + 1;</div><div class='add'>+</div><div class='add'>+	u32 gpmc_base_add = OMAP34XX_GPMC_VIRT;</div><div class='add'>+</div><div class='add'>+	/* find out the chip-select on which NAND exists */</div><div class='add'>+	while (cs &lt; GPMC_CS_NUM) {</div><div class='add'>+		u32 ret = 0;</div><div class='add'>+		ret = gpmc_cs_read_reg(cs, GPMC_CS_CONFIG1);</div><div class='add'>+</div><div class='add'>+		if ((ret &amp; 0xC00) == 0x800) {</div><div class='add'>+			printk(KERN_INFO "Found NAND on CS%d\n", cs);</div><div class='add'>+			if (nandcs &gt; GPMC_CS_NUM)</div><div class='add'>+				nandcs = cs;</div><div class='add'>+		}</div><div class='add'>+		cs++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (nandcs &gt; GPMC_CS_NUM) {</div><div class='add'>+		printk(KERN_INFO "NAND: Unable to find configuration "</div><div class='add'>+				 "in GPMC\n ");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (nandcs &lt; GPMC_CS_NUM) {</div><div class='add'>+		overo_nand_data.cs = nandcs;</div><div class='add'>+		overo_nand_data.gpmc_cs_baseaddr = (void *)</div><div class='add'>+			(gpmc_base_add + GPMC_CS0_BASE + nandcs * GPMC_CS_SIZE);</div><div class='add'>+		overo_nand_data.gpmc_baseaddr = (void *) (gpmc_base_add);</div><div class='add'>+</div><div class='add'>+		printk(KERN_INFO "Registering NAND on CS%d\n", nandcs);</div><div class='add'>+		if (platform_device_register(&amp;overo_nand_device) &lt; 0)</div><div class='add'>+			printk(KERN_ERR "Unable to register NAND device\n");</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+static struct omap_uart_config overo_uart_config __initdata = {</div><div class='add'>+	.enabled_uarts	= ((1 &lt;&lt; 0) | (1 &lt;&lt; 1) | (1 &lt;&lt; 2)),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init overo_i2c_init(void)</div><div class='add'>+{</div><div class='add'>+	/* i2c2 pins are used for gpio */</div><div class='add'>+	omap_register_i2c_bus(3, 400, NULL, 0);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init overo_init_irq(void)</div><div class='add'>+{</div><div class='add'>+	omap2_init_common_hw();</div><div class='add'>+	omap_init_irq();</div><div class='add'>+	omap_gpio_init();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct platform_device overo_lcd_device = {</div><div class='add'>+	.name		= "overo_lcd",</div><div class='add'>+	.id		= -1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct omap_lcd_config overo_lcd_config __initdata = {</div><div class='add'>+	.ctrl_name	= "internal",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct omap_board_config_kernel overo_config[] __initdata = {</div><div class='add'>+	{ OMAP_TAG_UART,	&amp;overo_uart_config },</div><div class='add'>+	{ OMAP_TAG_LCD,		&amp;overo_lcd_config },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device *overo_devices[] __initdata = {</div><div class='add'>+	&amp;overo_lcd_device,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init overo_init(void)</div><div class='add'>+{</div><div class='add'>+	overo_i2c_init();</div><div class='add'>+	platform_add_devices(overo_devices, ARRAY_SIZE(overo_devices));</div><div class='add'>+	omap_board_config = overo_config;</div><div class='add'>+	omap_board_config_size = ARRAY_SIZE(overo_config);</div><div class='add'>+	omap_serial_init();</div><div class='add'>+	overo_flash_init();</div><div class='add'>+</div><div class='add'>+	if ((gpio_request(OVERO_GPIO_W2W_NRESET,</div><div class='add'>+			  "OVERO_GPIO_W2W_NRESET") == 0) &amp;&amp;</div><div class='add'>+	    (gpio_direction_output(OVERO_GPIO_W2W_NRESET, 1) == 0)) {</div><div class='add'>+		gpio_export(OVERO_GPIO_W2W_NRESET, 0);</div><div class='add'>+		gpio_set_value(OVERO_GPIO_W2W_NRESET, 0);</div><div class='add'>+		udelay(10);</div><div class='add'>+		gpio_set_value(OVERO_GPIO_W2W_NRESET, 1);</div><div class='add'>+	} else {</div><div class='add'>+		printk(KERN_ERR "could not obtain gpio for "</div><div class='add'>+					"OVERO_GPIO_W2W_NRESET\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((gpio_request(OVERO_GPIO_BT_XGATE, "OVERO_GPIO_BT_XGATE") == 0) &amp;&amp;</div><div class='add'>+	    (gpio_direction_output(OVERO_GPIO_BT_XGATE, 0) == 0))</div><div class='add'>+		gpio_export(OVERO_GPIO_BT_XGATE, 0);</div><div class='add'>+	else</div><div class='add'>+		printk(KERN_ERR "could not obtain gpio for OVERO_GPIO_BT_XGATE\n");</div><div class='add'>+</div><div class='add'>+	if ((gpio_request(OVERO_GPIO_BT_NRESET, "OVERO_GPIO_BT_NRESET") == 0) &amp;&amp;</div><div class='add'>+	    (gpio_direction_output(OVERO_GPIO_BT_NRESET, 1) == 0)) {</div><div class='add'>+		gpio_export(OVERO_GPIO_BT_NRESET, 0);</div><div class='add'>+		gpio_set_value(OVERO_GPIO_BT_NRESET, 0);</div><div class='add'>+		mdelay(6);</div><div class='add'>+		gpio_set_value(OVERO_GPIO_BT_NRESET, 1);</div><div class='add'>+	} else {</div><div class='add'>+		printk(KERN_ERR "could not obtain gpio for "</div><div class='add'>+					"OVERO_GPIO_BT_NRESET\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((gpio_request(OVERO_GPIO_USBH_CPEN, "OVERO_GPIO_USBH_CPEN") == 0) &amp;&amp;</div><div class='add'>+	    (gpio_direction_output(OVERO_GPIO_USBH_CPEN, 1) == 0))</div><div class='add'>+		gpio_export(OVERO_GPIO_USBH_CPEN, 0);</div><div class='add'>+	else</div><div class='add'>+		printk(KERN_ERR "could not obtain gpio for "</div><div class='add'>+					"OVERO_GPIO_USBH_CPEN\n");</div><div class='add'>+</div><div class='add'>+	if ((gpio_request(OVERO_GPIO_USBH_NRESET,</div><div class='add'>+			  "OVERO_GPIO_USBH_NRESET") == 0) &amp;&amp;</div><div class='add'>+	    (gpio_direction_output(OVERO_GPIO_USBH_NRESET, 1) == 0))</div><div class='add'>+		gpio_export(OVERO_GPIO_USBH_NRESET, 0);</div><div class='add'>+	else</div><div class='add'>+		printk(KERN_ERR "could not obtain gpio for "</div><div class='add'>+					"OVERO_GPIO_USBH_NRESET\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init overo_map_io(void)</div><div class='add'>+{</div><div class='add'>+	omap2_set_globals_343x();</div><div class='add'>+	omap2_map_common_io();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+MACHINE_START(OVERO, "Gumstix Overo")</div><div class='add'>+	.phys_io	= 0x48000000,</div><div class='add'>+	.io_pg_offst	= ((0xd8000000) &gt;&gt; 18) &amp; 0xfffc,</div><div class='add'>+	.boot_params	= 0x80000100,</div><div class='add'>+	.map_io		= overo_map_io,</div><div class='add'>+	.init_irq	= overo_init_irq,</div><div class='add'>+	.init_machine	= overo_init,</div><div class='add'>+	.timer		= &amp;omap_timer,</div><div class='add'>+MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c<br/>index 1d891e4a6933..ad721e0cbf7a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap2/clock.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-omap2/clock.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap2/clock.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/clock.c</a></div><div class='hunk'>@@ -21,11 +21,11 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='del'>-#include &lt;asm/bitops.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/bitops.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/clock.h&gt;</div><div class='add'>+#include &lt;mach/clockdomain.h&gt;</div><div class='ctx'> #include &lt;mach/sram.h&gt;</div><div class='ctx'> #include &lt;mach/cpu.h&gt;</div><div class='ctx'> #include &lt;asm/div64.h&gt;</div><div class='hunk'>@@ -62,10 +62,36 @@</div><div class='ctx'> u8 cpu_mask;</div><div class='ctx'> </div><div class='ctx'> /*-------------------------------------------------------------------------</div><div class='del'>- * Omap2 specific clock functions</div><div class='add'>+ * OMAP2/3 specific clock functions</div><div class='ctx'>  *-------------------------------------------------------------------------*/</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * omap2_init_clk_clkdm - look up a clockdomain name, store pointer in clk</div><div class='add'>+ * @clk: OMAP clock struct ptr to use</div><div class='add'>+ *</div><div class='add'>+ * Convert a clockdomain name stored in a struct clk 'clk' into a</div><div class='add'>+ * clockdomain pointer, and save it into the struct clk.  Intended to be</div><div class='add'>+ * called during clk_register().  No return value.</div><div class='add'>+ */</div><div class='add'>+void omap2_init_clk_clkdm(struct clk *clk)</div><div class='add'>+{</div><div class='add'>+	struct clockdomain *clkdm;</div><div class='add'>+</div><div class='add'>+	if (!clk-&gt;clkdm_name)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	clkdm = clkdm_lookup(clk-&gt;clkdm_name);</div><div class='add'>+	if (clkdm) {</div><div class='add'>+		pr_debug("clock: associated clk %s to clkdm %s\n",</div><div class='add'>+			 clk-&gt;name, clk-&gt;clkdm_name);</div><div class='add'>+		clk-&gt;clkdm = clkdm;</div><div class='add'>+	} else {</div><div class='add'>+		pr_debug("clock: could not associate clk %s to "</div><div class='add'>+			 "clkdm %s\n", clk-&gt;name, clk-&gt;clkdm_name);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * omap2_init_clksel_parent - set a clksel clk's parent field from the hardware</div><div class='ctx'>  * @clk: OMAP clock struct ptr to use</div><div class='ctx'>  *</div><div class='hunk'>@@ -251,7 +277,7 @@ int _omap2_clk_enable(struct clk *clk)</div><div class='ctx'> 	if (clk-&gt;enable)</div><div class='ctx'> 		return clk-&gt;enable(clk);</div><div class='ctx'> </div><div class='del'>-	if (unlikely(clk-&gt;enable_reg == 0)) {</div><div class='add'>+	if (unlikely(clk-&gt;enable_reg == NULL)) {</div><div class='ctx'> 		printk(KERN_ERR "clock.c: Enable for %s without enable code\n",</div><div class='ctx'> 		       clk-&gt;name);</div><div class='ctx'> 		return 0; /* REVISIT: -EINVAL */</div><div class='hunk'>@@ -283,7 +309,7 @@ void _omap2_clk_disable(struct clk *clk)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (clk-&gt;enable_reg == 0) {</div><div class='add'>+	if (clk-&gt;enable_reg == NULL) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * 'Independent' here refers to a clock which is not</div><div class='ctx'> 		 * controlled by its parent.</div><div class='hunk'>@@ -308,6 +334,9 @@ void omap2_clk_disable(struct clk *clk)</div><div class='ctx'> 		_omap2_clk_disable(clk);</div><div class='ctx'> 		if (likely((u32)clk-&gt;parent))</div><div class='ctx'> 			omap2_clk_disable(clk-&gt;parent);</div><div class='add'>+		if (clk-&gt;clkdm)</div><div class='add'>+			omap2_clkdm_clk_disable(clk-&gt;clkdm, clk);</div><div class='add'>+</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -324,11 +353,19 @@ int omap2_clk_enable(struct clk *clk)</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		if (clk-&gt;clkdm)</div><div class='add'>+			omap2_clkdm_clk_enable(clk-&gt;clkdm, clk);</div><div class='add'>+</div><div class='ctx'> 		ret = _omap2_clk_enable(clk);</div><div class='ctx'> </div><div class='del'>-		if (unlikely(ret != 0) &amp;&amp; clk-&gt;parent) {</div><div class='del'>-			omap2_clk_disable(clk-&gt;parent);</div><div class='del'>-			clk-&gt;usecount--;</div><div class='add'>+		if (unlikely(ret != 0)) {</div><div class='add'>+			if (clk-&gt;clkdm)</div><div class='add'>+				omap2_clkdm_clk_disable(clk-&gt;clkdm, clk);</div><div class='add'>+</div><div class='add'>+			if (clk-&gt;parent) {</div><div class='add'>+				omap2_clk_disable(clk-&gt;parent);</div><div class='add'>+				clk-&gt;usecount--;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -477,7 +514,7 @@ long omap2_clksel_round_rate(struct clk *clk, unsigned long target_rate)</div><div class='ctx'> /* Given a clock and a rate apply a clock specific rounding function */</div><div class='ctx'> long omap2_clk_round_rate(struct clk *clk, unsigned long rate)</div><div class='ctx'> {</div><div class='del'>-	if (clk-&gt;round_rate != 0)</div><div class='add'>+	if (clk-&gt;round_rate != NULL)</div><div class='ctx'> 		return clk-&gt;round_rate(clk, rate);</div><div class='ctx'> </div><div class='ctx'> 	if (clk-&gt;flags &amp; RATE_FIXED)</div><div class='hunk'>@@ -566,7 +603,7 @@ u32 omap2_divisor_to_clksel(struct clk *clk, u32 div)</div><div class='ctx'>  */</div><div class='ctx'> void __iomem *omap2_get_clksel(struct clk *clk, u32 *field_mask)</div><div class='ctx'> {</div><div class='del'>-	if (unlikely((clk-&gt;clksel_reg == 0) || (clk-&gt;clksel_mask == 0)))</div><div class='add'>+	if (unlikely((clk-&gt;clksel_reg == NULL) || (clk-&gt;clksel_mask == NULL)))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	*field_mask = clk-&gt;clksel_mask;</div><div class='hunk'>@@ -586,7 +623,7 @@ u32 omap2_clksel_get_divisor(struct clk *clk)</div><div class='ctx'> 	void __iomem *div_addr;</div><div class='ctx'> </div><div class='ctx'> 	div_addr = omap2_get_clksel(clk, &amp;field_mask);</div><div class='del'>-	if (div_addr == 0)</div><div class='add'>+	if (div_addr == NULL)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	field_val = __raw_readl(div_addr) &amp; field_mask;</div><div class='hunk'>@@ -605,7 +642,7 @@ int omap2_clksel_set_rate(struct clk *clk, unsigned long rate)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	div_addr = omap2_get_clksel(clk, &amp;field_mask);</div><div class='del'>-	if (div_addr == 0)</div><div class='add'>+	if (div_addr == NULL)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	field_val = omap2_divisor_to_clksel(clk, new_div);</div><div class='hunk'>@@ -643,7 +680,7 @@ int omap2_clk_set_rate(struct clk *clk, unsigned long rate)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* dpll_ck, core_ck, virt_prcm_set; plus all clksel clocks */</div><div class='del'>-	if (clk-&gt;set_rate != 0)</div><div class='add'>+	if (clk-&gt;set_rate != NULL)</div><div class='ctx'> 		ret = clk-&gt;set_rate(clk, rate);</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(ret == 0 &amp;&amp; (clk-&gt;flags &amp; RATE_PROPAGATES)))</div><div class='hunk'>@@ -664,7 +701,7 @@ static u32 omap2_clksel_get_src_field(void __iomem **src_addr,</div><div class='ctx'> 	const struct clksel_rate *clkr;</div><div class='ctx'> </div><div class='ctx'> 	*parent_div = 0;</div><div class='del'>-	*src_addr = 0;</div><div class='add'>+	*src_addr = NULL;</div><div class='ctx'> </div><div class='ctx'> 	clks = omap2_get_clksel_by_parent(clk, src_clk);</div><div class='ctx'> 	if (clks == NULL)</div><div class='hunk'>@@ -705,7 +742,7 @@ int omap2_clk_set_parent(struct clk *clk, struct clk *new_parent)</div><div class='ctx'> </div><div class='ctx'> 	field_val = omap2_clksel_get_src_field(&amp;src_addr, new_parent,</div><div class='ctx'> 					       &amp;field_mask, clk, &amp;parent_div);</div><div class='del'>-	if (src_addr == 0)</div><div class='add'>+	if (src_addr == NULL)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (clk-&gt;usecount &gt; 0)</div><div class='head'>diff --git a/arch/arm/mach-omap2/clock.h b/arch/arm/mach-omap2/clock.h<br/>index 626e5fa93b6a..1fb330e0847d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap2/clock.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-omap2/clock.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap2/clock.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/clock.h</a></div><div class='hunk'>@@ -21,6 +21,7 @@</div><div class='ctx'> /* The maximum error between a target DPLL rate and the rounded rate in Hz */</div><div class='ctx'> #define DEFAULT_DPLL_RATE_TOLERANCE	50000</div><div class='ctx'> </div><div class='add'>+int omap2_clk_init(void);</div><div class='ctx'> int omap2_clk_enable(struct clk *clk);</div><div class='ctx'> void omap2_clk_disable(struct clk *clk);</div><div class='ctx'> long omap2_clk_round_rate(struct clk *clk, unsigned long rate);</div><div class='hunk'>@@ -36,6 +37,7 @@ void omap2_clk_disable_unused(struct clk *clk);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> void omap2_clksel_recalc(struct clk *clk);</div><div class='add'>+void omap2_init_clk_clkdm(struct clk *clk);</div><div class='ctx'> void omap2_init_clksel_parent(struct clk *clk);</div><div class='ctx'> u32 omap2_clksel_get_divisor(struct clk *clk);</div><div class='ctx'> u32 omap2_clksel_round_rate_div(struct clk *clk, unsigned long target_rate,</div><div class='head'>diff --git a/arch/arm/mach-omap2/clock24xx.c b/arch/arm/mach-omap2/clock24xx.c<br/>index 295e671e9cfd..d382eb0184ac 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap2/clock24xx.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-omap2/clock24xx.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap2/clock24xx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/clock24xx.c</a></div><div class='hunk'>@@ -24,14 +24,13 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='del'>-</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/cpufreq.h&gt;</div><div class='add'>+#include &lt;linux/bitops.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/clock.h&gt;</div><div class='ctx'> #include &lt;mach/sram.h&gt;</div><div class='ctx'> #include &lt;asm/div64.h&gt;</div><div class='del'>-#include &lt;asm/bitops.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "memory.h"</div><div class='ctx'> #include "clock.h"</div><div class='head'>diff --git a/arch/arm/mach-omap2/clock24xx.h b/arch/arm/mach-omap2/clock24xx.h<br/>index be4e25554e05..242a19d86ccd 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap2/clock24xx.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-omap2/clock24xx.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap2/clock24xx.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/clock24xx.h</a></div><div class='hunk'>@@ -626,6 +626,7 @@ static struct clk func_32k_ck = {</div><div class='ctx'> 	.rate		= 32000,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X |</div><div class='ctx'> 				RATE_FIXED | ALWAYS_ENABLED | RATE_PROPAGATES,</div><div class='add'>+	.clkdm_name	= "wkup_clkdm",</div><div class='ctx'> 	.recalc		= &amp;propagate_rate,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -634,17 +635,19 @@ static struct clk osc_ck = {		/* (*12, *13, 19.2, *26, 38.4)MHz */</div><div class='ctx'> 	.name		= "osc_ck",</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X |</div><div class='ctx'> 				RATE_PROPAGATES,</div><div class='add'>+	.clkdm_name	= "wkup_clkdm",</div><div class='ctx'> 	.enable		= &amp;omap2_enable_osc_ck,</div><div class='ctx'> 	.disable	= &amp;omap2_disable_osc_ck,</div><div class='ctx'> 	.recalc		= &amp;omap2_osc_clk_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* With out modem likely 12MHz, with modem likely 13MHz */</div><div class='add'>+/* Without modem likely 12MHz, with modem likely 13MHz */</div><div class='ctx'> static struct clk sys_ck = {		/* (*12, *13, 19.2, 26, 38.4)MHz */</div><div class='ctx'> 	.name		= "sys_ck",		/* ~ ref_clk also */</div><div class='ctx'> 	.parent		= &amp;osc_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X |</div><div class='ctx'> 				ALWAYS_ENABLED | RATE_PROPAGATES,</div><div class='add'>+	.clkdm_name	= "wkup_clkdm",</div><div class='ctx'> 	.recalc		= &amp;omap2_sys_clk_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -653,6 +656,7 @@ static struct clk alt_ck = {		/* Typical 54M or 48M, may not exist */</div><div class='ctx'> 	.rate		= 54000000,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X |</div><div class='ctx'> 				RATE_FIXED | ALWAYS_ENABLED | RATE_PROPAGATES,</div><div class='add'>+	.clkdm_name	= "wkup_clkdm",</div><div class='ctx'> 	.recalc		= &amp;propagate_rate,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -684,6 +688,7 @@ static struct clk dpll_ck = {</div><div class='ctx'> 	.dpll_data	= &amp;dpll_dd,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X |</div><div class='ctx'> 				RATE_PROPAGATES | ALWAYS_ENABLED,</div><div class='add'>+	.clkdm_name	= "wkup_clkdm",</div><div class='ctx'> 	.recalc		= &amp;omap2_dpllcore_recalc,</div><div class='ctx'> 	.set_rate	= &amp;omap2_reprogram_dpllcore,</div><div class='ctx'> };</div><div class='hunk'>@@ -694,6 +699,7 @@ static struct clk apll96_ck = {</div><div class='ctx'> 	.rate		= 96000000,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X |</div><div class='ctx'> 				RATE_FIXED | RATE_PROPAGATES | ENABLE_ON_INIT,</div><div class='add'>+	.clkdm_name	= "wkup_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(PLL_MOD, CM_CLKEN),</div><div class='ctx'> 	.enable_bit	= OMAP24XX_EN_96M_PLL_SHIFT,</div><div class='ctx'> 	.enable		= &amp;omap2_clk_fixed_enable,</div><div class='hunk'>@@ -707,6 +713,7 @@ static struct clk apll54_ck = {</div><div class='ctx'> 	.rate		= 54000000,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X |</div><div class='ctx'> 				RATE_FIXED | RATE_PROPAGATES | ENABLE_ON_INIT,</div><div class='add'>+	.clkdm_name	= "wkup_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(PLL_MOD, CM_CLKEN),</div><div class='ctx'> 	.enable_bit	= OMAP24XX_EN_54M_PLL_SHIFT,</div><div class='ctx'> 	.enable		= &amp;omap2_clk_fixed_enable,</div><div class='hunk'>@@ -741,6 +748,7 @@ static struct clk func_54m_ck = {</div><div class='ctx'> 	.parent		= &amp;apll54_ck,	/* can also be alt_clk */</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X |</div><div class='ctx'> 				RATE_PROPAGATES | PARENT_CONTROLS_CLOCK,</div><div class='add'>+	.clkdm_name	= "wkup_clkdm",</div><div class='ctx'> 	.init		= &amp;omap2_init_clksel_parent,</div><div class='ctx'> 	.clksel_reg	= OMAP_CM_REGADDR(PLL_MOD, CM_CLKSEL1),</div><div class='ctx'> 	.clksel_mask	= OMAP24XX_54M_SOURCE,</div><div class='hunk'>@@ -753,6 +761,7 @@ static struct clk core_ck = {</div><div class='ctx'> 	.parent		= &amp;dpll_ck,		/* can also be 32k */</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X |</div><div class='ctx'> 				ALWAYS_ENABLED | RATE_PROPAGATES,</div><div class='add'>+	.clkdm_name	= "wkup_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -779,6 +788,7 @@ static struct clk func_96m_ck = {</div><div class='ctx'> 	.parent		= &amp;apll96_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X |</div><div class='ctx'> 				RATE_PROPAGATES | PARENT_CONTROLS_CLOCK,</div><div class='add'>+	.clkdm_name	= "wkup_clkdm",</div><div class='ctx'> 	.init		= &amp;omap2_init_clksel_parent,</div><div class='ctx'> 	.clksel_reg	= OMAP_CM_REGADDR(PLL_MOD, CM_CLKSEL1),</div><div class='ctx'> 	.clksel_mask	= OMAP2430_96M_SOURCE,</div><div class='hunk'>@@ -811,6 +821,7 @@ static struct clk func_48m_ck = {</div><div class='ctx'> 	.parent		= &amp;apll96_ck,	 /* 96M or Alt */</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X |</div><div class='ctx'> 				RATE_PROPAGATES | PARENT_CONTROLS_CLOCK,</div><div class='add'>+	.clkdm_name	= "wkup_clkdm",</div><div class='ctx'> 	.init		= &amp;omap2_init_clksel_parent,</div><div class='ctx'> 	.clksel_reg	= OMAP_CM_REGADDR(PLL_MOD, CM_CLKSEL1),</div><div class='ctx'> 	.clksel_mask	= OMAP24XX_48M_SOURCE,</div><div class='hunk'>@@ -826,6 +837,7 @@ static struct clk func_12m_ck = {</div><div class='ctx'> 	.fixed_div	= 4,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X |</div><div class='ctx'> 				RATE_PROPAGATES | PARENT_CONTROLS_CLOCK,</div><div class='add'>+	.clkdm_name	= "wkup_clkdm",</div><div class='ctx'> 	.recalc		= &amp;omap2_fixed_divisor_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -878,6 +890,7 @@ static struct clk sys_clkout_src = {</div><div class='ctx'> 	.parent		= &amp;func_54m_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X |</div><div class='ctx'> 				RATE_PROPAGATES,</div><div class='add'>+	.clkdm_name	= "wkup_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP24XX_PRCM_CLKOUT_CTRL,</div><div class='ctx'> 	.enable_bit	= OMAP24XX_CLKOUT_EN_SHIFT,</div><div class='ctx'> 	.init		= &amp;omap2_init_clksel_parent,</div><div class='hunk'>@@ -908,6 +921,7 @@ static struct clk sys_clkout = {</div><div class='ctx'> 	.parent		= &amp;sys_clkout_src,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X |</div><div class='ctx'> 				PARENT_CONTROLS_CLOCK,</div><div class='add'>+	.clkdm_name	= "wkup_clkdm",</div><div class='ctx'> 	.clksel_reg	= OMAP24XX_PRCM_CLKOUT_CTRL,</div><div class='ctx'> 	.clksel_mask	= OMAP24XX_CLKOUT_DIV_MASK,</div><div class='ctx'> 	.clksel		= sys_clkout_clksel,</div><div class='hunk'>@@ -921,6 +935,7 @@ static struct clk sys_clkout2_src = {</div><div class='ctx'> 	.name		= "sys_clkout2_src",</div><div class='ctx'> 	.parent		= &amp;func_54m_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | RATE_PROPAGATES,</div><div class='add'>+	.clkdm_name	= "wkup_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP24XX_PRCM_CLKOUT_CTRL,</div><div class='ctx'> 	.enable_bit	= OMAP2420_CLKOUT2_EN_SHIFT,</div><div class='ctx'> 	.init		= &amp;omap2_init_clksel_parent,</div><div class='hunk'>@@ -942,6 +957,7 @@ static struct clk sys_clkout2 = {</div><div class='ctx'> 	.name		= "sys_clkout2",</div><div class='ctx'> 	.parent		= &amp;sys_clkout2_src,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | PARENT_CONTROLS_CLOCK,</div><div class='add'>+	.clkdm_name	= "wkup_clkdm",</div><div class='ctx'> 	.clksel_reg	= OMAP24XX_PRCM_CLKOUT_CTRL,</div><div class='ctx'> 	.clksel_mask	= OMAP2420_CLKOUT2_DIV_MASK,</div><div class='ctx'> 	.clksel		= sys_clkout2_clksel,</div><div class='hunk'>@@ -954,6 +970,7 @@ static struct clk emul_ck = {</div><div class='ctx'> 	.name		= "emul_ck",</div><div class='ctx'> 	.parent		= &amp;func_54m_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X,</div><div class='add'>+	.clkdm_name	= "wkup_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP24XX_PRCM_CLKEMUL_CTRL,</div><div class='ctx'> 	.enable_bit	= OMAP24XX_EMULATION_EN_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -990,12 +1007,13 @@ static struct clk mpu_ck = {	/* Control cpu */</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X |</div><div class='ctx'> 				ALWAYS_ENABLED | DELAYED_APP |</div><div class='ctx'> 				CONFIG_PARTICIPANT | RATE_PROPAGATES,</div><div class='add'>+	.clkdm_name	= "mpu_clkdm",</div><div class='ctx'> 	.init		= &amp;omap2_init_clksel_parent,</div><div class='ctx'> 	.clksel_reg	= OMAP_CM_REGADDR(MPU_MOD, CM_CLKSEL),</div><div class='ctx'> 	.clksel_mask	= OMAP24XX_CLKSEL_MPU_MASK,</div><div class='ctx'> 	.clksel		= mpu_clksel,</div><div class='ctx'> 	.recalc		= &amp;omap2_clksel_recalc,</div><div class='del'>-	.round_rate     = &amp;omap2_clksel_round_rate,</div><div class='add'>+	.round_rate	= &amp;omap2_clksel_round_rate,</div><div class='ctx'> 	.set_rate	= &amp;omap2_clksel_set_rate</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1031,6 +1049,7 @@ static struct clk dsp_fck = {</div><div class='ctx'> 	.parent		= &amp;core_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X | DELAYED_APP |</div><div class='ctx'> 				CONFIG_PARTICIPANT | RATE_PROPAGATES,</div><div class='add'>+	.clkdm_name	= "dsp_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(OMAP24XX_DSP_MOD, CM_FCLKEN),</div><div class='ctx'> 	.enable_bit	= OMAP24XX_CM_FCLKEN_DSP_EN_DSP_SHIFT,</div><div class='ctx'> 	.clksel_reg	= OMAP_CM_REGADDR(OMAP24XX_DSP_MOD, CM_CLKSEL),</div><div class='hunk'>@@ -1054,10 +1073,7 @@ static const struct clksel dsp_irate_ick_clksel[] = {</div><div class='ctx'> 	{ .parent = NULL }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * This clock does not exist as such in the TRM, but is added to</div><div class='del'>- * separate source selection from  XXX</div><div class='del'>- */</div><div class='add'>+/* This clock does not exist as such in the TRM. */</div><div class='ctx'> static struct clk dsp_irate_ick = {</div><div class='ctx'> 	.name		= "dsp_irate_ick",</div><div class='ctx'> 	.parent		= &amp;dsp_fck,</div><div class='hunk'>@@ -1089,11 +1105,17 @@ static struct clk iva2_1_ick = {</div><div class='ctx'> 	.enable_bit	= OMAP24XX_CM_FCLKEN_DSP_EN_DSP_SHIFT,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * The IVA1 is an ARM7 core on the 2420 that has nothing to do with</div><div class='add'>+ * the C54x, but which is contained in the DSP powerdomain.  Does not</div><div class='add'>+ * exist on later OMAPs.</div><div class='add'>+ */</div><div class='ctx'> static struct clk iva1_ifck = {</div><div class='ctx'> 	.name		= "iva1_ifck",</div><div class='ctx'> 	.parent		= &amp;core_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CONFIG_PARTICIPANT |</div><div class='ctx'> 				RATE_PROPAGATES | DELAYED_APP,</div><div class='add'>+	.clkdm_name	= "iva1_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(OMAP24XX_DSP_MOD, CM_FCLKEN),</div><div class='ctx'> 	.enable_bit	= OMAP2420_EN_IVA_COP_SHIFT,</div><div class='ctx'> 	.clksel_reg	= OMAP_CM_REGADDR(OMAP24XX_DSP_MOD, CM_CLKSEL),</div><div class='hunk'>@@ -1109,6 +1131,7 @@ static struct clk iva1_mpu_int_ifck = {</div><div class='ctx'> 	.name		= "iva1_mpu_int_ifck",</div><div class='ctx'> 	.parent		= &amp;iva1_ifck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X,</div><div class='add'>+	.clkdm_name	= "iva1_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(OMAP24XX_DSP_MOD, CM_FCLKEN),</div><div class='ctx'> 	.enable_bit	= OMAP2420_EN_IVA_MPU_SHIFT,</div><div class='ctx'> 	.fixed_div	= 2,</div><div class='hunk'>@@ -1156,6 +1179,7 @@ static struct clk core_l3_ck = {	/* Used for ick and fck, interconnect */</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X |</div><div class='ctx'> 				ALWAYS_ENABLED | DELAYED_APP |</div><div class='ctx'> 				CONFIG_PARTICIPANT | RATE_PROPAGATES,</div><div class='add'>+	.clkdm_name	= "core_l3_clkdm",</div><div class='ctx'> 	.clksel_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_CLKSEL1),</div><div class='ctx'> 	.clksel_mask	= OMAP24XX_CLKSEL_L3_MASK,</div><div class='ctx'> 	.clksel		= core_l3_clksel,</div><div class='hunk'>@@ -1177,11 +1201,13 @@ static const struct clksel usb_l4_ick_clksel[] = {</div><div class='ctx'> 	{ .parent = NULL },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* It is unclear from TRM whether usb_l4_ick is really in L3 or L4 clkdm */</div><div class='ctx'> static struct clk usb_l4_ick = {	/* FS-USB interface clock */</div><div class='ctx'> 	.name		= "usb_l4_ick",</div><div class='ctx'> 	.parent		= &amp;core_l3_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X |</div><div class='ctx'> 				DELAYED_APP | CONFIG_PARTICIPANT,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN2),</div><div class='ctx'> 	.enable_bit	= OMAP24XX_EN_USB_SHIFT,</div><div class='ctx'> 	.clksel_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_CLKSEL1),</div><div class='hunk'>@@ -1193,10 +1219,42 @@ static struct clk usb_l4_ick = {	/* FS-USB interface clock */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * L4 clock management domain</div><div class='add'>+ *</div><div class='add'>+ * This domain contains lots of interface clocks from the L4 interface, some</div><div class='add'>+ * functional clocks.	Fixed APLL functional source clocks are managed in</div><div class='add'>+ * this domain.</div><div class='add'>+ */</div><div class='add'>+static const struct clksel_rate l4_core_l3_rates[] = {</div><div class='add'>+	{ .div = 1, .val = 1, .flags = RATE_IN_24XX | DEFAULT_RATE },</div><div class='add'>+	{ .div = 2, .val = 2, .flags = RATE_IN_24XX },</div><div class='add'>+	{ .div = 0 }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct clksel l4_clksel[] = {</div><div class='add'>+	{ .parent = &amp;core_l3_ck, .rates = l4_core_l3_rates },</div><div class='add'>+	{ .parent = NULL }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk l4_ck = {		/* used both as an ick and fck */</div><div class='add'>+	.name		= "l4_ck",</div><div class='add'>+	.parent		= &amp;core_l3_ck,</div><div class='add'>+	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X |</div><div class='add'>+				ALWAYS_ENABLED | DELAYED_APP | RATE_PROPAGATES,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='add'>+	.clksel_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_CLKSEL1),</div><div class='add'>+	.clksel_mask	= OMAP24XX_CLKSEL_L4_MASK,</div><div class='add'>+	.clksel		= l4_clksel,</div><div class='add'>+	.recalc		= &amp;omap2_clksel_recalc,</div><div class='add'>+	.round_rate	= &amp;omap2_clksel_round_rate,</div><div class='add'>+	.set_rate	= &amp;omap2_clksel_set_rate</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * SSI is in L3 management domain, its direct parent is core not l3,</div><div class='ctx'>  * many core power domain entities are grouped into the L3 clock</div><div class='ctx'>  * domain.</div><div class='del'>- * SSI_SSR_FCLK, SSI_SST_FCLK, SSI_L4_CLIK</div><div class='add'>+ * SSI_SSR_FCLK, SSI_SST_FCLK, SSI_L4_ICLK</div><div class='ctx'>  *</div><div class='ctx'>  * ssr = core/1/2/3/4/5, sst = 1/2 ssr.</div><div class='ctx'>  */</div><div class='hunk'>@@ -1221,6 +1279,7 @@ static struct clk ssi_ssr_sst_fck = {</div><div class='ctx'> 	.parent		= &amp;core_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X |</div><div class='ctx'> 				DELAYED_APP,</div><div class='add'>+	.clkdm_name	= "core_l3_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, OMAP24XX_CM_FCLKEN2),</div><div class='ctx'> 	.enable_bit	= OMAP24XX_EN_SSI_SHIFT,</div><div class='ctx'> 	.clksel_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_CLKSEL1),</div><div class='hunk'>@@ -1231,6 +1290,7 @@ static struct clk ssi_ssr_sst_fck = {</div><div class='ctx'> 	.set_rate	= &amp;omap2_clksel_set_rate</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * GFX clock domain</div><div class='ctx'>  *	Clocks:</div><div class='hunk'>@@ -1254,6 +1314,7 @@ static struct clk gfx_3d_fck = {</div><div class='ctx'> 	.name		= "gfx_3d_fck",</div><div class='ctx'> 	.parent		= &amp;core_l3_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "gfx_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(GFX_MOD, CM_FCLKEN),</div><div class='ctx'> 	.enable_bit	= OMAP24XX_EN_3D_SHIFT,</div><div class='ctx'> 	.clksel_reg	= OMAP_CM_REGADDR(GFX_MOD, CM_CLKSEL),</div><div class='hunk'>@@ -1268,6 +1329,7 @@ static struct clk gfx_2d_fck = {</div><div class='ctx'> 	.name		= "gfx_2d_fck",</div><div class='ctx'> 	.parent		= &amp;core_l3_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "gfx_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(GFX_MOD, CM_FCLKEN),</div><div class='ctx'> 	.enable_bit	= OMAP24XX_EN_2D_SHIFT,</div><div class='ctx'> 	.clksel_reg	= OMAP_CM_REGADDR(GFX_MOD, CM_CLKSEL),</div><div class='hunk'>@@ -1282,6 +1344,7 @@ static struct clk gfx_ick = {</div><div class='ctx'> 	.name		= "gfx_ick",		/* From l3 */</div><div class='ctx'> 	.parent		= &amp;core_l3_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "gfx_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(GFX_MOD, CM_ICLKEN),</div><div class='ctx'> 	.enable_bit	= OMAP_EN_GFX_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -1311,6 +1374,7 @@ static struct clk mdm_ick = {		/* used both as a ick and fck */</div><div class='ctx'> 	.name		= "mdm_ick",</div><div class='ctx'> 	.parent		= &amp;core_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP243X | DELAYED_APP | CONFIG_PARTICIPANT,</div><div class='add'>+	.clkdm_name	= "mdm_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(OMAP2430_MDM_MOD, CM_ICLKEN),</div><div class='ctx'> 	.enable_bit	= OMAP2430_CM_ICLKEN_MDM_EN_MDM_SHIFT,</div><div class='ctx'> 	.clksel_reg	= OMAP_CM_REGADDR(OMAP2430_MDM_MOD, CM_CLKSEL),</div><div class='hunk'>@@ -1325,52 +1389,13 @@ static struct clk mdm_osc_ck = {</div><div class='ctx'> 	.name		= "mdm_osc_ck",</div><div class='ctx'> 	.parent		= &amp;osc_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "mdm_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(OMAP2430_MDM_MOD, CM_FCLKEN),</div><div class='ctx'> 	.enable_bit	= OMAP2430_EN_OSC_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * L4 clock management domain</div><div class='del'>- *</div><div class='del'>- * This domain contains lots of interface clocks from the L4 interface, some</div><div class='del'>- * functional clocks.	Fixed APLL functional source clocks are managed in</div><div class='del'>- * this domain.</div><div class='del'>- */</div><div class='del'>-static const struct clksel_rate l4_core_l3_rates[] = {</div><div class='del'>-	{ .div = 1, .val = 1, .flags = RATE_IN_24XX | DEFAULT_RATE },</div><div class='del'>-	{ .div = 2, .val = 2, .flags = RATE_IN_24XX },</div><div class='del'>-	{ .div = 0 }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct clksel l4_clksel[] = {</div><div class='del'>-	{ .parent = &amp;core_l3_ck, .rates = l4_core_l3_rates },</div><div class='del'>-	{ .parent = NULL }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct clk l4_ck = {		/* used both as an ick and fck */</div><div class='del'>-	.name		= "l4_ck",</div><div class='del'>-	.parent		= &amp;core_l3_ck,</div><div class='del'>-	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X |</div><div class='del'>-				ALWAYS_ENABLED | DELAYED_APP | RATE_PROPAGATES,</div><div class='del'>-	.clksel_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_CLKSEL1),</div><div class='del'>-	.clksel_mask	= OMAP24XX_CLKSEL_L4_MASK,</div><div class='del'>-	.clksel		= l4_clksel,</div><div class='del'>-	.recalc		= &amp;omap2_clksel_recalc,</div><div class='del'>-	.round_rate	= &amp;omap2_clksel_round_rate,</div><div class='del'>-	.set_rate	= &amp;omap2_clksel_set_rate</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct clk ssi_l4_ick = {</div><div class='del'>-	.name		= "ssi_l4_ick",</div><div class='del'>-	.parent		= &amp;l4_ck,</div><div class='del'>-	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X,</div><div class='del'>-	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN2),</div><div class='del'>-	.enable_bit	= OMAP24XX_EN_SSI_SHIFT,</div><div class='del'>-	.recalc		= &amp;followparent_recalc,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * DSS clock domain</div><div class='ctx'>  * CLOCKs:</div><div class='ctx'>  * DSS_L4_ICLK, DSS_L3_ICLK,</div><div class='hunk'>@@ -1409,6 +1434,7 @@ static struct clk dss_ick = {		/* Enables both L3,L4 ICLK's */</div><div class='ctx'> 	.name		= "dss_ick",</div><div class='ctx'> 	.parent		= &amp;l4_ck,	/* really both l3 and l4 */</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "dss_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP24XX_EN_DSS1_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -1419,6 +1445,7 @@ static struct clk dss1_fck = {</div><div class='ctx'> 	.parent		= &amp;core_ck,		/* Core or sys */</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X |</div><div class='ctx'> 				DELAYED_APP,</div><div class='add'>+	.clkdm_name	= "dss_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP24XX_EN_DSS1_SHIFT,</div><div class='ctx'> 	.init		= &amp;omap2_init_clksel_parent,</div><div class='hunk'>@@ -1451,6 +1478,7 @@ static struct clk dss2_fck = {		/* Alt clk used in power management */</div><div class='ctx'> 	.parent		= &amp;sys_ck,		/* fixed at sys_ck or 48MHz */</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X |</div><div class='ctx'> 				DELAYED_APP,</div><div class='add'>+	.clkdm_name	= "dss_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP24XX_EN_DSS2_SHIFT,</div><div class='ctx'> 	.init		= &amp;omap2_init_clksel_parent,</div><div class='hunk'>@@ -1464,6 +1492,7 @@ static struct clk dss_54m_fck = {	/* Alt clk used in power management */</div><div class='ctx'> 	.name		= "dss_54m_fck",	/* 54m tv clk */</div><div class='ctx'> 	.parent		= &amp;func_54m_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "dss_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP24XX_EN_TV_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -1491,6 +1520,7 @@ static struct clk gpt1_ick = {</div><div class='ctx'> 	.name		= "gpt1_ick",</div><div class='ctx'> 	.parent		= &amp;l4_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(WKUP_MOD, CM_ICLKEN),</div><div class='ctx'> 	.enable_bit	= OMAP24XX_EN_GPT1_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -1500,6 +1530,7 @@ static struct clk gpt1_fck = {</div><div class='ctx'> 	.name		= "gpt1_fck",</div><div class='ctx'> 	.parent		= &amp;func_32k_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(WKUP_MOD, CM_FCLKEN),</div><div class='ctx'> 	.enable_bit	= OMAP24XX_EN_GPT1_SHIFT,</div><div class='ctx'> 	.init		= &amp;omap2_init_clksel_parent,</div><div class='hunk'>@@ -1515,6 +1546,7 @@ static struct clk gpt2_ick = {</div><div class='ctx'> 	.name		= "gpt2_ick",</div><div class='ctx'> 	.parent		= &amp;l4_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP24XX_EN_GPT2_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -1524,6 +1556,7 @@ static struct clk gpt2_fck = {</div><div class='ctx'> 	.name		= "gpt2_fck",</div><div class='ctx'> 	.parent		= &amp;func_32k_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP24XX_EN_GPT2_SHIFT,</div><div class='ctx'> 	.init		= &amp;omap2_init_clksel_parent,</div><div class='hunk'>@@ -1537,6 +1570,7 @@ static struct clk gpt3_ick = {</div><div class='ctx'> 	.name		= "gpt3_ick",</div><div class='ctx'> 	.parent		= &amp;l4_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP24XX_EN_GPT3_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -1546,6 +1580,7 @@ static struct clk gpt3_fck = {</div><div class='ctx'> 	.name		= "gpt3_fck",</div><div class='ctx'> 	.parent		= &amp;func_32k_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP24XX_EN_GPT3_SHIFT,</div><div class='ctx'> 	.init		= &amp;omap2_init_clksel_parent,</div><div class='hunk'>@@ -1559,6 +1594,7 @@ static struct clk gpt4_ick = {</div><div class='ctx'> 	.name		= "gpt4_ick",</div><div class='ctx'> 	.parent		= &amp;l4_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP24XX_EN_GPT4_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -1568,6 +1604,7 @@ static struct clk gpt4_fck = {</div><div class='ctx'> 	.name		= "gpt4_fck",</div><div class='ctx'> 	.parent		= &amp;func_32k_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP24XX_EN_GPT4_SHIFT,</div><div class='ctx'> 	.init		= &amp;omap2_init_clksel_parent,</div><div class='hunk'>@@ -1581,6 +1618,7 @@ static struct clk gpt5_ick = {</div><div class='ctx'> 	.name		= "gpt5_ick",</div><div class='ctx'> 	.parent		= &amp;l4_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP24XX_EN_GPT5_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -1590,6 +1628,7 @@ static struct clk gpt5_fck = {</div><div class='ctx'> 	.name		= "gpt5_fck",</div><div class='ctx'> 	.parent		= &amp;func_32k_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP24XX_EN_GPT5_SHIFT,</div><div class='ctx'> 	.init		= &amp;omap2_init_clksel_parent,</div><div class='hunk'>@@ -1603,6 +1642,7 @@ static struct clk gpt6_ick = {</div><div class='ctx'> 	.name		= "gpt6_ick",</div><div class='ctx'> 	.parent		= &amp;l4_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP24XX_EN_GPT6_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -1612,6 +1652,7 @@ static struct clk gpt6_fck = {</div><div class='ctx'> 	.name		= "gpt6_fck",</div><div class='ctx'> 	.parent		= &amp;func_32k_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP24XX_EN_GPT6_SHIFT,</div><div class='ctx'> 	.init		= &amp;omap2_init_clksel_parent,</div><div class='hunk'>@@ -1634,6 +1675,7 @@ static struct clk gpt7_fck = {</div><div class='ctx'> 	.name		= "gpt7_fck",</div><div class='ctx'> 	.parent		= &amp;func_32k_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP24XX_EN_GPT7_SHIFT,</div><div class='ctx'> 	.init		= &amp;omap2_init_clksel_parent,</div><div class='hunk'>@@ -1647,6 +1689,7 @@ static struct clk gpt8_ick = {</div><div class='ctx'> 	.name		= "gpt8_ick",</div><div class='ctx'> 	.parent		= &amp;l4_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP24XX_EN_GPT8_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -1656,6 +1699,7 @@ static struct clk gpt8_fck = {</div><div class='ctx'> 	.name		= "gpt8_fck",</div><div class='ctx'> 	.parent		= &amp;func_32k_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP24XX_EN_GPT8_SHIFT,</div><div class='ctx'> 	.init		= &amp;omap2_init_clksel_parent,</div><div class='hunk'>@@ -1669,6 +1713,7 @@ static struct clk gpt9_ick = {</div><div class='ctx'> 	.name		= "gpt9_ick",</div><div class='ctx'> 	.parent		= &amp;l4_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP24XX_EN_GPT9_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -1678,6 +1723,7 @@ static struct clk gpt9_fck = {</div><div class='ctx'> 	.name		= "gpt9_fck",</div><div class='ctx'> 	.parent		= &amp;func_32k_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP24XX_EN_GPT9_SHIFT,</div><div class='ctx'> 	.init		= &amp;omap2_init_clksel_parent,</div><div class='hunk'>@@ -1691,6 +1737,7 @@ static struct clk gpt10_ick = {</div><div class='ctx'> 	.name		= "gpt10_ick",</div><div class='ctx'> 	.parent		= &amp;l4_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP24XX_EN_GPT10_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -1700,6 +1747,7 @@ static struct clk gpt10_fck = {</div><div class='ctx'> 	.name		= "gpt10_fck",</div><div class='ctx'> 	.parent		= &amp;func_32k_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP24XX_EN_GPT10_SHIFT,</div><div class='ctx'> 	.init		= &amp;omap2_init_clksel_parent,</div><div class='hunk'>@@ -1713,6 +1761,7 @@ static struct clk gpt11_ick = {</div><div class='ctx'> 	.name		= "gpt11_ick",</div><div class='ctx'> 	.parent		= &amp;l4_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP24XX_EN_GPT11_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -1722,6 +1771,7 @@ static struct clk gpt11_fck = {</div><div class='ctx'> 	.name		= "gpt11_fck",</div><div class='ctx'> 	.parent		= &amp;func_32k_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP24XX_EN_GPT11_SHIFT,</div><div class='ctx'> 	.init		= &amp;omap2_init_clksel_parent,</div><div class='hunk'>@@ -1735,6 +1785,7 @@ static struct clk gpt12_ick = {</div><div class='ctx'> 	.name		= "gpt12_ick",</div><div class='ctx'> 	.parent		= &amp;l4_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP24XX_EN_GPT12_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -1744,6 +1795,7 @@ static struct clk gpt12_fck = {</div><div class='ctx'> 	.name		= "gpt12_fck",</div><div class='ctx'> 	.parent		= &amp;func_32k_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP24XX_EN_GPT12_SHIFT,</div><div class='ctx'> 	.init		= &amp;omap2_init_clksel_parent,</div><div class='hunk'>@@ -1758,6 +1810,7 @@ static struct clk mcbsp1_ick = {</div><div class='ctx'> 	.id		= 1,</div><div class='ctx'> 	.parent		= &amp;l4_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP24XX_EN_MCBSP1_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -1768,6 +1821,7 @@ static struct clk mcbsp1_fck = {</div><div class='ctx'> 	.id		= 1,</div><div class='ctx'> 	.parent		= &amp;func_96m_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP24XX_EN_MCBSP1_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -1778,6 +1832,7 @@ static struct clk mcbsp2_ick = {</div><div class='ctx'> 	.id		= 2,</div><div class='ctx'> 	.parent		= &amp;l4_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP24XX_EN_MCBSP2_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -1788,6 +1843,7 @@ static struct clk mcbsp2_fck = {</div><div class='ctx'> 	.id		= 2,</div><div class='ctx'> 	.parent		= &amp;func_96m_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP24XX_EN_MCBSP2_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -1798,6 +1854,7 @@ static struct clk mcbsp3_ick = {</div><div class='ctx'> 	.id		= 3,</div><div class='ctx'> 	.parent		= &amp;l4_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN2),</div><div class='ctx'> 	.enable_bit	= OMAP2430_EN_MCBSP3_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -1808,6 +1865,7 @@ static struct clk mcbsp3_fck = {</div><div class='ctx'> 	.id		= 3,</div><div class='ctx'> 	.parent		= &amp;func_96m_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, OMAP24XX_CM_FCLKEN2),</div><div class='ctx'> 	.enable_bit	= OMAP2430_EN_MCBSP3_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -1818,6 +1876,7 @@ static struct clk mcbsp4_ick = {</div><div class='ctx'> 	.id		= 4,</div><div class='ctx'> 	.parent		= &amp;l4_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN2),</div><div class='ctx'> 	.enable_bit	= OMAP2430_EN_MCBSP4_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -1828,6 +1887,7 @@ static struct clk mcbsp4_fck = {</div><div class='ctx'> 	.id		= 4,</div><div class='ctx'> 	.parent		= &amp;func_96m_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, OMAP24XX_CM_FCLKEN2),</div><div class='ctx'> 	.enable_bit	= OMAP2430_EN_MCBSP4_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -1838,6 +1898,7 @@ static struct clk mcbsp5_ick = {</div><div class='ctx'> 	.id		= 5,</div><div class='ctx'> 	.parent		= &amp;l4_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN2),</div><div class='ctx'> 	.enable_bit	= OMAP2430_EN_MCBSP5_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -1848,6 +1909,7 @@ static struct clk mcbsp5_fck = {</div><div class='ctx'> 	.id		= 5,</div><div class='ctx'> 	.parent		= &amp;func_96m_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, OMAP24XX_CM_FCLKEN2),</div><div class='ctx'> 	.enable_bit	= OMAP2430_EN_MCBSP5_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -1857,6 +1919,7 @@ static struct clk mcspi1_ick = {</div><div class='ctx'> 	.name		= "mcspi_ick",</div><div class='ctx'> 	.id		= 1,</div><div class='ctx'> 	.parent		= &amp;l4_ck,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X,</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP24XX_EN_MCSPI1_SHIFT,</div><div class='hunk'>@@ -1868,6 +1931,7 @@ static struct clk mcspi1_fck = {</div><div class='ctx'> 	.id		= 1,</div><div class='ctx'> 	.parent		= &amp;func_48m_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP24XX_EN_MCSPI1_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -1878,6 +1942,7 @@ static struct clk mcspi2_ick = {</div><div class='ctx'> 	.id		= 2,</div><div class='ctx'> 	.parent		= &amp;l4_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP24XX_EN_MCSPI2_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -1888,6 +1953,7 @@ static struct clk mcspi2_fck = {</div><div class='ctx'> 	.id		= 2,</div><div class='ctx'> 	.parent		= &amp;func_48m_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP24XX_EN_MCSPI2_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -1898,6 +1964,7 @@ static struct clk mcspi3_ick = {</div><div class='ctx'> 	.id		= 3,</div><div class='ctx'> 	.parent		= &amp;l4_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN2),</div><div class='ctx'> 	.enable_bit	= OMAP2430_EN_MCSPI3_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -1908,6 +1975,7 @@ static struct clk mcspi3_fck = {</div><div class='ctx'> 	.id		= 3,</div><div class='ctx'> 	.parent		= &amp;func_48m_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, OMAP24XX_CM_FCLKEN2),</div><div class='ctx'> 	.enable_bit	= OMAP2430_EN_MCSPI3_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -1917,6 +1985,7 @@ static struct clk uart1_ick = {</div><div class='ctx'> 	.name		= "uart1_ick",</div><div class='ctx'> 	.parent		= &amp;l4_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP24XX_EN_UART1_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -1926,6 +1995,7 @@ static struct clk uart1_fck = {</div><div class='ctx'> 	.name		= "uart1_fck",</div><div class='ctx'> 	.parent		= &amp;func_48m_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP24XX_EN_UART1_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -1935,6 +2005,7 @@ static struct clk uart2_ick = {</div><div class='ctx'> 	.name		= "uart2_ick",</div><div class='ctx'> 	.parent		= &amp;l4_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP24XX_EN_UART2_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -1944,6 +2015,7 @@ static struct clk uart2_fck = {</div><div class='ctx'> 	.name		= "uart2_fck",</div><div class='ctx'> 	.parent		= &amp;func_48m_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP24XX_EN_UART2_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -1953,6 +2025,7 @@ static struct clk uart3_ick = {</div><div class='ctx'> 	.name		= "uart3_ick",</div><div class='ctx'> 	.parent		= &amp;l4_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN2),</div><div class='ctx'> 	.enable_bit	= OMAP24XX_EN_UART3_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -1962,6 +2035,7 @@ static struct clk uart3_fck = {</div><div class='ctx'> 	.name		= "uart3_fck",</div><div class='ctx'> 	.parent		= &amp;func_48m_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, OMAP24XX_CM_FCLKEN2),</div><div class='ctx'> 	.enable_bit	= OMAP24XX_EN_UART3_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -1971,6 +2045,7 @@ static struct clk gpios_ick = {</div><div class='ctx'> 	.name		= "gpios_ick",</div><div class='ctx'> 	.parent		= &amp;l4_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(WKUP_MOD, CM_ICLKEN),</div><div class='ctx'> 	.enable_bit	= OMAP24XX_EN_GPIOS_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -1980,6 +2055,7 @@ static struct clk gpios_fck = {</div><div class='ctx'> 	.name		= "gpios_fck",</div><div class='ctx'> 	.parent		= &amp;func_32k_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "wkup_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(WKUP_MOD, CM_FCLKEN),</div><div class='ctx'> 	.enable_bit	= OMAP24XX_EN_GPIOS_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -1989,6 +2065,7 @@ static struct clk mpu_wdt_ick = {</div><div class='ctx'> 	.name		= "mpu_wdt_ick",</div><div class='ctx'> 	.parent		= &amp;l4_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(WKUP_MOD, CM_ICLKEN),</div><div class='ctx'> 	.enable_bit	= OMAP24XX_EN_MPU_WDT_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -1998,6 +2075,7 @@ static struct clk mpu_wdt_fck = {</div><div class='ctx'> 	.name		= "mpu_wdt_fck",</div><div class='ctx'> 	.parent		= &amp;func_32k_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "wkup_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(WKUP_MOD, CM_FCLKEN),</div><div class='ctx'> 	.enable_bit	= OMAP24XX_EN_MPU_WDT_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -2006,31 +2084,40 @@ static struct clk mpu_wdt_fck = {</div><div class='ctx'> static struct clk sync_32k_ick = {</div><div class='ctx'> 	.name		= "sync_32k_ick",</div><div class='ctx'> 	.parent		= &amp;l4_ck,</div><div class='del'>-	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X | ENABLE_ON_INIT,</div><div class='add'>+	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X |</div><div class='add'>+				ENABLE_ON_INIT,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(WKUP_MOD, CM_ICLKEN),</div><div class='ctx'> 	.enable_bit	= OMAP24XX_EN_32KSYNC_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='add'>+</div><div class='ctx'> static struct clk wdt1_ick = {</div><div class='ctx'> 	.name		= "wdt1_ick",</div><div class='ctx'> 	.parent		= &amp;l4_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(WKUP_MOD, CM_ICLKEN),</div><div class='ctx'> 	.enable_bit	= OMAP24XX_EN_WDT1_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='add'>+</div><div class='ctx'> static struct clk omapctrl_ick = {</div><div class='ctx'> 	.name		= "omapctrl_ick",</div><div class='ctx'> 	.parent		= &amp;l4_ck,</div><div class='del'>-	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X | ENABLE_ON_INIT,</div><div class='add'>+	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X |</div><div class='add'>+				ENABLE_ON_INIT,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(WKUP_MOD, CM_ICLKEN),</div><div class='ctx'> 	.enable_bit	= OMAP24XX_EN_OMAPCTRL_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='add'>+</div><div class='ctx'> static struct clk icr_ick = {</div><div class='ctx'> 	.name		= "icr_ick",</div><div class='ctx'> 	.parent		= &amp;l4_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(WKUP_MOD, CM_ICLKEN),</div><div class='ctx'> 	.enable_bit	= OMAP2430_EN_ICR_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -2040,15 +2127,22 @@ static struct clk cam_ick = {</div><div class='ctx'> 	.name		= "cam_ick",</div><div class='ctx'> 	.parent		= &amp;l4_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP24XX_EN_CAM_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * cam_fck controls both CAM_MCLK and CAM_FCLK.  It should probably be</div><div class='add'>+ * split into two separate clocks, since the parent clocks are different</div><div class='add'>+ * and the clockdomains are also different.</div><div class='add'>+ */</div><div class='ctx'> static struct clk cam_fck = {</div><div class='ctx'> 	.name		= "cam_fck",</div><div class='ctx'> 	.parent		= &amp;func_96m_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "core_l3_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP24XX_EN_CAM_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -2058,6 +2152,7 @@ static struct clk mailboxes_ick = {</div><div class='ctx'> 	.name		= "mailboxes_ick",</div><div class='ctx'> 	.parent		= &amp;l4_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP24XX_EN_MAILBOXES_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -2067,6 +2162,7 @@ static struct clk wdt4_ick = {</div><div class='ctx'> 	.name		= "wdt4_ick",</div><div class='ctx'> 	.parent		= &amp;l4_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP24XX_EN_WDT4_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -2076,6 +2172,7 @@ static struct clk wdt4_fck = {</div><div class='ctx'> 	.name		= "wdt4_fck",</div><div class='ctx'> 	.parent		= &amp;func_32k_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP24XX_EN_WDT4_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -2085,6 +2182,7 @@ static struct clk wdt3_ick = {</div><div class='ctx'> 	.name		= "wdt3_ick",</div><div class='ctx'> 	.parent		= &amp;l4_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP2420_EN_WDT3_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -2094,6 +2192,7 @@ static struct clk wdt3_fck = {</div><div class='ctx'> 	.name		= "wdt3_fck",</div><div class='ctx'> 	.parent		= &amp;func_32k_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP2420_EN_WDT3_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -2103,6 +2202,7 @@ static struct clk mspro_ick = {</div><div class='ctx'> 	.name		= "mspro_ick",</div><div class='ctx'> 	.parent		= &amp;l4_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP24XX_EN_MSPRO_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -2112,6 +2212,7 @@ static struct clk mspro_fck = {</div><div class='ctx'> 	.name		= "mspro_fck",</div><div class='ctx'> 	.parent		= &amp;func_96m_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP24XX_EN_MSPRO_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -2121,6 +2222,7 @@ static struct clk mmc_ick = {</div><div class='ctx'> 	.name		= "mmc_ick",</div><div class='ctx'> 	.parent		= &amp;l4_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP2420_EN_MMC_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -2130,6 +2232,7 @@ static struct clk mmc_fck = {</div><div class='ctx'> 	.name		= "mmc_fck",</div><div class='ctx'> 	.parent		= &amp;func_96m_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP2420_EN_MMC_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -2139,6 +2242,7 @@ static struct clk fac_ick = {</div><div class='ctx'> 	.name		= "fac_ick",</div><div class='ctx'> 	.parent		= &amp;l4_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP24XX_EN_FAC_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -2148,6 +2252,7 @@ static struct clk fac_fck = {</div><div class='ctx'> 	.name		= "fac_fck",</div><div class='ctx'> 	.parent		= &amp;func_12m_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP24XX_EN_FAC_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -2157,6 +2262,7 @@ static struct clk eac_ick = {</div><div class='ctx'> 	.name		= "eac_ick",</div><div class='ctx'> 	.parent		= &amp;l4_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP2420_EN_EAC_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -2166,6 +2272,7 @@ static struct clk eac_fck = {</div><div class='ctx'> 	.name		= "eac_fck",</div><div class='ctx'> 	.parent		= &amp;func_96m_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP2420_EN_EAC_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -2175,6 +2282,7 @@ static struct clk hdq_ick = {</div><div class='ctx'> 	.name		= "hdq_ick",</div><div class='ctx'> 	.parent		= &amp;l4_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP24XX_EN_HDQ_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -2184,6 +2292,7 @@ static struct clk hdq_fck = {</div><div class='ctx'> 	.name		= "hdq_fck",</div><div class='ctx'> 	.parent		= &amp;func_12m_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP24XX_EN_HDQ_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -2194,6 +2303,7 @@ static struct clk i2c2_ick = {</div><div class='ctx'> 	.id		= 2,</div><div class='ctx'> 	.parent		= &amp;l4_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP2420_EN_I2C2_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -2204,6 +2314,7 @@ static struct clk i2c2_fck = {</div><div class='ctx'> 	.id		= 2,</div><div class='ctx'> 	.parent		= &amp;func_12m_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP2420_EN_I2C2_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -2214,6 +2325,7 @@ static struct clk i2chs2_fck = {</div><div class='ctx'> 	.id		= 2,</div><div class='ctx'> 	.parent		= &amp;func_96m_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, OMAP24XX_CM_FCLKEN2),</div><div class='ctx'> 	.enable_bit	= OMAP2430_EN_I2CHS2_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -2224,6 +2336,7 @@ static struct clk i2c1_ick = {</div><div class='ctx'> 	.id		= 1,</div><div class='ctx'> 	.parent		= &amp;l4_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP2420_EN_I2C1_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -2234,6 +2347,7 @@ static struct clk i2c1_fck = {</div><div class='ctx'> 	.id		= 1,</div><div class='ctx'> 	.parent		= &amp;func_12m_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP2420_EN_I2C1_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -2244,6 +2358,7 @@ static struct clk i2chs1_fck = {</div><div class='ctx'> 	.id		= 1,</div><div class='ctx'> 	.parent		= &amp;func_96m_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, OMAP24XX_CM_FCLKEN2),</div><div class='ctx'> 	.enable_bit	= OMAP2430_EN_I2CHS1_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -2252,7 +2367,9 @@ static struct clk i2chs1_fck = {</div><div class='ctx'> static struct clk gpmc_fck = {</div><div class='ctx'> 	.name		= "gpmc_fck",</div><div class='ctx'> 	.parent		= &amp;core_l3_ck,</div><div class='del'>-	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X | ENABLE_ON_INIT,</div><div class='add'>+	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X |</div><div class='add'>+				ENABLE_ON_INIT,</div><div class='add'>+	.clkdm_name	= "core_l3_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2260,6 +2377,7 @@ static struct clk sdma_fck = {</div><div class='ctx'> 	.name		= "sdma_fck",</div><div class='ctx'> 	.parent		= &amp;core_l3_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "core_l3_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2267,6 +2385,7 @@ static struct clk sdma_ick = {</div><div class='ctx'> 	.name		= "sdma_ick",</div><div class='ctx'> 	.parent		= &amp;l4_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "core_l3_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2274,6 +2393,7 @@ static struct clk vlynq_ick = {</div><div class='ctx'> 	.name		= "vlynq_ick",</div><div class='ctx'> 	.parent		= &amp;core_l3_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X,</div><div class='add'>+	.clkdm_name	= "core_l3_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP2420_EN_VLYNQ_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -2308,6 +2428,7 @@ static struct clk vlynq_fck = {</div><div class='ctx'> 	.name		= "vlynq_fck",</div><div class='ctx'> 	.parent		= &amp;func_96m_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | DELAYED_APP,</div><div class='add'>+	.clkdm_name	= "core_l3_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP2420_EN_VLYNQ_SHIFT,</div><div class='ctx'> 	.init		= &amp;omap2_init_clksel_parent,</div><div class='hunk'>@@ -2323,6 +2444,7 @@ static struct clk sdrc_ick = {</div><div class='ctx'> 	.name		= "sdrc_ick",</div><div class='ctx'> 	.parent		= &amp;l4_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP243X | ENABLE_ON_INIT,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN3),</div><div class='ctx'> 	.enable_bit	= OMAP2430_EN_SDRC_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -2332,6 +2454,7 @@ static struct clk des_ick = {</div><div class='ctx'> 	.name		= "des_ick",</div><div class='ctx'> 	.parent		= &amp;l4_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP243X | CLOCK_IN_OMAP242X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, OMAP24XX_CM_ICLKEN4),</div><div class='ctx'> 	.enable_bit	= OMAP24XX_EN_DES_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -2341,6 +2464,7 @@ static struct clk sha_ick = {</div><div class='ctx'> 	.name		= "sha_ick",</div><div class='ctx'> 	.parent		= &amp;l4_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP243X | CLOCK_IN_OMAP242X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, OMAP24XX_CM_ICLKEN4),</div><div class='ctx'> 	.enable_bit	= OMAP24XX_EN_SHA_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -2350,6 +2474,7 @@ static struct clk rng_ick = {</div><div class='ctx'> 	.name		= "rng_ick",</div><div class='ctx'> 	.parent		= &amp;l4_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP243X | CLOCK_IN_OMAP242X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, OMAP24XX_CM_ICLKEN4),</div><div class='ctx'> 	.enable_bit	= OMAP24XX_EN_RNG_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -2359,6 +2484,7 @@ static struct clk aes_ick = {</div><div class='ctx'> 	.name		= "aes_ick",</div><div class='ctx'> 	.parent		= &amp;l4_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP243X | CLOCK_IN_OMAP242X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, OMAP24XX_CM_ICLKEN4),</div><div class='ctx'> 	.enable_bit	= OMAP24XX_EN_AES_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -2368,6 +2494,7 @@ static struct clk pka_ick = {</div><div class='ctx'> 	.name		= "pka_ick",</div><div class='ctx'> 	.parent		= &amp;l4_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP243X | CLOCK_IN_OMAP242X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, OMAP24XX_CM_ICLKEN4),</div><div class='ctx'> 	.enable_bit	= OMAP24XX_EN_PKA_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -2377,6 +2504,7 @@ static struct clk usb_fck = {</div><div class='ctx'> 	.name		= "usb_fck",</div><div class='ctx'> 	.parent		= &amp;func_48m_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP243X | CLOCK_IN_OMAP242X,</div><div class='add'>+	.clkdm_name	= "core_l3_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, OMAP24XX_CM_FCLKEN2),</div><div class='ctx'> 	.enable_bit	= OMAP24XX_EN_USB_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -2386,6 +2514,7 @@ static struct clk usbhs_ick = {</div><div class='ctx'> 	.name		= "usbhs_ick",</div><div class='ctx'> 	.parent		= &amp;core_l3_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "core_l3_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN2),</div><div class='ctx'> 	.enable_bit	= OMAP2430_EN_USBHS_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -2396,6 +2525,7 @@ static struct clk mmchs1_ick = {</div><div class='ctx'> 	.id		= 1,</div><div class='ctx'> 	.parent		= &amp;l4_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN2),</div><div class='ctx'> 	.enable_bit	= OMAP2430_EN_MMCHS1_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -2406,6 +2536,7 @@ static struct clk mmchs1_fck = {</div><div class='ctx'> 	.id		= 1,</div><div class='ctx'> 	.parent		= &amp;func_96m_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "core_l3_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, OMAP24XX_CM_FCLKEN2),</div><div class='ctx'> 	.enable_bit	= OMAP2430_EN_MMCHS1_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -2416,6 +2547,7 @@ static struct clk mmchs2_ick = {</div><div class='ctx'> 	.id		= 2,</div><div class='ctx'> 	.parent		= &amp;l4_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN2),</div><div class='ctx'> 	.enable_bit	= OMAP2430_EN_MMCHS2_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -2435,6 +2567,7 @@ static struct clk gpio5_ick = {</div><div class='ctx'> 	.name		= "gpio5_ick",</div><div class='ctx'> 	.parent		= &amp;l4_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN2),</div><div class='ctx'> 	.enable_bit	= OMAP2430_EN_GPIO5_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -2444,6 +2577,7 @@ static struct clk gpio5_fck = {</div><div class='ctx'> 	.name		= "gpio5_fck",</div><div class='ctx'> 	.parent		= &amp;func_32k_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, OMAP24XX_CM_FCLKEN2),</div><div class='ctx'> 	.enable_bit	= OMAP2430_EN_GPIO5_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -2453,6 +2587,7 @@ static struct clk mdm_intc_ick = {</div><div class='ctx'> 	.name		= "mdm_intc_ick",</div><div class='ctx'> 	.parent		= &amp;l4_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN2),</div><div class='ctx'> 	.enable_bit	= OMAP2430_EN_MDM_INTC_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -2463,6 +2598,7 @@ static struct clk mmchsdb1_fck = {</div><div class='ctx'> 	.id		= 1,</div><div class='ctx'> 	.parent		= &amp;func_32k_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, OMAP24XX_CM_FCLKEN2),</div><div class='ctx'> 	.enable_bit	= OMAP2430_EN_MMCHSDB1_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -2473,6 +2609,7 @@ static struct clk mmchsdb2_fck = {</div><div class='ctx'> 	.id		= 2,</div><div class='ctx'> 	.parent		= &amp;func_32k_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP243X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, OMAP24XX_CM_FCLKEN2),</div><div class='ctx'> 	.enable_bit	= OMAP2430_EN_MMCHSDB2_SHIFT,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='hunk'>@@ -2551,7 +2688,6 @@ static struct clk *onchip_24xx_clks[] __initdata = {</div><div class='ctx'> 	&amp;usb_l4_ick,</div><div class='ctx'> 	/* L4 domain clocks */</div><div class='ctx'> 	&amp;l4_ck,			/* used as both core_l4 and wu_l4 */</div><div class='del'>-	&amp;ssi_l4_ick,</div><div class='ctx'> 	/* virtual meta-group clock */</div><div class='ctx'> 	&amp;virt_prcm_set,</div><div class='ctx'> 	/* general l4 interface ck, multi-parent functional clk */</div><div class='head'>diff --git a/arch/arm/mach-omap2/clock34xx.c b/arch/arm/mach-omap2/clock34xx.c<br/>index 3ff74952f835..084e11082f80 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap2/clock34xx.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-omap2/clock34xx.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap2/clock34xx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/clock34xx.c</a></div><div class='hunk'>@@ -25,11 +25,11 @@</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/limits.h&gt;</div><div class='add'>+#include &lt;linux/bitops.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/clock.h&gt;</div><div class='ctx'> #include &lt;mach/sram.h&gt;</div><div class='ctx'> #include &lt;asm/div64.h&gt;</div><div class='del'>-#include &lt;asm/bitops.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "memory.h"</div><div class='ctx'> #include "clock.h"</div><div class='hunk'>@@ -62,11 +62,14 @@ static void omap3_dpll_recalc(struct clk *clk)</div><div class='ctx'> static void _omap3_dpll_write_clken(struct clk *clk, u8 clken_bits)</div><div class='ctx'> {</div><div class='ctx'> 	const struct dpll_data *dd;</div><div class='add'>+	u32 v;</div><div class='ctx'> </div><div class='ctx'> 	dd = clk-&gt;dpll_data;</div><div class='ctx'> </div><div class='del'>-	cm_rmw_reg_bits(dd-&gt;enable_mask, clken_bits &lt;&lt; __ffs(dd-&gt;enable_mask),</div><div class='del'>-			dd-&gt;control_reg);</div><div class='add'>+	v = __raw_readl(dd-&gt;control_reg);</div><div class='add'>+	v &amp;= ~dd-&gt;enable_mask;</div><div class='add'>+	v |= clken_bits &lt;&lt; __ffs(dd-&gt;enable_mask);</div><div class='add'>+	__raw_writel(v, dd-&gt;control_reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* _omap3_wait_dpll_status: wait for a DPLL to enter a specific state */</div><div class='hunk'>@@ -82,7 +85,7 @@ static int _omap3_wait_dpll_status(struct clk *clk, u8 state)</div><div class='ctx'> 	state &lt;&lt;= dd-&gt;idlest_bit;</div><div class='ctx'> 	idlest_mask = 1 &lt;&lt; dd-&gt;idlest_bit;</div><div class='ctx'> </div><div class='del'>-	while (((cm_read_reg(dd-&gt;idlest_reg) &amp; idlest_mask) != state) &amp;&amp;</div><div class='add'>+	while (((__raw_readl(dd-&gt;idlest_reg) &amp; idlest_mask) != state) &amp;&amp;</div><div class='ctx'> 	       i &lt; MAX_DPLL_WAIT_TRIES) {</div><div class='ctx'> 		i++;</div><div class='ctx'> 		udelay(1);</div><div class='hunk'>@@ -285,7 +288,7 @@ static u32 omap3_dpll_autoidle_read(struct clk *clk)</div><div class='ctx'> </div><div class='ctx'> 	dd = clk-&gt;dpll_data;</div><div class='ctx'> </div><div class='del'>-	v = cm_read_reg(dd-&gt;autoidle_reg);</div><div class='add'>+	v = __raw_readl(dd-&gt;autoidle_reg);</div><div class='ctx'> 	v &amp;= dd-&gt;autoidle_mask;</div><div class='ctx'> 	v &gt;&gt;= __ffs(dd-&gt;autoidle_mask);</div><div class='ctx'> </div><div class='hunk'>@@ -304,6 +307,7 @@ static u32 omap3_dpll_autoidle_read(struct clk *clk)</div><div class='ctx'> static void omap3_dpll_allow_idle(struct clk *clk)</div><div class='ctx'> {</div><div class='ctx'> 	const struct dpll_data *dd;</div><div class='add'>+	u32 v;</div><div class='ctx'> </div><div class='ctx'> 	if (!clk || !clk-&gt;dpll_data)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -315,9 +319,10 @@ static void omap3_dpll_allow_idle(struct clk *clk)</div><div class='ctx'> 	 * by writing 0x5 instead of 0x1.  Add some mechanism to</div><div class='ctx'> 	 * optionally enter this mode.</div><div class='ctx'> 	 */</div><div class='del'>-	cm_rmw_reg_bits(dd-&gt;autoidle_mask,</div><div class='del'>-			DPLL_AUTOIDLE_LOW_POWER_STOP &lt;&lt; __ffs(dd-&gt;autoidle_mask),</div><div class='del'>-			dd-&gt;autoidle_reg);</div><div class='add'>+	v = __raw_readl(dd-&gt;autoidle_reg);</div><div class='add'>+	v &amp;= ~dd-&gt;autoidle_mask;</div><div class='add'>+	v |= DPLL_AUTOIDLE_LOW_POWER_STOP &lt;&lt; __ffs(dd-&gt;autoidle_mask);</div><div class='add'>+	__raw_writel(v, dd-&gt;autoidle_reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -329,15 +334,17 @@ static void omap3_dpll_allow_idle(struct clk *clk)</div><div class='ctx'> static void omap3_dpll_deny_idle(struct clk *clk)</div><div class='ctx'> {</div><div class='ctx'> 	const struct dpll_data *dd;</div><div class='add'>+	u32 v;</div><div class='ctx'> </div><div class='ctx'> 	if (!clk || !clk-&gt;dpll_data)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	dd = clk-&gt;dpll_data;</div><div class='ctx'> </div><div class='del'>-	cm_rmw_reg_bits(dd-&gt;autoidle_mask,</div><div class='del'>-			DPLL_AUTOIDLE_DISABLE &lt;&lt; __ffs(dd-&gt;autoidle_mask),</div><div class='del'>-			dd-&gt;autoidle_reg);</div><div class='add'>+	v = __raw_readl(dd-&gt;autoidle_reg);</div><div class='add'>+	v &amp;= ~dd-&gt;autoidle_mask;</div><div class='add'>+	v |= DPLL_AUTOIDLE_DISABLE &lt;&lt; __ffs(dd-&gt;autoidle_mask);</div><div class='add'>+	__raw_writel(v, dd-&gt;autoidle_reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Clock control for DPLL outputs */</div><div class='hunk'>@@ -482,8 +489,10 @@ int __init omap2_clk_init(void)</div><div class='ctx'> 	for (clkp = onchip_34xx_clks;</div><div class='ctx'> 	     clkp &lt; onchip_34xx_clks + ARRAY_SIZE(onchip_34xx_clks);</div><div class='ctx'> 	     clkp++) {</div><div class='del'>-		if ((*clkp)-&gt;flags &amp; cpu_clkflg)</div><div class='add'>+		if ((*clkp)-&gt;flags &amp; cpu_clkflg) {</div><div class='ctx'> 			clk_register(*clkp);</div><div class='add'>+			omap2_init_clk_clkdm(*clkp);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* REVISIT: Not yet ready for OMAP3 */</div><div class='head'>diff --git a/arch/arm/mach-omap2/clock34xx.h b/arch/arm/mach-omap2/clock34xx.h<br/>index ec664457a11a..c38a8a09692f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap2/clock34xx.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-omap2/clock34xx.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap2/clock34xx.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/clock34xx.h</a></div><div class='hunk'>@@ -478,7 +478,7 @@ static struct clk dpll3_m2_ck = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct clksel core_ck_clksel[] = {</div><div class='del'>-	{ .parent = &amp;sys_ck,      .rates = dpll_bypass_rates },</div><div class='add'>+	{ .parent = &amp;sys_ck,	  .rates = dpll_bypass_rates },</div><div class='ctx'> 	{ .parent = &amp;dpll3_m2_ck, .rates = dpll_locked_rates },</div><div class='ctx'> 	{ .parent = NULL }</div><div class='ctx'> };</div><div class='hunk'>@@ -495,7 +495,7 @@ static struct clk core_ck = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct clksel dpll3_m2x2_ck_clksel[] = {</div><div class='del'>-	{ .parent = &amp;sys_ck,      .rates = dpll_bypass_rates },</div><div class='add'>+	{ .parent = &amp;sys_ck,	  .rates = dpll_bypass_rates },</div><div class='ctx'> 	{ .parent = &amp;dpll3_x2_ck, .rates = dpll_locked_rates },</div><div class='ctx'> 	{ .parent = NULL }</div><div class='ctx'> };</div><div class='hunk'>@@ -541,7 +541,7 @@ static struct clk dpll3_m3x2_ck = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct clksel emu_core_alwon_ck_clksel[] = {</div><div class='del'>-	{ .parent = &amp;sys_ck,        .rates = dpll_bypass_rates },</div><div class='add'>+	{ .parent = &amp;sys_ck,	    .rates = dpll_bypass_rates },</div><div class='ctx'> 	{ .parent = &amp;dpll3_m3x2_ck, .rates = dpll_locked_rates },</div><div class='ctx'> 	{ .parent = NULL }</div><div class='ctx'> };</div><div class='hunk'>@@ -633,7 +633,7 @@ static struct clk dpll4_m2x2_ck = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct clksel omap_96m_alwon_fck_clksel[] = {</div><div class='del'>-	{ .parent = &amp;sys_ck,        .rates = dpll_bypass_rates },</div><div class='add'>+	{ .parent = &amp;sys_ck,	    .rates = dpll_bypass_rates },</div><div class='ctx'> 	{ .parent = &amp;dpll4_m2x2_ck, .rates = dpll_locked_rates },</div><div class='ctx'> 	{ .parent = NULL }</div><div class='ctx'> };</div><div class='hunk'>@@ -659,7 +659,7 @@ static struct clk omap_96m_fck = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct clksel cm_96m_fck_clksel[] = {</div><div class='del'>-	{ .parent = &amp;sys_ck,        .rates = dpll_bypass_rates },</div><div class='add'>+	{ .parent = &amp;sys_ck,	    .rates = dpll_bypass_rates },</div><div class='ctx'> 	{ .parent = &amp;dpll4_m2x2_ck, .rates = dpll_locked_rates },</div><div class='ctx'> 	{ .parent = NULL }</div><div class='ctx'> };</div><div class='hunk'>@@ -701,7 +701,7 @@ static struct clk dpll4_m3x2_ck = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct clksel virt_omap_54m_fck_clksel[] = {</div><div class='del'>-	{ .parent = &amp;sys_ck,        .rates = dpll_bypass_rates },</div><div class='add'>+	{ .parent = &amp;sys_ck,	    .rates = dpll_bypass_rates },</div><div class='ctx'> 	{ .parent = &amp;dpll4_m3x2_ck, .rates = dpll_locked_rates },</div><div class='ctx'> 	{ .parent = NULL }</div><div class='ctx'> };</div><div class='hunk'>@@ -911,7 +911,7 @@ static struct clk dpll5_m2_ck = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct clksel omap_120m_fck_clksel[] = {</div><div class='del'>-	{ .parent = &amp;sys_ck,      .rates = dpll_bypass_rates },</div><div class='add'>+	{ .parent = &amp;sys_ck,	  .rates = dpll_bypass_rates },</div><div class='ctx'> 	{ .parent = &amp;dpll5_m2_ck, .rates = dpll_locked_rates },</div><div class='ctx'> 	{ .parent = NULL }</div><div class='ctx'> };</div><div class='hunk'>@@ -919,13 +919,13 @@ static const struct clksel omap_120m_fck_clksel[] = {</div><div class='ctx'> static struct clk omap_120m_fck = {</div><div class='ctx'> 	.name		= "omap_120m_fck",</div><div class='ctx'> 	.parent		= &amp;dpll5_m2_ck,</div><div class='del'>-	.init           = &amp;omap2_init_clksel_parent,</div><div class='del'>-	.clksel_reg     = OMAP_CM_REGADDR(PLL_MOD, CM_IDLEST2),</div><div class='del'>-	.clksel_mask    = OMAP3430ES2_ST_PERIPH2_CLK_MASK,</div><div class='del'>-	.clksel         = omap_120m_fck_clksel,</div><div class='add'>+	.init		= &amp;omap2_init_clksel_parent,</div><div class='add'>+	.clksel_reg	= OMAP_CM_REGADDR(PLL_MOD, CM_IDLEST2),</div><div class='add'>+	.clksel_mask	= OMAP3430ES2_ST_PERIPH2_CLK_MASK,</div><div class='add'>+	.clksel		= omap_120m_fck_clksel,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP3430ES2 | RATE_PROPAGATES |</div><div class='ctx'> 				PARENT_CONTROLS_CLOCK,</div><div class='del'>-	.recalc         = &amp;omap2_clksel_recalc,</div><div class='add'>+	.recalc		= &amp;omap2_clksel_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* CM EXTERNAL CLOCK OUTPUTS */</div><div class='hunk'>@@ -1034,7 +1034,7 @@ static struct clk dpll1_fck = {</div><div class='ctx'>  * called 'dpll1_fck'</div><div class='ctx'>  */</div><div class='ctx'> static const struct clksel mpu_clksel[] = {</div><div class='del'>-	{ .parent = &amp;dpll1_fck,     .rates = dpll_bypass_rates },</div><div class='add'>+	{ .parent = &amp;dpll1_fck,	    .rates = dpll_bypass_rates },</div><div class='ctx'> 	{ .parent = &amp;dpll1_x2m2_ck, .rates = dpll_locked_rates },</div><div class='ctx'> 	{ .parent = NULL }</div><div class='ctx'> };</div><div class='hunk'>@@ -1048,6 +1048,7 @@ static struct clk mpu_ck = {</div><div class='ctx'> 	.clksel		= mpu_clksel,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X | RATE_PROPAGATES |</div><div class='ctx'> 				PARENT_CONTROLS_CLOCK,</div><div class='add'>+	.clkdm_name	= "mpu_clkdm",</div><div class='ctx'> 	.recalc		= &amp;omap2_clksel_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1075,6 +1076,8 @@ static struct clk arm_fck = {</div><div class='ctx'> 	.recalc		= &amp;omap2_clksel_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* XXX What about neon_clkdm ? */</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * REVISIT: This clock is never specifically defined in the 3430 TRM,</div><div class='ctx'>  * although it is referenced - so this is a guess</div><div class='hunk'>@@ -1107,7 +1110,7 @@ static struct clk dpll2_fck = {</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static const struct clksel iva2_clksel[] = {</div><div class='del'>-	{ .parent = &amp;dpll2_fck,   .rates = dpll_bypass_rates },</div><div class='add'>+	{ .parent = &amp;dpll2_fck,	  .rates = dpll_bypass_rates },</div><div class='ctx'> 	{ .parent = &amp;dpll2_m2_ck, .rates = dpll_locked_rates },</div><div class='ctx'> 	{ .parent = NULL }</div><div class='ctx'> };</div><div class='hunk'>@@ -1123,6 +1126,7 @@ static struct clk iva2_ck = {</div><div class='ctx'> 	.clksel_mask	= OMAP3430_ST_IVA2_CLK_MASK,</div><div class='ctx'> 	.clksel		= iva2_clksel,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X | RATE_PROPAGATES,</div><div class='add'>+	.clkdm_name	= "iva2_clkdm",</div><div class='ctx'> 	.recalc		= &amp;omap2_clksel_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1137,6 +1141,7 @@ static struct clk l3_ick = {</div><div class='ctx'> 	.clksel		= div2_core_clksel,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X | RATE_PROPAGATES |</div><div class='ctx'> 				PARENT_CONTROLS_CLOCK,</div><div class='add'>+	.clkdm_name	= "core_l3_clkdm",</div><div class='ctx'> 	.recalc		= &amp;omap2_clksel_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1154,6 +1159,7 @@ static struct clk l4_ick = {</div><div class='ctx'> 	.clksel		= div2_l3_clksel,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X | RATE_PROPAGATES |</div><div class='ctx'> 				PARENT_CONTROLS_CLOCK,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.recalc		= &amp;omap2_clksel_recalc,</div><div class='ctx'> </div><div class='ctx'> };</div><div class='hunk'>@@ -1183,43 +1189,57 @@ static const struct clksel gfx_l3_clksel[] = {</div><div class='ctx'> 	{ .parent = NULL }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct clk gfx_l3_fck = {</div><div class='del'>-	.name		= "gfx_l3_fck",</div><div class='add'>+/* Virtual parent clock for gfx_l3_ick and gfx_l3_fck */</div><div class='add'>+static struct clk gfx_l3_ck = {</div><div class='add'>+	.name		= "gfx_l3_ck",</div><div class='ctx'> 	.parent		= &amp;l3_ick,</div><div class='ctx'> 	.init		= &amp;omap2_init_clksel_parent,</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(GFX_MOD, CM_ICLKEN),</div><div class='ctx'> 	.enable_bit	= OMAP_EN_GFX_SHIFT,</div><div class='add'>+	.flags		= CLOCK_IN_OMAP3430ES1,</div><div class='add'>+	.recalc		= &amp;followparent_recalc,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk gfx_l3_fck = {</div><div class='add'>+	.name		= "gfx_l3_fck",</div><div class='add'>+	.parent		= &amp;gfx_l3_ck,</div><div class='add'>+	.init		= &amp;omap2_init_clksel_parent,</div><div class='ctx'> 	.clksel_reg	= OMAP_CM_REGADDR(GFX_MOD, CM_CLKSEL),</div><div class='ctx'> 	.clksel_mask	= OMAP_CLKSEL_GFX_MASK,</div><div class='ctx'> 	.clksel		= gfx_l3_clksel,</div><div class='del'>-	.flags		= CLOCK_IN_OMAP3430ES1 | RATE_PROPAGATES,</div><div class='add'>+	.flags		= CLOCK_IN_OMAP3430ES1 | RATE_PROPAGATES |</div><div class='add'>+				PARENT_CONTROLS_CLOCK,</div><div class='add'>+	.clkdm_name	= "gfx_3430es1_clkdm",</div><div class='ctx'> 	.recalc		= &amp;omap2_clksel_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct clk gfx_l3_ick = {</div><div class='ctx'> 	.name		= "gfx_l3_ick",</div><div class='del'>-	.parent		= &amp;l3_ick,</div><div class='del'>-	.enable_reg	= OMAP_CM_REGADDR(GFX_MOD, CM_ICLKEN),</div><div class='del'>-	.enable_bit	= OMAP_EN_GFX_SHIFT,</div><div class='del'>-	.flags		= CLOCK_IN_OMAP3430ES1,</div><div class='add'>+	.parent		= &amp;gfx_l3_ck,</div><div class='add'>+	.flags		= CLOCK_IN_OMAP3430ES1 | PARENT_CONTROLS_CLOCK,</div><div class='add'>+	.clkdm_name	= "gfx_3430es1_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct clk gfx_cg1_ck = {</div><div class='ctx'> 	.name		= "gfx_cg1_ck",</div><div class='ctx'> 	.parent		= &amp;gfx_l3_fck, /* REVISIT: correct? */</div><div class='add'>+	.init		= &amp;omap2_init_clk_clkdm,</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(GFX_MOD, CM_FCLKEN),</div><div class='ctx'> 	.enable_bit	= OMAP3430ES1_EN_2D_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP3430ES1,</div><div class='add'>+	.clkdm_name	= "gfx_3430es1_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct clk gfx_cg2_ck = {</div><div class='ctx'> 	.name		= "gfx_cg2_ck",</div><div class='ctx'> 	.parent		= &amp;gfx_l3_fck, /* REVISIT: correct? */</div><div class='add'>+	.init		= &amp;omap2_init_clk_clkdm,</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(GFX_MOD, CM_FCLKEN),</div><div class='ctx'> 	.enable_bit	= OMAP3430ES1_EN_3D_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP3430ES1,</div><div class='add'>+	.clkdm_name	= "gfx_3430es1_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1252,15 +1272,18 @@ static struct clk sgx_fck = {</div><div class='ctx'> 	.clksel_mask	= OMAP3430ES2_CLKSEL_SGX_MASK,</div><div class='ctx'> 	.clksel		= sgx_clksel,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP3430ES2,</div><div class='add'>+	.clkdm_name	= "sgx_clkdm",</div><div class='ctx'> 	.recalc		= &amp;omap2_clksel_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct clk sgx_ick = {</div><div class='ctx'> 	.name		= "sgx_ick",</div><div class='ctx'> 	.parent		= &amp;l3_ick,</div><div class='add'>+	.init		= &amp;omap2_init_clk_clkdm,</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(OMAP3430ES2_SGX_MOD, CM_ICLKEN),</div><div class='ctx'> 	.enable_bit	= OMAP3430ES2_EN_SGX_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP3430ES2,</div><div class='add'>+	.clkdm_name	= "sgx_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1269,9 +1292,11 @@ static struct clk sgx_ick = {</div><div class='ctx'> static struct clk d2d_26m_fck = {</div><div class='ctx'> 	.name		= "d2d_26m_fck",</div><div class='ctx'> 	.parent		= &amp;sys_ck,</div><div class='add'>+	.init		= &amp;omap2_init_clk_clkdm,</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP3430ES1_EN_D2D_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP3430ES1,</div><div class='add'>+	.clkdm_name	= "d2d_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1291,6 +1316,7 @@ static struct clk gpt10_fck = {</div><div class='ctx'> 	.clksel_mask	= OMAP3430_CLKSEL_GPT10_MASK,</div><div class='ctx'> 	.clksel		= omap343x_gpt_clksel,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.recalc		= &amp;omap2_clksel_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1304,6 +1330,7 @@ static struct clk gpt11_fck = {</div><div class='ctx'> 	.clksel_mask	= OMAP3430_CLKSEL_GPT11_MASK,</div><div class='ctx'> 	.clksel		= omap343x_gpt_clksel,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.recalc		= &amp;omap2_clksel_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1341,6 +1368,7 @@ static struct clk core_96m_fck = {</div><div class='ctx'> 	.parent		= &amp;omap_96m_fck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X | RATE_PROPAGATES |</div><div class='ctx'> 				PARENT_CONTROLS_CLOCK,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1351,6 +1379,7 @@ static struct clk mmchs3_fck = {</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP3430ES2_EN_MMC3_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP3430ES2,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1361,6 +1390,7 @@ static struct clk mmchs2_fck = {</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP3430_EN_MMC2_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1370,6 +1400,7 @@ static struct clk mspro_fck = {</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP3430_EN_MSPRO_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1380,6 +1411,7 @@ static struct clk mmchs1_fck = {</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP3430_EN_MMC1_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1390,16 +1422,18 @@ static struct clk i2c3_fck = {</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP3430_EN_I2C3_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct clk i2c2_fck = {</div><div class='ctx'> 	.name		= "i2c_fck",</div><div class='del'>-	.id 		= 2,</div><div class='add'>+	.id		= 2,</div><div class='ctx'> 	.parent		= &amp;core_96m_fck,</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP3430_EN_I2C2_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1410,6 +1444,7 @@ static struct clk i2c1_fck = {</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP3430_EN_I2C1_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1443,6 +1478,7 @@ static struct clk mcbsp5_fck = {</div><div class='ctx'> 	.clksel_mask	= OMAP2_MCBSP5_CLKS_MASK,</div><div class='ctx'> 	.clksel		= mcbsp_15_clksel,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.recalc		= &amp;omap2_clksel_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1456,6 +1492,7 @@ static struct clk mcbsp1_fck = {</div><div class='ctx'> 	.clksel_mask	= OMAP2_MCBSP1_CLKS_MASK,</div><div class='ctx'> 	.clksel		= mcbsp_15_clksel,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.recalc		= &amp;omap2_clksel_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1466,6 +1503,7 @@ static struct clk core_48m_fck = {</div><div class='ctx'> 	.parent		= &amp;omap_48m_fck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X | RATE_PROPAGATES |</div><div class='ctx'> 				PARENT_CONTROLS_CLOCK,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1543,6 +1581,7 @@ static struct clk core_12m_fck = {</div><div class='ctx'> 	.parent		= &amp;omap_12m_fck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X | RATE_PROPAGATES |</div><div class='ctx'> 				PARENT_CONTROLS_CLOCK,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1581,6 +1620,7 @@ static struct clk ssi_ssr_fck = {</div><div class='ctx'> 	.clksel_mask	= OMAP3430_CLKSEL_SSI_MASK,</div><div class='ctx'> 	.clksel		= ssi_ssr_clksel,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X | RATE_PROPAGATES,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.recalc		= &amp;omap2_clksel_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1596,11 +1636,17 @@ static struct clk ssi_sst_fck = {</div><div class='ctx'> </div><div class='ctx'> /* CORE_L3_ICK based clocks */</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * XXX must add clk_enable/clk_disable for these if standard code won't</div><div class='add'>+ * handle it</div><div class='add'>+ */</div><div class='ctx'> static struct clk core_l3_ick = {</div><div class='ctx'> 	.name		= "core_l3_ick",</div><div class='ctx'> 	.parent		= &amp;l3_ick,</div><div class='add'>+	.init		= &amp;omap2_init_clk_clkdm,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X | RATE_PROPAGATES |</div><div class='ctx'> 				PARENT_CONTROLS_CLOCK,</div><div class='add'>+	.clkdm_name	= "core_l3_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1610,6 +1656,7 @@ static struct clk hsotgusb_ick = {</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP3430_EN_HSOTGUSB_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "core_l3_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1619,6 +1666,7 @@ static struct clk sdrc_ick = {</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP3430_EN_SDRC_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X | ENABLE_ON_INIT,</div><div class='add'>+	.clkdm_name	= "core_l3_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1627,6 +1675,7 @@ static struct clk gpmc_fck = {</div><div class='ctx'> 	.parent		= &amp;core_l3_ick,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X | PARENT_CONTROLS_CLOCK |</div><div class='ctx'> 				ENABLE_ON_INIT,</div><div class='add'>+	.clkdm_name	= "core_l3_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1654,8 +1703,10 @@ static struct clk pka_ick = {</div><div class='ctx'> static struct clk core_l4_ick = {</div><div class='ctx'> 	.name		= "core_l4_ick",</div><div class='ctx'> 	.parent		= &amp;l4_ick,</div><div class='add'>+	.init		= &amp;omap2_init_clk_clkdm,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X | RATE_PROPAGATES |</div><div class='ctx'> 				PARENT_CONTROLS_CLOCK,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1665,6 +1716,7 @@ static struct clk usbtll_ick = {</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN3),</div><div class='ctx'> 	.enable_bit	= OMAP3430ES2_EN_USBTLL_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP3430ES2,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1675,6 +1727,7 @@ static struct clk mmchs3_ick = {</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP3430ES2_EN_MMC3_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP3430ES2,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1685,6 +1738,7 @@ static struct clk icr_ick = {</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP3430_EN_ICR_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1694,6 +1748,7 @@ static struct clk aes2_ick = {</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP3430_EN_AES2_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1703,6 +1758,7 @@ static struct clk sha12_ick = {</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP3430_EN_SHA12_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1712,6 +1768,7 @@ static struct clk des2_ick = {</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP3430_EN_DES2_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1722,6 +1779,7 @@ static struct clk mmchs2_ick = {</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP3430_EN_MMC2_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1732,6 +1790,7 @@ static struct clk mmchs1_ick = {</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP3430_EN_MMC1_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1741,6 +1800,7 @@ static struct clk mspro_ick = {</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP3430_EN_MSPRO_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1750,6 +1810,7 @@ static struct clk hdq_ick = {</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP3430_EN_HDQ_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1760,6 +1821,7 @@ static struct clk mcspi4_ick = {</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP3430_EN_MCSPI4_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1770,6 +1832,7 @@ static struct clk mcspi3_ick = {</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP3430_EN_MCSPI3_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1780,6 +1843,7 @@ static struct clk mcspi2_ick = {</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP3430_EN_MCSPI2_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1790,6 +1854,7 @@ static struct clk mcspi1_ick = {</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP3430_EN_MCSPI1_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1800,6 +1865,7 @@ static struct clk i2c3_ick = {</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP3430_EN_I2C3_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1810,6 +1876,7 @@ static struct clk i2c2_ick = {</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP3430_EN_I2C2_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1820,6 +1887,7 @@ static struct clk i2c1_ick = {</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP3430_EN_I2C1_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1829,6 +1897,7 @@ static struct clk uart2_ick = {</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP3430_EN_UART2_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1838,6 +1907,7 @@ static struct clk uart1_ick = {</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP3430_EN_UART1_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1847,6 +1917,7 @@ static struct clk gpt11_ick = {</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP3430_EN_GPT11_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1856,6 +1927,7 @@ static struct clk gpt10_ick = {</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP3430_EN_GPT10_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1866,6 +1938,7 @@ static struct clk mcbsp5_ick = {</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP3430_EN_MCBSP5_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1876,6 +1949,7 @@ static struct clk mcbsp1_ick = {</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP3430_EN_MCBSP1_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1885,6 +1959,7 @@ static struct clk fac_ick = {</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP3430ES1_EN_FAC_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP3430ES1,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1894,6 +1969,7 @@ static struct clk mailboxes_ick = {</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP3430_EN_MAILBOXES_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1913,6 +1989,7 @@ static struct clk ssi_l4_ick = {</div><div class='ctx'> 	.parent		= &amp;l4_ick,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X | RATE_PROPAGATES |</div><div class='ctx'> 				PARENT_CONTROLS_CLOCK,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1922,6 +1999,7 @@ static struct clk ssi_ick = {</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),</div><div class='ctx'> 	.enable_bit	= OMAP3430_EN_SSI_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1996,7 +2074,7 @@ static struct clk des1_ick = {</div><div class='ctx'> </div><div class='ctx'> /* DSS */</div><div class='ctx'> static const struct clksel dss1_alwon_fck_clksel[] = {</div><div class='del'>-	{ .parent = &amp;sys_ck,        .rates = dpll_bypass_rates },</div><div class='add'>+	{ .parent = &amp;sys_ck,	    .rates = dpll_bypass_rates },</div><div class='ctx'> 	{ .parent = &amp;dpll4_m4x2_ck, .rates = dpll_locked_rates },</div><div class='ctx'> 	{ .parent = NULL }</div><div class='ctx'> };</div><div class='hunk'>@@ -2011,33 +2089,40 @@ static struct clk dss1_alwon_fck = {</div><div class='ctx'> 	.clksel_mask	= OMAP3430_ST_PERIPH_CLK_MASK,</div><div class='ctx'> 	.clksel		= dss1_alwon_fck_clksel,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "dss_clkdm",</div><div class='ctx'> 	.recalc		= &amp;omap2_clksel_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct clk dss_tv_fck = {</div><div class='ctx'> 	.name		= "dss_tv_fck",</div><div class='ctx'> 	.parent		= &amp;omap_54m_fck,</div><div class='add'>+	.init		= &amp;omap2_init_clk_clkdm,</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(OMAP3430_DSS_MOD, CM_FCLKEN),</div><div class='ctx'> 	.enable_bit	= OMAP3430_EN_TV_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "dss_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct clk dss_96m_fck = {</div><div class='ctx'> 	.name		= "dss_96m_fck",</div><div class='ctx'> 	.parent		= &amp;omap_96m_fck,</div><div class='add'>+	.init		= &amp;omap2_init_clk_clkdm,</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(OMAP3430_DSS_MOD, CM_FCLKEN),</div><div class='ctx'> 	.enable_bit	= OMAP3430_EN_TV_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "dss_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct clk dss2_alwon_fck = {</div><div class='ctx'> 	.name		= "dss2_alwon_fck",</div><div class='ctx'> 	.parent		= &amp;sys_ck,</div><div class='add'>+	.init		= &amp;omap2_init_clk_clkdm,</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(OMAP3430_DSS_MOD, CM_FCLKEN),</div><div class='ctx'> 	.enable_bit	= OMAP3430_EN_DSS2_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "dss_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2045,16 +2130,18 @@ static struct clk dss_ick = {</div><div class='ctx'> 	/* Handles both L3 and L4 clocks */</div><div class='ctx'> 	.name		= "dss_ick",</div><div class='ctx'> 	.parent		= &amp;l4_ick,</div><div class='add'>+	.init		= &amp;omap2_init_clk_clkdm,</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(OMAP3430_DSS_MOD, CM_ICLKEN),</div><div class='ctx'> 	.enable_bit	= OMAP3430_CM_ICLKEN_DSS_EN_DSS_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "dss_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* CAM */</div><div class='ctx'> </div><div class='ctx'> static const struct clksel cam_mclk_clksel[] = {</div><div class='del'>-	{ .parent = &amp;sys_ck,        .rates = dpll_bypass_rates },</div><div class='add'>+	{ .parent = &amp;sys_ck,	    .rates = dpll_bypass_rates },</div><div class='ctx'> 	{ .parent = &amp;dpll4_m5x2_ck, .rates = dpll_locked_rates },</div><div class='ctx'> 	{ .parent = NULL }</div><div class='ctx'> };</div><div class='hunk'>@@ -2069,24 +2156,19 @@ static struct clk cam_mclk = {</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(OMAP3430_CAM_MOD, CM_FCLKEN),</div><div class='ctx'> 	.enable_bit	= OMAP3430_EN_CAM_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "cam_clkdm",</div><div class='ctx'> 	.recalc		= &amp;omap2_clksel_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct clk cam_l3_ick = {</div><div class='del'>-	.name		= "cam_l3_ick",</div><div class='del'>-	.parent		= &amp;l3_ick,</div><div class='del'>-	.enable_reg	= OMAP_CM_REGADDR(OMAP3430_CAM_MOD, CM_ICLKEN),</div><div class='del'>-	.enable_bit	= OMAP3430_EN_CAM_SHIFT,</div><div class='del'>-	.flags		= CLOCK_IN_OMAP343X,</div><div class='del'>-	.recalc		= &amp;followparent_recalc,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct clk cam_l4_ick = {</div><div class='del'>-	.name		= "cam_l4_ick",</div><div class='add'>+static struct clk cam_ick = {</div><div class='add'>+	/* Handles both L3 and L4 clocks */</div><div class='add'>+	.name		= "cam_ick",</div><div class='ctx'> 	.parent		= &amp;l4_ick,</div><div class='add'>+	.init		= &amp;omap2_init_clk_clkdm,</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(OMAP3430_CAM_MOD, CM_ICLKEN),</div><div class='ctx'> 	.enable_bit	= OMAP3430_EN_CAM_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "cam_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2095,45 +2177,45 @@ static struct clk cam_l4_ick = {</div><div class='ctx'> static struct clk usbhost_120m_fck = {</div><div class='ctx'> 	.name		= "usbhost_120m_fck",</div><div class='ctx'> 	.parent		= &amp;omap_120m_fck,</div><div class='add'>+	.init		= &amp;omap2_init_clk_clkdm,</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(OMAP3430ES2_USBHOST_MOD, CM_FCLKEN),</div><div class='ctx'> 	.enable_bit	= OMAP3430ES2_EN_USBHOST2_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP3430ES2,</div><div class='add'>+	.clkdm_name	= "usbhost_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct clk usbhost_48m_fck = {</div><div class='ctx'> 	.name		= "usbhost_48m_fck",</div><div class='ctx'> 	.parent		= &amp;omap_48m_fck,</div><div class='add'>+	.init		= &amp;omap2_init_clk_clkdm,</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(OMAP3430ES2_USBHOST_MOD, CM_FCLKEN),</div><div class='ctx'> 	.enable_bit	= OMAP3430ES2_EN_USBHOST1_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP3430ES2,</div><div class='add'>+	.clkdm_name	= "usbhost_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct clk usbhost_l3_ick = {</div><div class='del'>-	.name		= "usbhost_l3_ick",</div><div class='del'>-	.parent		= &amp;l3_ick,</div><div class='del'>-	.enable_reg	= OMAP_CM_REGADDR(OMAP3430ES2_USBHOST_MOD, CM_ICLKEN),</div><div class='del'>-	.enable_bit	= OMAP3430ES2_EN_USBHOST_SHIFT,</div><div class='del'>-	.flags		= CLOCK_IN_OMAP3430ES2,</div><div class='del'>-	.recalc		= &amp;followparent_recalc,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct clk usbhost_l4_ick = {</div><div class='del'>-	.name		= "usbhost_l4_ick",</div><div class='add'>+static struct clk usbhost_ick = {</div><div class='add'>+	/* Handles both L3 and L4 clocks */</div><div class='add'>+	.name		= "usbhost_ick",</div><div class='ctx'> 	.parent		= &amp;l4_ick,</div><div class='add'>+	.init		= &amp;omap2_init_clk_clkdm,</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(OMAP3430ES2_USBHOST_MOD, CM_ICLKEN),</div><div class='ctx'> 	.enable_bit	= OMAP3430ES2_EN_USBHOST_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP3430ES2,</div><div class='add'>+	.clkdm_name	= "usbhost_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct clk usbhost_sar_fck = {</div><div class='ctx'> 	.name		= "usbhost_sar_fck",</div><div class='ctx'> 	.parent		= &amp;osc_sys_ck,</div><div class='add'>+	.init		= &amp;omap2_init_clk_clkdm,</div><div class='ctx'> 	.enable_reg	= OMAP_PRM_REGADDR(OMAP3430ES2_USBHOST_MOD, PM_PWSTCTRL),</div><div class='ctx'> 	.enable_bit	= OMAP3430ES2_SAVEANDRESTORE_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP3430ES2,</div><div class='add'>+	.clkdm_name	= "usbhost_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2175,6 +2257,7 @@ static struct clk usim_fck = {</div><div class='ctx'> 	.recalc		= &amp;omap2_clksel_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* XXX should gpt1's clksel have wkup_32k_fck as the 32k opt? */</div><div class='ctx'> static struct clk gpt1_fck = {</div><div class='ctx'> 	.name		= "gpt1_fck",</div><div class='ctx'> 	.init		= &amp;omap2_init_clksel_parent,</div><div class='hunk'>@@ -2184,13 +2267,16 @@ static struct clk gpt1_fck = {</div><div class='ctx'> 	.clksel_mask	= OMAP3430_CLKSEL_GPT1_MASK,</div><div class='ctx'> 	.clksel		= omap343x_gpt_clksel,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "wkup_clkdm",</div><div class='ctx'> 	.recalc		= &amp;omap2_clksel_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct clk wkup_32k_fck = {</div><div class='ctx'> 	.name		= "wkup_32k_fck",</div><div class='add'>+	.init		= &amp;omap2_init_clk_clkdm,</div><div class='ctx'> 	.parent		= &amp;omap_32k_fck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X | RATE_PROPAGATES | ALWAYS_ENABLED,</div><div class='add'>+	.clkdm_name	= "wkup_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2200,6 +2286,7 @@ static struct clk gpio1_fck = {</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(WKUP_MOD, CM_FCLKEN),</div><div class='ctx'> 	.enable_bit	= OMAP3430_EN_GPIO1_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "wkup_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2209,6 +2296,7 @@ static struct clk wdt2_fck = {</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(WKUP_MOD, CM_FCLKEN),</div><div class='ctx'> 	.enable_bit	= OMAP3430_EN_WDT2_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "wkup_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2216,6 +2304,7 @@ static struct clk wkup_l4_ick = {</div><div class='ctx'> 	.name		= "wkup_l4_ick",</div><div class='ctx'> 	.parent		= &amp;sys_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X | RATE_PROPAGATES | ALWAYS_ENABLED,</div><div class='add'>+	.clkdm_name	= "wkup_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2227,6 +2316,7 @@ static struct clk usim_ick = {</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(WKUP_MOD, CM_ICLKEN),</div><div class='ctx'> 	.enable_bit	= OMAP3430ES2_EN_USIMOCP_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP3430ES2,</div><div class='add'>+	.clkdm_name	= "wkup_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2236,6 +2326,7 @@ static struct clk wdt2_ick = {</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(WKUP_MOD, CM_ICLKEN),</div><div class='ctx'> 	.enable_bit	= OMAP3430_EN_WDT2_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "wkup_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2245,6 +2336,7 @@ static struct clk wdt1_ick = {</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(WKUP_MOD, CM_ICLKEN),</div><div class='ctx'> 	.enable_bit	= OMAP3430_EN_WDT1_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "wkup_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2254,6 +2346,7 @@ static struct clk gpio1_ick = {</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(WKUP_MOD, CM_ICLKEN),</div><div class='ctx'> 	.enable_bit	= OMAP3430_EN_GPIO1_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "wkup_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2263,15 +2356,18 @@ static struct clk omap_32ksync_ick = {</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(WKUP_MOD, CM_ICLKEN),</div><div class='ctx'> 	.enable_bit	= OMAP3430_EN_32KSYNC_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "wkup_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* XXX This clock no longer exists in 3430 TRM rev F */</div><div class='ctx'> static struct clk gpt12_ick = {</div><div class='ctx'> 	.name		= "gpt12_ick",</div><div class='ctx'> 	.parent		= &amp;wkup_l4_ick,</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(WKUP_MOD, CM_ICLKEN),</div><div class='ctx'> 	.enable_bit	= OMAP3430_EN_GPT12_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "wkup_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2281,6 +2377,7 @@ static struct clk gpt1_ick = {</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(WKUP_MOD, CM_ICLKEN),</div><div class='ctx'> 	.enable_bit	= OMAP3430_EN_GPT1_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "wkup_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2291,16 +2388,20 @@ static struct clk gpt1_ick = {</div><div class='ctx'> static struct clk per_96m_fck = {</div><div class='ctx'> 	.name		= "per_96m_fck",</div><div class='ctx'> 	.parent		= &amp;omap_96m_alwon_fck,</div><div class='add'>+	.init		= &amp;omap2_init_clk_clkdm,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X | RATE_PROPAGATES |</div><div class='ctx'> 				PARENT_CONTROLS_CLOCK,</div><div class='add'>+	.clkdm_name	= "per_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct clk per_48m_fck = {</div><div class='ctx'> 	.name		= "per_48m_fck",</div><div class='ctx'> 	.parent		= &amp;omap_48m_fck,</div><div class='add'>+	.init		= &amp;omap2_init_clk_clkdm,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X | RATE_PROPAGATES |</div><div class='ctx'> 				PARENT_CONTROLS_CLOCK,</div><div class='add'>+	.clkdm_name	= "per_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2310,6 +2411,7 @@ static struct clk uart3_fck = {</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(OMAP3430_PER_MOD, CM_FCLKEN),</div><div class='ctx'> 	.enable_bit	= OMAP3430_EN_UART3_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "per_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2322,6 +2424,7 @@ static struct clk gpt2_fck = {</div><div class='ctx'> 	.clksel_mask	= OMAP3430_CLKSEL_GPT2_MASK,</div><div class='ctx'> 	.clksel		= omap343x_gpt_clksel,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "per_clkdm",</div><div class='ctx'> 	.recalc		= &amp;omap2_clksel_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2334,6 +2437,7 @@ static struct clk gpt3_fck = {</div><div class='ctx'> 	.clksel_mask	= OMAP3430_CLKSEL_GPT3_MASK,</div><div class='ctx'> 	.clksel		= omap343x_gpt_clksel,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "per_clkdm",</div><div class='ctx'> 	.recalc		= &amp;omap2_clksel_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2346,6 +2450,7 @@ static struct clk gpt4_fck = {</div><div class='ctx'> 	.clksel_mask	= OMAP3430_CLKSEL_GPT4_MASK,</div><div class='ctx'> 	.clksel		= omap343x_gpt_clksel,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "per_clkdm",</div><div class='ctx'> 	.recalc		= &amp;omap2_clksel_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2358,6 +2463,7 @@ static struct clk gpt5_fck = {</div><div class='ctx'> 	.clksel_mask	= OMAP3430_CLKSEL_GPT5_MASK,</div><div class='ctx'> 	.clksel		= omap343x_gpt_clksel,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "per_clkdm",</div><div class='ctx'> 	.recalc		= &amp;omap2_clksel_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2370,6 +2476,7 @@ static struct clk gpt6_fck = {</div><div class='ctx'> 	.clksel_mask	= OMAP3430_CLKSEL_GPT6_MASK,</div><div class='ctx'> 	.clksel		= omap343x_gpt_clksel,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "per_clkdm",</div><div class='ctx'> 	.recalc		= &amp;omap2_clksel_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2382,6 +2489,7 @@ static struct clk gpt7_fck = {</div><div class='ctx'> 	.clksel_mask	= OMAP3430_CLKSEL_GPT7_MASK,</div><div class='ctx'> 	.clksel		= omap343x_gpt_clksel,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "per_clkdm",</div><div class='ctx'> 	.recalc		= &amp;omap2_clksel_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2394,6 +2502,7 @@ static struct clk gpt8_fck = {</div><div class='ctx'> 	.clksel_mask	= OMAP3430_CLKSEL_GPT8_MASK,</div><div class='ctx'> 	.clksel		= omap343x_gpt_clksel,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "per_clkdm",</div><div class='ctx'> 	.recalc		= &amp;omap2_clksel_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2406,12 +2515,14 @@ static struct clk gpt9_fck = {</div><div class='ctx'> 	.clksel_mask	= OMAP3430_CLKSEL_GPT9_MASK,</div><div class='ctx'> 	.clksel		= omap343x_gpt_clksel,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "per_clkdm",</div><div class='ctx'> 	.recalc		= &amp;omap2_clksel_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct clk per_32k_alwon_fck = {</div><div class='ctx'> 	.name		= "per_32k_alwon_fck",</div><div class='ctx'> 	.parent		= &amp;omap_32k_fck,</div><div class='add'>+	.clkdm_name	= "per_clkdm",</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X | RATE_PROPAGATES | ALWAYS_ENABLED,</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='hunk'>@@ -2422,6 +2533,7 @@ static struct clk gpio6_fck = {</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(OMAP3430_PER_MOD, CM_FCLKEN),</div><div class='ctx'> 	.enable_bit	= OMAP3430_EN_GPIO6_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "per_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2431,6 +2543,7 @@ static struct clk gpio5_fck = {</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(OMAP3430_PER_MOD, CM_FCLKEN),</div><div class='ctx'> 	.enable_bit	= OMAP3430_EN_GPIO5_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "per_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2440,6 +2553,7 @@ static struct clk gpio4_fck = {</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(OMAP3430_PER_MOD, CM_FCLKEN),</div><div class='ctx'> 	.enable_bit	= OMAP3430_EN_GPIO4_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "per_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2449,6 +2563,7 @@ static struct clk gpio3_fck = {</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(OMAP3430_PER_MOD, CM_FCLKEN),</div><div class='ctx'> 	.enable_bit	= OMAP3430_EN_GPIO3_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "per_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2458,6 +2573,7 @@ static struct clk gpio2_fck = {</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(OMAP3430_PER_MOD, CM_FCLKEN),</div><div class='ctx'> 	.enable_bit	= OMAP3430_EN_GPIO2_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "per_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2467,6 +2583,7 @@ static struct clk wdt3_fck = {</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(OMAP3430_PER_MOD, CM_FCLKEN),</div><div class='ctx'> 	.enable_bit	= OMAP3430_EN_WDT3_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "per_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2475,6 +2592,7 @@ static struct clk per_l4_ick = {</div><div class='ctx'> 	.parent		= &amp;l4_ick,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X | RATE_PROPAGATES |</div><div class='ctx'> 				PARENT_CONTROLS_CLOCK,</div><div class='add'>+	.clkdm_name	= "per_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2484,6 +2602,7 @@ static struct clk gpio6_ick = {</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(OMAP3430_PER_MOD, CM_ICLKEN),</div><div class='ctx'> 	.enable_bit	= OMAP3430_EN_GPIO6_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "per_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2493,6 +2612,7 @@ static struct clk gpio5_ick = {</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(OMAP3430_PER_MOD, CM_ICLKEN),</div><div class='ctx'> 	.enable_bit	= OMAP3430_EN_GPIO5_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "per_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2502,6 +2622,7 @@ static struct clk gpio4_ick = {</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(OMAP3430_PER_MOD, CM_ICLKEN),</div><div class='ctx'> 	.enable_bit	= OMAP3430_EN_GPIO4_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "per_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2511,6 +2632,7 @@ static struct clk gpio3_ick = {</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(OMAP3430_PER_MOD, CM_ICLKEN),</div><div class='ctx'> 	.enable_bit	= OMAP3430_EN_GPIO3_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "per_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2520,6 +2642,7 @@ static struct clk gpio2_ick = {</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(OMAP3430_PER_MOD, CM_ICLKEN),</div><div class='ctx'> 	.enable_bit	= OMAP3430_EN_GPIO2_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "per_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2529,6 +2652,7 @@ static struct clk wdt3_ick = {</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(OMAP3430_PER_MOD, CM_ICLKEN),</div><div class='ctx'> 	.enable_bit	= OMAP3430_EN_WDT3_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "per_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2538,6 +2662,7 @@ static struct clk uart3_ick = {</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(OMAP3430_PER_MOD, CM_ICLKEN),</div><div class='ctx'> 	.enable_bit	= OMAP3430_EN_UART3_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "per_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2547,6 +2672,7 @@ static struct clk gpt9_ick = {</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(OMAP3430_PER_MOD, CM_ICLKEN),</div><div class='ctx'> 	.enable_bit	= OMAP3430_EN_GPT9_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "per_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2556,6 +2682,7 @@ static struct clk gpt8_ick = {</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(OMAP3430_PER_MOD, CM_ICLKEN),</div><div class='ctx'> 	.enable_bit	= OMAP3430_EN_GPT8_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "per_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2565,6 +2692,7 @@ static struct clk gpt7_ick = {</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(OMAP3430_PER_MOD, CM_ICLKEN),</div><div class='ctx'> 	.enable_bit	= OMAP3430_EN_GPT7_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "per_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2574,6 +2702,7 @@ static struct clk gpt6_ick = {</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(OMAP3430_PER_MOD, CM_ICLKEN),</div><div class='ctx'> 	.enable_bit	= OMAP3430_EN_GPT6_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "per_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2583,6 +2712,7 @@ static struct clk gpt5_ick = {</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(OMAP3430_PER_MOD, CM_ICLKEN),</div><div class='ctx'> 	.enable_bit	= OMAP3430_EN_GPT5_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "per_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2592,6 +2722,7 @@ static struct clk gpt4_ick = {</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(OMAP3430_PER_MOD, CM_ICLKEN),</div><div class='ctx'> 	.enable_bit	= OMAP3430_EN_GPT4_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "per_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2601,6 +2732,7 @@ static struct clk gpt3_ick = {</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(OMAP3430_PER_MOD, CM_ICLKEN),</div><div class='ctx'> 	.enable_bit	= OMAP3430_EN_GPT3_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "per_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2610,6 +2742,7 @@ static struct clk gpt2_ick = {</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(OMAP3430_PER_MOD, CM_ICLKEN),</div><div class='ctx'> 	.enable_bit	= OMAP3430_EN_GPT2_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "per_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2620,6 +2753,7 @@ static struct clk mcbsp2_ick = {</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(OMAP3430_PER_MOD, CM_ICLKEN),</div><div class='ctx'> 	.enable_bit	= OMAP3430_EN_MCBSP2_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "per_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2630,6 +2764,7 @@ static struct clk mcbsp3_ick = {</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(OMAP3430_PER_MOD, CM_ICLKEN),</div><div class='ctx'> 	.enable_bit	= OMAP3430_EN_MCBSP3_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "per_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2640,12 +2775,13 @@ static struct clk mcbsp4_ick = {</div><div class='ctx'> 	.enable_reg	= OMAP_CM_REGADDR(OMAP3430_PER_MOD, CM_ICLKEN),</div><div class='ctx'> 	.enable_bit	= OMAP3430_EN_MCBSP4_SHIFT,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "per_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct clksel mcbsp_234_clksel[] = {</div><div class='ctx'> 	{ .parent = &amp;per_96m_fck, .rates = common_mcbsp_96m_rates },</div><div class='del'>-	{ .parent = &amp;mcbsp_clks,   .rates = common_mcbsp_mcbsp_rates },</div><div class='add'>+	{ .parent = &amp;mcbsp_clks,  .rates = common_mcbsp_mcbsp_rates },</div><div class='ctx'> 	{ .parent = NULL }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2659,6 +2795,7 @@ static struct clk mcbsp2_fck = {</div><div class='ctx'> 	.clksel_mask	= OMAP2_MCBSP2_CLKS_MASK,</div><div class='ctx'> 	.clksel		= mcbsp_234_clksel,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "per_clkdm",</div><div class='ctx'> 	.recalc		= &amp;omap2_clksel_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2672,6 +2809,7 @@ static struct clk mcbsp3_fck = {</div><div class='ctx'> 	.clksel_mask	= OMAP2_MCBSP3_CLKS_MASK,</div><div class='ctx'> 	.clksel		= mcbsp_234_clksel,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "per_clkdm",</div><div class='ctx'> 	.recalc		= &amp;omap2_clksel_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2685,6 +2823,7 @@ static struct clk mcbsp4_fck = {</div><div class='ctx'> 	.clksel_mask	= OMAP2_MCBSP4_CLKS_MASK,</div><div class='ctx'> 	.clksel		= mcbsp_234_clksel,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "per_clkdm",</div><div class='ctx'> 	.recalc		= &amp;omap2_clksel_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2732,6 +2871,7 @@ static struct clk emu_src_ck = {</div><div class='ctx'> 	.clksel_mask	= OMAP3430_MUX_CTRL_MASK,</div><div class='ctx'> 	.clksel		= emu_src_clksel,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X | RATE_PROPAGATES | ALWAYS_ENABLED,</div><div class='add'>+	.clkdm_name	= "emu_clkdm",</div><div class='ctx'> 	.recalc		= &amp;omap2_clksel_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2755,6 +2895,7 @@ static struct clk pclk_fck = {</div><div class='ctx'> 	.clksel_mask	= OMAP3430_CLKSEL_PCLK_MASK,</div><div class='ctx'> 	.clksel		= pclk_emu_clksel,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X | RATE_PROPAGATES | ALWAYS_ENABLED,</div><div class='add'>+	.clkdm_name	= "emu_clkdm",</div><div class='ctx'> 	.recalc		= &amp;omap2_clksel_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2777,6 +2918,7 @@ static struct clk pclkx2_fck = {</div><div class='ctx'> 	.clksel_mask	= OMAP3430_CLKSEL_PCLKX2_MASK,</div><div class='ctx'> 	.clksel		= pclkx2_emu_clksel,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X | RATE_PROPAGATES | ALWAYS_ENABLED,</div><div class='add'>+	.clkdm_name	= "emu_clkdm",</div><div class='ctx'> 	.recalc		= &amp;omap2_clksel_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2792,6 +2934,7 @@ static struct clk atclk_fck = {</div><div class='ctx'> 	.clksel_mask	= OMAP3430_CLKSEL_ATCLK_MASK,</div><div class='ctx'> 	.clksel		= atclk_emu_clksel,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X | RATE_PROPAGATES | ALWAYS_ENABLED,</div><div class='add'>+	.clkdm_name	= "emu_clkdm",</div><div class='ctx'> 	.recalc		= &amp;omap2_clksel_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2802,6 +2945,7 @@ static struct clk traceclk_src_fck = {</div><div class='ctx'> 	.clksel_mask	= OMAP3430_TRACE_MUX_CTRL_MASK,</div><div class='ctx'> 	.clksel		= emu_src_clksel,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X | RATE_PROPAGATES | ALWAYS_ENABLED,</div><div class='add'>+	.clkdm_name	= "emu_clkdm",</div><div class='ctx'> 	.recalc		= &amp;omap2_clksel_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2824,6 +2968,7 @@ static struct clk traceclk_fck = {</div><div class='ctx'> 	.clksel_mask	= OMAP3430_CLKSEL_TRACECLK_MASK,</div><div class='ctx'> 	.clksel		= traceclk_clksel,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X | ALWAYS_ENABLED,</div><div class='add'>+	.clkdm_name	= "emu_clkdm",</div><div class='ctx'> 	.recalc		= &amp;omap2_clksel_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2853,11 +2998,13 @@ static struct clk sr_l4_ick = {</div><div class='ctx'> 	.name		= "sr_l4_ick",</div><div class='ctx'> 	.parent		= &amp;l4_ick,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP343X,</div><div class='add'>+	.clkdm_name	= "core_l4_clkdm",</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* SECURE_32K_FCK clocks */</div><div class='ctx'> </div><div class='add'>+/* XXX This clock no longer exists in 3430 TRM rev F */</div><div class='ctx'> static struct clk gpt12_fck = {</div><div class='ctx'> 	.name		= "gpt12_fck",</div><div class='ctx'> 	.parent		= &amp;secure_32k_fck,</div><div class='hunk'>@@ -2933,6 +3080,7 @@ static struct clk *onchip_34xx_clks[] __initdata = {</div><div class='ctx'> 	&amp;l3_ick,</div><div class='ctx'> 	&amp;l4_ick,</div><div class='ctx'> 	&amp;rm_ick,</div><div class='add'>+	&amp;gfx_l3_ck,</div><div class='ctx'> 	&amp;gfx_l3_fck,</div><div class='ctx'> 	&amp;gfx_l3_ick,</div><div class='ctx'> 	&amp;gfx_cg1_ck,</div><div class='hunk'>@@ -3014,12 +3162,10 @@ static struct clk *onchip_34xx_clks[] __initdata = {</div><div class='ctx'> 	&amp;dss2_alwon_fck,</div><div class='ctx'> 	&amp;dss_ick,</div><div class='ctx'> 	&amp;cam_mclk,</div><div class='del'>-	&amp;cam_l3_ick,</div><div class='del'>-	&amp;cam_l4_ick,</div><div class='add'>+	&amp;cam_ick,</div><div class='ctx'> 	&amp;usbhost_120m_fck,</div><div class='ctx'> 	&amp;usbhost_48m_fck,</div><div class='del'>-	&amp;usbhost_l3_ick,</div><div class='del'>-	&amp;usbhost_l4_ick,</div><div class='add'>+	&amp;usbhost_ick,</div><div class='ctx'> 	&amp;usbhost_sar_fck,</div><div class='ctx'> 	&amp;usim_fck,</div><div class='ctx'> 	&amp;gpt1_fck,</div><div class='head'>diff --git a/arch/arm/mach-omap2/clockdomain.c b/arch/arm/mach-omap2/clockdomain.c<br/>new file mode 100644<br/>index 000000000000..4c3ce9cfd948<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap2/clockdomain.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/clockdomain.c</a></div><div class='hunk'>@@ -0,0 +1,623 @@</div><div class='add'>+/*</div><div class='add'>+ * OMAP2/3 clockdomain framework functions</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2008 Texas Instruments, Inc.</div><div class='add'>+ * Copyright (C) 2008 Nokia Corporation</div><div class='add'>+ *</div><div class='add'>+ * Written by Paul Walmsley and Jouni Högander</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+#ifdef CONFIG_OMAP_DEBUG_CLOCKDOMAIN</div><div class='add'>+#  define DEBUG</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/limits.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bitops.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;mach/clock.h&gt;</div><div class='add'>+</div><div class='add'>+#include "prm.h"</div><div class='add'>+#include "prm-regbits-24xx.h"</div><div class='add'>+#include "cm.h"</div><div class='add'>+</div><div class='add'>+#include &lt;mach/powerdomain.h&gt;</div><div class='add'>+#include &lt;mach/clockdomain.h&gt;</div><div class='add'>+</div><div class='add'>+/* clkdm_list contains all registered struct clockdomains */</div><div class='add'>+static LIST_HEAD(clkdm_list);</div><div class='add'>+</div><div class='add'>+/* clkdm_mutex protects clkdm_list add and del ops */</div><div class='add'>+static DEFINE_MUTEX(clkdm_mutex);</div><div class='add'>+</div><div class='add'>+/* array of powerdomain deps to be added/removed when clkdm in hwsup mode */</div><div class='add'>+static struct clkdm_pwrdm_autodep *autodeps;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Private functions */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * _autodep_lookup - resolve autodep pwrdm names to pwrdm pointers; store</div><div class='add'>+ * @autodep: struct clkdm_pwrdm_autodep * to resolve</div><div class='add'>+ *</div><div class='add'>+ * Resolve autodep powerdomain names to powerdomain pointers via</div><div class='add'>+ * pwrdm_lookup() and store the pointers in the autodep structure.  An</div><div class='add'>+ * "autodep" is a powerdomain sleep/wakeup dependency that is</div><div class='add'>+ * automatically added and removed whenever clocks in the associated</div><div class='add'>+ * clockdomain are enabled or disabled (respectively) when the</div><div class='add'>+ * clockdomain is in hardware-supervised mode.	Meant to be called</div><div class='add'>+ * once at clockdomain layer initialization, since these should remain</div><div class='add'>+ * fixed for a particular architecture.  No return value.</div><div class='add'>+ */</div><div class='add'>+static void _autodep_lookup(struct clkdm_pwrdm_autodep *autodep)</div><div class='add'>+{</div><div class='add'>+	struct powerdomain *pwrdm;</div><div class='add'>+</div><div class='add'>+	if (!autodep)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!omap_chip_is(autodep-&gt;omap_chip))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	pwrdm = pwrdm_lookup(autodep-&gt;pwrdm_name);</div><div class='add'>+	if (!pwrdm) {</div><div class='add'>+		pr_debug("clockdomain: _autodep_lookup: powerdomain %s "</div><div class='add'>+			 "does not exist\n", autodep-&gt;pwrdm_name);</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	autodep-&gt;pwrdm = pwrdm;</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * _clkdm_add_autodeps - add auto sleepdeps/wkdeps to clkdm upon clock enable</div><div class='add'>+ * @clkdm: struct clockdomain *</div><div class='add'>+ *</div><div class='add'>+ * Add the "autodep" sleep &amp; wakeup dependencies to clockdomain 'clkdm'</div><div class='add'>+ * in hardware-supervised mode.  Meant to be called from clock framework</div><div class='add'>+ * when a clock inside clockdomain 'clkdm' is enabled.	No return value.</div><div class='add'>+ */</div><div class='add'>+static void _clkdm_add_autodeps(struct clockdomain *clkdm)</div><div class='add'>+{</div><div class='add'>+	struct clkdm_pwrdm_autodep *autodep;</div><div class='add'>+</div><div class='add'>+	for (autodep = autodeps; autodep-&gt;pwrdm_name; autodep++) {</div><div class='add'>+		if (!autodep-&gt;pwrdm)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		pr_debug("clockdomain: adding %s sleepdep/wkdep for "</div><div class='add'>+			 "pwrdm %s\n", autodep-&gt;pwrdm_name,</div><div class='add'>+			 clkdm-&gt;pwrdm-&gt;name);</div><div class='add'>+</div><div class='add'>+		pwrdm_add_sleepdep(clkdm-&gt;pwrdm, autodep-&gt;pwrdm);</div><div class='add'>+		pwrdm_add_wkdep(clkdm-&gt;pwrdm, autodep-&gt;pwrdm);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * _clkdm_add_autodeps - remove auto sleepdeps/wkdeps from clkdm</div><div class='add'>+ * @clkdm: struct clockdomain *</div><div class='add'>+ *</div><div class='add'>+ * Remove the "autodep" sleep &amp; wakeup dependencies from clockdomain 'clkdm'</div><div class='add'>+ * in hardware-supervised mode.  Meant to be called from clock framework</div><div class='add'>+ * when a clock inside clockdomain 'clkdm' is disabled.  No return value.</div><div class='add'>+ */</div><div class='add'>+static void _clkdm_del_autodeps(struct clockdomain *clkdm)</div><div class='add'>+{</div><div class='add'>+	struct clkdm_pwrdm_autodep *autodep;</div><div class='add'>+</div><div class='add'>+	for (autodep = autodeps; autodep-&gt;pwrdm_name; autodep++) {</div><div class='add'>+		if (!autodep-&gt;pwrdm)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		pr_debug("clockdomain: removing %s sleepdep/wkdep for "</div><div class='add'>+			 "pwrdm %s\n", autodep-&gt;pwrdm_name,</div><div class='add'>+			 clkdm-&gt;pwrdm-&gt;name);</div><div class='add'>+</div><div class='add'>+		pwrdm_del_sleepdep(clkdm-&gt;pwrdm, autodep-&gt;pwrdm);</div><div class='add'>+		pwrdm_del_wkdep(clkdm-&gt;pwrdm, autodep-&gt;pwrdm);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static struct clockdomain *_clkdm_lookup(const char *name)</div><div class='add'>+{</div><div class='add'>+	struct clockdomain *clkdm, *temp_clkdm;</div><div class='add'>+</div><div class='add'>+	if (!name)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	clkdm = NULL;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(temp_clkdm, &amp;clkdm_list, node) {</div><div class='add'>+		if (!strcmp(name, temp_clkdm-&gt;name)) {</div><div class='add'>+			clkdm = temp_clkdm;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return clkdm;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Public functions */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * clkdm_init - set up the clockdomain layer</div><div class='add'>+ * @clkdms: optional pointer to an array of clockdomains to register</div><div class='add'>+ * @init_autodeps: optional pointer to an array of autodeps to register</div><div class='add'>+ *</div><div class='add'>+ * Set up internal state.  If a pointer to an array of clockdomains</div><div class='add'>+ * was supplied, loop through the list of clockdomains, register all</div><div class='add'>+ * that are available on the current platform.	Similarly, if a</div><div class='add'>+ * pointer to an array of clockdomain-powerdomain autodependencies was</div><div class='add'>+ * provided, register those.  No return value.</div><div class='add'>+ */</div><div class='add'>+void clkdm_init(struct clockdomain **clkdms,</div><div class='add'>+		struct clkdm_pwrdm_autodep *init_autodeps)</div><div class='add'>+{</div><div class='add'>+	struct clockdomain **c = NULL;</div><div class='add'>+	struct clkdm_pwrdm_autodep *autodep = NULL;</div><div class='add'>+</div><div class='add'>+	if (clkdms)</div><div class='add'>+		for (c = clkdms; *c; c++)</div><div class='add'>+			clkdm_register(*c);</div><div class='add'>+</div><div class='add'>+	autodeps = init_autodeps;</div><div class='add'>+	if (autodeps)</div><div class='add'>+		for (autodep = autodeps; autodep-&gt;pwrdm_name; autodep++)</div><div class='add'>+			_autodep_lookup(autodep);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * clkdm_register - register a clockdomain</div><div class='add'>+ * @clkdm: struct clockdomain * to register</div><div class='add'>+ *</div><div class='add'>+ * Adds a clockdomain to the internal clockdomain list.</div><div class='add'>+ * Returns -EINVAL if given a null pointer, -EEXIST if a clockdomain is</div><div class='add'>+ * already registered by the provided name, or 0 upon success.</div><div class='add'>+ */</div><div class='add'>+int clkdm_register(struct clockdomain *clkdm)</div><div class='add'>+{</div><div class='add'>+	int ret = -EINVAL;</div><div class='add'>+	struct powerdomain *pwrdm;</div><div class='add'>+</div><div class='add'>+	if (!clkdm || !clkdm-&gt;name)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!omap_chip_is(clkdm-&gt;omap_chip))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	pwrdm = pwrdm_lookup(clkdm-&gt;pwrdm_name);</div><div class='add'>+	if (!pwrdm) {</div><div class='add'>+		pr_debug("clockdomain: clkdm_register %s: powerdomain %s "</div><div class='add'>+			 "does not exist\n", clkdm-&gt;name, clkdm-&gt;pwrdm_name);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	clkdm-&gt;pwrdm = pwrdm;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;clkdm_mutex);</div><div class='add'>+	/* Verify that the clockdomain is not already registered */</div><div class='add'>+	if (_clkdm_lookup(clkdm-&gt;name)) {</div><div class='add'>+		ret = -EEXIST;</div><div class='add'>+		goto cr_unlock;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	list_add(&amp;clkdm-&gt;node, &amp;clkdm_list);</div><div class='add'>+</div><div class='add'>+	pwrdm_add_clkdm(pwrdm, clkdm);</div><div class='add'>+</div><div class='add'>+	pr_debug("clockdomain: registered %s\n", clkdm-&gt;name);</div><div class='add'>+	ret = 0;</div><div class='add'>+</div><div class='add'>+cr_unlock:</div><div class='add'>+	mutex_unlock(&amp;clkdm_mutex);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * clkdm_unregister - unregister a clockdomain</div><div class='add'>+ * @clkdm: struct clockdomain * to unregister</div><div class='add'>+ *</div><div class='add'>+ * Removes a clockdomain from the internal clockdomain list.  Returns</div><div class='add'>+ * -EINVAL if clkdm argument is NULL.</div><div class='add'>+ */</div><div class='add'>+int clkdm_unregister(struct clockdomain *clkdm)</div><div class='add'>+{</div><div class='add'>+	if (!clkdm)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	pwrdm_del_clkdm(clkdm-&gt;pwrdm, clkdm);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;clkdm_mutex);</div><div class='add'>+	list_del(&amp;clkdm-&gt;node);</div><div class='add'>+	mutex_unlock(&amp;clkdm_mutex);</div><div class='add'>+</div><div class='add'>+	pr_debug("clockdomain: unregistered %s\n", clkdm-&gt;name);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * clkdm_lookup - look up a clockdomain by name, return a pointer</div><div class='add'>+ * @name: name of clockdomain</div><div class='add'>+ *</div><div class='add'>+ * Find a registered clockdomain by its name.  Returns a pointer to the</div><div class='add'>+ * struct clockdomain if found, or NULL otherwise.</div><div class='add'>+ */</div><div class='add'>+struct clockdomain *clkdm_lookup(const char *name)</div><div class='add'>+{</div><div class='add'>+	struct clockdomain *clkdm, *temp_clkdm;</div><div class='add'>+</div><div class='add'>+	if (!name)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	clkdm = NULL;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;clkdm_mutex);</div><div class='add'>+	list_for_each_entry(temp_clkdm, &amp;clkdm_list, node) {</div><div class='add'>+		if (!strcmp(name, temp_clkdm-&gt;name)) {</div><div class='add'>+			clkdm = temp_clkdm;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;clkdm_mutex);</div><div class='add'>+</div><div class='add'>+	return clkdm;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * clkdm_for_each - call function on each registered clockdomain</div><div class='add'>+ * @fn: callback function *</div><div class='add'>+ *</div><div class='add'>+ * Call the supplied function for each registered clockdomain.</div><div class='add'>+ * The callback function can return anything but 0 to bail</div><div class='add'>+ * out early from the iterator.  The callback function is called with</div><div class='add'>+ * the clkdm_mutex held, so no clockdomain structure manipulation</div><div class='add'>+ * functions should be called from the callback, although hardware</div><div class='add'>+ * clockdomain control functions are fine.  Returns the last return</div><div class='add'>+ * value of the callback function, which should be 0 for success or</div><div class='add'>+ * anything else to indicate failure; or -EINVAL if the function pointer</div><div class='add'>+ * is null.</div><div class='add'>+ */</div><div class='add'>+int clkdm_for_each(int (*fn)(struct clockdomain *clkdm))</div><div class='add'>+{</div><div class='add'>+	struct clockdomain *clkdm;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (!fn)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;clkdm_mutex);</div><div class='add'>+	list_for_each_entry(clkdm, &amp;clkdm_list, node) {</div><div class='add'>+		ret = (*fn)(clkdm);</div><div class='add'>+		if (ret)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;clkdm_mutex);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * clkdm_get_pwrdm - return a ptr to the pwrdm that this clkdm resides in</div><div class='add'>+ * @clkdm: struct clockdomain *</div><div class='add'>+ *</div><div class='add'>+ * Return a pointer to the struct powerdomain that the specified clockdomain</div><div class='add'>+ * 'clkdm' exists in, or returns NULL if clkdm argument is NULL.</div><div class='add'>+ */</div><div class='add'>+struct powerdomain *clkdm_get_pwrdm(struct clockdomain *clkdm)</div><div class='add'>+{</div><div class='add'>+	if (!clkdm)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	return clkdm-&gt;pwrdm;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Hardware clockdomain control */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * omap2_clkdm_clktrctrl_read - read the clkdm's current state transition mode</div><div class='add'>+ * @clk: struct clk * of a clockdomain</div><div class='add'>+ *</div><div class='add'>+ * Return the clockdomain's current state transition mode from the</div><div class='add'>+ * corresponding domain CM_CLKSTCTRL register.	Returns -EINVAL if clk</div><div class='add'>+ * is NULL or the current mode upon success.</div><div class='add'>+ */</div><div class='add'>+static int omap2_clkdm_clktrctrl_read(struct clockdomain *clkdm)</div><div class='add'>+{</div><div class='add'>+	u32 v;</div><div class='add'>+</div><div class='add'>+	if (!clkdm)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	v = cm_read_mod_reg(clkdm-&gt;pwrdm-&gt;prcm_offs, CM_CLKSTCTRL);</div><div class='add'>+	v &amp;= clkdm-&gt;clktrctrl_mask;</div><div class='add'>+	v &gt;&gt;= __ffs(clkdm-&gt;clktrctrl_mask);</div><div class='add'>+</div><div class='add'>+	return v;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * omap2_clkdm_sleep - force clockdomain sleep transition</div><div class='add'>+ * @clkdm: struct clockdomain *</div><div class='add'>+ *</div><div class='add'>+ * Instruct the CM to force a sleep transition on the specified</div><div class='add'>+ * clockdomain 'clkdm'.  Returns -EINVAL if clk is NULL or if</div><div class='add'>+ * clockdomain does not support software-initiated sleep; 0 upon</div><div class='add'>+ * success.</div><div class='add'>+ */</div><div class='add'>+int omap2_clkdm_sleep(struct clockdomain *clkdm)</div><div class='add'>+{</div><div class='add'>+	if (!clkdm)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!(clkdm-&gt;flags &amp; CLKDM_CAN_FORCE_SLEEP)) {</div><div class='add'>+		pr_debug("clockdomain: %s does not support forcing "</div><div class='add'>+			 "sleep via software\n", clkdm-&gt;name);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pr_debug("clockdomain: forcing sleep on %s\n", clkdm-&gt;name);</div><div class='add'>+</div><div class='add'>+	if (cpu_is_omap24xx()) {</div><div class='add'>+</div><div class='add'>+		cm_set_mod_reg_bits(OMAP24XX_FORCESTATE,</div><div class='add'>+				    clkdm-&gt;pwrdm-&gt;prcm_offs, PM_PWSTCTRL);</div><div class='add'>+</div><div class='add'>+	} else if (cpu_is_omap34xx()) {</div><div class='add'>+</div><div class='add'>+		u32 v = (OMAP34XX_CLKSTCTRL_FORCE_SLEEP &lt;&lt;</div><div class='add'>+			 __ffs(clkdm-&gt;clktrctrl_mask));</div><div class='add'>+</div><div class='add'>+		cm_rmw_mod_reg_bits(clkdm-&gt;clktrctrl_mask, v,</div><div class='add'>+				    clkdm-&gt;pwrdm-&gt;prcm_offs, CM_CLKSTCTRL);</div><div class='add'>+</div><div class='add'>+	} else {</div><div class='add'>+		BUG();</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * omap2_clkdm_wakeup - force clockdomain wakeup transition</div><div class='add'>+ * @clkdm: struct clockdomain *</div><div class='add'>+ *</div><div class='add'>+ * Instruct the CM to force a wakeup transition on the specified</div><div class='add'>+ * clockdomain 'clkdm'.  Returns -EINVAL if clkdm is NULL or if the</div><div class='add'>+ * clockdomain does not support software-controlled wakeup; 0 upon</div><div class='add'>+ * success.</div><div class='add'>+ */</div><div class='add'>+int omap2_clkdm_wakeup(struct clockdomain *clkdm)</div><div class='add'>+{</div><div class='add'>+	if (!clkdm)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!(clkdm-&gt;flags &amp; CLKDM_CAN_FORCE_WAKEUP)) {</div><div class='add'>+		pr_debug("clockdomain: %s does not support forcing "</div><div class='add'>+			 "wakeup via software\n", clkdm-&gt;name);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pr_debug("clockdomain: forcing wakeup on %s\n", clkdm-&gt;name);</div><div class='add'>+</div><div class='add'>+	if (cpu_is_omap24xx()) {</div><div class='add'>+</div><div class='add'>+		cm_clear_mod_reg_bits(OMAP24XX_FORCESTATE,</div><div class='add'>+				      clkdm-&gt;pwrdm-&gt;prcm_offs, PM_PWSTCTRL);</div><div class='add'>+</div><div class='add'>+	} else if (cpu_is_omap34xx()) {</div><div class='add'>+</div><div class='add'>+		u32 v = (OMAP34XX_CLKSTCTRL_FORCE_WAKEUP &lt;&lt;</div><div class='add'>+			 __ffs(clkdm-&gt;clktrctrl_mask));</div><div class='add'>+</div><div class='add'>+		cm_rmw_mod_reg_bits(clkdm-&gt;clktrctrl_mask, v,</div><div class='add'>+				    clkdm-&gt;pwrdm-&gt;prcm_offs, CM_CLKSTCTRL);</div><div class='add'>+</div><div class='add'>+	} else {</div><div class='add'>+		BUG();</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * omap2_clkdm_allow_idle - enable hwsup idle transitions for clkdm</div><div class='add'>+ * @clkdm: struct clockdomain *</div><div class='add'>+ *</div><div class='add'>+ * Allow the hardware to automatically switch the clockdomain into</div><div class='add'>+ * active or idle states, as needed by downstream clocks.  If the</div><div class='add'>+ * clockdomain has any downstream clocks enabled in the clock</div><div class='add'>+ * framework, wkdep/sleepdep autodependencies are added; this is so</div><div class='add'>+ * device drivers can read and write to the device.  No return value.</div><div class='add'>+ */</div><div class='add'>+void omap2_clkdm_allow_idle(struct clockdomain *clkdm)</div><div class='add'>+{</div><div class='add'>+	u32 v;</div><div class='add'>+</div><div class='add'>+	if (!clkdm)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!(clkdm-&gt;flags &amp; CLKDM_CAN_ENABLE_AUTO)) {</div><div class='add'>+		pr_debug("clock: automatic idle transitions cannot be enabled "</div><div class='add'>+			 "on clockdomain %s\n", clkdm-&gt;name);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pr_debug("clockdomain: enabling automatic idle transitions for %s\n",</div><div class='add'>+		 clkdm-&gt;name);</div><div class='add'>+</div><div class='add'>+	if (atomic_read(&amp;clkdm-&gt;usecount) &gt; 0)</div><div class='add'>+		_clkdm_add_autodeps(clkdm);</div><div class='add'>+</div><div class='add'>+	if (cpu_is_omap24xx())</div><div class='add'>+		v = OMAP24XX_CLKSTCTRL_ENABLE_AUTO;</div><div class='add'>+	else if (cpu_is_omap34xx())</div><div class='add'>+		v = OMAP34XX_CLKSTCTRL_ENABLE_AUTO;</div><div class='add'>+	else</div><div class='add'>+		BUG();</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	cm_rmw_mod_reg_bits(clkdm-&gt;clktrctrl_mask,</div><div class='add'>+			    v &lt;&lt; __ffs(clkdm-&gt;clktrctrl_mask),</div><div class='add'>+			    clkdm-&gt;pwrdm-&gt;prcm_offs,</div><div class='add'>+			    CM_CLKSTCTRL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * omap2_clkdm_deny_idle - disable hwsup idle transitions for clkdm</div><div class='add'>+ * @clkdm: struct clockdomain *</div><div class='add'>+ *</div><div class='add'>+ * Prevent the hardware from automatically switching the clockdomain</div><div class='add'>+ * into inactive or idle states.  If the clockdomain has downstream</div><div class='add'>+ * clocks enabled in the clock framework, wkdep/sleepdep</div><div class='add'>+ * autodependencies are removed.  No return value.</div><div class='add'>+ */</div><div class='add'>+void omap2_clkdm_deny_idle(struct clockdomain *clkdm)</div><div class='add'>+{</div><div class='add'>+	u32 v;</div><div class='add'>+</div><div class='add'>+	if (!clkdm)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!(clkdm-&gt;flags &amp; CLKDM_CAN_DISABLE_AUTO)) {</div><div class='add'>+		pr_debug("clockdomain: automatic idle transitions cannot be "</div><div class='add'>+			 "disabled on %s\n", clkdm-&gt;name);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pr_debug("clockdomain: disabling automatic idle transitions for %s\n",</div><div class='add'>+		 clkdm-&gt;name);</div><div class='add'>+</div><div class='add'>+	if (cpu_is_omap24xx())</div><div class='add'>+		v = OMAP24XX_CLKSTCTRL_DISABLE_AUTO;</div><div class='add'>+	else if (cpu_is_omap34xx())</div><div class='add'>+		v = OMAP34XX_CLKSTCTRL_DISABLE_AUTO;</div><div class='add'>+	else</div><div class='add'>+		BUG();</div><div class='add'>+</div><div class='add'>+	cm_rmw_mod_reg_bits(clkdm-&gt;clktrctrl_mask,</div><div class='add'>+			    v &lt;&lt; __ffs(clkdm-&gt;clktrctrl_mask),</div><div class='add'>+			    clkdm-&gt;pwrdm-&gt;prcm_offs, CM_CLKSTCTRL);</div><div class='add'>+</div><div class='add'>+	if (atomic_read(&amp;clkdm-&gt;usecount) &gt; 0)</div><div class='add'>+		_clkdm_del_autodeps(clkdm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Clockdomain-to-clock framework interface code */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * omap2_clkdm_clk_enable - add an enabled downstream clock to this clkdm</div><div class='add'>+ * @clkdm: struct clockdomain *</div><div class='add'>+ * @clk: struct clk * of the enabled downstream clock</div><div class='add'>+ *</div><div class='add'>+ * Increment the usecount of this clockdomain 'clkdm' and ensure that</div><div class='add'>+ * it is awake.  Intended to be called by clk_enable() code.  If the</div><div class='add'>+ * clockdomain is in software-supervised idle mode, force the</div><div class='add'>+ * clockdomain to wake.  If the clockdomain is in hardware-supervised</div><div class='add'>+ * idle mode, add clkdm-pwrdm autodependencies, to ensure that devices</div><div class='add'>+ * in the clockdomain can be read from/written to by on-chip processors.</div><div class='add'>+ * Returns -EINVAL if passed null pointers; returns 0 upon success or</div><div class='add'>+ * if the clockdomain is in hwsup idle mode.</div><div class='add'>+ */</div><div class='add'>+int omap2_clkdm_clk_enable(struct clockdomain *clkdm, struct clk *clk)</div><div class='add'>+{</div><div class='add'>+	int v;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * XXX Rewrite this code to maintain a list of enabled</div><div class='add'>+	 * downstream clocks for debugging purposes?</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	if (!clkdm || !clk)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (atomic_inc_return(&amp;clkdm-&gt;usecount) &gt; 1)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Clockdomain now has one enabled downstream clock */</div><div class='add'>+</div><div class='add'>+	pr_debug("clockdomain: clkdm %s: clk %s now enabled\n", clkdm-&gt;name,</div><div class='add'>+		 clk-&gt;name);</div><div class='add'>+</div><div class='add'>+	v = omap2_clkdm_clktrctrl_read(clkdm);</div><div class='add'>+</div><div class='add'>+	if ((cpu_is_omap34xx() &amp;&amp; v == OMAP34XX_CLKSTCTRL_ENABLE_AUTO) ||</div><div class='add'>+	    (cpu_is_omap24xx() &amp;&amp; v == OMAP24XX_CLKSTCTRL_ENABLE_AUTO))</div><div class='add'>+		_clkdm_add_autodeps(clkdm);</div><div class='add'>+	else</div><div class='add'>+		omap2_clkdm_wakeup(clkdm);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * omap2_clkdm_clk_disable - remove an enabled downstream clock from this clkdm</div><div class='add'>+ * @clkdm: struct clockdomain *</div><div class='add'>+ * @clk: struct clk * of the disabled downstream clock</div><div class='add'>+ *</div><div class='add'>+ * Decrement the usecount of this clockdomain 'clkdm'. Intended to be</div><div class='add'>+ * called by clk_disable() code.  If the usecount goes to 0, put the</div><div class='add'>+ * clockdomain to sleep (software-supervised mode) or remove the</div><div class='add'>+ * clkdm-pwrdm autodependencies (hardware-supervised mode).  Returns</div><div class='add'>+ * -EINVAL if passed null pointers; -ERANGE if the clkdm usecount</div><div class='add'>+ * underflows and debugging is enabled; or returns 0 upon success or</div><div class='add'>+ * if the clockdomain is in hwsup idle mode.</div><div class='add'>+ */</div><div class='add'>+int omap2_clkdm_clk_disable(struct clockdomain *clkdm, struct clk *clk)</div><div class='add'>+{</div><div class='add'>+	int v;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * XXX Rewrite this code to maintain a list of enabled</div><div class='add'>+	 * downstream clocks for debugging purposes?</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	if (!clkdm || !clk)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+	if (atomic_read(&amp;clkdm-&gt;usecount) == 0) {</div><div class='add'>+		WARN_ON(1); /* underflow */</div><div class='add'>+		return -ERANGE;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	if (atomic_dec_return(&amp;clkdm-&gt;usecount) &gt; 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* All downstream clocks of this clockdomain are now disabled */</div><div class='add'>+</div><div class='add'>+	pr_debug("clockdomain: clkdm %s: clk %s now disabled\n", clkdm-&gt;name,</div><div class='add'>+		 clk-&gt;name);</div><div class='add'>+</div><div class='add'>+	v = omap2_clkdm_clktrctrl_read(clkdm);</div><div class='add'>+</div><div class='add'>+	if ((cpu_is_omap34xx() &amp;&amp; v == OMAP34XX_CLKSTCTRL_ENABLE_AUTO) ||</div><div class='add'>+	    (cpu_is_omap24xx() &amp;&amp; v == OMAP24XX_CLKSTCTRL_ENABLE_AUTO))</div><div class='add'>+		_clkdm_del_autodeps(clkdm);</div><div class='add'>+	else</div><div class='add'>+		omap2_clkdm_sleep(clkdm);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='head'>diff --git a/arch/arm/mach-omap2/clockdomains.h b/arch/arm/mach-omap2/clockdomains.h<br/>new file mode 100644<br/>index 000000000000..cd86dcc7b424<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap2/clockdomains.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/clockdomains.h</a></div><div class='hunk'>@@ -0,0 +1,305 @@</div><div class='add'>+/*</div><div class='add'>+ * OMAP2/3 clockdomains</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2008 Texas Instruments, Inc.</div><div class='add'>+ * Copyright (C) 2008 Nokia Corporation</div><div class='add'>+ *</div><div class='add'>+ * Written by Paul Walmsley</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __ARCH_ARM_MACH_OMAP2_CLOCKDOMAINS_H</div><div class='add'>+#define __ARCH_ARM_MACH_OMAP2_CLOCKDOMAINS_H</div><div class='add'>+</div><div class='add'>+#include &lt;mach/clockdomain.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * OMAP2/3-common clockdomains</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* This is an implicit clockdomain - it is never defined as such in TRM */</div><div class='add'>+static struct clockdomain wkup_clkdm = {</div><div class='add'>+	.name		= "wkup_clkdm",</div><div class='add'>+	.pwrdm_name	= "wkup_pwrdm",</div><div class='add'>+	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP24XX | CHIP_IS_OMAP3430),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * 2420-only clockdomains</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_ARCH_OMAP2420)</div><div class='add'>+</div><div class='add'>+static struct clockdomain mpu_2420_clkdm = {</div><div class='add'>+	.name		= "mpu_clkdm",</div><div class='add'>+	.pwrdm_name	= "mpu_pwrdm",</div><div class='add'>+	.flags		= CLKDM_CAN_HWSUP,</div><div class='add'>+	.clktrctrl_mask = OMAP24XX_AUTOSTATE_MPU_MASK,</div><div class='add'>+	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2420),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clockdomain iva1_2420_clkdm = {</div><div class='add'>+	.name		= "iva1_clkdm",</div><div class='add'>+	.pwrdm_name	= "dsp_pwrdm",</div><div class='add'>+	.flags		= CLKDM_CAN_HWSUP_SWSUP,</div><div class='add'>+	.clktrctrl_mask = OMAP2420_AUTOSTATE_IVA_MASK,</div><div class='add'>+	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2420),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif  /* CONFIG_ARCH_OMAP2420 */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * 2430-only clockdomains</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_ARCH_OMAP2430)</div><div class='add'>+</div><div class='add'>+static struct clockdomain mpu_2430_clkdm = {</div><div class='add'>+	.name		= "mpu_clkdm",</div><div class='add'>+	.pwrdm_name	= "mpu_pwrdm",</div><div class='add'>+	.flags		= CLKDM_CAN_HWSUP_SWSUP,</div><div class='add'>+	.clktrctrl_mask = OMAP24XX_AUTOSTATE_MPU_MASK,</div><div class='add'>+	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2430),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clockdomain mdm_clkdm = {</div><div class='add'>+	.name		= "mdm_clkdm",</div><div class='add'>+	.pwrdm_name	= "mdm_pwrdm",</div><div class='add'>+	.flags		= CLKDM_CAN_HWSUP_SWSUP,</div><div class='add'>+	.clktrctrl_mask = OMAP2430_AUTOSTATE_MDM_MASK,</div><div class='add'>+	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2430),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif    /* CONFIG_ARCH_OMAP2430 */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * 24XX-only clockdomains</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_ARCH_OMAP24XX)</div><div class='add'>+</div><div class='add'>+static struct clockdomain dsp_clkdm = {</div><div class='add'>+	.name		= "dsp_clkdm",</div><div class='add'>+	.pwrdm_name	= "dsp_pwrdm",</div><div class='add'>+	.flags		= CLKDM_CAN_HWSUP_SWSUP,</div><div class='add'>+	.clktrctrl_mask = OMAP24XX_AUTOSTATE_DSP_MASK,</div><div class='add'>+	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP24XX),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clockdomain gfx_24xx_clkdm = {</div><div class='add'>+	.name		= "gfx_clkdm",</div><div class='add'>+	.pwrdm_name	= "gfx_pwrdm",</div><div class='add'>+	.flags		= CLKDM_CAN_HWSUP_SWSUP,</div><div class='add'>+	.clktrctrl_mask = OMAP24XX_AUTOSTATE_GFX_MASK,</div><div class='add'>+	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP24XX),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clockdomain core_l3_24xx_clkdm = {</div><div class='add'>+	.name		= "core_l3_clkdm",</div><div class='add'>+	.pwrdm_name	= "core_pwrdm",</div><div class='add'>+	.flags		= CLKDM_CAN_HWSUP,</div><div class='add'>+	.clktrctrl_mask = OMAP24XX_AUTOSTATE_L3_MASK,</div><div class='add'>+	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP24XX),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clockdomain core_l4_24xx_clkdm = {</div><div class='add'>+	.name		= "core_l4_clkdm",</div><div class='add'>+	.pwrdm_name	= "core_pwrdm",</div><div class='add'>+	.flags		= CLKDM_CAN_HWSUP,</div><div class='add'>+	.clktrctrl_mask = OMAP24XX_AUTOSTATE_L4_MASK,</div><div class='add'>+	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP24XX),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clockdomain dss_24xx_clkdm = {</div><div class='add'>+	.name		= "dss_clkdm",</div><div class='add'>+	.pwrdm_name	= "core_pwrdm",</div><div class='add'>+	.flags		= CLKDM_CAN_HWSUP,</div><div class='add'>+	.clktrctrl_mask = OMAP24XX_AUTOSTATE_DSS_MASK,</div><div class='add'>+	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP24XX),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif   /* CONFIG_ARCH_OMAP24XX */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * 34xx clockdomains</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_ARCH_OMAP34XX)</div><div class='add'>+</div><div class='add'>+static struct clockdomain mpu_34xx_clkdm = {</div><div class='add'>+	.name		= "mpu_clkdm",</div><div class='add'>+	.pwrdm_name	= "mpu_pwrdm",</div><div class='add'>+	.flags		= CLKDM_CAN_HWSUP | CLKDM_CAN_FORCE_WAKEUP,</div><div class='add'>+	.clktrctrl_mask = OMAP3430_CLKTRCTRL_MPU_MASK,</div><div class='add'>+	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clockdomain neon_clkdm = {</div><div class='add'>+	.name		= "neon_clkdm",</div><div class='add'>+	.pwrdm_name	= "neon_pwrdm",</div><div class='add'>+	.flags		= CLKDM_CAN_HWSUP_SWSUP,</div><div class='add'>+	.clktrctrl_mask = OMAP3430_CLKTRCTRL_NEON_MASK,</div><div class='add'>+	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clockdomain iva2_clkdm = {</div><div class='add'>+	.name		= "iva2_clkdm",</div><div class='add'>+	.pwrdm_name	= "iva2_pwrdm",</div><div class='add'>+	.flags		= CLKDM_CAN_HWSUP_SWSUP,</div><div class='add'>+	.clktrctrl_mask = OMAP3430_CLKTRCTRL_IVA2_MASK,</div><div class='add'>+	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clockdomain gfx_3430es1_clkdm = {</div><div class='add'>+	.name		= "gfx_clkdm",</div><div class='add'>+	.pwrdm_name	= "gfx_pwrdm",</div><div class='add'>+	.flags		= CLKDM_CAN_HWSUP_SWSUP,</div><div class='add'>+	.clktrctrl_mask = OMAP3430ES1_CLKTRCTRL_GFX_MASK,</div><div class='add'>+	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430ES1),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clockdomain sgx_clkdm = {</div><div class='add'>+	.name		= "sgx_clkdm",</div><div class='add'>+	.pwrdm_name	= "sgx_pwrdm",</div><div class='add'>+	.flags		= CLKDM_CAN_HWSUP_SWSUP,</div><div class='add'>+	.clktrctrl_mask = OMAP3430ES2_CLKTRCTRL_SGX_MASK,</div><div class='add'>+	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430ES2),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The die-to-die clockdomain was documented in the 34xx ES1 TRM, but</div><div class='add'>+ * then that information was removed from the 34xx ES2+ TRM.  It is</div><div class='add'>+ * unclear whether the core is still there, but the clockdomain logic</div><div class='add'>+ * is there, and must be programmed to an appropriate state if the</div><div class='add'>+ * CORE clockdomain is to become inactive.</div><div class='add'>+ */</div><div class='add'>+static struct clockdomain d2d_clkdm = {</div><div class='add'>+	.name		= "d2d_clkdm",</div><div class='add'>+	.pwrdm_name	= "core_pwrdm",</div><div class='add'>+	.flags		= CLKDM_CAN_HWSUP,</div><div class='add'>+	.clktrctrl_mask = OMAP3430ES1_CLKTRCTRL_D2D_MASK,</div><div class='add'>+	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clockdomain core_l3_34xx_clkdm = {</div><div class='add'>+	.name		= "core_l3_clkdm",</div><div class='add'>+	.pwrdm_name	= "core_pwrdm",</div><div class='add'>+	.flags		= CLKDM_CAN_HWSUP,</div><div class='add'>+	.clktrctrl_mask = OMAP3430_CLKTRCTRL_L3_MASK,</div><div class='add'>+	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clockdomain core_l4_34xx_clkdm = {</div><div class='add'>+	.name		= "core_l4_clkdm",</div><div class='add'>+	.pwrdm_name	= "core_pwrdm",</div><div class='add'>+	.flags		= CLKDM_CAN_HWSUP,</div><div class='add'>+	.clktrctrl_mask = OMAP3430_CLKTRCTRL_L4_MASK,</div><div class='add'>+	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clockdomain dss_34xx_clkdm = {</div><div class='add'>+	.name		= "dss_clkdm",</div><div class='add'>+	.pwrdm_name	= "dss_pwrdm",</div><div class='add'>+	.flags		= CLKDM_CAN_HWSUP_SWSUP,</div><div class='add'>+	.clktrctrl_mask = OMAP3430_CLKTRCTRL_DSS_MASK,</div><div class='add'>+	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clockdomain cam_clkdm = {</div><div class='add'>+	.name		= "cam_clkdm",</div><div class='add'>+	.pwrdm_name	= "cam_pwrdm",</div><div class='add'>+	.flags		= CLKDM_CAN_HWSUP_SWSUP,</div><div class='add'>+	.clktrctrl_mask = OMAP3430_CLKTRCTRL_CAM_MASK,</div><div class='add'>+	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clockdomain usbhost_clkdm = {</div><div class='add'>+	.name		= "usbhost_clkdm",</div><div class='add'>+	.pwrdm_name	= "usbhost_pwrdm",</div><div class='add'>+	.flags		= CLKDM_CAN_HWSUP_SWSUP,</div><div class='add'>+	.clktrctrl_mask = OMAP3430ES2_CLKTRCTRL_USBHOST_MASK,</div><div class='add'>+	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430ES2),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clockdomain per_clkdm = {</div><div class='add'>+	.name		= "per_clkdm",</div><div class='add'>+	.pwrdm_name	= "per_pwrdm",</div><div class='add'>+	.flags		= CLKDM_CAN_HWSUP_SWSUP,</div><div class='add'>+	.clktrctrl_mask = OMAP3430_CLKTRCTRL_PER_MASK,</div><div class='add'>+	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clockdomain emu_clkdm = {</div><div class='add'>+	.name		= "emu_clkdm",</div><div class='add'>+	.pwrdm_name	= "emu_pwrdm",</div><div class='add'>+	.flags		= CLKDM_CAN_ENABLE_AUTO | CLKDM_CAN_SWSUP,</div><div class='add'>+	.clktrctrl_mask = OMAP3430_CLKTRCTRL_EMU_MASK,</div><div class='add'>+	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif   /* CONFIG_ARCH_OMAP34XX */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Clockdomain-powerdomain hwsup dependencies (34XX only)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static struct clkdm_pwrdm_autodep clkdm_pwrdm_autodeps[] = {</div><div class='add'>+	{</div><div class='add'>+		.pwrdm_name = "mpu_pwrdm",</div><div class='add'>+		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.pwrdm_name = "iva2_pwrdm",</div><div class='add'>+		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)</div><div class='add'>+	},</div><div class='add'>+	{ NULL }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static struct clockdomain *clockdomains_omap[] = {</div><div class='add'>+</div><div class='add'>+	&amp;wkup_clkdm,</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ARCH_OMAP2420</div><div class='add'>+	&amp;mpu_2420_clkdm,</div><div class='add'>+	&amp;iva1_2420_clkdm,</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ARCH_OMAP2430</div><div class='add'>+	&amp;mpu_2430_clkdm,</div><div class='add'>+	&amp;mdm_clkdm,</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ARCH_OMAP24XX</div><div class='add'>+	&amp;dsp_clkdm,</div><div class='add'>+	&amp;gfx_24xx_clkdm,</div><div class='add'>+	&amp;core_l3_24xx_clkdm,</div><div class='add'>+	&amp;core_l4_24xx_clkdm,</div><div class='add'>+	&amp;dss_24xx_clkdm,</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ARCH_OMAP34XX</div><div class='add'>+	&amp;mpu_34xx_clkdm,</div><div class='add'>+	&amp;neon_clkdm,</div><div class='add'>+	&amp;iva2_clkdm,</div><div class='add'>+	&amp;gfx_3430es1_clkdm,</div><div class='add'>+	&amp;sgx_clkdm,</div><div class='add'>+	&amp;d2d_clkdm,</div><div class='add'>+	&amp;core_l3_34xx_clkdm,</div><div class='add'>+	&amp;core_l4_34xx_clkdm,</div><div class='add'>+	&amp;dss_34xx_clkdm,</div><div class='add'>+	&amp;cam_clkdm,</div><div class='add'>+	&amp;usbhost_clkdm,</div><div class='add'>+	&amp;per_clkdm,</div><div class='add'>+	&amp;emu_clkdm,</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/arm/mach-omap2/cm-regbits-24xx.h b/arch/arm/mach-omap2/cm-regbits-24xx.h<br/>index 20ac38100678..1098ecfab861 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap2/cm-regbits-24xx.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-omap2/cm-regbits-24xx.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap2/cm-regbits-24xx.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/cm-regbits-24xx.h</a></div><div class='hunk'>@@ -63,7 +63,8 @@</div><div class='ctx'> #define OMAP24XX_CLKSEL_MPU_MASK			(0x1f &lt;&lt; 0)</div><div class='ctx'> </div><div class='ctx'> /* CM_CLKSTCTRL_MPU */</div><div class='del'>-#define OMAP24XX_AUTOSTATE_MPU				(1 &lt;&lt; 0)</div><div class='add'>+#define OMAP24XX_AUTOSTATE_MPU_SHIFT			0</div><div class='add'>+#define OMAP24XX_AUTOSTATE_MPU_MASK			(1 &lt;&lt; 0)</div><div class='ctx'> </div><div class='ctx'> /* CM_FCLKEN1_CORE specific bits*/</div><div class='ctx'> #define OMAP24XX_EN_TV_SHIFT				2</div><div class='hunk'>@@ -238,9 +239,12 @@</div><div class='ctx'> #define OMAP24XX_CLKSEL_GPT2_MASK			(0x3 &lt;&lt; 2)</div><div class='ctx'> </div><div class='ctx'> /* CM_CLKSTCTRL_CORE */</div><div class='del'>-#define OMAP24XX_AUTOSTATE_DSS				(1 &lt;&lt; 2)</div><div class='del'>-#define OMAP24XX_AUTOSTATE_L4				(1 &lt;&lt; 1)</div><div class='del'>-#define OMAP24XX_AUTOSTATE_L3				(1 &lt;&lt; 0)</div><div class='add'>+#define OMAP24XX_AUTOSTATE_DSS_SHIFT			2</div><div class='add'>+#define OMAP24XX_AUTOSTATE_DSS_MASK			(1 &lt;&lt; 2)</div><div class='add'>+#define OMAP24XX_AUTOSTATE_L4_SHIFT			1</div><div class='add'>+#define OMAP24XX_AUTOSTATE_L4_MASK			(1 &lt;&lt; 1)</div><div class='add'>+#define OMAP24XX_AUTOSTATE_L3_SHIFT			0</div><div class='add'>+#define OMAP24XX_AUTOSTATE_L3_MASK			(1 &lt;&lt; 0)</div><div class='ctx'> </div><div class='ctx'> /* CM_FCLKEN_GFX */</div><div class='ctx'> #define OMAP24XX_EN_3D_SHIFT				2</div><div class='hunk'>@@ -255,7 +259,8 @@</div><div class='ctx'> /* CM_CLKSEL_GFX specific bits */</div><div class='ctx'> </div><div class='ctx'> /* CM_CLKSTCTRL_GFX */</div><div class='del'>-#define OMAP24XX_AUTOSTATE_GFX				(1 &lt;&lt; 0)</div><div class='add'>+#define OMAP24XX_AUTOSTATE_GFX_SHIFT			0</div><div class='add'>+#define OMAP24XX_AUTOSTATE_GFX_MASK			(1 &lt;&lt; 0)</div><div class='ctx'> </div><div class='ctx'> /* CM_FCLKEN_WKUP specific bits */</div><div class='ctx'> </div><div class='hunk'>@@ -367,8 +372,10 @@</div><div class='ctx'> #define OMAP24XX_CLKSEL_DSP_MASK			(0x1f &lt;&lt; 0)</div><div class='ctx'> </div><div class='ctx'> /* CM_CLKSTCTRL_DSP */</div><div class='del'>-#define OMAP2420_AUTOSTATE_IVA				(1 &lt;&lt; 8)</div><div class='del'>-#define OMAP24XX_AUTOSTATE_DSP				(1 &lt;&lt; 0)</div><div class='add'>+#define OMAP2420_AUTOSTATE_IVA_SHIFT			8</div><div class='add'>+#define OMAP2420_AUTOSTATE_IVA_MASK			(1 &lt;&lt; 8)</div><div class='add'>+#define OMAP24XX_AUTOSTATE_DSP_SHIFT			0</div><div class='add'>+#define OMAP24XX_AUTOSTATE_DSP_MASK			(1 &lt;&lt; 0)</div><div class='ctx'> </div><div class='ctx'> /* CM_FCLKEN_MDM */</div><div class='ctx'> /* 2430 only */</div><div class='hunk'>@@ -396,6 +403,7 @@</div><div class='ctx'> </div><div class='ctx'> /* CM_CLKSTCTRL_MDM */</div><div class='ctx'> /* 2430 only */</div><div class='del'>-#define OMAP2430_AUTOSTATE_MDM				(1 &lt;&lt; 0)</div><div class='add'>+#define OMAP2430_AUTOSTATE_MDM_SHIFT			0</div><div class='add'>+#define OMAP2430_AUTOSTATE_MDM_MASK			(1 &lt;&lt; 0)</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-omap2/cm-regbits-34xx.h b/arch/arm/mach-omap2/cm-regbits-34xx.h<br/>index ee4c0ca1a708..219f5c8d9659 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap2/cm-regbits-34xx.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-omap2/cm-regbits-34xx.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap2/cm-regbits-34xx.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/cm-regbits-34xx.h</a></div><div class='hunk'>@@ -96,7 +96,8 @@</div><div class='ctx'> #define OMAP3430_CLKTRCTRL_IVA2_MASK			(0x3 &lt;&lt; 0)</div><div class='ctx'> </div><div class='ctx'> /* CM_CLKSTST_IVA2 */</div><div class='del'>-#define OMAP3430_CLKACTIVITY_IVA2			(1 &lt;&lt; 0)</div><div class='add'>+#define OMAP3430_CLKACTIVITY_IVA2_SHIFT			0</div><div class='add'>+#define OMAP3430_CLKACTIVITY_IVA2_MASK			(1 &lt;&lt; 0)</div><div class='ctx'> </div><div class='ctx'> /* CM_REVISION specific bits */</div><div class='ctx'> </div><div class='hunk'>@@ -140,7 +141,8 @@</div><div class='ctx'> #define OMAP3430_CLKTRCTRL_MPU_MASK			(0x3 &lt;&lt; 0)</div><div class='ctx'> </div><div class='ctx'> /* CM_CLKSTST_MPU */</div><div class='del'>-#define OMAP3430_CLKACTIVITY_MPU			(1 &lt;&lt; 0)</div><div class='add'>+#define OMAP3430_CLKACTIVITY_MPU_SHIFT			0</div><div class='add'>+#define OMAP3430_CLKACTIVITY_MPU_MASK			(1 &lt;&lt; 0)</div><div class='ctx'> </div><div class='ctx'> /* CM_FCLKEN1_CORE specific bits */</div><div class='ctx'> </div><div class='hunk'>@@ -300,9 +302,12 @@</div><div class='ctx'> #define OMAP3430_CLKTRCTRL_L3_MASK			(0x3 &lt;&lt; 0)</div><div class='ctx'> </div><div class='ctx'> /* CM_CLKSTST_CORE */</div><div class='del'>-#define OMAP3430ES1_CLKACTIVITY_D2D			(1 &lt;&lt; 2)</div><div class='del'>-#define OMAP3430_CLKACTIVITY_L4				(1 &lt;&lt; 1)</div><div class='del'>-#define OMAP3430_CLKACTIVITY_L3				(1 &lt;&lt; 0)</div><div class='add'>+#define OMAP3430ES1_CLKACTIVITY_D2D_SHIFT		2</div><div class='add'>+#define OMAP3430ES1_CLKACTIVITY_D2D_MASK		(1 &lt;&lt; 2)</div><div class='add'>+#define OMAP3430_CLKACTIVITY_L4_SHIFT			1</div><div class='add'>+#define OMAP3430_CLKACTIVITY_L4_MASK			(1 &lt;&lt; 1)</div><div class='add'>+#define OMAP3430_CLKACTIVITY_L3_SHIFT			0</div><div class='add'>+#define OMAP3430_CLKACTIVITY_L3_MASK			(1 &lt;&lt; 0)</div><div class='ctx'> </div><div class='ctx'> /* CM_FCLKEN_GFX */</div><div class='ctx'> #define OMAP3430ES1_EN_3D				(1 &lt;&lt; 2)</div><div class='hunk'>@@ -323,7 +328,8 @@</div><div class='ctx'> #define OMAP3430ES1_CLKTRCTRL_GFX_MASK			(0x3 &lt;&lt; 0)</div><div class='ctx'> </div><div class='ctx'> /* CM_CLKSTST_GFX */</div><div class='del'>-#define OMAP3430ES1_CLKACTIVITY_GFX			(1 &lt;&lt; 0)</div><div class='add'>+#define OMAP3430ES1_CLKACTIVITY_GFX_SHIFT		0</div><div class='add'>+#define OMAP3430ES1_CLKACTIVITY_GFX_MASK		(1 &lt;&lt; 0)</div><div class='ctx'> </div><div class='ctx'> /* CM_FCLKEN_SGX */</div><div class='ctx'> #define OMAP3430ES2_EN_SGX_SHIFT			1</div><div class='hunk'>@@ -333,6 +339,14 @@</div><div class='ctx'> #define OMAP3430ES2_CLKSEL_SGX_SHIFT			0</div><div class='ctx'> #define OMAP3430ES2_CLKSEL_SGX_MASK			(0x7 &lt;&lt; 0)</div><div class='ctx'> </div><div class='add'>+/* CM_CLKSTCTRL_SGX */</div><div class='add'>+#define OMAP3430ES2_CLKTRCTRL_SGX_SHIFT			0</div><div class='add'>+#define OMAP3430ES2_CLKTRCTRL_SGX_MASK			(0x3 &lt;&lt; 0)</div><div class='add'>+</div><div class='add'>+/* CM_CLKSTST_SGX */</div><div class='add'>+#define OMAP3430ES2_CLKACTIVITY_SGX_SHIFT		0</div><div class='add'>+#define OMAP3430ES2_CLKACTIVITY_SGX_MASK		(1 &lt;&lt; 0)</div><div class='add'>+</div><div class='ctx'> /* CM_FCLKEN_WKUP specific bits */</div><div class='ctx'> #define OMAP3430ES2_EN_USIMOCP_SHIFT			9</div><div class='ctx'> </div><div class='hunk'>@@ -498,7 +512,8 @@</div><div class='ctx'> #define OMAP3430_CLKTRCTRL_DSS_MASK			(0x3 &lt;&lt; 0)</div><div class='ctx'> </div><div class='ctx'> /* CM_CLKSTST_DSS */</div><div class='del'>-#define OMAP3430_CLKACTIVITY_DSS			(1 &lt;&lt; 0)</div><div class='add'>+#define OMAP3430_CLKACTIVITY_DSS_SHIFT			0</div><div class='add'>+#define OMAP3430_CLKACTIVITY_DSS_MASK			(1 &lt;&lt; 0)</div><div class='ctx'> </div><div class='ctx'> /* CM_FCLKEN_CAM specific bits */</div><div class='ctx'> </div><div class='hunk'>@@ -522,7 +537,8 @@</div><div class='ctx'> #define OMAP3430_CLKTRCTRL_CAM_MASK			(0x3 &lt;&lt; 0)</div><div class='ctx'> </div><div class='ctx'> /* CM_CLKSTST_CAM */</div><div class='del'>-#define OMAP3430_CLKACTIVITY_CAM			(1 &lt;&lt; 0)</div><div class='add'>+#define OMAP3430_CLKACTIVITY_CAM_SHIFT			0</div><div class='add'>+#define OMAP3430_CLKACTIVITY_CAM_MASK			(1 &lt;&lt; 0)</div><div class='ctx'> </div><div class='ctx'> /* CM_FCLKEN_PER specific bits */</div><div class='ctx'> </div><div class='hunk'>@@ -598,7 +614,8 @@</div><div class='ctx'> #define OMAP3430_CLKTRCTRL_PER_MASK			(0x3 &lt;&lt; 0)</div><div class='ctx'> </div><div class='ctx'> /* CM_CLKSTST_PER */</div><div class='del'>-#define OMAP3430_CLKACTIVITY_PER			(1 &lt;&lt; 0)</div><div class='add'>+#define OMAP3430_CLKACTIVITY_PER_SHIFT			0</div><div class='add'>+#define OMAP3430_CLKACTIVITY_PER_MASK			(1 &lt;&lt; 0)</div><div class='ctx'> </div><div class='ctx'> /* CM_CLKSEL1_EMU */</div><div class='ctx'> #define OMAP3430_DIV_DPLL4_SHIFT			24</div><div class='hunk'>@@ -623,7 +640,8 @@</div><div class='ctx'> #define OMAP3430_CLKTRCTRL_EMU_MASK			(0x3 &lt;&lt; 0)</div><div class='ctx'> </div><div class='ctx'> /* CM_CLKSTST_EMU */</div><div class='del'>-#define OMAP3430_CLKACTIVITY_EMU			(1 &lt;&lt; 0)</div><div class='add'>+#define OMAP3430_CLKACTIVITY_EMU_SHIFT			0</div><div class='add'>+#define OMAP3430_CLKACTIVITY_EMU_MASK			(1 &lt;&lt; 0)</div><div class='ctx'> </div><div class='ctx'> /* CM_CLKSEL2_EMU specific bits */</div><div class='ctx'> #define OMAP3430_CORE_DPLL_EMU_MULT_SHIFT		8</div><div class='hunk'>@@ -673,6 +691,8 @@</div><div class='ctx'> #define OMAP3430ES2_CLKTRCTRL_USBHOST_SHIFT		0</div><div class='ctx'> #define OMAP3430ES2_CLKTRCTRL_USBHOST_MASK		(3 &lt;&lt; 0)</div><div class='ctx'> </div><div class='del'>-</div><div class='add'>+/* CM_CLKSTST_USBHOST */</div><div class='add'>+#define OMAP3430ES2_CLKACTIVITY_USBHOST_SHIFT		0</div><div class='add'>+#define OMAP3430ES2_CLKACTIVITY_USBHOST_MASK		(1 &lt;&lt; 0)</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-omap2/cm.h b/arch/arm/mach-omap2/cm.h<br/>index 87a44c715aa4..65fdf78c91e1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap2/cm.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-omap2/cm.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap2/cm.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/cm.h</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASSEMBLER__</div><div class='ctx'> #define OMAP_CM_REGADDR(module, reg)					\</div><div class='del'>-	(void __iomem *)IO_ADDRESS(OMAP2_CM_BASE + (module) + (reg))</div><div class='add'>+			IO_ADDRESS(OMAP2_CM_BASE + (module) + (reg))</div><div class='ctx'> #else</div><div class='ctx'> #define OMAP2420_CM_REGADDR(module, reg)				\</div><div class='ctx'> 			IO_ADDRESS(OMAP2420_CM_BASE + (module) + (reg))</div><div class='head'>diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c<br/>index 7a7f02559075..90af2ac469aa 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap2/devices.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-omap2/devices.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap2/devices.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/devices.c</a></div><div class='hunk'>@@ -13,9 +13,9 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -23,50 +23,7 @@</div><div class='ctx'> #include &lt;mach/board.h&gt;</div><div class='ctx'> #include &lt;mach/mux.h&gt;</div><div class='ctx'> #include &lt;mach/gpio.h&gt;</div><div class='del'>-</div><div class='del'>-#if	defined(CONFIG_I2C_OMAP) || defined(CONFIG_I2C_OMAP_MODULE)</div><div class='del'>-</div><div class='del'>-#define OMAP2_I2C_BASE2		0x48072000</div><div class='del'>-#define OMAP2_I2C_INT2		57</div><div class='del'>-</div><div class='del'>-static struct resource i2c_resources2[] = {</div><div class='del'>-	{</div><div class='del'>-		.start		= OMAP2_I2C_BASE2,</div><div class='del'>-		.end		= OMAP2_I2C_BASE2 + 0x3f,</div><div class='del'>-		.flags		= IORESOURCE_MEM,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.start		= OMAP2_I2C_INT2,</div><div class='del'>-		.flags		= IORESOURCE_IRQ,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct platform_device omap_i2c_device2 = {</div><div class='del'>-	.name           = "i2c_omap",</div><div class='del'>-	.id             = 2,</div><div class='del'>-	.num_resources	= ARRAY_SIZE(i2c_resources2),</div><div class='del'>-	.resource	= i2c_resources2,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* See also arch/arm/plat-omap/devices.c for first I2C on 24xx */</div><div class='del'>-static void omap_init_i2c(void)</div><div class='del'>-{</div><div class='del'>-	/* REVISIT: Second I2C not in use on H4? */</div><div class='del'>-	if (machine_is_omap_h4())</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (!cpu_is_omap2430()) {</div><div class='del'>-		omap_cfg_reg(J15_24XX_I2C2_SCL);</div><div class='del'>-		omap_cfg_reg(H19_24XX_I2C2_SDA);</div><div class='del'>-	}</div><div class='del'>-	(void) platform_device_register(&amp;omap_i2c_device2);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-</div><div class='del'>-static void omap_init_i2c(void) {}</div><div class='del'>-</div><div class='del'>-#endif</div><div class='add'>+#include &lt;mach/eac.h&gt;</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_OMAP_DSP) || defined(CONFIG_OMAP_DSP_MODULE)</div><div class='ctx'> #define OMAP2_MBOX_BASE		IO_ADDRESS(OMAP24XX_MAILBOX_BASE)</div><div class='hunk'>@@ -104,7 +61,9 @@ static inline void omap_init_mbox(void) { }</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_OMAP_STI)</div><div class='ctx'> </div><div class='del'>-#define OMAP2_STI_BASE		IO_ADDRESS(0x48068000)</div><div class='add'>+#if defined(CONFIG_ARCH_OMAP2)</div><div class='add'>+</div><div class='add'>+#define OMAP2_STI_BASE		0x48068000</div><div class='ctx'> #define OMAP2_STI_CHANNEL_BASE	0x54000000</div><div class='ctx'> #define OMAP2_STI_IRQ		4</div><div class='ctx'> </div><div class='hunk'>@@ -124,6 +83,25 @@ static struct resource sti_resources[] = {</div><div class='ctx'> 		.flags		= IORESOURCE_IRQ,</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='add'>+#elif defined(CONFIG_ARCH_OMAP3)</div><div class='add'>+</div><div class='add'>+#define OMAP3_SDTI_BASE		0x54500000</div><div class='add'>+#define OMAP3_SDTI_CHANNEL_BASE	0x54600000</div><div class='add'>+</div><div class='add'>+static struct resource sti_resources[] = {</div><div class='add'>+	{</div><div class='add'>+		.start		= OMAP3_SDTI_BASE,</div><div class='add'>+		.end		= OMAP3_SDTI_BASE + 0xFFF,</div><div class='add'>+		.flags		= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.start		= OMAP3_SDTI_CHANNEL_BASE,</div><div class='add'>+		.end		= OMAP3_SDTI_CHANNEL_BASE + SZ_1M - 1,</div><div class='add'>+		.flags		= IORESOURCE_MEM,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> static struct platform_device sti_device = {</div><div class='ctx'> 	.name		= "sti",</div><div class='hunk'>@@ -140,12 +118,14 @@ static inline void omap_init_sti(void)</div><div class='ctx'> static inline void omap_init_sti(void) {}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SPI_OMAP24XX)</div><div class='add'>+#if defined(CONFIG_SPI_OMAP24XX) || defined(CONFIG_SPI_OMAP24XX_MODULE)</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/mcspi.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define OMAP2_MCSPI1_BASE		0x48098000</div><div class='ctx'> #define OMAP2_MCSPI2_BASE		0x4809a000</div><div class='add'>+#define OMAP2_MCSPI3_BASE		0x480b8000</div><div class='add'>+#define OMAP2_MCSPI4_BASE		0x480ba000</div><div class='ctx'> </div><div class='ctx'> static struct omap2_mcspi_platform_config omap2_mcspi1_config = {</div><div class='ctx'> 	.num_cs		= 4,</div><div class='hunk'>@@ -159,7 +139,7 @@ static struct resource omap2_mcspi1_resources[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct platform_device omap2_mcspi1 = {</div><div class='add'>+static struct platform_device omap2_mcspi1 = {</div><div class='ctx'> 	.name		= "omap2_mcspi",</div><div class='ctx'> 	.id		= 1,</div><div class='ctx'> 	.num_resources	= ARRAY_SIZE(omap2_mcspi1_resources),</div><div class='hunk'>@@ -181,7 +161,7 @@ static struct resource omap2_mcspi2_resources[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct platform_device omap2_mcspi2 = {</div><div class='add'>+static struct platform_device omap2_mcspi2 = {</div><div class='ctx'> 	.name		= "omap2_mcspi",</div><div class='ctx'> 	.id		= 2,</div><div class='ctx'> 	.num_resources	= ARRAY_SIZE(omap2_mcspi2_resources),</div><div class='hunk'>@@ -191,16 +171,162 @@ struct platform_device omap2_mcspi2 = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3)</div><div class='add'>+static struct omap2_mcspi_platform_config omap2_mcspi3_config = {</div><div class='add'>+	.num_cs		= 2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource omap2_mcspi3_resources[] = {</div><div class='add'>+	{</div><div class='add'>+	.start		= OMAP2_MCSPI3_BASE,</div><div class='add'>+	.end		= OMAP2_MCSPI3_BASE + 0xff,</div><div class='add'>+	.flags		= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device omap2_mcspi3 = {</div><div class='add'>+	.name		= "omap2_mcspi",</div><div class='add'>+	.id		= 3,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(omap2_mcspi3_resources),</div><div class='add'>+	.resource	= omap2_mcspi3_resources,</div><div class='add'>+	.dev		= {</div><div class='add'>+		.platform_data = &amp;omap2_mcspi3_config,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ARCH_OMAP3</div><div class='add'>+static struct omap2_mcspi_platform_config omap2_mcspi4_config = {</div><div class='add'>+	.num_cs		= 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource omap2_mcspi4_resources[] = {</div><div class='add'>+	{</div><div class='add'>+		.start		= OMAP2_MCSPI4_BASE,</div><div class='add'>+		.end		= OMAP2_MCSPI4_BASE + 0xff,</div><div class='add'>+		.flags		= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device omap2_mcspi4 = {</div><div class='add'>+	.name		= "omap2_mcspi",</div><div class='add'>+	.id		= 4,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(omap2_mcspi4_resources),</div><div class='add'>+	.resource	= omap2_mcspi4_resources,</div><div class='add'>+	.dev		= {</div><div class='add'>+		.platform_data = &amp;omap2_mcspi4_config,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static void omap_init_mcspi(void)</div><div class='ctx'> {</div><div class='ctx'> 	platform_device_register(&amp;omap2_mcspi1);</div><div class='ctx'> 	platform_device_register(&amp;omap2_mcspi2);</div><div class='add'>+#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3)</div><div class='add'>+	platform_device_register(&amp;omap2_mcspi3);</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_ARCH_OMAP3</div><div class='add'>+	platform_device_register(&amp;omap2_mcspi4);</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='ctx'> static inline void omap_init_mcspi(void) {}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_SND_OMAP24XX_EAC</div><div class='add'>+</div><div class='add'>+#define OMAP2_EAC_BASE			0x48090000</div><div class='add'>+</div><div class='add'>+static struct resource omap2_eac_resources[] = {</div><div class='add'>+	{</div><div class='add'>+		.start		= OMAP2_EAC_BASE,</div><div class='add'>+		.end		= OMAP2_EAC_BASE + 0x109,</div><div class='add'>+		.flags		= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device omap2_eac_device = {</div><div class='add'>+	.name		= "omap24xx-eac",</div><div class='add'>+	.id		= -1,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(omap2_eac_resources),</div><div class='add'>+	.resource	= omap2_eac_resources,</div><div class='add'>+	.dev = {</div><div class='add'>+		.platform_data = NULL,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void omap_init_eac(struct eac_platform_data *pdata)</div><div class='add'>+{</div><div class='add'>+	omap2_eac_device.dev.platform_data = pdata;</div><div class='add'>+	platform_device_register(&amp;omap2_eac_device);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+void omap_init_eac(struct eac_platform_data *pdata) {}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_OMAP_SHA1_MD5</div><div class='add'>+static struct resource sha1_md5_resources[] = {</div><div class='add'>+	{</div><div class='add'>+		.start	= OMAP24XX_SEC_SHA1MD5_BASE,</div><div class='add'>+		.end	= OMAP24XX_SEC_SHA1MD5_BASE + 0x64,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.start	= INT_24XX_SHA1MD5,</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device sha1_md5_device = {</div><div class='add'>+	.name		= "OMAP SHA1/MD5",</div><div class='add'>+	.id		= -1,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(sha1_md5_resources),</div><div class='add'>+	.resource	= sha1_md5_resources,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void omap_init_sha1_md5(void)</div><div class='add'>+{</div><div class='add'>+	platform_device_register(&amp;sha1_md5_device);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline void omap_init_sha1_md5(void) { }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_HDQ_MASTER_OMAP) || defined(CONFIG_HDQ_MASTER_OMAP_MODULE)</div><div class='add'>+#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3430)</div><div class='add'>+#define OMAP_HDQ_BASE	0x480B2000</div><div class='add'>+#endif</div><div class='add'>+static struct resource omap_hdq_resources[] = {</div><div class='add'>+	{</div><div class='add'>+		.start		= OMAP_HDQ_BASE,</div><div class='add'>+		.end		= OMAP_HDQ_BASE + 0x1C,</div><div class='add'>+		.flags		= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.start		= INT_24XX_HDQ_IRQ,</div><div class='add'>+		.flags		= IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+static struct platform_device omap_hdq_dev = {</div><div class='add'>+	.name = "omap_hdq",</div><div class='add'>+	.id = 0,</div><div class='add'>+	.dev = {</div><div class='add'>+		.platform_data = NULL,</div><div class='add'>+	},</div><div class='add'>+	.num_resources	= ARRAY_SIZE(omap_hdq_resources),</div><div class='add'>+	.resource	= omap_hdq_resources,</div><div class='add'>+};</div><div class='add'>+static inline void omap_hdq_init(void)</div><div class='add'>+{</div><div class='add'>+	(void) platform_device_register(&amp;omap_hdq_dev);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline void omap_hdq_init(void) {}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /*-------------------------------------------------------------------------*/</div><div class='ctx'> </div><div class='ctx'> static int __init omap2_init_devices(void)</div><div class='hunk'>@@ -208,10 +334,11 @@ static int __init omap2_init_devices(void)</div><div class='ctx'> 	/* please keep these calls, and their implementations above,</div><div class='ctx'> 	 * in alphabetical order so they're easier to sort through.</div><div class='ctx'> 	 */</div><div class='del'>-	omap_init_i2c();</div><div class='ctx'> 	omap_init_mbox();</div><div class='ctx'> 	omap_init_mcspi();</div><div class='add'>+	omap_hdq_init();</div><div class='ctx'> 	omap_init_sti();</div><div class='add'>+	omap_init_sha1_md5();</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c<br/>index f51d69bc457d..763bdbeaf681 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap2/gpmc.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-omap2/gpmc.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap2/gpmc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/gpmc.c</a></div><div class='hunk'>@@ -9,27 +9,23 @@</div><div class='ctx'>  * it under the terms of the GNU General Public License version 2 as</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='add'>+#undef DEBUG</div><div class='add'>+</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;mach/gpmc.h&gt;</div><div class='ctx'> </div><div class='del'>-#undef DEBUG</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_ARCH_OMAP2420</div><div class='del'>-#define GPMC_BASE		0x6800a000</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_ARCH_OMAP2430</div><div class='del'>-#define GPMC_BASE		0x6E000000</div><div class='del'>-#endif</div><div class='add'>+#include &lt;mach/sdrc.h&gt;</div><div class='ctx'> </div><div class='add'>+/* GPMC register offsets */</div><div class='ctx'> #define GPMC_REVISION		0x00</div><div class='ctx'> #define GPMC_SYSCONFIG		0x10</div><div class='ctx'> #define GPMC_SYSSTATUS		0x14</div><div class='hunk'>@@ -51,7 +47,6 @@</div><div class='ctx'> #define GPMC_CS0		0x60</div><div class='ctx'> #define GPMC_CS_SIZE		0x30</div><div class='ctx'> </div><div class='del'>-#define GPMC_CS_NUM		8</div><div class='ctx'> #define GPMC_MEM_START		0x00000000</div><div class='ctx'> #define GPMC_MEM_END		0x3FFFFFFF</div><div class='ctx'> #define BOOT_ROM_SPACE		0x100000	/* 1MB */</div><div class='hunk'>@@ -64,12 +59,9 @@ static struct resource	gpmc_cs_mem[GPMC_CS_NUM];</div><div class='ctx'> static DEFINE_SPINLOCK(gpmc_mem_lock);</div><div class='ctx'> static unsigned		gpmc_cs_map;</div><div class='ctx'> </div><div class='del'>-static void __iomem *gpmc_base =</div><div class='del'>-	(void __iomem *) IO_ADDRESS(GPMC_BASE);</div><div class='del'>-static void __iomem *gpmc_cs_base =</div><div class='del'>-	(void __iomem *) IO_ADDRESS(GPMC_BASE) + GPMC_CS0;</div><div class='add'>+static void __iomem *gpmc_base;</div><div class='ctx'> </div><div class='del'>-static struct clk *gpmc_fck;</div><div class='add'>+static struct clk *gpmc_l3_clk;</div><div class='ctx'> </div><div class='ctx'> static void gpmc_write_reg(int idx, u32 val)</div><div class='ctx'> {</div><div class='hunk'>@@ -85,19 +77,32 @@ void gpmc_cs_write_reg(int cs, int idx, u32 val)</div><div class='ctx'> {</div><div class='ctx'> 	void __iomem *reg_addr;</div><div class='ctx'> </div><div class='del'>-	reg_addr = gpmc_cs_base + (cs * GPMC_CS_SIZE) + idx;</div><div class='add'>+	reg_addr = gpmc_base + GPMC_CS0 + (cs * GPMC_CS_SIZE) + idx;</div><div class='ctx'> 	__raw_writel(val, reg_addr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> u32 gpmc_cs_read_reg(int cs, int idx)</div><div class='ctx'> {</div><div class='del'>-	return __raw_readl(gpmc_cs_base + (cs * GPMC_CS_SIZE) + idx);</div><div class='add'>+	void __iomem *reg_addr;</div><div class='add'>+</div><div class='add'>+	reg_addr = gpmc_base + GPMC_CS0 + (cs * GPMC_CS_SIZE) + idx;</div><div class='add'>+	return __raw_readl(reg_addr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* TODO: Add support for gpmc_fck to clock framework and use it */</div><div class='ctx'> unsigned long gpmc_get_fclk_period(void)</div><div class='ctx'> {</div><div class='del'>-	/* In picoseconds */</div><div class='del'>-	return 1000000000 / ((clk_get_rate(gpmc_fck)) / 1000);</div><div class='add'>+	unsigned long rate = clk_get_rate(gpmc_l3_clk);</div><div class='add'>+</div><div class='add'>+	if (rate == 0) {</div><div class='add'>+		printk(KERN_WARNING "gpmc_l3_clk not enabled\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rate /= 1000;</div><div class='add'>+	rate = 1000000000 / rate;	/* In picoseconds */</div><div class='add'>+</div><div class='add'>+	return rate;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> unsigned int gpmc_ns_to_ticks(unsigned int time_ns)</div><div class='hunk'>@@ -110,6 +115,11 @@ unsigned int gpmc_ns_to_ticks(unsigned int time_ns)</div><div class='ctx'> 	return (time_ns * 1000 + tick_ps - 1) / tick_ps;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+unsigned int gpmc_ticks_to_ns(unsigned int ticks)</div><div class='add'>+{</div><div class='add'>+	return ticks * gpmc_get_fclk_period() / 1000;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> unsigned int gpmc_round_ns_to_ticks(unsigned int time_ns)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long ticks = gpmc_ns_to_ticks(time_ns);</div><div class='hunk'>@@ -210,6 +220,11 @@ int gpmc_cs_set_timings(int cs, const struct gpmc_timings *t)</div><div class='ctx'> </div><div class='ctx'> 	GPMC_SET_ONE(GPMC_CS_CONFIG5, 24, 27, page_burst_access);</div><div class='ctx'> </div><div class='add'>+	if (cpu_is_omap34xx()) {</div><div class='add'>+		GPMC_SET_ONE(GPMC_CS_CONFIG6, 16, 19, wr_data_mux_bus);</div><div class='add'>+		GPMC_SET_ONE(GPMC_CS_CONFIG6, 24, 28, wr_access);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* caller is expected to have initialized CONFIG1 to cover</div><div class='ctx'> 	 * at least sync vs async</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -350,6 +365,7 @@ out:</div><div class='ctx'> 	spin_unlock(&amp;gpmc_mem_lock);</div><div class='ctx'> 	return r;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(gpmc_cs_request);</div><div class='ctx'> </div><div class='ctx'> void gpmc_cs_free(int cs)</div><div class='ctx'> {</div><div class='hunk'>@@ -365,8 +381,9 @@ void gpmc_cs_free(int cs)</div><div class='ctx'> 	gpmc_cs_set_reserved(cs, 0);</div><div class='ctx'> 	spin_unlock(&amp;gpmc_mem_lock);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(gpmc_cs_free);</div><div class='ctx'> </div><div class='del'>-void __init gpmc_mem_init(void)</div><div class='add'>+static void __init gpmc_mem_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int cs;</div><div class='ctx'> 	unsigned long boot_rom_space = 0;</div><div class='hunk'>@@ -396,12 +413,33 @@ void __init gpmc_mem_init(void)</div><div class='ctx'> void __init gpmc_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	u32 l;</div><div class='add'>+	char *ck;</div><div class='add'>+</div><div class='add'>+	if (cpu_is_omap24xx()) {</div><div class='add'>+		ck = "core_l3_ck";</div><div class='add'>+		if (cpu_is_omap2420())</div><div class='add'>+			l = OMAP2420_GPMC_BASE;</div><div class='add'>+		else</div><div class='add'>+			l = OMAP34XX_GPMC_BASE;</div><div class='add'>+	} else if (cpu_is_omap34xx()) {</div><div class='add'>+		ck = "gpmc_fck";</div><div class='add'>+		l = OMAP34XX_GPMC_BASE;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	gpmc_fck = clk_get(NULL, "gpmc_fck"); /* Always on ENABLE_ON_INIT */</div><div class='del'>-	if (IS_ERR(gpmc_fck))</div><div class='del'>-		WARN_ON(1);</div><div class='del'>-	else</div><div class='del'>-		clk_enable(gpmc_fck);</div><div class='add'>+	gpmc_l3_clk = clk_get(NULL, ck);</div><div class='add'>+	if (IS_ERR(gpmc_l3_clk)) {</div><div class='add'>+		printk(KERN_ERR "Could not get GPMC clock %s\n", ck);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	gpmc_base = ioremap(l, SZ_4K);</div><div class='add'>+	if (!gpmc_base) {</div><div class='add'>+		clk_put(gpmc_l3_clk);</div><div class='add'>+		printk(KERN_ERR "Could not get GPMC register memory\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	BUG_ON(IS_ERR(gpmc_l3_clk));</div><div class='ctx'> </div><div class='ctx'> 	l = gpmc_read_reg(GPMC_REVISION);</div><div class='ctx'> 	printk(KERN_INFO "GPMC revision %d.%d\n", (l &gt;&gt; 4) &amp; 0x0f, l &amp; 0x0f);</div><div class='head'>diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c<br/>index a5d4526ac4d6..bf45ff39a7b5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap2/id.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-omap2/id.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap2/id.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/id.c</a></div><div class='hunk'>@@ -14,27 +14,19 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/cputype.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;mach/common.h&gt;</div><div class='ctx'> #include &lt;mach/control.h&gt;</div><div class='ctx'> #include &lt;mach/cpu.h&gt;</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_ARCH_OMAP2420)</div><div class='del'>-#define TAP_BASE	io_p2v(0x48014000)</div><div class='del'>-#elif defined(CONFIG_ARCH_OMAP2430)</div><div class='del'>-#define TAP_BASE	io_p2v(0x4900A000)</div><div class='del'>-#elif defined(CONFIG_ARCH_OMAP34XX)</div><div class='del'>-#define TAP_BASE	io_p2v(0x4830A000)</div><div class='del'>-#endif</div><div class='add'>+static u32 class;</div><div class='add'>+static void __iomem *tap_base;</div><div class='add'>+static u16 tap_prod_id;</div><div class='ctx'> </div><div class='ctx'> #define OMAP_TAP_IDCODE		0x0204</div><div class='del'>-#if defined(CONFIG_ARCH_OMAP34XX)</div><div class='del'>-#define OMAP_TAP_PROD_ID	0x0210</div><div class='del'>-#else</div><div class='del'>-#define OMAP_TAP_PROD_ID	0x0208</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #define OMAP_TAP_DIE_ID_0	0x0218</div><div class='ctx'> #define OMAP_TAP_DIE_ID_1	0x021C</div><div class='ctx'> #define OMAP_TAP_DIE_ID_2	0x0220</div><div class='hunk'>@@ -93,18 +85,24 @@ static u32 __init read_tap_reg(int reg)</div><div class='ctx'> 	 * it means its Cortex r0p0 which is 3430 ES1</div><div class='ctx'> 	 */</div><div class='ctx'> 	if ((((cpuid &gt;&gt; 4) &amp; 0xFFF) == 0xC08) &amp;&amp; ((cpuid &amp; 0xF) == 0x0)) {</div><div class='add'>+</div><div class='add'>+		if (reg == tap_prod_id) {</div><div class='add'>+			regval = 0x000F00F0;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		switch (reg) {</div><div class='ctx'> 		case OMAP_TAP_IDCODE  : regval = 0x0B7AE02F; break;</div><div class='ctx'> 		/* Making DevType as 0xF in ES1 to differ from ES2 */</div><div class='del'>-		case OMAP_TAP_PROD_ID : regval = 0x000F00F0; break;</div><div class='ctx'> 		case OMAP_TAP_DIE_ID_0: regval = 0x01000000; break;</div><div class='ctx'> 		case OMAP_TAP_DIE_ID_1: regval = 0x1012d687; break;</div><div class='ctx'> 		case OMAP_TAP_DIE_ID_2:	regval = 0x00000000; break;</div><div class='ctx'> 		case OMAP_TAP_DIE_ID_3:	regval = 0x2d2c0000; break;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else</div><div class='del'>-		regval = __raw_readl(TAP_BASE + reg);</div><div class='add'>+		regval = __raw_readl(tap_base + reg);</div><div class='ctx'> </div><div class='add'>+out:</div><div class='ctx'> 	return regval;</div><div class='ctx'> </div><div class='ctx'> }</div><div class='hunk'>@@ -203,7 +201,7 @@ void __init omap2_check_revision(void)</div><div class='ctx'> 	u8  rev;</div><div class='ctx'> </div><div class='ctx'> 	idcode = read_tap_reg(OMAP_TAP_IDCODE);</div><div class='del'>-	prod_id = read_tap_reg(OMAP_TAP_PROD_ID);</div><div class='add'>+	prod_id = read_tap_reg(tap_prod_id);</div><div class='ctx'> 	hawkeye = (idcode &gt;&gt; 12) &amp; 0xffff;</div><div class='ctx'> 	rev = (idcode &gt;&gt; 28) &amp; 0x0f;</div><div class='ctx'> 	dev_type = (prod_id &gt;&gt; 16) &amp; 0x0f;</div><div class='hunk'>@@ -268,3 +266,13 @@ void __init omap2_check_revision(void)</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void __init omap2_set_globals_tap(struct omap_globals *omap2_globals)</div><div class='add'>+{</div><div class='add'>+	class = omap2_globals-&gt;class;</div><div class='add'>+	tap_base = omap2_globals-&gt;tap;</div><div class='add'>+</div><div class='add'>+	if (class == 0x3430)</div><div class='add'>+		tap_prod_id = 0x0210;</div><div class='add'>+	else</div><div class='add'>+		tap_prod_id = 0x0208;</div><div class='add'>+}</div><div class='head'>diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c<br/>index 987351f07d7b..5ea64f926ed5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap2/io.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-omap2/io.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap2/io.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/io.c</a></div><div class='hunk'>@@ -4,8 +4,11 @@</div><div class='ctx'>  * OMAP2 I/O mapping code</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2005 Nokia Corporation</div><div class='del'>- * Author: Juha Yrjölä &lt;juha.yrjola@nokia.com&gt;</div><div class='del'>- * Updated map desc to add 2430 support : &lt;x0khasim@ti.com&gt;</div><div class='add'>+ * Copyright (C) 2007 Texas Instruments</div><div class='add'>+ *</div><div class='add'>+ * Author:</div><div class='add'>+ *	Juha Yrjola &lt;juha.yrjola@nokia.com&gt;</div><div class='add'>+ *	Syed Khasim &lt;x0khasim@ti.com&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of the GNU General Public License version 2 as</div><div class='hunk'>@@ -15,27 +18,34 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/tlb.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/mux.h&gt;</div><div class='ctx'> #include &lt;mach/omapfb.h&gt;</div><div class='add'>+#include &lt;mach/sram.h&gt;</div><div class='add'>+</div><div class='add'>+#include "memory.h"</div><div class='add'>+</div><div class='add'>+#include "clock.h"</div><div class='add'>+</div><div class='add'>+#include &lt;mach/powerdomain.h&gt;</div><div class='add'>+</div><div class='add'>+#include "powerdomains.h"</div><div class='ctx'> </div><div class='del'>-extern void omap_sram_init(void);</div><div class='del'>-extern int omap2_clk_init(void);</div><div class='del'>-extern void omap2_check_revision(void);</div><div class='del'>-extern void omap2_init_memory(void);</div><div class='del'>-extern void gpmc_init(void);</div><div class='del'>-extern void omapfb_reserve_sdram(void);</div><div class='add'>+#include &lt;mach/clockdomain.h&gt;</div><div class='add'>+#include "clockdomains.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * The machine specific code may provide the extra mapping besides the</div><div class='ctx'>  * default mapping provided here.</div><div class='ctx'>  */</div><div class='del'>-static struct map_desc omap2_io_desc[] __initdata = {</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ARCH_OMAP24XX</div><div class='add'>+static struct map_desc omap24xx_io_desc[] __initdata = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.virtual	= L3_24XX_VIRT,</div><div class='ctx'> 		.pfn		= __phys_to_pfn(L3_24XX_PHYS),</div><div class='hunk'>@@ -43,12 +53,39 @@ static struct map_desc omap2_io_desc[] __initdata = {</div><div class='ctx'> 		.type		= MT_DEVICE</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='del'>-		.virtual        = L4_24XX_VIRT,</div><div class='del'>-		.pfn            = __phys_to_pfn(L4_24XX_PHYS),</div><div class='del'>-		.length         = L4_24XX_SIZE,</div><div class='del'>-		.type           = MT_DEVICE</div><div class='add'>+		.virtual	= L4_24XX_VIRT,</div><div class='add'>+		.pfn		= __phys_to_pfn(L4_24XX_PHYS),</div><div class='add'>+		.length		= L4_24XX_SIZE,</div><div class='add'>+		.type		= MT_DEVICE</div><div class='ctx'> 	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ARCH_OMAP2420</div><div class='add'>+static struct map_desc omap242x_io_desc[] __initdata = {</div><div class='add'>+	{</div><div class='add'>+		.virtual	= DSP_MEM_24XX_VIRT,</div><div class='add'>+		.pfn		= __phys_to_pfn(DSP_MEM_24XX_PHYS),</div><div class='add'>+		.length		= DSP_MEM_24XX_SIZE,</div><div class='add'>+		.type		= MT_DEVICE</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.virtual	= DSP_IPI_24XX_VIRT,</div><div class='add'>+		.pfn		= __phys_to_pfn(DSP_IPI_24XX_PHYS),</div><div class='add'>+		.length		= DSP_IPI_24XX_SIZE,</div><div class='add'>+		.type		= MT_DEVICE</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.virtual	= DSP_MMU_24XX_VIRT,</div><div class='add'>+		.pfn		= __phys_to_pfn(DSP_MMU_24XX_PHYS),</div><div class='add'>+		.length		= DSP_MMU_24XX_SIZE,</div><div class='add'>+		.type		= MT_DEVICE</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_ARCH_OMAP2430</div><div class='add'>+static struct map_desc omap243x_io_desc[] __initdata = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.virtual	= L4_WK_243X_VIRT,</div><div class='ctx'> 		.pfn		= __phys_to_pfn(L4_WK_243X_PHYS),</div><div class='hunk'>@@ -61,30 +98,90 @@ static struct map_desc omap2_io_desc[] __initdata = {</div><div class='ctx'> 		.length		= OMAP243X_GPMC_SIZE,</div><div class='ctx'> 		.type		= MT_DEVICE</div><div class='ctx'> 	},</div><div class='add'>+	{</div><div class='add'>+		.virtual	= OMAP243X_SDRC_VIRT,</div><div class='add'>+		.pfn		= __phys_to_pfn(OMAP243X_SDRC_PHYS),</div><div class='add'>+		.length		= OMAP243X_SDRC_SIZE,</div><div class='add'>+		.type		= MT_DEVICE</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.virtual	= OMAP243X_SMS_VIRT,</div><div class='add'>+		.pfn		= __phys_to_pfn(OMAP243X_SMS_PHYS),</div><div class='add'>+		.length		= OMAP243X_SMS_SIZE,</div><div class='add'>+		.type		= MT_DEVICE</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='add'>+#ifdef	CONFIG_ARCH_OMAP34XX</div><div class='add'>+static struct map_desc omap34xx_io_desc[] __initdata = {</div><div class='ctx'> 	{</div><div class='del'>-		.virtual	= DSP_MEM_24XX_VIRT,</div><div class='del'>-		.pfn		= __phys_to_pfn(DSP_MEM_24XX_PHYS),</div><div class='del'>-		.length		= DSP_MEM_24XX_SIZE,</div><div class='add'>+		.virtual	= L3_34XX_VIRT,</div><div class='add'>+		.pfn		= __phys_to_pfn(L3_34XX_PHYS),</div><div class='add'>+		.length		= L3_34XX_SIZE,</div><div class='ctx'> 		.type		= MT_DEVICE</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='del'>-		.virtual	= DSP_IPI_24XX_VIRT,</div><div class='del'>-		.pfn		= __phys_to_pfn(DSP_IPI_24XX_PHYS),</div><div class='del'>-		.length		= DSP_IPI_24XX_SIZE,</div><div class='add'>+		.virtual	= L4_34XX_VIRT,</div><div class='add'>+		.pfn		= __phys_to_pfn(L4_34XX_PHYS),</div><div class='add'>+		.length		= L4_34XX_SIZE,</div><div class='ctx'> 		.type		= MT_DEVICE</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='del'>-		.virtual	= DSP_MMU_24XX_VIRT,</div><div class='del'>-		.pfn		= __phys_to_pfn(DSP_MMU_24XX_PHYS),</div><div class='del'>-		.length		= DSP_MMU_24XX_SIZE,</div><div class='add'>+		.virtual	= L4_WK_34XX_VIRT,</div><div class='add'>+		.pfn		= __phys_to_pfn(L4_WK_34XX_PHYS),</div><div class='add'>+		.length		= L4_WK_34XX_SIZE,</div><div class='add'>+		.type		= MT_DEVICE</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.virtual	= OMAP34XX_GPMC_VIRT,</div><div class='add'>+		.pfn		= __phys_to_pfn(OMAP34XX_GPMC_PHYS),</div><div class='add'>+		.length		= OMAP34XX_GPMC_SIZE,</div><div class='ctx'> 		.type		= MT_DEVICE</div><div class='del'>-	}</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.virtual	= OMAP343X_SMS_VIRT,</div><div class='add'>+		.pfn		= __phys_to_pfn(OMAP343X_SMS_PHYS),</div><div class='add'>+		.length		= OMAP343X_SMS_SIZE,</div><div class='add'>+		.type		= MT_DEVICE</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.virtual	= OMAP343X_SDRC_VIRT,</div><div class='add'>+		.pfn		= __phys_to_pfn(OMAP343X_SDRC_PHYS),</div><div class='add'>+		.length		= OMAP343X_SDRC_SIZE,</div><div class='add'>+		.type		= MT_DEVICE</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.virtual	= L4_PER_34XX_VIRT,</div><div class='add'>+		.pfn		= __phys_to_pfn(L4_PER_34XX_PHYS),</div><div class='add'>+		.length		= L4_PER_34XX_SIZE,</div><div class='add'>+		.type		= MT_DEVICE</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.virtual	= L4_EMU_34XX_VIRT,</div><div class='add'>+		.pfn		= __phys_to_pfn(L4_EMU_34XX_PHYS),</div><div class='add'>+		.length		= L4_EMU_34XX_SIZE,</div><div class='add'>+		.type		= MT_DEVICE</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> void __init omap2_map_common_io(void)</div><div class='ctx'> {</div><div class='del'>-	iotable_init(omap2_io_desc, ARRAY_SIZE(omap2_io_desc));</div><div class='add'>+#if defined(CONFIG_ARCH_OMAP2420)</div><div class='add'>+	iotable_init(omap24xx_io_desc, ARRAY_SIZE(omap24xx_io_desc));</div><div class='add'>+	iotable_init(omap242x_io_desc, ARRAY_SIZE(omap242x_io_desc));</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_ARCH_OMAP2430)</div><div class='add'>+	iotable_init(omap24xx_io_desc, ARRAY_SIZE(omap24xx_io_desc));</div><div class='add'>+	iotable_init(omap243x_io_desc, ARRAY_SIZE(omap243x_io_desc));</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_ARCH_OMAP34XX)</div><div class='add'>+	iotable_init(omap34xx_io_desc, ARRAY_SIZE(omap34xx_io_desc));</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	/* Normally devicemaps_init() would flush caches and tlb after</div><div class='ctx'> 	 * mdesc-&gt;map_io(), but we must also do it here because of the CPU</div><div class='hunk'>@@ -101,12 +198,9 @@ void __init omap2_map_common_io(void)</div><div class='ctx'> void __init omap2_init_common_hw(void)</div><div class='ctx'> {</div><div class='ctx'> 	omap2_mux_init();</div><div class='add'>+	pwrdm_init(powerdomains_omap);</div><div class='add'>+	clkdm_init(clockdomains_omap, clkdm_pwrdm_autodeps);</div><div class='ctx'> 	omap2_clk_init();</div><div class='del'>-/*</div><div class='del'>- * Need to Fix this for 2430</div><div class='del'>- */</div><div class='del'>-#ifndef CONFIG_ARCH_OMAP2430</div><div class='ctx'> 	omap2_init_memory();</div><div class='del'>-#endif</div><div class='ctx'> 	gpmc_init();</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-omap2/irq.c b/arch/arm/mach-omap2/irq.c<br/>index 9ef15b31d8fc..d354e0fe4477 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap2/irq.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-omap2/irq.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap2/irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/irq.c</a></div><div class='hunk'>@@ -13,17 +13,23 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='del'>-#include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#define INTC_REVISION	0x0000</div><div class='del'>-#define INTC_SYSCONFIG	0x0010</div><div class='del'>-#define INTC_SYSSTATUS	0x0014</div><div class='del'>-#define INTC_CONTROL	0x0048</div><div class='del'>-#define INTC_MIR_CLEAR0	0x0088</div><div class='del'>-#define INTC_MIR_SET0	0x008c</div><div class='add'>+</div><div class='add'>+/* selected INTC register offsets */</div><div class='add'>+</div><div class='add'>+#define INTC_REVISION		0x0000</div><div class='add'>+#define INTC_SYSCONFIG		0x0010</div><div class='add'>+#define INTC_SYSSTATUS		0x0014</div><div class='add'>+#define INTC_CONTROL		0x0048</div><div class='add'>+#define INTC_MIR_CLEAR0		0x0088</div><div class='add'>+#define INTC_MIR_SET0		0x008c</div><div class='add'>+#define INTC_PENDING_IRQ0	0x0098</div><div class='add'>+</div><div class='add'>+/* Number of IRQ state bits in each MIR register */</div><div class='add'>+#define IRQ_BITS_PER_REG	32</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * OMAP2 has a number of different interrupt controllers, each interrupt</div><div class='hunk'>@@ -32,48 +38,50 @@</div><div class='ctx'>  * for each bank.. when in doubt, consult the TRM.</div><div class='ctx'>  */</div><div class='ctx'> static struct omap_irq_bank {</div><div class='del'>-	unsigned long base_reg;</div><div class='add'>+	void __iomem *base_reg;</div><div class='ctx'> 	unsigned int nr_irqs;</div><div class='ctx'> } __attribute__ ((aligned(4))) irq_banks[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		/* MPU INTC */</div><div class='del'>-		.base_reg	= IO_ADDRESS(OMAP24XX_IC_BASE),</div><div class='add'>+		.base_reg	= 0,</div><div class='ctx'> 		.nr_irqs	= 96,</div><div class='del'>-	}, {</div><div class='del'>-		/* XXX: DSP INTC */</div><div class='del'>-	}</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* INTC bank register get/set */</div><div class='add'>+</div><div class='add'>+static void intc_bank_write_reg(u32 val, struct omap_irq_bank *bank, u16 reg)</div><div class='add'>+{</div><div class='add'>+	__raw_writel(val, bank-&gt;base_reg + reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 intc_bank_read_reg(struct omap_irq_bank *bank, u16 reg)</div><div class='add'>+{</div><div class='add'>+	return __raw_readl(bank-&gt;base_reg + reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* XXX: FIQ and additional INTC support (only MPU at the moment) */</div><div class='ctx'> static void omap_ack_irq(unsigned int irq)</div><div class='ctx'> {</div><div class='del'>-	__raw_writel(0x1, irq_banks[0].base_reg + INTC_CONTROL);</div><div class='add'>+	intc_bank_write_reg(0x1, &amp;irq_banks[0], INTC_CONTROL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void omap_mask_irq(unsigned int irq)</div><div class='ctx'> {</div><div class='del'>-	int offset = (irq &gt;&gt; 5) &lt;&lt; 5;</div><div class='add'>+	int offset = irq &amp; (~(IRQ_BITS_PER_REG - 1));</div><div class='ctx'> </div><div class='del'>-	if (irq &gt;= 64) {</div><div class='del'>-		irq %= 64;</div><div class='del'>-	} else if (irq &gt;= 32) {</div><div class='del'>-		irq %= 32;</div><div class='del'>-	}</div><div class='add'>+	irq &amp;= (IRQ_BITS_PER_REG - 1);</div><div class='ctx'> </div><div class='del'>-	__raw_writel(1 &lt;&lt; irq, irq_banks[0].base_reg + INTC_MIR_SET0 + offset);</div><div class='add'>+	intc_bank_write_reg(1 &lt;&lt; irq, &amp;irq_banks[0], INTC_MIR_SET0 + offset);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void omap_unmask_irq(unsigned int irq)</div><div class='ctx'> {</div><div class='del'>-	int offset = (irq &gt;&gt; 5) &lt;&lt; 5;</div><div class='add'>+	int offset = irq &amp; (~(IRQ_BITS_PER_REG - 1));</div><div class='ctx'> </div><div class='del'>-	if (irq &gt;= 64) {</div><div class='del'>-		irq %= 64;</div><div class='del'>-	} else if (irq &gt;= 32) {</div><div class='del'>-		irq %= 32;</div><div class='del'>-	}</div><div class='add'>+	irq &amp;= (IRQ_BITS_PER_REG - 1);</div><div class='ctx'> </div><div class='del'>-	__raw_writel(1 &lt;&lt; irq, irq_banks[0].base_reg + INTC_MIR_CLEAR0 + offset);</div><div class='add'>+	intc_bank_write_reg(1 &lt;&lt; irq, &amp;irq_banks[0], INTC_MIR_CLEAR0 + offset);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void omap_mask_ack_irq(unsigned int irq)</div><div class='hunk'>@@ -93,20 +101,20 @@ static void __init omap_irq_bank_init_one(struct omap_irq_bank *bank)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long tmp;</div><div class='ctx'> </div><div class='del'>-	tmp = __raw_readl(bank-&gt;base_reg + INTC_REVISION) &amp; 0xff;</div><div class='del'>-	printk(KERN_INFO "IRQ: Found an INTC at 0x%08lx "</div><div class='add'>+	tmp = intc_bank_read_reg(bank, INTC_REVISION) &amp; 0xff;</div><div class='add'>+	printk(KERN_INFO "IRQ: Found an INTC at 0x%p "</div><div class='ctx'> 			 "(revision %ld.%ld) with %d interrupts\n",</div><div class='ctx'> 			 bank-&gt;base_reg, tmp &gt;&gt; 4, tmp &amp; 0xf, bank-&gt;nr_irqs);</div><div class='ctx'> </div><div class='del'>-	tmp = __raw_readl(bank-&gt;base_reg + INTC_SYSCONFIG);</div><div class='add'>+	tmp = intc_bank_read_reg(bank, INTC_SYSCONFIG);</div><div class='ctx'> 	tmp |= 1 &lt;&lt; 1;	/* soft reset */</div><div class='del'>-	__raw_writel(tmp, bank-&gt;base_reg + INTC_SYSCONFIG);</div><div class='add'>+	intc_bank_write_reg(tmp, bank, INTC_SYSCONFIG);</div><div class='ctx'> </div><div class='del'>-	while (!(__raw_readl(bank-&gt;base_reg + INTC_SYSSTATUS) &amp; 0x1))</div><div class='add'>+	while (!(intc_bank_read_reg(bank, INTC_SYSSTATUS) &amp; 0x1))</div><div class='ctx'> 		/* Wait for reset to complete */;</div><div class='ctx'> </div><div class='ctx'> 	/* Enable autoidle */</div><div class='del'>-	__raw_writel(1 &lt;&lt; 0, bank-&gt;base_reg + INTC_SYSCONFIG);</div><div class='add'>+	intc_bank_write_reg(1 &lt;&lt; 0, bank, INTC_SYSCONFIG);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __init omap_init_irq(void)</div><div class='hunk'>@@ -118,9 +126,10 @@ void __init omap_init_irq(void)</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(irq_banks); i++) {</div><div class='ctx'> 		struct omap_irq_bank *bank = irq_banks + i;</div><div class='ctx'> </div><div class='del'>-		/* XXX */</div><div class='del'>-		if (!bank-&gt;base_reg)</div><div class='del'>-			continue;</div><div class='add'>+		if (cpu_is_omap24xx())</div><div class='add'>+			bank-&gt;base_reg = OMAP2_IO_ADDRESS(OMAP24XX_IC_BASE);</div><div class='add'>+		else if (cpu_is_omap34xx())</div><div class='add'>+			bank-&gt;base_reg = OMAP2_IO_ADDRESS(OMAP34XX_IC_BASE);</div><div class='ctx'> </div><div class='ctx'> 		omap_irq_bank_init_one(bank);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-omap2/mailbox.c b/arch/arm/mach-omap2/mailbox.c<br/>index a480b96948e4..32b7af3c610b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap2/mailbox.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-omap2/mailbox.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap2/mailbox.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/mailbox.c</a></div><div class='hunk'>@@ -14,9 +14,9 @@</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;mach/mailbox.h&gt;</div><div class='ctx'> #include &lt;mach/irqs.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define MAILBOX_REVISION		0x00</div><div class='ctx'> #define MAILBOX_SYSCONFIG		0x10</div><div class='head'>diff --git a/arch/arm/mach-omap2/mcbsp.c b/arch/arm/mach-omap2/mcbsp.c<br/>index b261f1f80b5e..cae3ebe249b3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap2/mcbsp.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-omap2/mcbsp.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap2/mcbsp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/mcbsp.c</a></div><div class='hunk'>@@ -89,6 +89,30 @@ static struct mcbsp_internal_clk omap_mcbsp_clks[] = {</div><div class='ctx'> 			.disable	= omap_mcbsp_clk_disable,</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='add'>+	{</div><div class='add'>+		.clk = {</div><div class='add'>+			.name		= "mcbsp_clk",</div><div class='add'>+			.id		= 3,</div><div class='add'>+			.enable		= omap_mcbsp_clk_enable,</div><div class='add'>+			.disable	= omap_mcbsp_clk_disable,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.clk = {</div><div class='add'>+			.name		= "mcbsp_clk",</div><div class='add'>+			.id		= 4,</div><div class='add'>+			.enable		= omap_mcbsp_clk_enable,</div><div class='add'>+			.disable	= omap_mcbsp_clk_disable,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.clk = {</div><div class='add'>+			.name		= "mcbsp_clk",</div><div class='add'>+			.id		= 5,</div><div class='add'>+			.enable		= omap_mcbsp_clk_enable,</div><div class='add'>+			.disable	= omap_mcbsp_clk_disable,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define omap_mcbsp_clks_size	ARRAY_SIZE(omap_mcbsp_clks)</div><div class='hunk'>@@ -117,25 +141,14 @@ static void omap2_mcbsp_request(unsigned int id)</div><div class='ctx'> 		omap2_mcbsp2_mux_setup();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int omap2_mcbsp_check(unsigned int id)</div><div class='del'>-{</div><div class='del'>-	if (id &gt; OMAP_MAX_MCBSP_COUNT - 1) {</div><div class='del'>-		printk(KERN_ERR "OMAP-McBSP: McBSP%d doesn't exist\n", id + 1);</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static struct omap_mcbsp_ops omap2_mcbsp_ops = {</div><div class='ctx'> 	.request	= omap2_mcbsp_request,</div><div class='del'>-	.check		= omap2_mcbsp_check,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_ARCH_OMAP24XX</div><div class='del'>-static struct omap_mcbsp_platform_data omap24xx_mcbsp_pdata[] = {</div><div class='add'>+#ifdef CONFIG_ARCH_OMAP2420</div><div class='add'>+static struct omap_mcbsp_platform_data omap2420_mcbsp_pdata[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.phys_base	= OMAP24XX_MCBSP1_BASE,</div><div class='del'>-		.virt_base	= IO_ADDRESS(OMAP24XX_MCBSP1_BASE),</div><div class='ctx'> 		.dma_rx_sync	= OMAP24XX_DMA_MCBSP1_RX,</div><div class='ctx'> 		.dma_tx_sync	= OMAP24XX_DMA_MCBSP1_TX,</div><div class='ctx'> 		.rx_irq		= INT_24XX_MCBSP1_IRQ_RX,</div><div class='hunk'>@@ -145,7 +158,6 @@ static struct omap_mcbsp_platform_data omap24xx_mcbsp_pdata[] = {</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.phys_base	= OMAP24XX_MCBSP2_BASE,</div><div class='del'>-		.virt_base	= IO_ADDRESS(OMAP24XX_MCBSP2_BASE),</div><div class='ctx'> 		.dma_rx_sync	= OMAP24XX_DMA_MCBSP2_RX,</div><div class='ctx'> 		.dma_tx_sync	= OMAP24XX_DMA_MCBSP2_TX,</div><div class='ctx'> 		.rx_irq		= INT_24XX_MCBSP2_IRQ_RX,</div><div class='hunk'>@@ -154,17 +166,70 @@ static struct omap_mcbsp_platform_data omap24xx_mcbsp_pdata[] = {</div><div class='ctx'> 		.clk_name	= "mcbsp_clk",</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='del'>-#define OMAP24XX_MCBSP_PDATA_SZ		ARRAY_SIZE(omap24xx_mcbsp_pdata)</div><div class='add'>+#define OMAP2420_MCBSP_PDATA_SZ		ARRAY_SIZE(omap2420_mcbsp_pdata)</div><div class='ctx'> #else</div><div class='del'>-#define omap24xx_mcbsp_pdata		NULL</div><div class='del'>-#define OMAP24XX_MCBSP_PDATA_SZ		0</div><div class='add'>+#define omap2420_mcbsp_pdata		NULL</div><div class='add'>+#define OMAP2420_MCBSP_PDATA_SZ		0</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ARCH_OMAP2430</div><div class='add'>+static struct omap_mcbsp_platform_data omap2430_mcbsp_pdata[] = {</div><div class='add'>+	{</div><div class='add'>+		.phys_base	= OMAP24XX_MCBSP1_BASE,</div><div class='add'>+		.dma_rx_sync	= OMAP24XX_DMA_MCBSP1_RX,</div><div class='add'>+		.dma_tx_sync	= OMAP24XX_DMA_MCBSP1_TX,</div><div class='add'>+		.rx_irq		= INT_24XX_MCBSP1_IRQ_RX,</div><div class='add'>+		.tx_irq		= INT_24XX_MCBSP1_IRQ_TX,</div><div class='add'>+		.ops		= &amp;omap2_mcbsp_ops,</div><div class='add'>+		.clk_name	= "mcbsp_clk",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.phys_base	= OMAP24XX_MCBSP2_BASE,</div><div class='add'>+		.dma_rx_sync	= OMAP24XX_DMA_MCBSP2_RX,</div><div class='add'>+		.dma_tx_sync	= OMAP24XX_DMA_MCBSP2_TX,</div><div class='add'>+		.rx_irq		= INT_24XX_MCBSP2_IRQ_RX,</div><div class='add'>+		.tx_irq		= INT_24XX_MCBSP2_IRQ_TX,</div><div class='add'>+		.ops		= &amp;omap2_mcbsp_ops,</div><div class='add'>+		.clk_name	= "mcbsp_clk",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.phys_base	= OMAP2430_MCBSP3_BASE,</div><div class='add'>+		.dma_rx_sync	= OMAP24XX_DMA_MCBSP3_RX,</div><div class='add'>+		.dma_tx_sync	= OMAP24XX_DMA_MCBSP3_TX,</div><div class='add'>+		.rx_irq		= INT_24XX_MCBSP3_IRQ_RX,</div><div class='add'>+		.tx_irq		= INT_24XX_MCBSP3_IRQ_TX,</div><div class='add'>+		.ops		= &amp;omap2_mcbsp_ops,</div><div class='add'>+		.clk_name	= "mcbsp_clk",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.phys_base	= OMAP2430_MCBSP4_BASE,</div><div class='add'>+		.dma_rx_sync	= OMAP24XX_DMA_MCBSP4_RX,</div><div class='add'>+		.dma_tx_sync	= OMAP24XX_DMA_MCBSP4_TX,</div><div class='add'>+		.rx_irq		= INT_24XX_MCBSP4_IRQ_RX,</div><div class='add'>+		.tx_irq		= INT_24XX_MCBSP4_IRQ_TX,</div><div class='add'>+		.ops		= &amp;omap2_mcbsp_ops,</div><div class='add'>+		.clk_name	= "mcbsp_clk",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.phys_base	= OMAP2430_MCBSP5_BASE,</div><div class='add'>+		.dma_rx_sync	= OMAP24XX_DMA_MCBSP5_RX,</div><div class='add'>+		.dma_tx_sync	= OMAP24XX_DMA_MCBSP5_TX,</div><div class='add'>+		.rx_irq		= INT_24XX_MCBSP5_IRQ_RX,</div><div class='add'>+		.tx_irq		= INT_24XX_MCBSP5_IRQ_TX,</div><div class='add'>+		.ops		= &amp;omap2_mcbsp_ops,</div><div class='add'>+		.clk_name	= "mcbsp_clk",</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+#define OMAP2430_MCBSP_PDATA_SZ		ARRAY_SIZE(omap2430_mcbsp_pdata)</div><div class='add'>+#else</div><div class='add'>+#define omap2430_mcbsp_pdata		NULL</div><div class='add'>+#define OMAP2430_MCBSP_PDATA_SZ		0</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ARCH_OMAP34XX</div><div class='ctx'> static struct omap_mcbsp_platform_data omap34xx_mcbsp_pdata[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.phys_base	= OMAP34XX_MCBSP1_BASE,</div><div class='del'>-		.virt_base	= IO_ADDRESS(OMAP34XX_MCBSP1_BASE),</div><div class='ctx'> 		.dma_rx_sync	= OMAP24XX_DMA_MCBSP1_RX,</div><div class='ctx'> 		.dma_tx_sync	= OMAP24XX_DMA_MCBSP1_TX,</div><div class='ctx'> 		.rx_irq		= INT_24XX_MCBSP1_IRQ_RX,</div><div class='hunk'>@@ -174,7 +239,6 @@ static struct omap_mcbsp_platform_data omap34xx_mcbsp_pdata[] = {</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.phys_base	= OMAP34XX_MCBSP2_BASE,</div><div class='del'>-		.virt_base	= IO_ADDRESS(OMAP34XX_MCBSP2_BASE),</div><div class='ctx'> 		.dma_rx_sync	= OMAP24XX_DMA_MCBSP2_RX,</div><div class='ctx'> 		.dma_tx_sync	= OMAP24XX_DMA_MCBSP2_TX,</div><div class='ctx'> 		.rx_irq		= INT_24XX_MCBSP2_IRQ_RX,</div><div class='hunk'>@@ -182,6 +246,33 @@ static struct omap_mcbsp_platform_data omap34xx_mcbsp_pdata[] = {</div><div class='ctx'> 		.ops		= &amp;omap2_mcbsp_ops,</div><div class='ctx'> 		.clk_name	= "mcbsp_clk",</div><div class='ctx'> 	},</div><div class='add'>+	{</div><div class='add'>+		.phys_base	= OMAP34XX_MCBSP3_BASE,</div><div class='add'>+		.dma_rx_sync	= OMAP24XX_DMA_MCBSP3_RX,</div><div class='add'>+		.dma_tx_sync	= OMAP24XX_DMA_MCBSP3_TX,</div><div class='add'>+		.rx_irq		= INT_24XX_MCBSP3_IRQ_RX,</div><div class='add'>+		.tx_irq		= INT_24XX_MCBSP3_IRQ_TX,</div><div class='add'>+		.ops		= &amp;omap2_mcbsp_ops,</div><div class='add'>+		.clk_name	= "mcbsp_clk",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.phys_base	= OMAP34XX_MCBSP4_BASE,</div><div class='add'>+		.dma_rx_sync	= OMAP24XX_DMA_MCBSP4_RX,</div><div class='add'>+		.dma_tx_sync	= OMAP24XX_DMA_MCBSP4_TX,</div><div class='add'>+		.rx_irq		= INT_24XX_MCBSP4_IRQ_RX,</div><div class='add'>+		.tx_irq		= INT_24XX_MCBSP4_IRQ_TX,</div><div class='add'>+		.ops		= &amp;omap2_mcbsp_ops,</div><div class='add'>+		.clk_name	= "mcbsp_clk",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.phys_base	= OMAP34XX_MCBSP5_BASE,</div><div class='add'>+		.dma_rx_sync	= OMAP24XX_DMA_MCBSP5_RX,</div><div class='add'>+		.dma_tx_sync	= OMAP24XX_DMA_MCBSP5_TX,</div><div class='add'>+		.rx_irq		= INT_24XX_MCBSP5_IRQ_RX,</div><div class='add'>+		.tx_irq		= INT_24XX_MCBSP5_IRQ_TX,</div><div class='add'>+		.ops		= &amp;omap2_mcbsp_ops,</div><div class='add'>+		.clk_name	= "mcbsp_clk",</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> #define OMAP34XX_MCBSP_PDATA_SZ		ARRAY_SIZE(omap34xx_mcbsp_pdata)</div><div class='ctx'> #else</div><div class='hunk'>@@ -189,7 +280,7 @@ static struct omap_mcbsp_platform_data omap34xx_mcbsp_pdata[] = {</div><div class='ctx'> #define OMAP34XX_MCBSP_PDATA_SZ		0</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-int __init omap2_mcbsp_init(void)</div><div class='add'>+static int __init omap2_mcbsp_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -199,10 +290,24 @@ int __init omap2_mcbsp_init(void)</div><div class='ctx'> 		clk_register(&amp;omap_mcbsp_clks[i].clk);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (cpu_is_omap24xx())</div><div class='del'>-		omap_mcbsp_register_board_cfg(omap24xx_mcbsp_pdata,</div><div class='del'>-						OMAP24XX_MCBSP_PDATA_SZ);</div><div class='add'>+	if (cpu_is_omap2420())</div><div class='add'>+		omap_mcbsp_count = OMAP2420_MCBSP_PDATA_SZ;</div><div class='add'>+	if (cpu_is_omap2430())</div><div class='add'>+		omap_mcbsp_count = OMAP2430_MCBSP_PDATA_SZ;</div><div class='add'>+	if (cpu_is_omap34xx())</div><div class='add'>+		omap_mcbsp_count = OMAP34XX_MCBSP_PDATA_SZ;</div><div class='add'>+</div><div class='add'>+	mcbsp_ptr = kzalloc(omap_mcbsp_count * sizeof(struct omap_mcbsp *),</div><div class='add'>+								GFP_KERNEL);</div><div class='add'>+	if (!mcbsp_ptr)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='add'>+	if (cpu_is_omap2420())</div><div class='add'>+		omap_mcbsp_register_board_cfg(omap2420_mcbsp_pdata,</div><div class='add'>+						OMAP2420_MCBSP_PDATA_SZ);</div><div class='add'>+	if (cpu_is_omap2430())</div><div class='add'>+		omap_mcbsp_register_board_cfg(omap2430_mcbsp_pdata,</div><div class='add'>+						OMAP2430_MCBSP_PDATA_SZ);</div><div class='ctx'> 	if (cpu_is_omap34xx())</div><div class='ctx'> 		omap_mcbsp_register_board_cfg(omap34xx_mcbsp_pdata,</div><div class='ctx'> 						OMAP34XX_MCBSP_PDATA_SZ);</div><div class='head'>diff --git a/arch/arm/mach-omap2/memory.c b/arch/arm/mach-omap2/memory.c<br/>index 6b49cc9cbdcb..882c70224292 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap2/memory.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-omap2/memory.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap2/memory.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/memory.c</a></div><div class='hunk'>@@ -21,8 +21,7 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/common.h&gt;</div><div class='ctx'> #include &lt;mach/clock.h&gt;</div><div class='hunk'>@@ -102,6 +101,17 @@ u32 omap2_reprogram_sdrc(u32 level, u32 force)</div><div class='ctx'> 	return prev;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#if !defined(CONFIG_ARCH_OMAP2)</div><div class='add'>+void omap2_sram_ddr_init(u32 *slow_dll_ctrl, u32 fast_dll_ctrl,</div><div class='add'>+				u32 base_cs, u32 force_unlock)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+void omap2_sram_reprogram_sdrc(u32 perf_level, u32 dll_val,</div><div class='add'>+				      u32 mem_type)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> void omap2_init_memory_params(u32 force_lock_to_unlock_mode)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long dll_cnt;</div><div class='hunk'>@@ -166,6 +176,9 @@ void __init omap2_init_memory(void)</div><div class='ctx'> {</div><div class='ctx'> 	u32 l;</div><div class='ctx'> </div><div class='add'>+	if (!cpu_is_omap2420())</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	l = sms_read_reg(SMS_SYSCONFIG);</div><div class='ctx'> 	l &amp;= ~(0x3 &lt;&lt; 3);</div><div class='ctx'> 	l |= (0x2 &lt;&lt; 3);</div><div class='head'>diff --git a/arch/arm/mach-omap2/memory.h b/arch/arm/mach-omap2/memory.h<br/>index 9a280b50a893..bb3db80a7c46 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap2/memory.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-omap2/memory.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap2/memory.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/memory.h</a></div><div class='hunk'>@@ -14,6 +14,9 @@</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#ifndef ARCH_ARM_MACH_OMAP2_MEMORY_H</div><div class='add'>+#define ARCH_ARM_MACH_OMAP2_MEMORY_H</div><div class='add'>+</div><div class='ctx'> /* Memory timings */</div><div class='ctx'> #define M_DDR		1</div><div class='ctx'> #define M_LOCK_CTRL	(1 &lt;&lt; 2)</div><div class='hunk'>@@ -34,3 +37,7 @@ extern u32 omap2_memory_get_fast_dll_ctrl(void);</div><div class='ctx'> extern u32 omap2_memory_get_type(void);</div><div class='ctx'> u32 omap2_dll_force_needed(void);</div><div class='ctx'> u32 omap2_reprogram_sdrc(u32 level, u32 force);</div><div class='add'>+void __init omap2_init_memory(void);</div><div class='add'>+void __init gpmc_init(void);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/arm/mach-omap2/mux.c b/arch/arm/mach-omap2/mux.c<br/>index 443d07fef7f3..b1393673d95d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap2/mux.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-omap2/mux.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap2/mux.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/mux.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  * linux/arch/arm/mach-omap2/mux.c</div><div class='ctx'>  *</div><div class='del'>- * OMAP2 pin multiplexing configurations</div><div class='add'>+ * OMAP2 and OMAP3 pin multiplexing configurations</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2004 - 2008 Texas Instruments Inc.</div><div class='ctx'>  * Copyright (C) 2003 - 2008 Nokia Corporation</div><div class='hunk'>@@ -25,10 +25,11 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;asm/system.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/system.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;mach/control.h&gt;</div><div class='ctx'> #include &lt;mach/mux.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -219,16 +220,222 @@ MUX_CFG_24XX("AD13_2430_MCBSP2_DR_OFF",	0x0131,	0,	0,	0,	1)</div><div class='ctx'> #define OMAP24XX_PINS_SZ	0</div><div class='ctx'> #endif	/* CONFIG_ARCH_OMAP24XX */</div><div class='ctx'> </div><div class='del'>-#define OMAP24XX_PULL_ENA	(1 &lt;&lt; 3)</div><div class='del'>-#define OMAP24XX_PULL_UP	(1 &lt;&lt; 4)</div><div class='add'>+#ifdef CONFIG_ARCH_OMAP34XX</div><div class='add'>+static struct pin_config __initdata_or_module omap34xx_pins[] = {</div><div class='add'>+/*</div><div class='add'>+ *		Name, reg-offset,</div><div class='add'>+ *		mux-mode | [active-mode | off-mode]</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* 34xx I2C */</div><div class='add'>+MUX_CFG_34XX("K21_34XX_I2C1_SCL", 0x1ba,</div><div class='add'>+		OMAP34XX_MUX_MODE0 | OMAP34XX_PIN_INPUT_PULLUP)</div><div class='add'>+MUX_CFG_34XX("J21_34XX_I2C1_SDA", 0x1bc,</div><div class='add'>+		OMAP34XX_MUX_MODE0 | OMAP34XX_PIN_INPUT_PULLUP)</div><div class='add'>+MUX_CFG_34XX("AF15_34XX_I2C2_SCL", 0x1be,</div><div class='add'>+		OMAP34XX_MUX_MODE0 | OMAP34XX_PIN_INPUT_PULLUP)</div><div class='add'>+MUX_CFG_34XX("AE15_34XX_I2C2_SDA", 0x1c0,</div><div class='add'>+		OMAP34XX_MUX_MODE0 | OMAP34XX_PIN_INPUT_PULLUP)</div><div class='add'>+MUX_CFG_34XX("AF14_34XX_I2C3_SCL", 0x1c2,</div><div class='add'>+		OMAP34XX_MUX_MODE0 | OMAP34XX_PIN_INPUT_PULLUP)</div><div class='add'>+MUX_CFG_34XX("AG14_34XX_I2C3_SDA", 0x1c4,</div><div class='add'>+		OMAP34XX_MUX_MODE0 | OMAP34XX_PIN_INPUT_PULLUP)</div><div class='add'>+MUX_CFG_34XX("AD26_34XX_I2C4_SCL", 0xa00,</div><div class='add'>+		OMAP34XX_MUX_MODE0 | OMAP34XX_PIN_INPUT_PULLUP)</div><div class='add'>+MUX_CFG_34XX("AE26_34XX_I2C4_SDA", 0xa02,</div><div class='add'>+		OMAP34XX_MUX_MODE0 | OMAP34XX_PIN_INPUT_PULLUP)</div><div class='add'>+</div><div class='add'>+/* PHY - HSUSB: 12-pin ULPI PHY: Port 1*/</div><div class='add'>+MUX_CFG_34XX("Y8_3430_USB1HS_PHY_CLK", 0x5da,</div><div class='add'>+		OMAP34XX_MUX_MODE3 | OMAP34XX_PIN_OUTPUT)</div><div class='add'>+MUX_CFG_34XX("Y9_3430_USB1HS_PHY_STP", 0x5d8,</div><div class='add'>+		OMAP34XX_MUX_MODE3 | OMAP34XX_PIN_OUTPUT)</div><div class='add'>+MUX_CFG_34XX("AA14_3430_USB1HS_PHY_DIR", 0x5ec,</div><div class='add'>+		OMAP34XX_MUX_MODE3 | OMAP34XX_PIN_INPUT_PULLDOWN)</div><div class='add'>+MUX_CFG_34XX("AA11_3430_USB1HS_PHY_NXT", 0x5ee,</div><div class='add'>+		OMAP34XX_MUX_MODE3 | OMAP34XX_PIN_INPUT_PULLDOWN)</div><div class='add'>+MUX_CFG_34XX("W13_3430_USB1HS_PHY_D0", 0x5dc,</div><div class='add'>+		OMAP34XX_MUX_MODE3 | OMAP34XX_PIN_INPUT_PULLDOWN)</div><div class='add'>+MUX_CFG_34XX("W12_3430_USB1HS_PHY_D1", 0x5de,</div><div class='add'>+		OMAP34XX_MUX_MODE3 | OMAP34XX_PIN_INPUT_PULLDOWN)</div><div class='add'>+MUX_CFG_34XX("W11_3430_USB1HS_PHY_D2", 0x5e0,</div><div class='add'>+		OMAP34XX_MUX_MODE3 | OMAP34XX_PIN_INPUT_PULLDOWN)</div><div class='add'>+MUX_CFG_34XX("Y11_3430_USB1HS_PHY_D3", 0x5ea,</div><div class='add'>+		OMAP34XX_MUX_MODE3 | OMAP34XX_PIN_INPUT_PULLDOWN)</div><div class='add'>+MUX_CFG_34XX("W9_3430_USB1HS_PHY_D4", 0x5e4,</div><div class='add'>+		OMAP34XX_MUX_MODE3 | OMAP34XX_PIN_INPUT_PULLDOWN)</div><div class='add'>+MUX_CFG_34XX("Y12_3430_USB1HS_PHY_D5", 0x5e6,</div><div class='add'>+		OMAP34XX_MUX_MODE3 | OMAP34XX_PIN_INPUT_PULLDOWN)</div><div class='add'>+MUX_CFG_34XX("W8_3430_USB1HS_PHY_D6", 0x5e8,</div><div class='add'>+		OMAP34XX_MUX_MODE3 | OMAP34XX_PIN_INPUT_PULLDOWN)</div><div class='add'>+MUX_CFG_34XX("Y13_3430_USB1HS_PHY_D7", 0x5e2,</div><div class='add'>+		OMAP34XX_MUX_MODE3 | OMAP34XX_PIN_INPUT_PULLDOWN)</div><div class='add'>+</div><div class='add'>+/* PHY - HSUSB: 12-pin ULPI PHY: Port 2*/</div><div class='add'>+MUX_CFG_34XX("AA8_3430_USB2HS_PHY_CLK", 0x5f0,</div><div class='add'>+		OMAP34XX_MUX_MODE3 | OMAP34XX_PIN_OUTPUT)</div><div class='add'>+MUX_CFG_34XX("AA10_3430_USB2HS_PHY_STP", 0x5f2,</div><div class='add'>+		OMAP34XX_MUX_MODE3 | OMAP34XX_PIN_OUTPUT)</div><div class='add'>+MUX_CFG_34XX("AA9_3430_USB2HS_PHY_DIR", 0x5f4,</div><div class='add'>+		OMAP34XX_MUX_MODE3 | OMAP34XX_PIN_INPUT_PULLDOWN)</div><div class='add'>+MUX_CFG_34XX("AB11_3430_USB2HS_PHY_NXT", 0x5f6,</div><div class='add'>+		OMAP34XX_MUX_MODE3 | OMAP34XX_PIN_INPUT_PULLDOWN)</div><div class='add'>+MUX_CFG_34XX("AB10_3430_USB2HS_PHY_D0", 0x5f8,</div><div class='add'>+		OMAP34XX_MUX_MODE3 | OMAP34XX_PIN_INPUT_PULLDOWN)</div><div class='add'>+MUX_CFG_34XX("AB9_3430_USB2HS_PHY_D1", 0x5fa,</div><div class='add'>+		OMAP34XX_MUX_MODE3 | OMAP34XX_PIN_INPUT_PULLDOWN)</div><div class='add'>+MUX_CFG_34XX("W3_3430_USB2HS_PHY_D2", 0x1d4,</div><div class='add'>+		OMAP34XX_MUX_MODE3 | OMAP34XX_PIN_INPUT_PULLDOWN)</div><div class='add'>+MUX_CFG_34XX("T4_3430_USB2HS_PHY_D3", 0x1de,</div><div class='add'>+		OMAP34XX_MUX_MODE3 | OMAP34XX_PIN_INPUT_PULLDOWN)</div><div class='add'>+MUX_CFG_34XX("T3_3430_USB2HS_PHY_D4", 0x1d8,</div><div class='add'>+		OMAP34XX_MUX_MODE3 | OMAP34XX_PIN_INPUT_PULLDOWN)</div><div class='add'>+MUX_CFG_34XX("R3_3430_USB2HS_PHY_D5", 0x1da,</div><div class='add'>+		OMAP34XX_MUX_MODE3 | OMAP34XX_PIN_INPUT_PULLDOWN)</div><div class='add'>+MUX_CFG_34XX("R4_3430_USB2HS_PHY_D6", 0x1dc,</div><div class='add'>+		OMAP34XX_MUX_MODE3 | OMAP34XX_PIN_INPUT_PULLDOWN)</div><div class='add'>+MUX_CFG_34XX("T2_3430_USB2HS_PHY_D7", 0x1d6,</div><div class='add'>+		OMAP34XX_MUX_MODE3 | OMAP34XX_PIN_INPUT_PULLDOWN)</div><div class='add'>+</div><div class='add'>+/* TLL - HSUSB: 12-pin TLL Port 1*/</div><div class='add'>+MUX_CFG_34XX("Y8_3430_USB1HS_TLL_CLK", 0x5da,</div><div class='add'>+		OMAP34XX_MUX_MODE6 | OMAP34XX_PIN_INPUT_PULLDOWN)</div><div class='add'>+MUX_CFG_34XX("Y9_3430_USB1HS_TLL_STP", 0x5d8,</div><div class='add'>+		OMAP34XX_MUX_MODE6 | OMAP34XX_PIN_INPUT_PULLUP)</div><div class='add'>+MUX_CFG_34XX("AA14_3430_USB1HS_TLL_DIR", 0x5ec,</div><div class='add'>+		OMAP34XX_MUX_MODE6 | OMAP34XX_PIN_INPUT_PULLDOWN)</div><div class='add'>+MUX_CFG_34XX("AA11_3430_USB1HS_TLL_NXT", 0x5ee,</div><div class='add'>+		OMAP34XX_MUX_MODE6 | OMAP34XX_PIN_INPUT_PULLDOWN)</div><div class='add'>+MUX_CFG_34XX("W13_3430_USB1HS_TLL_D0", 0x5dc,</div><div class='add'>+		OMAP34XX_MUX_MODE6 | OMAP34XX_PIN_INPUT_PULLDOWN)</div><div class='add'>+MUX_CFG_34XX("W12_3430_USB1HS_TLL_D1", 0x5de,</div><div class='add'>+		OMAP34XX_MUX_MODE6 | OMAP34XX_PIN_INPUT_PULLDOWN)</div><div class='add'>+MUX_CFG_34XX("W11_3430_USB1HS_TLL_D2", 0x5e0,</div><div class='add'>+		OMAP34XX_MUX_MODE6 | OMAP34XX_PIN_INPUT_PULLDOWN)</div><div class='add'>+MUX_CFG_34XX("Y11_3430_USB1HS_TLL_D3", 0x5ea,</div><div class='add'>+		OMAP34XX_MUX_MODE6 | OMAP34XX_PIN_INPUT_PULLDOWN)</div><div class='add'>+MUX_CFG_34XX("W9_3430_USB1HS_TLL_D4", 0x5e4,</div><div class='add'>+		OMAP34XX_MUX_MODE6 | OMAP34XX_PIN_INPUT_PULLDOWN)</div><div class='add'>+MUX_CFG_34XX("Y12_3430_USB1HS_TLL_D5", 0x5e6,</div><div class='add'>+		OMAP34XX_MUX_MODE6 | OMAP34XX_PIN_INPUT_PULLDOWN)</div><div class='add'>+MUX_CFG_34XX("W8_3430_USB1HS_TLL_D6", 0x5e8,</div><div class='add'>+		OMAP34XX_MUX_MODE6 | OMAP34XX_PIN_INPUT_PULLDOWN)</div><div class='add'>+MUX_CFG_34XX("Y13_3430_USB1HS_TLL_D7", 0x5e2,</div><div class='add'>+		OMAP34XX_MUX_MODE6 | OMAP34XX_PIN_INPUT_PULLDOWN)</div><div class='add'>+</div><div class='add'>+/* TLL - HSUSB: 12-pin TLL Port 2*/</div><div class='add'>+MUX_CFG_34XX("AA8_3430_USB2HS_TLL_CLK", 0x5f0,</div><div class='add'>+		OMAP34XX_MUX_MODE6 | OMAP34XX_PIN_INPUT_PULLDOWN)</div><div class='add'>+MUX_CFG_34XX("AA10_3430_USB2HS_TLL_STP", 0x5f2,</div><div class='add'>+		OMAP34XX_MUX_MODE6 | OMAP34XX_PIN_INPUT_PULLUP)</div><div class='add'>+MUX_CFG_34XX("AA9_3430_USB2HS_TLL_DIR", 0x5f4,</div><div class='add'>+		OMAP34XX_MUX_MODE6 | OMAP34XX_PIN_INPUT_PULLDOWN)</div><div class='add'>+MUX_CFG_34XX("AB11_3430_USB2HS_TLL_NXT", 0x5f6,</div><div class='add'>+		OMAP34XX_MUX_MODE6 | OMAP34XX_PIN_INPUT_PULLDOWN)</div><div class='add'>+MUX_CFG_34XX("AB10_3430_USB2HS_TLL_D0", 0x5f8,</div><div class='add'>+		OMAP34XX_MUX_MODE6 | OMAP34XX_PIN_INPUT_PULLDOWN)</div><div class='add'>+MUX_CFG_34XX("AB9_3430_USB2HS_TLL_D1", 0x5fa,</div><div class='add'>+		OMAP34XX_MUX_MODE6 | OMAP34XX_PIN_INPUT_PULLDOWN)</div><div class='add'>+MUX_CFG_34XX("W3_3430_USB2HS_TLL_D2", 0x1d4,</div><div class='add'>+		OMAP34XX_MUX_MODE2 | OMAP34XX_PIN_INPUT_PULLDOWN)</div><div class='add'>+MUX_CFG_34XX("T4_3430_USB2HS_TLL_D3", 0x1de,</div><div class='add'>+		OMAP34XX_MUX_MODE2 | OMAP34XX_PIN_INPUT_PULLDOWN)</div><div class='add'>+MUX_CFG_34XX("T3_3430_USB2HS_TLL_D4", 0x1d8,</div><div class='add'>+		OMAP34XX_MUX_MODE2 | OMAP34XX_PIN_INPUT_PULLDOWN)</div><div class='add'>+MUX_CFG_34XX("R3_3430_USB2HS_TLL_D5", 0x1da,</div><div class='add'>+		OMAP34XX_MUX_MODE2 | OMAP34XX_PIN_INPUT_PULLDOWN)</div><div class='add'>+MUX_CFG_34XX("R4_3430_USB2HS_TLL_D6", 0x1dc,</div><div class='add'>+		OMAP34XX_MUX_MODE2 | OMAP34XX_PIN_INPUT_PULLDOWN)</div><div class='add'>+MUX_CFG_34XX("T2_3430_USB2HS_TLL_D7", 0x1d6,</div><div class='add'>+		OMAP34XX_MUX_MODE2 | OMAP34XX_PIN_INPUT_PULLDOWN)</div><div class='add'>+</div><div class='add'>+/* TLL - HSUSB: 12-pin TLL Port 3*/</div><div class='add'>+MUX_CFG_34XX("AA6_3430_USB3HS_TLL_CLK", 0x180,</div><div class='add'>+		OMAP34XX_MUX_MODE5 | OMAP34XX_PIN_INPUT_PULLDOWN)</div><div class='add'>+MUX_CFG_34XX("AB3_3430_USB3HS_TLL_STP", 0x166,</div><div class='add'>+		OMAP34XX_MUX_MODE5 | OMAP34XX_PIN_INPUT_PULLUP)</div><div class='add'>+MUX_CFG_34XX("AA3_3430_USB3HS_TLL_DIR", 0x168,</div><div class='add'>+		OMAP34XX_MUX_MODE5 | OMAP34XX_PIN_INPUT_PULLDOWN)</div><div class='add'>+MUX_CFG_34XX("Y3_3430_USB3HS_TLL_NXT", 0x16a,</div><div class='add'>+		OMAP34XX_MUX_MODE5 | OMAP34XX_PIN_INPUT_PULLDOWN)</div><div class='add'>+MUX_CFG_34XX("AA5_3430_USB3HS_TLL_D0", 0x186,</div><div class='add'>+		OMAP34XX_MUX_MODE5 | OMAP34XX_PIN_INPUT_PULLDOWN)</div><div class='add'>+MUX_CFG_34XX("Y4_3430_USB3HS_TLL_D1", 0x184,</div><div class='add'>+		OMAP34XX_MUX_MODE5 | OMAP34XX_PIN_INPUT_PULLDOWN)</div><div class='add'>+MUX_CFG_34XX("Y5_3430_USB3HS_TLL_D2", 0x188,</div><div class='add'>+		OMAP34XX_MUX_MODE5 | OMAP34XX_PIN_INPUT_PULLDOWN)</div><div class='add'>+MUX_CFG_34XX("W5_3430_USB3HS_TLL_D3", 0x18a,</div><div class='add'>+		OMAP34XX_MUX_MODE5 | OMAP34XX_PIN_INPUT_PULLDOWN)</div><div class='add'>+MUX_CFG_34XX("AB12_3430_USB3HS_TLL_D4", 0x16c,</div><div class='add'>+		OMAP34XX_MUX_MODE5 | OMAP34XX_PIN_INPUT_PULLDOWN)</div><div class='add'>+MUX_CFG_34XX("AB13_3430_USB3HS_TLL_D5", 0x16e,</div><div class='add'>+		OMAP34XX_MUX_MODE5 | OMAP34XX_PIN_INPUT_PULLDOWN)</div><div class='add'>+MUX_CFG_34XX("AA13_3430_USB3HS_TLL_D6", 0x170,</div><div class='add'>+		OMAP34XX_MUX_MODE5 | OMAP34XX_PIN_INPUT_PULLDOWN)</div><div class='add'>+MUX_CFG_34XX("AA12_3430_USB3HS_TLL_D7", 0x172,</div><div class='add'>+		OMAP34XX_MUX_MODE5 | OMAP34XX_PIN_INPUT_PULLDOWN)</div><div class='add'>+</div><div class='add'>+/* PHY FSUSB: FS Serial for Port 1 (multiple PHY modes supported) */</div><div class='add'>+MUX_CFG_34XX("AF10_3430_USB1FS_PHY_MM1_RXDP", 0x5d8,</div><div class='add'>+		OMAP34XX_MUX_MODE5 | OMAP34XX_PIN_INPUT_PULLDOWN)</div><div class='add'>+MUX_CFG_34XX("AG9_3430_USB1FS_PHY_MM1_RXDM", 0x5ee,</div><div class='add'>+		OMAP34XX_MUX_MODE5 | OMAP34XX_PIN_INPUT_PULLDOWN)</div><div class='add'>+MUX_CFG_34XX("W13_3430_USB1FS_PHY_MM1_RXRCV", 0x5dc,</div><div class='add'>+		OMAP34XX_MUX_MODE5 | OMAP34XX_PIN_INPUT_PULLDOWN)</div><div class='add'>+MUX_CFG_34XX("W12_3430_USB1FS_PHY_MM1_TXSE0", 0x5de,</div><div class='add'>+		OMAP34XX_MUX_MODE5 | OMAP34XX_PIN_INPUT_PULLDOWN)</div><div class='add'>+MUX_CFG_34XX("W11_3430_USB1FS_PHY_MM1_TXDAT", 0x5e0,</div><div class='add'>+		OMAP34XX_MUX_MODE5 | OMAP34XX_PIN_INPUT_PULLDOWN)</div><div class='add'>+MUX_CFG_34XX("Y11_3430_USB1FS_PHY_MM1_TXEN_N", 0x5ea,</div><div class='add'>+		OMAP34XX_MUX_MODE5 | OMAP34XX_PIN_OUTPUT)</div><div class='add'>+</div><div class='add'>+/* PHY FSUSB: FS Serial for Port 2 (multiple PHY modes supported) */</div><div class='add'>+MUX_CFG_34XX("AF7_3430_USB2FS_PHY_MM2_RXDP", 0x5f2,</div><div class='add'>+		OMAP34XX_MUX_MODE5 | OMAP34XX_PIN_INPUT_PULLDOWN)</div><div class='add'>+MUX_CFG_34XX("AH7_3430_USB2FS_PHY_MM2_RXDM", 0x5f6,</div><div class='add'>+		OMAP34XX_MUX_MODE5 | OMAP34XX_PIN_INPUT_PULLDOWN)</div><div class='add'>+MUX_CFG_34XX("AB10_3430_USB2FS_PHY_MM2_RXRCV", 0x5f8,</div><div class='add'>+		OMAP34XX_MUX_MODE5 | OMAP34XX_PIN_INPUT_PULLDOWN)</div><div class='add'>+MUX_CFG_34XX("AB9_3430_USB2FS_PHY_MM2_TXSE0", 0x5fa,</div><div class='add'>+		OMAP34XX_MUX_MODE5 | OMAP34XX_PIN_INPUT_PULLDOWN)</div><div class='add'>+MUX_CFG_34XX("W3_3430_USB2FS_PHY_MM2_TXDAT", 0x1d4,</div><div class='add'>+		OMAP34XX_MUX_MODE5 | OMAP34XX_PIN_INPUT_PULLDOWN)</div><div class='add'>+MUX_CFG_34XX("T4_3430_USB2FS_PHY_MM2_TXEN_N", 0x1de,</div><div class='add'>+		OMAP34XX_MUX_MODE5 | OMAP34XX_PIN_OUTPUT)</div><div class='add'>+</div><div class='add'>+/* PHY FSUSB: FS Serial for Port 3 (multiple PHY modes supported) */</div><div class='add'>+MUX_CFG_34XX("AH3_3430_USB3FS_PHY_MM3_RXDP", 0x166,</div><div class='add'>+		OMAP34XX_MUX_MODE6 | OMAP34XX_PIN_INPUT_PULLDOWN)</div><div class='add'>+MUX_CFG_34XX("AE3_3430_USB3FS_PHY_MM3_RXDM", 0x16a,</div><div class='add'>+		OMAP34XX_MUX_MODE6 | OMAP34XX_PIN_INPUT_PULLDOWN)</div><div class='add'>+MUX_CFG_34XX("AD1_3430_USB3FS_PHY_MM3_RXRCV", 0x186,</div><div class='add'>+		OMAP34XX_MUX_MODE6 | OMAP34XX_PIN_INPUT_PULLDOWN)</div><div class='add'>+MUX_CFG_34XX("AE1_3430_USB3FS_PHY_MM3_TXSE0", 0x184,</div><div class='add'>+		OMAP34XX_MUX_MODE6 | OMAP34XX_PIN_INPUT_PULLDOWN)</div><div class='add'>+MUX_CFG_34XX("AD2_3430_USB3FS_PHY_MM3_TXDAT", 0x188,</div><div class='add'>+		OMAP34XX_MUX_MODE6 | OMAP34XX_PIN_INPUT_PULLDOWN)</div><div class='add'>+MUX_CFG_34XX("AC1_3430_USB3FS_PHY_MM3_TXEN_N", 0x18a,</div><div class='add'>+		OMAP34XX_MUX_MODE6 | OMAP34XX_PIN_OUTPUT)</div><div class='add'>+</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define OMAP34XX_PINS_SZ	ARRAY_SIZE(omap34xx_pins)</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+#define omap34xx_pins		NULL</div><div class='add'>+#define OMAP34XX_PINS_SZ	0</div><div class='add'>+#endif	/* CONFIG_ARCH_OMAP34XX */</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_OMAP_MUX_DEBUG) || defined(CONFIG_OMAP_MUX_WARNINGS)</div><div class='del'>-void __init_or_module omap2_cfg_debug(const struct pin_config *cfg, u8 reg)</div><div class='add'>+static void __init_or_module omap2_cfg_debug(const struct pin_config *cfg, u16 reg)</div><div class='ctx'> {</div><div class='ctx'> 	u16 orig;</div><div class='ctx'> 	u8 warn = 0, debug = 0;</div><div class='ctx'> </div><div class='del'>-	orig = omap_ctrl_readb(cfg-&gt;mux_reg);</div><div class='add'>+	if (cpu_is_omap24xx())</div><div class='add'>+		orig = omap_ctrl_readb(cfg-&gt;mux_reg);</div><div class='add'>+	else</div><div class='add'>+		orig = omap_ctrl_readw(cfg-&gt;mux_reg);</div><div class='ctx'> </div><div class='ctx'> #ifdef	CONFIG_OMAP_MUX_DEBUG</div><div class='ctx'> 	debug = cfg-&gt;debug;</div><div class='hunk'>@@ -254,9 +461,9 @@ int __init_or_module omap24xx_cfg_reg(const struct pin_config *cfg)</div><div class='ctx'> 	spin_lock_irqsave(&amp;mux_spin_lock, flags);</div><div class='ctx'> 	reg |= cfg-&gt;mask &amp; 0x7;</div><div class='ctx'> 	if (cfg-&gt;pull_val)</div><div class='del'>-		reg |= OMAP24XX_PULL_ENA;</div><div class='add'>+		reg |= OMAP2_PULL_ENA;</div><div class='ctx'> 	if (cfg-&gt;pu_pd_val)</div><div class='del'>-		reg |= OMAP24XX_PULL_UP;</div><div class='add'>+		reg |= OMAP2_PULL_UP;</div><div class='ctx'> 	omap2_cfg_debug(cfg, reg);</div><div class='ctx'> 	omap_ctrl_writeb(reg, cfg-&gt;mux_reg);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;mux_spin_lock, flags);</div><div class='hunk'>@@ -264,7 +471,26 @@ int __init_or_module omap24xx_cfg_reg(const struct pin_config *cfg)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='del'>-#define omap24xx_cfg_reg	0</div><div class='add'>+#define omap24xx_cfg_reg	NULL</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ARCH_OMAP34XX</div><div class='add'>+static int __init_or_module omap34xx_cfg_reg(const struct pin_config *cfg)</div><div class='add'>+{</div><div class='add'>+	static DEFINE_SPINLOCK(mux_spin_lock);</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u16 reg = 0;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;mux_spin_lock, flags);</div><div class='add'>+	reg |= cfg-&gt;mux_val;</div><div class='add'>+	omap2_cfg_debug(cfg, reg);</div><div class='add'>+	omap_ctrl_writew(reg, cfg-&gt;mux_reg);</div><div class='add'>+	spin_unlock_irqrestore(&amp;mux_spin_lock, flags);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+#define omap34xx_cfg_reg	NULL</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> int __init omap2_mux_init(void)</div><div class='hunk'>@@ -273,6 +499,10 @@ int __init omap2_mux_init(void)</div><div class='ctx'> 		arch_mux_cfg.pins	= omap24xx_pins;</div><div class='ctx'> 		arch_mux_cfg.size	= OMAP24XX_PINS_SZ;</div><div class='ctx'> 		arch_mux_cfg.cfg_reg	= omap24xx_cfg_reg;</div><div class='add'>+	} else if (cpu_is_omap34xx()) {</div><div class='add'>+		arch_mux_cfg.pins	= omap34xx_pins;</div><div class='add'>+		arch_mux_cfg.size	= OMAP34XX_PINS_SZ;</div><div class='add'>+		arch_mux_cfg.cfg_reg	= omap34xx_cfg_reg;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return omap_mux_register(&amp;arch_mux_cfg);</div><div class='head'>diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c<br/>index 8671e1079ab5..55361c16c9d9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap2/pm.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-omap2/pm.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap2/pm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/pm.c</a></div><div class='hunk'>@@ -24,8 +24,8 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/atomic.h&gt;</div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-omap2/powerdomain.c b/arch/arm/mach-omap2/powerdomain.c<br/>new file mode 100644<br/>index 000000000000..73e2971b1757<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap2/powerdomain.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/powerdomain.c</a></div><div class='hunk'>@@ -0,0 +1,1113 @@</div><div class='add'>+/*</div><div class='add'>+ * OMAP powerdomain control</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2007-2008 Texas Instruments, Inc.</div><div class='add'>+ * Copyright (C) 2007-2008 Nokia Corporation</div><div class='add'>+ *</div><div class='add'>+ * Written by Paul Walmsley</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+#ifdef CONFIG_OMAP_DEBUG_POWERDOMAIN</div><div class='add'>+# define DEBUG</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/atomic.h&gt;</div><div class='add'>+</div><div class='add'>+#include "cm.h"</div><div class='add'>+#include "cm-regbits-34xx.h"</div><div class='add'>+#include "prm.h"</div><div class='add'>+#include "prm-regbits-34xx.h"</div><div class='add'>+</div><div class='add'>+#include &lt;mach/cpu.h&gt;</div><div class='add'>+#include &lt;mach/powerdomain.h&gt;</div><div class='add'>+#include &lt;mach/clockdomain.h&gt;</div><div class='add'>+</div><div class='add'>+/* pwrdm_list contains all registered struct powerdomains */</div><div class='add'>+static LIST_HEAD(pwrdm_list);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * pwrdm_rwlock protects pwrdm_list add and del ops - also reused to</div><div class='add'>+ * protect pwrdm_clkdms[] during clkdm add/del ops</div><div class='add'>+ */</div><div class='add'>+static DEFINE_RWLOCK(pwrdm_rwlock);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Private functions */</div><div class='add'>+</div><div class='add'>+static u32 prm_read_mod_bits_shift(s16 domain, s16 idx, u32 mask)</div><div class='add'>+{</div><div class='add'>+	u32 v;</div><div class='add'>+</div><div class='add'>+	v = prm_read_mod_reg(domain, idx);</div><div class='add'>+	v &amp;= mask;</div><div class='add'>+	v &gt;&gt;= __ffs(mask);</div><div class='add'>+</div><div class='add'>+	return v;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct powerdomain *_pwrdm_lookup(const char *name)</div><div class='add'>+{</div><div class='add'>+	struct powerdomain *pwrdm, *temp_pwrdm;</div><div class='add'>+</div><div class='add'>+	pwrdm = NULL;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(temp_pwrdm, &amp;pwrdm_list, node) {</div><div class='add'>+		if (!strcmp(name, temp_pwrdm-&gt;name)) {</div><div class='add'>+			pwrdm = temp_pwrdm;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return pwrdm;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* _pwrdm_deps_lookup - look up the specified powerdomain in a pwrdm list */</div><div class='add'>+static struct powerdomain *_pwrdm_deps_lookup(struct powerdomain *pwrdm,</div><div class='add'>+					      struct pwrdm_dep *deps)</div><div class='add'>+{</div><div class='add'>+	struct pwrdm_dep *pd;</div><div class='add'>+</div><div class='add'>+	if (!pwrdm || !deps || !omap_chip_is(pwrdm-&gt;omap_chip))</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+</div><div class='add'>+	for (pd = deps; pd; pd++) {</div><div class='add'>+</div><div class='add'>+		if (!omap_chip_is(pd-&gt;omap_chip))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (!pd-&gt;pwrdm &amp;&amp; pd-&gt;pwrdm_name)</div><div class='add'>+			pd-&gt;pwrdm = pwrdm_lookup(pd-&gt;pwrdm_name);</div><div class='add'>+</div><div class='add'>+		if (pd-&gt;pwrdm == pwrdm)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!pd)</div><div class='add'>+		return ERR_PTR(-ENOENT);</div><div class='add'>+</div><div class='add'>+	return pd-&gt;pwrdm;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Public functions */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pwrdm_init - set up the powerdomain layer</div><div class='add'>+ *</div><div class='add'>+ * Loop through the list of powerdomains, registering all that are</div><div class='add'>+ * available on the current CPU. If pwrdm_list is supplied and not</div><div class='add'>+ * null, all of the referenced powerdomains will be registered.  No</div><div class='add'>+ * return value.</div><div class='add'>+ */</div><div class='add'>+void pwrdm_init(struct powerdomain **pwrdm_list)</div><div class='add'>+{</div><div class='add'>+	struct powerdomain **p = NULL;</div><div class='add'>+</div><div class='add'>+	if (pwrdm_list)</div><div class='add'>+		for (p = pwrdm_list; *p; p++)</div><div class='add'>+			pwrdm_register(*p);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pwrdm_register - register a powerdomain</div><div class='add'>+ * @pwrdm: struct powerdomain * to register</div><div class='add'>+ *</div><div class='add'>+ * Adds a powerdomain to the internal powerdomain list.  Returns</div><div class='add'>+ * -EINVAL if given a null pointer, -EEXIST if a powerdomain is</div><div class='add'>+ * already registered by the provided name, or 0 upon success.</div><div class='add'>+ */</div><div class='add'>+int pwrdm_register(struct powerdomain *pwrdm)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int ret = -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!pwrdm)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!omap_chip_is(pwrdm-&gt;omap_chip))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	write_lock_irqsave(&amp;pwrdm_rwlock, flags);</div><div class='add'>+	if (_pwrdm_lookup(pwrdm-&gt;name)) {</div><div class='add'>+		ret = -EEXIST;</div><div class='add'>+		goto pr_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_add(&amp;pwrdm-&gt;node, &amp;pwrdm_list);</div><div class='add'>+</div><div class='add'>+	pr_debug("powerdomain: registered %s\n", pwrdm-&gt;name);</div><div class='add'>+	ret = 0;</div><div class='add'>+</div><div class='add'>+pr_unlock:</div><div class='add'>+	write_unlock_irqrestore(&amp;pwrdm_rwlock, flags);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pwrdm_unregister - unregister a powerdomain</div><div class='add'>+ * @pwrdm: struct powerdomain * to unregister</div><div class='add'>+ *</div><div class='add'>+ * Removes a powerdomain from the internal powerdomain list.  Returns</div><div class='add'>+ * -EINVAL if pwrdm argument is NULL.</div><div class='add'>+ */</div><div class='add'>+int pwrdm_unregister(struct powerdomain *pwrdm)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	if (!pwrdm)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	write_lock_irqsave(&amp;pwrdm_rwlock, flags);</div><div class='add'>+	list_del(&amp;pwrdm-&gt;node);</div><div class='add'>+	write_unlock_irqrestore(&amp;pwrdm_rwlock, flags);</div><div class='add'>+</div><div class='add'>+	pr_debug("powerdomain: unregistered %s\n", pwrdm-&gt;name);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pwrdm_lookup - look up a powerdomain by name, return a pointer</div><div class='add'>+ * @name: name of powerdomain</div><div class='add'>+ *</div><div class='add'>+ * Find a registered powerdomain by its name.  Returns a pointer to the</div><div class='add'>+ * struct powerdomain if found, or NULL otherwise.</div><div class='add'>+ */</div><div class='add'>+struct powerdomain *pwrdm_lookup(const char *name)</div><div class='add'>+{</div><div class='add'>+	struct powerdomain *pwrdm;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	if (!name)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	read_lock_irqsave(&amp;pwrdm_rwlock, flags);</div><div class='add'>+	pwrdm = _pwrdm_lookup(name);</div><div class='add'>+	read_unlock_irqrestore(&amp;pwrdm_rwlock, flags);</div><div class='add'>+</div><div class='add'>+	return pwrdm;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pwrdm_for_each - call function on each registered clockdomain</div><div class='add'>+ * @fn: callback function *</div><div class='add'>+ *</div><div class='add'>+ * Call the supplied function for each registered powerdomain.  The</div><div class='add'>+ * callback function can return anything but 0 to bail out early from</div><div class='add'>+ * the iterator.  The callback function is called with the pwrdm_rwlock</div><div class='add'>+ * held for reading, so no powerdomain structure manipulation</div><div class='add'>+ * functions should be called from the callback, although hardware</div><div class='add'>+ * powerdomain control functions are fine.  Returns the last return</div><div class='add'>+ * value of the callback function, which should be 0 for success or</div><div class='add'>+ * anything else to indicate failure; or -EINVAL if the function</div><div class='add'>+ * pointer is null.</div><div class='add'>+ */</div><div class='add'>+int pwrdm_for_each(int (*fn)(struct powerdomain *pwrdm))</div><div class='add'>+{</div><div class='add'>+	struct powerdomain *temp_pwrdm;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (!fn)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	read_lock_irqsave(&amp;pwrdm_rwlock, flags);</div><div class='add'>+	list_for_each_entry(temp_pwrdm, &amp;pwrdm_list, node) {</div><div class='add'>+		ret = (*fn)(temp_pwrdm);</div><div class='add'>+		if (ret)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	read_unlock_irqrestore(&amp;pwrdm_rwlock, flags);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pwrdm_add_clkdm - add a clockdomain to a powerdomain</div><div class='add'>+ * @pwrdm: struct powerdomain * to add the clockdomain to</div><div class='add'>+ * @clkdm: struct clockdomain * to associate with a powerdomain</div><div class='add'>+ *</div><div class='add'>+ * Associate the clockdomain 'clkdm' with a powerdomain 'pwrdm'.  This</div><div class='add'>+ * enables the use of pwrdm_for_each_clkdm().  Returns -EINVAL if</div><div class='add'>+ * presented with invalid pointers; -ENOMEM if memory could not be allocated;</div><div class='add'>+ * or 0 upon success.</div><div class='add'>+ */</div><div class='add'>+int pwrdm_add_clkdm(struct powerdomain *pwrdm, struct clockdomain *clkdm)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int i;</div><div class='add'>+	int ret = -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!pwrdm || !clkdm)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	pr_debug("powerdomain: associating clockdomain %s with powerdomain "</div><div class='add'>+		 "%s\n", clkdm-&gt;name, pwrdm-&gt;name);</div><div class='add'>+</div><div class='add'>+	write_lock_irqsave(&amp;pwrdm_rwlock, flags);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; PWRDM_MAX_CLKDMS; i++) {</div><div class='add'>+		if (!pwrdm-&gt;pwrdm_clkdms[i])</div><div class='add'>+			break;</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+		if (pwrdm-&gt;pwrdm_clkdms[i] == clkdm) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto pac_exit;</div><div class='add'>+		}</div><div class='add'>+#endif</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (i == PWRDM_MAX_CLKDMS) {</div><div class='add'>+		pr_debug("powerdomain: increase PWRDM_MAX_CLKDMS for "</div><div class='add'>+			 "pwrdm %s clkdm %s\n", pwrdm-&gt;name, clkdm-&gt;name);</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto pac_exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pwrdm-&gt;pwrdm_clkdms[i] = clkdm;</div><div class='add'>+</div><div class='add'>+	ret = 0;</div><div class='add'>+</div><div class='add'>+pac_exit:</div><div class='add'>+	write_unlock_irqrestore(&amp;pwrdm_rwlock, flags);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pwrdm_del_clkdm - remove a clockdomain from a powerdomain</div><div class='add'>+ * @pwrdm: struct powerdomain * to add the clockdomain to</div><div class='add'>+ * @clkdm: struct clockdomain * to associate with a powerdomain</div><div class='add'>+ *</div><div class='add'>+ * Dissociate the clockdomain 'clkdm' from the powerdomain</div><div class='add'>+ * 'pwrdm'. Returns -EINVAL if presented with invalid pointers;</div><div class='add'>+ * -ENOENT if the clkdm was not associated with the powerdomain, or 0</div><div class='add'>+ * upon success.</div><div class='add'>+ */</div><div class='add'>+int pwrdm_del_clkdm(struct powerdomain *pwrdm, struct clockdomain *clkdm)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int ret = -EINVAL;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!pwrdm || !clkdm)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	pr_debug("powerdomain: dissociating clockdomain %s from powerdomain "</div><div class='add'>+		 "%s\n", clkdm-&gt;name, pwrdm-&gt;name);</div><div class='add'>+</div><div class='add'>+	write_lock_irqsave(&amp;pwrdm_rwlock, flags);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; PWRDM_MAX_CLKDMS; i++)</div><div class='add'>+		if (pwrdm-&gt;pwrdm_clkdms[i] == clkdm)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+	if (i == PWRDM_MAX_CLKDMS) {</div><div class='add'>+		pr_debug("powerdomain: clkdm %s not associated with pwrdm "</div><div class='add'>+			 "%s ?!\n", clkdm-&gt;name, pwrdm-&gt;name);</div><div class='add'>+		ret = -ENOENT;</div><div class='add'>+		goto pdc_exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pwrdm-&gt;pwrdm_clkdms[i] = NULL;</div><div class='add'>+</div><div class='add'>+	ret = 0;</div><div class='add'>+</div><div class='add'>+pdc_exit:</div><div class='add'>+	write_unlock_irqrestore(&amp;pwrdm_rwlock, flags);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pwrdm_for_each_clkdm - call function on each clkdm in a pwrdm</div><div class='add'>+ * @pwrdm: struct powerdomain * to iterate over</div><div class='add'>+ * @fn: callback function *</div><div class='add'>+ *</div><div class='add'>+ * Call the supplied function for each clockdomain in the powerdomain</div><div class='add'>+ * 'pwrdm'.  The callback function can return anything but 0 to bail</div><div class='add'>+ * out early from the iterator.  The callback function is called with</div><div class='add'>+ * the pwrdm_rwlock held for reading, so no powerdomain structure</div><div class='add'>+ * manipulation functions should be called from the callback, although</div><div class='add'>+ * hardware powerdomain control functions are fine.  Returns -EINVAL</div><div class='add'>+ * if presented with invalid pointers; or passes along the last return</div><div class='add'>+ * value of the callback function, which should be 0 for success or</div><div class='add'>+ * anything else to indicate failure.</div><div class='add'>+ */</div><div class='add'>+int pwrdm_for_each_clkdm(struct powerdomain *pwrdm,</div><div class='add'>+			 int (*fn)(struct powerdomain *pwrdm,</div><div class='add'>+				   struct clockdomain *clkdm))</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!fn)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	read_lock_irqsave(&amp;pwrdm_rwlock, flags);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; PWRDM_MAX_CLKDMS &amp;&amp; !ret; i++)</div><div class='add'>+		ret = (*fn)(pwrdm, pwrdm-&gt;pwrdm_clkdms[i]);</div><div class='add'>+</div><div class='add'>+	read_unlock_irqrestore(&amp;pwrdm_rwlock, flags);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pwrdm_add_wkdep - add a wakeup dependency from pwrdm2 to pwrdm1</div><div class='add'>+ * @pwrdm1: wake this struct powerdomain * up (dependent)</div><div class='add'>+ * @pwrdm2: when this struct powerdomain * wakes up (source)</div><div class='add'>+ *</div><div class='add'>+ * When the powerdomain represented by pwrdm2 wakes up (due to an</div><div class='add'>+ * interrupt), wake up pwrdm1.	Implemented in hardware on the OMAP,</div><div class='add'>+ * this feature is designed to reduce wakeup latency of the dependent</div><div class='add'>+ * powerdomain.  Returns -EINVAL if presented with invalid powerdomain</div><div class='add'>+ * pointers, -ENOENT if pwrdm2 cannot wake up pwrdm1 in hardware, or</div><div class='add'>+ * 0 upon success.</div><div class='add'>+ */</div><div class='add'>+int pwrdm_add_wkdep(struct powerdomain *pwrdm1, struct powerdomain *pwrdm2)</div><div class='add'>+{</div><div class='add'>+	struct powerdomain *p;</div><div class='add'>+</div><div class='add'>+	if (!pwrdm1)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	p = _pwrdm_deps_lookup(pwrdm2, pwrdm1-&gt;wkdep_srcs);</div><div class='add'>+	if (IS_ERR(p)) {</div><div class='add'>+		pr_debug("powerdomain: hardware cannot set/clear wake up of "</div><div class='add'>+			 "%s when %s wakes up\n", pwrdm1-&gt;name, pwrdm2-&gt;name);</div><div class='add'>+		return IS_ERR(p);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pr_debug("powerdomain: hardware will wake up %s when %s wakes up\n",</div><div class='add'>+		 pwrdm1-&gt;name, pwrdm2-&gt;name);</div><div class='add'>+</div><div class='add'>+	prm_set_mod_reg_bits((1 &lt;&lt; pwrdm2-&gt;dep_bit),</div><div class='add'>+			     pwrdm1-&gt;prcm_offs, PM_WKDEP);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pwrdm_del_wkdep - remove a wakeup dependency from pwrdm2 to pwrdm1</div><div class='add'>+ * @pwrdm1: wake this struct powerdomain * up (dependent)</div><div class='add'>+ * @pwrdm2: when this struct powerdomain * wakes up (source)</div><div class='add'>+ *</div><div class='add'>+ * Remove a wakeup dependency that causes pwrdm1 to wake up when pwrdm2</div><div class='add'>+ * wakes up.  Returns -EINVAL if presented with invalid powerdomain</div><div class='add'>+ * pointers, -ENOENT if pwrdm2 cannot wake up pwrdm1 in hardware, or</div><div class='add'>+ * 0 upon success.</div><div class='add'>+ */</div><div class='add'>+int pwrdm_del_wkdep(struct powerdomain *pwrdm1, struct powerdomain *pwrdm2)</div><div class='add'>+{</div><div class='add'>+	struct powerdomain *p;</div><div class='add'>+</div><div class='add'>+	if (!pwrdm1)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	p = _pwrdm_deps_lookup(pwrdm2, pwrdm1-&gt;wkdep_srcs);</div><div class='add'>+	if (IS_ERR(p)) {</div><div class='add'>+		pr_debug("powerdomain: hardware cannot set/clear wake up of "</div><div class='add'>+			 "%s when %s wakes up\n", pwrdm1-&gt;name, pwrdm2-&gt;name);</div><div class='add'>+		return IS_ERR(p);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pr_debug("powerdomain: hardware will no longer wake up %s after %s "</div><div class='add'>+		 "wakes up\n", pwrdm1-&gt;name, pwrdm2-&gt;name);</div><div class='add'>+</div><div class='add'>+	prm_clear_mod_reg_bits((1 &lt;&lt; pwrdm2-&gt;dep_bit),</div><div class='add'>+			       pwrdm1-&gt;prcm_offs, PM_WKDEP);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pwrdm_read_wkdep - read wakeup dependency state from pwrdm2 to pwrdm1</div><div class='add'>+ * @pwrdm1: wake this struct powerdomain * up (dependent)</div><div class='add'>+ * @pwrdm2: when this struct powerdomain * wakes up (source)</div><div class='add'>+ *</div><div class='add'>+ * Return 1 if a hardware wakeup dependency exists wherein pwrdm1 will be</div><div class='add'>+ * awoken when pwrdm2 wakes up; 0 if dependency is not set; -EINVAL</div><div class='add'>+ * if either powerdomain pointer is invalid; or -ENOENT if the hardware</div><div class='add'>+ * is incapable.</div><div class='add'>+ *</div><div class='add'>+ * REVISIT: Currently this function only represents software-controllable</div><div class='add'>+ * wakeup dependencies.  Wakeup dependencies fixed in hardware are not</div><div class='add'>+ * yet handled here.</div><div class='add'>+ */</div><div class='add'>+int pwrdm_read_wkdep(struct powerdomain *pwrdm1, struct powerdomain *pwrdm2)</div><div class='add'>+{</div><div class='add'>+	struct powerdomain *p;</div><div class='add'>+</div><div class='add'>+	if (!pwrdm1)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	p = _pwrdm_deps_lookup(pwrdm2, pwrdm1-&gt;wkdep_srcs);</div><div class='add'>+	if (IS_ERR(p)) {</div><div class='add'>+		pr_debug("powerdomain: hardware cannot set/clear wake up of "</div><div class='add'>+			 "%s when %s wakes up\n", pwrdm1-&gt;name, pwrdm2-&gt;name);</div><div class='add'>+		return IS_ERR(p);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return prm_read_mod_bits_shift(pwrdm1-&gt;prcm_offs, PM_WKDEP,</div><div class='add'>+					(1 &lt;&lt; pwrdm2-&gt;dep_bit));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pwrdm_add_sleepdep - add a sleep dependency from pwrdm2 to pwrdm1</div><div class='add'>+ * @pwrdm1: prevent this struct powerdomain * from sleeping (dependent)</div><div class='add'>+ * @pwrdm2: when this struct powerdomain * is active (source)</div><div class='add'>+ *</div><div class='add'>+ * Prevent pwrdm1 from automatically going inactive (and then to</div><div class='add'>+ * retention or off) if pwrdm2 is still active.	 Returns -EINVAL if</div><div class='add'>+ * presented with invalid powerdomain pointers or called on a machine</div><div class='add'>+ * that does not support software-configurable hardware sleep dependencies,</div><div class='add'>+ * -ENOENT if the specified dependency cannot be set in hardware, or</div><div class='add'>+ * 0 upon success.</div><div class='add'>+ */</div><div class='add'>+int pwrdm_add_sleepdep(struct powerdomain *pwrdm1, struct powerdomain *pwrdm2)</div><div class='add'>+{</div><div class='add'>+	struct powerdomain *p;</div><div class='add'>+</div><div class='add'>+	if (!pwrdm1)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!cpu_is_omap34xx())</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	p = _pwrdm_deps_lookup(pwrdm2, pwrdm1-&gt;sleepdep_srcs);</div><div class='add'>+	if (IS_ERR(p)) {</div><div class='add'>+		pr_debug("powerdomain: hardware cannot set/clear sleep "</div><div class='add'>+			 "dependency affecting %s from %s\n", pwrdm1-&gt;name,</div><div class='add'>+			 pwrdm2-&gt;name);</div><div class='add'>+		return IS_ERR(p);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pr_debug("powerdomain: will prevent %s from sleeping if %s is active\n",</div><div class='add'>+		 pwrdm1-&gt;name, pwrdm2-&gt;name);</div><div class='add'>+</div><div class='add'>+	cm_set_mod_reg_bits((1 &lt;&lt; pwrdm2-&gt;dep_bit),</div><div class='add'>+			    pwrdm1-&gt;prcm_offs, OMAP3430_CM_SLEEPDEP);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pwrdm_del_sleepdep - remove a sleep dependency from pwrdm2 to pwrdm1</div><div class='add'>+ * @pwrdm1: prevent this struct powerdomain * from sleeping (dependent)</div><div class='add'>+ * @pwrdm2: when this struct powerdomain * is active (source)</div><div class='add'>+ *</div><div class='add'>+ * Allow pwrdm1 to automatically go inactive (and then to retention or</div><div class='add'>+ * off), independent of the activity state of pwrdm2.  Returns -EINVAL</div><div class='add'>+ * if presented with invalid powerdomain pointers or called on a machine</div><div class='add'>+ * that does not support software-configurable hardware sleep dependencies,</div><div class='add'>+ * -ENOENT if the specified dependency cannot be cleared in hardware, or</div><div class='add'>+ * 0 upon success.</div><div class='add'>+ */</div><div class='add'>+int pwrdm_del_sleepdep(struct powerdomain *pwrdm1, struct powerdomain *pwrdm2)</div><div class='add'>+{</div><div class='add'>+	struct powerdomain *p;</div><div class='add'>+</div><div class='add'>+	if (!pwrdm1)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!cpu_is_omap34xx())</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	p = _pwrdm_deps_lookup(pwrdm2, pwrdm1-&gt;sleepdep_srcs);</div><div class='add'>+	if (IS_ERR(p)) {</div><div class='add'>+		pr_debug("powerdomain: hardware cannot set/clear sleep "</div><div class='add'>+			 "dependency affecting %s from %s\n", pwrdm1-&gt;name,</div><div class='add'>+			 pwrdm2-&gt;name);</div><div class='add'>+		return IS_ERR(p);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pr_debug("powerdomain: will no longer prevent %s from sleeping if "</div><div class='add'>+		 "%s is active\n", pwrdm1-&gt;name, pwrdm2-&gt;name);</div><div class='add'>+</div><div class='add'>+	cm_clear_mod_reg_bits((1 &lt;&lt; pwrdm2-&gt;dep_bit),</div><div class='add'>+			      pwrdm1-&gt;prcm_offs, OMAP3430_CM_SLEEPDEP);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pwrdm_read_sleepdep - read sleep dependency state from pwrdm2 to pwrdm1</div><div class='add'>+ * @pwrdm1: prevent this struct powerdomain * from sleeping (dependent)</div><div class='add'>+ * @pwrdm2: when this struct powerdomain * is active (source)</div><div class='add'>+ *</div><div class='add'>+ * Return 1 if a hardware sleep dependency exists wherein pwrdm1 will</div><div class='add'>+ * not be allowed to automatically go inactive if pwrdm2 is active;</div><div class='add'>+ * 0 if pwrdm1's automatic power state inactivity transition is independent</div><div class='add'>+ * of pwrdm2's; -EINVAL if either powerdomain pointer is invalid or called</div><div class='add'>+ * on a machine that does not support software-configurable hardware sleep</div><div class='add'>+ * dependencies; or -ENOENT if the hardware is incapable.</div><div class='add'>+ *</div><div class='add'>+ * REVISIT: Currently this function only represents software-controllable</div><div class='add'>+ * sleep dependencies.	Sleep dependencies fixed in hardware are not</div><div class='add'>+ * yet handled here.</div><div class='add'>+ */</div><div class='add'>+int pwrdm_read_sleepdep(struct powerdomain *pwrdm1, struct powerdomain *pwrdm2)</div><div class='add'>+{</div><div class='add'>+	struct powerdomain *p;</div><div class='add'>+</div><div class='add'>+	if (!pwrdm1)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!cpu_is_omap34xx())</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	p = _pwrdm_deps_lookup(pwrdm2, pwrdm1-&gt;sleepdep_srcs);</div><div class='add'>+	if (IS_ERR(p)) {</div><div class='add'>+		pr_debug("powerdomain: hardware cannot set/clear sleep "</div><div class='add'>+			 "dependency affecting %s from %s\n", pwrdm1-&gt;name,</div><div class='add'>+			 pwrdm2-&gt;name);</div><div class='add'>+		return IS_ERR(p);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return prm_read_mod_bits_shift(pwrdm1-&gt;prcm_offs, OMAP3430_CM_SLEEPDEP,</div><div class='add'>+					(1 &lt;&lt; pwrdm2-&gt;dep_bit));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pwrdm_get_mem_bank_count - get number of memory banks in this powerdomain</div><div class='add'>+ * @pwrdm: struct powerdomain *</div><div class='add'>+ *</div><div class='add'>+ * Return the number of controllable memory banks in powerdomain pwrdm,</div><div class='add'>+ * starting with 1.  Returns -EINVAL if the powerdomain pointer is null.</div><div class='add'>+ */</div><div class='add'>+int pwrdm_get_mem_bank_count(struct powerdomain *pwrdm)</div><div class='add'>+{</div><div class='add'>+	if (!pwrdm)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return pwrdm-&gt;banks;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pwrdm_set_next_pwrst - set next powerdomain power state</div><div class='add'>+ * @pwrdm: struct powerdomain * to set</div><div class='add'>+ * @pwrst: one of the PWRDM_POWER_* macros</div><div class='add'>+ *</div><div class='add'>+ * Set the powerdomain pwrdm's next power state to pwrst.  The powerdomain</div><div class='add'>+ * may not enter this state immediately if the preconditions for this state</div><div class='add'>+ * have not been satisfied.  Returns -EINVAL if the powerdomain pointer is</div><div class='add'>+ * null or if the power state is invalid for the powerdomin, or returns 0</div><div class='add'>+ * upon success.</div><div class='add'>+ */</div><div class='add'>+int pwrdm_set_next_pwrst(struct powerdomain *pwrdm, u8 pwrst)</div><div class='add'>+{</div><div class='add'>+	if (!pwrdm)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!(pwrdm-&gt;pwrsts &amp; (1 &lt;&lt; pwrst)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	pr_debug("powerdomain: setting next powerstate for %s to %0x\n",</div><div class='add'>+		 pwrdm-&gt;name, pwrst);</div><div class='add'>+</div><div class='add'>+	prm_rmw_mod_reg_bits(OMAP_POWERSTATE_MASK,</div><div class='add'>+			     (pwrst &lt;&lt; OMAP_POWERSTATE_SHIFT),</div><div class='add'>+			     pwrdm-&gt;prcm_offs, PM_PWSTCTRL);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pwrdm_read_next_pwrst - get next powerdomain power state</div><div class='add'>+ * @pwrdm: struct powerdomain * to get power state</div><div class='add'>+ *</div><div class='add'>+ * Return the powerdomain pwrdm's next power state.  Returns -EINVAL</div><div class='add'>+ * if the powerdomain pointer is null or returns the next power state</div><div class='add'>+ * upon success.</div><div class='add'>+ */</div><div class='add'>+int pwrdm_read_next_pwrst(struct powerdomain *pwrdm)</div><div class='add'>+{</div><div class='add'>+	if (!pwrdm)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return prm_read_mod_bits_shift(pwrdm-&gt;prcm_offs, PM_PWSTCTRL,</div><div class='add'>+					OMAP_POWERSTATE_MASK);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pwrdm_read_pwrst - get current powerdomain power state</div><div class='add'>+ * @pwrdm: struct powerdomain * to get power state</div><div class='add'>+ *</div><div class='add'>+ * Return the powerdomain pwrdm's current power state.	Returns -EINVAL</div><div class='add'>+ * if the powerdomain pointer is null or returns the current power state</div><div class='add'>+ * upon success.</div><div class='add'>+ */</div><div class='add'>+int pwrdm_read_pwrst(struct powerdomain *pwrdm)</div><div class='add'>+{</div><div class='add'>+	if (!pwrdm)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return prm_read_mod_bits_shift(pwrdm-&gt;prcm_offs, PM_PWSTST,</div><div class='add'>+					OMAP_POWERSTATEST_MASK);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pwrdm_read_prev_pwrst - get previous powerdomain power state</div><div class='add'>+ * @pwrdm: struct powerdomain * to get previous power state</div><div class='add'>+ *</div><div class='add'>+ * Return the powerdomain pwrdm's previous power state.  Returns -EINVAL</div><div class='add'>+ * if the powerdomain pointer is null or returns the previous power state</div><div class='add'>+ * upon success.</div><div class='add'>+ */</div><div class='add'>+int pwrdm_read_prev_pwrst(struct powerdomain *pwrdm)</div><div class='add'>+{</div><div class='add'>+	if (!pwrdm)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return prm_read_mod_bits_shift(pwrdm-&gt;prcm_offs, OMAP3430_PM_PREPWSTST,</div><div class='add'>+					OMAP3430_LASTPOWERSTATEENTERED_MASK);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pwrdm_set_logic_retst - set powerdomain logic power state upon retention</div><div class='add'>+ * @pwrdm: struct powerdomain * to set</div><div class='add'>+ * @pwrst: one of the PWRDM_POWER_* macros</div><div class='add'>+ *</div><div class='add'>+ * Set the next power state that the logic portion of the powerdomain</div><div class='add'>+ * pwrdm will enter when the powerdomain enters retention.  This will</div><div class='add'>+ * be either RETENTION or OFF, if supported.  Returns -EINVAL if the</div><div class='add'>+ * powerdomain pointer is null or the target power state is not not</div><div class='add'>+ * supported, or returns 0 upon success.</div><div class='add'>+ */</div><div class='add'>+int pwrdm_set_logic_retst(struct powerdomain *pwrdm, u8 pwrst)</div><div class='add'>+{</div><div class='add'>+	if (!pwrdm)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!(pwrdm-&gt;pwrsts_logic_ret &amp; (1 &lt;&lt; pwrst)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	pr_debug("powerdomain: setting next logic powerstate for %s to %0x\n",</div><div class='add'>+		 pwrdm-&gt;name, pwrst);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The register bit names below may not correspond to the</div><div class='add'>+	 * actual names of the bits in each powerdomain's register,</div><div class='add'>+	 * but the type of value returned is the same for each</div><div class='add'>+	 * powerdomain.</div><div class='add'>+	 */</div><div class='add'>+	prm_rmw_mod_reg_bits(OMAP3430_LOGICL1CACHERETSTATE,</div><div class='add'>+			     (pwrst &lt;&lt; __ffs(OMAP3430_LOGICL1CACHERETSTATE)),</div><div class='add'>+			     pwrdm-&gt;prcm_offs, PM_PWSTCTRL);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pwrdm_set_mem_onst - set memory power state while powerdomain ON</div><div class='add'>+ * @pwrdm: struct powerdomain * to set</div><div class='add'>+ * @bank: memory bank number to set (0-3)</div><div class='add'>+ * @pwrst: one of the PWRDM_POWER_* macros</div><div class='add'>+ *</div><div class='add'>+ * Set the next power state that memory bank x of the powerdomain</div><div class='add'>+ * pwrdm will enter when the powerdomain enters the ON state.  Bank</div><div class='add'>+ * will be a number from 0 to 3, and represents different types of</div><div class='add'>+ * memory, depending on the powerdomain.  Returns -EINVAL if the</div><div class='add'>+ * powerdomain pointer is null or the target power state is not not</div><div class='add'>+ * supported for this memory bank, -EEXIST if the target memory bank</div><div class='add'>+ * does not exist or is not controllable, or returns 0 upon success.</div><div class='add'>+ */</div><div class='add'>+int pwrdm_set_mem_onst(struct powerdomain *pwrdm, u8 bank, u8 pwrst)</div><div class='add'>+{</div><div class='add'>+	u32 m;</div><div class='add'>+</div><div class='add'>+	if (!pwrdm)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (pwrdm-&gt;banks &lt; (bank + 1))</div><div class='add'>+		return -EEXIST;</div><div class='add'>+</div><div class='add'>+	if (!(pwrdm-&gt;pwrsts_mem_on[bank] &amp; (1 &lt;&lt; pwrst)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	pr_debug("powerdomain: setting next memory powerstate for domain %s "</div><div class='add'>+		 "bank %0x while pwrdm-ON to %0x\n", pwrdm-&gt;name, bank, pwrst);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The register bit names below may not correspond to the</div><div class='add'>+	 * actual names of the bits in each powerdomain's register,</div><div class='add'>+	 * but the type of value returned is the same for each</div><div class='add'>+	 * powerdomain.</div><div class='add'>+	 */</div><div class='add'>+	switch (bank) {</div><div class='add'>+	case 0:</div><div class='add'>+		m = OMAP3430_SHAREDL1CACHEFLATONSTATE_MASK;</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		m = OMAP3430_L1FLATMEMONSTATE_MASK;</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		m = OMAP3430_SHAREDL2CACHEFLATONSTATE_MASK;</div><div class='add'>+		break;</div><div class='add'>+	case 3:</div><div class='add'>+		m = OMAP3430_L2FLATMEMONSTATE_MASK;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		WARN_ON(1); /* should never happen */</div><div class='add'>+		return -EEXIST;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	prm_rmw_mod_reg_bits(m, (pwrst &lt;&lt; __ffs(m)),</div><div class='add'>+			     pwrdm-&gt;prcm_offs, PM_PWSTCTRL);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pwrdm_set_mem_retst - set memory power state while powerdomain in RET</div><div class='add'>+ * @pwrdm: struct powerdomain * to set</div><div class='add'>+ * @bank: memory bank number to set (0-3)</div><div class='add'>+ * @pwrst: one of the PWRDM_POWER_* macros</div><div class='add'>+ *</div><div class='add'>+ * Set the next power state that memory bank x of the powerdomain</div><div class='add'>+ * pwrdm will enter when the powerdomain enters the RETENTION state.</div><div class='add'>+ * Bank will be a number from 0 to 3, and represents different types</div><div class='add'>+ * of memory, depending on the powerdomain.  pwrst will be either</div><div class='add'>+ * RETENTION or OFF, if supported. Returns -EINVAL if the powerdomain</div><div class='add'>+ * pointer is null or the target power state is not not supported for</div><div class='add'>+ * this memory bank, -EEXIST if the target memory bank does not exist</div><div class='add'>+ * or is not controllable, or returns 0 upon success.</div><div class='add'>+ */</div><div class='add'>+int pwrdm_set_mem_retst(struct powerdomain *pwrdm, u8 bank, u8 pwrst)</div><div class='add'>+{</div><div class='add'>+	u32 m;</div><div class='add'>+</div><div class='add'>+	if (!pwrdm)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (pwrdm-&gt;banks &lt; (bank + 1))</div><div class='add'>+		return -EEXIST;</div><div class='add'>+</div><div class='add'>+	if (!(pwrdm-&gt;pwrsts_mem_ret[bank] &amp; (1 &lt;&lt; pwrst)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	pr_debug("powerdomain: setting next memory powerstate for domain %s "</div><div class='add'>+		 "bank %0x while pwrdm-RET to %0x\n", pwrdm-&gt;name, bank, pwrst);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The register bit names below may not correspond to the</div><div class='add'>+	 * actual names of the bits in each powerdomain's register,</div><div class='add'>+	 * but the type of value returned is the same for each</div><div class='add'>+	 * powerdomain.</div><div class='add'>+	 */</div><div class='add'>+	switch (bank) {</div><div class='add'>+	case 0:</div><div class='add'>+		m = OMAP3430_SHAREDL1CACHEFLATRETSTATE;</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		m = OMAP3430_L1FLATMEMRETSTATE;</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		m = OMAP3430_SHAREDL2CACHEFLATRETSTATE;</div><div class='add'>+		break;</div><div class='add'>+	case 3:</div><div class='add'>+		m = OMAP3430_L2FLATMEMRETSTATE;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		WARN_ON(1); /* should never happen */</div><div class='add'>+		return -EEXIST;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	prm_rmw_mod_reg_bits(m, (pwrst &lt;&lt; __ffs(m)), pwrdm-&gt;prcm_offs,</div><div class='add'>+			     PM_PWSTCTRL);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pwrdm_read_logic_pwrst - get current powerdomain logic retention power state</div><div class='add'>+ * @pwrdm: struct powerdomain * to get current logic retention power state</div><div class='add'>+ *</div><div class='add'>+ * Return the current power state that the logic portion of</div><div class='add'>+ * powerdomain pwrdm will enter</div><div class='add'>+ * Returns -EINVAL if the powerdomain pointer is null or returns the</div><div class='add'>+ * current logic retention power state upon success.</div><div class='add'>+ */</div><div class='add'>+int pwrdm_read_logic_pwrst(struct powerdomain *pwrdm)</div><div class='add'>+{</div><div class='add'>+	if (!pwrdm)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return prm_read_mod_bits_shift(pwrdm-&gt;prcm_offs, PM_PWSTST,</div><div class='add'>+					OMAP3430_LOGICSTATEST);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pwrdm_read_prev_logic_pwrst - get previous powerdomain logic power state</div><div class='add'>+ * @pwrdm: struct powerdomain * to get previous logic power state</div><div class='add'>+ *</div><div class='add'>+ * Return the powerdomain pwrdm's logic power state.  Returns -EINVAL</div><div class='add'>+ * if the powerdomain pointer is null or returns the previous logic</div><div class='add'>+ * power state upon success.</div><div class='add'>+ */</div><div class='add'>+int pwrdm_read_prev_logic_pwrst(struct powerdomain *pwrdm)</div><div class='add'>+{</div><div class='add'>+	if (!pwrdm)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The register bit names below may not correspond to the</div><div class='add'>+	 * actual names of the bits in each powerdomain's register,</div><div class='add'>+	 * but the type of value returned is the same for each</div><div class='add'>+	 * powerdomain.</div><div class='add'>+	 */</div><div class='add'>+	return prm_read_mod_bits_shift(pwrdm-&gt;prcm_offs, OMAP3430_PM_PREPWSTST,</div><div class='add'>+					OMAP3430_LASTLOGICSTATEENTERED);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pwrdm_read_mem_pwrst - get current memory bank power state</div><div class='add'>+ * @pwrdm: struct powerdomain * to get current memory bank power state</div><div class='add'>+ * @bank: memory bank number (0-3)</div><div class='add'>+ *</div><div class='add'>+ * Return the powerdomain pwrdm's current memory power state for bank</div><div class='add'>+ * x.  Returns -EINVAL if the powerdomain pointer is null, -EEXIST if</div><div class='add'>+ * the target memory bank does not exist or is not controllable, or</div><div class='add'>+ * returns the current memory power state upon success.</div><div class='add'>+ */</div><div class='add'>+int pwrdm_read_mem_pwrst(struct powerdomain *pwrdm, u8 bank)</div><div class='add'>+{</div><div class='add'>+	u32 m;</div><div class='add'>+</div><div class='add'>+	if (!pwrdm)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (pwrdm-&gt;banks &lt; (bank + 1))</div><div class='add'>+		return -EEXIST;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The register bit names below may not correspond to the</div><div class='add'>+	 * actual names of the bits in each powerdomain's register,</div><div class='add'>+	 * but the type of value returned is the same for each</div><div class='add'>+	 * powerdomain.</div><div class='add'>+	 */</div><div class='add'>+	switch (bank) {</div><div class='add'>+	case 0:</div><div class='add'>+		m = OMAP3430_SHAREDL1CACHEFLATSTATEST_MASK;</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		m = OMAP3430_L1FLATMEMSTATEST_MASK;</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		m = OMAP3430_SHAREDL2CACHEFLATSTATEST_MASK;</div><div class='add'>+		break;</div><div class='add'>+	case 3:</div><div class='add'>+		m = OMAP3430_L2FLATMEMSTATEST_MASK;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		WARN_ON(1); /* should never happen */</div><div class='add'>+		return -EEXIST;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return prm_read_mod_bits_shift(pwrdm-&gt;prcm_offs, PM_PWSTST, m);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pwrdm_read_prev_mem_pwrst - get previous memory bank power state</div><div class='add'>+ * @pwrdm: struct powerdomain * to get previous memory bank power state</div><div class='add'>+ * @bank: memory bank number (0-3)</div><div class='add'>+ *</div><div class='add'>+ * Return the powerdomain pwrdm's previous memory power state for bank</div><div class='add'>+ * x.  Returns -EINVAL if the powerdomain pointer is null, -EEXIST if</div><div class='add'>+ * the target memory bank does not exist or is not controllable, or</div><div class='add'>+ * returns the previous memory power state upon success.</div><div class='add'>+ */</div><div class='add'>+int pwrdm_read_prev_mem_pwrst(struct powerdomain *pwrdm, u8 bank)</div><div class='add'>+{</div><div class='add'>+	u32 m;</div><div class='add'>+</div><div class='add'>+	if (!pwrdm)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (pwrdm-&gt;banks &lt; (bank + 1))</div><div class='add'>+		return -EEXIST;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The register bit names below may not correspond to the</div><div class='add'>+	 * actual names of the bits in each powerdomain's register,</div><div class='add'>+	 * but the type of value returned is the same for each</div><div class='add'>+	 * powerdomain.</div><div class='add'>+	 */</div><div class='add'>+	switch (bank) {</div><div class='add'>+	case 0:</div><div class='add'>+		m = OMAP3430_LASTMEM1STATEENTERED_MASK;</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		m = OMAP3430_LASTMEM2STATEENTERED_MASK;</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		m = OMAP3430_LASTSHAREDL2CACHEFLATSTATEENTERED_MASK;</div><div class='add'>+		break;</div><div class='add'>+	case 3:</div><div class='add'>+		m = OMAP3430_LASTL2FLATMEMSTATEENTERED_MASK;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		WARN_ON(1); /* should never happen */</div><div class='add'>+		return -EEXIST;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return prm_read_mod_bits_shift(pwrdm-&gt;prcm_offs,</div><div class='add'>+					OMAP3430_PM_PREPWSTST, m);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pwrdm_clear_all_prev_pwrst - clear previous powerstate register for a pwrdm</div><div class='add'>+ * @pwrdm: struct powerdomain * to clear</div><div class='add'>+ *</div><div class='add'>+ * Clear the powerdomain's previous power state register.  Clears the</div><div class='add'>+ * entire register, including logic and memory bank previous power states.</div><div class='add'>+ * Returns -EINVAL if the powerdomain pointer is null, or returns 0 upon</div><div class='add'>+ * success.</div><div class='add'>+ */</div><div class='add'>+int pwrdm_clear_all_prev_pwrst(struct powerdomain *pwrdm)</div><div class='add'>+{</div><div class='add'>+	if (!pwrdm)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * XXX should get the powerdomain's current state here;</div><div class='add'>+	 * warn &amp; fail if it is not ON.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	pr_debug("powerdomain: clearing previous power state reg for %s\n",</div><div class='add'>+		 pwrdm-&gt;name);</div><div class='add'>+</div><div class='add'>+	prm_write_mod_reg(0, pwrdm-&gt;prcm_offs, OMAP3430_PM_PREPWSTST);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pwrdm_enable_hdwr_sar - enable automatic hardware SAR for a pwrdm</div><div class='add'>+ * @pwrdm: struct powerdomain *</div><div class='add'>+ *</div><div class='add'>+ * Enable automatic context save-and-restore upon power state change</div><div class='add'>+ * for some devices in a powerdomain.  Warning: this only affects a</div><div class='add'>+ * subset of devices in a powerdomain; check the TRM closely.  Returns</div><div class='add'>+ * -EINVAL if the powerdomain pointer is null or if the powerdomain</div><div class='add'>+ * does not support automatic save-and-restore, or returns 0 upon</div><div class='add'>+ * success.</div><div class='add'>+ */</div><div class='add'>+int pwrdm_enable_hdwr_sar(struct powerdomain *pwrdm)</div><div class='add'>+{</div><div class='add'>+	if (!pwrdm)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!(pwrdm-&gt;flags &amp; PWRDM_HAS_HDWR_SAR))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	pr_debug("powerdomain: %s: setting SAVEANDRESTORE bit\n",</div><div class='add'>+		 pwrdm-&gt;name);</div><div class='add'>+</div><div class='add'>+	prm_rmw_mod_reg_bits(0, 1 &lt;&lt; OMAP3430ES2_SAVEANDRESTORE_SHIFT,</div><div class='add'>+			     pwrdm-&gt;prcm_offs, PM_PWSTCTRL);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pwrdm_disable_hdwr_sar - disable automatic hardware SAR for a pwrdm</div><div class='add'>+ * @pwrdm: struct powerdomain *</div><div class='add'>+ *</div><div class='add'>+ * Disable automatic context save-and-restore upon power state change</div><div class='add'>+ * for some devices in a powerdomain.  Warning: this only affects a</div><div class='add'>+ * subset of devices in a powerdomain; check the TRM closely.  Returns</div><div class='add'>+ * -EINVAL if the powerdomain pointer is null or if the powerdomain</div><div class='add'>+ * does not support automatic save-and-restore, or returns 0 upon</div><div class='add'>+ * success.</div><div class='add'>+ */</div><div class='add'>+int pwrdm_disable_hdwr_sar(struct powerdomain *pwrdm)</div><div class='add'>+{</div><div class='add'>+	if (!pwrdm)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!(pwrdm-&gt;flags &amp; PWRDM_HAS_HDWR_SAR))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	pr_debug("powerdomain: %s: clearing SAVEANDRESTORE bit\n",</div><div class='add'>+		 pwrdm-&gt;name);</div><div class='add'>+</div><div class='add'>+	prm_rmw_mod_reg_bits(1 &lt;&lt; OMAP3430ES2_SAVEANDRESTORE_SHIFT, 0,</div><div class='add'>+			     pwrdm-&gt;prcm_offs, PM_PWSTCTRL);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pwrdm_has_hdwr_sar - test whether powerdomain supports hardware SAR</div><div class='add'>+ * @pwrdm: struct powerdomain *</div><div class='add'>+ *</div><div class='add'>+ * Returns 1 if powerdomain 'pwrdm' supports hardware save-and-restore</div><div class='add'>+ * for some devices, or 0 if it does not.</div><div class='add'>+ */</div><div class='add'>+bool pwrdm_has_hdwr_sar(struct powerdomain *pwrdm)</div><div class='add'>+{</div><div class='add'>+	return (pwrdm &amp;&amp; pwrdm-&gt;flags &amp; PWRDM_HAS_HDWR_SAR) ? 1 : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pwrdm_wait_transition - wait for powerdomain power transition to finish</div><div class='add'>+ * @pwrdm: struct powerdomain * to wait for</div><div class='add'>+ *</div><div class='add'>+ * If the powerdomain pwrdm is in the process of a state transition,</div><div class='add'>+ * spin until it completes the power transition, or until an iteration</div><div class='add'>+ * bailout value is reached. Returns -EINVAL if the powerdomain</div><div class='add'>+ * pointer is null, -EAGAIN if the bailout value was reached, or</div><div class='add'>+ * returns 0 upon success.</div><div class='add'>+ */</div><div class='add'>+int pwrdm_wait_transition(struct powerdomain *pwrdm)</div><div class='add'>+{</div><div class='add'>+	u32 c = 0;</div><div class='add'>+</div><div class='add'>+	if (!pwrdm)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * REVISIT: pwrdm_wait_transition() may be better implemented</div><div class='add'>+	 * via a callback and a periodic timer check -- how long do we expect</div><div class='add'>+	 * powerdomain transitions to take?</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* XXX Is this udelay() value meaningful? */</div><div class='add'>+	while ((prm_read_mod_reg(pwrdm-&gt;prcm_offs, PM_PWSTST) &amp;</div><div class='add'>+		OMAP_INTRANSITION) &amp;&amp;</div><div class='add'>+	       (c++ &lt; PWRDM_TRANSITION_BAILOUT))</div><div class='add'>+		udelay(1);</div><div class='add'>+</div><div class='add'>+	if (c &gt;= PWRDM_TRANSITION_BAILOUT) {</div><div class='add'>+		printk(KERN_ERR "powerdomain: waited too long for "</div><div class='add'>+		       "powerdomain %s to complete transition\n", pwrdm-&gt;name);</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pr_debug("powerdomain: completed transition in %d loops\n", c);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='head'>diff --git a/arch/arm/mach-omap2/powerdomains.h b/arch/arm/mach-omap2/powerdomains.h<br/>new file mode 100644<br/>index 000000000000..1e151faebbd3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap2/powerdomains.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/powerdomains.h</a></div><div class='hunk'>@@ -0,0 +1,187 @@</div><div class='add'>+/*</div><div class='add'>+ * OMAP2/3 common powerdomain definitions</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2007-8 Texas Instruments, Inc.</div><div class='add'>+ * Copyright (C) 2007-8 Nokia Corporation</div><div class='add'>+ *</div><div class='add'>+ * Written by Paul Walmsley</div><div class='add'>+ * Debugging and integration fixes by Jouni Högander</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef ARCH_ARM_MACH_OMAP2_POWERDOMAINS</div><div class='add'>+#define ARCH_ARM_MACH_OMAP2_POWERDOMAINS</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This file contains all of the powerdomains that have some element</div><div class='add'>+ * of software control for the OMAP24xx and OMAP34XX chips.</div><div class='add'>+ *</div><div class='add'>+ * A few notes:</div><div class='add'>+ *</div><div class='add'>+ * This is not an exhaustive listing of powerdomains on the chips; only</div><div class='add'>+ * powerdomains that can be controlled in software.</div><div class='add'>+ *</div><div class='add'>+ * A useful validation rule for struct powerdomain:</div><div class='add'>+ * Any powerdomain referenced by a wkdep_srcs or sleepdep_srcs array</div><div class='add'>+ * must have a dep_bit assigned.  So wkdep_srcs/sleepdep_srcs are really</div><div class='add'>+ * just software-controllable dependencies.  Non-software-controllable</div><div class='add'>+ * dependencies do exist, but they are not encoded below (yet).</div><div class='add'>+ *</div><div class='add'>+ * 24xx does not support programmable sleep dependencies (SLEEPDEP)</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The names for the DSP/IVA2 powerdomains are confusing.</div><div class='add'>+ *</div><div class='add'>+ * Most OMAP chips have an on-board DSP.</div><div class='add'>+ *</div><div class='add'>+ * On the 2420, this is a 'C55 DSP called, simply, the DSP.  Its</div><div class='add'>+ * powerdomain is called the "DSP power domain."  On the 2430, the</div><div class='add'>+ * on-board DSP is a 'C64 DSP, now called the IVA2 or IVA2.1.  Its</div><div class='add'>+ * powerdomain is still called the "DSP power domain."	On the 3430,</div><div class='add'>+ * the DSP is a 'C64 DSP like the 2430, also known as the IVA2; but</div><div class='add'>+ * its powerdomain is now called the "IVA2 power domain."</div><div class='add'>+ *</div><div class='add'>+ * The 2420 also has something called the IVA, which is a separate ARM</div><div class='add'>+ * core, and has nothing to do with the DSP/IVA2.</div><div class='add'>+ *</div><div class='add'>+ * Ideally the DSP/IVA2 could just be the same powerdomain, but the PRCM</div><div class='add'>+ * address offset is different between the C55 and C64 DSPs.</div><div class='add'>+ *</div><div class='add'>+ * The overly-specific dep_bit names are due to a bit name collision</div><div class='add'>+ * with CM_FCLKEN_{DSP,IVA2}.  The DSP/IVA2 PM_WKDEP and CM_SLEEPDEP shift</div><div class='add'>+ * value are the same for all powerdomains: 2</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * XXX should dep_bit be a mask, so we can test to see if it is 0 as a</div><div class='add'>+ * sanity check?</div><div class='add'>+ * XXX encode hardware fixed wakeup dependencies -- esp. for 3430 CORE</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;mach/powerdomain.h&gt;</div><div class='add'>+</div><div class='add'>+#include "prcm-common.h"</div><div class='add'>+#include "prm.h"</div><div class='add'>+#include "cm.h"</div><div class='add'>+</div><div class='add'>+/* OMAP2/3-common powerdomains and wakeup dependencies */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * 2420/2430 PM_WKDEP_GFX: CORE, MPU, WKUP</div><div class='add'>+ * 3430ES1 PM_WKDEP_GFX: adds IVA2, removes CORE</div><div class='add'>+ * 3430ES2 PM_WKDEP_SGX: adds IVA2, removes CORE</div><div class='add'>+ */</div><div class='add'>+static struct pwrdm_dep gfx_sgx_wkdeps[] = {</div><div class='add'>+	{</div><div class='add'>+		.pwrdm_name = "core_pwrdm",</div><div class='add'>+		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP24XX)</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.pwrdm_name = "iva2_pwrdm",</div><div class='add'>+		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.pwrdm_name = "mpu_pwrdm",</div><div class='add'>+		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP24XX |</div><div class='add'>+					    CHIP_IS_OMAP3430)</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.pwrdm_name = "wkup_pwrdm",</div><div class='add'>+		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP24XX |</div><div class='add'>+					    CHIP_IS_OMAP3430)</div><div class='add'>+	},</div><div class='add'>+	{ NULL },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * 3430: CM_SLEEPDEP_CAM: MPU</div><div class='add'>+ * 3430ES1: CM_SLEEPDEP_GFX: MPU</div><div class='add'>+ * 3430ES2: CM_SLEEPDEP_SGX: MPU</div><div class='add'>+ */</div><div class='add'>+static struct pwrdm_dep cam_gfx_sleepdeps[] = {</div><div class='add'>+	{</div><div class='add'>+		.pwrdm_name = "mpu_pwrdm",</div><div class='add'>+		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)</div><div class='add'>+	},</div><div class='add'>+	{ NULL },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#include "powerdomains24xx.h"</div><div class='add'>+#include "powerdomains34xx.h"</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * OMAP2/3 common powerdomains</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The GFX powerdomain is not present on 3430ES2, but currently we do not</div><div class='add'>+ * have a macro to filter it out at compile-time.</div><div class='add'>+ */</div><div class='add'>+static struct powerdomain gfx_pwrdm = {</div><div class='add'>+	.name		  = "gfx_pwrdm",</div><div class='add'>+	.prcm_offs	  = GFX_MOD,</div><div class='add'>+	.omap_chip	  = OMAP_CHIP_INIT(CHIP_IS_OMAP24XX |</div><div class='add'>+					   CHIP_IS_OMAP3430ES1),</div><div class='add'>+	.wkdep_srcs	  = gfx_sgx_wkdeps,</div><div class='add'>+	.sleepdep_srcs	  = cam_gfx_sleepdeps,</div><div class='add'>+	.pwrsts		  = PWRSTS_OFF_RET_ON,</div><div class='add'>+	.pwrsts_logic_ret = PWRDM_POWER_RET,</div><div class='add'>+	.banks		  = 1,</div><div class='add'>+	.pwrsts_mem_ret	  = {</div><div class='add'>+		[0] = PWRDM_POWER_RET, /* MEMRETSTATE */</div><div class='add'>+	},</div><div class='add'>+	.pwrsts_mem_on	  = {</div><div class='add'>+		[0] = PWRDM_POWER_ON,  /* MEMONSTATE */</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct powerdomain wkup_pwrdm = {</div><div class='add'>+	.name		= "wkup_pwrdm",</div><div class='add'>+	.prcm_offs	= WKUP_MOD,</div><div class='add'>+	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP24XX | CHIP_IS_OMAP3430),</div><div class='add'>+	.dep_bit	= OMAP_EN_WKUP_SHIFT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* As powerdomains are added or removed above, this list must also be changed */</div><div class='add'>+static struct powerdomain *powerdomains_omap[] __initdata = {</div><div class='add'>+</div><div class='add'>+	&amp;gfx_pwrdm,</div><div class='add'>+	&amp;wkup_pwrdm,</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ARCH_OMAP24XX</div><div class='add'>+	&amp;dsp_pwrdm,</div><div class='add'>+	&amp;mpu_24xx_pwrdm,</div><div class='add'>+	&amp;core_24xx_pwrdm,</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ARCH_OMAP2430</div><div class='add'>+	&amp;mdm_pwrdm,</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ARCH_OMAP34XX</div><div class='add'>+	&amp;iva2_pwrdm,</div><div class='add'>+	&amp;mpu_34xx_pwrdm,</div><div class='add'>+	&amp;neon_pwrdm,</div><div class='add'>+	&amp;core_34xx_pwrdm,</div><div class='add'>+	&amp;cam_pwrdm,</div><div class='add'>+	&amp;dss_pwrdm,</div><div class='add'>+	&amp;per_pwrdm,</div><div class='add'>+	&amp;emu_pwrdm,</div><div class='add'>+	&amp;sgx_pwrdm,</div><div class='add'>+	&amp;usbhost_pwrdm,</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	NULL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/arm/mach-omap2/powerdomains24xx.h b/arch/arm/mach-omap2/powerdomains24xx.h<br/>new file mode 100644<br/>index 000000000000..9f08dc3f7fd2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap2/powerdomains24xx.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/powerdomains24xx.h</a></div><div class='hunk'>@@ -0,0 +1,200 @@</div><div class='add'>+/*</div><div class='add'>+ * OMAP24XX powerdomain definitions</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2007-2008 Texas Instruments, Inc.</div><div class='add'>+ * Copyright (C) 2007-2008 Nokia Corporation</div><div class='add'>+ *</div><div class='add'>+ * Written by Paul Walmsley</div><div class='add'>+ * Debugging and integration fixes by Jouni Högander</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef ARCH_ARM_MACH_OMAP2_POWERDOMAINS24XX</div><div class='add'>+#define ARCH_ARM_MACH_OMAP2_POWERDOMAINS24XX</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * N.B. If powerdomains are added or removed from this file, update</div><div class='add'>+ * the array in mach-omap2/powerdomains.h.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;mach/powerdomain.h&gt;</div><div class='add'>+</div><div class='add'>+#include "prcm-common.h"</div><div class='add'>+#include "prm.h"</div><div class='add'>+#include "prm-regbits-24xx.h"</div><div class='add'>+#include "cm.h"</div><div class='add'>+#include "cm-regbits-24xx.h"</div><div class='add'>+</div><div class='add'>+/* 24XX powerdomains and dependencies */</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ARCH_OMAP24XX</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Wakeup dependency source arrays */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * 2420/2430 PM_WKDEP_DSP: CORE, MPU, WKUP</div><div class='add'>+ * 2430 PM_WKDEP_MDM: same as above</div><div class='add'>+ */</div><div class='add'>+static struct pwrdm_dep dsp_mdm_24xx_wkdeps[] = {</div><div class='add'>+	{</div><div class='add'>+		.pwrdm_name = "core_pwrdm",</div><div class='add'>+		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP24XX)</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.pwrdm_name = "mpu_pwrdm",</div><div class='add'>+		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP24XX)</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.pwrdm_name = "wkup_pwrdm",</div><div class='add'>+		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP24XX)</div><div class='add'>+	},</div><div class='add'>+	{ NULL },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * 2420 PM_WKDEP_MPU: CORE, DSP, WKUP</div><div class='add'>+ * 2430 adds MDM</div><div class='add'>+ */</div><div class='add'>+static struct pwrdm_dep mpu_24xx_wkdeps[] = {</div><div class='add'>+	{</div><div class='add'>+		.pwrdm_name = "core_pwrdm",</div><div class='add'>+		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP24XX)</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.pwrdm_name = "dsp_pwrdm",</div><div class='add'>+		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP24XX)</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.pwrdm_name = "wkup_pwrdm",</div><div class='add'>+		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP24XX)</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.pwrdm_name = "mdm_pwrdm",</div><div class='add'>+		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2430)</div><div class='add'>+	},</div><div class='add'>+	{ NULL },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * 2420 PM_WKDEP_CORE: DSP, GFX, MPU, WKUP</div><div class='add'>+ * 2430 adds MDM</div><div class='add'>+ */</div><div class='add'>+static struct pwrdm_dep core_24xx_wkdeps[] = {</div><div class='add'>+	{</div><div class='add'>+		.pwrdm_name = "dsp_pwrdm",</div><div class='add'>+		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP24XX)</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.pwrdm_name = "gfx_pwrdm",</div><div class='add'>+		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP24XX)</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.pwrdm_name = "mpu_pwrdm",</div><div class='add'>+		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP24XX)</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.pwrdm_name = "wkup_pwrdm",</div><div class='add'>+		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP24XX)</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.pwrdm_name = "mdm_pwrdm",</div><div class='add'>+		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2430)</div><div class='add'>+	},</div><div class='add'>+	{ NULL },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Powerdomains */</div><div class='add'>+</div><div class='add'>+static struct powerdomain dsp_pwrdm = {</div><div class='add'>+	.name		  = "dsp_pwrdm",</div><div class='add'>+	.prcm_offs	  = OMAP24XX_DSP_MOD,</div><div class='add'>+	.omap_chip	  = OMAP_CHIP_INIT(CHIP_IS_OMAP24XX),</div><div class='add'>+	.dep_bit	  = OMAP24XX_PM_WKDEP_MPU_EN_DSP_SHIFT,</div><div class='add'>+	.wkdep_srcs	  = dsp_mdm_24xx_wkdeps,</div><div class='add'>+	.pwrsts		  = PWRSTS_OFF_RET_ON,</div><div class='add'>+	.pwrsts_logic_ret = PWRDM_POWER_RET,</div><div class='add'>+	.banks		  = 1,</div><div class='add'>+	.pwrsts_mem_ret	  = {</div><div class='add'>+		[0] = PWRDM_POWER_RET,</div><div class='add'>+	},</div><div class='add'>+	.pwrsts_mem_on	  = {</div><div class='add'>+		[0] = PWRDM_POWER_ON,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct powerdomain mpu_24xx_pwrdm = {</div><div class='add'>+	.name		  = "mpu_pwrdm",</div><div class='add'>+	.prcm_offs	  = MPU_MOD,</div><div class='add'>+	.omap_chip	  = OMAP_CHIP_INIT(CHIP_IS_OMAP24XX),</div><div class='add'>+	.dep_bit	  = OMAP24XX_EN_MPU_SHIFT,</div><div class='add'>+	.wkdep_srcs	  = mpu_24xx_wkdeps,</div><div class='add'>+	.pwrsts		  = PWRSTS_OFF_RET_ON,</div><div class='add'>+	.pwrsts_logic_ret = PWRSTS_OFF_RET,</div><div class='add'>+	.banks		  = 1,</div><div class='add'>+	.pwrsts_mem_ret	  = {</div><div class='add'>+		[0] = PWRDM_POWER_RET,</div><div class='add'>+	},</div><div class='add'>+	.pwrsts_mem_on	  = {</div><div class='add'>+		[0] = PWRDM_POWER_ON,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct powerdomain core_24xx_pwrdm = {</div><div class='add'>+	.name		  = "core_pwrdm",</div><div class='add'>+	.prcm_offs	  = CORE_MOD,</div><div class='add'>+	.omap_chip	  = OMAP_CHIP_INIT(CHIP_IS_OMAP24XX),</div><div class='add'>+	.wkdep_srcs	  = core_24xx_wkdeps,</div><div class='add'>+	.pwrsts		  = PWRSTS_OFF_RET_ON,</div><div class='add'>+	.dep_bit	  = OMAP24XX_EN_CORE_SHIFT,</div><div class='add'>+	.banks		  = 3,</div><div class='add'>+	.pwrsts_mem_ret	  = {</div><div class='add'>+		[0] = PWRSTS_OFF_RET,	 /* MEM1RETSTATE */</div><div class='add'>+		[1] = PWRSTS_OFF_RET,	 /* MEM2RETSTATE */</div><div class='add'>+		[2] = PWRSTS_OFF_RET,	 /* MEM3RETSTATE */</div><div class='add'>+	},</div><div class='add'>+	.pwrsts_mem_on	  = {</div><div class='add'>+		[0] = PWRSTS_OFF_RET_ON, /* MEM1ONSTATE */</div><div class='add'>+		[1] = PWRSTS_OFF_RET_ON, /* MEM2ONSTATE */</div><div class='add'>+		[2] = PWRSTS_OFF_RET_ON, /* MEM3ONSTATE */</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif	   /* CONFIG_ARCH_OMAP24XX */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * 2430-specific powerdomains</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ARCH_OMAP2430</div><div class='add'>+</div><div class='add'>+/* XXX 2430 KILLDOMAINWKUP bit?  No current users apparently */</div><div class='add'>+</div><div class='add'>+/* Another case of bit name collisions between several registers: EN_MDM */</div><div class='add'>+static struct powerdomain mdm_pwrdm = {</div><div class='add'>+	.name		  = "mdm_pwrdm",</div><div class='add'>+	.prcm_offs	  = OMAP2430_MDM_MOD,</div><div class='add'>+	.omap_chip	  = OMAP_CHIP_INIT(CHIP_IS_OMAP2430),</div><div class='add'>+	.dep_bit	  = OMAP2430_PM_WKDEP_MPU_EN_MDM_SHIFT,</div><div class='add'>+	.wkdep_srcs	  = dsp_mdm_24xx_wkdeps,</div><div class='add'>+	.pwrsts		  = PWRSTS_OFF_RET_ON,</div><div class='add'>+	.pwrsts_logic_ret = PWRDM_POWER_RET,</div><div class='add'>+	.banks		  = 1,</div><div class='add'>+	.pwrsts_mem_ret	  = {</div><div class='add'>+		[0] = PWRDM_POWER_RET, /* MEMRETSTATE */</div><div class='add'>+	},</div><div class='add'>+	.pwrsts_mem_on	  = {</div><div class='add'>+		[0] = PWRDM_POWER_ON,  /* MEMONSTATE */</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif     /* CONFIG_ARCH_OMAP2430 */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/arm/mach-omap2/powerdomains34xx.h b/arch/arm/mach-omap2/powerdomains34xx.h<br/>new file mode 100644<br/>index 000000000000..f573f7108398<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap2/powerdomains34xx.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/powerdomains34xx.h</a></div><div class='hunk'>@@ -0,0 +1,327 @@</div><div class='add'>+/*</div><div class='add'>+ * OMAP34XX powerdomain definitions</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2007-2008 Texas Instruments, Inc.</div><div class='add'>+ * Copyright (C) 2007-2008 Nokia Corporation</div><div class='add'>+ *</div><div class='add'>+ * Written by Paul Walmsley</div><div class='add'>+ * Debugging and integration fixes by Jouni Högander</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef ARCH_ARM_MACH_OMAP2_POWERDOMAINS34XX</div><div class='add'>+#define ARCH_ARM_MACH_OMAP2_POWERDOMAINS34XX</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * N.B. If powerdomains are added or removed from this file, update</div><div class='add'>+ * the array in mach-omap2/powerdomains.h.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;mach/powerdomain.h&gt;</div><div class='add'>+</div><div class='add'>+#include "prcm-common.h"</div><div class='add'>+#include "prm.h"</div><div class='add'>+#include "prm-regbits-34xx.h"</div><div class='add'>+#include "cm.h"</div><div class='add'>+#include "cm-regbits-34xx.h"</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * 34XX-specific powerdomains, dependencies</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ARCH_OMAP34XX</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * 3430: PM_WKDEP_{PER,USBHOST}: CORE, IVA2, MPU, WKUP</div><div class='add'>+ * (USBHOST is ES2 only)</div><div class='add'>+ */</div><div class='add'>+static struct pwrdm_dep per_usbhost_wkdeps[] = {</div><div class='add'>+	{</div><div class='add'>+		.pwrdm_name = "core_pwrdm",</div><div class='add'>+		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.pwrdm_name = "iva2_pwrdm",</div><div class='add'>+		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.pwrdm_name = "mpu_pwrdm",</div><div class='add'>+		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.pwrdm_name = "wkup_pwrdm",</div><div class='add'>+		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)</div><div class='add'>+	},</div><div class='add'>+	{ NULL },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * 3430 PM_WKDEP_MPU: CORE, IVA2, DSS, PER</div><div class='add'>+ */</div><div class='add'>+static struct pwrdm_dep mpu_34xx_wkdeps[] = {</div><div class='add'>+	{</div><div class='add'>+		.pwrdm_name = "core_pwrdm",</div><div class='add'>+		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.pwrdm_name = "iva2_pwrdm",</div><div class='add'>+		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.pwrdm_name = "dss_pwrdm",</div><div class='add'>+		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.pwrdm_name = "per_pwrdm",</div><div class='add'>+		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)</div><div class='add'>+	},</div><div class='add'>+	{ NULL },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * 3430 PM_WKDEP_IVA2: CORE, MPU, WKUP, DSS, PER</div><div class='add'>+ */</div><div class='add'>+static struct pwrdm_dep iva2_wkdeps[] = {</div><div class='add'>+	{</div><div class='add'>+		.pwrdm_name = "core_pwrdm",</div><div class='add'>+		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.pwrdm_name = "mpu_pwrdm",</div><div class='add'>+		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.pwrdm_name = "wkup_pwrdm",</div><div class='add'>+		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.pwrdm_name = "dss_pwrdm",</div><div class='add'>+		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.pwrdm_name = "per_pwrdm",</div><div class='add'>+		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)</div><div class='add'>+	},</div><div class='add'>+	{ NULL },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* 3430 PM_WKDEP_{CAM,DSS}: IVA2, MPU, WKUP */</div><div class='add'>+static struct pwrdm_dep cam_dss_wkdeps[] = {</div><div class='add'>+	{</div><div class='add'>+		.pwrdm_name = "iva2_pwrdm",</div><div class='add'>+		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.pwrdm_name = "mpu_pwrdm",</div><div class='add'>+		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.pwrdm_name = "wkup_pwrdm",</div><div class='add'>+		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)</div><div class='add'>+	},</div><div class='add'>+	{ NULL },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* 3430: PM_WKDEP_NEON: MPU */</div><div class='add'>+static struct pwrdm_dep neon_wkdeps[] = {</div><div class='add'>+	{</div><div class='add'>+		.pwrdm_name = "mpu_pwrdm",</div><div class='add'>+		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)</div><div class='add'>+	},</div><div class='add'>+	{ NULL },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Sleep dependency source arrays for 34xx-specific pwrdms - 34XX only */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * 3430: CM_SLEEPDEP_{DSS,PER}: MPU, IVA</div><div class='add'>+ * 3430ES2: CM_SLEEPDEP_USBHOST: MPU, IVA</div><div class='add'>+ */</div><div class='add'>+static struct pwrdm_dep dss_per_usbhost_sleepdeps[] = {</div><div class='add'>+	{</div><div class='add'>+		.pwrdm_name = "mpu_pwrdm",</div><div class='add'>+		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.pwrdm_name = "iva2_pwrdm",</div><div class='add'>+		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)</div><div class='add'>+	},</div><div class='add'>+	{ NULL },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Powerdomains</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static struct powerdomain iva2_pwrdm = {</div><div class='add'>+	.name		  = "iva2_pwrdm",</div><div class='add'>+	.prcm_offs	  = OMAP3430_IVA2_MOD,</div><div class='add'>+	.omap_chip	  = OMAP_CHIP_INIT(CHIP_IS_OMAP3430),</div><div class='add'>+	.dep_bit	  = OMAP3430_PM_WKDEP_MPU_EN_IVA2_SHIFT,</div><div class='add'>+	.wkdep_srcs	  = iva2_wkdeps,</div><div class='add'>+	.pwrsts		  = PWRSTS_OFF_RET_ON,</div><div class='add'>+	.pwrsts_logic_ret = PWRSTS_OFF_RET,</div><div class='add'>+	.banks		  = 4,</div><div class='add'>+	.pwrsts_mem_ret	  = {</div><div class='add'>+		[0] = PWRSTS_OFF_RET,</div><div class='add'>+		[1] = PWRSTS_OFF_RET,</div><div class='add'>+		[2] = PWRSTS_OFF_RET,</div><div class='add'>+		[3] = PWRSTS_OFF_RET,</div><div class='add'>+	},</div><div class='add'>+	.pwrsts_mem_on	  = {</div><div class='add'>+		[0] = PWRDM_POWER_ON,</div><div class='add'>+		[1] = PWRDM_POWER_ON,</div><div class='add'>+		[2] = PWRSTS_OFF_ON,</div><div class='add'>+		[3] = PWRDM_POWER_ON,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct powerdomain mpu_34xx_pwrdm = {</div><div class='add'>+	.name		  = "mpu_pwrdm",</div><div class='add'>+	.prcm_offs	  = MPU_MOD,</div><div class='add'>+	.omap_chip	  = OMAP_CHIP_INIT(CHIP_IS_OMAP3430),</div><div class='add'>+	.dep_bit	  = OMAP3430_EN_MPU_SHIFT,</div><div class='add'>+	.wkdep_srcs	  = mpu_34xx_wkdeps,</div><div class='add'>+	.pwrsts		  = PWRSTS_OFF_RET_ON,</div><div class='add'>+	.pwrsts_logic_ret = PWRSTS_OFF_RET,</div><div class='add'>+	.banks		  = 1,</div><div class='add'>+	.pwrsts_mem_ret	  = {</div><div class='add'>+		[0] = PWRSTS_OFF_RET,</div><div class='add'>+	},</div><div class='add'>+	.pwrsts_mem_on	  = {</div><div class='add'>+		[0] = PWRSTS_OFF_ON,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* No wkdeps or sleepdeps for 34xx core apparently */</div><div class='add'>+static struct powerdomain core_34xx_pwrdm = {</div><div class='add'>+	.name		  = "core_pwrdm",</div><div class='add'>+	.prcm_offs	  = CORE_MOD,</div><div class='add'>+	.omap_chip	  = OMAP_CHIP_INIT(CHIP_IS_OMAP3430),</div><div class='add'>+	.pwrsts		  = PWRSTS_OFF_RET_ON,</div><div class='add'>+	.dep_bit	  = OMAP3430_EN_CORE_SHIFT,</div><div class='add'>+	.banks		  = 2,</div><div class='add'>+	.pwrsts_mem_ret	  = {</div><div class='add'>+		[0] = PWRSTS_OFF_RET,	 /* MEM1RETSTATE */</div><div class='add'>+		[1] = PWRSTS_OFF_RET,	 /* MEM2RETSTATE */</div><div class='add'>+	},</div><div class='add'>+	.pwrsts_mem_on	  = {</div><div class='add'>+		[0] = PWRSTS_OFF_RET_ON, /* MEM1ONSTATE */</div><div class='add'>+		[1] = PWRSTS_OFF_RET_ON, /* MEM2ONSTATE */</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Another case of bit name collisions between several registers: EN_DSS */</div><div class='add'>+static struct powerdomain dss_pwrdm = {</div><div class='add'>+	.name		  = "dss_pwrdm",</div><div class='add'>+	.omap_chip	  = OMAP_CHIP_INIT(CHIP_IS_OMAP3430),</div><div class='add'>+	.prcm_offs	  = OMAP3430_DSS_MOD,</div><div class='add'>+	.dep_bit	  = OMAP3430_PM_WKDEP_MPU_EN_DSS_SHIFT,</div><div class='add'>+	.wkdep_srcs	  = cam_dss_wkdeps,</div><div class='add'>+	.sleepdep_srcs	  = dss_per_usbhost_sleepdeps,</div><div class='add'>+	.pwrsts		  = PWRSTS_OFF_RET_ON,</div><div class='add'>+	.pwrsts_logic_ret = PWRDM_POWER_RET,</div><div class='add'>+	.banks		  = 1,</div><div class='add'>+	.pwrsts_mem_ret	  = {</div><div class='add'>+		[0] = PWRDM_POWER_RET, /* MEMRETSTATE */</div><div class='add'>+	},</div><div class='add'>+	.pwrsts_mem_on	  = {</div><div class='add'>+		[0] = PWRDM_POWER_ON,  /* MEMONSTATE */</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct powerdomain sgx_pwrdm = {</div><div class='add'>+	.name		  = "sgx_pwrdm",</div><div class='add'>+	.prcm_offs	  = OMAP3430ES2_SGX_MOD,</div><div class='add'>+	.omap_chip	  = OMAP_CHIP_INIT(CHIP_IS_OMAP3430ES2),</div><div class='add'>+	.wkdep_srcs	  = gfx_sgx_wkdeps,</div><div class='add'>+	.sleepdep_srcs	  = cam_gfx_sleepdeps,</div><div class='add'>+	/* XXX This is accurate for 3430 SGX, but what about GFX? */</div><div class='add'>+	.pwrsts		  = PWRSTS_OFF_RET_ON,</div><div class='add'>+	.pwrsts_logic_ret = PWRDM_POWER_RET,</div><div class='add'>+	.banks		  = 1,</div><div class='add'>+	.pwrsts_mem_ret	  = {</div><div class='add'>+		[0] = PWRDM_POWER_RET, /* MEMRETSTATE */</div><div class='add'>+	},</div><div class='add'>+	.pwrsts_mem_on	  = {</div><div class='add'>+		[0] = PWRDM_POWER_ON,  /* MEMONSTATE */</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct powerdomain cam_pwrdm = {</div><div class='add'>+	.name		  = "cam_pwrdm",</div><div class='add'>+	.omap_chip	  = OMAP_CHIP_INIT(CHIP_IS_OMAP3430),</div><div class='add'>+	.prcm_offs	  = OMAP3430_CAM_MOD,</div><div class='add'>+	.wkdep_srcs	  = cam_dss_wkdeps,</div><div class='add'>+	.sleepdep_srcs	  = cam_gfx_sleepdeps,</div><div class='add'>+	.pwrsts		  = PWRSTS_OFF_RET_ON,</div><div class='add'>+	.pwrsts_logic_ret = PWRDM_POWER_RET,</div><div class='add'>+	.banks		  = 1,</div><div class='add'>+	.pwrsts_mem_ret	  = {</div><div class='add'>+		[0] = PWRDM_POWER_RET, /* MEMRETSTATE */</div><div class='add'>+	},</div><div class='add'>+	.pwrsts_mem_on	  = {</div><div class='add'>+		[0] = PWRDM_POWER_ON,  /* MEMONSTATE */</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct powerdomain per_pwrdm = {</div><div class='add'>+	.name		  = "per_pwrdm",</div><div class='add'>+	.prcm_offs	  = OMAP3430_PER_MOD,</div><div class='add'>+	.omap_chip	  = OMAP_CHIP_INIT(CHIP_IS_OMAP3430),</div><div class='add'>+	.dep_bit	  = OMAP3430_EN_PER_SHIFT,</div><div class='add'>+	.wkdep_srcs	  = per_usbhost_wkdeps,</div><div class='add'>+	.sleepdep_srcs	  = dss_per_usbhost_sleepdeps,</div><div class='add'>+	.pwrsts		  = PWRSTS_OFF_RET_ON,</div><div class='add'>+	.pwrsts_logic_ret = PWRSTS_OFF_RET,</div><div class='add'>+	.banks		  = 1,</div><div class='add'>+	.pwrsts_mem_ret	  = {</div><div class='add'>+		[0] = PWRDM_POWER_RET, /* MEMRETSTATE */</div><div class='add'>+	},</div><div class='add'>+	.pwrsts_mem_on	  = {</div><div class='add'>+		[0] = PWRDM_POWER_ON,  /* MEMONSTATE */</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct powerdomain emu_pwrdm = {</div><div class='add'>+	.name		= "emu_pwrdm",</div><div class='add'>+	.prcm_offs	= OMAP3430_EMU_MOD,</div><div class='add'>+	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct powerdomain neon_pwrdm = {</div><div class='add'>+	.name		  = "neon_pwrdm",</div><div class='add'>+	.prcm_offs	  = OMAP3430_NEON_MOD,</div><div class='add'>+	.omap_chip	  = OMAP_CHIP_INIT(CHIP_IS_OMAP3430),</div><div class='add'>+	.wkdep_srcs	  = neon_wkdeps,</div><div class='add'>+	.pwrsts		  = PWRSTS_OFF_RET_ON,</div><div class='add'>+	.pwrsts_logic_ret = PWRDM_POWER_RET,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct powerdomain usbhost_pwrdm = {</div><div class='add'>+	.name		  = "usbhost_pwrdm",</div><div class='add'>+	.prcm_offs	  = OMAP3430ES2_USBHOST_MOD,</div><div class='add'>+	.omap_chip	  = OMAP_CHIP_INIT(CHIP_IS_OMAP3430ES2),</div><div class='add'>+	.wkdep_srcs	  = per_usbhost_wkdeps,</div><div class='add'>+	.sleepdep_srcs	  = dss_per_usbhost_sleepdeps,</div><div class='add'>+	.pwrsts		  = PWRSTS_OFF_RET_ON,</div><div class='add'>+	.pwrsts_logic_ret = PWRDM_POWER_RET,</div><div class='add'>+	.banks		  = 1,</div><div class='add'>+	.pwrsts_mem_ret	  = {</div><div class='add'>+		[0] = PWRDM_POWER_RET, /* MEMRETSTATE */</div><div class='add'>+	},</div><div class='add'>+	.pwrsts_mem_on	  = {</div><div class='add'>+		[0] = PWRDM_POWER_ON,  /* MEMONSTATE */</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif    /* CONFIG_ARCH_OMAP34XX */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/arm/mach-omap2/prcm-common.h b/arch/arm/mach-omap2/prcm-common.h<br/>index 54c32f482131..4a32822ff3fc 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap2/prcm-common.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-omap2/prcm-common.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap2/prcm-common.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/prcm-common.h</a></div><div class='hunk'>@@ -312,7 +312,8 @@</div><div class='ctx'> #define OMAP3430_ST_GPT2				(1 &lt;&lt; 3)</div><div class='ctx'> </div><div class='ctx'> /* CM_SLEEPDEP_PER, PM_WKDEP_IVA2, PM_WKDEP_MPU, PM_WKDEP_PER shared bits */</div><div class='del'>-#define OMAP3430_EN_CORE				(1 &lt;&lt; 0)</div><div class='add'>+#define OMAP3430_EN_CORE_SHIFT				0</div><div class='add'>+#define OMAP3430_EN_CORE_MASK				(1 &lt;&lt; 0)</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-omap2/prm-regbits-24xx.h b/arch/arm/mach-omap2/prm-regbits-24xx.h<br/>index c6d17a3378ec..4002051c20b9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap2/prm-regbits-24xx.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-omap2/prm-regbits-24xx.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap2/prm-regbits-24xx.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/prm-regbits-24xx.h</a></div><div class='hunk'>@@ -29,8 +29,10 @@</div><div class='ctx'> #define OMAP24XX_WKUP1_EN				(1 &lt;&lt; 0)</div><div class='ctx'> </div><div class='ctx'> /* PM_WKDEP_GFX, PM_WKDEP_MPU, PM_WKDEP_DSP, PM_WKDEP_MDM shared bits */</div><div class='del'>-#define OMAP24XX_EN_MPU					(1 &lt;&lt; 1)</div><div class='del'>-#define OMAP24XX_EN_CORE				(1 &lt;&lt; 0)</div><div class='add'>+#define OMAP24XX_EN_MPU_SHIFT				1</div><div class='add'>+#define OMAP24XX_EN_MPU_MASK				(1 &lt;&lt; 1)</div><div class='add'>+#define OMAP24XX_EN_CORE_SHIFT 				0</div><div class='add'>+#define OMAP24XX_EN_CORE_MASK				(1 &lt;&lt; 0)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * PM_PWSTCTRL_MPU, PM_PWSTCTRL_GFX, PM_PWSTCTRL_DSP, PM_PWSTCTRL_MDM</div><div class='hunk'>@@ -140,8 +142,10 @@</div><div class='ctx'> /* 2430 calls GLOBALWMPU_RST "GLOBALWARM_RST" instead */</div><div class='ctx'> </div><div class='ctx'> /* PM_WKDEP_MPU specific bits */</div><div class='del'>-#define OMAP2430_PM_WKDEP_MPU_EN_MDM			(1 &lt;&lt; 5)</div><div class='del'>-#define OMAP24XX_PM_WKDEP_MPU_EN_DSP			(1 &lt;&lt; 2)</div><div class='add'>+#define OMAP2430_PM_WKDEP_MPU_EN_MDM_SHIFT		5</div><div class='add'>+#define OMAP2430_PM_WKDEP_MPU_EN_MDM_MASK		(1 &lt;&lt; 5)</div><div class='add'>+#define OMAP24XX_PM_WKDEP_MPU_EN_DSP_SHIFT		2</div><div class='add'>+#define OMAP24XX_PM_WKDEP_MPU_EN_DSP_MASK		(1 &lt;&lt; 2)</div><div class='ctx'> </div><div class='ctx'> /* PM_EVGENCTRL_MPU specific bits */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-omap2/prm-regbits-34xx.h b/arch/arm/mach-omap2/prm-regbits-34xx.h<br/>index b4686bc345ca..5b5ecfe6c999 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap2/prm-regbits-34xx.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-omap2/prm-regbits-34xx.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap2/prm-regbits-34xx.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/prm-regbits-34xx.h</a></div><div class='hunk'>@@ -68,7 +68,8 @@</div><div class='ctx'> #define OMAP3430_VPINIDLE				(1 &lt;&lt; 0)</div><div class='ctx'> </div><div class='ctx'> /* PM_WKDEP_IVA2, PM_WKDEP_MPU shared bits */</div><div class='del'>-#define OMAP3430_EN_PER					(1 &lt;&lt; 7)</div><div class='add'>+#define OMAP3430_EN_PER_SHIFT				7</div><div class='add'>+#define OMAP3430_EN_PER_MASK				(1 &lt;&lt; 7)</div><div class='ctx'> </div><div class='ctx'> /* PM_PWSTCTRL_IVA2, PM_PWSTCTRL_MPU, PM_PWSTCTRL_CORE shared bits */</div><div class='ctx'> #define OMAP3430_MEMORYCHANGE				(1 &lt;&lt; 3)</div><div class='hunk'>@@ -77,7 +78,7 @@</div><div class='ctx'> #define OMAP3430_LOGICSTATEST				(1 &lt;&lt; 2)</div><div class='ctx'> </div><div class='ctx'> /* PM_PREPWSTST_IVA2, PM_PREPWSTST_CORE shared bits */</div><div class='del'>-#define OMAP3430_LASTLOGICSTATEENTERED				(1 &lt;&lt; 2)</div><div class='add'>+#define OMAP3430_LASTLOGICSTATEENTERED			(1 &lt;&lt; 2)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * PM_PREPWSTST_IVA2, PM_PREPWSTST_MPU, PM_PREPWSTST_CORE,</div><div class='hunk'>@@ -278,8 +279,10 @@</div><div class='ctx'> #define OMAP3430_EMULATION_MPU_RST			(1 &lt;&lt; 11)</div><div class='ctx'> </div><div class='ctx'> /* PM_WKDEP_MPU specific bits */</div><div class='del'>-#define OMAP3430_PM_WKDEP_MPU_EN_DSS			(1 &lt;&lt; 5)</div><div class='del'>-#define OMAP3430_PM_WKDEP_MPU_EN_IVA2			(1 &lt;&lt; 2)</div><div class='add'>+#define OMAP3430_PM_WKDEP_MPU_EN_DSS_SHIFT		5</div><div class='add'>+#define OMAP3430_PM_WKDEP_MPU_EN_DSS_MASK		(1 &lt;&lt; 5)</div><div class='add'>+#define OMAP3430_PM_WKDEP_MPU_EN_IVA2_SHIFT		2</div><div class='add'>+#define OMAP3430_PM_WKDEP_MPU_EN_IVA2_MASK		(1 &lt;&lt; 2)</div><div class='ctx'> </div><div class='ctx'> /* PM_EVGENCTRL_MPU */</div><div class='ctx'> #define OMAP3430_OFFLOADMODE_SHIFT			3</div><div class='head'>diff --git a/arch/arm/mach-omap2/prm.h b/arch/arm/mach-omap2/prm.h<br/>index bbf41fc8e9a9..e4dc4b17881d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap2/prm.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-omap2/prm.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap2/prm.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/prm.h</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASSEMBLER__</div><div class='ctx'> #define OMAP_PRM_REGADDR(module, reg)					\</div><div class='del'>-	(void __iomem *)IO_ADDRESS(OMAP2_PRM_BASE + (module) + (reg))</div><div class='add'>+			IO_ADDRESS(OMAP2_PRM_BASE + (module) + (reg))</div><div class='ctx'> #else</div><div class='ctx'> #define OMAP2420_PRM_REGADDR(module, reg)				\</div><div class='ctx'> 			IO_ADDRESS(OMAP2420_PRM_BASE + (module) + (reg))</div><div class='hunk'>@@ -305,7 +305,8 @@ static inline u32 prm_clear_mod_reg_bits(u32 bits, s16 module, s16 idx)</div><div class='ctx'>  * 3430: PM_WKDEP_IVA2, PM_WKDEP_GFX, PM_WKDEP_DSS, PM_WKDEP_CAM,</div><div class='ctx'>  *	 PM_WKDEP_PER</div><div class='ctx'>  */</div><div class='del'>-#define OMAP_EN_WKUP					(1 &lt;&lt; 4)</div><div class='add'>+#define OMAP_EN_WKUP_SHIFT				4</div><div class='add'>+#define OMAP_EN_WKUP_MASK				(1 &lt;&lt; 4)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * 24XX: PM_PWSTCTRL_MPU, PM_PWSTCTRL_CORE, PM_PWSTCTRL_GFX,</div><div class='head'>diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c<br/>index adc8a26a8fb0..4dcf39c285b9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap2/serial.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-omap2/serial.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap2/serial.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/serial.c</a></div><div class='hunk'>@@ -3,7 +3,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * OMAP2 serial support.</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2005 Nokia Corporation</div><div class='add'>+ * Copyright (C) 2005-2008 Nokia Corporation</div><div class='ctx'>  * Author: Paul Mundt &lt;paul.mundt@nokia.com&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * Based off of arch/arm/mach-omap/omap1/serial.c</div><div class='hunk'>@@ -17,44 +17,39 @@</div><div class='ctx'> #include &lt;linux/serial_8250.h&gt;</div><div class='ctx'> #include &lt;linux/serial_reg.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/common.h&gt;</div><div class='ctx'> #include &lt;mach/board.h&gt;</div><div class='ctx'> </div><div class='del'>-static struct clk * uart1_ick = NULL;</div><div class='del'>-static struct clk * uart1_fck = NULL;</div><div class='del'>-static struct clk * uart2_ick = NULL;</div><div class='del'>-static struct clk * uart2_fck = NULL;</div><div class='del'>-static struct clk * uart3_ick = NULL;</div><div class='del'>-static struct clk * uart3_fck = NULL;</div><div class='add'>+static struct clk *uart_ick[OMAP_MAX_NR_PORTS];</div><div class='add'>+static struct clk *uart_fck[OMAP_MAX_NR_PORTS];</div><div class='ctx'> </div><div class='ctx'> static struct plat_serial8250_port serial_platform_data[] = {</div><div class='ctx'> 	{</div><div class='del'>-		.membase	= (char *)IO_ADDRESS(OMAP_UART1_BASE),</div><div class='del'>-		.mapbase	= (unsigned long)OMAP_UART1_BASE,</div><div class='add'>+		.membase	= IO_ADDRESS(OMAP_UART1_BASE),</div><div class='add'>+		.mapbase	= OMAP_UART1_BASE,</div><div class='ctx'> 		.irq		= 72,</div><div class='ctx'> 		.flags		= UPF_BOOT_AUTOCONF,</div><div class='ctx'> 		.iotype		= UPIO_MEM,</div><div class='ctx'> 		.regshift	= 2,</div><div class='del'>-		.uartclk	= OMAP16XX_BASE_BAUD * 16,</div><div class='add'>+		.uartclk	= OMAP24XX_BASE_BAUD * 16,</div><div class='ctx'> 	}, {</div><div class='del'>-		.membase	= (char *)IO_ADDRESS(OMAP_UART2_BASE),</div><div class='del'>-		.mapbase	= (unsigned long)OMAP_UART2_BASE,</div><div class='add'>+		.membase	= IO_ADDRESS(OMAP_UART2_BASE),</div><div class='add'>+		.mapbase	= OMAP_UART2_BASE,</div><div class='ctx'> 		.irq		= 73,</div><div class='ctx'> 		.flags		= UPF_BOOT_AUTOCONF,</div><div class='ctx'> 		.iotype		= UPIO_MEM,</div><div class='ctx'> 		.regshift	= 2,</div><div class='del'>-		.uartclk	= OMAP16XX_BASE_BAUD * 16,</div><div class='add'>+		.uartclk	= OMAP24XX_BASE_BAUD * 16,</div><div class='ctx'> 	}, {</div><div class='del'>-		.membase	= (char *)IO_ADDRESS(OMAP_UART3_BASE),</div><div class='del'>-		.mapbase	= (unsigned long)OMAP_UART3_BASE,</div><div class='add'>+		.membase	= IO_ADDRESS(OMAP_UART3_BASE),</div><div class='add'>+		.mapbase	= OMAP_UART3_BASE,</div><div class='ctx'> 		.irq		= 74,</div><div class='ctx'> 		.flags		= UPF_BOOT_AUTOCONF,</div><div class='ctx'> 		.iotype		= UPIO_MEM,</div><div class='ctx'> 		.regshift	= 2,</div><div class='del'>-		.uartclk	= OMAP16XX_BASE_BAUD * 16,</div><div class='add'>+		.uartclk	= OMAP24XX_BASE_BAUD * 16,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.flags		= 0</div><div class='ctx'> 	}</div><div class='hunk'>@@ -71,7 +66,7 @@ static inline void serial_write_reg(struct plat_serial8250_port *p, int offset,</div><div class='ctx'> 				    int value)</div><div class='ctx'> {</div><div class='ctx'> 	offset &lt;&lt;= p-&gt;regshift;</div><div class='del'>-	__raw_writeb(value, (unsigned long)(p-&gt;membase + offset));</div><div class='add'>+	__raw_writeb(value, p-&gt;membase + offset);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -87,10 +82,27 @@ static inline void __init omap_serial_reset(struct plat_serial8250_port *p)</div><div class='ctx'> 	serial_write_reg(p, UART_OMAP_SYSC, (0x02 &lt;&lt; 3) | (1 &lt;&lt; 2) | (1 &lt;&lt; 0));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init omap_serial_init()</div><div class='add'>+void omap_serial_enable_clocks(int enable)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	for (i = 0; i &lt; OMAP_MAX_NR_PORTS; i++) {</div><div class='add'>+		if (uart_ick[i] &amp;&amp; uart_fck[i]) {</div><div class='add'>+			if (enable) {</div><div class='add'>+				clk_enable(uart_ick[i]);</div><div class='add'>+				clk_enable(uart_fck[i]);</div><div class='add'>+			} else {</div><div class='add'>+				clk_disable(uart_ick[i]);</div><div class='add'>+				clk_disable(uart_fck[i]);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init omap_serial_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	const struct omap_uart_config *info;</div><div class='add'>+	char name[16];</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Make sure the serial ports are muxed on at this point.</div><div class='hunk'>@@ -98,8 +110,7 @@ void __init omap_serial_init()</div><div class='ctx'> 	 * if not needed.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	info = omap_get_config(OMAP_TAG_UART,</div><div class='del'>-			       struct omap_uart_config);</div><div class='add'>+	info = omap_get_config(OMAP_TAG_UART, struct omap_uart_config);</div><div class='ctx'> </div><div class='ctx'> 	if (info == NULL)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -108,58 +119,26 @@ void __init omap_serial_init()</div><div class='ctx'> 		struct plat_serial8250_port *p = serial_platform_data + i;</div><div class='ctx'> </div><div class='ctx'> 		if (!(info-&gt;enabled_uarts &amp; (1 &lt;&lt; i))) {</div><div class='del'>-			p-&gt;membase = 0;</div><div class='add'>+			p-&gt;membase = NULL;</div><div class='ctx'> 			p-&gt;mapbase = 0;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		switch (i) {</div><div class='del'>-		case 0:</div><div class='del'>-			uart1_ick = clk_get(NULL, "uart1_ick");</div><div class='del'>-			if (IS_ERR(uart1_ick))</div><div class='del'>-				printk("Could not get uart1_ick\n");</div><div class='del'>-			else {</div><div class='del'>-				clk_enable(uart1_ick);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			uart1_fck = clk_get(NULL, "uart1_fck");</div><div class='del'>-			if (IS_ERR(uart1_fck))</div><div class='del'>-				printk("Could not get uart1_fck\n");</div><div class='del'>-			else {</div><div class='del'>-				clk_enable(uart1_fck);</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case 1:</div><div class='del'>-			uart2_ick = clk_get(NULL, "uart2_ick");</div><div class='del'>-			if (IS_ERR(uart2_ick))</div><div class='del'>-				printk("Could not get uart2_ick\n");</div><div class='del'>-			else {</div><div class='del'>-				clk_enable(uart2_ick);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			uart2_fck = clk_get(NULL, "uart2_fck");</div><div class='del'>-			if (IS_ERR(uart2_fck))</div><div class='del'>-				printk("Could not get uart2_fck\n");</div><div class='del'>-			else {</div><div class='del'>-				clk_enable(uart2_fck);</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case 2:</div><div class='del'>-			uart3_ick = clk_get(NULL, "uart3_ick");</div><div class='del'>-			if (IS_ERR(uart3_ick))</div><div class='del'>-				printk("Could not get uart3_ick\n");</div><div class='del'>-			else {</div><div class='del'>-				clk_enable(uart3_ick);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			uart3_fck = clk_get(NULL, "uart3_fck");</div><div class='del'>-			if (IS_ERR(uart3_fck))</div><div class='del'>-				printk("Could not get uart3_fck\n");</div><div class='del'>-			else {</div><div class='del'>-				clk_enable(uart3_fck);</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='add'>+		sprintf(name, "uart%d_ick", i+1);</div><div class='add'>+		uart_ick[i] = clk_get(NULL, name);</div><div class='add'>+		if (IS_ERR(uart_ick[i])) {</div><div class='add'>+			printk(KERN_ERR "Could not get uart%d_ick\n", i+1);</div><div class='add'>+			uart_ick[i] = NULL;</div><div class='add'>+		} else</div><div class='add'>+			clk_enable(uart_ick[i]);</div><div class='add'>+</div><div class='add'>+		sprintf(name, "uart%d_fck", i+1);</div><div class='add'>+		uart_fck[i] = clk_get(NULL, name);</div><div class='add'>+		if (IS_ERR(uart_fck[i])) {</div><div class='add'>+			printk(KERN_ERR "Could not get uart%d_fck\n", i+1);</div><div class='add'>+			uart_fck[i] = NULL;</div><div class='add'>+		} else</div><div class='add'>+			clk_enable(uart_fck[i]);</div><div class='ctx'> </div><div class='ctx'> 		omap_serial_reset(p);</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/arm/mach-omap2/sleep.S b/arch/arm/mach-omap2/sleep24xx.S<br/>index 87a706fd5f82..43336b93b21c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap2/sleep.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-omap2/sleep.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap2/sleep24xx.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/sleep24xx.S</a></div><div class='hunk'>@@ -5,6 +5,10 @@</div><div class='ctx'>  * Texas Instruments, &lt;www.ti.com&gt;</div><div class='ctx'>  * Richard Woodruff &lt;r-woodruff2@ti.com&gt;</div><div class='ctx'>  *</div><div class='add'>+ * (C) Copyright 2006 Nokia Corporation</div><div class='add'>+ * Fixed idle loop sleep</div><div class='add'>+ * Igor Stoppa &lt;igor.stoppa@nokia.com&gt;</div><div class='add'>+ *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or</div><div class='ctx'>  * modify it under the terms of the GNU General Public License as</div><div class='ctx'>  * published by the Free Software Foundation; either version 2 of</div><div class='hunk'>@@ -26,6 +30,8 @@</div><div class='ctx'> #include &lt;mach/io.h&gt;</div><div class='ctx'> #include &lt;mach/pm.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;mach/omap24xx.h&gt;</div><div class='add'>+</div><div class='ctx'> #include "sdrc.h"</div><div class='ctx'> </div><div class='ctx'> /* First address of reserved address space?  apparently valid for OMAP2 &amp; 3 */</div><div class='hunk'>@@ -52,15 +58,14 @@ ENTRY(omap24xx_idle_loop_suspend_sz)</div><div class='ctx'> 	.word	. - omap24xx_idle_loop_suspend</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * omap242x_cpu_suspend() - Forces OMAP into deep sleep state by completing</div><div class='add'>+ * omap24xx_cpu_suspend() - Forces OMAP into deep sleep state by completing</div><div class='ctx'>  * SDRC shutdown then ARM shutdown.  Upon wake MPU is back on so just restore</div><div class='ctx'>  * SDRC.</div><div class='ctx'>  *</div><div class='ctx'>  * Input:</div><div class='ctx'>  * R0 :	DLL ctrl value pre-Sleep</div><div class='del'>- * R1 : Processor+Revision</div><div class='del'>- *	2420: 0x21 = 242xES1, 0x26 = 242xES2.2</div><div class='del'>- *	2430: 0x31 = 2430ES1, 0x32 = 2430ES2</div><div class='add'>+ * R1 : SDRC_DLLA_CTRL</div><div class='add'>+ * R2 : SDRC_POWER</div><div class='ctx'>  *</div><div class='ctx'>  * The if the DPLL is going to AutoIdle. It seems like the DPLL may be back on</div><div class='ctx'>  * when we get called, but the DLL probably isn't.  We will wait a bit more in</div><div class='hunk'>@@ -80,15 +85,14 @@ ENTRY(omap24xx_idle_loop_suspend_sz)</div><div class='ctx'>  */</div><div class='ctx'> ENTRY(omap24xx_cpu_suspend)</div><div class='ctx'> 	stmfd	sp!, {r0 - r12, lr}	@ save registers on stack</div><div class='del'>-	mov	r3, #0x0		@ clear for mrc call</div><div class='add'>+	mov	r3, #0x0		@ clear for mcr call</div><div class='ctx'> 	mcr	p15, 0, r3, c7, c10, 4	@ memory barrier, hope SDR/DDR finished</div><div class='ctx'> 	nop</div><div class='ctx'> 	nop</div><div class='del'>-	ldr	r3, A_SDRC_POWER	@ addr of sdrc power</div><div class='del'>-	ldr	r4, [r3]		@ value of sdrc power</div><div class='add'>+	ldr	r4, [r2]		@ read SDRC_POWER</div><div class='ctx'> 	orr	r4, r4, #0x40		@ enable self refresh on idle req</div><div class='ctx'> 	mov	r5, #0x2000		@ set delay (DPLL relock + DLL relock)</div><div class='del'>-	str	r4, [r3]		@ make it so</div><div class='add'>+	str	r4, [r2]		@ make it so</div><div class='ctx'> 	mov	r2, #0</div><div class='ctx'> 	nop</div><div class='ctx'> 	mcr	p15, 0, r2, c7, c0, 4	@ wait for interrupt</div><div class='hunk'>@@ -97,14 +101,13 @@ loop:</div><div class='ctx'> 	subs	r5, r5, #0x1		@ awake, wait just a bit</div><div class='ctx'> 	bne	loop</div><div class='ctx'> </div><div class='del'>-	/* The DPLL has on before we take the DDR out of self refresh */</div><div class='add'>+	/* The DPLL has to be on before we take the DDR out of self refresh */</div><div class='ctx'> 	bic	r4, r4, #0x40		@ now clear self refresh bit.</div><div class='del'>-	str	r4, [r3]		@ put vlaue back.</div><div class='add'>+	str	r4, [r2]		@ write to SDRC_POWER</div><div class='ctx'> 	ldr	r4, A_SDRC0		@ make a clock happen</div><div class='del'>-	ldr	r4, [r4]</div><div class='add'>+	ldr	r4, [r4]		@ read A_SDRC0</div><div class='ctx'> 	nop				@ start auto refresh only after clk ok</div><div class='ctx'> 	movs	r0, r0			@ see if DDR or SDR</div><div class='del'>-	ldrne	r1, A_SDRC_DLLA_CTRL_S	@ get addr of DLL ctrl</div><div class='ctx'> 	strne	r0, [r1]		@ rewrite DLLA to force DLL reload</div><div class='ctx'> 	addne	r1, r1, #0x8		@ move to DLLB</div><div class='ctx'> 	strne	r0, [r1]		@ rewrite DLLB to force DLL reload</div><div class='hunk'>@@ -116,13 +119,8 @@ loop2:</div><div class='ctx'> 	/* resume*/</div><div class='ctx'> 	ldmfd	sp!, {r0 - r12, pc}	@ restore regs and return</div><div class='ctx'> </div><div class='del'>-A_SDRC_POWER:</div><div class='del'>-	.word OMAP242X_SDRC_REGADDR(SDRC_POWER)</div><div class='ctx'> A_SDRC0:</div><div class='ctx'> 	.word A_SDRC0_V</div><div class='del'>-A_SDRC_DLLA_CTRL_S:</div><div class='del'>-	.word OMAP242X_SDRC_REGADDR(SDRC_DLLA_CTRL)</div><div class='ctx'> </div><div class='ctx'> ENTRY(omap24xx_cpu_suspend_sz)</div><div class='ctx'> 	.word	. - omap24xx_cpu_suspend</div><div class='del'>-</div><div class='head'>diff --git a/arch/arm/mach-omap2/sram34xx.S b/arch/arm/mach-omap2/sram34xx.S<br/>new file mode 100644<br/>index 000000000000..2c7146136342<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-omap2/sram34xx.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-omap2/sram34xx.S</a></div><div class='hunk'>@@ -0,0 +1,179 @@</div><div class='add'>+/*</div><div class='add'>+ * linux/arch/arm/mach-omap3/sram.S</div><div class='add'>+ *</div><div class='add'>+ * Omap3 specific functions that need to be run in internal SRAM</div><div class='add'>+ *</div><div class='add'>+ * (C) Copyright 2007</div><div class='add'>+ * Texas Instruments Inc.</div><div class='add'>+ * Rajendra Nayak &lt;rnayak@ti.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * (C) Copyright 2004</div><div class='add'>+ * Texas Instruments, &lt;www.ti.com&gt;</div><div class='add'>+ * Richard Woodruff &lt;r-woodruff2@ti.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public License as</div><div class='add'>+ * published by the Free Software Foundation; either version 2 of</div><div class='add'>+ * the License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR /PURPOSE. See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,</div><div class='add'>+ * MA 02111-1307 USA</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/linkage.h&gt;</div><div class='add'>+#include &lt;asm/assembler.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;mach/io.h&gt;</div><div class='add'>+</div><div class='add'>+#include "sdrc.h"</div><div class='add'>+#include "cm.h"</div><div class='add'>+</div><div class='add'>+	.text</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Change frequency of core dpll</div><div class='add'>+ * r0 = sdrc_rfr_ctrl r1 = sdrc_actim_ctrla r2 = sdrc_actim_ctrlb r3 = M2</div><div class='add'>+ */</div><div class='add'>+ENTRY(omap3_sram_configure_core_dpll)</div><div class='add'>+	stmfd	sp!, {r1-r12, lr}	@ store regs to stack</div><div class='add'>+	cmp	r3, #0x2</div><div class='add'>+	blne	configure_sdrc</div><div class='add'>+	cmp	r3, #0x2</div><div class='add'>+	blne	lock_dll</div><div class='add'>+	cmp	r3, #0x1</div><div class='add'>+	blne	unlock_dll</div><div class='add'>+	bl	sdram_in_selfrefresh	@ put the SDRAM in self refresh</div><div class='add'>+	bl 	configure_core_dpll</div><div class='add'>+	bl	enable_sdrc</div><div class='add'>+	cmp	r3, #0x1</div><div class='add'>+	blne	wait_dll_unlock</div><div class='add'>+	cmp	r3, #0x2</div><div class='add'>+	blne	wait_dll_lock</div><div class='add'>+	cmp	r3, #0x1</div><div class='add'>+	blne	configure_sdrc</div><div class='add'>+	mov 	r0, #0 			@ return value</div><div class='add'>+	ldmfd	sp!, {r1-r12, pc}	@ restore regs and return</div><div class='add'>+unlock_dll:</div><div class='add'>+	ldr	r4, omap3_sdrc_dlla_ctrl</div><div class='add'>+	ldr	r5, [r4]</div><div class='add'>+	orr	r5, r5, #0x4</div><div class='add'>+	str	r5, [r4]</div><div class='add'>+	bx	lr</div><div class='add'>+lock_dll:</div><div class='add'>+	ldr	r4, omap3_sdrc_dlla_ctrl</div><div class='add'>+	ldr	r5, [r4]</div><div class='add'>+	bic	r5, r5, #0x4</div><div class='add'>+	str	r5, [r4]</div><div class='add'>+	bx	lr</div><div class='add'>+sdram_in_selfrefresh:</div><div class='add'>+	mov	r5, #0x0		@ Move 0 to R5</div><div class='add'>+	mcr	p15, 0, r5, c7, c10, 5	@ memory barrier</div><div class='add'>+	ldr	r4, omap3_sdrc_power	@ read the SDRC_POWER register</div><div class='add'>+	ldr	r5, [r4]		@ read the contents of SDRC_POWER</div><div class='add'>+	orr 	r5, r5, #0x40		@ enable self refresh on idle req</div><div class='add'>+	str 	r5, [r4]		@ write back to SDRC_POWER register</div><div class='add'>+	ldr	r4, omap3_cm_iclken1_core	@ read the CM_ICLKEN1_CORE reg</div><div class='add'>+	ldr	r5, [r4]</div><div class='add'>+	bic	r5, r5, #0x2		@ disable iclk bit for SRDC</div><div class='add'>+	str 	r5, [r4]</div><div class='add'>+wait_sdrc_idle:</div><div class='add'>+	ldr 	r4, omap3_cm_idlest1_core</div><div class='add'>+	ldr 	r5, [r4]</div><div class='add'>+	and 	r5, r5, #0x2		@ check for SDRC idle</div><div class='add'>+	cmp 	r5, #2</div><div class='add'>+	bne 	wait_sdrc_idle</div><div class='add'>+	bx 	lr</div><div class='add'>+configure_core_dpll:</div><div class='add'>+	ldr 	r4, omap3_cm_clksel1_pll</div><div class='add'>+	ldr	r5, [r4]</div><div class='add'>+	ldr	r6, core_m2_mask_val	@ modify m2 for core dpll</div><div class='add'>+	and	r5, r5, r6</div><div class='add'>+	orr	r5, r5, r3, lsl #0x1B	@ r3 contains the M2 val</div><div class='add'>+	str	r5, [r4]</div><div class='add'>+	mov 	r5, #0x800		@ wait for the clock to stabilise</div><div class='add'>+	cmp	r3, #2</div><div class='add'>+	bne	wait_clk_stable</div><div class='add'>+	bx	lr</div><div class='add'>+wait_clk_stable:</div><div class='add'>+	subs 	r5, r5, #1</div><div class='add'>+	bne	wait_clk_stable</div><div class='add'>+	nop</div><div class='add'>+	nop</div><div class='add'>+	nop</div><div class='add'>+	nop</div><div class='add'>+	nop</div><div class='add'>+	nop</div><div class='add'>+	nop</div><div class='add'>+	nop</div><div class='add'>+	nop</div><div class='add'>+	nop</div><div class='add'>+	bx	lr</div><div class='add'>+enable_sdrc:</div><div class='add'>+	ldr 	r4, omap3_cm_iclken1_core</div><div class='add'>+	ldr	r5, [r4]</div><div class='add'>+	orr 	r5, r5, #0x2		@ enable iclk bit for SDRC</div><div class='add'>+	str 	r5, [r4]</div><div class='add'>+wait_sdrc_idle1:</div><div class='add'>+	ldr 	r4, omap3_cm_idlest1_core</div><div class='add'>+	ldr	r5, [r4]</div><div class='add'>+	and 	r5, r5, #0x2</div><div class='add'>+	cmp	r5, #0</div><div class='add'>+	bne	wait_sdrc_idle1</div><div class='add'>+	ldr	r4, omap3_sdrc_power</div><div class='add'>+	ldr	r5, [r4]</div><div class='add'>+	bic 	r5, r5, #0x40</div><div class='add'>+	str 	r5, [r4]</div><div class='add'>+	bx	lr</div><div class='add'>+wait_dll_lock:</div><div class='add'>+	ldr	r4, omap3_sdrc_dlla_status</div><div class='add'>+	ldr	r5, [r4]</div><div class='add'>+	and 	r5, r5, #0x4</div><div class='add'>+	cmp	r5, #0x4</div><div class='add'>+	bne	wait_dll_lock</div><div class='add'>+	bx	lr</div><div class='add'>+wait_dll_unlock:</div><div class='add'>+	ldr	r4, omap3_sdrc_dlla_status</div><div class='add'>+	ldr	r5, [r4]</div><div class='add'>+	and	r5, r5, #0x4</div><div class='add'>+	cmp	r5, #0x0</div><div class='add'>+	bne	wait_dll_unlock</div><div class='add'>+	bx	lr</div><div class='add'>+configure_sdrc:</div><div class='add'>+	ldr	r4, omap3_sdrc_rfr_ctrl</div><div class='add'>+	str	r0, [r4]</div><div class='add'>+	ldr	r4, omap3_sdrc_actim_ctrla</div><div class='add'>+	str	r1, [r4]</div><div class='add'>+	ldr	r4, omap3_sdrc_actim_ctrlb</div><div class='add'>+	str	r2, [r4]</div><div class='add'>+	bx	lr</div><div class='add'>+</div><div class='add'>+omap3_sdrc_power:</div><div class='add'>+	.word OMAP34XX_SDRC_REGADDR(SDRC_POWER)</div><div class='add'>+omap3_cm_clksel1_pll:</div><div class='add'>+	.word OMAP34XX_CM_REGADDR(PLL_MOD, CM_CLKSEL1)</div><div class='add'>+omap3_cm_idlest1_core:</div><div class='add'>+	.word OMAP34XX_CM_REGADDR(CORE_MOD, CM_IDLEST)</div><div class='add'>+omap3_cm_iclken1_core:</div><div class='add'>+	.word OMAP34XX_CM_REGADDR(CORE_MOD, CM_ICLKEN1)</div><div class='add'>+omap3_sdrc_rfr_ctrl:</div><div class='add'>+	.word OMAP34XX_SDRC_REGADDR(SDRC_RFR_CTRL_0)</div><div class='add'>+omap3_sdrc_actim_ctrla:</div><div class='add'>+	.word OMAP34XX_SDRC_REGADDR(SDRC_ACTIM_CTRL_A_0)</div><div class='add'>+omap3_sdrc_actim_ctrlb:</div><div class='add'>+	.word OMAP34XX_SDRC_REGADDR(SDRC_ACTIM_CTRL_B_0)</div><div class='add'>+omap3_sdrc_dlla_status:</div><div class='add'>+	.word OMAP34XX_SDRC_REGADDR(SDRC_DLLA_STATUS)</div><div class='add'>+omap3_sdrc_dlla_ctrl:</div><div class='add'>+	.word OMAP34XX_SDRC_REGADDR(SDRC_DLLA_CTRL)</div><div class='add'>+core_m2_mask_val:</div><div class='add'>+	.word 0x07FFFFFF</div><div class='add'>+</div><div class='add'>+ENTRY(omap3_sram_configure_core_dpll_sz)</div><div class='add'>+	.word	. - omap3_sram_configure_core_dpll</div><div class='head'>diff --git a/arch/arm/mach-orion5x/Kconfig b/arch/arm/mach-orion5x/Kconfig<br/>index ddcd41b15d17..f59a8d0e0824 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-orion5x/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-orion5x/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-orion5x/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-orion5x/Kconfig</a></div><div class='hunk'>@@ -36,6 +36,12 @@ config MACH_TS209</div><div class='ctx'> 	  Say 'Y' here if you want your kernel to support the</div><div class='ctx'> 	  QNAP TS-109/TS-209 platform.</div><div class='ctx'> </div><div class='add'>+config MACH_TERASTATION_PRO2</div><div class='add'>+	bool "Buffalo Terastation Pro II/Live"</div><div class='add'>+	help</div><div class='add'>+	  Say 'Y' here if you want your kernel to support the</div><div class='add'>+	  Buffalo Terastation Pro II/Live platform.</div><div class='add'>+</div><div class='ctx'> config MACH_LINKSTATION_PRO</div><div class='ctx'> 	bool "Buffalo Linkstation Pro/Live"</div><div class='ctx'> 	select I2C_BOARDINFO</div><div class='hunk'>@@ -44,6 +50,13 @@ config MACH_LINKSTATION_PRO</div><div class='ctx'> 	  Buffalo Linkstation Pro/Live platform. Both v1 and</div><div class='ctx'> 	  v2 devices are supported.</div><div class='ctx'> </div><div class='add'>+config MACH_LINKSTATION_MINI</div><div class='add'>+	bool "Buffalo Linkstation Mini"</div><div class='add'>+	select I2C_BOARDINFO</div><div class='add'>+	help</div><div class='add'>+	  Say 'Y' here if you want your kernel to support the</div><div class='add'>+	  Buffalo Linkstation Mini platform.</div><div class='add'>+</div><div class='ctx'> config MACH_TS409</div><div class='ctx'> 	bool "QNAP TS-409"</div><div class='ctx'> 	help</div><div class='hunk'>@@ -68,6 +81,13 @@ config MACH_MV2120</div><div class='ctx'> 	  Say 'Y' here if you want your kernel to support the</div><div class='ctx'> 	  HP Media Vault mv2120 or mv5100.</div><div class='ctx'> </div><div class='add'>+config MACH_EDMINI_V2</div><div class='add'>+	bool "LaCie Ethernet Disk mini V2"</div><div class='add'>+	select I2C_BOARDINFO</div><div class='add'>+	help</div><div class='add'>+	  Say 'Y' here if you want your kernel to support the</div><div class='add'>+	  LaCie Ethernet Disk mini V2.</div><div class='add'>+</div><div class='ctx'> config MACH_MSS2</div><div class='ctx'> 	bool "Maxtor Shared Storage II"</div><div class='ctx'> 	help</div><div class='hunk'>@@ -92,6 +112,12 @@ config MACH_RD88F5181L_FXO</div><div class='ctx'> 	  Say 'Y' here if you want your kernel to support the</div><div class='ctx'> 	  Marvell Orion-VoIP FXO (88F5181L) RD.</div><div class='ctx'> </div><div class='add'>+config MACH_RD88F6183AP_GE</div><div class='add'>+	bool "Marvell Orion-1-90 AP GE Reference Design"</div><div class='add'>+	help</div><div class='add'>+	  Say 'Y' here if you want your kernel to support the</div><div class='add'>+	  Marvell Orion-1-90 (88F6183) AP GE RD.</div><div class='add'>+</div><div class='ctx'> endmenu</div><div class='ctx'> </div><div class='ctx'> endif</div><div class='head'>diff --git a/arch/arm/mach-orion5x/Makefile b/arch/arm/mach-orion5x/Makefile<br/>index fcc48a8864f3..3d4a1bc12355 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-orion5x/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-orion5x/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-orion5x/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-orion5x/Makefile</a></div><div class='hunk'>@@ -2,14 +2,18 @@ obj-y				+= common.o addr-map.o pci.o gpio.o irq.o mpp.o</div><div class='ctx'> obj-$(CONFIG_MACH_DB88F5281)	+= db88f5281-setup.o</div><div class='ctx'> obj-$(CONFIG_MACH_RD88F5182)	+= rd88f5182-setup.o</div><div class='ctx'> obj-$(CONFIG_MACH_KUROBOX_PRO)	+= kurobox_pro-setup.o</div><div class='add'>+obj-$(CONFIG_MACH_TERASTATION_PRO2)	+= terastation_pro2-setup.o</div><div class='ctx'> obj-$(CONFIG_MACH_LINKSTATION_PRO) += kurobox_pro-setup.o</div><div class='add'>+obj-$(CONFIG_MACH_LINKSTATION_MINI) += lsmini-setup.o</div><div class='ctx'> obj-$(CONFIG_MACH_DNS323)	+= dns323-setup.o</div><div class='ctx'> obj-$(CONFIG_MACH_TS209)	+= ts209-setup.o tsx09-common.o</div><div class='ctx'> obj-$(CONFIG_MACH_TS409)	+= ts409-setup.o tsx09-common.o</div><div class='ctx'> obj-$(CONFIG_MACH_WRT350N_V2)	+= wrt350n-v2-setup.o</div><div class='ctx'> obj-$(CONFIG_MACH_TS78XX)	+= ts78xx-setup.o</div><div class='ctx'> obj-$(CONFIG_MACH_MV2120)	+= mv2120-setup.o</div><div class='add'>+obj-$(CONFIG_MACH_EDMINI_V2)	+= edmini_v2-setup.o</div><div class='ctx'> obj-$(CONFIG_MACH_MSS2)		+= mss2-setup.o</div><div class='ctx'> obj-$(CONFIG_MACH_WNR854T)	+= wnr854t-setup.o</div><div class='ctx'> obj-$(CONFIG_MACH_RD88F5181L_GE)	+= rd88f5181l-ge-setup.o</div><div class='ctx'> obj-$(CONFIG_MACH_RD88F5181L_FXO)	+= rd88f5181l-fxo-setup.o</div><div class='add'>+obj-$(CONFIG_MACH_RD88F6183AP_GE)	+= rd88f6183ap-ge-setup.o</div><div class='head'>diff --git a/arch/arm/mach-orion5x/addr-map.c b/arch/arm/mach-orion5x/addr-map.c<br/>index bea37972120a..719957e05d9e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-orion5x/addr-map.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-orion5x/addr-map.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-orion5x/addr-map.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-orion5x/addr-map.c</a></div><div class='hunk'>@@ -13,8 +13,8 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/mbus.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include "common.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/arm/mach-orion5x/common.c b/arch/arm/mach-orion5x/common.c<br/>index 7b11e552bc5a..9625ef5975d0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-orion5x/common.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-orion5x/common.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-orion5x/common.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-orion5x/common.c</a></div><div class='hunk'>@@ -18,6 +18,7 @@</div><div class='ctx'> #include &lt;linux/mv643xx_eth.h&gt;</div><div class='ctx'> #include &lt;linux/mv643xx_i2c.h&gt;</div><div class='ctx'> #include &lt;linux/ata_platform.h&gt;</div><div class='add'>+#include &lt;linux/spi/orion_spi.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/timex.h&gt;</div><div class='hunk'>@@ -146,7 +147,6 @@ void __init orion5x_ehci1_init(void)</div><div class='ctx'>  ****************************************************************************/</div><div class='ctx'> struct mv643xx_eth_shared_platform_data orion5x_eth_shared_data = {</div><div class='ctx'> 	.dram		= &amp;orion5x_mbus_dram_info,</div><div class='del'>-	.t_clk		= ORION5X_TCLK,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct resource orion5x_eth_shared_resources[] = {</div><div class='hunk'>@@ -154,6 +154,10 @@ static struct resource orion5x_eth_shared_resources[] = {</div><div class='ctx'> 		.start	= ORION5X_ETH_PHYS_BASE + 0x2000,</div><div class='ctx'> 		.end	= ORION5X_ETH_PHYS_BASE + 0x3fff,</div><div class='ctx'> 		.flags	= IORESOURCE_MEM,</div><div class='add'>+	}, {</div><div class='add'>+		.start	= IRQ_ORION5X_ETH_ERR,</div><div class='add'>+		.end	= IRQ_ORION5X_ETH_ERR,</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -163,7 +167,7 @@ static struct platform_device orion5x_eth_shared = {</div><div class='ctx'> 	.dev		= {</div><div class='ctx'> 		.platform_data	= &amp;orion5x_eth_shared_data,</div><div class='ctx'> 	},</div><div class='del'>-	.num_resources	= 1,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(orion5x_eth_shared_resources),</div><div class='ctx'> 	.resource	= orion5x_eth_shared_resources,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -268,6 +272,38 @@ void __init orion5x_sata_init(struct mv_sata_platform_data *sata_data)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************</div><div class='add'>+ * SPI</div><div class='add'>+ ****************************************************************************/</div><div class='add'>+static struct orion_spi_info orion5x_spi_plat_data = {</div><div class='add'>+	.tclk		= 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource orion5x_spi_resources[] = {</div><div class='add'>+	{</div><div class='add'>+		.name	= "spi base",</div><div class='add'>+		.start	= SPI_PHYS_BASE,</div><div class='add'>+		.end	= SPI_PHYS_BASE + 0x1f,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device orion5x_spi = {</div><div class='add'>+	.name		= "orion_spi",</div><div class='add'>+	.id		= 0,</div><div class='add'>+	.dev		= {</div><div class='add'>+		.platform_data	= &amp;orion5x_spi_plat_data,</div><div class='add'>+	},</div><div class='add'>+	.num_resources	= ARRAY_SIZE(orion5x_spi_resources),</div><div class='add'>+	.resource	= orion5x_spi_resources,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void __init orion5x_spi_init()</div><div class='add'>+{</div><div class='add'>+	platform_device_register(&amp;orion5x_spi);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*****************************************************************************</div><div class='ctx'>  * UART0</div><div class='ctx'>  ****************************************************************************/</div><div class='ctx'> static struct plat_serial8250_port orion5x_uart0_data[] = {</div><div class='hunk'>@@ -278,7 +314,7 @@ static struct plat_serial8250_port orion5x_uart0_data[] = {</div><div class='ctx'> 		.flags		= UPF_SKIP_TEST | UPF_BOOT_AUTOCONF,</div><div class='ctx'> 		.iotype		= UPIO_MEM,</div><div class='ctx'> 		.regshift	= 2,</div><div class='del'>-		.uartclk	= ORION5X_TCLK,</div><div class='add'>+		.uartclk	= 0,</div><div class='ctx'> 	}, {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='hunk'>@@ -322,7 +358,7 @@ static struct plat_serial8250_port orion5x_uart1_data[] = {</div><div class='ctx'> 		.flags		= UPF_SKIP_TEST | UPF_BOOT_AUTOCONF,</div><div class='ctx'> 		.iotype		= UPIO_MEM,</div><div class='ctx'> 		.regshift	= 2,</div><div class='del'>-		.uartclk	= ORION5X_TCLK,</div><div class='add'>+		.uartclk	= 0,</div><div class='ctx'> 	}, {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='hunk'>@@ -455,9 +491,24 @@ void __init orion5x_xor_init(void)</div><div class='ctx'> /*****************************************************************************</div><div class='ctx'>  * Time handling</div><div class='ctx'>  ****************************************************************************/</div><div class='add'>+int orion5x_tclk;</div><div class='add'>+</div><div class='add'>+int __init orion5x_find_tclk(void)</div><div class='add'>+{</div><div class='add'>+	u32 dev, rev;</div><div class='add'>+</div><div class='add'>+	orion5x_pcie_id(&amp;dev, &amp;rev);</div><div class='add'>+	if (dev == MV88F6183_DEV_ID &amp;&amp;</div><div class='add'>+	    (readl(MPP_RESET_SAMPLE) &amp; 0x00000200) == 0)</div><div class='add'>+		return 133333333;</div><div class='add'>+</div><div class='add'>+	return 166666667;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void orion5x_timer_init(void)</div><div class='ctx'> {</div><div class='del'>-	orion_time_init(IRQ_ORION5X_BRIDGE, ORION5X_TCLK);</div><div class='add'>+	orion5x_tclk = orion5x_find_tclk();</div><div class='add'>+	orion_time_init(IRQ_ORION5X_BRIDGE, orion5x_tclk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct sys_timer orion5x_timer = {</div><div class='hunk'>@@ -499,6 +550,12 @@ static void __init orion5x_id(u32 *dev, u32 *rev, char **dev_name)</div><div class='ctx'> 		} else {</div><div class='ctx'> 			*dev_name = "MV88F5181(L)-Rev-Unsupported";</div><div class='ctx'> 		}</div><div class='add'>+	} else if (*dev == MV88F6183_DEV_ID) {</div><div class='add'>+		if (*rev == MV88F6183_REV_B0) {</div><div class='add'>+			*dev_name = "MV88F6183-Rev-B0";</div><div class='add'>+		} else {</div><div class='add'>+			*dev_name = "MV88F6183-Rev-Unsupported";</div><div class='add'>+		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		*dev_name = "Device-Unknown";</div><div class='ctx'> 	}</div><div class='hunk'>@@ -510,7 +567,12 @@ void __init orion5x_init(void)</div><div class='ctx'> 	u32 dev, rev;</div><div class='ctx'> </div><div class='ctx'> 	orion5x_id(&amp;dev, &amp;rev, &amp;dev_name);</div><div class='del'>-	printk(KERN_INFO "Orion ID: %s. TCLK=%d.\n", dev_name, ORION5X_TCLK);</div><div class='add'>+	printk(KERN_INFO "Orion ID: %s. TCLK=%d.\n", dev_name, orion5x_tclk);</div><div class='add'>+</div><div class='add'>+	orion5x_eth_shared_data.t_clk = orion5x_tclk;</div><div class='add'>+	orion5x_spi_plat_data.tclk = orion5x_tclk;</div><div class='add'>+	orion5x_uart0_data[0].uartclk = orion5x_tclk;</div><div class='add'>+	orion5x_uart1_data[0].uartclk = orion5x_tclk;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Setup Orion address map</div><div class='head'>diff --git a/arch/arm/mach-orion5x/common.h b/arch/arm/mach-orion5x/common.h<br/>index 0bd195551a27..1f8b2da676a5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-orion5x/common.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-orion5x/common.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-orion5x/common.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-orion5x/common.h</a></div><div class='hunk'>@@ -10,6 +10,7 @@ struct mv_sata_platform_data;</div><div class='ctx'> void orion5x_map_io(void);</div><div class='ctx'> void orion5x_init_irq(void);</div><div class='ctx'> void orion5x_init(void);</div><div class='add'>+extern int orion5x_tclk;</div><div class='ctx'> extern struct sys_timer orion5x_timer;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -30,6 +31,7 @@ void orion5x_ehci1_init(void);</div><div class='ctx'> void orion5x_eth_init(struct mv643xx_eth_platform_data *eth_data);</div><div class='ctx'> void orion5x_i2c_init(void);</div><div class='ctx'> void orion5x_sata_init(struct mv_sata_platform_data *sata_data);</div><div class='add'>+void orion5x_spi_init(void);</div><div class='ctx'> void orion5x_uart0_init(void);</div><div class='ctx'> void orion5x_uart1_init(void);</div><div class='ctx'> void orion5x_xor_init(void);</div><div class='head'>diff --git a/arch/arm/mach-orion5x/db88f5281-setup.c b/arch/arm/mach-orion5x/db88f5281-setup.c<br/>index ff13e9060b18..d318bea2af91 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-orion5x/db88f5281-setup.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-orion5x/db88f5281-setup.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-orion5x/db88f5281-setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-orion5x/db88f5281-setup.c</a></div><div class='hunk'>@@ -285,7 +285,7 @@ subsys_initcall(db88f5281_pci_init);</div><div class='ctx'>  * Ethernet</div><div class='ctx'>  ****************************************************************************/</div><div class='ctx'> static struct mv643xx_eth_platform_data db88f5281_eth_data = {</div><div class='del'>-	.phy_addr	= 8,</div><div class='add'>+	.phy_addr	= MV643XX_ETH_PHY_ADDR(8),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************</div><div class='head'>diff --git a/arch/arm/mach-orion5x/dns323-setup.c b/arch/arm/mach-orion5x/dns323-setup.c<br/>index b38c65ccfb15..3e66098340a5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-orion5x/dns323-setup.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-orion5x/dns323-setup.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-orion5x/dns323-setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-orion5x/dns323-setup.c</a></div><div class='hunk'>@@ -79,7 +79,7 @@ subsys_initcall(dns323_pci_init);</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static struct mv643xx_eth_platform_data dns323_eth_data = {</div><div class='del'>-	.phy_addr = 8,</div><div class='add'>+	.phy_addr = MV643XX_ETH_PHY_ADDR(8),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /****************************************************************************</div><div class='head'>diff --git a/arch/arm/mach-orion5x/edmini_v2-setup.c b/arch/arm/mach-orion5x/edmini_v2-setup.c<br/>new file mode 100644<br/>index 000000000000..b24ee0c2cd61<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-orion5x/edmini_v2-setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-orion5x/edmini_v2-setup.c</a></div><div class='hunk'>@@ -0,0 +1,262 @@</div><div class='add'>+/*</div><div class='add'>+ * arch/arm/mach-orion5x/edmini_v2-setup.c</div><div class='add'>+ *</div><div class='add'>+ * LaCie Ethernet Disk mini V2 Setup</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2008 Christopher Moore &lt;moore@free.fr&gt;</div><div class='add'>+ * Copyright (C) 2008 Albert Aribaud &lt;albert.aribaud@free.fr&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file is licensed under the terms of the GNU General Public</div><div class='add'>+ * License version 2. This program is licensed "as is" without any</div><div class='add'>+ * warranty of any kind, whether express or implied.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * TODO: add Orion USB device port init when kernel.org support is added.</div><div class='add'>+ * TODO: add flash write support: see below.</div><div class='add'>+ * TODO: add power-off support.</div><div class='add'>+ * TODO: add I2C EEPROM support.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='add'>+#include &lt;linux/mtd/physmap.h&gt;</div><div class='add'>+#include &lt;linux/mv643xx_eth.h&gt;</div><div class='add'>+#include &lt;linux/leds.h&gt;</div><div class='add'>+#include &lt;linux/gpio_keys.h&gt;</div><div class='add'>+#include &lt;linux/input.h&gt;</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/ata_platform.h&gt;</div><div class='add'>+#include &lt;linux/gpio.h&gt;</div><div class='add'>+#include &lt;asm/mach-types.h&gt;</div><div class='add'>+#include &lt;asm/mach/arch.h&gt;</div><div class='add'>+#include &lt;asm/mach/pci.h&gt;</div><div class='add'>+#include &lt;mach/orion5x.h&gt;</div><div class='add'>+#include "common.h"</div><div class='add'>+#include "mpp.h"</div><div class='add'>+</div><div class='add'>+/*****************************************************************************</div><div class='add'>+ * EDMINI_V2 Info</div><div class='add'>+ ****************************************************************************/</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * 512KB NOR flash Device bus boot chip select</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define EDMINI_V2_NOR_BOOT_BASE		0xfff80000</div><div class='add'>+#define EDMINI_V2_NOR_BOOT_SIZE		SZ_512K</div><div class='add'>+</div><div class='add'>+/*****************************************************************************</div><div class='add'>+ * 512KB NOR Flash on BOOT Device</div><div class='add'>+ ****************************************************************************/</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Currently the MTD code does not recognize the MX29LV400CBCT as a bottom</div><div class='add'>+ * -type device. This could cause risks of accidentally erasing critical</div><div class='add'>+ * flash sectors. We thus define a single, write-protected partition covering</div><div class='add'>+ * the whole flash.</div><div class='add'>+ * TODO: once the flash part TOP/BOTTOM detection issue is sorted out in the MTD</div><div class='add'>+ * code, break this into at least three partitions: 'u-boot code', 'u-boot</div><div class='add'>+ * environment' and 'whatever is left'.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static struct mtd_partition edmini_v2_partitions[] = {</div><div class='add'>+	{</div><div class='add'>+		.name		= "Full512kb",</div><div class='add'>+		.size		= 0x00080000,</div><div class='add'>+		.offset		= 0x00000000,</div><div class='add'>+		.mask_flags	= MTD_WRITEABLE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct physmap_flash_data edmini_v2_nor_flash_data = {</div><div class='add'>+	.width		= 1,</div><div class='add'>+	.parts		= edmini_v2_partitions,</div><div class='add'>+	.nr_parts	= ARRAY_SIZE(edmini_v2_partitions),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource edmini_v2_nor_flash_resource = {</div><div class='add'>+	.flags			= IORESOURCE_MEM,</div><div class='add'>+	.start			= EDMINI_V2_NOR_BOOT_BASE,</div><div class='add'>+	.end			= EDMINI_V2_NOR_BOOT_BASE</div><div class='add'>+		+ EDMINI_V2_NOR_BOOT_SIZE - 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device edmini_v2_nor_flash = {</div><div class='add'>+	.name			= "physmap-flash",</div><div class='add'>+	.id			= 0,</div><div class='add'>+	.dev		= {</div><div class='add'>+		.platform_data	= &amp;edmini_v2_nor_flash_data,</div><div class='add'>+	},</div><div class='add'>+	.num_resources		= 1,</div><div class='add'>+	.resource		= &amp;edmini_v2_nor_flash_resource,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*****************************************************************************</div><div class='add'>+ * Ethernet</div><div class='add'>+ ****************************************************************************/</div><div class='add'>+</div><div class='add'>+static struct mv643xx_eth_platform_data edmini_v2_eth_data = {</div><div class='add'>+	.phy_addr	= 8,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*****************************************************************************</div><div class='add'>+ * RTC 5C372a on I2C bus</div><div class='add'>+ ****************************************************************************/</div><div class='add'>+</div><div class='add'>+#define EDMINIV2_RTC_GPIO	3</div><div class='add'>+</div><div class='add'>+static struct i2c_board_info __initdata edmini_v2_i2c_rtc = {</div><div class='add'>+	I2C_BOARD_INFO("rs5c372a", 0x32),</div><div class='add'>+	.irq = 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*****************************************************************************</div><div class='add'>+ * Sata</div><div class='add'>+ ****************************************************************************/</div><div class='add'>+</div><div class='add'>+static struct mv_sata_platform_data edmini_v2_sata_data = {</div><div class='add'>+	.n_ports	= 2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*****************************************************************************</div><div class='add'>+ * GPIO LED (simple - doesn't use hardware blinking support)</div><div class='add'>+ ****************************************************************************/</div><div class='add'>+</div><div class='add'>+#define EDMINI_V2_GPIO_LED_POWER	16</div><div class='add'>+</div><div class='add'>+static struct gpio_led edmini_v2_leds[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "power:blue",</div><div class='add'>+		.gpio = EDMINI_V2_GPIO_LED_POWER,</div><div class='add'>+		.active_low = 1,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct gpio_led_platform_data edmini_v2_led_data = {</div><div class='add'>+	.num_leds = ARRAY_SIZE(edmini_v2_leds),</div><div class='add'>+	.leds = edmini_v2_leds,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device edmini_v2_gpio_leds = {</div><div class='add'>+	.name           = "leds-gpio",</div><div class='add'>+	.id             = -1,</div><div class='add'>+	.dev            = {</div><div class='add'>+		.platform_data  = &amp;edmini_v2_led_data,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/****************************************************************************</div><div class='add'>+ * GPIO key</div><div class='add'>+ ****************************************************************************/</div><div class='add'>+</div><div class='add'>+#define EDMINI_V2_GPIO_KEY_POWER	18</div><div class='add'>+</div><div class='add'>+static struct gpio_keys_button edmini_v2_buttons[] = {</div><div class='add'>+	{</div><div class='add'>+		.code		= KEY_POWER,</div><div class='add'>+		.gpio		= EDMINI_V2_GPIO_KEY_POWER,</div><div class='add'>+		.desc		= "Power Button",</div><div class='add'>+		.active_low	= 0,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct gpio_keys_platform_data edmini_v2_button_data = {</div><div class='add'>+	.buttons	= edmini_v2_buttons,</div><div class='add'>+	.nbuttons	= ARRAY_SIZE(edmini_v2_buttons),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device edmini_v2_gpio_buttons = {</div><div class='add'>+	.name		= "gpio-keys",</div><div class='add'>+	.id		= -1,</div><div class='add'>+	.dev		= {</div><div class='add'>+		.platform_data	= &amp;edmini_v2_button_data,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*****************************************************************************</div><div class='add'>+ * General Setup</div><div class='add'>+ ****************************************************************************/</div><div class='add'>+static struct orion5x_mpp_mode edminiv2_mpp_modes[] __initdata = {</div><div class='add'>+	{  0, MPP_UNUSED },</div><div class='add'>+	{  1, MPP_UNUSED },</div><div class='add'>+	{  2, MPP_UNUSED },</div><div class='add'>+	{  3, MPP_GPIO },	/* RTC interrupt */</div><div class='add'>+	{  4, MPP_UNUSED },</div><div class='add'>+	{  5, MPP_UNUSED },</div><div class='add'>+	{  6, MPP_UNUSED },</div><div class='add'>+	{  7, MPP_UNUSED },</div><div class='add'>+	{  8, MPP_UNUSED },</div><div class='add'>+	{  9, MPP_UNUSED },</div><div class='add'>+	{ 10, MPP_UNUSED },</div><div class='add'>+	{ 11, MPP_UNUSED },</div><div class='add'>+	{ 12, MPP_SATA_LED },	/* SATA 0 presence */</div><div class='add'>+	{ 13, MPP_SATA_LED },	/* SATA 1 presence */</div><div class='add'>+	{ 14, MPP_SATA_LED },	/* SATA 0 active */</div><div class='add'>+	{ 15, MPP_SATA_LED },	/* SATA 1 active */</div><div class='add'>+	/* 16: Power LED control (0 = On, 1 = Off) */</div><div class='add'>+	{ 16, MPP_GPIO },</div><div class='add'>+	/* 17: Power LED control select (0 = CPLD, 1 = GPIO16) */</div><div class='add'>+	{ 17, MPP_GPIO },</div><div class='add'>+	/* 18: Power button status (0 = Released, 1 = Pressed) */</div><div class='add'>+	{ 18, MPP_GPIO },</div><div class='add'>+	{ 19, MPP_UNUSED },</div><div class='add'>+	{ -1 }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init edmini_v2_init(void)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Setup basic Orion functions. Need to be called early.</div><div class='add'>+	 */</div><div class='add'>+	orion5x_init();</div><div class='add'>+</div><div class='add'>+	orion5x_mpp_conf(edminiv2_mpp_modes);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Configure peripherals.</div><div class='add'>+	 */</div><div class='add'>+	orion5x_ehci0_init();</div><div class='add'>+	orion5x_eth_init(&amp;edmini_v2_eth_data);</div><div class='add'>+	orion5x_i2c_init();</div><div class='add'>+	orion5x_sata_init(&amp;edmini_v2_sata_data);</div><div class='add'>+	orion5x_uart0_init();</div><div class='add'>+</div><div class='add'>+	orion5x_setup_dev_boot_win(EDMINI_V2_NOR_BOOT_BASE,</div><div class='add'>+				EDMINI_V2_NOR_BOOT_SIZE);</div><div class='add'>+	platform_device_register(&amp;edmini_v2_nor_flash);</div><div class='add'>+	platform_device_register(&amp;edmini_v2_gpio_leds);</div><div class='add'>+	platform_device_register(&amp;edmini_v2_gpio_buttons);</div><div class='add'>+</div><div class='add'>+	pr_notice("edmini_v2: USB device port, flash write and power-off "</div><div class='add'>+		  "are not yet supported.\n");</div><div class='add'>+</div><div class='add'>+	/* Get RTC IRQ and register the chip */</div><div class='add'>+	if (gpio_request(EDMINIV2_RTC_GPIO, "rtc") == 0) {</div><div class='add'>+		if (gpio_direction_input(EDMINIV2_RTC_GPIO) == 0)</div><div class='add'>+			edmini_v2_i2c_rtc.irq = gpio_to_irq(EDMINIV2_RTC_GPIO);</div><div class='add'>+		else</div><div class='add'>+			gpio_free(EDMINIV2_RTC_GPIO);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (edmini_v2_i2c_rtc.irq == 0)</div><div class='add'>+		pr_warning("edmini_v2: failed to get RTC IRQ\n");</div><div class='add'>+</div><div class='add'>+	i2c_register_board_info(0, &amp;edmini_v2_i2c_rtc, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Warning: LaCie use a wrong mach-type (0x20e=526) in their bootloader. */</div><div class='add'>+MACHINE_START(EDMINI_V2, "LaCie Ethernet Disk mini V2")</div><div class='add'>+	/* Maintainer: Christopher Moore &lt;moore@free.fr&gt; */</div><div class='add'>+	.phys_io	= ORION5X_REGS_PHYS_BASE,</div><div class='add'>+	.io_pg_offst	= ((ORION5X_REGS_VIRT_BASE) &gt;&gt; 18) &amp; 0xFFFC,</div><div class='add'>+	.boot_params	= 0x00000100,</div><div class='add'>+	.init_machine	= edmini_v2_init,</div><div class='add'>+	.map_io		= orion5x_map_io,</div><div class='add'>+	.init_irq	= orion5x_init_irq,</div><div class='add'>+	.timer		= &amp;orion5x_timer,</div><div class='add'>+	.fixup		= tag_fixup_mem32,</div><div class='add'>+MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-orion5x/gpio.c b/arch/arm/mach-orion5x/gpio.c<br/>index cd8a16f67d2b..fc419868e39f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-orion5x/gpio.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-orion5x/gpio.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-orion5x/gpio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-orion5x/gpio.c</a></div><div class='hunk'>@@ -15,8 +15,8 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;asm/gpio.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;mach/orion5x.h&gt;</div><div class='ctx'> #include "common.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-orion5x/include/mach/orion5x.h b/arch/arm/mach-orion5x/include/mach/orion5x.h<br/>index 61eb74a88862..9f5ce1ce5840 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-orion5x/include/mach/orion5x.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-orion5x/include/mach/orion5x.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-orion5x/include/mach/orion5x.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-orion5x/include/mach/orion5x.h</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'>  * arch/arm/mach-orion5x/include/mach/orion5x.h</div><div class='ctx'>  *</div><div class='ctx'>  * Generic definitions of Orion SoC flavors:</div><div class='del'>- *  Orion-1, Orion-VoIP, Orion-NAS, and Orion-2.</div><div class='add'>+ *  Orion-1, Orion-VoIP, Orion-NAS, Orion-2, and Orion-1-90.</div><div class='ctx'>  *</div><div class='ctx'>  * Maintainer: Tzachi Perelstein &lt;tzachi@marvell.com&gt;</div><div class='ctx'>  *</div><div class='hunk'>@@ -76,6 +76,9 @@</div><div class='ctx'> #define MV88F5281_REV_D0	4</div><div class='ctx'> #define MV88F5281_REV_D1	5</div><div class='ctx'> #define MV88F5281_REV_D2	6</div><div class='add'>+/* Orion-1-90 (88F6183) */</div><div class='add'>+#define MV88F6183_DEV_ID	0x6183</div><div class='add'>+#define MV88F6183_REV_B0	3</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  * Orion Registers Map</div><div class='hunk'>@@ -86,6 +89,7 @@</div><div class='ctx'> #define ORION5X_DEV_BUS_PHYS_BASE	(ORION5X_REGS_PHYS_BASE | 0x10000)</div><div class='ctx'> #define ORION5X_DEV_BUS_VIRT_BASE	(ORION5X_REGS_VIRT_BASE | 0x10000)</div><div class='ctx'> #define ORION5X_DEV_BUS_REG(x)		(ORION5X_DEV_BUS_VIRT_BASE | (x))</div><div class='add'>+#define  SPI_PHYS_BASE			(ORION5X_DEV_BUS_PHYS_BASE | 0x0600)</div><div class='ctx'> #define  I2C_PHYS_BASE			(ORION5X_DEV_BUS_PHYS_BASE | 0x1000)</div><div class='ctx'> #define  UART0_PHYS_BASE		(ORION5X_DEV_BUS_PHYS_BASE | 0x2000)</div><div class='ctx'> #define  UART0_VIRT_BASE		(ORION5X_DEV_BUS_VIRT_BASE | 0x2000)</div><div class='hunk'>@@ -153,9 +157,11 @@</div><div class='ctx'> #define CPU_CONF		ORION5X_BRIDGE_REG(0x100)</div><div class='ctx'> #define CPU_CTRL		ORION5X_BRIDGE_REG(0x104)</div><div class='ctx'> #define CPU_RESET_MASK		ORION5X_BRIDGE_REG(0x108)</div><div class='add'>+#define  WDT_RESET		0x0002</div><div class='ctx'> #define CPU_SOFT_RESET		ORION5X_BRIDGE_REG(0x10c)</div><div class='ctx'> #define POWER_MNG_CTRL_REG	ORION5X_BRIDGE_REG(0x11C)</div><div class='ctx'> #define BRIDGE_CAUSE		ORION5X_BRIDGE_REG(0x110)</div><div class='add'>+#define  WDT_INT_REQ		0x0008</div><div class='ctx'> #define BRIDGE_MASK		ORION5X_BRIDGE_REG(0x114)</div><div class='ctx'> #define  BRIDGE_INT_TIMER0	0x0002</div><div class='ctx'> #define  BRIDGE_INT_TIMER1	0x0004</div><div class='head'>diff --git a/arch/arm/mach-orion5x/include/mach/timex.h b/arch/arm/mach-orion5x/include/mach/timex.h<br/>index e82e44db7629..4c69820e0810 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-orion5x/include/mach/timex.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-orion5x/include/mach/timex.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-orion5x/include/mach/timex.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-orion5x/include/mach/timex.h</a></div><div class='hunk'>@@ -9,5 +9,3 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define CLOCK_TICK_RATE		(100 * HZ)</div><div class='del'>-</div><div class='del'>-#define ORION5X_TCLK		166666667</div><div class='head'>diff --git a/arch/arm/mach-orion5x/irq.c b/arch/arm/mach-orion5x/irq.c<br/>index 2545ff9e5830..632a36f5cf14 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-orion5x/irq.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-orion5x/irq.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-orion5x/irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-orion5x/irq.c</a></div><div class='hunk'>@@ -13,8 +13,8 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;asm/gpio.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;mach/orion5x.h&gt;</div><div class='ctx'> #include &lt;plat/irq.h&gt;</div><div class='ctx'> #include "common.h"</div><div class='hunk'>@@ -162,7 +162,7 @@ static void orion5x_gpio_irq_handler(unsigned int irq, struct irq_desc *desc)</div><div class='ctx'> 				polarity ^= 1 &lt;&lt; pin;</div><div class='ctx'> 				writel(polarity, GPIO_IN_POL);</div><div class='ctx'> 			}</div><div class='del'>-			desc_handle_irq(irq, desc);</div><div class='add'>+			generic_handle_irq(irq);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-orion5x/kurobox_pro-setup.c b/arch/arm/mach-orion5x/kurobox_pro-setup.c<br/>index e321ec331839..dfbb68df7b09 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-orion5x/kurobox_pro-setup.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-orion5x/kurobox_pro-setup.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-orion5x/kurobox_pro-setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-orion5x/kurobox_pro-setup.c</a></div><div class='hunk'>@@ -161,7 +161,7 @@ subsys_initcall(kurobox_pro_pci_init);</div><div class='ctx'>  ****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> static struct mv643xx_eth_platform_data kurobox_pro_eth_data = {</div><div class='del'>-	.phy_addr	= 8,</div><div class='add'>+	.phy_addr	= MV643XX_ETH_PHY_ADDR(8),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************</div><div class='hunk'>@@ -293,7 +293,7 @@ static void kurobox_pro_power_off(void)</div><div class='ctx'> 	const unsigned char shutdownwait[]	= {0x00, 0x0c};</div><div class='ctx'> 	const unsigned char poweroff[]		= {0x00, 0x06};</div><div class='ctx'> 	/* 38400 baud divisor */</div><div class='del'>-	const unsigned divisor = ((ORION5X_TCLK + (8 * 38400)) / (16 * 38400));</div><div class='add'>+	const unsigned divisor = ((orion5x_tclk + (8 * 38400)) / (16 * 38400));</div><div class='ctx'> </div><div class='ctx'> 	pr_info("%s: triggering power-off...\n", __func__);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-orion5x/lsmini-setup.c b/arch/arm/mach-orion5x/lsmini-setup.c<br/>new file mode 100644<br/>index 000000000000..e0c43b8beb72<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-orion5x/lsmini-setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-orion5x/lsmini-setup.c</a></div><div class='hunk'>@@ -0,0 +1,279 @@</div><div class='add'>+/*</div><div class='add'>+ * arch/arm/mach-orion5x/lsmini-setup.c</div><div class='add'>+ *</div><div class='add'>+ * Maintainer: Alexey Kopytko &lt;alexey@kopytko.ru&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file is licensed under the terms of the GNU General Public</div><div class='add'>+ * License version 2.  This program is licensed "as is" without any</div><div class='add'>+ * warranty of any kind, whether express or implied.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/mtd/physmap.h&gt;</div><div class='add'>+#include &lt;linux/mv643xx_eth.h&gt;</div><div class='add'>+#include &lt;linux/leds.h&gt;</div><div class='add'>+#include &lt;linux/gpio_keys.h&gt;</div><div class='add'>+#include &lt;linux/input.h&gt;</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/ata_platform.h&gt;</div><div class='add'>+#include &lt;asm/mach-types.h&gt;</div><div class='add'>+#include &lt;linux/gpio.h&gt;</div><div class='add'>+#include &lt;asm/mach/arch.h&gt;</div><div class='add'>+#include "common.h"</div><div class='add'>+#include "mpp.h"</div><div class='add'>+#include "include/mach/system.h"</div><div class='add'>+</div><div class='add'>+/*****************************************************************************</div><div class='add'>+ * Linkstation Mini Info</div><div class='add'>+ ****************************************************************************/</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * 256K NOR flash Device bus boot chip select</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define LSMINI_NOR_BOOT_BASE	0xf4000000</div><div class='add'>+#define LSMINI_NOR_BOOT_SIZE	SZ_256K</div><div class='add'>+</div><div class='add'>+/*****************************************************************************</div><div class='add'>+ * 256KB NOR Flash on BOOT Device</div><div class='add'>+ ****************************************************************************/</div><div class='add'>+</div><div class='add'>+static struct physmap_flash_data lsmini_nor_flash_data = {</div><div class='add'>+	.width		= 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource lsmini_nor_flash_resource = {</div><div class='add'>+	.flags	= IORESOURCE_MEM,</div><div class='add'>+	.start	= LSMINI_NOR_BOOT_BASE,</div><div class='add'>+	.end	= LSMINI_NOR_BOOT_BASE + LSMINI_NOR_BOOT_SIZE - 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device lsmini_nor_flash = {</div><div class='add'>+	.name			= "physmap-flash",</div><div class='add'>+	.id			= 0,</div><div class='add'>+	.dev		= {</div><div class='add'>+		.platform_data	= &amp;lsmini_nor_flash_data,</div><div class='add'>+	},</div><div class='add'>+	.num_resources		= 1,</div><div class='add'>+	.resource		= &amp;lsmini_nor_flash_resource,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*****************************************************************************</div><div class='add'>+ * Ethernet</div><div class='add'>+ ****************************************************************************/</div><div class='add'>+</div><div class='add'>+static struct mv643xx_eth_platform_data lsmini_eth_data = {</div><div class='add'>+	.phy_addr	= 8,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*****************************************************************************</div><div class='add'>+ * RTC 5C372a on I2C bus</div><div class='add'>+ ****************************************************************************/</div><div class='add'>+</div><div class='add'>+static struct i2c_board_info __initdata lsmini_i2c_rtc = {</div><div class='add'>+	I2C_BOARD_INFO("rs5c372a", 0x32),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*****************************************************************************</div><div class='add'>+ * LEDs attached to GPIO</div><div class='add'>+ ****************************************************************************/</div><div class='add'>+</div><div class='add'>+#define LSMINI_GPIO_LED_ALARM	2</div><div class='add'>+#define LSMINI_GPIO_LED_INFO	3</div><div class='add'>+#define LSMINI_GPIO_LED_FUNC	9</div><div class='add'>+#define LSMINI_GPIO_LED_PWR	14</div><div class='add'>+</div><div class='add'>+static struct gpio_led lsmini_led_pins[] = {</div><div class='add'>+	{</div><div class='add'>+		.name	   = "alarm:red",</div><div class='add'>+		.gpio	   = LSMINI_GPIO_LED_ALARM,</div><div class='add'>+		.active_low     = 1,</div><div class='add'>+	}, {</div><div class='add'>+		.name	   = "info:amber",</div><div class='add'>+		.gpio	   = LSMINI_GPIO_LED_INFO,</div><div class='add'>+		.active_low     = 1,</div><div class='add'>+	}, {</div><div class='add'>+		.name	   = "func:blue:top",</div><div class='add'>+		.gpio	   = LSMINI_GPIO_LED_FUNC,</div><div class='add'>+		.active_low     = 1,</div><div class='add'>+	}, {</div><div class='add'>+		.name	   = "power:blue:bottom",</div><div class='add'>+		.gpio	   = LSMINI_GPIO_LED_PWR,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct gpio_led_platform_data lsmini_led_data = {</div><div class='add'>+	.leds	   = lsmini_led_pins,</div><div class='add'>+	.num_leds       = ARRAY_SIZE(lsmini_led_pins),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device lsmini_leds = {</div><div class='add'>+	.name   = "leds-gpio",</div><div class='add'>+	.id     = -1,</div><div class='add'>+	.dev    = {</div><div class='add'>+		.platform_data  = &amp;lsmini_led_data,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/****************************************************************************</div><div class='add'>+ * GPIO Attached Keys</div><div class='add'>+ ****************************************************************************/</div><div class='add'>+</div><div class='add'>+#define LSMINI_GPIO_KEY_FUNC       15</div><div class='add'>+#define LSMINI_GPIO_KEY_POWER	   18</div><div class='add'>+#define LSMINI_GPIO_KEY_AUTOPOWER 17</div><div class='add'>+</div><div class='add'>+#define LSMINI_SW_POWER		0x00</div><div class='add'>+#define LSMINI_SW_AUTOPOWER	0x01</div><div class='add'>+</div><div class='add'>+static struct gpio_keys_button lsmini_buttons[] = {</div><div class='add'>+	{</div><div class='add'>+		.code	   = KEY_OPTION,</div><div class='add'>+		.gpio	   = LSMINI_GPIO_KEY_FUNC,</div><div class='add'>+		.desc	   = "Function Button",</div><div class='add'>+		.active_low     = 1,</div><div class='add'>+	}, {</div><div class='add'>+		.type		= EV_SW,</div><div class='add'>+		.code	   = LSMINI_SW_POWER,</div><div class='add'>+		.gpio	   = LSMINI_GPIO_KEY_POWER,</div><div class='add'>+		.desc	   = "Power-on Switch",</div><div class='add'>+		.active_low     = 1,</div><div class='add'>+	}, {</div><div class='add'>+		.type		= EV_SW,</div><div class='add'>+		.code	   = LSMINI_SW_AUTOPOWER,</div><div class='add'>+		.gpio	   = LSMINI_GPIO_KEY_AUTOPOWER,</div><div class='add'>+		.desc	   = "Power-auto Switch",</div><div class='add'>+		.active_low     = 1,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct gpio_keys_platform_data lsmini_button_data = {</div><div class='add'>+	.buttons	= lsmini_buttons,</div><div class='add'>+	.nbuttons       = ARRAY_SIZE(lsmini_buttons),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device lsmini_button_device = {</div><div class='add'>+	.name	   = "gpio-keys",</div><div class='add'>+	.id	     = -1,</div><div class='add'>+	.num_resources  = 0,</div><div class='add'>+	.dev	    = {</div><div class='add'>+		.platform_data  = &amp;lsmini_button_data,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*****************************************************************************</div><div class='add'>+ * SATA</div><div class='add'>+ ****************************************************************************/</div><div class='add'>+static struct mv_sata_platform_data lsmini_sata_data = {</div><div class='add'>+	.n_ports	= 2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*****************************************************************************</div><div class='add'>+ * Linkstation Mini specific power off method: reboot</div><div class='add'>+ ****************************************************************************/</div><div class='add'>+/*</div><div class='add'>+ * On the Linkstation Mini, the shutdown process is following:</div><div class='add'>+ * - Userland monitors key events until the power switch goes to off position</div><div class='add'>+ * - The board reboots</div><div class='add'>+ * - U-boot starts and goes into an idle mode waiting for the user</div><div class='add'>+ *   to move the switch to ON position</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static void lsmini_power_off(void)</div><div class='add'>+{</div><div class='add'>+	arch_reset(0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*****************************************************************************</div><div class='add'>+ * General Setup</div><div class='add'>+ ****************************************************************************/</div><div class='add'>+</div><div class='add'>+#define LSMINI_GPIO_USB_POWER	16</div><div class='add'>+#define LSMINI_GPIO_AUTO_POWER	17</div><div class='add'>+#define LSMINI_GPIO_POWER	18</div><div class='add'>+</div><div class='add'>+#define LSMINI_GPIO_HDD_POWER0	1</div><div class='add'>+#define LSMINI_GPIO_HDD_POWER1	19</div><div class='add'>+</div><div class='add'>+static struct orion5x_mpp_mode lsmini_mpp_modes[] __initdata = {</div><div class='add'>+	{  0, MPP_UNUSED }, /* LED_RESERVE1 (unused) */</div><div class='add'>+	{  1, MPP_GPIO }, /* HDD_PWR */</div><div class='add'>+	{  2, MPP_GPIO }, /* LED_ALARM */</div><div class='add'>+	{  3, MPP_GPIO }, /* LED_INFO */</div><div class='add'>+	{  4, MPP_UNUSED },</div><div class='add'>+	{  5, MPP_UNUSED },</div><div class='add'>+	{  6, MPP_UNUSED },</div><div class='add'>+	{  7, MPP_UNUSED },</div><div class='add'>+	{  8, MPP_UNUSED },</div><div class='add'>+	{  9, MPP_GPIO }, /* LED_FUNC */</div><div class='add'>+	{ 10, MPP_UNUSED },</div><div class='add'>+	{ 11, MPP_UNUSED }, /* LED_ETH (dummy) */</div><div class='add'>+	{ 12, MPP_UNUSED },</div><div class='add'>+	{ 13, MPP_UNUSED },</div><div class='add'>+	{ 14, MPP_GPIO }, /* LED_PWR */</div><div class='add'>+	{ 15, MPP_GPIO }, /* FUNC */</div><div class='add'>+	{ 16, MPP_GPIO }, /* USB_PWR */</div><div class='add'>+	{ 17, MPP_GPIO }, /* AUTO_POWER */</div><div class='add'>+	{ 18, MPP_GPIO }, /* POWER */</div><div class='add'>+	{ 19, MPP_GPIO }, /* HDD_PWR1 */</div><div class='add'>+	{ -1 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init lsmini_init(void)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Setup basic Orion functions. Need to be called early.</div><div class='add'>+	 */</div><div class='add'>+	orion5x_init();</div><div class='add'>+</div><div class='add'>+	orion5x_mpp_conf(lsmini_mpp_modes);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Configure peripherals.</div><div class='add'>+	 */</div><div class='add'>+	orion5x_ehci0_init();</div><div class='add'>+	orion5x_ehci1_init();</div><div class='add'>+	orion5x_eth_init(&amp;lsmini_eth_data);</div><div class='add'>+	orion5x_i2c_init();</div><div class='add'>+	orion5x_sata_init(&amp;lsmini_sata_data);</div><div class='add'>+	orion5x_uart0_init();</div><div class='add'>+	orion5x_xor_init();</div><div class='add'>+</div><div class='add'>+	orion5x_setup_dev_boot_win(LSMINI_NOR_BOOT_BASE,</div><div class='add'>+				   LSMINI_NOR_BOOT_SIZE);</div><div class='add'>+	platform_device_register(&amp;lsmini_nor_flash);</div><div class='add'>+</div><div class='add'>+	platform_device_register(&amp;lsmini_button_device);</div><div class='add'>+</div><div class='add'>+	platform_device_register(&amp;lsmini_leds);</div><div class='add'>+</div><div class='add'>+	i2c_register_board_info(0, &amp;lsmini_i2c_rtc, 1);</div><div class='add'>+</div><div class='add'>+	/* enable USB power */</div><div class='add'>+	gpio_set_value(LSMINI_GPIO_USB_POWER, 1);</div><div class='add'>+</div><div class='add'>+	/* register power-off method */</div><div class='add'>+	pm_power_off = lsmini_power_off;</div><div class='add'>+</div><div class='add'>+	pr_info("%s: finished\n", __func__);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_MACH_LINKSTATION_MINI</div><div class='add'>+MACHINE_START(LINKSTATION_MINI, "Buffalo Linkstation Mini")</div><div class='add'>+	/* Maintainer: Alexey Kopytko &lt;alexey@kopytko.ru&gt; */</div><div class='add'>+	.phys_io	= ORION5X_REGS_PHYS_BASE,</div><div class='add'>+	.io_pg_offst	= ((ORION5X_REGS_VIRT_BASE) &gt;&gt; 18) &amp; 0xFFFC,</div><div class='add'>+	.boot_params	= 0x00000100,</div><div class='add'>+	.init_machine	= lsmini_init,</div><div class='add'>+	.map_io		= orion5x_map_io,</div><div class='add'>+	.init_irq	= orion5x_init_irq,</div><div class='add'>+	.timer		= &amp;orion5x_timer,</div><div class='add'>+	.fixup		= tag_fixup_mem32,</div><div class='add'>+MACHINE_END</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/arm/mach-orion5x/mpp.c b/arch/arm/mach-orion5x/mpp.c<br/>index c04ab0e16ea1..640ea2a3fc6c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-orion5x/mpp.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-orion5x/mpp.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-orion5x/mpp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-orion5x/mpp.c</a></div><div class='hunk'>@@ -11,8 +11,8 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/mbus.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include "common.h"</div><div class='ctx'> #include "mpp.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-orion5x/mss2-setup.c b/arch/arm/mach-orion5x/mss2-setup.c<br/>index 53ff1893b883..68acca98e638 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-orion5x/mss2-setup.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-orion5x/mss2-setup.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-orion5x/mss2-setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-orion5x/mss2-setup.c</a></div><div class='hunk'>@@ -109,7 +109,7 @@ subsys_initcall(mss2_pci_init);</div><div class='ctx'>  ****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> static struct mv643xx_eth_platform_data mss2_eth_data = {</div><div class='del'>-	.phy_addr	= 8,</div><div class='add'>+	.phy_addr	= MV643XX_ETH_PHY_ADDR(8),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************</div><div class='head'>diff --git a/arch/arm/mach-orion5x/mv2120-setup.c b/arch/arm/mach-orion5x/mv2120-setup.c<br/>index 978d4d599396..97c9ccb2ac60 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-orion5x/mv2120-setup.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-orion5x/mv2120-setup.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-orion5x/mv2120-setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-orion5x/mv2120-setup.c</a></div><div class='hunk'>@@ -39,7 +39,7 @@</div><div class='ctx'>  * Ethernet</div><div class='ctx'>  ****************************************************************************/</div><div class='ctx'> static struct mv643xx_eth_platform_data mv2120_eth_data = {</div><div class='del'>-	.phy_addr	= 8,</div><div class='add'>+	.phy_addr	= MV643XX_ETH_PHY_ADDR(8),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct mv_sata_platform_data mv2120_sata_data = {</div><div class='head'>diff --git a/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c b/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c<br/>index e72fe1e065e8..500cdadaf09c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c</a></div><div class='hunk'>@@ -88,7 +88,7 @@ static struct orion5x_mpp_mode rd88f5181l_fxo_mpp_modes[] __initdata = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct mv643xx_eth_platform_data rd88f5181l_fxo_eth_data = {</div><div class='del'>-	.phy_addr	= -1,</div><div class='add'>+	.phy_addr	= MV643XX_ETH_PHY_NONE,</div><div class='ctx'> 	.speed		= SPEED_1000,</div><div class='ctx'> 	.duplex		= DUPLEX_FULL,</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c b/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c<br/>index a1fe3257320d..ebde81416499 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-orion5x/rd88f5181l-ge-setup.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-orion5x/rd88f5181l-ge-setup.c</a></div><div class='hunk'>@@ -89,7 +89,7 @@ static struct orion5x_mpp_mode rd88f5181l_ge_mpp_modes[] __initdata = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct mv643xx_eth_platform_data rd88f5181l_ge_eth_data = {</div><div class='del'>-	.phy_addr	= -1,</div><div class='add'>+	.phy_addr	= MV643XX_ETH_PHY_NONE,</div><div class='ctx'> 	.speed		= SPEED_1000,</div><div class='ctx'> 	.duplex		= DUPLEX_FULL,</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/mach-orion5x/rd88f5182-setup.c b/arch/arm/mach-orion5x/rd88f5182-setup.c<br/>index 4c3bcd76ac85..a04f9e4b633a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-orion5x/rd88f5182-setup.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-orion5x/rd88f5182-setup.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-orion5x/rd88f5182-setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-orion5x/rd88f5182-setup.c</a></div><div class='hunk'>@@ -221,7 +221,7 @@ subsys_initcall(rd88f5182_pci_init);</div><div class='ctx'>  ****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> static struct mv643xx_eth_platform_data rd88f5182_eth_data = {</div><div class='del'>-	.phy_addr	= 8,</div><div class='add'>+	.phy_addr	= MV643XX_ETH_PHY_ADDR(8),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************</div><div class='head'>diff --git a/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c b/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c<br/>new file mode 100644<br/>index 000000000000..40e049539091<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c</a></div><div class='hunk'>@@ -0,0 +1,117 @@</div><div class='add'>+/*</div><div class='add'>+ * arch/arm/mach-orion5x/rd88f6183-ap-ge-setup.c</div><div class='add'>+ *</div><div class='add'>+ * Marvell Orion-1-90 AP GE Reference Design Setup</div><div class='add'>+ *</div><div class='add'>+ * This file is licensed under the terms of the GNU General Public</div><div class='add'>+ * License version 2.  This program is licensed "as is" without any</div><div class='add'>+ * warranty of any kind, whether express or implied.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='add'>+#include &lt;linux/mtd/physmap.h&gt;</div><div class='add'>+#include &lt;linux/mv643xx_eth.h&gt;</div><div class='add'>+#include &lt;linux/spi/spi.h&gt;</div><div class='add'>+#include &lt;linux/spi/orion_spi.h&gt;</div><div class='add'>+#include &lt;linux/spi/flash.h&gt;</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='add'>+#include &lt;asm/mach-types.h&gt;</div><div class='add'>+#include &lt;asm/gpio.h&gt;</div><div class='add'>+#include &lt;asm/leds.h&gt;</div><div class='add'>+#include &lt;asm/mach/arch.h&gt;</div><div class='add'>+#include &lt;asm/mach/pci.h&gt;</div><div class='add'>+#include &lt;mach/orion5x.h&gt;</div><div class='add'>+#include "common.h"</div><div class='add'>+#include "mpp.h"</div><div class='add'>+</div><div class='add'>+static struct mv643xx_eth_platform_data rd88f6183ap_ge_eth_data = {</div><div class='add'>+	.phy_addr	= -1,</div><div class='add'>+	.speed		= SPEED_1000,</div><div class='add'>+	.duplex		= DUPLEX_FULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct mtd_partition rd88f6183ap_ge_partitions[] = {</div><div class='add'>+	{</div><div class='add'>+		.name	= "kernel",</div><div class='add'>+		.offset	= 0x00000000,</div><div class='add'>+		.size	= 0x00200000,</div><div class='add'>+	}, {</div><div class='add'>+		.name	= "rootfs",</div><div class='add'>+		.offset	= 0x00200000,</div><div class='add'>+		.size	= 0x00500000,</div><div class='add'>+	}, {</div><div class='add'>+		.name	= "nvram",</div><div class='add'>+		.offset	= 0x00700000,</div><div class='add'>+		.size	= 0x00080000,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct flash_platform_data rd88f6183ap_ge_spi_slave_data = {</div><div class='add'>+	.type		= "m25p64",</div><div class='add'>+	.nr_parts	= ARRAY_SIZE(rd88f6183ap_ge_partitions),</div><div class='add'>+	.parts		= rd88f6183ap_ge_partitions,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct spi_board_info __initdata rd88f6183ap_ge_spi_slave_info[] = {</div><div class='add'>+	{</div><div class='add'>+		.modalias	= "m25p80",</div><div class='add'>+		.platform_data	= &amp;rd88f6183ap_ge_spi_slave_data,</div><div class='add'>+		.irq		= NO_IRQ,</div><div class='add'>+		.max_speed_hz	= 20000000,</div><div class='add'>+		.bus_num	= 0,</div><div class='add'>+		.chip_select	= 0,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init rd88f6183ap_ge_init(void)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Setup basic Orion functions. Need to be called early.</div><div class='add'>+	 */</div><div class='add'>+	orion5x_init();</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Configure peripherals.</div><div class='add'>+	 */</div><div class='add'>+	orion5x_ehci0_init();</div><div class='add'>+	orion5x_eth_init(&amp;rd88f6183ap_ge_eth_data);</div><div class='add'>+	spi_register_board_info(rd88f6183ap_ge_spi_slave_info,</div><div class='add'>+				ARRAY_SIZE(rd88f6183ap_ge_spi_slave_info));</div><div class='add'>+	orion5x_spi_init();</div><div class='add'>+	orion5x_uart0_init();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct hw_pci rd88f6183ap_ge_pci __initdata = {</div><div class='add'>+	.nr_controllers	= 2,</div><div class='add'>+	.swizzle	= pci_std_swizzle,</div><div class='add'>+	.setup		= orion5x_pci_sys_setup,</div><div class='add'>+	.scan		= orion5x_pci_sys_scan_bus,</div><div class='add'>+	.map_irq	= orion5x_pci_map_irq,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init rd88f6183ap_ge_pci_init(void)</div><div class='add'>+{</div><div class='add'>+	if (machine_is_rd88f6183ap_ge()) {</div><div class='add'>+		orion5x_pci_disable();</div><div class='add'>+		pci_common_init(&amp;rd88f6183ap_ge_pci);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+subsys_initcall(rd88f6183ap_ge_pci_init);</div><div class='add'>+</div><div class='add'>+MACHINE_START(RD88F6183AP_GE, "Marvell Orion-1-90 AP GE Reference Design")</div><div class='add'>+	/* Maintainer: Lennert Buytenhek &lt;buytenh@marvell.com&gt; */</div><div class='add'>+	.phys_io	= ORION5X_REGS_PHYS_BASE,</div><div class='add'>+	.io_pg_offst	= ((ORION5X_REGS_VIRT_BASE) &gt;&gt; 18) &amp; 0xFFFC,</div><div class='add'>+	.boot_params	= 0x00000100,</div><div class='add'>+	.init_machine	= rd88f6183ap_ge_init,</div><div class='add'>+	.map_io		= orion5x_map_io,</div><div class='add'>+	.init_irq	= orion5x_init_irq,</div><div class='add'>+	.timer		= &amp;orion5x_timer,</div><div class='add'>+	.fixup		= tag_fixup_mem32,</div><div class='add'>+MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-orion5x/terastation_pro2-setup.c b/arch/arm/mach-orion5x/terastation_pro2-setup.c<br/>new file mode 100644<br/>index 000000000000..0b101d7d41c2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-orion5x/terastation_pro2-setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-orion5x/terastation_pro2-setup.c</a></div><div class='hunk'>@@ -0,0 +1,369 @@</div><div class='add'>+/*</div><div class='add'>+ * Buffalo Terastation Pro II/Live Board Setup</div><div class='add'>+ *</div><div class='add'>+ * Maintainer: Sylver Bruneau &lt;sylver.bruneau@googlemail.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public License</div><div class='add'>+ * as published by the Free Software Foundation; either version</div><div class='add'>+ * 2 of the License, or (at your option) any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/mtd/physmap.h&gt;</div><div class='add'>+#include &lt;linux/mv643xx_eth.h&gt;</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/serial_reg.h&gt;</div><div class='add'>+#include &lt;asm/mach-types.h&gt;</div><div class='add'>+#include &lt;asm/gpio.h&gt;</div><div class='add'>+#include &lt;asm/mach/arch.h&gt;</div><div class='add'>+#include &lt;asm/mach/pci.h&gt;</div><div class='add'>+#include &lt;mach/orion5x.h&gt;</div><div class='add'>+#include "common.h"</div><div class='add'>+#include "mpp.h"</div><div class='add'>+</div><div class='add'>+/*****************************************************************************</div><div class='add'>+ * Terastation Pro 2/Live Info</div><div class='add'>+ ****************************************************************************/</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Terastation Pro 2 hardware :</div><div class='add'>+ * - Marvell 88F5281-D0</div><div class='add'>+ * - Marvell 88SX6042 SATA controller (PCI)</div><div class='add'>+ * - Marvell 88E1118 Gigabit Ethernet PHY</div><div class='add'>+ * - 256KB NOR flash</div><div class='add'>+ * - 128MB of DDR RAM</div><div class='add'>+ * - PCIe port (not equipped)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * 256K NOR flash Device bus boot chip select</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define TSP2_NOR_BOOT_BASE	0xf4000000</div><div class='add'>+#define TSP2_NOR_BOOT_SIZE	SZ_256K</div><div class='add'>+</div><div class='add'>+/*****************************************************************************</div><div class='add'>+ * 256KB NOR Flash on BOOT Device</div><div class='add'>+ ****************************************************************************/</div><div class='add'>+</div><div class='add'>+static struct physmap_flash_data tsp2_nor_flash_data = {</div><div class='add'>+	.width    = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource tsp2_nor_flash_resource = {</div><div class='add'>+	.flags = IORESOURCE_MEM,</div><div class='add'>+	.start = TSP2_NOR_BOOT_BASE,</div><div class='add'>+	.end   = TSP2_NOR_BOOT_BASE + TSP2_NOR_BOOT_SIZE - 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device tsp2_nor_flash = {</div><div class='add'>+	.name          = "physmap-flash",</div><div class='add'>+	.id            = 0,</div><div class='add'>+	.dev           = {</div><div class='add'>+		.platform_data	= &amp;tsp2_nor_flash_data,</div><div class='add'>+	},</div><div class='add'>+	.num_resources = 1,</div><div class='add'>+	.resource      = &amp;tsp2_nor_flash_resource,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*****************************************************************************</div><div class='add'>+ * PCI</div><div class='add'>+ ****************************************************************************/</div><div class='add'>+#define TSP2_PCI_SLOT0_OFFS		7</div><div class='add'>+#define TSP2_PCI_SLOT0_IRQ_PIN		11</div><div class='add'>+</div><div class='add'>+void __init tsp2_pci_preinit(void)</div><div class='add'>+{</div><div class='add'>+	int pin;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Configure PCI GPIO IRQ pins</div><div class='add'>+	 */</div><div class='add'>+	pin = TSP2_PCI_SLOT0_IRQ_PIN;</div><div class='add'>+	if (gpio_request(pin, "PCI Int1") == 0) {</div><div class='add'>+		if (gpio_direction_input(pin) == 0) {</div><div class='add'>+			set_irq_type(gpio_to_irq(pin), IRQ_TYPE_LEVEL_LOW);</div><div class='add'>+		} else {</div><div class='add'>+			printk(KERN_ERR "tsp2_pci_preinit failed "</div><div class='add'>+					"to set_irq_type pin %d\n", pin);</div><div class='add'>+			gpio_free(pin);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		printk(KERN_ERR "tsp2_pci_preinit failed to "</div><div class='add'>+				"gpio_request %d\n", pin);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init tsp2_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)</div><div class='add'>+{</div><div class='add'>+	int irq;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Check for devices with hard-wired IRQs.</div><div class='add'>+	 */</div><div class='add'>+	irq = orion5x_pci_map_irq(dev, slot, pin);</div><div class='add'>+	if (irq != -1)</div><div class='add'>+		return irq;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * PCI IRQs are connected via GPIOs.</div><div class='add'>+	 */</div><div class='add'>+	if (slot == TSP2_PCI_SLOT0_OFFS)</div><div class='add'>+		return gpio_to_irq(TSP2_PCI_SLOT0_IRQ_PIN);</div><div class='add'>+</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct hw_pci tsp2_pci __initdata = {</div><div class='add'>+	.nr_controllers = 2,</div><div class='add'>+	.preinit        = tsp2_pci_preinit,</div><div class='add'>+	.swizzle        = pci_std_swizzle,</div><div class='add'>+	.setup          = orion5x_pci_sys_setup,</div><div class='add'>+	.scan           = orion5x_pci_sys_scan_bus,</div><div class='add'>+	.map_irq        = tsp2_pci_map_irq,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init tsp2_pci_init(void)</div><div class='add'>+{</div><div class='add'>+	if (machine_is_terastation_pro2())</div><div class='add'>+		pci_common_init(&amp;tsp2_pci);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+subsys_initcall(tsp2_pci_init);</div><div class='add'>+</div><div class='add'>+/*****************************************************************************</div><div class='add'>+ * Ethernet</div><div class='add'>+ ****************************************************************************/</div><div class='add'>+</div><div class='add'>+static struct mv643xx_eth_platform_data tsp2_eth_data = {</div><div class='add'>+	.phy_addr	= 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*****************************************************************************</div><div class='add'>+ * RTC 5C372a on I2C bus</div><div class='add'>+ ****************************************************************************/</div><div class='add'>+</div><div class='add'>+#define TSP2_RTC_GPIO	9</div><div class='add'>+</div><div class='add'>+static struct i2c_board_info __initdata tsp2_i2c_rtc = {</div><div class='add'>+	I2C_BOARD_INFO("rs5c372a", 0x32),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*****************************************************************************</div><div class='add'>+ * Terastation Pro II specific power off method via UART1-attached</div><div class='add'>+ * microcontroller</div><div class='add'>+ ****************************************************************************/</div><div class='add'>+</div><div class='add'>+#define UART1_REG(x)	(UART1_VIRT_BASE + ((UART_##x) &lt;&lt; 2))</div><div class='add'>+</div><div class='add'>+static int tsp2_miconread(unsigned char *buf, int count)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	int timeout;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; count; i++) {</div><div class='add'>+		timeout = 10;</div><div class='add'>+</div><div class='add'>+		while (!(readl(UART1_REG(LSR)) &amp; UART_LSR_DR)) {</div><div class='add'>+			if (--timeout == 0)</div><div class='add'>+				break;</div><div class='add'>+			udelay(1000);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (timeout == 0)</div><div class='add'>+			break;</div><div class='add'>+		buf[i] = readl(UART1_REG(RX));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* return read bytes */</div><div class='add'>+	return i;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tsp2_miconwrite(const unsigned char *buf, int count)</div><div class='add'>+{</div><div class='add'>+	int i = 0;</div><div class='add'>+</div><div class='add'>+	while (count--) {</div><div class='add'>+		while (!(readl(UART1_REG(LSR)) &amp; UART_LSR_THRE))</div><div class='add'>+			barrier();</div><div class='add'>+		writel(buf[i++], UART1_REG(TX));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tsp2_miconsend(const unsigned char *data, int count)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	unsigned char checksum = 0;</div><div class='add'>+	unsigned char recv_buf[40];</div><div class='add'>+	unsigned char send_buf[40];</div><div class='add'>+	unsigned char correct_ack[3];</div><div class='add'>+	int retry = 2;</div><div class='add'>+</div><div class='add'>+	/* Generate checksum */</div><div class='add'>+	for (i = 0; i &lt; count; i++)</div><div class='add'>+		checksum -=  data[i];</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		/* Send data */</div><div class='add'>+		tsp2_miconwrite(data, count);</div><div class='add'>+</div><div class='add'>+		/* send checksum */</div><div class='add'>+		tsp2_miconwrite(&amp;checksum, 1);</div><div class='add'>+</div><div class='add'>+		if (tsp2_miconread(recv_buf, sizeof(recv_buf)) &lt;= 3) {</div><div class='add'>+			printk(KERN_ERR "&gt;%s: receive failed.\n", __func__);</div><div class='add'>+</div><div class='add'>+			/* send preamble to clear the receive buffer */</div><div class='add'>+			memset(&amp;send_buf, 0xff, sizeof(send_buf));</div><div class='add'>+			tsp2_miconwrite(send_buf, sizeof(send_buf));</div><div class='add'>+</div><div class='add'>+			/* make dummy reads */</div><div class='add'>+			mdelay(100);</div><div class='add'>+			tsp2_miconread(recv_buf, sizeof(recv_buf));</div><div class='add'>+		} else {</div><div class='add'>+			/* Generate expected ack */</div><div class='add'>+			correct_ack[0] = 0x01;</div><div class='add'>+			correct_ack[1] = data[1];</div><div class='add'>+			correct_ack[2] = 0x00;</div><div class='add'>+</div><div class='add'>+			/* checksum Check */</div><div class='add'>+			if ((recv_buf[0] + recv_buf[1] + recv_buf[2] +</div><div class='add'>+			     recv_buf[3]) &amp; 0xFF) {</div><div class='add'>+				printk(KERN_ERR "&gt;%s: Checksum Error : "</div><div class='add'>+					"Received data[%02x, %02x, %02x, %02x]"</div><div class='add'>+					"\n", __func__, recv_buf[0],</div><div class='add'>+					recv_buf[1], recv_buf[2], recv_buf[3]);</div><div class='add'>+			} else {</div><div class='add'>+				/* Check Received Data */</div><div class='add'>+				if (correct_ack[0] == recv_buf[0] &amp;&amp;</div><div class='add'>+				    correct_ack[1] == recv_buf[1] &amp;&amp;</div><div class='add'>+				    correct_ack[2] == recv_buf[2]) {</div><div class='add'>+					/* Interval for next command */</div><div class='add'>+					mdelay(10);</div><div class='add'>+</div><div class='add'>+					/* Receive ACK */</div><div class='add'>+					return 0;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+			/* Received NAK or illegal Data */</div><div class='add'>+			printk(KERN_ERR "&gt;%s: Error : NAK or Illegal Data "</div><div class='add'>+					"Received\n", __func__);</div><div class='add'>+		}</div><div class='add'>+	} while (retry--);</div><div class='add'>+</div><div class='add'>+	/* Interval for next command */</div><div class='add'>+	mdelay(10);</div><div class='add'>+</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tsp2_power_off(void)</div><div class='add'>+{</div><div class='add'>+	const unsigned char watchdogkill[]	= {0x01, 0x35, 0x00};</div><div class='add'>+	const unsigned char shutdownwait[]	= {0x00, 0x0c};</div><div class='add'>+	const unsigned char poweroff[]		= {0x00, 0x06};</div><div class='add'>+	/* 38400 baud divisor */</div><div class='add'>+	const unsigned divisor = ((orion5x_tclk + (8 * 38400)) / (16 * 38400));</div><div class='add'>+</div><div class='add'>+	pr_info("%s: triggering power-off...\n", __func__);</div><div class='add'>+</div><div class='add'>+	/* hijack uart1 and reset into sane state (38400,8n1,even parity) */</div><div class='add'>+	writel(0x83, UART1_REG(LCR));</div><div class='add'>+	writel(divisor &amp; 0xff, UART1_REG(DLL));</div><div class='add'>+	writel((divisor &gt;&gt; 8) &amp; 0xff, UART1_REG(DLM));</div><div class='add'>+	writel(0x1b, UART1_REG(LCR));</div><div class='add'>+	writel(0x00, UART1_REG(IER));</div><div class='add'>+	writel(0x07, UART1_REG(FCR));</div><div class='add'>+	writel(0x00, UART1_REG(MCR));</div><div class='add'>+</div><div class='add'>+	/* Send the commands to shutdown the Terastation Pro II */</div><div class='add'>+	tsp2_miconsend(watchdogkill, sizeof(watchdogkill)) ;</div><div class='add'>+	tsp2_miconsend(shutdownwait, sizeof(shutdownwait)) ;</div><div class='add'>+	tsp2_miconsend(poweroff, sizeof(poweroff));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*****************************************************************************</div><div class='add'>+ * General Setup</div><div class='add'>+ ****************************************************************************/</div><div class='add'>+static struct orion5x_mpp_mode tsp2_mpp_modes[] __initdata = {</div><div class='add'>+	{  0, MPP_PCIE_RST_OUTn },</div><div class='add'>+	{  1, MPP_UNUSED },</div><div class='add'>+	{  2, MPP_UNUSED },</div><div class='add'>+	{  3, MPP_UNUSED },</div><div class='add'>+	{  4, MPP_NAND },		/* BOOT NAND Flash REn */</div><div class='add'>+	{  5, MPP_NAND },		/* BOOT NAND Flash WEn */</div><div class='add'>+	{  6, MPP_NAND },		/* BOOT NAND Flash HREn[0] */</div><div class='add'>+	{  7, MPP_NAND },		/* BOOT NAND Flash WEn[0] */</div><div class='add'>+	{  8, MPP_GPIO },		/* MICON int */</div><div class='add'>+	{  9, MPP_GPIO },		/* RTC int */</div><div class='add'>+	{ 10, MPP_UNUSED },</div><div class='add'>+	{ 11, MPP_GPIO },		/* PCI Int A */</div><div class='add'>+	{ 12, MPP_UNUSED },</div><div class='add'>+	{ 13, MPP_GPIO },		/* UPS on UART0 enable */</div><div class='add'>+	{ 14, MPP_GPIO },		/* UPS low battery detection */</div><div class='add'>+	{ 15, MPP_UNUSED },</div><div class='add'>+	{ 16, MPP_UART },		/* UART1 RXD */</div><div class='add'>+	{ 17, MPP_UART },		/* UART1 TXD */</div><div class='add'>+	{ 18, MPP_UART },		/* UART1 CTSn */</div><div class='add'>+	{ 19, MPP_UART },		/* UART1 RTSn */</div><div class='add'>+	{ -1 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init tsp2_init(void)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Setup basic Orion functions. Need to be called early.</div><div class='add'>+	 */</div><div class='add'>+	orion5x_init();</div><div class='add'>+</div><div class='add'>+	orion5x_mpp_conf(tsp2_mpp_modes);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Configure peripherals.</div><div class='add'>+	 */</div><div class='add'>+	orion5x_setup_dev_boot_win(TSP2_NOR_BOOT_BASE,</div><div class='add'>+				   TSP2_NOR_BOOT_SIZE);</div><div class='add'>+	platform_device_register(&amp;tsp2_nor_flash);</div><div class='add'>+</div><div class='add'>+	orion5x_ehci0_init();</div><div class='add'>+	orion5x_eth_init(&amp;tsp2_eth_data);</div><div class='add'>+	orion5x_i2c_init();</div><div class='add'>+	orion5x_uart0_init();</div><div class='add'>+	orion5x_uart1_init();</div><div class='add'>+</div><div class='add'>+	/* Get RTC IRQ and register the chip */</div><div class='add'>+	if (gpio_request(TSP2_RTC_GPIO, "rtc") == 0) {</div><div class='add'>+		if (gpio_direction_input(TSP2_RTC_GPIO) == 0)</div><div class='add'>+			tsp2_i2c_rtc.irq = gpio_to_irq(TSP2_RTC_GPIO);</div><div class='add'>+		else</div><div class='add'>+			gpio_free(TSP2_RTC_GPIO);</div><div class='add'>+	}</div><div class='add'>+	if (tsp2_i2c_rtc.irq == 0)</div><div class='add'>+		pr_warning("tsp2_init: failed to get RTC IRQ\n");</div><div class='add'>+	i2c_register_board_info(0, &amp;tsp2_i2c_rtc, 1);</div><div class='add'>+</div><div class='add'>+	/* register Terastation Pro II specific power-off method */</div><div class='add'>+	pm_power_off = tsp2_power_off;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+MACHINE_START(TERASTATION_PRO2, "Buffalo Terastation Pro II/Live")</div><div class='add'>+	/* Maintainer:  Sylver Bruneau &lt;sylver.bruneau@googlemail.com&gt; */</div><div class='add'>+	.phys_io	= ORION5X_REGS_PHYS_BASE,</div><div class='add'>+	.io_pg_offst	= ((ORION5X_REGS_VIRT_BASE) &gt;&gt; 18) &amp; 0xFFFC,</div><div class='add'>+	.boot_params	= 0x00000100,</div><div class='add'>+	.init_machine	= tsp2_init,</div><div class='add'>+	.map_io		= orion5x_map_io,</div><div class='add'>+	.init_irq	= orion5x_init_irq,</div><div class='add'>+	.timer		= &amp;orion5x_timer,</div><div class='add'>+	.fixup		= tag_fixup_mem32,</div><div class='add'>+MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-orion5x/ts78xx-setup.c b/arch/arm/mach-orion5x/ts78xx-setup.c<br/>index ae0a5dccd2a1..1368e9fd1a06 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-orion5x/ts78xx-setup.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-orion5x/ts78xx-setup.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-orion5x/ts78xx-setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-orion5x/ts78xx-setup.c</a></div><div class='hunk'>@@ -103,8 +103,7 @@ static struct platform_device ts78xx_nor_boot_flash = {</div><div class='ctx'>  * Ethernet</div><div class='ctx'>  ****************************************************************************/</div><div class='ctx'> static struct mv643xx_eth_platform_data ts78xx_eth_data = {</div><div class='del'>-	.phy_addr	= 0,</div><div class='del'>-	.force_phy_addr = 1,</div><div class='add'>+	.phy_addr	= MV643XX_ETH_PHY_ADDR(0),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************</div><div class='head'>diff --git a/arch/arm/mach-orion5x/tsx09-common.c b/arch/arm/mach-orion5x/tsx09-common.c<br/>index 83feac3147a6..c9abb8fbfa70 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-orion5x/tsx09-common.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-orion5x/tsx09-common.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-orion5x/tsx09-common.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-orion5x/tsx09-common.c</a></div><div class='hunk'>@@ -16,6 +16,7 @@</div><div class='ctx'> #include &lt;linux/timex.h&gt;</div><div class='ctx'> #include &lt;linux/serial_reg.h&gt;</div><div class='ctx'> #include "tsx09-common.h"</div><div class='add'>+#include "common.h"</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************</div><div class='ctx'>  * QNAP TS-x09 specific power off method via UART1-attached PIC</div><div class='hunk'>@@ -26,7 +27,7 @@</div><div class='ctx'> void qnap_tsx09_power_off(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* 19200 baud divisor */</div><div class='del'>-	const unsigned divisor = ((ORION5X_TCLK + (8 * 19200)) / (16 * 19200));</div><div class='add'>+	const unsigned divisor = ((orion5x_tclk + (8 * 19200)) / (16 * 19200));</div><div class='ctx'> </div><div class='ctx'> 	pr_info("%s: triggering power-off...\n", __func__);</div><div class='ctx'> </div><div class='hunk'>@@ -48,7 +49,7 @@ void qnap_tsx09_power_off(void)</div><div class='ctx'>  ****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> struct mv643xx_eth_platform_data qnap_tsx09_eth_data = {</div><div class='del'>-	.phy_addr	= 8,</div><div class='add'>+	.phy_addr	= MV643XX_ETH_PHY_ADDR(8),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init qnap_tsx09_parse_hex_nibble(char n)</div><div class='head'>diff --git a/arch/arm/mach-orion5x/wnr854t-setup.c b/arch/arm/mach-orion5x/wnr854t-setup.c<br/>index b6bc43e07eed..7ddc22c2bb54 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-orion5x/wnr854t-setup.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-orion5x/wnr854t-setup.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-orion5x/wnr854t-setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-orion5x/wnr854t-setup.c</a></div><div class='hunk'>@@ -92,7 +92,7 @@ static struct platform_device wnr854t_nor_flash = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct mv643xx_eth_platform_data wnr854t_eth_data = {</div><div class='del'>-	.phy_addr	= -1,</div><div class='add'>+	.phy_addr	= MV643XX_ETH_PHY_NONE,</div><div class='ctx'> 	.speed		= SPEED_1000,</div><div class='ctx'> 	.duplex		= DUPLEX_FULL,</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/mach-orion5x/wrt350n-v2-setup.c b/arch/arm/mach-orion5x/wrt350n-v2-setup.c<br/>index b10da17b3fbd..9a4fd5256462 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-orion5x/wrt350n-v2-setup.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-orion5x/wrt350n-v2-setup.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-orion5x/wrt350n-v2-setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-orion5x/wrt350n-v2-setup.c</a></div><div class='hunk'>@@ -100,7 +100,7 @@ static struct platform_device wrt350n_v2_nor_flash = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct mv643xx_eth_platform_data wrt350n_v2_eth_data = {</div><div class='del'>-	.phy_addr	= -1,</div><div class='add'>+	.phy_addr	= MV643XX_ETH_PHY_NONE,</div><div class='ctx'> 	.speed		= SPEED_1000,</div><div class='ctx'> 	.duplex		= DUPLEX_FULL,</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/mach-pnx4008/clock.c b/arch/arm/mach-pnx4008/clock.c<br/>index 24d036a24a72..898c0e88acbc 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pnx4008/clock.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pnx4008/clock.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pnx4008/clock.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pnx4008/clock.c</a></div><div class='hunk'>@@ -20,9 +20,9 @@</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/clock.h&gt;</div><div class='ctx'> #include "clock.h"</div><div class='head'>diff --git a/arch/arm/mach-pnx4008/core.c b/arch/arm/mach-pnx4008/core.c<br/>index 3ba46ede9bbd..45734bb880a8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pnx4008/core.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pnx4008/core.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pnx4008/core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pnx4008/core.c</a></div><div class='hunk'>@@ -25,9 +25,9 @@</div><div class='ctx'> #include &lt;linux/serial_8250.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/spi/spi.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-pnx4008/dma.c b/arch/arm/mach-pnx4008/dma.c<br/>index 833c56be7344..ac2f70eddb9e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pnx4008/dma.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pnx4008/dma.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pnx4008/dma.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pnx4008/dma.c</a></div><div class='hunk'>@@ -21,12 +21,12 @@</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='ctx'> #include &lt;asm/dma-mapping.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/mach/dma.h&gt;</div><div class='ctx'> #include &lt;mach/clock.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-pnx4008/gpio.c b/arch/arm/mach-pnx4008/gpio.c<br/>index fb51f7279e95..015cc21d5f55 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pnx4008/gpio.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pnx4008/gpio.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pnx4008/gpio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pnx4008/gpio.c</a></div><div class='hunk'>@@ -17,7 +17,7 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;mach/platform.h&gt;</div><div class='ctx'> #include &lt;mach/gpio.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-pnx4008/include/mach/system.h b/arch/arm/mach-pnx4008/include/mach/system.h<br/>index 8985a4622b8c..e12e7abfcbcf 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pnx4008/include/mach/system.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pnx4008/include/mach/system.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pnx4008/include/mach/system.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pnx4008/include/mach/system.h</a></div><div class='hunk'>@@ -21,8 +21,8 @@</div><div class='ctx'> #ifndef __ASM_ARCH_SYSTEM_H</div><div class='ctx'> #define __ASM_ARCH_SYSTEM_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;mach/platform.h&gt;</div><div class='ctx'> </div><div class='ctx'> static void arch_idle(void)</div><div class='head'>diff --git a/arch/arm/mach-pnx4008/include/mach/timex.h b/arch/arm/mach-pnx4008/include/mach/timex.h<br/>index 956fbd8e977c..5ff0196c0f16 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pnx4008/include/mach/timex.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pnx4008/include/mach/timex.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pnx4008/include/mach/timex.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pnx4008/include/mach/timex.h</a></div><div class='hunk'>@@ -14,8 +14,8 @@</div><div class='ctx'> #ifndef __PNX4008_TIMEX_H</div><div class='ctx'> #define __PNX4008_TIMEX_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define CLOCK_TICK_RATE		1000000</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-pnx4008/irq.c b/arch/arm/mach-pnx4008/irq.c<br/>index 5c4f55af5d4b..a9ce02b4bf17 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pnx4008/irq.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pnx4008/irq.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pnx4008/irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pnx4008/irq.c</a></div><div class='hunk'>@@ -23,8 +23,8 @@</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-pnx4008/pm.c b/arch/arm/mach-pnx4008/pm.c<br/>index f970906d8848..b3d8d53e32ef 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pnx4008/pm.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pnx4008/pm.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pnx4008/pm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pnx4008/pm.c</a></div><div class='hunk'>@@ -18,8 +18,8 @@</div><div class='ctx'> #include &lt;linux/suspend.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #include &lt;mach/pm.h&gt;</div><div class='ctx'> #include &lt;mach/clock.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-pnx4008/serial.c b/arch/arm/mach-pnx4008/serial.c<br/>index 9be84bbb30e8..f40961e51914 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pnx4008/serial.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pnx4008/serial.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pnx4008/serial.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pnx4008/serial.c</a></div><div class='hunk'>@@ -12,8 +12,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/platform.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-pnx4008/time.c b/arch/arm/mach-pnx4008/time.c<br/>index 180975244f96..fc0ba183fe12 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pnx4008/time.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pnx4008/time.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pnx4008/time.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pnx4008/time.c</a></div><div class='hunk'>@@ -22,10 +22,10 @@</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='ctx'> #include &lt;linux/timex.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/leds.h&gt;</div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='ctx'> #include &lt;asm/errno.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig<br/>index e8ee7ec9ff6d..f27f6b3d6e6f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pxa/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/Kconfig</a></div><div class='hunk'>@@ -38,16 +38,23 @@ config ARCH_LUBBOCK</div><div class='ctx'> 	bool "Intel DBPXA250 Development Platform"</div><div class='ctx'> 	select PXA25x</div><div class='ctx'> 	select SA1111</div><div class='add'>+	select PXA_HAVE_BOARD_IRQS</div><div class='ctx'> </div><div class='ctx'> config MACH_LOGICPD_PXA270</div><div class='ctx'> 	bool "LogicPD PXA270 Card Engine Development Platform"</div><div class='ctx'> 	select PXA27x</div><div class='ctx'> 	select HAVE_PWM</div><div class='add'>+	select PXA_HAVE_BOARD_IRQS</div><div class='ctx'> </div><div class='ctx'> config MACH_MAINSTONE</div><div class='ctx'> 	bool "Intel HCDDBBVA0 Development Platform"</div><div class='ctx'> 	select PXA27x</div><div class='ctx'> 	select HAVE_PWM</div><div class='add'>+	select PXA_HAVE_BOARD_IRQS</div><div class='add'>+</div><div class='add'>+config MACH_MP900C</div><div class='add'>+	bool "Nec Mobilepro 900/c"</div><div class='add'>+	select PXA25x</div><div class='ctx'> </div><div class='ctx'> config ARCH_PXA_IDP</div><div class='ctx'> 	bool "Accelent Xscale IDP"</div><div class='hunk'>@@ -114,10 +121,21 @@ config MACH_TOSA</div><div class='ctx'> 	bool "Enable Sharp SL-6000x (Tosa) Support"</div><div class='ctx'> 	depends on PXA_SHARPSL</div><div class='ctx'> 	select PXA25x</div><div class='add'>+	select PXA_HAVE_BOARD_IRQS</div><div class='add'>+</div><div class='add'>+config ARCH_VIPER</div><div class='add'>+	bool "Arcom/Eurotech VIPER SBC"</div><div class='add'>+	select PXA25x</div><div class='add'>+	select ISA</div><div class='add'>+	select I2C_GPIO</div><div class='add'>+	select HAVE_PWM</div><div class='add'>+	select PXA_HAVE_BOARD_IRQS</div><div class='add'>+	select PXA_HAVE_ISA_IRQS</div><div class='ctx'> </div><div class='ctx'> config ARCH_PXA_ESERIES</div><div class='ctx'> 	bool "PXA based Toshiba e-series PDAs"</div><div class='ctx'> 	select PXA25x</div><div class='add'>+	select PXA_HAVE_BOARD_IRQS</div><div class='ctx'> </div><div class='ctx'> config MACH_E330</div><div class='ctx'> 	bool "Toshiba e330"</div><div class='hunk'>@@ -170,13 +188,41 @@ config MACH_E800</div><div class='ctx'> 	  Say Y here if you intend to run this kernel on a Toshiba</div><div class='ctx'> 	  e800 family PDA.</div><div class='ctx'> </div><div class='add'>+config TRIZEPS_PXA</div><div class='add'>+	bool "PXA based Keith und Koep Trizeps DIMM-Modules"</div><div class='add'>+</div><div class='ctx'> config MACH_TRIZEPS4</div><div class='ctx'> 	bool "Keith und Koep Trizeps4 DIMM-Module"</div><div class='add'>+	depends on TRIZEPS_PXA</div><div class='add'>+	select TRIZEPS_PCMCIA</div><div class='ctx'> 	select PXA27x</div><div class='ctx'> </div><div class='del'>-config MACH_TRIZEPS4_CONXS</div><div class='add'>+config MACH_TRIZEPS4WL</div><div class='add'>+	bool "Keith und Koep Trizeps4-WL DIMM-Module"</div><div class='add'>+	depends on TRIZEPS_PXA</div><div class='add'>+	select TRIZEPS_PCMCIA</div><div class='add'>+	select PXA27x</div><div class='add'>+	select PXA_SSP</div><div class='add'>+</div><div class='add'>+choice</div><div class='add'>+	prompt "Select base board for Trizeps module"</div><div class='add'>+	depends on TRIZEPS_PXA</div><div class='add'>+</div><div class='add'>+config MACH_TRIZEPS_CONXS</div><div class='ctx'> 	bool "ConXS Eval Board"</div><div class='del'>-	depends on MACH_TRIZEPS4</div><div class='add'>+</div><div class='add'>+config MACH_TRIZEPS_UCONXS</div><div class='add'>+	bool "uConXS Eval Board"</div><div class='add'>+</div><div class='add'>+config MACH_TRIZEPS_ANY</div><div class='add'>+	bool "another Board"</div><div class='add'>+</div><div class='add'>+endchoice</div><div class='add'>+</div><div class='add'>+config TRIZEPS_PCMCIA</div><div class='add'>+	bool</div><div class='add'>+	help</div><div class='add'>+	  Enable PCMCIA support for Trizeps modules</div><div class='ctx'> </div><div class='ctx'> config MACH_EM_X270</div><div class='ctx'> 	bool "CompuLab EM-x270 platform"</div><div class='hunk'>@@ -189,6 +235,7 @@ config MACH_COLIBRI</div><div class='ctx'> config MACH_ZYLONITE</div><div class='ctx'> 	bool "PXA3xx Development Platform (aka Zylonite)"</div><div class='ctx'> 	select PXA3xx</div><div class='add'>+	select PXA_SSP</div><div class='ctx'> 	select HAVE_PWM</div><div class='ctx'> </div><div class='ctx'> config MACH_LITTLETON</div><div class='hunk'>@@ -207,20 +254,42 @@ config MACH_SAAR</div><div class='ctx'> 	select PXA930</div><div class='ctx'> </div><div class='ctx'> config MACH_ARMCORE</div><div class='del'>-	bool "CompuLab CM-X270 modules"</div><div class='add'>+	bool "CompuLab CM-X255/CM-X270 modules"</div><div class='ctx'> 	select PXA27x</div><div class='ctx'> 	select IWMMXT</div><div class='add'>+	select ZONE_DMA if PCI</div><div class='add'>+	select PXA25x</div><div class='add'>+	select PXA_SSP</div><div class='add'>+</div><div class='add'>+config MACH_CM_X300</div><div class='add'>+	bool "CompuLab CM-X300 modules"</div><div class='add'>+	select PXA3xx</div><div class='add'>+	select CPU_PXA300</div><div class='ctx'> </div><div class='ctx'> config MACH_MAGICIAN</div><div class='ctx'> 	bool "Enable HTC Magician Support"</div><div class='ctx'> 	select PXA27x</div><div class='ctx'> 	select IWMMXT</div><div class='add'>+	select PXA_HAVE_BOARD_IRQS</div><div class='add'>+</div><div class='add'>+config MACH_MIOA701</div><div class='add'>+	bool "Mitac Mio A701 Support"</div><div class='add'>+	select PXA27x</div><div class='add'>+	select IWMMXT</div><div class='add'>+	select LEDS_GPIO</div><div class='add'>+	select HAVE_PWM</div><div class='add'>+	select GPIO_SYSFS</div><div class='add'>+	help</div><div class='add'>+	  Say Y here if you intend to run this kernel on a</div><div class='add'>+	  MIO A701. Currently there is only basic support</div><div class='add'>+	  for this PDA.</div><div class='ctx'> </div><div class='ctx'> config MACH_PCM027</div><div class='ctx'> 	bool "Phytec phyCORE-PXA270 CPU module (PCM-027)"</div><div class='ctx'> 	select PXA27x</div><div class='ctx'> 	select IWMMXT</div><div class='ctx'> 	select PXA_SSP</div><div class='add'>+	select PXA_HAVE_BOARD_IRQS</div><div class='ctx'> </div><div class='ctx'> config ARCH_PXA_PALM</div><div class='ctx'> 	bool "PXA based Palm PDAs"</div><div class='hunk'>@@ -236,6 +305,16 @@ config MACH_PALMTX</div><div class='ctx'> 	  Say Y here if you intend to run this kernel on a Palm T|X</div><div class='ctx'> 	  handheld computer.</div><div class='ctx'> </div><div class='add'>+config MACH_PALMZ72</div><div class='add'>+	bool "Palm Zire 72"</div><div class='add'>+	default y</div><div class='add'>+	depends on ARCH_PXA_PALM</div><div class='add'>+	select PXA27x</div><div class='add'>+	select IWMMXT</div><div class='add'>+	help</div><div class='add'>+	  Say Y here if you intend to run this kernel on Palm Zire 72</div><div class='add'>+	  handheld computer.</div><div class='add'>+</div><div class='ctx'> config MACH_PCM990_BASEBOARD</div><div class='ctx'> 	bool "PHYTEC PCM-990 development board"</div><div class='ctx'> 	select HAVE_PWM</div><div class='hunk'>@@ -256,6 +335,9 @@ config PCM990_DISPLAY_NONE</div><div class='ctx'> </div><div class='ctx'> endchoice</div><div class='ctx'> </div><div class='add'>+config MACH_AM200EPD</div><div class='add'>+	depends on MACH_GUMSTIX_F</div><div class='add'>+	bool "Enable AM200EPD board support"</div><div class='ctx'> </div><div class='ctx'> config PXA_EZX</div><div class='ctx'> 	bool "Motorola EZX Platform"</div><div class='hunk'>@@ -343,4 +425,10 @@ config TOSA_BT</div><div class='ctx'> 	  This is a simple driver that is able to control</div><div class='ctx'> 	  the state of built in bluetooth chip on tosa.</div><div class='ctx'> </div><div class='add'>+config PXA_HAVE_BOARD_IRQS</div><div class='add'>+	bool</div><div class='add'>+</div><div class='add'>+config PXA_HAVE_ISA_IRQS</div><div class='add'>+	bool</div><div class='add'>+</div><div class='ctx'> endif</div><div class='head'>diff --git a/arch/arm/mach-pxa/Makefile b/arch/arm/mach-pxa/Makefile<br/>index 99ecbe7f8506..d31c9979cfa3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pxa/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/Makefile</a></div><div class='hunk'>@@ -6,7 +6,12 @@</div><div class='ctx'> obj-y				+= clock.o devices.o generic.o irq.o dma.o \</div><div class='ctx'> 				   time.o gpio.o reset.o</div><div class='ctx'> obj-$(CONFIG_PM)		+= pm.o sleep.o standby.o</div><div class='del'>-obj-$(CONFIG_CPU_FREQ)		+= cpu-pxa.o</div><div class='add'>+</div><div class='add'>+ifeq ($(CONFIG_CPU_FREQ),y)</div><div class='add'>+obj-$(CONFIG_PXA25x)		+= cpufreq-pxa2xx.o</div><div class='add'>+obj-$(CONFIG_PXA27x)		+= cpufreq-pxa2xx.o</div><div class='add'>+obj-$(CONFIG_PXA3xx)		+= cpufreq-pxa3xx.o</div><div class='add'>+endif</div><div class='ctx'> </div><div class='ctx'> # Generic drivers that other drivers may depend upon</div><div class='ctx'> obj-$(CONFIG_PXA_SSP)		+= ssp.o</div><div class='hunk'>@@ -22,27 +27,33 @@ obj-$(CONFIG_CPU_PXA930)	+= pxa930.o</div><div class='ctx'> </div><div class='ctx'> # Specific board support</div><div class='ctx'> obj-$(CONFIG_ARCH_GUMSTIX)	+= gumstix.o</div><div class='add'>+obj-$(CONFIG_MACH_AM200EPD)	+= am200epd.o</div><div class='ctx'> obj-$(CONFIG_ARCH_LUBBOCK)	+= lubbock.o</div><div class='ctx'> obj-$(CONFIG_MACH_LOGICPD_PXA270) += lpd270.o</div><div class='ctx'> obj-$(CONFIG_MACH_MAINSTONE)	+= mainstone.o</div><div class='add'>+obj-$(CONFIG_MACH_MP900C)	+= mp900.o</div><div class='ctx'> obj-$(CONFIG_ARCH_PXA_IDP)	+= idp.o</div><div class='ctx'> obj-$(CONFIG_MACH_TRIZEPS4)	+= trizeps4.o</div><div class='ctx'> obj-$(CONFIG_MACH_COLIBRI)	+= colibri.o</div><div class='del'>-obj-$(CONFIG_PXA_SHARP_C7xx)	+= corgi.o corgi_ssp.o corgi_lcd.o sharpsl_pm.o corgi_pm.o</div><div class='del'>-obj-$(CONFIG_PXA_SHARP_Cxx00)	+= spitz.o corgi_ssp.o corgi_lcd.o sharpsl_pm.o spitz_pm.o</div><div class='del'>-obj-$(CONFIG_MACH_AKITA)	+= akita-ioexp.o</div><div class='del'>-obj-$(CONFIG_MACH_POODLE)	+= poodle.o corgi_ssp.o</div><div class='add'>+obj-$(CONFIG_PXA_SHARP_C7xx)	+= corgi.o sharpsl_pm.o corgi_pm.o</div><div class='add'>+obj-$(CONFIG_PXA_SHARP_Cxx00)	+= spitz.o sharpsl_pm.o spitz_pm.o</div><div class='add'>+obj-$(CONFIG_MACH_POODLE)	+= poodle.o</div><div class='ctx'> obj-$(CONFIG_MACH_PCM027)	+= pcm027.o</div><div class='ctx'> obj-$(CONFIG_MACH_PCM990_BASEBOARD)	+= pcm990-baseboard.o</div><div class='ctx'> obj-$(CONFIG_MACH_TOSA)		+= tosa.o</div><div class='ctx'> obj-$(CONFIG_MACH_EM_X270)	+= em-x270.o</div><div class='ctx'> obj-$(CONFIG_MACH_MAGICIAN)	+= magician.o</div><div class='del'>-obj-$(CONFIG_ARCH_PXA_ESERIES)	+= eseries.o eseries_udc.o</div><div class='del'>-obj-$(CONFIG_MACH_E740)		+= e740_lcd.o</div><div class='del'>-obj-$(CONFIG_MACH_E750)		+= e750_lcd.o</div><div class='del'>-obj-$(CONFIG_MACH_E400)		+= e400_lcd.o</div><div class='del'>-obj-$(CONFIG_MACH_E800)		+= e800_lcd.o</div><div class='add'>+obj-$(CONFIG_MACH_MIOA701)	+= mioa701.o mioa701_bootresume.o</div><div class='add'>+obj-$(CONFIG_ARCH_PXA_ESERIES)	+= eseries.o</div><div class='add'>+obj-$(CONFIG_MACH_E330)		+= e330.o</div><div class='add'>+obj-$(CONFIG_MACH_E350)		+= e350.o</div><div class='add'>+obj-$(CONFIG_MACH_E740)		+= e740.o</div><div class='add'>+obj-$(CONFIG_MACH_E750)		+= e750.o</div><div class='add'>+obj-$(CONFIG_MACH_E400)		+= e400.o</div><div class='add'>+obj-$(CONFIG_MACH_E800)		+= e800.o</div><div class='ctx'> obj-$(CONFIG_MACH_PALMTX)	+= palmtx.o</div><div class='add'>+obj-$(CONFIG_MACH_PALMZ72)	+= palmz72.o</div><div class='add'>+obj-$(CONFIG_ARCH_VIPER)	+= viper.o</div><div class='ctx'> </div><div class='ctx'> ifeq ($(CONFIG_MACH_ZYLONITE),y)</div><div class='ctx'>   obj-y				+= zylonite.o</div><div class='hunk'>@@ -53,7 +64,8 @@ obj-$(CONFIG_MACH_LITTLETON)	+= littleton.o</div><div class='ctx'> obj-$(CONFIG_MACH_TAVOREVB)	+= tavorevb.o</div><div class='ctx'> obj-$(CONFIG_MACH_SAAR)		+= saar.o</div><div class='ctx'> </div><div class='del'>-obj-$(CONFIG_MACH_ARMCORE)      += cm-x270.o</div><div class='add'>+obj-$(CONFIG_MACH_ARMCORE)      += cm-x2xx.o cm-x255.o cm-x270.o</div><div class='add'>+obj-$(CONFIG_MACH_CM_X300)      += cm-x300.o</div><div class='ctx'> obj-$(CONFIG_PXA_EZX)           += ezx.o</div><div class='ctx'> </div><div class='ctx'> # Support for blinky lights</div><div class='hunk'>@@ -61,12 +73,11 @@ led-y := leds.o</div><div class='ctx'> led-$(CONFIG_ARCH_LUBBOCK)	+= leds-lubbock.o</div><div class='ctx'> led-$(CONFIG_MACH_MAINSTONE)	+= leds-mainstone.o</div><div class='ctx'> led-$(CONFIG_ARCH_PXA_IDP)	+= leds-idp.o</div><div class='del'>-led-$(CONFIG_MACH_TRIZEPS4)	+= leds-trizeps4.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_LEDS)		+= $(led-y)</div><div class='ctx'> </div><div class='ctx'> ifeq ($(CONFIG_PCI),y)</div><div class='del'>-obj-$(CONFIG_MACH_ARMCORE) += cm-x270-pci.o</div><div class='add'>+obj-$(CONFIG_MACH_ARMCORE) += cm-x2xx-pci.o</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_TOSA_BT)		+= tosa-bt.o</div><div class='head'>diff --git a/arch/arm/mach-pxa/akita-ioexp.c b/arch/arm/mach-pxa/akita-ioexp.c<br/>deleted file mode 100644<br/>index 5c67b188a3ba..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/akita-ioexp.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pxa/akita-ioexp.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,222 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Support for the Extra GPIOs on the Sharp SL-C1000 (Akita)</div><div class='del'>- * (uses a Maxim MAX7310 8 Port IO Expander)</div><div class='del'>- *</div><div class='del'>- * Copyright 2005 Openedhand Ltd.</div><div class='del'>- *</div><div class='del'>- * Author: Richard Purdie &lt;richard@openedhand.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/i2c.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/workqueue.h&gt;</div><div class='del'>-#include &lt;mach/akita.h&gt;</div><div class='del'>-</div><div class='del'>-/* MAX7310 Regiser Map */</div><div class='del'>-#define MAX7310_INPUT    0x00</div><div class='del'>-#define MAX7310_OUTPUT   0x01</div><div class='del'>-#define MAX7310_POLINV   0x02</div><div class='del'>-#define MAX7310_IODIR    0x03 /* 1 = Input, 0 = Output */</div><div class='del'>-#define MAX7310_TIMEOUT  0x04</div><div class='del'>-</div><div class='del'>-/* Addresses to scan */</div><div class='del'>-static const unsigned short normal_i2c[] = { 0x18, I2C_CLIENT_END };</div><div class='del'>-</div><div class='del'>-/* I2C Magic */</div><div class='del'>-I2C_CLIENT_INSMOD;</div><div class='del'>-</div><div class='del'>-static int max7310_write(struct i2c_client *client, int address, int data);</div><div class='del'>-static struct i2c_client max7310_template;</div><div class='del'>-static void akita_ioexp_work(struct work_struct *private_);</div><div class='del'>-</div><div class='del'>-static struct device *akita_ioexp_device;</div><div class='del'>-static unsigned char ioexp_output_value = AKITA_IOEXP_IO_OUT;</div><div class='del'>-DECLARE_WORK(akita_ioexp, akita_ioexp_work);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * MAX7310 Access</div><div class='del'>- */</div><div class='del'>-static int max7310_config(struct device *dev, int iomode, int polarity)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	struct i2c_client *client = to_i2c_client(dev);</div><div class='del'>-</div><div class='del'>-	ret = max7310_write(client, MAX7310_POLINV, polarity);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-	ret = max7310_write(client, MAX7310_IODIR, iomode);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int max7310_set_ouputs(struct device *dev, int outputs)</div><div class='del'>-{</div><div class='del'>-	struct i2c_client *client = to_i2c_client(dev);</div><div class='del'>-</div><div class='del'>-	return max7310_write(client, MAX7310_OUTPUT, outputs);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * I2C Functions</div><div class='del'>- */</div><div class='del'>-static int max7310_write(struct i2c_client *client, int address, int value)</div><div class='del'>-{</div><div class='del'>-	u8 data[2];</div><div class='del'>-</div><div class='del'>-	data[0] = address &amp; 0xff;</div><div class='del'>-	data[1] = value &amp; 0xff;</div><div class='del'>-</div><div class='del'>-	if (i2c_master_send(client, data, 2) == 2)</div><div class='del'>-		return 0;</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int max7310_detect(struct i2c_adapter *adapter, int address, int kind)</div><div class='del'>-{</div><div class='del'>-	struct i2c_client *new_client;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (!(new_client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL)))</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	max7310_template.adapter = adapter;</div><div class='del'>-	max7310_template.addr = address;</div><div class='del'>-</div><div class='del'>-	memcpy(new_client, &amp;max7310_template, sizeof(struct i2c_client));</div><div class='del'>-</div><div class='del'>-	if ((err = i2c_attach_client(new_client))) {</div><div class='del'>-		kfree(new_client);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	max7310_config(&amp;new_client-&gt;dev, AKITA_IOEXP_IO_DIR, 0);</div><div class='del'>-	akita_ioexp_device = &amp;new_client-&gt;dev;</div><div class='del'>-	schedule_work(&amp;akita_ioexp);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int max7310_attach_adapter(struct i2c_adapter *adapter)</div><div class='del'>-{</div><div class='del'>-	return i2c_probe(adapter, &amp;addr_data, max7310_detect);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int max7310_detach_client(struct i2c_client *client)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	akita_ioexp_device = NULL;</div><div class='del'>-</div><div class='del'>-	if ((err = i2c_detach_client(client)))</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	kfree(client);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct i2c_driver max7310_i2c_driver = {</div><div class='del'>-	.driver = {</div><div class='del'>-		.name	= "akita-max7310",</div><div class='del'>-	},</div><div class='del'>-	.id		= I2C_DRIVERID_AKITAIOEXP,</div><div class='del'>-	.attach_adapter	= max7310_attach_adapter,</div><div class='del'>-	.detach_client	= max7310_detach_client,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct i2c_client max7310_template = {</div><div class='del'>-	name:   "akita-max7310",</div><div class='del'>-	driver: &amp;max7310_i2c_driver,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void akita_set_ioexp(struct device *dev, unsigned char bit)</div><div class='del'>-{</div><div class='del'>-	ioexp_output_value |= bit;</div><div class='del'>-</div><div class='del'>-	if (akita_ioexp_device)</div><div class='del'>-		schedule_work(&amp;akita_ioexp);</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void akita_reset_ioexp(struct device *dev, unsigned char bit)</div><div class='del'>-{</div><div class='del'>-	ioexp_output_value &amp;= ~bit;</div><div class='del'>-</div><div class='del'>-	if (akita_ioexp_device)</div><div class='del'>-		schedule_work(&amp;akita_ioexp);</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(akita_set_ioexp);</div><div class='del'>-EXPORT_SYMBOL(akita_reset_ioexp);</div><div class='del'>-</div><div class='del'>-static void akita_ioexp_work(struct work_struct *private_)</div><div class='del'>-{</div><div class='del'>-	if (akita_ioexp_device)</div><div class='del'>-		max7310_set_ouputs(akita_ioexp_device, ioexp_output_value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-static int akita_ioexp_suspend(struct platform_device *pdev, pm_message_t state)</div><div class='del'>-{</div><div class='del'>-	flush_scheduled_work();</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int akita_ioexp_resume(struct platform_device *pdev)</div><div class='del'>-{</div><div class='del'>-	schedule_work(&amp;akita_ioexp);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-#define akita_ioexp_suspend NULL</div><div class='del'>-#define akita_ioexp_resume NULL</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static int __init akita_ioexp_probe(struct platform_device *pdev)</div><div class='del'>-{</div><div class='del'>-	return i2c_add_driver(&amp;max7310_i2c_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int akita_ioexp_remove(struct platform_device *pdev)</div><div class='del'>-{</div><div class='del'>-	i2c_del_driver(&amp;max7310_i2c_driver);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct platform_driver akita_ioexp_driver = {</div><div class='del'>-	.probe		= akita_ioexp_probe,</div><div class='del'>-	.remove		= akita_ioexp_remove,</div><div class='del'>-	.suspend	= akita_ioexp_suspend,</div><div class='del'>-	.resume		= akita_ioexp_resume,</div><div class='del'>-	.driver		= {</div><div class='del'>-		.name	= "akita-ioexp",</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init akita_ioexp_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;akita_ioexp_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit akita_ioexp_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;akita_ioexp_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-MODULE_AUTHOR("Richard Purdie &lt;rpurdie@openedhand.com&gt;");</div><div class='del'>-MODULE_DESCRIPTION("Akita IO-Expander driver");</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-</div><div class='del'>-fs_initcall(akita_ioexp_init);</div><div class='del'>-module_exit(akita_ioexp_exit);</div><div class='del'>-</div><div class='head'>diff --git a/arch/arm/mach-pxa/am200epd.c b/arch/arm/mach-pxa/am200epd.c<br/>new file mode 100644<br/>index 000000000000..b965085a37b9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/am200epd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/am200epd.c</a></div><div class='hunk'>@@ -0,0 +1,374 @@</div><div class='add'>+/*</div><div class='add'>+ * am200epd.c -- Platform device for AM200 EPD kit</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2008, Jaya Kumar</div><div class='add'>+ *</div><div class='add'>+ * This file is subject to the terms and conditions of the GNU General Public</div><div class='add'>+ * License. See the file COPYING in the main directory of this archive for</div><div class='add'>+ * more details.</div><div class='add'>+ *</div><div class='add'>+ * Layout is based on skeletonfb.c by James Simmons and Geert Uytterhoeven.</div><div class='add'>+ *</div><div class='add'>+ * This work was made possible by help and equipment support from E-Ink</div><div class='add'>+ * Corporation. http://support.eink.com/community</div><div class='add'>+ *</div><div class='add'>+ * This driver is written to be used with the Metronome display controller.</div><div class='add'>+ * on the AM200 EPD prototype kit/development kit with an E-Ink 800x600</div><div class='add'>+ * Vizplex EPD on a Gumstix board using the Lyre interface board.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/fb.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='add'>+#include &lt;linux/gpio.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;mach/pxafb.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;video/metronomefb.h&gt;</div><div class='add'>+</div><div class='add'>+static unsigned int panel_type = 6;</div><div class='add'>+static struct platform_device *am200_device;</div><div class='add'>+static struct metronome_board am200_board;</div><div class='add'>+</div><div class='add'>+static struct pxafb_mode_info am200_fb_mode_9inch7 = {</div><div class='add'>+	.pixclock	= 40000,</div><div class='add'>+	.xres		= 1200,</div><div class='add'>+	.yres		= 842,</div><div class='add'>+	.bpp		= 16,</div><div class='add'>+	.hsync_len	= 2,</div><div class='add'>+	.left_margin	= 2,</div><div class='add'>+	.right_margin	= 2,</div><div class='add'>+	.vsync_len	= 1,</div><div class='add'>+	.upper_margin	= 2,</div><div class='add'>+	.lower_margin	= 25,</div><div class='add'>+	.sync		= FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct pxafb_mode_info am200_fb_mode_8inch = {</div><div class='add'>+	.pixclock	= 40000,</div><div class='add'>+	.xres		= 1088,</div><div class='add'>+	.yres		= 791,</div><div class='add'>+	.bpp		= 16,</div><div class='add'>+	.hsync_len	= 28,</div><div class='add'>+	.left_margin	= 8,</div><div class='add'>+	.right_margin	= 30,</div><div class='add'>+	.vsync_len	= 8,</div><div class='add'>+	.upper_margin	= 10,</div><div class='add'>+	.lower_margin	= 8,</div><div class='add'>+	.sync		= FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct pxafb_mode_info am200_fb_mode_6inch = {</div><div class='add'>+	.pixclock	= 40189,</div><div class='add'>+	.xres		= 832,</div><div class='add'>+	.yres		= 622,</div><div class='add'>+	.bpp		= 16,</div><div class='add'>+	.hsync_len	= 28,</div><div class='add'>+	.left_margin	= 34,</div><div class='add'>+	.right_margin	= 34,</div><div class='add'>+	.vsync_len	= 25,</div><div class='add'>+	.upper_margin	= 0,</div><div class='add'>+	.lower_margin	= 2,</div><div class='add'>+	.sync		= FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct pxafb_mach_info am200_fb_info = {</div><div class='add'>+	.modes		= &amp;am200_fb_mode_6inch,</div><div class='add'>+	.num_modes	= 1,</div><div class='add'>+	.lcd_conn	= LCD_TYPE_COLOR_TFT | LCD_PCLK_EDGE_FALL |</div><div class='add'>+			  LCD_AC_BIAS_FREQ(24),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* register offsets for gpio control */</div><div class='add'>+#define LED_GPIO_PIN 51</div><div class='add'>+#define STDBY_GPIO_PIN 48</div><div class='add'>+#define RST_GPIO_PIN 49</div><div class='add'>+#define RDY_GPIO_PIN 32</div><div class='add'>+#define ERR_GPIO_PIN 17</div><div class='add'>+#define PCBPWR_GPIO_PIN 16</div><div class='add'>+static int gpios[] = { LED_GPIO_PIN , STDBY_GPIO_PIN , RST_GPIO_PIN,</div><div class='add'>+			RDY_GPIO_PIN, ERR_GPIO_PIN, PCBPWR_GPIO_PIN };</div><div class='add'>+static char *gpio_names[] = { "LED" , "STDBY" , "RST", "RDY", "ERR", "PCBPWR" };</div><div class='add'>+</div><div class='add'>+static int am200_init_gpio_regs(struct metronomefb_par *par)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(gpios); i++) {</div><div class='add'>+		err = gpio_request(gpios[i], gpio_names[i]);</div><div class='add'>+		if (err) {</div><div class='add'>+			dev_err(&amp;am200_device-&gt;dev, "failed requesting "</div><div class='add'>+				"gpio %s, err=%d\n", gpio_names[i], err);</div><div class='add'>+			goto err_req_gpio;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	gpio_direction_output(LED_GPIO_PIN, 0);</div><div class='add'>+	gpio_direction_output(STDBY_GPIO_PIN, 0);</div><div class='add'>+	gpio_direction_output(RST_GPIO_PIN, 0);</div><div class='add'>+</div><div class='add'>+	gpio_direction_input(RDY_GPIO_PIN);</div><div class='add'>+	gpio_direction_input(ERR_GPIO_PIN);</div><div class='add'>+</div><div class='add'>+	gpio_direction_output(PCBPWR_GPIO_PIN, 0);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_req_gpio:</div><div class='add'>+	while (i &gt; 0)</div><div class='add'>+		gpio_free(gpios[i--]);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void am200_cleanup(struct metronomefb_par *par)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	free_irq(IRQ_GPIO(RDY_GPIO_PIN), par);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(gpios); i++)</div><div class='add'>+		gpio_free(gpios[i]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int am200_share_video_mem(struct fb_info *info)</div><div class='add'>+{</div><div class='add'>+	/* rough check if this is our desired fb and not something else */</div><div class='add'>+	if ((info-&gt;var.xres != am200_fb_info.modes-&gt;xres)</div><div class='add'>+		|| (info-&gt;var.yres != am200_fb_info.modes-&gt;yres))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* we've now been notified that we have our new fb */</div><div class='add'>+	am200_board.metromem = info-&gt;screen_base;</div><div class='add'>+	am200_board.host_fbinfo = info;</div><div class='add'>+</div><div class='add'>+	/* try to refcount host drv since we are the consumer after this */</div><div class='add'>+	if (!try_module_get(info-&gt;fbops-&gt;owner))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int am200_unshare_video_mem(struct fb_info *info)</div><div class='add'>+{</div><div class='add'>+	dev_dbg(&amp;am200_device-&gt;dev, "ENTER %s\n", __func__);</div><div class='add'>+</div><div class='add'>+	if (info != am200_board.host_fbinfo)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	module_put(am200_board.host_fbinfo-&gt;fbops-&gt;owner);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int am200_fb_notifier_callback(struct notifier_block *self,</div><div class='add'>+				 unsigned long event, void *data)</div><div class='add'>+{</div><div class='add'>+	struct fb_event *evdata = data;</div><div class='add'>+	struct fb_info *info = evdata-&gt;info;</div><div class='add'>+</div><div class='add'>+	dev_dbg(&amp;am200_device-&gt;dev, "ENTER %s\n", __func__);</div><div class='add'>+</div><div class='add'>+	if (event == FB_EVENT_FB_REGISTERED)</div><div class='add'>+		return am200_share_video_mem(info);</div><div class='add'>+	else if (event == FB_EVENT_FB_UNREGISTERED)</div><div class='add'>+		return am200_unshare_video_mem(info);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct notifier_block am200_fb_notif = {</div><div class='add'>+	.notifier_call = am200_fb_notifier_callback,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* this gets called as part of our init. these steps must be done now so</div><div class='add'>+ * that we can use set_pxa_fb_info */</div><div class='add'>+static void __init am200_presetup_fb(void)</div><div class='add'>+{</div><div class='add'>+	int fw;</div><div class='add'>+	int fh;</div><div class='add'>+	int padding_size;</div><div class='add'>+	int totalsize;</div><div class='add'>+</div><div class='add'>+	switch (panel_type) {</div><div class='add'>+	case 6:</div><div class='add'>+		am200_fb_info.modes = &amp;am200_fb_mode_6inch;</div><div class='add'>+		break;</div><div class='add'>+	case 8:</div><div class='add'>+		am200_fb_info.modes = &amp;am200_fb_mode_8inch;</div><div class='add'>+		break;</div><div class='add'>+	case 97:</div><div class='add'>+		am200_fb_info.modes = &amp;am200_fb_mode_9inch7;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dev_err(&amp;am200_device-&gt;dev, "invalid panel_type selection,"</div><div class='add'>+						" setting to 6\n");</div><div class='add'>+		am200_fb_info.modes = &amp;am200_fb_mode_6inch;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* the frame buffer is divided as follows:</div><div class='add'>+	command | CRC | padding</div><div class='add'>+	16kb waveform data | CRC | padding</div><div class='add'>+	image data | CRC</div><div class='add'>+	*/</div><div class='add'>+</div><div class='add'>+	fw = am200_fb_info.modes-&gt;xres;</div><div class='add'>+	fh = am200_fb_info.modes-&gt;yres;</div><div class='add'>+</div><div class='add'>+	/* waveform must be 16k + 2 for checksum */</div><div class='add'>+	am200_board.wfm_size = roundup(16*1024 + 2, fw);</div><div class='add'>+</div><div class='add'>+	padding_size = PAGE_SIZE + (4 * fw);</div><div class='add'>+</div><div class='add'>+	/* total is 1 cmd , 1 wfm, padding and image */</div><div class='add'>+	totalsize = fw + am200_board.wfm_size + padding_size + (fw*fh);</div><div class='add'>+</div><div class='add'>+	/* save this off because we're manipulating fw after this and</div><div class='add'>+	 * we'll need it when we're ready to setup the framebuffer */</div><div class='add'>+	am200_board.fw = fw;</div><div class='add'>+	am200_board.fh = fh;</div><div class='add'>+</div><div class='add'>+	/* the reason we do this adjustment is because we want to acquire</div><div class='add'>+	 * more framebuffer memory without imposing custom awareness on the</div><div class='add'>+	 * underlying pxafb driver */</div><div class='add'>+	am200_fb_info.modes-&gt;yres = DIV_ROUND_UP(totalsize, fw);</div><div class='add'>+</div><div class='add'>+	/* we divide since we told the LCD controller we're 16bpp */</div><div class='add'>+	am200_fb_info.modes-&gt;xres /= 2;</div><div class='add'>+</div><div class='add'>+	set_pxa_fb_info(&amp;am200_fb_info);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* this gets called by metronomefb as part of its init, in our case, we</div><div class='add'>+ * have already completed initial framebuffer init in presetup_fb so we</div><div class='add'>+ * can just setup the fb access pointers */</div><div class='add'>+static int am200_setup_fb(struct metronomefb_par *par)</div><div class='add'>+{</div><div class='add'>+	int fw;</div><div class='add'>+	int fh;</div><div class='add'>+</div><div class='add'>+	fw = am200_board.fw;</div><div class='add'>+	fh = am200_board.fh;</div><div class='add'>+</div><div class='add'>+	/* metromem was set up by the notifier in share_video_mem so now</div><div class='add'>+	 * we can use its value to calculate the other entries */</div><div class='add'>+	par-&gt;metromem_cmd = (struct metromem_cmd *) am200_board.metromem;</div><div class='add'>+	par-&gt;metromem_wfm = am200_board.metromem + fw;</div><div class='add'>+	par-&gt;metromem_img = par-&gt;metromem_wfm + am200_board.wfm_size;</div><div class='add'>+	par-&gt;metromem_img_csum = (u16 *) (par-&gt;metromem_img + (fw * fh));</div><div class='add'>+	par-&gt;metromem_dma = am200_board.host_fbinfo-&gt;fix.smem_start;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int am200_get_panel_type(void)</div><div class='add'>+{</div><div class='add'>+	return panel_type;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t am200_handle_irq(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	struct metronomefb_par *par = dev_id;</div><div class='add'>+</div><div class='add'>+	wake_up_interruptible(&amp;par-&gt;waitq);</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int am200_setup_irq(struct fb_info *info)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = request_irq(IRQ_GPIO(RDY_GPIO_PIN), am200_handle_irq,</div><div class='add'>+				IRQF_DISABLED|IRQF_TRIGGER_FALLING,</div><div class='add'>+				"AM200", info-&gt;par);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_err(&amp;am200_device-&gt;dev, "request_irq failed: %d\n", ret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void am200_set_rst(struct metronomefb_par *par, int state)</div><div class='add'>+{</div><div class='add'>+	gpio_set_value(RST_GPIO_PIN, state);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void am200_set_stdby(struct metronomefb_par *par, int state)</div><div class='add'>+{</div><div class='add'>+	gpio_set_value(STDBY_GPIO_PIN, state);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int am200_wait_event(struct metronomefb_par *par)</div><div class='add'>+{</div><div class='add'>+	return wait_event_timeout(par-&gt;waitq, gpio_get_value(RDY_GPIO_PIN), HZ);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int am200_wait_event_intr(struct metronomefb_par *par)</div><div class='add'>+{</div><div class='add'>+	return wait_event_interruptible_timeout(par-&gt;waitq,</div><div class='add'>+					gpio_get_value(RDY_GPIO_PIN), HZ);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct metronome_board am200_board = {</div><div class='add'>+	.owner			= THIS_MODULE,</div><div class='add'>+	.setup_irq		= am200_setup_irq,</div><div class='add'>+	.setup_io		= am200_init_gpio_regs,</div><div class='add'>+	.setup_fb		= am200_setup_fb,</div><div class='add'>+	.set_rst		= am200_set_rst,</div><div class='add'>+	.set_stdby		= am200_set_stdby,</div><div class='add'>+	.met_wait_event		= am200_wait_event,</div><div class='add'>+	.met_wait_event_intr	= am200_wait_event_intr,</div><div class='add'>+	.get_panel_type		= am200_get_panel_type,</div><div class='add'>+	.cleanup		= am200_cleanup,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init am200_init(void)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* before anything else, we request notification for any fb</div><div class='add'>+	 * creation events */</div><div class='add'>+	fb_register_client(&amp;am200_fb_notif);</div><div class='add'>+</div><div class='add'>+	/* request our platform independent driver */</div><div class='add'>+	request_module("metronomefb");</div><div class='add'>+</div><div class='add'>+	am200_device = platform_device_alloc("metronomefb", -1);</div><div class='add'>+	if (!am200_device)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* the am200_board that will be seen by metronomefb is a copy */</div><div class='add'>+	platform_device_add_data(am200_device, &amp;am200_board,</div><div class='add'>+					sizeof(am200_board));</div><div class='add'>+</div><div class='add'>+	/* this _add binds metronomefb to am200. metronomefb refcounts am200 */</div><div class='add'>+	ret = platform_device_add(am200_device);</div><div class='add'>+</div><div class='add'>+	if (ret) {</div><div class='add'>+		platform_device_put(am200_device);</div><div class='add'>+		fb_unregister_client(&amp;am200_fb_notif);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	am200_presetup_fb();</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_param(panel_type, uint, 0);</div><div class='add'>+MODULE_PARM_DESC(panel_type, "Select the panel type: 6, 8, 97");</div><div class='add'>+</div><div class='add'>+module_init(am200_init);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("board driver for am200 metronome epd kit");</div><div class='add'>+MODULE_AUTHOR("Jaya Kumar");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/arch/arm/mach-pxa/cm-x255.c b/arch/arm/mach-pxa/cm-x255.c<br/>new file mode 100644<br/>index 000000000000..83a4cdf08176<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/cm-x255.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/cm-x255.c</a></div><div class='hunk'>@@ -0,0 +1,258 @@</div><div class='add'>+/*</div><div class='add'>+ * linux/arch/arm/mach-pxa/cm-x255.c</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2007, 2008 CompuLab, Ltd.</div><div class='add'>+ * Mike Rapoport &lt;mike@compulab.co.il&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='add'>+#include &lt;linux/gpio.h&gt;</div><div class='add'>+#include &lt;linux/mtd/partitions.h&gt;</div><div class='add'>+#include &lt;linux/mtd/physmap.h&gt;</div><div class='add'>+#include &lt;linux/mtd/nand-gpio.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/spi/spi.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/mach/arch.h&gt;</div><div class='add'>+#include &lt;asm/mach-types.h&gt;</div><div class='add'>+#include &lt;asm/mach/map.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;mach/pxa2xx-regs.h&gt;</div><div class='add'>+#include &lt;mach/mfp-pxa25x.h&gt;</div><div class='add'>+#include &lt;mach/pxa2xx_spi.h&gt;</div><div class='add'>+#include &lt;mach/bitfield.h&gt;</div><div class='add'>+</div><div class='add'>+#include "generic.h"</div><div class='add'>+</div><div class='add'>+#define GPIO_NAND_CS	(5)</div><div class='add'>+#define GPIO_NAND_ALE	(4)</div><div class='add'>+#define GPIO_NAND_CLE	(3)</div><div class='add'>+#define GPIO_NAND_RB	(10)</div><div class='add'>+</div><div class='add'>+static unsigned long cmx255_pin_config[] = {</div><div class='add'>+	/* AC'97 */</div><div class='add'>+	GPIO28_AC97_BITCLK,</div><div class='add'>+	GPIO29_AC97_SDATA_IN_0,</div><div class='add'>+	GPIO30_AC97_SDATA_OUT,</div><div class='add'>+	GPIO31_AC97_SYNC,</div><div class='add'>+</div><div class='add'>+	/* BTUART */</div><div class='add'>+	GPIO42_BTUART_RXD,</div><div class='add'>+	GPIO43_BTUART_TXD,</div><div class='add'>+	GPIO44_BTUART_CTS,</div><div class='add'>+	GPIO45_BTUART_RTS,</div><div class='add'>+</div><div class='add'>+	/* STUART */</div><div class='add'>+	GPIO46_STUART_RXD,</div><div class='add'>+	GPIO47_STUART_TXD,</div><div class='add'>+</div><div class='add'>+	/* LCD */</div><div class='add'>+	GPIO58_LCD_LDD_0,</div><div class='add'>+	GPIO59_LCD_LDD_1,</div><div class='add'>+	GPIO60_LCD_LDD_2,</div><div class='add'>+	GPIO61_LCD_LDD_3,</div><div class='add'>+	GPIO62_LCD_LDD_4,</div><div class='add'>+	GPIO63_LCD_LDD_5,</div><div class='add'>+	GPIO64_LCD_LDD_6,</div><div class='add'>+	GPIO65_LCD_LDD_7,</div><div class='add'>+	GPIO66_LCD_LDD_8,</div><div class='add'>+	GPIO67_LCD_LDD_9,</div><div class='add'>+	GPIO68_LCD_LDD_10,</div><div class='add'>+	GPIO69_LCD_LDD_11,</div><div class='add'>+	GPIO70_LCD_LDD_12,</div><div class='add'>+	GPIO71_LCD_LDD_13,</div><div class='add'>+	GPIO72_LCD_LDD_14,</div><div class='add'>+	GPIO73_LCD_LDD_15,</div><div class='add'>+	GPIO74_LCD_FCLK,</div><div class='add'>+	GPIO75_LCD_LCLK,</div><div class='add'>+	GPIO76_LCD_PCLK,</div><div class='add'>+	GPIO77_LCD_BIAS,</div><div class='add'>+</div><div class='add'>+	/* SSP1 */</div><div class='add'>+	GPIO23_SSP1_SCLK,</div><div class='add'>+	GPIO24_SSP1_SFRM,</div><div class='add'>+	GPIO25_SSP1_TXD,</div><div class='add'>+	GPIO26_SSP1_RXD,</div><div class='add'>+</div><div class='add'>+	/* SSP2 */</div><div class='add'>+	GPIO81_SSP2_CLK_OUT,</div><div class='add'>+	GPIO82_SSP2_FRM_OUT,</div><div class='add'>+	GPIO83_SSP2_TXD,</div><div class='add'>+	GPIO84_SSP2_RXD,</div><div class='add'>+</div><div class='add'>+	/* PC Card */</div><div class='add'>+	GPIO48_nPOE,</div><div class='add'>+	GPIO49_nPWE,</div><div class='add'>+	GPIO50_nPIOR,</div><div class='add'>+	GPIO51_nPIOW,</div><div class='add'>+	GPIO52_nPCE_1,</div><div class='add'>+	GPIO53_nPCE_2,</div><div class='add'>+	GPIO54_nPSKTSEL,</div><div class='add'>+	GPIO55_nPREG,</div><div class='add'>+	GPIO56_nPWAIT,</div><div class='add'>+	GPIO57_nIOIS16,</div><div class='add'>+</div><div class='add'>+	/* SDRAM and local bus */</div><div class='add'>+	GPIO15_nCS_1,</div><div class='add'>+	GPIO78_nCS_2,</div><div class='add'>+	GPIO79_nCS_3,</div><div class='add'>+	GPIO80_nCS_4,</div><div class='add'>+	GPIO33_nCS_5,</div><div class='add'>+	GPIO18_RDY,</div><div class='add'>+</div><div class='add'>+	/* GPIO */</div><div class='add'>+	GPIO0_GPIO	| WAKEUP_ON_EDGE_BOTH,</div><div class='add'>+	GPIO9_GPIO,				/* PC card reset */</div><div class='add'>+</div><div class='add'>+	/* NAND controls */</div><div class='add'>+	GPIO5_GPIO	| MFP_LPM_DRIVE_HIGH,	/* NAND CE# */</div><div class='add'>+	GPIO4_GPIO	| MFP_LPM_DRIVE_LOW,	/* NAND ALE */</div><div class='add'>+	GPIO3_GPIO	| MFP_LPM_DRIVE_LOW,	/* NAND CLE */</div><div class='add'>+	GPIO10_GPIO,				/* NAND Ready/Busy */</div><div class='add'>+</div><div class='add'>+	/* interrupts */</div><div class='add'>+	GPIO22_GPIO,	/* DM9000 interrupt */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_SPI_PXA2XX)</div><div class='add'>+static struct pxa2xx_spi_master pxa_ssp_master_info = {</div><div class='add'>+	.num_chipselect	= 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct spi_board_info spi_board_info[] __initdata = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.modalias	= "rtc-max6902",</div><div class='add'>+		.max_speed_hz	= 1000000,</div><div class='add'>+		.bus_num	= 1,</div><div class='add'>+		.chip_select	= 0,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init cmx255_init_rtc(void)</div><div class='add'>+{</div><div class='add'>+	pxa2xx_set_spi_info(1, &amp;pxa_ssp_master_info);</div><div class='add'>+	spi_register_board_info(ARRAY_AND_SIZE(spi_board_info));</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline void cmx255_init_rtc(void) {}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE)</div><div class='add'>+static struct mtd_partition cmx255_nor_partitions[] = {</div><div class='add'>+	{</div><div class='add'>+		.name		= "ARMmon",</div><div class='add'>+		.size		= 0x00030000,</div><div class='add'>+		.offset		= 0,</div><div class='add'>+		.mask_flags	= MTD_WRITEABLE  /* force read-only */</div><div class='add'>+	} , {</div><div class='add'>+		.name		= "ARMmon setup block",</div><div class='add'>+		.size		= 0x00010000,</div><div class='add'>+		.offset		= MTDPART_OFS_APPEND,</div><div class='add'>+		.mask_flags	= MTD_WRITEABLE  /* force read-only */</div><div class='add'>+	} , {</div><div class='add'>+		.name		= "kernel",</div><div class='add'>+		.size		= 0x00160000,</div><div class='add'>+		.offset		= MTDPART_OFS_APPEND,</div><div class='add'>+	} , {</div><div class='add'>+		.name		= "ramdisk",</div><div class='add'>+		.size		= MTDPART_SIZ_FULL,</div><div class='add'>+		.offset		= MTDPART_OFS_APPEND</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct physmap_flash_data cmx255_nor_flash_data[] = {</div><div class='add'>+	{</div><div class='add'>+		.width		= 2,	/* bankwidth in bytes */</div><div class='add'>+		.parts		= cmx255_nor_partitions,</div><div class='add'>+		.nr_parts	= ARRAY_SIZE(cmx255_nor_partitions)</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource cmx255_nor_resource = {</div><div class='add'>+	.start	= PXA_CS0_PHYS,</div><div class='add'>+	.end	= PXA_CS0_PHYS + SZ_8M - 1,</div><div class='add'>+	.flags	= IORESOURCE_MEM,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device cmx255_nor = {</div><div class='add'>+	.name	= "physmap-flash",</div><div class='add'>+	.id	= -1,</div><div class='add'>+	.dev	= {</div><div class='add'>+		.platform_data = cmx255_nor_flash_data,</div><div class='add'>+	},</div><div class='add'>+	.resource = &amp;cmx255_nor_resource,</div><div class='add'>+	.num_resources = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init cmx255_init_nor(void)</div><div class='add'>+{</div><div class='add'>+	platform_device_register(&amp;cmx255_nor);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline void cmx255_init_nor(void) {}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_MTD_NAND_GPIO) || defined(CONFIG_MTD_NAND_GPIO_MODULE)</div><div class='add'>+static struct resource cmx255_nand_resource[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start = PXA_CS1_PHYS,</div><div class='add'>+		.end   = PXA_CS1_PHYS + 11,</div><div class='add'>+		.flags = IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.start = PXA_CS5_PHYS,</div><div class='add'>+		.end   = PXA_CS5_PHYS + 3,</div><div class='add'>+		.flags = IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct mtd_partition cmx255_nand_parts[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.name	= "cmx255-nand",</div><div class='add'>+		.size	= MTDPART_SIZ_FULL,</div><div class='add'>+		.offset	= 0,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct gpio_nand_platdata cmx255_nand_platdata = {</div><div class='add'>+	.gpio_nce = GPIO_NAND_CS,</div><div class='add'>+	.gpio_cle = GPIO_NAND_CLE,</div><div class='add'>+	.gpio_ale = GPIO_NAND_ALE,</div><div class='add'>+	.gpio_rdy = GPIO_NAND_RB,</div><div class='add'>+	.gpio_nwp = -1,</div><div class='add'>+	.parts = cmx255_nand_parts,</div><div class='add'>+	.num_parts = ARRAY_SIZE(cmx255_nand_parts),</div><div class='add'>+	.chip_delay = 25,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device cmx255_nand = {</div><div class='add'>+	.name		= "gpio-nand",</div><div class='add'>+	.num_resources	= ARRAY_SIZE(cmx255_nand_resource),</div><div class='add'>+	.resource	= cmx255_nand_resource,</div><div class='add'>+	.id		= -1,</div><div class='add'>+	.dev		= {</div><div class='add'>+		.platform_data = &amp;cmx255_nand_platdata,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init cmx255_init_nand(void)</div><div class='add'>+{</div><div class='add'>+	platform_device_register(&amp;cmx255_nand);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline void cmx255_init_nand(void) {}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+void __init cmx255_init(void)</div><div class='add'>+{</div><div class='add'>+	pxa2xx_mfp_config(ARRAY_AND_SIZE(cmx255_pin_config));</div><div class='add'>+</div><div class='add'>+	cmx255_init_rtc();</div><div class='add'>+	cmx255_init_nor();</div><div class='add'>+	cmx255_init_nand();</div><div class='add'>+}</div><div class='head'>diff --git a/arch/arm/mach-pxa/cm-x270-pci.h b/arch/arm/mach-pxa/cm-x270-pci.h<br/>deleted file mode 100644<br/>index 48f532f4cb51..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/cm-x270-pci.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pxa/cm-x270-pci.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,13 +0,0 @@</div><div class='del'>-extern void __cmx270_pci_init_irq(int irq_gpio);</div><div class='del'>-extern void __cmx270_pci_suspend(void);</div><div class='del'>-extern void __cmx270_pci_resume(void);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-#define cmx270_pci_init_irq(x) __cmx270_pci_init_irq(x)</div><div class='del'>-#define cmx270_pci_suspend(x) __cmx270_pci_suspend(x)</div><div class='del'>-#define cmx270_pci_resume(x) __cmx270_pci_resume(x)</div><div class='del'>-#else</div><div class='del'>-#define cmx270_pci_init_irq(x) do {} while (0)</div><div class='del'>-#define cmx270_pci_suspend(x) do {} while (0)</div><div class='del'>-#define cmx270_pci_resume(x) do {} while (0)</div><div class='del'>-#endif</div><div class='head'>diff --git a/arch/arm/mach-pxa/cm-x270.c b/arch/arm/mach-pxa/cm-x270.c<br/>index af003a269534..df83b97f303f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/cm-x270.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pxa/cm-x270.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/cm-x270.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/cm-x270.c</a></div><div class='hunk'>@@ -14,46 +14,22 @@</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/gpio.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/dm9000.h&gt;</div><div class='ctx'> #include &lt;linux/rtc-v3020.h&gt;</div><div class='ctx'> #include &lt;video/mbxfb.h&gt;</div><div class='del'>-#include &lt;linux/leds.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/mach/arch.h&gt;</div><div class='del'>-#include &lt;asm/mach-types.h&gt;</div><div class='del'>-#include &lt;asm/mach/map.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;mach/pxa2xx-regs.h&gt;</div><div class='ctx'> #include &lt;mach/mfp-pxa27x.h&gt;</div><div class='del'>-#include &lt;mach/pxa-regs.h&gt;</div><div class='del'>-#include &lt;mach/audio.h&gt;</div><div class='del'>-#include &lt;mach/pxafb.h&gt;</div><div class='ctx'> #include &lt;mach/ohci.h&gt;</div><div class='ctx'> #include &lt;mach/mmc.h&gt;</div><div class='del'>-#include &lt;mach/bitfield.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/hardware/it8152.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='del'>-#include "cm-x270-pci.h"</div><div class='del'>-</div><div class='del'>-/* virtual addresses for statically mapped regions */</div><div class='del'>-#define CMX270_VIRT_BASE	(0xe8000000)</div><div class='del'>-#define CMX270_IT8152_VIRT	(CMX270_VIRT_BASE)</div><div class='ctx'> </div><div class='add'>+/* physical address if local-bus attached devices */</div><div class='ctx'> #define RTC_PHYS_BASE		(PXA_CS1_PHYS + (5 &lt;&lt; 22))</div><div class='del'>-#define DM9000_PHYS_BASE	(PXA_CS1_PHYS + (6 &lt;&lt; 22))</div><div class='ctx'> </div><div class='ctx'> /* GPIO IRQ usage */</div><div class='del'>-#define GPIO10_ETHIRQ		(10)</div><div class='del'>-#define GPIO22_IT8152_IRQ	(22)</div><div class='ctx'> #define GPIO83_MMC_IRQ		(83)</div><div class='del'>-#define GPIO95_GFXIRQ		(95)</div><div class='ctx'> </div><div class='del'>-#define CMX270_ETHIRQ		IRQ_GPIO(GPIO10_ETHIRQ)</div><div class='del'>-#define CMX270_IT8152_IRQ	IRQ_GPIO(GPIO22_IT8152_IRQ)</div><div class='ctx'> #define CMX270_MMC_IRQ		IRQ_GPIO(GPIO83_MMC_IRQ)</div><div class='del'>-#define CMX270_GFXIRQ		IRQ_GPIO(GPIO95_GFXIRQ)</div><div class='ctx'> </div><div class='ctx'> /* MMC power enable */</div><div class='ctx'> #define GPIO105_MMC_POWER	(105)</div><div class='hunk'>@@ -157,62 +133,6 @@ static unsigned long cmx270_pin_config[] = {</div><div class='ctx'> 	GPIO83_GPIO,	/* MMC card detect */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_DM9000) || defined(CONFIG_DM9000_MODULE)</div><div class='del'>-static struct resource cmx270_dm9000_resource[] = {</div><div class='del'>-	[0] = {</div><div class='del'>-		.start = DM9000_PHYS_BASE,</div><div class='del'>-		.end   = DM9000_PHYS_BASE + 4,</div><div class='del'>-		.flags = IORESOURCE_MEM,</div><div class='del'>-	},</div><div class='del'>-	[1] = {</div><div class='del'>-		.start = DM9000_PHYS_BASE + 8,</div><div class='del'>-		.end   = DM9000_PHYS_BASE + 8 + 500,</div><div class='del'>-		.flags = IORESOURCE_MEM,</div><div class='del'>-	},</div><div class='del'>-	[2] = {</div><div class='del'>-		.start = CMX270_ETHIRQ,</div><div class='del'>-		.end   = CMX270_ETHIRQ,</div><div class='del'>-		.flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct dm9000_plat_data cmx270_dm9000_platdata = {</div><div class='del'>-	.flags		= DM9000_PLATF_32BITONLY,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct platform_device cmx270_dm9000_device = {</div><div class='del'>-	.name		= "dm9000",</div><div class='del'>-	.id		= 0,</div><div class='del'>-	.num_resources	= ARRAY_SIZE(cmx270_dm9000_resource),</div><div class='del'>-	.resource	= cmx270_dm9000_resource,</div><div class='del'>-	.dev		= {</div><div class='del'>-		.platform_data = &amp;cmx270_dm9000_platdata,</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void __init cmx270_init_dm9000(void)</div><div class='del'>-{</div><div class='del'>-	platform_device_register(&amp;cmx270_dm9000_device);</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-static inline void cmx270_init_dm9000(void) {}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* UCB1400 touchscreen controller */</div><div class='del'>-#if defined(CONFIG_TOUCHSCREEN_UCB1400) || defined(CONFIG_TOUCHSCREEN_UCB1400_MODULE)</div><div class='del'>-static struct platform_device cmx270_ts_device = {</div><div class='del'>-	.name		= "ucb1400_ts",</div><div class='del'>-	.id		= -1,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void __init cmx270_init_touchscreen(void)</div><div class='del'>-{</div><div class='del'>-	platform_device_register(&amp;cmx270_ts_device);</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-static inline void cmx270_init_touchscreen(void) {}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> /* V3020 RTC */</div><div class='ctx'> #if defined(CONFIG_RTC_DRV_V3020) || defined(CONFIG_RTC_DRV_V3020_MODULE)</div><div class='ctx'> static struct resource cmx270_v3020_resource[] = {</div><div class='hunk'>@@ -245,44 +165,6 @@ static void __init cmx270_init_rtc(void)</div><div class='ctx'> static inline void cmx270_init_rtc(void) {}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-/* CM-X270 LEDs */</div><div class='del'>-#if defined(CONFIG_LEDS_GPIO) || defined(CONFIG_LEDS_GPIO_MODULE)</div><div class='del'>-static struct gpio_led cmx270_leds[] = {</div><div class='del'>-	[0] = {</div><div class='del'>-		.name = "cm-x270:red",</div><div class='del'>-		.default_trigger = "nand-disk",</div><div class='del'>-		.gpio = 93,</div><div class='del'>-		.active_low = 1,</div><div class='del'>-	},</div><div class='del'>-	[1] = {</div><div class='del'>-		.name = "cm-x270:green",</div><div class='del'>-		.default_trigger = "heartbeat",</div><div class='del'>-		.gpio = 94,</div><div class='del'>-		.active_low = 1,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct gpio_led_platform_data cmx270_gpio_led_pdata = {</div><div class='del'>-	.num_leds = ARRAY_SIZE(cmx270_leds),</div><div class='del'>-	.leds = cmx270_leds,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct platform_device cmx270_led_device = {</div><div class='del'>-	.name		= "leds-gpio",</div><div class='del'>-	.id		= -1,</div><div class='del'>-	.dev		= {</div><div class='del'>-		.platform_data = &amp;cmx270_gpio_led_pdata,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void __init cmx270_init_leds(void)</div><div class='del'>-{</div><div class='del'>-	platform_device_register(&amp;cmx270_led_device);</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-static inline void cmx270_init_leds(void) {}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> /* 2700G graphics */</div><div class='ctx'> #if defined(CONFIG_FB_MBX) || defined(CONFIG_FB_MBX_MODULE)</div><div class='ctx'> static u64 fb_dma_mask = ~(u64)0;</div><div class='hunk'>@@ -373,238 +255,11 @@ static void __init cmx270_init_2700G(void)</div><div class='ctx'> static inline void cmx270_init_2700G(void) {}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_FB_PXA) || defined(CONFIG_FB_PXA_MODULE)</div><div class='del'>-/*</div><div class='del'>-  Display definitions</div><div class='del'>-  keep these for backwards compatibility, although symbolic names (as</div><div class='del'>-  e.g. in lpd270.c) looks better</div><div class='del'>-*/</div><div class='del'>-#define MTYPE_STN320x240	0</div><div class='del'>-#define MTYPE_TFT640x480	1</div><div class='del'>-#define MTYPE_CRT640x480	2</div><div class='del'>-#define MTYPE_CRT800x600	3</div><div class='del'>-#define MTYPE_TFT320x240	6</div><div class='del'>-#define MTYPE_STN640x480	7</div><div class='del'>-</div><div class='del'>-static struct pxafb_mode_info generic_stn_320x240_mode = {</div><div class='del'>-	.pixclock	= 76923,</div><div class='del'>-	.bpp		= 8,</div><div class='del'>-	.xres		= 320,</div><div class='del'>-	.yres		= 240,</div><div class='del'>-	.hsync_len	= 3,</div><div class='del'>-	.vsync_len	= 2,</div><div class='del'>-	.left_margin	= 3,</div><div class='del'>-	.upper_margin	= 0,</div><div class='del'>-	.right_margin	= 3,</div><div class='del'>-	.lower_margin	= 0,</div><div class='del'>-	.sync		= (FB_SYNC_HOR_HIGH_ACT |</div><div class='del'>-			   FB_SYNC_VERT_HIGH_ACT),</div><div class='del'>-	.cmap_greyscale = 0,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct pxafb_mach_info generic_stn_320x240 = {</div><div class='del'>-	.modes		= &amp;generic_stn_320x240_mode,</div><div class='del'>-	.num_modes	= 1,</div><div class='del'>-	.lccr0		= 0,</div><div class='del'>-	.lccr3		= (LCCR3_PixClkDiv(0x03) |</div><div class='del'>-			   LCCR3_Acb(0xff) |</div><div class='del'>-			   LCCR3_PCP),</div><div class='del'>-	.cmap_inverse	= 0,</div><div class='del'>-	.cmap_static	= 0,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct pxafb_mode_info generic_tft_640x480_mode = {</div><div class='del'>-	.pixclock	= 38461,</div><div class='del'>-	.bpp		= 8,</div><div class='del'>-	.xres		= 640,</div><div class='del'>-	.yres		= 480,</div><div class='del'>-	.hsync_len	= 60,</div><div class='del'>-	.vsync_len	= 2,</div><div class='del'>-	.left_margin	= 70,</div><div class='del'>-	.upper_margin	= 10,</div><div class='del'>-	.right_margin	= 70,</div><div class='del'>-	.lower_margin	= 5,</div><div class='del'>-	.sync		= 0,</div><div class='del'>-	.cmap_greyscale = 0,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct pxafb_mach_info generic_tft_640x480 = {</div><div class='del'>-	.modes		= &amp;generic_tft_640x480_mode,</div><div class='del'>-	.num_modes	= 1,</div><div class='del'>-	.lccr0		= (LCCR0_PAS),</div><div class='del'>-	.lccr3		= (LCCR3_PixClkDiv(0x01) |</div><div class='del'>-			   LCCR3_Acb(0xff) |</div><div class='del'>-			   LCCR3_PCP),</div><div class='del'>-	.cmap_inverse	= 0,</div><div class='del'>-	.cmap_static	= 0,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct pxafb_mode_info generic_crt_640x480_mode = {</div><div class='del'>-	.pixclock	= 38461,</div><div class='del'>-	.bpp		= 8,</div><div class='del'>-	.xres		= 640,</div><div class='del'>-	.yres		= 480,</div><div class='del'>-	.hsync_len	= 63,</div><div class='del'>-	.vsync_len	= 2,</div><div class='del'>-	.left_margin	= 81,</div><div class='del'>-	.upper_margin	= 33,</div><div class='del'>-	.right_margin	= 16,</div><div class='del'>-	.lower_margin	= 10,</div><div class='del'>-	.sync		= (FB_SYNC_HOR_HIGH_ACT |</div><div class='del'>-			   FB_SYNC_VERT_HIGH_ACT),</div><div class='del'>-	.cmap_greyscale = 0,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct pxafb_mach_info generic_crt_640x480 = {</div><div class='del'>-	.modes		= &amp;generic_crt_640x480_mode,</div><div class='del'>-	.num_modes	= 1,</div><div class='del'>-	.lccr0		= (LCCR0_PAS),</div><div class='del'>-	.lccr3		= (LCCR3_PixClkDiv(0x01) |</div><div class='del'>-			   LCCR3_Acb(0xff)),</div><div class='del'>-	.cmap_inverse	= 0,</div><div class='del'>-	.cmap_static	= 0,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct pxafb_mode_info generic_crt_800x600_mode = {</div><div class='del'>-	.pixclock	= 28846,</div><div class='del'>-	.bpp		= 8,</div><div class='del'>-	.xres		= 800,</div><div class='del'>-	.yres	  	= 600,</div><div class='del'>-	.hsync_len	= 63,</div><div class='del'>-	.vsync_len	= 2,</div><div class='del'>-	.left_margin	= 26,</div><div class='del'>-	.upper_margin	= 21,</div><div class='del'>-	.right_margin	= 26,</div><div class='del'>-	.lower_margin	= 11,</div><div class='del'>-	.sync		= (FB_SYNC_HOR_HIGH_ACT |</div><div class='del'>-			   FB_SYNC_VERT_HIGH_ACT),</div><div class='del'>-	.cmap_greyscale = 0,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct pxafb_mach_info generic_crt_800x600 = {</div><div class='del'>-	.modes		= &amp;generic_crt_800x600_mode,</div><div class='del'>-	.num_modes	= 1,</div><div class='del'>-	.lccr0		= (LCCR0_PAS),</div><div class='del'>-	.lccr3		= (LCCR3_PixClkDiv(0x02) |</div><div class='del'>-			   LCCR3_Acb(0xff)),</div><div class='del'>-	.cmap_inverse	= 0,</div><div class='del'>-	.cmap_static	= 0,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct pxafb_mode_info generic_tft_320x240_mode = {</div><div class='del'>-	.pixclock	= 134615,</div><div class='del'>-	.bpp		= 16,</div><div class='del'>-	.xres		= 320,</div><div class='del'>-	.yres		= 240,</div><div class='del'>-	.hsync_len	= 63,</div><div class='del'>-	.vsync_len	= 7,</div><div class='del'>-	.left_margin	= 75,</div><div class='del'>-	.upper_margin	= 0,</div><div class='del'>-	.right_margin	= 15,</div><div class='del'>-	.lower_margin	= 15,</div><div class='del'>-	.sync		= 0,</div><div class='del'>-	.cmap_greyscale = 0,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct pxafb_mach_info generic_tft_320x240 = {</div><div class='del'>-	.modes		= &amp;generic_tft_320x240_mode,</div><div class='del'>-	.num_modes	= 1,</div><div class='del'>-	.lccr0		= (LCCR0_PAS),</div><div class='del'>-	.lccr3		= (LCCR3_PixClkDiv(0x06) |</div><div class='del'>-			   LCCR3_Acb(0xff) |</div><div class='del'>-			   LCCR3_PCP),</div><div class='del'>-	.cmap_inverse	= 0,</div><div class='del'>-	.cmap_static	= 0,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct pxafb_mode_info generic_stn_640x480_mode = {</div><div class='del'>-	.pixclock	= 57692,</div><div class='del'>-	.bpp		= 8,</div><div class='del'>-	.xres		= 640,</div><div class='del'>-	.yres		= 480,</div><div class='del'>-	.hsync_len	= 4,</div><div class='del'>-	.vsync_len	= 2,</div><div class='del'>-	.left_margin	= 10,</div><div class='del'>-	.upper_margin	= 5,</div><div class='del'>-	.right_margin	= 10,</div><div class='del'>-	.lower_margin	= 5,</div><div class='del'>-	.sync		= (FB_SYNC_HOR_HIGH_ACT |</div><div class='del'>-			   FB_SYNC_VERT_HIGH_ACT),</div><div class='del'>-	.cmap_greyscale = 0,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct pxafb_mach_info generic_stn_640x480 = {</div><div class='del'>-	.modes		= &amp;generic_stn_640x480_mode,</div><div class='del'>-	.num_modes	= 1,</div><div class='del'>-	.lccr0		= 0,</div><div class='del'>-	.lccr3		= (LCCR3_PixClkDiv(0x02) |</div><div class='del'>-			   LCCR3_Acb(0xff)),</div><div class='del'>-	.cmap_inverse	= 0,</div><div class='del'>-	.cmap_static	= 0,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct pxafb_mach_info *cmx270_display = &amp;generic_crt_640x480;</div><div class='del'>-</div><div class='del'>-static int __init cmx270_set_display(char *str)</div><div class='del'>-{</div><div class='del'>-	int disp_type = simple_strtol(str, NULL, 0);</div><div class='del'>-	switch (disp_type) {</div><div class='del'>-	case MTYPE_STN320x240:</div><div class='del'>-		cmx270_display = &amp;generic_stn_320x240;</div><div class='del'>-		break;</div><div class='del'>-	case MTYPE_TFT640x480:</div><div class='del'>-		cmx270_display = &amp;generic_tft_640x480;</div><div class='del'>-		break;</div><div class='del'>-	case MTYPE_CRT640x480:</div><div class='del'>-		cmx270_display = &amp;generic_crt_640x480;</div><div class='del'>-		break;</div><div class='del'>-	case MTYPE_CRT800x600:</div><div class='del'>-		cmx270_display = &amp;generic_crt_800x600;</div><div class='del'>-		break;</div><div class='del'>-	case MTYPE_TFT320x240:</div><div class='del'>-		cmx270_display = &amp;generic_tft_320x240;</div><div class='del'>-		break;</div><div class='del'>-	case MTYPE_STN640x480:</div><div class='del'>-		cmx270_display = &amp;generic_stn_640x480;</div><div class='del'>-		break;</div><div class='del'>-	default: /* fallback to CRT 640x480 */</div><div class='del'>-		cmx270_display = &amp;generic_crt_640x480;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-   This should be done really early to get proper configuration for</div><div class='del'>-   frame buffer.</div><div class='del'>-   Indeed, pxafb parameters can be used istead, but CM-X270 bootloader</div><div class='del'>-   has limitied line length for kernel command line, and also it will</div><div class='del'>-   break compatibitlty with proprietary releases already in field.</div><div class='del'>-*/</div><div class='del'>-__setup("monitor=", cmx270_set_display);</div><div class='del'>-</div><div class='del'>-static void __init cmx270_init_display(void)</div><div class='del'>-{</div><div class='del'>-	set_pxa_fb_info(cmx270_display);</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-static inline void cmx270_init_display(void) {}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> /* PXA27x OHCI controller setup */</div><div class='ctx'> #if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)</div><div class='del'>-static int cmx270_ohci_init(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	/* Set the Power Control Polarity Low */</div><div class='del'>-	UHCHR = (UHCHR | UHCHR_PCPL) &amp;</div><div class='del'>-		~(UHCHR_SSEP1 | UHCHR_SSEP2 | UHCHR_SSE);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static struct pxaohci_platform_data cmx270_ohci_platform_data = {</div><div class='ctx'> 	.port_mode	= PMM_PERPORT_MODE,</div><div class='del'>-	.init		= cmx270_ohci_init,</div><div class='add'>+	.flags		= ENABLE_PORT1 | ENABLE_PORT2 | POWER_CONTROL_LOW,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void __init cmx270_init_ohci(void)</div><div class='hunk'>@@ -676,131 +331,12 @@ static void __init cmx270_init_mmc(void)</div><div class='ctx'> static inline void cmx270_init_mmc(void) {}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-static unsigned long sleep_save_msc[10];</div><div class='del'>-</div><div class='del'>-static int cmx270_suspend(struct sys_device *dev, pm_message_t state)</div><div class='del'>-{</div><div class='del'>-	cmx270_pci_suspend();</div><div class='del'>-</div><div class='del'>-	/* save MSC registers */</div><div class='del'>-	sleep_save_msc[0] = MSC0;</div><div class='del'>-	sleep_save_msc[1] = MSC1;</div><div class='del'>-	sleep_save_msc[2] = MSC2;</div><div class='del'>-</div><div class='del'>-	/* setup power saving mode registers */</div><div class='del'>-	PCFR = 0x0;</div><div class='del'>-	PSLR = 0xff400000;</div><div class='del'>-	PMCR  = 0x00000005;</div><div class='del'>-	PWER  = 0x80000000;</div><div class='del'>-	PFER  = 0x00000000;</div><div class='del'>-	PRER  = 0x00000000;</div><div class='del'>-	PGSR0 = 0xC0018800;</div><div class='del'>-	PGSR1 = 0x004F0002;</div><div class='del'>-	PGSR2 = 0x6021C000;</div><div class='del'>-	PGSR3 = 0x00020000;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cmx270_resume(struct sys_device *dev)</div><div class='del'>-{</div><div class='del'>-	cmx270_pci_resume();</div><div class='del'>-</div><div class='del'>-	/* restore MSC registers */</div><div class='del'>-	MSC0 = sleep_save_msc[0];</div><div class='del'>-	MSC1 = sleep_save_msc[1];</div><div class='del'>-	MSC2 = sleep_save_msc[2];</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct sysdev_class cmx270_pm_sysclass = {</div><div class='del'>-	.name = "pm",</div><div class='del'>-	.resume = cmx270_resume,</div><div class='del'>-	.suspend = cmx270_suspend,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct sys_device cmx270_pm_device = {</div><div class='del'>-	.cls = &amp;cmx270_pm_sysclass,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init cmx270_pm_init(void)</div><div class='del'>-{</div><div class='del'>-	int error;</div><div class='del'>-	error = sysdev_class_register(&amp;cmx270_pm_sysclass);</div><div class='del'>-	if (error == 0)</div><div class='del'>-		error = sysdev_register(&amp;cmx270_pm_device);</div><div class='del'>-	return error;</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-static int __init cmx270_pm_init(void) { return 0; }</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_SND_PXA2XX_AC97) || defined(CONFIG_SND_PXA2XX_AC97_MODULE)</div><div class='del'>-static void __init cmx270_init_ac97(void)</div><div class='del'>-{</div><div class='del'>-	pxa_set_ac97_info(NULL);</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-static inline void cmx270_init_ac97(void) {}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static void __init cmx270_init(void)</div><div class='add'>+void __init cmx270_init(void)</div><div class='ctx'> {</div><div class='del'>-	cmx270_pm_init();</div><div class='del'>-</div><div class='ctx'> 	pxa2xx_mfp_config(ARRAY_AND_SIZE(cmx270_pin_config));</div><div class='ctx'> </div><div class='del'>-	cmx270_init_dm9000();</div><div class='ctx'> 	cmx270_init_rtc();</div><div class='del'>-	cmx270_init_display();</div><div class='ctx'> 	cmx270_init_mmc();</div><div class='ctx'> 	cmx270_init_ohci();</div><div class='del'>-	cmx270_init_ac97();</div><div class='del'>-	cmx270_init_touchscreen();</div><div class='del'>-	cmx270_init_leds();</div><div class='ctx'> 	cmx270_init_2700G();</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-static void __init cmx270_init_irq(void)</div><div class='del'>-{</div><div class='del'>-	pxa27x_init_irq();</div><div class='del'>-</div><div class='del'>-	cmx270_pci_init_irq(GPIO22_IT8152_IRQ);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-/* Map PCI companion statically */</div><div class='del'>-static struct map_desc cmx270_io_desc[] __initdata = {</div><div class='del'>-	[0] = { /* PCI bridge */</div><div class='del'>-		.virtual	= CMX270_IT8152_VIRT,</div><div class='del'>-		.pfn		= __phys_to_pfn(PXA_CS4_PHYS),</div><div class='del'>-		.length		= SZ_64M,</div><div class='del'>-		.type		= MT_DEVICE</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void __init cmx270_map_io(void)</div><div class='del'>-{</div><div class='del'>-	pxa_map_io();</div><div class='del'>-	iotable_init(cmx270_io_desc, ARRAY_SIZE(cmx270_io_desc));</div><div class='del'>-</div><div class='del'>-	it8152_base_address = CMX270_IT8152_VIRT;</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-static void __init cmx270_map_io(void)</div><div class='del'>-{</div><div class='del'>-	pxa_map_io();</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-MACHINE_START(ARMCORE, "Compulab CM-x270")</div><div class='del'>-	.boot_params	= 0xa0000100,</div><div class='del'>-	.phys_io	= 0x40000000,</div><div class='del'>-	.io_pg_offst	= (io_p2v(0x40000000) &gt;&gt; 18) &amp; 0xfffc,</div><div class='del'>-	.map_io		= cmx270_map_io,</div><div class='del'>-	.init_irq	= cmx270_init_irq,</div><div class='del'>-	.timer		= &amp;pxa_timer,</div><div class='del'>-	.init_machine	= cmx270_init,</div><div class='del'>-MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-pxa/cm-x270-pci.c b/arch/arm/mach-pxa/cm-x2xx-pci.c<br/>index 2d5bcea1e520..3156b25f6e9d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/cm-x270-pci.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pxa/cm-x270-pci.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/cm-x2xx-pci.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/cm-x2xx-pci.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/arch/arm/mach-pxa/cm-x270-pci.c</div><div class='add'>+ * linux/arch/arm/mach-pxa/cm-x2xx-pci.c</div><div class='ctx'>  *</div><div class='ctx'>  * PCI bios-type initialisation for PCI machines</div><div class='ctx'>  *</div><div class='hunk'>@@ -28,7 +28,7 @@</div><div class='ctx'> #include &lt;asm/hardware/it8152.h&gt;</div><div class='ctx'> </div><div class='ctx'> unsigned long it8152_base_address;</div><div class='del'>-static int cmx270_it8152_irq_gpio;</div><div class='add'>+static int cmx2xx_it8152_irq_gpio;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Only first 64MB of memory can be accessed via PCI.</div><div class='hunk'>@@ -36,13 +36,13 @@ static int cmx270_it8152_irq_gpio;</div><div class='ctx'>  * This is really ugly and we need a better way of specifying</div><div class='ctx'>  * DMA-capable regions of memory.</div><div class='ctx'>  */</div><div class='del'>-void __init cmx270_pci_adjust_zones(int node, unsigned long *zone_size,</div><div class='add'>+void __init cmx2xx_pci_adjust_zones(int node, unsigned long *zone_size,</div><div class='ctx'> 	unsigned long *zhole_size)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int sz = SZ_64M &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> </div><div class='ctx'> 	if (machine_is_armcore()) {</div><div class='del'>-		pr_info("Adjusting zones for CM-X270\n");</div><div class='add'>+		pr_info("Adjusting zones for CM-X2XX\n");</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Only adjust if &gt; 64M on current system</div><div class='hunk'>@@ -57,29 +57,29 @@ void __init cmx270_pci_adjust_zones(int node, unsigned long *zone_size,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void cmx270_it8152_irq_demux(unsigned int irq, struct irq_desc *desc)</div><div class='add'>+static void cmx2xx_it8152_irq_demux(unsigned int irq, struct irq_desc *desc)</div><div class='ctx'> {</div><div class='ctx'> 	/* clear our parent irq */</div><div class='del'>-	GEDR(cmx270_it8152_irq_gpio) = GPIO_bit(cmx270_it8152_irq_gpio);</div><div class='add'>+	GEDR(cmx2xx_it8152_irq_gpio) = GPIO_bit(cmx2xx_it8152_irq_gpio);</div><div class='ctx'> </div><div class='ctx'> 	it8152_irq_demux(irq, desc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __cmx270_pci_init_irq(int irq_gpio)</div><div class='add'>+void __cmx2xx_pci_init_irq(int irq_gpio)</div><div class='ctx'> {</div><div class='ctx'> 	it8152_init_irq();</div><div class='ctx'> </div><div class='del'>-	cmx270_it8152_irq_gpio = irq_gpio;</div><div class='add'>+	cmx2xx_it8152_irq_gpio = irq_gpio;</div><div class='ctx'> </div><div class='ctx'> 	set_irq_type(gpio_to_irq(irq_gpio), IRQ_TYPE_EDGE_RISING);</div><div class='ctx'> </div><div class='del'>-	set_irq_chained_handler(gpio_to_irq(irq_gpio), cmx270_it8152_irq_demux);</div><div class='add'>+	set_irq_chained_handler(gpio_to_irq(irq_gpio), cmx2xx_it8152_irq_demux);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> static unsigned long sleep_save_ite[10];</div><div class='ctx'> </div><div class='del'>-void __cmx270_pci_suspend(void)</div><div class='add'>+void __cmx2xx_pci_suspend(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* save ITE state */</div><div class='ctx'> 	sleep_save_ite[0] = __raw_readl(IT8152_INTC_PDCNIMR);</div><div class='hunk'>@@ -91,7 +91,7 @@ void __cmx270_pci_suspend(void)</div><div class='ctx'> 	__raw_writel((0), IT8152_INTC_LPCNIRR);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __cmx270_pci_resume(void)</div><div class='add'>+void __cmx2xx_pci_resume(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* restore IT8152 state */</div><div class='ctx'> 	__raw_writel((sleep_save_ite[0]), IT8152_INTC_PDCNIMR);</div><div class='hunk'>@@ -99,12 +99,12 @@ void __cmx270_pci_resume(void)</div><div class='ctx'> 	__raw_writel((sleep_save_ite[2]), IT8152_INTC_LPNIAR);</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='del'>-void cmx270_pci_suspend(void) {}</div><div class='del'>-void cmx270_pci_resume(void) {}</div><div class='add'>+void cmx2xx_pci_suspend(void) {}</div><div class='add'>+void cmx2xx_pci_resume(void) {}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* PCI IRQ mapping*/</div><div class='del'>-static int __init cmx270_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)</div><div class='add'>+static int __init cmx2xx_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)</div><div class='ctx'> {</div><div class='ctx'> 	int irq;</div><div class='ctx'> </div><div class='hunk'>@@ -116,14 +116,14 @@ static int __init cmx270_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	  Here comes the ugly part. The routing is baseboard specific,</div><div class='del'>-	  but defining a platform for each possible base of CM-X270 is</div><div class='del'>-	  unrealistic. Here we keep mapping for ATXBase and SB-X270.</div><div class='add'>+	  but defining a platform for each possible base of CM-X2XX is</div><div class='add'>+	  unrealistic. Here we keep mapping for ATXBase and SB-X2XX.</div><div class='ctx'> 	*/</div><div class='ctx'> 	/* ATXBASE PCI slot */</div><div class='ctx'> 	if (slot == 7)</div><div class='ctx'> 		return IT8152_PCI_INTA;</div><div class='ctx'> </div><div class='del'>-	/* ATXBase/SB-x270 CardBus */</div><div class='add'>+	/* ATXBase/SB-X2XX CardBus */</div><div class='ctx'> 	if (slot == 8 || slot == 0)</div><div class='ctx'> 		return IT8152_PCI_INTB;</div><div class='ctx'> </div><div class='hunk'>@@ -131,7 +131,11 @@ static int __init cmx270_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)</div><div class='ctx'> 	if (slot == 9)</div><div class='ctx'> 		return IT8152_PCI_INTA;</div><div class='ctx'> </div><div class='del'>-	/* SB-x270 Ethernet */</div><div class='add'>+	/* CM-x255 Onboard Ethernet */</div><div class='add'>+	if (slot == 15)</div><div class='add'>+		return IT8152_PCI_INTC;</div><div class='add'>+</div><div class='add'>+	/* SB-x2xx Ethernet */</div><div class='ctx'> 	if (slot == 16)</div><div class='ctx'> 		return IT8152_PCI_INTA;</div><div class='ctx'> </div><div class='hunk'>@@ -144,9 +148,9 @@ static int __init cmx270_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)</div><div class='ctx'> 	return(0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void cmx270_pci_preinit(void)</div><div class='add'>+static void cmx2xx_pci_preinit(void)</div><div class='ctx'> {</div><div class='del'>-	pr_info("Initializing CM-X270 PCI subsystem\n");</div><div class='add'>+	pr_info("Initializing CM-X2XX PCI subsystem\n");</div><div class='ctx'> </div><div class='ctx'> 	__raw_writel(0x800, IT8152_PCI_CFG_ADDR);</div><div class='ctx'> 	if (__raw_readl(IT8152_PCI_CFG_DATA) == 0x81521283) {</div><div class='hunk'>@@ -200,21 +204,21 @@ static void cmx270_pci_preinit(void)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct hw_pci cmx270_pci __initdata = {</div><div class='add'>+static struct hw_pci cmx2xx_pci __initdata = {</div><div class='ctx'> 	.swizzle	= pci_std_swizzle,</div><div class='del'>-	.map_irq	= cmx270_pci_map_irq,</div><div class='add'>+	.map_irq	= cmx2xx_pci_map_irq,</div><div class='ctx'> 	.nr_controllers	= 1,</div><div class='ctx'> 	.setup		= it8152_pci_setup,</div><div class='ctx'> 	.scan		= it8152_pci_scan_bus,</div><div class='del'>-	.preinit	= cmx270_pci_preinit,</div><div class='add'>+	.preinit	= cmx2xx_pci_preinit,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init cmx270_init_pci(void)</div><div class='add'>+static int __init cmx2xx_init_pci(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (machine_is_armcore())</div><div class='del'>-		pci_common_init(&amp;cmx270_pci);</div><div class='add'>+		pci_common_init(&amp;cmx2xx_pci);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-subsys_initcall(cmx270_init_pci);</div><div class='add'>+subsys_initcall(cmx2xx_init_pci);</div><div class='head'>diff --git a/arch/arm/mach-pxa/cm-x2xx-pci.h b/arch/arm/mach-pxa/cm-x2xx-pci.h<br/>new file mode 100644<br/>index 000000000000..e24aad2e3ad7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/cm-x2xx-pci.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/cm-x2xx-pci.h</a></div><div class='hunk'>@@ -0,0 +1,13 @@</div><div class='add'>+extern void __cmx2xx_pci_init_irq(int irq_gpio);</div><div class='add'>+extern void __cmx2xx_pci_suspend(void);</div><div class='add'>+extern void __cmx2xx_pci_resume(void);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PCI</div><div class='add'>+#define cmx2xx_pci_init_irq(x) __cmx2xx_pci_init_irq(x)</div><div class='add'>+#define cmx2xx_pci_suspend(x) __cmx2xx_pci_suspend(x)</div><div class='add'>+#define cmx2xx_pci_resume(x) __cmx2xx_pci_resume(x)</div><div class='add'>+#else</div><div class='add'>+#define cmx2xx_pci_init_irq(x) do {} while (0)</div><div class='add'>+#define cmx2xx_pci_suspend(x) do {} while (0)</div><div class='add'>+#define cmx2xx_pci_resume(x) do {} while (0)</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/arm/mach-pxa/cm-x2xx.c b/arch/arm/mach-pxa/cm-x2xx.c<br/>new file mode 100644<br/>index 000000000000..0b3ce3b6d896<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/cm-x2xx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/cm-x2xx.c</a></div><div class='hunk'>@@ -0,0 +1,531 @@</div><div class='add'>+/*</div><div class='add'>+ * linux/arch/arm/mach-pxa/cm-x2xx.c</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2008 CompuLab, Ltd.</div><div class='add'>+ * Mike Rapoport &lt;mike@compulab.co.il&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='add'>+#include &lt;linux/gpio.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/dm9000.h&gt;</div><div class='add'>+#include &lt;linux/leds.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/mach/arch.h&gt;</div><div class='add'>+#include &lt;asm/mach-types.h&gt;</div><div class='add'>+#include &lt;asm/mach/map.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;mach/pxa2xx-regs.h&gt;</div><div class='add'>+#include &lt;mach/mfp-pxa27x.h&gt;</div><div class='add'>+#include &lt;mach/pxa-regs.h&gt;</div><div class='add'>+#include &lt;mach/audio.h&gt;</div><div class='add'>+#include &lt;mach/pxafb.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/hardware/it8152.h&gt;</div><div class='add'>+</div><div class='add'>+#include "generic.h"</div><div class='add'>+#include "cm-x2xx-pci.h"</div><div class='add'>+</div><div class='add'>+extern void cmx255_init(void);</div><div class='add'>+extern void cmx270_init(void);</div><div class='add'>+</div><div class='add'>+/* virtual addresses for statically mapped regions */</div><div class='add'>+#define CMX2XX_VIRT_BASE	(0xe8000000)</div><div class='add'>+#define CMX2XX_IT8152_VIRT	(CMX2XX_VIRT_BASE)</div><div class='add'>+</div><div class='add'>+/* physical address if local-bus attached devices */</div><div class='add'>+#define CMX255_DM9000_PHYS_BASE (PXA_CS1_PHYS + (8 &lt;&lt; 22))</div><div class='add'>+#define CMX270_DM9000_PHYS_BASE	(PXA_CS1_PHYS + (6 &lt;&lt; 22))</div><div class='add'>+</div><div class='add'>+/* leds */</div><div class='add'>+#define CMX255_GPIO_RED		(27)</div><div class='add'>+#define CMX255_GPIO_GREEN	(32)</div><div class='add'>+#define CMX270_GPIO_RED		(93)</div><div class='add'>+#define CMX270_GPIO_GREEN	(94)</div><div class='add'>+</div><div class='add'>+/* GPIO IRQ usage */</div><div class='add'>+#define GPIO22_ETHIRQ		(22)</div><div class='add'>+#define GPIO10_ETHIRQ		(10)</div><div class='add'>+#define CMX255_GPIO_IT8152_IRQ	(0)</div><div class='add'>+#define CMX270_GPIO_IT8152_IRQ	(22)</div><div class='add'>+</div><div class='add'>+#define CMX255_ETHIRQ		IRQ_GPIO(GPIO22_ETHIRQ)</div><div class='add'>+#define CMX270_ETHIRQ		IRQ_GPIO(GPIO10_ETHIRQ)</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_DM9000) || defined(CONFIG_DM9000_MODULE)</div><div class='add'>+static struct resource cmx255_dm9000_resource[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start = CMX255_DM9000_PHYS_BASE,</div><div class='add'>+		.end   = CMX255_DM9000_PHYS_BASE + 3,</div><div class='add'>+		.flags = IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.start = CMX255_DM9000_PHYS_BASE + 4,</div><div class='add'>+		.end   = CMX255_DM9000_PHYS_BASE + 4 + 500,</div><div class='add'>+		.flags = IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[2] = {</div><div class='add'>+		.start = CMX255_ETHIRQ,</div><div class='add'>+		.end   = CMX255_ETHIRQ,</div><div class='add'>+		.flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource cmx270_dm9000_resource[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start = CMX270_DM9000_PHYS_BASE,</div><div class='add'>+		.end   = CMX270_DM9000_PHYS_BASE + 3,</div><div class='add'>+		.flags = IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.start = CMX270_DM9000_PHYS_BASE + 8,</div><div class='add'>+		.end   = CMX270_DM9000_PHYS_BASE + 8 + 500,</div><div class='add'>+		.flags = IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[2] = {</div><div class='add'>+		.start = CMX270_ETHIRQ,</div><div class='add'>+		.end   = CMX270_ETHIRQ,</div><div class='add'>+		.flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct dm9000_plat_data cmx270_dm9000_platdata = {</div><div class='add'>+	.flags		= DM9000_PLATF_32BITONLY,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device cmx2xx_dm9000_device = {</div><div class='add'>+	.name		= "dm9000",</div><div class='add'>+	.id		= 0,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(cmx270_dm9000_resource),</div><div class='add'>+	.dev		= {</div><div class='add'>+		.platform_data = &amp;cmx270_dm9000_platdata,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init cmx2xx_init_dm9000(void)</div><div class='add'>+{</div><div class='add'>+	if (cpu_is_pxa25x())</div><div class='add'>+		cmx2xx_dm9000_device.resource = cmx255_dm9000_resource;</div><div class='add'>+	else</div><div class='add'>+		cmx2xx_dm9000_device.resource = cmx270_dm9000_resource;</div><div class='add'>+	platform_device_register(&amp;cmx2xx_dm9000_device);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline void cmx2xx_init_dm9000(void) {}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* UCB1400 touchscreen controller */</div><div class='add'>+#if defined(CONFIG_TOUCHSCREEN_UCB1400) || defined(CONFIG_TOUCHSCREEN_UCB1400_MODULE)</div><div class='add'>+static struct platform_device cmx2xx_ts_device = {</div><div class='add'>+	.name		= "ucb1400_ts",</div><div class='add'>+	.id		= -1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init cmx2xx_init_touchscreen(void)</div><div class='add'>+{</div><div class='add'>+	platform_device_register(&amp;cmx2xx_ts_device);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline void cmx2xx_init_touchscreen(void) {}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* CM-X270 LEDs */</div><div class='add'>+#if defined(CONFIG_LEDS_GPIO) || defined(CONFIG_LEDS_GPIO_MODULE)</div><div class='add'>+static struct gpio_led cmx2xx_leds[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.name = "cm-x2xx:red",</div><div class='add'>+		.default_trigger = "nand-disk",</div><div class='add'>+		.active_low = 1,</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.name = "cm-x2xx:green",</div><div class='add'>+		.default_trigger = "heartbeat",</div><div class='add'>+		.active_low = 1,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct gpio_led_platform_data cmx2xx_gpio_led_pdata = {</div><div class='add'>+	.num_leds = ARRAY_SIZE(cmx2xx_leds),</div><div class='add'>+	.leds = cmx2xx_leds,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device cmx2xx_led_device = {</div><div class='add'>+	.name		= "leds-gpio",</div><div class='add'>+	.id		= -1,</div><div class='add'>+	.dev		= {</div><div class='add'>+		.platform_data = &amp;cmx2xx_gpio_led_pdata,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init cmx2xx_init_leds(void)</div><div class='add'>+{</div><div class='add'>+	if (cpu_is_pxa25x()) {</div><div class='add'>+		cmx2xx_leds[0].gpio = CMX255_GPIO_RED;</div><div class='add'>+		cmx2xx_leds[1].gpio = CMX255_GPIO_GREEN;</div><div class='add'>+	} else {</div><div class='add'>+		cmx2xx_leds[0].gpio = CMX270_GPIO_RED;</div><div class='add'>+		cmx2xx_leds[1].gpio = CMX270_GPIO_GREEN;</div><div class='add'>+	}</div><div class='add'>+	platform_device_register(&amp;cmx2xx_led_device);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline void cmx2xx_init_leds(void) {}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_FB_PXA) || defined(CONFIG_FB_PXA_MODULE)</div><div class='add'>+/*</div><div class='add'>+  Display definitions</div><div class='add'>+  keep these for backwards compatibility, although symbolic names (as</div><div class='add'>+  e.g. in lpd270.c) looks better</div><div class='add'>+*/</div><div class='add'>+#define MTYPE_STN320x240	0</div><div class='add'>+#define MTYPE_TFT640x480	1</div><div class='add'>+#define MTYPE_CRT640x480	2</div><div class='add'>+#define MTYPE_CRT800x600	3</div><div class='add'>+#define MTYPE_TFT320x240	6</div><div class='add'>+#define MTYPE_STN640x480	7</div><div class='add'>+</div><div class='add'>+static struct pxafb_mode_info generic_stn_320x240_mode = {</div><div class='add'>+	.pixclock	= 76923,</div><div class='add'>+	.bpp		= 8,</div><div class='add'>+	.xres		= 320,</div><div class='add'>+	.yres		= 240,</div><div class='add'>+	.hsync_len	= 3,</div><div class='add'>+	.vsync_len	= 2,</div><div class='add'>+	.left_margin	= 3,</div><div class='add'>+	.upper_margin	= 0,</div><div class='add'>+	.right_margin	= 3,</div><div class='add'>+	.lower_margin	= 0,</div><div class='add'>+	.sync		= (FB_SYNC_HOR_HIGH_ACT |</div><div class='add'>+			   FB_SYNC_VERT_HIGH_ACT),</div><div class='add'>+	.cmap_greyscale = 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct pxafb_mach_info generic_stn_320x240 = {</div><div class='add'>+	.modes		= &amp;generic_stn_320x240_mode,</div><div class='add'>+	.num_modes	= 1,</div><div class='add'>+	.lccr0		= 0,</div><div class='add'>+	.lccr3		= (LCCR3_PixClkDiv(0x03) |</div><div class='add'>+			   LCCR3_Acb(0xff) |</div><div class='add'>+			   LCCR3_PCP),</div><div class='add'>+	.cmap_inverse	= 0,</div><div class='add'>+	.cmap_static	= 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct pxafb_mode_info generic_tft_640x480_mode = {</div><div class='add'>+	.pixclock	= 38461,</div><div class='add'>+	.bpp		= 8,</div><div class='add'>+	.xres		= 640,</div><div class='add'>+	.yres		= 480,</div><div class='add'>+	.hsync_len	= 60,</div><div class='add'>+	.vsync_len	= 2,</div><div class='add'>+	.left_margin	= 70,</div><div class='add'>+	.upper_margin	= 10,</div><div class='add'>+	.right_margin	= 70,</div><div class='add'>+	.lower_margin	= 5,</div><div class='add'>+	.sync		= 0,</div><div class='add'>+	.cmap_greyscale = 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct pxafb_mach_info generic_tft_640x480 = {</div><div class='add'>+	.modes		= &amp;generic_tft_640x480_mode,</div><div class='add'>+	.num_modes	= 1,</div><div class='add'>+	.lccr0		= (LCCR0_PAS),</div><div class='add'>+	.lccr3		= (LCCR3_PixClkDiv(0x01) |</div><div class='add'>+			   LCCR3_Acb(0xff) |</div><div class='add'>+			   LCCR3_PCP),</div><div class='add'>+	.cmap_inverse	= 0,</div><div class='add'>+	.cmap_static	= 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct pxafb_mode_info generic_crt_640x480_mode = {</div><div class='add'>+	.pixclock	= 38461,</div><div class='add'>+	.bpp		= 8,</div><div class='add'>+	.xres		= 640,</div><div class='add'>+	.yres		= 480,</div><div class='add'>+	.hsync_len	= 63,</div><div class='add'>+	.vsync_len	= 2,</div><div class='add'>+	.left_margin	= 81,</div><div class='add'>+	.upper_margin	= 33,</div><div class='add'>+	.right_margin	= 16,</div><div class='add'>+	.lower_margin	= 10,</div><div class='add'>+	.sync		= (FB_SYNC_HOR_HIGH_ACT |</div><div class='add'>+			   FB_SYNC_VERT_HIGH_ACT),</div><div class='add'>+	.cmap_greyscale = 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct pxafb_mach_info generic_crt_640x480 = {</div><div class='add'>+	.modes		= &amp;generic_crt_640x480_mode,</div><div class='add'>+	.num_modes	= 1,</div><div class='add'>+	.lccr0		= (LCCR0_PAS),</div><div class='add'>+	.lccr3		= (LCCR3_PixClkDiv(0x01) |</div><div class='add'>+			   LCCR3_Acb(0xff)),</div><div class='add'>+	.cmap_inverse	= 0,</div><div class='add'>+	.cmap_static	= 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct pxafb_mode_info generic_crt_800x600_mode = {</div><div class='add'>+	.pixclock	= 28846,</div><div class='add'>+	.bpp		= 8,</div><div class='add'>+	.xres		= 800,</div><div class='add'>+	.yres	  	= 600,</div><div class='add'>+	.hsync_len	= 63,</div><div class='add'>+	.vsync_len	= 2,</div><div class='add'>+	.left_margin	= 26,</div><div class='add'>+	.upper_margin	= 21,</div><div class='add'>+	.right_margin	= 26,</div><div class='add'>+	.lower_margin	= 11,</div><div class='add'>+	.sync		= (FB_SYNC_HOR_HIGH_ACT |</div><div class='add'>+			   FB_SYNC_VERT_HIGH_ACT),</div><div class='add'>+	.cmap_greyscale = 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct pxafb_mach_info generic_crt_800x600 = {</div><div class='add'>+	.modes		= &amp;generic_crt_800x600_mode,</div><div class='add'>+	.num_modes	= 1,</div><div class='add'>+	.lccr0		= (LCCR0_PAS),</div><div class='add'>+	.lccr3		= (LCCR3_PixClkDiv(0x02) |</div><div class='add'>+			   LCCR3_Acb(0xff)),</div><div class='add'>+	.cmap_inverse	= 0,</div><div class='add'>+	.cmap_static	= 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct pxafb_mode_info generic_tft_320x240_mode = {</div><div class='add'>+	.pixclock	= 134615,</div><div class='add'>+	.bpp		= 16,</div><div class='add'>+	.xres		= 320,</div><div class='add'>+	.yres		= 240,</div><div class='add'>+	.hsync_len	= 63,</div><div class='add'>+	.vsync_len	= 7,</div><div class='add'>+	.left_margin	= 75,</div><div class='add'>+	.upper_margin	= 0,</div><div class='add'>+	.right_margin	= 15,</div><div class='add'>+	.lower_margin	= 15,</div><div class='add'>+	.sync		= 0,</div><div class='add'>+	.cmap_greyscale = 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct pxafb_mach_info generic_tft_320x240 = {</div><div class='add'>+	.modes		= &amp;generic_tft_320x240_mode,</div><div class='add'>+	.num_modes	= 1,</div><div class='add'>+	.lccr0		= (LCCR0_PAS),</div><div class='add'>+	.lccr3		= (LCCR3_PixClkDiv(0x06) |</div><div class='add'>+			   LCCR3_Acb(0xff) |</div><div class='add'>+			   LCCR3_PCP),</div><div class='add'>+	.cmap_inverse	= 0,</div><div class='add'>+	.cmap_static	= 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct pxafb_mode_info generic_stn_640x480_mode = {</div><div class='add'>+	.pixclock	= 57692,</div><div class='add'>+	.bpp		= 8,</div><div class='add'>+	.xres		= 640,</div><div class='add'>+	.yres		= 480,</div><div class='add'>+	.hsync_len	= 4,</div><div class='add'>+	.vsync_len	= 2,</div><div class='add'>+	.left_margin	= 10,</div><div class='add'>+	.upper_margin	= 5,</div><div class='add'>+	.right_margin	= 10,</div><div class='add'>+	.lower_margin	= 5,</div><div class='add'>+	.sync		= (FB_SYNC_HOR_HIGH_ACT |</div><div class='add'>+			   FB_SYNC_VERT_HIGH_ACT),</div><div class='add'>+	.cmap_greyscale = 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct pxafb_mach_info generic_stn_640x480 = {</div><div class='add'>+	.modes		= &amp;generic_stn_640x480_mode,</div><div class='add'>+	.num_modes	= 1,</div><div class='add'>+	.lccr0		= 0,</div><div class='add'>+	.lccr3		= (LCCR3_PixClkDiv(0x02) |</div><div class='add'>+			   LCCR3_Acb(0xff)),</div><div class='add'>+	.cmap_inverse	= 0,</div><div class='add'>+	.cmap_static	= 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct pxafb_mach_info *cmx2xx_display = &amp;generic_crt_640x480;</div><div class='add'>+</div><div class='add'>+static int __init cmx2xx_set_display(char *str)</div><div class='add'>+{</div><div class='add'>+	int disp_type = simple_strtol(str, NULL, 0);</div><div class='add'>+	switch (disp_type) {</div><div class='add'>+	case MTYPE_STN320x240:</div><div class='add'>+		cmx2xx_display = &amp;generic_stn_320x240;</div><div class='add'>+		break;</div><div class='add'>+	case MTYPE_TFT640x480:</div><div class='add'>+		cmx2xx_display = &amp;generic_tft_640x480;</div><div class='add'>+		break;</div><div class='add'>+	case MTYPE_CRT640x480:</div><div class='add'>+		cmx2xx_display = &amp;generic_crt_640x480;</div><div class='add'>+		break;</div><div class='add'>+	case MTYPE_CRT800x600:</div><div class='add'>+		cmx2xx_display = &amp;generic_crt_800x600;</div><div class='add'>+		break;</div><div class='add'>+	case MTYPE_TFT320x240:</div><div class='add'>+		cmx2xx_display = &amp;generic_tft_320x240;</div><div class='add'>+		break;</div><div class='add'>+	case MTYPE_STN640x480:</div><div class='add'>+		cmx2xx_display = &amp;generic_stn_640x480;</div><div class='add'>+		break;</div><div class='add'>+	default: /* fallback to CRT 640x480 */</div><div class='add'>+		cmx2xx_display = &amp;generic_crt_640x480;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+   This should be done really early to get proper configuration for</div><div class='add'>+   frame buffer.</div><div class='add'>+   Indeed, pxafb parameters can be used istead, but CM-X2XX bootloader</div><div class='add'>+   has limitied line length for kernel command line, and also it will</div><div class='add'>+   break compatibitlty with proprietary releases already in field.</div><div class='add'>+*/</div><div class='add'>+__setup("monitor=", cmx2xx_set_display);</div><div class='add'>+</div><div class='add'>+static void __init cmx2xx_init_display(void)</div><div class='add'>+{</div><div class='add'>+	set_pxa_fb_info(cmx2xx_display);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline void cmx2xx_init_display(void) {}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+static unsigned long sleep_save_msc[10];</div><div class='add'>+</div><div class='add'>+static int cmx2xx_suspend(struct sys_device *dev, pm_message_t state)</div><div class='add'>+{</div><div class='add'>+	cmx2xx_pci_suspend();</div><div class='add'>+</div><div class='add'>+	/* save MSC registers */</div><div class='add'>+	sleep_save_msc[0] = MSC0;</div><div class='add'>+	sleep_save_msc[1] = MSC1;</div><div class='add'>+	sleep_save_msc[2] = MSC2;</div><div class='add'>+</div><div class='add'>+	/* setup power saving mode registers */</div><div class='add'>+	PCFR = 0x0;</div><div class='add'>+	PSLR = 0xff400000;</div><div class='add'>+	PMCR  = 0x00000005;</div><div class='add'>+	PWER  = 0x80000000;</div><div class='add'>+	PFER  = 0x00000000;</div><div class='add'>+	PRER  = 0x00000000;</div><div class='add'>+	PGSR0 = 0xC0018800;</div><div class='add'>+	PGSR1 = 0x004F0002;</div><div class='add'>+	PGSR2 = 0x6021C000;</div><div class='add'>+	PGSR3 = 0x00020000;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cmx2xx_resume(struct sys_device *dev)</div><div class='add'>+{</div><div class='add'>+	cmx2xx_pci_resume();</div><div class='add'>+</div><div class='add'>+	/* restore MSC registers */</div><div class='add'>+	MSC0 = sleep_save_msc[0];</div><div class='add'>+	MSC1 = sleep_save_msc[1];</div><div class='add'>+	MSC2 = sleep_save_msc[2];</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sysdev_class cmx2xx_pm_sysclass = {</div><div class='add'>+	.name = "pm",</div><div class='add'>+	.resume = cmx2xx_resume,</div><div class='add'>+	.suspend = cmx2xx_suspend,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct sys_device cmx2xx_pm_device = {</div><div class='add'>+	.cls = &amp;cmx2xx_pm_sysclass,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init cmx2xx_pm_init(void)</div><div class='add'>+{</div><div class='add'>+	int error;</div><div class='add'>+	error = sysdev_class_register(&amp;cmx2xx_pm_sysclass);</div><div class='add'>+	if (error == 0)</div><div class='add'>+		error = sysdev_register(&amp;cmx2xx_pm_device);</div><div class='add'>+	return error;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static int __init cmx2xx_pm_init(void) { return 0; }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_SND_PXA2XX_AC97) || defined(CONFIG_SND_PXA2XX_AC97_MODULE)</div><div class='add'>+static void __init cmx2xx_init_ac97(void)</div><div class='add'>+{</div><div class='add'>+	pxa_set_ac97_info(NULL);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline void cmx2xx_init_ac97(void) {}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static void __init cmx2xx_init(void)</div><div class='add'>+{</div><div class='add'>+	cmx2xx_pm_init();</div><div class='add'>+</div><div class='add'>+	if (cpu_is_pxa25x())</div><div class='add'>+		cmx255_init();</div><div class='add'>+	else</div><div class='add'>+		cmx270_init();</div><div class='add'>+</div><div class='add'>+	cmx2xx_init_dm9000();</div><div class='add'>+	cmx2xx_init_display();</div><div class='add'>+	cmx2xx_init_ac97();</div><div class='add'>+	cmx2xx_init_touchscreen();</div><div class='add'>+	cmx2xx_init_leds();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init cmx2xx_init_irq(void)</div><div class='add'>+{</div><div class='add'>+	pxa27x_init_irq();</div><div class='add'>+</div><div class='add'>+	if (cpu_is_pxa25x()) {</div><div class='add'>+		pxa25x_init_irq();</div><div class='add'>+		cmx2xx_pci_init_irq(CMX255_GPIO_IT8152_IRQ);</div><div class='add'>+	} else {</div><div class='add'>+		pxa27x_init_irq();</div><div class='add'>+		cmx2xx_pci_init_irq(CMX270_GPIO_IT8152_IRQ);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PCI</div><div class='add'>+/* Map PCI companion statically */</div><div class='add'>+static struct map_desc cmx2xx_io_desc[] __initdata = {</div><div class='add'>+	[0] = { /* PCI bridge */</div><div class='add'>+		.virtual	= CMX2XX_IT8152_VIRT,</div><div class='add'>+		.pfn		= __phys_to_pfn(PXA_CS4_PHYS),</div><div class='add'>+		.length		= SZ_64M,</div><div class='add'>+		.type		= MT_DEVICE</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init cmx2xx_map_io(void)</div><div class='add'>+{</div><div class='add'>+	pxa_map_io();</div><div class='add'>+	iotable_init(cmx2xx_io_desc, ARRAY_SIZE(cmx2xx_io_desc));</div><div class='add'>+</div><div class='add'>+	it8152_base_address = CMX2XX_IT8152_VIRT;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static void __init cmx2xx_map_io(void)</div><div class='add'>+{</div><div class='add'>+	pxa_map_io();</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+MACHINE_START(ARMCORE, "Compulab CM-X2XX")</div><div class='add'>+	.boot_params	= 0xa0000100,</div><div class='add'>+	.phys_io	= 0x40000000,</div><div class='add'>+	.io_pg_offst	= (io_p2v(0x40000000) &gt;&gt; 18) &amp; 0xfffc,</div><div class='add'>+	.map_io		= cmx2xx_map_io,</div><div class='add'>+	.init_irq	= cmx2xx_init_irq,</div><div class='add'>+	.timer		= &amp;pxa_timer,</div><div class='add'>+	.init_machine	= cmx2xx_init,</div><div class='add'>+MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-pxa/cm-x300.c b/arch/arm/mach-pxa/cm-x300.c<br/>new file mode 100644<br/>index 000000000000..deb46cd144bf<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/cm-x300.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/cm-x300.c</a></div><div class='hunk'>@@ -0,0 +1,465 @@</div><div class='add'>+/*</div><div class='add'>+ * linux/arch/arm/mach-pxa/cm-x300.c</div><div class='add'>+ *</div><div class='add'>+ * Support for the CompuLab CM-X300 modules</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2008 CompuLab Ltd.</div><div class='add'>+ *</div><div class='add'>+ * Mike Rapoport &lt;mike@compulab.co.il&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/gpio.h&gt;</div><div class='add'>+#include &lt;linux/dm9000.h&gt;</div><div class='add'>+#include &lt;linux/leds.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/i2c/pca953x.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/mach-types.h&gt;</div><div class='add'>+#include &lt;asm/mach/arch.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;mach/mfp-pxa300.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='add'>+#include &lt;mach/pxafb.h&gt;</div><div class='add'>+#include &lt;mach/mmc.h&gt;</div><div class='add'>+#include &lt;mach/ohci.h&gt;</div><div class='add'>+#include &lt;mach/i2c.h&gt;</div><div class='add'>+#include &lt;mach/pxa3xx_nand.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/mach/map.h&gt;</div><div class='add'>+</div><div class='add'>+#include "generic.h"</div><div class='add'>+</div><div class='add'>+#define CM_X300_ETH_PHYS	0x08000010</div><div class='add'>+</div><div class='add'>+#define GPIO82_MMC2_IRQ		(82)</div><div class='add'>+#define GPIO85_MMC2_WP		(85)</div><div class='add'>+</div><div class='add'>+#define	CM_X300_MMC2_IRQ	IRQ_GPIO(GPIO82_MMC2_IRQ)</div><div class='add'>+</div><div class='add'>+static mfp_cfg_t cm_x300_mfp_cfg[] __initdata = {</div><div class='add'>+	/* LCD */</div><div class='add'>+	GPIO54_LCD_LDD_0,</div><div class='add'>+	GPIO55_LCD_LDD_1,</div><div class='add'>+	GPIO56_LCD_LDD_2,</div><div class='add'>+	GPIO57_LCD_LDD_3,</div><div class='add'>+	GPIO58_LCD_LDD_4,</div><div class='add'>+	GPIO59_LCD_LDD_5,</div><div class='add'>+	GPIO60_LCD_LDD_6,</div><div class='add'>+	GPIO61_LCD_LDD_7,</div><div class='add'>+	GPIO62_LCD_LDD_8,</div><div class='add'>+	GPIO63_LCD_LDD_9,</div><div class='add'>+	GPIO64_LCD_LDD_10,</div><div class='add'>+	GPIO65_LCD_LDD_11,</div><div class='add'>+	GPIO66_LCD_LDD_12,</div><div class='add'>+	GPIO67_LCD_LDD_13,</div><div class='add'>+	GPIO68_LCD_LDD_14,</div><div class='add'>+	GPIO69_LCD_LDD_15,</div><div class='add'>+	GPIO72_LCD_FCLK,</div><div class='add'>+	GPIO73_LCD_LCLK,</div><div class='add'>+	GPIO74_LCD_PCLK,</div><div class='add'>+	GPIO75_LCD_BIAS,</div><div class='add'>+</div><div class='add'>+	/* BTUART */</div><div class='add'>+	GPIO111_UART2_RTS,</div><div class='add'>+	GPIO112_UART2_RXD | MFP_LPM_EDGE_FALL,</div><div class='add'>+	GPIO113_UART2_TXD,</div><div class='add'>+	GPIO114_UART2_CTS | MFP_LPM_EDGE_BOTH,</div><div class='add'>+</div><div class='add'>+	/* STUART */</div><div class='add'>+	GPIO109_UART3_TXD,</div><div class='add'>+	GPIO110_UART3_RXD | MFP_LPM_EDGE_FALL,</div><div class='add'>+</div><div class='add'>+	/* AC97 */</div><div class='add'>+	GPIO23_AC97_nACRESET,</div><div class='add'>+	GPIO24_AC97_SYSCLK,</div><div class='add'>+	GPIO29_AC97_BITCLK,</div><div class='add'>+	GPIO25_AC97_SDATA_IN_0,</div><div class='add'>+	GPIO27_AC97_SDATA_OUT,</div><div class='add'>+	GPIO28_AC97_SYNC,</div><div class='add'>+</div><div class='add'>+	/* Keypad */</div><div class='add'>+	GPIO115_KP_MKIN_0 | MFP_LPM_EDGE_BOTH,</div><div class='add'>+	GPIO116_KP_MKIN_1 | MFP_LPM_EDGE_BOTH,</div><div class='add'>+	GPIO117_KP_MKIN_2 | MFP_LPM_EDGE_BOTH,</div><div class='add'>+	GPIO118_KP_MKIN_3 | MFP_LPM_EDGE_BOTH,</div><div class='add'>+	GPIO119_KP_MKIN_4 | MFP_LPM_EDGE_BOTH,</div><div class='add'>+	GPIO120_KP_MKIN_5 | MFP_LPM_EDGE_BOTH,</div><div class='add'>+	GPIO2_2_KP_MKIN_6 | MFP_LPM_EDGE_BOTH,</div><div class='add'>+	GPIO3_2_KP_MKIN_7 | MFP_LPM_EDGE_BOTH,</div><div class='add'>+	GPIO121_KP_MKOUT_0,</div><div class='add'>+	GPIO122_KP_MKOUT_1,</div><div class='add'>+	GPIO123_KP_MKOUT_2,</div><div class='add'>+	GPIO124_KP_MKOUT_3,</div><div class='add'>+	GPIO125_KP_MKOUT_4,</div><div class='add'>+	GPIO4_2_KP_MKOUT_5,</div><div class='add'>+</div><div class='add'>+	/* MMC1 */</div><div class='add'>+	GPIO3_MMC1_DAT0,</div><div class='add'>+	GPIO4_MMC1_DAT1 | MFP_LPM_EDGE_BOTH,</div><div class='add'>+	GPIO5_MMC1_DAT2,</div><div class='add'>+	GPIO6_MMC1_DAT3,</div><div class='add'>+	GPIO7_MMC1_CLK,</div><div class='add'>+	GPIO8_MMC1_CMD,	/* CMD0 for slot 0 */</div><div class='add'>+</div><div class='add'>+	/* MMC2 */</div><div class='add'>+	GPIO9_MMC2_DAT0,</div><div class='add'>+	GPIO10_MMC2_DAT1 | MFP_LPM_EDGE_BOTH,</div><div class='add'>+	GPIO11_MMC2_DAT2,</div><div class='add'>+	GPIO12_MMC2_DAT3,</div><div class='add'>+	GPIO13_MMC2_CLK,</div><div class='add'>+	GPIO14_MMC2_CMD,</div><div class='add'>+</div><div class='add'>+	/* FFUART */</div><div class='add'>+	GPIO30_UART1_RXD | MFP_LPM_EDGE_FALL,</div><div class='add'>+	GPIO31_UART1_TXD,</div><div class='add'>+	GPIO32_UART1_CTS,</div><div class='add'>+	GPIO37_UART1_RTS,</div><div class='add'>+	GPIO33_UART1_DCD,</div><div class='add'>+	GPIO34_UART1_DSR | MFP_LPM_EDGE_FALL,</div><div class='add'>+	GPIO35_UART1_RI,</div><div class='add'>+	GPIO36_UART1_DTR,</div><div class='add'>+</div><div class='add'>+	/* GPIOs */</div><div class='add'>+	GPIO79_GPIO,			/* LED */</div><div class='add'>+	GPIO82_GPIO | MFP_PULL_HIGH,	/* MMC CD */</div><div class='add'>+	GPIO85_GPIO,			/* MMC WP */</div><div class='add'>+	GPIO99_GPIO,			/* Ethernet IRQ */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_DM9000) || defined(CONFIG_DM9000_MODULE)</div><div class='add'>+static struct resource dm9000_resources[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start	= CM_X300_ETH_PHYS,</div><div class='add'>+		.end	= CM_X300_ETH_PHYS + 0x3,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.start	= CM_X300_ETH_PHYS + 0x4,</div><div class='add'>+		.end	= CM_X300_ETH_PHYS + 0x4 + 500,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[2] = {</div><div class='add'>+		.start	= IRQ_GPIO(mfp_to_gpio(MFP_PIN_GPIO99)),</div><div class='add'>+		.end	= IRQ_GPIO(mfp_to_gpio(MFP_PIN_GPIO99)),</div><div class='add'>+		.flags	= IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct dm9000_plat_data cm_x300_dm9000_platdata = {</div><div class='add'>+	.flags		= DM9000_PLATF_16BITONLY,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device dm9000_device = {</div><div class='add'>+	.name		= "dm9000",</div><div class='add'>+	.id		= 0,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(dm9000_resources),</div><div class='add'>+	.resource	= dm9000_resources,</div><div class='add'>+	.dev		= {</div><div class='add'>+		.platform_data = &amp;cm_x300_dm9000_platdata,</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init cm_x300_init_dm9000(void)</div><div class='add'>+{</div><div class='add'>+	platform_device_register(&amp;dm9000_device);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline void cm_x300_init_dm9000(void) {}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_FB_PXA) || defined(CONFIG_FB_PXA_MODULE)</div><div class='add'>+static struct pxafb_mode_info cm_x300_lcd_modes[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.pixclock	= 38000,</div><div class='add'>+		.bpp		= 16,</div><div class='add'>+		.xres		= 480,</div><div class='add'>+		.yres		= 640,</div><div class='add'>+		.hsync_len	= 8,</div><div class='add'>+		.vsync_len	= 2,</div><div class='add'>+		.left_margin	= 8,</div><div class='add'>+		.upper_margin	= 0,</div><div class='add'>+		.right_margin	= 24,</div><div class='add'>+		.lower_margin	= 4,</div><div class='add'>+		.cmap_greyscale	= 0,</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.pixclock	= 153800,</div><div class='add'>+		.bpp		= 16,</div><div class='add'>+		.xres		= 240,</div><div class='add'>+		.yres		= 320,</div><div class='add'>+		.hsync_len	= 8,</div><div class='add'>+		.vsync_len	= 2,</div><div class='add'>+		.left_margin	= 8,</div><div class='add'>+		.upper_margin	= 2,</div><div class='add'>+		.right_margin	= 88,</div><div class='add'>+		.lower_margin	= 2,</div><div class='add'>+		.cmap_greyscale	= 0,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct pxafb_mach_info cm_x300_lcd = {</div><div class='add'>+	.modes			= cm_x300_lcd_modes,</div><div class='add'>+	.num_modes		= 2,</div><div class='add'>+	.lcd_conn		= LCD_COLOR_TFT_16BPP | LCD_PCLK_EDGE_FALL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init cm_x300_init_lcd(void)</div><div class='add'>+{</div><div class='add'>+	set_pxa_fb_info(&amp;cm_x300_lcd);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline void cm_x300_init_lcd(void) {}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_MTD_NAND_PXA3xx) || defined(CONFIG_MTD_NAND_PXA3xx_MODULE)</div><div class='add'>+static struct mtd_partition cm_x300_nand_partitions[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.name        = "OBM",</div><div class='add'>+		.offset      = 0,</div><div class='add'>+		.size        = SZ_256K,</div><div class='add'>+		.mask_flags  = MTD_WRITEABLE, /* force read-only */</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.name        = "U-Boot",</div><div class='add'>+		.offset      = MTDPART_OFS_APPEND,</div><div class='add'>+		.size        = SZ_256K,</div><div class='add'>+		.mask_flags  = MTD_WRITEABLE, /* force read-only */</div><div class='add'>+	},</div><div class='add'>+	[2] = {</div><div class='add'>+		.name        = "Environment",</div><div class='add'>+		.offset      = MTDPART_OFS_APPEND,</div><div class='add'>+		.size        = SZ_256K,</div><div class='add'>+	},</div><div class='add'>+	[3] = {</div><div class='add'>+		.name        = "reserved",</div><div class='add'>+		.offset      = MTDPART_OFS_APPEND,</div><div class='add'>+		.size        = SZ_256K + SZ_1M,</div><div class='add'>+		.mask_flags  = MTD_WRITEABLE, /* force read-only */</div><div class='add'>+	},</div><div class='add'>+	[4] = {</div><div class='add'>+		.name        = "kernel",</div><div class='add'>+		.offset      = MTDPART_OFS_APPEND,</div><div class='add'>+		.size        = SZ_4M,</div><div class='add'>+	},</div><div class='add'>+	[5] = {</div><div class='add'>+		.name        = "fs",</div><div class='add'>+		.offset      = MTDPART_OFS_APPEND,</div><div class='add'>+		.size        = MTDPART_SIZ_FULL,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct pxa3xx_nand_platform_data cm_x300_nand_info = {</div><div class='add'>+	.enable_arbiter	= 1,</div><div class='add'>+	.parts		= cm_x300_nand_partitions,</div><div class='add'>+	.nr_parts	= ARRAY_SIZE(cm_x300_nand_partitions),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init cm_x300_init_nand(void)</div><div class='add'>+{</div><div class='add'>+	pxa3xx_set_nand_info(&amp;cm_x300_nand_info);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline void cm_x300_init_nand(void) {}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_MMC) || defined(CONFIG_MMC_MODULE)</div><div class='add'>+/* The first MMC slot of CM-X300 is hardwired to Libertas card and has</div><div class='add'>+   no detection/ro pins */</div><div class='add'>+static int cm_x300_mci_init(struct device *dev,</div><div class='add'>+			    irq_handler_t cm_x300_detect_int,</div><div class='add'>+			    void *data)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cm_x300_mci_exit(struct device *dev, void *data)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct pxamci_platform_data cm_x300_mci_platform_data = {</div><div class='add'>+	.detect_delay	= 20,</div><div class='add'>+	.ocr_mask	= MMC_VDD_32_33|MMC_VDD_33_34,</div><div class='add'>+	.init 		= cm_x300_mci_init,</div><div class='add'>+	.exit		= cm_x300_mci_exit,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int cm_x300_mci2_ro(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	return gpio_get_value(GPIO85_MMC2_WP);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cm_x300_mci2_init(struct device *dev,</div><div class='add'>+			     irq_handler_t cm_x300_detect_int,</div><div class='add'>+			     void *data)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * setup GPIO for CM-X300 MMC controller</div><div class='add'>+	 */</div><div class='add'>+	err = gpio_request(GPIO82_MMC2_IRQ, "mmc card detect");</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_request_cd;</div><div class='add'>+	gpio_direction_input(GPIO82_MMC2_IRQ);</div><div class='add'>+</div><div class='add'>+	err = gpio_request(GPIO85_MMC2_WP, "mmc write protect");</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_request_wp;</div><div class='add'>+	gpio_direction_input(GPIO85_MMC2_WP);</div><div class='add'>+</div><div class='add'>+	err = request_irq(CM_X300_MMC2_IRQ, cm_x300_detect_int,</div><div class='add'>+			  IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,</div><div class='add'>+			  "MMC card detect", data);</div><div class='add'>+	if (err) {</div><div class='add'>+		printk(KERN_ERR "%s: MMC/SD/SDIO: "</div><div class='add'>+				"can't request card detect IRQ\n", __func__);</div><div class='add'>+		goto err_request_irq;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_request_irq:</div><div class='add'>+	gpio_free(GPIO85_MMC2_WP);</div><div class='add'>+err_request_wp:</div><div class='add'>+	gpio_free(GPIO82_MMC2_IRQ);</div><div class='add'>+err_request_cd:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cm_x300_mci2_exit(struct device *dev, void *data)</div><div class='add'>+{</div><div class='add'>+	free_irq(CM_X300_MMC2_IRQ, data);</div><div class='add'>+	gpio_free(GPIO82_MMC2_IRQ);</div><div class='add'>+	gpio_free(GPIO85_MMC2_WP);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct pxamci_platform_data cm_x300_mci2_platform_data = {</div><div class='add'>+	.detect_delay	= 20,</div><div class='add'>+	.ocr_mask	= MMC_VDD_32_33|MMC_VDD_33_34,</div><div class='add'>+	.init 		= cm_x300_mci2_init,</div><div class='add'>+	.exit		= cm_x300_mci2_exit,</div><div class='add'>+	.get_ro		= cm_x300_mci2_ro,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init cm_x300_init_mmc(void)</div><div class='add'>+{</div><div class='add'>+	pxa_set_mci_info(&amp;cm_x300_mci_platform_data);</div><div class='add'>+	pxa3xx_set_mci2_info(&amp;cm_x300_mci2_platform_data);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline void cm_x300_init_mmc(void) {}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)</div><div class='add'>+static struct pxaohci_platform_data cm_x300_ohci_platform_data = {</div><div class='add'>+	.port_mode	= PMM_PERPORT_MODE,</div><div class='add'>+	.flags		= ENABLE_PORT1 | ENABLE_PORT2 | POWER_CONTROL_LOW,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init cm_x300_init_ohci(void)</div><div class='add'>+{</div><div class='add'>+	pxa_set_ohci_info(&amp;cm_x300_ohci_platform_data);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline void cm_x300_init_ohci(void) {}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_LEDS_GPIO) || defined(CONFIG_LEDS_GPIO_MODULE)</div><div class='add'>+static struct gpio_led cm_x300_leds[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.name = "cm-x300:green",</div><div class='add'>+		.default_trigger = "heartbeat",</div><div class='add'>+		.gpio = 79,</div><div class='add'>+		.active_low = 1,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct gpio_led_platform_data cm_x300_gpio_led_pdata = {</div><div class='add'>+	.num_leds = ARRAY_SIZE(cm_x300_leds),</div><div class='add'>+	.leds = cm_x300_leds,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device cm_x300_led_device = {</div><div class='add'>+	.name		= "leds-gpio",</div><div class='add'>+	.id		= -1,</div><div class='add'>+	.dev		= {</div><div class='add'>+		.platform_data = &amp;cm_x300_gpio_led_pdata,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init cm_x300_init_leds(void)</div><div class='add'>+{</div><div class='add'>+	platform_device_register(&amp;cm_x300_led_device);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline void cm_x300_init_leds(void) {}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)</div><div class='add'>+/* PCA9555 */</div><div class='add'>+static struct pca953x_platform_data cm_x300_gpio_ext_pdata_0 = {</div><div class='add'>+	.gpio_base = 128,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct pca953x_platform_data cm_x300_gpio_ext_pdata_1 = {</div><div class='add'>+	.gpio_base = 144,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct i2c_board_info cm_x300_gpio_ext_info[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		I2C_BOARD_INFO("pca9555", 0x24),</div><div class='add'>+		.platform_data = &amp;cm_x300_gpio_ext_pdata_0,</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		I2C_BOARD_INFO("pca9555", 0x25),</div><div class='add'>+		.platform_data = &amp;cm_x300_gpio_ext_pdata_1,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init cm_x300_init_i2c(void)</div><div class='add'>+{</div><div class='add'>+	pxa_set_i2c_info(NULL);</div><div class='add'>+	i2c_register_board_info(0, cm_x300_gpio_ext_info,</div><div class='add'>+				ARRAY_SIZE(cm_x300_gpio_ext_info));</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline void cm_x300_init_i2c(void) {}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static void __init cm_x300_init(void)</div><div class='add'>+{</div><div class='add'>+	/* board-processor specific GPIO initialization */</div><div class='add'>+	pxa3xx_mfp_config(ARRAY_AND_SIZE(cm_x300_mfp_cfg));</div><div class='add'>+</div><div class='add'>+	cm_x300_init_dm9000();</div><div class='add'>+	cm_x300_init_lcd();</div><div class='add'>+	cm_x300_init_ohci();</div><div class='add'>+	cm_x300_init_mmc();</div><div class='add'>+	cm_x300_init_nand();</div><div class='add'>+	cm_x300_init_leds();</div><div class='add'>+	cm_x300_init_i2c();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+MACHINE_START(CM_X300, "CM-X300 module")</div><div class='add'>+	.phys_io	= 0x40000000,</div><div class='add'>+	.boot_params	= 0xa0000100,</div><div class='add'>+	.io_pg_offst	= (io_p2v(0x40000000) &gt;&gt; 18) &amp; 0xfffc,</div><div class='add'>+	.map_io		= pxa_map_io,</div><div class='add'>+	.init_irq	= pxa3xx_init_irq,</div><div class='add'>+	.timer		= &amp;pxa_timer,</div><div class='add'>+	.init_machine	= cm_x300_init,</div><div class='add'>+MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-pxa/colibri.c b/arch/arm/mach-pxa/colibri.c<br/>index abce13c846c5..e8473624427e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/colibri.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pxa/colibri.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/colibri.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/colibri.c</a></div><div class='hunk'>@@ -29,12 +29,17 @@</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/flash.h&gt;</div><div class='ctx'> #include &lt;mach/pxa-regs.h&gt;</div><div class='del'>-#include &lt;mach/pxa2xx-gpio.h&gt;</div><div class='add'>+#include &lt;mach/mfp-pxa27x.h&gt;</div><div class='ctx'> #include &lt;mach/colibri.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> #include "devices.h"</div><div class='ctx'> </div><div class='add'>+static unsigned long colibri_pin_config[] __initdata = {</div><div class='add'>+	GPIO78_nCS_2,	/* Ethernet CS */</div><div class='add'>+	GPIO114_GPIO,	/* Ethernet IRQ */</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Flash</div><div class='ctx'>  */</div><div class='hunk'>@@ -116,9 +121,7 @@ static struct platform_device *colibri_devices[] __initdata = {</div><div class='ctx'> </div><div class='ctx'> static void __init colibri_init(void)</div><div class='ctx'> {</div><div class='del'>-	/* DM9000 LAN */</div><div class='del'>-	pxa_gpio_mode(GPIO78_nCS_2_MD);</div><div class='del'>-	pxa_gpio_mode(GPIO_DM9000 | GPIO_IN);</div><div class='add'>+	pxa2xx_mfp_config(ARRAY_AND_SIZE(colibri_pin_config));</div><div class='ctx'> </div><div class='ctx'> 	platform_add_devices(colibri_devices, ARRAY_SIZE(colibri_devices));</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-pxa/corgi.c b/arch/arm/mach-pxa/corgi.c<br/>index e703a8d209e2..65558d6aa220 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/corgi.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pxa/corgi.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/corgi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/corgi.c</a></div><div class='hunk'>@@ -20,7 +20,12 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/mmc/host.h&gt;</div><div class='ctx'> #include &lt;linux/pm.h&gt;</div><div class='add'>+#include &lt;linux/gpio.h&gt;</div><div class='ctx'> #include &lt;linux/backlight.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/spi/spi.h&gt;</div><div class='add'>+#include &lt;linux/spi/ads7846.h&gt;</div><div class='add'>+#include &lt;linux/spi/corgi_lcd.h&gt;</div><div class='ctx'> #include &lt;video/w100fb.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='hunk'>@@ -28,7 +33,6 @@</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='hunk'>@@ -37,11 +41,12 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/pxa-regs.h&gt;</div><div class='ctx'> #include &lt;mach/pxa2xx-regs.h&gt;</div><div class='del'>-#include &lt;mach/pxa2xx-gpio.h&gt;</div><div class='add'>+#include &lt;mach/mfp-pxa25x.h&gt;</div><div class='ctx'> #include &lt;mach/i2c.h&gt;</div><div class='ctx'> #include &lt;mach/irda.h&gt;</div><div class='ctx'> #include &lt;mach/mmc.h&gt;</div><div class='ctx'> #include &lt;mach/udc.h&gt;</div><div class='add'>+#include &lt;mach/pxa2xx_spi.h&gt;</div><div class='ctx'> #include &lt;mach/corgi.h&gt;</div><div class='ctx'> #include &lt;mach/sharpsl.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -52,6 +57,61 @@</div><div class='ctx'> #include "devices.h"</div><div class='ctx'> #include "sharpsl.h"</div><div class='ctx'> </div><div class='add'>+static unsigned long corgi_pin_config[] __initdata = {</div><div class='add'>+	/* Static Memory I/O */</div><div class='add'>+	GPIO78_nCS_2,	/* w100fb */</div><div class='add'>+	GPIO80_nCS_4,	/* scoop */</div><div class='add'>+</div><div class='add'>+	/* SSP1 */</div><div class='add'>+	GPIO23_SSP1_SCLK,</div><div class='add'>+	GPIO25_SSP1_TXD,</div><div class='add'>+	GPIO26_SSP1_RXD,</div><div class='add'>+	GPIO24_GPIO,	/* CORGI_GPIO_ADS7846_CS - SFRM as chip select */</div><div class='add'>+</div><div class='add'>+	/* I2S */</div><div class='add'>+	GPIO28_I2S_BITCLK_OUT,</div><div class='add'>+	GPIO29_I2S_SDATA_IN,</div><div class='add'>+	GPIO30_I2S_SDATA_OUT,</div><div class='add'>+	GPIO31_I2S_SYNC,</div><div class='add'>+	GPIO32_I2S_SYSCLK,</div><div class='add'>+</div><div class='add'>+	/* Infra-Red */</div><div class='add'>+	GPIO47_FICP_TXD,</div><div class='add'>+	GPIO46_FICP_RXD,</div><div class='add'>+</div><div class='add'>+	/* FFUART */</div><div class='add'>+	GPIO40_FFUART_DTR,</div><div class='add'>+	GPIO41_FFUART_RTS,</div><div class='add'>+	GPIO39_FFUART_TXD,</div><div class='add'>+	GPIO37_FFUART_DSR,</div><div class='add'>+	GPIO34_FFUART_RXD,</div><div class='add'>+	GPIO35_FFUART_CTS,</div><div class='add'>+</div><div class='add'>+	/* PC Card */</div><div class='add'>+	GPIO48_nPOE,</div><div class='add'>+	GPIO49_nPWE,</div><div class='add'>+	GPIO50_nPIOR,</div><div class='add'>+	GPIO51_nPIOW,</div><div class='add'>+	GPIO52_nPCE_1,</div><div class='add'>+	GPIO53_nPCE_2,</div><div class='add'>+	GPIO54_nPSKTSEL,</div><div class='add'>+	GPIO55_nPREG,</div><div class='add'>+	GPIO56_nPWAIT,</div><div class='add'>+	GPIO57_nIOIS16,</div><div class='add'>+</div><div class='add'>+	/* MMC */</div><div class='add'>+	GPIO6_MMC_CLK,</div><div class='add'>+	GPIO8_MMC_CS0,</div><div class='add'>+</div><div class='add'>+	/* GPIO */</div><div class='add'>+	GPIO9_GPIO,	/* CORGI_GPIO_nSD_DETECT */</div><div class='add'>+	GPIO7_GPIO,	/* CORGI_GPIO_nSD_WP */</div><div class='add'>+	GPIO33_GPIO,	/* CORGI_GPIO_SD_PWR */</div><div class='add'>+	GPIO22_GPIO,	/* CORGI_GPIO_IR_ON */</div><div class='add'>+	GPIO44_GPIO,	/* CORGI_GPIO_HSYNC */</div><div class='add'>+</div><div class='add'>+	GPIO1_GPIO | WAKEUP_ON_EDGE_RISE,</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Corgi SCOOP Device</div><div class='hunk'>@@ -67,6 +127,7 @@ static struct resource corgi_scoop_resources[] = {</div><div class='ctx'> static struct scoop_config corgi_scoop_setup = {</div><div class='ctx'> 	.io_dir 	= CORGI_SCOOP_IO_DIR,</div><div class='ctx'> 	.io_out		= CORGI_SCOOP_IO_OUT,</div><div class='add'>+	.gpio_base	= CORGI_SCOOP_GPIO_BASE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct platform_device corgiscoop_device = {</div><div class='hunk'>@@ -79,27 +140,6 @@ struct platform_device corgiscoop_device = {</div><div class='ctx'> 	.resource	= corgi_scoop_resources,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void corgi_pcmcia_init(void)</div><div class='del'>-{</div><div class='del'>-	/* Setup default state of GPIO outputs</div><div class='del'>-	   before we enable them as outputs. */</div><div class='del'>-	GPSR(GPIO48_nPOE) = GPIO_bit(GPIO48_nPOE) |</div><div class='del'>-		GPIO_bit(GPIO49_nPWE) | GPIO_bit(GPIO50_nPIOR) |</div><div class='del'>-		GPIO_bit(GPIO51_nPIOW) | GPIO_bit(GPIO52_nPCE_1) |</div><div class='del'>-		GPIO_bit(GPIO53_nPCE_2);</div><div class='del'>-</div><div class='del'>-	pxa_gpio_mode(GPIO48_nPOE_MD);</div><div class='del'>-	pxa_gpio_mode(GPIO49_nPWE_MD);</div><div class='del'>-	pxa_gpio_mode(GPIO50_nPIOR_MD);</div><div class='del'>-	pxa_gpio_mode(GPIO51_nPIOW_MD);</div><div class='del'>-	pxa_gpio_mode(GPIO55_nPREG_MD);</div><div class='del'>-	pxa_gpio_mode(GPIO56_nPWAIT_MD);</div><div class='del'>-	pxa_gpio_mode(GPIO57_nIOIS16_MD);</div><div class='del'>-	pxa_gpio_mode(GPIO52_nPCE_1_MD);</div><div class='del'>-	pxa_gpio_mode(GPIO53_nPCE_2_MD);</div><div class='del'>-	pxa_gpio_mode(GPIO54_pSKTSEL_MD);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static struct scoop_pcmcia_dev corgi_pcmcia_scoop[] = {</div><div class='ctx'> {</div><div class='ctx'> 	.dev        = &amp;corgiscoop_device.dev,</div><div class='hunk'>@@ -112,58 +152,10 @@ static struct scoop_pcmcia_dev corgi_pcmcia_scoop[] = {</div><div class='ctx'> static struct scoop_pcmcia_config corgi_pcmcia_config = {</div><div class='ctx'> 	.devs         = &amp;corgi_pcmcia_scoop[0],</div><div class='ctx'> 	.num_devs     = 1,</div><div class='del'>-	.pcmcia_init  = corgi_pcmcia_init,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(corgiscoop_device);</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Corgi SSP Device</div><div class='del'>- *</div><div class='del'>- * Set the parent as the scoop device because a lot of SSP devices</div><div class='del'>- * also use scoop functions and this makes the power up/down order</div><div class='del'>- * work correctly.</div><div class='del'>- */</div><div class='del'>-struct platform_device corgissp_device = {</div><div class='del'>-	.name		= "corgi-ssp",</div><div class='del'>-	.dev		= {</div><div class='del'>- 		.parent = &amp;corgiscoop_device.dev,</div><div class='del'>-	},</div><div class='del'>-	.id		= -1,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct corgissp_machinfo corgi_ssp_machinfo = {</div><div class='del'>-	.port		= 1,</div><div class='del'>-	.cs_lcdcon	= CORGI_GPIO_LCDCON_CS,</div><div class='del'>-	.cs_ads7846	= CORGI_GPIO_ADS7846_CS,</div><div class='del'>-	.cs_max1111	= CORGI_GPIO_MAX1111_CS,</div><div class='del'>-	.clk_lcdcon	= 76,</div><div class='del'>-	.clk_ads7846	= 2,</div><div class='del'>-	.clk_max1111	= 8,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * LCD/Framebuffer</div><div class='del'>- */</div><div class='del'>-static void w100_lcdtg_suspend(struct w100fb_par *par)</div><div class='del'>-{</div><div class='del'>-	corgi_lcdtg_suspend();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void w100_lcdtg_init(struct w100fb_par *par)</div><div class='del'>-{</div><div class='del'>-	corgi_lcdtg_hw_init(par-&gt;xres);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static struct w100_tg_info corgi_lcdtg_info = {</div><div class='del'>-	.change  = w100_lcdtg_init,</div><div class='del'>-	.suspend = w100_lcdtg_suspend,</div><div class='del'>-	.resume  = w100_lcdtg_init,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static struct w100_mem_info corgi_fb_mem = {</div><div class='ctx'> 	.ext_cntl          = 0x00040003,</div><div class='ctx'> 	.sdram_mode_reg    = 0x00650021,</div><div class='hunk'>@@ -242,7 +234,6 @@ static struct w100_mode corgi_fb_modes[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct w100fb_mach_info corgi_fb_info = {</div><div class='del'>-	.tg         = &amp;corgi_lcdtg_info,</div><div class='ctx'> 	.init_mode  = INIT_MODE_ROTATED,</div><div class='ctx'> 	.mem        = &amp;corgi_fb_mem,</div><div class='ctx'> 	.regs       = &amp;corgi_fb_regs,</div><div class='hunk'>@@ -268,60 +259,10 @@ static struct platform_device corgifb_device = {</div><div class='ctx'> 	.resource	= corgi_fb_resources,</div><div class='ctx'> 	.dev            = {</div><div class='ctx'> 		.platform_data = &amp;corgi_fb_info,</div><div class='del'>-		.parent = &amp;corgissp_device.dev,</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Corgi Backlight Device</div><div class='del'>- */</div><div class='del'>-static void corgi_bl_kick_battery(void)</div><div class='del'>-{</div><div class='del'>-	void (*kick_batt)(void);</div><div class='del'>-</div><div class='del'>-	kick_batt = symbol_get(sharpsl_battery_kick);</div><div class='del'>-	if (kick_batt) {</div><div class='del'>-		kick_batt();</div><div class='del'>-		symbol_put(sharpsl_battery_kick);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void corgi_bl_set_intensity(int intensity)</div><div class='del'>-{</div><div class='del'>-	if (intensity &gt; 0x10)</div><div class='del'>-		intensity += 0x10;</div><div class='del'>-</div><div class='del'>-	/* Bits 0-4 are accessed via the SSP interface */</div><div class='del'>-	corgi_ssp_blduty_set(intensity &amp; 0x1f);</div><div class='del'>-</div><div class='del'>-	/* Bit 5 is via SCOOP */</div><div class='del'>-	if (intensity &amp; 0x0020)</div><div class='del'>-		set_scoop_gpio(&amp;corgiscoop_device.dev, CORGI_SCP_BACKLIGHT_CONT);</div><div class='del'>-	else</div><div class='del'>-		reset_scoop_gpio(&amp;corgiscoop_device.dev, CORGI_SCP_BACKLIGHT_CONT);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct generic_bl_info corgi_bl_machinfo = {</div><div class='del'>-	.name = "corgi-bl",</div><div class='del'>-	.max_intensity = 0x2f,</div><div class='del'>-	.default_intensity = 0x1f,</div><div class='del'>-	.limit_mask = 0x0b,</div><div class='del'>-	.set_bl_intensity = corgi_bl_set_intensity,</div><div class='del'>-	.kick_battery = corgi_bl_kick_battery,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct platform_device corgibl_device = {</div><div class='del'>-	.name		= "generic-bl",</div><div class='del'>-	.dev		= {</div><div class='del'>- 		.parent = &amp;corgifb_device.dev,</div><div class='del'>-		.platform_data	= &amp;corgi_bl_machinfo,</div><div class='del'>-	},</div><div class='del'>-	.id		= -1,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Corgi Keyboard Device</div><div class='ctx'>  */</div><div class='hunk'>@@ -330,75 +271,35 @@ static struct platform_device corgikbd_device = {</div><div class='ctx'> 	.id		= -1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Corgi LEDs</div><div class='ctx'>  */</div><div class='del'>-static struct platform_device corgiled_device = {</div><div class='del'>-	.name		= "corgi-led",</div><div class='del'>-	.id		= -1,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Corgi Touch Screen Device</div><div class='del'>- */</div><div class='del'>-static unsigned long (*get_hsync_invperiod)(struct device *dev);</div><div class='del'>-</div><div class='del'>-static void inline sharpsl_wait_sync(int gpio)</div><div class='del'>-{</div><div class='del'>-	while((GPLR(gpio) &amp; GPIO_bit(gpio)) == 0);</div><div class='del'>-	while((GPLR(gpio) &amp; GPIO_bit(gpio)) != 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned long corgi_get_hsync_invperiod(void)</div><div class='del'>-{</div><div class='del'>-	if (!get_hsync_invperiod)</div><div class='del'>-		get_hsync_invperiod = symbol_get(w100fb_get_hsynclen);</div><div class='del'>-	if (!get_hsync_invperiod)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return get_hsync_invperiod(&amp;corgifb_device.dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void corgi_put_hsync(void)</div><div class='del'>-{</div><div class='del'>-	if (get_hsync_invperiod)</div><div class='del'>-		symbol_put(w100fb_get_hsynclen);</div><div class='del'>-	get_hsync_invperiod = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void corgi_wait_hsync(void)</div><div class='del'>-{</div><div class='del'>-	sharpsl_wait_sync(CORGI_GPIO_HSYNC);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct resource corgits_resources[] = {</div><div class='del'>-	[0] = {</div><div class='del'>-		.start		= CORGI_IRQ_GPIO_TP_INT,</div><div class='del'>-		.end		= CORGI_IRQ_GPIO_TP_INT,</div><div class='del'>-		.flags		= IORESOURCE_IRQ,</div><div class='add'>+static struct gpio_led corgi_gpio_leds[] = {</div><div class='add'>+	{</div><div class='add'>+		.name			= "corgi:amber:charge",</div><div class='add'>+		.default_trigger	= "sharpsl-charge",</div><div class='add'>+		.gpio			= CORGI_GPIO_LED_ORANGE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name			= "corgi:green:mail",</div><div class='add'>+		.default_trigger	= "nand-disk",</div><div class='add'>+		.gpio			= CORGI_GPIO_LED_GREEN,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct corgits_machinfo  corgi_ts_machinfo = {</div><div class='del'>-	.get_hsync_invperiod = corgi_get_hsync_invperiod,</div><div class='del'>-	.put_hsync           = corgi_put_hsync,</div><div class='del'>-	.wait_hsync          = corgi_wait_hsync,</div><div class='add'>+static struct gpio_led_platform_data corgi_gpio_leds_info = {</div><div class='add'>+	.leds		= corgi_gpio_leds,</div><div class='add'>+	.num_leds	= ARRAY_SIZE(corgi_gpio_leds),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct platform_device corgits_device = {</div><div class='del'>-	.name		= "corgi-ts",</div><div class='add'>+static struct platform_device corgiled_device = {</div><div class='add'>+	.name		= "leds-gpio",</div><div class='add'>+	.id		= -1,</div><div class='ctx'> 	.dev		= {</div><div class='del'>- 		.parent = &amp;corgissp_device.dev,</div><div class='del'>-		.platform_data	= &amp;corgi_ts_machinfo,</div><div class='add'>+		.platform_data = &amp;corgi_gpio_leds_info,</div><div class='ctx'> 	},</div><div class='del'>-	.id		= -1,</div><div class='del'>-	.num_resources	= ARRAY_SIZE(corgits_resources),</div><div class='del'>-	.resource	= corgits_resources,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * MMC/SD Device</div><div class='ctx'>  *</div><div class='hunk'>@@ -411,20 +312,42 @@ static int corgi_mci_init(struct device *dev, irq_handler_t corgi_detect_int, vo</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	/* setup GPIO for PXA25x MMC controller	*/</div><div class='del'>-	pxa_gpio_mode(GPIO6_MMCCLK_MD);</div><div class='del'>-	pxa_gpio_mode(GPIO8_MMCCS0_MD);</div><div class='del'>-	pxa_gpio_mode(CORGI_GPIO_nSD_DETECT | GPIO_IN);</div><div class='del'>-	pxa_gpio_mode(CORGI_GPIO_SD_PWR | GPIO_OUT);</div><div class='add'>+	err = gpio_request(CORGI_GPIO_nSD_DETECT, "nSD_DETECT");</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_out;</div><div class='ctx'> </div><div class='del'>-	corgi_mci_platform_data.detect_delay = msecs_to_jiffies(250);</div><div class='add'>+	err = gpio_request(CORGI_GPIO_nSD_WP, "nSD_WP");</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_free_1;</div><div class='ctx'> </div><div class='del'>-	err = request_irq(CORGI_IRQ_GPIO_nSD_DETECT, corgi_detect_int,</div><div class='del'>-			  IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,</div><div class='del'>-			  "MMC card detect", data);</div><div class='add'>+	err = gpio_request(CORGI_GPIO_SD_PWR, "SD_PWR");</div><div class='ctx'> 	if (err)</div><div class='del'>-		printk(KERN_ERR "corgi_mci_init: MMC/SD: can't request MMC card detect IRQ\n");</div><div class='add'>+		goto err_free_2;</div><div class='ctx'> </div><div class='add'>+	gpio_direction_input(CORGI_GPIO_nSD_DETECT);</div><div class='add'>+	gpio_direction_input(CORGI_GPIO_nSD_WP);</div><div class='add'>+	gpio_direction_output(CORGI_GPIO_SD_PWR, 0);</div><div class='add'>+</div><div class='add'>+	corgi_mci_platform_data.detect_delay = msecs_to_jiffies(250);</div><div class='add'>+</div><div class='add'>+	err = request_irq(CORGI_IRQ_GPIO_nSD_DETECT, corgi_detect_int,</div><div class='add'>+				IRQF_DISABLED | IRQF_TRIGGER_RISING |</div><div class='add'>+				IRQF_TRIGGER_FALLING,</div><div class='add'>+				"MMC card detect", data);</div><div class='add'>+	if (err) {</div><div class='add'>+		pr_err("%s: MMC/SD: can't request MMC card detect IRQ\n",</div><div class='add'>+				__func__);</div><div class='add'>+		goto err_free_3;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_free_3:</div><div class='add'>+	gpio_free(CORGI_GPIO_SD_PWR);</div><div class='add'>+err_free_2:</div><div class='add'>+	gpio_free(CORGI_GPIO_nSD_WP);</div><div class='add'>+err_free_1:</div><div class='add'>+	gpio_free(CORGI_GPIO_nSD_DETECT);</div><div class='add'>+err_out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -432,20 +355,20 @@ static void corgi_mci_setpower(struct device *dev, unsigned int vdd)</div><div class='ctx'> {</div><div class='ctx'> 	struct pxamci_platform_data* p_d = dev-&gt;platform_data;</div><div class='ctx'> </div><div class='del'>-	if (( 1 &lt;&lt; vdd) &amp; p_d-&gt;ocr_mask)</div><div class='del'>-		GPSR1 = GPIO_bit(CORGI_GPIO_SD_PWR);</div><div class='del'>-	else</div><div class='del'>-		GPCR1 = GPIO_bit(CORGI_GPIO_SD_PWR);</div><div class='add'>+	gpio_set_value(CORGI_GPIO_SD_PWR, ((1 &lt;&lt; vdd) &amp; p_d-&gt;ocr_mask));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int corgi_mci_get_ro(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	return GPLR(CORGI_GPIO_nSD_WP) &amp; GPIO_bit(CORGI_GPIO_nSD_WP);</div><div class='add'>+	return gpio_get_value(CORGI_GPIO_nSD_WP);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void corgi_mci_exit(struct device *dev, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	free_irq(CORGI_IRQ_GPIO_nSD_DETECT, data);</div><div class='add'>+	gpio_free(CORGI_GPIO_SD_PWR);</div><div class='add'>+	gpio_free(CORGI_GPIO_nSD_WP);</div><div class='add'>+	gpio_free(CORGI_GPIO_nSD_DETECT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct pxamci_platform_data corgi_mci_platform_data = {</div><div class='hunk'>@@ -462,16 +385,32 @@ static struct pxamci_platform_data corgi_mci_platform_data = {</div><div class='ctx'>  */</div><div class='ctx'> static void corgi_irda_transceiver_mode(struct device *dev, int mode)</div><div class='ctx'> {</div><div class='del'>-	if (mode &amp; IR_OFF)</div><div class='del'>-		GPSR(CORGI_GPIO_IR_ON) = GPIO_bit(CORGI_GPIO_IR_ON);</div><div class='del'>-	else</div><div class='del'>-		GPCR(CORGI_GPIO_IR_ON) = GPIO_bit(CORGI_GPIO_IR_ON);</div><div class='add'>+	gpio_set_value(CORGI_GPIO_IR_ON, mode &amp; IR_OFF);</div><div class='ctx'> 	pxa2xx_transceiver_mode(dev, mode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int corgi_irda_startup(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = gpio_request(CORGI_GPIO_IR_ON, "IR_ON");</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	gpio_direction_output(CORGI_GPIO_IR_ON, 1);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void corgi_irda_shutdown(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	gpio_free(CORGI_GPIO_IR_ON);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct pxaficp_platform_data corgi_ficp_platform_data = {</div><div class='del'>-	.transceiver_cap  = IR_SIRMODE | IR_OFF,</div><div class='del'>-	.transceiver_mode = corgi_irda_transceiver_mode,</div><div class='add'>+	.transceiver_cap	= IR_SIRMODE | IR_OFF,</div><div class='add'>+	.transceiver_mode	= corgi_irda_transceiver_mode,</div><div class='add'>+	.startup		= corgi_irda_startup,</div><div class='add'>+	.shutdown		= corgi_irda_shutdown,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -483,14 +422,129 @@ static struct pxa2xx_udc_mach_info udc_info __initdata = {</div><div class='ctx'> 	.gpio_pullup		= CORGI_GPIO_USB_PULLUP,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_SPI_PXA2XX) || defined(CONFIG_SPI_PXA2XX_MASTER)</div><div class='add'>+static struct pxa2xx_spi_master corgi_spi_info = {</div><div class='add'>+	.num_chipselect	= 3,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct ads7846_platform_data corgi_ads7846_info = {</div><div class='add'>+	.model			= 7846,</div><div class='add'>+	.vref_delay_usecs	= 100,</div><div class='add'>+	.x_plate_ohms		= 419,</div><div class='add'>+	.y_plate_ohms		= 486,</div><div class='add'>+	.gpio_pendown		= CORGI_GPIO_TP_INT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void corgi_ads7846_cs(u32 command)</div><div class='add'>+{</div><div class='add'>+	gpio_set_value(CORGI_GPIO_ADS7846_CS, !(command == PXA2XX_CS_ASSERT));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct pxa2xx_spi_chip corgi_ads7846_chip = {</div><div class='add'>+	.cs_control	= corgi_ads7846_cs,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void corgi_bl_kick_battery(void)</div><div class='add'>+{</div><div class='add'>+	void (*kick_batt)(void);</div><div class='add'>+</div><div class='add'>+	kick_batt = symbol_get(sharpsl_battery_kick);</div><div class='add'>+	if (kick_batt) {</div><div class='add'>+		kick_batt();</div><div class='add'>+		symbol_put(sharpsl_battery_kick);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct corgi_lcd_platform_data corgi_lcdcon_info = {</div><div class='add'>+	.init_mode		= CORGI_LCD_MODE_VGA,</div><div class='add'>+	.max_intensity		= 0x2f,</div><div class='add'>+	.default_intensity	= 0x1f,</div><div class='add'>+	.limit_mask		= 0x0b,</div><div class='add'>+	.gpio_backlight_cont	= CORGI_GPIO_BACKLIGHT_CONT,</div><div class='add'>+	.gpio_backlight_on	= -1,</div><div class='add'>+	.kick_battery		= corgi_bl_kick_battery,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void corgi_lcdcon_cs(u32 command)</div><div class='add'>+{</div><div class='add'>+	gpio_set_value(CORGI_GPIO_LCDCON_CS, !(command == PXA2XX_CS_ASSERT));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct pxa2xx_spi_chip corgi_lcdcon_chip = {</div><div class='add'>+	.cs_control	= corgi_lcdcon_cs,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void corgi_max1111_cs(u32 command)</div><div class='add'>+{</div><div class='add'>+	gpio_set_value(CORGI_GPIO_MAX1111_CS, !(command == PXA2XX_CS_ASSERT));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct pxa2xx_spi_chip corgi_max1111_chip = {</div><div class='add'>+	.cs_control	= corgi_max1111_cs,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct spi_board_info corgi_spi_devices[] = {</div><div class='add'>+	{</div><div class='add'>+		.modalias	= "ads7846",</div><div class='add'>+		.max_speed_hz	= 1200000,</div><div class='add'>+		.bus_num	= 1,</div><div class='add'>+		.chip_select	= 0,</div><div class='add'>+		.platform_data	= &amp;corgi_ads7846_info,</div><div class='add'>+		.controller_data= &amp;corgi_ads7846_chip,</div><div class='add'>+		.irq		= gpio_to_irq(CORGI_GPIO_TP_INT),</div><div class='add'>+	}, {</div><div class='add'>+		.modalias	= "corgi-lcd",</div><div class='add'>+		.max_speed_hz	= 50000,</div><div class='add'>+		.bus_num	= 1,</div><div class='add'>+		.chip_select	= 1,</div><div class='add'>+		.platform_data	= &amp;corgi_lcdcon_info,</div><div class='add'>+		.controller_data= &amp;corgi_lcdcon_chip,</div><div class='add'>+	}, {</div><div class='add'>+		.modalias	= "max1111",</div><div class='add'>+		.max_speed_hz	= 450000,</div><div class='add'>+		.bus_num	= 1,</div><div class='add'>+		.chip_select	= 2,</div><div class='add'>+		.controller_data= &amp;corgi_max1111_chip,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init corgi_init_spi(void)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = gpio_request(CORGI_GPIO_ADS7846_CS, "ADS7846_CS");</div><div class='add'>+	if (err)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	err = gpio_request(CORGI_GPIO_LCDCON_CS, "LCDCON_CS");</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_free_1;</div><div class='add'>+</div><div class='add'>+	err = gpio_request(CORGI_GPIO_MAX1111_CS, "MAX1111_CS");</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_free_2;</div><div class='add'>+</div><div class='add'>+	gpio_direction_output(CORGI_GPIO_ADS7846_CS, 1);</div><div class='add'>+	gpio_direction_output(CORGI_GPIO_LCDCON_CS, 1);</div><div class='add'>+	gpio_direction_output(CORGI_GPIO_MAX1111_CS, 1);</div><div class='add'>+</div><div class='add'>+	pxa2xx_set_spi_info(1, &amp;corgi_spi_info);</div><div class='add'>+	spi_register_board_info(ARRAY_AND_SIZE(corgi_spi_devices));</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+err_free_2:</div><div class='add'>+	gpio_free(CORGI_GPIO_LCDCON_CS);</div><div class='add'>+err_free_1:</div><div class='add'>+	gpio_free(CORGI_GPIO_ADS7846_CS);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline void corgi_init_spi(void) {}</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> static struct platform_device *devices[] __initdata = {</div><div class='ctx'> 	&amp;corgiscoop_device,</div><div class='del'>-	&amp;corgissp_device,</div><div class='ctx'> 	&amp;corgifb_device,</div><div class='ctx'> 	&amp;corgikbd_device,</div><div class='del'>-	&amp;corgibl_device,</div><div class='del'>-	&amp;corgits_device,</div><div class='ctx'> 	&amp;corgiled_device,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -498,7 +552,8 @@ static void corgi_poweroff(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (!machine_is_corgi())</div><div class='ctx'> 		/* Green LED off tells the bootloader to halt */</div><div class='del'>-		reset_scoop_gpio(&amp;corgiscoop_device.dev, CORGI_SCP_LED_GREEN);</div><div class='add'>+		gpio_set_value(CORGI_GPIO_LED_GREEN, 0);</div><div class='add'>+</div><div class='ctx'> 	arm_machine_restart('h');</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -506,7 +561,8 @@ static void corgi_restart(char mode)</div><div class='ctx'> {</div><div class='ctx'> 	if (!machine_is_corgi())</div><div class='ctx'> 		/* Green LED on tells the bootloader to reboot */</div><div class='del'>-		set_scoop_gpio(&amp;corgiscoop_device.dev, CORGI_SCP_LED_GREEN);</div><div class='add'>+		gpio_set_value(CORGI_GPIO_LED_GREEN, 1);</div><div class='add'>+</div><div class='ctx'> 	arm_machine_restart('h');</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -515,20 +571,12 @@ static void __init corgi_init(void)</div><div class='ctx'> 	pm_power_off = corgi_poweroff;</div><div class='ctx'> 	arm_pm_restart = corgi_restart;</div><div class='ctx'> </div><div class='del'>-	/* setup sleep mode values */</div><div class='del'>-	PWER  = 0x00000002;</div><div class='del'>-	PFER  = 0x00000000;</div><div class='del'>-	PRER  = 0x00000002;</div><div class='del'>-	PGSR0 = 0x0158C000;</div><div class='del'>-	PGSR1 = 0x00FF0080;</div><div class='del'>-	PGSR2 = 0x0001C004;</div><div class='ctx'> 	/* Stop 3.6MHz and drive HIGH to PCMCIA and CS */</div><div class='ctx'> 	PCFR |= PCFR_OPDE;</div><div class='ctx'> </div><div class='del'>-	corgi_ssp_set_machinfo(&amp;corgi_ssp_machinfo);</div><div class='add'>+	pxa2xx_mfp_config(ARRAY_AND_SIZE(corgi_pin_config));</div><div class='ctx'> </div><div class='del'>-	pxa_gpio_mode(CORGI_GPIO_IR_ON | GPIO_OUT);</div><div class='del'>-	pxa_gpio_mode(CORGI_GPIO_HSYNC | GPIO_IN);</div><div class='add'>+	corgi_init_spi();</div><div class='ctx'> </div><div class='ctx'>  	pxa_set_udc_info(&amp;udc_info);</div><div class='ctx'> 	pxa_set_mci_info(&amp;corgi_mci_platform_data);</div><div class='head'>diff --git a/arch/arm/mach-pxa/corgi_lcd.c b/arch/arm/mach-pxa/corgi_lcd.c<br/>deleted file mode 100644<br/>index 311baf149b07..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/corgi_lcd.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pxa/corgi_lcd.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,290 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * linux/arch/arm/mach-pxa/corgi_lcd.c</div><div class='del'>- *</div><div class='del'>- * Corgi/Spitz LCD Specific Code</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2005 Richard Purdie</div><div class='del'>- *</div><div class='del'>- * Connectivity:</div><div class='del'>- *   Corgi - LCD to ATI Imageon w100 (Wallaby)</div><div class='del'>- *   Spitz - LCD to PXA Framebuffer</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;mach/akita.h&gt;</div><div class='del'>-#include &lt;mach/corgi.h&gt;</div><div class='del'>-#include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;mach/pxa-regs.h&gt;</div><div class='del'>-#include &lt;mach/sharpsl.h&gt;</div><div class='del'>-#include &lt;mach/spitz.h&gt;</div><div class='del'>-#include &lt;asm/hardware/scoop.h&gt;</div><div class='del'>-#include &lt;asm/mach/sharpsl_param.h&gt;</div><div class='del'>-#include "generic.h"</div><div class='del'>-</div><div class='del'>-/* Register Addresses */</div><div class='del'>-#define RESCTL_ADRS     0x00</div><div class='del'>-#define PHACTRL_ADRS    0x01</div><div class='del'>-#define DUTYCTRL_ADRS   0x02</div><div class='del'>-#define POWERREG0_ADRS  0x03</div><div class='del'>-#define POWERREG1_ADRS  0x04</div><div class='del'>-#define GPOR3_ADRS      0x05</div><div class='del'>-#define PICTRL_ADRS     0x06</div><div class='del'>-#define POLCTRL_ADRS    0x07</div><div class='del'>-</div><div class='del'>-/* Register Bit Definitions */</div><div class='del'>-#define RESCTL_QVGA     0x01</div><div class='del'>-#define RESCTL_VGA      0x00</div><div class='del'>-</div><div class='del'>-#define POWER1_VW_ON    0x01  /* VW Supply FET ON */</div><div class='del'>-#define POWER1_GVSS_ON  0x02  /* GVSS(-8V) Power Supply ON */</div><div class='del'>-#define POWER1_VDD_ON   0x04  /* VDD(8V),SVSS(-4V) Power Supply ON */</div><div class='del'>-</div><div class='del'>-#define POWER1_VW_OFF   0x00  /* VW Supply FET OFF */</div><div class='del'>-#define POWER1_GVSS_OFF 0x00  /* GVSS(-8V) Power Supply OFF */</div><div class='del'>-#define POWER1_VDD_OFF  0x00  /* VDD(8V),SVSS(-4V) Power Supply OFF */</div><div class='del'>-</div><div class='del'>-#define POWER0_COM_DCLK 0x01  /* COM Voltage DC Bias DAC Serial Data Clock */</div><div class='del'>-#define POWER0_COM_DOUT 0x02  /* COM Voltage DC Bias DAC Serial Data Out */</div><div class='del'>-#define POWER0_DAC_ON   0x04  /* DAC Power Supply ON */</div><div class='del'>-#define POWER0_COM_ON   0x08  /* COM Power Supply ON */</div><div class='del'>-#define POWER0_VCC5_ON  0x10  /* VCC5 Power Supply ON */</div><div class='del'>-</div><div class='del'>-#define POWER0_DAC_OFF  0x00  /* DAC Power Supply OFF */</div><div class='del'>-#define POWER0_COM_OFF  0x00  /* COM Power Supply OFF */</div><div class='del'>-#define POWER0_VCC5_OFF 0x00  /* VCC5 Power Supply OFF */</div><div class='del'>-</div><div class='del'>-#define PICTRL_INIT_STATE      0x01</div><div class='del'>-#define PICTRL_INIOFF          0x02</div><div class='del'>-#define PICTRL_POWER_DOWN      0x04</div><div class='del'>-#define PICTRL_COM_SIGNAL_OFF  0x08</div><div class='del'>-#define PICTRL_DAC_SIGNAL_OFF  0x10</div><div class='del'>-</div><div class='del'>-#define POLCTRL_SYNC_POL_FALL  0x01</div><div class='del'>-#define POLCTRL_EN_POL_FALL    0x02</div><div class='del'>-#define POLCTRL_DATA_POL_FALL  0x04</div><div class='del'>-#define POLCTRL_SYNC_ACT_H     0x08</div><div class='del'>-#define POLCTRL_EN_ACT_L       0x10</div><div class='del'>-</div><div class='del'>-#define POLCTRL_SYNC_POL_RISE  0x00</div><div class='del'>-#define POLCTRL_EN_POL_RISE    0x00</div><div class='del'>-#define POLCTRL_DATA_POL_RISE  0x00</div><div class='del'>-#define POLCTRL_SYNC_ACT_L     0x00</div><div class='del'>-#define POLCTRL_EN_ACT_H       0x00</div><div class='del'>-</div><div class='del'>-#define PHACTRL_PHASE_MANUAL   0x01</div><div class='del'>-#define DEFAULT_PHAD_QVGA     (9)</div><div class='del'>-#define DEFAULT_COMADJ        (125)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This is only a psuedo I2C interface. We can't use the standard kernel</div><div class='del'>- * routines as the interface is write only. We just assume the data is acked...</div><div class='del'>- */</div><div class='del'>-static void lcdtg_ssp_i2c_send(u8 data)</div><div class='del'>-{</div><div class='del'>-	corgi_ssp_lcdtg_send(POWERREG0_ADRS, data);</div><div class='del'>-	udelay(10);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void lcdtg_i2c_send_bit(u8 data)</div><div class='del'>-{</div><div class='del'>-	lcdtg_ssp_i2c_send(data);</div><div class='del'>-	lcdtg_ssp_i2c_send(data | POWER0_COM_DCLK);</div><div class='del'>-	lcdtg_ssp_i2c_send(data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void lcdtg_i2c_send_start(u8 base)</div><div class='del'>-{</div><div class='del'>-	lcdtg_ssp_i2c_send(base | POWER0_COM_DCLK | POWER0_COM_DOUT);</div><div class='del'>-	lcdtg_ssp_i2c_send(base | POWER0_COM_DCLK);</div><div class='del'>-	lcdtg_ssp_i2c_send(base);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void lcdtg_i2c_send_stop(u8 base)</div><div class='del'>-{</div><div class='del'>-	lcdtg_ssp_i2c_send(base);</div><div class='del'>-	lcdtg_ssp_i2c_send(base | POWER0_COM_DCLK);</div><div class='del'>-	lcdtg_ssp_i2c_send(base | POWER0_COM_DCLK | POWER0_COM_DOUT);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void lcdtg_i2c_send_byte(u8 base, u8 data)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	for (i = 0; i &lt; 8; i++) {</div><div class='del'>-		if (data &amp; 0x80)</div><div class='del'>-			lcdtg_i2c_send_bit(base | POWER0_COM_DOUT);</div><div class='del'>-		else</div><div class='del'>-			lcdtg_i2c_send_bit(base);</div><div class='del'>-		data &lt;&lt;= 1;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void lcdtg_i2c_wait_ack(u8 base)</div><div class='del'>-{</div><div class='del'>-	lcdtg_i2c_send_bit(base);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void lcdtg_set_common_voltage(u8 base_data, u8 data)</div><div class='del'>-{</div><div class='del'>-	/* Set Common Voltage to M62332FP via I2C */</div><div class='del'>-	lcdtg_i2c_send_start(base_data);</div><div class='del'>-	lcdtg_i2c_send_byte(base_data, 0x9c);</div><div class='del'>-	lcdtg_i2c_wait_ack(base_data);</div><div class='del'>-	lcdtg_i2c_send_byte(base_data, 0x00);</div><div class='del'>-	lcdtg_i2c_wait_ack(base_data);</div><div class='del'>-	lcdtg_i2c_send_byte(base_data, data);</div><div class='del'>-	lcdtg_i2c_wait_ack(base_data);</div><div class='del'>-	lcdtg_i2c_send_stop(base_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Set Phase Adjust */</div><div class='del'>-static void lcdtg_set_phadadj(int mode)</div><div class='del'>-{</div><div class='del'>-	int adj;</div><div class='del'>-	switch(mode) {</div><div class='del'>-		case 480:</div><div class='del'>-		case 640:</div><div class='del'>-			/* Setting for VGA */</div><div class='del'>-			adj = sharpsl_param.phadadj;</div><div class='del'>-			if (adj &lt; 0) {</div><div class='del'>-				adj = PHACTRL_PHASE_MANUAL;</div><div class='del'>-			} else {</div><div class='del'>-				adj = ((adj &amp; 0x0f) &lt;&lt; 1) | PHACTRL_PHASE_MANUAL;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case 240:</div><div class='del'>-		case 320:</div><div class='del'>-		default:</div><div class='del'>-			/* Setting for QVGA */</div><div class='del'>-			adj = (DEFAULT_PHAD_QVGA &lt;&lt; 1) | PHACTRL_PHASE_MANUAL;</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	corgi_ssp_lcdtg_send(PHACTRL_ADRS, adj);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int lcd_inited;</div><div class='del'>-</div><div class='del'>-void corgi_lcdtg_hw_init(int mode)</div><div class='del'>-{</div><div class='del'>-	if (!lcd_inited) {</div><div class='del'>-		int comadj;</div><div class='del'>-</div><div class='del'>-		/* Initialize Internal Logic &amp; Port */</div><div class='del'>-		corgi_ssp_lcdtg_send(PICTRL_ADRS, PICTRL_POWER_DOWN | PICTRL_INIOFF | PICTRL_INIT_STATE</div><div class='del'>-	  			| PICTRL_COM_SIGNAL_OFF | PICTRL_DAC_SIGNAL_OFF);</div><div class='del'>-</div><div class='del'>-		corgi_ssp_lcdtg_send(POWERREG0_ADRS, POWER0_COM_DCLK | POWER0_COM_DOUT | POWER0_DAC_OFF</div><div class='del'>-				| POWER0_COM_OFF | POWER0_VCC5_OFF);</div><div class='del'>-</div><div class='del'>-		corgi_ssp_lcdtg_send(POWERREG1_ADRS, POWER1_VW_OFF | POWER1_GVSS_OFF | POWER1_VDD_OFF);</div><div class='del'>-</div><div class='del'>-		/* VDD(+8V), SVSS(-4V) ON */</div><div class='del'>-		corgi_ssp_lcdtg_send(POWERREG1_ADRS, POWER1_VW_OFF | POWER1_GVSS_OFF | POWER1_VDD_ON);</div><div class='del'>-		mdelay(3);</div><div class='del'>-</div><div class='del'>-		/* DAC ON */</div><div class='del'>-		corgi_ssp_lcdtg_send(POWERREG0_ADRS, POWER0_COM_DCLK | POWER0_COM_DOUT | POWER0_DAC_ON</div><div class='del'>-				| POWER0_COM_OFF | POWER0_VCC5_OFF);</div><div class='del'>-</div><div class='del'>-		/* INIB = H, INI = L  */</div><div class='del'>-		/* PICTL[0] = H , PICTL[1] = PICTL[2] = PICTL[4] = L */</div><div class='del'>-		corgi_ssp_lcdtg_send(PICTRL_ADRS, PICTRL_INIT_STATE | PICTRL_COM_SIGNAL_OFF);</div><div class='del'>-</div><div class='del'>-		/* Set Common Voltage */</div><div class='del'>-		comadj = sharpsl_param.comadj;</div><div class='del'>-		if (comadj &lt; 0)</div><div class='del'>-			comadj = DEFAULT_COMADJ;</div><div class='del'>-		lcdtg_set_common_voltage((POWER0_DAC_ON | POWER0_COM_OFF | POWER0_VCC5_OFF), comadj);</div><div class='del'>-</div><div class='del'>-		/* VCC5 ON, DAC ON */</div><div class='del'>-		corgi_ssp_lcdtg_send(POWERREG0_ADRS, POWER0_COM_DCLK | POWER0_COM_DOUT | POWER0_DAC_ON |</div><div class='del'>-				POWER0_COM_OFF | POWER0_VCC5_ON);</div><div class='del'>-</div><div class='del'>-		/* GVSS(-8V) ON, VDD ON */</div><div class='del'>-		corgi_ssp_lcdtg_send(POWERREG1_ADRS, POWER1_VW_OFF | POWER1_GVSS_ON | POWER1_VDD_ON);</div><div class='del'>-		mdelay(2);</div><div class='del'>-</div><div class='del'>-		/* COM SIGNAL ON (PICTL[3] = L) */</div><div class='del'>-		corgi_ssp_lcdtg_send(PICTRL_ADRS, PICTRL_INIT_STATE);</div><div class='del'>-</div><div class='del'>-		/* COM ON, DAC ON, VCC5_ON */</div><div class='del'>-		corgi_ssp_lcdtg_send(POWERREG0_ADRS, POWER0_COM_DCLK | POWER0_COM_DOUT | POWER0_DAC_ON</div><div class='del'>-				| POWER0_COM_ON | POWER0_VCC5_ON);</div><div class='del'>-</div><div class='del'>-		/* VW ON, GVSS ON, VDD ON */</div><div class='del'>-		corgi_ssp_lcdtg_send(POWERREG1_ADRS, POWER1_VW_ON | POWER1_GVSS_ON | POWER1_VDD_ON);</div><div class='del'>-</div><div class='del'>-		/* Signals output enable */</div><div class='del'>-		corgi_ssp_lcdtg_send(PICTRL_ADRS, 0);</div><div class='del'>-</div><div class='del'>-		/* Set Phase Adjust */</div><div class='del'>-		lcdtg_set_phadadj(mode);</div><div class='del'>-</div><div class='del'>-		/* Initialize for Input Signals from ATI */</div><div class='del'>-		corgi_ssp_lcdtg_send(POLCTRL_ADRS, POLCTRL_SYNC_POL_RISE | POLCTRL_EN_POL_RISE</div><div class='del'>-				| POLCTRL_DATA_POL_RISE | POLCTRL_SYNC_ACT_L | POLCTRL_EN_ACT_H);</div><div class='del'>-		udelay(1000);</div><div class='del'>-</div><div class='del'>-		lcd_inited=1;</div><div class='del'>-	} else {</div><div class='del'>-		lcdtg_set_phadadj(mode);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch(mode) {</div><div class='del'>-		case 480:</div><div class='del'>-		case 640:</div><div class='del'>-			/* Set Lcd Resolution (VGA) */</div><div class='del'>-			corgi_ssp_lcdtg_send(RESCTL_ADRS, RESCTL_VGA);</div><div class='del'>-			break;</div><div class='del'>-		case 240:</div><div class='del'>-		case 320:</div><div class='del'>-		default:</div><div class='del'>-			/* Set Lcd Resolution (QVGA) */</div><div class='del'>-			corgi_ssp_lcdtg_send(RESCTL_ADRS, RESCTL_QVGA);</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void corgi_lcdtg_suspend(void)</div><div class='del'>-{</div><div class='del'>-	/* 60Hz x 2 frame = 16.7msec x 2 = 33.4 msec */</div><div class='del'>-	mdelay(34);</div><div class='del'>-</div><div class='del'>-	/* (1)VW OFF */</div><div class='del'>-	corgi_ssp_lcdtg_send(POWERREG1_ADRS, POWER1_VW_OFF | POWER1_GVSS_ON | POWER1_VDD_ON);</div><div class='del'>-</div><div class='del'>-	/* (2)COM OFF */</div><div class='del'>-	corgi_ssp_lcdtg_send(PICTRL_ADRS, PICTRL_COM_SIGNAL_OFF);</div><div class='del'>-	corgi_ssp_lcdtg_send(POWERREG0_ADRS, POWER0_DAC_ON | POWER0_COM_OFF | POWER0_VCC5_ON);</div><div class='del'>-</div><div class='del'>-	/* (3)Set Common Voltage Bias 0V */</div><div class='del'>-	lcdtg_set_common_voltage(POWER0_DAC_ON | POWER0_COM_OFF | POWER0_VCC5_ON, 0);</div><div class='del'>-</div><div class='del'>-	/* (4)GVSS OFF */</div><div class='del'>-	corgi_ssp_lcdtg_send(POWERREG1_ADRS, POWER1_VW_OFF | POWER1_GVSS_OFF | POWER1_VDD_ON);</div><div class='del'>-</div><div class='del'>-	/* (5)VCC5 OFF */</div><div class='del'>-	corgi_ssp_lcdtg_send(POWERREG0_ADRS, POWER0_DAC_ON | POWER0_COM_OFF | POWER0_VCC5_OFF);</div><div class='del'>-</div><div class='del'>-	/* (6)Set PDWN, INIOFF, DACOFF */</div><div class='del'>-	corgi_ssp_lcdtg_send(PICTRL_ADRS, PICTRL_INIOFF | PICTRL_DAC_SIGNAL_OFF |</div><div class='del'>-			PICTRL_POWER_DOWN | PICTRL_COM_SIGNAL_OFF);</div><div class='del'>-</div><div class='del'>-	/* (7)DAC OFF */</div><div class='del'>-	corgi_ssp_lcdtg_send(POWERREG0_ADRS, POWER0_DAC_OFF | POWER0_COM_OFF | POWER0_VCC5_OFF);</div><div class='del'>-</div><div class='del'>-	/* (8)VDD OFF */</div><div class='del'>-	corgi_ssp_lcdtg_send(POWERREG1_ADRS, POWER1_VW_OFF | POWER1_GVSS_OFF | POWER1_VDD_OFF);</div><div class='del'>-</div><div class='del'>-	lcd_inited = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/arch/arm/mach-pxa/corgi_pm.c b/arch/arm/mach-pxa/corgi_pm.c<br/>index 35bbfccd2df3..eb7d6c94aa42 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/corgi_pm.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pxa/corgi_pm.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/corgi_pm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/corgi_pm.c</a></div><div class='hunk'>@@ -21,7 +21,6 @@</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/hardware/scoop.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/sharpsl.h&gt;</div><div class='ctx'> #include &lt;mach/corgi.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-pxa/corgi_ssp.c b/arch/arm/mach-pxa/corgi_ssp.c<br/>deleted file mode 100644<br/>index 8e2f2215c4ba..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/corgi_ssp.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pxa/corgi_ssp.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,276 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  SSP control code for Sharp Corgi devices</div><div class='del'>- *</div><div class='del'>- *  Copyright (c) 2004-2005 Richard Purdie</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License version 2 as</div><div class='del'>- *  published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/mach-types.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;mach/ssp.h&gt;</div><div class='del'>-#include &lt;mach/pxa-regs.h&gt;</div><div class='del'>-#include &lt;mach/pxa2xx-gpio.h&gt;</div><div class='del'>-#include &lt;mach/regs-ssp.h&gt;</div><div class='del'>-#include "sharpsl.h"</div><div class='del'>-</div><div class='del'>-static DEFINE_SPINLOCK(corgi_ssp_lock);</div><div class='del'>-static struct ssp_dev corgi_ssp_dev;</div><div class='del'>-static struct ssp_state corgi_ssp_state;</div><div class='del'>-static struct corgissp_machinfo *ssp_machinfo;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * There are three devices connected to the SSP interface:</div><div class='del'>- *   1. A touchscreen controller (TI ADS7846 compatible)</div><div class='del'>- *   2. An LCD controller (with some Backlight functionality)</div><div class='del'>- *   3. A battery monitoring IC (Maxim MAX1111)</div><div class='del'>- *</div><div class='del'>- * Each device uses a different speed/mode of communication.</div><div class='del'>- *</div><div class='del'>- * The touchscreen is very sensitive and the most frequently used</div><div class='del'>- * so the port is left configured for this.</div><div class='del'>- *</div><div class='del'>- * Devices are selected using Chip Selects on GPIOs.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *  ADS7846 Routines</div><div class='del'>- */</div><div class='del'>-unsigned long corgi_ssp_ads7846_putget(ulong data)</div><div class='del'>-{</div><div class='del'>-	unsigned long flag;</div><div class='del'>-	u32 ret = 0;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;corgi_ssp_lock, flag);</div><div class='del'>-	if (ssp_machinfo-&gt;cs_ads7846 &gt;= 0)</div><div class='del'>-		GPCR(ssp_machinfo-&gt;cs_ads7846) = GPIO_bit(ssp_machinfo-&gt;cs_ads7846);</div><div class='del'>-</div><div class='del'>-	ssp_write_word(&amp;corgi_ssp_dev,data);</div><div class='del'>- 	ssp_read_word(&amp;corgi_ssp_dev, &amp;ret);</div><div class='del'>-</div><div class='del'>-	if (ssp_machinfo-&gt;cs_ads7846 &gt;= 0)</div><div class='del'>-		GPSR(ssp_machinfo-&gt;cs_ads7846) = GPIO_bit(ssp_machinfo-&gt;cs_ads7846);</div><div class='del'>-	spin_unlock_irqrestore(&amp;corgi_ssp_lock, flag);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * NOTE: These functions should always be called in interrupt context</div><div class='del'>- * and use the _lock and _unlock functions. They are very time sensitive.</div><div class='del'>- */</div><div class='del'>-void corgi_ssp_ads7846_lock(void)</div><div class='del'>-{</div><div class='del'>-	spin_lock(&amp;corgi_ssp_lock);</div><div class='del'>-	if (ssp_machinfo-&gt;cs_ads7846 &gt;= 0)</div><div class='del'>-		GPCR(ssp_machinfo-&gt;cs_ads7846) = GPIO_bit(ssp_machinfo-&gt;cs_ads7846);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void corgi_ssp_ads7846_unlock(void)</div><div class='del'>-{</div><div class='del'>-	if (ssp_machinfo-&gt;cs_ads7846 &gt;= 0)</div><div class='del'>-		GPSR(ssp_machinfo-&gt;cs_ads7846) = GPIO_bit(ssp_machinfo-&gt;cs_ads7846);</div><div class='del'>-	spin_unlock(&amp;corgi_ssp_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void corgi_ssp_ads7846_put(ulong data)</div><div class='del'>-{</div><div class='del'>-	ssp_write_word(&amp;corgi_ssp_dev,data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-unsigned long corgi_ssp_ads7846_get(void)</div><div class='del'>-{</div><div class='del'>-	u32 ret = 0;</div><div class='del'>-	ssp_read_word(&amp;corgi_ssp_dev, &amp;ret);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(corgi_ssp_ads7846_putget);</div><div class='del'>-EXPORT_SYMBOL(corgi_ssp_ads7846_lock);</div><div class='del'>-EXPORT_SYMBOL(corgi_ssp_ads7846_unlock);</div><div class='del'>-EXPORT_SYMBOL(corgi_ssp_ads7846_put);</div><div class='del'>-EXPORT_SYMBOL(corgi_ssp_ads7846_get);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *  LCD/Backlight Routines</div><div class='del'>- */</div><div class='del'>-unsigned long corgi_ssp_dac_put(ulong data)</div><div class='del'>-{</div><div class='del'>-	unsigned long flag, sscr1 = SSCR1_SPH;</div><div class='del'>-	u32 tmp;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;corgi_ssp_lock, flag);</div><div class='del'>-</div><div class='del'>-	if (machine_is_spitz() || machine_is_akita() || machine_is_borzoi())</div><div class='del'>-		sscr1 = 0;</div><div class='del'>-</div><div class='del'>-	ssp_disable(&amp;corgi_ssp_dev);</div><div class='del'>-	ssp_config(&amp;corgi_ssp_dev, (SSCR0_Motorola | (SSCR0_DSS &amp; 0x07 )), sscr1, 0, SSCR0_SerClkDiv(ssp_machinfo-&gt;clk_lcdcon));</div><div class='del'>-	ssp_enable(&amp;corgi_ssp_dev);</div><div class='del'>-</div><div class='del'>-	if (ssp_machinfo-&gt;cs_lcdcon &gt;= 0)</div><div class='del'>-		GPCR(ssp_machinfo-&gt;cs_lcdcon) = GPIO_bit(ssp_machinfo-&gt;cs_lcdcon);</div><div class='del'>-	ssp_write_word(&amp;corgi_ssp_dev,data);</div><div class='del'>-	/* Read null data back from device to prevent SSP overflow */</div><div class='del'>-	ssp_read_word(&amp;corgi_ssp_dev, &amp;tmp);</div><div class='del'>-	if (ssp_machinfo-&gt;cs_lcdcon &gt;= 0)</div><div class='del'>-		GPSR(ssp_machinfo-&gt;cs_lcdcon) = GPIO_bit(ssp_machinfo-&gt;cs_lcdcon);</div><div class='del'>-</div><div class='del'>-	ssp_disable(&amp;corgi_ssp_dev);</div><div class='del'>-	ssp_config(&amp;corgi_ssp_dev, (SSCR0_National | (SSCR0_DSS &amp; 0x0b )), 0, 0, SSCR0_SerClkDiv(ssp_machinfo-&gt;clk_ads7846));</div><div class='del'>-	ssp_enable(&amp;corgi_ssp_dev);</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;corgi_ssp_lock, flag);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void corgi_ssp_lcdtg_send(u8 adrs, u8 data)</div><div class='del'>-{</div><div class='del'>-	corgi_ssp_dac_put(((adrs &amp; 0x07) &lt;&lt; 5) | (data &amp; 0x1f));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void corgi_ssp_blduty_set(int duty)</div><div class='del'>-{</div><div class='del'>-	corgi_ssp_lcdtg_send(0x02,duty);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(corgi_ssp_lcdtg_send);</div><div class='del'>-EXPORT_SYMBOL(corgi_ssp_blduty_set);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *  Max1111 Routines</div><div class='del'>- */</div><div class='del'>-int corgi_ssp_max1111_get(ulong data)</div><div class='del'>-{</div><div class='del'>-	unsigned long flag;</div><div class='del'>-	long voltage = 0, voltage1 = 0, voltage2 = 0;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;corgi_ssp_lock, flag);</div><div class='del'>-	if (ssp_machinfo-&gt;cs_max1111 &gt;= 0)</div><div class='del'>-		GPCR(ssp_machinfo-&gt;cs_max1111) = GPIO_bit(ssp_machinfo-&gt;cs_max1111);</div><div class='del'>-	ssp_disable(&amp;corgi_ssp_dev);</div><div class='del'>-	ssp_config(&amp;corgi_ssp_dev, (SSCR0_Motorola | (SSCR0_DSS &amp; 0x07 )), 0, 0, SSCR0_SerClkDiv(ssp_machinfo-&gt;clk_max1111));</div><div class='del'>-	ssp_enable(&amp;corgi_ssp_dev);</div><div class='del'>-</div><div class='del'>-	udelay(1);</div><div class='del'>-</div><div class='del'>-	/* TB1/RB1 */</div><div class='del'>-	ssp_write_word(&amp;corgi_ssp_dev,data);</div><div class='del'>-	ssp_read_word(&amp;corgi_ssp_dev, (u32*)&amp;voltage1); /* null read */</div><div class='del'>-</div><div class='del'>-	/* TB12/RB2 */</div><div class='del'>-	ssp_write_word(&amp;corgi_ssp_dev,0);</div><div class='del'>-	ssp_read_word(&amp;corgi_ssp_dev, (u32*)&amp;voltage1);</div><div class='del'>-</div><div class='del'>-	/* TB13/RB3*/</div><div class='del'>-	ssp_write_word(&amp;corgi_ssp_dev,0);</div><div class='del'>-	ssp_read_word(&amp;corgi_ssp_dev, (u32*)&amp;voltage2);</div><div class='del'>-</div><div class='del'>-	ssp_disable(&amp;corgi_ssp_dev);</div><div class='del'>-	ssp_config(&amp;corgi_ssp_dev, (SSCR0_National | (SSCR0_DSS &amp; 0x0b )), 0, 0, SSCR0_SerClkDiv(ssp_machinfo-&gt;clk_ads7846));</div><div class='del'>-	ssp_enable(&amp;corgi_ssp_dev);</div><div class='del'>-	if (ssp_machinfo-&gt;cs_max1111 &gt;= 0)</div><div class='del'>-		GPSR(ssp_machinfo-&gt;cs_max1111) = GPIO_bit(ssp_machinfo-&gt;cs_max1111);</div><div class='del'>-	spin_unlock_irqrestore(&amp;corgi_ssp_lock, flag);</div><div class='del'>-</div><div class='del'>-	if (voltage1 &amp; 0xc0 || voltage2 &amp; 0x3f)</div><div class='del'>-		voltage = -1;</div><div class='del'>-	else</div><div class='del'>-		voltage = ((voltage1 &lt;&lt; 2) &amp; 0xfc) | ((voltage2 &gt;&gt; 6) &amp; 0x03);</div><div class='del'>-</div><div class='del'>-	return voltage;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(corgi_ssp_max1111_get);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *  Support Routines</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-void __init corgi_ssp_set_machinfo(struct corgissp_machinfo *machinfo)</div><div class='del'>-{</div><div class='del'>-	ssp_machinfo = machinfo;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init corgi_ssp_probe(struct platform_device *dev)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	/* Chip Select - Disable All */</div><div class='del'>-	if (ssp_machinfo-&gt;cs_lcdcon &gt;= 0)</div><div class='del'>-		pxa_gpio_mode(ssp_machinfo-&gt;cs_lcdcon  | GPIO_OUT | GPIO_DFLT_HIGH);</div><div class='del'>-	if (ssp_machinfo-&gt;cs_max1111 &gt;= 0)</div><div class='del'>-	        pxa_gpio_mode(ssp_machinfo-&gt;cs_max1111 | GPIO_OUT | GPIO_DFLT_HIGH);</div><div class='del'>-	if (ssp_machinfo-&gt;cs_ads7846 &gt;= 0)</div><div class='del'>-        	pxa_gpio_mode(ssp_machinfo-&gt;cs_ads7846 | GPIO_OUT | GPIO_DFLT_HIGH);</div><div class='del'>-</div><div class='del'>-	ret = ssp_init(&amp;corgi_ssp_dev, ssp_machinfo-&gt;port, 0);</div><div class='del'>-</div><div class='del'>-	if (ret)</div><div class='del'>-		printk(KERN_ERR "Unable to register SSP handler!\n");</div><div class='del'>-	else {</div><div class='del'>-		ssp_disable(&amp;corgi_ssp_dev);</div><div class='del'>-		ssp_config(&amp;corgi_ssp_dev, (SSCR0_National | (SSCR0_DSS &amp; 0x0b )), 0, 0, SSCR0_SerClkDiv(ssp_machinfo-&gt;clk_ads7846));</div><div class='del'>-		ssp_enable(&amp;corgi_ssp_dev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int corgi_ssp_remove(struct platform_device *dev)</div><div class='del'>-{</div><div class='del'>-	ssp_exit(&amp;corgi_ssp_dev);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int corgi_ssp_suspend(struct platform_device *dev, pm_message_t state)</div><div class='del'>-{</div><div class='del'>-	ssp_flush(&amp;corgi_ssp_dev);</div><div class='del'>-	ssp_save_state(&amp;corgi_ssp_dev,&amp;corgi_ssp_state);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int corgi_ssp_resume(struct platform_device *dev)</div><div class='del'>-{</div><div class='del'>-	if (ssp_machinfo-&gt;cs_lcdcon &gt;= 0)</div><div class='del'>-		GPSR(ssp_machinfo-&gt;cs_lcdcon) = GPIO_bit(ssp_machinfo-&gt;cs_lcdcon);  /* High - Disable LCD Control/Timing Gen */</div><div class='del'>-	if (ssp_machinfo-&gt;cs_max1111 &gt;= 0)</div><div class='del'>-		GPSR(ssp_machinfo-&gt;cs_max1111) = GPIO_bit(ssp_machinfo-&gt;cs_max1111); /* High - Disable MAX1111*/</div><div class='del'>-	if (ssp_machinfo-&gt;cs_ads7846 &gt;= 0)</div><div class='del'>-		GPSR(ssp_machinfo-&gt;cs_ads7846) = GPIO_bit(ssp_machinfo-&gt;cs_ads7846); /* High - Disable ADS7846*/</div><div class='del'>-	ssp_restore_state(&amp;corgi_ssp_dev,&amp;corgi_ssp_state);</div><div class='del'>-	ssp_enable(&amp;corgi_ssp_dev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct platform_driver corgissp_driver = {</div><div class='del'>-	.probe		= corgi_ssp_probe,</div><div class='del'>-	.remove		= corgi_ssp_remove,</div><div class='del'>-	.suspend	= corgi_ssp_suspend,</div><div class='del'>-	.resume		= corgi_ssp_resume,</div><div class='del'>-	.driver		= {</div><div class='del'>-		.name	= "corgi-ssp",</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int __init corgi_ssp_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;corgissp_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-arch_initcall(corgi_ssp_init);</div><div class='head'>diff --git a/arch/arm/mach-pxa/cpu-pxa.c b/arch/arm/mach-pxa/cpufreq-pxa2xx.c<br/>index 6f5569bac131..1f272ea83f36 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/cpu-pxa.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pxa/cpu-pxa.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/cpufreq-pxa2xx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/cpufreq-pxa2xx.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/arch/arm/mach-pxa/cpu-pxa.c</div><div class='add'>+ *  linux/arch/arm/mach-pxa/cpufreq-pxa2xx.c</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2002,2003 Intrinsyc Software</div><div class='ctx'>  *</div><div class='hunk'>@@ -335,9 +335,6 @@ static __init int pxa_cpufreq_init(struct cpufreq_policy *policy)</div><div class='ctx'> 		pxa27x_guess_max_freq();</div><div class='ctx'> </div><div class='ctx'> 	/* set default policy and cpuinfo */</div><div class='del'>-	policy-&gt;governor = CPUFREQ_DEFAULT_GOVERNOR;</div><div class='del'>-	if (cpu_is_pxa25x())</div><div class='del'>-		policy-&gt;policy = CPUFREQ_POLICY_PERFORMANCE;</div><div class='ctx'> 	policy-&gt;cpuinfo.transition_latency = 1000; /* FIXME: 1 ms, assumed */</div><div class='ctx'> 	policy-&gt;cur = get_clk_frequency_khz(0);	   /* current freq */</div><div class='ctx'> 	policy-&gt;min = policy-&gt;max = policy-&gt;cur;</div><div class='head'>diff --git a/arch/arm/mach-pxa/cpufreq-pxa3xx.c b/arch/arm/mach-pxa/cpufreq-pxa3xx.c<br/>new file mode 100644<br/>index 000000000000..968c8309ec37<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/cpufreq-pxa3xx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/cpufreq-pxa3xx.c</a></div><div class='hunk'>@@ -0,0 +1,257 @@</div><div class='add'>+/*</div><div class='add'>+ * linux/arch/arm/mach-pxa/cpufreq-pxa3xx.c</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2008 Marvell International Ltd.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/cpufreq.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/pxa-regs.h&gt;</div><div class='add'>+#include &lt;mach/pxa3xx-regs.h&gt;</div><div class='add'>+</div><div class='add'>+#include "generic.h"</div><div class='add'>+</div><div class='add'>+#define HSS_104M	(0)</div><div class='add'>+#define HSS_156M	(1)</div><div class='add'>+#define HSS_208M	(2)</div><div class='add'>+#define HSS_312M	(3)</div><div class='add'>+</div><div class='add'>+#define SMCFS_78M	(0)</div><div class='add'>+#define SMCFS_104M	(2)</div><div class='add'>+#define SMCFS_208M	(5)</div><div class='add'>+</div><div class='add'>+#define SFLFS_104M	(0)</div><div class='add'>+#define SFLFS_156M	(1)</div><div class='add'>+#define SFLFS_208M	(2)</div><div class='add'>+#define SFLFS_312M	(3)</div><div class='add'>+</div><div class='add'>+#define XSPCLK_156M	(0)</div><div class='add'>+#define XSPCLK_NONE	(3)</div><div class='add'>+</div><div class='add'>+#define DMCFS_26M	(0)</div><div class='add'>+#define DMCFS_260M	(3)</div><div class='add'>+</div><div class='add'>+struct pxa3xx_freq_info {</div><div class='add'>+	unsigned int cpufreq_mhz;</div><div class='add'>+	unsigned int core_xl : 5;</div><div class='add'>+	unsigned int core_xn : 3;</div><div class='add'>+	unsigned int hss : 2;</div><div class='add'>+	unsigned int dmcfs : 2;</div><div class='add'>+	unsigned int smcfs : 3;</div><div class='add'>+	unsigned int sflfs : 2;</div><div class='add'>+	unsigned int df_clkdiv : 3;</div><div class='add'>+</div><div class='add'>+	int	vcc_core;	/* in mV */</div><div class='add'>+	int	vcc_sram;	/* in mV */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define OP(cpufreq, _xl, _xn, _hss, _dmc, _smc, _sfl, _dfi, vcore, vsram) \</div><div class='add'>+{									\</div><div class='add'>+	.cpufreq_mhz	= cpufreq,					\</div><div class='add'>+	.core_xl	= _xl,						\</div><div class='add'>+	.core_xn	= _xn,						\</div><div class='add'>+	.hss		= HSS_##_hss##M,				\</div><div class='add'>+	.dmcfs		= DMCFS_##_dmc##M,				\</div><div class='add'>+	.smcfs		= SMCFS_##_smc##M,				\</div><div class='add'>+	.sflfs		= SFLFS_##_sfl##M,				\</div><div class='add'>+	.df_clkdiv	= _dfi,						\</div><div class='add'>+	.vcc_core	= vcore,					\</div><div class='add'>+	.vcc_sram	= vsram,					\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct pxa3xx_freq_info pxa300_freqs[] = {</div><div class='add'>+	/*  CPU XL XN  HSS DMEM SMEM SRAM DFI VCC_CORE VCC_SRAM */</div><div class='add'>+	OP(104,  8, 1, 104, 260,  78, 104, 3, 1000, 1100), /* 104MHz */</div><div class='add'>+	OP(208, 16, 1, 104, 260, 104, 156, 2, 1000, 1100), /* 208MHz */</div><div class='add'>+	OP(416, 16, 2, 156, 260, 104, 208, 2, 1100, 1200), /* 416MHz */</div><div class='add'>+	OP(624, 24, 2, 208, 260, 208, 312, 3, 1375, 1400), /* 624MHz */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct pxa3xx_freq_info pxa320_freqs[] = {</div><div class='add'>+	/*  CPU XL XN  HSS DMEM SMEM SRAM DFI VCC_CORE VCC_SRAM */</div><div class='add'>+	OP(104,  8, 1, 104, 260,  78, 104, 3, 1000, 1100), /* 104MHz */</div><div class='add'>+	OP(208, 16, 1, 104, 260, 104, 156, 2, 1000, 1100), /* 208MHz */</div><div class='add'>+	OP(416, 16, 2, 156, 260, 104, 208, 2, 1100, 1200), /* 416MHz */</div><div class='add'>+	OP(624, 24, 2, 208, 260, 208, 312, 3, 1375, 1400), /* 624MHz */</div><div class='add'>+	OP(806, 31, 2, 208, 260, 208, 312, 3, 1400, 1400), /* 806MHz */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static unsigned int pxa3xx_freqs_num;</div><div class='add'>+static struct pxa3xx_freq_info *pxa3xx_freqs;</div><div class='add'>+static struct cpufreq_frequency_table *pxa3xx_freqs_table;</div><div class='add'>+</div><div class='add'>+static int setup_freqs_table(struct cpufreq_policy *policy,</div><div class='add'>+			     struct pxa3xx_freq_info *freqs, int num)</div><div class='add'>+{</div><div class='add'>+	struct cpufreq_frequency_table *table;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	table = kzalloc((num + 1) * sizeof(*table), GFP_KERNEL);</div><div class='add'>+	if (table == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num; i++) {</div><div class='add'>+		table[i].index = i;</div><div class='add'>+		table[i].frequency = freqs[i].cpufreq_mhz * 1000;</div><div class='add'>+	}</div><div class='add'>+	table[num].frequency = i;</div><div class='add'>+	table[num].frequency = CPUFREQ_TABLE_END;</div><div class='add'>+</div><div class='add'>+	pxa3xx_freqs = freqs;</div><div class='add'>+	pxa3xx_freqs_num = num;</div><div class='add'>+	pxa3xx_freqs_table = table;</div><div class='add'>+</div><div class='add'>+	return cpufreq_frequency_table_cpuinfo(policy, table);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __update_core_freq(struct pxa3xx_freq_info *info)</div><div class='add'>+{</div><div class='add'>+	uint32_t mask = ACCR_XN_MASK | ACCR_XL_MASK;</div><div class='add'>+	uint32_t accr = ACCR;</div><div class='add'>+	uint32_t xclkcfg;</div><div class='add'>+</div><div class='add'>+	accr &amp;= ~(ACCR_XN_MASK | ACCR_XL_MASK | ACCR_XSPCLK_MASK);</div><div class='add'>+	accr |= ACCR_XN(info-&gt;core_xn) | ACCR_XL(info-&gt;core_xl);</div><div class='add'>+</div><div class='add'>+	/* No clock until core PLL is re-locked */</div><div class='add'>+	accr |= ACCR_XSPCLK(XSPCLK_NONE);</div><div class='add'>+</div><div class='add'>+	xclkcfg = (info-&gt;core_xn == 2) ? 0x3 : 0x2;	/* turbo bit */</div><div class='add'>+</div><div class='add'>+	ACCR = accr;</div><div class='add'>+	__asm__("mcr p14, 0, %0, c6, c0, 0\n" : : "r"(xclkcfg));</div><div class='add'>+</div><div class='add'>+	while ((ACSR &amp; mask) != (accr &amp; mask))</div><div class='add'>+		cpu_relax();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __update_bus_freq(struct pxa3xx_freq_info *info)</div><div class='add'>+{</div><div class='add'>+	uint32_t mask;</div><div class='add'>+	uint32_t accr = ACCR;</div><div class='add'>+</div><div class='add'>+	mask = ACCR_SMCFS_MASK | ACCR_SFLFS_MASK | ACCR_HSS_MASK |</div><div class='add'>+		ACCR_DMCFS_MASK;</div><div class='add'>+</div><div class='add'>+	accr &amp;= ~mask;</div><div class='add'>+	accr |= ACCR_SMCFS(info-&gt;smcfs) | ACCR_SFLFS(info-&gt;sflfs) |</div><div class='add'>+		ACCR_HSS(info-&gt;hss) | ACCR_DMCFS(info-&gt;dmcfs);</div><div class='add'>+</div><div class='add'>+	ACCR = accr;</div><div class='add'>+</div><div class='add'>+	while ((ACSR &amp; mask) != (accr &amp; mask))</div><div class='add'>+		cpu_relax();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pxa3xx_cpufreq_verify(struct cpufreq_policy *policy)</div><div class='add'>+{</div><div class='add'>+	return cpufreq_frequency_table_verify(policy, pxa3xx_freqs_table);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int pxa3xx_cpufreq_get(unsigned int cpu)</div><div class='add'>+{</div><div class='add'>+	return get_clk_frequency_khz(0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pxa3xx_cpufreq_set(struct cpufreq_policy *policy,</div><div class='add'>+			      unsigned int target_freq,</div><div class='add'>+			      unsigned int relation)</div><div class='add'>+{</div><div class='add'>+	struct pxa3xx_freq_info *next;</div><div class='add'>+	struct cpufreq_freqs freqs;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int idx;</div><div class='add'>+</div><div class='add'>+	if (policy-&gt;cpu != 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Lookup the next frequency */</div><div class='add'>+	if (cpufreq_frequency_table_target(policy, pxa3xx_freqs_table,</div><div class='add'>+				target_freq, relation, &amp;idx))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	next = &amp;pxa3xx_freqs[idx];</div><div class='add'>+</div><div class='add'>+	freqs.old = policy-&gt;cur;</div><div class='add'>+	freqs.new = next-&gt;cpufreq_mhz * 1000;</div><div class='add'>+	freqs.cpu = policy-&gt;cpu;</div><div class='add'>+</div><div class='add'>+	pr_debug("CPU frequency from %d MHz to %d MHz%s\n",</div><div class='add'>+			freqs.old / 1000, freqs.new / 1000,</div><div class='add'>+			(freqs.old == freqs.new) ? " (skipped)" : "");</div><div class='add'>+</div><div class='add'>+	if (freqs.old == target_freq)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	cpufreq_notify_transition(&amp;freqs, CPUFREQ_PRECHANGE);</div><div class='add'>+</div><div class='add'>+	local_irq_save(flags);</div><div class='add'>+	__update_core_freq(next);</div><div class='add'>+	__update_bus_freq(next);</div><div class='add'>+	local_irq_restore(flags);</div><div class='add'>+</div><div class='add'>+	cpufreq_notify_transition(&amp;freqs, CPUFREQ_POSTCHANGE);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __init int pxa3xx_cpufreq_init(struct cpufreq_policy *policy)</div><div class='add'>+{</div><div class='add'>+	int ret = -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* set default policy and cpuinfo */</div><div class='add'>+	policy-&gt;cpuinfo.min_freq = 104000;</div><div class='add'>+	policy-&gt;cpuinfo.max_freq = (cpu_is_pxa320()) ? 806000 : 624000;</div><div class='add'>+	policy-&gt;cpuinfo.transition_latency = 1000; /* FIXME: 1 ms, assumed */</div><div class='add'>+	policy-&gt;cur = policy-&gt;min = policy-&gt;max = get_clk_frequency_khz(0);</div><div class='add'>+</div><div class='add'>+	if (cpu_is_pxa300() || cpu_is_pxa310())</div><div class='add'>+		ret = setup_freqs_table(policy, ARRAY_AND_SIZE(pxa300_freqs));</div><div class='add'>+</div><div class='add'>+	if (cpu_is_pxa320())</div><div class='add'>+		ret = setup_freqs_table(policy, ARRAY_AND_SIZE(pxa320_freqs));</div><div class='add'>+</div><div class='add'>+	if (ret) {</div><div class='add'>+		pr_err("failed to setup frequency table\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pr_info("CPUFREQ support for PXA3xx initialized\n");</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct cpufreq_driver pxa3xx_cpufreq_driver = {</div><div class='add'>+	.verify		= pxa3xx_cpufreq_verify,</div><div class='add'>+	.target		= pxa3xx_cpufreq_set,</div><div class='add'>+	.init		= pxa3xx_cpufreq_init,</div><div class='add'>+	.get		= pxa3xx_cpufreq_get,</div><div class='add'>+	.name		= "pxa3xx-cpufreq",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init cpufreq_init(void)</div><div class='add'>+{</div><div class='add'>+	if (cpu_is_pxa3xx())</div><div class='add'>+		return cpufreq_register_driver(&amp;pxa3xx_cpufreq_driver);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+module_init(cpufreq_init);</div><div class='add'>+</div><div class='add'>+static void __exit cpufreq_exit(void)</div><div class='add'>+{</div><div class='add'>+	cpufreq_unregister_driver(&amp;pxa3xx_cpufreq_driver);</div><div class='add'>+}</div><div class='add'>+module_exit(cpufreq_exit);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("CPU frequency scaling driver for PXA3xx");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/arch/arm/mach-pxa/devices.h b/arch/arm/mach-pxa/devices.h<br/>index 887c738f5911..bb04af4b0aa3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/devices.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pxa/devices.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/devices.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/devices.h</a></div><div class='hunk'>@@ -32,5 +32,6 @@ extern struct platform_device pxa27x_device_pwm0;</div><div class='ctx'> extern struct platform_device pxa27x_device_pwm1;</div><div class='ctx'> </div><div class='ctx'> extern struct platform_device pxa3xx_device_nand;</div><div class='add'>+extern struct platform_device pxa3xx_device_i2c_power;</div><div class='ctx'> </div><div class='ctx'> void __init pxa_register_device(struct platform_device *dev, void *data);</div><div class='head'>diff --git a/arch/arm/mach-pxa/e330.c b/arch/arm/mach-pxa/e330.c<br/>new file mode 100644<br/>index 000000000000..d488eded2058<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/e330.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/e330.c</a></div><div class='hunk'>@@ -0,0 +1,43 @@</div><div class='add'>+/*</div><div class='add'>+ * Hardware definitions for the Toshiba eseries PDAs</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2003 Ian Molton &lt;spyro@f2s.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file is licensed under</div><div class='add'>+ * the terms of the GNU General Public License version 2. This program</div><div class='add'>+ * is licensed "as is" without any warranty of any kind, whether express</div><div class='add'>+ * or implied.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/setup.h&gt;</div><div class='add'>+#include &lt;asm/mach/arch.h&gt;</div><div class='add'>+#include &lt;asm/mach-types.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;mach/mfp-pxa25x.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/udc.h&gt;</div><div class='add'>+</div><div class='add'>+#include "generic.h"</div><div class='add'>+#include "eseries.h"</div><div class='add'>+</div><div class='add'>+static void __init e330_init(void)</div><div class='add'>+{</div><div class='add'>+	pxa_set_udc_info(&amp;e7xx_udc_mach_info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+MACHINE_START(E330, "Toshiba e330")</div><div class='add'>+	/* Maintainer: Ian Molton (spyro@f2s.com) */</div><div class='add'>+	.phys_io	= 0x40000000,</div><div class='add'>+	.io_pg_offst	= (io_p2v(0x40000000) &gt;&gt; 18) &amp; 0xfffc,</div><div class='add'>+	.boot_params	= 0xa0000100,</div><div class='add'>+	.map_io		= pxa_map_io,</div><div class='add'>+	.init_irq	= pxa25x_init_irq,</div><div class='add'>+	.fixup		= eseries_fixup,</div><div class='add'>+	.init_machine	= e330_init,</div><div class='add'>+	.timer		= &amp;pxa_timer,</div><div class='add'>+MACHINE_END</div><div class='add'>+</div><div class='head'>diff --git a/arch/arm/mach-pxa/e350.c b/arch/arm/mach-pxa/e350.c<br/>new file mode 100644<br/>index 000000000000..8ecbc5479828<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/e350.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/e350.c</a></div><div class='hunk'>@@ -0,0 +1,43 @@</div><div class='add'>+/*</div><div class='add'>+ * Hardware definitions for the Toshiba eseries PDAs</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2003 Ian Molton &lt;spyro@f2s.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file is licensed under</div><div class='add'>+ * the terms of the GNU General Public License version 2. This program</div><div class='add'>+ * is licensed "as is" without any warranty of any kind, whether express</div><div class='add'>+ * or implied.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/setup.h&gt;</div><div class='add'>+#include &lt;asm/mach/arch.h&gt;</div><div class='add'>+#include &lt;asm/mach-types.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;mach/mfp-pxa25x.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/udc.h&gt;</div><div class='add'>+</div><div class='add'>+#include "generic.h"</div><div class='add'>+#include "eseries.h"</div><div class='add'>+</div><div class='add'>+static void __init e350_init(void)</div><div class='add'>+{</div><div class='add'>+	pxa_set_udc_info(&amp;e7xx_udc_mach_info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+MACHINE_START(E350, "Toshiba e350")</div><div class='add'>+	/* Maintainer: Ian Molton (spyro@f2s.com) */</div><div class='add'>+	.phys_io	= 0x40000000,</div><div class='add'>+	.io_pg_offst	= (io_p2v(0x40000000) &gt;&gt; 18) &amp; 0xfffc,</div><div class='add'>+	.boot_params	= 0xa0000100,</div><div class='add'>+	.map_io		= pxa_map_io,</div><div class='add'>+	.init_irq	= pxa25x_init_irq,</div><div class='add'>+	.fixup		= eseries_fixup,</div><div class='add'>+	.init_machine	= e350_init,</div><div class='add'>+	.timer		= &amp;pxa_timer,</div><div class='add'>+MACHINE_END</div><div class='add'>+</div><div class='head'>diff --git a/arch/arm/mach-pxa/e400.c b/arch/arm/mach-pxa/e400.c<br/>new file mode 100644<br/>index 000000000000..544bbaa20621<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/e400.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/e400.c</a></div><div class='hunk'>@@ -0,0 +1,94 @@</div><div class='add'>+/*</div><div class='add'>+ * Hardware definitions for the Toshiba eseries PDAs</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2003 Ian Molton &lt;spyro@f2s.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file is licensed under</div><div class='add'>+ * the terms of the GNU General Public License version 2. This program</div><div class='add'>+ * is licensed "as is" without any warranty of any kind, whether express</div><div class='add'>+ * or implied.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/setup.h&gt;</div><div class='add'>+#include &lt;asm/mach/arch.h&gt;</div><div class='add'>+#include &lt;asm/mach-types.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;mach/pxa-regs.h&gt;</div><div class='add'>+#include &lt;mach/mfp-pxa25x.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;mach/pxafb.h&gt;</div><div class='add'>+#include &lt;mach/udc.h&gt;</div><div class='add'>+</div><div class='add'>+#include "generic.h"</div><div class='add'>+#include "eseries.h"</div><div class='add'>+</div><div class='add'>+/* ------------------------ E400 LCD definitions ------------------------ */</div><div class='add'>+</div><div class='add'>+static struct pxafb_mode_info e400_pxafb_mode_info = {</div><div class='add'>+	.pixclock       = 140703,</div><div class='add'>+	.xres           = 240,</div><div class='add'>+	.yres           = 320,</div><div class='add'>+	.bpp            = 16,</div><div class='add'>+	.hsync_len      = 4,</div><div class='add'>+	.left_margin    = 28,</div><div class='add'>+	.right_margin   = 8,</div><div class='add'>+	.vsync_len      = 3,</div><div class='add'>+	.upper_margin   = 5,</div><div class='add'>+	.lower_margin   = 6,</div><div class='add'>+	.sync           = 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct pxafb_mach_info e400_pxafb_mach_info = {</div><div class='add'>+	.modes          = &amp;e400_pxafb_mode_info,</div><div class='add'>+	.num_modes      = 1,</div><div class='add'>+	.lccr0          = LCCR0_Color | LCCR0_Sngl | LCCR0_Act,</div><div class='add'>+	.lccr3          = 0,</div><div class='add'>+	.pxafb_backlight_power  = NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* ------------------------ E400 MFP config ----------------------------- */</div><div class='add'>+</div><div class='add'>+static unsigned long e400_pin_config[] __initdata = {</div><div class='add'>+	/* Chip selects */</div><div class='add'>+	GPIO15_nCS_1,   /* CS1 - Flash */</div><div class='add'>+	GPIO80_nCS_4,   /* CS4 - TMIO */</div><div class='add'>+</div><div class='add'>+	/* Clocks */</div><div class='add'>+	GPIO12_32KHz,</div><div class='add'>+</div><div class='add'>+	/* BTUART */</div><div class='add'>+	GPIO42_BTUART_RXD,</div><div class='add'>+	GPIO43_BTUART_TXD,</div><div class='add'>+	GPIO44_BTUART_CTS,</div><div class='add'>+	GPIO45_GPIO, /* Used by TMIO for #SUSPEND */</div><div class='add'>+</div><div class='add'>+	/* wakeup */</div><div class='add'>+	GPIO0_GPIO | WAKEUP_ON_EDGE_RISE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* ---------------------------------------------------------------------- */</div><div class='add'>+</div><div class='add'>+static void __init e400_init(void)</div><div class='add'>+{</div><div class='add'>+	pxa2xx_mfp_config(ARRAY_AND_SIZE(e400_pin_config));</div><div class='add'>+	set_pxa_fb_info(&amp;e400_pxafb_mach_info);</div><div class='add'>+	pxa_set_udc_info(&amp;e7xx_udc_mach_info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+MACHINE_START(E400, "Toshiba e400")</div><div class='add'>+	/* Maintainer: Ian Molton (spyro@f2s.com) */</div><div class='add'>+	.phys_io	= 0x40000000,</div><div class='add'>+	.io_pg_offst	= (io_p2v(0x40000000) &gt;&gt; 18) &amp; 0xfffc,</div><div class='add'>+	.boot_params	= 0xa0000100,</div><div class='add'>+	.map_io		= pxa_map_io,</div><div class='add'>+	.init_irq	= pxa25x_init_irq,</div><div class='add'>+	.fixup		= eseries_fixup,</div><div class='add'>+	.init_machine	= e400_init,</div><div class='add'>+	.timer		= &amp;pxa_timer,</div><div class='add'>+MACHINE_END</div><div class='add'>+</div><div class='head'>diff --git a/arch/arm/mach-pxa/e400_lcd.c b/arch/arm/mach-pxa/e400_lcd.c<br/>deleted file mode 100644<br/>index 263884165f57..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/e400_lcd.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pxa/e400_lcd.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,56 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * e400_lcd.c</div><div class='del'>- *</div><div class='del'>- * (c) 2005 Ian Molton &lt;spyro@f2s.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/mach-types.h&gt;</div><div class='del'>-#include &lt;mach/pxa-regs.h&gt;</div><div class='del'>-#include &lt;mach/pxafb.h&gt;</div><div class='del'>-</div><div class='del'>-static struct pxafb_mode_info e400_pxafb_mode_info = {</div><div class='del'>-	.pixclock       = 140703,</div><div class='del'>-	.xres           = 240,</div><div class='del'>-	.yres           = 320,</div><div class='del'>-	.bpp            = 16,</div><div class='del'>-	.hsync_len      = 4,</div><div class='del'>-	.left_margin    = 28,</div><div class='del'>-	.right_margin   = 8,</div><div class='del'>-	.vsync_len      = 3,</div><div class='del'>-	.upper_margin   = 5,</div><div class='del'>-	.lower_margin   = 6,</div><div class='del'>-	.sync           = 0,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct pxafb_mach_info e400_pxafb_mach_info = {</div><div class='del'>-	.modes          = &amp;e400_pxafb_mode_info,</div><div class='del'>-	.num_modes      = 1,</div><div class='del'>-	.lccr0          = LCCR0_Color | LCCR0_Sngl | LCCR0_Act,</div><div class='del'>-	.lccr3          = 0,</div><div class='del'>-	.pxafb_backlight_power  = NULL,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init e400_lcd_init(void)</div><div class='del'>-{</div><div class='del'>-	if (!machine_is_e400())</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	set_pxa_fb_info(&amp;e400_pxafb_mach_info);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(e400_lcd_init);</div><div class='del'>-</div><div class='del'>-MODULE_AUTHOR("Ian Molton &lt;spyro@f2s.com&gt;");</div><div class='del'>-MODULE_DESCRIPTION("e400 lcd driver");</div><div class='del'>-MODULE_LICENSE("GPLv2");</div><div class='del'>-</div><div class='head'>diff --git a/arch/arm/mach-pxa/e740.c b/arch/arm/mach-pxa/e740.c<br/>new file mode 100644<br/>index 000000000000..c57a15b37f0d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/e740.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/e740.c</a></div><div class='hunk'>@@ -0,0 +1,169 @@</div><div class='add'>+/*</div><div class='add'>+ * Hardware definitions for the Toshiba eseries PDAs</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2003 Ian Molton &lt;spyro@f2s.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file is licensed under</div><div class='add'>+ * the terms of the GNU General Public License version 2. This program</div><div class='add'>+ * is licensed "as is" without any warranty of any kind, whether express</div><div class='add'>+ * or implied.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/fb.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;video/w100fb.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/setup.h&gt;</div><div class='add'>+#include &lt;asm/mach/arch.h&gt;</div><div class='add'>+#include &lt;asm/mach-types.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;mach/mfp-pxa25x.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/udc.h&gt;</div><div class='add'>+</div><div class='add'>+#include "generic.h"</div><div class='add'>+#include "eseries.h"</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* ------------------------ e740 video support --------------------------- */</div><div class='add'>+</div><div class='add'>+static struct w100_gen_regs e740_lcd_regs = {</div><div class='add'>+	.lcd_format =            0x00008023,</div><div class='add'>+	.lcdd_cntl1 =            0x0f000000,</div><div class='add'>+	.lcdd_cntl2 =            0x0003ffff,</div><div class='add'>+	.genlcd_cntl1 =          0x00ffff03,</div><div class='add'>+	.genlcd_cntl2 =          0x003c0f03,</div><div class='add'>+	.genlcd_cntl3 =          0x000143aa,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct w100_mode e740_lcd_mode = {</div><div class='add'>+	.xres            = 240,</div><div class='add'>+	.yres            = 320,</div><div class='add'>+	.left_margin     = 20,</div><div class='add'>+	.right_margin    = 28,</div><div class='add'>+	.upper_margin    = 9,</div><div class='add'>+	.lower_margin    = 8,</div><div class='add'>+	.crtc_ss         = 0x80140013,</div><div class='add'>+	.crtc_ls         = 0x81150110,</div><div class='add'>+	.crtc_gs         = 0x80050005,</div><div class='add'>+	.crtc_vpos_gs    = 0x000a0009,</div><div class='add'>+	.crtc_rev        = 0x0040010a,</div><div class='add'>+	.crtc_dclk       = 0xa906000a,</div><div class='add'>+	.crtc_gclk       = 0x80050108,</div><div class='add'>+	.crtc_goe        = 0x80050108,</div><div class='add'>+	.pll_freq        = 57,</div><div class='add'>+	.pixclk_divider         = 4,</div><div class='add'>+	.pixclk_divider_rotated = 4,</div><div class='add'>+	.pixclk_src     = CLK_SRC_XTAL,</div><div class='add'>+	.sysclk_divider  = 1,</div><div class='add'>+	.sysclk_src     = CLK_SRC_PLL,</div><div class='add'>+	.crtc_ps1_active =       0x41060010,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct w100_gpio_regs e740_w100_gpio_info = {</div><div class='add'>+	.init_data1 = 0x21002103,</div><div class='add'>+	.gpio_dir1  = 0xffffdeff,</div><div class='add'>+	.gpio_oe1   = 0x03c00643,</div><div class='add'>+	.init_data2 = 0x003f003f,</div><div class='add'>+	.gpio_dir2  = 0xffffffff,</div><div class='add'>+	.gpio_oe2   = 0x000000ff,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct w100fb_mach_info e740_fb_info = {</div><div class='add'>+	.modelist   = &amp;e740_lcd_mode,</div><div class='add'>+	.num_modes  = 1,</div><div class='add'>+	.regs       = &amp;e740_lcd_regs,</div><div class='add'>+	.gpio       = &amp;e740_w100_gpio_info,</div><div class='add'>+	.xtal_freq = 14318000,</div><div class='add'>+	.xtal_dbl   = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource e740_fb_resources[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start          = 0x0c000000,</div><div class='add'>+		.end            = 0x0cffffff,</div><div class='add'>+		.flags          = IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device e740_fb_device = {</div><div class='add'>+	.name           = "w100fb",</div><div class='add'>+	.id             = -1,</div><div class='add'>+	.dev            = {</div><div class='add'>+		.platform_data  = &amp;e740_fb_info,</div><div class='add'>+	},</div><div class='add'>+	.num_resources  = ARRAY_SIZE(e740_fb_resources),</div><div class='add'>+	.resource       = e740_fb_resources,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* --------------------------- MFP Pin config -------------------------- */</div><div class='add'>+</div><div class='add'>+static unsigned long e740_pin_config[] __initdata = {</div><div class='add'>+	/* Chip selects */</div><div class='add'>+	GPIO15_nCS_1,   /* CS1 - Flash */</div><div class='add'>+	GPIO79_nCS_3,   /* CS3 - IMAGEON */</div><div class='add'>+	GPIO80_nCS_4,   /* CS4 - TMIO */</div><div class='add'>+</div><div class='add'>+	/* Clocks */</div><div class='add'>+	GPIO12_32KHz,</div><div class='add'>+</div><div class='add'>+	/* BTUART */</div><div class='add'>+	GPIO42_BTUART_RXD,</div><div class='add'>+	GPIO43_BTUART_TXD,</div><div class='add'>+	GPIO44_BTUART_CTS,</div><div class='add'>+	GPIO45_GPIO, /* Used by TMIO for #SUSPEND */</div><div class='add'>+</div><div class='add'>+	/* PC Card */</div><div class='add'>+	GPIO8_GPIO,   /* CD0 */</div><div class='add'>+	GPIO44_GPIO,  /* CD1 */</div><div class='add'>+	GPIO11_GPIO,  /* IRQ0 */</div><div class='add'>+	GPIO6_GPIO,   /* IRQ1 */</div><div class='add'>+	GPIO27_GPIO,  /* RST0 */</div><div class='add'>+	GPIO24_GPIO,  /* RST1 */</div><div class='add'>+	GPIO20_GPIO,  /* PWR0 */</div><div class='add'>+	GPIO23_GPIO,  /* PWR1 */</div><div class='add'>+	GPIO48_nPOE,</div><div class='add'>+	GPIO49_nPWE,</div><div class='add'>+	GPIO50_nPIOR,</div><div class='add'>+	GPIO51_nPIOW,</div><div class='add'>+	GPIO52_nPCE_1,</div><div class='add'>+	GPIO53_nPCE_2,</div><div class='add'>+	GPIO54_nPSKTSEL,</div><div class='add'>+	GPIO55_nPREG,</div><div class='add'>+	GPIO56_nPWAIT,</div><div class='add'>+	GPIO57_nIOIS16,</div><div class='add'>+</div><div class='add'>+	/* wakeup */</div><div class='add'>+	GPIO0_GPIO | WAKEUP_ON_EDGE_RISE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* ----------------------------------------------------------------------- */</div><div class='add'>+</div><div class='add'>+static struct platform_device *devices[] __initdata = {</div><div class='add'>+	&amp;e740_fb_device,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init e740_init(void)</div><div class='add'>+{</div><div class='add'>+	pxa2xx_mfp_config(ARRAY_AND_SIZE(e740_pin_config));</div><div class='add'>+	platform_add_devices(devices, ARRAY_SIZE(devices));</div><div class='add'>+	pxa_set_udc_info(&amp;e7xx_udc_mach_info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+MACHINE_START(E740, "Toshiba e740")</div><div class='add'>+	/* Maintainer: Ian Molton (spyro@f2s.com) */</div><div class='add'>+	.phys_io	= 0x40000000,</div><div class='add'>+	.io_pg_offst	= (io_p2v(0x40000000) &gt;&gt; 18) &amp; 0xfffc,</div><div class='add'>+	.boot_params	= 0xa0000100,</div><div class='add'>+	.map_io		= pxa_map_io,</div><div class='add'>+	.init_irq	= pxa25x_init_irq,</div><div class='add'>+	.fixup		= eseries_fixup,</div><div class='add'>+	.init_machine	= e740_init,</div><div class='add'>+	.timer		= &amp;pxa_timer,</div><div class='add'>+MACHINE_END</div><div class='add'>+</div><div class='head'>diff --git a/arch/arm/mach-pxa/e740_lcd.c b/arch/arm/mach-pxa/e740_lcd.c<br/>deleted file mode 100644<br/>index 26bd599af178..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/e740_lcd.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pxa/e740_lcd.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,123 +0,0 @@</div><div class='del'>-/* e740_lcd.c</div><div class='del'>- *</div><div class='del'>- * This file contains the definitions for the LCD timings and functions</div><div class='del'>- * to control the LCD power / frontlighting via the w100fb driver.</div><div class='del'>- *</div><div class='del'>- * (c) 2005 Ian Molton &lt;spyro@f2s.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/device.h&gt;</div><div class='del'>-#include &lt;linux/fb.h&gt;</div><div class='del'>-#include &lt;linux/err.h&gt;</div><div class='del'>-#include &lt;linux/platform_device.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/mach-types.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;video/w100fb.h&gt;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-**potential** shutdown routine - to be investigated</div><div class='del'>-devmem2 0x0c010528 w 0xff3fff00</div><div class='del'>-devmem2 0x0c010190 w 0x7FFF8000</div><div class='del'>-devmem2 0x0c0101b0 w 0x00FF0000</div><div class='del'>-devmem2 0x0c01008c w 0x00000000</div><div class='del'>-devmem2 0x0c010080 w 0x000000bf</div><div class='del'>-devmem2 0x0c010098 w 0x00000015</div><div class='del'>-devmem2 0x0c010088 w 0x4b000204</div><div class='del'>-devmem2 0x0c010098 w 0x0000001d</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-static struct w100_gen_regs e740_lcd_regs = {</div><div class='del'>-	.lcd_format =            0x00008023,</div><div class='del'>-	.lcdd_cntl1 =            0x0f000000,</div><div class='del'>-	.lcdd_cntl2 =            0x0003ffff,</div><div class='del'>-	.genlcd_cntl1 =          0x00ffff03,</div><div class='del'>-	.genlcd_cntl2 =          0x003c0f03,</div><div class='del'>-	.genlcd_cntl3 =          0x000143aa,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct w100_mode e740_lcd_mode = {</div><div class='del'>-	.xres            = 240,</div><div class='del'>-	.yres            = 320,</div><div class='del'>-	.left_margin     = 20,</div><div class='del'>-	.right_margin    = 28,</div><div class='del'>-	.upper_margin    = 9,</div><div class='del'>-	.lower_margin    = 8,</div><div class='del'>-	.crtc_ss         = 0x80140013,</div><div class='del'>-	.crtc_ls         = 0x81150110,</div><div class='del'>-	.crtc_gs         = 0x80050005,</div><div class='del'>-	.crtc_vpos_gs    = 0x000a0009,</div><div class='del'>-	.crtc_rev        = 0x0040010a,</div><div class='del'>-	.crtc_dclk       = 0xa906000a,</div><div class='del'>-	.crtc_gclk       = 0x80050108,</div><div class='del'>-	.crtc_goe        = 0x80050108,</div><div class='del'>-	.pll_freq        = 57,</div><div class='del'>-	.pixclk_divider         = 4,</div><div class='del'>-	.pixclk_divider_rotated = 4,</div><div class='del'>-	.pixclk_src     = CLK_SRC_XTAL,</div><div class='del'>-	.sysclk_divider  = 1,</div><div class='del'>-	.sysclk_src     = CLK_SRC_PLL,</div><div class='del'>-	.crtc_ps1_active =       0x41060010,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static struct w100_gpio_regs e740_w100_gpio_info = {</div><div class='del'>-	.init_data1 = 0x21002103,</div><div class='del'>-	.gpio_dir1  = 0xffffdeff,</div><div class='del'>-	.gpio_oe1   = 0x03c00643,</div><div class='del'>-	.init_data2 = 0x003f003f,</div><div class='del'>-	.gpio_dir2  = 0xffffffff,</div><div class='del'>-	.gpio_oe2   = 0x000000ff,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct w100fb_mach_info e740_fb_info = {</div><div class='del'>-	.modelist   = &amp;e740_lcd_mode,</div><div class='del'>-	.num_modes  = 1,</div><div class='del'>-	.regs       = &amp;e740_lcd_regs,</div><div class='del'>-	.gpio       = &amp;e740_w100_gpio_info,</div><div class='del'>-	.xtal_freq = 14318000,</div><div class='del'>-	.xtal_dbl   = 1,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct resource e740_fb_resources[] = {</div><div class='del'>-	[0] = {</div><div class='del'>-		.start          = 0x0c000000,</div><div class='del'>-		.end            = 0x0cffffff,</div><div class='del'>-		.flags          = IORESOURCE_MEM,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* ----------------------- device declarations -------------------------- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static struct platform_device e740_fb_device = {</div><div class='del'>-	.name           = "w100fb",</div><div class='del'>-	.id             = -1,</div><div class='del'>-	.dev            = {</div><div class='del'>-		.platform_data  = &amp;e740_fb_info,</div><div class='del'>-	},</div><div class='del'>-	.num_resources  = ARRAY_SIZE(e740_fb_resources),</div><div class='del'>-	.resource       = e740_fb_resources,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int e740_lcd_init(void)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (!machine_is_e740())</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	return platform_device_register(&amp;e740_fb_device);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(e740_lcd_init);</div><div class='del'>-</div><div class='del'>-MODULE_AUTHOR("Ian Molton &lt;spyro@f2s.com&gt;");</div><div class='del'>-MODULE_DESCRIPTION("e740 lcd driver");</div><div class='del'>-MODULE_LICENSE("GPLv2");</div><div class='head'>diff --git a/arch/arm/mach-pxa/e750_lcd.c b/arch/arm/mach-pxa/e750.c<br/>index 75edc3b5390f..640e738b85df 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/e750_lcd.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pxa/e750_lcd.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/e750.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/e750.c</a></div><div class='hunk'>@@ -1,25 +1,35 @@</div><div class='del'>-/* e750_lcd.c</div><div class='add'>+/*</div><div class='add'>+ * Hardware definitions for the Toshiba eseries PDAs</div><div class='ctx'>  *</div><div class='del'>- * This file contains the definitions for the LCD timings and functions</div><div class='del'>- * to control the LCD power / frontlighting via the w100fb driver.</div><div class='add'>+ * Copyright (c) 2003 Ian Molton &lt;spyro@f2s.com&gt;</div><div class='ctx'>  *</div><div class='del'>- * (c) 2005 Ian Molton &lt;spyro@f2s.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='add'>+ * This file is licensed under</div><div class='add'>+ * the terms of the GNU General Public License version 2. This program</div><div class='add'>+ * is licensed "as is" without any warranty of any kind, whether express</div><div class='add'>+ * or implied.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='del'>-#include &lt;linux/fb.h&gt;</div><div class='del'>-#include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/fb.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;video/w100fb.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/setup.h&gt;</div><div class='add'>+#include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;video/w100fb.h&gt;</div><div class='add'>+#include &lt;mach/mfp-pxa25x.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/udc.h&gt;</div><div class='add'>+</div><div class='add'>+#include "generic.h"</div><div class='add'>+#include "eseries.h"</div><div class='add'>+</div><div class='add'>+/* ---------------------- E750 LCD definitions -------------------- */</div><div class='ctx'> </div><div class='ctx'> static struct w100_gen_regs e750_lcd_regs = {</div><div class='ctx'> 	.lcd_format =            0x00008003,</div><div class='hunk'>@@ -54,7 +64,6 @@ static struct w100_mode e750_lcd_mode = {</div><div class='ctx'> 	.sysclk_src     = CLK_SRC_PLL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> static struct w100_gpio_regs e750_w100_gpio_info = {</div><div class='ctx'> 	.init_data1 = 0x01192f1b,</div><div class='ctx'> 	.gpio_dir1  = 0xd5ffdeff,</div><div class='hunk'>@@ -81,9 +90,6 @@ static struct resource e750_fb_resources[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* ----------------------- device declarations -------------------------- */</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> static struct platform_device e750_fb_device = {</div><div class='ctx'> 	.name           = "w100fb",</div><div class='ctx'> 	.id             = -1,</div><div class='hunk'>@@ -94,16 +100,27 @@ static struct platform_device e750_fb_device = {</div><div class='ctx'> 	.resource       = e750_fb_resources,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int e750_lcd_init(void)</div><div class='del'>-{</div><div class='del'>-	if (!machine_is_e750())</div><div class='del'>-		return -ENODEV;</div><div class='add'>+/* ----------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='del'>-	return platform_device_register(&amp;e750_fb_device);</div><div class='add'>+static struct platform_device *devices[] __initdata = {</div><div class='add'>+	&amp;e750_fb_device,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init e750_init(void)</div><div class='add'>+{</div><div class='add'>+	platform_add_devices(devices, ARRAY_SIZE(devices));</div><div class='add'>+	pxa_set_udc_info(&amp;e7xx_udc_mach_info);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(e750_lcd_init);</div><div class='add'>+MACHINE_START(E750, "Toshiba e750")</div><div class='add'>+	/* Maintainer: Ian Molton (spyro@f2s.com) */</div><div class='add'>+	.phys_io	= 0x40000000,</div><div class='add'>+	.io_pg_offst	= (io_p2v(0x40000000) &gt;&gt; 18) &amp; 0xfffc,</div><div class='add'>+	.boot_params	= 0xa0000100,</div><div class='add'>+	.map_io		= pxa_map_io,</div><div class='add'>+	.init_irq	= pxa25x_init_irq,</div><div class='add'>+	.fixup		= eseries_fixup,</div><div class='add'>+	.init_machine	= e750_init,</div><div class='add'>+	.timer		= &amp;pxa_timer,</div><div class='add'>+MACHINE_END</div><div class='ctx'> </div><div class='del'>-MODULE_AUTHOR("Ian Molton &lt;spyro@f2s.com&gt;");</div><div class='del'>-MODULE_DESCRIPTION("e750 lcd driver");</div><div class='del'>-MODULE_LICENSE("GPLv2");</div><div class='head'>diff --git a/arch/arm/mach-pxa/e800_lcd.c b/arch/arm/mach-pxa/e800.c<br/>index e6aeab0ebc22..a293e09bfe25 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/e800_lcd.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pxa/e800_lcd.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/e800.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/e800.c</a></div><div class='hunk'>@@ -1,25 +1,36 @@</div><div class='del'>-/* e800_lcd.c</div><div class='add'>+/*</div><div class='add'>+ * Hardware definitions for the Toshiba eseries PDAs</div><div class='ctx'>  *</div><div class='del'>- * This file contains the definitions for the LCD timings and functions</div><div class='del'>- * to control the LCD power / frontlighting via the w100fb driver.</div><div class='add'>+ * Copyright (c) 2003 Ian Molton &lt;spyro@f2s.com&gt;</div><div class='ctx'>  *</div><div class='del'>- * (c) 2005 Ian Molton &lt;spyro@f2s.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='add'>+ * This file is licensed under</div><div class='add'>+ * the terms of the GNU General Public License version 2. This program</div><div class='add'>+ * is licensed "as is" without any warranty of any kind, whether express</div><div class='add'>+ * or implied.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='del'>-#include &lt;linux/fb.h&gt;</div><div class='del'>-#include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/fb.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;video/w100fb.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/setup.h&gt;</div><div class='add'>+#include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;video/w100fb.h&gt;</div><div class='add'>+#include &lt;mach/mfp-pxa25x.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/eseries-gpio.h&gt;</div><div class='add'>+#include &lt;mach/udc.h&gt;</div><div class='add'>+</div><div class='add'>+#include "generic.h"</div><div class='add'>+#include "eseries.h"</div><div class='add'>+</div><div class='add'>+/* ------------------------ e800 LCD definitions ------------------------- */</div><div class='ctx'> </div><div class='ctx'> static struct w100_gen_regs e800_lcd_regs = {</div><div class='ctx'> 	.lcd_format =            0x00008003,</div><div class='hunk'>@@ -71,8 +82,8 @@ static struct w100_mode e800_lcd_mode[2] = {</div><div class='ctx'> 		.crtc_goe        = 0x80cc0015,</div><div class='ctx'> 		.crtc_ps1_active = 0x00000000,</div><div class='ctx'> 		.pll_freq        = 100,</div><div class='del'>-		.pixclk_divider         = 6, /* Wince uses 14 which gives a 7MHz pclk. */</div><div class='del'>-		.pixclk_divider_rotated = 6, /* we want a 14MHz one (much nicer to look at) */</div><div class='add'>+		.pixclk_divider         = 6, /* Wince uses 14 which gives a */</div><div class='add'>+		.pixclk_divider_rotated = 6, /* 7MHz Pclk. We use a 14MHz one */</div><div class='ctx'> 		.pixclk_src     = CLK_SRC_PLL,</div><div class='ctx'> 		.sysclk_divider  = 0,</div><div class='ctx'> 		.sysclk_src     = CLK_SRC_PLL,</div><div class='hunk'>@@ -131,9 +142,6 @@ static struct resource e800_fb_resources[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* ----------------------- device declarations -------------------------- */</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> static struct platform_device e800_fb_device = {</div><div class='ctx'> 	.name           = "w100fb",</div><div class='ctx'> 	.id             = -1,</div><div class='hunk'>@@ -144,16 +152,35 @@ static struct platform_device e800_fb_device = {</div><div class='ctx'> 	.resource       = e800_fb_resources,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int e800_lcd_init(void)</div><div class='del'>-{</div><div class='del'>-	if (!machine_is_e800())</div><div class='del'>-		return -ENODEV;</div><div class='add'>+/* --------------------------- UDC definitions --------------------------- */</div><div class='add'>+</div><div class='add'>+static struct pxa2xx_udc_mach_info e800_udc_mach_info = {</div><div class='add'>+	.gpio_vbus   = GPIO_E800_USB_DISC,</div><div class='add'>+	.gpio_pullup = GPIO_E800_USB_PULLUP,</div><div class='add'>+	.gpio_pullup_inverted = 1</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-	return platform_device_register(&amp;e800_fb_device);</div><div class='add'>+/* ----------------------------------------------------------------------- */</div><div class='add'>+</div><div class='add'>+static struct platform_device *devices[] __initdata = {</div><div class='add'>+	&amp;e800_fb_device,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init e800_init(void)</div><div class='add'>+{</div><div class='add'>+	platform_add_devices(devices, ARRAY_SIZE(devices));</div><div class='add'>+	pxa_set_udc_info(&amp;e800_udc_mach_info);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(e800_lcd_init);</div><div class='add'>+MACHINE_START(E800, "Toshiba e800")</div><div class='add'>+	/* Maintainer: Ian Molton (spyro@f2s.com) */</div><div class='add'>+	.phys_io	= 0x40000000,</div><div class='add'>+	.io_pg_offst	= (io_p2v(0x40000000) &gt;&gt; 18) &amp; 0xfffc,</div><div class='add'>+	.boot_params	= 0xa0000100,</div><div class='add'>+	.map_io		= pxa_map_io,</div><div class='add'>+	.init_irq	= pxa25x_init_irq,</div><div class='add'>+	.fixup		= eseries_fixup,</div><div class='add'>+	.init_machine	= e800_init,</div><div class='add'>+	.timer		= &amp;pxa_timer,</div><div class='add'>+MACHINE_END</div><div class='ctx'> </div><div class='del'>-MODULE_AUTHOR("Ian Molton &lt;spyro@f2s.com&gt;");</div><div class='del'>-MODULE_DESCRIPTION("e800 lcd driver");</div><div class='del'>-MODULE_LICENSE("GPLv2");</div><div class='head'>diff --git a/arch/arm/mach-pxa/em-x270.c b/arch/arm/mach-pxa/em-x270.c<br/>index 7a0a681a5847..f5ed8038ede5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/em-x270.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pxa/em-x270.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/em-x270.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/em-x270.c</a></div><div class='hunk'>@@ -373,10 +373,6 @@ static inline void em_x270_init_nand(void) {}</div><div class='ctx'> #if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)</div><div class='ctx'> static int em_x270_ohci_init(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	/* Set the Power Control Polarity Low */</div><div class='del'>-	UHCHR = (UHCHR | UHCHR_PCPL) &amp;</div><div class='del'>-		~(UHCHR_SSEP1 | UHCHR_SSEP2 | UHCHR_SSE);</div><div class='del'>-</div><div class='ctx'> 	/* enable port 2 transiever */</div><div class='ctx'> 	UP2OCR = UP2OCR_HXS | UP2OCR_HXOE;</div><div class='ctx'> </div><div class='hunk'>@@ -385,6 +381,7 @@ static int em_x270_ohci_init(struct device *dev)</div><div class='ctx'> </div><div class='ctx'> static struct pxaohci_platform_data em_x270_ohci_platform_data = {</div><div class='ctx'> 	.port_mode	= PMM_PERPORT_MODE,</div><div class='add'>+	.flags		= ENABLE_PORT1 | ENABLE_PORT2 | POWER_CONTROL_LOW,</div><div class='ctx'> 	.init		= em_x270_ohci_init,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-pxa/eseries.c b/arch/arm/mach-pxa/eseries.c<br/>index 001a252bd514..d28849b50a14 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/eseries.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pxa/eseries.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/eseries.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/eseries.c</a></div><div class='hunk'>@@ -19,68 +19,13 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/mfp-pxa25x.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/eseries-gpio.h&gt;</div><div class='add'>+#include &lt;mach/udc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> </div><div class='del'>-static unsigned long e740_pin_config[] __initdata = {</div><div class='del'>-	/* Chip selects */</div><div class='del'>-	GPIO15_nCS_1,   /* CS1 - Flash */</div><div class='del'>-	GPIO79_nCS_3,   /* CS3 - IMAGEON */</div><div class='del'>-	GPIO80_nCS_4,   /* CS4 - TMIO */</div><div class='del'>-</div><div class='del'>-	/* Clocks */</div><div class='del'>-	GPIO12_32KHz,</div><div class='del'>-</div><div class='del'>-	/* BTUART */</div><div class='del'>-	GPIO42_BTUART_RXD,</div><div class='del'>-	GPIO43_BTUART_TXD,</div><div class='del'>-	GPIO44_BTUART_CTS,</div><div class='del'>-	GPIO45_GPIO, /* Used by TMIO for #SUSPEND */</div><div class='del'>-</div><div class='del'>-	/* PC Card */</div><div class='del'>-	GPIO8_GPIO,   /* CD0 */</div><div class='del'>-	GPIO44_GPIO,  /* CD1 */</div><div class='del'>-	GPIO11_GPIO,  /* IRQ0 */</div><div class='del'>-	GPIO6_GPIO,   /* IRQ1 */</div><div class='del'>-	GPIO27_GPIO,  /* RST0 */</div><div class='del'>-	GPIO24_GPIO,  /* RST1 */</div><div class='del'>-	GPIO20_GPIO,  /* PWR0 */</div><div class='del'>-	GPIO23_GPIO,  /* PWR1 */</div><div class='del'>-	GPIO48_nPOE,</div><div class='del'>-	GPIO49_nPWE,</div><div class='del'>-	GPIO50_nPIOR,</div><div class='del'>-	GPIO51_nPIOW,</div><div class='del'>-	GPIO52_nPCE_1,</div><div class='del'>-	GPIO53_nPCE_2,</div><div class='del'>-	GPIO54_nPSKTSEL,</div><div class='del'>-	GPIO55_nPREG,</div><div class='del'>-	GPIO56_nPWAIT,</div><div class='del'>-	GPIO57_nIOIS16,</div><div class='del'>-</div><div class='del'>-	/* wakeup */</div><div class='del'>-	GPIO0_GPIO | WAKEUP_ON_EDGE_RISE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned long e400_pin_config[] __initdata = {</div><div class='del'>-	/* Chip selects */</div><div class='del'>-	GPIO15_nCS_1,   /* CS1 - Flash */</div><div class='del'>-	GPIO80_nCS_4,   /* CS4 - TMIO */</div><div class='del'>-</div><div class='del'>-	/* Clocks */</div><div class='del'>-	GPIO12_32KHz,</div><div class='del'>-</div><div class='del'>-	/* BTUART */</div><div class='del'>-	GPIO42_BTUART_RXD,</div><div class='del'>-	GPIO43_BTUART_TXD,</div><div class='del'>-	GPIO44_BTUART_CTS,</div><div class='del'>-	GPIO45_GPIO, /* Used by TMIO for #SUSPEND */</div><div class='del'>-</div><div class='del'>-	/* wakeup */</div><div class='del'>-	GPIO0_GPIO | WAKEUP_ON_EDGE_RISE,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /* Only e800 has 128MB RAM */</div><div class='del'>-static void __init eseries_fixup(struct machine_desc *desc,</div><div class='add'>+void __init eseries_fixup(struct machine_desc *desc,</div><div class='ctx'> 	struct tag *tags, char **cmdline, struct meminfo *mi)</div><div class='ctx'> {</div><div class='ctx'> 	mi-&gt;nr_banks=1;</div><div class='hunk'>@@ -92,95 +37,9 @@ static void __init eseries_fixup(struct machine_desc *desc,</div><div class='ctx'> 		mi-&gt;bank[0].size = (64*1024*1024);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __init e740_init(void)</div><div class='del'>-{</div><div class='del'>-	pxa2xx_mfp_config(ARRAY_AND_SIZE(e740_pin_config));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __init e400_init(void)</div><div class='del'>-{</div><div class='del'>-	pxa2xx_mfp_config(ARRAY_AND_SIZE(e400_pin_config));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* e-series machine definitions */</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_MACH_E330</div><div class='del'>-MACHINE_START(E330, "Toshiba e330")</div><div class='del'>-	/* Maintainer: Ian Molton (spyro@f2s.com) */</div><div class='del'>-	.phys_io	= 0x40000000,</div><div class='del'>-	.io_pg_offst	= (io_p2v(0x40000000) &gt;&gt; 18) &amp; 0xfffc,</div><div class='del'>-	.boot_params	= 0xa0000100,</div><div class='del'>-	.map_io		= pxa_map_io,</div><div class='del'>-	.init_irq	= pxa25x_init_irq,</div><div class='del'>-	.fixup		= eseries_fixup,</div><div class='del'>-	.timer		= &amp;pxa_timer,</div><div class='del'>-MACHINE_END</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_MACH_E350</div><div class='del'>-MACHINE_START(E350, "Toshiba e350")</div><div class='del'>-	/* Maintainer: Ian Molton (spyro@f2s.com) */</div><div class='del'>-	.phys_io	= 0x40000000,</div><div class='del'>-	.io_pg_offst	= (io_p2v(0x40000000) &gt;&gt; 18) &amp; 0xfffc,</div><div class='del'>-	.boot_params	= 0xa0000100,</div><div class='del'>-	.map_io		= pxa_map_io,</div><div class='del'>-	.init_irq	= pxa25x_init_irq,</div><div class='del'>-	.fixup		= eseries_fixup,</div><div class='del'>-	.timer		= &amp;pxa_timer,</div><div class='del'>-MACHINE_END</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_MACH_E740</div><div class='del'>-MACHINE_START(E740, "Toshiba e740")</div><div class='del'>-	/* Maintainer: Ian Molton (spyro@f2s.com) */</div><div class='del'>-	.phys_io	= 0x40000000,</div><div class='del'>-	.io_pg_offst	= (io_p2v(0x40000000) &gt;&gt; 18) &amp; 0xfffc,</div><div class='del'>-	.boot_params	= 0xa0000100,</div><div class='del'>-	.map_io		= pxa_map_io,</div><div class='del'>-	.init_irq	= pxa25x_init_irq,</div><div class='del'>-	.fixup		= eseries_fixup,</div><div class='del'>-	.init_machine	= e740_init,</div><div class='del'>-	.timer		= &amp;pxa_timer,</div><div class='del'>-MACHINE_END</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_MACH_E750</div><div class='del'>-MACHINE_START(E750, "Toshiba e750")</div><div class='del'>-	/* Maintainer: Ian Molton (spyro@f2s.com) */</div><div class='del'>-	.phys_io	= 0x40000000,</div><div class='del'>-	.io_pg_offst	= (io_p2v(0x40000000) &gt;&gt; 18) &amp; 0xfffc,</div><div class='del'>-	.boot_params	= 0xa0000100,</div><div class='del'>-	.map_io		= pxa_map_io,</div><div class='del'>-	.init_irq	= pxa25x_init_irq,</div><div class='del'>-	.fixup		= eseries_fixup,</div><div class='del'>-	.timer		= &amp;pxa_timer,</div><div class='del'>-MACHINE_END</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_MACH_E400</div><div class='del'>-MACHINE_START(E400, "Toshiba e400")</div><div class='del'>-	/* Maintainer: Ian Molton (spyro@f2s.com) */</div><div class='del'>-	.phys_io	= 0x40000000,</div><div class='del'>-	.io_pg_offst	= (io_p2v(0x40000000) &gt;&gt; 18) &amp; 0xfffc,</div><div class='del'>-	.boot_params	= 0xa0000100,</div><div class='del'>-	.map_io		= pxa_map_io,</div><div class='del'>-	.init_irq	= pxa25x_init_irq,</div><div class='del'>-	.fixup		= eseries_fixup,</div><div class='del'>-	.init_machine	= e400_init,</div><div class='del'>-	.timer		= &amp;pxa_timer,</div><div class='del'>-MACHINE_END</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_MACH_E800</div><div class='del'>-MACHINE_START(E800, "Toshiba e800")</div><div class='del'>-	/* Maintainer: Ian Molton (spyro@f2s.com) */</div><div class='del'>-	.phys_io	= 0x40000000,</div><div class='del'>-	.io_pg_offst	= (io_p2v(0x40000000) &gt;&gt; 18) &amp; 0xfffc,</div><div class='del'>-	.boot_params	= 0xa0000100,</div><div class='del'>-	.map_io		= pxa_map_io,</div><div class='del'>-	.init_irq	= pxa25x_init_irq,</div><div class='del'>-	.fixup		= eseries_fixup,</div><div class='del'>-	.timer		= &amp;pxa_timer,</div><div class='del'>-MACHINE_END</div><div class='del'>-#endif</div><div class='add'>+struct pxa2xx_udc_mach_info e7xx_udc_mach_info = {</div><div class='add'>+	.gpio_vbus   = GPIO_E7XX_USB_DISC,</div><div class='add'>+	.gpio_pullup = GPIO_E7XX_USB_PULLUP,</div><div class='add'>+	.gpio_pullup_inverted = 1</div><div class='add'>+};</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-pxa/eseries.h b/arch/arm/mach-pxa/eseries.h<br/>new file mode 100644<br/>index 000000000000..a83f88d4b6ad<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/eseries.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/eseries.h</a></div><div class='hunk'>@@ -0,0 +1,4 @@</div><div class='add'>+void __init eseries_fixup(struct machine_desc *desc,</div><div class='add'>+	struct tag *tags, char **cmdline, struct meminfo *mi);</div><div class='add'>+</div><div class='add'>+extern struct pxa2xx_udc_mach_info e7xx_udc_mach_info;</div><div class='head'>diff --git a/arch/arm/mach-pxa/eseries_udc.c b/arch/arm/mach-pxa/eseries_udc.c<br/>deleted file mode 100644<br/>index d622c04c0d44..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/eseries_udc.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pxa/eseries_udc.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,57 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * UDC functions for the Toshiba e-series PDAs</div><div class='del'>- *</div><div class='del'>- * Copyright (c) Ian Molton 2003</div><div class='del'>- *</div><div class='del'>- * This file is licensed under</div><div class='del'>- * the terms of the GNU General Public License version 2. This program</div><div class='del'>- * is licensed "as is" without any warranty of any kind, whether express</div><div class='del'>- * or implied.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/device.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;mach/udc.h&gt;</div><div class='del'>-#include &lt;mach/eseries-gpio.h&gt;</div><div class='del'>-#include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;mach/pxa-regs.h&gt;</div><div class='del'>-#include &lt;asm/mach/arch.h&gt;</div><div class='del'>-#include &lt;asm/mach-types.h&gt;</div><div class='del'>-#include &lt;asm/mach/map.h&gt;</div><div class='del'>-#include &lt;asm/domain.h&gt;</div><div class='del'>-</div><div class='del'>-/* local PXA generic code */</div><div class='del'>-#include "generic.h"</div><div class='del'>-</div><div class='del'>-static struct pxa2xx_udc_mach_info e7xx_udc_mach_info = {</div><div class='del'>-	.gpio_vbus   = GPIO_E7XX_USB_DISC,</div><div class='del'>-	.gpio_pullup = GPIO_E7XX_USB_PULLUP,</div><div class='del'>-	.gpio_pullup_inverted = 1</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct pxa2xx_udc_mach_info e800_udc_mach_info = {</div><div class='del'>-	.gpio_vbus   = GPIO_E800_USB_DISC,</div><div class='del'>-	.gpio_pullup = GPIO_E800_USB_PULLUP,</div><div class='del'>-	.gpio_pullup_inverted = 1</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init eseries_udc_init(void)</div><div class='del'>-{</div><div class='del'>-	if (machine_is_e330() || machine_is_e350() ||</div><div class='del'>-	    machine_is_e740() || machine_is_e750() ||</div><div class='del'>-	    machine_is_e400())</div><div class='del'>-		pxa_set_udc_info(&amp;e7xx_udc_mach_info);</div><div class='del'>-	else if (machine_is_e800())</div><div class='del'>-		pxa_set_udc_info(&amp;e800_udc_mach_info);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(eseries_udc_init);</div><div class='del'>-</div><div class='del'>-MODULE_AUTHOR("Ian Molton &lt;spyro@f2s.com&gt;");</div><div class='del'>-MODULE_DESCRIPTION("eseries UDC support");</div><div class='del'>-MODULE_LICENSE("GPLv2");</div><div class='head'>diff --git a/arch/arm/mach-pxa/generic.c b/arch/arm/mach-pxa/generic.c<br/>index ceaed0076366..85ed0b33331f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/generic.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pxa/generic.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/generic.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/generic.c</a></div><div class='hunk'>@@ -46,7 +46,7 @@ void clear_reset_status(unsigned int mask)</div><div class='ctx'>  */</div><div class='ctx'> unsigned int get_clk_frequency_khz(int info)</div><div class='ctx'> {</div><div class='del'>-	if (cpu_is_pxa21x() || cpu_is_pxa25x())</div><div class='add'>+	if (cpu_is_pxa25x())</div><div class='ctx'> 		return pxa25x_get_clk_frequency_khz(info);</div><div class='ctx'> 	else if (cpu_is_pxa27x())</div><div class='ctx'> 		return pxa27x_get_clk_frequency_khz(info);</div><div class='hunk'>@@ -60,7 +60,7 @@ EXPORT_SYMBOL(get_clk_frequency_khz);</div><div class='ctx'>  */</div><div class='ctx'> unsigned int get_memclk_frequency_10khz(void)</div><div class='ctx'> {</div><div class='del'>-	if (cpu_is_pxa21x() || cpu_is_pxa25x())</div><div class='add'>+	if (cpu_is_pxa25x())</div><div class='ctx'> 		return pxa25x_get_memclk_frequency_10khz();</div><div class='ctx'> 	else if (cpu_is_pxa27x())</div><div class='ctx'> 		return pxa27x_get_memclk_frequency_10khz();</div><div class='hunk'>@@ -88,11 +88,6 @@ static struct map_desc standard_io_desc[] __initdata = {</div><div class='ctx'> 		.pfn		= __phys_to_pfn(0x48000000),</div><div class='ctx'> 		.length		= 0x00200000,</div><div class='ctx'> 		.type		= MT_DEVICE</div><div class='del'>-	}, {	/* USB host */</div><div class='del'>-		.virtual	=  0xf8000000,</div><div class='del'>-		.pfn		= __phys_to_pfn(0x4c000000),</div><div class='del'>-		.length		= 0x00100000,</div><div class='del'>-		.type		= MT_DEVICE</div><div class='ctx'> 	}, {	/* Camera */</div><div class='ctx'> 		.virtual	=  0xfa000000,</div><div class='ctx'> 		.pfn		= __phys_to_pfn(0x50000000),</div><div class='head'>diff --git a/arch/arm/mach-pxa/generic.h b/arch/arm/mach-pxa/generic.h<br/>index 041c048320e4..dc876a8e6668 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/generic.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pxa/generic.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/generic.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/generic.h</a></div><div class='hunk'>@@ -65,4 +65,5 @@ static inline void pxa3xx_clear_reset_status(unsigned int mask) {}</div><div class='ctx'> </div><div class='ctx'> extern struct sysdev_class pxa_irq_sysclass;</div><div class='ctx'> extern struct sysdev_class pxa_gpio_sysclass;</div><div class='add'>+extern struct sysdev_class pxa2xx_mfp_sysclass;</div><div class='ctx'> extern struct sysdev_class pxa3xx_mfp_sysclass;</div><div class='head'>diff --git a/arch/arm/mach-pxa/gpio.c b/arch/arm/mach-pxa/gpio.c<br/>index 07acc1b23857..14930cf8be7b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/gpio.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pxa/gpio.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/gpio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/gpio.c</a></div><div class='hunk'>@@ -16,10 +16,10 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/gpio.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;mach/pxa-regs.h&gt;</div><div class='ctx'> #include &lt;mach/pxa2xx-gpio.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -275,7 +275,7 @@ static void pxa_gpio_demux_handler(unsigned int irq, struct irq_desc *desc)</div><div class='ctx'> 			loop = 1;</div><div class='ctx'> </div><div class='ctx'> 			n = PXA_GPIO_IRQ_BASE + bit;</div><div class='del'>-			desc_handle_irq(n, irq_desc + n);</div><div class='add'>+			generic_handle_irq(n);</div><div class='ctx'> </div><div class='ctx'> 			bit = find_next_bit(gedr, GEDR_BITS, bit + 1);</div><div class='ctx'> 		}</div><div class='head'>diff --git a/arch/arm/mach-pxa/gumstix.c b/arch/arm/mach-pxa/gumstix.c<br/>index c0092472fa58..d8962a0fb98d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/gumstix.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pxa/gumstix.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/gumstix.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/gumstix.c</a></div><div class='hunk'>@@ -20,8 +20,12 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/mtd.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='add'>+#include &lt;linux/gpio.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/clk.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/memory.h&gt;</div><div class='hunk'>@@ -40,7 +44,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/pxa-regs.h&gt;</div><div class='ctx'> #include &lt;mach/pxa2xx-regs.h&gt;</div><div class='del'>-#include &lt;mach/pxa2xx-gpio.h&gt;</div><div class='add'>+#include &lt;mach/mfp-pxa25x.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> </div><div class='hunk'>@@ -85,21 +89,8 @@ static struct platform_device *devices[] __initdata = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MMC_PXA</div><div class='del'>-static struct pxamci_platform_data gumstix_mci_platform_data;</div><div class='del'>-</div><div class='del'>-static int gumstix_mci_init(struct device *dev, irq_handler_t detect_int,</div><div class='del'>-				void *data)</div><div class='del'>-{</div><div class='del'>-	pxa_gpio_mode(GPIO6_MMCCLK_MD);</div><div class='del'>-	pxa_gpio_mode(GPIO53_MMCCLK_MD);</div><div class='del'>-	pxa_gpio_mode(GPIO8_MMCCS0_MD);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static struct pxamci_platform_data gumstix_mci_platform_data = {</div><div class='ctx'> 	.ocr_mask	= MMC_VDD_32_33|MMC_VDD_33_34,</div><div class='del'>-	.init		= gumstix_mci_init,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void __init gumstix_mmc_init(void)</div><div class='hunk'>@@ -109,11 +100,11 @@ static void __init gumstix_mmc_init(void)</div><div class='ctx'> #else</div><div class='ctx'> static void __init gumstix_mmc_init(void)</div><div class='ctx'> {</div><div class='del'>-	printk(KERN_INFO "Gumstix mmc disabled\n");</div><div class='add'>+	pr_debug("Gumstix mmc disabled\n");</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_USB_GADGET_PXA2XX</div><div class='add'>+#ifdef CONFIG_USB_GADGET_PXA25X</div><div class='ctx'> static struct pxa2xx_udc_mach_info gumstix_udc_info __initdata = {</div><div class='ctx'> 	.gpio_vbus		= GPIO_GUMSTIX_USB_GPIOn,</div><div class='ctx'> 	.gpio_pullup		= GPIO_GUMSTIX_USB_GPIOx,</div><div class='hunk'>@@ -126,12 +117,87 @@ static void __init gumstix_udc_init(void)</div><div class='ctx'> #else</div><div class='ctx'> static void gumstix_udc_init(void)</div><div class='ctx'> {</div><div class='del'>-	printk(KERN_INFO "Gumstix udc is disabled\n");</div><div class='add'>+	pr_debug("Gumstix udc is disabled\n");</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_BT</div><div class='add'>+/* Normally, the bootloader would have enabled this 32kHz clock but many</div><div class='add'>+** boards still have u-boot 1.1.4 so we check if it has been turned on and</div><div class='add'>+** if not, we turn it on with a warning message. */</div><div class='add'>+static void gumstix_setup_bt_clock(void)</div><div class='add'>+{</div><div class='add'>+	int timeout = 500;</div><div class='add'>+</div><div class='add'>+	if (!(OSCC &amp; OSCC_OOK))</div><div class='add'>+		pr_warning("32kHz clock was not on. Bootloader may need to "</div><div class='add'>+				"be updated\n");</div><div class='add'>+	else</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	OSCC |= OSCC_OON;</div><div class='add'>+	do {</div><div class='add'>+		if (OSCC &amp; OSCC_OOK)</div><div class='add'>+			break;</div><div class='add'>+		udelay(1);</div><div class='add'>+	} while (--timeout);</div><div class='add'>+	if (!timeout)</div><div class='add'>+		pr_err("Failed to start 32kHz clock\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init gumstix_bluetooth_init(void)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	gumstix_setup_bt_clock();</div><div class='add'>+</div><div class='add'>+	err = gpio_request(GPIO_GUMSTIX_BTRESET, "BTRST");</div><div class='add'>+	if (err) {</div><div class='add'>+		pr_err("gumstix: failed request gpio for bluetooth reset\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = gpio_direction_output(GPIO_GUMSTIX_BTRESET, 1);</div><div class='add'>+	if (err) {</div><div class='add'>+		pr_err("gumstix: can't reset bluetooth\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	gpio_set_value(GPIO_GUMSTIX_BTRESET, 0);</div><div class='add'>+	udelay(100);</div><div class='add'>+	gpio_set_value(GPIO_GUMSTIX_BTRESET, 1);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static void gumstix_bluetooth_init(void)</div><div class='add'>+{</div><div class='add'>+	pr_debug("Gumstix Bluetooth is disabled\n");</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static unsigned long gumstix_pin_config[] __initdata = {</div><div class='add'>+	GPIO12_32KHz,</div><div class='add'>+	/* BTUART */</div><div class='add'>+	GPIO42_HWUART_RXD,</div><div class='add'>+	GPIO43_HWUART_TXD,</div><div class='add'>+	GPIO44_HWUART_CTS,</div><div class='add'>+	GPIO45_HWUART_RTS,</div><div class='add'>+	/* MMC */</div><div class='add'>+	GPIO6_MMC_CLK,</div><div class='add'>+	GPIO53_MMC_CLK,</div><div class='add'>+	GPIO8_MMC_CS0,</div><div class='add'>+	/* these are used by AM200EPD */</div><div class='add'>+	GPIO51_GPIO,</div><div class='add'>+	GPIO49_GPIO,</div><div class='add'>+	GPIO48_GPIO,</div><div class='add'>+	GPIO32_GPIO,</div><div class='add'>+	GPIO17_GPIO,</div><div class='add'>+	GPIO16_GPIO,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static void __init gumstix_init(void)</div><div class='ctx'> {</div><div class='add'>+	pxa2xx_mfp_config(ARRAY_AND_SIZE(gumstix_pin_config));</div><div class='add'>+</div><div class='add'>+	gumstix_bluetooth_init();</div><div class='ctx'> 	gumstix_udc_init();</div><div class='ctx'> 	gumstix_mmc_init();</div><div class='ctx'> 	(void) platform_add_devices(devices, ARRAY_SIZE(devices));</div><div class='head'>diff --git a/arch/arm/mach-pxa/idp.c b/arch/arm/mach-pxa/idp.c<br/>index 5aa0270d5605..013b15baa034 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/idp.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pxa/idp.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/idp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/idp.c</a></div><div class='hunk'>@@ -32,7 +32,7 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/pxa-regs.h&gt;</div><div class='del'>-#include &lt;mach/pxa2xx-gpio.h&gt;</div><div class='add'>+#include &lt;mach/mfp-pxa25x.h&gt;</div><div class='ctx'> #include &lt;mach/idp.h&gt;</div><div class='ctx'> #include &lt;mach/pxafb.h&gt;</div><div class='ctx'> #include &lt;mach/bitfield.h&gt;</div><div class='hunk'>@@ -46,6 +46,47 @@</div><div class='ctx'>  * - Ethernet interrupt</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+static unsigned long idp_pin_config[] __initdata = {</div><div class='add'>+	/* LCD */</div><div class='add'>+	GPIO58_LCD_LDD_0,</div><div class='add'>+	GPIO59_LCD_LDD_1,</div><div class='add'>+	GPIO60_LCD_LDD_2,</div><div class='add'>+	GPIO61_LCD_LDD_3,</div><div class='add'>+	GPIO62_LCD_LDD_4,</div><div class='add'>+	GPIO63_LCD_LDD_5,</div><div class='add'>+	GPIO64_LCD_LDD_6,</div><div class='add'>+	GPIO65_LCD_LDD_7,</div><div class='add'>+	GPIO66_LCD_LDD_8,</div><div class='add'>+	GPIO67_LCD_LDD_9,</div><div class='add'>+	GPIO68_LCD_LDD_10,</div><div class='add'>+	GPIO69_LCD_LDD_11,</div><div class='add'>+	GPIO70_LCD_LDD_12,</div><div class='add'>+	GPIO71_LCD_LDD_13,</div><div class='add'>+	GPIO72_LCD_LDD_14,</div><div class='add'>+	GPIO73_LCD_LDD_15,</div><div class='add'>+	GPIO74_LCD_FCLK,</div><div class='add'>+	GPIO75_LCD_LCLK,</div><div class='add'>+	GPIO76_LCD_PCLK,</div><div class='add'>+</div><div class='add'>+	/* BTUART */</div><div class='add'>+	GPIO42_BTUART_RXD,</div><div class='add'>+	GPIO43_BTUART_TXD,</div><div class='add'>+	GPIO44_BTUART_CTS,</div><div class='add'>+	GPIO45_BTUART_RTS,</div><div class='add'>+</div><div class='add'>+	/* STUART */</div><div class='add'>+	GPIO46_STUART_RXD,</div><div class='add'>+	GPIO47_STUART_TXD,</div><div class='add'>+</div><div class='add'>+	/* MMC */</div><div class='add'>+	GPIO6_MMC_CLK,</div><div class='add'>+	GPIO8_MMC_CS0,</div><div class='add'>+</div><div class='add'>+	/* Ethernet */</div><div class='add'>+	GPIO33_nCS_5,	/* Ethernet CS */</div><div class='add'>+	GPIO4_GPIO,	/* Ethernet IRQ */</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct resource smc91x_resources[] = {</div><div class='ctx'> 	[0] = {</div><div class='ctx'> 		.start	= (IDP_ETH_PHYS + 0x300),</div><div class='hunk'>@@ -121,44 +162,28 @@ static struct pxafb_mach_info sharp_lm8v31 = {</div><div class='ctx'> 	.num_modes      = 1,</div><div class='ctx'> 	.cmap_inverse	= 0,</div><div class='ctx'> 	.cmap_static	= 0,</div><div class='del'>-	.lccr0		= LCCR0_SDS,</div><div class='del'>-	.lccr3		= LCCR3_PCP | LCCR3_Acb(255),</div><div class='add'>+	.lcd_conn	= LCD_COLOR_DSTN_16BPP | LCD_PCLK_EDGE_FALL |</div><div class='add'>+			  LCD_AC_BIAS_FREQ(255),</div><div class='ctx'> 	.pxafb_backlight_power = &amp;idp_backlight_power,</div><div class='ctx'> 	.pxafb_lcd_power = &amp;idp_lcd_power</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int idp_mci_init(struct device *dev, irq_handler_t idp_detect_int, void *data)</div><div class='del'>-{</div><div class='del'>-	/* setup GPIO for PXA25x MMC controller	*/</div><div class='del'>-	pxa_gpio_mode(GPIO6_MMCCLK_MD);</div><div class='del'>-	pxa_gpio_mode(GPIO8_MMCCS0_MD);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static struct pxamci_platform_data idp_mci_platform_data = {</div><div class='ctx'> 	.ocr_mask	= MMC_VDD_32_33|MMC_VDD_33_34,</div><div class='del'>-	.init 		= idp_mci_init,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void __init idp_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	printk("idp_init()\n");</div><div class='ctx'> </div><div class='add'>+	pxa2xx_mfp_config(ARRAY_AND_SIZE(idp_pin_config));</div><div class='add'>+</div><div class='ctx'> 	platform_device_register(&amp;smc91x_device);</div><div class='ctx'> 	//platform_device_register(&amp;mst_audio_device);</div><div class='ctx'> 	set_pxa_fb_info(&amp;sharp_lm8v31);</div><div class='ctx'> 	pxa_set_mci_info(&amp;idp_mci_platform_data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __init idp_init_irq(void)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	pxa25x_init_irq();</div><div class='del'>-</div><div class='del'>-	set_irq_type(TOUCH_PANEL_IRQ, TOUCH_PANEL_IRQ_EDGE);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static struct map_desc idp_io_desc[] __initdata = {</div><div class='ctx'>   	{</div><div class='ctx'> 		.virtual	=  IDP_COREVOLT_VIRT,</div><div class='hunk'>@@ -177,15 +202,6 @@ static void __init idp_map_io(void)</div><div class='ctx'> {</div><div class='ctx'> 	pxa_map_io();</div><div class='ctx'> 	iotable_init(idp_io_desc, ARRAY_SIZE(idp_io_desc));</div><div class='del'>-</div><div class='del'>-	// serial ports 2 &amp; 3</div><div class='del'>-	pxa_gpio_mode(GPIO42_BTRXD_MD);</div><div class='del'>-	pxa_gpio_mode(GPIO43_BTTXD_MD);</div><div class='del'>-	pxa_gpio_mode(GPIO44_BTCTS_MD);</div><div class='del'>-	pxa_gpio_mode(GPIO45_BTRTS_MD);</div><div class='del'>-	pxa_gpio_mode(GPIO46_STRXD_MD);</div><div class='del'>-	pxa_gpio_mode(GPIO47_STTXD_MD);</div><div class='del'>-</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -194,7 +210,7 @@ MACHINE_START(PXA_IDP, "Vibren PXA255 IDP")</div><div class='ctx'> 	.phys_io	= 0x40000000,</div><div class='ctx'> 	.io_pg_offst	= (io_p2v(0x40000000) &gt;&gt; 18) &amp; 0xfffc,</div><div class='ctx'> 	.map_io		= idp_map_io,</div><div class='del'>-	.init_irq	= idp_init_irq,</div><div class='add'>+	.init_irq	= pxa25x_init_irq,</div><div class='ctx'> 	.timer		= &amp;pxa_timer,</div><div class='ctx'> 	.init_machine	= idp_init,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-pxa/include/mach/akita.h b/arch/arm/mach-pxa/include/mach/akita.h<br/>deleted file mode 100644<br/>index 5d8cc1d9cb10..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/include/mach/akita.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pxa/include/mach/akita.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,32 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Hardware specific definitions for SL-C1000 (Akita)</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2005 Richard Purdie</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* Akita IO Expander GPIOs */</div><div class='del'>-</div><div class='del'>-#define AKITA_IOEXP_RESERVED_7      (1 &lt;&lt; 7)</div><div class='del'>-#define AKITA_IOEXP_IR_ON           (1 &lt;&lt; 6)</div><div class='del'>-#define AKITA_IOEXP_AKIN_PULLUP     (1 &lt;&lt; 5)</div><div class='del'>-#define AKITA_IOEXP_BACKLIGHT_CONT  (1 &lt;&lt; 4)</div><div class='del'>-#define AKITA_IOEXP_BACKLIGHT_ON    (1 &lt;&lt; 3)</div><div class='del'>-#define AKITA_IOEXP_MIC_BIAS        (1 &lt;&lt; 2)</div><div class='del'>-#define AKITA_IOEXP_RESERVED_1      (1 &lt;&lt; 1)</div><div class='del'>-#define AKITA_IOEXP_RESERVED_0      (1 &lt;&lt; 0)</div><div class='del'>-</div><div class='del'>-/* Direction Bitfield  0=output  1=input */</div><div class='del'>-#define AKITA_IOEXP_IO_DIR	0</div><div class='del'>-/* Default Values */</div><div class='del'>-#define AKITA_IOEXP_IO_OUT	(AKITA_IOEXP_IR_ON | AKITA_IOEXP_AKIN_PULLUP)</div><div class='del'>-</div><div class='del'>-extern struct platform_device akitaioexp_device;</div><div class='del'>-</div><div class='del'>-void akita_set_ioexp(struct device *dev, unsigned char bitmask);</div><div class='del'>-void akita_reset_ioexp(struct device *dev, unsigned char bitmask);</div><div class='del'>-</div><div class='head'>diff --git a/arch/arm/mach-pxa/include/mach/camera.h b/arch/arm/mach-pxa/include/mach/camera.h<br/>index 39516ced8b1f..31abe6d514b8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/include/mach/camera.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pxa/include/mach/camera.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/include/mach/camera.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/include/mach/camera.h</a></div><div class='hunk'>@@ -36,8 +36,6 @@</div><div class='ctx'> </div><div class='ctx'> struct pxacamera_platform_data {</div><div class='ctx'> 	int (*init)(struct device *);</div><div class='del'>-	int (*power)(struct device *, int);</div><div class='del'>-	int (*reset)(struct device *, int);</div><div class='ctx'> </div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	unsigned long mclk_10khz;</div><div class='head'>diff --git a/arch/arm/mach-pxa/include/mach/corgi.h b/arch/arm/mach-pxa/include/mach/corgi.h<br/>index bf856503baf6..585970ef08ce 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/include/mach/corgi.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pxa/include/mach/corgi.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/include/mach/corgi.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/include/mach/corgi.h</a></div><div class='hunk'>@@ -98,12 +98,21 @@</div><div class='ctx'> 			CORGI_SCP_MIC_BIAS )</div><div class='ctx'> #define CORGI_SCOOP_IO_OUT	( CORGI_SCP_MUTE_L | CORGI_SCP_MUTE_R )</div><div class='ctx'> </div><div class='add'>+#define CORGI_SCOOP_GPIO_BASE		(NR_BUILTIN_GPIO)</div><div class='add'>+#define CORGI_GPIO_LED_GREEN		(CORGI_SCOOP_GPIO_BASE + 0)</div><div class='add'>+#define CORGI_GPIO_SWA			(CORGI_SCOOP_GPIO_BASE + 1)  /* Hinge Switch A */</div><div class='add'>+#define CORGI_GPIO_SWB			(CORGI_SCOOP_GPIO_BASE + 2)  /* Hinge Switch B */</div><div class='add'>+#define CORGI_GPIO_MUTE_L		(CORGI_SCOOP_GPIO_BASE + 3)</div><div class='add'>+#define CORGI_GPIO_MUTE_R		(CORGI_SCOOP_GPIO_BASE + 4)</div><div class='add'>+#define CORGI_GPIO_AKIN_PULLUP		(CORGI_SCOOP_GPIO_BASE + 5)</div><div class='add'>+#define CORGI_GPIO_APM_ON		(CORGI_SCOOP_GPIO_BASE + 6)</div><div class='add'>+#define CORGI_GPIO_BACKLIGHT_CONT	(CORGI_SCOOP_GPIO_BASE + 7)</div><div class='add'>+#define CORGI_GPIO_MIC_BIAS		(CORGI_SCOOP_GPIO_BASE + 8)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Shared data structures</div><div class='ctx'>  */</div><div class='ctx'> extern struct platform_device corgiscoop_device;</div><div class='del'>-extern struct platform_device corgissp_device;</div><div class='ctx'> </div><div class='ctx'> #endif /* __ASM_ARCH_CORGI_H  */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-pxa/include/mach/entry-macro.S b/arch/arm/mach-pxa/include/mach/entry-macro.S<br/>index de16c12d5232..f6b4bf3e73d2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/include/mach/entry-macro.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pxa/include/mach/entry-macro.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/include/mach/entry-macro.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/include/mach/entry-macro.S</a></div><div class='hunk'>@@ -41,7 +41,7 @@</div><div class='ctx'> 		and	\irqstat, \irqstat, \irqnr</div><div class='ctx'> 		clz	\irqnr, \irqstat</div><div class='ctx'> 		rsb	\irqnr, \irqnr, #31</div><div class='del'>-		add	\irqnr, \irqnr, #32</div><div class='add'>+		add	\irqnr, \irqnr, #(32 + PXA_IRQ(0))</div><div class='ctx'> 		b	1001f</div><div class='ctx'> 1003:</div><div class='ctx'> 		mrc	p6, 0, \irqstat, c0, c0, 0	@ ICIP</div><div class='hunk'>@@ -52,6 +52,6 @@</div><div class='ctx'> 		rsb	\irqstat, \irqnr, #0</div><div class='ctx'> 		and	\irqstat, \irqstat, \irqnr</div><div class='ctx'> 		clz	\irqnr, \irqstat</div><div class='del'>-		rsb	\irqnr, \irqnr, #31</div><div class='add'>+		rsb	\irqnr, \irqnr, #(31 + PXA_IRQ(0))</div><div class='ctx'> 1001:</div><div class='ctx'> 		.endm</div><div class='head'>diff --git a/arch/arm/mach-pxa/include/mach/hardware.h b/arch/arm/mach-pxa/include/mach/hardware.h<br/>index e89df4d0d239..a582a6d9b92b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/include/mach/hardware.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pxa/include/mach/hardware.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/include/mach/hardware.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/include/mach/hardware.h</a></div><div class='hunk'>@@ -62,26 +62,74 @@</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/cputype.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *   CPU     Stepping     CPU_ID         JTAG_ID</div><div class='add'>+ *</div><div class='add'>+ *  PXA210	B0	0x69052922	0x2926C013</div><div class='add'>+ *  PXA210	B1	0x69052923	0x3926C013</div><div class='add'>+ *  PXA210	B2	0x69052924	0x4926C013</div><div class='add'>+ *  PXA210	C0	0x69052D25	0x5926C013</div><div class='add'>+ *</div><div class='add'>+ *  PXA250	A0	0x69052100	0x09264013</div><div class='add'>+ *  PXA250	A1	0x69052101	0x19264013</div><div class='add'>+ *  PXA250	B0	0x69052902	0x29264013</div><div class='add'>+ *  PXA250	B1	0x69052903	0x39264013</div><div class='add'>+ *  PXA250	B2	0x69052904	0x49264013</div><div class='add'>+ *  PXA250	C0	0x69052D05	0x59264013</div><div class='add'>+ *</div><div class='add'>+ *  PXA255	A0	0x69052D06	0x69264013</div><div class='add'>+ *</div><div class='add'>+ *  PXA26x	A0	0x69052903	0x39264013</div><div class='add'>+ *  PXA26x	B0	0x69052D05	0x59264013</div><div class='add'>+ *</div><div class='add'>+ *  PXA27x	A0	0x69054110	0x09265013</div><div class='add'>+ *  PXA27x	A1	0x69054111	0x19265013</div><div class='add'>+ *  PXA27x	B0	0x69054112	0x29265013</div><div class='add'>+ *  PXA27x	B1	0x69054113	0x39265013</div><div class='add'>+ *  PXA27x	C0	0x69054114	0x49265013</div><div class='add'>+ *  PXA27x	C5	0x69054117	0x79265013</div><div class='add'>+ *</div><div class='add'>+ *  PXA30x	A0	0x69056880	0x0E648013</div><div class='add'>+ *  PXA30x	A1	0x69056881	0x1E648013</div><div class='add'>+ *  PXA31x	A0	0x69056890	0x0E649013</div><div class='add'>+ *  PXA31x	A1	0x69056891	0x1E649013</div><div class='add'>+ *  PXA31x	A2	0x69056892	0x2E649013</div><div class='add'>+ *  PXA32x	B1	0x69056825	0x5E642013</div><div class='add'>+ *  PXA32x	B2	0x69056826	0x6E642013</div><div class='add'>+ *</div><div class='add'>+ *  PXA930	B0	0x69056835	0x5E643013</div><div class='add'>+ *  PXA930	B1	0x69056837	0x7E643013</div><div class='add'>+ *  PXA930	B2	0x69056838	0x8E643013</div><div class='add'>+ */</div><div class='ctx'> #ifdef CONFIG_PXA25x</div><div class='del'>-#define __cpu_is_pxa21x(id)				\</div><div class='add'>+#define __cpu_is_pxa210(id)				\</div><div class='ctx'> 	({						\</div><div class='del'>-		unsigned int _id = (id) &gt;&gt; 4 &amp; 0xf3f;	\</div><div class='del'>-		_id == 0x212;				\</div><div class='add'>+		unsigned int _id = (id) &amp; 0xf3f0;	\</div><div class='add'>+		_id == 0x2120;				\</div><div class='ctx'> 	})</div><div class='ctx'> </div><div class='del'>-#define __cpu_is_pxa255(id)                             \</div><div class='del'>-	({                                              \</div><div class='del'>-		unsigned int _id = (id) &gt;&gt; 4 &amp; 0xfff;   \</div><div class='del'>-		_id == 0x2d0;                           \</div><div class='del'>-	 })</div><div class='add'>+#define __cpu_is_pxa250(id)				\</div><div class='add'>+	({						\</div><div class='add'>+		unsigned int _id = (id) &amp; 0xf3ff;	\</div><div class='add'>+		_id &lt;= 0x2105;				\</div><div class='add'>+	})</div><div class='add'>+</div><div class='add'>+#define __cpu_is_pxa255(id)				\</div><div class='add'>+	({						\</div><div class='add'>+		unsigned int _id = (id) &amp; 0xffff;	\</div><div class='add'>+		_id == 0x2d06;				\</div><div class='add'>+	})</div><div class='ctx'> </div><div class='ctx'> #define __cpu_is_pxa25x(id)				\</div><div class='ctx'> 	({						\</div><div class='del'>-		unsigned int _id = (id) &gt;&gt; 4 &amp; 0xfff;	\</div><div class='del'>-		_id == 0x2d0 || _id == 0x290;		\</div><div class='add'>+		unsigned int _id = (id) &amp; 0xf300;	\</div><div class='add'>+		_id == 0x2100;				\</div><div class='ctx'> 	})</div><div class='ctx'> #else</div><div class='del'>-#define __cpu_is_pxa21x(id)	(0)</div><div class='add'>+#define __cpu_is_pxa210(id)	(0)</div><div class='add'>+#define __cpu_is_pxa250(id)	(0)</div><div class='ctx'> #define __cpu_is_pxa255(id)	(0)</div><div class='ctx'> #define __cpu_is_pxa25x(id)	(0)</div><div class='ctx'> #endif</div><div class='hunk'>@@ -136,9 +184,14 @@</div><div class='ctx'> #define __cpu_is_pxa930(id)	(0)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#define cpu_is_pxa21x()					\</div><div class='add'>+#define cpu_is_pxa210()					\</div><div class='ctx'> 	({						\</div><div class='del'>-		__cpu_is_pxa21x(read_cpuid_id());	\</div><div class='add'>+		__cpu_is_pxa210(read_cpuid_id());	\</div><div class='add'>+	})</div><div class='add'>+</div><div class='add'>+#define cpu_is_pxa250()					\</div><div class='add'>+	({						\</div><div class='add'>+		__cpu_is_pxa250(read_cpuid_id());	\</div><div class='ctx'> 	})</div><div class='ctx'> </div><div class='ctx'> #define cpu_is_pxa255()                                 \</div><div class='hunk'>@@ -151,6 +204,8 @@</div><div class='ctx'> 		__cpu_is_pxa25x(read_cpuid_id());	\</div><div class='ctx'> 	})</div><div class='ctx'> </div><div class='add'>+extern int cpu_is_pxa26x(void);</div><div class='add'>+</div><div class='ctx'> #define cpu_is_pxa27x()					\</div><div class='ctx'> 	({						\</div><div class='ctx'> 		__cpu_is_pxa27x(read_cpuid_id());	\</div><div class='head'>diff --git a/arch/arm/mach-pxa/include/mach/i2c.h b/arch/arm/mach-pxa/include/mach/i2c.h<br/>index 80596b013443..1a9f65e6ec0f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/include/mach/i2c.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pxa/include/mach/i2c.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/include/mach/i2c.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/include/mach/i2c.h</a></div><div class='hunk'>@@ -65,13 +65,18 @@ struct i2c_pxa_platform_data {</div><div class='ctx'> 	unsigned int		slave_addr;</div><div class='ctx'> 	struct i2c_slave_client	*slave;</div><div class='ctx'> 	unsigned int		class;</div><div class='del'>-	int			use_pio;</div><div class='add'>+	unsigned int		use_pio :1;</div><div class='add'>+	unsigned int		fast_mode :1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern void pxa_set_i2c_info(struct i2c_pxa_platform_data *info);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PXA27x</div><div class='del'>-extern void pxa_set_i2c_power_info(struct i2c_pxa_platform_data *info);</div><div class='add'>+extern void pxa27x_set_i2c_power_info(struct i2c_pxa_platform_data *info);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PXA3xx</div><div class='add'>+extern void pxa3xx_set_i2c_power_info(struct i2c_pxa_platform_data *info);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-pxa/include/mach/irqs.h b/arch/arm/mach-pxa/include/mach/irqs.h<br/>index 108b5db9b2af..9c163e19ada9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/include/mach/irqs.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pxa/include/mach/irqs.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/include/mach/irqs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/include/mach/irqs.h</a></div><div class='hunk'>@@ -11,7 +11,14 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#define PXA_IRQ(x)	(x)</div><div class='add'>+#ifdef CONFIG_PXA_HAVE_ISA_IRQS</div><div class='add'>+#define PXA_ISA_IRQ(x)	(x)</div><div class='add'>+#define PXA_ISA_IRQ_NUM	(16)</div><div class='add'>+#else</div><div class='add'>+#define PXA_ISA_IRQ_NUM	(0)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define PXA_IRQ(x)	(PXA_ISA_IRQ_NUM + (x))</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_PXA27x) || defined(CONFIG_PXA3xx)</div><div class='ctx'> #define IRQ_SSP3	PXA_IRQ(0)	/* SSP3 service request */</div><div class='hunk'>@@ -73,7 +80,7 @@</div><div class='ctx'> #define IRQ_MMC3	PXA_IRQ(55)	/* MMC3 Controller (PXA310) */</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#define PXA_GPIO_IRQ_BASE	(64)</div><div class='add'>+#define PXA_GPIO_IRQ_BASE	PXA_IRQ(64)</div><div class='ctx'> #define PXA_GPIO_IRQ_NUM	(128)</div><div class='ctx'> </div><div class='ctx'> #define GPIO_2_x_TO_IRQ(x)	(PXA_GPIO_IRQ_BASE + (x))</div><div class='hunk'>@@ -178,13 +185,7 @@</div><div class='ctx'> #define NR_IRQS			(IRQ_S1_BVD1_STSCHG + 1)</div><div class='ctx'> #elif defined(CONFIG_SHARP_LOCOMO)</div><div class='ctx'> #define NR_IRQS			(IRQ_LOCOMO_SPI_TEND + 1)</div><div class='del'>-#elif defined(CONFIG_ARCH_LUBBOCK) || \</div><div class='del'>-      defined(CONFIG_MACH_LOGICPD_PXA270) || \</div><div class='del'>-      defined(CONFIG_MACH_TOSA) || \</div><div class='del'>-      defined(CONFIG_MACH_MAINSTONE) || \</div><div class='del'>-      defined(CONFIG_MACH_PCM027) || \</div><div class='del'>-      defined(CONFIG_ARCH_PXA_ESERIES) || \</div><div class='del'>-      defined(CONFIG_MACH_MAGICIAN)</div><div class='add'>+#elif defined(CONFIG_PXA_HAVE_BOARD_IRQS)</div><div class='ctx'> #define NR_IRQS			(IRQ_BOARD_END)</div><div class='ctx'> #elif defined(CONFIG_MACH_ZYLONITE)</div><div class='ctx'> #define NR_IRQS			(IRQ_BOARD_START + 32)</div><div class='head'>diff --git a/arch/arm/mach-pxa/include/mach/littleton.h b/arch/arm/mach-pxa/include/mach/littleton.h<br/>index 79d209b826f4..5c4e320c1437 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/include/mach/littleton.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pxa/include/mach/littleton.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/include/mach/littleton.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/include/mach/littleton.h</a></div><div class='hunk'>@@ -3,4 +3,6 @@</div><div class='ctx'> </div><div class='ctx'> #define LITTLETON_ETH_PHYS	0x30000000</div><div class='ctx'> </div><div class='add'>+#define LITTLETON_GPIO_LCD_CS	(17)</div><div class='add'>+</div><div class='ctx'> #endif /* __ASM_ARCH_ZYLONITE_H */</div><div class='head'>diff --git a/arch/arm/mach-pxa/include/mach/memory.h b/arch/arm/mach-pxa/include/mach/memory.h<br/>index 552eb7fa6579..59aef89808d6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/include/mach/memory.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pxa/include/mach/memory.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/include/mach/memory.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/include/mach/memory.h</a></div><div class='hunk'>@@ -40,11 +40,11 @@</div><div class='ctx'> #define NODE_MEM_SIZE_BITS	26</div><div class='ctx'> </div><div class='ctx'> #if !defined(__ASSEMBLY__) &amp;&amp; defined(CONFIG_MACH_ARMCORE) &amp;&amp; defined(CONFIG_PCI)</div><div class='del'>-void cmx270_pci_adjust_zones(int node, unsigned long *size,</div><div class='add'>+void cmx2xx_pci_adjust_zones(int node, unsigned long *size,</div><div class='ctx'> 			     unsigned long *holes);</div><div class='ctx'> </div><div class='ctx'> #define arch_adjust_zones(node, size, holes) \</div><div class='del'>-	cmx270_pci_adjust_zones(node, size, holes)</div><div class='add'>+	cmx2xx_pci_adjust_zones(node, size, holes)</div><div class='ctx'> </div><div class='ctx'> #define ISA_DMA_THRESHOLD	(PHYS_OFFSET + SZ_64M - 1)</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-pxa/include/mach/mfp-pxa25x.h b/arch/arm/mach-pxa/include/mach/mfp-pxa25x.h<br/>index 6c8e72238bfd..617cab2cc8d0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/include/mach/mfp-pxa25x.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pxa/include/mach/mfp-pxa25x.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/include/mach/mfp-pxa25x.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/include/mach/mfp-pxa25x.h</a></div><div class='hunk'>@@ -17,7 +17,7 @@</div><div class='ctx'> </div><div class='ctx'> /* Crystal and Clock Signals */</div><div class='ctx'> #define GPIO10_RTCCLK		MFP_CFG_OUT(GPIO10, AF1, DRIVE_LOW)</div><div class='del'>-#define GPIO70_RTC_CLK		MFP_CFG_OUT(GPIO70, AF1, DRIVE_LOW)</div><div class='add'>+#define GPIO70_RTCCLK		MFP_CFG_OUT(GPIO70, AF1, DRIVE_LOW)</div><div class='ctx'> #define GPIO7_48MHz		MFP_CFG_OUT(GPIO7,  AF1, DRIVE_LOW)</div><div class='ctx'> #define GPIO11_3_6MHz		MFP_CFG_OUT(GPIO11, AF1, DRIVE_LOW)</div><div class='ctx'> #define GPIO71_3_6MHz		MFP_CFG_OUT(GPIO71, AF1, DRIVE_LOW)</div><div class='hunk'>@@ -156,6 +156,6 @@</div><div class='ctx'> #define GPIO74_LCD_FCLK		MFP_CFG_OUT(GPIO74, AF2, DRIVE_LOW)</div><div class='ctx'> #define GPIO75_LCD_LCLK		MFP_CFG_OUT(GPIO75, AF2, DRIVE_LOW)</div><div class='ctx'> #define GPIO76_LCD_PCLK		MFP_CFG_OUT(GPIO76, AF2, DRIVE_LOW)</div><div class='del'>-#define GPIO77_LCD_ACBIAS	MFP_CFG_OUT(GPIO77, AF2, DRIVE_LOW)</div><div class='add'>+#define GPIO77_LCD_BIAS		MFP_CFG_OUT(GPIO77, AF2, DRIVE_LOW)</div><div class='ctx'> </div><div class='ctx'> #endif /* __ASM_ARCH_MFP_PXA25X_H */</div><div class='head'>diff --git a/arch/arm/mach-pxa/include/mach/mfp-pxa320.h b/arch/arm/mach-pxa/include/mach/mfp-pxa320.h<br/>index 74990510cf34..67f8385ea548 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/include/mach/mfp-pxa320.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pxa/include/mach/mfp-pxa320.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/include/mach/mfp-pxa320.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/include/mach/mfp-pxa320.h</a></div><div class='hunk'>@@ -257,10 +257,10 @@</div><div class='ctx'> #define GPIO38_SSP2_RXD		MFP_CFG(GPIO38, AF2)</div><div class='ctx'> #define GPIO38_SSP2_TXD		MFP_CFG(GPIO38, AF5)</div><div class='ctx'> </div><div class='del'>-#define GPIO69_SSP3_SCLK	MFP_CFG(GPIO69, AF2, DS08X, FLOAT)</div><div class='del'>-#define GPIO70_SSP3_FRM		MFP_CFG(GPIO70, AF2, DS08X, DRIVE_LOW)</div><div class='del'>-#define GPIO89_SSP3_SCLK	MFP_CFG(GPIO89, AF1, DS08X, FLOAT)</div><div class='del'>-#define GPIO90_SSP3_FRM		MFP_CFG(GPIO90, AF1, DS08X, DRIVE_LOW)</div><div class='add'>+#define GPIO69_SSP3_SCLK	MFP_CFG_X(GPIO69, AF2, DS08X, FLOAT)</div><div class='add'>+#define GPIO70_SSP3_FRM		MFP_CFG_X(GPIO70, AF2, DS08X, DRIVE_LOW)</div><div class='add'>+#define GPIO89_SSP3_SCLK	MFP_CFG_X(GPIO89, AF1, DS08X, FLOAT)</div><div class='add'>+#define GPIO90_SSP3_FRM		MFP_CFG_X(GPIO90, AF1, DS08X, DRIVE_LOW)</div><div class='ctx'> #define GPIO71_SSP3_RXD		MFP_CFG_X(GPIO71, AF5, DS08X, FLOAT)</div><div class='ctx'> #define GPIO71_SSP3_TXD		MFP_CFG_X(GPIO71, AF2, DS08X, DRIVE_LOW)</div><div class='ctx'> #define GPIO72_SSP3_RXD		MFP_CFG_X(GPIO72, AF2, DS08X, FLOAT)</div><div class='head'>diff --git a/arch/arm/mach-pxa/include/mach/mfp.h b/arch/arm/mach-pxa/include/mach/mfp.h<br/>index 8769567b389b..482185053a92 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/include/mach/mfp.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pxa/include/mach/mfp.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/include/mach/mfp.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/include/mach/mfp.h</a></div><div class='hunk'>@@ -274,12 +274,13 @@ typedef unsigned long mfp_cfg_t;</div><div class='ctx'> #define MFP_DS_MASK		(0x7 &lt;&lt; 13)</div><div class='ctx'> #define MFP_DS(x)		(((x) &gt;&gt; 13) &amp; 0x7)</div><div class='ctx'> </div><div class='del'>-#define MFP_LPM_INPUT		(0x0 &lt;&lt; 16)</div><div class='add'>+#define MFP_LPM_DEFAULT		(0x0 &lt;&lt; 16)</div><div class='ctx'> #define MFP_LPM_DRIVE_LOW	(0x1 &lt;&lt; 16)</div><div class='ctx'> #define MFP_LPM_DRIVE_HIGH	(0x2 &lt;&lt; 16)</div><div class='ctx'> #define MFP_LPM_PULL_LOW	(0x3 &lt;&lt; 16)</div><div class='ctx'> #define MFP_LPM_PULL_HIGH	(0x4 &lt;&lt; 16)</div><div class='ctx'> #define MFP_LPM_FLOAT		(0x5 &lt;&lt; 16)</div><div class='add'>+#define MFP_LPM_INPUT		(0x6 &lt;&lt; 16)</div><div class='ctx'> #define MFP_LPM_STATE_MASK	(0x7 &lt;&lt; 16)</div><div class='ctx'> #define MFP_LPM_STATE(x)	(((x) &gt;&gt; 16) &amp; 0x7)</div><div class='ctx'> </div><div class='hunk'>@@ -297,7 +298,7 @@ typedef unsigned long mfp_cfg_t;</div><div class='ctx'> #define MFP_PULL_MASK		(0x3 &lt;&lt; 21)</div><div class='ctx'> #define MFP_PULL(x)		(((x) &gt;&gt; 21) &amp; 0x3)</div><div class='ctx'> </div><div class='del'>-#define MFP_CFG_DEFAULT		(MFP_AF0 | MFP_DS03X | MFP_LPM_INPUT |\</div><div class='add'>+#define MFP_CFG_DEFAULT		(MFP_AF0 | MFP_DS03X | MFP_LPM_DEFAULT |\</div><div class='ctx'> 				 MFP_LPM_EDGE_NONE | MFP_PULL_NONE)</div><div class='ctx'> </div><div class='ctx'> #define MFP_CFG(pin, af)		\</div><div class='head'>diff --git a/arch/arm/mach-pxa/include/mach/mioa701.h b/arch/arm/mach-pxa/include/mach/mioa701.h<br/>new file mode 100644<br/>index 000000000000..8483cb511831<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/include/mach/mioa701.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/include/mach/mioa701.h</a></div><div class='hunk'>@@ -0,0 +1,67 @@</div><div class='add'>+#ifndef _MIOA701_H_</div><div class='add'>+#define _MIOA701_H_</div><div class='add'>+</div><div class='add'>+#define MIO_CFG_IN(pin, af)		\</div><div class='add'>+	((MFP_CFG_DEFAULT &amp; ~(MFP_AF_MASK | MFP_DIR_MASK)) |\</div><div class='add'>+	 (MFP_PIN(pin) | MFP_##af | MFP_DIR_IN))</div><div class='add'>+</div><div class='add'>+#define MIO_CFG_OUT(pin, af, state)	\</div><div class='add'>+	((MFP_CFG_DEFAULT &amp; ~(MFP_AF_MASK | MFP_DIR_MASK | MFP_LPM_STATE_MASK)) |\</div><div class='add'>+	 (MFP_PIN(pin) | MFP_##af | MFP_DIR_OUT | MFP_LPM_##state))</div><div class='add'>+</div><div class='add'>+/* Global GPIOs */</div><div class='add'>+#define GPIO9_CHARGE_nEN			9</div><div class='add'>+#define GPIO18_POWEROFF				18</div><div class='add'>+#define GPIO87_LCD_POWER			87</div><div class='add'>+</div><div class='add'>+/* USB */</div><div class='add'>+#define GPIO13_USB_DETECT			13</div><div class='add'>+#define GPIO22_USB_ENABLE			22</div><div class='add'>+</div><div class='add'>+/* SDIO bits */</div><div class='add'>+#define GPIO78_SDIO_RO				78</div><div class='add'>+#define GPIO15_SDIO_INSERT			15</div><div class='add'>+#define GPIO91_SDIO_EN				91</div><div class='add'>+</div><div class='add'>+/* Bluetooth */</div><div class='add'>+#define GPIO83_BT_ON				83</div><div class='add'>+</div><div class='add'>+/* GPS */</div><div class='add'>+#define GPIO23_GPS_UNKNOWN1			23</div><div class='add'>+#define GPIO26_GPS_ON				26</div><div class='add'>+#define GPIO27_GPS_RESET			27</div><div class='add'>+#define GPIO106_GPS_UNKNOWN2			106</div><div class='add'>+#define GPIO107_GPS_UNKNOWN3			107</div><div class='add'>+</div><div class='add'>+/* GSM */</div><div class='add'>+#define GPIO24_GSM_MOD_RESET_CMD		24</div><div class='add'>+#define GPIO88_GSM_nMOD_ON_CMD			88</div><div class='add'>+#define GPIO90_GSM_nMOD_OFF_CMD			90</div><div class='add'>+#define GPIO114_GSM_nMOD_DTE_UART_STATE 	114</div><div class='add'>+#define GPIO25_GSM_MOD_ON_STATE			25</div><div class='add'>+#define GPIO113_GSM_EVENT			113</div><div class='add'>+</div><div class='add'>+/* SOUND */</div><div class='add'>+#define GPIO12_HPJACK_INSERT			12</div><div class='add'>+</div><div class='add'>+/* LEDS */</div><div class='add'>+#define GPIO10_LED_nCharging			10</div><div class='add'>+#define GPIO97_LED_nBlue			97</div><div class='add'>+#define GPIO98_LED_nOrange			98</div><div class='add'>+#define GPIO82_LED_nVibra			82</div><div class='add'>+#define GPIO115_LED_nKeyboard			115</div><div class='add'>+</div><div class='add'>+/* Keyboard */</div><div class='add'>+#define GPIO0_KEY_POWER				0</div><div class='add'>+#define GPIO93_KEY_VOLUME_UP			93</div><div class='add'>+#define GPIO94_KEY_VOLUME_DOWN			94</div><div class='add'>+</div><div class='add'>+extern struct input_dev *mioa701_evdev;</div><div class='add'>+extern void mioa701_gpio_lpm_set(unsigned long mfp_pin);</div><div class='add'>+</div><div class='add'>+/* Assembler externals mioa701_bootresume.S */</div><div class='add'>+extern u32 mioa701_bootstrap;</div><div class='add'>+extern u32 mioa701_jumpaddr;</div><div class='add'>+extern u32 mioa701_bootstrap_lg;</div><div class='add'>+</div><div class='add'>+#endif /* _MIOA701_H */</div><div class='head'>diff --git a/arch/arm/mach-pxa/include/mach/ohci.h b/arch/arm/mach-pxa/include/mach/ohci.h<br/>index e848a47128cd..95b6e2a6e514 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/include/mach/ohci.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pxa/include/mach/ohci.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/include/mach/ohci.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/include/mach/ohci.h</a></div><div class='hunk'>@@ -7,6 +7,22 @@ struct pxaohci_platform_data {</div><div class='ctx'> 	int (*init)(struct device *);</div><div class='ctx'> 	void (*exit)(struct device *);</div><div class='ctx'> </div><div class='add'>+	unsigned long flags;</div><div class='add'>+#define ENABLE_PORT1		(1 &lt;&lt; 0)</div><div class='add'>+#define ENABLE_PORT2		(1 &lt;&lt; 1)</div><div class='add'>+#define ENABLE_PORT3		(1 &lt;&lt; 2)</div><div class='add'>+#define ENABLE_PORT_ALL		(ENABLE_PORT1 | ENABLE_PORT2 | ENABLE_PORT3)</div><div class='add'>+</div><div class='add'>+#define POWER_SENSE_LOW		(1 &lt;&lt; 3)</div><div class='add'>+#define POWER_CONTROL_LOW	(1 &lt;&lt; 4)</div><div class='add'>+#define NO_OC_PROTECTION	(1 &lt;&lt; 5)</div><div class='add'>+#define OC_MODE_GLOBAL		(0 &lt;&lt; 6)</div><div class='add'>+#define OC_MODE_PERPORT		(1 &lt;&lt; 6)</div><div class='add'>+</div><div class='add'>+	int power_on_delay;	/* Power On to Power Good time - in ms</div><div class='add'>+				 * HCD must wait for this duration before</div><div class='add'>+				 * accessing a powered on port</div><div class='add'>+				 */</div><div class='ctx'> 	int port_mode;</div><div class='ctx'> #define PMM_NPS_MODE           1</div><div class='ctx'> #define PMM_GLOBAL_MODE        2</div><div class='head'>diff --git a/arch/arm/mach-pxa/include/mach/palmz72.h b/arch/arm/mach-pxa/include/mach/palmz72.h<br/>new file mode 100644<br/>index 000000000000..5032307ebf7d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/include/mach/palmz72.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/include/mach/palmz72.h</a></div><div class='hunk'>@@ -0,0 +1,80 @@</div><div class='add'>+/*</div><div class='add'>+ * GPIOs and interrupts for Palm Zire72 Handheld Computer</div><div class='add'>+ *</div><div class='add'>+ * Authors:	Alex Osborne &lt;bobofdoom@gmail.com&gt;</div><div class='add'>+ *		Jan Herman &lt;2hp@seznam.cz&gt;</div><div class='add'>+ *		Sergey Lapin &lt;slapin@ossfans.org&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _INCLUDE_PALMZ72_H_</div><div class='add'>+#define _INCLUDE_PALMZ72_H_</div><div class='add'>+</div><div class='add'>+/* Power and control */</div><div class='add'>+#define GPIO_NR_PALMZ72_GPIO_RESET		1</div><div class='add'>+#define GPIO_NR_PALMZ72_POWER_DETECT		0</div><div class='add'>+</div><div class='add'>+/* SD/MMC */</div><div class='add'>+#define GPIO_NR_PALMZ72_SD_DETECT_N		14</div><div class='add'>+#define GPIO_NR_PALMZ72_SD_POWER_N		98</div><div class='add'>+#define GPIO_NR_PALMZ72_SD_RO 115</div><div class='add'>+</div><div class='add'>+/* Touchscreen */</div><div class='add'>+#define GPIO_NR_PALMZ72_WM9712_IRQ		27</div><div class='add'>+</div><div class='add'>+/* IRDA -  disable GPIO connected to SD pin of tranceiver (TFBS4710?) ? */</div><div class='add'>+#define GPIO_NR_PALMZ72_IR_DISABLE		49</div><div class='add'>+</div><div class='add'>+/* USB */</div><div class='add'>+#define GPIO_NR_PALMZ72_USB_DETECT_N		15</div><div class='add'>+#define GPIO_NR_PALMZ72_USB_POWER		95</div><div class='add'>+#define GPIO_NR_PALMZ72_USB_PULLUP		12</div><div class='add'>+</div><div class='add'>+/* LCD/Backlight */</div><div class='add'>+#define GPIO_NR_PALMZ72_BL_POWER		20</div><div class='add'>+#define GPIO_NR_PALMZ72_LCD_POWER		96</div><div class='add'>+</div><div class='add'>+/* LED */</div><div class='add'>+#define GPIO_NR_PALMZ72_LED_GREEN		88</div><div class='add'>+</div><div class='add'>+/* Bluetooth */</div><div class='add'>+#define GPIO_NR_PALMZ72_BT_POWER		17</div><div class='add'>+#define GPIO_NR_PALMZ72_BT_RESET		83</div><div class='add'>+</div><div class='add'>+/** Initial values **/</div><div class='add'>+</div><div class='add'>+/* Battery */</div><div class='add'>+#define PALMZ72_BAT_MAX_VOLTAGE		4000	/* 4.00v current voltage */</div><div class='add'>+#define PALMZ72_BAT_MIN_VOLTAGE		3550	/* 3.55v critical voltage */</div><div class='add'>+#define PALMZ72_BAT_MAX_CURRENT		0	/* unknokn */</div><div class='add'>+#define PALMZ72_BAT_MIN_CURRENT		0	/* unknown */</div><div class='add'>+#define PALMZ72_BAT_MAX_CHARGE		1	/* unknown */</div><div class='add'>+#define PALMZ72_BAT_MIN_CHARGE		1	/* unknown */</div><div class='add'>+#define PALMZ72_MAX_LIFE_MINS		360	/* on-life in minutes */</div><div class='add'>+</div><div class='add'>+/* Backlight */</div><div class='add'>+#define PALMZ72_MAX_INTENSITY		0xFE</div><div class='add'>+#define PALMZ72_DEFAULT_INTENSITY	0x7E</div><div class='add'>+#define PALMZ72_LIMIT_MASK		0x7F</div><div class='add'>+#define PALMZ72_PRESCALER		0x3F</div><div class='add'>+#define PALMZ72_PERIOD_NS		3500</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+struct palmz72_resume_info {</div><div class='add'>+	u32 magic0;		/* 0x0 */</div><div class='add'>+	u32 magic1;		/* 0x4 */</div><div class='add'>+	u32 resume_addr;	/* 0x8 */</div><div class='add'>+	u32 pad[11];		/* 0xc..0x37 */</div><div class='add'>+	u32 arm_control;	/* 0x38 */</div><div class='add'>+	u32 aux_control;	/* 0x3c */</div><div class='add'>+	u32 ttb;		/* 0x40 */</div><div class='add'>+	u32 domain_access;	/* 0x44 */</div><div class='add'>+	u32 process_id;		/* 0x48 */</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+#endif</div><div class='add'>+</div><div class='head'>diff --git a/arch/arm/mach-pxa/include/mach/pm.h b/arch/arm/mach-pxa/include/mach/pm.h<br/>index 261e5bc958db..83342469acac 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/include/mach/pm.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pxa/include/mach/pm.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/include/mach/pm.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/include/mach/pm.h</a></div><div class='hunk'>@@ -15,6 +15,8 @@ struct pxa_cpu_pm_fns {</div><div class='ctx'> 	void	(*restore)(unsigned long *);</div><div class='ctx'> 	int	(*valid)(suspend_state_t state);</div><div class='ctx'> 	void	(*enter)(suspend_state_t state);</div><div class='add'>+	int	(*prepare)(void);</div><div class='add'>+	void	(*finish)(void);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern struct pxa_cpu_pm_fns *pxa_cpu_pm_fns;</div><div class='head'>diff --git a/arch/arm/mach-pxa/include/mach/poodle.h b/arch/arm/mach-pxa/include/mach/poodle.h<br/>index 67debc47e8c6..0b3e6d051c64 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/include/mach/poodle.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pxa/include/mach/poodle.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/include/mach/poodle.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/include/mach/poodle.h</a></div><div class='hunk'>@@ -23,6 +23,7 @@</div><div class='ctx'> #define POODLE_GPIO_AC_IN		(1)</div><div class='ctx'> #define POODLE_GPIO_CO			16</div><div class='ctx'> #define POODLE_GPIO_TP_INT		(5)</div><div class='add'>+#define POODLE_GPIO_TP_CS		(24)</div><div class='ctx'> #define POODLE_GPIO_WAKEUP		(11)	/* change battery */</div><div class='ctx'> #define POODLE_GPIO_GA_INT		(10)</div><div class='ctx'> #define POODLE_GPIO_IR_ON		(22)</div><div class='hunk'>@@ -70,6 +71,14 @@</div><div class='ctx'> #define POODLE_SCOOP_IO_DIR	( POODLE_SCOOP_VPEN | POODLE_SCOOP_HS_OUT )</div><div class='ctx'> #define POODLE_SCOOP_IO_OUT	( 0 )</div><div class='ctx'> </div><div class='add'>+#define POODLE_SCOOP_GPIO_BASE	(NR_BUILTIN_GPIO)</div><div class='add'>+#define POODLE_GPIO_CHARGE_ON	(POODLE_SCOOP_GPIO_BASE + 0)</div><div class='add'>+#define POODLE_GPIO_CP401	(POODLE_SCOOP_GPIO_BASE + 2)</div><div class='add'>+#define POODLE_GPIO_VPEN	(POODLE_SCOOP_GPIO_BASE + 7)</div><div class='add'>+#define POODLE_GPIO_L_PCLK	(POODLE_SCOOP_GPIO_BASE + 9)</div><div class='add'>+#define POODLE_GPIO_L_LCLK	(POODLE_SCOOP_GPIO_BASE + 10)</div><div class='add'>+#define POODLE_GPIO_HS_OUT	(POODLE_SCOOP_GPIO_BASE + 11)</div><div class='add'>+</div><div class='ctx'> #define POODLE_LOCOMO_GPIO_AMP_ON      LOCOMO_GPIO(8)</div><div class='ctx'> #define POODLE_LOCOMO_GPIO_MUTE_L      LOCOMO_GPIO(10)</div><div class='ctx'> #define POODLE_LOCOMO_GPIO_MUTE_R      LOCOMO_GPIO(11)</div><div class='head'>diff --git a/arch/arm/mach-pxa/include/mach/pxa-regs.h b/arch/arm/mach-pxa/include/mach/pxa-regs.h<br/>index 12288ca3cbb2..15295d960000 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/include/mach/pxa-regs.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pxa/include/mach/pxa-regs.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/include/mach/pxa-regs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/include/mach/pxa-regs.h</a></div><div class='hunk'>@@ -69,30 +69,18 @@</div><div class='ctx'> /*</div><div class='ctx'>  * DMA Controller</div><div class='ctx'>  */</div><div class='del'>-</div><div class='del'>-#define DCSR0		__REG(0x40000000)  /* DMA Control / Status Register for Channel 0 */</div><div class='del'>-#define DCSR1		__REG(0x40000004)  /* DMA Control / Status Register for Channel 1 */</div><div class='del'>-#define DCSR2		__REG(0x40000008)  /* DMA Control / Status Register for Channel 2 */</div><div class='del'>-#define DCSR3		__REG(0x4000000c)  /* DMA Control / Status Register for Channel 3 */</div><div class='del'>-#define DCSR4		__REG(0x40000010)  /* DMA Control / Status Register for Channel 4 */</div><div class='del'>-#define DCSR5		__REG(0x40000014)  /* DMA Control / Status Register for Channel 5 */</div><div class='del'>-#define DCSR6		__REG(0x40000018)  /* DMA Control / Status Register for Channel 6 */</div><div class='del'>-#define DCSR7		__REG(0x4000001c)  /* DMA Control / Status Register for Channel 7 */</div><div class='del'>-#define DCSR8		__REG(0x40000020)  /* DMA Control / Status Register for Channel 8 */</div><div class='del'>-#define DCSR9		__REG(0x40000024)  /* DMA Control / Status Register for Channel 9 */</div><div class='del'>-#define DCSR10		__REG(0x40000028)  /* DMA Control / Status Register for Channel 10 */</div><div class='del'>-#define DCSR11		__REG(0x4000002c)  /* DMA Control / Status Register for Channel 11 */</div><div class='del'>-#define DCSR12		__REG(0x40000030)  /* DMA Control / Status Register for Channel 12 */</div><div class='del'>-#define DCSR13		__REG(0x40000034)  /* DMA Control / Status Register for Channel 13 */</div><div class='del'>-#define DCSR14		__REG(0x40000038)  /* DMA Control / Status Register for Channel 14 */</div><div class='del'>-#define DCSR15		__REG(0x4000003c)  /* DMA Control / Status Register for Channel 15 */</div><div class='del'>-</div><div class='ctx'> #define DCSR(x)		__REG2(0x40000000, (x) &lt;&lt; 2)</div><div class='ctx'> </div><div class='ctx'> #define DCSR_RUN	(1 &lt;&lt; 31)	/* Run Bit (read / write) */</div><div class='ctx'> #define DCSR_NODESC	(1 &lt;&lt; 30)	/* No-Descriptor Fetch (read / write) */</div><div class='ctx'> #define DCSR_STOPIRQEN	(1 &lt;&lt; 29)	/* Stop Interrupt Enable (read / write) */</div><div class='del'>-#ifdef CONFIG_PXA27x</div><div class='add'>+#define DCSR_REQPEND	(1 &lt;&lt; 8)	/* Request Pending (read-only) */</div><div class='add'>+#define DCSR_STOPSTATE	(1 &lt;&lt; 3)	/* Stop State (read-only) */</div><div class='add'>+#define DCSR_ENDINTR	(1 &lt;&lt; 2)	/* End Interrupt (read / write) */</div><div class='add'>+#define DCSR_STARTINTR	(1 &lt;&lt; 1)	/* Start Interrupt (read / write) */</div><div class='add'>+#define DCSR_BUSERR	(1 &lt;&lt; 0)	/* Bus Error Interrupt (read / write) */</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_PXA27x) || defined(CONFIG_PXA3xx)</div><div class='ctx'> #define DCSR_EORIRQEN	(1 &lt;&lt; 28)       /* End of Receive Interrupt Enable (R/W) */</div><div class='ctx'> #define DCSR_EORJMPEN	(1 &lt;&lt; 27)       /* Jump to next descriptor on EOR */</div><div class='ctx'> #define DCSR_EORSTOPEN	(1 &lt;&lt; 26)       /* STOP on an EOR */</div><div class='hunk'>@@ -101,11 +89,6 @@</div><div class='ctx'> #define DCSR_CMPST	(1 &lt;&lt; 10)       /* The Descriptor Compare Status */</div><div class='ctx'> #define DCSR_EORINTR	(1 &lt;&lt; 9)        /* The end of Receive */</div><div class='ctx'> #endif</div><div class='del'>-#define DCSR_REQPEND	(1 &lt;&lt; 8)	/* Request Pending (read-only) */</div><div class='del'>-#define DCSR_STOPSTATE	(1 &lt;&lt; 3)	/* Stop State (read-only) */</div><div class='del'>-#define DCSR_ENDINTR	(1 &lt;&lt; 2)	/* End Interrupt (read / write) */</div><div class='del'>-#define DCSR_STARTINTR	(1 &lt;&lt; 1)	/* Start Interrupt (read / write) */</div><div class='del'>-#define DCSR_BUSERR	(1 &lt;&lt; 0)	/* Bus Error Interrupt (read / write) */</div><div class='ctx'> </div><div class='ctx'> #define DALGN		__REG(0x400000a0)  /* DMA Alignment Register */</div><div class='ctx'> #define DINT		__REG(0x400000f0)  /* DMA Interrupt Register */</div><div class='hunk'>@@ -114,145 +97,9 @@</div><div class='ctx'> 			&amp;__REG2(0x40000100, ((n) &amp; 0x3f) &lt;&lt; 2) : \</div><div class='ctx'> 			&amp;__REG2(0x40001100, ((n) &amp; 0x3f) &lt;&lt; 2)))</div><div class='ctx'> </div><div class='del'>-#define DRCMR0		__REG(0x40000100)  /* Request to Channel Map Register for DREQ 0 */</div><div class='del'>-#define DRCMR1		__REG(0x40000104)  /* Request to Channel Map Register for DREQ 1 */</div><div class='del'>-#define DRCMR2		__REG(0x40000108)  /* Request to Channel Map Register for I2S receive Request */</div><div class='del'>-#define DRCMR3		__REG(0x4000010c)  /* Request to Channel Map Register for I2S transmit Request */</div><div class='del'>-#define DRCMR4		__REG(0x40000110)  /* Request to Channel Map Register for BTUART receive Request */</div><div class='del'>-#define DRCMR5		__REG(0x40000114)  /* Request to Channel Map Register for BTUART transmit Request. */</div><div class='del'>-#define DRCMR6		__REG(0x40000118)  /* Request to Channel Map Register for FFUART receive Request */</div><div class='del'>-#define DRCMR7		__REG(0x4000011c)  /* Request to Channel Map Register for FFUART transmit Request */</div><div class='del'>-#define DRCMR8		__REG(0x40000120)  /* Request to Channel Map Register for AC97 microphone Request */</div><div class='del'>-#define DRCMR9		__REG(0x40000124)  /* Request to Channel Map Register for AC97 modem receive Request */</div><div class='del'>-#define DRCMR10		__REG(0x40000128)  /* Request to Channel Map Register for AC97 modem transmit Request */</div><div class='del'>-#define DRCMR11		__REG(0x4000012c)  /* Request to Channel Map Register for AC97 audio receive Request */</div><div class='del'>-#define DRCMR12		__REG(0x40000130)  /* Request to Channel Map Register for AC97 audio transmit Request */</div><div class='del'>-#define DRCMR13		__REG(0x40000134)  /* Request to Channel Map Register for SSP receive Request */</div><div class='del'>-#define DRCMR14		__REG(0x40000138)  /* Request to Channel Map Register for SSP transmit Request */</div><div class='del'>-#define DRCMR15		__REG(0x4000013c)  /* Request to Channel Map Register for SSP2 receive Request */</div><div class='del'>-#define DRCMR16		__REG(0x40000140)  /* Request to Channel Map Register for SSP2 transmit Request */</div><div class='del'>-#define DRCMR17		__REG(0x40000144)  /* Request to Channel Map Register for ICP receive Request */</div><div class='del'>-#define DRCMR18		__REG(0x40000148)  /* Request to Channel Map Register for ICP transmit Request */</div><div class='del'>-#define DRCMR19		__REG(0x4000014c)  /* Request to Channel Map Register for STUART receive Request */</div><div class='del'>-#define DRCMR20		__REG(0x40000150)  /* Request to Channel Map Register for STUART transmit Request */</div><div class='del'>-#define DRCMR21		__REG(0x40000154)  /* Request to Channel Map Register for MMC receive Request */</div><div class='del'>-#define DRCMR22		__REG(0x40000158)  /* Request to Channel Map Register for MMC transmit Request */</div><div class='del'>-#define DRCMR23		__REG(0x4000015c)  /* Reserved */</div><div class='del'>-#define DRCMR24		__REG(0x40000160)  /* Reserved */</div><div class='del'>-#define DRCMR25		__REG(0x40000164)  /* Request to Channel Map Register for USB endpoint 1 Request */</div><div class='del'>-#define DRCMR26		__REG(0x40000168)  /* Request to Channel Map Register for USB endpoint 2 Request */</div><div class='del'>-#define DRCMR27		__REG(0x4000016C)  /* Request to Channel Map Register for USB endpoint 3 Request */</div><div class='del'>-#define DRCMR28		__REG(0x40000170)  /* Request to Channel Map Register for USB endpoint 4 Request */</div><div class='del'>-#define DRCMR29		__REG(0x40000174)  /* Reserved */</div><div class='del'>-#define DRCMR30		__REG(0x40000178)  /* Request to Channel Map Register for USB endpoint 6 Request */</div><div class='del'>-#define DRCMR31		__REG(0x4000017C)  /* Request to Channel Map Register for USB endpoint 7 Request */</div><div class='del'>-#define DRCMR32		__REG(0x40000180)  /* Request to Channel Map Register for USB endpoint 8 Request */</div><div class='del'>-#define DRCMR33		__REG(0x40000184)  /* Request to Channel Map Register for USB endpoint 9 Request */</div><div class='del'>-#define DRCMR34		__REG(0x40000188)  /* Reserved */</div><div class='del'>-#define DRCMR35		__REG(0x4000018C)  /* Request to Channel Map Register for USB endpoint 11 Request */</div><div class='del'>-#define DRCMR36		__REG(0x40000190)  /* Request to Channel Map Register for USB endpoint 12 Request */</div><div class='del'>-#define DRCMR37		__REG(0x40000194)  /* Request to Channel Map Register for USB endpoint 13 Request */</div><div class='del'>-#define DRCMR38		__REG(0x40000198)  /* Request to Channel Map Register for USB endpoint 14 Request */</div><div class='del'>-#define DRCMR39		__REG(0x4000019C)  /* Reserved */</div><div class='del'>-#define DRCMR66		__REG(0x40001108)  /* Request to Channel Map Register for SSP3 receive Request */</div><div class='del'>-#define DRCMR67		__REG(0x4000110C)  /* Request to Channel Map Register for SSP3 transmit Request */</div><div class='del'>-#define DRCMR68		__REG(0x40001110)  /* Request to Channel Map Register for Camera FIFO 0 Request */</div><div class='del'>-#define DRCMR69		__REG(0x40001114)  /* Request to Channel Map Register for Camera FIFO 1 Request */</div><div class='del'>-#define DRCMR70		__REG(0x40001118)  /* Request to Channel Map Register for Camera FIFO 2 Request */</div><div class='del'>-</div><div class='del'>-#define DRCMRRXSADR	DRCMR2</div><div class='del'>-#define DRCMRTXSADR	DRCMR3</div><div class='del'>-#define DRCMRRXBTRBR	DRCMR4</div><div class='del'>-#define DRCMRTXBTTHR	DRCMR5</div><div class='del'>-#define DRCMRRXFFRBR	DRCMR6</div><div class='del'>-#define DRCMRTXFFTHR	DRCMR7</div><div class='del'>-#define DRCMRRXMCDR	DRCMR8</div><div class='del'>-#define DRCMRRXMODR	DRCMR9</div><div class='del'>-#define DRCMRTXMODR	DRCMR10</div><div class='del'>-#define DRCMRRXPCDR	DRCMR11</div><div class='del'>-#define DRCMRTXPCDR	DRCMR12</div><div class='del'>-#define DRCMRRXSSDR	DRCMR13</div><div class='del'>-#define DRCMRTXSSDR	DRCMR14</div><div class='del'>-#define DRCMRRXSS2DR   DRCMR15</div><div class='del'>-#define DRCMRTXSS2DR   DRCMR16</div><div class='del'>-#define DRCMRRXICDR	DRCMR17</div><div class='del'>-#define DRCMRTXICDR	DRCMR18</div><div class='del'>-#define DRCMRRXSTRBR	DRCMR19</div><div class='del'>-#define DRCMRTXSTTHR	DRCMR20</div><div class='del'>-#define DRCMRRXMMC	DRCMR21</div><div class='del'>-#define DRCMRTXMMC	DRCMR22</div><div class='del'>-#define DRCMRRXSS3DR   DRCMR66</div><div class='del'>-#define DRCMRTXSS3DR   DRCMR67</div><div class='del'>-#define DRCMRUDC(x)	DRCMR((x) + 24)</div><div class='del'>-</div><div class='ctx'> #define DRCMR_MAPVLD	(1 &lt;&lt; 7)	/* Map Valid (read / write) */</div><div class='ctx'> #define DRCMR_CHLNUM	0x1f		/* mask for Channel Number (read / write) */</div><div class='ctx'> </div><div class='del'>-#define DDADR0		__REG(0x40000200)  /* DMA Descriptor Address Register Channel 0 */</div><div class='del'>-#define DSADR0		__REG(0x40000204)  /* DMA Source Address Register Channel 0 */</div><div class='del'>-#define DTADR0		__REG(0x40000208)  /* DMA Target Address Register Channel 0 */</div><div class='del'>-#define DCMD0		__REG(0x4000020c)  /* DMA Command Address Register Channel 0 */</div><div class='del'>-#define DDADR1		__REG(0x40000210)  /* DMA Descriptor Address Register Channel 1 */</div><div class='del'>-#define DSADR1		__REG(0x40000214)  /* DMA Source Address Register Channel 1 */</div><div class='del'>-#define DTADR1		__REG(0x40000218)  /* DMA Target Address Register Channel 1 */</div><div class='del'>-#define DCMD1		__REG(0x4000021c)  /* DMA Command Address Register Channel 1 */</div><div class='del'>-#define DDADR2		__REG(0x40000220)  /* DMA Descriptor Address Register Channel 2 */</div><div class='del'>-#define DSADR2		__REG(0x40000224)  /* DMA Source Address Register Channel 2 */</div><div class='del'>-#define DTADR2		__REG(0x40000228)  /* DMA Target Address Register Channel 2 */</div><div class='del'>-#define DCMD2		__REG(0x4000022c)  /* DMA Command Address Register Channel 2 */</div><div class='del'>-#define DDADR3		__REG(0x40000230)  /* DMA Descriptor Address Register Channel 3 */</div><div class='del'>-#define DSADR3		__REG(0x40000234)  /* DMA Source Address Register Channel 3 */</div><div class='del'>-#define DTADR3		__REG(0x40000238)  /* DMA Target Address Register Channel 3 */</div><div class='del'>-#define DCMD3		__REG(0x4000023c)  /* DMA Command Address Register Channel 3 */</div><div class='del'>-#define DDADR4		__REG(0x40000240)  /* DMA Descriptor Address Register Channel 4 */</div><div class='del'>-#define DSADR4		__REG(0x40000244)  /* DMA Source Address Register Channel 4 */</div><div class='del'>-#define DTADR4		__REG(0x40000248)  /* DMA Target Address Register Channel 4 */</div><div class='del'>-#define DCMD4		__REG(0x4000024c)  /* DMA Command Address Register Channel 4 */</div><div class='del'>-#define DDADR5		__REG(0x40000250)  /* DMA Descriptor Address Register Channel 5 */</div><div class='del'>-#define DSADR5		__REG(0x40000254)  /* DMA Source Address Register Channel 5 */</div><div class='del'>-#define DTADR5		__REG(0x40000258)  /* DMA Target Address Register Channel 5 */</div><div class='del'>-#define DCMD5		__REG(0x4000025c)  /* DMA Command Address Register Channel 5 */</div><div class='del'>-#define DDADR6		__REG(0x40000260)  /* DMA Descriptor Address Register Channel 6 */</div><div class='del'>-#define DSADR6		__REG(0x40000264)  /* DMA Source Address Register Channel 6 */</div><div class='del'>-#define DTADR6		__REG(0x40000268)  /* DMA Target Address Register Channel 6 */</div><div class='del'>-#define DCMD6		__REG(0x4000026c)  /* DMA Command Address Register Channel 6 */</div><div class='del'>-#define DDADR7		__REG(0x40000270)  /* DMA Descriptor Address Register Channel 7 */</div><div class='del'>-#define DSADR7		__REG(0x40000274)  /* DMA Source Address Register Channel 7 */</div><div class='del'>-#define DTADR7		__REG(0x40000278)  /* DMA Target Address Register Channel 7 */</div><div class='del'>-#define DCMD7		__REG(0x4000027c)  /* DMA Command Address Register Channel 7 */</div><div class='del'>-#define DDADR8		__REG(0x40000280)  /* DMA Descriptor Address Register Channel 8 */</div><div class='del'>-#define DSADR8		__REG(0x40000284)  /* DMA Source Address Register Channel 8 */</div><div class='del'>-#define DTADR8		__REG(0x40000288)  /* DMA Target Address Register Channel 8 */</div><div class='del'>-#define DCMD8		__REG(0x4000028c)  /* DMA Command Address Register Channel 8 */</div><div class='del'>-#define DDADR9		__REG(0x40000290)  /* DMA Descriptor Address Register Channel 9 */</div><div class='del'>-#define DSADR9		__REG(0x40000294)  /* DMA Source Address Register Channel 9 */</div><div class='del'>-#define DTADR9		__REG(0x40000298)  /* DMA Target Address Register Channel 9 */</div><div class='del'>-#define DCMD9		__REG(0x4000029c)  /* DMA Command Address Register Channel 9 */</div><div class='del'>-#define DDADR10		__REG(0x400002a0)  /* DMA Descriptor Address Register Channel 10 */</div><div class='del'>-#define DSADR10		__REG(0x400002a4)  /* DMA Source Address Register Channel 10 */</div><div class='del'>-#define DTADR10		__REG(0x400002a8)  /* DMA Target Address Register Channel 10 */</div><div class='del'>-#define DCMD10		__REG(0x400002ac)  /* DMA Command Address Register Channel 10 */</div><div class='del'>-#define DDADR11		__REG(0x400002b0)  /* DMA Descriptor Address Register Channel 11 */</div><div class='del'>-#define DSADR11		__REG(0x400002b4)  /* DMA Source Address Register Channel 11 */</div><div class='del'>-#define DTADR11		__REG(0x400002b8)  /* DMA Target Address Register Channel 11 */</div><div class='del'>-#define DCMD11		__REG(0x400002bc)  /* DMA Command Address Register Channel 11 */</div><div class='del'>-#define DDADR12		__REG(0x400002c0)  /* DMA Descriptor Address Register Channel 12 */</div><div class='del'>-#define DSADR12		__REG(0x400002c4)  /* DMA Source Address Register Channel 12 */</div><div class='del'>-#define DTADR12		__REG(0x400002c8)  /* DMA Target Address Register Channel 12 */</div><div class='del'>-#define DCMD12		__REG(0x400002cc)  /* DMA Command Address Register Channel 12 */</div><div class='del'>-#define DDADR13		__REG(0x400002d0)  /* DMA Descriptor Address Register Channel 13 */</div><div class='del'>-#define DSADR13		__REG(0x400002d4)  /* DMA Source Address Register Channel 13 */</div><div class='del'>-#define DTADR13		__REG(0x400002d8)  /* DMA Target Address Register Channel 13 */</div><div class='del'>-#define DCMD13		__REG(0x400002dc)  /* DMA Command Address Register Channel 13 */</div><div class='del'>-#define DDADR14		__REG(0x400002e0)  /* DMA Descriptor Address Register Channel 14 */</div><div class='del'>-#define DSADR14		__REG(0x400002e4)  /* DMA Source Address Register Channel 14 */</div><div class='del'>-#define DTADR14		__REG(0x400002e8)  /* DMA Target Address Register Channel 14 */</div><div class='del'>-#define DCMD14		__REG(0x400002ec)  /* DMA Command Address Register Channel 14 */</div><div class='del'>-#define DDADR15		__REG(0x400002f0)  /* DMA Descriptor Address Register Channel 15 */</div><div class='del'>-#define DSADR15		__REG(0x400002f4)  /* DMA Source Address Register Channel 15 */</div><div class='del'>-#define DTADR15		__REG(0x400002f8)  /* DMA Target Address Register Channel 15 */</div><div class='del'>-#define DCMD15		__REG(0x400002fc)  /* DMA Command Address Register Channel 15 */</div><div class='del'>-</div><div class='ctx'> #define DDADR(x)	__REG2(0x40000200, (x) &lt;&lt; 4)</div><div class='ctx'> #define DSADR(x)	__REG2(0x40000204, (x) &lt;&lt; 4)</div><div class='ctx'> #define DTADR(x)	__REG2(0x40000208, (x) &lt;&lt; 4)</div><div class='hunk'>@@ -418,91 +265,13 @@</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * I2C registers</div><div class='add'>+ * I2C registers - moved into drivers/i2c/busses/i2c-pxa.c</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define IBMR		__REG(0x40301680)  /* I2C Bus Monitor Register - IBMR */</div><div class='del'>-#define IDBR		__REG(0x40301688)  /* I2C Data Buffer Register - IDBR */</div><div class='del'>-#define ICR		__REG(0x40301690)  /* I2C Control Register - ICR */</div><div class='del'>-#define ISR		__REG(0x40301698)  /* I2C Status Register - ISR */</div><div class='del'>-#define ISAR		__REG(0x403016A0)  /* I2C Slave Address Register - ISAR */</div><div class='del'>-</div><div class='del'>-#define PWRIBMR    __REG(0x40f00180)  /* Power I2C Bus Monitor Register-IBMR */</div><div class='del'>-#define PWRIDBR    __REG(0x40f00188)  /* Power I2C Data Buffer Register-IDBR */</div><div class='del'>-#define PWRICR __REG(0x40f00190)  /* Power I2C Control Register - ICR */</div><div class='del'>-#define PWRISR __REG(0x40f00198)  /* Power I2C Status Register - ISR */</div><div class='del'>-#define PWRISAR    __REG(0x40f001A0)  /*Power I2C Slave Address Register-ISAR */</div><div class='del'>-</div><div class='del'>-#define ICR_START	(1 &lt;&lt; 0)	   /* start bit */</div><div class='del'>-#define ICR_STOP	(1 &lt;&lt; 1)	   /* stop bit */</div><div class='del'>-#define ICR_ACKNAK	(1 &lt;&lt; 2)	   /* send ACK(0) or NAK(1) */</div><div class='del'>-#define ICR_TB		(1 &lt;&lt; 3)	   /* transfer byte bit */</div><div class='del'>-#define ICR_MA		(1 &lt;&lt; 4)	   /* master abort */</div><div class='del'>-#define ICR_SCLE	(1 &lt;&lt; 5)	   /* master clock enable */</div><div class='del'>-#define ICR_IUE		(1 &lt;&lt; 6)	   /* unit enable */</div><div class='del'>-#define ICR_GCD		(1 &lt;&lt; 7)	   /* general call disable */</div><div class='del'>-#define ICR_ITEIE	(1 &lt;&lt; 8)	   /* enable tx interrupts */</div><div class='del'>-#define ICR_IRFIE	(1 &lt;&lt; 9)	   /* enable rx interrupts */</div><div class='del'>-#define ICR_BEIE	(1 &lt;&lt; 10)	   /* enable bus error ints */</div><div class='del'>-#define ICR_SSDIE	(1 &lt;&lt; 11)	   /* slave STOP detected int enable */</div><div class='del'>-#define ICR_ALDIE	(1 &lt;&lt; 12)	   /* enable arbitration interrupt */</div><div class='del'>-#define ICR_SADIE	(1 &lt;&lt; 13)	   /* slave address detected int enable */</div><div class='del'>-#define ICR_UR		(1 &lt;&lt; 14)	   /* unit reset */</div><div class='del'>-</div><div class='del'>-#define ISR_RWM		(1 &lt;&lt; 0)	   /* read/write mode */</div><div class='del'>-#define ISR_ACKNAK	(1 &lt;&lt; 1)	   /* ack/nak status */</div><div class='del'>-#define ISR_UB		(1 &lt;&lt; 2)	   /* unit busy */</div><div class='del'>-#define ISR_IBB		(1 &lt;&lt; 3)	   /* bus busy */</div><div class='del'>-#define ISR_SSD		(1 &lt;&lt; 4)	   /* slave stop detected */</div><div class='del'>-#define ISR_ALD		(1 &lt;&lt; 5)	   /* arbitration loss detected */</div><div class='del'>-#define ISR_ITE		(1 &lt;&lt; 6)	   /* tx buffer empty */</div><div class='del'>-#define ISR_IRF		(1 &lt;&lt; 7)	   /* rx buffer full */</div><div class='del'>-#define ISR_GCAD	(1 &lt;&lt; 8)	   /* general call address detected */</div><div class='del'>-#define ISR_SAD		(1 &lt;&lt; 9)	   /* slave address detected */</div><div class='del'>-#define ISR_BED		(1 &lt;&lt; 10)	   /* bus error no ACK/NAK */</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> /*</div><div class='del'>- * Serial Audio Controller</div><div class='add'>+ * Serial Audio Controller - moved into sound/soc/pxa/pxa2xx-i2s.c</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define SACR0		__REG(0x40400000)  /* Global Control Register */</div><div class='del'>-#define SACR1		__REG(0x40400004)  /* Serial Audio I 2 S/MSB-Justified Control Register */</div><div class='del'>-#define SASR0		__REG(0x4040000C)  /* Serial Audio I 2 S/MSB-Justified Interface and FIFO Status Register */</div><div class='del'>-#define SAIMR		__REG(0x40400014)  /* Serial Audio Interrupt Mask Register */</div><div class='del'>-#define SAICR		__REG(0x40400018)  /* Serial Audio Interrupt Clear Register */</div><div class='del'>-#define SADIV		__REG(0x40400060)  /* Audio Clock Divider Register. */</div><div class='del'>-#define SADR		__REG(0x40400080)  /* Serial Audio Data Register (TX and RX FIFO access Register). */</div><div class='del'>-</div><div class='del'>-#define SACR0_RFTH(x)	((x) &lt;&lt; 12)	/* Rx FIFO Interrupt or DMA Trigger Threshold */</div><div class='del'>-#define SACR0_TFTH(x)	((x) &lt;&lt; 8)	/* Tx FIFO Interrupt or DMA Trigger Threshold */</div><div class='del'>-#define SACR0_STRF	(1 &lt;&lt; 5)	/* FIFO Select for EFWR Special Function */</div><div class='del'>-#define SACR0_EFWR	(1 &lt;&lt; 4)	/* Enable EFWR Function  */</div><div class='del'>-#define SACR0_RST	(1 &lt;&lt; 3)	/* FIFO, i2s Register Reset */</div><div class='del'>-#define SACR0_BCKD	(1 &lt;&lt; 2) 	/* Bit Clock Direction */</div><div class='del'>-#define SACR0_ENB	(1 &lt;&lt; 0)	/* Enable I2S Link */</div><div class='del'>-#define SACR1_ENLBF	(1 &lt;&lt; 5)	/* Enable Loopback */</div><div class='del'>-#define SACR1_DRPL	(1 &lt;&lt; 4) 	/* Disable Replaying Function */</div><div class='del'>-#define SACR1_DREC	(1 &lt;&lt; 3)	/* Disable Recording Function */</div><div class='del'>-#define SACR1_AMSL	(1 &lt;&lt; 0)	/* Specify Alternate Mode */</div><div class='del'>-</div><div class='del'>-#define SASR0_I2SOFF	(1 &lt;&lt; 7)	/* Controller Status */</div><div class='del'>-#define SASR0_ROR	(1 &lt;&lt; 6)	/* Rx FIFO Overrun */</div><div class='del'>-#define SASR0_TUR	(1 &lt;&lt; 5)	/* Tx FIFO Underrun */</div><div class='del'>-#define SASR0_RFS	(1 &lt;&lt; 4)	/* Rx FIFO Service Request */</div><div class='del'>-#define SASR0_TFS	(1 &lt;&lt; 3)	/* Tx FIFO Service Request */</div><div class='del'>-#define SASR0_BSY	(1 &lt;&lt; 2)	/* I2S Busy */</div><div class='del'>-#define SASR0_RNE	(1 &lt;&lt; 1)	/* Rx FIFO Not Empty */</div><div class='del'>-#define SASR0_TNF	(1 &lt;&lt; 0) 	/* Tx FIFO Not Empty */</div><div class='del'>-</div><div class='del'>-#define SAICR_ROR	(1 &lt;&lt; 6)	/* Clear Rx FIFO Overrun Interrupt */</div><div class='del'>-#define SAICR_TUR	(1 &lt;&lt; 5)	/* Clear Tx FIFO Underrun Interrupt */</div><div class='del'>-</div><div class='del'>-#define SAIMR_ROR	(1 &lt;&lt; 6)	/* Enable Rx FIFO Overrun Condition Interrupt */</div><div class='del'>-#define SAIMR_TUR	(1 &lt;&lt; 5)	/* Enable Tx FIFO Underrun Condition Interrupt */</div><div class='del'>-#define SAIMR_RFS	(1 &lt;&lt; 4)	/* Enable Rx FIFO Service Interrupt */</div><div class='del'>-#define SAIMR_TFS	(1 &lt;&lt; 3)	/* Enable Tx FIFO Service Interrupt */</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * AC97 Controller registers</div><div class='ctx'>  */</div><div class='hunk'>@@ -989,77 +758,6 @@</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_PXA27x) || defined(CONFIG_PXA3xx)</div><div class='del'>-/*</div><div class='del'>- * UHC: USB Host Controller (OHCI-like) register definitions</div><div class='del'>- */</div><div class='del'>-#define UHC_BASE_PHYS	(0x4C000000)</div><div class='del'>-#define UHCREV		__REG(0x4C000000) /* UHC HCI Spec Revision */</div><div class='del'>-#define UHCHCON		__REG(0x4C000004) /* UHC Host Control Register */</div><div class='del'>-#define UHCCOMS		__REG(0x4C000008) /* UHC Command Status Register */</div><div class='del'>-#define UHCINTS		__REG(0x4C00000C) /* UHC Interrupt Status Register */</div><div class='del'>-#define UHCINTE		__REG(0x4C000010) /* UHC Interrupt Enable */</div><div class='del'>-#define UHCINTD		__REG(0x4C000014) /* UHC Interrupt Disable */</div><div class='del'>-#define UHCHCCA		__REG(0x4C000018) /* UHC Host Controller Comm. Area */</div><div class='del'>-#define UHCPCED		__REG(0x4C00001C) /* UHC Period Current Endpt Descr */</div><div class='del'>-#define UHCCHED		__REG(0x4C000020) /* UHC Control Head Endpt Descr */</div><div class='del'>-#define UHCCCED		__REG(0x4C000024) /* UHC Control Current Endpt Descr */</div><div class='del'>-#define UHCBHED		__REG(0x4C000028) /* UHC Bulk Head Endpt Descr */</div><div class='del'>-#define UHCBCED		__REG(0x4C00002C) /* UHC Bulk Current Endpt Descr */</div><div class='del'>-#define UHCDHEAD	__REG(0x4C000030) /* UHC Done Head */</div><div class='del'>-#define UHCFMI		__REG(0x4C000034) /* UHC Frame Interval */</div><div class='del'>-#define UHCFMR		__REG(0x4C000038) /* UHC Frame Remaining */</div><div class='del'>-#define UHCFMN		__REG(0x4C00003C) /* UHC Frame Number */</div><div class='del'>-#define UHCPERS		__REG(0x4C000040) /* UHC Periodic Start */</div><div class='del'>-#define UHCLS		__REG(0x4C000044) /* UHC Low Speed Threshold */</div><div class='del'>-</div><div class='del'>-#define UHCRHDA		__REG(0x4C000048) /* UHC Root Hub Descriptor A */</div><div class='del'>-#define UHCRHDA_NOCP	(1 &lt;&lt; 12)	/* No over current protection */</div><div class='del'>-</div><div class='del'>-#define UHCRHDB		__REG(0x4C00004C) /* UHC Root Hub Descriptor B */</div><div class='del'>-#define UHCRHS		__REG(0x4C000050) /* UHC Root Hub Status */</div><div class='del'>-#define UHCRHPS1	__REG(0x4C000054) /* UHC Root Hub Port 1 Status */</div><div class='del'>-#define UHCRHPS2	__REG(0x4C000058) /* UHC Root Hub Port 2 Status */</div><div class='del'>-#define UHCRHPS3	__REG(0x4C00005C) /* UHC Root Hub Port 3 Status */</div><div class='del'>-</div><div class='del'>-#define UHCSTAT		__REG(0x4C000060) /* UHC Status Register */</div><div class='del'>-#define UHCSTAT_UPS3	(1 &lt;&lt; 16)	/* USB Power Sense Port3 */</div><div class='del'>-#define UHCSTAT_SBMAI	(1 &lt;&lt; 15)	/* System Bus Master Abort Interrupt*/</div><div class='del'>-#define UHCSTAT_SBTAI	(1 &lt;&lt; 14)	/* System Bus Target Abort Interrupt*/</div><div class='del'>-#define UHCSTAT_UPRI	(1 &lt;&lt; 13)	/* USB Port Resume Interrupt */</div><div class='del'>-#define UHCSTAT_UPS2	(1 &lt;&lt; 12)	/* USB Power Sense Port 2 */</div><div class='del'>-#define UHCSTAT_UPS1	(1 &lt;&lt; 11)	/* USB Power Sense Port 1 */</div><div class='del'>-#define UHCSTAT_HTA	(1 &lt;&lt; 10)	/* HCI Target Abort */</div><div class='del'>-#define UHCSTAT_HBA	(1 &lt;&lt; 8)	/* HCI Buffer Active */</div><div class='del'>-#define UHCSTAT_RWUE	(1 &lt;&lt; 7)	/* HCI Remote Wake Up Event */</div><div class='del'>-</div><div class='del'>-#define UHCHR           __REG(0x4C000064) /* UHC Reset Register */</div><div class='del'>-#define UHCHR_SSEP3	(1 &lt;&lt; 11)	/* Sleep Standby Enable for Port3 */</div><div class='del'>-#define UHCHR_SSEP2	(1 &lt;&lt; 10)	/* Sleep Standby Enable for Port2 */</div><div class='del'>-#define UHCHR_SSEP1	(1 &lt;&lt; 9)	/* Sleep Standby Enable for Port1 */</div><div class='del'>-#define UHCHR_PCPL	(1 &lt;&lt; 7)	/* Power control polarity low */</div><div class='del'>-#define UHCHR_PSPL	(1 &lt;&lt; 6)	/* Power sense polarity low */</div><div class='del'>-#define UHCHR_SSE	(1 &lt;&lt; 5)	/* Sleep Standby Enable */</div><div class='del'>-#define UHCHR_UIT	(1 &lt;&lt; 4)	/* USB Interrupt Test */</div><div class='del'>-#define UHCHR_SSDC	(1 &lt;&lt; 3)	/* Simulation Scale Down Clock */</div><div class='del'>-#define UHCHR_CGR	(1 &lt;&lt; 2)	/* Clock Generation Reset */</div><div class='del'>-#define UHCHR_FHR	(1 &lt;&lt; 1)	/* Force Host Controller Reset */</div><div class='del'>-#define UHCHR_FSBIR	(1 &lt;&lt; 0)	/* Force System Bus Iface Reset */</div><div class='del'>-</div><div class='del'>-#define UHCHIE          __REG(0x4C000068) /* UHC Interrupt Enable Register*/</div><div class='del'>-#define UHCHIE_UPS3IE	(1 &lt;&lt; 14)	/* Power Sense Port3 IntEn */</div><div class='del'>-#define UHCHIE_UPRIE	(1 &lt;&lt; 13)	/* Port Resume IntEn */</div><div class='del'>-#define UHCHIE_UPS2IE	(1 &lt;&lt; 12)	/* Power Sense Port2 IntEn */</div><div class='del'>-#define UHCHIE_UPS1IE	(1 &lt;&lt; 11)	/* Power Sense Port1 IntEn */</div><div class='del'>-#define UHCHIE_TAIE	(1 &lt;&lt; 10)	/* HCI Interface Transfer Abort</div><div class='del'>-					   Interrupt Enable*/</div><div class='del'>-#define UHCHIE_HBAIE	(1 &lt;&lt; 8)	/* HCI Buffer Active IntEn */</div><div class='del'>-#define UHCHIE_RWIE	(1 &lt;&lt; 7)	/* Remote Wake-up IntEn */</div><div class='del'>-</div><div class='del'>-#define UHCHIT          __REG(0x4C00006C) /* UHC Interrupt Test register */</div><div class='del'>-</div><div class='del'>-#endif /* CONFIG_PXA27x || CONFIG_PXA3xx */</div><div class='del'>-</div><div class='ctx'> /* PWRMODE register M field values */</div><div class='ctx'> </div><div class='ctx'> #define PWRMODE_IDLE		0x1</div><div class='head'>diff --git a/arch/arm/mach-pxa/include/mach/pxa3xx-regs.h b/arch/arm/mach-pxa/include/mach/pxa3xx-regs.h<br/>index 39eb68319e28..b1fcd10ab6c6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/include/mach/pxa3xx-regs.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pxa/include/mach/pxa3xx-regs.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/include/mach/pxa3xx-regs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/include/mach/pxa3xx-regs.h</a></div><div class='hunk'>@@ -131,6 +131,28 @@</div><div class='ctx'> #define CKENB		__REG(0x41340010)	/* B Clock Enable Register */</div><div class='ctx'> #define AC97_DIV	__REG(0x41340014)	/* AC97 clock divisor value register */</div><div class='ctx'> </div><div class='add'>+#define ACCR_XPDIS		(1 &lt;&lt; 31)	/* Core PLL Output Disable */</div><div class='add'>+#define ACCR_SPDIS		(1 &lt;&lt; 30)	/* System PLL Output Disable */</div><div class='add'>+#define ACCR_D0CS		(1 &lt;&lt; 26)	/* D0 Mode Clock Select */</div><div class='add'>+#define ACCR_PCCE		(1 &lt;&lt; 11)	/* Power Mode Change Clock Enable */</div><div class='add'>+#define ACCR_DDR_D0CS		(1 &lt;&lt; 7)	/* DDR SDRAM clock frequency in D0CS (PXA31x only) */</div><div class='add'>+</div><div class='add'>+#define ACCR_SMCFS_MASK		(0x7 &lt;&lt; 23)	/* Static Memory Controller Frequency Select */</div><div class='add'>+#define ACCR_SFLFS_MASK		(0x3 &lt;&lt; 18)	/* Frequency Select for Internal Memory Controller */</div><div class='add'>+#define ACCR_XSPCLK_MASK	(0x3 &lt;&lt; 16)	/* Core Frequency during Frequency Change */</div><div class='add'>+#define ACCR_HSS_MASK		(0x3 &lt;&lt; 14)	/* System Bus-Clock Frequency Select */</div><div class='add'>+#define ACCR_DMCFS_MASK		(0x3 &lt;&lt; 12)	/* Dynamic Memory Controller Clock Frequency Select */</div><div class='add'>+#define ACCR_XN_MASK		(0x7 &lt;&lt; 8)	/* Core PLL Turbo-Mode-to-Run-Mode Ratio */</div><div class='add'>+#define ACCR_XL_MASK		(0x1f)		/* Core PLL Run-Mode-to-Oscillator Ratio */</div><div class='add'>+</div><div class='add'>+#define ACCR_SMCFS(x)		(((x) &amp; 0x7) &lt;&lt; 23)</div><div class='add'>+#define ACCR_SFLFS(x)		(((x) &amp; 0x3) &lt;&lt; 18)</div><div class='add'>+#define ACCR_XSPCLK(x)		(((x) &amp; 0x3) &lt;&lt; 16)</div><div class='add'>+#define ACCR_HSS(x)		(((x) &amp; 0x3) &lt;&lt; 14)</div><div class='add'>+#define ACCR_DMCFS(x)		(((x) &amp; 0x3) &lt;&lt; 12)</div><div class='add'>+#define ACCR_XN(x)		(((x) &amp; 0x7) &lt;&lt; 8)</div><div class='add'>+#define ACCR_XL(x)		((x) &amp; 0x1f)</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Clock Enable Bit</div><div class='ctx'>  */</div><div class='head'>diff --git a/arch/arm/mach-pxa/include/mach/reset.h b/arch/arm/mach-pxa/include/mach/reset.h<br/>index 9489a48871a8..7b8842cfa5fc 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/include/mach/reset.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pxa/include/mach/reset.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/include/mach/reset.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/include/mach/reset.h</a></div><div class='hunk'>@@ -10,9 +10,12 @@</div><div class='ctx'> extern unsigned int reset_status;</div><div class='ctx'> extern void clear_reset_status(unsigned int mask);</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * register GPIO as reset generator</div><div class='add'>+/**</div><div class='add'>+ * init_gpio_reset() - register GPIO as reset generator</div><div class='add'>+ *</div><div class='add'>+ * @gpio - gpio nr</div><div class='add'>+ * @output - set gpio as out/low instead of input during normal work</div><div class='ctx'>  */</div><div class='del'>-extern int init_gpio_reset(int gpio);</div><div class='add'>+extern int init_gpio_reset(int gpio, int output);</div><div class='ctx'> </div><div class='ctx'> #endif /* __ASM_ARCH_RESET_H */</div><div class='head'>diff --git a/arch/arm/mach-pxa/include/mach/spitz.h b/arch/arm/mach-pxa/include/mach/spitz.h<br/>index bd14365f7ed5..31ac26b55bc1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/include/mach/spitz.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pxa/include/mach/spitz.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/include/mach/spitz.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/include/mach/spitz.h</a></div><div class='hunk'>@@ -16,6 +16,7 @@</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/fb.h&gt;</div><div class='add'>+#include &lt;linux/gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Spitz/Akita GPIOs */</div><div class='ctx'> </div><div class='hunk'>@@ -100,13 +101,24 @@</div><div class='ctx'> #define SPITZ_SCP_JK_A          SCOOP_GPCR_PA18  /* Low */</div><div class='ctx'> #define SPITZ_SCP_ADC_TEMP_ON   SCOOP_GPCR_PA19  /* Low */</div><div class='ctx'> </div><div class='del'>-#define SPITZ_SCP_IO_DIR      (SPITZ_SCP_LED_GREEN | SPITZ_SCP_JK_B | SPITZ_SCP_CHRG_ON | \</div><div class='del'>-                               SPITZ_SCP_MUTE_L | SPITZ_SCP_MUTE_R | SPITZ_SCP_LED_ORANGE | \</div><div class='add'>+#define SPITZ_SCP_IO_DIR      (SPITZ_SCP_JK_B | SPITZ_SCP_CHRG_ON | \</div><div class='add'>+                               SPITZ_SCP_MUTE_L | SPITZ_SCP_MUTE_R | \</div><div class='ctx'>                                SPITZ_SCP_CF_POWER | SPITZ_SCP_JK_A | SPITZ_SCP_ADC_TEMP_ON)</div><div class='ctx'> #define SPITZ_SCP_IO_OUT      (SPITZ_SCP_CHRG_ON | SPITZ_SCP_MUTE_L | SPITZ_SCP_MUTE_R)</div><div class='ctx'> #define SPITZ_SCP_SUS_CLR     (SPITZ_SCP_MUTE_L | SPITZ_SCP_MUTE_R | SPITZ_SCP_JK_A | SPITZ_SCP_ADC_TEMP_ON)</div><div class='ctx'> #define SPITZ_SCP_SUS_SET     0</div><div class='ctx'> </div><div class='add'>+#define SPITZ_SCP_GPIO_BASE	(NR_BUILTIN_GPIO)</div><div class='add'>+#define SPITZ_GPIO_LED_GREEN	(SPITZ_SCP_GPIO_BASE + 0)</div><div class='add'>+#define SPITZ_GPIO_JK_B		(SPITZ_SCP_GPIO_BASE + 1)</div><div class='add'>+#define SPITZ_GPIO_CHRG_ON	(SPITZ_SCP_GPIO_BASE + 2)</div><div class='add'>+#define SPITZ_GPIO_MUTE_L	(SPITZ_SCP_GPIO_BASE + 3)</div><div class='add'>+#define SPITZ_GPIO_MUTE_R	(SPITZ_SCP_GPIO_BASE + 4)</div><div class='add'>+#define SPITZ_GPIO_CF_POWER	(SPITZ_SCP_GPIO_BASE + 5)</div><div class='add'>+#define SPITZ_GPIO_LED_ORANGE	(SPITZ_SCP_GPIO_BASE + 6)</div><div class='add'>+#define SPITZ_GPIO_JK_A		(SPITZ_SCP_GPIO_BASE + 7)</div><div class='add'>+#define SPITZ_GPIO_ADC_TEMP_ON	(SPITZ_SCP_GPIO_BASE + 8)</div><div class='add'>+</div><div class='ctx'> /* Spitz Scoop Device (No. 2) GPIOs */</div><div class='ctx'> /* Suspend States in comments */</div><div class='ctx'> #define SPITZ_SCP2_IR_ON           SCOOP_GPCR_PA11  /* High */</div><div class='hunk'>@@ -119,15 +131,36 @@</div><div class='ctx'> #define SPITZ_SCP2_BACKLIGHT_ON    SCOOP_GPCR_PA18  /* Low */</div><div class='ctx'> #define SPITZ_SCP2_MIC_BIAS        SCOOP_GPCR_PA19  /* Low */</div><div class='ctx'> </div><div class='del'>-#define SPITZ_SCP2_IO_DIR (SPITZ_SCP2_IR_ON | SPITZ_SCP2_AKIN_PULLUP | SPITZ_SCP2_RESERVED_1 | \</div><div class='add'>+#define SPITZ_SCP2_IO_DIR (SPITZ_SCP2_AKIN_PULLUP | SPITZ_SCP2_RESERVED_1 | \</div><div class='ctx'>                            SPITZ_SCP2_RESERVED_2 | SPITZ_SCP2_RESERVED_3 | SPITZ_SCP2_RESERVED_4 | \</div><div class='ctx'>                            SPITZ_SCP2_BACKLIGHT_CONT | SPITZ_SCP2_BACKLIGHT_ON | SPITZ_SCP2_MIC_BIAS)</div><div class='ctx'> </div><div class='del'>-#define SPITZ_SCP2_IO_OUT   (SPITZ_SCP2_IR_ON | SPITZ_SCP2_AKIN_PULLUP | SPITZ_SCP2_RESERVED_1)</div><div class='add'>+#define SPITZ_SCP2_IO_OUT   (SPITZ_SCP2_AKIN_PULLUP | SPITZ_SCP2_RESERVED_1)</div><div class='ctx'> #define SPITZ_SCP2_SUS_CLR  (SPITZ_SCP2_RESERVED_2 | SPITZ_SCP2_RESERVED_3 | SPITZ_SCP2_RESERVED_4 | \</div><div class='ctx'>                              SPITZ_SCP2_BACKLIGHT_CONT | SPITZ_SCP2_BACKLIGHT_ON | SPITZ_SCP2_MIC_BIAS)</div><div class='ctx'> #define SPITZ_SCP2_SUS_SET  (SPITZ_SCP2_IR_ON | SPITZ_SCP2_RESERVED_1)</div><div class='ctx'> </div><div class='add'>+#define SPITZ_SCP2_GPIO_BASE		(NR_BUILTIN_GPIO + 12)</div><div class='add'>+#define SPITZ_GPIO_IR_ON		(SPITZ_SCP2_GPIO_BASE + 0)</div><div class='add'>+#define SPITZ_GPIO_AKIN_PULLUP		(SPITZ_SCP2_GPIO_BASE + 1</div><div class='add'>+#define SPITZ_GPIO_RESERVED_1		(SPITZ_SCP2_GPIO_BASE + 2)</div><div class='add'>+#define SPITZ_GPIO_RESERVED_2		(SPITZ_SCP2_GPIO_BASE + 3)</div><div class='add'>+#define SPITZ_GPIO_RESERVED_3		(SPITZ_SCP2_GPIO_BASE + 4)</div><div class='add'>+#define SPITZ_GPIO_RESERVED_4		(SPITZ_SCP2_GPIO_BASE + 5)</div><div class='add'>+#define SPITZ_GPIO_BACKLIGHT_CONT	(SPITZ_SCP2_GPIO_BASE + 6)</div><div class='add'>+#define SPITZ_GPIO_BACKLIGHT_ON		(SPITZ_SCP2_GPIO_BASE + 7)</div><div class='add'>+#define SPITZ_GPIO_MIC_BIAS		(SPITZ_SCP2_GPIO_BASE + 8)</div><div class='add'>+</div><div class='add'>+/* Akita IO Expander GPIOs */</div><div class='add'>+#define AKITA_IOEXP_GPIO_BASE		(NR_BUILTIN_GPIO + 12)</div><div class='add'>+#define AKITA_GPIO_RESERVED_0		(AKITA_IOEXP_GPIO_BASE + 0)</div><div class='add'>+#define AKITA_GPIO_RESERVED_1		(AKITA_IOEXP_GPIO_BASE + 1)</div><div class='add'>+#define AKITA_GPIO_MIC_BIAS		(AKITA_IOEXP_GPIO_BASE + 2)</div><div class='add'>+#define AKITA_GPIO_BACKLIGHT_ON		(AKITA_IOEXP_GPIO_BASE + 3)</div><div class='add'>+#define AKITA_GPIO_BACKLIGHT_CONT	(AKITA_IOEXP_GPIO_BASE + 4)</div><div class='add'>+#define AKITA_GPIO_AKIN_PULLUP		(AKITA_IOEXP_GPIO_BASE + 5)</div><div class='add'>+#define AKITA_GPIO_IR_ON		(AKITA_IOEXP_GPIO_BASE + 6)</div><div class='add'>+#define AKITA_GPIO_RESERVED_7		(AKITA_IOEXP_GPIO_BASE + 7)</div><div class='ctx'> </div><div class='ctx'> /* Spitz IRQ Definitions */</div><div class='ctx'> </div><div class='hunk'>@@ -154,5 +187,4 @@</div><div class='ctx'>  */</div><div class='ctx'> extern struct platform_device spitzscoop_device;</div><div class='ctx'> extern struct platform_device spitzscoop2_device;</div><div class='del'>-extern struct platform_device spitzssp_device;</div><div class='ctx'> extern struct sharpsl_charger_machinfo spitz_pm_machinfo;</div><div class='head'>diff --git a/arch/arm/mach-pxa/include/mach/ssp.h b/arch/arm/mach-pxa/include/mach/ssp.h<br/>index a012882c9ee6..cb5cb766f0f1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/include/mach/ssp.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pxa/include/mach/ssp.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/include/mach/ssp.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/include/mach/ssp.h</a></div><div class='hunk'>@@ -20,6 +20,7 @@</div><div class='ctx'> #define __ASM_ARCH_SSP_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> enum pxa_ssp_type {</div><div class='ctx'> 	SSP_UNDEFINED = 0,</div><div class='hunk'>@@ -78,6 +79,29 @@ int ssp_init(struct ssp_dev *dev, u32 port, u32 init_flags);</div><div class='ctx'> int ssp_config(struct ssp_dev *dev, u32 mode, u32 flags, u32 psp_flags, u32 speed);</div><div class='ctx'> void ssp_exit(struct ssp_dev *dev);</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * ssp_write_reg - Write to a SSP register</div><div class='add'>+ *</div><div class='add'>+ * @dev: SSP device to access</div><div class='add'>+ * @reg: Register to write to</div><div class='add'>+ * @val: Value to be written.</div><div class='add'>+ */</div><div class='add'>+static inline void ssp_write_reg(struct ssp_device *dev, u32 reg, u32 val)</div><div class='add'>+{</div><div class='add'>+	__raw_writel(val, dev-&gt;mmio_base + reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ssp_read_reg - Read from a SSP register</div><div class='add'>+ *</div><div class='add'>+ * @dev: SSP device to access</div><div class='add'>+ * @reg: Register to read from</div><div class='add'>+ */</div><div class='add'>+static inline u32 ssp_read_reg(struct ssp_device *dev, u32 reg)</div><div class='add'>+{</div><div class='add'>+	return __raw_readl(dev-&gt;mmio_base + reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> struct ssp_device *ssp_request(int port, const char *label);</div><div class='ctx'> void ssp_free(struct ssp_device *);</div><div class='ctx'> #endif /* __ASM_ARCH_SSP_H */</div><div class='head'>diff --git a/arch/arm/mach-pxa/include/mach/trizeps4.h b/arch/arm/mach-pxa/include/mach/trizeps4.h<br/>index 641d0ec110bb..903e1a2e6641 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/include/mach/trizeps4.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pxa/include/mach/trizeps4.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/include/mach/trizeps4.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/include/mach/trizeps4.h</a></div><div class='hunk'>@@ -17,11 +17,16 @@</div><div class='ctx'> #define TRIZEPS4_PIC_PHYS	(PXA_CS3_PHYS)	/* Logic chip on ConXS-Board */</div><div class='ctx'> #define TRIZEPS4_SDRAM_BASE	0xa0000000      /* SDRAM region */</div><div class='ctx'> </div><div class='del'>-#define TRIZEPS4_CFSR_PHYS	(PXA_CS3_PHYS)			/* Logic chip on ConXS-Board CSFR register */</div><div class='del'>-#define TRIZEPS4_BOCR_PHYS	(PXA_CS3_PHYS+0x02000000)	/* Logic chip on ConXS-Board BOCR register */</div><div class='del'>-#define TRIZEPS4_IRCR_PHYS	(PXA_CS3_PHYS+0x02400000)	/* Logic chip on ConXS-Board IRCR register*/</div><div class='del'>-#define TRIZEPS4_UPSR_PHYS	(PXA_CS3_PHYS+0x02800000)	/* Logic chip on ConXS-Board UPSR register*/</div><div class='del'>-#define TRIZEPS4_DICR_PHYS	(PXA_CS3_PHYS+0x03800000)	/* Logic chip on ConXS-Board DICR register*/</div><div class='add'>+				/* Logic on ConXS-board CSFR register*/</div><div class='add'>+#define TRIZEPS4_CFSR_PHYS	(PXA_CS3_PHYS)</div><div class='add'>+				/* Logic on ConXS-board BOCR register*/</div><div class='add'>+#define TRIZEPS4_BOCR_PHYS	(PXA_CS3_PHYS+0x02000000)</div><div class='add'>+				/* Logic on ConXS-board IRCR register*/</div><div class='add'>+#define TRIZEPS4_IRCR_PHYS	(PXA_CS3_PHYS+0x02400000)</div><div class='add'>+				/* Logic on ConXS-board UPSR register*/</div><div class='add'>+#define TRIZEPS4_UPSR_PHYS	(PXA_CS3_PHYS+0x02800000)</div><div class='add'>+				/* Logic on ConXS-board DICR register*/</div><div class='add'>+#define TRIZEPS4_DICR_PHYS	(PXA_CS3_PHYS+0x03800000)</div><div class='ctx'> </div><div class='ctx'> /* virtual memory regions */</div><div class='ctx'> #define TRIZEPS4_DISK_VIRT	0xF0000000	/* Disk On Chip region */</div><div class='hunk'>@@ -54,6 +59,15 @@</div><div class='ctx'> #define GPIO_MMC_DET		12</div><div class='ctx'> #define TRIZEPS4_MMC_IRQ	IRQ_GPIO(GPIO_MMC_DET)</div><div class='ctx'> </div><div class='add'>+/* DOC NAND chip */</div><div class='add'>+#define GPIO_DOC_LOCK           94</div><div class='add'>+#define GPIO_DOC_IRQ            93</div><div class='add'>+#define TRIZEPS4_DOC_IRQ        IRQ_GPIO(GPIO_DOC_IRQ)</div><div class='add'>+</div><div class='add'>+/* SPI interface */</div><div class='add'>+#define GPIO_SPI                53</div><div class='add'>+#define TRIZEPS4_SPI_IRQ        IRQ_GPIO(GPIO_SPI)</div><div class='add'>+</div><div class='ctx'> /* LEDS using tx2 / rx2 */</div><div class='ctx'> #define GPIO_SYS_BUSY_LED	46</div><div class='ctx'> #define GPIO_HEARTBEAT_LED	47</div><div class='hunk'>@@ -62,24 +76,66 @@</div><div class='ctx'> #define GPIO_PIC		0</div><div class='ctx'> #define TRIZEPS4_PIC_IRQ	IRQ_GPIO(GPIO_PIC)</div><div class='ctx'> </div><div class='del'>-#define CFSR_P2V(x)		((x) - TRIZEPS4_CFSR_PHYS + TRIZEPS4_CFSR_VIRT)</div><div class='del'>-#define CFSR_V2P(x)		((x) - TRIZEPS4_CFSR_VIRT + TRIZEPS4_CFSR_PHYS)</div><div class='add'>+#ifdef CONFIG_MACH_TRIZEPS_CONXS</div><div class='add'>+/* for CONXS base board define these registers */</div><div class='add'>+#define CFSR_P2V(x)	((x) - TRIZEPS4_CFSR_PHYS + TRIZEPS4_CFSR_VIRT)</div><div class='add'>+#define CFSR_V2P(x)	((x) - TRIZEPS4_CFSR_VIRT + TRIZEPS4_CFSR_PHYS)</div><div class='ctx'> </div><div class='del'>-#define BCR_P2V(x)		((x) - TRIZEPS4_BOCR_PHYS + TRIZEPS4_BOCR_VIRT)</div><div class='del'>-#define BCR_V2P(x)		((x) - TRIZEPS4_BOCR_VIRT + TRIZEPS4_BOCR_PHYS)</div><div class='add'>+#define BCR_P2V(x)	((x) - TRIZEPS4_BOCR_PHYS + TRIZEPS4_BOCR_VIRT)</div><div class='add'>+#define BCR_V2P(x)	((x) - TRIZEPS4_BOCR_VIRT + TRIZEPS4_BOCR_PHYS)</div><div class='ctx'> </div><div class='del'>-#define DCR_P2V(x)		((x) - TRIZEPS4_DICR_PHYS + TRIZEPS4_DICR_VIRT)</div><div class='del'>-#define DCR_V2P(x)		((x) - TRIZEPS4_DICR_VIRT + TRIZEPS4_DICR_PHYS)</div><div class='add'>+#define DCR_P2V(x)	((x) - TRIZEPS4_DICR_PHYS + TRIZEPS4_DICR_VIRT)</div><div class='add'>+#define DCR_V2P(x)	((x) - TRIZEPS4_DICR_VIRT + TRIZEPS4_DICR_PHYS)</div><div class='add'>+</div><div class='add'>+#define IRCR_P2V(x)	((x) - TRIZEPS4_IRCR_PHYS + TRIZEPS4_IRCR_VIRT)</div><div class='add'>+#define IRCR_V2P(x)	((x) - TRIZEPS4_IRCR_VIRT + TRIZEPS4_IRCR_PHYS)</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='del'>-#define ConXS_CFSR		(*((volatile unsigned short *)CFSR_P2V(0x0C000000)))</div><div class='del'>-#define ConXS_BCR		(*((volatile unsigned short *)BCR_P2V(0x0E000000)))</div><div class='del'>-#define ConXS_DCR		(*((volatile unsigned short *)DCR_P2V(0x0F800000)))</div><div class='add'>+static inline unsigned short CFSR_readw(void)</div><div class='add'>+{</div><div class='add'>+	/* [Compact Flash Status Register] is read only */</div><div class='add'>+	return *((unsigned short *)CFSR_P2V(0x0C000000));</div><div class='add'>+}</div><div class='add'>+static inline void BCR_writew(unsigned short value)</div><div class='add'>+{</div><div class='add'>+	/* [Board Control Regsiter] is write only */</div><div class='add'>+	*((unsigned short *)BCR_P2V(0x0E000000)) = value;</div><div class='add'>+}</div><div class='add'>+static inline void DCR_writew(unsigned short value)</div><div class='add'>+{</div><div class='add'>+	/* [Display Control Register] is write only */</div><div class='add'>+	*((unsigned short *)DCR_P2V(0x0E000000)) = value;</div><div class='add'>+}</div><div class='add'>+static inline void IRCR_writew(unsigned short value)</div><div class='add'>+{</div><div class='add'>+	/* [InfraRed data Control Register] is write only */</div><div class='add'>+	*((unsigned short *)IRCR_P2V(0x0E000000)) = value;</div><div class='add'>+}</div><div class='ctx'> #else</div><div class='ctx'> #define ConXS_CFSR		CFSR_P2V(0x0C000000)</div><div class='ctx'> #define ConXS_BCR		BCR_P2V(0x0E000000)</div><div class='ctx'> #define ConXS_DCR		DCR_P2V(0x0F800000)</div><div class='add'>+#define ConXS_IRCR		IRCR_P2V(0x0F800000)</div><div class='ctx'> #endif</div><div class='add'>+#else</div><div class='add'>+/* for whatever baseboard define function registers */</div><div class='add'>+static inline unsigned short CFSR_readw(void)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+static inline void BCR_writew(unsigned short value)</div><div class='add'>+{</div><div class='add'>+	;</div><div class='add'>+}</div><div class='add'>+static inline void DCR_writew(unsigned short value)</div><div class='add'>+{</div><div class='add'>+	;</div><div class='add'>+}</div><div class='add'>+static inline void IRCR_writew(unsigned short value)</div><div class='add'>+{</div><div class='add'>+	;</div><div class='add'>+}</div><div class='add'>+#endif	/* CONFIG_MACH_TRIZEPS_CONXS */</div><div class='ctx'> </div><div class='ctx'> #define ConXS_CFSR_BVD_MASK	0x0003</div><div class='ctx'> #define ConXS_CFSR_BVD1		(1 &lt;&lt; 0)</div><div class='head'>diff --git a/arch/arm/mach-pxa/include/mach/viper.h b/arch/arm/mach-pxa/include/mach/viper.h<br/>new file mode 100644<br/>index 000000000000..10988c270ca3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/include/mach/viper.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/include/mach/viper.h</a></div><div class='hunk'>@@ -0,0 +1,96 @@</div><div class='add'>+/*</div><div class='add'>+ * arch/arm/mach-pxa/include/mach/viper.h</div><div class='add'>+ *</div><div class='add'>+ * Author:	Ian Campbell</div><div class='add'>+ * Created:	Feb 03, 2003</div><div class='add'>+ * Copyright:	Arcom Control Systems.</div><div class='add'>+ *</div><div class='add'>+ * Maintained by Marc Zyngier &lt;maz@misterjones.org&gt;</div><div class='add'>+ *			      &lt;marc.zyngier@altran.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * Created based on lubbock.h:</div><div class='add'>+ *  Author:	Nicolas Pitre</div><div class='add'>+ *  Created:	Jun 15, 2001</div><div class='add'>+ *  Copyright:	MontaVista Software Inc.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef ARCH_VIPER_H</div><div class='add'>+#define ARCH_VIPER_H</div><div class='add'>+</div><div class='add'>+#define VIPER_BOOT_PHYS		PXA_CS0_PHYS</div><div class='add'>+#define VIPER_FLASH_PHYS	PXA_CS1_PHYS</div><div class='add'>+#define VIPER_ETH_PHYS		PXA_CS2_PHYS</div><div class='add'>+#define VIPER_USB_PHYS		PXA_CS3_PHYS</div><div class='add'>+#define VIPER_ETH_DATA_PHYS	PXA_CS4_PHYS</div><div class='add'>+#define VIPER_CPLD_PHYS		PXA_CS5_PHYS</div><div class='add'>+</div><div class='add'>+#define VIPER_CPLD_BASE		(0xf0000000)</div><div class='add'>+#define VIPER_PC104IO_BASE	(0xf1000000)</div><div class='add'>+#define VIPER_USB_BASE		(0xf1800000)</div><div class='add'>+</div><div class='add'>+#define VIPER_ETH_GPIO		(0)</div><div class='add'>+#define VIPER_CPLD_GPIO		(1)</div><div class='add'>+#define VIPER_USB_GPIO		(2)</div><div class='add'>+#define VIPER_UARTA_GPIO	(4)</div><div class='add'>+#define VIPER_UARTB_GPIO	(3)</div><div class='add'>+#define VIPER_CF_CD_GPIO	(32)</div><div class='add'>+#define VIPER_CF_RDY_GPIO	(8)</div><div class='add'>+#define VIPER_BCKLIGHT_EN_GPIO	(9)</div><div class='add'>+#define VIPER_LCD_EN_GPIO	(10)</div><div class='add'>+#define VIPER_PSU_DATA_GPIO	(6)</div><div class='add'>+#define VIPER_PSU_CLK_GPIO	(11)</div><div class='add'>+#define VIPER_UART_SHDN_GPIO	(12)</div><div class='add'>+#define VIPER_BRIGHTNESS_GPIO	(16)</div><div class='add'>+#define VIPER_PSU_nCS_LD_GPIO	(19)</div><div class='add'>+#define VIPER_UPS_GPIO		(20)</div><div class='add'>+#define VIPER_CF_POWER_GPIO	(82)</div><div class='add'>+#define VIPER_TPM_I2C_SDA_GPIO	(26)</div><div class='add'>+#define VIPER_TPM_I2C_SCL_GPIO	(27)</div><div class='add'>+#define VIPER_RTC_I2C_SDA_GPIO	(83)</div><div class='add'>+#define VIPER_RTC_I2C_SCL_GPIO	(84)</div><div class='add'>+</div><div class='add'>+#define VIPER_CPLD_P2V(x)	((x) - VIPER_CPLD_PHYS + VIPER_CPLD_BASE)</div><div class='add'>+#define VIPER_CPLD_V2P(x)	((x) - VIPER_CPLD_BASE + VIPER_CPLD_PHYS)</div><div class='add'>+</div><div class='add'>+#ifndef __ASSEMBLY__</div><div class='add'>+#  define __VIPER_CPLD_REG(x)	(*((volatile u16 *)VIPER_CPLD_P2V(x)))</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* board level registers in the CPLD: (offsets from CPLD_BASE) ... */</div><div class='add'>+</div><div class='add'>+/* ... Physical addresses */</div><div class='add'>+#define _VIPER_LO_IRQ_STATUS	(VIPER_CPLD_PHYS + 0x100000)</div><div class='add'>+#define _VIPER_ICR_PHYS		(VIPER_CPLD_PHYS + 0x100002)</div><div class='add'>+#define _VIPER_HI_IRQ_STATUS	(VIPER_CPLD_PHYS + 0x100004)</div><div class='add'>+#define _VIPER_VERSION_PHYS	(VIPER_CPLD_PHYS + 0x100006)</div><div class='add'>+#define VIPER_UARTA_PHYS	(VIPER_CPLD_PHYS + 0x300010)</div><div class='add'>+#define VIPER_UARTB_PHYS	(VIPER_CPLD_PHYS + 0x300000)</div><div class='add'>+#define _VIPER_SRAM_BASE	(VIPER_CPLD_PHYS + 0x800000)</div><div class='add'>+</div><div class='add'>+/* ... Virtual addresses */</div><div class='add'>+#define VIPER_LO_IRQ_STATUS	__VIPER_CPLD_REG(_VIPER_LO_IRQ_STATUS)</div><div class='add'>+#define VIPER_HI_IRQ_STATUS	__VIPER_CPLD_REG(_VIPER_HI_IRQ_STATUS)</div><div class='add'>+#define VIPER_VERSION		__VIPER_CPLD_REG(_VIPER_VERSION_PHYS)</div><div class='add'>+#define VIPER_ICR		__VIPER_CPLD_REG(_VIPER_ICR_PHYS)</div><div class='add'>+</div><div class='add'>+/* Decode VIPER_VERSION register */</div><div class='add'>+#define VIPER_CPLD_REVISION(x)	(((x) &gt;&gt; 5) &amp; 0x7)</div><div class='add'>+#define VIPER_BOARD_VERSION(x)	(((x) &gt;&gt; 3) &amp; 0x3)</div><div class='add'>+#define VIPER_BOARD_ISSUE(x)	(((x) &gt;&gt; 0) &amp; 0x7)</div><div class='add'>+</div><div class='add'>+/* Interrupt and Configuration Register (VIPER_ICR) */</div><div class='add'>+/* This is a write only register. Only CF_RST is used under Linux */</div><div class='add'>+</div><div class='add'>+extern void viper_cf_rst(int state);</div><div class='add'>+</div><div class='add'>+#define VIPER_ICR_RETRIG	(1 &lt;&lt; 0)</div><div class='add'>+#define VIPER_ICR_AUTO_CLR	(1 &lt;&lt; 1)</div><div class='add'>+#define VIPER_ICR_R_DIS		(1 &lt;&lt; 2)</div><div class='add'>+#define VIPER_ICR_CF_RST	(1 &lt;&lt; 3)</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='head'>diff --git a/arch/arm/mach-pxa/irq.c b/arch/arm/mach-pxa/irq.c<br/>index 5e95c5372fec..fa69c3a6a38e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/irq.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pxa/irq.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/irq.c</a></div><div class='hunk'>@@ -57,7 +57,7 @@ void __init pxa_init_irq(int irq_nr, set_wake_t fn)</div><div class='ctx'> </div><div class='ctx'> 	pxa_internal_irq_nr = irq_nr;</div><div class='ctx'> </div><div class='del'>-	for (irq = 0; irq &lt; irq_nr; irq += 32) {</div><div class='add'>+	for (irq = PXA_IRQ(0); irq &lt; PXA_IRQ(irq_nr); irq += 32) {</div><div class='ctx'> 		_ICMR(irq) = 0;	/* disable all IRQs */</div><div class='ctx'> 		_ICLR(irq) = 0;	/* all IRQs are IRQ, not FIQ */</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/arm/mach-pxa/leds-trizeps4.c b/arch/arm/mach-pxa/leds-trizeps4.c<br/>deleted file mode 100644<br/>index 3bc29007df3a..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/leds-trizeps4.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pxa/leds-trizeps4.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,134 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * linux/arch/arm/mach-pxa/leds-trizeps4.c</div><div class='del'>- *</div><div class='del'>- *  Author:	Jürgen Schindele</div><div class='del'>- *  Created:	20 02, 2006</div><div class='del'>- *  Copyright:	Jürgen Schindele</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/system.h&gt;</div><div class='del'>-#include &lt;asm/types.h&gt;</div><div class='del'>-#include &lt;asm/leds.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;mach/pxa-regs.h&gt;</div><div class='del'>-#include &lt;mach/pxa2xx-gpio.h&gt;</div><div class='del'>-#include &lt;mach/trizeps4.h&gt;</div><div class='del'>-</div><div class='del'>-#include "leds.h"</div><div class='del'>-</div><div class='del'>-#define LED_STATE_ENABLED	1</div><div class='del'>-#define LED_STATE_CLAIMED	2</div><div class='del'>-</div><div class='del'>-#define SYS_BUSY		0x01</div><div class='del'>-#define HEARTBEAT		0x02</div><div class='del'>-#define BLINK			0x04</div><div class='del'>-</div><div class='del'>-static unsigned int led_state;</div><div class='del'>-static unsigned int hw_led_state;</div><div class='del'>-</div><div class='del'>-void trizeps4_leds_event(led_event_t evt)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	local_irq_save(flags);</div><div class='del'>-</div><div class='del'>-	switch (evt) {</div><div class='del'>-	case led_start:</div><div class='del'>-		hw_led_state = 0;</div><div class='del'>-		pxa_gpio_mode( GPIO_SYS_BUSY_LED  | GPIO_OUT);		/* LED1 */</div><div class='del'>-		pxa_gpio_mode( GPIO_HEARTBEAT_LED | GPIO_OUT);		/* LED2 */</div><div class='del'>-		led_state = LED_STATE_ENABLED;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case led_stop:</div><div class='del'>-		led_state &amp;= ~LED_STATE_ENABLED;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case led_claim:</div><div class='del'>-		led_state |= LED_STATE_CLAIMED;</div><div class='del'>-		hw_led_state = 0;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case led_release:</div><div class='del'>-		led_state &amp;= ~LED_STATE_CLAIMED;</div><div class='del'>-		hw_led_state = 0;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_LEDS_TIMER</div><div class='del'>-	case led_timer:</div><div class='del'>-		hw_led_state ^= HEARTBEAT;</div><div class='del'>-		break;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_LEDS_CPU</div><div class='del'>-	case led_idle_start:</div><div class='del'>-		hw_led_state &amp;= ~SYS_BUSY;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case led_idle_end:</div><div class='del'>-		hw_led_state |= SYS_BUSY;</div><div class='del'>-		break;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	case led_halted:</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case led_green_on:</div><div class='del'>-		hw_led_state |= BLINK;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case led_green_off:</div><div class='del'>-		hw_led_state &amp;= ~BLINK;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case led_amber_on:</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case led_amber_off:</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case led_red_on:</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case led_red_off:</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if  (led_state &amp; LED_STATE_ENABLED) {</div><div class='del'>-		switch (hw_led_state) {</div><div class='del'>-			case 0:</div><div class='del'>-				GPSR(GPIO_SYS_BUSY_LED)  |= GPIO_bit(GPIO_SYS_BUSY_LED);</div><div class='del'>-				GPSR(GPIO_HEARTBEAT_LED) |= GPIO_bit(GPIO_HEARTBEAT_LED);</div><div class='del'>-				break;</div><div class='del'>-			case 1:</div><div class='del'>-				GPCR(GPIO_SYS_BUSY_LED)  |= GPIO_bit(GPIO_SYS_BUSY_LED);</div><div class='del'>-				GPSR(GPIO_HEARTBEAT_LED) |= GPIO_bit(GPIO_HEARTBEAT_LED);</div><div class='del'>-				break;</div><div class='del'>-			case 2:</div><div class='del'>-				GPSR(GPIO_SYS_BUSY_LED)  |= GPIO_bit(GPIO_SYS_BUSY_LED);</div><div class='del'>-				GPCR(GPIO_HEARTBEAT_LED) |= GPIO_bit(GPIO_HEARTBEAT_LED);</div><div class='del'>-				break;</div><div class='del'>-			case 3:</div><div class='del'>-				GPCR(GPIO_SYS_BUSY_LED)  |= GPIO_bit(GPIO_SYS_BUSY_LED);</div><div class='del'>-				GPCR(GPIO_HEARTBEAT_LED) |= GPIO_bit(GPIO_HEARTBEAT_LED);</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		/* turn all off */</div><div class='del'>-		GPSR(GPIO_SYS_BUSY_LED)  |= GPIO_bit(GPIO_SYS_BUSY_LED);</div><div class='del'>-		GPSR(GPIO_HEARTBEAT_LED) |= GPIO_bit(GPIO_HEARTBEAT_LED);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	local_irq_restore(flags);</div><div class='del'>-}</div><div class='head'>diff --git a/arch/arm/mach-pxa/leds.c b/arch/arm/mach-pxa/leds.c<br/>index e13eb841e48d..bbe4d5f6afaa 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/leds.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pxa/leds.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/leds.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/leds.c</a></div><div class='hunk'>@@ -24,8 +24,6 @@ pxa_leds_init(void)</div><div class='ctx'> 		leds_event = mainstone_leds_event;</div><div class='ctx'> 	if (machine_is_pxa_idp())</div><div class='ctx'> 		leds_event = idp_leds_event;</div><div class='del'>-	if (machine_is_trizeps4())</div><div class='del'>-		leds_event = trizeps4_leds_event;</div><div class='ctx'> </div><div class='ctx'> 	leds_event(led_start);</div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/arch/arm/mach-pxa/littleton.c b/arch/arm/mach-pxa/littleton.c<br/>index 58f3402a0375..b4d00aba0e31 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/littleton.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pxa/littleton.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/littleton.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/littleton.c</a></div><div class='hunk'>@@ -20,6 +20,7 @@</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/spi/spi.h&gt;</div><div class='ctx'> #include &lt;linux/smc91x.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/types.h&gt;</div><div class='hunk'>@@ -38,6 +39,7 @@</div><div class='ctx'> #include &lt;mach/gpio.h&gt;</div><div class='ctx'> #include &lt;mach/pxafb.h&gt;</div><div class='ctx'> #include &lt;mach/ssp.h&gt;</div><div class='add'>+#include &lt;mach/pxa2xx_spi.h&gt;</div><div class='ctx'> #include &lt;mach/pxa27x_keypad.h&gt;</div><div class='ctx'> #include &lt;mach/pxa3xx_nand.h&gt;</div><div class='ctx'> #include &lt;mach/littleton.h&gt;</div><div class='hunk'>@@ -72,8 +74,8 @@ static mfp_cfg_t littleton_mfp_cfg[] __initdata = {</div><div class='ctx'> </div><div class='ctx'> 	/* SSP2 */</div><div class='ctx'> 	GPIO25_SSP2_SCLK,</div><div class='del'>-	GPIO17_SSP2_FRM,</div><div class='ctx'> 	GPIO27_SSP2_TXD,</div><div class='add'>+	GPIO17_GPIO,	/* SFRM as chip-select */</div><div class='ctx'> </div><div class='ctx'> 	/* Debug Ethernet */</div><div class='ctx'> 	GPIO90_GPIO,</div><div class='hunk'>@@ -123,160 +125,6 @@ static struct platform_device smc91x_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_FB_PXA) || defined(CONFIG_FB_PXA_MODULE)</div><div class='del'>-/* use bit 30, 31 as the indicator of command parameter number */</div><div class='del'>-#define CMD0(x)		((0x00000000) | ((x) &lt;&lt; 9))</div><div class='del'>-#define CMD1(x, x1)	((0x40000000) | ((x) &lt;&lt; 9) | 0x100 | (x1))</div><div class='del'>-#define CMD2(x, x1, x2)	((0x80000000) | ((x) &lt;&lt; 18) | 0x20000 |\</div><div class='del'>-			 ((x1) &lt;&lt; 9) | 0x100 | (x2))</div><div class='del'>-</div><div class='del'>-static uint32_t lcd_panel_reset[] = {</div><div class='del'>-	CMD0(0x1), /* reset */</div><div class='del'>-	CMD0(0x0), /* nop */</div><div class='del'>-	CMD0(0x0), /* nop */</div><div class='del'>-	CMD0(0x0), /* nop */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static uint32_t lcd_panel_on[] = {</div><div class='del'>-	CMD0(0x29),		/* Display ON */</div><div class='del'>-	CMD2(0xB8, 0xFF, 0xF9),	/* Output Control */</div><div class='del'>-	CMD0(0x11),		/* Sleep out */</div><div class='del'>-	CMD1(0xB0, 0x16),	/* Wake */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static uint32_t lcd_panel_off[] = {</div><div class='del'>-	CMD0(0x28),		/* Display OFF */</div><div class='del'>-	CMD2(0xB8, 0x80, 0x02),	/* Output Control */</div><div class='del'>-	CMD0(0x10),		/* Sleep in */</div><div class='del'>-	CMD1(0xB0, 0x00),	/* Deep stand by in */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static uint32_t lcd_vga_pass_through[] = {</div><div class='del'>-	CMD1(0xB0, 0x16),</div><div class='del'>-	CMD1(0xBC, 0x80),</div><div class='del'>-	CMD1(0xE1, 0x00),</div><div class='del'>-	CMD1(0x36, 0x50),</div><div class='del'>-	CMD1(0x3B, 0x00),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static uint32_t lcd_qvga_pass_through[] = {</div><div class='del'>-	CMD1(0xB0, 0x16),</div><div class='del'>-	CMD1(0xBC, 0x81),</div><div class='del'>-	CMD1(0xE1, 0x00),</div><div class='del'>-	CMD1(0x36, 0x50),</div><div class='del'>-	CMD1(0x3B, 0x22),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static uint32_t lcd_vga_transfer[] = {</div><div class='del'>-	CMD1(0xcf, 0x02), 	/* Blanking period control (1) */</div><div class='del'>-	CMD2(0xd0, 0x08, 0x04),	/* Blanking period control (2) */</div><div class='del'>-	CMD1(0xd1, 0x01),	/* CKV timing control on/off */</div><div class='del'>-	CMD2(0xd2, 0x14, 0x00),	/* CKV 1,2 timing control */</div><div class='del'>-	CMD2(0xd3, 0x1a, 0x0f),	/* OEV timing control */</div><div class='del'>-	CMD2(0xd4, 0x1f, 0xaf),	/* ASW timing control (1) */</div><div class='del'>-	CMD1(0xd5, 0x14),	/* ASW timing control (2) */</div><div class='del'>-	CMD0(0x21),		/* Invert for normally black display */</div><div class='del'>-	CMD0(0x29),		/* Display on */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static uint32_t lcd_qvga_transfer[] = {</div><div class='del'>-	CMD1(0xd6, 0x02),	/* Blanking period control (1) */</div><div class='del'>-	CMD2(0xd7, 0x08, 0x04),	/* Blanking period control (2) */</div><div class='del'>-	CMD1(0xd8, 0x01),	/* CKV timing control on/off */</div><div class='del'>-	CMD2(0xd9, 0x00, 0x08),	/* CKV 1,2 timing control */</div><div class='del'>-	CMD2(0xde, 0x05, 0x0a),	/* OEV timing control */</div><div class='del'>-	CMD2(0xdf, 0x0a, 0x19),	/* ASW timing control (1) */</div><div class='del'>-	CMD1(0xe0, 0x0a),	/* ASW timing control (2) */</div><div class='del'>-	CMD0(0x21),		/* Invert for normally black display */</div><div class='del'>-	CMD0(0x29),		/* Display on */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static uint32_t lcd_panel_config[] = {</div><div class='del'>-	CMD2(0xb8, 0xff, 0xf9),	/* Output control */</div><div class='del'>-	CMD0(0x11),		/* sleep out */</div><div class='del'>-	CMD1(0xba, 0x01),	/* Display mode (1) */</div><div class='del'>-	CMD1(0xbb, 0x00),	/* Display mode (2) */</div><div class='del'>-	CMD1(0x3a, 0x60),	/* Display mode 18-bit RGB */</div><div class='del'>-	CMD1(0xbf, 0x10),	/* Drive system change control */</div><div class='del'>-	CMD1(0xb1, 0x56),	/* Booster operation setup */</div><div class='del'>-	CMD1(0xb2, 0x33),	/* Booster mode setup */</div><div class='del'>-	CMD1(0xb3, 0x11),	/* Booster frequency setup */</div><div class='del'>-	CMD1(0xb4, 0x02),	/* Op amp/system clock */</div><div class='del'>-	CMD1(0xb5, 0x35),	/* VCS voltage */</div><div class='del'>-	CMD1(0xb6, 0x40),	/* VCOM voltage */</div><div class='del'>-	CMD1(0xb7, 0x03),	/* External display signal */</div><div class='del'>-	CMD1(0xbd, 0x00),	/* ASW slew rate */</div><div class='del'>-	CMD1(0xbe, 0x00),	/* Dummy data for QuadData operation */</div><div class='del'>-	CMD1(0xc0, 0x11),	/* Sleep out FR count (A) */</div><div class='del'>-	CMD1(0xc1, 0x11),	/* Sleep out FR count (B) */</div><div class='del'>-	CMD1(0xc2, 0x11),	/* Sleep out FR count (C) */</div><div class='del'>-	CMD2(0xc3, 0x20, 0x40),	/* Sleep out FR count (D) */</div><div class='del'>-	CMD2(0xc4, 0x60, 0xc0),	/* Sleep out FR count (E) */</div><div class='del'>-	CMD2(0xc5, 0x10, 0x20),	/* Sleep out FR count (F) */</div><div class='del'>-	CMD1(0xc6, 0xc0),	/* Sleep out FR count (G) */</div><div class='del'>-	CMD2(0xc7, 0x33, 0x43),	/* Gamma 1 fine tuning (1) */</div><div class='del'>-	CMD1(0xc8, 0x44),	/* Gamma 1 fine tuning (2) */</div><div class='del'>-	CMD1(0xc9, 0x33),	/* Gamma 1 inclination adjustment */</div><div class='del'>-	CMD1(0xca, 0x00),	/* Gamma 1 blue offset adjustment */</div><div class='del'>-	CMD2(0xec, 0x01, 0xf0),	/* Horizontal clock cycles */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void ssp_reconfig(struct ssp_dev *dev, int nparam)</div><div class='del'>-{</div><div class='del'>-	static int last_nparam = -1;</div><div class='del'>-</div><div class='del'>-	/* check if it is necessary to re-config SSP */</div><div class='del'>-	if (nparam == last_nparam)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	ssp_disable(dev);</div><div class='del'>-	ssp_config(dev, (nparam == 2) ? 0x0010058a : 0x00100581, 0x18, 0, 0);</div><div class='del'>-</div><div class='del'>-	last_nparam = nparam;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ssp_send_cmd(uint32_t *cmd, int num)</div><div class='del'>-{</div><div class='del'>-	static int ssp_initialized;</div><div class='del'>-	static struct ssp_dev ssp2;</div><div class='del'>-</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (!ssp_initialized) {</div><div class='del'>-		ssp_init(&amp;ssp2, 2, SSP_NO_IRQ);</div><div class='del'>-		ssp_initialized = 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	clk_enable(ssp2.ssp-&gt;clk);</div><div class='del'>-	for (i = 0; i &lt; num; i++, cmd++) {</div><div class='del'>-		ssp_reconfig(&amp;ssp2, (*cmd &gt;&gt; 30) &amp; 0x3);</div><div class='del'>-		ssp_write_word(&amp;ssp2, *cmd &amp; 0x3fffffff);</div><div class='del'>-</div><div class='del'>-		/* FIXME: ssp_flush() is mandatory here to work */</div><div class='del'>-		ssp_flush(&amp;ssp2);</div><div class='del'>-	}</div><div class='del'>-	clk_disable(ssp2.ssp-&gt;clk);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void littleton_lcd_power(int on, struct fb_var_screeninfo *var)</div><div class='del'>-{</div><div class='del'>-	if (on) {</div><div class='del'>-		ssp_send_cmd(ARRAY_AND_SIZE(lcd_panel_on));</div><div class='del'>-		ssp_send_cmd(ARRAY_AND_SIZE(lcd_panel_reset));</div><div class='del'>-		if (var-&gt;xres &gt; 240) {</div><div class='del'>-			/* VGA */</div><div class='del'>-			ssp_send_cmd(ARRAY_AND_SIZE(lcd_vga_pass_through));</div><div class='del'>-			ssp_send_cmd(ARRAY_AND_SIZE(lcd_panel_config));</div><div class='del'>-			ssp_send_cmd(ARRAY_AND_SIZE(lcd_vga_transfer));</div><div class='del'>-		} else {</div><div class='del'>-			/* QVGA */</div><div class='del'>-			ssp_send_cmd(ARRAY_AND_SIZE(lcd_qvga_pass_through));</div><div class='del'>-			ssp_send_cmd(ARRAY_AND_SIZE(lcd_panel_config));</div><div class='del'>-			ssp_send_cmd(ARRAY_AND_SIZE(lcd_qvga_transfer));</div><div class='del'>-		}</div><div class='del'>-	} else</div><div class='del'>-		ssp_send_cmd(ARRAY_AND_SIZE(lcd_panel_off));</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static struct pxafb_mode_info tpo_tdo24mtea1_modes[] = {</div><div class='ctx'> 	[0] = {</div><div class='ctx'> 		/* VGA */</div><div class='hunk'>@@ -312,7 +160,6 @@ static struct pxafb_mach_info littleton_lcd_info = {</div><div class='ctx'> 	.modes			= tpo_tdo24mtea1_modes,</div><div class='ctx'> 	.num_modes		= 2,</div><div class='ctx'> 	.lcd_conn		= LCD_COLOR_TFT_16BPP,</div><div class='del'>-	.pxafb_lcd_power	= littleton_lcd_power,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void littleton_init_lcd(void)</div><div class='hunk'>@@ -323,6 +170,51 @@ static void littleton_init_lcd(void)</div><div class='ctx'> static inline void littleton_init_lcd(void) {};</div><div class='ctx'> #endif /* CONFIG_FB_PXA || CONFIG_FB_PXA_MODULE */</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_SPI_PXA2XX) || defined(CONFIG_SPI_PXA2XX_MODULE)</div><div class='add'>+static struct pxa2xx_spi_master littleton_spi_info = {</div><div class='add'>+	.num_chipselect		= 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void littleton_tdo24m_cs(u32 cmd)</div><div class='add'>+{</div><div class='add'>+	gpio_set_value(LITTLETON_GPIO_LCD_CS, !(cmd == PXA2XX_CS_ASSERT));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct pxa2xx_spi_chip littleton_tdo24m_chip = {</div><div class='add'>+	.rx_threshold	= 1,</div><div class='add'>+	.tx_threshold	= 1,</div><div class='add'>+	.cs_control	= littleton_tdo24m_cs,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct spi_board_info littleton_spi_devices[] __initdata = {</div><div class='add'>+	{</div><div class='add'>+		.modalias	= "tdo24m",</div><div class='add'>+		.max_speed_hz	= 1000000,</div><div class='add'>+		.bus_num	= 2,</div><div class='add'>+		.chip_select	= 0,</div><div class='add'>+		.controller_data= &amp;littleton_tdo24m_chip,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init littleton_init_spi(void)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = gpio_request(LITTLETON_GPIO_LCD_CS, "LCD_CS");</div><div class='add'>+	if (err) {</div><div class='add'>+		pr_warning("failed to request GPIO for LCS CS\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	gpio_direction_output(LITTLETON_GPIO_LCD_CS, 1);</div><div class='add'>+</div><div class='add'>+	pxa2xx_set_spi_info(2, &amp;littleton_spi_info);</div><div class='add'>+	spi_register_board_info(ARRAY_AND_SIZE(littleton_spi_devices));</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline void littleton_init_spi(void) {}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #if defined(CONFIG_KEYBOARD_PXA27x) || defined(CONFIG_KEYBOARD_PXA27x_MODULE)</div><div class='ctx'> static unsigned int littleton_matrix_key_map[] = {</div><div class='ctx'> 	/* KEY(row, col, key_code) */</div><div class='hunk'>@@ -433,6 +325,7 @@ static void __init littleton_init(void)</div><div class='ctx'> 	 */</div><div class='ctx'> 	platform_device_register(&amp;smc91x_device);</div><div class='ctx'> </div><div class='add'>+	littleton_init_spi();</div><div class='ctx'> 	littleton_init_lcd();</div><div class='ctx'> 	littleton_init_keypad();</div><div class='ctx'> 	littleton_init_nand();</div><div class='head'>diff --git a/arch/arm/mach-pxa/lpd270.c b/arch/arm/mach-pxa/lpd270.c<br/>index b7038948d1d4..de3f67daaacf 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/lpd270.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pxa/lpd270.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/lpd270.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/lpd270.c</a></div><div class='hunk'>@@ -40,7 +40,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/pxa-regs.h&gt;</div><div class='ctx'> #include &lt;mach/pxa2xx-regs.h&gt;</div><div class='del'>-#include &lt;mach/pxa2xx-gpio.h&gt;</div><div class='add'>+#include &lt;mach/mfp-pxa27x.h&gt;</div><div class='ctx'> #include &lt;mach/lpd270.h&gt;</div><div class='ctx'> #include &lt;mach/audio.h&gt;</div><div class='ctx'> #include &lt;mach/pxafb.h&gt;</div><div class='hunk'>@@ -51,6 +51,43 @@</div><div class='ctx'> #include "generic.h"</div><div class='ctx'> #include "devices.h"</div><div class='ctx'> </div><div class='add'>+static unsigned long lpd270_pin_config[] __initdata = {</div><div class='add'>+	/* Chip Selects */</div><div class='add'>+	GPIO15_nCS_1,	/* Mainboard Flash */</div><div class='add'>+	GPIO78_nCS_2,	/* CPLD + Ethernet */</div><div class='add'>+</div><div class='add'>+	/* LCD - 16bpp Active TFT */</div><div class='add'>+	GPIO58_LCD_LDD_0,</div><div class='add'>+	GPIO59_LCD_LDD_1,</div><div class='add'>+	GPIO60_LCD_LDD_2,</div><div class='add'>+	GPIO61_LCD_LDD_3,</div><div class='add'>+	GPIO62_LCD_LDD_4,</div><div class='add'>+	GPIO63_LCD_LDD_5,</div><div class='add'>+	GPIO64_LCD_LDD_6,</div><div class='add'>+	GPIO65_LCD_LDD_7,</div><div class='add'>+	GPIO66_LCD_LDD_8,</div><div class='add'>+	GPIO67_LCD_LDD_9,</div><div class='add'>+	GPIO68_LCD_LDD_10,</div><div class='add'>+	GPIO69_LCD_LDD_11,</div><div class='add'>+	GPIO70_LCD_LDD_12,</div><div class='add'>+	GPIO71_LCD_LDD_13,</div><div class='add'>+	GPIO72_LCD_LDD_14,</div><div class='add'>+	GPIO73_LCD_LDD_15,</div><div class='add'>+	GPIO74_LCD_FCLK,</div><div class='add'>+	GPIO75_LCD_LCLK,</div><div class='add'>+	GPIO76_LCD_PCLK,</div><div class='add'>+	GPIO77_LCD_BIAS,</div><div class='add'>+	GPIO16_PWM0_OUT,	/* Backlight */</div><div class='add'>+</div><div class='add'>+	/* USB Host */</div><div class='add'>+	GPIO88_USBH1_PWR,</div><div class='add'>+	GPIO89_USBH1_PEN,</div><div class='add'>+</div><div class='add'>+	/* AC97 */</div><div class='add'>+	GPIO45_AC97_SYSCLK,</div><div class='add'>+</div><div class='add'>+	GPIO1_GPIO | WAKEUP_ON_EDGE_BOTH,</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> static unsigned int lpd270_irq_enabled;</div><div class='ctx'> </div><div class='hunk'>@@ -88,8 +125,7 @@ static void lpd270_irq_handler(unsigned int irq, struct irq_desc *desc)</div><div class='ctx'> 		GEDR(0) = GPIO_bit(0);  /* clear useless edge notification */</div><div class='ctx'> 		if (likely(pending)) {</div><div class='ctx'> 			irq = LPD270_IRQ(0) + __ffs(pending);</div><div class='del'>-			desc = irq_desc + irq;</div><div class='del'>-			desc_handle_irq(irq, desc);</div><div class='add'>+			generic_handle_irq(irq);</div><div class='ctx'> </div><div class='ctx'> 			pending = __raw_readw(LPD270_INT_STATUS) &amp;</div><div class='ctx'> 						lpd270_irq_enabled;</div><div class='hunk'>@@ -265,8 +301,8 @@ static struct pxafb_mode_info sharp_lq057q3dc02_mode = {</div><div class='ctx'> static struct pxafb_mach_info sharp_lq057q3dc02 = {</div><div class='ctx'> 	.modes			= &amp;sharp_lq057q3dc02_mode,</div><div class='ctx'> 	.num_modes		= 1,</div><div class='del'>-	.lccr0			= 0x07800080,</div><div class='del'>-	.lccr3			= 0x00400000,</div><div class='add'>+	.lcd_conn		= LCD_COLOR_TFT_16BPP | LCD_PCLK_EDGE_FALL |</div><div class='add'>+				  LCD_ALTERNATE_MAPPING,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* 12.1" TFT SVGA (LoLo display number 2) */</div><div class='hunk'>@@ -287,8 +323,8 @@ static struct pxafb_mode_info sharp_lq121s1dg31_mode = {</div><div class='ctx'> static struct pxafb_mach_info sharp_lq121s1dg31 = {</div><div class='ctx'> 	.modes			= &amp;sharp_lq121s1dg31_mode,</div><div class='ctx'> 	.num_modes		= 1,</div><div class='del'>-	.lccr0			= 0x07800080,</div><div class='del'>-	.lccr3			= 0x00400000,</div><div class='add'>+	.lcd_conn		= LCD_COLOR_TFT_16BPP | LCD_PCLK_EDGE_FALL |</div><div class='add'>+				  LCD_ALTERNATE_MAPPING,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* 3.6" TFT QVGA (LoLo display number 3) */</div><div class='hunk'>@@ -309,8 +345,8 @@ static struct pxafb_mode_info sharp_lq036q1da01_mode = {</div><div class='ctx'> static struct pxafb_mach_info sharp_lq036q1da01 = {</div><div class='ctx'> 	.modes			= &amp;sharp_lq036q1da01_mode,</div><div class='ctx'> 	.num_modes		= 1,</div><div class='del'>-	.lccr0			= 0x07800080,</div><div class='del'>-	.lccr3			= 0x00400000,</div><div class='add'>+	.lcd_conn		= LCD_COLOR_TFT_16BPP | LCD_PCLK_EDGE_FALL |</div><div class='add'>+				  LCD_ALTERNATE_MAPPING,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* 6.4" TFT VGA (LoLo display number 5) */</div><div class='hunk'>@@ -331,8 +367,8 @@ static struct pxafb_mode_info sharp_lq64d343_mode = {</div><div class='ctx'> static struct pxafb_mach_info sharp_lq64d343 = {</div><div class='ctx'> 	.modes			= &amp;sharp_lq64d343_mode,</div><div class='ctx'> 	.num_modes		= 1,</div><div class='del'>-	.lccr0			= 0x07800080,</div><div class='del'>-	.lccr3			= 0x00400000,</div><div class='add'>+	.lcd_conn		= LCD_COLOR_TFT_16BPP | LCD_PCLK_EDGE_FALL |</div><div class='add'>+				  LCD_ALTERNATE_MAPPING,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* 10.4" TFT VGA (LoLo display number 7) */</div><div class='hunk'>@@ -353,8 +389,8 @@ static struct pxafb_mode_info sharp_lq10d368_mode = {</div><div class='ctx'> static struct pxafb_mach_info sharp_lq10d368 = {</div><div class='ctx'> 	.modes			= &amp;sharp_lq10d368_mode,</div><div class='ctx'> 	.num_modes		= 1,</div><div class='del'>-	.lccr0			= 0x07800080,</div><div class='del'>-	.lccr3			= 0x00400000,</div><div class='add'>+	.lcd_conn		= LCD_COLOR_TFT_16BPP | LCD_PCLK_EDGE_FALL |</div><div class='add'>+				  LCD_ALTERNATE_MAPPING,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* 3.5" TFT QVGA (LoLo display number 8) */</div><div class='hunk'>@@ -375,8 +411,8 @@ static struct pxafb_mode_info sharp_lq035q7db02_20_mode = {</div><div class='ctx'> static struct pxafb_mach_info sharp_lq035q7db02_20 = {</div><div class='ctx'> 	.modes			= &amp;sharp_lq035q7db02_20_mode,</div><div class='ctx'> 	.num_modes		= 1,</div><div class='del'>-	.lccr0			= 0x07800080,</div><div class='del'>-	.lccr3			= 0x00400000,</div><div class='add'>+	.lcd_conn		= LCD_COLOR_TFT_16BPP | LCD_PCLK_EDGE_FALL |</div><div class='add'>+				  LCD_ALTERNATE_MAPPING,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct pxafb_mach_info *lpd270_lcd_to_use;</div><div class='hunk'>@@ -411,27 +447,15 @@ static struct platform_device *platform_devices[] __initdata = {</div><div class='ctx'> 	&amp;lpd270_flash_device[1],</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int lpd270_ohci_init(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	/* setup Port1 GPIO pin. */</div><div class='del'>-	pxa_gpio_mode(88 | GPIO_ALT_FN_1_IN);	/* USBHPWR1 */</div><div class='del'>-	pxa_gpio_mode(89 | GPIO_ALT_FN_2_OUT);	/* USBHPEN1 */</div><div class='del'>-</div><div class='del'>-	/* Set the Power Control Polarity Low and Power Sense</div><div class='del'>-	   Polarity Low to active low. */</div><div class='del'>-	UHCHR = (UHCHR | UHCHR_PCPL | UHCHR_PSPL) &amp;</div><div class='del'>-		~(UHCHR_SSEP1 | UHCHR_SSEP2 | UHCHR_SSEP3 | UHCHR_SSE);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static struct pxaohci_platform_data lpd270_ohci_platform_data = {</div><div class='ctx'> 	.port_mode	= PMM_PERPORT_MODE,</div><div class='del'>-	.init		= lpd270_ohci_init,</div><div class='add'>+	.flags		= ENABLE_PORT_ALL | POWER_CONTROL_LOW | POWER_SENSE_LOW,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void __init lpd270_init(void)</div><div class='ctx'> {</div><div class='add'>+	pxa2xx_mfp_config(ARRAY_AND_SIZE(lpd270_pin_config));</div><div class='add'>+</div><div class='ctx'> 	lpd270_flash_data[0].width = (BOOT_DEF &amp; 1) ? 2 : 4;</div><div class='ctx'> 	lpd270_flash_data[1].width = 4;</div><div class='ctx'> </div><div class='hunk'>@@ -442,12 +466,6 @@ static void __init lpd270_init(void)</div><div class='ctx'> 	 */</div><div class='ctx'> 	ARB_CNTRL = ARB_CORE_PARK | 0x234;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * On LogicPD PXA270, we route AC97_SYSCLK via GPIO45.</div><div class='del'>-	 */</div><div class='del'>-	pxa_gpio_mode(GPIO45_SYSCLK_AC97_MD);</div><div class='del'>-	pxa_gpio_mode(GPIO16_PWM0_MD);</div><div class='del'>-</div><div class='ctx'> 	platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices));</div><div class='ctx'> </div><div class='ctx'> 	pxa_set_ac97_info(NULL);</div><div class='hunk'>@@ -473,15 +491,6 @@ static void __init lpd270_map_io(void)</div><div class='ctx'> 	pxa_map_io();</div><div class='ctx'> 	iotable_init(lpd270_io_desc, ARRAY_SIZE(lpd270_io_desc));</div><div class='ctx'> </div><div class='del'>-	/* initialize sleep mode regs (wake-up sources, etc) */</div><div class='del'>-	PGSR0 = 0x00008800;</div><div class='del'>-	PGSR1 = 0x00000002;</div><div class='del'>-	PGSR2 = 0x0001FC00;</div><div class='del'>-	PGSR3 = 0x00001F81;</div><div class='del'>-	PWER  = 0xC0000002;</div><div class='del'>-	PRER  = 0x00000002;</div><div class='del'>-	PFER  = 0x00000002;</div><div class='del'>-</div><div class='ctx'> 	/* for use I SRAM as framebuffer.  */</div><div class='ctx'> 	PSLR |= 0x00000F04;</div><div class='ctx'> 	PCFR  = 0x00000066;</div><div class='head'>diff --git a/arch/arm/mach-pxa/lubbock.c b/arch/arm/mach-pxa/lubbock.c<br/>index 4ffdff2d9ff1..bff704354c1a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/lubbock.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pxa/lubbock.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/lubbock.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/lubbock.c</a></div><div class='hunk'>@@ -57,13 +57,36 @@</div><div class='ctx'> </div><div class='ctx'> static unsigned long lubbock_pin_config[] __initdata = {</div><div class='ctx'> 	GPIO15_nCS_1,	/* CS1 - Flash */</div><div class='add'>+	GPIO78_nCS_2,	/* CS2 - Baseboard FGPA */</div><div class='ctx'> 	GPIO79_nCS_3,	/* CS3 - SMC ethernet */</div><div class='add'>+	GPIO80_nCS_4,	/* CS4 - SA1111 */</div><div class='ctx'> </div><div class='ctx'> 	/* SSP data pins */</div><div class='ctx'> 	GPIO23_SSP1_SCLK,</div><div class='ctx'> 	GPIO25_SSP1_TXD,</div><div class='ctx'> 	GPIO26_SSP1_RXD,</div><div class='ctx'> </div><div class='add'>+	/* LCD - 16bpp DSTN */</div><div class='add'>+	GPIO58_LCD_LDD_0,</div><div class='add'>+	GPIO59_LCD_LDD_1,</div><div class='add'>+	GPIO60_LCD_LDD_2,</div><div class='add'>+	GPIO61_LCD_LDD_3,</div><div class='add'>+	GPIO62_LCD_LDD_4,</div><div class='add'>+	GPIO63_LCD_LDD_5,</div><div class='add'>+	GPIO64_LCD_LDD_6,</div><div class='add'>+	GPIO65_LCD_LDD_7,</div><div class='add'>+	GPIO66_LCD_LDD_8,</div><div class='add'>+	GPIO67_LCD_LDD_9,</div><div class='add'>+	GPIO68_LCD_LDD_10,</div><div class='add'>+	GPIO69_LCD_LDD_11,</div><div class='add'>+	GPIO70_LCD_LDD_12,</div><div class='add'>+	GPIO71_LCD_LDD_13,</div><div class='add'>+	GPIO72_LCD_LDD_14,</div><div class='add'>+	GPIO73_LCD_LDD_15,</div><div class='add'>+	GPIO74_LCD_FCLK,</div><div class='add'>+	GPIO75_LCD_LCLK,</div><div class='add'>+	GPIO76_LCD_PCLK,</div><div class='add'>+</div><div class='ctx'> 	/* BTUART */</div><div class='ctx'> 	GPIO42_BTUART_RXD,</div><div class='ctx'> 	GPIO43_BTUART_TXD,</div><div class='hunk'>@@ -132,8 +155,7 @@ static void lubbock_irq_handler(unsigned int irq, struct irq_desc *desc)</div><div class='ctx'> 		GEDR(0) = GPIO_bit(0);	/* clear our parent irq */</div><div class='ctx'> 		if (likely(pending)) {</div><div class='ctx'> 			irq = LUBBOCK_IRQ(0) + __ffs(pending);</div><div class='del'>-			desc = irq_desc + irq;</div><div class='del'>-			desc_handle_irq(irq, desc);</div><div class='add'>+			generic_handle_irq(irq);</div><div class='ctx'> 		}</div><div class='ctx'> 		pending = LUB_IRQ_SET_CLR &amp; lubbock_irq_enabled;</div><div class='ctx'> 	} while (pending);</div><div class='head'>diff --git a/arch/arm/mach-pxa/magician.c b/arch/arm/mach-pxa/magician.c<br/>index 143f28adaf95..519138bc5f85 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/magician.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pxa/magician.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/magician.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/magician.c</a></div><div class='hunk'>@@ -409,7 +409,7 @@ static struct platform_device backlight = {</div><div class='ctx'>  * LEDs</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-struct gpio_led gpio_leds[] = {</div><div class='add'>+static struct gpio_led gpio_leds[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.name = "magician::vibra",</div><div class='ctx'> 		.default_trigger = "none",</div><div class='hunk'>@@ -669,18 +669,10 @@ static struct pxamci_platform_data magician_mci_info = {</div><div class='ctx'>  * USB OHCI</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static int magician_ohci_init(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	UHCHR = (UHCHR | UHCHR_SSEP2 | UHCHR_PCPL | UHCHR_CGR) &amp;</div><div class='del'>-	    ~(UHCHR_SSEP1 | UHCHR_SSEP3 | UHCHR_SSE);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static struct pxaohci_platform_data magician_ohci_info = {</div><div class='del'>-	.port_mode    = PMM_PERPORT_MODE,</div><div class='del'>-	.init         = magician_ohci_init,</div><div class='del'>-	.power_budget = 0,</div><div class='add'>+	.port_mode	= PMM_PERPORT_MODE,</div><div class='add'>+	.flags		= ENABLE_PORT1 | ENABLE_PORT3 | POWER_CONTROL_LOW,</div><div class='add'>+	.power_budget	= 0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-pxa/mainstone.c b/arch/arm/mach-pxa/mainstone.c<br/>index d44af761564d..f2c7ad8f2b6b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/mainstone.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pxa/mainstone.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/mainstone.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/mainstone.c</a></div><div class='hunk'>@@ -162,8 +162,7 @@ static void mainstone_irq_handler(unsigned int irq, struct irq_desc *desc)</div><div class='ctx'> 		GEDR(0) = GPIO_bit(0);  /* clear useless edge notification */</div><div class='ctx'> 		if (likely(pending)) {</div><div class='ctx'> 			irq = MAINSTONE_IRQ(0) + __ffs(pending);</div><div class='del'>-			desc = irq_desc + irq;</div><div class='del'>-			desc_handle_irq(irq, desc);</div><div class='add'>+			generic_handle_irq(irq);</div><div class='ctx'> 		}</div><div class='ctx'> 		pending = MST_INTSETCLR &amp; mainstone_irq_enabled;</div><div class='ctx'> 	} while (pending);</div><div class='hunk'>@@ -508,19 +507,9 @@ static struct platform_device *platform_devices[] __initdata = {</div><div class='ctx'> 	&amp;mst_gpio_keys_device,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int mainstone_ohci_init(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	/* Set the Power Control Polarity Low and Power Sense</div><div class='del'>-	   Polarity Low to active low. */</div><div class='del'>-	UHCHR = (UHCHR | UHCHR_PCPL | UHCHR_PSPL) &amp;</div><div class='del'>-		~(UHCHR_SSEP1 | UHCHR_SSEP2 | UHCHR_SSEP3 | UHCHR_SSE);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static struct pxaohci_platform_data mainstone_ohci_platform_data = {</div><div class='ctx'> 	.port_mode	= PMM_PERPORT_MODE,</div><div class='del'>-	.init		= mainstone_ohci_init,</div><div class='add'>+	.flags		= ENABLE_PORT_ALL | POWER_CONTROL_LOW | POWER_SENSE_LOW,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_KEYBOARD_PXA27x) || defined(CONFIG_KEYBOARD_PXA27x_MODULE)</div><div class='head'>diff --git a/arch/arm/mach-pxa/mfp-pxa2xx.c b/arch/arm/mach-pxa/mfp-pxa2xx.c<br/>index 925575f10acf..2061c00c8ead 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/mfp-pxa2xx.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pxa/mfp-pxa2xx.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/mfp-pxa2xx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/mfp-pxa2xx.c</a></div><div class='hunk'>@@ -25,7 +25,12 @@</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> </div><div class='del'>-#define PGSR(x)		__REG2(0x40F00020, ((x) &amp; 0x60) &gt;&gt; 3)</div><div class='add'>+#define gpio_to_bank(gpio)	((gpio) &gt;&gt; 5)</div><div class='add'>+</div><div class='add'>+#define PGSR(x)		__REG2(0x40F00020, (x) &lt;&lt; 2)</div><div class='add'>+#define __GAFR(u, x)	__REG2((u) ? 0x40E00058 : 0x40E00054, (x) &lt;&lt; 3)</div><div class='add'>+#define GAFR_L(x)	__GAFR(0, x)</div><div class='add'>+#define GAFR_U(x)	__GAFR(1, x)</div><div class='ctx'> </div><div class='ctx'> #define PWER_WE35	(1 &lt;&lt; 24)</div><div class='ctx'> </div><div class='hunk'>@@ -38,49 +43,59 @@ struct gpio_desc {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct gpio_desc gpio_desc[MFP_PIN_GPIO127 + 1];</div><div class='add'>+static int gpio_nr;</div><div class='ctx'> </div><div class='del'>-static int __mfp_config_lpm(unsigned gpio, unsigned long lpm)</div><div class='del'>-{</div><div class='del'>-	unsigned mask = GPIO_bit(gpio);</div><div class='del'>-</div><div class='del'>-	/* low power state */</div><div class='del'>-	switch (lpm) {</div><div class='del'>-	case MFP_LPM_DRIVE_HIGH:</div><div class='del'>-		PGSR(gpio) |= mask;</div><div class='del'>-		break;</div><div class='del'>-	case MFP_LPM_DRIVE_LOW:</div><div class='del'>-		PGSR(gpio) &amp;= ~mask;</div><div class='del'>-		break;</div><div class='del'>-	case MFP_LPM_INPUT:</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		pr_warning("%s: invalid low power state for GPIO%d\n",</div><div class='del'>-				__func__, gpio);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='add'>+static unsigned long gpdr_lpm[4];</div><div class='ctx'> </div><div class='ctx'> static int __mfp_config_gpio(unsigned gpio, unsigned long c)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long gafr, mask = GPIO_bit(gpio);</div><div class='del'>-	int fn;</div><div class='add'>+	int bank = gpio_to_bank(gpio);</div><div class='add'>+	int uorl = !!(gpio &amp; 0x10); /* GAFRx_U or GAFRx_L ? */</div><div class='add'>+	int shft = (gpio &amp; 0xf) &lt;&lt; 1;</div><div class='add'>+	int fn = MFP_AF(c);</div><div class='add'>+	int dir = c &amp; MFP_DIR_OUT;</div><div class='ctx'> </div><div class='del'>-	fn = MFP_AF(c);</div><div class='ctx'> 	if (fn &gt; 3)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	/* alternate function and direction */</div><div class='del'>-	gafr = GAFR(gpio) &amp; ~(0x3 &lt;&lt; ((gpio &amp; 0xf) * 2));</div><div class='del'>-	GAFR(gpio) = gafr |  (fn  &lt;&lt; ((gpio &amp; 0xf) * 2));</div><div class='add'>+	/* alternate function and direction at run-time */</div><div class='add'>+	gafr = (uorl == 0) ? GAFR_L(bank) : GAFR_U(bank);</div><div class='add'>+	gafr = (gafr &amp; ~(0x3 &lt;&lt; shft)) | (fn &lt;&lt; shft);</div><div class='ctx'> </div><div class='del'>-	if (c &amp; MFP_DIR_OUT)</div><div class='add'>+	if (uorl == 0)</div><div class='add'>+		GAFR_L(bank) = gafr;</div><div class='add'>+	else</div><div class='add'>+		GAFR_U(bank) = gafr;</div><div class='add'>+</div><div class='add'>+	if (dir == MFP_DIR_OUT)</div><div class='ctx'> 		GPDR(gpio) |= mask;</div><div class='ctx'> 	else</div><div class='ctx'> 		GPDR(gpio) &amp;= ~mask;</div><div class='ctx'> </div><div class='del'>-	if (__mfp_config_lpm(gpio, c &amp; MFP_LPM_STATE_MASK))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	/* alternate function and direction at low power mode */</div><div class='add'>+	switch (c &amp; MFP_LPM_STATE_MASK) {</div><div class='add'>+	case MFP_LPM_DRIVE_HIGH:</div><div class='add'>+		PGSR(bank) |= mask;</div><div class='add'>+		dir = MFP_DIR_OUT;</div><div class='add'>+		break;</div><div class='add'>+	case MFP_LPM_DRIVE_LOW:</div><div class='add'>+		PGSR(bank) &amp;= ~mask;</div><div class='add'>+		dir = MFP_DIR_OUT;</div><div class='add'>+		break;</div><div class='add'>+	case MFP_LPM_DEFAULT:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		/* warning and fall through, treat as MFP_LPM_DEFAULT */</div><div class='add'>+		pr_warning("%s: GPIO%d: unsupported low power mode\n",</div><div class='add'>+				__func__, gpio);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dir == MFP_DIR_OUT)</div><div class='add'>+		gpdr_lpm[bank] |= mask;</div><div class='add'>+	else</div><div class='add'>+		gpdr_lpm[bank] &amp;= ~mask;</div><div class='ctx'> </div><div class='ctx'> 	/* give early warning if MFP_LPM_CAN_WAKEUP is set on the</div><div class='ctx'> 	 * configurations of those pins not able to wakeup</div><div class='hunk'>@@ -91,7 +106,7 @@ static int __mfp_config_gpio(unsigned gpio, unsigned long c)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((c &amp; MFP_LPM_CAN_WAKEUP) &amp;&amp; (c &amp; MFP_DIR_OUT)) {</div><div class='add'>+	if ((c &amp; MFP_LPM_CAN_WAKEUP) &amp;&amp; (dir == MFP_DIR_OUT)) {</div><div class='ctx'> 		pr_warning("%s: output GPIO%d unable to wakeup\n",</div><div class='ctx'> 				__func__, gpio);</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -135,7 +150,7 @@ void pxa2xx_mfp_config(unsigned long *mfp_cfgs, int num)</div><div class='ctx'> </div><div class='ctx'> void pxa2xx_mfp_set_lpm(int mfp, unsigned long lpm)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='add'>+	unsigned long flags, c;</div><div class='ctx'> 	int gpio;</div><div class='ctx'> </div><div class='ctx'> 	gpio = __mfp_validate(mfp);</div><div class='hunk'>@@ -143,7 +158,11 @@ void pxa2xx_mfp_set_lpm(int mfp, unsigned long lpm)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	local_irq_save(flags);</div><div class='del'>-	__mfp_config_lpm(gpio, lpm);</div><div class='add'>+</div><div class='add'>+	c = gpio_desc[gpio].config;</div><div class='add'>+	c = (c &amp; ~MFP_LPM_STATE_MASK) | lpm;</div><div class='add'>+	__mfp_config_gpio(gpio, c);</div><div class='add'>+</div><div class='ctx'> 	local_irq_restore(flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -187,23 +206,22 @@ int gpio_set_wake(unsigned int gpio, unsigned int on)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PXA25x</div><div class='del'>-static int __init pxa25x_mfp_init(void)</div><div class='add'>+static void __init pxa25x_mfp_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	if (cpu_is_pxa25x()) {</div><div class='del'>-		for (i = 0; i &lt;= 84; i++)</div><div class='del'>-			gpio_desc[i].valid = 1;</div><div class='add'>+	for (i = 0; i &lt;= 84; i++)</div><div class='add'>+		gpio_desc[i].valid = 1;</div><div class='ctx'> </div><div class='del'>-		for (i = 0; i &lt;= 15; i++) {</div><div class='del'>-			gpio_desc[i].can_wakeup = 1;</div><div class='del'>-			gpio_desc[i].mask = GPIO_bit(i);</div><div class='del'>-		}</div><div class='add'>+	for (i = 0; i &lt;= 15; i++) {</div><div class='add'>+		gpio_desc[i].can_wakeup = 1;</div><div class='add'>+		gpio_desc[i].mask = GPIO_bit(i);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	gpio_nr = 85;</div><div class='ctx'> }</div><div class='del'>-postcore_initcall(pxa25x_mfp_init);</div><div class='add'>+#else</div><div class='add'>+static inline void pxa25x_mfp_init(void) {}</div><div class='ctx'> #endif /* CONFIG_PXA25x */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PXA27x</div><div class='hunk'>@@ -233,45 +251,106 @@ int keypad_set_wake(unsigned int on)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init pxa27x_mfp_init(void)</div><div class='add'>+static void __init pxa27x_mfp_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int i, gpio;</div><div class='ctx'> </div><div class='del'>-	if (cpu_is_pxa27x()) {</div><div class='del'>-		for (i = 0; i &lt;= 120; i++) {</div><div class='del'>-			/* skip GPIO2, 5, 6, 7, 8, they are not</div><div class='del'>-			 * valid pins allow configuration</div><div class='del'>-			 */</div><div class='del'>-			if (i == 2 || i == 5 || i == 6 ||</div><div class='del'>-			    i == 7 || i == 8)</div><div class='del'>-				continue;</div><div class='add'>+	for (i = 0; i &lt;= 120; i++) {</div><div class='add'>+		/* skip GPIO2, 5, 6, 7, 8, they are not</div><div class='add'>+		 * valid pins allow configuration</div><div class='add'>+		 */</div><div class='add'>+		if (i == 2 || i == 5 || i == 6 || i == 7 || i == 8)</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='del'>-			gpio_desc[i].valid = 1;</div><div class='del'>-		}</div><div class='add'>+		gpio_desc[i].valid = 1;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		/* Keypad GPIOs */</div><div class='del'>-		for (i = 0; i &lt; ARRAY_SIZE(pxa27x_pkwr_gpio); i++) {</div><div class='del'>-			gpio = pxa27x_pkwr_gpio[i];</div><div class='del'>-			gpio_desc[gpio].can_wakeup = 1;</div><div class='del'>-			gpio_desc[gpio].keypad_gpio = 1;</div><div class='del'>-			gpio_desc[gpio].mask = 1 &lt;&lt; i;</div><div class='del'>-		}</div><div class='add'>+	/* Keypad GPIOs */</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(pxa27x_pkwr_gpio); i++) {</div><div class='add'>+		gpio = pxa27x_pkwr_gpio[i];</div><div class='add'>+		gpio_desc[gpio].can_wakeup = 1;</div><div class='add'>+		gpio_desc[gpio].keypad_gpio = 1;</div><div class='add'>+		gpio_desc[gpio].mask = 1 &lt;&lt; i;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		/* Overwrite GPIO13 as a PWER wakeup source */</div><div class='del'>-		for (i = 0; i &lt;= 15; i++) {</div><div class='del'>-			/* skip GPIO2, 5, 6, 7, 8 */</div><div class='del'>-			if (GPIO_bit(i) &amp; 0x1e4)</div><div class='del'>-				continue;</div><div class='add'>+	/* Overwrite GPIO13 as a PWER wakeup source */</div><div class='add'>+	for (i = 0; i &lt;= 15; i++) {</div><div class='add'>+		/* skip GPIO2, 5, 6, 7, 8 */</div><div class='add'>+		if (GPIO_bit(i) &amp; 0x1e4)</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='del'>-			gpio_desc[i].can_wakeup = 1;</div><div class='del'>-			gpio_desc[i].mask = GPIO_bit(i);</div><div class='del'>-		}</div><div class='add'>+		gpio_desc[i].can_wakeup = 1;</div><div class='add'>+		gpio_desc[i].mask = GPIO_bit(i);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	gpio_desc[35].can_wakeup = 1;</div><div class='add'>+	gpio_desc[35].mask = PWER_WE35;</div><div class='add'>+</div><div class='add'>+	gpio_nr = 121;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline void pxa27x_mfp_init(void) {}</div><div class='add'>+#endif /* CONFIG_PXA27x */</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+static unsigned long saved_gafr[2][4];</div><div class='add'>+static unsigned long saved_gpdr[4];</div><div class='ctx'> </div><div class='del'>-		gpio_desc[35].can_wakeup = 1;</div><div class='del'>-		gpio_desc[35].mask = PWER_WE35;</div><div class='add'>+static int pxa2xx_mfp_suspend(struct sys_device *d, pm_message_t state)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt;= gpio_to_bank(gpio_nr); i++) {</div><div class='add'>+</div><div class='add'>+		saved_gafr[0][i] = GAFR_L(i);</div><div class='add'>+		saved_gafr[1][i] = GAFR_U(i);</div><div class='add'>+		saved_gpdr[i] = GPDR(i * 32);</div><div class='add'>+</div><div class='add'>+		GPDR(i * 32) = gpdr_lpm[i];</div><div class='ctx'> 	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='add'>+static int pxa2xx_mfp_resume(struct sys_device *d)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt;= gpio_to_bank(gpio_nr); i++) {</div><div class='add'>+		GAFR_L(i) = saved_gafr[0][i];</div><div class='add'>+		GAFR_U(i) = saved_gafr[1][i];</div><div class='add'>+		GPDR(i * 32) = saved_gpdr[i];</div><div class='add'>+	}</div><div class='add'>+	PSSR = PSSR_RDH | PSSR_PH;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-postcore_initcall(pxa27x_mfp_init);</div><div class='del'>-#endif /* CONFIG_PXA27x */</div><div class='add'>+#else</div><div class='add'>+#define pxa2xx_mfp_suspend	NULL</div><div class='add'>+#define pxa2xx_mfp_resume	NULL</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+struct sysdev_class pxa2xx_mfp_sysclass = {</div><div class='add'>+	.name		= "mfp",</div><div class='add'>+	.suspend	= pxa2xx_mfp_suspend,</div><div class='add'>+	.resume		= pxa2xx_mfp_resume,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init pxa2xx_mfp_init(void)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!cpu_is_pxa2xx())</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (cpu_is_pxa25x())</div><div class='add'>+		pxa25x_mfp_init();</div><div class='add'>+</div><div class='add'>+	if (cpu_is_pxa27x())</div><div class='add'>+		pxa27x_mfp_init();</div><div class='add'>+</div><div class='add'>+	/* initialize gafr_run[], pgsr_lpm[] from existing values */</div><div class='add'>+	for (i = 0; i &lt;= gpio_to_bank(gpio_nr); i++)</div><div class='add'>+		gpdr_lpm[i] = GPDR(i * 32);</div><div class='add'>+</div><div class='add'>+	return sysdev_class_register(&amp;pxa2xx_mfp_sysclass);</div><div class='add'>+}</div><div class='add'>+postcore_initcall(pxa2xx_mfp_init);</div><div class='head'>diff --git a/arch/arm/mach-pxa/mioa701.c b/arch/arm/mach-pxa/mioa701.c<br/>new file mode 100644<br/>index 000000000000..0842c531ee4d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/mioa701.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/mioa701.c</a></div><div class='hunk'>@@ -0,0 +1,905 @@</div><div class='add'>+/*</div><div class='add'>+ * Handles the Mitac Mio A701 Board</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2008 Robert Jarzmik</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/input.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/gpio_keys.h&gt;</div><div class='add'>+#include &lt;linux/pwm_backlight.h&gt;</div><div class='add'>+#include &lt;linux/rtc.h&gt;</div><div class='add'>+#include &lt;linux/leds.h&gt;</div><div class='add'>+#include &lt;linux/gpio.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='add'>+#include &lt;linux/pda_power.h&gt;</div><div class='add'>+#include &lt;linux/power_supply.h&gt;</div><div class='add'>+#include &lt;linux/wm97xx.h&gt;</div><div class='add'>+#include &lt;linux/mtd/physmap.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/mach-types.h&gt;</div><div class='add'>+#include &lt;asm/mach/arch.h&gt;</div><div class='add'>+#include &lt;mach/mfp-pxa27x.h&gt;</div><div class='add'>+#include &lt;mach/pxa27x_keypad.h&gt;</div><div class='add'>+#include &lt;mach/pxafb.h&gt;</div><div class='add'>+#include &lt;mach/pxa2xx-regs.h&gt;</div><div class='add'>+#include &lt;mach/mmc.h&gt;</div><div class='add'>+#include &lt;mach/udc.h&gt;</div><div class='add'>+#include &lt;mach/pxa27x-udc.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;mach/mioa701.h&gt;</div><div class='add'>+</div><div class='add'>+#include "generic.h"</div><div class='add'>+#include "devices.h"</div><div class='add'>+</div><div class='add'>+static unsigned long mioa701_pin_config[] = {</div><div class='add'>+	/* Mio global */</div><div class='add'>+	MIO_CFG_OUT(GPIO9_CHARGE_nEN, AF0, DRIVE_LOW),</div><div class='add'>+	MIO_CFG_OUT(GPIO18_POWEROFF, AF0, DRIVE_LOW),</div><div class='add'>+	MFP_CFG_OUT(GPIO3, AF0, DRIVE_HIGH),</div><div class='add'>+	MFP_CFG_OUT(GPIO4, AF0, DRIVE_HIGH),</div><div class='add'>+</div><div class='add'>+	/* Backlight PWM 0 */</div><div class='add'>+	GPIO16_PWM0_OUT,</div><div class='add'>+</div><div class='add'>+	/* MMC */</div><div class='add'>+	GPIO32_MMC_CLK,</div><div class='add'>+	GPIO92_MMC_DAT_0,</div><div class='add'>+	GPIO109_MMC_DAT_1,</div><div class='add'>+	GPIO110_MMC_DAT_2,</div><div class='add'>+	GPIO111_MMC_DAT_3,</div><div class='add'>+	GPIO112_MMC_CMD,</div><div class='add'>+	MIO_CFG_IN(GPIO78_SDIO_RO, AF0),</div><div class='add'>+	MIO_CFG_IN(GPIO15_SDIO_INSERT, AF0),</div><div class='add'>+	MIO_CFG_OUT(GPIO91_SDIO_EN, AF0, DRIVE_LOW),</div><div class='add'>+</div><div class='add'>+	/* USB */</div><div class='add'>+	MIO_CFG_IN(GPIO13_USB_DETECT, AF0),</div><div class='add'>+	MIO_CFG_OUT(GPIO22_USB_ENABLE, AF0, DRIVE_LOW),</div><div class='add'>+</div><div class='add'>+	/* LCD */</div><div class='add'>+	GPIO58_LCD_LDD_0,</div><div class='add'>+	GPIO59_LCD_LDD_1,</div><div class='add'>+	GPIO60_LCD_LDD_2,</div><div class='add'>+	GPIO61_LCD_LDD_3,</div><div class='add'>+	GPIO62_LCD_LDD_4,</div><div class='add'>+	GPIO63_LCD_LDD_5,</div><div class='add'>+	GPIO64_LCD_LDD_6,</div><div class='add'>+	GPIO65_LCD_LDD_7,</div><div class='add'>+	GPIO66_LCD_LDD_8,</div><div class='add'>+	GPIO67_LCD_LDD_9,</div><div class='add'>+	GPIO68_LCD_LDD_10,</div><div class='add'>+	GPIO69_LCD_LDD_11,</div><div class='add'>+	GPIO70_LCD_LDD_12,</div><div class='add'>+	GPIO71_LCD_LDD_13,</div><div class='add'>+	GPIO72_LCD_LDD_14,</div><div class='add'>+	GPIO73_LCD_LDD_15,</div><div class='add'>+	GPIO74_LCD_FCLK,</div><div class='add'>+	GPIO75_LCD_LCLK,</div><div class='add'>+	GPIO76_LCD_PCLK,</div><div class='add'>+</div><div class='add'>+	/* Bluetooth */</div><div class='add'>+	GPIO44_BTUART_CTS,</div><div class='add'>+	GPIO42_BTUART_RXD,</div><div class='add'>+	GPIO45_BTUART_RTS,</div><div class='add'>+	GPIO43_BTUART_TXD,</div><div class='add'>+	MIO_CFG_OUT(GPIO83_BT_ON, AF0, DRIVE_LOW),</div><div class='add'>+</div><div class='add'>+	/* GPS */</div><div class='add'>+	MIO_CFG_OUT(GPIO23_GPS_UNKNOWN1, AF0, DRIVE_LOW),</div><div class='add'>+	MIO_CFG_OUT(GPIO26_GPS_ON, AF0, DRIVE_LOW),</div><div class='add'>+	MIO_CFG_OUT(GPIO27_GPS_RESET, AF0, DRIVE_LOW),</div><div class='add'>+	MIO_CFG_OUT(GPIO106_GPS_UNKNOWN2, AF0, DRIVE_LOW),</div><div class='add'>+	MIO_CFG_OUT(GPIO107_GPS_UNKNOWN3, AF0, DRIVE_LOW),</div><div class='add'>+	GPIO46_STUART_RXD,</div><div class='add'>+	GPIO47_STUART_TXD,</div><div class='add'>+</div><div class='add'>+	/* GSM */</div><div class='add'>+	MIO_CFG_OUT(GPIO24_GSM_MOD_RESET_CMD, AF0, DRIVE_LOW),</div><div class='add'>+	MIO_CFG_OUT(GPIO88_GSM_nMOD_ON_CMD, AF0, DRIVE_HIGH),</div><div class='add'>+	MIO_CFG_OUT(GPIO90_GSM_nMOD_OFF_CMD, AF0, DRIVE_HIGH),</div><div class='add'>+	MIO_CFG_OUT(GPIO114_GSM_nMOD_DTE_UART_STATE, AF0, DRIVE_HIGH),</div><div class='add'>+	MIO_CFG_IN(GPIO25_GSM_MOD_ON_STATE, AF0),</div><div class='add'>+	MIO_CFG_IN(GPIO113_GSM_EVENT, AF0) | WAKEUP_ON_EDGE_BOTH,</div><div class='add'>+	GPIO34_FFUART_RXD,</div><div class='add'>+	GPIO35_FFUART_CTS,</div><div class='add'>+	GPIO36_FFUART_DCD,</div><div class='add'>+	GPIO37_FFUART_DSR,</div><div class='add'>+	GPIO39_FFUART_TXD,</div><div class='add'>+	GPIO40_FFUART_DTR,</div><div class='add'>+	GPIO41_FFUART_RTS,</div><div class='add'>+</div><div class='add'>+	/* Sound */</div><div class='add'>+	GPIO89_AC97_SYSCLK,</div><div class='add'>+	MIO_CFG_IN(GPIO12_HPJACK_INSERT, AF0),</div><div class='add'>+</div><div class='add'>+	/* Leds */</div><div class='add'>+	MIO_CFG_OUT(GPIO10_LED_nCharging, AF0, DRIVE_HIGH),</div><div class='add'>+	MIO_CFG_OUT(GPIO97_LED_nBlue, AF0, DRIVE_HIGH),</div><div class='add'>+	MIO_CFG_OUT(GPIO98_LED_nOrange, AF0, DRIVE_HIGH),</div><div class='add'>+	MIO_CFG_OUT(GPIO82_LED_nVibra, AF0, DRIVE_HIGH),</div><div class='add'>+	MIO_CFG_OUT(GPIO115_LED_nKeyboard, AF0, DRIVE_HIGH),</div><div class='add'>+</div><div class='add'>+	/* Keyboard */</div><div class='add'>+	MIO_CFG_IN(GPIO0_KEY_POWER, AF0) | WAKEUP_ON_EDGE_BOTH,</div><div class='add'>+	MIO_CFG_IN(GPIO93_KEY_VOLUME_UP, AF0),</div><div class='add'>+	MIO_CFG_IN(GPIO94_KEY_VOLUME_DOWN, AF0),</div><div class='add'>+	GPIO100_KP_MKIN_0,</div><div class='add'>+	GPIO101_KP_MKIN_1,</div><div class='add'>+	GPIO102_KP_MKIN_2,</div><div class='add'>+	GPIO103_KP_MKOUT_0,</div><div class='add'>+	GPIO104_KP_MKOUT_1,</div><div class='add'>+	GPIO105_KP_MKOUT_2,</div><div class='add'>+</div><div class='add'>+	/* Unknown */</div><div class='add'>+	MFP_CFG_IN(GPIO14, AF0),</div><div class='add'>+	MFP_CFG_IN(GPIO20, AF0),</div><div class='add'>+	MFP_CFG_IN(GPIO21, AF0),</div><div class='add'>+	MFP_CFG_IN(GPIO33, AF0),</div><div class='add'>+	MFP_CFG_OUT(GPIO49, AF0, DRIVE_HIGH),</div><div class='add'>+	MFP_CFG_OUT(GPIO57, AF0, DRIVE_HIGH),</div><div class='add'>+	MFP_CFG_OUT(GPIO77, AF0, DRIVE_HIGH),</div><div class='add'>+	MFP_CFG_IN(GPIO80, AF0),</div><div class='add'>+	MFP_CFG_OUT(GPIO86, AF0, DRIVE_HIGH),</div><div class='add'>+	MFP_CFG_IN(GPIO96, AF0),</div><div class='add'>+	MFP_CFG_OUT(GPIO116, AF0, DRIVE_HIGH),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define MIO_GPIO_IN(num, _desc) \</div><div class='add'>+	{ .gpio = (num), .dir = 0, .desc = (_desc) }</div><div class='add'>+#define MIO_GPIO_OUT(num, _init, _desc) \</div><div class='add'>+	{ .gpio = (num), .dir = 1, .init = (_init), .desc = (_desc) }</div><div class='add'>+struct gpio_ress {</div><div class='add'>+	unsigned gpio : 8;</div><div class='add'>+	unsigned dir : 1;</div><div class='add'>+	unsigned init : 1;</div><div class='add'>+	char *desc;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int mio_gpio_request(struct gpio_ress *gpios, int size)</div><div class='add'>+{</div><div class='add'>+	int i, rc = 0;</div><div class='add'>+	int gpio;</div><div class='add'>+	int dir;</div><div class='add'>+</div><div class='add'>+	for (i = 0; (!rc) &amp;&amp; (i &lt; size); i++) {</div><div class='add'>+		gpio = gpios[i].gpio;</div><div class='add'>+		dir = gpios[i].dir;</div><div class='add'>+		rc = gpio_request(gpio, gpios[i].desc);</div><div class='add'>+		if (rc) {</div><div class='add'>+			printk(KERN_ERR "Error requesting GPIO %d(%s) : %d\n",</div><div class='add'>+			       gpio, gpios[i].desc, rc);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		if (dir)</div><div class='add'>+			gpio_direction_output(gpio, gpios[i].init);</div><div class='add'>+		else</div><div class='add'>+			gpio_direction_input(gpio);</div><div class='add'>+	}</div><div class='add'>+	while ((rc) &amp;&amp; (--i &gt;= 0))</div><div class='add'>+		gpio_free(gpios[i].gpio);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mio_gpio_free(struct gpio_ress *gpios, int size)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; size; i++)</div><div class='add'>+		gpio_free(gpios[i].gpio);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* LCD Screen and Backlight */</div><div class='add'>+static struct platform_pwm_backlight_data mioa701_backlight_data = {</div><div class='add'>+	.pwm_id		= 0,</div><div class='add'>+	.max_brightness	= 100,</div><div class='add'>+	.dft_brightness	= 50,</div><div class='add'>+	.pwm_period_ns	= 4000 * 1024,	/* Fl = 250kHz */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * LTM0305A776C LCD panel timings</div><div class='add'>+ *</div><div class='add'>+ * see:</div><div class='add'>+ *  - the LTM0305A776C datasheet,</div><div class='add'>+ *  - and the PXA27x Programmers' manual</div><div class='add'>+ */</div><div class='add'>+static struct pxafb_mode_info mioa701_ltm0305a776c = {</div><div class='add'>+	.pixclock		= 220000,	/* CLK=4.545 MHz */</div><div class='add'>+	.xres			= 240,</div><div class='add'>+	.yres			= 320,</div><div class='add'>+	.bpp			= 16,</div><div class='add'>+	.hsync_len		= 4,</div><div class='add'>+	.vsync_len		= 2,</div><div class='add'>+	.left_margin		= 6,</div><div class='add'>+	.right_margin		= 4,</div><div class='add'>+	.upper_margin		= 5,</div><div class='add'>+	.lower_margin		= 3,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void mioa701_lcd_power(int on, struct fb_var_screeninfo *si)</div><div class='add'>+{</div><div class='add'>+	gpio_set_value(GPIO87_LCD_POWER, on);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct pxafb_mach_info mioa701_pxafb_info = {</div><div class='add'>+	.modes			= &amp;mioa701_ltm0305a776c,</div><div class='add'>+	.num_modes		= 1,</div><div class='add'>+	.lcd_conn		= LCD_COLOR_TFT_16BPP | LCD_PCLK_EDGE_FALL,</div><div class='add'>+	.pxafb_lcd_power	= mioa701_lcd_power,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Keyboard configuration</div><div class='add'>+ */</div><div class='add'>+static unsigned int mioa701_matrix_keys[] = {</div><div class='add'>+	KEY(0, 0, KEY_UP),</div><div class='add'>+	KEY(0, 1, KEY_RIGHT),</div><div class='add'>+	KEY(0, 2, KEY_MEDIA),</div><div class='add'>+	KEY(1, 0, KEY_DOWN),</div><div class='add'>+	KEY(1, 1, KEY_ENTER),</div><div class='add'>+	KEY(1, 2, KEY_CONNECT),	/* GPS key */</div><div class='add'>+	KEY(2, 0, KEY_LEFT),</div><div class='add'>+	KEY(2, 1, KEY_PHONE),	/* Phone Green key */</div><div class='add'>+	KEY(2, 2, KEY_CAMERA)	/* Camera key */</div><div class='add'>+};</div><div class='add'>+static struct pxa27x_keypad_platform_data mioa701_keypad_info = {</div><div class='add'>+	.matrix_key_rows = 3,</div><div class='add'>+	.matrix_key_cols = 3,</div><div class='add'>+	.matrix_key_map = mioa701_matrix_keys,</div><div class='add'>+	.matrix_key_map_size = ARRAY_SIZE(mioa701_matrix_keys),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * GPIO Key Configuration</div><div class='add'>+ */</div><div class='add'>+#define MIO_KEY(key, _gpio, _desc, _wakeup) \</div><div class='add'>+	{ .code = (key), .gpio = (_gpio), .active_low = 0, \</div><div class='add'>+	.desc = (_desc), .type = EV_KEY, .wakeup = (_wakeup) }</div><div class='add'>+static struct gpio_keys_button mioa701_button_table[] = {</div><div class='add'>+	MIO_KEY(KEY_EXIT, GPIO0_KEY_POWER, "Power button", 1),</div><div class='add'>+	MIO_KEY(KEY_VOLUMEUP, GPIO93_KEY_VOLUME_UP, "Volume up", 0),</div><div class='add'>+	MIO_KEY(KEY_VOLUMEDOWN, GPIO94_KEY_VOLUME_DOWN, "Volume down", 0),</div><div class='add'>+	MIO_KEY(KEY_HP, GPIO12_HPJACK_INSERT, "HP jack detect", 0)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct gpio_keys_platform_data mioa701_gpio_keys_data = {</div><div class='add'>+	.buttons  = mioa701_button_table,</div><div class='add'>+	.nbuttons = ARRAY_SIZE(mioa701_button_table),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Leds and vibrator</div><div class='add'>+ */</div><div class='add'>+#define ONE_LED(_gpio, _name) \</div><div class='add'>+{ .gpio = (_gpio), .name = (_name), .active_low = true }</div><div class='add'>+static struct gpio_led gpio_leds[] = {</div><div class='add'>+	ONE_LED(GPIO10_LED_nCharging, "mioa701:charging"),</div><div class='add'>+	ONE_LED(GPIO97_LED_nBlue, "mioa701:blue"),</div><div class='add'>+	ONE_LED(GPIO98_LED_nOrange, "mioa701:orange"),</div><div class='add'>+	ONE_LED(GPIO82_LED_nVibra, "mioa701:vibra"),</div><div class='add'>+	ONE_LED(GPIO115_LED_nKeyboard, "mioa701:keyboard")</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct gpio_led_platform_data gpio_led_info = {</div><div class='add'>+	.leds = gpio_leds,</div><div class='add'>+	.num_leds = ARRAY_SIZE(gpio_leds),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * GSM Sagem XS200 chip</div><div class='add'>+ *</div><div class='add'>+ * GSM handling was purged from kernel. For history, this is the way to go :</div><div class='add'>+ *   - init : GPIO24_GSM_MOD_RESET_CMD = 0, GPIO114_GSM_nMOD_DTE_UART_STATE = 1</div><div class='add'>+ *            GPIO88_GSM_nMOD_ON_CMD = 1, GPIO90_GSM_nMOD_OFF_CMD = 1</div><div class='add'>+ *   - reset : GPIO24_GSM_MOD_RESET_CMD = 1, msleep(100),</div><div class='add'>+ *             GPIO24_GSM_MOD_RESET_CMD = 0</div><div class='add'>+ *   - turn on  : GPIO88_GSM_nMOD_ON_CMD = 0, msleep(1000),</div><div class='add'>+ *                GPIO88_GSM_nMOD_ON_CMD = 1</div><div class='add'>+ *   - turn off : GPIO90_GSM_nMOD_OFF_CMD = 0, msleep(1000),</div><div class='add'>+ *                GPIO90_GSM_nMOD_OFF_CMD = 1</div><div class='add'>+ */</div><div class='add'>+static int is_gsm_on(void)</div><div class='add'>+{</div><div class='add'>+	int is_on;</div><div class='add'>+</div><div class='add'>+	is_on = !!gpio_get_value(GPIO25_GSM_MOD_ON_STATE);</div><div class='add'>+	return is_on;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+irqreturn_t gsm_on_irq(int irq, void *p)</div><div class='add'>+{</div><div class='add'>+	printk(KERN_DEBUG "Mioa701: GSM status changed to %s\n",</div><div class='add'>+	       is_gsm_on() ? "on" : "off");</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct gpio_ress gsm_gpios[] = {</div><div class='add'>+	MIO_GPIO_IN(GPIO25_GSM_MOD_ON_STATE, "GSM state"),</div><div class='add'>+	MIO_GPIO_IN(GPIO113_GSM_EVENT, "GSM event"),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init gsm_init(void)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = mio_gpio_request(ARRAY_AND_SIZE(gsm_gpios));</div><div class='add'>+	if (rc)</div><div class='add'>+		goto err_gpio;</div><div class='add'>+	rc = request_irq(gpio_to_irq(GPIO25_GSM_MOD_ON_STATE), gsm_on_irq,</div><div class='add'>+			 IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,</div><div class='add'>+			 "GSM XS200 Power Irq", NULL);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto err_irq;</div><div class='add'>+</div><div class='add'>+	gpio_set_wake(GPIO113_GSM_EVENT, 1);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_irq:</div><div class='add'>+	printk(KERN_ERR "Mioa701: Can't request GSM_ON irq\n");</div><div class='add'>+	mio_gpio_free(ARRAY_AND_SIZE(gsm_gpios));</div><div class='add'>+err_gpio:</div><div class='add'>+	printk(KERN_ERR "Mioa701: gsm not available\n");</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void gsm_exit(void)</div><div class='add'>+{</div><div class='add'>+	free_irq(gpio_to_irq(GPIO25_GSM_MOD_ON_STATE), NULL);</div><div class='add'>+	mio_gpio_free(ARRAY_AND_SIZE(gsm_gpios));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Bluetooth BRF6150 chip</div><div class='add'>+ *</div><div class='add'>+ * BT handling was purged from kernel. For history, this is the way to go :</div><div class='add'>+ * - turn on  : GPIO83_BT_ON = 1</div><div class='add'>+ * - turn off : GPIO83_BT_ON = 0</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * GPS Sirf Star III chip</div><div class='add'>+ *</div><div class='add'>+ * GPS handling was purged from kernel. For history, this is the way to go :</div><div class='add'>+ * - init : GPIO23_GPS_UNKNOWN1 = 1, GPIO26_GPS_ON = 0, GPIO27_GPS_RESET = 0</div><div class='add'>+ *          GPIO106_GPS_UNKNOWN2 = 0, GPIO107_GPS_UNKNOWN3 = 0</div><div class='add'>+ * - turn on  : GPIO27_GPS_RESET = 1, GPIO26_GPS_ON = 1</div><div class='add'>+ * - turn off : GPIO26_GPS_ON = 0, GPIO27_GPS_RESET = 0</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * USB UDC</div><div class='add'>+ */</div><div class='add'>+static void udc_power_command(int cmd)</div><div class='add'>+{</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case PXA2XX_UDC_CMD_DISCONNECT:</div><div class='add'>+		gpio_set_value(GPIO22_USB_ENABLE, 0);</div><div class='add'>+		break;</div><div class='add'>+	case PXA2XX_UDC_CMD_CONNECT:</div><div class='add'>+		gpio_set_value(GPIO22_USB_ENABLE, 1);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		printk(KERN_INFO "udc_control: unknown command (0x%x)!\n", cmd);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int is_usb_connected(void)</div><div class='add'>+{</div><div class='add'>+	return !!gpio_get_value(GPIO13_USB_DETECT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct pxa2xx_udc_mach_info mioa701_udc_info = {</div><div class='add'>+	.udc_is_connected = is_usb_connected,</div><div class='add'>+	.udc_command	  = udc_power_command,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct gpio_ress udc_gpios[] = {</div><div class='add'>+	MIO_GPIO_OUT(GPIO22_USB_ENABLE, 0, "USB Vbus enable")</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init udc_init(void)</div><div class='add'>+{</div><div class='add'>+	pxa_set_udc_info(&amp;mioa701_udc_info);</div><div class='add'>+	return mio_gpio_request(ARRAY_AND_SIZE(udc_gpios));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void udc_exit(void)</div><div class='add'>+{</div><div class='add'>+	mio_gpio_free(ARRAY_AND_SIZE(udc_gpios));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * SDIO/MMC Card controller</div><div class='add'>+ */</div><div class='add'>+static void mci_setpower(struct device *dev, unsigned int vdd)</div><div class='add'>+{</div><div class='add'>+	struct pxamci_platform_data *p_d = dev-&gt;platform_data;</div><div class='add'>+</div><div class='add'>+	if ((1 &lt;&lt; vdd) &amp; p_d-&gt;ocr_mask)</div><div class='add'>+		gpio_set_value(GPIO91_SDIO_EN, 1);	/* enable SDIO power */</div><div class='add'>+	else</div><div class='add'>+		gpio_set_value(GPIO91_SDIO_EN, 0);	/* disable SDIO power */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mci_get_ro(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	return gpio_get_value(GPIO78_SDIO_RO);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct gpio_ress mci_gpios[] = {</div><div class='add'>+	MIO_GPIO_IN(GPIO78_SDIO_RO, 	"SDIO readonly detect"),</div><div class='add'>+	MIO_GPIO_IN(GPIO15_SDIO_INSERT,	"SDIO insertion detect"),</div><div class='add'>+	MIO_GPIO_OUT(GPIO91_SDIO_EN, 0,	"SDIO power enable")</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void mci_exit(struct device *dev, void *data)</div><div class='add'>+{</div><div class='add'>+	mio_gpio_free(ARRAY_AND_SIZE(mci_gpios));</div><div class='add'>+	free_irq(gpio_to_irq(GPIO15_SDIO_INSERT), data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct pxamci_platform_data mioa701_mci_info;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * The card detect interrupt isn't debounced so we delay it by 250ms</div><div class='add'>+ * to give the card a chance to fully insert/eject.</div><div class='add'>+ */</div><div class='add'>+static int mci_init(struct device *dev, irq_handler_t detect_int, void *data)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+	int irq = gpio_to_irq(GPIO15_SDIO_INSERT);</div><div class='add'>+</div><div class='add'>+	rc = mio_gpio_request(ARRAY_AND_SIZE(mci_gpios));</div><div class='add'>+	if (rc)</div><div class='add'>+		goto err_gpio;</div><div class='add'>+	/* enable RE/FE interrupt on card insertion and removal */</div><div class='add'>+	rc = request_irq(irq, detect_int,</div><div class='add'>+			 IRQF_DISABLED | IRQF_TRIGGER_RISING |</div><div class='add'>+			 IRQF_TRIGGER_FALLING,</div><div class='add'>+			 "MMC card detect", data);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto err_irq;</div><div class='add'>+</div><div class='add'>+	mioa701_mci_info.detect_delay = msecs_to_jiffies(250);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_irq:</div><div class='add'>+	dev_err(dev, "mioa701_mci_init: MMC/SD:"</div><div class='add'>+		" can't request MMC card detect IRQ\n");</div><div class='add'>+	mio_gpio_free(ARRAY_AND_SIZE(mci_gpios));</div><div class='add'>+err_gpio:</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct pxamci_platform_data mioa701_mci_info = {</div><div class='add'>+	.ocr_mask = MMC_VDD_32_33 | MMC_VDD_33_34,</div><div class='add'>+	.init	  = mci_init,</div><div class='add'>+	.get_ro	  = mci_get_ro,</div><div class='add'>+	.setpower = mci_setpower,</div><div class='add'>+	.exit	  = mci_exit,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* FlashRAM */</div><div class='add'>+static struct resource strataflash_resource = {</div><div class='add'>+	.start = PXA_CS0_PHYS,</div><div class='add'>+	.end   = PXA_CS0_PHYS + SZ_64M - 1,</div><div class='add'>+	.flags = IORESOURCE_MEM,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct physmap_flash_data strataflash_data = {</div><div class='add'>+	.width = 2,</div><div class='add'>+	/* .set_vpp = mioa701_set_vpp, */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device strataflash = {</div><div class='add'>+	.name	       = "physmap-flash",</div><div class='add'>+	.id	       = -1,</div><div class='add'>+	.resource      = &amp;strataflash_resource,</div><div class='add'>+	.num_resources = 1,</div><div class='add'>+	.dev = {</div><div class='add'>+		.platform_data = &amp;strataflash_data,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Suspend/Resume bootstrap management</div><div class='add'>+ *</div><div class='add'>+ * MIO A701 reboot sequence is highly ROM dependant. From the one dissassembled,</div><div class='add'>+ * this sequence is as follows :</div><div class='add'>+ *   - disables interrupts</div><div class='add'>+ *   - initialize SDRAM (self refresh RAM into active RAM)</div><div class='add'>+ *   - initialize GPIOs (depends on value at 0xa020b020)</div><div class='add'>+ *   - initialize coprossessors</div><div class='add'>+ *   - if edge detect on PWR_SCL(GPIO3), then proceed to cold start</div><div class='add'>+ *   - or if value at 0xa020b000 not equal to 0x0f0f0f0f, proceed to cold start</div><div class='add'>+ *   - else do a resume, ie. jump to addr 0xa0100000</div><div class='add'>+ */</div><div class='add'>+#define RESUME_ENABLE_ADDR	0xa020b000</div><div class='add'>+#define RESUME_ENABLE_VAL	0x0f0f0f0f</div><div class='add'>+#define RESUME_BT_ADDR		0xa020b020</div><div class='add'>+#define RESUME_UNKNOWN_ADDR	0xa020b024</div><div class='add'>+#define RESUME_VECTOR_ADDR	0xa0100000</div><div class='add'>+#define BOOTSTRAP_WORDS		mioa701_bootstrap_lg/4</div><div class='add'>+</div><div class='add'>+static u32 *save_buffer;</div><div class='add'>+</div><div class='add'>+static void install_bootstrap(void)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	u32 *rom_bootstrap  = phys_to_virt(RESUME_VECTOR_ADDR);</div><div class='add'>+	u32 *src = &amp;mioa701_bootstrap;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; BOOTSTRAP_WORDS; i++)</div><div class='add'>+		rom_bootstrap[i] = src[i];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int mioa701_sys_suspend(struct sys_device *sysdev, pm_message_t state)</div><div class='add'>+{</div><div class='add'>+	int i = 0, is_bt_on;</div><div class='add'>+	u32 *mem_resume_vector	= phys_to_virt(RESUME_VECTOR_ADDR);</div><div class='add'>+	u32 *mem_resume_enabler = phys_to_virt(RESUME_ENABLE_ADDR);</div><div class='add'>+	u32 *mem_resume_bt	= phys_to_virt(RESUME_BT_ADDR);</div><div class='add'>+	u32 *mem_resume_unknown	= phys_to_virt(RESUME_UNKNOWN_ADDR);</div><div class='add'>+</div><div class='add'>+	/* Devices prepare suspend */</div><div class='add'>+	is_bt_on = gpio_get_value(GPIO83_BT_ON);</div><div class='add'>+	pxa2xx_mfp_set_lpm(GPIO83_BT_ON,</div><div class='add'>+			   is_bt_on ? MFP_LPM_DRIVE_HIGH : MFP_LPM_DRIVE_LOW);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; BOOTSTRAP_WORDS; i++)</div><div class='add'>+		save_buffer[i] = mem_resume_vector[i];</div><div class='add'>+	save_buffer[i++] = *mem_resume_enabler;</div><div class='add'>+	save_buffer[i++] = *mem_resume_bt;</div><div class='add'>+	save_buffer[i++] = *mem_resume_unknown;</div><div class='add'>+</div><div class='add'>+	*mem_resume_enabler = RESUME_ENABLE_VAL;</div><div class='add'>+	*mem_resume_bt	    = is_bt_on;</div><div class='add'>+</div><div class='add'>+	install_bootstrap();</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mioa701_sys_resume(struct sys_device *sysdev)</div><div class='add'>+{</div><div class='add'>+	int i = 0;</div><div class='add'>+	u32 *mem_resume_vector	= phys_to_virt(RESUME_VECTOR_ADDR);</div><div class='add'>+	u32 *mem_resume_enabler = phys_to_virt(RESUME_ENABLE_ADDR);</div><div class='add'>+	u32 *mem_resume_bt	= phys_to_virt(RESUME_BT_ADDR);</div><div class='add'>+	u32 *mem_resume_unknown	= phys_to_virt(RESUME_UNKNOWN_ADDR);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; BOOTSTRAP_WORDS; i++)</div><div class='add'>+		mem_resume_vector[i] = save_buffer[i];</div><div class='add'>+	*mem_resume_enabler = save_buffer[i++];</div><div class='add'>+	*mem_resume_bt	    = save_buffer[i++];</div><div class='add'>+	*mem_resume_unknown = save_buffer[i++];</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sysdev_class mioa701_sysclass = {</div><div class='add'>+	.name = "mioa701",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct sys_device sysdev_bootstrap = {</div><div class='add'>+	.cls		= &amp;mioa701_sysclass,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct sysdev_driver driver_bootstrap = {</div><div class='add'>+	.suspend	= &amp;mioa701_sys_suspend,</div><div class='add'>+	.resume		= &amp;mioa701_sys_resume,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init bootstrap_init(void)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+	int save_size = mioa701_bootstrap_lg + (sizeof(u32) * 3);</div><div class='add'>+</div><div class='add'>+	rc = sysdev_class_register(&amp;mioa701_sysclass);</div><div class='add'>+	if (rc) {</div><div class='add'>+		printk(KERN_ERR "Failed registering mioa701 sys class\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+	rc = sysdev_register(&amp;sysdev_bootstrap);</div><div class='add'>+	if (rc) {</div><div class='add'>+		printk(KERN_ERR "Failed registering mioa701 sys device\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+	rc = sysdev_driver_register(&amp;mioa701_sysclass, &amp;driver_bootstrap);</div><div class='add'>+	if (rc) {</div><div class='add'>+		printk(KERN_ERR "Failed registering PMU sys driver\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	save_buffer = kmalloc(save_size, GFP_KERNEL);</div><div class='add'>+	if (!save_buffer)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	printk(KERN_INFO "MioA701: allocated %d bytes for bootstrap\n",</div><div class='add'>+	       save_size);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bootstrap_exit(void)</div><div class='add'>+{</div><div class='add'>+	kfree(save_buffer);</div><div class='add'>+	sysdev_driver_unregister(&amp;mioa701_sysclass, &amp;driver_bootstrap);</div><div class='add'>+	sysdev_unregister(&amp;sysdev_bootstrap);</div><div class='add'>+	sysdev_class_unregister(&amp;mioa701_sysclass);</div><div class='add'>+</div><div class='add'>+	printk(KERN_CRIT "Unregistering mioa701 suspend will hang next"</div><div class='add'>+	       "resume !!!\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Power Supply</div><div class='add'>+ */</div><div class='add'>+static char *supplicants[] = {</div><div class='add'>+	"mioa701_battery"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void mioa701_set_charge(int flags)</div><div class='add'>+{</div><div class='add'>+	gpio_set_value(GPIO9_CHARGE_nEN, !flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct pda_power_pdata power_pdata = {</div><div class='add'>+	.is_ac_online	= is_usb_connected,</div><div class='add'>+	.set_charge = mioa701_set_charge,</div><div class='add'>+	.supplied_to = supplicants,</div><div class='add'>+	.num_supplicants = ARRAY_SIZE(supplicants),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource power_resources[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.name	= "ac",</div><div class='add'>+		.start	= gpio_to_irq(GPIO13_USB_DETECT),</div><div class='add'>+		.end	= gpio_to_irq(GPIO13_USB_DETECT),</div><div class='add'>+		.flags	= IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE |</div><div class='add'>+		IORESOURCE_IRQ_LOWEDGE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device power_dev = {</div><div class='add'>+	.name		= "pda-power",</div><div class='add'>+	.id		= -1,</div><div class='add'>+	.resource	= power_resources,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(power_resources),</div><div class='add'>+	.dev = {</div><div class='add'>+		.platform_data	= &amp;power_pdata,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_PDA_POWER) &amp;&amp; defined(CONFIG_TOUCHSCREEN_WM97XX)</div><div class='add'>+static struct wm97xx *battery_wm;</div><div class='add'>+</div><div class='add'>+static enum power_supply_property battery_props[] = {</div><div class='add'>+	POWER_SUPPLY_PROP_STATUS,</div><div class='add'>+	POWER_SUPPLY_PROP_VOLTAGE_MAX_DESIGN,</div><div class='add'>+	POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN,</div><div class='add'>+	POWER_SUPPLY_PROP_VOLTAGE_NOW,</div><div class='add'>+	POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN,	/* Necessary for apm */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int get_battery_voltage(void)</div><div class='add'>+{</div><div class='add'>+	int adc = -1;</div><div class='add'>+</div><div class='add'>+	if (battery_wm)</div><div class='add'>+		adc = wm97xx_read_aux_adc(battery_wm, WM97XX_AUX_ID1);</div><div class='add'>+	return adc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int get_battery_status(struct power_supply *b)</div><div class='add'>+{</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	if (is_usb_connected())</div><div class='add'>+		status = POWER_SUPPLY_STATUS_CHARGING;</div><div class='add'>+	else</div><div class='add'>+		status = POWER_SUPPLY_STATUS_DISCHARGING;</div><div class='add'>+</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int get_property(struct power_supply *b,</div><div class='add'>+			enum power_supply_property psp,</div><div class='add'>+			union power_supply_propval *val)</div><div class='add'>+{</div><div class='add'>+	int rc = 0;</div><div class='add'>+</div><div class='add'>+	switch (psp) {</div><div class='add'>+	case POWER_SUPPLY_PROP_STATUS:</div><div class='add'>+		val-&gt;intval = get_battery_status(b);</div><div class='add'>+		break;</div><div class='add'>+	case POWER_SUPPLY_PROP_VOLTAGE_MAX_DESIGN:</div><div class='add'>+		val-&gt;intval = 0xfd0;</div><div class='add'>+		break;</div><div class='add'>+	case POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN:</div><div class='add'>+		val-&gt;intval = 0xc00;</div><div class='add'>+		break;</div><div class='add'>+	case POWER_SUPPLY_PROP_VOLTAGE_NOW:</div><div class='add'>+		val-&gt;intval = get_battery_voltage();</div><div class='add'>+		break;</div><div class='add'>+	case POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN:</div><div class='add'>+		val-&gt;intval = 100;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		val-&gt;intval = -1;</div><div class='add'>+		rc = -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct power_supply battery_ps = {</div><div class='add'>+	.name = "mioa701_battery",</div><div class='add'>+	.type = POWER_SUPPLY_TYPE_BATTERY,</div><div class='add'>+	.get_property = get_property,</div><div class='add'>+	.properties = battery_props,</div><div class='add'>+	.num_properties = ARRAY_SIZE(battery_props),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int battery_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct wm97xx *wm = platform_get_drvdata(pdev);</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	battery_wm = wm;</div><div class='add'>+</div><div class='add'>+	rc = power_supply_register(NULL, &amp;battery_ps);</div><div class='add'>+	if (rc)</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev,</div><div class='add'>+		"Could not register mioa701 battery -&gt; %d\n", rc);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int battery_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	battery_wm = NULL;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct platform_driver mioa701_battery_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = "wm97xx-battery",</div><div class='add'>+	},</div><div class='add'>+	.probe = battery_probe,</div><div class='add'>+	.remove = battery_remove</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init mioa701_battery_init(void)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = platform_driver_register(&amp;mioa701_battery_driver);</div><div class='add'>+	if (rc)</div><div class='add'>+		printk(KERN_ERR "Could not register mioa701 battery driver\n");</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+static int __init mioa701_battery_init(void)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Mio global</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* Devices */</div><div class='add'>+#define MIO_PARENT_DEV(var, strname, tparent, pdata)	\</div><div class='add'>+static struct platform_device var = {			\</div><div class='add'>+	.name		= strname,			\</div><div class='add'>+	.id		= -1,				\</div><div class='add'>+	.dev		= {				\</div><div class='add'>+		.platform_data = pdata,			\</div><div class='add'>+		.parent	= tparent,			\</div><div class='add'>+	},						\</div><div class='add'>+};</div><div class='add'>+#define MIO_SIMPLE_DEV(var, strname, pdata)	\</div><div class='add'>+	MIO_PARENT_DEV(var, strname, NULL, pdata)</div><div class='add'>+</div><div class='add'>+MIO_SIMPLE_DEV(mioa701_gpio_keys, "gpio-keys",	    &amp;mioa701_gpio_keys_data)</div><div class='add'>+MIO_PARENT_DEV(mioa701_backlight, "pwm-backlight",  &amp;pxa27x_device_pwm0.dev,</div><div class='add'>+		&amp;mioa701_backlight_data);</div><div class='add'>+MIO_SIMPLE_DEV(mioa701_led,	  "leds-gpio",	    &amp;gpio_led_info)</div><div class='add'>+MIO_SIMPLE_DEV(pxa2xx_pcm,	  "pxa2xx-pcm",	    NULL)</div><div class='add'>+MIO_SIMPLE_DEV(pxa2xx_ac97,	  "pxa2xx-ac97",    NULL)</div><div class='add'>+MIO_PARENT_DEV(mio_wm9713_codec,  "wm9713-codec",   &amp;pxa2xx_ac97.dev, NULL)</div><div class='add'>+MIO_SIMPLE_DEV(mioa701_sound,	  "mioa701-wm9713", NULL)</div><div class='add'>+MIO_SIMPLE_DEV(mioa701_board,	  "mioa701-board",  NULL)</div><div class='add'>+</div><div class='add'>+static struct platform_device *devices[] __initdata = {</div><div class='add'>+	&amp;mioa701_gpio_keys,</div><div class='add'>+	&amp;mioa701_backlight,</div><div class='add'>+	&amp;mioa701_led,</div><div class='add'>+	&amp;pxa2xx_pcm,</div><div class='add'>+	&amp;pxa2xx_ac97,</div><div class='add'>+	&amp;mio_wm9713_codec,</div><div class='add'>+	&amp;mioa701_sound,</div><div class='add'>+	&amp;power_dev,</div><div class='add'>+	&amp;strataflash,</div><div class='add'>+	&amp;mioa701_board</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void mioa701_machine_exit(void);</div><div class='add'>+</div><div class='add'>+static void mioa701_poweroff(void)</div><div class='add'>+{</div><div class='add'>+	mioa701_machine_exit();</div><div class='add'>+	gpio_set_value(GPIO18_POWEROFF, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mioa701_restart(char c)</div><div class='add'>+{</div><div class='add'>+	mioa701_machine_exit();</div><div class='add'>+	arm_machine_restart(c);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct gpio_ress global_gpios[] = {</div><div class='add'>+	MIO_GPIO_OUT(GPIO9_CHARGE_nEN, 1, "Charger enable"),</div><div class='add'>+	MIO_GPIO_OUT(GPIO18_POWEROFF, 0, "Power Off"),</div><div class='add'>+	MIO_GPIO_OUT(GPIO87_LCD_POWER, 0, "LCD Power")</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init mioa701_machine_init(void)</div><div class='add'>+{</div><div class='add'>+	PSLR  = 0xff100000; /* SYSDEL=125ms, PWRDEL=125ms, PSLR_SL_ROD=1 */</div><div class='add'>+	PCFR = PCFR_DC_EN | PCFR_GPR_EN | PCFR_OPDE;</div><div class='add'>+	RTTR = 32768 - 1; /* Reset crazy WinCE value */</div><div class='add'>+	UP2OCR = UP2OCR_HXOE;</div><div class='add'>+</div><div class='add'>+	pxa2xx_mfp_config(ARRAY_AND_SIZE(mioa701_pin_config));</div><div class='add'>+	mio_gpio_request(ARRAY_AND_SIZE(global_gpios));</div><div class='add'>+	bootstrap_init();</div><div class='add'>+	set_pxa_fb_info(&amp;mioa701_pxafb_info);</div><div class='add'>+	pxa_set_mci_info(&amp;mioa701_mci_info);</div><div class='add'>+	pxa_set_keypad_info(&amp;mioa701_keypad_info);</div><div class='add'>+	udc_init();</div><div class='add'>+	pm_power_off = mioa701_poweroff;</div><div class='add'>+	arm_pm_restart = mioa701_restart;</div><div class='add'>+	platform_add_devices(devices, ARRAY_SIZE(devices));</div><div class='add'>+	gsm_init();</div><div class='add'>+	mioa701_battery_init();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mioa701_machine_exit(void)</div><div class='add'>+{</div><div class='add'>+	udc_exit();</div><div class='add'>+	bootstrap_exit();</div><div class='add'>+	gsm_exit();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+MACHINE_START(MIOA701, "MIO A701")</div><div class='add'>+	.phys_io	= 0x40000000,</div><div class='add'>+	.io_pg_offst	= (io_p2v(0x40000000) &gt;&gt; 18) &amp; 0xfffc,</div><div class='add'>+	.boot_params	= 0xa0000100,</div><div class='add'>+	.map_io		= &amp;pxa_map_io,</div><div class='add'>+	.init_irq	= &amp;pxa27x_init_irq,</div><div class='add'>+	.init_machine	= mioa701_machine_init,</div><div class='add'>+	.timer		= &amp;pxa_timer,</div><div class='add'>+MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-pxa/mioa701_bootresume.S b/arch/arm/mach-pxa/mioa701_bootresume.S<br/>new file mode 100644<br/>index 000000000000..a647693d9856<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/mioa701_bootresume.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/mioa701_bootresume.S</a></div><div class='hunk'>@@ -0,0 +1,36 @@</div><div class='add'>+/* Bootloader to resume MIO A701</div><div class='add'>+ *</div><div class='add'>+ * 2007-1-12 Robert Jarzmik</div><div class='add'>+ *</div><div class='add'>+ * This code is licenced under the GPLv2.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#include &lt;linux/linkage.h&gt;</div><div class='add'>+#include &lt;asm/assembler.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Note: Yes, part of the following code is located into the .data section.</div><div class='add'>+ *       This is to allow jumpaddr to be accessed with a relative load</div><div class='add'>+ *       while we can't rely on any MMU translation.  We could have put</div><div class='add'>+ *       sleep_save_sp in the .text section as well, but some setups might</div><div class='add'>+ *       insist on it to be truly read-only.</div><div class='add'>+ */</div><div class='add'>+	.data</div><div class='add'>+ENTRY(mioa701_bootstrap)</div><div class='add'>+0:</div><div class='add'>+	b	1f</div><div class='add'>+ENTRY(mioa701_jumpaddr)</div><div class='add'>+	.word	0x40f00008		@ PSPR in no-MMU mode</div><div class='add'>+1:</div><div class='add'>+	mov	r0,     #0xa0000000	@ Don't suppose memory access works</div><div class='add'>+	orr	r0, r0, #0x00200000	@ even if it's supposed to</div><div class='add'>+	mov	r1, #0</div><div class='add'>+	str	r1, [r0]		@ Early disable resume for next boot</div><div class='add'>+	ldr	r0, mioa701_jumpaddr	@ (Murphy's Law)</div><div class='add'>+	ldr	r0, [r0]</div><div class='add'>+	mov	pc, r0</div><div class='add'>+2:</div><div class='add'>+</div><div class='add'>+ENTRY(mioa701_bootstrap_lg)</div><div class='add'>+	.data</div><div class='add'>+	.word	2b-0b</div><div class='head'>diff --git a/arch/arm/mach-pxa/mp900.c b/arch/arm/mach-pxa/mp900.c<br/>new file mode 100644<br/>index 000000000000..8a73814126b1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/mp900.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/mp900.c</a></div><div class='hunk'>@@ -0,0 +1,100 @@</div><div class='add'>+/*</div><div class='add'>+ *  linux/arch/arm/mach-pxa/mp900.c</div><div class='add'>+ *</div><div class='add'>+ *  Support for the NEC MobilePro900/C platform</div><div class='add'>+ *</div><div class='add'>+ *  Based on mach-pxa/gumstix.c</div><div class='add'>+ *</div><div class='add'>+ *  2007, 2008 Kristoffer Ericson &lt;kristoffer.ericson@gmail.com&gt;</div><div class='add'>+ *  2007, 2008 Michael Petchkovsky &lt;mkpetch@internode.on.net&gt;</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ *  published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/usb/isp116x.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/pxa-regs.h&gt;</div><div class='add'>+#include &lt;asm/mach-types.h&gt;</div><div class='add'>+#include &lt;asm/mach/arch.h&gt;</div><div class='add'>+#include "generic.h"</div><div class='add'>+</div><div class='add'>+static void isp116x_pfm_delay(struct device *dev, int delay)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	/* 400Mhz PXA2 = 2.5ns / instruction */</div><div class='add'>+</div><div class='add'>+	int cyc = delay / 10;</div><div class='add'>+</div><div class='add'>+	/* 4 Instructions = 4 x 2.5ns = 10ns */</div><div class='add'>+	__asm__ volatile ("0:\n"</div><div class='add'>+		"subs %0, %1, #1\n"</div><div class='add'>+		"bge 0b\n"</div><div class='add'>+		:"=r" (cyc)</div><div class='add'>+		:"0"(cyc)</div><div class='add'>+	);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct isp116x_platform_data isp116x_pfm_data = {</div><div class='add'>+	.remote_wakeup_enable = 1,</div><div class='add'>+	.delay = isp116x_pfm_delay,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource isp116x_pfm_resources[] = {</div><div class='add'>+	[0] =	{</div><div class='add'>+		.start	= 0x0d000000,</div><div class='add'>+		.end	= 0x0d000000 + 1,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+		},</div><div class='add'>+	[1] =	{</div><div class='add'>+		.start  = 0x0d000000 + 4,</div><div class='add'>+		.end	= 0x0d000000 + 5,</div><div class='add'>+		.flags  = IORESOURCE_MEM,</div><div class='add'>+		},</div><div class='add'>+	[2] =	{</div><div class='add'>+		.start	= 61,</div><div class='add'>+		.end	= 61,</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='add'>+		},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device mp900c_dummy_device = {</div><div class='add'>+	.name		= "mp900c_dummy",</div><div class='add'>+	.id		= -1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device mp900c_usb = {</div><div class='add'>+	.name		= "isp116x-hcd",</div><div class='add'>+	.num_resources	= ARRAY_SIZE(isp116x_pfm_resources),</div><div class='add'>+	.resource	= isp116x_pfm_resources,</div><div class='add'>+	.dev.platform_data = &amp;isp116x_pfm_data,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device *devices[] __initdata = {</div><div class='add'>+	&amp;mp900c_dummy_device,</div><div class='add'>+	&amp;mp900c_usb,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init mp900c_init(void)</div><div class='add'>+{</div><div class='add'>+	printk(KERN_INFO "MobilePro 900/C machine init\n");</div><div class='add'>+	platform_add_devices(devices, ARRAY_SIZE(devices));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Maintainer - Michael Petchkovsky &lt;mkpetch@internode.on.net&gt; */</div><div class='add'>+MACHINE_START(NEC_MP900, "MobilePro900/C")</div><div class='add'>+	.phys_io	= 0x40000000,</div><div class='add'>+	.boot_params	= 0xa0220100,</div><div class='add'>+	.io_pg_offst	= (io_p2v(0x40000000) &gt;&gt; 18) &amp; 0xfffc,</div><div class='add'>+	.timer		= &amp;pxa_timer,</div><div class='add'>+	.map_io		= pxa_map_io,</div><div class='add'>+	.init_irq	= pxa25x_init_irq,</div><div class='add'>+	.init_machine	= mp900c_init,</div><div class='add'>+MACHINE_END</div><div class='add'>+</div><div class='head'>diff --git a/arch/arm/mach-pxa/palmtx.c b/arch/arm/mach-pxa/palmtx.c<br/>index fe924a23debe..4447711c9fc6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/palmtx.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pxa/palmtx.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/palmtx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/palmtx.c</a></div><div class='hunk'>@@ -25,6 +25,8 @@</div><div class='ctx'> #include &lt;linux/pda_power.h&gt;</div><div class='ctx'> #include &lt;linux/pwm_backlight.h&gt;</div><div class='ctx'> #include &lt;linux/gpio.h&gt;</div><div class='add'>+#include &lt;linux/wm97xx_batt.h&gt;</div><div class='add'>+#include &lt;linux/power_supply.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='hunk'>@@ -340,6 +342,23 @@ static struct platform_device power_supply = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /******************************************************************************</div><div class='add'>+ * WM97xx battery</div><div class='add'>+ ******************************************************************************/</div><div class='add'>+static struct wm97xx_batt_info wm97xx_batt_pdata = {</div><div class='add'>+	.batt_aux	= WM97XX_AUX_ID3,</div><div class='add'>+	.temp_aux	= WM97XX_AUX_ID2,</div><div class='add'>+	.charge_gpio	= -1,</div><div class='add'>+	.max_voltage	= PALMTX_BAT_MAX_VOLTAGE,</div><div class='add'>+	.min_voltage	= PALMTX_BAT_MIN_VOLTAGE,</div><div class='add'>+	.batt_mult	= 1000,</div><div class='add'>+	.batt_div	= 414,</div><div class='add'>+	.temp_mult	= 1,</div><div class='add'>+	.temp_div	= 1,</div><div class='add'>+	.batt_tech	= POWER_SUPPLY_TECHNOLOGY_LIPO,</div><div class='add'>+	.batt_name	= "main-batt",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/******************************************************************************</div><div class='ctx'>  * Framebuffer</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> static struct pxafb_mode_info palmtx_lcd_modes[] = {</div><div class='hunk'>@@ -401,6 +420,7 @@ static void __init palmtx_init(void)</div><div class='ctx'> 	pxa_set_ac97_info(NULL);</div><div class='ctx'> 	pxa_set_ficp_info(&amp;palmtx_ficp_platform_data);</div><div class='ctx'> 	pxa_set_keypad_info(&amp;palmtx_keypad_platform_data);</div><div class='add'>+	wm97xx_bat_set_pdata(&amp;wm97xx_batt_pdata);</div><div class='ctx'> </div><div class='ctx'> 	platform_add_devices(devices, ARRAY_SIZE(devices));</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-pxa/palmz72.c b/arch/arm/mach-pxa/palmz72.c<br/>new file mode 100644<br/>index 000000000000..2f730da3bba8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/palmz72.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/palmz72.c</a></div><div class='hunk'>@@ -0,0 +1,554 @@</div><div class='add'>+/*</div><div class='add'>+ * Hardware definitions for Palm Zire72</div><div class='add'>+ *</div><div class='add'>+ * Authors:</div><div class='add'>+ *	Vladimir "Farcaller" Pouzanov &lt;farcaller@gmail.com&gt;</div><div class='add'>+ *	Sergey Lapin &lt;slapin@ossfans.org&gt;</div><div class='add'>+ *	Alex Osborne &lt;bobofdoom@gmail.com&gt;</div><div class='add'>+ *	Jan Herman &lt;2hp@seznam.cz&gt;</div><div class='add'>+ *</div><div class='add'>+ * Rewrite for mainline:</div><div class='add'>+ *	Marek Vasut &lt;marek.vasut@gmail.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * (find more info at www.hackndev.com)</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='add'>+#include &lt;linux/gpio_keys.h&gt;</div><div class='add'>+#include &lt;linux/input.h&gt;</div><div class='add'>+#include &lt;linux/pda_power.h&gt;</div><div class='add'>+#include &lt;linux/pwm_backlight.h&gt;</div><div class='add'>+#include &lt;linux/gpio.h&gt;</div><div class='add'>+#include &lt;linux/power_supply.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/mach-types.h&gt;</div><div class='add'>+#include &lt;asm/mach/arch.h&gt;</div><div class='add'>+#include &lt;asm/mach/map.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;mach/audio.h&gt;</div><div class='add'>+#include &lt;mach/palmz72.h&gt;</div><div class='add'>+#include &lt;mach/mmc.h&gt;</div><div class='add'>+#include &lt;mach/pxafb.h&gt;</div><div class='add'>+#include &lt;mach/pxa-regs.h&gt;</div><div class='add'>+#include &lt;mach/pxa2xx-regs.h&gt;</div><div class='add'>+#include &lt;mach/mfp-pxa27x.h&gt;</div><div class='add'>+#include &lt;mach/irda.h&gt;</div><div class='add'>+#include &lt;mach/pxa27x_keypad.h&gt;</div><div class='add'>+#include &lt;mach/udc.h&gt;</div><div class='add'>+#include &lt;mach/pm.h&gt;</div><div class='add'>+</div><div class='add'>+#include "generic.h"</div><div class='add'>+#include "devices.h"</div><div class='add'>+</div><div class='add'>+/******************************************************************************</div><div class='add'>+ * Pin configuration</div><div class='add'>+ ******************************************************************************/</div><div class='add'>+static unsigned long palmz72_pin_config[] __initdata = {</div><div class='add'>+	/* MMC */</div><div class='add'>+	GPIO32_MMC_CLK,</div><div class='add'>+	GPIO92_MMC_DAT_0,</div><div class='add'>+	GPIO109_MMC_DAT_1,</div><div class='add'>+	GPIO110_MMC_DAT_2,</div><div class='add'>+	GPIO111_MMC_DAT_3,</div><div class='add'>+	GPIO112_MMC_CMD,</div><div class='add'>+	GPIO14_GPIO,	/* SD detect */</div><div class='add'>+	GPIO115_GPIO,	/* SD RO */</div><div class='add'>+	GPIO98_GPIO,	/* SD power */</div><div class='add'>+</div><div class='add'>+	/* AC97 */</div><div class='add'>+	GPIO28_AC97_BITCLK,</div><div class='add'>+	GPIO29_AC97_SDATA_IN_0,</div><div class='add'>+	GPIO30_AC97_SDATA_OUT,</div><div class='add'>+	GPIO31_AC97_SYNC,</div><div class='add'>+</div><div class='add'>+	/* IrDA */</div><div class='add'>+	GPIO49_GPIO,	/* ir disable */</div><div class='add'>+	GPIO46_FICP_RXD,</div><div class='add'>+	GPIO47_FICP_TXD,</div><div class='add'>+</div><div class='add'>+	/* PWM */</div><div class='add'>+	GPIO16_PWM0_OUT,</div><div class='add'>+</div><div class='add'>+	/* USB */</div><div class='add'>+	GPIO15_GPIO,	/* usb detect */</div><div class='add'>+	GPIO12_GPIO,	/* usb pullup */</div><div class='add'>+	GPIO95_GPIO,	/* usb power */</div><div class='add'>+</div><div class='add'>+	/* Matrix keypad */</div><div class='add'>+	GPIO100_KP_MKIN_0	| WAKEUP_ON_LEVEL_HIGH,</div><div class='add'>+	GPIO101_KP_MKIN_1	| WAKEUP_ON_LEVEL_HIGH,</div><div class='add'>+	GPIO102_KP_MKIN_2	| WAKEUP_ON_LEVEL_HIGH,</div><div class='add'>+	GPIO97_KP_MKIN_3	| WAKEUP_ON_LEVEL_HIGH,</div><div class='add'>+	GPIO103_KP_MKOUT_0,</div><div class='add'>+	GPIO104_KP_MKOUT_1,</div><div class='add'>+	GPIO105_KP_MKOUT_2,</div><div class='add'>+</div><div class='add'>+	/* LCD */</div><div class='add'>+	GPIO58_LCD_LDD_0,</div><div class='add'>+	GPIO59_LCD_LDD_1,</div><div class='add'>+	GPIO60_LCD_LDD_2,</div><div class='add'>+	GPIO61_LCD_LDD_3,</div><div class='add'>+	GPIO62_LCD_LDD_4,</div><div class='add'>+	GPIO63_LCD_LDD_5,</div><div class='add'>+	GPIO64_LCD_LDD_6,</div><div class='add'>+	GPIO65_LCD_LDD_7,</div><div class='add'>+	GPIO66_LCD_LDD_8,</div><div class='add'>+	GPIO67_LCD_LDD_9,</div><div class='add'>+	GPIO68_LCD_LDD_10,</div><div class='add'>+	GPIO69_LCD_LDD_11,</div><div class='add'>+	GPIO70_LCD_LDD_12,</div><div class='add'>+	GPIO71_LCD_LDD_13,</div><div class='add'>+	GPIO72_LCD_LDD_14,</div><div class='add'>+	GPIO73_LCD_LDD_15,</div><div class='add'>+	GPIO74_LCD_FCLK,</div><div class='add'>+	GPIO75_LCD_LCLK,</div><div class='add'>+	GPIO76_LCD_PCLK,</div><div class='add'>+	GPIO77_LCD_BIAS,</div><div class='add'>+	GPIO20_GPIO,	/* bl power */</div><div class='add'>+	GPIO21_GPIO,	/* LCD border switch */</div><div class='add'>+	GPIO22_GPIO,	/* LCD border color */</div><div class='add'>+	GPIO96_GPIO,	/* lcd power */</div><div class='add'>+</div><div class='add'>+	/* Misc. */</div><div class='add'>+	GPIO0_GPIO	| WAKEUP_ON_LEVEL_HIGH,	/* power detect */</div><div class='add'>+	GPIO88_GPIO,				/* green led */</div><div class='add'>+	GPIO27_GPIO,				/* WM9712 IRQ */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/******************************************************************************</div><div class='add'>+ * SD/MMC card controller</div><div class='add'>+ ******************************************************************************/</div><div class='add'>+static int palmz72_mci_init(struct device *dev,</div><div class='add'>+				irq_handler_t palmz72_detect_int, void *data)</div><div class='add'>+{</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	/* Setup an interrupt for detecting card insert/remove events */</div><div class='add'>+	err = gpio_request(GPIO_NR_PALMZ72_SD_DETECT_N, "SD IRQ");</div><div class='add'>+	if (err)</div><div class='add'>+		goto err;</div><div class='add'>+	err = gpio_direction_input(GPIO_NR_PALMZ72_SD_DETECT_N);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err2;</div><div class='add'>+	err = request_irq(gpio_to_irq(GPIO_NR_PALMZ72_SD_DETECT_N),</div><div class='add'>+			palmz72_detect_int, IRQF_DISABLED | IRQF_SAMPLE_RANDOM |</div><div class='add'>+			IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING,</div><div class='add'>+			"SD/MMC card detect", data);</div><div class='add'>+	if (err) {</div><div class='add'>+		printk(KERN_ERR "%s: cannot request SD/MMC card detect IRQ\n",</div><div class='add'>+				__func__);</div><div class='add'>+		goto err2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* SD_POWER is not actually power, but it is more like chip</div><div class='add'>+	 * select, i.e. it is inverted */</div><div class='add'>+</div><div class='add'>+	err = gpio_request(GPIO_NR_PALMZ72_SD_POWER_N, "SD_POWER");</div><div class='add'>+	if (err)</div><div class='add'>+		goto err3;</div><div class='add'>+	err = gpio_direction_output(GPIO_NR_PALMZ72_SD_POWER_N, 0);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err4;</div><div class='add'>+	err = gpio_request(GPIO_NR_PALMZ72_SD_RO, "SD_RO");</div><div class='add'>+	if (err)</div><div class='add'>+		goto err4;</div><div class='add'>+	err = gpio_direction_input(GPIO_NR_PALMZ72_SD_RO);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err5;</div><div class='add'>+</div><div class='add'>+	printk(KERN_DEBUG "%s: irq registered\n", __func__);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err5:</div><div class='add'>+	gpio_free(GPIO_NR_PALMZ72_SD_RO);</div><div class='add'>+err4:</div><div class='add'>+	gpio_free(GPIO_NR_PALMZ72_SD_POWER_N);</div><div class='add'>+err3:</div><div class='add'>+	free_irq(gpio_to_irq(GPIO_NR_PALMZ72_SD_DETECT_N), data);</div><div class='add'>+err2:</div><div class='add'>+	gpio_free(GPIO_NR_PALMZ72_SD_DETECT_N);</div><div class='add'>+err:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void palmz72_mci_exit(struct device *dev, void *data)</div><div class='add'>+{</div><div class='add'>+	gpio_free(GPIO_NR_PALMZ72_SD_POWER_N);</div><div class='add'>+	free_irq(gpio_to_irq(GPIO_NR_PALMZ72_SD_DETECT_N), data);</div><div class='add'>+	gpio_free(GPIO_NR_PALMZ72_SD_DETECT_N);</div><div class='add'>+	gpio_free(GPIO_NR_PALMZ72_SD_RO);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void palmz72_mci_power(struct device *dev, unsigned int vdd)</div><div class='add'>+{</div><div class='add'>+	struct pxamci_platform_data *p_d = dev-&gt;platform_data;</div><div class='add'>+	if (p_d-&gt;ocr_mask &amp; (1 &lt;&lt; vdd))</div><div class='add'>+		gpio_set_value(GPIO_NR_PALMZ72_SD_POWER_N, 0);</div><div class='add'>+	else</div><div class='add'>+		gpio_set_value(GPIO_NR_PALMZ72_SD_POWER_N, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int palmz72_mci_ro(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	return gpio_get_value(GPIO_NR_PALMZ72_SD_RO);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct pxamci_platform_data palmz72_mci_platform_data = {</div><div class='add'>+	.ocr_mask	= MMC_VDD_32_33 | MMC_VDD_33_34,</div><div class='add'>+	.setpower	= palmz72_mci_power,</div><div class='add'>+	.get_ro		= palmz72_mci_ro,</div><div class='add'>+	.init 		= palmz72_mci_init,</div><div class='add'>+	.exit		= palmz72_mci_exit,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/******************************************************************************</div><div class='add'>+ * GPIO keyboard</div><div class='add'>+ ******************************************************************************/</div><div class='add'>+static unsigned int palmz72_matrix_keys[] = {</div><div class='add'>+	KEY(0, 0, KEY_POWER),</div><div class='add'>+	KEY(0, 1, KEY_F1),</div><div class='add'>+	KEY(0, 2, KEY_ENTER),</div><div class='add'>+</div><div class='add'>+	KEY(1, 0, KEY_F2),</div><div class='add'>+	KEY(1, 1, KEY_F3),</div><div class='add'>+	KEY(1, 2, KEY_F4),</div><div class='add'>+</div><div class='add'>+	KEY(2, 0, KEY_UP),</div><div class='add'>+	KEY(2, 2, KEY_DOWN),</div><div class='add'>+</div><div class='add'>+	KEY(3, 0, KEY_RIGHT),</div><div class='add'>+	KEY(3, 2, KEY_LEFT),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct pxa27x_keypad_platform_data palmz72_keypad_platform_data = {</div><div class='add'>+	.matrix_key_rows	= 4,</div><div class='add'>+	.matrix_key_cols	= 3,</div><div class='add'>+	.matrix_key_map		= palmz72_matrix_keys,</div><div class='add'>+	.matrix_key_map_size	= ARRAY_SIZE(palmz72_matrix_keys),</div><div class='add'>+</div><div class='add'>+	.debounce_interval	= 30,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/******************************************************************************</div><div class='add'>+ * Backlight</div><div class='add'>+ ******************************************************************************/</div><div class='add'>+static int palmz72_backlight_init(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = gpio_request(GPIO_NR_PALMZ72_BL_POWER, "BL POWER");</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+	ret = gpio_direction_output(GPIO_NR_PALMZ72_BL_POWER, 0);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err2;</div><div class='add'>+	ret = gpio_request(GPIO_NR_PALMZ72_LCD_POWER, "LCD POWER");</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err2;</div><div class='add'>+	ret = gpio_direction_output(GPIO_NR_PALMZ72_LCD_POWER, 0);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err3;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+err3:</div><div class='add'>+	gpio_free(GPIO_NR_PALMZ72_LCD_POWER);</div><div class='add'>+err2:</div><div class='add'>+	gpio_free(GPIO_NR_PALMZ72_BL_POWER);</div><div class='add'>+err:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int palmz72_backlight_notify(int brightness)</div><div class='add'>+{</div><div class='add'>+	gpio_set_value(GPIO_NR_PALMZ72_BL_POWER, brightness);</div><div class='add'>+	gpio_set_value(GPIO_NR_PALMZ72_LCD_POWER, brightness);</div><div class='add'>+	return brightness;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void palmz72_backlight_exit(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	gpio_free(GPIO_NR_PALMZ72_BL_POWER);</div><div class='add'>+	gpio_free(GPIO_NR_PALMZ72_LCD_POWER);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct platform_pwm_backlight_data palmz72_backlight_data = {</div><div class='add'>+	.pwm_id		= 0,</div><div class='add'>+	.max_brightness	= PALMZ72_MAX_INTENSITY,</div><div class='add'>+	.dft_brightness	= PALMZ72_MAX_INTENSITY,</div><div class='add'>+	.pwm_period_ns	= PALMZ72_PERIOD_NS,</div><div class='add'>+	.init		= palmz72_backlight_init,</div><div class='add'>+	.notify		= palmz72_backlight_notify,</div><div class='add'>+	.exit		= palmz72_backlight_exit,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device palmz72_backlight = {</div><div class='add'>+	.name	= "pwm-backlight",</div><div class='add'>+	.dev	= {</div><div class='add'>+		.parent		= &amp;pxa27x_device_pwm0.dev,</div><div class='add'>+		.platform_data	= &amp;palmz72_backlight_data,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/******************************************************************************</div><div class='add'>+ * IrDA</div><div class='add'>+ ******************************************************************************/</div><div class='add'>+static int palmz72_irda_startup(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	err = gpio_request(GPIO_NR_PALMZ72_IR_DISABLE, "IR DISABLE");</div><div class='add'>+	if (err)</div><div class='add'>+		goto err;</div><div class='add'>+	err = gpio_direction_output(GPIO_NR_PALMZ72_IR_DISABLE, 1);</div><div class='add'>+	if (err)</div><div class='add'>+		gpio_free(GPIO_NR_PALMZ72_IR_DISABLE);</div><div class='add'>+err:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void palmz72_irda_shutdown(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	gpio_free(GPIO_NR_PALMZ72_IR_DISABLE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void palmz72_irda_transceiver_mode(struct device *dev, int mode)</div><div class='add'>+{</div><div class='add'>+	gpio_set_value(GPIO_NR_PALMZ72_IR_DISABLE, mode &amp; IR_OFF);</div><div class='add'>+	pxa2xx_transceiver_mode(dev, mode);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct pxaficp_platform_data palmz72_ficp_platform_data = {</div><div class='add'>+	.startup		= palmz72_irda_startup,</div><div class='add'>+	.shutdown		= palmz72_irda_shutdown,</div><div class='add'>+	.transceiver_cap	= IR_SIRMODE | IR_OFF,</div><div class='add'>+	.transceiver_mode	= palmz72_irda_transceiver_mode,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/******************************************************************************</div><div class='add'>+ * LEDs</div><div class='add'>+ ******************************************************************************/</div><div class='add'>+static struct gpio_led gpio_leds[] = {</div><div class='add'>+	{</div><div class='add'>+		.name			= "palmz72:green:led",</div><div class='add'>+		.default_trigger	= "none",</div><div class='add'>+		.gpio			= GPIO_NR_PALMZ72_LED_GREEN,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct gpio_led_platform_data gpio_led_info = {</div><div class='add'>+	.leds		= gpio_leds,</div><div class='add'>+	.num_leds	= ARRAY_SIZE(gpio_leds),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device palmz72_leds = {</div><div class='add'>+	.name	= "leds-gpio",</div><div class='add'>+	.id	= -1,</div><div class='add'>+	.dev	= {</div><div class='add'>+		.platform_data	= &amp;gpio_led_info,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/******************************************************************************</div><div class='add'>+ * Power supply</div><div class='add'>+ ******************************************************************************/</div><div class='add'>+static int power_supply_init(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = gpio_request(GPIO_NR_PALMZ72_POWER_DETECT, "CABLE_STATE_AC");</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err1;</div><div class='add'>+	ret = gpio_direction_input(GPIO_NR_PALMZ72_POWER_DETECT);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err2;</div><div class='add'>+</div><div class='add'>+	ret = gpio_request(GPIO_NR_PALMZ72_USB_DETECT_N, "CABLE_STATE_USB");</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err2;</div><div class='add'>+	ret = gpio_direction_input(GPIO_NR_PALMZ72_USB_DETECT_N);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err3;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+err3:</div><div class='add'>+	gpio_free(GPIO_NR_PALMZ72_USB_DETECT_N);</div><div class='add'>+err2:</div><div class='add'>+	gpio_free(GPIO_NR_PALMZ72_POWER_DETECT);</div><div class='add'>+err1:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int palmz72_is_ac_online(void)</div><div class='add'>+{</div><div class='add'>+	return gpio_get_value(GPIO_NR_PALMZ72_POWER_DETECT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int palmz72_is_usb_online(void)</div><div class='add'>+{</div><div class='add'>+	return !gpio_get_value(GPIO_NR_PALMZ72_USB_DETECT_N);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void power_supply_exit(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	gpio_free(GPIO_NR_PALMZ72_USB_DETECT_N);</div><div class='add'>+	gpio_free(GPIO_NR_PALMZ72_POWER_DETECT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static char *palmz72_supplicants[] = {</div><div class='add'>+	"main-battery",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct pda_power_pdata power_supply_info = {</div><div class='add'>+	.init            = power_supply_init,</div><div class='add'>+	.is_ac_online    = palmz72_is_ac_online,</div><div class='add'>+	.is_usb_online   = palmz72_is_usb_online,</div><div class='add'>+	.exit            = power_supply_exit,</div><div class='add'>+	.supplied_to     = palmz72_supplicants,</div><div class='add'>+	.num_supplicants = ARRAY_SIZE(palmz72_supplicants),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device power_supply = {</div><div class='add'>+	.name = "pda-power",</div><div class='add'>+	.id   = -1,</div><div class='add'>+	.dev  = {</div><div class='add'>+		.platform_data = &amp;power_supply_info,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/******************************************************************************</div><div class='add'>+ * Framebuffer</div><div class='add'>+ ******************************************************************************/</div><div class='add'>+static struct pxafb_mode_info palmz72_lcd_modes[] = {</div><div class='add'>+{</div><div class='add'>+	.pixclock	= 115384,</div><div class='add'>+	.xres		= 320,</div><div class='add'>+	.yres		= 320,</div><div class='add'>+	.bpp		= 16,</div><div class='add'>+</div><div class='add'>+	.left_margin	= 27,</div><div class='add'>+	.right_margin	= 7,</div><div class='add'>+	.upper_margin	= 7,</div><div class='add'>+	.lower_margin	= 8,</div><div class='add'>+</div><div class='add'>+	.hsync_len	= 6,</div><div class='add'>+	.vsync_len	= 1,</div><div class='add'>+},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct pxafb_mach_info palmz72_lcd_screen = {</div><div class='add'>+	.modes		= palmz72_lcd_modes,</div><div class='add'>+	.num_modes	= ARRAY_SIZE(palmz72_lcd_modes),</div><div class='add'>+	.lcd_conn	= LCD_COLOR_TFT_16BPP | LCD_PCLK_EDGE_FALL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+</div><div class='add'>+/* We have some black magic here</div><div class='add'>+ * PalmOS ROM on recover expects special struct physical address</div><div class='add'>+ * to be transferred via PSPR. Using this struct PalmOS restores</div><div class='add'>+ * its state after sleep. As for Linux, we need to setup it the</div><div class='add'>+ * same way. More than that, PalmOS ROM changes some values in memory.</div><div class='add'>+ * For now only one location is found, which needs special treatment.</div><div class='add'>+ * Thanks to Alex Osborne, Andrzej Zaborowski, and lots of other people</div><div class='add'>+ * for reading backtraces for me :)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define PALMZ72_SAVE_DWORD ((unsigned long *)0xc0000050)</div><div class='add'>+</div><div class='add'>+static struct palmz72_resume_info palmz72_resume_info = {</div><div class='add'>+	.magic0 = 0xb4e6,</div><div class='add'>+	.magic1 = 1,</div><div class='add'>+</div><div class='add'>+	/* reset state, MMU off etc */</div><div class='add'>+	.arm_control = 0,</div><div class='add'>+	.aux_control = 0,</div><div class='add'>+	.ttb = 0,</div><div class='add'>+	.domain_access = 0,</div><div class='add'>+	.process_id = 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static unsigned long store_ptr;</div><div class='add'>+</div><div class='add'>+/* sys_device for Palm Zire 72 PM */</div><div class='add'>+</div><div class='add'>+static int palmz72_pm_suspend(struct sys_device *dev, pm_message_t msg)</div><div class='add'>+{</div><div class='add'>+	/* setup the resume_info struct for the original bootloader */</div><div class='add'>+	palmz72_resume_info.resume_addr = (u32) pxa_cpu_resume;</div><div class='add'>+</div><div class='add'>+	/* Storing memory touched by ROM */</div><div class='add'>+	store_ptr = *PALMZ72_SAVE_DWORD;</div><div class='add'>+</div><div class='add'>+	/* Setting PSPR to a proper value */</div><div class='add'>+	PSPR = virt_to_phys(&amp;palmz72_resume_info);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int palmz72_pm_resume(struct sys_device *dev)</div><div class='add'>+{</div><div class='add'>+	*PALMZ72_SAVE_DWORD = store_ptr;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sysdev_class palmz72_pm_sysclass = {</div><div class='add'>+	.name = "palmz72_pm",</div><div class='add'>+	.suspend = palmz72_pm_suspend,</div><div class='add'>+	.resume = palmz72_pm_resume,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct sys_device palmz72_pm_device = {</div><div class='add'>+	.cls = &amp;palmz72_pm_sysclass,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init palmz72_pm_init(void)</div><div class='add'>+{</div><div class='add'>+	int ret = -ENODEV;</div><div class='add'>+	if (machine_is_palmz72()) {</div><div class='add'>+		ret = sysdev_class_register(&amp;palmz72_pm_sysclass);</div><div class='add'>+		if (ret == 0)</div><div class='add'>+			ret = sysdev_register(&amp;palmz72_pm_device);</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+device_initcall(palmz72_pm_init);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/******************************************************************************</div><div class='add'>+ * Machine init</div><div class='add'>+ ******************************************************************************/</div><div class='add'>+static struct platform_device *devices[] __initdata = {</div><div class='add'>+	&amp;palmz72_backlight,</div><div class='add'>+	&amp;palmz72_leds,</div><div class='add'>+	&amp;power_supply,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init palmz72_init(void)</div><div class='add'>+{</div><div class='add'>+	pxa2xx_mfp_config(ARRAY_AND_SIZE(palmz72_pin_config));</div><div class='add'>+	set_pxa_fb_info(&amp;palmz72_lcd_screen);</div><div class='add'>+	pxa_set_mci_info(&amp;palmz72_mci_platform_data);</div><div class='add'>+	pxa_set_ac97_info(NULL);</div><div class='add'>+	pxa_set_ficp_info(&amp;palmz72_ficp_platform_data);</div><div class='add'>+	pxa_set_keypad_info(&amp;palmz72_keypad_platform_data);</div><div class='add'>+	platform_add_devices(devices, ARRAY_SIZE(devices));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+MACHINE_START(PALMZ72, "Palm Zire72")</div><div class='add'>+	.phys_io	= 0x40000000,</div><div class='add'>+	.io_pg_offst	= io_p2v(0x40000000),</div><div class='add'>+	.boot_params	= 0xa0000100,</div><div class='add'>+	.map_io		= pxa_map_io,</div><div class='add'>+	.init_irq	= pxa27x_init_irq,</div><div class='add'>+	.timer		= &amp;pxa_timer,</div><div class='add'>+	.init_machine	= palmz72_init</div><div class='add'>+MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-pxa/pcm027.c b/arch/arm/mach-pxa/pcm027.c<br/>index 730b9f6ede1d..36135a02fdc7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/pcm027.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pxa/pcm027.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/pcm027.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/pcm027.c</a></div><div class='hunk'>@@ -31,7 +31,7 @@</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;mach/pxa-regs.h&gt;</div><div class='del'>-#include &lt;mach/pxa2xx-gpio.h&gt;</div><div class='add'>+#include &lt;mach/mfp-pxa27x.h&gt;</div><div class='ctx'> #include &lt;mach/pxa2xx-regs.h&gt;</div><div class='ctx'> #include &lt;mach/pxa2xx_spi.h&gt;</div><div class='ctx'> #include &lt;mach/pcm027.h&gt;</div><div class='hunk'>@@ -86,6 +86,28 @@</div><div class='ctx'>  * *) CPU internal use only</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+static unsigned long pcm027_pin_config[] __initdata = {</div><div class='add'>+	/* Chip Selects */</div><div class='add'>+	GPIO20_nSDCS_2,</div><div class='add'>+	GPIO21_nSDCS_3,</div><div class='add'>+	GPIO15_nCS_1,</div><div class='add'>+	GPIO78_nCS_2,</div><div class='add'>+	GPIO80_nCS_4,</div><div class='add'>+	GPIO33_nCS_5,	/* Ethernet */</div><div class='add'>+</div><div class='add'>+	/* I2C */</div><div class='add'>+	GPIO117_I2C_SCL,</div><div class='add'>+	GPIO118_I2C_SDA,</div><div class='add'>+</div><div class='add'>+	/* GPIO */</div><div class='add'>+	GPIO52_GPIO,	/* IRQ from network controller */</div><div class='add'>+#ifdef CONFIG_LEDS_GPIO</div><div class='add'>+	GPIO90_GPIO,	/* PCM027_LED_CPU */</div><div class='add'>+	GPIO91_GPIO,	/* PCM027_LED_HEART_BEAT */</div><div class='add'>+#endif</div><div class='add'>+	GPIO114_GPIO,	/* IRQ from CAN controller */</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * SMC91x network controller specific stuff</div><div class='ctx'>  */</div><div class='hunk'>@@ -206,13 +228,9 @@ static void __init pcm027_init(void)</div><div class='ctx'> 	 */</div><div class='ctx'> 	ARB_CNTRL = ARB_CORE_PARK | 0x234;</div><div class='ctx'> </div><div class='del'>-	platform_add_devices(devices, ARRAY_SIZE(devices));</div><div class='add'>+	pxa2xx_mfp_config(pcm027_pin_config, ARRAY_SIZE(pcm027_pin_config));</div><div class='ctx'> </div><div class='del'>-	/* LEDs (on demand only) */</div><div class='del'>-#ifdef CONFIG_LEDS_GPIO</div><div class='del'>-	pxa_gpio_mode(PCM027_LED_CPU | GPIO_OUT);</div><div class='del'>-	pxa_gpio_mode(PCM027_LED_HEARD_BEAT | GPIO_OUT);</div><div class='del'>-#endif /* CONFIG_LEDS_GPIO */</div><div class='add'>+	platform_add_devices(devices, ARRAY_SIZE(devices));</div><div class='ctx'> </div><div class='ctx'> 	/* at last call the baseboard to initialize itself */</div><div class='ctx'> #ifdef CONFIG_MACH_PCM990_BASEBOARD</div><div class='head'>diff --git a/arch/arm/mach-pxa/pcm990-baseboard.c b/arch/arm/mach-pxa/pcm990-baseboard.c<br/>index 420c9b3813f6..f601425f1b1e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/pcm990-baseboard.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pxa/pcm990-baseboard.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/pcm990-baseboard.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/pcm990-baseboard.c</a></div><div class='hunk'>@@ -262,8 +262,7 @@ static void pcm990_irq_handler(unsigned int irq, struct irq_desc *desc)</div><div class='ctx'> 					GPIO_bit(PCM990_CTRL_INT_IRQ_GPIO);</div><div class='ctx'> 		if (likely(pending)) {</div><div class='ctx'> 			irq = PCM027_IRQ(0) + __ffs(pending);</div><div class='del'>-			desc = irq_desc + irq;</div><div class='del'>-			desc_handle_irq(irq, desc);</div><div class='add'>+			generic_handle_irq(irq);</div><div class='ctx'> 		}</div><div class='ctx'> 		pending = (~PCM990_INTSETCLR) &amp; pcm990_irq_enabled;</div><div class='ctx'> 	} while (pending);</div><div class='hunk'>@@ -328,36 +327,10 @@ static struct pxamci_platform_data pcm990_mci_platform_data = {</div><div class='ctx'> 	.exit		= pcm990_mci_exit,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * init OHCI hardware to work with</div><div class='del'>- *</div><div class='del'>- * Note: Only USB port 1 (host only) is connected</div><div class='del'>- *</div><div class='del'>- * GPIO88 (USBHPWR#1): overcurrent in, overcurrent when low</div><div class='del'>- * GPIO89 (USBHPEN#1): power-on out, on when low</div><div class='del'>- */</div><div class='del'>-static int pcm990_ohci_init(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * disable USB port 2 and 3</div><div class='del'>-	 * power sense is active low</div><div class='del'>-	 */</div><div class='del'>-	UHCHR = ((UHCHR) | UHCHR_PCPL | UHCHR_PSPL | UHCHR_SSEP2 |</div><div class='del'>-				UHCHR_SSEP3) &amp; ~(UHCHR_SSEP1 | UHCHR_SSE);</div><div class='del'>-	/*</div><div class='del'>-	 * wait 10ms after Power on</div><div class='del'>-	 * overcurrent per port</div><div class='del'>-	 * power switch per port</div><div class='del'>-	 */</div><div class='del'>-	UHCRHDA = (5&lt;&lt;24) | (1&lt;&lt;11) | (1&lt;&lt;8);	/* FIXME: Required? */</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static struct pxaohci_platform_data pcm990_ohci_platform_data = {</div><div class='ctx'> 	.port_mode	= PMM_PERPORT_MODE,</div><div class='del'>-	.init		= pcm990_ohci_init,</div><div class='del'>-	.exit		= NULL,</div><div class='add'>+	.flags		= ENABLE_PORT1 | POWER_CONTROL_LOW | POWER_SENSE_LOW,</div><div class='add'>+	.power_on_delay	= 10,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/arm/mach-pxa/pm.c b/arch/arm/mach-pxa/pm.c<br/>index 1b539e675579..164eb0bb6321 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/pm.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pxa/pm.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/pm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/pm.c</a></div><div class='hunk'>@@ -86,9 +86,27 @@ static int pxa_pm_valid(suspend_state_t state)</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int pxa_pm_prepare(void)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (pxa_cpu_pm_fns &amp;&amp; pxa_cpu_pm_fns-&gt;prepare)</div><div class='add'>+		ret = pxa_cpu_pm_fns-&gt;prepare();</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pxa_pm_finish(void)</div><div class='add'>+{</div><div class='add'>+	if (pxa_cpu_pm_fns &amp;&amp; pxa_cpu_pm_fns-&gt;finish)</div><div class='add'>+		pxa_cpu_pm_fns-&gt;finish();</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct platform_suspend_ops pxa_pm_ops = {</div><div class='ctx'> 	.valid		= pxa_pm_valid,</div><div class='ctx'> 	.enter		= pxa_pm_enter,</div><div class='add'>+	.prepare	= pxa_pm_prepare,</div><div class='add'>+	.finish		= pxa_pm_finish,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init pxa_pm_init(void)</div><div class='head'>diff --git a/arch/arm/mach-pxa/poodle.c b/arch/arm/mach-pxa/poodle.c<br/>index 3f5f484549b3..2e3bd8b1523b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/poodle.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pxa/poodle.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/poodle.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/poodle.c</a></div><div class='hunk'>@@ -20,6 +20,9 @@</div><div class='ctx'> #include &lt;linux/fb.h&gt;</div><div class='ctx'> #include &lt;linux/pm.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/gpio.h&gt;</div><div class='add'>+#include &lt;linux/spi/spi.h&gt;</div><div class='add'>+#include &lt;linux/spi/ads7846.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='hunk'>@@ -33,7 +36,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/pxa-regs.h&gt;</div><div class='ctx'> #include &lt;mach/pxa2xx-regs.h&gt;</div><div class='del'>-#include &lt;mach/pxa2xx-gpio.h&gt;</div><div class='add'>+#include &lt;mach/mfp-pxa25x.h&gt;</div><div class='ctx'> #include &lt;mach/mmc.h&gt;</div><div class='ctx'> #include &lt;mach/udc.h&gt;</div><div class='ctx'> #include &lt;mach/i2c.h&gt;</div><div class='hunk'>@@ -42,6 +45,7 @@</div><div class='ctx'> #include &lt;mach/pxafb.h&gt;</div><div class='ctx'> #include &lt;mach/sharpsl.h&gt;</div><div class='ctx'> #include &lt;mach/ssp.h&gt;</div><div class='add'>+#include &lt;mach/pxa2xx_spi.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/hardware/scoop.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/locomo.h&gt;</div><div class='hunk'>@@ -51,6 +55,88 @@</div><div class='ctx'> #include "devices.h"</div><div class='ctx'> #include "sharpsl.h"</div><div class='ctx'> </div><div class='add'>+static unsigned long poodle_pin_config[] __initdata = {</div><div class='add'>+	/* I/O */</div><div class='add'>+	GPIO79_nCS_3,</div><div class='add'>+	GPIO80_nCS_4,</div><div class='add'>+	GPIO18_RDY,</div><div class='add'>+</div><div class='add'>+	/* Clock */</div><div class='add'>+	GPIO12_32KHz,</div><div class='add'>+</div><div class='add'>+	/* SSP1 */</div><div class='add'>+	GPIO23_SSP1_SCLK,</div><div class='add'>+	GPIO25_SSP1_TXD,</div><div class='add'>+	GPIO26_SSP1_RXD,</div><div class='add'>+	GPIO24_GPIO,	/* POODLE_GPIO_TP_CS - SFRM as chip select */</div><div class='add'>+</div><div class='add'>+	/* I2S */</div><div class='add'>+	GPIO28_I2S_BITCLK_OUT,</div><div class='add'>+	GPIO29_I2S_SDATA_IN,</div><div class='add'>+	GPIO30_I2S_SDATA_OUT,</div><div class='add'>+	GPIO31_I2S_SYNC,</div><div class='add'>+	GPIO32_I2S_SYSCLK,</div><div class='add'>+</div><div class='add'>+	/* Infra-Red */</div><div class='add'>+	GPIO47_FICP_TXD,</div><div class='add'>+	GPIO46_FICP_RXD,</div><div class='add'>+</div><div class='add'>+	/* FFUART */</div><div class='add'>+	GPIO40_FFUART_DTR,</div><div class='add'>+	GPIO41_FFUART_RTS,</div><div class='add'>+	GPIO39_FFUART_TXD,</div><div class='add'>+	GPIO37_FFUART_DSR,</div><div class='add'>+	GPIO34_FFUART_RXD,</div><div class='add'>+	GPIO35_FFUART_CTS,</div><div class='add'>+</div><div class='add'>+	/* LCD */</div><div class='add'>+	GPIO58_LCD_LDD_0,</div><div class='add'>+	GPIO59_LCD_LDD_1,</div><div class='add'>+	GPIO60_LCD_LDD_2,</div><div class='add'>+	GPIO61_LCD_LDD_3,</div><div class='add'>+	GPIO62_LCD_LDD_4,</div><div class='add'>+	GPIO63_LCD_LDD_5,</div><div class='add'>+	GPIO64_LCD_LDD_6,</div><div class='add'>+	GPIO65_LCD_LDD_7,</div><div class='add'>+	GPIO66_LCD_LDD_8,</div><div class='add'>+	GPIO67_LCD_LDD_9,</div><div class='add'>+	GPIO68_LCD_LDD_10,</div><div class='add'>+	GPIO69_LCD_LDD_11,</div><div class='add'>+	GPIO70_LCD_LDD_12,</div><div class='add'>+	GPIO71_LCD_LDD_13,</div><div class='add'>+	GPIO72_LCD_LDD_14,</div><div class='add'>+	GPIO73_LCD_LDD_15,</div><div class='add'>+	GPIO74_LCD_FCLK,</div><div class='add'>+	GPIO75_LCD_LCLK,</div><div class='add'>+	GPIO76_LCD_PCLK,</div><div class='add'>+	GPIO77_LCD_BIAS,</div><div class='add'>+</div><div class='add'>+	/* PC Card */</div><div class='add'>+	GPIO48_nPOE,</div><div class='add'>+	GPIO49_nPWE,</div><div class='add'>+	GPIO50_nPIOR,</div><div class='add'>+	GPIO51_nPIOW,</div><div class='add'>+	GPIO52_nPCE_1,</div><div class='add'>+	GPIO53_nPCE_2,</div><div class='add'>+	GPIO54_nPSKTSEL,</div><div class='add'>+	GPIO55_nPREG,</div><div class='add'>+	GPIO56_nPWAIT,</div><div class='add'>+	GPIO57_nIOIS16,</div><div class='add'>+</div><div class='add'>+	/* MMC */</div><div class='add'>+	GPIO6_MMC_CLK,</div><div class='add'>+	GPIO8_MMC_CS0,</div><div class='add'>+</div><div class='add'>+	/* GPIO */</div><div class='add'>+	GPIO9_GPIO,	/* POODLE_GPIO_nSD_DETECT */</div><div class='add'>+	GPIO7_GPIO,	/* POODLE_GPIO_nSD_WP */</div><div class='add'>+	GPIO3_GPIO,	/* POODLE_GPIO_SD_PWR */</div><div class='add'>+	GPIO33_GPIO,	/* POODLE_GPIO_SD_PWR1 */</div><div class='add'>+</div><div class='add'>+	GPIO20_GPIO,	/* POODLE_GPIO_USB_PULLUP */</div><div class='add'>+	GPIO22_GPIO,	/* POODLE_GPIO_IR_ON */</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct resource poodle_scoop_resources[] = {</div><div class='ctx'> 	[0] = {</div><div class='ctx'> 		.start		= 0x10800000,</div><div class='hunk'>@@ -62,6 +148,7 @@ static struct resource poodle_scoop_resources[] = {</div><div class='ctx'> static struct scoop_config poodle_scoop_setup = {</div><div class='ctx'> 	.io_dir		= POODLE_SCOOP_IO_DIR,</div><div class='ctx'> 	.io_out		= POODLE_SCOOP_IO_OUT,</div><div class='add'>+	.gpio_base	= POODLE_SCOOP_GPIO_BASE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct platform_device poodle_scoop_device = {</div><div class='hunk'>@@ -74,27 +161,6 @@ struct platform_device poodle_scoop_device = {</div><div class='ctx'> 	.resource	= poodle_scoop_resources,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void poodle_pcmcia_init(void)</div><div class='del'>-{</div><div class='del'>-	/* Setup default state of GPIO outputs</div><div class='del'>-	   before we enable them as outputs. */</div><div class='del'>-	GPSR(GPIO48_nPOE) = GPIO_bit(GPIO48_nPOE) |</div><div class='del'>-		GPIO_bit(GPIO49_nPWE) | GPIO_bit(GPIO50_nPIOR) |</div><div class='del'>-		GPIO_bit(GPIO51_nPIOW) | GPIO_bit(GPIO52_nPCE_1) |</div><div class='del'>-		GPIO_bit(GPIO53_nPCE_2);</div><div class='del'>-</div><div class='del'>-	pxa_gpio_mode(GPIO48_nPOE_MD);</div><div class='del'>-	pxa_gpio_mode(GPIO49_nPWE_MD);</div><div class='del'>-	pxa_gpio_mode(GPIO50_nPIOR_MD);</div><div class='del'>-	pxa_gpio_mode(GPIO51_nPIOW_MD);</div><div class='del'>-	pxa_gpio_mode(GPIO55_nPREG_MD);</div><div class='del'>-	pxa_gpio_mode(GPIO56_nPWAIT_MD);</div><div class='del'>-	pxa_gpio_mode(GPIO57_nIOIS16_MD);</div><div class='del'>-	pxa_gpio_mode(GPIO52_nPCE_1_MD);</div><div class='del'>-	pxa_gpio_mode(GPIO53_nPCE_2_MD);</div><div class='del'>-	pxa_gpio_mode(GPIO54_pSKTSEL_MD);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static struct scoop_pcmcia_dev poodle_pcmcia_scoop[] = {</div><div class='ctx'> {</div><div class='ctx'> 	.dev        = &amp;poodle_scoop_device.dev,</div><div class='hunk'>@@ -107,7 +173,6 @@ static struct scoop_pcmcia_dev poodle_pcmcia_scoop[] = {</div><div class='ctx'> static struct scoop_pcmcia_config poodle_pcmcia_config = {</div><div class='ctx'> 	.devs         = &amp;poodle_pcmcia_scoop[0],</div><div class='ctx'> 	.num_devs     = 1,</div><div class='del'>-	.pcmcia_init  = poodle_pcmcia_init,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(poodle_scoop_device);</div><div class='hunk'>@@ -136,62 +201,55 @@ struct platform_device poodle_locomo_device = {</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(poodle_locomo_device);</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Poodle SSP Device</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-struct platform_device poodle_ssp_device = {</div><div class='del'>-	.name		= "corgi-ssp",</div><div class='del'>-	.id		= -1,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct corgissp_machinfo poodle_ssp_machinfo = {</div><div class='del'>-	.port		= 1,</div><div class='del'>-	.cs_lcdcon	= -1,</div><div class='del'>-	.cs_ads7846	= -1,</div><div class='del'>-	.cs_max1111	= -1,</div><div class='del'>-	.clk_lcdcon	= 2,</div><div class='del'>-	.clk_ads7846	= 36,</div><div class='del'>-	.clk_max1111	= 2,</div><div class='add'>+#if defined(CONFIG_SPI_PXA2XX) || defined(CONFIG_SPI_PXA2XX_MODULE)</div><div class='add'>+static struct pxa2xx_spi_master poodle_spi_info = {</div><div class='add'>+	.num_chipselect	= 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Poodle Touch Screen Device</div><div class='del'>- */</div><div class='del'>-static struct resource poodlets_resources[] = {</div><div class='del'>-	[0] = {</div><div class='del'>-		.start		= POODLE_IRQ_GPIO_TP_INT,</div><div class='del'>-		.end		= POODLE_IRQ_GPIO_TP_INT,</div><div class='del'>-		.flags		= IORESOURCE_IRQ,</div><div class='del'>-	},</div><div class='add'>+static struct ads7846_platform_data poodle_ads7846_info = {</div><div class='add'>+	.model			= 7846,</div><div class='add'>+	.vref_delay_usecs	= 100,</div><div class='add'>+	.x_plate_ohms		= 419,</div><div class='add'>+	.y_plate_ohms		= 486,</div><div class='add'>+	.gpio_pendown		= POODLE_GPIO_TP_INT,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static unsigned long poodle_get_hsync_invperiod(void)</div><div class='add'>+static void ads7846_cs(u32 command)</div><div class='ctx'> {</div><div class='del'>-	return 0;</div><div class='add'>+	gpio_set_value(POODLE_GPIO_TP_CS, !(command == PXA2XX_CS_ASSERT));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void poodle_null_hsync(void)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct corgits_machinfo  poodle_ts_machinfo = {</div><div class='del'>-	.get_hsync_invperiod	= poodle_get_hsync_invperiod,</div><div class='del'>-	.put_hsync       	= poodle_null_hsync,</div><div class='del'>-	.wait_hsync      	= poodle_null_hsync,</div><div class='add'>+static struct pxa2xx_spi_chip poodle_ads7846_chip = {</div><div class='add'>+	.cs_control		= ads7846_cs,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct platform_device poodle_ts_device = {</div><div class='del'>-	.name		= "corgi-ts",</div><div class='del'>-	.dev		= {</div><div class='del'>-		.platform_data	= &amp;poodle_ts_machinfo,</div><div class='add'>+static struct spi_board_info poodle_spi_devices[] = {</div><div class='add'>+	{</div><div class='add'>+		.modalias	= "ads7846",</div><div class='add'>+		.max_speed_hz	= 10000,</div><div class='add'>+		.bus_num	= 1,</div><div class='add'>+		.platform_data	= &amp;poodle_ads7846_info,</div><div class='add'>+		.controller_data= &amp;poodle_ads7846_chip,</div><div class='add'>+		.irq		= gpio_to_irq(POODLE_GPIO_TP_INT),</div><div class='ctx'> 	},</div><div class='del'>-	.id		= -1,</div><div class='del'>-	.num_resources	= ARRAY_SIZE(poodlets_resources),</div><div class='del'>-	.resource	= poodlets_resources,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static void __init poodle_init_spi(void)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = gpio_request(POODLE_GPIO_TP_CS, "ADS7846_CS");</div><div class='add'>+	if (err)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	gpio_direction_output(POODLE_GPIO_TP_CS, 1);</div><div class='add'>+</div><div class='add'>+	pxa2xx_set_spi_info(1, &amp;poodle_spi_info);</div><div class='add'>+	spi_register_board_info(ARRAY_AND_SIZE(poodle_spi_devices));</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline void poodle_init_spi(void) {}</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * MMC/SD Device</div><div class='hunk'>@@ -205,22 +263,50 @@ static int poodle_mci_init(struct device *dev, irq_handler_t poodle_detect_int,</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	/* setup GPIO for PXA25x MMC controller	*/</div><div class='del'>-	pxa_gpio_mode(GPIO6_MMCCLK_MD);</div><div class='del'>-	pxa_gpio_mode(GPIO8_MMCCS0_MD);</div><div class='del'>-	pxa_gpio_mode(POODLE_GPIO_nSD_DETECT | GPIO_IN);</div><div class='del'>-	pxa_gpio_mode(POODLE_GPIO_nSD_WP | GPIO_IN);</div><div class='del'>-	pxa_gpio_mode(POODLE_GPIO_SD_PWR | GPIO_OUT);</div><div class='del'>-	pxa_gpio_mode(POODLE_GPIO_SD_PWR1 | GPIO_OUT);</div><div class='add'>+	err = gpio_request(POODLE_GPIO_nSD_DETECT, "nSD_DETECT");</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_out;</div><div class='add'>+</div><div class='add'>+	err = gpio_request(POODLE_GPIO_nSD_WP, "nSD_WP");</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_free_1;</div><div class='add'>+</div><div class='add'>+	err = gpio_request(POODLE_GPIO_SD_PWR, "SD_PWR");</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_free_2;</div><div class='add'>+</div><div class='add'>+	err = gpio_request(POODLE_GPIO_SD_PWR1, "SD_PWR1");</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_free_3;</div><div class='add'>+</div><div class='add'>+	gpio_direction_input(POODLE_GPIO_nSD_DETECT);</div><div class='add'>+	gpio_direction_input(POODLE_GPIO_nSD_WP);</div><div class='add'>+</div><div class='add'>+	gpio_direction_output(POODLE_GPIO_SD_PWR, 0);</div><div class='add'>+	gpio_direction_output(POODLE_GPIO_SD_PWR1, 0);</div><div class='ctx'> </div><div class='ctx'> 	poodle_mci_platform_data.detect_delay = msecs_to_jiffies(250);</div><div class='ctx'> </div><div class='ctx'> 	err = request_irq(POODLE_IRQ_GPIO_nSD_DETECT, poodle_detect_int,</div><div class='ctx'> 			  IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,</div><div class='ctx'> 			  "MMC card detect", data);</div><div class='del'>-	if (err)</div><div class='del'>-		printk(KERN_ERR "poodle_mci_init: MMC/SD: can't request MMC card detect IRQ\n");</div><div class='add'>+	if (err) {</div><div class='add'>+		pr_err("%s: MMC/SD: can't request MMC card detect IRQ\n",</div><div class='add'>+				__func__);</div><div class='add'>+		goto err_free_4;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> </div><div class='add'>+err_free_4:</div><div class='add'>+	gpio_free(POODLE_GPIO_SD_PWR1);</div><div class='add'>+err_free_3:</div><div class='add'>+	gpio_free(POODLE_GPIO_SD_PWR);</div><div class='add'>+err_free_2:</div><div class='add'>+	gpio_free(POODLE_GPIO_nSD_WP);</div><div class='add'>+err_free_1:</div><div class='add'>+	gpio_free(POODLE_GPIO_nSD_DETECT);</div><div class='add'>+err_out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -228,18 +314,19 @@ static void poodle_mci_setpower(struct device *dev, unsigned int vdd)</div><div class='ctx'> {</div><div class='ctx'> 	struct pxamci_platform_data* p_d = dev-&gt;platform_data;</div><div class='ctx'> </div><div class='del'>-	if (( 1 &lt;&lt; vdd) &amp; p_d-&gt;ocr_mask) {</div><div class='del'>-		GPSR(POODLE_GPIO_SD_PWR) = GPIO_bit(POODLE_GPIO_SD_PWR);</div><div class='add'>+	if ((1 &lt;&lt; vdd) &amp; p_d-&gt;ocr_mask) {</div><div class='add'>+		gpio_set_value(POODLE_GPIO_SD_PWR, 1);</div><div class='ctx'> 		mdelay(2);</div><div class='del'>-		GPSR(POODLE_GPIO_SD_PWR1) = GPIO_bit(POODLE_GPIO_SD_PWR1);</div><div class='add'>+		gpio_set_value(POODLE_GPIO_SD_PWR1, 1);</div><div class='ctx'> 	} else {</div><div class='del'>-		GPCR(POODLE_GPIO_SD_PWR1) = GPIO_bit(POODLE_GPIO_SD_PWR1);</div><div class='del'>-		GPCR(POODLE_GPIO_SD_PWR) = GPIO_bit(POODLE_GPIO_SD_PWR);</div><div class='add'>+		gpio_set_value(POODLE_GPIO_SD_PWR1, 0);</div><div class='add'>+		gpio_set_value(POODLE_GPIO_SD_PWR, 0);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int poodle_mci_get_ro(struct device *dev)</div><div class='ctx'> {</div><div class='add'>+	return !!gpio_get_value(POODLE_GPIO_nSD_WP);</div><div class='ctx'> 	return GPLR(POODLE_GPIO_nSD_WP) &amp; GPIO_bit(POODLE_GPIO_nSD_WP);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -247,6 +334,10 @@ static int poodle_mci_get_ro(struct device *dev)</div><div class='ctx'> static void poodle_mci_exit(struct device *dev, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	free_irq(POODLE_IRQ_GPIO_nSD_DETECT, data);</div><div class='add'>+	gpio_free(POODLE_GPIO_SD_PWR1);</div><div class='add'>+	gpio_free(POODLE_GPIO_SD_PWR);</div><div class='add'>+	gpio_free(POODLE_GPIO_nSD_WP);</div><div class='add'>+	gpio_free(POODLE_GPIO_nSD_DETECT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct pxamci_platform_data poodle_mci_platform_data = {</div><div class='hunk'>@@ -263,38 +354,41 @@ static struct pxamci_platform_data poodle_mci_platform_data = {</div><div class='ctx'>  */</div><div class='ctx'> static void poodle_irda_transceiver_mode(struct device *dev, int mode)</div><div class='ctx'> {</div><div class='del'>-	if (mode &amp; IR_OFF) {</div><div class='del'>-		GPSR(POODLE_GPIO_IR_ON) = GPIO_bit(POODLE_GPIO_IR_ON);</div><div class='del'>-	} else {</div><div class='del'>-		GPCR(POODLE_GPIO_IR_ON) = GPIO_bit(POODLE_GPIO_IR_ON);</div><div class='del'>-	}</div><div class='add'>+	gpio_set_value(POODLE_GPIO_IR_ON, mode &amp; IR_OFF);</div><div class='ctx'> 	pxa2xx_transceiver_mode(dev, mode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int poodle_irda_startup(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = gpio_request(POODLE_GPIO_IR_ON, "IR_ON");</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	gpio_direction_output(POODLE_GPIO_IR_ON, 1);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void poodle_irda_shutdown(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	gpio_free(POODLE_GPIO_IR_ON);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct pxaficp_platform_data poodle_ficp_platform_data = {</div><div class='del'>-	.transceiver_cap  = IR_SIRMODE | IR_OFF,</div><div class='del'>-	.transceiver_mode = poodle_irda_transceiver_mode,</div><div class='add'>+	.transceiver_cap	= IR_SIRMODE | IR_OFF,</div><div class='add'>+	.transceiver_mode	= poodle_irda_transceiver_mode,</div><div class='add'>+	.startup		= poodle_irda_startup,</div><div class='add'>+	.shutdown		= poodle_irda_shutdown,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * USB Device Controller</div><div class='ctx'>  */</div><div class='del'>-static void poodle_udc_command(int cmd)</div><div class='del'>-{</div><div class='del'>-	switch(cmd)	{</div><div class='del'>-	case PXA2XX_UDC_CMD_CONNECT:</div><div class='del'>-		GPSR(POODLE_GPIO_USB_PULLUP) = GPIO_bit(POODLE_GPIO_USB_PULLUP);</div><div class='del'>-		break;</div><div class='del'>-	case PXA2XX_UDC_CMD_DISCONNECT:</div><div class='del'>-		GPCR(POODLE_GPIO_USB_PULLUP) = GPIO_bit(POODLE_GPIO_USB_PULLUP);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static struct pxa2xx_udc_mach_info udc_info __initdata = {</div><div class='ctx'> 	/* no connect GPIO; poodle can't tell connection status */</div><div class='del'>-	.udc_command		= poodle_udc_command,</div><div class='add'>+	.gpio_pullup	= POODLE_GPIO_USB_PULLUP,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -316,15 +410,12 @@ static struct pxafb_mode_info poodle_fb_mode = {</div><div class='ctx'> static struct pxafb_mach_info poodle_fb_info = {</div><div class='ctx'> 	.modes		= &amp;poodle_fb_mode,</div><div class='ctx'> 	.num_modes	= 1,</div><div class='del'>-	.lccr0		= LCCR0_Act | LCCR0_Sngl | LCCR0_Color,</div><div class='del'>-	.lccr3		= 0,</div><div class='add'>+	.lcd_conn	= LCD_COLOR_TFT_16BPP,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct platform_device *devices[] __initdata = {</div><div class='ctx'> 	&amp;poodle_locomo_device,</div><div class='ctx'> 	&amp;poodle_scoop_device,</div><div class='del'>-	&amp;poodle_ssp_device,</div><div class='del'>-	&amp;poodle_ts_device,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void poodle_poweroff(void)</div><div class='hunk'>@@ -344,59 +435,23 @@ static void __init poodle_init(void)</div><div class='ctx'> 	pm_power_off = poodle_poweroff;</div><div class='ctx'> 	arm_pm_restart = poodle_restart;</div><div class='ctx'> </div><div class='del'>-	/* setup sleep mode values */</div><div class='del'>-	PWER  = 0x00000002;</div><div class='del'>-	PFER  = 0x00000000;</div><div class='del'>-	PRER  = 0x00000002;</div><div class='del'>-	PGSR0 = 0x00008000;</div><div class='del'>-	PGSR1 = 0x003F0202;</div><div class='del'>-	PGSR2 = 0x0001C000;</div><div class='ctx'> 	PCFR |= PCFR_OPDE;</div><div class='ctx'> </div><div class='del'>-	/* cpu initialize */</div><div class='del'>-	/* Pgsr Register */</div><div class='del'>-  	PGSR0 = 0x0146dd80;</div><div class='del'>-  	PGSR1 = 0x03bf0890;</div><div class='del'>-  	PGSR2 = 0x0001c000;</div><div class='del'>-</div><div class='del'>-	/* Alternate Register */</div><div class='del'>-  	GAFR0_L = 0x01001000;</div><div class='del'>-  	GAFR0_U = 0x591a8010;</div><div class='del'>-  	GAFR1_L = 0x900a8451;</div><div class='del'>-  	GAFR1_U = 0xaaa5aaaa;</div><div class='del'>-  	GAFR2_L = 0x8aaaaaaa;</div><div class='del'>-  	GAFR2_U = 0x00000002;</div><div class='del'>-</div><div class='del'>-	/* Direction Register */</div><div class='del'>-  	GPDR0 = 0xd3f0904c;</div><div class='del'>-  	GPDR1 = 0xfcffb7d3;</div><div class='del'>-  	GPDR2 = 0x0001ffff;</div><div class='del'>-</div><div class='del'>-	/* Output Register */</div><div class='del'>-  	GPCR0 = 0x00000000;</div><div class='del'>-  	GPCR1 = 0x00000000;</div><div class='del'>-  	GPCR2 = 0x00000000;</div><div class='del'>-</div><div class='del'>-  	GPSR0 = 0x00400000;</div><div class='del'>-  	GPSR1 = 0x00000000;</div><div class='del'>-        GPSR2 = 0x00000000;</div><div class='add'>+	pxa2xx_mfp_config(ARRAY_AND_SIZE(poodle_pin_config));</div><div class='add'>+</div><div class='add'>+	platform_scoop_config = &amp;poodle_pcmcia_config;</div><div class='add'>+</div><div class='add'>+	ret = platform_add_devices(devices, ARRAY_SIZE(devices));</div><div class='add'>+	if (ret)</div><div class='add'>+		pr_warning("poodle: Unable to register LoCoMo device\n");</div><div class='ctx'> </div><div class='ctx'> 	set_pxa_fb_parent(&amp;poodle_locomo_device.dev);</div><div class='ctx'> 	set_pxa_fb_info(&amp;poodle_fb_info);</div><div class='del'>-	pxa_gpio_mode(POODLE_GPIO_USB_PULLUP | GPIO_OUT);</div><div class='del'>-	pxa_gpio_mode(POODLE_GPIO_IR_ON | GPIO_OUT);</div><div class='ctx'> 	pxa_set_udc_info(&amp;udc_info);</div><div class='ctx'> 	pxa_set_mci_info(&amp;poodle_mci_platform_data);</div><div class='ctx'> 	pxa_set_ficp_info(&amp;poodle_ficp_platform_data);</div><div class='ctx'> 	pxa_set_i2c_info(NULL);</div><div class='del'>-</div><div class='del'>-	platform_scoop_config = &amp;poodle_pcmcia_config;</div><div class='del'>-</div><div class='del'>-	ret = platform_add_devices(devices, ARRAY_SIZE(devices));</div><div class='del'>-	if (ret) {</div><div class='del'>-		printk(KERN_WARNING "poodle: Unable to register LoCoMo device\n");</div><div class='del'>-	}</div><div class='del'>-	corgi_ssp_set_machinfo(&amp;poodle_ssp_machinfo);</div><div class='add'>+	poodle_init_spi();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __init fixup_poodle(struct machine_desc *desc,</div><div class='head'>diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c<br/>index 305452b56e91..25d17a1dab78 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/pxa25x.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pxa/pxa25x.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/pxa25x.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/pxa25x.c</a></div><div class='hunk'>@@ -36,6 +36,12 @@</div><div class='ctx'> #include "devices.h"</div><div class='ctx'> #include "clock.h"</div><div class='ctx'> </div><div class='add'>+int cpu_is_pxa26x(void)</div><div class='add'>+{</div><div class='add'>+	return cpu_is_pxa250() &amp;&amp; ((BOOT_DEF &amp; 0x8) == 0);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(cpu_is_pxa26x);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Various clock factors driven by the CCCR register.</div><div class='ctx'>  */</div><div class='hunk'>@@ -203,48 +209,21 @@ static struct clk pxa25x_clks[] = {</div><div class='ctx'>  * More ones like CP and general purpose register values are preserved</div><div class='ctx'>  * with the stack pointer in sleep.S.</div><div class='ctx'>  */</div><div class='del'>-enum {	SLEEP_SAVE_PGSR0, SLEEP_SAVE_PGSR1, SLEEP_SAVE_PGSR2,</div><div class='del'>-</div><div class='del'>-	SLEEP_SAVE_GAFR0_L, SLEEP_SAVE_GAFR0_U,</div><div class='del'>-	SLEEP_SAVE_GAFR1_L, SLEEP_SAVE_GAFR1_U,</div><div class='del'>-	SLEEP_SAVE_GAFR2_L, SLEEP_SAVE_GAFR2_U,</div><div class='del'>-</div><div class='add'>+enum {</div><div class='ctx'> 	SLEEP_SAVE_PSTR,</div><div class='del'>-</div><div class='ctx'> 	SLEEP_SAVE_CKEN,</div><div class='del'>-</div><div class='ctx'> 	SLEEP_SAVE_COUNT</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static void pxa25x_cpu_pm_save(unsigned long *sleep_save)</div><div class='ctx'> {</div><div class='del'>-	SAVE(PGSR0); SAVE(PGSR1); SAVE(PGSR2);</div><div class='del'>-</div><div class='del'>-	SAVE(GAFR0_L); SAVE(GAFR0_U);</div><div class='del'>-	SAVE(GAFR1_L); SAVE(GAFR1_U);</div><div class='del'>-	SAVE(GAFR2_L); SAVE(GAFR2_U);</div><div class='del'>-</div><div class='ctx'> 	SAVE(CKEN);</div><div class='ctx'> 	SAVE(PSTR);</div><div class='del'>-</div><div class='del'>-	/* Clear GPIO transition detect bits */</div><div class='del'>-	GEDR0 = GEDR0; GEDR1 = GEDR1; GEDR2 = GEDR2;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void pxa25x_cpu_pm_restore(unsigned long *sleep_save)</div><div class='ctx'> {</div><div class='del'>-	/* ensure not to come back here if it wasn't intended */</div><div class='del'>-	PSPR = 0;</div><div class='del'>-</div><div class='del'>-	/* restore registers */</div><div class='del'>-	RESTORE(GAFR0_L); RESTORE(GAFR0_U);</div><div class='del'>-	RESTORE(GAFR1_L); RESTORE(GAFR1_U);</div><div class='del'>-	RESTORE(GAFR2_L); RESTORE(GAFR2_U);</div><div class='del'>-	RESTORE(PGSR0); RESTORE(PGSR1); RESTORE(PGSR2);</div><div class='del'>-</div><div class='del'>-	PSSR = PSSR_RDH | PSSR_PH;</div><div class='del'>-</div><div class='ctx'> 	RESTORE(CKEN);</div><div class='ctx'> 	RESTORE(PSTR);</div><div class='ctx'> }</div><div class='hunk'>@@ -256,19 +235,32 @@ static void pxa25x_cpu_pm_enter(suspend_state_t state)</div><div class='ctx'> </div><div class='ctx'> 	switch (state) {</div><div class='ctx'> 	case PM_SUSPEND_MEM:</div><div class='del'>-		/* set resume return address */</div><div class='del'>-		PSPR = virt_to_phys(pxa_cpu_resume);</div><div class='ctx'> 		pxa25x_cpu_suspend(PWRMODE_SLEEP);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int pxa25x_cpu_pm_prepare(void)</div><div class='add'>+{</div><div class='add'>+	/* set resume return address */</div><div class='add'>+	PSPR = virt_to_phys(pxa_cpu_resume);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pxa25x_cpu_pm_finish(void)</div><div class='add'>+{</div><div class='add'>+	/* ensure not to come back here if it wasn't intended */</div><div class='add'>+	PSPR = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct pxa_cpu_pm_fns pxa25x_cpu_pm_fns = {</div><div class='ctx'> 	.save_count	= SLEEP_SAVE_COUNT,</div><div class='ctx'> 	.valid		= suspend_valid_only_mem,</div><div class='ctx'> 	.save		= pxa25x_cpu_pm_save,</div><div class='ctx'> 	.restore	= pxa25x_cpu_pm_restore,</div><div class='ctx'> 	.enter		= pxa25x_cpu_pm_enter,</div><div class='add'>+	.prepare	= pxa25x_cpu_pm_prepare,</div><div class='add'>+	.finish		= pxa25x_cpu_pm_finish,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void __init pxa25x_init_pm(void)</div><div class='hunk'>@@ -330,6 +322,8 @@ static struct sys_device pxa25x_sysdev[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.cls	= &amp;pxa_irq_sysclass,</div><div class='ctx'> 	}, {</div><div class='add'>+		.cls	= &amp;pxa2xx_mfp_sysclass,</div><div class='add'>+	}, {</div><div class='ctx'> 		.cls	= &amp;pxa_gpio_sysclass,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='hunk'>@@ -338,11 +332,7 @@ static int __init pxa25x_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int i, ret = 0;</div><div class='ctx'> </div><div class='del'>-	/* Only add HWUART for PXA255/26x; PXA210/250/27x do not have it. */</div><div class='del'>-	if (cpu_is_pxa255())</div><div class='del'>-		clks_register(&amp;pxa25x_hwuart_clk, 1);</div><div class='del'>-</div><div class='del'>-	if (cpu_is_pxa21x() || cpu_is_pxa25x()) {</div><div class='add'>+	if (cpu_is_pxa25x()) {</div><div class='ctx'> </div><div class='ctx'> 		reset_status = RCSR;</div><div class='ctx'> </div><div class='hunk'>@@ -365,9 +355,11 @@ static int __init pxa25x_init(void)</div><div class='ctx'> 			return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Only add HWUART for PXA255/26x; PXA210/250/27x do not have it. */</div><div class='del'>-	if (cpu_is_pxa255())</div><div class='add'>+	/* Only add HWUART for PXA255/26x; PXA210/250 do not have it. */</div><div class='add'>+	if (cpu_is_pxa255() || cpu_is_pxa26x()) {</div><div class='add'>+		clks_register(&amp;pxa25x_hwuart_clk, 1);</div><div class='ctx'> 		ret = platform_device_register(&amp;pxa_device_hwuart);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c<br/>index f9f6a9c31f4b..3e4ab2279c99 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/pxa27x.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pxa/pxa27x.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/pxa27x.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/pxa27x.c</a></div><div class='hunk'>@@ -34,6 +34,13 @@</div><div class='ctx'> #include "devices.h"</div><div class='ctx'> #include "clock.h"</div><div class='ctx'> </div><div class='add'>+void pxa27x_clear_otgph(void)</div><div class='add'>+{</div><div class='add'>+	if (cpu_is_pxa27x() &amp;&amp; (PSSR &amp; PSSR_OTGPH))</div><div class='add'>+		PSSR |= PSSR_OTGPH;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(pxa27x_clear_otgph);</div><div class='add'>+</div><div class='ctx'> /* Crystal clock: 13MHz */</div><div class='ctx'> #define BASE_CLK	13000000</div><div class='ctx'> </div><div class='hunk'>@@ -183,36 +190,18 @@ static struct clk pxa27x_clks[] = {</div><div class='ctx'>  * More ones like CP and general purpose register values are preserved</div><div class='ctx'>  * with the stack pointer in sleep.S.</div><div class='ctx'>  */</div><div class='del'>-enum {	SLEEP_SAVE_PGSR0, SLEEP_SAVE_PGSR1, SLEEP_SAVE_PGSR2, SLEEP_SAVE_PGSR3,</div><div class='del'>-</div><div class='del'>-	SLEEP_SAVE_GAFR0_L, SLEEP_SAVE_GAFR0_U,</div><div class='del'>-	SLEEP_SAVE_GAFR1_L, SLEEP_SAVE_GAFR1_U,</div><div class='del'>-	SLEEP_SAVE_GAFR2_L, SLEEP_SAVE_GAFR2_U,</div><div class='del'>-	SLEEP_SAVE_GAFR3_L, SLEEP_SAVE_GAFR3_U,</div><div class='del'>-</div><div class='add'>+enum {</div><div class='ctx'> 	SLEEP_SAVE_PSTR,</div><div class='del'>-</div><div class='ctx'> 	SLEEP_SAVE_CKEN,</div><div class='del'>-</div><div class='ctx'> 	SLEEP_SAVE_MDREFR,</div><div class='del'>-	SLEEP_SAVE_PWER, SLEEP_SAVE_PCFR, SLEEP_SAVE_PRER,</div><div class='del'>-	SLEEP_SAVE_PFER, SLEEP_SAVE_PKWR,</div><div class='del'>-</div><div class='add'>+	SLEEP_SAVE_PCFR,</div><div class='ctx'> 	SLEEP_SAVE_COUNT</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void pxa27x_cpu_pm_save(unsigned long *sleep_save)</div><div class='ctx'> {</div><div class='del'>-	SAVE(PGSR0); SAVE(PGSR1); SAVE(PGSR2); SAVE(PGSR3);</div><div class='del'>-</div><div class='del'>-	SAVE(GAFR0_L); SAVE(GAFR0_U);</div><div class='del'>-	SAVE(GAFR1_L); SAVE(GAFR1_U);</div><div class='del'>-	SAVE(GAFR2_L); SAVE(GAFR2_U);</div><div class='del'>-	SAVE(GAFR3_L); SAVE(GAFR3_U);</div><div class='del'>-</div><div class='ctx'> 	SAVE(MDREFR);</div><div class='del'>-	SAVE(PWER); SAVE(PCFR); SAVE(PRER);</div><div class='del'>-	SAVE(PFER); SAVE(PKWR);</div><div class='add'>+	SAVE(PCFR);</div><div class='ctx'> </div><div class='ctx'> 	SAVE(CKEN);</div><div class='ctx'> 	SAVE(PSTR);</div><div class='hunk'>@@ -220,24 +209,12 @@ void pxa27x_cpu_pm_save(unsigned long *sleep_save)</div><div class='ctx'> </div><div class='ctx'> void pxa27x_cpu_pm_restore(unsigned long *sleep_save)</div><div class='ctx'> {</div><div class='del'>-	/* ensure not to come back here if it wasn't intended */</div><div class='del'>-	PSPR = 0;</div><div class='del'>-</div><div class='del'>-	/* restore registers */</div><div class='del'>-	RESTORE(GAFR0_L); RESTORE(GAFR0_U);</div><div class='del'>-	RESTORE(GAFR1_L); RESTORE(GAFR1_U);</div><div class='del'>-	RESTORE(GAFR2_L); RESTORE(GAFR2_U);</div><div class='del'>-	RESTORE(GAFR3_L); RESTORE(GAFR3_U);</div><div class='del'>-	RESTORE(PGSR0); RESTORE(PGSR1); RESTORE(PGSR2); RESTORE(PGSR3);</div><div class='del'>-</div><div class='ctx'> 	RESTORE(MDREFR);</div><div class='del'>-	RESTORE(PWER); RESTORE(PCFR); RESTORE(PRER);</div><div class='del'>-	RESTORE(PFER); RESTORE(PKWR);</div><div class='add'>+	RESTORE(PCFR);</div><div class='ctx'> </div><div class='ctx'> 	PSSR = PSSR_RDH | PSSR_PH;</div><div class='ctx'> </div><div class='ctx'> 	RESTORE(CKEN);</div><div class='del'>-</div><div class='ctx'> 	RESTORE(PSTR);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -259,8 +236,6 @@ void pxa27x_cpu_pm_enter(suspend_state_t state)</div><div class='ctx'> 		pxa_cpu_standby();</div><div class='ctx'> 		break;</div><div class='ctx'> 	case PM_SUSPEND_MEM:</div><div class='del'>-		/* set resume return address */</div><div class='del'>-		PSPR = virt_to_phys(pxa_cpu_resume);</div><div class='ctx'> 		pxa27x_cpu_suspend(PWRMODE_SLEEP);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -271,12 +246,27 @@ static int pxa27x_cpu_pm_valid(suspend_state_t state)</div><div class='ctx'> 	return state == PM_SUSPEND_MEM || state == PM_SUSPEND_STANDBY;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int pxa27x_cpu_pm_prepare(void)</div><div class='add'>+{</div><div class='add'>+	/* set resume return address */</div><div class='add'>+	PSPR = virt_to_phys(pxa_cpu_resume);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pxa27x_cpu_pm_finish(void)</div><div class='add'>+{</div><div class='add'>+	/* ensure not to come back here if it wasn't intended */</div><div class='add'>+	PSPR = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct pxa_cpu_pm_fns pxa27x_cpu_pm_fns = {</div><div class='ctx'> 	.save_count	= SLEEP_SAVE_COUNT,</div><div class='ctx'> 	.save		= pxa27x_cpu_pm_save,</div><div class='ctx'> 	.restore	= pxa27x_cpu_pm_restore,</div><div class='ctx'> 	.valid		= pxa27x_cpu_pm_valid,</div><div class='ctx'> 	.enter		= pxa27x_cpu_pm_enter,</div><div class='add'>+	.prepare	= pxa27x_cpu_pm_prepare,</div><div class='add'>+	.finish		= pxa27x_cpu_pm_finish,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void __init pxa27x_init_pm(void)</div><div class='hunk'>@@ -349,7 +339,7 @@ struct platform_device pxa27x_device_i2c_power = {</div><div class='ctx'> 	.num_resources	= ARRAY_SIZE(i2c_power_resources),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-void __init pxa_set_i2c_power_info(struct i2c_pxa_platform_data *info)</div><div class='add'>+void __init pxa27x_set_i2c_power_info(struct i2c_pxa_platform_data *info)</div><div class='ctx'> {</div><div class='ctx'> 	local_irq_disable();</div><div class='ctx'> 	PCFR |= PCFR_PI2CEN;</div><div class='hunk'>@@ -376,6 +366,8 @@ static struct sys_device pxa27x_sysdev[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.cls	= &amp;pxa_irq_sysclass,</div><div class='ctx'> 	}, {</div><div class='add'>+		.cls	= &amp;pxa2xx_mfp_sysclass,</div><div class='add'>+	}, {</div><div class='ctx'> 		.cls	= &amp;pxa_gpio_sysclass,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/mach-pxa/pxa3xx.c b/arch/arm/mach-pxa/pxa3xx.c<br/>index 03cbc38103ed..b3cd5d0b0f35 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/pxa3xx.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pxa/pxa3xx.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/pxa3xx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/pxa3xx.c</a></div><div class='hunk'>@@ -203,6 +203,19 @@ static const struct clkops clk_pout_ops = {</div><div class='ctx'> 	.disable	= clk_pout_disable,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static void clk_dummy_enable(struct clk *clk)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void clk_dummy_disable(struct clk *clk)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct clkops clk_dummy_ops = {</div><div class='add'>+	.enable		= clk_dummy_enable,</div><div class='add'>+	.disable	= clk_dummy_disable,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct clk pxa3xx_clks[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.name           = "CLK_POUT",</div><div class='hunk'>@@ -211,6 +224,13 @@ static struct clk pxa3xx_clks[] = {</div><div class='ctx'> 		.delay          = 70,</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='add'>+	/* Power I2C clock is always on */</div><div class='add'>+	{</div><div class='add'>+		.name		= "I2CCLK",</div><div class='add'>+		.ops		= &amp;clk_dummy_ops,</div><div class='add'>+		.dev		= &amp;pxa3xx_device_i2c_power.dev,</div><div class='add'>+	},</div><div class='add'>+</div><div class='ctx'> 	PXA3xx_CK("LCDCLK",  LCD,    &amp;clk_pxa3xx_hsio_ops, &amp;pxa_device_fb.dev),</div><div class='ctx'> 	PXA3xx_CK("CAMCLK",  CAMERA, &amp;clk_pxa3xx_hsio_ops, NULL),</div><div class='ctx'> 	PXA3xx_CK("AC97CLK", AC97,   &amp;clk_pxa3xx_ac97_ops, NULL),</div><div class='hunk'>@@ -509,6 +529,30 @@ void __init pxa3xx_init_irq(void)</div><div class='ctx'>  * device registration specific to PXA3xx.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+static struct resource i2c_power_resources[] = {</div><div class='add'>+	{</div><div class='add'>+		.start  = 0x40f500c0,</div><div class='add'>+		.end    = 0x40f500d3,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	}, {</div><div class='add'>+		.start	= IRQ_PWRI2C,</div><div class='add'>+		.end	= IRQ_PWRI2C,</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct platform_device pxa3xx_device_i2c_power = {</div><div class='add'>+	.name		= "pxa2xx-i2c",</div><div class='add'>+	.id		= 1,</div><div class='add'>+	.resource	= i2c_power_resources,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(i2c_power_resources),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void __init pxa3xx_set_i2c_power_info(struct i2c_pxa_platform_data *info)</div><div class='add'>+{</div><div class='add'>+	pxa3xx_device_i2c_power.dev.platform_data = info;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct platform_device *devices[] __initdata = {</div><div class='ctx'> /*	&amp;pxa_device_udc,	The UDC driver is PXA25x only */</div><div class='ctx'> 	&amp;pxa_device_ffuart,</div><div class='hunk'>@@ -522,6 +566,7 @@ static struct platform_device *devices[] __initdata = {</div><div class='ctx'> 	&amp;pxa3xx_device_ssp4,</div><div class='ctx'> 	&amp;pxa27x_device_pwm0,</div><div class='ctx'> 	&amp;pxa27x_device_pwm1,</div><div class='add'>+	&amp;pxa3xx_device_i2c_power,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct sys_device pxa3xx_sysdev[] = {</div><div class='head'>diff --git a/arch/arm/mach-pxa/reset.c b/arch/arm/mach-pxa/reset.c<br/>index 9996c612c3d6..1b2af575c40f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/reset.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pxa/reset.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/reset.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/reset.c</a></div><div class='hunk'>@@ -7,7 +7,7 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/gpio.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;asm/proc-fns.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/pxa-regs.h&gt;</div><div class='hunk'>@@ -20,7 +20,7 @@ static void do_hw_reset(void);</div><div class='ctx'> </div><div class='ctx'> static int reset_gpio = -1;</div><div class='ctx'> </div><div class='del'>-int init_gpio_reset(int gpio)</div><div class='add'>+int init_gpio_reset(int gpio, int output)</div><div class='ctx'> {</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='hunk'>@@ -30,9 +30,12 @@ int init_gpio_reset(int gpio)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rc = gpio_direction_input(gpio);</div><div class='add'>+	if (output)</div><div class='add'>+		rc = gpio_direction_output(gpio, 0);</div><div class='add'>+	else</div><div class='add'>+		rc = gpio_direction_input(gpio);</div><div class='ctx'> 	if (rc) {</div><div class='del'>-		printk(KERN_ERR "Can't configure reset_gpio for input\n");</div><div class='add'>+		printk(KERN_ERR "Can't configure reset_gpio\n");</div><div class='ctx'> 		gpio_free(gpio);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/arm/mach-pxa/sharpsl_pm.c b/arch/arm/mach-pxa/sharpsl_pm.c<br/>index e804ae09370c..15c2f1a8623b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/sharpsl_pm.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pxa/sharpsl_pm.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/sharpsl_pm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/sharpsl_pm.c</a></div><div class='hunk'>@@ -116,24 +116,20 @@ struct battery_thresh  spitz_battery_levels_noac[] = {</div><div class='ctx'> 	{   0,   0},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* MAX1111 Commands */</div><div class='del'>-#define MAXCTRL_PD0      1u &lt;&lt; 0</div><div class='del'>-#define MAXCTRL_PD1      1u &lt;&lt; 1</div><div class='del'>-#define MAXCTRL_SGL      1u &lt;&lt; 2</div><div class='del'>-#define MAXCTRL_UNI      1u &lt;&lt; 3</div><div class='del'>-#define MAXCTRL_SEL_SH   4</div><div class='del'>-#define MAXCTRL_STR      1u &lt;&lt; 7</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Read MAX1111 ADC</div><div class='ctx'>  */</div><div class='add'>+extern int max1111_read_channel(int);</div><div class='add'>+</div><div class='ctx'> int sharpsl_pm_pxa_read_max1111(int channel)</div><div class='ctx'> {</div><div class='ctx'> 	if (machine_is_tosa()) // Ugly, better move this function into another module</div><div class='ctx'> 	    return 0;</div><div class='ctx'> </div><div class='del'>-	return corgi_ssp_max1111_get((channel &lt;&lt; MAXCTRL_SEL_SH) | MAXCTRL_PD0 | MAXCTRL_PD1</div><div class='del'>-			| MAXCTRL_SGL | MAXCTRL_UNI | MAXCTRL_STR);</div><div class='add'>+	/* max1111 accepts channels from 0-3, however,</div><div class='add'>+	 * it is encoded from 0-7 here in the code.</div><div class='add'>+	 */</div><div class='add'>+	return max1111_read_channel(channel &gt;&gt; 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void sharpsl_pm_pxa_init(void)</div><div class='head'>diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c<br/>index b569f3b4cf3a..524f656dc56d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/spitz.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pxa/spitz.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/spitz.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/spitz.c</a></div><div class='hunk'>@@ -19,16 +19,23 @@</div><div class='ctx'> #include &lt;linux/major.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/gpio.h&gt;</div><div class='add'>+#include &lt;linux/leds.h&gt;</div><div class='ctx'> #include &lt;linux/mmc/host.h&gt;</div><div class='ctx'> #include &lt;linux/pm.h&gt;</div><div class='ctx'> #include &lt;linux/backlight.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/i2c/pca953x.h&gt;</div><div class='add'>+#include &lt;linux/spi/spi.h&gt;</div><div class='add'>+#include &lt;linux/spi/ads7846.h&gt;</div><div class='add'>+#include &lt;linux/spi/corgi_lcd.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/memory.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='hunk'>@@ -37,7 +44,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/pxa-regs.h&gt;</div><div class='ctx'> #include &lt;mach/pxa2xx-regs.h&gt;</div><div class='del'>-#include &lt;mach/pxa2xx-gpio.h&gt;</div><div class='add'>+#include &lt;mach/mfp-pxa27x.h&gt;</div><div class='ctx'> #include &lt;mach/pxa27x-udc.h&gt;</div><div class='ctx'> #include &lt;mach/reset.h&gt;</div><div class='ctx'> #include &lt;mach/i2c.h&gt;</div><div class='hunk'>@@ -46,7 +53,7 @@</div><div class='ctx'> #include &lt;mach/ohci.h&gt;</div><div class='ctx'> #include &lt;mach/udc.h&gt;</div><div class='ctx'> #include &lt;mach/pxafb.h&gt;</div><div class='del'>-#include &lt;mach/akita.h&gt;</div><div class='add'>+#include &lt;mach/pxa2xx_spi.h&gt;</div><div class='ctx'> #include &lt;mach/spitz.h&gt;</div><div class='ctx'> #include &lt;mach/sharpsl.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -57,6 +64,66 @@</div><div class='ctx'> #include "devices.h"</div><div class='ctx'> #include "sharpsl.h"</div><div class='ctx'> </div><div class='add'>+static unsigned long spitz_pin_config[] __initdata = {</div><div class='add'>+	/* Chip Selects */</div><div class='add'>+	GPIO78_nCS_2,	/* SCOOP #2 */</div><div class='add'>+	GPIO80_nCS_4,	/* SCOOP #1 */</div><div class='add'>+</div><div class='add'>+	/* LCD - 16bpp Active TFT */</div><div class='add'>+	GPIO58_LCD_LDD_0,</div><div class='add'>+	GPIO59_LCD_LDD_1,</div><div class='add'>+	GPIO60_LCD_LDD_2,</div><div class='add'>+	GPIO61_LCD_LDD_3,</div><div class='add'>+	GPIO62_LCD_LDD_4,</div><div class='add'>+	GPIO63_LCD_LDD_5,</div><div class='add'>+	GPIO64_LCD_LDD_6,</div><div class='add'>+	GPIO65_LCD_LDD_7,</div><div class='add'>+	GPIO66_LCD_LDD_8,</div><div class='add'>+	GPIO67_LCD_LDD_9,</div><div class='add'>+	GPIO68_LCD_LDD_10,</div><div class='add'>+	GPIO69_LCD_LDD_11,</div><div class='add'>+	GPIO70_LCD_LDD_12,</div><div class='add'>+	GPIO71_LCD_LDD_13,</div><div class='add'>+	GPIO72_LCD_LDD_14,</div><div class='add'>+	GPIO73_LCD_LDD_15,</div><div class='add'>+	GPIO74_LCD_FCLK,</div><div class='add'>+	GPIO75_LCD_LCLK,</div><div class='add'>+	GPIO76_LCD_PCLK,</div><div class='add'>+</div><div class='add'>+	/* PC Card */</div><div class='add'>+	GPIO48_nPOE,</div><div class='add'>+	GPIO49_nPWE,</div><div class='add'>+	GPIO50_nPIOR,</div><div class='add'>+	GPIO51_nPIOW,</div><div class='add'>+	GPIO85_nPCE_1,</div><div class='add'>+	GPIO54_nPCE_2,</div><div class='add'>+	GPIO79_PSKTSEL,</div><div class='add'>+	GPIO55_nPREG,</div><div class='add'>+	GPIO56_nPWAIT,</div><div class='add'>+	GPIO57_nIOIS16,</div><div class='add'>+</div><div class='add'>+	/* MMC */</div><div class='add'>+	GPIO32_MMC_CLK,</div><div class='add'>+	GPIO112_MMC_CMD,</div><div class='add'>+	GPIO92_MMC_DAT_0,</div><div class='add'>+	GPIO109_MMC_DAT_1,</div><div class='add'>+	GPIO110_MMC_DAT_2,</div><div class='add'>+	GPIO111_MMC_DAT_3,</div><div class='add'>+</div><div class='add'>+	/* GPIOs */</div><div class='add'>+	GPIO9_GPIO,	/* SPITZ_GPIO_nSD_DETECT */</div><div class='add'>+	GPIO81_GPIO,	/* SPITZ_GPIO_nSD_WP */</div><div class='add'>+	GPIO41_GPIO,	/* SPITZ_GPIO_USB_CONNECT */</div><div class='add'>+	GPIO37_GPIO,	/* SPITZ_GPIO_USB_HOST */</div><div class='add'>+	GPIO35_GPIO,	/* SPITZ_GPIO_USB_DEVICE */</div><div class='add'>+	GPIO22_GPIO,	/* SPITZ_GPIO_HSYNC */</div><div class='add'>+	GPIO94_GPIO,	/* SPITZ_GPIO_CF_CD */</div><div class='add'>+	GPIO105_GPIO,	/* SPITZ_GPIO_CF_IRQ */</div><div class='add'>+	GPIO106_GPIO,	/* SPITZ_GPIO_CF2_IRQ */</div><div class='add'>+</div><div class='add'>+	GPIO1_GPIO | WAKEUP_ON_EDGE_RISE,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Spitz SCOOP Device #1</div><div class='ctx'>  */</div><div class='hunk'>@@ -69,10 +136,11 @@ static struct resource spitz_scoop_resources[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct scoop_config spitz_scoop_setup = {</div><div class='del'>-	.io_dir 	= SPITZ_SCP_IO_DIR,</div><div class='add'>+	.io_dir		= SPITZ_SCP_IO_DIR,</div><div class='ctx'> 	.io_out		= SPITZ_SCP_IO_OUT,</div><div class='del'>-	.suspend_clr = SPITZ_SCP_SUS_CLR,</div><div class='del'>-	.suspend_set = SPITZ_SCP_SUS_SET,</div><div class='add'>+	.suspend_clr	= SPITZ_SCP_SUS_CLR,</div><div class='add'>+	.suspend_set	= SPITZ_SCP_SUS_SET,</div><div class='add'>+	.gpio_base	= SPITZ_SCP_GPIO_BASE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct platform_device spitzscoop_device = {</div><div class='hunk'>@@ -97,10 +165,11 @@ static struct resource spitz_scoop2_resources[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct scoop_config spitz_scoop2_setup = {</div><div class='del'>-	.io_dir 	= SPITZ_SCP2_IO_DIR,</div><div class='add'>+	.io_dir		= SPITZ_SCP2_IO_DIR,</div><div class='ctx'> 	.io_out		= SPITZ_SCP2_IO_OUT,</div><div class='del'>-	.suspend_clr = SPITZ_SCP2_SUS_CLR,</div><div class='del'>-	.suspend_set = SPITZ_SCP2_SUS_SET,</div><div class='add'>+	.suspend_clr	= SPITZ_SCP2_SUS_CLR,</div><div class='add'>+	.suspend_set	= SPITZ_SCP2_SUS_SET,</div><div class='add'>+	.gpio_base	= SPITZ_SCP2_GPIO_BASE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct platform_device spitzscoop2_device = {</div><div class='hunk'>@@ -122,7 +191,7 @@ static void spitz_card_pwr_ctrl(int device, unsigned short new_cpr)</div><div class='ctx'> 	unsigned short cpr = read_scoop_reg(&amp;spitzscoop_device.dev, SCOOP_CPR);</div><div class='ctx'> </div><div class='ctx'> 	if (new_cpr &amp; 0x0007) {</div><div class='del'>-	        set_scoop_gpio(&amp;spitzscoop_device.dev, SPITZ_SCP_CF_POWER);</div><div class='add'>+		gpio_set_value(SPITZ_GPIO_CF_POWER, 1);</div><div class='ctx'> 		if (!(cpr &amp; 0x0002) &amp;&amp; !(cpr &amp; 0x0004))</div><div class='ctx'> 		        mdelay(5);</div><div class='ctx'> 		if (device == SPITZ_PWR_CF)</div><div class='hunk'>@@ -138,34 +207,13 @@ static void spitz_card_pwr_ctrl(int device, unsigned short new_cpr)</div><div class='ctx'> 		if (!(cpr &amp; 0x0002) &amp;&amp; !(cpr &amp; 0x0004)) {</div><div class='ctx'> 			write_scoop_reg(&amp;spitzscoop_device.dev, SCOOP_CPR, 0x0000);</div><div class='ctx'> 		        mdelay(1);</div><div class='del'>-		        reset_scoop_gpio(&amp;spitzscoop_device.dev, SPITZ_SCP_CF_POWER);</div><div class='add'>+			gpio_set_value(SPITZ_GPIO_CF_POWER, 0);</div><div class='ctx'> 		} else {</div><div class='ctx'> 		        write_scoop_reg(&amp;spitzscoop_device.dev, SCOOP_CPR, cpr | new_cpr);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void spitz_pcmcia_init(void)</div><div class='del'>-{</div><div class='del'>-	/* Setup default state of GPIO outputs</div><div class='del'>-	   before we enable them as outputs. */</div><div class='del'>-	GPSR(GPIO48_nPOE) = GPIO_bit(GPIO48_nPOE) |</div><div class='del'>-		GPIO_bit(GPIO49_nPWE) |	GPIO_bit(GPIO50_nPIOR) |</div><div class='del'>-		GPIO_bit(GPIO51_nPIOW) | GPIO_bit(GPIO54_nPCE_2);</div><div class='del'>-	GPSR(GPIO85_nPCE_1) = GPIO_bit(GPIO85_nPCE_1);</div><div class='del'>-</div><div class='del'>-	pxa_gpio_mode(GPIO48_nPOE_MD);</div><div class='del'>-	pxa_gpio_mode(GPIO49_nPWE_MD);</div><div class='del'>-	pxa_gpio_mode(GPIO50_nPIOR_MD);</div><div class='del'>-	pxa_gpio_mode(GPIO51_nPIOW_MD);</div><div class='del'>-	pxa_gpio_mode(GPIO55_nPREG_MD);</div><div class='del'>-	pxa_gpio_mode(GPIO56_nPWAIT_MD);</div><div class='del'>-	pxa_gpio_mode(GPIO57_nIOIS16_MD);</div><div class='del'>-	pxa_gpio_mode(GPIO85_nPCE_1_MD);</div><div class='del'>-	pxa_gpio_mode(GPIO54_nPCE_2_MD);</div><div class='del'>-	pxa_gpio_mode(GPIO104_pSKTSEL_MD);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void spitz_pcmcia_pwr(struct device *scoop, unsigned short cpr, int nr)</div><div class='ctx'> {</div><div class='ctx'> 	/* Only need to override behaviour for slot 0 */</div><div class='hunk'>@@ -191,165 +239,169 @@ static struct scoop_pcmcia_dev spitz_pcmcia_scoop[] = {</div><div class='ctx'> static struct scoop_pcmcia_config spitz_pcmcia_config = {</div><div class='ctx'> 	.devs         = &amp;spitz_pcmcia_scoop[0],</div><div class='ctx'> 	.num_devs     = 2,</div><div class='del'>-	.pcmcia_init  = spitz_pcmcia_init,</div><div class='ctx'> 	.power_ctrl   = spitz_pcmcia_pwr,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(spitzscoop_device);</div><div class='ctx'> EXPORT_SYMBOL(spitzscoop2_device);</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /*</div><div class='del'>- * Spitz SSP Device</div><div class='del'>- *</div><div class='del'>- * Set the parent as the scoop device because a lot of SSP devices</div><div class='del'>- * also use scoop functions and this makes the power up/down order</div><div class='del'>- * work correctly.</div><div class='add'>+ * Spitz Keyboard Device</div><div class='ctx'>  */</div><div class='del'>-struct platform_device spitzssp_device = {</div><div class='del'>-	.name		= "corgi-ssp",</div><div class='del'>-	.dev		= {</div><div class='del'>- 		.parent = &amp;spitzscoop_device.dev,</div><div class='del'>-	},</div><div class='add'>+static struct platform_device spitzkbd_device = {</div><div class='add'>+	.name		= "spitz-keyboard",</div><div class='ctx'> 	.id		= -1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct corgissp_machinfo spitz_ssp_machinfo = {</div><div class='del'>-	.port		= 2,</div><div class='del'>-	.cs_lcdcon	= SPITZ_GPIO_LCDCON_CS,</div><div class='del'>-	.cs_ads7846	= SPITZ_GPIO_ADS7846_CS,</div><div class='del'>-	.cs_max1111	= SPITZ_GPIO_MAX1111_CS,</div><div class='del'>-	.clk_lcdcon	= 520,</div><div class='del'>-	.clk_ads7846	= 14,</div><div class='del'>-	.clk_max1111	= 56,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Spitz Backlight Device</div><div class='add'>+ * Spitz LEDs</div><div class='ctx'>  */</div><div class='del'>-static void spitz_bl_kick_battery(void)</div><div class='del'>-{</div><div class='del'>-	void (*kick_batt)(void);</div><div class='del'>-</div><div class='del'>-	kick_batt = symbol_get(sharpsl_battery_kick);</div><div class='del'>-	if (kick_batt) {</div><div class='del'>-		kick_batt();</div><div class='del'>-		symbol_put(sharpsl_battery_kick);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct generic_bl_info spitz_bl_machinfo = {</div><div class='del'>-	.name = "corgi-bl",</div><div class='del'>-	.default_intensity = 0x1f,</div><div class='del'>-	.limit_mask = 0x0b,</div><div class='del'>-	.max_intensity = 0x2f,</div><div class='del'>-	.kick_battery = spitz_bl_kick_battery,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct platform_device spitzbl_device = {</div><div class='del'>-	.name		= "generic-bl",</div><div class='del'>-	.dev		= {</div><div class='del'>- 		.platform_data	= &amp;spitz_bl_machinfo,</div><div class='add'>+static struct gpio_led spitz_gpio_leds[] = {</div><div class='add'>+	{</div><div class='add'>+		.name			= "spitz:amber:charge",</div><div class='add'>+		.default_trigger	= "sharpsl-charge",</div><div class='add'>+		.gpio			= SPITZ_GPIO_LED_ORANGE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name			= "spitz:green:hddactivity",</div><div class='add'>+		.default_trigger	= "ide-disk",</div><div class='add'>+		.gpio			= SPITZ_GPIO_LED_GREEN,</div><div class='ctx'> 	},</div><div class='del'>-	.id		= -1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Spitz Keyboard Device</div><div class='del'>- */</div><div class='del'>-static struct platform_device spitzkbd_device = {</div><div class='del'>-	.name		= "spitz-keyboard",</div><div class='del'>-	.id		= -1,</div><div class='add'>+static struct gpio_led_platform_data spitz_gpio_leds_info = {</div><div class='add'>+	.leds		= spitz_gpio_leds,</div><div class='add'>+	.num_leds	= ARRAY_SIZE(spitz_gpio_leds),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Spitz LEDs</div><div class='del'>- */</div><div class='ctx'> static struct platform_device spitzled_device = {</div><div class='del'>-	.name		= "spitz-led",</div><div class='add'>+	.name		= "leds-gpio",</div><div class='ctx'> 	.id		= -1,</div><div class='add'>+	.dev		= {</div><div class='add'>+		.platform_data = &amp;spitz_gpio_leds_info,</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Spitz Touch Screen Device</div><div class='del'>- */</div><div class='add'>+#if defined(CONFIG_SPI_PXA2XX) || defined(CONFIG_SPI_PXA2XX_MODULE)</div><div class='add'>+static struct pxa2xx_spi_master spitz_spi_info = {</div><div class='add'>+	.num_chipselect	= 3,</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-static unsigned long (*get_hsync_invperiod)(struct device *dev);</div><div class='add'>+static struct ads7846_platform_data spitz_ads7846_info = {</div><div class='add'>+	.model			= 7846,</div><div class='add'>+	.vref_delay_usecs	= 100,</div><div class='add'>+	.x_plate_ohms		= 419,</div><div class='add'>+	.y_plate_ohms		= 486,</div><div class='add'>+	.gpio_pendown		= SPITZ_GPIO_TP_INT,</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-static void inline sharpsl_wait_sync(int gpio)</div><div class='add'>+static void spitz_ads7846_cs(u32 command)</div><div class='ctx'> {</div><div class='del'>-	while((GPLR(gpio) &amp; GPIO_bit(gpio)) == 0);</div><div class='del'>-	while((GPLR(gpio) &amp; GPIO_bit(gpio)) != 0);</div><div class='add'>+	gpio_set_value(SPITZ_GPIO_ADS7846_CS, !(command == PXA2XX_CS_ASSERT));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct device *spitz_pxafb_dev;</div><div class='add'>+static struct pxa2xx_spi_chip spitz_ads7846_chip = {</div><div class='add'>+	.cs_control		= spitz_ads7846_cs,</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-static int is_pxafb_device(struct device * dev, void * data)</div><div class='add'>+static void spitz_bl_kick_battery(void)</div><div class='ctx'> {</div><div class='del'>-	struct platform_device *pdev = container_of(dev, struct platform_device, dev);</div><div class='del'>-</div><div class='del'>-	return (strncmp(pdev-&gt;name, "pxa2xx-fb", 9) == 0);</div><div class='del'>-}</div><div class='add'>+	void (*kick_batt)(void);</div><div class='ctx'> </div><div class='del'>-static unsigned long spitz_get_hsync_invperiod(void)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_FB_PXA</div><div class='del'>-	if (!spitz_pxafb_dev) {</div><div class='del'>-		spitz_pxafb_dev = bus_find_device(&amp;platform_bus_type, NULL, NULL, is_pxafb_device);</div><div class='del'>-		if (!spitz_pxafb_dev)</div><div class='del'>-			return 0;</div><div class='add'>+	kick_batt = symbol_get(sharpsl_battery_kick);</div><div class='add'>+	if (kick_batt) {</div><div class='add'>+		kick_batt();</div><div class='add'>+		symbol_put(sharpsl_battery_kick);</div><div class='ctx'> 	}</div><div class='del'>-	if (!get_hsync_invperiod)</div><div class='del'>-		get_hsync_invperiod = symbol_get(pxafb_get_hsync_time);</div><div class='del'>-	if (!get_hsync_invperiod)</div><div class='del'>-#endif</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return get_hsync_invperiod(spitz_pxafb_dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void spitz_put_hsync(void)</div><div class='del'>-{</div><div class='del'>-	put_device(spitz_pxafb_dev);</div><div class='del'>-	if (get_hsync_invperiod)</div><div class='del'>-		symbol_put(pxafb_get_hsync_time);</div><div class='del'>-	spitz_pxafb_dev = NULL;</div><div class='del'>-	get_hsync_invperiod = NULL;</div><div class='del'>-}</div><div class='add'>+static struct corgi_lcd_platform_data spitz_lcdcon_info = {</div><div class='add'>+	.init_mode		= CORGI_LCD_MODE_VGA,</div><div class='add'>+	.max_intensity		= 0x2f,</div><div class='add'>+	.default_intensity	= 0x1f,</div><div class='add'>+	.limit_mask		= 0x0b,</div><div class='add'>+	.gpio_backlight_cont	= SPITZ_GPIO_BACKLIGHT_CONT,</div><div class='add'>+	.gpio_backlight_on	= SPITZ_GPIO_BACKLIGHT_ON,</div><div class='add'>+	.kick_battery		= spitz_bl_kick_battery,</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-static void spitz_wait_hsync(void)</div><div class='add'>+static void spitz_lcdcon_cs(u32 command)</div><div class='ctx'> {</div><div class='del'>-	sharpsl_wait_sync(SPITZ_GPIO_HSYNC);</div><div class='add'>+	gpio_set_value(SPITZ_GPIO_LCDCON_CS, !(command == PXA2XX_CS_ASSERT));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct resource spitzts_resources[] = {</div><div class='del'>-	[0] = {</div><div class='del'>-		.start		= SPITZ_IRQ_GPIO_TP_INT,</div><div class='del'>-		.end		= SPITZ_IRQ_GPIO_TP_INT,</div><div class='del'>-		.flags		= IORESOURCE_IRQ,</div><div class='del'>-	},</div><div class='add'>+static struct pxa2xx_spi_chip spitz_lcdcon_chip = {</div><div class='add'>+	.cs_control	= spitz_lcdcon_cs,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct corgits_machinfo  spitz_ts_machinfo = {</div><div class='del'>-	.get_hsync_invperiod = spitz_get_hsync_invperiod,</div><div class='del'>-	.put_hsync           = spitz_put_hsync,</div><div class='del'>-	.wait_hsync          = spitz_wait_hsync,</div><div class='add'>+static void spitz_max1111_cs(u32 command)</div><div class='add'>+{</div><div class='add'>+	gpio_set_value(SPITZ_GPIO_MAX1111_CS, !(command == PXA2XX_CS_ASSERT));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct pxa2xx_spi_chip spitz_max1111_chip = {</div><div class='add'>+	.cs_control	= spitz_max1111_cs,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct platform_device spitzts_device = {</div><div class='del'>-	.name		= "corgi-ts",</div><div class='del'>-	.dev		= {</div><div class='del'>- 		.parent = &amp;spitzssp_device.dev,</div><div class='del'>-		.platform_data	= &amp;spitz_ts_machinfo,</div><div class='add'>+static struct spi_board_info spitz_spi_devices[] = {</div><div class='add'>+	{</div><div class='add'>+		.modalias	= "ads7846",</div><div class='add'>+		.max_speed_hz	= 1200000,</div><div class='add'>+		.bus_num	= 2,</div><div class='add'>+		.chip_select	= 0,</div><div class='add'>+		.platform_data	= &amp;spitz_ads7846_info,</div><div class='add'>+		.controller_data= &amp;spitz_ads7846_chip,</div><div class='add'>+		.irq		= gpio_to_irq(SPITZ_GPIO_TP_INT),</div><div class='add'>+	}, {</div><div class='add'>+		.modalias	= "corgi-lcd",</div><div class='add'>+		.max_speed_hz	= 50000,</div><div class='add'>+		.bus_num	= 2,</div><div class='add'>+		.chip_select	= 1,</div><div class='add'>+		.platform_data	= &amp;spitz_lcdcon_info,</div><div class='add'>+		.controller_data= &amp;spitz_lcdcon_chip,</div><div class='add'>+	}, {</div><div class='add'>+		.modalias	= "max1111",</div><div class='add'>+		.max_speed_hz	= 450000,</div><div class='add'>+		.bus_num	= 2,</div><div class='add'>+		.chip_select	= 2,</div><div class='add'>+		.controller_data= &amp;spitz_max1111_chip,</div><div class='ctx'> 	},</div><div class='del'>-	.id		= -1,</div><div class='del'>-	.num_resources	= ARRAY_SIZE(spitzts_resources),</div><div class='del'>-	.resource	= spitzts_resources,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static void __init spitz_init_spi(void)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = gpio_request(SPITZ_GPIO_ADS7846_CS, "ADS7846_CS");</div><div class='add'>+	if (err)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	err = gpio_request(SPITZ_GPIO_LCDCON_CS, "LCDCON_CS");</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_free_1;</div><div class='add'>+</div><div class='add'>+	err = gpio_request(SPITZ_GPIO_MAX1111_CS, "MAX1111_CS");</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_free_2;</div><div class='add'>+</div><div class='add'>+	if (machine_is_akita()) {</div><div class='add'>+		spitz_lcdcon_info.gpio_backlight_cont = AKITA_GPIO_BACKLIGHT_CONT;</div><div class='add'>+		spitz_lcdcon_info.gpio_backlight_on = AKITA_GPIO_BACKLIGHT_ON;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pxa2xx_set_spi_info(2, &amp;spitz_spi_info);</div><div class='add'>+	spi_register_board_info(ARRAY_AND_SIZE(spitz_spi_devices));</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+err_free_2:</div><div class='add'>+	gpio_free(SPITZ_GPIO_LCDCON_CS);</div><div class='add'>+err_free_1:</div><div class='add'>+	gpio_free(SPITZ_GPIO_ADS7846_CS);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline void spitz_init_spi(void) {}</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * MMC/SD Device</div><div class='hunk'>@@ -364,24 +416,35 @@ static int spitz_mci_init(struct device *dev, irq_handler_t spitz_detect_int, vo</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	/* setup GPIO for PXA27x MMC controller	*/</div><div class='del'>-	pxa_gpio_mode(GPIO32_MMCCLK_MD);</div><div class='del'>-	pxa_gpio_mode(GPIO112_MMCCMD_MD);</div><div class='del'>-	pxa_gpio_mode(GPIO92_MMCDAT0_MD);</div><div class='del'>-	pxa_gpio_mode(GPIO109_MMCDAT1_MD);</div><div class='del'>-	pxa_gpio_mode(GPIO110_MMCDAT2_MD);</div><div class='del'>-	pxa_gpio_mode(GPIO111_MMCDAT3_MD);</div><div class='del'>-	pxa_gpio_mode(SPITZ_GPIO_nSD_DETECT | GPIO_IN);</div><div class='del'>-	pxa_gpio_mode(SPITZ_GPIO_nSD_WP | GPIO_IN);</div><div class='add'>+	err = gpio_request(SPITZ_GPIO_nSD_DETECT, "nSD_DETECT");</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_out;</div><div class='add'>+</div><div class='add'>+	err = gpio_request(SPITZ_GPIO_nSD_WP, "nSD_WP");</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_free_1;</div><div class='add'>+</div><div class='add'>+	gpio_direction_input(SPITZ_GPIO_nSD_DETECT);</div><div class='add'>+	gpio_direction_input(SPITZ_GPIO_nSD_WP);</div><div class='ctx'> </div><div class='ctx'> 	spitz_mci_platform_data.detect_delay = msecs_to_jiffies(250);</div><div class='ctx'> </div><div class='ctx'> 	err = request_irq(SPITZ_IRQ_GPIO_nSD_DETECT, spitz_detect_int,</div><div class='del'>-			  IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,</div><div class='add'>+			  IRQF_DISABLED | IRQF_TRIGGER_RISING |</div><div class='add'>+			  IRQF_TRIGGER_FALLING,</div><div class='ctx'> 			  "MMC card detect", data);</div><div class='del'>-	if (err)</div><div class='del'>-		printk(KERN_ERR "spitz_mci_init: MMC/SD: can't request MMC card detect IRQ\n");</div><div class='add'>+	if (err) {</div><div class='add'>+		pr_err("%s: MMC/SD: can't request MMC card detect IRQ\n",</div><div class='add'>+				__func__);</div><div class='add'>+		goto err_free_2;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='ctx'> </div><div class='add'>+err_free_2:</div><div class='add'>+	gpio_free(SPITZ_GPIO_nSD_WP);</div><div class='add'>+err_free_1:</div><div class='add'>+	gpio_free(SPITZ_GPIO_nSD_DETECT);</div><div class='add'>+err_out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -397,12 +460,14 @@ static void spitz_mci_setpower(struct device *dev, unsigned int vdd)</div><div class='ctx'> </div><div class='ctx'> static int spitz_mci_get_ro(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	return GPLR(SPITZ_GPIO_nSD_WP) &amp; GPIO_bit(SPITZ_GPIO_nSD_WP);</div><div class='add'>+	return gpio_get_value(SPITZ_GPIO_nSD_WP);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void spitz_mci_exit(struct device *dev, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	free_irq(SPITZ_IRQ_GPIO_nSD_DETECT, data);</div><div class='add'>+	gpio_free(SPITZ_GPIO_nSD_WP);</div><div class='add'>+	gpio_free(SPITZ_GPIO_nSD_DETECT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct pxamci_platform_data spitz_mci_platform_data = {</div><div class='hunk'>@@ -419,27 +484,24 @@ static struct pxamci_platform_data spitz_mci_platform_data = {</div><div class='ctx'>  */</div><div class='ctx'> static int spitz_ohci_init(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	/* Only Port 2 is connected */</div><div class='del'>-	pxa_gpio_mode(SPITZ_GPIO_USB_CONNECT | GPIO_IN);</div><div class='del'>-	pxa_gpio_mode(SPITZ_GPIO_USB_HOST | GPIO_OUT);</div><div class='del'>-	pxa_gpio_mode(SPITZ_GPIO_USB_DEVICE | GPIO_IN);</div><div class='del'>-</div><div class='del'>-	/* Setup USB Port 2 Output Control Register */</div><div class='del'>-	UP2OCR = UP2OCR_HXS | UP2OCR_HXOE | UP2OCR_DPPDE | UP2OCR_DMPDE;</div><div class='del'>-</div><div class='del'>-	GPSR(SPITZ_GPIO_USB_HOST) = GPIO_bit(SPITZ_GPIO_USB_HOST);</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	UHCHR = (UHCHR) &amp;</div><div class='del'>-		~(UHCHR_SSEP1 | UHCHR_SSEP2 | UHCHR_SSEP3 | UHCHR_SSE);</div><div class='add'>+	err = gpio_request(SPITZ_GPIO_USB_HOST, "USB_HOST");</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	UHCRHDA |= UHCRHDA_NOCP;</div><div class='add'>+	/* Only Port 2 is connected</div><div class='add'>+	 * Setup USB Port 2 Output Control Register</div><div class='add'>+	 */</div><div class='add'>+	UP2OCR = UP2OCR_HXS | UP2OCR_HXOE | UP2OCR_DPPDE | UP2OCR_DMPDE;</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return gpio_direction_output(SPITZ_GPIO_USB_HOST, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct pxaohci_platform_data spitz_ohci_platform_data = {</div><div class='ctx'> 	.port_mode	= PMM_NPS_MODE,</div><div class='ctx'> 	.init		= spitz_ohci_init,</div><div class='add'>+	.flags		= ENABLE_PORT_ALL | NO_OC_PROTECTION,</div><div class='ctx'> 	.power_budget	= 150,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -447,29 +509,50 @@ static struct pxaohci_platform_data spitz_ohci_platform_data = {</div><div class='ctx'> /*</div><div class='ctx'>  * Irda</div><div class='ctx'>  */</div><div class='add'>+static int spitz_irda_startup(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = gpio_request(SPITZ_GPIO_IR_ON, "IrDA on");</div><div class='add'>+	if (rc)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	rc = gpio_direction_output(SPITZ_GPIO_IR_ON, 1);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto err_dir;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_dir:</div><div class='add'>+	gpio_free(SPITZ_GPIO_IR_ON);</div><div class='add'>+err:</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void spitz_irda_shutdown(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	gpio_free(SPITZ_GPIO_IR_ON);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void spitz_irda_transceiver_mode(struct device *dev, int mode)</div><div class='ctx'> {</div><div class='del'>-	if (mode &amp; IR_OFF)</div><div class='del'>-		set_scoop_gpio(&amp;spitzscoop2_device.dev, SPITZ_SCP2_IR_ON);</div><div class='del'>-	else</div><div class='del'>-		reset_scoop_gpio(&amp;spitzscoop2_device.dev, SPITZ_SCP2_IR_ON);</div><div class='add'>+	gpio_set_value(SPITZ_GPIO_IR_ON, mode &amp; IR_OFF);</div><div class='ctx'> 	pxa2xx_transceiver_mode(dev, mode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MACH_AKITA</div><div class='ctx'> static void akita_irda_transceiver_mode(struct device *dev, int mode)</div><div class='ctx'> {</div><div class='del'>-	if (mode &amp; IR_OFF)</div><div class='del'>-		akita_set_ioexp(&amp;akitaioexp_device.dev, AKITA_IOEXP_IR_ON);</div><div class='del'>-	else</div><div class='del'>-		akita_reset_ioexp(&amp;akitaioexp_device.dev, AKITA_IOEXP_IR_ON);</div><div class='add'>+	gpio_set_value(AKITA_GPIO_IR_ON, mode &amp; IR_OFF);</div><div class='ctx'> 	pxa2xx_transceiver_mode(dev, mode);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static struct pxaficp_platform_data spitz_ficp_platform_data = {</div><div class='del'>-	.transceiver_cap  = IR_SIRMODE | IR_OFF,</div><div class='del'>-	.transceiver_mode = spitz_irda_transceiver_mode,</div><div class='add'>+	.transceiver_cap	= IR_SIRMODE | IR_OFF,</div><div class='add'>+	.transceiver_mode	= spitz_irda_transceiver_mode,</div><div class='add'>+	.startup		= spitz_irda_startup,</div><div class='add'>+	.shutdown		= spitz_irda_shutdown,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -477,14 +560,6 @@ static struct pxaficp_platform_data spitz_ficp_platform_data = {</div><div class='ctx'>  * Spitz PXA Framebuffer</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static void spitz_lcd_power(int on, struct fb_var_screeninfo *var)</div><div class='del'>-{</div><div class='del'>-	if (on)</div><div class='del'>-		corgi_lcdtg_hw_init(var-&gt;xres);</div><div class='del'>-	else</div><div class='del'>-		corgi_lcdtg_suspend();</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static struct pxafb_mode_info spitz_pxafb_modes[] = {</div><div class='ctx'> {</div><div class='ctx'> 	.pixclock       = 19231,</div><div class='hunk'>@@ -517,18 +592,13 @@ static struct pxafb_mach_info spitz_pxafb_info = {</div><div class='ctx'> 	.modes          = &amp;spitz_pxafb_modes[0],</div><div class='ctx'> 	.num_modes      = 2,</div><div class='ctx'> 	.fixed_modes    = 1,</div><div class='del'>-	.lccr0          = LCCR0_Color | LCCR0_Sngl | LCCR0_Act | LCCR0_LDDALT | LCCR0_OUC | LCCR0_CMDIM | LCCR0_RDSTM,</div><div class='del'>-	.lccr3          = LCCR3_PixRsEdg | LCCR3_OutEnH,</div><div class='del'>-	.pxafb_lcd_power = spitz_lcd_power,</div><div class='add'>+	.lcd_conn	= LCD_COLOR_TFT_16BPP | LCD_ALTERNATE_MAPPING,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static struct platform_device *devices[] __initdata = {</div><div class='ctx'> 	&amp;spitzscoop_device,</div><div class='del'>-	&amp;spitzssp_device,</div><div class='ctx'> 	&amp;spitzkbd_device,</div><div class='del'>-	&amp;spitzts_device,</div><div class='del'>-	&amp;spitzbl_device,</div><div class='ctx'> 	&amp;spitzled_device,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -548,63 +618,32 @@ static void spitz_restart(char mode)</div><div class='ctx'> </div><div class='ctx'> static void __init common_init(void)</div><div class='ctx'> {</div><div class='del'>-	init_gpio_reset(SPITZ_GPIO_ON_RESET);</div><div class='add'>+	init_gpio_reset(SPITZ_GPIO_ON_RESET, 1);</div><div class='ctx'> 	pm_power_off = spitz_poweroff;</div><div class='ctx'> 	arm_pm_restart = spitz_restart;</div><div class='ctx'> </div><div class='ctx'> 	PMCR = 0x00;</div><div class='ctx'> </div><div class='del'>-	/* setup sleep mode values */</div><div class='del'>-	PWER  = 0x00000002;</div><div class='del'>-	PFER  = 0x00000000;</div><div class='del'>-	PRER  = 0x00000002;</div><div class='del'>-	PGSR0 = 0x0158C000;</div><div class='del'>-	PGSR1 = 0x00FF0080;</div><div class='del'>-	PGSR2 = 0x0001C004;</div><div class='del'>-</div><div class='ctx'> 	/* Stop 3.6MHz and drive HIGH to PCMCIA and CS */</div><div class='ctx'> 	PCFR |= PCFR_OPDE;</div><div class='ctx'> </div><div class='del'>-	corgi_ssp_set_machinfo(&amp;spitz_ssp_machinfo);</div><div class='add'>+	pxa2xx_mfp_config(ARRAY_AND_SIZE(spitz_pin_config));</div><div class='ctx'> </div><div class='del'>-	pxa_gpio_mode(SPITZ_GPIO_HSYNC | GPIO_IN);</div><div class='add'>+	spitz_init_spi();</div><div class='ctx'> </div><div class='ctx'> 	platform_add_devices(devices, ARRAY_SIZE(devices));</div><div class='ctx'> 	pxa_set_mci_info(&amp;spitz_mci_platform_data);</div><div class='ctx'> 	pxa_set_ohci_info(&amp;spitz_ohci_platform_data);</div><div class='ctx'> 	pxa_set_ficp_info(&amp;spitz_ficp_platform_data);</div><div class='del'>-	set_pxa_fb_parent(&amp;spitzssp_device.dev);</div><div class='ctx'> 	set_pxa_fb_info(&amp;spitz_pxafb_info);</div><div class='ctx'> 	pxa_set_i2c_info(NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_MACH_SPITZ) || defined(CONFIG_MACH_BORZOI)</div><div class='del'>-static void spitz_bl_set_intensity(int intensity)</div><div class='del'>-{</div><div class='del'>-	if (intensity &gt; 0x10)</div><div class='del'>-		intensity += 0x10;</div><div class='del'>-</div><div class='del'>-	/* Bits 0-4 are accessed via the SSP interface */</div><div class='del'>-	corgi_ssp_blduty_set(intensity &amp; 0x1f);</div><div class='del'>-</div><div class='del'>-	/* Bit 5 is via SCOOP */</div><div class='del'>-	if (intensity &amp; 0x0020)</div><div class='del'>-		reset_scoop_gpio(&amp;spitzscoop2_device.dev, SPITZ_SCP2_BACKLIGHT_CONT);</div><div class='del'>-	else</div><div class='del'>-		set_scoop_gpio(&amp;spitzscoop2_device.dev, SPITZ_SCP2_BACKLIGHT_CONT);</div><div class='del'>-</div><div class='del'>-	if (intensity)</div><div class='del'>-		set_scoop_gpio(&amp;spitzscoop2_device.dev, SPITZ_SCP2_BACKLIGHT_ON);</div><div class='del'>-	else</div><div class='del'>-		reset_scoop_gpio(&amp;spitzscoop2_device.dev, SPITZ_SCP2_BACKLIGHT_ON);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void __init spitz_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	platform_scoop_config = &amp;spitz_pcmcia_config;</div><div class='ctx'> </div><div class='del'>-	spitz_bl_machinfo.set_bl_intensity = spitz_bl_set_intensity;</div><div class='del'>-</div><div class='ctx'> 	common_init();</div><div class='ctx'> </div><div class='ctx'> 	platform_device_register(&amp;spitzscoop2_device);</div><div class='hunk'>@@ -615,32 +654,17 @@ static void __init spitz_init(void)</div><div class='ctx'> /*</div><div class='ctx'>  * Akita IO Expander</div><div class='ctx'>  */</div><div class='del'>-struct platform_device akitaioexp_device = {</div><div class='del'>-	.name		= "akita-ioexp",</div><div class='del'>-	.id		= -1,</div><div class='add'>+static struct pca953x_platform_data akita_ioexp = {</div><div class='add'>+	.gpio_base		= AKITA_IOEXP_GPIO_BASE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL_GPL(akitaioexp_device);</div><div class='del'>-</div><div class='del'>-static void akita_bl_set_intensity(int intensity)</div><div class='del'>-{</div><div class='del'>-	if (intensity &gt; 0x10)</div><div class='del'>-		intensity += 0x10;</div><div class='del'>-</div><div class='del'>-	/* Bits 0-4 are accessed via the SSP interface */</div><div class='del'>-	corgi_ssp_blduty_set(intensity &amp; 0x1f);</div><div class='del'>-</div><div class='del'>-	/* Bit 5 is via IO-Expander */</div><div class='del'>-	if (intensity &amp; 0x0020)</div><div class='del'>-		akita_reset_ioexp(&amp;akitaioexp_device.dev, AKITA_IOEXP_BACKLIGHT_CONT);</div><div class='del'>-	else</div><div class='del'>-		akita_set_ioexp(&amp;akitaioexp_device.dev, AKITA_IOEXP_BACKLIGHT_CONT);</div><div class='del'>-</div><div class='del'>-	if (intensity)</div><div class='del'>-		akita_set_ioexp(&amp;akitaioexp_device.dev, AKITA_IOEXP_BACKLIGHT_ON);</div><div class='del'>-	else</div><div class='del'>-		akita_reset_ioexp(&amp;akitaioexp_device.dev, AKITA_IOEXP_BACKLIGHT_ON);</div><div class='del'>-}</div><div class='add'>+static struct i2c_board_info akita_i2c_board_info[] = {</div><div class='add'>+	{</div><div class='add'>+		.type		= "max7310",</div><div class='add'>+		.addr		= 0x18,</div><div class='add'>+		.platform_data	= &amp;akita_ioexp,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> static void __init akita_init(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -649,11 +673,10 @@ static void __init akita_init(void)</div><div class='ctx'> 	/* We just pretend the second element of the array doesn't exist */</div><div class='ctx'> 	spitz_pcmcia_config.num_devs = 1;</div><div class='ctx'> 	platform_scoop_config = &amp;spitz_pcmcia_config;</div><div class='del'>-	spitz_bl_machinfo.set_bl_intensity = akita_bl_set_intensity;</div><div class='ctx'> </div><div class='del'>-	platform_device_register(&amp;akitaioexp_device);</div><div class='add'>+	pxa_set_i2c_info(NULL);</div><div class='add'>+	i2c_register_board_info(0, ARRAY_AND_SIZE(akita_i2c_board_info));</div><div class='ctx'> </div><div class='del'>-	spitzscoop_device.dev.parent = &amp;akitaioexp_device.dev;</div><div class='ctx'> 	common_init();</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-pxa/spitz_pm.c b/arch/arm/mach-pxa/spitz_pm.c<br/>index 8a40505dfd28..53018db106ac 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/spitz_pm.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pxa/spitz_pm.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/spitz_pm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/spitz_pm.c</a></div><div class='hunk'>@@ -21,7 +21,6 @@</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/hardware/scoop.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/sharpsl.h&gt;</div><div class='ctx'> #include &lt;mach/spitz.h&gt;</div><div class='hunk'>@@ -48,44 +47,35 @@ static void spitz_charger_init(void)</div><div class='ctx'> </div><div class='ctx'> static void spitz_measure_temp(int on)</div><div class='ctx'> {</div><div class='del'>-	if (on)</div><div class='del'>-		set_scoop_gpio(&amp;spitzscoop_device.dev, SPITZ_SCP_ADC_TEMP_ON);</div><div class='del'>-	else</div><div class='del'>-		reset_scoop_gpio(&amp;spitzscoop_device.dev, SPITZ_SCP_ADC_TEMP_ON);</div><div class='add'>+	gpio_set_value(SPITZ_GPIO_ADC_TEMP_ON, on);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void spitz_charge(int on)</div><div class='ctx'> {</div><div class='ctx'> 	if (on) {</div><div class='ctx'> 		if (sharpsl_pm.flags &amp; SHARPSL_SUSPENDED) {</div><div class='del'>-			set_scoop_gpio(&amp;spitzscoop_device.dev, SPITZ_SCP_JK_B);</div><div class='del'>-			reset_scoop_gpio(&amp;spitzscoop_device.dev, SPITZ_SCP_CHRG_ON);</div><div class='add'>+			gpio_set_value(SPITZ_GPIO_JK_B, 1);</div><div class='add'>+			gpio_set_value(SPITZ_GPIO_CHRG_ON, 0);</div><div class='ctx'> 		} else {</div><div class='del'>-			reset_scoop_gpio(&amp;spitzscoop_device.dev, SPITZ_SCP_JK_B);</div><div class='del'>-			reset_scoop_gpio(&amp;spitzscoop_device.dev, SPITZ_SCP_CHRG_ON);</div><div class='add'>+			gpio_set_value(SPITZ_GPIO_JK_B, 0);</div><div class='add'>+			gpio_set_value(SPITZ_GPIO_CHRG_ON, 0);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		reset_scoop_gpio(&amp;spitzscoop_device.dev, SPITZ_SCP_JK_B);</div><div class='del'>-		set_scoop_gpio(&amp;spitzscoop_device.dev, SPITZ_SCP_CHRG_ON);</div><div class='add'>+		gpio_set_value(SPITZ_GPIO_JK_B, 0);</div><div class='add'>+		gpio_set_value(SPITZ_GPIO_CHRG_ON, 1);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void spitz_discharge(int on)</div><div class='ctx'> {</div><div class='del'>-	if (on)</div><div class='del'>-		set_scoop_gpio(&amp;spitzscoop_device.dev, SPITZ_SCP_JK_A);</div><div class='del'>-	else</div><div class='del'>-		reset_scoop_gpio(&amp;spitzscoop_device.dev, SPITZ_SCP_JK_A);</div><div class='add'>+	gpio_set_value(SPITZ_GPIO_JK_A, on);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* HACK - For unknown reasons, accurate voltage readings are only made with a load</div><div class='ctx'>    on the power bus which the green led on spitz provides */</div><div class='ctx'> static void spitz_discharge1(int on)</div><div class='ctx'> {</div><div class='del'>-	if (on)</div><div class='del'>-		set_scoop_gpio(&amp;spitzscoop_device.dev, SPITZ_SCP_LED_GREEN);</div><div class='del'>-	else</div><div class='del'>-		reset_scoop_gpio(&amp;spitzscoop_device.dev, SPITZ_SCP_LED_GREEN);</div><div class='add'>+	gpio_set_value(SPITZ_GPIO_LED_GREEN, on);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void spitz_presuspend(void)</div><div class='head'>diff --git a/arch/arm/mach-pxa/ssp.c b/arch/arm/mach-pxa/ssp.c<br/>index 9bd93c5f28b2..2c31ec725688 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/ssp.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pxa/ssp.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/ssp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/ssp.c</a></div><div class='hunk'>@@ -28,8 +28,8 @@</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;mach/ssp.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-pxa/time.c b/arch/arm/mach-pxa/time.c<br/>index b0d6b32654cf..f8a9a62959e5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/time.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pxa/time.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/time.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/time.c</a></div><div class='hunk'>@@ -155,7 +155,7 @@ static void __init pxa_timer_init(void)</div><div class='ctx'> 	OIER = 0;</div><div class='ctx'> 	OSSR = OSSR_M0 | OSSR_M1 | OSSR_M2 | OSSR_M3;</div><div class='ctx'> </div><div class='del'>-	if (cpu_is_pxa21x() || cpu_is_pxa25x())</div><div class='add'>+	if (cpu_is_pxa25x())</div><div class='ctx'> 		clock_tick_rate = 3686400;</div><div class='ctx'> 	else if (machine_is_mainstone())</div><div class='ctx'> 		clock_tick_rate = 3249600;</div><div class='head'>diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c<br/>index 9f3ef9eb32e3..130e37e4ebdd 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/tosa.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pxa/tosa.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/tosa.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/tosa.c</a></div><div class='hunk'>@@ -781,7 +781,7 @@ static void __init tosa_init(void)</div><div class='ctx'> 	gpio_set_wake(MFP_PIN_GPIO1, 1);</div><div class='ctx'> 	/* We can't pass to gpio-keys since it will drop the Reset altfunc */</div><div class='ctx'> </div><div class='del'>-	init_gpio_reset(TOSA_GPIO_ON_RESET);</div><div class='add'>+	init_gpio_reset(TOSA_GPIO_ON_RESET, 0);</div><div class='ctx'> </div><div class='ctx'> 	pm_power_off = tosa_poweroff;</div><div class='ctx'> 	arm_pm_restart = tosa_restart;</div><div class='head'>diff --git a/arch/arm/mach-pxa/trizeps4.c b/arch/arm/mach-pxa/trizeps4.c<br/>index 3ed757e6bcc8..a13dbf3c2c05 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/trizeps4.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pxa/trizeps4.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/trizeps4.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/trizeps4.c</a></div><div class='hunk'>@@ -22,8 +22,8 @@</div><div class='ctx'> #include &lt;linux/fb.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/serial_8250.h&gt;</div><div class='del'>-#include &lt;linux/mtd/mtd.h&gt;</div><div class='add'>+#include &lt;linux/gpio.h&gt;</div><div class='add'>+#include &lt;linux/dm9000.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/physmap.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -31,7 +31,6 @@</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/memory.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='del'>-#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/sizes.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -40,41 +39,148 @@</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/flash.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;mach/pxa-regs.h&gt;</div><div class='ctx'> #include &lt;mach/pxa2xx-regs.h&gt;</div><div class='del'>-#include &lt;mach/pxa2xx-gpio.h&gt;</div><div class='add'>+#include &lt;mach/mfp-pxa27x.h&gt;</div><div class='add'>+#include &lt;mach/pxa2xx_spi.h&gt;</div><div class='ctx'> #include &lt;mach/trizeps4.h&gt;</div><div class='ctx'> #include &lt;mach/audio.h&gt;</div><div class='ctx'> #include &lt;mach/pxafb.h&gt;</div><div class='ctx'> #include &lt;mach/mmc.h&gt;</div><div class='ctx'> #include &lt;mach/irda.h&gt;</div><div class='ctx'> #include &lt;mach/ohci.h&gt;</div><div class='add'>+#include &lt;mach/i2c.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> #include "devices.h"</div><div class='ctx'> </div><div class='del'>-/********************************************************************************************</div><div class='add'>+/*	comment out the following line if you want to use the</div><div class='add'>+ *	Standard UART from PXA for serial / irda transmission</div><div class='add'>+ *	and acivate it if you have status leds connected */</div><div class='add'>+#define STATUS_LEDS_ON_STUART_PINS 1</div><div class='add'>+</div><div class='add'>+/*****************************************************************************</div><div class='add'>+ * MultiFunctionPins of CPU</div><div class='add'>+ *****************************************************************************/</div><div class='add'>+static unsigned long trizeps4_pin_config[] __initdata = {</div><div class='add'>+	/* Chip Selects */</div><div class='add'>+	GPIO15_nCS_1,		/* DiskOnChip CS */</div><div class='add'>+	GPIO93_GPIO,		/* TRIZEPS4_DOC_IRQ */</div><div class='add'>+	GPIO94_GPIO,		/* DOC lock */</div><div class='add'>+</div><div class='add'>+	GPIO78_nCS_2,		/* DM9000 CS */</div><div class='add'>+	GPIO101_GPIO,		/* TRIZEPS4_ETH_IRQ */</div><div class='add'>+</div><div class='add'>+	GPIO79_nCS_3,		/* Logic CS */</div><div class='add'>+	GPIO0_GPIO | WAKEUP_ON_EDGE_RISE,	/* Logic irq */</div><div class='add'>+</div><div class='add'>+	/* LCD - 16bpp Active TFT */</div><div class='add'>+	GPIO58_LCD_LDD_0,</div><div class='add'>+	GPIO59_LCD_LDD_1,</div><div class='add'>+	GPIO60_LCD_LDD_2,</div><div class='add'>+	GPIO61_LCD_LDD_3,</div><div class='add'>+	GPIO62_LCD_LDD_4,</div><div class='add'>+	GPIO63_LCD_LDD_5,</div><div class='add'>+	GPIO64_LCD_LDD_6,</div><div class='add'>+	GPIO65_LCD_LDD_7,</div><div class='add'>+	GPIO66_LCD_LDD_8,</div><div class='add'>+	GPIO67_LCD_LDD_9,</div><div class='add'>+	GPIO68_LCD_LDD_10,</div><div class='add'>+	GPIO69_LCD_LDD_11,</div><div class='add'>+	GPIO70_LCD_LDD_12,</div><div class='add'>+	GPIO71_LCD_LDD_13,</div><div class='add'>+	GPIO72_LCD_LDD_14,</div><div class='add'>+	GPIO73_LCD_LDD_15,</div><div class='add'>+	GPIO74_LCD_FCLK,</div><div class='add'>+	GPIO75_LCD_LCLK,</div><div class='add'>+	GPIO76_LCD_PCLK,</div><div class='add'>+	GPIO77_LCD_BIAS,</div><div class='add'>+</div><div class='add'>+	/* UART */</div><div class='add'>+	GPIO9_FFUART_CTS,</div><div class='add'>+	GPIO10_FFUART_DCD,</div><div class='add'>+	GPIO16_FFUART_TXD,</div><div class='add'>+	GPIO33_FFUART_DSR,</div><div class='add'>+	GPIO38_FFUART_RI,</div><div class='add'>+	GPIO82_FFUART_DTR,</div><div class='add'>+	GPIO83_FFUART_RTS,</div><div class='add'>+	GPIO96_FFUART_RXD,</div><div class='add'>+</div><div class='add'>+	GPIO42_BTUART_RXD,</div><div class='add'>+	GPIO43_BTUART_TXD,</div><div class='add'>+	GPIO44_BTUART_CTS,</div><div class='add'>+	GPIO45_BTUART_RTS,</div><div class='add'>+#ifdef STATUS_LEDS_ON_STUART_PINS</div><div class='add'>+	GPIO46_GPIO,</div><div class='add'>+	GPIO47_GPIO,</div><div class='add'>+#else</div><div class='add'>+	GPIO46_STUART_RXD,</div><div class='add'>+	GPIO47_STUART_TXD,</div><div class='add'>+#endif</div><div class='add'>+	/* PCMCIA */</div><div class='add'>+	GPIO11_GPIO,			/* TRIZEPS4_CD_IRQ */</div><div class='add'>+	GPIO13_GPIO,			/* TRIZEPS4_READY_NINT */</div><div class='add'>+	GPIO48_nPOE,</div><div class='add'>+	GPIO49_nPWE,</div><div class='add'>+	GPIO50_nPIOR,</div><div class='add'>+	GPIO51_nPIOW,</div><div class='add'>+	GPIO54_nPCE_2,</div><div class='add'>+	GPIO55_nPREG,</div><div class='add'>+	GPIO56_nPWAIT,</div><div class='add'>+	GPIO57_nIOIS16,</div><div class='add'>+	GPIO102_nPCE_1,</div><div class='add'>+	GPIO104_PSKTSEL,</div><div class='add'>+</div><div class='add'>+	/* MultiMediaCard */</div><div class='add'>+	GPIO32_MMC_CLK,</div><div class='add'>+	GPIO92_MMC_DAT_0,</div><div class='add'>+	GPIO109_MMC_DAT_1,</div><div class='add'>+	GPIO110_MMC_DAT_2,</div><div class='add'>+	GPIO111_MMC_DAT_3,</div><div class='add'>+	GPIO112_MMC_CMD,</div><div class='add'>+	GPIO12_GPIO,			/* TRIZEPS4_MMC_IRQ */</div><div class='add'>+</div><div class='add'>+	/* USB OHCI */</div><div class='add'>+	GPIO88_USBH1_PWR,		/* USBHPWR1 */</div><div class='add'>+	GPIO89_USBH1_PEN,		/* USBHPEN1 */</div><div class='add'>+</div><div class='add'>+	/* I2C */</div><div class='add'>+	GPIO117_I2C_SCL,</div><div class='add'>+	GPIO118_I2C_SDA,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static unsigned long trizeps4wl_pin_config[] __initdata = {</div><div class='add'>+	/* SSP 2 */</div><div class='add'>+	GPIO14_SSP2_SFRM,</div><div class='add'>+	GPIO19_SSP2_SCLK,</div><div class='add'>+	GPIO53_GPIO,			/* TRIZEPS4_SPI_IRQ */</div><div class='add'>+	GPIO86_SSP2_RXD,</div><div class='add'>+	GPIO87_SSP2_TXD,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/****************************************************************************</div><div class='ctx'>  * ONBOARD FLASH</div><div class='del'>- ********************************************************************************************/</div><div class='add'>+ ****************************************************************************/</div><div class='ctx'> static struct mtd_partition trizeps4_partitions[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.name =		"Bootloader",</div><div class='ctx'> 		.offset =	0x00000000,</div><div class='ctx'> 		.size =		0x00040000,</div><div class='ctx'> 		.mask_flags =	MTD_WRITEABLE  /* force read-only */</div><div class='del'>-	},{</div><div class='add'>+	}, {</div><div class='ctx'> 		.name =		"Backup",</div><div class='ctx'> 		.offset =	0x00040000,</div><div class='ctx'> 		.size =		0x00040000,</div><div class='del'>-	},{</div><div class='add'>+	}, {</div><div class='ctx'> 		.name =		"Image",</div><div class='ctx'> 		.offset =	0x00080000,</div><div class='ctx'> 		.size =		0x01080000,</div><div class='del'>-	},{</div><div class='add'>+	}, {</div><div class='ctx'> 		.name =		"IPSM",</div><div class='ctx'> 		.offset =	0x01100000,</div><div class='ctx'> 		.size =		0x00e00000,</div><div class='del'>-	},{</div><div class='add'>+	}, {</div><div class='ctx'> 		.name =		"Registry",</div><div class='ctx'> 		.offset =	0x01f00000,</div><div class='ctx'> 		.size =		MTDPART_SIZ_FULL,</div><div class='hunk'>@@ -105,9 +211,9 @@ static struct platform_device flash_device = {</div><div class='ctx'> 	.num_resources = 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/********************************************************************************************</div><div class='add'>+/****************************************************************************</div><div class='ctx'>  * DAVICOM DM9000 Ethernet</div><div class='del'>- ********************************************************************************************/</div><div class='add'>+ ****************************************************************************/</div><div class='ctx'> static struct resource dm9000_resources[] = {</div><div class='ctx'> 	[0] = {</div><div class='ctx'> 		.start	= TRIZEPS4_ETH_PHYS+0x300,</div><div class='hunk'>@@ -122,67 +228,68 @@ static struct resource dm9000_resources[] = {</div><div class='ctx'> 	[2] = {</div><div class='ctx'> 		.start	= TRIZEPS4_ETH_IRQ,</div><div class='ctx'> 		.end	= TRIZEPS4_ETH_IRQ,</div><div class='del'>-		.flags	= (IORESOURCE_IRQ | IRQ_TYPE_EDGE_RISING),</div><div class='add'>+		.flags	= IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct dm9000_plat_data tri_dm9000_platdata = {</div><div class='add'>+	.flags		= DM9000_PLATF_32BITONLY,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct platform_device dm9000_device = {</div><div class='ctx'> 	.name		= "dm9000",</div><div class='ctx'> 	.id		= -1,</div><div class='ctx'> 	.num_resources	= ARRAY_SIZE(dm9000_resources),</div><div class='ctx'> 	.resource	= dm9000_resources,</div><div class='add'>+	.dev		= {</div><div class='add'>+		.platform_data = &amp;tri_dm9000_platdata,</div><div class='add'>+	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/********************************************************************************************</div><div class='del'>- * PXA270 serial ports</div><div class='del'>- ********************************************************************************************/</div><div class='del'>-static struct plat_serial8250_port tri_serial_ports[] = {</div><div class='del'>-#ifdef CONFIG_SERIAL_PXA</div><div class='del'>-	/* this uses the own PXA driver */</div><div class='add'>+/****************************************************************************</div><div class='add'>+ * LED's on GPIO pins of PXA</div><div class='add'>+ ****************************************************************************/</div><div class='add'>+static struct gpio_led trizeps4_led[] = {</div><div class='add'>+#ifdef STATUS_LEDS_ON_STUART_PINS</div><div class='ctx'> 	{</div><div class='del'>-		0,</div><div class='del'>-	},</div><div class='del'>-#else</div><div class='del'>-	/* this uses the generic 8520 driver */</div><div class='del'>-	[0] = {</div><div class='del'>-		.membase	= (void *)&amp;FFUART,</div><div class='del'>-		.irq		= IRQ_FFUART,</div><div class='del'>-		.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-		.iotype		= UPIO_MEM32,</div><div class='del'>-		.regshift	= 2,</div><div class='del'>-		.uartclk	= (921600*16),</div><div class='del'>-	},</div><div class='del'>-	[1] = {</div><div class='del'>-		.membase	= (void *)&amp;BTUART,</div><div class='del'>-		.irq		= IRQ_BTUART,</div><div class='del'>-		.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-		.iotype		= UPIO_MEM32,</div><div class='del'>-		.regshift	= 2,</div><div class='del'>-		.uartclk	= (921600*16),</div><div class='add'>+		.name = "led0:orange:heartbeat",	/* */</div><div class='add'>+		.default_trigger = "heartbeat",</div><div class='add'>+		.gpio = GPIO_HEARTBEAT_LED,</div><div class='add'>+		.active_low = 1,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='del'>-		0,</div><div class='add'>+		.name = "led1:yellow:cpubusy",		/* */</div><div class='add'>+		.default_trigger = "cpu-busy",</div><div class='add'>+		.gpio = GPIO_SYS_BUSY_LED,</div><div class='add'>+		.active_low = 1,</div><div class='ctx'> 	},</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct platform_device uart_devices = {</div><div class='del'>-	.name		= "serial8250",</div><div class='del'>-	.id		= 0,</div><div class='add'>+static struct gpio_led_platform_data trizeps4_led_data = {</div><div class='add'>+	.leds		= trizeps4_led,</div><div class='add'>+	.num_leds	= ARRAY_SIZE(trizeps4_led),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device leds_devices = {</div><div class='add'>+	.name		= "leds-gpio",</div><div class='add'>+	.id		= -1,</div><div class='ctx'> 	.dev		= {</div><div class='del'>-		.platform_data	= tri_serial_ports,</div><div class='add'>+		.platform_data	= &amp;trizeps4_led_data,</div><div class='ctx'> 	},</div><div class='del'>-	.num_resources	= 0,</div><div class='del'>-	.resource	= NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct platform_device * trizeps4_devices[] __initdata = {</div><div class='add'>+static struct platform_device *trizeps4_devices[] __initdata = {</div><div class='ctx'> 	&amp;flash_device,</div><div class='del'>-	&amp;uart_devices,</div><div class='ctx'> 	&amp;dm9000_device,</div><div class='add'>+	&amp;leds_devices,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device *trizeps4wl_devices[] __initdata = {</div><div class='add'>+	&amp;flash_device,</div><div class='add'>+	&amp;leds_devices,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_MACH_TRIZEPS4_CONXS</div><div class='ctx'> static short trizeps_conxs_bcr;</div><div class='ctx'> </div><div class='ctx'> /* PCCARD power switching supports only 3,3V */</div><div class='hunk'>@@ -192,108 +299,63 @@ void board_pcmcia_power(int power)</div><div class='ctx'> 		/* switch power on, put in reset and enable buffers */</div><div class='ctx'> 		trizeps_conxs_bcr |= power;</div><div class='ctx'> 		trizeps_conxs_bcr |= ConXS_BCR_CF_RESET;</div><div class='del'>-		trizeps_conxs_bcr &amp;= ~(ConXS_BCR_CF_BUF_EN);</div><div class='del'>-		ConXS_BCR = trizeps_conxs_bcr;</div><div class='add'>+		trizeps_conxs_bcr &amp;= ~ConXS_BCR_CF_BUF_EN;</div><div class='add'>+		BCR_writew(trizeps_conxs_bcr);</div><div class='ctx'> 		/* wait a little */</div><div class='ctx'> 		udelay(2000);</div><div class='ctx'> 		/* take reset away */</div><div class='del'>-		trizeps_conxs_bcr &amp;= ~(ConXS_BCR_CF_RESET);</div><div class='del'>-		ConXS_BCR = trizeps_conxs_bcr;</div><div class='add'>+		trizeps_conxs_bcr &amp;= ~ConXS_BCR_CF_RESET;</div><div class='add'>+		BCR_writew(trizeps_conxs_bcr);</div><div class='ctx'> 		udelay(2000);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* put in reset */</div><div class='ctx'> 		trizeps_conxs_bcr |= ConXS_BCR_CF_RESET;</div><div class='del'>-		ConXS_BCR = trizeps_conxs_bcr;</div><div class='add'>+		BCR_writew(trizeps_conxs_bcr);</div><div class='ctx'> 		udelay(1000);</div><div class='ctx'> 		/* switch power off */</div><div class='del'>-		trizeps_conxs_bcr &amp;= ~(0xf);</div><div class='del'>-		ConXS_BCR = trizeps_conxs_bcr;</div><div class='del'>-</div><div class='add'>+		trizeps_conxs_bcr &amp;= ~0xf;</div><div class='add'>+		BCR_writew(trizeps_conxs_bcr);</div><div class='ctx'> 	}</div><div class='del'>-	pr_debug("%s: o%s 0x%x\n", __func__, power ? "n": "ff", trizeps_conxs_bcr);</div><div class='add'>+	pr_debug("%s: o%s 0x%x\n", __func__, power ? "n" : "ff",</div><div class='add'>+			trizeps_conxs_bcr);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(board_pcmcia_power);</div><div class='ctx'> </div><div class='ctx'> /* backlight power switching for LCD panel */</div><div class='ctx'> static void board_backlight_power(int on)</div><div class='ctx'> {</div><div class='del'>-	if (on) {</div><div class='add'>+	if (on)</div><div class='ctx'> 		trizeps_conxs_bcr |= ConXS_BCR_L_DISP;</div><div class='del'>-	} else {</div><div class='add'>+	else</div><div class='ctx'> 		trizeps_conxs_bcr &amp;= ~ConXS_BCR_L_DISP;</div><div class='del'>-	}</div><div class='del'>-	pr_debug("%s: o%s 0x%x\n", __func__, on ? "n" : "ff", trizeps_conxs_bcr);</div><div class='del'>-	ConXS_BCR = trizeps_conxs_bcr;</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-/* Powersupply for MMC/SD cardslot */</div><div class='del'>-static void board_mci_power(struct device *dev, unsigned int vdd)</div><div class='del'>-{</div><div class='del'>-	struct pxamci_platform_data* p_d = dev-&gt;platform_data;</div><div class='del'>-</div><div class='del'>-	if (( 1 &lt;&lt; vdd) &amp; p_d-&gt;ocr_mask) {</div><div class='del'>-		pr_debug("%s: on\n", __func__);</div><div class='del'>-		/* FIXME fill in values here */</div><div class='del'>-	} else {</div><div class='del'>-		pr_debug("%s: off\n", __func__);</div><div class='del'>-		/* FIXME fill in values here */</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static short trizeps_conxs_ircr;</div><div class='del'>-</div><div class='del'>-/* Switch modes and Power for IRDA receiver */</div><div class='del'>-static void board_irda_mode(struct device *dev, int mode)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	local_irq_save(flags);</div><div class='del'>-	if (mode &amp; IR_SIRMODE) {</div><div class='del'>-		/* Slow mode */</div><div class='del'>-		trizeps_conxs_ircr &amp;= ~ConXS_IRCR_MODE;</div><div class='del'>-	} else if (mode &amp; IR_FIRMODE) {</div><div class='del'>-		/* Fast mode */</div><div class='del'>-		trizeps_conxs_ircr |= ConXS_IRCR_MODE;</div><div class='del'>-	}</div><div class='del'>-	pxa2xx_transceiver_mode(dev, mode);</div><div class='del'>-	if (mode &amp; IR_OFF) {</div><div class='del'>-		trizeps_conxs_ircr |= ConXS_IRCR_SD;</div><div class='del'>-	} else {</div><div class='del'>-		trizeps_conxs_ircr &amp;= ~ConXS_IRCR_SD;</div><div class='del'>-	}</div><div class='del'>-	/* FIXME write values to register */</div><div class='del'>-	local_irq_restore(flags);</div><div class='add'>+	pr_debug("%s: o%s 0x%x\n", __func__, on ? "n" : "ff",</div><div class='add'>+			trizeps_conxs_bcr);</div><div class='add'>+	BCR_writew(trizeps_conxs_bcr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#else</div><div class='del'>-/* for other baseboards define dummies */</div><div class='del'>-void board_pcmcia_power(int power)	{;}</div><div class='del'>-#define board_backlight_power		NULL</div><div class='del'>-#define board_mci_power			NULL</div><div class='del'>-#define board_irda_mode			NULL</div><div class='del'>-</div><div class='del'>-#endif		/* CONFIG_MACH_TRIZEPS4_CONXS */</div><div class='del'>-EXPORT_SYMBOL(board_pcmcia_power);</div><div class='add'>+/* a I2C based RTC is known on CONXS board */</div><div class='add'>+static struct i2c_board_info trizeps4_i2c_devices[] __initdata = {</div><div class='add'>+	{ I2C_BOARD_INFO("rtc-pcf8593", 0x51) }</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-static int trizeps4_mci_init(struct device *dev, irq_handler_t mci_detect_int, void *data)</div><div class='add'>+/****************************************************************************</div><div class='add'>+ * MMC card slot external to module</div><div class='add'>+ ****************************************************************************/</div><div class='add'>+static int trizeps4_mci_init(struct device *dev, irq_handler_t mci_detect_int,</div><div class='add'>+		void *data)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='del'>-	/* setup GPIO for PXA27x MMC controller */</div><div class='del'>-	pxa_gpio_mode(GPIO32_MMCCLK_MD);</div><div class='del'>-	pxa_gpio_mode(GPIO112_MMCCMD_MD);</div><div class='del'>-	pxa_gpio_mode(GPIO92_MMCDAT0_MD);</div><div class='del'>-	pxa_gpio_mode(GPIO109_MMCDAT1_MD);</div><div class='del'>-	pxa_gpio_mode(GPIO110_MMCDAT2_MD);</div><div class='del'>-	pxa_gpio_mode(GPIO111_MMCDAT3_MD);</div><div class='del'>-</div><div class='del'>-	pxa_gpio_mode(GPIO_MMC_DET | GPIO_IN);</div><div class='ctx'> </div><div class='ctx'> 	err = request_irq(TRIZEPS4_MMC_IRQ, mci_detect_int,</div><div class='del'>-			  IRQF_DISABLED | IRQF_TRIGGER_RISING,</div><div class='del'>-			  "MMC card detect", data);</div><div class='del'>-	if (err)</div><div class='del'>-		printk(KERN_ERR "trizeps4_mci_init: MMC/SD: can't request MMC card detect IRQ\n");</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='add'>+		IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_SAMPLE_RANDOM,</div><div class='add'>+		"MMC card detect", data);</div><div class='add'>+	if (err) {</div><div class='add'>+		printk(KERN_ERR "trizeps4_mci_init: MMC/SD: can't request"</div><div class='add'>+						"MMC card detect IRQ\n");</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void trizeps4_mci_exit(struct device *dev, void *data)</div><div class='hunk'>@@ -303,39 +365,69 @@ static void trizeps4_mci_exit(struct device *dev, void *data)</div><div class='ctx'> </div><div class='ctx'> static struct pxamci_platform_data trizeps4_mci_platform_data = {</div><div class='ctx'> 	.ocr_mask	= MMC_VDD_32_33|MMC_VDD_33_34,</div><div class='add'>+	.detect_delay	= 1,</div><div class='ctx'> 	.init 		= trizeps4_mci_init,</div><div class='ctx'> 	.exit		= trizeps4_mci_exit,</div><div class='del'>-	.setpower 	= board_mci_power,</div><div class='add'>+	.get_ro		= NULL,	/* write-protection not supported */</div><div class='add'>+	.setpower 	= NULL,	/* power-switching not supported */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct pxaficp_platform_data trizeps4_ficp_platform_data = {</div><div class='del'>-	.transceiver_cap  = IR_SIRMODE | IR_FIRMODE | IR_OFF,</div><div class='del'>-	.transceiver_mode = board_irda_mode,</div><div class='del'>-};</div><div class='add'>+/****************************************************************************</div><div class='add'>+ * IRDA mode switching on stuart</div><div class='add'>+ ****************************************************************************/</div><div class='add'>+#ifndef STATUS_LEDS_ON_STUART_PINS</div><div class='add'>+static short trizeps_conxs_ircr;</div><div class='ctx'> </div><div class='del'>-static int trizeps4_ohci_init(struct device *dev)</div><div class='add'>+static int trizeps4_irda_startup(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	/* setup Port1 GPIO pin. */</div><div class='del'>-	pxa_gpio_mode( 88 | GPIO_ALT_FN_1_IN);	/* USBHPWR1 */</div><div class='del'>-	pxa_gpio_mode( 89 | GPIO_ALT_FN_2_OUT);	/* USBHPEN1 */</div><div class='del'>-</div><div class='del'>-	/* Set the Power Control Polarity Low and Power Sense</div><div class='del'>-	   Polarity Low to active low. */</div><div class='del'>-	UHCHR = (UHCHR | UHCHR_PCPL | UHCHR_PSPL) &amp;</div><div class='del'>-		~(UHCHR_SSEP1 | UHCHR_SSEP2 | UHCHR_SSEP3 | UHCHR_SSE);</div><div class='del'>-</div><div class='add'>+	trizeps_conxs_ircr &amp;= ~ConXS_IRCR_SD;</div><div class='add'>+	IRCR_writew(trizeps_conxs_ircr);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void trizeps4_ohci_exit(struct device *dev)</div><div class='add'>+static void trizeps4_irda_shutdown(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	trizeps_conxs_ircr |= ConXS_IRCR_SD;</div><div class='add'>+	IRCR_writew(trizeps_conxs_ircr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void trizeps4_irda_transceiver_mode(struct device *dev, int mode)</div><div class='ctx'> {</div><div class='del'>-	;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	local_irq_save(flags);</div><div class='add'>+	/* Switch mode */</div><div class='add'>+	if (mode &amp; IR_SIRMODE)</div><div class='add'>+		trizeps_conxs_ircr &amp;= ~ConXS_IRCR_MODE;	/* Slow mode */</div><div class='add'>+	else if (mode &amp; IR_FIRMODE) {</div><div class='add'>+		trizeps_conxs_ircr |= ConXS_IRCR_MODE;	/* Fast mode */</div><div class='add'>+</div><div class='add'>+	/* Switch power */</div><div class='add'>+	if (mode &amp; IR_OFF)</div><div class='add'>+		trizeps_conxs_ircr |= ConXS_IRCR_SD;</div><div class='add'>+	else</div><div class='add'>+		trizeps_conxs_ircr &amp;= ~ConXS_IRCR_SD;</div><div class='add'>+</div><div class='add'>+	IRCR_writew(trizeps_conxs_ircr);</div><div class='add'>+	local_irq_restore(flags);</div><div class='add'>+</div><div class='add'>+	pxa2xx_transceiver_mode(dev, mode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct pxaficp_platform_data trizeps4_ficp_platform_data = {</div><div class='add'>+	.transceiver_cap	= IR_SIRMODE | IR_FIRMODE | IR_OFF,</div><div class='add'>+	.transceiver_mode	= trizeps4_irda_transceiver_mode,</div><div class='add'>+	.startup		= trizeps4_irda_startup,</div><div class='add'>+	.shutdown		= trizeps4_irda_shutdown,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/****************************************************************************</div><div class='add'>+ * OHCI USB port</div><div class='add'>+ ****************************************************************************/</div><div class='ctx'> static struct pxaohci_platform_data trizeps4_ohci_platform_data = {</div><div class='ctx'> 	.port_mode	= PMM_PERPORT_MODE,</div><div class='del'>-	.init		= trizeps4_ohci_init,</div><div class='del'>-	.exit		= trizeps4_ohci_exit,</div><div class='add'>+	.flags		= ENABLE_PORT_ALL | POWER_CONTROL_LOW | POWER_SENSE_LOW,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct map_desc trizeps4_io_desc[] __initdata = {</div><div class='hunk'>@@ -372,105 +464,80 @@ static struct map_desc trizeps4_io_desc[] __initdata = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct pxafb_mode_info sharp_lcd_mode = {</div><div class='del'>-    .pixclock		= 78000,</div><div class='del'>-    .xres		= 640,</div><div class='del'>-    .yres		= 480,</div><div class='del'>-    .bpp		= 8,</div><div class='del'>-    .hsync_len		= 4,</div><div class='del'>-    .left_margin	= 4,</div><div class='del'>-    .right_margin	= 4,</div><div class='del'>-    .vsync_len		= 2,</div><div class='del'>-    .upper_margin	= 0,</div><div class='del'>-    .lower_margin	= 0,</div><div class='del'>-    .sync		= FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,</div><div class='del'>-    .cmap_greyscale	= 0,</div><div class='add'>+	.pixclock	= 78000,</div><div class='add'>+	.xres		= 640,</div><div class='add'>+	.yres		= 480,</div><div class='add'>+	.bpp		= 8,</div><div class='add'>+	.hsync_len	= 4,</div><div class='add'>+	.left_margin	= 4,</div><div class='add'>+	.right_margin	= 4,</div><div class='add'>+	.vsync_len	= 2,</div><div class='add'>+	.upper_margin	= 0,</div><div class='add'>+	.lower_margin	= 0,</div><div class='add'>+	.sync		= FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,</div><div class='add'>+	.cmap_greyscale	= 0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct pxafb_mach_info sharp_lcd = {</div><div class='del'>-    .modes		= &amp;sharp_lcd_mode,</div><div class='del'>-    .num_modes	= 1,</div><div class='del'>-    .cmap_inverse	= 0,</div><div class='del'>-    .cmap_static	= 0,</div><div class='del'>-    .lccr0		= LCCR0_Color | LCCR0_Pas | LCCR0_Dual,</div><div class='del'>-    .lccr3		= 0x0340ff02,</div><div class='del'>-    .pxafb_backlight_power = board_backlight_power,</div><div class='add'>+	.modes		= &amp;sharp_lcd_mode,</div><div class='add'>+	.num_modes	= 1,</div><div class='add'>+	.lcd_conn	= LCD_COLOR_DSTN_16BPP | LCD_PCLK_EDGE_FALL,</div><div class='add'>+	.cmap_inverse	= 0,</div><div class='add'>+	.cmap_static	= 0,</div><div class='add'>+	.pxafb_backlight_power = board_backlight_power,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct pxafb_mode_info toshiba_lcd_mode = {</div><div class='del'>-    .pixclock		= 39720,</div><div class='del'>-    .xres		= 640,</div><div class='del'>-    .yres		= 480,</div><div class='del'>-    .bpp		= 8,</div><div class='del'>-    .hsync_len		= 63,</div><div class='del'>-    .left_margin	= 12,</div><div class='del'>-    .right_margin	= 12,</div><div class='del'>-    .vsync_len		= 4,</div><div class='del'>-    .upper_margin	= 32,</div><div class='del'>-    .lower_margin	= 10,</div><div class='del'>-    .sync		= 0,</div><div class='del'>-    .cmap_greyscale	= 0,</div><div class='add'>+	.pixclock	= 39720,</div><div class='add'>+	.xres		= 640,</div><div class='add'>+	.yres		= 480,</div><div class='add'>+	.bpp		= 8,</div><div class='add'>+	.hsync_len	= 63,</div><div class='add'>+	.left_margin	= 12,</div><div class='add'>+	.right_margin	= 12,</div><div class='add'>+	.vsync_len	= 4,</div><div class='add'>+	.upper_margin	= 32,</div><div class='add'>+	.lower_margin	= 10,</div><div class='add'>+	.sync		= 0,</div><div class='add'>+	.cmap_greyscale	= 0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct pxafb_mach_info toshiba_lcd = {</div><div class='del'>-    .modes		= &amp;toshiba_lcd_mode,</div><div class='del'>-    .num_modes	= 1,</div><div class='del'>-    .cmap_inverse	= 0,</div><div class='del'>-    .cmap_static	= 0,</div><div class='del'>-    .lccr0		= LCCR0_Color | LCCR0_Act,</div><div class='del'>-    .lccr3		= 0x03400002,</div><div class='del'>-    .pxafb_backlight_power = board_backlight_power,</div><div class='add'>+	.modes		= &amp;toshiba_lcd_mode,</div><div class='add'>+	.num_modes	= 1,</div><div class='add'>+	.lcd_conn	= (LCD_COLOR_TFT_16BPP | LCD_PCLK_EDGE_FALL),</div><div class='add'>+	.cmap_inverse	= 0,</div><div class='add'>+	.cmap_static	= 0,</div><div class='add'>+	.pxafb_backlight_power = board_backlight_power,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void __init trizeps4_init(void)</div><div class='ctx'> {</div><div class='del'>-	platform_add_devices(trizeps4_devices, ARRAY_SIZE(trizeps4_devices));</div><div class='add'>+	pxa2xx_mfp_config(ARRAY_AND_SIZE(trizeps4_pin_config));</div><div class='add'>+	if (machine_is_trizeps4wl()) {</div><div class='add'>+		pxa2xx_mfp_config(ARRAY_AND_SIZE(trizeps4wl_pin_config));</div><div class='add'>+		platform_add_devices(trizeps4wl_devices,</div><div class='add'>+					ARRAY_SIZE(trizeps4wl_devices));</div><div class='add'>+	} else {</div><div class='add'>+		platform_add_devices(trizeps4_devices,</div><div class='add'>+					ARRAY_SIZE(trizeps4_devices));</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-/*	set_pxa_fb_info(&amp;sharp_lcd); */</div><div class='del'>-	set_pxa_fb_info(&amp;toshiba_lcd);</div><div class='add'>+	if (0)	/* dont know how to determine LCD */</div><div class='add'>+		set_pxa_fb_info(&amp;sharp_lcd);</div><div class='add'>+	else</div><div class='add'>+		set_pxa_fb_info(&amp;toshiba_lcd);</div><div class='ctx'> </div><div class='ctx'> 	pxa_set_mci_info(&amp;trizeps4_mci_platform_data);</div><div class='add'>+#ifndef STATUS_LEDS_ON_STUART_PINS</div><div class='ctx'> 	pxa_set_ficp_info(&amp;trizeps4_ficp_platform_data);</div><div class='add'>+#endif</div><div class='ctx'> 	pxa_set_ohci_info(&amp;trizeps4_ohci_platform_data);</div><div class='ctx'> 	pxa_set_ac97_info(NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __init trizeps4_map_io(void)</div><div class='del'>-{</div><div class='del'>-	pxa_map_io();</div><div class='del'>-	iotable_init(trizeps4_io_desc, ARRAY_SIZE(trizeps4_io_desc));</div><div class='del'>-</div><div class='del'>-	/* for DiskOnChip */</div><div class='del'>-	pxa_gpio_mode(GPIO15_nCS_1_MD);</div><div class='del'>-</div><div class='del'>-	/* for off-module PIC on ConXS board */</div><div class='del'>-	pxa_gpio_mode(GPIO_PIC | GPIO_IN);</div><div class='del'>-</div><div class='del'>-	/* UCB1400 irq */</div><div class='del'>-	pxa_gpio_mode(GPIO_UCB1400 | GPIO_IN);</div><div class='del'>-</div><div class='del'>-	/* for DM9000 LAN */</div><div class='del'>-	pxa_gpio_mode(GPIO78_nCS_2_MD);</div><div class='del'>-	pxa_gpio_mode(GPIO_DM9000 | GPIO_IN);</div><div class='del'>-</div><div class='del'>-	/* for PCMCIA device */</div><div class='del'>-	pxa_gpio_mode(GPIO_PCD | GPIO_IN);</div><div class='del'>-	pxa_gpio_mode(GPIO_PRDY | GPIO_IN);</div><div class='del'>-</div><div class='del'>-	/* for I2C adapter */</div><div class='del'>-	pxa_gpio_mode(GPIO117_I2CSCL_MD);</div><div class='del'>-	pxa_gpio_mode(GPIO118_I2CSDA_MD);</div><div class='add'>+	pxa_set_i2c_info(NULL);</div><div class='add'>+	i2c_register_board_info(0, trizeps4_i2c_devices,</div><div class='add'>+					ARRAY_SIZE(trizeps4_i2c_devices));</div><div class='ctx'> </div><div class='del'>-	/* MMC_DET s.o. */</div><div class='del'>-	pxa_gpio_mode(GPIO_MMC_DET | GPIO_IN);</div><div class='del'>-</div><div class='del'>-	/* whats that for ??? */</div><div class='del'>-	pxa_gpio_mode(GPIO79_nCS_3_MD);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_LEDS</div><div class='del'>-	pxa_gpio_mode( GPIO_SYS_BUSY_LED  | GPIO_OUT);		/* LED1 */</div><div class='del'>-	pxa_gpio_mode( GPIO_HEARTBEAT_LED | GPIO_OUT);		/* LED2 */</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_MACH_TRIZEPS4_CONXS</div><div class='ctx'> #ifdef CONFIG_IDE_PXA_CF</div><div class='ctx'> 	/* if boot direct from compact flash dont disable power */</div><div class='ctx'> 	trizeps_conxs_bcr = 0x0009;</div><div class='hunk'>@@ -478,18 +545,24 @@ static void __init trizeps4_map_io(void)</div><div class='ctx'> 	/* this is the reset value */</div><div class='ctx'> 	trizeps_conxs_bcr = 0x00A0;</div><div class='ctx'> #endif</div><div class='del'>-	ConXS_BCR = trizeps_conxs_bcr;</div><div class='del'>-#endif</div><div class='add'>+	BCR_writew(trizeps_conxs_bcr);</div><div class='add'>+	board_backlight_power(1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init trizeps4_map_io(void)</div><div class='add'>+{</div><div class='add'>+	pxa_map_io();</div><div class='add'>+	iotable_init(trizeps4_io_desc, ARRAY_SIZE(trizeps4_io_desc));</div><div class='ctx'> </div><div class='del'>-#warning FIXME - accessing PM registers directly is deprecated</div><div class='del'>-	PWER  = 0x00000002;</div><div class='del'>-	PFER  = 0x00000000;</div><div class='del'>-	PRER  = 0x00000002;</div><div class='del'>-	PGSR0 = 0x0158C000;</div><div class='del'>-	PGSR1 = 0x00FF0080;</div><div class='del'>-	PGSR2 = 0x0001C004;</div><div class='del'>-	/* Stop 3.6MHz and drive HIGH to PCMCIA and CS */</div><div class='del'>-	PCFR |= PCFR_OPDE;</div><div class='add'>+	if ((MSC0 &amp; 0x8) &amp;&amp; (BOOT_DEF &amp; 0x1)) {</div><div class='add'>+		/* if flash is 16 bit wide its a Trizeps4 WL */</div><div class='add'>+		__machine_arch_type = MACH_TYPE_TRIZEPS4WL;</div><div class='add'>+		trizeps4_flash_data[0].width = 2;</div><div class='add'>+	} else {</div><div class='add'>+		/* if flash is 32 bit wide its a Trizeps4 */</div><div class='add'>+		__machine_arch_type = MACH_TYPE_TRIZEPS4;</div><div class='add'>+		trizeps4_flash_data[0].width = 4;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> MACHINE_START(TRIZEPS4, "Keith und Koep Trizeps IV module")</div><div class='hunk'>@@ -503,3 +576,13 @@ MACHINE_START(TRIZEPS4, "Keith und Koep Trizeps IV module")</div><div class='ctx'> 	.timer		= &amp;pxa_timer,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> </div><div class='add'>+MACHINE_START(TRIZEPS4WL, "Keith und Koep Trizeps IV-WL module")</div><div class='add'>+	/* MAINTAINER("Jürgen Schindele") */</div><div class='add'>+	.phys_io	= 0x40000000,</div><div class='add'>+	.io_pg_offst	= (io_p2v(0x40000000) &gt;&gt; 18) &amp; 0xfffc,</div><div class='add'>+	.boot_params	= TRIZEPS4_SDRAM_BASE + 0x100,</div><div class='add'>+	.init_machine	= trizeps4_init,</div><div class='add'>+	.map_io		= trizeps4_map_io,</div><div class='add'>+	.init_irq	= pxa27x_init_irq,</div><div class='add'>+	.timer		= &amp;pxa_timer,</div><div class='add'>+MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-pxa/viper.c b/arch/arm/mach-pxa/viper.c<br/>new file mode 100644<br/>index 000000000000..4b3120dbc049<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/viper.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/viper.c</a></div><div class='hunk'>@@ -0,0 +1,983 @@</div><div class='add'>+/*</div><div class='add'>+ *  linux/arch/arm/mach-pxa/viper.c</div><div class='add'>+ *</div><div class='add'>+ *  Support for the Arcom VIPER SBC.</div><div class='add'>+ *</div><div class='add'>+ *  Author:	Ian Campbell</div><div class='add'>+ *  Created:    Feb 03, 2003</div><div class='add'>+ *  Copyright:  Arcom Control Systems</div><div class='add'>+ *</div><div class='add'>+ *  Maintained by Marc Zyngier &lt;maz@misterjones.org&gt;</div><div class='add'>+ *                             &lt;marc.zyngier@altran.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * Based on lubbock.c:</div><div class='add'>+ *  Author:	Nicolas Pitre</div><div class='add'>+ *  Created:	Jun 15, 2001</div><div class='add'>+ *  Copyright:	MontaVista Software Inc.</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ *  published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/memory.h&gt;</div><div class='add'>+#include &lt;linux/cpu.h&gt;</div><div class='add'>+#include &lt;linux/cpufreq.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/major.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/pm.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/gpio.h&gt;</div><div class='add'>+#include &lt;linux/i2c-gpio.h&gt;</div><div class='add'>+#include &lt;linux/serial_8250.h&gt;</div><div class='add'>+#include &lt;linux/smc91x.h&gt;</div><div class='add'>+#include &lt;linux/pwm_backlight.h&gt;</div><div class='add'>+#include &lt;linux/usb/isp116x.h&gt;</div><div class='add'>+#include &lt;linux/mtd/mtd.h&gt;</div><div class='add'>+#include &lt;linux/mtd/partitions.h&gt;</div><div class='add'>+#include &lt;linux/mtd/physmap.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;mach/pxa-regs.h&gt;</div><div class='add'>+#include &lt;mach/pxa2xx-regs.h&gt;</div><div class='add'>+#include &lt;mach/bitfield.h&gt;</div><div class='add'>+#include &lt;mach/audio.h&gt;</div><div class='add'>+#include &lt;mach/pxafb.h&gt;</div><div class='add'>+#include &lt;mach/mfp-pxa25x.h&gt;</div><div class='add'>+#include &lt;mach/i2c.h&gt;</div><div class='add'>+#include &lt;mach/viper.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/setup.h&gt;</div><div class='add'>+#include &lt;asm/mach-types.h&gt;</div><div class='add'>+#include &lt;asm/irq.h&gt;</div><div class='add'>+#include &lt;asm/sizes.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/mach/arch.h&gt;</div><div class='add'>+#include &lt;asm/mach/map.h&gt;</div><div class='add'>+#include &lt;asm/mach/irq.h&gt;</div><div class='add'>+</div><div class='add'>+#include "generic.h"</div><div class='add'>+#include "devices.h"</div><div class='add'>+</div><div class='add'>+static unsigned int icr;</div><div class='add'>+</div><div class='add'>+static void viper_icr_set_bit(unsigned int bit)</div><div class='add'>+{</div><div class='add'>+	icr |= bit;</div><div class='add'>+	VIPER_ICR = icr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void viper_icr_clear_bit(unsigned int bit)</div><div class='add'>+{</div><div class='add'>+	icr &amp;= ~bit;</div><div class='add'>+	VIPER_ICR = icr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This function is used from the pcmcia module to reset the CF */</div><div class='add'>+void viper_cf_rst(int state)</div><div class='add'>+{</div><div class='add'>+	if (state)</div><div class='add'>+		viper_icr_set_bit(VIPER_ICR_CF_RST);</div><div class='add'>+	else</div><div class='add'>+		viper_icr_clear_bit(VIPER_ICR_CF_RST);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(viper_cf_rst);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The CPLD version register was not present on VIPER boards prior to</div><div class='add'>+ * v2i1. On v1 boards where the version register is not present we</div><div class='add'>+ * will just read back the previous value from the databus.</div><div class='add'>+ *</div><div class='add'>+ * Therefore we do two reads. The first time we write 0 to the</div><div class='add'>+ * (read-only) register before reading and the second time we write</div><div class='add'>+ * 0xff first. If the two reads do not match or they read back as 0xff</div><div class='add'>+ * or 0x00 then we have version 1 hardware.</div><div class='add'>+ */</div><div class='add'>+static u8 viper_hw_version(void)</div><div class='add'>+{</div><div class='add'>+	u8 v1, v2;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	local_irq_save(flags);</div><div class='add'>+</div><div class='add'>+	VIPER_VERSION = 0;</div><div class='add'>+	v1 = VIPER_VERSION;</div><div class='add'>+	VIPER_VERSION = 0xff;</div><div class='add'>+	v2 = VIPER_VERSION;</div><div class='add'>+</div><div class='add'>+	v1 = (v1 != v2 || v1 == 0xff) ? 0 : v1;</div><div class='add'>+</div><div class='add'>+	local_irq_restore(flags);</div><div class='add'>+	return v1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* CPU sysdev */</div><div class='add'>+static int viper_cpu_suspend(struct sys_device *sysdev, pm_message_t state)</div><div class='add'>+{</div><div class='add'>+	viper_icr_set_bit(VIPER_ICR_R_DIS);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int viper_cpu_resume(struct sys_device *sysdev)</div><div class='add'>+{</div><div class='add'>+	viper_icr_clear_bit(VIPER_ICR_R_DIS);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sysdev_driver viper_cpu_sysdev_driver = {</div><div class='add'>+	.suspend	= viper_cpu_suspend,</div><div class='add'>+	.resume		= viper_cpu_resume,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static unsigned int current_voltage_divisor;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * If force is not true then step from existing to new divisor. If</div><div class='add'>+ * force is true then jump straight to the new divisor. Stepping is</div><div class='add'>+ * used because if the jump in voltage is too large, the VCC can dip</div><div class='add'>+ * too low and the regulator cuts out.</div><div class='add'>+ *</div><div class='add'>+ * force can be used to initialize the divisor to a know state by</div><div class='add'>+ * setting the value for the current clock speed, since we are already</div><div class='add'>+ * running at that speed we know the voltage should be pretty close so</div><div class='add'>+ * the jump won't be too large</div><div class='add'>+ */</div><div class='add'>+static void viper_set_core_cpu_voltage(unsigned long khz, int force)</div><div class='add'>+{</div><div class='add'>+	int i = 0;</div><div class='add'>+	unsigned int divisor = 0;</div><div class='add'>+	const char *v;</div><div class='add'>+</div><div class='add'>+	if (khz &lt; 200000) {</div><div class='add'>+		v = "1.0"; divisor = 0xfff;</div><div class='add'>+	} else if (khz &lt; 300000) {</div><div class='add'>+		v = "1.1"; divisor = 0xde5;</div><div class='add'>+	} else {</div><div class='add'>+		v = "1.3"; divisor = 0x325;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pr_debug("viper: setting CPU core voltage to %sV at %d.%03dMHz\n",</div><div class='add'>+		 v, (int)khz / 1000, (int)khz % 1000);</div><div class='add'>+</div><div class='add'>+#define STEP 0x100</div><div class='add'>+	do {</div><div class='add'>+		int step;</div><div class='add'>+</div><div class='add'>+		if (force)</div><div class='add'>+			step = divisor;</div><div class='add'>+		else if (current_voltage_divisor &lt; divisor - STEP)</div><div class='add'>+			step = current_voltage_divisor + STEP;</div><div class='add'>+		else if (current_voltage_divisor &gt; divisor + STEP)</div><div class='add'>+			step = current_voltage_divisor - STEP;</div><div class='add'>+		else</div><div class='add'>+			step = divisor;</div><div class='add'>+		force = 0;</div><div class='add'>+</div><div class='add'>+		gpio_set_value(VIPER_PSU_CLK_GPIO, 0);</div><div class='add'>+		gpio_set_value(VIPER_PSU_nCS_LD_GPIO, 0);</div><div class='add'>+</div><div class='add'>+		for (i = 1 &lt;&lt; 11 ; i &gt; 0 ; i &gt;&gt;= 1) {</div><div class='add'>+			udelay(1);</div><div class='add'>+</div><div class='add'>+			gpio_set_value(VIPER_PSU_DATA_GPIO, step &amp; i);</div><div class='add'>+			udelay(1);</div><div class='add'>+</div><div class='add'>+			gpio_set_value(VIPER_PSU_CLK_GPIO, 1);</div><div class='add'>+			udelay(1);</div><div class='add'>+</div><div class='add'>+			gpio_set_value(VIPER_PSU_CLK_GPIO, 0);</div><div class='add'>+		}</div><div class='add'>+		udelay(1);</div><div class='add'>+</div><div class='add'>+		gpio_set_value(VIPER_PSU_nCS_LD_GPIO, 1);</div><div class='add'>+		udelay(1);</div><div class='add'>+</div><div class='add'>+		gpio_set_value(VIPER_PSU_nCS_LD_GPIO, 0);</div><div class='add'>+</div><div class='add'>+		current_voltage_divisor = step;</div><div class='add'>+	} while (current_voltage_divisor != divisor);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Interrupt handling */</div><div class='add'>+static unsigned long viper_irq_enabled_mask;</div><div class='add'>+static const int viper_isa_irqs[] = { 3, 4, 5, 6, 7, 10, 11, 12, 9, 14, 15 };</div><div class='add'>+static const int viper_isa_irq_map[] = {</div><div class='add'>+	0,		/* ISA irq #0, invalid */</div><div class='add'>+	0,		/* ISA irq #1, invalid */</div><div class='add'>+	0,		/* ISA irq #2, invalid */</div><div class='add'>+	1 &lt;&lt; 0,		/* ISA irq #3 */</div><div class='add'>+	1 &lt;&lt; 1,		/* ISA irq #4 */</div><div class='add'>+	1 &lt;&lt; 2,		/* ISA irq #5 */</div><div class='add'>+	1 &lt;&lt; 3,		/* ISA irq #6 */</div><div class='add'>+	1 &lt;&lt; 4,		/* ISA irq #7 */</div><div class='add'>+	0,		/* ISA irq #8, invalid */</div><div class='add'>+	1 &lt;&lt; 8,		/* ISA irq #9 */</div><div class='add'>+	1 &lt;&lt; 5,		/* ISA irq #10 */</div><div class='add'>+	1 &lt;&lt; 6,		/* ISA irq #11 */</div><div class='add'>+	1 &lt;&lt; 7,		/* ISA irq #12 */</div><div class='add'>+	0,		/* ISA irq #13, invalid */</div><div class='add'>+	1 &lt;&lt; 9,		/* ISA irq #14 */</div><div class='add'>+	1 &lt;&lt; 10,	/* ISA irq #15 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline int viper_irq_to_bitmask(unsigned int irq)</div><div class='add'>+{</div><div class='add'>+	return viper_isa_irq_map[irq - PXA_ISA_IRQ(0)];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int viper_bit_to_irq(int bit)</div><div class='add'>+{</div><div class='add'>+	return viper_isa_irqs[bit] + PXA_ISA_IRQ(0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void viper_ack_irq(unsigned int irq)</div><div class='add'>+{</div><div class='add'>+	int viper_irq = viper_irq_to_bitmask(irq);</div><div class='add'>+</div><div class='add'>+	if (viper_irq &amp; 0xff)</div><div class='add'>+		VIPER_LO_IRQ_STATUS = viper_irq;</div><div class='add'>+	else</div><div class='add'>+		VIPER_HI_IRQ_STATUS = (viper_irq &gt;&gt; 8);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void viper_mask_irq(unsigned int irq)</div><div class='add'>+{</div><div class='add'>+	viper_irq_enabled_mask &amp;= ~(viper_irq_to_bitmask(irq));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void viper_unmask_irq(unsigned int irq)</div><div class='add'>+{</div><div class='add'>+	viper_irq_enabled_mask |= viper_irq_to_bitmask(irq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned long viper_irq_pending(void)</div><div class='add'>+{</div><div class='add'>+	return (VIPER_HI_IRQ_STATUS &lt;&lt; 8 | VIPER_LO_IRQ_STATUS) &amp;</div><div class='add'>+			viper_irq_enabled_mask;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void viper_irq_handler(unsigned int irq, struct irq_desc *desc)</div><div class='add'>+{</div><div class='add'>+	unsigned long pending;</div><div class='add'>+</div><div class='add'>+	pending = viper_irq_pending();</div><div class='add'>+	do {</div><div class='add'>+		/* we're in a chained irq handler,</div><div class='add'>+		 * so ack the interrupt by hand */</div><div class='add'>+		GEDR(VIPER_CPLD_GPIO) = GPIO_bit(VIPER_CPLD_GPIO);</div><div class='add'>+</div><div class='add'>+		if (likely(pending)) {</div><div class='add'>+			irq = viper_bit_to_irq(__ffs(pending));</div><div class='add'>+			generic_handle_irq(irq);</div><div class='add'>+		}</div><div class='add'>+		pending = viper_irq_pending();</div><div class='add'>+	} while (pending);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct irq_chip viper_irq_chip = {</div><div class='add'>+	.name	= "ISA",</div><div class='add'>+	.ack	= viper_ack_irq,</div><div class='add'>+	.mask	= viper_mask_irq,</div><div class='add'>+	.unmask	= viper_unmask_irq</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init viper_init_irq(void)</div><div class='add'>+{</div><div class='add'>+	int level;</div><div class='add'>+	int isa_irq;</div><div class='add'>+</div><div class='add'>+	pxa25x_init_irq();</div><div class='add'>+</div><div class='add'>+	/* setup ISA IRQs */</div><div class='add'>+	for (level = 0; level &lt; ARRAY_SIZE(viper_isa_irqs); level++) {</div><div class='add'>+		isa_irq = viper_bit_to_irq(level);</div><div class='add'>+		set_irq_chip(isa_irq, &amp;viper_irq_chip);</div><div class='add'>+		set_irq_handler(isa_irq, handle_edge_irq);</div><div class='add'>+		set_irq_flags(isa_irq, IRQF_VALID | IRQF_PROBE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	set_irq_chained_handler(gpio_to_irq(VIPER_CPLD_GPIO),</div><div class='add'>+				viper_irq_handler);</div><div class='add'>+	set_irq_type(gpio_to_irq(VIPER_CPLD_GPIO), IRQ_TYPE_EDGE_BOTH);</div><div class='add'>+</div><div class='add'>+#ifndef CONFIG_SERIAL_PXA</div><div class='add'>+	/*</div><div class='add'>+	 * 8250 doesn't support IRQ_TYPE being passed as part</div><div class='add'>+	 * of the plat_serial8250_port structure...</div><div class='add'>+	 */</div><div class='add'>+	set_irq_type(gpio_to_irq(VIPER_UARTA_GPIO), IRQ_TYPE_EDGE_RISING);</div><div class='add'>+	set_irq_type(gpio_to_irq(VIPER_UARTB_GPIO), IRQ_TYPE_EDGE_RISING);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Flat Panel */</div><div class='add'>+static struct pxafb_mode_info fb_mode_info[] = {</div><div class='add'>+	{</div><div class='add'>+		.pixclock	= 157500,</div><div class='add'>+</div><div class='add'>+		.xres		= 320,</div><div class='add'>+		.yres		= 240,</div><div class='add'>+</div><div class='add'>+		.bpp		= 16,</div><div class='add'>+</div><div class='add'>+		.hsync_len	= 63,</div><div class='add'>+		.left_margin	= 7,</div><div class='add'>+		.right_margin	= 13,</div><div class='add'>+</div><div class='add'>+		.vsync_len	= 20,</div><div class='add'>+		.upper_margin	= 0,</div><div class='add'>+		.lower_margin	= 0,</div><div class='add'>+</div><div class='add'>+		.sync		= 0,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct pxafb_mach_info fb_info = {</div><div class='add'>+	.modes			= fb_mode_info,</div><div class='add'>+	.num_modes		= 1,</div><div class='add'>+	.lcd_conn		= LCD_COLOR_TFT_16BPP | LCD_PCLK_EDGE_FALL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int viper_backlight_init(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* GPIO9 and 10 control FB backlight. Initialise to off */</div><div class='add'>+	ret = gpio_request(VIPER_BCKLIGHT_EN_GPIO, "Backlight");</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_request_bckl;</div><div class='add'>+</div><div class='add'>+	ret = gpio_request(VIPER_LCD_EN_GPIO, "LCD");</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_request_lcd;</div><div class='add'>+</div><div class='add'>+	ret = gpio_direction_output(VIPER_BCKLIGHT_EN_GPIO, 0);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_dir;</div><div class='add'>+</div><div class='add'>+	ret = gpio_direction_output(VIPER_LCD_EN_GPIO, 0);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_dir;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_dir:</div><div class='add'>+	gpio_free(VIPER_LCD_EN_GPIO);</div><div class='add'>+err_request_lcd:</div><div class='add'>+	gpio_free(VIPER_BCKLIGHT_EN_GPIO);</div><div class='add'>+err_request_bckl:</div><div class='add'>+	dev_err(dev, "Failed to setup LCD GPIOs\n");</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int viper_backlight_notify(int brightness)</div><div class='add'>+{</div><div class='add'>+	gpio_set_value(VIPER_LCD_EN_GPIO, !!brightness);</div><div class='add'>+	gpio_set_value(VIPER_BCKLIGHT_EN_GPIO, !!brightness);</div><div class='add'>+</div><div class='add'>+	return brightness;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void viper_backlight_exit(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	gpio_free(VIPER_LCD_EN_GPIO);</div><div class='add'>+	gpio_free(VIPER_BCKLIGHT_EN_GPIO);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct platform_pwm_backlight_data viper_backlight_data = {</div><div class='add'>+	.pwm_id		= 0,</div><div class='add'>+	.max_brightness	= 100,</div><div class='add'>+	.dft_brightness	= 100,</div><div class='add'>+	.pwm_period_ns	= 1000000,</div><div class='add'>+	.init		= viper_backlight_init,</div><div class='add'>+	.notify		= viper_backlight_notify,</div><div class='add'>+	.exit		= viper_backlight_exit,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device viper_backlight_device = {</div><div class='add'>+	.name		= "pwm-backlight",</div><div class='add'>+	.dev		= {</div><div class='add'>+		.parent		= &amp;pxa25x_device_pwm0.dev,</div><div class='add'>+		.platform_data	= &amp;viper_backlight_data,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Ethernet */</div><div class='add'>+static struct resource smc91x_resources[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.name	= "smc91x-regs",</div><div class='add'>+		.start  = VIPER_ETH_PHYS + 0x300,</div><div class='add'>+		.end    = VIPER_ETH_PHYS + 0x30f,</div><div class='add'>+		.flags  = IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.start  = gpio_to_irq(VIPER_ETH_GPIO),</div><div class='add'>+		.end    = gpio_to_irq(VIPER_ETH_GPIO),</div><div class='add'>+		.flags  = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,</div><div class='add'>+	},</div><div class='add'>+	[2] = {</div><div class='add'>+		.name	= "smc91x-data32",</div><div class='add'>+		.start  = VIPER_ETH_DATA_PHYS,</div><div class='add'>+		.end    = VIPER_ETH_DATA_PHYS + 3,</div><div class='add'>+		.flags  = IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct smc91x_platdata viper_smc91x_info = {</div><div class='add'>+	.flags	= SMC91X_USE_16BIT | SMC91X_NOWAIT,</div><div class='add'>+	.leda	= RPC_LED_100_10,</div><div class='add'>+	.ledb	= RPC_LED_TX_RX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device smc91x_device = {</div><div class='add'>+	.name		= "smc91x",</div><div class='add'>+	.id		= -1,</div><div class='add'>+	.num_resources  = ARRAY_SIZE(smc91x_resources),</div><div class='add'>+	.resource       = smc91x_resources,</div><div class='add'>+	.dev		= {</div><div class='add'>+		.platform_data	= &amp;viper_smc91x_info,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* i2c */</div><div class='add'>+static struct i2c_gpio_platform_data i2c_bus_data = {</div><div class='add'>+	.sda_pin = VIPER_RTC_I2C_SDA_GPIO,</div><div class='add'>+	.scl_pin = VIPER_RTC_I2C_SCL_GPIO,</div><div class='add'>+	.udelay  = 10,</div><div class='add'>+	.timeout = 100,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device i2c_bus_device = {</div><div class='add'>+	.name		= "i2c-gpio",</div><div class='add'>+	.id		= 1, /* pxa2xx-i2c is bus 0, so start at 1 */</div><div class='add'>+	.dev = {</div><div class='add'>+		.platform_data = &amp;i2c_bus_data,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct i2c_board_info __initdata viper_i2c_devices[] = {</div><div class='add'>+	{</div><div class='add'>+		I2C_BOARD_INFO("ds1338", 0x68),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Serial configuration:</div><div class='add'>+ * You can either have the standard PXA ports driven by the PXA driver,</div><div class='add'>+ * or all the ports (PXA + 16850) driven by the 8250 driver.</div><div class='add'>+ * Choose your poison.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static struct resource viper_serial_resources[] = {</div><div class='add'>+#ifndef CONFIG_SERIAL_PXA</div><div class='add'>+	{</div><div class='add'>+		.start	= 0x40100000,</div><div class='add'>+		.end	= 0x4010001f,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.start	= 0x40200000,</div><div class='add'>+		.end	= 0x4020001f,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.start	= 0x40700000,</div><div class='add'>+		.end	= 0x4070001f,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.start	= VIPER_UARTA_PHYS,</div><div class='add'>+		.end	= VIPER_UARTA_PHYS + 0xf,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.start	= VIPER_UARTB_PHYS,</div><div class='add'>+		.end	= VIPER_UARTB_PHYS + 0xf,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+#else</div><div class='add'>+	{</div><div class='add'>+		0,</div><div class='add'>+	},</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct plat_serial8250_port serial_platform_data[] = {</div><div class='add'>+#ifndef CONFIG_SERIAL_PXA</div><div class='add'>+	/* Internal UARTs */</div><div class='add'>+	{</div><div class='add'>+		.membase	= (void *)&amp;FFUART,</div><div class='add'>+		.mapbase	= __PREG(FFUART),</div><div class='add'>+		.irq		= IRQ_FFUART,</div><div class='add'>+		.uartclk	= 921600 * 16,</div><div class='add'>+		.regshift	= 2,</div><div class='add'>+		.flags		= UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,</div><div class='add'>+		.iotype		= UPIO_MEM,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.membase	= (void *)&amp;BTUART,</div><div class='add'>+		.mapbase	= __PREG(BTUART),</div><div class='add'>+		.irq		= IRQ_BTUART,</div><div class='add'>+		.uartclk	= 921600 * 16,</div><div class='add'>+		.regshift	= 2,</div><div class='add'>+		.flags		= UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,</div><div class='add'>+		.iotype		= UPIO_MEM,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.membase	= (void *)&amp;STUART,</div><div class='add'>+		.mapbase	= __PREG(STUART),</div><div class='add'>+		.irq		= IRQ_STUART,</div><div class='add'>+		.uartclk	= 921600 * 16,</div><div class='add'>+		.regshift	= 2,</div><div class='add'>+		.flags		= UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,</div><div class='add'>+		.iotype		= UPIO_MEM,</div><div class='add'>+	},</div><div class='add'>+	/* External UARTs */</div><div class='add'>+	{</div><div class='add'>+		.mapbase	= VIPER_UARTA_PHYS,</div><div class='add'>+		.irq		= gpio_to_irq(VIPER_UARTA_GPIO),</div><div class='add'>+		.uartclk	= 1843200,</div><div class='add'>+		.regshift	= 1,</div><div class='add'>+		.iotype		= UPIO_MEM,</div><div class='add'>+		.flags		= UPF_BOOT_AUTOCONF | UPF_IOREMAP |</div><div class='add'>+				  UPF_SKIP_TEST,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.mapbase	= VIPER_UARTB_PHYS,</div><div class='add'>+		.irq		= gpio_to_irq(VIPER_UARTB_GPIO),</div><div class='add'>+		.uartclk	= 1843200,</div><div class='add'>+		.regshift	= 1,</div><div class='add'>+		.iotype		= UPIO_MEM,</div><div class='add'>+		.flags		= UPF_BOOT_AUTOCONF | UPF_IOREMAP |</div><div class='add'>+				  UPF_SKIP_TEST,</div><div class='add'>+	},</div><div class='add'>+#endif</div><div class='add'>+	{ },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device serial_device = {</div><div class='add'>+	.name			= "serial8250",</div><div class='add'>+	.id			= 0,</div><div class='add'>+	.dev			= {</div><div class='add'>+		.platform_data	= serial_platform_data,</div><div class='add'>+	},</div><div class='add'>+	.num_resources		= ARRAY_SIZE(viper_serial_resources),</div><div class='add'>+	.resource		= viper_serial_resources,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* USB */</div><div class='add'>+static void isp116x_delay(struct device *dev, int delay)</div><div class='add'>+{</div><div class='add'>+	ndelay(delay);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct resource isp116x_resources[] = {</div><div class='add'>+	[0] = { /* DATA */</div><div class='add'>+		.start  = VIPER_USB_PHYS + 0,</div><div class='add'>+		.end    = VIPER_USB_PHYS + 1,</div><div class='add'>+		.flags  = IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[1] = { /* ADDR */</div><div class='add'>+		.start  = VIPER_USB_PHYS + 2,</div><div class='add'>+		.end    = VIPER_USB_PHYS + 3,</div><div class='add'>+		.flags  = IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[2] = {</div><div class='add'>+		.start  = gpio_to_irq(VIPER_USB_GPIO),</div><div class='add'>+		.end    = gpio_to_irq(VIPER_USB_GPIO),</div><div class='add'>+		.flags  = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* (DataBusWidth16|AnalogOCEnable|DREQOutputPolarity|DownstreamPort15KRSel ) */</div><div class='add'>+static struct isp116x_platform_data isp116x_platform_data = {</div><div class='add'>+	/* Enable internal resistors on downstream ports */</div><div class='add'>+	.sel15Kres		= 1,</div><div class='add'>+	/* On-chip overcurrent protection */</div><div class='add'>+	.oc_enable		= 1,</div><div class='add'>+	/* INT output polarity */</div><div class='add'>+	.int_act_high		= 1,</div><div class='add'>+	/* INT edge or level triggered */</div><div class='add'>+	.int_edge_triggered	= 0,</div><div class='add'>+</div><div class='add'>+	/* WAKEUP pin connected - NOT SUPPORTED  */</div><div class='add'>+	/* .remote_wakeup_connected = 0, */</div><div class='add'>+	/* Wakeup by devices on usb bus enabled */</div><div class='add'>+	.remote_wakeup_enable	= 0,</div><div class='add'>+	.delay			= isp116x_delay,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device isp116x_device = {</div><div class='add'>+	.name			= "isp116x-hcd",</div><div class='add'>+	.id			= -1,</div><div class='add'>+	.num_resources  	= ARRAY_SIZE(isp116x_resources),</div><div class='add'>+	.resource       	= isp116x_resources,</div><div class='add'>+	.dev			= {</div><div class='add'>+		.platform_data	= &amp;isp116x_platform_data,</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* MTD */</div><div class='add'>+static struct resource mtd_resources[] = {</div><div class='add'>+	[0] = {	/* RedBoot config + filesystem flash */</div><div class='add'>+		.start	= VIPER_FLASH_PHYS,</div><div class='add'>+		.end	= VIPER_FLASH_PHYS + SZ_32M - 1,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[1] = {	/* Boot flash */</div><div class='add'>+		.start	= VIPER_BOOT_PHYS,</div><div class='add'>+		.end	= VIPER_BOOT_PHYS + SZ_1M - 1,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[2] = { /*</div><div class='add'>+		 * SRAM size is actually 256KB, 8bits, with a sparse mapping</div><div class='add'>+		 * (each byte is on a 16bit boundary).</div><div class='add'>+		 */</div><div class='add'>+		.start	= _VIPER_SRAM_BASE,</div><div class='add'>+		.end	= _VIPER_SRAM_BASE + SZ_512K - 1,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct mtd_partition viper_boot_flash_partition = {</div><div class='add'>+	.name		= "RedBoot",</div><div class='add'>+	.size		= SZ_1M,</div><div class='add'>+	.offset		= 0,</div><div class='add'>+	.mask_flags	= MTD_WRITEABLE,	/* force R/O */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct physmap_flash_data viper_flash_data[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.width		= 2,</div><div class='add'>+		.parts		= NULL,</div><div class='add'>+		.nr_parts	= 0,</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.width		= 2,</div><div class='add'>+		.parts		= &amp;viper_boot_flash_partition,</div><div class='add'>+		.nr_parts	= 1,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device viper_mtd_devices[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.name		= "physmap-flash",</div><div class='add'>+		.id		= 0,</div><div class='add'>+		.dev		= {</div><div class='add'>+			.platform_data	= &amp;viper_flash_data[0],</div><div class='add'>+		},</div><div class='add'>+		.resource	= &amp;mtd_resources[0],</div><div class='add'>+		.num_resources	= 1,</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.name		= "physmap-flash",</div><div class='add'>+		.id		= 1,</div><div class='add'>+		.dev		= {</div><div class='add'>+			.platform_data	= &amp;viper_flash_data[1],</div><div class='add'>+		},</div><div class='add'>+		.resource	= &amp;mtd_resources[1],</div><div class='add'>+		.num_resources	= 1,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device *viper_devs[] __initdata = {</div><div class='add'>+	&amp;smc91x_device,</div><div class='add'>+	&amp;i2c_bus_device,</div><div class='add'>+	&amp;serial_device,</div><div class='add'>+	&amp;isp116x_device,</div><div class='add'>+	&amp;viper_mtd_devices[0],</div><div class='add'>+	&amp;viper_mtd_devices[1],</div><div class='add'>+	&amp;viper_backlight_device,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static mfp_cfg_t viper_pin_config[] __initdata = {</div><div class='add'>+	/* Chip selects */</div><div class='add'>+	GPIO15_nCS_1,</div><div class='add'>+	GPIO78_nCS_2,</div><div class='add'>+	GPIO79_nCS_3,</div><div class='add'>+	GPIO80_nCS_4,</div><div class='add'>+	GPIO33_nCS_5,</div><div class='add'>+</div><div class='add'>+	/* FP Backlight */</div><div class='add'>+	GPIO9_GPIO, 				/* VIPER_BCKLIGHT_EN_GPIO */</div><div class='add'>+	GPIO10_GPIO,				/* VIPER_LCD_EN_GPIO */</div><div class='add'>+	GPIO16_PWM0_OUT,</div><div class='add'>+</div><div class='add'>+	/* Ethernet PHY Ready */</div><div class='add'>+	GPIO18_RDY,</div><div class='add'>+</div><div class='add'>+	/* Serial shutdown */</div><div class='add'>+	GPIO12_GPIO | MFP_LPM_DRIVE_HIGH,	/* VIPER_UART_SHDN_GPIO */</div><div class='add'>+</div><div class='add'>+	/* Compact-Flash / PC104 */</div><div class='add'>+	GPIO48_nPOE,</div><div class='add'>+	GPIO49_nPWE,</div><div class='add'>+	GPIO50_nPIOR,</div><div class='add'>+	GPIO51_nPIOW,</div><div class='add'>+	GPIO52_nPCE_1,</div><div class='add'>+	GPIO53_nPCE_2,</div><div class='add'>+	GPIO54_nPSKTSEL,</div><div class='add'>+	GPIO55_nPREG,</div><div class='add'>+	GPIO56_nPWAIT,</div><div class='add'>+	GPIO57_nIOIS16,</div><div class='add'>+	GPIO8_GPIO,				/* VIPER_CF_RDY_GPIO */</div><div class='add'>+	GPIO32_GPIO,				/* VIPER_CF_CD_GPIO */</div><div class='add'>+	GPIO82_GPIO,				/* VIPER_CF_POWER_GPIO */</div><div class='add'>+</div><div class='add'>+	/* Integrated UPS control */</div><div class='add'>+	GPIO20_GPIO,				/* VIPER_UPS_GPIO */</div><div class='add'>+</div><div class='add'>+	/* Vcc regulator control */</div><div class='add'>+	GPIO6_GPIO,				/* VIPER_PSU_DATA_GPIO */</div><div class='add'>+	GPIO11_GPIO,				/* VIPER_PSU_CLK_GPIO */</div><div class='add'>+	GPIO19_GPIO,				/* VIPER_PSU_nCS_LD_GPIO */</div><div class='add'>+</div><div class='add'>+	/* i2c busses */</div><div class='add'>+	GPIO26_GPIO,				/* VIPER_TPM_I2C_SDA_GPIO */</div><div class='add'>+	GPIO27_GPIO,				/* VIPER_TPM_I2C_SCL_GPIO */</div><div class='add'>+	GPIO83_GPIO,				/* VIPER_RTC_I2C_SDA_GPIO */</div><div class='add'>+	GPIO84_GPIO,				/* VIPER_RTC_I2C_SCL_GPIO */</div><div class='add'>+</div><div class='add'>+	/* PC/104 Interrupt */</div><div class='add'>+	GPIO1_GPIO | WAKEUP_ON_EDGE_RISE,	/* VIPER_CPLD_GPIO */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static unsigned long viper_tpm;</div><div class='add'>+</div><div class='add'>+static int __init viper_tpm_setup(char *str)</div><div class='add'>+{</div><div class='add'>+	strict_strtoul(str, 10, &amp;viper_tpm);</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__setup("tpm=", viper_tpm_setup);</div><div class='add'>+</div><div class='add'>+static void __init viper_tpm_init(void)</div><div class='add'>+{</div><div class='add'>+	struct platform_device *tpm_device;</div><div class='add'>+	struct i2c_gpio_platform_data i2c_tpm_data = {</div><div class='add'>+		.sda_pin = VIPER_TPM_I2C_SDA_GPIO,</div><div class='add'>+		.scl_pin = VIPER_TPM_I2C_SCL_GPIO,</div><div class='add'>+		.udelay  = 10,</div><div class='add'>+		.timeout = 100,</div><div class='add'>+	};</div><div class='add'>+	char *errstr;</div><div class='add'>+</div><div class='add'>+	/* Allocate TPM i2c bus if requested */</div><div class='add'>+	if (!viper_tpm)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	tpm_device = platform_device_alloc("i2c-gpio", 2);</div><div class='add'>+	if (tpm_device) {</div><div class='add'>+		if (!platform_device_add_data(tpm_device,</div><div class='add'>+					      &amp;i2c_tpm_data,</div><div class='add'>+					      sizeof(i2c_tpm_data))) {</div><div class='add'>+			if (platform_device_add(tpm_device)) {</div><div class='add'>+				errstr = "register TPM i2c bus";</div><div class='add'>+				goto error_free_tpm;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			errstr = "allocate TPM i2c bus data";</div><div class='add'>+			goto error_free_tpm;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		errstr = "allocate TPM i2c device";</div><div class='add'>+		goto error_tpm;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+error_free_tpm:</div><div class='add'>+	kfree(tpm_device);</div><div class='add'>+error_tpm:</div><div class='add'>+	pr_err("viper: Couldn't %s, giving up\n", errstr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init viper_init_vcore_gpios(void)</div><div class='add'>+{</div><div class='add'>+	if (gpio_request(VIPER_PSU_DATA_GPIO, "PSU data"))</div><div class='add'>+		goto err_request_data;</div><div class='add'>+</div><div class='add'>+	if (gpio_request(VIPER_PSU_CLK_GPIO, "PSU clock"))</div><div class='add'>+		goto err_request_clk;</div><div class='add'>+</div><div class='add'>+	if (gpio_request(VIPER_PSU_nCS_LD_GPIO, "PSU cs"))</div><div class='add'>+		goto err_request_cs;</div><div class='add'>+</div><div class='add'>+	if (gpio_direction_output(VIPER_PSU_DATA_GPIO, 0) ||</div><div class='add'>+	    gpio_direction_output(VIPER_PSU_CLK_GPIO, 0) ||</div><div class='add'>+	    gpio_direction_output(VIPER_PSU_nCS_LD_GPIO, 0))</div><div class='add'>+		goto err_dir;</div><div class='add'>+</div><div class='add'>+	/* c/should assume redboot set the correct level ??? */</div><div class='add'>+	viper_set_core_cpu_voltage(get_clk_frequency_khz(0), 1);</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+err_dir:</div><div class='add'>+	gpio_free(VIPER_PSU_nCS_LD_GPIO);</div><div class='add'>+err_request_cs:</div><div class='add'>+	gpio_free(VIPER_PSU_CLK_GPIO);</div><div class='add'>+err_request_clk:</div><div class='add'>+	gpio_free(VIPER_PSU_DATA_GPIO);</div><div class='add'>+err_request_data:</div><div class='add'>+	pr_err("viper: Failed to setup vcore control GPIOs\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init viper_init_serial_gpio(void)</div><div class='add'>+{</div><div class='add'>+	if (gpio_request(VIPER_UART_SHDN_GPIO, "UARTs shutdown"))</div><div class='add'>+		goto err_request;</div><div class='add'>+</div><div class='add'>+	if (gpio_direction_output(VIPER_UART_SHDN_GPIO, 0))</div><div class='add'>+		goto err_dir;</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+err_dir:</div><div class='add'>+	gpio_free(VIPER_UART_SHDN_GPIO);</div><div class='add'>+err_request:</div><div class='add'>+	pr_err("viper: Failed to setup UART shutdown GPIO\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_CPU_FREQ</div><div class='add'>+static int viper_cpufreq_notifier(struct notifier_block *nb,</div><div class='add'>+				  unsigned long val, void *data)</div><div class='add'>+{</div><div class='add'>+	struct cpufreq_freqs *freq = data;</div><div class='add'>+</div><div class='add'>+	/* TODO: Adjust timings??? */</div><div class='add'>+</div><div class='add'>+	switch (val) {</div><div class='add'>+	case CPUFREQ_PRECHANGE:</div><div class='add'>+		if (freq-&gt;old &lt; freq-&gt;new) {</div><div class='add'>+			/* we are getting faster so raise the voltage</div><div class='add'>+			 * before we change freq */</div><div class='add'>+			viper_set_core_cpu_voltage(freq-&gt;new, 0);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case CPUFREQ_POSTCHANGE:</div><div class='add'>+		if (freq-&gt;old &gt; freq-&gt;new) {</div><div class='add'>+			/* we are slowing down so drop the power</div><div class='add'>+			 * after we change freq */</div><div class='add'>+			viper_set_core_cpu_voltage(freq-&gt;new, 0);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case CPUFREQ_RESUMECHANGE:</div><div class='add'>+		viper_set_core_cpu_voltage(freq-&gt;new, 0);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		/* ignore */</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct notifier_block viper_cpufreq_notifier_block = {</div><div class='add'>+	.notifier_call  = viper_cpufreq_notifier</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init viper_init_cpufreq(void)</div><div class='add'>+{</div><div class='add'>+	if (cpufreq_register_notifier(&amp;viper_cpufreq_notifier_block,</div><div class='add'>+				      CPUFREQ_TRANSITION_NOTIFIER))</div><div class='add'>+		pr_err("viper: Failed to setup cpufreq notifier\n");</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline void viper_init_cpufreq(void) {}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static void viper_power_off(void)</div><div class='add'>+{</div><div class='add'>+	pr_notice("Shutting off UPS\n");</div><div class='add'>+	gpio_set_value(VIPER_UPS_GPIO, 1);</div><div class='add'>+	/* Spin to death... */</div><div class='add'>+	while (1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init viper_init(void)</div><div class='add'>+{</div><div class='add'>+	u8 version;</div><div class='add'>+</div><div class='add'>+	pm_power_off = viper_power_off;</div><div class='add'>+</div><div class='add'>+	pxa2xx_mfp_config(ARRAY_AND_SIZE(viper_pin_config));</div><div class='add'>+</div><div class='add'>+	/* Wake-up serial console */</div><div class='add'>+	viper_init_serial_gpio();</div><div class='add'>+</div><div class='add'>+	set_pxa_fb_info(&amp;fb_info);</div><div class='add'>+</div><div class='add'>+	/* v1 hardware cannot use the datacs line */</div><div class='add'>+	version = viper_hw_version();</div><div class='add'>+	if (version == 0)</div><div class='add'>+		smc91x_device.num_resources--;</div><div class='add'>+</div><div class='add'>+	pxa_set_i2c_info(NULL);</div><div class='add'>+	platform_add_devices(viper_devs, ARRAY_SIZE(viper_devs));</div><div class='add'>+</div><div class='add'>+	viper_init_vcore_gpios();</div><div class='add'>+	viper_init_cpufreq();</div><div class='add'>+</div><div class='add'>+	sysdev_driver_register(&amp;cpu_sysdev_class, &amp;viper_cpu_sysdev_driver);</div><div class='add'>+</div><div class='add'>+	if (version) {</div><div class='add'>+		pr_info("viper: hardware v%di%d detected. "</div><div class='add'>+			"CPLD revision %d.\n",</div><div class='add'>+			VIPER_BOARD_VERSION(version),</div><div class='add'>+			VIPER_BOARD_ISSUE(version),</div><div class='add'>+			VIPER_CPLD_REVISION(version));</div><div class='add'>+		system_rev = (VIPER_BOARD_VERSION(version) &lt;&lt; 8) |</div><div class='add'>+			     (VIPER_BOARD_ISSUE(version) &lt;&lt; 4) |</div><div class='add'>+			     VIPER_CPLD_REVISION(version);</div><div class='add'>+	} else {</div><div class='add'>+		pr_info("viper: No version register.\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	i2c_register_board_info(1, ARRAY_AND_SIZE(viper_i2c_devices));</div><div class='add'>+</div><div class='add'>+	viper_tpm_init();</div><div class='add'>+	pxa_set_ac97_info(NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct map_desc viper_io_desc[] __initdata = {</div><div class='add'>+	{</div><div class='add'>+		.virtual = VIPER_CPLD_BASE,</div><div class='add'>+		.pfn     = __phys_to_pfn(VIPER_CPLD_PHYS),</div><div class='add'>+		.length  = 0x00300000,</div><div class='add'>+		.type    = MT_DEVICE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.virtual = VIPER_PC104IO_BASE,</div><div class='add'>+		.pfn     = __phys_to_pfn(_PCMCIA1IO),</div><div class='add'>+		.length  = 0x00800000,</div><div class='add'>+		.type    = MT_DEVICE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init viper_map_io(void)</div><div class='add'>+{</div><div class='add'>+	pxa_map_io();</div><div class='add'>+</div><div class='add'>+	iotable_init(viper_io_desc, ARRAY_SIZE(viper_io_desc));</div><div class='add'>+</div><div class='add'>+	PCFR |= PCFR_OPDE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+MACHINE_START(VIPER, "Arcom/Eurotech VIPER SBC")</div><div class='add'>+	/* Maintainer: Marc Zyngier &lt;maz@misterjones.org&gt; */</div><div class='add'>+	.phys_io	= 0x40000000,</div><div class='add'>+	.io_pg_offst	= (io_p2v(0x40000000) &gt;&gt; 18) &amp; 0xfffc,</div><div class='add'>+	.boot_params	= 0xa0000100,</div><div class='add'>+	.map_io		= viper_map_io,</div><div class='add'>+	.init_irq	= viper_init_irq,</div><div class='add'>+	.timer          = &amp;pxa_timer,</div><div class='add'>+	.init_machine	= viper_init,</div><div class='add'>+MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-pxa/zylonite.c b/arch/arm/mach-pxa/zylonite.c<br/>index 0cb65b5772fe..813804433466 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/zylonite.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pxa/zylonite.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/zylonite.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/zylonite.c</a></div><div class='hunk'>@@ -29,6 +29,7 @@</div><div class='ctx'> #include &lt;mach/pxafb.h&gt;</div><div class='ctx'> #include &lt;mach/zylonite.h&gt;</div><div class='ctx'> #include &lt;mach/mmc.h&gt;</div><div class='add'>+#include &lt;mach/ohci.h&gt;</div><div class='ctx'> #include &lt;mach/pxa27x_keypad.h&gt;</div><div class='ctx'> #include &lt;mach/pxa3xx_nand.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -423,6 +424,21 @@ static void __init zylonite_init_nand(void)</div><div class='ctx'> static inline void zylonite_init_nand(void) {}</div><div class='ctx'> #endif /* CONFIG_MTD_NAND_PXA3xx || CONFIG_MTD_NAND_PXA3xx_MODULE */</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)</div><div class='add'>+static struct pxaohci_platform_data zylonite_ohci_info = {</div><div class='add'>+	.port_mode	= PMM_PERPORT_MODE,</div><div class='add'>+	.flags		= ENABLE_PORT1 | ENABLE_PORT2 |</div><div class='add'>+			  POWER_CONTROL_LOW | POWER_SENSE_LOW,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init zylonite_init_ohci(void)</div><div class='add'>+{</div><div class='add'>+	pxa_set_ohci_info(&amp;zylonite_ohci_info);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline void zylonite_init_ohci(void) {}</div><div class='add'>+#endif /* CONFIG_USB_OHCI_HCD || CONFIG_USB_OHCI_HCD_MODULE */</div><div class='add'>+</div><div class='ctx'> static void __init zylonite_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* board-processor specific initialization */</div><div class='hunk'>@@ -443,6 +459,7 @@ static void __init zylonite_init(void)</div><div class='ctx'> 	zylonite_init_keypad();</div><div class='ctx'> 	zylonite_init_nand();</div><div class='ctx'> 	zylonite_init_leds();</div><div class='add'>+	zylonite_init_ohci();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> MACHINE_START(ZYLONITE, "PXA3xx Platform Development Kit (aka Zylonite)")</div><div class='head'>diff --git a/arch/arm/mach-pxa/zylonite_pxa300.c b/arch/arm/mach-pxa/zylonite_pxa300.c<br/>index 095f5c648236..46538885a58a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/zylonite_pxa300.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pxa/zylonite_pxa300.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/zylonite_pxa300.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/zylonite_pxa300.c</a></div><div class='hunk'>@@ -73,6 +73,12 @@ static mfp_cfg_t common_mfp_cfg[] __initdata = {</div><div class='ctx'> 	GPIO27_AC97_SDATA_OUT,</div><div class='ctx'> 	GPIO28_AC97_SYNC,</div><div class='ctx'> </div><div class='add'>+	/* SSP3 */</div><div class='add'>+	GPIO91_SSP3_SCLK,</div><div class='add'>+	GPIO92_SSP3_FRM,</div><div class='add'>+	GPIO93_SSP3_TXD,</div><div class='add'>+	GPIO94_SSP3_RXD,</div><div class='add'>+</div><div class='ctx'> 	/* WM9713 IRQ */</div><div class='ctx'> 	GPIO26_GPIO,</div><div class='ctx'> </div><div class='hunk'>@@ -113,6 +119,10 @@ static mfp_cfg_t common_mfp_cfg[] __initdata = {</div><div class='ctx'> 	GPIO13_MMC2_CLK,</div><div class='ctx'> 	GPIO14_MMC2_CMD,</div><div class='ctx'> </div><div class='add'>+	/* USB Host */</div><div class='add'>+	GPIO0_2_USBH_PEN,</div><div class='add'>+	GPIO1_2_USBH_PWR,</div><div class='add'>+</div><div class='ctx'> 	/* Standard I2C */</div><div class='ctx'> 	GPIO21_I2C_SCL,</div><div class='ctx'> 	GPIO22_I2C_SDA,</div><div class='hunk'>@@ -209,7 +219,7 @@ static struct pca953x_platform_data gpio_exp[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct i2c_board_info zylonite_i2c_board_info[] = {</div><div class='add'>+static struct i2c_board_info zylonite_i2c_board_info[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.type		= "pca9539",</div><div class='ctx'> 		.addr		= 0x74,</div><div class='head'>diff --git a/arch/arm/mach-pxa/zylonite_pxa320.c b/arch/arm/mach-pxa/zylonite_pxa320.c<br/>index 9879d7da2df5..0f244744daae 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/zylonite_pxa320.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-pxa/zylonite_pxa320.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-pxa/zylonite_pxa320.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-pxa/zylonite_pxa320.c</a></div><div class='hunk'>@@ -69,6 +69,12 @@ static mfp_cfg_t mfp_cfg[] __initdata = {</div><div class='ctx'> 	GPIO39_AC97_BITCLK,</div><div class='ctx'> 	GPIO40_AC97_nACRESET,</div><div class='ctx'> </div><div class='add'>+	/* SSP3 */</div><div class='add'>+	GPIO89_SSP3_SCLK,</div><div class='add'>+	GPIO90_SSP3_FRM,</div><div class='add'>+	GPIO91_SSP3_TXD,</div><div class='add'>+	GPIO92_SSP3_RXD,</div><div class='add'>+</div><div class='ctx'> 	/* WM9713 IRQ */</div><div class='ctx'> 	GPIO15_GPIO,</div><div class='ctx'> </div><div class='hunk'>@@ -117,6 +123,10 @@ static mfp_cfg_t mfp_cfg[] __initdata = {</div><div class='ctx'> 	GPIO28_MMC2_CLK,</div><div class='ctx'> 	GPIO29_MMC2_CMD,</div><div class='ctx'> </div><div class='add'>+	/* USB Host */</div><div class='add'>+	GPIO2_2_USBH_PEN,</div><div class='add'>+	GPIO3_2_USBH_PWR,</div><div class='add'>+</div><div class='ctx'> 	/* Debug LEDs */</div><div class='ctx'> 	GPIO1_2_GPIO | MFP_LPM_DRIVE_HIGH,</div><div class='ctx'> 	GPIO4_2_GPIO | MFP_LPM_DRIVE_HIGH,</div><div class='head'>diff --git a/arch/arm/mach-realview/core.c b/arch/arm/mach-realview/core.c<br/>index 4f9c84ab781c..2f04d54711e7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-realview/core.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-realview/core.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-realview/core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-realview/core.c</a></div><div class='hunk'>@@ -27,10 +27,10 @@</div><div class='ctx'> #include &lt;linux/amba/clcd.h&gt;</div><div class='ctx'> #include &lt;linux/clocksource.h&gt;</div><div class='ctx'> #include &lt;linux/clockchips.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/leds.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/arm_timer.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-realview/core.h b/arch/arm/mach-realview/core.h<br/>index 33dbbb41a663..3cea92c70d8f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-realview/core.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-realview/core.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-realview/core.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-realview/core.h</a></div><div class='hunk'>@@ -23,9 +23,9 @@</div><div class='ctx'> #define __ASM_ARCH_REALVIEW_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/amba/bus.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/leds.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define AMBA_DEVICE(name,busid,base,plat)			\</div><div class='ctx'> static struct amba_device name##_device = {			\</div><div class='head'>diff --git a/arch/arm/mach-realview/include/mach/system.h b/arch/arm/mach-realview/include/mach/system.h<br/>index 4d3c8f3f8053..a2f61c78adbf 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-realview/include/mach/system.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-realview/include/mach/system.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-realview/include/mach/system.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-realview/include/mach/system.h</a></div><div class='hunk'>@@ -21,8 +21,8 @@</div><div class='ctx'> #ifndef __ASM_ARCH_SYSTEM_H</div><div class='ctx'> #define __ASM_ARCH_SYSTEM_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;mach/platform.h&gt;</div><div class='ctx'> </div><div class='ctx'> static inline void arch_idle(void)</div><div class='head'>diff --git a/arch/arm/mach-realview/localtimer.c b/arch/arm/mach-realview/localtimer.c<br/>index 82fa1f26e026..44d178cd5733 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-realview/localtimer.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-realview/localtimer.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-realview/localtimer.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-realview/localtimer.c</a></div><div class='hunk'>@@ -17,11 +17,11 @@</div><div class='ctx'> #include &lt;linux/percpu.h&gt;</div><div class='ctx'> #include &lt;linux/clockchips.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/hardware/arm_twd.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/gic.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> static DEFINE_PER_CPU(struct clock_event_device, local_clockevent);</div><div class='head'>diff --git a/arch/arm/mach-realview/platsmp.c b/arch/arm/mach-realview/platsmp.c<br/>index 1907d22f4fed..e102aeb0f76e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-realview/platsmp.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-realview/platsmp.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-realview/platsmp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-realview/platsmp.c</a></div><div class='hunk'>@@ -13,10 +13,10 @@</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/board-eb.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-realview/realview_eb.c b/arch/arm/mach-realview/realview_eb.c<br/>index 19a9968fc5b9..eb829eb1ebe2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-realview/realview_eb.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-realview/realview_eb.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-realview/realview_eb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-realview/realview_eb.c</a></div><div class='hunk'>@@ -23,9 +23,9 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/sysdev.h&gt;</div><div class='ctx'> #include &lt;linux/amba/bus.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/leds.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-realview/realview_pb1176.c b/arch/arm/mach-realview/realview_pb1176.c<br/>index 0986cbd15943..cccdb3eb90fe 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-realview/realview_pb1176.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-realview/realview_pb1176.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-realview/realview_pb1176.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-realview/realview_pb1176.c</a></div><div class='hunk'>@@ -23,9 +23,9 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/sysdev.h&gt;</div><div class='ctx'> #include &lt;linux/amba/bus.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/leds.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-realview/realview_pb11mp.c b/arch/arm/mach-realview/realview_pb11mp.c<br/>index f4e7135e3eb5..8b863148ec18 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-realview/realview_pb11mp.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-realview/realview_pb11mp.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-realview/realview_pb11mp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-realview/realview_pb11mp.c</a></div><div class='hunk'>@@ -23,9 +23,9 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/sysdev.h&gt;</div><div class='ctx'> #include &lt;linux/amba/bus.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/leds.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-rpc/dma.c b/arch/arm/mach-rpc/dma.c<br/>index 4b19fe484190..7958a30f8932 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-rpc/dma.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-rpc/dma.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-rpc/dma.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-rpc/dma.c</a></div><div class='hunk'>@@ -14,11 +14,11 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='ctx'> #include &lt;asm/fiq.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-rpc/include/mach/memory.h b/arch/arm/mach-rpc/include/mach/memory.h<br/>index 05425d558ee7..9bf7e43e2863 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-rpc/include/mach/memory.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-rpc/include/mach/memory.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-rpc/include/mach/memory.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-rpc/include/mach/memory.h</a></div><div class='hunk'>@@ -36,4 +36,12 @@</div><div class='ctx'> #define FLUSH_BASE_PHYS		0x00000000</div><div class='ctx'> #define FLUSH_BASE		0xdf000000</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Sparsemem support.  Each section is a maximum of 64MB.  The sections</div><div class='add'>+ * are offset by 128MB and can cover 128MB, so that gives us a maximum</div><div class='add'>+ * of 29 physmem bits.</div><div class='add'>+ */</div><div class='add'>+#define MAX_PHYSMEM_BITS	29</div><div class='add'>+#define SECTION_SIZE_BITS	26</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-rpc/include/mach/system.h b/arch/arm/mach-rpc/include/mach/system.h<br/>index 54d6e3f2d319..bd7268ba17e2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-rpc/include/mach/system.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-rpc/include/mach/system.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-rpc/include/mach/system.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-rpc/include/mach/system.h</a></div><div class='hunk'>@@ -7,9 +7,9 @@</div><div class='ctx'>  * it under the terms of the GNU General Public License version 2 as</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/iomd.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> static inline void arch_idle(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/arm/mach-rpc/include/mach/uncompress.h b/arch/arm/mach-rpc/include/mach/uncompress.h<br/>index baa9c866d7bf..d5862368c4f2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-rpc/include/mach/uncompress.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-rpc/include/mach/uncompress.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-rpc/include/mach/uncompress.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-rpc/include/mach/uncompress.h</a></div><div class='hunk'>@@ -9,8 +9,8 @@</div><div class='ctx'>  */</div><div class='ctx'> #define VIDMEM ((char *)SCREEN_START)</div><div class='ctx'>  </div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-rpc/irq.c b/arch/arm/mach-rpc/irq.c<br/>index 7a029621db43..9dd15d679c5d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-rpc/irq.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-rpc/irq.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-rpc/irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-rpc/irq.c</a></div><div class='hunk'>@@ -1,10 +1,10 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/iomd.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> static void iomd_ack_irq_a(unsigned int irq)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/arm/mach-rpc/riscpc.c b/arch/arm/mach-rpc/riscpc.c<br/>index ce8470fea887..e88d417736af 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-rpc/riscpc.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-rpc/riscpc.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-rpc/riscpc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-rpc/riscpc.c</a></div><div class='hunk'>@@ -18,9 +18,9 @@</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/serial_8250.h&gt;</div><div class='ctx'> #include &lt;linux/ata_platform.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/elf.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-s3c2400/gpio.c b/arch/arm/mach-s3c2400/gpio.c<br/>index 148d0ddef3e8..7a7ed4174c8c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2400/gpio.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-s3c2400/gpio.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2400/gpio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2400/gpio.c</a></div><div class='hunk'>@@ -24,10 +24,10 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/regs-gpio.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-s3c2410/bast-irq.c b/arch/arm/mach-s3c2410/bast-irq.c<br/>index c66021b5fa4d..9a37c87152b0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2410/bast-irq.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-s3c2410/bast-irq.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2410/bast-irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2410/bast-irq.c</a></div><div class='hunk'>@@ -25,12 +25,12 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -38,7 +38,7 @@</div><div class='ctx'> #include &lt;mach/bast-map.h&gt;</div><div class='ctx'> #include &lt;mach/bast-irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c24xx/irq.h&gt;</div><div class='add'>+#include &lt;plat/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #if 0</div><div class='ctx'> #include &lt;asm/debug-ll.h&gt;</div><div class='hunk'>@@ -130,8 +130,7 @@ bast_irq_pc104_demux(unsigned int irq,</div><div class='ctx'> 		for (i = 0; stat != 0; i++, stat &gt;&gt;= 1) {</div><div class='ctx'> 			if (stat &amp; 1) {</div><div class='ctx'> 				irqno = bast_pc104_irqs[i];</div><div class='del'>-				desc = irq_desc + irqno;</div><div class='del'>-				desc_handle_irq(irqno, desc);</div><div class='add'>+				generic_handle_irq(irqno);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/clock.c b/arch/arm/mach-s3c2410/clock.c<br/>index 1322851d1acb..4e07943c1e29 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2410/clock.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-s3c2410/clock.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2410/clock.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2410/clock.c</a></div><div class='hunk'>@@ -31,19 +31,19 @@</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/serial_core.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c/regs-serial.h&gt;</div><div class='add'>+#include &lt;plat/regs-serial.h&gt;</div><div class='ctx'> #include &lt;mach/regs-clock.h&gt;</div><div class='ctx'> #include &lt;mach/regs-gpio.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c24xx/s3c2410.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/clock.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/cpu.h&gt;</div><div class='add'>+#include &lt;plat/s3c2410.h&gt;</div><div class='add'>+#include &lt;plat/clock.h&gt;</div><div class='add'>+#include &lt;plat/cpu.h&gt;</div><div class='ctx'> </div><div class='ctx'> int s3c2410_clkcon_enable(struct clk *clk, int enable)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/dma.c b/arch/arm/mach-s3c2410/dma.c<br/>index 8730797749e3..7d914a470b6c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2410/dma.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-s3c2410/dma.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2410/dma.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2410/dma.c</a></div><div class='hunk'>@@ -20,10 +20,10 @@</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='ctx'> #include &lt;mach/dma.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c24xx/cpu.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/dma.h&gt;</div><div class='add'>+#include &lt;plat/cpu.h&gt;</div><div class='add'>+#include &lt;plat/dma.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c/regs-serial.h&gt;</div><div class='add'>+#include &lt;plat/regs-serial.h&gt;</div><div class='ctx'> #include &lt;mach/regs-gpio.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c/regs-ac97.h&gt;</div><div class='ctx'> #include &lt;mach/regs-mem.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/gpio.c b/arch/arm/mach-s3c2410/gpio.c<br/>index c6eefb1d590c..36a3132f39e7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2410/gpio.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-s3c2410/gpio.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2410/gpio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2410/gpio.c</a></div><div class='hunk'>@@ -25,10 +25,10 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/regs-gpio.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-s3c2410/include/mach/debug-macro.S b/arch/arm/mach-s3c2410/include/mach/debug-macro.S<br/>index 682df23087ab..4c29a89ad077 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2410/include/mach/debug-macro.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-s3c2410/include/mach/debug-macro.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2410/include/mach/debug-macro.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2410/include/mach/debug-macro.S</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/map.h&gt;</div><div class='ctx'> #include &lt;mach/regs-gpio.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c/regs-serial.h&gt;</div><div class='add'>+#include &lt;plat/regs-serial.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define S3C2410_UART1_OFF (0x4000)</div><div class='ctx'> #define SHIFT_2440TXF (14-9)</div><div class='hunk'>@@ -99,4 +99,4 @@</div><div class='ctx'> </div><div class='ctx'> /* include the reset of the code which will do the work */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c/debug-macro.S&gt;</div><div class='add'>+#include &lt;plat/debug-macro.S&gt;</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/include/mach/map.h b/arch/arm/mach-s3c2410/include/mach/map.h<br/>index 64bf7e94a5bf..23c470c2e5b1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2410/include/mach/map.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-s3c2410/include/mach/map.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2410/include/mach/map.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2410/include/mach/map.h</a></div><div class='hunk'>@@ -13,7 +13,7 @@</div><div class='ctx'> #ifndef __ASM_ARCH_MAP_H</div><div class='ctx'> #define __ASM_ARCH_MAP_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c/map.h&gt;</div><div class='add'>+#include &lt;plat/map.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define S3C2410_ADDR(x)		S3C_ADDR(x)</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-s3c2410/include/mach/spi.h b/arch/arm/mach-s3c2410/include/mach/spi.h<br/>index 921b13b4f0a0..46d46f5b99f2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2410/include/mach/spi.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-s3c2410/include/mach/spi.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2410/include/mach/spi.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2410/include/mach/spi.h</a></div><div class='hunk'>@@ -18,6 +18,7 @@ struct s3c2410_spi_info {</div><div class='ctx'> 	unsigned int		 num_cs;	/* total chipselects */</div><div class='ctx'> 	int			 bus_num;       /* bus number to use. */</div><div class='ctx'> </div><div class='add'>+	void (*gpio_setup)(struct s3c2410_spi_info *spi, int enable);</div><div class='ctx'> 	void (*set_cs)(struct s3c2410_spi_info *spi, int cs, int pol);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-s3c2410/include/mach/system-reset.h b/arch/arm/mach-s3c2410/include/mach/system-reset.h<br/>index ec2defebf0d5..43535a0e7186 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2410/include/mach/system-reset.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-s3c2410/include/mach/system-reset.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2410/include/mach/system-reset.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2410/include/mach/system-reset.h</a></div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/plat-s3c/regs-watchdog.h&gt;</div><div class='ctx'> #include &lt;mach/regs-clock.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/include/mach/system.h b/arch/arm/mach-s3c2410/include/mach/system.h<br/>index e9f676bc0116..a8cbca6701e5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2410/include/mach/system.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-s3c2410/include/mach/system.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2410/include/mach/system.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2410/include/mach/system.h</a></div><div class='hunk'>@@ -10,8 +10,8 @@</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/map.h&gt;</div><div class='ctx'> #include &lt;mach/idle.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/include/mach/uncompress.h b/arch/arm/mach-s3c2410/include/mach/uncompress.h<br/>index 708e47459ffc..ab39491beee2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2410/include/mach/uncompress.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-s3c2410/include/mach/uncompress.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2410/include/mach/uncompress.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2410/include/mach/uncompress.h</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> #undef S3C2410_GPIOREG</div><div class='ctx'> #define S3C2410_GPIOREG(x) ((S3C24XX_PA_GPIO + (x)))</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c/uncompress.h&gt;</div><div class='add'>+#include &lt;plat/uncompress.h&gt;</div><div class='ctx'> </div><div class='ctx'> static inline int is_arm926(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/irq.c b/arch/arm/mach-s3c2410/irq.c<br/>index f5c5c53e1cc1..92150399563b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2410/irq.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-s3c2410/irq.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2410/irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2410/irq.c</a></div><div class='hunk'>@@ -25,8 +25,8 @@</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/sysdev.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c24xx/cpu.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/pm.h&gt;</div><div class='add'>+#include &lt;plat/cpu.h&gt;</div><div class='add'>+#include &lt;plat/pm.h&gt;</div><div class='ctx'> </div><div class='ctx'> static int s3c2410_irq_add(struct sys_device *sysdev)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/mach-amlm5900.c b/arch/arm/mach-s3c2410/mach-amlm5900.c<br/>index f0de3c23ce78..d061fea01900 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2410/mach-amlm5900.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-s3c2410/mach-amlm5900.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2410/mach-amlm5900.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2410/mach-amlm5900.c</a></div><div class='hunk'>@@ -36,6 +36,7 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='ctx'> #include &lt;linux/serial_core.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='hunk'>@@ -43,17 +44,16 @@</div><div class='ctx'> #include &lt;asm/mach/flash.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;mach/fb.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c/regs-serial.h&gt;</div><div class='add'>+#include &lt;plat/regs-serial.h&gt;</div><div class='ctx'> #include &lt;mach/regs-lcd.h&gt;</div><div class='ctx'> #include &lt;mach/regs-gpio.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c24xx/devs.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/cpu.h&gt;</div><div class='add'>+#include &lt;plat/devs.h&gt;</div><div class='add'>+#include &lt;plat/cpu.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MTD_PARTITIONS</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-s3c2410/mach-bast.c b/arch/arm/mach-s3c2410/mach-bast.c<br/>index 24c6334fac89..8db9c700e3c2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2410/mach-bast.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-s3c2410/mach-bast.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2410/mach-bast.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2410/mach-bast.c</a></div><div class='hunk'>@@ -22,6 +22,7 @@</div><div class='ctx'> #include &lt;linux/dm9000.h&gt;</div><div class='ctx'> #include &lt;linux/ata_platform.h&gt;</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;net/ax88796.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -34,12 +35,11 @@</div><div class='ctx'> #include &lt;mach/bast-cpld.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='ctx'> //#include &lt;asm/debug-ll.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c/regs-serial.h&gt;</div><div class='add'>+#include &lt;plat/regs-serial.h&gt;</div><div class='ctx'> #include &lt;mach/regs-gpio.h&gt;</div><div class='ctx'> #include &lt;mach/regs-mem.h&gt;</div><div class='ctx'> #include &lt;mach/regs-lcd.h&gt;</div><div class='hunk'>@@ -55,9 +55,9 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/serial_8250.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c24xx/clock.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/devs.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/cpu.h&gt;</div><div class='add'>+#include &lt;plat/clock.h&gt;</div><div class='add'>+#include &lt;plat/devs.h&gt;</div><div class='add'>+#include &lt;plat/cpu.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "usb-simtec.h"</div><div class='ctx'> #include "nor-simtec.h"</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/mach-h1940.c b/arch/arm/mach-s3c2410/mach-h1940.c<br/>index e35933a46d10..98716d0108e9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2410/mach-h1940.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-s3c2410/mach-h1940.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2410/mach-h1940.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2410/mach-h1940.c</a></div><div class='hunk'>@@ -20,17 +20,17 @@</div><div class='ctx'> #include &lt;linux/sysdev.h&gt;</div><div class='ctx'> #include &lt;linux/serial_core.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c/regs-serial.h&gt;</div><div class='add'>+#include &lt;plat/regs-serial.h&gt;</div><div class='ctx'> #include &lt;mach/regs-lcd.h&gt;</div><div class='ctx'> #include &lt;mach/regs-gpio.h&gt;</div><div class='ctx'> #include &lt;mach/regs-clock.h&gt;</div><div class='hunk'>@@ -40,10 +40,10 @@</div><div class='ctx'> #include &lt;mach/fb.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c24xx/udc.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c24xx/clock.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/devs.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/cpu.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/pm.h&gt;</div><div class='add'>+#include &lt;plat/clock.h&gt;</div><div class='add'>+#include &lt;plat/devs.h&gt;</div><div class='add'>+#include &lt;plat/cpu.h&gt;</div><div class='add'>+#include &lt;plat/pm.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct map_desc h1940_iodesc[] __initdata = {</div><div class='ctx'> 	[0] = {</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/mach-n30.c b/arch/arm/mach-s3c2410/mach-n30.c<br/>index 80fe2ed0775c..82505517846c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2410/mach-n30.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-s3c2410/mach-n30.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2410/mach-n30.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2410/mach-n30.c</a></div><div class='hunk'>@@ -25,9 +25,9 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/serial_core.h&gt;</div><div class='ctx'> #include &lt;linux/timer.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -41,12 +41,12 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/plat-s3c/iic.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c/regs-serial.h&gt;</div><div class='add'>+#include &lt;plat/regs-serial.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c24xx/clock.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/cpu.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/devs.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/s3c2410.h&gt;</div><div class='add'>+#include &lt;plat/clock.h&gt;</div><div class='add'>+#include &lt;plat/cpu.h&gt;</div><div class='add'>+#include &lt;plat/devs.h&gt;</div><div class='add'>+#include &lt;plat/s3c2410.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c24xx/udc.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct map_desc n30_iodesc[] __initdata = {</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/mach-otom.c b/arch/arm/mach-s3c2410/mach-otom.c<br/>index 606ee15911b6..d8255cf87e44 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2410/mach-otom.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-s3c2410/mach-otom.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2410/mach-otom.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2410/mach-otom.c</a></div><div class='hunk'>@@ -17,6 +17,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/serial_core.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='hunk'>@@ -25,17 +26,16 @@</div><div class='ctx'> #include &lt;mach/otom-map.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c/regs-serial.h&gt;</div><div class='add'>+#include &lt;plat/regs-serial.h&gt;</div><div class='ctx'> #include &lt;mach/regs-gpio.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c24xx/s3c2410.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/clock.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/devs.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/cpu.h&gt;</div><div class='add'>+#include &lt;plat/s3c2410.h&gt;</div><div class='add'>+#include &lt;plat/clock.h&gt;</div><div class='add'>+#include &lt;plat/devs.h&gt;</div><div class='add'>+#include &lt;plat/cpu.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct map_desc otom11_iodesc[] __initdata = {</div><div class='ctx'>   /* Device area */</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/mach-qt2410.c b/arch/arm/mach-s3c2410/mach-qt2410.c<br/>index 7d34844debde..661807e14e8a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2410/mach-qt2410.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-s3c2410/mach-qt2410.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2410/mach-qt2410.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2410/mach-qt2410.c</a></div><div class='hunk'>@@ -32,7 +32,7 @@</div><div class='ctx'> #include &lt;linux/serial_core.h&gt;</div><div class='ctx'> #include &lt;linux/spi/spi.h&gt;</div><div class='ctx'> #include &lt;linux/spi/spi_bitbang.h&gt;</div><div class='del'>-</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/mtd.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/nand.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/nand_ecc.h&gt;</div><div class='hunk'>@@ -43,23 +43,22 @@</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/regs-gpio.h&gt;</div><div class='ctx'> #include &lt;mach/leds-gpio.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c/regs-serial.h&gt;</div><div class='add'>+#include &lt;plat/regs-serial.h&gt;</div><div class='ctx'> #include &lt;mach/fb.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c/nand.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c24xx/udc.h&gt;</div><div class='ctx'> #include &lt;mach/spi.h&gt;</div><div class='ctx'> #include &lt;mach/spi-gpio.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c24xx/common-smdk.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/devs.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/cpu.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/pm.h&gt;</div><div class='add'>+#include &lt;plat/common-smdk.h&gt;</div><div class='add'>+#include &lt;plat/devs.h&gt;</div><div class='add'>+#include &lt;plat/cpu.h&gt;</div><div class='add'>+#include &lt;plat/pm.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct map_desc qt2410_iodesc[] __initdata = {</div><div class='ctx'> 	{ 0xe0000000, __phys_to_pfn(S3C2410_CS3+0x01000000), SZ_1M, MT_DEVICE }</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/mach-smdk2410.c b/arch/arm/mach-s3c2410/mach-smdk2410.c<br/>index b88939d72282..152527bb2872 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2410/mach-smdk2410.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-s3c2410/mach-smdk2410.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2410/mach-smdk2410.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2410/mach-smdk2410.c</a></div><div class='hunk'>@@ -36,22 +36,22 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/serial_core.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c/regs-serial.h&gt;</div><div class='add'>+#include &lt;plat/regs-serial.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c24xx/devs.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/cpu.h&gt;</div><div class='add'>+#include &lt;plat/devs.h&gt;</div><div class='add'>+#include &lt;plat/cpu.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c24xx/common-smdk.h&gt;</div><div class='add'>+#include &lt;plat/common-smdk.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct map_desc smdk2410_iodesc[] __initdata = {</div><div class='ctx'>   /* nothing here yet */</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/mach-tct_hammer.c b/arch/arm/mach-s3c2410/mach-tct_hammer.c<br/>index ec87306a8c24..309dcf4c870a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2410/mach-tct_hammer.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-s3c2410/mach-tct_hammer.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2410/mach-tct_hammer.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2410/mach-tct_hammer.c</a></div><div class='hunk'>@@ -33,6 +33,7 @@</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/serial_core.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='hunk'>@@ -40,13 +41,12 @@</div><div class='ctx'> #include &lt;asm/mach/flash.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c/regs-serial.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/devs.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/cpu.h&gt;</div><div class='add'>+#include &lt;plat/regs-serial.h&gt;</div><div class='add'>+#include &lt;plat/devs.h&gt;</div><div class='add'>+#include &lt;plat/cpu.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MTD_PARTITIONS</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-s3c2410/mach-vr1000.c b/arch/arm/mach-s3c2410/mach-vr1000.c<br/>index fbc0213d5485..941353af16dc 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2410/mach-vr1000.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-s3c2410/mach-vr1000.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2410/mach-vr1000.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2410/mach-vr1000.c</a></div><div class='hunk'>@@ -25,6 +25,7 @@</div><div class='ctx'> #include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/serial_8250.h&gt;</div><div class='ctx'> #include &lt;linux/serial_reg.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='hunk'>@@ -36,17 +37,16 @@</div><div class='ctx'> #include &lt;mach/vr1000-cpld.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c/regs-serial.h&gt;</div><div class='add'>+#include &lt;plat/regs-serial.h&gt;</div><div class='ctx'> #include &lt;mach/regs-gpio.h&gt;</div><div class='ctx'> #include &lt;mach/leds-gpio.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c24xx/clock.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/devs.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/cpu.h&gt;</div><div class='add'>+#include &lt;plat/clock.h&gt;</div><div class='add'>+#include &lt;plat/devs.h&gt;</div><div class='add'>+#include &lt;plat/cpu.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "usb-simtec.h"</div><div class='ctx'> #include "nor-simtec.h"</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/pm.c b/arch/arm/mach-s3c2410/pm.c<br/>index ba43ff9e8164..a6970f613192 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2410/pm.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-s3c2410/pm.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2410/pm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2410/pm.c</a></div><div class='hunk'>@@ -25,17 +25,17 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='ctx'> #include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/regs-gpio.h&gt;</div><div class='ctx'> #include &lt;mach/h1940.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c24xx/cpu.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/pm.h&gt;</div><div class='add'>+#include &lt;plat/cpu.h&gt;</div><div class='add'>+#include &lt;plat/pm.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_S3C2410_PM_DEBUG</div><div class='ctx'> extern void pm_dbg(const char *fmt, ...);</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/s3c2410.c b/arch/arm/mach-s3c2410/s3c2410.c<br/>index 5d977f9c88ac..ac79b536c4c3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2410/s3c2410.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-s3c2410/s3c2410.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2410/s3c2410.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2410/s3c2410.c</a></div><div class='hunk'>@@ -19,22 +19,22 @@</div><div class='ctx'> #include &lt;linux/sysdev.h&gt;</div><div class='ctx'> #include &lt;linux/serial_core.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/regs-clock.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c/regs-serial.h&gt;</div><div class='add'>+#include &lt;plat/regs-serial.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c24xx/s3c2410.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/cpu.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/devs.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/clock.h&gt;</div><div class='add'>+#include &lt;plat/s3c2410.h&gt;</div><div class='add'>+#include &lt;plat/cpu.h&gt;</div><div class='add'>+#include &lt;plat/devs.h&gt;</div><div class='add'>+#include &lt;plat/clock.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Initial IO mappings */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-s3c2410/sleep.S b/arch/arm/mach-s3c2410/sleep.S<br/>index be37f221a177..dd5b6388a5a5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2410/sleep.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-s3c2410/sleep.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2410/sleep.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2410/sleep.S</a></div><div class='hunk'>@@ -32,7 +32,7 @@</div><div class='ctx'> #include &lt;mach/regs-gpio.h&gt;</div><div class='ctx'> #include &lt;mach/regs-clock.h&gt;</div><div class='ctx'> #include &lt;mach/regs-mem.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c/regs-serial.h&gt;</div><div class='add'>+#include &lt;plat/regs-serial.h&gt;</div><div class='ctx'> </div><div class='ctx'> 	/* s3c2410_cpu_suspend</div><div class='ctx'> 	 *</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/usb-simtec.c b/arch/arm/mach-s3c2410/usb-simtec.c<br/>index 4dacf8a1750d..6078f09b7df5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2410/usb-simtec.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-s3c2410/usb-simtec.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2410/usb-simtec.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2410/usb-simtec.c</a></div><div class='hunk'>@@ -21,6 +21,7 @@</div><div class='ctx'> #include &lt;linux/timer.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='hunk'>@@ -32,10 +33,9 @@</div><div class='ctx'> #include &lt;mach/regs-gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c24xx/devs.h&gt;</div><div class='add'>+#include &lt;plat/devs.h&gt;</div><div class='ctx'> #include "usb-simtec.h"</div><div class='ctx'> </div><div class='ctx'> /* control power and monitor over-current events on various Simtec</div><div class='head'>diff --git a/arch/arm/mach-s3c2412/clock.c b/arch/arm/mach-s3c2412/clock.c<br/>index af4b2ce516f9..96d9eb15424f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2412/clock.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-s3c2412/clock.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2412/clock.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2412/clock.c</a></div><div class='hunk'>@@ -31,19 +31,19 @@</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/serial_core.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c/regs-serial.h&gt;</div><div class='add'>+#include &lt;plat/regs-serial.h&gt;</div><div class='ctx'> #include &lt;mach/regs-clock.h&gt;</div><div class='ctx'> #include &lt;mach/regs-gpio.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c24xx/s3c2412.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/clock.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/cpu.h&gt;</div><div class='add'>+#include &lt;plat/s3c2412.h&gt;</div><div class='add'>+#include &lt;plat/clock.h&gt;</div><div class='add'>+#include &lt;plat/cpu.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* We currently have to assume that the system is running</div><div class='ctx'>  * from the XTPll input, and that all ***REFCLKs are being</div><div class='head'>diff --git a/arch/arm/mach-s3c2412/dma.c b/arch/arm/mach-s3c2412/dma.c<br/>index 22fc04a3b533..ba0591e71f32 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2412/dma.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-s3c2412/dma.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2412/dma.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2412/dma.c</a></div><div class='hunk'>@@ -16,15 +16,15 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/sysdev.h&gt;</div><div class='ctx'> #include &lt;linux/serial_core.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='ctx'> #include &lt;mach/dma.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c24xx/dma.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/cpu.h&gt;</div><div class='add'>+#include &lt;plat/dma.h&gt;</div><div class='add'>+#include &lt;plat/cpu.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c/regs-serial.h&gt;</div><div class='add'>+#include &lt;plat/regs-serial.h&gt;</div><div class='ctx'> #include &lt;mach/regs-gpio.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c/regs-ac97.h&gt;</div><div class='ctx'> #include &lt;mach/regs-mem.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-s3c2412/irq.c b/arch/arm/mach-s3c2412/irq.c<br/>index ac62b79044f4..6000ca9d1815 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2412/irq.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-s3c2412/irq.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2412/irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2412/irq.c</a></div><div class='hunk'>@@ -24,10 +24,10 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -35,9 +35,9 @@</div><div class='ctx'> #include &lt;mach/regs-gpio.h&gt;</div><div class='ctx'> #include &lt;mach/regs-power.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c24xx/cpu.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/irq.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/pm.h&gt;</div><div class='add'>+#include &lt;plat/cpu.h&gt;</div><div class='add'>+#include &lt;plat/irq.h&gt;</div><div class='add'>+#include &lt;plat/pm.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define INTMSK(start, end) ((1 &lt;&lt; ((end) + 1 - (start))) - 1)</div><div class='ctx'> #define INTMSK_SUB(start, end) (INTMSK(start, end) &lt;&lt; ((start - S3C2410_IRQSUB(0))))</div><div class='hunk'>@@ -123,10 +123,10 @@ static void s3c2412_irq_demux_cfsdi(unsigned int irq, struct irq_desc *desc)</div><div class='ctx'> 	subsrc  &amp;= ~submsk;</div><div class='ctx'> </div><div class='ctx'> 	if (subsrc &amp; INTBIT(IRQ_S3C2412_SDI))</div><div class='del'>-		desc_handle_irq(IRQ_S3C2412_SDI, irq_desc + IRQ_S3C2412_SDI);</div><div class='add'>+		generic_handle_irq(IRQ_S3C2412_SDI);</div><div class='ctx'> </div><div class='ctx'> 	if (subsrc &amp; INTBIT(IRQ_S3C2412_CF))</div><div class='del'>-		desc_handle_irq(IRQ_S3C2412_CF, irq_desc + IRQ_S3C2412_CF);</div><div class='add'>+		generic_handle_irq(IRQ_S3C2412_CF);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define INTMSK_CFSDI	(1UL &lt;&lt; (IRQ_S3C2412_CFSDI - IRQ_EINT0))</div><div class='head'>diff --git a/arch/arm/mach-s3c2412/mach-jive.c b/arch/arm/mach-s3c2412/mach-jive.c<br/>index ad980a1690c2..b08f18c8c47a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2412/mach-jive.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-s3c2412/mach-jive.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2412/mach-jive.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2412/mach-jive.c</a></div><div class='hunk'>@@ -30,7 +30,7 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c/regs-serial.h&gt;</div><div class='add'>+#include &lt;plat/regs-serial.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c/nand.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c/iic.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -48,10 +48,10 @@</div><div class='ctx'> #include &lt;linux/mtd/nand_ecc.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c24xx/clock.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/devs.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/cpu.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/pm.h&gt;</div><div class='add'>+#include &lt;plat/clock.h&gt;</div><div class='add'>+#include &lt;plat/devs.h&gt;</div><div class='add'>+#include &lt;plat/cpu.h&gt;</div><div class='add'>+#include &lt;plat/pm.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c24xx/udc.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct map_desc jive_iodesc[] __initdata = {</div><div class='head'>diff --git a/arch/arm/mach-s3c2412/mach-smdk2413.c b/arch/arm/mach-s3c2412/mach-smdk2413.c<br/>index 80affb1ee4cd..c719b5a740a9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2412/mach-smdk2413.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-s3c2412/mach-smdk2413.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2412/mach-smdk2413.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2412/mach-smdk2413.c</a></div><div class='hunk'>@@ -19,6 +19,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/serial_core.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='hunk'>@@ -27,12 +28,11 @@</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/iomd.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='ctx'> //#include &lt;asm/debug-ll.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c/regs-serial.h&gt;</div><div class='add'>+#include &lt;plat/regs-serial.h&gt;</div><div class='ctx'> #include &lt;mach/regs-gpio.h&gt;</div><div class='ctx'> #include &lt;mach/regs-lcd.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -40,13 +40,13 @@</div><div class='ctx'> #include &lt;asm/plat-s3c24xx/udc.h&gt;</div><div class='ctx'> #include &lt;mach/fb.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c24xx/s3c2410.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/s3c2412.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/clock.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/devs.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/cpu.h&gt;</div><div class='add'>+#include &lt;plat/s3c2410.h&gt;</div><div class='add'>+#include &lt;plat/s3c2412.h&gt;</div><div class='add'>+#include &lt;plat/clock.h&gt;</div><div class='add'>+#include &lt;plat/devs.h&gt;</div><div class='add'>+#include &lt;plat/cpu.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c24xx/common-smdk.h&gt;</div><div class='add'>+#include &lt;plat/common-smdk.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct map_desc smdk2413_iodesc[] __initdata = {</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/mach-s3c2412/mach-vstms.c b/arch/arm/mach-s3c2412/mach-vstms.c<br/>index 7a08b3789915..4cfa19ad9be0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2412/mach-vstms.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-s3c2412/mach-vstms.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2412/mach-vstms.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2412/mach-vstms.c</a></div><div class='hunk'>@@ -17,7 +17,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/serial_core.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='del'>-</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/mtd.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/nand.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/nand_ecc.h&gt;</div><div class='hunk'>@@ -29,11 +29,10 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c/regs-serial.h&gt;</div><div class='add'>+#include &lt;plat/regs-serial.h&gt;</div><div class='ctx'> #include &lt;mach/regs-gpio.h&gt;</div><div class='ctx'> #include &lt;mach/regs-lcd.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -42,11 +41,11 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/plat-s3c/nand.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c24xx/s3c2410.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/s3c2412.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/clock.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/devs.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/cpu.h&gt;</div><div class='add'>+#include &lt;plat/s3c2410.h&gt;</div><div class='add'>+#include &lt;plat/s3c2412.h&gt;</div><div class='add'>+#include &lt;plat/clock.h&gt;</div><div class='add'>+#include &lt;plat/devs.h&gt;</div><div class='add'>+#include &lt;plat/cpu.h&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static struct map_desc vstms_iodesc[] __initdata = {</div><div class='head'>diff --git a/arch/arm/mach-s3c2412/pm.c b/arch/arm/mach-s3c2412/pm.c<br/>index 737523a4e037..217e9e4ed45f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2412/pm.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-s3c2412/pm.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2412/pm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2412/pm.c</a></div><div class='hunk'>@@ -18,9 +18,9 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/sysdev.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/regs-power.h&gt;</div><div class='hunk'>@@ -28,10 +28,10 @@</div><div class='ctx'> #include &lt;mach/regs-gpio.h&gt;</div><div class='ctx'> #include &lt;mach/regs-dsc.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c24xx/cpu.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/pm.h&gt;</div><div class='add'>+#include &lt;plat/cpu.h&gt;</div><div class='add'>+#include &lt;plat/pm.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c24xx/s3c2412.h&gt;</div><div class='add'>+#include &lt;plat/s3c2412.h&gt;</div><div class='ctx'> </div><div class='ctx'> extern void s3c2412_sleep_enter(void);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-s3c2412/s3c2412.c b/arch/arm/mach-s3c2412/s3c2412.c<br/>index d278010b9f60..313759c3da69 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2412/s3c2412.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-s3c2412/s3c2412.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2412/s3c2412.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2412/s3c2412.c</a></div><div class='hunk'>@@ -20,6 +20,7 @@</div><div class='ctx'> #include &lt;linux/sysdev.h&gt;</div><div class='ctx'> #include &lt;linux/serial_core.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='hunk'>@@ -27,14 +28,13 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/proc-fns.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/reset.h&gt;</div><div class='ctx'> #include &lt;mach/idle.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/regs-clock.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c/regs-serial.h&gt;</div><div class='add'>+#include &lt;plat/regs-serial.h&gt;</div><div class='ctx'> #include &lt;mach/regs-power.h&gt;</div><div class='ctx'> #include &lt;mach/regs-gpio.h&gt;</div><div class='ctx'> #include &lt;mach/regs-gpioj.h&gt;</div><div class='hunk'>@@ -42,11 +42,11 @@</div><div class='ctx'> #include &lt;asm/plat-s3c24xx/regs-spi.h&gt;</div><div class='ctx'> #include &lt;mach/regs-s3c2412.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c24xx/s3c2412.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/cpu.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/devs.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/clock.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/pm.h&gt;</div><div class='add'>+#include &lt;plat/s3c2412.h&gt;</div><div class='add'>+#include &lt;plat/cpu.h&gt;</div><div class='add'>+#include &lt;plat/devs.h&gt;</div><div class='add'>+#include &lt;plat/clock.h&gt;</div><div class='add'>+#include &lt;plat/pm.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifndef CONFIG_CPU_S3C2412_ONLY</div><div class='ctx'> void __iomem *s3c24xx_va_gpio2 = S3C24XX_VA_GPIO;</div><div class='head'>diff --git a/arch/arm/mach-s3c2440/clock.c b/arch/arm/mach-s3c2440/clock.c<br/>index 95567e6daea1..d1c29b2537cd 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2440/clock.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-s3c2440/clock.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2440/clock.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2440/clock.c</a></div><div class='hunk'>@@ -33,16 +33,16 @@</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/atomic.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/regs-clock.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c24xx/clock.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/cpu.h&gt;</div><div class='add'>+#include &lt;plat/clock.h&gt;</div><div class='add'>+#include &lt;plat/cpu.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* S3C2440 extended clock support */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-s3c2440/dma.c b/arch/arm/mach-s3c2440/dma.c<br/>index cdd4e6e79ac0..32303f6a8321 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2440/dma.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-s3c2440/dma.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2440/dma.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2440/dma.c</a></div><div class='hunk'>@@ -20,10 +20,10 @@</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='ctx'> #include &lt;mach/dma.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c24xx/dma.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/cpu.h&gt;</div><div class='add'>+#include &lt;plat/dma.h&gt;</div><div class='add'>+#include &lt;plat/cpu.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c/regs-serial.h&gt;</div><div class='add'>+#include &lt;plat/regs-serial.h&gt;</div><div class='ctx'> #include &lt;mach/regs-gpio.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c/regs-ac97.h&gt;</div><div class='ctx'> #include &lt;mach/regs-mem.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-s3c2440/dsc.c b/arch/arm/mach-s3c2440/dsc.c<br/>index c0c67438d0a4..554044272771 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2440/dsc.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-s3c2440/dsc.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2440/dsc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2440/dsc.c</a></div><div class='hunk'>@@ -15,20 +15,20 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/regs-gpio.h&gt;</div><div class='ctx'> #include &lt;mach/regs-dsc.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c24xx/cpu.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/s3c2440.h&gt;</div><div class='add'>+#include &lt;plat/cpu.h&gt;</div><div class='add'>+#include &lt;plat/s3c2440.h&gt;</div><div class='ctx'> </div><div class='ctx'> int s3c2440_set_dsc(unsigned int pin, unsigned int value)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/arm/mach-s3c2440/irq.c b/arch/arm/mach-s3c2440/irq.c<br/>index 276b823f4e27..63c5ab65727f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2440/irq.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-s3c2440/irq.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2440/irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2440/irq.c</a></div><div class='hunk'>@@ -24,19 +24,19 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/regs-irq.h&gt;</div><div class='ctx'> #include &lt;mach/regs-gpio.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c24xx/cpu.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/pm.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/irq.h&gt;</div><div class='add'>+#include &lt;plat/cpu.h&gt;</div><div class='add'>+#include &lt;plat/pm.h&gt;</div><div class='add'>+#include &lt;plat/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* WDT/AC97 */</div><div class='ctx'> </div><div class='hunk'>@@ -44,7 +44,6 @@ static void s3c_irq_demux_wdtac97(unsigned int irq,</div><div class='ctx'> 				  struct irq_desc *desc)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int subsrc, submsk;</div><div class='del'>-	struct irq_desc *mydesc;</div><div class='ctx'> </div><div class='ctx'> 	/* read the current pending interrupts, and the mask</div><div class='ctx'> 	 * for what it is available */</div><div class='hunk'>@@ -58,12 +57,10 @@ static void s3c_irq_demux_wdtac97(unsigned int irq,</div><div class='ctx'> </div><div class='ctx'> 	if (subsrc != 0) {</div><div class='ctx'> 		if (subsrc &amp; 1) {</div><div class='del'>-			mydesc = irq_desc + IRQ_S3C2440_WDT;</div><div class='del'>-			desc_handle_irq(IRQ_S3C2440_WDT, mydesc);</div><div class='add'>+			generic_handle_irq(IRQ_S3C2440_WDT);</div><div class='ctx'> 		}</div><div class='ctx'> 		if (subsrc &amp; 2) {</div><div class='del'>-			mydesc = irq_desc + IRQ_S3C2440_AC97;</div><div class='del'>-			desc_handle_irq(IRQ_S3C2440_AC97, mydesc);</div><div class='add'>+			generic_handle_irq(IRQ_S3C2440_AC97);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-s3c2440/mach-anubis.c b/arch/arm/mach-s3c2440/mach-anubis.c<br/>index 441f4bc09472..e2beca470484 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2440/mach-anubis.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-s3c2440/mach-anubis.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2440/mach-anubis.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2440/mach-anubis.c</a></div><div class='hunk'>@@ -19,7 +19,7 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/ata_platform.h&gt;</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='del'>-</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/sm501.h&gt;</div><div class='ctx'> #include &lt;linux/sm501-regs.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -32,11 +32,10 @@</div><div class='ctx'> #include &lt;mach/anubis-cpld.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c/regs-serial.h&gt;</div><div class='add'>+#include &lt;plat/regs-serial.h&gt;</div><div class='ctx'> #include &lt;mach/regs-gpio.h&gt;</div><div class='ctx'> #include &lt;mach/regs-mem.h&gt;</div><div class='ctx'> #include &lt;mach/regs-lcd.h&gt;</div><div class='hunk'>@@ -49,9 +48,9 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;net/ax88796.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c24xx/clock.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/devs.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/cpu.h&gt;</div><div class='add'>+#include &lt;plat/clock.h&gt;</div><div class='add'>+#include &lt;plat/devs.h&gt;</div><div class='add'>+#include &lt;plat/cpu.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define COPYRIGHT ", (c) 2005 Simtec Electronics"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-s3c2440/mach-at2440evb.c b/arch/arm/mach-s3c2440/mach-at2440evb.c<br/>index f0f0cc6afcf4..66876c6f2f1c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2440/mach-at2440evb.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-s3c2440/mach-at2440evb.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2440/mach-at2440evb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2440/mach-at2440evb.c</a></div><div class='hunk'>@@ -31,7 +31,7 @@</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c/regs-serial.h&gt;</div><div class='add'>+#include &lt;plat/regs-serial.h&gt;</div><div class='ctx'> #include &lt;mach/regs-gpio.h&gt;</div><div class='ctx'> #include &lt;mach/regs-mem.h&gt;</div><div class='ctx'> #include &lt;mach/regs-lcd.h&gt;</div><div class='hunk'>@@ -42,9 +42,9 @@</div><div class='ctx'> #include &lt;linux/mtd/nand_ecc.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c24xx/clock.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/devs.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/cpu.h&gt;</div><div class='add'>+#include &lt;plat/clock.h&gt;</div><div class='add'>+#include &lt;plat/devs.h&gt;</div><div class='add'>+#include &lt;plat/cpu.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct map_desc at2440evb_iodesc[] __initdata = {</div><div class='ctx'> 	/* Nothing here */</div><div class='head'>diff --git a/arch/arm/mach-s3c2440/mach-nexcoder.c b/arch/arm/mach-s3c2440/mach-nexcoder.c<br/>index 1a5e7027b41b..a546307fd53d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2440/mach-nexcoder.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-s3c2440/mach-nexcoder.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2440/mach-nexcoder.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2440/mach-nexcoder.c</a></div><div class='hunk'>@@ -21,6 +21,7 @@</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/serial_core.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/mtd/map.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -30,19 +31,18 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='ctx'> //#include &lt;asm/debug-ll.h&gt;</div><div class='ctx'> #include &lt;mach/regs-gpio.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c/regs-serial.h&gt;</div><div class='add'>+#include &lt;plat/regs-serial.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c24xx/s3c2410.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/s3c2440.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/clock.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/devs.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/cpu.h&gt;</div><div class='add'>+#include &lt;plat/s3c2410.h&gt;</div><div class='add'>+#include &lt;plat/s3c2440.h&gt;</div><div class='add'>+#include &lt;plat/clock.h&gt;</div><div class='add'>+#include &lt;plat/devs.h&gt;</div><div class='add'>+#include &lt;plat/cpu.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct map_desc nexcoder_iodesc[] __initdata = {</div><div class='ctx'> 	/* nothing here yet */</div><div class='head'>diff --git a/arch/arm/mach-s3c2440/mach-osiris.c b/arch/arm/mach-s3c2440/mach-osiris.c<br/>index 8b83f93b6102..2361d606abc5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2440/mach-osiris.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-s3c2440/mach-osiris.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2440/mach-osiris.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2440/mach-osiris.c</a></div><div class='hunk'>@@ -20,6 +20,7 @@</div><div class='ctx'> #include &lt;linux/serial_core.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='hunk'>@@ -29,11 +30,10 @@</div><div class='ctx'> #include &lt;mach/osiris-cpld.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c/regs-serial.h&gt;</div><div class='add'>+#include &lt;plat/regs-serial.h&gt;</div><div class='ctx'> #include &lt;mach/regs-gpio.h&gt;</div><div class='ctx'> #include &lt;mach/regs-mem.h&gt;</div><div class='ctx'> #include &lt;mach/regs-lcd.h&gt;</div><div class='hunk'>@@ -44,9 +44,9 @@</div><div class='ctx'> #include &lt;linux/mtd/nand_ecc.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c24xx/clock.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/devs.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/cpu.h&gt;</div><div class='add'>+#include &lt;plat/clock.h&gt;</div><div class='add'>+#include &lt;plat/devs.h&gt;</div><div class='add'>+#include &lt;plat/cpu.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* onboard perihperal map */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-s3c2440/mach-rx3715.c b/arch/arm/mach-s3c2440/mach-rx3715.c<br/>index e0b07e6a0a18..4d14c7cff892 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2440/mach-rx3715.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-s3c2440/mach-rx3715.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2440/mach-rx3715.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2440/mach-rx3715.c</a></div><div class='hunk'>@@ -23,7 +23,7 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/serial_core.h&gt;</div><div class='ctx'> #include &lt;linux/serial.h&gt;</div><div class='del'>-</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/mtd.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/nand.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/nand_ecc.h&gt;</div><div class='hunk'>@@ -34,11 +34,10 @@</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c/regs-serial.h&gt;</div><div class='add'>+#include &lt;plat/regs-serial.h&gt;</div><div class='ctx'> #include &lt;mach/regs-gpio.h&gt;</div><div class='ctx'> #include &lt;mach/regs-lcd.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -46,10 +45,10 @@</div><div class='ctx'> #include &lt;asm/plat-s3c/nand.h&gt;</div><div class='ctx'> #include &lt;mach/fb.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c24xx/clock.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/devs.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/cpu.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/pm.h&gt;</div><div class='add'>+#include &lt;plat/clock.h&gt;</div><div class='add'>+#include &lt;plat/devs.h&gt;</div><div class='add'>+#include &lt;plat/cpu.h&gt;</div><div class='add'>+#include &lt;plat/pm.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct map_desc rx3715_iodesc[] __initdata = {</div><div class='ctx'> 	/* dump ISA space somewhere unused */</div><div class='head'>diff --git a/arch/arm/mach-s3c2440/mach-smdk2440.c b/arch/arm/mach-s3c2440/mach-smdk2440.c<br/>index 327c8f371984..fefeaaa4155f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2440/mach-smdk2440.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-s3c2440/mach-smdk2440.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2440/mach-smdk2440.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2440/mach-smdk2440.c</a></div><div class='hunk'>@@ -21,30 +21,30 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/serial_core.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c/regs-serial.h&gt;</div><div class='add'>+#include &lt;plat/regs-serial.h&gt;</div><div class='ctx'> #include &lt;mach/regs-gpio.h&gt;</div><div class='ctx'> #include &lt;mach/regs-lcd.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/idle.h&gt;</div><div class='ctx'> #include &lt;mach/fb.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c24xx/s3c2410.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/s3c2440.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/clock.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/devs.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/cpu.h&gt;</div><div class='add'>+#include &lt;plat/s3c2410.h&gt;</div><div class='add'>+#include &lt;plat/s3c2440.h&gt;</div><div class='add'>+#include &lt;plat/clock.h&gt;</div><div class='add'>+#include &lt;plat/devs.h&gt;</div><div class='add'>+#include &lt;plat/cpu.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c24xx/common-smdk.h&gt;</div><div class='add'>+#include &lt;plat/common-smdk.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct map_desc smdk2440_iodesc[] __initdata = {</div><div class='ctx'> 	/* ISA IO Space map (memory space selected by A24) */</div><div class='head'>diff --git a/arch/arm/mach-s3c2440/s3c2440.c b/arch/arm/mach-s3c2440/s3c2440.c<br/>index d6b9a92d284e..ac1f7ea5f405 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2440/s3c2440.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-s3c2440/s3c2440.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2440/s3c2440.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2440/s3c2440.c</a></div><div class='hunk'>@@ -20,18 +20,18 @@</div><div class='ctx'> #include &lt;linux/serial_core.h&gt;</div><div class='ctx'> #include &lt;linux/sysdev.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c24xx/s3c2440.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/devs.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/cpu.h&gt;</div><div class='add'>+#include &lt;plat/s3c2440.h&gt;</div><div class='add'>+#include &lt;plat/devs.h&gt;</div><div class='add'>+#include &lt;plat/cpu.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct sys_device s3c2440_sysdev = {</div><div class='ctx'> 	.cls		= &amp;s3c2440_sysclass,</div><div class='head'>diff --git a/arch/arm/mach-s3c2442/clock.c b/arch/arm/mach-s3c2442/clock.c<br/>index 569b5c3d334a..ea1aa1f5157a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2442/clock.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-s3c2442/clock.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2442/clock.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2442/clock.c</a></div><div class='hunk'>@@ -33,16 +33,16 @@</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/atomic.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/regs-clock.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c24xx/clock.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/cpu.h&gt;</div><div class='add'>+#include &lt;plat/clock.h&gt;</div><div class='add'>+#include &lt;plat/cpu.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* S3C2442 extended clock support */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-s3c2442/s3c2442.c b/arch/arm/mach-s3c2442/s3c2442.c<br/>index fbf8264249da..4663bdc7fff6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2442/s3c2442.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-s3c2442/s3c2442.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2442/s3c2442.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2442/s3c2442.c</a></div><div class='hunk'>@@ -19,8 +19,8 @@</div><div class='ctx'> #include &lt;linux/serial_core.h&gt;</div><div class='ctx'> #include &lt;linux/sysdev.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c24xx/s3c2442.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/cpu.h&gt;</div><div class='add'>+#include &lt;plat/s3c2442.h&gt;</div><div class='add'>+#include &lt;plat/cpu.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct sys_device s3c2442_sysdev = {</div><div class='ctx'> 	.cls		= &amp;s3c2442_sysclass,</div><div class='head'>diff --git a/arch/arm/mach-s3c2443/clock.c b/arch/arm/mach-s3c2443/clock.c<br/>index 6a8d7cced4a2..2f60bf6b8d43 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2443/clock.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-s3c2443/clock.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2443/clock.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2443/clock.c</a></div><div class='hunk'>@@ -31,17 +31,17 @@</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/serial_core.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/regs-s3c2443-clock.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c24xx/s3c2443.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/clock.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/cpu.h&gt;</div><div class='add'>+#include &lt;plat/s3c2443.h&gt;</div><div class='add'>+#include &lt;plat/clock.h&gt;</div><div class='add'>+#include &lt;plat/cpu.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* We currently have to assume that the system is running</div><div class='ctx'>  * from the XTPll input, and that all ***REFCLKs are being</div><div class='head'>diff --git a/arch/arm/mach-s3c2443/dma.c b/arch/arm/mach-s3c2443/dma.c<br/>index c1ff03aebfda..f73ccb25ff94 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2443/dma.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-s3c2443/dma.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2443/dma.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2443/dma.c</a></div><div class='hunk'>@@ -16,15 +16,15 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/sysdev.h&gt;</div><div class='ctx'> #include &lt;linux/serial_core.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='ctx'> #include &lt;mach/dma.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c24xx/dma.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/cpu.h&gt;</div><div class='add'>+#include &lt;plat/dma.h&gt;</div><div class='add'>+#include &lt;plat/cpu.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c/regs-serial.h&gt;</div><div class='add'>+#include &lt;plat/regs-serial.h&gt;</div><div class='ctx'> #include &lt;mach/regs-gpio.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c/regs-ac97.h&gt;</div><div class='ctx'> #include &lt;mach/regs-mem.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-s3c2443/irq.c b/arch/arm/mach-s3c2443/irq.c<br/>index 9674de7223fd..0e0d693f3974 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2443/irq.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-s3c2443/irq.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2443/irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2443/irq.c</a></div><div class='hunk'>@@ -24,19 +24,19 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/regs-irq.h&gt;</div><div class='ctx'> #include &lt;mach/regs-gpio.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c24xx/cpu.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/pm.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/irq.h&gt;</div><div class='add'>+#include &lt;plat/cpu.h&gt;</div><div class='add'>+#include &lt;plat/pm.h&gt;</div><div class='add'>+#include &lt;plat/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define INTMSK(start, end) ((1 &lt;&lt; ((end) + 1 - (start))) - 1)</div><div class='ctx'> </div><div class='hunk'>@@ -44,7 +44,6 @@ static inline void s3c2443_irq_demux(unsigned int irq, unsigned int len)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int subsrc, submsk;</div><div class='ctx'> 	unsigned int end;</div><div class='del'>-	struct irq_desc *mydesc;</div><div class='ctx'> </div><div class='ctx'> 	/* read the current pending interrupts, and the mask</div><div class='ctx'> 	 * for what it is available */</div><div class='hunk'>@@ -57,13 +56,11 @@ static inline void s3c2443_irq_demux(unsigned int irq, unsigned int len)</div><div class='ctx'> 	subsrc  &amp;= (1 &lt;&lt; len)-1;</div><div class='ctx'> </div><div class='ctx'> 	end = len + irq;</div><div class='del'>-	mydesc = irq_desc + irq;</div><div class='ctx'> </div><div class='ctx'> 	for (; irq &lt; end &amp;&amp; subsrc; irq++) {</div><div class='ctx'> 		if (subsrc &amp; 1)</div><div class='del'>-			desc_handle_irq(irq, mydesc);</div><div class='add'>+			generic_handle_irq(irq);</div><div class='ctx'> </div><div class='del'>-		mydesc++;</div><div class='ctx'> 		subsrc &gt;&gt;= 1;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-s3c2443/mach-smdk2443.c b/arch/arm/mach-s3c2443/mach-smdk2443.c<br/>index e3c0d587bd10..a7fe65f3dcc1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2443/mach-smdk2443.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-s3c2443/mach-smdk2443.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2443/mach-smdk2443.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2443/mach-smdk2443.c</a></div><div class='hunk'>@@ -21,30 +21,30 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/serial_core.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c/regs-serial.h&gt;</div><div class='add'>+#include &lt;plat/regs-serial.h&gt;</div><div class='ctx'> #include &lt;mach/regs-gpio.h&gt;</div><div class='ctx'> #include &lt;mach/regs-lcd.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/idle.h&gt;</div><div class='ctx'> #include &lt;mach/fb.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c24xx/s3c2410.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/s3c2440.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/clock.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/devs.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/cpu.h&gt;</div><div class='add'>+#include &lt;plat/s3c2410.h&gt;</div><div class='add'>+#include &lt;plat/s3c2440.h&gt;</div><div class='add'>+#include &lt;plat/clock.h&gt;</div><div class='add'>+#include &lt;plat/devs.h&gt;</div><div class='add'>+#include &lt;plat/cpu.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c24xx/common-smdk.h&gt;</div><div class='add'>+#include &lt;plat/common-smdk.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct map_desc smdk2443_iodesc[] __initdata = {</div><div class='ctx'> 	/* ISA IO Space map (memory space selected by A24) */</div><div class='head'>diff --git a/arch/arm/mach-s3c2443/s3c2443.c b/arch/arm/mach-s3c2443/s3c2443.c<br/>index 37793f924b5e..bbeddf9ddcb1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2443/s3c2443.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-s3c2443/s3c2443.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-s3c2443/s3c2443.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-s3c2443/s3c2443.c</a></div><div class='hunk'>@@ -20,21 +20,21 @@</div><div class='ctx'> #include &lt;linux/serial_core.h&gt;</div><div class='ctx'> #include &lt;linux/sysdev.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/regs-s3c2443-clock.h&gt;</div><div class='ctx'> #include &lt;mach/reset.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c24xx/s3c2443.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/devs.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/cpu.h&gt;</div><div class='add'>+#include &lt;plat/s3c2443.h&gt;</div><div class='add'>+#include &lt;plat/devs.h&gt;</div><div class='add'>+#include &lt;plat/cpu.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct map_desc s3c2443_iodesc[] __initdata = {</div><div class='ctx'> 	IODESC_ENT(WATCHDOG),</div><div class='head'>diff --git a/arch/arm/mach-sa1100/badge4.c b/arch/arm/mach-sa1100/badge4.c<br/>index 3efefbdd2527..ab5883b39ddf 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-sa1100/badge4.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-sa1100/badge4.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-sa1100/badge4.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-sa1100/badge4.c</a></div><div class='hunk'>@@ -95,19 +95,19 @@ static int __init badge4_sa1111_init(void)</div><div class='ctx'>  *   One-hundred-twenty-seven 32 KiW Main Blocks (8128 Ki b)</div><div class='ctx'>  */</div><div class='ctx'> static struct mtd_partition badge4_partitions[] = {</div><div class='del'>-        {</div><div class='del'>-                .name           = "BLOB boot loader",</div><div class='del'>-                .offset         = 0,</div><div class='del'>-                .size           = 0x0000A000</div><div class='del'>-        }, {</div><div class='del'>-                .name           = "params",</div><div class='del'>-                .offset         = MTDPART_OFS_APPEND,</div><div class='del'>-                .size           = 0x00006000</div><div class='del'>-        }, {</div><div class='del'>-                .name           = "root",</div><div class='del'>-                .offset         = MTDPART_OFS_APPEND,</div><div class='del'>-                .size           = MTDPART_SIZ_FULL</div><div class='del'>-        }</div><div class='add'>+	{</div><div class='add'>+		.name	= "BLOB boot loader",</div><div class='add'>+		.offset	= 0,</div><div class='add'>+		.size	= 0x0000A000</div><div class='add'>+	}, {</div><div class='add'>+		.name	= "params",</div><div class='add'>+		.offset	= MTDPART_OFS_APPEND,</div><div class='add'>+		.size	= 0x00006000</div><div class='add'>+	}, {</div><div class='add'>+		.name	= "root",</div><div class='add'>+		.offset	= MTDPART_OFS_APPEND,</div><div class='add'>+		.size	= MTDPART_SIZ_FULL</div><div class='add'>+	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct flash_platform_data badge4_flash_data = {</div><div class='hunk'>@@ -126,7 +126,7 @@ static int five_v_on __initdata = 0;</div><div class='ctx'> </div><div class='ctx'> static int __init five_v_on_setup(char *ignore)</div><div class='ctx'> {</div><div class='del'>-        five_v_on = 1;</div><div class='add'>+	five_v_on = 1;</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> __setup("five_v_on", five_v_on_setup);</div><div class='hunk'>@@ -171,15 +171,15 @@ static int __init badge4_init(void)</div><div class='ctx'> 	GPCR  = BADGE4_GPIO_TESTPT_J7;</div><div class='ctx'> 	GPDR |= BADGE4_GPIO_TESTPT_J7;</div><div class='ctx'> </div><div class='del'>- 	/* 5V supply rail. */</div><div class='del'>- 	GPCR  = BADGE4_GPIO_PCMEN5V;		/* initially off */</div><div class='del'>-  	GPDR |= BADGE4_GPIO_PCMEN5V;</div><div class='add'>+	/* 5V supply rail. */</div><div class='add'>+	GPCR  = BADGE4_GPIO_PCMEN5V;		/* initially off */</div><div class='add'>+	GPDR |= BADGE4_GPIO_PCMEN5V;</div><div class='ctx'> </div><div class='ctx'> 	/* CPLD sdram type inputs; set up by blob */</div><div class='ctx'> 	//GPDR |= (BADGE4_GPIO_SDTYP1 | BADGE4_GPIO_SDTYP0);</div><div class='ctx'> 	printk(KERN_DEBUG __FILE__ ": SDRAM CPLD typ1=%d typ0=%d\n",</div><div class='del'>-	       !!(GPLR &amp; BADGE4_GPIO_SDTYP1),</div><div class='del'>-	       !!(GPLR &amp; BADGE4_GPIO_SDTYP0));</div><div class='add'>+		!!(GPLR &amp; BADGE4_GPIO_SDTYP1),</div><div class='add'>+		!!(GPLR &amp; BADGE4_GPIO_SDTYP0));</div><div class='ctx'> </div><div class='ctx'> 	/* SA1111 reset pin; set up by blob */</div><div class='ctx'> 	//GPSR  = BADGE4_GPIO_SA1111_NRST;</div><div class='hunk'>@@ -205,8 +205,8 @@ static int __init badge4_init(void)</div><div class='ctx'> 	ret = badge4_sa1111_init();</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		printk(KERN_ERR</div><div class='del'>-		       "%s: SA-1111 initialization failed (%d)\n",</div><div class='del'>-		       __func__, ret);</div><div class='add'>+			"%s: SA-1111 initialization failed (%d)\n",</div><div class='add'>+			__func__, ret);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 	/* maybe turn on 5v0 from the start */</div><div class='hunk'>@@ -254,7 +254,7 @@ EXPORT_SYMBOL(badge4_set_5V);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static struct map_desc badge4_io_desc[] __initdata = {</div><div class='del'>-  	{	/* SRAM  bank 1 */</div><div class='add'>+	{	/* SRAM  bank 1 */</div><div class='ctx'> 		.virtual	= 0xf1000000,</div><div class='ctx'> 		.pfn		= __phys_to_pfn(0x08000000),</div><div class='ctx'> 		.length		= 0x00100000,</div><div class='head'>diff --git a/arch/arm/mach-sa1100/cpu-sa1100.c b/arch/arm/mach-sa1100/cpu-sa1100.c<br/>index da3a898a6d66..244d5956312c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-sa1100/cpu-sa1100.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-sa1100/cpu-sa1100.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-sa1100/cpu-sa1100.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-sa1100/cpu-sa1100.c</a></div><div class='hunk'>@@ -88,6 +88,8 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/cpufreq.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/cputype.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='hunk'>@@ -222,7 +224,6 @@ static int __init sa1100_cpu_init(struct cpufreq_policy *policy)</div><div class='ctx'> 	if (policy-&gt;cpu != 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	policy-&gt;cur = policy-&gt;min = policy-&gt;max = sa11x0_getspeed(0);</div><div class='del'>-	policy-&gt;governor = CPUFREQ_DEFAULT_GOVERNOR;</div><div class='ctx'> 	policy-&gt;cpuinfo.min_freq = 59000;</div><div class='ctx'> 	policy-&gt;cpuinfo.max_freq = 287000;</div><div class='ctx'> 	policy-&gt;cpuinfo.transition_latency = CPUFREQ_ETERNAL;</div><div class='hunk'>@@ -240,7 +241,7 @@ static struct cpufreq_driver sa1100_driver = {</div><div class='ctx'> </div><div class='ctx'> static int __init sa1100_dram_init(void)</div><div class='ctx'> {</div><div class='del'>- 	if ((processor_id &amp; CPU_SA1100_MASK) == CPU_SA1100_ID)</div><div class='add'>+	if (cpu_is_sa1100())</div><div class='ctx'> 		return cpufreq_register_driver(&amp;sa1100_driver);</div><div class='ctx'> 	else</div><div class='ctx'> 		return -ENODEV;</div><div class='head'>diff --git a/arch/arm/mach-sa1100/cpu-sa1110.c b/arch/arm/mach-sa1100/cpu-sa1110.c<br/>index 029dbfbbafcf..3e4fb214eada 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-sa1100/cpu-sa1110.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-sa1100/cpu-sa1110.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-sa1100/cpu-sa1110.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-sa1100/cpu-sa1110.c</a></div><div class='hunk'>@@ -23,10 +23,11 @@</div><div class='ctx'> #include &lt;linux/cpufreq.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;asm/cputype.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='head'>diff --git a/arch/arm/mach-sa1100/generic.c b/arch/arm/mach-sa1100/generic.c<br/>index b422526f6d8b..c1fbd5b5f9c4 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-sa1100/generic.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-sa1100/generic.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-sa1100/generic.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-sa1100/generic.c</a></div><div class='hunk'>@@ -42,7 +42,7 @@ EXPORT_SYMBOL(reset_status);</div><div class='ctx'> static const unsigned short cclk_frequency_100khz[NR_FREQS] = {</div><div class='ctx'> 	 590,	/*  59.0 MHz */</div><div class='ctx'> 	 737,	/*  73.7 MHz */</div><div class='del'>-	 885, 	/*  88.5 MHz */</div><div class='add'>+	 885,	/*  88.5 MHz */</div><div class='ctx'> 	1032,	/* 103.2 MHz */</div><div class='ctx'> 	1180,	/* 118.0 MHz */</div><div class='ctx'> 	1327,	/* 132.7 MHz */</div><div class='hunk'>@@ -52,10 +52,10 @@ static const unsigned short cclk_frequency_100khz[NR_FREQS] = {</div><div class='ctx'> 	1917,	/* 191.7 MHz */</div><div class='ctx'> 	2064,	/* 206.4 MHz */</div><div class='ctx'> 	2212,	/* 221.2 MHz */</div><div class='del'>-	2359,   /* 235.9 MHz */</div><div class='del'>-	2507,   /* 250.7 MHz */</div><div class='del'>-	2654,   /* 265.4 MHz */</div><div class='del'>-	2802    /* 280.2 MHz */</div><div class='add'>+	2359,	/* 235.9 MHz */</div><div class='add'>+	2507,	/* 250.7 MHz */</div><div class='add'>+	2654,	/* 265.4 MHz */</div><div class='add'>+	2802	/* 280.2 MHz */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_CPU_FREQ_SA1100) || defined(CONFIG_CPU_FREQ_SA1110)</div><div class='hunk'>@@ -113,7 +113,7 @@ unsigned int sa11x0_getspeed(unsigned int cpu)</div><div class='ctx'> #else</div><div class='ctx'> /*</div><div class='ctx'>  * We still need to provide this so building without cpufreq works.</div><div class='del'>- */ </div><div class='add'>+ */</div><div class='ctx'> unsigned int cpufreq_get(unsigned int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	return cclk_frequency_100khz[PPCR &amp; 0xf] * 100;</div><div class='hunk'>@@ -389,7 +389,7 @@ EXPORT_SYMBOL(sa1100fb_lcd_power);</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static struct map_desc standard_io_desc[] __initdata = {</div><div class='del'>-  	{	/* PCM */</div><div class='add'>+	{	/* PCM */</div><div class='ctx'> 		.virtual	=  0xf8000000,</div><div class='ctx'> 		.pfn		= __phys_to_pfn(0x80000000),</div><div class='ctx'> 		.length		= 0x00100000,</div><div class='head'>diff --git a/arch/arm/mach-sa1100/include/mach/SA-1100.h b/arch/arm/mach-sa1100/include/mach/SA-1100.h<br/>index 62aaf04a3906..4f7ea012e1e5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-sa1100/include/mach/SA-1100.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-sa1100/include/mach/SA-1100.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-sa1100/include/mach/SA-1100.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-sa1100/include/mach/SA-1100.h</a></div><div class='hunk'>@@ -2054,19 +2054,3 @@</div><div class='ctx'>                 	        	/* active display mode)            */</div><div class='ctx'> #define LCCR3_OutEnH	(LCCR3_OEP*0)	/*  Output Enable active High      */</div><div class='ctx'> #define LCCR3_OutEnL	(LCCR3_OEP*1)	/*  Output Enable active Low       */</div><div class='del'>-</div><div class='del'>-#ifndef __ASSEMBLY__</div><div class='del'>-extern unsigned int processor_id;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define CPU_REVISION	(processor_id &amp; 15)</div><div class='del'>-#define CPU_SA1110_A0	(0)</div><div class='del'>-#define CPU_SA1110_B0	(4)</div><div class='del'>-#define CPU_SA1110_B1	(5)</div><div class='del'>-#define CPU_SA1110_B2	(6)</div><div class='del'>-#define CPU_SA1110_B4	(8)</div><div class='del'>-</div><div class='del'>-#define CPU_SA1100_ID	(0x4401a110)</div><div class='del'>-#define CPU_SA1100_MASK	(0xfffffff0)</div><div class='del'>-#define CPU_SA1110_ID	(0x6901b110)</div><div class='del'>-#define CPU_SA1110_MASK	(0xfffffff0)</div><div class='head'>diff --git a/arch/arm/mach-sa1100/include/mach/hardware.h b/arch/arm/mach-sa1100/include/mach/hardware.h<br/>index 5976435f42c2..b70846c096aa 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-sa1100/include/mach/hardware.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-sa1100/include/mach/hardware.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-sa1100/include/mach/hardware.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-sa1100/include/mach/hardware.h</a></div><div class='hunk'>@@ -36,8 +36,26 @@</div><div class='ctx'> #define io_v2p( x )             \</div><div class='ctx'>    ( (((x)&amp;0x00ffffff) | (((x)&amp;(0x30000000&gt;&gt;VIO_SHIFT))&lt;&lt;VIO_SHIFT)) + PIO_START )</div><div class='ctx'> </div><div class='add'>+#define CPU_SA1110_A0	(0)</div><div class='add'>+#define CPU_SA1110_B0	(4)</div><div class='add'>+#define CPU_SA1110_B1	(5)</div><div class='add'>+#define CPU_SA1110_B2	(6)</div><div class='add'>+#define CPU_SA1110_B4	(8)</div><div class='add'>+</div><div class='add'>+#define CPU_SA1100_ID	(0x4401a110)</div><div class='add'>+#define CPU_SA1100_MASK	(0xfffffff0)</div><div class='add'>+#define CPU_SA1110_ID	(0x6901b110)</div><div class='add'>+#define CPU_SA1110_MASK	(0xfffffff0)</div><div class='add'>+</div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/cputype.h&gt;</div><div class='add'>+</div><div class='add'>+#define CPU_REVISION	(read_cpuid_id() &amp; 15)</div><div class='add'>+</div><div class='add'>+#define cpu_is_sa1100()	((read_cpuid_id() &amp; CPU_SA1100_MASK) == CPU_SA1100_ID)</div><div class='add'>+#define cpu_is_sa1110()	((read_cpuid_id() &amp; CPU_SA1110_MASK) == CPU_SA1110_ID)</div><div class='add'>+</div><div class='ctx'> # define __REG(x)	(*((volatile unsigned long *)io_p2v(x)))</div><div class='ctx'> # define __PREG(x)	(io_v2p((unsigned long)&amp;(x)))</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-sa1100/include/mach/memory.h b/arch/arm/mach-sa1100/include/mach/memory.h<br/>index 29f639e2afc6..1c127b68581d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-sa1100/include/mach/memory.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-sa1100/include/mach/memory.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-sa1100/include/mach/memory.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-sa1100/include/mach/memory.h</a></div><div class='hunk'>@@ -40,23 +40,21 @@ void sa1111_adjust_zones(int node, unsigned long *size, unsigned long *holes);</div><div class='ctx'> #define __bus_to_virt(x)	 __phys_to_virt(x)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Because of the wide memory address space between physical RAM banks on the </div><div class='del'>- * SA1100, it's much convenient to use Linux's NUMA support to implement our </div><div class='del'>- * memory map representation.  Assuming all memory nodes have equal access </div><div class='add'>+ * Because of the wide memory address space between physical RAM banks on the</div><div class='add'>+ * SA1100, it's much convenient to use Linux's SparseMEM support to implement</div><div class='add'>+ * our memory map representation.  Assuming all memory nodes have equal access</div><div class='ctx'>  * characteristics, we then have generic discontiguous memory support.</div><div class='ctx'>  *</div><div class='del'>- * Of course, all this isn't mandatory for SA1100 implementations with only</div><div class='del'>- * one used memory bank.  For those, simply undefine CONFIG_DISCONTIGMEM.</div><div class='del'>- *</div><div class='del'>- * The nodes are matched with the physical memory bank addresses which are </div><div class='del'>- * incidentally the same as virtual addresses.</div><div class='add'>+ * The sparsemem banks are matched with the physical memory bank addresses</div><div class='add'>+ * which are incidentally the same as virtual addresses.</div><div class='ctx'>  * </div><div class='ctx'>  * 	node 0:  0xc0000000 - 0xc7ffffff</div><div class='ctx'>  * 	node 1:  0xc8000000 - 0xcfffffff</div><div class='ctx'>  * 	node 2:  0xd0000000 - 0xd7ffffff</div><div class='ctx'>  * 	node 3:  0xd8000000 - 0xdfffffff</div><div class='ctx'>  */</div><div class='del'>-#define NODE_MEM_SIZE_BITS	27</div><div class='add'>+#define MAX_PHYSMEM_BITS	32</div><div class='add'>+#define SECTION_SIZE_BITS	27</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Cache flushing area - SA1100 zero bank</div><div class='head'>diff --git a/arch/arm/mach-sa1100/irq.c b/arch/arm/mach-sa1100/irq.c<br/>index 86369a8f0cea..3093d46a9c6f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-sa1100/irq.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-sa1100/irq.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-sa1100/irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-sa1100/irq.c</a></div><div class='hunk'>@@ -122,14 +122,12 @@ sa1100_high_gpio_handler(unsigned int irq, struct irq_desc *desc)</div><div class='ctx'> 		GEDR = mask;</div><div class='ctx'> </div><div class='ctx'> 		irq = IRQ_GPIO11;</div><div class='del'>-		desc = irq_desc + irq;</div><div class='ctx'> 		mask &gt;&gt;= 11;</div><div class='ctx'> 		do {</div><div class='ctx'> 			if (mask &amp; 1)</div><div class='del'>-				desc_handle_irq(irq, desc);</div><div class='add'>+				generic_handle_irq(irq);</div><div class='ctx'> 			mask &gt;&gt;= 1;</div><div class='ctx'> 			irq++;</div><div class='del'>-			desc++;</div><div class='ctx'> 		} while (mask);</div><div class='ctx'> </div><div class='ctx'> 		mask = GEDR &amp; 0xfffff800;</div><div class='head'>diff --git a/arch/arm/mach-sa1100/neponset.c b/arch/arm/mach-sa1100/neponset.c<br/>index 4856a6bd2482..6ccd175bc4cf 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-sa1100/neponset.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-sa1100/neponset.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-sa1100/neponset.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-sa1100/neponset.c</a></div><div class='hunk'>@@ -33,8 +33,6 @@ neponset_irq_handler(unsigned int irq, struct irq_desc *desc)</div><div class='ctx'> 	unsigned int irr;</div><div class='ctx'> </div><div class='ctx'> 	while (1) {</div><div class='del'>-		struct irq_desc *d;</div><div class='del'>-</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Acknowledge the parent IRQ.</div><div class='ctx'> 		 */</div><div class='hunk'>@@ -67,21 +65,18 @@ neponset_irq_handler(unsigned int irq, struct irq_desc *desc)</div><div class='ctx'> 			desc-&gt;chip-&gt;ack(irq);</div><div class='ctx'> </div><div class='ctx'> 			if (irr &amp; IRR_ETHERNET) {</div><div class='del'>-				d = irq_desc + IRQ_NEPONSET_SMC9196;</div><div class='del'>-				desc_handle_irq(IRQ_NEPONSET_SMC9196, d);</div><div class='add'>+				generic_handle_irq(IRQ_NEPONSET_SMC9196);</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			if (irr &amp; IRR_USAR) {</div><div class='del'>-				d = irq_desc + IRQ_NEPONSET_USAR;</div><div class='del'>-				desc_handle_irq(IRQ_NEPONSET_USAR, d);</div><div class='add'>+				generic_handle_irq(IRQ_NEPONSET_USAR);</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			desc-&gt;chip-&gt;unmask(irq);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (irr &amp; IRR_SA1111) {</div><div class='del'>-			d = irq_desc + IRQ_NEPONSET_SA1111;</div><div class='del'>-			desc_handle_irq(IRQ_NEPONSET_SA1111, d);</div><div class='add'>+			generic_handle_irq(IRQ_NEPONSET_SA1111);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-sa1100/pleb.c b/arch/arm/mach-sa1100/pleb.c<br/>index 83be1c6c5f80..e45d3a1890bc 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-sa1100/pleb.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-sa1100/pleb.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-sa1100/pleb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-sa1100/pleb.c</a></div><div class='hunk'>@@ -8,11 +8,10 @@</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='del'>-</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -39,8 +38,8 @@</div><div class='ctx'> </div><div class='ctx'> static struct resource smc91x_resources[] = {</div><div class='ctx'> 	[0] = {</div><div class='del'>-		.start	=  PLEB_ETH0_P,</div><div class='del'>-		.end	=  PLEB_ETH0_P | 0x03ffffff,</div><div class='add'>+		.start	= PLEB_ETH0_P,</div><div class='add'>+		.end	= PLEB_ETH0_P | 0x03ffffff,</div><div class='ctx'> 		.flags	= IORESOURCE_MEM,</div><div class='ctx'> 	},</div><div class='ctx'> #if 0 /* Autoprobe instead, to get rising/falling edge characteristic right */</div><div class='hunk'>@@ -87,15 +86,15 @@ static struct resource pleb_flash_resources[] = {</div><div class='ctx'> static struct mtd_partition pleb_partitions[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.name		= "blob",</div><div class='del'>-		.offset 	= 0,</div><div class='add'>+		.offset		= 0,</div><div class='ctx'> 		.size		= 0x00020000,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.name		= "kernel",</div><div class='del'>-		.offset 	= MTDPART_OFS_APPEND,</div><div class='add'>+		.offset		= MTDPART_OFS_APPEND,</div><div class='ctx'> 		.size		= 0x000e0000,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.name		= "rootfs",</div><div class='del'>-		.offset 	= MTDPART_OFS_APPEND,</div><div class='add'>+		.offset		= MTDPART_OFS_APPEND,</div><div class='ctx'> 		.size		= 0x00300000,</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/mach-sa1100/simpad.c b/arch/arm/mach-sa1100/simpad.c<br/>index 8dd635317959..3c74534f7fee 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-sa1100/simpad.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-sa1100/simpad.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-sa1100/simpad.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-sa1100/simpad.c</a></div><div class='hunk'>@@ -12,6 +12,7 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/mtd.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='hunk'>@@ -27,7 +28,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/serial_core.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-sa1100/ssp.c b/arch/arm/mach-sa1100/ssp.c<br/>index 641f361c56f4..b20ff93b84a5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-sa1100/ssp.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-sa1100/ssp.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-sa1100/ssp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-sa1100/ssp.c</a></div><div class='hunk'>@@ -17,8 +17,8 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/ssp.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-shark/core.c b/arch/arm/mach-shark/core.c<br/>index 09d9f33d4072..a9400d984451 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-shark/core.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-shark/core.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-shark/core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-shark/core.c</a></div><div class='hunk'>@@ -9,10 +9,10 @@</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/serial_8250.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/leds.h&gt;</div><div class='ctx'> #include &lt;asm/param.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-shark/include/mach/system.h b/arch/arm/mach-shark/include/mach/system.h<br/>index 85aceef6f874..e45bd734a03e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-shark/include/mach/system.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-shark/include/mach/system.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-shark/include/mach/system.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-shark/include/mach/system.h</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'> #ifndef __ASM_ARCH_SYSTEM_H</div><div class='ctx'> #define __ASM_ARCH_SYSTEM_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> static void arch_reset(char mode)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/arm/mach-shark/irq.c b/arch/arm/mach-shark/irq.c<br/>index 44b0811b400c..c04eb6a1e2be 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-shark/irq.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-shark/irq.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-shark/irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-shark/irq.c</a></div><div class='hunk'>@@ -11,9 +11,9 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/arm/mach-shark/leds.c b/arch/arm/mach-shark/leds.c<br/>index b1896471aa3c..8bd8d6bb4d92 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-shark/leds.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-shark/leds.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-shark/leds.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-shark/leds.c</a></div><div class='hunk'>@@ -20,10 +20,10 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/leds.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define LED_STATE_ENABLED	1</div><div class='head'>diff --git a/arch/arm/mach-versatile/core.c b/arch/arm/mach-versatile/core.c<br/>index b638f10411e8..565e0ba0d67e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-versatile/core.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-versatile/core.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-versatile/core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-versatile/core.c</a></div><div class='hunk'>@@ -29,10 +29,10 @@</div><div class='ctx'> #include &lt;linux/clocksource.h&gt;</div><div class='ctx'> #include &lt;linux/clockchips.h&gt;</div><div class='ctx'> #include &lt;linux/cnt32_to_63.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/leds.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/arm_timer.h&gt;</div><div class='hunk'>@@ -95,8 +95,7 @@ sic_handle_irq(unsigned int irq, struct irq_desc *desc)</div><div class='ctx'> </div><div class='ctx'> 		irq += IRQ_SIC_START;</div><div class='ctx'> </div><div class='del'>-		desc = irq_desc + irq;</div><div class='del'>-		desc_handle_irq(irq, desc);</div><div class='add'>+		generic_handle_irq(irq);</div><div class='ctx'> 	} while (status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-versatile/include/mach/system.h b/arch/arm/mach-versatile/include/mach/system.h<br/>index 91fa559c7cca..c59e6100c7e3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-versatile/include/mach/system.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-versatile/include/mach/system.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-versatile/include/mach/system.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-versatile/include/mach/system.h</a></div><div class='hunk'>@@ -21,8 +21,8 @@</div><div class='ctx'> #ifndef __ASM_ARCH_SYSTEM_H</div><div class='ctx'> #define __ASM_ARCH_SYSTEM_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;mach/platform.h&gt;</div><div class='ctx'> </div><div class='ctx'> static inline void arch_idle(void)</div><div class='head'>diff --git a/arch/arm/mach-versatile/pci.c b/arch/arm/mach-versatile/pci.c<br/>index 36f23f896503..7161ba23b58a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-versatile/pci.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-versatile/pci.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-versatile/pci.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-versatile/pci.c</a></div><div class='hunk'>@@ -21,9 +21,9 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/mach/pci.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-versatile/versatile_ab.c b/arch/arm/mach-versatile/versatile_ab.c<br/>index 76375c64413a..bb8ec7724f79 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-versatile/versatile_ab.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-versatile/versatile_ab.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-versatile/versatile_ab.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-versatile/versatile_ab.c</a></div><div class='hunk'>@@ -23,9 +23,9 @@</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/sysdev.h&gt;</div><div class='ctx'> #include &lt;linux/amba/bus.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-versatile/versatile_pb.c b/arch/arm/mach-versatile/versatile_pb.c<br/>index 1725f019fc85..aa051c0884f8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-versatile/versatile_pb.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mach-versatile/versatile_pb.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mach-versatile/versatile_pb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mach-versatile/versatile_pb.c</a></div><div class='hunk'>@@ -23,9 +23,9 @@</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/sysdev.h&gt;</div><div class='ctx'> #include &lt;linux/amba/bus.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig<br/>index ed15f876c725..d1193884d76d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mm/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/Kconfig</a></div><div class='hunk'>@@ -428,7 +428,7 @@ config CPU_32v6K</div><div class='ctx'> # ARMv7</div><div class='ctx'> config CPU_V7</div><div class='ctx'> 	bool "Support ARM V7 processor"</div><div class='del'>-	depends on ARCH_INTEGRATOR || MACH_REALVIEW_EB</div><div class='add'>+	depends on ARCH_INTEGRATOR || MACH_REALVIEW_EB || ARCH_OMAP3</div><div class='ctx'> 	select CPU_32v6K</div><div class='ctx'> 	select CPU_32v7</div><div class='ctx'> 	select CPU_ABRT_EV7</div><div class='hunk'>@@ -735,6 +735,14 @@ config CACHE_FEROCEON_L2</div><div class='ctx'> 	help</div><div class='ctx'> 	  This option enables the Feroceon L2 cache controller.</div><div class='ctx'> </div><div class='add'>+config CACHE_FEROCEON_L2_WRITETHROUGH</div><div class='add'>+	bool "Force Feroceon L2 cache write through"</div><div class='add'>+	depends on CACHE_FEROCEON_L2</div><div class='add'>+	default n</div><div class='add'>+	help</div><div class='add'>+	  Say Y here to use the Feroceon L2 cache in writethrough mode.</div><div class='add'>+	  Unless you specifically require this, say N for writeback mode.</div><div class='add'>+</div><div class='ctx'> config CACHE_L2X0</div><div class='ctx'> 	bool "Enable the L2x0 outer cache controller"</div><div class='ctx'> 	depends on REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || MACH_REALVIEW_PB1176</div><div class='head'>diff --git a/arch/arm/mm/Makefile b/arch/arm/mm/Makefile<br/>index 2e27a8c8372b..480f78a3611a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mm/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/Makefile</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'> # Makefile for the linux arm-specific parts of the memory manager.</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-obj-y				:= consistent.o extable.o fault.o init.o \</div><div class='add'>+obj-y				:= dma-mapping.o extable.o fault.o init.o \</div><div class='ctx'> 				   iomap.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_MMU)		+= fault-armv.o flush.o ioremap.o mmap.o \</div><div class='head'>diff --git a/arch/arm/mm/abort-ev7.S b/arch/arm/mm/abort-ev7.S<br/>index eb90bce38e14..2e6dc040c654 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/abort-ev7.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mm/abort-ev7.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/abort-ev7.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/abort-ev7.S</a></div><div class='hunk'>@@ -30,3 +30,4 @@ ENTRY(v7_early_abort)</div><div class='ctx'> 	 * New designs should not need to patch up faults.</div><div class='ctx'> 	 */</div><div class='ctx'> 	mov	pc, lr</div><div class='add'>+ENDPROC(v7_early_abort)</div><div class='head'>diff --git a/arch/arm/mm/abort-nommu.S b/arch/arm/mm/abort-nommu.S<br/>index a7cc7f9ee45d..625e580945b5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/abort-nommu.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mm/abort-nommu.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/abort-nommu.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/abort-nommu.S</a></div><div class='hunk'>@@ -17,3 +17,4 @@ ENTRY(nommu_early_abort)</div><div class='ctx'> 	mov	r0, #0				@ clear r0, r1 (no FSR/FAR)</div><div class='ctx'> 	mov	r1, #0</div><div class='ctx'> 	mov	pc, lr</div><div class='add'>+ENDPROC(nommu_early_abort)</div><div class='head'>diff --git a/arch/arm/mm/alignment.c b/arch/arm/mm/alignment.c<br/>index e162cca5917f..133e65d166b3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/alignment.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mm/alignment.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/alignment.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/alignment.c</a></div><div class='hunk'>@@ -17,8 +17,8 @@</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/unaligned.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "fault.h"</div><div class='head'>diff --git a/arch/arm/mm/cache-feroceon-l2.c b/arch/arm/mm/cache-feroceon-l2.c<br/>index 7b5a25d81576..13cdae8b0d44 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/cache-feroceon-l2.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mm/cache-feroceon-l2.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/cache-feroceon-l2.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/cache-feroceon-l2.c</a></div><div class='hunk'>@@ -48,11 +48,12 @@ static inline void l2_clean_mva_range(unsigned long start, unsigned long end)</div><div class='ctx'> 	 * L2 is PIPT and range operations only do a TLB lookup on</div><div class='ctx'> 	 * the start address.</div><div class='ctx'> 	 */</div><div class='del'>-	BUG_ON((start ^ end) &amp; ~(PAGE_SIZE - 1));</div><div class='add'>+	BUG_ON((start ^ end) &gt;&gt; PAGE_SHIFT);</div><div class='ctx'> </div><div class='ctx'> 	raw_local_irq_save(flags);</div><div class='del'>-	__asm__("mcr p15, 1, %0, c15, c9, 4" : : "r" (start));</div><div class='del'>-	__asm__("mcr p15, 1, %0, c15, c9, 5" : : "r" (end));</div><div class='add'>+	__asm__("mcr p15, 1, %0, c15, c9, 4\n\t"</div><div class='add'>+		"mcr p15, 1, %1, c15, c9, 5"</div><div class='add'>+		: : "r" (start), "r" (end));</div><div class='ctx'> 	raw_local_irq_restore(flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -80,11 +81,12 @@ static inline void l2_inv_mva_range(unsigned long start, unsigned long end)</div><div class='ctx'> 	 * L2 is PIPT and range operations only do a TLB lookup on</div><div class='ctx'> 	 * the start address.</div><div class='ctx'> 	 */</div><div class='del'>-	BUG_ON((start ^ end) &amp; ~(PAGE_SIZE - 1));</div><div class='add'>+	BUG_ON((start ^ end) &gt;&gt; PAGE_SHIFT);</div><div class='ctx'> </div><div class='ctx'> 	raw_local_irq_save(flags);</div><div class='del'>-	__asm__("mcr p15, 1, %0, c15, c11, 4" : : "r" (start));</div><div class='del'>-	__asm__("mcr p15, 1, %0, c15, c11, 5" : : "r" (end));</div><div class='add'>+	__asm__("mcr p15, 1, %0, c15, c11, 4\n\t"</div><div class='add'>+		"mcr p15, 1, %1, c15, c11, 5"</div><div class='add'>+		: : "r" (start), "r" (end));</div><div class='ctx'> 	raw_local_irq_restore(flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -205,7 +207,7 @@ static void feroceon_l2_flush_range(unsigned long start, unsigned long end)</div><div class='ctx'>  * time.  These are necessary because the L2 cache can only be enabled</div><div class='ctx'>  * or disabled while the L1 Dcache and Icache are both disabled.</div><div class='ctx'>  */</div><div class='del'>-static void __init invalidate_and_disable_dcache(void)</div><div class='add'>+static int __init flush_and_disable_dcache(void)</div><div class='ctx'> {</div><div class='ctx'> 	u32 cr;</div><div class='ctx'> </div><div class='hunk'>@@ -217,7 +219,9 @@ static void __init invalidate_and_disable_dcache(void)</div><div class='ctx'> 		flush_cache_all();</div><div class='ctx'> 		set_cr(cr &amp; ~CR_C);</div><div class='ctx'> 		raw_local_irq_restore(flags);</div><div class='add'>+		return 1;</div><div class='ctx'> 	}</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __init enable_dcache(void)</div><div class='hunk'>@@ -225,18 +229,17 @@ static void __init enable_dcache(void)</div><div class='ctx'> 	u32 cr;</div><div class='ctx'> </div><div class='ctx'> 	cr = get_cr();</div><div class='del'>-	if (!(cr &amp; CR_C))</div><div class='del'>-		set_cr(cr | CR_C);</div><div class='add'>+	set_cr(cr | CR_C);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __init __invalidate_icache(void)</div><div class='ctx'> {</div><div class='ctx'> 	int dummy;</div><div class='ctx'> </div><div class='del'>-	__asm__ __volatile__("mcr p15, 0, %0, c7, c5, 0\n" : "=r" (dummy));</div><div class='add'>+	__asm__ __volatile__("mcr p15, 0, %0, c7, c5, 0" : "=r" (dummy));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __init invalidate_and_disable_icache(void)</div><div class='add'>+static int __init invalidate_and_disable_icache(void)</div><div class='ctx'> {</div><div class='ctx'> 	u32 cr;</div><div class='ctx'> </div><div class='hunk'>@@ -244,7 +247,9 @@ static void __init invalidate_and_disable_icache(void)</div><div class='ctx'> 	if (cr &amp; CR_I) {</div><div class='ctx'> 		set_cr(cr &amp; ~CR_I);</div><div class='ctx'> 		__invalidate_icache();</div><div class='add'>+		return 1;</div><div class='ctx'> 	}</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __init enable_icache(void)</div><div class='hunk'>@@ -252,8 +257,7 @@ static void __init enable_icache(void)</div><div class='ctx'> 	u32 cr;</div><div class='ctx'> </div><div class='ctx'> 	cr = get_cr();</div><div class='del'>-	if (!(cr &amp; CR_I))</div><div class='del'>-		set_cr(cr | CR_I);</div><div class='add'>+	set_cr(cr | CR_I);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline u32 read_extra_features(void)</div><div class='hunk'>@@ -291,13 +295,17 @@ static void __init enable_l2(void)</div><div class='ctx'> </div><div class='ctx'> 	u = read_extra_features();</div><div class='ctx'> 	if (!(u &amp; 0x00400000)) {</div><div class='add'>+		int i, d;</div><div class='add'>+</div><div class='ctx'> 		printk(KERN_INFO "Feroceon L2: Enabling L2\n");</div><div class='ctx'> </div><div class='del'>-		invalidate_and_disable_dcache();</div><div class='del'>-		invalidate_and_disable_icache();</div><div class='add'>+		d = flush_and_disable_dcache();</div><div class='add'>+		i = invalidate_and_disable_icache();</div><div class='ctx'> 		write_extra_features(u | 0x00400000);</div><div class='del'>-		enable_icache();</div><div class='del'>-		enable_dcache();</div><div class='add'>+		if (i)</div><div class='add'>+			enable_icache();</div><div class='add'>+		if (d)</div><div class='add'>+			enable_dcache();</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c<br/>index 76b800a95191..b480f1d3591f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/cache-l2x0.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mm/cache-l2x0.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/cache-l2x0.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/cache-l2x0.c</a></div><div class='hunk'>@@ -18,9 +18,9 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/cache-l2x0.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define CACHE_LINE_SIZE		32</div><div class='head'>diff --git a/arch/arm/mm/cache-v7.S b/arch/arm/mm/cache-v7.S<br/>index 35ffc4d95997..d19c2bec2b1f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/cache-v7.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mm/cache-v7.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/cache-v7.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/cache-v7.S</a></div><div class='hunk'>@@ -66,6 +66,7 @@ finished:</div><div class='ctx'> 	mcr	p15, 2, r10, c0, c0, 0		@ select current cache level in cssr</div><div class='ctx'> 	isb</div><div class='ctx'> 	mov	pc, lr</div><div class='add'>+ENDPROC(v7_flush_dcache_all)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *	v7_flush_cache_all()</div><div class='hunk'>@@ -85,6 +86,7 @@ ENTRY(v7_flush_kern_cache_all)</div><div class='ctx'> 	mcr	p15, 0, r0, c7, c5, 0		@ I+BTB cache invalidate</div><div class='ctx'> 	ldmfd	sp!, {r4-r5, r7, r9-r11, lr}</div><div class='ctx'> 	mov	pc, lr</div><div class='add'>+ENDPROC(v7_flush_kern_cache_all)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *	v7_flush_cache_all()</div><div class='hunk'>@@ -110,6 +112,8 @@ ENTRY(v7_flush_user_cache_all)</div><div class='ctx'>  */</div><div class='ctx'> ENTRY(v7_flush_user_cache_range)</div><div class='ctx'> 	mov	pc, lr</div><div class='add'>+ENDPROC(v7_flush_user_cache_all)</div><div class='add'>+ENDPROC(v7_flush_user_cache_range)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *	v7_coherent_kern_range(start,end)</div><div class='hunk'>@@ -155,6 +159,8 @@ ENTRY(v7_coherent_user_range)</div><div class='ctx'> 	dsb</div><div class='ctx'> 	isb</div><div class='ctx'> 	mov	pc, lr</div><div class='add'>+ENDPROC(v7_coherent_kern_range)</div><div class='add'>+ENDPROC(v7_coherent_user_range)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *	v7_flush_kern_dcache_page(kaddr)</div><div class='hunk'>@@ -174,6 +180,7 @@ ENTRY(v7_flush_kern_dcache_page)</div><div class='ctx'> 	blo	1b</div><div class='ctx'> 	dsb</div><div class='ctx'> 	mov	pc, lr</div><div class='add'>+ENDPROC(v7_flush_kern_dcache_page)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *	v7_dma_inv_range(start,end)</div><div class='hunk'>@@ -202,6 +209,7 @@ ENTRY(v7_dma_inv_range)</div><div class='ctx'> 	blo	1b</div><div class='ctx'> 	dsb</div><div class='ctx'> 	mov	pc, lr</div><div class='add'>+ENDPROC(v7_dma_inv_range)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *	v7_dma_clean_range(start,end)</div><div class='hunk'>@@ -219,6 +227,7 @@ ENTRY(v7_dma_clean_range)</div><div class='ctx'> 	blo	1b</div><div class='ctx'> 	dsb</div><div class='ctx'> 	mov	pc, lr</div><div class='add'>+ENDPROC(v7_dma_clean_range)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *	v7_dma_flush_range(start,end)</div><div class='hunk'>@@ -236,6 +245,7 @@ ENTRY(v7_dma_flush_range)</div><div class='ctx'> 	blo	1b</div><div class='ctx'> 	dsb</div><div class='ctx'> 	mov	pc, lr</div><div class='add'>+ENDPROC(v7_dma_flush_range)</div><div class='ctx'> </div><div class='ctx'> 	__INITDATA</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mm/cache-xsc3l2.c b/arch/arm/mm/cache-xsc3l2.c<br/>index 158bd96763d3..10b1bae1a258 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/cache-xsc3l2.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mm/cache-xsc3l2.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/cache-xsc3l2.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/cache-xsc3l2.c</a></div><div class='hunk'>@@ -18,10 +18,11 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='add'>+#include &lt;asm/cputype.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define CR_L2	(1 &lt;&lt; 26)</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mm/copypage-v4mc.c b/arch/arm/mm/copypage-v4mc.c<br/>index ded0e96d069d..8d33e2549344 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/copypage-v4mc.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mm/copypage-v4mc.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/copypage-v4mc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/copypage-v4mc.c</a></div><div class='hunk'>@@ -28,7 +28,7 @@</div><div class='ctx'>  * specific hacks for copying pages efficiently.</div><div class='ctx'>  */</div><div class='ctx'> #define minicache_pgprot __pgprot(L_PTE_PRESENT | L_PTE_YOUNG | \</div><div class='del'>-				  L_PTE_CACHEABLE)</div><div class='add'>+				  L_PTE_MT_MINICACHE)</div><div class='ctx'> </div><div class='ctx'> static DEFINE_SPINLOCK(minicache_lock);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mm/copypage-v6.c b/arch/arm/mm/copypage-v6.c<br/>index 3adb79257f43..0e21c0767580 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/copypage-v6.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mm/copypage-v6.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/copypage-v6.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/copypage-v6.c</a></div><div class='hunk'>@@ -16,6 +16,7 @@</div><div class='ctx'> #include &lt;asm/shmparam.h&gt;</div><div class='ctx'> #include &lt;asm/tlbflush.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='add'>+#include &lt;asm/cachetype.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "mm.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mm/copypage-xscale.c b/arch/arm/mm/copypage-xscale.c<br/>index 2e455f82a4d5..bad49331bbf9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/copypage-xscale.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mm/copypage-xscale.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/copypage-xscale.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/copypage-xscale.c</a></div><div class='hunk'>@@ -30,7 +30,7 @@</div><div class='ctx'> #define COPYPAGE_MINICACHE	0xffff8000</div><div class='ctx'> </div><div class='ctx'> #define minicache_pgprot __pgprot(L_PTE_PRESENT | L_PTE_YOUNG | \</div><div class='del'>-				  L_PTE_CACHEABLE)</div><div class='add'>+				  L_PTE_MT_MINICACHE)</div><div class='ctx'> </div><div class='ctx'> static DEFINE_SPINLOCK(minicache_lock);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mm/consistent.c b/arch/arm/mm/dma-mapping.c<br/>index db7b3e38ef1d..67960017dc8f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/consistent.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mm/consistent.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/dma-mapping.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/dma-mapping.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/arch/arm/mm/consistent.c</div><div class='add'>+ *  linux/arch/arm/mm/dma-mapping.c</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2000-2004 Russell King</div><div class='ctx'>  *</div><div class='hunk'>@@ -512,3 +512,105 @@ void dma_cache_maint(const void *start, size_t size, int direction)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(dma_cache_maint);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dma_map_sg - map a set of SG buffers for streaming mode DMA</div><div class='add'>+ * @dev: valid struct device pointer, or NULL for ISA and EISA-like devices</div><div class='add'>+ * @sg: list of buffers</div><div class='add'>+ * @nents: number of buffers to map</div><div class='add'>+ * @dir: DMA transfer direction</div><div class='add'>+ *</div><div class='add'>+ * Map a set of buffers described by scatterlist in streaming mode for DMA.</div><div class='add'>+ * This is the scatter-gather version of the dma_map_single interface.</div><div class='add'>+ * Here the scatter gather list elements are each tagged with the</div><div class='add'>+ * appropriate dma address and length.  They are obtained via</div><div class='add'>+ * sg_dma_{address,length}.</div><div class='add'>+ *</div><div class='add'>+ * Device ownership issues as mentioned for dma_map_single are the same</div><div class='add'>+ * here.</div><div class='add'>+ */</div><div class='add'>+int dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,</div><div class='add'>+		enum dma_data_direction dir)</div><div class='add'>+{</div><div class='add'>+	struct scatterlist *s;</div><div class='add'>+	int i, j;</div><div class='add'>+</div><div class='add'>+	for_each_sg(sg, s, nents, i) {</div><div class='add'>+		s-&gt;dma_address = dma_map_page(dev, sg_page(s), s-&gt;offset,</div><div class='add'>+						s-&gt;length, dir);</div><div class='add'>+		if (dma_mapping_error(dev, s-&gt;dma_address))</div><div class='add'>+			goto bad_mapping;</div><div class='add'>+	}</div><div class='add'>+	return nents;</div><div class='add'>+</div><div class='add'>+ bad_mapping:</div><div class='add'>+	for_each_sg(sg, s, i, j)</div><div class='add'>+		dma_unmap_page(dev, sg_dma_address(s), sg_dma_len(s), dir);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dma_map_sg);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dma_unmap_sg - unmap a set of SG buffers mapped by dma_map_sg</div><div class='add'>+ * @dev: valid struct device pointer, or NULL for ISA and EISA-like devices</div><div class='add'>+ * @sg: list of buffers</div><div class='add'>+ * @nents: number of buffers to unmap (returned from dma_map_sg)</div><div class='add'>+ * @dir: DMA transfer direction (same as was passed to dma_map_sg)</div><div class='add'>+ *</div><div class='add'>+ * Unmap a set of streaming mode DMA translations.  Again, CPU access</div><div class='add'>+ * rules concerning calls here are the same as for dma_unmap_single().</div><div class='add'>+ */</div><div class='add'>+void dma_unmap_sg(struct device *dev, struct scatterlist *sg, int nents,</div><div class='add'>+		enum dma_data_direction dir)</div><div class='add'>+{</div><div class='add'>+	struct scatterlist *s;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for_each_sg(sg, s, nents, i)</div><div class='add'>+		dma_unmap_page(dev, sg_dma_address(s), sg_dma_len(s), dir);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dma_unmap_sg);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dma_sync_sg_for_cpu</div><div class='add'>+ * @dev: valid struct device pointer, or NULL for ISA and EISA-like devices</div><div class='add'>+ * @sg: list of buffers</div><div class='add'>+ * @nents: number of buffers to map (returned from dma_map_sg)</div><div class='add'>+ * @dir: DMA transfer direction (same as was passed to dma_map_sg)</div><div class='add'>+ */</div><div class='add'>+void dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg,</div><div class='add'>+			int nents, enum dma_data_direction dir)</div><div class='add'>+{</div><div class='add'>+	struct scatterlist *s;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for_each_sg(sg, s, nents, i) {</div><div class='add'>+		dmabounce_sync_for_cpu(dev, sg_dma_address(s), 0,</div><div class='add'>+					sg_dma_len(s), dir);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dma_sync_sg_for_cpu);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dma_sync_sg_for_device</div><div class='add'>+ * @dev: valid struct device pointer, or NULL for ISA and EISA-like devices</div><div class='add'>+ * @sg: list of buffers</div><div class='add'>+ * @nents: number of buffers to map (returned from dma_map_sg)</div><div class='add'>+ * @dir: DMA transfer direction (same as was passed to dma_map_sg)</div><div class='add'>+ */</div><div class='add'>+void dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg,</div><div class='add'>+			int nents, enum dma_data_direction dir)</div><div class='add'>+{</div><div class='add'>+	struct scatterlist *s;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for_each_sg(sg, s, nents, i) {</div><div class='add'>+		if (!dmabounce_sync_for_device(dev, sg_dma_address(s), 0,</div><div class='add'>+					sg_dma_len(s), dir))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (!arch_is_coherent())</div><div class='add'>+			dma_cache_maint(sg_virt(s), s-&gt;length, dir);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dma_sync_sg_for_device);</div><div class='head'>diff --git a/arch/arm/mm/extable.c b/arch/arm/mm/extable.c<br/>index 9592c3ee4cb2..9d285626bc7d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/extable.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mm/extable.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/extable.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/extable.c</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'>  *  linux/arch/arm/mm/extable.c</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> int fixup_exception(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/arm/mm/fault-armv.c b/arch/arm/mm/fault-armv.c<br/>index a8ec97b4752e..81d0b8772de3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/fault-armv.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mm/fault-armv.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/fault-armv.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/fault-armv.c</a></div><div class='hunk'>@@ -17,11 +17,13 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/pagemap.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/bugs.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='add'>+#include &lt;asm/cachetype.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/tlbflush.h&gt;</div><div class='ctx'> </div><div class='del'>-static unsigned long shared_pte_mask = L_PTE_CACHEABLE;</div><div class='add'>+static unsigned long shared_pte_mask = L_PTE_MT_BUFFERABLE;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * We take the easy way out of this problem - we make the</div><div class='hunk'>@@ -63,9 +65,10 @@ static int adjust_pte(struct vm_area_struct *vma, unsigned long address)</div><div class='ctx'> 	 * If this page isn't present, or is already setup to</div><div class='ctx'> 	 * fault (ie, is old), we can safely ignore any issues.</div><div class='ctx'> 	 */</div><div class='del'>-	if (ret &amp;&amp; pte_val(entry) &amp; shared_pte_mask) {</div><div class='add'>+	if (ret &amp;&amp; (pte_val(entry) &amp; L_PTE_MT_MASK) != shared_pte_mask) {</div><div class='ctx'> 		flush_cache_page(vma, address, pte_pfn(entry));</div><div class='del'>-		pte_val(entry) &amp;= ~shared_pte_mask;</div><div class='add'>+		pte_val(entry) &amp;= ~L_PTE_MT_MASK;</div><div class='add'>+		pte_val(entry) |= shared_pte_mask;</div><div class='ctx'> 		set_pte_at(vma-&gt;vm_mm, address, pte, entry);</div><div class='ctx'> 		flush_tlb_page(vma, address);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -197,7 +200,7 @@ void __init check_writebuffer_bugs(void)</div><div class='ctx'> 		unsigned long *p1, *p2;</div><div class='ctx'> 		pgprot_t prot = __pgprot(L_PTE_PRESENT|L_PTE_YOUNG|</div><div class='ctx'> 					 L_PTE_DIRTY|L_PTE_WRITE|</div><div class='del'>-					 L_PTE_BUFFERABLE);</div><div class='add'>+					 L_PTE_MT_BUFFERABLE);</div><div class='ctx'> </div><div class='ctx'> 		p1 = vmap(&amp;page, 1, VM_IOREMAP, prot);</div><div class='ctx'> 		p2 = vmap(&amp;page, 1, VM_IOREMAP, prot);</div><div class='hunk'>@@ -218,7 +221,7 @@ void __init check_writebuffer_bugs(void)</div><div class='ctx'> </div><div class='ctx'> 	if (v) {</div><div class='ctx'> 		printk("failed, %s\n", reason);</div><div class='del'>-		shared_pte_mask |= L_PTE_BUFFERABLE;</div><div class='add'>+		shared_pte_mask = L_PTE_MT_UNCACHED;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		printk("ok\n");</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c<br/>index 28ad7ab1c0cd..2df8d9facf57 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/fault.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mm/fault.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/fault.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/fault.c</a></div><div class='hunk'>@@ -13,11 +13,11 @@</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kprobes.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/tlbflush.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "fault.h"</div><div class='ctx'> </div><div class='hunk'>@@ -72,9 +72,8 @@ void show_pte(struct mm_struct *mm, unsigned long addr)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		pmd = pmd_offset(pgd, addr);</div><div class='del'>-#if PTRS_PER_PMD != 1</div><div class='del'>-		printk(", *pmd=%08lx", pmd_val(*pmd));</div><div class='del'>-#endif</div><div class='add'>+		if (PTRS_PER_PMD != 1)</div><div class='add'>+			printk(", *pmd=%08lx", pmd_val(*pmd));</div><div class='ctx'> </div><div class='ctx'> 		if (pmd_none(*pmd))</div><div class='ctx'> 			break;</div><div class='head'>diff --git a/arch/arm/mm/flush.c b/arch/arm/mm/flush.c<br/>index 029ee65fda2b..0fa9bf388f0b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/flush.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mm/flush.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/flush.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/flush.c</a></div><div class='hunk'>@@ -12,6 +12,7 @@</div><div class='ctx'> #include &lt;linux/pagemap.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='add'>+#include &lt;asm/cachetype.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/tlbflush.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c<br/>index 30a69d67d673..82c4b4217989 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/init.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mm/init.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/init.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/init.c</a></div><div class='hunk'>@@ -26,9 +26,42 @@</div><div class='ctx'> </div><div class='ctx'> #include "mm.h"</div><div class='ctx'> </div><div class='del'>-extern void _text, _etext, __data_start, _end, __init_begin, __init_end;</div><div class='del'>-extern unsigned long phys_initrd_start;</div><div class='del'>-extern unsigned long phys_initrd_size;</div><div class='add'>+static unsigned long phys_initrd_start __initdata = 0;</div><div class='add'>+static unsigned long phys_initrd_size __initdata = 0;</div><div class='add'>+</div><div class='add'>+static void __init early_initrd(char **p)</div><div class='add'>+{</div><div class='add'>+	unsigned long start, size;</div><div class='add'>+</div><div class='add'>+	start = memparse(*p, p);</div><div class='add'>+	if (**p == ',') {</div><div class='add'>+		size = memparse((*p) + 1, p);</div><div class='add'>+</div><div class='add'>+		phys_initrd_start = start;</div><div class='add'>+		phys_initrd_size = size;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+__early_param("initrd=", early_initrd);</div><div class='add'>+</div><div class='add'>+static int __init parse_tag_initrd(const struct tag *tag)</div><div class='add'>+{</div><div class='add'>+	printk(KERN_WARNING "ATAG_INITRD is deprecated; "</div><div class='add'>+		"please update your bootloader.\n");</div><div class='add'>+	phys_initrd_start = __virt_to_phys(tag-&gt;u.initrd.start);</div><div class='add'>+	phys_initrd_size = tag-&gt;u.initrd.size;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__tagtable(ATAG_INITRD, parse_tag_initrd);</div><div class='add'>+</div><div class='add'>+static int __init parse_tag_initrd2(const struct tag *tag)</div><div class='add'>+{</div><div class='add'>+	phys_initrd_start = tag-&gt;u.initrd.start;</div><div class='add'>+	phys_initrd_size = tag-&gt;u.initrd.size;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__tagtable(ATAG_INITRD2, parse_tag_initrd2);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * This is used to pass memory configuration data from paging_init</div><div class='hunk'>@@ -36,10 +69,6 @@ extern unsigned long phys_initrd_size;</div><div class='ctx'>  */</div><div class='ctx'> static struct meminfo meminfo = { 0, };</div><div class='ctx'> </div><div class='del'>-#define for_each_nodebank(iter,mi,no)			\</div><div class='del'>-	for (iter = 0; iter &lt; mi-&gt;nr_banks; iter++)	\</div><div class='del'>-		if (mi-&gt;bank[iter].node == no)</div><div class='del'>-</div><div class='ctx'> void show_mem(void)</div><div class='ctx'> {</div><div class='ctx'> 	int free = 0, total = 0, reserved = 0;</div><div class='hunk'>@@ -50,14 +79,15 @@ void show_mem(void)</div><div class='ctx'> 	show_free_areas();</div><div class='ctx'> 	for_each_online_node(node) {</div><div class='ctx'> 		pg_data_t *n = NODE_DATA(node);</div><div class='del'>-		struct page *map = n-&gt;node_mem_map - n-&gt;node_start_pfn;</div><div class='add'>+		struct page *map = pgdat_page_nr(n, 0) - n-&gt;node_start_pfn;</div><div class='ctx'> </div><div class='ctx'> 		for_each_nodebank (i,mi,node) {</div><div class='add'>+			struct membank *bank = &amp;mi-&gt;bank[i];</div><div class='ctx'> 			unsigned int pfn1, pfn2;</div><div class='ctx'> 			struct page *page, *end;</div><div class='ctx'> </div><div class='del'>-			pfn1 = __phys_to_pfn(mi-&gt;bank[i].start);</div><div class='del'>-			pfn2 = __phys_to_pfn(mi-&gt;bank[i].size + mi-&gt;bank[i].start);</div><div class='add'>+			pfn1 = bank_pfn_start(bank);</div><div class='add'>+			pfn2 = bank_pfn_end(bank);</div><div class='ctx'> </div><div class='ctx'> 			page = map + pfn1;</div><div class='ctx'> 			end  = map + pfn2;</div><div class='hunk'>@@ -96,17 +126,17 @@ void show_mem(void)</div><div class='ctx'> static unsigned int __init</div><div class='ctx'> find_bootmap_pfn(int node, struct meminfo *mi, unsigned int bootmap_pages)</div><div class='ctx'> {</div><div class='del'>-	unsigned int start_pfn, bank, bootmap_pfn;</div><div class='add'>+	unsigned int start_pfn, i, bootmap_pfn;</div><div class='ctx'> </div><div class='ctx'> 	start_pfn   = PAGE_ALIGN(__pa(&amp;_end)) &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> 	bootmap_pfn = 0;</div><div class='ctx'> </div><div class='del'>-	for_each_nodebank(bank, mi, node) {</div><div class='add'>+	for_each_nodebank(i, mi, node) {</div><div class='add'>+		struct membank *bank = &amp;mi-&gt;bank[i];</div><div class='ctx'> 		unsigned int start, end;</div><div class='ctx'> </div><div class='del'>-		start = mi-&gt;bank[bank].start &gt;&gt; PAGE_SHIFT;</div><div class='del'>-		end   = (mi-&gt;bank[bank].size +</div><div class='del'>-			 mi-&gt;bank[bank].start) &gt;&gt; PAGE_SHIFT;</div><div class='add'>+		start = bank_pfn_start(bank);</div><div class='add'>+		end   = bank_pfn_end(bank);</div><div class='ctx'> </div><div class='ctx'> 		if (end &lt; start_pfn)</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -145,13 +175,10 @@ static int __init check_initrd(struct meminfo *mi)</div><div class='ctx'> 		initrd_node = -1;</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; i &lt; mi-&gt;nr_banks; i++) {</div><div class='del'>-			unsigned long bank_end;</div><div class='del'>-</div><div class='del'>-			bank_end = mi-&gt;bank[i].start + mi-&gt;bank[i].size;</div><div class='del'>-</div><div class='del'>-			if (mi-&gt;bank[i].start &lt;= phys_initrd_start &amp;&amp;</div><div class='del'>-			    end &lt;= bank_end)</div><div class='del'>-				initrd_node = mi-&gt;bank[i].node;</div><div class='add'>+			struct membank *bank = &amp;mi-&gt;bank[i];</div><div class='add'>+			if (bank_phys_start(bank) &lt;= phys_initrd_start &amp;&amp;</div><div class='add'>+			    end &lt;= bank_phys_end(bank))</div><div class='add'>+				initrd_node = bank-&gt;node;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -171,19 +198,17 @@ static inline void map_memory_bank(struct membank *bank)</div><div class='ctx'> #ifdef CONFIG_MMU</div><div class='ctx'> 	struct map_desc map;</div><div class='ctx'> </div><div class='del'>-	map.pfn = __phys_to_pfn(bank-&gt;start);</div><div class='del'>-	map.virtual = __phys_to_virt(bank-&gt;start);</div><div class='del'>-	map.length = bank-&gt;size;</div><div class='add'>+	map.pfn = bank_pfn_start(bank);</div><div class='add'>+	map.virtual = __phys_to_virt(bank_phys_start(bank));</div><div class='add'>+	map.length = bank_phys_size(bank);</div><div class='ctx'> 	map.type = MT_MEMORY;</div><div class='ctx'> </div><div class='ctx'> 	create_mapping(&amp;map);</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned long __init</div><div class='del'>-bootmem_init_node(int node, int initrd_node, struct meminfo *mi)</div><div class='add'>+static unsigned long __init bootmem_init_node(int node, struct meminfo *mi)</div><div class='ctx'> {</div><div class='del'>-	unsigned long zone_size[MAX_NR_ZONES], zhole_size[MAX_NR_ZONES];</div><div class='ctx'> 	unsigned long start_pfn, end_pfn, boot_pfn;</div><div class='ctx'> 	unsigned int boot_pages;</div><div class='ctx'> 	pg_data_t *pgdat;</div><div class='hunk'>@@ -199,8 +224,8 @@ bootmem_init_node(int node, int initrd_node, struct meminfo *mi)</div><div class='ctx'> 		struct membank *bank = &amp;mi-&gt;bank[i];</div><div class='ctx'> 		unsigned long start, end;</div><div class='ctx'> </div><div class='del'>-		start = bank-&gt;start &gt;&gt; PAGE_SHIFT;</div><div class='del'>-		end = (bank-&gt;start + bank-&gt;size) &gt;&gt; PAGE_SHIFT;</div><div class='add'>+		start = bank_pfn_start(bank);</div><div class='add'>+		end = bank_pfn_end(bank);</div><div class='ctx'> </div><div class='ctx'> 		if (start_pfn &gt; start)</div><div class='ctx'> 			start_pfn = start;</div><div class='hunk'>@@ -230,8 +255,11 @@ bootmem_init_node(int node, int initrd_node, struct meminfo *mi)</div><div class='ctx'> 	pgdat = NODE_DATA(node);</div><div class='ctx'> 	init_bootmem_node(pgdat, boot_pfn, start_pfn, end_pfn);</div><div class='ctx'> </div><div class='del'>-	for_each_nodebank(i, mi, node)</div><div class='del'>-		free_bootmem_node(pgdat, mi-&gt;bank[i].start, mi-&gt;bank[i].size);</div><div class='add'>+	for_each_nodebank(i, mi, node) {</div><div class='add'>+		struct membank *bank = &amp;mi-&gt;bank[i];</div><div class='add'>+		free_bootmem_node(pgdat, bank_phys_start(bank), bank_phys_size(bank));</div><div class='add'>+		memory_present(node, bank_pfn_start(bank), bank_pfn_end(bank));</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Reserve the bootmem bitmap for this node.</div><div class='hunk'>@@ -239,31 +267,39 @@ bootmem_init_node(int node, int initrd_node, struct meminfo *mi)</div><div class='ctx'> 	reserve_bootmem_node(pgdat, boot_pfn &lt;&lt; PAGE_SHIFT,</div><div class='ctx'> 			     boot_pages &lt;&lt; PAGE_SHIFT, BOOTMEM_DEFAULT);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Reserve any special node zero regions.</div><div class='del'>-	 */</div><div class='del'>-	if (node == 0)</div><div class='del'>-		reserve_node_zero(pgdat);</div><div class='add'>+	return end_pfn;</div><div class='add'>+}</div><div class='ctx'> </div><div class='add'>+static void __init bootmem_reserve_initrd(int node)</div><div class='add'>+{</div><div class='ctx'> #ifdef CONFIG_BLK_DEV_INITRD</div><div class='del'>-	/*</div><div class='del'>-	 * If the initrd is in this node, reserve its memory.</div><div class='del'>-	 */</div><div class='del'>-	if (node == initrd_node) {</div><div class='del'>-		int res = reserve_bootmem_node(pgdat, phys_initrd_start,</div><div class='del'>-				     phys_initrd_size, BOOTMEM_EXCLUSIVE);</div><div class='del'>-</div><div class='del'>-		if (res == 0) {</div><div class='del'>-			initrd_start = __phys_to_virt(phys_initrd_start);</div><div class='del'>-			initrd_end = initrd_start + phys_initrd_size;</div><div class='del'>-		} else {</div><div class='del'>-			printk(KERN_ERR</div><div class='del'>-				"INITRD: 0x%08lx+0x%08lx overlaps in-use "</div><div class='del'>-				"memory region - disabling initrd\n",</div><div class='del'>-				phys_initrd_start, phys_initrd_size);</div><div class='del'>-		}</div><div class='add'>+	pg_data_t *pgdat = NODE_DATA(node);</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	res = reserve_bootmem_node(pgdat, phys_initrd_start,</div><div class='add'>+			     phys_initrd_size, BOOTMEM_EXCLUSIVE);</div><div class='add'>+</div><div class='add'>+	if (res == 0) {</div><div class='add'>+		initrd_start = __phys_to_virt(phys_initrd_start);</div><div class='add'>+		initrd_end = initrd_start + phys_initrd_size;</div><div class='add'>+	} else {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+			"INITRD: 0x%08lx+0x%08lx overlaps in-use "</div><div class='add'>+			"memory region - disabling initrd\n",</div><div class='add'>+			phys_initrd_start, phys_initrd_size);</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init bootmem_free_node(int node, struct meminfo *mi)</div><div class='add'>+{</div><div class='add'>+	unsigned long zone_size[MAX_NR_ZONES], zhole_size[MAX_NR_ZONES];</div><div class='add'>+	unsigned long start_pfn, end_pfn;</div><div class='add'>+	pg_data_t *pgdat = NODE_DATA(node);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	start_pfn = pgdat-&gt;bdata-&gt;node_min_pfn;</div><div class='add'>+	end_pfn = pgdat-&gt;bdata-&gt;node_low_pfn;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * initialise the zones within this node.</div><div class='hunk'>@@ -284,7 +320,7 @@ bootmem_init_node(int node, int initrd_node, struct meminfo *mi)</div><div class='ctx'> 	 */</div><div class='ctx'> 	zhole_size[0] = zone_size[0];</div><div class='ctx'> 	for_each_nodebank(i, mi, node)</div><div class='del'>-		zhole_size[0] -= mi-&gt;bank[i].size &gt;&gt; PAGE_SHIFT;</div><div class='add'>+		zhole_size[0] -= bank_pfn_size(&amp;mi-&gt;bank[i]);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Adjust the sizes according to any special requirements for</div><div class='hunk'>@@ -293,21 +329,12 @@ bootmem_init_node(int node, int initrd_node, struct meminfo *mi)</div><div class='ctx'> 	arch_adjust_zones(node, zone_size, zhole_size);</div><div class='ctx'> </div><div class='ctx'> 	free_area_init_node(node, zone_size, start_pfn, zhole_size);</div><div class='del'>-</div><div class='del'>-	return end_pfn;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __init bootmem_init(struct meminfo *mi)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long memend_pfn = 0;</div><div class='del'>-	int node, initrd_node, i;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Invalidate the node number for empty or invalid memory banks</div><div class='del'>-	 */</div><div class='del'>-	for (i = 0; i &lt; mi-&gt;nr_banks; i++)</div><div class='del'>-		if (mi-&gt;bank[i].size == 0 || mi-&gt;bank[i].node &gt;= MAX_NUMNODES)</div><div class='del'>-			mi-&gt;bank[i].node = -1;</div><div class='add'>+	int node, initrd_node;</div><div class='ctx'> </div><div class='ctx'> 	memcpy(&amp;meminfo, mi, sizeof(meminfo));</div><div class='ctx'> </div><div class='hunk'>@@ -320,9 +347,19 @@ void __init bootmem_init(struct meminfo *mi)</div><div class='ctx'> 	 * Run through each node initialising the bootmem allocator.</div><div class='ctx'> 	 */</div><div class='ctx'> 	for_each_node(node) {</div><div class='del'>-		unsigned long end_pfn;</div><div class='add'>+		unsigned long end_pfn = bootmem_init_node(node, mi);</div><div class='ctx'> </div><div class='del'>-		end_pfn = bootmem_init_node(node, initrd_node, mi);</div><div class='add'>+		/*</div><div class='add'>+		 * Reserve any special node zero regions.</div><div class='add'>+		 */</div><div class='add'>+		if (node == 0)</div><div class='add'>+			reserve_node_zero(NODE_DATA(node));</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * If the initrd is in this node, reserve its memory.</div><div class='add'>+		 */</div><div class='add'>+		if (node == initrd_node)</div><div class='add'>+			bootmem_reserve_initrd(node);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Remember the highest memory PFN.</div><div class='hunk'>@@ -331,6 +368,19 @@ void __init bootmem_init(struct meminfo *mi)</div><div class='ctx'> 			memend_pfn = end_pfn;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * sparse_init() needs the bootmem allocator up and running.</div><div class='add'>+	 */</div><div class='add'>+	sparse_init();</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Now free memory in each node - free_area_init_node needs</div><div class='add'>+	 * the sparse mem_map arrays initialized by sparse_init()</div><div class='add'>+	 * for memmap_init_zone(), otherwise all PFNs are invalid.</div><div class='add'>+	 */</div><div class='add'>+	for_each_node(node)</div><div class='add'>+		bootmem_free_node(node, mi);</div><div class='add'>+</div><div class='ctx'> 	high_memory = __va(memend_pfn &lt;&lt; PAGE_SHIFT);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -401,7 +451,9 @@ static void __init free_unused_memmap_node(int node, struct meminfo *mi)</div><div class='ctx'> 	 * information on the command line.</div><div class='ctx'> 	 */</div><div class='ctx'> 	for_each_nodebank(i, mi, node) {</div><div class='del'>-		bank_start = mi-&gt;bank[i].start &gt;&gt; PAGE_SHIFT;</div><div class='add'>+		struct membank *bank = &amp;mi-&gt;bank[i];</div><div class='add'>+</div><div class='add'>+		bank_start = bank_pfn_start(bank);</div><div class='ctx'> 		if (bank_start &lt; prev_bank_end) {</div><div class='ctx'> 			printk(KERN_ERR "MEM: unordered memory banks.  "</div><div class='ctx'> 				"Not freeing memmap.\n");</div><div class='hunk'>@@ -415,8 +467,7 @@ static void __init free_unused_memmap_node(int node, struct meminfo *mi)</div><div class='ctx'> 		if (prev_bank_end &amp;&amp; prev_bank_end != bank_start)</div><div class='ctx'> 			free_memmap(node, prev_bank_end, bank_start);</div><div class='ctx'> </div><div class='del'>-		prev_bank_end = (mi-&gt;bank[i].start +</div><div class='del'>-				 mi-&gt;bank[i].size) &gt;&gt; PAGE_SHIFT;</div><div class='add'>+		prev_bank_end = bank_pfn_end(bank);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -461,8 +512,8 @@ void __init mem_init(void)</div><div class='ctx'> </div><div class='ctx'> 	num_physpages = 0;</div><div class='ctx'> 	for (i = 0; i &lt; meminfo.nr_banks; i++) {</div><div class='del'>-		num_physpages += meminfo.bank[i].size &gt;&gt; PAGE_SHIFT;</div><div class='del'>-		printk(" %ldMB", meminfo.bank[i].size &gt;&gt; 20);</div><div class='add'>+		num_physpages += bank_pfn_size(&amp;meminfo.bank[i]);</div><div class='add'>+		printk(" %ldMB", bank_phys_size(&amp;meminfo.bank[i]) &gt;&gt; 20);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	printk(" = %luMB total\n", num_physpages &gt;&gt; (20 - PAGE_SHIFT));</div><div class='head'>diff --git a/arch/arm/mm/iomap.c b/arch/arm/mm/iomap.c<br/>index 7429f8c01015..ffad039cbb73 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/iomap.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mm/iomap.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/iomap.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/iomap.c</a></div><div class='hunk'>@@ -7,8 +7,7 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef __io</div><div class='ctx'> void __iomem *ioport_map(unsigned long port, unsigned int nr)</div><div class='head'>diff --git a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c<br/>index b81dbf9ffb77..18373f73f2fc 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/ioremap.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mm/ioremap.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/ioremap.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/ioremap.c</a></div><div class='hunk'>@@ -24,9 +24,10 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/cputype.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='ctx'> #include &lt;asm/pgalloc.h&gt;</div><div class='ctx'> #include &lt;asm/tlbflush.h&gt;</div><div class='hunk'>@@ -55,8 +56,7 @@ static int remap_area_pte(pmd_t *pmd, unsigned long addr, unsigned long end,</div><div class='ctx'> 		if (!pte_none(*pte))</div><div class='ctx'> 			goto bad;</div><div class='ctx'> </div><div class='del'>-		set_pte_ext(pte, pfn_pte(phys_addr &gt;&gt; PAGE_SHIFT, prot),</div><div class='del'>-			    type-&gt;prot_pte_ext);</div><div class='add'>+		set_pte_ext(pte, pfn_pte(phys_addr &gt;&gt; PAGE_SHIFT, prot), 0);</div><div class='ctx'> 		phys_addr += PAGE_SIZE;</div><div class='ctx'> 	} while (pte++, addr += PAGE_SIZE, addr != end);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -332,15 +332,14 @@ __arm_ioremap(unsigned long phys_addr, size_t size, unsigned int mtype)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(__arm_ioremap);</div><div class='ctx'> </div><div class='del'>-void __iounmap(volatile void __iomem *addr)</div><div class='add'>+void __iounmap(volatile void __iomem *io_addr)</div><div class='ctx'> {</div><div class='add'>+	void *addr = (void *)(PAGE_MASK &amp; (unsigned long)io_addr);</div><div class='ctx'> #ifndef CONFIG_SMP</div><div class='ctx'> 	struct vm_struct **p, *tmp;</div><div class='ctx'> #endif</div><div class='ctx'> 	unsigned int section_mapping = 0;</div><div class='ctx'> </div><div class='del'>-	addr = (volatile void __iomem *)(PAGE_MASK &amp; (unsigned long)addr);</div><div class='del'>-</div><div class='ctx'> #ifndef CONFIG_SMP</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If this is a section based mapping we need to handle it</div><div class='hunk'>@@ -351,7 +350,7 @@ void __iounmap(volatile void __iomem *addr)</div><div class='ctx'> 	 */</div><div class='ctx'> 	write_lock(&amp;vmlist_lock);</div><div class='ctx'> 	for (p = &amp;vmlist ; (tmp = *p) ; p = &amp;tmp-&gt;next) {</div><div class='del'>-		if((tmp-&gt;flags &amp; VM_IOREMAP) &amp;&amp; (tmp-&gt;addr == addr)) {</div><div class='add'>+		if ((tmp-&gt;flags &amp; VM_IOREMAP) &amp;&amp; (tmp-&gt;addr == addr)) {</div><div class='ctx'> 			if (tmp-&gt;flags &amp; VM_ARM_SECTION_MAPPING) {</div><div class='ctx'> 				*p = tmp-&gt;next;</div><div class='ctx'> 				unmap_area_sections((unsigned long)tmp-&gt;addr,</div><div class='hunk'>@@ -366,6 +365,6 @@ void __iounmap(volatile void __iomem *addr)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	if (!section_mapping)</div><div class='del'>-		vunmap((void __force *)addr);</div><div class='add'>+		vunmap(addr);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(__iounmap);</div><div class='head'>diff --git a/arch/arm/mm/mm.h b/arch/arm/mm/mm.h<br/>index 7647c597fc59..5d9f53907b4e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/mm.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mm/mm.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/mm.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/mm.h</a></div><div class='hunk'>@@ -18,7 +18,6 @@ static inline pmd_t *pmd_off_k(unsigned long virt)</div><div class='ctx'> </div><div class='ctx'> struct mem_type {</div><div class='ctx'> 	unsigned int prot_pte;</div><div class='del'>-	unsigned int prot_pte_ext;</div><div class='ctx'> 	unsigned int prot_l1;</div><div class='ctx'> 	unsigned int prot_sect;</div><div class='ctx'> 	unsigned int domain;</div><div class='hunk'>@@ -35,3 +34,5 @@ struct pglist_data;</div><div class='ctx'> void __init create_mapping(struct map_desc *md);</div><div class='ctx'> void __init bootmem_init(struct meminfo *mi);</div><div class='ctx'> void reserve_node_zero(struct pglist_data *pgdat);</div><div class='add'>+</div><div class='add'>+extern void _text, _stext, _etext, __data_start, _end, __init_begin, __init_end;</div><div class='head'>diff --git a/arch/arm/mm/mmap.c b/arch/arm/mm/mmap.c<br/>index 3f6dc40b8353..5358fcc7f61e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/mmap.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mm/mmap.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/mmap.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/mmap.c</a></div><div class='hunk'>@@ -6,6 +6,8 @@</div><div class='ctx'> #include &lt;linux/mman.h&gt;</div><div class='ctx'> #include &lt;linux/shm.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;asm/cputype.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define COLOUR_ALIGN(addr,pgoff)		\</div><div class='hunk'>@@ -37,8 +39,8 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,</div><div class='ctx'> 	 * caches alias.  This is indicated by bits 9 and 21 of the</div><div class='ctx'> 	 * cache type register.</div><div class='ctx'> 	 */</div><div class='del'>-	cache_type = read_cpuid(CPUID_CACHETYPE);</div><div class='del'>-	if (cache_type != read_cpuid(CPUID_ID)) {</div><div class='add'>+	cache_type = read_cpuid_cachetype();</div><div class='add'>+	if (cache_type != read_cpuid_id()) {</div><div class='ctx'> 		aliasing = (cache_type | cache_type &gt;&gt; 12) &amp; (1 &lt;&lt; 11);</div><div class='ctx'> 		if (aliasing)</div><div class='ctx'> 			do_align = filp || flags &amp; MAP_SHARED;</div><div class='head'>diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c<br/>index a713e40e1f1a..8ba754064559 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/mmu.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mm/mmu.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/mmu.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/mmu.c</a></div><div class='hunk'>@@ -15,6 +15,7 @@</div><div class='ctx'> #include &lt;linux/mman.h&gt;</div><div class='ctx'> #include &lt;linux/nodemask.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/cputype.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/sizes.h&gt;</div><div class='hunk'>@@ -27,9 +28,6 @@</div><div class='ctx'> </div><div class='ctx'> DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);</div><div class='ctx'> </div><div class='del'>-extern void _stext, _etext, __data_start, _end;</div><div class='del'>-extern pgd_t swapper_pg_dir[PTRS_PER_PGD];</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * empty_zero_page is a special page that is used for</div><div class='ctx'>  * zero-initialized data and COW.</div><div class='hunk'>@@ -68,27 +66,27 @@ static struct cachepolicy cache_policies[] __initdata = {</div><div class='ctx'> 		.policy		= "uncached",</div><div class='ctx'> 		.cr_mask	= CR_W|CR_C,</div><div class='ctx'> 		.pmd		= PMD_SECT_UNCACHED,</div><div class='del'>-		.pte		= 0,</div><div class='add'>+		.pte		= L_PTE_MT_UNCACHED,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.policy		= "buffered",</div><div class='ctx'> 		.cr_mask	= CR_C,</div><div class='ctx'> 		.pmd		= PMD_SECT_BUFFERED,</div><div class='del'>-		.pte		= PTE_BUFFERABLE,</div><div class='add'>+		.pte		= L_PTE_MT_BUFFERABLE,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.policy		= "writethrough",</div><div class='ctx'> 		.cr_mask	= 0,</div><div class='ctx'> 		.pmd		= PMD_SECT_WT,</div><div class='del'>-		.pte		= PTE_CACHEABLE,</div><div class='add'>+		.pte		= L_PTE_MT_WRITETHROUGH,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.policy		= "writeback",</div><div class='ctx'> 		.cr_mask	= 0,</div><div class='ctx'> 		.pmd		= PMD_SECT_WB,</div><div class='del'>-		.pte		= PTE_BUFFERABLE|PTE_CACHEABLE,</div><div class='add'>+		.pte		= L_PTE_MT_WRITEBACK,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.policy		= "writealloc",</div><div class='ctx'> 		.cr_mask	= 0,</div><div class='ctx'> 		.pmd		= PMD_SECT_WBWA,</div><div class='del'>-		.pte		= PTE_BUFFERABLE|PTE_CACHEABLE,</div><div class='add'>+		.pte		= L_PTE_MT_WRITEALLOC,</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -186,35 +184,28 @@ void adjust_cr(unsigned long mask, unsigned long set)</div><div class='ctx'> </div><div class='ctx'> static struct mem_type mem_types[] = {</div><div class='ctx'> 	[MT_DEVICE] = {		  /* Strongly ordered / ARMv6 shared device */</div><div class='del'>-		.prot_pte	= PROT_PTE_DEVICE,</div><div class='add'>+		.prot_pte	= PROT_PTE_DEVICE | L_PTE_MT_DEV_SHARED |</div><div class='add'>+				  L_PTE_SHARED,</div><div class='ctx'> 		.prot_l1	= PMD_TYPE_TABLE,</div><div class='ctx'> 		.prot_sect	= PROT_SECT_DEVICE | PMD_SECT_UNCACHED,</div><div class='ctx'> 		.domain		= DOMAIN_IO,</div><div class='ctx'> 	},</div><div class='ctx'> 	[MT_DEVICE_NONSHARED] = { /* ARMv6 non-shared device */</div><div class='del'>-		.prot_pte	= PROT_PTE_DEVICE,</div><div class='del'>-		.prot_pte_ext	= PTE_EXT_TEX(2),</div><div class='add'>+		.prot_pte	= PROT_PTE_DEVICE | L_PTE_MT_DEV_NONSHARED,</div><div class='ctx'> 		.prot_l1	= PMD_TYPE_TABLE,</div><div class='ctx'> 		.prot_sect	= PROT_SECT_DEVICE | PMD_SECT_TEX(2),</div><div class='ctx'> 		.domain		= DOMAIN_IO,</div><div class='ctx'> 	},</div><div class='ctx'> 	[MT_DEVICE_CACHED] = {	  /* ioremap_cached */</div><div class='del'>-		.prot_pte	= PROT_PTE_DEVICE | L_PTE_CACHEABLE | L_PTE_BUFFERABLE,</div><div class='add'>+		.prot_pte	= PROT_PTE_DEVICE | L_PTE_MT_DEV_CACHED,</div><div class='ctx'> 		.prot_l1	= PMD_TYPE_TABLE,</div><div class='ctx'> 		.prot_sect	= PROT_SECT_DEVICE | PMD_SECT_WB,</div><div class='ctx'> 		.domain		= DOMAIN_IO,</div><div class='ctx'> 	},	</div><div class='del'>-	[MT_DEVICE_IXP2000] = {	  /* IXP2400 requires XCB=101 for on-chip I/O */</div><div class='del'>-		.prot_pte	= PROT_PTE_DEVICE,</div><div class='del'>-		.prot_l1	= PMD_TYPE_TABLE,</div><div class='del'>-		.prot_sect	= PROT_SECT_DEVICE | PMD_SECT_BUFFERABLE |</div><div class='del'>-				  PMD_SECT_TEX(1),</div><div class='del'>-		.domain		= DOMAIN_IO,</div><div class='del'>-	},</div><div class='ctx'> 	[MT_DEVICE_WC] = {	/* ioremap_wc */</div><div class='del'>-		.prot_pte	= PROT_PTE_DEVICE,</div><div class='add'>+		.prot_pte	= PROT_PTE_DEVICE | L_PTE_MT_DEV_WC,</div><div class='ctx'> 		.prot_l1	= PMD_TYPE_TABLE,</div><div class='del'>-		.prot_sect	= PROT_SECT_DEVICE,</div><div class='add'>+		.prot_sect	= PROT_SECT_DEVICE | PMD_SECT_BUFFERABLE,</div><div class='ctx'> 		.domain		= DOMAIN_IO,</div><div class='ctx'> 	},</div><div class='ctx'> 	[MT_CACHECLEAN] = {</div><div class='hunk'>@@ -259,7 +250,7 @@ static void __init build_mem_type_table(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct cachepolicy *cp;</div><div class='ctx'> 	unsigned int cr = get_cr();</div><div class='del'>-	unsigned int user_pgprot, kern_pgprot;</div><div class='add'>+	unsigned int user_pgprot, kern_pgprot, vecs_pgprot;</div><div class='ctx'> 	int cpu_arch = cpu_architecture();</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -277,6 +268,9 @@ static void __init build_mem_type_table(void)</div><div class='ctx'> 			cachepolicy = CPOLICY_WRITEBACK;</div><div class='ctx'> 		ecc_mask = 0;</div><div class='ctx'> 	}</div><div class='add'>+#ifdef CONFIG_SMP</div><div class='add'>+	cachepolicy = CPOLICY_WRITEALLOC;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * On non-Xscale3 ARMv5-and-older systems, use CB=01</div><div class='hunk'>@@ -285,11 +279,8 @@ static void __init build_mem_type_table(void)</div><div class='ctx'> 	 * in xsc3 parlance, Uncached Normal in ARMv6 parlance).</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (cpu_is_xsc3() || cpu_arch &gt;= CPU_ARCH_ARMv6) {</div><div class='del'>-		mem_types[MT_DEVICE_WC].prot_pte_ext |= PTE_EXT_TEX(1);</div><div class='ctx'> 		mem_types[MT_DEVICE_WC].prot_sect |= PMD_SECT_TEX(1);</div><div class='del'>-	} else {</div><div class='del'>-		mem_types[MT_DEVICE_WC].prot_pte |= L_PTE_BUFFERABLE;</div><div class='del'>-		mem_types[MT_DEVICE_WC].prot_sect |= PMD_SECT_BUFFERABLE;</div><div class='add'>+		mem_types[MT_DEVICE_WC].prot_sect &amp;= ~PMD_SECT_BUFFERABLE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -312,7 +303,15 @@ static void __init build_mem_type_table(void)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	cp = &amp;cache_policies[cachepolicy];</div><div class='del'>-	kern_pgprot = user_pgprot = cp-&gt;pte;</div><div class='add'>+	vecs_pgprot = kern_pgprot = user_pgprot = cp-&gt;pte;</div><div class='add'>+</div><div class='add'>+#ifndef CONFIG_SMP</div><div class='add'>+	/*</div><div class='add'>+	 * Only use write-through for non-SMP systems</div><div class='add'>+	 */</div><div class='add'>+	if (cpu_arch &gt;= CPU_ARCH_ARMv5 &amp;&amp; cachepolicy &gt; CPOLICY_WRITETHROUGH)</div><div class='add'>+		vecs_pgprot = cache_policies[CPOLICY_WRITETHROUGH].pte;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Enable CPU-specific coherency if supported.</div><div class='hunk'>@@ -340,7 +339,6 @@ static void __init build_mem_type_table(void)</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Mark the device area as "shared device"</div><div class='ctx'> 		 */</div><div class='del'>-		mem_types[MT_DEVICE].prot_pte |= L_PTE_BUFFERABLE;</div><div class='ctx'> 		mem_types[MT_DEVICE].prot_sect |= PMD_SECT_BUFFERED;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='hunk'>@@ -349,30 +347,21 @@ static void __init build_mem_type_table(void)</div><div class='ctx'> 		 */</div><div class='ctx'> 		user_pgprot |= L_PTE_SHARED;</div><div class='ctx'> 		kern_pgprot |= L_PTE_SHARED;</div><div class='add'>+		vecs_pgprot |= L_PTE_SHARED;</div><div class='ctx'> 		mem_types[MT_MEMORY].prot_sect |= PMD_SECT_S;</div><div class='ctx'> #endif</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 16; i++) {</div><div class='ctx'> 		unsigned long v = pgprot_val(protection_map[i]);</div><div class='del'>-		v = (v &amp; ~(L_PTE_BUFFERABLE|L_PTE_CACHEABLE)) | user_pgprot;</div><div class='del'>-		protection_map[i] = __pgprot(v);</div><div class='add'>+		protection_map[i] = __pgprot(v | user_pgprot);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mem_types[MT_LOW_VECTORS].prot_pte |= kern_pgprot;</div><div class='del'>-	mem_types[MT_HIGH_VECTORS].prot_pte |= kern_pgprot;</div><div class='add'>+	mem_types[MT_LOW_VECTORS].prot_pte |= vecs_pgprot;</div><div class='add'>+	mem_types[MT_HIGH_VECTORS].prot_pte |= vecs_pgprot;</div><div class='ctx'> </div><div class='del'>-	if (cpu_arch &gt;= CPU_ARCH_ARMv5) {</div><div class='del'>-#ifndef CONFIG_SMP</div><div class='del'>-		/*</div><div class='del'>-		 * Only use write-through for non-SMP systems</div><div class='del'>-		 */</div><div class='del'>-		mem_types[MT_LOW_VECTORS].prot_pte &amp;= ~L_PTE_BUFFERABLE;</div><div class='del'>-		mem_types[MT_HIGH_VECTORS].prot_pte &amp;= ~L_PTE_BUFFERABLE;</div><div class='del'>-#endif</div><div class='del'>-	} else {</div><div class='add'>+	if (cpu_arch &lt; CPU_ARCH_ARMv5)</div><div class='ctx'> 		mem_types[MT_MINICLEAN].prot_sect &amp;= ~PMD_SECT_TEX(1);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	pgprot_user   = __pgprot(L_PTE_PRESENT | L_PTE_YOUNG | user_pgprot);</div><div class='ctx'> 	pgprot_kernel = __pgprot(L_PTE_PRESENT | L_PTE_YOUNG |</div><div class='hunk'>@@ -420,8 +409,7 @@ static void __init alloc_init_pte(pmd_t *pmd, unsigned long addr,</div><div class='ctx'> </div><div class='ctx'> 	pte = pte_offset_kernel(pmd, addr);</div><div class='ctx'> 	do {</div><div class='del'>-		set_pte_ext(pte, pfn_pte(pfn, __pgprot(type-&gt;prot_pte)),</div><div class='del'>-			    type-&gt;prot_pte_ext);</div><div class='add'>+		set_pte_ext(pte, pfn_pte(pfn, __pgprot(type-&gt;prot_pte)), 0);</div><div class='ctx'> 		pfn++;</div><div class='ctx'> 	} while (pte++, addr += PAGE_SIZE, addr != end);</div><div class='ctx'> }</div><div class='hunk'>@@ -588,12 +576,35 @@ void __init iotable_init(struct map_desc *io_desc, int nr)</div><div class='ctx'> 		create_mapping(io_desc + i);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static unsigned long __initdata vmalloc_reserve = SZ_128M;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * vmalloc=size forces the vmalloc area to be exactly 'size'</div><div class='add'>+ * bytes. This can be used to increase (or decrease) the vmalloc</div><div class='add'>+ * area - the default is 128m.</div><div class='add'>+ */</div><div class='add'>+static void __init early_vmalloc(char **arg)</div><div class='add'>+{</div><div class='add'>+	vmalloc_reserve = memparse(*arg, arg);</div><div class='add'>+</div><div class='add'>+	if (vmalloc_reserve &lt; SZ_16M) {</div><div class='add'>+		vmalloc_reserve = SZ_16M;</div><div class='add'>+		printk(KERN_WARNING</div><div class='add'>+			"vmalloc area too small, limiting to %luMB\n",</div><div class='add'>+			vmalloc_reserve &gt;&gt; 20);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+__early_param("vmalloc=", early_vmalloc);</div><div class='add'>+</div><div class='add'>+#define VMALLOC_MIN	(void *)(VMALLOC_END - vmalloc_reserve)</div><div class='add'>+</div><div class='ctx'> static int __init check_membank_valid(struct membank *mb)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='del'>-	 * Check whether this memory region has non-zero size.</div><div class='add'>+	 * Check whether this memory region has non-zero size or</div><div class='add'>+	 * invalid node number.</div><div class='ctx'> 	 */</div><div class='del'>-	if (mb-&gt;size == 0)</div><div class='add'>+	if (mb-&gt;size == 0 || mb-&gt;node &gt;= MAX_NUMNODES)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -627,8 +638,7 @@ static int __init check_membank_valid(struct membank *mb)</div><div class='ctx'> </div><div class='ctx'> static void __init sanity_check_meminfo(struct meminfo *mi)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='del'>-	int j;</div><div class='add'>+	int i, j;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0, j = 0; i &lt; mi-&gt;nr_banks; i++) {</div><div class='ctx'> 		if (check_membank_valid(&amp;mi-&gt;bank[i]))</div><div class='head'>diff --git a/arch/arm/mm/nommu.c b/arch/arm/mm/nommu.c<br/>index 63c62fdea521..07b62b238979 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/nommu.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mm/nommu.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/nommu.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/nommu.c</a></div><div class='hunk'>@@ -7,16 +7,14 @@</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/pagemap.h&gt;</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "mm.h"</div><div class='ctx'> </div><div class='del'>-extern void _stext, __data_start, _end;</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Reserve the various regions of node 0</div><div class='ctx'>  */</div><div class='hunk'>@@ -43,12 +41,26 @@ void __init reserve_node_zero(pg_data_t *pgdat)</div><div class='ctx'> 			BOOTMEM_DEFAULT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void __init sanity_check_meminfo(struct meminfo *mi)</div><div class='add'>+{</div><div class='add'>+	int i, j;</div><div class='add'>+</div><div class='add'>+	for (i = 0, j = 0; i &lt; mi-&gt;nr_banks; i++) {</div><div class='add'>+		struct membank *mb = &amp;mi-&gt;bank[i];</div><div class='add'>+</div><div class='add'>+		if (mb-&gt;size != 0 &amp;&amp; mb-&gt;node &lt; MAX_NUMNODES)</div><div class='add'>+			mi-&gt;bank[j++] = mi-&gt;bank[i];</div><div class='add'>+	}</div><div class='add'>+	mi-&gt;nr_banks = j;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * paging_init() sets up the page tables, initialises the zone memory</div><div class='ctx'>  * maps, and sets up the zero page, bad page and bad page tables.</div><div class='ctx'>  */</div><div class='ctx'> void __init paging_init(struct meminfo *mi, struct machine_desc *mdesc)</div><div class='ctx'> {</div><div class='add'>+	sanity_check_meminfo(mi);</div><div class='ctx'> 	bootmem_init(mi);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mm/proc-arm1020.S b/arch/arm/mm/proc-arm1020.S<br/>index 5673f4d6113b..b5551bf010aa 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/proc-arm1020.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mm/proc-arm1020.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/proc-arm1020.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/proc-arm1020.S</a></div><div class='hunk'>@@ -29,7 +29,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;asm/assembler.h&gt;</div><div class='ctx'> #include &lt;asm/asm-offsets.h&gt;</div><div class='del'>-#include &lt;asm/elf.h&gt;</div><div class='add'>+#include &lt;asm/hwcap.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable-hwdef.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='hunk'>@@ -399,29 +399,7 @@ ENTRY(cpu_arm1020_switch_mm)</div><div class='ctx'> 	.align	5</div><div class='ctx'> ENTRY(cpu_arm1020_set_pte_ext)</div><div class='ctx'> #ifdef CONFIG_MMU</div><div class='del'>-	str	r1, [r0], #-2048		@ linux version</div><div class='del'>-</div><div class='del'>-	eor	r1, r1, #L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_WRITE | L_PTE_DIRTY</div><div class='del'>-</div><div class='del'>-	bic	r2, r1, #PTE_SMALL_AP_MASK</div><div class='del'>-	bic	r2, r2, #PTE_TYPE_MASK</div><div class='del'>-	orr	r2, r2, #PTE_TYPE_SMALL</div><div class='del'>-</div><div class='del'>-	tst	r1, #L_PTE_USER			@ User?</div><div class='del'>-	orrne	r2, r2, #PTE_SMALL_AP_URO_SRW</div><div class='del'>-</div><div class='del'>-	tst	r1, #L_PTE_WRITE | L_PTE_DIRTY	@ Write and Dirty?</div><div class='del'>-	orreq	r2, r2, #PTE_SMALL_AP_UNO_SRW</div><div class='del'>-</div><div class='del'>-	tst	r1, #L_PTE_PRESENT | L_PTE_YOUNG	@ Present and Young?</div><div class='del'>-	movne	r2, #0</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_CPU_DCACHE_WRITETHROUGH</div><div class='del'>-	eor	r3, r1, #0x0a			@ C &amp; small page?</div><div class='del'>-	tst	r3, #0x0b</div><div class='del'>-	biceq	r2, r2, #4</div><div class='del'>-#endif</div><div class='del'>-	str	r2, [r0]			@ hardware version</div><div class='add'>+	armv3_set_pte_ext</div><div class='ctx'> 	mov	r0, r0</div><div class='ctx'> #ifndef CONFIG_CPU_DCACHE_DISABLE</div><div class='ctx'> 	mcr	p15, 0, r0, c7, c10, 4</div><div class='head'>diff --git a/arch/arm/mm/proc-arm1020e.S b/arch/arm/mm/proc-arm1020e.S<br/>index 4343fdb0e9e5..8bc6740c29eb 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/proc-arm1020e.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mm/proc-arm1020e.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/proc-arm1020e.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/proc-arm1020e.S</a></div><div class='hunk'>@@ -29,7 +29,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;asm/assembler.h&gt;</div><div class='ctx'> #include &lt;asm/asm-offsets.h&gt;</div><div class='del'>-#include &lt;asm/elf.h&gt;</div><div class='add'>+#include &lt;asm/hwcap.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable-hwdef.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='hunk'>@@ -383,29 +383,7 @@ ENTRY(cpu_arm1020e_switch_mm)</div><div class='ctx'> 	.align	5</div><div class='ctx'> ENTRY(cpu_arm1020e_set_pte_ext)</div><div class='ctx'> #ifdef CONFIG_MMU</div><div class='del'>-	str	r1, [r0], #-2048		@ linux version</div><div class='del'>-</div><div class='del'>-	eor	r1, r1, #L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_WRITE | L_PTE_DIRTY</div><div class='del'>-</div><div class='del'>-	bic	r2, r1, #PTE_SMALL_AP_MASK</div><div class='del'>-	bic	r2, r2, #PTE_TYPE_MASK</div><div class='del'>-	orr	r2, r2, #PTE_TYPE_SMALL</div><div class='del'>-</div><div class='del'>-	tst	r1, #L_PTE_USER			@ User?</div><div class='del'>-	orrne	r2, r2, #PTE_SMALL_AP_URO_SRW</div><div class='del'>-</div><div class='del'>-	tst	r1, #L_PTE_WRITE | L_PTE_DIRTY	@ Write and Dirty?</div><div class='del'>-	orreq	r2, r2, #PTE_SMALL_AP_UNO_SRW</div><div class='del'>-</div><div class='del'>-	tst	r1, #L_PTE_PRESENT | L_PTE_YOUNG	@ Present and Young?</div><div class='del'>-	movne	r2, #0</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_CPU_DCACHE_WRITETHROUGH</div><div class='del'>-	eor	r3, r1, #0x0a			@ C &amp; small page?</div><div class='del'>-	tst	r3, #0x0b</div><div class='del'>-	biceq	r2, r2, #4</div><div class='del'>-#endif</div><div class='del'>-	str	r2, [r0]			@ hardware version</div><div class='add'>+	armv3_set_pte_ext</div><div class='ctx'> 	mov	r0, r0</div><div class='ctx'> #ifndef CONFIG_CPU_DCACHE_DISABLE</div><div class='ctx'> 	mcr	p15, 0, r0, c7, c10, 1		@ clean D entry</div><div class='head'>diff --git a/arch/arm/mm/proc-arm1022.S b/arch/arm/mm/proc-arm1022.S<br/>index 2a4ea1659e96..2cd03e66c0a3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/proc-arm1022.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mm/proc-arm1022.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/proc-arm1022.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/proc-arm1022.S</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;asm/assembler.h&gt;</div><div class='ctx'> #include &lt;asm/asm-offsets.h&gt;</div><div class='del'>-#include &lt;asm/elf.h&gt;</div><div class='add'>+#include &lt;asm/hwcap.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable-hwdef.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='hunk'>@@ -365,29 +365,7 @@ ENTRY(cpu_arm1022_switch_mm)</div><div class='ctx'> 	.align	5</div><div class='ctx'> ENTRY(cpu_arm1022_set_pte_ext)</div><div class='ctx'> #ifdef CONFIG_MMU</div><div class='del'>-	str	r1, [r0], #-2048		@ linux version</div><div class='del'>-</div><div class='del'>-	eor	r1, r1, #L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_WRITE | L_PTE_DIRTY</div><div class='del'>-</div><div class='del'>-	bic	r2, r1, #PTE_SMALL_AP_MASK</div><div class='del'>-	bic	r2, r2, #PTE_TYPE_MASK</div><div class='del'>-	orr	r2, r2, #PTE_TYPE_SMALL</div><div class='del'>-</div><div class='del'>-	tst	r1, #L_PTE_USER			@ User?</div><div class='del'>-	orrne	r2, r2, #PTE_SMALL_AP_URO_SRW</div><div class='del'>-</div><div class='del'>-	tst	r1, #L_PTE_WRITE | L_PTE_DIRTY	@ Write and Dirty?</div><div class='del'>-	orreq	r2, r2, #PTE_SMALL_AP_UNO_SRW</div><div class='del'>-</div><div class='del'>-	tst	r1, #L_PTE_PRESENT | L_PTE_YOUNG	@ Present and Young?</div><div class='del'>-	movne	r2, #0</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_CPU_DCACHE_WRITETHROUGH</div><div class='del'>-	eor	r3, r1, #0x0a			@ C &amp; small page?</div><div class='del'>-	tst	r3, #0x0b</div><div class='del'>-	biceq	r2, r2, #4</div><div class='del'>-#endif</div><div class='del'>-	str	r2, [r0]			@ hardware version</div><div class='add'>+	armv3_set_pte_ext</div><div class='ctx'> 	mov	r0, r0</div><div class='ctx'> #ifndef CONFIG_CPU_DCACHE_DISABLE</div><div class='ctx'> 	mcr	p15, 0, r0, c7, c10, 1		@ clean D entry</div><div class='head'>diff --git a/arch/arm/mm/proc-arm1026.S b/arch/arm/mm/proc-arm1026.S<br/>index 77a1babd421c..ad961a897f6e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/proc-arm1026.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mm/proc-arm1026.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/proc-arm1026.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/proc-arm1026.S</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;asm/assembler.h&gt;</div><div class='ctx'> #include &lt;asm/asm-offsets.h&gt;</div><div class='del'>-#include &lt;asm/elf.h&gt;</div><div class='add'>+#include &lt;asm/hwcap.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable-hwdef.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='hunk'>@@ -354,29 +354,7 @@ ENTRY(cpu_arm1026_switch_mm)</div><div class='ctx'> 	.align	5</div><div class='ctx'> ENTRY(cpu_arm1026_set_pte_ext)</div><div class='ctx'> #ifdef CONFIG_MMU</div><div class='del'>-	str	r1, [r0], #-2048		@ linux version</div><div class='del'>-</div><div class='del'>-	eor	r1, r1, #L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_WRITE | L_PTE_DIRTY</div><div class='del'>-</div><div class='del'>-	bic	r2, r1, #PTE_SMALL_AP_MASK</div><div class='del'>-	bic	r2, r2, #PTE_TYPE_MASK</div><div class='del'>-	orr	r2, r2, #PTE_TYPE_SMALL</div><div class='del'>-</div><div class='del'>-	tst	r1, #L_PTE_USER			@ User?</div><div class='del'>-	orrne	r2, r2, #PTE_SMALL_AP_URO_SRW</div><div class='del'>-</div><div class='del'>-	tst	r1, #L_PTE_WRITE | L_PTE_DIRTY	@ Write and Dirty?</div><div class='del'>-	orreq	r2, r2, #PTE_SMALL_AP_UNO_SRW</div><div class='del'>-</div><div class='del'>-	tst	r1, #L_PTE_PRESENT | L_PTE_YOUNG	@ Present and Young?</div><div class='del'>-	movne	r2, #0</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_CPU_DCACHE_WRITETHROUGH</div><div class='del'>-	eor	r3, r1, #0x0a			@ C &amp; small page?</div><div class='del'>-	tst	r3, #0x0b</div><div class='del'>-	biceq	r2, r2, #4</div><div class='del'>-#endif</div><div class='del'>-	str	r2, [r0]			@ hardware version</div><div class='add'>+	armv3_set_pte_ext</div><div class='ctx'> 	mov	r0, r0</div><div class='ctx'> #ifndef CONFIG_CPU_DCACHE_DISABLE</div><div class='ctx'> 	mcr	p15, 0, r0, c7, c10, 1		@ clean D entry</div><div class='head'>diff --git a/arch/arm/mm/proc-arm6_7.S b/arch/arm/mm/proc-arm6_7.S<br/>index c371fc87776e..80d6e1de069a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/proc-arm6_7.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mm/proc-arm6_7.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/proc-arm6_7.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/proc-arm6_7.S</a></div><div class='hunk'>@@ -15,11 +15,13 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;asm/assembler.h&gt;</div><div class='ctx'> #include &lt;asm/asm-offsets.h&gt;</div><div class='del'>-#include &lt;asm/elf.h&gt;</div><div class='add'>+#include &lt;asm/hwcap.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable-hwdef.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "proc-macros.S"</div><div class='add'>+</div><div class='ctx'> ENTRY(cpu_arm6_dcache_clean_area)</div><div class='ctx'> ENTRY(cpu_arm7_dcache_clean_area)</div><div class='ctx'> 		mov	pc, lr</div><div class='hunk'>@@ -214,30 +216,13 @@ ENTRY(cpu_arm7_switch_mm)</div><div class='ctx'>  *	   : r1 = value to set</div><div class='ctx'>  * Purpose : Set a PTE and flush it out of any WB cache</div><div class='ctx'>  */</div><div class='del'>-		.align	5</div><div class='add'>+	.align	5</div><div class='ctx'> ENTRY(cpu_arm6_set_pte_ext)</div><div class='ctx'> ENTRY(cpu_arm7_set_pte_ext)</div><div class='ctx'> #ifdef CONFIG_MMU</div><div class='del'>-		str	r1, [r0], #-2048		@ linux version</div><div class='del'>-</div><div class='del'>-		eor	r1, r1, #L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_WRITE | L_PTE_DIRTY</div><div class='del'>-</div><div class='del'>-		bic	r2, r1, #PTE_SMALL_AP_MASK</div><div class='del'>-		bic	r2, r2, #PTE_TYPE_MASK</div><div class='del'>-		orr	r2, r2, #PTE_TYPE_SMALL</div><div class='del'>-</div><div class='del'>-		tst	r1, #L_PTE_USER			@ User?</div><div class='del'>-		orrne	r2, r2, #PTE_SMALL_AP_URO_SRW</div><div class='del'>-</div><div class='del'>-		tst	r1, #L_PTE_WRITE | L_PTE_DIRTY	@ Write and Dirty?</div><div class='del'>-		orreq	r2, r2, #PTE_SMALL_AP_UNO_SRW</div><div class='del'>-</div><div class='del'>-		tst	r1, #L_PTE_PRESENT | L_PTE_YOUNG	@ Present and Young</div><div class='del'>-		movne	r2, #0</div><div class='del'>-</div><div class='del'>-		str	r2, [r0]			@ hardware version</div><div class='add'>+	armv3_set_pte_ext wc_disable=0</div><div class='ctx'> #endif /* CONFIG_MMU */</div><div class='del'>-		mov	pc, lr</div><div class='add'>+	mov	pc, lr</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Function: _arm6_7_reset</div><div class='head'>diff --git a/arch/arm/mm/proc-arm720.S b/arch/arm/mm/proc-arm720.S<br/>index eda733d30455..85ae18695f10 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/proc-arm720.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mm/proc-arm720.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/proc-arm720.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/proc-arm720.S</a></div><div class='hunk'>@@ -36,7 +36,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;asm/assembler.h&gt;</div><div class='ctx'> #include &lt;asm/asm-offsets.h&gt;</div><div class='del'>-#include &lt;asm/elf.h&gt;</div><div class='add'>+#include &lt;asm/hwcap.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable-hwdef.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='hunk'>@@ -93,29 +93,12 @@ ENTRY(cpu_arm720_switch_mm)</div><div class='ctx'>  *	   : r1 = value to set</div><div class='ctx'>  * Purpose : Set a PTE and flush it out of any WB cache</div><div class='ctx'>  */</div><div class='del'>-		.align	5</div><div class='add'>+	.align	5</div><div class='ctx'> ENTRY(cpu_arm720_set_pte_ext)</div><div class='ctx'> #ifdef CONFIG_MMU</div><div class='del'>-		str	r1, [r0], #-2048		@ linux version</div><div class='del'>-</div><div class='del'>-		eor	r1, r1, #L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_WRITE | L_PTE_DIRTY</div><div class='del'>-</div><div class='del'>-		bic	r2, r1, #PTE_SMALL_AP_MASK</div><div class='del'>-		bic	r2, r2, #PTE_TYPE_MASK</div><div class='del'>-		orr	r2, r2, #PTE_TYPE_SMALL</div><div class='del'>-</div><div class='del'>-		tst	r1, #L_PTE_USER			@ User?</div><div class='del'>-		orrne	r2, r2, #PTE_SMALL_AP_URO_SRW</div><div class='del'>-</div><div class='del'>-		tst	r1, #L_PTE_WRITE | L_PTE_DIRTY	@ Write and Dirty?</div><div class='del'>-		orreq	r2, r2, #PTE_SMALL_AP_UNO_SRW</div><div class='del'>-</div><div class='del'>-		tst	r1, #L_PTE_PRESENT | L_PTE_YOUNG	@ Present and Young</div><div class='del'>-		movne	r2, #0</div><div class='del'>-</div><div class='del'>-		str	r2, [r0]			@ hardware version</div><div class='add'>+	armv3_set_pte_ext wc_disable=0</div><div class='ctx'> #endif</div><div class='del'>-		mov	pc, lr</div><div class='add'>+	mov	pc, lr</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Function: arm720_reset</div><div class='head'>diff --git a/arch/arm/mm/proc-arm740.S b/arch/arm/mm/proc-arm740.S<br/>index 3a57376c8bc9..4f95bee63e95 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/proc-arm740.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mm/proc-arm740.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/proc-arm740.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/proc-arm740.S</a></div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;asm/assembler.h&gt;</div><div class='ctx'> #include &lt;asm/asm-offsets.h&gt;</div><div class='del'>-#include &lt;asm/elf.h&gt;</div><div class='add'>+#include &lt;asm/hwcap.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable-hwdef.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='head'>diff --git a/arch/arm/mm/proc-arm7tdmi.S b/arch/arm/mm/proc-arm7tdmi.S<br/>index 7b3ecdeb5370..93e05fa7bed4 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/proc-arm7tdmi.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mm/proc-arm7tdmi.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/proc-arm7tdmi.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/proc-arm7tdmi.S</a></div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;asm/assembler.h&gt;</div><div class='ctx'> #include &lt;asm/asm-offsets.h&gt;</div><div class='del'>-#include &lt;asm/elf.h&gt;</div><div class='add'>+#include &lt;asm/hwcap.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable-hwdef.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='head'>diff --git a/arch/arm/mm/proc-arm920.S b/arch/arm/mm/proc-arm920.S<br/>index 28cdb060df45..914d688394fc 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/proc-arm920.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mm/proc-arm920.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/proc-arm920.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/proc-arm920.S</a></div><div class='hunk'>@@ -28,7 +28,7 @@</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;asm/assembler.h&gt;</div><div class='del'>-#include &lt;asm/elf.h&gt;</div><div class='add'>+#include &lt;asm/hwcap.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable-hwdef.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='hunk'>@@ -351,33 +351,11 @@ ENTRY(cpu_arm920_switch_mm)</div><div class='ctx'> 	.align	5</div><div class='ctx'> ENTRY(cpu_arm920_set_pte_ext)</div><div class='ctx'> #ifdef CONFIG_MMU</div><div class='del'>-	str	r1, [r0], #-2048		@ linux version</div><div class='del'>-</div><div class='del'>-	eor	r1, r1, #L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_WRITE | L_PTE_DIRTY</div><div class='del'>-</div><div class='del'>-	bic	r2, r1, #PTE_SMALL_AP_MASK</div><div class='del'>-	bic	r2, r2, #PTE_TYPE_MASK</div><div class='del'>-	orr	r2, r2, #PTE_TYPE_SMALL</div><div class='del'>-</div><div class='del'>-	tst	r1, #L_PTE_USER			@ User?</div><div class='del'>-	orrne	r2, r2, #PTE_SMALL_AP_URO_SRW</div><div class='del'>-</div><div class='del'>-	tst	r1, #L_PTE_WRITE | L_PTE_DIRTY	@ Write and Dirty?</div><div class='del'>-	orreq	r2, r2, #PTE_SMALL_AP_UNO_SRW</div><div class='del'>-</div><div class='del'>-	tst	r1, #L_PTE_PRESENT | L_PTE_YOUNG	@ Present and Young?</div><div class='del'>-	movne	r2, #0</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_CPU_DCACHE_WRITETHROUGH</div><div class='del'>-	eor	r3, r2, #0x0a			@ C &amp; small page?</div><div class='del'>-	tst	r3, #0x0b</div><div class='del'>-	biceq	r2, r2, #4</div><div class='del'>-#endif</div><div class='del'>-	str	r2, [r0]			@ hardware version</div><div class='add'>+	armv3_set_pte_ext</div><div class='ctx'> 	mov	r0, r0</div><div class='ctx'> 	mcr	p15, 0, r0, c7, c10, 1		@ clean D entry</div><div class='ctx'> 	mcr	p15, 0, r0, c7, c10, 4		@ drain WB</div><div class='del'>-#endif /* CONFIG_MMU */</div><div class='add'>+#endif</div><div class='ctx'> 	mov	pc, lr</div><div class='ctx'> </div><div class='ctx'> 	__INIT</div><div class='head'>diff --git a/arch/arm/mm/proc-arm922.S b/arch/arm/mm/proc-arm922.S<br/>index 94ddcb4a4b76..51c9c9859e58 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/proc-arm922.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mm/proc-arm922.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/proc-arm922.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/proc-arm922.S</a></div><div class='hunk'>@@ -29,7 +29,7 @@</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;asm/assembler.h&gt;</div><div class='del'>-#include &lt;asm/elf.h&gt;</div><div class='add'>+#include &lt;asm/hwcap.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable-hwdef.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='hunk'>@@ -355,29 +355,7 @@ ENTRY(cpu_arm922_switch_mm)</div><div class='ctx'> 	.align	5</div><div class='ctx'> ENTRY(cpu_arm922_set_pte_ext)</div><div class='ctx'> #ifdef CONFIG_MMU</div><div class='del'>-	str	r1, [r0], #-2048		@ linux version</div><div class='del'>-</div><div class='del'>-	eor	r1, r1, #L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_WRITE | L_PTE_DIRTY</div><div class='del'>-</div><div class='del'>-	bic	r2, r1, #PTE_SMALL_AP_MASK</div><div class='del'>-	bic	r2, r2, #PTE_TYPE_MASK</div><div class='del'>-	orr	r2, r2, #PTE_TYPE_SMALL</div><div class='del'>-</div><div class='del'>-	tst	r1, #L_PTE_USER			@ User?</div><div class='del'>-	orrne	r2, r2, #PTE_SMALL_AP_URO_SRW</div><div class='del'>-</div><div class='del'>-	tst	r1, #L_PTE_WRITE | L_PTE_DIRTY	@ Write and Dirty?</div><div class='del'>-	orreq	r2, r2, #PTE_SMALL_AP_UNO_SRW</div><div class='del'>-</div><div class='del'>-	tst	r1, #L_PTE_PRESENT | L_PTE_YOUNG	@ Present and Young?</div><div class='del'>-	movne	r2, #0</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_CPU_DCACHE_WRITETHROUGH</div><div class='del'>-	eor	r3, r2, #0x0a			@ C &amp; small page?</div><div class='del'>-	tst	r3, #0x0b</div><div class='del'>-	biceq	r2, r2, #4</div><div class='del'>-#endif</div><div class='del'>-	str	r2, [r0]			@ hardware version</div><div class='add'>+	armv3_set_pte_ext</div><div class='ctx'> 	mov	r0, r0</div><div class='ctx'> 	mcr	p15, 0, r0, c7, c10, 1		@ clean D entry</div><div class='ctx'> 	mcr	p15, 0, r0, c7, c10, 4		@ drain WB</div><div class='head'>diff --git a/arch/arm/mm/proc-arm925.S b/arch/arm/mm/proc-arm925.S<br/>index d045812f3399..2724526d89c1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/proc-arm925.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mm/proc-arm925.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/proc-arm925.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/proc-arm925.S</a></div><div class='hunk'>@@ -52,7 +52,7 @@</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;asm/assembler.h&gt;</div><div class='del'>-#include &lt;asm/elf.h&gt;</div><div class='add'>+#include &lt;asm/hwcap.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable-hwdef.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='hunk'>@@ -398,29 +398,7 @@ ENTRY(cpu_arm925_switch_mm)</div><div class='ctx'> 	.align	5</div><div class='ctx'> ENTRY(cpu_arm925_set_pte_ext)</div><div class='ctx'> #ifdef CONFIG_MMU</div><div class='del'>-	str	r1, [r0], #-2048		@ linux version</div><div class='del'>-</div><div class='del'>-	eor	r1, r1, #L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_WRITE | L_PTE_DIRTY</div><div class='del'>-</div><div class='del'>-	bic	r2, r1, #PTE_SMALL_AP_MASK</div><div class='del'>-	bic	r2, r2, #PTE_TYPE_MASK</div><div class='del'>-	orr	r2, r2, #PTE_TYPE_SMALL</div><div class='del'>-</div><div class='del'>-	tst	r1, #L_PTE_USER			@ User?</div><div class='del'>-	orrne	r2, r2, #PTE_SMALL_AP_URO_SRW</div><div class='del'>-</div><div class='del'>-	tst	r1, #L_PTE_WRITE | L_PTE_DIRTY	@ Write and Dirty?</div><div class='del'>-	orreq	r2, r2, #PTE_SMALL_AP_UNO_SRW</div><div class='del'>-</div><div class='del'>-	tst	r1, #L_PTE_PRESENT | L_PTE_YOUNG	@ Present and Young?</div><div class='del'>-	movne	r2, #0</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_CPU_DCACHE_WRITETHROUGH</div><div class='del'>-	eor	r3, r2, #0x0a			@ C &amp; small page?</div><div class='del'>-	tst	r3, #0x0b</div><div class='del'>-	biceq	r2, r2, #4</div><div class='del'>-#endif</div><div class='del'>-	str	r2, [r0]			@ hardware version</div><div class='add'>+	armv3_set_pte_ext</div><div class='ctx'> 	mov	r0, r0</div><div class='ctx'> #ifndef CONFIG_CPU_DCACHE_WRITETHROUGH</div><div class='ctx'> 	mcr	p15, 0, r0, c7, c10, 1		@ clean D entry</div><div class='head'>diff --git a/arch/arm/mm/proc-arm926.S b/arch/arm/mm/proc-arm926.S<br/>index 4cd33169a7c9..54466937bff9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/proc-arm926.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mm/proc-arm926.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/proc-arm926.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/proc-arm926.S</a></div><div class='hunk'>@@ -28,7 +28,7 @@</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;asm/assembler.h&gt;</div><div class='del'>-#include &lt;asm/elf.h&gt;</div><div class='add'>+#include &lt;asm/hwcap.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable-hwdef.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='hunk'>@@ -359,29 +359,7 @@ ENTRY(cpu_arm926_switch_mm)</div><div class='ctx'> 	.align	5</div><div class='ctx'> ENTRY(cpu_arm926_set_pte_ext)</div><div class='ctx'> #ifdef CONFIG_MMU</div><div class='del'>-	str	r1, [r0], #-2048		@ linux version</div><div class='del'>-</div><div class='del'>-	eor	r1, r1, #L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_WRITE | L_PTE_DIRTY</div><div class='del'>-</div><div class='del'>-	bic	r2, r1, #PTE_SMALL_AP_MASK</div><div class='del'>-	bic	r2, r2, #PTE_TYPE_MASK</div><div class='del'>-	orr	r2, r2, #PTE_TYPE_SMALL</div><div class='del'>-</div><div class='del'>-	tst	r1, #L_PTE_USER			@ User?</div><div class='del'>-	orrne	r2, r2, #PTE_SMALL_AP_URO_SRW</div><div class='del'>-</div><div class='del'>-	tst	r1, #L_PTE_WRITE | L_PTE_DIRTY	@ Write and Dirty?</div><div class='del'>-	orreq	r2, r2, #PTE_SMALL_AP_UNO_SRW</div><div class='del'>-</div><div class='del'>-	tst	r1, #L_PTE_PRESENT | L_PTE_YOUNG	@ Present and Young?</div><div class='del'>-	movne	r2, #0</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_CPU_DCACHE_WRITETHROUGH</div><div class='del'>-	eor	r3, r2, #0x0a			@ C &amp; small page?</div><div class='del'>-	tst	r3, #0x0b</div><div class='del'>-	biceq	r2, r2, #4</div><div class='del'>-#endif</div><div class='del'>-	str	r2, [r0]			@ hardware version</div><div class='add'>+	armv3_set_pte_ext</div><div class='ctx'> 	mov	r0, r0</div><div class='ctx'> #ifndef CONFIG_CPU_DCACHE_WRITETHROUGH</div><div class='ctx'> 	mcr	p15, 0, r0, c7, c10, 1		@ clean D entry</div><div class='head'>diff --git a/arch/arm/mm/proc-arm940.S b/arch/arm/mm/proc-arm940.S<br/>index 551244d5ca19..f595117caf55 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/proc-arm940.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mm/proc-arm940.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/proc-arm940.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/proc-arm940.S</a></div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;asm/assembler.h&gt;</div><div class='del'>-#include &lt;asm/elf.h&gt;</div><div class='add'>+#include &lt;asm/hwcap.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable-hwdef.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='head'>diff --git a/arch/arm/mm/proc-arm946.S b/arch/arm/mm/proc-arm946.S<br/>index 6168c6160dee..e03f6ff1fb26 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/proc-arm946.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mm/proc-arm946.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/proc-arm946.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/proc-arm946.S</a></div><div class='hunk'>@@ -13,7 +13,7 @@</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;asm/assembler.h&gt;</div><div class='del'>-#include &lt;asm/elf.h&gt;</div><div class='add'>+#include &lt;asm/hwcap.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable-hwdef.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='head'>diff --git a/arch/arm/mm/proc-arm9tdmi.S b/arch/arm/mm/proc-arm9tdmi.S<br/>index c85c1f50e396..be6c11d2b3fb 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/proc-arm9tdmi.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mm/proc-arm9tdmi.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/proc-arm9tdmi.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/proc-arm9tdmi.S</a></div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;asm/assembler.h&gt;</div><div class='ctx'> #include &lt;asm/asm-offsets.h&gt;</div><div class='del'>-#include &lt;asm/elf.h&gt;</div><div class='add'>+#include &lt;asm/hwcap.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable-hwdef.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='head'>diff --git a/arch/arm/mm/proc-feroceon.S b/arch/arm/mm/proc-feroceon.S<br/>index f2e5884c513a..0fe1f8fc3488 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/proc-feroceon.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mm/proc-feroceon.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/proc-feroceon.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/proc-feroceon.S</a></div><div class='hunk'>@@ -22,7 +22,7 @@</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;asm/assembler.h&gt;</div><div class='del'>-#include &lt;asm/elf.h&gt;</div><div class='add'>+#include &lt;asm/hwcap.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable-hwdef.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='hunk'>@@ -80,7 +80,8 @@ ENTRY(cpu_feroceon_proc_fin)</div><div class='ctx'> 	msr	cpsr_c, ip</div><div class='ctx'> 	bl	feroceon_flush_kern_cache_all</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_CACHE_FEROCEON_L2) &amp;&amp; !defined(CONFIG_L2_CACHE_WRITETHROUGH)</div><div class='add'>+#if defined(CONFIG_CACHE_FEROCEON_L2) &amp;&amp; \</div><div class='add'>+	!defined(CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH)</div><div class='ctx'> 	mov	r0, #0</div><div class='ctx'> 	mcr	p15, 1, r0, c15, c9, 0		@ clean L2</div><div class='ctx'> 	mcr	p15, 0, r0, c7, c10, 4		@ drain WB</div><div class='hunk'>@@ -389,7 +390,8 @@ ENTRY(feroceon_range_cache_fns)</div><div class='ctx'> </div><div class='ctx'> 	.align	5</div><div class='ctx'> ENTRY(cpu_feroceon_dcache_clean_area)</div><div class='del'>-#if defined(CONFIG_CACHE_FEROCEON_L2) &amp;&amp; !defined(CONFIG_L2_CACHE_WRITETHROUGH)</div><div class='add'>+#if defined(CONFIG_CACHE_FEROCEON_L2) &amp;&amp; \</div><div class='add'>+	!defined(CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH)</div><div class='ctx'> 	mov	r2, r0</div><div class='ctx'> 	mov	r3, r1</div><div class='ctx'> #endif</div><div class='hunk'>@@ -397,7 +399,8 @@ ENTRY(cpu_feroceon_dcache_clean_area)</div><div class='ctx'> 	add	r0, r0, #CACHE_DLINESIZE</div><div class='ctx'> 	subs	r1, r1, #CACHE_DLINESIZE</div><div class='ctx'> 	bhi	1b</div><div class='del'>-#if defined(CONFIG_CACHE_FEROCEON_L2) &amp;&amp; !defined(CONFIG_L2_CACHE_WRITETHROUGH)</div><div class='add'>+#if defined(CONFIG_CACHE_FEROCEON_L2) &amp;&amp; \</div><div class='add'>+	!defined(CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH)</div><div class='ctx'> 1:	mcr	p15, 1, r2, c15, c9, 1		@ clean L2 entry</div><div class='ctx'> 	add	r2, r2, #CACHE_DLINESIZE</div><div class='ctx'> 	subs	r3, r3, #CACHE_DLINESIZE</div><div class='hunk'>@@ -446,27 +449,11 @@ ENTRY(cpu_feroceon_switch_mm)</div><div class='ctx'> 	.align	5</div><div class='ctx'> ENTRY(cpu_feroceon_set_pte_ext)</div><div class='ctx'> #ifdef CONFIG_MMU</div><div class='del'>-	str	r1, [r0], #-2048		@ linux version</div><div class='del'>-</div><div class='del'>-	eor	r1, r1, #L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_WRITE | L_PTE_DIRTY</div><div class='del'>-</div><div class='del'>-	bic	r2, r1, #PTE_SMALL_AP_MASK</div><div class='del'>-	bic	r2, r2, #PTE_TYPE_MASK</div><div class='del'>-	orr	r2, r2, #PTE_TYPE_SMALL</div><div class='del'>-</div><div class='del'>-	tst	r1, #L_PTE_USER			@ User?</div><div class='del'>-	orrne	r2, r2, #PTE_SMALL_AP_URO_SRW</div><div class='del'>-</div><div class='del'>-	tst	r1, #L_PTE_WRITE | L_PTE_DIRTY	@ Write and Dirty?</div><div class='del'>-	orreq	r2, r2, #PTE_SMALL_AP_UNO_SRW</div><div class='del'>-</div><div class='del'>-	tst	r1, #L_PTE_PRESENT | L_PTE_YOUNG	@ Present and Young?</div><div class='del'>-	movne	r2, #0</div><div class='del'>-</div><div class='del'>-	str	r2, [r0]			@ hardware version</div><div class='add'>+	armv3_set_pte_ext wc_disable=0</div><div class='ctx'> 	mov	r0, r0</div><div class='ctx'> 	mcr	p15, 0, r0, c7, c10, 1		@ clean D entry</div><div class='del'>-#if defined(CONFIG_CACHE_FEROCEON_L2) &amp;&amp; !defined(CONFIG_L2_CACHE_WRITETHROUGH)</div><div class='add'>+#if defined(CONFIG_CACHE_FEROCEON_L2) &amp;&amp; \</div><div class='add'>+	!defined(CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH)</div><div class='ctx'> 	mcr	p15, 1, r0, c15, c9, 1		@ clean L2 entry</div><div class='ctx'> #endif</div><div class='ctx'> 	mcr	p15, 0, r0, c7, c10, 4		@ drain WB</div><div class='head'>diff --git a/arch/arm/mm/proc-macros.S b/arch/arm/mm/proc-macros.S<br/>index b13150052a76..54b1f721dec8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/proc-macros.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mm/proc-macros.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/proc-macros.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/proc-macros.S</a></div><div class='hunk'>@@ -71,3 +71,173 @@</div><div class='ctx'> 	mov	\reg, #16			@ size offset</div><div class='ctx'> 	mov	\reg, \reg, lsl \tmp		@ actual cache line size</div><div class='ctx'> 	.endm</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Sanity check the PTE configuration for the code below - which makes</div><div class='add'>+ * certain assumptions about how these bits are layed out.</div><div class='add'>+ */</div><div class='add'>+#if L_PTE_SHARED != PTE_EXT_SHARED</div><div class='add'>+#error PTE shared bit mismatch</div><div class='add'>+#endif</div><div class='add'>+#if L_PTE_BUFFERABLE != PTE_BUFFERABLE</div><div class='add'>+#error PTE bufferable bit mismatch</div><div class='add'>+#endif</div><div class='add'>+#if L_PTE_CACHEABLE != PTE_CACHEABLE</div><div class='add'>+#error PTE cacheable bit mismatch</div><div class='add'>+#endif</div><div class='add'>+#if (L_PTE_EXEC+L_PTE_USER+L_PTE_WRITE+L_PTE_DIRTY+L_PTE_YOUNG+\</div><div class='add'>+     L_PTE_FILE+L_PTE_PRESENT) &gt; L_PTE_SHARED</div><div class='add'>+#error Invalid Linux PTE bit settings</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The ARMv6 and ARMv7 set_pte_ext translation function.</div><div class='add'>+ *</div><div class='add'>+ * Permission translation:</div><div class='add'>+ *  YUWD  APX AP1 AP0	SVC	User</div><div class='add'>+ *  0xxx   0   0   0	no acc	no acc</div><div class='add'>+ *  100x   1   0   1	r/o	no acc</div><div class='add'>+ *  10x0   1   0   1	r/o	no acc</div><div class='add'>+ *  1011   0   0   1	r/w	no acc</div><div class='add'>+ *  110x   0   1   0	r/w	r/o</div><div class='add'>+ *  11x0   0   1   0	r/w	r/o</div><div class='add'>+ *  1111   0   1   1	r/w	r/w</div><div class='add'>+ */</div><div class='add'>+	.macro	armv6_mt_table pfx</div><div class='add'>+\pfx\()_mt_table:</div><div class='add'>+	.long	0x00						@ L_PTE_MT_UNCACHED</div><div class='add'>+	.long	PTE_EXT_TEX(1)					@ L_PTE_MT_BUFFERABLE</div><div class='add'>+	.long	PTE_CACHEABLE					@ L_PTE_MT_WRITETHROUGH</div><div class='add'>+	.long	PTE_CACHEABLE | PTE_BUFFERABLE			@ L_PTE_MT_WRITEBACK</div><div class='add'>+	.long	PTE_BUFFERABLE					@ L_PTE_MT_DEV_SHARED</div><div class='add'>+	.long	0x00						@ unused</div><div class='add'>+	.long	0x00						@ L_PTE_MT_MINICACHE (not present)</div><div class='add'>+	.long	PTE_EXT_TEX(1) | PTE_CACHEABLE | PTE_BUFFERABLE	@ L_PTE_MT_WRITEALLOC</div><div class='add'>+	.long	0x00						@ unused</div><div class='add'>+	.long	PTE_EXT_TEX(1)					@ L_PTE_MT_DEV_WC</div><div class='add'>+	.long	0x00						@ unused</div><div class='add'>+	.long	PTE_CACHEABLE | PTE_BUFFERABLE			@ L_PTE_MT_DEV_CACHED</div><div class='add'>+	.long	PTE_EXT_TEX(2)					@ L_PTE_MT_DEV_NONSHARED</div><div class='add'>+	.long	0x00						@ unused</div><div class='add'>+	.long	0x00						@ unused</div><div class='add'>+	.long	0x00						@ unused</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.macro	armv6_set_pte_ext pfx</div><div class='add'>+	str	r1, [r0], #-2048		@ linux version</div><div class='add'>+</div><div class='add'>+	bic	r3, r1, #0x000003fc</div><div class='add'>+	bic	r3, r3, #PTE_TYPE_MASK</div><div class='add'>+	orr	r3, r3, r2</div><div class='add'>+	orr	r3, r3, #PTE_EXT_AP0 | 2</div><div class='add'>+</div><div class='add'>+	adr	ip, \pfx\()_mt_table</div><div class='add'>+	and	r2, r1, #L_PTE_MT_MASK</div><div class='add'>+	ldr	r2, [ip, r2]</div><div class='add'>+</div><div class='add'>+	tst	r1, #L_PTE_WRITE</div><div class='add'>+	tstne	r1, #L_PTE_DIRTY</div><div class='add'>+	orreq	r3, r3, #PTE_EXT_APX</div><div class='add'>+</div><div class='add'>+	tst	r1, #L_PTE_USER</div><div class='add'>+	orrne	r3, r3, #PTE_EXT_AP1</div><div class='add'>+	tstne	r3, #PTE_EXT_APX</div><div class='add'>+	bicne	r3, r3, #PTE_EXT_APX | PTE_EXT_AP0</div><div class='add'>+</div><div class='add'>+	tst	r1, #L_PTE_EXEC</div><div class='add'>+	orreq	r3, r3, #PTE_EXT_XN</div><div class='add'>+</div><div class='add'>+	orr	r3, r3, r2</div><div class='add'>+</div><div class='add'>+	tst	r1, #L_PTE_YOUNG</div><div class='add'>+	tstne	r1, #L_PTE_PRESENT</div><div class='add'>+	moveq	r3, #0</div><div class='add'>+</div><div class='add'>+	str	r3, [r0]</div><div class='add'>+	mcr	p15, 0, r0, c7, c10, 1		@ flush_pte</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The ARMv3, ARMv4 and ARMv5 set_pte_ext translation function,</div><div class='add'>+ * covering most CPUs except Xscale and Xscale 3.</div><div class='add'>+ *</div><div class='add'>+ * Permission translation:</div><div class='add'>+ *  YUWD   AP	SVC	User</div><div class='add'>+ *  0xxx  0x00	no acc	no acc</div><div class='add'>+ *  100x  0x00	r/o	no acc</div><div class='add'>+ *  10x0  0x00	r/o	no acc</div><div class='add'>+ *  1011  0x55	r/w	no acc</div><div class='add'>+ *  110x  0xaa	r/w	r/o</div><div class='add'>+ *  11x0  0xaa	r/w	r/o</div><div class='add'>+ *  1111  0xff	r/w	r/w</div><div class='add'>+ */</div><div class='add'>+	.macro	armv3_set_pte_ext wc_disable=1</div><div class='add'>+	str	r1, [r0], #-2048		@ linux version</div><div class='add'>+</div><div class='add'>+	eor	r3, r1, #L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_WRITE | L_PTE_DIRTY</div><div class='add'>+</div><div class='add'>+	bic	r2, r1, #PTE_SMALL_AP_MASK	@ keep C, B bits</div><div class='add'>+	bic	r2, r2, #PTE_TYPE_MASK</div><div class='add'>+	orr	r2, r2, #PTE_TYPE_SMALL</div><div class='add'>+</div><div class='add'>+	tst	r3, #L_PTE_USER			@ user?</div><div class='add'>+	orrne	r2, r2, #PTE_SMALL_AP_URO_SRW</div><div class='add'>+</div><div class='add'>+	tst	r3, #L_PTE_WRITE | L_PTE_DIRTY	@ write and dirty?</div><div class='add'>+	orreq	r2, r2, #PTE_SMALL_AP_UNO_SRW</div><div class='add'>+</div><div class='add'>+	tst	r3, #L_PTE_PRESENT | L_PTE_YOUNG	@ present and young?</div><div class='add'>+	movne	r2, #0</div><div class='add'>+</div><div class='add'>+	.if	\wc_disable</div><div class='add'>+#ifdef CONFIG_CPU_DCACHE_WRITETHROUGH</div><div class='add'>+	tst	r2, #PTE_CACHEABLE</div><div class='add'>+	bicne	r2, r2, #PTE_BUFFERABLE</div><div class='add'>+#endif</div><div class='add'>+	.endif</div><div class='add'>+	str	r2, [r0]			@ hardware version</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Xscale set_pte_ext translation, split into two halves to cope</div><div class='add'>+ * with work-arounds.  r3 must be preserved by code between these</div><div class='add'>+ * two macros.</div><div class='add'>+ *</div><div class='add'>+ * Permission translation:</div><div class='add'>+ *  YUWD  AP	SVC	User</div><div class='add'>+ *  0xxx  00	no acc	no acc</div><div class='add'>+ *  100x  00	r/o	no acc</div><div class='add'>+ *  10x0  00	r/o	no acc</div><div class='add'>+ *  1011  01	r/w	no acc</div><div class='add'>+ *  110x  10	r/w	r/o</div><div class='add'>+ *  11x0  10	r/w	r/o</div><div class='add'>+ *  1111  11	r/w	r/w</div><div class='add'>+ */</div><div class='add'>+	.macro	xscale_set_pte_ext_prologue</div><div class='add'>+	str	r1, [r0], #-2048		@ linux version</div><div class='add'>+</div><div class='add'>+	eor	r3, r1, #L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_WRITE | L_PTE_DIRTY</div><div class='add'>+</div><div class='add'>+	bic	r2, r1, #PTE_SMALL_AP_MASK	@ keep C, B bits</div><div class='add'>+	orr	r2, r2, #PTE_TYPE_EXT		@ extended page</div><div class='add'>+</div><div class='add'>+	tst	r3, #L_PTE_USER			@ user?</div><div class='add'>+	orrne	r2, r2, #PTE_EXT_AP_URO_SRW	@ yes -&gt; user r/o, system r/w</div><div class='add'>+</div><div class='add'>+	tst	r3, #L_PTE_WRITE | L_PTE_DIRTY	@ write and dirty?</div><div class='add'>+	orreq	r2, r2, #PTE_EXT_AP_UNO_SRW	@ yes -&gt; user n/a, system r/w</div><div class='add'>+						@ combined with user -&gt; user r/w</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.macro	xscale_set_pte_ext_epilogue</div><div class='add'>+	tst	r3, #L_PTE_PRESENT | L_PTE_YOUNG	@ present and young?</div><div class='add'>+	movne	r2, #0				@ no -&gt; fault</div><div class='add'>+</div><div class='add'>+	str	r2, [r0]			@ hardware version</div><div class='add'>+	mov	ip, #0</div><div class='add'>+	mcr	p15, 0, r0, c7, c10, 1		@ clean L1 D line</div><div class='add'>+	mcr	p15, 0, ip, c7, c10, 4		@ data write barrier</div><div class='add'>+	.endm</div><div class='head'>diff --git a/arch/arm/mm/proc-sa110.S b/arch/arm/mm/proc-sa110.S<br/>index bbe10576c861..90a7e5279f29 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/proc-sa110.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mm/proc-sa110.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/proc-sa110.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/proc-sa110.S</a></div><div class='hunk'>@@ -17,7 +17,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;asm/assembler.h&gt;</div><div class='ctx'> #include &lt;asm/asm-offsets.h&gt;</div><div class='del'>-#include &lt;asm/elf.h&gt;</div><div class='add'>+#include &lt;asm/hwcap.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable-hwdef.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='hunk'>@@ -153,24 +153,7 @@ ENTRY(cpu_sa110_switch_mm)</div><div class='ctx'> 	.align	5</div><div class='ctx'> ENTRY(cpu_sa110_set_pte_ext)</div><div class='ctx'> #ifdef CONFIG_MMU</div><div class='del'>-	str	r1, [r0], #-2048		@ linux version</div><div class='del'>-</div><div class='del'>-	eor	r1, r1, #L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_WRITE | L_PTE_DIRTY</div><div class='del'>-</div><div class='del'>-	bic	r2, r1, #PTE_SMALL_AP_MASK</div><div class='del'>-	bic	r2, r2, #PTE_TYPE_MASK</div><div class='del'>-	orr	r2, r2, #PTE_TYPE_SMALL</div><div class='del'>-</div><div class='del'>-	tst	r1, #L_PTE_USER			@ User?</div><div class='del'>-	orrne	r2, r2, #PTE_SMALL_AP_URO_SRW</div><div class='del'>-</div><div class='del'>-	tst	r1, #L_PTE_WRITE | L_PTE_DIRTY	@ Write and Dirty?</div><div class='del'>-	orreq	r2, r2, #PTE_SMALL_AP_UNO_SRW</div><div class='del'>-</div><div class='del'>-	tst	r1, #L_PTE_PRESENT | L_PTE_YOUNG	@ Present and Young?</div><div class='del'>-	movne	r2, #0</div><div class='del'>-</div><div class='del'>-	str	r2, [r0]			@ hardware version</div><div class='add'>+	armv3_set_pte_ext wc_disable=0</div><div class='ctx'> 	mov	r0, r0</div><div class='ctx'> 	mcr	p15, 0, r0, c7, c10, 1		@ clean D entry</div><div class='ctx'> 	mcr	p15, 0, r0, c7, c10, 4		@ drain WB</div><div class='head'>diff --git a/arch/arm/mm/proc-sa1100.S b/arch/arm/mm/proc-sa1100.S<br/>index 871ba018252e..451e2d953e2a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/proc-sa1100.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mm/proc-sa1100.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/proc-sa1100.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/proc-sa1100.S</a></div><div class='hunk'>@@ -22,7 +22,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;asm/assembler.h&gt;</div><div class='ctx'> #include &lt;asm/asm-offsets.h&gt;</div><div class='del'>-#include &lt;asm/elf.h&gt;</div><div class='add'>+#include &lt;asm/hwcap.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable-hwdef.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='hunk'>@@ -166,24 +166,7 @@ ENTRY(cpu_sa1100_switch_mm)</div><div class='ctx'> 	.align	5</div><div class='ctx'> ENTRY(cpu_sa1100_set_pte_ext)</div><div class='ctx'> #ifdef CONFIG_MMU</div><div class='del'>-	str	r1, [r0], #-2048		@ linux version</div><div class='del'>-</div><div class='del'>-	eor	r1, r1, #L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_WRITE | L_PTE_DIRTY</div><div class='del'>-</div><div class='del'>-	bic	r2, r1, #PTE_SMALL_AP_MASK</div><div class='del'>-	bic	r2, r2, #PTE_TYPE_MASK</div><div class='del'>-	orr	r2, r2, #PTE_TYPE_SMALL</div><div class='del'>-</div><div class='del'>-	tst	r1, #L_PTE_USER			@ User?</div><div class='del'>-	orrne	r2, r2, #PTE_SMALL_AP_URO_SRW</div><div class='del'>-</div><div class='del'>-	tst	r1, #L_PTE_WRITE | L_PTE_DIRTY	@ Write and Dirty?</div><div class='del'>-	orreq	r2, r2, #PTE_SMALL_AP_UNO_SRW</div><div class='del'>-</div><div class='del'>-	tst	r1, #L_PTE_PRESENT | L_PTE_YOUNG	@ Present and Young?</div><div class='del'>-	movne	r2, #0</div><div class='del'>-</div><div class='del'>-	str	r2, [r0]			@ hardware version</div><div class='add'>+	armv3_set_pte_ext wc_disable=0</div><div class='ctx'> 	mov	r0, r0</div><div class='ctx'> 	mcr	p15, 0, r0, c7, c10, 1		@ clean D entry</div><div class='ctx'> 	mcr	p15, 0, r0, c7, c10, 4		@ drain WB</div><div class='head'>diff --git a/arch/arm/mm/proc-v6.S b/arch/arm/mm/proc-v6.S<br/>index 5702ec58b2a2..294943b85973 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/proc-v6.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mm/proc-v6.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/proc-v6.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/proc-v6.S</a></div><div class='hunk'>@@ -13,7 +13,7 @@</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/assembler.h&gt;</div><div class='ctx'> #include &lt;asm/asm-offsets.h&gt;</div><div class='del'>-#include &lt;asm/elf.h&gt;</div><div class='add'>+#include &lt;asm/hwcap.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable-hwdef.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -114,46 +114,12 @@ ENTRY(cpu_v6_switch_mm)</div><div class='ctx'>  *		  (hardware version is stored at -1024 bytes)</div><div class='ctx'>  *	- pte   - PTE value to store</div><div class='ctx'>  *	- ext	- value for extended PTE bits</div><div class='del'>- *</div><div class='del'>- *	Permissions:</div><div class='del'>- *	  YUWD  APX AP1 AP0	SVC	User</div><div class='del'>- *	  0xxx   0   0   0	no acc	no acc</div><div class='del'>- *	  100x   1   0   1	r/o	no acc</div><div class='del'>- *	  10x0   1   0   1	r/o	no acc</div><div class='del'>- *	  1011   0   0   1	r/w	no acc</div><div class='del'>- *	  110x   0   1   0	r/w	r/o</div><div class='del'>- *	  11x0   0   1   0	r/w	r/o</div><div class='del'>- *	  1111   0   1   1	r/w	r/w</div><div class='ctx'>  */</div><div class='add'>+	armv6_mt_table cpu_v6</div><div class='add'>+</div><div class='ctx'> ENTRY(cpu_v6_set_pte_ext)</div><div class='ctx'> #ifdef CONFIG_MMU</div><div class='del'>-	str	r1, [r0], #-2048		@ linux version</div><div class='del'>-</div><div class='del'>-	bic	r3, r1, #0x000003f0</div><div class='del'>-	bic	r3, r3, #0x00000003</div><div class='del'>-	orr	r3, r3, r2</div><div class='del'>-	orr	r3, r3, #PTE_EXT_AP0 | 2</div><div class='del'>-</div><div class='del'>-	tst	r1, #L_PTE_WRITE</div><div class='del'>-	tstne	r1, #L_PTE_DIRTY</div><div class='del'>-	orreq	r3, r3, #PTE_EXT_APX</div><div class='del'>-</div><div class='del'>-	tst	r1, #L_PTE_USER</div><div class='del'>-	orrne	r3, r3, #PTE_EXT_AP1</div><div class='del'>-	tstne	r3, #PTE_EXT_APX</div><div class='del'>-	bicne	r3, r3, #PTE_EXT_APX | PTE_EXT_AP0</div><div class='del'>-</div><div class='del'>-	tst	r1, #L_PTE_YOUNG</div><div class='del'>-	biceq	r3, r3, #PTE_EXT_APX | PTE_EXT_AP_MASK</div><div class='del'>-</div><div class='del'>-	tst	r1, #L_PTE_EXEC</div><div class='del'>-	orreq	r3, r3, #PTE_EXT_XN</div><div class='del'>-</div><div class='del'>-	tst	r1, #L_PTE_PRESENT</div><div class='del'>-	moveq	r3, #0</div><div class='del'>-</div><div class='del'>-	str	r3, [r0]</div><div class='del'>-	mcr	p15, 0, r0, c7, c10, 1 @ flush_pte</div><div class='add'>+	armv6_set_pte_ext cpu_v6</div><div class='ctx'> #endif</div><div class='ctx'> 	mov	pc, lr</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S<br/>index b49f9a4c82c8..34e424041927 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/proc-v7.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mm/proc-v7.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/proc-v7.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/proc-v7.S</a></div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/assembler.h&gt;</div><div class='ctx'> #include &lt;asm/asm-offsets.h&gt;</div><div class='del'>-#include &lt;asm/elf.h&gt;</div><div class='add'>+#include &lt;asm/hwcap.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable-hwdef.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -25,9 +25,11 @@</div><div class='ctx'> </div><div class='ctx'> ENTRY(cpu_v7_proc_init)</div><div class='ctx'> 	mov	pc, lr</div><div class='add'>+ENDPROC(cpu_v7_proc_init)</div><div class='ctx'> </div><div class='ctx'> ENTRY(cpu_v7_proc_fin)</div><div class='ctx'> 	mov	pc, lr</div><div class='add'>+ENDPROC(cpu_v7_proc_fin)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *	cpu_v7_reset(loc)</div><div class='hunk'>@@ -43,6 +45,7 @@ ENTRY(cpu_v7_proc_fin)</div><div class='ctx'> 	.align	5</div><div class='ctx'> ENTRY(cpu_v7_reset)</div><div class='ctx'> 	mov	pc, r0</div><div class='add'>+ENDPROC(cpu_v7_reset)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *	cpu_v7_do_idle()</div><div class='hunk'>@@ -52,8 +55,9 @@ ENTRY(cpu_v7_reset)</div><div class='ctx'>  *	IRQs are already disabled.</div><div class='ctx'>  */</div><div class='ctx'> ENTRY(cpu_v7_do_idle)</div><div class='del'>-	.long	0xe320f003			@ ARM V7 WFI instruction</div><div class='add'>+	wfi</div><div class='ctx'> 	mov	pc, lr</div><div class='add'>+ENDPROC(cpu_v7_do_idle)</div><div class='ctx'> </div><div class='ctx'> ENTRY(cpu_v7_dcache_clean_area)</div><div class='ctx'> #ifndef TLB_CAN_READ_FROM_L1_CACHE</div><div class='hunk'>@@ -65,6 +69,7 @@ ENTRY(cpu_v7_dcache_clean_area)</div><div class='ctx'> 	dsb</div><div class='ctx'> #endif</div><div class='ctx'> 	mov	pc, lr</div><div class='add'>+ENDPROC(cpu_v7_dcache_clean_area)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *	cpu_v7_switch_mm(pgd_phys, tsk)</div><div class='hunk'>@@ -89,6 +94,7 @@ ENTRY(cpu_v7_switch_mm)</div><div class='ctx'> 	isb</div><div class='ctx'> #endif</div><div class='ctx'> 	mov	pc, lr</div><div class='add'>+ENDPROC(cpu_v7_switch_mm)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *	cpu_v7_set_pte_ext(ptep, pte)</div><div class='hunk'>@@ -99,26 +105,19 @@ ENTRY(cpu_v7_switch_mm)</div><div class='ctx'>  *		  (hardware version is stored at -1024 bytes)</div><div class='ctx'>  *	- pte   - PTE value to store</div><div class='ctx'>  *	- ext	- value for extended PTE bits</div><div class='del'>- *</div><div class='del'>- *	Permissions:</div><div class='del'>- *	  YUWD  APX AP1 AP0	SVC	User</div><div class='del'>- *	  0xxx   0   0   0	no acc	no acc</div><div class='del'>- *	  100x   1   0   1	r/o	no acc</div><div class='del'>- *	  10x0   1   0   1	r/o	no acc</div><div class='del'>- *	  1011   0   0   1	r/w	no acc</div><div class='del'>- *	  110x   0   1   0	r/w	r/o</div><div class='del'>- *	  11x0   0   1   0	r/w	r/o</div><div class='del'>- *	  1111   0   1   1	r/w	r/w</div><div class='ctx'>  */</div><div class='ctx'> ENTRY(cpu_v7_set_pte_ext)</div><div class='ctx'> #ifdef CONFIG_MMU</div><div class='ctx'> 	str	r1, [r0], #-2048		@ linux version</div><div class='ctx'> </div><div class='ctx'> 	bic	r3, r1, #0x000003f0</div><div class='del'>-	bic	r3, r3, #0x00000003</div><div class='add'>+	bic	r3, r3, #PTE_TYPE_MASK</div><div class='ctx'> 	orr	r3, r3, r2</div><div class='ctx'> 	orr	r3, r3, #PTE_EXT_AP0 | 2</div><div class='ctx'> </div><div class='add'>+	tst	r2, #1 &lt;&lt; 4</div><div class='add'>+	orrne	r3, r3, #PTE_EXT_TEX(1)</div><div class='add'>+</div><div class='ctx'> 	tst	r1, #L_PTE_WRITE</div><div class='ctx'> 	tstne	r1, #L_PTE_DIRTY</div><div class='ctx'> 	orreq	r3, r3, #PTE_EXT_APX</div><div class='hunk'>@@ -128,19 +127,18 @@ ENTRY(cpu_v7_set_pte_ext)</div><div class='ctx'> 	tstne	r3, #PTE_EXT_APX</div><div class='ctx'> 	bicne	r3, r3, #PTE_EXT_APX | PTE_EXT_AP0</div><div class='ctx'> </div><div class='del'>-	tst	r1, #L_PTE_YOUNG</div><div class='del'>-	biceq	r3, r3, #PTE_EXT_APX | PTE_EXT_AP_MASK</div><div class='del'>-</div><div class='ctx'> 	tst	r1, #L_PTE_EXEC</div><div class='ctx'> 	orreq	r3, r3, #PTE_EXT_XN</div><div class='ctx'> </div><div class='del'>-	tst	r1, #L_PTE_PRESENT</div><div class='add'>+	tst	r1, #L_PTE_YOUNG</div><div class='add'>+	tstne	r1, #L_PTE_PRESENT</div><div class='ctx'> 	moveq	r3, #0</div><div class='ctx'> </div><div class='ctx'> 	str	r3, [r0]</div><div class='ctx'> 	mcr	p15, 0, r0, c7, c10, 1		@ flush_pte</div><div class='ctx'> #endif</div><div class='ctx'> 	mov	pc, lr</div><div class='add'>+ENDPROC(cpu_v7_set_pte_ext)</div><div class='ctx'> </div><div class='ctx'> cpu_v7_name:</div><div class='ctx'> 	.ascii	"ARMv7 Processor"</div><div class='hunk'>@@ -182,12 +180,17 @@ __v7_setup:</div><div class='ctx'> 	mov	r10, #0x1f			@ domains 0, 1 = manager</div><div class='ctx'> 	mcr	p15, 0, r10, c3, c0, 0		@ load domain access register</div><div class='ctx'> #endif</div><div class='add'>+	ldr	r5, =0x40e040e0</div><div class='add'>+	ldr	r6, =0xff0aa1a8</div><div class='add'>+	mcr	p15, 0, r5, c10, c2, 0		@ write PRRR</div><div class='add'>+	mcr	p15, 0, r6, c10, c2, 1		@ write NMRR</div><div class='ctx'> 	adr	r5, v7_crval</div><div class='ctx'> 	ldmia	r5, {r5, r6}</div><div class='ctx'>    	mrc	p15, 0, r0, c1, c0, 0		@ read control register</div><div class='ctx'> 	bic	r0, r0, r5			@ clear bits them</div><div class='ctx'> 	orr	r0, r0, r6			@ set them</div><div class='ctx'> 	mov	pc, lr				@ return to head.S:__ret</div><div class='add'>+ENDPROC(__v7_setup)</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 *         V X F   I D LR</div><div class='hunk'>@@ -197,7 +200,7 @@ __v7_setup:</div><div class='ctx'> 	 */</div><div class='ctx'> 	.type	v7_crval, #object</div><div class='ctx'> v7_crval:</div><div class='del'>-	crval	clear=0x0120c302, mmuset=0x00c0387d, ucset=0x00c0187c</div><div class='add'>+	crval	clear=0x0120c302, mmuset=0x10c0387d, ucset=0x00c0187c</div><div class='ctx'> </div><div class='ctx'> __v7_setup_stack:</div><div class='ctx'> 	.space	4 * 11				@ 11 registers</div><div class='head'>diff --git a/arch/arm/mm/proc-xsc3.S b/arch/arm/mm/proc-xsc3.S<br/>index 7bd9e7197f60..04dc8b65401b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/proc-xsc3.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mm/proc-xsc3.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/proc-xsc3.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/proc-xsc3.S</a></div><div class='hunk'>@@ -27,7 +27,7 @@</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;asm/assembler.h&gt;</div><div class='del'>-#include &lt;asm/elf.h&gt;</div><div class='add'>+#include &lt;asm/hwcap.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable-hwdef.h&gt;</div><div class='hunk'>@@ -345,38 +345,38 @@ ENTRY(cpu_xsc3_switch_mm)</div><div class='ctx'>  * cpu_xsc3_set_pte_ext(ptep, pte, ext)</div><div class='ctx'>  *</div><div class='ctx'>  * Set a PTE and flush it out</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='add'>+cpu_xsc3_mt_table:</div><div class='add'>+	.long	0x00						@ L_PTE_MT_UNCACHED</div><div class='add'>+	.long	PTE_EXT_TEX(1)					@ L_PTE_MT_BUFFERABLE</div><div class='add'>+	.long	PTE_CACHEABLE					@ L_PTE_MT_WRITETHROUGH</div><div class='add'>+	.long	PTE_CACHEABLE | PTE_BUFFERABLE			@ L_PTE_MT_WRITEBACK</div><div class='add'>+	.long	PTE_EXT_TEX(1) | PTE_BUFFERABLE			@ L_PTE_MT_DEV_SHARED</div><div class='add'>+	.long	0x00						@ unused</div><div class='add'>+	.long	0x00						@ L_PTE_MT_MINICACHE (not present)</div><div class='add'>+	.long	PTE_EXT_TEX(5) | PTE_CACHEABLE | PTE_BUFFERABLE	@ L_PTE_MT_WRITEALLOC (not present?)</div><div class='add'>+	.long	0x00						@ unused</div><div class='add'>+	.long	PTE_EXT_TEX(1)					@ L_PTE_MT_DEV_WC</div><div class='add'>+	.long	0x00						@ unused</div><div class='add'>+	.long	PTE_CACHEABLE | PTE_BUFFERABLE			@ L_PTE_MT_DEV_CACHED</div><div class='add'>+	.long	PTE_EXT_TEX(2)					@ L_PTE_MT_DEV_NONSHARED</div><div class='add'>+	.long	0x00						@ unused</div><div class='add'>+	.long	0x00						@ unused</div><div class='add'>+	.long	0x00						@ unused</div><div class='add'>+</div><div class='ctx'> 	.align	5</div><div class='ctx'> ENTRY(cpu_xsc3_set_pte_ext)</div><div class='del'>-	str	r1, [r0], #-2048		@ linux version</div><div class='add'>+	xscale_set_pte_ext_prologue</div><div class='ctx'> </div><div class='del'>-	bic	r2, r1, #0xff0			@ keep C, B bits</div><div class='del'>-	orr	r2, r2, #PTE_TYPE_EXT		@ extended page</div><div class='ctx'> 	tst	r1, #L_PTE_SHARED		@ shared?</div><div class='del'>-	orrne	r2, r2, #0x200</div><div class='del'>-</div><div class='del'>-	eor	r3, r1, #L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_WRITE | L_PTE_DIRTY</div><div class='del'>-</div><div class='del'>-	tst	r3, #L_PTE_USER			@ user?</div><div class='del'>-	orrne	r2, r2, #PTE_EXT_AP_URO_SRW	@ yes -&gt; user r/o, system r/w</div><div class='del'>-</div><div class='del'>-	tst	r3, #L_PTE_WRITE | L_PTE_DIRTY	@ write and dirty?</div><div class='del'>-	orreq	r2, r2, #PTE_EXT_AP_UNO_SRW	@ yes -&gt; user n/a, system r/w</div><div class='del'>-						@ combined with user -&gt; user r/w</div><div class='del'>-</div><div class='del'>-	@ If it's cacheable, it needs to be in L2 also.</div><div class='del'>-	eor	ip, r1, #L_PTE_CACHEABLE</div><div class='del'>-	tst	ip, #L_PTE_CACHEABLE</div><div class='del'>-	orreq	r2, r2, #PTE_EXT_TEX(0x5)</div><div class='del'>-</div><div class='del'>-	tst	r3, #L_PTE_PRESENT | L_PTE_YOUNG	@ present and young?</div><div class='del'>-	movne	r2, #0				@ no -&gt; fault</div><div class='del'>-</div><div class='del'>-	str	r2, [r0]			@ hardware version</div><div class='del'>-	mov	ip, #0</div><div class='del'>-	mcr	p15, 0, r0, c7, c10, 1		@ clean L1 D line</div><div class='del'>-	mcr	p15, 0, ip, c7, c10, 4		@ data write barrier</div><div class='add'>+	and	r1, r1, #L_PTE_MT_MASK</div><div class='add'>+	adr	ip, cpu_xsc3_mt_table</div><div class='add'>+	ldr	ip, [ip, r1]</div><div class='add'>+	orrne	r2, r2, #PTE_EXT_COHERENT	@ interlock: mask in coherent bit</div><div class='add'>+	bic	r2, r2, #0x0c			@ clear old C,B bits</div><div class='add'>+	orr	r2, r2, ip</div><div class='add'>+</div><div class='add'>+	xscale_set_pte_ext_epilogue</div><div class='ctx'> 	mov	pc, lr</div><div class='ctx'> </div><div class='ctx'> 	.ltorg</div><div class='head'>diff --git a/arch/arm/mm/proc-xscale.S b/arch/arm/mm/proc-xscale.S<br/>index 2dd85273976f..0cce37b93937 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/proc-xscale.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mm/proc-xscale.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/proc-xscale.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/proc-xscale.S</a></div><div class='hunk'>@@ -23,7 +23,7 @@</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;asm/assembler.h&gt;</div><div class='del'>-#include &lt;asm/elf.h&gt;</div><div class='add'>+#include &lt;asm/hwcap.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable-hwdef.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='hunk'>@@ -406,8 +406,6 @@ ENTRY(cpu_xscale_dcache_clean_area)</div><div class='ctx'> </div><div class='ctx'> /* =============================== PageTable ============================== */</div><div class='ctx'> </div><div class='del'>-#define PTE_CACHE_WRITE_ALLOCATE 0</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * cpu_xscale_switch_mm(pgd)</div><div class='ctx'>  *</div><div class='hunk'>@@ -431,56 +429,42 @@ ENTRY(cpu_xscale_switch_mm)</div><div class='ctx'>  *</div><div class='ctx'>  * Errata 40: must set memory to write-through for user read-only pages.</div><div class='ctx'>  */</div><div class='add'>+cpu_xscale_mt_table:</div><div class='add'>+	.long	0x00						@ L_PTE_MT_UNCACHED</div><div class='add'>+	.long	PTE_BUFFERABLE					@ L_PTE_MT_BUFFERABLE</div><div class='add'>+	.long	PTE_CACHEABLE					@ L_PTE_MT_WRITETHROUGH</div><div class='add'>+	.long	PTE_CACHEABLE | PTE_BUFFERABLE			@ L_PTE_MT_WRITEBACK</div><div class='add'>+	.long	PTE_EXT_TEX(1) | PTE_BUFFERABLE			@ L_PTE_MT_DEV_SHARED</div><div class='add'>+	.long	0x00						@ unused</div><div class='add'>+	.long	PTE_EXT_TEX(1) | PTE_CACHEABLE			@ L_PTE_MT_MINICACHE</div><div class='add'>+	.long	PTE_EXT_TEX(1) | PTE_CACHEABLE | PTE_BUFFERABLE	@ L_PTE_MT_WRITEALLOC</div><div class='add'>+	.long	0x00						@ unused</div><div class='add'>+	.long	PTE_BUFFERABLE					@ L_PTE_MT_DEV_WC</div><div class='add'>+	.long	0x00						@ unused</div><div class='add'>+	.long	PTE_CACHEABLE | PTE_BUFFERABLE			@ L_PTE_MT_DEV_CACHED</div><div class='add'>+	.long	0x00						@ L_PTE_MT_DEV_NONSHARED</div><div class='add'>+	.long	0x00						@ unused</div><div class='add'>+	.long	0x00						@ unused</div><div class='add'>+	.long	0x00						@ unused</div><div class='add'>+</div><div class='ctx'> 	.align	5</div><div class='ctx'> ENTRY(cpu_xscale_set_pte_ext)</div><div class='del'>-	str	r1, [r0], #-2048		@ linux version</div><div class='del'>-</div><div class='del'>-	bic	r2, r1, #0xff0</div><div class='del'>-	orr	r2, r2, #PTE_TYPE_EXT		@ extended page</div><div class='del'>-</div><div class='del'>-	eor	r3, r1, #L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_WRITE | L_PTE_DIRTY</div><div class='del'>-</div><div class='del'>-	tst	r3, #L_PTE_USER			@ User?</div><div class='del'>-	orrne	r2, r2, #PTE_EXT_AP_URO_SRW	@ yes -&gt; user r/o, system r/w</div><div class='del'>-</div><div class='del'>-	tst	r3, #L_PTE_WRITE | L_PTE_DIRTY	@ Write and Dirty?</div><div class='del'>-	orreq	r2, r2, #PTE_EXT_AP_UNO_SRW	@ yes -&gt; user n/a, system r/w</div><div class='del'>-						@ combined with user -&gt; user r/w</div><div class='del'>-</div><div class='del'>-	@</div><div class='del'>-	@ Handle the X bit.  We want to set this bit for the minicache</div><div class='del'>-	@ (U = E = B = W = 0, C = 1) or when write allocate is enabled,</div><div class='del'>-	@ and we have a writeable, cacheable region.  If we ignore the</div><div class='del'>-	@ U and E bits, we can allow user space to use the minicache as</div><div class='del'>-	@ well.</div><div class='del'>-	@</div><div class='del'>-	@  X = (C &amp; ~W &amp; ~B) | (C &amp; W &amp; B &amp; write_allocate)</div><div class='del'>-	@</div><div class='del'>-	eor	ip, r1, #L_PTE_CACHEABLE</div><div class='del'>-	tst	ip, #L_PTE_CACHEABLE | L_PTE_WRITE | L_PTE_BUFFERABLE</div><div class='del'>-#if PTE_CACHE_WRITE_ALLOCATE</div><div class='del'>-	eorne	ip, r1, #L_PTE_CACHEABLE | L_PTE_WRITE | L_PTE_BUFFERABLE</div><div class='del'>-	tstne	ip, #L_PTE_CACHEABLE | L_PTE_WRITE | L_PTE_BUFFERABLE</div><div class='del'>-#endif</div><div class='del'>-	orreq	r2, r2, #PTE_EXT_TEX(1)</div><div class='add'>+	xscale_set_pte_ext_prologue</div><div class='ctx'> </div><div class='ctx'> 	@</div><div class='del'>-	@ Erratum 40: The B bit must be cleared for a user read-only</div><div class='del'>-	@ cacheable page.</div><div class='del'>-	@</div><div class='del'>-	@  B = B &amp; ~(U &amp; C &amp; ~W)</div><div class='add'>+	@ Erratum 40: must set memory to write-through for user read-only pages</div><div class='ctx'> 	@</div><div class='del'>-	and	ip, r1, #L_PTE_USER | L_PTE_WRITE | L_PTE_CACHEABLE</div><div class='del'>-	teq	ip, #L_PTE_USER | L_PTE_CACHEABLE</div><div class='del'>-	biceq	r2, r2, #PTE_BUFFERABLE</div><div class='add'>+	and	ip, r1, #(L_PTE_MT_MASK | L_PTE_USER | L_PTE_WRITE) &amp; ~(4 &lt;&lt; 2)</div><div class='add'>+	teq	ip, #L_PTE_MT_WRITEBACK | L_PTE_USER</div><div class='ctx'> </div><div class='del'>-	tst	r3, #L_PTE_PRESENT | L_PTE_YOUNG	@ Present and Young?</div><div class='del'>-	movne	r2, #0				@ no -&gt; fault</div><div class='add'>+	moveq	r1, #L_PTE_MT_WRITETHROUGH</div><div class='add'>+	and	r1, r1, #L_PTE_MT_MASK</div><div class='add'>+	adr	ip, cpu_xscale_mt_table</div><div class='add'>+	ldr	ip, [ip, r1]</div><div class='add'>+	bic	r2, r2, #0x0c</div><div class='add'>+	orr	r2, r2, ip</div><div class='ctx'> </div><div class='del'>-	str	r2, [r0]			@ hardware version</div><div class='del'>-	mov	ip, #0</div><div class='del'>-	mcr	p15, 0, r0, c7, c10, 1		@ Clean D cache line</div><div class='del'>-	mcr	p15, 0, ip, c7, c10, 4		@ Drain Write (&amp; Fill) Buffer</div><div class='add'>+	xscale_set_pte_ext_epilogue</div><div class='ctx'> 	mov	pc, lr</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mm/tlb-v7.S b/arch/arm/mm/tlb-v7.S<br/>index b56dda8052f7..24ba5109f2e7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/tlb-v7.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/mm/tlb-v7.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/mm/tlb-v7.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/mm/tlb-v7.S</a></div><div class='hunk'>@@ -51,6 +51,7 @@ ENTRY(v7wbi_flush_user_tlb_range)</div><div class='ctx'> 	mcr	p15, 0, ip, c7, c5, 6		@ flush BTAC/BTB</div><div class='ctx'> 	dsb</div><div class='ctx'> 	mov	pc, lr</div><div class='add'>+ENDPROC(v7wbi_flush_user_tlb_range)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *	v7wbi_flush_kern_tlb_range(start,end)</div><div class='hunk'>@@ -77,6 +78,7 @@ ENTRY(v7wbi_flush_kern_tlb_range)</div><div class='ctx'> 	dsb</div><div class='ctx'> 	isb</div><div class='ctx'> 	mov	pc, lr</div><div class='add'>+ENDPROC(v7wbi_flush_kern_tlb_range)</div><div class='ctx'> </div><div class='ctx'> 	.section ".text.init", #alloc, #execinstr</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/nwfpe/fpa11_cpdt.c b/arch/arm/nwfpe/fpa11_cpdt.c<br/>index 79f8e67cc6c1..d31c49f953b1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/nwfpe/fpa11_cpdt.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/nwfpe/fpa11_cpdt.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/nwfpe/fpa11_cpdt.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/nwfpe/fpa11_cpdt.c</a></div><div class='hunk'>@@ -26,7 +26,7 @@</div><div class='ctx'> #include "fpmodule.h"</div><div class='ctx'> #include "fpmodule.inl"</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> static inline void loadSingle(const unsigned int Fn, const unsigned int __user *pMem)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/arm/oprofile/Makefile b/arch/arm/oprofile/Makefile<br/>index e61d0cc520b7..88e31f549f50 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/oprofile/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/oprofile/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/oprofile/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/oprofile/Makefile</a></div><div class='hunk'>@@ -11,3 +11,4 @@ oprofile-$(CONFIG_CPU_XSCALE)		+= op_model_xscale.o</div><div class='ctx'> oprofile-$(CONFIG_OPROFILE_ARM11_CORE)	+= op_model_arm11_core.o</div><div class='ctx'> oprofile-$(CONFIG_OPROFILE_ARMV6)	+= op_model_v6.o</div><div class='ctx'> oprofile-$(CONFIG_OPROFILE_MPCORE)	+= op_model_mpcore.o</div><div class='add'>+oprofile-$(CONFIG_OPROFILE_ARMV7)	+= op_model_v7.o</div><div class='head'>diff --git a/arch/arm/oprofile/backtrace.c b/arch/arm/oprofile/backtrace.c<br/>index f5ebf30151fa..cefc21c2eee4 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/oprofile/backtrace.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/oprofile/backtrace.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/oprofile/backtrace.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/oprofile/backtrace.c</a></div><div class='hunk'>@@ -16,8 +16,8 @@</div><div class='ctx'> #include &lt;linux/oprofile.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "../kernel/stacktrace.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/oprofile/common.c b/arch/arm/oprofile/common.c<br/>index 0a5cf3a6438b..3fcd752d6146 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/oprofile/common.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/oprofile/common.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/oprofile/common.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/oprofile/common.c</a></div><div class='hunk'>@@ -145,6 +145,10 @@ int __init oprofile_arch_init(struct oprofile_operations *ops)</div><div class='ctx'> 	spec = &amp;op_mpcore_spec;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_OPROFILE_ARMV7</div><div class='add'>+	spec = &amp;op_armv7_spec;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	if (spec) {</div><div class='ctx'> 		ret = spec-&gt;init();</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='head'>diff --git a/arch/arm/oprofile/op_arm_model.h b/arch/arm/oprofile/op_arm_model.h<br/>index 4899c629aa03..8c4e4f6a1de3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/oprofile/op_arm_model.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/oprofile/op_arm_model.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/oprofile/op_arm_model.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/oprofile/op_arm_model.h</a></div><div class='hunk'>@@ -26,6 +26,7 @@ extern struct op_arm_model_spec op_xscale_spec;</div><div class='ctx'> </div><div class='ctx'> extern struct op_arm_model_spec op_armv6_spec;</div><div class='ctx'> extern struct op_arm_model_spec op_mpcore_spec;</div><div class='add'>+extern struct op_arm_model_spec op_armv7_spec;</div><div class='ctx'> </div><div class='ctx'> extern void arm_backtrace(struct pt_regs * const regs, unsigned int depth);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/oprofile/op_model_mpcore.c b/arch/arm/oprofile/op_model_mpcore.c<br/>index 92db6e035c65..4de366e8b4c5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/oprofile/op_model_mpcore.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/oprofile/op_model_mpcore.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/oprofile/op_model_mpcore.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/oprofile/op_model_mpcore.c</a></div><div class='hunk'>@@ -36,8 +36,8 @@</div><div class='ctx'> #include &lt;linux/oprofile.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='head'>diff --git a/arch/arm/oprofile/op_model_v7.c b/arch/arm/oprofile/op_model_v7.c<br/>new file mode 100644<br/>index 000000000000..f20295f14adb<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/oprofile/op_model_v7.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/oprofile/op_model_v7.c</a></div><div class='hunk'>@@ -0,0 +1,411 @@</div><div class='add'>+/**</div><div class='add'>+ * op_model_v7.c</div><div class='add'>+ * ARM V7 (Cortex A8) Event Monitor Driver</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2008 Jean Pihet &lt;jpihet@mvista.com&gt;</div><div class='add'>+ * Copyright 2004 ARM SMP Development Team</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/oprofile.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='add'>+#include &lt;linux/smp.h&gt;</div><div class='add'>+</div><div class='add'>+#include "op_counter.h"</div><div class='add'>+#include "op_arm_model.h"</div><div class='add'>+#include "op_model_v7.h"</div><div class='add'>+</div><div class='add'>+/* #define DEBUG */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * ARM V7 PMNC support</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static u32 cnt_en[CNTMAX];</div><div class='add'>+</div><div class='add'>+static inline void armv7_pmnc_write(u32 val)</div><div class='add'>+{</div><div class='add'>+	val &amp;= PMNC_MASK;</div><div class='add'>+	asm volatile("mcr p15, 0, %0, c9, c12, 0" : : "r" (val));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32 armv7_pmnc_read(void)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	asm volatile("mrc p15, 0, %0, c9, c12, 0" : "=r" (val));</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32 armv7_pmnc_enable_counter(unsigned int cnt)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	if (cnt &gt;= CNTMAX) {</div><div class='add'>+		printk(KERN_ERR "oprofile: CPU%u enabling wrong PMNC counter"</div><div class='add'>+			" %d\n", smp_processor_id(), cnt);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cnt == CCNT)</div><div class='add'>+		val = CNTENS_C;</div><div class='add'>+	else</div><div class='add'>+		val = (1 &lt;&lt; (cnt - CNT0));</div><div class='add'>+</div><div class='add'>+	val &amp;= CNTENS_MASK;</div><div class='add'>+	asm volatile("mcr p15, 0, %0, c9, c12, 1" : : "r" (val));</div><div class='add'>+</div><div class='add'>+	return cnt;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32 armv7_pmnc_disable_counter(unsigned int cnt)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	if (cnt &gt;= CNTMAX) {</div><div class='add'>+		printk(KERN_ERR "oprofile: CPU%u disabling wrong PMNC counter"</div><div class='add'>+			" %d\n", smp_processor_id(), cnt);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cnt == CCNT)</div><div class='add'>+		val = CNTENC_C;</div><div class='add'>+	else</div><div class='add'>+		val = (1 &lt;&lt; (cnt - CNT0));</div><div class='add'>+</div><div class='add'>+	val &amp;= CNTENC_MASK;</div><div class='add'>+	asm volatile("mcr p15, 0, %0, c9, c12, 2" : : "r" (val));</div><div class='add'>+</div><div class='add'>+	return cnt;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32 armv7_pmnc_enable_intens(unsigned int cnt)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	if (cnt &gt;= CNTMAX) {</div><div class='add'>+		printk(KERN_ERR "oprofile: CPU%u enabling wrong PMNC counter"</div><div class='add'>+			" interrupt enable %d\n", smp_processor_id(), cnt);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cnt == CCNT)</div><div class='add'>+		val = INTENS_C;</div><div class='add'>+	else</div><div class='add'>+		val = (1 &lt;&lt; (cnt - CNT0));</div><div class='add'>+</div><div class='add'>+	val &amp;= INTENS_MASK;</div><div class='add'>+	asm volatile("mcr p15, 0, %0, c9, c14, 1" : : "r" (val));</div><div class='add'>+</div><div class='add'>+	return cnt;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32 armv7_pmnc_getreset_flags(void)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	/* Read */</div><div class='add'>+	asm volatile("mrc p15, 0, %0, c9, c12, 3" : "=r" (val));</div><div class='add'>+</div><div class='add'>+	/* Write to clear flags */</div><div class='add'>+	val &amp;= FLAG_MASK;</div><div class='add'>+	asm volatile("mcr p15, 0, %0, c9, c12, 3" : : "r" (val));</div><div class='add'>+</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int armv7_pmnc_select_counter(unsigned int cnt)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	if ((cnt == CCNT) || (cnt &gt;= CNTMAX)) {</div><div class='add'>+		printk(KERN_ERR "oprofile: CPU%u selecting wrong PMNC counteri"</div><div class='add'>+			" %d\n", smp_processor_id(), cnt);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	val = (cnt - CNT0) &amp; SELECT_MASK;</div><div class='add'>+	asm volatile("mcr p15, 0, %0, c9, c12, 5" : : "r" (val));</div><div class='add'>+</div><div class='add'>+	return cnt;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void armv7_pmnc_write_evtsel(unsigned int cnt, u32 val)</div><div class='add'>+{</div><div class='add'>+	if (armv7_pmnc_select_counter(cnt) == cnt) {</div><div class='add'>+		val &amp;= EVTSEL_MASK;</div><div class='add'>+		asm volatile("mcr p15, 0, %0, c9, c13, 1" : : "r" (val));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void armv7_pmnc_reset_counter(unsigned int cnt)</div><div class='add'>+{</div><div class='add'>+	u32 cpu_cnt = CPU_COUNTER(smp_processor_id(), cnt);</div><div class='add'>+	u32 val = -(u32)counter_config[cpu_cnt].count;</div><div class='add'>+</div><div class='add'>+	switch (cnt) {</div><div class='add'>+	case CCNT:</div><div class='add'>+		armv7_pmnc_disable_counter(cnt);</div><div class='add'>+</div><div class='add'>+		asm volatile("mcr p15, 0, %0, c9, c13, 0" : : "r" (val));</div><div class='add'>+</div><div class='add'>+		if (cnt_en[cnt] != 0)</div><div class='add'>+		    armv7_pmnc_enable_counter(cnt);</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case CNT0:</div><div class='add'>+	case CNT1:</div><div class='add'>+	case CNT2:</div><div class='add'>+	case CNT3:</div><div class='add'>+		armv7_pmnc_disable_counter(cnt);</div><div class='add'>+</div><div class='add'>+		if (armv7_pmnc_select_counter(cnt) == cnt)</div><div class='add'>+		    asm volatile("mcr p15, 0, %0, c9, c13, 2" : : "r" (val));</div><div class='add'>+</div><div class='add'>+		if (cnt_en[cnt] != 0)</div><div class='add'>+		    armv7_pmnc_enable_counter(cnt);</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		printk(KERN_ERR "oprofile: CPU%u resetting wrong PMNC counter"</div><div class='add'>+			" %d\n", smp_processor_id(), cnt);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int armv7_setup_pmnc(void)</div><div class='add'>+{</div><div class='add'>+	unsigned int cnt;</div><div class='add'>+</div><div class='add'>+	if (armv7_pmnc_read() &amp; PMNC_E) {</div><div class='add'>+		printk(KERN_ERR "oprofile: CPU%u PMNC still enabled when setup"</div><div class='add'>+			" new event counter.\n", smp_processor_id());</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Initialize &amp; Reset PMNC: C bit, D bit and P bit.</div><div class='add'>+	 *  Note: Using a slower count for CCNT (D bit: divide by 64) results</div><div class='add'>+	 *   in a more stable system</div><div class='add'>+	 */</div><div class='add'>+	armv7_pmnc_write(PMNC_P | PMNC_C | PMNC_D);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	for (cnt = CCNT; cnt &lt; CNTMAX; cnt++) {</div><div class='add'>+		unsigned long event;</div><div class='add'>+		u32 cpu_cnt = CPU_COUNTER(smp_processor_id(), cnt);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Disable counter</div><div class='add'>+		 */</div><div class='add'>+		armv7_pmnc_disable_counter(cnt);</div><div class='add'>+		cnt_en[cnt] = 0;</div><div class='add'>+</div><div class='add'>+		if (!counter_config[cpu_cnt].enabled)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		event = counter_config[cpu_cnt].event &amp; 255;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Set event (if destined for PMNx counters)</div><div class='add'>+		 * We don't need to set the event if it's a cycle count</div><div class='add'>+		 */</div><div class='add'>+		if (cnt != CCNT)</div><div class='add'>+			armv7_pmnc_write_evtsel(cnt, event);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Enable interrupt for this counter</div><div class='add'>+		 */</div><div class='add'>+		armv7_pmnc_enable_intens(cnt);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Reset counter</div><div class='add'>+		 */</div><div class='add'>+		armv7_pmnc_reset_counter(cnt);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Enable counter</div><div class='add'>+		 */</div><div class='add'>+		armv7_pmnc_enable_counter(cnt);</div><div class='add'>+		cnt_en[cnt] = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void armv7_start_pmnc(void)</div><div class='add'>+{</div><div class='add'>+	armv7_pmnc_write(armv7_pmnc_read() | PMNC_E);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void armv7_stop_pmnc(void)</div><div class='add'>+{</div><div class='add'>+	armv7_pmnc_write(armv7_pmnc_read() &amp; ~PMNC_E);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * CPU counters' IRQ handler (one IRQ per CPU)</div><div class='add'>+ */</div><div class='add'>+static irqreturn_t armv7_pmnc_interrupt(int irq, void *arg)</div><div class='add'>+{</div><div class='add'>+	struct pt_regs *regs = get_irq_regs();</div><div class='add'>+	unsigned int cnt;</div><div class='add'>+	u32 flags;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Stop IRQ generation</div><div class='add'>+	 */</div><div class='add'>+	armv7_stop_pmnc();</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Get and reset overflow status flags</div><div class='add'>+	 */</div><div class='add'>+	flags = armv7_pmnc_getreset_flags();</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Cycle counter</div><div class='add'>+	 */</div><div class='add'>+	if (flags &amp; FLAG_C) {</div><div class='add'>+		u32 cpu_cnt = CPU_COUNTER(smp_processor_id(), CCNT);</div><div class='add'>+		armv7_pmnc_reset_counter(CCNT);</div><div class='add'>+		oprofile_add_sample(regs, cpu_cnt);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * PMNC counters 0:3</div><div class='add'>+	 */</div><div class='add'>+	for (cnt = CNT0; cnt &lt; CNTMAX; cnt++) {</div><div class='add'>+		if (flags &amp; (1 &lt;&lt; (cnt - CNT0))) {</div><div class='add'>+			u32 cpu_cnt = CPU_COUNTER(smp_processor_id(), cnt);</div><div class='add'>+			armv7_pmnc_reset_counter(cnt);</div><div class='add'>+			oprofile_add_sample(regs, cpu_cnt);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Allow IRQ generation</div><div class='add'>+	 */</div><div class='add'>+	armv7_start_pmnc();</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int armv7_request_interrupts(int *irqs, int nr)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; nr; i++) {</div><div class='add'>+		ret = request_irq(irqs[i], armv7_pmnc_interrupt,</div><div class='add'>+				IRQF_DISABLED, "CP15 PMNC", NULL);</div><div class='add'>+		if (ret != 0) {</div><div class='add'>+			printk(KERN_ERR "oprofile: unable to request IRQ%u"</div><div class='add'>+				" for ARMv7\n",</div><div class='add'>+			       irqs[i]);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (i != nr)</div><div class='add'>+		while (i-- != 0)</div><div class='add'>+			free_irq(irqs[i], NULL);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void armv7_release_interrupts(int *irqs, int nr)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; nr; i++)</div><div class='add'>+		free_irq(irqs[i], NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+static void armv7_pmnc_dump_regs(void)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+	unsigned int cnt;</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "PMNC registers dump:\n");</div><div class='add'>+</div><div class='add'>+	asm volatile("mrc p15, 0, %0, c9, c12, 0" : "=r" (val));</div><div class='add'>+	printk(KERN_INFO "PMNC  =0x%08x\n", val);</div><div class='add'>+</div><div class='add'>+	asm volatile("mrc p15, 0, %0, c9, c12, 1" : "=r" (val));</div><div class='add'>+	printk(KERN_INFO "CNTENS=0x%08x\n", val);</div><div class='add'>+</div><div class='add'>+	asm volatile("mrc p15, 0, %0, c9, c14, 1" : "=r" (val));</div><div class='add'>+	printk(KERN_INFO "INTENS=0x%08x\n", val);</div><div class='add'>+</div><div class='add'>+	asm volatile("mrc p15, 0, %0, c9, c12, 3" : "=r" (val));</div><div class='add'>+	printk(KERN_INFO "FLAGS =0x%08x\n", val);</div><div class='add'>+</div><div class='add'>+	asm volatile("mrc p15, 0, %0, c9, c12, 5" : "=r" (val));</div><div class='add'>+	printk(KERN_INFO "SELECT=0x%08x\n", val);</div><div class='add'>+</div><div class='add'>+	asm volatile("mrc p15, 0, %0, c9, c13, 0" : "=r" (val));</div><div class='add'>+	printk(KERN_INFO "CCNT  =0x%08x\n", val);</div><div class='add'>+</div><div class='add'>+	for (cnt = CNT0; cnt &lt; CNTMAX; cnt++) {</div><div class='add'>+		armv7_pmnc_select_counter(cnt);</div><div class='add'>+		asm volatile("mrc p15, 0, %0, c9, c13, 2" : "=r" (val));</div><div class='add'>+		printk(KERN_INFO "CNT[%d] count =0x%08x\n", cnt-CNT0, val);</div><div class='add'>+		asm volatile("mrc p15, 0, %0, c9, c13, 1" : "=r" (val));</div><div class='add'>+		printk(KERN_INFO "CNT[%d] evtsel=0x%08x\n", cnt-CNT0, val);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int irqs[] = {</div><div class='add'>+#ifdef CONFIG_ARCH_OMAP3</div><div class='add'>+	INT_34XX_BENCH_MPU_EMUL,</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void armv7_pmnc_stop(void)</div><div class='add'>+{</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+	armv7_pmnc_dump_regs();</div><div class='add'>+#endif</div><div class='add'>+	armv7_stop_pmnc();</div><div class='add'>+	armv7_release_interrupts(irqs, ARRAY_SIZE(irqs));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int armv7_pmnc_start(void)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+	armv7_pmnc_dump_regs();</div><div class='add'>+#endif</div><div class='add'>+	ret = armv7_request_interrupts(irqs, ARRAY_SIZE(irqs));</div><div class='add'>+	if (ret &gt;= 0)</div><div class='add'>+		armv7_start_pmnc();</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int armv7_detect_pmnc(void)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct op_arm_model_spec op_armv7_spec = {</div><div class='add'>+	.init		= armv7_detect_pmnc,</div><div class='add'>+	.num_counters	= 5,</div><div class='add'>+	.setup_ctrs	= armv7_setup_pmnc,</div><div class='add'>+	.start		= armv7_pmnc_start,</div><div class='add'>+	.stop		= armv7_pmnc_stop,</div><div class='add'>+	.name		= "arm/armv7",</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/oprofile/op_model_v7.h b/arch/arm/oprofile/op_model_v7.h<br/>new file mode 100644<br/>index 000000000000..0e19bcc2e100<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/oprofile/op_model_v7.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/oprofile/op_model_v7.h</a></div><div class='hunk'>@@ -0,0 +1,103 @@</div><div class='add'>+/**</div><div class='add'>+ * op_model_v7.h</div><div class='add'>+ * ARM v7 (Cortex A8) Event Monitor Driver</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2008 Jean Pihet &lt;jpihet@mvista.com&gt;</div><div class='add'>+ * Copyright 2004 ARM SMP Development Team</div><div class='add'>+ * Copyright 2000-2004 Deepak Saxena &lt;dsaxena@mvista.com&gt;</div><div class='add'>+ * Copyright 2000-2004 MontaVista Software Inc</div><div class='add'>+ * Copyright 2004 Dave Jiang &lt;dave.jiang@intel.com&gt;</div><div class='add'>+ * Copyright 2004 Intel Corporation</div><div class='add'>+ * Copyright 2004 Zwane Mwaikambo &lt;zwane@arm.linux.org.uk&gt;</div><div class='add'>+ * Copyright 2004 Oprofile Authors</div><div class='add'>+ *</div><div class='add'>+ * Read the file COPYING</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+#ifndef OP_MODEL_V7_H</div><div class='add'>+#define OP_MODEL_V7_H</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Per-CPU PMNC: config reg</div><div class='add'>+ */</div><div class='add'>+#define PMNC_E		(1 &lt;&lt; 0)	/* Enable all counters */</div><div class='add'>+#define PMNC_P		(1 &lt;&lt; 1)	/* Reset all counters */</div><div class='add'>+#define PMNC_C		(1 &lt;&lt; 2)	/* Cycle counter reset */</div><div class='add'>+#define PMNC_D		(1 &lt;&lt; 3)	/* CCNT counts every 64th cpu cycle */</div><div class='add'>+#define PMNC_X		(1 &lt;&lt; 4)	/* Export to ETM */</div><div class='add'>+#define PMNC_DP		(1 &lt;&lt; 5)	/* Disable CCNT if non-invasive debug*/</div><div class='add'>+#define	PMNC_MASK	0x3f		/* Mask for writable bits */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Available counters</div><div class='add'>+ */</div><div class='add'>+#define CCNT 		0</div><div class='add'>+#define CNT0 		1</div><div class='add'>+#define CNT1 		2</div><div class='add'>+#define CNT2 		3</div><div class='add'>+#define CNT3 		4</div><div class='add'>+#define CNTMAX 		5</div><div class='add'>+</div><div class='add'>+#define CPU_COUNTER(cpu, counter)	((cpu) * CNTMAX + (counter))</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * CNTENS: counters enable reg</div><div class='add'>+ */</div><div class='add'>+#define CNTENS_P0	(1 &lt;&lt; 0)</div><div class='add'>+#define CNTENS_P1	(1 &lt;&lt; 1)</div><div class='add'>+#define CNTENS_P2	(1 &lt;&lt; 2)</div><div class='add'>+#define CNTENS_P3	(1 &lt;&lt; 3)</div><div class='add'>+#define CNTENS_C	(1 &lt;&lt; 31)</div><div class='add'>+#define	CNTENS_MASK	0x8000000f	/* Mask for writable bits */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * CNTENC: counters disable reg</div><div class='add'>+ */</div><div class='add'>+#define CNTENC_P0	(1 &lt;&lt; 0)</div><div class='add'>+#define CNTENC_P1	(1 &lt;&lt; 1)</div><div class='add'>+#define CNTENC_P2	(1 &lt;&lt; 2)</div><div class='add'>+#define CNTENC_P3	(1 &lt;&lt; 3)</div><div class='add'>+#define CNTENC_C	(1 &lt;&lt; 31)</div><div class='add'>+#define	CNTENC_MASK	0x8000000f	/* Mask for writable bits */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * INTENS: counters overflow interrupt enable reg</div><div class='add'>+ */</div><div class='add'>+#define INTENS_P0	(1 &lt;&lt; 0)</div><div class='add'>+#define INTENS_P1	(1 &lt;&lt; 1)</div><div class='add'>+#define INTENS_P2	(1 &lt;&lt; 2)</div><div class='add'>+#define INTENS_P3	(1 &lt;&lt; 3)</div><div class='add'>+#define INTENS_C	(1 &lt;&lt; 31)</div><div class='add'>+#define	INTENS_MASK	0x8000000f	/* Mask for writable bits */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * EVTSEL: Event selection reg</div><div class='add'>+ */</div><div class='add'>+#define	EVTSEL_MASK	0x7f		/* Mask for writable bits */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * SELECT: Counter selection reg</div><div class='add'>+ */</div><div class='add'>+#define	SELECT_MASK	0x1f		/* Mask for writable bits */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * FLAG: counters overflow flag status reg</div><div class='add'>+ */</div><div class='add'>+#define FLAG_P0		(1 &lt;&lt; 0)</div><div class='add'>+#define FLAG_P1		(1 &lt;&lt; 1)</div><div class='add'>+#define FLAG_P2		(1 &lt;&lt; 2)</div><div class='add'>+#define FLAG_P3		(1 &lt;&lt; 3)</div><div class='add'>+#define FLAG_C		(1 &lt;&lt; 31)</div><div class='add'>+#define	FLAG_MASK	0x8000000f	/* Mask for writable bits */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+int armv7_setup_pmu(void);</div><div class='add'>+int armv7_start_pmu(void);</div><div class='add'>+int armv7_stop_pmu(void);</div><div class='add'>+int armv7_request_interrupts(int *, int);</div><div class='add'>+void armv7_release_interrupts(int *, int);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/arm/oprofile/op_model_xscale.c b/arch/arm/oprofile/op_model_xscale.c<br/>index 7c3289c2acd7..724ab9ce2526 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/oprofile/op_model_xscale.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/oprofile/op_model_xscale.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/oprofile/op_model_xscale.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/oprofile/op_model_xscale.c</a></div><div class='hunk'>@@ -22,7 +22,7 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/system.h&gt;</div><div class='add'>+#include &lt;asm/cputype.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "op_counter.h"</div><div class='ctx'> #include "op_arm_model.h"</div><div class='head'>diff --git a/arch/arm/plat-iop/i2c.c b/arch/arm/plat-iop/i2c.c<br/>index 6dcbcc4ad419..4efe392859ee 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-iop/i2c.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-iop/i2c.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-iop/i2c.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-iop/i2c.c</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'> #include &lt;linux/serial.h&gt;</div><div class='ctx'> #include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/serial_core.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='head'>diff --git a/arch/arm/plat-iop/io.c b/arch/arm/plat-iop/io.c<br/>index 39dcfb4bdc71..ed0bbece0d61 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-iop/io.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-iop/io.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-iop/io.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-iop/io.c</a></div><div class='hunk'>@@ -18,8 +18,8 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> void * __iomem __iop3xx_ioremap(unsigned long cookie, size_t size,</div><div class='ctx'> 	unsigned int mtype)</div><div class='head'>diff --git a/arch/arm/plat-iop/pci.c b/arch/arm/plat-iop/pci.c<br/>index 54708bf9cb15..77fa7cc7d162 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-iop/pci.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-iop/pci.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-iop/pci.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-iop/pci.c</a></div><div class='hunk'>@@ -17,7 +17,7 @@</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/signal.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='head'>diff --git a/arch/arm/plat-iop/time.c b/arch/arm/plat-iop/time.c<br/>index c53fefb6aac4..3695bbe3ee28 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-iop/time.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-iop/time.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-iop/time.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-iop/time.c</a></div><div class='hunk'>@@ -18,8 +18,8 @@</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/timex.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='head'>diff --git a/arch/arm/plat-mxc/Kconfig b/arch/arm/plat-mxc/Kconfig<br/>index e14eaad11dd5..b2a7e3fad117 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-mxc/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-mxc/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-mxc/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-mxc/Kconfig</a></div><div class='hunk'>@@ -23,4 +23,15 @@ source "arch/arm/mach-mx3/Kconfig"</div><div class='ctx'> </div><div class='ctx'> endmenu</div><div class='ctx'> </div><div class='add'>+config MXC_IRQ_PRIOR</div><div class='add'>+	bool "Use IRQ priority"</div><div class='add'>+	depends on ARCH_MXC</div><div class='add'>+	help</div><div class='add'>+	  Select this if you want to use prioritized IRQ handling.</div><div class='add'>+	  This feature prevents higher priority ISR to be interrupted</div><div class='add'>+	  by lower priority IRQ even IRQF_DISABLED flag is not set.</div><div class='add'>+	  This may be useful in embedded applications, where are strong</div><div class='add'>+	  requirements for timing.</div><div class='add'>+	  Say N here, unless you have a specialized requirement.</div><div class='add'>+</div><div class='ctx'> endif</div><div class='head'>diff --git a/arch/arm/plat-mxc/Makefile b/arch/arm/plat-mxc/Makefile<br/>index db66e9ae8414..067556f7c91f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-mxc/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-mxc/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-mxc/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-mxc/Makefile</a></div><div class='hunk'>@@ -3,6 +3,6 @@</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> # Common support</div><div class='del'>-obj-y := irq.o clock.o gpio.o time.o</div><div class='add'>+obj-y := irq.o clock.o gpio.o time.o devices.o</div><div class='ctx'> </div><div class='del'>-obj-$(CONFIG_ARCH_MX2) += iomux-mx1-mx2.o</div><div class='add'>+obj-$(CONFIG_ARCH_MX2) += iomux-mx1-mx2.o dma-mx1-mx2.o</div><div class='head'>diff --git a/arch/arm/plat-mxc/devices.c b/arch/arm/plat-mxc/devices.c<br/>new file mode 100644<br/>index 000000000000..c66748267c45<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-mxc/devices.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-mxc/devices.c</a></div><div class='hunk'>@@ -0,0 +1,36 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2008 Sascha Hauer, kernel@pengutronix.de</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public License</div><div class='add'>+ * as published by the Free Software Foundation; either version 2</div><div class='add'>+ * of the License, or (at your option) any later version.</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 51 Franklin Street, Fifth Floor,</div><div class='add'>+ * Boston, MA  02110-1301, USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+</div><div class='add'>+int __init mxc_register_device(struct platform_device *pdev, void *data)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	pdev-&gt;dev.platform_data = data;</div><div class='add'>+</div><div class='add'>+	ret = platform_device_register(pdev);</div><div class='add'>+	if (ret)</div><div class='add'>+		pr_debug("Unable to register platform device '%s': %d\n",</div><div class='add'>+			 pdev-&gt;name, ret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='head'>diff --git a/arch/arm/plat-mxc/dma-mx1-mx2.c b/arch/arm/plat-mxc/dma-mx1-mx2.c<br/>new file mode 100644<br/>index 000000000000..b296f19fd89a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-mxc/dma-mx1-mx2.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-mxc/dma-mx1-mx2.c</a></div><div class='hunk'>@@ -0,0 +1,840 @@</div><div class='add'>+/*</div><div class='add'>+ *  linux/arch/arm/plat-mxc/dma-mx1-mx2.c</div><div class='add'>+ *</div><div class='add'>+ *  i.MX DMA registration and IRQ dispatching</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2006 Pavel Pisa &lt;pisa@cmp.felk.cvut.cz&gt;</div><div class='add'>+ * Copyright 2008 Juergen Beisert, &lt;kernel@pengutronix.de&gt;</div><div class='add'>+ * Copyright 2008 Sascha Hauer, &lt;s.hauer@pengutronix.de&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public License</div><div class='add'>+ * as published by the Free Software Foundation; either version 2</div><div class='add'>+ * of the License, or (at your option) any later version.</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,</div><div class='add'>+ * MA 02110-1301, USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/scatterlist.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/system.h&gt;</div><div class='add'>+#include &lt;asm/irq.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;asm/dma.h&gt;</div><div class='add'>+#include &lt;mach/dma-mx1-mx2.h&gt;</div><div class='add'>+</div><div class='add'>+#define DMA_DCR     0x00		/* Control Register */</div><div class='add'>+#define DMA_DISR    0x04		/* Interrupt status Register */</div><div class='add'>+#define DMA_DIMR    0x08		/* Interrupt mask Register */</div><div class='add'>+#define DMA_DBTOSR  0x0c		/* Burst timeout status Register */</div><div class='add'>+#define DMA_DRTOSR  0x10		/* Request timeout Register */</div><div class='add'>+#define DMA_DSESR   0x14		/* Transfer Error Status Register */</div><div class='add'>+#define DMA_DBOSR   0x18		/* Buffer overflow status Register */</div><div class='add'>+#define DMA_DBTOCR  0x1c		/* Burst timeout control Register */</div><div class='add'>+#define DMA_WSRA    0x40		/* W-Size Register A */</div><div class='add'>+#define DMA_XSRA    0x44		/* X-Size Register A */</div><div class='add'>+#define DMA_YSRA    0x48		/* Y-Size Register A */</div><div class='add'>+#define DMA_WSRB    0x4c		/* W-Size Register B */</div><div class='add'>+#define DMA_XSRB    0x50		/* X-Size Register B */</div><div class='add'>+#define DMA_YSRB    0x54		/* Y-Size Register B */</div><div class='add'>+#define DMA_SAR(x)  (0x80 + ((x) &lt;&lt; 6))	/* Source Address Registers */</div><div class='add'>+#define DMA_DAR(x)  (0x84 + ((x) &lt;&lt; 6))	/* Destination Address Registers */</div><div class='add'>+#define DMA_CNTR(x) (0x88 + ((x) &lt;&lt; 6))	/* Count Registers */</div><div class='add'>+#define DMA_CCR(x)  (0x8c + ((x) &lt;&lt; 6))	/* Control Registers */</div><div class='add'>+#define DMA_RSSR(x) (0x90 + ((x) &lt;&lt; 6))	/* Request source select Registers */</div><div class='add'>+#define DMA_BLR(x)  (0x94 + ((x) &lt;&lt; 6))	/* Burst length Registers */</div><div class='add'>+#define DMA_RTOR(x) (0x98 + ((x) &lt;&lt; 6))	/* Request timeout Registers */</div><div class='add'>+#define DMA_BUCR(x) (0x98 + ((x) &lt;&lt; 6))	/* Bus Utilization Registers */</div><div class='add'>+#define DMA_CCNR(x) (0x9C + ((x) &lt;&lt; 6))	/* Channel counter Registers */</div><div class='add'>+</div><div class='add'>+#define DCR_DRST           (1&lt;&lt;1)</div><div class='add'>+#define DCR_DEN            (1&lt;&lt;0)</div><div class='add'>+#define DBTOCR_EN          (1&lt;&lt;15)</div><div class='add'>+#define DBTOCR_CNT(x)      ((x) &amp; 0x7fff)</div><div class='add'>+#define CNTR_CNT(x)        ((x) &amp; 0xffffff)</div><div class='add'>+#define CCR_ACRPT          (1&lt;&lt;14)</div><div class='add'>+#define CCR_DMOD_LINEAR    (0x0 &lt;&lt; 12)</div><div class='add'>+#define CCR_DMOD_2D        (0x1 &lt;&lt; 12)</div><div class='add'>+#define CCR_DMOD_FIFO      (0x2 &lt;&lt; 12)</div><div class='add'>+#define CCR_DMOD_EOBFIFO   (0x3 &lt;&lt; 12)</div><div class='add'>+#define CCR_SMOD_LINEAR    (0x0 &lt;&lt; 10)</div><div class='add'>+#define CCR_SMOD_2D        (0x1 &lt;&lt; 10)</div><div class='add'>+#define CCR_SMOD_FIFO      (0x2 &lt;&lt; 10)</div><div class='add'>+#define CCR_SMOD_EOBFIFO   (0x3 &lt;&lt; 10)</div><div class='add'>+#define CCR_MDIR_DEC       (1&lt;&lt;9)</div><div class='add'>+#define CCR_MSEL_B         (1&lt;&lt;8)</div><div class='add'>+#define CCR_DSIZ_32        (0x0 &lt;&lt; 6)</div><div class='add'>+#define CCR_DSIZ_8         (0x1 &lt;&lt; 6)</div><div class='add'>+#define CCR_DSIZ_16        (0x2 &lt;&lt; 6)</div><div class='add'>+#define CCR_SSIZ_32        (0x0 &lt;&lt; 4)</div><div class='add'>+#define CCR_SSIZ_8         (0x1 &lt;&lt; 4)</div><div class='add'>+#define CCR_SSIZ_16        (0x2 &lt;&lt; 4)</div><div class='add'>+#define CCR_REN            (1&lt;&lt;3)</div><div class='add'>+#define CCR_RPT            (1&lt;&lt;2)</div><div class='add'>+#define CCR_FRC            (1&lt;&lt;1)</div><div class='add'>+#define CCR_CEN            (1&lt;&lt;0)</div><div class='add'>+#define RTOR_EN            (1&lt;&lt;15)</div><div class='add'>+#define RTOR_CLK           (1&lt;&lt;14)</div><div class='add'>+#define RTOR_PSC           (1&lt;&lt;13)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * struct imx_dma_channel - i.MX specific DMA extension</div><div class='add'>+ * @name: name specified by DMA client</div><div class='add'>+ * @irq_handler: client callback for end of transfer</div><div class='add'>+ * @err_handler: client callback for error condition</div><div class='add'>+ * @data: clients context data for callbacks</div><div class='add'>+ * @dma_mode: direction of the transfer %DMA_MODE_READ or %DMA_MODE_WRITE</div><div class='add'>+ * @sg: pointer to the actual read/written chunk for scatter-gather emulation</div><div class='add'>+ * @resbytes: total residual number of bytes to transfer</div><div class='add'>+ *            (it can be lower or same as sum of SG mapped chunk sizes)</div><div class='add'>+ * @sgcount: number of chunks to be read/written</div><div class='add'>+ *</div><div class='add'>+ * Structure is used for IMX DMA processing. It would be probably good</div><div class='add'>+ * @struct dma_struct in the future for external interfacing and use</div><div class='add'>+ * @struct imx_dma_channel only as extension to it.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+struct imx_dma_channel {</div><div class='add'>+	const char *name;</div><div class='add'>+	void (*irq_handler) (int, void *);</div><div class='add'>+	void (*err_handler) (int, void *, int errcode);</div><div class='add'>+	void (*prog_handler) (int, void *, struct scatterlist *);</div><div class='add'>+	void *data;</div><div class='add'>+	dmamode_t  dma_mode;</div><div class='add'>+	struct scatterlist *sg;</div><div class='add'>+	unsigned int resbytes;</div><div class='add'>+	int dma_num;</div><div class='add'>+</div><div class='add'>+	int in_use;</div><div class='add'>+</div><div class='add'>+	u32 ccr_from_device;</div><div class='add'>+	u32 ccr_to_device;</div><div class='add'>+</div><div class='add'>+	struct timer_list watchdog;</div><div class='add'>+</div><div class='add'>+	int hw_chaining;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct imx_dma_channel imx_dma_channels[IMX_DMA_CHANNELS];</div><div class='add'>+</div><div class='add'>+static struct clk *dma_clk;</div><div class='add'>+</div><div class='add'>+static int imx_dma_hw_chain(struct imx_dma_channel *imxdma)</div><div class='add'>+{</div><div class='add'>+	if (cpu_is_mx27())</div><div class='add'>+		return imxdma-&gt;hw_chaining;</div><div class='add'>+	else</div><div class='add'>+		return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * imx_dma_sg_next - prepare next chunk for scatter-gather DMA emulation</div><div class='add'>+ */</div><div class='add'>+static inline int imx_dma_sg_next(int channel, struct scatterlist *sg)</div><div class='add'>+{</div><div class='add'>+	struct imx_dma_channel *imxdma = &amp;imx_dma_channels[channel];</div><div class='add'>+	unsigned long now;</div><div class='add'>+</div><div class='add'>+	if (!imxdma-&gt;name) {</div><div class='add'>+		printk(KERN_CRIT "%s: called for  not allocated channel %d\n",</div><div class='add'>+		       __func__, channel);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	now = min(imxdma-&gt;resbytes, sg-&gt;length);</div><div class='add'>+	imxdma-&gt;resbytes -= now;</div><div class='add'>+</div><div class='add'>+	if ((imxdma-&gt;dma_mode &amp; DMA_MODE_MASK) == DMA_MODE_READ)</div><div class='add'>+		__raw_writel(sg-&gt;dma_address, DMA_BASE + DMA_DAR(channel));</div><div class='add'>+	else</div><div class='add'>+		__raw_writel(sg-&gt;dma_address, DMA_BASE + DMA_SAR(channel));</div><div class='add'>+</div><div class='add'>+	__raw_writel(now, DMA_BASE + DMA_CNTR(channel));</div><div class='add'>+</div><div class='add'>+	pr_debug("imxdma%d: next sg chunk dst 0x%08x, src 0x%08x, "</div><div class='add'>+		"size 0x%08x\n", channel,</div><div class='add'>+		 __raw_readl(DMA_BASE + DMA_DAR(channel)),</div><div class='add'>+		 __raw_readl(DMA_BASE + DMA_SAR(channel)),</div><div class='add'>+		 __raw_readl(DMA_BASE + DMA_CNTR(channel)));</div><div class='add'>+</div><div class='add'>+	return now;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * imx_dma_setup_single - setup i.MX DMA channel for linear memory to/from</div><div class='add'>+ * device transfer</div><div class='add'>+ *</div><div class='add'>+ * @channel: i.MX DMA channel number</div><div class='add'>+ * @dma_address: the DMA/physical memory address of the linear data block</div><div class='add'>+ *		to transfer</div><div class='add'>+ * @dma_length: length of the data block in bytes</div><div class='add'>+ * @dev_addr: physical device port address</div><div class='add'>+ * @dmamode: DMA transfer mode, %DMA_MODE_READ from the device to the memory</div><div class='add'>+ *           or %DMA_MODE_WRITE from memory to the device</div><div class='add'>+ *</div><div class='add'>+ * Return value: if incorrect parameters are provided -%EINVAL.</div><div class='add'>+ *		Zero indicates success.</div><div class='add'>+ */</div><div class='add'>+int</div><div class='add'>+imx_dma_setup_single(int channel, dma_addr_t dma_address,</div><div class='add'>+		     unsigned int dma_length, unsigned int dev_addr,</div><div class='add'>+		     dmamode_t dmamode)</div><div class='add'>+{</div><div class='add'>+	struct imx_dma_channel *imxdma = &amp;imx_dma_channels[channel];</div><div class='add'>+</div><div class='add'>+	imxdma-&gt;sg = NULL;</div><div class='add'>+	imxdma-&gt;dma_mode = dmamode;</div><div class='add'>+</div><div class='add'>+	if (!dma_address) {</div><div class='add'>+		printk(KERN_ERR "imxdma%d: imx_dma_setup_single null address\n",</div><div class='add'>+		       channel);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!dma_length) {</div><div class='add'>+		printk(KERN_ERR "imxdma%d: imx_dma_setup_single zero length\n",</div><div class='add'>+		       channel);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((dmamode &amp; DMA_MODE_MASK) == DMA_MODE_READ) {</div><div class='add'>+		pr_debug("imxdma%d: %s dma_addressg=0x%08x dma_length=%d "</div><div class='add'>+			"dev_addr=0x%08x for read\n",</div><div class='add'>+			channel, __func__, (unsigned int)dma_address,</div><div class='add'>+			dma_length, dev_addr);</div><div class='add'>+</div><div class='add'>+		__raw_writel(dev_addr, DMA_BASE + DMA_SAR(channel));</div><div class='add'>+		__raw_writel(dma_address, DMA_BASE + DMA_DAR(channel));</div><div class='add'>+		__raw_writel(imxdma-&gt;ccr_from_device,</div><div class='add'>+				DMA_BASE + DMA_CCR(channel));</div><div class='add'>+	} else if ((dmamode &amp; DMA_MODE_MASK) == DMA_MODE_WRITE) {</div><div class='add'>+		pr_debug("imxdma%d: %s dma_addressg=0x%08x dma_length=%d "</div><div class='add'>+			"dev_addr=0x%08x for write\n",</div><div class='add'>+			channel, __func__, (unsigned int)dma_address,</div><div class='add'>+			dma_length, dev_addr);</div><div class='add'>+</div><div class='add'>+		__raw_writel(dma_address, DMA_BASE + DMA_SAR(channel));</div><div class='add'>+		__raw_writel(dev_addr, DMA_BASE + DMA_DAR(channel));</div><div class='add'>+		__raw_writel(imxdma-&gt;ccr_to_device,</div><div class='add'>+				DMA_BASE + DMA_CCR(channel));</div><div class='add'>+	} else {</div><div class='add'>+		printk(KERN_ERR "imxdma%d: imx_dma_setup_single bad dmamode\n",</div><div class='add'>+		       channel);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	__raw_writel(dma_length, DMA_BASE + DMA_CNTR(channel));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(imx_dma_setup_single);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * imx_dma_setup_sg - setup i.MX DMA channel SG list to/from device transfer</div><div class='add'>+ * @channel: i.MX DMA channel number</div><div class='add'>+ * @sg: pointer to the scatter-gather list/vector</div><div class='add'>+ * @sgcount: scatter-gather list hungs count</div><div class='add'>+ * @dma_length: total length of the transfer request in bytes</div><div class='add'>+ * @dev_addr: physical device port address</div><div class='add'>+ * @dmamode: DMA transfer mode, %DMA_MODE_READ from the device to the memory</div><div class='add'>+ *           or %DMA_MODE_WRITE from memory to the device</div><div class='add'>+ *</div><div class='add'>+ * The function sets up DMA channel state and registers to be ready for</div><div class='add'>+ * transfer specified by provided parameters. The scatter-gather emulation</div><div class='add'>+ * is set up according to the parameters.</div><div class='add'>+ *</div><div class='add'>+ * The full preparation of the transfer requires setup of more register</div><div class='add'>+ * by the caller before imx_dma_enable() can be called.</div><div class='add'>+ *</div><div class='add'>+ * %BLR(channel) holds transfer burst length in bytes, 0 means 64 bytes</div><div class='add'>+ *</div><div class='add'>+ * %RSSR(channel) has to be set to the DMA request line source %DMA_REQ_xxx</div><div class='add'>+ *</div><div class='add'>+ * %CCR(channel) has to specify transfer parameters, the next settings is</div><div class='add'>+ * typical for linear or simple scatter-gather transfers if %DMA_MODE_READ is</div><div class='add'>+ * specified</div><div class='add'>+ *</div><div class='add'>+ * %CCR_DMOD_LINEAR | %CCR_DSIZ_32 | %CCR_SMOD_FIFO | %CCR_SSIZ_x</div><div class='add'>+ *</div><div class='add'>+ * The typical setup for %DMA_MODE_WRITE is specified by next options</div><div class='add'>+ * combination</div><div class='add'>+ *</div><div class='add'>+ * %CCR_SMOD_LINEAR | %CCR_SSIZ_32 | %CCR_DMOD_FIFO | %CCR_DSIZ_x</div><div class='add'>+ *</div><div class='add'>+ * Be careful here and do not mistakenly mix source and target device</div><div class='add'>+ * port sizes constants, they are really different:</div><div class='add'>+ * %CCR_SSIZ_8, %CCR_SSIZ_16, %CCR_SSIZ_32,</div><div class='add'>+ * %CCR_DSIZ_8, %CCR_DSIZ_16, %CCR_DSIZ_32</div><div class='add'>+ *</div><div class='add'>+ * Return value: if incorrect parameters are provided -%EINVAL.</div><div class='add'>+ * Zero indicates success.</div><div class='add'>+ */</div><div class='add'>+int</div><div class='add'>+imx_dma_setup_sg(int channel,</div><div class='add'>+		 struct scatterlist *sg, unsigned int sgcount,</div><div class='add'>+		 unsigned int dma_length, unsigned int dev_addr,</div><div class='add'>+		 dmamode_t dmamode)</div><div class='add'>+{</div><div class='add'>+	struct imx_dma_channel *imxdma = &amp;imx_dma_channels[channel];</div><div class='add'>+</div><div class='add'>+	if (imxdma-&gt;in_use)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	imxdma-&gt;sg = sg;</div><div class='add'>+	imxdma-&gt;dma_mode = dmamode;</div><div class='add'>+	imxdma-&gt;resbytes = dma_length;</div><div class='add'>+</div><div class='add'>+	if (!sg || !sgcount) {</div><div class='add'>+		printk(KERN_ERR "imxdma%d: imx_dma_setup_sg epty sg list\n",</div><div class='add'>+		       channel);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!sg-&gt;length) {</div><div class='add'>+		printk(KERN_ERR "imxdma%d: imx_dma_setup_sg zero length\n",</div><div class='add'>+		       channel);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((dmamode &amp; DMA_MODE_MASK) == DMA_MODE_READ) {</div><div class='add'>+		pr_debug("imxdma%d: %s sg=%p sgcount=%d total length=%d "</div><div class='add'>+			"dev_addr=0x%08x for read\n",</div><div class='add'>+			channel, __func__, sg, sgcount, dma_length, dev_addr);</div><div class='add'>+</div><div class='add'>+		__raw_writel(dev_addr, DMA_BASE + DMA_SAR(channel));</div><div class='add'>+		__raw_writel(imxdma-&gt;ccr_from_device,</div><div class='add'>+				DMA_BASE + DMA_CCR(channel));</div><div class='add'>+	} else if ((dmamode &amp; DMA_MODE_MASK) == DMA_MODE_WRITE) {</div><div class='add'>+		pr_debug("imxdma%d: %s sg=%p sgcount=%d total length=%d "</div><div class='add'>+			"dev_addr=0x%08x for write\n",</div><div class='add'>+			channel, __func__, sg, sgcount, dma_length, dev_addr);</div><div class='add'>+</div><div class='add'>+		__raw_writel(dev_addr, DMA_BASE + DMA_DAR(channel));</div><div class='add'>+		__raw_writel(imxdma-&gt;ccr_to_device,</div><div class='add'>+				DMA_BASE + DMA_CCR(channel));</div><div class='add'>+	} else {</div><div class='add'>+		printk(KERN_ERR "imxdma%d: imx_dma_setup_sg bad dmamode\n",</div><div class='add'>+		       channel);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	imx_dma_sg_next(channel, sg);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(imx_dma_setup_sg);</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+imx_dma_config_channel(int channel, unsigned int config_port,</div><div class='add'>+	unsigned int config_mem, unsigned int dmareq, int hw_chaining)</div><div class='add'>+{</div><div class='add'>+	struct imx_dma_channel *imxdma = &amp;imx_dma_channels[channel];</div><div class='add'>+	u32 dreq = 0;</div><div class='add'>+</div><div class='add'>+	imxdma-&gt;hw_chaining = 0;</div><div class='add'>+</div><div class='add'>+	if (hw_chaining) {</div><div class='add'>+		imxdma-&gt;hw_chaining = 1;</div><div class='add'>+		if (!imx_dma_hw_chain(imxdma))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dmareq)</div><div class='add'>+		dreq = CCR_REN;</div><div class='add'>+</div><div class='add'>+	imxdma-&gt;ccr_from_device = config_port | (config_mem &lt;&lt; 2) | dreq;</div><div class='add'>+	imxdma-&gt;ccr_to_device = config_mem | (config_port &lt;&lt; 2) | dreq;</div><div class='add'>+</div><div class='add'>+	__raw_writel(dmareq, DMA_BASE + DMA_RSSR(channel));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(imx_dma_config_channel);</div><div class='add'>+</div><div class='add'>+void imx_dma_config_burstlen(int channel, unsigned int burstlen)</div><div class='add'>+{</div><div class='add'>+	__raw_writel(burstlen, DMA_BASE + DMA_BLR(channel));</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(imx_dma_config_burstlen);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * imx_dma_setup_handlers - setup i.MX DMA channel end and error notification</div><div class='add'>+ * handlers</div><div class='add'>+ * @channel: i.MX DMA channel number</div><div class='add'>+ * @irq_handler: the pointer to the function called if the transfer</div><div class='add'>+ *		ends successfully</div><div class='add'>+ * @err_handler: the pointer to the function called if the premature</div><div class='add'>+ *		end caused by error occurs</div><div class='add'>+ * @data: user specified value to be passed to the handlers</div><div class='add'>+ */</div><div class='add'>+int</div><div class='add'>+imx_dma_setup_handlers(int channel,</div><div class='add'>+		       void (*irq_handler) (int, void *),</div><div class='add'>+		       void (*err_handler) (int, void *, int),</div><div class='add'>+		       void *data)</div><div class='add'>+{</div><div class='add'>+	struct imx_dma_channel *imxdma = &amp;imx_dma_channels[channel];</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	if (!imxdma-&gt;name) {</div><div class='add'>+		printk(KERN_CRIT "%s: called for  not allocated channel %d\n",</div><div class='add'>+		       __func__, channel);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	local_irq_save(flags);</div><div class='add'>+	__raw_writel(1 &lt;&lt; channel, DMA_BASE + DMA_DISR);</div><div class='add'>+	imxdma-&gt;irq_handler = irq_handler;</div><div class='add'>+	imxdma-&gt;err_handler = err_handler;</div><div class='add'>+	imxdma-&gt;data = data;</div><div class='add'>+	local_irq_restore(flags);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(imx_dma_setup_handlers);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * imx_dma_setup_progression_handler - setup i.MX DMA channel progression</div><div class='add'>+ * handlers</div><div class='add'>+ * @channel: i.MX DMA channel number</div><div class='add'>+ * @prog_handler: the pointer to the function called if the transfer progresses</div><div class='add'>+ */</div><div class='add'>+int</div><div class='add'>+imx_dma_setup_progression_handler(int channel,</div><div class='add'>+			void (*prog_handler) (int, void*, struct scatterlist*))</div><div class='add'>+{</div><div class='add'>+	struct imx_dma_channel *imxdma = &amp;imx_dma_channels[channel];</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	if (!imxdma-&gt;name) {</div><div class='add'>+		printk(KERN_CRIT "%s: called for  not allocated channel %d\n",</div><div class='add'>+		       __func__, channel);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	local_irq_save(flags);</div><div class='add'>+	imxdma-&gt;prog_handler = prog_handler;</div><div class='add'>+	local_irq_restore(flags);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(imx_dma_setup_progression_handler);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * imx_dma_enable - function to start i.MX DMA channel operation</div><div class='add'>+ * @channel: i.MX DMA channel number</div><div class='add'>+ *</div><div class='add'>+ * The channel has to be allocated by driver through imx_dma_request()</div><div class='add'>+ * or imx_dma_request_by_prio() function.</div><div class='add'>+ * The transfer parameters has to be set to the channel registers through</div><div class='add'>+ * call of the imx_dma_setup_single() or imx_dma_setup_sg() function</div><div class='add'>+ * and registers %BLR(channel), %RSSR(channel) and %CCR(channel) has to</div><div class='add'>+ * be set prior this function call by the channel user.</div><div class='add'>+ */</div><div class='add'>+void imx_dma_enable(int channel)</div><div class='add'>+{</div><div class='add'>+	struct imx_dma_channel *imxdma = &amp;imx_dma_channels[channel];</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	pr_debug("imxdma%d: imx_dma_enable\n", channel);</div><div class='add'>+</div><div class='add'>+	if (!imxdma-&gt;name) {</div><div class='add'>+		printk(KERN_CRIT "%s: called for  not allocated channel %d\n",</div><div class='add'>+		       __func__, channel);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (imxdma-&gt;in_use)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	local_irq_save(flags);</div><div class='add'>+</div><div class='add'>+	__raw_writel(1 &lt;&lt; channel, DMA_BASE + DMA_DISR);</div><div class='add'>+	__raw_writel(__raw_readl(DMA_BASE + DMA_DIMR) &amp; ~(1 &lt;&lt; channel),</div><div class='add'>+		DMA_BASE + DMA_DIMR);</div><div class='add'>+	__raw_writel(__raw_readl(DMA_BASE + DMA_CCR(channel)) | CCR_CEN |</div><div class='add'>+		CCR_ACRPT,</div><div class='add'>+		DMA_BASE + DMA_CCR(channel));</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ARCH_MX2</div><div class='add'>+	if (imxdma-&gt;sg &amp;&amp; imx_dma_hw_chain(imxdma)) {</div><div class='add'>+		imxdma-&gt;sg = sg_next(imxdma-&gt;sg);</div><div class='add'>+		if (imxdma-&gt;sg) {</div><div class='add'>+			u32 tmp;</div><div class='add'>+			imx_dma_sg_next(channel, imxdma-&gt;sg);</div><div class='add'>+			tmp = __raw_readl(DMA_BASE + DMA_CCR(channel));</div><div class='add'>+			__raw_writel(tmp | CCR_RPT | CCR_ACRPT,</div><div class='add'>+				DMA_BASE + DMA_CCR(channel));</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	imxdma-&gt;in_use = 1;</div><div class='add'>+</div><div class='add'>+	local_irq_restore(flags);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(imx_dma_enable);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * imx_dma_disable - stop, finish i.MX DMA channel operatin</div><div class='add'>+ * @channel: i.MX DMA channel number</div><div class='add'>+ */</div><div class='add'>+void imx_dma_disable(int channel)</div><div class='add'>+{</div><div class='add'>+	struct imx_dma_channel *imxdma = &amp;imx_dma_channels[channel];</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	pr_debug("imxdma%d: imx_dma_disable\n", channel);</div><div class='add'>+</div><div class='add'>+	if (imx_dma_hw_chain(imxdma))</div><div class='add'>+		del_timer(&amp;imxdma-&gt;watchdog);</div><div class='add'>+</div><div class='add'>+	local_irq_save(flags);</div><div class='add'>+	__raw_writel(__raw_readl(DMA_BASE + DMA_DIMR) | (1 &lt;&lt; channel),</div><div class='add'>+		DMA_BASE + DMA_DIMR);</div><div class='add'>+	__raw_writel(__raw_readl(DMA_BASE + DMA_CCR(channel)) &amp; ~CCR_CEN,</div><div class='add'>+		DMA_BASE + DMA_CCR(channel));</div><div class='add'>+	__raw_writel(1 &lt;&lt; channel, DMA_BASE + DMA_DISR);</div><div class='add'>+	imxdma-&gt;in_use = 0;</div><div class='add'>+	local_irq_restore(flags);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(imx_dma_disable);</div><div class='add'>+</div><div class='add'>+static void imx_dma_watchdog(unsigned long chno)</div><div class='add'>+{</div><div class='add'>+	struct imx_dma_channel *imxdma = &amp;imx_dma_channels[chno];</div><div class='add'>+</div><div class='add'>+	__raw_writel(0, DMA_BASE + DMA_CCR(chno));</div><div class='add'>+	imxdma-&gt;in_use = 0;</div><div class='add'>+	imxdma-&gt;sg = NULL;</div><div class='add'>+</div><div class='add'>+	if (imxdma-&gt;err_handler)</div><div class='add'>+		imxdma-&gt;err_handler(chno, imxdma-&gt;data, IMX_DMA_ERR_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t dma_err_handler(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	int i, disr;</div><div class='add'>+	struct imx_dma_channel *imxdma;</div><div class='add'>+	unsigned int err_mask;</div><div class='add'>+	int errcode;</div><div class='add'>+</div><div class='add'>+	disr = __raw_readl(DMA_BASE + DMA_DISR);</div><div class='add'>+</div><div class='add'>+	err_mask = __raw_readl(DMA_BASE + DMA_DBTOSR) |</div><div class='add'>+		   __raw_readl(DMA_BASE + DMA_DRTOSR) |</div><div class='add'>+		   __raw_readl(DMA_BASE + DMA_DSESR)  |</div><div class='add'>+		   __raw_readl(DMA_BASE + DMA_DBOSR);</div><div class='add'>+</div><div class='add'>+	if (!err_mask)</div><div class='add'>+		return IRQ_HANDLED;</div><div class='add'>+</div><div class='add'>+	__raw_writel(disr &amp; err_mask, DMA_BASE + DMA_DISR);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; IMX_DMA_CHANNELS; i++) {</div><div class='add'>+		if (!(err_mask &amp; (1 &lt;&lt; i)))</div><div class='add'>+			continue;</div><div class='add'>+		imxdma = &amp;imx_dma_channels[i];</div><div class='add'>+		errcode = 0;</div><div class='add'>+</div><div class='add'>+		if (__raw_readl(DMA_BASE + DMA_DBTOSR) &amp; (1 &lt;&lt; i)) {</div><div class='add'>+			__raw_writel(1 &lt;&lt; i, DMA_BASE + DMA_DBTOSR);</div><div class='add'>+			errcode |= IMX_DMA_ERR_BURST;</div><div class='add'>+		}</div><div class='add'>+		if (__raw_readl(DMA_BASE + DMA_DRTOSR) &amp; (1 &lt;&lt; i)) {</div><div class='add'>+			__raw_writel(1 &lt;&lt; i, DMA_BASE + DMA_DRTOSR);</div><div class='add'>+			errcode |= IMX_DMA_ERR_REQUEST;</div><div class='add'>+		}</div><div class='add'>+		if (__raw_readl(DMA_BASE + DMA_DSESR) &amp; (1 &lt;&lt; i)) {</div><div class='add'>+			__raw_writel(1 &lt;&lt; i, DMA_BASE + DMA_DSESR);</div><div class='add'>+			errcode |= IMX_DMA_ERR_TRANSFER;</div><div class='add'>+		}</div><div class='add'>+		if (__raw_readl(DMA_BASE + DMA_DBOSR) &amp; (1 &lt;&lt; i)) {</div><div class='add'>+			__raw_writel(1 &lt;&lt; i, DMA_BASE + DMA_DBOSR);</div><div class='add'>+			errcode |= IMX_DMA_ERR_BUFFER;</div><div class='add'>+		}</div><div class='add'>+		if (imxdma-&gt;name &amp;&amp; imxdma-&gt;err_handler) {</div><div class='add'>+			imxdma-&gt;err_handler(i, imxdma-&gt;data, errcode);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		imx_dma_channels[i].sg = NULL;</div><div class='add'>+</div><div class='add'>+		printk(KERN_WARNING</div><div class='add'>+		       "DMA timeout on channel %d (%s) -%s%s%s%s\n",</div><div class='add'>+		       i, imxdma-&gt;name,</div><div class='add'>+		       errcode &amp; IMX_DMA_ERR_BURST ?    " burst" : "",</div><div class='add'>+		       errcode &amp; IMX_DMA_ERR_REQUEST ?  " request" : "",</div><div class='add'>+		       errcode &amp; IMX_DMA_ERR_TRANSFER ? " transfer" : "",</div><div class='add'>+		       errcode &amp; IMX_DMA_ERR_BUFFER ?   " buffer" : "");</div><div class='add'>+	}</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dma_irq_handle_channel(int chno)</div><div class='add'>+{</div><div class='add'>+	struct imx_dma_channel *imxdma = &amp;imx_dma_channels[chno];</div><div class='add'>+</div><div class='add'>+	if (!imxdma-&gt;name) {</div><div class='add'>+		/*</div><div class='add'>+		 * IRQ for an unregistered DMA channel:</div><div class='add'>+		 * let's clear the interrupts and disable it.</div><div class='add'>+		 */</div><div class='add'>+		printk(KERN_WARNING</div><div class='add'>+		       "spurious IRQ for DMA channel %d\n", chno);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (imxdma-&gt;sg) {</div><div class='add'>+		u32 tmp;</div><div class='add'>+		struct scatterlist *current_sg = imxdma-&gt;sg;</div><div class='add'>+		imxdma-&gt;sg = sg_next(imxdma-&gt;sg);</div><div class='add'>+</div><div class='add'>+		if (imxdma-&gt;sg) {</div><div class='add'>+			imx_dma_sg_next(chno, imxdma-&gt;sg);</div><div class='add'>+</div><div class='add'>+			tmp = __raw_readl(DMA_BASE + DMA_CCR(chno));</div><div class='add'>+</div><div class='add'>+			if (imx_dma_hw_chain(imxdma)) {</div><div class='add'>+				/* FIXME: The timeout should probably be</div><div class='add'>+				 * configurable</div><div class='add'>+				 */</div><div class='add'>+				mod_timer(&amp;imxdma-&gt;watchdog,</div><div class='add'>+					jiffies + msecs_to_jiffies(500));</div><div class='add'>+</div><div class='add'>+				tmp |= CCR_CEN | CCR_RPT | CCR_ACRPT;</div><div class='add'>+				__raw_writel(tmp, DMA_BASE +</div><div class='add'>+						DMA_CCR(chno));</div><div class='add'>+			} else {</div><div class='add'>+				__raw_writel(tmp &amp; ~CCR_CEN, DMA_BASE +</div><div class='add'>+						DMA_CCR(chno));</div><div class='add'>+				tmp |= CCR_CEN;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			__raw_writel(tmp, DMA_BASE + DMA_CCR(chno));</div><div class='add'>+</div><div class='add'>+			if (imxdma-&gt;prog_handler)</div><div class='add'>+				imxdma-&gt;prog_handler(chno, imxdma-&gt;data,</div><div class='add'>+						current_sg);</div><div class='add'>+</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (imx_dma_hw_chain(imxdma)) {</div><div class='add'>+			del_timer(&amp;imxdma-&gt;watchdog);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	__raw_writel(0, DMA_BASE + DMA_CCR(chno));</div><div class='add'>+	imxdma-&gt;in_use = 0;</div><div class='add'>+	if (imxdma-&gt;irq_handler)</div><div class='add'>+		imxdma-&gt;irq_handler(chno, imxdma-&gt;data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t dma_irq_handler(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	int i, disr;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ARCH_MX2</div><div class='add'>+	dma_err_handler(irq, dev_id);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	disr = __raw_readl(DMA_BASE + DMA_DISR);</div><div class='add'>+</div><div class='add'>+	pr_debug("imxdma: dma_irq_handler called, disr=0x%08x\n",</div><div class='add'>+		     disr);</div><div class='add'>+</div><div class='add'>+	__raw_writel(disr, DMA_BASE + DMA_DISR);</div><div class='add'>+	for (i = 0; i &lt; IMX_DMA_CHANNELS; i++) {</div><div class='add'>+		if (disr &amp; (1 &lt;&lt; i))</div><div class='add'>+			dma_irq_handle_channel(i);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * imx_dma_request - request/allocate specified channel number</div><div class='add'>+ * @channel: i.MX DMA channel number</div><div class='add'>+ * @name: the driver/caller own non-%NULL identification</div><div class='add'>+ */</div><div class='add'>+int imx_dma_request(int channel, const char *name)</div><div class='add'>+{</div><div class='add'>+	struct imx_dma_channel *imxdma = &amp;imx_dma_channels[channel];</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* basic sanity checks */</div><div class='add'>+	if (!name)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (channel &gt;= IMX_DMA_CHANNELS) {</div><div class='add'>+		printk(KERN_CRIT "%s: called for  non-existed channel %d\n",</div><div class='add'>+		       __func__, channel);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	local_irq_save(flags);</div><div class='add'>+	if (imxdma-&gt;name) {</div><div class='add'>+		local_irq_restore(flags);</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ARCH_MX2</div><div class='add'>+	ret = request_irq(MXC_INT_DMACH0 + channel, dma_irq_handler, 0, "DMA",</div><div class='add'>+			NULL);</div><div class='add'>+	if (ret) {</div><div class='add'>+		printk(KERN_CRIT "Can't register IRQ %d for DMA channel %d\n",</div><div class='add'>+				MXC_INT_DMACH0 + channel, channel);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+	init_timer(&amp;imxdma-&gt;watchdog);</div><div class='add'>+	imxdma-&gt;watchdog.function = &amp;imx_dma_watchdog;</div><div class='add'>+	imxdma-&gt;watchdog.data = channel;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	imxdma-&gt;name = name;</div><div class='add'>+	imxdma-&gt;irq_handler = NULL;</div><div class='add'>+	imxdma-&gt;err_handler = NULL;</div><div class='add'>+	imxdma-&gt;data = NULL;</div><div class='add'>+	imxdma-&gt;sg = NULL;</div><div class='add'>+</div><div class='add'>+	local_irq_restore(flags);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(imx_dma_request);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * imx_dma_free - release previously acquired channel</div><div class='add'>+ * @channel: i.MX DMA channel number</div><div class='add'>+ */</div><div class='add'>+void imx_dma_free(int channel)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	struct imx_dma_channel *imxdma = &amp;imx_dma_channels[channel];</div><div class='add'>+</div><div class='add'>+	if (!imxdma-&gt;name) {</div><div class='add'>+		printk(KERN_CRIT</div><div class='add'>+		       "%s: trying to free free channel %d\n",</div><div class='add'>+		       __func__, channel);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	local_irq_save(flags);</div><div class='add'>+	/* Disable interrupts */</div><div class='add'>+	__raw_writel(__raw_readl(DMA_BASE + DMA_DIMR) | (1 &lt;&lt; channel),</div><div class='add'>+		DMA_BASE + DMA_DIMR);</div><div class='add'>+	__raw_writel(__raw_readl(DMA_BASE + DMA_CCR(channel)) &amp; ~CCR_CEN,</div><div class='add'>+		DMA_BASE + DMA_CCR(channel));</div><div class='add'>+	imxdma-&gt;name = NULL;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ARCH_MX2</div><div class='add'>+	free_irq(MXC_INT_DMACH0 + channel, NULL);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	local_irq_restore(flags);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(imx_dma_free);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * imx_dma_request_by_prio - find and request some of free channels best</div><div class='add'>+ * suiting requested priority</div><div class='add'>+ * @channel: i.MX DMA channel number</div><div class='add'>+ * @name: the driver/caller own non-%NULL identification</div><div class='add'>+ *</div><div class='add'>+ * This function tries to find a free channel in the specified priority group</div><div class='add'>+ * This function tries to find a free channel in the specified priority group</div><div class='add'>+ * if the priority cannot be achieved it tries to look for free channel</div><div class='add'>+ * in the higher and then even lower priority groups.</div><div class='add'>+ *</div><div class='add'>+ * Return value: If there is no free channel to allocate, -%ENODEV is returned.</div><div class='add'>+ *               On successful allocation channel is returned.</div><div class='add'>+ */</div><div class='add'>+int imx_dma_request_by_prio(const char *name, enum imx_dma_prio prio)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	int best;</div><div class='add'>+</div><div class='add'>+	switch (prio) {</div><div class='add'>+	case (DMA_PRIO_HIGH):</div><div class='add'>+		best = 8;</div><div class='add'>+		break;</div><div class='add'>+	case (DMA_PRIO_MEDIUM):</div><div class='add'>+		best = 4;</div><div class='add'>+		break;</div><div class='add'>+	case (DMA_PRIO_LOW):</div><div class='add'>+	default:</div><div class='add'>+		best = 0;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = best; i &lt; IMX_DMA_CHANNELS; i++)</div><div class='add'>+		if (!imx_dma_request(i, name))</div><div class='add'>+			return i;</div><div class='add'>+</div><div class='add'>+	for (i = best - 1; i &gt;= 0; i--)</div><div class='add'>+		if (!imx_dma_request(i, name))</div><div class='add'>+			return i;</div><div class='add'>+</div><div class='add'>+	printk(KERN_ERR "%s: no free DMA channel found\n", __func__);</div><div class='add'>+</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(imx_dma_request_by_prio);</div><div class='add'>+</div><div class='add'>+static int __init imx_dma_init(void)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	dma_clk = clk_get(NULL, "dma_clk");</div><div class='add'>+	clk_enable(dma_clk);</div><div class='add'>+</div><div class='add'>+	/* reset DMA module */</div><div class='add'>+	__raw_writel(DCR_DRST, DMA_BASE + DMA_DCR);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ARCH_MX1</div><div class='add'>+	ret = request_irq(DMA_INT, dma_irq_handler, 0, "DMA", NULL);</div><div class='add'>+	if (ret) {</div><div class='add'>+		printk(KERN_CRIT "Wow!  Can't register IRQ for DMA\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = request_irq(DMA_ERR, dma_err_handler, 0, "DMA", NULL);</div><div class='add'>+	if (ret) {</div><div class='add'>+		printk(KERN_CRIT "Wow!  Can't register ERRIRQ for DMA\n");</div><div class='add'>+		free_irq(DMA_INT, NULL);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	/* enable DMA module */</div><div class='add'>+	__raw_writel(DCR_DEN, DMA_BASE + DMA_DCR);</div><div class='add'>+</div><div class='add'>+	/* clear all interrupts */</div><div class='add'>+	__raw_writel((1 &lt;&lt; IMX_DMA_CHANNELS) - 1, DMA_BASE + DMA_DISR);</div><div class='add'>+</div><div class='add'>+	/* disable interrupts */</div><div class='add'>+	__raw_writel((1 &lt;&lt; IMX_DMA_CHANNELS) - 1, DMA_BASE + DMA_DIMR);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; IMX_DMA_CHANNELS; i++) {</div><div class='add'>+		imx_dma_channels[i].sg = NULL;</div><div class='add'>+		imx_dma_channels[i].dma_num = i;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+arch_initcall(imx_dma_init);</div><div class='head'>diff --git a/arch/arm/plat-mxc/include/mach/board-mx31ads.h b/arch/arm/plat-mxc/include/mach/board-mx31ads.h<br/>index 1bc6fb0f9a83..745b48864f93 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-mxc/include/mach/board-mx31ads.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-mxc/include/mach/board-mx31ads.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-mxc/include/mach/board-mx31ads.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-mxc/include/mach/board-mx31ads.h</a></div><div class='hunk'>@@ -90,6 +90,9 @@</div><div class='ctx'> #define PBC_INTMASK_CLEAR_REG	(PBC_INTMASK_CLEAR + PBC_BASE_ADDRESS)</div><div class='ctx'> #define EXPIO_PARENT_INT	IOMUX_TO_IRQ(MX31_PIN_GPIO1_4)</div><div class='ctx'> </div><div class='add'>+#define MXC_EXP_IO_BASE		(MXC_MAX_INT_LINES + MXC_MAX_GPIO_LINES)</div><div class='add'>+#define MXC_IRQ_TO_EXPIO(irq)	((irq) - MXC_EXP_IO_BASE)</div><div class='add'>+</div><div class='ctx'> #define EXPIO_INT_LOW_BAT	(MXC_EXP_IO_BASE + 0)</div><div class='ctx'> #define EXPIO_INT_PB_IRQ	(MXC_EXP_IO_BASE + 1)</div><div class='ctx'> #define EXPIO_INT_OTG_FS_OVR	(MXC_EXP_IO_BASE + 2)</div><div class='head'>diff --git a/arch/arm/plat-mxc/include/mach/clock.h b/arch/arm/plat-mxc/include/mach/clock.h<br/>index 24caa2b7c91d..d21f78e78819 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-mxc/include/mach/clock.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-mxc/include/mach/clock.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-mxc/include/mach/clock.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-mxc/include/mach/clock.h</a></div><div class='hunk'>@@ -39,7 +39,7 @@ struct clk {</div><div class='ctx'> 	/* Register bit position for clock's enable/disable control. */</div><div class='ctx'> 	u8 enable_shift;</div><div class='ctx'> 	/* Register address for clock's enable/disable control. */</div><div class='del'>-	u32 enable_reg;</div><div class='add'>+	void __iomem *enable_reg;</div><div class='ctx'> 	u32 flags;</div><div class='ctx'> 	/* get the current clock rate (always a fresh value) */</div><div class='ctx'> 	unsigned long (*get_rate) (struct clk *);</div><div class='head'>diff --git a/arch/arm/plat-mxc/include/mach/common.h b/arch/arm/plat-mxc/include/mach/common.h<br/>index a6d2e24aab15..6350287a59b9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-mxc/include/mach/common.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-mxc/include/mach/common.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-mxc/include/mach/common.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-mxc/include/mach/common.h</a></div><div class='hunk'>@@ -11,10 +11,13 @@</div><div class='ctx'> #ifndef __ASM_ARCH_MXC_COMMON_H__</div><div class='ctx'> #define __ASM_ARCH_MXC_COMMON_H__</div><div class='ctx'> </div><div class='add'>+struct platform_device;</div><div class='add'>+</div><div class='ctx'> extern void mxc_map_io(void);</div><div class='ctx'> extern void mxc_init_irq(void);</div><div class='ctx'> extern void mxc_timer_init(const char *clk_timer);</div><div class='ctx'> extern int mxc_clocks_init(unsigned long fref);</div><div class='ctx'> extern int mxc_register_gpios(void);</div><div class='add'>+extern int mxc_register_device(struct platform_device *pdev, void *data);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/plat-mxc/include/mach/dma-mx1-mx2.h b/arch/arm/plat-mxc/include/mach/dma-mx1-mx2.h<br/>new file mode 100644<br/>index 000000000000..e85fd946116c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-mxc/include/mach/dma-mx1-mx2.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-mxc/include/mach/dma-mx1-mx2.h</a></div><div class='hunk'>@@ -0,0 +1,89 @@</div><div class='add'>+/*</div><div class='add'>+ *  linux/arch/arm/plat-mxc/include/mach/dma-mx1-mx2.h</div><div class='add'>+ *</div><div class='add'>+ *  i.MX DMA registration and IRQ dispatching</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2006 Pavel Pisa &lt;pisa@cmp.felk.cvut.cz&gt;</div><div class='add'>+ * Copyright 2008 Juergen Beisert, &lt;kernel@pengutronix.de&gt;</div><div class='add'>+ * Copyright 2008 Sascha Hauer, &lt;s.hauer@pengutronix.de&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public License</div><div class='add'>+ * as published by the Free Software Foundation; either version 2</div><div class='add'>+ * of the License, or (at your option) any later version.</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,</div><div class='add'>+ * MA 02110-1301, USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;asm/dma.h&gt;</div><div class='add'>+</div><div class='add'>+#ifndef __ASM_ARCH_MXC_DMA_H</div><div class='add'>+#define __ASM_ARCH_MXC_DMA_H</div><div class='add'>+</div><div class='add'>+#define IMX_DMA_CHANNELS  16</div><div class='add'>+</div><div class='add'>+#define DMA_BASE IO_ADDRESS(DMA_BASE_ADDR)</div><div class='add'>+</div><div class='add'>+#define IMX_DMA_MEMSIZE_32	(0 &lt;&lt; 4)</div><div class='add'>+#define IMX_DMA_MEMSIZE_8	(1 &lt;&lt; 4)</div><div class='add'>+#define IMX_DMA_MEMSIZE_16	(2 &lt;&lt; 4)</div><div class='add'>+#define IMX_DMA_TYPE_LINEAR	(0 &lt;&lt; 10)</div><div class='add'>+#define IMX_DMA_TYPE_2D		(1 &lt;&lt; 10)</div><div class='add'>+#define IMX_DMA_TYPE_FIFO	(2 &lt;&lt; 10)</div><div class='add'>+</div><div class='add'>+#define IMX_DMA_ERR_BURST     (1 &lt;&lt; 0)</div><div class='add'>+#define IMX_DMA_ERR_REQUEST   (1 &lt;&lt; 1)</div><div class='add'>+#define IMX_DMA_ERR_TRANSFER  (1 &lt;&lt; 2)</div><div class='add'>+#define IMX_DMA_ERR_BUFFER    (1 &lt;&lt; 3)</div><div class='add'>+#define IMX_DMA_ERR_TIMEOUT   (1 &lt;&lt; 4)</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+imx_dma_config_channel(int channel, unsigned int config_port,</div><div class='add'>+	unsigned int config_mem, unsigned int dmareq, int hw_chaining);</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+imx_dma_config_burstlen(int channel, unsigned int burstlen);</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+imx_dma_setup_single(int channel, dma_addr_t dma_address,</div><div class='add'>+		unsigned int dma_length, unsigned int dev_addr,</div><div class='add'>+		dmamode_t dmamode);</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+imx_dma_setup_sg(int channel, struct scatterlist *sg,</div><div class='add'>+		unsigned int sgcount, unsigned int dma_length,</div><div class='add'>+		unsigned int dev_addr, dmamode_t dmamode);</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+imx_dma_setup_handlers(int channel,</div><div class='add'>+		void (*irq_handler) (int, void *),</div><div class='add'>+		void (*err_handler) (int, void *, int), void *data);</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+imx_dma_setup_progression_handler(int channel,</div><div class='add'>+		void (*prog_handler) (int, void*, struct scatterlist*));</div><div class='add'>+</div><div class='add'>+void imx_dma_enable(int channel);</div><div class='add'>+</div><div class='add'>+void imx_dma_disable(int channel);</div><div class='add'>+</div><div class='add'>+int imx_dma_request(int channel, const char *name);</div><div class='add'>+</div><div class='add'>+void imx_dma_free(int channel);</div><div class='add'>+</div><div class='add'>+enum imx_dma_prio {</div><div class='add'>+	DMA_PRIO_HIGH = 0,</div><div class='add'>+	DMA_PRIO_MEDIUM = 1,</div><div class='add'>+	DMA_PRIO_LOW = 2</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int imx_dma_request_by_prio(const char *name, enum imx_dma_prio prio);</div><div class='add'>+</div><div class='add'>+#endif	/* _ASM_ARCH_MXC_DMA_H */</div><div class='head'>diff --git a/arch/arm/plat-mxc/include/mach/entry-macro.S b/arch/arm/plat-mxc/include/mach/entry-macro.S<br/>index b542433afb1b..11632028f7d1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-mxc/include/mach/entry-macro.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-mxc/include/mach/entry-macro.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-mxc/include/mach/entry-macro.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-mxc/include/mach/entry-macro.S</a></div><div class='hunk'>@@ -9,11 +9,17 @@</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#define AVIC_NIMASK	0x04</div><div class='add'>+</div><div class='ctx'> 	@ this macro disables fast irq (not implemented)</div><div class='ctx'> 	.macro	disable_fiq</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='ctx'> 	.macro  get_irqnr_preamble, base, tmp</div><div class='add'>+	ldr	\base, =AVIC_IO_ADDRESS(AVIC_BASE_ADDR)</div><div class='add'>+#ifdef CONFIG_MXC_IRQ_PRIOR</div><div class='add'>+	ldr	r4, [\base, #AVIC_NIMASK]</div><div class='add'>+#endif</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='ctx'> 	.macro  arch_ret_to_user, tmp1, tmp2</div><div class='hunk'>@@ -23,7 +29,6 @@</div><div class='ctx'> 	@ and returns its number in irqnr</div><div class='ctx'> 	@ and returns if an interrupt occured in irqstat</div><div class='ctx'> 	.macro	get_irqnr_and_base, irqnr, irqstat, base, tmp</div><div class='del'>-	ldr	\base, =AVIC_IO_ADDRESS(AVIC_BASE_ADDR)</div><div class='ctx'> 	@ Load offset &amp; priority of the highest priority</div><div class='ctx'> 	@ interrupt pending from AVIC_NIVECSR</div><div class='ctx'> 	ldr	\irqstat, [\base, #0x40]</div><div class='hunk'>@@ -32,6 +37,11 @@</div><div class='ctx'> 	mov	\irqnr, \irqstat, asr #16</div><div class='ctx'> 	@ set zero flag if IRQ + 1 == 0</div><div class='ctx'> 	adds	\tmp, \irqnr, #1</div><div class='add'>+#ifdef CONFIG_MXC_IRQ_PRIOR</div><div class='add'>+	bicne	\tmp, \irqstat, #0xFFFFFFE0</div><div class='add'>+	strne	\tmp, [\base, #AVIC_NIMASK]</div><div class='add'>+	streq	r4, [\base, #AVIC_NIMASK]</div><div class='add'>+#endif</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='ctx'> 	@ irq priority table (not used)</div><div class='head'>diff --git a/arch/arm/plat-mxc/include/mach/iomux-mx1-mx2.h b/arch/arm/plat-mxc/include/mach/iomux-mx1-mx2.h<br/>index 076d37b38eb2..3d09bfd6c53d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-mxc/include/mach/iomux-mx1-mx2.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-mxc/include/mach/iomux-mx1-mx2.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-mxc/include/mach/iomux-mx1-mx2.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-mxc/include/mach/iomux-mx1-mx2.h</a></div><div class='hunk'>@@ -247,6 +247,11 @@ extern int mxc_gpio_setup_multiple_pins(const int *pin_list, unsigned count,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ARCH_MX2</div><div class='add'>+#define PA0_PF_USBH2_CLK	(GPIO_PORTA | GPIO_PF | 0)</div><div class='add'>+#define PA1_PF_USBH2_DIR	(GPIO_PORTA | GPIO_PF | 1)</div><div class='add'>+#define PA2_PF_USBH2_DATA7	(GPIO_PORTA | GPIO_PF | 2)</div><div class='add'>+#define PA3_PF_USBH2_NXT	(GPIO_PORTA | GPIO_PF | 3)</div><div class='add'>+#define PA4_PF_USBH2_STP	(GPIO_PORTA | GPIO_PF | 4)</div><div class='ctx'> #define PA5_PF_LSCLK		(GPIO_PORTA | GPIO_OUT | GPIO_PF | 5)</div><div class='ctx'> #define PA6_PF_LD0		(GPIO_PORTA | GPIO_OUT | GPIO_PF | 6)</div><div class='ctx'> #define PA7_PF_LD1		(GPIO_PORTA | GPIO_OUT | GPIO_PF | 7)</div><div class='hunk'>@@ -294,6 +299,16 @@ extern int mxc_gpio_setup_multiple_pins(const int *pin_list, unsigned count,</div><div class='ctx'> #define PB20_AF_UART5_CTS	(GPIO_PORTB | GPIO_OUT | GPIO_AF | 20)</div><div class='ctx'> #define PB21_PF_CSI_HSYNC	(GPIO_PORTB | GPIO_OUT | GPIO_PF | 21)</div><div class='ctx'> #define PB21_AF_UART5_RTS	(GPIO_PORTB | GPIO_IN  | GPIO_AF | 21)</div><div class='add'>+#define PB22_PF_USBH1_SUSP	(GPIO_PORTB | GPIO_PF | 22)</div><div class='add'>+#define PB23_PF_USB_PWR		(GPIO_PORTB | GPIO_PF | 23)</div><div class='add'>+#define PB24_PF_USB_OC_B	(GPIO_PORTB | GPIO_PF | 24)</div><div class='add'>+#define PB25_PF_USBH1_RCV	(GPIO_PORTB | GPIO_PF | 25)</div><div class='add'>+#define PB26_PF_USBH1_FS	(GPIO_PORTB | GPIO_PF | 26)</div><div class='add'>+#define PB27_PF_USBH1_OE_B	(GPIO_PORTB | GPIO_PF | 27)</div><div class='add'>+#define PB28_PF_USBH1_TXDM	(GPIO_PORTB | GPIO_PF | 28)</div><div class='add'>+#define PB29_PF_USBH1_TXDP	(GPIO_PORTB | GPIO_PF | 29)</div><div class='add'>+#define PB30_PF_USBH1_RXDM	(GPIO_PORTB | GPIO_PF | 30)</div><div class='add'>+#define PB31_PF_USBH1_RXDP	(GPIO_PORTB | GPIO_PF | 31)</div><div class='ctx'> #define PB26_AF_UART4_RTS	(GPIO_PORTB | GPIO_IN  | GPIO_PF | 26)</div><div class='ctx'> #define PB28_AF_UART4_TXD	(GPIO_PORTB | GPIO_OUT | GPIO_AF | 28)</div><div class='ctx'> #define PB29_AF_UART4_CTS	(GPIO_PORTB | GPIO_OUT | GPIO_AF | 29)</div><div class='hunk'>@@ -335,8 +350,15 @@ extern int mxc_gpio_setup_multiple_pins(const int *pin_list, unsigned count,</div><div class='ctx'> #define PD16_AIN_FEC_TX_ER	(GPIO_PORTD | GPIO_OUT | GPIO_AIN | 16)</div><div class='ctx'> #define PD17_PF_I2C_DATA	(GPIO_PORTD | GPIO_OUT | GPIO_PF | 17)</div><div class='ctx'> #define PD18_PF_I2C_CLK		(GPIO_PORTD | GPIO_OUT | GPIO_PF | 18)</div><div class='add'>+#define PD19_AF_USBH2_DATA4	(GPIO_PORTD | GPIO_AF | 19)</div><div class='add'>+#define PD20_AF_USBH2_DATA3	(GPIO_PORTD | GPIO_AF | 20)</div><div class='add'>+#define PD21_AF_USBH2_DATA6	(GPIO_PORTD | GPIO_AF | 21)</div><div class='add'>+#define PD22_AF_USBH2_DATA0	(GPIO_PORTD | GPIO_AF | 22)</div><div class='add'>+#define PD23_AF_USBH2_DATA2	(GPIO_PORTD | GPIO_AF | 23)</div><div class='add'>+#define PD24_AF_USBH2_DATA1	(GPIO_PORTD | GPIO_AF | 24)</div><div class='ctx'> #define PD25_PF_CSPI1_RDY	(GPIO_PORTD | GPIO_OUT | GPIO_PF  | 25)</div><div class='ctx'> #define PD26_PF_CSPI1_SS2	(GPIO_PORTD | GPIO_OUT | GPIO_PF  | 26)</div><div class='add'>+#define PD26_AF_USBH2_DATA5     (GPIO_PORTD | GPIO_AF | 26)</div><div class='ctx'> #define PD27_PF_CSPI1_SS1	(GPIO_PORTD | GPIO_OUT | GPIO_PF  | 27)</div><div class='ctx'> #define PD28_PF_CSPI1_SS0	(GPIO_PORTD | GPIO_OUT | GPIO_PF  | 28)</div><div class='ctx'> #define PD29_PF_CSPI1_SCLK	(GPIO_PORTD | GPIO_OUT | GPIO_PF  | 29)</div><div class='hunk'>@@ -355,6 +377,8 @@ extern int mxc_gpio_setup_multiple_pins(const int *pin_list, unsigned count,</div><div class='ctx'> #define PE13_PF_UART1_RXD	(GPIO_PORTE | GPIO_IN  | GPIO_PF | 13)</div><div class='ctx'> #define PE14_PF_UART1_CTS	(GPIO_PORTE | GPIO_OUT | GPIO_PF | 14)</div><div class='ctx'> #define PE15_PF_UART1_RTS	(GPIO_PORTE | GPIO_IN  | GPIO_PF | 15)</div><div class='add'>+#define PE16_AF_RTCK		(GPIO_PORTE | GPIO_OUT | GPIO_AF | 16)</div><div class='add'>+#define PE16_PF_RTCK		(GPIO_PORTE | GPIO_OUT | GPIO_PF | 16)</div><div class='ctx'> #define PE18_AF_CSPI3_MISO	(GPIO_PORTE | GPIO_IN  | GPIO_AF | 18)</div><div class='ctx'> #define PE21_AF_CSPI3_SS	(GPIO_PORTE | GPIO_OUT | GPIO_AF | 21)</div><div class='ctx'> #define PE22_AF_CSPI3_MOSI	(GPIO_PORTE | GPIO_OUT | GPIO_AF | 22)</div><div class='head'>diff --git a/arch/arm/plat-mxc/include/mach/iomux-mx3.h b/arch/arm/plat-mxc/include/mach/iomux-mx3.h<br/>index 7509e7692f08..c9f39c2fb8c6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-mxc/include/mach/iomux-mx3.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-mxc/include/mach/iomux-mx3.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-mxc/include/mach/iomux-mx3.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-mxc/include/mach/iomux-mx3.h</a></div><div class='hunk'>@@ -491,6 +491,26 @@ enum iomux_pins {</div><div class='ctx'> #define MX31_PIN_RTS1__RTS1		IOMUX_MODE(MX31_PIN_RTS1, IOMUX_CONFIG_FUNC)</div><div class='ctx'> #define MX31_PIN_TXD1__TXD1		IOMUX_MODE(MX31_PIN_TXD1, IOMUX_CONFIG_FUNC)</div><div class='ctx'> #define MX31_PIN_RXD1__RXD1		IOMUX_MODE(MX31_PIN_RXD1, IOMUX_CONFIG_FUNC)</div><div class='add'>+#define MX31_PIN_CSPI1_MOSI__MOSI	IOMUX_MODE(MX31_PIN_CSPI1_MOSI, IOMUX_CONFIG_FUNC)</div><div class='add'>+#define MX31_PIN_CSPI1_MISO__MISO	IOMUX_MODE(MX31_PIN_CSPI1_MISO, IOMUX_CONFIG_FUNC)</div><div class='add'>+#define MX31_PIN_CSPI1_SCLK__SCLK	IOMUX_MODE(MX31_PIN_CSPI1_SCLK, IOMUX_CONFIG_FUNC)</div><div class='add'>+#define MX31_PIN_CSPI1_SPI_RDY__SPI_RDY	IOMUX_MODE(MX31_PIN_CSPI1_SPI_RDY, IOMUX_CONFIG_FUNC)</div><div class='add'>+#define MX31_PIN_CSPI1_SS0__SS0		IOMUX_MODE(MX31_PIN_CSPI1_SS0, IOMUX_CONFIG_FUNC)</div><div class='add'>+#define MX31_PIN_CSPI1_SS1__SS1		IOMUX_MODE(MX31_PIN_CSPI1_SS1, IOMUX_CONFIG_FUNC)</div><div class='add'>+#define MX31_PIN_CSPI1_SS2__SS2		IOMUX_MODE(MX31_PIN_CSPI1_SS2, IOMUX_CONFIG_FUNC)</div><div class='add'>+#define MX31_PIN_CSPI2_MOSI__MOSI	IOMUX_MODE(MX31_PIN_CSPI2_MOSI, IOMUX_CONFIG_FUNC)</div><div class='add'>+#define MX31_PIN_CSPI2_MISO__MISO	IOMUX_MODE(MX31_PIN_CSPI2_MISO, IOMUX_CONFIG_FUNC)</div><div class='add'>+#define MX31_PIN_CSPI2_SCLK__SCLK	IOMUX_MODE(MX31_PIN_CSPI2_SCLK, IOMUX_CONFIG_FUNC)</div><div class='add'>+#define MX31_PIN_CSPI2_SPI_RDY__SPI_RDY	IOMUX_MODE(MX31_PIN_CSPI2_SPI_RDY, IOMUX_CONFIG_FUNC)</div><div class='add'>+#define MX31_PIN_CSPI2_SS0__SS0		IOMUX_MODE(MX31_PIN_CSPI2_SS0, IOMUX_CONFIG_FUNC)</div><div class='add'>+#define MX31_PIN_CSPI2_SS1__SS1		IOMUX_MODE(MX31_PIN_CSPI2_SS1, IOMUX_CONFIG_FUNC)</div><div class='add'>+#define MX31_PIN_CSPI2_SS2__SS2		IOMUX_MODE(MX31_PIN_CSPI2_SS2, IOMUX_CONFIG_FUNC)</div><div class='add'>+#define MX31_PIN_CSPI3_MOSI__MOSI	IOMUX_MODE(MX31_PIN_CSPI3_MOSI, IOMUX_CONFIG_FUNC)</div><div class='add'>+#define MX31_PIN_CSPI3_MISO__MISO	IOMUX_MODE(MX31_PIN_CSPI3_MISO, IOMUX_CONFIG_FUNC)</div><div class='add'>+#define MX31_PIN_CSPI3_SCLK__SCLK	IOMUX_MODE(MX31_PIN_CSPI3_SCLK, IOMUX_CONFIG_FUNC)</div><div class='add'>+#define MX31_PIN_CSPI3_SPI_RDY__SPI_RDY	IOMUX_MODE(MX31_PIN_CSPI3_SPI_RDY, IOMUX_CONFIG_FUNC)</div><div class='add'>+/*XXX: The SS0, SS1, SS2, SS3 lines of spi3 are multiplexed by cspi2_ss0, cspi2_ss1, cspi1_ss0</div><div class='add'>+ * cspi1_ss1*/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * This function configures the pad value for a IOMUX pin.</div><div class='head'>diff --git a/arch/arm/plat-mxc/include/mach/irqs.h b/arch/arm/plat-mxc/include/mach/irqs.h<br/>index 228c4f68ccdf..b55bba35e18a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-mxc/include/mach/irqs.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-mxc/include/mach/irqs.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-mxc/include/mach/irqs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-mxc/include/mach/irqs.h</a></div><div class='hunk'>@@ -12,5 +12,6 @@</div><div class='ctx'> #define __ASM_ARCH_MXC_IRQS_H__</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='add'>+extern void imx_irq_set_priority(unsigned char irq, unsigned char prio);</div><div class='ctx'> </div><div class='ctx'> #endif /* __ASM_ARCH_MXC_IRQS_H__ */</div><div class='head'>diff --git a/arch/arm/plat-mxc/include/mach/mx27.h b/arch/arm/plat-mxc/include/mach/mx27.h<br/>index 212ecc246626..a86db64744a1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-mxc/include/mach/mx27.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-mxc/include/mach/mx27.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-mxc/include/mach/mx27.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-mxc/include/mach/mx27.h</a></div><div class='hunk'>@@ -128,6 +128,7 @@</div><div class='ctx'>  * it returns 0xDEADBEEF</div><div class='ctx'>  */</div><div class='ctx'> #define IO_ADDRESS(x)   \</div><div class='add'>+	(void __iomem *) \</div><div class='ctx'> 	(((x &gt;= AIPI_BASE_ADDR) &amp;&amp; (x &lt; (AIPI_BASE_ADDR + AIPI_SIZE))) ? \</div><div class='ctx'> 		AIPI_IO_ADDRESS(x) : \</div><div class='ctx'> 	((x &gt;= SAHB1_BASE_ADDR) &amp;&amp; (x &lt; (SAHB1_BASE_ADDR + SAHB1_SIZE))) ? \</div><div class='head'>diff --git a/arch/arm/plat-mxc/include/mach/mx31.h b/arch/arm/plat-mxc/include/mach/mx31.h<br/>index a7373e4a56cb..0536f8917bc0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-mxc/include/mach/mx31.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-mxc/include/mach/mx31.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-mxc/include/mach/mx31.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-mxc/include/mach/mx31.h</a></div><div class='hunk'>@@ -198,6 +198,7 @@</div><div class='ctx'>  * it returns 0xDEADBEEF</div><div class='ctx'>  */</div><div class='ctx'> #define IO_ADDRESS(x)   \</div><div class='add'>+	(void __iomem *) \</div><div class='ctx'> 	(((x &gt;= IRAM_BASE_ADDR) &amp;&amp; (x &lt; (IRAM_BASE_ADDR + IRAM_SIZE))) ? IRAM_IO_ADDRESS(x):\</div><div class='ctx'> 	((x &gt;= L2CC_BASE_ADDR) &amp;&amp; (x &lt; (L2CC_BASE_ADDR + L2CC_SIZE))) ? L2CC_IO_ADDRESS(x):\</div><div class='ctx'> 	((x &gt;= AIPS1_BASE_ADDR) &amp;&amp; (x &lt; (AIPS1_BASE_ADDR + AIPS1_SIZE))) ? AIPS1_IO_ADDRESS(x):\</div><div class='head'>diff --git a/arch/arm/plat-mxc/include/mach/mxc.h b/arch/arm/plat-mxc/include/mach/mxc.h<br/>index 332eda4dbd3b..f6caab062131 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-mxc/include/mach/mxc.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-mxc/include/mach/mxc.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-mxc/include/mach/mxc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-mxc/include/mach/mxc.h</a></div><div class='hunk'>@@ -33,4 +33,10 @@</div><div class='ctx'> # define cpu_is_mx27() (0)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_ARCH_MX3) || defined(CONFIG_ARCH_MX2)</div><div class='add'>+#define CSCR_U(n) (IO_ADDRESS(WEIM_BASE_ADDR) + n * 0x10)</div><div class='add'>+#define CSCR_L(n) (IO_ADDRESS(WEIM_BASE_ADDR) + n * 0x10 + 0x4)</div><div class='add'>+#define CSCR_A(n) (IO_ADDRESS(WEIM_BASE_ADDR) + n * 0x10 + 0x8)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #endif /*  __ASM_ARCH_MXC_H__ */</div><div class='head'>diff --git a/arch/arm/plat-mxc/irq.c b/arch/arm/plat-mxc/irq.c<br/>index 1053b666c676..d862c9e5f8db 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-mxc/irq.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-mxc/irq.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-mxc/irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-mxc/irq.c</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;mach/common.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define AVIC_BASE		IO_ADDRESS(AVIC_BASE_ADDR)</div><div class='hunk'>@@ -30,14 +30,7 @@</div><div class='ctx'> #define AVIC_INTENABLEL		(AVIC_BASE + 0x14)	/* int enable reg low */</div><div class='ctx'> #define AVIC_INTTYPEH		(AVIC_BASE + 0x18)	/* int type reg high */</div><div class='ctx'> #define AVIC_INTTYPEL		(AVIC_BASE + 0x1C)	/* int type reg low */</div><div class='del'>-#define AVIC_NIPRIORITY7	(AVIC_BASE + 0x20)	/* norm int priority lvl7 */</div><div class='del'>-#define AVIC_NIPRIORITY6	(AVIC_BASE + 0x24)	/* norm int priority lvl6 */</div><div class='del'>-#define AVIC_NIPRIORITY5	(AVIC_BASE + 0x28)	/* norm int priority lvl5 */</div><div class='del'>-#define AVIC_NIPRIORITY4	(AVIC_BASE + 0x2C)	/* norm int priority lvl4 */</div><div class='del'>-#define AVIC_NIPRIORITY3	(AVIC_BASE + 0x30)	/* norm int priority lvl3 */</div><div class='del'>-#define AVIC_NIPRIORITY2	(AVIC_BASE + 0x34)	/* norm int priority lvl2 */</div><div class='del'>-#define AVIC_NIPRIORITY1	(AVIC_BASE + 0x38)	/* norm int priority lvl1 */</div><div class='del'>-#define AVIC_NIPRIORITY0	(AVIC_BASE + 0x3C)	/* norm int priority lvl0 */</div><div class='add'>+#define AVIC_NIPRIORITY(x)	(AVIC_BASE + (0x20 + 4 * (7 - (x)))) /* int priority */</div><div class='ctx'> #define AVIC_NIVECSR		(AVIC_BASE + 0x40)	/* norm int vector/status */</div><div class='ctx'> #define AVIC_FIVECSR		(AVIC_BASE + 0x44)	/* fast int vector/status */</div><div class='ctx'> #define AVIC_INTSRCH		(AVIC_BASE + 0x48)	/* int source reg high */</div><div class='hunk'>@@ -54,6 +47,24 @@</div><div class='ctx'> #define IIM_PROD_REV_SH		3</div><div class='ctx'> #define IIM_PROD_REV_LEN	5</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_MXC_IRQ_PRIOR</div><div class='add'>+void imx_irq_set_priority(unsigned char irq, unsigned char prio)</div><div class='add'>+{</div><div class='add'>+	unsigned int temp;</div><div class='add'>+	unsigned int mask = 0x0F &lt;&lt; irq % 8 * 4;</div><div class='add'>+</div><div class='add'>+	if (irq &gt; 63)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	temp = __raw_readl(AVIC_NIPRIORITY(irq / 8));</div><div class='add'>+	temp &amp;= ~mask;</div><div class='add'>+	temp |= prio &amp; mask;</div><div class='add'>+</div><div class='add'>+	__raw_writel(temp, AVIC_NIPRIORITY(irq / 8));</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(imx_irq_set_priority);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /* Disable interrupt number "irq" in the AVIC */</div><div class='ctx'> static void mxc_mask_irq(unsigned int irq)</div><div class='ctx'> {</div><div class='hunk'>@@ -101,10 +112,9 @@ void __init mxc_init_irq(void)</div><div class='ctx'> 		set_irq_flags(i, IRQF_VALID);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Set WDOG2's interrupt the highest priority level (bit 28-31) */</div><div class='del'>-	reg = __raw_readl(AVIC_NIPRIORITY6);</div><div class='del'>-	reg |= (0xF &lt;&lt; 28);</div><div class='del'>-	__raw_writel(reg, AVIC_NIPRIORITY6);</div><div class='add'>+	/* Set default priority value (0) for all IRQ's */</div><div class='add'>+	for (i = 0; i &lt; 8; i++)</div><div class='add'>+		__raw_writel(0, AVIC_NIPRIORITY(i));</div><div class='ctx'> </div><div class='ctx'> 	/* init architectures chained interrupt handler */</div><div class='ctx'> 	mxc_register_gpios();</div><div class='head'>diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig<br/>index b917206ee906..a94f0c44ebc8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-omap/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/Kconfig</a></div><div class='hunk'>@@ -15,6 +15,9 @@ config ARCH_OMAP1</div><div class='ctx'> config ARCH_OMAP2</div><div class='ctx'> 	bool "TI OMAP2"</div><div class='ctx'> </div><div class='add'>+config ARCH_OMAP3</div><div class='add'>+	bool "TI OMAP3"</div><div class='add'>+</div><div class='ctx'> endchoice</div><div class='ctx'> </div><div class='ctx'> comment "OMAP Feature Selections"</div><div class='hunk'>@@ -29,6 +32,30 @@ config OMAP_DEBUG_LEDS</div><div class='ctx'> 	depends on OMAP_DEBUG_DEVICES</div><div class='ctx'> 	default y if LEDS || LEDS_OMAP_DEBUG</div><div class='ctx'> </div><div class='add'>+config OMAP_DEBUG_POWERDOMAIN</div><div class='add'>+	bool "Emit debug messages from powerdomain layer"</div><div class='add'>+	depends on ARCH_OMAP2 || ARCH_OMAP3</div><div class='add'>+	default n</div><div class='add'>+	help</div><div class='add'>+	  Say Y here if you want to compile in powerdomain layer</div><div class='add'>+	  debugging messages for OMAP2/3.   These messages can</div><div class='add'>+	  provide more detail as to why some powerdomain calls</div><div class='add'>+	  may be failing, and will also emit a descriptive message</div><div class='add'>+	  for every powerdomain register write.  However, the</div><div class='add'>+	  extra detail costs some memory.</div><div class='add'>+</div><div class='add'>+config OMAP_DEBUG_CLOCKDOMAIN</div><div class='add'>+	bool "Emit debug messages from clockdomain layer"</div><div class='add'>+	depends on ARCH_OMAP2 || ARCH_OMAP3</div><div class='add'>+	default n</div><div class='add'>+	help</div><div class='add'>+	  Say Y here if you want to compile in clockdomain layer</div><div class='add'>+	  debugging messages for OMAP2/3.   These messages can</div><div class='add'>+	  provide more detail as to why some clockdomain calls</div><div class='add'>+	  may be failing, and will also emit a descriptive message</div><div class='add'>+	  for every clockdomain register write.  However, the</div><div class='add'>+	  extra detail costs some memory.</div><div class='add'>+</div><div class='ctx'> config OMAP_RESET_CLOCKS</div><div class='ctx'> 	bool "Reset unused clocks during boot"</div><div class='ctx'> 	depends on ARCH_OMAP</div><div class='hunk'>@@ -88,13 +115,13 @@ config OMAP_MPU_TIMER</div><div class='ctx'> </div><div class='ctx'> config OMAP_32K_TIMER</div><div class='ctx'> 	bool "Use 32KHz timer"</div><div class='del'>-	depends on ARCH_OMAP16XX || ARCH_OMAP24XX</div><div class='add'>+	depends on ARCH_OMAP16XX || ARCH_OMAP24XX || ARCH_OMAP34XX</div><div class='ctx'> 	help</div><div class='ctx'> 	  Select this option if you want to enable the OMAP 32KHz timer.</div><div class='ctx'> 	  This timer saves power compared to the OMAP_MPU_TIMER, and has</div><div class='ctx'> 	  support for no tick during idle. The 32KHz timer provides less</div><div class='ctx'> 	  intra-tick resolution than OMAP_MPU_TIMER. The 32KHz timer is</div><div class='del'>-	  currently only available for OMAP16XX and 24XX.</div><div class='add'>+	  currently only available for OMAP16XX, 24XX and 34XX.</div><div class='ctx'> </div><div class='ctx'> endchoice</div><div class='ctx'> </div><div class='hunk'>@@ -109,7 +136,7 @@ config OMAP_32K_TIMER_HZ</div><div class='ctx'> </div><div class='ctx'> config OMAP_DM_TIMER</div><div class='ctx'> 	bool "Use dual-mode timer"</div><div class='del'>-	depends on ARCH_OMAP16XX || ARCH_OMAP24XX</div><div class='add'>+	depends on ARCH_OMAP16XX || ARCH_OMAP24XX || ARCH_OMAP34XX</div><div class='ctx'> 	help</div><div class='ctx'> 	 Select this option if you want to use OMAP Dual-Mode timers.</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/plat-omap/Makefile b/arch/arm/plat-omap/Makefile<br/>index 2c4051cc79a1..deaff58878a2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-omap/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/Makefile</a></div><div class='hunk'>@@ -4,7 +4,7 @@</div><div class='ctx'> </div><div class='ctx'> # Common support</div><div class='ctx'> obj-y := common.o sram.o clock.o devices.o dma.o mux.o gpio.o \</div><div class='del'>-	 usb.o fb.o</div><div class='add'>+	 usb.o fb.o io.o</div><div class='ctx'> obj-m :=</div><div class='ctx'> obj-n :=</div><div class='ctx'> obj-  :=</div><div class='head'>diff --git a/arch/arm/plat-omap/clock.c b/arch/arm/plat-omap/clock.c<br/>index 197974defbe4..bf6a10c5fc4f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/clock.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-omap/clock.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/clock.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/clock.c</a></div><div class='hunk'>@@ -22,8 +22,7 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/cpufreq.h&gt;</div><div class='ctx'> #include &lt;linux/debugfs.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/clock.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c<br/>index f4dff423ae7c..0843b8882f93 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/common.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-omap/common.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/common.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/common.c</a></div><div class='hunk'>@@ -18,12 +18,12 @@</div><div class='ctx'> #include &lt;linux/serial_8250.h&gt;</div><div class='ctx'> #include &lt;linux/serial_reg.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/common.h&gt;</div><div class='hunk'>@@ -248,6 +248,7 @@ static struct omap_globals *omap2_globals;</div><div class='ctx'> </div><div class='ctx'> static void __init __omap2_set_globals(void)</div><div class='ctx'> {</div><div class='add'>+	omap2_set_globals_tap(omap2_globals);</div><div class='ctx'> 	omap2_set_globals_memory(omap2_globals);</div><div class='ctx'> 	omap2_set_globals_control(omap2_globals);</div><div class='ctx'> 	omap2_set_globals_prcm(omap2_globals);</div><div class='hunk'>@@ -258,12 +259,13 @@ static void __init __omap2_set_globals(void)</div><div class='ctx'> #if defined(CONFIG_ARCH_OMAP2420)</div><div class='ctx'> </div><div class='ctx'> static struct omap_globals omap242x_globals = {</div><div class='del'>-	.tap	= (__force void __iomem *)OMAP2_IO_ADDRESS(0x48014000),</div><div class='del'>-	.sdrc	= (__force void __iomem *)OMAP2_IO_ADDRESS(OMAP2420_SDRC_BASE),</div><div class='del'>-	.sms	= (__force void __iomem *)OMAP2_IO_ADDRESS(OMAP2420_SMS_BASE),</div><div class='del'>-	.ctrl	= (__force void __iomem *)OMAP2_IO_ADDRESS(OMAP2420_CTRL_BASE),</div><div class='del'>-	.prm	= (__force void __iomem *)OMAP2_IO_ADDRESS(OMAP2420_PRM_BASE),</div><div class='del'>-	.cm	= (__force void __iomem *)OMAP2_IO_ADDRESS(OMAP2420_CM_BASE),</div><div class='add'>+	.class	= OMAP242X_CLASS,</div><div class='add'>+	.tap	= OMAP2_IO_ADDRESS(0x48014000),</div><div class='add'>+	.sdrc	= OMAP2_IO_ADDRESS(OMAP2420_SDRC_BASE),</div><div class='add'>+	.sms	= OMAP2_IO_ADDRESS(OMAP2420_SMS_BASE),</div><div class='add'>+	.ctrl	= OMAP2_IO_ADDRESS(OMAP2420_CTRL_BASE),</div><div class='add'>+	.prm	= OMAP2_IO_ADDRESS(OMAP2420_PRM_BASE),</div><div class='add'>+	.cm	= OMAP2_IO_ADDRESS(OMAP2420_CM_BASE),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void __init omap2_set_globals_242x(void)</div><div class='hunk'>@@ -276,12 +278,13 @@ void __init omap2_set_globals_242x(void)</div><div class='ctx'> #if defined(CONFIG_ARCH_OMAP2430)</div><div class='ctx'> </div><div class='ctx'> static struct omap_globals omap243x_globals = {</div><div class='del'>-	.tap	= (__force void __iomem *)OMAP2_IO_ADDRESS(0x4900a000),</div><div class='del'>-	.sdrc	= (__force void __iomem *)OMAP2_IO_ADDRESS(OMAP243X_SDRC_BASE),</div><div class='del'>-	.sms	= (__force void __iomem *)OMAP2_IO_ADDRESS(OMAP243X_SMS_BASE),</div><div class='del'>-	.ctrl	= (__force void __iomem *)OMAP2_IO_ADDRESS(OMAP243X_CTRL_BASE),</div><div class='del'>-	.prm	= (__force void __iomem *)OMAP2_IO_ADDRESS(OMAP2430_PRM_BASE),</div><div class='del'>-	.cm	= (__force void __iomem *)OMAP2_IO_ADDRESS(OMAP2430_CM_BASE),</div><div class='add'>+	.class	= OMAP243X_CLASS,</div><div class='add'>+	.tap	= OMAP2_IO_ADDRESS(0x4900a000),</div><div class='add'>+	.sdrc	= OMAP2_IO_ADDRESS(OMAP243X_SDRC_BASE),</div><div class='add'>+	.sms	= OMAP2_IO_ADDRESS(OMAP243X_SMS_BASE),</div><div class='add'>+	.ctrl	= OMAP2_IO_ADDRESS(OMAP243X_CTRL_BASE),</div><div class='add'>+	.prm	= OMAP2_IO_ADDRESS(OMAP2430_PRM_BASE),</div><div class='add'>+	.cm	= OMAP2_IO_ADDRESS(OMAP2430_CM_BASE),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void __init omap2_set_globals_243x(void)</div><div class='hunk'>@@ -294,12 +297,13 @@ void __init omap2_set_globals_243x(void)</div><div class='ctx'> #if defined(CONFIG_ARCH_OMAP3430)</div><div class='ctx'> </div><div class='ctx'> static struct omap_globals omap343x_globals = {</div><div class='del'>-	.tap	= (__force void __iomem *)OMAP2_IO_ADDRESS(0x4830A000),</div><div class='del'>-	.sdrc	= (__force void __iomem *)OMAP2_IO_ADDRESS(OMAP343X_SDRC_BASE),</div><div class='del'>-	.sms	= (__force void __iomem *)OMAP2_IO_ADDRESS(OMAP343X_SMS_BASE),</div><div class='del'>-	.ctrl	= (__force void __iomem *)OMAP2_IO_ADDRESS(OMAP343X_CTRL_BASE),</div><div class='del'>-	.prm	= (__force void __iomem *)OMAP2_IO_ADDRESS(OMAP3430_PRM_BASE),</div><div class='del'>-	.cm	= (__force void __iomem *)OMAP2_IO_ADDRESS(OMAP3430_CM_BASE),</div><div class='add'>+	.class	= OMAP343X_CLASS,</div><div class='add'>+	.tap	= OMAP2_IO_ADDRESS(0x4830A000),</div><div class='add'>+	.sdrc	= OMAP2_IO_ADDRESS(OMAP343X_SDRC_BASE),</div><div class='add'>+	.sms	= OMAP2_IO_ADDRESS(OMAP343X_SMS_BASE),</div><div class='add'>+	.ctrl	= OMAP2_IO_ADDRESS(OMAP343X_CTRL_BASE),</div><div class='add'>+	.prm	= OMAP2_IO_ADDRESS(OMAP3430_PRM_BASE),</div><div class='add'>+	.cm	= OMAP2_IO_ADDRESS(OMAP3430_CM_BASE),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void __init omap2_set_globals_343x(void)</div><div class='head'>diff --git a/arch/arm/plat-omap/cpu-omap.c b/arch/arm/plat-omap/cpu-omap.c<br/>index ae1de308aaad..b2690242a390 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/cpu-omap.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-omap/cpu-omap.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/cpu-omap.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/cpu-omap.c</a></div><div class='hunk'>@@ -20,9 +20,9 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define VERY_HI_RATE	900000000</div><div class='head'>diff --git a/arch/arm/plat-omap/debug-devices.c b/arch/arm/plat-omap/debug-devices.c<br/>index 5b73bb274452..e31154b15d9e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/debug-devices.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-omap/debug-devices.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/debug-devices.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/debug-devices.c</a></div><div class='hunk'>@@ -12,9 +12,9 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/board.h&gt;</div><div class='ctx'> #include &lt;mach/gpio.h&gt;</div><div class='head'>diff --git a/arch/arm/plat-omap/debug-leds.c b/arch/arm/plat-omap/debug-leds.c<br/>index 9422dee7de84..2f4c0cabfd34 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/debug-leds.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-omap/debug-leds.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/debug-leds.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/debug-leds.c</a></div><div class='hunk'>@@ -11,8 +11,8 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/leds.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/leds.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='head'>diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c<br/>index 01da719a7453..0cb2b22388e9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/devices.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-omap/devices.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/devices.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/devices.c</a></div><div class='hunk'>@@ -13,24 +13,24 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/tc.h&gt;</div><div class='add'>+#include &lt;mach/control.h&gt;</div><div class='ctx'> #include &lt;mach/board.h&gt;</div><div class='ctx'> #include &lt;mach/mmc.h&gt;</div><div class='ctx'> #include &lt;mach/mux.h&gt;</div><div class='ctx'> #include &lt;mach/gpio.h&gt;</div><div class='ctx'> #include &lt;mach/menelaus.h&gt;</div><div class='ctx'> #include &lt;mach/mcbsp.h&gt;</div><div class='add'>+#include &lt;mach/dsp_common.h&gt;</div><div class='ctx'> </div><div class='ctx'> #if	defined(CONFIG_OMAP_DSP) || defined(CONFIG_OMAP_DSP_MODULE)</div><div class='ctx'> </div><div class='del'>-#include "../plat-omap/dsp/dsp_common.h"</div><div class='del'>-</div><div class='ctx'> static struct dsp_platform_data dsp_pdata = {</div><div class='ctx'> 	.kdev_list = LIST_HEAD_INIT(dsp_pdata.kdev_list),</div><div class='ctx'> };</div><div class='hunk'>@@ -76,7 +76,7 @@ int dsp_kfunc_device_register(struct dsp_kfunc_device *kdev)</div><div class='ctx'> {</div><div class='ctx'> 	static DEFINE_MUTEX(dsp_pdata_lock);</div><div class='ctx'> </div><div class='del'>-	mutex_init(&amp;kdev-&gt;lock);</div><div class='add'>+	spin_lock_init(&amp;kdev-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;dsp_pdata_lock);</div><div class='ctx'> 	list_add_tail(&amp;kdev-&gt;entry, &amp;dsp_pdata.kdev_list);</div><div class='hunk'>@@ -95,6 +95,10 @@ static inline void omap_init_dsp(void) { }</div><div class='ctx'> </div><div class='ctx'> static void omap_init_kp(void)</div><div class='ctx'> {</div><div class='add'>+	/* 2430 and 34xx keypad is on TWL4030 */</div><div class='add'>+	if (cpu_is_omap2430() || cpu_is_omap34xx())</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	if (machine_is_omap_h2() || machine_is_omap_h3()) {</div><div class='ctx'> 		omap_cfg_reg(F18_1610_KBC0);</div><div class='ctx'> 		omap_cfg_reg(D20_1610_KBC1);</div><div class='hunk'>@@ -156,13 +160,6 @@ void omap_mcbsp_register_board_cfg(struct omap_mcbsp_platform_data *config,</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	if (size &gt; OMAP_MAX_MCBSP_COUNT) {</div><div class='del'>-		printk(KERN_WARNING "Registered too many McBSPs platform_data."</div><div class='del'>-			" Using maximum (%d) available.\n",</div><div class='del'>-			OMAP_MAX_MCBSP_COUNT);</div><div class='del'>-		size = OMAP_MAX_MCBSP_COUNT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	omap_mcbsp_devices = kzalloc(size * sizeof(struct platform_device *),</div><div class='ctx'> 				     GFP_KERNEL);</div><div class='ctx'> 	if (!omap_mcbsp_devices) {</div><div class='hunk'>@@ -441,16 +438,8 @@ static inline void omap_init_uwire(void) {}</div><div class='ctx'> </div><div class='ctx'> #if	defined(CONFIG_OMAP_WATCHDOG) || defined(CONFIG_OMAP_WATCHDOG_MODULE)</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_ARCH_OMAP24XX</div><div class='del'>-#define	OMAP_WDT_BASE		0x48022000</div><div class='del'>-#else</div><div class='del'>-#define	OMAP_WDT_BASE		0xfffeb000</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> static struct resource wdt_resources[] = {</div><div class='ctx'> 	{</div><div class='del'>-		.start		= OMAP_WDT_BASE,</div><div class='del'>-		.end		= OMAP_WDT_BASE + 0x4f,</div><div class='ctx'> 		.flags		= IORESOURCE_MEM,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='hunk'>@@ -464,6 +453,19 @@ static struct platform_device omap_wdt_device = {</div><div class='ctx'> </div><div class='ctx'> static void omap_init_wdt(void)</div><div class='ctx'> {</div><div class='add'>+	if (cpu_is_omap16xx())</div><div class='add'>+		wdt_resources[0].start = 0xfffeb000;</div><div class='add'>+	else if (cpu_is_omap2420())</div><div class='add'>+		wdt_resources[0].start = 0x48022000; /* WDT2 */</div><div class='add'>+	else if (cpu_is_omap2430())</div><div class='add'>+		wdt_resources[0].start = 0x49016000; /* WDT2 */</div><div class='add'>+	else if (cpu_is_omap343x())</div><div class='add'>+		wdt_resources[0].start = 0x48314000; /* WDT2 */</div><div class='add'>+	else</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	wdt_resources[0].end = wdt_resources[0].start + 0x4f;</div><div class='add'>+</div><div class='ctx'> 	(void) platform_device_register(&amp;omap_wdt_device);</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='hunk'>@@ -525,10 +527,6 @@ static inline void omap_init_rng(void) {}</div><div class='ctx'>  */</div><div class='ctx'> static int __init omap_init_devices(void)</div><div class='ctx'> {</div><div class='del'>-/*</div><div class='del'>- * Need to enable relevant once for 2430 SDP</div><div class='del'>- */</div><div class='del'>-#ifndef CONFIG_MACH_OMAP_2430SDP</div><div class='ctx'> 	/* please keep these calls, and their implementations above,</div><div class='ctx'> 	 * in alphabetical order so they're easier to sort through.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -538,7 +536,6 @@ static int __init omap_init_devices(void)</div><div class='ctx'> 	omap_init_uwire();</div><div class='ctx'> 	omap_init_wdt();</div><div class='ctx'> 	omap_init_rng();</div><div class='del'>-#endif</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> arch_initcall(omap_init_devices);</div><div class='head'>diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c<br/>index a63b644ad305..50f8b4ad9a09 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/dma.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-omap/dma.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/dma.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/dma.c</a></div><div class='hunk'>@@ -1233,7 +1233,7 @@ int omap_request_dma_chain(int dev_id, const char *dev_name,</div><div class='ctx'> 	/* request and reserve DMA channels for the chain */</div><div class='ctx'> 	for (i = 0; i &lt; no_of_chans; i++) {</div><div class='ctx'> 		err = omap_request_dma(dev_id, dev_name,</div><div class='del'>-					callback, 0, &amp;channels[i]);</div><div class='add'>+					callback, NULL, &amp;channels[i]);</div><div class='ctx'> 		if (err &lt; 0) {</div><div class='ctx'> 			int j;</div><div class='ctx'> 			for (j = 0; j &lt; i; j++)</div><div class='hunk'>@@ -2297,13 +2297,13 @@ static int __init omap_init_dma(void)</div><div class='ctx'> 	int ch, r;</div><div class='ctx'> </div><div class='ctx'> 	if (cpu_class_is_omap1()) {</div><div class='del'>-		omap_dma_base = (void __iomem *)IO_ADDRESS(OMAP1_DMA_BASE);</div><div class='add'>+		omap_dma_base = IO_ADDRESS(OMAP1_DMA_BASE);</div><div class='ctx'> 		dma_lch_count = OMAP1_LOGICAL_DMA_CH_COUNT;</div><div class='ctx'> 	} else if (cpu_is_omap24xx()) {</div><div class='del'>-		omap_dma_base = (void __iomem *)IO_ADDRESS(OMAP24XX_DMA4_BASE);</div><div class='add'>+		omap_dma_base = IO_ADDRESS(OMAP24XX_DMA4_BASE);</div><div class='ctx'> 		dma_lch_count = OMAP_DMA4_LOGICAL_DMA_CH_COUNT;</div><div class='ctx'> 	} else if (cpu_is_omap34xx()) {</div><div class='del'>-		omap_dma_base = (void __iomem *)IO_ADDRESS(OMAP34XX_DMA4_BASE);</div><div class='add'>+		omap_dma_base = IO_ADDRESS(OMAP34XX_DMA4_BASE);</div><div class='ctx'> 		dma_lch_count = OMAP_DMA4_LOGICAL_DMA_CH_COUNT;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		pr_err("DMA init failed for unsupported omap\n");</div><div class='head'>diff --git a/arch/arm/plat-omap/dmtimer.c b/arch/arm/plat-omap/dmtimer.c<br/>index 743a4abcd85d..963c31cd1541 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/dmtimer.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-omap/dmtimer.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/dmtimer.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/dmtimer.c</a></div><div class='hunk'>@@ -32,9 +32,9 @@</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;mach/dmtimer.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;mach/irqs.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* register offsets */</div><div class='hunk'>@@ -693,7 +693,7 @@ int __init omap_dm_timer_init(void)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; dm_timer_count; i++) {</div><div class='ctx'> 		timer = &amp;dm_timers[i];</div><div class='del'>-		timer-&gt;io_base = (void __iomem *)io_p2v(timer-&gt;phys_base);</div><div class='add'>+		timer-&gt;io_base = IO_ADDRESS(timer-&gt;phys_base);</div><div class='ctx'> #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)</div><div class='ctx'> 		if (cpu_class_is_omap2()) {</div><div class='ctx'> 			char clk_name[16];</div><div class='head'>diff --git a/arch/arm/plat-omap/fb.c b/arch/arm/plat-omap/fb.c<br/>index 17a92a31e746..ce6b4baeedec 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/fb.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-omap/fb.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/fb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/fb.c</a></div><div class='hunk'>@@ -27,9 +27,9 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/board.h&gt;</div><div class='head'>diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c<br/>index 9e1341ebc14e..8679fbca6bbe 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/gpio.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-omap/gpio.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/gpio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/gpio.c</a></div><div class='hunk'>@@ -17,6 +17,7 @@</div><div class='ctx'> #include &lt;linux/sysdev.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='hunk'>@@ -24,12 +25,10 @@</div><div class='ctx'> #include &lt;mach/gpio.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * OMAP1510 GPIO registers</div><div class='ctx'>  */</div><div class='del'>-#define OMAP1510_GPIO_BASE		(void __iomem *)0xfffce000</div><div class='add'>+#define OMAP1510_GPIO_BASE		IO_ADDRESS(0xfffce000)</div><div class='ctx'> #define OMAP1510_GPIO_DATA_INPUT	0x00</div><div class='ctx'> #define OMAP1510_GPIO_DATA_OUTPUT	0x04</div><div class='ctx'> #define OMAP1510_GPIO_DIR_CONTROL	0x08</div><div class='hunk'>@@ -43,10 +42,10 @@</div><div class='ctx'> /*</div><div class='ctx'>  * OMAP1610 specific GPIO registers</div><div class='ctx'>  */</div><div class='del'>-#define OMAP1610_GPIO1_BASE		(void __iomem *)0xfffbe400</div><div class='del'>-#define OMAP1610_GPIO2_BASE		(void __iomem *)0xfffbec00</div><div class='del'>-#define OMAP1610_GPIO3_BASE		(void __iomem *)0xfffbb400</div><div class='del'>-#define OMAP1610_GPIO4_BASE		(void __iomem *)0xfffbbc00</div><div class='add'>+#define OMAP1610_GPIO1_BASE		IO_ADDRESS(0xfffbe400)</div><div class='add'>+#define OMAP1610_GPIO2_BASE		IO_ADDRESS(0xfffbec00)</div><div class='add'>+#define OMAP1610_GPIO3_BASE		IO_ADDRESS(0xfffbb400)</div><div class='add'>+#define OMAP1610_GPIO4_BASE		IO_ADDRESS(0xfffbbc00)</div><div class='ctx'> #define OMAP1610_GPIO_REVISION		0x0000</div><div class='ctx'> #define OMAP1610_GPIO_SYSCONFIG		0x0010</div><div class='ctx'> #define OMAP1610_GPIO_SYSSTATUS		0x0014</div><div class='hunk'>@@ -68,12 +67,12 @@</div><div class='ctx'> /*</div><div class='ctx'>  * OMAP730 specific GPIO registers</div><div class='ctx'>  */</div><div class='del'>-#define OMAP730_GPIO1_BASE		(void __iomem *)0xfffbc000</div><div class='del'>-#define OMAP730_GPIO2_BASE		(void __iomem *)0xfffbc800</div><div class='del'>-#define OMAP730_GPIO3_BASE		(void __iomem *)0xfffbd000</div><div class='del'>-#define OMAP730_GPIO4_BASE		(void __iomem *)0xfffbd800</div><div class='del'>-#define OMAP730_GPIO5_BASE		(void __iomem *)0xfffbe000</div><div class='del'>-#define OMAP730_GPIO6_BASE		(void __iomem *)0xfffbe800</div><div class='add'>+#define OMAP730_GPIO1_BASE		IO_ADDRESS(0xfffbc000)</div><div class='add'>+#define OMAP730_GPIO2_BASE		IO_ADDRESS(0xfffbc800)</div><div class='add'>+#define OMAP730_GPIO3_BASE		IO_ADDRESS(0xfffbd000)</div><div class='add'>+#define OMAP730_GPIO4_BASE		IO_ADDRESS(0xfffbd800)</div><div class='add'>+#define OMAP730_GPIO5_BASE		IO_ADDRESS(0xfffbe000)</div><div class='add'>+#define OMAP730_GPIO6_BASE		IO_ADDRESS(0xfffbe800)</div><div class='ctx'> #define OMAP730_GPIO_DATA_INPUT		0x00</div><div class='ctx'> #define OMAP730_GPIO_DATA_OUTPUT	0x04</div><div class='ctx'> #define OMAP730_GPIO_DIR_CONTROL	0x08</div><div class='hunk'>@@ -84,16 +83,16 @@</div><div class='ctx'> /*</div><div class='ctx'>  * omap24xx specific GPIO registers</div><div class='ctx'>  */</div><div class='del'>-#define OMAP242X_GPIO1_BASE		(void __iomem *)0x48018000</div><div class='del'>-#define OMAP242X_GPIO2_BASE		(void __iomem *)0x4801a000</div><div class='del'>-#define OMAP242X_GPIO3_BASE		(void __iomem *)0x4801c000</div><div class='del'>-#define OMAP242X_GPIO4_BASE		(void __iomem *)0x4801e000</div><div class='add'>+#define OMAP242X_GPIO1_BASE		IO_ADDRESS(0x48018000)</div><div class='add'>+#define OMAP242X_GPIO2_BASE		IO_ADDRESS(0x4801a000)</div><div class='add'>+#define OMAP242X_GPIO3_BASE		IO_ADDRESS(0x4801c000)</div><div class='add'>+#define OMAP242X_GPIO4_BASE		IO_ADDRESS(0x4801e000)</div><div class='ctx'> </div><div class='del'>-#define OMAP243X_GPIO1_BASE		(void __iomem *)0x4900C000</div><div class='del'>-#define OMAP243X_GPIO2_BASE		(void __iomem *)0x4900E000</div><div class='del'>-#define OMAP243X_GPIO3_BASE		(void __iomem *)0x49010000</div><div class='del'>-#define OMAP243X_GPIO4_BASE		(void __iomem *)0x49012000</div><div class='del'>-#define OMAP243X_GPIO5_BASE		(void __iomem *)0x480B6000</div><div class='add'>+#define OMAP243X_GPIO1_BASE		IO_ADDRESS(0x4900C000)</div><div class='add'>+#define OMAP243X_GPIO2_BASE		IO_ADDRESS(0x4900E000)</div><div class='add'>+#define OMAP243X_GPIO3_BASE		IO_ADDRESS(0x49010000)</div><div class='add'>+#define OMAP243X_GPIO4_BASE		IO_ADDRESS(0x49012000)</div><div class='add'>+#define OMAP243X_GPIO5_BASE		IO_ADDRESS(0x480B6000)</div><div class='ctx'> </div><div class='ctx'> #define OMAP24XX_GPIO_REVISION		0x0000</div><div class='ctx'> #define OMAP24XX_GPIO_SYSCONFIG		0x0010</div><div class='hunk'>@@ -123,13 +122,14 @@</div><div class='ctx'>  * omap34xx specific GPIO registers</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define OMAP34XX_GPIO1_BASE		(void __iomem *)0x48310000</div><div class='del'>-#define OMAP34XX_GPIO2_BASE		(void __iomem *)0x49050000</div><div class='del'>-#define OMAP34XX_GPIO3_BASE		(void __iomem *)0x49052000</div><div class='del'>-#define OMAP34XX_GPIO4_BASE		(void __iomem *)0x49054000</div><div class='del'>-#define OMAP34XX_GPIO5_BASE		(void __iomem *)0x49056000</div><div class='del'>-#define OMAP34XX_GPIO6_BASE		(void __iomem *)0x49058000</div><div class='add'>+#define OMAP34XX_GPIO1_BASE		IO_ADDRESS(0x48310000)</div><div class='add'>+#define OMAP34XX_GPIO2_BASE		IO_ADDRESS(0x49050000)</div><div class='add'>+#define OMAP34XX_GPIO3_BASE		IO_ADDRESS(0x49052000)</div><div class='add'>+#define OMAP34XX_GPIO4_BASE		IO_ADDRESS(0x49054000)</div><div class='add'>+#define OMAP34XX_GPIO5_BASE		IO_ADDRESS(0x49056000)</div><div class='add'>+#define OMAP34XX_GPIO6_BASE		IO_ADDRESS(0x49058000)</div><div class='ctx'> </div><div class='add'>+#define OMAP_MPUIO_VBASE		IO_ADDRESS(OMAP_MPUIO_BASE)</div><div class='ctx'> </div><div class='ctx'> struct gpio_bank {</div><div class='ctx'> 	void __iomem *base;</div><div class='hunk'>@@ -161,7 +161,7 @@ struct gpio_bank {</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ARCH_OMAP16XX</div><div class='ctx'> static struct gpio_bank gpio_bank_1610[5] = {</div><div class='del'>-	{ OMAP_MPUIO_BASE,     INT_MPUIO,	    IH_MPUIO_BASE,     METHOD_MPUIO},</div><div class='add'>+	{ OMAP_MPUIO_VBASE,    INT_MPUIO,	    IH_MPUIO_BASE,     METHOD_MPUIO},</div><div class='ctx'> 	{ OMAP1610_GPIO1_BASE, INT_GPIO_BANK1,	    IH_GPIO_BASE,      METHOD_GPIO_1610 },</div><div class='ctx'> 	{ OMAP1610_GPIO2_BASE, INT_1610_GPIO_BANK2, IH_GPIO_BASE + 16, METHOD_GPIO_1610 },</div><div class='ctx'> 	{ OMAP1610_GPIO3_BASE, INT_1610_GPIO_BANK3, IH_GPIO_BASE + 32, METHOD_GPIO_1610 },</div><div class='hunk'>@@ -171,14 +171,14 @@ static struct gpio_bank gpio_bank_1610[5] = {</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ARCH_OMAP15XX</div><div class='ctx'> static struct gpio_bank gpio_bank_1510[2] = {</div><div class='del'>-	{ OMAP_MPUIO_BASE,    INT_MPUIO,      IH_MPUIO_BASE, METHOD_MPUIO },</div><div class='add'>+	{ OMAP_MPUIO_VBASE,   INT_MPUIO,      IH_MPUIO_BASE, METHOD_MPUIO },</div><div class='ctx'> 	{ OMAP1510_GPIO_BASE, INT_GPIO_BANK1, IH_GPIO_BASE,  METHOD_GPIO_1510 }</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ARCH_OMAP730</div><div class='ctx'> static struct gpio_bank gpio_bank_730[7] = {</div><div class='del'>-	{ OMAP_MPUIO_BASE,     INT_730_MPUIO,	    IH_MPUIO_BASE,	METHOD_MPUIO },</div><div class='add'>+	{ OMAP_MPUIO_VBASE,    INT_730_MPUIO,	    IH_MPUIO_BASE,	METHOD_MPUIO },</div><div class='ctx'> 	{ OMAP730_GPIO1_BASE,  INT_730_GPIO_BANK1,  IH_GPIO_BASE,	METHOD_GPIO_730 },</div><div class='ctx'> 	{ OMAP730_GPIO2_BASE,  INT_730_GPIO_BANK2,  IH_GPIO_BASE + 32,	METHOD_GPIO_730 },</div><div class='ctx'> 	{ OMAP730_GPIO3_BASE,  INT_730_GPIO_BANK3,  IH_GPIO_BASE + 64,	METHOD_GPIO_730 },</div><div class='hunk'>@@ -1051,13 +1051,10 @@ static void gpio_irq_handler(unsigned int irq, struct irq_desc *desc)</div><div class='ctx'> </div><div class='ctx'> 		gpio_irq = bank-&gt;virtual_irq_start;</div><div class='ctx'> 		for (; isr != 0; isr &gt;&gt;= 1, gpio_irq++) {</div><div class='del'>-			struct irq_desc *d;</div><div class='del'>-</div><div class='ctx'> 			if (!(isr &amp; 1))</div><div class='ctx'> 				continue;</div><div class='del'>-			d = irq_desc + gpio_irq;</div><div class='ctx'> </div><div class='del'>-			desc_handle_irq(gpio_irq, d);</div><div class='add'>+			generic_handle_irq(gpio_irq);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	/* if bank has any level sensitive GPIO pin interrupt</div><div class='hunk'>@@ -1393,7 +1390,7 @@ static int __init _omap_gpio_init(void)</div><div class='ctx'> </div><div class='ctx'> 		gpio_bank_count = 5;</div><div class='ctx'> 		gpio_bank = gpio_bank_1610;</div><div class='del'>-		rev = omap_readw(gpio_bank[1].base + OMAP1610_GPIO_REVISION);</div><div class='add'>+		rev = __raw_readw(gpio_bank[1].base + OMAP1610_GPIO_REVISION);</div><div class='ctx'> 		printk(KERN_INFO "OMAP GPIO hardware version %d.%d\n",</div><div class='ctx'> 		       (rev &gt;&gt; 4) &amp; 0x0f, rev &amp; 0x0f);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1412,7 +1409,7 @@ static int __init _omap_gpio_init(void)</div><div class='ctx'> </div><div class='ctx'> 		gpio_bank_count = 4;</div><div class='ctx'> 		gpio_bank = gpio_bank_242x;</div><div class='del'>-		rev = omap_readl(gpio_bank[0].base + OMAP24XX_GPIO_REVISION);</div><div class='add'>+		rev = __raw_readl(gpio_bank[0].base + OMAP24XX_GPIO_REVISION);</div><div class='ctx'> 		printk(KERN_INFO "OMAP242x GPIO hardware version %d.%d\n",</div><div class='ctx'> 			(rev &gt;&gt; 4) &amp; 0x0f, rev &amp; 0x0f);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1421,7 +1418,7 @@ static int __init _omap_gpio_init(void)</div><div class='ctx'> </div><div class='ctx'> 		gpio_bank_count = 5;</div><div class='ctx'> 		gpio_bank = gpio_bank_243x;</div><div class='del'>-		rev = omap_readl(gpio_bank[0].base + OMAP24XX_GPIO_REVISION);</div><div class='add'>+		rev = __raw_readl(gpio_bank[0].base + OMAP24XX_GPIO_REVISION);</div><div class='ctx'> 		printk(KERN_INFO "OMAP243x GPIO hardware version %d.%d\n",</div><div class='ctx'> 			(rev &gt;&gt; 4) &amp; 0x0f, rev &amp; 0x0f);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1432,7 +1429,7 @@ static int __init _omap_gpio_init(void)</div><div class='ctx'> </div><div class='ctx'> 		gpio_bank_count = OMAP34XX_NR_GPIOS;</div><div class='ctx'> 		gpio_bank = gpio_bank_34xx;</div><div class='del'>-		rev = omap_readl(gpio_bank[0].base + OMAP24XX_GPIO_REVISION);</div><div class='add'>+		rev = __raw_readl(gpio_bank[0].base + OMAP24XX_GPIO_REVISION);</div><div class='ctx'> 		printk(KERN_INFO "OMAP34xx GPIO hardware version %d.%d\n",</div><div class='ctx'> 			(rev &gt;&gt; 4) &amp; 0x0f, rev &amp; 0x0f);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1441,10 +1438,9 @@ static int __init _omap_gpio_init(void)</div><div class='ctx'> 		int j, gpio_count = 16;</div><div class='ctx'> </div><div class='ctx'> 		bank = &amp;gpio_bank[i];</div><div class='del'>-		bank-&gt;base = IO_ADDRESS(bank-&gt;base);</div><div class='ctx'> 		spin_lock_init(&amp;bank-&gt;lock);</div><div class='ctx'> 		if (bank_is_mpuio(bank))</div><div class='del'>-			omap_writew(0xFFFF, OMAP_MPUIO_BASE + OMAP_MPUIO_GPIO_MASKIT);</div><div class='add'>+			__raw_writew(0xffff, bank-&gt;base + OMAP_MPUIO_GPIO_MASKIT);</div><div class='ctx'> 		if (cpu_is_omap15xx() &amp;&amp; bank-&gt;method == METHOD_GPIO_1510) {</div><div class='ctx'> 			__raw_writew(0xffff, bank-&gt;base + OMAP1510_GPIO_INT_MASK);</div><div class='ctx'> 			__raw_writew(0x0000, bank-&gt;base + OMAP1510_GPIO_INT_STATUS);</div><div class='head'>diff --git a/arch/arm/plat-omap/include/mach/board-2430sdp.h b/arch/arm/plat-omap/include/mach/board-2430sdp.h<br/>index cf1dc0223949..10d449ea7ed0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/include/mach/board-2430sdp.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-omap/include/mach/board-2430sdp.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/include/mach/board-2430sdp.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/include/mach/board-2430sdp.h</a></div><div class='hunk'>@@ -30,10 +30,12 @@</div><div class='ctx'> #define __ASM_ARCH_OMAP_2430SDP_H</div><div class='ctx'> </div><div class='ctx'> /* Placeholder for 2430SDP specific defines */</div><div class='del'>-#define OMAP24XX_ETHR_START		 0x08000300</div><div class='add'>+#define OMAP24XX_ETHR_START		0x08000300</div><div class='ctx'> #define OMAP24XX_ETHR_GPIO_IRQ		149</div><div class='ctx'> #define SDP2430_CS0_BASE		0x04000000</div><div class='ctx'> </div><div class='del'>-#define TWL4030_IRQNUM			INT_24XX_SYS_NIRQ</div><div class='add'>+/* Function prototypes */</div><div class='add'>+extern void sdp2430_flash_init(void);</div><div class='add'>+extern void sdp2430_usb_init(void);</div><div class='ctx'> </div><div class='ctx'> #endif /* __ASM_ARCH_OMAP_2430SDP_H */</div><div class='head'>diff --git a/arch/arm/plat-omap/include/mach/board-apollon.h b/arch/arm/plat-omap/include/mach/board-apollon.h<br/>index d6f2a8e963d5..731c858cf3fe 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/include/mach/board-apollon.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-omap/include/mach/board-apollon.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/include/mach/board-apollon.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/include/mach/board-apollon.h</a></div><div class='hunk'>@@ -31,6 +31,12 @@</div><div class='ctx'> </div><div class='ctx'> extern void apollon_mmc_init(void);</div><div class='ctx'> </div><div class='add'>+static inline int apollon_plus(void)</div><div class='add'>+{</div><div class='add'>+	/* The apollon plus has IDCODE revision 5 */</div><div class='add'>+	return system_rev &amp; 0xc0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Placeholder for APOLLON specific defines */</div><div class='ctx'> #define APOLLON_ETHR_GPIO_IRQ		74</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/plat-omap/include/mach/board-h4.h b/arch/arm/plat-omap/include/mach/board-h4.h<br/>index 1470cd3e519b..7c3fa0f0a65e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/include/mach/board-h4.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-omap/include/mach/board-h4.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/include/mach/board-h4.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/include/mach/board-h4.h</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  * arch/arm/plat-omap/include/mach/board-h4.h</div><div class='ctx'>  *</div><div class='del'>- * Hardware definitions for TI OMAP1610 H4 board.</div><div class='add'>+ * Hardware definitions for TI OMAP2420 H4 board.</div><div class='ctx'>  *</div><div class='ctx'>  * Initial creation by Dirk Behme &lt;dirk.behme@de.bosch.com&gt;</div><div class='ctx'>  *</div><div class='hunk'>@@ -29,6 +29,9 @@</div><div class='ctx'> #ifndef __ASM_ARCH_OMAP_H4_H</div><div class='ctx'> #define __ASM_ARCH_OMAP_H4_H</div><div class='ctx'> </div><div class='add'>+/* MMC Prototypes */</div><div class='add'>+extern void h4_mmc_init(void);</div><div class='add'>+</div><div class='ctx'> /* Placeholder for H4 specific defines */</div><div class='ctx'> #define OMAP24XX_ETHR_GPIO_IRQ		92</div><div class='ctx'> #endif /*  __ASM_ARCH_OMAP_H4_H */</div><div class='head'>diff --git a/arch/arm/plat-omap/include/mach/board-ldp.h b/arch/arm/plat-omap/include/mach/board-ldp.h<br/>new file mode 100644<br/>index 000000000000..66e2746c04ca<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/include/mach/board-ldp.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/include/mach/board-ldp.h</a></div><div class='hunk'>@@ -0,0 +1,36 @@</div><div class='add'>+/*</div><div class='add'>+ * arch/arm/plat-omap/include/mach/board-ldp.h</div><div class='add'>+ *</div><div class='add'>+ * Hardware definitions for TI OMAP3 LDP.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2008 Texas Instruments Inc.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms of the GNU General Public License as published by the</div><div class='add'>+ * Free Software Foundation; either version 2 of the License, or (at your</div><div class='add'>+ * option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED</div><div class='add'>+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN</div><div class='add'>+ * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,</div><div class='add'>+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT</div><div class='add'>+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF</div><div class='add'>+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON</div><div class='add'>+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF</div><div class='add'>+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License along</div><div class='add'>+ * with this program; if not, write to the Free Software Foundation, Inc.,</div><div class='add'>+ * 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __ASM_ARCH_OMAP_LDP_H</div><div class='add'>+#define __ASM_ARCH_OMAP_LDP_H</div><div class='add'>+</div><div class='add'>+extern void twl4030_bci_battery_init(void);</div><div class='add'>+</div><div class='add'>+#define TWL4030_IRQNUM		INT_34XX_SYS_NIRQ</div><div class='add'>+</div><div class='add'>+#endif /* __ASM_ARCH_OMAP_LDP_H */</div><div class='head'>diff --git a/arch/arm/plat-omap/include/mach/board-omap3beagle.h b/arch/arm/plat-omap/include/mach/board-omap3beagle.h<br/>new file mode 100644<br/>index 000000000000..3080d52d877a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/include/mach/board-omap3beagle.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/include/mach/board-omap3beagle.h</a></div><div class='hunk'>@@ -0,0 +1,33 @@</div><div class='add'>+/*</div><div class='add'>+ * arch/arm/plat-omap/include/mach/board-omap3beagle.h</div><div class='add'>+ *</div><div class='add'>+ * Hardware definitions for TI OMAP3 BEAGLE.</div><div class='add'>+ *</div><div class='add'>+ * Initial creation by Syed Mohammed Khasim &lt;khasim@ti.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms of the GNU General Public License as published by the</div><div class='add'>+ * Free Software Foundation; either version 2 of the License, or (at your</div><div class='add'>+ * option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED</div><div class='add'>+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN</div><div class='add'>+ * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,</div><div class='add'>+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT</div><div class='add'>+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF</div><div class='add'>+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON</div><div class='add'>+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF</div><div class='add'>+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License along</div><div class='add'>+ * with this program; if not, write to the Free Software Foundation, Inc.,</div><div class='add'>+ * 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __ASM_ARCH_OMAP3_BEAGLE_H</div><div class='add'>+#define __ASM_ARCH_OMAP3_BEAGLE_H</div><div class='add'>+</div><div class='add'>+#endif /* __ASM_ARCH_OMAP3_BEAGLE_H */</div><div class='add'>+</div><div class='head'>diff --git a/arch/arm/plat-omap/include/mach/board-overo.h b/arch/arm/plat-omap/include/mach/board-overo.h<br/>new file mode 100644<br/>index 000000000000..7ecae66966d1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/include/mach/board-overo.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/include/mach/board-overo.h</a></div><div class='hunk'>@@ -0,0 +1,26 @@</div><div class='add'>+/*</div><div class='add'>+ * board-overo.h (Gumstix Overo)</div><div class='add'>+ *</div><div class='add'>+ * Initial code: Steve Sakoman &lt;steve@sakoman.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms of the GNU General Public License as published by the</div><div class='add'>+ * Free Software Foundation; either version 2 of the License, or (at your</div><div class='add'>+ * option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License along</div><div class='add'>+ * with this program; if not, write to the Free Software Foundation, Inc.,</div><div class='add'>+ * 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __ASM_ARCH_OVERO_H</div><div class='add'>+#define __ASM_ARCH_OVERO_H</div><div class='add'>+</div><div class='add'>+#define OVERO_GPIO_BT_XGATE	15</div><div class='add'>+#define OVERO_GPIO_W2W_NRESET	16</div><div class='add'>+#define OVERO_GPIO_BT_NRESET	164</div><div class='add'>+#define OVERO_GPIO_USBH_CPEN	168</div><div class='add'>+#define OVERO_GPIO_USBH_NRESET	183</div><div class='add'>+</div><div class='add'>+#endif /* ____ASM_ARCH_OVERO_H */</div><div class='add'>+</div><div class='head'>diff --git a/arch/arm/plat-omap/include/mach/board.h b/arch/arm/plat-omap/include/mach/board.h<br/>index 54445642f35d..c23c12ccb353 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/include/mach/board.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-omap/include/mach/board.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/include/mach/board.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/include/mach/board.h</a></div><div class='hunk'>@@ -45,6 +45,8 @@ struct omap_mmc_conf {</div><div class='ctx'> 	unsigned cover:1;</div><div class='ctx'> 	/* 4 wire signaling is optional, and is only used for SD/SDIO */</div><div class='ctx'> 	unsigned wire4:1;</div><div class='add'>+	/* use the internal clock */</div><div class='add'>+	unsigned internal_clock:1;</div><div class='ctx'> 	s16 power_pin;</div><div class='ctx'> 	s16 switch_pin;</div><div class='ctx'> 	s16 wp_pin;</div><div class='head'>diff --git a/arch/arm/plat-omap/include/mach/clock.h b/arch/arm/plat-omap/include/mach/clock.h<br/>index 92f7c7238fcd..719298554ed7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/include/mach/clock.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-omap/include/mach/clock.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/include/mach/clock.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/include/mach/clock.h</a></div><div class='hunk'>@@ -15,6 +15,7 @@</div><div class='ctx'> </div><div class='ctx'> struct module;</div><div class='ctx'> struct clk;</div><div class='add'>+struct clockdomain;</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)</div><div class='ctx'> </div><div class='hunk'>@@ -79,6 +80,8 @@ struct clk {</div><div class='ctx'> 	u32			clksel_mask;</div><div class='ctx'> 	const struct clksel	*clksel;</div><div class='ctx'> 	struct dpll_data	*dpll_data;</div><div class='add'>+	const char		*clkdm_name;</div><div class='add'>+	struct clockdomain	*clkdm;</div><div class='ctx'> #else</div><div class='ctx'> 	__u8			rate_offset;</div><div class='ctx'> 	__u8			src_offset;</div><div class='head'>diff --git a/arch/arm/plat-omap/include/mach/clockdomain.h b/arch/arm/plat-omap/include/mach/clockdomain.h<br/>new file mode 100644<br/>index 000000000000..1f51f0173784<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/include/mach/clockdomain.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/include/mach/clockdomain.h</a></div><div class='hunk'>@@ -0,0 +1,106 @@</div><div class='add'>+/*</div><div class='add'>+ * linux/include/asm-arm/arch-omap/clockdomain.h</div><div class='add'>+ *</div><div class='add'>+ * OMAP2/3 clockdomain framework functions</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2008 Texas Instruments, Inc.</div><div class='add'>+ * Copyright (C) 2008 Nokia Corporation</div><div class='add'>+ *</div><div class='add'>+ * Written by Paul Walmsley</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __ASM_ARM_ARCH_OMAP_CLOCKDOMAIN_H</div><div class='add'>+#define __ASM_ARM_ARCH_OMAP_CLOCKDOMAIN_H</div><div class='add'>+</div><div class='add'>+#include &lt;mach/powerdomain.h&gt;</div><div class='add'>+#include &lt;mach/clock.h&gt;</div><div class='add'>+#include &lt;mach/cpu.h&gt;</div><div class='add'>+</div><div class='add'>+/* Clockdomain capability flags */</div><div class='add'>+#define CLKDM_CAN_FORCE_SLEEP			(1 &lt;&lt; 0)</div><div class='add'>+#define CLKDM_CAN_FORCE_WAKEUP			(1 &lt;&lt; 1)</div><div class='add'>+#define CLKDM_CAN_ENABLE_AUTO			(1 &lt;&lt; 2)</div><div class='add'>+#define CLKDM_CAN_DISABLE_AUTO			(1 &lt;&lt; 3)</div><div class='add'>+</div><div class='add'>+#define CLKDM_CAN_HWSUP		(CLKDM_CAN_ENABLE_AUTO | CLKDM_CAN_DISABLE_AUTO)</div><div class='add'>+#define CLKDM_CAN_SWSUP		(CLKDM_CAN_FORCE_SLEEP | CLKDM_CAN_FORCE_WAKEUP)</div><div class='add'>+#define CLKDM_CAN_HWSUP_SWSUP	(CLKDM_CAN_SWSUP | CLKDM_CAN_HWSUP)</div><div class='add'>+</div><div class='add'>+/* OMAP24XX CM_CLKSTCTRL_*.AUTOSTATE_* register bit values */</div><div class='add'>+#define OMAP24XX_CLKSTCTRL_DISABLE_AUTO		0x0</div><div class='add'>+#define OMAP24XX_CLKSTCTRL_ENABLE_AUTO		0x1</div><div class='add'>+</div><div class='add'>+/* OMAP3XXX CM_CLKSTCTRL_*.CLKTRCTRL_* register bit values */</div><div class='add'>+#define OMAP34XX_CLKSTCTRL_DISABLE_AUTO		0x0</div><div class='add'>+#define OMAP34XX_CLKSTCTRL_FORCE_SLEEP		0x1</div><div class='add'>+#define OMAP34XX_CLKSTCTRL_FORCE_WAKEUP		0x2</div><div class='add'>+#define OMAP34XX_CLKSTCTRL_ENABLE_AUTO		0x3</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * struct clkdm_pwrdm_autodep - a powerdomain that should have wkdeps</div><div class='add'>+ * and sleepdeps added when a powerdomain should stay active in hwsup mode;</div><div class='add'>+ * and conversely, removed when the powerdomain should be allowed to go</div><div class='add'>+ * inactive in hwsup mode.</div><div class='add'>+ */</div><div class='add'>+struct clkdm_pwrdm_autodep {</div><div class='add'>+</div><div class='add'>+	/* Name of the powerdomain to add a wkdep/sleepdep on */</div><div class='add'>+	const char *pwrdm_name;</div><div class='add'>+</div><div class='add'>+	/* Powerdomain pointer (looked up at clkdm_init() time) */</div><div class='add'>+	struct powerdomain *pwrdm;</div><div class='add'>+</div><div class='add'>+	/* OMAP chip types that this clockdomain dep is valid on */</div><div class='add'>+	const struct omap_chip_id omap_chip;</div><div class='add'>+</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct clockdomain {</div><div class='add'>+</div><div class='add'>+	/* Clockdomain name */</div><div class='add'>+	const char *name;</div><div class='add'>+</div><div class='add'>+	/* Powerdomain enclosing this clockdomain */</div><div class='add'>+	const char *pwrdm_name;</div><div class='add'>+</div><div class='add'>+	/* CLKTRCTRL/AUTOSTATE field mask in CM_CLKSTCTRL reg */</div><div class='add'>+	const u16 clktrctrl_mask;</div><div class='add'>+</div><div class='add'>+	/* Clockdomain capability flags */</div><div class='add'>+	const u8 flags;</div><div class='add'>+</div><div class='add'>+	/* OMAP chip types that this clockdomain is valid on */</div><div class='add'>+	const struct omap_chip_id omap_chip;</div><div class='add'>+</div><div class='add'>+	/* Usecount tracking */</div><div class='add'>+	atomic_t usecount;</div><div class='add'>+</div><div class='add'>+	/* Powerdomain pointer assigned at clkdm_register() */</div><div class='add'>+	struct powerdomain *pwrdm;</div><div class='add'>+</div><div class='add'>+	struct list_head node;</div><div class='add'>+</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void clkdm_init(struct clockdomain **clkdms, struct clkdm_pwrdm_autodep *autodeps);</div><div class='add'>+int clkdm_register(struct clockdomain *clkdm);</div><div class='add'>+int clkdm_unregister(struct clockdomain *clkdm);</div><div class='add'>+struct clockdomain *clkdm_lookup(const char *name);</div><div class='add'>+</div><div class='add'>+int clkdm_for_each(int (*fn)(struct clockdomain *clkdm));</div><div class='add'>+struct powerdomain *clkdm_get_pwrdm(struct clockdomain *clkdm);</div><div class='add'>+</div><div class='add'>+void omap2_clkdm_allow_idle(struct clockdomain *clkdm);</div><div class='add'>+void omap2_clkdm_deny_idle(struct clockdomain *clkdm);</div><div class='add'>+</div><div class='add'>+int omap2_clkdm_wakeup(struct clockdomain *clkdm);</div><div class='add'>+int omap2_clkdm_sleep(struct clockdomain *clkdm);</div><div class='add'>+</div><div class='add'>+int omap2_clkdm_clk_enable(struct clockdomain *clkdm, struct clk *clk);</div><div class='add'>+int omap2_clkdm_clk_disable(struct clockdomain *clkdm, struct clk *clk);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/arm/plat-omap/include/mach/common.h b/arch/arm/plat-omap/include/mach/common.h<br/>index 06093112b665..ef70e2b0f054 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/include/mach/common.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-omap/include/mach/common.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/include/mach/common.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/include/mach/common.h</a></div><div class='hunk'>@@ -34,6 +34,7 @@ struct sys_timer;</div><div class='ctx'> extern void omap_map_common_io(void);</div><div class='ctx'> extern struct sys_timer omap_timer;</div><div class='ctx'> extern void omap_serial_init(void);</div><div class='add'>+extern void omap_serial_enable_clocks(int enable);</div><div class='ctx'> #ifdef CONFIG_I2C_OMAP</div><div class='ctx'> extern int omap_register_i2c_bus(int bus_id, u32 clkrate,</div><div class='ctx'> 				 struct i2c_board_info const *info,</div><div class='hunk'>@@ -49,6 +50,7 @@ static inline int omap_register_i2c_bus(int bus_id, u32 clkrate,</div><div class='ctx'> </div><div class='ctx'> /* IO bases for various OMAP processors */</div><div class='ctx'> struct omap_globals {</div><div class='add'>+	u32		class;		/* OMAP class to detect */</div><div class='ctx'> 	void __iomem	*tap;		/* Control module ID code */</div><div class='ctx'> 	void __iomem	*sdrc;		/* SDRAM Controller */</div><div class='ctx'> 	void __iomem	*sms;		/* SDRAM Memory Scheduler */</div><div class='hunk'>@@ -62,6 +64,7 @@ void omap2_set_globals_243x(void);</div><div class='ctx'> void omap2_set_globals_343x(void);</div><div class='ctx'> </div><div class='ctx'> /* These get called from omap2_set_globals_xxxx(), do not call these */</div><div class='add'>+void omap2_set_globals_tap(struct omap_globals *);</div><div class='ctx'> void omap2_set_globals_memory(struct omap_globals *);</div><div class='ctx'> void omap2_set_globals_control(struct omap_globals *);</div><div class='ctx'> void omap2_set_globals_prcm(struct omap_globals *);</div><div class='head'>diff --git a/arch/arm/plat-omap/include/mach/control.h b/arch/arm/plat-omap/include/mach/control.h<br/>index e3fd62d9a995..dc9886760577 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/include/mach/control.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-omap/include/mach/control.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/include/mach/control.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/include/mach/control.h</a></div><div class='hunk'>@@ -1,13 +1,10 @@</div><div class='del'>-#ifndef __ASM_ARCH_CONTROL_H</div><div class='del'>-#define __ASM_ARCH_CONTROL_H</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * arch/arm/plat-omap/include/mach/control.h</div><div class='ctx'>  *</div><div class='ctx'>  * OMAP2/3 System Control Module definitions</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2007 Texas Instruments, Inc.</div><div class='del'>- * Copyright (C) 2007 Nokia Corporation</div><div class='add'>+ * Copyright (C) 2007-2008 Texas Instruments, Inc.</div><div class='add'>+ * Copyright (C) 2007-2008 Nokia Corporation</div><div class='ctx'>  *</div><div class='ctx'>  * Written by Paul Walmsley</div><div class='ctx'>  *</div><div class='hunk'>@@ -16,14 +13,23 @@</div><div class='ctx'>  * the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#ifndef __ASM_ARCH_CONTROL_H</div><div class='add'>+#define __ASM_ARCH_CONTROL_H</div><div class='add'>+</div><div class='ctx'> #include &lt;mach/io.h&gt;</div><div class='ctx'> </div><div class='add'>+#ifndef __ASSEMBLY__</div><div class='ctx'> #define OMAP242X_CTRL_REGADDR(reg)					\</div><div class='del'>-	(void __iomem *)IO_ADDRESS(OMAP242X_CTRL_BASE + (reg))</div><div class='add'>+	IO_ADDRESS(OMAP242X_CTRL_BASE + (reg))</div><div class='ctx'> #define OMAP243X_CTRL_REGADDR(reg)					\</div><div class='del'>-	(void __iomem *)IO_ADDRESS(OMAP243X_CTRL_BASE + (reg))</div><div class='add'>+	IO_ADDRESS(OMAP243X_CTRL_BASE + (reg))</div><div class='ctx'> #define OMAP343X_CTRL_REGADDR(reg)					\</div><div class='del'>-	(void __iomem *)IO_ADDRESS(OMAP343X_CTRL_BASE + (reg))</div><div class='add'>+	IO_ADDRESS(OMAP343X_CTRL_BASE + (reg))</div><div class='add'>+#else</div><div class='add'>+#define OMAP242X_CTRL_REGADDR(reg)	IO_ADDRESS(OMAP242X_CTRL_BASE + (reg))</div><div class='add'>+#define OMAP243X_CTRL_REGADDR(reg)	IO_ADDRESS(OMAP243X_CTRL_BASE + (reg))</div><div class='add'>+#define OMAP343X_CTRL_REGADDR(reg)	IO_ADDRESS(OMAP343X_CTRL_BASE + (reg))</div><div class='add'>+#endif /* __ASSEMBLY__ */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * As elsewhere, the "OMAP2_" prefix indicates that the macro is valid for</div><div class='hunk'>@@ -134,6 +140,7 @@</div><div class='ctx'> #define OMAP343X_CONTROL_TEST_KEY_13	(OMAP2_CONTROL_GENERAL + 0x00fc)</div><div class='ctx'> #define OMAP343X_CONTROL_IVA2_BOOTADDR	(OMAP2_CONTROL_GENERAL + 0x0190)</div><div class='ctx'> #define OMAP343X_CONTROL_IVA2_BOOTMOD	(OMAP2_CONTROL_GENERAL + 0x0194)</div><div class='add'>+#define OMAP343X_CONTROL_TEMP_SENSOR	(OMAP2_CONTROL_GENERAL + 0x02b4)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * REVISIT: This list of registers is not comprehensive - there are more</div><div class='head'>diff --git a/arch/arm/plat-omap/include/mach/cpu.h b/arch/arm/plat-omap/include/mach/cpu.h<br/>index 05aee0eda34f..e0464187209d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/include/mach/cpu.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-omap/include/mach/cpu.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/include/mach/cpu.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/include/mach/cpu.h</a></div><div class='hunk'>@@ -346,9 +346,14 @@ IS_OMAP_TYPE(3430, 0x3430)</div><div class='ctx'> 		get_sil_revision(system_rev)</div><div class='ctx'> </div><div class='ctx'> /* Various silicon macros defined here */</div><div class='add'>+#define OMAP242X_CLASS		0x24200000</div><div class='ctx'> #define OMAP2420_REV_ES1_0	0x24200000</div><div class='ctx'> #define OMAP2420_REV_ES2_0	0x24201000</div><div class='add'>+</div><div class='add'>+#define OMAP243X_CLASS		0x24300000</div><div class='ctx'> #define OMAP2430_REV_ES1_0	0x24300000</div><div class='add'>+</div><div class='add'>+#define OMAP343X_CLASS		0x34300000</div><div class='ctx'> #define OMAP3430_REV_ES1_0	0x34300000</div><div class='ctx'> #define OMAP3430_REV_ES2_0	0x34301000</div><div class='ctx'> #define OMAP3430_REV_ES2_1	0x34302000</div><div class='head'>diff --git a/arch/arm/plat-omap/include/mach/debug-macro.S b/arch/arm/plat-omap/include/mach/debug-macro.S<br/>index 1b0039bdeb4e..1b11f5c6a2d9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/include/mach/debug-macro.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-omap/include/mach/debug-macro.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/include/mach/debug-macro.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/include/mach/debug-macro.S</a></div><div class='hunk'>@@ -35,6 +35,18 @@</div><div class='ctx'> #ifdef CONFIG_OMAP_LL_DEBUG_UART3</div><div class='ctx'> 		add	\rx, \rx, #0x00004000	@ UART 3</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='add'>+#elif	CONFIG_ARCH_OMAP3</div><div class='add'>+		moveq	\rx, #0x48000000	@ physical base address</div><div class='add'>+		movne	\rx, #0xd8000000	@ virtual base</div><div class='add'>+		orr	\rx, \rx, #0x0006a000</div><div class='add'>+#ifdef CONFIG_OMAP_LL_DEBUG_UART2</div><div class='add'>+		add	\rx, \rx, #0x00002000	@ UART 2</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_OMAP_LL_DEBUG_UART3</div><div class='add'>+		add	\rx, \rx, #0x00fb0000	@ UART 3</div><div class='add'>+		add	\rx, \rx, #0x00006000</div><div class='add'>+#endif</div><div class='ctx'> #endif</div><div class='ctx'> 		.endm</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/plat-omap/include/mach/entry-macro.S b/arch/arm/plat-omap/include/mach/entry-macro.S<br/>index d4e9043bf201..030118ee204a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/include/mach/entry-macro.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-omap/include/mach/entry-macro.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/include/mach/entry-macro.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/include/mach/entry-macro.S</a></div><div class='hunk'>@@ -55,9 +55,17 @@</div><div class='ctx'> 1510:</div><div class='ctx'> 		.endm</div><div class='ctx'> </div><div class='del'>-#elif defined(CONFIG_ARCH_OMAP24XX)</div><div class='add'>+#endif</div><div class='add'>+#if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX)</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_ARCH_OMAP24XX)</div><div class='ctx'> #include &lt;mach/omap24xx.h&gt;</div><div class='add'>+#endif</div><div class='add'>+#if defined(CONFIG_ARCH_OMAP34XX)</div><div class='add'>+#include &lt;mach/omap34xx.h&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define INTCPS_SIR_IRQ_OFFSET	0x0040		/* Active interrupt number */</div><div class='ctx'> </div><div class='ctx'> 		.macro	disable_fiq</div><div class='ctx'> 		.endm</div><div class='hunk'>@@ -79,7 +87,7 @@</div><div class='ctx'> 		ldr	\irqnr, [\base, #0xd8] /* IRQ pending reg 3 */</div><div class='ctx'> 		cmp	\irqnr, #0x0</div><div class='ctx'> 2222:</div><div class='del'>-		ldrne	\irqnr, [\base, #IRQ_SIR_IRQ]</div><div class='add'>+		ldrne	\irqnr, [\base, #INTCPS_SIR_IRQ_OFFSET]</div><div class='ctx'> </div><div class='ctx'> 		.endm</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/plat-omap/include/mach/fpga.h b/arch/arm/plat-omap/include/mach/fpga.h<br/>index c92e4b42b289..f1864a652f7a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/include/mach/fpga.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-omap/include/mach/fpga.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/include/mach/fpga.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/include/mach/fpga.h</a></div><div class='hunk'>@@ -34,9 +34,9 @@ extern void omap1510_fpga_init_irq(void);</div><div class='ctx'>  * ---------------------------------------------------------------------------</div><div class='ctx'>  */</div><div class='ctx'> /* maps in the FPGA registers and the ETHR registers */</div><div class='del'>-#define H2P2_DBG_FPGA_BASE		0xE8000000	/* VA */</div><div class='del'>-#define H2P2_DBG_FPGA_SIZE		SZ_4K		/* SIZE */</div><div class='del'>-#define H2P2_DBG_FPGA_START		0x04000000	/* PA */</div><div class='add'>+#define H2P2_DBG_FPGA_BASE		IOMEM(0xE8000000)	/* VA */</div><div class='add'>+#define H2P2_DBG_FPGA_SIZE		SZ_4K			/* SIZE */</div><div class='add'>+#define H2P2_DBG_FPGA_START		0x04000000		/* PA */</div><div class='ctx'> </div><div class='ctx'> #define H2P2_DBG_FPGA_ETHR_START	(H2P2_DBG_FPGA_START + 0x300)</div><div class='ctx'> #define H2P2_DBG_FPGA_FPGA_REV		(H2P2_DBG_FPGA_BASE + 0x10)	/* FPGA Revision */</div><div class='hunk'>@@ -85,9 +85,9 @@ struct h2p2_dbg_fpga {</div><div class='ctx'>  *  OMAP-1510 FPGA</div><div class='ctx'>  * ---------------------------------------------------------------------------</div><div class='ctx'>  */</div><div class='del'>-#define OMAP1510_FPGA_BASE			0xE8000000	/* Virtual */</div><div class='del'>-#define OMAP1510_FPGA_SIZE			SZ_4K</div><div class='del'>-#define OMAP1510_FPGA_START			0x08000000	/* Physical */</div><div class='add'>+#define OMAP1510_FPGA_BASE		IOMEM(0xE8000000)	/* VA */</div><div class='add'>+#define OMAP1510_FPGA_SIZE		SZ_4K</div><div class='add'>+#define OMAP1510_FPGA_START		0x08000000		/* PA */</div><div class='ctx'> </div><div class='ctx'> /* Revision */</div><div class='ctx'> #define OMAP1510_FPGA_REV_LOW			(OMAP1510_FPGA_BASE + 0x0)</div><div class='head'>diff --git a/arch/arm/plat-omap/include/mach/gpio.h b/arch/arm/plat-omap/include/mach/gpio.h<br/>index 94ce2780e8ee..98e9008b7e9d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/include/mach/gpio.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-omap/include/mach/gpio.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/include/mach/gpio.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/include/mach/gpio.h</a></div><div class='hunk'>@@ -26,10 +26,10 @@</div><div class='ctx'> #ifndef __ASM_ARCH_OMAP_GPIO_H</div><div class='ctx'> #define __ASM_ARCH_OMAP_GPIO_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;mach/irqs.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#define OMAP_MPUIO_BASE			(void __iomem *)0xfffb5000</div><div class='add'>+#define OMAP_MPUIO_BASE			0xfffb5000</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ARCH_OMAP730</div><div class='ctx'> #define OMAP_MPUIO_INPUT_LATCH		0x00</div><div class='hunk'>@@ -76,6 +76,8 @@ extern void omap_free_gpio(int gpio);</div><div class='ctx'> extern void omap_set_gpio_direction(int gpio, int is_input);</div><div class='ctx'> extern void omap_set_gpio_dataout(int gpio, int enable);</div><div class='ctx'> extern int omap_get_gpio_datain(int gpio);</div><div class='add'>+extern void omap2_gpio_prepare_for_retention(void);</div><div class='add'>+extern void omap2_gpio_resume_after_retention(void);</div><div class='ctx'> extern void omap_set_gpio_debounce(int gpio, int enable);</div><div class='ctx'> extern void omap_set_gpio_debounce_time(int gpio, int enable);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/plat-omap/include/mach/gpmc.h b/arch/arm/plat-omap/include/mach/gpmc.h<br/>index 6a8e07ffc2d0..45b678439bb7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/include/mach/gpmc.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-omap/include/mach/gpmc.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/include/mach/gpmc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/include/mach/gpmc.h</a></div><div class='hunk'>@@ -11,6 +11,9 @@</div><div class='ctx'> #ifndef __OMAP2_GPMC_H</div><div class='ctx'> #define __OMAP2_GPMC_H</div><div class='ctx'> </div><div class='add'>+/* Maximum Number of Chip Selects */</div><div class='add'>+#define GPMC_CS_NUM		8</div><div class='add'>+</div><div class='ctx'> #define GPMC_CS_CONFIG1		0x00</div><div class='ctx'> #define GPMC_CS_CONFIG2		0x04</div><div class='ctx'> #define GPMC_CS_CONFIG3		0x08</div><div class='hunk'>@@ -22,6 +25,9 @@</div><div class='ctx'> #define GPMC_CS_NAND_ADDRESS	0x20</div><div class='ctx'> #define GPMC_CS_NAND_DATA	0x24</div><div class='ctx'> </div><div class='add'>+#define GPMC_CONFIG		0x50</div><div class='add'>+#define GPMC_STATUS		0x54</div><div class='add'>+</div><div class='ctx'> #define GPMC_CONFIG1_WRAPBURST_SUPP     (1 &lt;&lt; 31)</div><div class='ctx'> #define GPMC_CONFIG1_READMULTIPLE_SUPP  (1 &lt;&lt; 30)</div><div class='ctx'> #define GPMC_CONFIG1_READTYPE_ASYNC     (0 &lt;&lt; 29)</div><div class='hunk'>@@ -78,9 +84,14 @@ struct gpmc_timings {</div><div class='ctx'> 	u16 access;		/* Start-cycle to first data valid delay */</div><div class='ctx'> 	u16 rd_cycle;		/* Total read cycle time */</div><div class='ctx'> 	u16 wr_cycle;		/* Total write cycle time */</div><div class='add'>+</div><div class='add'>+	/* The following are only on OMAP3430 */</div><div class='add'>+	u16 wr_access;		/* WRACCESSTIME */</div><div class='add'>+	u16 wr_data_mux_bus;	/* WRDATAONADMUXBUS */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern unsigned int gpmc_ns_to_ticks(unsigned int time_ns);</div><div class='add'>+extern unsigned int gpmc_ticks_to_ns(unsigned int ticks);</div><div class='ctx'> extern unsigned int gpmc_round_ns_to_ticks(unsigned int time_ns);</div><div class='ctx'> extern unsigned long gpmc_get_fclk_period(void);</div><div class='ctx'> </div><div class='hunk'>@@ -92,5 +103,6 @@ extern int gpmc_cs_request(int cs, unsigned long size, unsigned long *base);</div><div class='ctx'> extern void gpmc_cs_free(int cs);</div><div class='ctx'> extern int gpmc_cs_set_reserved(int cs, int reserved);</div><div class='ctx'> extern int gpmc_cs_reserved(int cs);</div><div class='add'>+extern void gpmc_init(void);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/plat-omap/include/mach/hardware.h b/arch/arm/plat-omap/include/mach/hardware.h<br/>index 07f5d7f21528..6589ddbb63b2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/include/mach/hardware.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-omap/include/mach/hardware.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/include/mach/hardware.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/include/mach/hardware.h</a></div><div class='hunk'>@@ -89,7 +89,7 @@</div><div class='ctx'> #define DPLL_CTL		(0xfffecf00)</div><div class='ctx'> </div><div class='ctx'> /* DSP clock control. Must use __raw_readw() and __raw_writew() with these */</div><div class='del'>-#define DSP_CONFIG_REG_BASE     (0xe1008000)</div><div class='add'>+#define DSP_CONFIG_REG_BASE     IOMEM(0xe1008000)</div><div class='ctx'> #define DSP_CKCTL		(DSP_CONFIG_REG_BASE + 0x0)</div><div class='ctx'> #define DSP_IDLECT1		(DSP_CONFIG_REG_BASE + 0x4)</div><div class='ctx'> #define DSP_IDLECT2		(DSP_CONFIG_REG_BASE + 0x8)</div><div class='hunk'>@@ -282,8 +282,8 @@</div><div class='ctx'> </div><div class='ctx'> #include "omap730.h"</div><div class='ctx'> #include "omap1510.h"</div><div class='del'>-#include "omap24xx.h"</div><div class='ctx'> #include "omap16xx.h"</div><div class='add'>+#include "omap24xx.h"</div><div class='ctx'> #include "omap34xx.h"</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASSEMBLER__</div><div class='hunk'>@@ -322,6 +322,14 @@</div><div class='ctx'> #include "board-2430sdp.h"</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_MACH_OMAP3_BEAGLE</div><div class='add'>+#include "board-omap3beagle.h"</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_MACH_OMAP_LDP</div><div class='add'>+#include "board-ldp.h"</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_MACH_OMAP_APOLLON</div><div class='ctx'> #include "board-apollon.h"</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/plat-omap/include/mach/io.h b/arch/arm/plat-omap/include/mach/io.h<br/>index 2a30b7d88cde..adc83b7b8205 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/include/mach/io.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-omap/include/mach/io.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/include/mach/io.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/include/mach/io.h</a></div><div class='hunk'>@@ -55,14 +55,13 @@</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_ARCH_OMAP1)</div><div class='ctx'> </div><div class='del'>-#define IO_PHYS		0xFFFB0000</div><div class='del'>-#define IO_OFFSET	0x01000000	/* Virtual IO = 0xfefb0000 */</div><div class='del'>-#define IO_SIZE		0x40000</div><div class='del'>-#define IO_VIRT		(IO_PHYS - IO_OFFSET)</div><div class='del'>-#define IO_ADDRESS(pa)	((pa) - IO_OFFSET)</div><div class='del'>-#define OMAP1_IO_ADDRESS(pa)	((pa) - IO_OFFSET)</div><div class='del'>-#define io_p2v(pa)	((pa) - IO_OFFSET)</div><div class='del'>-#define io_v2p(va)	((va) + IO_OFFSET)</div><div class='add'>+#define IO_PHYS			0xFFFB0000</div><div class='add'>+#define IO_OFFSET		0x01000000	/* Virtual IO = 0xfefb0000 */</div><div class='add'>+#define IO_SIZE			0x40000</div><div class='add'>+#define IO_VIRT			(IO_PHYS - IO_OFFSET)</div><div class='add'>+#define __IO_ADDRESS(pa)	((pa) - IO_OFFSET)</div><div class='add'>+#define __OMAP1_IO_ADDRESS(pa)	((pa) - IO_OFFSET)</div><div class='add'>+#define io_v2p(va)		((va) + IO_OFFSET)</div><div class='ctx'> </div><div class='ctx'> #elif defined(CONFIG_ARCH_OMAP2)</div><div class='ctx'> </div><div class='hunk'>@@ -74,7 +73,6 @@</div><div class='ctx'> #define L4_24XX_VIRT	0xd8000000</div><div class='ctx'> #define L4_24XX_SIZE	SZ_1M		/* 1MB of 128MB used, want 1MB sect */</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_ARCH_OMAP2430</div><div class='ctx'> #define L4_WK_243X_PHYS		L4_WK_243X_BASE		/* 0x49000000 */</div><div class='ctx'> #define L4_WK_243X_VIRT		0xd9000000</div><div class='ctx'> #define L4_WK_243X_SIZE		SZ_1M</div><div class='hunk'>@@ -88,13 +86,10 @@</div><div class='ctx'> #define OMAP243X_SMS_VIRT	0xFC000000</div><div class='ctx'> #define OMAP243X_SMS_SIZE	SZ_1M</div><div class='ctx'> </div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define IO_OFFSET	0x90000000</div><div class='del'>-#define IO_ADDRESS(pa)	((pa) + IO_OFFSET)	/* Works for L3 and L4 */</div><div class='del'>-#define OMAP2_IO_ADDRESS(pa)	((pa) + IO_OFFSET)	/* Works for L3 and L4 */</div><div class='del'>-#define io_p2v(pa)	((pa) + IO_OFFSET)	/* Works for L3 and L4 */</div><div class='del'>-#define io_v2p(va)	((va) - IO_OFFSET)	/* Works for L3 and L4 */</div><div class='add'>+#define IO_OFFSET		0x90000000</div><div class='add'>+#define __IO_ADDRESS(pa)	((pa) + IO_OFFSET)	/* Works for L3 and L4 */</div><div class='add'>+#define __OMAP2_IO_ADDRESS(pa)	((pa) + IO_OFFSET)	/* Works for L3 and L4 */</div><div class='add'>+#define io_v2p(va)		((va) - IO_OFFSET)	/* Works for L3 and L4 */</div><div class='ctx'> </div><div class='ctx'> /* DSP */</div><div class='ctx'> #define DSP_MEM_24XX_PHYS	OMAP2420_DSP_MEM_BASE	/* 0x58000000 */</div><div class='hunk'>@@ -149,9 +144,8 @@</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #define IO_OFFSET		0x90000000</div><div class='del'>-#define IO_ADDRESS(pa)		((pa) + IO_OFFSET)/* Works for L3 and L4 */</div><div class='del'>-#define OMAP2_IO_ADDRESS(pa)	((pa) + IO_OFFSET)/* Works for L3 and L4 */</div><div class='del'>-#define io_p2v(pa)		((pa) + IO_OFFSET)/* Works for L3 and L4 */</div><div class='add'>+#define __IO_ADDRESS(pa)	((pa) + IO_OFFSET)/* Works for L3 and L4 */</div><div class='add'>+#define __OMAP2_IO_ADDRESS(pa)	((pa) + IO_OFFSET)/* Works for L3 and L4 */</div><div class='ctx'> #define io_v2p(va)		((va) - IO_OFFSET)/* Works for L3 and L4 */</div><div class='ctx'> </div><div class='ctx'> /* DSP */</div><div class='hunk'>@@ -167,7 +161,14 @@</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifndef __ASSEMBLER__</div><div class='add'>+#define IO_ADDRESS(pa)		IOMEM(__IO_ADDRESS(pa))</div><div class='add'>+#define OMAP1_IO_ADDRESS(pa)	IOMEM(__OMAP1_IO_ADDRESS(pa))</div><div class='add'>+#define OMAP2_IO_ADDRESS(pa)	IOMEM(__OMAP2_IO_ADDRESS(pa))</div><div class='add'>+</div><div class='add'>+#ifdef __ASSEMBLER__</div><div class='add'>+#define IOMEM(x)		x</div><div class='add'>+#else</div><div class='add'>+#define IOMEM(x)		((void __force __iomem *)(x))</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Functions to access the OMAP IO region</div><div class='hunk'>@@ -178,13 +179,13 @@</div><div class='ctx'>  *	 - DO NOT use hardcoded virtual addresses to allow changing the</div><div class='ctx'>  *	   IO address space again if needed</div><div class='ctx'>  */</div><div class='del'>-#define omap_readb(a)		(*(volatile unsigned char  *)IO_ADDRESS(a))</div><div class='del'>-#define omap_readw(a)		(*(volatile unsigned short *)IO_ADDRESS(a))</div><div class='del'>-#define omap_readl(a)		(*(volatile unsigned int   *)IO_ADDRESS(a))</div><div class='add'>+#define omap_readb(a)		__raw_readb(IO_ADDRESS(a))</div><div class='add'>+#define omap_readw(a)		__raw_readw(IO_ADDRESS(a))</div><div class='add'>+#define omap_readl(a)		__raw_readl(IO_ADDRESS(a))</div><div class='ctx'> </div><div class='del'>-#define omap_writeb(v,a)	(*(volatile unsigned char  *)IO_ADDRESS(a) = (v))</div><div class='del'>-#define omap_writew(v,a)	(*(volatile unsigned short *)IO_ADDRESS(a) = (v))</div><div class='del'>-#define omap_writel(v,a)	(*(volatile unsigned int   *)IO_ADDRESS(a) = (v))</div><div class='add'>+#define omap_writeb(v,a)	__raw_writeb(v, IO_ADDRESS(a))</div><div class='add'>+#define omap_writew(v,a)	__raw_writew(v, IO_ADDRESS(a))</div><div class='add'>+#define omap_writel(v,a)	__raw_writel(v, IO_ADDRESS(a))</div><div class='ctx'> </div><div class='ctx'> extern void omap1_map_common_io(void);</div><div class='ctx'> extern void omap1_init_common_hw(void);</div><div class='hunk'>@@ -192,6 +193,12 @@ extern void omap1_init_common_hw(void);</div><div class='ctx'> extern void omap2_map_common_io(void);</div><div class='ctx'> extern void omap2_init_common_hw(void);</div><div class='ctx'> </div><div class='add'>+#define __arch_ioremap(p,s,t)	omap_ioremap(p,s,t)</div><div class='add'>+#define __arch_iounmap(v)	omap_iounmap(v)</div><div class='add'>+</div><div class='add'>+void __iomem *omap_ioremap(unsigned long phys, size_t size, unsigned int type);</div><div class='add'>+void omap_iounmap(volatile void __iomem *addr);</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/plat-omap/include/mach/irqs.h b/arch/arm/plat-omap/include/mach/irqs.h<br/>index 17248bbf3f27..a2929ac8c687 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/include/mach/irqs.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-omap/include/mach/irqs.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/include/mach/irqs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/include/mach/irqs.h</a></div><div class='hunk'>@@ -125,6 +125,7 @@</div><div class='ctx'> #define INT_UART2		(15 + IH2_BASE)</div><div class='ctx'> #define INT_BT_MCSI1TX		(16 + IH2_BASE)</div><div class='ctx'> #define INT_BT_MCSI1RX		(17 + IH2_BASE)</div><div class='add'>+#define INT_SOSSI_MATCH		(19 + IH2_BASE)</div><div class='ctx'> #define INT_USB_W2FC		(20 + IH2_BASE)</div><div class='ctx'> #define INT_1WIRE		(21 + IH2_BASE)</div><div class='ctx'> #define INT_OS_TIMER		(22 + IH2_BASE)</div><div class='hunk'>@@ -176,6 +177,7 @@</div><div class='ctx'> #define INT_1610_DMA_CH14	(61 + IH2_BASE)</div><div class='ctx'> #define INT_1610_DMA_CH15	(62 + IH2_BASE)</div><div class='ctx'> #define INT_1610_NAND		(63 + IH2_BASE)</div><div class='add'>+#define INT_1610_SHA1MD5	(91 + IH2_BASE)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * OMAP-730 specific IRQ numbers for interrupt handler 2</div><div class='hunk'>@@ -263,12 +265,18 @@</div><div class='ctx'> #define INT_24XX_GPTIMER10	46</div><div class='ctx'> #define INT_24XX_GPTIMER11	47</div><div class='ctx'> #define INT_24XX_GPTIMER12	48</div><div class='add'>+#define INT_24XX_SHA1MD5	51</div><div class='add'>+#define INT_24XX_MCBSP4_IRQ_TX	54</div><div class='add'>+#define INT_24XX_MCBSP4_IRQ_RX	55</div><div class='ctx'> #define INT_24XX_I2C1_IRQ	56</div><div class='ctx'> #define INT_24XX_I2C2_IRQ	57</div><div class='add'>+#define INT_24XX_HDQ_IRQ	58</div><div class='ctx'> #define INT_24XX_MCBSP1_IRQ_TX	59</div><div class='ctx'> #define INT_24XX_MCBSP1_IRQ_RX	60</div><div class='ctx'> #define INT_24XX_MCBSP2_IRQ_TX	62</div><div class='ctx'> #define INT_24XX_MCBSP2_IRQ_RX	63</div><div class='add'>+#define INT_24XX_SPI1_IRQ	65</div><div class='add'>+#define INT_24XX_SPI2_IRQ	66</div><div class='ctx'> #define INT_24XX_UART1_IRQ	72</div><div class='ctx'> #define INT_24XX_UART2_IRQ	73</div><div class='ctx'> #define INT_24XX_UART3_IRQ	74</div><div class='hunk'>@@ -278,7 +286,60 @@</div><div class='ctx'> #define INT_24XX_USB_IRQ_HGEN	78</div><div class='ctx'> #define INT_24XX_USB_IRQ_HSOF	79</div><div class='ctx'> #define INT_24XX_USB_IRQ_OTG	80</div><div class='add'>+#define INT_24XX_MCBSP5_IRQ_TX	81</div><div class='add'>+#define INT_24XX_MCBSP5_IRQ_RX	82</div><div class='ctx'> #define INT_24XX_MMC_IRQ	83</div><div class='add'>+#define INT_24XX_MMC2_IRQ	86</div><div class='add'>+#define INT_24XX_MCBSP3_IRQ_TX	89</div><div class='add'>+#define INT_24XX_MCBSP3_IRQ_RX	90</div><div class='add'>+#define INT_24XX_SPI3_IRQ	91</div><div class='add'>+</div><div class='add'>+#define INT_243X_MCBSP2_IRQ	16</div><div class='add'>+#define INT_243X_MCBSP3_IRQ	17</div><div class='add'>+#define INT_243X_MCBSP4_IRQ	18</div><div class='add'>+#define INT_243X_MCBSP5_IRQ	19</div><div class='add'>+#define INT_243X_MCBSP1_IRQ	64</div><div class='add'>+#define INT_243X_HS_USB_MC	92</div><div class='add'>+#define INT_243X_HS_USB_DMA	93</div><div class='add'>+#define INT_243X_CARKIT_IRQ	94</div><div class='add'>+</div><div class='add'>+#define INT_34XX_BENCH_MPU_EMUL	3</div><div class='add'>+#define INT_34XX_ST_MCBSP2_IRQ	4</div><div class='add'>+#define INT_34XX_ST_MCBSP3_IRQ	5</div><div class='add'>+#define INT_34XX_SSM_ABORT_IRQ	6</div><div class='add'>+#define INT_34XX_SYS_NIRQ	7</div><div class='add'>+#define INT_34XX_D2D_FW_IRQ	8</div><div class='add'>+#define INT_34XX_PRCM_MPU_IRQ	11</div><div class='add'>+#define INT_34XX_MCBSP1_IRQ	16</div><div class='add'>+#define INT_34XX_MCBSP2_IRQ	17</div><div class='add'>+#define INT_34XX_MCBSP3_IRQ	22</div><div class='add'>+#define INT_34XX_MCBSP4_IRQ	23</div><div class='add'>+#define INT_34XX_CAM_IRQ	24</div><div class='add'>+#define INT_34XX_MCBSP5_IRQ	27</div><div class='add'>+#define INT_34XX_GPIO_BANK1	29</div><div class='add'>+#define INT_34XX_GPIO_BANK2	30</div><div class='add'>+#define INT_34XX_GPIO_BANK3	31</div><div class='add'>+#define INT_34XX_GPIO_BANK4	32</div><div class='add'>+#define INT_34XX_GPIO_BANK5	33</div><div class='add'>+#define INT_34XX_GPIO_BANK6	34</div><div class='add'>+#define INT_34XX_USIM_IRQ	35</div><div class='add'>+#define INT_34XX_WDT3_IRQ	36</div><div class='add'>+#define INT_34XX_SPI4_IRQ	48</div><div class='add'>+#define INT_34XX_SHA1MD52_IRQ	49</div><div class='add'>+#define INT_34XX_FPKA_READY_IRQ	50</div><div class='add'>+#define INT_34XX_SHA1MD51_IRQ	51</div><div class='add'>+#define INT_34XX_RNG_IRQ	52</div><div class='add'>+#define INT_34XX_I2C3_IRQ	61</div><div class='add'>+#define INT_34XX_FPKA_ERROR_IRQ	64</div><div class='add'>+#define INT_34XX_PBIAS_IRQ	75</div><div class='add'>+#define INT_34XX_OHCI_IRQ	76</div><div class='add'>+#define INT_34XX_EHCI_IRQ	77</div><div class='add'>+#define INT_34XX_TLL_IRQ	78</div><div class='add'>+#define INT_34XX_PARTHASH_IRQ	79</div><div class='add'>+#define INT_34XX_MMC3_IRQ	94</div><div class='add'>+#define INT_34XX_GPT12_IRQ	95</div><div class='add'>+</div><div class='add'>+#define	INT_34XX_BENCH_MPU_EMUL	3</div><div class='ctx'> </div><div class='ctx'> /* Max. 128 level 2 IRQs (OMAP1610), 192 GPIOs (OMAP730) and</div><div class='ctx'>  * 16 MPUIO lines */</div><div class='head'>diff --git a/arch/arm/plat-omap/include/mach/mcbsp.h b/arch/arm/plat-omap/include/mach/mcbsp.h<br/>index 8fdb95e26fcd..6a0d1a0a24a7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/include/mach/mcbsp.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-omap/include/mach/mcbsp.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/include/mach/mcbsp.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/include/mach/mcbsp.h</a></div><div class='hunk'>@@ -43,9 +43,15 @@</div><div class='ctx'> </div><div class='ctx'> #define OMAP24XX_MCBSP1_BASE	0x48074000</div><div class='ctx'> #define OMAP24XX_MCBSP2_BASE	0x48076000</div><div class='add'>+#define OMAP2430_MCBSP3_BASE	0x4808c000</div><div class='add'>+#define OMAP2430_MCBSP4_BASE	0x4808e000</div><div class='add'>+#define OMAP2430_MCBSP5_BASE	0x48096000</div><div class='ctx'> </div><div class='ctx'> #define OMAP34XX_MCBSP1_BASE	0x48074000</div><div class='ctx'> #define OMAP34XX_MCBSP2_BASE	0x49022000</div><div class='add'>+#define OMAP34XX_MCBSP3_BASE	0x49024000</div><div class='add'>+#define OMAP34XX_MCBSP4_BASE	0x49026000</div><div class='add'>+#define OMAP34XX_MCBSP5_BASE	0x48096000</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_ARCH_OMAP15XX) || defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP730)</div><div class='ctx'> </div><div class='hunk'>@@ -81,9 +87,6 @@</div><div class='ctx'> #define OMAP_MCBSP_REG_XCERG	0x3A</div><div class='ctx'> #define OMAP_MCBSP_REG_XCERH	0x3C</div><div class='ctx'> </div><div class='del'>-#define OMAP_MAX_MCBSP_COUNT	3</div><div class='del'>-#define MAX_MCBSP_CLOCKS	3</div><div class='del'>-</div><div class='ctx'> #define AUDIO_MCBSP_DATAWRITE	(OMAP1510_MCBSP1_BASE + OMAP_MCBSP_REG_DXR1)</div><div class='ctx'> #define AUDIO_MCBSP_DATAREAD	(OMAP1510_MCBSP1_BASE + OMAP_MCBSP_REG_DRR1)</div><div class='ctx'> </div><div class='hunk'>@@ -91,12 +94,14 @@</div><div class='ctx'> #define AUDIO_DMA_TX		OMAP_DMA_MCBSP1_TX</div><div class='ctx'> #define AUDIO_DMA_RX		OMAP_DMA_MCBSP1_RX</div><div class='ctx'> </div><div class='del'>-#elif defined(CONFIG_ARCH_OMAP24XX)</div><div class='add'>+#elif defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX)</div><div class='ctx'> </div><div class='ctx'> #define OMAP_MCBSP_REG_DRR2	0x00</div><div class='ctx'> #define OMAP_MCBSP_REG_DRR1	0x04</div><div class='ctx'> #define OMAP_MCBSP_REG_DXR2	0x08</div><div class='ctx'> #define OMAP_MCBSP_REG_DXR1	0x0C</div><div class='add'>+#define OMAP_MCBSP_REG_DRR	0x00</div><div class='add'>+#define OMAP_MCBSP_REG_DXR	0x08</div><div class='ctx'> #define OMAP_MCBSP_REG_SPCR2	0x10</div><div class='ctx'> #define OMAP_MCBSP_REG_SPCR1	0x14</div><div class='ctx'> #define OMAP_MCBSP_REG_RCR2	0x18</div><div class='hunk'>@@ -124,9 +129,9 @@</div><div class='ctx'> #define OMAP_MCBSP_REG_RCERH	0x70</div><div class='ctx'> #define OMAP_MCBSP_REG_XCERG	0x74</div><div class='ctx'> #define OMAP_MCBSP_REG_XCERH	0x78</div><div class='del'>-</div><div class='del'>-#define OMAP_MAX_MCBSP_COUNT	2</div><div class='del'>-#define MAX_MCBSP_CLOCKS	2</div><div class='add'>+#define OMAP_MCBSP_REG_SYSCON	0x8C</div><div class='add'>+#define OMAP_MCBSP_REG_XCCR	0xAC</div><div class='add'>+#define OMAP_MCBSP_REG_RCCR	0xB0</div><div class='ctx'> </div><div class='ctx'> #define AUDIO_MCBSP_DATAWRITE	(OMAP24XX_MCBSP2_BASE + OMAP_MCBSP_REG_DXR1)</div><div class='ctx'> #define AUDIO_MCBSP_DATAREAD	(OMAP24XX_MCBSP2_BASE + OMAP_MCBSP_REG_DRR1)</div><div class='hunk'>@@ -137,10 +142,6 @@</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#define OMAP_MCBSP_READ(base, reg)		__raw_readw((base) + OMAP_MCBSP_REG_##reg)</div><div class='del'>-#define OMAP_MCBSP_WRITE(base, reg, val)	__raw_writew((val), (base) + OMAP_MCBSP_REG_##reg)</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> /************************** McBSP SPCR1 bit definitions ***********************/</div><div class='ctx'> #define RRST			0x0001</div><div class='ctx'> #define RRDY			0x0002</div><div class='hunk'>@@ -151,6 +152,7 @@</div><div class='ctx'> #define DXENA			0x0080</div><div class='ctx'> #define CLKSTP(value)		((value)&lt;&lt;11)	/* bits 11:12 */</div><div class='ctx'> #define RJUST(value)		((value)&lt;&lt;13)	/* bits 13:14 */</div><div class='add'>+#define ALB			0x8000</div><div class='ctx'> #define DLB			0x8000</div><div class='ctx'> </div><div class='ctx'> /************************** McBSP SPCR2 bit definitions ***********************/</div><div class='hunk'>@@ -228,6 +230,17 @@</div><div class='ctx'> #define XPABLK(value)		((value)&lt;&lt;5)	/* Bits 5:6 */</div><div class='ctx'> #define XPBBLK(value)		((value)&lt;&lt;7)	/* Bits 7:8 */</div><div class='ctx'> </div><div class='add'>+/*********************** McBSP XCCR bit definitions *************************/</div><div class='add'>+#define DILB			0x0020</div><div class='add'>+#define XDMAEN			0x0008</div><div class='add'>+#define XDISABLE		0x0001</div><div class='add'>+</div><div class='add'>+/********************** McBSP RCCR bit definitions *************************/</div><div class='add'>+#define RDMAEN			0x0008</div><div class='add'>+#define RDISABLE		0x0001</div><div class='add'>+</div><div class='add'>+/********************** McBSP SYSCONFIG bit definitions ********************/</div><div class='add'>+#define SOFTRST			0x0002</div><div class='ctx'> </div><div class='ctx'> /* we don't do multichannel for now */</div><div class='ctx'> struct omap_mcbsp_reg_cfg {</div><div class='hunk'>@@ -260,6 +273,8 @@ typedef enum {</div><div class='ctx'> 	OMAP_MCBSP1 = 0,</div><div class='ctx'> 	OMAP_MCBSP2,</div><div class='ctx'> 	OMAP_MCBSP3,</div><div class='add'>+	OMAP_MCBSP4,</div><div class='add'>+	OMAP_MCBSP5</div><div class='ctx'> } omap_mcbsp_id;</div><div class='ctx'> </div><div class='ctx'> typedef int __bitwise omap_mcbsp_io_type_t;</div><div class='hunk'>@@ -311,12 +326,10 @@ struct omap_mcbsp_spi_cfg {</div><div class='ctx'> struct omap_mcbsp_ops {</div><div class='ctx'> 	void (*request)(unsigned int);</div><div class='ctx'> 	void (*free)(unsigned int);</div><div class='del'>-	int (*check)(unsigned int);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct omap_mcbsp_platform_data {</div><div class='ctx'> 	unsigned long phys_base;</div><div class='del'>-	u32 virt_base;</div><div class='ctx'> 	u8 dma_rx_sync, dma_tx_sync;</div><div class='ctx'> 	u16 rx_irq, tx_irq;</div><div class='ctx'> 	struct omap_mcbsp_ops *ops;</div><div class='hunk'>@@ -326,7 +339,7 @@ struct omap_mcbsp_platform_data {</div><div class='ctx'> struct omap_mcbsp {</div><div class='ctx'> 	struct device *dev;</div><div class='ctx'> 	unsigned long phys_base;</div><div class='del'>-	u32 io_base;</div><div class='add'>+	void __iomem *io_base;</div><div class='ctx'> 	u8 id;</div><div class='ctx'> 	u8 free;</div><div class='ctx'> 	omap_mcbsp_word_length rx_word_length;</div><div class='hunk'>@@ -354,6 +367,8 @@ struct omap_mcbsp {</div><div class='ctx'> 	struct omap_mcbsp_platform_data *pdata;</div><div class='ctx'> 	struct clk *clk;</div><div class='ctx'> };</div><div class='add'>+extern struct omap_mcbsp **mcbsp_ptr;</div><div class='add'>+extern int omap_mcbsp_count;</div><div class='ctx'> </div><div class='ctx'> int omap_mcbsp_init(void);</div><div class='ctx'> void omap_mcbsp_register_board_cfg(struct omap_mcbsp_platform_data *config,</div><div class='hunk'>@@ -378,5 +393,6 @@ void omap_mcbsp_set_spi_mode(unsigned int id, const struct omap_mcbsp_spi_cfg *</div><div class='ctx'> /* Polled read/write functions */</div><div class='ctx'> int omap_mcbsp_pollread(unsigned int id, u16 * buf);</div><div class='ctx'> int omap_mcbsp_pollwrite(unsigned int id, u16 buf);</div><div class='add'>+int omap_mcbsp_set_io_type(unsigned int id, omap_mcbsp_io_type_t io_type);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/plat-omap/include/mach/memory.h b/arch/arm/plat-omap/include/mach/memory.h<br/>index a325caf80d04..d40cac60b959 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/include/mach/memory.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-omap/include/mach/memory.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/include/mach/memory.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/include/mach/memory.h</a></div><div class='hunk'>@@ -38,7 +38,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #if defined(CONFIG_ARCH_OMAP1)</div><div class='ctx'> #define PHYS_OFFSET		UL(0x10000000)</div><div class='del'>-#elif defined(CONFIG_ARCH_OMAP2)</div><div class='add'>+#elif defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)</div><div class='ctx'> #define PHYS_OFFSET		UL(0x80000000)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/plat-omap/include/mach/mtd-xip.h b/arch/arm/plat-omap/include/mach/mtd-xip.h<br/>index 5cee7e16a1b4..39b591ff54bb 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/include/mach/mtd-xip.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-omap/include/mach/mtd-xip.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/include/mach/mtd-xip.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/include/mach/mtd-xip.h</a></div><div class='hunk'>@@ -3,7 +3,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Do not include this file directly. It's included from linux/mtd/xip.h</div><div class='ctx'>  *</div><div class='del'>- * Author: Vladimir Barinov &lt;vbarinov@ru.mvista.com&gt;</div><div class='add'>+ * Author: Vladimir Barinov &lt;vbarinov@embeddedalley.com&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * (c) 2005 MontaVista Software, Inc.  This file is licensed under the</div><div class='ctx'>  * terms of the GNU General Public License version 2.  This program is</div><div class='head'>diff --git a/arch/arm/plat-omap/include/mach/mux.h b/arch/arm/plat-omap/include/mach/mux.h<br/>index 614b2c1327c7..6bbf1789bed5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/include/mach/mux.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-omap/include/mach/mux.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/include/mach/mux.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/include/mach/mux.h</a></div><div class='hunk'>@@ -125,20 +125,64 @@</div><div class='ctx'> 	.pu_pd_val	= pull_mode,				\</div><div class='ctx'> },</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-#define PULL_DISABLED	0</div><div class='del'>-#define PULL_ENABLED	1</div><div class='del'>-</div><div class='del'>-#define PULL_DOWN	0</div><div class='del'>-#define PULL_UP		1</div><div class='add'>+/* 24xx/34xx mux bit defines */</div><div class='add'>+#define OMAP2_PULL_ENA		(1 &lt;&lt; 3)</div><div class='add'>+#define OMAP2_PULL_UP		(1 &lt;&lt; 4)</div><div class='add'>+#define OMAP2_ALTELECTRICALSEL	(1 &lt;&lt; 5)</div><div class='add'>+</div><div class='add'>+/* 34xx specific mux bit defines */</div><div class='add'>+#define OMAP3_INPUT_EN		(1 &lt;&lt; 8)</div><div class='add'>+#define OMAP3_OFF_EN		(1 &lt;&lt; 9)</div><div class='add'>+#define OMAP3_OFFOUT_EN		(1 &lt;&lt; 10)</div><div class='add'>+#define OMAP3_OFFOUT_VAL	(1 &lt;&lt; 11)</div><div class='add'>+#define OMAP3_OFF_PULL_EN	(1 &lt;&lt; 12)</div><div class='add'>+#define OMAP3_OFF_PULL_UP	(1 &lt;&lt; 13)</div><div class='add'>+#define OMAP3_WAKEUP_EN		(1 &lt;&lt; 14)</div><div class='add'>+</div><div class='add'>+/* 34xx mux mode options for each pin. See TRM for options */</div><div class='add'>+#define	OMAP34XX_MUX_MODE0	0</div><div class='add'>+#define	OMAP34XX_MUX_MODE1	1</div><div class='add'>+#define	OMAP34XX_MUX_MODE2	2</div><div class='add'>+#define	OMAP34XX_MUX_MODE3	3</div><div class='add'>+#define	OMAP34XX_MUX_MODE4	4</div><div class='add'>+#define	OMAP34XX_MUX_MODE5	5</div><div class='add'>+#define	OMAP34XX_MUX_MODE6	6</div><div class='add'>+#define	OMAP34XX_MUX_MODE7	7</div><div class='add'>+</div><div class='add'>+/* 34xx active pin states */</div><div class='add'>+#define OMAP34XX_PIN_OUTPUT		0</div><div class='add'>+#define OMAP34XX_PIN_INPUT		OMAP3_INPUT_EN</div><div class='add'>+#define OMAP34XX_PIN_INPUT_PULLUP	(OMAP2_PULL_ENA | OMAP3_INPUT_EN \</div><div class='add'>+						| OMAP2_PULL_UP)</div><div class='add'>+#define OMAP34XX_PIN_INPUT_PULLDOWN	(OMAP2_PULL_ENA | OMAP3_INPUT_EN)</div><div class='add'>+</div><div class='add'>+/* 34xx off mode states */</div><div class='add'>+#define OMAP34XX_PIN_OFF_NONE           0</div><div class='add'>+#define OMAP34XX_PIN_OFF_OUTPUT_HIGH	(OMAP3_OFF_EN | OMAP3_OFFOUT_EN \</div><div class='add'>+						| OMAP3_OFFOUT_VAL)</div><div class='add'>+#define OMAP34XX_PIN_OFF_OUTPUT_LOW	(OMAP3_OFF_EN | OMAP3_OFFOUT_EN)</div><div class='add'>+#define OMAP34XX_PIN_OFF_INPUT_PULLUP	(OMAP3_OFF_EN | OMAP3_OFF_PULL_EN \</div><div class='add'>+						| OMAP3_OFF_PULL_UP)</div><div class='add'>+#define OMAP34XX_PIN_OFF_INPUT_PULLDOWN	(OMAP3_OFF_EN | OMAP3_OFF_PULL_EN)</div><div class='add'>+#define OMAP34XX_PIN_OFF_WAKEUPENABLE	OMAP3_WAKEUP_EN</div><div class='add'>+</div><div class='add'>+#define MUX_CFG_34XX(desc, reg_offset, mux_value) {		\</div><div class='add'>+	.name		= desc,					\</div><div class='add'>+	.debug		= 0,					\</div><div class='add'>+	.mux_reg	= reg_offset,				\</div><div class='add'>+	.mux_val	= mux_value				\</div><div class='add'>+},</div><div class='ctx'> </div><div class='ctx'> struct pin_config {</div><div class='del'>-	char *name;</div><div class='del'>-	unsigned char busy;</div><div class='del'>-	unsigned char debug;</div><div class='add'>+	char 			*name;</div><div class='add'>+	const unsigned int 	mux_reg;</div><div class='add'>+	unsigned char		debug;</div><div class='ctx'> </div><div class='del'>-	const char *mux_reg_name;</div><div class='del'>-	const unsigned int mux_reg;</div><div class='add'>+#if	defined(CONFIG_ARCH_OMAP34XX)</div><div class='add'>+	u16			mux_val; /* Wake-up, off mode, pull, mux mode */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if	defined(CONFIG_ARCH_OMAP1) || defined(CONFIG_ARCH_OMAP24XX)</div><div class='ctx'> 	const unsigned char mask_offset;</div><div class='ctx'> 	const unsigned char mask;</div><div class='ctx'> </div><div class='hunk'>@@ -150,6 +194,12 @@ struct pin_config {</div><div class='ctx'> 	const char *pu_pd_name;</div><div class='ctx'> 	const unsigned int pu_pd_reg;</div><div class='ctx'> 	const unsigned char pu_pd_val;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if	defined(CONFIG_OMAP_MUX_DEBUG) || defined(CONFIG_OMAP_MUX_WARNINGS)</div><div class='add'>+	const char *mux_reg_name;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum omap730_index {</div><div class='hunk'>@@ -593,6 +643,114 @@ enum omap24xx_index {</div><div class='ctx'> </div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum omap34xx_index {</div><div class='add'>+	/* 34xx I2C */</div><div class='add'>+	K21_34XX_I2C1_SCL,</div><div class='add'>+	J21_34XX_I2C1_SDA,</div><div class='add'>+	AF15_34XX_I2C2_SCL,</div><div class='add'>+	AE15_34XX_I2C2_SDA,</div><div class='add'>+	AF14_34XX_I2C3_SCL,</div><div class='add'>+	AG14_34XX_I2C3_SDA,</div><div class='add'>+	AD26_34XX_I2C4_SCL,</div><div class='add'>+	AE26_34XX_I2C4_SDA,</div><div class='add'>+</div><div class='add'>+	/* PHY - HSUSB: 12-pin ULPI PHY: Port 1*/</div><div class='add'>+	Y8_3430_USB1HS_PHY_CLK,</div><div class='add'>+	Y9_3430_USB1HS_PHY_STP,</div><div class='add'>+	AA14_3430_USB1HS_PHY_DIR,</div><div class='add'>+	AA11_3430_USB1HS_PHY_NXT,</div><div class='add'>+	W13_3430_USB1HS_PHY_DATA0,</div><div class='add'>+	W12_3430_USB1HS_PHY_DATA1,</div><div class='add'>+	W11_3430_USB1HS_PHY_DATA2,</div><div class='add'>+	Y11_3430_USB1HS_PHY_DATA3,</div><div class='add'>+	W9_3430_USB1HS_PHY_DATA4,</div><div class='add'>+	Y12_3430_USB1HS_PHY_DATA5,</div><div class='add'>+	W8_3430_USB1HS_PHY_DATA6,</div><div class='add'>+	Y13_3430_USB1HS_PHY_DATA7,</div><div class='add'>+</div><div class='add'>+	/* PHY - HSUSB: 12-pin ULPI PHY: Port 2*/</div><div class='add'>+	AA8_3430_USB2HS_PHY_CLK,</div><div class='add'>+	AA10_3430_USB2HS_PHY_STP,</div><div class='add'>+	AA9_3430_USB2HS_PHY_DIR,</div><div class='add'>+	AB11_3430_USB2HS_PHY_NXT,</div><div class='add'>+	AB10_3430_USB2HS_PHY_DATA0,</div><div class='add'>+	AB9_3430_USB2HS_PHY_DATA1,</div><div class='add'>+	W3_3430_USB2HS_PHY_DATA2,</div><div class='add'>+	T4_3430_USB2HS_PHY_DATA3,</div><div class='add'>+	T3_3430_USB2HS_PHY_DATA4,</div><div class='add'>+	R3_3430_USB2HS_PHY_DATA5,</div><div class='add'>+	R4_3430_USB2HS_PHY_DATA6,</div><div class='add'>+	T2_3430_USB2HS_PHY_DATA7,</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	/* TLL - HSUSB: 12-pin TLL Port 1*/</div><div class='add'>+	Y8_3430_USB1HS_TLL_CLK,</div><div class='add'>+	Y9_3430_USB1HS_TLL_STP,</div><div class='add'>+	AA14_3430_USB1HS_TLL_DIR,</div><div class='add'>+	AA11_3430_USB1HS_TLL_NXT,</div><div class='add'>+	W13_3430_USB1HS_TLL_DATA0,</div><div class='add'>+	W12_3430_USB1HS_TLL_DATA1,</div><div class='add'>+	W11_3430_USB1HS_TLL_DATA2,</div><div class='add'>+	Y11_3430_USB1HS_TLL_DATA3,</div><div class='add'>+	W9_3430_USB1HS_TLL_DATA4,</div><div class='add'>+	Y12_3430_USB1HS_TLL_DATA5,</div><div class='add'>+	W8_3430_USB1HS_TLL_DATA6,</div><div class='add'>+	Y13_3430_USB1HS_TLL_DATA7,</div><div class='add'>+</div><div class='add'>+	/* TLL - HSUSB: 12-pin TLL Port 2*/</div><div class='add'>+	AA8_3430_USB2HS_TLL_CLK,</div><div class='add'>+	AA10_3430_USB2HS_TLL_STP,</div><div class='add'>+	AA9_3430_USB2HS_TLL_DIR,</div><div class='add'>+	AB11_3430_USB2HS_TLL_NXT,</div><div class='add'>+	AB10_3430_USB2HS_TLL_DATA0,</div><div class='add'>+	AB9_3430_USB2HS_TLL_DATA1,</div><div class='add'>+	W3_3430_USB2HS_TLL_DATA2,</div><div class='add'>+	T4_3430_USB2HS_TLL_DATA3,</div><div class='add'>+	T3_3430_USB2HS_TLL_DATA4,</div><div class='add'>+	R3_3430_USB2HS_TLL_DATA5,</div><div class='add'>+	R4_3430_USB2HS_TLL_DATA6,</div><div class='add'>+	T2_3430_USB2HS_TLL_DATA7,</div><div class='add'>+</div><div class='add'>+	/* TLL - HSUSB: 12-pin TLL Port 3*/</div><div class='add'>+	AA6_3430_USB3HS_TLL_CLK,</div><div class='add'>+	AB3_3430_USB3HS_TLL_STP,</div><div class='add'>+	AA3_3430_USB3HS_TLL_DIR,</div><div class='add'>+	Y3_3430_USB3HS_TLL_NXT,</div><div class='add'>+	AA5_3430_USB3HS_TLL_DATA0,</div><div class='add'>+	Y4_3430_USB3HS_TLL_DATA1,</div><div class='add'>+	Y5_3430_USB3HS_TLL_DATA2,</div><div class='add'>+	W5_3430_USB3HS_TLL_DATA3,</div><div class='add'>+	AB12_3430_USB3HS_TLL_DATA4,</div><div class='add'>+	AB13_3430_USB3HS_TLL_DATA5,</div><div class='add'>+	AA13_3430_USB3HS_TLL_DATA6,</div><div class='add'>+	AA12_3430_USB3HS_TLL_DATA7,</div><div class='add'>+</div><div class='add'>+	/* PHY FSUSB: FS Serial for Port 1 (multiple PHY modes supported) */</div><div class='add'>+	AF10_3430_USB1FS_PHY_MM1_RXDP,</div><div class='add'>+	AG9_3430_USB1FS_PHY_MM1_RXDM,</div><div class='add'>+	W13_3430_USB1FS_PHY_MM1_RXRCV,</div><div class='add'>+	W12_3430_USB1FS_PHY_MM1_TXSE0,</div><div class='add'>+	W11_3430_USB1FS_PHY_MM1_TXDAT,</div><div class='add'>+	Y11_3430_USB1FS_PHY_MM1_TXEN_N,</div><div class='add'>+</div><div class='add'>+	/* PHY FSUSB: FS Serial for Port 2 (multiple PHY modes supported) */</div><div class='add'>+	AF7_3430_USB2FS_PHY_MM2_RXDP,</div><div class='add'>+	AH7_3430_USB2FS_PHY_MM2_RXDM,</div><div class='add'>+	AB10_3430_USB2FS_PHY_MM2_RXRCV,</div><div class='add'>+	AB9_3430_USB2FS_PHY_MM2_TXSE0,</div><div class='add'>+	W3_3430_USB2FS_PHY_MM2_TXDAT,</div><div class='add'>+	T4_3430_USB2FS_PHY_MM2_TXEN_N,</div><div class='add'>+</div><div class='add'>+	/* PHY FSUSB: FS Serial for Port 3 (multiple PHY modes supported) */</div><div class='add'>+	AH3_3430_USB3FS_PHY_MM3_RXDP,</div><div class='add'>+	AE3_3430_USB3FS_PHY_MM3_RXDM,</div><div class='add'>+	AD1_3430_USB3FS_PHY_MM3_RXRCV,</div><div class='add'>+	AE1_3430_USB3FS_PHY_MM3_TXSE0,</div><div class='add'>+	AD2_3430_USB3FS_PHY_MM3_TXDAT,</div><div class='add'>+	AC1_3430_USB3FS_PHY_MM3_TXEN_N,</div><div class='add'>+</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct omap_mux_cfg {</div><div class='ctx'> 	struct pin_config	*pins;</div><div class='ctx'> 	unsigned long		size;</div><div class='head'>diff --git a/arch/arm/plat-omap/include/mach/omap1510.h b/arch/arm/plat-omap/include/mach/omap1510.h<br/>index 505a38af8b22..d24004668138 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/include/mach/omap1510.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-omap/include/mach/omap1510.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/include/mach/omap1510.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/include/mach/omap1510.h</a></div><div class='hunk'>@@ -44,5 +44,7 @@</div><div class='ctx'> #define OMAP1510_DSPREG_SIZE	SZ_128K</div><div class='ctx'> #define OMAP1510_DSPREG_START	0xE1000000</div><div class='ctx'> </div><div class='add'>+#define OMAP1510_DSP_MMU_BASE	(0xfffed200)</div><div class='add'>+</div><div class='ctx'> #endif /*  __ASM_ARCH_OMAP15XX_H */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/plat-omap/include/mach/omap16xx.h b/arch/arm/plat-omap/include/mach/omap16xx.h<br/>index c6c93afb2788..0e69b504c25f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/include/mach/omap16xx.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-omap/include/mach/omap16xx.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/include/mach/omap16xx.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/include/mach/omap16xx.h</a></div><div class='hunk'>@@ -44,6 +44,11 @@</div><div class='ctx'> #define OMAP16XX_DSPREG_SIZE	SZ_128K</div><div class='ctx'> #define OMAP16XX_DSPREG_START	0xE1000000</div><div class='ctx'> </div><div class='add'>+#define OMAP16XX_SEC_BASE	0xFFFE4000</div><div class='add'>+#define OMAP16XX_SEC_DES	(OMAP16XX_SEC_BASE + 0x0000)</div><div class='add'>+#define OMAP16XX_SEC_SHA1MD5	(OMAP16XX_SEC_BASE + 0x0800)</div><div class='add'>+#define OMAP16XX_SEC_RNG	(OMAP16XX_SEC_BASE + 0x1000)</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * ---------------------------------------------------------------------------</div><div class='ctx'>  * Interrupts</div><div class='hunk'>@@ -190,7 +195,7 @@</div><div class='ctx'> #define WSPR_DISABLE_0         (0x0000aaaa)</div><div class='ctx'> #define WSPR_DISABLE_1         (0x00005555)</div><div class='ctx'> </div><div class='del'>-/* Mailbox */</div><div class='add'>+#define OMAP16XX_DSP_MMU_BASE	(0xfffed200)</div><div class='ctx'> #define OMAP16XX_MAILBOX_BASE	(0xfffcf000)</div><div class='ctx'> </div><div class='ctx'> #endif /*  __ASM_ARCH_OMAP16XX_H */</div><div class='head'>diff --git a/arch/arm/plat-omap/include/mach/omap24xx.h b/arch/arm/plat-omap/include/mach/omap24xx.h<br/>index bb8319d66e9f..24335d4932f5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/include/mach/omap24xx.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-omap/include/mach/omap24xx.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/include/mach/omap24xx.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/include/mach/omap24xx.h</a></div><div class='hunk'>@@ -39,7 +39,6 @@</div><div class='ctx'> /* interrupt controller */</div><div class='ctx'> #define OMAP24XX_IC_BASE	(L4_24XX_BASE + 0xfe000)</div><div class='ctx'> #define OMAP24XX_IVA_INTC_BASE	0x40000000</div><div class='del'>-#define IRQ_SIR_IRQ		0x0040</div><div class='ctx'> </div><div class='ctx'> #define OMAP2420_CTRL_BASE	L4_24XX_BASE</div><div class='ctx'> #define OMAP2420_32KSYNCT_BASE	(L4_24XX_BASE + 0x4000)</div><div class='hunk'>@@ -48,6 +47,7 @@</div><div class='ctx'> #define OMAP2420_PRM_BASE	OMAP2420_CM_BASE</div><div class='ctx'> #define OMAP2420_SDRC_BASE	(L3_24XX_BASE + 0x9000)</div><div class='ctx'> #define OMAP2420_SMS_BASE	0x68008000</div><div class='add'>+#define OMAP2420_GPMC_BASE	0x6800a000</div><div class='ctx'> </div><div class='ctx'> #define OMAP2430_32KSYNCT_BASE	(L4_WK_243X_BASE + 0x20000)</div><div class='ctx'> #define OMAP2430_PRCM_BASE	(L4_WK_243X_BASE + 0x6000)</div><div class='head'>diff --git a/arch/arm/plat-omap/include/mach/omapfb.h b/arch/arm/plat-omap/include/mach/omapfb.h<br/>index cae037d13079..ec67fb428607 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/include/mach/omapfb.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-omap/include/mach/omapfb.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/include/mach/omapfb.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/include/mach/omapfb.h</a></div><div class='hunk'>@@ -62,6 +62,7 @@</div><div class='ctx'> #define OMAPFB_CAPS_WINDOW_PIXEL_DOUBLE	0x00010000</div><div class='ctx'> #define OMAPFB_CAPS_WINDOW_SCALE	0x00020000</div><div class='ctx'> #define OMAPFB_CAPS_WINDOW_OVERLAY	0x00040000</div><div class='add'>+#define OMAPFB_CAPS_WINDOW_ROTATE	0x00080000</div><div class='ctx'> #define OMAPFB_CAPS_SET_BACKLIGHT	0x01000000</div><div class='ctx'> </div><div class='ctx'> /* Values from DSP must map to lower 16-bits */</div><div class='hunk'>@@ -305,6 +306,7 @@ struct lcd_ctrl {</div><div class='ctx'> 					   int screen_width,</div><div class='ctx'> 					   int pos_x, int pos_y, int width,</div><div class='ctx'> 					   int height, int color_mode);</div><div class='add'>+	int		(*set_rotate)	  (int angle);</div><div class='ctx'> 	int		(*setup_mem)	  (int plane, size_t size,</div><div class='ctx'> 					   int mem_type, unsigned long *paddr);</div><div class='ctx'> 	int		(*mmap)		  (struct fb_info *info,</div><div class='hunk'>@@ -374,6 +376,7 @@ extern struct lcd_ctrl omap1_lcd_ctrl;</div><div class='ctx'> extern struct lcd_ctrl omap2_disp_ctrl;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+extern void omapfb_reserve_sdram(void);</div><div class='ctx'> extern void omapfb_register_panel(struct lcd_panel *panel);</div><div class='ctx'> extern void omapfb_write_first_pixel(struct omapfb_device *fbdev, u16 pixval);</div><div class='ctx'> extern void omapfb_notify_clients(struct omapfb_device *fbdev,</div><div class='head'>diff --git a/arch/arm/plat-omap/include/mach/pm.h b/arch/arm/plat-omap/include/mach/pm.h<br/>index bfa09325a5ff..768eb6e7abcf 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/include/mach/pm.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-omap/include/mach/pm.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/include/mach/pm.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/include/mach/pm.h</a></div><div class='hunk'>@@ -39,11 +39,11 @@</div><div class='ctx'>  * Register and offset definitions to be used in PM assembler code</div><div class='ctx'>  * ----------------------------------------------------------------------------</div><div class='ctx'>  */</div><div class='del'>-#define CLKGEN_REG_ASM_BASE		io_p2v(0xfffece00)</div><div class='add'>+#define CLKGEN_REG_ASM_BASE		IO_ADDRESS(0xfffece00)</div><div class='ctx'> #define ARM_IDLECT1_ASM_OFFSET		0x04</div><div class='ctx'> #define ARM_IDLECT2_ASM_OFFSET		0x08</div><div class='ctx'> </div><div class='del'>-#define TCMIF_ASM_BASE			io_p2v(0xfffecc00)</div><div class='add'>+#define TCMIF_ASM_BASE			IO_ADDRESS(0xfffecc00)</div><div class='ctx'> #define EMIFS_CONFIG_ASM_OFFSET		0x0c</div><div class='ctx'> #define EMIFF_SDRAM_CONFIG_ASM_OFFSET	0x20</div><div class='ctx'> </div><div class='hunk'>@@ -135,7 +135,8 @@ extern void omap_pm_suspend(void);</div><div class='ctx'> extern void omap730_cpu_suspend(unsigned short, unsigned short);</div><div class='ctx'> extern void omap1510_cpu_suspend(unsigned short, unsigned short);</div><div class='ctx'> extern void omap1610_cpu_suspend(unsigned short, unsigned short);</div><div class='del'>-extern void omap24xx_cpu_suspend(u32 dll_ctrl, u32 cpu_revision);</div><div class='add'>+extern void omap24xx_cpu_suspend(u32 dll_ctrl, void __iomem *sdrc_dlla_ctrl,</div><div class='add'>+					void __iomem *sdrc_power);</div><div class='ctx'> extern void omap730_idle_loop_suspend(void);</div><div class='ctx'> extern void omap1510_idle_loop_suspend(void);</div><div class='ctx'> extern void omap1610_idle_loop_suspend(void);</div><div class='head'>diff --git a/arch/arm/plat-omap/include/mach/powerdomain.h b/arch/arm/plat-omap/include/mach/powerdomain.h<br/>new file mode 100644<br/>index 000000000000..2806a9c8e4d7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/include/mach/powerdomain.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/include/mach/powerdomain.h</a></div><div class='hunk'>@@ -0,0 +1,166 @@</div><div class='add'>+/*</div><div class='add'>+ * OMAP2/3 powerdomain control</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2007-8 Texas Instruments, Inc.</div><div class='add'>+ * Copyright (C) 2007-8 Nokia Corporation</div><div class='add'>+ *</div><div class='add'>+ * Written by Paul Walmsley</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef ASM_ARM_ARCH_OMAP_POWERDOMAIN</div><div class='add'>+#define ASM_ARM_ARCH_OMAP_POWERDOMAIN</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/atomic.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;mach/cpu.h&gt;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Powerdomain basic power states */</div><div class='add'>+#define PWRDM_POWER_OFF		0x0</div><div class='add'>+#define PWRDM_POWER_RET		0x1</div><div class='add'>+#define PWRDM_POWER_INACTIVE	0x2</div><div class='add'>+#define PWRDM_POWER_ON		0x3</div><div class='add'>+</div><div class='add'>+/* Powerdomain allowable state bitfields */</div><div class='add'>+#define PWRSTS_OFF_ON		((1 &lt;&lt; PWRDM_POWER_OFF) | \</div><div class='add'>+				 (1 &lt;&lt; PWRDM_POWER_ON))</div><div class='add'>+</div><div class='add'>+#define PWRSTS_OFF_RET		((1 &lt;&lt; PWRDM_POWER_OFF) | \</div><div class='add'>+				 (1 &lt;&lt; PWRDM_POWER_RET))</div><div class='add'>+</div><div class='add'>+#define PWRSTS_OFF_RET_ON	(PWRSTS_OFF_RET | (1 &lt;&lt; PWRDM_POWER_ON))</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Powerdomain flags */</div><div class='add'>+#define PWRDM_HAS_HDWR_SAR	(1 &lt;&lt; 0) /* hardware save-and-restore support */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Number of memory banks that are power-controllable.	On OMAP3430, the</div><div class='add'>+ * maximum is 4.</div><div class='add'>+ */</div><div class='add'>+#define PWRDM_MAX_MEM_BANKS	4</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Maximum number of clockdomains that can be associated with a powerdomain.</div><div class='add'>+ * CORE powerdomain is probably the worst case.</div><div class='add'>+ */</div><div class='add'>+#define PWRDM_MAX_CLKDMS	3</div><div class='add'>+</div><div class='add'>+/* XXX A completely arbitrary number. What is reasonable here? */</div><div class='add'>+#define PWRDM_TRANSITION_BAILOUT 100000</div><div class='add'>+</div><div class='add'>+struct clockdomain;</div><div class='add'>+struct powerdomain;</div><div class='add'>+</div><div class='add'>+/* Encodes dependencies between powerdomains - statically defined */</div><div class='add'>+struct pwrdm_dep {</div><div class='add'>+</div><div class='add'>+	/* Powerdomain name */</div><div class='add'>+	const char *pwrdm_name;</div><div class='add'>+</div><div class='add'>+	/* Powerdomain pointer - resolved by the powerdomain code */</div><div class='add'>+	struct powerdomain *pwrdm;</div><div class='add'>+</div><div class='add'>+	/* Flags to mark OMAP chip restrictions, etc. */</div><div class='add'>+	const struct omap_chip_id omap_chip;</div><div class='add'>+</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct powerdomain {</div><div class='add'>+</div><div class='add'>+	/* Powerdomain name */</div><div class='add'>+	const char *name;</div><div class='add'>+</div><div class='add'>+	/* the address offset from CM_BASE/PRM_BASE */</div><div class='add'>+	const s16 prcm_offs;</div><div class='add'>+</div><div class='add'>+	/* Used to represent the OMAP chip types containing this pwrdm */</div><div class='add'>+	const struct omap_chip_id omap_chip;</div><div class='add'>+</div><div class='add'>+	/* Bit shift of this powerdomain's PM_WKDEP/CM_SLEEPDEP bit */</div><div class='add'>+	const u8 dep_bit;</div><div class='add'>+</div><div class='add'>+	/* Powerdomains that can be told to wake this powerdomain up */</div><div class='add'>+	struct pwrdm_dep *wkdep_srcs;</div><div class='add'>+</div><div class='add'>+	/* Powerdomains that can be told to keep this pwrdm from inactivity */</div><div class='add'>+	struct pwrdm_dep *sleepdep_srcs;</div><div class='add'>+</div><div class='add'>+	/* Possible powerdomain power states */</div><div class='add'>+	const u8 pwrsts;</div><div class='add'>+</div><div class='add'>+	/* Possible logic power states when pwrdm in RETENTION */</div><div class='add'>+	const u8 pwrsts_logic_ret;</div><div class='add'>+</div><div class='add'>+	/* Powerdomain flags */</div><div class='add'>+	const u8 flags;</div><div class='add'>+</div><div class='add'>+	/* Number of software-controllable memory banks in this powerdomain */</div><div class='add'>+	const u8 banks;</div><div class='add'>+</div><div class='add'>+	/* Possible memory bank pwrstates when pwrdm in RETENTION */</div><div class='add'>+	const u8 pwrsts_mem_ret[PWRDM_MAX_MEM_BANKS];</div><div class='add'>+</div><div class='add'>+	/* Possible memory bank pwrstates when pwrdm is ON */</div><div class='add'>+	const u8 pwrsts_mem_on[PWRDM_MAX_MEM_BANKS];</div><div class='add'>+</div><div class='add'>+	/* Clockdomains in this powerdomain */</div><div class='add'>+	struct clockdomain *pwrdm_clkdms[PWRDM_MAX_CLKDMS];</div><div class='add'>+</div><div class='add'>+	struct list_head node;</div><div class='add'>+</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+void pwrdm_init(struct powerdomain **pwrdm_list);</div><div class='add'>+</div><div class='add'>+int pwrdm_register(struct powerdomain *pwrdm);</div><div class='add'>+int pwrdm_unregister(struct powerdomain *pwrdm);</div><div class='add'>+struct powerdomain *pwrdm_lookup(const char *name);</div><div class='add'>+</div><div class='add'>+int pwrdm_for_each(int (*fn)(struct powerdomain *pwrdm));</div><div class='add'>+</div><div class='add'>+int pwrdm_add_clkdm(struct powerdomain *pwrdm, struct clockdomain *clkdm);</div><div class='add'>+int pwrdm_del_clkdm(struct powerdomain *pwrdm, struct clockdomain *clkdm);</div><div class='add'>+int pwrdm_for_each_clkdm(struct powerdomain *pwrdm,</div><div class='add'>+			 int (*fn)(struct powerdomain *pwrdm,</div><div class='add'>+				   struct clockdomain *clkdm));</div><div class='add'>+</div><div class='add'>+int pwrdm_add_wkdep(struct powerdomain *pwrdm1, struct powerdomain *pwrdm2);</div><div class='add'>+int pwrdm_del_wkdep(struct powerdomain *pwrdm1, struct powerdomain *pwrdm2);</div><div class='add'>+int pwrdm_read_wkdep(struct powerdomain *pwrdm1, struct powerdomain *pwrdm2);</div><div class='add'>+int pwrdm_add_sleepdep(struct powerdomain *pwrdm1, struct powerdomain *pwrdm2);</div><div class='add'>+int pwrdm_del_sleepdep(struct powerdomain *pwrdm1, struct powerdomain *pwrdm2);</div><div class='add'>+int pwrdm_read_sleepdep(struct powerdomain *pwrdm1, struct powerdomain *pwrdm2);</div><div class='add'>+</div><div class='add'>+int pwrdm_get_mem_bank_count(struct powerdomain *pwrdm);</div><div class='add'>+</div><div class='add'>+int pwrdm_set_next_pwrst(struct powerdomain *pwrdm, u8 pwrst);</div><div class='add'>+int pwrdm_read_next_pwrst(struct powerdomain *pwrdm);</div><div class='add'>+int pwrdm_read_prev_pwrst(struct powerdomain *pwrdm);</div><div class='add'>+int pwrdm_clear_all_prev_pwrst(struct powerdomain *pwrdm);</div><div class='add'>+</div><div class='add'>+int pwrdm_set_logic_retst(struct powerdomain *pwrdm, u8 pwrst);</div><div class='add'>+int pwrdm_set_mem_onst(struct powerdomain *pwrdm, u8 bank, u8 pwrst);</div><div class='add'>+int pwrdm_set_mem_retst(struct powerdomain *pwrdm, u8 bank, u8 pwrst);</div><div class='add'>+</div><div class='add'>+int pwrdm_read_logic_pwrst(struct powerdomain *pwrdm);</div><div class='add'>+int pwrdm_read_prev_logic_pwrst(struct powerdomain *pwrdm);</div><div class='add'>+int pwrdm_read_mem_pwrst(struct powerdomain *pwrdm, u8 bank);</div><div class='add'>+int pwrdm_read_prev_mem_pwrst(struct powerdomain *pwrdm, u8 bank);</div><div class='add'>+</div><div class='add'>+int pwrdm_enable_hdwr_sar(struct powerdomain *pwrdm);</div><div class='add'>+int pwrdm_disable_hdwr_sar(struct powerdomain *pwrdm);</div><div class='add'>+bool pwrdm_has_hdwr_sar(struct powerdomain *pwrdm);</div><div class='add'>+</div><div class='add'>+int pwrdm_wait_transition(struct powerdomain *pwrdm);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/arm/plat-omap/include/mach/sdrc.h b/arch/arm/plat-omap/include/mach/sdrc.h<br/>index 787b7acec546..a98c6c3beb2c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/include/mach/sdrc.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-omap/include/mach/sdrc.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/include/mach/sdrc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/include/mach/sdrc.h</a></div><div class='hunk'>@@ -25,6 +25,8 @@</div><div class='ctx'> #define SDRC_DLLB_STATUS	0x06C</div><div class='ctx'> #define SDRC_POWER		0x070</div><div class='ctx'> #define SDRC_MR_0		0x084</div><div class='add'>+#define SDRC_ACTIM_CTRL_A_0	0x09c</div><div class='add'>+#define SDRC_ACTIM_CTRL_B_0	0x0a0</div><div class='ctx'> #define SDRC_RFR_CTRL_0		0x0a4</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -63,9 +65,9 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#define OMAP242X_SMS_REGADDR(reg)	(void __iomem *)IO_ADDRESS(OMAP2420_SMS_BASE + reg)</div><div class='del'>-#define OMAP243X_SMS_REGADDR(reg)	(void __iomem *)IO_ADDRESS(OMAP243X_SMS_BASE + reg)</div><div class='del'>-#define OMAP343X_SMS_REGADDR(reg)	(void __iomem *)IO_ADDRESS(OMAP343X_SMS_BASE + reg)</div><div class='add'>+#define OMAP242X_SMS_REGADDR(reg)	IO_ADDRESS(OMAP2420_SMS_BASE + reg)</div><div class='add'>+#define OMAP243X_SMS_REGADDR(reg)	IO_ADDRESS(OMAP243X_SMS_BASE + reg)</div><div class='add'>+#define OMAP343X_SMS_REGADDR(reg)	IO_ADDRESS(OMAP343X_SMS_BASE + reg)</div><div class='ctx'> </div><div class='ctx'> /* SMS register offsets - read/write with sms_{read,write}_reg() */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/plat-omap/include/mach/serial.h b/arch/arm/plat-omap/include/mach/serial.h<br/>index cc6bfa51ccb5..8a676a04be48 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/include/mach/serial.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-omap/include/mach/serial.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/include/mach/serial.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/include/mach/serial.h</a></div><div class='hunk'>@@ -20,18 +20,24 @@</div><div class='ctx'> #define OMAP_UART1_BASE		0x4806a000</div><div class='ctx'> #define OMAP_UART2_BASE		0x4806c000</div><div class='ctx'> #define OMAP_UART3_BASE		0x4806e000</div><div class='add'>+#elif defined(CONFIG_ARCH_OMAP3)</div><div class='add'>+/* OMAP3 serial ports */</div><div class='add'>+#define OMAP_UART1_BASE		0x4806a000</div><div class='add'>+#define OMAP_UART2_BASE		0x4806c000</div><div class='add'>+#define OMAP_UART3_BASE		0x49020000</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #define OMAP_MAX_NR_PORTS	3</div><div class='ctx'> #define OMAP1510_BASE_BAUD	(12000000/16)</div><div class='ctx'> #define OMAP16XX_BASE_BAUD	(48000000/16)</div><div class='add'>+#define OMAP24XX_BASE_BAUD	(48000000/16)</div><div class='ctx'> </div><div class='del'>-#define is_omap_port(p)	({int __ret = 0;			\</div><div class='del'>-			if (p == IO_ADDRESS(OMAP_UART1_BASE) ||	\</div><div class='del'>-			    p == IO_ADDRESS(OMAP_UART2_BASE) ||	\</div><div class='del'>-			    p == IO_ADDRESS(OMAP_UART3_BASE))	\</div><div class='del'>-				__ret = 1;			\</div><div class='del'>-			__ret;					\</div><div class='add'>+#define is_omap_port(pt)	({int __ret = 0;			\</div><div class='add'>+			if ((pt)-&gt;port.mapbase == OMAP_UART1_BASE ||	\</div><div class='add'>+			    (pt)-&gt;port.mapbase == OMAP_UART2_BASE ||	\</div><div class='add'>+			    (pt)-&gt;port.mapbase == OMAP_UART3_BASE)	\</div><div class='add'>+				__ret = 1;				\</div><div class='add'>+			__ret;						\</div><div class='ctx'> 			})</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/plat-omap/include/mach/sram.h b/arch/arm/plat-omap/include/mach/sram.h<br/>index e09323449981..ab35d622dcf5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/include/mach/sram.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-omap/include/mach/sram.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/include/mach/sram.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/include/mach/sram.h</a></div><div class='hunk'>@@ -21,6 +21,10 @@ extern void omap2_sram_reprogram_sdrc(u32 perf_level, u32 dll_val,</div><div class='ctx'> 				      u32 mem_type);</div><div class='ctx'> extern u32 omap2_set_prcm(u32 dpll_ctrl_val, u32 sdrc_rfr_val, int bypass);</div><div class='ctx'> </div><div class='add'>+extern u32 omap3_configure_core_dpll(u32 sdrc_rfr_ctrl,</div><div class='add'>+				     u32 sdrc_actim_ctrla,</div><div class='add'>+				     u32 sdrc_actim_ctrlb, u32 m2);</div><div class='add'>+</div><div class='ctx'> /* Do not use these */</div><div class='ctx'> extern void omap1_sram_reprogram_clock(u32 ckctl, u32 dpllctl);</div><div class='ctx'> extern unsigned long omap1_sram_reprogram_clock_sz;</div><div class='hunk'>@@ -53,4 +57,10 @@ extern void omap243x_sram_reprogram_sdrc(u32 perf_level, u32 dll_val,</div><div class='ctx'> 						u32 mem_type);</div><div class='ctx'> extern unsigned long omap243x_sram_reprogram_sdrc_sz;</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+extern u32 omap3_sram_configure_core_dpll(u32 sdrc_rfr_ctrl,</div><div class='add'>+					  u32 sdrc_actim_ctrla,</div><div class='add'>+					  u32 sdrc_actim_ctrlb, u32 m2);</div><div class='add'>+extern unsigned long omap3_sram_configure_core_dpll_sz;</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/plat-omap/include/mach/system.h b/arch/arm/plat-omap/include/mach/system.h<br/>index 06a28c7b98de..06923f261545 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/include/mach/system.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-omap/include/mach/system.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/include/mach/system.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/include/mach/system.h</a></div><div class='hunk'>@@ -40,7 +40,7 @@ static inline void omap1_arch_reset(char mode)</div><div class='ctx'> </div><div class='ctx'> static inline void arch_reset(char mode)</div><div class='ctx'> {</div><div class='del'>-	if (!cpu_is_omap24xx())</div><div class='add'>+	if (!cpu_class_is_omap2())</div><div class='ctx'> 		omap1_arch_reset(mode);</div><div class='ctx'> 	else</div><div class='ctx'> 		omap_prcm_arch_reset(mode);</div><div class='head'>diff --git a/arch/arm/plat-omap/io.c b/arch/arm/plat-omap/io.c<br/>new file mode 100644<br/>index 000000000000..af326efc1ad3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/io.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/io.c</a></div><div class='hunk'>@@ -0,0 +1,107 @@</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;mach/omap730.h&gt;</div><div class='add'>+#include &lt;mach/omap1510.h&gt;</div><div class='add'>+#include &lt;mach/omap16xx.h&gt;</div><div class='add'>+#include &lt;mach/omap24xx.h&gt;</div><div class='add'>+#include &lt;mach/omap34xx.h&gt;</div><div class='add'>+</div><div class='add'>+#define BETWEEN(p,st,sz)	((p) &gt;= (st) &amp;&amp; (p) &lt; ((st) + (sz)))</div><div class='add'>+#define XLATE(p,pst,vst)	((void __iomem *)((p) - (pst) + (vst)))</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Intercept ioremap() requests for addresses in our fixed mapping regions.</div><div class='add'>+ */</div><div class='add'>+void __iomem *omap_ioremap(unsigned long p, size_t size, unsigned int type)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_ARCH_OMAP1</div><div class='add'>+	if (cpu_class_is_omap1()) {</div><div class='add'>+		if (BETWEEN(p, IO_PHYS, IO_SIZE))</div><div class='add'>+			return XLATE(p, IO_PHYS, IO_VIRT);</div><div class='add'>+	}</div><div class='add'>+	if (cpu_is_omap730()) {</div><div class='add'>+		if (BETWEEN(p, OMAP730_DSP_BASE, OMAP730_DSP_SIZE))</div><div class='add'>+			return XLATE(p, OMAP730_DSP_BASE, OMAP730_DSP_START);</div><div class='add'>+</div><div class='add'>+		if (BETWEEN(p, OMAP730_DSPREG_BASE, OMAP730_DSPREG_SIZE))</div><div class='add'>+			return XLATE(p, OMAP730_DSPREG_BASE,</div><div class='add'>+					OMAP730_DSPREG_START);</div><div class='add'>+	}</div><div class='add'>+	if (cpu_is_omap15xx()) {</div><div class='add'>+		if (BETWEEN(p, OMAP1510_DSP_BASE, OMAP1510_DSP_SIZE))</div><div class='add'>+			return XLATE(p, OMAP1510_DSP_BASE, OMAP1510_DSP_START);</div><div class='add'>+</div><div class='add'>+		if (BETWEEN(p, OMAP1510_DSPREG_BASE, OMAP1510_DSPREG_SIZE))</div><div class='add'>+			return XLATE(p, OMAP1510_DSPREG_BASE,</div><div class='add'>+					OMAP1510_DSPREG_START);</div><div class='add'>+	}</div><div class='add'>+	if (cpu_is_omap16xx()) {</div><div class='add'>+		if (BETWEEN(p, OMAP16XX_DSP_BASE, OMAP16XX_DSP_SIZE))</div><div class='add'>+			return XLATE(p, OMAP16XX_DSP_BASE, OMAP16XX_DSP_START);</div><div class='add'>+</div><div class='add'>+		if (BETWEEN(p, OMAP16XX_DSPREG_BASE, OMAP16XX_DSPREG_SIZE))</div><div class='add'>+			return XLATE(p, OMAP16XX_DSPREG_BASE,</div><div class='add'>+					OMAP16XX_DSPREG_START);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_ARCH_OMAP2</div><div class='add'>+	if (cpu_is_omap24xx()) {</div><div class='add'>+		if (BETWEEN(p, L3_24XX_PHYS, L3_24XX_SIZE))</div><div class='add'>+			return XLATE(p, L3_24XX_PHYS, L3_24XX_VIRT);</div><div class='add'>+		if (BETWEEN(p, L4_24XX_PHYS, L4_24XX_SIZE))</div><div class='add'>+			return XLATE(p, L4_24XX_PHYS, L4_24XX_VIRT);</div><div class='add'>+	}</div><div class='add'>+	if (cpu_is_omap2420()) {</div><div class='add'>+		if (BETWEEN(p, DSP_MEM_24XX_PHYS, DSP_MEM_24XX_SIZE))</div><div class='add'>+			return XLATE(p, DSP_MEM_24XX_PHYS, DSP_MEM_24XX_VIRT);</div><div class='add'>+		if (BETWEEN(p, DSP_IPI_24XX_PHYS, DSP_IPI_24XX_SIZE))</div><div class='add'>+			return XLATE(p, DSP_IPI_24XX_PHYS, DSP_IPI_24XX_SIZE);</div><div class='add'>+		if (BETWEEN(p, DSP_MMU_24XX_PHYS, DSP_MMU_24XX_SIZE))</div><div class='add'>+			return XLATE(p, DSP_MMU_24XX_PHYS, DSP_MMU_24XX_VIRT);</div><div class='add'>+	}</div><div class='add'>+	if (cpu_is_omap2430()) {</div><div class='add'>+		if (BETWEEN(p, L4_WK_243X_PHYS, L4_WK_243X_SIZE))</div><div class='add'>+			return XLATE(p, L4_WK_243X_PHYS, L4_WK_243X_VIRT);</div><div class='add'>+		if (BETWEEN(p, OMAP243X_GPMC_PHYS, OMAP243X_GPMC_SIZE))</div><div class='add'>+			return XLATE(p, OMAP243X_GPMC_PHYS, OMAP243X_GPMC_VIRT);</div><div class='add'>+		if (BETWEEN(p, OMAP243X_SDRC_PHYS, OMAP243X_SDRC_SIZE))</div><div class='add'>+			return XLATE(p, OMAP243X_SDRC_PHYS, OMAP243X_SDRC_VIRT);</div><div class='add'>+		if (BETWEEN(p, OMAP243X_SMS_PHYS, OMAP243X_SMS_SIZE))</div><div class='add'>+			return XLATE(p, OMAP243X_SMS_PHYS, OMAP243X_SMS_VIRT);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_ARCH_OMAP3</div><div class='add'>+	if (cpu_is_omap34xx()) {</div><div class='add'>+		if (BETWEEN(p, L3_34XX_PHYS, L3_34XX_SIZE))</div><div class='add'>+			return XLATE(p, L3_34XX_PHYS, L3_34XX_VIRT);</div><div class='add'>+		if (BETWEEN(p, L4_34XX_PHYS, L4_34XX_SIZE))</div><div class='add'>+			return XLATE(p, L4_34XX_PHYS, L4_34XX_VIRT);</div><div class='add'>+		if (BETWEEN(p, L4_WK_34XX_PHYS, L4_WK_34XX_SIZE))</div><div class='add'>+			return XLATE(p, L4_WK_34XX_PHYS, L4_WK_34XX_VIRT);</div><div class='add'>+		if (BETWEEN(p, OMAP34XX_GPMC_PHYS, OMAP34XX_GPMC_SIZE))</div><div class='add'>+			return XLATE(p, OMAP34XX_GPMC_PHYS, OMAP34XX_GPMC_VIRT);</div><div class='add'>+		if (BETWEEN(p, OMAP343X_SMS_PHYS, OMAP343X_SMS_SIZE))</div><div class='add'>+			return XLATE(p, OMAP343X_SMS_PHYS, OMAP343X_SMS_VIRT);</div><div class='add'>+		if (BETWEEN(p, OMAP343X_SDRC_PHYS, OMAP343X_SDRC_SIZE))</div><div class='add'>+			return XLATE(p, OMAP343X_SDRC_PHYS, OMAP343X_SDRC_VIRT);</div><div class='add'>+		if (BETWEEN(p, L4_PER_34XX_PHYS, L4_PER_34XX_SIZE))</div><div class='add'>+			return XLATE(p, L4_PER_34XX_PHYS, L4_PER_34XX_VIRT);</div><div class='add'>+		if (BETWEEN(p, L4_EMU_34XX_PHYS, L4_EMU_34XX_SIZE))</div><div class='add'>+			return XLATE(p, L4_EMU_34XX_PHYS, L4_EMU_34XX_VIRT);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	return __arm_ioremap(p, size, type);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(omap_ioremap);</div><div class='add'>+</div><div class='add'>+void omap_iounmap(volatile void __iomem *addr)</div><div class='add'>+{</div><div class='add'>+	unsigned long virt = (unsigned long)addr;</div><div class='add'>+</div><div class='add'>+	if (virt &gt;= VMALLOC_START &amp;&amp; virt &lt; VMALLOC_END)</div><div class='add'>+		__iounmap(addr);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(omap_iounmap);</div><div class='head'>diff --git a/arch/arm/plat-omap/mailbox.c b/arch/arm/plat-omap/mailbox.c<br/>index 1d7aec1a691a..b52ce053e6f2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/mailbox.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-omap/mailbox.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/mailbox.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/mailbox.c</a></div><div class='hunk'>@@ -30,7 +30,7 @@</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;mach/mailbox.h&gt;</div><div class='ctx'> #include "mailbox.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/plat-omap/mcbsp.c b/arch/arm/plat-omap/mcbsp.c<br/>index 014d26574bb6..af33fc713e1a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/mcbsp.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-omap/mcbsp.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/mcbsp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/mcbsp.c</a></div><div class='hunk'>@@ -27,43 +27,65 @@</div><div class='ctx'> #include &lt;mach/dma.h&gt;</div><div class='ctx'> #include &lt;mach/mcbsp.h&gt;</div><div class='ctx'> </div><div class='del'>-static struct omap_mcbsp mcbsp[OMAP_MAX_MCBSP_COUNT];</div><div class='add'>+struct omap_mcbsp **mcbsp_ptr;</div><div class='add'>+int omap_mcbsp_count;</div><div class='ctx'> </div><div class='del'>-#define omap_mcbsp_check_valid_id(id)	(mcbsp[id].pdata &amp;&amp; \</div><div class='del'>-					mcbsp[id].pdata-&gt;ops &amp;&amp; \</div><div class='del'>-					mcbsp[id].pdata-&gt;ops-&gt;check &amp;&amp; \</div><div class='del'>-					(mcbsp[id].pdata-&gt;ops-&gt;check(id) == 0))</div><div class='add'>+void omap_mcbsp_write(void __iomem *io_base, u16 reg, u32 val)</div><div class='add'>+{</div><div class='add'>+	if (cpu_class_is_omap1() || cpu_is_omap2420())</div><div class='add'>+		__raw_writew((u16)val, io_base + reg);</div><div class='add'>+	else</div><div class='add'>+		__raw_writel(val, io_base + reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int omap_mcbsp_read(void __iomem *io_base, u16 reg)</div><div class='add'>+{</div><div class='add'>+	if (cpu_class_is_omap1() || cpu_is_omap2420())</div><div class='add'>+		return __raw_readw(io_base + reg);</div><div class='add'>+	else</div><div class='add'>+		return __raw_readl(io_base + reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define OMAP_MCBSP_READ(base, reg) \</div><div class='add'>+			omap_mcbsp_read(base, OMAP_MCBSP_REG_##reg)</div><div class='add'>+#define OMAP_MCBSP_WRITE(base, reg, val) \</div><div class='add'>+			omap_mcbsp_write(base, OMAP_MCBSP_REG_##reg, val)</div><div class='add'>+</div><div class='add'>+#define omap_mcbsp_check_valid_id(id)	(id &lt; omap_mcbsp_count)</div><div class='add'>+#define id_to_mcbsp_ptr(id)		mcbsp_ptr[id];</div><div class='ctx'> </div><div class='ctx'> static void omap_mcbsp_dump_reg(u8 id)</div><div class='ctx'> {</div><div class='del'>-	dev_dbg(mcbsp[id].dev, "**** McBSP%d regs ****\n", mcbsp[id].id);</div><div class='del'>-	dev_dbg(mcbsp[id].dev, "DRR2:  0x%04x\n",</div><div class='del'>-			OMAP_MCBSP_READ(mcbsp[id].io_base, DRR2));</div><div class='del'>-	dev_dbg(mcbsp[id].dev, "DRR1:  0x%04x\n",</div><div class='del'>-			OMAP_MCBSP_READ(mcbsp[id].io_base, DRR1));</div><div class='del'>-	dev_dbg(mcbsp[id].dev, "DXR2:  0x%04x\n",</div><div class='del'>-			OMAP_MCBSP_READ(mcbsp[id].io_base, DXR2));</div><div class='del'>-	dev_dbg(mcbsp[id].dev, "DXR1:  0x%04x\n",</div><div class='del'>-			OMAP_MCBSP_READ(mcbsp[id].io_base, DXR1));</div><div class='del'>-	dev_dbg(mcbsp[id].dev, "SPCR2: 0x%04x\n",</div><div class='del'>-			OMAP_MCBSP_READ(mcbsp[id].io_base, SPCR2));</div><div class='del'>-	dev_dbg(mcbsp[id].dev, "SPCR1: 0x%04x\n",</div><div class='del'>-			OMAP_MCBSP_READ(mcbsp[id].io_base, SPCR1));</div><div class='del'>-	dev_dbg(mcbsp[id].dev, "RCR2:  0x%04x\n",</div><div class='del'>-			OMAP_MCBSP_READ(mcbsp[id].io_base, RCR2));</div><div class='del'>-	dev_dbg(mcbsp[id].dev, "RCR1:  0x%04x\n",</div><div class='del'>-			OMAP_MCBSP_READ(mcbsp[id].io_base, RCR1));</div><div class='del'>-	dev_dbg(mcbsp[id].dev, "XCR2:  0x%04x\n",</div><div class='del'>-			OMAP_MCBSP_READ(mcbsp[id].io_base, XCR2));</div><div class='del'>-	dev_dbg(mcbsp[id].dev, "XCR1:  0x%04x\n",</div><div class='del'>-			OMAP_MCBSP_READ(mcbsp[id].io_base, XCR1));</div><div class='del'>-	dev_dbg(mcbsp[id].dev, "SRGR2: 0x%04x\n",</div><div class='del'>-			OMAP_MCBSP_READ(mcbsp[id].io_base, SRGR2));</div><div class='del'>-	dev_dbg(mcbsp[id].dev, "SRGR1: 0x%04x\n",</div><div class='del'>-			OMAP_MCBSP_READ(mcbsp[id].io_base, SRGR1));</div><div class='del'>-	dev_dbg(mcbsp[id].dev, "PCR0:  0x%04x\n",</div><div class='del'>-			OMAP_MCBSP_READ(mcbsp[id].io_base, PCR0));</div><div class='del'>-	dev_dbg(mcbsp[id].dev, "***********************\n");</div><div class='add'>+	struct omap_mcbsp *mcbsp = id_to_mcbsp_ptr(id);</div><div class='add'>+</div><div class='add'>+	dev_dbg(mcbsp-&gt;dev, "**** McBSP%d regs ****\n", mcbsp-&gt;id);</div><div class='add'>+	dev_dbg(mcbsp-&gt;dev, "DRR2:  0x%04x\n",</div><div class='add'>+			OMAP_MCBSP_READ(mcbsp-&gt;io_base, DRR2));</div><div class='add'>+	dev_dbg(mcbsp-&gt;dev, "DRR1:  0x%04x\n",</div><div class='add'>+			OMAP_MCBSP_READ(mcbsp-&gt;io_base, DRR1));</div><div class='add'>+	dev_dbg(mcbsp-&gt;dev, "DXR2:  0x%04x\n",</div><div class='add'>+			OMAP_MCBSP_READ(mcbsp-&gt;io_base, DXR2));</div><div class='add'>+	dev_dbg(mcbsp-&gt;dev, "DXR1:  0x%04x\n",</div><div class='add'>+			OMAP_MCBSP_READ(mcbsp-&gt;io_base, DXR1));</div><div class='add'>+	dev_dbg(mcbsp-&gt;dev, "SPCR2: 0x%04x\n",</div><div class='add'>+			OMAP_MCBSP_READ(mcbsp-&gt;io_base, SPCR2));</div><div class='add'>+	dev_dbg(mcbsp-&gt;dev, "SPCR1: 0x%04x\n",</div><div class='add'>+			OMAP_MCBSP_READ(mcbsp-&gt;io_base, SPCR1));</div><div class='add'>+	dev_dbg(mcbsp-&gt;dev, "RCR2:  0x%04x\n",</div><div class='add'>+			OMAP_MCBSP_READ(mcbsp-&gt;io_base, RCR2));</div><div class='add'>+	dev_dbg(mcbsp-&gt;dev, "RCR1:  0x%04x\n",</div><div class='add'>+			OMAP_MCBSP_READ(mcbsp-&gt;io_base, RCR1));</div><div class='add'>+	dev_dbg(mcbsp-&gt;dev, "XCR2:  0x%04x\n",</div><div class='add'>+			OMAP_MCBSP_READ(mcbsp-&gt;io_base, XCR2));</div><div class='add'>+	dev_dbg(mcbsp-&gt;dev, "XCR1:  0x%04x\n",</div><div class='add'>+			OMAP_MCBSP_READ(mcbsp-&gt;io_base, XCR1));</div><div class='add'>+	dev_dbg(mcbsp-&gt;dev, "SRGR2: 0x%04x\n",</div><div class='add'>+			OMAP_MCBSP_READ(mcbsp-&gt;io_base, SRGR2));</div><div class='add'>+	dev_dbg(mcbsp-&gt;dev, "SRGR1: 0x%04x\n",</div><div class='add'>+			OMAP_MCBSP_READ(mcbsp-&gt;io_base, SRGR1));</div><div class='add'>+	dev_dbg(mcbsp-&gt;dev, "PCR0:  0x%04x\n",</div><div class='add'>+			OMAP_MCBSP_READ(mcbsp-&gt;io_base, PCR0));</div><div class='add'>+	dev_dbg(mcbsp-&gt;dev, "***********************\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static irqreturn_t omap_mcbsp_tx_irq_handler(int irq, void *dev_id)</div><div class='hunk'>@@ -126,16 +148,18 @@ static void omap_mcbsp_rx_dma_callback(int lch, u16 ch_status, void *data)</div><div class='ctx'>  */</div><div class='ctx'> void omap_mcbsp_config(unsigned int id, const struct omap_mcbsp_reg_cfg *config)</div><div class='ctx'> {</div><div class='del'>-	u32 io_base;</div><div class='add'>+	struct omap_mcbsp *mcbsp;</div><div class='add'>+	void __iomem *io_base;</div><div class='ctx'> </div><div class='ctx'> 	if (!omap_mcbsp_check_valid_id(id)) {</div><div class='ctx'> 		printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='add'>+	mcbsp = id_to_mcbsp_ptr(id);</div><div class='ctx'> </div><div class='del'>-	io_base = mcbsp[id].io_base;</div><div class='del'>-	dev_dbg(mcbsp[id].dev, "Configuring McBSP%d  io_base: 0x%8x\n",</div><div class='del'>-			mcbsp[id].id, io_base);</div><div class='add'>+	io_base = mcbsp-&gt;io_base;</div><div class='add'>+	dev_dbg(mcbsp-&gt;dev, "Configuring McBSP%d  phys_base: 0x%08lx\n",</div><div class='add'>+			mcbsp-&gt;id, mcbsp-&gt;phys_base);</div><div class='ctx'> </div><div class='ctx'> 	/* We write the given config */</div><div class='ctx'> 	OMAP_MCBSP_WRITE(io_base, SPCR2, config-&gt;spcr2);</div><div class='hunk'>@@ -158,23 +182,26 @@ EXPORT_SYMBOL(omap_mcbsp_config);</div><div class='ctx'>  */</div><div class='ctx'> int omap_mcbsp_set_io_type(unsigned int id, omap_mcbsp_io_type_t io_type)</div><div class='ctx'> {</div><div class='add'>+	struct omap_mcbsp *mcbsp;</div><div class='add'>+</div><div class='ctx'> 	if (!omap_mcbsp_check_valid_id(id)) {</div><div class='ctx'> 		printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='add'>+	mcbsp = id_to_mcbsp_ptr(id);</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;mcbsp[id].lock);</div><div class='add'>+	spin_lock(&amp;mcbsp-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	if (!mcbsp[id].free) {</div><div class='del'>-		dev_err(mcbsp[id].dev, "McBSP%d is currently in use\n",</div><div class='del'>-			mcbsp[id].id);</div><div class='del'>-		spin_unlock(&amp;mcbsp[id].lock);</div><div class='add'>+	if (!mcbsp-&gt;free) {</div><div class='add'>+		dev_err(mcbsp-&gt;dev, "McBSP%d is currently in use\n",</div><div class='add'>+			mcbsp-&gt;id);</div><div class='add'>+		spin_unlock(&amp;mcbsp-&gt;lock);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mcbsp[id].io_type = io_type;</div><div class='add'>+	mcbsp-&gt;io_type = io_type;</div><div class='ctx'> </div><div class='del'>-	spin_unlock(&amp;mcbsp[id].lock);</div><div class='add'>+	spin_unlock(&amp;mcbsp-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -182,53 +209,60 @@ EXPORT_SYMBOL(omap_mcbsp_set_io_type);</div><div class='ctx'> </div><div class='ctx'> int omap_mcbsp_request(unsigned int id)</div><div class='ctx'> {</div><div class='add'>+	struct omap_mcbsp *mcbsp;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (!omap_mcbsp_check_valid_id(id)) {</div><div class='ctx'> 		printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='add'>+	mcbsp = id_to_mcbsp_ptr(id);</div><div class='ctx'> </div><div class='del'>-	if (mcbsp[id].pdata-&gt;ops-&gt;request)</div><div class='del'>-		mcbsp[id].pdata-&gt;ops-&gt;request(id);</div><div class='add'>+	if (mcbsp-&gt;pdata &amp;&amp; mcbsp-&gt;pdata-&gt;ops &amp;&amp; mcbsp-&gt;pdata-&gt;ops-&gt;request)</div><div class='add'>+		mcbsp-&gt;pdata-&gt;ops-&gt;request(id);</div><div class='ctx'> </div><div class='del'>-	clk_enable(mcbsp[id].clk);</div><div class='add'>+	clk_enable(mcbsp-&gt;clk);</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;mcbsp[id].lock);</div><div class='del'>-	if (!mcbsp[id].free) {</div><div class='del'>-		dev_err(mcbsp[id].dev, "McBSP%d is currently in use\n",</div><div class='del'>-			mcbsp[id].id);</div><div class='del'>-		spin_unlock(&amp;mcbsp[id].lock);</div><div class='add'>+	spin_lock(&amp;mcbsp-&gt;lock);</div><div class='add'>+	if (!mcbsp-&gt;free) {</div><div class='add'>+		dev_err(mcbsp-&gt;dev, "McBSP%d is currently in use\n",</div><div class='add'>+			mcbsp-&gt;id);</div><div class='add'>+		spin_unlock(&amp;mcbsp-&gt;lock);</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mcbsp[id].free = 0;</div><div class='del'>-	spin_unlock(&amp;mcbsp[id].lock);</div><div class='add'>+	mcbsp-&gt;free = 0;</div><div class='add'>+	spin_unlock(&amp;mcbsp-&gt;lock);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Make sure that transmitter, receiver and sample-rate generator are</div><div class='add'>+	 * not running before activating IRQs.</div><div class='add'>+	 */</div><div class='add'>+	OMAP_MCBSP_WRITE(mcbsp-&gt;io_base, SPCR1, 0);</div><div class='add'>+	OMAP_MCBSP_WRITE(mcbsp-&gt;io_base, SPCR2, 0);</div><div class='ctx'> </div><div class='del'>-	if (mcbsp[id].io_type == OMAP_MCBSP_IRQ_IO) {</div><div class='add'>+	if (mcbsp-&gt;io_type == OMAP_MCBSP_IRQ_IO) {</div><div class='ctx'> 		/* We need to get IRQs here */</div><div class='del'>-		err = request_irq(mcbsp[id].tx_irq, omap_mcbsp_tx_irq_handler,</div><div class='del'>-					0, "McBSP", (void *) (&amp;mcbsp[id]));</div><div class='add'>+		init_completion(&amp;mcbsp-&gt;tx_irq_completion);</div><div class='add'>+		err = request_irq(mcbsp-&gt;tx_irq, omap_mcbsp_tx_irq_handler,</div><div class='add'>+					0, "McBSP", (void *)mcbsp);</div><div class='ctx'> 		if (err != 0) {</div><div class='del'>-			dev_err(mcbsp[id].dev, "Unable to request TX IRQ %d "</div><div class='del'>-					"for McBSP%d\n", mcbsp[id].tx_irq,</div><div class='del'>-					mcbsp[id].id);</div><div class='add'>+			dev_err(mcbsp-&gt;dev, "Unable to request TX IRQ %d "</div><div class='add'>+					"for McBSP%d\n", mcbsp-&gt;tx_irq,</div><div class='add'>+					mcbsp-&gt;id);</div><div class='ctx'> 			return err;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		init_completion(&amp;(mcbsp[id].tx_irq_completion));</div><div class='del'>-</div><div class='del'>-		err = request_irq(mcbsp[id].rx_irq, omap_mcbsp_rx_irq_handler,</div><div class='del'>-					0, "McBSP", (void *) (&amp;mcbsp[id]));</div><div class='add'>+		init_completion(&amp;mcbsp-&gt;rx_irq_completion);</div><div class='add'>+		err = request_irq(mcbsp-&gt;rx_irq, omap_mcbsp_rx_irq_handler,</div><div class='add'>+					0, "McBSP", (void *)mcbsp);</div><div class='ctx'> 		if (err != 0) {</div><div class='del'>-			dev_err(mcbsp[id].dev, "Unable to request RX IRQ %d "</div><div class='del'>-					"for McBSP%d\n", mcbsp[id].rx_irq,</div><div class='del'>-					mcbsp[id].id);</div><div class='del'>-			free_irq(mcbsp[id].tx_irq, (void *) (&amp;mcbsp[id]));</div><div class='add'>+			dev_err(mcbsp-&gt;dev, "Unable to request RX IRQ %d "</div><div class='add'>+					"for McBSP%d\n", mcbsp-&gt;rx_irq,</div><div class='add'>+					mcbsp-&gt;id);</div><div class='add'>+			free_irq(mcbsp-&gt;tx_irq, (void *)mcbsp);</div><div class='ctx'> 			return err;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		init_completion(&amp;(mcbsp[id].rx_irq_completion));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -237,31 +271,34 @@ EXPORT_SYMBOL(omap_mcbsp_request);</div><div class='ctx'> </div><div class='ctx'> void omap_mcbsp_free(unsigned int id)</div><div class='ctx'> {</div><div class='add'>+	struct omap_mcbsp *mcbsp;</div><div class='add'>+</div><div class='ctx'> 	if (!omap_mcbsp_check_valid_id(id)) {</div><div class='ctx'> 		printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='add'>+	mcbsp = id_to_mcbsp_ptr(id);</div><div class='ctx'> </div><div class='del'>-	if (mcbsp[id].pdata-&gt;ops-&gt;free)</div><div class='del'>-		mcbsp[id].pdata-&gt;ops-&gt;free(id);</div><div class='add'>+	if (mcbsp-&gt;pdata &amp;&amp; mcbsp-&gt;pdata-&gt;ops &amp;&amp; mcbsp-&gt;pdata-&gt;ops-&gt;free)</div><div class='add'>+		mcbsp-&gt;pdata-&gt;ops-&gt;free(id);</div><div class='ctx'> </div><div class='del'>-	clk_disable(mcbsp[id].clk);</div><div class='add'>+	clk_disable(mcbsp-&gt;clk);</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;mcbsp[id].lock);</div><div class='del'>-	if (mcbsp[id].free) {</div><div class='del'>-		dev_err(mcbsp[id].dev, "McBSP%d was not reserved\n",</div><div class='del'>-			mcbsp[id].id);</div><div class='del'>-		spin_unlock(&amp;mcbsp[id].lock);</div><div class='add'>+	spin_lock(&amp;mcbsp-&gt;lock);</div><div class='add'>+	if (mcbsp-&gt;free) {</div><div class='add'>+		dev_err(mcbsp-&gt;dev, "McBSP%d was not reserved\n",</div><div class='add'>+			mcbsp-&gt;id);</div><div class='add'>+		spin_unlock(&amp;mcbsp-&gt;lock);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mcbsp[id].free = 1;</div><div class='del'>-	spin_unlock(&amp;mcbsp[id].lock);</div><div class='add'>+	mcbsp-&gt;free = 1;</div><div class='add'>+	spin_unlock(&amp;mcbsp-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	if (mcbsp[id].io_type == OMAP_MCBSP_IRQ_IO) {</div><div class='add'>+	if (mcbsp-&gt;io_type == OMAP_MCBSP_IRQ_IO) {</div><div class='ctx'> 		/* Free IRQs */</div><div class='del'>-		free_irq(mcbsp[id].rx_irq, (void *) (&amp;mcbsp[id]));</div><div class='del'>-		free_irq(mcbsp[id].tx_irq, (void *) (&amp;mcbsp[id]));</div><div class='add'>+		free_irq(mcbsp-&gt;rx_irq, (void *)mcbsp);</div><div class='add'>+		free_irq(mcbsp-&gt;tx_irq, (void *)mcbsp);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(omap_mcbsp_free);</div><div class='hunk'>@@ -273,18 +310,19 @@ EXPORT_SYMBOL(omap_mcbsp_free);</div><div class='ctx'>  */</div><div class='ctx'> void omap_mcbsp_start(unsigned int id)</div><div class='ctx'> {</div><div class='del'>-	u32 io_base;</div><div class='add'>+	struct omap_mcbsp *mcbsp;</div><div class='add'>+	void __iomem *io_base;</div><div class='ctx'> 	u16 w;</div><div class='ctx'> </div><div class='ctx'> 	if (!omap_mcbsp_check_valid_id(id)) {</div><div class='ctx'> 		printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='add'>+	mcbsp = id_to_mcbsp_ptr(id);</div><div class='add'>+	io_base = mcbsp-&gt;io_base;</div><div class='ctx'> </div><div class='del'>-	io_base = mcbsp[id].io_base;</div><div class='del'>-</div><div class='del'>-	mcbsp[id].rx_word_length = (OMAP_MCBSP_READ(io_base, RCR1) &gt;&gt; 5) &amp; 0x7;</div><div class='del'>-	mcbsp[id].tx_word_length = (OMAP_MCBSP_READ(io_base, XCR1) &gt;&gt; 5) &amp; 0x7;</div><div class='add'>+	mcbsp-&gt;rx_word_length = (OMAP_MCBSP_READ(io_base, RCR1) &gt;&gt; 5) &amp; 0x7;</div><div class='add'>+	mcbsp-&gt;tx_word_length = (OMAP_MCBSP_READ(io_base, XCR1) &gt;&gt; 5) &amp; 0x7;</div><div class='ctx'> </div><div class='ctx'> 	/* Start the sample generator */</div><div class='ctx'> 	w = OMAP_MCBSP_READ(io_base, SPCR2);</div><div class='hunk'>@@ -310,7 +348,8 @@ EXPORT_SYMBOL(omap_mcbsp_start);</div><div class='ctx'> </div><div class='ctx'> void omap_mcbsp_stop(unsigned int id)</div><div class='ctx'> {</div><div class='del'>-	u32 io_base;</div><div class='add'>+	struct omap_mcbsp *mcbsp;</div><div class='add'>+	void __iomem *io_base;</div><div class='ctx'> 	u16 w;</div><div class='ctx'> </div><div class='ctx'> 	if (!omap_mcbsp_check_valid_id(id)) {</div><div class='hunk'>@@ -318,7 +357,8 @@ void omap_mcbsp_stop(unsigned int id)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	io_base = mcbsp[id].io_base;</div><div class='add'>+	mcbsp = id_to_mcbsp_ptr(id);</div><div class='add'>+	io_base = mcbsp-&gt;io_base;</div><div class='ctx'> </div><div class='ctx'> 	/* Reset transmitter */</div><div class='ctx'> 	w = OMAP_MCBSP_READ(io_base, SPCR2);</div><div class='hunk'>@@ -337,14 +377,17 @@ EXPORT_SYMBOL(omap_mcbsp_stop);</div><div class='ctx'> /* polled mcbsp i/o operations */</div><div class='ctx'> int omap_mcbsp_pollwrite(unsigned int id, u16 buf)</div><div class='ctx'> {</div><div class='del'>-	u32 base;</div><div class='add'>+	struct omap_mcbsp *mcbsp;</div><div class='add'>+	void __iomem *base;</div><div class='ctx'> </div><div class='ctx'> 	if (!omap_mcbsp_check_valid_id(id)) {</div><div class='ctx'> 		printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	base = mcbsp[id].io_base;</div><div class='add'>+	mcbsp = id_to_mcbsp_ptr(id);</div><div class='add'>+	base = mcbsp-&gt;io_base;</div><div class='add'>+</div><div class='ctx'> 	writew(buf, base + OMAP_MCBSP_REG_DXR1);</div><div class='ctx'> 	/* if frame sync error - clear the error */</div><div class='ctx'> 	if (readw(base + OMAP_MCBSP_REG_SPCR2) &amp; XSYNC_ERR) {</div><div class='hunk'>@@ -366,8 +409,8 @@ int omap_mcbsp_pollwrite(unsigned int id, u16 buf)</div><div class='ctx'> 				       (XRST),</div><div class='ctx'> 				       base + OMAP_MCBSP_REG_SPCR2);</div><div class='ctx'> 				udelay(10);</div><div class='del'>-				dev_err(mcbsp[id].dev, "Could not write to"</div><div class='del'>-					" McBSP%d Register\n", mcbsp[id].id);</div><div class='add'>+				dev_err(mcbsp-&gt;dev, "Could not write to"</div><div class='add'>+					" McBSP%d Register\n", mcbsp-&gt;id);</div><div class='ctx'> 				return -2;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -379,14 +422,16 @@ EXPORT_SYMBOL(omap_mcbsp_pollwrite);</div><div class='ctx'> </div><div class='ctx'> int omap_mcbsp_pollread(unsigned int id, u16 *buf)</div><div class='ctx'> {</div><div class='del'>-	u32 base;</div><div class='add'>+	struct omap_mcbsp *mcbsp;</div><div class='add'>+	void __iomem *base;</div><div class='ctx'> </div><div class='ctx'> 	if (!omap_mcbsp_check_valid_id(id)) {</div><div class='ctx'> 		printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='add'>+	mcbsp = id_to_mcbsp_ptr(id);</div><div class='ctx'> </div><div class='del'>-	base = mcbsp[id].io_base;</div><div class='add'>+	base = mcbsp-&gt;io_base;</div><div class='ctx'> 	/* if frame sync error - clear the error */</div><div class='ctx'> 	if (readw(base + OMAP_MCBSP_REG_SPCR1) &amp; RSYNC_ERR) {</div><div class='ctx'> 		/* clear error */</div><div class='hunk'>@@ -407,8 +452,8 @@ int omap_mcbsp_pollread(unsigned int id, u16 *buf)</div><div class='ctx'> 				       (RRST),</div><div class='ctx'> 				       base + OMAP_MCBSP_REG_SPCR1);</div><div class='ctx'> 				udelay(10);</div><div class='del'>-				dev_err(mcbsp[id].dev, "Could not read from"</div><div class='del'>-					" McBSP%d Register\n", mcbsp[id].id);</div><div class='add'>+				dev_err(mcbsp-&gt;dev, "Could not read from"</div><div class='add'>+					" McBSP%d Register\n", mcbsp-&gt;id);</div><div class='ctx'> 				return -2;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -424,7 +469,8 @@ EXPORT_SYMBOL(omap_mcbsp_pollread);</div><div class='ctx'>  */</div><div class='ctx'> void omap_mcbsp_xmit_word(unsigned int id, u32 word)</div><div class='ctx'> {</div><div class='del'>-	u32 io_base;</div><div class='add'>+	struct omap_mcbsp *mcbsp;</div><div class='add'>+	void __iomem *io_base;</div><div class='ctx'> 	omap_mcbsp_word_length word_length;</div><div class='ctx'> </div><div class='ctx'> 	if (!omap_mcbsp_check_valid_id(id)) {</div><div class='hunk'>@@ -432,10 +478,11 @@ void omap_mcbsp_xmit_word(unsigned int id, u32 word)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	io_base = mcbsp[id].io_base;</div><div class='del'>-	word_length = mcbsp[id].tx_word_length;</div><div class='add'>+	mcbsp = id_to_mcbsp_ptr(id);</div><div class='add'>+	io_base = mcbsp-&gt;io_base;</div><div class='add'>+	word_length = mcbsp-&gt;tx_word_length;</div><div class='ctx'> </div><div class='del'>-	wait_for_completion(&amp;(mcbsp[id].tx_irq_completion));</div><div class='add'>+	wait_for_completion(&amp;mcbsp-&gt;tx_irq_completion);</div><div class='ctx'> </div><div class='ctx'> 	if (word_length &gt; OMAP_MCBSP_WORD_16)</div><div class='ctx'> 		OMAP_MCBSP_WRITE(io_base, DXR2, word &gt;&gt; 16);</div><div class='hunk'>@@ -445,7 +492,8 @@ EXPORT_SYMBOL(omap_mcbsp_xmit_word);</div><div class='ctx'> </div><div class='ctx'> u32 omap_mcbsp_recv_word(unsigned int id)</div><div class='ctx'> {</div><div class='del'>-	u32 io_base;</div><div class='add'>+	struct omap_mcbsp *mcbsp;</div><div class='add'>+	void __iomem *io_base;</div><div class='ctx'> 	u16 word_lsb, word_msb = 0;</div><div class='ctx'> 	omap_mcbsp_word_length word_length;</div><div class='ctx'> </div><div class='hunk'>@@ -453,11 +501,12 @@ u32 omap_mcbsp_recv_word(unsigned int id)</div><div class='ctx'> 		printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='add'>+	mcbsp = id_to_mcbsp_ptr(id);</div><div class='ctx'> </div><div class='del'>-	word_length = mcbsp[id].rx_word_length;</div><div class='del'>-	io_base = mcbsp[id].io_base;</div><div class='add'>+	word_length = mcbsp-&gt;rx_word_length;</div><div class='add'>+	io_base = mcbsp-&gt;io_base;</div><div class='ctx'> </div><div class='del'>-	wait_for_completion(&amp;(mcbsp[id].rx_irq_completion));</div><div class='add'>+	wait_for_completion(&amp;mcbsp-&gt;rx_irq_completion);</div><div class='ctx'> </div><div class='ctx'> 	if (word_length &gt; OMAP_MCBSP_WORD_16)</div><div class='ctx'> 		word_msb = OMAP_MCBSP_READ(io_base, DRR2);</div><div class='hunk'>@@ -469,7 +518,8 @@ EXPORT_SYMBOL(omap_mcbsp_recv_word);</div><div class='ctx'> </div><div class='ctx'> int omap_mcbsp_spi_master_xmit_word_poll(unsigned int id, u32 word)</div><div class='ctx'> {</div><div class='del'>-	u32 io_base;</div><div class='add'>+	struct omap_mcbsp *mcbsp;</div><div class='add'>+	void __iomem *io_base;</div><div class='ctx'> 	omap_mcbsp_word_length tx_word_length;</div><div class='ctx'> 	omap_mcbsp_word_length rx_word_length;</div><div class='ctx'> 	u16 spcr2, spcr1, attempts = 0, word_lsb, word_msb = 0;</div><div class='hunk'>@@ -478,10 +528,10 @@ int omap_mcbsp_spi_master_xmit_word_poll(unsigned int id, u32 word)</div><div class='ctx'> 		printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	io_base = mcbsp[id].io_base;</div><div class='del'>-	tx_word_length = mcbsp[id].tx_word_length;</div><div class='del'>-	rx_word_length = mcbsp[id].rx_word_length;</div><div class='add'>+	mcbsp = id_to_mcbsp_ptr(id);</div><div class='add'>+	io_base = mcbsp-&gt;io_base;</div><div class='add'>+	tx_word_length = mcbsp-&gt;tx_word_length;</div><div class='add'>+	rx_word_length = mcbsp-&gt;rx_word_length;</div><div class='ctx'> </div><div class='ctx'> 	if (tx_word_length != rx_word_length)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -496,8 +546,8 @@ int omap_mcbsp_spi_master_xmit_word_poll(unsigned int id, u32 word)</div><div class='ctx'> 			udelay(10);</div><div class='ctx'> 			OMAP_MCBSP_WRITE(io_base, SPCR2, spcr2 | XRST);</div><div class='ctx'> 			udelay(10);</div><div class='del'>-			dev_err(mcbsp[id].dev, "McBSP%d transmitter not "</div><div class='del'>-				"ready\n", mcbsp[id].id);</div><div class='add'>+			dev_err(mcbsp-&gt;dev, "McBSP%d transmitter not "</div><div class='add'>+				"ready\n", mcbsp-&gt;id);</div><div class='ctx'> 			return -EAGAIN;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -517,8 +567,8 @@ int omap_mcbsp_spi_master_xmit_word_poll(unsigned int id, u32 word)</div><div class='ctx'> 			udelay(10);</div><div class='ctx'> 			OMAP_MCBSP_WRITE(io_base, SPCR1, spcr1 | RRST);</div><div class='ctx'> 			udelay(10);</div><div class='del'>-			dev_err(mcbsp[id].dev, "McBSP%d receiver not "</div><div class='del'>-				"ready\n", mcbsp[id].id);</div><div class='add'>+			dev_err(mcbsp-&gt;dev, "McBSP%d receiver not "</div><div class='add'>+				"ready\n", mcbsp-&gt;id);</div><div class='ctx'> 			return -EAGAIN;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -534,7 +584,9 @@ EXPORT_SYMBOL(omap_mcbsp_spi_master_xmit_word_poll);</div><div class='ctx'> </div><div class='ctx'> int omap_mcbsp_spi_master_recv_word_poll(unsigned int id, u32 *word)</div><div class='ctx'> {</div><div class='del'>-	u32 io_base, clock_word = 0;</div><div class='add'>+	struct omap_mcbsp *mcbsp;</div><div class='add'>+	u32 clock_word = 0;</div><div class='add'>+	void __iomem *io_base;</div><div class='ctx'> 	omap_mcbsp_word_length tx_word_length;</div><div class='ctx'> 	omap_mcbsp_word_length rx_word_length;</div><div class='ctx'> 	u16 spcr2, spcr1, attempts = 0, word_lsb, word_msb = 0;</div><div class='hunk'>@@ -544,9 +596,11 @@ int omap_mcbsp_spi_master_recv_word_poll(unsigned int id, u32 *word)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	io_base = mcbsp[id].io_base;</div><div class='del'>-	tx_word_length = mcbsp[id].tx_word_length;</div><div class='del'>-	rx_word_length = mcbsp[id].rx_word_length;</div><div class='add'>+	mcbsp = id_to_mcbsp_ptr(id);</div><div class='add'>+	io_base = mcbsp-&gt;io_base;</div><div class='add'>+</div><div class='add'>+	tx_word_length = mcbsp-&gt;tx_word_length;</div><div class='add'>+	rx_word_length = mcbsp-&gt;rx_word_length;</div><div class='ctx'> </div><div class='ctx'> 	if (tx_word_length != rx_word_length)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -561,8 +615,8 @@ int omap_mcbsp_spi_master_recv_word_poll(unsigned int id, u32 *word)</div><div class='ctx'> 			udelay(10);</div><div class='ctx'> 			OMAP_MCBSP_WRITE(io_base, SPCR2, spcr2 | XRST);</div><div class='ctx'> 			udelay(10);</div><div class='del'>-			dev_err(mcbsp[id].dev, "McBSP%d transmitter not "</div><div class='del'>-				"ready\n", mcbsp[id].id);</div><div class='add'>+			dev_err(mcbsp-&gt;dev, "McBSP%d transmitter not "</div><div class='add'>+				"ready\n", mcbsp-&gt;id);</div><div class='ctx'> 			return -EAGAIN;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -582,8 +636,8 @@ int omap_mcbsp_spi_master_recv_word_poll(unsigned int id, u32 *word)</div><div class='ctx'> 			udelay(10);</div><div class='ctx'> 			OMAP_MCBSP_WRITE(io_base, SPCR1, spcr1 | RRST);</div><div class='ctx'> 			udelay(10);</div><div class='del'>-			dev_err(mcbsp[id].dev, "McBSP%d receiver not "</div><div class='del'>-				"ready\n", mcbsp[id].id);</div><div class='add'>+			dev_err(mcbsp-&gt;dev, "McBSP%d receiver not "</div><div class='add'>+				"ready\n", mcbsp-&gt;id);</div><div class='ctx'> 			return -EAGAIN;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -609,6 +663,7 @@ EXPORT_SYMBOL(omap_mcbsp_spi_master_recv_word_poll);</div><div class='ctx'> int omap_mcbsp_xmit_buffer(unsigned int id, dma_addr_t buffer,</div><div class='ctx'> 				unsigned int length)</div><div class='ctx'> {</div><div class='add'>+	struct omap_mcbsp *mcbsp;</div><div class='ctx'> 	int dma_tx_ch;</div><div class='ctx'> 	int src_port = 0;</div><div class='ctx'> 	int dest_port = 0;</div><div class='hunk'>@@ -618,50 +673,51 @@ int omap_mcbsp_xmit_buffer(unsigned int id, dma_addr_t buffer,</div><div class='ctx'> 		printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='add'>+	mcbsp = id_to_mcbsp_ptr(id);</div><div class='ctx'> </div><div class='del'>-	if (omap_request_dma(mcbsp[id].dma_tx_sync, "McBSP TX",</div><div class='add'>+	if (omap_request_dma(mcbsp-&gt;dma_tx_sync, "McBSP TX",</div><div class='ctx'> 				omap_mcbsp_tx_dma_callback,</div><div class='del'>-				&amp;mcbsp[id],</div><div class='add'>+				mcbsp,</div><div class='ctx'> 				&amp;dma_tx_ch)) {</div><div class='del'>-		dev_err(mcbsp[id].dev, " Unable to request DMA channel for "</div><div class='add'>+		dev_err(mcbsp-&gt;dev, " Unable to request DMA channel for "</div><div class='ctx'> 				"McBSP%d TX. Trying IRQ based TX\n",</div><div class='del'>-				mcbsp[id].id);</div><div class='add'>+				mcbsp-&gt;id);</div><div class='ctx'> 		return -EAGAIN;</div><div class='ctx'> 	}</div><div class='del'>-	mcbsp[id].dma_tx_lch = dma_tx_ch;</div><div class='add'>+	mcbsp-&gt;dma_tx_lch = dma_tx_ch;</div><div class='ctx'> </div><div class='del'>-	dev_err(mcbsp[id].dev, "McBSP%d TX DMA on channel %d\n", mcbsp[id].id,</div><div class='add'>+	dev_err(mcbsp-&gt;dev, "McBSP%d TX DMA on channel %d\n", mcbsp-&gt;id,</div><div class='ctx'> 		dma_tx_ch);</div><div class='ctx'> </div><div class='del'>-	init_completion(&amp;(mcbsp[id].tx_dma_completion));</div><div class='add'>+	init_completion(&amp;mcbsp-&gt;tx_dma_completion);</div><div class='ctx'> </div><div class='ctx'> 	if (cpu_class_is_omap1()) {</div><div class='ctx'> 		src_port = OMAP_DMA_PORT_TIPB;</div><div class='ctx'> 		dest_port = OMAP_DMA_PORT_EMIFF;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (cpu_class_is_omap2())</div><div class='del'>-		sync_dev = mcbsp[id].dma_tx_sync;</div><div class='add'>+		sync_dev = mcbsp-&gt;dma_tx_sync;</div><div class='ctx'> </div><div class='del'>-	omap_set_dma_transfer_params(mcbsp[id].dma_tx_lch,</div><div class='add'>+	omap_set_dma_transfer_params(mcbsp-&gt;dma_tx_lch,</div><div class='ctx'> 				     OMAP_DMA_DATA_TYPE_S16,</div><div class='ctx'> 				     length &gt;&gt; 1, 1,</div><div class='ctx'> 				     OMAP_DMA_SYNC_ELEMENT,</div><div class='ctx'> 	 sync_dev, 0);</div><div class='ctx'> </div><div class='del'>-	omap_set_dma_dest_params(mcbsp[id].dma_tx_lch,</div><div class='add'>+	omap_set_dma_dest_params(mcbsp-&gt;dma_tx_lch,</div><div class='ctx'> 				 src_port,</div><div class='ctx'> 				 OMAP_DMA_AMODE_CONSTANT,</div><div class='del'>-				 mcbsp[id].phys_base + OMAP_MCBSP_REG_DXR1,</div><div class='add'>+				 mcbsp-&gt;phys_base + OMAP_MCBSP_REG_DXR1,</div><div class='ctx'> 				 0, 0);</div><div class='ctx'> </div><div class='del'>-	omap_set_dma_src_params(mcbsp[id].dma_tx_lch,</div><div class='add'>+	omap_set_dma_src_params(mcbsp-&gt;dma_tx_lch,</div><div class='ctx'> 				dest_port,</div><div class='ctx'> 				OMAP_DMA_AMODE_POST_INC,</div><div class='ctx'> 				buffer,</div><div class='ctx'> 				0, 0);</div><div class='ctx'> </div><div class='del'>-	omap_start_dma(mcbsp[id].dma_tx_lch);</div><div class='del'>-	wait_for_completion(&amp;(mcbsp[id].tx_dma_completion));</div><div class='add'>+	omap_start_dma(mcbsp-&gt;dma_tx_lch);</div><div class='add'>+	wait_for_completion(&amp;mcbsp-&gt;tx_dma_completion);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -670,6 +726,7 @@ EXPORT_SYMBOL(omap_mcbsp_xmit_buffer);</div><div class='ctx'> int omap_mcbsp_recv_buffer(unsigned int id, dma_addr_t buffer,</div><div class='ctx'> 				unsigned int length)</div><div class='ctx'> {</div><div class='add'>+	struct omap_mcbsp *mcbsp;</div><div class='ctx'> 	int dma_rx_ch;</div><div class='ctx'> 	int src_port = 0;</div><div class='ctx'> 	int dest_port = 0;</div><div class='hunk'>@@ -679,50 +736,51 @@ int omap_mcbsp_recv_buffer(unsigned int id, dma_addr_t buffer,</div><div class='ctx'> 		printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='add'>+	mcbsp = id_to_mcbsp_ptr(id);</div><div class='ctx'> </div><div class='del'>-	if (omap_request_dma(mcbsp[id].dma_rx_sync, "McBSP RX",</div><div class='add'>+	if (omap_request_dma(mcbsp-&gt;dma_rx_sync, "McBSP RX",</div><div class='ctx'> 				omap_mcbsp_rx_dma_callback,</div><div class='del'>-				&amp;mcbsp[id],</div><div class='add'>+				mcbsp,</div><div class='ctx'> 				&amp;dma_rx_ch)) {</div><div class='del'>-		dev_err(mcbsp[id].dev, "Unable to request DMA channel for "</div><div class='add'>+		dev_err(mcbsp-&gt;dev, "Unable to request DMA channel for "</div><div class='ctx'> 				"McBSP%d RX. Trying IRQ based RX\n",</div><div class='del'>-				mcbsp[id].id);</div><div class='add'>+				mcbsp-&gt;id);</div><div class='ctx'> 		return -EAGAIN;</div><div class='ctx'> 	}</div><div class='del'>-	mcbsp[id].dma_rx_lch = dma_rx_ch;</div><div class='add'>+	mcbsp-&gt;dma_rx_lch = dma_rx_ch;</div><div class='ctx'> </div><div class='del'>-	dev_err(mcbsp[id].dev, "McBSP%d RX DMA on channel %d\n", mcbsp[id].id,</div><div class='add'>+	dev_err(mcbsp-&gt;dev, "McBSP%d RX DMA on channel %d\n", mcbsp-&gt;id,</div><div class='ctx'> 		dma_rx_ch);</div><div class='ctx'> </div><div class='del'>-	init_completion(&amp;(mcbsp[id].rx_dma_completion));</div><div class='add'>+	init_completion(&amp;mcbsp-&gt;rx_dma_completion);</div><div class='ctx'> </div><div class='ctx'> 	if (cpu_class_is_omap1()) {</div><div class='ctx'> 		src_port = OMAP_DMA_PORT_TIPB;</div><div class='ctx'> 		dest_port = OMAP_DMA_PORT_EMIFF;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (cpu_class_is_omap2())</div><div class='del'>-		sync_dev = mcbsp[id].dma_rx_sync;</div><div class='add'>+		sync_dev = mcbsp-&gt;dma_rx_sync;</div><div class='ctx'> </div><div class='del'>-	omap_set_dma_transfer_params(mcbsp[id].dma_rx_lch,</div><div class='add'>+	omap_set_dma_transfer_params(mcbsp-&gt;dma_rx_lch,</div><div class='ctx'> 					OMAP_DMA_DATA_TYPE_S16,</div><div class='ctx'> 					length &gt;&gt; 1, 1,</div><div class='ctx'> 					OMAP_DMA_SYNC_ELEMENT,</div><div class='ctx'> 					sync_dev, 0);</div><div class='ctx'> </div><div class='del'>-	omap_set_dma_src_params(mcbsp[id].dma_rx_lch,</div><div class='add'>+	omap_set_dma_src_params(mcbsp-&gt;dma_rx_lch,</div><div class='ctx'> 				src_port,</div><div class='ctx'> 				OMAP_DMA_AMODE_CONSTANT,</div><div class='del'>-				mcbsp[id].phys_base + OMAP_MCBSP_REG_DRR1,</div><div class='add'>+				mcbsp-&gt;phys_base + OMAP_MCBSP_REG_DRR1,</div><div class='ctx'> 				0, 0);</div><div class='ctx'> </div><div class='del'>-	omap_set_dma_dest_params(mcbsp[id].dma_rx_lch,</div><div class='add'>+	omap_set_dma_dest_params(mcbsp-&gt;dma_rx_lch,</div><div class='ctx'> 					dest_port,</div><div class='ctx'> 					OMAP_DMA_AMODE_POST_INC,</div><div class='ctx'> 					buffer,</div><div class='ctx'> 					0, 0);</div><div class='ctx'> </div><div class='del'>-	omap_start_dma(mcbsp[id].dma_rx_lch);</div><div class='del'>-	wait_for_completion(&amp;(mcbsp[id].rx_dma_completion));</div><div class='add'>+	omap_start_dma(mcbsp-&gt;dma_rx_lch);</div><div class='add'>+	wait_for_completion(&amp;mcbsp-&gt;rx_dma_completion);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -737,12 +795,14 @@ EXPORT_SYMBOL(omap_mcbsp_recv_buffer);</div><div class='ctx'> void omap_mcbsp_set_spi_mode(unsigned int id,</div><div class='ctx'> 				const struct omap_mcbsp_spi_cfg *spi_cfg)</div><div class='ctx'> {</div><div class='add'>+	struct omap_mcbsp *mcbsp;</div><div class='ctx'> 	struct omap_mcbsp_reg_cfg mcbsp_cfg;</div><div class='ctx'> </div><div class='ctx'> 	if (!omap_mcbsp_check_valid_id(id)) {</div><div class='ctx'> 		printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='add'>+	mcbsp = id_to_mcbsp_ptr(id);</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;mcbsp_cfg, 0, sizeof(struct omap_mcbsp_reg_cfg));</div><div class='ctx'> </div><div class='hunk'>@@ -803,9 +863,10 @@ EXPORT_SYMBOL(omap_mcbsp_set_spi_mode);</div><div class='ctx'>  * McBSP1 and McBSP3 are directly mapped on 1610 and 1510.</div><div class='ctx'>  * 730 has only 2 McBSP, and both of them are MPU peripherals.</div><div class='ctx'>  */</div><div class='del'>-static int __init omap_mcbsp_probe(struct platform_device *pdev)</div><div class='add'>+static int __devinit omap_mcbsp_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct omap_mcbsp_platform_data *pdata = pdev-&gt;dev.platform_data;</div><div class='add'>+	struct omap_mcbsp *mcbsp;</div><div class='ctx'> 	int id = pdev-&gt;id - 1;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -818,47 +879,63 @@ static int __init omap_mcbsp_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(&amp;pdev-&gt;dev, "Initializing OMAP McBSP (%d).\n", pdev-&gt;id);</div><div class='ctx'> </div><div class='del'>-	if (id &gt;= OMAP_MAX_MCBSP_COUNT) {</div><div class='add'>+	if (id &gt;= omap_mcbsp_count) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "Invalid McBSP device id (%d)\n", id);</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		goto exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_lock_init(&amp;mcbsp[id].lock);</div><div class='del'>-	mcbsp[id].id = id + 1;</div><div class='del'>-	mcbsp[id].free = 1;</div><div class='del'>-	mcbsp[id].dma_tx_lch = -1;</div><div class='del'>-	mcbsp[id].dma_rx_lch = -1;</div><div class='add'>+	mcbsp = kzalloc(sizeof(struct omap_mcbsp), GFP_KERNEL);</div><div class='add'>+	if (!mcbsp) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+	mcbsp_ptr[id] = mcbsp;</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;mcbsp-&gt;lock);</div><div class='add'>+	mcbsp-&gt;id = id + 1;</div><div class='add'>+	mcbsp-&gt;free = 1;</div><div class='add'>+	mcbsp-&gt;dma_tx_lch = -1;</div><div class='add'>+	mcbsp-&gt;dma_rx_lch = -1;</div><div class='add'>+</div><div class='add'>+	mcbsp-&gt;phys_base = pdata-&gt;phys_base;</div><div class='add'>+	mcbsp-&gt;io_base = ioremap(pdata-&gt;phys_base, SZ_4K);</div><div class='add'>+	if (!mcbsp-&gt;io_base) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto err_ioremap;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	mcbsp[id].phys_base = pdata-&gt;phys_base;</div><div class='del'>-	mcbsp[id].io_base = pdata-&gt;virt_base;</div><div class='ctx'> 	/* Default I/O is IRQ based */</div><div class='del'>-	mcbsp[id].io_type = OMAP_MCBSP_IRQ_IO;</div><div class='del'>-	mcbsp[id].tx_irq = pdata-&gt;tx_irq;</div><div class='del'>-	mcbsp[id].rx_irq = pdata-&gt;rx_irq;</div><div class='del'>-	mcbsp[id].dma_rx_sync = pdata-&gt;dma_rx_sync;</div><div class='del'>-	mcbsp[id].dma_tx_sync = pdata-&gt;dma_tx_sync;</div><div class='add'>+	mcbsp-&gt;io_type = OMAP_MCBSP_IRQ_IO;</div><div class='add'>+	mcbsp-&gt;tx_irq = pdata-&gt;tx_irq;</div><div class='add'>+	mcbsp-&gt;rx_irq = pdata-&gt;rx_irq;</div><div class='add'>+	mcbsp-&gt;dma_rx_sync = pdata-&gt;dma_rx_sync;</div><div class='add'>+	mcbsp-&gt;dma_tx_sync = pdata-&gt;dma_tx_sync;</div><div class='ctx'> </div><div class='ctx'> 	if (pdata-&gt;clk_name)</div><div class='del'>-		mcbsp[id].clk = clk_get(&amp;pdev-&gt;dev, pdata-&gt;clk_name);</div><div class='del'>-	if (IS_ERR(mcbsp[id].clk)) {</div><div class='del'>-		mcbsp[id].free = 0;</div><div class='add'>+		mcbsp-&gt;clk = clk_get(&amp;pdev-&gt;dev, pdata-&gt;clk_name);</div><div class='add'>+	if (IS_ERR(mcbsp-&gt;clk)) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev,</div><div class='ctx'> 			"Invalid clock configuration for McBSP%d.\n",</div><div class='del'>-			mcbsp[id].id);</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto exit;</div><div class='add'>+			mcbsp-&gt;id);</div><div class='add'>+		ret = PTR_ERR(mcbsp-&gt;clk);</div><div class='add'>+		goto err_clk;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mcbsp[id].pdata = pdata;</div><div class='del'>-	mcbsp[id].dev = &amp;pdev-&gt;dev;</div><div class='del'>-	platform_set_drvdata(pdev, &amp;mcbsp[id]);</div><div class='add'>+	mcbsp-&gt;pdata = pdata;</div><div class='add'>+	mcbsp-&gt;dev = &amp;pdev-&gt;dev;</div><div class='add'>+	platform_set_drvdata(pdev, mcbsp);</div><div class='add'>+	return 0;</div><div class='ctx'> </div><div class='add'>+err_clk:</div><div class='add'>+	iounmap(mcbsp-&gt;io_base);</div><div class='add'>+err_ioremap:</div><div class='add'>+	mcbsp-&gt;free = 0;</div><div class='ctx'> exit:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int omap_mcbsp_remove(struct platform_device *pdev)</div><div class='add'>+static int __devexit omap_mcbsp_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct omap_mcbsp *mcbsp = platform_get_drvdata(pdev);</div><div class='ctx'> </div><div class='hunk'>@@ -872,6 +949,8 @@ static int omap_mcbsp_remove(struct platform_device *pdev)</div><div class='ctx'> 		clk_disable(mcbsp-&gt;clk);</div><div class='ctx'> 		clk_put(mcbsp-&gt;clk);</div><div class='ctx'> </div><div class='add'>+		iounmap(mcbsp-&gt;io_base);</div><div class='add'>+</div><div class='ctx'> 		mcbsp-&gt;clk = NULL;</div><div class='ctx'> 		mcbsp-&gt;free = 0;</div><div class='ctx'> 		mcbsp-&gt;dev = NULL;</div><div class='hunk'>@@ -882,7 +961,7 @@ static int omap_mcbsp_remove(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> static struct platform_driver omap_mcbsp_driver = {</div><div class='ctx'> 	.probe		= omap_mcbsp_probe,</div><div class='del'>-	.remove		= omap_mcbsp_remove,</div><div class='add'>+	.remove		= __devexit_p(omap_mcbsp_remove),</div><div class='ctx'> 	.driver		= {</div><div class='ctx'> 		.name	= "omap-mcbsp",</div><div class='ctx'> 	},</div><div class='head'>diff --git a/arch/arm/plat-omap/mux.c b/arch/arm/plat-omap/mux.c<br/>index 847df208c46c..80b040fd5ca7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/mux.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-omap/mux.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/mux.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/mux.c</a></div><div class='hunk'>@@ -25,8 +25,8 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;mach/mux.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/plat-omap/ocpi.c b/arch/arm/plat-omap/ocpi.c<br/>index 8bdbf979a257..ebe0c73c8901 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/ocpi.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-omap/ocpi.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/ocpi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/ocpi.c</a></div><div class='hunk'>@@ -31,8 +31,8 @@</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define OCPI_BASE		0xfffec320</div><div class='head'>diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c<br/>index ac67eeb6ca6a..9f9a921829c0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/sram.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-omap/sram.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/sram.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/sram.c</a></div><div class='hunk'>@@ -15,9 +15,9 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/tlb.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='hunk'>@@ -271,7 +271,7 @@ int __init omap1_sram_init(void)</div><div class='ctx'> #define omap1_sram_init()	do {} while (0)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)</div><div class='add'>+#if defined(CONFIG_ARCH_OMAP2)</div><div class='ctx'> </div><div class='ctx'> static void (*_omap2_sram_ddr_init)(u32 *slow_dll_ctrl, u32 fast_dll_ctrl,</div><div class='ctx'> 			      u32 base_cs, u32 force_unlock);</div><div class='hunk'>@@ -352,23 +352,19 @@ static inline int omap243x_sram_init(void)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ARCH_OMAP3</div><div class='ctx'> </div><div class='del'>-static u32 (*_omap2_sram_reprogram_gpmc)(u32 perf_level);</div><div class='del'>-u32 omap2_sram_reprogram_gpmc(u32 perf_level)</div><div class='del'>-{</div><div class='del'>-	if (!_omap2_sram_reprogram_gpmc)</div><div class='del'>-		omap_sram_error();</div><div class='del'>-</div><div class='del'>-	return _omap2_sram_reprogram_gpmc(perf_level);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u32 (*_omap2_sram_configure_core_dpll)(u32 m, u32 n,</div><div class='del'>-						u32 freqsel, u32 m2);</div><div class='del'>-u32 omap2_sram_configure_core_dpll(u32 m, u32 n, u32 freqsel, u32 m2)</div><div class='add'>+static u32 (*_omap3_sram_configure_core_dpll)(u32 sdrc_rfr_ctrl,</div><div class='add'>+					      u32 sdrc_actim_ctrla,</div><div class='add'>+					      u32 sdrc_actim_ctrlb,</div><div class='add'>+					      u32 m2);</div><div class='add'>+u32 omap3_configure_core_dpll(u32 sdrc_rfr_ctrl, u32 sdrc_actim_ctrla,</div><div class='add'>+			      u32 sdrc_actim_ctrlb, u32 m2)</div><div class='ctx'> {</div><div class='del'>-	if (!_omap2_sram_configure_core_dpll)</div><div class='add'>+	if (!_omap3_sram_configure_core_dpll)</div><div class='ctx'> 		omap_sram_error();</div><div class='ctx'> </div><div class='del'>-	return _omap2_sram_configure_core_dpll(m, n, freqsel, m2);</div><div class='add'>+	return _omap3_sram_configure_core_dpll(sdrc_rfr_ctrl,</div><div class='add'>+					       sdrc_actim_ctrla,</div><div class='add'>+					       sdrc_actim_ctrlb, m2);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* REVISIT: Should this be same as omap34xx_sram_init() after off-idle? */</div><div class='hunk'>@@ -376,31 +372,16 @@ void restore_sram_functions(void)</div><div class='ctx'> {</div><div class='ctx'> 	omap_sram_ceil = omap_sram_base + omap_sram_size;</div><div class='ctx'> </div><div class='del'>-	_omap2_sram_reprogram_gpmc = omap_sram_push(omap34xx_sram_reprogram_gpmc,</div><div class='del'>-		omap34xx_sram_reprogram_gpmc_sz);</div><div class='del'>-</div><div class='del'>-	_omap2_sram_configure_core_dpll =</div><div class='del'>-			omap_sram_push(omap34xx_sram_configure_core_dpll,</div><div class='del'>-					omap34xx_sram_configure_core_dpll_sz);</div><div class='add'>+	_omap3_sram_configure_core_dpll =</div><div class='add'>+		omap_sram_push(omap3_sram_configure_core_dpll,</div><div class='add'>+			       omap3_sram_configure_core_dpll_sz);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int __init omap34xx_sram_init(void)</div><div class='ctx'> {</div><div class='del'>-	_omap2_sram_ddr_init = omap_sram_push(omap34xx_sram_ddr_init,</div><div class='del'>-					omap34xx_sram_ddr_init_sz);</div><div class='del'>-</div><div class='del'>-	_omap2_sram_reprogram_sdrc = omap_sram_push(omap34xx_sram_reprogram_sdrc,</div><div class='del'>-					omap34xx_sram_reprogram_sdrc_sz);</div><div class='del'>-</div><div class='del'>-	_omap2_set_prcm = omap_sram_push(omap34xx_sram_set_prcm,</div><div class='del'>-					omap34xx_sram_set_prcm_sz);</div><div class='del'>-</div><div class='del'>-	_omap2_sram_reprogram_gpmc = omap_sram_push(omap34xx_sram_reprogram_gpmc,</div><div class='del'>-					omap34xx_sram_reprogram_gpmc_sz);</div><div class='del'>-</div><div class='del'>-	_omap2_sram_configure_core_dpll =</div><div class='del'>-				omap_sram_push(omap34xx_sram_configure_core_dpll,</div><div class='del'>-					omap34xx_sram_configure_core_dpll_sz);</div><div class='add'>+	_omap3_sram_configure_core_dpll =</div><div class='add'>+		omap_sram_push(omap3_sram_configure_core_dpll,</div><div class='add'>+			       omap3_sram_configure_core_dpll_sz);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/plat-omap/usb.c b/arch/arm/plat-omap/usb.c<br/>index 777485e0636b..67ca1e216df7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/usb.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-omap/usb.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-omap/usb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-omap/usb.c</a></div><div class='hunk'>@@ -27,8 +27,8 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/usb/otg.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='head'>diff --git a/arch/arm/plat-s3c/Makefile b/arch/arm/plat-s3c/Makefile<br/>new file mode 100644<br/>index 000000000000..f03d7b35ba37<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-s3c/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-s3c/Makefile</a></div><div class='hunk'>@@ -0,0 +1,3 @@</div><div class='add'>+# dummy makefile, currently just including asm/arm/plat-s3c/include/plat</div><div class='add'>+</div><div class='add'>+obj-n	:= dummy.o</div><div class='head'>diff --git a/include/asm-arm/plat-s3c/debug-macro.S b/arch/arm/plat-s3c/include/plat/debug-macro.S<br/>index 84c40b847da8..4aa7e2e6c001 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-arm/plat-s3c/debug-macro.S?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-arm/plat-s3c/debug-macro.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-s3c/include/plat/debug-macro.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-s3c/include/plat/debug-macro.S</a></div><div class='hunk'>@@ -9,7 +9,7 @@</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c/regs-serial.h&gt;</div><div class='add'>+#include &lt;plat/regs-serial.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* The S3C2440 implementations are used by default as they are the</div><div class='ctx'>  * most widely re-used */</div><div class='head'>diff --git a/include/asm-arm/plat-s3c/map.h b/arch/arm/plat-s3c/include/plat/map.h<br/>index b84289d32a54..b84289d32a54 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-arm/plat-s3c/map.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-arm/plat-s3c/map.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-s3c/include/plat/map.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-s3c/include/plat/map.h</a></div><div class='head'>diff --git a/include/asm-arm/plat-s3c/regs-adc.h b/arch/arm/plat-s3c/include/plat/regs-adc.h<br/>index 4323cccc86cd..4323cccc86cd 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-arm/plat-s3c/regs-adc.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-arm/plat-s3c/regs-adc.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-s3c/include/plat/regs-adc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-s3c/include/plat/regs-adc.h</a></div><div class='head'>diff --git a/include/asm-arm/plat-s3c/regs-serial.h b/arch/arm/plat-s3c/include/plat/regs-serial.h<br/>index a0daa647b92c..a0daa647b92c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-arm/plat-s3c/regs-serial.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-arm/plat-s3c/regs-serial.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-s3c/include/plat/regs-serial.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-s3c/include/plat/regs-serial.h</a></div><div class='head'>diff --git a/include/asm-arm/plat-s3c/regs-timer.h b/arch/arm/plat-s3c/include/plat/regs-timer.h<br/>index cc0eedd53e38..cc0eedd53e38 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-arm/plat-s3c/regs-timer.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-arm/plat-s3c/regs-timer.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-s3c/include/plat/regs-timer.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-s3c/include/plat/regs-timer.h</a></div><div class='head'>diff --git a/include/asm-arm/plat-s3c/uncompress.h b/arch/arm/plat-s3c/include/plat/uncompress.h<br/>index 19b9eda39485..4df006b9cc10 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-arm/plat-s3c/uncompress.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-arm/plat-s3c/uncompress.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-s3c/include/plat/uncompress.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-s3c/include/plat/uncompress.h</a></div><div class='hunk'>@@ -27,7 +27,7 @@ static void arch_detect_cpu(void);</div><div class='ctx'> </div><div class='ctx'> /* defines for UART registers */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c/regs-serial.h&gt;</div><div class='add'>+#include &lt;plat/regs-serial.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c/regs-watchdog.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* working in physical space... */</div><div class='head'>diff --git a/arch/arm/plat-s3c24xx/clock.c b/arch/arm/plat-s3c24xx/clock.c<br/>index 54d4b8e2263c..a005ddbd9ef3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-s3c24xx/clock.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-s3c24xx/clock.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-s3c24xx/clock.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-s3c24xx/clock.c</a></div><div class='hunk'>@@ -39,16 +39,16 @@</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/regs-clock.h&gt;</div><div class='ctx'> #include &lt;mach/regs-gpio.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c24xx/clock.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/cpu.h&gt;</div><div class='add'>+#include &lt;plat/clock.h&gt;</div><div class='add'>+#include &lt;plat/cpu.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* clock information */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/plat-s3c24xx/common-smdk.c b/arch/arm/plat-s3c24xx/common-smdk.c<br/>index 1863a1b1bc49..3098736c65d9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-s3c24xx/common-smdk.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-s3c24xx/common-smdk.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-s3c24xx/common-smdk.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-s3c24xx/common-smdk.c</a></div><div class='hunk'>@@ -25,6 +25,7 @@</div><div class='ctx'> #include &lt;linux/mtd/nand.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/nand_ecc.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='hunk'>@@ -32,7 +33,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/regs-gpio.h&gt;</div><div class='hunk'>@@ -40,9 +40,9 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/plat-s3c/nand.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c24xx/common-smdk.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/devs.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/pm.h&gt;</div><div class='add'>+#include &lt;plat/common-smdk.h&gt;</div><div class='add'>+#include &lt;plat/devs.h&gt;</div><div class='add'>+#include &lt;plat/pm.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* LED devices */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/plat-s3c24xx/cpu.c b/arch/arm/plat-s3c24xx/cpu.c<br/>index 89ce60eabd5b..22a329513c0f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-s3c24xx/cpu.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-s3c24xx/cpu.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-s3c24xx/cpu.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-s3c24xx/cpu.c</a></div><div class='hunk'>@@ -29,11 +29,11 @@</div><div class='ctx'> #include &lt;linux/serial_core.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/delay.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='hunk'>@@ -42,18 +42,18 @@</div><div class='ctx'> #include &lt;mach/system-reset.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/regs-gpio.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c/regs-serial.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/plat-s3c24xx/cpu.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/devs.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/clock.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/s3c2400.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/s3c2410.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/s3c2412.h&gt;</div><div class='add'>+#include &lt;plat/regs-serial.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;plat/cpu.h&gt;</div><div class='add'>+#include &lt;plat/devs.h&gt;</div><div class='add'>+#include &lt;plat/clock.h&gt;</div><div class='add'>+#include &lt;plat/s3c2400.h&gt;</div><div class='add'>+#include &lt;plat/s3c2410.h&gt;</div><div class='add'>+#include &lt;plat/s3c2412.h&gt;</div><div class='ctx'> #include "s3c244x.h"</div><div class='del'>-#include &lt;asm/plat-s3c24xx/s3c2440.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/s3c2442.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/s3c2443.h&gt;</div><div class='add'>+#include &lt;plat/s3c2440.h&gt;</div><div class='add'>+#include &lt;plat/s3c2442.h&gt;</div><div class='add'>+#include &lt;plat/s3c2443.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct cpu_table {</div><div class='ctx'> 	unsigned long	idcode;</div><div class='head'>diff --git a/arch/arm/plat-s3c24xx/devs.c b/arch/arm/plat-s3c24xx/devs.c<br/>index d6fb76578b11..e93f8bf6d338 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-s3c24xx/devs.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-s3c24xx/devs.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-s3c24xx/devs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-s3c24xx/devs.c</a></div><div class='hunk'>@@ -19,20 +19,20 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/serial_core.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> #include &lt;mach/fb.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c/regs-serial.h&gt;</div><div class='add'>+#include &lt;plat/regs-serial.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c24xx/udc.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c24xx/devs.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/cpu.h&gt;</div><div class='add'>+#include &lt;plat/devs.h&gt;</div><div class='add'>+#include &lt;plat/cpu.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c24xx/regs-spi.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Serial port registrations */</div><div class='head'>diff --git a/arch/arm/plat-s3c24xx/dma.c b/arch/arm/plat-s3c24xx/dma.c<br/>index 08c2aaf14c41..1baf941d1930 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-s3c24xx/dma.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-s3c24xx/dma.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-s3c24xx/dma.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-s3c24xx/dma.c</a></div><div class='hunk'>@@ -26,17 +26,17 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/dma.h&gt;</div><div class='ctx'> #include &lt;mach/map.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c24xx/dma.h&gt;</div><div class='add'>+#include &lt;plat/dma.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* io map for dma */</div><div class='ctx'> static void __iomem *dma_base;</div><div class='head'>diff --git a/arch/arm/plat-s3c24xx/gpio.c b/arch/arm/plat-s3c24xx/gpio.c<br/>index dd27334e3d7e..4a899c279eb5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-s3c24xx/gpio.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-s3c24xx/gpio.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-s3c24xx/gpio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-s3c24xx/gpio.c</a></div><div class='hunk'>@@ -26,10 +26,10 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/regs-gpio.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-arm/plat-s3c24xx/clock.h b/arch/arm/plat-s3c24xx/include/plat/clock.h<br/>index 235b753cd877..235b753cd877 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-arm/plat-s3c24xx/clock.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-arm/plat-s3c24xx/clock.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-s3c24xx/include/plat/clock.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-s3c24xx/include/plat/clock.h</a></div><div class='head'>diff --git a/include/asm-arm/plat-s3c24xx/common-smdk.h b/arch/arm/plat-s3c24xx/include/plat/common-smdk.h<br/>index 58d9094c935c..58d9094c935c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-arm/plat-s3c24xx/common-smdk.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-arm/plat-s3c24xx/common-smdk.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-s3c24xx/include/plat/common-smdk.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-s3c24xx/include/plat/common-smdk.h</a></div><div class='head'>diff --git a/include/asm-arm/plat-s3c24xx/cpu.h b/arch/arm/plat-s3c24xx/include/plat/cpu.h<br/>index 23e420e8bd5b..23e420e8bd5b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-arm/plat-s3c24xx/cpu.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-arm/plat-s3c24xx/cpu.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-s3c24xx/include/plat/cpu.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-s3c24xx/include/plat/cpu.h</a></div><div class='head'>diff --git a/include/asm-arm/plat-s3c24xx/devs.h b/arch/arm/plat-s3c24xx/include/plat/devs.h<br/>index badaac9d64a8..badaac9d64a8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-arm/plat-s3c24xx/devs.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-arm/plat-s3c24xx/devs.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-s3c24xx/include/plat/devs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-s3c24xx/include/plat/devs.h</a></div><div class='head'>diff --git a/include/asm-arm/plat-s3c24xx/dma.h b/arch/arm/plat-s3c24xx/include/plat/dma.h<br/>index c78efe316fc8..c78efe316fc8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-arm/plat-s3c24xx/dma.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-arm/plat-s3c24xx/dma.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-s3c24xx/include/plat/dma.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-s3c24xx/include/plat/dma.h</a></div><div class='head'>diff --git a/include/asm-arm/plat-s3c24xx/irq.h b/arch/arm/plat-s3c24xx/include/plat/irq.h<br/>index 45746a995343..45746a995343 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-arm/plat-s3c24xx/irq.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-arm/plat-s3c24xx/irq.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-s3c24xx/include/plat/irq.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-s3c24xx/include/plat/irq.h</a></div><div class='head'>diff --git a/include/asm-arm/plat-s3c24xx/pm.h b/arch/arm/plat-s3c24xx/include/plat/pm.h<br/>index cc623667e48a..cc623667e48a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-arm/plat-s3c24xx/pm.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-arm/plat-s3c24xx/pm.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-s3c24xx/include/plat/pm.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-s3c24xx/include/plat/pm.h</a></div><div class='head'>diff --git a/include/asm-arm/plat-s3c24xx/s3c2400.h b/arch/arm/plat-s3c24xx/include/plat/s3c2400.h<br/>index 3a5a16821af8..3a5a16821af8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-arm/plat-s3c24xx/s3c2400.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-arm/plat-s3c24xx/s3c2400.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-s3c24xx/include/plat/s3c2400.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-s3c24xx/include/plat/s3c2400.h</a></div><div class='head'>diff --git a/include/asm-arm/plat-s3c24xx/s3c2410.h b/arch/arm/plat-s3c24xx/include/plat/s3c2410.h<br/>index 3cd1ec677b3f..3cd1ec677b3f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-arm/plat-s3c24xx/s3c2410.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-arm/plat-s3c24xx/s3c2410.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-s3c24xx/include/plat/s3c2410.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-s3c24xx/include/plat/s3c2410.h</a></div><div class='head'>diff --git a/include/asm-arm/plat-s3c24xx/s3c2412.h b/arch/arm/plat-s3c24xx/include/plat/s3c2412.h<br/>index 3ec97685e781..3ec97685e781 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-arm/plat-s3c24xx/s3c2412.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-arm/plat-s3c24xx/s3c2412.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-s3c24xx/include/plat/s3c2412.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-s3c24xx/include/plat/s3c2412.h</a></div><div class='head'>diff --git a/include/asm-arm/plat-s3c24xx/s3c2440.h b/arch/arm/plat-s3c24xx/include/plat/s3c2440.h<br/>index 107853bf9481..107853bf9481 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-arm/plat-s3c24xx/s3c2440.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-arm/plat-s3c24xx/s3c2440.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-s3c24xx/include/plat/s3c2440.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-s3c24xx/include/plat/s3c2440.h</a></div><div class='head'>diff --git a/include/asm-arm/plat-s3c24xx/s3c2442.h b/arch/arm/plat-s3c24xx/include/plat/s3c2442.h<br/>index 451a23a2092a..451a23a2092a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-arm/plat-s3c24xx/s3c2442.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-arm/plat-s3c24xx/s3c2442.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-s3c24xx/include/plat/s3c2442.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-s3c24xx/include/plat/s3c2442.h</a></div><div class='head'>diff --git a/include/asm-arm/plat-s3c24xx/s3c2443.h b/arch/arm/plat-s3c24xx/include/plat/s3c2443.h<br/>index 11d83b5c84e6..11d83b5c84e6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-arm/plat-s3c24xx/s3c2443.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-arm/plat-s3c24xx/s3c2443.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-s3c24xx/include/plat/s3c2443.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-s3c24xx/include/plat/s3c2443.h</a></div><div class='head'>diff --git a/arch/arm/plat-s3c24xx/irq.c b/arch/arm/plat-s3c24xx/irq.c<br/>index 36cefe176835..963f7a4f26f2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-s3c24xx/irq.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-s3c24xx/irq.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-s3c24xx/irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-s3c24xx/irq.c</a></div><div class='hunk'>@@ -55,19 +55,19 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/regs-irq.h&gt;</div><div class='ctx'> #include &lt;mach/regs-gpio.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c24xx/cpu.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/pm.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/irq.h&gt;</div><div class='add'>+#include &lt;plat/cpu.h&gt;</div><div class='add'>+#include &lt;plat/pm.h&gt;</div><div class='add'>+#include &lt;plat/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* wakeup irq control */</div><div class='ctx'> </div><div class='hunk'>@@ -468,7 +468,6 @@ static void s3c_irq_demux_adc(unsigned int irq,</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int subsrc, submsk;</div><div class='ctx'> 	unsigned int offset = 9;</div><div class='del'>-	struct irq_desc *mydesc;</div><div class='ctx'> </div><div class='ctx'> 	/* read the current pending interrupts, and the mask</div><div class='ctx'> 	 * for what it is available */</div><div class='hunk'>@@ -482,12 +481,10 @@ static void s3c_irq_demux_adc(unsigned int irq,</div><div class='ctx'> </div><div class='ctx'> 	if (subsrc != 0) {</div><div class='ctx'> 		if (subsrc &amp; 1) {</div><div class='del'>-			mydesc = irq_desc + IRQ_TC;</div><div class='del'>-			desc_handle_irq(IRQ_TC, mydesc);</div><div class='add'>+			generic_handle_irq(IRQ_TC);</div><div class='ctx'> 		}</div><div class='ctx'> 		if (subsrc &amp; 2) {</div><div class='del'>-			mydesc = irq_desc + IRQ_ADC;</div><div class='del'>-			desc_handle_irq(IRQ_ADC, mydesc);</div><div class='add'>+			generic_handle_irq(IRQ_ADC);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -496,7 +493,6 @@ static void s3c_irq_demux_uart(unsigned int start)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int subsrc, submsk;</div><div class='ctx'> 	unsigned int offset = start - IRQ_S3CUART_RX0;</div><div class='del'>-	struct irq_desc *desc;</div><div class='ctx'> </div><div class='ctx'> 	/* read the current pending interrupts, and the mask</div><div class='ctx'> 	 * for what it is available */</div><div class='hunk'>@@ -512,20 +508,14 @@ static void s3c_irq_demux_uart(unsigned int start)</div><div class='ctx'> 	subsrc &amp;= 7;</div><div class='ctx'> </div><div class='ctx'> 	if (subsrc != 0) {</div><div class='del'>-		desc = irq_desc + start;</div><div class='del'>-</div><div class='ctx'> 		if (subsrc &amp; 1)</div><div class='del'>-			desc_handle_irq(start, desc);</div><div class='del'>-</div><div class='del'>-		desc++;</div><div class='add'>+			generic_handle_irq(start);</div><div class='ctx'> </div><div class='ctx'> 		if (subsrc &amp; 2)</div><div class='del'>-			desc_handle_irq(start+1, desc);</div><div class='del'>-</div><div class='del'>-		desc++;</div><div class='add'>+			generic_handle_irq(start+1);</div><div class='ctx'> </div><div class='ctx'> 		if (subsrc &amp; 4)</div><div class='del'>-			desc_handle_irq(start+2, desc);</div><div class='add'>+			generic_handle_irq(start+2);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -572,7 +562,7 @@ s3c_irq_demux_extint8(unsigned int irq,</div><div class='ctx'> 		eintpnd &amp;= ~(1&lt;&lt;irq);</div><div class='ctx'> </div><div class='ctx'> 		irq += (IRQ_EINT4 - 4);</div><div class='del'>-		desc_handle_irq(irq, irq_desc + irq);</div><div class='add'>+		generic_handle_irq(irq);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> }</div><div class='hunk'>@@ -595,7 +585,7 @@ s3c_irq_demux_extint4t7(unsigned int irq,</div><div class='ctx'> </div><div class='ctx'> 		irq += (IRQ_EINT4 - 4);</div><div class='ctx'> </div><div class='del'>-		desc_handle_irq(irq, irq_desc + irq);</div><div class='add'>+		generic_handle_irq(irq);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/plat-s3c24xx/pm-simtec.c b/arch/arm/plat-s3c24xx/pm-simtec.c<br/>index e6705014b2a0..21dfa74773d1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-s3c24xx/pm-simtec.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-s3c24xx/pm-simtec.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-s3c24xx/pm-simtec.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-s3c24xx/pm-simtec.c</a></div><div class='hunk'>@@ -20,12 +20,12 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/sysdev.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/map.h&gt;</div><div class='ctx'> #include &lt;mach/regs-gpio.h&gt;</div><div class='hunk'>@@ -33,7 +33,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c24xx/pm.h&gt;</div><div class='add'>+#include &lt;plat/pm.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define COPYRIGHT ", (c) 2005 Simtec Electronics"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/plat-s3c24xx/pm.c b/arch/arm/plat-s3c24xx/pm.c<br/>index fc4b731a949c..8efb57ad5019 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-s3c24xx/pm.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-s3c24xx/pm.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-s3c24xx/pm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-s3c24xx/pm.c</a></div><div class='hunk'>@@ -35,12 +35,12 @@</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/serial_core.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c/regs-serial.h&gt;</div><div class='add'>+#include &lt;plat/regs-serial.h&gt;</div><div class='ctx'> #include &lt;mach/regs-clock.h&gt;</div><div class='ctx'> #include &lt;mach/regs-gpio.h&gt;</div><div class='ctx'> #include &lt;mach/regs-mem.h&gt;</div><div class='hunk'>@@ -48,7 +48,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c24xx/pm.h&gt;</div><div class='add'>+#include &lt;plat/pm.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* for external use */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/plat-s3c24xx/pwm-clock.c b/arch/arm/plat-s3c24xx/pwm-clock.c<br/>index 306cc9c6f9ef..b8e854f1b1d5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-s3c24xx/pwm-clock.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-s3c24xx/pwm-clock.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-s3c24xx/pwm-clock.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-s3c24xx/pwm-clock.c</a></div><div class='hunk'>@@ -24,10 +24,10 @@</div><div class='ctx'> #include &lt;mach/regs-clock.h&gt;</div><div class='ctx'> #include &lt;mach/regs-gpio.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c24xx/clock.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/cpu.h&gt;</div><div class='add'>+#include &lt;plat/clock.h&gt;</div><div class='add'>+#include &lt;plat/cpu.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c/regs-timer.h&gt;</div><div class='add'>+#include &lt;plat/regs-timer.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Each of the timers 0 through 5 go through the following</div><div class='ctx'>  * clock tree, with the inputs depending on the timers.</div><div class='head'>diff --git a/arch/arm/plat-s3c24xx/pwm.c b/arch/arm/plat-s3c24xx/pwm.c<br/>index 7a92c938542a..feb770f2e84e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-s3c24xx/pwm.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-s3c24xx/pwm.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-s3c24xx/pwm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-s3c24xx/pwm.c</a></div><div class='hunk'>@@ -19,8 +19,8 @@</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/pwm.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c24xx/devs.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c/regs-timer.h&gt;</div><div class='add'>+#include &lt;plat/devs.h&gt;</div><div class='add'>+#include &lt;plat/regs-timer.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct pwm_device {</div><div class='ctx'> 	struct list_head	 list;</div><div class='head'>diff --git a/arch/arm/plat-s3c24xx/s3c244x-clock.c b/arch/arm/plat-s3c24xx/s3c244x-clock.c<br/>index 8a5fffde6631..7c09773ff9fc 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-s3c24xx/s3c244x-clock.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-s3c24xx/s3c244x-clock.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-s3c24xx/s3c244x-clock.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-s3c24xx/s3c244x-clock.c</a></div><div class='hunk'>@@ -33,16 +33,16 @@</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/atomic.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/regs-clock.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c24xx/clock.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/cpu.h&gt;</div><div class='add'>+#include &lt;plat/clock.h&gt;</div><div class='add'>+#include &lt;plat/cpu.h&gt;</div><div class='ctx'> </div><div class='ctx'> static int s3c2440_setparent_armclk(struct clk *clk, struct clk *parent)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/arm/plat-s3c24xx/s3c244x-irq.c b/arch/arm/plat-s3c24xx/s3c244x-irq.c<br/>index f3dc38cf1de4..0902afd227ca 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-s3c24xx/s3c244x-irq.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-s3c24xx/s3c244x-irq.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-s3c24xx/s3c244x-irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-s3c24xx/s3c244x-irq.c</a></div><div class='hunk'>@@ -24,19 +24,19 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/regs-irq.h&gt;</div><div class='ctx'> #include &lt;mach/regs-gpio.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c24xx/cpu.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/pm.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/irq.h&gt;</div><div class='add'>+#include &lt;plat/cpu.h&gt;</div><div class='add'>+#include &lt;plat/pm.h&gt;</div><div class='add'>+#include &lt;plat/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* camera irq */</div><div class='ctx'> </div><div class='hunk'>@@ -44,7 +44,6 @@ static void s3c_irq_demux_cam(unsigned int irq,</div><div class='ctx'> 			      struct irq_desc *desc)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int subsrc, submsk;</div><div class='del'>-	struct irq_desc *mydesc;</div><div class='ctx'> </div><div class='ctx'> 	/* read the current pending interrupts, and the mask</div><div class='ctx'> 	 * for what it is available */</div><div class='hunk'>@@ -58,12 +57,10 @@ static void s3c_irq_demux_cam(unsigned int irq,</div><div class='ctx'> </div><div class='ctx'> 	if (subsrc != 0) {</div><div class='ctx'> 		if (subsrc &amp; 1) {</div><div class='del'>-			mydesc = irq_desc + IRQ_S3C2440_CAM_C;</div><div class='del'>-			desc_handle_irq(IRQ_S3C2440_CAM_C, mydesc);</div><div class='add'>+			generic_handle_irq(IRQ_S3C2440_CAM_C);</div><div class='ctx'> 		}</div><div class='ctx'> 		if (subsrc &amp; 2) {</div><div class='del'>-			mydesc = irq_desc + IRQ_S3C2440_CAM_P;</div><div class='del'>-			desc_handle_irq(IRQ_S3C2440_CAM_P, mydesc);</div><div class='add'>+			generic_handle_irq(IRQ_S3C2440_CAM_P);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/plat-s3c24xx/s3c244x.c b/arch/arm/plat-s3c24xx/s3c244x.c<br/>index 281b4804ed38..c0344fac4a94 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-s3c24xx/s3c244x.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-s3c24xx/s3c244x.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-s3c24xx/s3c244x.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-s3c24xx/s3c244x.c</a></div><div class='hunk'>@@ -20,28 +20,28 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/sysdev.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/regs-clock.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c/regs-serial.h&gt;</div><div class='add'>+#include &lt;plat/regs-serial.h&gt;</div><div class='ctx'> #include &lt;mach/regs-gpio.h&gt;</div><div class='ctx'> #include &lt;mach/regs-gpioj.h&gt;</div><div class='ctx'> #include &lt;mach/regs-dsc.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c24xx/s3c2410.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/s3c2440.h&gt;</div><div class='add'>+#include &lt;plat/s3c2410.h&gt;</div><div class='add'>+#include &lt;plat/s3c2440.h&gt;</div><div class='ctx'> #include "s3c244x.h"</div><div class='del'>-#include &lt;asm/plat-s3c24xx/clock.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/devs.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/cpu.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/pm.h&gt;</div><div class='add'>+#include &lt;plat/clock.h&gt;</div><div class='add'>+#include &lt;plat/devs.h&gt;</div><div class='add'>+#include &lt;plat/cpu.h&gt;</div><div class='add'>+#include &lt;plat/pm.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct map_desc s3c244x_iodesc[] __initdata = {</div><div class='ctx'> 	IODESC_ENT(CLKPWR),</div><div class='head'>diff --git a/arch/arm/plat-s3c24xx/sleep.S b/arch/arm/plat-s3c24xx/sleep.S<br/>index 4981a08b6ebb..76594b212802 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-s3c24xx/sleep.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-s3c24xx/sleep.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-s3c24xx/sleep.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-s3c24xx/sleep.S</a></div><div class='hunk'>@@ -32,7 +32,7 @@</div><div class='ctx'> #include &lt;mach/regs-gpio.h&gt;</div><div class='ctx'> #include &lt;mach/regs-clock.h&gt;</div><div class='ctx'> #include &lt;mach/regs-mem.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c/regs-serial.h&gt;</div><div class='add'>+#include &lt;plat/regs-serial.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* CONFIG_DEBUG_RESUME is dangerous if your bootloader does not</div><div class='ctx'>  * reset the UART configuration, only enable if you really need this!</div><div class='head'>diff --git a/arch/arm/plat-s3c24xx/time.c b/arch/arm/plat-s3c24xx/time.c<br/>index b471a21ae2e4..c51916236ac0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-s3c24xx/time.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/plat-s3c24xx/time.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/plat-s3c24xx/time.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/plat-s3c24xx/time.c</a></div><div class='hunk'>@@ -25,20 +25,20 @@</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/leds.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;mach/map.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c/regs-timer.h&gt;</div><div class='add'>+#include &lt;plat/regs-timer.h&gt;</div><div class='ctx'> #include &lt;mach/regs-irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c24xx/clock.h&gt;</div><div class='del'>-#include &lt;asm/plat-s3c24xx/cpu.h&gt;</div><div class='add'>+#include &lt;plat/clock.h&gt;</div><div class='add'>+#include &lt;plat/cpu.h&gt;</div><div class='ctx'> </div><div class='ctx'> static unsigned long timer_startval;</div><div class='ctx'> static unsigned long timer_usec_ticks;</div><div class='head'>diff --git a/arch/arm/tools/mach-types b/arch/arm/tools/mach-types<br/>index 56281c030a7b..43aa2020f85c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/tools/mach-types?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/tools/mach-types</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/tools/mach-types?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/tools/mach-types</a></div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> #</div><div class='ctx'> #   http://www.arm.linux.org.uk/developer/machines/?action=new</div><div class='ctx'> #</div><div class='del'>-# Last update: Wed Aug 13 21:56:02 2008</div><div class='add'>+# Last update: Thu Sep 25 10:10:50 2008</div><div class='ctx'> #</div><div class='ctx'> # machine_is_xxx	CONFIG_xxxx		MACH_TYPE_xxx		number</div><div class='ctx'> #</div><div class='hunk'>@@ -1810,7 +1810,7 @@ kriss_sensor		MACH_KRISS_SENSOR	KRISS_SENSOR		1819</div><div class='ctx'> pilz_pmi5		MACH_PILZ_PMI5		PILZ_PMI5		1820</div><div class='ctx'> jade			MACH_JADE		JADE			1821</div><div class='ctx'> ks8695_softplc		MACH_KS8695_SOFTPLC	KS8695_SOFTPLC		1822</div><div class='del'>-gprisc3			MACH_GPRISC4		GPRISC4			1823</div><div class='add'>+gprisc3			MACH_GPRISC3		GPRISC3			1823</div><div class='ctx'> stamp9260		MACH_STAMP9260		STAMP9260		1824</div><div class='ctx'> smdk6430		MACH_SMDK6430		SMDK6430		1825</div><div class='ctx'> smdkc100		MACH_SMDKC100		SMDKC100		1826</div><div class='hunk'>@@ -1859,5 +1859,43 @@ kbio9260		MACH_KBIO9260		KBIO9260		1868</div><div class='ctx'> ginza			MACH_GINZA		GINZA			1869</div><div class='ctx'> a636n			MACH_A636N		A636N			1870</div><div class='ctx'> imx27ipcam		MACH_IMX27IPCAM		IMX27IPCAM		1871</div><div class='del'>-nenoc			MACH_NEMOC		NEMOC			1872</div><div class='add'>+nemoc			MACH_NEMOC		NEMOC			1872</div><div class='ctx'> geneva			MACH_GENEVA		GENEVA			1873</div><div class='add'>+htcpharos		MACH_HTCPHAROS		HTCPHAROS		1874</div><div class='add'>+neonc			MACH_NEONC		NEONC			1875</div><div class='add'>+nas7100			MACH_NAS7100		NAS7100			1876</div><div class='add'>+teuphone		MACH_TEUPHONE		TEUPHONE		1877</div><div class='add'>+annax_eth2		MACH_ANNAX_ETH2		ANNAX_ETH2		1878</div><div class='add'>+csb733			MACH_CSB733		CSB733			1879</div><div class='add'>+bk3			MACH_BK3		BK3			1880</div><div class='add'>+omap_em32		MACH_OMAP_EM32		OMAP_EM32		1881</div><div class='add'>+et9261cp		MACH_ET9261CP		ET9261CP		1882</div><div class='add'>+jasperc			MACH_JASPERC		JASPERC			1883</div><div class='add'>+issi_arm9		MACH_ISSI_ARM9		ISSI_ARM9		1884</div><div class='add'>+ued			MACH_UED		UED			1885</div><div class='add'>+esiblade		MACH_ESIBLADE		ESIBLADE		1886</div><div class='add'>+eye02			MACH_EYE02		EYE02			1887</div><div class='add'>+imx27kbd		MACH_IMX27KBD		IMX27KBD		1888</div><div class='add'>+sst61vc010_fpga		MACH_SST61VC010_FPGA	SST61VC010_FPGA		1889</div><div class='add'>+kixvp435		MACH_KIXVP435		KIXVP435		1890</div><div class='add'>+kixnp435		MACH_KIXNP435		KIXNP435		1891</div><div class='add'>+africa			MACH_AFRICA		AFRICA			1892</div><div class='add'>+nh233			MACH_NH233		NH233			1893</div><div class='add'>+rd88f6183ap_ge		MACH_RD88F6183AP_GE	RD88F6183AP_GE		1894</div><div class='add'>+bcm4760			MACH_BCM4760		BCM4760			1895</div><div class='add'>+eddy_v2			MACH_EDDY_V2		EDDY_V2			1896</div><div class='add'>+realview_pba8		MACH_REALVIEW_PBA8	REALVIEW_PBA8		1897</div><div class='add'>+hid_a7			MACH_HID_A7		HID_A7			1898</div><div class='add'>+hero			MACH_HERO		HERO			1899</div><div class='add'>+omap_poseidon		MACH_OMAP_POSEIDON	OMAP_POSEIDON		1900</div><div class='add'>+realview_pbx		MACH_REALVIEW_PBX	REALVIEW_PBX		1901</div><div class='add'>+micro9s			MACH_MICRO9S		MICRO9S			1902</div><div class='add'>+mako			MACH_MAKO		MAKO			1903</div><div class='add'>+xdaflame		MACH_XDAFLAME		XDAFLAME		1904</div><div class='add'>+phidget_sbc2		MACH_PHIDGET_SBC2	PHIDGET_SBC2		1905</div><div class='add'>+limestone		MACH_LIMESTONE		LIMESTONE		1906</div><div class='add'>+iprobe_c32		MACH_IPROBE_C32		IPROBE_C32		1907</div><div class='add'>+rut100			MACH_RUT100		RUT100			1908</div><div class='add'>+asusp535		MACH_ASUSP535		ASUSP535		1909</div><div class='add'>+htcraphael		MACH_HTCRAPHAEL		HTCRAPHAEL		1910</div><div class='add'>+sygdg1			MACH_SYGDG1		SYGDG1			1911</div><div class='head'>diff --git a/arch/arm/vfp/entry.S b/arch/arm/vfp/entry.S<br/>index 806ce26d5243..ba592a9e6fb3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/vfp/entry.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/vfp/entry.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/vfp/entry.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/vfp/entry.S</a></div><div class='hunk'>@@ -21,13 +21,13 @@</div><div class='ctx'> #include &lt;asm/assembler.h&gt;</div><div class='ctx'> #include &lt;asm/vfpmacros.h&gt;</div><div class='ctx'> </div><div class='del'>-	.globl	do_vfp</div><div class='del'>-do_vfp:</div><div class='add'>+ENTRY(do_vfp)</div><div class='ctx'> 	enable_irq</div><div class='ctx'>  	ldr	r4, .LCvfp</div><div class='ctx'> 	ldr	r11, [r10, #TI_CPU]	@ CPU number</div><div class='ctx'> 	add	r10, r10, #TI_VFPSTATE	@ r10 = workspace</div><div class='ctx'> 	ldr	pc, [r4]		@ call VFP entry point</div><div class='add'>+ENDPROC(do_vfp)</div><div class='ctx'> </div><div class='ctx'> ENTRY(vfp_null_entry)</div><div class='ctx'> 	mov	pc, lr</div><div class='hunk'>@@ -40,11 +40,11 @@ ENDPROC(vfp_null_entry)</div><div class='ctx'> @ failure to the VFP initialisation code.</div><div class='ctx'> </div><div class='ctx'> 	__INIT</div><div class='del'>-	.globl	vfp_testing_entry</div><div class='del'>-vfp_testing_entry:</div><div class='add'>+ENTRY(vfp_testing_entry)</div><div class='ctx'> 	ldr	r0, VFP_arch_address</div><div class='ctx'> 	str	r5, [r0]		@ known non-zero value</div><div class='ctx'> 	mov	pc, r9			@ we have handled the fault</div><div class='add'>+ENDPROC(vfp_testing_entry)</div><div class='ctx'> </div><div class='ctx'> VFP_arch_address:</div><div class='ctx'> 	.word	VFP_arch</div><div class='head'>diff --git a/arch/arm/vfp/vfphw.S b/arch/arm/vfp/vfphw.S<br/>index 353f9e5c7919..a62dcf7098ba 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/vfp/vfphw.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/arm/vfp/vfphw.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/arm/vfp/vfphw.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/arm/vfp/vfphw.S</a></div><div class='hunk'>@@ -68,8 +68,7 @@</div><div class='ctx'> @  r11 = CPU number</div><div class='ctx'> @  lr  = failure return</div><div class='ctx'> </div><div class='del'>-	.globl	vfp_support_entry</div><div class='del'>-vfp_support_entry:</div><div class='add'>+ENTRY(vfp_support_entry)</div><div class='ctx'> 	DBGSTR3	"instr %08x pc %08x state %p", r0, r2, r10</div><div class='ctx'> </div><div class='ctx'> 	VFPFMRX	r1, FPEXC		@ Is the VFP enabled?</div><div class='hunk'>@@ -165,11 +164,10 @@ process_exception:</div><div class='ctx'> 					@ code will raise an exception if</div><div class='ctx'> 					@ required. If not, the user code will</div><div class='ctx'> 					@ retry the faulted instruction</div><div class='add'>+ENDPROC(vfp_support_entry)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='del'>-	.globl	vfp_save_state</div><div class='del'>-	.type	vfp_save_state, %function</div><div class='del'>-vfp_save_state:</div><div class='add'>+ENTRY(vfp_save_state)</div><div class='ctx'> 	@ Save the current VFP state</div><div class='ctx'> 	@ r0 - save location</div><div class='ctx'> 	@ r1 - FPEXC</div><div class='hunk'>@@ -182,13 +180,13 @@ vfp_save_state:</div><div class='ctx'> 	VFPFMRX	r12, FPINST2, NE	@ FPINST2 if needed (and present)</div><div class='ctx'> 	stmia	r0, {r1, r2, r3, r12}	@ save FPEXC, FPSCR, FPINST, FPINST2</div><div class='ctx'> 	mov	pc, lr</div><div class='add'>+ENDPROC(vfp_save_state)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> last_VFP_context_address:</div><div class='ctx'> 	.word	last_VFP_context</div><div class='ctx'> </div><div class='del'>-	.globl	vfp_get_float</div><div class='del'>-vfp_get_float:</div><div class='add'>+ENTRY(vfp_get_float)</div><div class='ctx'> 	add	pc, pc, r0, lsl #3</div><div class='ctx'> 	mov	r0, r0</div><div class='ctx'> 	.irp	dr,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15</div><div class='hunk'>@@ -197,9 +195,9 @@ vfp_get_float:</div><div class='ctx'> 	mrc	p10, 0, r0, c\dr, c0, 4	@ fmrs	r0, s1</div><div class='ctx'> 	mov	pc, lr</div><div class='ctx'> 	.endr</div><div class='add'>+ENDPROC(vfp_get_float)</div><div class='ctx'> </div><div class='del'>-	.globl	vfp_put_float</div><div class='del'>-vfp_put_float:</div><div class='add'>+ENTRY(vfp_put_float)</div><div class='ctx'> 	add	pc, pc, r1, lsl #3</div><div class='ctx'> 	mov	r0, r0</div><div class='ctx'> 	.irp	dr,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15</div><div class='hunk'>@@ -208,9 +206,9 @@ vfp_put_float:</div><div class='ctx'> 	mcr	p10, 0, r0, c\dr, c0, 4	@ fmsr	r0, s1</div><div class='ctx'> 	mov	pc, lr</div><div class='ctx'> 	.endr</div><div class='add'>+ENDPROC(vfp_put_float)</div><div class='ctx'> </div><div class='del'>-	.globl	vfp_get_double</div><div class='del'>-vfp_get_double:</div><div class='add'>+ENTRY(vfp_get_double)</div><div class='ctx'> 	add	pc, pc, r0, lsl #3</div><div class='ctx'> 	mov	r0, r0</div><div class='ctx'> 	.irp	dr,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15</div><div class='hunk'>@@ -229,9 +227,9 @@ vfp_get_double:</div><div class='ctx'> 	mov	r0, #0</div><div class='ctx'> 	mov	r1, #0</div><div class='ctx'> 	mov	pc, lr</div><div class='add'>+ENDPROC(vfp_get_double)</div><div class='ctx'> </div><div class='del'>-	.globl	vfp_put_double</div><div class='del'>-vfp_put_double:</div><div class='add'>+ENTRY(vfp_put_double)</div><div class='ctx'> 	add	pc, pc, r2, lsl #3</div><div class='ctx'> 	mov	r0, r0</div><div class='ctx'> 	.irp	dr,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15</div><div class='hunk'>@@ -245,3 +243,4 @@ vfp_put_double:</div><div class='ctx'> 	mov	pc, lr</div><div class='ctx'> 	.endr</div><div class='ctx'> #endif</div><div class='add'>+ENDPROC(vfp_put_double)</div><div class='head'>diff --git a/arch/avr32/boards/atngw100/setup.c b/arch/avr32/boards/atngw100/setup.c<br/>index b8286f1ce854..6c54580a66df 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/avr32/boards/atngw100/setup.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/avr32/boards/atngw100/setup.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/avr32/boards/atngw100/setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/avr32/boards/atngw100/setup.c</a></div><div class='hunk'>@@ -9,6 +9,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/gpio.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='ctx'> #include &lt;linux/i2c-gpio.h&gt;</div><div class='hunk'>@@ -53,8 +54,11 @@ static struct spi_board_info spi0_board_info[] __initdata = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct mci_platform_data __initdata mci0_data = {</div><div class='del'>-	.detect_pin	= GPIO_PIN_PC(25),</div><div class='del'>-	.wp_pin		= GPIO_PIN_PE(0),</div><div class='add'>+	.slot[0] = {</div><div class='add'>+		.bus_width	= 4,</div><div class='add'>+		.detect_pin	= GPIO_PIN_PC(25),</div><div class='add'>+		.wp_pin		= GPIO_PIN_PE(0),</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -190,7 +194,7 @@ static int __init atngw100_init(void)</div><div class='ctx'> 	 * PB28/EXTINT3 doesn't; it should be SMBALERT# (for PMBus),</div><div class='ctx'> 	 * but it's not available off-board.</div><div class='ctx'> 	 */</div><div class='del'>-	at32_select_periph(GPIO_PIN_PB(28), 0, AT32_GPIOF_PULLUP);</div><div class='add'>+	at32_select_periph(GPIO_PIOB_BASE, 1 &lt;&lt; 28, 0, AT32_GPIOF_PULLUP);</div><div class='ctx'> 	at32_select_gpio(i2c_gpio_data.sda_pin,</div><div class='ctx'> 		AT32_GPIOF_MULTIDRV | AT32_GPIOF_OUTPUT | AT32_GPIOF_HIGH);</div><div class='ctx'> 	at32_select_gpio(i2c_gpio_data.scl_pin,</div><div class='hunk'>@@ -204,6 +208,15 @@ postcore_initcall(atngw100_init);</div><div class='ctx'> </div><div class='ctx'> static int __init atngw100_arch_init(void)</div><div class='ctx'> {</div><div class='add'>+	/* PB30 is the otherwise unused jumper on the mainboard, with an</div><div class='add'>+	 * external pullup; the jumper grounds it.  Use it however you</div><div class='add'>+	 * like, including letting U-Boot or Linux tweak boot sequences.</div><div class='add'>+	 */</div><div class='add'>+	at32_select_gpio(GPIO_PIN_PB(30), 0);</div><div class='add'>+	gpio_request(GPIO_PIN_PB(30), "j15");</div><div class='add'>+	gpio_direction_input(GPIO_PIN_PB(30));</div><div class='add'>+	gpio_export(GPIO_PIN_PB(30), false);</div><div class='add'>+</div><div class='ctx'> 	/* set_irq_type() after the arch_initcall for EIC has run, and</div><div class='ctx'> 	 * before the I2C subsystem could try using this IRQ.</div><div class='ctx'> 	 */</div><div class='head'>diff --git a/arch/avr32/boards/atstk1000/atstk1002.c b/arch/avr32/boards/atstk1000/atstk1002.c<br/>index dfc3443e23aa..29e5b51a7fd2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/avr32/boards/atstk1000/atstk1002.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/avr32/boards/atstk1000/atstk1002.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/avr32/boards/atstk1000/atstk1002.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/avr32/boards/atstk1000/atstk1002.c</a></div><div class='hunk'>@@ -232,7 +232,7 @@ static void __init atstk1002_setup_extdac(void)</div><div class='ctx'> 		goto err_set_clk;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	at32_select_periph(GPIO_PIN_PA(30), GPIO_PERIPH_A, 0);</div><div class='add'>+	at32_select_periph(GPIO_PIOA_BASE, (1 &lt;&lt; 30), GPIO_PERIPH_A, 0);</div><div class='ctx'> 	at73c213_data.dac_clk = gclk;</div><div class='ctx'> </div><div class='ctx'> err_set_clk:</div><div class='hunk'>@@ -264,16 +264,20 @@ void __init setup_board(void)</div><div class='ctx'> </div><div class='ctx'> #ifndef CONFIG_BOARD_ATSTK100X_SW2_CUSTOM</div><div class='ctx'> </div><div class='add'>+static struct mci_platform_data __initdata mci0_data = {</div><div class='add'>+	.slot[0] = {</div><div class='add'>+		.bus_width	= 4,</div><div class='add'>+</div><div class='ctx'> /* MMC card detect requires MACB0 *NOT* be used */</div><div class='ctx'> #ifdef CONFIG_BOARD_ATSTK1002_SW6_CUSTOM</div><div class='del'>-static struct mci_platform_data __initdata mci0_data = {</div><div class='del'>-	.detect_pin	= GPIO_PIN_PC(14),	/* gpio30/sdcd */</div><div class='del'>-	.wp_pin		= GPIO_PIN_PC(15),	/* gpio31/sdwp */</div><div class='del'>-};</div><div class='del'>-#define MCI_PDATA	&amp;mci0_data</div><div class='add'>+		.detect_pin	= GPIO_PIN_PC(14), /* gpio30/sdcd */</div><div class='add'>+		.wp_pin		= GPIO_PIN_PC(15), /* gpio31/sdwp */</div><div class='ctx'> #else</div><div class='del'>-#define MCI_PDATA	NULL</div><div class='add'>+		.detect_pin	= -ENODEV,</div><div class='add'>+		.wp_pin		= -ENODEV,</div><div class='ctx'> #endif	/* SW6 for sd{cd,wp} routing */</div><div class='add'>+	},</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> #endif	/* SW2 for MMC signal routing */</div><div class='ctx'> </div><div class='hunk'>@@ -326,13 +330,14 @@ static int __init atstk1002_init(void)</div><div class='ctx'> 	at32_add_device_spi(1, spi1_board_info, ARRAY_SIZE(spi1_board_info));</div><div class='ctx'> #endif</div><div class='ctx'> #ifndef CONFIG_BOARD_ATSTK100X_SW2_CUSTOM</div><div class='del'>-	at32_add_device_mci(0, MCI_PDATA);</div><div class='add'>+	at32_add_device_mci(0, &amp;mci0_data);</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_BOARD_ATSTK1002_SW5_CUSTOM</div><div class='ctx'> 	set_hw_addr(at32_add_device_eth(1, &amp;eth_data[1]));</div><div class='ctx'> #else</div><div class='ctx'> 	at32_add_device_lcdc(0, &amp;atstk1000_lcdc_data,</div><div class='del'>-			     fbmem_start, fbmem_size, 0);</div><div class='add'>+			     fbmem_start, fbmem_size,</div><div class='add'>+			     ATMEL_LCDC_PRI_24BIT | ATMEL_LCDC_PRI_CONTROL);</div><div class='ctx'> #endif</div><div class='ctx'> 	at32_add_device_usba(0, NULL);</div><div class='ctx'> #ifndef CONFIG_BOARD_ATSTK100X_SW3_CUSTOM</div><div class='head'>diff --git a/arch/avr32/boards/atstk1000/atstk1003.c b/arch/avr32/boards/atstk1000/atstk1003.c<br/>index 0cf664174c17..be089d7f37eb 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/avr32/boards/atstk1000/atstk1003.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/avr32/boards/atstk1000/atstk1003.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/avr32/boards/atstk1000/atstk1003.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/avr32/boards/atstk1000/atstk1003.c</a></div><div class='hunk'>@@ -19,6 +19,7 @@</div><div class='ctx'> #include &lt;linux/spi/spi.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='add'>+#include &lt;asm/atmel-mci.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/at32ap700x.h&gt;</div><div class='ctx'> #include &lt;mach/board.h&gt;</div><div class='hunk'>@@ -66,6 +67,16 @@ static struct spi_board_info spi1_board_info[] __initdata = { {</div><div class='ctx'> } };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifndef CONFIG_BOARD_ATSTK100X_SW2_CUSTOM</div><div class='add'>+static struct mci_platform_data __initdata mci0_data = {</div><div class='add'>+	.slot[0] = {</div><div class='add'>+		.bus_width	= 4,</div><div class='add'>+		.detect_pin	= -ENODEV,</div><div class='add'>+		.wp_pin		= -ENODEV,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_BOARD_ATSTK1000_EXTDAC</div><div class='ctx'> static void __init atstk1003_setup_extdac(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -84,7 +95,7 @@ static void __init atstk1003_setup_extdac(void)</div><div class='ctx'> 		goto err_set_clk;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	at32_select_periph(GPIO_PIN_PA(30), GPIO_PERIPH_A, 0);</div><div class='add'>+	at32_select_periph(GPIO_PIOA_BASE, (1 &lt;&lt; 30), GPIO_PERIPH_A, 0);</div><div class='ctx'> 	at73c213_data.dac_clk = gclk;</div><div class='ctx'> </div><div class='ctx'> err_set_clk:</div><div class='hunk'>@@ -154,7 +165,7 @@ static int __init atstk1003_init(void)</div><div class='ctx'> 	at32_add_device_spi(1, spi1_board_info, ARRAY_SIZE(spi1_board_info));</div><div class='ctx'> #endif</div><div class='ctx'> #ifndef CONFIG_BOARD_ATSTK100X_SW2_CUSTOM</div><div class='del'>-	at32_add_device_mci(0, NULL);</div><div class='add'>+	at32_add_device_mci(0, &amp;mci0_data);</div><div class='ctx'> #endif</div><div class='ctx'> 	at32_add_device_usba(0, NULL);</div><div class='ctx'> #ifndef CONFIG_BOARD_ATSTK100X_SW3_CUSTOM</div><div class='head'>diff --git a/arch/avr32/boards/atstk1000/atstk1004.c b/arch/avr32/boards/atstk1000/atstk1004.c<br/>index 50a5273e5916..248ef237c167 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/avr32/boards/atstk1000/atstk1004.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/avr32/boards/atstk1000/atstk1004.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/avr32/boards/atstk1000/atstk1004.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/avr32/boards/atstk1000/atstk1004.c</a></div><div class='hunk'>@@ -21,6 +21,7 @@</div><div class='ctx'> #include &lt;video/atmel_lcdc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='add'>+#include &lt;asm/atmel-mci.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/at32ap700x.h&gt;</div><div class='ctx'> #include &lt;mach/board.h&gt;</div><div class='hunk'>@@ -71,6 +72,16 @@ static struct spi_board_info spi1_board_info[] __initdata = { {</div><div class='ctx'> } };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifndef CONFIG_BOARD_ATSTK100X_SW2_CUSTOM</div><div class='add'>+static struct mci_platform_data __initdata mci0_data = {</div><div class='add'>+	.slot[0] = {</div><div class='add'>+		.bus_width	= 4,</div><div class='add'>+		.detect_pin	= -ENODEV,</div><div class='add'>+		.wp_pin		= -ENODEV,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_BOARD_ATSTK1000_EXTDAC</div><div class='ctx'> static void __init atstk1004_setup_extdac(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -89,7 +100,7 @@ static void __init atstk1004_setup_extdac(void)</div><div class='ctx'> 		goto err_set_clk;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	at32_select_periph(GPIO_PIN_PA(30), GPIO_PERIPH_A, 0);</div><div class='add'>+	at32_select_periph(GPIO_PIOA_BASE, (1 &lt;&lt; 30), GPIO_PERIPH_A, 0);</div><div class='ctx'> 	at73c213_data.dac_clk = gclk;</div><div class='ctx'> </div><div class='ctx'> err_set_clk:</div><div class='hunk'>@@ -137,10 +148,11 @@ static int __init atstk1004_init(void)</div><div class='ctx'> 	at32_add_device_spi(1, spi1_board_info, ARRAY_SIZE(spi1_board_info));</div><div class='ctx'> #endif</div><div class='ctx'> #ifndef CONFIG_BOARD_ATSTK100X_SW2_CUSTOM</div><div class='del'>-	at32_add_device_mci(0, NULL);</div><div class='add'>+	at32_add_device_mci(0, &amp;mci0_data);</div><div class='ctx'> #endif</div><div class='ctx'> 	at32_add_device_lcdc(0, &amp;atstk1000_lcdc_data,</div><div class='del'>-			     fbmem_start, fbmem_size, 0);</div><div class='add'>+			     fbmem_start, fbmem_size,</div><div class='add'>+			     ATMEL_LCDC_PRI_24BIT | ATMEL_LCDC_PRI_CONTROL);</div><div class='ctx'> 	at32_add_device_usba(0, NULL);</div><div class='ctx'> #ifndef CONFIG_BOARD_ATSTK100X_SW3_CUSTOM</div><div class='ctx'> 	at32_add_device_ssc(0, ATMEL_SSC_TX);</div><div class='head'>diff --git a/arch/avr32/include/asm/a.out.h b/arch/avr32/include/asm/a.out.h<br/>deleted file mode 100644<br/>index e46375a34a72..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/avr32/include/asm/a.out.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/avr32/include/asm/a.out.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,20 +0,0 @@</div><div class='del'>-#ifndef __ASM_AVR32_A_OUT_H</div><div class='del'>-#define __ASM_AVR32_A_OUT_H</div><div class='del'>-</div><div class='del'>-struct exec</div><div class='del'>-{</div><div class='del'>-  unsigned long a_info;		/* Use macros N_MAGIC, etc for access */</div><div class='del'>-  unsigned a_text;		/* length of text, in bytes */</div><div class='del'>-  unsigned a_data;		/* length of data, in bytes */</div><div class='del'>-  unsigned a_bss;		/* length of uninitialized data area for file, in bytes */</div><div class='del'>-  unsigned a_syms;		/* length of symbol table data in file, in bytes */</div><div class='del'>-  unsigned a_entry;		/* start address */</div><div class='del'>-  unsigned a_trsize;		/* length of relocation info for text, in bytes */</div><div class='del'>-  unsigned a_drsize;		/* length of relocation info for data, in bytes */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define N_TRSIZE(a)	((a).a_trsize)</div><div class='del'>-#define N_DRSIZE(a)	((a).a_drsize)</div><div class='del'>-#define N_SYMSIZE(a)	((a).a_syms)</div><div class='del'>-</div><div class='del'>-#endif /* __ASM_AVR32_A_OUT_H */</div><div class='head'>diff --git a/arch/avr32/include/asm/atmel-mci.h b/arch/avr32/include/asm/atmel-mci.h<br/>index c2ea6e1c9aa1..59f3fadd0b68 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/avr32/include/asm/atmel-mci.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/avr32/include/asm/atmel-mci.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/avr32/include/asm/atmel-mci.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/avr32/include/asm/atmel-mci.h</a></div><div class='hunk'>@@ -1,9 +1,39 @@</div><div class='ctx'> #ifndef __ASM_AVR32_ATMEL_MCI_H</div><div class='ctx'> #define __ASM_AVR32_ATMEL_MCI_H</div><div class='ctx'> </div><div class='del'>-struct mci_platform_data {</div><div class='add'>+#define ATMEL_MCI_MAX_NR_SLOTS	2</div><div class='add'>+</div><div class='add'>+struct dma_slave;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct mci_slot_pdata - board-specific per-slot configuration</div><div class='add'>+ * @bus_width: Number of data lines wired up the slot</div><div class='add'>+ * @detect_pin: GPIO pin wired to the card detect switch</div><div class='add'>+ * @wp_pin: GPIO pin wired to the write protect sensor</div><div class='add'>+ *</div><div class='add'>+ * If a given slot is not present on the board, @bus_width should be</div><div class='add'>+ * set to 0. The other fields are ignored in this case.</div><div class='add'>+ *</div><div class='add'>+ * Any pins that aren't available should be set to a negative value.</div><div class='add'>+ *</div><div class='add'>+ * Note that support for multiple slots is experimental -- some cards</div><div class='add'>+ * might get upset if we don't get the clock management exactly right.</div><div class='add'>+ * But in most cases, it should work just fine.</div><div class='add'>+ */</div><div class='add'>+struct mci_slot_pdata {</div><div class='add'>+	unsigned int		bus_width;</div><div class='ctx'> 	int			detect_pin;</div><div class='ctx'> 	int			wp_pin;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * struct mci_platform_data - board-specific MMC/SDcard configuration</div><div class='add'>+ * @dma_slave: DMA slave interface to use in data transfers, or NULL.</div><div class='add'>+ * @slot: Per-slot configuration data.</div><div class='add'>+ */</div><div class='add'>+struct mci_platform_data {</div><div class='add'>+	struct dma_slave	*dma_slave;</div><div class='add'>+	struct mci_slot_pdata	slot[ATMEL_MCI_MAX_NR_SLOTS];</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #endif /* __ASM_AVR32_ATMEL_MCI_H */</div><div class='head'>diff --git a/arch/avr32/include/asm/byteorder.h b/arch/avr32/include/asm/byteorder.h<br/>index d77b48ba7338..8e3af02076dd 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/avr32/include/asm/byteorder.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/avr32/include/asm/byteorder.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/avr32/include/asm/byteorder.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/avr32/include/asm/byteorder.h</a></div><div class='hunk'>@@ -7,6 +7,9 @@</div><div class='ctx'> #include &lt;asm/types.h&gt;</div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='ctx'> </div><div class='add'>+#define __BIG_ENDIAN</div><div class='add'>+#define __SWAB_64_THRU_32__</div><div class='add'>+</div><div class='ctx'> #ifdef __CHECKER__</div><div class='ctx'> extern unsigned long __builtin_bswap_32(unsigned long x);</div><div class='ctx'> extern unsigned short __builtin_bswap_16(unsigned short x);</div><div class='hunk'>@@ -17,15 +20,18 @@ extern unsigned short __builtin_bswap_16(unsigned short x);</div><div class='ctx'>  * the result.</div><div class='ctx'>  */</div><div class='ctx'> #if !(__GNUC__ == 4 &amp;&amp; __GNUC_MINOR__ &lt; 2)</div><div class='del'>-#define __arch__swab32(x) __builtin_bswap_32(x)</div><div class='del'>-#define __arch__swab16(x) __builtin_bswap_16(x)</div><div class='del'>-#endif</div><div class='add'>+static inline __attribute_const__ __u16 __arch_swab16(__u16 val)</div><div class='add'>+{</div><div class='add'>+	return __builtin_bswap_16(val);</div><div class='add'>+}</div><div class='add'>+#define __arch_swab16 __arch_swab16</div><div class='ctx'> </div><div class='del'>-#if !defined(__STRICT_ANSI__) || defined(__KERNEL__)</div><div class='del'>-# define __BYTEORDER_HAS_U64__</div><div class='del'>-# define __SWAB_64_THRU_32__</div><div class='add'>+static inline __attribute_const__ __u32 __arch_swab32(__u32 val)</div><div class='add'>+{</div><div class='add'>+	return __builtin_bswap_32(val);</div><div class='add'>+}</div><div class='add'>+#define __arch_swab32 __arch_swab32</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/byteorder/big_endian.h&gt;</div><div class='del'>-</div><div class='add'>+#include &lt;linux/byteorder.h&gt;</div><div class='ctx'> #endif /* __ASM_AVR32_BYTEORDER_H */</div><div class='head'>diff --git a/arch/avr32/include/asm/elf.h b/arch/avr32/include/asm/elf.h<br/>index 64ce40ee1d58..d5d1d41c600a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/avr32/include/asm/elf.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/avr32/include/asm/elf.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/avr32/include/asm/elf.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/avr32/include/asm/elf.h</a></div><div class='hunk'>@@ -103,6 +103,6 @@ typedef struct user_fpu_struct elf_fpregset_t;</div><div class='ctx'> </div><div class='ctx'> #define ELF_PLATFORM  (NULL)</div><div class='ctx'> </div><div class='del'>-#define SET_PERSONALITY(ex, ibcs2) set_personality(PER_LINUX_32BIT)</div><div class='add'>+#define SET_PERSONALITY(ex) set_personality(PER_LINUX_32BIT)</div><div class='ctx'> </div><div class='ctx'> #endif /* __ASM_AVR32_ELF_H */</div><div class='head'>diff --git a/arch/avr32/include/asm/io.h b/arch/avr32/include/asm/io.h<br/>index a520f77ead96..22c97ef92201 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/avr32/include/asm/io.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/avr32/include/asm/io.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/avr32/include/asm/io.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/avr32/include/asm/io.h</a></div><div class='hunk'>@@ -160,6 +160,14 @@ BUILDIO_IOPORT(l, u32)</div><div class='ctx'> #define readw_relaxed			readw</div><div class='ctx'> #define readl_relaxed			readl</div><div class='ctx'> </div><div class='add'>+#define readb_be			__raw_readb</div><div class='add'>+#define readw_be			__raw_readw</div><div class='add'>+#define readl_be			__raw_readl</div><div class='add'>+</div><div class='add'>+#define writeb_be			__raw_writeb</div><div class='add'>+#define writew_be			__raw_writew</div><div class='add'>+#define writel_be			__raw_writel</div><div class='add'>+</div><div class='ctx'> #define __BUILD_MEMORY_STRING(bwl, type)				\</div><div class='ctx'> static inline void writes##bwl(volatile void __iomem *addr,		\</div><div class='ctx'> 			       const void *data, unsigned int count)	\</div><div class='head'>diff --git a/arch/avr32/kernel/process.c b/arch/avr32/kernel/process.c<br/>index 2c08ac992ac3..134d5302b6dd 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/avr32/kernel/process.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/avr32/kernel/process.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/avr32/kernel/process.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/avr32/kernel/process.c</a></div><div class='hunk'>@@ -9,6 +9,7 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kallsyms.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/pm.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='ctx'> #include &lt;linux/reboot.h&gt;</div><div class='ctx'> #include &lt;linux/tick.h&gt;</div><div class='hunk'>@@ -20,7 +21,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/pm.h&gt;</div><div class='ctx'> </div><div class='del'>-void (*pm_power_off)(void) = NULL;</div><div class='add'>+void (*pm_power_off)(void);</div><div class='ctx'> EXPORT_SYMBOL(pm_power_off);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/avr32/kernel/setup.c b/arch/avr32/kernel/setup.c<br/>index d8e623c426c1..5c7083916c33 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/avr32/kernel/setup.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/avr32/kernel/setup.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/avr32/kernel/setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/avr32/kernel/setup.c</a></div><div class='hunk'>@@ -283,6 +283,25 @@ static int __init early_parse_fbmem(char *p)</div><div class='ctx'> }</div><div class='ctx'> early_param("fbmem", early_parse_fbmem);</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Pick out the memory size.  We look for mem=size@start,</div><div class='add'>+ * where start and size are "size[KkMmGg]"</div><div class='add'>+ */</div><div class='add'>+static int __init early_mem(char *p)</div><div class='add'>+{</div><div class='add'>+	resource_size_t size, start;</div><div class='add'>+</div><div class='add'>+	start = system_ram-&gt;start;</div><div class='add'>+	size  = memparse(p, &amp;p);</div><div class='add'>+	if (*p == '@')</div><div class='add'>+		start = memparse(p + 1, &amp;p);</div><div class='add'>+</div><div class='add'>+	system_ram-&gt;start = start;</div><div class='add'>+	system_ram-&gt;end = system_ram-&gt;start + size - 1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+early_param("mem", early_mem);</div><div class='add'>+</div><div class='ctx'> static int __init parse_tag_core(struct tag *tag)</div><div class='ctx'> {</div><div class='ctx'> 	if (tag-&gt;hdr.size &gt; 2) {</div><div class='head'>diff --git a/arch/avr32/mach-at32ap/at32ap700x.c b/arch/avr32/mach-at32ap/at32ap700x.c<br/>index e01dbe4ebb40..813b6844cdf6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/avr32/mach-at32ap/at32ap700x.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/avr32/mach-at32ap/at32ap700x.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/avr32/mach-at32ap/at32ap700x.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/avr32/mach-at32ap/at32ap700x.c</a></div><div class='hunk'>@@ -82,8 +82,9 @@ static struct platform_device _name##_id##_device = {		\</div><div class='ctx'> 	.num_resources	= ARRAY_SIZE(_name##_id##_resource),	\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define select_peripheral(pin, periph, flags)			\</div><div class='del'>-	at32_select_periph(GPIO_PIN_##pin, GPIO_##periph, flags)</div><div class='add'>+#define select_peripheral(port, pin_mask, periph, flags)	\</div><div class='add'>+	at32_select_periph(GPIO_##port##_BASE, pin_mask,	\</div><div class='add'>+			   GPIO_##periph, flags)</div><div class='ctx'> </div><div class='ctx'> #define DEV_CLK(_name, devname, bus, _index)			\</div><div class='ctx'> static struct clk devname##_##_name = {				\</div><div class='hunk'>@@ -871,6 +872,7 @@ static struct clk atmel_psif1_pclk = {</div><div class='ctx'> struct platform_device *__init at32_add_device_psif(unsigned int id)</div><div class='ctx'> {</div><div class='ctx'> 	struct platform_device *pdev;</div><div class='add'>+	u32 pin_mask;</div><div class='ctx'> </div><div class='ctx'> 	if (!(id == 0 || id == 1))</div><div class='ctx'> 		return NULL;</div><div class='hunk'>@@ -881,20 +883,22 @@ struct platform_device *__init at32_add_device_psif(unsigned int id)</div><div class='ctx'> </div><div class='ctx'> 	switch (id) {</div><div class='ctx'> 	case 0:</div><div class='add'>+		pin_mask  = (1 &lt;&lt; 8) | (1 &lt;&lt; 9); /* CLOCK &amp; DATA */</div><div class='add'>+</div><div class='ctx'> 		if (platform_device_add_resources(pdev, atmel_psif0_resource,</div><div class='ctx'> 					ARRAY_SIZE(atmel_psif0_resource)))</div><div class='ctx'> 			goto err_add_resources;</div><div class='ctx'> 		atmel_psif0_pclk.dev = &amp;pdev-&gt;dev;</div><div class='del'>-		select_peripheral(PA(8), PERIPH_A, 0); /* CLOCK */</div><div class='del'>-		select_peripheral(PA(9), PERIPH_A, 0); /* DATA  */</div><div class='add'>+		select_peripheral(PIOA, pin_mask, PERIPH_A, 0);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 1:</div><div class='add'>+		pin_mask  = (1 &lt;&lt; 11) | (1 &lt;&lt; 12); /* CLOCK &amp; DATA */</div><div class='add'>+</div><div class='ctx'> 		if (platform_device_add_resources(pdev, atmel_psif1_resource,</div><div class='ctx'> 					ARRAY_SIZE(atmel_psif1_resource)))</div><div class='ctx'> 			goto err_add_resources;</div><div class='ctx'> 		atmel_psif1_pclk.dev = &amp;pdev-&gt;dev;</div><div class='del'>-		select_peripheral(PB(11), PERIPH_A, 0); /* CLOCK */</div><div class='del'>-		select_peripheral(PB(12), PERIPH_A, 0); /* DATA  */</div><div class='add'>+		select_peripheral(PIOB, pin_mask, PERIPH_A, 0);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return NULL;</div><div class='hunk'>@@ -958,26 +962,30 @@ DEV_CLK(usart, atmel_usart3, pba, 6);</div><div class='ctx'> </div><div class='ctx'> static inline void configure_usart0_pins(void)</div><div class='ctx'> {</div><div class='del'>-	select_peripheral(PA(8),  PERIPH_B, 0);	/* RXD	*/</div><div class='del'>-	select_peripheral(PA(9),  PERIPH_B, 0);	/* TXD	*/</div><div class='add'>+	u32 pin_mask = (1 &lt;&lt; 8) | (1 &lt;&lt; 9); /* RXD &amp; TXD */</div><div class='add'>+</div><div class='add'>+	select_peripheral(PIOA, pin_mask, PERIPH_B, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void configure_usart1_pins(void)</div><div class='ctx'> {</div><div class='del'>-	select_peripheral(PA(17), PERIPH_A, 0);	/* RXD	*/</div><div class='del'>-	select_peripheral(PA(18), PERIPH_A, 0);	/* TXD	*/</div><div class='add'>+	u32 pin_mask = (1 &lt;&lt; 17) | (1 &lt;&lt; 18); /* RXD &amp; TXD */</div><div class='add'>+</div><div class='add'>+	select_peripheral(PIOA, pin_mask, PERIPH_A, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void configure_usart2_pins(void)</div><div class='ctx'> {</div><div class='del'>-	select_peripheral(PB(26), PERIPH_B, 0);	/* RXD	*/</div><div class='del'>-	select_peripheral(PB(27), PERIPH_B, 0);	/* TXD	*/</div><div class='add'>+	u32 pin_mask = (1 &lt;&lt; 26) | (1 &lt;&lt; 27); /* RXD &amp; TXD */</div><div class='add'>+</div><div class='add'>+	select_peripheral(PIOB, pin_mask, PERIPH_B, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void configure_usart3_pins(void)</div><div class='ctx'> {</div><div class='del'>-	select_peripheral(PB(18), PERIPH_B, 0);	/* RXD	*/</div><div class='del'>-	select_peripheral(PB(17), PERIPH_B, 0);	/* TXD	*/</div><div class='add'>+	u32 pin_mask = (1 &lt;&lt; 18) | (1 &lt;&lt; 17); /* RXD &amp; TXD */</div><div class='add'>+</div><div class='add'>+	select_peripheral(PIOB, pin_mask, PERIPH_B, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct platform_device *__initdata at32_usarts[4];</div><div class='hunk'>@@ -1057,59 +1065,69 @@ struct platform_device *__init</div><div class='ctx'> at32_add_device_eth(unsigned int id, struct eth_platform_data *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct platform_device *pdev;</div><div class='add'>+	u32 pin_mask;</div><div class='ctx'> </div><div class='ctx'> 	switch (id) {</div><div class='ctx'> 	case 0:</div><div class='ctx'> 		pdev = &amp;macb0_device;</div><div class='ctx'> </div><div class='del'>-		select_peripheral(PC(3),  PERIPH_A, 0);	/* TXD0	*/</div><div class='del'>-		select_peripheral(PC(4),  PERIPH_A, 0);	/* TXD1	*/</div><div class='del'>-		select_peripheral(PC(7),  PERIPH_A, 0);	/* TXEN	*/</div><div class='del'>-		select_peripheral(PC(8),  PERIPH_A, 0);	/* TXCK */</div><div class='del'>-		select_peripheral(PC(9),  PERIPH_A, 0);	/* RXD0	*/</div><div class='del'>-		select_peripheral(PC(10), PERIPH_A, 0);	/* RXD1	*/</div><div class='del'>-		select_peripheral(PC(13), PERIPH_A, 0);	/* RXER	*/</div><div class='del'>-		select_peripheral(PC(15), PERIPH_A, 0);	/* RXDV	*/</div><div class='del'>-		select_peripheral(PC(16), PERIPH_A, 0);	/* MDC	*/</div><div class='del'>-		select_peripheral(PC(17), PERIPH_A, 0);	/* MDIO	*/</div><div class='add'>+		pin_mask  = (1 &lt;&lt; 3);	/* TXD0 */</div><div class='add'>+		pin_mask |= (1 &lt;&lt; 4);	/* TXD1 */</div><div class='add'>+		pin_mask |= (1 &lt;&lt; 7);	/* TXEN */</div><div class='add'>+		pin_mask |= (1 &lt;&lt; 8);	/* TXCK */</div><div class='add'>+		pin_mask |= (1 &lt;&lt; 9);	/* RXD0 */</div><div class='add'>+		pin_mask |= (1 &lt;&lt; 10);	/* RXD1 */</div><div class='add'>+		pin_mask |= (1 &lt;&lt; 13);	/* RXER */</div><div class='add'>+		pin_mask |= (1 &lt;&lt; 15);	/* RXDV */</div><div class='add'>+		pin_mask |= (1 &lt;&lt; 16);	/* MDC  */</div><div class='add'>+		pin_mask |= (1 &lt;&lt; 17);	/* MDIO */</div><div class='ctx'> </div><div class='ctx'> 		if (!data-&gt;is_rmii) {</div><div class='del'>-			select_peripheral(PC(0),  PERIPH_A, 0);	/* COL	*/</div><div class='del'>-			select_peripheral(PC(1),  PERIPH_A, 0);	/* CRS	*/</div><div class='del'>-			select_peripheral(PC(2),  PERIPH_A, 0);	/* TXER	*/</div><div class='del'>-			select_peripheral(PC(5),  PERIPH_A, 0);	/* TXD2	*/</div><div class='del'>-			select_peripheral(PC(6),  PERIPH_A, 0);	/* TXD3 */</div><div class='del'>-			select_peripheral(PC(11), PERIPH_A, 0);	/* RXD2	*/</div><div class='del'>-			select_peripheral(PC(12), PERIPH_A, 0);	/* RXD3	*/</div><div class='del'>-			select_peripheral(PC(14), PERIPH_A, 0);	/* RXCK	*/</div><div class='del'>-			select_peripheral(PC(18), PERIPH_A, 0);	/* SPD	*/</div><div class='add'>+			pin_mask |= (1 &lt;&lt; 0);	/* COL  */</div><div class='add'>+			pin_mask |= (1 &lt;&lt; 1);	/* CRS  */</div><div class='add'>+			pin_mask |= (1 &lt;&lt; 2);	/* TXER */</div><div class='add'>+			pin_mask |= (1 &lt;&lt; 5);	/* TXD2 */</div><div class='add'>+			pin_mask |= (1 &lt;&lt; 6);	/* TXD3 */</div><div class='add'>+			pin_mask |= (1 &lt;&lt; 11);	/* RXD2 */</div><div class='add'>+			pin_mask |= (1 &lt;&lt; 12);	/* RXD3 */</div><div class='add'>+			pin_mask |= (1 &lt;&lt; 14);	/* RXCK */</div><div class='add'>+			pin_mask |= (1 &lt;&lt; 18);	/* SPD  */</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		select_peripheral(PIOC, pin_mask, PERIPH_A, 0);</div><div class='add'>+</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case 1:</div><div class='ctx'> 		pdev = &amp;macb1_device;</div><div class='ctx'> </div><div class='del'>-		select_peripheral(PD(13), PERIPH_B, 0);		/* TXD0	*/</div><div class='del'>-		select_peripheral(PD(14), PERIPH_B, 0);		/* TXD1	*/</div><div class='del'>-		select_peripheral(PD(11), PERIPH_B, 0);		/* TXEN	*/</div><div class='del'>-		select_peripheral(PD(12), PERIPH_B, 0);		/* TXCK */</div><div class='del'>-		select_peripheral(PD(10), PERIPH_B, 0);		/* RXD0	*/</div><div class='del'>-		select_peripheral(PD(6),  PERIPH_B, 0);		/* RXD1	*/</div><div class='del'>-		select_peripheral(PD(5),  PERIPH_B, 0);		/* RXER	*/</div><div class='del'>-		select_peripheral(PD(4),  PERIPH_B, 0);		/* RXDV	*/</div><div class='del'>-		select_peripheral(PD(3),  PERIPH_B, 0);		/* MDC	*/</div><div class='del'>-		select_peripheral(PD(2),  PERIPH_B, 0);		/* MDIO	*/</div><div class='add'>+		pin_mask  = (1 &lt;&lt; 13);	/* TXD0 */</div><div class='add'>+		pin_mask |= (1 &lt;&lt; 14);	/* TXD1 */</div><div class='add'>+		pin_mask |= (1 &lt;&lt; 11);	/* TXEN */</div><div class='add'>+		pin_mask |= (1 &lt;&lt; 12);	/* TXCK */</div><div class='add'>+		pin_mask |= (1 &lt;&lt; 10);	/* RXD0 */</div><div class='add'>+		pin_mask |= (1 &lt;&lt; 6);	/* RXD1 */</div><div class='add'>+		pin_mask |= (1 &lt;&lt; 5);	/* RXER */</div><div class='add'>+		pin_mask |= (1 &lt;&lt; 4);	/* RXDV */</div><div class='add'>+		pin_mask |= (1 &lt;&lt; 3);	/* MDC  */</div><div class='add'>+		pin_mask |= (1 &lt;&lt; 2);	/* MDIO */</div><div class='add'>+</div><div class='add'>+		if (!data-&gt;is_rmii)</div><div class='add'>+			pin_mask |= (1 &lt;&lt; 15);	/* SPD  */</div><div class='add'>+</div><div class='add'>+		select_peripheral(PIOD, pin_mask, PERIPH_B, 0);</div><div class='ctx'> </div><div class='ctx'> 		if (!data-&gt;is_rmii) {</div><div class='del'>-			select_peripheral(PC(19), PERIPH_B, 0);	/* COL	*/</div><div class='del'>-			select_peripheral(PC(23), PERIPH_B, 0);	/* CRS	*/</div><div class='del'>-			select_peripheral(PC(26), PERIPH_B, 0);	/* TXER	*/</div><div class='del'>-			select_peripheral(PC(27), PERIPH_B, 0);	/* TXD2	*/</div><div class='del'>-			select_peripheral(PC(28), PERIPH_B, 0);	/* TXD3 */</div><div class='del'>-			select_peripheral(PC(29), PERIPH_B, 0);	/* RXD2	*/</div><div class='del'>-			select_peripheral(PC(30), PERIPH_B, 0);	/* RXD3	*/</div><div class='del'>-			select_peripheral(PC(24), PERIPH_B, 0);	/* RXCK	*/</div><div class='del'>-			select_peripheral(PD(15), PERIPH_B, 0);	/* SPD	*/</div><div class='add'>+			pin_mask  = (1 &lt;&lt; 19);	/* COL  */</div><div class='add'>+			pin_mask |= (1 &lt;&lt; 23);	/* CRS  */</div><div class='add'>+			pin_mask |= (1 &lt;&lt; 26);	/* TXER */</div><div class='add'>+			pin_mask |= (1 &lt;&lt; 27);	/* TXD2 */</div><div class='add'>+			pin_mask |= (1 &lt;&lt; 28);	/* TXD3 */</div><div class='add'>+			pin_mask |= (1 &lt;&lt; 29);	/* RXD2 */</div><div class='add'>+			pin_mask |= (1 &lt;&lt; 30);	/* RXD3 */</div><div class='add'>+			pin_mask |= (1 &lt;&lt; 24);	/* RXCK */</div><div class='add'>+</div><div class='add'>+			select_peripheral(PIOC, pin_mask, PERIPH_B, 0);</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='hunk'>@@ -1177,23 +1195,28 @@ at32_add_device_spi(unsigned int id, struct spi_board_info *b, unsigned int n)</div><div class='ctx'> 		{ GPIO_PIN_PB(2), GPIO_PIN_PB(3),</div><div class='ctx'> 		  GPIO_PIN_PB(4), GPIO_PIN_PA(27), };</div><div class='ctx'> 	struct platform_device *pdev;</div><div class='add'>+	u32 pin_mask;</div><div class='ctx'> </div><div class='ctx'> 	switch (id) {</div><div class='ctx'> 	case 0:</div><div class='ctx'> 		pdev = &amp;atmel_spi0_device;</div><div class='add'>+		pin_mask  = (1 &lt;&lt; 1) | (1 &lt;&lt; 2);	/* MOSI &amp; SCK */</div><div class='add'>+</div><div class='ctx'> 		/* pullup MISO so a level is always defined */</div><div class='del'>-		select_peripheral(PA(0),  PERIPH_A, AT32_GPIOF_PULLUP);</div><div class='del'>-		select_peripheral(PA(1),  PERIPH_A, 0);	/* MOSI	 */</div><div class='del'>-		select_peripheral(PA(2),  PERIPH_A, 0);	/* SCK	 */</div><div class='add'>+		select_peripheral(PIOA, (1 &lt;&lt; 0), PERIPH_A, AT32_GPIOF_PULLUP);</div><div class='add'>+		select_peripheral(PIOA, pin_mask, PERIPH_A, 0);</div><div class='add'>+</div><div class='ctx'> 		at32_spi_setup_slaves(0, b, n, spi0_pins);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case 1:</div><div class='ctx'> 		pdev = &amp;atmel_spi1_device;</div><div class='add'>+		pin_mask  = (1 &lt;&lt; 1) | (1 &lt;&lt; 5);	/* MOSI */</div><div class='add'>+</div><div class='ctx'> 		/* pullup MISO so a level is always defined */</div><div class='del'>-		select_peripheral(PB(0),  PERIPH_B, AT32_GPIOF_PULLUP);</div><div class='del'>-		select_peripheral(PB(1),  PERIPH_B, 0);	/* MOSI  */</div><div class='del'>-		select_peripheral(PB(5),  PERIPH_B, 0);	/* SCK   */</div><div class='add'>+		select_peripheral(PIOB, (1 &lt;&lt; 0), PERIPH_B, AT32_GPIOF_PULLUP);</div><div class='add'>+		select_peripheral(PIOB, pin_mask, PERIPH_B, 0);</div><div class='add'>+</div><div class='ctx'> 		at32_spi_setup_slaves(1, b, n, spi1_pins);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='hunk'>@@ -1226,6 +1249,7 @@ struct platform_device *__init at32_add_device_twi(unsigned int id,</div><div class='ctx'> 						    unsigned int n)</div><div class='ctx'> {</div><div class='ctx'> 	struct platform_device *pdev;</div><div class='add'>+	u32 pin_mask;</div><div class='ctx'> </div><div class='ctx'> 	if (id != 0)</div><div class='ctx'> 		return NULL;</div><div class='hunk'>@@ -1238,8 +1262,9 @@ struct platform_device *__init at32_add_device_twi(unsigned int id,</div><div class='ctx'> 				ARRAY_SIZE(atmel_twi0_resource)))</div><div class='ctx'> 		goto err_add_resources;</div><div class='ctx'> </div><div class='del'>-	select_peripheral(PA(6),  PERIPH_A, 0);	/* SDA	*/</div><div class='del'>-	select_peripheral(PA(7),  PERIPH_A, 0);	/* SDL	*/</div><div class='add'>+	pin_mask  = (1 &lt;&lt; 6) | (1 &lt;&lt; 7);	/* SDA &amp; SDL */</div><div class='add'>+</div><div class='add'>+	select_peripheral(PIOA, pin_mask, PERIPH_A, 0);</div><div class='ctx'> </div><div class='ctx'> 	atmel_twi0_pclk.dev = &amp;pdev-&gt;dev;</div><div class='ctx'> </div><div class='hunk'>@@ -1272,10 +1297,16 @@ static struct clk atmel_mci0_pclk = {</div><div class='ctx'> struct platform_device *__init</div><div class='ctx'> at32_add_device_mci(unsigned int id, struct mci_platform_data *data)</div><div class='ctx'> {</div><div class='del'>-	struct mci_platform_data	_data;</div><div class='ctx'> 	struct platform_device		*pdev;</div><div class='add'>+	struct dw_dma_slave		*dws;</div><div class='add'>+	u32				pioa_mask;</div><div class='add'>+	u32				piob_mask;</div><div class='ctx'> </div><div class='del'>-	if (id != 0)</div><div class='add'>+	if (id != 0 || !data)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	/* Must have at least one usable slot */</div><div class='add'>+	if (!data-&gt;slot[0].bus_width &amp;&amp; !data-&gt;slot[1].bus_width)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	pdev = platform_device_alloc("atmel_mci", id);</div><div class='hunk'>@@ -1286,28 +1317,80 @@ at32_add_device_mci(unsigned int id, struct mci_platform_data *data)</div><div class='ctx'> 				ARRAY_SIZE(atmel_mci0_resource)))</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='del'>-	if (!data) {</div><div class='del'>-		data = &amp;_data;</div><div class='del'>-		memset(data, -1, sizeof(struct mci_platform_data));</div><div class='del'>-		data-&gt;detect_pin = GPIO_PIN_NONE;</div><div class='del'>-		data-&gt;wp_pin = GPIO_PIN_NONE;</div><div class='del'>-	}</div><div class='add'>+	if (data-&gt;dma_slave)</div><div class='add'>+		dws = kmemdup(to_dw_dma_slave(data-&gt;dma_slave),</div><div class='add'>+				sizeof(struct dw_dma_slave), GFP_KERNEL);</div><div class='add'>+	else</div><div class='add'>+		dws = kzalloc(sizeof(struct dw_dma_slave), GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	dws-&gt;slave.dev = &amp;pdev-&gt;dev;</div><div class='add'>+	dws-&gt;slave.dma_dev = &amp;dw_dmac0_device.dev;</div><div class='add'>+	dws-&gt;slave.reg_width = DMA_SLAVE_WIDTH_32BIT;</div><div class='add'>+	dws-&gt;cfg_hi = (DWC_CFGH_SRC_PER(0)</div><div class='add'>+				| DWC_CFGH_DST_PER(1));</div><div class='add'>+	dws-&gt;cfg_lo &amp;= ~(DWC_CFGL_HS_DST_POL</div><div class='add'>+				| DWC_CFGL_HS_SRC_POL);</div><div class='add'>+</div><div class='add'>+	data-&gt;dma_slave = &amp;dws-&gt;slave;</div><div class='ctx'> </div><div class='ctx'> 	if (platform_device_add_data(pdev, data,</div><div class='ctx'> 				sizeof(struct mci_platform_data)))</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='del'>-	select_peripheral(PA(10), PERIPH_A, 0);	/* CLK	 */</div><div class='del'>-	select_peripheral(PA(11), PERIPH_A, 0);	/* CMD	 */</div><div class='del'>-	select_peripheral(PA(12), PERIPH_A, 0);	/* DATA0 */</div><div class='del'>-	select_peripheral(PA(13), PERIPH_A, 0);	/* DATA1 */</div><div class='del'>-	select_peripheral(PA(14), PERIPH_A, 0);	/* DATA2 */</div><div class='del'>-	select_peripheral(PA(15), PERIPH_A, 0);	/* DATA3 */</div><div class='add'>+	/* CLK line is common to both slots */</div><div class='add'>+	pioa_mask = 1 &lt;&lt; 10;</div><div class='ctx'> </div><div class='del'>-	if (gpio_is_valid(data-&gt;detect_pin))</div><div class='del'>-		at32_select_gpio(data-&gt;detect_pin, 0);</div><div class='del'>-	if (gpio_is_valid(data-&gt;wp_pin))</div><div class='del'>-		at32_select_gpio(data-&gt;wp_pin, 0);</div><div class='add'>+	switch (data-&gt;slot[0].bus_width) {</div><div class='add'>+	case 4:</div><div class='add'>+		pioa_mask |= 1 &lt;&lt; 13;		/* DATA1 */</div><div class='add'>+		pioa_mask |= 1 &lt;&lt; 14;		/* DATA2 */</div><div class='add'>+		pioa_mask |= 1 &lt;&lt; 15;		/* DATA3 */</div><div class='add'>+		/* fall through */</div><div class='add'>+	case 1:</div><div class='add'>+		pioa_mask |= 1 &lt;&lt; 11;		/* CMD	 */</div><div class='add'>+		pioa_mask |= 1 &lt;&lt; 12;		/* DATA0 */</div><div class='add'>+</div><div class='add'>+		if (gpio_is_valid(data-&gt;slot[0].detect_pin))</div><div class='add'>+			at32_select_gpio(data-&gt;slot[0].detect_pin, 0);</div><div class='add'>+		if (gpio_is_valid(data-&gt;slot[0].wp_pin))</div><div class='add'>+			at32_select_gpio(data-&gt;slot[0].wp_pin, 0);</div><div class='add'>+		break;</div><div class='add'>+	case 0:</div><div class='add'>+		/* Slot is unused */</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		goto fail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	select_peripheral(PIOA, pioa_mask, PERIPH_A, 0);</div><div class='add'>+	piob_mask = 0;</div><div class='add'>+</div><div class='add'>+	switch (data-&gt;slot[1].bus_width) {</div><div class='add'>+	case 4:</div><div class='add'>+		piob_mask |= 1 &lt;&lt;  8;		/* DATA1 */</div><div class='add'>+		piob_mask |= 1 &lt;&lt;  9;		/* DATA2 */</div><div class='add'>+		piob_mask |= 1 &lt;&lt; 10;		/* DATA3 */</div><div class='add'>+		/* fall through */</div><div class='add'>+	case 1:</div><div class='add'>+		piob_mask |= 1 &lt;&lt;  6;		/* CMD	 */</div><div class='add'>+		piob_mask |= 1 &lt;&lt;  7;		/* DATA0 */</div><div class='add'>+		select_peripheral(PIOB, piob_mask, PERIPH_B, 0);</div><div class='add'>+</div><div class='add'>+		if (gpio_is_valid(data-&gt;slot[1].detect_pin))</div><div class='add'>+			at32_select_gpio(data-&gt;slot[1].detect_pin, 0);</div><div class='add'>+		if (gpio_is_valid(data-&gt;slot[1].wp_pin))</div><div class='add'>+			at32_select_gpio(data-&gt;slot[1].wp_pin, 0);</div><div class='add'>+		break;</div><div class='add'>+	case 0:</div><div class='add'>+		/* Slot is unused */</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		if (!data-&gt;slot[0].bus_width)</div><div class='add'>+			goto fail;</div><div class='add'>+</div><div class='add'>+		data-&gt;slot[1].bus_width = 0;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	atmel_mci0_pclk.dev = &amp;pdev-&gt;dev;</div><div class='ctx'> </div><div class='hunk'>@@ -1353,13 +1436,14 @@ static struct clk atmel_lcdfb0_pixclk = {</div><div class='ctx'> struct platform_device *__init</div><div class='ctx'> at32_add_device_lcdc(unsigned int id, struct atmel_lcdfb_info *data,</div><div class='ctx'> 		     unsigned long fbmem_start, unsigned long fbmem_len,</div><div class='del'>-		     unsigned int pin_config)</div><div class='add'>+		     u64 pin_mask)</div><div class='ctx'> {</div><div class='ctx'> 	struct platform_device *pdev;</div><div class='ctx'> 	struct atmel_lcdfb_info *info;</div><div class='ctx'> 	struct fb_monspecs *monspecs;</div><div class='ctx'> 	struct fb_videomode *modedb;</div><div class='ctx'> 	unsigned int modedb_size;</div><div class='add'>+	u32 portc_mask, portd_mask, porte_mask;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Do a deep copy of the fb data, monspecs and modedb. Make</div><div class='hunk'>@@ -1381,76 +1465,21 @@ at32_add_device_lcdc(unsigned int id, struct atmel_lcdfb_info *data,</div><div class='ctx'> 	case 0:</div><div class='ctx'> 		pdev = &amp;atmel_lcdfb0_device;</div><div class='ctx'> </div><div class='del'>-		switch (pin_config) {</div><div class='del'>-		case 0:</div><div class='del'>-			select_peripheral(PC(19), PERIPH_A, 0);	/* CC	  */</div><div class='del'>-			select_peripheral(PC(20), PERIPH_A, 0);	/* HSYNC  */</div><div class='del'>-			select_peripheral(PC(21), PERIPH_A, 0);	/* PCLK	  */</div><div class='del'>-			select_peripheral(PC(22), PERIPH_A, 0);	/* VSYNC  */</div><div class='del'>-			select_peripheral(PC(23), PERIPH_A, 0);	/* DVAL	  */</div><div class='del'>-			select_peripheral(PC(24), PERIPH_A, 0);	/* MODE	  */</div><div class='del'>-			select_peripheral(PC(25), PERIPH_A, 0);	/* PWR	  */</div><div class='del'>-			select_peripheral(PC(26), PERIPH_A, 0);	/* DATA0  */</div><div class='del'>-			select_peripheral(PC(27), PERIPH_A, 0);	/* DATA1  */</div><div class='del'>-			select_peripheral(PC(28), PERIPH_A, 0);	/* DATA2  */</div><div class='del'>-			select_peripheral(PC(29), PERIPH_A, 0);	/* DATA3  */</div><div class='del'>-			select_peripheral(PC(30), PERIPH_A, 0);	/* DATA4  */</div><div class='del'>-			select_peripheral(PC(31), PERIPH_A, 0);	/* DATA5  */</div><div class='del'>-			select_peripheral(PD(0),  PERIPH_A, 0);	/* DATA6  */</div><div class='del'>-			select_peripheral(PD(1),  PERIPH_A, 0);	/* DATA7  */</div><div class='del'>-			select_peripheral(PD(2),  PERIPH_A, 0);	/* DATA8  */</div><div class='del'>-			select_peripheral(PD(3),  PERIPH_A, 0);	/* DATA9  */</div><div class='del'>-			select_peripheral(PD(4),  PERIPH_A, 0);	/* DATA10 */</div><div class='del'>-			select_peripheral(PD(5),  PERIPH_A, 0);	/* DATA11 */</div><div class='del'>-			select_peripheral(PD(6),  PERIPH_A, 0);	/* DATA12 */</div><div class='del'>-			select_peripheral(PD(7),  PERIPH_A, 0);	/* DATA13 */</div><div class='del'>-			select_peripheral(PD(8),  PERIPH_A, 0);	/* DATA14 */</div><div class='del'>-			select_peripheral(PD(9),  PERIPH_A, 0);	/* DATA15 */</div><div class='del'>-			select_peripheral(PD(10), PERIPH_A, 0);	/* DATA16 */</div><div class='del'>-			select_peripheral(PD(11), PERIPH_A, 0);	/* DATA17 */</div><div class='del'>-			select_peripheral(PD(12), PERIPH_A, 0);	/* DATA18 */</div><div class='del'>-			select_peripheral(PD(13), PERIPH_A, 0);	/* DATA19 */</div><div class='del'>-			select_peripheral(PD(14), PERIPH_A, 0);	/* DATA20 */</div><div class='del'>-			select_peripheral(PD(15), PERIPH_A, 0);	/* DATA21 */</div><div class='del'>-			select_peripheral(PD(16), PERIPH_A, 0);	/* DATA22 */</div><div class='del'>-			select_peripheral(PD(17), PERIPH_A, 0);	/* DATA23 */</div><div class='del'>-			break;</div><div class='del'>-		case 1:</div><div class='del'>-			select_peripheral(PE(0),  PERIPH_B, 0);	/* CC	  */</div><div class='del'>-			select_peripheral(PC(20), PERIPH_A, 0);	/* HSYNC  */</div><div class='del'>-			select_peripheral(PC(21), PERIPH_A, 0);	/* PCLK	  */</div><div class='del'>-			select_peripheral(PC(22), PERIPH_A, 0);	/* VSYNC  */</div><div class='del'>-			select_peripheral(PE(1),  PERIPH_B, 0);	/* DVAL	  */</div><div class='del'>-			select_peripheral(PE(2),  PERIPH_B, 0);	/* MODE	  */</div><div class='del'>-			select_peripheral(PC(25), PERIPH_A, 0);	/* PWR	  */</div><div class='del'>-			select_peripheral(PE(3),  PERIPH_B, 0);	/* DATA0  */</div><div class='del'>-			select_peripheral(PE(4),  PERIPH_B, 0);	/* DATA1  */</div><div class='del'>-			select_peripheral(PE(5),  PERIPH_B, 0);	/* DATA2  */</div><div class='del'>-			select_peripheral(PE(6),  PERIPH_B, 0);	/* DATA3  */</div><div class='del'>-			select_peripheral(PE(7),  PERIPH_B, 0);	/* DATA4  */</div><div class='del'>-			select_peripheral(PC(31), PERIPH_A, 0);	/* DATA5  */</div><div class='del'>-			select_peripheral(PD(0),  PERIPH_A, 0);	/* DATA6  */</div><div class='del'>-			select_peripheral(PD(1),  PERIPH_A, 0);	/* DATA7  */</div><div class='del'>-			select_peripheral(PE(8),  PERIPH_B, 0);	/* DATA8  */</div><div class='del'>-			select_peripheral(PE(9),  PERIPH_B, 0);	/* DATA9  */</div><div class='del'>-			select_peripheral(PE(10), PERIPH_B, 0);	/* DATA10 */</div><div class='del'>-			select_peripheral(PE(11), PERIPH_B, 0);	/* DATA11 */</div><div class='del'>-			select_peripheral(PE(12), PERIPH_B, 0);	/* DATA12 */</div><div class='del'>-			select_peripheral(PD(7),  PERIPH_A, 0);	/* DATA13 */</div><div class='del'>-			select_peripheral(PD(8),  PERIPH_A, 0);	/* DATA14 */</div><div class='del'>-			select_peripheral(PD(9),  PERIPH_A, 0);	/* DATA15 */</div><div class='del'>-			select_peripheral(PE(13), PERIPH_B, 0);	/* DATA16 */</div><div class='del'>-			select_peripheral(PE(14), PERIPH_B, 0);	/* DATA17 */</div><div class='del'>-			select_peripheral(PE(15), PERIPH_B, 0);	/* DATA18 */</div><div class='del'>-			select_peripheral(PE(16), PERIPH_B, 0);	/* DATA19 */</div><div class='del'>-			select_peripheral(PE(17), PERIPH_B, 0);	/* DATA20 */</div><div class='del'>-			select_peripheral(PE(18), PERIPH_B, 0);	/* DATA21 */</div><div class='del'>-			select_peripheral(PD(16), PERIPH_A, 0);	/* DATA22 */</div><div class='del'>-			select_peripheral(PD(17), PERIPH_A, 0);	/* DATA23 */</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			goto err_invalid_id;</div><div class='del'>-		}</div><div class='add'>+		if (pin_mask == 0ULL)</div><div class='add'>+			/* Default to "full" lcdc control signals and 24bit */</div><div class='add'>+			pin_mask = ATMEL_LCDC_PRI_24BIT | ATMEL_LCDC_PRI_CONTROL;</div><div class='add'>+</div><div class='add'>+		/* LCDC on port C */</div><div class='add'>+		portc_mask = (pin_mask &amp; 0xfff80000) &gt;&gt; 19;</div><div class='add'>+		select_peripheral(PIOC, portc_mask, PERIPH_A, 0);</div><div class='add'>+</div><div class='add'>+		/* LCDC on port D */</div><div class='add'>+		portd_mask = pin_mask &amp; 0x0003ffff;</div><div class='add'>+		select_peripheral(PIOD, portd_mask, PERIPH_A, 0);</div><div class='add'>+</div><div class='add'>+		/* LCDC on port E */</div><div class='add'>+		porte_mask = (pin_mask &gt;&gt; 32) &amp; 0x0007ffff;</div><div class='add'>+		select_peripheral(PIOE, porte_mask, PERIPH_B, 0);</div><div class='ctx'> </div><div class='ctx'> 		clk_set_parent(&amp;atmel_lcdfb0_pixclk, &amp;pll0);</div><div class='ctx'> 		clk_set_rate(&amp;atmel_lcdfb0_pixclk, clk_get_rate(&amp;pll0));</div><div class='hunk'>@@ -1499,6 +1528,7 @@ static struct clk atmel_pwm0_mck = {</div><div class='ctx'> struct platform_device *__init at32_add_device_pwm(u32 mask)</div><div class='ctx'> {</div><div class='ctx'> 	struct platform_device *pdev;</div><div class='add'>+	u32 pin_mask;</div><div class='ctx'> </div><div class='ctx'> 	if (!mask)</div><div class='ctx'> 		return NULL;</div><div class='hunk'>@@ -1514,14 +1544,21 @@ struct platform_device *__init at32_add_device_pwm(u32 mask)</div><div class='ctx'> 	if (platform_device_add_data(pdev, &amp;mask, sizeof(mask)))</div><div class='ctx'> 		goto out_free_pdev;</div><div class='ctx'> </div><div class='add'>+	pin_mask = 0;</div><div class='ctx'> 	if (mask &amp; (1 &lt;&lt; 0))</div><div class='del'>-		select_peripheral(PA(28), PERIPH_A, 0);</div><div class='add'>+		pin_mask |= (1 &lt;&lt; 28);</div><div class='ctx'> 	if (mask &amp; (1 &lt;&lt; 1))</div><div class='del'>-		select_peripheral(PA(29), PERIPH_A, 0);</div><div class='add'>+		pin_mask |= (1 &lt;&lt; 29);</div><div class='add'>+	if (pin_mask &gt; 0)</div><div class='add'>+		select_peripheral(PIOA, pin_mask, PERIPH_A, 0);</div><div class='add'>+</div><div class='add'>+	pin_mask = 0;</div><div class='ctx'> 	if (mask &amp; (1 &lt;&lt; 2))</div><div class='del'>-		select_peripheral(PA(21), PERIPH_B, 0);</div><div class='add'>+		pin_mask |= (1 &lt;&lt; 21);</div><div class='ctx'> 	if (mask &amp; (1 &lt;&lt; 3))</div><div class='del'>-		select_peripheral(PA(22), PERIPH_B, 0);</div><div class='add'>+		pin_mask |= (1 &lt;&lt; 22);</div><div class='add'>+	if (pin_mask &gt; 0)</div><div class='add'>+		select_peripheral(PIOA, pin_mask, PERIPH_B, 0);</div><div class='ctx'> </div><div class='ctx'> 	atmel_pwm0_mck.dev = &amp;pdev-&gt;dev;</div><div class='ctx'> </div><div class='hunk'>@@ -1562,52 +1599,65 @@ struct platform_device *__init</div><div class='ctx'> at32_add_device_ssc(unsigned int id, unsigned int flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct platform_device *pdev;</div><div class='add'>+	u32 pin_mask = 0;</div><div class='ctx'> </div><div class='ctx'> 	switch (id) {</div><div class='ctx'> 	case 0:</div><div class='ctx'> 		pdev = &amp;ssc0_device;</div><div class='ctx'> 		if (flags &amp; ATMEL_SSC_RF)</div><div class='del'>-			select_peripheral(PA(21), PERIPH_A, 0);	/* RF */</div><div class='add'>+			pin_mask |= (1 &lt;&lt; 21);	/* RF */</div><div class='ctx'> 		if (flags &amp; ATMEL_SSC_RK)</div><div class='del'>-			select_peripheral(PA(22), PERIPH_A, 0);	/* RK */</div><div class='add'>+			pin_mask |= (1 &lt;&lt; 22);	/* RK */</div><div class='ctx'> 		if (flags &amp; ATMEL_SSC_TK)</div><div class='del'>-			select_peripheral(PA(23), PERIPH_A, 0);	/* TK */</div><div class='add'>+			pin_mask |= (1 &lt;&lt; 23);	/* TK */</div><div class='ctx'> 		if (flags &amp; ATMEL_SSC_TF)</div><div class='del'>-			select_peripheral(PA(24), PERIPH_A, 0);	/* TF */</div><div class='add'>+			pin_mask |= (1 &lt;&lt; 24);	/* TF */</div><div class='ctx'> 		if (flags &amp; ATMEL_SSC_TD)</div><div class='del'>-			select_peripheral(PA(25), PERIPH_A, 0);	/* TD */</div><div class='add'>+			pin_mask |= (1 &lt;&lt; 25);	/* TD */</div><div class='ctx'> 		if (flags &amp; ATMEL_SSC_RD)</div><div class='del'>-			select_peripheral(PA(26), PERIPH_A, 0);	/* RD */</div><div class='add'>+			pin_mask |= (1 &lt;&lt; 26);	/* RD */</div><div class='add'>+</div><div class='add'>+		if (pin_mask &gt; 0)</div><div class='add'>+			select_peripheral(PIOA, pin_mask, PERIPH_A, 0);</div><div class='add'>+</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 1:</div><div class='ctx'> 		pdev = &amp;ssc1_device;</div><div class='ctx'> 		if (flags &amp; ATMEL_SSC_RF)</div><div class='del'>-			select_peripheral(PA(0), PERIPH_B, 0);	/* RF */</div><div class='add'>+			pin_mask |= (1 &lt;&lt; 0);	/* RF */</div><div class='ctx'> 		if (flags &amp; ATMEL_SSC_RK)</div><div class='del'>-			select_peripheral(PA(1), PERIPH_B, 0);	/* RK */</div><div class='add'>+			pin_mask |= (1 &lt;&lt; 1);	/* RK */</div><div class='ctx'> 		if (flags &amp; ATMEL_SSC_TK)</div><div class='del'>-			select_peripheral(PA(2), PERIPH_B, 0);	/* TK */</div><div class='add'>+			pin_mask |= (1 &lt;&lt; 2);	/* TK */</div><div class='ctx'> 		if (flags &amp; ATMEL_SSC_TF)</div><div class='del'>-			select_peripheral(PA(3), PERIPH_B, 0);	/* TF */</div><div class='add'>+			pin_mask |= (1 &lt;&lt; 3);	/* TF */</div><div class='ctx'> 		if (flags &amp; ATMEL_SSC_TD)</div><div class='del'>-			select_peripheral(PA(4), PERIPH_B, 0);	/* TD */</div><div class='add'>+			pin_mask |= (1 &lt;&lt; 4);	/* TD */</div><div class='ctx'> 		if (flags &amp; ATMEL_SSC_RD)</div><div class='del'>-			select_peripheral(PA(5), PERIPH_B, 0);	/* RD */</div><div class='add'>+			pin_mask |= (1 &lt;&lt; 5);	/* RD */</div><div class='add'>+</div><div class='add'>+		if (pin_mask &gt; 0)</div><div class='add'>+			select_peripheral(PIOA, pin_mask, PERIPH_B, 0);</div><div class='add'>+</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 2:</div><div class='ctx'> 		pdev = &amp;ssc2_device;</div><div class='ctx'> 		if (flags &amp; ATMEL_SSC_TD)</div><div class='del'>-			select_peripheral(PB(13), PERIPH_A, 0);	/* TD */</div><div class='add'>+			pin_mask |= (1 &lt;&lt; 13);	/* TD */</div><div class='ctx'> 		if (flags &amp; ATMEL_SSC_RD)</div><div class='del'>-			select_peripheral(PB(14), PERIPH_A, 0);	/* RD */</div><div class='add'>+			pin_mask |= (1 &lt;&lt; 14);	/* RD */</div><div class='ctx'> 		if (flags &amp; ATMEL_SSC_TK)</div><div class='del'>-			select_peripheral(PB(15), PERIPH_A, 0);	/* TK */</div><div class='add'>+			pin_mask |= (1 &lt;&lt; 15);	/* TK */</div><div class='ctx'> 		if (flags &amp; ATMEL_SSC_TF)</div><div class='del'>-			select_peripheral(PB(16), PERIPH_A, 0);	/* TF */</div><div class='add'>+			pin_mask |= (1 &lt;&lt; 16);	/* TF */</div><div class='ctx'> 		if (flags &amp; ATMEL_SSC_RF)</div><div class='del'>-			select_peripheral(PB(17), PERIPH_A, 0);	/* RF */</div><div class='add'>+			pin_mask |= (1 &lt;&lt; 17);	/* RF */</div><div class='ctx'> 		if (flags &amp; ATMEL_SSC_RK)</div><div class='del'>-			select_peripheral(PB(18), PERIPH_A, 0);	/* RK */</div><div class='add'>+			pin_mask |= (1 &lt;&lt; 18);	/* RK */</div><div class='add'>+</div><div class='add'>+		if (pin_mask &gt; 0)</div><div class='add'>+			select_peripheral(PIOB, pin_mask, PERIPH_A, 0);</div><div class='add'>+</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return NULL;</div><div class='hunk'>@@ -1745,14 +1795,15 @@ static int __init at32_init_ide_or_cf(struct platform_device *pdev,</div><div class='ctx'> 		unsigned int cs, unsigned int extint)</div><div class='ctx'> {</div><div class='ctx'> 	static unsigned int extint_pin_map[4] __initdata = {</div><div class='del'>-		GPIO_PIN_PB(25),</div><div class='del'>-		GPIO_PIN_PB(26),</div><div class='del'>-		GPIO_PIN_PB(27),</div><div class='del'>-		GPIO_PIN_PB(28),</div><div class='add'>+		(1 &lt;&lt; 25),</div><div class='add'>+		(1 &lt;&lt; 26),</div><div class='add'>+		(1 &lt;&lt; 27),</div><div class='add'>+		(1 &lt;&lt; 28),</div><div class='ctx'> 	};</div><div class='ctx'> 	static bool common_pins_initialized __initdata = false;</div><div class='ctx'> 	unsigned int extint_pin;</div><div class='ctx'> 	int ret;</div><div class='add'>+	u32 pin_mask;</div><div class='ctx'> </div><div class='ctx'> 	if (extint &gt;= ARRAY_SIZE(extint_pin_map))</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -1766,7 +1817,8 @@ static int __init at32_init_ide_or_cf(struct platform_device *pdev,</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='ctx'> </div><div class='del'>-		select_peripheral(PE(21), PERIPH_A, 0); /* NCS4   -&gt; OE_N  */</div><div class='add'>+		/* NCS4   -&gt; OE_N  */</div><div class='add'>+		select_peripheral(PIOE, (1 &lt;&lt; 21), PERIPH_A, 0);</div><div class='ctx'> 		hmatrix_sfr_set_bits(HMATRIX_SLAVE_EBI, HMATRIX_EBI_CF0_ENABLE);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 5:</div><div class='hunk'>@@ -1776,7 +1828,8 @@ static int __init at32_init_ide_or_cf(struct platform_device *pdev,</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='ctx'> </div><div class='del'>-		select_peripheral(PE(22), PERIPH_A, 0); /* NCS5   -&gt; OE_N  */</div><div class='add'>+		/* NCS5   -&gt; OE_N  */</div><div class='add'>+		select_peripheral(PIOE, (1 &lt;&lt; 22), PERIPH_A, 0);</div><div class='ctx'> 		hmatrix_sfr_set_bits(HMATRIX_SLAVE_EBI, HMATRIX_EBI_CF1_ENABLE);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -1784,14 +1837,17 @@ static int __init at32_init_ide_or_cf(struct platform_device *pdev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!common_pins_initialized) {</div><div class='del'>-		select_peripheral(PE(19), PERIPH_A, 0);	/* CFCE1  -&gt; CS0_N */</div><div class='del'>-		select_peripheral(PE(20), PERIPH_A, 0);	/* CFCE2  -&gt; CS1_N */</div><div class='del'>-		select_peripheral(PE(23), PERIPH_A, 0); /* CFRNW  -&gt; DIR   */</div><div class='del'>-		select_peripheral(PE(24), PERIPH_A, 0); /* NWAIT  &lt;- IORDY */</div><div class='add'>+		pin_mask  = (1 &lt;&lt; 19);	/* CFCE1  -&gt; CS0_N */</div><div class='add'>+		pin_mask |= (1 &lt;&lt; 20);	/* CFCE2  -&gt; CS1_N */</div><div class='add'>+		pin_mask |= (1 &lt;&lt; 23);	/* CFRNW  -&gt; DIR   */</div><div class='add'>+		pin_mask |= (1 &lt;&lt; 24);	/* NWAIT  &lt;- IORDY */</div><div class='add'>+</div><div class='add'>+		select_peripheral(PIOE, pin_mask, PERIPH_A, 0);</div><div class='add'>+</div><div class='ctx'> 		common_pins_initialized = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	at32_select_periph(extint_pin, GPIO_PERIPH_A, AT32_GPIOF_DEGLITCH);</div><div class='add'>+	select_peripheral(PIOB, extint_pin, PERIPH_A, AT32_GPIOF_DEGLITCH);</div><div class='ctx'> </div><div class='ctx'> 	pdev-&gt;resource[1].start = EIM_IRQ_BASE + extint;</div><div class='ctx'> 	pdev-&gt;resource[1].end = pdev-&gt;resource[1].start;</div><div class='hunk'>@@ -1930,6 +1986,7 @@ at32_add_device_ac97c(unsigned int id, struct ac97c_platform_data *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct platform_device *pdev;</div><div class='ctx'> 	struct ac97c_platform_data _data;</div><div class='add'>+	u32 pin_mask;</div><div class='ctx'> </div><div class='ctx'> 	if (id != 0)</div><div class='ctx'> 		return NULL;</div><div class='hunk'>@@ -1956,10 +2013,10 @@ at32_add_device_ac97c(unsigned int id, struct ac97c_platform_data *data)</div><div class='ctx'> 				sizeof(struct ac97c_platform_data)))</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='del'>-	select_peripheral(PB(20), PERIPH_B, 0);	/* SDO	*/</div><div class='del'>-	select_peripheral(PB(21), PERIPH_B, 0);	/* SYNC	*/</div><div class='del'>-	select_peripheral(PB(22), PERIPH_B, 0);	/* SCLK	*/</div><div class='del'>-	select_peripheral(PB(23), PERIPH_B, 0);	/* SDI	*/</div><div class='add'>+	pin_mask  = (1 &lt;&lt; 20) | (1 &lt;&lt; 21);	/* SDO &amp; SYNC */</div><div class='add'>+	pin_mask |= (1 &lt;&lt; 22) | (1 &lt;&lt; 23);	/* SCLK &amp; SDI */</div><div class='add'>+</div><div class='add'>+	select_peripheral(PIOB, pin_mask, PERIPH_B, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* TODO: gpio_is_valid(data-&gt;reset_pin) with kernel 2.6.26. */</div><div class='ctx'> 	if (data-&gt;reset_pin != GPIO_PIN_NONE)</div><div class='hunk'>@@ -2001,6 +2058,7 @@ static struct clk abdac0_sample_clk = {</div><div class='ctx'> struct platform_device *__init at32_add_device_abdac(unsigned int id)</div><div class='ctx'> {</div><div class='ctx'> 	struct platform_device *pdev;</div><div class='add'>+	u32 pin_mask;</div><div class='ctx'> </div><div class='ctx'> 	if (id != 0)</div><div class='ctx'> 		return NULL;</div><div class='hunk'>@@ -2013,10 +2071,10 @@ struct platform_device *__init at32_add_device_abdac(unsigned int id)</div><div class='ctx'> 				ARRAY_SIZE(abdac0_resource)))</div><div class='ctx'> 		goto err_add_resources;</div><div class='ctx'> </div><div class='del'>-	select_peripheral(PB(20), PERIPH_A, 0);	/* DATA1	*/</div><div class='del'>-	select_peripheral(PB(21), PERIPH_A, 0);	/* DATA0	*/</div><div class='del'>-	select_peripheral(PB(22), PERIPH_A, 0);	/* DATAN1	*/</div><div class='del'>-	select_peripheral(PB(23), PERIPH_A, 0);	/* DATAN0	*/</div><div class='add'>+	pin_mask  = (1 &lt;&lt; 20) | (1 &lt;&lt; 22);	/* DATA1 &amp; DATAN1 */</div><div class='add'>+	pin_mask |= (1 &lt;&lt; 21) | (1 &lt;&lt; 23);	/* DATA0 &amp; DATAN0 */</div><div class='add'>+</div><div class='add'>+	select_peripheral(PIOB, pin_mask, PERIPH_A, 0);</div><div class='ctx'> </div><div class='ctx'> 	abdac0_pclk.dev = &amp;pdev-&gt;dev;</div><div class='ctx'> 	abdac0_sample_clk.dev = &amp;pdev-&gt;dev;</div><div class='hunk'>@@ -2073,7 +2131,7 @@ static struct clk gclk4 = {</div><div class='ctx'> 	.index		= 4,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct clk *at32_clock_list[] = {</div><div class='add'>+static __initdata struct clk *init_clocks[] = {</div><div class='ctx'> 	&amp;osc32k,</div><div class='ctx'> 	&amp;osc0,</div><div class='ctx'> 	&amp;osc1,</div><div class='hunk'>@@ -2137,7 +2195,6 @@ struct clk *at32_clock_list[] = {</div><div class='ctx'> 	&amp;gclk3,</div><div class='ctx'> 	&amp;gclk4,</div><div class='ctx'> };</div><div class='del'>-unsigned int at32_nr_clocks = ARRAY_SIZE(at32_clock_list);</div><div class='ctx'> </div><div class='ctx'> void __init setup_platform(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -2168,14 +2225,19 @@ void __init setup_platform(void)</div><div class='ctx'> 	genclk_init_parent(&amp;abdac0_sample_clk);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Turn on all clocks that have at least one user already, and</div><div class='del'>-	 * turn off everything else. We only do this for module</div><div class='del'>-	 * clocks, and even though it isn't particularly pretty to</div><div class='del'>-	 * check the address of the mode function, it should do the</div><div class='del'>-	 * trick...</div><div class='add'>+	 * Build initial dynamic clock list by registering all clocks</div><div class='add'>+	 * from the array.</div><div class='add'>+	 * At the same time, turn on all clocks that have at least one</div><div class='add'>+	 * user already, and turn off everything else. We only do this</div><div class='add'>+	 * for module clocks, and even though it isn't particularly</div><div class='add'>+	 * pretty to  check the address of the mode function, it should</div><div class='add'>+	 * do the trick...</div><div class='ctx'> 	 */</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(at32_clock_list); i++) {</div><div class='del'>-		struct clk *clk = at32_clock_list[i];</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(init_clocks); i++) {</div><div class='add'>+		struct clk *clk = init_clocks[i];</div><div class='add'>+</div><div class='add'>+		/* first, register clock */</div><div class='add'>+		at32_clk_register(clk);</div><div class='ctx'> </div><div class='ctx'> 		if (clk-&gt;users == 0)</div><div class='ctx'> 			continue;</div><div class='head'>diff --git a/arch/avr32/mach-at32ap/clock.c b/arch/avr32/mach-at32ap/clock.c<br/>index 6c27ddac5adf..138a00a2a2d0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/avr32/mach-at32ap/clock.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/avr32/mach-at32ap/clock.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/avr32/mach-at32ap/clock.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/avr32/mach-at32ap/clock.c</a></div><div class='hunk'>@@ -15,24 +15,40 @@</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/chip.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "clock.h"</div><div class='ctx'> </div><div class='add'>+/* at32 clock list */</div><div class='add'>+static LIST_HEAD(at32_clock_list);</div><div class='add'>+</div><div class='ctx'> static DEFINE_SPINLOCK(clk_lock);</div><div class='add'>+static DEFINE_SPINLOCK(clk_list_lock);</div><div class='add'>+</div><div class='add'>+void at32_clk_register(struct clk *clk)</div><div class='add'>+{</div><div class='add'>+	spin_lock(&amp;clk_list_lock);</div><div class='add'>+	/* add the new item to the end of the list */</div><div class='add'>+	list_add_tail(&amp;clk-&gt;list, &amp;at32_clock_list);</div><div class='add'>+	spin_unlock(&amp;clk_list_lock);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> struct clk *clk_get(struct device *dev, const char *id)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='add'>+	struct clk *clk;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; at32_nr_clocks; i++) {</div><div class='del'>-		struct clk *clk = at32_clock_list[i];</div><div class='add'>+	spin_lock(&amp;clk_list_lock);</div><div class='ctx'> </div><div class='del'>-		if (clk-&gt;dev == dev &amp;&amp; strcmp(id, clk-&gt;name) == 0)</div><div class='add'>+	list_for_each_entry(clk, &amp;at32_clock_list, list) {</div><div class='add'>+		if (clk-&gt;dev == dev &amp;&amp; strcmp(id, clk-&gt;name) == 0) {</div><div class='add'>+			spin_unlock(&amp;clk_list_lock);</div><div class='ctx'> 			return clk;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	spin_unlock(&amp;clk_list_lock);</div><div class='ctx'> 	return ERR_PTR(-ENOENT);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(clk_get);</div><div class='hunk'>@@ -203,8 +219,8 @@ dump_clock(struct clk *parent, struct clkinf *r)</div><div class='ctx'> </div><div class='ctx'> 	/* cost of this scan is small, but not linear... */</div><div class='ctx'> 	r-&gt;nest = nest + NEST_DELTA;</div><div class='del'>-	for (i = 3; i &lt; at32_nr_clocks; i++) {</div><div class='del'>-		clk = at32_clock_list[i];</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(clk, &amp;at32_clock_list, list) {</div><div class='ctx'> 		if (clk-&gt;parent == parent)</div><div class='ctx'> 			dump_clock(clk, r);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -215,6 +231,7 @@ static int clk_show(struct seq_file *s, void *unused)</div><div class='ctx'> {</div><div class='ctx'> 	struct clkinf	r;</div><div class='ctx'> 	int		i;</div><div class='add'>+	struct clk 	*clk;</div><div class='ctx'> </div><div class='ctx'> 	/* show all the power manager registers */</div><div class='ctx'> 	seq_printf(s, "MCCTRL  = %8x\n", pm_readl(MCCTRL));</div><div class='hunk'>@@ -234,14 +251,25 @@ static int clk_show(struct seq_file *s, void *unused)</div><div class='ctx'> </div><div class='ctx'> 	seq_printf(s, "\n");</div><div class='ctx'> </div><div class='del'>-	/* show clock tree as derived from the three oscillators</div><div class='del'>-	 * we "know" are at the head of the list</div><div class='del'>-	 */</div><div class='ctx'> 	r.s = s;</div><div class='ctx'> 	r.nest = 0;</div><div class='del'>-	dump_clock(at32_clock_list[0], &amp;r);</div><div class='del'>-	dump_clock(at32_clock_list[1], &amp;r);</div><div class='del'>-	dump_clock(at32_clock_list[2], &amp;r);</div><div class='add'>+	/* protected from changes on the list while dumping */</div><div class='add'>+	spin_lock(&amp;clk_list_lock);</div><div class='add'>+</div><div class='add'>+	/* show clock tree as derived from the three oscillators */</div><div class='add'>+	clk = clk_get(NULL, "osc32k");</div><div class='add'>+	dump_clock(clk, &amp;r);</div><div class='add'>+	clk_put(clk);</div><div class='add'>+</div><div class='add'>+	clk = clk_get(NULL, "osc0");</div><div class='add'>+	dump_clock(clk, &amp;r);</div><div class='add'>+	clk_put(clk);</div><div class='add'>+</div><div class='add'>+	clk = clk_get(NULL, "osc1");</div><div class='add'>+	dump_clock(clk, &amp;r);</div><div class='add'>+	clk_put(clk);</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;clk_list_lock);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/avr32/mach-at32ap/clock.h b/arch/avr32/mach-at32ap/clock.h<br/>index bb8e1f295835..623bf0e9a1e7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/avr32/mach-at32ap/clock.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/avr32/mach-at32ap/clock.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/avr32/mach-at32ap/clock.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/avr32/mach-at32ap/clock.h</a></div><div class='hunk'>@@ -12,8 +12,13 @@</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+void at32_clk_register(struct clk *clk);</div><div class='ctx'> </div><div class='ctx'> struct clk {</div><div class='add'>+	struct list_head list;		/* linking element */</div><div class='ctx'> 	const char	*name;		/* Clock name/function */</div><div class='ctx'> 	struct device	*dev;		/* Device the clock is used by */</div><div class='ctx'> 	struct clk	*parent;	/* Parent clock, if any */</div><div class='hunk'>@@ -25,6 +30,3 @@ struct clk {</div><div class='ctx'> 	u16		users;		/* Enabled if non-zero */</div><div class='ctx'> 	u16		index;		/* Sibling index */</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-extern struct clk *at32_clock_list[];</div><div class='del'>-extern unsigned int at32_nr_clocks;</div><div class='head'>diff --git a/arch/avr32/mach-at32ap/cpufreq.c b/arch/avr32/mach-at32ap/cpufreq.c<br/>index 5dd8d25428bf..d84efe4984ab 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/avr32/mach-at32ap/cpufreq.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/avr32/mach-at32ap/cpufreq.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/avr32/mach-at32ap/cpufreq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/avr32/mach-at32ap/cpufreq.c</a></div><div class='hunk'>@@ -87,7 +87,6 @@ static int __init at32_cpufreq_driver_init(struct cpufreq_policy *policy)</div><div class='ctx'> 	policy-&gt;cur = at32_get_speed(0);</div><div class='ctx'> 	policy-&gt;min = policy-&gt;cpuinfo.min_freq;</div><div class='ctx'> 	policy-&gt;max = policy-&gt;cpuinfo.max_freq;</div><div class='del'>-	policy-&gt;governor = CPUFREQ_DEFAULT_GOVERNOR;</div><div class='ctx'> </div><div class='ctx'> 	printk("cpufreq: AT32AP CPU frequency driver\n");</div><div class='ctx'> </div><div class='head'>diff --git a/arch/avr32/mach-at32ap/include/mach/at32ap700x.h b/arch/avr32/mach-at32ap/include/mach/at32ap700x.h<br/>index 1e9852d65cca..a77d372f6f3e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/avr32/mach-at32ap/include/mach/at32ap700x.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/avr32/mach-at32ap/include/mach/at32ap700x.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/avr32/mach-at32ap/include/mach/at32ap700x.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/avr32/mach-at32ap/include/mach/at32ap700x.h</a></div><div class='hunk'>@@ -83,4 +83,132 @@</div><div class='ctx'> #define HMATRIX_BASE	0xfff00800</div><div class='ctx'> #define SDRAMC_BASE	0xfff03800</div><div class='ctx'> </div><div class='add'>+/* LCDC on port C */</div><div class='add'>+#define ATMEL_LCDC_PC_CC	(1ULL &lt;&lt; 19)</div><div class='add'>+#define ATMEL_LCDC_PC_HSYNC	(1ULL &lt;&lt; 20)</div><div class='add'>+#define ATMEL_LCDC_PC_PCLK	(1ULL &lt;&lt; 21)</div><div class='add'>+#define ATMEL_LCDC_PC_VSYNC	(1ULL &lt;&lt; 22)</div><div class='add'>+#define ATMEL_LCDC_PC_DVAL	(1ULL &lt;&lt; 23)</div><div class='add'>+#define ATMEL_LCDC_PC_MODE	(1ULL &lt;&lt; 24)</div><div class='add'>+#define ATMEL_LCDC_PC_PWR	(1ULL &lt;&lt; 25)</div><div class='add'>+#define ATMEL_LCDC_PC_DATA0	(1ULL &lt;&lt; 26)</div><div class='add'>+#define ATMEL_LCDC_PC_DATA1	(1ULL &lt;&lt; 27)</div><div class='add'>+#define ATMEL_LCDC_PC_DATA2	(1ULL &lt;&lt; 28)</div><div class='add'>+#define ATMEL_LCDC_PC_DATA3	(1ULL &lt;&lt; 29)</div><div class='add'>+#define ATMEL_LCDC_PC_DATA4	(1ULL &lt;&lt; 30)</div><div class='add'>+#define ATMEL_LCDC_PC_DATA5	(1ULL &lt;&lt; 31)</div><div class='add'>+</div><div class='add'>+/* LCDC on port D */</div><div class='add'>+#define ATMEL_LCDC_PD_DATA6	(1ULL &lt;&lt; 0)</div><div class='add'>+#define ATMEL_LCDC_PD_DATA7	(1ULL &lt;&lt; 1)</div><div class='add'>+#define ATMEL_LCDC_PD_DATA8	(1ULL &lt;&lt; 2)</div><div class='add'>+#define ATMEL_LCDC_PD_DATA9	(1ULL &lt;&lt; 3)</div><div class='add'>+#define ATMEL_LCDC_PD_DATA10	(1ULL &lt;&lt; 4)</div><div class='add'>+#define ATMEL_LCDC_PD_DATA11	(1ULL &lt;&lt; 5)</div><div class='add'>+#define ATMEL_LCDC_PD_DATA12	(1ULL &lt;&lt; 6)</div><div class='add'>+#define ATMEL_LCDC_PD_DATA13	(1ULL &lt;&lt; 7)</div><div class='add'>+#define ATMEL_LCDC_PD_DATA14	(1ULL &lt;&lt; 8)</div><div class='add'>+#define ATMEL_LCDC_PD_DATA15	(1ULL &lt;&lt; 9)</div><div class='add'>+#define ATMEL_LCDC_PD_DATA16	(1ULL &lt;&lt; 10)</div><div class='add'>+#define ATMEL_LCDC_PD_DATA17	(1ULL &lt;&lt; 11)</div><div class='add'>+#define ATMEL_LCDC_PD_DATA18	(1ULL &lt;&lt; 12)</div><div class='add'>+#define ATMEL_LCDC_PD_DATA19	(1ULL &lt;&lt; 13)</div><div class='add'>+#define ATMEL_LCDC_PD_DATA20	(1ULL &lt;&lt; 14)</div><div class='add'>+#define ATMEL_LCDC_PD_DATA21	(1ULL &lt;&lt; 15)</div><div class='add'>+#define ATMEL_LCDC_PD_DATA22	(1ULL &lt;&lt; 16)</div><div class='add'>+#define ATMEL_LCDC_PD_DATA23	(1ULL &lt;&lt; 17)</div><div class='add'>+</div><div class='add'>+/* LCDC on port E */</div><div class='add'>+#define ATMEL_LCDC_PE_CC	(1ULL &lt;&lt; (32 + 0))</div><div class='add'>+#define ATMEL_LCDC_PE_DVAL	(1ULL &lt;&lt; (32 + 1))</div><div class='add'>+#define ATMEL_LCDC_PE_MODE	(1ULL &lt;&lt; (32 + 2))</div><div class='add'>+#define ATMEL_LCDC_PE_DATA0	(1ULL &lt;&lt; (32 + 3))</div><div class='add'>+#define ATMEL_LCDC_PE_DATA1	(1ULL &lt;&lt; (32 + 4))</div><div class='add'>+#define ATMEL_LCDC_PE_DATA2	(1ULL &lt;&lt; (32 + 5))</div><div class='add'>+#define ATMEL_LCDC_PE_DATA3	(1ULL &lt;&lt; (32 + 6))</div><div class='add'>+#define ATMEL_LCDC_PE_DATA4	(1ULL &lt;&lt; (32 + 7))</div><div class='add'>+#define ATMEL_LCDC_PE_DATA8	(1ULL &lt;&lt; (32 + 8))</div><div class='add'>+#define ATMEL_LCDC_PE_DATA9	(1ULL &lt;&lt; (32 + 9))</div><div class='add'>+#define ATMEL_LCDC_PE_DATA10	(1ULL &lt;&lt; (32 + 10))</div><div class='add'>+#define ATMEL_LCDC_PE_DATA11	(1ULL &lt;&lt; (32 + 11))</div><div class='add'>+#define ATMEL_LCDC_PE_DATA12	(1ULL &lt;&lt; (32 + 12))</div><div class='add'>+#define ATMEL_LCDC_PE_DATA16	(1ULL &lt;&lt; (32 + 13))</div><div class='add'>+#define ATMEL_LCDC_PE_DATA17	(1ULL &lt;&lt; (32 + 14))</div><div class='add'>+#define ATMEL_LCDC_PE_DATA18	(1ULL &lt;&lt; (32 + 15))</div><div class='add'>+#define ATMEL_LCDC_PE_DATA19	(1ULL &lt;&lt; (32 + 16))</div><div class='add'>+#define ATMEL_LCDC_PE_DATA20	(1ULL &lt;&lt; (32 + 17))</div><div class='add'>+#define ATMEL_LCDC_PE_DATA21	(1ULL &lt;&lt; (32 + 18))</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define ATMEL_LCDC(PORT, PIN)	(ATMEL_LCDC_##PORT##_##PIN)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define ATMEL_LCDC_PRI_24B_DATA	(					\</div><div class='add'>+		ATMEL_LCDC(PC, DATA0)  | ATMEL_LCDC(PC, DATA1)  |	\</div><div class='add'>+		ATMEL_LCDC(PC, DATA2)  | ATMEL_LCDC(PC, DATA3)  |	\</div><div class='add'>+		ATMEL_LCDC(PC, DATA4)  | ATMEL_LCDC(PC, DATA5)  |	\</div><div class='add'>+		ATMEL_LCDC(PD, DATA6)  | ATMEL_LCDC(PD, DATA7)  |	\</div><div class='add'>+		ATMEL_LCDC(PD, DATA8)  | ATMEL_LCDC(PD, DATA9)  |	\</div><div class='add'>+		ATMEL_LCDC(PD, DATA10) | ATMEL_LCDC(PD, DATA11) |	\</div><div class='add'>+		ATMEL_LCDC(PD, DATA12) | ATMEL_LCDC(PD, DATA13) |	\</div><div class='add'>+		ATMEL_LCDC(PD, DATA14) | ATMEL_LCDC(PD, DATA15) |	\</div><div class='add'>+		ATMEL_LCDC(PD, DATA16) | ATMEL_LCDC(PD, DATA17) |	\</div><div class='add'>+		ATMEL_LCDC(PD, DATA18) | ATMEL_LCDC(PD, DATA19) |	\</div><div class='add'>+		ATMEL_LCDC(PD, DATA20) | ATMEL_LCDC(PD, DATA21) |	\</div><div class='add'>+		ATMEL_LCDC(PD, DATA22) | ATMEL_LCDC(PD, DATA23))</div><div class='add'>+</div><div class='add'>+#define ATMEL_LCDC_ALT_24B_DATA (					\</div><div class='add'>+		ATMEL_LCDC(PE, DATA0)  | ATMEL_LCDC(PE, DATA1)  |	\</div><div class='add'>+		ATMEL_LCDC(PE, DATA2)  | ATMEL_LCDC(PE, DATA3)  |	\</div><div class='add'>+		ATMEL_LCDC(PE, DATA4)  | ATMEL_LCDC(PC, DATA5)  |	\</div><div class='add'>+		ATMEL_LCDC(PD, DATA6)  | ATMEL_LCDC(PD, DATA7)  |	\</div><div class='add'>+		ATMEL_LCDC(PE, DATA8)  | ATMEL_LCDC(PE, DATA9)  |	\</div><div class='add'>+		ATMEL_LCDC(PE, DATA10) | ATMEL_LCDC(PE, DATA11) |	\</div><div class='add'>+		ATMEL_LCDC(PE, DATA12) | ATMEL_LCDC(PD, DATA13) |	\</div><div class='add'>+		ATMEL_LCDC(PD, DATA14) | ATMEL_LCDC(PD, DATA15) |	\</div><div class='add'>+		ATMEL_LCDC(PE, DATA16) | ATMEL_LCDC(PE, DATA17) |	\</div><div class='add'>+		ATMEL_LCDC(PE, DATA18) | ATMEL_LCDC(PE, DATA19) |	\</div><div class='add'>+		ATMEL_LCDC(PE, DATA20) | ATMEL_LCDC(PE, DATA21) |	\</div><div class='add'>+		ATMEL_LCDC(PD, DATA22) | ATMEL_LCDC(PD, DATA23))</div><div class='add'>+</div><div class='add'>+#define ATMEL_LCDC_PRI_15B_DATA (					\</div><div class='add'>+		ATMEL_LCDC(PC, DATA0)  | ATMEL_LCDC(PC, DATA1)  |	\</div><div class='add'>+		ATMEL_LCDC(PC, DATA2)  | ATMEL_LCDC(PC, DATA3)  |	\</div><div class='add'>+		ATMEL_LCDC(PC, DATA4)  | ATMEL_LCDC(PC, DATA5)  |	\</div><div class='add'>+		ATMEL_LCDC(PD, DATA8)  | ATMEL_LCDC(PD, DATA9)  |	\</div><div class='add'>+		ATMEL_LCDC(PD, DATA10) | ATMEL_LCDC(PD, DATA11) |	\</div><div class='add'>+		ATMEL_LCDC(PD, DATA12) | ATMEL_LCDC(PD, DATA16) |	\</div><div class='add'>+		ATMEL_LCDC(PD, DATA17) | ATMEL_LCDC(PD, DATA18) |	\</div><div class='add'>+		ATMEL_LCDC(PD, DATA19) | ATMEL_LCDC(PD, DATA20))</div><div class='add'>+</div><div class='add'>+#define ATMEL_LCDC_ALT_15B_DATA	(					\</div><div class='add'>+		ATMEL_LCDC(PE, DATA0)  | ATMEL_LCDC(PE, DATA1)  |	\</div><div class='add'>+		ATMEL_LCDC(PE, DATA2)  | ATMEL_LCDC(PE, DATA3)  |	\</div><div class='add'>+		ATMEL_LCDC(PE, DATA4)  | ATMEL_LCDC(PC, DATA5)  |	\</div><div class='add'>+		ATMEL_LCDC(PE, DATA8)  | ATMEL_LCDC(PE, DATA9)  |	\</div><div class='add'>+		ATMEL_LCDC(PE, DATA10) | ATMEL_LCDC(PE, DATA11) |	\</div><div class='add'>+		ATMEL_LCDC(PE, DATA12) | ATMEL_LCDC(PE, DATA16) |	\</div><div class='add'>+		ATMEL_LCDC(PE, DATA17) | ATMEL_LCDC(PE, DATA18) |	\</div><div class='add'>+		ATMEL_LCDC(PE, DATA19) | ATMEL_LCDC(PE, DATA20))</div><div class='add'>+</div><div class='add'>+#define ATMEL_LCDC_PRI_CONTROL (					\</div><div class='add'>+		ATMEL_LCDC(PC, CC)   | ATMEL_LCDC(PC, DVAL) |		\</div><div class='add'>+		ATMEL_LCDC(PC, MODE) | ATMEL_LCDC(PC, PWR))</div><div class='add'>+</div><div class='add'>+#define ATMEL_LCDC_ALT_CONTROL (					\</div><div class='add'>+		ATMEL_LCDC(PE, CC)   | ATMEL_LCDC(PE, DVAL) |		\</div><div class='add'>+		ATMEL_LCDC(PE, MODE) | ATMEL_LCDC(PC, PWR))</div><div class='add'>+</div><div class='add'>+#define ATMEL_LCDC_CONTROL (						\</div><div class='add'>+		ATMEL_LCDC(PC, HSYNC) | ATMEL_LCDC(PC, VSYNC) |		\</div><div class='add'>+		ATMEL_LCDC(PC, PCLK))</div><div class='add'>+</div><div class='add'>+#define ATMEL_LCDC_PRI_24BIT	(ATMEL_LCDC_CONTROL | ATMEL_LCDC_PRI_24B_DATA)</div><div class='add'>+</div><div class='add'>+#define ATMEL_LCDC_ALT_24BIT	(ATMEL_LCDC_CONTROL | ATMEL_LCDC_ALT_24B_DATA)</div><div class='add'>+</div><div class='add'>+#define ATMEL_LCDC_PRI_15BIT	(ATMEL_LCDC_CONTROL | ATMEL_LCDC_PRI_15B_DATA)</div><div class='add'>+</div><div class='add'>+#define ATMEL_LCDC_ALT_15BIT	(ATMEL_LCDC_CONTROL | ATMEL_LCDC_ALT_15B_DATA)</div><div class='add'>+</div><div class='ctx'> #endif /* __ASM_ARCH_AT32AP700X_H__ */</div><div class='head'>diff --git a/arch/avr32/mach-at32ap/include/mach/board.h b/arch/avr32/mach-at32ap/include/mach/board.h<br/>index e60e9076544d..c48386d66bc3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/avr32/mach-at32ap/include/mach/board.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/avr32/mach-at32ap/include/mach/board.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/avr32/mach-at32ap/include/mach/board.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/avr32/mach-at32ap/include/mach/board.h</a></div><div class='hunk'>@@ -43,7 +43,7 @@ struct atmel_lcdfb_info;</div><div class='ctx'> struct platform_device *</div><div class='ctx'> at32_add_device_lcdc(unsigned int id, struct atmel_lcdfb_info *data,</div><div class='ctx'> 		     unsigned long fbmem_start, unsigned long fbmem_len,</div><div class='del'>-		     unsigned int pin_config);</div><div class='add'>+		     u64 pin_mask);</div><div class='ctx'> </div><div class='ctx'> struct usba_platform_data;</div><div class='ctx'> struct platform_device *</div><div class='head'>diff --git a/arch/avr32/mach-at32ap/include/mach/io.h b/arch/avr32/mach-at32ap/include/mach/io.h<br/>index 4ec6abc68ea3..22ea79b74052 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/avr32/mach-at32ap/include/mach/io.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/avr32/mach-at32ap/include/mach/io.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/avr32/mach-at32ap/include/mach/io.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/avr32/mach-at32ap/include/mach/io.h</a></div><div class='hunk'>@@ -1,8 +1,7 @@</div><div class='ctx'> #ifndef __ASM_AVR32_ARCH_AT32AP_IO_H</div><div class='ctx'> #define __ASM_AVR32_ARCH_AT32AP_IO_H</div><div class='ctx'> </div><div class='del'>-/* For "bizarre" halfword swapping */</div><div class='del'>-#include &lt;linux/byteorder/swabb.h&gt;</div><div class='add'>+#include &lt;linux/swab.h&gt;</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_AP700X_32_BIT_SMC)</div><div class='ctx'> # define __swizzle_addr_b(addr)	(addr ^ 3UL)</div><div class='head'>diff --git a/arch/avr32/mach-at32ap/include/mach/portmux.h b/arch/avr32/mach-at32ap/include/mach/portmux.h<br/>index b1abe6b4e4ef..21c79373b53f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/avr32/mach-at32ap/include/mach/portmux.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/avr32/mach-at32ap/include/mach/portmux.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/avr32/mach-at32ap/include/mach/portmux.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/avr32/mach-at32ap/include/mach/portmux.h</a></div><div class='hunk'>@@ -21,9 +21,10 @@</div><div class='ctx'> #define AT32_GPIOF_DEGLITCH	0x00000008	/* (IN) Filter glitches */</div><div class='ctx'> #define AT32_GPIOF_MULTIDRV	0x00000010	/* Enable multidriver option */</div><div class='ctx'> </div><div class='del'>-void at32_select_periph(unsigned int pin, unsigned int periph,</div><div class='del'>-			unsigned long flags);</div><div class='add'>+void at32_select_periph(unsigned int port, unsigned int pin,</div><div class='add'>+			unsigned int periph, unsigned long flags);</div><div class='ctx'> void at32_select_gpio(unsigned int pin, unsigned long flags);</div><div class='add'>+void at32_deselect_pin(unsigned int pin);</div><div class='ctx'> void at32_reserve_pin(unsigned int pin);</div><div class='ctx'> </div><div class='ctx'> #endif /* __ASM_ARCH_PORTMUX_H__ */</div><div class='head'>diff --git a/arch/avr32/mach-at32ap/pdc.c b/arch/avr32/mach-at32ap/pdc.c<br/>index 1040bda4fda7..61ab15aae970 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/avr32/mach-at32ap/pdc.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/avr32/mach-at32ap/pdc.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/avr32/mach-at32ap/pdc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/avr32/mach-at32ap/pdc.c</a></div><div class='hunk'>@@ -35,7 +35,6 @@ static int __init pdc_probe(struct platform_device *pdev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct platform_driver pdc_driver = {</div><div class='del'>-	.probe		= pdc_probe,</div><div class='ctx'> 	.driver		= {</div><div class='ctx'> 		.name	= "pdc",</div><div class='ctx'> 	},</div><div class='hunk'>@@ -43,6 +42,6 @@ static struct platform_driver pdc_driver = {</div><div class='ctx'> </div><div class='ctx'> static int __init pdc_init(void)</div><div class='ctx'> {</div><div class='del'>-	return platform_driver_register(&amp;pdc_driver);</div><div class='add'>+	return platform_driver_probe(&amp;pdc_driver, pdc_probe);</div><div class='ctx'> }</div><div class='ctx'> arch_initcall(pdc_init);</div><div class='head'>diff --git a/arch/avr32/mach-at32ap/pio.c b/arch/avr32/mach-at32ap/pio.c<br/>index 405ee6bad4ce..ed81a8bcb22d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/avr32/mach-at32ap/pio.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/avr32/mach-at32ap/pio.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/avr32/mach-at32ap/pio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/avr32/mach-at32ap/pio.c</a></div><div class='hunk'>@@ -50,35 +50,48 @@ static struct pio_device *gpio_to_pio(unsigned int gpio)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Pin multiplexing API */</div><div class='add'>+static DEFINE_SPINLOCK(pio_lock);</div><div class='ctx'> </div><div class='del'>-void __init at32_select_periph(unsigned int pin, unsigned int periph,</div><div class='del'>-			       unsigned long flags)</div><div class='add'>+void __init at32_select_periph(unsigned int port, u32 pin_mask,</div><div class='add'>+			       unsigned int periph, unsigned long flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct pio_device *pio;</div><div class='del'>-	unsigned int pin_index = pin &amp; 0x1f;</div><div class='del'>-	u32 mask = 1 &lt;&lt; pin_index;</div><div class='ctx'> </div><div class='del'>-	pio = gpio_to_pio(pin);</div><div class='add'>+	/* assign and verify pio */</div><div class='add'>+	pio = gpio_to_pio(port);</div><div class='ctx'> 	if (unlikely(!pio)) {</div><div class='del'>-		printk("pio: invalid pin %u\n", pin);</div><div class='add'>+		printk(KERN_WARNING "pio: invalid port %u\n", port);</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (unlikely(test_and_set_bit(pin_index, &amp;pio-&gt;pinmux_mask)</div><div class='del'>-			 || gpiochip_is_requested(&amp;pio-&gt;chip, pin_index))) {</div><div class='del'>-		printk("%s: pin %u is busy\n", pio-&gt;name, pin_index);</div><div class='add'>+	/* Test if any of the requested pins is already muxed */</div><div class='add'>+	spin_lock(&amp;pio_lock);</div><div class='add'>+	if (unlikely(pio-&gt;pinmux_mask &amp; pin_mask)) {</div><div class='add'>+		printk(KERN_WARNING "%s: pin(s) busy (requested 0x%x, busy 0x%x)\n",</div><div class='add'>+		       pio-&gt;name, pin_mask, pio-&gt;pinmux_mask &amp; pin_mask);</div><div class='add'>+		spin_unlock(&amp;pio_lock);</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pio_writel(pio, PUER, mask);</div><div class='add'>+	pio-&gt;pinmux_mask |= pin_mask;</div><div class='add'>+</div><div class='add'>+	/* enable pull ups */</div><div class='add'>+	pio_writel(pio, PUER, pin_mask);</div><div class='add'>+</div><div class='add'>+	/* select either peripheral A or B */</div><div class='ctx'> 	if (periph)</div><div class='del'>-		pio_writel(pio, BSR, mask);</div><div class='add'>+		pio_writel(pio, BSR, pin_mask);</div><div class='ctx'> 	else</div><div class='del'>-		pio_writel(pio, ASR, mask);</div><div class='add'>+		pio_writel(pio, ASR, pin_mask);</div><div class='add'>+</div><div class='add'>+	/* enable peripheral control */</div><div class='add'>+	pio_writel(pio, PDR, pin_mask);</div><div class='ctx'> </div><div class='del'>-	pio_writel(pio, PDR, mask);</div><div class='add'>+	/* Disable pull ups if not requested. */</div><div class='ctx'> 	if (!(flags &amp; AT32_GPIOF_PULLUP))</div><div class='del'>-		pio_writel(pio, PUDR, mask);</div><div class='add'>+		pio_writel(pio, PUDR, pin_mask);</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;pio_lock);</div><div class='ctx'> </div><div class='ctx'> 	return;</div><div class='ctx'> </div><div class='hunk'>@@ -134,6 +147,25 @@ fail:</div><div class='ctx'> 	dump_stack();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Undo a previous pin reservation. Will not affect the hardware</div><div class='add'>+ * configuration.</div><div class='add'>+ */</div><div class='add'>+void at32_deselect_pin(unsigned int pin)</div><div class='add'>+{</div><div class='add'>+	struct pio_device *pio;</div><div class='add'>+	unsigned int pin_index = pin &amp; 0x1f;</div><div class='add'>+</div><div class='add'>+	pio = gpio_to_pio(pin);</div><div class='add'>+	if (unlikely(!pio)) {</div><div class='add'>+		printk("pio: invalid pin %u\n", pin);</div><div class='add'>+		dump_stack();</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	clear_bit(pin_index, &amp;pio-&gt;pinmux_mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Reserve a pin, preventing anyone else from changing its configuration. */</div><div class='ctx'> void __init at32_reserve_pin(unsigned int pin)</div><div class='ctx'> {</div><div class='hunk'>@@ -382,7 +414,6 @@ static int __init pio_probe(struct platform_device *pdev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct platform_driver pio_driver = {</div><div class='del'>-	.probe		= pio_probe,</div><div class='ctx'> 	.driver		= {</div><div class='ctx'> 		.name		= "pio",</div><div class='ctx'> 	},</div><div class='hunk'>@@ -390,7 +421,7 @@ static struct platform_driver pio_driver = {</div><div class='ctx'> </div><div class='ctx'> static int __init pio_init(void)</div><div class='ctx'> {</div><div class='del'>-	return platform_driver_register(&amp;pio_driver);</div><div class='add'>+	return platform_driver_probe(&amp;pio_driver, pio_probe);</div><div class='ctx'> }</div><div class='ctx'> postcore_initcall(pio_init);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/avr32/oprofile/Makefile b/arch/avr32/oprofile/Makefile<br/>index 1fe81c3c1e86..e0eb520e0287 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/avr32/oprofile/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>arch/avr32/oprofile/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/avr32/oprofile/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/avr32/oprofile/Makefile</a></div><div class='hunk'>@@ -5,4 +5,4 @@ oprofile-y		:= $(addprefix ../../../drivers/oprofile/,	\</div><div class='ctx'> 				event_buffer.o oprofile_files.o		\</div><div class='ctx'> 				oprofilefs.o oprofile_stats.o		\</div><div class='ctx'> 				timer_int.o)</div><div class='del'>-oprofile-y		+= op_model_avr32.o</div><div class='add'>+oprofile-y		+= op_model_avr32.o backtrace.o</div><div class='head'>diff --git a/arch/avr32/oprofile/backtrace.c b/arch/avr32/oprofile/backtrace.c<br/>new file mode 100644<br/>index 000000000000..75d9ad6f99cf<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/avr32/oprofile/backtrace.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/avr32/oprofile/backtrace.c</a></div><div class='hunk'>@@ -0,0 +1,81 @@</div><div class='add'>+/*</div><div class='add'>+ * AVR32 specific backtracing code for oprofile</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2008 Weinmann GmbH</div><div class='add'>+ *</div><div class='add'>+ * Author: Nikolaus Voss &lt;n.voss@weinmann.de&gt;</div><div class='add'>+ *</div><div class='add'>+ * Based on i386 oprofile backtrace code by John Levon and David Smith</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/oprofile.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='add'>+</div><div class='add'>+/* The first two words of each frame on the stack look like this if we have</div><div class='add'>+ * frame pointers */</div><div class='add'>+struct frame_head {</div><div class='add'>+	unsigned long lr;</div><div class='add'>+	struct frame_head *fp;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* copied from arch/avr32/kernel/process.c */</div><div class='add'>+static inline int valid_stack_ptr(struct thread_info *tinfo, unsigned long p)</div><div class='add'>+{</div><div class='add'>+	return (p &gt; (unsigned long)tinfo)</div><div class='add'>+		&amp;&amp; (p &lt; (unsigned long)tinfo + THREAD_SIZE - 3);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* copied from arch/x86/oprofile/backtrace.c */</div><div class='add'>+static struct frame_head *dump_user_backtrace(struct frame_head *head)</div><div class='add'>+{</div><div class='add'>+	struct frame_head bufhead[2];</div><div class='add'>+</div><div class='add'>+	/* Also check accessibility of one struct frame_head beyond */</div><div class='add'>+	if (!access_ok(VERIFY_READ, head, sizeof(bufhead)))</div><div class='add'>+		return NULL;</div><div class='add'>+	if (__copy_from_user_inatomic(bufhead, head, sizeof(bufhead)))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	oprofile_add_trace(bufhead[0].lr);</div><div class='add'>+</div><div class='add'>+	/* frame pointers should strictly progress back up the stack</div><div class='add'>+	 * (towards higher addresses) */</div><div class='add'>+	if (bufhead[0].fp &lt;= head)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	return bufhead[0].fp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void avr32_backtrace(struct pt_regs * const regs, unsigned int depth)</div><div class='add'>+{</div><div class='add'>+	/* Get first frame pointer */</div><div class='add'>+	struct frame_head *head = (struct frame_head *)(regs-&gt;r7);</div><div class='add'>+</div><div class='add'>+	if (!user_mode(regs)) {</div><div class='add'>+#ifdef CONFIG_FRAME_POINTER</div><div class='add'>+		/*</div><div class='add'>+		 * Traverse the kernel stack from frame to frame up to</div><div class='add'>+		 * "depth" steps.</div><div class='add'>+		 */</div><div class='add'>+		while (depth-- &amp;&amp; valid_stack_ptr(task_thread_info(current),</div><div class='add'>+						  (unsigned long)head)) {</div><div class='add'>+			oprofile_add_trace(head-&gt;lr);</div><div class='add'>+			if (head-&gt;fp &lt;= head)</div><div class='add'>+				break;</div><div class='add'>+			head = head-&gt;fp;</div><div class='add'>+		}</div><div class='add'>+#endif</div><div class='add'>+	} else {</div><div class='add'>+		/* Assume we have frame pointers in user mode process */</div><div class='add'>+		while (depth-- &amp;&amp; head)</div><div class='add'>+			head = dump_user_backtrace(head);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='head'>diff --git a/arch/avr32/oprofile/op_model_avr32.c b/arch/avr32/oprofile/op_model_avr32.c<br/>index df42325c7f81..a3e9b3c4845a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/avr32/oprofile/op_model_avr32.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/avr32/oprofile/op_model_avr32.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/avr32/oprofile/op_model_avr32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/avr32/oprofile/op_model_avr32.c</a></div><div class='hunk'>@@ -22,6 +22,8 @@</div><div class='ctx'> #define AVR32_PERFCTR_IRQ_GROUP	0</div><div class='ctx'> #define AVR32_PERFCTR_IRQ_LINE	1</div><div class='ctx'> </div><div class='add'>+void avr32_backtrace(struct pt_regs * const regs, unsigned int depth);</div><div class='add'>+</div><div class='ctx'> enum { PCCNT, PCNT0, PCNT1, NR_counter };</div><div class='ctx'> </div><div class='ctx'> struct avr32_perf_counter {</div><div class='hunk'>@@ -223,6 +225,8 @@ int __init oprofile_arch_init(struct oprofile_operations *ops)</div><div class='ctx'> 	memcpy(ops, &amp;avr32_perf_counter_ops,</div><div class='ctx'> 			sizeof(struct oprofile_operations));</div><div class='ctx'> </div><div class='add'>+	ops-&gt;backtrace = avr32_backtrace;</div><div class='add'>+</div><div class='ctx'> 	printk(KERN_INFO "oprofile: using AVR32 performance monitoring.\n");</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig<br/>index 4154ff1101fa..8102c79aaa94 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/Kconfig</a></div><div class='hunk'>@@ -162,16 +162,28 @@ config BF549</div><div class='ctx'> config BF561</div><div class='ctx'> 	bool "BF561"</div><div class='ctx'> 	help</div><div class='del'>-	  Not Supported Yet - Work in progress - BF561 Processor Support.</div><div class='add'>+	  BF561 Processor Support.</div><div class='ctx'> </div><div class='ctx'> endchoice</div><div class='ctx'> </div><div class='add'>+config BF_REV_MIN</div><div class='add'>+	int</div><div class='add'>+	default 0 if (BF52x || BF54x)</div><div class='add'>+	default 2 if (BF537 || BF536 || BF534)</div><div class='add'>+	default 3 if (BF561 ||BF533 || BF532 || BF531)</div><div class='add'>+</div><div class='add'>+config BF_REV_MAX</div><div class='add'>+	int</div><div class='add'>+	default 2 if (BF52x || BF54x)</div><div class='add'>+	default 3 if (BF537 || BF536 || BF534)</div><div class='add'>+	default 5 if (BF561)</div><div class='add'>+	default 6 if (BF533 || BF532 || BF531)</div><div class='add'>+</div><div class='ctx'> choice</div><div class='ctx'> 	prompt "Silicon Rev"</div><div class='del'>-	default BF_REV_0_1 if BF527</div><div class='del'>-	default BF_REV_0_2 if BF537</div><div class='del'>-	default BF_REV_0_3 if BF533</div><div class='del'>-	default BF_REV_0_0 if BF549</div><div class='add'>+	default BF_REV_0_1 if (BF52x || BF54x)</div><div class='add'>+	default BF_REV_0_2 if (BF534 || BF536 || BF537)</div><div class='add'>+	default BF_REV_0_3 if (BF531 || BF532 || BF533 || BF561)</div><div class='ctx'> </div><div class='ctx'> config BF_REV_0_0</div><div class='ctx'> 	bool "0.0"</div><div class='hunk'>@@ -183,7 +195,7 @@ config BF_REV_0_1</div><div class='ctx'> </div><div class='ctx'> config BF_REV_0_2</div><div class='ctx'> 	bool "0.2"</div><div class='del'>-	depends on (BF537 || BF536 || BF534)</div><div class='add'>+	depends on (BF52x || BF537 || BF536 || BF534 || BF54x)</div><div class='ctx'> </div><div class='ctx'> config BF_REV_0_3</div><div class='ctx'> 	bool "0.3"</div><div class='hunk'>@@ -197,6 +209,10 @@ config BF_REV_0_5</div><div class='ctx'> 	bool "0.5"</div><div class='ctx'> 	depends on (BF561 || BF533 || BF532 || BF531)</div><div class='ctx'> </div><div class='add'>+config BF_REV_0_6</div><div class='add'>+	bool "0.6"</div><div class='add'>+	depends on (BF533 || BF532 || BF531)</div><div class='add'>+</div><div class='ctx'> config BF_REV_ANY</div><div class='ctx'> 	bool "any"</div><div class='ctx'> </div><div class='hunk'>@@ -249,7 +265,7 @@ config MEM_MT48LC8M32B2B5_7</div><div class='ctx'> </div><div class='ctx'> config MEM_MT48LC32M16A2TG_75</div><div class='ctx'> 	bool</div><div class='del'>-	depends on (BFIN527_EZKIT || BFIN532_IP0X || BLACKSTAMP)</div><div class='add'>+	depends on (BFIN527_EZKIT || BFIN532_IP0X || BLACKSTAMP || BFIN526_EZBRD)</div><div class='ctx'> 	default y</div><div class='ctx'> </div><div class='ctx'> source "arch/blackfin/mach-bf527/Kconfig"</div><div class='hunk'>@@ -286,13 +302,20 @@ config BOOT_LOAD</div><div class='ctx'> 	  memory region is used to capture NULL pointer references as well</div><div class='ctx'> 	  as some core kernel functions.</div><div class='ctx'> </div><div class='add'>+config ROM_BASE</div><div class='add'>+	hex "Kernel ROM Base"</div><div class='add'>+	default "0x20040000"</div><div class='add'>+	range 0x20000000 0x20400000 if !(BF54x || BF561)</div><div class='add'>+	range 0x20000000 0x30000000 if (BF54x || BF561)</div><div class='add'>+	help</div><div class='add'>+</div><div class='ctx'> comment "Clock/PLL Setup"</div><div class='ctx'> </div><div class='ctx'> config CLKIN_HZ</div><div class='ctx'> 	int "Frequency of the crystal on the board in Hz"</div><div class='ctx'> 	default "11059200" if BFIN533_STAMP</div><div class='ctx'> 	default "27000000" if BFIN533_EZKIT</div><div class='del'>-	default "25000000" if (BFIN537_STAMP || BFIN527_EZKIT || H8606_HVSISTEMAS || BLACKSTAMP)</div><div class='add'>+	default "25000000" if (BFIN537_STAMP || BFIN527_EZKIT || H8606_HVSISTEMAS || BLACKSTAMP || BFIN526_EZBRD)</div><div class='ctx'> 	default "30000000" if BFIN561_EZKIT</div><div class='ctx'> 	default "24576000" if PNAV10</div><div class='ctx'> 	default "10000000" if BFIN532_IP0X</div><div class='hunk'>@@ -332,7 +355,7 @@ config VCO_MULT</div><div class='ctx'> 	default "22" if BFIN533_BLUETECHNIX_CM</div><div class='ctx'> 	default "20" if (BFIN537_BLUETECHNIX_CM || BFIN527_BLUETECHNIX_CM || BFIN561_BLUETECHNIX_CM)</div><div class='ctx'> 	default "20" if BFIN561_EZKIT</div><div class='del'>-	default "16" if (H8606_HVSISTEMAS || BLACKSTAMP)</div><div class='add'>+	default "16" if (H8606_HVSISTEMAS || BLACKSTAMP || BFIN526_EZBRD)</div><div class='ctx'> 	help</div><div class='ctx'> 	  This controls the frequency of the on-chip PLL. This can be between 1 and 64.</div><div class='ctx'> 	  PLL Frequency = (Crystal Frequency) * (this setting)</div><div class='hunk'>@@ -368,14 +391,6 @@ config SCLK_DIV</div><div class='ctx'> 	  This can be between 1 and 15</div><div class='ctx'> 	  System Clock = (PLL frequency) / (this setting)</div><div class='ctx'> </div><div class='del'>-config MAX_MEM_SIZE</div><div class='del'>-	int "Max SDRAM Memory Size in MBytes"</div><div class='del'>-	depends on !MPU</div><div class='del'>-	default 512</div><div class='del'>-	help</div><div class='del'>-	  This is the max memory size that the kernel will create CPLB</div><div class='del'>-	  tables for.  Your system will not be able to handle any more.</div><div class='del'>-</div><div class='ctx'> choice</div><div class='ctx'> 	prompt "DDR SDRAM Chip Type"</div><div class='ctx'> 	depends on BFIN_KERNEL_CLOCK</div><div class='hunk'>@@ -389,6 +404,14 @@ config MEM_MT46V32M16_5B</div><div class='ctx'> 	bool "MT46V32M16_5B"</div><div class='ctx'> endchoice</div><div class='ctx'> </div><div class='add'>+config MAX_MEM_SIZE</div><div class='add'>+	int "Max SDRAM Memory Size in MBytes"</div><div class='add'>+	depends on !MPU</div><div class='add'>+	default 512</div><div class='add'>+	help</div><div class='add'>+	  This is the max memory size that the kernel will create CPLB</div><div class='add'>+	  tables for.  Your system will not be able to handle any more.</div><div class='add'>+</div><div class='ctx'> #</div><div class='ctx'> # Max &amp; Min Speeds for various Chips</div><div class='ctx'> #</div><div class='hunk'>@@ -455,8 +478,6 @@ config CYCLES_CLOCKSOURCE</div><div class='ctx'> </div><div class='ctx'> source kernel/time/Kconfig</div><div class='ctx'> </div><div class='del'>-comment "Memory Setup"</div><div class='del'>-</div><div class='ctx'> comment "Misc"</div><div class='ctx'> </div><div class='ctx'> choice</div><div class='hunk'>@@ -622,6 +643,15 @@ config CPLB_SWITCH_TAB_L1</div><div class='ctx'> 	  If enabled, the CPLB Switch Tables are linked</div><div class='ctx'> 	  into L1 data memory. (less latency)</div><div class='ctx'> </div><div class='add'>+config APP_STACK_L1</div><div class='add'>+	bool "Support locating application stack in L1 Scratch Memory"</div><div class='add'>+	default y</div><div class='add'>+	help</div><div class='add'>+	  If enabled the application stack can be located in L1</div><div class='add'>+	  scratch memory (less latency).</div><div class='add'>+</div><div class='add'>+	  Currently only works with FLAT binaries.</div><div class='add'>+</div><div class='ctx'> comment "Speed Optimizations"</div><div class='ctx'> config BFIN_INS_LOWOVERHEAD</div><div class='ctx'> 	bool "ins[bwl] low overhead, higher interrupt latency"</div><div class='hunk'>@@ -755,6 +785,13 @@ config BFIN_WT</div><div class='ctx'> </div><div class='ctx'> endchoice</div><div class='ctx'> </div><div class='add'>+config BFIN_L2_CACHEABLE</div><div class='add'>+	bool "Cache L2 SRAM"</div><div class='add'>+	depends on (BFIN_DCACHE || BFIN_ICACHE) &amp;&amp; (BF54x || BF561)</div><div class='add'>+	default n</div><div class='add'>+	help</div><div class='add'>+	  Select to make L2 SRAM cacheable in L1 data and instruction cache.</div><div class='add'>+</div><div class='ctx'> config MPU</div><div class='ctx'> 	bool "Enable the memory protection unit (EXPERIMENTAL)"</div><div class='ctx'> 	default n</div><div class='head'>diff --git a/arch/blackfin/Kconfig.debug b/arch/blackfin/Kconfig.debug<br/>index c468624d55f0..3ad25983ec97 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/Kconfig.debug?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/Kconfig.debug</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/Kconfig.debug?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/Kconfig.debug</a></div><div class='hunk'>@@ -2,6 +2,22 @@ menu "Kernel hacking"</div><div class='ctx'> </div><div class='ctx'> source "lib/Kconfig.debug"</div><div class='ctx'> </div><div class='add'>+config HAVE_ARCH_KGDB</div><div class='add'>+       def_bool y</div><div class='add'>+</div><div class='add'>+config DEBUG_VERBOSE</div><div class='add'>+	bool "Verbose fault messages"</div><div class='add'>+	default y</div><div class='add'>+	select PRINTK</div><div class='add'>+	help</div><div class='add'>+	  When a program crashes due to an exception, or the kernel detects</div><div class='add'>+	  an internal error, the kernel can print a not so brief message</div><div class='add'>+	  explaining what the problem was. This debugging information is</div><div class='add'>+	  useful to developers and kernel hackers when tracking down problems,</div><div class='add'>+	  but mostly meaningless to other people. This is always helpful for</div><div class='add'>+	  debugging but serves no purpose on a production system.</div><div class='add'>+	  Most people should say N here.</div><div class='add'>+</div><div class='ctx'> config DEBUG_MMRS</div><div class='ctx'> 	bool "Generate Blackfin MMR tree"</div><div class='ctx'> 	select DEBUG_FS</div><div class='hunk'>@@ -22,6 +38,44 @@ config DEBUG_HWERR</div><div class='ctx'> 	  hardware error interrupts and need to know where they are coming</div><div class='ctx'> 	  from.</div><div class='ctx'> </div><div class='add'>+config DEBUG_DOUBLEFAULT</div><div class='add'>+	bool "Debug Double Faults"</div><div class='add'>+	default n</div><div class='add'>+	help</div><div class='add'>+	  If an exception is caused while executing code within the exception</div><div class='add'>+	  handler, the NMI handler, the reset vector, or in emulator mode,</div><div class='add'>+	  a double fault occurs. On the Blackfin, this is a unrecoverable</div><div class='add'>+	  event. You have two options:</div><div class='add'>+	  - RESET exactly when double fault occurs. The excepting</div><div class='add'>+	    instruction address is stored in RETX, where the next kernel</div><div class='add'>+	    boot will print it out.</div><div class='add'>+	  - Print debug message. This is much more error prone, although</div><div class='add'>+	    easier to handle. It is error prone since:</div><div class='add'>+	    - The excepting instruction is not committed.</div><div class='add'>+	    - All writebacks from the instruction are prevented.</div><div class='add'>+	    - The generated exception is not taken.</div><div class='add'>+	    - The EXCAUSE field is updated with an unrecoverable event</div><div class='add'>+	    The only way to check this is to see if EXCAUSE contains the</div><div class='add'>+	    unrecoverable event value at every exception return. By selecting</div><div class='add'>+	    this option, you are skipping over the faulting instruction, and </div><div class='add'>+	    hoping things stay together enough to print out a debug message.</div><div class='add'>+</div><div class='add'>+	  This does add a little kernel code, but is the only method to debug</div><div class='add'>+	  double faults - if unsure say "Y"</div><div class='add'>+</div><div class='add'>+choice</div><div class='add'>+	prompt "Double Fault Failure Method"</div><div class='add'>+	default DEBUG_DOUBLEFAULT_PRINT</div><div class='add'>+	depends on DEBUG_DOUBLEFAULT</div><div class='add'>+</div><div class='add'>+config DEBUG_DOUBLEFAULT_PRINT</div><div class='add'>+	bool "Print"</div><div class='add'>+</div><div class='add'>+config DEBUG_DOUBLEFAULT_RESET</div><div class='add'>+	bool "Reset"</div><div class='add'>+</div><div class='add'>+endchoice</div><div class='add'>+</div><div class='ctx'> config DEBUG_ICACHE_CHECK</div><div class='ctx'> 	bool "Check Instruction cache coherency"</div><div class='ctx'> 	depends on DEBUG_KERNEL</div><div class='hunk'>@@ -143,6 +197,7 @@ config DEBUG_BFIN_NO_KERN_HWTRACE</div><div class='ctx'> config EARLY_PRINTK</div><div class='ctx'> 	bool "Early printk" </div><div class='ctx'> 	default n</div><div class='add'>+	select SERIAL_CORE_CONSOLE</div><div class='ctx'> 	help</div><div class='ctx'> 	  This option enables special console drivers which allow the kernel</div><div class='ctx'> 	  to print messages very early in the bootup process.</div><div class='head'>diff --git a/arch/blackfin/Makefile b/arch/blackfin/Makefile<br/>index eac0533d6e4f..6bf50977850c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/Makefile</a></div><div class='hunk'>@@ -67,6 +67,7 @@ rev-$(CONFIG_BF_REV_0_2)  := 0.2</div><div class='ctx'> rev-$(CONFIG_BF_REV_0_3)  := 0.3</div><div class='ctx'> rev-$(CONFIG_BF_REV_0_4)  := 0.4</div><div class='ctx'> rev-$(CONFIG_BF_REV_0_5)  := 0.5</div><div class='add'>+rev-$(CONFIG_BF_REV_0_6)  := 0.6</div><div class='ctx'> rev-$(CONFIG_BF_REV_NONE) := none</div><div class='ctx'> rev-$(CONFIG_BF_REV_ANY)  := any</div><div class='ctx'> </div><div class='head'>diff --git a/arch/blackfin/configs/BF526-EZBRD_defconfig b/arch/blackfin/configs/BF526-EZBRD_defconfig<br/>new file mode 100644<br/>index 000000000000..4443a47e516f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/configs/BF526-EZBRD_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/configs/BF526-EZBRD_defconfig</a></div><div class='hunk'>@@ -0,0 +1,1427 @@</div><div class='add'>+#</div><div class='add'>+# Automatically generated make config: don't edit</div><div class='add'>+# Linux kernel version: 2.6.26.3</div><div class='add'>+# Thu Aug 28 16:49:53 2008</div><div class='add'>+#</div><div class='add'>+# CONFIG_MMU is not set</div><div class='add'>+# CONFIG_FPU is not set</div><div class='add'>+CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='add'>+# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set</div><div class='add'>+CONFIG_BLACKFIN=y</div><div class='add'>+CONFIG_ZONE_DMA=y</div><div class='add'>+CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='add'>+CONFIG_GENERIC_HWEIGHT=y</div><div class='add'>+CONFIG_GENERIC_HARDIRQS=y</div><div class='add'>+CONFIG_GENERIC_IRQ_PROBE=y</div><div class='add'>+CONFIG_GENERIC_GPIO=y</div><div class='add'>+CONFIG_FORCE_MAX_ZONEORDER=14</div><div class='add'>+CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# General setup</div><div class='add'>+#</div><div class='add'>+CONFIG_EXPERIMENTAL=y</div><div class='add'>+CONFIG_BROKEN_ON_SMP=y</div><div class='add'>+CONFIG_INIT_ENV_ARG_LIMIT=32</div><div class='add'>+CONFIG_LOCALVERSION=""</div><div class='add'>+CONFIG_LOCALVERSION_AUTO=y</div><div class='add'>+CONFIG_SYSVIPC=y</div><div class='add'>+CONFIG_SYSVIPC_SYSCTL=y</div><div class='add'>+# CONFIG_POSIX_MQUEUE is not set</div><div class='add'>+# CONFIG_BSD_PROCESS_ACCT is not set</div><div class='add'>+# CONFIG_TASKSTATS is not set</div><div class='add'>+# CONFIG_AUDIT is not set</div><div class='add'>+CONFIG_IKCONFIG=y</div><div class='add'>+CONFIG_IKCONFIG_PROC=y</div><div class='add'>+CONFIG_LOG_BUF_SHIFT=14</div><div class='add'>+# CONFIG_CGROUPS is not set</div><div class='add'>+# CONFIG_GROUP_SCHED is not set</div><div class='add'>+CONFIG_SYSFS_DEPRECATED=y</div><div class='add'>+CONFIG_SYSFS_DEPRECATED_V2=y</div><div class='add'>+# CONFIG_RELAY is not set</div><div class='add'>+# CONFIG_NAMESPACES is not set</div><div class='add'>+CONFIG_BLK_DEV_INITRD=y</div><div class='add'>+CONFIG_INITRAMFS_SOURCE=""</div><div class='add'>+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set</div><div class='add'>+CONFIG_SYSCTL=y</div><div class='add'>+CONFIG_EMBEDDED=y</div><div class='add'>+CONFIG_UID16=y</div><div class='add'>+CONFIG_SYSCTL_SYSCALL=y</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='add'>+CONFIG_KALLSYMS=y</div><div class='add'>+# CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='add'>+CONFIG_HOTPLUG=y</div><div class='add'>+CONFIG_PRINTK=y</div><div class='add'>+CONFIG_BUG=y</div><div class='add'>+CONFIG_ELF_CORE=y</div><div class='add'>+CONFIG_COMPAT_BRK=y</div><div class='add'>+CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_FUTEX=y</div><div class='add'>+CONFIG_ANON_INODES=y</div><div class='add'>+CONFIG_EPOLL=y</div><div class='add'>+CONFIG_SIGNALFD=y</div><div class='add'>+CONFIG_TIMERFD=y</div><div class='add'>+CONFIG_EVENTFD=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='add'>+CONFIG_SLAB=y</div><div class='add'>+# CONFIG_SLUB is not set</div><div class='add'>+# CONFIG_SLOB is not set</div><div class='add'>+# CONFIG_PROFILING is not set</div><div class='add'>+# CONFIG_MARKERS is not set</div><div class='add'>+CONFIG_HAVE_OPROFILE=y</div><div class='add'>+# CONFIG_HAVE_KPROBES is not set</div><div class='add'>+# CONFIG_HAVE_KRETPROBES is not set</div><div class='add'>+# CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+CONFIG_SLABINFO=y</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='add'>+CONFIG_TINY_SHMEM=y</div><div class='add'>+CONFIG_BASE_SMALL=0</div><div class='add'>+CONFIG_MODULES=y</div><div class='add'>+# CONFIG_MODULE_FORCE_LOAD is not set</div><div class='add'>+CONFIG_MODULE_UNLOAD=y</div><div class='add'>+# CONFIG_MODULE_FORCE_UNLOAD is not set</div><div class='add'>+# CONFIG_MODVERSIONS is not set</div><div class='add'>+# CONFIG_MODULE_SRCVERSION_ALL is not set</div><div class='add'>+CONFIG_KMOD=y</div><div class='add'>+CONFIG_BLOCK=y</div><div class='add'>+# CONFIG_LBD is not set</div><div class='add'>+# CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='add'>+# CONFIG_LSF is not set</div><div class='add'>+# CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IO Schedulers</div><div class='add'>+#</div><div class='add'>+CONFIG_IOSCHED_NOOP=y</div><div class='add'>+# CONFIG_IOSCHED_AS is not set</div><div class='add'>+# CONFIG_IOSCHED_DEADLINE is not set</div><div class='add'>+# CONFIG_IOSCHED_CFQ is not set</div><div class='add'>+# CONFIG_DEFAULT_AS is not set</div><div class='add'>+# CONFIG_DEFAULT_DEADLINE is not set</div><div class='add'>+# CONFIG_DEFAULT_CFQ is not set</div><div class='add'>+CONFIG_DEFAULT_NOOP=y</div><div class='add'>+CONFIG_DEFAULT_IOSCHED="noop"</div><div class='add'>+CONFIG_CLASSIC_RCU=y</div><div class='add'>+# CONFIG_PREEMPT_NONE is not set</div><div class='add'>+CONFIG_PREEMPT_VOLUNTARY=y</div><div class='add'>+# CONFIG_PREEMPT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Blackfin Processor Options</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Processor and Board Settings</div><div class='add'>+#</div><div class='add'>+# CONFIG_BF522 is not set</div><div class='add'>+# CONFIG_BF523 is not set</div><div class='add'>+# CONFIG_BF524 is not set</div><div class='add'>+# CONFIG_BF525 is not set</div><div class='add'>+CONFIG_BF526=y</div><div class='add'>+# CONFIG_BF527 is not set</div><div class='add'>+# CONFIG_BF531 is not set</div><div class='add'>+# CONFIG_BF532 is not set</div><div class='add'>+# CONFIG_BF533 is not set</div><div class='add'>+# CONFIG_BF534 is not set</div><div class='add'>+# CONFIG_BF536 is not set</div><div class='add'>+# CONFIG_BF537 is not set</div><div class='add'>+# CONFIG_BF542 is not set</div><div class='add'>+# CONFIG_BF544 is not set</div><div class='add'>+# CONFIG_BF547 is not set</div><div class='add'>+# CONFIG_BF548 is not set</div><div class='add'>+# CONFIG_BF549 is not set</div><div class='add'>+# CONFIG_BF561 is not set</div><div class='add'>+CONFIG_BF_REV_0_0=y</div><div class='add'>+# CONFIG_BF_REV_0_1 is not set</div><div class='add'>+# CONFIG_BF_REV_0_2 is not set</div><div class='add'>+# CONFIG_BF_REV_0_3 is not set</div><div class='add'>+# CONFIG_BF_REV_0_4 is not set</div><div class='add'>+# CONFIG_BF_REV_0_5 is not set</div><div class='add'>+# CONFIG_BF_REV_ANY is not set</div><div class='add'>+# CONFIG_BF_REV_NONE is not set</div><div class='add'>+CONFIG_BF52x=y</div><div class='add'>+CONFIG_MEM_MT48LC32M16A2TG_75=y</div><div class='add'>+# CONFIG_BFIN527_EZKIT is not set</div><div class='add'>+# CONFIG_BFIN527_BLUETECHNIX_CM is not set</div><div class='add'>+CONFIG_BFIN526_EZBRD=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# BF527 Specific Configuration</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Alternative Multiplexing Scheme</div><div class='add'>+#</div><div class='add'>+# CONFIG_BF527_SPORT0_PORTF is not set</div><div class='add'>+CONFIG_BF527_SPORT0_PORTG=y</div><div class='add'>+CONFIG_BF527_SPORT0_TSCLK_PG10=y</div><div class='add'>+# CONFIG_BF527_SPORT0_TSCLK_PG14 is not set</div><div class='add'>+CONFIG_BF527_UART1_PORTF=y</div><div class='add'>+# CONFIG_BF527_UART1_PORTG is not set</div><div class='add'>+# CONFIG_BF527_NAND_D_PORTF is not set</div><div class='add'>+CONFIG_BF527_NAND_D_PORTH=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Interrupt Priority Assignment</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Priority</div><div class='add'>+#</div><div class='add'>+CONFIG_IRQ_PLL_WAKEUP=7</div><div class='add'>+CONFIG_IRQ_DMA0_ERROR=7</div><div class='add'>+CONFIG_IRQ_DMAR0_BLK=7</div><div class='add'>+CONFIG_IRQ_DMAR1_BLK=7</div><div class='add'>+CONFIG_IRQ_DMAR0_OVR=7</div><div class='add'>+CONFIG_IRQ_DMAR1_OVR=7</div><div class='add'>+CONFIG_IRQ_PPI_ERROR=7</div><div class='add'>+CONFIG_IRQ_MAC_ERROR=7</div><div class='add'>+CONFIG_IRQ_SPORT0_ERROR=7</div><div class='add'>+CONFIG_IRQ_SPORT1_ERROR=7</div><div class='add'>+CONFIG_IRQ_UART0_ERROR=7</div><div class='add'>+CONFIG_IRQ_UART1_ERROR=7</div><div class='add'>+CONFIG_IRQ_RTC=8</div><div class='add'>+CONFIG_IRQ_PPI=8</div><div class='add'>+CONFIG_IRQ_SPORT0_RX=9</div><div class='add'>+CONFIG_IRQ_SPORT0_TX=9</div><div class='add'>+CONFIG_IRQ_SPORT1_RX=9</div><div class='add'>+CONFIG_IRQ_SPORT1_TX=9</div><div class='add'>+CONFIG_IRQ_TWI=10</div><div class='add'>+CONFIG_IRQ_SPI=10</div><div class='add'>+CONFIG_IRQ_UART0_RX=10</div><div class='add'>+CONFIG_IRQ_UART0_TX=10</div><div class='add'>+CONFIG_IRQ_UART1_RX=10</div><div class='add'>+CONFIG_IRQ_UART1_TX=10</div><div class='add'>+CONFIG_IRQ_OPTSEC=11</div><div class='add'>+CONFIG_IRQ_CNT=11</div><div class='add'>+CONFIG_IRQ_MAC_RX=11</div><div class='add'>+CONFIG_IRQ_PORTH_INTA=11</div><div class='add'>+CONFIG_IRQ_MAC_TX=11</div><div class='add'>+CONFIG_IRQ_PORTH_INTB=11</div><div class='add'>+CONFIG_IRQ_TMR0=12</div><div class='add'>+CONFIG_IRQ_TMR1=12</div><div class='add'>+CONFIG_IRQ_TMR2=12</div><div class='add'>+CONFIG_IRQ_TMR3=12</div><div class='add'>+CONFIG_IRQ_TMR4=12</div><div class='add'>+CONFIG_IRQ_TMR5=12</div><div class='add'>+CONFIG_IRQ_TMR6=12</div><div class='add'>+CONFIG_IRQ_TMR7=12</div><div class='add'>+CONFIG_IRQ_PORTG_INTA=12</div><div class='add'>+CONFIG_IRQ_PORTG_INTB=12</div><div class='add'>+CONFIG_IRQ_MEM_DMA0=13</div><div class='add'>+CONFIG_IRQ_MEM_DMA1=13</div><div class='add'>+CONFIG_IRQ_WATCH=13</div><div class='add'>+CONFIG_IRQ_PORTF_INTA=13</div><div class='add'>+CONFIG_IRQ_PORTF_INTB=13</div><div class='add'>+CONFIG_IRQ_SPI_ERROR=7</div><div class='add'>+CONFIG_IRQ_NFC_ERROR=7</div><div class='add'>+CONFIG_IRQ_HDMA_ERROR=7</div><div class='add'>+CONFIG_IRQ_HDMA=7</div><div class='add'>+CONFIG_IRQ_USB_EINT=10</div><div class='add'>+CONFIG_IRQ_USB_INT0=11</div><div class='add'>+CONFIG_IRQ_USB_INT1=11</div><div class='add'>+CONFIG_IRQ_USB_INT2=11</div><div class='add'>+CONFIG_IRQ_USB_DMA=11</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Board customizations</div><div class='add'>+#</div><div class='add'>+# CONFIG_CMDLINE_BOOL is not set</div><div class='add'>+CONFIG_BOOT_LOAD=0x1000</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Clock/PLL Setup</div><div class='add'>+#</div><div class='add'>+CONFIG_CLKIN_HZ=25000000</div><div class='add'>+# CONFIG_BFIN_KERNEL_CLOCK is not set</div><div class='add'>+CONFIG_MAX_MEM_SIZE=512</div><div class='add'>+CONFIG_MAX_VCO_HZ=400000000</div><div class='add'>+CONFIG_MIN_VCO_HZ=50000000</div><div class='add'>+CONFIG_MAX_SCLK_HZ=133333333</div><div class='add'>+CONFIG_MIN_SCLK_HZ=27000000</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel Timer/Scheduler</div><div class='add'>+#</div><div class='add'>+# CONFIG_HZ_100 is not set</div><div class='add'>+CONFIG_HZ_250=y</div><div class='add'>+# CONFIG_HZ_300 is not set</div><div class='add'>+# CONFIG_HZ_1000 is not set</div><div class='add'>+CONFIG_HZ=250</div><div class='add'>+# CONFIG_SCHED_HRTICK is not set</div><div class='add'>+CONFIG_GENERIC_TIME=y</div><div class='add'>+CONFIG_GENERIC_CLOCKEVENTS=y</div><div class='add'>+# CONFIG_CYCLES_CLOCKSOURCE is not set</div><div class='add'>+# CONFIG_TICK_ONESHOT is not set</div><div class='add'>+# CONFIG_NO_HZ is not set</div><div class='add'>+# CONFIG_HIGH_RES_TIMERS is not set</div><div class='add'>+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Memory Setup</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Misc</div><div class='add'>+#</div><div class='add'>+CONFIG_BFIN_SCRATCH_REG_RETN=y</div><div class='add'>+# CONFIG_BFIN_SCRATCH_REG_RETE is not set</div><div class='add'>+# CONFIG_BFIN_SCRATCH_REG_CYCLES is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Blackfin Kernel Optimizations</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Memory Optimizations</div><div class='add'>+#</div><div class='add'>+CONFIG_I_ENTRY_L1=y</div><div class='add'>+CONFIG_EXCPT_IRQ_SYSC_L1=y</div><div class='add'>+CONFIG_DO_IRQ_L1=y</div><div class='add'>+CONFIG_CORE_TIMER_IRQ_L1=y</div><div class='add'>+CONFIG_IDLE_L1=y</div><div class='add'>+# CONFIG_SCHEDULE_L1 is not set</div><div class='add'>+CONFIG_ARITHMETIC_OPS_L1=y</div><div class='add'>+CONFIG_ACCESS_OK_L1=y</div><div class='add'>+# CONFIG_MEMSET_L1 is not set</div><div class='add'>+# CONFIG_MEMCPY_L1 is not set</div><div class='add'>+# CONFIG_SYS_BFIN_SPINLOCK_L1 is not set</div><div class='add'>+# CONFIG_IP_CHECKSUM_L1 is not set</div><div class='add'>+CONFIG_CACHELINE_ALIGNED_L1=y</div><div class='add'>+# CONFIG_SYSCALL_TAB_L1 is not set</div><div class='add'>+# CONFIG_CPLB_SWITCH_TAB_L1 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Speed Optimizations</div><div class='add'>+#</div><div class='add'>+CONFIG_BFIN_INS_LOWOVERHEAD=y</div><div class='add'>+CONFIG_RAMKERNEL=y</div><div class='add'>+# CONFIG_ROMKERNEL is not set</div><div class='add'>+CONFIG_SELECT_MEMORY_MODEL=y</div><div class='add'>+CONFIG_FLATMEM_MANUAL=y</div><div class='add'>+# CONFIG_DISCONTIGMEM_MANUAL is not set</div><div class='add'>+# CONFIG_SPARSEMEM_MANUAL is not set</div><div class='add'>+CONFIG_FLATMEM=y</div><div class='add'>+CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='add'>+# CONFIG_SPARSEMEM_STATIC is not set</div><div class='add'>+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='add'>+CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='add'>+CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+CONFIG_ZONE_DMA_FLAG=1</div><div class='add'>+CONFIG_VIRT_TO_BUS=y</div><div class='add'>+CONFIG_BFIN_GPTIMERS=y</div><div class='add'>+CONFIG_BFIN_DMA_5XX=y</div><div class='add'>+# CONFIG_DMA_UNCACHED_4M is not set</div><div class='add'>+# CONFIG_DMA_UNCACHED_2M is not set</div><div class='add'>+CONFIG_DMA_UNCACHED_1M=y</div><div class='add'>+# CONFIG_DMA_UNCACHED_NONE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Cache Support</div><div class='add'>+#</div><div class='add'>+CONFIG_BFIN_ICACHE=y</div><div class='add'>+CONFIG_BFIN_DCACHE=y</div><div class='add'>+# CONFIG_BFIN_DCACHE_BANKA is not set</div><div class='add'>+# CONFIG_BFIN_ICACHE_LOCK is not set</div><div class='add'>+CONFIG_BFIN_WB=y</div><div class='add'>+# CONFIG_BFIN_WT is not set</div><div class='add'>+# CONFIG_MPU is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Asynchonous Memory Configuration</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# EBIU_AMGCTL Global Control</div><div class='add'>+#</div><div class='add'>+CONFIG_C_AMCKEN=y</div><div class='add'>+CONFIG_C_CDPRIO=y</div><div class='add'>+# CONFIG_C_AMBEN is not set</div><div class='add'>+# CONFIG_C_AMBEN_B0 is not set</div><div class='add'>+# CONFIG_C_AMBEN_B0_B1 is not set</div><div class='add'>+# CONFIG_C_AMBEN_B0_B1_B2 is not set</div><div class='add'>+CONFIG_C_AMBEN_ALL=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# EBIU_AMBCTL Control</div><div class='add'>+#</div><div class='add'>+CONFIG_BANK_0=0x7BB0</div><div class='add'>+CONFIG_BANK_1=0x5554</div><div class='add'>+CONFIG_BANK_2=0x7BB0</div><div class='add'>+CONFIG_BANK_3=0xFFC0</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Bus options (PCI, PCMCIA, EISA, MCA, ISA)</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARCH_SUPPORTS_MSI is not set</div><div class='add'>+# CONFIG_PCCARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Executable file formats</div><div class='add'>+#</div><div class='add'>+CONFIG_BINFMT_ELF_FDPIC=y</div><div class='add'>+CONFIG_BINFMT_FLAT=y</div><div class='add'>+CONFIG_BINFMT_ZFLAT=y</div><div class='add'>+# CONFIG_BINFMT_SHARED_FLAT is not set</div><div class='add'>+# CONFIG_BINFMT_MISC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Power management options</div><div class='add'>+#</div><div class='add'>+# CONFIG_PM is not set</div><div class='add'>+CONFIG_ARCH_SUSPEND_POSSIBLE=y</div><div class='add'>+# CONFIG_PM_WAKEUP_BY_GPIO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CPU Frequency scaling</div><div class='add'>+#</div><div class='add'>+# CONFIG_CPU_FREQ is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking</div><div class='add'>+#</div><div class='add'>+CONFIG_NET=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking options</div><div class='add'>+#</div><div class='add'>+CONFIG_PACKET=y</div><div class='add'>+# CONFIG_PACKET_MMAP is not set</div><div class='add'>+CONFIG_UNIX=y</div><div class='add'>+CONFIG_XFRM=y</div><div class='add'>+# CONFIG_XFRM_USER is not set</div><div class='add'>+# CONFIG_XFRM_SUB_POLICY is not set</div><div class='add'>+# CONFIG_XFRM_MIGRATE is not set</div><div class='add'>+# CONFIG_XFRM_STATISTICS is not set</div><div class='add'>+# CONFIG_NET_KEY is not set</div><div class='add'>+CONFIG_INET=y</div><div class='add'>+# CONFIG_IP_MULTICAST is not set</div><div class='add'>+# CONFIG_IP_ADVANCED_ROUTER is not set</div><div class='add'>+CONFIG_IP_FIB_HASH=y</div><div class='add'>+CONFIG_IP_PNP=y</div><div class='add'>+# CONFIG_IP_PNP_DHCP is not set</div><div class='add'>+# CONFIG_IP_PNP_BOOTP is not set</div><div class='add'>+# CONFIG_IP_PNP_RARP is not set</div><div class='add'>+# CONFIG_NET_IPIP is not set</div><div class='add'>+# CONFIG_NET_IPGRE is not set</div><div class='add'>+# CONFIG_ARPD is not set</div><div class='add'>+CONFIG_SYN_COOKIES=y</div><div class='add'>+# CONFIG_INET_AH is not set</div><div class='add'>+# CONFIG_INET_ESP is not set</div><div class='add'>+# CONFIG_INET_IPCOMP is not set</div><div class='add'>+# CONFIG_INET_XFRM_TUNNEL is not set</div><div class='add'>+# CONFIG_INET_TUNNEL is not set</div><div class='add'>+CONFIG_INET_XFRM_MODE_TRANSPORT=y</div><div class='add'>+CONFIG_INET_XFRM_MODE_TUNNEL=y</div><div class='add'>+CONFIG_INET_XFRM_MODE_BEET=y</div><div class='add'>+# CONFIG_INET_LRO is not set</div><div class='add'>+CONFIG_INET_DIAG=y</div><div class='add'>+CONFIG_INET_TCP_DIAG=y</div><div class='add'>+# CONFIG_TCP_CONG_ADVANCED is not set</div><div class='add'>+CONFIG_TCP_CONG_CUBIC=y</div><div class='add'>+CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='add'>+# CONFIG_TCP_MD5SIG is not set</div><div class='add'>+# CONFIG_IPV6 is not set</div><div class='add'>+# CONFIG_NETLABEL is not set</div><div class='add'>+# CONFIG_NETWORK_SECMARK is not set</div><div class='add'>+# CONFIG_NETFILTER is not set</div><div class='add'>+# CONFIG_IP_DCCP is not set</div><div class='add'>+# CONFIG_IP_SCTP is not set</div><div class='add'>+# CONFIG_TIPC is not set</div><div class='add'>+# CONFIG_ATM is not set</div><div class='add'>+# CONFIG_BRIDGE is not set</div><div class='add'>+# CONFIG_VLAN_8021Q is not set</div><div class='add'>+# CONFIG_DECNET is not set</div><div class='add'>+# CONFIG_LLC2 is not set</div><div class='add'>+# CONFIG_IPX is not set</div><div class='add'>+# CONFIG_ATALK is not set</div><div class='add'>+# CONFIG_X25 is not set</div><div class='add'>+# CONFIG_LAPB is not set</div><div class='add'>+# CONFIG_ECONET is not set</div><div class='add'>+# CONFIG_WAN_ROUTER is not set</div><div class='add'>+# CONFIG_NET_SCHED is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network testing</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_PKTGEN is not set</div><div class='add'>+# CONFIG_HAMRADIO is not set</div><div class='add'>+# CONFIG_CAN is not set</div><div class='add'>+# CONFIG_IRDA is not set</div><div class='add'>+# CONFIG_BT is not set</div><div class='add'>+# CONFIG_AF_RXRPC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless</div><div class='add'>+#</div><div class='add'>+# CONFIG_CFG80211 is not set</div><div class='add'>+# CONFIG_WIRELESS_EXT is not set</div><div class='add'>+# CONFIG_MAC80211 is not set</div><div class='add'>+# CONFIG_IEEE80211 is not set</div><div class='add'>+# CONFIG_RFKILL is not set</div><div class='add'>+# CONFIG_NET_9P is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Device Drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Generic Driver Options</div><div class='add'>+#</div><div class='add'>+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='add'>+CONFIG_STANDALONE=y</div><div class='add'>+CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='add'>+# CONFIG_FW_LOADER is not set</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='add'>+# CONFIG_CONNECTOR is not set</div><div class='add'>+CONFIG_MTD=y</div><div class='add'>+# CONFIG_MTD_DEBUG is not set</div><div class='add'>+# CONFIG_MTD_CONCAT is not set</div><div class='add'>+CONFIG_MTD_PARTITIONS=y</div><div class='add'>+# CONFIG_MTD_REDBOOT_PARTS is not set</div><div class='add'>+# CONFIG_MTD_CMDLINE_PARTS is not set</div><div class='add'>+# CONFIG_MTD_AR7_PARTS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# User Modules And Translation Layers</div><div class='add'>+#</div><div class='add'>+CONFIG_MTD_CHAR=m</div><div class='add'>+CONFIG_MTD_BLKDEVS=y</div><div class='add'>+CONFIG_MTD_BLOCK=y</div><div class='add'>+# CONFIG_FTL is not set</div><div class='add'>+# CONFIG_NFTL is not set</div><div class='add'>+# CONFIG_INFTL is not set</div><div class='add'>+# CONFIG_RFD_FTL is not set</div><div class='add'>+# CONFIG_SSFDC is not set</div><div class='add'>+# CONFIG_MTD_OOPS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# RAM/ROM/Flash chip drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_CFI is not set</div><div class='add'>+CONFIG_MTD_JEDECPROBE=m</div><div class='add'>+CONFIG_MTD_GEN_PROBE=m</div><div class='add'>+# CONFIG_MTD_CFI_ADV_OPTIONS is not set</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_1=y</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_2=y</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_4=y</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set</div><div class='add'>+CONFIG_MTD_CFI_I1=y</div><div class='add'>+CONFIG_MTD_CFI_I2=y</div><div class='add'>+# CONFIG_MTD_CFI_I4 is not set</div><div class='add'>+# CONFIG_MTD_CFI_I8 is not set</div><div class='add'>+# CONFIG_MTD_CFI_INTELEXT is not set</div><div class='add'>+# CONFIG_MTD_CFI_AMDSTD is not set</div><div class='add'>+# CONFIG_MTD_CFI_STAA is not set</div><div class='add'>+CONFIG_MTD_RAM=y</div><div class='add'>+CONFIG_MTD_ROM=m</div><div class='add'>+# CONFIG_MTD_ABSENT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Mapping drivers for chip access</div><div class='add'>+#</div><div class='add'>+CONFIG_MTD_COMPLEX_MAPPINGS=y</div><div class='add'>+# CONFIG_MTD_PHYSMAP is not set</div><div class='add'>+# CONFIG_MTD_GPIO_ADDR is not set</div><div class='add'>+# CONFIG_MTD_UCLINUX is not set</div><div class='add'>+# CONFIG_MTD_PLATRAM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Self-contained MTD device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_DATAFLASH is not set</div><div class='add'>+# CONFIG_MTD_M25P80 is not set</div><div class='add'>+# CONFIG_MTD_SLRAM is not set</div><div class='add'>+# CONFIG_MTD_PHRAM is not set</div><div class='add'>+# CONFIG_MTD_MTDRAM is not set</div><div class='add'>+# CONFIG_MTD_BLOCK2MTD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Disk-On-Chip Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_DOC2000 is not set</div><div class='add'>+# CONFIG_MTD_DOC2001 is not set</div><div class='add'>+# CONFIG_MTD_DOC2001PLUS is not set</div><div class='add'>+CONFIG_MTD_NAND=m</div><div class='add'>+# CONFIG_MTD_NAND_VERIFY_WRITE is not set</div><div class='add'>+# CONFIG_MTD_NAND_ECC_SMC is not set</div><div class='add'>+# CONFIG_MTD_NAND_MUSEUM_IDS is not set</div><div class='add'>+CONFIG_MTD_NAND_BFIN=m</div><div class='add'>+CONFIG_BFIN_NAND_BASE=0x20212000</div><div class='add'>+CONFIG_BFIN_NAND_CLE=2</div><div class='add'>+CONFIG_BFIN_NAND_ALE=1</div><div class='add'>+CONFIG_BFIN_NAND_READY=3</div><div class='add'>+CONFIG_MTD_NAND_IDS=m</div><div class='add'>+# CONFIG_MTD_NAND_BF5XX is not set</div><div class='add'>+# CONFIG_MTD_NAND_DISKONCHIP is not set</div><div class='add'>+# CONFIG_MTD_NAND_NANDSIM is not set</div><div class='add'>+# CONFIG_MTD_NAND_PLATFORM is not set</div><div class='add'>+# CONFIG_MTD_ALAUDA is not set</div><div class='add'>+# CONFIG_MTD_ONENAND is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# UBI - Unsorted block images</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_UBI is not set</div><div class='add'>+# CONFIG_PARPORT is not set</div><div class='add'>+CONFIG_BLK_DEV=y</div><div class='add'>+# CONFIG_BLK_DEV_COW_COMMON is not set</div><div class='add'>+# CONFIG_BLK_DEV_LOOP is not set</div><div class='add'>+# CONFIG_BLK_DEV_NBD is not set</div><div class='add'>+# CONFIG_BLK_DEV_UB is not set</div><div class='add'>+CONFIG_BLK_DEV_RAM=y</div><div class='add'>+CONFIG_BLK_DEV_RAM_COUNT=16</div><div class='add'>+CONFIG_BLK_DEV_RAM_SIZE=4096</div><div class='add'>+# CONFIG_BLK_DEV_XIP is not set</div><div class='add'>+# CONFIG_CDROM_PKTCDVD is not set</div><div class='add'>+# CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+CONFIG_MISC_DEVICES=y</div><div class='add'>+# CONFIG_EEPROM_93CX6 is not set</div><div class='add'>+# CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+CONFIG_HAVE_IDE=y</div><div class='add'>+# CONFIG_IDE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_RAID_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI is not set</div><div class='add'>+# CONFIG_SCSI_DMA is not set</div><div class='add'>+# CONFIG_SCSI_NETLINK is not set</div><div class='add'>+# CONFIG_ATA is not set</div><div class='add'>+# CONFIG_MD is not set</div><div class='add'>+CONFIG_NETDEVICES=y</div><div class='add'>+# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='add'>+# CONFIG_DUMMY is not set</div><div class='add'>+# CONFIG_BONDING is not set</div><div class='add'>+# CONFIG_MACVLAN is not set</div><div class='add'>+# CONFIG_EQUALIZER is not set</div><div class='add'>+# CONFIG_TUN is not set</div><div class='add'>+# CONFIG_VETH is not set</div><div class='add'>+CONFIG_PHYLIB=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MII PHY device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MARVELL_PHY is not set</div><div class='add'>+# CONFIG_DAVICOM_PHY is not set</div><div class='add'>+# CONFIG_QSEMI_PHY is not set</div><div class='add'>+# CONFIG_LXT_PHY is not set</div><div class='add'>+# CONFIG_CICADA_PHY is not set</div><div class='add'>+# CONFIG_VITESSE_PHY is not set</div><div class='add'>+# CONFIG_SMSC_PHY is not set</div><div class='add'>+# CONFIG_BROADCOM_PHY is not set</div><div class='add'>+# CONFIG_ICPLUS_PHY is not set</div><div class='add'>+# CONFIG_REALTEK_PHY is not set</div><div class='add'>+# CONFIG_FIXED_PHY is not set</div><div class='add'>+# CONFIG_MDIO_BITBANG is not set</div><div class='add'>+CONFIG_NET_ETHERNET=y</div><div class='add'>+CONFIG_MII=y</div><div class='add'>+CONFIG_BFIN_MAC=y</div><div class='add'>+CONFIG_BFIN_TX_DESC_NUM=10</div><div class='add'>+CONFIG_BFIN_RX_DESC_NUM=20</div><div class='add'>+CONFIG_BFIN_MAC_RMII=y</div><div class='add'>+# CONFIG_SMC91X is not set</div><div class='add'>+# CONFIG_SMSC911X is not set</div><div class='add'>+# CONFIG_DM9000 is not set</div><div class='add'>+# CONFIG_ENC28J60 is not set</div><div class='add'>+# CONFIG_IBM_NEW_EMAC_ZMII is not set</div><div class='add'>+# CONFIG_IBM_NEW_EMAC_RGMII is not set</div><div class='add'>+# CONFIG_IBM_NEW_EMAC_TAH is not set</div><div class='add'>+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set</div><div class='add'>+# CONFIG_B44 is not set</div><div class='add'>+CONFIG_NETDEV_1000=y</div><div class='add'>+# CONFIG_E1000E_ENABLED is not set</div><div class='add'>+# CONFIG_AX88180 is not set</div><div class='add'>+CONFIG_NETDEV_10000=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless LAN</div><div class='add'>+#</div><div class='add'>+# CONFIG_WLAN_PRE80211 is not set</div><div class='add'>+# CONFIG_WLAN_80211 is not set</div><div class='add'>+# CONFIG_IWLWIFI_LEDS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Network Adapters</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_CATC is not set</div><div class='add'>+# CONFIG_USB_KAWETH is not set</div><div class='add'>+# CONFIG_USB_PEGASUS is not set</div><div class='add'>+# CONFIG_USB_RTL8150 is not set</div><div class='add'>+# CONFIG_USB_USBNET is not set</div><div class='add'>+# CONFIG_WAN is not set</div><div class='add'>+# CONFIG_PPP is not set</div><div class='add'>+# CONFIG_SLIP is not set</div><div class='add'>+# CONFIG_NETCONSOLE is not set</div><div class='add'>+# CONFIG_NETPOLL is not set</div><div class='add'>+# CONFIG_NET_POLL_CONTROLLER is not set</div><div class='add'>+# CONFIG_ISDN is not set</div><div class='add'>+# CONFIG_PHONE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input device support</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT=y</div><div class='add'>+# CONFIG_INPUT_FF_MEMLESS is not set</div><div class='add'>+# CONFIG_INPUT_POLLDEV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Userland interfaces</div><div class='add'>+#</div><div class='add'>+# CONFIG_INPUT_MOUSEDEV is not set</div><div class='add'>+# CONFIG_INPUT_JOYDEV is not set</div><div class='add'>+# CONFIG_INPUT_EVDEV is not set</div><div class='add'>+# CONFIG_INPUT_EVBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_INPUT_KEYBOARD is not set</div><div class='add'>+# CONFIG_INPUT_MOUSE is not set</div><div class='add'>+# CONFIG_INPUT_JOYSTICK is not set</div><div class='add'>+# CONFIG_INPUT_TABLET is not set</div><div class='add'>+# CONFIG_INPUT_TOUCHSCREEN is not set</div><div class='add'>+CONFIG_INPUT_MISC=y</div><div class='add'>+# CONFIG_INPUT_ATI_REMOTE is not set</div><div class='add'>+# CONFIG_INPUT_ATI_REMOTE2 is not set</div><div class='add'>+# CONFIG_INPUT_KEYSPAN_REMOTE is not set</div><div class='add'>+# CONFIG_INPUT_POWERMATE is not set</div><div class='add'>+# CONFIG_INPUT_YEALINK is not set</div><div class='add'>+# CONFIG_INPUT_UINPUT is not set</div><div class='add'>+# CONFIG_TWI_KEYPAD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware I/O ports</div><div class='add'>+#</div><div class='add'>+# CONFIG_SERIO is not set</div><div class='add'>+# CONFIG_GAMEPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Character devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_AD9960 is not set</div><div class='add'>+# CONFIG_SPI_ADC_BF533 is not set</div><div class='add'>+# CONFIG_BF5xx_PPIFCD is not set</div><div class='add'>+# CONFIG_BFIN_SIMPLE_TIMER is not set</div><div class='add'>+# CONFIG_BF5xx_PPI is not set</div><div class='add'>+# CONFIG_BFIN_SPORT is not set</div><div class='add'>+# CONFIG_BFIN_TIMER_LATENCY is not set</div><div class='add'>+# CONFIG_TWI_LCD is not set</div><div class='add'>+CONFIG_SIMPLE_GPIO=m</div><div class='add'>+CONFIG_VT=y</div><div class='add'>+CONFIG_VT_CONSOLE=y</div><div class='add'>+CONFIG_HW_CONSOLE=y</div><div class='add'>+# CONFIG_VT_HW_CONSOLE_BINDING is not set</div><div class='add'>+CONFIG_DEVKMEM=y</div><div class='add'>+# CONFIG_SERIAL_NONSTANDARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Serial drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_SERIAL_8250 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Non-8250 serial port support</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIAL_BFIN=y</div><div class='add'>+CONFIG_SERIAL_BFIN_CONSOLE=y</div><div class='add'>+CONFIG_SERIAL_BFIN_DMA=y</div><div class='add'>+# CONFIG_SERIAL_BFIN_PIO is not set</div><div class='add'>+# CONFIG_SERIAL_BFIN_UART0 is not set</div><div class='add'>+CONFIG_SERIAL_BFIN_UART1=y</div><div class='add'>+# CONFIG_BFIN_UART1_CTSRTS is not set</div><div class='add'>+CONFIG_SERIAL_CORE=y</div><div class='add'>+CONFIG_SERIAL_CORE_CONSOLE=y</div><div class='add'>+# CONFIG_SERIAL_BFIN_SPORT is not set</div><div class='add'>+CONFIG_UNIX98_PTYS=y</div><div class='add'>+# CONFIG_LEGACY_PTYS is not set</div><div class='add'>+CONFIG_BFIN_OTP=y</div><div class='add'>+# CONFIG_BFIN_OTP_WRITE_ENABLE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CAN, the car bus and industrial fieldbus</div><div class='add'>+#</div><div class='add'>+# CONFIG_CAN4LINUX is not set</div><div class='add'>+# CONFIG_IPMI_HANDLER is not set</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='add'>+# CONFIG_R3964 is not set</div><div class='add'>+# CONFIG_RAW_DRIVER is not set</div><div class='add'>+# CONFIG_TCG_TPM is not set</div><div class='add'>+CONFIG_I2C=y</div><div class='add'>+CONFIG_I2C_BOARDINFO=y</div><div class='add'>+CONFIG_I2C_CHARDEV=m</div><div class='add'>+CONFIG_I2C_HELPER_AUTO=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C Hardware Bus support</div><div class='add'>+#</div><div class='add'>+CONFIG_I2C_BLACKFIN_TWI=y</div><div class='add'>+CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ=50</div><div class='add'>+# CONFIG_I2C_GPIO is not set</div><div class='add'>+# CONFIG_I2C_OCORES is not set</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='add'>+# CONFIG_I2C_SIMTEC is not set</div><div class='add'>+# CONFIG_I2C_TAOS_EVM is not set</div><div class='add'>+# CONFIG_I2C_STUB is not set</div><div class='add'>+# CONFIG_I2C_TINY_USB is not set</div><div class='add'>+# CONFIG_I2C_PCA_PLATFORM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous I2C Chip support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DS1682 is not set</div><div class='add'>+# CONFIG_SENSORS_AD5252 is not set</div><div class='add'>+# CONFIG_SENSORS_EEPROM is not set</div><div class='add'>+# CONFIG_SENSORS_PCF8574 is not set</div><div class='add'>+# CONFIG_PCF8575 is not set</div><div class='add'>+# CONFIG_SENSORS_PCF8591 is not set</div><div class='add'>+# CONFIG_SENSORS_MAX6875 is not set</div><div class='add'>+# CONFIG_SENSORS_TSL2550 is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_CORE is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_ALGO is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_BUS is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_CHIP is not set</div><div class='add'>+CONFIG_SPI=y</div><div class='add'>+CONFIG_SPI_MASTER=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI Master Controller Drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_SPI_BFIN=y</div><div class='add'>+# CONFIG_SPI_BITBANG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI Protocol Masters</div><div class='add'>+#</div><div class='add'>+# CONFIG_SPI_AT25 is not set</div><div class='add'>+# CONFIG_SPI_SPIDEV is not set</div><div class='add'>+# CONFIG_SPI_TLE62X0 is not set</div><div class='add'>+# CONFIG_W1 is not set</div><div class='add'>+# CONFIG_POWER_SUPPLY is not set</div><div class='add'>+CONFIG_HWMON=y</div><div class='add'>+# CONFIG_HWMON_VID is not set</div><div class='add'>+# CONFIG_SENSORS_AD7418 is not set</div><div class='add'>+# CONFIG_SENSORS_ADM1021 is not set</div><div class='add'>+# CONFIG_SENSORS_ADM1025 is not set</div><div class='add'>+# CONFIG_SENSORS_ADM1026 is not set</div><div class='add'>+# CONFIG_SENSORS_ADM1029 is not set</div><div class='add'>+# CONFIG_SENSORS_ADM1031 is not set</div><div class='add'>+# CONFIG_SENSORS_ADM9240 is not set</div><div class='add'>+# CONFIG_SENSORS_ADT7470 is not set</div><div class='add'>+# CONFIG_SENSORS_ADT7473 is not set</div><div class='add'>+# CONFIG_SENSORS_ATXP1 is not set</div><div class='add'>+# CONFIG_SENSORS_DS1621 is not set</div><div class='add'>+# CONFIG_SENSORS_F71805F is not set</div><div class='add'>+# CONFIG_SENSORS_F71882FG is not set</div><div class='add'>+# CONFIG_SENSORS_F75375S is not set</div><div class='add'>+# CONFIG_SENSORS_GL518SM is not set</div><div class='add'>+# CONFIG_SENSORS_GL520SM is not set</div><div class='add'>+# CONFIG_SENSORS_IT87 is not set</div><div class='add'>+# CONFIG_SENSORS_LM63 is not set</div><div class='add'>+# CONFIG_SENSORS_LM70 is not set</div><div class='add'>+# CONFIG_SENSORS_LM75 is not set</div><div class='add'>+# CONFIG_SENSORS_LM77 is not set</div><div class='add'>+# CONFIG_SENSORS_LM78 is not set</div><div class='add'>+# CONFIG_SENSORS_LM80 is not set</div><div class='add'>+# CONFIG_SENSORS_LM83 is not set</div><div class='add'>+# CONFIG_SENSORS_LM85 is not set</div><div class='add'>+# CONFIG_SENSORS_LM87 is not set</div><div class='add'>+# CONFIG_SENSORS_LM90 is not set</div><div class='add'>+# CONFIG_SENSORS_LM92 is not set</div><div class='add'>+# CONFIG_SENSORS_LM93 is not set</div><div class='add'>+# CONFIG_SENSORS_MAX1619 is not set</div><div class='add'>+# CONFIG_SENSORS_MAX6650 is not set</div><div class='add'>+# CONFIG_SENSORS_PC87360 is not set</div><div class='add'>+# CONFIG_SENSORS_PC87427 is not set</div><div class='add'>+# CONFIG_SENSORS_DME1737 is not set</div><div class='add'>+# CONFIG_SENSORS_SMSC47M1 is not set</div><div class='add'>+# CONFIG_SENSORS_SMSC47M192 is not set</div><div class='add'>+# CONFIG_SENSORS_SMSC47B397 is not set</div><div class='add'>+# CONFIG_SENSORS_ADS7828 is not set</div><div class='add'>+# CONFIG_SENSORS_THMC50 is not set</div><div class='add'>+# CONFIG_SENSORS_VT1211 is not set</div><div class='add'>+# CONFIG_SENSORS_W83781D is not set</div><div class='add'>+# CONFIG_SENSORS_W83791D is not set</div><div class='add'>+# CONFIG_SENSORS_W83792D is not set</div><div class='add'>+# CONFIG_SENSORS_W83793 is not set</div><div class='add'>+# CONFIG_SENSORS_W83L785TS is not set</div><div class='add'>+# CONFIG_SENSORS_W83L786NG is not set</div><div class='add'>+# CONFIG_SENSORS_W83627HF is not set</div><div class='add'>+# CONFIG_SENSORS_W83627EHF is not set</div><div class='add'>+# CONFIG_HWMON_DEBUG_CHIP is not set</div><div class='add'>+# CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='add'>+CONFIG_WATCHDOG=y</div><div class='add'>+# CONFIG_WATCHDOG_NOWAYOUT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Watchdog Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_SOFT_WATCHDOG is not set</div><div class='add'>+CONFIG_BFIN_WDT=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB-based Watchdog Cards</div><div class='add'>+#</div><div class='add'>+# CONFIG_USBPCWATCHDOG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Sonics Silicon Backplane</div><div class='add'>+#</div><div class='add'>+CONFIG_SSB_POSSIBLE=y</div><div class='add'>+# CONFIG_SSB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multifunction device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MFD_SM501 is not set</div><div class='add'>+# CONFIG_HTC_PASIC3 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia core support</div><div class='add'>+#</div><div class='add'>+# CONFIG_VIDEO_DEV is not set</div><div class='add'>+# CONFIG_DVB_CORE is not set</div><div class='add'>+# CONFIG_VIDEO_MEDIA is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_DAB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics support</div><div class='add'>+#</div><div class='add'>+# CONFIG_VGASTATE is not set</div><div class='add'>+# CONFIG_VIDEO_OUTPUT_CONTROL is not set</div><div class='add'>+# CONFIG_FB is not set</div><div class='add'>+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Display device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DISPLAY_SUPPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Console display driver support</div><div class='add'>+#</div><div class='add'>+CONFIG_DUMMY_CONSOLE=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Sound</div><div class='add'>+#</div><div class='add'>+CONFIG_SOUND=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Advanced Linux Sound Architecture</div><div class='add'>+#</div><div class='add'>+CONFIG_SND=m</div><div class='add'>+CONFIG_SND_TIMER=m</div><div class='add'>+CONFIG_SND_PCM=m</div><div class='add'>+# CONFIG_SND_SEQUENCER is not set</div><div class='add'>+CONFIG_SND_OSSEMUL=y</div><div class='add'>+CONFIG_SND_MIXER_OSS=m</div><div class='add'>+CONFIG_SND_PCM_OSS=m</div><div class='add'>+CONFIG_SND_PCM_OSS_PLUGINS=y</div><div class='add'>+# CONFIG_SND_DYNAMIC_MINORS is not set</div><div class='add'>+CONFIG_SND_SUPPORT_OLD_API=y</div><div class='add'>+CONFIG_SND_VERBOSE_PROCFS=y</div><div class='add'>+# CONFIG_SND_VERBOSE_PRINTK is not set</div><div class='add'>+# CONFIG_SND_DEBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Generic devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_SND_DUMMY is not set</div><div class='add'>+# CONFIG_SND_MTPAV is not set</div><div class='add'>+# CONFIG_SND_SERIAL_U16550 is not set</div><div class='add'>+# CONFIG_SND_MPU401 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# ALSA Blackfin devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_SND_BLACKFIN_AD1836 is not set</div><div class='add'>+# CONFIG_SND_BFIN_AD73311 is not set</div><div class='add'>+# CONFIG_SND_BFIN_AD73322 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_SND_USB_AUDIO is not set</div><div class='add'>+# CONFIG_SND_USB_CAIAQ is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# System on Chip audio support</div><div class='add'>+#</div><div class='add'>+CONFIG_SND_SOC=m</div><div class='add'>+CONFIG_SND_BF5XX_I2S=m</div><div class='add'>+CONFIG_SND_BF5XX_SOC_SSM2602=m</div><div class='add'>+# CONFIG_SND_BF5XX_AC97 is not set</div><div class='add'>+CONFIG_SND_BF5XX_SOC_SPORT=m</div><div class='add'>+CONFIG_SND_BF5XX_SOC_I2S=m</div><div class='add'>+CONFIG_SND_BF5XX_SPORT_NUM=0</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# ALSA SoC audio for Freescale SOCs</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SoC Audio for the Texas Instruments OMAP</div><div class='add'>+#</div><div class='add'>+CONFIG_SND_SOC_SSM2602=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Open Sound System</div><div class='add'>+#</div><div class='add'>+# CONFIG_SOUND_PRIME is not set</div><div class='add'>+CONFIG_HID_SUPPORT=y</div><div class='add'>+CONFIG_HID=y</div><div class='add'>+# CONFIG_HID_DEBUG is not set</div><div class='add'>+# CONFIG_HIDRAW is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Input Devices</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_HID=y</div><div class='add'>+# CONFIG_USB_HIDINPUT_POWERBOOK is not set</div><div class='add'>+# CONFIG_HID_FF is not set</div><div class='add'>+# CONFIG_USB_HIDDEV is not set</div><div class='add'>+CONFIG_USB_SUPPORT=y</div><div class='add'>+CONFIG_USB_ARCH_HAS_HCD=y</div><div class='add'>+# CONFIG_USB_ARCH_HAS_OHCI is not set</div><div class='add'>+# CONFIG_USB_ARCH_HAS_EHCI is not set</div><div class='add'>+CONFIG_USB=y</div><div class='add'>+# CONFIG_USB_DEBUG is not set</div><div class='add'>+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous USB options</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_DEVICEFS is not set</div><div class='add'>+CONFIG_USB_DEVICE_CLASS=y</div><div class='add'>+# CONFIG_USB_DYNAMIC_MINORS is not set</div><div class='add'>+# CONFIG_USB_OTG is not set</div><div class='add'>+# CONFIG_USB_OTG_WHITELIST is not set</div><div class='add'>+CONFIG_USB_OTG_BLACKLIST_HUB=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Host Controller Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_C67X00_HCD is not set</div><div class='add'>+# CONFIG_USB_ISP116X_HCD is not set</div><div class='add'>+# CONFIG_USB_ISP1760_HCD is not set</div><div class='add'>+# CONFIG_USB_ISP1362_HCD is not set</div><div class='add'>+# CONFIG_USB_SL811_HCD is not set</div><div class='add'>+# CONFIG_USB_R8A66597_HCD is not set</div><div class='add'>+CONFIG_USB_MUSB_HDRC=y</div><div class='add'>+CONFIG_USB_MUSB_SOC=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Blackfin high speed USB support</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_MUSB_HOST=y</div><div class='add'>+# CONFIG_USB_MUSB_PERIPHERAL is not set</div><div class='add'>+# CONFIG_USB_MUSB_OTG is not set</div><div class='add'>+CONFIG_USB_MUSB_HDRC_HCD=y</div><div class='add'>+CONFIG_MUSB_PIO_ONLY=y</div><div class='add'>+CONFIG_USB_MUSB_LOGLEVEL=0</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Device Class drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_ACM is not set</div><div class='add'>+# CONFIG_USB_PRINTER is not set</div><div class='add'>+# CONFIG_USB_WDM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# may also be needed; see USB_STORAGE Help for more information</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_LIBUSUAL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Imaging devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_MDC800 is not set</div><div class='add'>+CONFIG_USB_MON=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB port drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_SERIAL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Miscellaneous drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_EMI62 is not set</div><div class='add'>+# CONFIG_USB_EMI26 is not set</div><div class='add'>+# CONFIG_USB_ADUTUX is not set</div><div class='add'>+# CONFIG_USB_AUERSWALD is not set</div><div class='add'>+# CONFIG_USB_RIO500 is not set</div><div class='add'>+# CONFIG_USB_LEGOTOWER is not set</div><div class='add'>+# CONFIG_USB_LCD is not set</div><div class='add'>+# CONFIG_USB_BERRY_CHARGE is not set</div><div class='add'>+# CONFIG_USB_LED is not set</div><div class='add'>+# CONFIG_USB_CYPRESS_CY7C63 is not set</div><div class='add'>+# CONFIG_USB_CYTHERM is not set</div><div class='add'>+# CONFIG_USB_PHIDGET is not set</div><div class='add'>+# CONFIG_USB_IDMOUSE is not set</div><div class='add'>+# CONFIG_USB_FTDI_ELAN is not set</div><div class='add'>+# CONFIG_USB_APPLEDISPLAY is not set</div><div class='add'>+# CONFIG_USB_SISUSBVGA is not set</div><div class='add'>+# CONFIG_USB_LD is not set</div><div class='add'>+# CONFIG_USB_TRANCEVIBRATOR is not set</div><div class='add'>+# CONFIG_USB_IOWARRIOR is not set</div><div class='add'>+# CONFIG_USB_ISIGHTFW is not set</div><div class='add'>+# CONFIG_USB_GADGET is not set</div><div class='add'>+# CONFIG_MMC is not set</div><div class='add'>+# CONFIG_MEMSTICK is not set</div><div class='add'>+# CONFIG_NEW_LEDS is not set</div><div class='add'>+# CONFIG_ACCESSIBILITY is not set</div><div class='add'>+CONFIG_RTC_LIB=y</div><div class='add'>+CONFIG_RTC_CLASS=y</div><div class='add'>+CONFIG_RTC_HCTOSYS=y</div><div class='add'>+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"</div><div class='add'>+# CONFIG_RTC_DEBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# RTC interfaces</div><div class='add'>+#</div><div class='add'>+CONFIG_RTC_INTF_SYSFS=y</div><div class='add'>+CONFIG_RTC_INTF_PROC=y</div><div class='add'>+CONFIG_RTC_INTF_DEV=y</div><div class='add'>+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set</div><div class='add'>+# CONFIG_RTC_DRV_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C RTC drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_RTC_DRV_DS1307 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1374 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1672 is not set</div><div class='add'>+# CONFIG_RTC_DRV_MAX6900 is not set</div><div class='add'>+# CONFIG_RTC_DRV_RS5C372 is not set</div><div class='add'>+# CONFIG_RTC_DRV_ISL1208 is not set</div><div class='add'>+# CONFIG_RTC_DRV_X1205 is not set</div><div class='add'>+# CONFIG_RTC_DRV_PCF8563 is not set</div><div class='add'>+# CONFIG_RTC_DRV_PCF8583 is not set</div><div class='add'>+# CONFIG_RTC_DRV_M41T80 is not set</div><div class='add'>+# CONFIG_RTC_DRV_S35390A is not set</div><div class='add'>+# CONFIG_RTC_DRV_FM3130 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI RTC drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_RTC_DRV_MAX6902 is not set</div><div class='add'>+# CONFIG_RTC_DRV_R9701 is not set</div><div class='add'>+# CONFIG_RTC_DRV_RS5C348 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Platform RTC drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_RTC_DRV_DS1511 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1553 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1742 is not set</div><div class='add'>+# CONFIG_RTC_DRV_STK17TA8 is not set</div><div class='add'>+# CONFIG_RTC_DRV_M48T86 is not set</div><div class='add'>+# CONFIG_RTC_DRV_M48T59 is not set</div><div class='add'>+# CONFIG_RTC_DRV_V3020 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# on-CPU RTC drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_RTC_DRV_BFIN=y</div><div class='add'>+# CONFIG_UIO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# File systems</div><div class='add'>+#</div><div class='add'>+# CONFIG_EXT2_FS is not set</div><div class='add'>+# CONFIG_EXT3_FS is not set</div><div class='add'>+# CONFIG_EXT4DEV_FS is not set</div><div class='add'>+# CONFIG_REISERFS_FS is not set</div><div class='add'>+# CONFIG_JFS_FS is not set</div><div class='add'>+# CONFIG_FS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_XFS_FS is not set</div><div class='add'>+# CONFIG_OCFS2_FS is not set</div><div class='add'>+# CONFIG_DNOTIFY is not set</div><div class='add'>+CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='add'>+# CONFIG_QUOTA is not set</div><div class='add'>+# CONFIG_AUTOFS_FS is not set</div><div class='add'>+# CONFIG_AUTOFS4_FS is not set</div><div class='add'>+# CONFIG_FUSE_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CD-ROM/DVD Filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ISO9660_FS is not set</div><div class='add'>+# CONFIG_UDF_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DOS/FAT/NT Filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_MSDOS_FS is not set</div><div class='add'>+# CONFIG_VFAT_FS is not set</div><div class='add'>+# CONFIG_NTFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Pseudo filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_PROC_FS=y</div><div class='add'>+CONFIG_PROC_SYSCTL=y</div><div class='add'>+CONFIG_SYSFS=y</div><div class='add'>+# CONFIG_TMPFS is not set</div><div class='add'>+# CONFIG_HUGETLB_PAGE is not set</div><div class='add'>+# CONFIG_CONFIGFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ADFS_FS is not set</div><div class='add'>+# CONFIG_AFFS_FS is not set</div><div class='add'>+# CONFIG_HFS_FS is not set</div><div class='add'>+# CONFIG_HFSPLUS_FS is not set</div><div class='add'>+# CONFIG_BEFS_FS is not set</div><div class='add'>+# CONFIG_BFS_FS is not set</div><div class='add'>+# CONFIG_EFS_FS is not set</div><div class='add'>+CONFIG_YAFFS_FS=m</div><div class='add'>+CONFIG_YAFFS_YAFFS1=y</div><div class='add'>+# CONFIG_YAFFS_9BYTE_TAGS is not set</div><div class='add'>+# CONFIG_YAFFS_DOES_ECC is not set</div><div class='add'>+CONFIG_YAFFS_YAFFS2=y</div><div class='add'>+CONFIG_YAFFS_AUTO_YAFFS2=y</div><div class='add'>+# CONFIG_YAFFS_DISABLE_LAZY_LOAD is not set</div><div class='add'>+# CONFIG_YAFFS_DISABLE_WIDE_TNODES is not set</div><div class='add'>+# CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED is not set</div><div class='add'>+CONFIG_YAFFS_SHORT_NAMES_IN_RAM=y</div><div class='add'>+CONFIG_JFFS2_FS=m</div><div class='add'>+CONFIG_JFFS2_FS_DEBUG=0</div><div class='add'>+CONFIG_JFFS2_FS_WRITEBUFFER=y</div><div class='add'>+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set</div><div class='add'>+# CONFIG_JFFS2_SUMMARY is not set</div><div class='add'>+# CONFIG_JFFS2_FS_XATTR is not set</div><div class='add'>+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set</div><div class='add'>+CONFIG_JFFS2_ZLIB=y</div><div class='add'>+# CONFIG_JFFS2_LZO is not set</div><div class='add'>+CONFIG_JFFS2_RTIME=y</div><div class='add'>+# CONFIG_JFFS2_RUBIN is not set</div><div class='add'>+# CONFIG_CRAMFS is not set</div><div class='add'>+# CONFIG_VXFS_FS is not set</div><div class='add'>+# CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_HPFS_FS is not set</div><div class='add'>+# CONFIG_QNX4FS_FS is not set</div><div class='add'>+# CONFIG_ROMFS_FS is not set</div><div class='add'>+# CONFIG_SYSV_FS is not set</div><div class='add'>+# CONFIG_UFS_FS is not set</div><div class='add'>+CONFIG_NETWORK_FILESYSTEMS=y</div><div class='add'>+CONFIG_NFS_FS=m</div><div class='add'>+CONFIG_NFS_V3=y</div><div class='add'>+# CONFIG_NFS_V3_ACL is not set</div><div class='add'>+# CONFIG_NFS_V4 is not set</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='add'>+CONFIG_LOCKD=m</div><div class='add'>+CONFIG_LOCKD_V4=y</div><div class='add'>+CONFIG_NFS_COMMON=y</div><div class='add'>+CONFIG_SUNRPC=m</div><div class='add'>+# CONFIG_SUNRPC_BIND34 is not set</div><div class='add'>+# CONFIG_RPCSEC_GSS_KRB5 is not set</div><div class='add'>+# CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='add'>+CONFIG_SMB_FS=m</div><div class='add'>+# CONFIG_SMB_NLS_DEFAULT is not set</div><div class='add'>+# CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_NCP_FS is not set</div><div class='add'>+# CONFIG_CODA_FS is not set</div><div class='add'>+# CONFIG_AFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Partition Types</div><div class='add'>+#</div><div class='add'>+# CONFIG_PARTITION_ADVANCED is not set</div><div class='add'>+CONFIG_MSDOS_PARTITION=y</div><div class='add'>+CONFIG_NLS=m</div><div class='add'>+CONFIG_NLS_DEFAULT="iso8859-1"</div><div class='add'>+# CONFIG_NLS_CODEPAGE_437 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_737 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_775 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_850 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_852 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_855 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_857 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_860 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_861 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_862 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_863 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_864 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_865 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_866 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_869 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_936 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_950 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_932 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_949 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_874 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_8 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_1250 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_1251 is not set</div><div class='add'>+# CONFIG_NLS_ASCII is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_1 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_2 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_3 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_4 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_5 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_6 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_7 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_9 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_13 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_14 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_15 is not set</div><div class='add'>+# CONFIG_NLS_KOI8_R is not set</div><div class='add'>+# CONFIG_NLS_KOI8_U is not set</div><div class='add'>+# CONFIG_NLS_UTF8 is not set</div><div class='add'>+# CONFIG_DLM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel hacking</div><div class='add'>+#</div><div class='add'>+# CONFIG_PRINTK_TIME is not set</div><div class='add'>+CONFIG_ENABLE_WARN_DEPRECATED=y</div><div class='add'>+CONFIG_ENABLE_MUST_CHECK=y</div><div class='add'>+CONFIG_FRAME_WARN=1024</div><div class='add'>+# CONFIG_MAGIC_SYSRQ is not set</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='add'>+CONFIG_DEBUG_FS=y</div><div class='add'>+# CONFIG_HEADERS_CHECK is not set</div><div class='add'>+# CONFIG_DEBUG_KERNEL is not set</div><div class='add'>+# CONFIG_DEBUG_BUGVERBOSE is not set</div><div class='add'>+# CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_DEBUG_MMRS=y</div><div class='add'>+CONFIG_DEBUG_HUNT_FOR_ZERO=y</div><div class='add'>+CONFIG_DEBUG_BFIN_HWTRACE_ON=y</div><div class='add'>+CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_OFF=y</div><div class='add'>+# CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_ONE is not set</div><div class='add'>+# CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_TWO is not set</div><div class='add'>+CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION=0</div><div class='add'>+# CONFIG_DEBUG_BFIN_HWTRACE_EXPAND is not set</div><div class='add'>+# CONFIG_DEBUG_BFIN_NO_KERN_HWTRACE is not set</div><div class='add'>+CONFIG_EARLY_PRINTK=y</div><div class='add'>+CONFIG_CPLB_INFO=y</div><div class='add'>+CONFIG_ACCESS_CHECK=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Security options</div><div class='add'>+#</div><div class='add'>+# CONFIG_KEYS is not set</div><div class='add'>+CONFIG_SECURITY=y</div><div class='add'>+# CONFIG_SECURITY_NETWORK is not set</div><div class='add'>+# CONFIG_SECURITY_CAPABILITIES is not set</div><div class='add'>+# CONFIG_SECURITY_ROOTPLUG is not set</div><div class='add'>+CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=0</div><div class='add'>+CONFIG_CRYPTO=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Crypto core or helper</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_MANAGER is not set</div><div class='add'>+# CONFIG_CRYPTO_GF128MUL is not set</div><div class='add'>+# CONFIG_CRYPTO_NULL is not set</div><div class='add'>+# CONFIG_CRYPTO_CRYPTD is not set</div><div class='add'>+# CONFIG_CRYPTO_AUTHENC is not set</div><div class='add'>+# CONFIG_CRYPTO_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Authenticated Encryption with Associated Data</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CCM is not set</div><div class='add'>+# CONFIG_CRYPTO_GCM is not set</div><div class='add'>+# CONFIG_CRYPTO_SEQIV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block modes</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CBC is not set</div><div class='add'>+# CONFIG_CRYPTO_CTR is not set</div><div class='add'>+# CONFIG_CRYPTO_CTS is not set</div><div class='add'>+# CONFIG_CRYPTO_ECB is not set</div><div class='add'>+# CONFIG_CRYPTO_LRW is not set</div><div class='add'>+# CONFIG_CRYPTO_PCBC is not set</div><div class='add'>+# CONFIG_CRYPTO_XTS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hash modes</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_HMAC is not set</div><div class='add'>+# CONFIG_CRYPTO_XCBC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Digest</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CRC32C is not set</div><div class='add'>+# CONFIG_CRYPTO_MD4 is not set</div><div class='add'>+# CONFIG_CRYPTO_MD5 is not set</div><div class='add'>+# CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_SHA1 is not set</div><div class='add'>+# CONFIG_CRYPTO_SHA256 is not set</div><div class='add'>+# CONFIG_CRYPTO_SHA512 is not set</div><div class='add'>+# CONFIG_CRYPTO_TGR192 is not set</div><div class='add'>+# CONFIG_CRYPTO_WP512 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ciphers</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_AES is not set</div><div class='add'>+# CONFIG_CRYPTO_ANUBIS is not set</div><div class='add'>+# CONFIG_CRYPTO_ARC4 is not set</div><div class='add'>+# CONFIG_CRYPTO_BLOWFISH is not set</div><div class='add'>+# CONFIG_CRYPTO_CAMELLIA is not set</div><div class='add'>+# CONFIG_CRYPTO_CAST5 is not set</div><div class='add'>+# CONFIG_CRYPTO_CAST6 is not set</div><div class='add'>+# CONFIG_CRYPTO_DES is not set</div><div class='add'>+# CONFIG_CRYPTO_FCRYPT is not set</div><div class='add'>+# CONFIG_CRYPTO_KHAZAD is not set</div><div class='add'>+# CONFIG_CRYPTO_SALSA20 is not set</div><div class='add'>+# CONFIG_CRYPTO_SEED is not set</div><div class='add'>+# CONFIG_CRYPTO_SERPENT is not set</div><div class='add'>+# CONFIG_CRYPTO_TEA is not set</div><div class='add'>+# CONFIG_CRYPTO_TWOFISH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Compression</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_DEFLATE is not set</div><div class='add'>+# CONFIG_CRYPTO_LZO is not set</div><div class='add'>+CONFIG_CRYPTO_HW=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Library routines</div><div class='add'>+#</div><div class='add'>+CONFIG_BITREVERSE=y</div><div class='add'>+# CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='add'>+CONFIG_CRC_CCITT=m</div><div class='add'>+# CONFIG_CRC16 is not set</div><div class='add'>+# CONFIG_CRC_ITU_T is not set</div><div class='add'>+CONFIG_CRC32=y</div><div class='add'>+# CONFIG_CRC7 is not set</div><div class='add'>+# CONFIG_LIBCRC32C is not set</div><div class='add'>+CONFIG_ZLIB_INFLATE=y</div><div class='add'>+CONFIG_ZLIB_DEFLATE=m</div><div class='add'>+CONFIG_PLIST=y</div><div class='add'>+CONFIG_HAS_IOMEM=y</div><div class='add'>+CONFIG_HAS_IOPORT=y</div><div class='add'>+CONFIG_HAS_DMA=y</div><div class='head'>diff --git a/arch/blackfin/configs/BF527-EZKIT_defconfig b/arch/blackfin/configs/BF527-EZKIT_defconfig<br/>index 66854a83c0de..4a2a660a6b35 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/configs/BF527-EZKIT_defconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/configs/BF527-EZKIT_defconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/configs/BF527-EZKIT_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/configs/BF527-EZKIT_defconfig</a></div><div class='hunk'>@@ -772,7 +772,7 @@ CONFIG_UNIX98_PTYS=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_CAN4LINUX is not set</div><div class='ctx'> # CONFIG_IPMI_HANDLER is not set</div><div class='del'>-CONFIG_HW_RANDOM=y</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='ctx'> # CONFIG_GEN_RTC is not set</div><div class='ctx'> # CONFIG_R3964 is not set</div><div class='ctx'> # CONFIG_RAW_DRIVER is not set</div><div class='head'>diff --git a/arch/blackfin/configs/BF533-EZKIT_defconfig b/arch/blackfin/configs/BF533-EZKIT_defconfig<br/>index 6bc11db12690..deeb5e45effb 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/configs/BF533-EZKIT_defconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/configs/BF533-EZKIT_defconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/configs/BF533-EZKIT_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/configs/BF533-EZKIT_defconfig</a></div><div class='hunk'>@@ -674,7 +674,7 @@ CONFIG_UNIX98_PTYS=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_CAN4LINUX is not set</div><div class='ctx'> # CONFIG_IPMI_HANDLER is not set</div><div class='del'>-CONFIG_HW_RANDOM=y</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='ctx'> # CONFIG_GEN_RTC is not set</div><div class='ctx'> # CONFIG_R3964 is not set</div><div class='ctx'> # CONFIG_RAW_DRIVER is not set</div><div class='hunk'>@@ -740,7 +740,7 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='ctx'> # CONFIG_DVB_CORE is not set</div><div class='del'>-CONFIG_DAB=y</div><div class='add'>+# CONFIG_DAB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Graphics support</div><div class='head'>diff --git a/arch/blackfin/configs/BF533-STAMP_defconfig b/arch/blackfin/configs/BF533-STAMP_defconfig<br/>index d77d991a1f61..c23267ed880b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/configs/BF533-STAMP_defconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/configs/BF533-STAMP_defconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/configs/BF533-STAMP_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/configs/BF533-STAMP_defconfig</a></div><div class='hunk'>@@ -681,7 +681,7 @@ CONFIG_UNIX98_PTYS=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_CAN4LINUX is not set</div><div class='ctx'> # CONFIG_IPMI_HANDLER is not set</div><div class='del'>-CONFIG_HW_RANDOM=y</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='ctx'> # CONFIG_GEN_RTC is not set</div><div class='ctx'> # CONFIG_R3964 is not set</div><div class='ctx'> # CONFIG_RAW_DRIVER is not set</div><div class='head'>diff --git a/arch/blackfin/configs/BF537-STAMP_defconfig b/arch/blackfin/configs/BF537-STAMP_defconfig<br/>index 5fd7c4b143df..63a0f854745c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/configs/BF537-STAMP_defconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/configs/BF537-STAMP_defconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/configs/BF537-STAMP_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/configs/BF537-STAMP_defconfig</a></div><div class='hunk'>@@ -731,7 +731,7 @@ CONFIG_CAN4LINUX=y</div><div class='ctx'> # CONFIG_CAN_UNCTWINCAN is not set</div><div class='ctx'> CONFIG_CAN_BLACKFIN=m</div><div class='ctx'> # CONFIG_IPMI_HANDLER is not set</div><div class='del'>-CONFIG_HW_RANDOM=y</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='ctx'> # CONFIG_GEN_RTC is not set</div><div class='ctx'> # CONFIG_R3964 is not set</div><div class='ctx'> # CONFIG_RAW_DRIVER is not set</div><div class='hunk'>@@ -871,7 +871,7 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='ctx'> # CONFIG_DVB_CORE is not set</div><div class='del'>-CONFIG_DAB=y</div><div class='add'>+# CONFIG_DAB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Graphics support</div><div class='head'>diff --git a/arch/blackfin/configs/BF548-EZKIT_defconfig b/arch/blackfin/configs/BF548-EZKIT_defconfig<br/>index 390669e8668e..bf63660815b9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/configs/BF548-EZKIT_defconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/configs/BF548-EZKIT_defconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/configs/BF548-EZKIT_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/configs/BF548-EZKIT_defconfig</a></div><div class='hunk'>@@ -855,7 +855,7 @@ CONFIG_UNIX98_PTYS=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_CAN4LINUX is not set</div><div class='ctx'> # CONFIG_IPMI_HANDLER is not set</div><div class='del'>-CONFIG_HW_RANDOM=y</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='ctx'> # CONFIG_GEN_RTC is not set</div><div class='ctx'> # CONFIG_R3964 is not set</div><div class='ctx'> # CONFIG_RAW_DRIVER is not set</div><div class='hunk'>@@ -1001,7 +1001,7 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='ctx'> # CONFIG_DVB_CORE is not set</div><div class='del'>-CONFIG_DAB=y</div><div class='add'>+# CONFIG_DAB is not set</div><div class='ctx'> # CONFIG_USB_DABUSB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='head'>diff --git a/arch/blackfin/configs/BF561-EZKIT_defconfig b/arch/blackfin/configs/BF561-EZKIT_defconfig<br/>index 976a4d7ba175..3c70d6230a12 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/configs/BF561-EZKIT_defconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/configs/BF561-EZKIT_defconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/configs/BF561-EZKIT_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/configs/BF561-EZKIT_defconfig</a></div><div class='hunk'>@@ -719,7 +719,7 @@ CONFIG_UNIX98_PTYS=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_CAN4LINUX is not set</div><div class='ctx'> # CONFIG_IPMI_HANDLER is not set</div><div class='del'>-CONFIG_HW_RANDOM=y</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='ctx'> # CONFIG_GEN_RTC is not set</div><div class='ctx'> # CONFIG_R3964 is not set</div><div class='ctx'> # CONFIG_RAW_DRIVER is not set</div><div class='hunk'>@@ -785,7 +785,7 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='ctx'> # CONFIG_DVB_CORE is not set</div><div class='del'>-CONFIG_DAB=y</div><div class='add'>+# CONFIG_DAB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Graphics support</div><div class='head'>diff --git a/arch/blackfin/configs/CM-BF527_defconfig b/arch/blackfin/configs/CM-BF527_defconfig<br/>index 0799aa9bba9d..b6a14635fb91 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/configs/CM-BF527_defconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/configs/CM-BF527_defconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/configs/CM-BF527_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/configs/CM-BF527_defconfig</a></div><div class='hunk'>@@ -679,7 +679,7 @@ CONFIG_UNIX98_PTYS=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_CAN4LINUX is not set</div><div class='ctx'> # CONFIG_IPMI_HANDLER is not set</div><div class='del'>-CONFIG_HW_RANDOM=y</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='ctx'> # CONFIG_GEN_RTC is not set</div><div class='ctx'> # CONFIG_R3964 is not set</div><div class='ctx'> # CONFIG_RAW_DRIVER is not set</div><div class='head'>diff --git a/arch/blackfin/configs/CM-BF533_defconfig b/arch/blackfin/configs/CM-BF533_defconfig<br/>index 09deea44480b..c3ba9066b935 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/configs/CM-BF533_defconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/configs/CM-BF533_defconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/configs/CM-BF533_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/configs/CM-BF533_defconfig</a></div><div class='hunk'>@@ -672,7 +672,7 @@ CONFIG_HWMON=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='ctx'> # CONFIG_DVB_CORE is not set</div><div class='del'>-CONFIG_DAB=y</div><div class='add'>+# CONFIG_DAB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Graphics support</div><div class='head'>diff --git a/arch/blackfin/configs/CM-BF537E_defconfig b/arch/blackfin/configs/CM-BF537E_defconfig<br/>index 219fc345a5f5..cdc6b7feb59e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/configs/CM-BF537E_defconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/configs/CM-BF537E_defconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/configs/CM-BF537E_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/configs/CM-BF537E_defconfig</a></div><div class='hunk'>@@ -703,7 +703,7 @@ CONFIG_HWMON=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='ctx'> # CONFIG_DVB_CORE is not set</div><div class='del'>-CONFIG_DAB=y</div><div class='add'>+# CONFIG_DAB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Graphics support</div><div class='head'>diff --git a/arch/blackfin/configs/CM-BF537U_defconfig b/arch/blackfin/configs/CM-BF537U_defconfig<br/>index 9873d586fc77..f074bdcd1ce5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/configs/CM-BF537U_defconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/configs/CM-BF537U_defconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/configs/CM-BF537U_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/configs/CM-BF537U_defconfig</a></div><div class='hunk'>@@ -683,7 +683,7 @@ CONFIG_HWMON=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='ctx'> # CONFIG_DVB_CORE is not set</div><div class='del'>-CONFIG_DAB=y</div><div class='add'>+# CONFIG_DAB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Graphics support</div><div class='head'>diff --git a/arch/blackfin/configs/CM-BF548_defconfig b/arch/blackfin/configs/CM-BF548_defconfig<br/>index 0e3605fdb7b0..5c44fdb8e6e3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/configs/CM-BF548_defconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/configs/CM-BF548_defconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/configs/CM-BF548_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/configs/CM-BF548_defconfig</a></div><div class='hunk'>@@ -762,7 +762,7 @@ CONFIG_UNIX98_PTYS=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_CAN4LINUX is not set</div><div class='ctx'> # CONFIG_IPMI_HANDLER is not set</div><div class='del'>-CONFIG_HW_RANDOM=y</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='ctx'> # CONFIG_GEN_RTC is not set</div><div class='ctx'> # CONFIG_R3964 is not set</div><div class='ctx'> # CONFIG_RAW_DRIVER is not set</div><div class='hunk'>@@ -909,7 +909,7 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='ctx'> # CONFIG_DVB_CORE is not set</div><div class='del'>-CONFIG_DAB=y</div><div class='add'>+# CONFIG_DAB is not set</div><div class='ctx'> # CONFIG_USB_DABUSB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='head'>diff --git a/arch/blackfin/configs/CM-BF561_defconfig b/arch/blackfin/configs/CM-BF561_defconfig<br/>index 59c7cdbee904..086fe5dda495 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/configs/CM-BF561_defconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/configs/CM-BF561_defconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/configs/CM-BF561_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/configs/CM-BF561_defconfig</a></div><div class='hunk'>@@ -684,7 +684,7 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='ctx'> # CONFIG_DVB_CORE is not set</div><div class='del'>-CONFIG_DAB=y</div><div class='add'>+# CONFIG_DAB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Graphics support</div><div class='head'>diff --git a/arch/blackfin/configs/H8606_defconfig b/arch/blackfin/configs/H8606_defconfig<br/>index ba0bee90b7e1..1fc31f1b762b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/configs/H8606_defconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/configs/H8606_defconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/configs/H8606_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/configs/H8606_defconfig</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.22.12</div><div class='add'>+# Linux kernel version: 2.6.22.14</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_MMU is not set</div><div class='ctx'> # CONFIG_FPU is not set</div><div class='hunk'>@@ -192,7 +192,7 @@ CONFIG_CLKIN_HZ=25000000</div><div class='ctx'> # CONFIG_BFIN_KERNEL_CLOCK is not set</div><div class='ctx'> CONFIG_MAX_VCO_HZ=400000000</div><div class='ctx'> CONFIG_MIN_VCO_HZ=50000000</div><div class='del'>-CONFIG_MAX_SCLK_HZ=133000000</div><div class='add'>+CONFIG_MAX_SCLK_HZ=133333333</div><div class='ctx'> CONFIG_MIN_SCLK_HZ=27000000</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -516,7 +516,7 @@ CONFIG_MTD_COMPLEX_MAPPINGS=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_MTD_DATAFLASH is not set</div><div class='ctx'> CONFIG_MTD_M25P80=y</div><div class='del'>-CONFIG_M25PXX_USE_FAST_READ=y</div><div class='add'>+# CONFIG_M25PXX_USE_FAST_READ is not set</div><div class='ctx'> # CONFIG_MTD_SLRAM is not set</div><div class='ctx'> # CONFIG_MTD_PHRAM is not set</div><div class='ctx'> # CONFIG_MTD_MTDRAM is not set</div><div class='hunk'>@@ -635,25 +635,25 @@ CONFIG_INPUT=y</div><div class='ctx'> # CONFIG_INPUT_MOUSEDEV is not set</div><div class='ctx'> # CONFIG_INPUT_JOYDEV is not set</div><div class='ctx'> # CONFIG_INPUT_TSDEV is not set</div><div class='del'>-CONFIG_INPUT_EVDEV=m</div><div class='add'>+CONFIG_INPUT_EVDEV=y</div><div class='ctx'> # CONFIG_INPUT_EVBUG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Input Device Drivers</div><div class='ctx'> #</div><div class='del'>-# CONFIG_INPUT_KEYBOARD is not set</div><div class='add'>+CONFIG_INPUT_KEYBOARD=y</div><div class='add'>+# CONFIG_KEYBOARD_ATKBD is not set</div><div class='add'>+# CONFIG_KEYBOARD_SUNKBD is not set</div><div class='add'>+# CONFIG_KEYBOARD_LKKBD is not set</div><div class='add'>+# CONFIG_KEYBOARD_XTKBD is not set</div><div class='add'>+# CONFIG_KEYBOARD_NEWTON is not set</div><div class='add'>+# CONFIG_KEYBOARD_STOWAWAY is not set</div><div class='add'>+CONFIG_KEYBOARD_GPIO=y</div><div class='ctx'> # CONFIG_INPUT_MOUSE is not set</div><div class='ctx'> # CONFIG_INPUT_JOYSTICK is not set</div><div class='ctx'> # CONFIG_INPUT_TABLET is not set</div><div class='ctx'> # CONFIG_INPUT_TOUCHSCREEN is not set</div><div class='del'>-CONFIG_INPUT_MISC=y</div><div class='del'>-# CONFIG_INPUT_ATI_REMOTE is not set</div><div class='del'>-# CONFIG_INPUT_ATI_REMOTE2 is not set</div><div class='del'>-# CONFIG_INPUT_KEYSPAN_REMOTE is not set</div><div class='del'>-# CONFIG_INPUT_POWERMATE is not set</div><div class='del'>-# CONFIG_INPUT_YEALINK is not set</div><div class='del'>-# CONFIG_INPUT_UINPUT is not set</div><div class='del'>-# CONFIG_BF53X_PFBUTTONS is not set</div><div class='add'>+# CONFIG_INPUT_MISC is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Hardware I/O ports</div><div class='hunk'>@@ -681,7 +681,15 @@ CONFIG_BFIN_TIMER_LATENCY=y</div><div class='ctx'> #</div><div class='ctx'> # Serial drivers</div><div class='ctx'> #</div><div class='del'>-# CONFIG_SERIAL_8250 is not set</div><div class='add'>+CONFIG_SERIAL_8250=y</div><div class='add'>+# CONFIG_SERIAL_8250_CONSOLE is not set</div><div class='add'>+CONFIG_SERIAL_8250_NR_UARTS=4</div><div class='add'>+CONFIG_SERIAL_8250_RUNTIME_UARTS=4</div><div class='add'>+CONFIG_SERIAL_8250_EXTENDED=y</div><div class='add'>+# CONFIG_SERIAL_8250_MANY_PORTS is not set</div><div class='add'>+CONFIG_SERIAL_8250_SHARE_IRQ=y</div><div class='add'>+# CONFIG_SERIAL_8250_DETECT_IRQ is not set</div><div class='add'>+# CONFIG_SERIAL_8250_RSA is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Non-8250 serial port support</div><div class='head'>diff --git a/arch/blackfin/include/asm/a.out.h b/arch/blackfin/include/asm/a.out.h<br/>deleted file mode 100644<br/>index 6c3d652ebd33..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/include/asm/a.out.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/include/asm/a.out.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,19 +0,0 @@</div><div class='del'>-#ifndef __BFIN_A_OUT_H__</div><div class='del'>-#define __BFIN_A_OUT_H__</div><div class='del'>-</div><div class='del'>-struct exec {</div><div class='del'>-	unsigned long a_info;	/* Use macros N_MAGIC, etc for access */</div><div class='del'>-	unsigned a_text;	/* length of text, in bytes */</div><div class='del'>-	unsigned a_data;	/* length of data, in bytes */</div><div class='del'>-	unsigned a_bss;		/* length of uninitialized data area for file, in bytes */</div><div class='del'>-	unsigned a_syms;	/* length of symbol table data in file, in bytes */</div><div class='del'>-	unsigned a_entry;	/* start address */</div><div class='del'>-	unsigned a_trsize;	/* length of relocation info for text, in bytes */</div><div class='del'>-	unsigned a_drsize;	/* length of relocation info for data, in bytes */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define N_TRSIZE(a)	((a).a_trsize)</div><div class='del'>-#define N_DRSIZE(a)	((a).a_drsize)</div><div class='del'>-#define N_SYMSIZE(a)	((a).a_syms)</div><div class='del'>-</div><div class='del'>-#endif				/* __BFIN_A_OUT_H__ */</div><div class='head'>diff --git a/arch/blackfin/include/asm/bfin-global.h b/arch/blackfin/include/asm/bfin-global.h<br/>index 7ba70de66f2b..56dcb0a2d244 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/include/asm/bfin-global.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/include/asm/bfin-global.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/include/asm/bfin-global.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/include/asm/bfin-global.h</a></div><div class='hunk'>@@ -63,7 +63,6 @@ extern void bfin_dcache_init(void);</div><div class='ctx'> extern void init_exception_vectors(void);</div><div class='ctx'> extern void program_IAR(void);</div><div class='ctx'> </div><div class='del'>-extern void bfin_reset(void);</div><div class='ctx'> extern asmlinkage void lower_to_irq14(void);</div><div class='ctx'> extern asmlinkage void bfin_return_from_exception(void);</div><div class='ctx'> extern asmlinkage void evt14_softirq(void);</div><div class='hunk'>@@ -92,6 +91,8 @@ extern int sram_free(const void*);</div><div class='ctx'> extern void *sram_alloc_with_lsl(size_t, unsigned long);</div><div class='ctx'> extern int sram_free_with_lsl(const void*);</div><div class='ctx'> </div><div class='add'>+extern void *isram_memcpy(void *dest, const void *src, size_t n);</div><div class='add'>+</div><div class='ctx'> extern const char bfin_board_name[];</div><div class='ctx'> </div><div class='ctx'> extern unsigned long bfin_sic_iwr[];</div><div class='hunk'>@@ -104,7 +105,7 @@ extern char _stext_l1[], _etext_l1[], _sdata_l1[], _edata_l1[], _sbss_l1[],</div><div class='ctx'> 	_stext_l2[], _etext_l2[], _sdata_l2[], _edata_l2[], _sbss_l2[],</div><div class='ctx'> 	_ebss_l2[], _l2_lma_start[];</div><div class='ctx'> </div><div class='del'>-/* only used when CONFIG_MTD_UCLINUX */</div><div class='add'>+/* only used when MTD_UCLINUX */</div><div class='ctx'> extern unsigned long memory_mtd_start, memory_mtd_end, mtd_size;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_BFIN_ICACHE_LOCK</div><div class='head'>diff --git a/arch/blackfin/include/asm/bfrom.h b/arch/blackfin/include/asm/bfrom.h<br/>new file mode 100644<br/>index 000000000000..cfe8024c3b2f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/include/asm/bfrom.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/include/asm/bfrom.h</a></div><div class='hunk'>@@ -0,0 +1,85 @@</div><div class='add'>+/* Blackfin on-chip ROM API</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2008 Analog Devices Inc.</div><div class='add'>+ *</div><div class='add'>+ * Licensed under the GPL-2 or later.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __BFROM_H__</div><div class='add'>+#define __BFROM_H__</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+/* Possible syscontrol action flags */</div><div class='add'>+#define SYSCTRL_READ        0x00000000    /* read registers */</div><div class='add'>+#define SYSCTRL_WRITE       0x00000001    /* write registers */</div><div class='add'>+#define SYSCTRL_SYSRESET    0x00000002    /* perform system reset */</div><div class='add'>+#define SYSCTRL_CORERESET   0x00000004    /* perform core reset */</div><div class='add'>+#define SYSCTRL_SOFTRESET   0x00000006    /* perform core and system reset */</div><div class='add'>+#define SYSCTRL_VRCTL       0x00000010    /* read/write VR_CTL register */</div><div class='add'>+#define SYSCTRL_EXTVOLTAGE  0x00000020    /* VDDINT supplied externally */</div><div class='add'>+#define SYSCTRL_INTVOLTAGE  0x00000000    /* VDDINT generated by on-chip regulator */</div><div class='add'>+#define SYSCTRL_OTPVOLTAGE  0x00000040    /* For Factory Purposes Only */</div><div class='add'>+#define SYSCTRL_PLLCTL      0x00000100    /* read/write PLL_CTL register */</div><div class='add'>+#define SYSCTRL_PLLDIV      0x00000200    /* read/write PLL_DIV register */</div><div class='add'>+#define SYSCTRL_LOCKCNT     0x00000400    /* read/write PLL_LOCKCNT register */</div><div class='add'>+#define SYSCTRL_PLLSTAT     0x00000800    /* read/write PLL_STAT register */</div><div class='add'>+</div><div class='add'>+typedef struct ADI_SYSCTRL_VALUES {</div><div class='add'>+	uint16_t uwVrCtl;</div><div class='add'>+	uint16_t uwPllCtl;</div><div class='add'>+	uint16_t uwPllDiv;</div><div class='add'>+	uint16_t uwPllLockCnt;</div><div class='add'>+	uint16_t uwPllStat;</div><div class='add'>+} ADI_SYSCTRL_VALUES;</div><div class='add'>+</div><div class='add'>+static uint32_t (* const bfrom_SysControl)(uint32_t action_flags, ADI_SYSCTRL_VALUES *power_settings, void *reserved) = (void *)0xEF000038;</div><div class='add'>+</div><div class='add'>+/* We need a dedicated function since we need to screw with the stack pointer</div><div class='add'>+ * when resetting.  The on-chip ROM will save/restore registers on the stack</div><div class='add'>+ * when doing a system reset, so the stack cannot be outside of the chip.</div><div class='add'>+ */</div><div class='add'>+__attribute__((__noreturn__))</div><div class='add'>+static inline void bfrom_SoftReset(void *new_stack)</div><div class='add'>+{</div><div class='add'>+	while (1)</div><div class='add'>+		__asm__ __volatile__(</div><div class='add'>+			"sp = %[stack];"</div><div class='add'>+			"jump (%[bfrom_syscontrol]);"</div><div class='add'>+			: : [bfrom_syscontrol] "p"(bfrom_SysControl),</div><div class='add'>+				"q0"(SYSCTRL_SOFTRESET),</div><div class='add'>+				"q1"(0),</div><div class='add'>+				"q2"(NULL),</div><div class='add'>+				[stack] "p"(new_stack)</div><div class='add'>+		);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* OTP Functions */</div><div class='add'>+static uint32_t (* const bfrom_OtpCommand)(uint32_t command, uint32_t value) = (void *)0xEF000018;</div><div class='add'>+static uint32_t (* const bfrom_OtpRead)(uint32_t page, uint32_t flags, uint64_t *page_content) = (void *)0xEF00001A;</div><div class='add'>+static uint32_t (* const bfrom_OtpWrite)(uint32_t page, uint32_t flags, uint64_t *page_content) = (void *)0xEF00001C;</div><div class='add'>+</div><div class='add'>+/* otp command: defines for "command" */</div><div class='add'>+#define OTP_INIT                 0x00000001</div><div class='add'>+#define OTP_CLOSE                0x00000002</div><div class='add'>+</div><div class='add'>+/* otp read/write: defines for "flags" */</div><div class='add'>+#define OTP_LOWER_HALF           0x00000000 /* select upper/lower 64-bit half (bit 0) */</div><div class='add'>+#define OTP_UPPER_HALF           0x00000001</div><div class='add'>+#define OTP_NO_ECC               0x00000010 /* do not use ECC */</div><div class='add'>+#define OTP_LOCK                 0x00000020 /* sets page protection bit for page */</div><div class='add'>+#define OTP_CHECK_FOR_PREV_WRITE 0x00000080</div><div class='add'>+</div><div class='add'>+/* Return values for all functions */</div><div class='add'>+#define OTP_SUCCESS          0x00000000</div><div class='add'>+#define OTP_MASTER_ERROR     0x001</div><div class='add'>+#define OTP_WRITE_ERROR      0x003</div><div class='add'>+#define OTP_READ_ERROR       0x005</div><div class='add'>+#define OTP_ACC_VIO_ERROR    0x009</div><div class='add'>+#define OTP_DATA_MULT_ERROR  0x011</div><div class='add'>+#define OTP_ECC_MULT_ERROR   0x021</div><div class='add'>+#define OTP_PREV_WR_ERROR    0x041</div><div class='add'>+#define OTP_DATA_SB_WARN     0x100</div><div class='add'>+#define OTP_ECC_SB_WARN      0x200</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/blackfin/include/asm/cacheflush.h b/arch/blackfin/include/asm/cacheflush.h<br/>index d81a77545a04..4403415583fa 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/include/asm/cacheflush.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/include/asm/cacheflush.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/include/asm/cacheflush.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/include/asm/cacheflush.h</a></div><div class='hunk'>@@ -30,13 +30,11 @@</div><div class='ctx'> #ifndef _BLACKFIN_CACHEFLUSH_H</div><div class='ctx'> #define _BLACKFIN_CACHEFLUSH_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/cplb.h&gt;</div><div class='del'>-</div><div class='del'>-extern void blackfin_icache_dcache_flush_range(unsigned int, unsigned int);</div><div class='del'>-extern void blackfin_icache_flush_range(unsigned int, unsigned int);</div><div class='del'>-extern void blackfin_dcache_flush_range(unsigned int, unsigned int);</div><div class='del'>-extern void blackfin_dcache_invalidate_range(unsigned int, unsigned int);</div><div class='del'>-extern void blackfin_dflush_page(void *);</div><div class='add'>+extern void blackfin_icache_dcache_flush_range(unsigned long start_address, unsigned long end_address);</div><div class='add'>+extern void blackfin_icache_flush_range(unsigned long start_address, unsigned long end_address);</div><div class='add'>+extern void blackfin_dcache_flush_range(unsigned long start_address, unsigned long end_address);</div><div class='add'>+extern void blackfin_dcache_invalidate_range(unsigned long start_address, unsigned long end_address);</div><div class='add'>+extern void blackfin_dflush_page(void *page);</div><div class='ctx'> </div><div class='ctx'> #define flush_dcache_mmap_lock(mapping)		do { } while (0)</div><div class='ctx'> #define flush_dcache_mmap_unlock(mapping)	do { } while (0)</div><div class='hunk'>@@ -87,4 +85,21 @@ do { memcpy(dst, src, len); \</div><div class='ctx'> # define flush_dcache_page(page)			do { } while (0)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+extern unsigned long reserved_mem_dcache_on;</div><div class='add'>+extern unsigned long reserved_mem_icache_on;</div><div class='add'>+</div><div class='add'>+static inline int bfin_addr_dcachable(unsigned long addr)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_BFIN_DCACHE</div><div class='add'>+	if (addr &lt; (_ramend - DMA_UNCACHED_REGION))</div><div class='add'>+		return 1;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	if (reserved_mem_dcache_on &amp;&amp;</div><div class='add'>+		addr &gt;= _ramend &amp;&amp; addr &lt; physical_mem_end)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif				/* _BLACKFIN_ICACHEFLUSH_H */</div><div class='head'>diff --git a/arch/blackfin/include/asm/cplb.h b/arch/blackfin/include/asm/cplb.h<br/>index 05d6f05fb748..9e8b4035fcec 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/include/asm/cplb.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/include/asm/cplb.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/include/asm/cplb.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/include/asm/cplb.h</a></div><div class='hunk'>@@ -55,7 +55,13 @@</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #define L1_DMEMORY       (CPLB_LOCK | CPLB_COMMON)</div><div class='del'>-#define L2_MEMORY        (CPLB_COMMON)</div><div class='add'>+#ifdef CONFIG_BFIN_L2_CACHEABLE</div><div class='add'>+#define L2_IMEMORY        (SDRAM_IGENERIC)</div><div class='add'>+#define L2_DMEMORY        (SDRAM_DGENERIC)</div><div class='add'>+#else</div><div class='add'>+#define L2_IMEMORY        (CPLB_COMMON)</div><div class='add'>+#define L2_DMEMORY        (CPLB_COMMON)</div><div class='add'>+#endif</div><div class='ctx'> #define SDRAM_DNON_CHBL  (CPLB_COMMON)</div><div class='ctx'> #define SDRAM_EBIU       (CPLB_COMMON)</div><div class='ctx'> #define SDRAM_OOPS       (CPLB_VALID | ANOMALY_05000158_WORKAROUND | CPLB_LOCK | CPLB_DIRTY)</div><div class='head'>diff --git a/arch/blackfin/include/asm/cplbinit.h b/arch/blackfin/include/asm/cplbinit.h<br/>index 0eb1c1b685a7..f845b41147ba 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/include/asm/cplbinit.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/include/asm/cplbinit.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/include/asm/cplbinit.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/include/asm/cplbinit.h</a></div><div class='hunk'>@@ -87,9 +87,6 @@ extern u_long dpdt_swapcount_table[];</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_MPU */</div><div class='ctx'> </div><div class='del'>-extern unsigned long reserved_mem_dcache_on;</div><div class='del'>-extern unsigned long reserved_mem_icache_on;</div><div class='del'>-</div><div class='del'>-extern void generate_cpl_tables(void);</div><div class='add'>+extern void generate_cplb_tables(void);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/blackfin/include/asm/cpumask.h b/arch/blackfin/include/asm/cpumask.h<br/>deleted file mode 100644<br/>index b20a8e9012cb..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/include/asm/cpumask.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/include/asm/cpumask.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,6 +0,0 @@</div><div class='del'>-#ifndef _ASM_BLACKFIN_CPUMASK_H</div><div class='del'>-#define _ASM_BLACKFIN_CPUMASK_H</div><div class='del'>-</div><div class='del'>-#include &lt;asm-generic/cpumask.h&gt;</div><div class='del'>-</div><div class='del'>-#endif				/* _ASM_BLACKFIN_CPUMASK_H */</div><div class='head'>diff --git a/arch/blackfin/include/asm/dma-mapping.h b/arch/blackfin/include/asm/dma-mapping.h<br/>index 1a13c2fc3667..ede748d67efd 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/include/asm/dma-mapping.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/include/asm/dma-mapping.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/include/asm/dma-mapping.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/include/asm/dma-mapping.h</a></div><div class='hunk'>@@ -80,4 +80,15 @@ extern int dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,</div><div class='ctx'> extern void dma_unmap_sg(struct device *dev, struct scatterlist *sg,</div><div class='ctx'> 		      int nhwentries, enum dma_data_direction direction);</div><div class='ctx'> </div><div class='add'>+static inline void dma_sync_single_for_cpu(struct device *dev,</div><div class='add'>+					dma_addr_t handle, size_t size,</div><div class='add'>+					enum dma_data_direction dir)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void dma_sync_single_for_device(struct device *dev,</div><div class='add'>+					dma_addr_t handle, size_t size,</div><div class='add'>+					enum dma_data_direction dir)</div><div class='add'>+{</div><div class='add'>+}</div><div class='ctx'> #endif				/* _BLACKFIN_DMA_MAPPING_H */</div><div class='head'>diff --git a/arch/blackfin/include/asm/elf.h b/arch/blackfin/include/asm/elf.h<br/>index 67a03a8a353e..cdbfcfc30f6a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/include/asm/elf.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/include/asm/elf.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/include/asm/elf.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/include/asm/elf.h</a></div><div class='hunk'>@@ -122,6 +122,6 @@ do {											\</div><div class='ctx'> </div><div class='ctx'> #define ELF_PLATFORM  (NULL)</div><div class='ctx'> </div><div class='del'>-#define SET_PERSONALITY(ex, ibcs2) set_personality((ibcs2)?PER_SVR4:PER_LINUX)</div><div class='add'>+#define SET_PERSONALITY(ex) set_personality(PER_LINUX)</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/blackfin/include/asm/io.h b/arch/blackfin/include/asm/io.h<br/>index cbbf7ffdbbff..7dc77a21fdf3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/include/asm/io.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/include/asm/io.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/include/asm/io.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/include/asm/io.h</a></div><div class='hunk'>@@ -134,6 +134,36 @@ extern void dma_insb(unsigned long port, void *addr, unsigned short count);</div><div class='ctx'> extern void dma_insw(unsigned long port, void *addr, unsigned short count);</div><div class='ctx'> extern void dma_insl(unsigned long port, void *addr, unsigned short count);</div><div class='ctx'> </div><div class='add'>+static inline void readsl(const void __iomem *addr, void *buf, int len)</div><div class='add'>+{</div><div class='add'>+	insl((unsigned long)addr, buf, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void readsw(const void __iomem *addr, void *buf, int len)</div><div class='add'>+{</div><div class='add'>+	insw((unsigned long)addr, buf, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void readsb(const void __iomem *addr, void *buf, int len)</div><div class='add'>+{</div><div class='add'>+	insb((unsigned long)addr, buf, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void writesl(const void __iomem *addr, const void *buf, int len)</div><div class='add'>+{</div><div class='add'>+	outsl((unsigned long)addr, buf, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void writesw(const void __iomem *addr, const void *buf, int len)</div><div class='add'>+{</div><div class='add'>+	outsw((unsigned long)addr, buf, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void writesb(const void __iomem *addr, const void *buf, int len)</div><div class='add'>+{</div><div class='add'>+	outsb((unsigned long)addr, buf, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Map some physical address range into the kernel address space.</div><div class='ctx'>  */</div><div class='head'>diff --git a/arch/blackfin/include/asm/kgdb.h b/arch/blackfin/include/asm/kgdb.h<br/>index 0f73847fd6bc..26ebac6646d8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/include/asm/kgdb.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/include/asm/kgdb.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/include/asm/kgdb.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/include/asm/kgdb.h</a></div><div class='hunk'>@@ -124,9 +124,16 @@ enum regnames {</div><div class='ctx'> /* Number of bytes of registers.  */</div><div class='ctx'> #define NUMREGBYTES BFIN_NUM_REGS*4</div><div class='ctx'> </div><div class='del'>-#define BREAKPOINT() asm("   EXCPT 2;");</div><div class='del'>-#define BREAK_INSTR_SIZE       2</div><div class='del'>-#define HW_BREAKPOINT_NUM		6</div><div class='add'>+static inline void arch_kgdb_breakpoint(void)</div><div class='add'>+{</div><div class='add'>+	asm("   EXCPT 2;");</div><div class='add'>+}</div><div class='add'>+#define BREAK_INSTR_SIZE	2</div><div class='add'>+#define CACHE_FLUSH_IS_SAFE	1</div><div class='add'>+#define HW_INST_WATCHPOINT_NUM	6</div><div class='add'>+#define HW_WATCHPOINT_NUM	8</div><div class='add'>+#define TYPE_INST_WATCHPOINT	0</div><div class='add'>+#define TYPE_DATA_WATCHPOINT	1</div><div class='ctx'> </div><div class='ctx'> /* Instruction watchpoint address control register bits mask */</div><div class='ctx'> #define WPPWR		0x1</div><div class='hunk'>@@ -163,10 +170,11 @@ enum regnames {</div><div class='ctx'> #define WPDAEN1		0x8</div><div class='ctx'> #define WPDCNTEN0	0x10</div><div class='ctx'> #define WPDCNTEN1	0x20</div><div class='add'>+</div><div class='ctx'> #define WPDSRC0		0xc0</div><div class='del'>-#define WPDACC0		0x300</div><div class='add'>+#define WPDACC0_OFFSET	8</div><div class='ctx'> #define WPDSRC1		0xc00</div><div class='del'>-#define WPDACC1		0x3000</div><div class='add'>+#define WPDACC1_OFFSET	12</div><div class='ctx'> </div><div class='ctx'> /* Watchpoint status register bits mask */</div><div class='ctx'> #define STATIA0		0x1</div><div class='hunk'>@@ -178,7 +186,4 @@ enum regnames {</div><div class='ctx'> #define STATDA0		0x40</div><div class='ctx'> #define STATDA1		0x80</div><div class='ctx'> </div><div class='del'>-extern void kgdb_print(const char *fmt, ...);</div><div class='del'>-extern void init_kgdb_uart(void);</div><div class='del'>-</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/blackfin/include/asm/mmu_context.h b/arch/blackfin/include/asm/mmu_context.h<br/>index 8529552a981f..35593dda2a4d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/include/asm/mmu_context.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/include/asm/mmu_context.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/include/asm/mmu_context.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/include/asm/mmu_context.h</a></div><div class='hunk'>@@ -45,49 +45,12 @@ extern unsigned long l1_stack_len;</div><div class='ctx'> extern int l1sram_free(const void*);</div><div class='ctx'> extern void *l1sram_alloc_max(void*);</div><div class='ctx'> </div><div class='del'>-static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Called when creating a new context during fork() or execve().  */</div><div class='del'>-static inline int</div><div class='del'>-init_new_context(struct task_struct *tsk, struct mm_struct *mm)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_MPU</div><div class='del'>-	unsigned long p = __get_free_pages(GFP_KERNEL, page_mask_order);</div><div class='del'>-	mm-&gt;context.page_rwx_mask = (unsigned long *)p;</div><div class='del'>-	memset(mm-&gt;context.page_rwx_mask, 0,</div><div class='del'>-	       page_mask_nelts * 3 * sizeof(long));</div><div class='del'>-#endif</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline void free_l1stack(void)</div><div class='ctx'> {</div><div class='ctx'> 	nr_l1stack_tasks--;</div><div class='ctx'> 	if (nr_l1stack_tasks == 0)</div><div class='ctx'> 		l1sram_free(l1_stack_base);</div><div class='ctx'> }</div><div class='del'>-static inline void destroy_context(struct mm_struct *mm)</div><div class='del'>-{</div><div class='del'>-	struct sram_list_struct *tmp;</div><div class='del'>-</div><div class='del'>-	if (current_l1_stack_save == mm-&gt;context.l1_stack_save)</div><div class='del'>-		current_l1_stack_save = NULL;</div><div class='del'>-	if (mm-&gt;context.l1_stack_save)</div><div class='del'>-		free_l1stack();</div><div class='del'>-</div><div class='del'>-	while ((tmp = mm-&gt;context.sram_list)) {</div><div class='del'>-		mm-&gt;context.sram_list = tmp-&gt;next;</div><div class='del'>-		sram_free(tmp-&gt;addr);</div><div class='del'>-		kfree(tmp);</div><div class='del'>-	}</div><div class='del'>-#ifdef CONFIG_MPU</div><div class='del'>-	if (current_rwx_mask == mm-&gt;context.page_rwx_mask)</div><div class='del'>-		current_rwx_mask = NULL;</div><div class='del'>-	free_pages((unsigned long)mm-&gt;context.page_rwx_mask, page_mask_order);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='ctx'> </div><div class='ctx'> static inline unsigned long</div><div class='ctx'> alloc_l1stack(unsigned long length, unsigned long *stack_base)</div><div class='hunk'>@@ -134,6 +97,7 @@ static inline void switch_mm(struct mm_struct *prev_mm, struct mm_struct *next_m</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_APP_STACK_L1</div><div class='ctx'> 	/* L1 stack switching.  */</div><div class='ctx'> 	if (!next_mm-&gt;context.l1_stack_save)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -144,6 +108,7 @@ static inline void switch_mm(struct mm_struct *prev_mm, struct mm_struct *next_m</div><div class='ctx'> 	}</div><div class='ctx'> 	current_l1_stack_save = next_mm-&gt;context.l1_stack_save;</div><div class='ctx'> 	memcpy(l1_stack_base, current_l1_stack_save, l1_stack_len);</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MPU</div><div class='hunk'>@@ -180,4 +145,44 @@ static inline void update_protections(struct mm_struct *mm)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Called when creating a new context during fork() or execve().  */</div><div class='add'>+static inline int</div><div class='add'>+init_new_context(struct task_struct *tsk, struct mm_struct *mm)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_MPU</div><div class='add'>+	unsigned long p = __get_free_pages(GFP_KERNEL, page_mask_order);</div><div class='add'>+	mm-&gt;context.page_rwx_mask = (unsigned long *)p;</div><div class='add'>+	memset(mm-&gt;context.page_rwx_mask, 0,</div><div class='add'>+	       page_mask_nelts * 3 * sizeof(long));</div><div class='add'>+#endif</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void destroy_context(struct mm_struct *mm)</div><div class='add'>+{</div><div class='add'>+	struct sram_list_struct *tmp;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_APP_STACK_L1</div><div class='add'>+	if (current_l1_stack_save == mm-&gt;context.l1_stack_save)</div><div class='add'>+		current_l1_stack_save = 0;</div><div class='add'>+	if (mm-&gt;context.l1_stack_save)</div><div class='add'>+		free_l1stack();</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	while ((tmp = mm-&gt;context.sram_list)) {</div><div class='add'>+		mm-&gt;context.sram_list = tmp-&gt;next;</div><div class='add'>+		sram_free(tmp-&gt;addr);</div><div class='add'>+		kfree(tmp);</div><div class='add'>+	}</div><div class='add'>+#ifdef CONFIG_MPU</div><div class='add'>+	if (current_rwx_mask == mm-&gt;context.page_rwx_mask)</div><div class='add'>+		current_rwx_mask = NULL;</div><div class='add'>+	free_pages((unsigned long)mm-&gt;context.page_rwx_mask, page_mask_order);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/blackfin/include/asm/processor.h b/arch/blackfin/include/asm/processor.h<br/>index 6f3995b119d8..e3e9b41fa8db 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/include/asm/processor.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/include/asm/processor.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/include/asm/processor.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/include/asm/processor.h</a></div><div class='hunk'>@@ -134,6 +134,12 @@ static inline uint32_t __pure bfin_revid(void)</div><div class='ctx'> 	return revid;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline uint16_t __pure bfin_cpuid(void)</div><div class='add'>+{</div><div class='add'>+	return (bfin_read_CHIPID() &amp; CHIPID_FAMILY) &gt;&gt; 12;</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline uint32_t __pure bfin_compiled_revid(void)</div><div class='ctx'> {</div><div class='ctx'> #if defined(CONFIG_BF_REV_0_0)</div><div class='head'>diff --git a/arch/blackfin/include/asm/ptrace.h b/arch/blackfin/include/asm/ptrace.h<br/>index a45a80e54adc..e3f086dc7268 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/include/asm/ptrace.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/include/asm/ptrace.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/include/asm/ptrace.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/include/asm/ptrace.h</a></div><div class='hunk'>@@ -158,6 +158,8 @@ extern void show_regs(struct pt_regs *);</div><div class='ctx'> #define PT_SEQSTAT 8</div><div class='ctx'> #define PT_IPEND 4</div><div class='ctx'> </div><div class='add'>+#define PT_ORIG_R0 208</div><div class='add'>+#define PT_ORIG_P0 212</div><div class='ctx'> #define PT_SYSCFG 216</div><div class='ctx'> #define PT_TEXT_ADDR 220</div><div class='ctx'> #define PT_TEXT_END_ADDR 224</div><div class='head'>diff --git a/arch/blackfin/include/asm/timex.h b/arch/blackfin/include/asm/timex.h<br/>index 22b0806161bb..248aeb066805 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/include/asm/timex.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/include/asm/timex.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/include/asm/timex.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/include/asm/timex.h</a></div><div class='hunk'>@@ -16,7 +16,7 @@ typedef unsigned long long cycles_t;</div><div class='ctx'> static inline cycles_t get_cycles(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long tmp, tmp2;</div><div class='del'>-	__asm__("%0 = cycles; %1 = cycles2;" : "=d"(tmp), "=d"(tmp2));</div><div class='add'>+	__asm__ __volatile__("%0 = cycles; %1 = cycles2;" : "=d"(tmp), "=d"(tmp2));</div><div class='ctx'> 	return tmp | ((cycles_t)tmp2 &lt;&lt; 32);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/blackfin/include/asm/traps.h b/arch/blackfin/include/asm/traps.h<br/>index f0e5f940d9ca..34f7295fb070 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/include/asm/traps.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/include/asm/traps.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/include/asm/traps.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/include/asm/traps.h</a></div><div class='hunk'>@@ -59,6 +59,9 @@</div><div class='ctx'> 	level "   or a 16-bit register is accessed with a 32-bit instruction.\n"</div><div class='ctx'> #define HWC_x3(level) \</div><div class='ctx'> 	"External Memory Addressing Error\n"</div><div class='add'>+#define EXC_0x04(level) \</div><div class='add'>+	"Unimplmented exception occured\n" \</div><div class='add'>+	level " - Maybe you forgot to install a custom exception handler?\n"</div><div class='ctx'> #define HWC_x12(level) \</div><div class='ctx'> 	"Performance Monitor Overflow\n"</div><div class='ctx'> #define HWC_x18(level) \</div><div class='hunk'>@@ -84,7 +87,7 @@</div><div class='ctx'> 	level "   a particular processor implementation.\n"</div><div class='ctx'> #define EXC_0x22(level) \</div><div class='ctx'> 	"Illegal instruction combination\n" \</div><div class='del'>-	level " - See section for multi-issue rules in the ADSP-BF53x Blackfin\n" \</div><div class='add'>+	level " - See section for multi-issue rules in the Blackfin\n" \</div><div class='ctx'> 	level "   Processor Instruction Set Reference.\n"</div><div class='ctx'> #define EXC_0x23(level) \</div><div class='ctx'> 	"Data access CPLB protection violation\n" \</div><div class='head'>diff --git a/arch/blackfin/kernel/asm-offsets.c b/arch/blackfin/kernel/asm-offsets.c<br/>index 881afe9082c7..9bb85dd5ccb3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/kernel/asm-offsets.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/kernel/asm-offsets.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/kernel/asm-offsets.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/kernel/asm-offsets.c</a></div><div class='hunk'>@@ -60,6 +60,7 @@ int main(void)</div><div class='ctx'> 	DEFINE(KERNEL_STACK_SIZE, THREAD_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	/* offsets into the pt_regs */</div><div class='add'>+	DEFINE(PT_ORIG_R0, offsetof(struct pt_regs, orig_r0));</div><div class='ctx'> 	DEFINE(PT_ORIG_P0, offsetof(struct pt_regs, orig_p0));</div><div class='ctx'> 	DEFINE(PT_ORIG_PC, offsetof(struct pt_regs, orig_pc));</div><div class='ctx'> 	DEFINE(PT_R0, offsetof(struct pt_regs, r0));</div><div class='head'>diff --git a/arch/blackfin/kernel/bfin_dma_5xx.c b/arch/blackfin/kernel/bfin_dma_5xx.c<br/>index 93229b3d6e3e..339293d677cc 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/kernel/bfin_dma_5xx.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/kernel/bfin_dma_5xx.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/kernel/bfin_dma_5xx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/kernel/bfin_dma_5xx.c</a></div><div class='hunk'>@@ -117,15 +117,14 @@ int request_dma(unsigned int channel, char *device_id)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_BF54x</div><div class='ctx'> 	if (channel &gt;= CH_UART2_RX &amp;&amp; channel &lt;= CH_UART3_TX) {</div><div class='del'>-		if (strncmp(device_id, "BFIN_UART", 9) == 0) {</div><div class='del'>-			dma_ch[channel].regs-&gt;peripheral_map &amp;= 0x0FFF;</div><div class='del'>-			dma_ch[channel].regs-&gt;peripheral_map |=</div><div class='add'>+		unsigned int per_map;</div><div class='add'>+		per_map = dma_ch[channel].regs-&gt;peripheral_map &amp; 0xFFF;</div><div class='add'>+		if (strncmp(device_id, "BFIN_UART", 9) == 0)</div><div class='add'>+			dma_ch[channel].regs-&gt;peripheral_map = per_map |</div><div class='ctx'> 				((channel - CH_UART2_RX + 0xC)&lt;&lt;12);</div><div class='del'>-		} else {</div><div class='del'>-			dma_ch[channel].regs-&gt;peripheral_map &amp;= 0x0FFF;</div><div class='del'>-			dma_ch[channel].regs-&gt;peripheral_map |=</div><div class='add'>+		else</div><div class='add'>+			dma_ch[channel].regs-&gt;peripheral_map = per_map |</div><div class='ctx'> 				((channel - CH_UART2_RX + 0x6)&lt;&lt;12);</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/arch/blackfin/kernel/bfin_gpio.c b/arch/blackfin/kernel/bfin_gpio.c<br/>index ecbd141e0ef2..6e08f425bb44 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/kernel/bfin_gpio.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/kernel/bfin_gpio.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/kernel/bfin_gpio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/kernel/bfin_gpio.c</a></div><div class='hunk'>@@ -231,14 +231,14 @@ inline int check_gpio(unsigned gpio)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-void gpio_error(unsigned gpio)</div><div class='add'>+static void gpio_error(unsigned gpio)</div><div class='ctx'> {</div><div class='ctx'> 	printk(KERN_ERR "bfin-gpio: GPIO %d wasn't requested!\n", gpio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void set_label(unsigned short ident, const char *label)</div><div class='ctx'> {</div><div class='del'>-	if (label &amp;&amp; str_ident) {</div><div class='add'>+	if (label) {</div><div class='ctx'> 		strncpy(str_ident[ident].name, label,</div><div class='ctx'> 			 RESOURCE_LABEL_SIZE);</div><div class='ctx'> 		str_ident[ident].name[RESOURCE_LABEL_SIZE - 1] = 0;</div><div class='hunk'>@@ -247,9 +247,6 @@ static void set_label(unsigned short ident, const char *label)</div><div class='ctx'> </div><div class='ctx'> static char *get_label(unsigned short ident)</div><div class='ctx'> {</div><div class='del'>-	if (!str_ident)</div><div class='del'>-		return "UNKNOWN";</div><div class='del'>-</div><div class='ctx'> 	return (*str_ident[ident].name ? str_ident[ident].name : "UNKNOWN");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -260,7 +257,7 @@ static int cmp_label(unsigned short ident, const char *label)</div><div class='ctx'> 		printk(KERN_ERR "Please provide none-null label\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (label &amp;&amp; str_ident)</div><div class='add'>+	if (label)</div><div class='ctx'> 		return strncmp(str_ident[ident].name,</div><div class='ctx'> 				 label, strlen(label));</div><div class='ctx'> 	else</div><div class='head'>diff --git a/arch/blackfin/kernel/cplb-mpu/cplbinit.c b/arch/blackfin/kernel/cplb-mpu/cplbinit.c<br/>index 48060105346a..55af729f8495 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/kernel/cplb-mpu/cplbinit.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/kernel/cplb-mpu/cplbinit.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/kernel/cplb-mpu/cplbinit.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/kernel/cplb-mpu/cplbinit.c</a></div><div class='hunk'>@@ -36,7 +36,7 @@ struct cplb_entry dcplb_tbl[MAX_CPLBS];</div><div class='ctx'> int first_switched_icplb, first_switched_dcplb;</div><div class='ctx'> int first_mask_dcplb;</div><div class='ctx'> </div><div class='del'>-void __init generate_cpl_tables(void)</div><div class='add'>+void __init generate_cplb_tables(void)</div><div class='ctx'> {</div><div class='ctx'> 	int i_d, i_i;</div><div class='ctx'> 	unsigned long addr;</div><div class='hunk'>@@ -83,8 +83,18 @@ void __init generate_cpl_tables(void)</div><div class='ctx'> 	dcplb_tbl[i_d].addr = L1_DATA_A_START;</div><div class='ctx'> 	dcplb_tbl[i_d++].data = L1_DMEMORY | PAGE_SIZE_4MB;</div><div class='ctx'> #endif</div><div class='add'>+#if L1_CODE_LENGTH &gt; 0</div><div class='ctx'> 	icplb_tbl[i_i].addr = L1_CODE_START;</div><div class='ctx'> 	icplb_tbl[i_i++].data = L1_IMEMORY | PAGE_SIZE_4MB;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* Cover L2 memory */</div><div class='add'>+#if L2_LENGTH &gt; 0</div><div class='add'>+	dcplb_tbl[i_d].addr = L2_START;</div><div class='add'>+	dcplb_tbl[i_d++].data = L2_DMEMORY | PAGE_SIZE_1MB;</div><div class='add'>+	icplb_tbl[i_i].addr = L2_START;</div><div class='add'>+	icplb_tbl[i_i++].data = L2_IMEMORY | PAGE_SIZE_1MB;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	first_mask_dcplb = i_d;</div><div class='ctx'> 	first_switched_dcplb = i_d + (1 &lt;&lt; page_mask_order);</div><div class='head'>diff --git a/arch/blackfin/kernel/cplb-mpu/cplbmgr.c b/arch/blackfin/kernel/cplb-mpu/cplbmgr.c<br/>index 99f2831e2964..baa52e261f0d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/kernel/cplb-mpu/cplbmgr.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/kernel/cplb-mpu/cplbmgr.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/kernel/cplb-mpu/cplbmgr.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/kernel/cplb-mpu/cplbmgr.c</a></div><div class='hunk'>@@ -21,6 +21,7 @@</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/blackfin.h&gt;</div><div class='add'>+#include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #include &lt;asm/cplbinit.h&gt;</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -144,9 +145,7 @@ static noinline int dcplb_miss(void)</div><div class='ctx'> </div><div class='ctx'> 	d_data = CPLB_SUPV_WR | CPLB_VALID | CPLB_DIRTY | PAGE_SIZE_4KB;</div><div class='ctx'> #ifdef CONFIG_BFIN_DCACHE</div><div class='del'>-	if (addr &lt; _ramend - DMA_UNCACHED_REGION ||</div><div class='del'>-	    (reserved_mem_dcache_on &amp;&amp; addr &gt;= _ramend &amp;&amp;</div><div class='del'>-	     addr &lt; physical_mem_end)) {</div><div class='add'>+	if (bfin_addr_dcachable(addr)) {</div><div class='ctx'> 		d_data |= CPLB_L1_CHBL | ANOMALY_05000158_WORKAROUND;</div><div class='ctx'> #ifdef CONFIG_BFIN_WT</div><div class='ctx'> 		d_data |= CPLB_L1_AOW | CPLB_WT;</div><div class='hunk'>@@ -322,9 +321,11 @@ int cplb_hdr(int seqstat, struct pt_regs *regs)</div><div class='ctx'> void flush_switched_cplbs(void)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	nr_cplb_flush++;</div><div class='ctx'> </div><div class='add'>+	local_irq_save(flags);</div><div class='ctx'> 	disable_icplb();</div><div class='ctx'> 	for (i = first_switched_icplb; i &lt; MAX_CPLBS; i++) {</div><div class='ctx'> 		icplb_tbl[i].data = 0;</div><div class='hunk'>@@ -338,6 +339,8 @@ void flush_switched_cplbs(void)</div><div class='ctx'> 		bfin_write32(DCPLB_DATA0 + i * 4, 0);</div><div class='ctx'> 	}</div><div class='ctx'> 	enable_dcplb();</div><div class='add'>+	local_irq_restore(flags);</div><div class='add'>+</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void set_mask_dcplbs(unsigned long *masks)</div><div class='hunk'>@@ -345,10 +348,15 @@ void set_mask_dcplbs(unsigned long *masks)</div><div class='ctx'> 	int i;</div><div class='ctx'> 	unsigned long addr = (unsigned long)masks;</div><div class='ctx'> 	unsigned long d_data;</div><div class='del'>-	current_rwx_mask = masks;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	if (!masks)</div><div class='add'>+	if (!masks) {</div><div class='add'>+		current_rwx_mask = masks;</div><div class='ctx'> 		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	local_irq_save(flags);</div><div class='add'>+	current_rwx_mask = masks;</div><div class='ctx'> </div><div class='ctx'> 	d_data = CPLB_SUPV_WR | CPLB_VALID | CPLB_DIRTY | PAGE_SIZE_4KB;</div><div class='ctx'> #ifdef CONFIG_BFIN_DCACHE</div><div class='hunk'>@@ -367,4 +375,5 @@ void set_mask_dcplbs(unsigned long *masks)</div><div class='ctx'> 		addr += PAGE_SIZE;</div><div class='ctx'> 	}</div><div class='ctx'> 	enable_dcplb();</div><div class='add'>+	local_irq_restore(flags);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/blackfin/kernel/cplb-nompu/cplbinit.c b/arch/blackfin/kernel/cplb-nompu/cplbinit.c<br/>index 728f708d3981..512f8c92ead5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/kernel/cplb-nompu/cplbinit.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/kernel/cplb-nompu/cplbinit.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/kernel/cplb-nompu/cplbinit.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/kernel/cplb-nompu/cplbinit.c</a></div><div class='hunk'>@@ -23,6 +23,7 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/blackfin.h&gt;</div><div class='add'>+#include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #include &lt;asm/cplb.h&gt;</div><div class='ctx'> #include &lt;asm/cplbinit.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -168,8 +169,8 @@ static struct cplb_desc cplb_data[] = {</div><div class='ctx'> 		.end = L2_START + L2_LENGTH,</div><div class='ctx'> 		.psize = SIZE_1M,</div><div class='ctx'> 		.attr = SWITCH_T | I_CPLB | D_CPLB,</div><div class='del'>-		.i_conf = L2_MEMORY,</div><div class='del'>-		.d_conf = L2_MEMORY,</div><div class='add'>+		.i_conf = L2_IMEMORY,</div><div class='add'>+		.d_conf = L2_DMEMORY,</div><div class='ctx'> 		.valid = (L2_LENGTH &gt; 0),</div><div class='ctx'> 		.name = "L2 Memory",</div><div class='ctx'> 	},</div><div class='hunk'>@@ -308,7 +309,7 @@ __fill_data_cplbtab(struct cplb_tab *t, int i, u32 a_start, u32 a_end)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init generate_cpl_tables(void)</div><div class='add'>+void __init generate_cplb_tables(void)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='ctx'> 	u16 i, j, process;</div><div class='head'>diff --git a/arch/blackfin/kernel/early_printk.c b/arch/blackfin/kernel/early_printk.c<br/>index 60f67f90fe35..1f4e3d2e0901 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/kernel/early_printk.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/kernel/early_printk.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/kernel/early_printk.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/kernel/early_printk.c</a></div><div class='hunk'>@@ -35,6 +35,9 @@</div><div class='ctx'> extern struct console *bfin_earlyserial_init(unsigned int port,</div><div class='ctx'> 						unsigned int cflag);</div><div class='ctx'> #endif</div><div class='add'>+#ifdef CONFIG_BFIN_JTAG_COMM</div><div class='add'>+extern struct console *bfin_jc_early_init(void);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> static struct console *early_console;</div><div class='ctx'> </div><div class='hunk'>@@ -142,6 +145,15 @@ int __init setup_early_printk(char *buf)</div><div class='ctx'> 		early_console = earlyserial_init(buf);</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_BFIN_JTAG_COMM</div><div class='add'>+	/* Check for Blackfin JTAG */</div><div class='add'>+	if (!strncmp(buf, "jtag", 4)) {</div><div class='add'>+		buf += 4;</div><div class='add'>+		early_console = bfin_jc_early_init();</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_FB</div><div class='ctx'> 		/* TODO: add framebuffer console support */</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/blackfin/kernel/kgdb.c b/arch/blackfin/kernel/kgdb.c<br/>index a1f9641a6425..b795a207742c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/kernel/kgdb.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/kernel/kgdb.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/kernel/kgdb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/kernel/kgdb.c</a></div><div class='hunk'>@@ -1,32 +1,9 @@</div><div class='ctx'> /*</div><div class='del'>- * File:         arch/blackfin/kernel/kgdb.c</div><div class='del'>- * Based on:</div><div class='del'>- * Author:       Sonic Zhang</div><div class='add'>+ * arch/blackfin/kernel/kgdb.c - Blackfin kgdb pieces</div><div class='ctx'>  *</div><div class='del'>- * Created:</div><div class='del'>- * Description:</div><div class='add'>+ * Copyright 2005-2008 Analog Devices Inc.</div><div class='ctx'>  *</div><div class='del'>- * Rev:          $Id: kgdb_bfin_linux-2.6.x.patch 4934 2007-02-13 09:32:11Z sonicz $</div><div class='del'>- *</div><div class='del'>- * Modified:</div><div class='del'>- *               Copyright 2005-2006 Analog Devices Inc.</div><div class='del'>- *</div><div class='del'>- * Bugs:         Enter bugs at http://blackfin.uclinux.org/</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see the file COPYING, or write</div><div class='del'>- * to the Free Software Foundation, Inc.,</div><div class='del'>- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA</div><div class='add'>+ * Licensed under the GPL-2 or later.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='hunk'>@@ -39,24 +16,29 @@</div><div class='ctx'> #include &lt;linux/kgdb.h&gt;</div><div class='ctx'> #include &lt;linux/console.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/debugger.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/traps.h&gt;</div><div class='ctx'> #include &lt;asm/blackfin.h&gt;</div><div class='add'>+#include &lt;asm/dma.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Put the error code here just in case the user cares.  */</div><div class='del'>-int gdb_bf533errcode;</div><div class='add'>+int gdb_bfin_errcode;</div><div class='ctx'> /* Likewise, the vector number here (since GDB only gets the signal</div><div class='ctx'>    number through the usual means, and that's not very specific).  */</div><div class='del'>-int gdb_bf533vector = -1;</div><div class='add'>+int gdb_bfin_vector = -1;</div><div class='ctx'> </div><div class='ctx'> #if KGDB_MAX_NO_CPUS != 8</div><div class='ctx'> #error change the definition of slavecpulocks</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-void regs_to_gdb_regs(unsigned long *gdb_regs, struct pt_regs *regs)</div><div class='add'>+#ifdef CONFIG_BFIN_WDT</div><div class='add'>+# error "Please unselect blackfin watchdog driver before build KGDB."</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+void pt_regs_to_gdb_regs(unsigned long *gdb_regs, struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	gdb_regs[BFIN_R0] = regs-&gt;r0;</div><div class='ctx'> 	gdb_regs[BFIN_R1] = regs-&gt;r1;</div><div class='hunk'>@@ -133,7 +115,7 @@ void sleeping_thread_to_gdb_regs(unsigned long *gdb_regs, struct task_struct *p)</div><div class='ctx'> 	gdb_regs[BFIN_SEQSTAT] = p-&gt;thread.seqstat;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void gdb_regs_to_regs(unsigned long *gdb_regs, struct pt_regs *regs)</div><div class='add'>+void gdb_regs_to_pt_regs(unsigned long *gdb_regs, struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	regs-&gt;r0 = gdb_regs[BFIN_R0];</div><div class='ctx'> 	regs-&gt;r1 = gdb_regs[BFIN_R1];</div><div class='hunk'>@@ -199,171 +181,208 @@ struct hw_breakpoint {</div><div class='ctx'> 	unsigned int dataacc:2;</div><div class='ctx'> 	unsigned short count;</div><div class='ctx'> 	unsigned int addr;</div><div class='del'>-} breakinfo[HW_BREAKPOINT_NUM];</div><div class='add'>+} breakinfo[HW_WATCHPOINT_NUM];</div><div class='ctx'> </div><div class='del'>-int kgdb_arch_init(void)</div><div class='del'>-{</div><div class='del'>-	debugger_step = 0;</div><div class='del'>-</div><div class='del'>-	kgdb_remove_all_hw_break();</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int kgdb_set_hw_break(unsigned long addr)</div><div class='add'>+int bfin_set_hw_break(unsigned long addr, int len, enum kgdb_bptype type)</div><div class='ctx'> {</div><div class='ctx'> 	int breakno;</div><div class='del'>-	for (breakno = 0; breakno &lt; HW_BREAKPOINT_NUM; breakno++)</div><div class='del'>-		if (!breakinfo[breakno].occupied) {</div><div class='add'>+	int bfin_type;</div><div class='add'>+	int dataacc = 0;</div><div class='add'>+</div><div class='add'>+	switch (type) {</div><div class='add'>+	case BP_HARDWARE_BREAKPOINT:</div><div class='add'>+		bfin_type = TYPE_INST_WATCHPOINT;</div><div class='add'>+		break;</div><div class='add'>+	case BP_WRITE_WATCHPOINT:</div><div class='add'>+		dataacc = 1;</div><div class='add'>+		bfin_type = TYPE_DATA_WATCHPOINT;</div><div class='add'>+		break;</div><div class='add'>+	case BP_READ_WATCHPOINT:</div><div class='add'>+		dataacc = 2;</div><div class='add'>+		bfin_type = TYPE_DATA_WATCHPOINT;</div><div class='add'>+		break;</div><div class='add'>+	case BP_ACCESS_WATCHPOINT:</div><div class='add'>+		dataacc = 3;</div><div class='add'>+		bfin_type = TYPE_DATA_WATCHPOINT;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -ENOSPC;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Becasue hardware data watchpoint impelemented in current</div><div class='add'>+	 * Blackfin can not trigger an exception event as the hardware</div><div class='add'>+	 * instrction watchpoint does, we ignaore all data watch point here.</div><div class='add'>+	 * They can be turned on easily after future blackfin design</div><div class='add'>+	 * supports this feature.</div><div class='add'>+	 */</div><div class='add'>+	for (breakno = 0; breakno &lt; HW_INST_WATCHPOINT_NUM; breakno++)</div><div class='add'>+		if (bfin_type == breakinfo[breakno].type</div><div class='add'>+			&amp;&amp; !breakinfo[breakno].occupied) {</div><div class='ctx'> 			breakinfo[breakno].occupied = 1;</div><div class='ctx'> 			breakinfo[breakno].enabled = 1;</div><div class='del'>-			breakinfo[breakno].type = 1;</div><div class='ctx'> 			breakinfo[breakno].addr = addr;</div><div class='add'>+			breakinfo[breakno].dataacc = dataacc;</div><div class='add'>+			breakinfo[breakno].count = 0;</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 	return -ENOSPC;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int kgdb_remove_hw_break(unsigned long addr)</div><div class='add'>+int bfin_remove_hw_break(unsigned long addr, int len, enum kgdb_bptype type)</div><div class='ctx'> {</div><div class='ctx'> 	int breakno;</div><div class='del'>-	for (breakno = 0; breakno &lt; HW_BREAKPOINT_NUM; breakno++)</div><div class='del'>-		if (breakinfo[breakno].addr == addr)</div><div class='del'>-			memset(&amp;(breakinfo[breakno]), 0, sizeof(struct hw_breakpoint));</div><div class='add'>+	int bfin_type;</div><div class='add'>+</div><div class='add'>+	switch (type) {</div><div class='add'>+	case BP_HARDWARE_BREAKPOINT:</div><div class='add'>+		bfin_type = TYPE_INST_WATCHPOINT;</div><div class='add'>+		break;</div><div class='add'>+	case BP_WRITE_WATCHPOINT:</div><div class='add'>+	case BP_READ_WATCHPOINT:</div><div class='add'>+	case BP_ACCESS_WATCHPOINT:</div><div class='add'>+		bfin_type = TYPE_DATA_WATCHPOINT;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	for (breakno = 0; breakno &lt; HW_WATCHPOINT_NUM; breakno++)</div><div class='add'>+		if (bfin_type == breakinfo[breakno].type</div><div class='add'>+			&amp;&amp; breakinfo[breakno].occupied</div><div class='add'>+			&amp;&amp; breakinfo[breakno].addr == addr) {</div><div class='add'>+			breakinfo[breakno].occupied = 0;</div><div class='add'>+			breakinfo[breakno].enabled = 0;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void kgdb_remove_all_hw_break(void)</div><div class='add'>+void bfin_remove_all_hw_break(void)</div><div class='ctx'> {</div><div class='del'>-	memset(breakinfo, 0, sizeof(struct hw_breakpoint)*8);</div><div class='del'>-}</div><div class='add'>+	int breakno;</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>-void kgdb_show_info(void)</div><div class='del'>-{</div><div class='del'>-	printk(KERN_DEBUG "hwd: wpia0=0x%x, wpiacnt0=%d, wpiactl=0x%x, wpstat=0x%x\n",</div><div class='del'>-		bfin_read_WPIA0(), bfin_read_WPIACNT0(),</div><div class='del'>-		bfin_read_WPIACTL(), bfin_read_WPSTAT());</div><div class='add'>+	memset(breakinfo, 0, sizeof(struct hw_breakpoint)*HW_WATCHPOINT_NUM);</div><div class='add'>+</div><div class='add'>+	for (breakno = 0; breakno &lt; HW_INST_WATCHPOINT_NUM; breakno++)</div><div class='add'>+		breakinfo[breakno].type = TYPE_INST_WATCHPOINT;</div><div class='add'>+	for (; breakno &lt; HW_WATCHPOINT_NUM; breakno++)</div><div class='add'>+		breakinfo[breakno].type = TYPE_DATA_WATCHPOINT;</div><div class='ctx'> }</div><div class='del'>-*/</div><div class='ctx'> </div><div class='del'>-void kgdb_correct_hw_break(void)</div><div class='add'>+void bfin_correct_hw_break(void)</div><div class='ctx'> {</div><div class='ctx'> 	int breakno;</div><div class='del'>-	int correctit;</div><div class='del'>-	uint32_t wpdactl = bfin_read_WPDACTL();</div><div class='add'>+	unsigned int wpiactl = 0;</div><div class='add'>+	unsigned int wpdactl = 0;</div><div class='add'>+	int enable_wp = 0;</div><div class='add'>+</div><div class='add'>+	for (breakno = 0; breakno &lt; HW_WATCHPOINT_NUM; breakno++)</div><div class='add'>+		if (breakinfo[breakno].enabled) {</div><div class='add'>+			enable_wp = 1;</div><div class='ctx'> </div><div class='del'>-	correctit = 0;</div><div class='del'>-	for (breakno = 0; breakno &lt; HW_BREAKPOINT_NUM; breakno++) {</div><div class='del'>-		if (breakinfo[breakno].type == 1) {</div><div class='ctx'> 			switch (breakno) {</div><div class='ctx'> 			case 0:</div><div class='del'>-				if (breakinfo[breakno].enabled &amp;&amp; !(wpdactl &amp; WPIAEN0)) {</div><div class='del'>-					correctit = 1;</div><div class='del'>-					wpdactl &amp;= ~(WPIREN01|EMUSW0);</div><div class='del'>-					wpdactl |= WPIAEN0|WPICNTEN0;</div><div class='del'>-					bfin_write_WPIA0(breakinfo[breakno].addr);</div><div class='del'>-					bfin_write_WPIACNT0(breakinfo[breakno].skip);</div><div class='del'>-				} else if (!breakinfo[breakno].enabled &amp;&amp; (wpdactl &amp; WPIAEN0)) {</div><div class='del'>-					correctit = 1;</div><div class='del'>-					wpdactl &amp;= ~WPIAEN0;</div><div class='del'>-				}</div><div class='add'>+				wpiactl |= WPIAEN0|WPICNTEN0;</div><div class='add'>+				bfin_write_WPIA0(breakinfo[breakno].addr);</div><div class='add'>+				bfin_write_WPIACNT0(breakinfo[breakno].count</div><div class='add'>+					+ breakinfo-&gt;skip);</div><div class='ctx'> 				break;</div><div class='del'>-</div><div class='ctx'> 			case 1:</div><div class='del'>-				if (breakinfo[breakno].enabled &amp;&amp; !(wpdactl &amp; WPIAEN1)) {</div><div class='del'>-					correctit = 1;</div><div class='del'>-					wpdactl &amp;= ~(WPIREN01|EMUSW1);</div><div class='del'>-					wpdactl |= WPIAEN1|WPICNTEN1;</div><div class='del'>-					bfin_write_WPIA1(breakinfo[breakno].addr);</div><div class='del'>-					bfin_write_WPIACNT1(breakinfo[breakno].skip);</div><div class='del'>-				} else if (!breakinfo[breakno].enabled &amp;&amp; (wpdactl &amp; WPIAEN1)) {</div><div class='del'>-					correctit = 1;</div><div class='del'>-					wpdactl &amp;= ~WPIAEN1;</div><div class='del'>-				}</div><div class='add'>+				wpiactl |= WPIAEN1|WPICNTEN1;</div><div class='add'>+				bfin_write_WPIA1(breakinfo[breakno].addr);</div><div class='add'>+				bfin_write_WPIACNT1(breakinfo[breakno].count</div><div class='add'>+					+ breakinfo-&gt;skip);</div><div class='ctx'> 				break;</div><div class='del'>-</div><div class='ctx'> 			case 2:</div><div class='del'>-				if (breakinfo[breakno].enabled &amp;&amp; !(wpdactl &amp; WPIAEN2)) {</div><div class='del'>-					correctit = 1;</div><div class='del'>-					wpdactl &amp;= ~(WPIREN23|EMUSW2);</div><div class='del'>-					wpdactl |= WPIAEN2|WPICNTEN2;</div><div class='del'>-					bfin_write_WPIA2(breakinfo[breakno].addr);</div><div class='del'>-					bfin_write_WPIACNT2(breakinfo[breakno].skip);</div><div class='del'>-				} else if (!breakinfo[breakno].enabled &amp;&amp; (wpdactl &amp; WPIAEN2)) {</div><div class='del'>-					correctit = 1;</div><div class='del'>-					wpdactl &amp;= ~WPIAEN2;</div><div class='del'>-				}</div><div class='add'>+				wpiactl |= WPIAEN2|WPICNTEN2;</div><div class='add'>+				bfin_write_WPIA2(breakinfo[breakno].addr);</div><div class='add'>+				bfin_write_WPIACNT2(breakinfo[breakno].count</div><div class='add'>+					+ breakinfo-&gt;skip);</div><div class='ctx'> 				break;</div><div class='del'>-</div><div class='ctx'> 			case 3:</div><div class='del'>-				if (breakinfo[breakno].enabled &amp;&amp; !(wpdactl &amp; WPIAEN3)) {</div><div class='del'>-					correctit = 1;</div><div class='del'>-					wpdactl &amp;= ~(WPIREN23|EMUSW3);</div><div class='del'>-					wpdactl |= WPIAEN3|WPICNTEN3;</div><div class='del'>-					bfin_write_WPIA3(breakinfo[breakno].addr);</div><div class='del'>-					bfin_write_WPIACNT3(breakinfo[breakno].skip);</div><div class='del'>-				} else if (!breakinfo[breakno].enabled &amp;&amp; (wpdactl &amp; WPIAEN3)) {</div><div class='del'>-					correctit = 1;</div><div class='del'>-					wpdactl &amp;= ~WPIAEN3;</div><div class='del'>-				}</div><div class='add'>+				wpiactl |= WPIAEN3|WPICNTEN3;</div><div class='add'>+				bfin_write_WPIA3(breakinfo[breakno].addr);</div><div class='add'>+				bfin_write_WPIACNT3(breakinfo[breakno].count</div><div class='add'>+					+ breakinfo-&gt;skip);</div><div class='ctx'> 				break;</div><div class='ctx'> 			case 4:</div><div class='del'>-				if (breakinfo[breakno].enabled &amp;&amp; !(wpdactl &amp; WPIAEN4)) {</div><div class='del'>-					correctit = 1;</div><div class='del'>-					wpdactl &amp;= ~(WPIREN45|EMUSW4);</div><div class='del'>-					wpdactl |= WPIAEN4|WPICNTEN4;</div><div class='del'>-					bfin_write_WPIA4(breakinfo[breakno].addr);</div><div class='del'>-					bfin_write_WPIACNT4(breakinfo[breakno].skip);</div><div class='del'>-				} else if (!breakinfo[breakno].enabled &amp;&amp; (wpdactl &amp; WPIAEN4)) {</div><div class='del'>-					correctit = 1;</div><div class='del'>-					wpdactl &amp;= ~WPIAEN4;</div><div class='del'>-				}</div><div class='add'>+				wpiactl |= WPIAEN4|WPICNTEN4;</div><div class='add'>+				bfin_write_WPIA4(breakinfo[breakno].addr);</div><div class='add'>+				bfin_write_WPIACNT4(breakinfo[breakno].count</div><div class='add'>+					+ breakinfo-&gt;skip);</div><div class='ctx'> 				break;</div><div class='ctx'> 			case 5:</div><div class='del'>-				if (breakinfo[breakno].enabled &amp;&amp; !(wpdactl &amp; WPIAEN5)) {</div><div class='del'>-					correctit = 1;</div><div class='del'>-					wpdactl &amp;= ~(WPIREN45|EMUSW5);</div><div class='del'>-					wpdactl |= WPIAEN5|WPICNTEN5;</div><div class='del'>-					bfin_write_WPIA5(breakinfo[breakno].addr);</div><div class='del'>-					bfin_write_WPIACNT5(breakinfo[breakno].skip);</div><div class='del'>-				} else if (!breakinfo[breakno].enabled &amp;&amp; (wpdactl &amp; WPIAEN5)) {</div><div class='del'>-					correctit = 1;</div><div class='del'>-					wpdactl &amp;= ~WPIAEN5;</div><div class='del'>-				}</div><div class='add'>+				wpiactl |= WPIAEN5|WPICNTEN5;</div><div class='add'>+				bfin_write_WPIA5(breakinfo[breakno].addr);</div><div class='add'>+				bfin_write_WPIACNT5(breakinfo[breakno].count</div><div class='add'>+					+ breakinfo-&gt;skip);</div><div class='add'>+				break;</div><div class='add'>+			case 6:</div><div class='add'>+				wpdactl |= WPDAEN0|WPDCNTEN0|WPDSRC0;</div><div class='add'>+				wpdactl |= breakinfo[breakno].dataacc</div><div class='add'>+					&lt;&lt; WPDACC0_OFFSET;</div><div class='add'>+				bfin_write_WPDA0(breakinfo[breakno].addr);</div><div class='add'>+				bfin_write_WPDACNT0(breakinfo[breakno].count</div><div class='add'>+					+ breakinfo-&gt;skip);</div><div class='add'>+				break;</div><div class='add'>+			case 7:</div><div class='add'>+				wpdactl |= WPDAEN1|WPDCNTEN1|WPDSRC1;</div><div class='add'>+				wpdactl |= breakinfo[breakno].dataacc</div><div class='add'>+					&lt;&lt; WPDACC1_OFFSET;</div><div class='add'>+				bfin_write_WPDA1(breakinfo[breakno].addr);</div><div class='add'>+				bfin_write_WPDACNT1(breakinfo[breakno].count</div><div class='add'>+					+ breakinfo-&gt;skip);</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-	}</div><div class='del'>-	if (correctit) {</div><div class='del'>-		wpdactl &amp;= ~WPAND;</div><div class='del'>-		wpdactl |= WPPWR;</div><div class='del'>-		/*printk("correct_hw_break: wpdactl=0x%x\n", wpdactl);*/</div><div class='add'>+</div><div class='add'>+	/* Should enable WPPWR bit first before set any other</div><div class='add'>+	 * WPIACTL and WPDACTL bits */</div><div class='add'>+	if (enable_wp) {</div><div class='add'>+		bfin_write_WPIACTL(WPPWR);</div><div class='add'>+		CSYNC();</div><div class='add'>+		bfin_write_WPIACTL(wpiactl|WPPWR);</div><div class='ctx'> 		bfin_write_WPDACTL(wpdactl);</div><div class='ctx'> 		CSYNC();</div><div class='del'>-		/*kgdb_show_info();*/</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void kgdb_disable_hw_debug(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	/* Disable hardware debugging while we are in kgdb */</div><div class='del'>-	bfin_write_WPIACTL(bfin_read_WPIACTL() &amp; ~0x1);</div><div class='add'>+	bfin_write_WPIACTL(0);</div><div class='add'>+	bfin_write_WPDACTL(0);</div><div class='ctx'> 	CSYNC();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void kgdb_post_master_code(struct pt_regs *regs, int eVector, int err_code)</div><div class='add'>+#ifdef CONFIG_SMP</div><div class='add'>+void kgdb_passive_cpu_callback(void *info)</div><div class='add'>+{</div><div class='add'>+	kgdb_nmicallback(raw_smp_processor_id(), get_irq_regs());</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void kgdb_roundup_cpus(unsigned long flags)</div><div class='add'>+{</div><div class='add'>+	smp_call_function(kgdb_passive_cpu_callback, NULL, 0, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void kgdb_roundup_cpu(int cpu, unsigned long flags)</div><div class='add'>+{</div><div class='add'>+	smp_call_function_single(cpu, kgdb_passive_cpu_callback, NULL, 0, 0);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+void kgdb_post_primary_code(struct pt_regs *regs, int eVector, int err_code)</div><div class='ctx'> {</div><div class='ctx'> 	/* Master processor is completely in the debugger */</div><div class='del'>-	gdb_bf533vector = eVector;</div><div class='del'>-	gdb_bf533errcode = err_code;</div><div class='add'>+	gdb_bfin_vector = eVector;</div><div class='add'>+	gdb_bfin_errcode = err_code;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int kgdb_arch_handle_exception(int exceptionVector, int signo,</div><div class='add'>+int kgdb_arch_handle_exception(int vector, int signo,</div><div class='ctx'> 			       int err_code, char *remcom_in_buffer,</div><div class='ctx'> 			       char *remcom_out_buffer,</div><div class='del'>-			       struct pt_regs *linux_regs)</div><div class='add'>+			       struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	long addr;</div><div class='ctx'> 	long breakno;</div><div class='hunk'>@@ -385,44 +404,40 @@ int kgdb_arch_handle_exception(int exceptionVector, int signo,</div><div class='ctx'> 		/* try to read optional parameter, pc unchanged if no parm */</div><div class='ctx'> 		ptr = &amp;remcom_in_buffer[1];</div><div class='ctx'> 		if (kgdb_hex2long(&amp;ptr, &amp;addr)) {</div><div class='del'>-			linux_regs-&gt;retx = addr;</div><div class='add'>+			regs-&gt;retx = addr;</div><div class='ctx'> 		}</div><div class='del'>-		newPC = linux_regs-&gt;retx;</div><div class='add'>+		newPC = regs-&gt;retx;</div><div class='ctx'> </div><div class='ctx'> 		/* clear the trace bit */</div><div class='del'>-		linux_regs-&gt;syscfg &amp;= 0xfffffffe;</div><div class='add'>+		regs-&gt;syscfg &amp;= 0xfffffffe;</div><div class='ctx'> </div><div class='ctx'> 		/* set the trace bit if we're stepping */</div><div class='ctx'> 		if (remcom_in_buffer[0] == 's') {</div><div class='del'>-			linux_regs-&gt;syscfg |= 0x1;</div><div class='del'>-			debugger_step = linux_regs-&gt;ipend;</div><div class='del'>-			debugger_step &gt;&gt;= 6;</div><div class='del'>-			for (i = 10; i &gt; 0; i--, debugger_step &gt;&gt;= 1)</div><div class='del'>-				if (debugger_step &amp; 1)</div><div class='add'>+			regs-&gt;syscfg |= 0x1;</div><div class='add'>+			kgdb_single_step = regs-&gt;ipend;</div><div class='add'>+			kgdb_single_step &gt;&gt;= 6;</div><div class='add'>+			for (i = 10; i &gt; 0; i--, kgdb_single_step &gt;&gt;= 1)</div><div class='add'>+				if (kgdb_single_step &amp; 1)</div><div class='ctx'> 					break;</div><div class='ctx'> 			/* i indicate event priority of current stopped instruction</div><div class='ctx'> 			 * user space instruction is 0, IVG15 is 1, IVTMR is 10.</div><div class='del'>-			 * debugger_step &gt; 0 means in single step mode</div><div class='add'>+			 * kgdb_single_step &gt; 0 means in single step mode</div><div class='ctx'> 			 */</div><div class='del'>-			debugger_step = i + 1;</div><div class='del'>-		} else {</div><div class='del'>-			debugger_step = 0;</div><div class='add'>+			kgdb_single_step = i + 1;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		wp_status = bfin_read_WPSTAT();</div><div class='del'>-		CSYNC();</div><div class='del'>-</div><div class='del'>-		if (exceptionVector == VEC_WATCH) {</div><div class='del'>-			for (breakno = 0; breakno &lt; 6; ++breakno) {</div><div class='add'>+		if (vector == VEC_WATCH) {</div><div class='add'>+			wp_status = bfin_read_WPSTAT();</div><div class='add'>+			for (breakno = 0; breakno &lt; HW_WATCHPOINT_NUM; breakno++) {</div><div class='ctx'> 				if (wp_status &amp; (1 &lt;&lt; breakno)) {</div><div class='ctx'> 					breakinfo-&gt;skip = 1;</div><div class='ctx'> 					break;</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='add'>+			bfin_write_WPSTAT(0);</div><div class='ctx'> 		}</div><div class='del'>-		kgdb_correct_hw_break();</div><div class='ctx'> </div><div class='del'>-		bfin_write_WPSTAT(0);</div><div class='add'>+		bfin_correct_hw_break();</div><div class='ctx'> </div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}			/* switch */</div><div class='hunk'>@@ -431,5 +446,385 @@ int kgdb_arch_handle_exception(int exceptionVector, int signo,</div><div class='ctx'> </div><div class='ctx'> struct kgdb_arch arch_kgdb_ops = {</div><div class='ctx'> 	.gdb_bpt_instr = {0xa1},</div><div class='add'>+#ifdef CONFIG_SMP</div><div class='add'>+	.flags = KGDB_HW_BREAKPOINT|KGDB_THR_PROC_SWAP,</div><div class='add'>+#else</div><div class='ctx'> 	.flags = KGDB_HW_BREAKPOINT,</div><div class='add'>+#endif</div><div class='add'>+	.set_hw_breakpoint = bfin_set_hw_break,</div><div class='add'>+	.remove_hw_breakpoint = bfin_remove_hw_break,</div><div class='add'>+	.remove_all_hw_break = bfin_remove_all_hw_break,</div><div class='add'>+	.correct_hw_break = bfin_correct_hw_break,</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+static int hex(char ch)</div><div class='add'>+{</div><div class='add'>+	if ((ch &gt;= 'a') &amp;&amp; (ch &lt;= 'f'))</div><div class='add'>+		return ch - 'a' + 10;</div><div class='add'>+	if ((ch &gt;= '0') &amp;&amp; (ch &lt;= '9'))</div><div class='add'>+		return ch - '0';</div><div class='add'>+	if ((ch &gt;= 'A') &amp;&amp; (ch &lt;= 'F'))</div><div class='add'>+		return ch - 'A' + 10;</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int validate_memory_access_address(unsigned long addr, int size)</div><div class='add'>+{</div><div class='add'>+	int cpu = raw_smp_processor_id();</div><div class='add'>+</div><div class='add'>+	if (size &lt; 0)</div><div class='add'>+		return EFAULT;</div><div class='add'>+	if (addr &gt;= 0x1000 &amp;&amp; (addr + size) &lt;= physical_mem_end)</div><div class='add'>+		return 0;</div><div class='add'>+	if (addr &gt;= SYSMMR_BASE)</div><div class='add'>+		return 0;</div><div class='add'>+	if (addr &gt;= ASYNC_BANK0_BASE</div><div class='add'>+	   &amp;&amp; addr + size &lt;= ASYNC_BANK3_BASE + ASYNC_BANK3_SIZE)</div><div class='add'>+		return 0;</div><div class='add'>+	if (cpu == 0) {</div><div class='add'>+		if (addr &gt;= L1_SCRATCH_START</div><div class='add'>+		   &amp;&amp; (addr + size &lt;= L1_SCRATCH_START + L1_SCRATCH_LENGTH))</div><div class='add'>+			return 0;</div><div class='add'>+#if L1_CODE_LENGTH != 0</div><div class='add'>+		if (addr &gt;= L1_CODE_START</div><div class='add'>+		   &amp;&amp; (addr + size &lt;= L1_CODE_START + L1_CODE_LENGTH))</div><div class='add'>+			return 0;</div><div class='add'>+#endif</div><div class='add'>+#if L1_DATA_A_LENGTH != 0</div><div class='add'>+		if (addr &gt;= L1_DATA_A_START</div><div class='add'>+		   &amp;&amp; (addr + size &lt;= L1_DATA_A_START + L1_DATA_A_LENGTH))</div><div class='add'>+			return 0;</div><div class='add'>+#endif</div><div class='add'>+#if L1_DATA_B_LENGTH != 0</div><div class='add'>+		if (addr &gt;= L1_DATA_B_START</div><div class='add'>+		   &amp;&amp; (addr + size &lt;= L1_DATA_B_START + L1_DATA_B_LENGTH))</div><div class='add'>+			return 0;</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_SMP</div><div class='add'>+	} else if (cpu == 1) {</div><div class='add'>+		if (addr &gt;= COREB_L1_SCRATCH_START</div><div class='add'>+		   &amp;&amp; (addr + size &lt;= COREB_L1_SCRATCH_START</div><div class='add'>+		   + L1_SCRATCH_LENGTH))</div><div class='add'>+			return 0;</div><div class='add'>+# if L1_CODE_LENGTH != 0</div><div class='add'>+		if (addr &gt;= COREB_L1_CODE_START</div><div class='add'>+		   &amp;&amp; (addr + size &lt;= COREB_L1_CODE_START + L1_CODE_LENGTH))</div><div class='add'>+			return 0;</div><div class='add'>+# endif</div><div class='add'>+# if L1_DATA_A_LENGTH != 0</div><div class='add'>+		if (addr &gt;= COREB_L1_DATA_A_START</div><div class='add'>+		   &amp;&amp; (addr + size &lt;= COREB_L1_DATA_A_START + L1_DATA_A_LENGTH))</div><div class='add'>+			return 0;</div><div class='add'>+# endif</div><div class='add'>+# if L1_DATA_B_LENGTH != 0</div><div class='add'>+		if (addr &gt;= COREB_L1_DATA_B_START</div><div class='add'>+		   &amp;&amp; (addr + size &lt;= COREB_L1_DATA_B_START + L1_DATA_B_LENGTH))</div><div class='add'>+			return 0;</div><div class='add'>+# endif</div><div class='add'>+#endif</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#if L2_LENGTH != 0</div><div class='add'>+	if (addr &gt;= L2_START</div><div class='add'>+	   &amp;&amp; addr + size &lt;= L2_START + L2_LENGTH)</div><div class='add'>+		return 0;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	return EFAULT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Convert the memory pointed to by mem into hex, placing result in buf.</div><div class='add'>+ * Return a pointer to the last char put in buf (null). May return an error.</div><div class='add'>+ */</div><div class='add'>+int kgdb_mem2hex(char *mem, char *buf, int count)</div><div class='add'>+{</div><div class='add'>+	char *tmp;</div><div class='add'>+	int err = 0;</div><div class='add'>+	unsigned char *pch;</div><div class='add'>+	unsigned short mmr16;</div><div class='add'>+	unsigned long mmr32;</div><div class='add'>+	int cpu = raw_smp_processor_id();</div><div class='add'>+</div><div class='add'>+	if (validate_memory_access_address((unsigned long)mem, count))</div><div class='add'>+		return EFAULT;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We use the upper half of buf as an intermediate buffer for the</div><div class='add'>+	 * raw memory copy.  Hex conversion will work against this one.</div><div class='add'>+	 */</div><div class='add'>+	tmp = buf + count;</div><div class='add'>+</div><div class='add'>+	if ((unsigned int)mem &gt;= SYSMMR_BASE) { /*access MMR registers*/</div><div class='add'>+		switch (count) {</div><div class='add'>+		case 2:</div><div class='add'>+			if ((unsigned int)mem % 2 == 0) {</div><div class='add'>+				mmr16 = *(unsigned short *)mem;</div><div class='add'>+				pch = (unsigned char *)&amp;mmr16;</div><div class='add'>+				*tmp++ = *pch++;</div><div class='add'>+				*tmp++ = *pch++;</div><div class='add'>+				tmp -= 2;</div><div class='add'>+			} else</div><div class='add'>+				err = EFAULT;</div><div class='add'>+			break;</div><div class='add'>+		case 4:</div><div class='add'>+			if ((unsigned int)mem % 4 == 0) {</div><div class='add'>+				mmr32 = *(unsigned long *)mem;</div><div class='add'>+				pch = (unsigned char *)&amp;mmr32;</div><div class='add'>+				*tmp++ = *pch++;</div><div class='add'>+				*tmp++ = *pch++;</div><div class='add'>+				*tmp++ = *pch++;</div><div class='add'>+				*tmp++ = *pch++;</div><div class='add'>+				tmp -= 4;</div><div class='add'>+			} else</div><div class='add'>+				err = EFAULT;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			err = EFAULT;</div><div class='add'>+		}</div><div class='add'>+	} else if (cpu == 0 &amp;&amp; (unsigned int)mem &gt;= L1_CODE_START &amp;&amp;</div><div class='add'>+		(unsigned int)(mem + count) &lt;= L1_CODE_START + L1_CODE_LENGTH</div><div class='add'>+#ifdef CONFIG_SMP</div><div class='add'>+		|| cpu == 1 &amp;&amp; (unsigned int)mem &gt;= COREB_L1_CODE_START &amp;&amp;</div><div class='add'>+		(unsigned int)(mem + count) &lt;=</div><div class='add'>+		COREB_L1_CODE_START + L1_CODE_LENGTH</div><div class='add'>+#endif</div><div class='add'>+		) {</div><div class='add'>+		/* access L1 instruction SRAM*/</div><div class='add'>+		if (dma_memcpy(tmp, mem, count) == NULL)</div><div class='add'>+			err = EFAULT;</div><div class='add'>+	} else</div><div class='add'>+		err = probe_kernel_read(tmp, mem, count);</div><div class='add'>+</div><div class='add'>+	if (!err) {</div><div class='add'>+		while (count &gt; 0) {</div><div class='add'>+			buf = pack_hex_byte(buf, *tmp);</div><div class='add'>+			tmp++;</div><div class='add'>+			count--;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		*buf = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Copy the binary array pointed to by buf into mem.  Fix $, #, and</div><div class='add'>+ * 0x7d escaped with 0x7d.  Return a pointer to the character after</div><div class='add'>+ * the last byte written.</div><div class='add'>+ */</div><div class='add'>+int kgdb_ebin2mem(char *buf, char *mem, int count)</div><div class='add'>+{</div><div class='add'>+	char *tmp_old;</div><div class='add'>+	char *tmp_new;</div><div class='add'>+	unsigned short *mmr16;</div><div class='add'>+	unsigned long *mmr32;</div><div class='add'>+	int err = 0;</div><div class='add'>+	int size = 0;</div><div class='add'>+	int cpu = raw_smp_processor_id();</div><div class='add'>+</div><div class='add'>+	tmp_old = tmp_new = buf;</div><div class='add'>+</div><div class='add'>+	while (count-- &gt; 0) {</div><div class='add'>+		if (*tmp_old == 0x7d)</div><div class='add'>+			*tmp_new = *(++tmp_old) ^ 0x20;</div><div class='add'>+		else</div><div class='add'>+			*tmp_new = *tmp_old;</div><div class='add'>+		tmp_new++;</div><div class='add'>+		tmp_old++;</div><div class='add'>+		size++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (validate_memory_access_address((unsigned long)mem, size))</div><div class='add'>+		return EFAULT;</div><div class='add'>+</div><div class='add'>+	if ((unsigned int)mem &gt;= SYSMMR_BASE) { /*access MMR registers*/</div><div class='add'>+		switch (size) {</div><div class='add'>+		case 2:</div><div class='add'>+			if ((unsigned int)mem % 2 == 0) {</div><div class='add'>+				mmr16 = (unsigned short *)buf;</div><div class='add'>+				*(unsigned short *)mem = *mmr16;</div><div class='add'>+			} else</div><div class='add'>+				return EFAULT;</div><div class='add'>+			break;</div><div class='add'>+		case 4:</div><div class='add'>+			if ((unsigned int)mem % 4 == 0) {</div><div class='add'>+				mmr32 = (unsigned long *)buf;</div><div class='add'>+				*(unsigned long *)mem = *mmr32;</div><div class='add'>+			} else</div><div class='add'>+				return EFAULT;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			return EFAULT;</div><div class='add'>+		}</div><div class='add'>+	} else if (cpu == 0 &amp;&amp; (unsigned int)mem &gt;= L1_CODE_START &amp;&amp;</div><div class='add'>+		(unsigned int)(mem + count) &lt; L1_CODE_START + L1_CODE_LENGTH</div><div class='add'>+#ifdef CONFIG_SMP</div><div class='add'>+		|| cpu == 1 &amp;&amp; (unsigned int)mem &gt;= COREB_L1_CODE_START &amp;&amp;</div><div class='add'>+		(unsigned int)(mem + count) &lt;=</div><div class='add'>+		COREB_L1_CODE_START + L1_CODE_LENGTH</div><div class='add'>+#endif</div><div class='add'>+		) {</div><div class='add'>+		/* access L1 instruction SRAM */</div><div class='add'>+		if (dma_memcpy(mem, buf, size) == NULL)</div><div class='add'>+			err = EFAULT;</div><div class='add'>+	} else</div><div class='add'>+		err = probe_kernel_write(mem, buf, size);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Convert the hex array pointed to by buf into binary to be placed in mem.</div><div class='add'>+ * Return a pointer to the character AFTER the last byte written.</div><div class='add'>+ * May return an error.</div><div class='add'>+ */</div><div class='add'>+int kgdb_hex2mem(char *buf, char *mem, int count)</div><div class='add'>+{</div><div class='add'>+	char *tmp_raw;</div><div class='add'>+	char *tmp_hex;</div><div class='add'>+	unsigned short *mmr16;</div><div class='add'>+	unsigned long *mmr32;</div><div class='add'>+	int cpu = raw_smp_processor_id();</div><div class='add'>+</div><div class='add'>+	if (validate_memory_access_address((unsigned long)mem, count))</div><div class='add'>+		return EFAULT;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We use the upper half of buf as an intermediate buffer for the</div><div class='add'>+	 * raw memory that is converted from hex.</div><div class='add'>+	 */</div><div class='add'>+	tmp_raw = buf + count * 2;</div><div class='add'>+</div><div class='add'>+	tmp_hex = tmp_raw - 1;</div><div class='add'>+	while (tmp_hex &gt;= buf) {</div><div class='add'>+		tmp_raw--;</div><div class='add'>+		*tmp_raw = hex(*tmp_hex--);</div><div class='add'>+		*tmp_raw |= hex(*tmp_hex--) &lt;&lt; 4;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((unsigned int)mem &gt;= SYSMMR_BASE) { /*access MMR registers*/</div><div class='add'>+		switch (count) {</div><div class='add'>+		case 2:</div><div class='add'>+			if ((unsigned int)mem % 2 == 0) {</div><div class='add'>+				mmr16 = (unsigned short *)tmp_raw;</div><div class='add'>+				*(unsigned short *)mem = *mmr16;</div><div class='add'>+			} else</div><div class='add'>+				return EFAULT;</div><div class='add'>+			break;</div><div class='add'>+		case 4:</div><div class='add'>+			if ((unsigned int)mem % 4 == 0) {</div><div class='add'>+				mmr32 = (unsigned long *)tmp_raw;</div><div class='add'>+				*(unsigned long *)mem = *mmr32;</div><div class='add'>+			} else</div><div class='add'>+				return EFAULT;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			return EFAULT;</div><div class='add'>+		}</div><div class='add'>+	} else if (cpu == 0 &amp;&amp; (unsigned int)mem &gt;= L1_CODE_START &amp;&amp;</div><div class='add'>+		(unsigned int)(mem + count) &lt;= L1_CODE_START + L1_CODE_LENGTH</div><div class='add'>+#ifdef CONFIG_SMP</div><div class='add'>+		|| cpu == 1 &amp;&amp; (unsigned int)mem &gt;= COREB_L1_CODE_START &amp;&amp;</div><div class='add'>+		(unsigned int)(mem + count) &lt;=</div><div class='add'>+		COREB_L1_CODE_START + L1_CODE_LENGTH</div><div class='add'>+#endif</div><div class='add'>+		) {</div><div class='add'>+		/* access L1 instruction SRAM */</div><div class='add'>+		if (dma_memcpy(mem, tmp_raw, count) == NULL)</div><div class='add'>+			return EFAULT;</div><div class='add'>+	} else</div><div class='add'>+		return probe_kernel_write(mem, tmp_raw, count);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int kgdb_validate_break_address(unsigned long addr)</div><div class='add'>+{</div><div class='add'>+	int cpu = raw_smp_processor_id();</div><div class='add'>+</div><div class='add'>+	if (addr &gt;= 0x1000 &amp;&amp; (addr + BREAK_INSTR_SIZE) &lt;= physical_mem_end)</div><div class='add'>+		return 0;</div><div class='add'>+	if (addr &gt;= ASYNC_BANK0_BASE</div><div class='add'>+	   &amp;&amp; addr + BREAK_INSTR_SIZE &lt;= ASYNC_BANK3_BASE + ASYNC_BANK3_BASE)</div><div class='add'>+		return 0;</div><div class='add'>+#if L1_CODE_LENGTH != 0</div><div class='add'>+	if (cpu == 0 &amp;&amp; addr &gt;= L1_CODE_START</div><div class='add'>+	   &amp;&amp; addr + BREAK_INSTR_SIZE &lt;= L1_CODE_START + L1_CODE_LENGTH)</div><div class='add'>+		return 0;</div><div class='add'>+# ifdef CONFIG_SMP</div><div class='add'>+	else if (cpu == 1 &amp;&amp; addr &gt;= COREB_L1_CODE_START</div><div class='add'>+	   &amp;&amp; addr + BREAK_INSTR_SIZE &lt;= COREB_L1_CODE_START + L1_CODE_LENGTH)</div><div class='add'>+		return 0;</div><div class='add'>+# endif</div><div class='add'>+#endif</div><div class='add'>+#if L2_LENGTH != 0</div><div class='add'>+	if (addr &gt;= L2_START</div><div class='add'>+	   &amp;&amp; addr + BREAK_INSTR_SIZE &lt;= L2_START + L2_LENGTH)</div><div class='add'>+		return 0;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	return EFAULT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int kgdb_arch_set_breakpoint(unsigned long addr, char *saved_instr)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	int cpu = raw_smp_processor_id();</div><div class='add'>+</div><div class='add'>+	if ((cpu == 0 &amp;&amp; (unsigned int)addr &gt;= L1_CODE_START</div><div class='add'>+		&amp;&amp; (unsigned int)(addr + BREAK_INSTR_SIZE)</div><div class='add'>+		&lt; L1_CODE_START + L1_CODE_LENGTH)</div><div class='add'>+#ifdef CONFIG_SMP</div><div class='add'>+		|| (cpu == 1 &amp;&amp; (unsigned int)addr &gt;= COREB_L1_CODE_START</div><div class='add'>+		&amp;&amp; (unsigned int)(addr + BREAK_INSTR_SIZE)</div><div class='add'>+		&lt; COREB_L1_CODE_START + L1_CODE_LENGTH)</div><div class='add'>+#endif</div><div class='add'>+		) {</div><div class='add'>+		/* access L1 instruction SRAM */</div><div class='add'>+		if (dma_memcpy(saved_instr, (void *)addr, BREAK_INSTR_SIZE)</div><div class='add'>+			== NULL)</div><div class='add'>+			return -EFAULT;</div><div class='add'>+</div><div class='add'>+		if (dma_memcpy((void *)addr, arch_kgdb_ops.gdb_bpt_instr,</div><div class='add'>+			BREAK_INSTR_SIZE) == NULL)</div><div class='add'>+			return -EFAULT;</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	} else {</div><div class='add'>+		err = probe_kernel_read(saved_instr, (char *)addr,</div><div class='add'>+			BREAK_INSTR_SIZE);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		return probe_kernel_write((char *)addr,</div><div class='add'>+			arch_kgdb_ops.gdb_bpt_instr, BREAK_INSTR_SIZE);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int kgdb_arch_remove_breakpoint(unsigned long addr, char *bundle)</div><div class='add'>+{</div><div class='add'>+	if ((unsigned int)addr &gt;= L1_CODE_START &amp;&amp;</div><div class='add'>+		(unsigned int)(addr + BREAK_INSTR_SIZE) &lt;</div><div class='add'>+			L1_CODE_START + L1_CODE_LENGTH) {</div><div class='add'>+		/* access L1 instruction SRAM */</div><div class='add'>+		if (dma_memcpy((void *)addr, bundle, BREAK_INSTR_SIZE) == NULL)</div><div class='add'>+			return -EFAULT;</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	} else</div><div class='add'>+		return probe_kernel_write((char *)addr,</div><div class='add'>+				(char *)bundle, BREAK_INSTR_SIZE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int kgdb_arch_init(void)</div><div class='add'>+{</div><div class='add'>+	kgdb_single_step = 0;</div><div class='add'>+</div><div class='add'>+	bfin_remove_all_hw_break();</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void kgdb_arch_exit(void)</div><div class='add'>+{</div><div class='add'>+}</div><div class='head'>diff --git a/arch/blackfin/kernel/ptrace.c b/arch/blackfin/kernel/ptrace.c<br/>index bf1a51d8e608..140bf00e9974 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/kernel/ptrace.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/kernel/ptrace.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/kernel/ptrace.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/kernel/ptrace.c</a></div><div class='hunk'>@@ -46,7 +46,6 @@</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='ctx'> #include &lt;asm/fixed_code.h&gt;</div><div class='ctx'> </div><div class='del'>-#define MAX_SHARED_LIBS 3</div><div class='ctx'> #define TEXT_OFFSET 0</div><div class='ctx'> /*</div><div class='ctx'>  * does not yet catch signals sent when the child dies.</div><div class='hunk'>@@ -161,21 +160,32 @@ static inline int is_user_addr_valid(struct task_struct *child,</div><div class='ctx'> 	struct vm_list_struct *vml;</div><div class='ctx'> 	struct sram_list_struct *sraml;</div><div class='ctx'> </div><div class='add'>+	/* overflow */</div><div class='add'>+	if (start + len &lt; start)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='ctx'> 	for (vml = child-&gt;mm-&gt;context.vmlist; vml; vml = vml-&gt;next)</div><div class='del'>-		if (start &gt;= vml-&gt;vma-&gt;vm_start &amp;&amp; start + len &lt;= vml-&gt;vma-&gt;vm_end)</div><div class='add'>+		if (start &gt;= vml-&gt;vma-&gt;vm_start &amp;&amp; start + len &lt; vml-&gt;vma-&gt;vm_end)</div><div class='ctx'> 			return 0;</div><div class='ctx'> </div><div class='ctx'> 	for (sraml = child-&gt;mm-&gt;context.sram_list; sraml; sraml = sraml-&gt;next)</div><div class='ctx'> 		if (start &gt;= (unsigned long)sraml-&gt;addr</div><div class='del'>-		    &amp;&amp; start + len &lt;= (unsigned long)sraml-&gt;addr + sraml-&gt;length)</div><div class='add'>+		    &amp;&amp; start + len &lt; (unsigned long)sraml-&gt;addr + sraml-&gt;length)</div><div class='ctx'> 			return 0;</div><div class='ctx'> </div><div class='del'>-	if (start &gt;= FIXED_CODE_START &amp;&amp; start + len &lt;= FIXED_CODE_END)</div><div class='add'>+	if (start &gt;= FIXED_CODE_START &amp;&amp; start + len &lt; FIXED_CODE_END)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	return -EIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void ptrace_enable(struct task_struct *child)</div><div class='add'>+{</div><div class='add'>+	unsigned long tmp;</div><div class='add'>+	tmp = get_reg(child, PT_SYSCFG) | (TRACE_BITS);</div><div class='add'>+	put_reg(child, PT_SYSCFG, tmp);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Called by kernel/ptrace.c when detaching..</div><div class='ctx'>  *</div><div class='hunk'>@@ -192,14 +202,12 @@ void ptrace_disable(struct task_struct *child)</div><div class='ctx'> long arch_ptrace(struct task_struct *child, long request, long addr, long data)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	int add = 0;</div><div class='ctx'> 	unsigned long __user *datap = (unsigned long __user *)data;</div><div class='ctx'> </div><div class='ctx'> 	switch (request) {</div><div class='ctx'> 		/* when I and D space are separate, these will need to be fixed. */</div><div class='ctx'> 	case PTRACE_PEEKDATA:</div><div class='ctx'> 		pr_debug("ptrace: PEEKDATA\n");</div><div class='del'>-		add = MAX_SHARED_LIBS * 4;	/* space between text and data */</div><div class='ctx'> 		/* fall through */</div><div class='ctx'> 	case PTRACE_PEEKTEXT:	/* read word at location addr. */</div><div class='ctx'> 		{</div><div class='hunk'>@@ -207,40 +215,35 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)</div><div class='ctx'> 			int copied;</div><div class='ctx'> </div><div class='ctx'> 			ret = -EIO;</div><div class='del'>-			pr_debug("ptrace: PEEKTEXT at addr 0x%08lx + add %d %ld\n", addr, add,</div><div class='del'>-			         sizeof(data));</div><div class='del'>-			if (is_user_addr_valid(child, addr + add, sizeof(tmp)) &lt; 0)</div><div class='add'>+			pr_debug("ptrace: PEEKTEXT at addr 0x%08lx + %ld\n", addr, sizeof(data));</div><div class='add'>+			if (is_user_addr_valid(child, addr, sizeof(tmp)) &lt; 0)</div><div class='ctx'> 				break;</div><div class='ctx'> 			pr_debug("ptrace: user address is valid\n");</div><div class='ctx'> </div><div class='del'>-#if L1_CODE_LENGTH != 0</div><div class='del'>-			if (addr + add &gt;= L1_CODE_START</div><div class='del'>-			    &amp;&amp; addr + add + sizeof(tmp) &lt;= L1_CODE_START + L1_CODE_LENGTH) {</div><div class='del'>-				safe_dma_memcpy (&amp;tmp, (const void *)(addr + add), sizeof(tmp));</div><div class='add'>+			if (L1_CODE_LENGTH != 0 &amp;&amp; addr &gt;= L1_CODE_START</div><div class='add'>+			    &amp;&amp; addr + sizeof(tmp) &lt;= L1_CODE_START + L1_CODE_LENGTH) {</div><div class='add'>+				safe_dma_memcpy (&amp;tmp, (const void *)(addr), sizeof(tmp));</div><div class='ctx'> 				copied = sizeof(tmp);</div><div class='del'>-			} else</div><div class='del'>-#endif</div><div class='del'>-#if L1_DATA_A_LENGTH != 0</div><div class='del'>-			if (addr + add &gt;= L1_DATA_A_START</div><div class='del'>-			    &amp;&amp; addr + add + sizeof(tmp) &lt;= L1_DATA_A_START + L1_DATA_A_LENGTH) {</div><div class='del'>-				memcpy(&amp;tmp, (const void *)(addr + add), sizeof(tmp));</div><div class='add'>+</div><div class='add'>+			} else if (L1_DATA_A_LENGTH != 0 &amp;&amp; addr &gt;= L1_DATA_A_START</div><div class='add'>+			    &amp;&amp; addr + sizeof(tmp) &lt;= L1_DATA_A_START + L1_DATA_A_LENGTH) {</div><div class='add'>+				memcpy(&amp;tmp, (const void *)(addr), sizeof(tmp));</div><div class='ctx'> 				copied = sizeof(tmp);</div><div class='del'>-			} else</div><div class='del'>-#endif</div><div class='del'>-#if L1_DATA_B_LENGTH != 0</div><div class='del'>-			if (addr + add &gt;= L1_DATA_B_START</div><div class='del'>-			    &amp;&amp; addr + add + sizeof(tmp) &lt;= L1_DATA_B_START + L1_DATA_B_LENGTH) {</div><div class='del'>-				memcpy(&amp;tmp, (const void *)(addr + add), sizeof(tmp));</div><div class='add'>+</div><div class='add'>+			} else if (L1_DATA_B_LENGTH != 0 &amp;&amp; addr &gt;= L1_DATA_B_START</div><div class='add'>+			    &amp;&amp; addr + sizeof(tmp) &lt;= L1_DATA_B_START + L1_DATA_B_LENGTH) {</div><div class='add'>+				memcpy(&amp;tmp, (const void *)(addr), sizeof(tmp));</div><div class='ctx'> 				copied = sizeof(tmp);</div><div class='del'>-			} else</div><div class='del'>-#endif</div><div class='del'>-			if (addr + add &gt;= FIXED_CODE_START</div><div class='del'>-			    &amp;&amp; addr + add + sizeof(tmp) &lt;= FIXED_CODE_END) {</div><div class='del'>-				memcpy(&amp;tmp, (const void *)(addr + add), sizeof(tmp));</div><div class='add'>+</div><div class='add'>+			} else if (addr &gt;= FIXED_CODE_START</div><div class='add'>+			    &amp;&amp; addr + sizeof(tmp) &lt;= FIXED_CODE_END) {</div><div class='add'>+				memcpy(&amp;tmp, (const void *)(addr), sizeof(tmp));</div><div class='ctx'> 				copied = sizeof(tmp);</div><div class='add'>+</div><div class='ctx'> 			} else</div><div class='del'>-				copied = access_process_vm(child, addr + add, &amp;tmp,</div><div class='add'>+				copied = access_process_vm(child, addr, &amp;tmp,</div><div class='ctx'> 							   sizeof(tmp), 0);</div><div class='add'>+</div><div class='ctx'> 			pr_debug("ptrace: copied size %d [0x%08lx]\n", copied, tmp);</div><div class='ctx'> 			if (copied != sizeof(tmp))</div><div class='ctx'> 				break;</div><div class='hunk'>@@ -284,47 +287,43 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)</div><div class='ctx'> </div><div class='ctx'> 		/* when I and D space are separate, this will have to be fixed. */</div><div class='ctx'> 	case PTRACE_POKEDATA:</div><div class='del'>-		printk(KERN_NOTICE "ptrace: PTRACE_PEEKDATA\n");</div><div class='add'>+		pr_debug("ptrace: PTRACE_PEEKDATA\n");</div><div class='ctx'> 		/* fall through */</div><div class='ctx'> 	case PTRACE_POKETEXT:	/* write the word at location addr. */</div><div class='ctx'> 		{</div><div class='ctx'> 			int copied;</div><div class='ctx'> </div><div class='ctx'> 			ret = -EIO;</div><div class='del'>-			pr_debug("ptrace: POKETEXT at addr 0x%08lx + add %d %ld bytes %lx\n",</div><div class='del'>-			         addr, add, sizeof(data), data);</div><div class='del'>-			if (is_user_addr_valid(child, addr + add, sizeof(data)) &lt; 0)</div><div class='add'>+			pr_debug("ptrace: POKETEXT at addr 0x%08lx + %ld bytes %lx\n",</div><div class='add'>+			         addr, sizeof(data), data);</div><div class='add'>+			if (is_user_addr_valid(child, addr, sizeof(data)) &lt; 0)</div><div class='ctx'> 				break;</div><div class='ctx'> 			pr_debug("ptrace: user address is valid\n");</div><div class='ctx'> </div><div class='del'>-#if L1_CODE_LENGTH != 0</div><div class='del'>-			if (addr + add &gt;= L1_CODE_START</div><div class='del'>-			    &amp;&amp; addr + add + sizeof(data) &lt;= L1_CODE_START + L1_CODE_LENGTH) {</div><div class='del'>-				safe_dma_memcpy ((void *)(addr + add), &amp;data, sizeof(data));</div><div class='add'>+			if (L1_CODE_LENGTH != 0 &amp;&amp; addr &gt;= L1_CODE_START</div><div class='add'>+			    &amp;&amp; addr + sizeof(data) &lt;= L1_CODE_START + L1_CODE_LENGTH) {</div><div class='add'>+				safe_dma_memcpy ((void *)(addr), &amp;data, sizeof(data));</div><div class='ctx'> 				copied = sizeof(data);</div><div class='del'>-			} else</div><div class='del'>-#endif</div><div class='del'>-#if L1_DATA_A_LENGTH != 0</div><div class='del'>-			if (addr + add &gt;= L1_DATA_A_START</div><div class='del'>-			    &amp;&amp; addr + add + sizeof(data) &lt;= L1_DATA_A_START + L1_DATA_A_LENGTH) {</div><div class='del'>-				memcpy((void *)(addr + add), &amp;data, sizeof(data));</div><div class='add'>+</div><div class='add'>+			} else if (L1_DATA_A_LENGTH != 0 &amp;&amp; addr &gt;= L1_DATA_A_START</div><div class='add'>+			    &amp;&amp; addr + sizeof(data) &lt;= L1_DATA_A_START + L1_DATA_A_LENGTH) {</div><div class='add'>+				memcpy((void *)(addr), &amp;data, sizeof(data));</div><div class='ctx'> 				copied = sizeof(data);</div><div class='del'>-			} else</div><div class='del'>-#endif</div><div class='del'>-#if L1_DATA_B_LENGTH != 0</div><div class='del'>-			if (addr + add &gt;= L1_DATA_B_START</div><div class='del'>-			    &amp;&amp; addr + add + sizeof(data) &lt;= L1_DATA_B_START + L1_DATA_B_LENGTH) {</div><div class='del'>-				memcpy((void *)(addr + add), &amp;data, sizeof(data));</div><div class='add'>+</div><div class='add'>+			} else if (L1_DATA_B_LENGTH != 0 &amp;&amp; addr &gt;= L1_DATA_B_START</div><div class='add'>+			    &amp;&amp; addr + sizeof(data) &lt;= L1_DATA_B_START + L1_DATA_B_LENGTH) {</div><div class='add'>+				memcpy((void *)(addr), &amp;data, sizeof(data));</div><div class='ctx'> 				copied = sizeof(data);</div><div class='del'>-			} else</div><div class='del'>-#endif</div><div class='del'>-			if (addr + add &gt;= FIXED_CODE_START</div><div class='del'>-			    &amp;&amp; addr + add + sizeof(data) &lt;= FIXED_CODE_END) {</div><div class='del'>-				memcpy((void *)(addr + add), &amp;data, sizeof(data));</div><div class='add'>+</div><div class='add'>+			} else if (addr &gt;= FIXED_CODE_START</div><div class='add'>+			    &amp;&amp; addr + sizeof(data) &lt;= FIXED_CODE_END) {</div><div class='add'>+				memcpy((void *)(addr), &amp;data, sizeof(data));</div><div class='ctx'> 				copied = sizeof(data);</div><div class='add'>+</div><div class='ctx'> 			} else</div><div class='del'>-				copied = access_process_vm(child, addr + add, &amp;data,</div><div class='add'>+				copied = access_process_vm(child, addr, &amp;data,</div><div class='ctx'> 							   sizeof(data), 1);</div><div class='add'>+</div><div class='ctx'> 			pr_debug("ptrace: copied size %d\n", copied);</div><div class='ctx'> 			if (copied != sizeof(data))</div><div class='ctx'> 				break;</div><div class='hunk'>@@ -351,29 +350,22 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case PTRACE_SYSCALL:	/* continue and stop at next (return from) syscall */</div><div class='del'>-	case PTRACE_CONT:</div><div class='del'>-		{		/* restart after signal. */</div><div class='del'>-			long tmp;</div><div class='add'>+	case PTRACE_CONT:	/* restart after signal. */</div><div class='add'>+		pr_debug("ptrace: syscall/cont\n");</div><div class='ctx'> </div><div class='del'>-			pr_debug("ptrace_cont\n");</div><div class='del'>-</div><div class='del'>-			ret = -EIO;</div><div class='del'>-			if (!valid_signal(data))</div><div class='del'>-				break;</div><div class='del'>-			if (request == PTRACE_SYSCALL)</div><div class='del'>-				set_tsk_thread_flag(child, TIF_SYSCALL_TRACE);</div><div class='del'>-			else</div><div class='del'>-				clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);</div><div class='del'>-</div><div class='del'>-			child-&gt;exit_code = data;</div><div class='del'>-			/* make sure the single step bit is not set. */</div><div class='del'>-			tmp = get_reg(child, PT_SYSCFG) &amp; ~(TRACE_BITS);</div><div class='del'>-			put_reg(child, PT_SYSCFG, tmp);</div><div class='del'>-			pr_debug("before wake_up_process\n");</div><div class='del'>-			wake_up_process(child);</div><div class='del'>-			ret = 0;</div><div class='add'>+		ret = -EIO;</div><div class='add'>+		if (!valid_signal(data))</div><div class='ctx'> 			break;</div><div class='del'>-		}</div><div class='add'>+		if (request == PTRACE_SYSCALL)</div><div class='add'>+			set_tsk_thread_flag(child, TIF_SYSCALL_TRACE);</div><div class='add'>+		else</div><div class='add'>+			clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);</div><div class='add'>+		child-&gt;exit_code = data;</div><div class='add'>+		ptrace_disable(child);</div><div class='add'>+		pr_debug("ptrace: before wake_up_process\n");</div><div class='add'>+		wake_up_process(child);</div><div class='add'>+		ret = 0;</div><div class='add'>+		break;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * make the child exit.  Best I can do is send it a sigkill.</div><div class='hunk'>@@ -381,55 +373,37 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)</div><div class='ctx'> 	 * exit.</div><div class='ctx'> 	 */</div><div class='ctx'> 	case PTRACE_KILL:</div><div class='del'>-		{</div><div class='del'>-			long tmp;</div><div class='del'>-			ret = 0;</div><div class='del'>-			if (child-&gt;exit_state == EXIT_ZOMBIE)	/* already dead */</div><div class='del'>-				break;</div><div class='del'>-			child-&gt;exit_code = SIGKILL;</div><div class='del'>-			/* make sure the single step bit is not set. */</div><div class='del'>-			tmp = get_reg(child, PT_SYSCFG) &amp; ~(TRACE_BITS);</div><div class='del'>-			put_reg(child, PT_SYSCFG, tmp);</div><div class='del'>-			wake_up_process(child);</div><div class='add'>+		ret = 0;</div><div class='add'>+		if (child-&gt;exit_state == EXIT_ZOMBIE)	/* already dead */</div><div class='ctx'> 			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	case PTRACE_SINGLESTEP:</div><div class='del'>-		{		/* set the trap flag. */</div><div class='del'>-			long tmp;</div><div class='del'>-</div><div class='del'>-			pr_debug("single step\n");</div><div class='del'>-			ret = -EIO;</div><div class='del'>-			if (!valid_signal(data))</div><div class='del'>-				break;</div><div class='del'>-			clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);</div><div class='del'>-</div><div class='del'>-			tmp = get_reg(child, PT_SYSCFG) | (TRACE_BITS);</div><div class='del'>-			put_reg(child, PT_SYSCFG, tmp);</div><div class='add'>+		child-&gt;exit_code = SIGKILL;</div><div class='add'>+		ptrace_disable(child);</div><div class='add'>+		wake_up_process(child);</div><div class='add'>+		break;</div><div class='ctx'> </div><div class='del'>-			child-&gt;exit_code = data;</div><div class='del'>-			/* give it a chance to run. */</div><div class='del'>-			wake_up_process(child);</div><div class='del'>-			ret = 0;</div><div class='add'>+	case PTRACE_SINGLESTEP:	/* set the trap flag. */</div><div class='add'>+		pr_debug("ptrace: single step\n");</div><div class='add'>+		ret = -EIO;</div><div class='add'>+		if (!valid_signal(data))</div><div class='ctx'> 			break;</div><div class='del'>-		}</div><div class='add'>+		clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);</div><div class='add'>+		ptrace_enable(child);</div><div class='add'>+		child-&gt;exit_code = data;</div><div class='add'>+		wake_up_process(child);</div><div class='add'>+		ret = 0;</div><div class='add'>+		break;</div><div class='ctx'> </div><div class='ctx'> 	case PTRACE_GETREGS:</div><div class='del'>-		{</div><div class='del'>-</div><div class='del'>-			/* Get all gp regs from the child. */</div><div class='del'>-			ret = ptrace_getregs(child, datap);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='add'>+		/* Get all gp regs from the child. */</div><div class='add'>+		ret = ptrace_getregs(child, datap);</div><div class='add'>+		break;</div><div class='ctx'> </div><div class='ctx'> 	case PTRACE_SETREGS:</div><div class='del'>-		{</div><div class='del'>-			printk(KERN_NOTICE</div><div class='del'>-			       "ptrace: SETREGS: **** NOT IMPLEMENTED ***\n");</div><div class='del'>-			/* Set all gp regs in the child. */</div><div class='del'>-			ret = 0;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='add'>+		printk(KERN_WARNING "ptrace: SETREGS: **** NOT IMPLEMENTED ***\n");</div><div class='add'>+		/* Set all gp regs in the child. */</div><div class='add'>+		ret = 0;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='ctx'> 	default:</div><div class='ctx'> 		ret = ptrace_request(child, request, addr, data);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -440,7 +414,6 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)</div><div class='ctx'> </div><div class='ctx'> asmlinkage void syscall_trace(void)</div><div class='ctx'> {</div><div class='del'>-</div><div class='ctx'> 	if (!test_thread_flag(TIF_SYSCALL_TRACE))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/blackfin/kernel/reboot.c b/arch/blackfin/kernel/reboot.c<br/>index 367e2dc09881..ae97ca407b0d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/kernel/reboot.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/kernel/reboot.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/kernel/reboot.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/kernel/reboot.c</a></div><div class='hunk'>@@ -10,6 +10,7 @@</div><div class='ctx'> #include &lt;asm/bfin-global.h&gt;</div><div class='ctx'> #include &lt;asm/reboot.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='add'>+#include &lt;asm/bfrom.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* A system soft reset makes external memory unusable so force</div><div class='ctx'>  * this function into L1.  We use the compiler ssync here rather</div><div class='hunk'>@@ -20,7 +21,7 @@</div><div class='ctx'>  * the core reset.</div><div class='ctx'>  */</div><div class='ctx'> __attribute__((l1_text))</div><div class='del'>-void bfin_reset(void)</div><div class='add'>+static void bfin_reset(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* Wait for completion of "system" events such as cache line</div><div class='ctx'> 	 * line fills so that we avoid infinite stalls later on as</div><div class='hunk'>@@ -34,15 +35,15 @@ void bfin_reset(void)</div><div class='ctx'> 		bfin_write_SWRST(0x7);</div><div class='ctx'> </div><div class='ctx'> 		/* Due to the way reset is handled in the hardware, we need</div><div class='del'>-		 * to delay for 7 SCLKS.  The only reliable way to do this is</div><div class='del'>-		 * to calculate the CCLK/SCLK ratio and multiply 7.  For now,</div><div class='add'>+		 * to delay for 10 SCLKS.  The only reliable way to do this is</div><div class='add'>+		 * to calculate the CCLK/SCLK ratio and multiply 10.  For now,</div><div class='ctx'> 		 * we'll assume worse case which is a 1:15 ratio.</div><div class='ctx'> 		 */</div><div class='ctx'> 		asm(</div><div class='ctx'> 			"LSETUP (1f, 1f) LC0 = %0\n"</div><div class='ctx'> 			"1: nop;"</div><div class='ctx'> 			:</div><div class='del'>-			: "a" (15 * 7)</div><div class='add'>+			: "a" (15 * 10)</div><div class='ctx'> 			: "LC0", "LB0", "LT0"</div><div class='ctx'> 		);</div><div class='ctx'> </div><div class='hunk'>@@ -74,7 +75,14 @@ void machine_restart(char *cmd)</div><div class='ctx'> {</div><div class='ctx'> 	native_machine_restart(cmd);</div><div class='ctx'> 	local_irq_disable();</div><div class='del'>-	bfin_reset();</div><div class='add'>+	if (ANOMALY_05000353 || ANOMALY_05000386)</div><div class='add'>+		bfin_reset();</div><div class='add'>+	else</div><div class='add'>+		/* the bootrom checks to see how it was reset and will</div><div class='add'>+		 * automatically perform a software reset for us when</div><div class='add'>+		 * it starts executing boot</div><div class='add'>+		 */</div><div class='add'>+		asm("raise 1;");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> __attribute__((weak))</div><div class='head'>diff --git a/arch/blackfin/kernel/setup.c b/arch/blackfin/kernel/setup.c<br/>index 7a82d10b4ebf..7f35d1046cd8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/kernel/setup.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/kernel/setup.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/kernel/setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/kernel/setup.c</a></div><div class='hunk'>@@ -42,6 +42,7 @@ EXPORT_SYMBOL(memory_start);</div><div class='ctx'> EXPORT_SYMBOL(memory_end);</div><div class='ctx'> EXPORT_SYMBOL(physical_mem_end);</div><div class='ctx'> EXPORT_SYMBOL(_ramend);</div><div class='add'>+EXPORT_SYMBOL(reserved_mem_dcache_on);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MTD_UCLINUX</div><div class='ctx'> unsigned long memory_mtd_end, memory_mtd_start, mtd_size;</div><div class='hunk'>@@ -52,7 +53,8 @@ EXPORT_SYMBOL(mtd_size);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> char __initdata command_line[COMMAND_LINE_SIZE];</div><div class='del'>-unsigned int __initdata *__retx;</div><div class='add'>+void __initdata *init_retx, *init_saved_retx, *init_saved_seqstat,</div><div class='add'>+	*init_saved_icplb_fault_addr, *init_saved_dcplb_fault_addr;</div><div class='ctx'> </div><div class='ctx'> /* boot memmap, for parsing "memmap=" */</div><div class='ctx'> #define BFIN_MEMMAP_MAX		128 /* number of entries in bfin_memmap */</div><div class='hunk'>@@ -77,10 +79,10 @@ static struct change_member *change_point[2*BFIN_MEMMAP_MAX] __initdata;</div><div class='ctx'> static struct bfin_memmap_entry *overlap_list[BFIN_MEMMAP_MAX] __initdata;</div><div class='ctx'> static struct bfin_memmap_entry new_map[BFIN_MEMMAP_MAX] __initdata;</div><div class='ctx'> </div><div class='del'>-void __init bf53x_cache_init(void)</div><div class='add'>+void __init bfin_cache_init(void)</div><div class='ctx'> {</div><div class='ctx'> #if defined(CONFIG_BFIN_DCACHE) || defined(CONFIG_BFIN_ICACHE)</div><div class='del'>-	generate_cpl_tables();</div><div class='add'>+	generate_cplb_tables();</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_BFIN_ICACHE</div><div class='hunk'>@@ -100,7 +102,7 @@ void __init bf53x_cache_init(void)</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init bf53x_relocate_l1_mem(void)</div><div class='add'>+void __init bfin_relocate_l1_mem(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long l1_code_length;</div><div class='ctx'> 	unsigned long l1_data_a_length;</div><div class='hunk'>@@ -410,7 +412,7 @@ static __init void parse_cmdline_early(char *cmdline_p)</div><div class='ctx'>  *  [_rambase, _ramstart]:		kernel image</div><div class='ctx'>  *  [memory_start, memory_end]:		dynamic memory managed by kernel</div><div class='ctx'>  *  [memory_end, _ramend]:		reserved memory</div><div class='del'>- *  	[meory_mtd_start(memory_end),</div><div class='add'>+ *  	[memory_mtd_start(memory_end),</div><div class='ctx'>  *  		memory_mtd_start + mtd_size]:	rootfs (if any)</div><div class='ctx'>  *	[_ramend - DMA_UNCACHED_REGION,</div><div class='ctx'>  *		_ramend]:			uncached DMA region</div><div class='hunk'>@@ -782,16 +784,25 @@ void __init setup_arch(char **cmdline_p)</div><div class='ctx'> </div><div class='ctx'> 	_bfin_swrst = bfin_read_SWRST();</div><div class='ctx'> </div><div class='del'>-	/* If we double fault, reset the system - otherwise we hang forever */</div><div class='del'>-	bfin_write_SWRST(DOUBLE_FAULT);</div><div class='add'>+#ifdef CONFIG_DEBUG_DOUBLEFAULT_PRINT</div><div class='add'>+	bfin_write_SWRST(_bfin_swrst &amp; ~DOUBLE_FAULT);</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_DEBUG_DOUBLEFAULT_RESET</div><div class='add'>+	bfin_write_SWRST(_bfin_swrst | DOUBLE_FAULT);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='del'>-	if (_bfin_swrst &amp; RESET_DOUBLE)</div><div class='del'>-		/*</div><div class='del'>-		 * don't decode the address, since you don't know if this</div><div class='del'>-		 * kernel's symbol map is the same as the crashing kernel</div><div class='del'>-		 */</div><div class='del'>-		printk(KERN_INFO "Recovering from Double Fault event at %pF\n", __retx);</div><div class='del'>-	else if (_bfin_swrst &amp; RESET_WDOG)</div><div class='add'>+	if (_bfin_swrst &amp; RESET_DOUBLE) {</div><div class='add'>+		printk(KERN_EMERG "Recovering from DOUBLE FAULT event\n");</div><div class='add'>+#ifdef CONFIG_DEBUG_DOUBLEFAULT</div><div class='add'>+		/* We assume the crashing kernel, and the current symbol table match */</div><div class='add'>+		printk(KERN_EMERG " While handling exception (EXCAUSE = 0x%x) at %pF\n",</div><div class='add'>+			(int)init_saved_seqstat &amp; SEQSTAT_EXCAUSE, init_saved_retx);</div><div class='add'>+		printk(KERN_NOTICE "   DCPLB_FAULT_ADDR: %pF\n", init_saved_dcplb_fault_addr);</div><div class='add'>+		printk(KERN_NOTICE "   ICPLB_FAULT_ADDR: %pF\n", init_saved_icplb_fault_addr);</div><div class='add'>+#endif</div><div class='add'>+		printk(KERN_NOTICE " The instruction at %pF caused a double exception\n",</div><div class='add'>+			init_retx);</div><div class='add'>+	} else if (_bfin_swrst &amp; RESET_WDOG)</div><div class='ctx'> 		printk(KERN_INFO "Recovering from Watchdog event\n");</div><div class='ctx'> 	else if (_bfin_swrst &amp; RESET_SOFTWARE)</div><div class='ctx'> 		printk(KERN_NOTICE "Reset caused by Software reset\n");</div><div class='hunk'>@@ -803,17 +814,24 @@ void __init setup_arch(char **cmdline_p)</div><div class='ctx'> 		printk(KERN_INFO "Compiled for ADSP-%s Rev none\n", CPU);</div><div class='ctx'> 	else</div><div class='ctx'> 		printk(KERN_INFO "Compiled for ADSP-%s Rev 0.%d\n", CPU, bfin_compiled_revid());</div><div class='del'>-	if (bfin_revid() != bfin_compiled_revid()) {</div><div class='del'>-		if (bfin_compiled_revid() == -1)</div><div class='del'>-			printk(KERN_ERR "Warning: Compiled for Rev none, but running on Rev %d\n",</div><div class='del'>-			       bfin_revid());</div><div class='del'>-		else if (bfin_compiled_revid() != 0xffff)</div><div class='del'>-			printk(KERN_ERR "Warning: Compiled for Rev %d, but running on Rev %d\n",</div><div class='del'>-			       bfin_compiled_revid(), bfin_revid());</div><div class='add'>+</div><div class='add'>+	if (unlikely(CPUID != bfin_cpuid()))</div><div class='add'>+		printk(KERN_ERR "ERROR: Not running on ADSP-%s: unknown CPUID 0x%04x Rev 0.%d\n",</div><div class='add'>+			CPU, bfin_cpuid(), bfin_revid());</div><div class='add'>+	else {</div><div class='add'>+		if (bfin_revid() != bfin_compiled_revid()) {</div><div class='add'>+			if (bfin_compiled_revid() == -1)</div><div class='add'>+				printk(KERN_ERR "Warning: Compiled for Rev none, but running on Rev %d\n",</div><div class='add'>+				       bfin_revid());</div><div class='add'>+			else if (bfin_compiled_revid() != 0xffff)</div><div class='add'>+				printk(KERN_ERR "Warning: Compiled for Rev %d, but running on Rev %d\n",</div><div class='add'>+				       bfin_compiled_revid(), bfin_revid());</div><div class='add'>+		}</div><div class='add'>+		if (bfin_revid() &lt;= CONFIG_BF_REV_MIN || bfin_revid() &gt; CONFIG_BF_REV_MAX)</div><div class='add'>+			printk(KERN_ERR "Warning: Unsupported Chip Revision ADSP-%s Rev 0.%d detected\n",</div><div class='add'>+			       CPU, bfin_revid());</div><div class='ctx'> 	}</div><div class='del'>-	if (bfin_revid() &lt; SUPPORTED_REVID)</div><div class='del'>-		printk(KERN_ERR "Warning: Unsupported Chip Revision ADSP-%s Rev 0.%d detected\n",</div><div class='del'>-		       CPU, bfin_revid());</div><div class='add'>+</div><div class='ctx'> 	printk(KERN_INFO "Blackfin Linux support by http://blackfin.uclinux.org/\n");</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_INFO "Processor Speed: %lu MHz core clock and %lu MHz System Clock\n",</div><div class='hunk'>@@ -850,7 +868,7 @@ void __init setup_arch(char **cmdline_p)</div><div class='ctx'> 		!= SAFE_USER_INSTRUCTION - FIXED_CODE_START);</div><div class='ctx'> </div><div class='ctx'> 	init_exception_vectors();</div><div class='del'>-	bf53x_cache_init();</div><div class='add'>+	bfin_cache_init();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init topology_init(void)</div><div class='hunk'>@@ -986,13 +1004,18 @@ static int show_cpuinfo(struct seq_file *m, void *v)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	seq_printf(m, "processor\t: %d\n"</div><div class='del'>-		"vendor_id\t: %s\n"</div><div class='del'>-		"cpu family\t: 0x%x\n"</div><div class='del'>-		"model name\t: ADSP-%s %lu(MHz CCLK) %lu(MHz SCLK) (%s)\n"</div><div class='add'>+		"vendor_id\t: %s\n",</div><div class='add'>+		*(unsigned int *)v,</div><div class='add'>+		vendor);</div><div class='add'>+</div><div class='add'>+	if (CPUID == bfin_cpuid())</div><div class='add'>+		seq_printf(m, "cpu family\t: 0x%04x\n", CPUID);</div><div class='add'>+	else</div><div class='add'>+		seq_printf(m, "cpu family\t: Compiled for:0x%04x, running on:0x%04x\n",</div><div class='add'>+			CPUID, bfin_cpuid());</div><div class='add'>+</div><div class='add'>+	seq_printf(m, "model name\t: ADSP-%s %lu(MHz CCLK) %lu(MHz SCLK) (%s)\n"</div><div class='ctx'> 		"stepping\t: %d\n",</div><div class='del'>-		0,</div><div class='del'>-		vendor,</div><div class='del'>-		(bfin_read_CHIPID() &amp; CHIPID_FAMILY),</div><div class='ctx'> 		cpu, cclk/1000000, sclk/1000000,</div><div class='ctx'> #ifdef CONFIG_MPU</div><div class='ctx'> 		"mpu on",</div><div class='hunk'>@@ -1038,7 +1061,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)</div><div class='ctx'> 	if ((bfin_read_DMEM_CONTROL() &amp; (ENDCPLB | DMC_ENABLE)) != (ENDCPLB | DMC_ENABLE))</div><div class='ctx'> 		dcache_size = 0;</div><div class='ctx'> </div><div class='del'>-	if ((bfin_read_IMEM_CONTROL() &amp; (IMC | ENICPLB)) == (IMC | ENICPLB))</div><div class='add'>+	if ((bfin_read_IMEM_CONTROL() &amp; (IMC | ENICPLB)) != (IMC | ENICPLB))</div><div class='ctx'> 		icache_size = 0;</div><div class='ctx'> </div><div class='ctx'> 	seq_printf(m, "cache size\t: %d KB(L1 icache) "</div><div class='hunk'>@@ -1127,12 +1150,18 @@ static int show_cpuinfo(struct seq_file *m, void *v)</div><div class='ctx'> </div><div class='ctx'> static void *c_start(struct seq_file *m, loff_t *pos)</div><div class='ctx'> {</div><div class='del'>-	return *pos &lt; NR_CPUS ? ((void *)0x12345678) : NULL;</div><div class='add'>+	if (*pos == 0)</div><div class='add'>+		*pos = first_cpu(cpu_online_map);</div><div class='add'>+	if (*pos &gt;= num_online_cpus())</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	return pos;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void *c_next(struct seq_file *m, void *v, loff_t *pos)</div><div class='ctx'> {</div><div class='del'>-	++*pos;</div><div class='add'>+	*pos = next_cpu(*pos, cpu_online_map);</div><div class='add'>+</div><div class='ctx'> 	return c_start(m, pos);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/blackfin/kernel/traps.c b/arch/blackfin/kernel/traps.c<br/>index 9a9d5083acfd..1aa2c788e228 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/kernel/traps.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/kernel/traps.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/kernel/traps.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/kernel/traps.c</a></div><div class='hunk'>@@ -34,20 +34,19 @@</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;asm/traps.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='add'>+#include &lt;asm/cplb.h&gt;</div><div class='ctx'> #include &lt;asm/blackfin.h&gt;</div><div class='ctx'> #include &lt;asm/irq_handler.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;asm/trace.h&gt;</div><div class='ctx'> #include &lt;asm/fixed_code.h&gt;</div><div class='del'>-#include &lt;asm/dma.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_KGDB</div><div class='del'>-# include &lt;linux/debugger.h&gt;</div><div class='ctx'> # include &lt;linux/kgdb.h&gt;</div><div class='ctx'> </div><div class='ctx'> # define CHK_DEBUGGER_TRAP() \</div><div class='ctx'> 	do { \</div><div class='del'>-		CHK_DEBUGGER(trapnr, sig, info.si_code, fp, ); \</div><div class='add'>+		kgdb_handle_exception(trapnr, sig, info.si_code, fp); \</div><div class='ctx'> 	} while (0)</div><div class='ctx'> # define CHK_DEBUGGER_TRAP_MAYBE() \</div><div class='ctx'> 	do { \</div><div class='hunk'>@@ -59,6 +58,15 @@</div><div class='ctx'> # define CHK_DEBUGGER_TRAP_MAYBE() do { } while (0)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_VERBOSE_DEBUG</div><div class='add'>+#define verbose_printk(fmt, arg...) \</div><div class='add'>+	printk(fmt, ##arg)</div><div class='add'>+#else</div><div class='add'>+#define verbose_printk(fmt, arg...) \</div><div class='add'>+	({ if (0) printk(fmt, ##arg); 0; })</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /* Initiate the event table handler */</div><div class='ctx'> void __init trap_init(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -67,10 +75,19 @@ void __init trap_init(void)</div><div class='ctx'> 	CSYNC();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-unsigned long saved_icplb_fault_addr, saved_dcplb_fault_addr;</div><div class='add'>+/*</div><div class='add'>+ * Used to save the RETX, SEQSTAT, I/D CPLB FAULT ADDR</div><div class='add'>+ * values across the transition from exception to IRQ5.</div><div class='add'>+ * We put these in L1, so they are going to be in a valid</div><div class='add'>+ * location during exception context</div><div class='add'>+ */</div><div class='add'>+__attribute__((l1_data))</div><div class='add'>+unsigned long saved_retx, saved_seqstat,</div><div class='add'>+	saved_icplb_fault_addr, saved_dcplb_fault_addr;</div><div class='ctx'> </div><div class='ctx'> static void decode_address(char *buf, unsigned long address)</div><div class='ctx'> {</div><div class='add'>+#ifdef CONFIG_DEBUG_VERBOSE</div><div class='ctx'> 	struct vm_list_struct *vml;</div><div class='ctx'> 	struct task_struct *p;</div><div class='ctx'> 	struct mm_struct *mm;</div><div class='hunk'>@@ -178,16 +195,39 @@ static void decode_address(char *buf, unsigned long address)</div><div class='ctx'> </div><div class='ctx'> done:</div><div class='ctx'> 	write_unlock_irqrestore(&amp;tasklist_lock, flags);</div><div class='add'>+#else</div><div class='add'>+	sprintf(buf, " ");</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> asmlinkage void double_fault_c(struct pt_regs *fp)</div><div class='ctx'> {</div><div class='ctx'> 	console_verbose();</div><div class='ctx'> 	oops_in_progress = 1;</div><div class='add'>+#ifdef CONFIG_DEBUG_VERBOSE</div><div class='ctx'> 	printk(KERN_EMERG "\n" KERN_EMERG "Double Fault\n");</div><div class='del'>-	dump_bfin_process(fp);</div><div class='del'>-	dump_bfin_mem(fp);</div><div class='del'>-	show_regs(fp);</div><div class='add'>+#ifdef CONFIG_DEBUG_DOUBLEFAULT_PRINT</div><div class='add'>+	if (((long)fp-&gt;seqstat &amp;  SEQSTAT_EXCAUSE) == VEC_UNCOV) {</div><div class='add'>+		char buf[150];</div><div class='add'>+		decode_address(buf, saved_retx);</div><div class='add'>+		printk(KERN_EMERG "While handling exception (EXCAUSE = 0x%x) at %s:\n",</div><div class='add'>+			(int)saved_seqstat &amp; SEQSTAT_EXCAUSE, buf);</div><div class='add'>+		decode_address(buf, saved_dcplb_fault_addr);</div><div class='add'>+		printk(KERN_NOTICE "   DCPLB_FAULT_ADDR: %s\n", buf);</div><div class='add'>+		decode_address(buf, saved_icplb_fault_addr);</div><div class='add'>+		printk(KERN_NOTICE "   ICPLB_FAULT_ADDR: %s\n", buf);</div><div class='add'>+</div><div class='add'>+		decode_address(buf, fp-&gt;retx);</div><div class='add'>+		printk(KERN_NOTICE "The instruction at %s caused a double exception\n",</div><div class='add'>+			buf);</div><div class='add'>+	} else</div><div class='add'>+#endif</div><div class='add'>+	{</div><div class='add'>+		dump_bfin_process(fp);</div><div class='add'>+		dump_bfin_mem(fp);</div><div class='add'>+		show_regs(fp);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='ctx'> 	panic("Double Fault - unrecoverable event\n");</div><div class='ctx'> </div><div class='ctx'> }</div><div class='hunk'>@@ -259,34 +299,42 @@ asmlinkage void trap_c(struct pt_regs *fp)</div><div class='ctx'> 			return;</div><div class='ctx'> 		else</div><div class='ctx'> 			break;</div><div class='add'>+	/* 0x03 - User Defined, userspace stack overflow */</div><div class='add'>+	case VEC_EXCPT03:</div><div class='add'>+		info.si_code = SEGV_STACKFLOW;</div><div class='add'>+		sig = SIGSEGV;</div><div class='add'>+		verbose_printk(KERN_NOTICE EXC_0x03(KERN_NOTICE));</div><div class='add'>+		CHK_DEBUGGER_TRAP_MAYBE();</div><div class='add'>+		break;</div><div class='add'>+	/* 0x02 - KGDB initial connection and break signal trap */</div><div class='add'>+	case VEC_EXCPT02:</div><div class='ctx'> #ifdef CONFIG_KGDB</div><div class='del'>-	case VEC_EXCPT02 :		 /* gdb connection */</div><div class='ctx'> 		info.si_code = TRAP_ILLTRAP;</div><div class='ctx'> 		sig = SIGTRAP;</div><div class='ctx'> 		CHK_DEBUGGER_TRAP();</div><div class='ctx'> 		return;</div><div class='del'>-#else</div><div class='del'>-	/* 0x02 - User Defined, Caught by default */</div><div class='ctx'> #endif</div><div class='del'>-	/* 0x03 - User Defined, userspace stack overflow */</div><div class='del'>-	case VEC_EXCPT03:</div><div class='del'>-		info.si_code = SEGV_STACKFLOW;</div><div class='del'>-		sig = SIGSEGV;</div><div class='del'>-		printk(KERN_NOTICE EXC_0x03(KERN_NOTICE));</div><div class='del'>-		CHK_DEBUGGER_TRAP();</div><div class='add'>+	/* 0x04 - User Defined */</div><div class='add'>+	/* 0x05 - User Defined */</div><div class='add'>+	/* 0x06 - User Defined */</div><div class='add'>+	/* 0x07 - User Defined */</div><div class='add'>+	/* 0x08 - User Defined */</div><div class='add'>+	/* 0x09 - User Defined */</div><div class='add'>+	/* 0x0A - User Defined */</div><div class='add'>+	/* 0x0B - User Defined */</div><div class='add'>+	/* 0x0C - User Defined */</div><div class='add'>+	/* 0x0D - User Defined */</div><div class='add'>+	/* 0x0E - User Defined */</div><div class='add'>+	/* 0x0F - User Defined */</div><div class='add'>+	/* If we got here, it is most likely that someone was trying to use a</div><div class='add'>+	 * custom exception handler, and it is not actually installed properly</div><div class='add'>+	 */</div><div class='add'>+	case VEC_EXCPT04 ... VEC_EXCPT15:</div><div class='add'>+		info.si_code = ILL_ILLPARAOP;</div><div class='add'>+		sig = SIGILL;</div><div class='add'>+		verbose_printk(KERN_NOTICE EXC_0x04(KERN_NOTICE));</div><div class='add'>+		CHK_DEBUGGER_TRAP_MAYBE();</div><div class='ctx'> 		break;</div><div class='del'>-	/* 0x04 - User Defined, Caught by default */</div><div class='del'>-	/* 0x05 - User Defined, Caught by default */</div><div class='del'>-	/* 0x06 - User Defined, Caught by default */</div><div class='del'>-	/* 0x07 - User Defined, Caught by default */</div><div class='del'>-	/* 0x08 - User Defined, Caught by default */</div><div class='del'>-	/* 0x09 - User Defined, Caught by default */</div><div class='del'>-	/* 0x0A - User Defined, Caught by default */</div><div class='del'>-	/* 0x0B - User Defined, Caught by default */</div><div class='del'>-	/* 0x0C - User Defined, Caught by default */</div><div class='del'>-	/* 0x0D - User Defined, Caught by default */</div><div class='del'>-	/* 0x0E - User Defined, Caught by default */</div><div class='del'>-	/* 0x0F - User Defined, Caught by default */</div><div class='ctx'> 	/* 0x10 HW Single step, handled here */</div><div class='ctx'> 	case VEC_STEP:</div><div class='ctx'> 		info.si_code = TRAP_STEP;</div><div class='hunk'>@@ -301,8 +349,8 @@ asmlinkage void trap_c(struct pt_regs *fp)</div><div class='ctx'> 	case VEC_OVFLOW:</div><div class='ctx'> 		info.si_code = TRAP_TRACEFLOW;</div><div class='ctx'> 		sig = SIGTRAP;</div><div class='del'>-		printk(KERN_NOTICE EXC_0x11(KERN_NOTICE));</div><div class='del'>-		CHK_DEBUGGER_TRAP();</div><div class='add'>+		verbose_printk(KERN_NOTICE EXC_0x11(KERN_NOTICE));</div><div class='add'>+		CHK_DEBUGGER_TRAP_MAYBE();</div><div class='ctx'> 		break;</div><div class='ctx'> 	/* 0x12 - Reserved, Caught by default */</div><div class='ctx'> 	/* 0x13 - Reserved, Caught by default */</div><div class='hunk'>@@ -323,44 +371,43 @@ asmlinkage void trap_c(struct pt_regs *fp)</div><div class='ctx'> 	case VEC_UNDEF_I:</div><div class='ctx'> 		info.si_code = ILL_ILLOPC;</div><div class='ctx'> 		sig = SIGILL;</div><div class='del'>-		printk(KERN_NOTICE EXC_0x21(KERN_NOTICE));</div><div class='del'>-		CHK_DEBUGGER_TRAP();</div><div class='add'>+		verbose_printk(KERN_NOTICE EXC_0x21(KERN_NOTICE));</div><div class='add'>+		CHK_DEBUGGER_TRAP_MAYBE();</div><div class='ctx'> 		break;</div><div class='ctx'> 	/* 0x22 - Illegal Instruction Combination, handled here */</div><div class='ctx'> 	case VEC_ILGAL_I:</div><div class='ctx'> 		info.si_code = ILL_ILLPARAOP;</div><div class='ctx'> 		sig = SIGILL;</div><div class='del'>-		printk(KERN_NOTICE EXC_0x22(KERN_NOTICE));</div><div class='del'>-		CHK_DEBUGGER_TRAP();</div><div class='add'>+		verbose_printk(KERN_NOTICE EXC_0x22(KERN_NOTICE));</div><div class='add'>+		CHK_DEBUGGER_TRAP_MAYBE();</div><div class='ctx'> 		break;</div><div class='ctx'> 	/* 0x23 - Data CPLB protection violation, handled here */</div><div class='ctx'> 	case VEC_CPLB_VL:</div><div class='ctx'> 		info.si_code = ILL_CPLB_VI;</div><div class='ctx'> 		sig = SIGBUS;</div><div class='del'>-		printk(KERN_NOTICE EXC_0x23(KERN_NOTICE));</div><div class='del'>-		CHK_DEBUGGER_TRAP();</div><div class='add'>+		verbose_printk(KERN_NOTICE EXC_0x23(KERN_NOTICE));</div><div class='add'>+		CHK_DEBUGGER_TRAP_MAYBE();</div><div class='ctx'> 		break;</div><div class='ctx'> 	/* 0x24 - Data access misaligned, handled here */</div><div class='ctx'> 	case VEC_MISALI_D:</div><div class='ctx'> 		info.si_code = BUS_ADRALN;</div><div class='ctx'> 		sig = SIGBUS;</div><div class='del'>-		printk(KERN_NOTICE EXC_0x24(KERN_NOTICE));</div><div class='del'>-		CHK_DEBUGGER_TRAP();</div><div class='add'>+		verbose_printk(KERN_NOTICE EXC_0x24(KERN_NOTICE));</div><div class='add'>+		CHK_DEBUGGER_TRAP_MAYBE();</div><div class='ctx'> 		break;</div><div class='ctx'> 	/* 0x25 - Unrecoverable Event, handled here */</div><div class='ctx'> 	case VEC_UNCOV:</div><div class='ctx'> 		info.si_code = ILL_ILLEXCPT;</div><div class='ctx'> 		sig = SIGILL;</div><div class='del'>-		printk(KERN_NOTICE EXC_0x25(KERN_NOTICE));</div><div class='del'>-		CHK_DEBUGGER_TRAP();</div><div class='add'>+		verbose_printk(KERN_NOTICE EXC_0x25(KERN_NOTICE));</div><div class='add'>+		CHK_DEBUGGER_TRAP_MAYBE();</div><div class='ctx'> 		break;</div><div class='ctx'> 	/* 0x26 - Data CPLB Miss, normal case is handled in _cplb_hdr,</div><div class='ctx'> 		error case is handled here */</div><div class='ctx'> 	case VEC_CPLB_M:</div><div class='ctx'> 		info.si_code = BUS_ADRALN;</div><div class='ctx'> 		sig = SIGBUS;</div><div class='del'>-		printk(KERN_NOTICE EXC_0x26(KERN_NOTICE));</div><div class='del'>-		CHK_DEBUGGER_TRAP();</div><div class='add'>+		verbose_printk(KERN_NOTICE EXC_0x26(KERN_NOTICE));</div><div class='ctx'> 		break;</div><div class='ctx'> 	/* 0x27 - Data CPLB Multiple Hits - Linux Trap Zero, handled here */</div><div class='ctx'> 	case VEC_CPLB_MHIT:</div><div class='hunk'>@@ -368,11 +415,11 @@ asmlinkage void trap_c(struct pt_regs *fp)</div><div class='ctx'> 		sig = SIGSEGV;</div><div class='ctx'> #ifdef CONFIG_DEBUG_HUNT_FOR_ZERO</div><div class='ctx'> 		if (saved_dcplb_fault_addr &lt; FIXED_CODE_START)</div><div class='del'>-			printk(KERN_NOTICE "NULL pointer access\n");</div><div class='add'>+			verbose_printk(KERN_NOTICE "NULL pointer access\n");</div><div class='ctx'> 		else</div><div class='ctx'> #endif</div><div class='del'>-			printk(KERN_NOTICE EXC_0x27(KERN_NOTICE));</div><div class='del'>-		CHK_DEBUGGER_TRAP();</div><div class='add'>+			verbose_printk(KERN_NOTICE EXC_0x27(KERN_NOTICE));</div><div class='add'>+		CHK_DEBUGGER_TRAP_MAYBE();</div><div class='ctx'> 		break;</div><div class='ctx'> 	/* 0x28 - Emulation Watchpoint, handled here */</div><div class='ctx'> 	case VEC_WATCH:</div><div class='hunk'>@@ -390,8 +437,8 @@ asmlinkage void trap_c(struct pt_regs *fp)</div><div class='ctx'> 	case VEC_ISTRU_VL:      /* ADSP-BF535 only (MH) */</div><div class='ctx'> 		info.si_code = BUS_OPFETCH;</div><div class='ctx'> 		sig = SIGBUS;</div><div class='del'>-		printk(KERN_NOTICE "BF535: VEC_ISTRU_VL\n");</div><div class='del'>-		CHK_DEBUGGER_TRAP();</div><div class='add'>+		verbose_printk(KERN_NOTICE "BF535: VEC_ISTRU_VL\n");</div><div class='add'>+		CHK_DEBUGGER_TRAP_MAYBE();</div><div class='ctx'> 		break;</div><div class='ctx'> #else</div><div class='ctx'> 	/* 0x29 - Reserved, Caught by default */</div><div class='hunk'>@@ -400,22 +447,21 @@ asmlinkage void trap_c(struct pt_regs *fp)</div><div class='ctx'> 	case VEC_MISALI_I:</div><div class='ctx'> 		info.si_code = BUS_ADRALN;</div><div class='ctx'> 		sig = SIGBUS;</div><div class='del'>-		printk(KERN_NOTICE EXC_0x2A(KERN_NOTICE));</div><div class='del'>-		CHK_DEBUGGER_TRAP();</div><div class='add'>+		verbose_printk(KERN_NOTICE EXC_0x2A(KERN_NOTICE));</div><div class='add'>+		CHK_DEBUGGER_TRAP_MAYBE();</div><div class='ctx'> 		break;</div><div class='ctx'> 	/* 0x2B - Instruction CPLB protection violation, handled here */</div><div class='ctx'> 	case VEC_CPLB_I_VL:</div><div class='ctx'> 		info.si_code = ILL_CPLB_VI;</div><div class='ctx'> 		sig = SIGBUS;</div><div class='del'>-		printk(KERN_NOTICE EXC_0x2B(KERN_NOTICE));</div><div class='del'>-		CHK_DEBUGGER_TRAP();</div><div class='add'>+		verbose_printk(KERN_NOTICE EXC_0x2B(KERN_NOTICE));</div><div class='add'>+		CHK_DEBUGGER_TRAP_MAYBE();</div><div class='ctx'> 		break;</div><div class='ctx'> 	/* 0x2C - Instruction CPLB miss, handled in _cplb_hdr */</div><div class='ctx'> 	case VEC_CPLB_I_M:</div><div class='ctx'> 		info.si_code = ILL_CPLB_MISS;</div><div class='ctx'> 		sig = SIGBUS;</div><div class='del'>-		printk(KERN_NOTICE EXC_0x2C(KERN_NOTICE));</div><div class='del'>-		CHK_DEBUGGER_TRAP();</div><div class='add'>+		verbose_printk(KERN_NOTICE EXC_0x2C(KERN_NOTICE));</div><div class='ctx'> 		break;</div><div class='ctx'> 	/* 0x2D - Instruction CPLB Multiple Hits, handled here */</div><div class='ctx'> 	case VEC_CPLB_I_MHIT:</div><div class='hunk'>@@ -423,18 +469,18 @@ asmlinkage void trap_c(struct pt_regs *fp)</div><div class='ctx'> 		sig = SIGSEGV;</div><div class='ctx'> #ifdef CONFIG_DEBUG_HUNT_FOR_ZERO</div><div class='ctx'> 		if (saved_icplb_fault_addr &lt; FIXED_CODE_START)</div><div class='del'>-			printk(KERN_NOTICE "Jump to NULL address\n");</div><div class='add'>+			verbose_printk(KERN_NOTICE "Jump to NULL address\n");</div><div class='ctx'> 		else</div><div class='ctx'> #endif</div><div class='del'>-			printk(KERN_NOTICE EXC_0x2D(KERN_NOTICE));</div><div class='del'>-		CHK_DEBUGGER_TRAP();</div><div class='add'>+			verbose_printk(KERN_NOTICE EXC_0x2D(KERN_NOTICE));</div><div class='add'>+		CHK_DEBUGGER_TRAP_MAYBE();</div><div class='ctx'> 		break;</div><div class='ctx'> 	/* 0x2E - Illegal use of Supervisor Resource, handled here */</div><div class='ctx'> 	case VEC_ILL_RES:</div><div class='ctx'> 		info.si_code = ILL_PRVOPC;</div><div class='ctx'> 		sig = SIGILL;</div><div class='del'>-		printk(KERN_NOTICE EXC_0x2E(KERN_NOTICE));</div><div class='del'>-		CHK_DEBUGGER_TRAP();</div><div class='add'>+		verbose_printk(KERN_NOTICE EXC_0x2E(KERN_NOTICE));</div><div class='add'>+		CHK_DEBUGGER_TRAP_MAYBE();</div><div class='ctx'> 		break;</div><div class='ctx'> 	/* 0x2F - Reserved, Caught by default */</div><div class='ctx'> 	/* 0x30 - Reserved, Caught by default */</div><div class='hunk'>@@ -461,17 +507,17 @@ asmlinkage void trap_c(struct pt_regs *fp)</div><div class='ctx'> 		case (SEQSTAT_HWERRCAUSE_SYSTEM_MMR):</div><div class='ctx'> 			info.si_code = BUS_ADRALN;</div><div class='ctx'> 			sig = SIGBUS;</div><div class='del'>-			printk(KERN_NOTICE HWC_x2(KERN_NOTICE));</div><div class='add'>+			verbose_printk(KERN_NOTICE HWC_x2(KERN_NOTICE));</div><div class='ctx'> 			break;</div><div class='ctx'> 		/* External Memory Addressing Error */</div><div class='ctx'> 		case (SEQSTAT_HWERRCAUSE_EXTERN_ADDR):</div><div class='ctx'> 			info.si_code = BUS_ADRERR;</div><div class='ctx'> 			sig = SIGBUS;</div><div class='del'>-			printk(KERN_NOTICE HWC_x3(KERN_NOTICE));</div><div class='add'>+			verbose_printk(KERN_NOTICE HWC_x3(KERN_NOTICE));</div><div class='ctx'> 			break;</div><div class='ctx'> 		/* Performance Monitor Overflow */</div><div class='ctx'> 		case (SEQSTAT_HWERRCAUSE_PERF_FLOW):</div><div class='del'>-			printk(KERN_NOTICE HWC_x12(KERN_NOTICE));</div><div class='add'>+			verbose_printk(KERN_NOTICE HWC_x12(KERN_NOTICE));</div><div class='ctx'> 			break;</div><div class='ctx'> 		/* RAISE 5 instruction */</div><div class='ctx'> 		case (SEQSTAT_HWERRCAUSE_RAISE_5):</div><div class='hunk'>@@ -481,21 +527,25 @@ asmlinkage void trap_c(struct pt_regs *fp)</div><div class='ctx'> 			printk(KERN_NOTICE HWC_default(KERN_NOTICE));</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		CHK_DEBUGGER_TRAP();</div><div class='add'>+		CHK_DEBUGGER_TRAP_MAYBE();</div><div class='ctx'> 		break;</div><div class='add'>+	/*</div><div class='add'>+	 * We should be handling all known exception types above,</div><div class='add'>+	 * if we get here we hit a reserved one, so panic</div><div class='add'>+	 */</div><div class='ctx'> 	default:</div><div class='del'>-		info.si_code = TRAP_ILLTRAP;</div><div class='del'>-		sig = SIGTRAP;</div><div class='del'>-		printk(KERN_EMERG "Caught Unhandled Exception, code = %08lx\n",</div><div class='add'>+		oops_in_progress = 1;</div><div class='add'>+		info.si_code = ILL_ILLPARAOP;</div><div class='add'>+		sig = SIGILL;</div><div class='add'>+		verbose_printk(KERN_EMERG "Caught Unhandled Exception, code = %08lx\n",</div><div class='ctx'> 			(fp-&gt;seqstat &amp; SEQSTAT_EXCAUSE));</div><div class='del'>-		CHK_DEBUGGER_TRAP();</div><div class='add'>+		CHK_DEBUGGER_TRAP_MAYBE();</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(sig == 0);</div><div class='ctx'> </div><div class='ctx'> 	if (sig != SIGTRAP) {</div><div class='del'>-		unsigned long *stack;</div><div class='ctx'> 		dump_bfin_process(fp);</div><div class='ctx'> 		dump_bfin_mem(fp);</div><div class='ctx'> 		show_regs(fp);</div><div class='hunk'>@@ -503,7 +553,7 @@ asmlinkage void trap_c(struct pt_regs *fp)</div><div class='ctx'> 		/* Print out the trace buffer if it makes sense */</div><div class='ctx'> #ifndef CONFIG_DEBUG_BFIN_NO_KERN_HWTRACE</div><div class='ctx'> 		if (trapnr == VEC_CPLB_I_M || trapnr == VEC_CPLB_M)</div><div class='del'>-			printk(KERN_NOTICE "No trace since you do not have "</div><div class='add'>+			verbose_printk(KERN_NOTICE "No trace since you do not have "</div><div class='ctx'> 				"CONFIG_DEBUG_BFIN_NO_KERN_HWTRACE enabled\n"</div><div class='ctx'> 				KERN_NOTICE "\n");</div><div class='ctx'> 		else</div><div class='hunk'>@@ -512,20 +562,22 @@ asmlinkage void trap_c(struct pt_regs *fp)</div><div class='ctx'> </div><div class='ctx'> 		if (oops_in_progress) {</div><div class='ctx'> 			/* Dump the current kernel stack */</div><div class='del'>-			printk(KERN_NOTICE "\n" KERN_NOTICE "Kernel Stack\n");</div><div class='add'>+			verbose_printk(KERN_NOTICE "\n" KERN_NOTICE "Kernel Stack\n");</div><div class='ctx'> 			show_stack(current, NULL);</div><div class='del'>-</div><div class='ctx'> 			print_modules();</div><div class='ctx'> #ifndef CONFIG_ACCESS_CHECK</div><div class='del'>-			printk(KERN_EMERG "Please turn on "</div><div class='add'>+			verbose_printk(KERN_EMERG "Please turn on "</div><div class='ctx'> 			       "CONFIG_ACCESS_CHECK\n");</div><div class='ctx'> #endif</div><div class='ctx'> 			panic("Kernel exception");</div><div class='ctx'> 		} else {</div><div class='add'>+#ifdef CONFIG_VERBOSE_DEBUG</div><div class='add'>+			unsigned long *stack;</div><div class='ctx'> 			/* Dump the user space stack */</div><div class='ctx'> 			stack = (unsigned long *)rdusp();</div><div class='del'>-			printk(KERN_NOTICE "Userspace Stack\n");</div><div class='add'>+			verbose_printk(KERN_NOTICE "Userspace Stack\n");</div><div class='ctx'> 			show_stack(NULL, stack);</div><div class='add'>+#endif</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -546,7 +598,7 @@ asmlinkage void trap_c(struct pt_regs *fp)</div><div class='ctx'>  * Similar to get_user, do some address checking, then dereference</div><div class='ctx'>  * Return true on sucess, false on bad address</div><div class='ctx'>  */</div><div class='del'>-bool get_instruction(unsigned short *val, unsigned short *address)</div><div class='add'>+static bool get_instruction(unsigned short *val, unsigned short *address)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='ctx'> 	unsigned long addr;</div><div class='hunk'>@@ -592,7 +644,7 @@ bool get_instruction(unsigned short *val, unsigned short *address)</div><div class='ctx'> </div><div class='ctx'> #if L1_CODE_LENGTH != 0</div><div class='ctx'> 	if (addr &gt;= L1_CODE_START &amp;&amp; (addr + 2) &lt;= (L1_CODE_START + L1_CODE_LENGTH)) {</div><div class='del'>-		dma_memcpy(val, address, 2);</div><div class='add'>+		isram_memcpy(val, address, 2);</div><div class='ctx'> 		return true;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='hunk'>@@ -607,45 +659,48 @@ bool get_instruction(unsigned short *val, unsigned short *address)</div><div class='ctx'>  * These are the normal instructions which cause change of flow, which</div><div class='ctx'>  * would be at the source of the trace buffer</div><div class='ctx'>  */</div><div class='del'>-void decode_instruction(unsigned short *address)</div><div class='add'>+#ifdef CONFIG_DEBUG_VERBOSE</div><div class='add'>+static void decode_instruction(unsigned short *address)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned short opcode;</div><div class='ctx'> </div><div class='ctx'> 	if (get_instruction(&amp;opcode, address)) {</div><div class='ctx'> 		if (opcode == 0x0010)</div><div class='del'>-			printk("RTS");</div><div class='add'>+			verbose_printk("RTS");</div><div class='ctx'> 		else if (opcode == 0x0011)</div><div class='del'>-			printk("RTI");</div><div class='add'>+			verbose_printk("RTI");</div><div class='ctx'> 		else if (opcode == 0x0012)</div><div class='del'>-			printk("RTX");</div><div class='add'>+			verbose_printk("RTX");</div><div class='ctx'> 		else if (opcode &gt;= 0x0050 &amp;&amp; opcode &lt;= 0x0057)</div><div class='del'>-			printk("JUMP (P%i)", opcode &amp; 7);</div><div class='add'>+			verbose_printk("JUMP (P%i)", opcode &amp; 7);</div><div class='ctx'> 		else if (opcode &gt;= 0x0060 &amp;&amp; opcode &lt;= 0x0067)</div><div class='del'>-			printk("CALL (P%i)", opcode &amp; 7);</div><div class='add'>+			verbose_printk("CALL (P%i)", opcode &amp; 7);</div><div class='ctx'> 		else if (opcode &gt;= 0x0070 &amp;&amp; opcode &lt;= 0x0077)</div><div class='del'>-			printk("CALL (PC+P%i)", opcode &amp; 7);</div><div class='add'>+			verbose_printk("CALL (PC+P%i)", opcode &amp; 7);</div><div class='ctx'> 		else if (opcode &gt;= 0x0080 &amp;&amp; opcode &lt;= 0x0087)</div><div class='del'>-			printk("JUMP (PC+P%i)", opcode &amp; 7);</div><div class='add'>+			verbose_printk("JUMP (PC+P%i)", opcode &amp; 7);</div><div class='ctx'> 		else if ((opcode &gt;= 0x1000 &amp;&amp; opcode &lt;= 0x13FF) || (opcode &gt;= 0x1800 &amp;&amp; opcode &lt;= 0x1BFF))</div><div class='del'>-			printk("IF !CC JUMP");</div><div class='add'>+			verbose_printk("IF !CC JUMP");</div><div class='ctx'> 		else if ((opcode &gt;= 0x1400 &amp;&amp; opcode &lt;= 0x17ff) || (opcode &gt;= 0x1c00 &amp;&amp; opcode &lt;= 0x1fff))</div><div class='del'>-			printk("IF CC JUMP");</div><div class='add'>+			verbose_printk("IF CC JUMP");</div><div class='ctx'> 		else if (opcode &gt;= 0x2000 &amp;&amp; opcode &lt;= 0x2fff)</div><div class='del'>-			printk("JUMP.S");</div><div class='add'>+			verbose_printk("JUMP.S");</div><div class='ctx'> 		else if (opcode &gt;= 0xe080 &amp;&amp; opcode &lt;= 0xe0ff)</div><div class='del'>-			printk("LSETUP");</div><div class='add'>+			verbose_printk("LSETUP");</div><div class='ctx'> 		else if (opcode &gt;= 0xe200 &amp;&amp; opcode &lt;= 0xe2ff)</div><div class='del'>-			printk("JUMP.L");</div><div class='add'>+			verbose_printk("JUMP.L");</div><div class='ctx'> 		else if (opcode &gt;= 0xe300 &amp;&amp; opcode &lt;= 0xe3ff)</div><div class='del'>-			printk("CALL pcrel");</div><div class='add'>+			verbose_printk("CALL pcrel");</div><div class='ctx'> 		else</div><div class='del'>-			printk("0x%04x", opcode);</div><div class='add'>+			verbose_printk("0x%04x", opcode);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> void dump_bfin_trace_buffer(void)</div><div class='ctx'> {</div><div class='add'>+#ifdef CONFIG_DEBUG_VERBOSE</div><div class='ctx'> #ifdef CONFIG_DEBUG_BFIN_HWTRACE_ON</div><div class='ctx'> 	int tflags, i = 0;</div><div class='ctx'> 	char buf[150];</div><div class='hunk'>@@ -701,6 +756,7 @@ void dump_bfin_trace_buffer(void)</div><div class='ctx'> </div><div class='ctx'> 	trace_buffer_restore(tflags);</div><div class='ctx'> #endif</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(dump_bfin_trace_buffer);</div><div class='ctx'> </div><div class='hunk'>@@ -708,7 +764,7 @@ EXPORT_SYMBOL(dump_bfin_trace_buffer);</div><div class='ctx'>  * Checks to see if the address pointed to is either a</div><div class='ctx'>  * 16-bit CALL instruction, or a 32-bit CALL instruction</div><div class='ctx'>  */</div><div class='del'>-bool is_bfin_call(unsigned short *addr)</div><div class='add'>+static bool is_bfin_call(unsigned short *addr)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned short opcode = 0, *ins_addr;</div><div class='ctx'> 	ins_addr = (unsigned short *)addr;</div><div class='hunk'>@@ -730,8 +786,10 @@ bool is_bfin_call(unsigned short *addr)</div><div class='ctx'> 	return false;</div><div class='ctx'> </div><div class='ctx'> }</div><div class='add'>+</div><div class='ctx'> void show_stack(struct task_struct *task, unsigned long *stack)</div><div class='ctx'> {</div><div class='add'>+#ifdef CONFIG_PRINTK</div><div class='ctx'> 	unsigned int *addr, *endstack, *fp = 0, *frame;</div><div class='ctx'> 	unsigned short *ins_addr;</div><div class='ctx'> 	char buf[150];</div><div class='hunk'>@@ -756,8 +814,10 @@ void show_stack(struct task_struct *task, unsigned long *stack)</div><div class='ctx'> 	} else</div><div class='ctx'> 		endstack = (unsigned int *)PAGE_ALIGN((unsigned int)stack);</div><div class='ctx'> </div><div class='add'>+	printk(KERN_NOTICE "Stack info:\n");</div><div class='ctx'> 	decode_address(buf, (unsigned int)stack);</div><div class='del'>-	printk(KERN_NOTICE "Stack info:\n" KERN_NOTICE " SP: [0x%p] %s\n", stack, buf);</div><div class='add'>+	printk(KERN_NOTICE " SP: [0x%p] %s\n", stack, buf);</div><div class='add'>+</div><div class='ctx'> 	addr = (unsigned int *)((unsigned int)stack &amp; ~0x3F);</div><div class='ctx'> </div><div class='ctx'> 	/* First thing is to look for a frame pointer */</div><div class='hunk'>@@ -848,7 +908,7 @@ void show_stack(struct task_struct *task, unsigned long *stack)</div><div class='ctx'> 		if (!j)</div><div class='ctx'> 			printk("\n");</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void dump_stack(void)</div><div class='hunk'>@@ -866,38 +926,39 @@ EXPORT_SYMBOL(dump_stack);</div><div class='ctx'> </div><div class='ctx'> void dump_bfin_process(struct pt_regs *fp)</div><div class='ctx'> {</div><div class='add'>+#ifdef CONFIG_DEBUG_VERBOSE</div><div class='ctx'> 	/* We should be able to look at fp-&gt;ipend, but we don't push it on the</div><div class='ctx'> 	 * stack all the time, so do this until we fix that */</div><div class='ctx'> 	unsigned int context = bfin_read_IPEND();</div><div class='ctx'> </div><div class='ctx'> 	if (oops_in_progress)</div><div class='del'>-		printk(KERN_EMERG "Kernel OOPS in progress\n");</div><div class='add'>+		verbose_printk(KERN_EMERG "Kernel OOPS in progress\n");</div><div class='ctx'> </div><div class='ctx'> 	if (context &amp; 0x0020 &amp;&amp; (fp-&gt;seqstat &amp; SEQSTAT_EXCAUSE) == VEC_HWERR)</div><div class='del'>-		printk(KERN_NOTICE "HW Error context\n");</div><div class='add'>+		verbose_printk(KERN_NOTICE "HW Error context\n");</div><div class='ctx'> 	else if (context &amp; 0x0020)</div><div class='del'>-		printk(KERN_NOTICE "Deferred Exception context\n");</div><div class='add'>+		verbose_printk(KERN_NOTICE "Deferred Exception context\n");</div><div class='ctx'> 	else if (context &amp; 0x3FC0)</div><div class='del'>-		printk(KERN_NOTICE "Interrupt context\n");</div><div class='add'>+		verbose_printk(KERN_NOTICE "Interrupt context\n");</div><div class='ctx'> 	else if (context &amp; 0x4000)</div><div class='del'>-		printk(KERN_NOTICE "Deferred Interrupt context\n");</div><div class='add'>+		verbose_printk(KERN_NOTICE "Deferred Interrupt context\n");</div><div class='ctx'> 	else if (context &amp; 0x8000)</div><div class='del'>-		printk(KERN_NOTICE "Kernel process context\n");</div><div class='add'>+		verbose_printk(KERN_NOTICE "Kernel process context\n");</div><div class='ctx'> </div><div class='ctx'> 	/* Because we are crashing, and pointers could be bad, we check things</div><div class='ctx'> 	 * pretty closely before we use them</div><div class='ctx'> 	 */</div><div class='ctx'> 	if ((unsigned long)current &gt;= FIXED_CODE_START &amp;&amp;</div><div class='ctx'> 	    !((unsigned long)current &amp; 0x3) &amp;&amp; current-&gt;pid) {</div><div class='del'>-		printk(KERN_NOTICE "CURRENT PROCESS:\n");</div><div class='add'>+		verbose_printk(KERN_NOTICE "CURRENT PROCESS:\n");</div><div class='ctx'> 		if (current-&gt;comm &gt;= (char *)FIXED_CODE_START)</div><div class='del'>-			printk(KERN_NOTICE "COMM=%s PID=%d\n",</div><div class='add'>+			verbose_printk(KERN_NOTICE "COMM=%s PID=%d\n",</div><div class='ctx'> 				current-&gt;comm, current-&gt;pid);</div><div class='ctx'> 		else</div><div class='del'>-			printk(KERN_NOTICE "COMM= invalid\n");</div><div class='add'>+			verbose_printk(KERN_NOTICE "COMM= invalid\n");</div><div class='ctx'> </div><div class='ctx'> 		if (!((unsigned long)current-&gt;mm &amp; 0x3) &amp;&amp; (unsigned long)current-&gt;mm &gt;= FIXED_CODE_START)</div><div class='del'>-			printk(KERN_NOTICE  "TEXT = 0x%p-0x%p        DATA = 0x%p-0x%p\n"</div><div class='add'>+			verbose_printk(KERN_NOTICE  "TEXT = 0x%p-0x%p        DATA = 0x%p-0x%p\n"</div><div class='ctx'> 				KERN_NOTICE " BSS = 0x%p-0x%p  USER-STACK = 0x%p\n"</div><div class='ctx'> 				KERN_NOTICE "\n",</div><div class='ctx'> 				(void *)current-&gt;mm-&gt;start_code,</div><div class='hunk'>@@ -908,38 +969,40 @@ void dump_bfin_process(struct pt_regs *fp)</div><div class='ctx'> 				(void *)current-&gt;mm-&gt;brk,</div><div class='ctx'> 				(void *)current-&gt;mm-&gt;start_stack);</div><div class='ctx'> 		else</div><div class='del'>-			printk(KERN_NOTICE "invalid mm\n");</div><div class='add'>+			verbose_printk(KERN_NOTICE "invalid mm\n");</div><div class='ctx'> 	} else</div><div class='del'>-		printk(KERN_NOTICE "\n" KERN_NOTICE</div><div class='add'>+		verbose_printk(KERN_NOTICE "\n" KERN_NOTICE</div><div class='ctx'> 		     "No Valid process in current context\n");</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void dump_bfin_mem(struct pt_regs *fp)</div><div class='ctx'> {</div><div class='add'>+#ifdef CONFIG_DEBUG_VERBOSE</div><div class='ctx'> 	unsigned short *addr, *erraddr, val = 0, err = 0;</div><div class='ctx'> 	char sti = 0, buf[6];</div><div class='ctx'> </div><div class='ctx'> 	erraddr = (void *)fp-&gt;pc;</div><div class='ctx'> </div><div class='del'>-	printk(KERN_NOTICE "return address: [0x%p]; contents of:", erraddr);</div><div class='add'>+	verbose_printk(KERN_NOTICE "return address: [0x%p]; contents of:", erraddr);</div><div class='ctx'> </div><div class='ctx'> 	for (addr = (unsigned short *)((unsigned long)erraddr &amp; ~0xF) - 0x10;</div><div class='ctx'> 	     addr &lt; (unsigned short *)((unsigned long)erraddr &amp; ~0xF) + 0x10;</div><div class='ctx'> 	     addr++) {</div><div class='ctx'> 		if (!((unsigned long)addr &amp; 0xF))</div><div class='del'>-			printk("\n" KERN_NOTICE "0x%p: ", addr);</div><div class='add'>+			verbose_printk("\n" KERN_NOTICE "0x%p: ", addr);</div><div class='ctx'> </div><div class='del'>-		if (get_instruction(&amp;val, addr)) {</div><div class='add'>+		if (!get_instruction(&amp;val, addr)) {</div><div class='ctx'> 				val = 0;</div><div class='ctx'> 				sprintf(buf, "????");</div><div class='ctx'> 		} else</div><div class='ctx'> 			sprintf(buf, "%04x", val);</div><div class='ctx'> </div><div class='ctx'> 		if (addr == erraddr) {</div><div class='del'>-			printk("[%s]", buf);</div><div class='add'>+			verbose_printk("[%s]", buf);</div><div class='ctx'> 			err = val;</div><div class='ctx'> 		} else</div><div class='del'>-			printk(" %s ", buf);</div><div class='add'>+			verbose_printk(" %s ", buf);</div><div class='ctx'> </div><div class='ctx'> 		/* Do any previous instructions turn on interrupts? */</div><div class='ctx'> 		if (addr &lt;= erraddr &amp;&amp;				/* in the past */</div><div class='hunk'>@@ -948,14 +1011,14 @@ void dump_bfin_mem(struct pt_regs *fp)</div><div class='ctx'> 			sti = 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	printk("\n");</div><div class='add'>+	verbose_printk("\n");</div><div class='ctx'> </div><div class='ctx'> 	/* Hardware error interrupts can be deferred */</div><div class='ctx'> 	if (unlikely(sti &amp;&amp; (fp-&gt;seqstat &amp; SEQSTAT_EXCAUSE) == VEC_HWERR &amp;&amp;</div><div class='ctx'> 	    oops_in_progress)){</div><div class='del'>-		printk(KERN_NOTICE "Looks like this was a deferred error - sorry\n");</div><div class='add'>+		verbose_printk(KERN_NOTICE "Looks like this was a deferred error - sorry\n");</div><div class='ctx'> #ifndef CONFIG_DEBUG_HWERR</div><div class='del'>-		printk(KERN_NOTICE "The remaining message may be meaningless\n"</div><div class='add'>+		verbose_printk(KERN_NOTICE "The remaining message may be meaningless\n"</div><div class='ctx'> 			KERN_NOTICE "You should enable CONFIG_DEBUG_HWERR to get a"</div><div class='ctx'> 			 " better idea where it came from\n");</div><div class='ctx'> #else</div><div class='hunk'>@@ -969,34 +1032,47 @@ void dump_bfin_mem(struct pt_regs *fp)</div><div class='ctx'> 			/* And the last RETI points to the current userspace context */</div><div class='ctx'> 			if ((fp + 1)-&gt;pc &gt;= current-&gt;mm-&gt;start_code &amp;&amp;</div><div class='ctx'> 			    (fp + 1)-&gt;pc &lt;= current-&gt;mm-&gt;end_code) {</div><div class='del'>-				printk(KERN_NOTICE "It might be better to look around here : \n");</div><div class='del'>-				printk(KERN_NOTICE "-------------------------------------------\n");</div><div class='add'>+				verbose_printk(KERN_NOTICE "It might be better to look around here : \n");</div><div class='add'>+				verbose_printk(KERN_NOTICE "-------------------------------------------\n");</div><div class='ctx'> 				show_regs(fp + 1);</div><div class='del'>-				printk(KERN_NOTICE "-------------------------------------------\n");</div><div class='add'>+				verbose_printk(KERN_NOTICE "-------------------------------------------\n");</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> #endif</div><div class='ctx'> 	}</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void show_regs(struct pt_regs *fp)</div><div class='ctx'> {</div><div class='add'>+#ifdef CONFIG_DEBUG_VERBOSE</div><div class='ctx'> 	char buf [150];</div><div class='ctx'> 	struct irqaction *action;</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	printk(KERN_NOTICE "\n" KERN_NOTICE "SEQUENCER STATUS:\t\t%s\n", print_tainted());</div><div class='del'>-	printk(KERN_NOTICE " SEQSTAT: %08lx  IPEND: %04lx  SYSCFG: %04lx\n",</div><div class='add'>+	verbose_printk(KERN_NOTICE "\n" KERN_NOTICE "SEQUENCER STATUS:\t\t%s\n", print_tainted());</div><div class='add'>+	verbose_printk(KERN_NOTICE " SEQSTAT: %08lx  IPEND: %04lx  SYSCFG: %04lx\n",</div><div class='ctx'> 		(long)fp-&gt;seqstat, fp-&gt;ipend, fp-&gt;syscfg);</div><div class='del'>-	printk(KERN_NOTICE "  HWERRCAUSE: 0x%lx\n",</div><div class='del'>-		(fp-&gt;seqstat &amp; SEQSTAT_HWERRCAUSE) &gt;&gt; 14);</div><div class='del'>-	printk(KERN_NOTICE "  EXCAUSE   : 0x%lx\n",</div><div class='add'>+	if ((fp-&gt;seqstat &amp; SEQSTAT_EXCAUSE) == VEC_HWERR) {</div><div class='add'>+		verbose_printk(KERN_NOTICE "  HWERRCAUSE: 0x%lx\n",</div><div class='add'>+			(fp-&gt;seqstat &amp; SEQSTAT_HWERRCAUSE) &gt;&gt; 14);</div><div class='add'>+#ifdef EBIU_ERRMST</div><div class='add'>+		/* If the error was from the EBIU, print it out */</div><div class='add'>+		if (bfin_read_EBIU_ERRMST() &amp; CORE_ERROR) {</div><div class='add'>+			verbose_printk(KERN_NOTICE "  EBIU Error Reason  : 0x%04x\n",</div><div class='add'>+				bfin_read_EBIU_ERRMST());</div><div class='add'>+			verbose_printk(KERN_NOTICE "  EBIU Error Address : 0x%08x\n",</div><div class='add'>+				bfin_read_EBIU_ERRADD());</div><div class='add'>+		}</div><div class='add'>+#endif</div><div class='add'>+	}</div><div class='add'>+	verbose_printk(KERN_NOTICE "  EXCAUSE   : 0x%lx\n",</div><div class='ctx'> 		fp-&gt;seqstat &amp; SEQSTAT_EXCAUSE);</div><div class='ctx'> 	for (i = 6; i &lt;= 15 ; i++) {</div><div class='ctx'> 		if (fp-&gt;ipend &amp; (1 &lt;&lt; i)) {</div><div class='ctx'> 			decode_address(buf, bfin_read32(EVT0 + 4*i));</div><div class='del'>-			printk(KERN_NOTICE "  physical IVG%i asserted : %s\n", i, buf);</div><div class='add'>+			verbose_printk(KERN_NOTICE "  physical IVG%i asserted : %s\n", i, buf);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1009,64 +1085,65 @@ void show_regs(struct pt_regs *fp)</div><div class='ctx'> 				goto unlock;</div><div class='ctx'> </div><div class='ctx'> 			decode_address(buf, (unsigned int)action-&gt;handler);</div><div class='del'>-			printk(KERN_NOTICE "  logical irq %3d mapped  : %s", i, buf);</div><div class='add'>+			verbose_printk(KERN_NOTICE "  logical irq %3d mapped  : %s", i, buf);</div><div class='ctx'> 			for (action = action-&gt;next; action; action = action-&gt;next) {</div><div class='ctx'> 				decode_address(buf, (unsigned int)action-&gt;handler);</div><div class='del'>-				printk(", %s", buf);</div><div class='add'>+				verbose_printk(", %s", buf);</div><div class='ctx'> 			}</div><div class='del'>-			printk("\n");</div><div class='add'>+			verbose_printk("\n");</div><div class='ctx'> unlock:</div><div class='ctx'> 			spin_unlock_irqrestore(&amp;irq_desc[i].lock, flags);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	decode_address(buf, fp-&gt;rete);</div><div class='del'>-	printk(KERN_NOTICE " RETE: %s\n", buf);</div><div class='add'>+	verbose_printk(KERN_NOTICE " RETE: %s\n", buf);</div><div class='ctx'> 	decode_address(buf, fp-&gt;retn);</div><div class='del'>-	printk(KERN_NOTICE " RETN: %s\n", buf);</div><div class='add'>+	verbose_printk(KERN_NOTICE " RETN: %s\n", buf);</div><div class='ctx'> 	decode_address(buf, fp-&gt;retx);</div><div class='del'>-	printk(KERN_NOTICE " RETX: %s\n", buf);</div><div class='add'>+	verbose_printk(KERN_NOTICE " RETX: %s\n", buf);</div><div class='ctx'> 	decode_address(buf, fp-&gt;rets);</div><div class='del'>-	printk(KERN_NOTICE " RETS: %s\n", buf);</div><div class='add'>+	verbose_printk(KERN_NOTICE " RETS: %s\n", buf);</div><div class='ctx'> 	decode_address(buf, fp-&gt;pc);</div><div class='del'>-	printk(KERN_NOTICE " PC  : %s\n", buf);</div><div class='add'>+	verbose_printk(KERN_NOTICE " PC  : %s\n", buf);</div><div class='ctx'> </div><div class='ctx'> 	if (((long)fp-&gt;seqstat &amp;  SEQSTAT_EXCAUSE) &amp;&amp;</div><div class='ctx'> 	    (((long)fp-&gt;seqstat &amp; SEQSTAT_EXCAUSE) != VEC_HWERR)) {</div><div class='ctx'> 		decode_address(buf, saved_dcplb_fault_addr);</div><div class='del'>-		printk(KERN_NOTICE "DCPLB_FAULT_ADDR: %s\n", buf);</div><div class='add'>+		verbose_printk(KERN_NOTICE "DCPLB_FAULT_ADDR: %s\n", buf);</div><div class='ctx'> 		decode_address(buf, saved_icplb_fault_addr);</div><div class='del'>-		printk(KERN_NOTICE "ICPLB_FAULT_ADDR: %s\n", buf);</div><div class='add'>+		verbose_printk(KERN_NOTICE "ICPLB_FAULT_ADDR: %s\n", buf);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	printk(KERN_NOTICE "\n" KERN_NOTICE "PROCESSOR STATE:\n");</div><div class='del'>-	printk(KERN_NOTICE " R0 : %08lx    R1 : %08lx    R2 : %08lx    R3 : %08lx\n",</div><div class='add'>+	verbose_printk(KERN_NOTICE "\n" KERN_NOTICE "PROCESSOR STATE:\n");</div><div class='add'>+	verbose_printk(KERN_NOTICE " R0 : %08lx    R1 : %08lx    R2 : %08lx    R3 : %08lx\n",</div><div class='ctx'> 		fp-&gt;r0, fp-&gt;r1, fp-&gt;r2, fp-&gt;r3);</div><div class='del'>-	printk(KERN_NOTICE " R4 : %08lx    R5 : %08lx    R6 : %08lx    R7 : %08lx\n",</div><div class='add'>+	verbose_printk(KERN_NOTICE " R4 : %08lx    R5 : %08lx    R6 : %08lx    R7 : %08lx\n",</div><div class='ctx'> 		fp-&gt;r4, fp-&gt;r5, fp-&gt;r6, fp-&gt;r7);</div><div class='del'>-	printk(KERN_NOTICE " P0 : %08lx    P1 : %08lx    P2 : %08lx    P3 : %08lx\n",</div><div class='add'>+	verbose_printk(KERN_NOTICE " P0 : %08lx    P1 : %08lx    P2 : %08lx    P3 : %08lx\n",</div><div class='ctx'> 		fp-&gt;p0, fp-&gt;p1, fp-&gt;p2, fp-&gt;p3);</div><div class='del'>-	printk(KERN_NOTICE " P4 : %08lx    P5 : %08lx    FP : %08lx    SP : %08lx\n",</div><div class='add'>+	verbose_printk(KERN_NOTICE " P4 : %08lx    P5 : %08lx    FP : %08lx    SP : %08lx\n",</div><div class='ctx'> 		fp-&gt;p4, fp-&gt;p5, fp-&gt;fp, (long)fp);</div><div class='del'>-	printk(KERN_NOTICE " LB0: %08lx    LT0: %08lx    LC0: %08lx\n",</div><div class='add'>+	verbose_printk(KERN_NOTICE " LB0: %08lx    LT0: %08lx    LC0: %08lx\n",</div><div class='ctx'> 		fp-&gt;lb0, fp-&gt;lt0, fp-&gt;lc0);</div><div class='del'>-	printk(KERN_NOTICE " LB1: %08lx    LT1: %08lx    LC1: %08lx\n",</div><div class='add'>+	verbose_printk(KERN_NOTICE " LB1: %08lx    LT1: %08lx    LC1: %08lx\n",</div><div class='ctx'> 		fp-&gt;lb1, fp-&gt;lt1, fp-&gt;lc1);</div><div class='del'>-	printk(KERN_NOTICE " B0 : %08lx    L0 : %08lx    M0 : %08lx    I0 : %08lx\n",</div><div class='add'>+	verbose_printk(KERN_NOTICE " B0 : %08lx    L0 : %08lx    M0 : %08lx    I0 : %08lx\n",</div><div class='ctx'> 		fp-&gt;b0, fp-&gt;l0, fp-&gt;m0, fp-&gt;i0);</div><div class='del'>-	printk(KERN_NOTICE " B1 : %08lx    L1 : %08lx    M1 : %08lx    I1 : %08lx\n",</div><div class='add'>+	verbose_printk(KERN_NOTICE " B1 : %08lx    L1 : %08lx    M1 : %08lx    I1 : %08lx\n",</div><div class='ctx'> 		fp-&gt;b1, fp-&gt;l1, fp-&gt;m1, fp-&gt;i1);</div><div class='del'>-	printk(KERN_NOTICE " B2 : %08lx    L2 : %08lx    M2 : %08lx    I2 : %08lx\n",</div><div class='add'>+	verbose_printk(KERN_NOTICE " B2 : %08lx    L2 : %08lx    M2 : %08lx    I2 : %08lx\n",</div><div class='ctx'> 		fp-&gt;b2, fp-&gt;l2, fp-&gt;m2, fp-&gt;i2);</div><div class='del'>-	printk(KERN_NOTICE " B3 : %08lx    L3 : %08lx    M3 : %08lx    I3 : %08lx\n",</div><div class='add'>+	verbose_printk(KERN_NOTICE " B3 : %08lx    L3 : %08lx    M3 : %08lx    I3 : %08lx\n",</div><div class='ctx'> 		fp-&gt;b3, fp-&gt;l3, fp-&gt;m3, fp-&gt;i3);</div><div class='del'>-	printk(KERN_NOTICE "A0.w: %08lx   A0.x: %08lx   A1.w: %08lx   A1.x: %08lx\n",</div><div class='add'>+	verbose_printk(KERN_NOTICE "A0.w: %08lx   A0.x: %08lx   A1.w: %08lx   A1.x: %08lx\n",</div><div class='ctx'> 		fp-&gt;a0w, fp-&gt;a0x, fp-&gt;a1w, fp-&gt;a1x);</div><div class='ctx'> </div><div class='del'>-	printk(KERN_NOTICE "USP : %08lx  ASTAT: %08lx\n",</div><div class='add'>+	verbose_printk(KERN_NOTICE "USP : %08lx  ASTAT: %08lx\n",</div><div class='ctx'> 		rdusp(), fp-&gt;astat);</div><div class='ctx'> </div><div class='del'>-	printk(KERN_NOTICE "\n");</div><div class='add'>+	verbose_printk(KERN_NOTICE "\n");</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SYS_BFIN_SPINLOCK_L1</div><div class='head'>diff --git a/arch/blackfin/mach-bf527/boards/Kconfig b/arch/blackfin/mach-bf527/boards/Kconfig<br/>index 8bf9e58f0148..df224d04e167 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mach-bf527/boards/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/mach-bf527/boards/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mach-bf527/boards/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-bf527/boards/Kconfig</a></div><div class='hunk'>@@ -14,4 +14,9 @@ config BFIN527_BLUETECHNIX_CM</div><div class='ctx'> 	help</div><div class='ctx'> 	  CM-BF527 support for EVAL- and DEV-Board.</div><div class='ctx'> </div><div class='add'>+config BFIN526_EZBRD</div><div class='add'>+	bool "BF526-EZBRD"</div><div class='add'>+	help</div><div class='add'>+	  BF526-EZBRD/EZKIT Lite board support.</div><div class='add'>+</div><div class='ctx'> endchoice</div><div class='head'>diff --git a/arch/blackfin/mach-bf527/boards/Makefile b/arch/blackfin/mach-bf527/boards/Makefile<br/>index 7ba7d256bbb8..eb6ed3362f9f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mach-bf527/boards/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/mach-bf527/boards/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mach-bf527/boards/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-bf527/boards/Makefile</a></div><div class='hunk'>@@ -4,3 +4,4 @@</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_BFIN527_EZKIT)            += ezkit.o</div><div class='ctx'> obj-$(CONFIG_BFIN527_BLUETECHNIX_CM)   += cm_bf527.o</div><div class='add'>+obj-$(CONFIG_BFIN526_EZBRD)            += ezbrd.o</div><div class='head'>diff --git a/arch/blackfin/mach-bf527/boards/cm_bf527.c b/arch/blackfin/mach-bf527/boards/cm_bf527.c<br/>index d22bc7773717..9ea440bbb13d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mach-bf527/boards/cm_bf527.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/mach-bf527/boards/cm_bf527.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mach-bf527/boards/cm_bf527.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-bf527/boards/cm_bf527.c</a></div><div class='hunk'>@@ -43,10 +43,7 @@</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/usb/sl811.h&gt;</div><div class='del'>-#if defined(CONFIG_USB_MUSB_HDRC) || defined(CONFIG_USB_MUSB_HDRC_MODULE)</div><div class='ctx'> #include &lt;linux/usb/musb.h&gt;</div><div class='del'>-#endif</div><div class='del'>-#include &lt;asm/cplb.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='ctx'> #include &lt;asm/bfin5xx_spi.h&gt;</div><div class='ctx'> #include &lt;asm/reboot.h&gt;</div><div class='hunk'>@@ -130,6 +127,16 @@ static struct resource musb_resources[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct musb_hdrc_config musb_config = {</div><div class='add'>+	.multipoint	= 0,</div><div class='add'>+	.dyn_fifo	= 0,</div><div class='add'>+	.soft_con	= 1,</div><div class='add'>+	.dma		= 1,</div><div class='add'>+	.num_eps	= 7,</div><div class='add'>+	.dma_channels	= 7,</div><div class='add'>+	.gpio_vrsel	= GPIO_PF11,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct musb_hdrc_platform_data musb_plat = {</div><div class='ctx'> #if defined(CONFIG_USB_MUSB_OTG)</div><div class='ctx'> 	.mode		= MUSB_OTG,</div><div class='hunk'>@@ -138,7 +145,7 @@ static struct musb_hdrc_platform_data musb_plat = {</div><div class='ctx'> #elif defined(CONFIG_USB_GADGET_MUSB_HDRC)</div><div class='ctx'> 	.mode		= MUSB_PERIPHERAL,</div><div class='ctx'> #endif</div><div class='del'>-	.multipoint	= 0,</div><div class='add'>+	.config		= &amp;musb_config,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static u64 musb_dmamask = ~(u32)0;</div><div class='hunk'>@@ -201,7 +208,7 @@ static struct mtd_partition partition_info[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.name = "linux kernel(nand)",</div><div class='ctx'> 		.offset = 0,</div><div class='del'>-		.size = 4 * SIZE_1M,</div><div class='add'>+		.size = 4 * 1024 * 1024,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.name = "file system(nand)",</div><div class='head'>diff --git a/arch/blackfin/mach-bf527/boards/ezbrd.c b/arch/blackfin/mach-bf527/boards/ezbrd.c<br/>new file mode 100644<br/>index 000000000000..36c87b6fbdec<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mach-bf527/boards/ezbrd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-bf527/boards/ezbrd.c</a></div><div class='hunk'>@@ -0,0 +1,734 @@</div><div class='add'>+/*</div><div class='add'>+ * File:         arch/blackfin/mach-bf527/boards/ezbrd.c</div><div class='add'>+ * Based on:     arch/blackfin/mach-bf537/boards/stamp.c</div><div class='add'>+ * Author:       Aidan Williams &lt;aidan@nicta.com.au&gt;</div><div class='add'>+ *</div><div class='add'>+ * Created:</div><div class='add'>+ * Description:</div><div class='add'>+ *</div><div class='add'>+ * Modified:</div><div class='add'>+ *               Copyright 2005 National ICT Australia (NICTA)</div><div class='add'>+ *               Copyright 2004-2008 Analog Devices Inc.</div><div class='add'>+ *</div><div class='add'>+ * Bugs:         Enter bugs at http://blackfin.uclinux.org/</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, see the file COPYING, or write</div><div class='add'>+ * to the Free Software Foundation, Inc.,</div><div class='add'>+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/mtd/mtd.h&gt;</div><div class='add'>+#include &lt;linux/mtd/partitions.h&gt;</div><div class='add'>+#include &lt;linux/mtd/physmap.h&gt;</div><div class='add'>+#include &lt;linux/spi/spi.h&gt;</div><div class='add'>+#include &lt;linux/spi/flash.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/usb/musb.h&gt;</div><div class='add'>+#include &lt;asm/dma.h&gt;</div><div class='add'>+#include &lt;asm/bfin5xx_spi.h&gt;</div><div class='add'>+#include &lt;asm/reboot.h&gt;</div><div class='add'>+#include &lt;asm/nand.h&gt;</div><div class='add'>+#include &lt;asm/portmux.h&gt;</div><div class='add'>+#include &lt;asm/dpmc.h&gt;</div><div class='add'>+#include &lt;linux/spi/ad7877.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Name the Board for the /proc/cpuinfo</div><div class='add'>+ */</div><div class='add'>+const char bfin_board_name[] = "BF526-EZBRD";</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  Driver needs to know address, irq and flag pin.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_USB_MUSB_HDRC) || defined(CONFIG_USB_MUSB_HDRC_MODULE)</div><div class='add'>+static struct resource musb_resources[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start	= 0xffc03800,</div><div class='add'>+		.end	= 0xffc03cff,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[1] = {	/* general IRQ */</div><div class='add'>+		.start	= IRQ_USB_INT0,</div><div class='add'>+		.end	= IRQ_USB_INT0,</div><div class='add'>+		.flags	= IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,</div><div class='add'>+	},</div><div class='add'>+	[2] = {	/* DMA IRQ */</div><div class='add'>+		.start	= IRQ_USB_DMA,</div><div class='add'>+		.end	= IRQ_USB_DMA,</div><div class='add'>+		.flags	= IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct musb_hdrc_config musb_config = {</div><div class='add'>+	.multipoint	= 0,</div><div class='add'>+	.dyn_fifo	= 0,</div><div class='add'>+	.soft_con	= 1,</div><div class='add'>+	.dma		= 1,</div><div class='add'>+	.num_eps	= 7,</div><div class='add'>+	.dma_channels	= 7,</div><div class='add'>+	.gpio_vrsel	= GPIO_PG13,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct musb_hdrc_platform_data musb_plat = {</div><div class='add'>+#if defined(CONFIG_USB_MUSB_OTG)</div><div class='add'>+	.mode		= MUSB_OTG,</div><div class='add'>+#elif defined(CONFIG_USB_MUSB_HDRC_HCD)</div><div class='add'>+	.mode		= MUSB_HOST,</div><div class='add'>+#elif defined(CONFIG_USB_GADGET_MUSB_HDRC)</div><div class='add'>+	.mode		= MUSB_PERIPHERAL,</div><div class='add'>+#endif</div><div class='add'>+	.config		= &amp;musb_config,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u64 musb_dmamask = ~(u32)0;</div><div class='add'>+</div><div class='add'>+static struct platform_device musb_device = {</div><div class='add'>+	.name		= "musb_hdrc",</div><div class='add'>+	.id		= 0,</div><div class='add'>+	.dev = {</div><div class='add'>+		.dma_mask		= &amp;musb_dmamask,</div><div class='add'>+		.coherent_dma_mask	= 0xffffffff,</div><div class='add'>+		.platform_data		= &amp;musb_plat,</div><div class='add'>+	},</div><div class='add'>+	.num_resources	= ARRAY_SIZE(musb_resources),</div><div class='add'>+	.resource	= musb_resources,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE)</div><div class='add'>+static struct mtd_partition ezbrd_partitions[] = {</div><div class='add'>+	{</div><div class='add'>+		.name       = "bootloader(nor)",</div><div class='add'>+		.size       = 0x40000,</div><div class='add'>+		.offset     = 0,</div><div class='add'>+	}, {</div><div class='add'>+		.name       = "linux kernel(nor)",</div><div class='add'>+		.size       = 0x1C0000,</div><div class='add'>+		.offset     = MTDPART_OFS_APPEND,</div><div class='add'>+	}, {</div><div class='add'>+		.name       = "file system(nor)",</div><div class='add'>+		.size       = MTDPART_SIZ_FULL,</div><div class='add'>+		.offset     = MTDPART_OFS_APPEND,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct physmap_flash_data ezbrd_flash_data = {</div><div class='add'>+	.width      = 2,</div><div class='add'>+	.parts      = ezbrd_partitions,</div><div class='add'>+	.nr_parts   = ARRAY_SIZE(ezbrd_partitions),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource ezbrd_flash_resource = {</div><div class='add'>+	.start = 0x20000000,</div><div class='add'>+	.end   = 0x203fffff,</div><div class='add'>+	.flags = IORESOURCE_MEM,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device ezbrd_flash_device = {</div><div class='add'>+	.name          = "physmap-flash",</div><div class='add'>+	.id            = 0,</div><div class='add'>+	.dev = {</div><div class='add'>+		.platform_data = &amp;ezbrd_flash_data,</div><div class='add'>+	},</div><div class='add'>+	.num_resources = 1,</div><div class='add'>+	.resource      = &amp;ezbrd_flash_resource,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_MTD_NAND_BF5XX) || defined(CONFIG_MTD_NAND_BF5XX_MODULE)</div><div class='add'>+static struct mtd_partition partition_info[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "linux kernel(nand)",</div><div class='add'>+		.offset = 0,</div><div class='add'>+		.size = 4 * 1024 * 1024,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "file system(nand)",</div><div class='add'>+		.offset = MTDPART_OFS_APPEND,</div><div class='add'>+		.size = MTDPART_SIZ_FULL,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct bf5xx_nand_platform bf5xx_nand_platform = {</div><div class='add'>+	.page_size = NFC_PG_SIZE_256,</div><div class='add'>+	.data_width = NFC_NWIDTH_8,</div><div class='add'>+	.partitions = partition_info,</div><div class='add'>+	.nr_partitions = ARRAY_SIZE(partition_info),</div><div class='add'>+	.rd_dly = 3,</div><div class='add'>+	.wr_dly = 3,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource bf5xx_nand_resources[] = {</div><div class='add'>+	{</div><div class='add'>+		.start = NFC_CTL,</div><div class='add'>+		.end = NFC_DATA_RD + 2,</div><div class='add'>+		.flags = IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.start = CH_NFC,</div><div class='add'>+		.end = CH_NFC,</div><div class='add'>+		.flags = IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device bf5xx_nand_device = {</div><div class='add'>+	.name = "bf5xx-nand",</div><div class='add'>+	.id = 0,</div><div class='add'>+	.num_resources = ARRAY_SIZE(bf5xx_nand_resources),</div><div class='add'>+	.resource = bf5xx_nand_resources,</div><div class='add'>+	.dev = {</div><div class='add'>+		.platform_data = &amp;bf5xx_nand_platform,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)</div><div class='add'>+static struct platform_device rtc_device = {</div><div class='add'>+	.name = "rtc-bfin",</div><div class='add'>+	.id   = -1,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)</div><div class='add'>+static struct platform_device bfin_mac_device = {</div><div class='add'>+	.name = "bfin_mac",</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_MTD_M25P80) \</div><div class='add'>+	|| defined(CONFIG_MTD_M25P80_MODULE)</div><div class='add'>+static struct mtd_partition bfin_spi_flash_partitions[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "bootloader(spi)",</div><div class='add'>+		.size = 0x00040000,</div><div class='add'>+		.offset = 0,</div><div class='add'>+		.mask_flags = MTD_CAP_ROM</div><div class='add'>+	}, {</div><div class='add'>+		.name = "linux kernel(spi)",</div><div class='add'>+		.size = MTDPART_SIZ_FULL,</div><div class='add'>+		.offset = MTDPART_OFS_APPEND,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct flash_platform_data bfin_spi_flash_data = {</div><div class='add'>+	.name = "m25p80",</div><div class='add'>+	.parts = bfin_spi_flash_partitions,</div><div class='add'>+	.nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions),</div><div class='add'>+	.type = "m25p16",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* SPI flash chip (m25p64) */</div><div class='add'>+static struct bfin5xx_spi_chip spi_flash_chip_info = {</div><div class='add'>+	.enable_dma = 0,         /* use dma transfer with this chip*/</div><div class='add'>+	.bits_per_word = 8,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_SPI_ADC_BF533) \</div><div class='add'>+	|| defined(CONFIG_SPI_ADC_BF533_MODULE)</div><div class='add'>+/* SPI ADC chip */</div><div class='add'>+static struct bfin5xx_spi_chip spi_adc_chip_info = {</div><div class='add'>+	.enable_dma = 1,         /* use dma transfer with this chip*/</div><div class='add'>+	.bits_per_word = 16,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_SPI_MMC) || defined(CONFIG_SPI_MMC_MODULE)</div><div class='add'>+static struct bfin5xx_spi_chip spi_mmc_chip_info = {</div><div class='add'>+	.enable_dma = 1,</div><div class='add'>+	.bits_per_word = 8,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_PBX)</div><div class='add'>+static struct bfin5xx_spi_chip spi_si3xxx_chip_info = {</div><div class='add'>+	.ctl_reg	= 0x4, /* send zero */</div><div class='add'>+	.enable_dma	= 0,</div><div class='add'>+	.bits_per_word	= 8,</div><div class='add'>+	.cs_change_per_word = 1,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE)</div><div class='add'>+static struct bfin5xx_spi_chip spi_ad7877_chip_info = {</div><div class='add'>+	.enable_dma = 0,</div><div class='add'>+	.bits_per_word = 16,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ad7877_platform_data bfin_ad7877_ts_info = {</div><div class='add'>+	.model			= 7877,</div><div class='add'>+	.vref_delay_usecs	= 50,	/* internal, no capacitor */</div><div class='add'>+	.x_plate_ohms		= 419,</div><div class='add'>+	.y_plate_ohms		= 486,</div><div class='add'>+	.pressure_max		= 1000,</div><div class='add'>+	.pressure_min		= 0,</div><div class='add'>+	.stopacq_polarity 	= 1,</div><div class='add'>+	.first_conversion_delay = 3,</div><div class='add'>+	.acquisition_time 	= 1,</div><div class='add'>+	.averaging 		= 1,</div><div class='add'>+	.pen_down_acc_interval 	= 1,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_SND_SOC_WM8731) || defined(CONFIG_SND_SOC_WM8731_MODULE) \</div><div class='add'>+	 &amp;&amp; defined(CONFIG_SND_SOC_WM8731_SPI)</div><div class='add'>+static struct bfin5xx_spi_chip spi_wm8731_chip_info = {</div><div class='add'>+	.enable_dma = 0,</div><div class='add'>+	.bits_per_word = 16,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_SPI_SPIDEV) || defined(CONFIG_SPI_SPIDEV_MODULE)</div><div class='add'>+static struct bfin5xx_spi_chip spidev_chip_info = {</div><div class='add'>+	.enable_dma = 0,</div><div class='add'>+	.bits_per_word = 8,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_FB_BFIN_LQ035Q1) || defined(CONFIG_FB_BFIN_LQ035Q1_MODULE)</div><div class='add'>+static struct bfin5xx_spi_chip lq035q1_spi_chip_info = {</div><div class='add'>+	.enable_dma = 0,</div><div class='add'>+	.bits_per_word = 8,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static struct spi_board_info bfin_spi_board_info[] __initdata = {</div><div class='add'>+#if defined(CONFIG_MTD_M25P80) \</div><div class='add'>+	|| defined(CONFIG_MTD_M25P80_MODULE)</div><div class='add'>+	{</div><div class='add'>+		/* the modalias must be the same as spi device driver name */</div><div class='add'>+		.modalias = "m25p80", /* Name of spi_driver for this device */</div><div class='add'>+		.max_speed_hz = 25000000,     /* max spi clock (SCK) speed in HZ */</div><div class='add'>+		.bus_num = 0, /* Framework bus number */</div><div class='add'>+		.chip_select = 1, /* Framework chip select. On STAMP537 it is SPISSEL1*/</div><div class='add'>+		.platform_data = &amp;bfin_spi_flash_data,</div><div class='add'>+		.controller_data = &amp;spi_flash_chip_info,</div><div class='add'>+		.mode = SPI_MODE_3,</div><div class='add'>+	},</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_SPI_ADC_BF533) \</div><div class='add'>+	|| defined(CONFIG_SPI_ADC_BF533_MODULE)</div><div class='add'>+	{</div><div class='add'>+		.modalias = "bfin_spi_adc", /* Name of spi_driver for this device */</div><div class='add'>+		.max_speed_hz = 6250000,     /* max spi clock (SCK) speed in HZ */</div><div class='add'>+		.bus_num = 0, /* Framework bus number */</div><div class='add'>+		.chip_select = 1, /* Framework chip select. */</div><div class='add'>+		.platform_data = NULL, /* No spi_driver specific config */</div><div class='add'>+		.controller_data = &amp;spi_adc_chip_info,</div><div class='add'>+	},</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_SPI_MMC) || defined(CONFIG_SPI_MMC_MODULE)</div><div class='add'>+	{</div><div class='add'>+		.modalias = "spi_mmc_dummy",</div><div class='add'>+		.max_speed_hz = 25000000,     /* max spi clock (SCK) speed in HZ */</div><div class='add'>+		.bus_num = 0,</div><div class='add'>+		.chip_select = 0,</div><div class='add'>+		.platform_data = NULL,</div><div class='add'>+		.controller_data = &amp;spi_mmc_chip_info,</div><div class='add'>+		.mode = SPI_MODE_3,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.modalias = "spi_mmc",</div><div class='add'>+		.max_speed_hz = 25000000,     /* max spi clock (SCK) speed in HZ */</div><div class='add'>+		.bus_num = 0,</div><div class='add'>+		.chip_select = CONFIG_SPI_MMC_CS_CHAN,</div><div class='add'>+		.platform_data = NULL,</div><div class='add'>+		.controller_data = &amp;spi_mmc_chip_info,</div><div class='add'>+		.mode = SPI_MODE_3,</div><div class='add'>+	},</div><div class='add'>+#endif</div><div class='add'>+#if defined(CONFIG_PBX)</div><div class='add'>+	{</div><div class='add'>+		.modalias = "fxs-spi",</div><div class='add'>+		.max_speed_hz = 12500000,     /* max spi clock (SCK) speed in HZ */</div><div class='add'>+		.bus_num = 0,</div><div class='add'>+		.chip_select = 8 - CONFIG_J11_JUMPER,</div><div class='add'>+		.controller_data = &amp;spi_si3xxx_chip_info,</div><div class='add'>+		.mode = SPI_MODE_3,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.modalias = "fxo-spi",</div><div class='add'>+		.max_speed_hz = 12500000,     /* max spi clock (SCK) speed in HZ */</div><div class='add'>+		.bus_num = 0,</div><div class='add'>+		.chip_select = 8 - CONFIG_J19_JUMPER,</div><div class='add'>+		.controller_data = &amp;spi_si3xxx_chip_info,</div><div class='add'>+		.mode = SPI_MODE_3,</div><div class='add'>+	},</div><div class='add'>+#endif</div><div class='add'>+#if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE)</div><div class='add'>+	{</div><div class='add'>+		.modalias		= "ad7877",</div><div class='add'>+		.platform_data		= &amp;bfin_ad7877_ts_info,</div><div class='add'>+		.irq			= IRQ_PF8,</div><div class='add'>+		.max_speed_hz	= 12500000,     /* max spi clock (SCK) speed in HZ */</div><div class='add'>+		.bus_num	= 0,</div><div class='add'>+		.chip_select  = 2,</div><div class='add'>+		.controller_data = &amp;spi_ad7877_chip_info,</div><div class='add'>+	},</div><div class='add'>+#endif</div><div class='add'>+#if defined(CONFIG_SND_SOC_WM8731) || defined(CONFIG_SND_SOC_WM8731_MODULE) \</div><div class='add'>+	 &amp;&amp; defined(CONFIG_SND_SOC_WM8731_SPI)</div><div class='add'>+	{</div><div class='add'>+		.modalias	= "wm8731",</div><div class='add'>+		.max_speed_hz	= 3125000,     /* max spi clock (SCK) speed in HZ */</div><div class='add'>+		.bus_num	= 0,</div><div class='add'>+		.chip_select    = 5,</div><div class='add'>+		.controller_data = &amp;spi_wm8731_chip_info,</div><div class='add'>+		.mode = SPI_MODE_0,</div><div class='add'>+	},</div><div class='add'>+#endif</div><div class='add'>+#if defined(CONFIG_SPI_SPIDEV) || defined(CONFIG_SPI_SPIDEV_MODULE)</div><div class='add'>+	{</div><div class='add'>+		.modalias = "spidev",</div><div class='add'>+		.max_speed_hz = 3125000,     /* max spi clock (SCK) speed in HZ */</div><div class='add'>+		.bus_num = 0,</div><div class='add'>+		.chip_select = 1,</div><div class='add'>+		.controller_data = &amp;spidev_chip_info,</div><div class='add'>+	},</div><div class='add'>+#endif</div><div class='add'>+#if defined(CONFIG_FB_BFIN_LQ035Q1) || defined(CONFIG_FB_BFIN_LQ035Q1_MODULE)</div><div class='add'>+	{</div><div class='add'>+		.modalias = "bfin-lq035q1-spi",</div><div class='add'>+		.max_speed_hz = 20000000,     /* max spi clock (SCK) speed in HZ */</div><div class='add'>+		.bus_num = 0,</div><div class='add'>+		.chip_select = 1,</div><div class='add'>+		.controller_data = &amp;lq035q1_spi_chip_info,</div><div class='add'>+		.mode = SPI_CPHA | SPI_CPOL,</div><div class='add'>+	},</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)</div><div class='add'>+/* SPI controller data */</div><div class='add'>+static struct bfin5xx_spi_master bfin_spi0_info = {</div><div class='add'>+	.num_chipselect = 8,</div><div class='add'>+	.enable_dma = 1,  /* master has the ability to do dma transfer */</div><div class='add'>+	.pin_req = {P_SPI0_SCK, P_SPI0_MISO, P_SPI0_MOSI, 0},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* SPI (0) */</div><div class='add'>+static struct resource bfin_spi0_resource[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start = SPI0_REGBASE,</div><div class='add'>+		.end   = SPI0_REGBASE + 0xFF,</div><div class='add'>+		.flags = IORESOURCE_MEM,</div><div class='add'>+		},</div><div class='add'>+	[1] = {</div><div class='add'>+		.start = CH_SPI,</div><div class='add'>+		.end   = CH_SPI,</div><div class='add'>+		.flags = IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device bfin_spi0_device = {</div><div class='add'>+	.name = "bfin-spi",</div><div class='add'>+	.id = 0, /* Bus number */</div><div class='add'>+	.num_resources = ARRAY_SIZE(bfin_spi0_resource),</div><div class='add'>+	.resource = bfin_spi0_resource,</div><div class='add'>+	.dev = {</div><div class='add'>+		.platform_data = &amp;bfin_spi0_info, /* Passed to driver */</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+#endif  /* spi master and devices */</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)</div><div class='add'>+static struct resource bfin_uart_resources[] = {</div><div class='add'>+#ifdef CONFIG_SERIAL_BFIN_UART0</div><div class='add'>+	{</div><div class='add'>+		.start = 0xFFC00400,</div><div class='add'>+		.end = 0xFFC004FF,</div><div class='add'>+		.flags = IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_SERIAL_BFIN_UART1</div><div class='add'>+	{</div><div class='add'>+		.start = 0xFFC02000,</div><div class='add'>+		.end = 0xFFC020FF,</div><div class='add'>+		.flags = IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device bfin_uart_device = {</div><div class='add'>+	.name = "bfin-uart",</div><div class='add'>+	.id = 1,</div><div class='add'>+	.num_resources = ARRAY_SIZE(bfin_uart_resources),</div><div class='add'>+	.resource = bfin_uart_resources,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)</div><div class='add'>+static struct resource bfin_sir_resources[] = {</div><div class='add'>+#ifdef CONFIG_BFIN_SIR0</div><div class='add'>+	{</div><div class='add'>+		.start = 0xFFC00400,</div><div class='add'>+		.end = 0xFFC004FF,</div><div class='add'>+		.flags = IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_BFIN_SIR1</div><div class='add'>+	{</div><div class='add'>+		.start = 0xFFC02000,</div><div class='add'>+		.end = 0xFFC020FF,</div><div class='add'>+		.flags = IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device bfin_sir_device = {</div><div class='add'>+	.name = "bfin_sir",</div><div class='add'>+	.id = 0,</div><div class='add'>+	.num_resources = ARRAY_SIZE(bfin_sir_resources),</div><div class='add'>+	.resource = bfin_sir_resources,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)</div><div class='add'>+static struct resource bfin_twi0_resource[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start = TWI0_REGBASE,</div><div class='add'>+		.end   = TWI0_REGBASE,</div><div class='add'>+		.flags = IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.start = IRQ_TWI,</div><div class='add'>+		.end   = IRQ_TWI,</div><div class='add'>+		.flags = IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device i2c_bfin_twi_device = {</div><div class='add'>+	.name = "i2c-bfin-twi",</div><div class='add'>+	.id = 0,</div><div class='add'>+	.num_resources = ARRAY_SIZE(bfin_twi0_resource),</div><div class='add'>+	.resource = bfin_twi0_resource,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_I2C_BOARDINFO</div><div class='add'>+static struct i2c_board_info __initdata bfin_i2c_board_info[] = {</div><div class='add'>+#if defined(CONFIG_TWI_LCD) || defined(CONFIG_TWI_LCD_MODULE)</div><div class='add'>+	{</div><div class='add'>+		I2C_BOARD_INFO("pcf8574_lcd", 0x22),</div><div class='add'>+	},</div><div class='add'>+#endif</div><div class='add'>+#if defined(CONFIG_TWI_KEYPAD) || defined(CONFIG_TWI_KEYPAD_MODULE)</div><div class='add'>+	{</div><div class='add'>+		I2C_BOARD_INFO("pcf8574_keypad", 0x27),</div><div class='add'>+		.irq = IRQ_PF8,</div><div class='add'>+	},</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)</div><div class='add'>+static struct platform_device bfin_sport0_uart_device = {</div><div class='add'>+	.name = "bfin-sport-uart",</div><div class='add'>+	.id = 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device bfin_sport1_uart_device = {</div><div class='add'>+	.name = "bfin-sport-uart",</div><div class='add'>+	.id = 1,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)</div><div class='add'>+#include &lt;linux/input.h&gt;</div><div class='add'>+#include &lt;linux/gpio_keys.h&gt;</div><div class='add'>+</div><div class='add'>+static struct gpio_keys_button bfin_gpio_keys_table[] = {</div><div class='add'>+	{BTN_0, GPIO_PG0, 1, "gpio-keys: BTN0"},</div><div class='add'>+	{BTN_1, GPIO_PG13, 1, "gpio-keys: BTN1"},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct gpio_keys_platform_data bfin_gpio_keys_data = {</div><div class='add'>+	.buttons        = bfin_gpio_keys_table,</div><div class='add'>+	.nbuttons       = ARRAY_SIZE(bfin_gpio_keys_table),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device bfin_device_gpiokeys = {</div><div class='add'>+	.name      = "gpio-keys",</div><div class='add'>+	.dev = {</div><div class='add'>+		.platform_data = &amp;bfin_gpio_keys_data,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static struct resource bfin_gpios_resources = {</div><div class='add'>+	.start = 0,</div><div class='add'>+	.end   = MAX_BLACKFIN_GPIOS - 1,</div><div class='add'>+	.flags = IORESOURCE_IRQ,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device bfin_gpios_device = {</div><div class='add'>+	.name = "simple-gpio",</div><div class='add'>+	.id = -1,</div><div class='add'>+	.num_resources = 1,</div><div class='add'>+	.resource = &amp;bfin_gpios_resources,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const unsigned int cclk_vlev_datasheet[] =</div><div class='add'>+{</div><div class='add'>+	VRPAIR(VLEV_100, 400000000),</div><div class='add'>+	VRPAIR(VLEV_105, 426000000),</div><div class='add'>+	VRPAIR(VLEV_110, 500000000),</div><div class='add'>+	VRPAIR(VLEV_115, 533000000),</div><div class='add'>+	VRPAIR(VLEV_120, 600000000),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct bfin_dpmc_platform_data bfin_dmpc_vreg_data = {</div><div class='add'>+	.tuple_tab = cclk_vlev_datasheet,</div><div class='add'>+	.tabsize = ARRAY_SIZE(cclk_vlev_datasheet),</div><div class='add'>+	.vr_settling_time = 25 /* us */,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device bfin_dpmc = {</div><div class='add'>+	.name = "bfin dpmc",</div><div class='add'>+	.dev = {</div><div class='add'>+		.platform_data = &amp;bfin_dmpc_vreg_data,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_FB_BFIN_LQ035Q1) || defined(CONFIG_FB_BFIN_LQ035Q1_MODULE)</div><div class='add'>+#include &lt;asm/bfin-lq035q1.h&gt;</div><div class='add'>+</div><div class='add'>+static struct bfin_lq035q1fb_disp_info bfin_lq035q1_data = {</div><div class='add'>+	.mode = 	LQ035_NORM | LQ035_RGB | LQ035_RL | LQ035_TB,</div><div class='add'>+	.use_bl = 	1,</div><div class='add'>+	.gpio_bl =	GPIO_PG12,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource bfin_lq035q1_resources[] = {</div><div class='add'>+	{</div><div class='add'>+		.start = IRQ_PPI_ERROR,</div><div class='add'>+		.end = IRQ_PPI_ERROR,</div><div class='add'>+		.flags = IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device bfin_lq035q1_device = {</div><div class='add'>+	.name		= "bfin-lq035q1",</div><div class='add'>+	.id		= -1,</div><div class='add'>+	.num_resources 	= ARRAY_SIZE(bfin_lq035q1_resources),</div><div class='add'>+	.resource 	= bfin_lq035q1_resources,</div><div class='add'>+	.dev		= {</div><div class='add'>+		.platform_data = &amp;bfin_lq035q1_data,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static struct platform_device *stamp_devices[] __initdata = {</div><div class='add'>+</div><div class='add'>+	&amp;bfin_dpmc,</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_MTD_NAND_BF5XX) || defined(CONFIG_MTD_NAND_BF5XX_MODULE)</div><div class='add'>+	&amp;bf5xx_nand_device,</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)</div><div class='add'>+	&amp;rtc_device,</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_USB_MUSB_HDRC) || defined(CONFIG_USB_MUSB_HDRC_MODULE)</div><div class='add'>+	&amp;musb_device,</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)</div><div class='add'>+	&amp;bfin_mac_device,</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)</div><div class='add'>+	&amp;bfin_spi0_device,</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)</div><div class='add'>+	&amp;bfin_uart_device,</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_FB_BFIN_LQ035Q1) || defined(CONFIG_FB_BFIN_LQ035Q1_MODULE)</div><div class='add'>+	&amp;bfin_lq035q1_device,</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)</div><div class='add'>+	&amp;bfin_sir_device,</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)</div><div class='add'>+	&amp;i2c_bfin_twi_device,</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)</div><div class='add'>+	&amp;bfin_sport0_uart_device,</div><div class='add'>+	&amp;bfin_sport1_uart_device,</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)</div><div class='add'>+	&amp;bfin_device_gpiokeys,</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE)</div><div class='add'>+	&amp;ezbrd_flash_device,</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	&amp;bfin_gpios_device,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init stamp_init(void)</div><div class='add'>+{</div><div class='add'>+	printk(KERN_INFO "%s(): registering device resources\n", __func__);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_I2C_BOARDINFO</div><div class='add'>+	i2c_register_board_info(0, bfin_i2c_board_info,</div><div class='add'>+				ARRAY_SIZE(bfin_i2c_board_info));</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	platform_add_devices(stamp_devices, ARRAY_SIZE(stamp_devices));</div><div class='add'>+	spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info));</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+arch_initcall(stamp_init);</div><div class='add'>+</div><div class='add'>+void native_machine_restart(char *cmd)</div><div class='add'>+{</div><div class='add'>+	/* workaround reboot hang when booting from SPI */</div><div class='add'>+	if ((bfin_read_SYSCR() &amp; 0x7) == 0x3)</div><div class='add'>+		bfin_gpio_reset_spi0_ssel1();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bfin_get_ether_addr(char *addr)</div><div class='add'>+{</div><div class='add'>+	/* the MAC is stored in OTP memory page 0xDF */</div><div class='add'>+	u32 ret;</div><div class='add'>+	u64 otp_mac;</div><div class='add'>+	u32 (*otp_read)(u32 page, u32 flags, u64 *page_content) = (void *)0xEF00001A;</div><div class='add'>+</div><div class='add'>+	ret = otp_read(0xDF, 0x00, &amp;otp_mac);</div><div class='add'>+	if (!(ret &amp; 0x1)) {</div><div class='add'>+		char *otp_mac_p = (char *)&amp;otp_mac;</div><div class='add'>+		for (ret = 0; ret &lt; 6; ++ret)</div><div class='add'>+			addr[ret] = otp_mac_p[5 - ret];</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(bfin_get_ether_addr);</div><div class='head'>diff --git a/arch/blackfin/mach-bf527/boards/ezkit.c b/arch/blackfin/mach-bf527/boards/ezkit.c<br/>index 762f754c06cc..8ee2b744e234 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mach-bf527/boards/ezkit.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/mach-bf527/boards/ezkit.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mach-bf527/boards/ezkit.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-bf527/boards/ezkit.c</a></div><div class='hunk'>@@ -42,10 +42,7 @@</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/usb/sl811.h&gt;</div><div class='del'>-#if defined(CONFIG_USB_MUSB_HDRC) || defined(CONFIG_USB_MUSB_HDRC_MODULE)</div><div class='ctx'> #include &lt;linux/usb/musb.h&gt;</div><div class='del'>-#endif</div><div class='del'>-#include &lt;asm/cplb.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='ctx'> #include &lt;asm/bfin5xx_spi.h&gt;</div><div class='ctx'> #include &lt;asm/reboot.h&gt;</div><div class='hunk'>@@ -129,6 +126,16 @@ static struct resource musb_resources[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct musb_hdrc_config musb_config = {</div><div class='add'>+	.multipoint	= 0,</div><div class='add'>+	.dyn_fifo	= 0,</div><div class='add'>+	.soft_con	= 1,</div><div class='add'>+	.dma		= 1,</div><div class='add'>+	.num_eps	= 7,</div><div class='add'>+	.dma_channels	= 7,</div><div class='add'>+	.gpio_vrsel	= GPIO_PG13,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct musb_hdrc_platform_data musb_plat = {</div><div class='ctx'> #if defined(CONFIG_USB_MUSB_OTG)</div><div class='ctx'> 	.mode		= MUSB_OTG,</div><div class='hunk'>@@ -137,7 +144,7 @@ static struct musb_hdrc_platform_data musb_plat = {</div><div class='ctx'> #elif defined(CONFIG_USB_GADGET_MUSB_HDRC)</div><div class='ctx'> 	.mode		= MUSB_PERIPHERAL,</div><div class='ctx'> #endif</div><div class='del'>-	.multipoint	= 0,</div><div class='add'>+	.config		= &amp;musb_config,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static u64 musb_dmamask = ~(u32)0;</div><div class='hunk'>@@ -218,7 +225,7 @@ static struct mtd_partition partition_info[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.name = "linux kernel(nand)",</div><div class='ctx'> 		.offset = 0,</div><div class='del'>-		.size = 4 * SIZE_1M,</div><div class='add'>+		.size = 4 * 1024 * 1024,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.name = "file system(nand)",</div><div class='hunk'>@@ -846,6 +853,38 @@ static struct platform_device bfin_device_gpiokeys = {</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_JOYSTICK_BFIN_ROTARY) || defined(CONFIG_JOYSTICK_BFIN_ROTARY_MODULE)</div><div class='add'>+#include &lt;linux/input.h&gt;</div><div class='add'>+#include &lt;asm/bfin_rotary.h&gt;</div><div class='add'>+</div><div class='add'>+static struct bfin_rotary_platform_data bfin_rotary_data = {</div><div class='add'>+	/*.rotary_up_key     = KEY_UP,*/</div><div class='add'>+	/*.rotary_down_key   = KEY_DOWN,*/</div><div class='add'>+	.rotary_rel_code   = REL_WHEEL,</div><div class='add'>+	.rotary_button_key = KEY_ENTER,</div><div class='add'>+	.debounce	   = 10,	/* 0..17 */</div><div class='add'>+	.mode		   = ROT_QUAD_ENC | ROT_DEBE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource bfin_rotary_resources[] = {</div><div class='add'>+	{</div><div class='add'>+		.start = IRQ_CNT,</div><div class='add'>+		.end = IRQ_CNT,</div><div class='add'>+		.flags = IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device bfin_rotary_device = {</div><div class='add'>+	.name		= "bfin-rotary",</div><div class='add'>+	.id		= -1,</div><div class='add'>+	.num_resources 	= ARRAY_SIZE(bfin_rotary_resources),</div><div class='add'>+	.resource 	= bfin_rotary_resources,</div><div class='add'>+	.dev		= {</div><div class='add'>+		.platform_data = &amp;bfin_rotary_data,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static struct resource bfin_gpios_resources = {</div><div class='ctx'> 	.start = 0,</div><div class='ctx'> 	.end   = MAX_BLACKFIN_GPIOS - 1,</div><div class='hunk'>@@ -962,6 +1001,10 @@ static struct platform_device *stamp_devices[] __initdata = {</div><div class='ctx'> 	&amp;bfin_device_gpiokeys,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_JOYSTICK_BFIN_ROTARY) || defined(CONFIG_JOYSTICK_BFIN_ROTARY_MODULE)</div><div class='add'>+	&amp;bfin_rotary_device,</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE)</div><div class='ctx'> 	&amp;ezkit_flash_device,</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/blackfin/mach-bf527/head.S b/arch/blackfin/mach-bf527/head.S<br/>index 28c486191209..0eb1da85db73 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mach-bf527/head.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/mach-bf527/head.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mach-bf527/head.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-bf527/head.S</a></div><div class='hunk'>@@ -87,6 +87,9 @@ ENTRY(_start_dma_code)</div><div class='ctx'> 	r1 = PLL_BYPASS;                 /* Bypass the PLL?                 */</div><div class='ctx'> 	r1 = r1 &lt;&lt; 8;                    /* Shift it over                   */</div><div class='ctx'> 	r0 = r1 | r0;                    /* add them all together           */</div><div class='add'>+#ifdef ANOMALY_05000265</div><div class='add'>+	BITSET(r0, 15);                  /* Add 250 mV of hysteresis to SPORT input pins */</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	p0.h = hi(PLL_CTL);</div><div class='ctx'> 	p0.l = lo(PLL_CTL);              /* Load the address                */</div><div class='head'>diff --git a/arch/blackfin/mach-bf527/include/mach/anomaly.h b/arch/blackfin/mach-bf527/include/mach/anomaly.h<br/>index b7b166f4f064..62373e61c585 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mach-bf527/include/mach/anomaly.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/mach-bf527/include/mach/anomaly.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mach-bf527/include/mach/anomaly.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-bf527/include/mach/anomaly.h</a></div><div class='hunk'>@@ -7,12 +7,24 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* This file shoule be up to date with:</div><div class='del'>- *  - Revision C, 01/25/2008; ADSP-BF527 Blackfin Processor Anomaly List</div><div class='add'>+ *  - Revision B, 08/12/2008; ADSP-BF526 Blackfin Processor Anomaly List</div><div class='add'>+ *  - Revision E, 08/18/2008; ADSP-BF527 Blackfin Processor Anomaly List</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _MACH_ANOMALY_H_</div><div class='ctx'> #define _MACH_ANOMALY_H_</div><div class='ctx'> </div><div class='add'>+#if defined(__ADSPBF522__) || defined(__ADSPBF524__) || defined(__ADSPBF526__)</div><div class='add'>+# define ANOMALY_BF526 1</div><div class='add'>+#else</div><div class='add'>+# define ANOMALY_BF526 0</div><div class='add'>+#endif</div><div class='add'>+#if defined(__ADSPBF523__) || defined(__ADSPBF525__) || defined(__ADSPBF527__)</div><div class='add'>+# define ANOMALY_BF527 1</div><div class='add'>+#else</div><div class='add'>+# define ANOMALY_BF527 0</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /* Multi-Issue Instruction with dsp32shiftimm in slot1 and P-reg Store in slot2 Not Supported */</div><div class='ctx'> #define ANOMALY_05000074 (1)</div><div class='ctx'> /* DMA_RUN Bit Is Not Valid after a Peripheral Receive Channel DMA Stops */</div><div class='hunk'>@@ -23,68 +35,124 @@</div><div class='ctx'> #define ANOMALY_05000245 (1)</div><div class='ctx'> /* Sensitivity To Noise with Slow Input Edge Rates on External SPORT TX and RX Clocks */</div><div class='ctx'> #define ANOMALY_05000265 (1)</div><div class='del'>-/* New Feature: EMAC TX DMA Word Alignment */</div><div class='del'>-#define ANOMALY_05000285 (1)</div><div class='add'>+/* False Hardware Errors Caused by Fetches at the Boundary of Reserved Memory */</div><div class='add'>+#define ANOMALY_05000310 (1)</div><div class='ctx'> /* Errors when SSYNC, CSYNC, or Loads to LT, LB and LC Registers Are Interrupted */</div><div class='del'>-#define ANOMALY_05000312 (1)</div><div class='add'>+#define ANOMALY_05000312 (ANOMALY_BF527)</div><div class='add'>+/* PPI Is Level-Sensitive on First Transfer In Single Frame Sync Modes */</div><div class='add'>+#define ANOMALY_05000313 (__SILICON_REVISION__ &lt; 2)</div><div class='ctx'> /* Incorrect Access of OTP_STATUS During otp_write() Function */</div><div class='del'>-#define ANOMALY_05000328 (1)</div><div class='add'>+#define ANOMALY_05000328 (ANOMALY_BF527 &amp;&amp; __SILICON_REVISION__ &lt; 2)</div><div class='ctx'> /* Disallowed Configuration Prevents Subsequent Allowed Configuration on Host DMA Port */</div><div class='del'>-#define ANOMALY_05000337 (1)</div><div class='add'>+#define ANOMALY_05000337 (ANOMALY_BF527 &amp;&amp; __SILICON_REVISION__ &lt; 2)</div><div class='ctx'> /* Ethernet MAC MDIO Reads Do Not Meet IEEE Specification */</div><div class='del'>-#define ANOMALY_05000341 (1)</div><div class='add'>+#define ANOMALY_05000341 (ANOMALY_BF527 &amp;&amp; __SILICON_REVISION__ &lt; 2)</div><div class='ctx'> /* TWI May Not Operate Correctly Under Certain Signal Termination Conditions */</div><div class='del'>-#define ANOMALY_05000342 (1)</div><div class='add'>+#define ANOMALY_05000342 (ANOMALY_BF527 &amp;&amp; __SILICON_REVISION__ &lt; 2)</div><div class='ctx'> /* USB Calibration Value Is Not Initialized */</div><div class='del'>-#define ANOMALY_05000346 (1)</div><div class='add'>+#define ANOMALY_05000346 (ANOMALY_BF527 &amp;&amp; __SILICON_REVISION__ &lt; 2)</div><div class='add'>+/* USB Calibration Value to use */</div><div class='add'>+#define ANOMALY_05000346_value 0xE510</div><div class='ctx'> /* Preboot Routine Incorrectly Alters Reset Value of USB Register */</div><div class='del'>-#define ANOMALY_05000347 (1)</div><div class='add'>+#define ANOMALY_05000347 (ANOMALY_BF527 &amp;&amp; __SILICON_REVISION__ &lt; 2)</div><div class='ctx'> /* Security Features Are Not Functional */</div><div class='del'>-#define ANOMALY_05000348 (__SILICON_REVISION__ &lt; 1)</div><div class='add'>+#define ANOMALY_05000348 (ANOMALY_BF527 &amp;&amp; __SILICON_REVISION__ &lt; 1)</div><div class='add'>+/* bfrom_SysControl() Firmware Function Performs Improper System Reset */</div><div class='add'>+#define ANOMALY_05000353 (ANOMALY_BF526)</div><div class='ctx'> /* Regulator Programming Blocked when Hibernate Wakeup Source Remains Active */</div><div class='del'>-#define ANOMALY_05000355 (1)</div><div class='add'>+#define ANOMALY_05000355 (ANOMALY_BF527 &amp;&amp; __SILICON_REVISION__ &lt; 2)</div><div class='ctx'> /* Serial Port (SPORT) Multichannel Transmit Failure when Channel 0 Is Disabled */</div><div class='del'>-#define ANOMALY_05000357 (1)</div><div class='add'>+#define ANOMALY_05000357 (ANOMALY_BF527 &amp;&amp; __SILICON_REVISION__ &lt; 2)</div><div class='ctx'> /* Incorrect Revision Number in DSPID Register */</div><div class='del'>-#define ANOMALY_05000364 (__SILICON_REVISION__ &gt; 0)</div><div class='add'>+#define ANOMALY_05000364 (ANOMALY_BF527 &amp;&amp; __SILICON_REVISION__ == 1)</div><div class='ctx'> /* PPI Underflow Error Goes Undetected in ITU-R 656 Mode */</div><div class='ctx'> #define ANOMALY_05000366 (1)</div><div class='del'>-/* New Feature: Higher Default CCLK Rate */</div><div class='del'>-#define ANOMALY_05000368 (1)</div><div class='add'>+/* Incorrect Default CSEL Value in PLL_DIV */</div><div class='add'>+#define ANOMALY_05000368 (ANOMALY_BF527 &amp;&amp; __SILICON_REVISION__ &lt; 2)</div><div class='ctx'> /* Possible RETS Register Corruption when Subroutine Is under 5 Cycles in Duration */</div><div class='del'>-#define ANOMALY_05000371 (1)</div><div class='add'>+#define ANOMALY_05000371 (ANOMALY_BF527 &amp;&amp; __SILICON_REVISION__ &lt; 2)</div><div class='ctx'> /* Authentication Fails To Initiate */</div><div class='del'>-#define ANOMALY_05000376 (__SILICON_REVISION__ &gt; 0)</div><div class='add'>+#define ANOMALY_05000376 (ANOMALY_BF527 &amp;&amp; __SILICON_REVISION__ &lt; 2)</div><div class='ctx'> /* Data Read From L3 Memory by USB DMA May be Corrupted */</div><div class='del'>-#define ANOMALY_05000380 (1)</div><div class='del'>-/* USB Full-speed Mode not Fully Tested */</div><div class='del'>-#define ANOMALY_05000381 (1)</div><div class='del'>-/* New Feature: Boot from OTP Memory */</div><div class='del'>-#define ANOMALY_05000385 (1)</div><div class='del'>-/* New Feature: bfrom_SysControl() Routine */</div><div class='del'>-#define ANOMALY_05000386 (1)</div><div class='del'>-/* New Feature: Programmable Preboot Settings */</div><div class='del'>-#define ANOMALY_05000387 (1)</div><div class='add'>+#define ANOMALY_05000380 (ANOMALY_BF527 &amp;&amp; __SILICON_REVISION__ &lt; 2)</div><div class='add'>+/* 8-Bit NAND Flash Boot Mode Not Functional */</div><div class='add'>+#define ANOMALY_05000382 (__SILICON_REVISION__ &lt; 2)</div><div class='add'>+/* Host Must Not Read Back During Host DMA Boot */</div><div class='add'>+#define ANOMALY_05000384 (ANOMALY_BF527 &amp;&amp; __SILICON_REVISION__ &lt; 2)</div><div class='add'>+/* Boot from OTP Memory Not Functional */</div><div class='add'>+#define ANOMALY_05000385 (ANOMALY_BF527 &amp;&amp; __SILICON_REVISION__ &lt; 2)</div><div class='add'>+/* bfrom_SysControl() Firmware Routine Not Functional */</div><div class='add'>+#define ANOMALY_05000386 (ANOMALY_BF527 &amp;&amp; __SILICON_REVISION__ &lt; 2)</div><div class='add'>+/* Programmable Preboot Settings Not Functional */</div><div class='add'>+#define ANOMALY_05000387 (ANOMALY_BF527 &amp;&amp; __SILICON_REVISION__ &lt; 2)</div><div class='add'>+/* CRC32 Checksum Support Not Functional */</div><div class='add'>+#define ANOMALY_05000388 (__SILICON_REVISION__ &lt; 2)</div><div class='ctx'> /* Reset Vector Must Not Be in SDRAM Memory Space */</div><div class='del'>-#define ANOMALY_05000389 (1)</div><div class='del'>-/* New Feature: pTempCurrent Added to ADI_BOOT_DATA Structure */</div><div class='del'>-#define ANOMALY_05000392 (1)</div><div class='del'>-/* New Feature: dTempByteCount Value Increased in ADI_BOOT_DATA Structure */</div><div class='del'>-#define ANOMALY_05000393 (1)</div><div class='del'>-/* New Feature: Log Buffer Functionality */</div><div class='del'>-#define ANOMALY_05000394 (1)</div><div class='del'>-/* New Feature: Hook Routine Functionality */</div><div class='del'>-#define ANOMALY_05000395 (1)</div><div class='del'>-/* New Feature: Header Indirect Bit */</div><div class='del'>-#define ANOMALY_05000396 (1)</div><div class='del'>-/* New Feature: BK_ONES, BK_ZEROS, and BK_DATECODE Constants */</div><div class='del'>-#define ANOMALY_05000397 (1)</div><div class='del'>-/* New Feature: SWRESET, DFRESET and WDRESET Bits Added to SYSCR Register */</div><div class='del'>-#define ANOMALY_05000398 (1)</div><div class='del'>-/* New Feature: BCODE_NOBOOT Added to BCODE Field of SYSCR Register */</div><div class='del'>-#define ANOMALY_05000399 (1)</div><div class='add'>+#define ANOMALY_05000389 (ANOMALY_BF527 &amp;&amp; __SILICON_REVISION__ &lt; 2)</div><div class='add'>+/* pTempCurrent Not Present in ADI_BOOT_DATA Structure */</div><div class='add'>+#define ANOMALY_05000392 (ANOMALY_BF527 &amp;&amp; __SILICON_REVISION__ &lt; 2)</div><div class='add'>+/* Deprecated Value of dTempByteCount in ADI_BOOT_DATA Structure */</div><div class='add'>+#define ANOMALY_05000393 (ANOMALY_BF527 &amp;&amp; __SILICON_REVISION__ &lt; 2)</div><div class='add'>+/* Log Buffer Not Functional */</div><div class='add'>+#define ANOMALY_05000394 (ANOMALY_BF527 &amp;&amp; __SILICON_REVISION__ &lt; 2)</div><div class='add'>+/* Hook Routine Not Functional */</div><div class='add'>+#define ANOMALY_05000395 (ANOMALY_BF527 &amp;&amp; __SILICON_REVISION__ &lt; 2)</div><div class='add'>+/* Header Indirect Bit Not Functional */</div><div class='add'>+#define ANOMALY_05000396 (ANOMALY_BF527 &amp;&amp; __SILICON_REVISION__ &lt; 2)</div><div class='add'>+/* BK_ONES, BK_ZEROS, and BK_DATECODE Constants Not Functional */</div><div class='add'>+#define ANOMALY_05000397 (ANOMALY_BF527 &amp;&amp; __SILICON_REVISION__ &lt; 2)</div><div class='add'>+/* SWRESET, DFRESET and WDRESET Bits in the SYSCR Register Not Functional */</div><div class='add'>+#define ANOMALY_05000398 (ANOMALY_BF527 &amp;&amp; __SILICON_REVISION__ &lt; 2)</div><div class='add'>+/* BCODE_NOBOOT in BCODE Field of SYSCR Register Not Functional */</div><div class='add'>+#define ANOMALY_05000399 (ANOMALY_BF527 &amp;&amp; __SILICON_REVISION__ &lt; 2)</div><div class='ctx'> /* PPI Data Signals D0 and D8 do not Tristate After Disabling PPI */</div><div class='del'>-#define ANOMALY_05000401 (1)</div><div class='add'>+#define ANOMALY_05000401 (__SILICON_REVISION__ &lt; 2)</div><div class='add'>+/* Level-Sensitive External GPIO Wakeups May Cause Indefinite Stall */</div><div class='add'>+#define ANOMALY_05000403 (__SILICON_REVISION__ &lt; 2)</div><div class='add'>+/* Lockbox SESR Disallows Certain User Interrupts */</div><div class='add'>+#define ANOMALY_05000404 (__SILICON_REVISION__ &lt; 2)</div><div class='add'>+/* Lockbox SESR Firmware Does Not Save/Restore Full Context */</div><div class='add'>+#define ANOMALY_05000405 (1)</div><div class='add'>+/* Lockbox SESR Firmware Arguments Are Not Retained After First Initialization */</div><div class='add'>+#define ANOMALY_05000407 (__SILICON_REVISION__ &lt; 2)</div><div class='add'>+/* Lockbox Firmware Memory Cleanup Routine Does not Clear Registers */</div><div class='add'>+#define ANOMALY_05000408 (1)</div><div class='add'>+/* Lockbox firmware leaves MDMA0 channel enabled */</div><div class='add'>+#define ANOMALY_05000409 (__SILICON_REVISION__ &lt; 2)</div><div class='add'>+/* Incorrect Default Internal Voltage Regulator Setting */</div><div class='add'>+#define ANOMALY_05000410 (ANOMALY_BF527 &amp;&amp; __SILICON_REVISION__ &lt; 2)</div><div class='add'>+/* bfrom_SysControl() Firmware Function Cannot be Used to Enter Power Saving Modes */</div><div class='add'>+#define ANOMALY_05000411 (__SILICON_REVISION__ &lt; 2)</div><div class='add'>+/* OTP_CHECK_FOR_PREV_WRITE Bit is Not Functional in bfrom_OtpWrite() API */</div><div class='add'>+#define ANOMALY_05000414 (__SILICON_REVISION__ &lt; 2)</div><div class='add'>+/* DEB2_URGENT Bit Not Functional */</div><div class='add'>+#define ANOMALY_05000415 (__SILICON_REVISION__ &lt; 2)</div><div class='add'>+/* Speculative Fetches Can Cause Undesired External FIFO Operations */</div><div class='add'>+#define ANOMALY_05000416 (1)</div><div class='add'>+/* SPORT0 Ignores External TSCLK0 on PG14 When TMR6 is an Output */</div><div class='add'>+#define ANOMALY_05000417 (ANOMALY_BF527 &amp;&amp; __SILICON_REVISION__ &lt; 2)</div><div class='add'>+/* tSFSPE and tHFSPE Do Not Meet Data Sheet Specifications */</div><div class='add'>+#define ANOMALY_05000418 (__SILICON_REVISION__ &lt; 2)</div><div class='add'>+/* USB PLL_STABLE Bit May Not Accurately Reflect the USB PLL's Status */</div><div class='add'>+#define ANOMALY_05000420 (__SILICON_REVISION__ &lt; 2)</div><div class='add'>+/* TWI Fall Time (Tof) May Violate the Minimum I2C Specification */</div><div class='add'>+#define ANOMALY_05000421 (1)</div><div class='add'>+/* TWI Input Capacitance (Ci) May Violate the Maximum I2C Specification */</div><div class='add'>+#define ANOMALY_05000422 (ANOMALY_BF527 &amp;&amp; __SILICON_REVISION__ &gt; 1)</div><div class='add'>+/* Certain Ethernet Frames With Errors are Misclassified in RMII Mode */</div><div class='add'>+#define ANOMALY_05000423 (__SILICON_REVISION__ &lt; 2)</div><div class='add'>+/* Internal Voltage Regulator Not Trimmed */</div><div class='add'>+#define ANOMALY_05000424 (ANOMALY_BF527 &amp;&amp; __SILICON_REVISION__ &lt; 2)</div><div class='add'>+/* Multichannel SPORT Channel Misalignment Under Specific Configuration */</div><div class='add'>+#define ANOMALY_05000425 (__SILICON_REVISION__ &lt; 2)</div><div class='add'>+/* Speculative Fetches of Indirect-Pointer Instructions Can Cause Spurious Hardware Errors */</div><div class='add'>+#define ANOMALY_05000426 (1)</div><div class='add'>+/* WB_EDGE Bit in NFC_IRQSTAT Incorrectly Reflects Buffer Status Instead of IRQ Status */</div><div class='add'>+#define ANOMALY_05000429 (__SILICON_REVISION__ &lt; 2)</div><div class='add'>+/* Software System Reset Corrupts PLL_LOCKCNT Register */</div><div class='add'>+#define ANOMALY_05000430 (ANOMALY_BF527 &amp;&amp; __SILICON_REVISION__ &gt; 1)</div><div class='add'>+/* bfrom_SysControl() Does Not Clear SIC_IWR1 Before Executing PLL Programming Sequence */</div><div class='add'>+#define ANOMALY_05000432 (ANOMALY_BF526)</div><div class='ctx'> </div><div class='ctx'> /* Anomalies that don't exist on this proc */</div><div class='ctx'> #define ANOMALY_05000125 (0)</div><div class='hunk'>@@ -97,6 +165,8 @@</div><div class='ctx'> #define ANOMALY_05000263 (0)</div><div class='ctx'> #define ANOMALY_05000266 (0)</div><div class='ctx'> #define ANOMALY_05000273 (0)</div><div class='add'>+#define ANOMALY_05000285 (0)</div><div class='add'>+#define ANOMALY_05000307 (0)</div><div class='ctx'> #define ANOMALY_05000311 (0)</div><div class='ctx'> #define ANOMALY_05000323 (0)</div><div class='ctx'> #define ANOMALY_05000363 (0)</div><div class='head'>diff --git a/arch/blackfin/mach-bf527/include/mach/bf527.h b/arch/blackfin/mach-bf527/include/mach/bf527.h<br/>index 056eb4b9cd25..144f08d3f8ea 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mach-bf527/include/mach/bf527.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/mach-bf527/include/mach/bf527.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mach-bf527/include/mach/bf527.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-bf527/include/mach/bf527.h</a></div><div class='hunk'>@@ -30,8 +30,6 @@</div><div class='ctx'> #ifndef __MACH_BF527_H__</div><div class='ctx'> #define __MACH_BF527_H__</div><div class='ctx'> </div><div class='del'>-#define SUPPORTED_REVID 2</div><div class='del'>-</div><div class='ctx'> #define OFFSET_(x) ((x) &amp; 0x0000FFFF)</div><div class='ctx'> </div><div class='ctx'> /*some misc defines*/</div><div class='hunk'>@@ -112,16 +110,31 @@</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_BF527</div><div class='ctx'> #define CPU "BF527"</div><div class='add'>+#define CPUID 0x27e4</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_BF526</div><div class='add'>+#define CPU "BF526"</div><div class='add'>+#define CPUID 0x27e4</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_BF525</div><div class='ctx'> #define CPU "BF525"</div><div class='add'>+#define CPUID 0x27e4</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_BF524</div><div class='add'>+#define CPU "BF524"</div><div class='add'>+#define CPUID 0x27e4</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_BF523</div><div class='add'>+#define CPU "BF523"</div><div class='add'>+#define CPUID 0x27e4</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_BF522</div><div class='ctx'> #define CPU "BF522"</div><div class='add'>+#define CPUID 0x27e4</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> #ifndef CPU</div><div class='del'>-#define	CPU "UNKNOWN"</div><div class='del'>-#define CPUID 0x0</div><div class='add'>+#error Unknown CPU type - This kernel doesn't seem to be configured properly</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #endif				/* __MACH_BF527_H__  */</div><div class='head'>diff --git a/arch/blackfin/mach-bf527/include/mach/bfin_serial_5xx.h b/arch/blackfin/mach-bf527/include/mach/bfin_serial_5xx.h<br/>index 2526b6ed6faa..75722d6008b0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mach-bf527/include/mach/bfin_serial_5xx.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/mach-bf527/include/mach/bfin_serial_5xx.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mach-bf527/include/mach/bfin_serial_5xx.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-bf527/include/mach/bfin_serial_5xx.h</a></div><div class='hunk'>@@ -78,6 +78,9 @@</div><div class='ctx'> #  define CONFIG_UART1_RTS_PIN -1</div><div class='ctx'> # endif</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='add'>+#define BFIN_UART_TX_FIFO_SIZE	2</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * The pin configuration is different from schematic</div><div class='ctx'>  */</div><div class='hunk'>@@ -119,7 +122,6 @@ static inline void UART_CLEAR_LSR(struct bfin_serial_port *uart)</div><div class='ctx'> 	bfin_write16(uart-&gt;port.membase + OFFSET_LSR, -1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct bfin_serial_port bfin_serial_ports[BFIN_UART_NR_PORTS];</div><div class='ctx'> struct bfin_serial_res {</div><div class='ctx'> 	unsigned long uart_base_addr;</div><div class='ctx'> 	int uart_irq;</div><div class='hunk'>@@ -164,8 +166,6 @@ struct bfin_serial_res bfin_serial_resource[] = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int nr_ports = ARRAY_SIZE(bfin_serial_resource);</div><div class='del'>-</div><div class='ctx'> #define DRIVER_NAME "bfin-uart"</div><div class='ctx'> </div><div class='ctx'> static void bfin_serial_hw_init(struct bfin_serial_port *uart)</div><div class='head'>diff --git a/arch/blackfin/mach-bf527/include/mach/defBF52x_base.h b/arch/blackfin/mach-bf527/include/mach/defBF52x_base.h<br/>index 6ac2ed7026eb..68b55d03fedf 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mach-bf527/include/mach/defBF52x_base.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/mach-bf527/include/mach/defBF52x_base.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mach-bf527/include/mach/defBF52x_base.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-bf527/include/mach/defBF52x_base.h</a></div><div class='hunk'>@@ -1840,6 +1840,33 @@</div><div class='ctx'> </div><div class='ctx'> #define                 DPRESCALE  0xf        /* Load Counter Register */</div><div class='ctx'> </div><div class='add'>+/* CNT_COMMAND bit field options */</div><div class='add'>+</div><div class='add'>+#define W1LCNT_ZERO   0x0001   /* write 1 to load CNT_COUNTER with zero */</div><div class='add'>+#define W1LCNT_MIN    0x0004   /* write 1 to load CNT_COUNTER from CNT_MIN */</div><div class='add'>+#define W1LCNT_MAX    0x0008   /* write 1 to load CNT_COUNTER from CNT_MAX */</div><div class='add'>+</div><div class='add'>+#define W1LMIN_ZERO   0x0010   /* write 1 to load CNT_MIN with zero */</div><div class='add'>+#define W1LMIN_CNT    0x0020   /* write 1 to load CNT_MIN from CNT_COUNTER */</div><div class='add'>+#define W1LMIN_MAX    0x0080   /* write 1 to load CNT_MIN from CNT_MAX */</div><div class='add'>+</div><div class='add'>+#define W1LMAX_ZERO   0x0100   /* write 1 to load CNT_MAX with zero */</div><div class='add'>+#define W1LMAX_CNT    0x0200   /* write 1 to load CNT_MAX from CNT_COUNTER */</div><div class='add'>+#define W1LMAX_MIN    0x0400   /* write 1 to load CNT_MAX from CNT_MIN */</div><div class='add'>+</div><div class='add'>+/* CNT_CONFIG bit field options */</div><div class='add'>+</div><div class='add'>+#define CNTMODE_QUADENC  0x0000  /* quadrature encoder mode */</div><div class='add'>+#define CNTMODE_BINENC   0x0100  /* binary encoder mode */</div><div class='add'>+#define CNTMODE_UDCNT    0x0200  /* up/down counter mode */</div><div class='add'>+#define CNTMODE_DIRCNT   0x0400  /* direction counter mode */</div><div class='add'>+#define CNTMODE_DIRTMR   0x0500  /* direction timer mode */</div><div class='add'>+</div><div class='add'>+#define BNDMODE_COMP     0x0000  /* boundary compare mode */</div><div class='add'>+#define BNDMODE_ZERO     0x1000  /* boundary compare and zero mode */</div><div class='add'>+#define BNDMODE_CAPT     0x2000  /* boundary capture mode */</div><div class='add'>+#define BNDMODE_AEXT     0x3000  /* boundary auto-extend mode */</div><div class='add'>+</div><div class='ctx'> /* Bit masks for OTP_CONTROL */</div><div class='ctx'> </div><div class='ctx'> #define                FUSE_FADDR  0x1ff      /* OTP/Fuse Address */</div><div class='head'>diff --git a/arch/blackfin/mach-bf527/include/mach/portmux.h b/arch/blackfin/mach-bf527/include/mach/portmux.h<br/>index ae4d205bfcf5..7f6da2c386bb 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mach-bf527/include/mach/portmux.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/mach-bf527/include/mach/portmux.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mach-bf527/include/mach/portmux.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-bf527/include/mach/portmux.h</a></div><div class='hunk'>@@ -67,6 +67,10 @@</div><div class='ctx'> #define P_UART1_RX	(P_DEFINED | P_IDENT(GPIO_PG13) | P_FUNCT(1))</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#define P_CNT_CZM	(P_DEFINED | P_IDENT(GPIO_PF11) | P_FUNCT(3))</div><div class='add'>+#define P_CNT_CDG	(P_DEFINED | P_IDENT(GPIO_PF12) | P_FUNCT(3))</div><div class='add'>+#define P_CNT_CUD	(P_DEFINED | P_IDENT(GPIO_PF13) | P_FUNCT(3))</div><div class='add'>+</div><div class='ctx'> #define P_HWAIT		(P_DONTCARE)</div><div class='ctx'> </div><div class='ctx'> #define P_SPI0_SS	(P_DEFINED | P_IDENT(GPIO_PG1) | P_FUNCT(0))</div><div class='head'>diff --git a/arch/blackfin/mach-bf533/boards/H8606.c b/arch/blackfin/mach-bf533/boards/H8606.c<br/>index c66a68f30239..72ac3ac8ef76 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mach-bf533/boards/H8606.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/mach-bf533/boards/H8606.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mach-bf533/boards/H8606.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-bf533/boards/H8606.c</a></div><div class='hunk'>@@ -9,7 +9,7 @@</div><div class='ctx'>  * Modified:</div><div class='ctx'>  *               Copyright 2005 National ICT Australia (NICTA)</div><div class='ctx'>  *               Copyright 2004-2006 Analog Devices Inc</div><div class='del'>- *		 Copyright 2007 HV Sistemas S.L.</div><div class='add'>+ *		 Copyright 2007,2008 HV Sistemas S.L.</div><div class='ctx'>  *</div><div class='ctx'>  * Bugs:         Enter bugs at http://blackfin.uclinux.org/</div><div class='ctx'>  *</div><div class='hunk'>@@ -64,18 +64,18 @@ static struct platform_device rtc_device = {</div><div class='ctx'> static struct resource dm9000_resources[] = {</div><div class='ctx'> 	[0] = {</div><div class='ctx'> 		.start	= 0x20300000,</div><div class='del'>-		.end	= 0x20300000 + 1,</div><div class='add'>+		.end	= 0x20300002,</div><div class='ctx'> 		.flags	= IORESOURCE_MEM,</div><div class='ctx'> 	},</div><div class='ctx'> 	[1] = {</div><div class='del'>-		.start	= 0x20300000 + 4,</div><div class='del'>-		.end	= 0x20300000 + 5,</div><div class='add'>+		.start	= 0x20300004,</div><div class='add'>+		.end	= 0x20300006,</div><div class='ctx'> 		.flags	= IORESOURCE_MEM,</div><div class='ctx'> 	},</div><div class='ctx'> 	[2] = {</div><div class='ctx'> 		.start	= IRQ_PF10,</div><div class='ctx'> 		.end	= IRQ_PF10,</div><div class='del'>-		.flags	= (IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE),</div><div class='add'>+		.flags	= (IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE | IRQF_SHARED | IRQF_TRIGGER_HIGH),</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -140,18 +140,22 @@ static struct platform_device net2272_bfin_device = {</div><div class='ctx'> #if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE)</div><div class='ctx'> static struct mtd_partition bfin_spi_flash_partitions[] = {</div><div class='ctx'> 	{</div><div class='del'>-		.name = "bootloader(spi)",</div><div class='del'>-		.size = 0x00060000,</div><div class='add'>+		.name = "bootloader (spi)",</div><div class='add'>+		.size = 0x40000,</div><div class='ctx'> 		.offset = 0,</div><div class='ctx'> 		.mask_flags = MTD_CAP_ROM</div><div class='ctx'> 	}, {</div><div class='del'>-		.name = "linux kernel(spi)",</div><div class='del'>-		.size = 0x100000,</div><div class='del'>-		.offset = 0x60000</div><div class='add'>+		.name = "fpga (spi)",</div><div class='add'>+		.size =   0x30000,</div><div class='add'>+		.offset = 0x40000</div><div class='ctx'> 	}, {</div><div class='del'>-		.name = "file system(spi)",</div><div class='del'>-		.size = 0x6a0000,</div><div class='del'>-		.offset = 0x00160000,</div><div class='add'>+		.name = "linux kernel (spi)",</div><div class='add'>+		.size =   0x150000,</div><div class='add'>+		.offset =  0x70000</div><div class='add'>+	}, {</div><div class='add'>+		.name = "jffs2 root file system (spi)",</div><div class='add'>+		.size =   0x640000,</div><div class='add'>+		.offset = 0x1c0000,</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -340,7 +344,7 @@ static struct platform_device bfin_sir_device = {</div><div class='ctx'> </div><div class='ctx'> static struct plat_serial8250_port serial8250_platform_data [] = {</div><div class='ctx'> 	{</div><div class='del'>-		.membase = 0x20200000,</div><div class='add'>+		.membase = (void *)0x20200000,</div><div class='ctx'> 		.mapbase = 0x20200000,</div><div class='ctx'> 		.irq = IRQ_PF8,</div><div class='ctx'> 		.flags = UPF_BOOT_AUTOCONF | UART_CONFIG_TYPE,</div><div class='hunk'>@@ -348,7 +352,7 @@ static struct plat_serial8250_port serial8250_platform_data [] = {</div><div class='ctx'> 		.regshift = 1,</div><div class='ctx'> 		.uartclk = 66666667,</div><div class='ctx'> 	}, {</div><div class='del'>-		.membase = 0x20200010,</div><div class='add'>+		.membase = (void *)0x20200010,</div><div class='ctx'> 		.mapbase = 0x20200010,</div><div class='ctx'> 		.irq = IRQ_PF8,</div><div class='ctx'> 		.flags = UPF_BOOT_AUTOCONF | UART_CONFIG_TYPE,</div><div class='head'>diff --git a/arch/blackfin/mach-bf533/head.S b/arch/blackfin/mach-bf533/head.S<br/>index 01b2b7ead5ab..9fc95aaca439 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mach-bf533/head.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/mach-bf533/head.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mach-bf533/head.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-bf533/head.S</a></div><div class='hunk'>@@ -78,6 +78,9 @@ ENTRY(_start_dma_code)</div><div class='ctx'> 	r1 = PLL_BYPASS;                 /* Bypass the PLL?                 */</div><div class='ctx'> 	r1 = r1 &lt;&lt; 8;                    /* Shift it over                   */</div><div class='ctx'> 	r0 = r1 | r0;                    /* add them all together           */</div><div class='add'>+#ifdef ANOMALY_05000265</div><div class='add'>+	BITSET(r0, 15);                  /* Add 250 mV of hysteresis to SPORT input pins */</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	p0.h = hi(PLL_CTL);</div><div class='ctx'> 	p0.l = lo(PLL_CTL);              /* Load the address                */</div><div class='head'>diff --git a/arch/blackfin/mach-bf533/include/mach/anomaly.h b/arch/blackfin/mach-bf533/include/mach/anomaly.h<br/>index 8f7ea112fd3a..f544fc56959a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mach-bf533/include/mach/anomaly.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/mach-bf533/include/mach/anomaly.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mach-bf533/include/mach/anomaly.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-bf533/include/mach/anomaly.h</a></div><div class='hunk'>@@ -7,7 +7,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* This file shoule be up to date with:</div><div class='del'>- *  - Revision C, 02/08/2008; ADSP-BF531/BF532/BF533 Blackfin Processor Anomaly List</div><div class='add'>+ *  - Revision D, 06/18/2008; ADSP-BF531/BF532/BF533 Blackfin Processor Anomaly List</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _MACH_ANOMALY_H_</div><div class='hunk'>@@ -97,11 +97,11 @@</div><div class='ctx'> /* UART STB Bit Incorrectly Affects Receiver Setting */</div><div class='ctx'> #define ANOMALY_05000231 (__SILICON_REVISION__ &lt; 5)</div><div class='ctx'> /* PPI_FS3 Is Not Driven in 2 or 3 Internal Frame Sync Transmit Modes */</div><div class='del'>-#define ANOMALY_05000233 (__SILICON_REVISION__ &lt; 4)</div><div class='add'>+#define ANOMALY_05000233 (__SILICON_REVISION__ &lt; 6)</div><div class='ctx'> /* Incorrect Revision Number in DSPID Register */</div><div class='ctx'> #define ANOMALY_05000234 (__SILICON_REVISION__ == 4)</div><div class='ctx'> /* DF Bit in PLL_CTL Register Does Not Respond to Hardware Reset */</div><div class='del'>-#define ANOMALY_05000242 (__SILICON_REVISION__ &lt; 4)</div><div class='add'>+#define ANOMALY_05000242 (__SILICON_REVISION__ &lt; 5)</div><div class='ctx'> /* If I-Cache Is On, CSYNC/SSYNC/IDLE Around Change of Control Causes Failures */</div><div class='ctx'> #define ANOMALY_05000244 (__SILICON_REVISION__ &lt; 5)</div><div class='ctx'> /* Spurious Hardware Error from an Access in the Shadow of a Conditional Branch */</div><div class='hunk'>@@ -131,7 +131,7 @@</div><div class='ctx'> /* CSYNC/SSYNC/IDLE Causes Infinite Stall in Penultimate Instruction in Hardware Loop */</div><div class='ctx'> #define ANOMALY_05000264 (__SILICON_REVISION__ &lt; 5)</div><div class='ctx'> /* Sensitivity To Noise with Slow Input Edge Rates on External SPORT TX and RX Clocks */</div><div class='del'>-#define ANOMALY_05000265 (__SILICON_REVISION__ &lt; 5)</div><div class='add'>+#define ANOMALY_05000265 (1)</div><div class='ctx'> /* High I/O Activity Causes Output Voltage of Internal Voltage Regulator (Vddint) to Increase */</div><div class='ctx'> #define ANOMALY_05000269 (__SILICON_REVISION__ &lt; 5)</div><div class='ctx'> /* High I/O Activity Causes Output Voltage of Internal Voltage Regulator (Vddint) to Decrease */</div><div class='hunk'>@@ -141,56 +141,59 @@</div><div class='ctx'> /* Certain Data Cache Writethrough Modes Fail for Vddint &lt;= 0.9V */</div><div class='ctx'> #define ANOMALY_05000272 (1)</div><div class='ctx'> /* Writes to Synchronous SDRAM Memory May Be Lost */</div><div class='del'>-#define ANOMALY_05000273 (1)</div><div class='add'>+#define ANOMALY_05000273 (__SILICON_REVISION__ &lt; 6)</div><div class='ctx'> /* Timing Requirements Change for External Frame Sync PPI Modes with Non-Zero PPI_DELAY */</div><div class='ctx'> #define ANOMALY_05000276 (1)</div><div class='ctx'> /* Writes to an I/O Data Register One SCLK Cycle after an Edge Is Detected May Clear Interrupt */</div><div class='del'>-#define ANOMALY_05000277 (1)</div><div class='add'>+#define ANOMALY_05000277 (__SILICON_REVISION__ &lt; 6)</div><div class='ctx'> /* Disabling Peripherals with DMA Running May Cause DMA System Instability */</div><div class='del'>-#define ANOMALY_05000278 (1)</div><div class='add'>+#define ANOMALY_05000278 (__SILICON_REVISION__ &lt; 6)</div><div class='ctx'> /* False Hardware Error Exception When ISR Context Is Not Restored */</div><div class='del'>-#define ANOMALY_05000281 (1)</div><div class='add'>+#define ANOMALY_05000281 (__SILICON_REVISION__ &lt; 6)</div><div class='ctx'> /* Memory DMA Corruption with 32-Bit Data and Traffic Control */</div><div class='del'>-#define ANOMALY_05000282 (1)</div><div class='add'>+#define ANOMALY_05000282 (__SILICON_REVISION__ &lt; 6)</div><div class='ctx'> /* System MMR Write Is Stalled Indefinitely When Killed in a Particular Stage */</div><div class='del'>-#define ANOMALY_05000283 (1)</div><div class='add'>+#define ANOMALY_05000283 (__SILICON_REVISION__ &lt; 6)</div><div class='ctx'> /* SPORTs May Receive Bad Data If FIFOs Fill Up */</div><div class='del'>-#define ANOMALY_05000288 (1)</div><div class='add'>+#define ANOMALY_05000288 (__SILICON_REVISION__ &lt; 6)</div><div class='ctx'> /* Memory-To-Memory DMA Source/Destination Descriptors Must Be in Same Memory Space */</div><div class='del'>-#define ANOMALY_05000301 (1)</div><div class='add'>+#define ANOMALY_05000301 (__SILICON_REVISION__ &lt; 6)</div><div class='ctx'> /* SSYNCs After Writes To DMA MMR Registers May Not Be Handled Correctly */</div><div class='ctx'> #define ANOMALY_05000302 (__SILICON_REVISION__ &lt; 5)</div><div class='ctx'> /* New Feature: Additional Hysteresis on SPORT Input Pins (Not Available On Older Silicon) */</div><div class='ctx'> #define ANOMALY_05000305 (__SILICON_REVISION__ &lt; 5)</div><div class='ctx'> /* New Feature: Additional PPI Frame Sync Sampling Options (Not Available On Older Silicon) */</div><div class='ctx'> #define ANOMALY_05000306 (__SILICON_REVISION__ &lt; 5)</div><div class='add'>+/* SCKELOW Bit Does Not Maintain State Through Hibernate */</div><div class='add'>+#define ANOMALY_05000307 (1)</div><div class='ctx'> /* False Hardware Errors Caused by Fetches at the Boundary of Reserved Memory */</div><div class='ctx'> #define ANOMALY_05000310 (1)</div><div class='ctx'> /* Erroneous Flag (GPIO) Pin Operations under Specific Sequences */</div><div class='del'>-#define ANOMALY_05000311 (1)</div><div class='add'>+#define ANOMALY_05000311 (__SILICON_REVISION__ &lt; 6)</div><div class='ctx'> /* Errors When SSYNC, CSYNC, or Loads to LT, LB and LC Registers Are Interrupted */</div><div class='del'>-#define ANOMALY_05000312 (1)</div><div class='add'>+#define ANOMALY_05000312 (__SILICON_REVISION__ &lt; 6)</div><div class='ctx'> /* PPI Is Level-Sensitive on First Transfer */</div><div class='del'>-#define ANOMALY_05000313 (1)</div><div class='add'>+#define ANOMALY_05000313 (__SILICON_REVISION__ &lt; 6)</div><div class='ctx'> /* Killed System MMR Write Completes Erroneously On Next System MMR Access */</div><div class='del'>-#define ANOMALY_05000315 (1)</div><div class='add'>+#define ANOMALY_05000315 (__SILICON_REVISION__ &lt; 6)</div><div class='ctx'> /* Internal Voltage Regulator Values of 1.05V, 1.10V and 1.15V Not Allowed for LQFP Packages */</div><div class='del'>-#define ANOMALY_05000319 (ANOMALY_BF531 || ANOMALY_BF532)</div><div class='add'>+#define ANOMALY_05000319 ((ANOMALY_BF531 || ANOMALY_BF532) &amp;&amp; __SILICON_REVISION__ &lt; 6)</div><div class='ctx'> /* Serial Port (SPORT) Multichannel Transmit Failure when Channel 0 Is Disabled */</div><div class='del'>-#define ANOMALY_05000357 (1)</div><div class='add'>+#define ANOMALY_05000357 (__SILICON_REVISION__ &lt; 6)</div><div class='ctx'> /* UART Break Signal Issues */</div><div class='ctx'> #define ANOMALY_05000363 (__SILICON_REVISION__ &lt; 5)</div><div class='ctx'> /* PPI Underflow Error Goes Undetected in ITU-R 656 Mode */</div><div class='ctx'> #define ANOMALY_05000366 (1)</div><div class='ctx'> /* Possible RETS Register Corruption when Subroutine Is under 5 Cycles in Duration */</div><div class='del'>-#define ANOMALY_05000371 (1)</div><div class='add'>+#define ANOMALY_05000371 (__SILICON_REVISION__ &lt; 6)</div><div class='ctx'> /* PPI Does Not Start Properly In Specific Mode */</div><div class='del'>-#define ANOMALY_05000400 (__SILICON_REVISION__ &gt;= 5)</div><div class='add'>+#define ANOMALY_05000400 (__SILICON_REVISION__ == 5)</div><div class='ctx'> /* SSYNC Stalls Processor when Executed from Non-Cacheable Memory */</div><div class='del'>-#define ANOMALY_05000402 (__SILICON_REVISION__ &gt;= 5)</div><div class='add'>+#define ANOMALY_05000402 (__SILICON_REVISION__ == 5)</div><div class='ctx'> /* Level-Sensitive External GPIO Wakeups May Cause Indefinite Stall */</div><div class='ctx'> #define ANOMALY_05000403 (1)</div><div class='del'>-</div><div class='add'>+/* Speculative Fetches Can Cause Undesired External FIFO Operations */</div><div class='add'>+#define ANOMALY_05000416 (1)</div><div class='ctx'> </div><div class='ctx'> /* These anomalies have been "phased" out of analog.com anomaly sheets and are</div><div class='ctx'>  * here to show running on older silicon just isn't feasible.</div><div class='hunk'>@@ -268,5 +271,7 @@</div><div class='ctx'> /* Anomalies that don't exist on this proc */</div><div class='ctx'> #define ANOMALY_05000266 (0)</div><div class='ctx'> #define ANOMALY_05000323 (0)</div><div class='add'>+#define ANOMALY_05000353 (1)</div><div class='add'>+#define ANOMALY_05000386 (1)</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/blackfin/mach-bf533/include/mach/bf533.h b/arch/blackfin/mach-bf533/include/mach/bf533.h<br/>index 12a416931991..dfc8c1ad2d7a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mach-bf533/include/mach/bf533.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/mach-bf533/include/mach/bf533.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mach-bf533/include/mach/bf533.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-bf533/include/mach/bf533.h</a></div><div class='hunk'>@@ -30,8 +30,6 @@</div><div class='ctx'> #ifndef __MACH_BF533_H__</div><div class='ctx'> #define __MACH_BF533_H__</div><div class='ctx'> </div><div class='del'>-#define SUPPORTED_REVID 2</div><div class='del'>-</div><div class='ctx'> #define OFFSET_(x) ((x) &amp; 0x0000FFFF)</div><div class='ctx'> </div><div class='ctx'> /*some misc defines*/</div><div class='hunk'>@@ -143,19 +141,19 @@</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_BF533</div><div class='ctx'> #define CPU "BF533"</div><div class='del'>-#define CPUID 0x027a5000</div><div class='add'>+#define CPUID 0x27a5</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_BF532</div><div class='ctx'> #define CPU "BF532"</div><div class='del'>-#define CPUID 0x0275A000</div><div class='add'>+#define CPUID 0x275A</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_BF531</div><div class='ctx'> #define CPU "BF531"</div><div class='del'>-#define CPUID 0x027a5000</div><div class='add'>+#define CPUID 0x27a5</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> #ifndef CPU</div><div class='del'>-#define	CPU "UNKNOWN"</div><div class='del'>-#define CPUID 0x0</div><div class='add'>+#error Unknown CPU type - This kernel doesn't seem to be configured properly</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #endif				/* __MACH_BF533_H__  */</div><div class='head'>diff --git a/arch/blackfin/mach-bf533/include/mach/bfin_serial_5xx.h b/arch/blackfin/mach-bf533/include/mach/bfin_serial_5xx.h<br/>index ebf592b59aab..f3d9e495230c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mach-bf533/include/mach/bfin_serial_5xx.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/mach-bf533/include/mach/bfin_serial_5xx.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mach-bf533/include/mach/bfin_serial_5xx.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-bf533/include/mach/bfin_serial_5xx.h</a></div><div class='hunk'>@@ -69,6 +69,8 @@</div><div class='ctx'> # endif</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#define BFIN_UART_TX_FIFO_SIZE	2</div><div class='add'>+</div><div class='ctx'> struct bfin_serial_port {</div><div class='ctx'>         struct uart_port        port;</div><div class='ctx'>         unsigned int            old_status;</div><div class='hunk'>@@ -83,7 +85,7 @@ struct bfin_serial_port {</div><div class='ctx'> 	unsigned int		rx_dma_channel;</div><div class='ctx'> 	struct work_struct	tx_dma_workqueue;</div><div class='ctx'> #else</div><div class='del'>-# if ANOMALY_05000230</div><div class='add'>+# if ANOMALY_05000363</div><div class='ctx'> 	unsigned int anomaly_threshold;</div><div class='ctx'> # endif</div><div class='ctx'> #endif</div><div class='hunk'>@@ -111,7 +113,6 @@ static inline void UART_CLEAR_LSR(struct bfin_serial_port *uart)</div><div class='ctx'> 	bfin_write16(uart-&gt;port.membase + OFFSET_LSR, -1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct bfin_serial_port bfin_serial_ports[BFIN_UART_NR_PORTS];</div><div class='ctx'> struct bfin_serial_res {</div><div class='ctx'> 	unsigned long	uart_base_addr;</div><div class='ctx'> 	int		uart_irq;</div><div class='hunk'>@@ -142,7 +143,6 @@ struct bfin_serial_res bfin_serial_resource[] = {</div><div class='ctx'> </div><div class='ctx'> #define DRIVER_NAME "bfin-uart"</div><div class='ctx'> </div><div class='del'>-int nr_ports = BFIN_UART_NR_PORTS;</div><div class='ctx'> static void bfin_serial_hw_init(struct bfin_serial_port *uart)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='hunk'>@@ -158,7 +158,7 @@ static void bfin_serial_hw_init(struct bfin_serial_port *uart)</div><div class='ctx'> 	}</div><div class='ctx'> 	if (uart-&gt;rts_pin &gt;= 0) {</div><div class='ctx'> 		gpio_request(uart-&gt;rts_pin, DRIVER_NAME);</div><div class='del'>-		gpio_direction_input(uart-&gt;rts_pin, 0);</div><div class='add'>+		gpio_direction_output(uart-&gt;rts_pin, 0);</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c<br/>index 8482d22321f3..8d394393201f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mach-bf537/boards/stamp.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/mach-bf537/boards/stamp.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mach-bf537/boards/stamp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-bf537/boards/stamp.c</a></div><div class='hunk'>@@ -51,7 +51,6 @@</div><div class='ctx'> #include &lt;asm/reboot.h&gt;</div><div class='ctx'> #include &lt;asm/portmux.h&gt;</div><div class='ctx'> #include &lt;asm/dpmc.h&gt;</div><div class='del'>-#include &lt;linux/spi/ad7877.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Name the Board for the /proc/cpuinfo</div><div class='hunk'>@@ -555,6 +554,7 @@ static struct bfin5xx_spi_chip spi_si3xxx_chip_info = {</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE)</div><div class='add'>+#include &lt;linux/spi/ad7877.h&gt;</div><div class='ctx'> static struct bfin5xx_spi_chip spi_ad7877_chip_info = {</div><div class='ctx'> 	.enable_dma = 0,</div><div class='ctx'> 	.bits_per_word = 16,</div><div class='hunk'>@@ -575,6 +575,30 @@ static const struct ad7877_platform_data bfin_ad7877_ts_info = {</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_TOUCHSCREEN_AD7879) || defined(CONFIG_TOUCHSCREEN_AD7879_MODULE)</div><div class='add'>+#include &lt;linux/spi/ad7879.h&gt;</div><div class='add'>+static const struct ad7879_platform_data bfin_ad7879_ts_info = {</div><div class='add'>+	.model			= 7879,	/* Model = AD7879 */</div><div class='add'>+	.x_plate_ohms		= 620,	/* 620 Ohm from the touch datasheet */</div><div class='add'>+	.pressure_max		= 10000,</div><div class='add'>+	.pressure_min		= 0,</div><div class='add'>+	.first_conversion_delay = 3,	/* wait 512us before do a first conversion */</div><div class='add'>+	.acquisition_time 	= 1,	/* 4us acquisition time per sample */</div><div class='add'>+	.median			= 2,	/* do 8 measurements */</div><div class='add'>+	.averaging 		= 1,	/* take the average of 4 middle samples */</div><div class='add'>+	.pen_down_acc_interval 	= 255,	/* 9.4 ms */</div><div class='add'>+	.gpio_output		= 1,	/* configure AUX/VBAT/GPIO as GPIO output */</div><div class='add'>+	.gpio_default 		= 1,	/* During initialization set GPIO = HIGH */</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_TOUCHSCREEN_AD7879_SPI) || defined(CONFIG_TOUCHSCREEN_AD7879_SPI_MODULE)</div><div class='add'>+static struct bfin5xx_spi_chip spi_ad7879_chip_info = {</div><div class='add'>+	.enable_dma = 0,</div><div class='add'>+	.bits_per_word = 16,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #if defined(CONFIG_SPI_SPIDEV) || defined(CONFIG_SPI_SPIDEV_MODULE)</div><div class='ctx'> static struct bfin5xx_spi_chip spidev_chip_info = {</div><div class='ctx'> 	.enable_dma = 0,</div><div class='hunk'>@@ -582,6 +606,13 @@ static struct bfin5xx_spi_chip spidev_chip_info = {</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_FB_BFIN_LQ035Q1) || defined(CONFIG_FB_BFIN_LQ035Q1_MODULE)</div><div class='add'>+static struct bfin5xx_spi_chip lq035q1_spi_chip_info = {</div><div class='add'>+	.enable_dma	= 0,</div><div class='add'>+	.bits_per_word	= 8,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #if defined(CONFIG_MTD_DATAFLASH) \</div><div class='ctx'> 	|| defined(CONFIG_MTD_DATAFLASH_MODULE)</div><div class='ctx'> </div><div class='hunk'>@@ -721,6 +752,18 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {</div><div class='ctx'> 		.controller_data = &amp;spi_ad7877_chip_info,</div><div class='ctx'> 	},</div><div class='ctx'> #endif</div><div class='add'>+#if defined(CONFIG_TOUCHSCREEN_AD7879_SPI) || defined(CONFIG_TOUCHSCREEN_AD7879_SPI_MODULE)</div><div class='add'>+	{</div><div class='add'>+		.modalias = "ad7879",</div><div class='add'>+		.platform_data = &amp;bfin_ad7879_ts_info,</div><div class='add'>+		.irq = IRQ_PF7,</div><div class='add'>+		.max_speed_hz = 5000000,     /* max spi clock (SCK) speed in HZ */</div><div class='add'>+		.bus_num = 0,</div><div class='add'>+		.chip_select = 1,</div><div class='add'>+		.controller_data = &amp;spi_ad7879_chip_info,</div><div class='add'>+		.mode = SPI_CPHA | SPI_CPOL,</div><div class='add'>+	},</div><div class='add'>+#endif</div><div class='ctx'> #if defined(CONFIG_SPI_SPIDEV) || defined(CONFIG_SPI_SPIDEV_MODULE)</div><div class='ctx'> 	{</div><div class='ctx'> 		.modalias = "spidev",</div><div class='hunk'>@@ -730,6 +773,16 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {</div><div class='ctx'> 		.controller_data = &amp;spidev_chip_info,</div><div class='ctx'> 	},</div><div class='ctx'> #endif</div><div class='add'>+#if defined(CONFIG_FB_BFIN_LQ035Q1) || defined(CONFIG_FB_BFIN_LQ035Q1_MODULE)</div><div class='add'>+	{</div><div class='add'>+		.modalias = "bfin-lq035q1-spi",</div><div class='add'>+		.max_speed_hz = 20000000,     /* max spi clock (SCK) speed in HZ */</div><div class='add'>+		.bus_num = 0,</div><div class='add'>+		.chip_select = 2,</div><div class='add'>+		.controller_data = &amp;lq035q1_spi_chip_info,</div><div class='add'>+		.mode = SPI_CPHA | SPI_CPOL,</div><div class='add'>+	},</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)</div><div class='hunk'>@@ -777,6 +830,34 @@ static struct platform_device bfin_fb_adv7393_device = {</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_FB_BFIN_LQ035Q1) || defined(CONFIG_FB_BFIN_LQ035Q1_MODULE)</div><div class='add'>+#include &lt;asm/bfin-lq035q1.h&gt;</div><div class='add'>+</div><div class='add'>+static struct bfin_lq035q1fb_disp_info bfin_lq035q1_data = {</div><div class='add'>+	.mode = 	LQ035_NORM | LQ035_RGB | LQ035_RL | LQ035_TB,</div><div class='add'>+	.use_bl = 	0,	/* let something else control the LCD Blacklight */</div><div class='add'>+	.gpio_bl =	GPIO_PF7,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource bfin_lq035q1_resources[] = {</div><div class='add'>+	{</div><div class='add'>+		.start = IRQ_PPI_ERROR,</div><div class='add'>+		.end = IRQ_PPI_ERROR,</div><div class='add'>+		.flags = IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device bfin_lq035q1_device = {</div><div class='add'>+	.name		= "bfin-lq035q1",</div><div class='add'>+	.id		= -1,</div><div class='add'>+	.num_resources 	= ARRAY_SIZE(bfin_lq035q1_resources),</div><div class='add'>+	.resource 	= bfin_lq035q1_resources,</div><div class='add'>+	.dev		= {</div><div class='add'>+		.platform_data = &amp;bfin_lq035q1_data,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)</div><div class='ctx'> static struct resource bfin_uart_resources[] = {</div><div class='ctx'> #ifdef CONFIG_SERIAL_BFIN_UART0</div><div class='hunk'>@@ -856,7 +937,7 @@ static struct i2c_board_info __initdata bfin_i2c_board_info[] = {</div><div class='ctx'> #if defined(CONFIG_JOYSTICK_AD7142) || defined(CONFIG_JOYSTICK_AD7142_MODULE)</div><div class='ctx'> 	{</div><div class='ctx'> 		I2C_BOARD_INFO("ad7142_joystick", 0x2C),</div><div class='del'>-		.irq = 55,</div><div class='add'>+		.irq = IRQ_PF5,</div><div class='ctx'> 	},</div><div class='ctx'> #endif</div><div class='ctx'> #if defined(CONFIG_TWI_LCD) || defined(CONFIG_TWI_LCD_MODULE)</div><div class='hunk'>@@ -867,7 +948,14 @@ static struct i2c_board_info __initdata bfin_i2c_board_info[] = {</div><div class='ctx'> #if defined(CONFIG_TWI_KEYPAD) || defined(CONFIG_TWI_KEYPAD_MODULE)</div><div class='ctx'> 	{</div><div class='ctx'> 		I2C_BOARD_INFO("pcf8574_keypad", 0x27),</div><div class='del'>-		.irq = 72,</div><div class='add'>+		.irq = IRQ_PG6,</div><div class='add'>+	},</div><div class='add'>+#endif</div><div class='add'>+#if defined(CONFIG_TOUCHSCREEN_AD7879_I2C) || defined(CONFIG_TOUCHSCREEN_AD7879_I2C_MODULE)</div><div class='add'>+	{</div><div class='add'>+		I2C_BOARD_INFO("ad7879", 0x2F),</div><div class='add'>+		.irq = IRQ_PG5,</div><div class='add'>+		.platform_data = (void *)&amp;bfin_ad7879_ts_info,</div><div class='ctx'> 	},</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='hunk'>@@ -997,6 +1085,10 @@ static struct platform_device *stamp_devices[] __initdata = {</div><div class='ctx'> 	&amp;bfin_fb_device,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_FB_BFIN_LQ035Q1) || defined(CONFIG_FB_BFIN_LQ035Q1_MODULE)</div><div class='add'>+	&amp;bfin_lq035q1_device,</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #if defined(CONFIG_FB_BFIN_7393) || defined(CONFIG_FB_BFIN_7393_MODULE)</div><div class='ctx'> 	&amp;bfin_fb_adv7393_device,</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/blackfin/mach-bf537/head.S b/arch/blackfin/mach-bf537/head.S<br/>index 12eb5cc571d0..f5c94bf80e3b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mach-bf537/head.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/mach-bf537/head.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mach-bf537/head.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-bf537/head.S</a></div><div class='hunk'>@@ -87,6 +87,9 @@ ENTRY(_start_dma_code)</div><div class='ctx'> 	r1 = PLL_BYPASS;                 /* Bypass the PLL?                 */</div><div class='ctx'> 	r1 = r1 &lt;&lt; 8;                    /* Shift it over                   */</div><div class='ctx'> 	r0 = r1 | r0;                    /* add them all together           */</div><div class='add'>+#ifdef ANOMALY_05000265</div><div class='add'>+	BITSET(r0, 15);                  /* Add 250 mV of hysteresis to SPORT input pins */</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	p0.h = hi(PLL_CTL);</div><div class='ctx'> 	p0.l = lo(PLL_CTL);              /* Load the address                */</div><div class='head'>diff --git a/arch/blackfin/mach-bf537/include/mach/anomaly.h b/arch/blackfin/mach-bf537/include/mach/anomaly.h<br/>index 8460ab9c324f..c68992494f9e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mach-bf537/include/mach/anomaly.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/mach-bf537/include/mach/anomaly.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mach-bf537/include/mach/anomaly.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-bf537/include/mach/anomaly.h</a></div><div class='hunk'>@@ -158,6 +158,8 @@</div><div class='ctx'> #define ANOMALY_05000266 (0)</div><div class='ctx'> #define ANOMALY_05000311 (0)</div><div class='ctx'> #define ANOMALY_05000323 (0)</div><div class='add'>+#define ANOMALY_05000353 (1)</div><div class='ctx'> #define ANOMALY_05000363 (0)</div><div class='add'>+#define ANOMALY_05000386 (1)</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/blackfin/mach-bf537/include/mach/bf537.h b/arch/blackfin/mach-bf537/include/mach/bf537.h<br/>index cfe2a221112e..24d5c9d42323 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mach-bf537/include/mach/bf537.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/mach-bf537/include/mach/bf537.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mach-bf537/include/mach/bf537.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-bf537/include/mach/bf537.h</a></div><div class='hunk'>@@ -30,8 +30,6 @@</div><div class='ctx'> #ifndef __MACH_BF537_H__</div><div class='ctx'> #define __MACH_BF537_H__</div><div class='ctx'> </div><div class='del'>-#define SUPPORTED_REVID 2</div><div class='del'>-</div><div class='ctx'> /* Masks for generic ERROR IRQ demultiplexing used in int-priority-sc.c */</div><div class='ctx'> </div><div class='ctx'> #define SPI_ERR_MASK (TXCOL | RBSY | MODF | TXE)	/* SPI_STAT */</div><div class='hunk'>@@ -123,19 +121,19 @@</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_BF537</div><div class='ctx'> #define CPU "BF537"</div><div class='del'>-#define CPUID 0x027c8000</div><div class='add'>+#define CPUID 0x27c8</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_BF536</div><div class='ctx'> #define CPU "BF536"</div><div class='del'>-#define CPUID 0x027c8000</div><div class='add'>+#define CPUID 0x27c8</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_BF534</div><div class='ctx'> #define CPU "BF534"</div><div class='del'>-#define CPUID 0x027c6000</div><div class='add'>+#define CPUID 0x27c6</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> #ifndef CPU</div><div class='del'>-#define	CPU "UNKNOWN"</div><div class='del'>-#define CPUID 0x0</div><div class='add'>+#error Unknown CPU type - This kernel doesn't seem to be configured properly</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #endif				/* __MACH_BF537_H__  */</div><div class='head'>diff --git a/arch/blackfin/mach-bf537/include/mach/bfin_serial_5xx.h b/arch/blackfin/mach-bf537/include/mach/bfin_serial_5xx.h<br/>index 1bf56ffa22f9..b3f87e1d16a2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mach-bf537/include/mach/bfin_serial_5xx.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/mach-bf537/include/mach/bfin_serial_5xx.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mach-bf537/include/mach/bfin_serial_5xx.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-bf537/include/mach/bfin_serial_5xx.h</a></div><div class='hunk'>@@ -78,6 +78,9 @@</div><div class='ctx'> #  define CONFIG_UART1_RTS_PIN -1</div><div class='ctx'> # endif</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='add'>+#define BFIN_UART_TX_FIFO_SIZE	2</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * The pin configuration is different from schematic</div><div class='ctx'>  */</div><div class='hunk'>@@ -119,7 +122,6 @@ static inline void UART_CLEAR_LSR(struct bfin_serial_port *uart)</div><div class='ctx'> 	bfin_write16(uart-&gt;port.membase + OFFSET_LSR, -1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct bfin_serial_port bfin_serial_ports[BFIN_UART_NR_PORTS];</div><div class='ctx'> struct bfin_serial_res {</div><div class='ctx'> 	unsigned long	uart_base_addr;</div><div class='ctx'> 	int		uart_irq;</div><div class='hunk'>@@ -164,8 +166,6 @@ struct bfin_serial_res bfin_serial_resource[] = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int nr_ports = ARRAY_SIZE(bfin_serial_resource);</div><div class='del'>-</div><div class='ctx'> #define DRIVER_NAME "bfin-uart"</div><div class='ctx'> </div><div class='ctx'> static void bfin_serial_hw_init(struct bfin_serial_port *uart)</div><div class='head'>diff --git a/arch/blackfin/mach-bf548/boards/cm_bf548.c b/arch/blackfin/mach-bf548/boards/cm_bf548.c<br/>index ce934ee174e0..24192aaa9275 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mach-bf548/boards/cm_bf548.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/mach-bf548/boards/cm_bf548.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mach-bf548/boards/cm_bf548.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-bf548/boards/cm_bf548.c</a></div><div class='hunk'>@@ -36,11 +36,8 @@</div><div class='ctx'> #include &lt;linux/spi/flash.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='del'>-#if defined(CONFIG_USB_MUSB_HDRC) || defined(CONFIG_USB_MUSB_HDRC_MODULE)</div><div class='ctx'> #include &lt;linux/usb/musb.h&gt;</div><div class='del'>-#endif</div><div class='ctx'> #include &lt;asm/bfin5xx_spi.h&gt;</div><div class='del'>-#include &lt;asm/cplb.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='ctx'> #include &lt;asm/gpio.h&gt;</div><div class='ctx'> #include &lt;asm/nand.h&gt;</div><div class='hunk'>@@ -175,6 +172,7 @@ static struct resource bfin_uart_resources[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.start = 0xFFC03100,</div><div class='ctx'> 		.end = 0xFFC031FF,</div><div class='add'>+		.flags = IORESOURCE_MEM,</div><div class='ctx'> 	},</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='hunk'>@@ -268,6 +266,16 @@ static struct resource musb_resources[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct musb_hdrc_config musb_config = {</div><div class='add'>+	.multipoint	= 0,</div><div class='add'>+	.dyn_fifo	= 0,</div><div class='add'>+	.soft_con	= 1,</div><div class='add'>+	.dma		= 1,</div><div class='add'>+	.num_eps	= 7,</div><div class='add'>+	.dma_channels	= 7,</div><div class='add'>+	.gpio_vrsel	= GPIO_PH6,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct musb_hdrc_platform_data musb_plat = {</div><div class='ctx'> #if defined(CONFIG_USB_MUSB_OTG)</div><div class='ctx'> 	.mode		= MUSB_OTG,</div><div class='hunk'>@@ -276,7 +284,7 @@ static struct musb_hdrc_platform_data musb_plat = {</div><div class='ctx'> #elif defined(CONFIG_USB_GADGET_MUSB_HDRC)</div><div class='ctx'> 	.mode		= MUSB_PERIPHERAL,</div><div class='ctx'> #endif</div><div class='del'>-	.multipoint	= 0,</div><div class='add'>+	.config		= &amp;musb_config,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static u64 musb_dmamask = ~(u32)0;</div><div class='hunk'>@@ -321,12 +329,12 @@ static struct mtd_partition partition_info[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.name = "linux kernel(nand)",</div><div class='ctx'> 		.offset = 0,</div><div class='del'>-		.size = 4 * SIZE_1M,</div><div class='add'>+		.size = 4 * 1024 * 1024,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.name = "file system(nand)",</div><div class='del'>-		.offset = 4 * SIZE_1M,</div><div class='del'>-		.size = (256 - 4) * SIZE_1M,</div><div class='add'>+		.offset = 4 * 1024 * 1024,</div><div class='add'>+		.size = (256 - 4) * 1024 * 1024,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/blackfin/mach-bf548/boards/ezkit.c b/arch/blackfin/mach-bf548/boards/ezkit.c<br/>index 39357693046d..5288187a3ace 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mach-bf548/boards/ezkit.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/mach-bf548/boards/ezkit.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mach-bf548/boards/ezkit.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-bf548/boards/ezkit.c</a></div><div class='hunk'>@@ -38,11 +38,8 @@</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='del'>-#if defined(CONFIG_USB_MUSB_HDRC) || defined(CONFIG_USB_MUSB_HDRC_MODULE)</div><div class='ctx'> #include &lt;linux/usb/musb.h&gt;</div><div class='del'>-#endif</div><div class='ctx'> #include &lt;asm/bfin5xx_spi.h&gt;</div><div class='del'>-#include &lt;asm/cplb.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='ctx'> #include &lt;asm/gpio.h&gt;</div><div class='ctx'> #include &lt;asm/nand.h&gt;</div><div class='hunk'>@@ -186,6 +183,37 @@ static struct platform_device bf54x_kpad_device = {</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_JOYSTICK_BFIN_ROTARY) || defined(CONFIG_JOYSTICK_BFIN_ROTARY_MODULE)</div><div class='add'>+#include &lt;asm/bfin_rotary.h&gt;</div><div class='add'>+</div><div class='add'>+static struct bfin_rotary_platform_data bfin_rotary_data = {</div><div class='add'>+	/*.rotary_up_key     = KEY_UP,*/</div><div class='add'>+	/*.rotary_down_key   = KEY_DOWN,*/</div><div class='add'>+	.rotary_rel_code   = REL_WHEEL,</div><div class='add'>+	.rotary_button_key = KEY_ENTER,</div><div class='add'>+	.debounce	   = 10,	/* 0..17 */</div><div class='add'>+	.mode		   = ROT_QUAD_ENC | ROT_DEBE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource bfin_rotary_resources[] = {</div><div class='add'>+	{</div><div class='add'>+		.start = IRQ_CNT,</div><div class='add'>+		.end = IRQ_CNT,</div><div class='add'>+		.flags = IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device bfin_rotary_device = {</div><div class='add'>+	.name		= "bfin-rotary",</div><div class='add'>+	.id		= -1,</div><div class='add'>+	.num_resources 	= ARRAY_SIZE(bfin_rotary_resources),</div><div class='add'>+	.resource 	= bfin_rotary_resources,</div><div class='add'>+	.dev		= {</div><div class='add'>+		.platform_data = &amp;bfin_rotary_data,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)</div><div class='ctx'> static struct platform_device rtc_device = {</div><div class='ctx'> 	.name = "rtc-bfin",</div><div class='hunk'>@@ -314,6 +342,16 @@ static struct resource musb_resources[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct musb_hdrc_config musb_config = {</div><div class='add'>+	.multipoint	= 0,</div><div class='add'>+	.dyn_fifo	= 0,</div><div class='add'>+	.soft_con	= 1,</div><div class='add'>+	.dma		= 1,</div><div class='add'>+	.num_eps	= 7,</div><div class='add'>+	.dma_channels	= 7,</div><div class='add'>+	.gpio_vrsel	= GPIO_PE7,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct musb_hdrc_platform_data musb_plat = {</div><div class='ctx'> #if defined(CONFIG_USB_MUSB_OTG)</div><div class='ctx'> 	.mode		= MUSB_OTG,</div><div class='hunk'>@@ -322,7 +360,7 @@ static struct musb_hdrc_platform_data musb_plat = {</div><div class='ctx'> #elif defined(CONFIG_USB_GADGET_MUSB_HDRC)</div><div class='ctx'> 	.mode		= MUSB_PERIPHERAL,</div><div class='ctx'> #endif</div><div class='del'>-	.multipoint	= 0,</div><div class='add'>+	.config		= &amp;musb_config,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static u64 musb_dmamask = ~(u32)0;</div><div class='hunk'>@@ -367,7 +405,7 @@ static struct mtd_partition partition_info[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.name = "linux kernel(nand)",</div><div class='ctx'> 		.offset = 0,</div><div class='del'>-		.size = 4 * SIZE_1M,</div><div class='add'>+		.size = 4 * 1024 * 1024,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.name = "file system(nand)",</div><div class='hunk'>@@ -424,7 +462,7 @@ static struct mtd_partition ezkit_partitions[] = {</div><div class='ctx'> 		.offset     = 0,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.name       = "linux kernel(nor)",</div><div class='del'>-		.size       = 0x1C0000,</div><div class='add'>+		.size       = 0x400000,</div><div class='ctx'> 		.offset     = MTDPART_OFS_APPEND,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.name       = "file system(nor)",</div><div class='hunk'>@@ -441,7 +479,7 @@ static struct physmap_flash_data ezkit_flash_data = {</div><div class='ctx'> </div><div class='ctx'> static struct resource ezkit_flash_resource = {</div><div class='ctx'> 	.start = 0x20000000,</div><div class='del'>-	.end   = 0x20ffffff,</div><div class='add'>+	.end   = 0x21ffffff,</div><div class='ctx'> 	.flags = IORESOURCE_MEM,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -551,7 +589,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {</div><div class='ctx'> {</div><div class='ctx'> 	.modalias		= "ad7877",</div><div class='ctx'> 	.platform_data		= &amp;bfin_ad7877_ts_info,</div><div class='del'>-	.irq			= IRQ_PJ11,</div><div class='add'>+	.irq			= IRQ_PJ11,	/* newer boards (Rev 1.4+) use IRQ_PB4 */</div><div class='ctx'> 	.max_speed_hz		= 12500000,     /* max spi clock (SCK) speed in HZ */</div><div class='ctx'> 	.bus_num		= 0,</div><div class='ctx'> 	.chip_select  		= 2,</div><div class='hunk'>@@ -810,6 +848,10 @@ static struct platform_device *ezkit_devices[] __initdata = {</div><div class='ctx'> 	&amp;bf54x_kpad_device,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_JOYSTICK_BFIN_ROTARY) || defined(CONFIG_JOYSTICK_BFIN_ROTARY_MODULE)</div><div class='add'>+	&amp;bfin_rotary_device,</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)</div><div class='ctx'> 	&amp;i2c_bfin_twi0_device,</div><div class='ctx'> #if !defined(CONFIG_BF542)</div><div class='head'>diff --git a/arch/blackfin/mach-bf548/head.S b/arch/blackfin/mach-bf548/head.S<br/>index 4d5cfeacb123..93b361dff27b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mach-bf548/head.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/mach-bf548/head.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mach-bf548/head.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-bf548/head.S</a></div><div class='hunk'>@@ -73,25 +73,19 @@ ENTRY(_start_dma_code)</div><div class='ctx'> 	w[p0] = r0.l;</div><div class='ctx'> 	ssync;</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_BF54x)</div><div class='add'>+	/* enable self refresh via SRREQ */</div><div class='ctx'> 	P2.H = hi(EBIU_RSTCTL);</div><div class='ctx'> 	P2.L = lo(EBIU_RSTCTL);</div><div class='ctx'> 	R0 = [P2];</div><div class='ctx'> 	BITSET (R0, 3);</div><div class='del'>-#else</div><div class='del'>-	P2.H = hi(EBIU_SDGCTL);</div><div class='del'>-	P2.L = lo(EBIU_SDGCTL);</div><div class='del'>-	R0 = [P2];</div><div class='del'>-	BITSET (R0, 24);</div><div class='del'>-#endif</div><div class='ctx'> 	[P2] = R0;</div><div class='ctx'> 	SSYNC;</div><div class='del'>-#if defined(CONFIG_BF54x)</div><div class='add'>+</div><div class='add'>+	/* wait for SRACK bit to be set */</div><div class='ctx'> .LSRR_MODE:</div><div class='ctx'> 	R0 = [P2];</div><div class='ctx'> 	CC = BITTST(R0, 4);</div><div class='ctx'> 	if !CC JUMP .LSRR_MODE;</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> 	r0 = CONFIG_VCO_MULT &amp; 63;       /* Load the VCO multiplier         */</div><div class='ctx'> 	r0 = r0 &lt;&lt; 9;                    /* Shift it over,                  */</div><div class='hunk'>@@ -100,6 +94,9 @@ ENTRY(_start_dma_code)</div><div class='ctx'> 	r1 = PLL_BYPASS;                 /* Bypass the PLL?                 */</div><div class='ctx'> 	r1 = r1 &lt;&lt; 8;                    /* Shift it over                   */</div><div class='ctx'> 	r0 = r1 | r0;                    /* add them all together           */</div><div class='add'>+#ifdef ANOMALY_05000265</div><div class='add'>+	BITSET(r0, 15);                  /* Add 250 mV of hysteresis to SPORT input pins */</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	p0.h = hi(PLL_CTL);</div><div class='ctx'> 	p0.l = lo(PLL_CTL);              /* Load the address                */</div><div class='hunk'>@@ -123,7 +120,7 @@ ENTRY(_start_dma_code)</div><div class='ctx'> 	w[p0] = r0.l;</div><div class='ctx'> 	ssync;</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_BF54x)</div><div class='add'>+	/* disable self refresh by clearing SRREQ */</div><div class='ctx'> 	P2.H = hi(EBIU_RSTCTL);</div><div class='ctx'> 	P2.L = lo(EBIU_RSTCTL);</div><div class='ctx'> 	R0 = [P2];</div><div class='hunk'>@@ -155,41 +152,6 @@ ENTRY(_start_dma_code)</div><div class='ctx'> 	r0.h = hi(mem_DDRCTL2);</div><div class='ctx'> 	[p0] = r0;</div><div class='ctx'> 	ssync;</div><div class='del'>-#else</div><div class='del'>-	p0.l = lo(EBIU_SDRRC);</div><div class='del'>-	p0.h = hi(EBIU_SDRRC);</div><div class='del'>-	r0 = mem_SDRRC;</div><div class='del'>-	w[p0] = r0.l;</div><div class='del'>-	ssync;</div><div class='del'>-</div><div class='del'>-	p0.l = LO(EBIU_SDBCTL);</div><div class='del'>-	p0.h = HI(EBIU_SDBCTL);     /* SDRAM Memory Bank Control Register */</div><div class='del'>-	r0 = mem_SDBCTL;</div><div class='del'>-	w[p0] = r0.l;</div><div class='del'>-	ssync;</div><div class='del'>-</div><div class='del'>-	P2.H = hi(EBIU_SDGCTL);</div><div class='del'>-	P2.L = lo(EBIU_SDGCTL);</div><div class='del'>-	R0 = [P2];</div><div class='del'>-	BITCLR (R0, 24);</div><div class='del'>-	p0.h = hi(EBIU_SDSTAT);</div><div class='del'>-	p0.l = lo(EBIU_SDSTAT);</div><div class='del'>-	r2.l = w[p0];</div><div class='del'>-	cc = bittst(r2,3);</div><div class='del'>-	if !cc jump .Lskip;</div><div class='del'>-	NOP;</div><div class='del'>-	BITSET (R0, 23);</div><div class='del'>-.Lskip:</div><div class='del'>-	[P2] = R0;</div><div class='del'>-	SSYNC;</div><div class='del'>-</div><div class='del'>-	R0.L = lo(mem_SDGCTL);</div><div class='del'>-	R0.H = hi(mem_SDGCTL);</div><div class='del'>-	R1 = [p2];</div><div class='del'>-	R1 = R1 | R0;</div><div class='del'>-	[P2] = R1;</div><div class='del'>-	SSYNC;</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> 	RTS;</div><div class='ctx'> ENDPROC(_start_dma_code)</div><div class='head'>diff --git a/arch/blackfin/mach-bf548/include/mach/anomaly.h b/arch/blackfin/mach-bf548/include/mach/anomaly.h<br/>index 3ad59655881a..816b09278f62 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mach-bf548/include/mach/anomaly.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/mach-bf548/include/mach/anomaly.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mach-bf548/include/mach/anomaly.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-bf548/include/mach/anomaly.h</a></div><div class='hunk'>@@ -2,18 +2,18 @@</div><div class='ctx'>  * File: include/asm-blackfin/mach-bf548/anomaly.h</div><div class='ctx'>  * Bugs: Enter bugs at http://blackfin.uclinux.org/</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2004-2007 Analog Devices Inc.</div><div class='add'>+ * Copyright (C) 2004-2008 Analog Devices Inc.</div><div class='ctx'>  * Licensed under the GPL-2 or later.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* This file shoule be up to date with:</div><div class='del'>- *  - Revision E, 11/28/2007; ADSP-BF542/BF544/BF547/BF548/BF549 Blackfin Processor Anomaly List</div><div class='add'>+ *  - Revision G, 08/07/2008; ADSP-BF542/BF544/BF547/BF548/BF549 Blackfin Processor Anomaly List</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _MACH_ANOMALY_H_</div><div class='ctx'> #define _MACH_ANOMALY_H_</div><div class='ctx'> </div><div class='del'>-/* Multi-Issue Instruction with dsp32shiftimm in slot1 and P-reg Store in slot 2 Not Supported */</div><div class='add'>+/* Multi-Issue Instruction with dsp32shiftimm in slot1 and P-reg Store in slot2 Not Supported */</div><div class='ctx'> #define ANOMALY_05000074 (1)</div><div class='ctx'> /* DMA_RUN Bit Is Not Valid after a Peripheral Receive Channel DMA Stops */</div><div class='ctx'> #define ANOMALY_05000119 (1)</div><div class='hunk'>@@ -36,14 +36,14 @@</div><div class='ctx'> /* TWI Slave Boot Mode Is Not Functional */</div><div class='ctx'> #define ANOMALY_05000324 (__SILICON_REVISION__ &lt; 1)</div><div class='ctx'> /* External FIFO Boot Mode Is Not Functional */</div><div class='del'>-#define ANOMALY_05000325 (__SILICON_REVISION__ &lt; 1)</div><div class='add'>+#define ANOMALY_05000325 (__SILICON_REVISION__ &lt; 2)</div><div class='ctx'> /* Data Lost When Core and DMA Accesses Are Made to the USB FIFO Simultaneously */</div><div class='ctx'> #define ANOMALY_05000327 (__SILICON_REVISION__ &lt; 1)</div><div class='ctx'> /* Incorrect Access of OTP_STATUS During otp_write() Function */</div><div class='ctx'> #define ANOMALY_05000328 (__SILICON_REVISION__ &lt; 1)</div><div class='ctx'> /* Synchronous Burst Flash Boot Mode Is Not Functional */</div><div class='ctx'> #define ANOMALY_05000329 (__SILICON_REVISION__ &lt; 1)</div><div class='del'>-/* Host DMA Boot Mode Is Not Functional */</div><div class='add'>+/* Host DMA Boot Modes Are Not Functional */</div><div class='ctx'> #define ANOMALY_05000330 (__SILICON_REVISION__ &lt; 1)</div><div class='ctx'> /* Inadequate Timing Margins on DDR DQS to DQ and DQM Skew */</div><div class='ctx'> #define ANOMALY_05000334 (__SILICON_REVISION__ &lt; 1)</div><div class='hunk'>@@ -61,26 +61,102 @@</div><div class='ctx'> #define ANOMALY_05000344 (__SILICON_REVISION__ &lt; 1)</div><div class='ctx'> /* USB Calibration Value Is Not Intialized */</div><div class='ctx'> #define ANOMALY_05000346 (__SILICON_REVISION__ &lt; 1)</div><div class='del'>-/* Boot ROM Kernel Incorrectly Alters Reset Value of USB Register */</div><div class='add'>+/* USB Calibration Value to use */</div><div class='add'>+#define ANOMALY_05000346_value 0x5411</div><div class='add'>+/* Preboot Routine Incorrectly Alters Reset Value of USB Register */</div><div class='ctx'> #define ANOMALY_05000347 (__SILICON_REVISION__ &lt; 1)</div><div class='ctx'> /* Data Lost when Core Reads SDH Data FIFO */</div><div class='ctx'> #define ANOMALY_05000349 (__SILICON_REVISION__ &lt; 1)</div><div class='ctx'> /* PLL Status Register Is Inaccurate */</div><div class='ctx'> #define ANOMALY_05000351 (__SILICON_REVISION__ &lt; 1)</div><div class='add'>+/* bfrom_SysControl() Firmware Function Performs Improper System Reset */</div><div class='add'>+#define ANOMALY_05000353 (__SILICON_REVISION__ &lt; 2)</div><div class='add'>+/* Regulator Programming Blocked when Hibernate Wakeup Source Remains Active */</div><div class='add'>+#define ANOMALY_05000355 (__SILICON_REVISION__ &lt; 1)</div><div class='add'>+/* System Stalled During A Core Access To AMC While A Core Access To NFC FIFO Is Required */</div><div class='add'>+#define ANOMALY_05000356 (__SILICON_REVISION__ &lt; 1)</div><div class='ctx'> /* Serial Port (SPORT) Multichannel Transmit Failure when Channel 0 Is Disabled */</div><div class='ctx'> #define ANOMALY_05000357 (1)</div><div class='ctx'> /* External Memory Read Access Hangs Core With PLL Bypass */</div><div class='ctx'> #define ANOMALY_05000360 (1)</div><div class='ctx'> /* DMAs that Go Urgent during Tight Core Writes to External Memory Are Blocked */</div><div class='ctx'> #define ANOMALY_05000365 (1)</div><div class='add'>+/* WURESET Bit In SYSCR Register Does Not Properly Indicate Hibernate Wake-Up */</div><div class='add'>+#define ANOMALY_05000367 (__SILICON_REVISION__ &lt; 1)</div><div class='ctx'> /* Addressing Conflict between Boot ROM and Asynchronous Memory */</div><div class='ctx'> #define ANOMALY_05000369 (1)</div><div class='add'>+/* Default PLL MSEL and SSEL Settings Can Cause 400MHz Product To Violate Specifications */</div><div class='add'>+#define ANOMALY_05000370 (__SILICON_REVISION__ &lt; 1)</div><div class='ctx'> /* Possible RETS Register Corruption when Subroutine Is under 5 Cycles in Duration */</div><div class='del'>-#define ANOMALY_05000371 (1)</div><div class='add'>+#define ANOMALY_05000371 (__SILICON_REVISION__ &lt; 2)</div><div class='add'>+/* USB DP/DM Data Pins May Lose State When Entering Hibernate */</div><div class='add'>+#define ANOMALY_05000372 (__SILICON_REVISION__ &lt; 1)</div><div class='ctx'> /* Mobile DDR Operation Not Functional */</div><div class='ctx'> #define ANOMALY_05000377 (1)</div><div class='ctx'> /* Security/Authentication Speedpath Causes Authentication To Fail To Initiate */</div><div class='del'>-#define ANOMALY_05000378 (1)</div><div class='add'>+#define ANOMALY_05000378 (__SILICON_REVISION__ &lt; 2)</div><div class='add'>+/* 16-Bit NAND FLASH Boot Mode Is Not Functional */</div><div class='add'>+#define ANOMALY_05000379 (1)</div><div class='add'>+/* 8-Bit NAND Flash Boot Mode Not Functional */</div><div class='add'>+#define ANOMALY_05000382 (__SILICON_REVISION__ &lt; 1)</div><div class='add'>+/* Some ATAPI Modes Are Not Functional */</div><div class='add'>+#define ANOMALY_05000383 (1)</div><div class='add'>+/* Boot from OTP Memory Not Functional */</div><div class='add'>+#define ANOMALY_05000385 (__SILICON_REVISION__ &lt; 1)</div><div class='add'>+/* bfrom_SysControl() Firmware Routine Not Functional */</div><div class='add'>+#define ANOMALY_05000386 (__SILICON_REVISION__ &lt; 1)</div><div class='add'>+/* Programmable Preboot Settings Not Functional */</div><div class='add'>+#define ANOMALY_05000387 (__SILICON_REVISION__ &lt; 1)</div><div class='add'>+/* CRC32 Checksum Support Not Functional */</div><div class='add'>+#define ANOMALY_05000388 (__SILICON_REVISION__ &lt; 1)</div><div class='add'>+/* Reset Vector Must Not Be in SDRAM Memory Space */</div><div class='add'>+#define ANOMALY_05000389 (__SILICON_REVISION__ &lt; 1)</div><div class='add'>+/* Changed Meaning of BCODE Field in SYSCR Register */</div><div class='add'>+#define ANOMALY_05000390 (__SILICON_REVISION__ &lt; 1)</div><div class='add'>+/* Repeated Boot from Page-Mode or Burst-Mode Flash Memory May Fail */</div><div class='add'>+#define ANOMALY_05000391 (__SILICON_REVISION__ &lt; 1)</div><div class='add'>+/* pTempCurrent Not Present in ADI_BOOT_DATA Structure */</div><div class='add'>+#define ANOMALY_05000392 (__SILICON_REVISION__ &lt; 1)</div><div class='add'>+/* Deprecated Value of dTempByteCount in ADI_BOOT_DATA Structure */</div><div class='add'>+#define ANOMALY_05000393 (__SILICON_REVISION__ &lt; 1)</div><div class='add'>+/* Log Buffer Not Functional */</div><div class='add'>+#define ANOMALY_05000394 (__SILICON_REVISION__ &lt; 1)</div><div class='add'>+/* Hook Routine Not Functional */</div><div class='add'>+#define ANOMALY_05000395 (__SILICON_REVISION__ &lt; 1)</div><div class='add'>+/* Header Indirect Bit Not Functional */</div><div class='add'>+#define ANOMALY_05000396 (__SILICON_REVISION__ &lt; 1)</div><div class='add'>+/* BK_ONES, BK_ZEROS, and BK_DATECODE Constants Not Functional */</div><div class='add'>+#define ANOMALY_05000397 (__SILICON_REVISION__ &lt; 1)</div><div class='add'>+/* Lockbox SESR Disallows Certain User Interrupts */</div><div class='add'>+#define ANOMALY_05000404 (__SILICON_REVISION__ &lt; 2)</div><div class='add'>+/* Lockbox SESR Firmware Does Not Save/Restore Full Context */</div><div class='add'>+#define ANOMALY_05000405 (1)</div><div class='add'>+/* Lockbox SESR Argument Checking Does Not Check L2 Memory Protection Range */</div><div class='add'>+#define ANOMALY_05000406 (__SILICON_REVISION__ &lt; 2)</div><div class='add'>+/* Lockbox SESR Firmware Arguments Are Not Retained After First Initialization */</div><div class='add'>+#define ANOMALY_05000407 (__SILICON_REVISION__ &lt; 2)</div><div class='add'>+/* Lockbox Firmware Memory Cleanup Routine Does not Clear Registers */</div><div class='add'>+#define ANOMALY_05000408 (1)</div><div class='add'>+/* Lockbox firmware leaves MDMA0 channel enabled */</div><div class='add'>+#define ANOMALY_05000409 (__SILICON_REVISION__ &lt; 2)</div><div class='add'>+/* bfrom_SysControl() Firmware Function Cannot be Used to Enter Power Saving Modes */</div><div class='add'>+#define ANOMALY_05000411 (__SILICON_REVISION__ &lt; 2)</div><div class='add'>+/* NAND Boot Mode Not Compatible With Some NAND Flash Devices */</div><div class='add'>+#define ANOMALY_05000413 (__SILICON_REVISION__ &lt; 2)</div><div class='add'>+/* OTP_CHECK_FOR_PREV_WRITE Bit is Not Functional in bfrom_OtpWrite() API */</div><div class='add'>+#define ANOMALY_05000414 (__SILICON_REVISION__ &lt; 2)</div><div class='add'>+/* Speculative Fetches Can Cause Undesired External FIFO Operations */</div><div class='add'>+#define ANOMALY_05000416 (1)</div><div class='add'>+/* Multichannel SPORT Channel Misalignment Under Specific Configuration */</div><div class='add'>+#define ANOMALY_05000425 (1)</div><div class='add'>+/* Speculative Fetches of Indirect-Pointer Instructions Can Cause Spurious Hardware Errors */</div><div class='add'>+#define ANOMALY_05000426 (1)</div><div class='add'>+/* CORE_EPPI_PRIO bit and SYS_EPPI_PRIO bit in the HMDMA1_CONTROL register are not functional */</div><div class='add'>+#define ANOMALY_05000427 (__SILICON_REVISION__ &lt; 2)</div><div class='add'>+/* WB_EDGE Bit in NFC_IRQSTAT Incorrectly Behaves as a Buffer Status Bit Instead of an IRQ Status Bit */</div><div class='add'>+#define ANOMALY_05000429 (__SILICON_REVISION__ &lt; 2)</div><div class='add'>+/* Software System Reset Corrupts PLL_LOCKCNT Register */</div><div class='add'>+#define ANOMALY_05000430 (__SILICON_REVISION__ &gt;= 2)</div><div class='ctx'> </div><div class='ctx'> /* Anomalies that don't exist on this proc */</div><div class='ctx'> #define ANOMALY_05000125 (0)</div><div class='hunk'>@@ -93,6 +169,7 @@</div><div class='ctx'> #define ANOMALY_05000263 (0)</div><div class='ctx'> #define ANOMALY_05000266 (0)</div><div class='ctx'> #define ANOMALY_05000273 (0)</div><div class='add'>+#define ANOMALY_05000307 (0)</div><div class='ctx'> #define ANOMALY_05000311 (0)</div><div class='ctx'> #define ANOMALY_05000323 (0)</div><div class='ctx'> #define ANOMALY_05000363 (0)</div><div class='head'>diff --git a/arch/blackfin/mach-bf548/include/mach/bf548.h b/arch/blackfin/mach-bf548/include/mach/bf548.h<br/>index e748588e8930..49f9b403d458 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mach-bf548/include/mach/bf548.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/mach-bf548/include/mach/bf548.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mach-bf548/include/mach/bf548.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-bf548/include/mach/bf548.h</a></div><div class='hunk'>@@ -30,8 +30,6 @@</div><div class='ctx'> #ifndef __MACH_BF548_H__</div><div class='ctx'> #define __MACH_BF548_H__</div><div class='ctx'> </div><div class='del'>-#define SUPPORTED_REVID 0</div><div class='del'>-</div><div class='ctx'> #define OFFSET_(x) ((x) &amp; 0x0000FFFF)</div><div class='ctx'> </div><div class='ctx'> /*some misc defines*/</div><div class='hunk'>@@ -108,20 +106,23 @@</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_BF542)</div><div class='ctx'> # define CPU   "BF542"</div><div class='del'>-# define CPUID 0x027c8000</div><div class='add'>+# define CPUID 0x27de</div><div class='ctx'> #elif defined(CONFIG_BF544)</div><div class='del'>-# define CPU "BF544"</div><div class='del'>-# define CPUID 0x027c8000</div><div class='add'>+# define CPU   "BF544"</div><div class='add'>+# define CPUID 0x27de</div><div class='ctx'> #elif defined(CONFIG_BF547)</div><div class='del'>-# define CPU "BF547"</div><div class='add'>+# define CPU   "BF547"</div><div class='add'>+# define CPUID 0x27de</div><div class='ctx'> #elif defined(CONFIG_BF548)</div><div class='del'>-# define CPU "BF548"</div><div class='del'>-# define CPUID 0x027c6000</div><div class='add'>+# define CPU   "BF548"</div><div class='add'>+# define CPUID 0x27de</div><div class='ctx'> #elif defined(CONFIG_BF549)</div><div class='del'>-# define CPU "BF549"</div><div class='del'>-#else</div><div class='del'>-# define CPU "UNKNOWN"</div><div class='del'>-# define CPUID 0x0</div><div class='add'>+# define CPU   "BF549"</div><div class='add'>+# define CPUID 0x27de</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef CPU</div><div class='add'>+#error Unknown CPU type - This kernel doesn't seem to be configured properly</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #endif	/* __MACH_BF48_H__  */</div><div class='head'>diff --git a/arch/blackfin/mach-bf548/include/mach/bfin_serial_5xx.h b/arch/blackfin/mach-bf548/include/mach/bfin_serial_5xx.h<br/>index 5e29446a8e03..e4cf35e7ab9f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mach-bf548/include/mach/bfin_serial_5xx.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/mach-bf548/include/mach/bfin_serial_5xx.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mach-bf548/include/mach/bfin_serial_5xx.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-bf548/include/mach/bfin_serial_5xx.h</a></div><div class='hunk'>@@ -82,6 +82,9 @@</div><div class='ctx'> #  define CONFIG_UART1_RTS_PIN -1</div><div class='ctx'> # endif</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='add'>+#define BFIN_UART_TX_FIFO_SIZE	2</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * The pin configuration is different from schematic</div><div class='ctx'>  */</div><div class='hunk'>@@ -105,7 +108,6 @@ struct bfin_serial_port {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct bfin_serial_port bfin_serial_ports[BFIN_UART_NR_PORTS];</div><div class='ctx'> struct bfin_serial_res {</div><div class='ctx'> 	unsigned long	uart_base_addr;</div><div class='ctx'> 	int		uart_irq;</div><div class='hunk'>@@ -170,8 +172,6 @@ struct bfin_serial_res bfin_serial_resource[] = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int nr_ports = ARRAY_SIZE(bfin_serial_resource);</div><div class='del'>-</div><div class='ctx'> #define DRIVER_NAME "bfin-uart"</div><div class='ctx'> </div><div class='ctx'> static void bfin_serial_hw_init(struct bfin_serial_port *uart)</div><div class='head'>diff --git a/arch/blackfin/mach-bf548/include/mach/mem_map.h b/arch/blackfin/mach-bf548/include/mach/mem_map.h<br/>index f99f47bc3a07..a2228428dc06 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mach-bf548/include/mach/mem_map.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/mach-bf548/include/mach/mem_map.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mach-bf548/include/mach/mem_map.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-bf548/include/mach/mem_map.h</a></div><div class='hunk'>@@ -94,13 +94,13 @@</div><div class='ctx'> #endif /*CONFIG_BFIN_DCACHE*/</div><div class='ctx'> </div><div class='ctx'> /* Level 2 Memory */</div><div class='del'>-#if !defined(CONFIG_BF542)</div><div class='del'>-# define L2_START          0xFEB00000</div><div class='del'>-# if defined(CONFIG_BF544)</div><div class='del'>-#  define L2_LENGTH        0x10000</div><div class='del'>-# else</div><div class='del'>-#  define L2_LENGTH        0x20000</div><div class='del'>-# endif</div><div class='add'>+#define L2_START            0xFEB00000</div><div class='add'>+#if defined(CONFIG_BF542)</div><div class='add'>+# define L2_LENGTH          0</div><div class='add'>+#elif defined(CONFIG_BF544)</div><div class='add'>+# define L2_LENGTH          0x10000</div><div class='add'>+#else</div><div class='add'>+# define L2_LENGTH          0x20000</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* Scratch Pad Memory */</div><div class='head'>diff --git a/arch/blackfin/mach-bf561/head.S b/arch/blackfin/mach-bf561/head.S<br/>index 75ea6a905829..31a777a9e699 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mach-bf561/head.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/mach-bf561/head.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mach-bf561/head.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-bf561/head.S</a></div><div class='hunk'>@@ -77,6 +77,9 @@ ENTRY(_start_dma_code)</div><div class='ctx'> 	r1 = PLL_BYPASS;                 /* Bypass the PLL?                 */</div><div class='ctx'> 	r1 = r1 &lt;&lt; 8;                    /* Shift it over                   */</div><div class='ctx'> 	r0 = r1 | r0;                    /* add them all together           */</div><div class='add'>+#ifdef ANOMALY_05000265</div><div class='add'>+	BITSET(r0, 15);                  /* Add 250 mV of hysteresis to SPORT input pins */</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	p0.h = hi(PLL_CTL);</div><div class='ctx'> 	p0.l = lo(PLL_CTL);              /* Load the address                */</div><div class='head'>diff --git a/arch/blackfin/mach-bf561/include/mach/anomaly.h b/arch/blackfin/mach-bf561/include/mach/anomaly.h<br/>index 5c5d7d7d695f..22990df04ae1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mach-bf561/include/mach/anomaly.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/mach-bf561/include/mach/anomaly.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mach-bf561/include/mach/anomaly.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-bf561/include/mach/anomaly.h</a></div><div class='hunk'>@@ -270,5 +270,7 @@</div><div class='ctx'> #define ANOMALY_05000183 (0)</div><div class='ctx'> #define ANOMALY_05000273 (0)</div><div class='ctx'> #define ANOMALY_05000311 (0)</div><div class='add'>+#define ANOMALY_05000353 (1)</div><div class='add'>+#define ANOMALY_05000386 (1)</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/blackfin/mach-bf561/include/mach/bf561.h b/arch/blackfin/mach-bf561/include/mach/bf561.h<br/>index 3ef9e5f36136..18b1b3a223ab 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mach-bf561/include/mach/bf561.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/mach-bf561/include/mach/bf561.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mach-bf561/include/mach/bf561.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-bf561/include/mach/bf561.h</a></div><div class='hunk'>@@ -30,8 +30,6 @@</div><div class='ctx'> #ifndef __MACH_BF561_H__</div><div class='ctx'> #define __MACH_BF561_H__</div><div class='ctx'> </div><div class='del'>-#define SUPPORTED_REVID		0x3</div><div class='del'>-</div><div class='ctx'> #define OFFSET_(x) ((x) &amp; 0x0000FFFF)</div><div class='ctx'> </div><div class='ctx'> /*some misc defines*/</div><div class='hunk'>@@ -213,11 +211,11 @@</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_BF561</div><div class='ctx'> #define CPU "BF561"</div><div class='del'>-#define CPUID 0x027bb000</div><div class='add'>+#define CPUID 0x27bb</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> #ifndef CPU</div><div class='del'>-#define CPU "UNKNOWN"</div><div class='del'>-#define CPUID 0x0</div><div class='add'>+#error Unknown CPU type - This kernel doesn't seem to be configured properly</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #endif				/* __MACH_BF561_H__  */</div><div class='head'>diff --git a/arch/blackfin/mach-bf561/include/mach/bfin_serial_5xx.h b/arch/blackfin/mach-bf561/include/mach/bfin_serial_5xx.h<br/>index 8aa02780e642..043bfcf26c52 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mach-bf561/include/mach/bfin_serial_5xx.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/mach-bf561/include/mach/bfin_serial_5xx.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mach-bf561/include/mach/bfin_serial_5xx.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-bf561/include/mach/bfin_serial_5xx.h</a></div><div class='hunk'>@@ -69,6 +69,8 @@</div><div class='ctx'> # endif</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#define BFIN_UART_TX_FIFO_SIZE	2</div><div class='add'>+</div><div class='ctx'> struct bfin_serial_port {</div><div class='ctx'>         struct uart_port        port;</div><div class='ctx'>         unsigned int            old_status;</div><div class='hunk'>@@ -83,7 +85,7 @@ struct bfin_serial_port {</div><div class='ctx'> 	unsigned int		rx_dma_channel;</div><div class='ctx'> 	struct work_struct	tx_dma_workqueue;</div><div class='ctx'> #else</div><div class='del'>-# if ANOMALY_05000230</div><div class='add'>+# if ANOMALY_05000363</div><div class='ctx'> 	unsigned int anomaly_threshold;</div><div class='ctx'> # endif</div><div class='ctx'> #endif</div><div class='hunk'>@@ -111,7 +113,6 @@ static inline void UART_CLEAR_LSR(struct bfin_serial_port *uart)</div><div class='ctx'> 	bfin_write16(uart-&gt;port.membase + OFFSET_LSR, -1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct bfin_serial_port bfin_serial_ports[BFIN_UART_NR_PORTS];</div><div class='ctx'> struct bfin_serial_res {</div><div class='ctx'> 	unsigned long	uart_base_addr;</div><div class='ctx'> 	int		uart_irq;</div><div class='hunk'>@@ -142,7 +143,6 @@ struct bfin_serial_res bfin_serial_resource[] = {</div><div class='ctx'> </div><div class='ctx'> #define DRIVER_NAME "bfin-uart"</div><div class='ctx'> </div><div class='del'>-int nr_ports = BFIN_UART_NR_PORTS;</div><div class='ctx'> static void bfin_serial_hw_init(struct bfin_serial_port *uart)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='hunk'>@@ -158,7 +158,7 @@ static void bfin_serial_hw_init(struct bfin_serial_port *uart)</div><div class='ctx'> 	}</div><div class='ctx'> 	if (uart-&gt;rts_pin &gt;= 0) {</div><div class='ctx'> 		gpio_request(uart-&gt;rts_pin, DRIVER_NAME);</div><div class='del'>-		gpio_direction_input(uart-&gt;rts_pin, 0);</div><div class='add'>+		gpio_direction_output(uart-&gt;rts_pin, 0);</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/blackfin/mach-bf561/include/mach/mem_map.h b/arch/blackfin/mach-bf561/include/mach/mem_map.h<br/>index c26d8486cc4b..f1d4c0637bd2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mach-bf561/include/mach/mem_map.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/mach-bf561/include/mach/mem_map.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mach-bf561/include/mach/mem_map.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-bf561/include/mach/mem_map.h</a></div><div class='hunk'>@@ -35,9 +35,16 @@</div><div class='ctx'> /* Memory Map for ADSP-BF561 processors */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_BF561</div><div class='del'>-#define L1_CODE_START     0xFFA00000</div><div class='del'>-#define L1_DATA_A_START     0xFF800000</div><div class='del'>-#define L1_DATA_B_START     0xFF900000</div><div class='add'>+#define COREA_L1_CODE_START       0xFFA00000</div><div class='add'>+#define COREA_L1_DATA_A_START     0xFF800000</div><div class='add'>+#define COREA_L1_DATA_B_START     0xFF900000</div><div class='add'>+#define COREB_L1_CODE_START       0xFF600000</div><div class='add'>+#define COREB_L1_DATA_A_START     0xFF400000</div><div class='add'>+#define COREB_L1_DATA_B_START     0xFF500000</div><div class='add'>+</div><div class='add'>+#define L1_CODE_START       COREA_L1_CODE_START</div><div class='add'>+#define L1_DATA_A_START     COREA_L1_DATA_A_START</div><div class='add'>+#define L1_DATA_B_START     COREA_L1_DATA_B_START</div><div class='ctx'> </div><div class='ctx'> #define L1_CODE_LENGTH      0x4000</div><div class='ctx'> </div><div class='hunk'>@@ -72,7 +79,10 @@</div><div class='ctx'> </div><div class='ctx'> /* Scratch Pad Memory */</div><div class='ctx'> </div><div class='del'>-#define L1_SCRATCH_START	0xFFB00000</div><div class='add'>+#define COREA_L1_SCRATCH_START	0xFFB00000</div><div class='add'>+#define COREB_L1_SCRATCH_START	0xFF700000</div><div class='add'>+</div><div class='add'>+#define L1_SCRATCH_START	COREA_L1_SCRATCH_START</div><div class='ctx'> #define L1_SCRATCH_LENGTH	0x1000</div><div class='ctx'> </div><div class='ctx'> #endif				/* _MEM_MAP_533_H_ */</div><div class='head'>diff --git a/arch/blackfin/mach-common/cache.S b/arch/blackfin/mach-common/cache.S<br/>index 85f8c79b3c37..db532181fbde 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mach-common/cache.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/mach-common/cache.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mach-common/cache.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-common/cache.S</a></div><div class='hunk'>@@ -1,148 +1,91 @@</div><div class='ctx'> /*</div><div class='del'>- * File:         arch/blackfin/mach-common/cache.S</div><div class='del'>- * Based on:</div><div class='del'>- * Author:       LG Soft India</div><div class='add'>+ * Blackfin cache control code</div><div class='ctx'>  *</div><div class='del'>- * Created:</div><div class='del'>- * Description:  cache control support</div><div class='add'>+ * Copyright 2004-2008 Analog Devices Inc.</div><div class='ctx'>  *</div><div class='del'>- * Modified:</div><div class='del'>- *               Copyright 2004-2006 Analog Devices Inc.</div><div class='add'>+ * Enter bugs at http://blackfin.uclinux.org/</div><div class='ctx'>  *</div><div class='del'>- * Bugs:         Enter bugs at http://blackfin.uclinux.org/</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see the file COPYING, or write</div><div class='del'>- * to the Free Software Foundation, Inc.,</div><div class='del'>- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA</div><div class='add'>+ * Licensed under the GPL-2 or later.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='del'>-#include &lt;asm/cplb.h&gt;</div><div class='del'>-#include &lt;asm/entry.h&gt;</div><div class='ctx'> #include &lt;asm/blackfin.h&gt;</div><div class='ctx'> #include &lt;asm/cache.h&gt;</div><div class='add'>+#include &lt;asm/page.h&gt;</div><div class='ctx'> </div><div class='ctx'> .text</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * blackfin_cache_flush_range(start, end)</div><div class='del'>- * Invalidate all cache lines assocoiated with this</div><div class='del'>- * area of memory.</div><div class='add'>+/* Since all L1 caches work the same way, we use the same method for flushing</div><div class='add'>+ * them.  Only the actual flush instruction differs.  We write this in asm as</div><div class='add'>+ * GCC can be hard to coax into writing nice hardware loops.</div><div class='ctx'>  *</div><div class='del'>- * start:	Start address</div><div class='del'>- * end:		End address</div><div class='add'>+ * Also, we assume the following register setup:</div><div class='add'>+ * R0 = start address</div><div class='add'>+ * R1 = end address</div><div class='ctx'>  */</div><div class='del'>-ENTRY(_blackfin_icache_flush_range)</div><div class='add'>+.macro do_flush flushins:req optflushins optnopins label</div><div class='add'>+</div><div class='add'>+	/* end = ((end - 1) &amp; -L1_CACHE_BYTES) + L1_CACHE_BYTES; */</div><div class='add'>+	R1 += -1;</div><div class='ctx'> 	R2 = -L1_CACHE_BYTES;</div><div class='del'>-	R2 = R0 &amp; R2;</div><div class='del'>-	P0 = R2;</div><div class='del'>-	P1 = R1;</div><div class='del'>-	CSYNC(R3);</div><div class='del'>-	IFLUSH [P0];</div><div class='add'>+	R1 = R1 &amp; R2;</div><div class='add'>+	R1 += L1_CACHE_BYTES;</div><div class='add'>+</div><div class='add'>+	/* count = (end - start) &gt;&gt; L1_CACHE_SHIFT */</div><div class='add'>+	R2 = R1 - R0;</div><div class='add'>+	R2 &gt;&gt;= L1_CACHE_SHIFT;</div><div class='add'>+	P1 = R2;</div><div class='add'>+</div><div class='add'>+.ifnb \label</div><div class='add'>+\label :</div><div class='add'>+.endif</div><div class='add'>+	P0 = R0;</div><div class='add'>+	LSETUP (1f, 2f) LC1 = P1;</div><div class='ctx'> 1:</div><div class='del'>-	IFLUSH [P0++];</div><div class='del'>-	CC = P0 &lt; P1 (iu);</div><div class='del'>-	IF CC JUMP 1b (bp);</div><div class='del'>-	IFLUSH [P0];</div><div class='del'>-	SSYNC(R3);</div><div class='add'>+.ifnb \optflushins</div><div class='add'>+	\optflushins [P0];</div><div class='add'>+.endif</div><div class='add'>+.ifb \optnopins</div><div class='add'>+2:</div><div class='add'>+.endif</div><div class='add'>+	\flushins [P0++];</div><div class='add'>+.ifnb \optnopins</div><div class='add'>+2: \optnopins;</div><div class='add'>+.endif</div><div class='add'>+</div><div class='ctx'> 	RTS;</div><div class='del'>-ENDPROC(_blackfin_icache_flush_range)</div><div class='add'>+.endm</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * blackfin_icache_dcache_flush_range(start, end)</div><div class='del'>- * FLUSH all cache lines assocoiated with this</div><div class='del'>- * area of memory.</div><div class='del'>- *</div><div class='del'>- * start:	Start address</div><div class='del'>- * end:		End address</div><div class='del'>- */</div><div class='add'>+/* Invalidate all instruction cache lines assocoiated with this memory area */</div><div class='add'>+ENTRY(_blackfin_icache_flush_range)</div><div class='add'>+	do_flush IFLUSH, , nop</div><div class='add'>+ENDPROC(_blackfin_icache_flush_range)</div><div class='ctx'> </div><div class='add'>+/* Flush all cache lines assocoiated with this area of memory. */</div><div class='ctx'> ENTRY(_blackfin_icache_dcache_flush_range)</div><div class='del'>-	R2 = -L1_CACHE_BYTES;</div><div class='del'>-	R2 = R0 &amp; R2;</div><div class='del'>-	P0 = R2;</div><div class='del'>-	P1 = R1;</div><div class='del'>-	CSYNC(R3);</div><div class='del'>-	IFLUSH [P0];</div><div class='del'>-1:</div><div class='del'>-	FLUSH [P0];</div><div class='del'>-	IFLUSH [P0++];</div><div class='del'>-	CC = P0 &lt; P1 (iu);</div><div class='del'>-	IF CC JUMP 1b (bp);</div><div class='del'>-	IFLUSH [P0];</div><div class='del'>-	FLUSH [P0];</div><div class='del'>-	SSYNC(R3);</div><div class='del'>-	RTS;</div><div class='add'>+	do_flush IFLUSH, FLUSH</div><div class='ctx'> ENDPROC(_blackfin_icache_dcache_flush_range)</div><div class='ctx'> </div><div class='ctx'> /* Throw away all D-cached data in specified region without any obligation to</div><div class='del'>- * write them back. However, we must clean the D-cached entries around the</div><div class='del'>- * boundaries of the start and/or end address is not cache aligned.</div><div class='del'>- *</div><div class='del'>- * Start: start address,</div><div class='del'>- * end  : end address.</div><div class='add'>+ * write them back.  Since the Blackfin ISA does not have an "invalidate"</div><div class='add'>+ * instruction, we use flush/invalidate.  Perhaps as a speed optimization we</div><div class='add'>+ * could bang on the DTEST MMRs ...</div><div class='ctx'>  */</div><div class='del'>-</div><div class='ctx'> ENTRY(_blackfin_dcache_invalidate_range)</div><div class='del'>-	R2 = -L1_CACHE_BYTES;</div><div class='del'>-	R2 = R0 &amp; R2;</div><div class='del'>-	P0 = R2;</div><div class='del'>-	P1 = R1;</div><div class='del'>-	CSYNC(R3);</div><div class='del'>-	FLUSHINV[P0];</div><div class='del'>-1:</div><div class='del'>-	FLUSHINV[P0++];</div><div class='del'>-	CC = P0 &lt; P1 (iu);</div><div class='del'>-	IF CC JUMP 1b (bp);</div><div class='del'>-</div><div class='del'>-	/* If the data crosses a cache line, then we'll be pointing to</div><div class='del'>-	 * the last cache line, but won't have flushed/invalidated it yet,</div><div class='del'>-	 * so do one more.</div><div class='del'>-	 */</div><div class='del'>-	FLUSHINV[P0];</div><div class='del'>-	SSYNC(R3);</div><div class='del'>-	RTS;</div><div class='add'>+	do_flush FLUSHINV</div><div class='ctx'> ENDPROC(_blackfin_dcache_invalidate_range)</div><div class='ctx'> </div><div class='add'>+/* Flush all data cache lines assocoiated with this memory area */</div><div class='ctx'> ENTRY(_blackfin_dcache_flush_range)</div><div class='del'>-	R2 = -L1_CACHE_BYTES;</div><div class='del'>-	R2 = R0 &amp; R2;</div><div class='del'>-	P0 = R2;</div><div class='del'>-	P1 = R1;</div><div class='del'>-	CSYNC(R3);</div><div class='del'>-	FLUSH[P0];</div><div class='del'>-1:</div><div class='del'>-	FLUSH[P0++];</div><div class='del'>-	CC = P0 &lt; P1 (iu);</div><div class='del'>-	IF CC JUMP 1b (bp);</div><div class='del'>-</div><div class='del'>-	/* If the data crosses a cache line, then we'll be pointing to</div><div class='del'>-	 * the last cache line, but won't have flushed it yet, so do</div><div class='del'>-	 * one more.</div><div class='del'>-	 */</div><div class='del'>-	FLUSH[P0];</div><div class='del'>-	SSYNC(R3);</div><div class='del'>-	RTS;</div><div class='add'>+	do_flush FLUSH, , , .Ldfr</div><div class='ctx'> ENDPROC(_blackfin_dcache_flush_range)</div><div class='ctx'> </div><div class='add'>+/* Our headers convert the page structure to an address, so just need to flush</div><div class='add'>+ * its contents like normal.  We know the start address is page aligned (which</div><div class='add'>+ * greater than our cache alignment), as is the end address.  So just jump into</div><div class='add'>+ * the middle of the dcache flush function.</div><div class='add'>+ */</div><div class='ctx'> ENTRY(_blackfin_dflush_page)</div><div class='ctx'> 	P1 = 1 &lt;&lt; (PAGE_SHIFT - L1_CACHE_SHIFT);</div><div class='del'>-	P0 = R0;</div><div class='del'>-	CSYNC(R3);</div><div class='del'>-	FLUSH[P0];</div><div class='del'>-	LSETUP (.Lfl1, .Lfl1) LC0 = P1;</div><div class='del'>-.Lfl1:	FLUSH [P0++];</div><div class='del'>-	SSYNC(R3);</div><div class='del'>-	RTS;</div><div class='add'>+	jump .Ldfr;</div><div class='ctx'> ENDPROC(_blackfin_dflush_page)</div><div class='head'>diff --git a/arch/blackfin/mach-common/cpufreq.c b/arch/blackfin/mach-common/cpufreq.c<br/>index 75cdad291e88..c22c47b60127 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mach-common/cpufreq.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/mach-common/cpufreq.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mach-common/cpufreq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-common/cpufreq.c</a></div><div class='hunk'>@@ -158,8 +158,6 @@ static int __init __bfin_cpu_init(struct cpufreq_policy *policy)</div><div class='ctx'> 						 dpm_state_table[index].tscale);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	policy-&gt;governor = CPUFREQ_DEFAULT_GOVERNOR;</div><div class='del'>-</div><div class='ctx'> 	policy-&gt;cpuinfo.transition_latency = (bfin_read_PLL_LOCKCNT() / (sclk / 1000000)) * 1000;</div><div class='ctx'> 	/*Now ,only support one cpu */</div><div class='ctx'> 	policy-&gt;cur = cclk;</div><div class='head'>diff --git a/arch/blackfin/mach-common/entry.S b/arch/blackfin/mach-common/entry.S<br/>index 847c172a99eb..c13fa8da28c7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mach-common/entry.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/mach-common/entry.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mach-common/entry.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-common/entry.S</a></div><div class='hunk'>@@ -129,6 +129,18 @@ ENTRY(_ex_icplb_miss)</div><div class='ctx'> #else</div><div class='ctx'> 	call __cplb_hdr;</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_DEBUG_DOUBLEFAULT</div><div class='add'>+	/* While we were processing this, did we double fault? */</div><div class='add'>+	r7 = SEQSTAT;           /* reason code is in bit 5:0 */</div><div class='add'>+	r6.l = lo(SEQSTAT_EXCAUSE);</div><div class='add'>+	r6.h = hi(SEQSTAT_EXCAUSE);</div><div class='add'>+	r7 = r7 &amp; r6;</div><div class='add'>+	r6 = 0x25;</div><div class='add'>+	CC = R7 == R6;</div><div class='add'>+	if CC JUMP _double_fault;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	DEBUG_HWTRACE_RESTORE(p5, r7)</div><div class='ctx'> 	RESTORE_ALL_SYS</div><div class='ctx'> 	SP = EX_SCRATCH_REG;</div><div class='hunk'>@@ -136,11 +148,8 @@ ENTRY(_ex_icplb_miss)</div><div class='ctx'> ENDPROC(_ex_icplb_miss)</div><div class='ctx'> </div><div class='ctx'> ENTRY(_ex_syscall)</div><div class='del'>-	(R7:6,P5:4) = [sp++];</div><div class='del'>-	ASTAT = [sp++];</div><div class='ctx'> 	raise 15;		/* invoked by TRAP #0, for sys call */</div><div class='del'>-	sp = EX_SCRATCH_REG;</div><div class='del'>-	rtx</div><div class='add'>+	jump.s _bfin_return_from_exception;</div><div class='ctx'> ENDPROC(_ex_syscall)</div><div class='ctx'> </div><div class='ctx'> ENTRY(_ex_soft_bp)</div><div class='hunk'>@@ -181,8 +190,8 @@ ENTRY(_ex_single_step)</div><div class='ctx'> 	if cc jump .Lfind_priority_done;</div><div class='ctx'> 	jump.s .Lfind_priority_start;</div><div class='ctx'> .Lfind_priority_done:</div><div class='del'>-	p4.l = _debugger_step;</div><div class='del'>-	p4.h = _debugger_step;</div><div class='add'>+	p4.l = _kgdb_single_step;</div><div class='add'>+	p4.h = _kgdb_single_step;</div><div class='ctx'> 	r6 = [p4];</div><div class='ctx'> 	cc = r6 == 0;</div><div class='ctx'> 	if cc jump .Ldo_single_step;</div><div class='hunk'>@@ -250,6 +259,29 @@ ENTRY(_bfin_return_from_exception)</div><div class='ctx'> 	R7=LC1;</div><div class='ctx'> 	LC1=R7;</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_DEBUG_DOUBLEFAULT</div><div class='add'>+	/* While we were processing the current exception,</div><div class='add'>+	 * did we cause another, and double fault?</div><div class='add'>+	 */</div><div class='add'>+	r7 = SEQSTAT;           /* reason code is in bit 5:0 */</div><div class='add'>+	r6.l = lo(SEQSTAT_EXCAUSE);</div><div class='add'>+	r6.h = hi(SEQSTAT_EXCAUSE);</div><div class='add'>+	r7 = r7 &amp; r6;</div><div class='add'>+	r6 = 0x25;</div><div class='add'>+	CC = R7 == R6;</div><div class='add'>+	if CC JUMP _double_fault;</div><div class='add'>+</div><div class='add'>+	/* Did we cause a HW error? */</div><div class='add'>+	p5.l = lo(ILAT);</div><div class='add'>+	p5.h = hi(ILAT);</div><div class='add'>+	r6 = [p5];</div><div class='add'>+	r7 = 0x20;		/* Did I just cause anther HW error? */</div><div class='add'>+	r7 = r7 &amp; r1;</div><div class='add'>+	CC = R7 == R6;</div><div class='add'>+	if CC JUMP _double_fault;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	(R7:6,P5:4) = [sp++];</div><div class='ctx'> 	ASTAT = [sp++];</div><div class='ctx'> 	sp = EX_SCRATCH_REG;</div><div class='hunk'>@@ -292,6 +324,14 @@ ENTRY(_ex_trap_c)</div><div class='ctx'> 	[p4] = p5;</div><div class='ctx'> 	csync;</div><div class='ctx'> </div><div class='add'>+#ifndef CONFIG_DEBUG_DOUBLEFAULT</div><div class='add'>+	/*</div><div class='add'>+	 * Save these registers, as they are only valid in exception context</div><div class='add'>+	 *  (where we are now - as soon as we defer to IRQ5, they can change)</div><div class='add'>+	 * DCPLB_STATUS and ICPLB_STATUS are also only valid in EVT3,</div><div class='add'>+	 * but they are not very interesting, so don't save them</div><div class='add'>+	 */</div><div class='add'>+</div><div class='ctx'> 	p4.l = lo(DCPLB_FAULT_ADDR);</div><div class='ctx'> 	p4.h = hi(DCPLB_FAULT_ADDR);</div><div class='ctx'> 	r7 = [p4];</div><div class='hunk'>@@ -304,12 +344,11 @@ ENTRY(_ex_trap_c)</div><div class='ctx'> 	p5.l = _saved_icplb_fault_addr;</div><div class='ctx'> 	[p5] = r7;</div><div class='ctx'> </div><div class='del'>-	p4.l = _excpt_saved_stuff;</div><div class='del'>-	p4.h = _excpt_saved_stuff;</div><div class='del'>-</div><div class='ctx'> 	r6 = retx;</div><div class='add'>+	p4.l = _saved_retx;</div><div class='add'>+	p4.h = _saved_retx;</div><div class='ctx'> 	[p4] = r6;</div><div class='del'>-</div><div class='add'>+#endif</div><div class='ctx'> 	r6 = SYSCFG;</div><div class='ctx'> 	[p4 + 4] = r6;</div><div class='ctx'> 	BITCLR(r6, 0);</div><div class='hunk'>@@ -327,59 +366,56 @@ ENTRY(_ex_trap_c)</div><div class='ctx'> 	r6 = 0x3f;</div><div class='ctx'> 	sti r6;</div><div class='ctx'> </div><div class='del'>-	(R7:6,P5:4) = [sp++];</div><div class='del'>-	ASTAT = [sp++];</div><div class='del'>-	SP = EX_SCRATCH_REG;</div><div class='ctx'> 	raise 5;</div><div class='del'>-	rtx;</div><div class='add'>+	jump.s _bfin_return_from_exception;</div><div class='ctx'> ENDPROC(_ex_trap_c)</div><div class='ctx'> </div><div class='ctx'> /* We just realized we got an exception, while we were processing a different</div><div class='ctx'>  * exception. This is a unrecoverable event, so crash</div><div class='ctx'>  */</div><div class='ctx'> ENTRY(_double_fault)</div><div class='del'>-        /* Turn caches &amp; protection off, to ensure we don't get any more</div><div class='del'>-         * double exceptions</div><div class='del'>-         */</div><div class='del'>-</div><div class='del'>-        P4.L = LO(IMEM_CONTROL);</div><div class='del'>-        P4.H = HI(IMEM_CONTROL);</div><div class='del'>-</div><div class='del'>-        R5 = [P4];              /* Control Register*/</div><div class='del'>-        BITCLR(R5,ENICPLB_P);</div><div class='del'>-        SSYNC;          /* SSYNC required before writing to IMEM_CONTROL. */</div><div class='del'>-        .align 8;</div><div class='del'>-        [P4] = R5;</div><div class='del'>-        SSYNC;</div><div class='del'>-</div><div class='del'>-        P4.L = LO(DMEM_CONTROL);</div><div class='del'>-        P4.H = HI(DMEM_CONTROL);</div><div class='del'>-        R5 = [P4];</div><div class='del'>-        BITCLR(R5,ENDCPLB_P);</div><div class='del'>-        SSYNC;          /* SSYNC required before writing to DMEM_CONTROL. */</div><div class='del'>-        .align 8;</div><div class='del'>-        [P4] = R5;</div><div class='del'>-        SSYNC;</div><div class='del'>-</div><div class='del'>-        /* Fix up the stack */</div><div class='del'>-        (R7:6,P5:4) = [sp++];</div><div class='del'>-        ASTAT = [sp++];</div><div class='del'>-        SP = EX_SCRATCH_REG;</div><div class='del'>-</div><div class='del'>-        /* We should be out of the exception stack, and back down into</div><div class='del'>-         * kernel or user space stack</div><div class='del'>-         */</div><div class='del'>-        SAVE_ALL_SYS</div><div class='add'>+	/* Turn caches &amp; protection off, to ensure we don't get any more</div><div class='add'>+	 * double exceptions</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	P4.L = LO(IMEM_CONTROL);</div><div class='add'>+	P4.H = HI(IMEM_CONTROL);</div><div class='add'>+</div><div class='add'>+	R5 = [P4];              /* Control Register*/</div><div class='add'>+	BITCLR(R5,ENICPLB_P);</div><div class='add'>+	SSYNC;          /* SSYNC required before writing to IMEM_CONTROL. */</div><div class='add'>+	.align 8;</div><div class='add'>+	[P4] = R5;</div><div class='add'>+	SSYNC;</div><div class='add'>+</div><div class='add'>+	P4.L = LO(DMEM_CONTROL);</div><div class='add'>+	P4.H = HI(DMEM_CONTROL);</div><div class='add'>+	R5 = [P4];</div><div class='add'>+	BITCLR(R5,ENDCPLB_P);</div><div class='add'>+	SSYNC;          /* SSYNC required before writing to DMEM_CONTROL. */</div><div class='add'>+	.align 8;</div><div class='add'>+	[P4] = R5;</div><div class='add'>+	SSYNC;</div><div class='add'>+</div><div class='add'>+	/* Fix up the stack */</div><div class='add'>+	(R7:6,P5:4) = [sp++];</div><div class='add'>+	ASTAT = [sp++];</div><div class='add'>+	SP = EX_SCRATCH_REG;</div><div class='add'>+</div><div class='add'>+	/* We should be out of the exception stack, and back down into</div><div class='add'>+	 * kernel or user space stack</div><div class='add'>+	 */</div><div class='add'>+	SAVE_ALL_SYS</div><div class='ctx'> </div><div class='ctx'> 	/* The dumping functions expect the return address in the RETI</div><div class='ctx'> 	 * slot.  */</div><div class='ctx'> 	r6 = retx;</div><div class='ctx'> 	[sp + PT_PC] = r6;</div><div class='ctx'> </div><div class='del'>-        r0 = sp;        /* stack frame pt_regs pointer argument ==&gt; r0 */</div><div class='del'>-        SP += -12;</div><div class='del'>-        call _double_fault_c;</div><div class='del'>-        SP += 12;</div><div class='add'>+	r0 = sp;        /* stack frame pt_regs pointer argument ==&gt; r0 */</div><div class='add'>+	SP += -12;</div><div class='add'>+	call _double_fault_c;</div><div class='add'>+	SP += 12;</div><div class='ctx'> .L_double_fault_panic:</div><div class='ctx'>         JUMP .L_double_fault_panic</div><div class='ctx'> </div><div class='hunk'>@@ -388,8 +424,8 @@ ENDPROC(_double_fault)</div><div class='ctx'> ENTRY(_exception_to_level5)</div><div class='ctx'> 	SAVE_ALL_SYS</div><div class='ctx'> </div><div class='del'>-	p4.l = _excpt_saved_stuff;</div><div class='del'>-	p4.h = _excpt_saved_stuff;</div><div class='add'>+	p4.l = _saved_retx;</div><div class='add'>+	p4.h = _saved_retx;</div><div class='ctx'> 	r6 = [p4];</div><div class='ctx'> 	[sp + PT_PC] = r6;</div><div class='ctx'> </div><div class='hunk'>@@ -420,6 +456,17 @@ ENTRY(_exception_to_level5)</div><div class='ctx'> 	call _trap_c;</div><div class='ctx'> 	SP += 12;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_DEBUG_DOUBLEFAULT</div><div class='add'>+	/* Grab ILAT */</div><div class='add'>+	p2.l = lo(ILAT);</div><div class='add'>+	p2.h = hi(ILAT);</div><div class='add'>+	r0 = [p2];</div><div class='add'>+	r1 = 0x20;  /* Did I just cause anther HW error? */</div><div class='add'>+	r0 = r0 &amp; r1;</div><div class='add'>+	CC = R0 == R1;</div><div class='add'>+	if CC JUMP _double_fault;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	call _ret_from_exception;</div><div class='ctx'> 	RESTORE_ALL_SYS</div><div class='ctx'> 	rti;</div><div class='hunk'>@@ -436,7 +483,48 @@ ENTRY(_trap) /* Exception: 4th entry into system event table(supervisor mode)*/</div><div class='ctx'> 	/* Try to deal with syscalls quickly.  */</div><div class='ctx'> 	[--sp] = ASTAT;</div><div class='ctx'> 	[--sp] = (R7:6,P5:4);</div><div class='add'>+</div><div class='add'>+#if ANOMALY_05000283 || ANOMALY_05000315</div><div class='add'>+	cc = r7 == r7;</div><div class='add'>+	p5.h = HI(CHIPID);</div><div class='add'>+	p5.l = LO(CHIPID);</div><div class='add'>+	if cc jump 1f;</div><div class='add'>+	r7.l = W[p5];</div><div class='add'>+1:</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_DEBUG_DOUBLEFAULT</div><div class='add'>+	/*</div><div class='add'>+	 * Save these registers, as they are only valid in exception context</div><div class='add'>+	 * (where we are now - as soon as we defer to IRQ5, they can change)</div><div class='add'>+	 * DCPLB_STATUS and ICPLB_STATUS are also only valid in EVT3,</div><div class='add'>+	 * but they are not very interesting, so don't save them</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	p4.l = lo(DCPLB_FAULT_ADDR);</div><div class='add'>+	p4.h = hi(DCPLB_FAULT_ADDR);</div><div class='add'>+	r7 = [p4];</div><div class='add'>+	p5.h = _saved_dcplb_fault_addr;</div><div class='add'>+	p5.l = _saved_dcplb_fault_addr;</div><div class='add'>+	[p5] = r7;</div><div class='add'>+</div><div class='add'>+	r7 = [p4 + (ICPLB_FAULT_ADDR - DCPLB_FAULT_ADDR)];</div><div class='add'>+	p5.h = _saved_icplb_fault_addr;</div><div class='add'>+	p5.l = _saved_icplb_fault_addr;</div><div class='add'>+	[p5] = r7;</div><div class='add'>+</div><div class='add'>+	p4.l = _saved_retx;</div><div class='add'>+	p4.h = _saved_retx;</div><div class='add'>+	r6 = retx;</div><div class='add'>+	[p4] = r6;</div><div class='add'>+</div><div class='ctx'> 	r7 = SEQSTAT;		/* reason code is in bit 5:0 */</div><div class='add'>+	p4.l = _saved_seqstat;</div><div class='add'>+	p4.h = _saved_seqstat;</div><div class='add'>+	[p4] = r7;</div><div class='add'>+#else</div><div class='add'>+	r7 = SEQSTAT;           /* reason code is in bit 5:0 */</div><div class='add'>+#endif</div><div class='ctx'> 	r6.l = lo(SEQSTAT_EXCAUSE);</div><div class='ctx'> 	r6.h = hi(SEQSTAT_EXCAUSE);</div><div class='ctx'> 	r7 = r7 &amp; r6;</div><div class='hunk'>@@ -616,6 +704,9 @@ ENTRY(_system_call)</div><div class='ctx'> 	rts;</div><div class='ctx'> ENDPROC(_system_call)</div><div class='ctx'> </div><div class='add'>+/* Do not mark as ENTRY() to avoid error in assembler ...</div><div class='add'>+ * this symbol need not be global anyways, so ...</div><div class='add'>+ */</div><div class='ctx'> _sys_trace:</div><div class='ctx'> 	call _syscall_trace;</div><div class='ctx'> </div><div class='hunk'>@@ -941,6 +1032,15 @@ ENTRY(_early_trap)</div><div class='ctx'> 	SAVE_ALL_SYS</div><div class='ctx'> 	trace_buffer_stop(p0,r0);</div><div class='ctx'> </div><div class='add'>+#if ANOMALY_05000283 || ANOMALY_05000315</div><div class='add'>+	cc = r5 == r5;</div><div class='add'>+	p4.h = HI(CHIPID);</div><div class='add'>+	p4.l = LO(CHIPID);</div><div class='add'>+	if cc jump 1f;</div><div class='add'>+	r5.l = W[p4];</div><div class='add'>+1:</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	/* Turn caches off, to ensure we don't get double exceptions */</div><div class='ctx'> </div><div class='ctx'> 	P4.L = LO(IMEM_CONTROL);</div><div class='hunk'>@@ -992,7 +1092,12 @@ ENTRY(_ex_table)</div><div class='ctx'> 	 */</div><div class='ctx'> 	.long _ex_syscall       /* 0x00 - User Defined - Linux Syscall */</div><div class='ctx'> 	.long _ex_soft_bp       /* 0x01 - User Defined - Software breakpoint */</div><div class='add'>+#ifdef	CONFIG_KGDB</div><div class='add'>+	.long _ex_trap_c	/* 0x02 - User Defined - KGDB initial connection</div><div class='add'>+							 and break signal trap */</div><div class='add'>+#else</div><div class='ctx'> 	.long _ex_replaceable   /* 0x02 - User Defined */</div><div class='add'>+#endif</div><div class='ctx'> 	.long _ex_trap_c        /* 0x03 - User Defined - userspace stack overflow */</div><div class='ctx'> 	.long _ex_trap_c        /* 0x04 - User Defined - dump trace buffer */</div><div class='ctx'> 	.long _ex_replaceable   /* 0x05 - User Defined */</div><div class='hunk'>@@ -1432,15 +1537,7 @@ ENTRY(_sys_call_table)</div><div class='ctx'> 	.rept NR_syscalls-(.-_sys_call_table)/4</div><div class='ctx'> 	.long _sys_ni_syscall</div><div class='ctx'> 	.endr</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Used to save the real RETX, IMASK and SYSCFG when temporarily</div><div class='del'>-	 * storing safe values across the transition from exception to IRQ5.</div><div class='del'>-	 */</div><div class='del'>-_excpt_saved_stuff:</div><div class='del'>-	.long 0;</div><div class='del'>-	.long 0;</div><div class='del'>-	.long 0;</div><div class='add'>+END(_sys_call_table)</div><div class='ctx'> </div><div class='ctx'> _exception_stack:</div><div class='ctx'> 	.rept 1024</div><div class='head'>diff --git a/arch/blackfin/mach-common/head.S b/arch/blackfin/mach-common/head.S<br/>index 191b4e974c4b..f123a62e2451 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mach-common/head.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/mach-common/head.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mach-common/head.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-common/head.S</a></div><div class='hunk'>@@ -68,6 +68,16 @@ ENTRY(__start)</div><div class='ctx'> 	M2 = r0;</div><div class='ctx'> 	M3 = r0;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Clear ITEST_COMMAND and DTEST_COMMAND registers,</div><div class='add'>+	 * Leaving these as non-zero can confuse the emulator</div><div class='add'>+	 */</div><div class='add'>+	p0.L = LO(DTEST_COMMAND);</div><div class='add'>+	p0.H = HI(DTEST_COMMAND);</div><div class='add'>+	[p0] = R0;</div><div class='add'>+	[p0 + (ITEST_COMMAND - DTEST_COMMAND)] = R0;</div><div class='add'>+	CSYNC;</div><div class='add'>+</div><div class='ctx'> 	trace_buffer_init(p0,r0);</div><div class='ctx'> 	P0 = R1;</div><div class='ctx'> 	R0 = R1;</div><div class='hunk'>@@ -90,12 +100,46 @@ ENTRY(__start)</div><div class='ctx'> 	[p0] = R0;</div><div class='ctx'> 	SSYNC;</div><div class='ctx'> </div><div class='del'>-	/* Save RETX, in case of doublefault */</div><div class='del'>-	p0.l = ___retx;</div><div class='del'>-	p0.h = ___retx;</div><div class='add'>+	/* in case of double faults, save a few things */</div><div class='add'>+	p0.l = _init_retx;</div><div class='add'>+	p0.h = _init_retx;</div><div class='ctx'> 	R0 = RETX;</div><div class='ctx'> 	[P0] = R0;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_DEBUG_DOUBLEFAULT</div><div class='add'>+	/* Only save these if we are storing them,</div><div class='add'>+	 * This happens here, since L1 gets clobbered</div><div class='add'>+	 * below</div><div class='add'>+	 */</div><div class='add'>+	p0.l = _saved_retx;</div><div class='add'>+	p0.h = _saved_retx;</div><div class='add'>+	p1.l = _init_saved_retx;</div><div class='add'>+	p1.h = _init_saved_retx;</div><div class='add'>+	r0 = [p0];</div><div class='add'>+	[p1] = r0;</div><div class='add'>+</div><div class='add'>+	p0.l = _saved_dcplb_fault_addr;</div><div class='add'>+	p0.h = _saved_dcplb_fault_addr;</div><div class='add'>+	p1.l = _init_saved_dcplb_fault_addr;</div><div class='add'>+	p1.h = _init_saved_dcplb_fault_addr;</div><div class='add'>+	r0 = [p0];</div><div class='add'>+	[p1] = r0;</div><div class='add'>+</div><div class='add'>+	p0.l = _saved_icplb_fault_addr;</div><div class='add'>+	p0.h = _saved_icplb_fault_addr;</div><div class='add'>+	p1.l = _init_saved_icplb_fault_addr;</div><div class='add'>+	p1.h = _init_saved_icplb_fault_addr;</div><div class='add'>+	r0 = [p0];</div><div class='add'>+	[p1] = r0;</div><div class='add'>+</div><div class='add'>+	p0.l = _saved_seqstat;</div><div class='add'>+	p0.h = _saved_seqstat;</div><div class='add'>+	p1.l = _init_saved_seqstat;</div><div class='add'>+	p1.h = _init_saved_seqstat;</div><div class='add'>+	r0 = [p0];</div><div class='add'>+	[p1] = r0;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	/* Initialize stack pointer */</div><div class='ctx'> 	sp.l = lo(INITIAL_STACK);</div><div class='ctx'> 	sp.h = hi(INITIAL_STACK);</div><div class='hunk'>@@ -107,7 +151,7 @@ ENTRY(__start)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	/* Put The Code for PLL Programming and SDRAM Programming in L1 ISRAM */</div><div class='del'>-	call _bf53x_relocate_l1_mem;</div><div class='add'>+	call _bfin_relocate_l1_mem;</div><div class='ctx'> #ifdef CONFIG_BFIN_KERNEL_CLOCK</div><div class='ctx'> 	call _start_dma_code;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -162,6 +206,60 @@ ENTRY(_real_start)</div><div class='ctx'> 	w[p0] = r0;</div><div class='ctx'> 	ssync;</div><div class='ctx'> </div><div class='add'>+#if L1_DATA_A_LENGTH &gt; 0</div><div class='add'>+	r1.l = __sbss_l1;</div><div class='add'>+	r1.h = __sbss_l1;</div><div class='add'>+	r2.l = __ebss_l1;</div><div class='add'>+	r2.h = __ebss_l1;</div><div class='add'>+	r0 = 0 (z);</div><div class='add'>+	r2 = r2 - r1;</div><div class='add'>+	cc = r2 == 0;</div><div class='add'>+	if cc jump .L_a_l1_done;</div><div class='add'>+	r2 &gt;&gt;= 2;</div><div class='add'>+	p1 = r1;</div><div class='add'>+	p2 = r2;</div><div class='add'>+	lsetup (.L_clear_a_l1, .L_clear_a_l1 ) lc0 = p2;</div><div class='add'>+.L_clear_a_l1:</div><div class='add'>+	[p1++] = r0;</div><div class='add'>+.L_a_l1_done:</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if L1_DATA_B_LENGTH &gt; 0</div><div class='add'>+	r1.l = __sbss_b_l1;</div><div class='add'>+	r1.h = __sbss_b_l1;</div><div class='add'>+	r2.l = __ebss_b_l1;</div><div class='add'>+	r2.h = __ebss_b_l1;</div><div class='add'>+	r0 = 0 (z);</div><div class='add'>+	r2 = r2 - r1;</div><div class='add'>+	cc = r2 == 0;</div><div class='add'>+	if cc jump .L_b_l1_done;</div><div class='add'>+	r2 &gt;&gt;= 2;</div><div class='add'>+	p1 = r1;</div><div class='add'>+	p2 = r2;</div><div class='add'>+	lsetup (.L_clear_b_l1, .L_clear_b_l1 ) lc0 = p2;</div><div class='add'>+.L_clear_b_l1:</div><div class='add'>+	[p1++] = r0;</div><div class='add'>+.L_b_l1_done:</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if L2_LENGTH &gt; 0</div><div class='add'>+	r1.l = __sbss_l2;</div><div class='add'>+	r1.h = __sbss_l2;</div><div class='add'>+	r2.l = __ebss_l2;</div><div class='add'>+	r2.h = __ebss_l2;</div><div class='add'>+	r0 = 0 (z);</div><div class='add'>+	r2 = r2 - r1;</div><div class='add'>+	cc = r2 == 0;</div><div class='add'>+	if cc jump .L_l2_done;</div><div class='add'>+	r2 &gt;&gt;= 2;</div><div class='add'>+	p1 = r1;</div><div class='add'>+	p2 = r2;</div><div class='add'>+	lsetup (.L_clear_l2, .L_clear_l2 ) lc0 = p2;</div><div class='add'>+.L_clear_l2:</div><div class='add'>+	[p1++] = r0;</div><div class='add'>+.L_l2_done:</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	/* Zero out the bss region</div><div class='ctx'> 	 * Note: this will fail if bss is 0 bytes ...</div><div class='ctx'> 	 */</div><div class='head'>diff --git a/arch/blackfin/mach-common/interrupt.S b/arch/blackfin/mach-common/interrupt.S<br/>index b27e59d32401..4a2ec7a9675a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mach-common/interrupt.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/mach-common/interrupt.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mach-common/interrupt.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-common/interrupt.S</a></div><div class='hunk'>@@ -143,7 +143,7 @@ ENTRY(_evt_ivhw)</div><div class='ctx'> 	fp = 0;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if ANOMALY_05000283</div><div class='add'>+#if ANOMALY_05000283 || ANOMALY_05000315</div><div class='ctx'> 	cc = r7 == r7;</div><div class='ctx'> 	p5.h = HI(CHIPID);</div><div class='ctx'> 	p5.l = LO(CHIPID);</div><div class='hunk'>@@ -179,7 +179,16 @@ ENTRY(_evt_ivhw)</div><div class='ctx'> 	call _trap_c;</div><div class='ctx'> 	SP += 12;</div><div class='ctx'> </div><div class='add'>+#ifdef EBIU_ERRMST</div><div class='add'>+	/* make sure EBIU_ERRMST is clear */</div><div class='add'>+	p0.l = LO(EBIU_ERRMST);</div><div class='add'>+	p0.h = HI(EBIU_ERRMST);</div><div class='add'>+	r0.l = (CORE_ERROR | CORE_MERROR);</div><div class='add'>+	w[p0] = r0.l;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	call _ret_from_exception;</div><div class='add'>+</div><div class='ctx'> .Lcommon_restore_all_sys:</div><div class='ctx'> 	RESTORE_ALL_SYS</div><div class='ctx'> 	rti;</div><div class='head'>diff --git a/arch/blackfin/mach-common/ints-priority.c b/arch/blackfin/mach-common/ints-priority.c<br/>index 5fa536727c61..34e8a726ffda 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mach-common/ints-priority.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/mach-common/ints-priority.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mach-common/ints-priority.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mach-common/ints-priority.c</a></div><div class='hunk'>@@ -243,12 +243,14 @@ int bfin_internal_set_wake(unsigned int irq, unsigned int state)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static struct irq_chip bfin_core_irqchip = {</div><div class='add'>+	.name = "CORE",</div><div class='ctx'> 	.ack = bfin_ack_noop,</div><div class='ctx'> 	.mask = bfin_core_mask_irq,</div><div class='ctx'> 	.unmask = bfin_core_unmask_irq,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct irq_chip bfin_internal_irqchip = {</div><div class='add'>+	.name = "INTN",</div><div class='ctx'> 	.ack = bfin_ack_noop,</div><div class='ctx'> 	.mask = bfin_internal_mask_irq,</div><div class='ctx'> 	.unmask = bfin_internal_unmask_irq,</div><div class='hunk'>@@ -278,6 +280,7 @@ static void bfin_generic_error_unmask_irq(unsigned int irq)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct irq_chip bfin_generic_error_irqchip = {</div><div class='add'>+	.name = "ERROR",</div><div class='ctx'> 	.ack = bfin_ack_noop,</div><div class='ctx'> 	.mask_ack = bfin_generic_error_mask_irq,</div><div class='ctx'> 	.mask = bfin_generic_error_mask_irq,</div><div class='hunk'>@@ -361,6 +364,14 @@ static void bfin_demux_error_irq(unsigned int int_err_irq,</div><div class='ctx'> }</div><div class='ctx'> #endif				/* BF537_GENERIC_ERROR_INT_DEMUX */</div><div class='ctx'> </div><div class='add'>+static inline void bfin_set_irq_handler(unsigned irq, irq_flow_handler_t handle)</div><div class='add'>+{</div><div class='add'>+	struct irq_desc *desc = irq_desc + irq;</div><div class='add'>+	/* May not call generic set_irq_handler() due to spinlock</div><div class='add'>+	   recursion. */</div><div class='add'>+	desc-&gt;handle_irq = handle;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #if !defined(CONFIG_BF54x)</div><div class='ctx'> </div><div class='ctx'> static unsigned short gpio_enabled[gpio_bank(MAX_BLACKFIN_GPIOS)];</div><div class='hunk'>@@ -473,9 +484,9 @@ static int bfin_gpio_irq_type(unsigned int irq, unsigned int type)</div><div class='ctx'> 	SSYNC();</div><div class='ctx'> </div><div class='ctx'> 	if (type &amp; (IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING))</div><div class='del'>-		set_irq_handler(irq, handle_edge_irq);</div><div class='add'>+		bfin_set_irq_handler(irq, handle_edge_irq);</div><div class='ctx'> 	else</div><div class='del'>-		set_irq_handler(irq, handle_level_irq);</div><div class='add'>+		bfin_set_irq_handler(irq, handle_level_irq);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -495,6 +506,7 @@ int bfin_gpio_set_wake(unsigned int irq, unsigned int state)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static struct irq_chip bfin_gpio_irqchip = {</div><div class='add'>+	.name = "GPIO",</div><div class='ctx'> 	.ack = bfin_gpio_ack_irq,</div><div class='ctx'> 	.mask = bfin_gpio_mask_irq,</div><div class='ctx'> 	.mask_ack = bfin_gpio_mask_ack_irq,</div><div class='hunk'>@@ -804,10 +816,10 @@ static int bfin_gpio_irq_type(unsigned int irq, unsigned int type)</div><div class='ctx'> </div><div class='ctx'> 	if (type &amp; (IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING)) {</div><div class='ctx'> 		pint[bank]-&gt;edge_set = pintbit;</div><div class='del'>-		set_irq_handler(irq, handle_edge_irq);</div><div class='add'>+		bfin_set_irq_handler(irq, handle_edge_irq);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		pint[bank]-&gt;edge_clear = pintbit;</div><div class='del'>-		set_irq_handler(irq, handle_level_irq);</div><div class='add'>+		bfin_set_irq_handler(irq, handle_level_irq);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	SSYNC();</div><div class='hunk'>@@ -884,6 +896,7 @@ void bfin_pm_restore(void)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static struct irq_chip bfin_gpio_irqchip = {</div><div class='add'>+	.name = "GPIO",</div><div class='ctx'> 	.ack = bfin_gpio_ack_irq,</div><div class='ctx'> 	.mask = bfin_gpio_mask_irq,</div><div class='ctx'> 	.mask_ack = bfin_gpio_mask_ack_irq,</div><div class='hunk'>@@ -1136,8 +1149,4 @@ void do_irq(int vec, struct pt_regs *fp)</div><div class='ctx'> 		vec = ivg-&gt;irqno;</div><div class='ctx'> 	}</div><div class='ctx'> 	asm_do_IRQ(vec, fp);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_KGDB</div><div class='del'>-	kgdb_process_breakpoint();</div><div class='del'>-#endif</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/blackfin/mm/Makefile b/arch/blackfin/mm/Makefile<br/>index 2a7202ce01fd..d489f894f4b1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mm/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/mm/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mm/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mm/Makefile</a></div><div class='hunk'>@@ -2,4 +2,4 @@</div><div class='ctx'> # arch/blackfin/mm/Makefile</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-obj-y := blackfin_sram.o init.o</div><div class='add'>+obj-y := sram-alloc.o isram-driver.o init.o</div><div class='head'>diff --git a/arch/blackfin/mm/isram-driver.c b/arch/blackfin/mm/isram-driver.c<br/>new file mode 100644<br/>index 000000000000..22913e7a1818<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mm/isram-driver.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mm/isram-driver.c</a></div><div class='hunk'>@@ -0,0 +1,201 @@</div><div class='add'>+/*</div><div class='add'>+ * Description: Instruction SRAM accessor functions for the Blackfin</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2008 Analog Devices Inc.</div><div class='add'>+ *</div><div class='add'>+ * Bugs: Enter bugs at http://blackfin.uclinux.org/</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, see the file COPYING, or write</div><div class='add'>+ * to the Free Software Foundation, Inc.,</div><div class='add'>+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/blackfin.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * IMPORTANT WARNING ABOUT THESE FUNCTIONS</div><div class='add'>+ *</div><div class='add'>+ * The emulator will not function correctly if a write command is left in</div><div class='add'>+ * ITEST_COMMAND or DTEST_COMMAND AND access to cache memory is needed by</div><div class='add'>+ * the emulator. To avoid such problems, ensure that both ITEST_COMMAND</div><div class='add'>+ * and DTEST_COMMAND are zero when exiting these functions.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * On the Blackfin, L1 instruction sram (which operates at core speeds) can not</div><div class='add'>+ * be accessed by a normal core load, so we need to go through a few hoops to</div><div class='add'>+ * read/write it.</div><div class='add'>+ * To try to make it easier - we export a memcpy interface, where either src or</div><div class='add'>+ * dest can be in this special L1 memory area.</div><div class='add'>+ * The low level read/write functions should not be exposed to the rest of the</div><div class='add'>+ * kernel, since they operate on 64-bit data, and need specific address alignment</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static DEFINE_SPINLOCK(dtest_lock);</div><div class='add'>+</div><div class='add'>+/* Takes a void pointer */</div><div class='add'>+#define IADDR2DTEST(x) \</div><div class='add'>+	({ unsigned long __addr = (unsigned long)(x); \</div><div class='add'>+		(__addr &amp; 0x47F8)        | /* address bits 14 &amp; 10:3 */ \</div><div class='add'>+		(__addr &amp; 0x0800) &lt;&lt; 15  | /* address bit  11        */ \</div><div class='add'>+		(__addr  &amp; 0x3000) &lt;&lt; 4  | /* address bits 13:12     */ \</div><div class='add'>+		(__addr  &amp; 0x8000) &lt;&lt; 8  | /* address bit  15        */ \</div><div class='add'>+		(0x1000004);               /* isram access           */ \</div><div class='add'>+	})</div><div class='add'>+</div><div class='add'>+/* Takes a pointer, and returns the offset (in bits) which things should be shifted */</div><div class='add'>+#define ADDR2OFFSET(x) ((((unsigned long)(x)) &amp; 0x7) * 8)</div><div class='add'>+</div><div class='add'>+/* Takes a pointer, determines if it is the last byte in the isram 64-bit data type */</div><div class='add'>+#define ADDR2LAST(x) ((((unsigned long)x) &amp; 0x7) == 0x7)</div><div class='add'>+</div><div class='add'>+static void isram_write(const void *addr, uint64_t data)</div><div class='add'>+{</div><div class='add'>+	uint32_t cmd;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	if (addr &gt;= (void *)(L1_CODE_START + L1_CODE_LENGTH))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	cmd = IADDR2DTEST(addr) | 1;             /* write */</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Writes to DTEST_DATA[0:1] need to be atomic with write to DTEST_COMMAND</div><div class='add'>+	 * While in exception context - atomicity is guaranteed or double fault</div><div class='add'>+	 */</div><div class='add'>+	spin_lock_irqsave(&amp;dtest_lock, flags);</div><div class='add'>+</div><div class='add'>+	bfin_write_DTEST_DATA0(data &amp; 0xFFFFFFFF);</div><div class='add'>+	bfin_write_DTEST_DATA1(data &gt;&gt; 32);</div><div class='add'>+</div><div class='add'>+	/* use the builtin, since interrupts are already turned off */</div><div class='add'>+	__builtin_bfin_csync();</div><div class='add'>+	bfin_write_DTEST_COMMAND(cmd);</div><div class='add'>+	__builtin_bfin_csync();</div><div class='add'>+</div><div class='add'>+	bfin_write_DTEST_COMMAND(0);</div><div class='add'>+	__builtin_bfin_csync();</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;dtest_lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static uint64_t isram_read(const void *addr)</div><div class='add'>+{</div><div class='add'>+	uint32_t cmd;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	uint64_t ret;</div><div class='add'>+</div><div class='add'>+	if (addr &gt; (void *)(L1_CODE_START + L1_CODE_LENGTH))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	cmd = IADDR2DTEST(addr) | 0;              /* read */</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Reads of DTEST_DATA[0:1] need to be atomic with write to DTEST_COMMAND</div><div class='add'>+	 * While in exception context - atomicity is guaranteed or double fault</div><div class='add'>+	 */</div><div class='add'>+	spin_lock_irqsave(&amp;dtest_lock, flags);</div><div class='add'>+	/* use the builtin, since interrupts are already turned off */</div><div class='add'>+	__builtin_bfin_csync();</div><div class='add'>+	bfin_write_DTEST_COMMAND(cmd);</div><div class='add'>+	__builtin_bfin_csync();</div><div class='add'>+	ret = bfin_read_DTEST_DATA0() | ((uint64_t)bfin_read_DTEST_DATA1() &lt;&lt; 32);</div><div class='add'>+</div><div class='add'>+	bfin_write_DTEST_COMMAND(0);</div><div class='add'>+	__builtin_bfin_csync();</div><div class='add'>+	spin_unlock_irqrestore(&amp;dtest_lock, flags);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool isram_check_addr(const void *addr, size_t n)</div><div class='add'>+{</div><div class='add'>+	if ((addr &gt;= (void *)L1_CODE_START) &amp;&amp;</div><div class='add'>+	    (addr &lt; (void *)(L1_CODE_START + L1_CODE_LENGTH))) {</div><div class='add'>+		if ((addr + n) &gt;= (void *)(L1_CODE_START + L1_CODE_LENGTH)) {</div><div class='add'>+			show_stack(NULL, NULL);</div><div class='add'>+			printk(KERN_ERR "isram_memcpy: copy involving %p length "</div><div class='add'>+					"(%zu) too long\n", addr, n);</div><div class='add'>+		}</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The isram_memcpy() function copies n bytes from memory area src to memory area dest.</div><div class='add'>+ * The isram_memcpy() function returns a pointer to dest.</div><div class='add'>+ * Either dest or src can be in L1 instruction sram.</div><div class='add'>+ */</div><div class='add'>+void *isram_memcpy(void *dest, const void *src, size_t n)</div><div class='add'>+{</div><div class='add'>+	uint64_t data_in = 0, data_out = 0;</div><div class='add'>+	size_t count;</div><div class='add'>+	bool dest_in_l1, src_in_l1, need_data, put_data;</div><div class='add'>+	unsigned char byte, *src_byte, *dest_byte;</div><div class='add'>+</div><div class='add'>+	src_byte = (unsigned char *)src;</div><div class='add'>+	dest_byte = (unsigned char *)dest;</div><div class='add'>+</div><div class='add'>+	dest_in_l1 = isram_check_addr(dest, n);</div><div class='add'>+	src_in_l1 = isram_check_addr(src, n);</div><div class='add'>+</div><div class='add'>+	need_data = true;</div><div class='add'>+	put_data = true;</div><div class='add'>+	for (count = 0; count &lt; n; count++) {</div><div class='add'>+		if (src_in_l1) {</div><div class='add'>+			if (need_data) {</div><div class='add'>+				data_in = isram_read(src + count);</div><div class='add'>+				need_data = false;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (ADDR2LAST(src + count))</div><div class='add'>+				need_data = true;</div><div class='add'>+</div><div class='add'>+			byte = (unsigned char)((data_in &gt;&gt; ADDR2OFFSET(src + count)) &amp; 0xff);</div><div class='add'>+</div><div class='add'>+		} else {</div><div class='add'>+			/* src is in L2 or L3 - so just dereference*/</div><div class='add'>+			byte = src_byte[count];</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (dest_in_l1) {</div><div class='add'>+			if (put_data) {</div><div class='add'>+				data_out = isram_read(dest + count);</div><div class='add'>+				put_data = false;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			data_out &amp;= ~((uint64_t)0xff &lt;&lt; ADDR2OFFSET(dest + count));</div><div class='add'>+			data_out |= ((uint64_t)byte &lt;&lt; ADDR2OFFSET(dest + count));</div><div class='add'>+</div><div class='add'>+			if (ADDR2LAST(dest + count)) {</div><div class='add'>+				put_data = true;</div><div class='add'>+				isram_write(dest + count, data_out);</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			/* dest in L2 or L3 - so just dereference */</div><div class='add'>+			dest_byte[count] = byte;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* make sure we dump the last byte if necessary */</div><div class='add'>+	if (dest_in_l1 &amp;&amp; !put_data)</div><div class='add'>+		isram_write(dest + count, data_out);</div><div class='add'>+</div><div class='add'>+	return dest;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(isram_memcpy);</div><div class='add'>+</div><div class='head'>diff --git a/arch/blackfin/mm/blackfin_sram.c b/arch/blackfin/mm/sram-alloc.c<br/>index 4f5e887a0d96..0f1ca6930c16 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mm/blackfin_sram.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/blackfin/mm/blackfin_sram.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/blackfin/mm/sram-alloc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/blackfin/mm/sram-alloc.c</a></div><div class='hunk'>@@ -1,13 +1,13 @@</div><div class='ctx'> /*</div><div class='del'>- * File:         arch/blackfin/mm/blackfin_sram.c</div><div class='add'>+ * File:         arch/blackfin/mm/sram-alloc.c</div><div class='ctx'>  * Based on:</div><div class='ctx'>  * Author:</div><div class='ctx'>  *</div><div class='ctx'>  * Created:</div><div class='del'>- * Description:  SRAM driver for Blackfin ADSP-BF5xx</div><div class='add'>+ * Description:  SRAM allocator for Blackfin L1 and L2 memory</div><div class='ctx'>  *</div><div class='ctx'>  * Modified:</div><div class='del'>- *               Copyright 2004-2007 Analog Devices Inc.</div><div class='add'>+ *               Copyright 2004-2008 Analog Devices Inc.</div><div class='ctx'>  *</div><div class='ctx'>  * Bugs:         Enter bugs at http://blackfin.uclinux.org/</div><div class='ctx'>  *</div><div class='hunk'>@@ -78,7 +78,7 @@ static void __init l1sram_init(void)</div><div class='ctx'> 	free_l1_ssram_head.next =</div><div class='ctx'> 		kmem_cache_alloc(sram_piece_cache, GFP_KERNEL);</div><div class='ctx'> 	if (!free_l1_ssram_head.next) {</div><div class='del'>-		printk(KERN_INFO"Fail to initialize Scratchpad data SRAM.\n");</div><div class='add'>+		printk(KERN_INFO "Failed to initialize Scratchpad data SRAM\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -102,7 +102,7 @@ static void __init l1_data_sram_init(void)</div><div class='ctx'> 	free_l1_data_A_sram_head.next =</div><div class='ctx'> 		kmem_cache_alloc(sram_piece_cache, GFP_KERNEL);</div><div class='ctx'> 	if (!free_l1_data_A_sram_head.next) {</div><div class='del'>-		printk(KERN_INFO"Fail to initialize L1 Data A SRAM.\n");</div><div class='add'>+		printk(KERN_INFO "Failed to initialize L1 Data A SRAM\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -123,7 +123,7 @@ static void __init l1_data_sram_init(void)</div><div class='ctx'> 	free_l1_data_B_sram_head.next =</div><div class='ctx'> 		kmem_cache_alloc(sram_piece_cache, GFP_KERNEL);</div><div class='ctx'> 	if (!free_l1_data_B_sram_head.next) {</div><div class='del'>-		printk(KERN_INFO"Fail to initialize L1 Data B SRAM.\n");</div><div class='add'>+		printk(KERN_INFO "Failed to initialize L1 Data B SRAM\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -151,7 +151,7 @@ static void __init l1_inst_sram_init(void)</div><div class='ctx'> 	free_l1_inst_sram_head.next =</div><div class='ctx'> 		kmem_cache_alloc(sram_piece_cache, GFP_KERNEL);</div><div class='ctx'> 	if (!free_l1_inst_sram_head.next) {</div><div class='del'>-		printk(KERN_INFO"Fail to initialize L1 Instruction SRAM.\n");</div><div class='add'>+		printk(KERN_INFO "Failed to initialize L1 Instruction SRAM\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -179,7 +179,7 @@ static void __init l2_sram_init(void)</div><div class='ctx'> 	free_l2_sram_head.next =</div><div class='ctx'> 		kmem_cache_alloc(sram_piece_cache, GFP_KERNEL);</div><div class='ctx'> 	if (!free_l2_sram_head.next) {</div><div class='del'>-		printk(KERN_INFO"Fail to initialize L2 SRAM.\n");</div><div class='add'>+		printk(KERN_INFO "Failed to initialize L2 SRAM\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -351,28 +351,31 @@ static int _sram_free(const void *addr,</div><div class='ctx'> </div><div class='ctx'> int sram_free(const void *addr)</div><div class='ctx'> {</div><div class='del'>-	if (0) {}</div><div class='add'>+</div><div class='ctx'> #if L1_CODE_LENGTH != 0</div><div class='del'>-	else if (addr &gt;= (void *)L1_CODE_START</div><div class='add'>+	if (addr &gt;= (void *)L1_CODE_START</div><div class='ctx'> 		 &amp;&amp; addr &lt; (void *)(L1_CODE_START + L1_CODE_LENGTH))</div><div class='ctx'> 		return l1_inst_sram_free(addr);</div><div class='add'>+	else</div><div class='ctx'> #endif</div><div class='ctx'> #if L1_DATA_A_LENGTH != 0</div><div class='del'>-	else if (addr &gt;= (void *)L1_DATA_A_START</div><div class='add'>+	if (addr &gt;= (void *)L1_DATA_A_START</div><div class='ctx'> 		 &amp;&amp; addr &lt; (void *)(L1_DATA_A_START + L1_DATA_A_LENGTH))</div><div class='ctx'> 		return l1_data_A_sram_free(addr);</div><div class='add'>+	else</div><div class='ctx'> #endif</div><div class='ctx'> #if L1_DATA_B_LENGTH != 0</div><div class='del'>-	else if (addr &gt;= (void *)L1_DATA_B_START</div><div class='add'>+	if (addr &gt;= (void *)L1_DATA_B_START</div><div class='ctx'> 		 &amp;&amp; addr &lt; (void *)(L1_DATA_B_START + L1_DATA_B_LENGTH))</div><div class='ctx'> 		return l1_data_B_sram_free(addr);</div><div class='add'>+	else</div><div class='ctx'> #endif</div><div class='ctx'> #if L2_LENGTH != 0</div><div class='del'>-	else if (addr &gt;= (void *)L2_START</div><div class='add'>+	if (addr &gt;= (void *)L2_START</div><div class='ctx'> 		 &amp;&amp; addr &lt; (void *)(L2_START + L2_LENGTH))</div><div class='ctx'> 		return l2_sram_free(addr);</div><div class='del'>-#endif</div><div class='ctx'> 	else</div><div class='add'>+#endif</div><div class='ctx'> 		return -1;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(sram_free);</div><div class='head'>diff --git a/arch/cris/Makefile b/arch/cris/Makefile<br/>index 838cd2ae03ae..c6f5f5a2ffdf 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/cris/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>arch/cris/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/cris/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/cris/Makefile</a></div><div class='hunk'>@@ -10,6 +10,8 @@</div><div class='ctx'> # License.  See the file "COPYING" in the main directory of this archive</div><div class='ctx'> # for more details.</div><div class='ctx'> </div><div class='add'>+KBUILD_DEFCONFIG := etrax-100lx_v2_defconfig</div><div class='add'>+</div><div class='ctx'> arch-y := v10</div><div class='ctx'> arch-$(CONFIG_ETRAX_ARCH_V10) := v10</div><div class='ctx'> arch-$(CONFIG_ETRAX_ARCH_V32) := v32</div><div class='head'>diff --git a/arch/cris/arch-v10/boot/compressed/Makefile b/arch/cris/arch-v10/boot/compressed/Makefile<br/>index 08d943ce4be7..6fe0ffaf3be6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/cris/arch-v10/boot/compressed/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>arch/cris/arch-v10/boot/compressed/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/cris/arch-v10/boot/compressed/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/cris/arch-v10/boot/compressed/Makefile</a></div><div class='hunk'>@@ -4,7 +4,7 @@</div><div class='ctx'> </div><div class='ctx'> asflags-y += $(LINUXINCLUDE)</div><div class='ctx'> ccflags-y += -O2 $(LINUXINCLUDE)</div><div class='del'>-ldflags-y += -T $(srctree)/$(obj)/decompress.ld</div><div class='add'>+ldflags-y += -T $(srctree)/$(src)/decompress.lds</div><div class='ctx'> OBJECTS = $(obj)/head.o $(obj)/misc.o</div><div class='ctx'> OBJCOPYFLAGS = -O binary --remove-section=.bss</div><div class='ctx'> </div><div class='head'>diff --git a/arch/cris/arch-v10/boot/compressed/decompress.ld b/arch/cris/arch-v10/boot/compressed/decompress.lds<br/>index e80f4594d543..e80f4594d543 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/cris/arch-v10/boot/compressed/decompress.ld?id=c15895ef30c2c03e99802951787183039a349d32'>arch/cris/arch-v10/boot/compressed/decompress.ld</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/cris/arch-v10/boot/compressed/decompress.lds?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/cris/arch-v10/boot/compressed/decompress.lds</a></div><div class='head'>diff --git a/arch/cris/arch-v10/boot/rescue/Makefile b/arch/cris/arch-v10/boot/rescue/Makefile<br/>index 07688da92708..82ab59b968e5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/cris/arch-v10/boot/rescue/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>arch/cris/arch-v10/boot/rescue/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/cris/arch-v10/boot/rescue/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/cris/arch-v10/boot/rescue/Makefile</a></div><div class='hunk'>@@ -4,7 +4,7 @@</div><div class='ctx'> </div><div class='ctx'> ccflags-y += -O2 $(LINUXINCLUDE)</div><div class='ctx'> asflags-y += $(LINUXINCLUDE)</div><div class='del'>-ldflags-y += -T $(srctree)/$(obj)/rescue.ld</div><div class='add'>+ldflags-y += -T $(srctree)/$(src)/rescue.lds</div><div class='ctx'> OBJCOPYFLAGS = -O binary --remove-section=.bss</div><div class='ctx'> obj-$(CONFIG_ETRAX_AXISFLASHMAP) = head.o</div><div class='ctx'> OBJECT := $(obj)/head.o</div><div class='head'>diff --git a/arch/cris/arch-v10/boot/rescue/rescue.ld b/arch/cris/arch-v10/boot/rescue/rescue.lds<br/>index 0b52a9490db6..0b52a9490db6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/cris/arch-v10/boot/rescue/rescue.ld?id=c15895ef30c2c03e99802951787183039a349d32'>arch/cris/arch-v10/boot/rescue/rescue.ld</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/cris/arch-v10/boot/rescue/rescue.lds?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/cris/arch-v10/boot/rescue/rescue.lds</a></div><div class='head'>diff --git a/arch/cris/arch-v10/boot/tools/build.c b/arch/cris/arch-v10/boot/tools/build.c<br/>index 2f9bbb26d603..c8adef364160 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/cris/arch-v10/boot/tools/build.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/cris/arch-v10/boot/tools/build.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/cris/arch-v10/boot/tools/build.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/cris/arch-v10/boot/tools/build.c</a></div><div class='hunk'>@@ -30,7 +30,6 @@</div><div class='ctx'> #include &lt;sys/sysmacros.h&gt;</div><div class='ctx'> #include &lt;unistd.h&gt;	/* contains read/write */</div><div class='ctx'> #include &lt;fcntl.h&gt;</div><div class='del'>-#include &lt;linux/a.out.h&gt;</div><div class='ctx'> #include &lt;errno.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define MINIX_HEADER 32</div><div class='head'>diff --git a/arch/cris/arch-v32/boot/compressed/Makefile b/arch/cris/arch-v32/boot/compressed/Makefile<br/>index d6335f26083b..5a1b31c99eaa 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/cris/arch-v32/boot/compressed/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>arch/cris/arch-v32/boot/compressed/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/cris/arch-v32/boot/compressed/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/cris/arch-v32/boot/compressed/Makefile</a></div><div class='hunk'>@@ -4,7 +4,7 @@</div><div class='ctx'> </div><div class='ctx'> asflags-y += -I $(srctree)/include/asm/mach/ -I $(srctree)/include/asm/arch</div><div class='ctx'> ccflags-y += -O2 -I $(srctree)/include/asm/mach/ -I $(srctree)/include/asm/arch</div><div class='del'>-ldflags-y += -T $(srctree)/$(obj)/decompress.ld</div><div class='add'>+ldflags-y += -T $(srctree)/$(src)/decompress.lds</div><div class='ctx'> OBJECTS = $(obj)/head.o $(obj)/misc.o</div><div class='ctx'> OBJCOPYFLAGS = -O binary --remove-section=.bss</div><div class='ctx'> </div><div class='head'>diff --git a/arch/cris/arch-v32/boot/compressed/decompress.ld b/arch/cris/arch-v32/boot/compressed/decompress.lds<br/>index 3c837feca3ac..3c837feca3ac 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/cris/arch-v32/boot/compressed/decompress.ld?id=c15895ef30c2c03e99802951787183039a349d32'>arch/cris/arch-v32/boot/compressed/decompress.ld</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/cris/arch-v32/boot/compressed/decompress.lds?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/cris/arch-v32/boot/compressed/decompress.lds</a></div><div class='head'>diff --git a/arch/cris/arch-v32/boot/rescue/Makefile b/arch/cris/arch-v32/boot/rescue/Makefile<br/>index 44ae0ad61f90..566aac663a38 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/cris/arch-v32/boot/rescue/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>arch/cris/arch-v32/boot/rescue/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/cris/arch-v32/boot/rescue/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/cris/arch-v32/boot/rescue/Makefile</a></div><div class='hunk'>@@ -7,7 +7,7 @@ ccflags-y += -O2 -I $(srctree)/include/asm/arch/mach/ \</div><div class='ctx'> 		-I $(srctree)/include/asm/arch</div><div class='ctx'> asflags-y += -I $(srctree)/include/asm/arch/mach/ -I $(srctree)/include/asm/arch</div><div class='ctx'> LD = gcc-cris -mlinux -march=v32 -nostdlib</div><div class='del'>-ldflags-y += -T $(srctree)/$(obj)/rescue.ld</div><div class='add'>+ldflags-y += -T $(srctree)/$(src)/rescue.lds</div><div class='ctx'> LDPOSTFLAGS = -lgcc</div><div class='ctx'> OBJCOPYFLAGS = -O binary --remove-section=.bss</div><div class='ctx'> obj-$(CONFIG_ETRAX_AXISFLASHMAP) = head.o</div><div class='head'>diff --git a/arch/cris/arch-v32/boot/rescue/rescue.ld b/arch/cris/arch-v32/boot/rescue/rescue.lds<br/>index 8ac646bc1a2b..8ac646bc1a2b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/cris/arch-v32/boot/rescue/rescue.ld?id=c15895ef30c2c03e99802951787183039a349d32'>arch/cris/arch-v32/boot/rescue/rescue.ld</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/cris/arch-v32/boot/rescue/rescue.lds?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/cris/arch-v32/boot/rescue/rescue.lds</a></div><div class='head'>diff --git a/arch/cris/arch-v32/kernel/smp.c b/arch/cris/arch-v32/kernel/smp.c<br/>index 952a24b2f5a9..52e16c6436f9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/cris/arch-v32/kernel/smp.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/cris/arch-v32/kernel/smp.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/cris/arch-v32/kernel/smp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/cris/arch-v32/kernel/smp.c</a></div><div class='hunk'>@@ -178,6 +178,7 @@ void __init smp_callin(void)</div><div class='ctx'> 	unmask_irq(IPI_INTR_VECT);</div><div class='ctx'> 	unmask_irq(TIMER0_INTR_VECT);</div><div class='ctx'> 	preempt_disable();</div><div class='add'>+	notify_cpu_starting(cpu);</div><div class='ctx'> 	local_irq_enable();</div><div class='ctx'> </div><div class='ctx'> 	cpu_set(cpu, cpu_online_map);</div><div class='head'>diff --git a/arch/cris/arch-v32/mach-a3/cpufreq.c b/arch/cris/arch-v32/mach-a3/cpufreq.c<br/>index 8e5a3cab8ad7..ee391ecb5bc9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/cris/arch-v32/mach-a3/cpufreq.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/cris/arch-v32/mach-a3/cpufreq.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/cris/arch-v32/mach-a3/cpufreq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/cris/arch-v32/mach-a3/cpufreq.c</a></div><div class='hunk'>@@ -85,7 +85,6 @@ static int cris_freq_cpu_init(struct cpufreq_policy *policy)</div><div class='ctx'> 	int result;</div><div class='ctx'> </div><div class='ctx'> 	/* cpuinfo and default policy values */</div><div class='del'>-	policy-&gt;governor = CPUFREQ_DEFAULT_GOVERNOR;</div><div class='ctx'> 	policy-&gt;cpuinfo.transition_latency = 1000000; /* 1ms */</div><div class='ctx'> 	policy-&gt;cur = cris_freq_get_cpu_frequency(0);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/cris/arch-v32/mach-fs/cpufreq.c b/arch/cris/arch-v32/mach-fs/cpufreq.c<br/>index d57631c0d8d1..58bd71e5bda9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/cris/arch-v32/mach-fs/cpufreq.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/cris/arch-v32/mach-fs/cpufreq.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/cris/arch-v32/mach-fs/cpufreq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/cris/arch-v32/mach-fs/cpufreq.c</a></div><div class='hunk'>@@ -81,7 +81,6 @@ static int cris_freq_cpu_init(struct cpufreq_policy *policy)</div><div class='ctx'> 	int result;</div><div class='ctx'> </div><div class='ctx'> 	/* cpuinfo and default policy values */</div><div class='del'>-	policy-&gt;governor = CPUFREQ_DEFAULT_GOVERNOR;</div><div class='ctx'> 	policy-&gt;cpuinfo.transition_latency = 1000000;	/* 1ms */</div><div class='ctx'> 	policy-&gt;cur = cris_freq_get_cpu_frequency(0);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/cris/artpec_3_defconfig b/arch/cris/configs/artpec_3_defconfig<br/>index 41fe67409aab..41fe67409aab 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/cris/artpec_3_defconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/cris/artpec_3_defconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/cris/configs/artpec_3_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/cris/configs/artpec_3_defconfig</a></div><div class='head'>diff --git a/arch/cris/arch-v10/defconfig b/arch/cris/configs/etrax-100lx_defconfig<br/>index 572f11926399..572f11926399 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/cris/arch-v10/defconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/cris/arch-v10/defconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/cris/configs/etrax-100lx_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/cris/configs/etrax-100lx_defconfig</a></div><div class='head'>diff --git a/arch/cris/defconfig b/arch/cris/configs/etrax-100lx_v2_defconfig<br/>index 59f36a58f842..59f36a58f842 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/cris/defconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/cris/defconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/cris/configs/etrax-100lx_v2_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/cris/configs/etrax-100lx_v2_defconfig</a></div><div class='head'>diff --git a/arch/cris/etraxfs_defconfig b/arch/cris/configs/etraxfs_defconfig<br/>index 73c646a37255..73c646a37255 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/cris/etraxfs_defconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/cris/etraxfs_defconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/cris/configs/etraxfs_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/cris/configs/etraxfs_defconfig</a></div><div class='head'>diff --git a/arch/frv/kernel/pm.c b/arch/frv/kernel/pm.c<br/>index d1113c5031f5..be722fc1acff 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/frv/kernel/pm.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/frv/kernel/pm.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/frv/kernel/pm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/frv/kernel/pm.c</a></div><div class='hunk'>@@ -211,7 +211,7 @@ static int cmode_procctl(ctl_table *ctl, int write, struct file *filp,</div><div class='ctx'> 	return try_set_cmode(new_cmode)?:*lenp;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cmode_sysctl(ctl_table *table, int __user *name, int nlen,</div><div class='add'>+static int cmode_sysctl(ctl_table *table,</div><div class='ctx'> 			void __user *oldval, size_t __user *oldlenp,</div><div class='ctx'> 			void __user *newval, size_t newlen)</div><div class='ctx'> {</div><div class='hunk'>@@ -314,7 +314,7 @@ static int p0_procctl(ctl_table *ctl, int write, struct file *filp,</div><div class='ctx'> 	return try_set_p0(new_p0)?:*lenp;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int p0_sysctl(ctl_table *table, int __user *name, int nlen,</div><div class='add'>+static int p0_sysctl(ctl_table *table,</div><div class='ctx'> 		     void __user *oldval, size_t __user *oldlenp,</div><div class='ctx'> 		     void __user *newval, size_t newlen)</div><div class='ctx'> {</div><div class='hunk'>@@ -358,7 +358,7 @@ static int cm_procctl(ctl_table *ctl, int write, struct file *filp,</div><div class='ctx'> 	return try_set_cm(new_cm)?:*lenp;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cm_sysctl(ctl_table *table, int __user *name, int nlen,</div><div class='add'>+static int cm_sysctl(ctl_table *table,</div><div class='ctx'> 		     void __user *oldval, size_t __user *oldlenp,</div><div class='ctx'> 		     void __user *newval, size_t newlen)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/frv/mb93090-mb00/pci-dma-nommu.c b/arch/frv/mb93090-mb00/pci-dma-nommu.c<br/>index 64ee58d748be..52ff9aec799d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/frv/mb93090-mb00/pci-dma-nommu.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/frv/mb93090-mb00/pci-dma-nommu.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/frv/mb93090-mb00/pci-dma-nommu.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/frv/mb93090-mb00/pci-dma-nommu.c</a></div><div class='hunk'>@@ -111,7 +111,7 @@ EXPORT_SYMBOL(dma_free_coherent);</div><div class='ctx'>  * The 32-bit bus address to use is returned.</div><div class='ctx'>  *</div><div class='ctx'>  * Once the device is given the dma address, the device owns this memory</div><div class='del'>- * until either pci_unmap_single or pci_dma_sync_single is performed.</div><div class='add'>+ * until either dma_unmap_single or pci_dma_sync_single is performed.</div><div class='ctx'>  */</div><div class='ctx'> dma_addr_t dma_map_single(struct device *dev, void *ptr, size_t size,</div><div class='ctx'> 			  enum dma_data_direction direction)</div><div class='hunk'>@@ -129,7 +129,7 @@ EXPORT_SYMBOL(dma_map_single);</div><div class='ctx'> /*</div><div class='ctx'>  * Map a set of buffers described by scatterlist in streaming</div><div class='ctx'>  * mode for DMA.  This is the scather-gather version of the</div><div class='del'>- * above pci_map_single interface.  Here the scatter gather list</div><div class='add'>+ * above dma_map_single interface.  Here the scatter gather list</div><div class='ctx'>  * elements are each tagged with the appropriate dma address</div><div class='ctx'>  * and length.  They are obtained via sg_dma_{address,length}(SG).</div><div class='ctx'>  *</div><div class='hunk'>@@ -139,7 +139,7 @@ EXPORT_SYMBOL(dma_map_single);</div><div class='ctx'>  *       The routine returns the number of addr/length pairs actually</div><div class='ctx'>  *       used, at most nents.</div><div class='ctx'>  *</div><div class='del'>- * Device ownership issues as mentioned above for pci_map_single are</div><div class='add'>+ * Device ownership issues as mentioned above for dma_map_single are</div><div class='ctx'>  * the same here.</div><div class='ctx'>  */</div><div class='ctx'> int dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,</div><div class='hunk'>@@ -158,3 +158,20 @@ int dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(dma_map_sg);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Map a single page of the indicated size for DMA in streaming mode.</div><div class='add'>+ * The 32-bit bus address to use is returned.</div><div class='add'>+ *</div><div class='add'>+ * Device ownership issues as mentioned above for dma_map_single are</div><div class='add'>+ * the same here.</div><div class='add'>+ */</div><div class='add'>+dma_addr_t dma_map_page(struct device *dev, struct page *page, unsigned long offset,</div><div class='add'>+			size_t size, enum dma_data_direction direction)</div><div class='add'>+{</div><div class='add'>+	BUG_ON(direction == DMA_NONE);</div><div class='add'>+	flush_dcache_page(page);</div><div class='add'>+	return (dma_addr_t) page_to_phys(page) + offset;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL(dma_map_page);</div><div class='head'>diff --git a/arch/frv/mb93090-mb00/pci-dma.c b/arch/frv/mb93090-mb00/pci-dma.c<br/>index 662f7b12d005..3ddedebc4eb3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/frv/mb93090-mb00/pci-dma.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/frv/mb93090-mb00/pci-dma.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/frv/mb93090-mb00/pci-dma.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/frv/mb93090-mb00/pci-dma.c</a></div><div class='hunk'>@@ -61,7 +61,7 @@ EXPORT_SYMBOL(dma_map_single);</div><div class='ctx'> /*</div><div class='ctx'>  * Map a set of buffers described by scatterlist in streaming</div><div class='ctx'>  * mode for DMA.  This is the scather-gather version of the</div><div class='del'>- * above pci_map_single interface.  Here the scatter gather list</div><div class='add'>+ * above dma_map_single interface.  Here the scatter gather list</div><div class='ctx'>  * elements are each tagged with the appropriate dma address</div><div class='ctx'>  * and length.  They are obtained via sg_dma_{address,length}(SG).</div><div class='ctx'>  *</div><div class='hunk'>@@ -71,7 +71,7 @@ EXPORT_SYMBOL(dma_map_single);</div><div class='ctx'>  *       The routine returns the number of addr/length pairs actually</div><div class='ctx'>  *       used, at most nents.</div><div class='ctx'>  *</div><div class='del'>- * Device ownership issues as mentioned above for pci_map_single are</div><div class='add'>+ * Device ownership issues as mentioned above for dma_map_single are</div><div class='ctx'>  * the same here.</div><div class='ctx'>  */</div><div class='ctx'> int dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,</div><div class='hunk'>@@ -105,6 +105,13 @@ int dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(dma_map_sg);</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Map a single page of the indicated size for DMA in streaming mode.</div><div class='add'>+ * The 32-bit bus address to use is returned.</div><div class='add'>+ *</div><div class='add'>+ * Device ownership issues as mentioned above for dma_map_single are</div><div class='add'>+ * the same here.</div><div class='add'>+ */</div><div class='ctx'> dma_addr_t dma_map_page(struct device *dev, struct page *page, unsigned long offset,</div><div class='ctx'> 			size_t size, enum dma_data_direction direction)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/frv/mb93090-mb00/pci-frv.c b/arch/frv/mb93090-mb00/pci-frv.c<br/>index edae117fcc2b..43d67534c712 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/frv/mb93090-mb00/pci-frv.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/frv/mb93090-mb00/pci-frv.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/frv/mb93090-mb00/pci-frv.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/frv/mb93090-mb00/pci-frv.c</a></div><div class='hunk'>@@ -201,38 +201,6 @@ void __init pcibios_resource_survey(void)</div><div class='ctx'> 	pcibios_assign_resources();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int pcibios_enable_resources(struct pci_dev *dev, int mask)</div><div class='del'>-{</div><div class='del'>-	u16 cmd, old_cmd;</div><div class='del'>-	int idx;</div><div class='del'>-	struct resource *r;</div><div class='del'>-</div><div class='del'>-	pci_read_config_word(dev, PCI_COMMAND, &amp;cmd);</div><div class='del'>-	old_cmd = cmd;</div><div class='del'>-	for(idx=0; idx&lt;6; idx++) {</div><div class='del'>-		/* Only set up the requested stuff */</div><div class='del'>-		if (!(mask &amp; (1&lt;&lt;idx)))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		r = &amp;dev-&gt;resource[idx];</div><div class='del'>-		if (!r-&gt;start &amp;&amp; r-&gt;end) {</div><div class='del'>-			printk(KERN_ERR "PCI: Device %s not available because of resource collisions\n", pci_name(dev));</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-		if (r-&gt;flags &amp; IORESOURCE_IO)</div><div class='del'>-			cmd |= PCI_COMMAND_IO;</div><div class='del'>-		if (r-&gt;flags &amp; IORESOURCE_MEM)</div><div class='del'>-			cmd |= PCI_COMMAND_MEMORY;</div><div class='del'>-	}</div><div class='del'>-	if (dev-&gt;resource[PCI_ROM_RESOURCE].start)</div><div class='del'>-		cmd |= PCI_COMMAND_MEMORY;</div><div class='del'>-	if (cmd != old_cmd) {</div><div class='del'>-		printk("PCI: Enabling device %s (%04x -&gt; %04x)\n", pci_name(dev), old_cmd, cmd);</div><div class='del'>-		pci_write_config_word(dev, PCI_COMMAND, cmd);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  *  If we set up a device for bus mastering, we need to check the latency</div><div class='ctx'>  *  timer as certain crappy BIOSes forget to set it properly.</div><div class='head'>diff --git a/arch/frv/mb93090-mb00/pci-frv.h b/arch/frv/mb93090-mb00/pci-frv.h<br/>index 0c7bf39dc729..f3fe55914793 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/frv/mb93090-mb00/pci-frv.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/frv/mb93090-mb00/pci-frv.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/frv/mb93090-mb00/pci-frv.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/frv/mb93090-mb00/pci-frv.h</a></div><div class='hunk'>@@ -29,7 +29,6 @@ extern unsigned int __nongpreldata pci_probe;</div><div class='ctx'> extern unsigned int pcibios_max_latency;</div><div class='ctx'> </div><div class='ctx'> void pcibios_resource_survey(void);</div><div class='del'>-int pcibios_enable_resources(struct pci_dev *, int);</div><div class='ctx'> </div><div class='ctx'> /* pci-vdk.c */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/frv/mb93090-mb00/pci-vdk.c b/arch/frv/mb93090-mb00/pci-vdk.c<br/>index f003cfa68b7a..0f41c3a72da5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/frv/mb93090-mb00/pci-vdk.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/frv/mb93090-mb00/pci-vdk.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/frv/mb93090-mb00/pci-vdk.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/frv/mb93090-mb00/pci-vdk.c</a></div><div class='hunk'>@@ -412,7 +412,7 @@ int pcibios_enable_device(struct pci_dev *dev, int mask)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if ((err = pcibios_enable_resources(dev, mask)) &lt; 0)</div><div class='add'>+	if ((err = pci_enable_resources(dev, mask)) &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	if (!dev-&gt;msi_enabled)</div><div class='ctx'> 		pcibios_enable_irq(dev);</div><div class='head'>diff --git a/arch/frv/mm/init.c b/arch/frv/mm/init.c<br/>index 1b851db34186..0708284f85fb 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/frv/mm/init.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/frv/mm/init.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/frv/mm/init.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/frv/mm/init.c</a></div><div class='hunk'>@@ -87,8 +87,6 @@ void __init paging_init(void)</div><div class='ctx'> </div><div class='ctx'> 		pkmap_page_table = alloc_bootmem_pages(PAGE_SIZE);</div><div class='ctx'> </div><div class='del'>-		memset(pkmap_page_table, 0, PAGE_SIZE);</div><div class='del'>-</div><div class='ctx'> 		pge = swapper_pg_dir + pgd_index_k(PKMAP_BASE);</div><div class='ctx'> 		pue = pud_offset(pge, PKMAP_BASE);</div><div class='ctx'> 		pme = pmd_offset(pue, PKMAP_BASE);</div><div class='head'>diff --git a/arch/h8300/Kconfig b/arch/h8300/Kconfig<br/>index 2b413325e885..7789c3d82d3c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/h8300/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/h8300/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/h8300/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/h8300/Kconfig</a></div><div class='hunk'>@@ -62,13 +62,14 @@ config GENERIC_TIME</div><div class='ctx'> 	bool</div><div class='ctx'> 	default y</div><div class='ctx'> </div><div class='add'>+config GENERIC_BUG</div><div class='add'>+        bool</div><div class='add'>+        depends on BUG</div><div class='add'>+</div><div class='ctx'> config TIME_LOW_RES</div><div class='ctx'> 	bool</div><div class='ctx'> 	default y</div><div class='ctx'> </div><div class='del'>-config ARCH_SUPPORTS_AOUT</div><div class='del'>-	def_bool y</div><div class='del'>-</div><div class='ctx'> config NO_IOPORT</div><div class='ctx'> 	def_bool y</div><div class='ctx'> </div><div class='head'>diff --git a/arch/h8300/Kconfig.cpu b/arch/h8300/Kconfig.cpu<br/>index 582797db9603..b65dcfe51d9c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/h8300/Kconfig.cpu?id=c15895ef30c2c03e99802951787183039a349d32'>arch/h8300/Kconfig.cpu</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/h8300/Kconfig.cpu?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/h8300/Kconfig.cpu</a></div><div class='hunk'>@@ -1,5 +1,7 @@</div><div class='ctx'> menu "Processor type and features"</div><div class='ctx'> </div><div class='add'>+source "kernel/time/Kconfig"</div><div class='add'>+</div><div class='ctx'> choice</div><div class='ctx'> 	prompt "H8/300 platform"</div><div class='ctx'> 	default H8300H_GENERIC</div><div class='hunk'>@@ -11,6 +13,7 @@ config H8300H_GENERIC</div><div class='ctx'> </div><div class='ctx'> config H8300H_AKI3068NET</div><div class='ctx'> 	bool "AE-3068/69"</div><div class='add'>+	select CONFIG_H83068</div><div class='ctx'> 	help</div><div class='ctx'> 	  AKI-H8/3068F / AKI-H8/3069F Flashmicom LAN Board Support</div><div class='ctx'> 	  More Information. (Japanese Only)</div><div class='hunk'>@@ -21,6 +24,7 @@ config H8300H_AKI3068NET</div><div class='ctx'> </div><div class='ctx'> config H8300H_H8MAX</div><div class='ctx'> 	bool "H8MAX"</div><div class='add'>+	select CONFIG_H83068</div><div class='ctx'> 	help</div><div class='ctx'> 	  H8MAX Evaluation Board Support</div><div class='ctx'> 	  More Information. (Japanese Only)</div><div class='hunk'>@@ -28,6 +32,7 @@ config H8300H_H8MAX</div><div class='ctx'> </div><div class='ctx'> config H8300H_SIM</div><div class='ctx'> 	bool "H8/300H Simulator"</div><div class='add'>+	select CONFIG_H83007</div><div class='ctx'> 	help</div><div class='ctx'> 	  GDB Simulator Support</div><div class='ctx'> 	  More Information.</div><div class='hunk'>@@ -40,6 +45,7 @@ config H8S_GENERIC</div><div class='ctx'> </div><div class='ctx'> config H8S_EDOSK2674</div><div class='ctx'> 	bool "EDOSK-2674"</div><div class='add'>+	select CONFIG_H8S2768</div><div class='ctx'> 	help</div><div class='ctx'> 	  Renesas EDOSK-2674 Evaluation Board Support</div><div class='ctx'> 	  More Information.</div><div class='hunk'>@@ -55,44 +61,37 @@ config H8S_SIM</div><div class='ctx'> </div><div class='ctx'> endchoice</div><div class='ctx'> </div><div class='del'>-if (H8300H_GENERIC || H8S_GENERIC)</div><div class='del'>-menu "Detail Selection"</div><div class='del'>-if (H8300H_GENERIC)</div><div class='ctx'> choice</div><div class='ctx'> 	prompt "CPU Selection"</div><div class='ctx'> </div><div class='ctx'> config H83002</div><div class='ctx'> 	bool "H8/3001,3002,3003"</div><div class='add'>+	select CPU_H8300H</div><div class='ctx'> </div><div class='ctx'> config H83007</div><div class='ctx'> 	bool "H8/3006,3007"</div><div class='add'>+	select CPU_H8300H</div><div class='ctx'> </div><div class='ctx'> config H83048</div><div class='ctx'> 	bool "H8/3044,3045,3046,3047,3048,3052"</div><div class='add'>+	select CPU_H8300H</div><div class='ctx'> </div><div class='ctx'> config H83068</div><div class='ctx'> 	bool "H8/3065,3066,3067,3068,3069"</div><div class='del'>-endchoice</div><div class='del'>-endif</div><div class='del'>-</div><div class='del'>-if (H8S_GENERIC)</div><div class='del'>-choice</div><div class='del'>-	prompt "CPU Selection"</div><div class='add'>+	select CPU_H8300H</div><div class='ctx'> </div><div class='ctx'> config H8S2678</div><div class='ctx'> 	bool "H8S/2670,2673,2674R,2675,2676"</div><div class='add'>+	select CPU_H8S</div><div class='add'>+</div><div class='ctx'> endchoice</div><div class='del'>-endif</div><div class='ctx'> </div><div class='ctx'> config CPU_CLOCK</div><div class='ctx'> 	int "CPU Clock Frequency (/1KHz)"</div><div class='ctx'> 	default "20000"</div><div class='ctx'> 	help</div><div class='ctx'> 	  CPU Clock Frequency divide to 1000</div><div class='del'>-endmenu</div><div class='del'>-endif</div><div class='ctx'> </div><div class='del'>-if (H8300H_GENERIC || H8S_GENERIC || H8300H_SIM || H8S_SIM || H8S_EDOSK2674)</div><div class='ctx'> choice</div><div class='ctx'> 	prompt "Kernel executes from"</div><div class='ctx'> 	---help---</div><div class='hunk'>@@ -107,75 +106,61 @@ config ROMKERNEL</div><div class='ctx'> 	bool "ROM"</div><div class='ctx'> 	help</div><div class='ctx'> 	  The kernel will be resident in FLASH/ROM when running.</div><div class='del'>-</div><div class='ctx'> endchoice</div><div class='del'>-endif</div><div class='ctx'> </div><div class='del'>-if (H8300H_AKI3068NET)</div><div class='del'>-config H83068</div><div class='del'>-	bool</div><div class='del'>-	default y</div><div class='ctx'> </div><div class='del'>-config CPU_CLOCK</div><div class='del'>-	int</div><div class='del'>-	default "20000"</div><div class='del'>-</div><div class='del'>-config RAMKERNEL</div><div class='add'>+config CPU_H8300H</div><div class='ctx'> 	bool</div><div class='add'>+	depends on (H83002 || H83007 || H83048 || H83068)</div><div class='ctx'> 	default y</div><div class='del'>-endif</div><div class='ctx'> </div><div class='del'>-if (H8300H_H8MAX)</div><div class='del'>-config H83068</div><div class='add'>+config CPU_H8S</div><div class='ctx'> 	bool</div><div class='add'>+	depends on H8S2678</div><div class='ctx'> 	default y</div><div class='ctx'> </div><div class='del'>-config CPU_CLOCK</div><div class='del'>-	int</div><div class='del'>-	default 25000</div><div class='add'>+choice</div><div class='add'>+	prompt "Timer"</div><div class='add'>+config H8300_TIMER8</div><div class='add'>+	bool "8bit timer (2ch cascade)"</div><div class='add'>+	depends on (H83007 || H83068 || H8S2678)</div><div class='ctx'> </div><div class='del'>-config RAMKERNEL</div><div class='del'>-	bool</div><div class='del'>-	default y</div><div class='del'>-endif</div><div class='add'>+config H8300_TIMER16</div><div class='add'>+	bool "16bit timer"</div><div class='add'>+	depends on (H83007 || H83068)</div><div class='ctx'> </div><div class='del'>-if (H8300H_SIM)</div><div class='del'>-config H83007</div><div class='del'>-	bool</div><div class='del'>-	default y</div><div class='add'>+config H8300_ITU</div><div class='add'>+	bool "ITU"</div><div class='add'>+	depends on (H83002 || H83048)</div><div class='ctx'> </div><div class='del'>-config CPU_CLOCK</div><div class='del'>-	int</div><div class='del'>-	default "16000"</div><div class='del'>-endif</div><div class='add'>+config H8300_TPU</div><div class='add'>+	bool "TPU"</div><div class='add'>+	depends on H8S2678</div><div class='add'>+endchoice</div><div class='ctx'> </div><div class='del'>-if (H8S_EDOSK2674)</div><div class='del'>-config H8S2678</div><div class='del'>-	bool</div><div class='del'>-	default y</div><div class='del'>-config CPU_CLOCK</div><div class='del'>-	int</div><div class='del'>-	default 33000</div><div class='add'>+if H8300_TIMER8</div><div class='add'>+choice</div><div class='add'>+	prompt "Timer Channel"</div><div class='add'>+config H8300_TIMER8_CH0</div><div class='add'>+	bool "Channel 0"</div><div class='add'>+config H8300_TIMER8_CH2</div><div class='add'>+	bool "Channel 2"</div><div class='add'>+	depends on CPU_H8300H</div><div class='add'>+endchoice</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='del'>-if (H8S_SIM)</div><div class='del'>-config H8S2678</div><div class='del'>-	bool</div><div class='del'>-	default y</div><div class='del'>-config CPU_CLOCK</div><div class='del'>-	int</div><div class='del'>-	default 33000</div><div class='del'>-endif</div><div class='add'>+config H8300_TIMER16_CH</div><div class='add'>+	int "16bit timer channel (0 - 2)"</div><div class='add'>+	depends on H8300_TIMER16</div><div class='add'>+	range 0 2</div><div class='ctx'> </div><div class='del'>-config CPU_H8300H</div><div class='del'>-	bool</div><div class='del'>-	depends on (H83002 || H83007 || H83048 || H83068)</div><div class='del'>-	default y</div><div class='add'>+config H8300_ITU_CH</div><div class='add'>+	int "ITU channel"</div><div class='add'>+	depends on H8300_ITU</div><div class='ctx'> </div><div class='del'>-config CPU_H8S</div><div class='del'>-	bool</div><div class='del'>-	depends on H8S2678</div><div class='del'>-	default y</div><div class='add'>+config H8300_TPU_CH</div><div class='add'>+	int "TPU channel"</div><div class='add'>+	depends on H8300_TPU</div><div class='ctx'> </div><div class='ctx'> config PREEMPT</div><div class='ctx'> 	bool "Preemptible Kernel"</div><div class='head'>diff --git a/arch/h8300/include/asm/a.out.h b/arch/h8300/include/asm/a.out.h<br/>deleted file mode 100644<br/>index ded780f0a492..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/h8300/include/asm/a.out.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/h8300/include/asm/a.out.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,20 +0,0 @@</div><div class='del'>-#ifndef __H8300_A_OUT_H__</div><div class='del'>-#define __H8300_A_OUT_H__</div><div class='del'>-</div><div class='del'>-struct exec</div><div class='del'>-{</div><div class='del'>-  unsigned long a_info;		/* Use macros N_MAGIC, etc for access */</div><div class='del'>-  unsigned a_text;		/* length of text, in bytes */</div><div class='del'>-  unsigned a_data;		/* length of data, in bytes */</div><div class='del'>-  unsigned a_bss;		/* length of uninitialized data area for file, in bytes */</div><div class='del'>-  unsigned a_syms;		/* length of symbol table data in file, in bytes */</div><div class='del'>-  unsigned a_entry;		/* start address */</div><div class='del'>-  unsigned a_trsize;		/* length of relocation info for text, in bytes */</div><div class='del'>-  unsigned a_drsize;		/* length of relocation info for data, in bytes */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define N_TRSIZE(a)	((a).a_trsize)</div><div class='del'>-#define N_DRSIZE(a)	((a).a_drsize)</div><div class='del'>-#define N_SYMSIZE(a)	((a).a_syms)</div><div class='del'>-</div><div class='del'>-#endif /* __H8300_A_OUT_H__ */</div><div class='head'>diff --git a/arch/h8300/include/asm/bug.h b/arch/h8300/include/asm/bug.h<br/>index edddf5b086e5..887c19773185 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/h8300/include/asm/bug.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/h8300/include/asm/bug.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/h8300/include/asm/bug.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/h8300/include/asm/bug.h</a></div><div class='hunk'>@@ -1,4 +1,8 @@</div><div class='ctx'> #ifndef _H8300_BUG_H</div><div class='ctx'> #define _H8300_BUG_H</div><div class='add'>+</div><div class='add'>+/* always true */</div><div class='add'>+#define is_valid_bugaddr(addr) (1)</div><div class='add'>+</div><div class='ctx'> #include &lt;asm-generic/bug.h&gt;</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/h8300/include/asm/elf.h b/arch/h8300/include/asm/elf.h<br/>index a8b57d1f4128..94e2284c8816 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/h8300/include/asm/elf.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/h8300/include/asm/elf.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/h8300/include/asm/elf.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/h8300/include/asm/elf.h</a></div><div class='hunk'>@@ -55,7 +55,7 @@ typedef unsigned long elf_fpregset_t;</div><div class='ctx'> </div><div class='ctx'> #define ELF_PLATFORM  (NULL)</div><div class='ctx'> </div><div class='del'>-#define SET_PERSONALITY(ex, ibcs2) set_personality(PER_LINUX)</div><div class='add'>+#define SET_PERSONALITY(ex) set_personality(PER_LINUX)</div><div class='ctx'> </div><div class='ctx'> #define R_H8_NONE       0</div><div class='ctx'> #define R_H8_DIR32      1</div><div class='head'>diff --git a/arch/h8300/include/asm/io.h b/arch/h8300/include/asm/io.h<br/>index 26dc6ccd9441..33e842f3284b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/h8300/include/asm/io.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/h8300/include/asm/io.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/h8300/include/asm/io.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/h8300/include/asm/io.h</a></div><div class='hunk'>@@ -295,6 +295,40 @@ static __inline__ void ctrl_outl(unsigned long b, unsigned long addr)</div><div class='ctx'>         *(volatile unsigned long*)addr = b;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static __inline__ void ctrl_bclr(int b, unsigned long addr)</div><div class='add'>+{</div><div class='add'>+	if (__builtin_constant_p(b))</div><div class='add'>+		switch (b) {</div><div class='add'>+		case 0: __asm__("bclr #0,@%0"::"r"(addr)); break;</div><div class='add'>+		case 1: __asm__("bclr #1,@%0"::"r"(addr)); break;</div><div class='add'>+		case 2: __asm__("bclr #2,@%0"::"r"(addr)); break;</div><div class='add'>+		case 3: __asm__("bclr #3,@%0"::"r"(addr)); break;</div><div class='add'>+		case 4: __asm__("bclr #4,@%0"::"r"(addr)); break;</div><div class='add'>+		case 5: __asm__("bclr #5,@%0"::"r"(addr)); break;</div><div class='add'>+		case 6: __asm__("bclr #6,@%0"::"r"(addr)); break;</div><div class='add'>+		case 7: __asm__("bclr #7,@%0"::"r"(addr)); break;</div><div class='add'>+		}</div><div class='add'>+	else</div><div class='add'>+		__asm__("bclr %w0,@%1"::"r"(b), "r"(addr));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __inline__ void ctrl_bset(int b, unsigned long addr)</div><div class='add'>+{</div><div class='add'>+	if (__builtin_constant_p(b))</div><div class='add'>+		switch (b) {</div><div class='add'>+		case 0: __asm__("bset #0,@%0"::"r"(addr)); break;</div><div class='add'>+		case 1: __asm__("bset #1,@%0"::"r"(addr)); break;</div><div class='add'>+		case 2: __asm__("bset #2,@%0"::"r"(addr)); break;</div><div class='add'>+		case 3: __asm__("bset #3,@%0"::"r"(addr)); break;</div><div class='add'>+		case 4: __asm__("bset #4,@%0"::"r"(addr)); break;</div><div class='add'>+		case 5: __asm__("bset #5,@%0"::"r"(addr)); break;</div><div class='add'>+		case 6: __asm__("bset #6,@%0"::"r"(addr)); break;</div><div class='add'>+		case 7: __asm__("bset #7,@%0"::"r"(addr)); break;</div><div class='add'>+		}</div><div class='add'>+	else</div><div class='add'>+		__asm__("bset %w0,@%1"::"r"(b), "r"(addr));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Pages to physical address... */</div><div class='ctx'> #define page_to_phys(page)      ((page - mem_map) &lt;&lt; PAGE_SHIFT)</div><div class='ctx'> #define page_to_bus(page)       ((page - mem_map) &lt;&lt; PAGE_SHIFT)</div><div class='head'>diff --git a/arch/h8300/include/asm/md.h b/arch/h8300/include/asm/md.h<br/>index 1a47dc6691fb..1b7300e0a175 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/h8300/include/asm/md.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/h8300/include/asm/md.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/h8300/include/asm/md.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/h8300/include/asm/md.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* $Id: md.h,v 1.1 2002/11/19 02:09:26 gerg Exp $</div><div class='add'>+/*</div><div class='ctx'>  * md.h: High speed xor_block operation for RAID4/5 </div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='head'>diff --git a/arch/h8300/include/asm/system.h b/arch/h8300/include/asm/system.h<br/>index 4b8e475908ae..d98d97685f06 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/h8300/include/asm/system.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/h8300/include/asm/system.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/h8300/include/asm/system.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/h8300/include/asm/system.h</a></div><div class='hunk'>@@ -155,4 +155,6 @@ static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int siz</div><div class='ctx'> </div><div class='ctx'> #define arch_align_stack(x) (x)</div><div class='ctx'> </div><div class='add'>+void die(char *str, struct pt_regs *fp, unsigned long err);</div><div class='add'>+</div><div class='ctx'> #endif /* _H8300_SYSTEM_H */</div><div class='head'>diff --git a/arch/h8300/kernel/Makefile b/arch/h8300/kernel/Makefile<br/>index 6c248c3c5c3b..8d4d2a54be9e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/h8300/kernel/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>arch/h8300/kernel/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/h8300/kernel/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/h8300/kernel/Makefile</a></div><div class='hunk'>@@ -7,6 +7,6 @@ extra-y := vmlinux.lds</div><div class='ctx'> obj-y := process.o traps.o ptrace.o irq.o \</div><div class='ctx'> 	 sys_h8300.o time.o signal.o \</div><div class='ctx'>          setup.o gpio.o init_task.o syscalls.o \</div><div class='del'>-	 entry.o</div><div class='add'>+	 entry.o timer/</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_MODULES) += module.o h8300_ksyms.o </div><div class='head'>diff --git a/arch/h8300/kernel/module.c b/arch/h8300/kernel/module.c<br/>index 4fd7138a6e03..cfc9127d2ced 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/h8300/kernel/module.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/h8300/kernel/module.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/h8300/kernel/module.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/h8300/kernel/module.c</a></div><div class='hunk'>@@ -114,9 +114,10 @@ int module_finalize(const Elf_Ehdr *hdr,</div><div class='ctx'> 		    const Elf_Shdr *sechdrs,</div><div class='ctx'> 		    struct module *me)</div><div class='ctx'> {</div><div class='del'>-	return 0;</div><div class='add'>+	return module_bug_finalize(hdr, sechdrs, me);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void module_arch_cleanup(struct module *mod)</div><div class='ctx'> {</div><div class='add'>+	module_bug_cleanup(mod);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/h8300/kernel/process.c b/arch/h8300/kernel/process.c<br/>index dfbe7ab9ffe2..a8ef654a5a0b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/h8300/kernel/process.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/h8300/kernel/process.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/h8300/kernel/process.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/h8300/kernel/process.c</a></div><div class='hunk'>@@ -34,7 +34,6 @@</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/user.h&gt;</div><div class='del'>-#include &lt;linux/a.out.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/reboot.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='head'>diff --git a/arch/h8300/kernel/time.c b/arch/h8300/kernel/time.c<br/>index e37c835e67cf..7f2d6cfbb4b6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/h8300/kernel/time.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/h8300/kernel/time.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/h8300/kernel/time.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/h8300/kernel/time.c</a></div><div class='hunk'>@@ -27,27 +27,21 @@</div><div class='ctx'> #include &lt;linux/profile.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/target_time.h&gt;</div><div class='add'>+#include &lt;asm/timer.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define	TICK_SIZE (tick_nsec / 1000)</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * timer_interrupt() needs to keep up the real-time clock,</div><div class='del'>- * as well as call the "do_timer()" routine every clocktick</div><div class='del'>- */</div><div class='del'>-static void timer_interrupt(int irq, void *dummy, struct pt_regs * regs)</div><div class='add'>+void h8300_timer_tick(void)</div><div class='ctx'> {</div><div class='del'>-	/* may need to kick the hardware timer */</div><div class='del'>-	platform_timer_eoi();</div><div class='del'>-</div><div class='add'>+	if (current-&gt;pid)</div><div class='add'>+		profile_tick(CPU_PROFILING);</div><div class='add'>+	write_seqlock(&amp;xtime_lock);</div><div class='ctx'> 	do_timer(1);</div><div class='del'>-#ifndef CONFIG_SMP</div><div class='del'>-	update_process_times(user_mode(regs));</div><div class='del'>-#endif</div><div class='del'>-	profile_tick(CPU_PROFILING);</div><div class='add'>+	write_sequnlock(&amp;xtime_lock);</div><div class='add'>+	update_process_times(user_mode(get_irq_regs()));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void time_init(void)</div><div class='add'>+void __init time_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int year, mon, day, hour, min, sec;</div><div class='ctx'> </div><div class='hunk'>@@ -57,12 +51,13 @@ void time_init(void)</div><div class='ctx'> 	year = 1980;</div><div class='ctx'> 	mon = day = 1;</div><div class='ctx'> 	hour = min = sec = 0;</div><div class='del'>-	platform_gettod (&amp;year, &amp;mon, &amp;day, &amp;hour, &amp;min, &amp;sec);</div><div class='del'>-</div><div class='add'>+#ifdef CONFIG_H8300_GETTOD</div><div class='add'>+	h8300_gettod (&amp;year, &amp;mon, &amp;day, &amp;hour, &amp;min, &amp;sec);</div><div class='add'>+#endif</div><div class='ctx'> 	if ((year += 1900) &lt; 1970)</div><div class='ctx'> 		year += 100;</div><div class='ctx'> 	xtime.tv_sec = mktime(year, mon, day, hour, min, sec);</div><div class='ctx'> 	xtime.tv_nsec = 0;</div><div class='ctx'> </div><div class='del'>-	platform_timer_setup(timer_interrupt);</div><div class='add'>+	h8300_timer_setup();</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/h8300/kernel/timer/Makefile b/arch/h8300/kernel/timer/Makefile<br/>new file mode 100644<br/>index 000000000000..bef0510ea6ad<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/h8300/kernel/timer/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/h8300/kernel/timer/Makefile</a></div><div class='hunk'>@@ -0,0 +1,6 @@</div><div class='add'>+# h8300 internal timer handler</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_H8300_TIMER8)  := timer8.o</div><div class='add'>+obj-$(CONFIG_H8300_TIMER16) := timer16.o</div><div class='add'>+obj-$(CONFIG_H8300_ITU)     := itu.o</div><div class='add'>+obj-$(CONFIG_H8300_TPU)     := tpu.o</div><div class='head'>diff --git a/arch/h8300/kernel/timer/itu.c b/arch/h8300/kernel/timer/itu.c<br/>new file mode 100644<br/>index 000000000000..d1c926596b08<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/h8300/kernel/timer/itu.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/h8300/kernel/timer/itu.c</a></div><div class='hunk'>@@ -0,0 +1,83 @@</div><div class='add'>+/*</div><div class='add'>+ *  linux/arch/h8300/kernel/timer/itu.c</div><div class='add'>+ *</div><div class='add'>+ *  Yoshinori Sato &lt;ysato@users.sourcefoge.jp&gt;</div><div class='add'>+ *</div><div class='add'>+ *  ITU Timer Handler</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/param.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/timex.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/segment.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/irq.h&gt;</div><div class='add'>+#include &lt;asm/regs306x.h&gt;</div><div class='add'>+</div><div class='add'>+#if CONFIG_H8300_ITU_CH == 0</div><div class='add'>+#define ITUBASE	0xffff64</div><div class='add'>+#define ITUIRQ	24</div><div class='add'>+#elif CONFIG_H8300_ITU_CH == 1</div><div class='add'>+#define ITUBASE	0xffff6e</div><div class='add'>+#define ITUIRQ	28</div><div class='add'>+#elif CONFIG_H8300_ITU_CH == 2</div><div class='add'>+#define ITUBASE	0xffff78</div><div class='add'>+#define ITUIRQ	32</div><div class='add'>+#elif CONFIG_H8300_ITU_CH == 3</div><div class='add'>+#define ITUBASE	0xffff82</div><div class='add'>+#define ITUIRQ	36</div><div class='add'>+#elif CONFIG_H8300_ITU_CH == 4</div><div class='add'>+#define ITUBASE	0xffff92</div><div class='add'>+#define ITUIRQ	40</div><div class='add'>+#else</div><div class='add'>+#error Unknown timer channel.</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define TCR	0</div><div class='add'>+#define TIOR	1</div><div class='add'>+#define TIER	2</div><div class='add'>+#define TSR	3</div><div class='add'>+#define TCNT	4</div><div class='add'>+#define GRA	6</div><div class='add'>+#define GRB	8</div><div class='add'>+</div><div class='add'>+static irqreturn_t timer_interrupt(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	h8300_timer_tick();</div><div class='add'>+	ctrl_bclr(IMFA, ITUBASE + TSR);</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct irqaction itu_irq = {</div><div class='add'>+	.name		= "itu",</div><div class='add'>+	.handler	= timer_interrupt,</div><div class='add'>+	.flags		= IRQF_DISABLED | IRQF_TIMER,</div><div class='add'>+	.mask		= CPU_MASK_NONE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const int __initdata divide_rate[] = {1, 2, 4, 8};</div><div class='add'>+</div><div class='add'>+void __init h8300_timer_setup(void)</div><div class='add'>+{</div><div class='add'>+	unsigned int div;</div><div class='add'>+	unsigned int cnt;</div><div class='add'>+</div><div class='add'>+	calc_param(cnt, div, divide_rate, 0x10000);</div><div class='add'>+</div><div class='add'>+	setup_irq(ITUIRQ, &amp;itu_irq);</div><div class='add'>+</div><div class='add'>+	/* initalize timer */</div><div class='add'>+	ctrl_outb(0, TSTR);</div><div class='add'>+	ctrl_outb(CCLR0 | div, ITUBASE + TCR);</div><div class='add'>+	ctrl_outb(0x01, ITUBASE + TIER);</div><div class='add'>+	ctrl_outw(cnt, ITUBASE + GRA);</div><div class='add'>+	ctrl_bset(CONFIG_H8300_ITU_CH, TSTR);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/h8300/kernel/timer/timer16.c b/arch/h8300/kernel/timer/timer16.c<br/>new file mode 100644<br/>index 000000000000..e14271b72119<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/h8300/kernel/timer/timer16.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/h8300/kernel/timer/timer16.c</a></div><div class='hunk'>@@ -0,0 +1,78 @@</div><div class='add'>+/*</div><div class='add'>+ *  linux/arch/h8300/kernel/timer/timer16.c</div><div class='add'>+ *</div><div class='add'>+ *  Yoshinori Sato &lt;ysato@users.sourcefoge.jp&gt;</div><div class='add'>+ *</div><div class='add'>+ *  16bit Timer Handler</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/param.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/timex.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/segment.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/irq.h&gt;</div><div class='add'>+#include &lt;asm/regs306x.h&gt;</div><div class='add'>+</div><div class='add'>+/* 16bit timer */</div><div class='add'>+#if CONFIG_H8300_TIMER16_CH == 0</div><div class='add'>+#define _16BASE	0xffff78</div><div class='add'>+#define _16IRQ	24</div><div class='add'>+#elif CONFIG_H8300_TIMER16_CH == 1</div><div class='add'>+#define _16BASE	0xffff80</div><div class='add'>+#define _16IRQ	28</div><div class='add'>+#elif CONFIG_H8300_TIMER16_CH == 2</div><div class='add'>+#define _16BASE	0xffff88</div><div class='add'>+#define _16IRQ	32</div><div class='add'>+#else</div><div class='add'>+#error Unknown timer channel.</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define TCR	0</div><div class='add'>+#define TIOR	1</div><div class='add'>+#define TCNT	2</div><div class='add'>+#define GRA	4</div><div class='add'>+#define GRB	6</div><div class='add'>+</div><div class='add'>+#define H8300_TIMER_FREQ CONFIG_CPU_CLOCK*10000 /* Timer input freq. */</div><div class='add'>+</div><div class='add'>+static irqreturn_t timer_interrupt(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	h8300_timer_tick();</div><div class='add'>+	ctrl_bclr(CONFIG_H8300_TIMER16_CH, TISRA);</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct irqaction timer16_irq = {</div><div class='add'>+	.name		= "timer-16",</div><div class='add'>+	.handler	= timer_interrupt,</div><div class='add'>+	.flags		= IRQF_DISABLED | IRQF_TIMER,</div><div class='add'>+	.mask		= CPU_MASK_NONE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const int __initdata divide_rate[] = {1, 2, 4, 8};</div><div class='add'>+</div><div class='add'>+void __init h8300_timer_setup(void)</div><div class='add'>+{</div><div class='add'>+	unsigned int div;</div><div class='add'>+	unsigned int cnt;</div><div class='add'>+</div><div class='add'>+	calc_param(cnt, div, divide_rate, 0x10000);</div><div class='add'>+</div><div class='add'>+	setup_irq(_16IRQ, &amp;timer16_irq);</div><div class='add'>+</div><div class='add'>+	/* initalize timer */</div><div class='add'>+	ctrl_outb(0, TSTR);</div><div class='add'>+	ctrl_outb(CCLR0 | div, _16BASE + TCR);</div><div class='add'>+	ctrl_outw(cnt, _16BASE + GRA);</div><div class='add'>+	ctrl_bset(4 + CONFIG_H8300_TIMER16_CH, TISRA);</div><div class='add'>+	ctrl_bset(CONFIG_H8300_TIMER16_CH, TSTR);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/h8300/kernel/timer/timer8.c b/arch/h8300/kernel/timer/timer8.c<br/>new file mode 100644<br/>index 000000000000..0556d7c7bea6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/h8300/kernel/timer/timer8.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/h8300/kernel/timer/timer8.c</a></div><div class='hunk'>@@ -0,0 +1,103 @@</div><div class='add'>+/*</div><div class='add'>+ *  linux/arch/h8300/kernel/cpu/timer/timer8.c</div><div class='add'>+ *</div><div class='add'>+ *  Yoshinori Sato &lt;ysato@users.sourcefoge.jp&gt;</div><div class='add'>+ *</div><div class='add'>+ *  8bit Timer Handler</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/param.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/profile.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/irq.h&gt;</div><div class='add'>+#include &lt;asm/timer.h&gt;</div><div class='add'>+#if defined(CONFIG_CPU_H8300H)</div><div class='add'>+#include &lt;asm/regs306x.h&gt;</div><div class='add'>+#endif</div><div class='add'>+#if defined(CONFIG_CPU_H8S)</div><div class='add'>+#include &lt;asm/regs267x.h&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* 8bit timer x2 */</div><div class='add'>+#define CMFA	6</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_H8300_TIMER8_CH0)</div><div class='add'>+#define _8BASE	_8TCR0</div><div class='add'>+#ifdef CONFIG_CPU_H8300H</div><div class='add'>+#define _8IRQ	36</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_CPU_H8S</div><div class='add'>+#define _8IRQ	72</div><div class='add'>+#endif</div><div class='add'>+#elif defined(CONFIG_H8300_TIMER8_CH2)</div><div class='add'>+#ifdef CONFIG_CPU_H8300H</div><div class='add'>+#define _8BASE	_8TCR2</div><div class='add'>+#define _8IRQ	40</div><div class='add'>+#endif</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef _8BASE</div><div class='add'>+#error Unknown timer channel.</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define _8TCR	0</div><div class='add'>+#define _8TCSR	2</div><div class='add'>+#define TCORA	4</div><div class='add'>+#define TCORB	6</div><div class='add'>+#define _8TCNT	8</div><div class='add'>+</div><div class='add'>+#define CMIEA	0x40</div><div class='add'>+#define CCLR_CMA 0x08</div><div class='add'>+#define CKS2	0x04</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * timer_interrupt() needs to keep up the real-time clock,</div><div class='add'>+ * as well as call the "do_timer()" routine every clocktick</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static irqreturn_t timer_interrupt(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	h8300_timer_tick();</div><div class='add'>+	ctrl_bclr(CMFA, _8BASE + _8TCSR);</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct irqaction timer8_irq = {</div><div class='add'>+	.name		= "timer-8",</div><div class='add'>+	.handler	= timer_interrupt,</div><div class='add'>+	.flags		= IRQF_DISABLED | IRQF_TIMER,</div><div class='add'>+	.mask		= CPU_MASK_NONE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const int __initdata divide_rate[] = {8, 64, 8192};</div><div class='add'>+</div><div class='add'>+void __init h8300_timer_setup(void)</div><div class='add'>+{</div><div class='add'>+	unsigned int div;</div><div class='add'>+	unsigned int cnt;</div><div class='add'>+</div><div class='add'>+	calc_param(cnt, div, divide_rate, 0x10000);</div><div class='add'>+	div++;</div><div class='add'>+</div><div class='add'>+	setup_irq(_8IRQ, &amp;timer8_irq);</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_CPU_H8S)</div><div class='add'>+	/* Timer module enable */</div><div class='add'>+	ctrl_bclr(0, MSTPCRL)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* initalize timer */</div><div class='add'>+	ctrl_outw(cnt, _8BASE + TCORA);</div><div class='add'>+	ctrl_outw(0x0000, _8BASE + _8TCSR);</div><div class='add'>+	ctrl_outw((CMIEA|CCLR_CMA|CKS2) &lt;&lt; 8 | div,</div><div class='add'>+		  _8BASE + _8TCR);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/h8300/kernel/timer/tpu.c b/arch/h8300/kernel/timer/tpu.c<br/>new file mode 100644<br/>index 000000000000..df7f453a9673<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/h8300/kernel/timer/tpu.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/h8300/kernel/timer/tpu.c</a></div><div class='hunk'>@@ -0,0 +1,102 @@</div><div class='add'>+/*</div><div class='add'>+ *  linux/arch/h8300/kernel/timer/tpu.c</div><div class='add'>+ *</div><div class='add'>+ *  Yoshinori Sato &lt;ysato@users.sourceforge.jp&gt;</div><div class='add'>+ *</div><div class='add'>+ *  TPU Timer Handler</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/config.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/param.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/timex.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/segment.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/irq.h&gt;</div><div class='add'>+#include &lt;asm/regs267x.h&gt;</div><div class='add'>+</div><div class='add'>+/* TPU */</div><div class='add'>+#if CONFIG_H8300_TPU_CH == 0</div><div class='add'>+#define TPUBASE	0xffffd0</div><div class='add'>+#define TPUIRQ	40</div><div class='add'>+#elif CONFIG_H8300_TPU_CH == 1</div><div class='add'>+#define TPUBASE	0xffffe0</div><div class='add'>+#define TPUIRQ	48</div><div class='add'>+#elif CONFIG_H8300_TPU_CH == 2</div><div class='add'>+#define TPUBASE	0xfffff0</div><div class='add'>+#define TPUIRQ	52</div><div class='add'>+#elif CONFIG_H8300_TPU_CH == 3</div><div class='add'>+#define TPUBASE	0xfffe80</div><div class='add'>+#define TPUIRQ	56</div><div class='add'>+#elif CONFIG_H8300_TPU_CH == 4</div><div class='add'>+#define TPUBASE	0xfffe90</div><div class='add'>+#define TPUIRQ	64</div><div class='add'>+#else</div><div class='add'>+#error Unknown timer channel.</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define _TCR	0</div><div class='add'>+#define _TMDR	1</div><div class='add'>+#define _TIOR	2</div><div class='add'>+#define _TIER	4</div><div class='add'>+#define _TSR	5</div><div class='add'>+#define _TCNT	6</div><div class='add'>+#define _GRA	8</div><div class='add'>+#define _GRB	10</div><div class='add'>+</div><div class='add'>+#define CCLR0	0x20</div><div class='add'>+</div><div class='add'>+static irqreturn_t timer_interrupt(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	h8300_timer_tick();</div><div class='add'>+	ctrl_bclr(0, TPUBASE + _TSR);</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct irqaction tpu_irq = {</div><div class='add'>+	.name		= "tpu",</div><div class='add'>+	.handler	= timer_interrupt,</div><div class='add'>+	.flags		= IRQF_DISABLED | IRQF_TIMER,</div><div class='add'>+	.mask		= CPU_MASK_NONE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const static int __initdata divide_rate[] = {</div><div class='add'>+#if CONFIG_H8300_TPU_CH == 0</div><div class='add'>+	1,4,16,64,0,0,0,0,</div><div class='add'>+#elif (CONFIG_H8300_TPU_CH == 1) || (CONFIG_H8300_TPU_CH == 5)</div><div class='add'>+	1,4,16,64,0,0,256,0,</div><div class='add'>+#elif (CONFIG_H8300_TPU_CH == 2) || (CONFIG_H8300_TPU_CH == 4)</div><div class='add'>+	1,4,16,64,0,0,0,1024,</div><div class='add'>+#elif CONFIG_H8300_TPU_CH == 3</div><div class='add'>+	1,4,16,64,0,1024,256,4096,</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void __init h8300_timer_setup(void)</div><div class='add'>+{</div><div class='add'>+	unsigned int cnt;</div><div class='add'>+	unsigned int div;</div><div class='add'>+</div><div class='add'>+	calc_param(cnt, div, divide_rate, 0x10000);</div><div class='add'>+</div><div class='add'>+	setup_irq(TPUIRQ, &amp;tpu_irq);</div><div class='add'>+</div><div class='add'>+	/* TPU module enabled */</div><div class='add'>+	ctrl_bclr(3, MSTPCRH);</div><div class='add'>+</div><div class='add'>+	ctrl_outb(0, TSTR);</div><div class='add'>+	ctrl_outb(CCLR0 | div, TPUBASE + _TCR);</div><div class='add'>+	ctrl_outb(0, TPUBASE + _TMDR);</div><div class='add'>+	ctrl_outw(0, TPUBASE + _TIOR);</div><div class='add'>+	ctrl_outb(0x01, TPUBASE + _TIER);</div><div class='add'>+	ctrl_outw(cnt, TPUBASE + _GRA);</div><div class='add'>+	ctrl_bset(CONFIG_H8300_TPU_CH, TSTR);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/h8300/kernel/traps.c b/arch/h8300/kernel/traps.c<br/>index f8f7d7ea97f1..3c0b66bc669e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/h8300/kernel/traps.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/h8300/kernel/traps.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/h8300/kernel/traps.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/h8300/kernel/traps.c</a></div><div class='hunk'>@@ -20,12 +20,14 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/bug.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/traps.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='del'>-#include &lt;asm/gpio.h&gt;</div><div class='add'>+</div><div class='add'>+static DEFINE_SPINLOCK(die_lock);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * this must be called very early as the kernel might</div><div class='hunk'>@@ -94,16 +96,19 @@ static void dump(struct pt_regs *fp)</div><div class='ctx'> 	printk("\n\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void die_if_kernel (char *str, struct pt_regs *fp, int nr)</div><div class='add'>+void die(char *str, struct pt_regs *fp, unsigned long err)</div><div class='ctx'> {</div><div class='del'>-	extern int console_loglevel;</div><div class='add'>+	static int diecount;</div><div class='ctx'> </div><div class='del'>-	if (!(fp-&gt;ccr &amp; PS_S))</div><div class='del'>-		return;</div><div class='add'>+	oops_enter();</div><div class='ctx'> </div><div class='del'>-	console_loglevel = 15;</div><div class='add'>+	console_verbose();</div><div class='add'>+	spin_lock_irq(&amp;die_lock);</div><div class='add'>+	report_bug(fp-&gt;pc, fp);</div><div class='add'>+	printk(KERN_EMERG "%s: %04lx [#%d] ", str, err &amp; 0xffff, ++diecount);</div><div class='ctx'> 	dump(fp);</div><div class='ctx'> </div><div class='add'>+	spin_unlock_irq(&amp;die_lock);</div><div class='ctx'> 	do_exit(SIGSEGV);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/h8300/mm/fault.c b/arch/h8300/mm/fault.c<br/>index 29e9af9f0e6a..1d092abebf03 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/h8300/mm/fault.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/h8300/mm/fault.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/h8300/mm/fault.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/h8300/mm/fault.c</a></div><div class='hunk'>@@ -20,8 +20,6 @@</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> </div><div class='del'>-extern void die_if_kernel(char *, struct pt_regs *, long);</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * This routine handles page faults.  It determines the problem, and</div><div class='ctx'>  * then passes it off to one of the appropriate routines.</div><div class='hunk'>@@ -50,7 +48,8 @@ asmlinkage int do_page_fault(struct pt_regs *regs, unsigned long address,</div><div class='ctx'> 	} else</div><div class='ctx'> 		printk(KERN_ALERT "Unable to handle kernel access");</div><div class='ctx'> 	printk(" at virtual address %08lx\n",address);</div><div class='del'>-	die_if_kernel("Oops", regs, error_code);</div><div class='add'>+	if (!user_mode(regs))</div><div class='add'>+		die("Oops", regs, error_code);</div><div class='ctx'> 	do_exit(SIGKILL);</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='head'>diff --git a/arch/h8300/platform/h8300h/aki3068net/Makefile b/arch/h8300/platform/h8300h/aki3068net/Makefile<br/>index b03c328f8c70..b7ff78050b7f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/h8300/platform/h8300h/aki3068net/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>arch/h8300/platform/h8300h/aki3068net/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/h8300/platform/h8300h/aki3068net/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/h8300/platform/h8300h/aki3068net/Makefile</a></div><div class='hunk'>@@ -3,4 +3,3 @@</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> extra-y := crt0_ram.o</div><div class='del'>-obj-y := timer.o</div><div class='head'>diff --git a/arch/h8300/platform/h8300h/aki3068net/timer.c b/arch/h8300/platform/h8300h/aki3068net/timer.c<br/>deleted file mode 100644<br/>index 27cd85d56128..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/h8300/platform/h8300h/aki3068net/timer.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/h8300/platform/h8300h/aki3068net/timer.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,51 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  linux/arch/h8300/platform/h8300h/aki3068net/timer.c</div><div class='del'>- *</div><div class='del'>- *  Yoshinori Sato &lt;ysato@users.sourcefoge.jp&gt;</div><div class='del'>- *</div><div class='del'>- *  Platform depend Timer Handler</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/param.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/timex.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/segment.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/regs306x.h&gt;</div><div class='del'>-</div><div class='del'>-#define CMFA 6</div><div class='del'>-</div><div class='del'>-#define CMIEA 0x40</div><div class='del'>-#define CCLR_CMA 0x08</div><div class='del'>-#define CLK_DIV8192 0x03</div><div class='del'>-</div><div class='del'>-#define H8300_TIMER_FREQ CONFIG_CPU_CLOCK*1000/8192 /* Timer input freq. */</div><div class='del'>-</div><div class='del'>-void __init platform_timer_setup(irqreturn_t (*timer_int)(int, void *, struct pt_regs *))</div><div class='del'>-{</div><div class='del'>-	/* setup 8bit timer ch2 */</div><div class='del'>-	ctrl_outb(H8300_TIMER_FREQ / HZ, TCORA2);      /* set interval */</div><div class='del'>-	ctrl_outb(0x00, _8TCSR2);                      /* no output */</div><div class='del'>-	request_irq(40, timer_int, 0, "timer", 0);</div><div class='del'>-	ctrl_outb(CMIEA|CCLR_CMA|CLK_DIV8192, _8TCR2); /* start count */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void platform_timer_eoi(void)</div><div class='del'>-{</div><div class='del'>-	*(volatile unsigned char *)_8TCSR2 &amp;= ~(1 &lt;&lt; CMFA);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void platform_gettod(int *year, int *mon, int *day, int *hour,</div><div class='del'>-		 int *min, int *sec)</div><div class='del'>-{</div><div class='del'>-	*year = *mon = *day = *hour = *min = *sec = 0;</div><div class='del'>-}</div><div class='head'>diff --git a/arch/h8300/platform/h8300h/generic/Makefile b/arch/h8300/platform/h8300h/generic/Makefile<br/>index 32b964a9010e..2b12a170209e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/h8300/platform/h8300h/generic/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>arch/h8300/platform/h8300h/generic/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/h8300/platform/h8300h/generic/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/h8300/platform/h8300h/generic/Makefile</a></div><div class='hunk'>@@ -3,4 +3,3 @@</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> extra-y :=  crt0_$(MODEL).o</div><div class='del'>-obj-y := timer.o</div><div class='head'>diff --git a/arch/h8300/platform/h8300h/generic/timer.c b/arch/h8300/platform/h8300h/generic/timer.c<br/>deleted file mode 100644<br/>index 6f5cefe0cceb..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/h8300/platform/h8300h/generic/timer.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/h8300/platform/h8300h/generic/timer.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,95 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  linux/arch/h8300/platform/h8300h/generic/timer.c</div><div class='del'>- *</div><div class='del'>- *  Yoshinori Sato &lt;ysato@users.sourceforge.jp&gt;</div><div class='del'>- *</div><div class='del'>- *  Platform depend Timer Handler</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/param.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/segment.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/irq.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;linux/timex.h&gt;</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_H83007) || defined(CONFIG_H83068)</div><div class='del'>-#include &lt;asm/regs306x.h&gt;</div><div class='del'>-#define CMFA 6</div><div class='del'>-</div><div class='del'>-#define CMIEA 0x40</div><div class='del'>-#define CCLR_CMA 0x08</div><div class='del'>-#define CLK_DIV8192 0x03</div><div class='del'>-</div><div class='del'>-#define H8300_TIMER_FREQ CONFIG_CPU_CLOCK*1000/8192 /* Timer input freq. */</div><div class='del'>-</div><div class='del'>-void __init platform_timer_setup(irqreturn_t (*timer_int)(int, void *, struct pt_regs *))</div><div class='del'>-{</div><div class='del'>-	/* setup 8bit timer ch2 */</div><div class='del'>-	ctrl_outb(H8300_TIMER_FREQ / HZ, TCORA2);      /* set interval */</div><div class='del'>-	ctrl_outb(0x00, _8TCSR2);                      /* no output */</div><div class='del'>-	request_irq(40, timer_int, 0, "timer", 0);</div><div class='del'>-	ctrl_outb(CMIEA|CCLR_CMA|CLK_DIV8192, _8TCR2); /* start count */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void platform_timer_eoi(void)</div><div class='del'>-{</div><div class='del'>-	*(volatile unsigned char *)_8TCSR2 &amp;= ~(1 &lt;&lt; CMFA);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_H83002) || defined(CONFIG_H83048)</div><div class='del'>-/* FIXME! */</div><div class='del'>-#define TSTR 0x00ffff60</div><div class='del'>-#define TSNC 0x00ffff61</div><div class='del'>-#define TMDR 0x00ffff62</div><div class='del'>-#define TFCR 0x00ffff63</div><div class='del'>-#define TOER 0x00ffff90</div><div class='del'>-#define TOCR 0x00ffff91</div><div class='del'>-/* ITU0 */</div><div class='del'>-#define TCR  0x00ffff64</div><div class='del'>-#define TIOR 0x00ffff65</div><div class='del'>-#define TIER 0x00ffff66</div><div class='del'>-#define TSR  0x00ffff67</div><div class='del'>-#define TCNT 0x00ffff68</div><div class='del'>-#define GRA  0x00ffff6a</div><div class='del'>-#define GRB  0x00ffff6c</div><div class='del'>-</div><div class='del'>-#define CCLR_CMGRA 0x20</div><div class='del'>-#define CLK_DIV8 0x03</div><div class='del'>-</div><div class='del'>-#define H8300_TIMER_FREQ CONFIG_CPU_CLOCK*1000/8 /* Timer input freq. */</div><div class='del'>-</div><div class='del'>-void __init platform_timer_setup(irqreturn_t (*timer_int)(int, void *, struct pt_regs *))</div><div class='del'>-{</div><div class='del'>-	*(unsigned short *)GRA= H8300_TIMER_FREQ / HZ;  /* set interval */</div><div class='del'>-	*(unsigned short *)TCNT=0;                      /* clear counter */</div><div class='del'>-	ctrl_outb(0x80|CCLR_CMGRA|CLK_DIV8, TCR);       /* set ITU0 clock */</div><div class='del'>-	ctrl_outb(0x88, TIOR);                          /* no output */</div><div class='del'>-	request_irq(26, timer_int, 0, "timer", 0);</div><div class='del'>-	ctrl_outb(0xf9, TIER);                          /* compare match GRA interrupt */</div><div class='del'>-	ctrl_outb(ctrl_inb(TSNC) &amp; ~0x01, TSNC);        /* ITU0 async */</div><div class='del'>-	ctrl_outb(ctrl_inb(TMDR) &amp; ~0x01, TMDR);        /* ITU0 normal mode */</div><div class='del'>-	ctrl_outb(ctrl_inb(TSTR) | 0x01, TSTR);         /* ITU0 Start */</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void platform_timer_eoi(void)</div><div class='del'>-{</div><div class='del'>-	ctrl_outb(ctrl_inb(TSR) &amp; ~0x01,TSR);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-void platform_gettod(int *year, int *mon, int *day, int *hour,</div><div class='del'>-		 int *min, int *sec)</div><div class='del'>-{</div><div class='del'>-	*year = *mon = *day = *hour = *min = *sec = 0;</div><div class='del'>-}</div><div class='head'>diff --git a/arch/h8300/platform/h8300h/h8max/Makefile b/arch/h8300/platform/h8300h/h8max/Makefile<br/>index b03c328f8c70..b7ff78050b7f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/h8300/platform/h8300h/h8max/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>arch/h8300/platform/h8300h/h8max/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/h8300/platform/h8300h/h8max/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/h8300/platform/h8300h/h8max/Makefile</a></div><div class='hunk'>@@ -3,4 +3,3 @@</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> extra-y := crt0_ram.o</div><div class='del'>-obj-y := timer.o</div><div class='head'>diff --git a/arch/h8300/platform/h8300h/h8max/timer.c b/arch/h8300/platform/h8300h/h8max/timer.c<br/>deleted file mode 100644<br/>index 85a574afe9d0..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/h8300/platform/h8300h/h8max/timer.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/h8300/platform/h8300h/h8max/timer.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,52 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  linux/arch/h8300/platform/h8300h/h8max/timer.c</div><div class='del'>- *</div><div class='del'>- *  Yoshinori Sato &lt;ysato@users.sourcefoge.jp&gt;</div><div class='del'>- *</div><div class='del'>- *  Platform depend Timer Handler</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/param.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/timex.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/segment.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/regs306x.h&gt;</div><div class='del'>-</div><div class='del'>-#define CMFA 6</div><div class='del'>-</div><div class='del'>-#define CMIEA 0x40</div><div class='del'>-#define CCLR_CMA 0x08</div><div class='del'>-#define CLK_DIV8192 0x03</div><div class='del'>-</div><div class='del'>-#define H8300_TIMER_FREQ CONFIG_CPU_CLOCK*1000/8192 /* Timer input freq. */</div><div class='del'>-</div><div class='del'>-void __init platform_timer_setup(irqreturn_t (*timer_int)(int, void *, struct pt_regs *))</div><div class='del'>-{</div><div class='del'>-	/* setup 8bit timer ch2 */</div><div class='del'>-	ctrl_outb(H8300_TIMER_FREQ / HZ, TCORA2);      /* set interval */</div><div class='del'>-	ctrl_outb(0x00, _8TCSR2);                      /* no output */</div><div class='del'>-	request_irq(40, timer_int, 0, "timer", 0);</div><div class='del'>-	ctrl_outb(CMIEA|CCLR_CMA|CLK_DIV8192, _8TCR2); /* start count */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void platform_timer_eoi(void)</div><div class='del'>-{</div><div class='del'>-	*(volatile unsigned char *)_8TCSR2 &amp;= ~(1 &lt;&lt; CMFA);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void platform_gettod(int *year, int *mon, int *day, int *hour,</div><div class='del'>-		 int *min, int *sec)</div><div class='del'>-{</div><div class='del'>-	*year = *mon = *day = *hour = *min = *sec = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/arch/h8300/platform/h8s/edosk2674/Makefile b/arch/h8300/platform/h8s/edosk2674/Makefile<br/>index f763654ac6fe..8e349723bb4f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/h8300/platform/h8s/edosk2674/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>arch/h8300/platform/h8s/edosk2674/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/h8300/platform/h8s/edosk2674/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/h8300/platform/h8s/edosk2674/Makefile</a></div><div class='hunk'>@@ -3,4 +3,3 @@</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> extra-y := crt0_$(MODEL).o</div><div class='del'>-obj-y := timer.o</div><div class='head'>diff --git a/arch/h8300/platform/h8s/edosk2674/timer.c b/arch/h8300/platform/h8s/edosk2674/timer.c<br/>deleted file mode 100644<br/>index bfb1424482f4..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/h8300/platform/h8s/edosk2674/timer.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/h8300/platform/h8s/edosk2674/timer.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,54 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  linux/arch/h8300/platform/h8s/edosk2674/timer.c</div><div class='del'>- *</div><div class='del'>- *  Yoshinori Sato &lt;ysato@users.sourceforge.jp&gt;</div><div class='del'>- *</div><div class='del'>- *  Platform depend Timer Handler</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/param.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/timex.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/segment.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/regs267x.h&gt;</div><div class='del'>-</div><div class='del'>-#define CMFA 6</div><div class='del'>-</div><div class='del'>-#define CMIEA 0x40</div><div class='del'>-#define CCLR_CMA 0x08</div><div class='del'>-#define CLK_DIV8192 0x03</div><div class='del'>-</div><div class='del'>-#define H8300_TIMER_FREQ CONFIG_CPU_CLOCK*1000/8192 /* Timer input freq. */</div><div class='del'>-</div><div class='del'>-void __init platform_timer_setup(irqreturn_t (*timer_int)(int, void *, struct pt_regs *))</div><div class='del'>-{</div><div class='del'>-	/* 8bit timer module enabled */</div><div class='del'>-	ctrl_outb(ctrl_inb(MSTPCRL) &amp; ~0x01, MSTPCRL);</div><div class='del'>-	/* setup 8bit timer ch1 */</div><div class='del'>-	ctrl_outb(H8300_TIMER_FREQ / HZ, _8TCORA1);      /* set interval */</div><div class='del'>-	ctrl_outb(0x00, _8TCSR1);                        /* no output */</div><div class='del'>-	request_irq(76, timer_int, 0, "timer" ,0);</div><div class='del'>-	ctrl_outb(CMIEA|CCLR_CMA|CLK_DIV8192, _8TCR1);   /* start count */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void platform_timer_eoi(void)</div><div class='del'>-{</div><div class='del'>-	*(volatile unsigned char *)_8TCSR1 &amp;= ~(1 &lt;&lt; CMFA);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void platform_gettod(int *year, int *mon, int *day, int *hour,</div><div class='del'>-		 int *min, int *sec)</div><div class='del'>-{</div><div class='del'>-/* FIXME! not RTC support */</div><div class='del'>-	*year = *mon = *day = *hour = *min = *sec = 0;</div><div class='del'>-}</div><div class='head'>diff --git a/arch/h8300/platform/h8s/generic/Makefile b/arch/h8300/platform/h8s/generic/Makefile<br/>index 055d53a9811b..44b4685c664c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/h8300/platform/h8s/generic/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>arch/h8300/platform/h8s/generic/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/h8300/platform/h8s/generic/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/h8300/platform/h8s/generic/Makefile</a></div><div class='hunk'>@@ -3,4 +3,3 @@</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> extra-y =  crt0_$(MODEL).o</div><div class='del'>-obj-y := timer.o</div><div class='head'>diff --git a/arch/h8300/platform/h8s/generic/timer.c b/arch/h8300/platform/h8s/generic/timer.c<br/>deleted file mode 100644<br/>index c2211c6e79da..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/h8300/platform/h8s/generic/timer.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/h8300/platform/h8s/generic/timer.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,53 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  linux/arch/h8300/platform/h8s/generic/timer.c</div><div class='del'>- *</div><div class='del'>- *  Yoshinori Sato &lt;ysato@users.sourceforge.jp&gt;</div><div class='del'>- *</div><div class='del'>- *  Platform depend Timer Handler</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/param.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/timex.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/segment.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/regs267x.h&gt;</div><div class='del'>-</div><div class='del'>-#define CMFA 6</div><div class='del'>-</div><div class='del'>-#define CMIEA 0x40</div><div class='del'>-#define CCLR_CMA 0x08</div><div class='del'>-#define CLK_DIV8192 0x03</div><div class='del'>-</div><div class='del'>-#define H8300_TIMER_FREQ CONFIG_CPU_CLOCK*1000/8192 /* Timer input freq. */</div><div class='del'>-</div><div class='del'>-void __init platform_timer_setup(irqreturn_t (*timer_int)(int, void *, struct pt_regs *))</div><div class='del'>-{</div><div class='del'>-	/* 8bit timer module enabled */</div><div class='del'>-	ctrl_outb(ctrl_inb(MSTPCRL) &amp; ~0x01, MSTPCRL);</div><div class='del'>-	/* setup 8bit timer ch1 */</div><div class='del'>-	ctrl_outb(H8300_TIMER_FREQ / HZ, _8TCORA1);      /* set interval */</div><div class='del'>-	ctrl_outb(0x00, _8TCSR1);                        /* no output */</div><div class='del'>-	request_irq(76, timer_int, 0, "timer" ,0);</div><div class='del'>-	ctrl_outb(CMIEA|CCLR_CMA|CLK_DIV8192, _8TCR1);   /* start count */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void platform_timer_eoi(void)</div><div class='del'>-{</div><div class='del'>-	*(volatile unsigned char *)_8TCSR1 &amp;= ~(1 &lt;&lt; CMFA);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void platform_gettod(int *year, int *mon, int *day, int *hour,</div><div class='del'>-		 int *min, int *sec)</div><div class='del'>-{</div><div class='del'>-	*year = *mon = *day = *hour = *min = *sec = 0;</div><div class='del'>-}</div><div class='head'>diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig<br/>index 48e496fe1e75..3b7aa38254a8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/ia64/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/ia64/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/ia64/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/ia64/Kconfig</a></div><div class='hunk'>@@ -60,14 +60,6 @@ config RWSEM_XCHGADD_ALGORITHM</div><div class='ctx'> 	bool</div><div class='ctx'> 	default y</div><div class='ctx'> </div><div class='del'>-config ARCH_HAS_ILOG2_U32</div><div class='del'>-	bool</div><div class='del'>-	default n</div><div class='del'>-</div><div class='del'>-config ARCH_HAS_ILOG2_U64</div><div class='del'>-	bool</div><div class='del'>-	default n</div><div class='del'>-</div><div class='ctx'> config HUGETLB_PAGE_SIZE_VARIABLE</div><div class='ctx'> 	bool</div><div class='ctx'> 	depends on HUGETLB_PAGE</div><div class='head'>diff --git a/arch/ia64/ia32/binfmt_elf32.c b/arch/ia64/ia32/binfmt_elf32.c<br/>index 4f0c30c38e99..f92bdaac8976 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/ia64/ia32/binfmt_elf32.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/ia64/ia32/binfmt_elf32.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/ia64/ia32/binfmt_elf32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/ia64/ia32/binfmt_elf32.c</a></div><div class='hunk'>@@ -41,7 +41,7 @@ randomize_stack_top(unsigned long stack_top);</div><div class='ctx'> #define elf_map				elf32_map</div><div class='ctx'> </div><div class='ctx'> #undef SET_PERSONALITY</div><div class='del'>-#define SET_PERSONALITY(ex, ibcs2)	elf32_set_personality()</div><div class='add'>+#define SET_PERSONALITY(ex)	elf32_set_personality()</div><div class='ctx'> </div><div class='ctx'> #define elf_read_implies_exec(ex, have_pt_gnu_stack)	(!(have_pt_gnu_stack))</div><div class='ctx'> </div><div class='head'>diff --git a/arch/ia64/ia32/ia32_entry.S b/arch/ia64/ia32/ia32_entry.S<br/>index ff88c48c5d19..53505bb04771 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/ia64/ia32/ia32_entry.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/ia64/ia32/ia32_entry.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/ia64/ia32/ia32_entry.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/ia64/ia32/ia32_entry.S</a></div><div class='hunk'>@@ -251,8 +251,8 @@ ia32_syscall_table:</div><div class='ctx'> 	data8 compat_sys_setrlimit	  /* 75 */</div><div class='ctx'> 	data8 compat_sys_old_getrlimit</div><div class='ctx'> 	data8 compat_sys_getrusage</div><div class='del'>-	data8 sys32_gettimeofday</div><div class='del'>-	data8 sys32_settimeofday</div><div class='add'>+	data8 compat_sys_gettimeofday</div><div class='add'>+	data8 compat_sys_settimeofday</div><div class='ctx'> 	data8 sys32_getgroups16	  /* 80 */</div><div class='ctx'> 	data8 sys32_setgroups16</div><div class='ctx'> 	data8 sys32_old_select</div><div class='head'>diff --git a/arch/ia64/ia32/ia32priv.h b/arch/ia64/ia32/ia32priv.h<br/>index dd0c53687a96..0f15349c3c6b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/ia64/ia32/ia32priv.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/ia64/ia32/ia32priv.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/ia64/ia32/ia32priv.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/ia64/ia32/ia32priv.h</a></div><div class='hunk'>@@ -332,8 +332,8 @@ void ia64_elf32_init(struct pt_regs *regs);</div><div class='ctx'> #define ELF_PLATFORM	NULL</div><div class='ctx'> </div><div class='ctx'> #ifdef __KERNEL__</div><div class='del'>-# define SET_PERSONALITY(EX,IBCS2)				\</div><div class='del'>-	(current-&gt;personality = (IBCS2) ? PER_SVR4 : PER_LINUX)</div><div class='add'>+# define SET_PERSONALITY(EX)				\</div><div class='add'>+	(current-&gt;personality = PER_LINUX)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #define IA32_EFLAG	0x200</div><div class='head'>diff --git a/arch/ia64/ia32/sys_ia32.c b/arch/ia64/ia32/sys_ia32.c<br/>index bf196cbb3796..f4430bb4bbdc 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/ia64/ia32/sys_ia32.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/ia64/ia32/sys_ia32.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/ia64/ia32/sys_ia32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/ia64/ia32/sys_ia32.c</a></div><div class='hunk'>@@ -118,41 +118,6 @@ sys32_execve (char __user *name, compat_uptr_t __user *argv, compat_uptr_t __use</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int cp_compat_stat(struct kstat *stat, struct compat_stat __user *ubuf)</div><div class='del'>-{</div><div class='del'>-	compat_ino_t ino;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if ((u64) stat-&gt;size &gt; MAX_NON_LFS ||</div><div class='del'>-	    !old_valid_dev(stat-&gt;dev) ||</div><div class='del'>-	    !old_valid_dev(stat-&gt;rdev))</div><div class='del'>-		return -EOVERFLOW;</div><div class='del'>-</div><div class='del'>-	ino = stat-&gt;ino;</div><div class='del'>-	if (sizeof(ino) &lt; sizeof(stat-&gt;ino) &amp;&amp; ino != stat-&gt;ino)</div><div class='del'>-		return -EOVERFLOW;</div><div class='del'>-</div><div class='del'>-	if (clear_user(ubuf, sizeof(*ubuf)))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	err  = __put_user(old_encode_dev(stat-&gt;dev), &amp;ubuf-&gt;st_dev);</div><div class='del'>-	err |= __put_user(ino, &amp;ubuf-&gt;st_ino);</div><div class='del'>-	err |= __put_user(stat-&gt;mode, &amp;ubuf-&gt;st_mode);</div><div class='del'>-	err |= __put_user(stat-&gt;nlink, &amp;ubuf-&gt;st_nlink);</div><div class='del'>-	err |= __put_user(high2lowuid(stat-&gt;uid), &amp;ubuf-&gt;st_uid);</div><div class='del'>-	err |= __put_user(high2lowgid(stat-&gt;gid), &amp;ubuf-&gt;st_gid);</div><div class='del'>-	err |= __put_user(old_encode_dev(stat-&gt;rdev), &amp;ubuf-&gt;st_rdev);</div><div class='del'>-	err |= __put_user(stat-&gt;size, &amp;ubuf-&gt;st_size);</div><div class='del'>-	err |= __put_user(stat-&gt;atime.tv_sec, &amp;ubuf-&gt;st_atime);</div><div class='del'>-	err |= __put_user(stat-&gt;atime.tv_nsec, &amp;ubuf-&gt;st_atime_nsec);</div><div class='del'>-	err |= __put_user(stat-&gt;mtime.tv_sec, &amp;ubuf-&gt;st_mtime);</div><div class='del'>-	err |= __put_user(stat-&gt;mtime.tv_nsec, &amp;ubuf-&gt;st_mtime_nsec);</div><div class='del'>-	err |= __put_user(stat-&gt;ctime.tv_sec, &amp;ubuf-&gt;st_ctime);</div><div class='del'>-	err |= __put_user(stat-&gt;ctime.tv_nsec, &amp;ubuf-&gt;st_ctime_nsec);</div><div class='del'>-	err |= __put_user(stat-&gt;blksize, &amp;ubuf-&gt;st_blksize);</div><div class='del'>-	err |= __put_user(stat-&gt;blocks, &amp;ubuf-&gt;st_blocks);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='ctx'> </div><div class='ctx'> #if PAGE_SHIFT &gt; IA32_PAGE_SHIFT</div><div class='ctx'> </div><div class='hunk'>@@ -1148,68 +1113,12 @@ sys32_pipe (int __user *fd)</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline long</div><div class='del'>-get_tv32 (struct timeval *o, struct compat_timeval __user *i)</div><div class='del'>-{</div><div class='del'>-	return (!access_ok(VERIFY_READ, i, sizeof(*i)) ||</div><div class='del'>-		(__get_user(o-&gt;tv_sec, &amp;i-&gt;tv_sec) | __get_user(o-&gt;tv_usec, &amp;i-&gt;tv_usec)));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline long</div><div class='del'>-put_tv32 (struct compat_timeval __user *o, struct timeval *i)</div><div class='del'>-{</div><div class='del'>-	return (!access_ok(VERIFY_WRITE, o, sizeof(*o)) ||</div><div class='del'>-		(__put_user(i-&gt;tv_sec, &amp;o-&gt;tv_sec) | __put_user(i-&gt;tv_usec, &amp;o-&gt;tv_usec)));</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> asmlinkage unsigned long</div><div class='ctx'> sys32_alarm (unsigned int seconds)</div><div class='ctx'> {</div><div class='ctx'> 	return alarm_setitimer(seconds);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Translations due to time_t size differences.  Which affects all</div><div class='del'>-   sorts of things, like timeval and itimerval.  */</div><div class='del'>-</div><div class='del'>-extern struct timezone sys_tz;</div><div class='del'>-</div><div class='del'>-asmlinkage long</div><div class='del'>-sys32_gettimeofday (struct compat_timeval __user *tv, struct timezone __user *tz)</div><div class='del'>-{</div><div class='del'>-	if (tv) {</div><div class='del'>-		struct timeval ktv;</div><div class='del'>-		do_gettimeofday(&amp;ktv);</div><div class='del'>-		if (put_tv32(tv, &amp;ktv))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-	}</div><div class='del'>-	if (tz) {</div><div class='del'>-		if (copy_to_user(tz, &amp;sys_tz, sizeof(sys_tz)))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-asmlinkage long</div><div class='del'>-sys32_settimeofday (struct compat_timeval __user *tv, struct timezone __user *tz)</div><div class='del'>-{</div><div class='del'>-	struct timeval ktv;</div><div class='del'>-	struct timespec kts;</div><div class='del'>-	struct timezone ktz;</div><div class='del'>-</div><div class='del'>-	if (tv) {</div><div class='del'>-		if (get_tv32(&amp;ktv, tv))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		kts.tv_sec = ktv.tv_sec;</div><div class='del'>-		kts.tv_nsec = ktv.tv_usec * 1000;</div><div class='del'>-	}</div><div class='del'>-	if (tz) {</div><div class='del'>-		if (copy_from_user(&amp;ktz, tz, sizeof(ktz)))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return do_sys_settimeofday(tv ? &amp;kts : NULL, tz ? &amp;ktz : NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> struct sel_arg_struct {</div><div class='ctx'> 	unsigned int n;</div><div class='ctx'> 	unsigned int inp;</div><div class='head'>diff --git a/arch/ia64/include/asm/a.out.h b/arch/ia64/include/asm/a.out.h<br/>deleted file mode 100644<br/>index 193dcfb67596..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/ia64/include/asm/a.out.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/ia64/include/asm/a.out.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,32 +0,0 @@</div><div class='del'>-#ifndef _ASM_IA64_A_OUT_H</div><div class='del'>-#define _ASM_IA64_A_OUT_H</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * No a.out format has been (or should be) defined so this file is</div><div class='del'>- * just a dummy that allows us to get binfmt_elf compiled.  It</div><div class='del'>- * probably would be better to clean up binfmt_elf.c so it does not</div><div class='del'>- * necessarily depend on there being a.out support.</div><div class='del'>- *</div><div class='del'>- * Modified 1998-2002</div><div class='del'>- *	David Mosberger-Tang &lt;davidm@hpl.hp.com&gt;, Hewlett-Packard Co.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-</div><div class='del'>-struct exec {</div><div class='del'>-	unsigned long a_info;</div><div class='del'>-	unsigned long a_text;</div><div class='del'>-	unsigned long a_data;</div><div class='del'>-	unsigned long a_bss;</div><div class='del'>-	unsigned long a_entry;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define N_TXTADDR(x)	0</div><div class='del'>-#define N_DATADDR(x)	0</div><div class='del'>-#define N_BSSADDR(x)	0</div><div class='del'>-#define N_DRSIZE(x)	0</div><div class='del'>-#define N_TRSIZE(x)	0</div><div class='del'>-#define N_SYMSIZE(x)	0</div><div class='del'>-#define N_TXTOFF(x)	0</div><div class='del'>-</div><div class='del'>-#endif /* _ASM_IA64_A_OUT_H */</div><div class='head'>diff --git a/arch/ia64/include/asm/dma-mapping.h b/arch/ia64/include/asm/dma-mapping.h<br/>index 9f0df9bd46b7..06ff1ba21465 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/ia64/include/asm/dma-mapping.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/ia64/include/asm/dma-mapping.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/ia64/include/asm/dma-mapping.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/ia64/include/asm/dma-mapping.h</a></div><div class='hunk'>@@ -8,7 +8,9 @@</div><div class='ctx'> #include &lt;asm/machvec.h&gt;</div><div class='ctx'> #include &lt;linux/scatterlist.h&gt;</div><div class='ctx'> </div><div class='del'>-#define dma_alloc_coherent	platform_dma_alloc_coherent</div><div class='add'>+#define dma_alloc_coherent(dev, size, handle, gfp)	\</div><div class='add'>+	platform_dma_alloc_coherent(dev, size, handle, (gfp) | GFP_DMA)</div><div class='add'>+</div><div class='ctx'> /* coherent mem. is cheap */</div><div class='ctx'> static inline void *</div><div class='ctx'> dma_alloc_noncoherent(struct device *dev, size_t size, dma_addr_t *dma_handle,</div><div class='head'>diff --git a/arch/ia64/include/asm/elf.h b/arch/ia64/include/asm/elf.h<br/>index 2acb6b6543c9..86eddee029cb 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/ia64/include/asm/elf.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/ia64/include/asm/elf.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/ia64/include/asm/elf.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/ia64/include/asm/elf.h</a></div><div class='hunk'>@@ -202,7 +202,7 @@ extern void ia64_elf_core_copy_regs (struct pt_regs *src, elf_gregset_t dst);</div><div class='ctx'>    relevant until we have real hardware to play with... */</div><div class='ctx'> #define ELF_PLATFORM	NULL</div><div class='ctx'> </div><div class='del'>-#define SET_PERSONALITY(ex, ibcs2)	set_personality(PER_LINUX)</div><div class='add'>+#define SET_PERSONALITY(ex)	set_personality(PER_LINUX)</div><div class='ctx'> #define elf_read_implies_exec(ex, executable_stack)					\</div><div class='ctx'> 	((executable_stack!=EXSTACK_DISABLE_X) &amp;&amp; ((ex).e_flags &amp; EF_IA_64_LINUX_EXECUTABLE_STACK) != 0)</div><div class='ctx'> </div><div class='head'>diff --git a/arch/ia64/include/asm/kvm_host.h b/arch/ia64/include/asm/kvm_host.h<br/>index 1efe513a9941..85db124d37f6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/ia64/include/asm/kvm_host.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/ia64/include/asm/kvm_host.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/ia64/include/asm/kvm_host.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/ia64/include/asm/kvm_host.h</a></div><div class='hunk'>@@ -132,7 +132,7 @@</div><div class='ctx'> #define GPFN_IOSAPIC        (4UL &lt;&lt; 60) /* IOSAPIC base */</div><div class='ctx'> #define GPFN_LEGACY_IO      (5UL &lt;&lt; 60) /* Legacy I/O base */</div><div class='ctx'> #define GPFN_GFW        (6UL &lt;&lt; 60) /* Guest Firmware */</div><div class='del'>-#define GPFN_HIGH_MMIO      (7UL &lt;&lt; 60) /* High MMIO range */</div><div class='add'>+#define GPFN_PHYS_MMIO      (7UL &lt;&lt; 60) /* Directed MMIO Range */</div><div class='ctx'> </div><div class='ctx'> #define GPFN_IO_MASK        (7UL &lt;&lt; 60) /* Guest pfn is I/O type */</div><div class='ctx'> #define GPFN_INV_MASK       (1UL &lt;&lt; 63) /* Guest pfn is invalid */</div><div class='hunk'>@@ -413,6 +413,10 @@ struct kvm_arch {</div><div class='ctx'> 	struct kvm_ioapic *vioapic;</div><div class='ctx'> 	struct kvm_vm_stat stat;</div><div class='ctx'> 	struct kvm_sal_data rdv_sal_data;</div><div class='add'>+</div><div class='add'>+	struct list_head assigned_dev_head;</div><div class='add'>+	struct dmar_domain *intel_iommu_domain;</div><div class='add'>+	struct hlist_head irq_ack_notifier_list;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cpuid3_t {</div><div class='head'>diff --git a/arch/ia64/include/asm/siginfo.h b/arch/ia64/include/asm/siginfo.h<br/>index 9294e4b0c8bc..118d42979003 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/ia64/include/asm/siginfo.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/ia64/include/asm/siginfo.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/ia64/include/asm/siginfo.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/ia64/include/asm/siginfo.h</a></div><div class='hunk'>@@ -113,11 +113,6 @@ typedef struct siginfo {</div><div class='ctx'> #undef NSIGSEGV</div><div class='ctx'> #define NSIGSEGV	3</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * SIGTRAP si_codes</div><div class='del'>- */</div><div class='del'>-#define TRAP_BRANCH	(__SI_FAULT|3)	/* process taken branch trap */</div><div class='del'>-#define TRAP_HWBKPT	(__SI_FAULT|4)	/* hardware breakpoint or watchpoint */</div><div class='ctx'> #undef NSIGTRAP</div><div class='ctx'> #define NSIGTRAP	4</div><div class='ctx'> </div><div class='head'>diff --git a/arch/ia64/include/asm/statfs.h b/arch/ia64/include/asm/statfs.h<br/>index 811097974f31..1e589669de56 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/ia64/include/asm/statfs.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/ia64/include/asm/statfs.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/ia64/include/asm/statfs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/ia64/include/asm/statfs.h</a></div><div class='hunk'>@@ -8,55 +8,13 @@</div><div class='ctx'>  *	David Mosberger-Tang &lt;davidm@hpl.hp.com&gt;, Hewlett-Packard Co</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#ifndef __KERNEL_STRICT_NAMES</div><div class='del'>-# include &lt;linux/types.h&gt;</div><div class='del'>-typedef __kernel_fsid_t	fsid_t;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> /*</div><div class='del'>- * This is ugly --- we're already 64-bit, so just duplicate the definitions</div><div class='add'>+ * We need compat_statfs64 to be packed, because the i386 ABI won't</div><div class='add'>+ * add padding at the end to bring it to a multiple of 8 bytes, but</div><div class='add'>+ * the IA64 ABI will.</div><div class='ctx'>  */</div><div class='del'>-struct statfs {</div><div class='del'>-	long f_type;</div><div class='del'>-	long f_bsize;</div><div class='del'>-	long f_blocks;</div><div class='del'>-	long f_bfree;</div><div class='del'>-	long f_bavail;</div><div class='del'>-	long f_files;</div><div class='del'>-	long f_ffree;</div><div class='del'>-	__kernel_fsid_t f_fsid;</div><div class='del'>-	long f_namelen;</div><div class='del'>-	long f_frsize;</div><div class='del'>-	long f_spare[5];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-struct statfs64 {</div><div class='del'>-	long f_type;</div><div class='del'>-	long f_bsize;</div><div class='del'>-	long f_blocks;</div><div class='del'>-	long f_bfree;</div><div class='del'>-	long f_bavail;</div><div class='del'>-	long f_files;</div><div class='del'>-	long f_ffree;</div><div class='del'>-	__kernel_fsid_t f_fsid;</div><div class='del'>-	long f_namelen;</div><div class='del'>-	long f_frsize;</div><div class='del'>-	long f_spare[5];</div><div class='del'>-};</div><div class='add'>+#define ARCH_PACK_COMPAT_STATFS64 __attribute__((packed,aligned(4)))</div><div class='ctx'> </div><div class='del'>-struct compat_statfs64 {</div><div class='del'>-	__u32 f_type;</div><div class='del'>-	__u32 f_bsize;</div><div class='del'>-	__u64 f_blocks;</div><div class='del'>-	__u64 f_bfree;</div><div class='del'>-	__u64 f_bavail;</div><div class='del'>-	__u64 f_files;</div><div class='del'>-	__u64 f_ffree;</div><div class='del'>-	__kernel_fsid_t f_fsid;</div><div class='del'>-	__u32 f_namelen;</div><div class='del'>-	__u32 f_frsize;</div><div class='del'>-	__u32 f_spare[5];</div><div class='del'>-} __attribute__((packed));</div><div class='add'>+#include &lt;asm-generic/statfs.h&gt;</div><div class='ctx'> </div><div class='ctx'> #endif /* _ASM_IA64_STATFS_H */</div><div class='head'>diff --git a/arch/ia64/kernel/smpboot.c b/arch/ia64/kernel/smpboot.c<br/>index d8f05e504fbf..1dcbb85fc4ee 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/ia64/kernel/smpboot.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/ia64/kernel/smpboot.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/ia64/kernel/smpboot.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/ia64/kernel/smpboot.c</a></div><div class='hunk'>@@ -401,6 +401,7 @@ smp_callin (void)</div><div class='ctx'> 	spin_lock(&amp;vector_lock);</div><div class='ctx'> 	/* Setup the per cpu irq handling data structures */</div><div class='ctx'> 	__setup_vector_irq(cpuid);</div><div class='add'>+	notify_cpu_starting(cpuid);</div><div class='ctx'> 	cpu_set(cpuid, cpu_online_map);</div><div class='ctx'> 	per_cpu(cpu_state, cpuid) = CPU_ONLINE;</div><div class='ctx'> 	spin_unlock(&amp;vector_lock);</div><div class='head'>diff --git a/arch/ia64/kvm/Kconfig b/arch/ia64/kvm/Kconfig<br/>index 7914e4828504..8e99fed6b3fd 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/ia64/kvm/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/ia64/kvm/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/ia64/kvm/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/ia64/kvm/Kconfig</a></div><div class='hunk'>@@ -46,4 +46,6 @@ config KVM_INTEL</div><div class='ctx'> config KVM_TRACE</div><div class='ctx'>        bool</div><div class='ctx'> </div><div class='add'>+source drivers/virtio/Kconfig</div><div class='add'>+</div><div class='ctx'> endif # VIRTUALIZATION</div><div class='head'>diff --git a/arch/ia64/kvm/Makefile b/arch/ia64/kvm/Makefile<br/>index bf22fb9e6dcf..cf37f8f490c0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/ia64/kvm/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>arch/ia64/kvm/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/ia64/kvm/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/ia64/kvm/Makefile</a></div><div class='hunk'>@@ -44,7 +44,11 @@ EXTRA_CFLAGS += -Ivirt/kvm -Iarch/ia64/kvm/</div><div class='ctx'> EXTRA_AFLAGS += -Ivirt/kvm -Iarch/ia64/kvm/</div><div class='ctx'> </div><div class='ctx'> common-objs = $(addprefix ../../../virt/kvm/, kvm_main.o ioapic.o \</div><div class='del'>-		coalesced_mmio.o)</div><div class='add'>+		coalesced_mmio.o irq_comm.o)</div><div class='add'>+</div><div class='add'>+ifeq ($(CONFIG_DMAR),y)</div><div class='add'>+common-objs += $(addprefix ../../../virt/kvm/, vtd.o)</div><div class='add'>+endif</div><div class='ctx'> </div><div class='ctx'> kvm-objs := $(common-objs) kvm-ia64.o kvm_fw.o</div><div class='ctx'> obj-$(CONFIG_KVM) += kvm.o</div><div class='head'>diff --git a/arch/ia64/kvm/irq.h b/arch/ia64/kvm/irq.h<br/>new file mode 100644<br/>index 000000000000..c6786e8b1bf4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/ia64/kvm/irq.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/ia64/kvm/irq.h</a></div><div class='hunk'>@@ -0,0 +1,31 @@</div><div class='add'>+/*</div><div class='add'>+ * irq.h: In-kernel interrupt controller related definitions</div><div class='add'>+ * Copyright (c) 2008, Intel Corporation.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms and conditions of the GNU General Public License,</div><div class='add'>+ * version 2, as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope it will be useful, but WITHOUT</div><div class='add'>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='add'>+ * more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License along with</div><div class='add'>+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple</div><div class='add'>+ * Place - Suite 330, Boston, MA 02111-1307 USA.</div><div class='add'>+ *</div><div class='add'>+ * Authors:</div><div class='add'>+ *   Xiantao Zhang &lt;xiantao.zhang@intel.com&gt;</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __IRQ_H</div><div class='add'>+#define __IRQ_H</div><div class='add'>+</div><div class='add'>+static inline int irqchip_in_kernel(struct kvm *kvm)</div><div class='add'>+{</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/ia64/kvm/kvm-ia64.c b/arch/ia64/kvm/kvm-ia64.c<br/>index cd0d1a7284b7..c0699f0e35a9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/ia64/kvm/kvm-ia64.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/ia64/kvm/kvm-ia64.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/ia64/kvm/kvm-ia64.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/ia64/kvm/kvm-ia64.c</a></div><div class='hunk'>@@ -31,6 +31,7 @@</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='ctx'> #include &lt;linux/hrtimer.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/intel-iommu.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/gcc_intrin.h&gt;</div><div class='hunk'>@@ -45,6 +46,7 @@</div><div class='ctx'> #include "iodev.h"</div><div class='ctx'> #include "ioapic.h"</div><div class='ctx'> #include "lapic.h"</div><div class='add'>+#include "irq.h"</div><div class='ctx'> </div><div class='ctx'> static unsigned long kvm_vmm_base;</div><div class='ctx'> static unsigned long kvm_vsa_base;</div><div class='hunk'>@@ -179,12 +181,16 @@ int kvm_dev_ioctl_check_extension(long ext)</div><div class='ctx'> 	switch (ext) {</div><div class='ctx'> 	case KVM_CAP_IRQCHIP:</div><div class='ctx'> 	case KVM_CAP_USER_MEMORY:</div><div class='add'>+	case KVM_CAP_MP_STATE:</div><div class='ctx'> </div><div class='ctx'> 		r = 1;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case KVM_CAP_COALESCED_MMIO:</div><div class='ctx'> 		r = KVM_COALESCED_MMIO_PAGE_OFFSET;</div><div class='ctx'> 		break;</div><div class='add'>+	case KVM_CAP_IOMMU:</div><div class='add'>+		r = intel_iommu_found();</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		r = 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -771,6 +777,7 @@ static void kvm_init_vm(struct kvm *kvm)</div><div class='ctx'> 	 */</div><div class='ctx'> 	kvm_build_io_pmt(kvm);</div><div class='ctx'> </div><div class='add'>+	INIT_LIST_HEAD(&amp;kvm-&gt;arch.assigned_dev_head);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct  kvm *kvm_arch_create_vm(void)</div><div class='hunk'>@@ -1334,6 +1341,10 @@ static void kvm_release_vm_pages(struct kvm *kvm)</div><div class='ctx'> </div><div class='ctx'> void kvm_arch_destroy_vm(struct kvm *kvm)</div><div class='ctx'> {</div><div class='add'>+	kvm_iommu_unmap_guest(kvm);</div><div class='add'>+#ifdef  KVM_CAP_DEVICE_ASSIGNMENT</div><div class='add'>+	kvm_free_all_assigned_devices(kvm);</div><div class='add'>+#endif</div><div class='ctx'> 	kfree(kvm-&gt;arch.vioapic);</div><div class='ctx'> 	kvm_release_vm_pages(kvm);</div><div class='ctx'> 	kvm_free_physmem(kvm);</div><div class='hunk'>@@ -1435,17 +1446,24 @@ int kvm_arch_set_memory_region(struct kvm *kvm,</div><div class='ctx'> 		int user_alloc)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long i;</div><div class='del'>-	struct page *page;</div><div class='add'>+	unsigned long pfn;</div><div class='ctx'> 	int npages = mem-&gt;memory_size &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> 	struct kvm_memory_slot *memslot = &amp;kvm-&gt;memslots[mem-&gt;slot];</div><div class='ctx'> 	unsigned long base_gfn = memslot-&gt;base_gfn;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; npages; i++) {</div><div class='del'>-		page = gfn_to_page(kvm, base_gfn + i);</div><div class='del'>-		kvm_set_pmt_entry(kvm, base_gfn + i,</div><div class='del'>-				page_to_pfn(page) &lt;&lt; PAGE_SHIFT,</div><div class='del'>-				_PAGE_AR_RWX|_PAGE_MA_WB);</div><div class='del'>-		memslot-&gt;rmap[i] = (unsigned long)page;</div><div class='add'>+		pfn = gfn_to_pfn(kvm, base_gfn + i);</div><div class='add'>+		if (!kvm_is_mmio_pfn(pfn)) {</div><div class='add'>+			kvm_set_pmt_entry(kvm, base_gfn + i,</div><div class='add'>+					pfn &lt;&lt; PAGE_SHIFT,</div><div class='add'>+				_PAGE_AR_RWX | _PAGE_MA_WB);</div><div class='add'>+			memslot-&gt;rmap[i] = (unsigned long)pfn_to_page(pfn);</div><div class='add'>+		} else {</div><div class='add'>+			kvm_set_pmt_entry(kvm, base_gfn + i,</div><div class='add'>+					GPFN_PHYS_MMIO | (pfn &lt;&lt; PAGE_SHIFT),</div><div class='add'>+					_PAGE_MA_UC);</div><div class='add'>+			memslot-&gt;rmap[i] = 0;</div><div class='add'>+			}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1789,11 +1807,43 @@ int kvm_arch_vcpu_runnable(struct kvm_vcpu *vcpu)</div><div class='ctx'> int kvm_arch_vcpu_ioctl_get_mpstate(struct kvm_vcpu *vcpu,</div><div class='ctx'> 				    struct kvm_mp_state *mp_state)</div><div class='ctx'> {</div><div class='del'>-	return -EINVAL;</div><div class='add'>+	vcpu_load(vcpu);</div><div class='add'>+	mp_state-&gt;mp_state = vcpu-&gt;arch.mp_state;</div><div class='add'>+	vcpu_put(vcpu);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vcpu_reset(struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+	long psr;</div><div class='add'>+	local_irq_save(psr);</div><div class='add'>+	r = kvm_insert_vmm_mapping(vcpu);</div><div class='add'>+	if (r)</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	vcpu-&gt;arch.launched = 0;</div><div class='add'>+	kvm_arch_vcpu_uninit(vcpu);</div><div class='add'>+	r = kvm_arch_vcpu_init(vcpu);</div><div class='add'>+	if (r)</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	kvm_purge_vmm_mapping(vcpu);</div><div class='add'>+	r = 0;</div><div class='add'>+fail:</div><div class='add'>+	local_irq_restore(psr);</div><div class='add'>+	return r;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int kvm_arch_vcpu_ioctl_set_mpstate(struct kvm_vcpu *vcpu,</div><div class='ctx'> 				    struct kvm_mp_state *mp_state)</div><div class='ctx'> {</div><div class='del'>-	return -EINVAL;</div><div class='add'>+	int r = 0;</div><div class='add'>+</div><div class='add'>+	vcpu_load(vcpu);</div><div class='add'>+	vcpu-&gt;arch.mp_state = mp_state-&gt;mp_state;</div><div class='add'>+	if (vcpu-&gt;arch.mp_state == KVM_MP_STATE_UNINITIALIZED)</div><div class='add'>+		r = vcpu_reset(vcpu);</div><div class='add'>+	vcpu_put(vcpu);</div><div class='add'>+	return r;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/ia64/kvm/kvm_minstate.h b/arch/ia64/kvm/kvm_minstate.h<br/>index 13980d9b8bcf..2cc41d17cf99 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/ia64/kvm/kvm_minstate.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/ia64/kvm/kvm_minstate.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/ia64/kvm/kvm_minstate.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/ia64/kvm/kvm_minstate.h</a></div><div class='hunk'>@@ -50,27 +50,18 @@</div><div class='ctx'> </div><div class='ctx'> #define PAL_VSA_SYNC_READ						\</div><div class='ctx'> 	/* begin to call pal vps sync_read */				\</div><div class='add'>+{.mii;									\</div><div class='ctx'> 	add r25 = VMM_VPD_BASE_OFFSET, r21;				\</div><div class='del'>-	adds r20 = VMM_VCPU_VSA_BASE_OFFSET, r21;  /* entry point */	\</div><div class='add'>+	nop 0x0;							\</div><div class='add'>+	mov r24=ip;							\</div><div class='ctx'> 	;;								\</div><div class='add'>+}									\</div><div class='add'>+{.mmb									\</div><div class='add'>+	add r24=0x20, r24;						\</div><div class='ctx'> 	ld8 r25 = [r25];      /* read vpd base */			\</div><div class='del'>-	ld8 r20 = [r20];						\</div><div class='del'>-	;;								\</div><div class='del'>-	add r20 = PAL_VPS_SYNC_READ,r20;				\</div><div class='del'>-	;;								\</div><div class='del'>-{ .mii;									\</div><div class='del'>-	nop 0x0;							\</div><div class='del'>-	mov r24 = ip;							\</div><div class='del'>-	mov b0 = r20;							\</div><div class='add'>+	br.cond.sptk kvm_vps_sync_read;		/*call the service*/	\</div><div class='ctx'> 	;;								\</div><div class='ctx'> };									\</div><div class='del'>-{ .mmb;									\</div><div class='del'>-	add r24 = 0x20, r24;						\</div><div class='del'>-	nop 0x0;							\</div><div class='del'>-	br.cond.sptk b0;        /*  call the service */			\</div><div class='del'>-	;;								\</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #define KVM_MINSTATE_GET_CURRENT(reg)   mov reg=r21</div><div class='head'>diff --git a/arch/ia64/kvm/optvfault.S b/arch/ia64/kvm/optvfault.S<br/>index e4f15d641b22..634abad979b5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/ia64/kvm/optvfault.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/ia64/kvm/optvfault.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/ia64/kvm/optvfault.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/ia64/kvm/optvfault.S</a></div><div class='hunk'>@@ -1,9 +1,12 @@</div><div class='ctx'> /*</div><div class='del'>- * arch/ia64/vmx/optvfault.S</div><div class='add'>+ * arch/ia64/kvm/optvfault.S</div><div class='ctx'>  * optimize virtualization fault handler</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2006 Intel Co</div><div class='ctx'>  *	Xuefei Xu (Anthony Xu) &lt;anthony.xu@intel.com&gt;</div><div class='add'>+ * Copyright (C) 2008 Intel Co</div><div class='add'>+ *      Add the support for Tukwila processors.</div><div class='add'>+ *	Xiantao Zhang &lt;xiantao.zhang@intel.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/asmmacro.h&gt;</div><div class='hunk'>@@ -20,6 +23,98 @@</div><div class='ctx'> #define ACCE_MOV_TO_PSR</div><div class='ctx'> #define ACCE_THASH</div><div class='ctx'> </div><div class='add'>+#define VMX_VPS_SYNC_READ			\</div><div class='add'>+	add r16=VMM_VPD_BASE_OFFSET,r21;	\</div><div class='add'>+	mov r17 = b0;				\</div><div class='add'>+	mov r18 = r24;				\</div><div class='add'>+	mov r19 = r25;				\</div><div class='add'>+	mov r20 = r31;				\</div><div class='add'>+	;;					\</div><div class='add'>+{.mii;						\</div><div class='add'>+	ld8 r16 = [r16];			\</div><div class='add'>+	nop 0x0;				\</div><div class='add'>+	mov r24 = ip;				\</div><div class='add'>+	;;					\</div><div class='add'>+};						\</div><div class='add'>+{.mmb;						\</div><div class='add'>+	add r24=0x20, r24;			\</div><div class='add'>+	mov r25 =r16;				\</div><div class='add'>+	br.sptk.many kvm_vps_sync_read;		\</div><div class='add'>+};						\</div><div class='add'>+	mov b0 = r17;				\</div><div class='add'>+	mov r24 = r18;				\</div><div class='add'>+	mov r25 = r19;				\</div><div class='add'>+	mov r31 = r20</div><div class='add'>+</div><div class='add'>+ENTRY(kvm_vps_entry)</div><div class='add'>+	adds r29 = VMM_VCPU_VSA_BASE_OFFSET,r21</div><div class='add'>+	;;</div><div class='add'>+	ld8 r29 = [r29]</div><div class='add'>+	;;</div><div class='add'>+	add r29 = r29, r30</div><div class='add'>+	;;</div><div class='add'>+	mov b0 = r29</div><div class='add'>+	br.sptk.many b0</div><div class='add'>+END(kvm_vps_entry)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *	Inputs:</div><div class='add'>+ *	r24 : return address</div><div class='add'>+ *  	r25 : vpd</div><div class='add'>+ *	r29 : scratch</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+GLOBAL_ENTRY(kvm_vps_sync_read)</div><div class='add'>+	movl r30 = PAL_VPS_SYNC_READ</div><div class='add'>+	;;</div><div class='add'>+	br.sptk.many kvm_vps_entry</div><div class='add'>+END(kvm_vps_sync_read)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *	Inputs:</div><div class='add'>+ *	r24 : return address</div><div class='add'>+ *  	r25 : vpd</div><div class='add'>+ *	r29 : scratch</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+GLOBAL_ENTRY(kvm_vps_sync_write)</div><div class='add'>+	movl r30 = PAL_VPS_SYNC_WRITE</div><div class='add'>+	;;</div><div class='add'>+	br.sptk.many kvm_vps_entry</div><div class='add'>+END(kvm_vps_sync_write)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *	Inputs:</div><div class='add'>+ *	r23 : pr</div><div class='add'>+ *	r24 : guest b0</div><div class='add'>+ *  	r25 : vpd</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+GLOBAL_ENTRY(kvm_vps_resume_normal)</div><div class='add'>+	movl r30 = PAL_VPS_RESUME_NORMAL</div><div class='add'>+	;;</div><div class='add'>+	mov pr=r23,-2</div><div class='add'>+	br.sptk.many kvm_vps_entry</div><div class='add'>+END(kvm_vps_resume_normal)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *	Inputs:</div><div class='add'>+ *	r23 : pr</div><div class='add'>+ *	r24 : guest b0</div><div class='add'>+ *  	r25 : vpd</div><div class='add'>+ *	r17 : isr</div><div class='add'>+ */</div><div class='add'>+GLOBAL_ENTRY(kvm_vps_resume_handler)</div><div class='add'>+	movl r30 = PAL_VPS_RESUME_HANDLER</div><div class='add'>+	;;</div><div class='add'>+	ld8 r27=[r25]</div><div class='add'>+	shr r17=r17,IA64_ISR_IR_BIT</div><div class='add'>+	;;</div><div class='add'>+	dep r27=r17,r27,63,1   // bit 63 of r27 indicate whether enable CFLE</div><div class='add'>+	mov pr=r23,-2</div><div class='add'>+	br.sptk.many kvm_vps_entry</div><div class='add'>+END(kvm_vps_resume_handler)</div><div class='add'>+</div><div class='ctx'> //mov r1=ar3</div><div class='ctx'> GLOBAL_ENTRY(kvm_asm_mov_from_ar)</div><div class='ctx'> #ifndef ACCE_MOV_FROM_AR</div><div class='hunk'>@@ -157,11 +252,11 @@ GLOBAL_ENTRY(kvm_asm_rsm)</div><div class='ctx'> #ifndef ACCE_RSM</div><div class='ctx'> 	br.many kvm_virtualization_fault_back</div><div class='ctx'> #endif</div><div class='del'>-	add r16=VMM_VPD_BASE_OFFSET,r21</div><div class='add'>+	VMX_VPS_SYNC_READ</div><div class='add'>+	;;</div><div class='ctx'> 	extr.u r26=r25,6,21</div><div class='ctx'> 	extr.u r27=r25,31,2</div><div class='ctx'> 	;;</div><div class='del'>-	ld8 r16=[r16]</div><div class='ctx'> 	extr.u r28=r25,36,1</div><div class='ctx'> 	dep r26=r27,r26,21,2</div><div class='ctx'> 	;;</div><div class='hunk'>@@ -196,7 +291,7 @@ GLOBAL_ENTRY(kvm_asm_rsm)</div><div class='ctx'> 	tbit.nz p6,p0=r23,0</div><div class='ctx'> 	;;</div><div class='ctx'> 	tbit.z.or p6,p0=r26,IA64_PSR_DT_BIT</div><div class='del'>-	(p6) br.dptk kvm_resume_to_guest</div><div class='add'>+	(p6) br.dptk kvm_resume_to_guest_with_sync</div><div class='ctx'> 	;;</div><div class='ctx'> 	add r26=VMM_VCPU_META_RR0_OFFSET,r21</div><div class='ctx'> 	add r27=VMM_VCPU_META_RR0_OFFSET+8,r21</div><div class='hunk'>@@ -212,7 +307,7 @@ GLOBAL_ENTRY(kvm_asm_rsm)</div><div class='ctx'> 	mov rr[r28]=r27</div><div class='ctx'> 	;;</div><div class='ctx'> 	srlz.d</div><div class='del'>-	br.many kvm_resume_to_guest</div><div class='add'>+	br.many kvm_resume_to_guest_with_sync</div><div class='ctx'> END(kvm_asm_rsm)</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -221,11 +316,11 @@ GLOBAL_ENTRY(kvm_asm_ssm)</div><div class='ctx'> #ifndef ACCE_SSM</div><div class='ctx'> 	br.many kvm_virtualization_fault_back</div><div class='ctx'> #endif</div><div class='del'>-	add r16=VMM_VPD_BASE_OFFSET,r21</div><div class='add'>+	VMX_VPS_SYNC_READ</div><div class='add'>+	;;</div><div class='ctx'> 	extr.u r26=r25,6,21</div><div class='ctx'> 	extr.u r27=r25,31,2</div><div class='ctx'> 	;;</div><div class='del'>-	ld8 r16=[r16]</div><div class='ctx'> 	extr.u r28=r25,36,1</div><div class='ctx'> 	dep r26=r27,r26,21,2</div><div class='ctx'> 	;;  //r26 is imm24</div><div class='hunk'>@@ -271,7 +366,7 @@ kvm_asm_ssm_1:</div><div class='ctx'> 	tbit.nz p6,p0=r29,IA64_PSR_I_BIT</div><div class='ctx'> 	;;</div><div class='ctx'> 	tbit.z.or p6,p0=r19,IA64_PSR_I_BIT</div><div class='del'>-	(p6) br.dptk kvm_resume_to_guest</div><div class='add'>+	(p6) br.dptk kvm_resume_to_guest_with_sync</div><div class='ctx'> 	;;</div><div class='ctx'> 	add r29=VPD_VTPR_START_OFFSET,r16</div><div class='ctx'> 	add r30=VPD_VHPI_START_OFFSET,r16</div><div class='hunk'>@@ -286,7 +381,7 @@ kvm_asm_ssm_1:</div><div class='ctx'> 	;;</div><div class='ctx'> 	cmp.gt p6,p0=r30,r17</div><div class='ctx'> 	(p6) br.dpnt.few kvm_asm_dispatch_vexirq</div><div class='del'>-	br.many kvm_resume_to_guest</div><div class='add'>+	br.many kvm_resume_to_guest_with_sync</div><div class='ctx'> END(kvm_asm_ssm)</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -295,10 +390,9 @@ GLOBAL_ENTRY(kvm_asm_mov_to_psr)</div><div class='ctx'> #ifndef ACCE_MOV_TO_PSR</div><div class='ctx'> 	br.many kvm_virtualization_fault_back</div><div class='ctx'> #endif</div><div class='del'>-	add r16=VMM_VPD_BASE_OFFSET,r21</div><div class='del'>-	extr.u r26=r25,13,7 //r2</div><div class='add'>+	VMX_VPS_SYNC_READ</div><div class='ctx'> 	;;</div><div class='del'>-	ld8 r16=[r16]</div><div class='add'>+	extr.u r26=r25,13,7 //r2</div><div class='ctx'> 	addl r20=@gprel(asm_mov_from_reg),gp</div><div class='ctx'> 	;;</div><div class='ctx'> 	adds r30=kvm_asm_mov_to_psr_back-asm_mov_from_reg,r20</div><div class='hunk'>@@ -374,7 +468,7 @@ kvm_asm_mov_to_psr_1:</div><div class='ctx'> 	;;</div><div class='ctx'> 	tbit.nz.or p6,p0=r17,IA64_PSR_I_BIT</div><div class='ctx'> 	tbit.z.or p6,p0=r30,IA64_PSR_I_BIT</div><div class='del'>-	(p6) br.dpnt.few kvm_resume_to_guest</div><div class='add'>+	(p6) br.dpnt.few kvm_resume_to_guest_with_sync</div><div class='ctx'> 	;;</div><div class='ctx'> 	add r29=VPD_VTPR_START_OFFSET,r16</div><div class='ctx'> 	add r30=VPD_VHPI_START_OFFSET,r16</div><div class='hunk'>@@ -389,13 +483,29 @@ kvm_asm_mov_to_psr_1:</div><div class='ctx'> 	;;</div><div class='ctx'> 	cmp.gt p6,p0=r30,r17</div><div class='ctx'> 	(p6) br.dpnt.few kvm_asm_dispatch_vexirq</div><div class='del'>-	br.many kvm_resume_to_guest</div><div class='add'>+	br.many kvm_resume_to_guest_with_sync</div><div class='ctx'> END(kvm_asm_mov_to_psr)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> ENTRY(kvm_asm_dispatch_vexirq)</div><div class='ctx'> //increment iip</div><div class='add'>+	mov r17 = b0</div><div class='add'>+	mov r18 = r31</div><div class='add'>+{.mii</div><div class='add'>+	add r25=VMM_VPD_BASE_OFFSET,r21</div><div class='add'>+	nop 0x0</div><div class='add'>+	mov r24 = ip</div><div class='add'>+	;;</div><div class='add'>+}</div><div class='add'>+{.mmb</div><div class='add'>+	add r24 = 0x20, r24</div><div class='add'>+	ld8 r25 = [r25]</div><div class='add'>+	br.sptk.many kvm_vps_sync_write</div><div class='add'>+}</div><div class='add'>+	mov b0 =r17</div><div class='ctx'> 	mov r16=cr.ipsr</div><div class='add'>+	mov r31 = r18</div><div class='add'>+	mov r19 = 37</div><div class='ctx'> 	;;</div><div class='ctx'> 	extr.u r17=r16,IA64_PSR_RI_BIT,2</div><div class='ctx'> 	tbit.nz p6,p7=r16,IA64_PSR_RI_BIT+1</div><div class='hunk'>@@ -435,25 +545,31 @@ GLOBAL_ENTRY(kvm_asm_thash)</div><div class='ctx'> 	;;</div><div class='ctx'> kvm_asm_thash_back1:</div><div class='ctx'> 	shr.u r23=r19,61		// get RR number</div><div class='del'>-	adds r25=VMM_VCPU_VRR0_OFFSET,r21	// get vcpu-&gt;arch.vrr[0]'s addr</div><div class='add'>+	adds r28=VMM_VCPU_VRR0_OFFSET,r21	// get vcpu-&gt;arch.vrr[0]'s addr</div><div class='ctx'> 	adds r16=VMM_VPD_VPTA_OFFSET,r16	// get vpta</div><div class='ctx'> 	;;</div><div class='del'>-	shladd r27=r23,3,r25	// get vcpu-&gt;arch.vrr[r23]'s addr</div><div class='add'>+	shladd r27=r23,3,r28	// get vcpu-&gt;arch.vrr[r23]'s addr</div><div class='ctx'> 	ld8 r17=[r16]		// get PTA</div><div class='ctx'> 	mov r26=1</div><div class='ctx'> 	;;</div><div class='del'>-	extr.u r29=r17,2,6		// get pta.size</div><div class='del'>-	ld8 r25=[r27]		// get vcpu-&gt;arch.vrr[r23]'s value</div><div class='add'>+	extr.u r29=r17,2,6	// get pta.size</div><div class='add'>+	ld8 r28=[r27]		// get vcpu-&gt;arch.vrr[r23]'s value</div><div class='ctx'> 	;;</div><div class='del'>-	extr.u r25=r25,2,6		// get rr.ps</div><div class='add'>+	mov b0=r24</div><div class='add'>+	//Fallback to C if pta.vf is set</div><div class='add'>+	tbit.nz p6,p0=r17, 8</div><div class='add'>+	;;</div><div class='add'>+	(p6) mov r24=EVENT_THASH</div><div class='add'>+	(p6) br.cond.dpnt.many kvm_virtualization_fault_back</div><div class='add'>+	extr.u r28=r28,2,6	// get rr.ps</div><div class='ctx'> 	shl r22=r26,r29		// 1UL &lt;&lt; pta.size</div><div class='ctx'> 	;;</div><div class='del'>-	shr.u r23=r19,r25		// vaddr &gt;&gt; rr.ps</div><div class='add'>+	shr.u r23=r19,r28	// vaddr &gt;&gt; rr.ps</div><div class='ctx'> 	adds r26=3,r29		// pta.size + 3</div><div class='ctx'> 	shl r27=r17,3		// pta &lt;&lt; 3</div><div class='ctx'> 	;;</div><div class='ctx'> 	shl r23=r23,3		// (vaddr &gt;&gt; rr.ps) &lt;&lt; 3</div><div class='del'>-	shr.u r27=r27,r26		// (pta &lt;&lt; 3) &gt;&gt; (pta.size+3)</div><div class='add'>+	shr.u r27=r27,r26	// (pta &lt;&lt; 3) &gt;&gt; (pta.size+3)</div><div class='ctx'> 	movl r16=7&lt;&lt;61</div><div class='ctx'> 	;;</div><div class='ctx'> 	adds r22=-1,r22		// (1UL &lt;&lt; pta.size) - 1</div><div class='hunk'>@@ -724,6 +840,29 @@ END(asm_mov_from_reg)</div><div class='ctx'>  * r31: pr</div><div class='ctx'>  * r24: b0</div><div class='ctx'>  */</div><div class='add'>+ENTRY(kvm_resume_to_guest_with_sync)</div><div class='add'>+	adds r19=VMM_VPD_BASE_OFFSET,r21</div><div class='add'>+	mov r16 = r31</div><div class='add'>+	mov r17 = r24</div><div class='add'>+	;;</div><div class='add'>+{.mii</div><div class='add'>+	ld8 r25 =[r19]</div><div class='add'>+	nop 0x0</div><div class='add'>+	mov r24 = ip</div><div class='add'>+	;;</div><div class='add'>+}</div><div class='add'>+{.mmb</div><div class='add'>+	add r24 =0x20, r24</div><div class='add'>+	nop 0x0</div><div class='add'>+	br.sptk.many kvm_vps_sync_write</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+	mov r31 = r16</div><div class='add'>+	mov r24 =r17</div><div class='add'>+	;;</div><div class='add'>+	br.sptk.many kvm_resume_to_guest</div><div class='add'>+END(kvm_resume_to_guest_with_sync)</div><div class='add'>+</div><div class='ctx'> ENTRY(kvm_resume_to_guest)</div><div class='ctx'> 	adds r16 = VMM_VCPU_SAVED_GP_OFFSET,r21</div><div class='ctx'> 	;;</div><div class='head'>diff --git a/arch/ia64/kvm/process.c b/arch/ia64/kvm/process.c<br/>index 5a33f7ed29a0..3417783ae164 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/ia64/kvm/process.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/ia64/kvm/process.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/ia64/kvm/process.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/ia64/kvm/process.c</a></div><div class='hunk'>@@ -962,9 +962,9 @@ static void kvm_do_resume_op(struct kvm_vcpu *vcpu)</div><div class='ctx'> void vmm_transition(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='ctx'> 	ia64_call_vsa(PAL_VPS_SAVE, (unsigned long)vcpu-&gt;arch.vpd,</div><div class='del'>-			0, 0, 0, 0, 0, 0);</div><div class='add'>+			1, 0, 0, 0, 0, 0);</div><div class='ctx'> 	vmm_trampoline(&amp;vcpu-&gt;arch.guest, &amp;vcpu-&gt;arch.host);</div><div class='ctx'> 	ia64_call_vsa(PAL_VPS_RESTORE, (unsigned long)vcpu-&gt;arch.vpd,</div><div class='del'>-						0, 0, 0, 0, 0, 0);</div><div class='add'>+						1, 0, 0, 0, 0, 0);</div><div class='ctx'> 	kvm_do_resume_op(vcpu);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/ia64/kvm/vcpu.h b/arch/ia64/kvm/vcpu.h<br/>index b0fcfb62c49e..341e3fee280c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/ia64/kvm/vcpu.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/ia64/kvm/vcpu.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/ia64/kvm/vcpu.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/ia64/kvm/vcpu.h</a></div><div class='hunk'>@@ -313,21 +313,21 @@ static inline void vcpu_set_tr(struct thash_data *trp, u64 pte, u64 itir,</div><div class='ctx'> 	trp-&gt;rid = rid;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-extern u64 kvm_lookup_mpa(u64 gpfn);</div><div class='del'>-extern u64 kvm_gpa_to_mpa(u64 gpa);</div><div class='del'>-</div><div class='del'>-/* Return I/O type if trye */</div><div class='del'>-#define __gpfn_is_io(gpfn)			\</div><div class='del'>-	({						\</div><div class='del'>-	 u64 pte, ret = 0;			\</div><div class='del'>-	 pte = kvm_lookup_mpa(gpfn);		\</div><div class='del'>-	 if (!(pte &amp; GPFN_INV_MASK))		\</div><div class='del'>-	 ret = pte &amp; GPFN_IO_MASK;	\</div><div class='del'>-	 ret;					\</div><div class='del'>-	 })</div><div class='add'>+extern u64 kvm_get_mpt_entry(u64 gpfn);</div><div class='ctx'> </div><div class='add'>+/* Return I/ */</div><div class='add'>+static inline u64 __gpfn_is_io(u64 gpfn)</div><div class='add'>+{</div><div class='add'>+	u64  pte;</div><div class='add'>+	pte = kvm_get_mpt_entry(gpfn);</div><div class='add'>+	if (!(pte &amp; GPFN_INV_MASK)) {</div><div class='add'>+		pte = pte &amp; GPFN_IO_MASK;</div><div class='add'>+		if (pte != GPFN_PHYS_MMIO)</div><div class='add'>+			return pte;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> #endif</div><div class='del'>-</div><div class='ctx'> #define IA64_NO_FAULT	0</div><div class='ctx'> #define IA64_FAULT	1</div><div class='ctx'> </div><div class='head'>diff --git a/arch/ia64/kvm/vmm_ivt.S b/arch/ia64/kvm/vmm_ivt.S<br/>index 3ee5f481c06d..c1d7251a1480 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/ia64/kvm/vmm_ivt.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/ia64/kvm/vmm_ivt.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/ia64/kvm/vmm_ivt.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/ia64/kvm/vmm_ivt.S</a></div><div class='hunk'>@@ -1261,11 +1261,6 @@ kvm_rse_clear_invalid:</div><div class='ctx'>     adds r19=VMM_VPD_VPSR_OFFSET,r18</div><div class='ctx'>     ;;</div><div class='ctx'>     ld8 r19=[r19]        //vpsr</div><div class='del'>-    adds r20=VMM_VCPU_VSA_BASE_OFFSET,r21</div><div class='del'>-    ;;</div><div class='del'>-    ld8 r20=[r20]</div><div class='del'>-    ;;</div><div class='del'>-//vsa_sync_write_start</div><div class='ctx'>     mov r25=r18</div><div class='ctx'>     adds r16= VMM_VCPU_GP_OFFSET,r21</div><div class='ctx'>     ;;</div><div class='hunk'>@@ -1274,10 +1269,7 @@ kvm_rse_clear_invalid:</div><div class='ctx'>     ;;</div><div class='ctx'>     add  r24=r24,r16</div><div class='ctx'>     ;;</div><div class='del'>-    add r16=PAL_VPS_SYNC_WRITE,r20</div><div class='del'>-    ;;</div><div class='del'>-    mov b0=r16</div><div class='del'>-    br.cond.sptk b0         // call the service</div><div class='add'>+    br.sptk.many  kvm_vps_sync_write       // call the service</div><div class='ctx'>     ;;</div><div class='ctx'> END(ia64_leave_hypervisor)</div><div class='ctx'> // fall through</div><div class='hunk'>@@ -1288,28 +1280,15 @@ GLOBAL_ENTRY(ia64_vmm_entry)</div><div class='ctx'>  *  r17:cr.isr</div><div class='ctx'>  *  r18:vpd</div><div class='ctx'>  *  r19:vpsr</div><div class='del'>- *  r20:__vsa_base</div><div class='ctx'>  *  r22:b0</div><div class='ctx'>  *  r23:predicate</div><div class='ctx'>  */</div><div class='ctx'>     mov r24=r22</div><div class='ctx'>     mov r25=r18</div><div class='ctx'>     tbit.nz p1,p2 = r19,IA64_PSR_IC_BIT        // p1=vpsr.ic</div><div class='add'>+    (p1) br.cond.sptk.few kvm_vps_resume_normal</div><div class='add'>+    (p2) br.cond.sptk.many kvm_vps_resume_handler</div><div class='ctx'>     ;;</div><div class='del'>-    (p1) add r29=PAL_VPS_RESUME_NORMAL,r20</div><div class='del'>-    (p1) br.sptk.many ia64_vmm_entry_out</div><div class='del'>-    ;;</div><div class='del'>-    tbit.nz p1,p2 = r17,IA64_ISR_IR_BIT		//p1=cr.isr.ir</div><div class='del'>-    ;;</div><div class='del'>-    (p1) add r29=PAL_VPS_RESUME_NORMAL,r20</div><div class='del'>-    (p2) add r29=PAL_VPS_RESUME_HANDLER,r20</div><div class='del'>-    (p2) ld8 r26=[r25]</div><div class='del'>-    ;;</div><div class='del'>-ia64_vmm_entry_out:</div><div class='del'>-    mov pr=r23,-2</div><div class='del'>-    mov b0=r29</div><div class='del'>-    ;;</div><div class='del'>-    br.cond.sptk b0             // call pal service</div><div class='ctx'> END(ia64_vmm_entry)</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -1376,6 +1355,9 @@ GLOBAL_ENTRY(vmm_reset_entry)</div><div class='ctx'>     //set up ipsr, iip, vpd.vpsr, dcr</div><div class='ctx'>     // For IPSR: it/dt/rt=1, i/ic=1, si=1, vm/bn=1</div><div class='ctx'>     // For DCR: all bits 0</div><div class='add'>+    bsw.0</div><div class='add'>+    ;;</div><div class='add'>+    mov r21 =r13</div><div class='ctx'>     adds r14=-VMM_PT_REGS_SIZE, r12</div><div class='ctx'>     ;;</div><div class='ctx'>     movl r6=0x501008826000      // IPSR dt/rt/it:1;i/ic:1, si:1, vm/bn:1</div><div class='hunk'>@@ -1387,12 +1369,6 @@ GLOBAL_ENTRY(vmm_reset_entry)</div><div class='ctx'>     ;;</div><div class='ctx'>     srlz.i</div><div class='ctx'>     ;;</div><div class='del'>-    bsw.0</div><div class='del'>-    ;;</div><div class='del'>-    mov r21 =r13</div><div class='del'>-    ;;</div><div class='del'>-    bsw.1</div><div class='del'>-    ;;</div><div class='ctx'>     mov ar.rsc = 0</div><div class='ctx'>     ;;</div><div class='ctx'>     flushrs</div><div class='hunk'>@@ -1406,12 +1382,9 @@ GLOBAL_ENTRY(vmm_reset_entry)</div><div class='ctx'>     ld8 r1 = [r20]</div><div class='ctx'>     ;;</div><div class='ctx'>     mov cr.iip=r4</div><div class='del'>-    ;;</div><div class='ctx'>     adds r16=VMM_VPD_BASE_OFFSET,r13</div><div class='del'>-    adds r20=VMM_VCPU_VSA_BASE_OFFSET,r13</div><div class='ctx'>     ;;</div><div class='ctx'>     ld8 r18=[r16]</div><div class='del'>-    ld8 r20=[r20]</div><div class='ctx'>     ;;</div><div class='ctx'>     adds r19=VMM_VPD_VPSR_OFFSET,r18</div><div class='ctx'>     ;;</div><div class='head'>diff --git a/arch/ia64/kvm/vtlb.c b/arch/ia64/kvm/vtlb.c<br/>index def4576d22b1..e22b93361e08 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/ia64/kvm/vtlb.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/ia64/kvm/vtlb.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/ia64/kvm/vtlb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/ia64/kvm/vtlb.c</a></div><div class='hunk'>@@ -390,7 +390,7 @@ void thash_purge_entries_remote(struct kvm_vcpu *v, u64 va, u64 ps)</div><div class='ctx'> </div><div class='ctx'> u64 translate_phy_pte(u64 *pte, u64 itir, u64 va)</div><div class='ctx'> {</div><div class='del'>-	u64 ps, ps_mask, paddr, maddr;</div><div class='add'>+	u64 ps, ps_mask, paddr, maddr, io_mask;</div><div class='ctx'> 	union pte_flags phy_pte;</div><div class='ctx'> </div><div class='ctx'> 	ps = itir_ps(itir);</div><div class='hunk'>@@ -398,8 +398,9 @@ u64 translate_phy_pte(u64 *pte, u64 itir, u64 va)</div><div class='ctx'> 	phy_pte.val = *pte;</div><div class='ctx'> 	paddr = *pte;</div><div class='ctx'> 	paddr = ((paddr &amp; _PAGE_PPN_MASK) &amp; ps_mask) | (va &amp; ~ps_mask);</div><div class='del'>-	maddr = kvm_lookup_mpa(paddr &gt;&gt; PAGE_SHIFT);</div><div class='del'>-	if (maddr &amp; GPFN_IO_MASK) {</div><div class='add'>+	maddr = kvm_get_mpt_entry(paddr &gt;&gt; PAGE_SHIFT);</div><div class='add'>+	io_mask = maddr &amp; GPFN_IO_MASK;</div><div class='add'>+	if (io_mask &amp;&amp; (io_mask != GPFN_PHYS_MMIO)) {</div><div class='ctx'> 		*pte |= VTLB_PTE_IO;</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -418,7 +419,7 @@ int thash_purge_and_insert(struct kvm_vcpu *v, u64 pte, u64 itir,</div><div class='ctx'> 						u64 ifa, int type)</div><div class='ctx'> {</div><div class='ctx'> 	u64 ps;</div><div class='del'>-	u64 phy_pte;</div><div class='add'>+	u64 phy_pte, io_mask, index;</div><div class='ctx'> 	union ia64_rr vrr, mrr;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -426,13 +427,16 @@ int thash_purge_and_insert(struct kvm_vcpu *v, u64 pte, u64 itir,</div><div class='ctx'> 	vrr.val = vcpu_get_rr(v, ifa);</div><div class='ctx'> 	mrr.val = ia64_get_rr(ifa);</div><div class='ctx'> </div><div class='add'>+	index = (pte &amp; _PAGE_PPN_MASK) &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	io_mask = kvm_get_mpt_entry(index) &amp; GPFN_IO_MASK;</div><div class='ctx'> 	phy_pte = translate_phy_pte(&amp;pte, itir, ifa);</div><div class='ctx'> </div><div class='ctx'> 	/* Ensure WB attribute if pte is related to a normal mem page,</div><div class='ctx'> 	 * which is required by vga acceleration since qemu maps shared</div><div class='ctx'> 	 * vram buffer with WB.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!(pte &amp; VTLB_PTE_IO) &amp;&amp; ((pte &amp; _PAGE_MA_MASK) != _PAGE_MA_NAT)) {</div><div class='add'>+	if (!(pte &amp; VTLB_PTE_IO) &amp;&amp; ((pte &amp; _PAGE_MA_MASK) != _PAGE_MA_NAT) &amp;&amp;</div><div class='add'>+			io_mask != GPFN_PHYS_MMIO) {</div><div class='ctx'> 		pte &amp;= ~_PAGE_MA_MASK;</div><div class='ctx'> 		phy_pte &amp;= ~_PAGE_MA_MASK;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -566,12 +570,19 @@ void thash_init(struct thash_cb *hcb, u64 sz)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u64 kvm_lookup_mpa(u64 gpfn)</div><div class='add'>+u64 kvm_get_mpt_entry(u64 gpfn)</div><div class='ctx'> {</div><div class='ctx'> 	u64 *base = (u64 *) KVM_P2M_BASE;</div><div class='ctx'> 	return *(base + gpfn);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+u64 kvm_lookup_mpa(u64 gpfn)</div><div class='add'>+{</div><div class='add'>+	u64 maddr;</div><div class='add'>+	maddr = kvm_get_mpt_entry(gpfn);</div><div class='add'>+	return maddr&amp;_PAGE_PPN_MASK;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> u64 kvm_gpa_to_mpa(u64 gpa)</div><div class='ctx'> {</div><div class='ctx'> 	u64 pte = kvm_lookup_mpa(gpa &gt;&gt; PAGE_SHIFT);</div><div class='head'>diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c<br/>index 200100ea7610..f482a9098e32 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/ia64/mm/init.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/ia64/mm/init.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/ia64/mm/init.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/ia64/mm/init.c</a></div><div class='hunk'>@@ -21,7 +21,6 @@</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='ctx'> #include &lt;linux/kexec.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/a.out.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='ctx'> #include &lt;asm/ia32.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='head'>diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig<br/>index f57113f1f892..00289c178f89 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/m32r/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/m32r/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/m32r/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/m32r/Kconfig</a></div><div class='hunk'>@@ -36,9 +36,6 @@ config NO_IOPORT</div><div class='ctx'> config NO_DMA</div><div class='ctx'> 	def_bool y</div><div class='ctx'> </div><div class='del'>-config ARCH_SUPPORTS_AOUT</div><div class='del'>-	def_bool y</div><div class='del'>-</div><div class='ctx'> config HZ</div><div class='ctx'> 	int</div><div class='ctx'> 	default 100</div><div class='head'>diff --git a/arch/m32r/kernel/process.c b/arch/m32r/kernel/process.c<br/>index 5be4faaf5b1c..7103d91e1a2f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/m32r/kernel/process.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/m32r/kernel/process.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/m32r/kernel/process.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/m32r/kernel/process.c</a></div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> #undef DEBUG_PROCESS</div><div class='ctx'> #ifdef DEBUG_PROCESS</div><div class='ctx'> #define DPRINTK(fmt, args...)  printk("%s:%d:%s: " fmt, __FILE__, __LINE__, \</div><div class='del'>-  __FUNCTION__, ##args)</div><div class='add'>+  __func__, ##args)</div><div class='ctx'> #else</div><div class='ctx'> #define DPRINTK(fmt, args...)</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/m32r/kernel/smpboot.c b/arch/m32r/kernel/smpboot.c<br/>index 2c03ac1d005f..fc2994811f15 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/m32r/kernel/smpboot.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/m32r/kernel/smpboot.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/m32r/kernel/smpboot.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/m32r/kernel/smpboot.c</a></div><div class='hunk'>@@ -498,6 +498,8 @@ static void __init smp_online(void)</div><div class='ctx'> {</div><div class='ctx'> 	int cpu_id = smp_processor_id();</div><div class='ctx'> </div><div class='add'>+	notify_cpu_starting(cpu_id);</div><div class='add'>+</div><div class='ctx'> 	local_irq_enable();</div><div class='ctx'> </div><div class='ctx'> 	/* Get our bogomips. */</div><div class='head'>diff --git a/arch/m32r/mm/discontig.c b/arch/m32r/mm/discontig.c<br/>index cbc3c4c54566..7daf897292cf 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/m32r/mm/discontig.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/m32r/mm/discontig.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/m32r/mm/discontig.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/m32r/mm/discontig.c</a></div><div class='hunk'>@@ -111,9 +111,9 @@ unsigned long __init setup_memory(void)</div><div class='ctx'> 				initrd_start, INITRD_SIZE);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			printk("initrd extends beyond end of memory "</div><div class='del'>-				"(0x%08lx &gt; 0x%08lx)\ndisabling initrd\n",</div><div class='add'>+				"(0x%08lx &gt; 0x%08llx)\ndisabling initrd\n",</div><div class='ctx'> 				INITRD_START + INITRD_SIZE,</div><div class='del'>-				PFN_PHYS(max_low_pfn));</div><div class='add'>+			        (unsigned long long)PFN_PHYS(max_low_pfn));</div><div class='ctx'> </div><div class='ctx'> 			initrd_start = 0;</div><div class='ctx'> 		}</div><div class='head'>diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig<br/>index 8c5e1de68fcb..677c93a490f6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/m68k/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/m68k/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/m68k/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/m68k/Kconfig</a></div><div class='hunk'>@@ -5,6 +5,7 @@</div><div class='ctx'> config M68K</div><div class='ctx'> 	bool</div><div class='ctx'> 	default y</div><div class='add'>+	select HAVE_AOUT</div><div class='ctx'> 	select HAVE_IDE</div><div class='ctx'> </div><div class='ctx'> config MMU</div><div class='hunk'>@@ -53,9 +54,6 @@ config NO_IOPORT</div><div class='ctx'> config NO_DMA</div><div class='ctx'> 	def_bool SUN3</div><div class='ctx'> </div><div class='del'>-config ARCH_SUPPORTS_AOUT</div><div class='del'>-	def_bool y</div><div class='del'>-</div><div class='ctx'> config HZ</div><div class='ctx'> 	int</div><div class='ctx'> 	default 100</div><div class='hunk'>@@ -107,21 +105,9 @@ config PCMCIA</div><div class='ctx'> 	  To compile this driver as modules, choose M here: the</div><div class='ctx'> 	  modules will be called pcmcia_core and ds.</div><div class='ctx'> </div><div class='del'>-config SUN3</div><div class='del'>-	bool "Sun3 support"</div><div class='del'>-	select M68020</div><div class='del'>-	select MMU_SUN3 if MMU</div><div class='del'>-	help</div><div class='del'>-	  This option enables support for the Sun 3 series of workstations</div><div class='del'>-	  (3/50, 3/60, 3/1xx, 3/2xx systems). Enabling this option requires</div><div class='del'>-	  that all other hardware types must be disabled, as Sun 3 kernels</div><div class='del'>-	  are incompatible with all other m68k targets (including Sun 3x!).</div><div class='del'>-</div><div class='del'>-	  If you don't want to compile a kernel exclusively for a Sun 3, say N.</div><div class='del'>-</div><div class='ctx'> config AMIGA</div><div class='ctx'> 	bool "Amiga support"</div><div class='del'>-	depends on !MMU_SUN3</div><div class='add'>+	select MMU_MOTOROLA if MMU</div><div class='ctx'> 	help</div><div class='ctx'> 	  This option enables support for the Amiga series of computers. If</div><div class='ctx'> 	  you plan to use this kernel on an Amiga, say Y here and browse the</div><div class='hunk'>@@ -129,33 +115,16 @@ config AMIGA</div><div class='ctx'> </div><div class='ctx'> config ATARI</div><div class='ctx'> 	bool "Atari support"</div><div class='del'>-	depends on !MMU_SUN3</div><div class='add'>+	select MMU_MOTOROLA if MMU</div><div class='ctx'> 	help</div><div class='ctx'> 	  This option enables support for the 68000-based Atari series of</div><div class='ctx'> 	  computers (including the TT, Falcon and Medusa). If you plan to use</div><div class='ctx'> 	  this kernel on an Atari, say Y here and browse the material</div><div class='ctx'> 	  available in &lt;file:Documentation/m68k&gt;; otherwise say N.</div><div class='ctx'> </div><div class='del'>-config HADES</div><div class='del'>-	bool "Hades support"</div><div class='del'>-	depends on ATARI &amp;&amp; BROKEN</div><div class='del'>-	help</div><div class='del'>-	  This option enables support for the Hades Atari clone. If you plan</div><div class='del'>-	  to use this kernel on a Hades, say Y here; otherwise say N.</div><div class='del'>-</div><div class='del'>-config PCI</div><div class='del'>-	bool</div><div class='del'>-	depends on HADES</div><div class='del'>-	default y</div><div class='del'>-	help</div><div class='del'>-	  Find out whether you have a PCI motherboard. PCI is the name of a</div><div class='del'>-	  bus system, i.e. the way the CPU talks to the other stuff inside</div><div class='del'>-	  your box. Other bus systems are ISA, EISA, MicroChannel (MCA) or</div><div class='del'>-	  VESA. If you have PCI, say Y, otherwise N.</div><div class='del'>-</div><div class='ctx'> config MAC</div><div class='ctx'> 	bool "Macintosh support"</div><div class='del'>-	depends on !MMU_SUN3</div><div class='add'>+	select MMU_MOTOROLA if MMU</div><div class='ctx'> 	help</div><div class='ctx'> 	  This option enables support for the Apple Macintosh series of</div><div class='ctx'> 	  computers (yes, there is experimental support now, at least for part</div><div class='hunk'>@@ -176,14 +145,14 @@ config M68K_L2_CACHE</div><div class='ctx'> </div><div class='ctx'> config APOLLO</div><div class='ctx'> 	bool "Apollo support"</div><div class='del'>-	depends on !MMU_SUN3</div><div class='add'>+	select MMU_MOTOROLA if MMU</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say Y here if you want to run Linux on an MC680x0-based Apollo</div><div class='ctx'> 	  Domain workstation such as the DN3500.</div><div class='ctx'> </div><div class='ctx'> config VME</div><div class='ctx'> 	bool "VME (Motorola and BVM) support"</div><div class='del'>-	depends on !MMU_SUN3</div><div class='add'>+	select MMU_MOTOROLA if MMU</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say Y here if you want to build a kernel for a 680x0 based VME</div><div class='ctx'> 	  board.  Boards currently supported include Motorola boards MVME147,</div><div class='hunk'>@@ -220,7 +189,7 @@ config BVME6000</div><div class='ctx'> </div><div class='ctx'> config HP300</div><div class='ctx'> 	bool "HP9000/300 and HP9000/400 support"</div><div class='del'>-	depends on !MMU_SUN3</div><div class='add'>+	select MMU_MOTOROLA if MMU</div><div class='ctx'> 	help</div><div class='ctx'> 	  This option enables support for the HP9000/300 and HP9000/400 series</div><div class='ctx'> 	  of workstations. Support for these machines is still somewhat</div><div class='hunk'>@@ -239,7 +208,7 @@ config DIO</div><div class='ctx'> </div><div class='ctx'> config SUN3X</div><div class='ctx'> 	bool "Sun3x support"</div><div class='del'>-	depends on !MMU_SUN3</div><div class='add'>+	select MMU_MOTOROLA if MMU</div><div class='ctx'> 	select M68030</div><div class='ctx'> 	help</div><div class='ctx'> 	  This option enables support for the Sun 3x series of workstations.</div><div class='hunk'>@@ -252,7 +221,7 @@ config SUN3X</div><div class='ctx'> </div><div class='ctx'> config Q40</div><div class='ctx'> 	bool "Q40/Q60 support"</div><div class='del'>-	depends on !MMU_SUN3</div><div class='add'>+	select MMU_MOTOROLA if MMU</div><div class='ctx'> 	help</div><div class='ctx'> 	  The Q40 is a Motorola 68040-based successor to the Sinclair QL</div><div class='ctx'> 	  manufactured in Germany.  There is an official Q40 home page at</div><div class='hunk'>@@ -260,6 +229,19 @@ config Q40</div><div class='ctx'> 	  Q60. Select your CPU below.  For 68LC060 don't forget to enable FPU</div><div class='ctx'> 	  emulation.</div><div class='ctx'> </div><div class='add'>+config SUN3</div><div class='add'>+	bool "Sun3 support"</div><div class='add'>+	depends on !MMU_MOTOROLA</div><div class='add'>+	select MMU_SUN3 if MMU</div><div class='add'>+	select M68020</div><div class='add'>+	help</div><div class='add'>+	  This option enables support for the Sun 3 series of workstations</div><div class='add'>+	  (3/50, 3/60, 3/1xx, 3/2xx systems). Enabling this option requires</div><div class='add'>+	  that all other hardware types must be disabled, as Sun 3 kernels</div><div class='add'>+	  are incompatible with all other m68k targets (including Sun 3x!).</div><div class='add'>+</div><div class='add'>+	  If you don't want to compile a kernel exclusively for a Sun 3, say N.</div><div class='add'>+</div><div class='ctx'> comment "Processor type"</div><div class='ctx'> </div><div class='ctx'> config M68020</div><div class='hunk'>@@ -297,10 +279,10 @@ config M68060</div><div class='ctx'> config MMU_MOTOROLA</div><div class='ctx'> 	bool</div><div class='ctx'> 	depends on MMU &amp;&amp; !MMU_SUN3</div><div class='del'>-	default y</div><div class='ctx'> </div><div class='ctx'> config MMU_SUN3</div><div class='ctx'> 	bool</div><div class='add'>+	depends on MMU &amp;&amp; !MMU_MOTOROLA</div><div class='ctx'> </div><div class='ctx'> config M68KFPU_EMU</div><div class='ctx'> 	bool "Math emulation support (EXPERIMENTAL)"</div><div class='head'>diff --git a/arch/m68k/amiga/config.c b/arch/m68k/amiga/config.c<br/>index df679d96b1cb..0a3f9e8ebde0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/m68k/amiga/config.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/m68k/amiga/config.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/m68k/amiga/config.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/m68k/amiga/config.c</a></div><div class='hunk'>@@ -24,6 +24,7 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/zorro.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/keyboard.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/bootinfo.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='hunk'>@@ -984,3 +985,11 @@ static int amiga_get_hardware_list(char *buffer)</div><div class='ctx'> </div><div class='ctx'> 	return len;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The Amiga keyboard driver needs key_maps, but we cannot export it in</div><div class='add'>+ * drivers/char/defkeymap.c, as it is autogenerated</div><div class='add'>+ */</div><div class='add'>+#ifdef CONFIG_HW_CONSOLE</div><div class='add'>+EXPORT_SYMBOL_GPL(key_maps);</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/m68k/atari/Makefile b/arch/m68k/atari/Makefile<br/>index 2cd905efe63a..0cac723306f9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/m68k/atari/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>arch/m68k/atari/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/m68k/atari/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/m68k/atari/Makefile</a></div><div class='hunk'>@@ -5,7 +5,4 @@</div><div class='ctx'> obj-y		:= config.o time.o debug.o ataints.o stdma.o \</div><div class='ctx'> 			atasound.o stram.o</div><div class='ctx'> </div><div class='del'>-ifeq ($(CONFIG_PCI),y)</div><div class='del'>-obj-$(CONFIG_HADES)	+= hades-pci.o</div><div class='del'>-endif</div><div class='ctx'> obj-$(CONFIG_ATARI_KBD_CORE)	+= atakeyb.o</div><div class='head'>diff --git a/arch/m68k/atari/ataints.c b/arch/m68k/atari/ataints.c<br/>index b45593a60bdd..dba4afabb444 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/m68k/atari/ataints.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/m68k/atari/ataints.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/m68k/atari/ataints.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/m68k/atari/ataints.c</a></div><div class='hunk'>@@ -407,10 +407,8 @@ void __init atari_init_IRQ(void)</div><div class='ctx'> 		 * gets overruns)</div><div class='ctx'> 		 */</div><div class='ctx'> </div><div class='del'>-		if (!MACH_IS_HADES) {</div><div class='del'>-			vectors[VEC_INT2] = falcon_hblhandler;</div><div class='del'>-			vectors[VEC_INT4] = falcon_hblhandler;</div><div class='del'>-		}</div><div class='add'>+		vectors[VEC_INT2] = falcon_hblhandler;</div><div class='add'>+		vectors[VEC_INT4] = falcon_hblhandler;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ATARIHW_PRESENT(PCM_8BIT) &amp;&amp; ATARIHW_PRESENT(MICROWIRE)) {</div><div class='head'>diff --git a/arch/m68k/atari/atakeyb.c b/arch/m68k/atari/atakeyb.c<br/>index bb959fbab2dc..c038b7c7eff0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/m68k/atari/atakeyb.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/m68k/atari/atakeyb.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/m68k/atari/atakeyb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/m68k/atari/atakeyb.c</a></div><div class='hunk'>@@ -635,15 +635,3 @@ int atari_keyb_init(void)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(atari_keyb_init);</div><div class='del'>-</div><div class='del'>-int atari_kbd_translate(unsigned char keycode, unsigned char *keycodep, char raw_mode)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_MAGIC_SYSRQ</div><div class='del'>-	/* ALT+HELP pressed? */</div><div class='del'>-	if ((keycode == 98) &amp;&amp; ((shift_state &amp; 0xff) == 8))</div><div class='del'>-		*keycodep = 0xff;</div><div class='del'>-	else</div><div class='del'>-#endif</div><div class='del'>-		*keycodep = keycode;</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='head'>diff --git a/arch/m68k/atari/config.c b/arch/m68k/atari/config.c<br/>index 5945e1505558..af031855f796 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/m68k/atari/config.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/m68k/atari/config.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/m68k/atari/config.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/m68k/atari/config.c</a></div><div class='hunk'>@@ -231,7 +231,7 @@ void __init config_atari(void)</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	printk("Atari hardware found: ");</div><div class='del'>-	if (MACH_IS_MEDUSA || MACH_IS_HADES) {</div><div class='add'>+	if (MACH_IS_MEDUSA) {</div><div class='ctx'> 		/* There's no Atari video hardware on the Medusa, but all the</div><div class='ctx'> 		 * addresses below generate a DTACK so no bus error occurs! */</div><div class='ctx'> 	} else if (hwreg_present(f030_xreg)) {</div><div class='hunk'>@@ -269,10 +269,6 @@ void __init config_atari(void)</div><div class='ctx'> 		ATARIHW_SET(SCSI_DMA);</div><div class='ctx'> 		printk("TT_SCSI_DMA ");</div><div class='ctx'> 	}</div><div class='del'>-	if (!MACH_IS_HADES &amp;&amp; hwreg_present(&amp;st_dma.dma_hi)) {</div><div class='del'>-		ATARIHW_SET(STND_DMA);</div><div class='del'>-		printk("STND_DMA ");</div><div class='del'>-	}</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The ST-DMA address registers aren't readable</div><div class='ctx'> 	 * on all Medusas, so the test below may fail</div><div class='hunk'>@@ -294,12 +290,11 @@ void __init config_atari(void)</div><div class='ctx'> 		ATARIHW_SET(YM_2149);</div><div class='ctx'> 		printk("YM2149 ");</div><div class='ctx'> 	}</div><div class='del'>-	if (!MACH_IS_MEDUSA &amp;&amp; !MACH_IS_HADES &amp;&amp;</div><div class='del'>-		hwreg_present(&amp;tt_dmasnd.ctrl)) {</div><div class='add'>+	if (!MACH_IS_MEDUSA &amp;&amp; hwreg_present(&amp;tt_dmasnd.ctrl)) {</div><div class='ctx'> 		ATARIHW_SET(PCM_8BIT);</div><div class='ctx'> 		printk("PCM ");</div><div class='ctx'> 	}</div><div class='del'>-	if (!MACH_IS_HADES &amp;&amp; hwreg_present(&amp;falcon_codec.unused5)) {</div><div class='add'>+	if (hwreg_present(&amp;falcon_codec.unused5)) {</div><div class='ctx'> 		ATARIHW_SET(CODEC);</div><div class='ctx'> 		printk("CODEC ");</div><div class='ctx'> 	}</div><div class='hunk'>@@ -313,7 +308,7 @@ void __init config_atari(void)</div><div class='ctx'> 	    (tt_scc_dma.dma_ctrl = 0x01, (tt_scc_dma.dma_ctrl &amp; 1) == 1) &amp;&amp;</div><div class='ctx'> 	    (tt_scc_dma.dma_ctrl = 0x00, (tt_scc_dma.dma_ctrl &amp; 1) == 0)</div><div class='ctx'> #else</div><div class='del'>-	    !MACH_IS_MEDUSA &amp;&amp; !MACH_IS_HADES</div><div class='add'>+	    !MACH_IS_MEDUSA</div><div class='ctx'> #endif</div><div class='ctx'> 	    ) {</div><div class='ctx'> 		ATARIHW_SET(SCC_DMA);</div><div class='hunk'>@@ -327,10 +322,7 @@ void __init config_atari(void)</div><div class='ctx'> 		ATARIHW_SET(ST_ESCC);</div><div class='ctx'> 		printk("ST_ESCC ");</div><div class='ctx'> 	}</div><div class='del'>-	if (MACH_IS_HADES) {</div><div class='del'>-		ATARIHW_SET(VME);</div><div class='del'>-		printk("VME ");</div><div class='del'>-	} else if (hwreg_present(&amp;tt_scu.sys_mask)) {</div><div class='add'>+	if (hwreg_present(&amp;tt_scu.sys_mask)) {</div><div class='ctx'> 		ATARIHW_SET(SCU);</div><div class='ctx'> 		/* Assume a VME bus if there's a SCU */</div><div class='ctx'> 		ATARIHW_SET(VME);</div><div class='hunk'>@@ -340,7 +332,7 @@ void __init config_atari(void)</div><div class='ctx'> 		ATARIHW_SET(ANALOG_JOY);</div><div class='ctx'> 		printk("ANALOG_JOY ");</div><div class='ctx'> 	}</div><div class='del'>-	if (!MACH_IS_HADES &amp;&amp; hwreg_present(blitter.halftone)) {</div><div class='add'>+	if (hwreg_present(blitter.halftone)) {</div><div class='ctx'> 		ATARIHW_SET(BLITTER);</div><div class='ctx'> 		printk("BLITTER ");</div><div class='ctx'> 	}</div><div class='hunk'>@@ -349,8 +341,7 @@ void __init config_atari(void)</div><div class='ctx'> 		printk("IDE ");</div><div class='ctx'> 	}</div><div class='ctx'> #if 1 /* This maybe wrong */</div><div class='del'>-	if (!MACH_IS_MEDUSA &amp;&amp; !MACH_IS_HADES &amp;&amp;</div><div class='del'>-	    hwreg_present(&amp;tt_microwire.data) &amp;&amp;</div><div class='add'>+	if (!MACH_IS_MEDUSA &amp;&amp; hwreg_present(&amp;tt_microwire.data) &amp;&amp;</div><div class='ctx'> 	    hwreg_present(&amp;tt_microwire.mask) &amp;&amp;</div><div class='ctx'> 	    (tt_microwire.mask = 0x7ff,</div><div class='ctx'> 	     udelay(1),</div><div class='hunk'>@@ -369,19 +360,18 @@ void __init config_atari(void)</div><div class='ctx'> 		mach_hwclk = atari_tt_hwclk;</div><div class='ctx'> 		mach_set_clock_mmss = atari_tt_set_clock_mmss;</div><div class='ctx'> 	}</div><div class='del'>-	if (!MACH_IS_HADES &amp;&amp; hwreg_present(&amp;mste_rtc.sec_ones)) {</div><div class='add'>+	if (hwreg_present(&amp;mste_rtc.sec_ones)) {</div><div class='ctx'> 		ATARIHW_SET(MSTE_CLK);</div><div class='ctx'> 		printk("MSTE_CLK ");</div><div class='ctx'> 		mach_hwclk = atari_mste_hwclk;</div><div class='ctx'> 		mach_set_clock_mmss = atari_mste_set_clock_mmss;</div><div class='ctx'> 	}</div><div class='del'>-	if (!MACH_IS_MEDUSA &amp;&amp; !MACH_IS_HADES &amp;&amp;</div><div class='del'>-	    hwreg_present(&amp;dma_wd.fdc_speed) &amp;&amp;</div><div class='add'>+	if (!MACH_IS_MEDUSA &amp;&amp; hwreg_present(&amp;dma_wd.fdc_speed) &amp;&amp;</div><div class='ctx'> 	    hwreg_write(&amp;dma_wd.fdc_speed, 0)) {</div><div class='ctx'> 		ATARIHW_SET(FDCSPEED);</div><div class='ctx'> 		printk("FDC_SPEED ");</div><div class='ctx'> 	}</div><div class='del'>-	if (!MACH_IS_HADES &amp;&amp; !ATARIHW_PRESENT(ST_SCSI)) {</div><div class='add'>+	if (!ATARIHW_PRESENT(ST_SCSI)) {</div><div class='ctx'> 		ATARIHW_SET(ACSI);</div><div class='ctx'> 		printk("ACSI ");</div><div class='ctx'> 	}</div><div class='hunk'>@@ -449,7 +439,7 @@ void __init config_atari(void)</div><div class='ctx'> 	 * 0xFFxxxxxx -&gt; 0x00xxxxxx, so that the first 16MB is accessible</div><div class='ctx'> 	 * in the last 16MB of the address space.</div><div class='ctx'> 	 */</div><div class='del'>-	tos_version = (MACH_IS_MEDUSA || MACH_IS_HADES) ?</div><div class='add'>+	tos_version = (MACH_IS_MEDUSA) ?</div><div class='ctx'> 			0xfff : *(unsigned short *)0xff000002;</div><div class='ctx'> 	atari_rtc_year_offset = (tos_version &lt; 0x306) ? 70 : 68;</div><div class='ctx'> }</div><div class='hunk'>@@ -511,8 +501,7 @@ static void atari_reset(void)</div><div class='ctx'> 	 * On the Medusa, phys. 0x4 may contain garbage because it's no</div><div class='ctx'> 	 * ROM.  See above for explanation why we cannot use PTOV(4).</div><div class='ctx'> 	 */</div><div class='del'>-	reset_addr = MACH_IS_HADES ? 0x7fe00030 :</div><div class='del'>-		     MACH_IS_MEDUSA || MACH_IS_AB40 ? 0xe00030 :</div><div class='add'>+	reset_addr = MACH_IS_MEDUSA || MACH_IS_AB40 ? 0xe00030 :</div><div class='ctx'> 		     *(unsigned long *) 0xff000004;</div><div class='ctx'> </div><div class='ctx'> 	/* reset ACIA for switch off OverScan, if it's active */</div><div class='hunk'>@@ -606,8 +595,6 @@ static void atari_get_model(char *model)</div><div class='ctx'> 		if (MACH_IS_MEDUSA)</div><div class='ctx'> 			/* Medusa has TT _MCH cookie */</div><div class='ctx'> 			strcat(model, "Medusa");</div><div class='del'>-		else if (MACH_IS_HADES)</div><div class='del'>-			strcat(model, "Hades");</div><div class='ctx'> 		else</div><div class='ctx'> 			strcat(model, "TT");</div><div class='ctx'> 		break;</div><div class='head'>diff --git a/arch/m68k/atari/hades-pci.c b/arch/m68k/atari/hades-pci.c<br/>deleted file mode 100644<br/>index 2bbabc008708..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/m68k/atari/hades-pci.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/m68k/atari/hades-pci.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,440 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * hades-pci.c - Hardware specific PCI BIOS functions the Hades Atari clone.</div><div class='del'>- *</div><div class='del'>- * Written by Wout Klaren.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-# define DBG_DEVS(args)		printk args</div><div class='del'>-#else</div><div class='del'>-# define DBG_DEVS(args)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_PCI) &amp;&amp; defined(CONFIG_HADES)</div><div class='del'>-</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/pci.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/atarihw.h&gt;</div><div class='del'>-#include &lt;asm/atariints.h&gt;</div><div class='del'>-#include &lt;asm/byteorder.h&gt;</div><div class='del'>-#include &lt;asm/pci.h&gt;</div><div class='del'>-</div><div class='del'>-#define HADES_MEM_BASE		0x80000000</div><div class='del'>-#define HADES_MEM_SIZE		0x20000000</div><div class='del'>-#define HADES_CONFIG_BASE	0xA0000000</div><div class='del'>-#define HADES_CONFIG_SIZE	0x10000000</div><div class='del'>-#define HADES_IO_BASE		0xB0000000</div><div class='del'>-#define HADES_IO_SIZE		0x10000000</div><div class='del'>-#define HADES_VIRT_IO_SIZE	0x00010000	/* Only 64k is remapped and actually used. */</div><div class='del'>-</div><div class='del'>-#define N_SLOTS				4			/* Number of PCI slots. */</div><div class='del'>-</div><div class='del'>-static const char pci_mem_name[] = "PCI memory space";</div><div class='del'>-static const char pci_io_name[] = "PCI I/O space";</div><div class='del'>-static const char pci_config_name[] = "PCI config space";</div><div class='del'>-</div><div class='del'>-static struct resource config_space = {</div><div class='del'>-    .name = pci_config_name,</div><div class='del'>-    .start = HADES_CONFIG_BASE,</div><div class='del'>-    .end = HADES_CONFIG_BASE + HADES_CONFIG_SIZE - 1</div><div class='del'>-};</div><div class='del'>-static struct resource io_space = {</div><div class='del'>-    .name = pci_io_name,</div><div class='del'>-    .start = HADES_IO_BASE,</div><div class='del'>-    .end = HADES_IO_BASE + HADES_IO_SIZE - 1</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const unsigned long pci_conf_base_phys[] = {</div><div class='del'>-    0xA0080000, 0xA0040000, 0xA0020000, 0xA0010000</div><div class='del'>-};</div><div class='del'>-static unsigned long pci_conf_base_virt[N_SLOTS];</div><div class='del'>-static unsigned long pci_io_base_virt;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * static void *mk_conf_addr(unsigned char bus, unsigned char device_fn,</div><div class='del'>- *			     unsigned char where)</div><div class='del'>- *</div><div class='del'>- * Calculate the address of the PCI configuration area of the given</div><div class='del'>- * device.</div><div class='del'>- *</div><div class='del'>- * BUG: boards with multiple functions are probably not correctly</div><div class='del'>- * supported.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void *mk_conf_addr(struct pci_dev *dev, int where)</div><div class='del'>-{</div><div class='del'>-	int device = dev-&gt;devfn &gt;&gt; 3, function = dev-&gt;devfn &amp; 7;</div><div class='del'>-	void *result;</div><div class='del'>-</div><div class='del'>-	DBG_DEVS(("mk_conf_addr(bus=%d ,device_fn=0x%x, where=0x%x, pci_addr=0x%p)\n",</div><div class='del'>-		  dev-&gt;bus-&gt;number, dev-&gt;devfn, where, pci_addr));</div><div class='del'>-</div><div class='del'>-	if (device &gt; 3)</div><div class='del'>-	{</div><div class='del'>-		DBG_DEVS(("mk_conf_addr: device (%d) &gt; 3, returning NULL\n", device));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (dev-&gt;bus-&gt;number != 0)</div><div class='del'>-	{</div><div class='del'>-		DBG_DEVS(("mk_conf_addr: bus (%d) &gt; 0, returning NULL\n", device));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	result = (void *) (pci_conf_base_virt[device] | (function &lt;&lt; 8) | (where));</div><div class='del'>-	DBG_DEVS(("mk_conf_addr: returning pci_addr 0x%lx\n", (unsigned long) result));</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int hades_read_config_byte(struct pci_dev *dev, int where, u8 *value)</div><div class='del'>-{</div><div class='del'>-	volatile unsigned char *pci_addr;</div><div class='del'>-</div><div class='del'>-	*value = 0xff;</div><div class='del'>-</div><div class='del'>-	if ((pci_addr = (unsigned char *) mk_conf_addr(dev, where)) == NULL)</div><div class='del'>-		return PCIBIOS_DEVICE_NOT_FOUND;</div><div class='del'>-</div><div class='del'>-	*value = *pci_addr;</div><div class='del'>-</div><div class='del'>-	return PCIBIOS_SUCCESSFUL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int hades_read_config_word(struct pci_dev *dev, int where, u16 *value)</div><div class='del'>-{</div><div class='del'>-	volatile unsigned short *pci_addr;</div><div class='del'>-</div><div class='del'>-	*value = 0xffff;</div><div class='del'>-</div><div class='del'>-	if (where &amp; 0x1)</div><div class='del'>-		return PCIBIOS_BAD_REGISTER_NUMBER;</div><div class='del'>-</div><div class='del'>-	if ((pci_addr = (unsigned short *) mk_conf_addr(dev, where)) == NULL)</div><div class='del'>-		return PCIBIOS_DEVICE_NOT_FOUND;</div><div class='del'>-</div><div class='del'>-	*value = le16_to_cpu(*pci_addr);</div><div class='del'>-</div><div class='del'>-	return PCIBIOS_SUCCESSFUL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int hades_read_config_dword(struct pci_dev *dev, int where, u32 *value)</div><div class='del'>-{</div><div class='del'>-	volatile unsigned int *pci_addr;</div><div class='del'>-	unsigned char header_type;</div><div class='del'>-	int result;</div><div class='del'>-</div><div class='del'>-	*value = 0xffffffff;</div><div class='del'>-</div><div class='del'>-	if (where &amp; 0x3)</div><div class='del'>-		return PCIBIOS_BAD_REGISTER_NUMBER;</div><div class='del'>-</div><div class='del'>-	if ((pci_addr = (unsigned int *) mk_conf_addr(dev, where)) == NULL)</div><div class='del'>-		return PCIBIOS_DEVICE_NOT_FOUND;</div><div class='del'>-</div><div class='del'>-	*value = le32_to_cpu(*pci_addr);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Check if the value is an address on the bus. If true, add the</div><div class='del'>-	 * base address of the PCI memory or PCI I/O area on the Hades.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if ((result = hades_read_config_byte(dev, PCI_HEADER_TYPE,</div><div class='del'>-					     &amp;header_type)) != PCIBIOS_SUCCESSFUL)</div><div class='del'>-		return result;</div><div class='del'>-</div><div class='del'>-	if (((where &gt;= PCI_BASE_ADDRESS_0) &amp;&amp; (where &lt;= PCI_BASE_ADDRESS_1)) ||</div><div class='del'>-	    ((header_type != PCI_HEADER_TYPE_BRIDGE) &amp;&amp; ((where &gt;= PCI_BASE_ADDRESS_2) &amp;&amp;</div><div class='del'>-							 (where &lt;= PCI_BASE_ADDRESS_5))))</div><div class='del'>-	{</div><div class='del'>-		if ((*value &amp; PCI_BASE_ADDRESS_SPACE) == PCI_BASE_ADDRESS_SPACE_IO)</div><div class='del'>-		{</div><div class='del'>-			/*</div><div class='del'>-			 * Base address register that contains an I/O address. If the</div><div class='del'>-			 * address is valid on the Hades (0 &lt;= *value &lt; HADES_VIRT_IO_SIZE),</div><div class='del'>-			 * add 'pci_io_base_virt' to the value.</div><div class='del'>-			 */</div><div class='del'>-</div><div class='del'>-			if (*value &lt; HADES_VIRT_IO_SIZE)</div><div class='del'>-				*value += pci_io_base_virt;</div><div class='del'>-		}</div><div class='del'>-		else</div><div class='del'>-		{</div><div class='del'>-			/*</div><div class='del'>-			 * Base address register that contains an memory address. If the</div><div class='del'>-			 * address is valid on the Hades (0 &lt;= *value &lt; HADES_MEM_SIZE),</div><div class='del'>-			 * add HADES_MEM_BASE to the value.</div><div class='del'>-			 */</div><div class='del'>-</div><div class='del'>-			if (*value == 0)</div><div class='del'>-			{</div><div class='del'>-				/*</div><div class='del'>-				 * Base address is 0. Test if this base</div><div class='del'>-				 * address register is used.</div><div class='del'>-				 */</div><div class='del'>-</div><div class='del'>-				*pci_addr = 0xffffffff;</div><div class='del'>-				if (*pci_addr != 0)</div><div class='del'>-				{</div><div class='del'>-					*pci_addr = *value;</div><div class='del'>-					if (*value &lt; HADES_MEM_SIZE)</div><div class='del'>-						*value += HADES_MEM_BASE;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			else</div><div class='del'>-			{</div><div class='del'>-				if (*value &lt; HADES_MEM_SIZE)</div><div class='del'>-					*value += HADES_MEM_BASE;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return PCIBIOS_SUCCESSFUL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int hades_write_config_byte(struct pci_dev *dev, int where, u8 value)</div><div class='del'>-{</div><div class='del'>-	volatile unsigned char *pci_addr;</div><div class='del'>-</div><div class='del'>-	if ((pci_addr = (unsigned char *) mk_conf_addr(dev, where)) == NULL)</div><div class='del'>-		return PCIBIOS_DEVICE_NOT_FOUND;</div><div class='del'>-</div><div class='del'>-	*pci_addr = value;</div><div class='del'>-</div><div class='del'>-	return PCIBIOS_SUCCESSFUL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int hades_write_config_word(struct pci_dev *dev, int where, u16 value)</div><div class='del'>-{</div><div class='del'>-	volatile unsigned short *pci_addr;</div><div class='del'>-</div><div class='del'>-	if ((pci_addr = (unsigned short *) mk_conf_addr(dev, where)) == NULL)</div><div class='del'>-		return PCIBIOS_DEVICE_NOT_FOUND;</div><div class='del'>-</div><div class='del'>-	*pci_addr = cpu_to_le16(value);</div><div class='del'>-</div><div class='del'>-	return PCIBIOS_SUCCESSFUL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int hades_write_config_dword(struct pci_dev *dev, int where, u32 value)</div><div class='del'>-{</div><div class='del'>-	volatile unsigned int *pci_addr;</div><div class='del'>-	unsigned char header_type;</div><div class='del'>-	int result;</div><div class='del'>-</div><div class='del'>-	if ((pci_addr = (unsigned int *) mk_conf_addr(dev, where)) == NULL)</div><div class='del'>-		return PCIBIOS_DEVICE_NOT_FOUND;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Check if the value is an address on the bus. If true, subtract the</div><div class='del'>-	 * base address of the PCI memory or PCI I/O area on the Hades.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if ((result = hades_read_config_byte(dev, PCI_HEADER_TYPE,</div><div class='del'>-					     &amp;header_type)) != PCIBIOS_SUCCESSFUL)</div><div class='del'>-		return result;</div><div class='del'>-</div><div class='del'>-	if (((where &gt;= PCI_BASE_ADDRESS_0) &amp;&amp; (where &lt;= PCI_BASE_ADDRESS_1)) ||</div><div class='del'>-	    ((header_type != PCI_HEADER_TYPE_BRIDGE) &amp;&amp; ((where &gt;= PCI_BASE_ADDRESS_2) &amp;&amp;</div><div class='del'>-							 (where &lt;= PCI_BASE_ADDRESS_5))))</div><div class='del'>-	{</div><div class='del'>-		if ((value &amp; PCI_BASE_ADDRESS_SPACE) ==</div><div class='del'>-		    PCI_BASE_ADDRESS_SPACE_IO)</div><div class='del'>-		{</div><div class='del'>-			/*</div><div class='del'>-			 * I/O address. Check if the address is valid address on</div><div class='del'>-			 * the Hades (pci_io_base_virt &lt;= value &lt; pci_io_base_virt +</div><div class='del'>-			 * HADES_VIRT_IO_SIZE) or if the value is 0xffffffff. If not</div><div class='del'>-			 * true do not write the base address register. If it is a</div><div class='del'>-			 * valid base address subtract 'pci_io_base_virt' from the value.</div><div class='del'>-			 */</div><div class='del'>-</div><div class='del'>-			if ((value &gt;= pci_io_base_virt) &amp;&amp; (value &lt; (pci_io_base_virt +</div><div class='del'>-														 HADES_VIRT_IO_SIZE)))</div><div class='del'>-				value -= pci_io_base_virt;</div><div class='del'>-			else</div><div class='del'>-			{</div><div class='del'>-				if (value != 0xffffffff)</div><div class='del'>-					return PCIBIOS_SET_FAILED;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		else</div><div class='del'>-		{</div><div class='del'>-			/*</div><div class='del'>-			 * Memory address. Check if the address is valid address on</div><div class='del'>-			 * the Hades (HADES_MEM_BASE &lt;= value &lt; HADES_MEM_BASE + HADES_MEM_SIZE) or</div><div class='del'>-			 * if the value is 0xffffffff. If not true do not write</div><div class='del'>-			 * the base address register. If it is a valid base address</div><div class='del'>-			 * subtract HADES_MEM_BASE from the value.</div><div class='del'>-			 */</div><div class='del'>-</div><div class='del'>-			if ((value &gt;= HADES_MEM_BASE) &amp;&amp; (value &lt; (HADES_MEM_BASE + HADES_MEM_SIZE)))</div><div class='del'>-				value -= HADES_MEM_BASE;</div><div class='del'>-			else</div><div class='del'>-			{</div><div class='del'>-				if (value != 0xffffffff)</div><div class='del'>-					return PCIBIOS_SET_FAILED;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*pci_addr = cpu_to_le32(value);</div><div class='del'>-</div><div class='del'>-	return PCIBIOS_SUCCESSFUL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * static inline void hades_fixup(void)</div><div class='del'>- *</div><div class='del'>- * Assign IRQ numbers as used by Linux to the interrupt pins</div><div class='del'>- * of the PCI cards.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void __init hades_fixup(int pci_modify)</div><div class='del'>-{</div><div class='del'>-	char irq_tab[4] = {</div><div class='del'>-		[0] = IRQ_TT_MFP_IO0,		/* Slot 0. */</div><div class='del'>-		[1] = IRQ_TT_MFP_IO1,		/* Slot 1. */</div><div class='del'>-		[2] = IRQ_TT_MFP_SCC,		/* Slot 2. */</div><div class='del'>-		[3] = IRQ_TT_MFP_SCSIDMA	/* Slot 3. */</div><div class='del'>-	};</div><div class='del'>-	struct pci_dev *dev = NULL;</div><div class='del'>-	unsigned char slot;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Go through all devices, fixing up irqs as we see fit:</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	while ((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL)</div><div class='del'>-	{</div><div class='del'>-		if (dev-&gt;class &gt;&gt; 16 != PCI_BASE_CLASS_BRIDGE)</div><div class='del'>-		{</div><div class='del'>-			slot = PCI_SLOT(dev-&gt;devfn);	/* Determine slot number. */</div><div class='del'>-			dev-&gt;irq = irq_tab[slot];</div><div class='del'>-			if (pci_modify)</div><div class='del'>-				pci_write_config_byte(dev, PCI_INTERRUPT_LINE, dev-&gt;irq);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * static void hades_conf_device(struct pci_dev *dev)</div><div class='del'>- *</div><div class='del'>- * Machine dependent Configure the given device.</div><div class='del'>- *</div><div class='del'>- * Parameters:</div><div class='del'>- *</div><div class='del'>- * dev		- the pci device.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void __init hades_conf_device(struct pci_dev *dev)</div><div class='del'>-{</div><div class='del'>-	pci_write_config_byte(dev, PCI_CACHE_LINE_SIZE, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct pci_ops hades_pci_ops = {</div><div class='del'>-	.read_byte =	hades_read_config_byte,</div><div class='del'>-	.read_word =	hades_read_config_word,</div><div class='del'>-	.read_dword =	hades_read_config_dword,</div><div class='del'>-	.write_byte =	hades_write_config_byte,</div><div class='del'>-	.write_word =	hades_write_config_word,</div><div class='del'>-	.write_dword =	hades_write_config_dword</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * struct pci_bus_info *init_hades_pci(void)</div><div class='del'>- *</div><div class='del'>- * Machine specific initialisation:</div><div class='del'>- *</div><div class='del'>- * - Allocate and initialise a 'pci_bus_info' structure</div><div class='del'>- * - Initialise hardware</div><div class='del'>- *</div><div class='del'>- * Result: pointer to 'pci_bus_info' structure.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-struct pci_bus_info * __init init_hades_pci(void)</div><div class='del'>-{</div><div class='del'>-	struct pci_bus_info *bus;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Remap I/O and configuration space.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	pci_io_base_virt = (unsigned long) ioremap(HADES_IO_BASE, HADES_VIRT_IO_SIZE);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; N_SLOTS; i++)</div><div class='del'>-		pci_conf_base_virt[i] = (unsigned long) ioremap(pci_conf_base_phys[i], 0x10000);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Allocate memory for bus info structure.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	bus = kzalloc(sizeof(struct pci_bus_info), GFP_KERNEL);</div><div class='del'>-	if (unlikely(!bus))</div><div class='del'>-		goto iounmap_base_virt;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Claim resources. The m68k has no separate I/O space, both</div><div class='del'>-	 * PCI memory space and PCI I/O space are in memory space. Therefore</div><div class='del'>-	 * the I/O resources are requested in memory space as well.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (unlikely(request_resource(&amp;iomem_resource, &amp;config_space) != 0))</div><div class='del'>-		goto free_bus;</div><div class='del'>-</div><div class='del'>-	if (unlikely(request_resource(&amp;iomem_resource, &amp;io_space) != 0))</div><div class='del'>-		goto release_config_space;</div><div class='del'>-</div><div class='del'>-	bus-&gt;mem_space.start = HADES_MEM_BASE;</div><div class='del'>-	bus-&gt;mem_space.end = HADES_MEM_BASE + HADES_MEM_SIZE - 1;</div><div class='del'>-	bus-&gt;mem_space.name = pci_mem_name;</div><div class='del'>-#if 1</div><div class='del'>-	if (unlikely(request_resource(&amp;iomem_resource, &amp;bus-&gt;mem_space) != 0))</div><div class='del'>-		goto release_io_space;</div><div class='del'>-#endif</div><div class='del'>-	bus-&gt;io_space.start = pci_io_base_virt;</div><div class='del'>-	bus-&gt;io_space.end = pci_io_base_virt + HADES_VIRT_IO_SIZE - 1;</div><div class='del'>-	bus-&gt;io_space.name = pci_io_name;</div><div class='del'>-#if 1</div><div class='del'>-	if (unlikely(request_resource(&amp;ioport_resource, &amp;bus-&gt;io_space) != 0))</div><div class='del'>-		goto release_bus_mem_space;</div><div class='del'>-#endif</div><div class='del'>-	/*</div><div class='del'>-	 * Set hardware dependent functions.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	bus-&gt;m68k_pci_ops = &amp;hades_pci_ops;</div><div class='del'>-	bus-&gt;fixup = hades_fixup;</div><div class='del'>-	bus-&gt;conf_device = hades_conf_device;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Select high to low edge for PCI interrupts.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	tt_mfp.active_edge &amp;= ~0x27;</div><div class='del'>-</div><div class='del'>-	return bus;</div><div class='del'>-</div><div class='del'>-release_bus_mem_space:</div><div class='del'>-	release_resource(&amp;bus-&gt;mem_space);</div><div class='del'>-release_io_space:</div><div class='del'>-	release_resource(&amp;io_space);</div><div class='del'>-release_config_space:</div><div class='del'>-	release_resource(&amp;config_space);</div><div class='del'>-free_bus:</div><div class='del'>-	kfree(bus);</div><div class='del'>-iounmap_base_virt:</div><div class='del'>-	iounmap((void *)pci_io_base_virt);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; N_SLOTS; i++)</div><div class='del'>-		iounmap((void *)pci_conf_base_virt[i]);</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='head'>diff --git a/arch/m68k/atari/time.c b/arch/m68k/atari/time.c<br/>index e0d3c8bfb408..1edde27fa32d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/m68k/atari/time.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/m68k/atari/time.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/m68k/atari/time.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/m68k/atari/time.c</a></div><div class='hunk'>@@ -20,6 +20,9 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/atariints.h&gt;</div><div class='ctx'> </div><div class='add'>+DEFINE_SPINLOCK(rtc_lock);</div><div class='add'>+EXPORT_SYMBOL_GPL(rtc_lock);</div><div class='add'>+</div><div class='ctx'> void __init</div><div class='ctx'> atari_sched_init(irq_handler_t timer_routine)</div><div class='ctx'> {</div><div class='hunk'>@@ -191,13 +194,14 @@ int atari_tt_hwclk( int op, struct rtc_time *t )</div><div class='ctx'>         }</div><div class='ctx'> </div><div class='ctx'>         if (!(ctrl &amp; RTC_DM_BINARY)) {</div><div class='del'>-            BIN_TO_BCD(sec);</div><div class='del'>-            BIN_TO_BCD(min);</div><div class='del'>-            BIN_TO_BCD(hour);</div><div class='del'>-            BIN_TO_BCD(day);</div><div class='del'>-            BIN_TO_BCD(mon);</div><div class='del'>-            BIN_TO_BCD(year);</div><div class='del'>-            if (wday &gt;= 0) BIN_TO_BCD(wday);</div><div class='add'>+	    sec = bin2bcd(sec);</div><div class='add'>+	    min = bin2bcd(min);</div><div class='add'>+	    hour = bin2bcd(hour);</div><div class='add'>+	    day = bin2bcd(day);</div><div class='add'>+	    mon = bin2bcd(mon);</div><div class='add'>+	    year = bin2bcd(year);</div><div class='add'>+	    if (wday &gt;= 0)</div><div class='add'>+		wday = bin2bcd(wday);</div><div class='ctx'>         }</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='hunk'>@@ -252,13 +256,13 @@ int atari_tt_hwclk( int op, struct rtc_time *t )</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!(ctrl &amp; RTC_DM_BINARY)) {</div><div class='del'>-            BCD_TO_BIN(sec);</div><div class='del'>-            BCD_TO_BIN(min);</div><div class='del'>-            BCD_TO_BIN(hour);</div><div class='del'>-            BCD_TO_BIN(day);</div><div class='del'>-            BCD_TO_BIN(mon);</div><div class='del'>-            BCD_TO_BIN(year);</div><div class='del'>-            BCD_TO_BIN(wday);</div><div class='add'>+	    sec = bcd2bin(sec);</div><div class='add'>+	    min = bcd2bin(min);</div><div class='add'>+	    hour = bcd2bin(hour);</div><div class='add'>+	    day = bcd2bin(day);</div><div class='add'>+	    mon = bcd2bin(mon);</div><div class='add'>+	    year = bcd2bin(year);</div><div class='add'>+	    wday = bcd2bin(wday);</div><div class='ctx'>         }</div><div class='ctx'> </div><div class='ctx'>         if (!(ctrl &amp; RTC_24H)) {</div><div class='hunk'>@@ -318,7 +322,7 @@ int atari_tt_set_clock_mmss (unsigned long nowtime)</div><div class='ctx'> </div><div class='ctx'>     rtc_minutes = RTC_READ (RTC_MINUTES);</div><div class='ctx'>     if (!(save_control &amp; RTC_DM_BINARY))</div><div class='del'>-        BCD_TO_BIN (rtc_minutes);</div><div class='add'>+	rtc_minutes = bcd2bin(rtc_minutes);</div><div class='ctx'> </div><div class='ctx'>     /* Since we're only adjusting minutes and seconds, don't interfere</div><div class='ctx'>        with hour overflow.  This avoids messing with unknown time zones</div><div class='hunk'>@@ -329,8 +333,8 @@ int atari_tt_set_clock_mmss (unsigned long nowtime)</div><div class='ctx'>         {</div><div class='ctx'>             if (!(save_control &amp; RTC_DM_BINARY))</div><div class='ctx'>                 {</div><div class='del'>-                    BIN_TO_BCD (real_seconds);</div><div class='del'>-                    BIN_TO_BCD (real_minutes);</div><div class='add'>+		    real_seconds = bin2bcd(real_seconds);</div><div class='add'>+		    real_minutes = bin2bcd(real_minutes);</div><div class='ctx'>                 }</div><div class='ctx'>             RTC_WRITE (RTC_SECONDS, real_seconds);</div><div class='ctx'>             RTC_WRITE (RTC_MINUTES, real_minutes);</div><div class='head'>diff --git a/arch/m68k/bvme6000/config.c b/arch/m68k/bvme6000/config.c<br/>index 9433a88a33c4..65c9204ab9ac 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/m68k/bvme6000/config.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/m68k/bvme6000/config.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/m68k/bvme6000/config.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/m68k/bvme6000/config.c</a></div><div class='hunk'>@@ -25,6 +25,7 @@</div><div class='ctx'> #include &lt;linux/genhd.h&gt;</div><div class='ctx'> #include &lt;linux/rtc.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/bcd.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/bootinfo.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='hunk'>@@ -46,9 +47,6 @@ extern void bvme6000_reset (void);</div><div class='ctx'> extern void bvme6000_waitbut(void);</div><div class='ctx'> void bvme6000_set_vectors (void);</div><div class='ctx'> </div><div class='del'>-static unsigned char bcd2bin (unsigned char b);</div><div class='del'>-static unsigned char bin2bcd (unsigned char b);</div><div class='del'>-</div><div class='ctx'> /* Save tick handler routine pointer, will point to do_timer() in</div><div class='ctx'>  * kernel/sched.c, called via bvme6000_process_int() */</div><div class='ctx'> </div><div class='hunk'>@@ -264,17 +262,6 @@ unsigned long bvme6000_gettimeoffset (void)</div><div class='ctx'>     return v;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned char bcd2bin (unsigned char b)</div><div class='del'>-{</div><div class='del'>-	return ((b&gt;&gt;4)*10 + (b&amp;15));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned char bin2bcd (unsigned char b)</div><div class='del'>-{</div><div class='del'>-	return (((b/10)*16) + (b%10));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Looks like op is non-zero for setting the clock, and zero for</div><div class='ctx'>  * reading the clock.</div><div class='head'>diff --git a/arch/m68k/bvme6000/rtc.c b/arch/m68k/bvme6000/rtc.c<br/>index e8ac3f7d72df..808c9018b115 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/m68k/bvme6000/rtc.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/m68k/bvme6000/rtc.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/m68k/bvme6000/rtc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/m68k/bvme6000/rtc.c</a></div><div class='hunk'>@@ -57,16 +57,16 @@ static int rtc_ioctl(struct inode *inode, struct file *file, unsigned int cmd,</div><div class='ctx'> 		rtc-&gt;msr = 0x40;</div><div class='ctx'> 		memset(&amp;wtime, 0, sizeof(struct rtc_time));</div><div class='ctx'> 		do {</div><div class='del'>-			wtime.tm_sec =  BCD2BIN(rtc-&gt;bcd_sec);</div><div class='del'>-			wtime.tm_min =  BCD2BIN(rtc-&gt;bcd_min);</div><div class='del'>-			wtime.tm_hour = BCD2BIN(rtc-&gt;bcd_hr);</div><div class='del'>-			wtime.tm_mday =  BCD2BIN(rtc-&gt;bcd_dom);</div><div class='del'>-			wtime.tm_mon =  BCD2BIN(rtc-&gt;bcd_mth)-1;</div><div class='del'>-			wtime.tm_year = BCD2BIN(rtc-&gt;bcd_year);</div><div class='add'>+			wtime.tm_sec =  bcd2bin(rtc-&gt;bcd_sec);</div><div class='add'>+			wtime.tm_min =  bcd2bin(rtc-&gt;bcd_min);</div><div class='add'>+			wtime.tm_hour = bcd2bin(rtc-&gt;bcd_hr);</div><div class='add'>+			wtime.tm_mday =  bcd2bin(rtc-&gt;bcd_dom);</div><div class='add'>+			wtime.tm_mon =  bcd2bin(rtc-&gt;bcd_mth)-1;</div><div class='add'>+			wtime.tm_year = bcd2bin(rtc-&gt;bcd_year);</div><div class='ctx'> 			if (wtime.tm_year &lt; 70)</div><div class='ctx'> 				wtime.tm_year += 100;</div><div class='del'>-			wtime.tm_wday = BCD2BIN(rtc-&gt;bcd_dow)-1;</div><div class='del'>-		} while (wtime.tm_sec != BCD2BIN(rtc-&gt;bcd_sec));</div><div class='add'>+			wtime.tm_wday = bcd2bin(rtc-&gt;bcd_dow)-1;</div><div class='add'>+		} while (wtime.tm_sec != bcd2bin(rtc-&gt;bcd_sec));</div><div class='ctx'> 		rtc-&gt;msr = msr;</div><div class='ctx'> 		local_irq_restore(flags);</div><div class='ctx'> 		return copy_to_user(argp, &amp;wtime, sizeof wtime) ?</div><div class='hunk'>@@ -114,14 +114,14 @@ static int rtc_ioctl(struct inode *inode, struct file *file, unsigned int cmd,</div><div class='ctx'> </div><div class='ctx'> 		rtc-&gt;t0cr_rtmr = yrs%4;</div><div class='ctx'> 		rtc-&gt;bcd_tenms = 0;</div><div class='del'>-		rtc-&gt;bcd_sec   = BIN2BCD(sec);</div><div class='del'>-		rtc-&gt;bcd_min   = BIN2BCD(min);</div><div class='del'>-		rtc-&gt;bcd_hr    = BIN2BCD(hrs);</div><div class='del'>-		rtc-&gt;bcd_dom   = BIN2BCD(day);</div><div class='del'>-		rtc-&gt;bcd_mth   = BIN2BCD(mon);</div><div class='del'>-		rtc-&gt;bcd_year  = BIN2BCD(yrs%100);</div><div class='add'>+		rtc-&gt;bcd_sec   = bin2bcd(sec);</div><div class='add'>+		rtc-&gt;bcd_min   = bin2bcd(min);</div><div class='add'>+		rtc-&gt;bcd_hr    = bin2bcd(hrs);</div><div class='add'>+		rtc-&gt;bcd_dom   = bin2bcd(day);</div><div class='add'>+		rtc-&gt;bcd_mth   = bin2bcd(mon);</div><div class='add'>+		rtc-&gt;bcd_year  = bin2bcd(yrs%100);</div><div class='ctx'> 		if (rtc_tm.tm_wday &gt;= 0)</div><div class='del'>-			rtc-&gt;bcd_dow = BIN2BCD(rtc_tm.tm_wday+1);</div><div class='add'>+			rtc-&gt;bcd_dow = bin2bcd(rtc_tm.tm_wday+1);</div><div class='ctx'> 		rtc-&gt;t0cr_rtmr = yrs%4 | 0x08;</div><div class='ctx'> </div><div class='ctx'> 		rtc-&gt;msr = msr;</div><div class='head'>diff --git a/arch/m68k/kernel/Makefile b/arch/m68k/kernel/Makefile<br/>index 3a7f62225504..55d5d6b680a2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/m68k/kernel/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>arch/m68k/kernel/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/m68k/kernel/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/m68k/kernel/Makefile</a></div><div class='hunk'>@@ -14,5 +14,4 @@ obj-y	:= entry.o process.o traps.o ints.o signal.o ptrace.o module.o \</div><div class='ctx'> </div><div class='ctx'> devres-y = ../../../kernel/irq/devres.o</div><div class='ctx'> </div><div class='del'>-obj-$(CONFIG_PCI)	+= bios32.o</div><div class='ctx'> obj-y$(CONFIG_MMU_SUN3) += dma.o	# no, it's not a typo</div><div class='head'>diff --git a/arch/m68k/kernel/bios32.c b/arch/m68k/kernel/bios32.c<br/>deleted file mode 100644<br/>index af170c2be735..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/m68k/kernel/bios32.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/m68k/kernel/bios32.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,514 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * bios32.c - PCI BIOS functions for m68k systems.</div><div class='del'>- *</div><div class='del'>- * Written by Wout Klaren.</div><div class='del'>- *</div><div class='del'>- * Based on the DEC Alpha bios32.c by Dave Rusling and David Mosberger.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-# define DBG_DEVS(args)		printk args</div><div class='del'>-#else</div><div class='del'>-# define DBG_DEVS(args)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * PCI support for Linux/m68k. Currently only the Hades is supported.</div><div class='del'>- *</div><div class='del'>- * The support for PCI bridges in the DEC Alpha version has</div><div class='del'>- * been removed in this version.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/mm.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/pci.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='del'>-</div><div class='del'>-#define KB		1024</div><div class='del'>-#define MB		(1024*KB)</div><div class='del'>-#define GB		(1024*MB)</div><div class='del'>-</div><div class='del'>-#define MAJOR_REV	0</div><div class='del'>-#define MINOR_REV	5</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Align VAL to ALIGN, which must be a power of two.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define ALIGN(val,align)	(((val) + ((align) - 1)) &amp; ~((align) - 1))</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Offsets relative to the I/O and memory base addresses from where resources</div><div class='del'>- * are allocated.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define IO_ALLOC_OFFSET		0x00004000</div><div class='del'>-#define MEM_ALLOC_OFFSET	0x04000000</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Declarations of hardware specific initialisation functions.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-extern struct pci_bus_info *init_hades_pci(void);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Bus info structure of the PCI bus. A pointer to this structure is</div><div class='del'>- * put in the sysdata member of the pci_bus structure.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static struct pci_bus_info *bus_info;</div><div class='del'>-</div><div class='del'>-static int pci_modify = 1;		/* If set, layout the PCI bus ourself. */</div><div class='del'>-static int skip_vga;			/* If set do not modify base addresses</div><div class='del'>-					   of vga cards.*/</div><div class='del'>-static int disable_pci_burst;		/* If set do not allow PCI bursts. */</div><div class='del'>-</div><div class='del'>-static unsigned int io_base;</div><div class='del'>-static unsigned int mem_base;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * static void disable_dev(struct pci_dev *dev)</div><div class='del'>- *</div><div class='del'>- * Disable PCI device DEV so that it does not respond to I/O or memory</div><div class='del'>- * accesses.</div><div class='del'>- *</div><div class='del'>- * Parameters:</div><div class='del'>- *</div><div class='del'>- * dev	- device to disable.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void __init disable_dev(struct pci_dev *dev)</div><div class='del'>-{</div><div class='del'>-	unsigned short cmd;</div><div class='del'>-</div><div class='del'>-	if (((dev-&gt;class &gt;&gt; 8 == PCI_CLASS_NOT_DEFINED_VGA) ||</div><div class='del'>-	     (dev-&gt;class &gt;&gt; 8 == PCI_CLASS_DISPLAY_VGA) ||</div><div class='del'>-	     (dev-&gt;class &gt;&gt; 8 == PCI_CLASS_DISPLAY_XGA)) &amp;&amp; skip_vga)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	pci_read_config_word(dev, PCI_COMMAND, &amp;cmd);</div><div class='del'>-</div><div class='del'>-	cmd &amp;= (~PCI_COMMAND_IO &amp; ~PCI_COMMAND_MEMORY &amp; ~PCI_COMMAND_MASTER);</div><div class='del'>-	pci_write_config_word(dev, PCI_COMMAND, cmd);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * static void layout_dev(struct pci_dev *dev)</div><div class='del'>- *</div><div class='del'>- * Layout memory and I/O for a device.</div><div class='del'>- *</div><div class='del'>- * Parameters:</div><div class='del'>- *</div><div class='del'>- * device	- device to layout memory and I/O for.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void __init layout_dev(struct pci_dev *dev)</div><div class='del'>-{</div><div class='del'>-	unsigned short cmd;</div><div class='del'>-	unsigned int base, mask, size, reg;</div><div class='del'>-	unsigned int alignto;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Skip video cards if requested.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (((dev-&gt;class &gt;&gt; 8 == PCI_CLASS_NOT_DEFINED_VGA) ||</div><div class='del'>-	     (dev-&gt;class &gt;&gt; 8 == PCI_CLASS_DISPLAY_VGA) ||</div><div class='del'>-	     (dev-&gt;class &gt;&gt; 8 == PCI_CLASS_DISPLAY_XGA)) &amp;&amp; skip_vga)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	pci_read_config_word(dev, PCI_COMMAND, &amp;cmd);</div><div class='del'>-</div><div class='del'>-	for (reg = PCI_BASE_ADDRESS_0, i = 0; reg &lt;= PCI_BASE_ADDRESS_5; reg += 4, i++)</div><div class='del'>-	{</div><div class='del'>-		/*</div><div class='del'>-		 * Figure out how much space and of what type this</div><div class='del'>-		 * device wants.</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		pci_write_config_dword(dev, reg, 0xffffffff);</div><div class='del'>-		pci_read_config_dword(dev, reg, &amp;base);</div><div class='del'>-</div><div class='del'>-		if (!base)</div><div class='del'>-		{</div><div class='del'>-			/* this base-address register is unused */</div><div class='del'>-			dev-&gt;resource[i].start = 0;</div><div class='del'>-			dev-&gt;resource[i].end = 0;</div><div class='del'>-			dev-&gt;resource[i].flags = 0;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * We've read the base address register back after</div><div class='del'>-		 * writing all ones and so now we must decode it.</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		if (base &amp; PCI_BASE_ADDRESS_SPACE_IO)</div><div class='del'>-		{</div><div class='del'>-			/*</div><div class='del'>-			 * I/O space base address register.</div><div class='del'>-			 */</div><div class='del'>-</div><div class='del'>-			cmd |= PCI_COMMAND_IO;</div><div class='del'>-</div><div class='del'>-			base &amp;= PCI_BASE_ADDRESS_IO_MASK;</div><div class='del'>-			mask = (~base &lt;&lt; 1) | 0x1;</div><div class='del'>-			size = (mask &amp; base) &amp; 0xffffffff;</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * Align to multiple of size of minimum base.</div><div class='del'>-			 */</div><div class='del'>-</div><div class='del'>-			alignto = max_t(unsigned int, 0x040, size);</div><div class='del'>-			base = ALIGN(io_base, alignto);</div><div class='del'>-			io_base = base + size;</div><div class='del'>-			pci_write_config_dword(dev, reg, base | PCI_BASE_ADDRESS_SPACE_IO);</div><div class='del'>-</div><div class='del'>-			dev-&gt;resource[i].start = base;</div><div class='del'>-			dev-&gt;resource[i].end = dev-&gt;resource[i].start + size - 1;</div><div class='del'>-			dev-&gt;resource[i].flags = IORESOURCE_IO | PCI_BASE_ADDRESS_SPACE_IO;</div><div class='del'>-</div><div class='del'>-			DBG_DEVS(("layout_dev: IO address: %lX\n", base));</div><div class='del'>-		}</div><div class='del'>-		else</div><div class='del'>-		{</div><div class='del'>-			unsigned int type;</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * Memory space base address register.</div><div class='del'>-			 */</div><div class='del'>-</div><div class='del'>-			cmd |= PCI_COMMAND_MEMORY;</div><div class='del'>-			type = base &amp; PCI_BASE_ADDRESS_MEM_TYPE_MASK;</div><div class='del'>-			base &amp;= PCI_BASE_ADDRESS_MEM_MASK;</div><div class='del'>-			mask = (~base &lt;&lt; 1) | 0x1;</div><div class='del'>-			size = (mask &amp; base) &amp; 0xffffffff;</div><div class='del'>-			switch (type)</div><div class='del'>-			{</div><div class='del'>-			case PCI_BASE_ADDRESS_MEM_TYPE_32:</div><div class='del'>-			case PCI_BASE_ADDRESS_MEM_TYPE_64:</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			case PCI_BASE_ADDRESS_MEM_TYPE_1M:</div><div class='del'>-				printk("bios32 WARNING: slot %d, function %d "</div><div class='del'>-				       "requests memory below 1MB---don't "</div><div class='del'>-				       "know how to do that.\n",</div><div class='del'>-				       PCI_SLOT(dev-&gt;devfn),</div><div class='del'>-				       PCI_FUNC(dev-&gt;devfn));</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * Align to multiple of size of minimum base.</div><div class='del'>-			 */</div><div class='del'>-</div><div class='del'>-			alignto = max_t(unsigned int, 0x1000, size);</div><div class='del'>-			base = ALIGN(mem_base, alignto);</div><div class='del'>-			mem_base = base + size;</div><div class='del'>-			pci_write_config_dword(dev, reg, base);</div><div class='del'>-</div><div class='del'>-			dev-&gt;resource[i].start = base;</div><div class='del'>-			dev-&gt;resource[i].end = dev-&gt;resource[i].start + size - 1;</div><div class='del'>-			dev-&gt;resource[i].flags = IORESOURCE_MEM;</div><div class='del'>-</div><div class='del'>-			if (type == PCI_BASE_ADDRESS_MEM_TYPE_64)</div><div class='del'>-			{</div><div class='del'>-				/*</div><div class='del'>-				 * 64-bit address, set the highest 32 bits</div><div class='del'>-				 * to zero.</div><div class='del'>-				 */</div><div class='del'>-</div><div class='del'>-				reg += 4;</div><div class='del'>-				pci_write_config_dword(dev, reg, 0);</div><div class='del'>-</div><div class='del'>-				i++;</div><div class='del'>-				dev-&gt;resource[i].start = 0;</div><div class='del'>-				dev-&gt;resource[i].end = 0;</div><div class='del'>-				dev-&gt;resource[i].flags = 0;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Enable device:</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (dev-&gt;class &gt;&gt; 8 == PCI_CLASS_NOT_DEFINED ||</div><div class='del'>-	    dev-&gt;class &gt;&gt; 8 == PCI_CLASS_NOT_DEFINED_VGA ||</div><div class='del'>-	    dev-&gt;class &gt;&gt; 8 == PCI_CLASS_DISPLAY_VGA ||</div><div class='del'>-	    dev-&gt;class &gt;&gt; 8 == PCI_CLASS_DISPLAY_XGA)</div><div class='del'>-	{</div><div class='del'>-		/*</div><div class='del'>-		 * All of these (may) have I/O scattered all around</div><div class='del'>-		 * and may not use i/o-base address registers at all.</div><div class='del'>-		 * So we just have to always enable I/O to these</div><div class='del'>-		 * devices.</div><div class='del'>-		 */</div><div class='del'>-		cmd |= PCI_COMMAND_IO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pci_write_config_word(dev, PCI_COMMAND, cmd | PCI_COMMAND_MASTER);</div><div class='del'>-</div><div class='del'>-	pci_write_config_byte(dev, PCI_LATENCY_TIMER, (disable_pci_burst) ? 0 : 32);</div><div class='del'>-</div><div class='del'>-	if (bus_info != NULL)</div><div class='del'>-		bus_info-&gt;conf_device(dev);	/* Machine dependent configuration. */</div><div class='del'>-</div><div class='del'>-	DBG_DEVS(("layout_dev: bus %d  slot 0x%x  VID 0x%x  DID 0x%x  class 0x%x\n",</div><div class='del'>-		  dev-&gt;bus-&gt;number, PCI_SLOT(dev-&gt;devfn), dev-&gt;vendor, dev-&gt;device, dev-&gt;class));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * static void layout_bus(struct pci_bus *bus)</div><div class='del'>- *</div><div class='del'>- * Layout memory and I/O for all devices on the given bus.</div><div class='del'>- *</div><div class='del'>- * Parameters:</div><div class='del'>- *</div><div class='del'>- * bus	- bus.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void __init layout_bus(struct pci_bus *bus)</div><div class='del'>-{</div><div class='del'>-	unsigned int bio, bmem;</div><div class='del'>-	struct pci_dev *dev;</div><div class='del'>-</div><div class='del'>-	DBG_DEVS(("layout_bus: starting bus %d\n", bus-&gt;number));</div><div class='del'>-</div><div class='del'>-	if (!bus-&gt;devices &amp;&amp; !bus-&gt;children)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Align the current bases on appropriate boundaries (4K for</div><div class='del'>-	 * IO and 1MB for memory).</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	bio = io_base = ALIGN(io_base, 4*KB);</div><div class='del'>-	bmem = mem_base = ALIGN(mem_base, 1*MB);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * PCI devices might have been setup by a PCI BIOS emulation</div><div class='del'>-	 * running under TOS. In these cases there is a</div><div class='del'>-	 * window during which two devices may have an overlapping</div><div class='del'>-	 * address range. To avoid this causing trouble, we first</div><div class='del'>-	 * turn off the I/O and memory address decoders for all PCI</div><div class='del'>-	 * devices.  They'll be re-enabled only once all address</div><div class='del'>-	 * decoders are programmed consistently.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	DBG_DEVS(("layout_bus: disable_dev for bus %d\n", bus-&gt;number));</div><div class='del'>-</div><div class='del'>-	for (dev = bus-&gt;devices; dev; dev = dev-&gt;sibling)</div><div class='del'>-	{</div><div class='del'>-		if ((dev-&gt;class &gt;&gt; 16 != PCI_BASE_CLASS_BRIDGE) ||</div><div class='del'>-		    (dev-&gt;class &gt;&gt; 8 == PCI_CLASS_BRIDGE_PCMCIA))</div><div class='del'>-			disable_dev(dev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Allocate space to each device:</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	DBG_DEVS(("layout_bus: starting bus %d devices\n", bus-&gt;number));</div><div class='del'>-</div><div class='del'>-	for (dev = bus-&gt;devices; dev; dev = dev-&gt;sibling)</div><div class='del'>-	{</div><div class='del'>-		if ((dev-&gt;class &gt;&gt; 16 != PCI_BASE_CLASS_BRIDGE) ||</div><div class='del'>-		    (dev-&gt;class &gt;&gt; 8 == PCI_CLASS_BRIDGE_PCMCIA))</div><div class='del'>-			layout_dev(dev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	DBG_DEVS(("layout_bus: bus %d finished\n", bus-&gt;number));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * static void pcibios_fixup(void)</div><div class='del'>- *</div><div class='del'>- * Layout memory and I/O of all devices on the PCI bus if 'pci_modify' is</div><div class='del'>- * true. This might be necessary because not every m68k machine with a PCI</div><div class='del'>- * bus has a PCI BIOS. This function should be called right after</div><div class='del'>- * pci_scan_bus() in pcibios_init().</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void __init pcibios_fixup(void)</div><div class='del'>-{</div><div class='del'>-	if (pci_modify)</div><div class='del'>-	{</div><div class='del'>-		/*</div><div class='del'>-		 * Set base addresses for allocation of I/O and memory space.</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		io_base = bus_info-&gt;io_space.start + IO_ALLOC_OFFSET;</div><div class='del'>-		mem_base = bus_info-&gt;mem_space.start + MEM_ALLOC_OFFSET;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Scan the tree, allocating PCI memory and I/O space.</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		layout_bus(pci_bus_b(pci_root.next));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Fix interrupt assignments, etc.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	bus_info-&gt;fixup(pci_modify);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * static void pcibios_claim_resources(struct pci_bus *bus)</div><div class='del'>- *</div><div class='del'>- * Claim all resources that are assigned to devices on the given bus.</div><div class='del'>- *</div><div class='del'>- * Parameters:</div><div class='del'>- *</div><div class='del'>- * bus	- bus.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void __init pcibios_claim_resources(struct pci_bus *bus)</div><div class='del'>-{</div><div class='del'>-	struct pci_dev *dev;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	while (bus)</div><div class='del'>-	{</div><div class='del'>-		for (dev = bus-&gt;devices; (dev != NULL); dev = dev-&gt;sibling)</div><div class='del'>-		{</div><div class='del'>-			for (i = 0; i &lt; PCI_NUM_RESOURCES; i++)</div><div class='del'>-			{</div><div class='del'>-				struct resource *r = &amp;dev-&gt;resource[i];</div><div class='del'>-				struct resource *pr;</div><div class='del'>-				struct pci_bus_info *bus_info = (struct pci_bus_info *) dev-&gt;sysdata;</div><div class='del'>-</div><div class='del'>-				if ((r-&gt;start == 0) || (r-&gt;parent != NULL))</div><div class='del'>-					continue;</div><div class='del'>-#if 1</div><div class='del'>-				if (r-&gt;flags &amp; IORESOURCE_IO)</div><div class='del'>-					pr = &amp;bus_info-&gt;io_space;</div><div class='del'>-				else</div><div class='del'>-					pr = &amp;bus_info-&gt;mem_space;</div><div class='del'>-#else</div><div class='del'>-				if (r-&gt;flags &amp; IORESOURCE_IO)</div><div class='del'>-					pr = &amp;ioport_resource;</div><div class='del'>-				else</div><div class='del'>-					pr = &amp;iomem_resource;</div><div class='del'>-#endif</div><div class='del'>-				if (request_resource(pr, r) &lt; 0)</div><div class='del'>-				{</div><div class='del'>-					printk(KERN_ERR "PCI: Address space collision on region %d of device %s\n", i, dev-&gt;name);</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (bus-&gt;children)</div><div class='del'>-			pcibios_claim_resources(bus-&gt;children);</div><div class='del'>-</div><div class='del'>-		bus = bus-&gt;next;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * int pcibios_assign_resource(struct pci_dev *dev, int i)</div><div class='del'>- *</div><div class='del'>- * Assign a new address to a PCI resource.</div><div class='del'>- *</div><div class='del'>- * Parameters:</div><div class='del'>- *</div><div class='del'>- * dev	- device.</div><div class='del'>- * i	- resource.</div><div class='del'>- *</div><div class='del'>- * Result: 0 if successful.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-int __init pcibios_assign_resource(struct pci_dev *dev, int i)</div><div class='del'>-{</div><div class='del'>-	struct resource *r = &amp;dev-&gt;resource[i];</div><div class='del'>-	struct resource *pr = pci_find_parent_resource(dev, r);</div><div class='del'>-	unsigned long size = r-&gt;end + 1;</div><div class='del'>-</div><div class='del'>-	if (!pr)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (r-&gt;flags &amp; IORESOURCE_IO)</div><div class='del'>-	{</div><div class='del'>-		if (size &gt; 0x100)</div><div class='del'>-			return -EFBIG;</div><div class='del'>-</div><div class='del'>-		if (allocate_resource(pr, r, size, bus_info-&gt;io_space.start +</div><div class='del'>-				      IO_ALLOC_OFFSET,  bus_info-&gt;io_space.end, 1024))</div><div class='del'>-			return -EBUSY;</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-	{</div><div class='del'>-		if (allocate_resource(pr, r, size, bus_info-&gt;mem_space.start +</div><div class='del'>-				      MEM_ALLOC_OFFSET, bus_info-&gt;mem_space.end, size))</div><div class='del'>-			return -EBUSY;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (i &lt; 6)</div><div class='del'>-		pci_write_config_dword(dev, PCI_BASE_ADDRESS_0 + 4 * i, r-&gt;start);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __init pcibios_fixup_bus(struct pci_bus *bus)</div><div class='del'>-{</div><div class='del'>-	struct pci_dev *dev;</div><div class='del'>-	void *sysdata;</div><div class='del'>-</div><div class='del'>-	sysdata = (bus-&gt;parent) ? bus-&gt;parent-&gt;sysdata : bus-&gt;sysdata;</div><div class='del'>-</div><div class='del'>-	for (dev = bus-&gt;devices; (dev != NULL); dev = dev-&gt;sibling)</div><div class='del'>-		dev-&gt;sysdata = sysdata;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __init pcibios_init(void)</div><div class='del'>-{</div><div class='del'>-	printk("Linux/m68k PCI BIOS32 revision %x.%02x\n", MAJOR_REV, MINOR_REV);</div><div class='del'>-</div><div class='del'>-	bus_info = NULL;</div><div class='del'>-#ifdef CONFIG_HADES</div><div class='del'>-	if (MACH_IS_HADES)</div><div class='del'>-		bus_info = init_hades_pci();</div><div class='del'>-#endif</div><div class='del'>-	if (bus_info != NULL)</div><div class='del'>-	{</div><div class='del'>-		printk("PCI: Probing PCI hardware\n");</div><div class='del'>-		pci_scan_bus(0, bus_info-&gt;m68k_pci_ops, bus_info);</div><div class='del'>-		pcibios_fixup();</div><div class='del'>-		pcibios_claim_resources(pci_root);</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-		printk("PCI: No PCI bus detected\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char * __init pcibios_setup(char *str)</div><div class='del'>-{</div><div class='del'>-	if (!strcmp(str, "nomodify"))</div><div class='del'>-	{</div><div class='del'>-		pci_modify = 0;</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	else if (!strcmp(str, "skipvga"))</div><div class='del'>-	{</div><div class='del'>-		skip_vga = 1;</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	else if (!strcmp(str, "noburst"))</div><div class='del'>-	{</div><div class='del'>-		disable_pci_burst = 1;</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return str;</div><div class='del'>-}</div><div class='del'>-#endif /* CONFIG_PCI */</div><div class='head'>diff --git a/arch/m68k/kernel/dma.c b/arch/m68k/kernel/dma.c<br/>index 6f8c080dd9f9..2bb4245404d8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/m68k/kernel/dma.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/m68k/kernel/dma.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/m68k/kernel/dma.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/m68k/kernel/dma.c</a></div><div class='hunk'>@@ -66,8 +66,8 @@ void dma_free_coherent(struct device *dev, size_t size,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(dma_free_coherent);</div><div class='ctx'> </div><div class='del'>-inline void dma_sync_single_for_device(struct device *dev, dma_addr_t handle, size_t size,</div><div class='del'>-				       enum dma_data_direction dir)</div><div class='add'>+void dma_sync_single_for_device(struct device *dev, dma_addr_t handle,</div><div class='add'>+				size_t size, enum dma_data_direction dir)</div><div class='ctx'> {</div><div class='ctx'> 	switch (dir) {</div><div class='ctx'> 	case DMA_TO_DEVICE:</div><div class='head'>diff --git a/arch/m68k/kernel/ints.c b/arch/m68k/kernel/ints.c<br/>index ded7dd2f67b2..7e8a0d394e61 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/m68k/kernel/ints.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/m68k/kernel/ints.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/m68k/kernel/ints.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/m68k/kernel/ints.c</a></div><div class='hunk'>@@ -429,8 +429,9 @@ int show_interrupts(struct seq_file *p, void *v)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PROC_FS</div><div class='ctx'> void init_irq_proc(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* Insert /proc/irq driver here */</div><div class='ctx'> }</div><div class='del'>-</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/m68k/kernel/process.c b/arch/m68k/kernel/process.c<br/>index 7888cdf91f5d..3042c2bc8c58 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/m68k/kernel/process.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/m68k/kernel/process.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/m68k/kernel/process.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/m68k/kernel/process.c</a></div><div class='hunk'>@@ -78,7 +78,7 @@ unsigned long thread_saved_pc(struct task_struct *tsk)</div><div class='ctx'> static void default_idle(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (!need_resched())</div><div class='del'>-#if defined(MACH_ATARI_ONLY) &amp;&amp; !defined(CONFIG_HADES)</div><div class='add'>+#if defined(MACH_ATARI_ONLY)</div><div class='ctx'> 		/* block out HSYNC on the atari (falcon) */</div><div class='ctx'> 		__asm__("stop #0x2200" : : : "cc");</div><div class='ctx'> #else</div><div class='head'>diff --git a/arch/m68k/kernel/traps.c b/arch/m68k/kernel/traps.c<br/>index 75b8340b254b..6d813de2baf1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/m68k/kernel/traps.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/m68k/kernel/traps.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/m68k/kernel/traps.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/m68k/kernel/traps.c</a></div><div class='hunk'>@@ -883,8 +883,7 @@ void show_trace(unsigned long *stack)</div><div class='ctx'> 			if (i % 5 == 0)</div><div class='ctx'> 				printk("\n       ");</div><div class='ctx'> #endif</div><div class='del'>-			printk(" [&lt;%08lx&gt;]", addr);</div><div class='del'>-			print_symbol(" %s\n", addr);</div><div class='add'>+			printk(" [&lt;%08lx&gt;] %pS\n", addr, (void *)addr);</div><div class='ctx'> 			i++;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -900,10 +899,8 @@ void show_registers(struct pt_regs *regs)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	print_modules();</div><div class='del'>-	printk("PC: [&lt;%08lx&gt;]",regs-&gt;pc);</div><div class='del'>-	print_symbol(" %s", regs-&gt;pc);</div><div class='del'>-	printk("\nSR: %04x  SP: %p  a2: %08lx\n",</div><div class='del'>-	       regs-&gt;sr, regs, regs-&gt;a2);</div><div class='add'>+	printk("PC: [&lt;%08lx&gt;] %pS\n", regs-&gt;pc, (void *)regs-&gt;pc);</div><div class='add'>+	printk("SR: %04x  SP: %p  a2: %08lx\n", regs-&gt;sr, regs, regs-&gt;a2);</div><div class='ctx'> 	printk("d0: %08lx    d1: %08lx    d2: %08lx    d3: %08lx\n",</div><div class='ctx'> 	       regs-&gt;d0, regs-&gt;d1, regs-&gt;d2, regs-&gt;d3);</div><div class='ctx'> 	printk("d4: %08lx    d5: %08lx    a0: %08lx    a1: %08lx\n",</div><div class='head'>diff --git a/arch/m68k/kernel/vmlinux-std.lds b/arch/m68k/kernel/vmlinux-std.lds<br/>index 99b0784c0552..f846d4e3e5e1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/m68k/kernel/vmlinux-std.lds?id=c15895ef30c2c03e99802951787183039a349d32'>arch/m68k/kernel/vmlinux-std.lds</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/m68k/kernel/vmlinux-std.lds?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/m68k/kernel/vmlinux-std.lds</a></div><div class='hunk'>@@ -34,10 +34,10 @@ SECTIONS</div><div class='ctx'> 	CONSTRUCTORS</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-  .bss : { *(.bss) }		/* BSS */</div><div class='del'>-</div><div class='ctx'>   . = ALIGN(16);</div><div class='del'>-  .data.cacheline_aligned : { *(.data.cacheline_aligned) } :data</div><div class='add'>+  .data.cacheline_aligned : { *(.data.cacheline_aligned) }</div><div class='add'>+</div><div class='add'>+  .bss : { *(.bss) }		/* BSS */</div><div class='ctx'> </div><div class='ctx'>   _edata = .;			/* End of data section */</div><div class='ctx'> </div><div class='hunk'>@@ -48,7 +48,7 @@ SECTIONS</div><div class='ctx'> 	_sinittext = .;</div><div class='ctx'> 	INIT_TEXT</div><div class='ctx'> 	_einittext = .;</div><div class='del'>-  }</div><div class='add'>+  } :data</div><div class='ctx'>   .init.data : { INIT_DATA }</div><div class='ctx'>   . = ALIGN(16);</div><div class='ctx'>   __setup_start = .;</div><div class='hunk'>@@ -74,6 +74,7 @@ SECTIONS</div><div class='ctx'>   .init.ramfs : { *(.init.ramfs) }</div><div class='ctx'>   __initramfs_end = .;</div><div class='ctx'> #endif</div><div class='add'>+  NOTES</div><div class='ctx'>   . = ALIGN(8192);</div><div class='ctx'>   __init_end = .;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/m68k/mm/kmap.c b/arch/m68k/mm/kmap.c<br/>index 46b7d6035aab..df620ac2a296 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/m68k/mm/kmap.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/m68k/mm/kmap.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/m68k/mm/kmap.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/m68k/mm/kmap.c</a></div><div class='hunk'>@@ -66,8 +66,10 @@ static struct vm_struct *get_io_area(unsigned long size)</div><div class='ctx'> 	for (p = &amp;iolist; (tmp = *p) ; p = &amp;tmp-&gt;next) {</div><div class='ctx'> 		if (size + addr &lt; (unsigned long)tmp-&gt;addr)</div><div class='ctx'> 			break;</div><div class='del'>-		if (addr &gt; KMAP_END-size)</div><div class='add'>+		if (addr &gt; KMAP_END-size) {</div><div class='add'>+			kfree(area);</div><div class='ctx'> 			return NULL;</div><div class='add'>+		}</div><div class='ctx'> 		addr = tmp-&gt;size + (unsigned long)tmp-&gt;addr;</div><div class='ctx'> 	}</div><div class='ctx'> 	area-&gt;addr = (void *)addr;</div><div class='head'>diff --git a/arch/m68k/mvme16x/rtc.c b/arch/m68k/mvme16x/rtc.c<br/>index 432a9f13b2ed..cea5e3e4e636 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/m68k/mvme16x/rtc.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/m68k/mvme16x/rtc.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/m68k/mvme16x/rtc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/m68k/mvme16x/rtc.c</a></div><div class='hunk'>@@ -52,15 +52,15 @@ static int rtc_ioctl(struct inode *inode, struct file *file, unsigned int cmd,</div><div class='ctx'> 		/* Ensure clock and real-time-mode-register are accessible */</div><div class='ctx'> 		rtc-&gt;ctrl = RTC_READ;</div><div class='ctx'> 		memset(&amp;wtime, 0, sizeof(struct rtc_time));</div><div class='del'>-		wtime.tm_sec =  BCD2BIN(rtc-&gt;bcd_sec);</div><div class='del'>-		wtime.tm_min =  BCD2BIN(rtc-&gt;bcd_min);</div><div class='del'>-		wtime.tm_hour = BCD2BIN(rtc-&gt;bcd_hr);</div><div class='del'>-		wtime.tm_mday =  BCD2BIN(rtc-&gt;bcd_dom);</div><div class='del'>-		wtime.tm_mon =  BCD2BIN(rtc-&gt;bcd_mth)-1;</div><div class='del'>-		wtime.tm_year = BCD2BIN(rtc-&gt;bcd_year);</div><div class='add'>+		wtime.tm_sec =  bcd2bin(rtc-&gt;bcd_sec);</div><div class='add'>+		wtime.tm_min =  bcd2bin(rtc-&gt;bcd_min);</div><div class='add'>+		wtime.tm_hour = bcd2bin(rtc-&gt;bcd_hr);</div><div class='add'>+		wtime.tm_mday =  bcd2bin(rtc-&gt;bcd_dom);</div><div class='add'>+		wtime.tm_mon =  bcd2bin(rtc-&gt;bcd_mth)-1;</div><div class='add'>+		wtime.tm_year = bcd2bin(rtc-&gt;bcd_year);</div><div class='ctx'> 		if (wtime.tm_year &lt; 70)</div><div class='ctx'> 			wtime.tm_year += 100;</div><div class='del'>-		wtime.tm_wday = BCD2BIN(rtc-&gt;bcd_dow)-1;</div><div class='add'>+		wtime.tm_wday = bcd2bin(rtc-&gt;bcd_dow)-1;</div><div class='ctx'> 		rtc-&gt;ctrl = 0;</div><div class='ctx'> 		local_irq_restore(flags);</div><div class='ctx'> 		return copy_to_user(argp, &amp;wtime, sizeof wtime) ?</div><div class='hunk'>@@ -104,12 +104,12 @@ static int rtc_ioctl(struct inode *inode, struct file *file, unsigned int cmd,</div><div class='ctx'> 		local_irq_save(flags);</div><div class='ctx'> 		rtc-&gt;ctrl     = RTC_WRITE;</div><div class='ctx'> </div><div class='del'>-		rtc-&gt;bcd_sec  = BIN2BCD(sec);</div><div class='del'>-		rtc-&gt;bcd_min  = BIN2BCD(min);</div><div class='del'>-		rtc-&gt;bcd_hr   = BIN2BCD(hrs);</div><div class='del'>-		rtc-&gt;bcd_dom  = BIN2BCD(day);</div><div class='del'>-		rtc-&gt;bcd_mth  = BIN2BCD(mon);</div><div class='del'>-		rtc-&gt;bcd_year = BIN2BCD(yrs%100);</div><div class='add'>+		rtc-&gt;bcd_sec  = bin2bcd(sec);</div><div class='add'>+		rtc-&gt;bcd_min  = bin2bcd(min);</div><div class='add'>+		rtc-&gt;bcd_hr   = bin2bcd(hrs);</div><div class='add'>+		rtc-&gt;bcd_dom  = bin2bcd(day);</div><div class='add'>+		rtc-&gt;bcd_mth  = bin2bcd(mon);</div><div class='add'>+		rtc-&gt;bcd_year = bin2bcd(yrs%100);</div><div class='ctx'> </div><div class='ctx'> 		rtc-&gt;ctrl     = 0;</div><div class='ctx'> 		local_irq_restore(flags);</div><div class='head'>diff --git a/arch/m68k/q40/config.c b/arch/m68k/q40/config.c<br/>index be9de2f3dc48..9c7eefa3f98a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/m68k/q40/config.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/m68k/q40/config.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/m68k/q40/config.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/m68k/q40/config.c</a></div><div class='hunk'>@@ -23,6 +23,7 @@</div><div class='ctx'> #include &lt;linux/serial_reg.h&gt;</div><div class='ctx'> #include &lt;linux/rtc.h&gt;</div><div class='ctx'> #include &lt;linux/vt_kern.h&gt;</div><div class='add'>+#include &lt;linux/bcd.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/rtc.h&gt;</div><div class='hunk'>@@ -216,17 +217,6 @@ int q40_parse_bootinfo(const struct bi_record *rec)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static inline unsigned char bcd2bin(unsigned char b)</div><div class='del'>-{</div><div class='del'>-	return (b &gt;&gt; 4) * 10 + (b &amp; 15);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned char bin2bcd(unsigned char b)</div><div class='del'>-{</div><div class='del'>-	return (b / 10) * 16 + (b % 10);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> static unsigned long q40_gettimeoffset(void)</div><div class='ctx'> {</div><div class='ctx'> 	return 5000 * (ql_ticks != 0);</div><div class='head'>diff --git a/arch/m68k/sun3x/time.c b/arch/m68k/sun3x/time.c<br/>index f5eaafb00d21..536a04aaf22f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/m68k/sun3x/time.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/m68k/sun3x/time.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/m68k/sun3x/time.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/m68k/sun3x/time.c</a></div><div class='hunk'>@@ -47,23 +47,23 @@ int sun3x_hwclk(int set, struct rtc_time *t)</div><div class='ctx'> </div><div class='ctx'> 	if(set) {</div><div class='ctx'> 		h-&gt;csr |= C_WRITE;</div><div class='del'>-		h-&gt;sec = BIN2BCD(t-&gt;tm_sec);</div><div class='del'>-		h-&gt;min = BIN2BCD(t-&gt;tm_min);</div><div class='del'>-		h-&gt;hour = BIN2BCD(t-&gt;tm_hour);</div><div class='del'>-		h-&gt;wday = BIN2BCD(t-&gt;tm_wday);</div><div class='del'>-		h-&gt;mday = BIN2BCD(t-&gt;tm_mday);</div><div class='del'>-		h-&gt;month = BIN2BCD(t-&gt;tm_mon);</div><div class='del'>-		h-&gt;year = BIN2BCD(t-&gt;tm_year);</div><div class='add'>+		h-&gt;sec = bin2bcd(t-&gt;tm_sec);</div><div class='add'>+		h-&gt;min = bin2bcd(t-&gt;tm_min);</div><div class='add'>+		h-&gt;hour = bin2bcd(t-&gt;tm_hour);</div><div class='add'>+		h-&gt;wday = bin2bcd(t-&gt;tm_wday);</div><div class='add'>+		h-&gt;mday = bin2bcd(t-&gt;tm_mday);</div><div class='add'>+		h-&gt;month = bin2bcd(t-&gt;tm_mon);</div><div class='add'>+		h-&gt;year = bin2bcd(t-&gt;tm_year);</div><div class='ctx'> 		h-&gt;csr &amp;= ~C_WRITE;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		h-&gt;csr |= C_READ;</div><div class='del'>-		t-&gt;tm_sec = BCD2BIN(h-&gt;sec);</div><div class='del'>-		t-&gt;tm_min = BCD2BIN(h-&gt;min);</div><div class='del'>-		t-&gt;tm_hour = BCD2BIN(h-&gt;hour);</div><div class='del'>-		t-&gt;tm_wday = BCD2BIN(h-&gt;wday);</div><div class='del'>-		t-&gt;tm_mday = BCD2BIN(h-&gt;mday);</div><div class='del'>-		t-&gt;tm_mon = BCD2BIN(h-&gt;month);</div><div class='del'>-		t-&gt;tm_year = BCD2BIN(h-&gt;year);</div><div class='add'>+		t-&gt;tm_sec = bcd2bin(h-&gt;sec);</div><div class='add'>+		t-&gt;tm_min = bcd2bin(h-&gt;min);</div><div class='add'>+		t-&gt;tm_hour = bcd2bin(h-&gt;hour);</div><div class='add'>+		t-&gt;tm_wday = bcd2bin(h-&gt;wday);</div><div class='add'>+		t-&gt;tm_mday = bcd2bin(h-&gt;mday);</div><div class='add'>+		t-&gt;tm_mon = bcd2bin(h-&gt;month);</div><div class='add'>+		t-&gt;tm_year = bcd2bin(h-&gt;year);</div><div class='ctx'> 		h-&gt;csr &amp;= ~C_READ;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/arch/m68knommu/Kconfig b/arch/m68knommu/Kconfig<br/>index 2e7515e8db98..0a8998315e5e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/m68knommu/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/m68knommu/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/m68knommu/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/m68knommu/Kconfig</a></div><div class='hunk'>@@ -73,9 +73,6 @@ config GENERIC_CLOCKEVENTS</div><div class='ctx'> config NO_IOPORT</div><div class='ctx'> 	def_bool y</div><div class='ctx'> </div><div class='del'>-config ARCH_SUPPORTS_AOUT</div><div class='del'>-	def_bool y</div><div class='del'>-</div><div class='ctx'> source "init/Kconfig"</div><div class='ctx'> </div><div class='ctx'> menu "Processor type and features"</div><div class='head'>diff --git a/arch/m68knommu/include/asm/a.out.h b/arch/m68knommu/include/asm/a.out.h<br/>deleted file mode 100644<br/>index ce18ef99de04..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/m68knommu/include/asm/a.out.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/m68knommu/include/asm/a.out.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1 +0,0 @@</div><div class='del'>-#include &lt;asm-m68k/a.out.h&gt;</div><div class='head'>diff --git a/arch/m68knommu/include/asm/elf.h b/arch/m68knommu/include/asm/elf.h<br/>index 27f0ec70fba8..b8046837f384 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/m68knommu/include/asm/elf.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/m68knommu/include/asm/elf.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/m68knommu/include/asm/elf.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/m68knommu/include/asm/elf.h</a></div><div class='hunk'>@@ -105,6 +105,6 @@ typedef struct user_m68kfp_struct elf_fpregset_t;</div><div class='ctx'> </div><div class='ctx'> #define ELF_PLATFORM  (NULL)</div><div class='ctx'> </div><div class='del'>-#define SET_PERSONALITY(ex, ibcs2) set_personality((ibcs2)?PER_SVR4:PER_LINUX)</div><div class='add'>+#define SET_PERSONALITY(ex) set_personality(PER_LINUX)</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/m68knommu/kernel/process.c b/arch/m68knommu/kernel/process.c<br/>index 47502d5ec19f..3f2d7745f31e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/m68knommu/kernel/process.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/m68knommu/kernel/process.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/m68knommu/kernel/process.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/m68knommu/kernel/process.c</a></div><div class='hunk'>@@ -25,7 +25,6 @@</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/user.h&gt;</div><div class='del'>-#include &lt;linux/a.out.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/reboot.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='head'>diff --git a/arch/m68knommu/kernel/traps.c b/arch/m68knommu/kernel/traps.c<br/>index 46f8f9d0c408..5d5d56bcd0ef 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/m68knommu/kernel/traps.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/m68knommu/kernel/traps.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/m68knommu/kernel/traps.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/m68knommu/kernel/traps.c</a></div><div class='hunk'>@@ -22,7 +22,6 @@</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/a.out.h&gt;</div><div class='ctx'> #include &lt;linux/user.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='head'>diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig<br/>index 1e06d233fa83..b905744d7915 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/Kconfig</a></div><div class='hunk'>@@ -52,6 +52,7 @@ config BCM47XX</div><div class='ctx'> 	select SSB</div><div class='ctx'> 	select SSB_DRIVER_MIPS</div><div class='ctx'> 	select SSB_DRIVER_EXTIF</div><div class='add'>+	select SSB_EMBEDDED</div><div class='ctx'> 	select SSB_PCICORE_HOSTMODE if PCI</div><div class='ctx'> 	select GENERIC_GPIO</div><div class='ctx'> 	select SYS_HAS_EARLY_PRINTK</div><div class='hunk'>@@ -568,7 +569,7 @@ config MIKROTIK_RB532</div><div class='ctx'> 	select SYS_SUPPORTS_LITTLE_ENDIAN</div><div class='ctx'> 	select SWAP_IO_SPACE</div><div class='ctx'> 	select BOOT_RAW</div><div class='del'>-	select GENERIC_GPIO</div><div class='add'>+	select ARCH_REQUIRE_GPIOLIB</div><div class='ctx'> 	help</div><div class='ctx'> 	  Support the Mikrotik(tm) RouterBoard 532 series,</div><div class='ctx'> 	  based on the IDT RC32434 SoC.</div><div class='hunk'>@@ -598,7 +599,7 @@ config WR_PPMC</div><div class='ctx'> </div><div class='ctx'> endchoice</div><div class='ctx'> </div><div class='del'>-source "arch/mips/au1000/Kconfig"</div><div class='add'>+source "arch/mips/alchemy/Kconfig"</div><div class='ctx'> source "arch/mips/basler/excite/Kconfig"</div><div class='ctx'> source "arch/mips/jazz/Kconfig"</div><div class='ctx'> source "arch/mips/lasat/Kconfig"</div><div class='hunk'>@@ -610,11 +611,6 @@ source "arch/mips/vr41xx/Kconfig"</div><div class='ctx'> </div><div class='ctx'> endmenu</div><div class='ctx'> </div><div class='del'>-config GENERIC_LOCKBREAK</div><div class='del'>-	bool</div><div class='del'>-	default y</div><div class='del'>-	depends on SMP &amp;&amp; PREEMPT</div><div class='del'>-</div><div class='ctx'> config RWSEM_GENERIC_SPINLOCK</div><div class='ctx'> 	bool</div><div class='ctx'> 	default y</div><div class='hunk'>@@ -1273,6 +1269,13 @@ config CPU_SUPPORTS_32BIT_KERNEL</div><div class='ctx'> config CPU_SUPPORTS_64BIT_KERNEL</div><div class='ctx'> 	bool</div><div class='ctx'> </div><div class='add'>+#</div><div class='add'>+# Set to y for ptrace access to watch registers.</div><div class='add'>+#</div><div class='add'>+config HARDWARE_WATCHPOINTS</div><div class='add'>+       bool</div><div class='add'>+       default y if CPU_MIPS32 || CPU_MIPS64</div><div class='add'>+</div><div class='ctx'> menu "Kernel type"</div><div class='ctx'> </div><div class='ctx'> choice</div><div class='head'>diff --git a/arch/mips/Makefile b/arch/mips/Makefile<br/>index 9aab51caf16a..7f39fd8a91fe 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/Makefile</a></div><div class='hunk'>@@ -170,123 +170,123 @@ libs-$(CONFIG_SIBYTE_CFE)	+= arch/mips/sibyte/cfe/</div><div class='ctx'> # Acer PICA 61, Mips Magnum 4000 and Olivetti M700.</div><div class='ctx'> #</div><div class='ctx'> core-$(CONFIG_MACH_JAZZ)	+= arch/mips/jazz/</div><div class='del'>-cflags-$(CONFIG_MACH_JAZZ)	+= -Iinclude/asm-mips/mach-jazz</div><div class='add'>+cflags-$(CONFIG_MACH_JAZZ)	+= -I$(srctree)/arch/mips/include/asm/mach-jazz</div><div class='ctx'> load-$(CONFIG_MACH_JAZZ)	+= 0xffffffff80080000</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Common Alchemy Au1x00 stuff</div><div class='ctx'> #</div><div class='del'>-core-$(CONFIG_SOC_AU1X00)	+= arch/mips/au1000/common/</div><div class='del'>-cflags-$(CONFIG_SOC_AU1X00)	+= -Iinclude/asm-mips/mach-au1x00</div><div class='add'>+core-$(CONFIG_SOC_AU1X00)	+= arch/mips/alchemy/common/</div><div class='add'>+cflags-$(CONFIG_SOC_AU1X00)	+= -I$(srctree)/arch/mips/include/asm/mach-au1x00</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # AMD Alchemy Pb1000 eval board</div><div class='ctx'> #</div><div class='del'>-libs-$(CONFIG_MIPS_PB1000)	+= arch/mips/au1000/pb1000/</div><div class='del'>-cflags-$(CONFIG_MIPS_PB1000)	+= -Iinclude/asm-mips/mach-pb1x00</div><div class='add'>+libs-$(CONFIG_MIPS_PB1000)	+= arch/mips/alchemy/pb1000/</div><div class='add'>+cflags-$(CONFIG_MIPS_PB1000)	+= -I$(srctree)/arch/mips/include/asm/mach-pb1x00</div><div class='ctx'> load-$(CONFIG_MIPS_PB1000)	+= 0xffffffff80100000</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # AMD Alchemy Pb1100 eval board</div><div class='ctx'> #</div><div class='del'>-libs-$(CONFIG_MIPS_PB1100)	+= arch/mips/au1000/pb1100/</div><div class='del'>-cflags-$(CONFIG_MIPS_PB1100)	+= -Iinclude/asm-mips/mach-pb1x00</div><div class='add'>+libs-$(CONFIG_MIPS_PB1100)	+= arch/mips/alchemy/pb1100/</div><div class='add'>+cflags-$(CONFIG_MIPS_PB1100)	+= -I$(srctree)/arch/mips/include/asm/mach-pb1x00</div><div class='ctx'> load-$(CONFIG_MIPS_PB1100)	+= 0xffffffff80100000</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # AMD Alchemy Pb1500 eval board</div><div class='ctx'> #</div><div class='del'>-libs-$(CONFIG_MIPS_PB1500)	+= arch/mips/au1000/pb1500/</div><div class='del'>-cflags-$(CONFIG_MIPS_PB1500)	+= -Iinclude/asm-mips/mach-pb1x00</div><div class='add'>+libs-$(CONFIG_MIPS_PB1500)	+= arch/mips/alchemy/pb1500/</div><div class='add'>+cflags-$(CONFIG_MIPS_PB1500)	+= -I$(srctree)/arch/mips/include/asm/mach-pb1x00</div><div class='ctx'> load-$(CONFIG_MIPS_PB1500)	+= 0xffffffff80100000</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # AMD Alchemy Pb1550 eval board</div><div class='ctx'> #</div><div class='del'>-libs-$(CONFIG_MIPS_PB1550)	+= arch/mips/au1000/pb1550/</div><div class='del'>-cflags-$(CONFIG_MIPS_PB1550)	+= -Iinclude/asm-mips/mach-pb1x00</div><div class='add'>+libs-$(CONFIG_MIPS_PB1550)	+= arch/mips/alchemy/pb1550/</div><div class='add'>+cflags-$(CONFIG_MIPS_PB1550)	+= -I$(srctree)/arch/mips/include/asm/mach-pb1x00</div><div class='ctx'> load-$(CONFIG_MIPS_PB1550)	+= 0xffffffff80100000</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # AMD Alchemy Pb1200 eval board</div><div class='ctx'> #</div><div class='del'>-libs-$(CONFIG_MIPS_PB1200)	+= arch/mips/au1000/pb1200/</div><div class='del'>-cflags-$(CONFIG_MIPS_PB1200)	+= -Iinclude/asm-mips/mach-pb1x00</div><div class='add'>+libs-$(CONFIG_MIPS_PB1200)	+= arch/mips/alchemy/pb1200/</div><div class='add'>+cflags-$(CONFIG_MIPS_PB1200)	+= -I$(srctree)/arch/mips/include/asm/mach-pb1x00</div><div class='ctx'> load-$(CONFIG_MIPS_PB1200)	+= 0xffffffff80100000</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # AMD Alchemy Db1000 eval board</div><div class='ctx'> #</div><div class='del'>-libs-$(CONFIG_MIPS_DB1000)	+= arch/mips/au1000/db1x00/</div><div class='del'>-cflags-$(CONFIG_MIPS_DB1000)	+= -Iinclude/asm-mips/mach-db1x00</div><div class='add'>+libs-$(CONFIG_MIPS_DB1000)	+= arch/mips/alchemy/db1x00/</div><div class='add'>+cflags-$(CONFIG_MIPS_DB1000)	+= -I$(srctree)/arch/mips/include/asm/mach-db1x00</div><div class='ctx'> load-$(CONFIG_MIPS_DB1000)	+= 0xffffffff80100000</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # AMD Alchemy Db1100 eval board</div><div class='ctx'> #</div><div class='del'>-libs-$(CONFIG_MIPS_DB1100)	+= arch/mips/au1000/db1x00/</div><div class='del'>-cflags-$(CONFIG_MIPS_DB1100)	+= -Iinclude/asm-mips/mach-db1x00</div><div class='add'>+libs-$(CONFIG_MIPS_DB1100)	+= arch/mips/alchemy/db1x00/</div><div class='add'>+cflags-$(CONFIG_MIPS_DB1100)	+= -I$(srctree)/arch/mips/include/asm/mach-db1x00</div><div class='ctx'> load-$(CONFIG_MIPS_DB1100)	+= 0xffffffff80100000</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # AMD Alchemy Db1500 eval board</div><div class='ctx'> #</div><div class='del'>-libs-$(CONFIG_MIPS_DB1500)	+= arch/mips/au1000/db1x00/</div><div class='del'>-cflags-$(CONFIG_MIPS_DB1500)	+= -Iinclude/asm-mips/mach-db1x00</div><div class='add'>+libs-$(CONFIG_MIPS_DB1500)	+= arch/mips/alchemy/db1x00/</div><div class='add'>+cflags-$(CONFIG_MIPS_DB1500)	+= -I$(srctree)/arch/mips/include/asm/mach-db1x00</div><div class='ctx'> load-$(CONFIG_MIPS_DB1500)	+= 0xffffffff80100000</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # AMD Alchemy Db1550 eval board</div><div class='ctx'> #</div><div class='del'>-libs-$(CONFIG_MIPS_DB1550)	+= arch/mips/au1000/db1x00/</div><div class='del'>-cflags-$(CONFIG_MIPS_DB1550)	+= -Iinclude/asm-mips/mach-db1x00</div><div class='add'>+libs-$(CONFIG_MIPS_DB1550)	+= arch/mips/alchemy/db1x00/</div><div class='add'>+cflags-$(CONFIG_MIPS_DB1550)	+= -I$(srctree)/arch/mips/include/asm/mach-db1x00</div><div class='ctx'> load-$(CONFIG_MIPS_DB1550)	+= 0xffffffff80100000</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # AMD Alchemy Db1200 eval board</div><div class='ctx'> #</div><div class='del'>-libs-$(CONFIG_MIPS_DB1200)	+= arch/mips/au1000/pb1200/</div><div class='del'>-cflags-$(CONFIG_MIPS_DB1200)	+= -Iinclude/asm-mips/mach-db1x00</div><div class='add'>+libs-$(CONFIG_MIPS_DB1200)	+= arch/mips/alchemy/pb1200/</div><div class='add'>+cflags-$(CONFIG_MIPS_DB1200)	+= -I$(srctree)/arch/mips/include/asm/mach-db1x00</div><div class='ctx'> load-$(CONFIG_MIPS_DB1200)	+= 0xffffffff80100000</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # AMD Alchemy Bosporus eval board</div><div class='ctx'> #</div><div class='del'>-libs-$(CONFIG_MIPS_BOSPORUS)	+= arch/mips/au1000/db1x00/</div><div class='del'>-cflags-$(CONFIG_MIPS_BOSPORUS)	+= -Iinclude/asm-mips/mach-db1x00</div><div class='add'>+libs-$(CONFIG_MIPS_BOSPORUS)	+= arch/mips/alchemy/db1x00/</div><div class='add'>+cflags-$(CONFIG_MIPS_BOSPORUS)	+= -I$(srctree)/arch/mips/include/asm/mach-db1x00</div><div class='ctx'> load-$(CONFIG_MIPS_BOSPORUS)	+= 0xffffffff80100000</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # AMD Alchemy Mirage eval board</div><div class='ctx'> #</div><div class='del'>-libs-$(CONFIG_MIPS_MIRAGE)	+= arch/mips/au1000/db1x00/</div><div class='del'>-cflags-$(CONFIG_MIPS_MIRAGE)	+= -Iinclude/asm-mips/mach-db1x00</div><div class='add'>+libs-$(CONFIG_MIPS_MIRAGE)	+= arch/mips/alchemy/db1x00/</div><div class='add'>+cflags-$(CONFIG_MIPS_MIRAGE)	+= -I$(srctree)/arch/mips/include/asm/mach-db1x00</div><div class='ctx'> load-$(CONFIG_MIPS_MIRAGE)	+= 0xffffffff80100000</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # 4G-Systems eval board</div><div class='ctx'> #</div><div class='del'>-libs-$(CONFIG_MIPS_MTX1)	+= arch/mips/au1000/mtx-1/</div><div class='add'>+libs-$(CONFIG_MIPS_MTX1)	+= arch/mips/alchemy/mtx-1/</div><div class='ctx'> load-$(CONFIG_MIPS_MTX1)	+= 0xffffffff80100000</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # MyCable eval board</div><div class='ctx'> #</div><div class='del'>-libs-$(CONFIG_MIPS_XXS1500)	+= arch/mips/au1000/xxs1500/</div><div class='add'>+libs-$(CONFIG_MIPS_XXS1500)	+= arch/mips/alchemy/xxs1500/</div><div class='ctx'> load-$(CONFIG_MIPS_XXS1500)	+= 0xffffffff80100000</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Cobalt Server</div><div class='ctx'> #</div><div class='ctx'> core-$(CONFIG_MIPS_COBALT)	+= arch/mips/cobalt/</div><div class='del'>-cflags-$(CONFIG_MIPS_COBALT)	+= -Iinclude/asm-mips/mach-cobalt</div><div class='add'>+cflags-$(CONFIG_MIPS_COBALT)	+= -I$(srctree)/arch/mips/include/asm/mach-cobalt</div><div class='ctx'> load-$(CONFIG_MIPS_COBALT)	+= 0xffffffff80080000</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # DECstation family</div><div class='ctx'> #</div><div class='ctx'> core-$(CONFIG_MACH_DECSTATION)	+= arch/mips/dec/</div><div class='del'>-cflags-$(CONFIG_MACH_DECSTATION)+= -Iinclude/asm-mips/mach-dec</div><div class='add'>+cflags-$(CONFIG_MACH_DECSTATION)+= -I$(srctree)/arch/mips/include/asm/mach-dec</div><div class='ctx'> libs-$(CONFIG_MACH_DECSTATION)	+= arch/mips/dec/prom/</div><div class='ctx'> load-$(CONFIG_MACH_DECSTATION)	+= 0xffffffff80040000</div><div class='ctx'> </div><div class='hunk'>@@ -294,7 +294,7 @@ load-$(CONFIG_MACH_DECSTATION)	+= 0xffffffff80040000</div><div class='ctx'> # Wind River PPMC Board (4KC + GT64120)</div><div class='ctx'> #</div><div class='ctx'> core-$(CONFIG_WR_PPMC)		+= arch/mips/gt64120/wrppmc/</div><div class='del'>-cflags-$(CONFIG_WR_PPMC)		+= -Iinclude/asm-mips/mach-wrppmc</div><div class='add'>+cflags-$(CONFIG_WR_PPMC)		+= -I$(srctree)/arch/mips/include/asm/mach-wrppmc</div><div class='ctx'> load-$(CONFIG_WR_PPMC)		+= 0xffffffff80100000</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -302,13 +302,13 @@ load-$(CONFIG_WR_PPMC)		+= 0xffffffff80100000</div><div class='ctx'> #</div><div class='ctx'> core-$(CONFIG_LEMOTE_FULONG) +=arch/mips/lemote/lm2e/</div><div class='ctx'> load-$(CONFIG_LEMOTE_FULONG) +=0xffffffff80100000</div><div class='del'>-cflags-$(CONFIG_LEMOTE_FULONG) += -Iinclude/asm-mips/mach-lemote</div><div class='add'>+cflags-$(CONFIG_LEMOTE_FULONG) += -I$(srctree)/arch/mips/include/asm/mach-lemote</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # MIPS Malta board</div><div class='ctx'> #</div><div class='ctx'> core-$(CONFIG_MIPS_MALTA)	+= arch/mips/mti-malta/</div><div class='del'>-cflags-$(CONFIG_MIPS_MALTA)	+= -Iinclude/asm-mips/mach-malta</div><div class='add'>+cflags-$(CONFIG_MIPS_MALTA)	+= -I$(srctree)/arch/mips/include/asm/mach-malta</div><div class='ctx'> load-$(CONFIG_MIPS_MALTA)	+= 0xffffffff80100000</div><div class='ctx'> all-$(CONFIG_MIPS_MALTA)	:= vmlinux.bin</div><div class='ctx'> </div><div class='hunk'>@@ -316,14 +316,14 @@ all-$(CONFIG_MIPS_MALTA)	:= vmlinux.bin</div><div class='ctx'> # MIPS SIM</div><div class='ctx'> #</div><div class='ctx'> core-$(CONFIG_MIPS_SIM)		+= arch/mips/mipssim/</div><div class='del'>-cflags-$(CONFIG_MIPS_SIM)	+= -Iinclude/asm-mips/mach-mipssim</div><div class='add'>+cflags-$(CONFIG_MIPS_SIM)	+= -I$(srctree)/arch/mips/include/asm/mach-mipssim</div><div class='ctx'> load-$(CONFIG_MIPS_SIM)		+= 0x80100000</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # PMC-Sierra MSP SOCs</div><div class='ctx'> #</div><div class='ctx'> core-$(CONFIG_PMC_MSP)		+= arch/mips/pmc-sierra/msp71xx/</div><div class='del'>-cflags-$(CONFIG_PMC_MSP)	+= -Iinclude/asm-mips/pmc-sierra/msp71xx \</div><div class='add'>+cflags-$(CONFIG_PMC_MSP)	+= -I$(srctree)/arch/mips/include/asm/pmc-sierra/msp71xx \</div><div class='ctx'> 					-mno-branch-likely</div><div class='ctx'> load-$(CONFIG_PMC_MSP)		+= 0xffffffff80100000</div><div class='ctx'> </div><div class='hunk'>@@ -331,28 +331,28 @@ load-$(CONFIG_PMC_MSP)		+= 0xffffffff80100000</div><div class='ctx'> # PMC-Sierra Yosemite</div><div class='ctx'> #</div><div class='ctx'> core-$(CONFIG_PMC_YOSEMITE)	+= arch/mips/pmc-sierra/yosemite/</div><div class='del'>-cflags-$(CONFIG_PMC_YOSEMITE)	+= -Iinclude/asm-mips/mach-yosemite</div><div class='add'>+cflags-$(CONFIG_PMC_YOSEMITE)	+= -I$(srctree)/arch/mips/include/asm/mach-yosemite</div><div class='ctx'> load-$(CONFIG_PMC_YOSEMITE)	+= 0xffffffff80100000</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Basler eXcite</div><div class='ctx'> #</div><div class='ctx'> core-$(CONFIG_BASLER_EXCITE)	+= arch/mips/basler/excite/</div><div class='del'>-cflags-$(CONFIG_BASLER_EXCITE)	+= -Iinclude/asm-mips/mach-excite</div><div class='add'>+cflags-$(CONFIG_BASLER_EXCITE)	+= -I$(srctree)/arch/mips/include/asm/mach-excite</div><div class='ctx'> load-$(CONFIG_BASLER_EXCITE)	+= 0x80100000</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # LASAT platforms</div><div class='ctx'> #</div><div class='ctx'> core-$(CONFIG_LASAT)		+= arch/mips/lasat/</div><div class='del'>-cflags-$(CONFIG_LASAT)		+= -Iinclude/asm-mips/mach-lasat</div><div class='add'>+cflags-$(CONFIG_LASAT)		+= -I$(srctree)/arch/mips/include/asm/mach-lasat</div><div class='ctx'> load-$(CONFIG_LASAT)		+= 0xffffffff80000000</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Common VR41xx</div><div class='ctx'> #</div><div class='ctx'> core-$(CONFIG_MACH_VR41XX)	+= arch/mips/vr41xx/common/</div><div class='del'>-cflags-$(CONFIG_MACH_VR41XX)	+= -Iinclude/asm-mips/mach-vr41xx</div><div class='add'>+cflags-$(CONFIG_MACH_VR41XX)	+= -I$(srctree)/arch/mips/include/asm/mach-vr41xx</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # ZAO Networks Capcella (VR4131)</div><div class='hunk'>@@ -385,13 +385,13 @@ load-$(CONFIG_TANBAC_TB022X)	+= 0xffffffff80000000</div><div class='ctx'> # Common NXP PNX8550</div><div class='ctx'> #</div><div class='ctx'> core-$(CONFIG_SOC_PNX8550)	+= arch/mips/nxp/pnx8550/common/</div><div class='del'>-cflags-$(CONFIG_SOC_PNX8550)	+= -Iinclude/asm-mips/mach-pnx8550</div><div class='add'>+cflags-$(CONFIG_SOC_PNX8550)	+= -I$(srctree)/arch/mips/include/asm/mach-pnx8550</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # NXP PNX8550 JBS board</div><div class='ctx'> #</div><div class='ctx'> libs-$(CONFIG_PNX8550_JBS)	+= arch/mips/nxp/pnx8550/jbs/</div><div class='del'>-#cflags-$(CONFIG_PNX8550_JBS)	+= -Iinclude/asm-mips/mach-pnx8550</div><div class='add'>+#cflags-$(CONFIG_PNX8550_JBS)	+= -I$(srctree)/arch/mips/include/asm/mach-pnx8550</div><div class='ctx'> load-$(CONFIG_PNX8550_JBS)	+= 0xffffffff80060000</div><div class='ctx'> </div><div class='ctx'> # NXP PNX8550 STB810 board</div><div class='hunk'>@@ -402,7 +402,7 @@ load-$(CONFIG_PNX8550_STB810)	+= 0xffffffff80060000</div><div class='ctx'> # NEC EMMA2RH boards</div><div class='ctx'> #</div><div class='ctx'> core-$(CONFIG_EMMA2RH)          += arch/mips/emma2rh/common/</div><div class='del'>-cflags-$(CONFIG_EMMA2RH)        += -Iinclude/asm-mips/mach-emma2rh</div><div class='add'>+cflags-$(CONFIG_EMMA2RH)        += -I$(srctree)/arch/mips/include/asm/mach-emma2rh</div><div class='ctx'> </div><div class='ctx'> # NEC EMMA2RH Mark-eins</div><div class='ctx'> core-$(CONFIG_MARKEINS)         += arch/mips/emma2rh/markeins/</div><div class='hunk'>@@ -418,7 +418,7 @@ load-$(CONFIG_MARKEINS)         += 0xffffffff88100000</div><div class='ctx'> # address by 8kb.</div><div class='ctx'> #</div><div class='ctx'> core-$(CONFIG_SGI_IP22)		+= arch/mips/sgi-ip22/</div><div class='del'>-cflags-$(CONFIG_SGI_IP22)	+= -Iinclude/asm-mips/mach-ip22</div><div class='add'>+cflags-$(CONFIG_SGI_IP22)	+= -I$(srctree)/arch/mips/include/asm/mach-ip22</div><div class='ctx'> ifdef CONFIG_32BIT</div><div class='ctx'> load-$(CONFIG_SGI_IP22)		+= 0xffffffff88002000</div><div class='ctx'> endif</div><div class='hunk'>@@ -435,7 +435,7 @@ endif</div><div class='ctx'> #</div><div class='ctx'> ifdef CONFIG_SGI_IP27</div><div class='ctx'> core-$(CONFIG_SGI_IP27)		+= arch/mips/sgi-ip27/</div><div class='del'>-cflags-$(CONFIG_SGI_IP27)	+= -Iinclude/asm-mips/mach-ip27</div><div class='add'>+cflags-$(CONFIG_SGI_IP27)	+= -I$(srctree)/arch/mips/include/asm/mach-ip27</div><div class='ctx'> ifdef CONFIG_MAPPED_KERNEL</div><div class='ctx'> load-$(CONFIG_SGI_IP27)		+= 0xc00000004001c000</div><div class='ctx'> OBJCOPYFLAGS			:= --change-addresses=0x3fffffff80000000</div><div class='hunk'>@@ -460,7 +460,7 @@ ifdef CONFIG_SGI_IP28</div><div class='ctx'>   endif</div><div class='ctx'> endif</div><div class='ctx'> core-$(CONFIG_SGI_IP28)		+= arch/mips/sgi-ip22/</div><div class='del'>-cflags-$(CONFIG_SGI_IP28)	+= -mr10k-cache-barrier=1 -Iinclude/asm-mips/mach-ip28</div><div class='add'>+cflags-$(CONFIG_SGI_IP28)	+= -mr10k-cache-barrier=1 -I$(srctree)/arch/mips/include/asm/mach-ip28</div><div class='ctx'> load-$(CONFIG_SGI_IP28)		+= 0xa800000020004000</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -472,7 +472,7 @@ load-$(CONFIG_SGI_IP28)		+= 0xa800000020004000</div><div class='ctx'> # will break.</div><div class='ctx'> #</div><div class='ctx'> core-$(CONFIG_SGI_IP32)		+= arch/mips/sgi-ip32/</div><div class='del'>-cflags-$(CONFIG_SGI_IP32)	+= -Iinclude/asm-mips/mach-ip32</div><div class='add'>+cflags-$(CONFIG_SGI_IP32)	+= -I$(srctree)/arch/mips/include/asm/mach-ip32</div><div class='ctx'> load-$(CONFIG_SGI_IP32)		+= 0xffffffff80004000</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -484,22 +484,22 @@ load-$(CONFIG_SGI_IP32)		+= 0xffffffff80004000</div><div class='ctx'> #</div><div class='ctx'> core-$(CONFIG_SIBYTE_BCM112X)	+= arch/mips/sibyte/sb1250/</div><div class='ctx'> core-$(CONFIG_SIBYTE_BCM112X)	+= arch/mips/sibyte/common/</div><div class='del'>-cflags-$(CONFIG_SIBYTE_BCM112X)	+= -Iinclude/asm-mips/mach-sibyte \</div><div class='add'>+cflags-$(CONFIG_SIBYTE_BCM112X)	+= -I$(srctree)/arch/mips/include/asm/mach-sibyte \</div><div class='ctx'> 			-DSIBYTE_HDR_FEATURES=SIBYTE_HDR_FMASK_1250_112x_ALL</div><div class='ctx'> </div><div class='ctx'> core-$(CONFIG_SIBYTE_SB1250)	+= arch/mips/sibyte/sb1250/</div><div class='ctx'> core-$(CONFIG_SIBYTE_SB1250)	+= arch/mips/sibyte/common/</div><div class='del'>-cflags-$(CONFIG_SIBYTE_SB1250)	+= -Iinclude/asm-mips/mach-sibyte \</div><div class='add'>+cflags-$(CONFIG_SIBYTE_SB1250)	+= -I$(srctree)/arch/mips/include/asm/mach-sibyte \</div><div class='ctx'> 			-DSIBYTE_HDR_FEATURES=SIBYTE_HDR_FMASK_1250_112x_ALL</div><div class='ctx'> </div><div class='ctx'> core-$(CONFIG_SIBYTE_BCM1x55)	+= arch/mips/sibyte/bcm1480/</div><div class='ctx'> core-$(CONFIG_SIBYTE_BCM1x55)	+= arch/mips/sibyte/common/</div><div class='del'>-cflags-$(CONFIG_SIBYTE_BCM1x55)	+= -Iinclude/asm-mips/mach-sibyte \</div><div class='add'>+cflags-$(CONFIG_SIBYTE_BCM1x55)	+= -I$(srctree)/arch/mips/include/asm/mach-sibyte \</div><div class='ctx'> 			-DSIBYTE_HDR_FEATURES=SIBYTE_HDR_FMASK_1480_ALL</div><div class='ctx'> </div><div class='ctx'> core-$(CONFIG_SIBYTE_BCM1x80)	+= arch/mips/sibyte/bcm1480/</div><div class='ctx'> core-$(CONFIG_SIBYTE_BCM1x80)	+= arch/mips/sibyte/common/</div><div class='del'>-cflags-$(CONFIG_SIBYTE_BCM1x80)	+= -Iinclude/asm-mips/mach-sibyte \</div><div class='add'>+cflags-$(CONFIG_SIBYTE_BCM1x80)	+= -I$(srctree)/arch/mips/include/asm/mach-sibyte \</div><div class='ctx'> 			-DSIBYTE_HDR_FEATURES=SIBYTE_HDR_FMASK_1480_ALL</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -529,14 +529,14 @@ load-$(CONFIG_SIBYTE_BIGSUR)	:= 0xffffffff80100000</div><div class='ctx'> # Broadcom BCM47XX boards</div><div class='ctx'> #</div><div class='ctx'> core-$(CONFIG_BCM47XX)		+= arch/mips/bcm47xx/</div><div class='del'>-cflags-$(CONFIG_BCM47XX)	+= -Iinclude/asm-mips/mach-bcm47xx</div><div class='add'>+cflags-$(CONFIG_BCM47XX)	+= -I$(srctree)/arch/mips/include/asm/mach-bcm47xx</div><div class='ctx'> load-$(CONFIG_BCM47XX)		:= 0xffffffff80001000</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # SNI RM</div><div class='ctx'> #</div><div class='ctx'> core-$(CONFIG_SNI_RM)		+= arch/mips/sni/</div><div class='del'>-cflags-$(CONFIG_SNI_RM)		+= -Iinclude/asm-mips/mach-rm</div><div class='add'>+cflags-$(CONFIG_SNI_RM)		+= -I$(srctree)/arch/mips/include/asm/mach-rm</div><div class='ctx'> ifdef CONFIG_CPU_LITTLE_ENDIAN</div><div class='ctx'> load-$(CONFIG_SNI_RM)		+= 0xffffffff80600000</div><div class='ctx'> else</div><div class='hunk'>@@ -548,10 +548,10 @@ all-$(CONFIG_SNI_RM)		:= vmlinux.ecoff</div><div class='ctx'> # Common TXx9</div><div class='ctx'> #</div><div class='ctx'> core-$(CONFIG_MACH_TX39XX)	+= arch/mips/txx9/generic/</div><div class='del'>-cflags-$(CONFIG_MACH_TX39XX) += -Iinclude/asm-mips/mach-tx39xx</div><div class='add'>+cflags-$(CONFIG_MACH_TX39XX) += -I$(srctree)/arch/mips/include/asm/mach-tx39xx</div><div class='ctx'> load-$(CONFIG_MACH_TX39XX)	+= 0xffffffff80050000</div><div class='ctx'> core-$(CONFIG_MACH_TX49XX)	+= arch/mips/txx9/generic/</div><div class='del'>-cflags-$(CONFIG_MACH_TX49XX) += -Iinclude/asm-mips/mach-tx49xx</div><div class='add'>+cflags-$(CONFIG_MACH_TX49XX) += -I$(srctree)/arch/mips/include/asm/mach-tx49xx</div><div class='ctx'> load-$(CONFIG_MACH_TX49XX)	+= 0xffffffff80100000</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -563,21 +563,17 @@ core-$(CONFIG_TOSHIBA_JMR3927)	+= arch/mips/txx9/jmr3927/</div><div class='ctx'> # Routerboard 532 board</div><div class='ctx'> #</div><div class='ctx'> core-$(CONFIG_MIKROTIK_RB532)	+= arch/mips/rb532/</div><div class='del'>-cflags-$(CONFIG_MIKROTIK_RB532) += -Iinclude/asm-mips/mach-rc32434</div><div class='add'>+cflags-$(CONFIG_MIKROTIK_RB532) += -I$(srctree)/arch/mips/include/asm/mach-rc32434</div><div class='ctx'> load-$(CONFIG_MIKROTIK_RB532)	+= 0xffffffff80101000</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Toshiba RBTX4927 board or</div><div class='del'>-# Toshiba RBTX4937 board</div><div class='add'>+# Toshiba RBTX49XX boards</div><div class='ctx'> #</div><div class='ctx'> core-$(CONFIG_TOSHIBA_RBTX4927)	+= arch/mips/txx9/rbtx4927/</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Toshiba RBTX4938 board</div><div class='del'>-#</div><div class='ctx'> core-$(CONFIG_TOSHIBA_RBTX4938) += arch/mips/txx9/rbtx4938/</div><div class='add'>+core-$(CONFIG_TOSHIBA_RBTX4939) += arch/mips/txx9/rbtx4939/</div><div class='ctx'> </div><div class='del'>-cflags-y			+= -Iinclude/asm-mips/mach-generic</div><div class='add'>+cflags-y			+= -I$(srctree)/arch/mips/include/asm/mach-generic</div><div class='ctx'> drivers-$(CONFIG_PCI)		+= arch/mips/pci/</div><div class='ctx'> </div><div class='ctx'> ifdef CONFIG_32BIT</div><div class='head'>diff --git a/arch/mips/au1000/Kconfig b/arch/mips/alchemy/Kconfig<br/>index e4a057d80ab6..e4a057d80ab6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/au1000/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/au1000/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/alchemy/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/Kconfig</a></div><div class='head'>diff --git a/arch/mips/au1000/common/Makefile b/arch/mips/alchemy/common/Makefile<br/>index df48fd65bbf3..df48fd65bbf3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/au1000/common/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/au1000/common/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/alchemy/common/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/common/Makefile</a></div><div class='head'>diff --git a/arch/mips/au1000/common/au1xxx_irqmap.c b/arch/mips/alchemy/common/au1xxx_irqmap.c<br/>index c7ca1596394c..c7ca1596394c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/au1000/common/au1xxx_irqmap.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/au1000/common/au1xxx_irqmap.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/alchemy/common/au1xxx_irqmap.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/common/au1xxx_irqmap.c</a></div><div class='head'>diff --git a/arch/mips/au1000/common/clocks.c b/arch/mips/alchemy/common/clocks.c<br/>index 043429d17c5f..043429d17c5f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/au1000/common/clocks.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/au1000/common/clocks.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/alchemy/common/clocks.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/common/clocks.c</a></div><div class='head'>diff --git a/arch/mips/au1000/common/cputable.c b/arch/mips/alchemy/common/cputable.c<br/>index ba6430bc2d03..ba6430bc2d03 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/au1000/common/cputable.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/au1000/common/cputable.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/alchemy/common/cputable.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/common/cputable.c</a></div><div class='head'>diff --git a/arch/mips/au1000/common/dbdma.c b/arch/mips/alchemy/common/dbdma.c<br/>index 601ee9180ee4..601ee9180ee4 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/au1000/common/dbdma.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/au1000/common/dbdma.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/alchemy/common/dbdma.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/common/dbdma.c</a></div><div class='head'>diff --git a/arch/mips/au1000/common/dma.c b/arch/mips/alchemy/common/dma.c<br/>index d6fbda232e6a..d6fbda232e6a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/au1000/common/dma.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/au1000/common/dma.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/alchemy/common/dma.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/common/dma.c</a></div><div class='head'>diff --git a/arch/mips/au1000/common/gpio.c b/arch/mips/alchemy/common/gpio.c<br/>index e660ddd611c4..e660ddd611c4 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/au1000/common/gpio.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/au1000/common/gpio.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/alchemy/common/gpio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/common/gpio.c</a></div><div class='head'>diff --git a/arch/mips/au1000/common/irq.c b/arch/mips/alchemy/common/irq.c<br/>index 40c6ceceb5f9..40c6ceceb5f9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/au1000/common/irq.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/au1000/common/irq.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/alchemy/common/irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/common/irq.c</a></div><div class='head'>diff --git a/arch/mips/au1000/common/pci.c b/arch/mips/alchemy/common/pci.c<br/>index 7866cf50cf99..7866cf50cf99 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/au1000/common/pci.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/au1000/common/pci.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/alchemy/common/pci.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/common/pci.c</a></div><div class='head'>diff --git a/arch/mips/au1000/common/platform.c b/arch/mips/alchemy/common/platform.c<br/>index dc8a67efac28..dc8a67efac28 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/au1000/common/platform.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/au1000/common/platform.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/alchemy/common/platform.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/common/platform.c</a></div><div class='head'>diff --git a/arch/mips/au1000/common/power.c b/arch/mips/alchemy/common/power.c<br/>index bd854a6d1d89..bd854a6d1d89 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/au1000/common/power.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/au1000/common/power.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/alchemy/common/power.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/common/power.c</a></div><div class='head'>diff --git a/arch/mips/au1000/common/prom.c b/arch/mips/alchemy/common/prom.c<br/>index 18b310b475ca..18b310b475ca 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/au1000/common/prom.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/au1000/common/prom.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/alchemy/common/prom.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/common/prom.c</a></div><div class='head'>diff --git a/arch/mips/au1000/common/puts.c b/arch/mips/alchemy/common/puts.c<br/>index 55bbe24d45b6..55bbe24d45b6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/au1000/common/puts.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/au1000/common/puts.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/alchemy/common/puts.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/common/puts.c</a></div><div class='head'>diff --git a/arch/mips/au1000/common/reset.c b/arch/mips/alchemy/common/reset.c<br/>index d555429c8d6f..d555429c8d6f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/au1000/common/reset.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/au1000/common/reset.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/alchemy/common/reset.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/common/reset.c</a></div><div class='head'>diff --git a/arch/mips/au1000/common/setup.c b/arch/mips/alchemy/common/setup.c<br/>index 1ac6b06f42a3..1ac6b06f42a3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/au1000/common/setup.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/au1000/common/setup.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/alchemy/common/setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/common/setup.c</a></div><div class='head'>diff --git a/arch/mips/au1000/common/sleeper.S b/arch/mips/alchemy/common/sleeper.S<br/>index 4b3cf021a454..3006e270c8bc 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/au1000/common/sleeper.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/au1000/common/sleeper.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/alchemy/common/sleeper.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/common/sleeper.S</a></div><div class='hunk'>@@ -79,12 +79,12 @@ LEAF(save_and_sleep)</div><div class='ctx'> /* Put SDRAM into self refresh.  Preload instructions into cache,</div><div class='ctx'>  * issue a precharge, then auto refresh, then sleep commands to it.</div><div class='ctx'>  */</div><div class='del'>- 	la	t0, sdsleep</div><div class='add'>+	la	t0, sdsleep</div><div class='ctx'> 	.set	mips3</div><div class='del'>- 	cache	0x14, 0(t0)</div><div class='del'>- 	cache	0x14, 32(t0)</div><div class='del'>- 	cache	0x14, 64(t0)</div><div class='del'>- 	cache	0x14, 96(t0)</div><div class='add'>+	cache	0x14, 0(t0)</div><div class='add'>+	cache	0x14, 32(t0)</div><div class='add'>+	cache	0x14, 64(t0)</div><div class='add'>+	cache	0x14, 96(t0)</div><div class='ctx'> 	.set	mips0</div><div class='ctx'> </div><div class='ctx'> sdsleep:</div><div class='head'>diff --git a/arch/mips/au1000/common/time.c b/arch/mips/alchemy/common/time.c<br/>index 563d9390a872..563d9390a872 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/au1000/common/time.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/au1000/common/time.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/alchemy/common/time.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/common/time.c</a></div><div class='head'>diff --git a/arch/mips/au1000/db1x00/Makefile b/arch/mips/alchemy/db1x00/Makefile<br/>index 274db3b55d82..274db3b55d82 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/au1000/db1x00/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/au1000/db1x00/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/alchemy/db1x00/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/db1x00/Makefile</a></div><div class='head'>diff --git a/arch/mips/au1000/db1x00/board_setup.c b/arch/mips/alchemy/db1x00/board_setup.c<br/>index 9e5ccbbfcedd..9e5ccbbfcedd 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/au1000/db1x00/board_setup.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/au1000/db1x00/board_setup.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/alchemy/db1x00/board_setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/db1x00/board_setup.c</a></div><div class='head'>diff --git a/arch/mips/au1000/db1x00/init.c b/arch/mips/alchemy/db1x00/init.c<br/>index 847413514964..847413514964 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/au1000/db1x00/init.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/au1000/db1x00/init.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/alchemy/db1x00/init.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/db1x00/init.c</a></div><div class='head'>diff --git a/arch/mips/au1000/db1x00/irqmap.c b/arch/mips/alchemy/db1x00/irqmap.c<br/>index 94c090e8bf7a..94c090e8bf7a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/au1000/db1x00/irqmap.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/au1000/db1x00/irqmap.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/alchemy/db1x00/irqmap.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/db1x00/irqmap.c</a></div><div class='head'>diff --git a/arch/mips/au1000/mtx-1/Makefile b/arch/mips/alchemy/mtx-1/Makefile<br/>index 7c67b3d33bec..7c67b3d33bec 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/au1000/mtx-1/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/au1000/mtx-1/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/alchemy/mtx-1/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/mtx-1/Makefile</a></div><div class='head'>diff --git a/arch/mips/au1000/mtx-1/board_setup.c b/arch/mips/alchemy/mtx-1/board_setup.c<br/>index 3f8079186cf2..3f8079186cf2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/au1000/mtx-1/board_setup.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/au1000/mtx-1/board_setup.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/alchemy/mtx-1/board_setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/mtx-1/board_setup.c</a></div><div class='head'>diff --git a/arch/mips/au1000/mtx-1/init.c b/arch/mips/alchemy/mtx-1/init.c<br/>index 3bae13c28954..3bae13c28954 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/au1000/mtx-1/init.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/au1000/mtx-1/init.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/alchemy/mtx-1/init.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/mtx-1/init.c</a></div><div class='head'>diff --git a/arch/mips/au1000/mtx-1/irqmap.c b/arch/mips/alchemy/mtx-1/irqmap.c<br/>index f2bf02951e9c..f2bf02951e9c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/au1000/mtx-1/irqmap.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/au1000/mtx-1/irqmap.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/alchemy/mtx-1/irqmap.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/mtx-1/irqmap.c</a></div><div class='head'>diff --git a/arch/mips/au1000/mtx-1/platform.c b/arch/mips/alchemy/mtx-1/platform.c<br/>index 8b5914d1241f..8b5914d1241f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/au1000/mtx-1/platform.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/au1000/mtx-1/platform.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/alchemy/mtx-1/platform.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/mtx-1/platform.c</a></div><div class='head'>diff --git a/arch/mips/au1000/pb1000/Makefile b/arch/mips/alchemy/pb1000/Makefile<br/>index 99bbec0ca41b..99bbec0ca41b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/au1000/pb1000/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/au1000/pb1000/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/alchemy/pb1000/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/pb1000/Makefile</a></div><div class='head'>diff --git a/arch/mips/au1000/pb1000/board_setup.c b/arch/mips/alchemy/pb1000/board_setup.c<br/>index 25df167a95b3..25df167a95b3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/au1000/pb1000/board_setup.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/au1000/pb1000/board_setup.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/alchemy/pb1000/board_setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/pb1000/board_setup.c</a></div><div class='head'>diff --git a/arch/mips/au1000/pb1000/init.c b/arch/mips/alchemy/pb1000/init.c<br/>index 8a9c7d57208d..8a9c7d57208d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/au1000/pb1000/init.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/au1000/pb1000/init.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/alchemy/pb1000/init.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/pb1000/init.c</a></div><div class='head'>diff --git a/arch/mips/au1000/pb1000/irqmap.c b/arch/mips/alchemy/pb1000/irqmap.c<br/>index b3d56b0af321..b3d56b0af321 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/au1000/pb1000/irqmap.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/au1000/pb1000/irqmap.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/alchemy/pb1000/irqmap.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/pb1000/irqmap.c</a></div><div class='head'>diff --git a/arch/mips/au1000/pb1100/Makefile b/arch/mips/alchemy/pb1100/Makefile<br/>index 793e97c49e46..793e97c49e46 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/au1000/pb1100/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/au1000/pb1100/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/alchemy/pb1100/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/pb1100/Makefile</a></div><div class='head'>diff --git a/arch/mips/au1000/pb1100/board_setup.c b/arch/mips/alchemy/pb1100/board_setup.c<br/>index c0bfd59a7a36..c0bfd59a7a36 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/au1000/pb1100/board_setup.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/au1000/pb1100/board_setup.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/alchemy/pb1100/board_setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/pb1100/board_setup.c</a></div><div class='head'>diff --git a/arch/mips/au1000/pb1100/init.c b/arch/mips/alchemy/pb1100/init.c<br/>index 7c6792308bc5..7c6792308bc5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/au1000/pb1100/init.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/au1000/pb1100/init.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/alchemy/pb1100/init.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/pb1100/init.c</a></div><div class='head'>diff --git a/arch/mips/au1000/pb1100/irqmap.c b/arch/mips/alchemy/pb1100/irqmap.c<br/>index 9b7dd8b41283..9b7dd8b41283 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/au1000/pb1100/irqmap.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/au1000/pb1100/irqmap.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/alchemy/pb1100/irqmap.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/pb1100/irqmap.c</a></div><div class='head'>diff --git a/arch/mips/au1000/pb1200/Makefile b/arch/mips/alchemy/pb1200/Makefile<br/>index d678adf7ce85..d678adf7ce85 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/au1000/pb1200/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/au1000/pb1200/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/alchemy/pb1200/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/pb1200/Makefile</a></div><div class='head'>diff --git a/arch/mips/au1000/pb1200/board_setup.c b/arch/mips/alchemy/pb1200/board_setup.c<br/>index 6cb2115059ad..6cb2115059ad 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/au1000/pb1200/board_setup.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/au1000/pb1200/board_setup.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/alchemy/pb1200/board_setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/pb1200/board_setup.c</a></div><div class='head'>diff --git a/arch/mips/au1000/pb1200/init.c b/arch/mips/alchemy/pb1200/init.c<br/>index e9b2a0fd48ae..e9b2a0fd48ae 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/au1000/pb1200/init.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/au1000/pb1200/init.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/alchemy/pb1200/init.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/pb1200/init.c</a></div><div class='head'>diff --git a/arch/mips/au1000/pb1200/irqmap.c b/arch/mips/alchemy/pb1200/irqmap.c<br/>index 2a505ad8715b..2a505ad8715b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/au1000/pb1200/irqmap.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/au1000/pb1200/irqmap.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/alchemy/pb1200/irqmap.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/pb1200/irqmap.c</a></div><div class='head'>diff --git a/arch/mips/au1000/pb1200/platform.c b/arch/mips/alchemy/pb1200/platform.c<br/>index f8fb0aeac571..f8fb0aeac571 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/au1000/pb1200/platform.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/au1000/pb1200/platform.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/alchemy/pb1200/platform.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/pb1200/platform.c</a></div><div class='head'>diff --git a/arch/mips/au1000/pb1500/Makefile b/arch/mips/alchemy/pb1500/Makefile<br/>index 602f38df20bb..602f38df20bb 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/au1000/pb1500/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/au1000/pb1500/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/alchemy/pb1500/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/pb1500/Makefile</a></div><div class='head'>diff --git a/arch/mips/au1000/pb1500/board_setup.c b/arch/mips/alchemy/pb1500/board_setup.c<br/>index 035771c6e5b8..035771c6e5b8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/au1000/pb1500/board_setup.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/au1000/pb1500/board_setup.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/alchemy/pb1500/board_setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/pb1500/board_setup.c</a></div><div class='head'>diff --git a/arch/mips/au1000/pb1500/init.c b/arch/mips/alchemy/pb1500/init.c<br/>index 3b6e395cf952..3b6e395cf952 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/au1000/pb1500/init.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/au1000/pb1500/init.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/alchemy/pb1500/init.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/pb1500/init.c</a></div><div class='head'>diff --git a/arch/mips/au1000/pb1500/irqmap.c b/arch/mips/alchemy/pb1500/irqmap.c<br/>index 39c4682766a8..39c4682766a8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/au1000/pb1500/irqmap.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/au1000/pb1500/irqmap.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/alchemy/pb1500/irqmap.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/pb1500/irqmap.c</a></div><div class='head'>diff --git a/arch/mips/au1000/pb1550/Makefile b/arch/mips/alchemy/pb1550/Makefile<br/>index 7d8beca87fa5..7d8beca87fa5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/au1000/pb1550/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/au1000/pb1550/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/alchemy/pb1550/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/pb1550/Makefile</a></div><div class='head'>diff --git a/arch/mips/au1000/pb1550/board_setup.c b/arch/mips/alchemy/pb1550/board_setup.c<br/>index 0ed76b64b6ab..0ed76b64b6ab 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/au1000/pb1550/board_setup.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/au1000/pb1550/board_setup.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/alchemy/pb1550/board_setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/pb1550/board_setup.c</a></div><div class='head'>diff --git a/arch/mips/au1000/pb1550/init.c b/arch/mips/alchemy/pb1550/init.c<br/>index e1055a13a1a0..e1055a13a1a0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/au1000/pb1550/init.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/au1000/pb1550/init.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/alchemy/pb1550/init.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/pb1550/init.c</a></div><div class='head'>diff --git a/arch/mips/au1000/pb1550/irqmap.c b/arch/mips/alchemy/pb1550/irqmap.c<br/>index a02a4d1fa899..a02a4d1fa899 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/au1000/pb1550/irqmap.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/au1000/pb1550/irqmap.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/alchemy/pb1550/irqmap.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/pb1550/irqmap.c</a></div><div class='head'>diff --git a/arch/mips/au1000/xxs1500/Makefile b/arch/mips/alchemy/xxs1500/Makefile<br/>index db3c526f64d8..db3c526f64d8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/au1000/xxs1500/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/au1000/xxs1500/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/alchemy/xxs1500/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/xxs1500/Makefile</a></div><div class='head'>diff --git a/arch/mips/au1000/xxs1500/board_setup.c b/arch/mips/alchemy/xxs1500/board_setup.c<br/>index 4c587acac5c3..4c587acac5c3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/au1000/xxs1500/board_setup.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/au1000/xxs1500/board_setup.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/alchemy/xxs1500/board_setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/xxs1500/board_setup.c</a></div><div class='head'>diff --git a/arch/mips/au1000/xxs1500/init.c b/arch/mips/alchemy/xxs1500/init.c<br/>index 7516434760a1..7516434760a1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/au1000/xxs1500/init.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/au1000/xxs1500/init.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/alchemy/xxs1500/init.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/xxs1500/init.c</a></div><div class='head'>diff --git a/arch/mips/au1000/xxs1500/irqmap.c b/arch/mips/alchemy/xxs1500/irqmap.c<br/>index edf06ed11870..edf06ed11870 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/au1000/xxs1500/irqmap.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/au1000/xxs1500/irqmap.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/alchemy/xxs1500/irqmap.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/alchemy/xxs1500/irqmap.c</a></div><div class='head'>diff --git a/arch/mips/bcm47xx/gpio.c b/arch/mips/bcm47xx/gpio.c<br/>index f5a53acf995a..9b798800258c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/bcm47xx/gpio.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/bcm47xx/gpio.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/bcm47xx/gpio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/bcm47xx/gpio.c</a></div><div class='hunk'>@@ -12,68 +12,51 @@</div><div class='ctx'> #include &lt;asm/mach-bcm47xx/bcm47xx.h&gt;</div><div class='ctx'> #include &lt;asm/mach-bcm47xx/gpio.h&gt;</div><div class='ctx'> </div><div class='del'>-int bcm47xx_gpio_to_irq(unsigned gpio)</div><div class='add'>+#if (BCM47XX_CHIPCO_GPIO_LINES &gt; BCM47XX_EXTIF_GPIO_LINES)</div><div class='add'>+static DECLARE_BITMAP(gpio_in_use, BCM47XX_CHIPCO_GPIO_LINES);</div><div class='add'>+#else</div><div class='add'>+static DECLARE_BITMAP(gpio_in_use, BCM47XX_EXTIF_GPIO_LINES);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+int gpio_request(unsigned gpio, const char *tag)</div><div class='ctx'> {</div><div class='del'>-	if (ssb_bcm47xx.chipco.dev)</div><div class='del'>-		return ssb_mips_irq(ssb_bcm47xx.chipco.dev) + 2;</div><div class='del'>-	else if (ssb_bcm47xx.extif.dev)</div><div class='del'>-		return ssb_mips_irq(ssb_bcm47xx.extif.dev) + 2;</div><div class='del'>-	else</div><div class='add'>+	if (ssb_chipco_available(&amp;ssb_bcm47xx.chipco) &amp;&amp;</div><div class='add'>+	    ((unsigned)gpio &gt;= BCM47XX_CHIPCO_GPIO_LINES))</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(bcm47xx_gpio_to_irq);</div><div class='ctx'> </div><div class='del'>-int bcm47xx_gpio_get_value(unsigned gpio)</div><div class='del'>-{</div><div class='del'>-	if (ssb_bcm47xx.chipco.dev)</div><div class='del'>-		return ssb_chipco_gpio_in(&amp;ssb_bcm47xx.chipco, 1 &lt;&lt; gpio);</div><div class='del'>-	else if (ssb_bcm47xx.extif.dev)</div><div class='del'>-		return ssb_extif_gpio_in(&amp;ssb_bcm47xx.extif, 1 &lt;&lt; gpio);</div><div class='del'>-	else</div><div class='del'>-		return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(bcm47xx_gpio_get_value);</div><div class='add'>+	if (ssb_extif_available(&amp;ssb_bcm47xx.extif) &amp;&amp;</div><div class='add'>+	    ((unsigned)gpio &gt;= BCM47XX_EXTIF_GPIO_LINES))</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-void bcm47xx_gpio_set_value(unsigned gpio, int value)</div><div class='del'>-{</div><div class='del'>-	if (ssb_bcm47xx.chipco.dev)</div><div class='del'>-		ssb_chipco_gpio_out(&amp;ssb_bcm47xx.chipco,</div><div class='del'>-				    1 &lt;&lt; gpio,</div><div class='del'>-				    value ? 1 &lt;&lt; gpio : 0);</div><div class='del'>-	else if (ssb_bcm47xx.extif.dev)</div><div class='del'>-		ssb_extif_gpio_out(&amp;ssb_bcm47xx.extif,</div><div class='del'>-				   1 &lt;&lt; gpio,</div><div class='del'>-				   value ? 1 &lt;&lt; gpio : 0);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(bcm47xx_gpio_set_value);</div><div class='add'>+	if (test_and_set_bit(gpio, gpio_in_use))</div><div class='add'>+		return -EBUSY;</div><div class='ctx'> </div><div class='del'>-int bcm47xx_gpio_direction_input(unsigned gpio)</div><div class='del'>-{</div><div class='del'>-	if (ssb_bcm47xx.chipco.dev &amp;&amp; (gpio &lt; BCM47XX_CHIPCO_GPIO_LINES))</div><div class='del'>-		ssb_chipco_gpio_outen(&amp;ssb_bcm47xx.chipco,</div><div class='del'>-				      1 &lt;&lt; gpio, 0);</div><div class='del'>-	else if (ssb_bcm47xx.extif.dev &amp;&amp; (gpio &lt; BCM47XX_EXTIF_GPIO_LINES))</div><div class='del'>-		ssb_extif_gpio_outen(&amp;ssb_bcm47xx.extif,</div><div class='del'>-				     1 &lt;&lt; gpio, 0);</div><div class='del'>-	else</div><div class='del'>-		return -EINVAL;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(bcm47xx_gpio_direction_input);</div><div class='add'>+EXPORT_SYMBOL(gpio_request);</div><div class='ctx'> </div><div class='del'>-int bcm47xx_gpio_direction_output(unsigned gpio, int value)</div><div class='add'>+void gpio_free(unsigned gpio)</div><div class='ctx'> {</div><div class='del'>-	bcm47xx_gpio_set_value(gpio, value);</div><div class='add'>+	if (ssb_chipco_available(&amp;ssb_bcm47xx.chipco) &amp;&amp;</div><div class='add'>+	    ((unsigned)gpio &gt;= BCM47XX_CHIPCO_GPIO_LINES))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (ssb_extif_available(&amp;ssb_bcm47xx.extif) &amp;&amp;</div><div class='add'>+	    ((unsigned)gpio &gt;= BCM47XX_EXTIF_GPIO_LINES))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	clear_bit(gpio, gpio_in_use);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(gpio_free);</div><div class='ctx'> </div><div class='del'>-	if (ssb_bcm47xx.chipco.dev &amp;&amp; (gpio &lt; BCM47XX_CHIPCO_GPIO_LINES))</div><div class='del'>-		ssb_chipco_gpio_outen(&amp;ssb_bcm47xx.chipco,</div><div class='del'>-				      1 &lt;&lt; gpio, 1 &lt;&lt; gpio);</div><div class='del'>-	else if (ssb_bcm47xx.extif.dev &amp;&amp; (gpio &lt; BCM47XX_EXTIF_GPIO_LINES))</div><div class='del'>-		ssb_extif_gpio_outen(&amp;ssb_bcm47xx.extif,</div><div class='del'>-				     1 &lt;&lt; gpio, 1 &lt;&lt; gpio);</div><div class='add'>+int gpio_to_irq(unsigned gpio)</div><div class='add'>+{</div><div class='add'>+	if (ssb_chipco_available(&amp;ssb_bcm47xx.chipco))</div><div class='add'>+		return ssb_mips_irq(ssb_bcm47xx.chipco.dev) + 2;</div><div class='add'>+	else if (ssb_extif_available(&amp;ssb_bcm47xx.extif))</div><div class='add'>+		return ssb_mips_irq(ssb_bcm47xx.extif.dev) + 2;</div><div class='ctx'> 	else</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(bcm47xx_gpio_direction_output);</div><div class='add'>+EXPORT_SYMBOL_GPL(gpio_to_irq);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/bcm47xx/setup.c b/arch/mips/bcm47xx/setup.c<br/>index 8d36f186890e..2f580fa160c9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/bcm47xx/setup.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/bcm47xx/setup.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/bcm47xx/setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/bcm47xx/setup.c</a></div><div class='hunk'>@@ -27,6 +27,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/ssb/ssb.h&gt;</div><div class='add'>+#include &lt;linux/ssb/ssb_embedded.h&gt;</div><div class='ctx'> #include &lt;asm/bootinfo.h&gt;</div><div class='ctx'> #include &lt;asm/reboot.h&gt;</div><div class='ctx'> #include &lt;asm/time.h&gt;</div><div class='hunk'>@@ -41,7 +42,7 @@ static void bcm47xx_machine_restart(char *command)</div><div class='ctx'> 	printk(KERN_ALERT "Please stand by while rebooting the system...\n");</div><div class='ctx'> 	local_irq_disable();</div><div class='ctx'> 	/* Set the watchdog timer to reset immediately */</div><div class='del'>-	ssb_chipco_watchdog_timer_set(&amp;ssb_bcm47xx.chipco, 1);</div><div class='add'>+	ssb_watchdog_timer_set(&amp;ssb_bcm47xx, 1);</div><div class='ctx'> 	while (1)</div><div class='ctx'> 		cpu_relax();</div><div class='ctx'> }</div><div class='hunk'>@@ -50,7 +51,7 @@ static void bcm47xx_machine_halt(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* Disable interrupts and watchdog and spin forever */</div><div class='ctx'> 	local_irq_disable();</div><div class='del'>-	ssb_chipco_watchdog_timer_set(&amp;ssb_bcm47xx.chipco, 0);</div><div class='add'>+	ssb_watchdog_timer_set(&amp;ssb_bcm47xx, 0);</div><div class='ctx'> 	while (1)</div><div class='ctx'> 		cpu_relax();</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/bcm47xx/wgt634u.c b/arch/mips/bcm47xx/wgt634u.c<br/>index d1d90c9ef2fa..ef00e7f58c24 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/bcm47xx/wgt634u.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/bcm47xx/wgt634u.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/bcm47xx/wgt634u.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/bcm47xx/wgt634u.c</a></div><div class='hunk'>@@ -11,6 +11,9 @@</div><div class='ctx'> #include &lt;linux/leds.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/physmap.h&gt;</div><div class='ctx'> #include &lt;linux/ssb/ssb.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/reboot.h&gt;</div><div class='add'>+#include &lt;linux/gpio.h&gt;</div><div class='ctx'> #include &lt;asm/mach-bcm47xx/bcm47xx.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* GPIO definitions for the WGT634U */</div><div class='hunk'>@@ -99,6 +102,30 @@ static struct platform_device *wgt634u_devices[] __initdata = {</div><div class='ctx'> 	&amp;wgt634u_gpio_leds,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static irqreturn_t gpio_interrupt(int irq, void *ignored)</div><div class='add'>+{</div><div class='add'>+	int state;</div><div class='add'>+</div><div class='add'>+	/* Interrupts are shared, check if the current one is</div><div class='add'>+	   a GPIO interrupt. */</div><div class='add'>+	if (!ssb_chipco_irq_status(&amp;ssb_bcm47xx.chipco,</div><div class='add'>+				   SSB_CHIPCO_IRQ_GPIO))</div><div class='add'>+		return IRQ_NONE;</div><div class='add'>+</div><div class='add'>+	state = gpio_get_value(WGT634U_GPIO_RESET);</div><div class='add'>+</div><div class='add'>+	/* Interrupt are level triggered, revert the interrupt polarity</div><div class='add'>+	   to clear the interrupt. */</div><div class='add'>+	gpio_polarity(WGT634U_GPIO_RESET, state);</div><div class='add'>+</div><div class='add'>+	if (!state) {</div><div class='add'>+		printk(KERN_INFO "Reset button pressed");</div><div class='add'>+		ctrl_alt_del();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int __init wgt634u_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* There is no easy way to detect that we are running on a WGT634U</div><div class='hunk'>@@ -112,6 +139,19 @@ static int __init wgt634u_init(void)</div><div class='ctx'> 	    ((et0mac[1] == 0x09 &amp;&amp; et0mac[2] == 0x5b) ||</div><div class='ctx'> 	     (et0mac[1] == 0x0f &amp;&amp; et0mac[2] == 0xb5))) {</div><div class='ctx'> 		struct ssb_mipscore *mcore = &amp;ssb_bcm47xx.mipscore;</div><div class='add'>+</div><div class='add'>+		printk(KERN_INFO "WGT634U machine detected.\n");</div><div class='add'>+</div><div class='add'>+		if (!request_irq(gpio_to_irq(WGT634U_GPIO_RESET),</div><div class='add'>+				 gpio_interrupt, IRQF_SHARED,</div><div class='add'>+				 "WGT634U GPIO", &amp;ssb_bcm47xx.chipco)) {</div><div class='add'>+			gpio_direction_input(WGT634U_GPIO_RESET);</div><div class='add'>+			gpio_intmask(WGT634U_GPIO_RESET, 1);</div><div class='add'>+			ssb_chipco_irq_mask(&amp;ssb_bcm47xx.chipco,</div><div class='add'>+					    SSB_CHIPCO_IRQ_GPIO,</div><div class='add'>+					    SSB_CHIPCO_IRQ_GPIO);</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		wgt634u_flash_data.width = mcore-&gt;flash_buswidth;</div><div class='ctx'> 		wgt634u_flash_resource.start = mcore-&gt;flash_window;</div><div class='ctx'> 		wgt634u_flash_resource.end = mcore-&gt;flash_window</div><div class='head'>diff --git a/arch/mips/emma2rh/common/irq.c b/arch/mips/emma2rh/common/irq.c<br/>index d95604773667..91cbd959ab67 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/emma2rh/common/irq.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/emma2rh/common/irq.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/emma2rh/common/irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/emma2rh/common/irq.c</a></div><div class='hunk'>@@ -29,7 +29,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/mipsregs.h&gt;</div><div class='del'>-#include &lt;asm/debug.h&gt;</div><div class='ctx'> #include &lt;asm/addrspace.h&gt;</div><div class='ctx'> #include &lt;asm/bootinfo.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/emma2rh/common/prom.c b/arch/mips/emma2rh/common/prom.c<br/>index 5e92b3a9c5b8..e14a2e3d8842 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/emma2rh/common/prom.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/emma2rh/common/prom.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/emma2rh/common/prom.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/emma2rh/common/prom.c</a></div><div class='hunk'>@@ -30,7 +30,6 @@</div><div class='ctx'> #include &lt;asm/addrspace.h&gt;</div><div class='ctx'> #include &lt;asm/bootinfo.h&gt;</div><div class='ctx'> #include &lt;asm/emma2rh/emma2rh.h&gt;</div><div class='del'>-#include &lt;asm/debug.h&gt;</div><div class='ctx'> </div><div class='ctx'> const char *get_system_type(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/mips/emma2rh/markeins/platform.c b/arch/mips/emma2rh/markeins/platform.c<br/>index d70627de7cfe..fb9cda253ab0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/emma2rh/markeins/platform.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/emma2rh/markeins/platform.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/emma2rh/markeins/platform.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/emma2rh/markeins/platform.c</a></div><div class='hunk'>@@ -35,7 +35,6 @@</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/reboot.h&gt;</div><div class='ctx'> #include &lt;asm/traps.h&gt;</div><div class='del'>-#include &lt;asm/debug.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/emma2rh/emma2rh.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-mips/Kbuild b/arch/mips/include/asm/Kbuild<br/>index 7897f05e3165..7897f05e3165 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/Kbuild?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/Kbuild</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/Kbuild?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/Kbuild</a></div><div class='head'>diff --git a/include/asm-mips/abi.h b/arch/mips/include/asm/abi.h<br/>index 1dd74fbdc09b..1dd74fbdc09b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/abi.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/abi.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/abi.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/abi.h</a></div><div class='head'>diff --git a/include/asm-mips/addrspace.h b/arch/mips/include/asm/addrspace.h<br/>index 569f80aacbd2..569f80aacbd2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/addrspace.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/addrspace.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/addrspace.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/addrspace.h</a></div><div class='head'>diff --git a/include/asm-mips/asm.h b/arch/mips/include/asm/asm.h<br/>index 608cfcfbb3ea..608cfcfbb3ea 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/asm.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/asm.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/asm.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/asm.h</a></div><div class='head'>diff --git a/include/asm-mips/asmmacro-32.h b/arch/mips/include/asm/asmmacro-32.h<br/>index 5de3963f511e..5de3963f511e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/asmmacro-32.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/asmmacro-32.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/asmmacro-32.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/asmmacro-32.h</a></div><div class='head'>diff --git a/include/asm-mips/asmmacro-64.h b/arch/mips/include/asm/asmmacro-64.h<br/>index 225feefcb25d..225feefcb25d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/asmmacro-64.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/asmmacro-64.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/asmmacro-64.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/asmmacro-64.h</a></div><div class='head'>diff --git a/include/asm-mips/asmmacro.h b/arch/mips/include/asm/asmmacro.h<br/>index 7a881755800f..7a881755800f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/asmmacro.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/asmmacro.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/asmmacro.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/asmmacro.h</a></div><div class='head'>diff --git a/include/asm-mips/atomic.h b/arch/mips/include/asm/atomic.h<br/>index 1232be3885b0..1232be3885b0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/atomic.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/atomic.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/atomic.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/atomic.h</a></div><div class='head'>diff --git a/include/asm-mips/auxvec.h b/arch/mips/include/asm/auxvec.h<br/>index 7cf7f2d21943..7cf7f2d21943 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/auxvec.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/auxvec.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/auxvec.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/auxvec.h</a></div><div class='head'>diff --git a/include/asm-mips/barrier.h b/arch/mips/include/asm/barrier.h<br/>index 8e9ac313ca3b..8e9ac313ca3b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/barrier.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/barrier.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/barrier.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/barrier.h</a></div><div class='head'>diff --git a/include/asm-mips/bcache.h b/arch/mips/include/asm/bcache.h<br/>index 0ba9d6ef76a7..0ba9d6ef76a7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/bcache.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/bcache.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/bcache.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/bcache.h</a></div><div class='head'>diff --git a/include/asm-mips/bitops.h b/arch/mips/include/asm/bitops.h<br/>index 49df8c4c9d25..49df8c4c9d25 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/bitops.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/bitops.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/bitops.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/bitops.h</a></div><div class='head'>diff --git a/include/asm-mips/bootinfo.h b/arch/mips/include/asm/bootinfo.h<br/>index 610fe3af7a03..610fe3af7a03 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/bootinfo.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/bootinfo.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/bootinfo.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/bootinfo.h</a></div><div class='head'>diff --git a/include/asm-mips/branch.h b/arch/mips/include/asm/branch.h<br/>index 37c6857c8d4a..37c6857c8d4a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/branch.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/branch.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/branch.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/branch.h</a></div><div class='head'>diff --git a/include/asm-mips/break.h b/arch/mips/include/asm/break.h<br/>index 25b980c91e7e..25b980c91e7e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/break.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/break.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/break.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/break.h</a></div><div class='head'>diff --git a/include/asm-mips/bug.h b/arch/mips/include/asm/bug.h<br/>index 7eb63de808bc..7eb63de808bc 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/bug.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/bug.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/bug.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/bug.h</a></div><div class='head'>diff --git a/include/asm-mips/bugs.h b/arch/mips/include/asm/bugs.h<br/>index 9dc10df32078..9dc10df32078 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/bugs.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/bugs.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/bugs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/bugs.h</a></div><div class='head'>diff --git a/include/asm-mips/byteorder.h b/arch/mips/include/asm/byteorder.h<br/>index fe7dc2d59b69..fe7dc2d59b69 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/byteorder.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/byteorder.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/byteorder.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/byteorder.h</a></div><div class='head'>diff --git a/include/asm-mips/cache.h b/arch/mips/include/asm/cache.h<br/>index 37f175c42bb5..37f175c42bb5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/cache.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/cache.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/cache.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/cache.h</a></div><div class='head'>diff --git a/include/asm-mips/cachectl.h b/arch/mips/include/asm/cachectl.h<br/>index f3ce721861d3..f3ce721861d3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/cachectl.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/cachectl.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/cachectl.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/cachectl.h</a></div><div class='head'>diff --git a/include/asm-mips/cacheflush.h b/arch/mips/include/asm/cacheflush.h<br/>index 03b1d69b142f..03b1d69b142f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/cacheflush.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/cacheflush.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/cacheflush.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/cacheflush.h</a></div><div class='head'>diff --git a/include/asm-mips/cacheops.h b/arch/mips/include/asm/cacheops.h<br/>index 256ad2cc6eb8..256ad2cc6eb8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/cacheops.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/cacheops.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/cacheops.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/cacheops.h</a></div><div class='head'>diff --git a/include/asm-mips/cevt-r4k.h b/arch/mips/include/asm/cevt-r4k.h<br/>index fa4328f9124f..fa4328f9124f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/cevt-r4k.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/cevt-r4k.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/cevt-r4k.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/cevt-r4k.h</a></div><div class='head'>diff --git a/include/asm-mips/checksum.h b/arch/mips/include/asm/checksum.h<br/>index 290485ac5407..290485ac5407 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/checksum.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/checksum.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/checksum.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/checksum.h</a></div><div class='head'>diff --git a/include/asm-mips/cmp.h b/arch/mips/include/asm/cmp.h<br/>index 89a73fb93ae6..89a73fb93ae6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/cmp.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/cmp.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/cmp.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/cmp.h</a></div><div class='head'>diff --git a/include/asm-mips/cmpxchg.h b/arch/mips/include/asm/cmpxchg.h<br/>index 4a812c3ceb90..4a812c3ceb90 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/cmpxchg.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/cmpxchg.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/cmpxchg.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/cmpxchg.h</a></div><div class='head'>diff --git a/include/asm-mips/compat-signal.h b/arch/mips/include/asm/compat-signal.h<br/>index 368a99e5c3e1..368a99e5c3e1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/compat-signal.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/compat-signal.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/compat-signal.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/compat-signal.h</a></div><div class='head'>diff --git a/include/asm-mips/compat.h b/arch/mips/include/asm/compat.h<br/>index ac5d541368e9..ac5d541368e9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/compat.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/compat.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/compat.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/compat.h</a></div><div class='head'>diff --git a/include/asm-mips/compiler.h b/arch/mips/include/asm/compiler.h<br/>index 71f5c5cfc58a..71f5c5cfc58a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/compiler.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/compiler.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/compiler.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/compiler.h</a></div><div class='head'>diff --git a/include/asm-mips/cpu-features.h b/arch/mips/include/asm/cpu-features.h<br/>index 5ea701fc3425..5ea701fc3425 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/cpu-features.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/cpu-features.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/cpu-features.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/cpu-features.h</a></div><div class='head'>diff --git a/include/asm-mips/cpu-info.h b/arch/mips/include/asm/cpu-info.h<br/>index 2de73dbb2e9e..744cd8fb107f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/cpu-info.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/cpu-info.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/cpu-info.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/cpu-info.h</a></div><div class='hunk'>@@ -12,6 +12,8 @@</div><div class='ctx'> #ifndef __ASM_CPU_INFO_H</div><div class='ctx'> #define __ASM_CPU_INFO_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/cache.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -69,6 +71,10 @@ struct cpuinfo_mips {</div><div class='ctx'> 	int			tc_id;   /* Thread Context number */</div><div class='ctx'> #endif</div><div class='ctx'> 	void 			*data;	/* Additional data */</div><div class='add'>+	unsigned int		watch_reg_count;   /* Number that exist */</div><div class='add'>+	unsigned int		watch_reg_use_cnt; /* Usable by ptrace */</div><div class='add'>+#define NUM_WATCH_REGS 4</div><div class='add'>+	u16			watch_reg_masks[NUM_WATCH_REGS];</div><div class='ctx'> } __attribute__((aligned(SMP_CACHE_BYTES)));</div><div class='ctx'> </div><div class='ctx'> extern struct cpuinfo_mips cpu_data[];</div><div class='head'>diff --git a/include/asm-mips/cpu.h b/arch/mips/include/asm/cpu.h<br/>index 229a786101d9..229a786101d9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/cpu.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/cpu.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/cpu.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/cpu.h</a></div><div class='head'>diff --git a/include/asm-mips/cputime.h b/arch/mips/include/asm/cputime.h<br/>index c00eacbdd979..c00eacbdd979 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/cputime.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/cputime.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/cputime.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/cputime.h</a></div><div class='head'>diff --git a/include/asm-mips/current.h b/arch/mips/include/asm/current.h<br/>index 559db66b9790..559db66b9790 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/current.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/current.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/current.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/current.h</a></div><div class='head'>diff --git a/include/asm-mips/debug.h b/arch/mips/include/asm/debug.h<br/>index 1fd5a2b39445..1fd5a2b39445 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/debug.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/debug.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/debug.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/debug.h</a></div><div class='head'>diff --git a/include/asm-mips/dec/ecc.h b/arch/mips/include/asm/dec/ecc.h<br/>index 707ffdbc9add..707ffdbc9add 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/dec/ecc.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/dec/ecc.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/dec/ecc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/dec/ecc.h</a></div><div class='head'>diff --git a/include/asm-mips/dec/interrupts.h b/arch/mips/include/asm/dec/interrupts.h<br/>index e10d341067c8..e10d341067c8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/dec/interrupts.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/dec/interrupts.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/dec/interrupts.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/dec/interrupts.h</a></div><div class='head'>diff --git a/include/asm-mips/dec/ioasic.h b/arch/mips/include/asm/dec/ioasic.h<br/>index 98badd6bf22d..98badd6bf22d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/dec/ioasic.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/dec/ioasic.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/dec/ioasic.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/dec/ioasic.h</a></div><div class='head'>diff --git a/include/asm-mips/dec/ioasic_addrs.h b/arch/mips/include/asm/dec/ioasic_addrs.h<br/>index 4cbc1f8a1129..4cbc1f8a1129 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/dec/ioasic_addrs.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/dec/ioasic_addrs.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/dec/ioasic_addrs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/dec/ioasic_addrs.h</a></div><div class='head'>diff --git a/include/asm-mips/dec/ioasic_ints.h b/arch/mips/include/asm/dec/ioasic_ints.h<br/>index 9aaa9869615f..9aaa9869615f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/dec/ioasic_ints.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/dec/ioasic_ints.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/dec/ioasic_ints.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/dec/ioasic_ints.h</a></div><div class='head'>diff --git a/include/asm-mips/dec/kn01.h b/arch/mips/include/asm/dec/kn01.h<br/>index 28fa717ac423..28fa717ac423 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/dec/kn01.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/dec/kn01.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/dec/kn01.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/dec/kn01.h</a></div><div class='head'>diff --git a/include/asm-mips/dec/kn02.h b/arch/mips/include/asm/dec/kn02.h<br/>index 93430b5f4724..93430b5f4724 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/dec/kn02.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/dec/kn02.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/dec/kn02.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/dec/kn02.h</a></div><div class='head'>diff --git a/include/asm-mips/dec/kn02ba.h b/arch/mips/include/asm/dec/kn02ba.h<br/>index c957a4f1b32d..c957a4f1b32d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/dec/kn02ba.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/dec/kn02ba.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/dec/kn02ba.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/dec/kn02ba.h</a></div><div class='head'>diff --git a/include/asm-mips/dec/kn02ca.h b/arch/mips/include/asm/dec/kn02ca.h<br/>index 92c0fe256099..92c0fe256099 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/dec/kn02ca.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/dec/kn02ca.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/dec/kn02ca.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/dec/kn02ca.h</a></div><div class='head'>diff --git a/include/asm-mips/dec/kn02xa.h b/arch/mips/include/asm/dec/kn02xa.h<br/>index b56b4577f6ef..b56b4577f6ef 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/dec/kn02xa.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/dec/kn02xa.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/dec/kn02xa.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/dec/kn02xa.h</a></div><div class='head'>diff --git a/include/asm-mips/dec/kn03.h b/arch/mips/include/asm/dec/kn03.h<br/>index edede923ffb8..edede923ffb8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/dec/kn03.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/dec/kn03.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/dec/kn03.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/dec/kn03.h</a></div><div class='head'>diff --git a/include/asm-mips/dec/kn05.h b/arch/mips/include/asm/dec/kn05.h<br/>index 56d22dc8803a..56d22dc8803a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/dec/kn05.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/dec/kn05.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/dec/kn05.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/dec/kn05.h</a></div><div class='head'>diff --git a/include/asm-mips/dec/kn230.h b/arch/mips/include/asm/dec/kn230.h<br/>index ff1bf17de8d8..ff1bf17de8d8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/dec/kn230.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/dec/kn230.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/dec/kn230.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/dec/kn230.h</a></div><div class='head'>diff --git a/include/asm-mips/dec/machtype.h b/arch/mips/include/asm/dec/machtype.h<br/>index a6ecdebc430a..a6ecdebc430a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/dec/machtype.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/dec/machtype.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/dec/machtype.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/dec/machtype.h</a></div><div class='head'>diff --git a/include/asm-mips/dec/prom.h b/arch/mips/include/asm/dec/prom.h<br/>index b9c8203688d5..b9c8203688d5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/dec/prom.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/dec/prom.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/dec/prom.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/dec/prom.h</a></div><div class='head'>diff --git a/include/asm-mips/dec/system.h b/arch/mips/include/asm/dec/system.h<br/>index b2afaccd6831..b2afaccd6831 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/dec/system.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/dec/system.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/dec/system.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/dec/system.h</a></div><div class='head'>diff --git a/include/asm-mips/delay.h b/arch/mips/include/asm/delay.h<br/>index b0bccd2c4ed5..b0bccd2c4ed5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/delay.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/delay.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/delay.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/delay.h</a></div><div class='head'>diff --git a/include/asm-mips/device.h b/arch/mips/include/asm/device.h<br/>index d8f9872b0e2d..d8f9872b0e2d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/device.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/device.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/device.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/device.h</a></div><div class='head'>diff --git a/include/asm-mips/div64.h b/arch/mips/include/asm/div64.h<br/>index d1d699105c11..d1d699105c11 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/div64.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/div64.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/div64.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/div64.h</a></div><div class='head'>diff --git a/include/asm-mips/dma-mapping.h b/arch/mips/include/asm/dma-mapping.h<br/>index c64afb40cd06..c64afb40cd06 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/dma-mapping.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/dma-mapping.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/dma-mapping.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/dma-mapping.h</a></div><div class='head'>diff --git a/include/asm-mips/dma.h b/arch/mips/include/asm/dma.h<br/>index 1353c81065d1..1353c81065d1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/dma.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/dma.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/dma.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/dma.h</a></div><div class='head'>diff --git a/include/asm-mips/ds1286.h b/arch/mips/include/asm/ds1286.h<br/>index 6983b6ff0af3..6983b6ff0af3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/ds1286.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/ds1286.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/ds1286.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/ds1286.h</a></div><div class='head'>diff --git a/include/asm-mips/ds1287.h b/arch/mips/include/asm/ds1287.h<br/>index ba1702e86931..ba1702e86931 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/ds1287.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/ds1287.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/ds1287.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/ds1287.h</a></div><div class='head'>diff --git a/include/asm-mips/dsp.h b/arch/mips/include/asm/dsp.h<br/>index e9bfc0813c72..e9bfc0813c72 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/dsp.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/dsp.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/dsp.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/dsp.h</a></div><div class='head'>diff --git a/include/asm-mips/edac.h b/arch/mips/include/asm/edac.h<br/>index 4da0c1fe30d9..4da0c1fe30d9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/edac.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/edac.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/edac.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/edac.h</a></div><div class='head'>diff --git a/include/asm-mips/elf.h b/arch/mips/include/asm/elf.h<br/>index f69f7acba637..a8eac1697b3d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/elf.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/elf.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/elf.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/elf.h</a></div><div class='hunk'>@@ -247,10 +247,8 @@ extern struct mips_abi mips_abi_n32;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_32BIT</div><div class='ctx'> </div><div class='del'>-#define SET_PERSONALITY(ex, ibcs2)					\</div><div class='add'>+#define SET_PERSONALITY(ex)						\</div><div class='ctx'> do {									\</div><div class='del'>-	if (ibcs2)							\</div><div class='del'>-		set_personality(PER_SVR4);				\</div><div class='ctx'> 	set_personality(PER_LINUX);					\</div><div class='ctx'> 									\</div><div class='ctx'> 	current-&gt;thread.abi = &amp;mips_abi;				\</div><div class='hunk'>@@ -296,7 +294,7 @@ do {									\</div><div class='ctx'> #define __SET_PERSONALITY32(ex)	do { } while (0)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#define SET_PERSONALITY(ex, ibcs2)					\</div><div class='add'>+#define SET_PERSONALITY(ex)						\</div><div class='ctx'> do {									\</div><div class='ctx'> 	clear_thread_flag(TIF_32BIT_REGS);				\</div><div class='ctx'> 	clear_thread_flag(TIF_32BIT_ADDR);				\</div><div class='hunk'>@@ -306,9 +304,7 @@ do {									\</div><div class='ctx'> 	else								\</div><div class='ctx'> 		current-&gt;thread.abi = &amp;mips_abi;			\</div><div class='ctx'> 									\</div><div class='del'>-	if (ibcs2)							\</div><div class='del'>-		set_personality(PER_SVR4);				\</div><div class='del'>-	else if (current-&gt;personality != PER_LINUX32)			\</div><div class='add'>+	if (current-&gt;personality != PER_LINUX32)			\</div><div class='ctx'> 		set_personality(PER_LINUX);				\</div><div class='ctx'> } while (0)</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-mips/emergency-restart.h b/arch/mips/include/asm/emergency-restart.h<br/>index 108d8c48e42e..108d8c48e42e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/emergency-restart.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/emergency-restart.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/emergency-restart.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/emergency-restart.h</a></div><div class='head'>diff --git a/include/asm-mips/emma2rh/emma2rh.h b/arch/mips/include/asm/emma2rh/emma2rh.h<br/>index 6a1af0af51e3..6a1af0af51e3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/emma2rh/emma2rh.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/emma2rh/emma2rh.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/emma2rh/emma2rh.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/emma2rh/emma2rh.h</a></div><div class='head'>diff --git a/include/asm-mips/emma2rh/markeins.h b/arch/mips/include/asm/emma2rh/markeins.h<br/>index 973b0628490d..973b0628490d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/emma2rh/markeins.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/emma2rh/markeins.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/emma2rh/markeins.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/emma2rh/markeins.h</a></div><div class='head'>diff --git a/include/asm-mips/errno.h b/arch/mips/include/asm/errno.h<br/>index 3c0d840e4577..3c0d840e4577 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/errno.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/errno.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/errno.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/errno.h</a></div><div class='head'>diff --git a/include/asm-mips/fb.h b/arch/mips/include/asm/fb.h<br/>index bd3f68c9ddfc..bd3f68c9ddfc 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/fb.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/fb.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/fb.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/fb.h</a></div><div class='head'>diff --git a/include/asm-mips/fcntl.h b/arch/mips/include/asm/fcntl.h<br/>index 2a52333a062d..2a52333a062d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/fcntl.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/fcntl.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/fcntl.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/fcntl.h</a></div><div class='head'>diff --git a/include/asm-mips/fixmap.h b/arch/mips/include/asm/fixmap.h<br/>index 9cc8522a394f..9cc8522a394f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/fixmap.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/fixmap.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/fixmap.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/fixmap.h</a></div><div class='head'>diff --git a/include/asm-mips/floppy.h b/arch/mips/include/asm/floppy.h<br/>index 992d232adc83..992d232adc83 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/floppy.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/floppy.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/floppy.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/floppy.h</a></div><div class='head'>diff --git a/include/asm-mips/fpregdef.h b/arch/mips/include/asm/fpregdef.h<br/>index 2b5fddc8f487..2b5fddc8f487 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/fpregdef.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/fpregdef.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/fpregdef.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/fpregdef.h</a></div><div class='head'>diff --git a/include/asm-mips/fpu.h b/arch/mips/include/asm/fpu.h<br/>index 8a3ef247659a..8a3ef247659a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/fpu.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/fpu.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/fpu.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/fpu.h</a></div><div class='head'>diff --git a/include/asm-mips/fpu_emulator.h b/arch/mips/include/asm/fpu_emulator.h<br/>index 2731c38bd7ae..2731c38bd7ae 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/fpu_emulator.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/fpu_emulator.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/fpu_emulator.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/fpu_emulator.h</a></div><div class='head'>diff --git a/include/asm-mips/futex.h b/arch/mips/include/asm/futex.h<br/>index b9cce90346cf..b9cce90346cf 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/futex.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/futex.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/futex.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/futex.h</a></div><div class='head'>diff --git a/include/asm-mips/fw/arc/hinv.h b/arch/mips/include/asm/fw/arc/hinv.h<br/>index e6ff4add04e2..e6ff4add04e2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/fw/arc/hinv.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/fw/arc/hinv.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/fw/arc/hinv.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/fw/arc/hinv.h</a></div><div class='head'>diff --git a/include/asm-mips/fw/arc/types.h b/arch/mips/include/asm/fw/arc/types.h<br/>index b9adcd6f0860..b9adcd6f0860 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/fw/arc/types.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/fw/arc/types.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/fw/arc/types.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/fw/arc/types.h</a></div><div class='head'>diff --git a/include/asm-mips/fw/cfe/cfe_api.h b/arch/mips/include/asm/fw/cfe/cfe_api.h<br/>index 0995575db320..0995575db320 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/fw/cfe/cfe_api.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/fw/cfe/cfe_api.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/fw/cfe/cfe_api.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/fw/cfe/cfe_api.h</a></div><div class='head'>diff --git a/include/asm-mips/fw/cfe/cfe_error.h b/arch/mips/include/asm/fw/cfe/cfe_error.h<br/>index b80374636279..b80374636279 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/fw/cfe/cfe_error.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/fw/cfe/cfe_error.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/fw/cfe/cfe_error.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/fw/cfe/cfe_error.h</a></div><div class='head'>diff --git a/include/asm-mips/gcmpregs.h b/arch/mips/include/asm/gcmpregs.h<br/>index d74a8a4ca861..d74a8a4ca861 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/gcmpregs.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/gcmpregs.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/gcmpregs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/gcmpregs.h</a></div><div class='head'>diff --git a/include/asm-mips/gic.h b/arch/mips/include/asm/gic.h<br/>index 954807d9d66a..954807d9d66a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/gic.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/gic.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/gic.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/gic.h</a></div><div class='head'>diff --git a/include/asm-mips/gpio.h b/arch/mips/include/asm/gpio.h<br/>index 06e46faf862d..06e46faf862d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/gpio.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/gpio.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/gpio.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/gpio.h</a></div><div class='head'>diff --git a/include/asm-mips/gt64120.h b/arch/mips/include/asm/gt64120.h<br/>index e64b41093c49..e64b41093c49 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/gt64120.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/gt64120.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/gt64120.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/gt64120.h</a></div><div class='head'>diff --git a/include/asm-mips/hardirq.h b/arch/mips/include/asm/hardirq.h<br/>index 90bf399e6dd9..90bf399e6dd9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/hardirq.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/hardirq.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/hardirq.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/hardirq.h</a></div><div class='head'>diff --git a/include/asm-mips/hazards.h b/arch/mips/include/asm/hazards.h<br/>index 2de638f84c86..2de638f84c86 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/hazards.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/hazards.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/hazards.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/hazards.h</a></div><div class='head'>diff --git a/include/asm-mips/highmem.h b/arch/mips/include/asm/highmem.h<br/>index 4374ab2adc75..4374ab2adc75 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/highmem.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/highmem.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/highmem.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/highmem.h</a></div><div class='head'>diff --git a/include/asm-mips/hw_irq.h b/arch/mips/include/asm/hw_irq.h<br/>index aca05a43a97b..aca05a43a97b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/hw_irq.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/hw_irq.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/hw_irq.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/hw_irq.h</a></div><div class='head'>diff --git a/include/asm-mips/i8253.h b/arch/mips/include/asm/i8253.h<br/>index 5dabc870b322..5dabc870b322 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/i8253.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/i8253.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/i8253.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/i8253.h</a></div><div class='head'>diff --git a/include/asm-mips/i8259.h b/arch/mips/include/asm/i8259.h<br/>index 8572a2d90484..8572a2d90484 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/i8259.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/i8259.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/i8259.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/i8259.h</a></div><div class='head'>diff --git a/include/asm-mips/ide.h b/arch/mips/include/asm/ide.h<br/>index bb674c3b0303..bb674c3b0303 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/ide.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/ide.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/ide.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/ide.h</a></div><div class='head'>diff --git a/include/asm-mips/inst.h b/arch/mips/include/asm/inst.h<br/>index 6489f00731ca..6489f00731ca 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/inst.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/inst.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/inst.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/inst.h</a></div><div class='head'>diff --git a/include/asm-mips/io.h b/arch/mips/include/asm/io.h<br/>index 501a40b9f18d..501a40b9f18d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/io.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/io.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/io.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/io.h</a></div><div class='head'>diff --git a/include/asm-mips/ioctl.h b/arch/mips/include/asm/ioctl.h<br/>index 85067e248a83..85067e248a83 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/ioctl.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/ioctl.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/ioctl.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/ioctl.h</a></div><div class='head'>diff --git a/include/asm-mips/ioctls.h b/arch/mips/include/asm/ioctls.h<br/>index 3f04a995ec54..3f04a995ec54 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/ioctls.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/ioctls.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/ioctls.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/ioctls.h</a></div><div class='head'>diff --git a/include/asm-mips/ip32/crime.h b/arch/mips/include/asm/ip32/crime.h<br/>index 7c36b0e5b1c6..7c36b0e5b1c6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/ip32/crime.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/ip32/crime.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/ip32/crime.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/ip32/crime.h</a></div><div class='head'>diff --git a/include/asm-mips/ip32/ip32_ints.h b/arch/mips/include/asm/ip32/ip32_ints.h<br/>index 85bc5302bce0..85bc5302bce0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/ip32/ip32_ints.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/ip32/ip32_ints.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/ip32/ip32_ints.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/ip32/ip32_ints.h</a></div><div class='head'>diff --git a/include/asm-mips/ip32/mace.h b/arch/mips/include/asm/ip32/mace.h<br/>index d08d7c672139..d08d7c672139 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/ip32/mace.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/ip32/mace.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/ip32/mace.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/ip32/mace.h</a></div><div class='head'>diff --git a/include/asm-mips/ipcbuf.h b/arch/mips/include/asm/ipcbuf.h<br/>index d47d08f264e7..d47d08f264e7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/ipcbuf.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/ipcbuf.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/ipcbuf.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/ipcbuf.h</a></div><div class='head'>diff --git a/include/asm-mips/irq.h b/arch/mips/include/asm/irq.h<br/>index a58f0eecc68f..a58f0eecc68f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/irq.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/irq.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/irq.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/irq.h</a></div><div class='head'>diff --git a/include/asm-mips/irq_cpu.h b/arch/mips/include/asm/irq_cpu.h<br/>index ef6a07cddb23..ef6a07cddb23 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/irq_cpu.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/irq_cpu.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/irq_cpu.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/irq_cpu.h</a></div><div class='head'>diff --git a/include/asm-mips/irq_gt641xx.h b/arch/mips/include/asm/irq_gt641xx.h<br/>index f9a7c3ac2e66..f9a7c3ac2e66 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/irq_gt641xx.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/irq_gt641xx.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/irq_gt641xx.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/irq_gt641xx.h</a></div><div class='head'>diff --git a/include/asm-mips/irq_regs.h b/arch/mips/include/asm/irq_regs.h<br/>index 33bd2a06de57..33bd2a06de57 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/irq_regs.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/irq_regs.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/irq_regs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/irq_regs.h</a></div><div class='head'>diff --git a/include/asm-mips/irqflags.h b/arch/mips/include/asm/irqflags.h<br/>index 701ec0ba8fa9..701ec0ba8fa9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/irqflags.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/irqflags.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/irqflags.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/irqflags.h</a></div><div class='head'>diff --git a/include/asm-mips/isadep.h b/arch/mips/include/asm/isadep.h<br/>index 24c6cda79377..24c6cda79377 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/isadep.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/isadep.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/isadep.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/isadep.h</a></div><div class='head'>diff --git a/include/asm-mips/jazz.h b/arch/mips/include/asm/jazz.h<br/>index 83f449dec95e..83f449dec95e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/jazz.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/jazz.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/jazz.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/jazz.h</a></div><div class='head'>diff --git a/include/asm-mips/jazzdma.h b/arch/mips/include/asm/jazzdma.h<br/>index 8bb37bba68f0..8bb37bba68f0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/jazzdma.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/jazzdma.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/jazzdma.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/jazzdma.h</a></div><div class='head'>diff --git a/include/asm-mips/kdebug.h b/arch/mips/include/asm/kdebug.h<br/>index 5bf62aafc890..5bf62aafc890 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/kdebug.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/kdebug.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/kdebug.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/kdebug.h</a></div><div class='head'>diff --git a/include/asm-mips/kexec.h b/arch/mips/include/asm/kexec.h<br/>index 4314892aaebb..4314892aaebb 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/kexec.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/kexec.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/kexec.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/kexec.h</a></div><div class='head'>diff --git a/include/asm-mips/kgdb.h b/arch/mips/include/asm/kgdb.h<br/>index 48223b09396c..48223b09396c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/kgdb.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/kgdb.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/kgdb.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/kgdb.h</a></div><div class='head'>diff --git a/include/asm-mips/kmap_types.h b/arch/mips/include/asm/kmap_types.h<br/>index 806aae3c5338..806aae3c5338 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/kmap_types.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/kmap_types.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/kmap_types.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/kmap_types.h</a></div><div class='head'>diff --git a/include/asm-mips/kspd.h b/arch/mips/include/asm/kspd.h<br/>index 4e9e724c8935..4e9e724c8935 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/kspd.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/kspd.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/kspd.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/kspd.h</a></div><div class='head'>diff --git a/include/asm-mips/lasat/ds1603.h b/arch/mips/include/asm/lasat/ds1603.h<br/>index edcd7544b358..edcd7544b358 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/lasat/ds1603.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/lasat/ds1603.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/lasat/ds1603.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/lasat/ds1603.h</a></div><div class='head'>diff --git a/include/asm-mips/lasat/eeprom.h b/arch/mips/include/asm/lasat/eeprom.h<br/>index 3dac203697fa..3dac203697fa 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/lasat/eeprom.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/lasat/eeprom.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/lasat/eeprom.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/lasat/eeprom.h</a></div><div class='head'>diff --git a/include/asm-mips/lasat/head.h b/arch/mips/include/asm/lasat/head.h<br/>index f5589f31a197..f5589f31a197 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/lasat/head.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/lasat/head.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/lasat/head.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/lasat/head.h</a></div><div class='head'>diff --git a/include/asm-mips/lasat/lasat.h b/arch/mips/include/asm/lasat/lasat.h<br/>index caeba1e302a2..caeba1e302a2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/lasat/lasat.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/lasat/lasat.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/lasat/lasat.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/lasat/lasat.h</a></div><div class='head'>diff --git a/include/asm-mips/lasat/lasatint.h b/arch/mips/include/asm/lasat/lasatint.h<br/>index e0d2458b43d0..e0d2458b43d0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/lasat/lasatint.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/lasat/lasatint.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/lasat/lasatint.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/lasat/lasatint.h</a></div><div class='head'>diff --git a/include/asm-mips/lasat/picvue.h b/arch/mips/include/asm/lasat/picvue.h<br/>index 42a492edc40e..42a492edc40e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/lasat/picvue.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/lasat/picvue.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/lasat/picvue.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/lasat/picvue.h</a></div><div class='head'>diff --git a/include/asm-mips/lasat/serial.h b/arch/mips/include/asm/lasat/serial.h<br/>index 1c37d70579b8..1c37d70579b8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/lasat/serial.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/lasat/serial.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/lasat/serial.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/lasat/serial.h</a></div><div class='head'>diff --git a/include/asm-mips/linkage.h b/arch/mips/include/asm/linkage.h<br/>index e9a940d1b0c6..e9a940d1b0c6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/linkage.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/linkage.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/linkage.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/linkage.h</a></div><div class='head'>diff --git a/include/asm-mips/local.h b/arch/mips/include/asm/local.h<br/>index f96fd59e0845..f96fd59e0845 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/local.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/local.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/local.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/local.h</a></div><div class='head'>diff --git a/include/asm-mips/m48t35.h b/arch/mips/include/asm/m48t35.h<br/>index f44852e9a96d..f44852e9a96d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/m48t35.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/m48t35.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/m48t35.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/m48t35.h</a></div><div class='head'>diff --git a/include/asm-mips/m48t37.h b/arch/mips/include/asm/m48t37.h<br/>index cabf86264f36..cabf86264f36 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/m48t37.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/m48t37.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/m48t37.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/m48t37.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-au1x00/au1000.h b/arch/mips/include/asm/mach-au1x00/au1000.h<br/>index 0d302bad4492..0d302bad4492 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-au1x00/au1000.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-au1x00/au1000.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-au1x00/au1000.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-au1x00/au1000.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-au1x00/au1000_dma.h b/arch/mips/include/asm/mach-au1x00/au1000_dma.h<br/>index c333b4e1cd44..c333b4e1cd44 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-au1x00/au1000_dma.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-au1x00/au1000_dma.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-au1x00/au1000_dma.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-au1x00/au1000_dma.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-au1x00/au1000_gpio.h b/arch/mips/include/asm/mach-au1x00/au1000_gpio.h<br/>index d8c96fda5549..d8c96fda5549 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-au1x00/au1000_gpio.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-au1x00/au1000_gpio.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-au1x00/au1000_gpio.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-au1x00/au1000_gpio.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-au1x00/au1100_mmc.h b/arch/mips/include/asm/mach-au1x00/au1100_mmc.h<br/>index c35e20918490..c35e20918490 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-au1x00/au1100_mmc.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-au1x00/au1100_mmc.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-au1x00/au1100_mmc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-au1x00/au1100_mmc.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-au1x00/au1550_spi.h b/arch/mips/include/asm/mach-au1x00/au1550_spi.h<br/>index 08e1958e9410..08e1958e9410 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-au1x00/au1550_spi.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-au1x00/au1550_spi.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-au1x00/au1550_spi.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-au1x00/au1550_spi.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-au1x00/au1xxx.h b/arch/mips/include/asm/mach-au1x00/au1xxx.h<br/>index 1b3655090ed3..1b3655090ed3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-au1x00/au1xxx.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-au1x00/au1xxx.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-au1x00/au1xxx.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-au1x00/au1xxx.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-au1x00/au1xxx_dbdma.h b/arch/mips/include/asm/mach-au1x00/au1xxx_dbdma.h<br/>index 44a67bf05dc1..44a67bf05dc1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-au1x00/au1xxx_dbdma.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-au1x00/au1xxx_dbdma.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-au1x00/au1xxx_dbdma.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-au1x00/au1xxx_dbdma.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-au1x00/au1xxx_ide.h b/arch/mips/include/asm/mach-au1x00/au1xxx_ide.h<br/>index 60638b8969ba..60638b8969ba 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-au1x00/au1xxx_ide.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-au1x00/au1xxx_ide.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-au1x00/au1xxx_ide.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-au1x00/au1xxx_ide.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-au1x00/au1xxx_psc.h b/arch/mips/include/asm/mach-au1x00/au1xxx_psc.h<br/>index 892b7f168eb4..892b7f168eb4 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-au1x00/au1xxx_psc.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-au1x00/au1xxx_psc.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-au1x00/au1xxx_psc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-au1x00/au1xxx_psc.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-au1x00/gpio.h b/arch/mips/include/asm/mach-au1x00/gpio.h<br/>index 2dc61e009a08..2dc61e009a08 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-au1x00/gpio.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-au1x00/gpio.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-au1x00/gpio.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-au1x00/gpio.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-au1x00/ioremap.h b/arch/mips/include/asm/mach-au1x00/ioremap.h<br/>index 364cea2dc71f..364cea2dc71f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-au1x00/ioremap.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-au1x00/ioremap.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-au1x00/ioremap.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-au1x00/ioremap.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-au1x00/prom.h b/arch/mips/include/asm/mach-au1x00/prom.h<br/>index e38715577c51..e38715577c51 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-au1x00/prom.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-au1x00/prom.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-au1x00/prom.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-au1x00/prom.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-au1x00/war.h b/arch/mips/include/asm/mach-au1x00/war.h<br/>index dd57d03d68ba..dd57d03d68ba 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-au1x00/war.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-au1x00/war.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-au1x00/war.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-au1x00/war.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-bcm47xx/bcm47xx.h b/arch/mips/include/asm/mach-bcm47xx/bcm47xx.h<br/>index d008f47a28bd..d008f47a28bd 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-bcm47xx/bcm47xx.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-bcm47xx/bcm47xx.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-bcm47xx/bcm47xx.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-bcm47xx/bcm47xx.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-bcm47xx/gpio.h b/arch/mips/include/asm/mach-bcm47xx/gpio.h<br/>index cfc8f4d618ce..d8ff4cd89ab5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-bcm47xx/gpio.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-bcm47xx/gpio.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-bcm47xx/gpio.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-bcm47xx/gpio.h</a></div><div class='hunk'>@@ -9,47 +9,46 @@</div><div class='ctx'> #ifndef __BCM47XX_GPIO_H</div><div class='ctx'> #define __BCM47XX_GPIO_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/ssb/ssb_embedded.h&gt;</div><div class='add'>+#include &lt;asm/mach-bcm47xx/bcm47xx.h&gt;</div><div class='add'>+</div><div class='ctx'> #define BCM47XX_EXTIF_GPIO_LINES	5</div><div class='ctx'> #define BCM47XX_CHIPCO_GPIO_LINES	16</div><div class='ctx'> </div><div class='del'>-extern int bcm47xx_gpio_to_irq(unsigned gpio);</div><div class='del'>-extern int bcm47xx_gpio_get_value(unsigned gpio);</div><div class='del'>-extern void bcm47xx_gpio_set_value(unsigned gpio, int value);</div><div class='del'>-extern int bcm47xx_gpio_direction_input(unsigned gpio);</div><div class='del'>-extern int bcm47xx_gpio_direction_output(unsigned gpio, int value);</div><div class='del'>-</div><div class='del'>-static inline int gpio_request(unsigned gpio, const char *label)</div><div class='del'>-{</div><div class='del'>-       return 0;</div><div class='del'>-}</div><div class='add'>+extern int gpio_request(unsigned gpio, const char *label);</div><div class='add'>+extern void gpio_free(unsigned gpio);</div><div class='add'>+extern int gpio_to_irq(unsigned gpio);</div><div class='ctx'> </div><div class='del'>-static inline void gpio_free(unsigned gpio)</div><div class='add'>+static inline int gpio_get_value(unsigned gpio)</div><div class='ctx'> {</div><div class='add'>+	return ssb_gpio_in(&amp;ssb_bcm47xx, 1 &lt;&lt; gpio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int gpio_to_irq(unsigned gpio)</div><div class='add'>+static inline void gpio_set_value(unsigned gpio, int value)</div><div class='ctx'> {</div><div class='del'>-	return bcm47xx_gpio_to_irq(gpio);</div><div class='add'>+	ssb_gpio_out(&amp;ssb_bcm47xx, 1 &lt;&lt; gpio, value ? 1 &lt;&lt; gpio : 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int gpio_get_value(unsigned gpio)</div><div class='add'>+static inline int gpio_direction_input(unsigned gpio)</div><div class='ctx'> {</div><div class='del'>-	return bcm47xx_gpio_get_value(gpio);</div><div class='add'>+	return ssb_gpio_outen(&amp;ssb_bcm47xx, 1 &lt;&lt; gpio, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void gpio_set_value(unsigned gpio, int value)</div><div class='add'>+static inline int gpio_direction_output(unsigned gpio, int value)</div><div class='ctx'> {</div><div class='del'>-	bcm47xx_gpio_set_value(gpio, value);</div><div class='add'>+	return ssb_gpio_outen(&amp;ssb_bcm47xx, 1 &lt;&lt; gpio, 1 &lt;&lt; gpio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int gpio_direction_input(unsigned gpio)</div><div class='add'>+static int gpio_intmask(unsigned gpio, int value)</div><div class='ctx'> {</div><div class='del'>-	return bcm47xx_gpio_direction_input(gpio);</div><div class='add'>+	return ssb_gpio_intmask(&amp;ssb_bcm47xx, 1 &lt;&lt; gpio,</div><div class='add'>+				value ? 1 &lt;&lt; gpio : 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int gpio_direction_output(unsigned gpio, int value)</div><div class='add'>+static int gpio_polarity(unsigned gpio, int value)</div><div class='ctx'> {</div><div class='del'>-	return bcm47xx_gpio_direction_output(gpio, value);</div><div class='add'>+	return ssb_gpio_polarity(&amp;ssb_bcm47xx, 1 &lt;&lt; gpio,</div><div class='add'>+				 value ? 1 &lt;&lt; gpio : 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-mips/mach-bcm47xx/war.h b/arch/mips/include/asm/mach-bcm47xx/war.h<br/>index 4a2b7986b582..87cd4651dda3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-bcm47xx/war.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-bcm47xx/war.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-bcm47xx/war.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-bcm47xx/war.h</a></div><div class='hunk'>@@ -5,8 +5,8 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2002, 2004, 2007 by Ralf Baechle &lt;ralf@linux-mips.org&gt;</div><div class='ctx'>  */</div><div class='del'>-#ifndef __ASM_MIPS_MACH_BCM947XX_WAR_H</div><div class='del'>-#define __ASM_MIPS_MACH_BCM947XX_WAR_H</div><div class='add'>+#ifndef __ASM_MIPS_MACH_BCM47XX_WAR_H</div><div class='add'>+#define __ASM_MIPS_MACH_BCM47XX_WAR_H</div><div class='ctx'> </div><div class='ctx'> #define R4600_V1_INDEX_ICACHEOP_WAR	0</div><div class='ctx'> #define R4600_V1_HIT_CACHEOP_WAR	0</div><div class='hunk'>@@ -22,4 +22,4 @@</div><div class='ctx'> #define R10000_LLSC_WAR			0</div><div class='ctx'> #define MIPS34K_MISSED_ITLB_WAR		0</div><div class='ctx'> </div><div class='del'>-#endif /* __ASM_MIPS_MACH_BCM947XX_WAR_H */</div><div class='add'>+#endif /* __ASM_MIPS_MACH_BCM47XX_WAR_H */</div><div class='head'>diff --git a/include/asm-mips/mach-cobalt/cobalt.h b/arch/mips/include/asm/mach-cobalt/cobalt.h<br/>index 5b9fce73f11d..5b9fce73f11d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-cobalt/cobalt.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-cobalt/cobalt.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-cobalt/cobalt.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-cobalt/cobalt.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-cobalt/cpu-feature-overrides.h b/arch/mips/include/asm/mach-cobalt/cpu-feature-overrides.h<br/>index b3314cf53194..b3314cf53194 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-cobalt/cpu-feature-overrides.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-cobalt/cpu-feature-overrides.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-cobalt/cpu-feature-overrides.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-cobalt/cpu-feature-overrides.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-cobalt/irq.h b/arch/mips/include/asm/mach-cobalt/irq.h<br/>index 57c8c9ac5851..57c8c9ac5851 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-cobalt/irq.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-cobalt/irq.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-cobalt/irq.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-cobalt/irq.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-cobalt/mach-gt64120.h b/arch/mips/include/asm/mach-cobalt/mach-gt64120.h<br/>index ae9c5523c7ef..ae9c5523c7ef 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-cobalt/mach-gt64120.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-cobalt/mach-gt64120.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-cobalt/mach-gt64120.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-cobalt/mach-gt64120.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-cobalt/war.h b/arch/mips/include/asm/mach-cobalt/war.h<br/>index 97884fd18ac0..97884fd18ac0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-cobalt/war.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-cobalt/war.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-cobalt/war.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-cobalt/war.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-db1x00/db1200.h b/arch/mips/include/asm/mach-db1x00/db1200.h<br/>index 27f26102b1bb..27f26102b1bb 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-db1x00/db1200.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-db1x00/db1200.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-db1x00/db1200.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-db1x00/db1200.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-db1x00/db1x00.h b/arch/mips/include/asm/mach-db1x00/db1x00.h<br/>index 1a515b8c870f..1a515b8c870f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-db1x00/db1x00.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-db1x00/db1x00.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-db1x00/db1x00.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-db1x00/db1x00.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-dec/mc146818rtc.h b/arch/mips/include/asm/mach-dec/mc146818rtc.h<br/>index 6724e99e43e1..6724e99e43e1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-dec/mc146818rtc.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-dec/mc146818rtc.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-dec/mc146818rtc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-dec/mc146818rtc.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-dec/war.h b/arch/mips/include/asm/mach-dec/war.h<br/>index ca5e2ef909ad..ca5e2ef909ad 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-dec/war.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-dec/war.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-dec/war.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-dec/war.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-emma2rh/irq.h b/arch/mips/include/asm/mach-emma2rh/irq.h<br/>index 5439eb856461..5439eb856461 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-emma2rh/irq.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-emma2rh/irq.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-emma2rh/irq.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-emma2rh/irq.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-emma2rh/war.h b/arch/mips/include/asm/mach-emma2rh/war.h<br/>index b660a4c30e6a..b660a4c30e6a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-emma2rh/war.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-emma2rh/war.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-emma2rh/war.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-emma2rh/war.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-excite/cpu-feature-overrides.h b/arch/mips/include/asm/mach-excite/cpu-feature-overrides.h<br/>index 107104c3cd12..107104c3cd12 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-excite/cpu-feature-overrides.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-excite/cpu-feature-overrides.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-excite/cpu-feature-overrides.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-excite/cpu-feature-overrides.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-excite/excite.h b/arch/mips/include/asm/mach-excite/excite.h<br/>index 4c29ba44992c..4c29ba44992c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-excite/excite.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-excite/excite.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-excite/excite.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-excite/excite.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-excite/excite_fpga.h b/arch/mips/include/asm/mach-excite/excite_fpga.h<br/>index 0a1ef69bece7..0a1ef69bece7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-excite/excite_fpga.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-excite/excite_fpga.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-excite/excite_fpga.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-excite/excite_fpga.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-excite/excite_nandflash.h b/arch/mips/include/asm/mach-excite/excite_nandflash.h<br/>index c4cf6140622e..c4cf6140622e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-excite/excite_nandflash.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-excite/excite_nandflash.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-excite/excite_nandflash.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-excite/excite_nandflash.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-excite/rm9k_eth.h b/arch/mips/include/asm/mach-excite/rm9k_eth.h<br/>index 94705a46f72e..94705a46f72e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-excite/rm9k_eth.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-excite/rm9k_eth.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-excite/rm9k_eth.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-excite/rm9k_eth.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-excite/rm9k_wdt.h b/arch/mips/include/asm/mach-excite/rm9k_wdt.h<br/>index 3fa3c08d2da7..3fa3c08d2da7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-excite/rm9k_wdt.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-excite/rm9k_wdt.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-excite/rm9k_wdt.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-excite/rm9k_wdt.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-excite/rm9k_xicap.h b/arch/mips/include/asm/mach-excite/rm9k_xicap.h<br/>index 009577734a8d..009577734a8d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-excite/rm9k_xicap.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-excite/rm9k_xicap.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-excite/rm9k_xicap.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-excite/rm9k_xicap.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-excite/war.h b/arch/mips/include/asm/mach-excite/war.h<br/>index 1f82180c1598..1f82180c1598 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-excite/war.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-excite/war.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-excite/war.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-excite/war.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-generic/cpu-feature-overrides.h b/arch/mips/include/asm/mach-generic/cpu-feature-overrides.h<br/>index 7c185bb06f13..7c185bb06f13 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-generic/cpu-feature-overrides.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-generic/cpu-feature-overrides.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-generic/cpu-feature-overrides.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-generic/cpu-feature-overrides.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-generic/dma-coherence.h b/arch/mips/include/asm/mach-generic/dma-coherence.h<br/>index 76e04e7feb84..76e04e7feb84 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-generic/dma-coherence.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-generic/dma-coherence.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-generic/dma-coherence.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-generic/dma-coherence.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-generic/floppy.h b/arch/mips/include/asm/mach-generic/floppy.h<br/>index 001a8ce17c17..001a8ce17c17 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-generic/floppy.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-generic/floppy.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-generic/floppy.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-generic/floppy.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-generic/gpio.h b/arch/mips/include/asm/mach-generic/gpio.h<br/>index b4e70208da64..b4e70208da64 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-generic/gpio.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-generic/gpio.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-generic/gpio.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-generic/gpio.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-generic/ide.h b/arch/mips/include/asm/mach-generic/ide.h<br/>index 73008f7bdc93..9c93a5b36f2a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-generic/ide.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-generic/ide.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-generic/ide.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-generic/ide.h</a></div><div class='hunk'>@@ -19,35 +19,6 @@</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> </div><div class='del'>-static __inline__ int ide_probe_legacy(void)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-	struct pci_dev *dev;</div><div class='del'>-	/*</div><div class='del'>-	 * This can be called on the ide_setup() path, super-early in</div><div class='del'>-	 * boot.  But the down_read() will enable local interrupts,</div><div class='del'>-	 * which can cause some machines to crash.  So here we detect</div><div class='del'>-	 * and flag that situation and bail out early.</div><div class='del'>-	 */</div><div class='del'>-	if (no_pci_devices())</div><div class='del'>-		return 0;</div><div class='del'>-	dev = pci_get_class(PCI_CLASS_BRIDGE_EISA &lt;&lt; 8, NULL);</div><div class='del'>-	if (dev)</div><div class='del'>-		goto found;</div><div class='del'>-	dev = pci_get_class(PCI_CLASS_BRIDGE_ISA &lt;&lt; 8, NULL);</div><div class='del'>-	if (dev)</div><div class='del'>-		goto found;</div><div class='del'>-	return 0;</div><div class='del'>-found:</div><div class='del'>-	pci_dev_put(dev);</div><div class='del'>-	return 1;</div><div class='del'>-#elif defined(CONFIG_EISA) || defined(CONFIG_ISA)</div><div class='del'>-	return 1;</div><div class='del'>-#else</div><div class='del'>-	return 0;</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* MIPS port and memory-mapped I/O string operations.  */</div><div class='ctx'> static inline void __ide_flush_prologue(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/include/asm-mips/mach-generic/ioremap.h b/arch/mips/include/asm/mach-generic/ioremap.h<br/>index b379938d47f0..b379938d47f0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-generic/ioremap.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-generic/ioremap.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-generic/ioremap.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-generic/ioremap.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-generic/irq.h b/arch/mips/include/asm/mach-generic/irq.h<br/>index 70d9a25132c5..70d9a25132c5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-generic/irq.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-generic/irq.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-generic/irq.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-generic/irq.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-generic/kernel-entry-init.h b/arch/mips/include/asm/mach-generic/kernel-entry-init.h<br/>index 7e66505fa574..7e66505fa574 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-generic/kernel-entry-init.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-generic/kernel-entry-init.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-generic/kernel-entry-init.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-generic/kernel-entry-init.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-generic/kmalloc.h b/arch/mips/include/asm/mach-generic/kmalloc.h<br/>index b8e6deba352f..b8e6deba352f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-generic/kmalloc.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-generic/kmalloc.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-generic/kmalloc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-generic/kmalloc.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-generic/mangle-port.h b/arch/mips/include/asm/mach-generic/mangle-port.h<br/>index f49dc990214b..f49dc990214b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-generic/mangle-port.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-generic/mangle-port.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-generic/mangle-port.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-generic/mangle-port.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-generic/mc146818rtc.h b/arch/mips/include/asm/mach-generic/mc146818rtc.h<br/>index 0b9a942f079d..0b9a942f079d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-generic/mc146818rtc.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-generic/mc146818rtc.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-generic/mc146818rtc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-generic/mc146818rtc.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-generic/spaces.h b/arch/mips/include/asm/mach-generic/spaces.h<br/>index c9fa4b14968d..c9fa4b14968d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-generic/spaces.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-generic/spaces.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-generic/spaces.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-generic/spaces.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-generic/topology.h b/arch/mips/include/asm/mach-generic/topology.h<br/>index 5428f333a02c..5428f333a02c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-generic/topology.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-generic/topology.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-generic/topology.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-generic/topology.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-ip22/cpu-feature-overrides.h b/arch/mips/include/asm/mach-ip22/cpu-feature-overrides.h<br/>index 9c8735158da1..9c8735158da1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-ip22/cpu-feature-overrides.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-ip22/cpu-feature-overrides.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-ip22/cpu-feature-overrides.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-ip22/cpu-feature-overrides.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-ip22/spaces.h b/arch/mips/include/asm/mach-ip22/spaces.h<br/>index 7f9fa6f66059..7f9fa6f66059 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-ip22/spaces.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-ip22/spaces.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-ip22/spaces.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-ip22/spaces.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-ip22/war.h b/arch/mips/include/asm/mach-ip22/war.h<br/>index a44fa9656a82..a44fa9656a82 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-ip22/war.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-ip22/war.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-ip22/war.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-ip22/war.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-ip27/cpu-feature-overrides.h b/arch/mips/include/asm/mach-ip27/cpu-feature-overrides.h<br/>index 7d3112b148d9..7d3112b148d9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-ip27/cpu-feature-overrides.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-ip27/cpu-feature-overrides.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-ip27/cpu-feature-overrides.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-ip27/cpu-feature-overrides.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-ip27/dma-coherence.h b/arch/mips/include/asm/mach-ip27/dma-coherence.h<br/>index ed7e6222dc15..ed7e6222dc15 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-ip27/dma-coherence.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-ip27/dma-coherence.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-ip27/dma-coherence.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-ip27/dma-coherence.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-ip27/irq.h b/arch/mips/include/asm/mach-ip27/irq.h<br/>index cf4384bfa846..cf4384bfa846 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-ip27/irq.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-ip27/irq.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-ip27/irq.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-ip27/irq.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-ip27/kernel-entry-init.h b/arch/mips/include/asm/mach-ip27/kernel-entry-init.h<br/>index 624d66c7f290..624d66c7f290 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-ip27/kernel-entry-init.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-ip27/kernel-entry-init.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-ip27/kernel-entry-init.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-ip27/kernel-entry-init.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-ip27/kmalloc.h b/arch/mips/include/asm/mach-ip27/kmalloc.h<br/>index 426bd049b2d7..426bd049b2d7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-ip27/kmalloc.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-ip27/kmalloc.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-ip27/kmalloc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-ip27/kmalloc.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-ip27/mangle-port.h b/arch/mips/include/asm/mach-ip27/mangle-port.h<br/>index f6e4912ea062..f6e4912ea062 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-ip27/mangle-port.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-ip27/mangle-port.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-ip27/mangle-port.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-ip27/mangle-port.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-ip27/mmzone.h b/arch/mips/include/asm/mach-ip27/mmzone.h<br/>index 986a3b9b59a7..986a3b9b59a7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-ip27/mmzone.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-ip27/mmzone.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-ip27/mmzone.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-ip27/mmzone.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-ip27/spaces.h b/arch/mips/include/asm/mach-ip27/spaces.h<br/>index b18802a0b17e..b18802a0b17e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-ip27/spaces.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-ip27/spaces.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-ip27/spaces.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-ip27/spaces.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-ip27/topology.h b/arch/mips/include/asm/mach-ip27/topology.h<br/>index 7785bec732f2..7785bec732f2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-ip27/topology.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-ip27/topology.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-ip27/topology.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-ip27/topology.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-ip27/war.h b/arch/mips/include/asm/mach-ip27/war.h<br/>index e2ddcc9b1fff..e2ddcc9b1fff 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-ip27/war.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-ip27/war.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-ip27/war.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-ip27/war.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-ip28/cpu-feature-overrides.h b/arch/mips/include/asm/mach-ip28/cpu-feature-overrides.h<br/>index 9a53b326f848..9a53b326f848 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-ip28/cpu-feature-overrides.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-ip28/cpu-feature-overrides.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-ip28/cpu-feature-overrides.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-ip28/cpu-feature-overrides.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-ip28/spaces.h b/arch/mips/include/asm/mach-ip28/spaces.h<br/>index 05aabb27e5e7..05aabb27e5e7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-ip28/spaces.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-ip28/spaces.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-ip28/spaces.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-ip28/spaces.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-ip28/war.h b/arch/mips/include/asm/mach-ip28/war.h<br/>index a1baafab486a..a1baafab486a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-ip28/war.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-ip28/war.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-ip28/war.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-ip28/war.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-ip32/cpu-feature-overrides.h b/arch/mips/include/asm/mach-ip32/cpu-feature-overrides.h<br/>index 6782fccebe8d..6782fccebe8d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-ip32/cpu-feature-overrides.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-ip32/cpu-feature-overrides.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-ip32/cpu-feature-overrides.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-ip32/cpu-feature-overrides.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-ip32/dma-coherence.h b/arch/mips/include/asm/mach-ip32/dma-coherence.h<br/>index a5511ebb2d53..a5511ebb2d53 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-ip32/dma-coherence.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-ip32/dma-coherence.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-ip32/dma-coherence.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-ip32/dma-coherence.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-ip32/kmalloc.h b/arch/mips/include/asm/mach-ip32/kmalloc.h<br/>index b1e0be60f720..b1e0be60f720 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-ip32/kmalloc.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-ip32/kmalloc.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-ip32/kmalloc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-ip32/kmalloc.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-ip32/mangle-port.h b/arch/mips/include/asm/mach-ip32/mangle-port.h<br/>index f1d0f1756a9f..f1d0f1756a9f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-ip32/mangle-port.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-ip32/mangle-port.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-ip32/mangle-port.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-ip32/mangle-port.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-ip32/mc146818rtc.h b/arch/mips/include/asm/mach-ip32/mc146818rtc.h<br/>index c28ba8d84076..c28ba8d84076 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-ip32/mc146818rtc.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-ip32/mc146818rtc.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-ip32/mc146818rtc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-ip32/mc146818rtc.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-ip32/war.h b/arch/mips/include/asm/mach-ip32/war.h<br/>index d194056dcd7a..d194056dcd7a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-ip32/war.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-ip32/war.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-ip32/war.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-ip32/war.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-jazz/dma-coherence.h b/arch/mips/include/asm/mach-jazz/dma-coherence.h<br/>index d66979a124a8..d66979a124a8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-jazz/dma-coherence.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-jazz/dma-coherence.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-jazz/dma-coherence.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-jazz/dma-coherence.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-jazz/floppy.h b/arch/mips/include/asm/mach-jazz/floppy.h<br/>index 56e9ca6ae426..56e9ca6ae426 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-jazz/floppy.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-jazz/floppy.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-jazz/floppy.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-jazz/floppy.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-jazz/mc146818rtc.h b/arch/mips/include/asm/mach-jazz/mc146818rtc.h<br/>index 987f727afe25..987f727afe25 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-jazz/mc146818rtc.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-jazz/mc146818rtc.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-jazz/mc146818rtc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-jazz/mc146818rtc.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-jazz/war.h b/arch/mips/include/asm/mach-jazz/war.h<br/>index 6158ee861bfd..6158ee861bfd 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-jazz/war.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-jazz/war.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-jazz/war.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-jazz/war.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-lasat/irq.h b/arch/mips/include/asm/mach-lasat/irq.h<br/>index 3a282419d5f9..3a282419d5f9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-lasat/irq.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-lasat/irq.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-lasat/irq.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-lasat/irq.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-lasat/mach-gt64120.h b/arch/mips/include/asm/mach-lasat/mach-gt64120.h<br/>index 1a9ad45cc135..1a9ad45cc135 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-lasat/mach-gt64120.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-lasat/mach-gt64120.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-lasat/mach-gt64120.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-lasat/mach-gt64120.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-lasat/war.h b/arch/mips/include/asm/mach-lasat/war.h<br/>index bb1e0325c9be..bb1e0325c9be 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-lasat/war.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-lasat/war.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-lasat/war.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-lasat/war.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-lemote/dma-coherence.h b/arch/mips/include/asm/mach-lemote/dma-coherence.h<br/>index 7e914777ebc4..7e914777ebc4 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-lemote/dma-coherence.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-lemote/dma-coherence.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-lemote/dma-coherence.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-lemote/dma-coherence.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-lemote/mc146818rtc.h b/arch/mips/include/asm/mach-lemote/mc146818rtc.h<br/>index ed5147e11085..ed5147e11085 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-lemote/mc146818rtc.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-lemote/mc146818rtc.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-lemote/mc146818rtc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-lemote/mc146818rtc.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-lemote/war.h b/arch/mips/include/asm/mach-lemote/war.h<br/>index 05f89e0f2a11..05f89e0f2a11 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-lemote/war.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-lemote/war.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-lemote/war.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-lemote/war.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-malta/cpu-feature-overrides.h b/arch/mips/include/asm/mach-malta/cpu-feature-overrides.h<br/>index 7f3e3f9bd23a..7f3e3f9bd23a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-malta/cpu-feature-overrides.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-malta/cpu-feature-overrides.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-malta/cpu-feature-overrides.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-malta/cpu-feature-overrides.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-malta/irq.h b/arch/mips/include/asm/mach-malta/irq.h<br/>index 9b9da26683c2..9b9da26683c2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-malta/irq.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-malta/irq.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-malta/irq.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-malta/irq.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-malta/kernel-entry-init.h b/arch/mips/include/asm/mach-malta/kernel-entry-init.h<br/>index 0b793e7bf67e..0b793e7bf67e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-malta/kernel-entry-init.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-malta/kernel-entry-init.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-malta/kernel-entry-init.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-malta/kernel-entry-init.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-malta/mach-gt64120.h b/arch/mips/include/asm/mach-malta/mach-gt64120.h<br/>index 0f863148f3b6..0f863148f3b6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-malta/mach-gt64120.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-malta/mach-gt64120.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-malta/mach-gt64120.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-malta/mach-gt64120.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-malta/mc146818rtc.h b/arch/mips/include/asm/mach-malta/mc146818rtc.h<br/>index ea612f37f614..ea612f37f614 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-malta/mc146818rtc.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-malta/mc146818rtc.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-malta/mc146818rtc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-malta/mc146818rtc.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-malta/war.h b/arch/mips/include/asm/mach-malta/war.h<br/>index 7c6931d5f45f..7c6931d5f45f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-malta/war.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-malta/war.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-malta/war.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-malta/war.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-mipssim/cpu-feature-overrides.h b/arch/mips/include/asm/mach-mipssim/cpu-feature-overrides.h<br/>index 779b02205737..779b02205737 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-mipssim/cpu-feature-overrides.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-mipssim/cpu-feature-overrides.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-mipssim/cpu-feature-overrides.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-mipssim/cpu-feature-overrides.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-mipssim/war.h b/arch/mips/include/asm/mach-mipssim/war.h<br/>index c8a74a3515e0..c8a74a3515e0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-mipssim/war.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-mipssim/war.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-mipssim/war.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-mipssim/war.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-pb1x00/mc146818rtc.h b/arch/mips/include/asm/mach-pb1x00/mc146818rtc.h<br/>index 622c58710e5b..622c58710e5b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-pb1x00/mc146818rtc.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-pb1x00/mc146818rtc.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-pb1x00/mc146818rtc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-pb1x00/mc146818rtc.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-pb1x00/pb1000.h b/arch/mips/include/asm/mach-pb1x00/pb1000.h<br/>index 6d1ff9060e44..6d1ff9060e44 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-pb1x00/pb1000.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-pb1x00/pb1000.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-pb1x00/pb1000.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-pb1x00/pb1000.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-pb1x00/pb1100.h b/arch/mips/include/asm/mach-pb1x00/pb1100.h<br/>index b1a60f1cbd02..b1a60f1cbd02 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-pb1x00/pb1100.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-pb1x00/pb1100.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-pb1x00/pb1100.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-pb1x00/pb1100.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-pb1x00/pb1200.h b/arch/mips/include/asm/mach-pb1x00/pb1200.h<br/>index c8618df88cb5..c8618df88cb5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-pb1x00/pb1200.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-pb1x00/pb1200.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-pb1x00/pb1200.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-pb1x00/pb1200.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-pb1x00/pb1500.h b/arch/mips/include/asm/mach-pb1x00/pb1500.h<br/>index da51a2eb7b82..da51a2eb7b82 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-pb1x00/pb1500.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-pb1x00/pb1500.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-pb1x00/pb1500.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-pb1x00/pb1500.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-pb1x00/pb1550.h b/arch/mips/include/asm/mach-pb1x00/pb1550.h<br/>index 6704a11497db..6704a11497db 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-pb1x00/pb1550.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-pb1x00/pb1550.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-pb1x00/pb1550.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-pb1x00/pb1550.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-pnx8550/cm.h b/arch/mips/include/asm/mach-pnx8550/cm.h<br/>index bb0a56c7d011..bb0a56c7d011 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-pnx8550/cm.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-pnx8550/cm.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-pnx8550/cm.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-pnx8550/cm.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-pnx8550/glb.h b/arch/mips/include/asm/mach-pnx8550/glb.h<br/>index 07aa85e609bc..07aa85e609bc 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-pnx8550/glb.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-pnx8550/glb.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-pnx8550/glb.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-pnx8550/glb.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-pnx8550/int.h b/arch/mips/include/asm/mach-pnx8550/int.h<br/>index 0e0668b524f4..0e0668b524f4 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-pnx8550/int.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-pnx8550/int.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-pnx8550/int.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-pnx8550/int.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-pnx8550/kernel-entry-init.h b/arch/mips/include/asm/mach-pnx8550/kernel-entry-init.h<br/>index bdde00c9199b..bdde00c9199b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-pnx8550/kernel-entry-init.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-pnx8550/kernel-entry-init.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-pnx8550/kernel-entry-init.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-pnx8550/kernel-entry-init.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-pnx8550/nand.h b/arch/mips/include/asm/mach-pnx8550/nand.h<br/>index aefbc514ab09..aefbc514ab09 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-pnx8550/nand.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-pnx8550/nand.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-pnx8550/nand.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-pnx8550/nand.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-pnx8550/pci.h b/arch/mips/include/asm/mach-pnx8550/pci.h<br/>index b921508d701b..b921508d701b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-pnx8550/pci.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-pnx8550/pci.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-pnx8550/pci.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-pnx8550/pci.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-pnx8550/uart.h b/arch/mips/include/asm/mach-pnx8550/uart.h<br/>index ad7608d44874..ad7608d44874 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-pnx8550/uart.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-pnx8550/uart.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-pnx8550/uart.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-pnx8550/uart.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-pnx8550/usb.h b/arch/mips/include/asm/mach-pnx8550/usb.h<br/>index 483b7fc65d41..483b7fc65d41 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-pnx8550/usb.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-pnx8550/usb.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-pnx8550/usb.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-pnx8550/usb.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-pnx8550/war.h b/arch/mips/include/asm/mach-pnx8550/war.h<br/>index d0458dd082f9..d0458dd082f9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-pnx8550/war.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-pnx8550/war.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-pnx8550/war.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-pnx8550/war.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-rc32434/cpu-feature-overrides.h b/arch/mips/include/asm/mach-rc32434/cpu-feature-overrides.h<br/>index f3bc7efa2608..f3bc7efa2608 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-rc32434/cpu-feature-overrides.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-rc32434/cpu-feature-overrides.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-rc32434/cpu-feature-overrides.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-rc32434/cpu-feature-overrides.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-rc32434/ddr.h b/arch/mips/include/asm/mach-rc32434/ddr.h<br/>index 291e2cf9dde0..291e2cf9dde0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-rc32434/ddr.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-rc32434/ddr.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-rc32434/ddr.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-rc32434/ddr.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-rc32434/dma.h b/arch/mips/include/asm/mach-rc32434/dma.h<br/>index 5f898b5873f7..5f898b5873f7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-rc32434/dma.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-rc32434/dma.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-rc32434/dma.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-rc32434/dma.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-rc32434/dma_v.h b/arch/mips/include/asm/mach-rc32434/dma_v.h<br/>index 173a9f9146cd..173a9f9146cd 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-rc32434/dma_v.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-rc32434/dma_v.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-rc32434/dma_v.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-rc32434/dma_v.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-rc32434/eth.h b/arch/mips/include/asm/mach-rc32434/eth.h<br/>index a25cbc56173d..a25cbc56173d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-rc32434/eth.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-rc32434/eth.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-rc32434/eth.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-rc32434/eth.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-rc32434/gpio.h b/arch/mips/include/asm/mach-rc32434/gpio.h<br/>index f946f5f45bbb..c8e554eafce3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-rc32434/gpio.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-rc32434/gpio.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-rc32434/gpio.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-rc32434/gpio.h</a></div><div class='hunk'>@@ -14,6 +14,16 @@</div><div class='ctx'> #define _RC32434_GPIO_H_</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;asm-generic/gpio.h&gt;</div><div class='add'>+</div><div class='add'>+#define NR_BUILTIN_GPIO		32</div><div class='add'>+</div><div class='add'>+#define gpio_get_value	__gpio_get_value</div><div class='add'>+#define gpio_set_value	__gpio_set_value</div><div class='add'>+#define gpio_cansleep	__gpio_cansleep</div><div class='add'>+</div><div class='add'>+#define gpio_to_irq(gpio)	(8 + 4 * 32 + gpio)</div><div class='add'>+#define irq_to_gpio(irq)	(irq - (8 + 4 * 32))</div><div class='ctx'> </div><div class='ctx'> struct rb532_gpio_reg {</div><div class='ctx'> 	u32   gpiofunc;   /* GPIO Function Register</div><div class='hunk'>@@ -61,66 +71,18 @@ struct rb532_gpio_reg {</div><div class='ctx'> /* PCI messaging unit */</div><div class='ctx'> #define RC32434_PCI_MSU_GPIO	(1 &lt;&lt; 13)</div><div class='ctx'> </div><div class='add'>+/* NAND GPIO signals */</div><div class='add'>+#define GPIO_RDY		8</div><div class='add'>+#define GPIO_WPX	9</div><div class='add'>+#define GPIO_ALE		10</div><div class='add'>+#define GPIO_CLE		11</div><div class='add'>+</div><div class='add'>+/* Compact Flash GPIO pin */</div><div class='add'>+#define CF_GPIO_NUM		13</div><div class='ctx'> </div><div class='ctx'> extern void set_434_reg(unsigned reg_offs, unsigned bit, unsigned len, unsigned val);</div><div class='ctx'> extern unsigned get_434_reg(unsigned reg_offs);</div><div class='ctx'> extern void set_latch_u5(unsigned char or_mask, unsigned char nand_mask);</div><div class='ctx'> extern unsigned char get_latch_u5(void);</div><div class='ctx'> </div><div class='del'>-extern int rb532_gpio_get_value(unsigned gpio);</div><div class='del'>-extern void rb532_gpio_set_value(unsigned gpio, int value);</div><div class='del'>-extern int rb532_gpio_direction_input(unsigned gpio);</div><div class='del'>-extern int rb532_gpio_direction_output(unsigned gpio, int value);</div><div class='del'>-extern void rb532_gpio_set_int_level(unsigned gpio, int value);</div><div class='del'>-extern int rb532_gpio_get_int_level(unsigned gpio);</div><div class='del'>-extern void rb532_gpio_set_int_status(unsigned gpio, int value);</div><div class='del'>-extern int rb532_gpio_get_int_status(unsigned gpio);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Wrappers for the arch-neutral GPIO API */</div><div class='del'>-</div><div class='del'>-static inline int gpio_request(unsigned gpio, const char *label)</div><div class='del'>-{</div><div class='del'>-	/* Not yet implemented */</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void gpio_free(unsigned gpio)</div><div class='del'>-{</div><div class='del'>-	/* Not yet implemented */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int gpio_direction_input(unsigned gpio)</div><div class='del'>-{</div><div class='del'>-	return rb532_gpio_direction_input(gpio);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int gpio_direction_output(unsigned gpio, int value)</div><div class='del'>-{</div><div class='del'>-	return rb532_gpio_direction_output(gpio, value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int gpio_get_value(unsigned gpio)</div><div class='del'>-{</div><div class='del'>-	return rb532_gpio_get_value(gpio);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void gpio_set_value(unsigned gpio, int value)</div><div class='del'>-{</div><div class='del'>-	rb532_gpio_set_value(gpio, value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int gpio_to_irq(unsigned gpio)</div><div class='del'>-{</div><div class='del'>-	return gpio;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int irq_to_gpio(unsigned irq)</div><div class='del'>-{</div><div class='del'>-	return irq;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* For cansleep */</div><div class='del'>-#include &lt;asm-generic/gpio.h&gt;</div><div class='del'>-</div><div class='ctx'> #endif /* _RC32434_GPIO_H_ */</div><div class='head'>diff --git a/include/asm-mips/mach-rc32434/integ.h b/arch/mips/include/asm/mach-rc32434/integ.h<br/>index fa65bc3d8807..fa65bc3d8807 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-rc32434/integ.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-rc32434/integ.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-rc32434/integ.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-rc32434/integ.h</a></div><div class='head'>diff --git a/arch/mips/include/asm/mach-rc32434/irq.h b/arch/mips/include/asm/mach-rc32434/irq.h<br/>new file mode 100644<br/>index 000000000000..56738d8ec4e2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-rc32434/irq.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-rc32434/irq.h</a></div><div class='hunk'>@@ -0,0 +1,33 @@</div><div class='add'>+#ifndef __ASM_RC32434_IRQ_H</div><div class='add'>+#define __ASM_RC32434_IRQ_H</div><div class='add'>+</div><div class='add'>+#define NR_IRQS	256</div><div class='add'>+</div><div class='add'>+#include &lt;asm/mach-generic/irq.h&gt;</div><div class='add'>+#include &lt;asm/mach-rc32434/rb.h&gt;</div><div class='add'>+</div><div class='add'>+/* Interrupt Controller */</div><div class='add'>+#define IC_GROUP0_PEND		(REGBASE + 0x38000)</div><div class='add'>+#define IC_GROUP0_MASK		(REGBASE + 0x38008)</div><div class='add'>+#define IC_GROUP_OFFSET		0x0C</div><div class='add'>+</div><div class='add'>+#define NUM_INTR_GROUPS		5</div><div class='add'>+</div><div class='add'>+/* 16550 UARTs */</div><div class='add'>+#define GROUP0_IRQ_BASE		8	/* GRP2 IRQ numbers start here */</div><div class='add'>+					/* GRP3 IRQ numbers start here */</div><div class='add'>+#define GROUP1_IRQ_BASE		(GROUP0_IRQ_BASE + 32)</div><div class='add'>+					/* GRP4 IRQ numbers start here */</div><div class='add'>+#define GROUP2_IRQ_BASE		(GROUP1_IRQ_BASE + 32)</div><div class='add'>+					/* GRP5 IRQ numbers start here */</div><div class='add'>+#define GROUP3_IRQ_BASE		(GROUP2_IRQ_BASE + 32)</div><div class='add'>+#define GROUP4_IRQ_BASE		(GROUP3_IRQ_BASE + 32)</div><div class='add'>+</div><div class='add'>+#define UART0_IRQ		(GROUP3_IRQ_BASE + 0)</div><div class='add'>+</div><div class='add'>+#define ETH0_DMA_RX_IRQ   	(GROUP1_IRQ_BASE + 0)</div><div class='add'>+#define ETH0_DMA_TX_IRQ   	(GROUP1_IRQ_BASE + 1)</div><div class='add'>+#define ETH0_RX_OVR_IRQ   	(GROUP3_IRQ_BASE + 9)</div><div class='add'>+#define ETH0_TX_UND_IRQ   	(GROUP3_IRQ_BASE + 10)</div><div class='add'>+</div><div class='add'>+#endif  /* __ASM_RC32434_IRQ_H */</div><div class='head'>diff --git a/include/asm-mips/mach-rc32434/pci.h b/arch/mips/include/asm/mach-rc32434/pci.h<br/>index 410638f2af74..410638f2af74 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-rc32434/pci.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-rc32434/pci.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-rc32434/pci.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-rc32434/pci.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-rc32434/prom.h b/arch/mips/include/asm/mach-rc32434/prom.h<br/>index 1d66ddcda89a..660707f1bcce 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-rc32434/prom.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-rc32434/prom.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-rc32434/prom.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-rc32434/prom.h</a></div><div class='hunk'>@@ -28,14 +28,10 @@</div><div class='ctx'> </div><div class='ctx'> #define PROM_ENTRY(x)		(0xbfc00000 + ((x) * 8))</div><div class='ctx'> </div><div class='del'>-#define GPIO_INIT_NOBUTTON	""</div><div class='del'>-#define GPIO_INIT_BUTTON	" 2"</div><div class='del'>-</div><div class='ctx'> #define SR_NMI			0x00180000</div><div class='ctx'> #define SERIAL_SPEED_ENTRY	0x00000001</div><div class='ctx'> </div><div class='ctx'> #define FREQ_TAG		"HZ="</div><div class='del'>-#define GPIO_TAG		"gpio="</div><div class='ctx'> #define KMAC_TAG		"kmac="</div><div class='ctx'> #define MEM_TAG			"mem="</div><div class='ctx'> #define BOARD_TAG		"board="</div><div class='head'>diff --git a/include/asm-mips/mach-rc32434/rb.h b/arch/mips/include/asm/mach-rc32434/rb.h<br/>index e0a76e3ffea8..79e8ef67d0d3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-rc32434/rb.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-rc32434/rb.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-rc32434/rb.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-rc32434/rb.h</a></div><div class='hunk'>@@ -17,7 +17,10 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/genhd.h&gt;</div><div class='ctx'> </div><div class='del'>-#define IDT434_REG_BASE	((volatile void *) KSEG1ADDR(0x18000000))</div><div class='add'>+#define REGBASE		0x18000000</div><div class='add'>+#define IDT434_REG_BASE	((volatile void *) KSEG1ADDR(REGBASE))</div><div class='add'>+#define UART0BASE	0x58000</div><div class='add'>+#define RST		(1 &lt;&lt; 15)</div><div class='ctx'> #define DEV0BASE	0x010000</div><div class='ctx'> #define DEV0MASK	0x010004</div><div class='ctx'> #define DEV0C		0x010008</div><div class='head'>diff --git a/arch/mips/include/asm/mach-rc32434/rc32434.h b/arch/mips/include/asm/mach-rc32434/rc32434.h<br/>new file mode 100644<br/>index 000000000000..fce25d4231fc<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-rc32434/rc32434.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-rc32434/rc32434.h</a></div><div class='hunk'>@@ -0,0 +1,19 @@</div><div class='add'>+/*</div><div class='add'>+ * Definitions for IDT RC323434 CPU.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _ASM_RC32434_RC32434_H_</div><div class='add'>+#define _ASM_RC32434_RC32434_H_</div><div class='add'>+</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+</div><div class='add'>+#define IDT_CLOCK_MULT		2</div><div class='add'>+</div><div class='add'>+/* cpu pipeline flush */</div><div class='add'>+static inline void rc32434_sync(void)</div><div class='add'>+{</div><div class='add'>+	__asm__ volatile ("sync");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif  /* _ASM_RC32434_RC32434_H_ */</div><div class='head'>diff --git a/include/asm-mips/mach-rc32434/timer.h b/arch/mips/include/asm/mach-rc32434/timer.h<br/>index e49b1d57a017..e49b1d57a017 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-rc32434/timer.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-rc32434/timer.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-rc32434/timer.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-rc32434/timer.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-rc32434/war.h b/arch/mips/include/asm/mach-rc32434/war.h<br/>index 3ddf187e98a6..3ddf187e98a6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-rc32434/war.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-rc32434/war.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-rc32434/war.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-rc32434/war.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-rm/cpu-feature-overrides.h b/arch/mips/include/asm/mach-rm/cpu-feature-overrides.h<br/>index ccf543363537..ccf543363537 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-rm/cpu-feature-overrides.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-rm/cpu-feature-overrides.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-rm/cpu-feature-overrides.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-rm/cpu-feature-overrides.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-rm/mc146818rtc.h b/arch/mips/include/asm/mach-rm/mc146818rtc.h<br/>index 145bce096fe9..145bce096fe9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-rm/mc146818rtc.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-rm/mc146818rtc.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-rm/mc146818rtc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-rm/mc146818rtc.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-rm/war.h b/arch/mips/include/asm/mach-rm/war.h<br/>index 948d3129a114..948d3129a114 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-rm/war.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-rm/war.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-rm/war.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-rm/war.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-sibyte/cpu-feature-overrides.h b/arch/mips/include/asm/mach-sibyte/cpu-feature-overrides.h<br/>index 1c1f92415b9a..1c1f92415b9a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-sibyte/cpu-feature-overrides.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-sibyte/cpu-feature-overrides.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-sibyte/cpu-feature-overrides.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-sibyte/cpu-feature-overrides.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-sibyte/war.h b/arch/mips/include/asm/mach-sibyte/war.h<br/>index 7950ef4f032c..7950ef4f032c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-sibyte/war.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-sibyte/war.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-sibyte/war.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-sibyte/war.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-tx39xx/ioremap.h b/arch/mips/include/asm/mach-tx39xx/ioremap.h<br/>index 93c6c04ffda3..93c6c04ffda3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-tx39xx/ioremap.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-tx39xx/ioremap.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-tx39xx/ioremap.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-tx39xx/ioremap.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-tx39xx/mangle-port.h b/arch/mips/include/asm/mach-tx39xx/mangle-port.h<br/>index ef0b502fd8b7..ef0b502fd8b7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-tx39xx/mangle-port.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-tx39xx/mangle-port.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-tx39xx/mangle-port.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-tx39xx/mangle-port.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-tx39xx/war.h b/arch/mips/include/asm/mach-tx39xx/war.h<br/>index 433814616359..433814616359 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-tx39xx/war.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-tx39xx/war.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-tx39xx/war.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-tx39xx/war.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-tx49xx/cpu-feature-overrides.h b/arch/mips/include/asm/mach-tx49xx/cpu-feature-overrides.h<br/>index 275eaf92c748..275eaf92c748 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-tx49xx/cpu-feature-overrides.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-tx49xx/cpu-feature-overrides.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-tx49xx/cpu-feature-overrides.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-tx49xx/cpu-feature-overrides.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-tx49xx/ioremap.h b/arch/mips/include/asm/mach-tx49xx/ioremap.h<br/>index 1e7beae72229..1e7beae72229 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-tx49xx/ioremap.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-tx49xx/ioremap.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-tx49xx/ioremap.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-tx49xx/ioremap.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-tx49xx/kmalloc.h b/arch/mips/include/asm/mach-tx49xx/kmalloc.h<br/>index 913ff196259d..913ff196259d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-tx49xx/kmalloc.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-tx49xx/kmalloc.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-tx49xx/kmalloc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-tx49xx/kmalloc.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-tx49xx/war.h b/arch/mips/include/asm/mach-tx49xx/war.h<br/>index 39b5d1177c57..39b5d1177c57 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-tx49xx/war.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-tx49xx/war.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-tx49xx/war.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-tx49xx/war.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-vr41xx/irq.h b/arch/mips/include/asm/mach-vr41xx/irq.h<br/>index 862058d3f81b..862058d3f81b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-vr41xx/irq.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-vr41xx/irq.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-vr41xx/irq.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-vr41xx/irq.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-vr41xx/war.h b/arch/mips/include/asm/mach-vr41xx/war.h<br/>index 56a38926412a..56a38926412a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-vr41xx/war.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-vr41xx/war.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-vr41xx/war.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-vr41xx/war.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-wrppmc/mach-gt64120.h b/arch/mips/include/asm/mach-wrppmc/mach-gt64120.h<br/>index 83746b84a5ec..83746b84a5ec 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-wrppmc/mach-gt64120.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-wrppmc/mach-gt64120.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-wrppmc/mach-gt64120.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-wrppmc/mach-gt64120.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-wrppmc/war.h b/arch/mips/include/asm/mach-wrppmc/war.h<br/>index ac48629bb1ce..ac48629bb1ce 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-wrppmc/war.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-wrppmc/war.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-wrppmc/war.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-wrppmc/war.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-yosemite/cpu-feature-overrides.h b/arch/mips/include/asm/mach-yosemite/cpu-feature-overrides.h<br/>index 470e5e9e10d6..470e5e9e10d6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-yosemite/cpu-feature-overrides.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-yosemite/cpu-feature-overrides.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-yosemite/cpu-feature-overrides.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-yosemite/cpu-feature-overrides.h</a></div><div class='head'>diff --git a/include/asm-mips/mach-yosemite/war.h b/arch/mips/include/asm/mach-yosemite/war.h<br/>index e5c6d53efc86..e5c6d53efc86 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mach-yosemite/war.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mach-yosemite/war.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mach-yosemite/war.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mach-yosemite/war.h</a></div><div class='head'>diff --git a/include/asm-mips/mc146818-time.h b/arch/mips/include/asm/mc146818-time.h<br/>index cdc379a0a94e..cdc379a0a94e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mc146818-time.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mc146818-time.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mc146818-time.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mc146818-time.h</a></div><div class='head'>diff --git a/include/asm-mips/mc146818rtc.h b/arch/mips/include/asm/mc146818rtc.h<br/>index 68b4da6d520b..68b4da6d520b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mc146818rtc.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mc146818rtc.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mc146818rtc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mc146818rtc.h</a></div><div class='head'>diff --git a/include/asm-mips/mips-boards/bonito64.h b/arch/mips/include/asm/mips-boards/bonito64.h<br/>index a0f04bb99c99..a0f04bb99c99 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mips-boards/bonito64.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mips-boards/bonito64.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mips-boards/bonito64.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mips-boards/bonito64.h</a></div><div class='head'>diff --git a/include/asm-mips/mips-boards/generic.h b/arch/mips/include/asm/mips-boards/generic.h<br/>index 7f0b034dd9a5..7f0b034dd9a5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mips-boards/generic.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mips-boards/generic.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mips-boards/generic.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mips-boards/generic.h</a></div><div class='head'>diff --git a/include/asm-mips/mips-boards/launch.h b/arch/mips/include/asm/mips-boards/launch.h<br/>index d8ae7f95a522..d8ae7f95a522 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mips-boards/launch.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mips-boards/launch.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mips-boards/launch.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mips-boards/launch.h</a></div><div class='head'>diff --git a/include/asm-mips/mips-boards/malta.h b/arch/mips/include/asm/mips-boards/malta.h<br/>index c1891578fa65..c1891578fa65 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mips-boards/malta.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mips-boards/malta.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mips-boards/malta.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mips-boards/malta.h</a></div><div class='head'>diff --git a/include/asm-mips/mips-boards/maltaint.h b/arch/mips/include/asm/mips-boards/maltaint.h<br/>index cea872fc6f5c..cea872fc6f5c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mips-boards/maltaint.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mips-boards/maltaint.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mips-boards/maltaint.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mips-boards/maltaint.h</a></div><div class='head'>diff --git a/include/asm-mips/mips-boards/msc01_pci.h b/arch/mips/include/asm/mips-boards/msc01_pci.h<br/>index e036b7dd6deb..e036b7dd6deb 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mips-boards/msc01_pci.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mips-boards/msc01_pci.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mips-boards/msc01_pci.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mips-boards/msc01_pci.h</a></div><div class='head'>diff --git a/include/asm-mips/mips-boards/piix4.h b/arch/mips/include/asm/mips-boards/piix4.h<br/>index 2971d60f2e95..2971d60f2e95 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mips-boards/piix4.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mips-boards/piix4.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mips-boards/piix4.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mips-boards/piix4.h</a></div><div class='head'>diff --git a/include/asm-mips/mips-boards/prom.h b/arch/mips/include/asm/mips-boards/prom.h<br/>index a9db576a9768..a9db576a9768 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mips-boards/prom.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mips-boards/prom.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mips-boards/prom.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mips-boards/prom.h</a></div><div class='head'>diff --git a/include/asm-mips/mips-boards/sim.h b/arch/mips/include/asm/mips-boards/sim.h<br/>index acb7c2331d98..acb7c2331d98 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mips-boards/sim.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mips-boards/sim.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mips-boards/sim.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mips-boards/sim.h</a></div><div class='head'>diff --git a/include/asm-mips/mips-boards/simint.h b/arch/mips/include/asm/mips-boards/simint.h<br/>index 8ef6db76d5c1..8ef6db76d5c1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mips-boards/simint.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mips-boards/simint.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mips-boards/simint.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mips-boards/simint.h</a></div><div class='head'>diff --git a/include/asm-mips/mips_mt.h b/arch/mips/include/asm/mips_mt.h<br/>index ac7935203f89..ac7935203f89 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mips_mt.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mips_mt.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mips_mt.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mips_mt.h</a></div><div class='head'>diff --git a/include/asm-mips/mipsmtregs.h b/arch/mips/include/asm/mipsmtregs.h<br/>index c9420aa97e32..c9420aa97e32 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mipsmtregs.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mipsmtregs.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mipsmtregs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mipsmtregs.h</a></div><div class='head'>diff --git a/include/asm-mips/mipsprom.h b/arch/mips/include/asm/mipsprom.h<br/>index 146d41b67adc..146d41b67adc 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mipsprom.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mipsprom.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mipsprom.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mipsprom.h</a></div><div class='head'>diff --git a/include/asm-mips/mipsregs.h b/arch/mips/include/asm/mipsregs.h<br/>index 979866000da4..979866000da4 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mipsregs.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mipsregs.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mipsregs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mipsregs.h</a></div><div class='head'>diff --git a/include/asm-mips/mman.h b/arch/mips/include/asm/mman.h<br/>index e4d6f1fb1cf7..e4d6f1fb1cf7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mman.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mman.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mman.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mman.h</a></div><div class='head'>diff --git a/include/asm-mips/mmu.h b/arch/mips/include/asm/mmu.h<br/>index 4063edd79623..4063edd79623 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mmu.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mmu.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mmu.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mmu.h</a></div><div class='head'>diff --git a/include/asm-mips/mmu_context.h b/arch/mips/include/asm/mmu_context.h<br/>index 0c4f245eaeb2..d7f3eb03ad12 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mmu_context.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mmu_context.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mmu_context.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mmu_context.h</a></div><div class='hunk'>@@ -220,8 +220,8 @@ activate_mm(struct mm_struct *prev, struct mm_struct *next)</div><div class='ctx'> 	oldasid = read_c0_entryhi() &amp; ASID_MASK;</div><div class='ctx'> 	if(smtc_live_asid[mytlb][oldasid]) {</div><div class='ctx'> 		smtc_live_asid[mytlb][oldasid] &amp;= ~(0x1 &lt;&lt; cpu);</div><div class='del'>-       		if(smtc_live_asid[mytlb][oldasid] == 0)</div><div class='del'>-               		 smtc_flush_tlb_asid(oldasid);</div><div class='add'>+		if(smtc_live_asid[mytlb][oldasid] == 0)</div><div class='add'>+			 smtc_flush_tlb_asid(oldasid);</div><div class='ctx'> 	}</div><div class='ctx'> 	/* See comments for similar code above */</div><div class='ctx'> 	write_c0_entryhi((read_c0_entryhi() &amp; ~HW_ASID_MASK) |</div><div class='hunk'>@@ -285,8 +285,8 @@ drop_mmu_context(struct mm_struct *mm, unsigned cpu)</div><div class='ctx'> </div><div class='ctx'> 		/* SMTC shares the TLB (and ASIDs) across VPEs */</div><div class='ctx'> 		for_each_online_cpu(i) {</div><div class='del'>-	    	    if((smtc_status &amp; SMTC_TLB_SHARED)</div><div class='del'>-	    	    || (cpu_data[i].vpe_id == cpu_data[cpu].vpe_id))</div><div class='add'>+		    if((smtc_status &amp; SMTC_TLB_SHARED)</div><div class='add'>+		    || (cpu_data[i].vpe_id == cpu_data[cpu].vpe_id))</div><div class='ctx'> 			cpu_context(i, mm) = 0;</div><div class='ctx'> 		}</div><div class='ctx'> #endif /* CONFIG_MIPS_MT_SMTC */</div><div class='head'>diff --git a/include/asm-mips/mmzone.h b/arch/mips/include/asm/mmzone.h<br/>index f53ec54c92ff..f53ec54c92ff 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mmzone.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mmzone.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mmzone.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mmzone.h</a></div><div class='head'>diff --git a/include/asm-mips/module.h b/arch/mips/include/asm/module.h<br/>index de6d09ebbd80..de6d09ebbd80 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/module.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/module.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/module.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/module.h</a></div><div class='head'>diff --git a/include/asm-mips/msc01_ic.h b/arch/mips/include/asm/msc01_ic.h<br/>index 7989b9ffc1d2..7989b9ffc1d2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/msc01_ic.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/msc01_ic.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/msc01_ic.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/msc01_ic.h</a></div><div class='head'>diff --git a/include/asm-mips/msgbuf.h b/arch/mips/include/asm/msgbuf.h<br/>index 0d6c7f14de31..0d6c7f14de31 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/msgbuf.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/msgbuf.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/msgbuf.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/msgbuf.h</a></div><div class='head'>diff --git a/include/asm-mips/mutex.h b/arch/mips/include/asm/mutex.h<br/>index 458c1f7fbc18..458c1f7fbc18 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/mutex.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/mutex.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/mutex.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/mutex.h</a></div><div class='head'>diff --git a/include/asm-mips/nile4.h b/arch/mips/include/asm/nile4.h<br/>index c3ca959aa4d9..c3ca959aa4d9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/nile4.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/nile4.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/nile4.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/nile4.h</a></div><div class='head'>diff --git a/include/asm-mips/paccess.h b/arch/mips/include/asm/paccess.h<br/>index c2394f8b0fe1..c2394f8b0fe1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/paccess.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/paccess.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/paccess.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/paccess.h</a></div><div class='head'>diff --git a/include/asm-mips/page.h b/arch/mips/include/asm/page.h<br/>index fe7a88ea066e..fe7a88ea066e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/page.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/page.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/page.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/page.h</a></div><div class='head'>diff --git a/include/asm-mips/param.h b/arch/mips/include/asm/param.h<br/>index 1d9bb8c5ab24..1d9bb8c5ab24 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/param.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/param.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/param.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/param.h</a></div><div class='head'>diff --git a/include/asm-mips/parport.h b/arch/mips/include/asm/parport.h<br/>index f52656826cce..f52656826cce 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/parport.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/parport.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/parport.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/parport.h</a></div><div class='head'>diff --git a/include/asm-mips/pci.h b/arch/mips/include/asm/pci.h<br/>index 5510c53b7feb..5510c53b7feb 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/pci.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/pci.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/pci.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/pci.h</a></div><div class='head'>diff --git a/include/asm-mips/pci/bridge.h b/arch/mips/include/asm/pci/bridge.h<br/>index 5f4b9d4e4114..5f4b9d4e4114 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/pci/bridge.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/pci/bridge.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/pci/bridge.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/pci/bridge.h</a></div><div class='head'>diff --git a/include/asm-mips/percpu.h b/arch/mips/include/asm/percpu.h<br/>index 844e763e9332..844e763e9332 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/percpu.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/percpu.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/percpu.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/percpu.h</a></div><div class='head'>diff --git a/include/asm-mips/pgalloc.h b/arch/mips/include/asm/pgalloc.h<br/>index 1275831dda29..1275831dda29 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/pgalloc.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/pgalloc.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/pgalloc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/pgalloc.h</a></div><div class='head'>diff --git a/include/asm-mips/pgtable-32.h b/arch/mips/include/asm/pgtable-32.h<br/>index 55813d6150c7..55813d6150c7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/pgtable-32.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/pgtable-32.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/pgtable-32.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/pgtable-32.h</a></div><div class='head'>diff --git a/include/asm-mips/pgtable-64.h b/arch/mips/include/asm/pgtable-64.h<br/>index 943515f0ef87..943515f0ef87 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/pgtable-64.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/pgtable-64.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/pgtable-64.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/pgtable-64.h</a></div><div class='head'>diff --git a/include/asm-mips/pgtable-bits.h b/arch/mips/include/asm/pgtable-bits.h<br/>index 51b34a48c84a..51b34a48c84a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/pgtable-bits.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/pgtable-bits.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/pgtable-bits.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/pgtable-bits.h</a></div><div class='head'>diff --git a/include/asm-mips/pgtable.h b/arch/mips/include/asm/pgtable.h<br/>index 6a0edf72ffbc..6a0edf72ffbc 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/pgtable.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/pgtable.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/pgtable.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/pgtable.h</a></div><div class='head'>diff --git a/arch/mips/include/asm/pmc-sierra/msp71xx/gpio.h b/arch/mips/include/asm/pmc-sierra/msp71xx/gpio.h<br/>new file mode 100644<br/>index 000000000000..ebdbab973e41<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/pmc-sierra/msp71xx/gpio.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/pmc-sierra/msp71xx/gpio.h</a></div><div class='hunk'>@@ -0,0 +1,46 @@</div><div class='add'>+/*</div><div class='add'>+ * include/asm-mips/pmc-sierra/msp71xx/gpio.h</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * @author Patrick Glass &lt;patrickglass@gmail.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __PMC_MSP71XX_GPIO_H</div><div class='add'>+#define __PMC_MSP71XX_GPIO_H</div><div class='add'>+</div><div class='add'>+/* Max number of gpio's is 28 on chip plus 3 banks of I2C IO Expanders */</div><div class='add'>+#define ARCH_NR_GPIOS (28 + (3 * 8))</div><div class='add'>+</div><div class='add'>+/* new generic GPIO API - see Documentation/gpio.txt */</div><div class='add'>+#include &lt;asm-generic/gpio.h&gt;</div><div class='add'>+</div><div class='add'>+#define gpio_get_value	__gpio_get_value</div><div class='add'>+#define gpio_set_value	__gpio_set_value</div><div class='add'>+#define gpio_cansleep	__gpio_cansleep</div><div class='add'>+</div><div class='add'>+/* Setup calls for the gpio and gpio extended */</div><div class='add'>+extern void msp71xx_init_gpio(void);</div><div class='add'>+extern void msp71xx_init_gpio_extended(void);</div><div class='add'>+extern int msp71xx_set_output_drive(unsigned gpio, int value);</div><div class='add'>+</div><div class='add'>+/* Custom output drive functionss */</div><div class='add'>+static inline int gpio_set_output_drive(unsigned gpio, int value)</div><div class='add'>+{</div><div class='add'>+	return msp71xx_set_output_drive(gpio, value);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* IRQ's are not supported for gpio lines */</div><div class='add'>+static inline int gpio_to_irq(unsigned gpio)</div><div class='add'>+{</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int irq_to_gpio(unsigned irq)</div><div class='add'>+{</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* __PMC_MSP71XX_GPIO_H */</div><div class='head'>diff --git a/include/asm-mips/pmc-sierra/msp71xx/msp_cic_int.h b/arch/mips/include/asm/pmc-sierra/msp71xx/msp_cic_int.h<br/>index c84bcf9570b1..c84bcf9570b1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/pmc-sierra/msp71xx/msp_cic_int.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/pmc-sierra/msp71xx/msp_cic_int.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/pmc-sierra/msp71xx/msp_cic_int.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/pmc-sierra/msp71xx/msp_cic_int.h</a></div><div class='head'>diff --git a/include/asm-mips/pmc-sierra/msp71xx/msp_int.h b/arch/mips/include/asm/pmc-sierra/msp71xx/msp_int.h<br/>index 1d9f05474820..1d9f05474820 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/pmc-sierra/msp71xx/msp_int.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/pmc-sierra/msp71xx/msp_int.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/pmc-sierra/msp71xx/msp_int.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/pmc-sierra/msp71xx/msp_int.h</a></div><div class='head'>diff --git a/include/asm-mips/pmc-sierra/msp71xx/msp_pci.h b/arch/mips/include/asm/pmc-sierra/msp71xx/msp_pci.h<br/>index 415606903617..415606903617 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/pmc-sierra/msp71xx/msp_pci.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/pmc-sierra/msp71xx/msp_pci.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/pmc-sierra/msp71xx/msp_pci.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/pmc-sierra/msp71xx/msp_pci.h</a></div><div class='head'>diff --git a/include/asm-mips/pmc-sierra/msp71xx/msp_prom.h b/arch/mips/include/asm/pmc-sierra/msp71xx/msp_prom.h<br/>index 14ca7dc382a8..14ca7dc382a8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/pmc-sierra/msp71xx/msp_prom.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/pmc-sierra/msp71xx/msp_prom.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/pmc-sierra/msp71xx/msp_prom.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/pmc-sierra/msp71xx/msp_prom.h</a></div><div class='head'>diff --git a/include/asm-mips/pmc-sierra/msp71xx/msp_regops.h b/arch/mips/include/asm/pmc-sierra/msp71xx/msp_regops.h<br/>index 60a5a38dd5b2..60a5a38dd5b2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/pmc-sierra/msp71xx/msp_regops.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/pmc-sierra/msp71xx/msp_regops.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/pmc-sierra/msp71xx/msp_regops.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/pmc-sierra/msp71xx/msp_regops.h</a></div><div class='head'>diff --git a/include/asm-mips/pmc-sierra/msp71xx/msp_regs.h b/arch/mips/include/asm/pmc-sierra/msp71xx/msp_regs.h<br/>index 603eb737b4a8..603eb737b4a8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/pmc-sierra/msp71xx/msp_regs.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/pmc-sierra/msp71xx/msp_regs.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/pmc-sierra/msp71xx/msp_regs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/pmc-sierra/msp71xx/msp_regs.h</a></div><div class='head'>diff --git a/include/asm-mips/pmc-sierra/msp71xx/msp_slp_int.h b/arch/mips/include/asm/pmc-sierra/msp71xx/msp_slp_int.h<br/>index 96d4c8ce8c83..96d4c8ce8c83 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/pmc-sierra/msp71xx/msp_slp_int.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/pmc-sierra/msp71xx/msp_slp_int.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/pmc-sierra/msp71xx/msp_slp_int.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/pmc-sierra/msp71xx/msp_slp_int.h</a></div><div class='head'>diff --git a/include/asm-mips/pmc-sierra/msp71xx/war.h b/arch/mips/include/asm/pmc-sierra/msp71xx/war.h<br/>index 0bf48fc1892b..0bf48fc1892b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/pmc-sierra/msp71xx/war.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/pmc-sierra/msp71xx/war.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/pmc-sierra/msp71xx/war.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/pmc-sierra/msp71xx/war.h</a></div><div class='head'>diff --git a/include/asm-mips/pmon.h b/arch/mips/include/asm/pmon.h<br/>index 6ad519189ce2..6ad519189ce2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/pmon.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/pmon.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/pmon.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/pmon.h</a></div><div class='head'>diff --git a/include/asm-mips/poll.h b/arch/mips/include/asm/poll.h<br/>index 47b952080431..47b952080431 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/poll.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/poll.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/poll.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/poll.h</a></div><div class='head'>diff --git a/include/asm-mips/posix_types.h b/arch/mips/include/asm/posix_types.h<br/>index c200102c8586..c200102c8586 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/posix_types.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/posix_types.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/posix_types.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/posix_types.h</a></div><div class='head'>diff --git a/include/asm-mips/prefetch.h b/arch/mips/include/asm/prefetch.h<br/>index 17850834ccb0..17850834ccb0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/prefetch.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/prefetch.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/prefetch.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/prefetch.h</a></div><div class='head'>diff --git a/include/asm-mips/processor.h b/arch/mips/include/asm/processor.h<br/>index a1e4453469f9..18ee58e39445 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/processor.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/processor.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/processor.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/processor.h</a></div><div class='hunk'>@@ -105,6 +105,19 @@ struct mips_dsp_state {</div><div class='ctx'> 	{0,} \</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct mips3264_watch_reg_state {</div><div class='add'>+	/* The width of watchlo is 32 in a 32 bit kernel and 64 in a</div><div class='add'>+	   64 bit kernel.  We use unsigned long as it has the same</div><div class='add'>+	   property. */</div><div class='add'>+	unsigned long watchlo[NUM_WATCH_REGS];</div><div class='add'>+	/* Only the mask and IRW bits from watchhi. */</div><div class='add'>+	u16 watchhi[NUM_WATCH_REGS];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union mips_watch_reg_state {</div><div class='add'>+	struct mips3264_watch_reg_state mips3264;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> typedef struct {</div><div class='ctx'> 	unsigned long seg;</div><div class='ctx'> } mm_segment_t;</div><div class='hunk'>@@ -137,6 +150,9 @@ struct thread_struct {</div><div class='ctx'> 	/* Saved state of the DSP ASE, if available. */</div><div class='ctx'> 	struct mips_dsp_state dsp;</div><div class='ctx'> </div><div class='add'>+	/* Saved watch register state, if available. */</div><div class='add'>+	union mips_watch_reg_state watch;</div><div class='add'>+</div><div class='ctx'> 	/* Other stuff associated with the thread. */</div><div class='ctx'> 	unsigned long cp0_badvaddr;	/* Last user fault */</div><div class='ctx'> 	unsigned long cp0_baduaddr;	/* Last kernel fault accessing USEG */</div><div class='hunk'>@@ -193,6 +209,10 @@ struct thread_struct {</div><div class='ctx'> 		.dspcontrol	= 0,				\</div><div class='ctx'> 	},							\</div><div class='ctx'> 	/*							\</div><div class='add'>+	 * saved watch register stuff				\</div><div class='add'>+	 */							\</div><div class='add'>+	.watch = {{{0,},},},					\</div><div class='add'>+	/*							\</div><div class='ctx'> 	 * Other stuff associated with the process		\</div><div class='ctx'> 	 */							\</div><div class='ctx'> 	.cp0_badvaddr		= 0,				\</div><div class='head'>diff --git a/include/asm-mips/ptrace.h b/arch/mips/include/asm/ptrace.h<br/>index 786f7e3c99bc..9c22571b160d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/ptrace.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/ptrace.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/ptrace.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/ptrace.h</a></div><div class='hunk'>@@ -9,6 +9,9 @@</div><div class='ctx'> #ifndef _ASM_PTRACE_H</div><div class='ctx'> #define _ASM_PTRACE_H</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_64BIT</div><div class='add'>+#define __ARCH_WANT_COMPAT_SYS_PTRACE</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> /* 0 - 31 are integer registers, 32 - 63 are fp registers.  */</div><div class='ctx'> #define FPR_BASE	32</div><div class='hunk'>@@ -71,11 +74,63 @@ struct pt_regs {</div><div class='ctx'> #define PTRACE_POKEDATA_3264	0xc3</div><div class='ctx'> #define PTRACE_GET_THREAD_AREA_3264	0xc4</div><div class='ctx'> </div><div class='add'>+/* Read and write watchpoint registers.  */</div><div class='add'>+enum pt_watch_style {</div><div class='add'>+	pt_watch_style_mips32,</div><div class='add'>+	pt_watch_style_mips64</div><div class='add'>+};</div><div class='add'>+struct mips32_watch_regs {</div><div class='add'>+	uint32_t watchlo[8];</div><div class='add'>+	/* Lower 16 bits of watchhi. */</div><div class='add'>+	uint16_t watchhi[8];</div><div class='add'>+	/* Valid mask and I R W bits.</div><div class='add'>+	 * bit 0 -- 1 if W bit is usable.</div><div class='add'>+	 * bit 1 -- 1 if R bit is usable.</div><div class='add'>+	 * bit 2 -- 1 if I bit is usable.</div><div class='add'>+	 * bits 3 - 11 -- Valid watchhi mask bits.</div><div class='add'>+	 */</div><div class='add'>+	uint16_t watch_masks[8];</div><div class='add'>+	/* The number of valid watch register pairs.  */</div><div class='add'>+	uint32_t num_valid;</div><div class='add'>+} __attribute__((aligned(8)));</div><div class='add'>+</div><div class='add'>+struct mips64_watch_regs {</div><div class='add'>+	uint64_t watchlo[8];</div><div class='add'>+	uint16_t watchhi[8];</div><div class='add'>+	uint16_t watch_masks[8];</div><div class='add'>+	uint32_t num_valid;</div><div class='add'>+} __attribute__((aligned(8)));</div><div class='add'>+</div><div class='add'>+struct pt_watch_regs {</div><div class='add'>+	enum pt_watch_style style;</div><div class='add'>+	union {</div><div class='add'>+		struct mips32_watch_regs mips32;</div><div class='add'>+		struct mips32_watch_regs mips64;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define PTRACE_GET_WATCH_REGS	0xd0</div><div class='add'>+#define PTRACE_SET_WATCH_REGS	0xd1</div><div class='add'>+</div><div class='ctx'> #ifdef __KERNEL__</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/compiler.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/isadep.h&gt;</div><div class='ctx'> </div><div class='add'>+struct task_struct;</div><div class='add'>+</div><div class='add'>+extern int ptrace_getregs(struct task_struct *child, __s64 __user *data);</div><div class='add'>+extern int ptrace_setregs(struct task_struct *child, __s64 __user *data);</div><div class='add'>+</div><div class='add'>+extern int ptrace_getfpregs(struct task_struct *child, __u32 __user *data);</div><div class='add'>+extern int ptrace_setfpregs(struct task_struct *child, __u32 __user *data);</div><div class='add'>+</div><div class='add'>+extern int ptrace_get_watch_regs(struct task_struct *child,</div><div class='add'>+	struct pt_watch_regs __user *addr);</div><div class='add'>+extern int ptrace_set_watch_regs(struct task_struct *child,</div><div class='add'>+	struct pt_watch_regs __user *addr);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Does the process account for user or for system time?</div><div class='ctx'>  */</div><div class='head'>diff --git a/include/asm-mips/r4k-timer.h b/arch/mips/include/asm/r4k-timer.h<br/>index a37d12b3b61c..a37d12b3b61c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/r4k-timer.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/r4k-timer.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/r4k-timer.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/r4k-timer.h</a></div><div class='head'>diff --git a/include/asm-mips/r4kcache.h b/arch/mips/include/asm/r4kcache.h<br/>index 4c140db36786..4c140db36786 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/r4kcache.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/r4kcache.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/r4kcache.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/r4kcache.h</a></div><div class='head'>diff --git a/include/asm-mips/reboot.h b/arch/mips/include/asm/reboot.h<br/>index e48c0bfab257..e48c0bfab257 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/reboot.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/reboot.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/reboot.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/reboot.h</a></div><div class='head'>diff --git a/include/asm-mips/reg.h b/arch/mips/include/asm/reg.h<br/>index 634b55d7e7f6..634b55d7e7f6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/reg.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/reg.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/reg.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/reg.h</a></div><div class='head'>diff --git a/include/asm-mips/regdef.h b/arch/mips/include/asm/regdef.h<br/>index 7c8ecb6b9c40..7c8ecb6b9c40 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/regdef.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/regdef.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/regdef.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/regdef.h</a></div><div class='head'>diff --git a/include/asm-mips/resource.h b/arch/mips/include/asm/resource.h<br/>index 87cb3085269c..87cb3085269c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/resource.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/resource.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/resource.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/resource.h</a></div><div class='head'>diff --git a/include/asm-mips/rm9k-ocd.h b/arch/mips/include/asm/rm9k-ocd.h<br/>index b0b80d9ecf96..b0b80d9ecf96 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/rm9k-ocd.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/rm9k-ocd.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/rm9k-ocd.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/rm9k-ocd.h</a></div><div class='head'>diff --git a/include/asm-mips/rtlx.h b/arch/mips/include/asm/rtlx.h<br/>index 4ca3063ed2ce..4ca3063ed2ce 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/rtlx.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/rtlx.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/rtlx.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/rtlx.h</a></div><div class='head'>diff --git a/include/asm-mips/scatterlist.h b/arch/mips/include/asm/scatterlist.h<br/>index 83d69fe17c9f..83d69fe17c9f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/scatterlist.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/scatterlist.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/scatterlist.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/scatterlist.h</a></div><div class='head'>diff --git a/include/asm-mips/seccomp.h b/arch/mips/include/asm/seccomp.h<br/>index 36ed44070256..36ed44070256 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/seccomp.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/seccomp.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/seccomp.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/seccomp.h</a></div><div class='head'>diff --git a/include/asm-mips/sections.h b/arch/mips/include/asm/sections.h<br/>index b7e37262c246..b7e37262c246 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/sections.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/sections.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/sections.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sections.h</a></div><div class='head'>diff --git a/include/asm-mips/segment.h b/arch/mips/include/asm/segment.h<br/>index 92ac001fc483..92ac001fc483 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/segment.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/segment.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/segment.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/segment.h</a></div><div class='head'>diff --git a/include/asm-mips/sembuf.h b/arch/mips/include/asm/sembuf.h<br/>index 7281a4decaa0..7281a4decaa0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/sembuf.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/sembuf.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/sembuf.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sembuf.h</a></div><div class='head'>diff --git a/include/asm-mips/serial.h b/arch/mips/include/asm/serial.h<br/>index c07ebd8eb9e7..c07ebd8eb9e7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/serial.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/serial.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/serial.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/serial.h</a></div><div class='head'>diff --git a/include/asm-mips/setup.h b/arch/mips/include/asm/setup.h<br/>index e600cedda976..e600cedda976 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/setup.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/setup.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/setup.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/setup.h</a></div><div class='head'>diff --git a/include/asm-mips/sgi/gio.h b/arch/mips/include/asm/sgi/gio.h<br/>index 889cf028c95d..889cf028c95d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/sgi/gio.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/sgi/gio.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/sgi/gio.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sgi/gio.h</a></div><div class='head'>diff --git a/include/asm-mips/sgi/hpc3.h b/arch/mips/include/asm/sgi/hpc3.h<br/>index c4729f531919..c4729f531919 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/sgi/hpc3.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/sgi/hpc3.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/sgi/hpc3.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sgi/hpc3.h</a></div><div class='head'>diff --git a/include/asm-mips/sgi/ioc.h b/arch/mips/include/asm/sgi/ioc.h<br/>index 343ed15f8dc4..343ed15f8dc4 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/sgi/ioc.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/sgi/ioc.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/sgi/ioc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sgi/ioc.h</a></div><div class='head'>diff --git a/include/asm-mips/sgi/ip22.h b/arch/mips/include/asm/sgi/ip22.h<br/>index c0501f91719b..c0501f91719b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/sgi/ip22.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/sgi/ip22.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/sgi/ip22.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sgi/ip22.h</a></div><div class='head'>diff --git a/include/asm-mips/sgi/mc.h b/arch/mips/include/asm/sgi/mc.h<br/>index 1576c2394de8..1576c2394de8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/sgi/mc.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/sgi/mc.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/sgi/mc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sgi/mc.h</a></div><div class='head'>diff --git a/include/asm-mips/sgi/pi1.h b/arch/mips/include/asm/sgi/pi1.h<br/>index c9506915dc5c..c9506915dc5c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/sgi/pi1.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/sgi/pi1.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/sgi/pi1.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sgi/pi1.h</a></div><div class='head'>diff --git a/include/asm-mips/sgi/seeq.h b/arch/mips/include/asm/sgi/seeq.h<br/>index af0ffd76899d..af0ffd76899d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/sgi/seeq.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/sgi/seeq.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/sgi/seeq.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sgi/seeq.h</a></div><div class='head'>diff --git a/include/asm-mips/sgi/sgi.h b/arch/mips/include/asm/sgi/sgi.h<br/>index 645cea7c0f8e..645cea7c0f8e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/sgi/sgi.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/sgi/sgi.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/sgi/sgi.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sgi/sgi.h</a></div><div class='head'>diff --git a/include/asm-mips/sgi/wd.h b/arch/mips/include/asm/sgi/wd.h<br/>index 0d6c3a4da891..0d6c3a4da891 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/sgi/wd.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/sgi/wd.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/sgi/wd.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sgi/wd.h</a></div><div class='head'>diff --git a/include/asm-mips/sgialib.h b/arch/mips/include/asm/sgialib.h<br/>index bfce5c786f1c..bfce5c786f1c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/sgialib.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/sgialib.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/sgialib.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sgialib.h</a></div><div class='head'>diff --git a/include/asm-mips/sgiarcs.h b/arch/mips/include/asm/sgiarcs.h<br/>index 721327f88601..721327f88601 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/sgiarcs.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/sgiarcs.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/sgiarcs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sgiarcs.h</a></div><div class='head'>diff --git a/include/asm-mips/sgidefs.h b/arch/mips/include/asm/sgidefs.h<br/>index 876442fcfb32..876442fcfb32 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/sgidefs.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/sgidefs.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/sgidefs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sgidefs.h</a></div><div class='head'>diff --git a/include/asm-mips/shmbuf.h b/arch/mips/include/asm/shmbuf.h<br/>index f994438277bf..f994438277bf 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/shmbuf.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/shmbuf.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/shmbuf.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/shmbuf.h</a></div><div class='head'>diff --git a/include/asm-mips/shmparam.h b/arch/mips/include/asm/shmparam.h<br/>index 09290720751c..09290720751c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/shmparam.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/shmparam.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/shmparam.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/shmparam.h</a></div><div class='head'>diff --git a/include/asm-mips/sibyte/bcm1480_int.h b/arch/mips/include/asm/sibyte/bcm1480_int.h<br/>index 6109557c14e9..6109557c14e9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/sibyte/bcm1480_int.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/sibyte/bcm1480_int.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/sibyte/bcm1480_int.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sibyte/bcm1480_int.h</a></div><div class='head'>diff --git a/include/asm-mips/sibyte/bcm1480_l2c.h b/arch/mips/include/asm/sibyte/bcm1480_l2c.h<br/>index fd75817f7ac4..fd75817f7ac4 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/sibyte/bcm1480_l2c.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/sibyte/bcm1480_l2c.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/sibyte/bcm1480_l2c.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sibyte/bcm1480_l2c.h</a></div><div class='head'>diff --git a/include/asm-mips/sibyte/bcm1480_mc.h b/arch/mips/include/asm/sibyte/bcm1480_mc.h<br/>index f26a41a82b59..f26a41a82b59 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/sibyte/bcm1480_mc.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/sibyte/bcm1480_mc.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/sibyte/bcm1480_mc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sibyte/bcm1480_mc.h</a></div><div class='head'>diff --git a/include/asm-mips/sibyte/bcm1480_regs.h b/arch/mips/include/asm/sibyte/bcm1480_regs.h<br/>index b4077bb72611..b4077bb72611 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/sibyte/bcm1480_regs.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/sibyte/bcm1480_regs.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/sibyte/bcm1480_regs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sibyte/bcm1480_regs.h</a></div><div class='head'>diff --git a/include/asm-mips/sibyte/bcm1480_scd.h b/arch/mips/include/asm/sibyte/bcm1480_scd.h<br/>index 25ef24cbb92a..25ef24cbb92a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/sibyte/bcm1480_scd.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/sibyte/bcm1480_scd.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/sibyte/bcm1480_scd.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sibyte/bcm1480_scd.h</a></div><div class='head'>diff --git a/include/asm-mips/sibyte/bigsur.h b/arch/mips/include/asm/sibyte/bigsur.h<br/>index ebefe797fc1d..ebefe797fc1d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/sibyte/bigsur.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/sibyte/bigsur.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/sibyte/bigsur.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sibyte/bigsur.h</a></div><div class='head'>diff --git a/include/asm-mips/sibyte/board.h b/arch/mips/include/asm/sibyte/board.h<br/>index 25372ae0e814..25372ae0e814 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/sibyte/board.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/sibyte/board.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/sibyte/board.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sibyte/board.h</a></div><div class='head'>diff --git a/include/asm-mips/sibyte/carmel.h b/arch/mips/include/asm/sibyte/carmel.h<br/>index 11cad71323e8..11cad71323e8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/sibyte/carmel.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/sibyte/carmel.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/sibyte/carmel.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sibyte/carmel.h</a></div><div class='head'>diff --git a/include/asm-mips/sibyte/sb1250.h b/arch/mips/include/asm/sibyte/sb1250.h<br/>index 80c1a052662a..80c1a052662a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/sibyte/sb1250.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/sibyte/sb1250.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/sibyte/sb1250.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sibyte/sb1250.h</a></div><div class='head'>diff --git a/include/asm-mips/sibyte/sb1250_defs.h b/arch/mips/include/asm/sibyte/sb1250_defs.h<br/>index 09365f9111fa..09365f9111fa 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/sibyte/sb1250_defs.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/sibyte/sb1250_defs.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/sibyte/sb1250_defs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sibyte/sb1250_defs.h</a></div><div class='head'>diff --git a/include/asm-mips/sibyte/sb1250_dma.h b/arch/mips/include/asm/sibyte/sb1250_dma.h<br/>index bad56171d747..bad56171d747 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/sibyte/sb1250_dma.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/sibyte/sb1250_dma.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/sibyte/sb1250_dma.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sibyte/sb1250_dma.h</a></div><div class='head'>diff --git a/include/asm-mips/sibyte/sb1250_genbus.h b/arch/mips/include/asm/sibyte/sb1250_genbus.h<br/>index 94e9c7c8e783..94e9c7c8e783 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/sibyte/sb1250_genbus.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/sibyte/sb1250_genbus.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/sibyte/sb1250_genbus.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sibyte/sb1250_genbus.h</a></div><div class='head'>diff --git a/include/asm-mips/sibyte/sb1250_int.h b/arch/mips/include/asm/sibyte/sb1250_int.h<br/>index f2850b4bcfd4..f2850b4bcfd4 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/sibyte/sb1250_int.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/sibyte/sb1250_int.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/sibyte/sb1250_int.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sibyte/sb1250_int.h</a></div><div class='head'>diff --git a/include/asm-mips/sibyte/sb1250_l2c.h b/arch/mips/include/asm/sibyte/sb1250_l2c.h<br/>index 6554dcf05cfe..6554dcf05cfe 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/sibyte/sb1250_l2c.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/sibyte/sb1250_l2c.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/sibyte/sb1250_l2c.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sibyte/sb1250_l2c.h</a></div><div class='head'>diff --git a/include/asm-mips/sibyte/sb1250_ldt.h b/arch/mips/include/asm/sibyte/sb1250_ldt.h<br/>index 081e8b1c4ad0..081e8b1c4ad0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/sibyte/sb1250_ldt.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/sibyte/sb1250_ldt.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/sibyte/sb1250_ldt.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sibyte/sb1250_ldt.h</a></div><div class='head'>diff --git a/include/asm-mips/sibyte/sb1250_mac.h b/arch/mips/include/asm/sibyte/sb1250_mac.h<br/>index b6faf08ca81d..b6faf08ca81d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/sibyte/sb1250_mac.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/sibyte/sb1250_mac.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/sibyte/sb1250_mac.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sibyte/sb1250_mac.h</a></div><div class='head'>diff --git a/include/asm-mips/sibyte/sb1250_mc.h b/arch/mips/include/asm/sibyte/sb1250_mc.h<br/>index 1eb1b5a88736..1eb1b5a88736 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/sibyte/sb1250_mc.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/sibyte/sb1250_mc.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/sibyte/sb1250_mc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sibyte/sb1250_mc.h</a></div><div class='head'>diff --git a/include/asm-mips/sibyte/sb1250_regs.h b/arch/mips/include/asm/sibyte/sb1250_regs.h<br/>index 8f53ec817a5e..8f53ec817a5e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/sibyte/sb1250_regs.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/sibyte/sb1250_regs.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/sibyte/sb1250_regs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sibyte/sb1250_regs.h</a></div><div class='head'>diff --git a/include/asm-mips/sibyte/sb1250_scd.h b/arch/mips/include/asm/sibyte/sb1250_scd.h<br/>index e49c3e89b5ee..e49c3e89b5ee 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/sibyte/sb1250_scd.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/sibyte/sb1250_scd.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/sibyte/sb1250_scd.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sibyte/sb1250_scd.h</a></div><div class='head'>diff --git a/include/asm-mips/sibyte/sb1250_smbus.h b/arch/mips/include/asm/sibyte/sb1250_smbus.h<br/>index 04769923cf1e..04769923cf1e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/sibyte/sb1250_smbus.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/sibyte/sb1250_smbus.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/sibyte/sb1250_smbus.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sibyte/sb1250_smbus.h</a></div><div class='head'>diff --git a/include/asm-mips/sibyte/sb1250_syncser.h b/arch/mips/include/asm/sibyte/sb1250_syncser.h<br/>index d4b8558e0bf1..d4b8558e0bf1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/sibyte/sb1250_syncser.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/sibyte/sb1250_syncser.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/sibyte/sb1250_syncser.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sibyte/sb1250_syncser.h</a></div><div class='head'>diff --git a/include/asm-mips/sibyte/sb1250_uart.h b/arch/mips/include/asm/sibyte/sb1250_uart.h<br/>index d835bf280140..d835bf280140 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/sibyte/sb1250_uart.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/sibyte/sb1250_uart.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/sibyte/sb1250_uart.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sibyte/sb1250_uart.h</a></div><div class='head'>diff --git a/include/asm-mips/sibyte/sentosa.h b/arch/mips/include/asm/sibyte/sentosa.h<br/>index 64c47874f32d..64c47874f32d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/sibyte/sentosa.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/sibyte/sentosa.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/sibyte/sentosa.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sibyte/sentosa.h</a></div><div class='head'>diff --git a/include/asm-mips/sibyte/swarm.h b/arch/mips/include/asm/sibyte/swarm.h<br/>index 114d9d29ca9d..114d9d29ca9d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/sibyte/swarm.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/sibyte/swarm.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/sibyte/swarm.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sibyte/swarm.h</a></div><div class='head'>diff --git a/include/asm-mips/sigcontext.h b/arch/mips/include/asm/sigcontext.h<br/>index 9ce0607d7a4e..9ce0607d7a4e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/sigcontext.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/sigcontext.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/sigcontext.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sigcontext.h</a></div><div class='head'>diff --git a/include/asm-mips/siginfo.h b/arch/mips/include/asm/siginfo.h<br/>index 96e28f18dad1..96e28f18dad1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/siginfo.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/siginfo.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/siginfo.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/siginfo.h</a></div><div class='head'>diff --git a/include/asm-mips/signal.h b/arch/mips/include/asm/signal.h<br/>index bee5153aca48..bee5153aca48 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/signal.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/signal.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/signal.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/signal.h</a></div><div class='head'>diff --git a/include/asm-mips/sim.h b/arch/mips/include/asm/sim.h<br/>index 0cd719fabb51..0cd719fabb51 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/sim.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/sim.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/sim.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sim.h</a></div><div class='head'>diff --git a/include/asm-mips/smp-ops.h b/arch/mips/include/asm/smp-ops.h<br/>index 43c207e72a63..43c207e72a63 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/smp-ops.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/smp-ops.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/smp-ops.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/smp-ops.h</a></div><div class='head'>diff --git a/include/asm-mips/smp.h b/arch/mips/include/asm/smp.h<br/>index 0ff5b523ea77..0ff5b523ea77 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/smp.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/smp.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/smp.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/smp.h</a></div><div class='head'>diff --git a/include/asm-mips/smtc.h b/arch/mips/include/asm/smtc.h<br/>index ea60bf08dcb0..ea60bf08dcb0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/smtc.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/smtc.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/smtc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/smtc.h</a></div><div class='head'>diff --git a/include/asm-mips/smtc_ipi.h b/arch/mips/include/asm/smtc_ipi.h<br/>index 8ce517574340..8ce517574340 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/smtc_ipi.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/smtc_ipi.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/smtc_ipi.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/smtc_ipi.h</a></div><div class='head'>diff --git a/include/asm-mips/smtc_proc.h b/arch/mips/include/asm/smtc_proc.h<br/>index 25da651f1f5f..25da651f1f5f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/smtc_proc.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/smtc_proc.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/smtc_proc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/smtc_proc.h</a></div><div class='head'>diff --git a/include/asm-mips/smvp.h b/arch/mips/include/asm/smvp.h<br/>index 0d0e80a39e8a..0d0e80a39e8a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/smvp.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/smvp.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/smvp.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/smvp.h</a></div><div class='head'>diff --git a/include/asm-mips/sn/addrs.h b/arch/mips/include/asm/sn/addrs.h<br/>index fec9bdd34913..fec9bdd34913 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/sn/addrs.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/sn/addrs.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/sn/addrs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sn/addrs.h</a></div><div class='head'>diff --git a/include/asm-mips/sn/agent.h b/arch/mips/include/asm/sn/agent.h<br/>index ac4ea85c3a5c..ac4ea85c3a5c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/sn/agent.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/sn/agent.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/sn/agent.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sn/agent.h</a></div><div class='head'>diff --git a/include/asm-mips/sn/arch.h b/arch/mips/include/asm/sn/arch.h<br/>index bd75945e10ff..bd75945e10ff 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/sn/arch.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/sn/arch.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/sn/arch.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sn/arch.h</a></div><div class='head'>diff --git a/include/asm-mips/sn/fru.h b/arch/mips/include/asm/sn/fru.h<br/>index b3e3606723b7..b3e3606723b7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/sn/fru.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/sn/fru.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/sn/fru.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sn/fru.h</a></div><div class='head'>diff --git a/include/asm-mips/sn/gda.h b/arch/mips/include/asm/sn/gda.h<br/>index 9cb6ff770915..9cb6ff770915 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/sn/gda.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/sn/gda.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/sn/gda.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sn/gda.h</a></div><div class='head'>diff --git a/include/asm-mips/sn/hub.h b/arch/mips/include/asm/sn/hub.h<br/>index 1992d9254a08..1992d9254a08 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/sn/hub.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/sn/hub.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/sn/hub.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sn/hub.h</a></div><div class='head'>diff --git a/include/asm-mips/sn/intr.h b/arch/mips/include/asm/sn/intr.h<br/>index 6718b644b970..6718b644b970 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/sn/intr.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/sn/intr.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/sn/intr.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sn/intr.h</a></div><div class='head'>diff --git a/include/asm-mips/sn/io.h b/arch/mips/include/asm/sn/io.h<br/>index 24c6775fbb0f..24c6775fbb0f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/sn/io.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/sn/io.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/sn/io.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sn/io.h</a></div><div class='head'>diff --git a/include/asm-mips/sn/ioc3.h b/arch/mips/include/asm/sn/ioc3.h<br/>index 099677774d71..099677774d71 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/sn/ioc3.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/sn/ioc3.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/sn/ioc3.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sn/ioc3.h</a></div><div class='head'>diff --git a/include/asm-mips/sn/klconfig.h b/arch/mips/include/asm/sn/klconfig.h<br/>index 96cfd2ab1bcd..09e590daca17 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/sn/klconfig.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/sn/klconfig.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/sn/klconfig.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sn/klconfig.h</a></div><div class='hunk'>@@ -425,7 +425,7 @@ typedef struct lboard_s {</div><div class='ctx'> 	unsigned char 	brd_sversion;     /* version of this structure */</div><div class='ctx'>         unsigned char 	brd_brevision;    /* board revision */</div><div class='ctx'>         unsigned char 	brd_promver;      /* board prom version, if any */</div><div class='del'>- 	unsigned char 	brd_flags;        /* Enabled, Disabled etc */</div><div class='add'>+	unsigned char 	brd_flags;        /* Enabled, Disabled etc */</div><div class='ctx'> 	unsigned char 	brd_slot;         /* slot number */</div><div class='ctx'> 	unsigned short	brd_debugsw;      /* Debug switches */</div><div class='ctx'> 	moduleid_t	brd_module;       /* module to which it belongs */</div><div class='hunk'>@@ -595,9 +595,9 @@ typedef struct klcpu_s {                          /* CPU */</div><div class='ctx'> 	klinfo_t 	cpu_info;</div><div class='ctx'> 	unsigned short 	cpu_prid;	/* Processor PRID value */</div><div class='ctx'> 	unsigned short 	cpu_fpirr;	/* FPU IRR value */</div><div class='del'>-    	unsigned short 	cpu_speed;	/* Speed in MHZ */</div><div class='del'>-    	unsigned short 	cpu_scachesz;	/* secondary cache size in MB */</div><div class='del'>-    	unsigned short 	cpu_scachespeed;/* secondary cache speed in MHz */</div><div class='add'>+	unsigned short 	cpu_speed;	/* Speed in MHZ */</div><div class='add'>+	unsigned short 	cpu_scachesz;	/* secondary cache size in MB */</div><div class='add'>+	unsigned short 	cpu_scachespeed;/* secondary cache speed in MHz */</div><div class='ctx'> } klcpu_t ;</div><div class='ctx'> </div><div class='ctx'> #define CPU_STRUCT_VERSION   2</div><div class='hunk'>@@ -621,7 +621,7 @@ typedef struct klhub_uart_s {			/* HUB */</div><div class='ctx'> </div><div class='ctx'> typedef struct klmembnk_s {			/* MEMORY BANK */</div><div class='ctx'> 	klinfo_t 	membnk_info;</div><div class='del'>-    	short 		membnk_memsz;		/* Total memory in megabytes */</div><div class='add'>+	short 		membnk_memsz;		/* Total memory in megabytes */</div><div class='ctx'> 	short		membnk_dimm_select; /* bank to physical addr mapping*/</div><div class='ctx'> 	short		membnk_bnksz[MD_MEM_BANKS]; /* Memory bank sizes */</div><div class='ctx'> 	short		membnk_attr;</div><div class='hunk'>@@ -657,7 +657,7 @@ typedef struct klmod_serial_num_s {</div><div class='ctx'> </div><div class='ctx'> typedef struct klxbow_s {                          /* XBOW */</div><div class='ctx'> 	klinfo_t 	xbow_info ;</div><div class='del'>-    	klport_t	xbow_port_info[MAX_XBOW_LINKS] ; /* Module number */</div><div class='add'>+	klport_t	xbow_port_info[MAX_XBOW_LINKS] ; /* Module number */</div><div class='ctx'>         int		xbow_master_hub_link;</div><div class='ctx'>         /* type of brd connected+component struct ptr+flags */</div><div class='ctx'> } klxbow_t ;</div><div class='hunk'>@@ -673,9 +673,9 @@ typedef struct klpci_device_s {</div><div class='ctx'> </div><div class='ctx'> typedef struct klbri_s {                          /* BRIDGE */</div><div class='ctx'> 	klinfo_t 	bri_info ;</div><div class='del'>-    	unsigned char	bri_eprominfo ;    /* IO6prom connected to bridge */</div><div class='del'>-    	unsigned char	bri_bustype ;      /* PCI/VME BUS bridge/GIO */</div><div class='del'>-    	pci_t    	pci_specific  ;    /* PCI Board config info */</div><div class='add'>+	unsigned char	bri_eprominfo ;    /* IO6prom connected to bridge */</div><div class='add'>+	unsigned char	bri_bustype ;      /* PCI/VME BUS bridge/GIO */</div><div class='add'>+	pci_t    	pci_specific  ;    /* PCI Board config info */</div><div class='ctx'> 	klpci_device_t	bri_devices[MAX_PCI_DEVS] ;	/* PCI IDs */</div><div class='ctx'> 	klconf_off_t	bri_mfg_nic ;</div><div class='ctx'> } klbri_t ;</div><div class='hunk'>@@ -684,9 +684,9 @@ typedef struct klbri_s {                          /* BRIDGE */</div><div class='ctx'> </div><div class='ctx'> typedef struct klioc3_s {                          /* IOC3 */</div><div class='ctx'> 	klinfo_t 	ioc3_info ;</div><div class='del'>-    	unsigned char	ioc3_ssram ;        /* Info about ssram */</div><div class='del'>-    	unsigned char	ioc3_nvram ;        /* Info about nvram */</div><div class='del'>-    	klinfo_t	ioc3_superio ;      /* Info about superio */</div><div class='add'>+	unsigned char	ioc3_ssram ;        /* Info about ssram */</div><div class='add'>+	unsigned char	ioc3_nvram ;        /* Info about nvram */</div><div class='add'>+	klinfo_t	ioc3_superio ;      /* Info about superio */</div><div class='ctx'> 	klconf_off_t	ioc3_tty_off ;</div><div class='ctx'> 	klinfo_t	ioc3_enet ;</div><div class='ctx'> 	klconf_off_t	ioc3_enet_off ;</div><div class='hunk'>@@ -698,13 +698,13 @@ typedef struct klioc3_s {                          /* IOC3 */</div><div class='ctx'> typedef struct klvmeb_s {                          /* VME BRIDGE - PCI CTLR */</div><div class='ctx'> 	klinfo_t 	vmeb_info ;</div><div class='ctx'> 	vmeb_t		vmeb_specific ;</div><div class='del'>-    	klconf_off_t   	vmeb_brdinfo[MAX_VME_SLOTS]   ;    /* VME Board config info */</div><div class='add'>+	klconf_off_t   	vmeb_brdinfo[MAX_VME_SLOTS]   ;    /* VME Board config info */</div><div class='ctx'> } klvmeb_t ;</div><div class='ctx'> </div><div class='ctx'> typedef struct klvmed_s {                          /* VME DEVICE - VME BOARD */</div><div class='ctx'> 	klinfo_t	vmed_info ;</div><div class='ctx'> 	vmed_t		vmed_specific ;</div><div class='del'>-    	klconf_off_t   	vmed_brdinfo[MAX_VME_SLOTS]   ;    /* VME Board config info */</div><div class='add'>+	klconf_off_t   	vmed_brdinfo[MAX_VME_SLOTS]   ;    /* VME Board config info */</div><div class='ctx'> } klvmed_t ;</div><div class='ctx'> </div><div class='ctx'> #define ROUTER_VECTOR_VERS	2</div><div class='hunk'>@@ -714,7 +714,7 @@ typedef struct klrou_s {                          /* ROUTER */</div><div class='ctx'> 	klinfo_t 	rou_info ;</div><div class='ctx'> 	unsigned int		rou_flags ;           /* PCFG_ROUTER_xxx flags */</div><div class='ctx'> 	nic_t		rou_box_nic ;         /* nic of the containing module */</div><div class='del'>-    	klport_t 	rou_port[MAX_ROUTER_PORTS + 1] ; /* array index 1 to 6 */</div><div class='add'>+	klport_t 	rou_port[MAX_ROUTER_PORTS + 1] ; /* array index 1 to 6 */</div><div class='ctx'> 	klconf_off_t	rou_mfg_nic ;     /* MFG NIC string */</div><div class='ctx'> 	u64	rou_vector;	  /* vector from master node */</div><div class='ctx'> } klrou_t ;</div><div class='hunk'>@@ -769,7 +769,7 @@ typedef struct klgsn_s {                     /* GSN board */</div><div class='ctx'> </div><div class='ctx'> typedef struct klscsi_s {                          /* SCSI Controller */</div><div class='ctx'> 	klinfo_t 	scsi_info ;</div><div class='del'>-    	scsi_t       	scsi_specific   ;</div><div class='add'>+	scsi_t       	scsi_specific   ;</div><div class='ctx'> 	unsigned char 	scsi_numdevs ;</div><div class='ctx'> 	klconf_off_t	scsi_devinfo[MAX_SCSI_DEVS] ;</div><div class='ctx'> } klscsi_t ;</div><div class='hunk'>@@ -803,13 +803,13 @@ typedef struct klmsdev_s {                          /* mouse device */</div><div class='ctx'> </div><div class='ctx'> typedef struct klfddi_s {                          /* FDDI */</div><div class='ctx'> 	klinfo_t 	fddi_info ;</div><div class='del'>-    	fddi_t        	fddi_specific ;</div><div class='add'>+	fddi_t        	fddi_specific ;</div><div class='ctx'> 	klconf_off_t	fddi_devinfo[MAX_FDDI_DEVS] ;</div><div class='ctx'> } klfddi_t ;</div><div class='ctx'> </div><div class='ctx'> typedef struct klmio_s {                          /* MIO */</div><div class='ctx'> 	klinfo_t 	mio_info ;</div><div class='del'>-    	mio_t       	mio_specific   ;</div><div class='add'>+	mio_t       	mio_specific   ;</div><div class='ctx'> } klmio_t ;</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-mips/sn/kldir.h b/arch/mips/include/asm/sn/kldir.h<br/>index 1327e12e9645..1327e12e9645 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/sn/kldir.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/sn/kldir.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/sn/kldir.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sn/kldir.h</a></div><div class='head'>diff --git a/include/asm-mips/sn/klkernvars.h b/arch/mips/include/asm/sn/klkernvars.h<br/>index 5de4c5e8ab30..5de4c5e8ab30 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/sn/klkernvars.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/sn/klkernvars.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/sn/klkernvars.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sn/klkernvars.h</a></div><div class='head'>diff --git a/include/asm-mips/sn/launch.h b/arch/mips/include/asm/sn/launch.h<br/>index b7c2226312c6..b7c2226312c6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/sn/launch.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/sn/launch.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/sn/launch.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sn/launch.h</a></div><div class='head'>diff --git a/include/asm-mips/sn/mapped_kernel.h b/arch/mips/include/asm/sn/mapped_kernel.h<br/>index 721496a0bb92..721496a0bb92 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/sn/mapped_kernel.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/sn/mapped_kernel.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/sn/mapped_kernel.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sn/mapped_kernel.h</a></div><div class='head'>diff --git a/include/asm-mips/sn/nmi.h b/arch/mips/include/asm/sn/nmi.h<br/>index 6b7b0b5f3729..6b7b0b5f3729 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/sn/nmi.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/sn/nmi.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/sn/nmi.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sn/nmi.h</a></div><div class='head'>diff --git a/include/asm-mips/sn/sn0/addrs.h b/arch/mips/include/asm/sn/sn0/addrs.h<br/>index b06190093bbc..b06190093bbc 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/sn/sn0/addrs.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/sn/sn0/addrs.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/sn/sn0/addrs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sn/sn0/addrs.h</a></div><div class='head'>diff --git a/include/asm-mips/sn/sn0/arch.h b/arch/mips/include/asm/sn/sn0/arch.h<br/>index f734f2007f24..f734f2007f24 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/sn/sn0/arch.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/sn/sn0/arch.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/sn/sn0/arch.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sn/sn0/arch.h</a></div><div class='head'>diff --git a/include/asm-mips/sn/sn0/hub.h b/arch/mips/include/asm/sn/sn0/hub.h<br/>index 3e228f8e7969..3e228f8e7969 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/sn/sn0/hub.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/sn/sn0/hub.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/sn/sn0/hub.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sn/sn0/hub.h</a></div><div class='head'>diff --git a/include/asm-mips/sn/sn0/hubio.h b/arch/mips/include/asm/sn/sn0/hubio.h<br/>index 0187895e556c..d0c29d4de084 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/sn/sn0/hubio.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/sn/sn0/hubio.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/sn/sn0/hubio.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sn/sn0/hubio.h</a></div><div class='hunk'>@@ -175,10 +175,10 @@ typedef union hubii_wid_u {</div><div class='ctx'> 	u64	wid_reg_value;</div><div class='ctx'> 	struct {</div><div class='ctx'> 		u64 	wid_rsvd: 	32,	/* unused */</div><div class='del'>-                   	wid_rev_num:	 4,	/* revision number */</div><div class='del'>-                   	wid_part_num:	16,	/* the widget type: hub=c101 */</div><div class='del'>-                   	wid_mfg_num:	11,	/* Manufacturer id (IBM) */</div><div class='del'>-                   	wid_rsvd1:	 1;	/* Reserved */</div><div class='add'>+			wid_rev_num:	 4,	/* revision number */</div><div class='add'>+			wid_part_num:	16,	/* the widget type: hub=c101 */</div><div class='add'>+			wid_mfg_num:	11,	/* Manufacturer id (IBM) */</div><div class='add'>+			wid_rsvd1:	 1;	/* Reserved */</div><div class='ctx'>         } wid_fields_s;</div><div class='ctx'> } hubii_wid_t;</div><div class='ctx'> </div><div class='hunk'>@@ -187,13 +187,13 @@ typedef union hubii_wcr_u {</div><div class='ctx'> 	u64	wcr_reg_value;</div><div class='ctx'> 	struct {</div><div class='ctx'> 		u64 	wcr_rsvd: 	41,	/* unused */</div><div class='del'>-                   	wcr_e_thresh:	 5,	/* elasticity threshold */</div><div class='add'>+			wcr_e_thresh:	 5,	/* elasticity threshold */</div><div class='ctx'> 			wcr_dir_con:	 1,	/* widget direct connect */</div><div class='del'>-                   	wcr_f_bad_pkt:	 1,	/* Force bad llp pkt enable */</div><div class='del'>-                   	wcr_xbar_crd:	 3,	/* LLP crossbar credit */</div><div class='del'>-                   	wcr_rsvd1:	 8,	/* Reserved */</div><div class='add'>+			wcr_f_bad_pkt:	 1,	/* Force bad llp pkt enable */</div><div class='add'>+			wcr_xbar_crd:	 3,	/* LLP crossbar credit */</div><div class='add'>+			wcr_rsvd1:	 8,	/* Reserved */</div><div class='ctx'> 			wcr_tag_mode:    1,	/* Tag mode */</div><div class='del'>-                   	wcr_widget_id:	 4;	/* LLP crossbar credit */</div><div class='add'>+			wcr_widget_id:	 4;	/* LLP crossbar credit */</div><div class='ctx'>         } wcr_fields_s;</div><div class='ctx'> } hubii_wcr_t;</div><div class='ctx'> </div><div class='hunk'>@@ -220,14 +220,14 @@ typedef union hubii_ilcsr_u {</div><div class='ctx'> 	u64	icsr_reg_value;</div><div class='ctx'> 	struct {</div><div class='ctx'> 		u64 	icsr_rsvd: 	22,	/* unused */</div><div class='del'>-                   	icsr_max_burst:	10,	/* max burst */</div><div class='add'>+			icsr_max_burst:	10,	/* max burst */</div><div class='ctx'>                         icsr_rsvd4:	 6,	/* reserved */</div><div class='del'>-                   	icsr_max_retry:	10,	/* max retry */</div><div class='add'>+			icsr_max_retry:	10,	/* max retry */</div><div class='ctx'>                         icsr_rsvd3:	 2,	/* reserved */</div><div class='ctx'>                         icsr_lnk_stat:	 2,	/* link status */</div><div class='ctx'>                         icsr_bm8:	 1,	/* Bit mode 8 */</div><div class='ctx'>                         icsr_llp_en:	 1,	/* LLP enable bit */</div><div class='del'>-                 	icsr_rsvd2:	 1,     /* reserver */</div><div class='add'>+			icsr_rsvd2:	 1,     /* reserver */</div><div class='ctx'>                         icsr_wrm_reset:	 1,	/* Warm reset bit */</div><div class='ctx'> 			icsr_rsvd1:	 2,	/* Data ready offset */</div><div class='ctx'>                         icsr_null_to:	 6;	/* Null timeout   */</div><div class='hunk'>@@ -240,9 +240,9 @@ typedef union hubii_iowa_u {</div><div class='ctx'> 	u64	iowa_reg_value;</div><div class='ctx'> 	struct {</div><div class='ctx'> 		u64 	iowa_rsvd: 	48,	/* unused */</div><div class='del'>-                       	iowa_wxoac:	 8,	/* xtalk widget access bits */</div><div class='del'>-                   	iowa_rsvd1:	 7,	/* xtalk widget access bits */</div><div class='del'>-                  	iowa_w0oac:	 1;	/* xtalk widget access bits */</div><div class='add'>+			iowa_wxoac:	 8,	/* xtalk widget access bits */</div><div class='add'>+			iowa_rsvd1:	 7,	/* xtalk widget access bits */</div><div class='add'>+			iowa_w0oac:	 1;	/* xtalk widget access bits */</div><div class='ctx'>         } iowa_fields_s;</div><div class='ctx'> } hubii_iowa_t;</div><div class='ctx'> </div><div class='hunk'>@@ -261,7 +261,7 @@ typedef union	hubii_illr_u {</div><div class='ctx'> 	struct {</div><div class='ctx'> 		u64 	illr_rsvd: 	32,	/* unused */</div><div class='ctx'> 			illr_cb_cnt:	16,	/* checkbit error count */</div><div class='del'>-                   	illr_sn_cnt:	16;	/* sequence number count */</div><div class='add'>+			illr_sn_cnt:	16;	/* sequence number count */</div><div class='ctx'>         } illr_fields_s;</div><div class='ctx'> } hubii_illr_t;</div><div class='ctx'> </div><div class='hunk'>@@ -275,7 +275,7 @@ typedef union io_perf_sel {</div><div class='ctx'> 	struct {</div><div class='ctx'> 		u64 	perf_rsvd  : 48,</div><div class='ctx'> 			perf_icct  :  8,</div><div class='del'>-		 	perf_ippr1 :  4,</div><div class='add'>+			perf_ippr1 :  4,</div><div class='ctx'> 			perf_ippr0 :  4;</div><div class='ctx'> 	} perf_sel_bits;</div><div class='ctx'> } io_perf_sel_t;</div><div class='hunk'>@@ -733,7 +733,7 @@ typedef union hubii_ifdr_u {</div><div class='ctx'> 		u64	ifdr_rsvd:	49,</div><div class='ctx'> 	                ifdr_maxrp:	 7,</div><div class='ctx'> 	                ifdr_rsvd1:	 1,</div><div class='del'>-                      	ifdr_maxrq:	 7;</div><div class='add'>+			ifdr_maxrq:	 7;</div><div class='ctx'> 	} hi_ifdr_fields;</div><div class='ctx'> } hubii_ifdr_t;</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-mips/sn/sn0/hubmd.h b/arch/mips/include/asm/sn/sn0/hubmd.h<br/>index 14c225d80664..14c225d80664 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/sn/sn0/hubmd.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/sn/sn0/hubmd.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/sn/sn0/hubmd.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sn/sn0/hubmd.h</a></div><div class='head'>diff --git a/include/asm-mips/sn/sn0/hubni.h b/arch/mips/include/asm/sn/sn0/hubni.h<br/>index b40d3ef97a12..b40d3ef97a12 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/sn/sn0/hubni.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/sn/sn0/hubni.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/sn/sn0/hubni.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sn/sn0/hubni.h</a></div><div class='head'>diff --git a/include/asm-mips/sn/sn0/hubpi.h b/arch/mips/include/asm/sn/sn0/hubpi.h<br/>index e39f5f9da040..e39f5f9da040 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/sn/sn0/hubpi.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/sn/sn0/hubpi.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/sn/sn0/hubpi.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sn/sn0/hubpi.h</a></div><div class='head'>diff --git a/include/asm-mips/sn/sn0/ip27.h b/arch/mips/include/asm/sn/sn0/ip27.h<br/>index 3c97e0855c8d..3c97e0855c8d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/sn/sn0/ip27.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/sn/sn0/ip27.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/sn/sn0/ip27.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sn/sn0/ip27.h</a></div><div class='head'>diff --git a/include/asm-mips/sn/sn_private.h b/arch/mips/include/asm/sn/sn_private.h<br/>index 1a2c3025bf28..1a2c3025bf28 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/sn/sn_private.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/sn/sn_private.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/sn/sn_private.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sn/sn_private.h</a></div><div class='head'>diff --git a/include/asm-mips/sn/types.h b/arch/mips/include/asm/sn/types.h<br/>index 74d0bb260b86..74d0bb260b86 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/sn/types.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/sn/types.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/sn/types.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sn/types.h</a></div><div class='head'>diff --git a/include/asm-mips/sni.h b/arch/mips/include/asm/sni.h<br/>index 8c1eb02c6d16..8c1eb02c6d16 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/sni.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/sni.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/sni.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sni.h</a></div><div class='head'>diff --git a/include/asm-mips/socket.h b/arch/mips/include/asm/socket.h<br/>index facc2d7a87ca..facc2d7a87ca 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/socket.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/socket.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/socket.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/socket.h</a></div><div class='head'>diff --git a/include/asm-mips/sockios.h b/arch/mips/include/asm/sockios.h<br/>index ed1a5f78d22f..ed1a5f78d22f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/sockios.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/sockios.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/sockios.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sockios.h</a></div><div class='head'>diff --git a/include/asm-mips/sparsemem.h b/arch/mips/include/asm/sparsemem.h<br/>index 795ac6c23203..795ac6c23203 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/sparsemem.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/sparsemem.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/sparsemem.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sparsemem.h</a></div><div class='head'>diff --git a/include/asm-mips/spinlock.h b/arch/mips/include/asm/spinlock.h<br/>index bb897016c491..1a1f320c30d8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/spinlock.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/spinlock.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/spinlock.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/spinlock.h</a></div><div class='hunk'>@@ -9,62 +9,125 @@</div><div class='ctx'> #ifndef _ASM_SPINLOCK_H</div><div class='ctx'> #define _ASM_SPINLOCK_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/compiler.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/barrier.h&gt;</div><div class='ctx'> #include &lt;asm/war.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Your basic SMP spinlocks, allowing only a single CPU anywhere</div><div class='add'>+ *</div><div class='add'>+ * Simple spin lock operations.  There are two variants, one clears IRQ's</div><div class='add'>+ * on the local processor, one does not.</div><div class='add'>+ *</div><div class='add'>+ * These are fair FIFO ticket locks</div><div class='add'>+ *</div><div class='add'>+ * (the type definitions are in asm/spinlock_types.h)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define __raw_spin_is_locked(x)       ((x)-&gt;lock != 0)</div><div class='del'>-#define __raw_spin_lock_flags(lock, flags) __raw_spin_lock(lock)</div><div class='del'>-#define __raw_spin_unlock_wait(x) \</div><div class='del'>-	do { cpu_relax(); } while ((x)-&gt;lock)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Simple spin lock operations.  There are two variants, one clears IRQ's</div><div class='del'>- * on the local processor, one does not.</div><div class='del'>- *</div><div class='del'>- * We make no fairness assumptions.  They have a cost.</div><div class='add'>+ * Ticket locks are conceptually two parts, one indicating the current head of</div><div class='add'>+ * the queue, and the other indicating the current tail. The lock is acquired</div><div class='add'>+ * by atomically noting the tail and incrementing it by one (thus adding</div><div class='add'>+ * ourself to the queue and noting our position), then waiting until the head</div><div class='add'>+ * becomes equal to the the initial value of the tail.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+static inline int __raw_spin_is_locked(raw_spinlock_t *lock)</div><div class='add'>+{</div><div class='add'>+	unsigned int counters = ACCESS_ONCE(lock-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return ((counters &gt;&gt; 14) ^ counters) &amp; 0x1fff;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define __raw_spin_lock_flags(lock, flags) __raw_spin_lock(lock)</div><div class='add'>+#define __raw_spin_unlock_wait(x) \</div><div class='add'>+	while (__raw_spin_is_locked(x)) { cpu_relax(); }</div><div class='add'>+</div><div class='add'>+static inline int __raw_spin_is_contended(raw_spinlock_t *lock)</div><div class='add'>+{</div><div class='add'>+	unsigned int counters = ACCESS_ONCE(lock-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return (((counters &gt;&gt; 14) - counters) &amp; 0x1fff) &gt; 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void __raw_spin_lock(raw_spinlock_t *lock)</div><div class='ctx'> {</div><div class='del'>-	unsigned int tmp;</div><div class='add'>+	int my_ticket;</div><div class='add'>+	int tmp;</div><div class='ctx'> </div><div class='ctx'> 	if (R10000_LLSC_WAR) {</div><div class='del'>-		__asm__ __volatile__(</div><div class='del'>-		"	.set	noreorder	# __raw_spin_lock	\n"</div><div class='del'>-		"1:	ll	%1, %2					\n"</div><div class='del'>-		"	bnez	%1, 1b					\n"</div><div class='del'>-		"	 li	%1, 1					\n"</div><div class='del'>-		"	sc	%1, %0					\n"</div><div class='del'>-		"	beqzl	%1, 1b					\n"</div><div class='add'>+		__asm__ __volatile__ (</div><div class='add'>+		"	.set push		# __raw_spin_lock	\n"</div><div class='add'>+		"	.set noreorder					\n"</div><div class='add'>+		"							\n"</div><div class='add'>+		"1:	ll	%[ticket], %[ticket_ptr]		\n"</div><div class='add'>+		"	addiu	%[my_ticket], %[ticket], 0x4000		\n"</div><div class='add'>+		"	sc	%[my_ticket], %[ticket_ptr]		\n"</div><div class='add'>+		"	beqzl	%[my_ticket], 1b			\n"</div><div class='ctx'> 		"	 nop						\n"</div><div class='del'>-		"	.set	reorder					\n"</div><div class='del'>-		: "=m" (lock-&gt;lock), "=&amp;r" (tmp)</div><div class='del'>-		: "m" (lock-&gt;lock)</div><div class='del'>-		: "memory");</div><div class='add'>+		"	srl	%[my_ticket], %[ticket], 14		\n"</div><div class='add'>+		"	andi	%[my_ticket], %[my_ticket], 0x1fff	\n"</div><div class='add'>+		"	andi	%[ticket], %[ticket], 0x1fff		\n"</div><div class='add'>+		"	bne	%[ticket], %[my_ticket], 4f		\n"</div><div class='add'>+		"	 subu	%[ticket], %[my_ticket], %[ticket]	\n"</div><div class='add'>+		"2:							\n"</div><div class='add'>+		"	.subsection 2					\n"</div><div class='add'>+		"4:	andi	%[ticket], %[ticket], 0x1fff		\n"</div><div class='add'>+		"5:	sll	%[ticket], 5				\n"</div><div class='add'>+		"							\n"</div><div class='add'>+		"6:	bnez	%[ticket], 6b				\n"</div><div class='add'>+		"	 subu	%[ticket], 1				\n"</div><div class='add'>+		"							\n"</div><div class='add'>+		"	lw	%[ticket], %[ticket_ptr]		\n"</div><div class='add'>+		"	andi	%[ticket], %[ticket], 0x1fff		\n"</div><div class='add'>+		"	beq	%[ticket], %[my_ticket], 2b		\n"</div><div class='add'>+		"	 subu	%[ticket], %[my_ticket], %[ticket]	\n"</div><div class='add'>+		"	b	5b					\n"</div><div class='add'>+		"	 subu	%[ticket], %[ticket], 1			\n"</div><div class='add'>+		"	.previous					\n"</div><div class='add'>+		"	.set pop					\n"</div><div class='add'>+		: [ticket_ptr] "+m" (lock-&gt;lock),</div><div class='add'>+		  [ticket] "=&amp;r" (tmp),</div><div class='add'>+		  [my_ticket] "=&amp;r" (my_ticket));</div><div class='ctx'> 	} else {</div><div class='del'>-		__asm__ __volatile__(</div><div class='del'>-		"	.set	noreorder	# __raw_spin_lock	\n"</div><div class='del'>-		"1:	ll	%1, %2					\n"</div><div class='del'>-		"	bnez	%1, 2f					\n"</div><div class='del'>-		"	 li	%1, 1					\n"</div><div class='del'>-		"	sc	%1, %0					\n"</div><div class='del'>-		"	beqz	%1, 2f					\n"</div><div class='add'>+		__asm__ __volatile__ (</div><div class='add'>+		"	.set push		# __raw_spin_lock	\n"</div><div class='add'>+		"	.set noreorder					\n"</div><div class='add'>+		"							\n"</div><div class='add'>+		"	ll	%[ticket], %[ticket_ptr]		\n"</div><div class='add'>+		"1:	addiu	%[my_ticket], %[ticket], 0x4000		\n"</div><div class='add'>+		"	sc	%[my_ticket], %[ticket_ptr]		\n"</div><div class='add'>+		"	beqz	%[my_ticket], 3f			\n"</div><div class='ctx'> 		"	 nop						\n"</div><div class='add'>+		"	srl	%[my_ticket], %[ticket], 14		\n"</div><div class='add'>+		"	andi	%[my_ticket], %[my_ticket], 0x1fff	\n"</div><div class='add'>+		"	andi	%[ticket], %[ticket], 0x1fff		\n"</div><div class='add'>+		"	bne	%[ticket], %[my_ticket], 4f		\n"</div><div class='add'>+		"	 subu	%[ticket], %[my_ticket], %[ticket]	\n"</div><div class='add'>+		"2:							\n"</div><div class='ctx'> 		"	.subsection 2					\n"</div><div class='del'>-		"2:	ll	%1, %2					\n"</div><div class='del'>-		"	bnez	%1, 2b					\n"</div><div class='del'>-		"	 li	%1, 1					\n"</div><div class='del'>-		"	b	1b					\n"</div><div class='del'>-		"	 nop						\n"</div><div class='add'>+		"3:	b	1b					\n"</div><div class='add'>+		"	 ll	%[ticket], %[ticket_ptr]		\n"</div><div class='add'>+		"							\n"</div><div class='add'>+		"4:	andi	%[ticket], %[ticket], 0x1fff		\n"</div><div class='add'>+		"5:	sll	%[ticket], 5				\n"</div><div class='add'>+		"							\n"</div><div class='add'>+		"6:	bnez	%[ticket], 6b				\n"</div><div class='add'>+		"	 subu	%[ticket], 1				\n"</div><div class='add'>+		"							\n"</div><div class='add'>+		"	lw	%[ticket], %[ticket_ptr]		\n"</div><div class='add'>+		"	andi	%[ticket], %[ticket], 0x1fff		\n"</div><div class='add'>+		"	beq	%[ticket], %[my_ticket], 2b		\n"</div><div class='add'>+		"	 subu	%[ticket], %[my_ticket], %[ticket]	\n"</div><div class='add'>+		"	b	5b					\n"</div><div class='add'>+		"	 subu	%[ticket], %[ticket], 1			\n"</div><div class='ctx'> 		"	.previous					\n"</div><div class='del'>-		"	.set	reorder					\n"</div><div class='del'>-		: "=m" (lock-&gt;lock), "=&amp;r" (tmp)</div><div class='del'>-		: "m" (lock-&gt;lock)</div><div class='del'>-		: "memory");</div><div class='add'>+		"	.set pop					\n"</div><div class='add'>+		: [ticket_ptr] "+m" (lock-&gt;lock),</div><div class='add'>+		  [ticket] "=&amp;r" (tmp),</div><div class='add'>+		  [my_ticket] "=&amp;r" (my_ticket));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	smp_llsc_mb();</div><div class='hunk'>@@ -72,55 +135,103 @@ static inline void __raw_spin_lock(raw_spinlock_t *lock)</div><div class='ctx'> </div><div class='ctx'> static inline void __raw_spin_unlock(raw_spinlock_t *lock)</div><div class='ctx'> {</div><div class='del'>-	smp_mb();</div><div class='add'>+	int tmp;</div><div class='ctx'> </div><div class='del'>-	__asm__ __volatile__(</div><div class='del'>-	"	.set	noreorder	# __raw_spin_unlock	\n"</div><div class='del'>-	"	sw	$0, %0					\n"</div><div class='del'>-	"	.set\treorder					\n"</div><div class='del'>-	: "=m" (lock-&gt;lock)</div><div class='del'>-	: "m" (lock-&gt;lock)</div><div class='del'>-	: "memory");</div><div class='add'>+	smp_llsc_mb();</div><div class='add'>+</div><div class='add'>+	if (R10000_LLSC_WAR) {</div><div class='add'>+		__asm__ __volatile__ (</div><div class='add'>+		"				# __raw_spin_unlock	\n"</div><div class='add'>+		"1:	ll	%[ticket], %[ticket_ptr]		\n"</div><div class='add'>+		"	addiu	%[ticket], %[ticket], 1			\n"</div><div class='add'>+		"	ori	%[ticket], %[ticket], 0x2000		\n"</div><div class='add'>+		"	xori	%[ticket], %[ticket], 0x2000		\n"</div><div class='add'>+		"	sc	%[ticket], %[ticket_ptr]		\n"</div><div class='add'>+		"	beqzl	%[ticket], 1b				\n"</div><div class='add'>+		: [ticket_ptr] "+m" (lock-&gt;lock),</div><div class='add'>+		  [ticket] "=&amp;r" (tmp));</div><div class='add'>+	} else {</div><div class='add'>+		__asm__ __volatile__ (</div><div class='add'>+		"	.set push		# __raw_spin_unlock	\n"</div><div class='add'>+		"	.set noreorder					\n"</div><div class='add'>+		"							\n"</div><div class='add'>+		"	ll	%[ticket], %[ticket_ptr]		\n"</div><div class='add'>+		"1:	addiu	%[ticket], %[ticket], 1			\n"</div><div class='add'>+		"	ori	%[ticket], %[ticket], 0x2000		\n"</div><div class='add'>+		"	xori	%[ticket], %[ticket], 0x2000		\n"</div><div class='add'>+		"	sc	%[ticket], %[ticket_ptr]		\n"</div><div class='add'>+		"	beqz	%[ticket], 2f				\n"</div><div class='add'>+		"	 nop						\n"</div><div class='add'>+		"							\n"</div><div class='add'>+		"	.subsection 2					\n"</div><div class='add'>+		"2:	b	1b					\n"</div><div class='add'>+		"	 ll	%[ticket], %[ticket_ptr]		\n"</div><div class='add'>+		"	.previous					\n"</div><div class='add'>+		"	.set pop					\n"</div><div class='add'>+		: [ticket_ptr] "+m" (lock-&gt;lock),</div><div class='add'>+		  [ticket] "=&amp;r" (tmp));</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline unsigned int __raw_spin_trylock(raw_spinlock_t *lock)</div><div class='ctx'> {</div><div class='del'>-	unsigned int temp, res;</div><div class='add'>+	int tmp, tmp2, tmp3;</div><div class='ctx'> </div><div class='ctx'> 	if (R10000_LLSC_WAR) {</div><div class='del'>-		__asm__ __volatile__(</div><div class='del'>-		"	.set	noreorder	# __raw_spin_trylock	\n"</div><div class='del'>-		"1:	ll	%0, %3					\n"</div><div class='del'>-		"	ori	%2, %0, 1				\n"</div><div class='del'>-		"	sc	%2, %1					\n"</div><div class='del'>-		"	beqzl	%2, 1b					\n"</div><div class='del'>-		"	 nop						\n"</div><div class='del'>-		"	andi	%2, %0, 1				\n"</div><div class='del'>-		"	.set	reorder"</div><div class='del'>-		: "=&amp;r" (temp), "=m" (lock-&gt;lock), "=&amp;r" (res)</div><div class='del'>-		: "m" (lock-&gt;lock)</div><div class='del'>-		: "memory");</div><div class='add'>+		__asm__ __volatile__ (</div><div class='add'>+		"	.set push		# __raw_spin_trylock	\n"</div><div class='add'>+		"	.set noreorder					\n"</div><div class='add'>+		"							\n"</div><div class='add'>+		"1:	ll	%[ticket], %[ticket_ptr]		\n"</div><div class='add'>+		"	srl	%[my_ticket], %[ticket], 14		\n"</div><div class='add'>+		"	andi	%[my_ticket], %[my_ticket], 0x1fff	\n"</div><div class='add'>+		"	andi	%[now_serving], %[ticket], 0x1fff	\n"</div><div class='add'>+		"	bne	%[my_ticket], %[now_serving], 3f	\n"</div><div class='add'>+		"	 addiu	%[ticket], %[ticket], 0x4000		\n"</div><div class='add'>+		"	sc	%[ticket], %[ticket_ptr]		\n"</div><div class='add'>+		"	beqzl	%[ticket], 1b				\n"</div><div class='add'>+		"	 li	%[ticket], 1				\n"</div><div class='add'>+		"2:							\n"</div><div class='add'>+		"	.subsection 2					\n"</div><div class='add'>+		"3:	b	2b					\n"</div><div class='add'>+		"	 li	%[ticket], 0				\n"</div><div class='add'>+		"	.previous					\n"</div><div class='add'>+		"	.set pop					\n"</div><div class='add'>+		: [ticket_ptr] "+m" (lock-&gt;lock),</div><div class='add'>+		  [ticket] "=&amp;r" (tmp),</div><div class='add'>+		  [my_ticket] "=&amp;r" (tmp2),</div><div class='add'>+		  [now_serving] "=&amp;r" (tmp3));</div><div class='ctx'> 	} else {</div><div class='del'>-		__asm__ __volatile__(</div><div class='del'>-		"	.set	noreorder	# __raw_spin_trylock	\n"</div><div class='del'>-		"1:	ll	%0, %3					\n"</div><div class='del'>-		"	ori	%2, %0, 1				\n"</div><div class='del'>-		"	sc	%2, %1					\n"</div><div class='del'>-		"	beqz	%2, 2f					\n"</div><div class='del'>-		"	 andi	%2, %0, 1				\n"</div><div class='add'>+		__asm__ __volatile__ (</div><div class='add'>+		"	.set push		# __raw_spin_trylock	\n"</div><div class='add'>+		"	.set noreorder					\n"</div><div class='add'>+		"							\n"</div><div class='add'>+		"	ll	%[ticket], %[ticket_ptr]		\n"</div><div class='add'>+		"1:	srl	%[my_ticket], %[ticket], 14		\n"</div><div class='add'>+		"	andi	%[my_ticket], %[my_ticket], 0x1fff	\n"</div><div class='add'>+		"	andi	%[now_serving], %[ticket], 0x1fff	\n"</div><div class='add'>+		"	bne	%[my_ticket], %[now_serving], 3f	\n"</div><div class='add'>+		"	 addiu	%[ticket], %[ticket], 0x4000		\n"</div><div class='add'>+		"	sc	%[ticket], %[ticket_ptr]		\n"</div><div class='add'>+		"	beqz	%[ticket], 4f				\n"</div><div class='add'>+		"	 li	%[ticket], 1				\n"</div><div class='add'>+		"2:							\n"</div><div class='ctx'> 		"	.subsection 2					\n"</div><div class='del'>-		"2:	b	1b					\n"</div><div class='del'>-		"	 nop						\n"</div><div class='add'>+		"3:	b	2b					\n"</div><div class='add'>+		"	 li	%[ticket], 0				\n"</div><div class='add'>+		"4:	b	1b					\n"</div><div class='add'>+		"	 ll	%[ticket], %[ticket_ptr]		\n"</div><div class='ctx'> 		"	.previous					\n"</div><div class='del'>-		"	.set	reorder"</div><div class='del'>-		: "=&amp;r" (temp), "=m" (lock-&gt;lock), "=&amp;r" (res)</div><div class='del'>-		: "m" (lock-&gt;lock)</div><div class='del'>-		: "memory");</div><div class='add'>+		"	.set pop					\n"</div><div class='add'>+		: [ticket_ptr] "+m" (lock-&gt;lock),</div><div class='add'>+		  [ticket] "=&amp;r" (tmp),</div><div class='add'>+		  [my_ticket] "=&amp;r" (tmp2),</div><div class='add'>+		  [now_serving] "=&amp;r" (tmp3));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	smp_llsc_mb();</div><div class='ctx'> </div><div class='del'>-	return res == 0;</div><div class='add'>+	return tmp;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/include/asm-mips/spinlock_types.h b/arch/mips/include/asm/spinlock_types.h<br/>index ce26c5048b15..adeedaa116c1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/spinlock_types.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/spinlock_types.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/spinlock_types.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/spinlock_types.h</a></div><div class='hunk'>@@ -6,7 +6,12 @@</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> typedef struct {</div><div class='del'>-	volatile unsigned int lock;</div><div class='add'>+	/*</div><div class='add'>+	 * bits  0..13: serving_now</div><div class='add'>+	 * bits 14    : junk data</div><div class='add'>+	 * bits 15..28: ticket</div><div class='add'>+	 */</div><div class='add'>+	unsigned int lock;</div><div class='ctx'> } raw_spinlock_t;</div><div class='ctx'> </div><div class='ctx'> #define __RAW_SPIN_LOCK_UNLOCKED	{ 0 }</div><div class='head'>diff --git a/include/asm-mips/stackframe.h b/arch/mips/include/asm/stackframe.h<br/>index 4c37c4e5f72e..4c37c4e5f72e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/stackframe.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/stackframe.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/stackframe.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/stackframe.h</a></div><div class='head'>diff --git a/include/asm-mips/stacktrace.h b/arch/mips/include/asm/stacktrace.h<br/>index 0bf82818aa53..0bf82818aa53 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/stacktrace.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/stacktrace.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/stacktrace.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/stacktrace.h</a></div><div class='head'>diff --git a/include/asm-mips/stat.h b/arch/mips/include/asm/stat.h<br/>index 6e00f751ab6d..6e00f751ab6d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/stat.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/stat.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/stat.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/stat.h</a></div><div class='head'>diff --git a/include/asm-mips/statfs.h b/arch/mips/include/asm/statfs.h<br/>index c3ddf973c1c0..c3ddf973c1c0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/statfs.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/statfs.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/statfs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/statfs.h</a></div><div class='head'>diff --git a/include/asm-mips/string.h b/arch/mips/include/asm/string.h<br/>index 436e3ad352d9..436e3ad352d9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/string.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/string.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/string.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/string.h</a></div><div class='head'>diff --git a/include/asm-mips/suspend.h b/arch/mips/include/asm/suspend.h<br/>index 2562f8f9be0e..2562f8f9be0e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/suspend.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/suspend.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/suspend.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/suspend.h</a></div><div class='head'>diff --git a/include/asm-mips/sysmips.h b/arch/mips/include/asm/sysmips.h<br/>index 4f47b7d6a5f7..4f47b7d6a5f7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/sysmips.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/sysmips.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/sysmips.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/sysmips.h</a></div><div class='head'>diff --git a/include/asm-mips/system.h b/arch/mips/include/asm/system.h<br/>index a944eda4faf5..cd30f83235bb 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/system.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/system.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/system.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/system.h</a></div><div class='hunk'>@@ -20,6 +20,7 @@</div><div class='ctx'> #include &lt;asm/cmpxchg.h&gt;</div><div class='ctx'> #include &lt;asm/cpu-features.h&gt;</div><div class='ctx'> #include &lt;asm/dsp.h&gt;</div><div class='add'>+#include &lt;asm/watch.h&gt;</div><div class='ctx'> #include &lt;asm/war.h&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -76,6 +77,7 @@ do {									\</div><div class='ctx'> 		__restore_dsp(current);					\</div><div class='ctx'> 	if (cpu_has_userlocal)						\</div><div class='ctx'> 		write_c0_userlocal(current_thread_info()-&gt;tp_value);	\</div><div class='add'>+	__restore_watch();						\</div><div class='ctx'> } while (0)</div><div class='ctx'> </div><div class='ctx'> static inline unsigned long __xchg_u32(volatile int * m, unsigned int val)</div><div class='head'>diff --git a/include/asm-mips/termbits.h b/arch/mips/include/asm/termbits.h<br/>index c83c68444e86..c83c68444e86 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/termbits.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/termbits.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/termbits.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/termbits.h</a></div><div class='head'>diff --git a/include/asm-mips/termios.h b/arch/mips/include/asm/termios.h<br/>index a275661fa7e1..a275661fa7e1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/termios.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/termios.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/termios.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/termios.h</a></div><div class='head'>diff --git a/include/asm-mips/thread_info.h b/arch/mips/include/asm/thread_info.h<br/>index bb3060699df2..3f76de73c943 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/thread_info.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/thread_info.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/thread_info.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/thread_info.h</a></div><div class='hunk'>@@ -124,6 +124,7 @@ register struct thread_info *__current_thread_info __asm__("$28");</div><div class='ctx'> #define TIF_32BIT_REGS		22	/* also implies 16/32 fprs */</div><div class='ctx'> #define TIF_32BIT_ADDR		23	/* 32-bit address space (o32/n32) */</div><div class='ctx'> #define TIF_FPUBOUND		24	/* thread bound to FPU-full CPU set */</div><div class='add'>+#define TIF_LOAD_WATCH		25	/* If set, load watch registers */</div><div class='ctx'> #define TIF_SYSCALL_TRACE	31	/* syscall trace active */</div><div class='ctx'> </div><div class='ctx'> #define _TIF_SYSCALL_TRACE	(1&lt;&lt;TIF_SYSCALL_TRACE)</div><div class='hunk'>@@ -140,6 +141,7 @@ register struct thread_info *__current_thread_info __asm__("$28");</div><div class='ctx'> #define _TIF_32BIT_REGS		(1&lt;&lt;TIF_32BIT_REGS)</div><div class='ctx'> #define _TIF_32BIT_ADDR		(1&lt;&lt;TIF_32BIT_ADDR)</div><div class='ctx'> #define _TIF_FPUBOUND		(1&lt;&lt;TIF_FPUBOUND)</div><div class='add'>+#define _TIF_LOAD_WATCH		(1&lt;&lt;TIF_LOAD_WATCH)</div><div class='ctx'> </div><div class='ctx'> /* work to do on interrupt/exception return */</div><div class='ctx'> #define _TIF_WORK_MASK		(0x0000ffef &amp; ~_TIF_SECCOMP)</div><div class='head'>diff --git a/include/asm-mips/time.h b/arch/mips/include/asm/time.h<br/>index d3bd5c5aa2ec..d3bd5c5aa2ec 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/time.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/time.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/time.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/time.h</a></div><div class='head'>diff --git a/include/asm-mips/timex.h b/arch/mips/include/asm/timex.h<br/>index 6529704aa73a..6529704aa73a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/timex.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/timex.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/timex.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/timex.h</a></div><div class='head'>diff --git a/include/asm-mips/titan_dep.h b/arch/mips/include/asm/titan_dep.h<br/>index fee1908c65d2..fee1908c65d2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/titan_dep.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/titan_dep.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/titan_dep.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/titan_dep.h</a></div><div class='head'>diff --git a/include/asm-mips/tlb.h b/arch/mips/include/asm/tlb.h<br/>index 80d9dfcf1e88..80d9dfcf1e88 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/tlb.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/tlb.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/tlb.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/tlb.h</a></div><div class='head'>diff --git a/include/asm-mips/tlbdebug.h b/arch/mips/include/asm/tlbdebug.h<br/>index bb8f5c29c3d9..bb8f5c29c3d9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/tlbdebug.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/tlbdebug.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/tlbdebug.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/tlbdebug.h</a></div><div class='head'>diff --git a/include/asm-mips/tlbflush.h b/arch/mips/include/asm/tlbflush.h<br/>index 86b21de12e91..86b21de12e91 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/tlbflush.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/tlbflush.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/tlbflush.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/tlbflush.h</a></div><div class='head'>diff --git a/include/asm-mips/topology.h b/arch/mips/include/asm/topology.h<br/>index 259145e07e97..259145e07e97 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/topology.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/topology.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/topology.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/topology.h</a></div><div class='head'>diff --git a/include/asm-mips/traps.h b/arch/mips/include/asm/traps.h<br/>index 90ff2f497c50..90ff2f497c50 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/traps.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/traps.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/traps.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/traps.h</a></div><div class='head'>diff --git a/arch/mips/include/asm/txx9/boards.h b/arch/mips/include/asm/txx9/boards.h<br/>new file mode 100644<br/>index 000000000000..cbe9476d963e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/txx9/boards.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/txx9/boards.h</a></div><div class='hunk'>@@ -0,0 +1,13 @@</div><div class='add'>+#ifdef CONFIG_TOSHIBA_JMR3927</div><div class='add'>+BOARD_VEC(jmr3927_vec)</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_TOSHIBA_RBTX4927</div><div class='add'>+BOARD_VEC(rbtx4927_vec)</div><div class='add'>+BOARD_VEC(rbtx4937_vec)</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_TOSHIBA_RBTX4938</div><div class='add'>+BOARD_VEC(rbtx4938_vec)</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_TOSHIBA_RBTX4939</div><div class='add'>+BOARD_VEC(rbtx4939_vec)</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/asm-mips/txx9/generic.h b/arch/mips/include/asm/txx9/generic.h<br/>index 5b1ccf901c62..4316a3e57678 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/txx9/generic.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/txx9/generic.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/txx9/generic.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/txx9/generic.h</a></div><div class='hunk'>@@ -42,9 +42,10 @@ struct txx9_board_vec {</div><div class='ctx'> };</div><div class='ctx'> extern struct txx9_board_vec *txx9_board_vec;</div><div class='ctx'> extern int (*txx9_irq_dispatch)(int pending);</div><div class='del'>-void prom_init_cmdline(void);</div><div class='ctx'> char *prom_getcmdline(void);</div><div class='add'>+const char *prom_getenv(const char *name);</div><div class='ctx'> void txx9_wdt_init(unsigned long base);</div><div class='add'>+void txx9_wdt_now(unsigned long base);</div><div class='ctx'> void txx9_spi_init(int busid, unsigned long base, int irq);</div><div class='ctx'> void txx9_ethaddr_init(unsigned int id, unsigned char *ethaddr);</div><div class='ctx'> void txx9_sio_init(unsigned long baseaddr, int irq,</div><div class='hunk'>@@ -59,4 +60,30 @@ static inline void txx9_sio_putchar_init(unsigned long baseaddr)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+struct physmap_flash_data;</div><div class='add'>+void txx9_physmap_flash_init(int no, unsigned long addr, unsigned long size,</div><div class='add'>+			     const struct physmap_flash_data *pdata);</div><div class='add'>+</div><div class='add'>+/* 8 bit version of __fls(): find first bit set (returns 0..7) */</div><div class='add'>+static inline unsigned int __fls8(unsigned char x)</div><div class='add'>+{</div><div class='add'>+	int r = 7;</div><div class='add'>+</div><div class='add'>+	if (!(x &amp; 0xf0)) {</div><div class='add'>+		r -= 4;</div><div class='add'>+		x &lt;&lt;= 4;</div><div class='add'>+	}</div><div class='add'>+	if (!(x &amp; 0xc0)) {</div><div class='add'>+		r -= 2;</div><div class='add'>+		x &lt;&lt;= 2;</div><div class='add'>+	}</div><div class='add'>+	if (!(x &amp; 0x80))</div><div class='add'>+		r -= 1;</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void txx9_iocled_init(unsigned long baseaddr,</div><div class='add'>+		      int basenum, unsigned int num, int lowactive,</div><div class='add'>+		      const char *color, char **deftriggers);</div><div class='add'>+</div><div class='ctx'> #endif /* __ASM_TXX9_GENERIC_H */</div><div class='head'>diff --git a/include/asm-mips/txx9/jmr3927.h b/arch/mips/include/asm/txx9/jmr3927.h<br/>index a409c446bf18..a409c446bf18 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/txx9/jmr3927.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/txx9/jmr3927.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/txx9/jmr3927.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/txx9/jmr3927.h</a></div><div class='head'>diff --git a/include/asm-mips/txx9/pci.h b/arch/mips/include/asm/txx9/pci.h<br/>index 3d32529060aa..3d32529060aa 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/txx9/pci.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/txx9/pci.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/txx9/pci.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/txx9/pci.h</a></div><div class='head'>diff --git a/include/asm-mips/txx9/rbtx4927.h b/arch/mips/include/asm/txx9/rbtx4927.h<br/>index 6fcec912c143..b2adab3d1acc 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/txx9/rbtx4927.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/txx9/rbtx4927.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/txx9/rbtx4927.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/txx9/rbtx4927.h</a></div><div class='hunk'>@@ -34,8 +34,10 @@</div><div class='ctx'> #define RBTX4927_PCIIO		0x16000000</div><div class='ctx'> #define RBTX4927_PCIIO_SIZE	0x01000000</div><div class='ctx'> </div><div class='add'>+#define RBTX4927_LED_ADDR	(IO_BASE + TXX9_CE(2) + 0x00001000)</div><div class='ctx'> #define RBTX4927_IMASK_ADDR	(IO_BASE + TXX9_CE(2) + 0x00002000)</div><div class='ctx'> #define RBTX4927_IMSTAT_ADDR	(IO_BASE + TXX9_CE(2) + 0x00002006)</div><div class='add'>+#define RBTX4927_SOFTINT_ADDR	(IO_BASE + TXX9_CE(2) + 0x00003000)</div><div class='ctx'> #define RBTX4927_SOFTRESET_ADDR	(IO_BASE + TXX9_CE(2) + 0x0000f000)</div><div class='ctx'> #define RBTX4927_SOFTRESETLOCK_ADDR	(IO_BASE + TXX9_CE(2) + 0x0000f002)</div><div class='ctx'> #define RBTX4927_PCIRESET_ADDR	(IO_BASE + TXX9_CE(2) + 0x0000f006)</div><div class='hunk'>@@ -47,6 +49,7 @@</div><div class='ctx'> </div><div class='ctx'> #define rbtx4927_imask_addr	((__u8 __iomem *)RBTX4927_IMASK_ADDR)</div><div class='ctx'> #define rbtx4927_imstat_addr	((__u8 __iomem *)RBTX4927_IMSTAT_ADDR)</div><div class='add'>+#define rbtx4927_softint_addr	((__u8 __iomem *)RBTX4927_SOFTINT_ADDR)</div><div class='ctx'> #define rbtx4927_softreset_addr	((__u8 __iomem *)RBTX4927_SOFTRESET_ADDR)</div><div class='ctx'> #define rbtx4927_softresetlock_addr	\</div><div class='ctx'> 				((__u8 __iomem *)RBTX4927_SOFTRESETLOCK_ADDR)</div><div class='head'>diff --git a/include/asm-mips/txx9/rbtx4938.h b/arch/mips/include/asm/txx9/rbtx4938.h<br/>index 9f0441a28126..9f0441a28126 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/txx9/rbtx4938.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/txx9/rbtx4938.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/txx9/rbtx4938.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/txx9/rbtx4938.h</a></div><div class='head'>diff --git a/arch/mips/include/asm/txx9/rbtx4939.h b/arch/mips/include/asm/txx9/rbtx4939.h<br/>new file mode 100644<br/>index 000000000000..1acf428c0b4f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/txx9/rbtx4939.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/txx9/rbtx4939.h</a></div><div class='hunk'>@@ -0,0 +1,133 @@</div><div class='add'>+/*</div><div class='add'>+ * Definitions for RBTX4939</div><div class='add'>+ *</div><div class='add'>+ * (C) Copyright TOSHIBA CORPORATION 2005-2006</div><div class='add'>+ * 2003-2005 (c) MontaVista Software, Inc. This file is licensed under the</div><div class='add'>+ * terms of the GNU General Public License version 2. This program is</div><div class='add'>+ * licensed "as is" without any warranty of any kind, whether express</div><div class='add'>+ * or implied.</div><div class='add'>+ */</div><div class='add'>+#ifndef __ASM_TXX9_RBTX4939_H</div><div class='add'>+#define __ASM_TXX9_RBTX4939_H</div><div class='add'>+</div><div class='add'>+#include &lt;asm/addrspace.h&gt;</div><div class='add'>+#include &lt;asm/txx9irq.h&gt;</div><div class='add'>+#include &lt;asm/txx9/generic.h&gt;</div><div class='add'>+#include &lt;asm/txx9/tx4939.h&gt;</div><div class='add'>+</div><div class='add'>+/* Address map */</div><div class='add'>+#define RBTX4939_IOC_REG_ADDR	(IO_BASE + TXX9_CE(1) + 0x00000000)</div><div class='add'>+#define RBTX4939_BOARD_REV_ADDR	(IO_BASE + TXX9_CE(1) + 0x00000000)</div><div class='add'>+#define RBTX4939_IOC_REV_ADDR	(IO_BASE + TXX9_CE(1) + 0x00000002)</div><div class='add'>+#define RBTX4939_CONFIG1_ADDR	(IO_BASE + TXX9_CE(1) + 0x00000004)</div><div class='add'>+#define RBTX4939_CONFIG2_ADDR	(IO_BASE + TXX9_CE(1) + 0x00000006)</div><div class='add'>+#define RBTX4939_CONFIG3_ADDR	(IO_BASE + TXX9_CE(1) + 0x00000008)</div><div class='add'>+#define RBTX4939_CONFIG4_ADDR	(IO_BASE + TXX9_CE(1) + 0x0000000a)</div><div class='add'>+#define RBTX4939_USTAT_ADDR	(IO_BASE + TXX9_CE(1) + 0x00001000)</div><div class='add'>+#define RBTX4939_UDIPSW_ADDR	(IO_BASE + TXX9_CE(1) + 0x00001002)</div><div class='add'>+#define RBTX4939_BDIPSW_ADDR	(IO_BASE + TXX9_CE(1) + 0x00001004)</div><div class='add'>+#define RBTX4939_IEN_ADDR	(IO_BASE + TXX9_CE(1) + 0x00002000)</div><div class='add'>+#define RBTX4939_IPOL_ADDR	(IO_BASE + TXX9_CE(1) + 0x00002002)</div><div class='add'>+#define RBTX4939_IFAC1_ADDR	(IO_BASE + TXX9_CE(1) + 0x00002004)</div><div class='add'>+#define RBTX4939_IFAC2_ADDR	(IO_BASE + TXX9_CE(1) + 0x00002006)</div><div class='add'>+#define RBTX4939_SOFTINT_ADDR	(IO_BASE + TXX9_CE(1) + 0x00003000)</div><div class='add'>+#define RBTX4939_ISASTAT_ADDR	(IO_BASE + TXX9_CE(1) + 0x00004000)</div><div class='add'>+#define RBTX4939_PCISTAT_ADDR	(IO_BASE + TXX9_CE(1) + 0x00004002)</div><div class='add'>+#define RBTX4939_ROME_ADDR	(IO_BASE + TXX9_CE(1) + 0x00004004)</div><div class='add'>+#define RBTX4939_SPICS_ADDR	(IO_BASE + TXX9_CE(1) + 0x00004006)</div><div class='add'>+#define RBTX4939_AUDI_ADDR	(IO_BASE + TXX9_CE(1) + 0x00004008)</div><div class='add'>+#define RBTX4939_ISAGPIO_ADDR	(IO_BASE + TXX9_CE(1) + 0x0000400a)</div><div class='add'>+#define RBTX4939_PE1_ADDR	(IO_BASE + TXX9_CE(1) + 0x00005000)</div><div class='add'>+#define RBTX4939_PE2_ADDR	(IO_BASE + TXX9_CE(1) + 0x00005002)</div><div class='add'>+#define RBTX4939_PE3_ADDR	(IO_BASE + TXX9_CE(1) + 0x00005004)</div><div class='add'>+#define RBTX4939_VP_ADDR	(IO_BASE + TXX9_CE(1) + 0x00005006)</div><div class='add'>+#define RBTX4939_VPRESET_ADDR	(IO_BASE + TXX9_CE(1) + 0x00005008)</div><div class='add'>+#define RBTX4939_VPSOUT_ADDR	(IO_BASE + TXX9_CE(1) + 0x0000500a)</div><div class='add'>+#define RBTX4939_VPSIN_ADDR	(IO_BASE + TXX9_CE(1) + 0x0000500c)</div><div class='add'>+#define RBTX4939_7SEG_ADDR(s, ch)	\</div><div class='add'>+	(IO_BASE + TXX9_CE(1) + 0x00006000 + (s) * 16 + ((ch) &amp; 3) * 2)</div><div class='add'>+#define RBTX4939_SOFTRESET_ADDR	(IO_BASE + TXX9_CE(1) + 0x00007000)</div><div class='add'>+#define RBTX4939_RESETEN_ADDR	(IO_BASE + TXX9_CE(1) + 0x00007002)</div><div class='add'>+#define RBTX4939_RESETSTAT_ADDR	(IO_BASE + TXX9_CE(1) + 0x00007004)</div><div class='add'>+#define RBTX4939_ETHER_BASE	(IO_BASE + TXX9_CE(1) + 0x00020000)</div><div class='add'>+</div><div class='add'>+/* Ethernet port address */</div><div class='add'>+#define RBTX4939_ETHER_ADDR	(RBTX4939_ETHER_BASE + 0x300)</div><div class='add'>+</div><div class='add'>+/* bits for IEN/IPOL/IFAC */</div><div class='add'>+#define RBTX4938_INTB_ISA0	0</div><div class='add'>+#define RBTX4938_INTB_ISA11	1</div><div class='add'>+#define RBTX4938_INTB_ISA12	2</div><div class='add'>+#define RBTX4938_INTB_ISA15	3</div><div class='add'>+#define RBTX4938_INTB_I2S	4</div><div class='add'>+#define RBTX4938_INTB_SW	5</div><div class='add'>+#define RBTX4938_INTF_ISA0	(1 &lt;&lt; RBTX4938_INTB_ISA0)</div><div class='add'>+#define RBTX4938_INTF_ISA11	(1 &lt;&lt; RBTX4938_INTB_ISA11)</div><div class='add'>+#define RBTX4938_INTF_ISA12	(1 &lt;&lt; RBTX4938_INTB_ISA12)</div><div class='add'>+#define RBTX4938_INTF_ISA15	(1 &lt;&lt; RBTX4938_INTB_ISA15)</div><div class='add'>+#define RBTX4938_INTF_I2S	(1 &lt;&lt; RBTX4938_INTB_I2S)</div><div class='add'>+#define RBTX4938_INTF_SW	(1 &lt;&lt; RBTX4938_INTB_SW)</div><div class='add'>+</div><div class='add'>+/* bits for PE1,PE2,PE3 */</div><div class='add'>+#define RBTX4939_PE1_ATA(ch)	(0x01 &lt;&lt; (ch))</div><div class='add'>+#define RBTX4939_PE1_RMII(ch)	(0x04 &lt;&lt; (ch))</div><div class='add'>+#define RBTX4939_PE2_SIO0	0x01</div><div class='add'>+#define RBTX4939_PE2_SIO2	0x02</div><div class='add'>+#define RBTX4939_PE2_SIO3	0x04</div><div class='add'>+#define RBTX4939_PE2_CIR	0x08</div><div class='add'>+#define RBTX4939_PE2_SPI	0x10</div><div class='add'>+#define RBTX4939_PE2_GPIO	0x20</div><div class='add'>+#define RBTX4939_PE3_VP	0x01</div><div class='add'>+#define RBTX4939_PE3_VP_P	0x02</div><div class='add'>+#define RBTX4939_PE3_VP_S	0x04</div><div class='add'>+</div><div class='add'>+#define rbtx4939_board_rev_addr	((u8 __iomem *)RBTX4939_BOARD_REV_ADDR)</div><div class='add'>+#define rbtx4939_ioc_rev_addr	((u8 __iomem *)RBTX4939_IOC_REV_ADDR)</div><div class='add'>+#define rbtx4939_config1_addr	((u8 __iomem *)RBTX4939_CONFIG1_ADDR)</div><div class='add'>+#define rbtx4939_config2_addr	((u8 __iomem *)RBTX4939_CONFIG2_ADDR)</div><div class='add'>+#define rbtx4939_config3_addr	((u8 __iomem *)RBTX4939_CONFIG3_ADDR)</div><div class='add'>+#define rbtx4939_config4_addr	((u8 __iomem *)RBTX4939_CONFIG4_ADDR)</div><div class='add'>+#define rbtx4939_ustat_addr	((u8 __iomem *)RBTX4939_USTAT_ADDR)</div><div class='add'>+#define rbtx4939_udipsw_addr	((u8 __iomem *)RBTX4939_UDIPSW_ADDR)</div><div class='add'>+#define rbtx4939_bdipsw_addr	((u8 __iomem *)RBTX4939_BDIPSW_ADDR)</div><div class='add'>+#define rbtx4939_ien_addr	((u8 __iomem *)RBTX4939_IEN_ADDR)</div><div class='add'>+#define rbtx4939_ipol_addr	((u8 __iomem *)RBTX4939_IPOL_ADDR)</div><div class='add'>+#define rbtx4939_ifac1_addr	((u8 __iomem *)RBTX4939_IFAC1_ADDR)</div><div class='add'>+#define rbtx4939_ifac2_addr	((u8 __iomem *)RBTX4939_IFAC2_ADDR)</div><div class='add'>+#define rbtx4939_softint_addr	((u8 __iomem *)RBTX4939_SOFTINT_ADDR)</div><div class='add'>+#define rbtx4939_isastat_addr	((u8 __iomem *)RBTX4939_ISASTAT_ADDR)</div><div class='add'>+#define rbtx4939_pcistat_addr	((u8 __iomem *)RBTX4939_PCISTAT_ADDR)</div><div class='add'>+#define rbtx4939_rome_addr	((u8 __iomem *)RBTX4939_ROME_ADDR)</div><div class='add'>+#define rbtx4939_spics_addr	((u8 __iomem *)RBTX4939_SPICS_ADDR)</div><div class='add'>+#define rbtx4939_audi_addr	((u8 __iomem *)RBTX4939_AUDI_ADDR)</div><div class='add'>+#define rbtx4939_isagpio_addr	((u8 __iomem *)RBTX4939_ISAGPIO_ADDR)</div><div class='add'>+#define rbtx4939_pe1_addr	((u8 __iomem *)RBTX4939_PE1_ADDR)</div><div class='add'>+#define rbtx4939_pe2_addr	((u8 __iomem *)RBTX4939_PE2_ADDR)</div><div class='add'>+#define rbtx4939_pe3_addr	((u8 __iomem *)RBTX4939_PE3_ADDR)</div><div class='add'>+#define rbtx4939_vp_addr	((u8 __iomem *)RBTX4939_VP_ADDR)</div><div class='add'>+#define rbtx4939_vpreset_addr	((u8 __iomem *)RBTX4939_VPRESET_ADDR)</div><div class='add'>+#define rbtx4939_vpsout_addr	((u8 __iomem *)RBTX4939_VPSOUT_ADDR)</div><div class='add'>+#define rbtx4939_vpsin_addr	((u8 __iomem *)RBTX4939_VPSIN_ADDR)</div><div class='add'>+#define rbtx4939_7seg_addr(s, ch) \</div><div class='add'>+				((u8 __iomem *)RBTX4939_7SEG_ADDR(s, ch))</div><div class='add'>+#define rbtx4939_softreset_addr	((u8 __iomem *)RBTX4939_SOFTRESET_ADDR)</div><div class='add'>+#define rbtx4939_reseten_addr	((u8 __iomem *)RBTX4939_RESETEN_ADDR)</div><div class='add'>+#define rbtx4939_resetstat_addr	((u8 __iomem *)RBTX4939_RESETSTAT_ADDR)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * IRQ mappings</div><div class='add'>+ */</div><div class='add'>+#define RBTX4939_NR_IRQ_IOC	8</div><div class='add'>+</div><div class='add'>+#define RBTX4939_IRQ_IOC	(TXX9_IRQ_BASE + TX4939_NUM_IR)</div><div class='add'>+#define RBTX4939_IRQ_END	(RBTX4939_IRQ_IOC + RBTX4939_NR_IRQ_IOC)</div><div class='add'>+</div><div class='add'>+/* IOC (ISA, etc) */</div><div class='add'>+#define RBTX4939_IRQ_IOCINT	(TXX9_IRQ_BASE + TX4939_IR_INT(0))</div><div class='add'>+/* Onboard 10M Ether */</div><div class='add'>+#define RBTX4939_IRQ_ETHER	(TXX9_IRQ_BASE + TX4939_IR_INT(1))</div><div class='add'>+</div><div class='add'>+void rbtx4939_prom_init(void);</div><div class='add'>+void rbtx4939_irq_setup(void);</div><div class='add'>+</div><div class='add'>+#endif /* __ASM_TXX9_RBTX4939_H */</div><div class='head'>diff --git a/include/asm-mips/txx9/smsc_fdc37m81x.h b/arch/mips/include/asm/txx9/smsc_fdc37m81x.h<br/>index 02e161d0755d..d1d6332b4ca6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/txx9/smsc_fdc37m81x.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/txx9/smsc_fdc37m81x.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/txx9/smsc_fdc37m81x.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/txx9/smsc_fdc37m81x.h</a></div><div class='hunk'>@@ -62,6 +62,7 @@ void smsc_fdc37m81x_config_beg(void);</div><div class='ctx'> </div><div class='ctx'> void smsc_fdc37m81x_config_end(void);</div><div class='ctx'> </div><div class='add'>+u8 smsc_fdc37m81x_config_get(u8 reg);</div><div class='ctx'> void smsc_fdc37m81x_config_set(u8 reg, u8 val);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/asm-mips/txx9/spi.h b/arch/mips/include/asm/txx9/spi.h<br/>index ddfb2a0dc432..0d727f354557 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/txx9/spi.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/txx9/spi.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/txx9/spi.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/txx9/spi.h</a></div><div class='hunk'>@@ -13,7 +13,22 @@</div><div class='ctx'> #ifndef __ASM_TXX9_SPI_H</div><div class='ctx'> #define __ASM_TXX9_SPI_H</div><div class='ctx'> </div><div class='del'>-extern int spi_eeprom_register(int chipid);</div><div class='del'>-extern int spi_eeprom_read(int chipid, int address, unsigned char *buf, int len);</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SPI</div><div class='add'>+int spi_eeprom_register(int busid, int chipid, int size);</div><div class='add'>+int spi_eeprom_read(int busid, int chipid,</div><div class='add'>+		    int address, unsigned char *buf, int len);</div><div class='add'>+#else</div><div class='add'>+static inline int spi_eeprom_register(int busid, int chipid, int size)</div><div class='add'>+{</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+static inline int spi_eeprom_read(int busid, int chipid,</div><div class='add'>+				  int address, unsigned char *buf, int len)</div><div class='add'>+{</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #endif /* __ASM_TXX9_SPI_H */</div><div class='head'>diff --git a/include/asm-mips/txx9/tx3927.h b/arch/mips/include/asm/txx9/tx3927.h<br/>index 587deb9592d2..dc30c8d42061 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/txx9/tx3927.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/txx9/tx3927.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/txx9/tx3927.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/txx9/tx3927.h</a></div><div class='hunk'>@@ -325,6 +325,7 @@ struct tx3927_ccfg_reg {</div><div class='ctx'> #define TX3927_ROMC_BA(ch)	(tx3927_romcptr-&gt;cr[(ch)] &amp; 0xfff00000)</div><div class='ctx'> #define TX3927_ROMC_SIZE(ch)	\</div><div class='ctx'> 	(0x00100000 &lt;&lt; ((tx3927_romcptr-&gt;cr[(ch)] &gt;&gt; 8) &amp; 0xf))</div><div class='add'>+#define TX3927_ROMC_WIDTH(ch)	(32 &gt;&gt; ((tx3927_romcptr-&gt;cr[(ch)] &gt;&gt; 7) &amp; 0x1))</div><div class='ctx'> </div><div class='ctx'> void tx3927_wdt_init(void);</div><div class='ctx'> void tx3927_setup(void);</div><div class='hunk'>@@ -335,5 +336,6 @@ void tx3927_pcic_setup(struct pci_controller *channel,</div><div class='ctx'> 		       unsigned long sdram_size, int extarb);</div><div class='ctx'> void tx3927_setup_pcierr_irq(void);</div><div class='ctx'> void tx3927_irq_init(void);</div><div class='add'>+void tx3927_mtd_init(int ch);</div><div class='ctx'> </div><div class='ctx'> #endif /* __ASM_TXX9_TX3927_H */</div><div class='head'>diff --git a/include/asm-mips/txx9/tx4927.h b/arch/mips/include/asm/txx9/tx4927.h<br/>index 195f6515db9a..7d813f1cb98d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/txx9/tx4927.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/txx9/tx4927.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/txx9/tx4927.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/txx9/tx4927.h</a></div><div class='hunk'>@@ -50,12 +50,23 @@</div><div class='ctx'> #define TX4927_SIO_REG(ch)	(TX4927_REG_BASE + 0xf300 + (ch) * 0x100)</div><div class='ctx'> #define TX4927_PIO_REG		(TX4927_REG_BASE + 0xf500)</div><div class='ctx'> </div><div class='add'>+#define TX4927_IR_ECCERR	0</div><div class='add'>+#define TX4927_IR_WTOERR	1</div><div class='add'>+#define TX4927_NUM_IR_INT	6</div><div class='ctx'> #define TX4927_IR_INT(n)	(2 + (n))</div><div class='add'>+#define TX4927_NUM_IR_SIO	2</div><div class='ctx'> #define TX4927_IR_SIO(n)	(8 + (n))</div><div class='add'>+#define TX4927_NUM_IR_DMA	4</div><div class='add'>+#define TX4927_IR_DMA(n)	(10 + (n))</div><div class='add'>+#define TX4927_IR_PIO		14</div><div class='add'>+#define TX4927_IR_PDMAC		15</div><div class='ctx'> #define TX4927_IR_PCIC		16</div><div class='ctx'> #define TX4927_NUM_IR_TMR	3</div><div class='ctx'> #define TX4927_IR_TMR(n)	(17 + (n))</div><div class='ctx'> #define TX4927_IR_PCIERR	22</div><div class='add'>+#define TX4927_IR_PCIPME	23</div><div class='add'>+#define TX4927_IR_ACLC		24</div><div class='add'>+#define TX4927_IR_ACLCPME	25</div><div class='ctx'> #define TX4927_NUM_IR	32</div><div class='ctx'> </div><div class='ctx'> #define TX4927_IRC_INT	2	/* IP[2] in Status register */</div><div class='hunk'>@@ -196,6 +207,8 @@ struct tx4927_ccfg_reg {</div><div class='ctx'> #define TX4927_EBUSC_BA(ch)	((TX4927_EBUSC_CR(ch) &gt;&gt; 48) &lt;&lt; 20)</div><div class='ctx'> #define TX4927_EBUSC_SIZE(ch)	\</div><div class='ctx'> 	(0x00100000 &lt;&lt; ((unsigned long)(TX4927_EBUSC_CR(ch) &gt;&gt; 8) &amp; 0xf))</div><div class='add'>+#define TX4927_EBUSC_WIDTH(ch)	\</div><div class='add'>+	(64 &gt;&gt; ((__u32)(TX4927_EBUSC_CR(ch) &gt;&gt; 20) &amp; 0x3))</div><div class='ctx'> </div><div class='ctx'> /* utilities */</div><div class='ctx'> static inline void txx9_clear64(__u64 __iomem *adr, __u64 bits)</div><div class='hunk'>@@ -251,5 +264,6 @@ int tx4927_report_pciclk(void);</div><div class='ctx'> int tx4927_pciclk66_setup(void);</div><div class='ctx'> void tx4927_setup_pcierr_irq(void);</div><div class='ctx'> void tx4927_irq_init(void);</div><div class='add'>+void tx4927_mtd_init(int ch);</div><div class='ctx'> </div><div class='ctx'> #endif /* __ASM_TXX9_TX4927_H */</div><div class='head'>diff --git a/include/asm-mips/txx9/tx4927pcic.h b/arch/mips/include/asm/txx9/tx4927pcic.h<br/>index c470b8a5fe57..c470b8a5fe57 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/txx9/tx4927pcic.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/txx9/tx4927pcic.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/txx9/tx4927pcic.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/txx9/tx4927pcic.h</a></div><div class='head'>diff --git a/include/asm-mips/txx9/tx4938.h b/arch/mips/include/asm/txx9/tx4938.h<br/>index 8175d4ccbc39..989e7751135a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/txx9/tx4938.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/txx9/tx4938.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/txx9/tx4938.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/txx9/tx4938.h</a></div><div class='hunk'>@@ -274,6 +274,7 @@ struct tx4938_ccfg_reg {</div><div class='ctx'> #define TX4938_EBUSC_CR(ch)	TX4927_EBUSC_CR(ch)</div><div class='ctx'> #define TX4938_EBUSC_BA(ch)	TX4927_EBUSC_BA(ch)</div><div class='ctx'> #define TX4938_EBUSC_SIZE(ch)	TX4927_EBUSC_SIZE(ch)</div><div class='add'>+#define TX4938_EBUSC_WIDTH(ch)	TX4927_EBUSC_WIDTH(ch)</div><div class='ctx'> </div><div class='ctx'> #define tx4938_get_mem_size() tx4927_get_mem_size()</div><div class='ctx'> void tx4938_wdt_init(void);</div><div class='hunk'>@@ -289,5 +290,6 @@ struct pci_dev;</div><div class='ctx'> int tx4938_pcic1_map_irq(const struct pci_dev *dev, u8 slot);</div><div class='ctx'> void tx4938_setup_pcierr_irq(void);</div><div class='ctx'> void tx4938_irq_init(void);</div><div class='add'>+void tx4938_mtd_init(int ch);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/mips/include/asm/txx9/tx4939.h b/arch/mips/include/asm/txx9/tx4939.h<br/>new file mode 100644<br/>index 000000000000..88badb423010<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/txx9/tx4939.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/txx9/tx4939.h</a></div><div class='hunk'>@@ -0,0 +1,545 @@</div><div class='add'>+/*</div><div class='add'>+ * Definitions for TX4939</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2000-2001,2005-2006 Toshiba Corporation</div><div class='add'>+ * 2003-2005 (c) MontaVista Software, Inc. This file is licensed under the</div><div class='add'>+ * terms of the GNU General Public License version 2. This program is</div><div class='add'>+ * licensed "as is" without any warranty of any kind, whether express</div><div class='add'>+ * or implied.</div><div class='add'>+ */</div><div class='add'>+#ifndef __ASM_TXX9_TX4939_H</div><div class='add'>+#define __ASM_TXX9_TX4939_H</div><div class='add'>+</div><div class='add'>+/* some controllers are compatible with 4927/4938 */</div><div class='add'>+#include &lt;asm/txx9/tx4938.h&gt;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_64BIT</div><div class='add'>+#define TX4939_REG_BASE	0xffffffffff1f0000UL /* == TX4938_REG_BASE */</div><div class='add'>+#else</div><div class='add'>+#define TX4939_REG_BASE	0xff1f0000UL /* == TX4938_REG_BASE */</div><div class='add'>+#endif</div><div class='add'>+#define TX4939_REG_SIZE	0x00010000 /* == TX4938_REG_SIZE */</div><div class='add'>+</div><div class='add'>+#define TX4939_ATA_REG(ch)	(TX4939_REG_BASE + 0x3000 + (ch) * 0x1000)</div><div class='add'>+#define TX4939_NDFMC_REG	(TX4939_REG_BASE + 0x5000)</div><div class='add'>+#define TX4939_SRAMC_REG	(TX4939_REG_BASE + 0x6000)</div><div class='add'>+#define TX4939_CRYPTO_REG	(TX4939_REG_BASE + 0x6800)</div><div class='add'>+#define TX4939_PCIC1_REG	(TX4939_REG_BASE + 0x7000)</div><div class='add'>+#define TX4939_DDRC_REG		(TX4939_REG_BASE + 0x8000)</div><div class='add'>+#define TX4939_EBUSC_REG	(TX4939_REG_BASE + 0x9000)</div><div class='add'>+#define TX4939_VPC_REG		(TX4939_REG_BASE + 0xa000)</div><div class='add'>+#define TX4939_DMA_REG(ch)	(TX4939_REG_BASE + 0xb000 + (ch) * 0x800)</div><div class='add'>+#define TX4939_PCIC_REG		(TX4939_REG_BASE + 0xd000)</div><div class='add'>+#define TX4939_CCFG_REG		(TX4939_REG_BASE + 0xe000)</div><div class='add'>+#define TX4939_IRC_REG		(TX4939_REG_BASE + 0xe800)</div><div class='add'>+#define TX4939_NR_TMR	6	/* 0xf000,0xf100,0xf200,0xfd00,0xfe00,0xff00 */</div><div class='add'>+#define TX4939_TMR_REG(ch)	\</div><div class='add'>+	(TX4939_REG_BASE + 0xf000 + ((ch) + ((ch) &gt;= 3) * 10) * 0x100)</div><div class='add'>+#define TX4939_NR_SIO	4	/* 0xf300, 0xf400, 0xf380, 0xf480 */</div><div class='add'>+#define TX4939_SIO_REG(ch)	\</div><div class='add'>+	(TX4939_REG_BASE + 0xf300 + (((ch) &amp; 1) &lt;&lt; 8) + (((ch) &amp; 2) &lt;&lt; 6))</div><div class='add'>+#define TX4939_ACLC_REG		(TX4939_REG_BASE + 0xf700)</div><div class='add'>+#define TX4939_SPI_REG		(TX4939_REG_BASE + 0xf800)</div><div class='add'>+#define TX4939_I2C_REG		(TX4939_REG_BASE + 0xf900)</div><div class='add'>+#define TX4939_I2S_REG		(TX4939_REG_BASE + 0xfa00)</div><div class='add'>+#define TX4939_RTC_REG		(TX4939_REG_BASE + 0xfb00)</div><div class='add'>+#define TX4939_CIR_REG		(TX4939_REG_BASE + 0xfc00)</div><div class='add'>+</div><div class='add'>+struct tx4939_le_reg {</div><div class='add'>+	__u32 r;</div><div class='add'>+	__u32 unused;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct tx4939_ddrc_reg {</div><div class='add'>+	struct tx4939_le_reg ctl[47];</div><div class='add'>+	__u64 unused0[17];</div><div class='add'>+	__u64 winen;</div><div class='add'>+	__u64 win[4];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct tx4939_ccfg_reg {</div><div class='add'>+	__u64 ccfg;</div><div class='add'>+	__u64 crir;</div><div class='add'>+	__u64 pcfg;</div><div class='add'>+	__u64 toea;</div><div class='add'>+	__u64 clkctr;</div><div class='add'>+	__u64 unused0;</div><div class='add'>+	__u64 garbc;</div><div class='add'>+	__u64 unused1[2];</div><div class='add'>+	__u64 ramp;</div><div class='add'>+	__u64 unused2[2];</div><div class='add'>+	__u64 dskwctrl;</div><div class='add'>+	__u64 mclkosc;</div><div class='add'>+	__u64 mclkctl;</div><div class='add'>+	__u64 unused3[17];</div><div class='add'>+	struct {</div><div class='add'>+		__u64 mr;</div><div class='add'>+		__u64 dr;</div><div class='add'>+	} gpio[2];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct tx4939_irc_reg {</div><div class='add'>+	struct tx4939_le_reg den;</div><div class='add'>+	struct tx4939_le_reg scipb;</div><div class='add'>+	struct tx4939_le_reg dm[2];</div><div class='add'>+	struct tx4939_le_reg lvl[16];</div><div class='add'>+	struct tx4939_le_reg msk;</div><div class='add'>+	struct tx4939_le_reg edc;</div><div class='add'>+	struct tx4939_le_reg pnd0;</div><div class='add'>+	struct tx4939_le_reg cs;</div><div class='add'>+	struct tx4939_le_reg pnd1;</div><div class='add'>+	struct tx4939_le_reg dm2[2];</div><div class='add'>+	struct tx4939_le_reg dbr[2];</div><div class='add'>+	struct tx4939_le_reg dben;</div><div class='add'>+	struct tx4939_le_reg unused0[2];</div><div class='add'>+	struct tx4939_le_reg flag[2];</div><div class='add'>+	struct tx4939_le_reg pol;</div><div class='add'>+	struct tx4939_le_reg cnt;</div><div class='add'>+	struct tx4939_le_reg maskint;</div><div class='add'>+	struct tx4939_le_reg maskext;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct tx4939_rtc_reg {</div><div class='add'>+	__u32 ctl;</div><div class='add'>+	__u32 adr;</div><div class='add'>+	__u32 dat;</div><div class='add'>+	__u32 tbc;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct tx4939_crypto_reg {</div><div class='add'>+	struct tx4939_le_reg csr;</div><div class='add'>+	struct tx4939_le_reg idesptr;</div><div class='add'>+	struct tx4939_le_reg cdesptr;</div><div class='add'>+	struct tx4939_le_reg buserr;</div><div class='add'>+	struct tx4939_le_reg cip_tout;</div><div class='add'>+	struct tx4939_le_reg cir;</div><div class='add'>+	union {</div><div class='add'>+		struct {</div><div class='add'>+			struct tx4939_le_reg data[8];</div><div class='add'>+			struct tx4939_le_reg ctrl;</div><div class='add'>+		} gen;</div><div class='add'>+		struct {</div><div class='add'>+			struct {</div><div class='add'>+				struct tx4939_le_reg l;</div><div class='add'>+				struct tx4939_le_reg u;</div><div class='add'>+			} key[3], ini;</div><div class='add'>+			struct tx4939_le_reg ctrl;</div><div class='add'>+		} des;</div><div class='add'>+		struct {</div><div class='add'>+			struct tx4939_le_reg key[4];</div><div class='add'>+			struct tx4939_le_reg ini[4];</div><div class='add'>+			struct tx4939_le_reg ctrl;</div><div class='add'>+		} aes;</div><div class='add'>+		struct {</div><div class='add'>+			struct {</div><div class='add'>+				struct tx4939_le_reg l;</div><div class='add'>+				struct tx4939_le_reg u;</div><div class='add'>+			} cnt;</div><div class='add'>+			struct tx4939_le_reg ini[5];</div><div class='add'>+			struct tx4939_le_reg unused;</div><div class='add'>+			struct tx4939_le_reg ctrl;</div><div class='add'>+		} hash;</div><div class='add'>+	} cdr;</div><div class='add'>+	struct tx4939_le_reg unused0[7];</div><div class='add'>+	struct tx4939_le_reg rcsr;</div><div class='add'>+	struct tx4939_le_reg rpr;</div><div class='add'>+	__u64 rdr;</div><div class='add'>+	__u64 ror[3];</div><div class='add'>+	struct tx4939_le_reg unused1[2];</div><div class='add'>+	struct tx4939_le_reg xorslr;</div><div class='add'>+	struct tx4939_le_reg xorsur;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct tx4939_crypto_desc {</div><div class='add'>+	__u32 src;</div><div class='add'>+	__u32 dst;</div><div class='add'>+	__u32 next;</div><div class='add'>+	__u32 ctrl;</div><div class='add'>+	__u32 index;</div><div class='add'>+	__u32 xor;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct tx4939_vpc_reg {</div><div class='add'>+	struct tx4939_le_reg csr;</div><div class='add'>+	struct {</div><div class='add'>+		struct tx4939_le_reg ctrlA;</div><div class='add'>+		struct tx4939_le_reg ctrlB;</div><div class='add'>+		struct tx4939_le_reg idesptr;</div><div class='add'>+		struct tx4939_le_reg cdesptr;</div><div class='add'>+	} port[3];</div><div class='add'>+	struct tx4939_le_reg buserr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct tx4939_vpc_desc {</div><div class='add'>+	__u32 src;</div><div class='add'>+	__u32 next;</div><div class='add'>+	__u32 ctrl1;</div><div class='add'>+	__u32 ctrl2;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * IRC</div><div class='add'>+ */</div><div class='add'>+#define TX4939_IR_NONE	0</div><div class='add'>+#define TX4939_IR_DDR	1</div><div class='add'>+#define TX4939_IR_WTOERR	2</div><div class='add'>+#define TX4939_NUM_IR_INT	3</div><div class='add'>+#define TX4939_IR_INT(n)	(3 + (n))</div><div class='add'>+#define TX4939_NUM_IR_ETH	2</div><div class='add'>+#define TX4939_IR_ETH(n)	((n) ? 43 : 6)</div><div class='add'>+#define TX4939_IR_VIDEO	7</div><div class='add'>+#define TX4939_IR_CIR	8</div><div class='add'>+#define TX4939_NUM_IR_SIO	4</div><div class='add'>+#define TX4939_IR_SIO(n)	((n) ? 43 + (n) : 9)	/* 9,44-46 */</div><div class='add'>+#define TX4939_NUM_IR_DMA	4</div><div class='add'>+#define TX4939_IR_DMA(ch, n)	(((ch) ? 22 : 10) + (n)) /* 10-13,22-25 */</div><div class='add'>+#define TX4939_IR_IRC	14</div><div class='add'>+#define TX4939_IR_PDMAC	15</div><div class='add'>+#define TX4939_NUM_IR_TMR	6</div><div class='add'>+#define TX4939_IR_TMR(n)	(((n) &gt;= 3 ? 45 : 16) + (n)) /* 16-18,48-50 */</div><div class='add'>+#define TX4939_NUM_IR_ATA	2</div><div class='add'>+#define TX4939_IR_ATA(n)	(19 + (n))</div><div class='add'>+#define TX4939_IR_ACLC	21</div><div class='add'>+#define TX4939_IR_CIPHER	26</div><div class='add'>+#define TX4939_IR_INTA	27</div><div class='add'>+#define TX4939_IR_INTB	28</div><div class='add'>+#define TX4939_IR_INTC	29</div><div class='add'>+#define TX4939_IR_INTD	30</div><div class='add'>+#define TX4939_IR_I2C	33</div><div class='add'>+#define TX4939_IR_SPI	34</div><div class='add'>+#define TX4939_IR_PCIC	35</div><div class='add'>+#define TX4939_IR_PCIC1	36</div><div class='add'>+#define TX4939_IR_PCIERR	37</div><div class='add'>+#define TX4939_IR_PCIPME	38</div><div class='add'>+#define TX4939_IR_NDFMC	39</div><div class='add'>+#define TX4939_IR_ACLCPME	40</div><div class='add'>+#define TX4939_IR_RTC	41</div><div class='add'>+#define TX4939_IR_RND	42</div><div class='add'>+#define TX4939_IR_I2S	47</div><div class='add'>+#define TX4939_NUM_IR	64</div><div class='add'>+</div><div class='add'>+#define TX4939_IRC_INT	2	/* IP[2] in Status register */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * CCFG</div><div class='add'>+ */</div><div class='add'>+/* CCFG : Chip Configuration */</div><div class='add'>+#define TX4939_CCFG_PCIBOOT	0x0000040000000000ULL</div><div class='add'>+#define TX4939_CCFG_WDRST	0x0000020000000000ULL</div><div class='add'>+#define TX4939_CCFG_WDREXEN	0x0000010000000000ULL</div><div class='add'>+#define TX4939_CCFG_BCFG_MASK	0x000000ff00000000ULL</div><div class='add'>+#define TX4939_CCFG_GTOT_MASK	0x06000000</div><div class='add'>+#define TX4939_CCFG_GTOT_4096	0x06000000</div><div class='add'>+#define TX4939_CCFG_GTOT_2048	0x04000000</div><div class='add'>+#define TX4939_CCFG_GTOT_1024	0x02000000</div><div class='add'>+#define TX4939_CCFG_GTOT_512	0x00000000</div><div class='add'>+#define TX4939_CCFG_TINTDIS	0x01000000</div><div class='add'>+#define TX4939_CCFG_PCI66	0x00800000</div><div class='add'>+#define TX4939_CCFG_PCIMODE	0x00400000</div><div class='add'>+#define TX4939_CCFG_SSCG	0x00100000</div><div class='add'>+#define TX4939_CCFG_MULCLK_MASK	0x000e0000</div><div class='add'>+#define TX4939_CCFG_MULCLK_8	(0x7 &lt;&lt; 17)</div><div class='add'>+#define TX4939_CCFG_MULCLK_9	(0x0 &lt;&lt; 17)</div><div class='add'>+#define TX4939_CCFG_MULCLK_10	(0x1 &lt;&lt; 17)</div><div class='add'>+#define TX4939_CCFG_MULCLK_11	(0x2 &lt;&lt; 17)</div><div class='add'>+#define TX4939_CCFG_MULCLK_12	(0x3 &lt;&lt; 17)</div><div class='add'>+#define TX4939_CCFG_MULCLK_13	(0x4 &lt;&lt; 17)</div><div class='add'>+#define TX4939_CCFG_MULCLK_14	(0x5 &lt;&lt; 17)</div><div class='add'>+#define TX4939_CCFG_MULCLK_15	(0x6 &lt;&lt; 17)</div><div class='add'>+#define TX4939_CCFG_BEOW	0x00010000</div><div class='add'>+#define TX4939_CCFG_WR	0x00008000</div><div class='add'>+#define TX4939_CCFG_TOE	0x00004000</div><div class='add'>+#define TX4939_CCFG_PCIARB	0x00002000</div><div class='add'>+#define TX4939_CCFG_YDIVMODE_MASK	0x00001c00</div><div class='add'>+#define TX4939_CCFG_YDIVMODE_2	(0x0 &lt;&lt; 10)</div><div class='add'>+#define TX4939_CCFG_YDIVMODE_3	(0x1 &lt;&lt; 10)</div><div class='add'>+#define TX4939_CCFG_YDIVMODE_5	(0x6 &lt;&lt; 10)</div><div class='add'>+#define TX4939_CCFG_YDIVMODE_6	(0x7 &lt;&lt; 10)</div><div class='add'>+#define TX4939_CCFG_PTSEL	0x00000200</div><div class='add'>+#define TX4939_CCFG_BESEL	0x00000100</div><div class='add'>+#define TX4939_CCFG_SYSSP_MASK	0x000000c0</div><div class='add'>+#define TX4939_CCFG_ACKSEL	0x00000020</div><div class='add'>+#define TX4939_CCFG_ROMW	0x00000010</div><div class='add'>+#define TX4939_CCFG_ENDIAN	0x00000004</div><div class='add'>+#define TX4939_CCFG_ARMODE	0x00000002</div><div class='add'>+#define TX4939_CCFG_ACEHOLD	0x00000001</div><div class='add'>+</div><div class='add'>+/* PCFG : Pin Configuration */</div><div class='add'>+#define TX4939_PCFG_SIO2MODE_MASK	0xc000000000000000ULL</div><div class='add'>+#define TX4939_PCFG_SIO2MODE_GPIO	0x8000000000000000ULL</div><div class='add'>+#define TX4939_PCFG_SIO2MODE_SIO2	0x4000000000000000ULL</div><div class='add'>+#define TX4939_PCFG_SIO2MODE_SIO0	0x0000000000000000ULL</div><div class='add'>+#define TX4939_PCFG_SPIMODE	0x2000000000000000ULL</div><div class='add'>+#define TX4939_PCFG_I2CMODE	0x1000000000000000ULL</div><div class='add'>+#define TX4939_PCFG_I2SMODE_MASK	0x0c00000000000000ULL</div><div class='add'>+#define TX4939_PCFG_I2SMODE_GPIO	0x0c00000000000000ULL</div><div class='add'>+#define TX4939_PCFG_I2SMODE_I2S	0x0800000000000000ULL</div><div class='add'>+#define TX4939_PCFG_I2SMODE_I2S_ALT	0x0400000000000000ULL</div><div class='add'>+#define TX4939_PCFG_I2SMODE_ACLC	0x0000000000000000ULL</div><div class='add'>+#define TX4939_PCFG_SIO3MODE	0x0200000000000000ULL</div><div class='add'>+#define TX4939_PCFG_DMASEL3	0x0004000000000000ULL</div><div class='add'>+#define TX4939_PCFG_DMASEL3_SIO0	0x0004000000000000ULL</div><div class='add'>+#define TX4939_PCFG_DMASEL3_NDFC	0x0000000000000000ULL</div><div class='add'>+#define TX4939_PCFG_VSSMODE	0x0000200000000000ULL</div><div class='add'>+#define TX4939_PCFG_VPSMODE	0x0000100000000000ULL</div><div class='add'>+#define TX4939_PCFG_ET1MODE	0x0000080000000000ULL</div><div class='add'>+#define TX4939_PCFG_ET0MODE	0x0000040000000000ULL</div><div class='add'>+#define TX4939_PCFG_ATA1MODE	0x0000020000000000ULL</div><div class='add'>+#define TX4939_PCFG_ATA0MODE	0x0000010000000000ULL</div><div class='add'>+#define TX4939_PCFG_BP_PLL	0x0000000100000000ULL</div><div class='add'>+</div><div class='add'>+#define TX4939_PCFG_SYSCLKEN	0x08000000</div><div class='add'>+#define TX4939_PCFG_PCICLKEN_ALL	0x000f0000</div><div class='add'>+#define TX4939_PCFG_PCICLKEN(ch)	(0x00010000&lt;&lt;(ch))</div><div class='add'>+#define TX4939_PCFG_SPEED1	0x00002000</div><div class='add'>+#define TX4939_PCFG_SPEED0	0x00001000</div><div class='add'>+#define TX4939_PCFG_ITMODE	0x00000300</div><div class='add'>+#define TX4939_PCFG_DMASEL_ALL	(0x00000007 | TX4939_PCFG_DMASEL3)</div><div class='add'>+#define TX4939_PCFG_DMASEL2	0x00000004</div><div class='add'>+#define TX4939_PCFG_DMASEL2_DRQ2	0x00000000</div><div class='add'>+#define TX4939_PCFG_DMASEL2_SIO0	0x00000004</div><div class='add'>+#define TX4939_PCFG_DMASEL1	0x00000002</div><div class='add'>+#define TX4939_PCFG_DMASEL1_DRQ1	0x00000000</div><div class='add'>+#define TX4939_PCFG_DMASEL0	0x00000001</div><div class='add'>+#define TX4939_PCFG_DMASEL0_DRQ0	0x00000000</div><div class='add'>+</div><div class='add'>+/* CLKCTR : Clock Control */</div><div class='add'>+#define TX4939_CLKCTR_IOSCKD	0x8000000000000000ULL</div><div class='add'>+#define TX4939_CLKCTR_SYSCKD	0x4000000000000000ULL</div><div class='add'>+#define TX4939_CLKCTR_TM5CKD	0x2000000000000000ULL</div><div class='add'>+#define TX4939_CLKCTR_TM4CKD	0x1000000000000000ULL</div><div class='add'>+#define TX4939_CLKCTR_TM3CKD	0x0800000000000000ULL</div><div class='add'>+#define TX4939_CLKCTR_CIRCKD	0x0400000000000000ULL</div><div class='add'>+#define TX4939_CLKCTR_SIO3CKD	0x0200000000000000ULL</div><div class='add'>+#define TX4939_CLKCTR_SIO2CKD	0x0100000000000000ULL</div><div class='add'>+#define TX4939_CLKCTR_SIO1CKD	0x0080000000000000ULL</div><div class='add'>+#define TX4939_CLKCTR_VPCCKD	0x0040000000000000ULL</div><div class='add'>+#define TX4939_CLKCTR_EPCICKD	0x0020000000000000ULL</div><div class='add'>+#define TX4939_CLKCTR_ETH1CKD	0x0008000000000000ULL</div><div class='add'>+#define TX4939_CLKCTR_ATA1CKD	0x0004000000000000ULL</div><div class='add'>+#define TX4939_CLKCTR_BROMCKD	0x0002000000000000ULL</div><div class='add'>+#define TX4939_CLKCTR_NDCCKD	0x0001000000000000ULL</div><div class='add'>+#define TX4939_CLKCTR_I2CCKD	0x0000800000000000ULL</div><div class='add'>+#define TX4939_CLKCTR_ETH0CKD	0x0000400000000000ULL</div><div class='add'>+#define TX4939_CLKCTR_SPICKD	0x0000200000000000ULL</div><div class='add'>+#define TX4939_CLKCTR_SRAMCKD	0x0000100000000000ULL</div><div class='add'>+#define TX4939_CLKCTR_PCI1CKD	0x0000080000000000ULL</div><div class='add'>+#define TX4939_CLKCTR_DMA1CKD	0x0000040000000000ULL</div><div class='add'>+#define TX4939_CLKCTR_ACLCKD	0x0000020000000000ULL</div><div class='add'>+#define TX4939_CLKCTR_ATA0CKD	0x0000010000000000ULL</div><div class='add'>+#define TX4939_CLKCTR_DMA0CKD	0x0000008000000000ULL</div><div class='add'>+#define TX4939_CLKCTR_PCICCKD	0x0000004000000000ULL</div><div class='add'>+#define TX4939_CLKCTR_I2SCKD	0x0000002000000000ULL</div><div class='add'>+#define TX4939_CLKCTR_TM0CKD	0x0000001000000000ULL</div><div class='add'>+#define TX4939_CLKCTR_TM1CKD	0x0000000800000000ULL</div><div class='add'>+#define TX4939_CLKCTR_TM2CKD	0x0000000400000000ULL</div><div class='add'>+#define TX4939_CLKCTR_SIO0CKD	0x0000000200000000ULL</div><div class='add'>+#define TX4939_CLKCTR_CYPCKD	0x0000000100000000ULL</div><div class='add'>+#define TX4939_CLKCTR_IOSRST	0x80000000</div><div class='add'>+#define TX4939_CLKCTR_SYSRST	0x40000000</div><div class='add'>+#define TX4939_CLKCTR_TM5RST	0x20000000</div><div class='add'>+#define TX4939_CLKCTR_TM4RST	0x10000000</div><div class='add'>+#define TX4939_CLKCTR_TM3RST	0x08000000</div><div class='add'>+#define TX4939_CLKCTR_CIRRST	0x04000000</div><div class='add'>+#define TX4939_CLKCTR_SIO3RST	0x02000000</div><div class='add'>+#define TX4939_CLKCTR_SIO2RST	0x01000000</div><div class='add'>+#define TX4939_CLKCTR_SIO1RST	0x00800000</div><div class='add'>+#define TX4939_CLKCTR_VPCRST	0x00400000</div><div class='add'>+#define TX4939_CLKCTR_EPCIRST	0x00200000</div><div class='add'>+#define TX4939_CLKCTR_ETH1RST	0x00080000</div><div class='add'>+#define TX4939_CLKCTR_ATA1RST	0x00040000</div><div class='add'>+#define TX4939_CLKCTR_BROMRST	0x00020000</div><div class='add'>+#define TX4939_CLKCTR_NDCRST	0x00010000</div><div class='add'>+#define TX4939_CLKCTR_I2CRST	0x00008000</div><div class='add'>+#define TX4939_CLKCTR_ETH0RST	0x00004000</div><div class='add'>+#define TX4939_CLKCTR_SPIRST	0x00002000</div><div class='add'>+#define TX4939_CLKCTR_SRAMRST	0x00001000</div><div class='add'>+#define TX4939_CLKCTR_PCI1RST	0x00000800</div><div class='add'>+#define TX4939_CLKCTR_DMA1RST	0x00000400</div><div class='add'>+#define TX4939_CLKCTR_ACLRST	0x00000200</div><div class='add'>+#define TX4939_CLKCTR_ATA0RST	0x00000100</div><div class='add'>+#define TX4939_CLKCTR_DMA0RST	0x00000080</div><div class='add'>+#define TX4939_CLKCTR_PCICRST	0x00000040</div><div class='add'>+#define TX4939_CLKCTR_I2SRST	0x00000020</div><div class='add'>+#define TX4939_CLKCTR_TM0RST	0x00000010</div><div class='add'>+#define TX4939_CLKCTR_TM1RST	0x00000008</div><div class='add'>+#define TX4939_CLKCTR_TM2RST	0x00000004</div><div class='add'>+#define TX4939_CLKCTR_SIO0RST	0x00000002</div><div class='add'>+#define TX4939_CLKCTR_CYPRST	0x00000001</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * RTC</div><div class='add'>+ */</div><div class='add'>+#define TX4939_RTCCTL_ALME	0x00000080</div><div class='add'>+#define TX4939_RTCCTL_ALMD	0x00000040</div><div class='add'>+#define TX4939_RTCCTL_BUSY	0x00000020</div><div class='add'>+</div><div class='add'>+#define TX4939_RTCCTL_COMMAND	0x00000007</div><div class='add'>+#define TX4939_RTCCTL_COMMAND_NOP	0x00000000</div><div class='add'>+#define TX4939_RTCCTL_COMMAND_GETTIME	0x00000001</div><div class='add'>+#define TX4939_RTCCTL_COMMAND_SETTIME	0x00000002</div><div class='add'>+#define TX4939_RTCCTL_COMMAND_GETALARM	0x00000003</div><div class='add'>+#define TX4939_RTCCTL_COMMAND_SETALARM	0x00000004</div><div class='add'>+</div><div class='add'>+#define TX4939_RTCTBC_PM	0x00000080</div><div class='add'>+#define TX4939_RTCTBC_COMP	0x0000007f</div><div class='add'>+</div><div class='add'>+#define TX4939_RTC_REG_RAMSIZE	0x00000100</div><div class='add'>+#define TX4939_RTC_REG_RWBSIZE	0x00000006</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * CRYPTO</div><div class='add'>+ */</div><div class='add'>+#define TX4939_CRYPTO_CSR_SAESO	0x08000000</div><div class='add'>+#define TX4939_CRYPTO_CSR_SAESI	0x04000000</div><div class='add'>+#define TX4939_CRYPTO_CSR_SDESO	0x02000000</div><div class='add'>+#define TX4939_CRYPTO_CSR_SDESI	0x01000000</div><div class='add'>+#define TX4939_CRYPTO_CSR_INDXBST_MASK	0x00700000</div><div class='add'>+#define TX4939_CRYPTO_CSR_INDXBST(n)	((n) &lt;&lt; 20)</div><div class='add'>+#define TX4939_CRYPTO_CSR_TOINT	0x00080000</div><div class='add'>+#define TX4939_CRYPTO_CSR_DCINT	0x00040000</div><div class='add'>+#define TX4939_CRYPTO_CSR_GBINT	0x00010000</div><div class='add'>+#define TX4939_CRYPTO_CSR_INDXAST_MASK	0x0000e000</div><div class='add'>+#define TX4939_CRYPTO_CSR_INDXAST(n)	((n) &lt;&lt; 13)</div><div class='add'>+#define TX4939_CRYPTO_CSR_CSWAP_MASK	0x00001800</div><div class='add'>+#define TX4939_CRYPTO_CSR_CSWAP_NONE	0x00000000</div><div class='add'>+#define TX4939_CRYPTO_CSR_CSWAP_IN	0x00000800</div><div class='add'>+#define TX4939_CRYPTO_CSR_CSWAP_OUT	0x00001000</div><div class='add'>+#define TX4939_CRYPTO_CSR_CSWAP_BOTH	0x00001800</div><div class='add'>+#define TX4939_CRYPTO_CSR_CDIV_MASK	0x00000600</div><div class='add'>+#define TX4939_CRYPTO_CSR_CDIV_DIV2	0x00000000</div><div class='add'>+#define TX4939_CRYPTO_CSR_CDIV_DIV1	0x00000200</div><div class='add'>+#define TX4939_CRYPTO_CSR_CDIV_DIV2ALT	0x00000400</div><div class='add'>+#define TX4939_CRYPTO_CSR_CDIV_DIV1ALT	0x00000600</div><div class='add'>+#define TX4939_CRYPTO_CSR_PDINT_MASK	0x000000c0</div><div class='add'>+#define TX4939_CRYPTO_CSR_PDINT_ALL	0x00000000</div><div class='add'>+#define TX4939_CRYPTO_CSR_PDINT_END	0x00000040</div><div class='add'>+#define TX4939_CRYPTO_CSR_PDINT_NEXT	0x00000080</div><div class='add'>+#define TX4939_CRYPTO_CSR_PDINT_NONE	0x000000c0</div><div class='add'>+#define TX4939_CRYPTO_CSR_GINTE	0x00000008</div><div class='add'>+#define TX4939_CRYPTO_CSR_RSTD	0x00000004</div><div class='add'>+#define TX4939_CRYPTO_CSR_RSTC	0x00000002</div><div class='add'>+#define TX4939_CRYPTO_CSR_ENCR	0x00000001</div><div class='add'>+</div><div class='add'>+/* bits for tx4939_crypto_reg.cdr.gen.ctrl */</div><div class='add'>+#define TX4939_CRYPTO_CTX_ENGINE_MASK	0x00000003</div><div class='add'>+#define TX4939_CRYPTO_CTX_ENGINE_DES	0x00000000</div><div class='add'>+#define TX4939_CRYPTO_CTX_ENGINE_AES	0x00000001</div><div class='add'>+#define TX4939_CRYPTO_CTX_ENGINE_MD5	0x00000002</div><div class='add'>+#define TX4939_CRYPTO_CTX_ENGINE_SHA1	0x00000003</div><div class='add'>+#define TX4939_CRYPTO_CTX_TDMS	0x00000010</div><div class='add'>+#define TX4939_CRYPTO_CTX_CMS	0x00000020</div><div class='add'>+#define TX4939_CRYPTO_CTX_DMS	0x00000040</div><div class='add'>+#define TX4939_CRYPTO_CTX_UPDATE	0x00000080</div><div class='add'>+</div><div class='add'>+/* bits for tx4939_crypto_desc.ctrl */</div><div class='add'>+#define TX4939_CRYPTO_DESC_OB_CNT_MASK	0xffe00000</div><div class='add'>+#define TX4939_CRYPTO_DESC_OB_CNT(cnt)	((cnt) &lt;&lt; 21)</div><div class='add'>+#define TX4939_CRYPTO_DESC_IB_CNT_MASK	0x001ffc00</div><div class='add'>+#define TX4939_CRYPTO_DESC_IB_CNT(cnt)	((cnt) &lt;&lt; 10)</div><div class='add'>+#define TX4939_CRYPTO_DESC_START	0x00000200</div><div class='add'>+#define TX4939_CRYPTO_DESC_END	0x00000100</div><div class='add'>+#define TX4939_CRYPTO_DESC_XOR	0x00000010</div><div class='add'>+#define TX4939_CRYPTO_DESC_LAST	0x00000008</div><div class='add'>+#define TX4939_CRYPTO_DESC_ERR_MASK	0x00000006</div><div class='add'>+#define TX4939_CRYPTO_DESC_ERR_NONE	0x00000000</div><div class='add'>+#define TX4939_CRYPTO_DESC_ERR_TOUT	0x00000002</div><div class='add'>+#define TX4939_CRYPTO_DESC_ERR_DIGEST	0x00000004</div><div class='add'>+#define TX4939_CRYPTO_DESC_OWN	0x00000001</div><div class='add'>+</div><div class='add'>+/* bits for tx4939_crypto_desc.index */</div><div class='add'>+#define TX4939_CRYPTO_DESC_HASH_IDX_MASK	0x00000070</div><div class='add'>+#define TX4939_CRYPTO_DESC_HASH_IDX(idx)	((idx) &lt;&lt; 4)</div><div class='add'>+#define TX4939_CRYPTO_DESC_ENCRYPT_IDX_MASK	0x00000007</div><div class='add'>+#define TX4939_CRYPTO_DESC_ENCRYPT_IDX(idx)	((idx) &lt;&lt; 0)</div><div class='add'>+</div><div class='add'>+#define TX4939_CRYPTO_NR_SET	6</div><div class='add'>+</div><div class='add'>+#define TX4939_CRYPTO_RCSR_INTE	0x00000008</div><div class='add'>+#define TX4939_CRYPTO_RCSR_RST	0x00000004</div><div class='add'>+#define TX4939_CRYPTO_RCSR_FIN	0x00000002</div><div class='add'>+#define TX4939_CRYPTO_RCSR_ST	0x00000001</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * VPC</div><div class='add'>+ */</div><div class='add'>+#define TX4939_VPC_CSR_GBINT	0x00010000</div><div class='add'>+#define TX4939_VPC_CSR_SWAPO	0x00000020</div><div class='add'>+#define TX4939_VPC_CSR_SWAPI	0x00000010</div><div class='add'>+#define TX4939_VPC_CSR_GINTE	0x00000008</div><div class='add'>+#define TX4939_VPC_CSR_RSTD	0x00000004</div><div class='add'>+#define TX4939_VPC_CSR_RSTVPC	0x00000002</div><div class='add'>+</div><div class='add'>+#define TX4939_VPC_CTRLA_VDPSN	0x00000200</div><div class='add'>+#define TX4939_VPC_CTRLA_PBUSY	0x00000100</div><div class='add'>+#define TX4939_VPC_CTRLA_DCINT	0x00000080</div><div class='add'>+#define TX4939_VPC_CTRLA_UOINT	0x00000040</div><div class='add'>+#define TX4939_VPC_CTRLA_PDINT_MASK	0x00000030</div><div class='add'>+#define TX4939_VPC_CTRLA_PDINT_ALL	0x00000000</div><div class='add'>+#define TX4939_VPC_CTRLA_PDINT_NEXT	0x00000010</div><div class='add'>+#define TX4939_VPC_CTRLA_PDINT_NONE	0x00000030</div><div class='add'>+#define TX4939_VPC_CTRLA_VDVLDP	0x00000008</div><div class='add'>+#define TX4939_VPC_CTRLA_VDMODE	0x00000004</div><div class='add'>+#define TX4939_VPC_CTRLA_VDFOR	0x00000002</div><div class='add'>+#define TX4939_VPC_CTRLA_ENVPC	0x00000001</div><div class='add'>+</div><div class='add'>+/* bits for tx4939_vpc_desc.ctrl1 */</div><div class='add'>+#define TX4939_VPC_DESC_CTRL1_ERR_MASK	0x00000006</div><div class='add'>+#define TX4939_VPC_DESC_CTRL1_OWN	0x00000001</div><div class='add'>+</div><div class='add'>+#define tx4939_ddrcptr	((struct tx4939_ddrc_reg __iomem *)TX4939_DDRC_REG)</div><div class='add'>+#define tx4939_ebuscptr		tx4938_ebuscptr</div><div class='add'>+#define tx4939_ircptr \</div><div class='add'>+		((struct tx4939_irc_reg __iomem *)TX4939_IRC_REG)</div><div class='add'>+#define tx4939_pcicptr		tx4938_pcicptr</div><div class='add'>+#define tx4939_pcic1ptr		tx4938_pcic1ptr</div><div class='add'>+#define tx4939_ccfgptr \</div><div class='add'>+		((struct tx4939_ccfg_reg __iomem *)TX4939_CCFG_REG)</div><div class='add'>+#define tx4939_sramcptr		tx4938_sramcptr</div><div class='add'>+#define tx4939_rtcptr \</div><div class='add'>+		((struct tx4939_rtc_reg __iomem *)TX4939_RTC_REG)</div><div class='add'>+#define tx4939_cryptoptr \</div><div class='add'>+		((struct tx4939_crypto_reg __iomem *)TX4939_CRYPTO_REG)</div><div class='add'>+#define tx4939_vpcptr	((struct tx4939_vpc_reg __iomem *)TX4939_VPC_REG)</div><div class='add'>+</div><div class='add'>+#define TX4939_REV_MAJ_MIN()	\</div><div class='add'>+	((__u32)__raw_readq(&amp;tx4939_ccfgptr-&gt;crir) &amp; 0x00ff)</div><div class='add'>+#define TX4939_REV_PCODE()	\</div><div class='add'>+	((__u32)__raw_readq(&amp;tx4939_ccfgptr-&gt;crir) &gt;&gt; 16)</div><div class='add'>+#define TX4939_CCFG_BCFG()	\</div><div class='add'>+	((__u32)((__raw_readq(&amp;tx4939_ccfgptr-&gt;ccfg) &amp; TX4939_CCFG_BCFG_MASK) \</div><div class='add'>+		 &gt;&gt; 32))</div><div class='add'>+</div><div class='add'>+#define tx4939_ccfg_clear(bits)	tx4938_ccfg_clear(bits)</div><div class='add'>+#define tx4939_ccfg_set(bits)	tx4938_ccfg_set(bits)</div><div class='add'>+#define tx4939_ccfg_change(change, new)	tx4938_ccfg_change(change, new)</div><div class='add'>+</div><div class='add'>+#define TX4939_EBUSC_CR(ch)	TX4927_EBUSC_CR(ch)</div><div class='add'>+#define TX4939_EBUSC_BA(ch)	TX4927_EBUSC_BA(ch)</div><div class='add'>+#define TX4939_EBUSC_SIZE(ch)	TX4927_EBUSC_SIZE(ch)</div><div class='add'>+#define TX4939_EBUSC_WIDTH(ch)	\</div><div class='add'>+	(16 &gt;&gt; ((__u32)(TX4939_EBUSC_CR(ch) &gt;&gt; 20) &amp; 0x1))</div><div class='add'>+</div><div class='add'>+/* SCLK0 = MSTCLK * 429/19 * 16/245 / 2  (14.745MHz for MST 20MHz) */</div><div class='add'>+#define TX4939_SCLK0(mst)	\</div><div class='add'>+	((((mst) + 245/2) / 245UL * 429 * 16 + 19) / 19 / 2)</div><div class='add'>+</div><div class='add'>+void tx4939_wdt_init(void);</div><div class='add'>+void tx4939_add_memory_regions(void);</div><div class='add'>+void tx4939_setup(void);</div><div class='add'>+void tx4939_time_init(unsigned int tmrnr);</div><div class='add'>+void tx4939_sio_init(unsigned int sclk, unsigned int cts_mask);</div><div class='add'>+void tx4939_spi_init(int busid);</div><div class='add'>+void tx4939_ethaddr_init(unsigned char *addr0, unsigned char *addr1);</div><div class='add'>+int tx4939_report_pciclk(void);</div><div class='add'>+void tx4939_report_pci1clk(void);</div><div class='add'>+struct pci_dev;</div><div class='add'>+int tx4939_pcic1_map_irq(const struct pci_dev *dev, u8 slot);</div><div class='add'>+int tx4939_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin);</div><div class='add'>+void tx4939_setup_pcierr_irq(void);</div><div class='add'>+void tx4939_irq_init(void);</div><div class='add'>+int tx4939_irq(void);</div><div class='add'>+void tx4939_mtd_init(int ch);</div><div class='add'>+void tx4939_ata_init(void);</div><div class='add'>+</div><div class='add'>+#endif /* __ASM_TXX9_TX4939_H */</div><div class='head'>diff --git a/include/asm-mips/txx9irq.h b/arch/mips/include/asm/txx9irq.h<br/>index 5620879be37f..5620879be37f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/txx9irq.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/txx9irq.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/txx9irq.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/txx9irq.h</a></div><div class='head'>diff --git a/include/asm-mips/txx9pio.h b/arch/mips/include/asm/txx9pio.h<br/>index 3d6fa9f8d513..3d6fa9f8d513 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/txx9pio.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/txx9pio.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/txx9pio.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/txx9pio.h</a></div><div class='head'>diff --git a/include/asm-mips/txx9tmr.h b/arch/mips/include/asm/txx9tmr.h<br/>index 67f70a8f09bd..67f70a8f09bd 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/txx9tmr.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/txx9tmr.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/txx9tmr.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/txx9tmr.h</a></div><div class='head'>diff --git a/include/asm-mips/types.h b/arch/mips/include/asm/types.h<br/>index bcbb8d675af5..bcbb8d675af5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/types.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/types.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/types.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/types.h</a></div><div class='head'>diff --git a/include/asm-mips/uaccess.h b/arch/mips/include/asm/uaccess.h<br/>index 66523d610950..09ff5bb17445 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/uaccess.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/uaccess.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/uaccess.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/uaccess.h</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/thread_info.h&gt;</div><div class='del'>-#include &lt;asm-generic/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * The fs value determines whether argument validity checking should be</div><div class='hunk'>@@ -224,7 +223,7 @@ do {									\</div><div class='ctx'> </div><div class='ctx'> #define __get_user_nocheck(x, ptr, size)				\</div><div class='ctx'> ({									\</div><div class='del'>-	long __gu_err;							\</div><div class='add'>+	int __gu_err;							\</div><div class='ctx'> 									\</div><div class='ctx'> 	__get_user_common((x), size, ptr);				\</div><div class='ctx'> 	__gu_err;							\</div><div class='hunk'>@@ -232,7 +231,7 @@ do {									\</div><div class='ctx'> </div><div class='ctx'> #define __get_user_check(x, ptr, size)					\</div><div class='ctx'> ({									\</div><div class='del'>-	long __gu_err = -EFAULT;					\</div><div class='add'>+	int __gu_err = -EFAULT;						\</div><div class='ctx'> 	const __typeof__(*(ptr)) __user * __gu_ptr = (ptr);		\</div><div class='ctx'> 									\</div><div class='ctx'> 	if (likely(access_ok(VERIFY_READ,  __gu_ptr, size)))		\</div><div class='hunk'>@@ -304,7 +303,7 @@ do {									\</div><div class='ctx'> #define __put_user_nocheck(x, ptr, size)				\</div><div class='ctx'> ({									\</div><div class='ctx'> 	__typeof__(*(ptr)) __pu_val;					\</div><div class='del'>-	long __pu_err = 0;						\</div><div class='add'>+	int __pu_err = 0;						\</div><div class='ctx'> 									\</div><div class='ctx'> 	__pu_val = (x);							\</div><div class='ctx'> 	switch (size) {							\</div><div class='hunk'>@@ -321,7 +320,7 @@ do {									\</div><div class='ctx'> ({									\</div><div class='ctx'> 	__typeof__(*(ptr)) __user *__pu_addr = (ptr);			\</div><div class='ctx'> 	__typeof__(*(ptr)) __pu_val = (x);				\</div><div class='del'>-	long __pu_err = -EFAULT;					\</div><div class='add'>+	int __pu_err = -EFAULT;						\</div><div class='ctx'> 									\</div><div class='ctx'> 	if (likely(access_ok(VERIFY_WRITE,  __pu_addr, size))) {	\</div><div class='ctx'> 		switch (size) {						\</div><div class='hunk'>@@ -374,6 +373,269 @@ do {									\</div><div class='ctx'> extern void __put_user_unknown(void);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * put_user_unaligned: - Write a simple value into user space.</div><div class='add'>+ * @x:   Value to copy to user space.</div><div class='add'>+ * @ptr: Destination address, in user space.</div><div class='add'>+ *</div><div class='add'>+ * Context: User context only.  This function may sleep.</div><div class='add'>+ *</div><div class='add'>+ * This macro copies a single simple value from kernel space to user</div><div class='add'>+ * space.  It supports simple types like char and int, but not larger</div><div class='add'>+ * data types like structures or arrays.</div><div class='add'>+ *</div><div class='add'>+ * @ptr must have pointer-to-simple-variable type, and @x must be assignable</div><div class='add'>+ * to the result of dereferencing @ptr.</div><div class='add'>+ *</div><div class='add'>+ * Returns zero on success, or -EFAULT on error.</div><div class='add'>+ */</div><div class='add'>+#define put_user_unaligned(x,ptr)	\</div><div class='add'>+	__put_user_unaligned_check((x),(ptr),sizeof(*(ptr)))</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * get_user_unaligned: - Get a simple variable from user space.</div><div class='add'>+ * @x:   Variable to store result.</div><div class='add'>+ * @ptr: Source address, in user space.</div><div class='add'>+ *</div><div class='add'>+ * Context: User context only.  This function may sleep.</div><div class='add'>+ *</div><div class='add'>+ * This macro copies a single simple variable from user space to kernel</div><div class='add'>+ * space.  It supports simple types like char and int, but not larger</div><div class='add'>+ * data types like structures or arrays.</div><div class='add'>+ *</div><div class='add'>+ * @ptr must have pointer-to-simple-variable type, and the result of</div><div class='add'>+ * dereferencing @ptr must be assignable to @x without a cast.</div><div class='add'>+ *</div><div class='add'>+ * Returns zero on success, or -EFAULT on error.</div><div class='add'>+ * On error, the variable @x is set to zero.</div><div class='add'>+ */</div><div class='add'>+#define get_user_unaligned(x,ptr) \</div><div class='add'>+	__get_user_unaligned_check((x),(ptr),sizeof(*(ptr)))</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * __put_user_unaligned: - Write a simple value into user space, with less checking.</div><div class='add'>+ * @x:   Value to copy to user space.</div><div class='add'>+ * @ptr: Destination address, in user space.</div><div class='add'>+ *</div><div class='add'>+ * Context: User context only.  This function may sleep.</div><div class='add'>+ *</div><div class='add'>+ * This macro copies a single simple value from kernel space to user</div><div class='add'>+ * space.  It supports simple types like char and int, but not larger</div><div class='add'>+ * data types like structures or arrays.</div><div class='add'>+ *</div><div class='add'>+ * @ptr must have pointer-to-simple-variable type, and @x must be assignable</div><div class='add'>+ * to the result of dereferencing @ptr.</div><div class='add'>+ *</div><div class='add'>+ * Caller must check the pointer with access_ok() before calling this</div><div class='add'>+ * function.</div><div class='add'>+ *</div><div class='add'>+ * Returns zero on success, or -EFAULT on error.</div><div class='add'>+ */</div><div class='add'>+#define __put_user_unaligned(x,ptr) \</div><div class='add'>+	__put_user_unaligned_nocheck((x),(ptr),sizeof(*(ptr)))</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * __get_user_unaligned: - Get a simple variable from user space, with less checking.</div><div class='add'>+ * @x:   Variable to store result.</div><div class='add'>+ * @ptr: Source address, in user space.</div><div class='add'>+ *</div><div class='add'>+ * Context: User context only.  This function may sleep.</div><div class='add'>+ *</div><div class='add'>+ * This macro copies a single simple variable from user space to kernel</div><div class='add'>+ * space.  It supports simple types like char and int, but not larger</div><div class='add'>+ * data types like structures or arrays.</div><div class='add'>+ *</div><div class='add'>+ * @ptr must have pointer-to-simple-variable type, and the result of</div><div class='add'>+ * dereferencing @ptr must be assignable to @x without a cast.</div><div class='add'>+ *</div><div class='add'>+ * Caller must check the pointer with access_ok() before calling this</div><div class='add'>+ * function.</div><div class='add'>+ *</div><div class='add'>+ * Returns zero on success, or -EFAULT on error.</div><div class='add'>+ * On error, the variable @x is set to zero.</div><div class='add'>+ */</div><div class='add'>+#define __get_user_unaligned(x,ptr) \</div><div class='add'>+	__get_user__unalignednocheck((x),(ptr),sizeof(*(ptr)))</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Yuck.  We need two variants, one for 64bit operation and one</div><div class='add'>+ * for 32 bit mode and old iron.</div><div class='add'>+ */</div><div class='add'>+#ifdef CONFIG_32BIT</div><div class='add'>+#define __GET_USER_UNALIGNED_DW(val, ptr)				\</div><div class='add'>+	__get_user_unaligned_asm_ll32(val, ptr)</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_64BIT</div><div class='add'>+#define __GET_USER_UNALIGNED_DW(val, ptr)				\</div><div class='add'>+	__get_user_unaligned_asm(val, "uld", ptr)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+extern void __get_user_unaligned_unknown(void);</div><div class='add'>+</div><div class='add'>+#define __get_user_unaligned_common(val, size, ptr)			\</div><div class='add'>+do {									\</div><div class='add'>+	switch (size) {							\</div><div class='add'>+	case 1: __get_user_asm(val, "lb", ptr); break;			\</div><div class='add'>+	case 2: __get_user_unaligned_asm(val, "ulh", ptr); break;	\</div><div class='add'>+	case 4: __get_user_unaligned_asm(val, "ulw", ptr); break;	\</div><div class='add'>+	case 8: __GET_USER_UNALIGNED_DW(val, ptr); break;		\</div><div class='add'>+	default: __get_user_unaligned_unknown(); break;			\</div><div class='add'>+	}								\</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define __get_user_unaligned_nocheck(x,ptr,size)			\</div><div class='add'>+({									\</div><div class='add'>+	int __gu_err;							\</div><div class='add'>+									\</div><div class='add'>+	__get_user_unaligned_common((x), size, ptr);			\</div><div class='add'>+	__gu_err;							\</div><div class='add'>+})</div><div class='add'>+</div><div class='add'>+#define __get_user_unaligned_check(x,ptr,size)				\</div><div class='add'>+({									\</div><div class='add'>+	int __gu_err = -EFAULT;						\</div><div class='add'>+	const __typeof__(*(ptr)) __user * __gu_ptr = (ptr);		\</div><div class='add'>+									\</div><div class='add'>+	if (likely(access_ok(VERIFY_READ,  __gu_ptr, size)))		\</div><div class='add'>+		__get_user_unaligned_common((x), size, __gu_ptr);	\</div><div class='add'>+									\</div><div class='add'>+	__gu_err;							\</div><div class='add'>+})</div><div class='add'>+</div><div class='add'>+#define __get_user_unaligned_asm(val, insn, addr)			\</div><div class='add'>+{									\</div><div class='add'>+	long __gu_tmp;							\</div><div class='add'>+									\</div><div class='add'>+	__asm__ __volatile__(						\</div><div class='add'>+	"1:	" insn "	%1, %3				\n"	\</div><div class='add'>+	"2:							\n"	\</div><div class='add'>+	"	.section .fixup,\"ax\"				\n"	\</div><div class='add'>+	"3:	li	%0, %4					\n"	\</div><div class='add'>+	"	j	2b					\n"	\</div><div class='add'>+	"	.previous					\n"	\</div><div class='add'>+	"	.section __ex_table,\"a\"			\n"	\</div><div class='add'>+	"	"__UA_ADDR "\t1b, 3b				\n"	\</div><div class='add'>+	"	"__UA_ADDR "\t1b + 4, 3b			\n"	\</div><div class='add'>+	"	.previous					\n"	\</div><div class='add'>+	: "=r" (__gu_err), "=r" (__gu_tmp)				\</div><div class='add'>+	: "0" (0), "o" (__m(addr)), "i" (-EFAULT));			\</div><div class='add'>+									\</div><div class='add'>+	(val) = (__typeof__(*(addr))) __gu_tmp;				\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Get a long long 64 using 32 bit registers.</div><div class='add'>+ */</div><div class='add'>+#define __get_user_unaligned_asm_ll32(val, addr)			\</div><div class='add'>+{									\</div><div class='add'>+        unsigned long long __gu_tmp;					\</div><div class='add'>+									\</div><div class='add'>+	__asm__ __volatile__(						\</div><div class='add'>+	"1:	ulw	%1, (%3)				\n"	\</div><div class='add'>+	"2:	ulw	%D1, 4(%3)				\n"	\</div><div class='add'>+	"	move	%0, $0					\n"	\</div><div class='add'>+	"3:	.section	.fixup,\"ax\"			\n"	\</div><div class='add'>+	"4:	li	%0, %4					\n"	\</div><div class='add'>+	"	move	%1, $0					\n"	\</div><div class='add'>+	"	move	%D1, $0					\n"	\</div><div class='add'>+	"	j	3b					\n"	\</div><div class='add'>+	"	.previous					\n"	\</div><div class='add'>+	"	.section	__ex_table,\"a\"		\n"	\</div><div class='add'>+	"	" __UA_ADDR "	1b, 4b				\n"	\</div><div class='add'>+	"	" __UA_ADDR "	1b + 4, 4b			\n"	\</div><div class='add'>+	"	" __UA_ADDR "	2b, 4b				\n"	\</div><div class='add'>+	"	" __UA_ADDR "	2b + 4, 4b			\n"	\</div><div class='add'>+	"	.previous					\n"	\</div><div class='add'>+	: "=r" (__gu_err), "=&amp;r" (__gu_tmp)				\</div><div class='add'>+	: "0" (0), "r" (addr), "i" (-EFAULT));				\</div><div class='add'>+	(val) = (__typeof__(*(addr))) __gu_tmp;				\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Yuck.  We need two variants, one for 64bit operation and one</div><div class='add'>+ * for 32 bit mode and old iron.</div><div class='add'>+ */</div><div class='add'>+#ifdef CONFIG_32BIT</div><div class='add'>+#define __PUT_USER_UNALIGNED_DW(ptr) __put_user_unaligned_asm_ll32(ptr)</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_64BIT</div><div class='add'>+#define __PUT_USER_UNALIGNED_DW(ptr) __put_user_unaligned_asm("usd", ptr)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define __put_user_unaligned_nocheck(x,ptr,size)			\</div><div class='add'>+({									\</div><div class='add'>+	__typeof__(*(ptr)) __pu_val;					\</div><div class='add'>+	int __pu_err = 0;						\</div><div class='add'>+									\</div><div class='add'>+	__pu_val = (x);							\</div><div class='add'>+	switch (size) {							\</div><div class='add'>+	case 1: __put_user_asm("sb", ptr); break;			\</div><div class='add'>+	case 2: __put_user_unaligned_asm("ush", ptr); break;		\</div><div class='add'>+	case 4: __put_user_unaligned_asm("usw", ptr); break;		\</div><div class='add'>+	case 8: __PUT_USER_UNALIGNED_DW(ptr); break;			\</div><div class='add'>+	default: __put_user_unaligned_unknown(); break;			\</div><div class='add'>+	}								\</div><div class='add'>+	__pu_err;							\</div><div class='add'>+})</div><div class='add'>+</div><div class='add'>+#define __put_user_unaligned_check(x,ptr,size)				\</div><div class='add'>+({									\</div><div class='add'>+	__typeof__(*(ptr)) __user *__pu_addr = (ptr);			\</div><div class='add'>+	__typeof__(*(ptr)) __pu_val = (x);				\</div><div class='add'>+	int __pu_err = -EFAULT;						\</div><div class='add'>+									\</div><div class='add'>+	if (likely(access_ok(VERIFY_WRITE,  __pu_addr, size))) {	\</div><div class='add'>+		switch (size) {						\</div><div class='add'>+		case 1: __put_user_asm("sb", __pu_addr); break;		\</div><div class='add'>+		case 2: __put_user_unaligned_asm("ush", __pu_addr); break; \</div><div class='add'>+		case 4: __put_user_unaligned_asm("usw", __pu_addr); break; \</div><div class='add'>+		case 8: __PUT_USER_UNALGINED_DW(__pu_addr); break;	\</div><div class='add'>+		default: __put_user_unaligned_unknown(); break;		\</div><div class='add'>+		}							\</div><div class='add'>+	}								\</div><div class='add'>+	__pu_err;							\</div><div class='add'>+})</div><div class='add'>+</div><div class='add'>+#define __put_user_unaligned_asm(insn, ptr)				\</div><div class='add'>+{									\</div><div class='add'>+	__asm__ __volatile__(						\</div><div class='add'>+	"1:	" insn "	%z2, %3		# __put_user_unaligned_asm\n" \</div><div class='add'>+	"2:							\n"	\</div><div class='add'>+	"	.section	.fixup,\"ax\"			\n"	\</div><div class='add'>+	"3:	li	%0, %4					\n"	\</div><div class='add'>+	"	j	2b					\n"	\</div><div class='add'>+	"	.previous					\n"	\</div><div class='add'>+	"	.section	__ex_table,\"a\"		\n"	\</div><div class='add'>+	"	" __UA_ADDR "	1b, 3b				\n"	\</div><div class='add'>+	"	.previous					\n"	\</div><div class='add'>+	: "=r" (__pu_err)						\</div><div class='add'>+	: "0" (0), "Jr" (__pu_val), "o" (__m(ptr)),			\</div><div class='add'>+	  "i" (-EFAULT));						\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define __put_user_unaligned_asm_ll32(ptr)				\</div><div class='add'>+{									\</div><div class='add'>+	__asm__ __volatile__(						\</div><div class='add'>+	"1:	sw	%2, (%3)	# __put_user_unaligned_asm_ll32	\n" \</div><div class='add'>+	"2:	sw	%D2, 4(%3)				\n"	\</div><div class='add'>+	"3:							\n"	\</div><div class='add'>+	"	.section	.fixup,\"ax\"			\n"	\</div><div class='add'>+	"4:	li	%0, %4					\n"	\</div><div class='add'>+	"	j	3b					\n"	\</div><div class='add'>+	"	.previous					\n"	\</div><div class='add'>+	"	.section	__ex_table,\"a\"		\n"	\</div><div class='add'>+	"	" __UA_ADDR "	1b, 4b				\n"	\</div><div class='add'>+	"	" __UA_ADDR "	1b + 4, 4b			\n"	\</div><div class='add'>+	"	" __UA_ADDR "	2b, 4b				\n"	\</div><div class='add'>+	"	" __UA_ADDR "	2b + 4, 4b			\n"	\</div><div class='add'>+	"	.previous"						\</div><div class='add'>+	: "=r" (__pu_err)						\</div><div class='add'>+	: "0" (0), "r" (__pu_val), "r" (ptr),				\</div><div class='add'>+	  "i" (-EFAULT));						\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+extern void __put_user_unaligned_unknown(void);</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * We're generating jump to subroutines which will be outside the range of</div><div class='ctx'>  * jump instructions</div><div class='ctx'>  */</div><div class='head'>diff --git a/include/asm-mips/ucontext.h b/arch/mips/include/asm/ucontext.h<br/>index 8a4b20e88b81..8a4b20e88b81 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/ucontext.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/ucontext.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/ucontext.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/ucontext.h</a></div><div class='head'>diff --git a/include/asm-mips/unaligned.h b/arch/mips/include/asm/unaligned.h<br/>index 792404948571..792404948571 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/unaligned.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/unaligned.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/unaligned.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/unaligned.h</a></div><div class='head'>diff --git a/include/asm-mips/unistd.h b/arch/mips/include/asm/unistd.h<br/>index a73e1531e151..a73e1531e151 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/unistd.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/unistd.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/unistd.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/unistd.h</a></div><div class='head'>diff --git a/include/asm-mips/user.h b/arch/mips/include/asm/user.h<br/>index afa83a4c1888..afa83a4c1888 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/user.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/user.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/user.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/user.h</a></div><div class='head'>diff --git a/include/asm-mips/vga.h b/arch/mips/include/asm/vga.h<br/>index f4cff7e4fa8a..f4cff7e4fa8a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/vga.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/vga.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/vga.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/vga.h</a></div><div class='head'>diff --git a/include/asm-mips/vpe.h b/arch/mips/include/asm/vpe.h<br/>index c6e1b961537d..c6e1b961537d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/vpe.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/vpe.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/vpe.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/vpe.h</a></div><div class='head'>diff --git a/include/asm-mips/vr41xx/capcella.h b/arch/mips/include/asm/vr41xx/capcella.h<br/>index e0ee05a3dfcc..e0ee05a3dfcc 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/vr41xx/capcella.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/vr41xx/capcella.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/vr41xx/capcella.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/vr41xx/capcella.h</a></div><div class='head'>diff --git a/include/asm-mips/vr41xx/giu.h b/arch/mips/include/asm/vr41xx/giu.h<br/>index 0bcdd3a5c256..0bcdd3a5c256 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/vr41xx/giu.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/vr41xx/giu.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/vr41xx/giu.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/vr41xx/giu.h</a></div><div class='head'>diff --git a/include/asm-mips/vr41xx/irq.h b/arch/mips/include/asm/vr41xx/irq.h<br/>index d315dfbc08f2..d315dfbc08f2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/vr41xx/irq.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/vr41xx/irq.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/vr41xx/irq.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/vr41xx/irq.h</a></div><div class='head'>diff --git a/include/asm-mips/vr41xx/mpc30x.h b/arch/mips/include/asm/vr41xx/mpc30x.h<br/>index 1d67df843dc3..1d67df843dc3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/vr41xx/mpc30x.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/vr41xx/mpc30x.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/vr41xx/mpc30x.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/vr41xx/mpc30x.h</a></div><div class='head'>diff --git a/include/asm-mips/vr41xx/pci.h b/arch/mips/include/asm/vr41xx/pci.h<br/>index 6fc01ce19777..6fc01ce19777 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/vr41xx/pci.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/vr41xx/pci.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/vr41xx/pci.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/vr41xx/pci.h</a></div><div class='head'>diff --git a/include/asm-mips/vr41xx/siu.h b/arch/mips/include/asm/vr41xx/siu.h<br/>index da9f6e373409..da9f6e373409 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/vr41xx/siu.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/vr41xx/siu.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/vr41xx/siu.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/vr41xx/siu.h</a></div><div class='head'>diff --git a/include/asm-mips/vr41xx/tb0219.h b/arch/mips/include/asm/vr41xx/tb0219.h<br/>index dc981b4be0a4..dc981b4be0a4 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/vr41xx/tb0219.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/vr41xx/tb0219.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/vr41xx/tb0219.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/vr41xx/tb0219.h</a></div><div class='head'>diff --git a/include/asm-mips/vr41xx/tb0226.h b/arch/mips/include/asm/vr41xx/tb0226.h<br/>index de527dcfa5f3..de527dcfa5f3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/vr41xx/tb0226.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/vr41xx/tb0226.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/vr41xx/tb0226.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/vr41xx/tb0226.h</a></div><div class='head'>diff --git a/include/asm-mips/vr41xx/tb0287.h b/arch/mips/include/asm/vr41xx/tb0287.h<br/>index 61bead68abf0..61bead68abf0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/vr41xx/tb0287.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/vr41xx/tb0287.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/vr41xx/tb0287.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/vr41xx/tb0287.h</a></div><div class='head'>diff --git a/include/asm-mips/vr41xx/vr41xx.h b/arch/mips/include/asm/vr41xx/vr41xx.h<br/>index 22be64971cc6..22be64971cc6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/vr41xx/vr41xx.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/vr41xx/vr41xx.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/vr41xx/vr41xx.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/vr41xx/vr41xx.h</a></div><div class='head'>diff --git a/include/asm-mips/war.h b/arch/mips/include/asm/war.h<br/>index 22361d5e3bf0..22361d5e3bf0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/war.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/war.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/war.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/war.h</a></div><div class='head'>diff --git a/arch/mips/include/asm/watch.h b/arch/mips/include/asm/watch.h<br/>new file mode 100644<br/>index 000000000000..20126ec79359<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/watch.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/watch.h</a></div><div class='hunk'>@@ -0,0 +1,32 @@</div><div class='add'>+/*</div><div class='add'>+ * This file is subject to the terms and conditions of the GNU General Public</div><div class='add'>+ * License.  See the file "COPYING" in the main directory of this archive</div><div class='add'>+ * for more details.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2008 David Daney</div><div class='add'>+ */</div><div class='add'>+#ifndef _ASM_WATCH_H</div><div class='add'>+#define _ASM_WATCH_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bitops.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/mipsregs.h&gt;</div><div class='add'>+</div><div class='add'>+void mips_install_watch_registers(void);</div><div class='add'>+void mips_read_watch_registers(void);</div><div class='add'>+void mips_clear_watch_registers(void);</div><div class='add'>+void mips_probe_watch_registers(struct cpuinfo_mips *c);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_HARDWARE_WATCHPOINTS</div><div class='add'>+#define __restore_watch() do {						\</div><div class='add'>+	if (unlikely(test_bit(TIF_LOAD_WATCH,				\</div><div class='add'>+			      &amp;current_thread_info()-&gt;flags))) {	\</div><div class='add'>+		mips_install_watch_registers();				\</div><div class='add'>+	}								\</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+#define __restore_watch() do {} while (0)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif /* _ASM_WATCH_H */</div><div class='head'>diff --git a/include/asm-mips/wbflush.h b/arch/mips/include/asm/wbflush.h<br/>index eadc0ac47e24..eadc0ac47e24 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/wbflush.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/wbflush.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/wbflush.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/wbflush.h</a></div><div class='head'>diff --git a/include/asm-mips/xor.h b/arch/mips/include/asm/xor.h<br/>index c82eb12a5b18..c82eb12a5b18 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/xor.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/xor.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/xor.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/xor.h</a></div><div class='head'>diff --git a/include/asm-mips/xtalk/xtalk.h b/arch/mips/include/asm/xtalk/xtalk.h<br/>index 79bac882a739..79bac882a739 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/xtalk/xtalk.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/xtalk/xtalk.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/xtalk/xtalk.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/xtalk/xtalk.h</a></div><div class='head'>diff --git a/include/asm-mips/xtalk/xwidget.h b/arch/mips/include/asm/xtalk/xwidget.h<br/>index b4a13d7405ee..b4a13d7405ee 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/include/asm-mips/xtalk/xwidget.h?id=c15895ef30c2c03e99802951787183039a349d32'>include/asm-mips/xtalk/xwidget.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/include/asm/xtalk/xwidget.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/include/asm/xtalk/xwidget.h</a></div><div class='head'>diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile<br/>index 25775cb54000..d9da7112aaf8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/kernel/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/kernel/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/kernel/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/kernel/Makefile</a></div><div class='hunk'>@@ -6,7 +6,7 @@ extra-y		:= head.o init_task.o vmlinux.lds</div><div class='ctx'> </div><div class='ctx'> obj-y		+= cpu-probe.o branch.o entry.o genex.o irq.o process.o \</div><div class='ctx'> 		   ptrace.o reset.o setup.o signal.o syscall.o \</div><div class='del'>-		   time.o topology.o traps.o unaligned.o</div><div class='add'>+		   time.o topology.o traps.o unaligned.o watch.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_CEVT_BCM1480)	+= cevt-bcm1480.o</div><div class='ctx'> obj-$(CONFIG_CEVT_R4K)		+= cevt-r4k.o</div><div class='head'>diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c<br/>index e621fda8ab37..0cf15457ecac 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/kernel/cpu-probe.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/kernel/cpu-probe.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/kernel/cpu-probe.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/kernel/cpu-probe.c</a></div><div class='hunk'>@@ -21,6 +21,7 @@</div><div class='ctx'> #include &lt;asm/fpu.h&gt;</div><div class='ctx'> #include &lt;asm/mipsregs.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='add'>+#include &lt;asm/watch.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Not all of the MIPS CPUs have the "wait" instruction available. Moreover,</div><div class='hunk'>@@ -677,6 +678,7 @@ static inline void spram_config(void) {}</div><div class='ctx'> static inline void cpu_probe_mips(struct cpuinfo_mips *c)</div><div class='ctx'> {</div><div class='ctx'> 	decode_configs(c);</div><div class='add'>+	mips_probe_watch_registers(c);</div><div class='ctx'> 	switch (c-&gt;processor_id &amp; 0xff00) {</div><div class='ctx'> 	case PRID_IMP_4KC:</div><div class='ctx'> 		c-&gt;cputype = CPU_4KC;</div><div class='head'>diff --git a/arch/mips/kernel/genex.S b/arch/mips/kernel/genex.S<br/>index 01dcbe38fa01..757d48f0d80f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/kernel/genex.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/kernel/genex.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/kernel/genex.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/kernel/genex.S</a></div><div class='hunk'>@@ -453,7 +453,11 @@ NESTED(nmi_handler, PT_SIZE, sp)</div><div class='ctx'> 	BUILD_HANDLER tr tr sti silent			/* #13 */</div><div class='ctx'> 	BUILD_HANDLER fpe fpe fpe silent		/* #15 */</div><div class='ctx'> 	BUILD_HANDLER mdmx mdmx sti silent		/* #22 */</div><div class='add'>+#ifdef 	CONFIG_HARDWARE_WATCHPOINTS</div><div class='add'>+	BUILD_HANDLER watch watch sti silent		/* #23 */</div><div class='add'>+#else</div><div class='ctx'> 	BUILD_HANDLER watch watch sti verbose		/* #23 */</div><div class='add'>+#endif</div><div class='ctx'> 	BUILD_HANDLER mcheck mcheck cli verbose		/* #24 */</div><div class='ctx'> 	BUILD_HANDLER mt mt sti silent			/* #25 */</div><div class='ctx'> 	BUILD_HANDLER dsp dsp sti silent		/* #26 */</div><div class='head'>diff --git a/arch/mips/kernel/linux32.c b/arch/mips/kernel/linux32.c<br/>index 2fefb14414b7..aa2c55e3b55f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/kernel/linux32.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/kernel/linux32.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/kernel/linux32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/kernel/linux32.c</a></div><div class='hunk'>@@ -63,41 +63,6 @@</div><div class='ctx'> #define merge_64(r1, r2) ((((r2) &amp; 0xffffffffUL) &lt;&lt; 32) + ((r1) &amp; 0xffffffffUL))</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Revalidate the inode. This is required for proper NFS attribute caching.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-int cp_compat_stat(struct kstat *stat, struct compat_stat __user *statbuf)</div><div class='del'>-{</div><div class='del'>-	struct compat_stat tmp;</div><div class='del'>-</div><div class='del'>-	if (!new_valid_dev(stat-&gt;dev) || !new_valid_dev(stat-&gt;rdev))</div><div class='del'>-		return -EOVERFLOW;</div><div class='del'>-</div><div class='del'>-	memset(&amp;tmp, 0, sizeof(tmp));</div><div class='del'>-	tmp.st_dev = new_encode_dev(stat-&gt;dev);</div><div class='del'>-	tmp.st_ino = stat-&gt;ino;</div><div class='del'>-	if (sizeof(tmp.st_ino) &lt; sizeof(stat-&gt;ino) &amp;&amp; tmp.st_ino != stat-&gt;ino)</div><div class='del'>-		return -EOVERFLOW;</div><div class='del'>-	tmp.st_mode = stat-&gt;mode;</div><div class='del'>-	tmp.st_nlink = stat-&gt;nlink;</div><div class='del'>-	SET_UID(tmp.st_uid, stat-&gt;uid);</div><div class='del'>-	SET_GID(tmp.st_gid, stat-&gt;gid);</div><div class='del'>-	tmp.st_rdev = new_encode_dev(stat-&gt;rdev);</div><div class='del'>-	tmp.st_size = stat-&gt;size;</div><div class='del'>-	tmp.st_atime = stat-&gt;atime.tv_sec;</div><div class='del'>-	tmp.st_mtime = stat-&gt;mtime.tv_sec;</div><div class='del'>-	tmp.st_ctime = stat-&gt;ctime.tv_sec;</div><div class='del'>-#ifdef STAT_HAVE_NSEC</div><div class='del'>-	tmp.st_atime_nsec = stat-&gt;atime.tv_nsec;</div><div class='del'>-	tmp.st_mtime_nsec = stat-&gt;mtime.tv_nsec;</div><div class='del'>-	tmp.st_ctime_nsec = stat-&gt;ctime.tv_nsec;</div><div class='del'>-#endif</div><div class='del'>-	tmp.st_blocks = stat-&gt;blocks;</div><div class='del'>-	tmp.st_blksize = stat-&gt;blksize;</div><div class='del'>-	return copy_to_user(statbuf, &amp;tmp, sizeof(tmp)) ? -EFAULT : 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> asmlinkage unsigned long</div><div class='ctx'> sys32_mmap2(unsigned long addr, unsigned long len, unsigned long prot,</div><div class='ctx'>          unsigned long flags, unsigned long fd, unsigned long pgoff)</div><div class='hunk'>@@ -168,72 +133,6 @@ asmlinkage long sys32_ftruncate64(unsigned int fd, unsigned long __dummy,</div><div class='ctx'> 	return sys_ftruncate(fd, merge_64(a2, a3));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline long</div><div class='del'>-get_tv32(struct timeval *o, struct compat_timeval __user *i)</div><div class='del'>-{</div><div class='del'>-	return (!access_ok(VERIFY_READ, i, sizeof(*i)) ||</div><div class='del'>-		(__get_user(o-&gt;tv_sec, &amp;i-&gt;tv_sec) |</div><div class='del'>-		 __get_user(o-&gt;tv_usec, &amp;i-&gt;tv_usec)));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline long</div><div class='del'>-put_tv32(struct compat_timeval __user *o, struct timeval *i)</div><div class='del'>-{</div><div class='del'>-	return (!access_ok(VERIFY_WRITE, o, sizeof(*o)) ||</div><div class='del'>-		(__put_user(i-&gt;tv_sec, &amp;o-&gt;tv_sec) |</div><div class='del'>-		 __put_user(i-&gt;tv_usec, &amp;o-&gt;tv_usec)));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-extern struct timezone sys_tz;</div><div class='del'>-</div><div class='del'>-asmlinkage int</div><div class='del'>-sys32_gettimeofday(struct compat_timeval __user *tv, struct timezone __user *tz)</div><div class='del'>-{</div><div class='del'>-	if (tv) {</div><div class='del'>-		struct timeval ktv;</div><div class='del'>-		do_gettimeofday(&amp;ktv);</div><div class='del'>-		if (put_tv32(tv, &amp;ktv))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-	}</div><div class='del'>-	if (tz) {</div><div class='del'>-		if (copy_to_user(tz, &amp;sys_tz, sizeof(sys_tz)))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline long get_ts32(struct timespec *o, struct compat_timeval __user *i)</div><div class='del'>-{</div><div class='del'>-	long usec;</div><div class='del'>-</div><div class='del'>-	if (!access_ok(VERIFY_READ, i, sizeof(*i)))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	if (__get_user(o-&gt;tv_sec, &amp;i-&gt;tv_sec))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	if (__get_user(usec, &amp;i-&gt;tv_usec))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	o-&gt;tv_nsec = usec * 1000;</div><div class='del'>-		return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-asmlinkage int</div><div class='del'>-sys32_settimeofday(struct compat_timeval __user *tv, struct timezone __user *tz)</div><div class='del'>-{</div><div class='del'>-	struct timespec kts;</div><div class='del'>-	struct timezone ktz;</div><div class='del'>-</div><div class='del'>- 	if (tv) {</div><div class='del'>-		if (get_ts32(&amp;kts, tv))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-	}</div><div class='del'>-	if (tz) {</div><div class='del'>-		if (copy_from_user(&amp;ktz, tz, sizeof(ktz)))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return do_sys_settimeofday(tv ? &amp;kts : NULL, tz ? &amp;ktz : NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> asmlinkage int sys32_llseek(unsigned int fd, unsigned int offset_high,</div><div class='ctx'> 			    unsigned int offset_low, loff_t __user * result,</div><div class='ctx'> 			    unsigned int origin)</div><div class='head'>diff --git a/arch/mips/kernel/proc.c b/arch/mips/kernel/proc.c<br/>index 36f065398243..26760cad8b69 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/kernel/proc.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/kernel/proc.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/kernel/proc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/kernel/proc.c</a></div><div class='hunk'>@@ -23,6 +23,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)</div><div class='ctx'> 	unsigned int version = cpu_data[n].processor_id;</div><div class='ctx'> 	unsigned int fp_vers = cpu_data[n].fpu_id;</div><div class='ctx'> 	char fmt [64];</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> 	if (!cpu_isset(n, cpu_online_map))</div><div class='hunk'>@@ -38,7 +39,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)</div><div class='ctx'> 	seq_printf(m, "processor\t\t: %ld\n", n);</div><div class='ctx'> 	sprintf(fmt, "cpu model\t\t: %%s V%%d.%%d%s\n",</div><div class='ctx'> 	        cpu_data[n].options &amp; MIPS_CPU_FPU ? "  FPU V%d.%d" : "");</div><div class='del'>-	seq_printf(m, fmt, __cpu_name[smp_processor_id()],</div><div class='add'>+	seq_printf(m, fmt, __cpu_name[n],</div><div class='ctx'> 	                           (version &gt;&gt; 4) &amp; 0x0f, version &amp; 0x0f,</div><div class='ctx'> 	                           (fp_vers &gt;&gt; 4) &amp; 0x0f, fp_vers &amp; 0x0f);</div><div class='ctx'> 	seq_printf(m, "BogoMIPS\t\t: %lu.%02lu\n",</div><div class='hunk'>@@ -50,8 +51,16 @@ static int show_cpuinfo(struct seq_file *m, void *v)</div><div class='ctx'> 	seq_printf(m, "tlb_entries\t\t: %d\n", cpu_data[n].tlbsize);</div><div class='ctx'> 	seq_printf(m, "extra interrupt vector\t: %s\n",</div><div class='ctx'> 	              cpu_has_divec ? "yes" : "no");</div><div class='del'>-	seq_printf(m, "hardware watchpoint\t: %s\n",</div><div class='del'>-	              cpu_has_watch ? "yes" : "no");</div><div class='add'>+	seq_printf(m, "hardware watchpoint\t: %s",</div><div class='add'>+		   cpu_has_watch ? "yes, " : "no\n");</div><div class='add'>+	if (cpu_has_watch) {</div><div class='add'>+		seq_printf(m, "count: %d, address/irw mask: [",</div><div class='add'>+			   cpu_data[n].watch_reg_count);</div><div class='add'>+		for (i = 0; i &lt; cpu_data[n].watch_reg_count; i++)</div><div class='add'>+			seq_printf(m, "%s0x%04x", i ? ", " : "" ,</div><div class='add'>+				   cpu_data[n].watch_reg_masks[i]);</div><div class='add'>+		seq_printf(m, "]\n");</div><div class='add'>+	}</div><div class='ctx'> 	seq_printf(m, "ASEs implemented\t:%s%s%s%s%s%s\n",</div><div class='ctx'> 		      cpu_has_mips16 ? " mips16" : "",</div><div class='ctx'> 		      cpu_has_mdmx ? " mdmx" : "",</div><div class='head'>diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c<br/>index 22fc19bbe87f..ca2e4026ad20 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/kernel/process.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/kernel/process.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/kernel/process.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/kernel/process.c</a></div><div class='hunk'>@@ -22,7 +22,6 @@</div><div class='ctx'> #include &lt;linux/personality.h&gt;</div><div class='ctx'> #include &lt;linux/sys.h&gt;</div><div class='ctx'> #include &lt;linux/user.h&gt;</div><div class='del'>-#include &lt;linux/a.out.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/completion.h&gt;</div><div class='ctx'> #include &lt;linux/kallsyms.h&gt;</div><div class='head'>diff --git a/arch/mips/kernel/ptrace.c b/arch/mips/kernel/ptrace.c<br/>index 96ffc9c6d194..054861ccb4dd 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/kernel/ptrace.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/kernel/ptrace.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/kernel/ptrace.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/kernel/ptrace.c</a></div><div class='hunk'>@@ -46,7 +46,8 @@</div><div class='ctx'>  */</div><div class='ctx'> void ptrace_disable(struct task_struct *child)</div><div class='ctx'> {</div><div class='del'>-	/* Nothing to do.. */</div><div class='add'>+	/* Don't load the watchpoint registers for the ex-child. */</div><div class='add'>+	clear_tsk_thread_flag(child, TIF_LOAD_WATCH);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -167,6 +168,93 @@ int ptrace_setfpregs(struct task_struct *child, __u32 __user *data)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int ptrace_get_watch_regs(struct task_struct *child,</div><div class='add'>+			  struct pt_watch_regs __user *addr)</div><div class='add'>+{</div><div class='add'>+	enum pt_watch_style style;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!cpu_has_watch || current_cpu_data.watch_reg_use_cnt == 0)</div><div class='add'>+		return -EIO;</div><div class='add'>+	if (!access_ok(VERIFY_WRITE, addr, sizeof(struct pt_watch_regs)))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_32BIT</div><div class='add'>+	style = pt_watch_style_mips32;</div><div class='add'>+#define WATCH_STYLE mips32</div><div class='add'>+#else</div><div class='add'>+	style = pt_watch_style_mips64;</div><div class='add'>+#define WATCH_STYLE mips64</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	__put_user(style, &amp;addr-&gt;style);</div><div class='add'>+	__put_user(current_cpu_data.watch_reg_use_cnt,</div><div class='add'>+		   &amp;addr-&gt;WATCH_STYLE.num_valid);</div><div class='add'>+	for (i = 0; i &lt; current_cpu_data.watch_reg_use_cnt; i++) {</div><div class='add'>+		__put_user(child-&gt;thread.watch.mips3264.watchlo[i],</div><div class='add'>+			   &amp;addr-&gt;WATCH_STYLE.watchlo[i]);</div><div class='add'>+		__put_user(child-&gt;thread.watch.mips3264.watchhi[i] &amp; 0xfff,</div><div class='add'>+			   &amp;addr-&gt;WATCH_STYLE.watchhi[i]);</div><div class='add'>+		__put_user(current_cpu_data.watch_reg_masks[i],</div><div class='add'>+			   &amp;addr-&gt;WATCH_STYLE.watch_masks[i]);</div><div class='add'>+	}</div><div class='add'>+	for (; i &lt; 8; i++) {</div><div class='add'>+		__put_user(0, &amp;addr-&gt;WATCH_STYLE.watchlo[i]);</div><div class='add'>+		__put_user(0, &amp;addr-&gt;WATCH_STYLE.watchhi[i]);</div><div class='add'>+		__put_user(0, &amp;addr-&gt;WATCH_STYLE.watch_masks[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ptrace_set_watch_regs(struct task_struct *child,</div><div class='add'>+			  struct pt_watch_regs __user *addr)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	int watch_active = 0;</div><div class='add'>+	unsigned long lt[NUM_WATCH_REGS];</div><div class='add'>+	u16 ht[NUM_WATCH_REGS];</div><div class='add'>+</div><div class='add'>+	if (!cpu_has_watch || current_cpu_data.watch_reg_use_cnt == 0)</div><div class='add'>+		return -EIO;</div><div class='add'>+	if (!access_ok(VERIFY_READ, addr, sizeof(struct pt_watch_regs)))</div><div class='add'>+		return -EIO;</div><div class='add'>+	/* Check the values. */</div><div class='add'>+	for (i = 0; i &lt; current_cpu_data.watch_reg_use_cnt; i++) {</div><div class='add'>+		__get_user(lt[i], &amp;addr-&gt;WATCH_STYLE.watchlo[i]);</div><div class='add'>+#ifdef CONFIG_32BIT</div><div class='add'>+		if (lt[i] &amp; __UA_LIMIT)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+#else</div><div class='add'>+		if (test_tsk_thread_flag(child, TIF_32BIT_ADDR)) {</div><div class='add'>+			if (lt[i] &amp; 0xffffffff80000000UL)</div><div class='add'>+				return -EINVAL;</div><div class='add'>+		} else {</div><div class='add'>+			if (lt[i] &amp; __UA_LIMIT)</div><div class='add'>+				return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+#endif</div><div class='add'>+		__get_user(ht[i], &amp;addr-&gt;WATCH_STYLE.watchhi[i]);</div><div class='add'>+		if (ht[i] &amp; ~0xff8)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	/* Install them. */</div><div class='add'>+	for (i = 0; i &lt; current_cpu_data.watch_reg_use_cnt; i++) {</div><div class='add'>+		if (lt[i] &amp; 7)</div><div class='add'>+			watch_active = 1;</div><div class='add'>+		child-&gt;thread.watch.mips3264.watchlo[i] = lt[i];</div><div class='add'>+		/* Set the G bit. */</div><div class='add'>+		child-&gt;thread.watch.mips3264.watchhi[i] = ht[i];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (watch_active)</div><div class='add'>+		set_tsk_thread_flag(child, TIF_LOAD_WATCH);</div><div class='add'>+	else</div><div class='add'>+		clear_tsk_thread_flag(child, TIF_LOAD_WATCH);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> long arch_ptrace(struct task_struct *child, long request, long addr, long data)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -440,6 +528,16 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)</div><div class='ctx'> 				(unsigned long __user *) data);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='add'>+	case PTRACE_GET_WATCH_REGS:</div><div class='add'>+		ret = ptrace_get_watch_regs(child,</div><div class='add'>+					(struct pt_watch_regs __user *) addr);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case PTRACE_SET_WATCH_REGS:</div><div class='add'>+		ret = ptrace_set_watch_regs(child,</div><div class='add'>+					(struct pt_watch_regs __user *) addr);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='ctx'> 	default:</div><div class='ctx'> 		ret = ptrace_request(child, request, addr, data);</div><div class='ctx'> 		break;</div><div class='head'>diff --git a/arch/mips/kernel/ptrace32.c b/arch/mips/kernel/ptrace32.c<br/>index 76818be6ba7c..1ca34104e593 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/kernel/ptrace32.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/kernel/ptrace32.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/kernel/ptrace32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/kernel/ptrace32.c</a></div><div class='hunk'>@@ -15,6 +15,7 @@</div><div class='ctx'>  * binaries.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='add'>+#include &lt;linux/compat.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='hunk'>@@ -36,47 +37,17 @@</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/bootinfo.h&gt;</div><div class='ctx'> </div><div class='del'>-int ptrace_getregs(struct task_struct *child, __s64 __user *data);</div><div class='del'>-int ptrace_setregs(struct task_struct *child, __s64 __user *data);</div><div class='del'>-</div><div class='del'>-int ptrace_getfpregs(struct task_struct *child, __u32 __user *data);</div><div class='del'>-int ptrace_setfpregs(struct task_struct *child, __u32 __user *data);</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Tracing a 32-bit process with a 64-bit strace and vice versa will not</div><div class='ctx'>  * work.  I don't know how to fix this.</div><div class='ctx'>  */</div><div class='del'>-asmlinkage int sys32_ptrace(int request, int pid, int addr, int data)</div><div class='add'>+long compat_arch_ptrace(struct task_struct *child, compat_long_t request,</div><div class='add'>+			compat_ulong_t caddr, compat_ulong_t cdata)</div><div class='ctx'> {</div><div class='del'>-	struct task_struct *child;</div><div class='add'>+	int addr = caddr;</div><div class='add'>+	int data = cdata;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-#if 0</div><div class='del'>-	printk("ptrace(r=%d,pid=%d,addr=%08lx,data=%08lx)\n",</div><div class='del'>-	       (int) request, (int) pid, (unsigned long) addr,</div><div class='del'>-	       (unsigned long) data);</div><div class='del'>-#endif</div><div class='del'>-	lock_kernel();</div><div class='del'>-	if (request == PTRACE_TRACEME) {</div><div class='del'>-		ret = ptrace_traceme();</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	child = ptrace_get_task_struct(pid);</div><div class='del'>-	if (IS_ERR(child)) {</div><div class='del'>-		ret = PTR_ERR(child);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (request == PTRACE_ATTACH) {</div><div class='del'>-		ret = ptrace_attach(child);</div><div class='del'>-		goto out_tsk;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = ptrace_check_attach(child, request == PTRACE_KILL);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto out_tsk;</div><div class='del'>-</div><div class='ctx'> 	switch (request) {</div><div class='ctx'> 	/* when I and D space are separate, these will need to be fixed. */</div><div class='ctx'> 	case PTRACE_PEEKTEXT: /* read word at location addr. */</div><div class='hunk'>@@ -214,7 +185,7 @@ asmlinkage int sys32_ptrace(int request, int pid, int addr, int data)</div><div class='ctx'> 			if (!cpu_has_dsp) {</div><div class='ctx'> 				tmp = 0;</div><div class='ctx'> 				ret = -EIO;</div><div class='del'>-				goto out_tsk;</div><div class='add'>+				goto out;</div><div class='ctx'> 			}</div><div class='ctx'> 			dregs = __get_dsp_regs(child);</div><div class='ctx'> 			tmp = (unsigned long) (dregs[addr - DSP_BASE]);</div><div class='hunk'>@@ -224,14 +195,14 @@ asmlinkage int sys32_ptrace(int request, int pid, int addr, int data)</div><div class='ctx'> 			if (!cpu_has_dsp) {</div><div class='ctx'> 				tmp = 0;</div><div class='ctx'> 				ret = -EIO;</div><div class='del'>-				goto out_tsk;</div><div class='add'>+				goto out;</div><div class='ctx'> 			}</div><div class='ctx'> 			tmp = child-&gt;thread.dsp.dspcontrol;</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			tmp = 0;</div><div class='ctx'> 			ret = -EIO;</div><div class='del'>-			goto out_tsk;</div><div class='add'>+			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> 		ret = put_user(tmp, (unsigned __user *) (unsigned long) data);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -410,14 +381,20 @@ asmlinkage int sys32_ptrace(int request, int pid, int addr, int data)</div><div class='ctx'> 				(unsigned long __user *) (unsigned long) data);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='add'>+	case PTRACE_GET_WATCH_REGS:</div><div class='add'>+		ret = ptrace_get_watch_regs(child,</div><div class='add'>+			(struct pt_watch_regs __user *) (unsigned long) addr);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case PTRACE_SET_WATCH_REGS:</div><div class='add'>+		ret = ptrace_set_watch_regs(child,</div><div class='add'>+			(struct pt_watch_regs __user *) (unsigned long) addr);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='ctx'> 	default:</div><div class='ctx'> 		ret = ptrace_request(child, request, addr, data);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-out_tsk:</div><div class='del'>-	put_task_struct(child);</div><div class='ctx'> out:</div><div class='del'>-	unlock_kernel();</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/kernel/rtlx.c b/arch/mips/kernel/rtlx.c<br/>index dfd868b68364..4ce93aa7b372 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/kernel/rtlx.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/kernel/rtlx.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/kernel/rtlx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/kernel/rtlx.c</a></div><div class='hunk'>@@ -522,8 +522,8 @@ static int __init rtlx_module_init(void)</div><div class='ctx'> 		atomic_set(&amp;channel_wqs[i].in_open, 0);</div><div class='ctx'> 		mutex_init(&amp;channel_wqs[i].mutex);</div><div class='ctx'> </div><div class='del'>-		dev = device_create_drvdata(mt_class, NULL, MKDEV(major, i),</div><div class='del'>-					    NULL, "%s%d", module_name, i);</div><div class='add'>+		dev = device_create(mt_class, NULL, MKDEV(major, i), NULL,</div><div class='add'>+				    "%s%d", module_name, i);</div><div class='ctx'> 		if (IS_ERR(dev)) {</div><div class='ctx'> 			err = PTR_ERR(dev);</div><div class='ctx'> 			goto out_chrdev;</div><div class='head'>diff --git a/arch/mips/kernel/scall64-n32.S b/arch/mips/kernel/scall64-n32.S<br/>index da7f1b6ea0fb..e266b3aa6560 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/kernel/scall64-n32.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/kernel/scall64-n32.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/kernel/scall64-n32.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/kernel/scall64-n32.S</a></div><div class='hunk'>@@ -214,12 +214,12 @@ EXPORT(sysn32_call_table)</div><div class='ctx'> 	PTR	sys_fchown</div><div class='ctx'> 	PTR	sys_lchown</div><div class='ctx'> 	PTR	sys_umask</div><div class='del'>-	PTR	sys32_gettimeofday</div><div class='add'>+	PTR	compat_sys_gettimeofday</div><div class='ctx'> 	PTR	compat_sys_getrlimit		/* 6095 */</div><div class='ctx'> 	PTR	compat_sys_getrusage</div><div class='ctx'> 	PTR	compat_sys_sysinfo</div><div class='ctx'> 	PTR	compat_sys_times</div><div class='del'>-	PTR	sys32_ptrace</div><div class='add'>+	PTR	compat_sys_ptrace</div><div class='ctx'> 	PTR	sys_getuid			/* 6100 */</div><div class='ctx'> 	PTR	sys_syslog</div><div class='ctx'> 	PTR	sys_getgid</div><div class='hunk'>@@ -279,7 +279,7 @@ EXPORT(sysn32_call_table)</div><div class='ctx'> 	PTR	sys_chroot</div><div class='ctx'> 	PTR	sys_sync</div><div class='ctx'> 	PTR	sys_acct</div><div class='del'>-	PTR	sys32_settimeofday</div><div class='add'>+	PTR	compat_sys_settimeofday</div><div class='ctx'> 	PTR	compat_sys_mount		/* 6160 */</div><div class='ctx'> 	PTR	sys_umount</div><div class='ctx'> 	PTR	sys_swapon</div><div class='head'>diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S<br/>index d7cd1aac9ada..6c7ef8313ebd 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/kernel/scall64-o32.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/kernel/scall64-o32.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/kernel/scall64-o32.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/kernel/scall64-o32.S</a></div><div class='hunk'>@@ -231,7 +231,7 @@ sys_call_table:</div><div class='ctx'> 	PTR	sys_setuid</div><div class='ctx'> 	PTR	sys_getuid</div><div class='ctx'> 	PTR	compat_sys_stime		/* 4025 */</div><div class='del'>-	PTR	sys32_ptrace</div><div class='add'>+	PTR	compat_sys_ptrace</div><div class='ctx'> 	PTR	sys_alarm</div><div class='ctx'> 	PTR	sys_ni_syscall			/* was sys_fstat */</div><div class='ctx'> 	PTR	sys_pause</div><div class='hunk'>@@ -283,8 +283,8 @@ sys_call_table:</div><div class='ctx'> 	PTR	compat_sys_setrlimit		/* 4075 */</div><div class='ctx'> 	PTR	compat_sys_getrlimit</div><div class='ctx'> 	PTR	compat_sys_getrusage</div><div class='del'>-	PTR	sys32_gettimeofday</div><div class='del'>-	PTR	sys32_settimeofday</div><div class='add'>+	PTR	compat_sys_gettimeofday</div><div class='add'>+	PTR	compat_sys_settimeofday</div><div class='ctx'> 	PTR	sys_getgroups			/* 4080 */</div><div class='ctx'> 	PTR	sys_setgroups</div><div class='ctx'> 	PTR	sys_ni_syscall			/* old_select */</div><div class='head'>diff --git a/arch/mips/kernel/signal32.c b/arch/mips/kernel/signal32.c<br/>index 572c610db1b1..652709b353ad 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/kernel/signal32.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/kernel/signal32.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/kernel/signal32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/kernel/signal32.c</a></div><div class='hunk'>@@ -482,6 +482,18 @@ int copy_siginfo_to_user32(compat_siginfo_t __user *to, siginfo_t *from)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int copy_siginfo_from_user32(siginfo_t *to, compat_siginfo_t __user *from)</div><div class='add'>+{</div><div class='add'>+	memset(to, 0, sizeof *to);</div><div class='add'>+</div><div class='add'>+	if (copy_from_user(to, from, 3*sizeof(int)) ||</div><div class='add'>+	    copy_from_user(to-&gt;_sifields._pad,</div><div class='add'>+			   from-&gt;_sifields._pad, SI_PAD_SIZE32))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> asmlinkage void sys32_sigreturn(nabi_no_regargs struct pt_regs regs)</div><div class='ctx'> {</div><div class='ctx'> 	struct sigframe32 __user *frame;</div><div class='head'>diff --git a/arch/mips/kernel/smp.c b/arch/mips/kernel/smp.c<br/>index 4410f172b8ab..7b59cfb7e602 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/kernel/smp.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/kernel/smp.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/kernel/smp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/kernel/smp.c</a></div><div class='hunk'>@@ -121,6 +121,8 @@ asmlinkage __cpuinit void start_secondary(void)</div><div class='ctx'> 	cpu = smp_processor_id();</div><div class='ctx'> 	cpu_data[cpu].udelay_val = loops_per_jiffy;</div><div class='ctx'> </div><div class='add'>+	notify_cpu_starting(cpu);</div><div class='add'>+</div><div class='ctx'> 	mp_ops-&gt;smp_finish();</div><div class='ctx'> 	set_cpu_sibling_map(cpu);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/kernel/syscall.c b/arch/mips/kernel/syscall.c<br/>index 343015a2f418..37970d9b2186 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/kernel/syscall.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/kernel/syscall.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/kernel/syscall.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/kernel/syscall.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  * Copyright (C) 1999, 2000 Silicon Graphics, Inc.</div><div class='ctx'>  * Copyright (C) 2001 MIPS Technologies, Inc.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/a.out.h&gt;</div><div class='ctx'> #include &lt;linux/capability.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='head'>diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c<br/>index b602ac6eb47d..80b9e070c207 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/kernel/traps.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/kernel/traps.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/kernel/traps.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/kernel/traps.c</a></div><div class='hunk'>@@ -42,6 +42,7 @@</div><div class='ctx'> #include &lt;asm/tlbdebug.h&gt;</div><div class='ctx'> #include &lt;asm/traps.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;asm/watch.h&gt;</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='ctx'> #include &lt;asm/types.h&gt;</div><div class='ctx'> #include &lt;asm/stacktrace.h&gt;</div><div class='hunk'>@@ -912,13 +913,26 @@ asmlinkage void do_mdmx(struct pt_regs *regs)</div><div class='ctx'> </div><div class='ctx'> asmlinkage void do_watch(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='add'>+	u32 cause;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='del'>-	 * We use the watch exception where available to detect stack</div><div class='del'>-	 * overflows.</div><div class='add'>+	 * Clear WP (bit 22) bit of cause register so we don't loop</div><div class='add'>+	 * forever.</div><div class='ctx'> 	 */</div><div class='del'>-	dump_tlb_all();</div><div class='del'>-	show_regs(regs);</div><div class='del'>-	panic("Caught WATCH exception - probably caused by stack overflow.");</div><div class='add'>+	cause = read_c0_cause();</div><div class='add'>+	cause &amp;= ~(1 &lt;&lt; 22);</div><div class='add'>+	write_c0_cause(cause);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If the current thread has the watch registers loaded, save</div><div class='add'>+	 * their values and send SIGTRAP.  Otherwise another thread</div><div class='add'>+	 * left the registers set, clear them and continue.</div><div class='add'>+	 */</div><div class='add'>+	if (test_tsk_thread_flag(current, TIF_LOAD_WATCH)) {</div><div class='add'>+		mips_read_watch_registers();</div><div class='add'>+		force_sig(SIGTRAP, current);</div><div class='add'>+	} else</div><div class='add'>+		mips_clear_watch_registers();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> asmlinkage void do_mcheck(struct pt_regs *regs)</div><div class='head'>diff --git a/arch/mips/kernel/vmlinux.lds.S b/arch/mips/kernel/vmlinux.lds.S<br/>index afb119f35682..58738c8d754f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/kernel/vmlinux.lds.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/kernel/vmlinux.lds.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/kernel/vmlinux.lds.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/kernel/vmlinux.lds.S</a></div><div class='hunk'>@@ -104,7 +104,7 @@ SECTIONS</div><div class='ctx'> 	. = ALIGN(_PAGE_SIZE);</div><div class='ctx'> 	__nosave_end = .;</div><div class='ctx'> </div><div class='del'>-	. = ALIGN(32);</div><div class='add'>+	. = ALIGN(1 &lt;&lt; CONFIG_MIPS_L1_CACHE_SHIFT);</div><div class='ctx'> 	.data.cacheline_aligned : {</div><div class='ctx'> 		*(.data.cacheline_aligned)</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/mips/kernel/watch.c b/arch/mips/kernel/watch.c<br/>new file mode 100644<br/>index 000000000000..c15406968030<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/kernel/watch.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/kernel/watch.c</a></div><div class='hunk'>@@ -0,0 +1,188 @@</div><div class='add'>+/*</div><div class='add'>+ * This file is subject to the terms and conditions of the GNU General Public</div><div class='add'>+ * License.  See the file "COPYING" in the main directory of this archive</div><div class='add'>+ * for more details.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2008 David Daney</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/processor.h&gt;</div><div class='add'>+#include &lt;asm/watch.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Install the watch registers for the current thread.  A maximum of</div><div class='add'>+ * four registers are installed although the machine may have more.</div><div class='add'>+ */</div><div class='add'>+void mips_install_watch_registers(void)</div><div class='add'>+{</div><div class='add'>+	struct mips3264_watch_reg_state *watches =</div><div class='add'>+		&amp;current-&gt;thread.watch.mips3264;</div><div class='add'>+	switch (current_cpu_data.watch_reg_use_cnt) {</div><div class='add'>+	default:</div><div class='add'>+		BUG();</div><div class='add'>+	case 4:</div><div class='add'>+		write_c0_watchlo3(watches-&gt;watchlo[3]);</div><div class='add'>+		/* Write 1 to the I, R, and W bits to clear them, and</div><div class='add'>+		   1 to G so all ASIDs are trapped. */</div><div class='add'>+		write_c0_watchhi3(0x40000007 | watches-&gt;watchhi[3]);</div><div class='add'>+	case 3:</div><div class='add'>+		write_c0_watchlo2(watches-&gt;watchlo[2]);</div><div class='add'>+		write_c0_watchhi2(0x40000007 | watches-&gt;watchhi[2]);</div><div class='add'>+	case 2:</div><div class='add'>+		write_c0_watchlo1(watches-&gt;watchlo[1]);</div><div class='add'>+		write_c0_watchhi1(0x40000007 | watches-&gt;watchhi[1]);</div><div class='add'>+	case 1:</div><div class='add'>+		write_c0_watchlo0(watches-&gt;watchlo[0]);</div><div class='add'>+		write_c0_watchhi0(0x40000007 | watches-&gt;watchhi[0]);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Read back the watchhi registers so the user space debugger has</div><div class='add'>+ * access to the I, R, and W bits.  A maximum of four registers are</div><div class='add'>+ * read although the machine may have more.</div><div class='add'>+ */</div><div class='add'>+void mips_read_watch_registers(void)</div><div class='add'>+{</div><div class='add'>+	struct mips3264_watch_reg_state *watches =</div><div class='add'>+		&amp;current-&gt;thread.watch.mips3264;</div><div class='add'>+	switch (current_cpu_data.watch_reg_use_cnt) {</div><div class='add'>+	default:</div><div class='add'>+		BUG();</div><div class='add'>+	case 4:</div><div class='add'>+		watches-&gt;watchhi[3] = (read_c0_watchhi3() &amp; 0x0fff);</div><div class='add'>+	case 3:</div><div class='add'>+		watches-&gt;watchhi[2] = (read_c0_watchhi2() &amp; 0x0fff);</div><div class='add'>+	case 2:</div><div class='add'>+		watches-&gt;watchhi[1] = (read_c0_watchhi1() &amp; 0x0fff);</div><div class='add'>+	case 1:</div><div class='add'>+		watches-&gt;watchhi[0] = (read_c0_watchhi0() &amp; 0x0fff);</div><div class='add'>+	}</div><div class='add'>+	if (current_cpu_data.watch_reg_use_cnt == 1 &amp;&amp;</div><div class='add'>+	    (watches-&gt;watchhi[0] &amp; 7) == 0) {</div><div class='add'>+		/* Pathological case of release 1 architecture that</div><div class='add'>+		 * doesn't set the condition bits.  We assume that</div><div class='add'>+		 * since we got here, the watch condition was met and</div><div class='add'>+		 * signal that the conditions requested in watchlo</div><div class='add'>+		 * were met.  */</div><div class='add'>+		watches-&gt;watchhi[0] |= (watches-&gt;watchlo[0] &amp; 7);</div><div class='add'>+	}</div><div class='add'>+ }</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Disable all watch registers.  Although only four registers are</div><div class='add'>+ * installed, all are cleared to eliminate the possibility of endless</div><div class='add'>+ * looping in the watch handler.</div><div class='add'>+ */</div><div class='add'>+void mips_clear_watch_registers(void)</div><div class='add'>+{</div><div class='add'>+	switch (current_cpu_data.watch_reg_count) {</div><div class='add'>+	default:</div><div class='add'>+		BUG();</div><div class='add'>+	case 8:</div><div class='add'>+		write_c0_watchlo7(0);</div><div class='add'>+	case 7:</div><div class='add'>+		write_c0_watchlo6(0);</div><div class='add'>+	case 6:</div><div class='add'>+		write_c0_watchlo5(0);</div><div class='add'>+	case 5:</div><div class='add'>+		write_c0_watchlo4(0);</div><div class='add'>+	case 4:</div><div class='add'>+		write_c0_watchlo3(0);</div><div class='add'>+	case 3:</div><div class='add'>+		write_c0_watchlo2(0);</div><div class='add'>+	case 2:</div><div class='add'>+		write_c0_watchlo1(0);</div><div class='add'>+	case 1:</div><div class='add'>+		write_c0_watchlo0(0);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__cpuinit void mips_probe_watch_registers(struct cpuinfo_mips *c)</div><div class='add'>+{</div><div class='add'>+	unsigned int t;</div><div class='add'>+</div><div class='add'>+	if ((c-&gt;options &amp; MIPS_CPU_WATCH) == 0)</div><div class='add'>+		return;</div><div class='add'>+	/*</div><div class='add'>+	 * Check which of the I,R and W bits are supported, then</div><div class='add'>+	 * disable the register.</div><div class='add'>+	 */</div><div class='add'>+	write_c0_watchlo0(7);</div><div class='add'>+	t = read_c0_watchlo0();</div><div class='add'>+	write_c0_watchlo0(0);</div><div class='add'>+	c-&gt;watch_reg_masks[0] = t &amp; 7;</div><div class='add'>+</div><div class='add'>+	/* Write the mask bits and read them back to determine which</div><div class='add'>+	 * can be used. */</div><div class='add'>+	c-&gt;watch_reg_count = 1;</div><div class='add'>+	c-&gt;watch_reg_use_cnt = 1;</div><div class='add'>+	t = read_c0_watchhi0();</div><div class='add'>+	write_c0_watchhi0(t | 0xff8);</div><div class='add'>+	t = read_c0_watchhi0();</div><div class='add'>+	c-&gt;watch_reg_masks[0] |= (t &amp; 0xff8);</div><div class='add'>+	if ((t &amp; 0x80000000) == 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	write_c0_watchlo1(7);</div><div class='add'>+	t = read_c0_watchlo1();</div><div class='add'>+	write_c0_watchlo1(0);</div><div class='add'>+	c-&gt;watch_reg_masks[1] = t &amp; 7;</div><div class='add'>+</div><div class='add'>+	c-&gt;watch_reg_count = 2;</div><div class='add'>+	c-&gt;watch_reg_use_cnt = 2;</div><div class='add'>+	t = read_c0_watchhi1();</div><div class='add'>+	write_c0_watchhi1(t | 0xff8);</div><div class='add'>+	t = read_c0_watchhi1();</div><div class='add'>+	c-&gt;watch_reg_masks[1] |= (t &amp; 0xff8);</div><div class='add'>+	if ((t &amp; 0x80000000) == 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	write_c0_watchlo2(7);</div><div class='add'>+	t = read_c0_watchlo2();</div><div class='add'>+	write_c0_watchlo2(0);</div><div class='add'>+	c-&gt;watch_reg_masks[2] = t &amp; 7;</div><div class='add'>+</div><div class='add'>+	c-&gt;watch_reg_count = 3;</div><div class='add'>+	c-&gt;watch_reg_use_cnt = 3;</div><div class='add'>+	t = read_c0_watchhi2();</div><div class='add'>+	write_c0_watchhi2(t | 0xff8);</div><div class='add'>+	t = read_c0_watchhi2();</div><div class='add'>+	c-&gt;watch_reg_masks[2] |= (t &amp; 0xff8);</div><div class='add'>+	if ((t &amp; 0x80000000) == 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	write_c0_watchlo3(7);</div><div class='add'>+	t = read_c0_watchlo3();</div><div class='add'>+	write_c0_watchlo3(0);</div><div class='add'>+	c-&gt;watch_reg_masks[3] = t &amp; 7;</div><div class='add'>+</div><div class='add'>+	c-&gt;watch_reg_count = 4;</div><div class='add'>+	c-&gt;watch_reg_use_cnt = 4;</div><div class='add'>+	t = read_c0_watchhi3();</div><div class='add'>+	write_c0_watchhi3(t | 0xff8);</div><div class='add'>+	t = read_c0_watchhi3();</div><div class='add'>+	c-&gt;watch_reg_masks[3] |= (t &amp; 0xff8);</div><div class='add'>+	if ((t &amp; 0x80000000) == 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* We use at most 4, but probe and report up to 8. */</div><div class='add'>+	c-&gt;watch_reg_count = 5;</div><div class='add'>+	t = read_c0_watchhi4();</div><div class='add'>+	if ((t &amp; 0x80000000) == 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	c-&gt;watch_reg_count = 6;</div><div class='add'>+	t = read_c0_watchhi5();</div><div class='add'>+	if ((t &amp; 0x80000000) == 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	c-&gt;watch_reg_count = 7;</div><div class='add'>+	t = read_c0_watchhi6();</div><div class='add'>+	if ((t &amp; 0x80000000) == 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	c-&gt;watch_reg_count = 8;</div><div class='add'>+}</div><div class='head'>diff --git a/arch/mips/lasat/sysctl.c b/arch/mips/lasat/sysctl.c<br/>index 866881ec0cf8..8f88886feb12 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/lasat/sysctl.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/lasat/sysctl.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/lasat/sysctl.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/lasat/sysctl.c</a></div><div class='hunk'>@@ -38,14 +38,13 @@</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* Strategy function to write EEPROM after changing string entry */</div><div class='del'>-int sysctl_lasatstring(ctl_table *table, int *name, int nlen,</div><div class='add'>+int sysctl_lasatstring(ctl_table *table,</div><div class='ctx'> 		void *oldval, size_t *oldlenp,</div><div class='ctx'> 		void *newval, size_t newlen)</div><div class='ctx'> {</div><div class='ctx'> 	int r;</div><div class='ctx'> </div><div class='del'>-	r = sysctl_string(table, name,</div><div class='del'>-			  nlen, oldval, oldlenp, newval, newlen);</div><div class='add'>+	r = sysctl_string(table, oldval, oldlenp, newval, newlen);</div><div class='ctx'> 	if (r &lt; 0)</div><div class='ctx'> 		return r;</div><div class='ctx'> </div><div class='hunk'>@@ -113,13 +112,13 @@ int proc_dolasatrtc(ctl_table *table, int write, struct file *filp,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* Sysctl for setting the IP addresses */</div><div class='del'>-int sysctl_lasat_intvec(ctl_table *table, int *name, int nlen,</div><div class='add'>+int sysctl_lasat_intvec(ctl_table *table,</div><div class='ctx'> 		    void *oldval, size_t *oldlenp,</div><div class='ctx'> 		    void *newval, size_t newlen)</div><div class='ctx'> {</div><div class='ctx'> 	int r;</div><div class='ctx'> </div><div class='del'>-	r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen);</div><div class='add'>+	r = sysctl_intvec(table, oldval, oldlenp, newval, newlen);</div><div class='ctx'> 	if (r &lt; 0)</div><div class='ctx'> 		return r;</div><div class='ctx'> </div><div class='hunk'>@@ -131,7 +130,7 @@ int sysctl_lasat_intvec(ctl_table *table, int *name, int nlen,</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_DS1603</div><div class='ctx'> /* Same for RTC */</div><div class='del'>-int sysctl_lasat_rtc(ctl_table *table, int *name, int nlen,</div><div class='add'>+int sysctl_lasat_rtc(ctl_table *table,</div><div class='ctx'> 		    void *oldval, size_t *oldlenp,</div><div class='ctx'> 		    void *newval, size_t newlen)</div><div class='ctx'> {</div><div class='hunk'>@@ -140,7 +139,7 @@ int sysctl_lasat_rtc(ctl_table *table, int *name, int nlen,</div><div class='ctx'> 	rtctmp = read_persistent_clock();</div><div class='ctx'> 	if (rtctmp &lt; 0)</div><div class='ctx'> 		rtctmp = 0;</div><div class='del'>-	r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen);</div><div class='add'>+	r = sysctl_intvec(table, oldval, oldlenp, newval, newlen);</div><div class='ctx'> 	if (r &lt; 0)</div><div class='ctx'> 		return r;</div><div class='ctx'> 	if (newval &amp;&amp; newlen)</div><div class='hunk'>@@ -211,13 +210,13 @@ int proc_lasat_ip(ctl_table *table, int write, struct file *filp,</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static int sysctl_lasat_prid(ctl_table *table, int *name, int nlen,</div><div class='add'>+static int sysctl_lasat_prid(ctl_table *table,</div><div class='ctx'> 				     void *oldval, size_t *oldlenp,</div><div class='ctx'> 				     void *newval, size_t newlen)</div><div class='ctx'> {</div><div class='ctx'> 	int r;</div><div class='ctx'> </div><div class='del'>-	r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen);</div><div class='add'>+	r = sysctl_intvec(table, oldval, oldlenp, newval, newlen);</div><div class='ctx'> 	if (r &lt; 0)</div><div class='ctx'> 		return r;</div><div class='ctx'> 	if (newval &amp;&amp; newlen) {</div><div class='head'>diff --git a/arch/mips/lib/csum_partial.S b/arch/mips/lib/csum_partial.S<br/>index edac9892c51a..6b876ca299ee 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/lib/csum_partial.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/lib/csum_partial.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/lib/csum_partial.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/lib/csum_partial.S</a></div><div class='hunk'>@@ -55,20 +55,14 @@</div><div class='ctx'> #define UNIT(unit)  ((unit)*NBYTES)</div><div class='ctx'> </div><div class='ctx'> #define ADDC(sum,reg)						\</div><div class='del'>-	.set	push;						\</div><div class='del'>-	.set	noat;						\</div><div class='ctx'> 	ADD	sum, reg;					\</div><div class='ctx'> 	sltu	v1, sum, reg;					\</div><div class='ctx'> 	ADD	sum, v1;					\</div><div class='del'>-	.set	pop</div><div class='ctx'> </div><div class='ctx'> #define ADDC32(sum,reg)						\</div><div class='del'>-	.set	push;						\</div><div class='del'>-	.set	noat;						\</div><div class='ctx'> 	addu	sum, reg;					\</div><div class='ctx'> 	sltu	v1, sum, reg;					\</div><div class='ctx'> 	addu	sum, v1;					\</div><div class='del'>-	.set	pop</div><div class='ctx'> </div><div class='ctx'> #define CSUM_BIGCHUNK1(src, offset, sum, _t0, _t1, _t2, _t3)	\</div><div class='ctx'> 	LOAD	_t0, (offset + UNIT(0))(src);			\</div><div class='hunk'>@@ -267,8 +261,6 @@ LEAF(csum_partial)</div><div class='ctx'> 1:	ADDC(sum, t1)</div><div class='ctx'> </div><div class='ctx'> 	/* fold checksum */</div><div class='del'>-	.set	push</div><div class='del'>-	.set	noat</div><div class='ctx'> #ifdef USE_DOUBLE</div><div class='ctx'> 	dsll32	v1, sum, 0</div><div class='ctx'> 	daddu	sum, v1</div><div class='hunk'>@@ -276,21 +268,22 @@ LEAF(csum_partial)</div><div class='ctx'> 	dsra32	sum, sum, 0</div><div class='ctx'> 	addu	sum, v1</div><div class='ctx'> #endif</div><div class='del'>-	sll	v1, sum, 16</div><div class='del'>-	addu	sum, v1</div><div class='del'>-	sltu	v1, sum, v1</div><div class='del'>-	srl	sum, sum, 16</div><div class='del'>-	addu	sum, v1</div><div class='ctx'> </div><div class='ctx'> 	/* odd buffer alignment? */</div><div class='del'>-	beqz	t7, 1f</div><div class='del'>-	 nop</div><div class='del'>-	sll	v1, sum, 8</div><div class='add'>+#ifdef CPU_MIPSR2</div><div class='add'>+	wsbh	v1, sum</div><div class='add'>+	movn	sum, v1, t7</div><div class='add'>+#else</div><div class='add'>+	beqz	t7, 1f			/* odd buffer alignment? */</div><div class='add'>+	 lui	v1, 0x00ff</div><div class='add'>+	addu	v1, 0x00ff</div><div class='add'>+	and	t0, sum, v1</div><div class='add'>+	sll	t0, t0, 8</div><div class='ctx'> 	srl	sum, sum, 8</div><div class='del'>-	or	sum, v1</div><div class='del'>-	andi	sum, 0xffff</div><div class='del'>-	.set	pop</div><div class='add'>+	and	sum, sum, v1</div><div class='add'>+	or	sum, sum, t0</div><div class='ctx'> 1:</div><div class='add'>+#endif</div><div class='ctx'> 	.set	reorder</div><div class='ctx'> 	/* Add the passed partial csum.  */</div><div class='ctx'> 	ADDC32(sum, a2)</div><div class='hunk'>@@ -669,8 +662,6 @@ EXC(	sb	t0, NBYTES-2(dst), .Ls_exc)</div><div class='ctx'> 	ADDC(sum, t2)</div><div class='ctx'> .Ldone:</div><div class='ctx'> 	/* fold checksum */</div><div class='del'>-	.set	push</div><div class='del'>-	.set	noat</div><div class='ctx'> #ifdef USE_DOUBLE</div><div class='ctx'> 	dsll32	v1, sum, 0</div><div class='ctx'> 	daddu	sum, v1</div><div class='hunk'>@@ -678,21 +669,21 @@ EXC(	sb	t0, NBYTES-2(dst), .Ls_exc)</div><div class='ctx'> 	dsra32	sum, sum, 0</div><div class='ctx'> 	addu	sum, v1</div><div class='ctx'> #endif</div><div class='del'>-	sll	v1, sum, 16</div><div class='del'>-	addu	sum, v1</div><div class='del'>-	sltu	v1, sum, v1</div><div class='del'>-	srl	sum, sum, 16</div><div class='del'>-	addu	sum, v1</div><div class='ctx'> </div><div class='del'>-	/* odd buffer alignment? */</div><div class='del'>-	beqz	odd, 1f</div><div class='del'>-	 nop</div><div class='del'>-	sll	v1, sum, 8</div><div class='add'>+#ifdef CPU_MIPSR2</div><div class='add'>+	wsbh	v1, sum</div><div class='add'>+	movn	sum, v1, odd</div><div class='add'>+#else</div><div class='add'>+	beqz	odd, 1f			/* odd buffer alignment? */</div><div class='add'>+	 lui	v1, 0x00ff</div><div class='add'>+	addu	v1, 0x00ff</div><div class='add'>+	and	t0, sum, v1</div><div class='add'>+	sll	t0, t0, 8</div><div class='ctx'> 	srl	sum, sum, 8</div><div class='del'>-	or	sum, v1</div><div class='del'>-	andi	sum, 0xffff</div><div class='del'>-	.set	pop</div><div class='add'>+	and	sum, sum, v1</div><div class='add'>+	or	sum, sum, t0</div><div class='ctx'> 1:</div><div class='add'>+#endif</div><div class='ctx'> 	.set reorder</div><div class='ctx'> 	ADDC32(sum, psum)</div><div class='ctx'> 	jr	ra</div><div class='head'>diff --git a/arch/mips/pci/Makefile b/arch/mips/pci/Makefile<br/>index c8c32f417b6c..b1886244cedf 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/pci/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/pci/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/pci/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/pci/Makefile</a></div><div class='hunk'>@@ -45,6 +45,7 @@ obj-$(CONFIG_TANBAC_TB0287)	+= fixup-tb0287.o</div><div class='ctx'> obj-$(CONFIG_TOSHIBA_JMR3927)	+= fixup-jmr3927.o</div><div class='ctx'> obj-$(CONFIG_SOC_TX4927)	+= pci-tx4927.o</div><div class='ctx'> obj-$(CONFIG_SOC_TX4938)	+= pci-tx4938.o</div><div class='add'>+obj-$(CONFIG_SOC_TX4939)	+= pci-tx4939.o</div><div class='ctx'> obj-$(CONFIG_TOSHIBA_RBTX4927)	+= fixup-rbtx4927.o</div><div class='ctx'> obj-$(CONFIG_TOSHIBA_RBTX4938)	+= fixup-rbtx4938.o</div><div class='ctx'> obj-$(CONFIG_VICTOR_MPC30X)	+= fixup-mpc30x.o</div><div class='head'>diff --git a/arch/mips/pci/fixup-emma2rh.c b/arch/mips/pci/fixup-emma2rh.c<br/>index a2705895561d..846eae9cdd05 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/pci/fixup-emma2rh.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/pci/fixup-emma2rh.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/pci/fixup-emma2rh.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/pci/fixup-emma2rh.c</a></div><div class='hunk'>@@ -29,7 +29,6 @@</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/bootinfo.h&gt;</div><div class='del'>-#include &lt;asm/debug.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/emma2rh/emma2rh.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/pci/ops-pnx8550.c b/arch/mips/pci/ops-pnx8550.c<br/>index 0e160d9f07c3..1e6213fa7bdb 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/pci/ops-pnx8550.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/pci/ops-pnx8550.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/pci/ops-pnx8550.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/pci/ops-pnx8550.c</a></div><div class='hunk'>@@ -29,8 +29,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach-pnx8550/pci.h&gt;</div><div class='ctx'> #include &lt;asm/mach-pnx8550/glb.h&gt;</div><div class='del'>-#include &lt;asm/debug.h&gt;</div><div class='del'>-</div><div class='ctx'> </div><div class='ctx'> static inline void clear_status(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/mips/pci/pci-emma2rh.c b/arch/mips/pci/pci-emma2rh.c<br/>index d99591a0cdfe..772e283daa63 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/pci/pci-emma2rh.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/pci/pci-emma2rh.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/pci/pci-emma2rh.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/pci/pci-emma2rh.c</a></div><div class='hunk'>@@ -29,7 +29,6 @@</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/bootinfo.h&gt;</div><div class='del'>-#include &lt;asm/debug.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/emma2rh/emma2rh.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/pci/pci-tx4938.c b/arch/mips/pci/pci-tx4938.c<br/>index 60e2c52c2c5e..1ea257bc3b8f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/pci/pci-tx4938.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/pci/pci-tx4938.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/pci/pci-tx4938.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/pci/pci-tx4938.c</a></div><div class='hunk'>@@ -114,7 +114,7 @@ int __init tx4938_pciclk66_setup(void)</div><div class='ctx'> 	return pciclk;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int tx4938_pcic1_map_irq(const struct pci_dev *dev, u8 slot)</div><div class='add'>+int __init tx4938_pcic1_map_irq(const struct pci_dev *dev, u8 slot)</div><div class='ctx'> {</div><div class='ctx'> 	if (get_tx4927_pcicptr(dev-&gt;bus-&gt;sysdata) == tx4938_pcic1ptr) {</div><div class='ctx'> 		switch (slot) {</div><div class='head'>diff --git a/arch/mips/pci/pci-tx4939.c b/arch/mips/pci/pci-tx4939.c<br/>new file mode 100644<br/>index 000000000000..5fecf1cdc325<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/pci/pci-tx4939.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/pci/pci-tx4939.c</a></div><div class='hunk'>@@ -0,0 +1,109 @@</div><div class='add'>+/*</div><div class='add'>+ * linux/arch/mips/pci/pci-tx4939.c</div><div class='add'>+ *</div><div class='add'>+ * Based on linux/arch/mips/txx9/rbtx4939/setup.c,</div><div class='add'>+ *	    and RBTX49xx patch from CELF patch archive.</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2001, 2003-2005 MontaVista Software Inc.</div><div class='add'>+ * Copyright (C) 2004 by Ralf Baechle (ralf@linux-mips.org)</div><div class='add'>+ * (C) Copyright TOSHIBA CORPORATION 2000-2001, 2004-2007</div><div class='add'>+ *</div><div class='add'>+ * This file is subject to the terms and conditions of the GNU General Public</div><div class='add'>+ * License.  See the file "COPYING" in the main directory of this archive</div><div class='add'>+ * for more details.</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;asm/txx9/generic.h&gt;</div><div class='add'>+#include &lt;asm/txx9/tx4939.h&gt;</div><div class='add'>+</div><div class='add'>+int __init tx4939_report_pciclk(void)</div><div class='add'>+{</div><div class='add'>+	int pciclk = 0;</div><div class='add'>+</div><div class='add'>+	pr_info("PCIC --%s PCICLK:",</div><div class='add'>+		(__raw_readq(&amp;tx4939_ccfgptr-&gt;ccfg) &amp; TX4939_CCFG_PCI66) ?</div><div class='add'>+		" PCI66" : "");</div><div class='add'>+	if (__raw_readq(&amp;tx4939_ccfgptr-&gt;pcfg) &amp; TX4939_PCFG_PCICLKEN_ALL) {</div><div class='add'>+		pciclk = txx9_master_clock * 20 / 6;</div><div class='add'>+		if (!(__raw_readq(&amp;tx4939_ccfgptr-&gt;ccfg) &amp; TX4939_CCFG_PCI66))</div><div class='add'>+			pciclk /= 2;</div><div class='add'>+		printk(KERN_CONT "Internal(%u.%uMHz)",</div><div class='add'>+		       (pciclk + 50000) / 1000000,</div><div class='add'>+		       ((pciclk + 50000) / 100000) % 10);</div><div class='add'>+	} else {</div><div class='add'>+		printk(KERN_CONT "External");</div><div class='add'>+		pciclk = -1;</div><div class='add'>+	}</div><div class='add'>+	printk(KERN_CONT "\n");</div><div class='add'>+	return pciclk;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init tx4939_report_pci1clk(void)</div><div class='add'>+{</div><div class='add'>+	unsigned int pciclk = txx9_master_clock * 20 / 6;</div><div class='add'>+</div><div class='add'>+	pr_info("PCIC1 -- PCICLK:%u.%uMHz\n",</div><div class='add'>+		(pciclk + 50000) / 1000000,</div><div class='add'>+		((pciclk + 50000) / 100000) % 10);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int __init tx4939_pcic1_map_irq(const struct pci_dev *dev, u8 slot)</div><div class='add'>+{</div><div class='add'>+	if (get_tx4927_pcicptr(dev-&gt;bus-&gt;sysdata) == tx4939_pcic1ptr) {</div><div class='add'>+		switch (slot) {</div><div class='add'>+		case TX4927_PCIC_IDSEL_AD_TO_SLOT(31):</div><div class='add'>+			if (__raw_readq(&amp;tx4939_ccfgptr-&gt;pcfg) &amp;</div><div class='add'>+			    TX4939_PCFG_ET0MODE)</div><div class='add'>+				return TXX9_IRQ_BASE + TX4939_IR_ETH(0);</div><div class='add'>+			break;</div><div class='add'>+		case TX4927_PCIC_IDSEL_AD_TO_SLOT(30):</div><div class='add'>+			if (__raw_readq(&amp;tx4939_ccfgptr-&gt;pcfg) &amp;</div><div class='add'>+			    TX4939_PCFG_ET1MODE)</div><div class='add'>+				return TXX9_IRQ_BASE + TX4939_IR_ETH(1);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int __init tx4939_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)</div><div class='add'>+{</div><div class='add'>+	int irq = tx4939_pcic1_map_irq(dev, slot);</div><div class='add'>+</div><div class='add'>+	if (irq &gt;= 0)</div><div class='add'>+		return irq;</div><div class='add'>+	irq = pin;</div><div class='add'>+	/* IRQ rotation */</div><div class='add'>+	irq--;	/* 0-3 */</div><div class='add'>+	irq = (irq + 33 - slot) % 4;</div><div class='add'>+	irq++;	/* 1-4 */</div><div class='add'>+</div><div class='add'>+	switch (irq) {</div><div class='add'>+	case 1:</div><div class='add'>+		irq = TXX9_IRQ_BASE + TX4939_IR_INTA;</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		irq = TXX9_IRQ_BASE + TX4939_IR_INTB;</div><div class='add'>+		break;</div><div class='add'>+	case 3:</div><div class='add'>+		irq = TXX9_IRQ_BASE + TX4939_IR_INTC;</div><div class='add'>+		break;</div><div class='add'>+	case 4:</div><div class='add'>+		irq = TXX9_IRQ_BASE + TX4939_IR_INTD;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return irq;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init tx4939_setup_pcierr_irq(void)</div><div class='add'>+{</div><div class='add'>+	if (request_irq(TXX9_IRQ_BASE + TX4939_IR_PCIERR,</div><div class='add'>+			tx4927_pcierr_interrupt,</div><div class='add'>+			IRQF_DISABLED, "PCI error",</div><div class='add'>+			(void *)TX4939_PCIC_REG))</div><div class='add'>+		pr_warning("Failed to request irq for PCIERR\n");</div><div class='add'>+}</div><div class='head'>diff --git a/arch/mips/pci/pci.c b/arch/mips/pci/pci.c<br/>index c7fe6ec621e6..a377e9d2d029 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/pci/pci.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/pci/pci.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/pci/pci.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/pci/pci.c</a></div><div class='hunk'>@@ -34,6 +34,8 @@ static struct pci_controller *hose_head, **hose_tail = &amp;hose_head;</div><div class='ctx'> unsigned long PCIBIOS_MIN_IO	= 0x0000;</div><div class='ctx'> unsigned long PCIBIOS_MIN_MEM	= 0;</div><div class='ctx'> </div><div class='add'>+static int pci_initialized;</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * We need to avoid collisions with `mirrored' VGA ports</div><div class='ctx'>  * and other strange ISA hardware, so we always want the</div><div class='hunk'>@@ -74,6 +76,42 @@ pcibios_align_resource(void *data, struct resource *res,</div><div class='ctx'> 	res-&gt;start = start;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void __devinit pcibios_scanbus(struct pci_controller *hose)</div><div class='add'>+{</div><div class='add'>+	static int next_busno;</div><div class='add'>+	static int need_domain_info;</div><div class='add'>+	struct pci_bus *bus;</div><div class='add'>+</div><div class='add'>+	if (!hose-&gt;iommu)</div><div class='add'>+		PCI_DMA_BUS_IS_PHYS = 1;</div><div class='add'>+</div><div class='add'>+	if (hose-&gt;get_busno &amp;&amp; pci_probe_only)</div><div class='add'>+		next_busno = (*hose-&gt;get_busno)();</div><div class='add'>+</div><div class='add'>+	bus = pci_scan_bus(next_busno, hose-&gt;pci_ops, hose);</div><div class='add'>+	hose-&gt;bus = bus;</div><div class='add'>+</div><div class='add'>+	need_domain_info = need_domain_info || hose-&gt;index;</div><div class='add'>+	hose-&gt;need_domain_info = need_domain_info;</div><div class='add'>+	if (bus) {</div><div class='add'>+		next_busno = bus-&gt;subordinate + 1;</div><div class='add'>+		/* Don't allow 8-bit bus number overflow inside the hose -</div><div class='add'>+		   reserve some space for bridges. */</div><div class='add'>+		if (next_busno &gt; 224) {</div><div class='add'>+			next_busno = 0;</div><div class='add'>+			need_domain_info = 1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!pci_probe_only) {</div><div class='add'>+			pci_bus_size_bridges(bus);</div><div class='add'>+			pci_bus_assign_resources(bus);</div><div class='add'>+			pci_enable_bridges(bus);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static DEFINE_MUTEX(pci_scan_mutex);</div><div class='add'>+</div><div class='ctx'> void __devinit register_pci_controller(struct pci_controller *hose)</div><div class='ctx'> {</div><div class='ctx'> 	if (request_resource(&amp;iomem_resource, hose-&gt;mem_resource) &lt; 0)</div><div class='hunk'>@@ -93,6 +131,17 @@ void __devinit register_pci_controller(struct pci_controller *hose)</div><div class='ctx'> 		printk(KERN_WARNING</div><div class='ctx'> 		       "registering PCI controller with io_map_base unset\n");</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Scan the bus if it is register after the PCI subsystem</div><div class='add'>+	 * initialization.</div><div class='add'>+	 */</div><div class='add'>+	if (pci_initialized) {</div><div class='add'>+		mutex_lock(&amp;pci_scan_mutex);</div><div class='add'>+		pcibios_scanbus(hose);</div><div class='add'>+		mutex_unlock(&amp;pci_scan_mutex);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='hunk'>@@ -125,38 +174,15 @@ static u8 __init common_swizzle(struct pci_dev *dev, u8 *pinp)</div><div class='ctx'> static int __init pcibios_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_controller *hose;</div><div class='del'>-	struct pci_bus *bus;</div><div class='del'>-	int next_busno;</div><div class='del'>-	int need_domain_info = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Scan all of the recorded PCI controllers.  */</div><div class='del'>-	for (next_busno = 0, hose = hose_head; hose; hose = hose-&gt;next) {</div><div class='del'>-</div><div class='del'>-		if (!hose-&gt;iommu)</div><div class='del'>-			PCI_DMA_BUS_IS_PHYS = 1;</div><div class='del'>-</div><div class='del'>-		if (hose-&gt;get_busno &amp;&amp; pci_probe_only)</div><div class='del'>-			next_busno = (*hose-&gt;get_busno)();</div><div class='del'>-</div><div class='del'>-		bus = pci_scan_bus(next_busno, hose-&gt;pci_ops, hose);</div><div class='del'>-		hose-&gt;bus = bus;</div><div class='del'>-		need_domain_info = need_domain_info || hose-&gt;index;</div><div class='del'>-		hose-&gt;need_domain_info = need_domain_info;</div><div class='del'>-		if (bus) {</div><div class='del'>-			next_busno = bus-&gt;subordinate + 1;</div><div class='del'>-			/* Don't allow 8-bit bus number overflow inside the hose -</div><div class='del'>-			   reserve some space for bridges. */</div><div class='del'>-			if (next_busno &gt; 224) {</div><div class='del'>-				next_busno = 0;</div><div class='del'>-				need_domain_info = 1;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	for (hose = hose_head; hose; hose = hose-&gt;next)</div><div class='add'>+		pcibios_scanbus(hose);</div><div class='ctx'> </div><div class='del'>-	if (!pci_probe_only)</div><div class='del'>-		pci_assign_unassigned_resources();</div><div class='ctx'> 	pci_fixup_irqs(common_swizzle, pcibios_map_irq);</div><div class='ctx'> </div><div class='add'>+	pci_initialized = 1;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/pmc-sierra/msp71xx/Makefile b/arch/mips/pmc-sierra/msp71xx/Makefile<br/>index 4bba79c1cc79..e107f79b1491 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/pmc-sierra/msp71xx/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/pmc-sierra/msp71xx/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/pmc-sierra/msp71xx/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/pmc-sierra/msp71xx/Makefile</a></div><div class='hunk'>@@ -3,6 +3,7 @@</div><div class='ctx'> #</div><div class='ctx'> obj-y += msp_prom.o msp_setup.o msp_irq.o \</div><div class='ctx'> 	 msp_time.o msp_serial.o msp_elb.o</div><div class='add'>+obj-$(CONFIG_HAVE_GPIO_LIB) += gpio.o gpio_extended.o</div><div class='ctx'> obj-$(CONFIG_PMC_MSP7120_GW) += msp_hwbutton.o</div><div class='ctx'> obj-$(CONFIG_IRQ_MSP_SLP) += msp_irq_slp.o</div><div class='ctx'> obj-$(CONFIG_IRQ_MSP_CIC) += msp_irq_cic.o</div><div class='head'>diff --git a/arch/mips/pmc-sierra/msp71xx/gpio.c b/arch/mips/pmc-sierra/msp71xx/gpio.c<br/>new file mode 100644<br/>index 000000000000..69848c5813e2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/pmc-sierra/msp71xx/gpio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/pmc-sierra/msp71xx/gpio.c</a></div><div class='hunk'>@@ -0,0 +1,218 @@</div><div class='add'>+/*</div><div class='add'>+ * @file /arch/mips/pmc-sierra/msp71xx/gpio.c</div><div class='add'>+ *</div><div class='add'>+ * Generic PMC MSP71xx GPIO handling. These base gpio are controlled by two</div><div class='add'>+ * types of registers. The data register sets the output level when in output</div><div class='add'>+ * mode and when in input mode will contain the value at the input. The config</div><div class='add'>+ * register sets the various modes for each gpio.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * @author Patrick Glass &lt;patrickglass@gmail.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/gpio.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+</div><div class='add'>+#define MSP71XX_CFG_OFFSET(gpio)	(4 * (gpio))</div><div class='add'>+#define CONF_MASK			0x0F</div><div class='add'>+#define MSP71XX_GPIO_INPUT		0x01</div><div class='add'>+#define MSP71XX_GPIO_OUTPUT		0x08</div><div class='add'>+</div><div class='add'>+#define MSP71XX_GPIO_BASE		0x0B8400000L</div><div class='add'>+</div><div class='add'>+#define to_msp71xx_gpio_chip(c) container_of(c, struct msp71xx_gpio_chip, chip)</div><div class='add'>+</div><div class='add'>+static spinlock_t gpio_lock;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * struct msp71xx_gpio_chip - container for gpio chip and registers</div><div class='add'>+ * @chip: chip structure for the specified gpio bank</div><div class='add'>+ * @data_reg: register for reading and writing the gpio pin value</div><div class='add'>+ * @config_reg: register to set the mode for the gpio pin bank</div><div class='add'>+ * @out_drive_reg: register to set the output drive mode for the gpio pin bank</div><div class='add'>+ */</div><div class='add'>+struct msp71xx_gpio_chip {</div><div class='add'>+	struct gpio_chip chip;</div><div class='add'>+	void __iomem *data_reg;</div><div class='add'>+	void __iomem *config_reg;</div><div class='add'>+	void __iomem *out_drive_reg;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * msp71xx_gpio_get() - return the chip's gpio value</div><div class='add'>+ * @chip: chip structure which controls the specified gpio</div><div class='add'>+ * @offset: gpio whose value will be returned</div><div class='add'>+ *</div><div class='add'>+ * It will return 0 if gpio value is low and other if high.</div><div class='add'>+ */</div><div class='add'>+static int msp71xx_gpio_get(struct gpio_chip *chip, unsigned offset)</div><div class='add'>+{</div><div class='add'>+	struct msp71xx_gpio_chip *msp_chip = to_msp71xx_gpio_chip(chip);</div><div class='add'>+</div><div class='add'>+	return __raw_readl(msp_chip-&gt;data_reg) &amp; (1 &lt;&lt; offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * msp71xx_gpio_set() - set the output value for the gpio</div><div class='add'>+ * @chip: chip structure who controls the specified gpio</div><div class='add'>+ * @offset: gpio whose value will be assigned</div><div class='add'>+ * @value: logic level to assign to the gpio initially</div><div class='add'>+ *</div><div class='add'>+ * This will set the gpio bit specified to the desired value. It will set the</div><div class='add'>+ * gpio pin low if value is 0 otherwise it will be high.</div><div class='add'>+ */</div><div class='add'>+static void msp71xx_gpio_set(struct gpio_chip *chip, unsigned offset, int value)</div><div class='add'>+{</div><div class='add'>+	struct msp71xx_gpio_chip *msp_chip = to_msp71xx_gpio_chip(chip);</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u32 data;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;gpio_lock, flags);</div><div class='add'>+</div><div class='add'>+	data = __raw_readl(msp_chip-&gt;data_reg);</div><div class='add'>+	if (value)</div><div class='add'>+		data |= (1 &lt;&lt; offset);</div><div class='add'>+	else</div><div class='add'>+		data &amp;= ~(1 &lt;&lt; offset);</div><div class='add'>+	__raw_writel(data, msp_chip-&gt;data_reg);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;gpio_lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * msp71xx_set_gpio_mode() - declare the mode for a gpio</div><div class='add'>+ * @chip: chip structure which controls the specified gpio</div><div class='add'>+ * @offset: gpio whose value will be assigned</div><div class='add'>+ * @mode: desired configuration for the gpio (see datasheet)</div><div class='add'>+ *</div><div class='add'>+ * It will set the gpio pin config to the @mode value passed in.</div><div class='add'>+ */</div><div class='add'>+static int msp71xx_set_gpio_mode(struct gpio_chip *chip,</div><div class='add'>+				 unsigned offset, int mode)</div><div class='add'>+{</div><div class='add'>+	struct msp71xx_gpio_chip *msp_chip = to_msp71xx_gpio_chip(chip);</div><div class='add'>+	const unsigned bit_offset = MSP71XX_CFG_OFFSET(offset);</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u32 cfg;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;gpio_lock, flags);</div><div class='add'>+</div><div class='add'>+	cfg = __raw_readl(msp_chip-&gt;config_reg);</div><div class='add'>+	cfg &amp;= ~(CONF_MASK &lt;&lt; bit_offset);</div><div class='add'>+	cfg |= (mode &lt;&lt; bit_offset);</div><div class='add'>+	__raw_writel(cfg, msp_chip-&gt;config_reg);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;gpio_lock, flags);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * msp71xx_direction_output() - declare the direction mode for a gpio</div><div class='add'>+ * @chip: chip structure which controls the specified gpio</div><div class='add'>+ * @offset: gpio whose value will be assigned</div><div class='add'>+ * @value: logic level to assign to the gpio initially</div><div class='add'>+ *</div><div class='add'>+ * This call will set the mode for the @gpio to output. It will set the</div><div class='add'>+ * gpio pin low if value is 0 otherwise it will be high.</div><div class='add'>+ */</div><div class='add'>+static int msp71xx_direction_output(struct gpio_chip *chip,</div><div class='add'>+				    unsigned offset, int value)</div><div class='add'>+{</div><div class='add'>+	msp71xx_gpio_set(chip, offset, value);</div><div class='add'>+</div><div class='add'>+	return msp71xx_set_gpio_mode(chip, offset, MSP71XX_GPIO_OUTPUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * msp71xx_direction_input() - declare the direction mode for a gpio</div><div class='add'>+ * @chip: chip structure which controls the specified gpio</div><div class='add'>+ * @offset: gpio whose to which the value will be assigned</div><div class='add'>+ *</div><div class='add'>+ * This call will set the mode for the @gpio to input.</div><div class='add'>+ */</div><div class='add'>+static int msp71xx_direction_input(struct gpio_chip *chip, unsigned offset)</div><div class='add'>+{</div><div class='add'>+	return msp71xx_set_gpio_mode(chip, offset, MSP71XX_GPIO_INPUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * msp71xx_set_output_drive() - declare the output drive for the gpio line</div><div class='add'>+ * @gpio: gpio pin whose output drive you wish to modify</div><div class='add'>+ * @value: zero for active drain 1 for open drain drive</div><div class='add'>+ *</div><div class='add'>+ * This call will set the output drive mode for the @gpio to output.</div><div class='add'>+ */</div><div class='add'>+int msp71xx_set_output_drive(unsigned gpio, int value)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u32 data;</div><div class='add'>+</div><div class='add'>+	if (gpio &gt; 15 || gpio &lt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;gpio_lock, flags);</div><div class='add'>+</div><div class='add'>+	data = __raw_readl((void __iomem *)(MSP71XX_GPIO_BASE + 0x190));</div><div class='add'>+	if (value)</div><div class='add'>+		data |= (1 &lt;&lt; gpio);</div><div class='add'>+	else</div><div class='add'>+		data &amp;= ~(1 &lt;&lt; gpio);</div><div class='add'>+	__raw_writel(data, (void __iomem *)(MSP71XX_GPIO_BASE + 0x190));</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;gpio_lock, flags);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(msp71xx_set_output_drive);</div><div class='add'>+</div><div class='add'>+#define MSP71XX_GPIO_BANK(name, dr, cr, base_gpio, num_gpio) \</div><div class='add'>+{ \</div><div class='add'>+	.chip = { \</div><div class='add'>+		.label		  = name, \</div><div class='add'>+		.direction_input  = msp71xx_direction_input, \</div><div class='add'>+		.direction_output = msp71xx_direction_output, \</div><div class='add'>+		.get		  = msp71xx_gpio_get, \</div><div class='add'>+		.set		  = msp71xx_gpio_set, \</div><div class='add'>+		.base		  = base_gpio, \</div><div class='add'>+		.ngpio		  = num_gpio \</div><div class='add'>+	}, \</div><div class='add'>+	.data_reg	= (void __iomem *)(MSP71XX_GPIO_BASE + dr), \</div><div class='add'>+	.config_reg	= (void __iomem *)(MSP71XX_GPIO_BASE + cr), \</div><div class='add'>+	.out_drive_reg	= (void __iomem *)(MSP71XX_GPIO_BASE + 0x190), \</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * struct msp71xx_gpio_banks[] - container array of gpio banks</div><div class='add'>+ * @chip: chip structure for the specified gpio bank</div><div class='add'>+ * @data_reg: register for reading and writing the gpio pin value</div><div class='add'>+ * @config_reg: register to set the mode for the gpio pin bank</div><div class='add'>+ *</div><div class='add'>+ * This array structure defines the gpio banks for the PMC MIPS Processor.</div><div class='add'>+ * We specify the bank name, the data register, the config register, base</div><div class='add'>+ * starting gpio number, and the number of gpios exposed by the bank.</div><div class='add'>+ */</div><div class='add'>+static struct msp71xx_gpio_chip msp71xx_gpio_banks[] = {</div><div class='add'>+</div><div class='add'>+	MSP71XX_GPIO_BANK("GPIO_1_0", 0x170, 0x180, 0, 2),</div><div class='add'>+	MSP71XX_GPIO_BANK("GPIO_5_2", 0x174, 0x184, 2, 4),</div><div class='add'>+	MSP71XX_GPIO_BANK("GPIO_9_6", 0x178, 0x188, 6, 4),</div><div class='add'>+	MSP71XX_GPIO_BANK("GPIO_15_10", 0x17C, 0x18C, 10, 6),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void __init msp71xx_init_gpio(void)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;gpio_lock);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(msp71xx_gpio_banks); i++)</div><div class='add'>+		gpiochip_add(&amp;msp71xx_gpio_banks[i].chip);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/mips/pmc-sierra/msp71xx/gpio_extended.c b/arch/mips/pmc-sierra/msp71xx/gpio_extended.c<br/>new file mode 100644<br/>index 000000000000..fc6dbc6cf1c0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/pmc-sierra/msp71xx/gpio_extended.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/pmc-sierra/msp71xx/gpio_extended.c</a></div><div class='hunk'>@@ -0,0 +1,148 @@</div><div class='add'>+/*</div><div class='add'>+ * @file /arch/mips/pmc-sierra/msp71xx/gpio_extended.c</div><div class='add'>+ *</div><div class='add'>+ * Generic PMC MSP71xx EXTENDED (EXD) GPIO handling. The extended gpio is</div><div class='add'>+ * a set of hardware registers that have no need for explicit locking as</div><div class='add'>+ * it is handled by unique method of writing individual set/clr bits.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * @author Patrick Glass &lt;patrickglass@gmail.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/gpio.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+</div><div class='add'>+#define MSP71XX_DATA_OFFSET(gpio)	(2 * (gpio))</div><div class='add'>+#define MSP71XX_READ_OFFSET(gpio)	(MSP71XX_DATA_OFFSET(gpio) + 1)</div><div class='add'>+#define MSP71XX_CFG_OUT_OFFSET(gpio)	(MSP71XX_DATA_OFFSET(gpio) + 16)</div><div class='add'>+#define MSP71XX_CFG_IN_OFFSET(gpio)	(MSP71XX_CFG_OUT_OFFSET(gpio) + 1)</div><div class='add'>+</div><div class='add'>+#define MSP71XX_EXD_GPIO_BASE	0x0BC000000L</div><div class='add'>+</div><div class='add'>+#define to_msp71xx_exd_gpio_chip(c) \</div><div class='add'>+			container_of(c, struct msp71xx_exd_gpio_chip, chip)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * struct msp71xx_exd_gpio_chip - container for gpio chip and registers</div><div class='add'>+ * @chip: chip structure for the specified gpio bank</div><div class='add'>+ * @reg: register for control and data of gpio pin</div><div class='add'>+ */</div><div class='add'>+struct msp71xx_exd_gpio_chip {</div><div class='add'>+	struct gpio_chip chip;</div><div class='add'>+	void __iomem *reg;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * msp71xx_exd_gpio_get() - return the chip's gpio value</div><div class='add'>+ * @chip: chip structure which controls the specified gpio</div><div class='add'>+ * @offset: gpio whose value will be returned</div><div class='add'>+ *</div><div class='add'>+ * It will return 0 if gpio value is low and other if high.</div><div class='add'>+ */</div><div class='add'>+static int msp71xx_exd_gpio_get(struct gpio_chip *chip, unsigned offset)</div><div class='add'>+{</div><div class='add'>+	struct msp71xx_exd_gpio_chip *msp71xx_chip =</div><div class='add'>+	    to_msp71xx_exd_gpio_chip(chip);</div><div class='add'>+	const unsigned bit = MSP71XX_READ_OFFSET(offset);</div><div class='add'>+</div><div class='add'>+	return __raw_readl(msp71xx_chip-&gt;reg) &amp; (1 &lt;&lt; bit);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * msp71xx_exd_gpio_set() - set the output value for the gpio</div><div class='add'>+ * @chip: chip structure who controls the specified gpio</div><div class='add'>+ * @offset: gpio whose value will be assigned</div><div class='add'>+ * @value: logic level to assign to the gpio initially</div><div class='add'>+ *</div><div class='add'>+ * This will set the gpio bit specified to the desired value. It will set the</div><div class='add'>+ * gpio pin low if value is 0 otherwise it will be high.</div><div class='add'>+ */</div><div class='add'>+static void msp71xx_exd_gpio_set(struct gpio_chip *chip,</div><div class='add'>+				 unsigned offset, int value)</div><div class='add'>+{</div><div class='add'>+	struct msp71xx_exd_gpio_chip *msp71xx_chip =</div><div class='add'>+	    to_msp71xx_exd_gpio_chip(chip);</div><div class='add'>+	const unsigned bit = MSP71XX_DATA_OFFSET(offset);</div><div class='add'>+</div><div class='add'>+	__raw_writel(1 &lt;&lt; (bit + (value ? 1 : 0)), msp71xx_chip-&gt;reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * msp71xx_exd_direction_output() - declare the direction mode for a gpio</div><div class='add'>+ * @chip: chip structure which controls the specified gpio</div><div class='add'>+ * @offset: gpio whose value will be assigned</div><div class='add'>+ * @value: logic level to assign to the gpio initially</div><div class='add'>+ *</div><div class='add'>+ * This call will set the mode for the @gpio to output. It will set the</div><div class='add'>+ * gpio pin low if value is 0 otherwise it will be high.</div><div class='add'>+ */</div><div class='add'>+static int msp71xx_exd_direction_output(struct gpio_chip *chip,</div><div class='add'>+					unsigned offset, int value)</div><div class='add'>+{</div><div class='add'>+	struct msp71xx_exd_gpio_chip *msp71xx_chip =</div><div class='add'>+	    to_msp71xx_exd_gpio_chip(chip);</div><div class='add'>+</div><div class='add'>+	msp71xx_exd_gpio_set(chip, offset, value);</div><div class='add'>+	__raw_writel(1 &lt;&lt; MSP71XX_CFG_OUT_OFFSET(offset), msp71xx_chip-&gt;reg);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * msp71xx_exd_direction_input() - declare the direction mode for a gpio</div><div class='add'>+ * @chip: chip structure which controls the specified gpio</div><div class='add'>+ * @offset: gpio whose to which the value will be assigned</div><div class='add'>+ *</div><div class='add'>+ * This call will set the mode for the @gpio to input.</div><div class='add'>+ */</div><div class='add'>+static int msp71xx_exd_direction_input(struct gpio_chip *chip, unsigned offset)</div><div class='add'>+{</div><div class='add'>+	struct msp71xx_exd_gpio_chip *msp71xx_chip =</div><div class='add'>+	    to_msp71xx_exd_gpio_chip(chip);</div><div class='add'>+</div><div class='add'>+	__raw_writel(1 &lt;&lt; MSP71XX_CFG_IN_OFFSET(offset), msp71xx_chip-&gt;reg);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define MSP71XX_EXD_GPIO_BANK(name, exd_reg, base_gpio, num_gpio) \</div><div class='add'>+{ \</div><div class='add'>+	.chip = { \</div><div class='add'>+		.label		  = name, \</div><div class='add'>+		.direction_input  = msp71xx_exd_direction_input, \</div><div class='add'>+		.direction_output = msp71xx_exd_direction_output, \</div><div class='add'>+		.get		  = msp71xx_exd_gpio_get, \</div><div class='add'>+		.set		  = msp71xx_exd_gpio_set, \</div><div class='add'>+		.base		  = base_gpio, \</div><div class='add'>+		.ngpio		  = num_gpio, \</div><div class='add'>+	}, \</div><div class='add'>+	.reg	= (void __iomem *)(MSP71XX_EXD_GPIO_BASE + exd_reg), \</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * struct msp71xx_exd_gpio_banks[] - container array of gpio banks</div><div class='add'>+ * @chip: chip structure for the specified gpio bank</div><div class='add'>+ * @reg: register for reading and writing the gpio pin value</div><div class='add'>+ *</div><div class='add'>+ * This array structure defines the extended gpio banks for the</div><div class='add'>+ * PMC MIPS Processor. We specify the bank name, the data/config</div><div class='add'>+ * register,the base starting gpio number, and the number of</div><div class='add'>+ * gpios exposed by the bank of gpios.</div><div class='add'>+ */</div><div class='add'>+static struct msp71xx_exd_gpio_chip msp71xx_exd_gpio_banks[] = {</div><div class='add'>+</div><div class='add'>+	MSP71XX_EXD_GPIO_BANK("GPIO_23_16", 0x188, 16, 8),</div><div class='add'>+	MSP71XX_EXD_GPIO_BANK("GPIO_27_24", 0x18C, 24, 4),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void __init msp71xx_init_gpio_extended(void)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(msp71xx_exd_gpio_banks); i++)</div><div class='add'>+		gpiochip_add(&amp;msp71xx_exd_gpio_banks[i].chip);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/mips/rb532/devices.c b/arch/mips/rb532/devices.c<br/>index 82ab395efa33..31619c601b11 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/rb532/devices.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/rb532/devices.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/rb532/devices.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/rb532/devices.c</a></div><div class='hunk'>@@ -34,21 +34,11 @@</div><div class='ctx'> #include &lt;asm/mach-rc32434/rb.h&gt;</div><div class='ctx'> #include &lt;asm/mach-rc32434/integ.h&gt;</div><div class='ctx'> #include &lt;asm/mach-rc32434/gpio.h&gt;</div><div class='del'>-</div><div class='del'>-#define ETH0_DMA_RX_IRQ   	(GROUP1_IRQ_BASE + 0)</div><div class='del'>-#define ETH0_DMA_TX_IRQ   	(GROUP1_IRQ_BASE + 1)</div><div class='del'>-#define ETH0_RX_OVR_IRQ   	(GROUP3_IRQ_BASE + 9)</div><div class='del'>-#define ETH0_TX_UND_IRQ   	(GROUP3_IRQ_BASE + 10)</div><div class='add'>+#include &lt;asm/mach-rc32434/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define ETH0_RX_DMA_ADDR  (DMA0_BASE_ADDR + 0 * DMA_CHAN_OFFSET)</div><div class='ctx'> #define ETH0_TX_DMA_ADDR  (DMA0_BASE_ADDR + 1 * DMA_CHAN_OFFSET)</div><div class='ctx'> </div><div class='del'>-/* NAND definitions */</div><div class='del'>-#define GPIO_RDY (1 &lt;&lt; 0x08)</div><div class='del'>-#define GPIO_WPX (1 &lt;&lt; 0x09)</div><div class='del'>-#define GPIO_ALE (1 &lt;&lt; 0x0a)</div><div class='del'>-#define GPIO_CLE (1 &lt;&lt; 0x0b)</div><div class='del'>-</div><div class='ctx'> static struct resource korina_dev0_res[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.name = "korina_regs",</div><div class='hunk'>@@ -94,15 +84,13 @@ static struct korina_device korina_dev0_data = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct platform_device korina_dev0 = {</div><div class='del'>-	.id = 0,</div><div class='add'>+	.id = -1,</div><div class='ctx'> 	.name = "korina",</div><div class='ctx'> 	.dev.platform_data = &amp;korina_dev0_data,</div><div class='ctx'> 	.resource = korina_dev0_res,</div><div class='ctx'> 	.num_resources = ARRAY_SIZE(korina_dev0_res),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define CF_GPIO_NUM 13</div><div class='del'>-</div><div class='ctx'> static struct resource cf_slot0_res[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.name = "cf_membase",</div><div class='hunk'>@@ -116,11 +104,11 @@ static struct resource cf_slot0_res[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct cf_device cf_slot0_data = {</div><div class='del'>-	.gpio_pin = 13</div><div class='add'>+	.gpio_pin = CF_GPIO_NUM</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct platform_device cf_slot0 = {</div><div class='del'>-	.id = 0,</div><div class='add'>+	.id = -1,</div><div class='ctx'> 	.name = "pata-rb532-cf",</div><div class='ctx'> 	.dev.platform_data = &amp;cf_slot0_data,</div><div class='ctx'> 	.resource = cf_slot0_res,</div><div class='hunk'>@@ -185,7 +173,7 @@ static struct mtd_partition rb532_partition_info[] = {</div><div class='ctx'> </div><div class='ctx'> static struct platform_device rb532_led = {</div><div class='ctx'> 	.name = "rb532-led",</div><div class='del'>-	.id = 0,</div><div class='add'>+	.id = -1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct gpio_keys_button rb532_gpio_btn[] = {</div><div class='head'>diff --git a/arch/mips/rb532/gpio.c b/arch/mips/rb532/gpio.c<br/>index 00a1c7877bf4..76a7fd96d564 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/rb532/gpio.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/rb532/gpio.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/rb532/gpio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/rb532/gpio.c</a></div><div class='hunk'>@@ -27,28 +27,31 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/gpio.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/addrspace.h&gt;</div><div class='add'>+#include &lt;linux/gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach-rc32434/rb.h&gt;</div><div class='del'>-</div><div class='del'>-struct rb532_gpio_reg __iomem *rb532_gpio_reg0;</div><div class='del'>-EXPORT_SYMBOL(rb532_gpio_reg0);</div><div class='add'>+#include &lt;asm/mach-rc32434/gpio.h&gt;</div><div class='add'>+</div><div class='add'>+struct rb532_gpio_chip {</div><div class='add'>+	struct gpio_chip chip;</div><div class='add'>+	void __iomem	 *regbase;</div><div class='add'>+	void		(*set_int_level)(struct gpio_chip *chip, unsigned offset, int value);</div><div class='add'>+	int		(*get_int_level)(struct gpio_chip *chip, unsigned offset);</div><div class='add'>+	void		(*set_int_status)(struct gpio_chip *chip, unsigned offset, int value);</div><div class='add'>+	int		(*get_int_status)(struct gpio_chip *chip, unsigned offset);</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> struct mpmc_device dev3;</div><div class='ctx'> </div><div class='ctx'> static struct resource rb532_gpio_reg0_res[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.name 	= "gpio_reg0",</div><div class='del'>-		.start 	= (u32)(IDT434_REG_BASE + GPIOBASE),</div><div class='del'>-		.end 	= (u32)(IDT434_REG_BASE + GPIOBASE + sizeof(struct rb532_gpio_reg)),</div><div class='add'>+		.start 	= REGBASE + GPIOBASE,</div><div class='add'>+		.end 	= REGBASE + GPIOBASE + sizeof(struct rb532_gpio_reg) - 1,</div><div class='ctx'> 		.flags 	= IORESOURCE_MEM,</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='hunk'>@@ -56,8 +59,8 @@ static struct resource rb532_gpio_reg0_res[] = {</div><div class='ctx'> static struct resource rb532_dev3_ctl_res[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.name	= "dev3_ctl",</div><div class='del'>-		.start	= (u32)(IDT434_REG_BASE + DEV3BASE),</div><div class='del'>-		.end	= (u32)(IDT434_REG_BASE + DEV3BASE + sizeof(struct dev_reg)),</div><div class='add'>+		.start	= REGBASE + DEV3BASE,</div><div class='add'>+		.end	= REGBASE + DEV3BASE + sizeof(struct dev_reg) - 1,</div><div class='ctx'> 		.flags	= IORESOURCE_MEM,</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='hunk'>@@ -70,7 +73,7 @@ void set_434_reg(unsigned reg_offs, unsigned bit, unsigned len, unsigned val)</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;dev3.lock, flags);</div><div class='ctx'> </div><div class='del'>-	data = *(volatile unsigned *) (IDT434_REG_BASE + reg_offs);</div><div class='add'>+	data = readl(IDT434_REG_BASE + reg_offs);</div><div class='ctx'> 	for (i = 0; i != len; ++i) {</div><div class='ctx'> 		if (val &amp; (1 &lt;&lt; i))</div><div class='ctx'> 			data |= (1 &lt;&lt; (i + bit));</div><div class='hunk'>@@ -108,108 +111,199 @@ unsigned char get_latch_u5(void)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(get_latch_u5);</div><div class='ctx'> </div><div class='del'>-int rb532_gpio_get_value(unsigned gpio)</div><div class='add'>+/*</div><div class='add'>+ * Return GPIO level */</div><div class='add'>+static int rb532_gpio_get(struct gpio_chip *chip, unsigned offset)</div><div class='ctx'> {</div><div class='del'>-	return readl(&amp;rb532_gpio_reg0-&gt;gpiod) &amp; (1 &lt;&lt; gpio);</div><div class='add'>+	u32			mask = 1 &lt;&lt; offset;</div><div class='add'>+	struct rb532_gpio_chip	*gpch;</div><div class='add'>+</div><div class='add'>+	gpch = container_of(chip, struct rb532_gpio_chip, chip);</div><div class='add'>+	return readl(gpch-&gt;regbase + GPIOD) &amp; mask;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(rb532_gpio_get_value);</div><div class='ctx'> </div><div class='del'>-void rb532_gpio_set_value(unsigned gpio, int value)</div><div class='add'>+/*</div><div class='add'>+ * Set output GPIO level</div><div class='add'>+ */</div><div class='add'>+static void rb532_gpio_set(struct gpio_chip *chip,</div><div class='add'>+				unsigned offset, int value)</div><div class='ctx'> {</div><div class='del'>-	unsigned tmp;</div><div class='add'>+	unsigned long		flags;</div><div class='add'>+	u32			mask = 1 &lt;&lt; offset;</div><div class='add'>+	u32			tmp;</div><div class='add'>+	struct rb532_gpio_chip	*gpch;</div><div class='add'>+	void __iomem		*gpvr;</div><div class='ctx'> </div><div class='del'>-	tmp = readl(&amp;rb532_gpio_reg0-&gt;gpiod) &amp; ~(1 &lt;&lt; gpio);</div><div class='del'>-	if (value)</div><div class='del'>-		tmp |= 1 &lt;&lt; gpio;</div><div class='add'>+	gpch = container_of(chip, struct rb532_gpio_chip, chip);</div><div class='add'>+	gpvr = gpch-&gt;regbase + GPIOD;</div><div class='ctx'> </div><div class='del'>-	writel(tmp, (void *)&amp;rb532_gpio_reg0-&gt;gpiod);</div><div class='add'>+	local_irq_save(flags);</div><div class='add'>+	tmp = readl(gpvr);</div><div class='add'>+	if (value)</div><div class='add'>+		tmp |= mask;</div><div class='add'>+	else</div><div class='add'>+		tmp &amp;= ~mask;</div><div class='add'>+	writel(tmp, gpvr);</div><div class='add'>+	local_irq_restore(flags);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(rb532_gpio_set_value);</div><div class='ctx'> </div><div class='del'>-int rb532_gpio_direction_input(unsigned gpio)</div><div class='add'>+/*</div><div class='add'>+ * Set GPIO direction to input</div><div class='add'>+ */</div><div class='add'>+static int rb532_gpio_direction_input(struct gpio_chip *chip, unsigned offset)</div><div class='ctx'> {</div><div class='del'>-	writel(readl(&amp;rb532_gpio_reg0-&gt;gpiocfg) &amp; ~(1 &lt;&lt; gpio),</div><div class='del'>-	       (void *)&amp;rb532_gpio_reg0-&gt;gpiocfg);</div><div class='add'>+	unsigned long		flags;</div><div class='add'>+	u32			mask = 1 &lt;&lt; offset;</div><div class='add'>+	u32			value;</div><div class='add'>+	struct rb532_gpio_chip	*gpch;</div><div class='add'>+	void __iomem		*gpdr;</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(rb532_gpio_direction_input);</div><div class='add'>+	gpch = container_of(chip, struct rb532_gpio_chip, chip);</div><div class='add'>+	gpdr = gpch-&gt;regbase + GPIOCFG;</div><div class='ctx'> </div><div class='del'>-int rb532_gpio_direction_output(unsigned gpio, int value)</div><div class='del'>-{</div><div class='del'>-	gpio_set_value(gpio, value);</div><div class='del'>-	writel(readl(&amp;rb532_gpio_reg0-&gt;gpiocfg) | (1 &lt;&lt; gpio),</div><div class='del'>-	       (void *)&amp;rb532_gpio_reg0-&gt;gpiocfg);</div><div class='add'>+	local_irq_save(flags);</div><div class='add'>+	value = readl(gpdr);</div><div class='add'>+	value &amp;= ~mask;</div><div class='add'>+	writel(value, gpdr);</div><div class='add'>+	local_irq_restore(flags);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(rb532_gpio_direction_output);</div><div class='ctx'> </div><div class='del'>-void rb532_gpio_set_int_level(unsigned gpio, int value)</div><div class='add'>+/*</div><div class='add'>+ * Set GPIO direction to output</div><div class='add'>+ */</div><div class='add'>+static int rb532_gpio_direction_output(struct gpio_chip *chip,</div><div class='add'>+					unsigned offset, int value)</div><div class='ctx'> {</div><div class='del'>-	unsigned tmp;</div><div class='add'>+	unsigned long		flags;</div><div class='add'>+	u32			mask = 1 &lt;&lt; offset;</div><div class='add'>+	u32			tmp;</div><div class='add'>+	struct rb532_gpio_chip	*gpch;</div><div class='add'>+	void __iomem		*gpdr;</div><div class='add'>+</div><div class='add'>+	gpch = container_of(chip, struct rb532_gpio_chip, chip);</div><div class='add'>+	writel(mask, gpch-&gt;regbase + GPIOD);</div><div class='add'>+	gpdr = gpch-&gt;regbase + GPIOCFG;</div><div class='add'>+</div><div class='add'>+	local_irq_save(flags);</div><div class='add'>+	tmp = readl(gpdr);</div><div class='add'>+	tmp |= mask;</div><div class='add'>+	writel(tmp, gpdr);</div><div class='add'>+	local_irq_restore(flags);</div><div class='ctx'> </div><div class='del'>-	tmp = readl(&amp;rb532_gpio_reg0-&gt;gpioilevel) &amp; ~(1 &lt;&lt; gpio);</div><div class='del'>-	if (value)</div><div class='del'>-		tmp |= 1 &lt;&lt; gpio;</div><div class='del'>-	writel(tmp, (void *)&amp;rb532_gpio_reg0-&gt;gpioilevel);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(rb532_gpio_set_int_level);</div><div class='ctx'> </div><div class='del'>-int rb532_gpio_get_int_level(unsigned gpio)</div><div class='add'>+/*</div><div class='add'>+ * Set the GPIO interrupt level</div><div class='add'>+ */</div><div class='add'>+static void rb532_gpio_set_int_level(struct gpio_chip *chip,</div><div class='add'>+					unsigned offset, int value)</div><div class='ctx'> {</div><div class='del'>-	return readl(&amp;rb532_gpio_reg0-&gt;gpioilevel) &amp; (1 &lt;&lt; gpio);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(rb532_gpio_get_int_level);</div><div class='add'>+	unsigned long		flags;</div><div class='add'>+	u32			mask = 1 &lt;&lt; offset;</div><div class='add'>+	u32			tmp;</div><div class='add'>+	struct rb532_gpio_chip	*gpch;</div><div class='add'>+	void __iomem		*gpil;</div><div class='ctx'> </div><div class='del'>-void rb532_gpio_set_int_status(unsigned gpio, int value)</div><div class='del'>-{</div><div class='del'>-	unsigned tmp;</div><div class='add'>+	gpch = container_of(chip, struct rb532_gpio_chip, chip);</div><div class='add'>+	gpil = gpch-&gt;regbase + GPIOILEVEL;</div><div class='ctx'> </div><div class='del'>-	tmp = readl(&amp;rb532_gpio_reg0-&gt;gpioistat);</div><div class='add'>+	local_irq_save(flags);</div><div class='add'>+	tmp = readl(gpil);</div><div class='ctx'> 	if (value)</div><div class='del'>-		tmp |= 1 &lt;&lt; gpio;</div><div class='del'>-	writel(tmp, (void *)&amp;rb532_gpio_reg0-&gt;gpioistat);</div><div class='add'>+		tmp |= mask;</div><div class='add'>+	else</div><div class='add'>+		tmp &amp;= ~mask;</div><div class='add'>+	writel(tmp, gpil);</div><div class='add'>+	local_irq_restore(flags);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(rb532_gpio_set_int_status);</div><div class='ctx'> </div><div class='del'>-int rb532_gpio_get_int_status(unsigned gpio)</div><div class='add'>+/*</div><div class='add'>+ * Get the GPIO interrupt level</div><div class='add'>+ */</div><div class='add'>+static int rb532_gpio_get_int_level(struct gpio_chip *chip, unsigned offset)</div><div class='ctx'> {</div><div class='del'>-	return readl(&amp;rb532_gpio_reg0-&gt;gpioistat) &amp; (1 &lt;&lt; gpio);</div><div class='add'>+	u32			mask = 1 &lt;&lt; offset;</div><div class='add'>+	struct rb532_gpio_chip	*gpch;</div><div class='add'>+</div><div class='add'>+	gpch = container_of(chip, struct rb532_gpio_chip, chip);</div><div class='add'>+	return readl(gpch-&gt;regbase + GPIOILEVEL) &amp; mask;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(rb532_gpio_get_int_status);</div><div class='ctx'> </div><div class='del'>-void rb532_gpio_set_func(unsigned gpio, int value)</div><div class='add'>+/*</div><div class='add'>+ * Set the GPIO interrupt status</div><div class='add'>+ */</div><div class='add'>+static void rb532_gpio_set_int_status(struct gpio_chip *chip,</div><div class='add'>+				unsigned offset, int value)</div><div class='ctx'> {</div><div class='del'>-	unsigned tmp;</div><div class='add'>+	unsigned long		flags;</div><div class='add'>+	u32			mask = 1 &lt;&lt; offset;</div><div class='add'>+	u32			tmp;</div><div class='add'>+	struct rb532_gpio_chip	*gpch;</div><div class='add'>+	void __iomem		*gpis;</div><div class='add'>+</div><div class='add'>+	gpch = container_of(chip, struct rb532_gpio_chip, chip);</div><div class='add'>+	gpis = gpch-&gt;regbase + GPIOISTAT;</div><div class='ctx'> </div><div class='del'>-	tmp = readl(&amp;rb532_gpio_reg0-&gt;gpiofunc);</div><div class='add'>+	local_irq_save(flags);</div><div class='add'>+	tmp = readl(gpis);</div><div class='ctx'> 	if (value)</div><div class='del'>-		tmp |= 1 &lt;&lt; gpio;</div><div class='del'>-	writel(tmp, (void *)&amp;rb532_gpio_reg0-&gt;gpiofunc);</div><div class='add'>+		tmp |= mask;</div><div class='add'>+	else</div><div class='add'>+		tmp &amp;= ~mask;</div><div class='add'>+	writel(tmp, gpis);</div><div class='add'>+	local_irq_restore(flags);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(rb532_gpio_set_func);</div><div class='ctx'> </div><div class='del'>-int rb532_gpio_get_func(unsigned gpio)</div><div class='add'>+/*</div><div class='add'>+ * Get the GPIO interrupt status</div><div class='add'>+ */</div><div class='add'>+static int rb532_gpio_get_int_status(struct gpio_chip *chip, unsigned offset)</div><div class='ctx'> {</div><div class='del'>-	return readl(&amp;rb532_gpio_reg0-&gt;gpiofunc) &amp; (1 &lt;&lt; gpio);</div><div class='add'>+	u32			mask = 1 &lt;&lt; offset;</div><div class='add'>+	struct rb532_gpio_chip	*gpch;</div><div class='add'>+</div><div class='add'>+	gpch = container_of(chip, struct rb532_gpio_chip, chip);</div><div class='add'>+	return readl(gpch-&gt;regbase + GPIOISTAT) &amp; mask;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(rb532_gpio_get_func);</div><div class='add'>+</div><div class='add'>+static struct rb532_gpio_chip rb532_gpio_chip[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.chip = {</div><div class='add'>+			.label			= "gpio0",</div><div class='add'>+			.direction_input	= rb532_gpio_direction_input,</div><div class='add'>+			.direction_output	= rb532_gpio_direction_output,</div><div class='add'>+			.get			= rb532_gpio_get,</div><div class='add'>+			.set			= rb532_gpio_set,</div><div class='add'>+			.base			= 0,</div><div class='add'>+			.ngpio			= 32,</div><div class='add'>+		},</div><div class='add'>+		.get_int_level		= rb532_gpio_get_int_level,</div><div class='add'>+		.set_int_level		= rb532_gpio_set_int_level,</div><div class='add'>+		.get_int_status		= rb532_gpio_get_int_status,</div><div class='add'>+		.set_int_status		= rb532_gpio_set_int_status,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> int __init rb532_gpio_init(void)</div><div class='ctx'> {</div><div class='del'>-	rb532_gpio_reg0 = ioremap_nocache(rb532_gpio_reg0_res[0].start,</div><div class='del'>-				rb532_gpio_reg0_res[0].end -</div><div class='del'>-				rb532_gpio_reg0_res[0].start);</div><div class='add'>+	struct resource *r;</div><div class='ctx'> </div><div class='del'>-	if (!rb532_gpio_reg0) {</div><div class='add'>+	r = rb532_gpio_reg0_res;</div><div class='add'>+	rb532_gpio_chip-&gt;regbase = ioremap_nocache(r-&gt;start, r-&gt;end - r-&gt;start);</div><div class='add'>+</div><div class='add'>+	if (!rb532_gpio_chip-&gt;regbase) {</div><div class='ctx'> 		printk(KERN_ERR "rb532: cannot remap GPIO register 0\n");</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dev3.base = ioremap_nocache(rb532_dev3_ctl_res[0].start,</div><div class='del'>-				rb532_dev3_ctl_res[0].end -</div><div class='del'>-				rb532_dev3_ctl_res[0].start);</div><div class='add'>+	/* Register our GPIO chip */</div><div class='add'>+	gpiochip_add(&amp;rb532_gpio_chip-&gt;chip);</div><div class='add'>+</div><div class='add'>+	r = rb532_dev3_ctl_res;</div><div class='add'>+	dev3.base = ioremap_nocache(r-&gt;start, r-&gt;end - r-&gt;start);</div><div class='ctx'> </div><div class='ctx'> 	if (!dev3.base) {</div><div class='ctx'> 		printk(KERN_ERR "rb532: cannot remap device controller 3\n");</div><div class='head'>diff --git a/arch/mips/rb532/irq.c b/arch/mips/rb532/irq.c<br/>index c0d0f950caf2..549b46d2fcee 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/rb532/irq.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/rb532/irq.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/rb532/irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/rb532/irq.c</a></div><div class='hunk'>@@ -45,7 +45,7 @@</div><div class='ctx'> #include &lt;asm/mipsregs.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/mach-rc32434/rc32434.h&gt;</div><div class='add'>+#include &lt;asm/mach-rc32434/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct intr_group {</div><div class='ctx'> 	u32 mask;	/* mask of valid bits in pending/mask registers */</div><div class='head'>diff --git a/arch/mips/rb532/prom.c b/arch/mips/rb532/prom.c<br/>index 1bc0af8febf4..46ca24dbcc2d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/rb532/prom.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/rb532/prom.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/rb532/prom.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/rb532/prom.c</a></div><div class='hunk'>@@ -37,12 +37,8 @@</div><div class='ctx'> #include &lt;asm/mach-rc32434/ddr.h&gt;</div><div class='ctx'> #include &lt;asm/mach-rc32434/prom.h&gt;</div><div class='ctx'> </div><div class='del'>-extern void __init setup_serial_port(void);</div><div class='del'>-</div><div class='ctx'> unsigned int idt_cpu_freq = 132000000;</div><div class='ctx'> EXPORT_SYMBOL(idt_cpu_freq);</div><div class='del'>-unsigned int gpio_bootup_state;</div><div class='del'>-EXPORT_SYMBOL(gpio_bootup_state);</div><div class='ctx'> </div><div class='ctx'> static struct resource ddr_reg[] = {</div><div class='ctx'> 	{</div><div class='hunk'>@@ -108,9 +104,6 @@ void __init prom_setup_cmdline(void)</div><div class='ctx'> 				mips_machtype = MACH_MIKROTIK_RB532;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (match_tag(prom_argv[i], GPIO_TAG))</div><div class='del'>-			gpio_bootup_state = tag2ul(prom_argv[i], GPIO_TAG);</div><div class='del'>-</div><div class='ctx'> 		strcpy(cp, prom_argv[i]);</div><div class='ctx'> 		cp += strlen(prom_argv[i]);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -122,11 +115,6 @@ void __init prom_setup_cmdline(void)</div><div class='ctx'> 		strcpy(cp, arcs_cmdline);</div><div class='ctx'> 		cp += strlen(arcs_cmdline);</div><div class='ctx'> 	}</div><div class='del'>-	if (gpio_bootup_state &amp; 0x02)</div><div class='del'>-		strcpy(cp, GPIO_INIT_NOBUTTON);</div><div class='del'>-	else</div><div class='del'>-		strcpy(cp, GPIO_INIT_BUTTON);</div><div class='del'>-</div><div class='ctx'> 	cmd_line[CL_SIZE-1] = '\0';</div><div class='ctx'> </div><div class='ctx'> 	strcpy(arcs_cmdline, cmd_line);</div><div class='head'>diff --git a/arch/mips/rb532/serial.c b/arch/mips/rb532/serial.c<br/>index 1a05b5ddee09..3e0d7ec3a579 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/rb532/serial.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/rb532/serial.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/rb532/serial.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/rb532/serial.c</a></div><div class='hunk'>@@ -31,16 +31,16 @@</div><div class='ctx'> #include &lt;linux/serial_8250.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/serial.h&gt;</div><div class='del'>-#include &lt;asm/mach-rc32434/rc32434.h&gt;</div><div class='add'>+#include &lt;asm/mach-rc32434/rb.h&gt;</div><div class='ctx'> </div><div class='ctx'> extern unsigned int idt_cpu_freq;</div><div class='ctx'> </div><div class='ctx'> static struct uart_port rb532_uart = {</div><div class='ctx'> 	.type = PORT_16550A,</div><div class='ctx'> 	.line = 0,</div><div class='del'>-	.irq = RC32434_UART0_IRQ,</div><div class='add'>+	.irq = UART0_IRQ,</div><div class='ctx'> 	.iotype = UPIO_MEM,</div><div class='del'>-	.membase = (char *)KSEG1ADDR(RC32434_UART0_BASE),</div><div class='add'>+	.membase = (char *)KSEG1ADDR(REGBASE + UART0BASE),</div><div class='ctx'> 	.regshift = 2</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/rb532/setup.c b/arch/mips/rb532/setup.c<br/>index 7aafa95ac20b..50f530f5b602 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/rb532/setup.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/rb532/setup.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/rb532/setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/rb532/setup.c</a></div><div class='hunk'>@@ -9,7 +9,7 @@</div><div class='ctx'> #include &lt;asm/time.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/mach-rc32434/rc32434.h&gt;</div><div class='add'>+#include &lt;asm/mach-rc32434/rb.h&gt;</div><div class='ctx'> #include &lt;asm/mach-rc32434/pci.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct pci_reg __iomem *pci_reg;</div><div class='hunk'>@@ -27,7 +27,7 @@ static struct resource pci0_res[] = {</div><div class='ctx'> static void rb_machine_restart(char *command)</div><div class='ctx'> {</div><div class='ctx'> 	/* just jump to the reset vector */</div><div class='del'>-	writel(0x80000001, (void *)KSEG1ADDR(RC32434_REG_BASE + RC32434_RST));</div><div class='add'>+	writel(0x80000001, IDT434_REG_BASE + RST);</div><div class='ctx'> 	((void (*)(void)) KSEG1ADDR(0x1FC00000u))();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/rb532/time.c b/arch/mips/rb532/time.c<br/>index 8e7a46855b50..1377d599f0e3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/rb532/time.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/rb532/time.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/rb532/time.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/rb532/time.c</a></div><div class='hunk'>@@ -28,7 +28,6 @@</div><div class='ctx'> #include &lt;linux/timex.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mipsregs.h&gt;</div><div class='del'>-#include &lt;asm/debug.h&gt;</div><div class='ctx'> #include &lt;asm/time.h&gt;</div><div class='ctx'> #include &lt;asm/mach-rc32434/rc32434.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/sgi-ip22/ip22-platform.c b/arch/mips/sgi-ip22/ip22-platform.c<br/>index 52486c4d2b01..deddbf0ebe5c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/sgi-ip22/ip22-platform.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/sgi-ip22/ip22-platform.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/sgi-ip22/ip22-platform.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/sgi-ip22/ip22-platform.c</a></div><div class='hunk'>@@ -192,3 +192,18 @@ static int __init sgi_button_devinit(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> device_initcall(sgi_button_devinit);</div><div class='add'>+</div><div class='add'>+static int __init sgi_ds1286_devinit(void)</div><div class='add'>+{</div><div class='add'>+	struct resource res;</div><div class='add'>+</div><div class='add'>+	memset(&amp;res, 0, sizeof(res));</div><div class='add'>+	res.start = HPC3_CHIP0_BASE + offsetof(struct hpc3_regs, rtcregs);</div><div class='add'>+	res.end = res.start + sizeof(hpc3c0-&gt;rtcregs) - 1;</div><div class='add'>+	res.flags = IORESOURCE_MEM;</div><div class='add'>+</div><div class='add'>+	return IS_ERR(platform_device_register_simple("rtc-ds1286", -1,</div><div class='add'>+						      &amp;res, 1));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+device_initcall(sgi_ds1286_devinit);</div><div class='head'>diff --git a/arch/mips/sgi-ip22/ip22-setup.c b/arch/mips/sgi-ip22/ip22-setup.c<br/>index 896a1ef84829..b9a931358e23 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/sgi-ip22/ip22-setup.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/sgi-ip22/ip22-setup.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/sgi-ip22/ip22-setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/sgi-ip22/ip22-setup.c</a></div><div class='hunk'>@@ -4,7 +4,6 @@</div><div class='ctx'>  * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com)</div><div class='ctx'>  * Copyright (C) 1997, 1998 Ralf Baechle (ralf@gnu.org)</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/ds1286.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/kdev_t.h&gt;</div><div class='head'>diff --git a/arch/mips/sgi-ip22/ip22-time.c b/arch/mips/sgi-ip22/ip22-time.c<br/>index 10e505491655..3dcb27ec0c53 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/sgi-ip22/ip22-time.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/sgi-ip22/ip22-time.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/sgi-ip22/ip22-time.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/sgi-ip22/ip22-time.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  * Copyright (C) 2003, 06 Ralf Baechle (ralf@linux-mips.org)</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/bcd.h&gt;</div><div class='del'>-#include &lt;linux/ds1286.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -29,69 +28,6 @@</div><div class='ctx'> #include &lt;asm/sgi/hpc3.h&gt;</div><div class='ctx'> #include &lt;asm/sgi/ip22.h&gt;</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Note that mktime uses month from 1 to 12 while rtc_time_to_tm</div><div class='del'>- * uses 0 to 11.</div><div class='del'>- */</div><div class='del'>-unsigned long read_persistent_clock(void)</div><div class='del'>-{</div><div class='del'>-	unsigned int yrs, mon, day, hrs, min, sec;</div><div class='del'>-	unsigned int save_control;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;rtc_lock, flags);</div><div class='del'>-	save_control = hpc3c0-&gt;rtcregs[RTC_CMD] &amp; 0xff;</div><div class='del'>-	hpc3c0-&gt;rtcregs[RTC_CMD] = save_control | RTC_TE;</div><div class='del'>-</div><div class='del'>-	sec = BCD2BIN(hpc3c0-&gt;rtcregs[RTC_SECONDS] &amp; 0xff);</div><div class='del'>-	min = BCD2BIN(hpc3c0-&gt;rtcregs[RTC_MINUTES] &amp; 0xff);</div><div class='del'>-	hrs = BCD2BIN(hpc3c0-&gt;rtcregs[RTC_HOURS] &amp; 0x3f);</div><div class='del'>-	day = BCD2BIN(hpc3c0-&gt;rtcregs[RTC_DATE] &amp; 0xff);</div><div class='del'>-	mon = BCD2BIN(hpc3c0-&gt;rtcregs[RTC_MONTH] &amp; 0x1f);</div><div class='del'>-	yrs = BCD2BIN(hpc3c0-&gt;rtcregs[RTC_YEAR] &amp; 0xff);</div><div class='del'>-</div><div class='del'>-	hpc3c0-&gt;rtcregs[RTC_CMD] = save_control;</div><div class='del'>-	spin_unlock_irqrestore(&amp;rtc_lock, flags);</div><div class='del'>-</div><div class='del'>-	if (yrs &lt; 45)</div><div class='del'>-		yrs += 30;</div><div class='del'>-	if ((yrs += 40) &lt; 70)</div><div class='del'>-		yrs += 100;</div><div class='del'>-</div><div class='del'>-	return mktime(yrs + 1900, mon, day, hrs, min, sec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int rtc_mips_set_time(unsigned long tim)</div><div class='del'>-{</div><div class='del'>-	struct rtc_time tm;</div><div class='del'>-	unsigned int save_control;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	rtc_time_to_tm(tim, &amp;tm);</div><div class='del'>-</div><div class='del'>-	tm.tm_mon += 1;		/* tm_mon starts at zero */</div><div class='del'>-	tm.tm_year -= 40;</div><div class='del'>-	if (tm.tm_year &gt;= 100)</div><div class='del'>-		tm.tm_year -= 100;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;rtc_lock, flags);</div><div class='del'>-	save_control = hpc3c0-&gt;rtcregs[RTC_CMD] &amp; 0xff;</div><div class='del'>-	hpc3c0-&gt;rtcregs[RTC_CMD] = save_control | RTC_TE;</div><div class='del'>-</div><div class='del'>-	hpc3c0-&gt;rtcregs[RTC_YEAR] = BIN2BCD(tm.tm_year);</div><div class='del'>-	hpc3c0-&gt;rtcregs[RTC_MONTH] = BIN2BCD(tm.tm_mon);</div><div class='del'>-	hpc3c0-&gt;rtcregs[RTC_DATE] = BIN2BCD(tm.tm_mday);</div><div class='del'>-	hpc3c0-&gt;rtcregs[RTC_HOURS] = BIN2BCD(tm.tm_hour);</div><div class='del'>-	hpc3c0-&gt;rtcregs[RTC_MINUTES] = BIN2BCD(tm.tm_min);</div><div class='del'>-	hpc3c0-&gt;rtcregs[RTC_SECONDS] = BIN2BCD(tm.tm_sec);</div><div class='del'>-	hpc3c0-&gt;rtcregs[RTC_HUNDREDTH_SECOND] = 0;</div><div class='del'>-</div><div class='del'>-	hpc3c0-&gt;rtcregs[RTC_CMD] = save_control;</div><div class='del'>-	spin_unlock_irqrestore(&amp;rtc_lock, flags);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static unsigned long dosample(void)</div><div class='ctx'> {</div><div class='ctx'> 	u32 ct0, ct1;</div><div class='head'>diff --git a/arch/mips/sgi-ip27/ip27-timer.c b/arch/mips/sgi-ip27/ip27-timer.c<br/>index 8b4e854af925..1327c2746fb7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/sgi-ip27/ip27-timer.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/sgi-ip27/ip27-timer.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/sgi-ip27/ip27-timer.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/sgi-ip27/ip27-timer.c</a></div><div class='hunk'>@@ -13,12 +13,12 @@</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='ctx'> #include &lt;linux/timex.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/time.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/sgialib.h&gt;</div><div class='ctx'> #include &lt;asm/sn/ioc3.h&gt;</div><div class='del'>-#include &lt;asm/m48t35.h&gt;</div><div class='ctx'> #include &lt;asm/sn/klconfig.h&gt;</div><div class='ctx'> #include &lt;asm/sn/arch.h&gt;</div><div class='ctx'> #include &lt;asm/sn/addrs.h&gt;</div><div class='hunk'>@@ -28,51 +28,6 @@</div><div class='ctx'> </div><div class='ctx'> #define TICK_SIZE (tick_nsec / 1000)</div><div class='ctx'> </div><div class='del'>-#if 0</div><div class='del'>-static int set_rtc_mmss(unsigned long nowtime)</div><div class='del'>-{</div><div class='del'>-	int retval = 0;</div><div class='del'>-	int real_seconds, real_minutes, cmos_minutes;</div><div class='del'>-	struct m48t35_rtc *rtc;</div><div class='del'>-	nasid_t nid;</div><div class='del'>-</div><div class='del'>-	nid = get_nasid();</div><div class='del'>-	rtc = (struct m48t35_rtc *)(KL_CONFIG_CH_CONS_INFO(nid)-&gt;memory_base +</div><div class='del'>-							IOC3_BYTEBUS_DEV0);</div><div class='del'>-</div><div class='del'>-	rtc-&gt;control |= M48T35_RTC_READ;</div><div class='del'>-	cmos_minutes = BCD2BIN(rtc-&gt;min);</div><div class='del'>-	rtc-&gt;control &amp;= ~M48T35_RTC_READ;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Since we're only adjusting minutes and seconds, don't interfere with</div><div class='del'>-	 * hour overflow. This avoids messing with unknown time zones but</div><div class='del'>-	 * requires your RTC not to be off by more than 15 minutes</div><div class='del'>-	 */</div><div class='del'>-	real_seconds = nowtime % 60;</div><div class='del'>-	real_minutes = nowtime / 60;</div><div class='del'>-	if (((abs(real_minutes - cmos_minutes) + 15)/30) &amp; 1)</div><div class='del'>-		real_minutes += 30;	/* correct for half hour time zone */</div><div class='del'>-	real_minutes %= 60;</div><div class='del'>-</div><div class='del'>-	if (abs(real_minutes - cmos_minutes) &lt; 30) {</div><div class='del'>-		real_seconds = BIN2BCD(real_seconds);</div><div class='del'>-		real_minutes = BIN2BCD(real_minutes);</div><div class='del'>-		rtc-&gt;control |= M48T35_RTC_SET;</div><div class='del'>-		rtc-&gt;sec = real_seconds;</div><div class='del'>-		rtc-&gt;min = real_minutes;</div><div class='del'>-		rtc-&gt;control &amp;= ~M48T35_RTC_SET;</div><div class='del'>-	} else {</div><div class='del'>-		printk(KERN_WARNING</div><div class='del'>-		       "set_rtc_mmss: can't update from %d to %d\n",</div><div class='del'>-		       cmos_minutes, real_minutes);</div><div class='del'>-		retval = -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> /* Includes for ioc3_init().  */</div><div class='ctx'> #include &lt;asm/sn/types.h&gt;</div><div class='ctx'> #include &lt;asm/sn/sn0/addrs.h&gt;</div><div class='hunk'>@@ -80,37 +35,6 @@ static int set_rtc_mmss(unsigned long nowtime)</div><div class='ctx'> #include &lt;asm/sn/sn0/hubio.h&gt;</div><div class='ctx'> #include &lt;asm/pci/bridge.h&gt;</div><div class='ctx'> </div><div class='del'>-unsigned long read_persistent_clock(void)</div><div class='del'>-{</div><div class='del'>-        unsigned int year, month, date, hour, min, sec;</div><div class='del'>-	struct m48t35_rtc *rtc;</div><div class='del'>-	nasid_t nid;</div><div class='del'>-</div><div class='del'>-	nid = get_nasid();</div><div class='del'>-	rtc = (struct m48t35_rtc *)(KL_CONFIG_CH_CONS_INFO(nid)-&gt;memory_base +</div><div class='del'>-							IOC3_BYTEBUS_DEV0);</div><div class='del'>-</div><div class='del'>-	rtc-&gt;control |= M48T35_RTC_READ;</div><div class='del'>-	sec = rtc-&gt;sec;</div><div class='del'>-	min = rtc-&gt;min;</div><div class='del'>-	hour = rtc-&gt;hour;</div><div class='del'>-	date = rtc-&gt;date;</div><div class='del'>-	month = rtc-&gt;month;</div><div class='del'>-	year = rtc-&gt;year;</div><div class='del'>-	rtc-&gt;control &amp;= ~M48T35_RTC_READ;</div><div class='del'>-</div><div class='del'>-        sec = BCD2BIN(sec);</div><div class='del'>-        min = BCD2BIN(min);</div><div class='del'>-        hour = BCD2BIN(hour);</div><div class='del'>-        date = BCD2BIN(date);</div><div class='del'>-        month = BCD2BIN(month);</div><div class='del'>-        year = BCD2BIN(year);</div><div class='del'>-</div><div class='del'>-        year += 1970;</div><div class='del'>-</div><div class='del'>-        return mktime(year, month, date, hour, min, sec);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void enable_rt_irq(unsigned int irq)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='hunk'>@@ -286,6 +210,7 @@ void __cpuinit cpu_time_init(void)</div><div class='ctx'> </div><div class='ctx'> void __cpuinit hub_rtc_init(cnodeid_t cnode)</div><div class='ctx'> {</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We only need to initialize the current node.</div><div class='ctx'> 	 * If this is not the current node then it is a cpuless</div><div class='hunk'>@@ -301,3 +226,23 @@ void __cpuinit hub_rtc_init(cnodeid_t cnode)</div><div class='ctx'> 		LOCAL_HUB_S(PI_RT_PEND_B, 0);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static int __init sgi_ip27_rtc_devinit(void)</div><div class='add'>+{</div><div class='add'>+	struct resource res;</div><div class='add'>+</div><div class='add'>+	memset(&amp;res, 0, sizeof(res));</div><div class='add'>+	res.start = XPHYSADDR(KL_CONFIG_CH_CONS_INFO(master_nasid)-&gt;memory_base +</div><div class='add'>+			      IOC3_BYTEBUS_DEV0);</div><div class='add'>+	res.end = res.start + 32767;</div><div class='add'>+	res.flags = IORESOURCE_MEM;</div><div class='add'>+</div><div class='add'>+	return IS_ERR(platform_device_register_simple("rtc-m48t35", -1,</div><div class='add'>+						      &amp;res, 1));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * kludge make this a device_initcall after ioc3 resource conflicts</div><div class='add'>+ * are resolved</div><div class='add'>+ */</div><div class='add'>+late_initcall(sgi_ip27_rtc_devinit);</div><div class='head'>diff --git a/arch/mips/sgi-ip32/ip32-platform.c b/arch/mips/sgi-ip32/ip32-platform.c<br/>index 3d63721e0e80..511e9ff2acfd 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/sgi-ip32/ip32-platform.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/sgi-ip32/ip32-platform.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/sgi-ip32/ip32-platform.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/sgi-ip32/ip32-platform.c</a></div><div class='hunk'>@@ -90,6 +90,22 @@ static __init int sgio2btns_devinit(void)</div><div class='ctx'> </div><div class='ctx'> device_initcall(sgio2btns_devinit);</div><div class='ctx'> </div><div class='add'>+static struct resource sgio2_cmos_rsrc[] = {</div><div class='add'>+	{</div><div class='add'>+		.start = 0x70,</div><div class='add'>+		.end   = 0x71,</div><div class='add'>+		.flags = IORESOURCE_IO</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static __init int sgio2_cmos_devinit(void)</div><div class='add'>+{</div><div class='add'>+	return IS_ERR(platform_device_register_simple("rtc_cmos", -1,</div><div class='add'>+						      sgio2_cmos_rsrc, 1));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+device_initcall(sgio2_cmos_devinit);</div><div class='add'>+</div><div class='ctx'> MODULE_AUTHOR("Ralf Baechle &lt;ralf@linux-mips.org&gt;");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_DESCRIPTION("8250 UART probe driver for SGI IP32 aka O2");</div><div class='head'>diff --git a/arch/mips/sgi-ip32/ip32-setup.c b/arch/mips/sgi-ip32/ip32-setup.c<br/>index 1024bf40bd9e..c5a5d4a31b4b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/sgi-ip32/ip32-setup.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/sgi-ip32/ip32-setup.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/sgi-ip32/ip32-setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/sgi-ip32/ip32-setup.c</a></div><div class='hunk'>@@ -62,11 +62,6 @@ static inline void str2eaddr(unsigned char *ea, unsigned char *str)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-unsigned long read_persistent_clock(void)</div><div class='del'>-{</div><div class='del'>-	return mc146818_get_cmos_time();</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* An arbitrary time; this can be decreased if reliability looks good */</div><div class='ctx'> #define WAIT_MS 10</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/sibyte/common/sb_tbprof.c b/arch/mips/sibyte/common/sb_tbprof.c<br/>index 66e3e3fb311f..637a194e5cd5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/sibyte/common/sb_tbprof.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/sibyte/common/sb_tbprof.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/sibyte/common/sb_tbprof.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/sibyte/common/sb_tbprof.c</a></div><div class='hunk'>@@ -576,8 +576,7 @@ static int __init sbprof_tb_init(void)</div><div class='ctx'> </div><div class='ctx'> 	tb_class = tbc;</div><div class='ctx'> </div><div class='del'>-	dev = device_create_drvdata(tbc, NULL, MKDEV(SBPROF_TB_MAJOR, 0),</div><div class='del'>-				    NULL, "tb");</div><div class='add'>+	dev = device_create(tbc, NULL, MKDEV(SBPROF_TB_MAJOR, 0), NULL, "tb");</div><div class='ctx'> 	if (IS_ERR(dev)) {</div><div class='ctx'> 		err = PTR_ERR(dev);</div><div class='ctx'> 		goto out_class;</div><div class='head'>diff --git a/arch/mips/txx9/Kconfig b/arch/mips/txx9/Kconfig<br/>index 840fe757c48d..17052db4161d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/txx9/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/txx9/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/txx9/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/txx9/Kconfig</a></div><div class='hunk'>@@ -45,6 +45,14 @@ config TOSHIBA_RBTX4938</div><div class='ctx'> 	  This Toshiba board is based on the TX4938 processor. Say Y here to</div><div class='ctx'> 	  support this machine type</div><div class='ctx'> </div><div class='add'>+config TOSHIBA_RBTX4939</div><div class='add'>+	bool "Toshiba RBTX4939 bobard"</div><div class='add'>+	depends on MACH_TX49XX</div><div class='add'>+	select SOC_TX4939</div><div class='add'>+	help</div><div class='add'>+	  This Toshiba board is based on the TX4939 processor. Say Y here to</div><div class='add'>+	  support this machine type</div><div class='add'>+</div><div class='ctx'> config SOC_TX3927</div><div class='ctx'> 	bool</div><div class='ctx'> 	select CEVT_TXX9</div><div class='hunk'>@@ -71,6 +79,13 @@ config SOC_TX4938</div><div class='ctx'> 	select PCI_TX4927</div><div class='ctx'> 	select GPIO_TXX9</div><div class='ctx'> </div><div class='add'>+config SOC_TX4939</div><div class='add'>+	bool</div><div class='add'>+	select CEVT_TXX9</div><div class='add'>+	select HAS_TXX9_SERIAL</div><div class='add'>+	select HW_HAS_PCI</div><div class='add'>+	select PCI_TX4927</div><div class='add'>+</div><div class='ctx'> config TOSHIBA_FPCIB0</div><div class='ctx'> 	bool "FPCIB0 Backplane Support"</div><div class='ctx'> 	depends on PCI &amp;&amp; MACH_TXX9</div><div class='hunk'>@@ -94,16 +109,11 @@ config TOSHIBA_RBTX4938_MPLEX_NAND</div><div class='ctx'> 	bool "NAND"</div><div class='ctx'> config TOSHIBA_RBTX4938_MPLEX_ATA</div><div class='ctx'> 	bool "ATA"</div><div class='add'>+config TOSHIBA_RBTX4938_MPLEX_KEEP</div><div class='add'>+	bool "Keep firmware settings"</div><div class='ctx'> </div><div class='ctx'> endchoice</div><div class='ctx'> </div><div class='del'>-config TX4938_NAND_BOOT</div><div class='del'>-	depends on EXPERIMENTAL &amp;&amp; TOSHIBA_RBTX4938_MPLEX_NAND</div><div class='del'>-	bool "NAND Boot Support (EXPERIMENTAL)"</div><div class='del'>-	help</div><div class='del'>-	  This is only for Toshiba RBTX4938 reference board, which has NAND IPL.</div><div class='del'>-	  Select this option if you need to use NAND boot.</div><div class='del'>-</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='ctx'> config PCI_TX4927</div><div class='head'>diff --git a/arch/mips/txx9/generic/Makefile b/arch/mips/txx9/generic/Makefile<br/>index 9bb34af26b73..0030d23bef5b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/txx9/generic/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/txx9/generic/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/txx9/generic/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/txx9/generic/Makefile</a></div><div class='hunk'>@@ -7,6 +7,8 @@ obj-$(CONFIG_PCI)	+= pci.o</div><div class='ctx'> obj-$(CONFIG_SOC_TX3927)	+= setup_tx3927.o irq_tx3927.o</div><div class='ctx'> obj-$(CONFIG_SOC_TX4927)	+= mem_tx4927.o setup_tx4927.o irq_tx4927.o</div><div class='ctx'> obj-$(CONFIG_SOC_TX4938)	+= mem_tx4927.o setup_tx4938.o irq_tx4938.o</div><div class='add'>+obj-$(CONFIG_SOC_TX4939)	+= setup_tx4939.o irq_tx4939.o</div><div class='ctx'> obj-$(CONFIG_TOSHIBA_FPCIB0)	+= smsc_fdc37m81x.o</div><div class='add'>+obj-$(CONFIG_SPI)		+= spi_eeprom.o</div><div class='ctx'> </div><div class='ctx'> EXTRA_CFLAGS += -Werror</div><div class='head'>diff --git a/arch/mips/txx9/generic/irq_tx4927.c b/arch/mips/txx9/generic/irq_tx4927.c<br/>index cbea1fdde82b..ad2870def8f1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/txx9/generic/irq_tx4927.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/txx9/generic/irq_tx4927.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/txx9/generic/irq_tx4927.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/txx9/generic/irq_tx4927.c</a></div><div class='hunk'>@@ -30,8 +30,19 @@</div><div class='ctx'> </div><div class='ctx'> void __init tx4927_irq_init(void)</div><div class='ctx'> {</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='ctx'> 	mips_cpu_irq_init();</div><div class='ctx'> 	txx9_irq_init(TX4927_IRC_REG &amp; 0xfffffffffULL);</div><div class='ctx'> 	set_irq_chained_handler(MIPS_CPU_IRQ_BASE + TX4927_IRC_INT,</div><div class='ctx'> 				handle_simple_irq);</div><div class='add'>+	/* raise priority for errors, timers, SIO */</div><div class='add'>+	txx9_irq_set_pri(TX4927_IR_ECCERR, 7);</div><div class='add'>+	txx9_irq_set_pri(TX4927_IR_WTOERR, 7);</div><div class='add'>+	txx9_irq_set_pri(TX4927_IR_PCIERR, 7);</div><div class='add'>+	txx9_irq_set_pri(TX4927_IR_PCIPME, 7);</div><div class='add'>+	for (i = 0; i &lt; TX4927_NUM_IR_TMR; i++)</div><div class='add'>+		txx9_irq_set_pri(TX4927_IR_TMR(i), 6);</div><div class='add'>+	for (i = 0; i &lt; TX4927_NUM_IR_SIO; i++)</div><div class='add'>+		txx9_irq_set_pri(TX4927_IR_SIO(i), 5);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/txx9/generic/irq_tx4938.c b/arch/mips/txx9/generic/irq_tx4938.c<br/>index 6eac684bf190..025ae11359a8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/txx9/generic/irq_tx4938.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/txx9/generic/irq_tx4938.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/txx9/generic/irq_tx4938.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/txx9/generic/irq_tx4938.c</a></div><div class='hunk'>@@ -18,8 +18,19 @@</div><div class='ctx'> </div><div class='ctx'> void __init tx4938_irq_init(void)</div><div class='ctx'> {</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='ctx'> 	mips_cpu_irq_init();</div><div class='ctx'> 	txx9_irq_init(TX4938_IRC_REG &amp; 0xfffffffffULL);</div><div class='ctx'> 	set_irq_chained_handler(MIPS_CPU_IRQ_BASE + TX4938_IRC_INT,</div><div class='ctx'> 				handle_simple_irq);</div><div class='add'>+	/* raise priority for errors, timers, SIO */</div><div class='add'>+	txx9_irq_set_pri(TX4938_IR_ECCERR, 7);</div><div class='add'>+	txx9_irq_set_pri(TX4938_IR_WTOERR, 7);</div><div class='add'>+	txx9_irq_set_pri(TX4938_IR_PCIERR, 7);</div><div class='add'>+	txx9_irq_set_pri(TX4938_IR_PCIPME, 7);</div><div class='add'>+	for (i = 0; i &lt; TX4938_NUM_IR_TMR; i++)</div><div class='add'>+		txx9_irq_set_pri(TX4938_IR_TMR(i), 6);</div><div class='add'>+	for (i = 0; i &lt; TX4938_NUM_IR_SIO; i++)</div><div class='add'>+		txx9_irq_set_pri(TX4938_IR_SIO(i), 5);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/txx9/generic/irq_tx4939.c b/arch/mips/txx9/generic/irq_tx4939.c<br/>new file mode 100644<br/>index 000000000000..013213a8706b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/txx9/generic/irq_tx4939.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/txx9/generic/irq_tx4939.c</a></div><div class='hunk'>@@ -0,0 +1,215 @@</div><div class='add'>+/*</div><div class='add'>+ * TX4939 irq routines</div><div class='add'>+ * Based on linux/arch/mips/kernel/irq_txx9.c,</div><div class='add'>+ *	    and RBTX49xx patch from CELF patch archive.</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2001, 2003-2005 MontaVista Software Inc.</div><div class='add'>+ * Author: MontaVista Software, Inc.</div><div class='add'>+ *         ahennessy@mvista.com</div><div class='add'>+ *         source@mvista.com</div><div class='add'>+ * Copyright (C) 2000-2001,2005-2007 Toshiba Corporation</div><div class='add'>+ *</div><div class='add'>+ * This file is subject to the terms and conditions of the GNU General Public</div><div class='add'>+ * License.  See the file "COPYING" in the main directory of this archive</div><div class='add'>+ * for more details.</div><div class='add'>+ */</div><div class='add'>+/*</div><div class='add'>+ * TX4939 defines 64 IRQs.</div><div class='add'>+ * Similer to irq_txx9.c but different register layouts.</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;asm/irq_cpu.h&gt;</div><div class='add'>+#include &lt;asm/txx9irq.h&gt;</div><div class='add'>+#include &lt;asm/txx9/tx4939.h&gt;</div><div class='add'>+</div><div class='add'>+/* IRCER : Int. Control Enable */</div><div class='add'>+#define TXx9_IRCER_ICE	0x00000001</div><div class='add'>+</div><div class='add'>+/* IRCR : Int. Control */</div><div class='add'>+#define TXx9_IRCR_LOW	0x00000000</div><div class='add'>+#define TXx9_IRCR_HIGH	0x00000001</div><div class='add'>+#define TXx9_IRCR_DOWN	0x00000002</div><div class='add'>+#define TXx9_IRCR_UP	0x00000003</div><div class='add'>+#define TXx9_IRCR_EDGE(cr)	((cr) &amp; 0x00000002)</div><div class='add'>+</div><div class='add'>+/* IRSCR : Int. Status Control */</div><div class='add'>+#define TXx9_IRSCR_EIClrE	0x00000100</div><div class='add'>+#define TXx9_IRSCR_EIClr_MASK	0x0000000f</div><div class='add'>+</div><div class='add'>+/* IRCSR : Int. Current Status */</div><div class='add'>+#define TXx9_IRCSR_IF	0x00010000</div><div class='add'>+</div><div class='add'>+#define irc_dlevel	0</div><div class='add'>+#define irc_elevel	1</div><div class='add'>+</div><div class='add'>+static struct {</div><div class='add'>+	unsigned char level;</div><div class='add'>+	unsigned char mode;</div><div class='add'>+} tx4939irq[TX4939_NUM_IR] __read_mostly;</div><div class='add'>+</div><div class='add'>+static void tx4939_irq_unmask(unsigned int irq)</div><div class='add'>+{</div><div class='add'>+	unsigned int irq_nr = irq - TXX9_IRQ_BASE;</div><div class='add'>+	u32 __iomem *lvlp;</div><div class='add'>+	int ofs;</div><div class='add'>+	if (irq_nr &lt; 32) {</div><div class='add'>+		irq_nr--;</div><div class='add'>+		lvlp = &amp;tx4939_ircptr-&gt;lvl[(irq_nr % 16) / 2].r;</div><div class='add'>+	} else {</div><div class='add'>+		irq_nr -= 32;</div><div class='add'>+		lvlp = &amp;tx4939_ircptr-&gt;lvl[8 + (irq_nr % 16) / 2].r;</div><div class='add'>+	}</div><div class='add'>+	ofs = (irq_nr &amp; 16) + (irq_nr &amp; 1) * 8;</div><div class='add'>+	__raw_writel((__raw_readl(lvlp) &amp; ~(0xff &lt;&lt; ofs))</div><div class='add'>+		     | (tx4939irq[irq_nr].level &lt;&lt; ofs),</div><div class='add'>+		     lvlp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void tx4939_irq_mask(unsigned int irq)</div><div class='add'>+{</div><div class='add'>+	unsigned int irq_nr = irq - TXX9_IRQ_BASE;</div><div class='add'>+	u32 __iomem *lvlp;</div><div class='add'>+	int ofs;</div><div class='add'>+	if (irq_nr &lt; 32) {</div><div class='add'>+		irq_nr--;</div><div class='add'>+		lvlp = &amp;tx4939_ircptr-&gt;lvl[(irq_nr % 16) / 2].r;</div><div class='add'>+	} else {</div><div class='add'>+		irq_nr -= 32;</div><div class='add'>+		lvlp = &amp;tx4939_ircptr-&gt;lvl[8 + (irq_nr % 16) / 2].r;</div><div class='add'>+	}</div><div class='add'>+	ofs = (irq_nr &amp; 16) + (irq_nr &amp; 1) * 8;</div><div class='add'>+	__raw_writel((__raw_readl(lvlp) &amp; ~(0xff &lt;&lt; ofs))</div><div class='add'>+		     | (irc_dlevel &lt;&lt; ofs),</div><div class='add'>+		     lvlp);</div><div class='add'>+	mmiowb();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tx4939_irq_mask_ack(unsigned int irq)</div><div class='add'>+{</div><div class='add'>+	unsigned int irq_nr = irq - TXX9_IRQ_BASE;</div><div class='add'>+</div><div class='add'>+	tx4939_irq_mask(irq);</div><div class='add'>+	if (TXx9_IRCR_EDGE(tx4939irq[irq_nr].mode)) {</div><div class='add'>+		irq_nr--;</div><div class='add'>+		/* clear edge detection */</div><div class='add'>+		__raw_writel((TXx9_IRSCR_EIClrE | (irq_nr &amp; 0xf))</div><div class='add'>+			     &lt;&lt; (irq_nr &amp; 0x10),</div><div class='add'>+			     &amp;tx4939_ircptr-&gt;edc.r);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tx4939_irq_set_type(unsigned int irq, unsigned int flow_type)</div><div class='add'>+{</div><div class='add'>+	unsigned int irq_nr = irq - TXX9_IRQ_BASE;</div><div class='add'>+	u32 cr;</div><div class='add'>+	u32 __iomem *crp;</div><div class='add'>+	int ofs;</div><div class='add'>+	int mode;</div><div class='add'>+</div><div class='add'>+	if (flow_type &amp; IRQF_TRIGGER_PROBE)</div><div class='add'>+		return 0;</div><div class='add'>+	switch (flow_type &amp; IRQF_TRIGGER_MASK) {</div><div class='add'>+	case IRQF_TRIGGER_RISING:</div><div class='add'>+		mode = TXx9_IRCR_UP;</div><div class='add'>+		break;</div><div class='add'>+	case IRQF_TRIGGER_FALLING:</div><div class='add'>+		mode = TXx9_IRCR_DOWN;</div><div class='add'>+		break;</div><div class='add'>+	case IRQF_TRIGGER_HIGH:</div><div class='add'>+		mode = TXx9_IRCR_HIGH;</div><div class='add'>+		break;</div><div class='add'>+	case IRQF_TRIGGER_LOW:</div><div class='add'>+		mode = TXx9_IRCR_LOW;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (irq_nr &lt; 32) {</div><div class='add'>+		irq_nr--;</div><div class='add'>+		crp = &amp;tx4939_ircptr-&gt;dm[(irq_nr &amp; 8) &gt;&gt; 3].r;</div><div class='add'>+	} else {</div><div class='add'>+		irq_nr -= 32;</div><div class='add'>+		crp = &amp;tx4939_ircptr-&gt;dm2[((irq_nr &amp; 8) &gt;&gt; 3)].r;</div><div class='add'>+	}</div><div class='add'>+	ofs = (((irq_nr &amp; 16) &gt;&gt; 1) | (irq_nr &amp; (8 - 1))) * 2;</div><div class='add'>+	cr = __raw_readl(crp);</div><div class='add'>+	cr &amp;= ~(0x3 &lt;&lt; ofs);</div><div class='add'>+	cr |= (mode &amp; 0x3) &lt;&lt; ofs;</div><div class='add'>+	__raw_writel(cr, crp);</div><div class='add'>+	tx4939irq[irq_nr].mode = mode;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct irq_chip tx4939_irq_chip = {</div><div class='add'>+	.name		= "TX4939",</div><div class='add'>+	.ack		= tx4939_irq_mask_ack,</div><div class='add'>+	.mask		= tx4939_irq_mask,</div><div class='add'>+	.mask_ack	= tx4939_irq_mask_ack,</div><div class='add'>+	.unmask		= tx4939_irq_unmask,</div><div class='add'>+	.set_type	= tx4939_irq_set_type,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int tx4939_irq_set_pri(int irc_irq, int new_pri)</div><div class='add'>+{</div><div class='add'>+	int old_pri;</div><div class='add'>+</div><div class='add'>+	if ((unsigned int)irc_irq &gt;= TX4939_NUM_IR)</div><div class='add'>+		return 0;</div><div class='add'>+	old_pri = tx4939irq[irc_irq].level;</div><div class='add'>+	tx4939irq[irc_irq].level = new_pri;</div><div class='add'>+	return old_pri;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init tx4939_irq_init(void)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	mips_cpu_irq_init();</div><div class='add'>+	/* disable interrupt control */</div><div class='add'>+	__raw_writel(0, &amp;tx4939_ircptr-&gt;den.r);</div><div class='add'>+	__raw_writel(0, &amp;tx4939_ircptr-&gt;maskint.r);</div><div class='add'>+	__raw_writel(0, &amp;tx4939_ircptr-&gt;maskext.r);</div><div class='add'>+	/* irq_base + 0 is not used */</div><div class='add'>+	for (i = 1; i &lt; TX4939_NUM_IR; i++) {</div><div class='add'>+		tx4939irq[i].level = 4; /* middle level */</div><div class='add'>+		tx4939irq[i].mode = TXx9_IRCR_LOW;</div><div class='add'>+		set_irq_chip_and_handler(TXX9_IRQ_BASE + i,</div><div class='add'>+					 &amp;tx4939_irq_chip, handle_level_irq);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* mask all IRC interrupts */</div><div class='add'>+	__raw_writel(0, &amp;tx4939_ircptr-&gt;msk.r);</div><div class='add'>+	for (i = 0; i &lt; 16; i++)</div><div class='add'>+		__raw_writel(0, &amp;tx4939_ircptr-&gt;lvl[i].r);</div><div class='add'>+	/* setup IRC interrupt mode (Low Active) */</div><div class='add'>+	for (i = 0; i &lt; 2; i++)</div><div class='add'>+		__raw_writel(0, &amp;tx4939_ircptr-&gt;dm[i].r);</div><div class='add'>+	for (i = 0; i &lt; 2; i++)</div><div class='add'>+		__raw_writel(0, &amp;tx4939_ircptr-&gt;dm2[i].r);</div><div class='add'>+	/* enable interrupt control */</div><div class='add'>+	__raw_writel(TXx9_IRCER_ICE, &amp;tx4939_ircptr-&gt;den.r);</div><div class='add'>+	__raw_writel(irc_elevel, &amp;tx4939_ircptr-&gt;msk.r);</div><div class='add'>+</div><div class='add'>+	set_irq_chained_handler(MIPS_CPU_IRQ_BASE + TX4939_IRC_INT,</div><div class='add'>+				handle_simple_irq);</div><div class='add'>+</div><div class='add'>+	/* raise priority for errors, timers, sio */</div><div class='add'>+	tx4939_irq_set_pri(TX4939_IR_WTOERR, 7);</div><div class='add'>+	tx4939_irq_set_pri(TX4939_IR_PCIERR, 7);</div><div class='add'>+	tx4939_irq_set_pri(TX4939_IR_PCIPME, 7);</div><div class='add'>+	for (i = 0; i &lt; TX4939_NUM_IR_TMR; i++)</div><div class='add'>+		tx4939_irq_set_pri(TX4939_IR_TMR(i), 6);</div><div class='add'>+	for (i = 0; i &lt; TX4939_NUM_IR_SIO; i++)</div><div class='add'>+		tx4939_irq_set_pri(TX4939_IR_SIO(i), 5);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int tx4939_irq(void)</div><div class='add'>+{</div><div class='add'>+	u32 csr = __raw_readl(&amp;tx4939_ircptr-&gt;cs.r);</div><div class='add'>+</div><div class='add'>+	if (likely(!(csr &amp; TXx9_IRCSR_IF)))</div><div class='add'>+		return TXX9_IRQ_BASE + (csr &amp; (TX4939_NUM_IR - 1));</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='head'>diff --git a/arch/mips/txx9/generic/setup.c b/arch/mips/txx9/generic/setup.c<br/>index fe6bee09cece..5526375010f8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/txx9/generic/setup.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/txx9/generic/setup.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/txx9/generic/setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/txx9/generic/setup.c</a></div><div class='hunk'>@@ -22,11 +22,16 @@</div><div class='ctx'> #include &lt;linux/gpio.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/serial_core.h&gt;</div><div class='add'>+#include &lt;linux/mtd/physmap.h&gt;</div><div class='add'>+#include &lt;linux/leds.h&gt;</div><div class='ctx'> #include &lt;asm/bootinfo.h&gt;</div><div class='ctx'> #include &lt;asm/time.h&gt;</div><div class='ctx'> #include &lt;asm/reboot.h&gt;</div><div class='add'>+#include &lt;asm/r4kcache.h&gt;</div><div class='add'>+#include &lt;asm/sections.h&gt;</div><div class='ctx'> #include &lt;asm/txx9/generic.h&gt;</div><div class='ctx'> #include &lt;asm/txx9/pci.h&gt;</div><div class='add'>+#include &lt;asm/txx9tmr.h&gt;</div><div class='ctx'> #ifdef CONFIG_CPU_TX49XX</div><div class='ctx'> #include &lt;asm/txx9/tx4938.h&gt;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -67,7 +72,12 @@ unsigned int txx9_master_clock;</div><div class='ctx'> unsigned int txx9_cpu_clock;</div><div class='ctx'> unsigned int txx9_gbus_clock;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_CPU_TX39XX</div><div class='add'>+/* don't enable by default - see errata */</div><div class='add'>+int txx9_ccfg_toeon __initdata;</div><div class='add'>+#else</div><div class='ctx'> int txx9_ccfg_toeon __initdata = 1;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> /* Minimum CLK support */</div><div class='ctx'> </div><div class='hunk'>@@ -119,39 +129,232 @@ int irq_to_gpio(unsigned irq)</div><div class='ctx'> EXPORT_SYMBOL(irq_to_gpio);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-extern struct txx9_board_vec jmr3927_vec;</div><div class='del'>-extern struct txx9_board_vec rbtx4927_vec;</div><div class='del'>-extern struct txx9_board_vec rbtx4937_vec;</div><div class='del'>-extern struct txx9_board_vec rbtx4938_vec;</div><div class='add'>+#define BOARD_VEC(board)	extern struct txx9_board_vec board;</div><div class='add'>+#include &lt;asm/txx9/boards.h&gt;</div><div class='add'>+#undef BOARD_VEC</div><div class='ctx'> </div><div class='ctx'> struct txx9_board_vec *txx9_board_vec __initdata;</div><div class='ctx'> static char txx9_system_type[32];</div><div class='ctx'> </div><div class='del'>-void __init prom_init_cmdline(void)</div><div class='add'>+static struct txx9_board_vec *board_vecs[] __initdata = {</div><div class='add'>+#define BOARD_VEC(board)	&amp;board,</div><div class='add'>+#include &lt;asm/txx9/boards.h&gt;</div><div class='add'>+#undef BOARD_VEC</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct txx9_board_vec *__init find_board_byname(const char *name)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* search board_vecs table */</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(board_vecs); i++) {</div><div class='add'>+		if (strstr(board_vecs[i]-&gt;system, name))</div><div class='add'>+			return board_vecs[i];</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init prom_init_cmdline(void)</div><div class='ctx'> {</div><div class='ctx'> 	int argc = (int)fw_arg0;</div><div class='del'>-	char **argv = (char **)fw_arg1;</div><div class='add'>+	int *argv32 = (int *)fw_arg1;</div><div class='ctx'> 	int i;			/* Always ignore the "-c" at argv[0] */</div><div class='del'>-#ifdef CONFIG_64BIT</div><div class='del'>-	char *fixed_argv[32];</div><div class='del'>-	for (i = 0; i &lt; argc; i++)</div><div class='del'>-		fixed_argv[i] = (char *)(long)(*((__s32 *)argv + i));</div><div class='del'>-	argv = fixed_argv;</div><div class='del'>-#endif</div><div class='add'>+	char builtin[CL_SIZE];</div><div class='ctx'> </div><div class='ctx'> 	/* ignore all built-in args if any f/w args given */</div><div class='del'>-	if (argc &gt; 1)</div><div class='del'>-		*arcs_cmdline = '\0';</div><div class='add'>+	/*</div><div class='add'>+	 * But if built-in strings was started with '+', append them</div><div class='add'>+	 * to command line args.  If built-in was started with '-',</div><div class='add'>+	 * ignore all f/w args.</div><div class='add'>+	 */</div><div class='add'>+	builtin[0] = '\0';</div><div class='add'>+	if (arcs_cmdline[0] == '+')</div><div class='add'>+		strcpy(builtin, arcs_cmdline + 1);</div><div class='add'>+	else if (arcs_cmdline[0] == '-') {</div><div class='add'>+		strcpy(builtin, arcs_cmdline + 1);</div><div class='add'>+		argc = 0;</div><div class='add'>+	} else if (argc &lt;= 1)</div><div class='add'>+		strcpy(builtin, arcs_cmdline);</div><div class='add'>+	arcs_cmdline[0] = '\0';</div><div class='ctx'> </div><div class='ctx'> 	for (i = 1; i &lt; argc; i++) {</div><div class='add'>+		char *str = (char *)(long)argv32[i];</div><div class='ctx'> 		if (i != 1)</div><div class='ctx'> 			strcat(arcs_cmdline, " ");</div><div class='del'>-		strcat(arcs_cmdline, argv[i]);</div><div class='add'>+		if (strchr(str, ' ')) {</div><div class='add'>+			strcat(arcs_cmdline, "\"");</div><div class='add'>+			strcat(arcs_cmdline, str);</div><div class='add'>+			strcat(arcs_cmdline, "\"");</div><div class='add'>+		} else</div><div class='add'>+			strcat(arcs_cmdline, str);</div><div class='add'>+	}</div><div class='add'>+	/* append saved builtin args */</div><div class='add'>+	if (builtin[0]) {</div><div class='add'>+		if (arcs_cmdline[0])</div><div class='add'>+			strcat(arcs_cmdline, " ");</div><div class='add'>+		strcat(arcs_cmdline, builtin);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init prom_init(void)</div><div class='add'>+static int txx9_ic_disable __initdata;</div><div class='add'>+static int txx9_dc_disable __initdata;</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_CPU_TX49XX)</div><div class='add'>+/* flush all cache on very early stage (before 4k_cache_init) */</div><div class='add'>+static void __init early_flush_dcache(void)</div><div class='ctx'> {</div><div class='add'>+	unsigned int conf = read_c0_config();</div><div class='add'>+	unsigned int dc_size = 1 &lt;&lt; (12 + ((conf &amp; CONF_DC) &gt;&gt; 6));</div><div class='add'>+	unsigned int linesz = 32;</div><div class='add'>+	unsigned long addr, end;</div><div class='add'>+</div><div class='add'>+	end = INDEX_BASE + dc_size / 4;</div><div class='add'>+	/* 4way, waybit=0 */</div><div class='add'>+	for (addr = INDEX_BASE; addr &lt; end; addr += linesz) {</div><div class='add'>+		cache_op(Index_Writeback_Inv_D, addr | 0);</div><div class='add'>+		cache_op(Index_Writeback_Inv_D, addr | 1);</div><div class='add'>+		cache_op(Index_Writeback_Inv_D, addr | 2);</div><div class='add'>+		cache_op(Index_Writeback_Inv_D, addr | 3);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init txx9_cache_fixup(void)</div><div class='add'>+{</div><div class='add'>+	unsigned int conf;</div><div class='add'>+</div><div class='add'>+	conf = read_c0_config();</div><div class='add'>+	/* flush and disable */</div><div class='add'>+	if (txx9_ic_disable) {</div><div class='add'>+		conf |= TX49_CONF_IC;</div><div class='add'>+		write_c0_config(conf);</div><div class='add'>+	}</div><div class='add'>+	if (txx9_dc_disable) {</div><div class='add'>+		early_flush_dcache();</div><div class='add'>+		conf |= TX49_CONF_DC;</div><div class='add'>+		write_c0_config(conf);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* enable cache */</div><div class='add'>+	conf = read_c0_config();</div><div class='add'>+	if (!txx9_ic_disable)</div><div class='add'>+		conf &amp;= ~TX49_CONF_IC;</div><div class='add'>+	if (!txx9_dc_disable)</div><div class='add'>+		conf &amp;= ~TX49_CONF_DC;</div><div class='add'>+	write_c0_config(conf);</div><div class='add'>+</div><div class='add'>+	if (conf &amp; TX49_CONF_IC)</div><div class='add'>+		pr_info("TX49XX I-Cache disabled.\n");</div><div class='add'>+	if (conf &amp; TX49_CONF_DC)</div><div class='add'>+		pr_info("TX49XX D-Cache disabled.\n");</div><div class='add'>+}</div><div class='add'>+#elif defined(CONFIG_CPU_TX39XX)</div><div class='add'>+/* flush all cache on very early stage (before tx39_cache_init) */</div><div class='add'>+static void __init early_flush_dcache(void)</div><div class='add'>+{</div><div class='add'>+	unsigned int conf = read_c0_config();</div><div class='add'>+	unsigned int dc_size = 1 &lt;&lt; (10 + ((conf &amp; TX39_CONF_DCS_MASK) &gt;&gt;</div><div class='add'>+					   TX39_CONF_DCS_SHIFT));</div><div class='add'>+	unsigned int linesz = 16;</div><div class='add'>+	unsigned long addr, end;</div><div class='add'>+</div><div class='add'>+	end = INDEX_BASE + dc_size / 2;</div><div class='add'>+	/* 2way, waybit=0 */</div><div class='add'>+	for (addr = INDEX_BASE; addr &lt; end; addr += linesz) {</div><div class='add'>+		cache_op(Index_Writeback_Inv_D, addr | 0);</div><div class='add'>+		cache_op(Index_Writeback_Inv_D, addr | 1);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init txx9_cache_fixup(void)</div><div class='add'>+{</div><div class='add'>+	unsigned int conf;</div><div class='add'>+</div><div class='add'>+	conf = read_c0_config();</div><div class='add'>+	/* flush and disable */</div><div class='add'>+	if (txx9_ic_disable) {</div><div class='add'>+		conf &amp;= ~TX39_CONF_ICE;</div><div class='add'>+		write_c0_config(conf);</div><div class='add'>+	}</div><div class='add'>+	if (txx9_dc_disable) {</div><div class='add'>+		early_flush_dcache();</div><div class='add'>+		conf &amp;= ~TX39_CONF_DCE;</div><div class='add'>+		write_c0_config(conf);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* enable cache */</div><div class='add'>+	conf = read_c0_config();</div><div class='add'>+	if (!txx9_ic_disable)</div><div class='add'>+		conf |= TX39_CONF_ICE;</div><div class='add'>+	if (!txx9_dc_disable)</div><div class='add'>+		conf |= TX39_CONF_DCE;</div><div class='add'>+	write_c0_config(conf);</div><div class='add'>+</div><div class='add'>+	if (!(conf &amp; TX39_CONF_ICE))</div><div class='add'>+		pr_info("TX39XX I-Cache disabled.\n");</div><div class='add'>+	if (!(conf &amp; TX39_CONF_DCE))</div><div class='add'>+		pr_info("TX39XX D-Cache disabled.\n");</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline void txx9_cache_fixup(void)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static void __init preprocess_cmdline(void)</div><div class='add'>+{</div><div class='add'>+	char cmdline[CL_SIZE];</div><div class='add'>+	char *s;</div><div class='add'>+</div><div class='add'>+	strcpy(cmdline, arcs_cmdline);</div><div class='add'>+	s = cmdline;</div><div class='add'>+	arcs_cmdline[0] = '\0';</div><div class='add'>+	while (s &amp;&amp; *s) {</div><div class='add'>+		char *str = strsep(&amp;s, " ");</div><div class='add'>+		if (strncmp(str, "board=", 6) == 0) {</div><div class='add'>+			txx9_board_vec = find_board_byname(str + 6);</div><div class='add'>+			continue;</div><div class='add'>+		} else if (strncmp(str, "masterclk=", 10) == 0) {</div><div class='add'>+			unsigned long val;</div><div class='add'>+			if (strict_strtoul(str + 10, 10, &amp;val) == 0)</div><div class='add'>+				txx9_master_clock = val;</div><div class='add'>+			continue;</div><div class='add'>+		} else if (strcmp(str, "icdisable") == 0) {</div><div class='add'>+			txx9_ic_disable = 1;</div><div class='add'>+			continue;</div><div class='add'>+		} else if (strcmp(str, "dcdisable") == 0) {</div><div class='add'>+			txx9_dc_disable = 1;</div><div class='add'>+			continue;</div><div class='add'>+		} else if (strcmp(str, "toeoff") == 0) {</div><div class='add'>+			txx9_ccfg_toeon = 0;</div><div class='add'>+			continue;</div><div class='add'>+		} else if (strcmp(str, "toeon") == 0) {</div><div class='add'>+			txx9_ccfg_toeon = 1;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		if (arcs_cmdline[0])</div><div class='add'>+			strcat(arcs_cmdline, " ");</div><div class='add'>+		strcat(arcs_cmdline, str);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	txx9_cache_fixup();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init select_board(void)</div><div class='add'>+{</div><div class='add'>+	const char *envstr;</div><div class='add'>+</div><div class='add'>+	/* first, determine by "board=" argument in preprocess_cmdline() */</div><div class='add'>+	if (txx9_board_vec)</div><div class='add'>+		return;</div><div class='add'>+	/* next, determine by "board" envvar */</div><div class='add'>+	envstr = prom_getenv("board");</div><div class='add'>+	if (envstr) {</div><div class='add'>+		txx9_board_vec = find_board_byname(envstr);</div><div class='add'>+		if (txx9_board_vec)</div><div class='add'>+			return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* select "default" board */</div><div class='ctx'> #ifdef CONFIG_CPU_TX39XX</div><div class='ctx'> 	txx9_board_vec = &amp;jmr3927_vec;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -170,8 +373,20 @@ void __init prom_init(void)</div><div class='ctx'> 		txx9_board_vec = &amp;rbtx4938_vec;</div><div class='ctx'> 		break;</div><div class='ctx'> #endif</div><div class='add'>+#ifdef CONFIG_TOSHIBA_RBTX4939</div><div class='add'>+	case 0x4939:</div><div class='add'>+		txx9_board_vec = &amp;rbtx4939_vec;</div><div class='add'>+		break;</div><div class='add'>+#endif</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init prom_init(void)</div><div class='add'>+{</div><div class='add'>+	prom_init_cmdline();</div><div class='add'>+	preprocess_cmdline();</div><div class='add'>+	select_board();</div><div class='ctx'> </div><div class='ctx'> 	strcpy(txx9_system_type, txx9_board_vec-&gt;system);</div><div class='ctx'> </div><div class='hunk'>@@ -180,6 +395,11 @@ void __init prom_init(void)</div><div class='ctx'> </div><div class='ctx'> void __init prom_free_prom_memory(void)</div><div class='ctx'> {</div><div class='add'>+	unsigned long saddr = PAGE_SIZE;</div><div class='add'>+	unsigned long eaddr = __pa_symbol(&amp;_text);</div><div class='add'>+</div><div class='add'>+	if (saddr &lt; eaddr)</div><div class='add'>+		free_init_pages("prom memory", saddr, eaddr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> const char *get_system_type(void)</div><div class='hunk'>@@ -192,6 +412,21 @@ char * __init prom_getcmdline(void)</div><div class='ctx'> 	return &amp;(arcs_cmdline[0]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+const char *__init prom_getenv(const char *name)</div><div class='add'>+{</div><div class='add'>+	const s32 *str = (const s32 *)fw_arg2;</div><div class='add'>+</div><div class='add'>+	if (!str)</div><div class='add'>+		return NULL;</div><div class='add'>+	/* YAMON style ("name", "value" pairs) */</div><div class='add'>+	while (str[0] &amp;&amp; str[1]) {</div><div class='add'>+		if (!strcmp((const char *)(unsigned long)str[0], name))</div><div class='add'>+			return (const char *)(unsigned long)str[1];</div><div class='add'>+		str += 2;</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void __noreturn txx9_machine_halt(void)</div><div class='ctx'> {</div><div class='ctx'> 	local_irq_disable();</div><div class='hunk'>@@ -222,6 +457,20 @@ void __init txx9_wdt_init(unsigned long base)</div><div class='ctx'> 	platform_device_register_simple("txx9wdt", -1, &amp;res, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void txx9_wdt_now(unsigned long base)</div><div class='add'>+{</div><div class='add'>+	struct txx9_tmr_reg __iomem *tmrptr =</div><div class='add'>+		ioremap(base, sizeof(struct txx9_tmr_reg));</div><div class='add'>+	/* disable watch dog timer */</div><div class='add'>+	__raw_writel(TXx9_TMWTMR_WDIS | TXx9_TMWTMR_TWC, &amp;tmrptr-&gt;wtmr);</div><div class='add'>+	__raw_writel(0, &amp;tmrptr-&gt;tcr);</div><div class='add'>+	/* kick watchdog */</div><div class='add'>+	__raw_writel(TXx9_TMWTMR_TWIE, &amp;tmrptr-&gt;wtmr);</div><div class='add'>+	__raw_writel(1, &amp;tmrptr-&gt;cpra); /* immediate */</div><div class='add'>+	__raw_writel(TXx9_TMTCR_TCE | TXx9_TMTCR_CCDE | TXx9_TMTCR_TMODE_WDOG,</div><div class='add'>+		     &amp;tmrptr-&gt;tcr);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* SPI support */</div><div class='ctx'> void __init txx9_spi_init(int busid, unsigned long base, int irq)</div><div class='ctx'> {</div><div class='hunk'>@@ -372,3 +621,153 @@ static unsigned long __swizzle_addr_none(unsigned long port)</div><div class='ctx'> unsigned long (*__swizzle_addr_b)(unsigned long port) = __swizzle_addr_none;</div><div class='ctx'> EXPORT_SYMBOL(__swizzle_addr_b);</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='add'>+void __init txx9_physmap_flash_init(int no, unsigned long addr,</div><div class='add'>+				    unsigned long size,</div><div class='add'>+				    const struct physmap_flash_data *pdata)</div><div class='add'>+{</div><div class='add'>+#if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE)</div><div class='add'>+	struct resource res = {</div><div class='add'>+		.start = addr,</div><div class='add'>+		.end = addr + size - 1,</div><div class='add'>+		.flags = IORESOURCE_MEM,</div><div class='add'>+	};</div><div class='add'>+	struct platform_device *pdev;</div><div class='add'>+#ifdef CONFIG_MTD_PARTITIONS</div><div class='add'>+	static struct mtd_partition parts[2];</div><div class='add'>+	struct physmap_flash_data pdata_part;</div><div class='add'>+</div><div class='add'>+	/* If this area contained boot area, make separate partition */</div><div class='add'>+	if (pdata-&gt;nr_parts == 0 &amp;&amp; !pdata-&gt;parts &amp;&amp;</div><div class='add'>+	    addr &lt; 0x1fc00000 &amp;&amp; addr + size &gt; 0x1fc00000 &amp;&amp;</div><div class='add'>+	    !parts[0].name) {</div><div class='add'>+		parts[0].name = "boot";</div><div class='add'>+		parts[0].offset = 0x1fc00000 - addr;</div><div class='add'>+		parts[0].size = addr + size - 0x1fc00000;</div><div class='add'>+		parts[1].name = "user";</div><div class='add'>+		parts[1].offset = 0;</div><div class='add'>+		parts[1].size = 0x1fc00000 - addr;</div><div class='add'>+		pdata_part = *pdata;</div><div class='add'>+		pdata_part.nr_parts = ARRAY_SIZE(parts);</div><div class='add'>+		pdata_part.parts = parts;</div><div class='add'>+		pdata = &amp;pdata_part;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	pdev = platform_device_alloc("physmap-flash", no);</div><div class='add'>+	if (!pdev ||</div><div class='add'>+	    platform_device_add_resources(pdev, &amp;res, 1) ||</div><div class='add'>+	    platform_device_add_data(pdev, pdata, sizeof(*pdata)) ||</div><div class='add'>+	    platform_device_add(pdev))</div><div class='add'>+		platform_device_put(pdev);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_LEDS_GPIO) || defined(CONFIG_LEDS_GPIO_MODULE)</div><div class='add'>+static DEFINE_SPINLOCK(txx9_iocled_lock);</div><div class='add'>+</div><div class='add'>+#define TXX9_IOCLED_MAXLEDS 8</div><div class='add'>+</div><div class='add'>+struct txx9_iocled_data {</div><div class='add'>+	struct gpio_chip chip;</div><div class='add'>+	u8 cur_val;</div><div class='add'>+	void __iomem *mmioaddr;</div><div class='add'>+	struct gpio_led_platform_data pdata;</div><div class='add'>+	struct gpio_led leds[TXX9_IOCLED_MAXLEDS];</div><div class='add'>+	char names[TXX9_IOCLED_MAXLEDS][32];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int txx9_iocled_get(struct gpio_chip *chip, unsigned int offset)</div><div class='add'>+{</div><div class='add'>+	struct txx9_iocled_data *data =</div><div class='add'>+		container_of(chip, struct txx9_iocled_data, chip);</div><div class='add'>+	return data-&gt;cur_val &amp; (1 &lt;&lt; offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void txx9_iocled_set(struct gpio_chip *chip, unsigned int offset,</div><div class='add'>+			    int value)</div><div class='add'>+{</div><div class='add'>+	struct txx9_iocled_data *data =</div><div class='add'>+		container_of(chip, struct txx9_iocled_data, chip);</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	spin_lock_irqsave(&amp;txx9_iocled_lock, flags);</div><div class='add'>+	if (value)</div><div class='add'>+		data-&gt;cur_val |= 1 &lt;&lt; offset;</div><div class='add'>+	else</div><div class='add'>+		data-&gt;cur_val &amp;= ~(1 &lt;&lt; offset);</div><div class='add'>+	writeb(data-&gt;cur_val, data-&gt;mmioaddr);</div><div class='add'>+	mmiowb();</div><div class='add'>+	spin_unlock_irqrestore(&amp;txx9_iocled_lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int txx9_iocled_dir_in(struct gpio_chip *chip, unsigned int offset)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int txx9_iocled_dir_out(struct gpio_chip *chip, unsigned int offset,</div><div class='add'>+			       int value)</div><div class='add'>+{</div><div class='add'>+	txx9_iocled_set(chip, offset, value);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init txx9_iocled_init(unsigned long baseaddr,</div><div class='add'>+			     int basenum, unsigned int num, int lowactive,</div><div class='add'>+			     const char *color, char **deftriggers)</div><div class='add'>+{</div><div class='add'>+	struct txx9_iocled_data *iocled;</div><div class='add'>+	struct platform_device *pdev;</div><div class='add'>+	int i;</div><div class='add'>+	static char *default_triggers[] __initdata = {</div><div class='add'>+		"heartbeat",</div><div class='add'>+		"ide-disk",</div><div class='add'>+		"nand-disk",</div><div class='add'>+		NULL,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (!deftriggers)</div><div class='add'>+		deftriggers = default_triggers;</div><div class='add'>+	iocled = kzalloc(sizeof(*iocled), GFP_KERNEL);</div><div class='add'>+	if (!iocled)</div><div class='add'>+		return;</div><div class='add'>+	iocled-&gt;mmioaddr = ioremap(baseaddr, 1);</div><div class='add'>+	if (!iocled-&gt;mmioaddr)</div><div class='add'>+		return;</div><div class='add'>+	iocled-&gt;chip.get = txx9_iocled_get;</div><div class='add'>+	iocled-&gt;chip.set = txx9_iocled_set;</div><div class='add'>+	iocled-&gt;chip.direction_input = txx9_iocled_dir_in;</div><div class='add'>+	iocled-&gt;chip.direction_output = txx9_iocled_dir_out;</div><div class='add'>+	iocled-&gt;chip.label = "iocled";</div><div class='add'>+	iocled-&gt;chip.base = basenum;</div><div class='add'>+	iocled-&gt;chip.ngpio = num;</div><div class='add'>+	if (gpiochip_add(&amp;iocled-&gt;chip))</div><div class='add'>+		return;</div><div class='add'>+	if (basenum &lt; 0)</div><div class='add'>+		basenum = iocled-&gt;chip.base;</div><div class='add'>+</div><div class='add'>+	pdev = platform_device_alloc("leds-gpio", basenum);</div><div class='add'>+	if (!pdev)</div><div class='add'>+		return;</div><div class='add'>+	iocled-&gt;pdata.num_leds = num;</div><div class='add'>+	iocled-&gt;pdata.leds = iocled-&gt;leds;</div><div class='add'>+	for (i = 0; i &lt; num; i++) {</div><div class='add'>+		struct gpio_led *led = &amp;iocled-&gt;leds[i];</div><div class='add'>+		snprintf(iocled-&gt;names[i], sizeof(iocled-&gt;names[i]),</div><div class='add'>+			 "iocled:%s:%u", color, i);</div><div class='add'>+		led-&gt;name = iocled-&gt;names[i];</div><div class='add'>+		led-&gt;gpio = basenum + i;</div><div class='add'>+		led-&gt;active_low = lowactive;</div><div class='add'>+		if (deftriggers &amp;&amp; *deftriggers)</div><div class='add'>+			led-&gt;default_trigger = *deftriggers++;</div><div class='add'>+	}</div><div class='add'>+	pdev-&gt;dev.platform_data = &amp;iocled-&gt;pdata;</div><div class='add'>+	if (platform_device_add(pdev))</div><div class='add'>+		platform_device_put(pdev);</div><div class='add'>+}</div><div class='add'>+#else /* CONFIG_LEDS_GPIO */</div><div class='add'>+void __init txx9_iocled_init(unsigned long baseaddr,</div><div class='add'>+			     int basenum, unsigned int num, int lowactive,</div><div class='add'>+			     const char *color, char **deftriggers)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_LEDS_GPIO */</div><div class='head'>diff --git a/arch/mips/txx9/generic/setup_tx3927.c b/arch/mips/txx9/generic/setup_tx3927.c<br/>index 7bd963d37fc3..9505d58454c8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/txx9/generic/setup_tx3927.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/txx9/generic/setup_tx3927.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/txx9/generic/setup_tx3927.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/txx9/generic/setup_tx3927.c</a></div><div class='hunk'>@@ -15,6 +15,7 @@</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/param.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/mtd/physmap.h&gt;</div><div class='ctx'> #include &lt;asm/mipsregs.h&gt;</div><div class='ctx'> #include &lt;asm/txx9irq.h&gt;</div><div class='ctx'> #include &lt;asm/txx9tmr.h&gt;</div><div class='hunk'>@@ -32,11 +33,6 @@ void __init tx3927_setup(void)</div><div class='ctx'> 	int i;</div><div class='ctx'> 	unsigned int conf;</div><div class='ctx'> </div><div class='del'>-	/* don't enable - see errata */</div><div class='del'>-	txx9_ccfg_toeon = 0;</div><div class='del'>-	if (strstr(prom_getcmdline(), "toeon") != NULL)</div><div class='del'>-		txx9_ccfg_toeon = 1;</div><div class='del'>-</div><div class='ctx'> 	txx9_reg_res_init(TX3927_REV_PCODE(), TX3927_REG_BASE,</div><div class='ctx'> 			  TX3927_REG_SIZE);</div><div class='ctx'> </div><div class='hunk'>@@ -99,16 +95,14 @@ void __init tx3927_setup(void)</div><div class='ctx'> 	txx9_gpio_init(TX3927_PIO_REG, 0, 16);</div><div class='ctx'> </div><div class='ctx'> 	conf = read_c0_conf();</div><div class='del'>-	if (!(conf &amp; TX39_CONF_ICE))</div><div class='del'>-		printk(KERN_INFO "TX3927 I-Cache disabled.\n");</div><div class='del'>-	if (!(conf &amp; TX39_CONF_DCE))</div><div class='del'>-		printk(KERN_INFO "TX3927 D-Cache disabled.\n");</div><div class='del'>-	else if (!(conf &amp; TX39_CONF_WBON))</div><div class='del'>-		printk(KERN_INFO "TX3927 D-Cache WriteThrough.\n");</div><div class='del'>-	else if (!(conf &amp; TX39_CONF_CWFON))</div><div class='del'>-		printk(KERN_INFO "TX3927 D-Cache WriteBack.\n");</div><div class='del'>-	else</div><div class='del'>-		printk(KERN_INFO "TX3927 D-Cache WriteBack (CWF) .\n");</div><div class='add'>+	if (conf &amp; TX39_CONF_DCE) {</div><div class='add'>+		if (!(conf &amp; TX39_CONF_WBON))</div><div class='add'>+			pr_info("TX3927 D-Cache WriteThrough.\n");</div><div class='add'>+		else if (!(conf &amp; TX39_CONF_CWFON))</div><div class='add'>+			pr_info("TX3927 D-Cache WriteBack.\n");</div><div class='add'>+		else</div><div class='add'>+			pr_info("TX3927 D-Cache WriteBack (CWF) .\n");</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __init tx3927_time_init(unsigned int evt_tmrnr, unsigned int src_tmrnr)</div><div class='hunk'>@@ -128,3 +122,16 @@ void __init tx3927_sio_init(unsigned int sclk, unsigned int cts_mask)</div><div class='ctx'> 			      TXX9_IRQ_BASE + TX3927_IR_SIO(i),</div><div class='ctx'> 			      i, sclk, (1 &lt;&lt; i) &amp; cts_mask);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+void __init tx3927_mtd_init(int ch)</div><div class='add'>+{</div><div class='add'>+	struct physmap_flash_data pdata = {</div><div class='add'>+		.width = TX3927_ROMC_WIDTH(ch) / 8,</div><div class='add'>+	};</div><div class='add'>+	unsigned long start = txx9_ce_res[ch].start;</div><div class='add'>+	unsigned long size = txx9_ce_res[ch].end - start + 1;</div><div class='add'>+</div><div class='add'>+	if (!(tx3927_romcptr-&gt;cr[ch] &amp; 0x8))</div><div class='add'>+		return;	/* disabled */</div><div class='add'>+	txx9_physmap_flash_init(ch, start, size, &amp;pdata);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/mips/txx9/generic/setup_tx4927.c b/arch/mips/txx9/generic/setup_tx4927.c<br/>index f80d4b7a694d..914e93c62639 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/txx9/generic/setup_tx4927.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/txx9/generic/setup_tx4927.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/txx9/generic/setup_tx4927.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/txx9/generic/setup_tx4927.c</a></div><div class='hunk'>@@ -14,6 +14,10 @@</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/param.h&gt;</div><div class='add'>+#include &lt;linux/ptrace.h&gt;</div><div class='add'>+#include &lt;linux/mtd/physmap.h&gt;</div><div class='add'>+#include &lt;asm/reboot.h&gt;</div><div class='add'>+#include &lt;asm/traps.h&gt;</div><div class='ctx'> #include &lt;asm/txx9irq.h&gt;</div><div class='ctx'> #include &lt;asm/txx9tmr.h&gt;</div><div class='ctx'> #include &lt;asm/txx9pio.h&gt;</div><div class='hunk'>@@ -22,6 +26,10 @@</div><div class='ctx'> </div><div class='ctx'> static void __init tx4927_wdr_init(void)</div><div class='ctx'> {</div><div class='add'>+	/* report watchdog reset status */</div><div class='add'>+	if (____raw_readq(&amp;tx4927_ccfgptr-&gt;ccfg) &amp; TX4927_CCFG_WDRST)</div><div class='add'>+		pr_warning("Watchdog reset detected at 0x%lx\n",</div><div class='add'>+			   read_c0_errorepc());</div><div class='ctx'> 	/* clear WatchDogReset (W1C) */</div><div class='ctx'> 	tx4927_ccfg_set(TX4927_CCFG_WDRST);</div><div class='ctx'> 	/* do reset on watchdog */</div><div class='hunk'>@@ -33,6 +41,47 @@ void __init tx4927_wdt_init(void)</div><div class='ctx'> 	txx9_wdt_init(TX4927_TMR_REG(2) &amp; 0xfffffffffULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void tx4927_machine_restart(char *command)</div><div class='add'>+{</div><div class='add'>+	local_irq_disable();</div><div class='add'>+	pr_emerg("Rebooting (with %s watchdog reset)...\n",</div><div class='add'>+		 (____raw_readq(&amp;tx4927_ccfgptr-&gt;ccfg) &amp; TX4927_CCFG_WDREXEN) ?</div><div class='add'>+		 "external" : "internal");</div><div class='add'>+	/* clear watchdog status */</div><div class='add'>+	tx4927_ccfg_set(TX4927_CCFG_WDRST);	/* W1C */</div><div class='add'>+	txx9_wdt_now(TX4927_TMR_REG(2) &amp; 0xfffffffffULL);</div><div class='add'>+	while (!(____raw_readq(&amp;tx4927_ccfgptr-&gt;ccfg) &amp; TX4927_CCFG_WDRST))</div><div class='add'>+		;</div><div class='add'>+	mdelay(10);</div><div class='add'>+	if (____raw_readq(&amp;tx4927_ccfgptr-&gt;ccfg) &amp; TX4927_CCFG_WDREXEN) {</div><div class='add'>+		pr_emerg("Rebooting (with internal watchdog reset)...\n");</div><div class='add'>+		/* External WDRST failed.  Do internal watchdog reset */</div><div class='add'>+		tx4927_ccfg_clear(TX4927_CCFG_WDREXEN);</div><div class='add'>+	}</div><div class='add'>+	/* fallback */</div><div class='add'>+	(*_machine_halt)();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void show_registers(struct pt_regs *regs);</div><div class='add'>+static int tx4927_be_handler(struct pt_regs *regs, int is_fixup)</div><div class='add'>+{</div><div class='add'>+	int data = regs-&gt;cp0_cause &amp; 4;</div><div class='add'>+	console_verbose();</div><div class='add'>+	pr_err("%cBE exception at %#lx\n", data ? 'D' : 'I', regs-&gt;cp0_epc);</div><div class='add'>+	pr_err("ccfg:%llx, toea:%llx\n",</div><div class='add'>+	       (unsigned long long)____raw_readq(&amp;tx4927_ccfgptr-&gt;ccfg),</div><div class='add'>+	       (unsigned long long)____raw_readq(&amp;tx4927_ccfgptr-&gt;toea));</div><div class='add'>+#ifdef CONFIG_PCI</div><div class='add'>+	tx4927_report_pcic_status();</div><div class='add'>+#endif</div><div class='add'>+	show_registers(regs);</div><div class='add'>+	panic("BusError!");</div><div class='add'>+}</div><div class='add'>+static void __init tx4927_be_init(void)</div><div class='add'>+{</div><div class='add'>+	board_be_handler = tx4927_be_handler;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct resource tx4927_sdram_resource[4];</div><div class='ctx'> </div><div class='ctx'> void __init tx4927_setup(void)</div><div class='hunk'>@@ -44,6 +93,7 @@ void __init tx4927_setup(void)</div><div class='ctx'> </div><div class='ctx'> 	txx9_reg_res_init(TX4927_REV_PCODE(), TX4927_REG_BASE,</div><div class='ctx'> 			  TX4927_REG_SIZE);</div><div class='add'>+	set_c0_config(TX49_CONF_CWFON);</div><div class='ctx'> </div><div class='ctx'> 	/* SDRAMC,EBUSC are configured by PROM */</div><div class='ctx'> 	for (i = 0; i &lt; 8; i++) {</div><div class='hunk'>@@ -167,6 +217,9 @@ void __init tx4927_setup(void)</div><div class='ctx'> 	txx9_gpio_init(TX4927_PIO_REG &amp; 0xfffffffffULL, 0, TX4927_NUM_PIO);</div><div class='ctx'> 	__raw_writel(0, &amp;tx4927_pioptr-&gt;maskcpu);</div><div class='ctx'> 	__raw_writel(0, &amp;tx4927_pioptr-&gt;maskext);</div><div class='add'>+</div><div class='add'>+	_machine_restart = tx4927_machine_restart;</div><div class='add'>+	board_be_init = tx4927_be_init;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __init tx4927_time_init(unsigned int tmrnr)</div><div class='hunk'>@@ -186,3 +239,47 @@ void __init tx4927_sio_init(unsigned int sclk, unsigned int cts_mask)</div><div class='ctx'> 			      TXX9_IRQ_BASE + TX4927_IR_SIO(i),</div><div class='ctx'> 			      i, sclk, (1 &lt;&lt; i) &amp; cts_mask);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+void __init tx4927_mtd_init(int ch)</div><div class='add'>+{</div><div class='add'>+	struct physmap_flash_data pdata = {</div><div class='add'>+		.width = TX4927_EBUSC_WIDTH(ch) / 8,</div><div class='add'>+	};</div><div class='add'>+	unsigned long start = txx9_ce_res[ch].start;</div><div class='add'>+	unsigned long size = txx9_ce_res[ch].end - start + 1;</div><div class='add'>+</div><div class='add'>+	if (!(TX4927_EBUSC_CR(ch) &amp; 0x8))</div><div class='add'>+		return;	/* disabled */</div><div class='add'>+	txx9_physmap_flash_init(ch, start, size, &amp;pdata);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init tx4927_stop_unused_modules(void)</div><div class='add'>+{</div><div class='add'>+	__u64 pcfg, rst = 0, ckd = 0;</div><div class='add'>+	char buf[128];</div><div class='add'>+</div><div class='add'>+	buf[0] = '\0';</div><div class='add'>+	local_irq_disable();</div><div class='add'>+	pcfg = ____raw_readq(&amp;tx4927_ccfgptr-&gt;pcfg);</div><div class='add'>+	if (!(pcfg &amp; TX4927_PCFG_SEL2)) {</div><div class='add'>+		rst |= TX4927_CLKCTR_ACLRST;</div><div class='add'>+		ckd |= TX4927_CLKCTR_ACLCKD;</div><div class='add'>+		strcat(buf, " ACLC");</div><div class='add'>+	}</div><div class='add'>+	if (rst | ckd) {</div><div class='add'>+		txx9_set64(&amp;tx4927_ccfgptr-&gt;clkctr, rst);</div><div class='add'>+		txx9_set64(&amp;tx4927_ccfgptr-&gt;clkctr, ckd);</div><div class='add'>+	}</div><div class='add'>+	local_irq_enable();</div><div class='add'>+	if (buf[0])</div><div class='add'>+		pr_info("%s: stop%s\n", txx9_pcode_str, buf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init tx4927_late_init(void)</div><div class='add'>+{</div><div class='add'>+	if (txx9_pcode != 0x4927)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	tx4927_stop_unused_modules();</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+late_initcall(tx4927_late_init);</div><div class='head'>diff --git a/arch/mips/txx9/generic/setup_tx4938.c b/arch/mips/txx9/generic/setup_tx4938.c<br/>index f3040b9ba059..af724e53ef91 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/txx9/generic/setup_tx4938.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/txx9/generic/setup_tx4938.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/txx9/generic/setup_tx4938.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/txx9/generic/setup_tx4938.c</a></div><div class='hunk'>@@ -14,6 +14,10 @@</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/param.h&gt;</div><div class='add'>+#include &lt;linux/ptrace.h&gt;</div><div class='add'>+#include &lt;linux/mtd/physmap.h&gt;</div><div class='add'>+#include &lt;asm/reboot.h&gt;</div><div class='add'>+#include &lt;asm/traps.h&gt;</div><div class='ctx'> #include &lt;asm/txx9irq.h&gt;</div><div class='ctx'> #include &lt;asm/txx9tmr.h&gt;</div><div class='ctx'> #include &lt;asm/txx9pio.h&gt;</div><div class='hunk'>@@ -22,6 +26,10 @@</div><div class='ctx'> </div><div class='ctx'> static void __init tx4938_wdr_init(void)</div><div class='ctx'> {</div><div class='add'>+	/* report watchdog reset status */</div><div class='add'>+	if (____raw_readq(&amp;tx4938_ccfgptr-&gt;ccfg) &amp; TX4938_CCFG_WDRST)</div><div class='add'>+		pr_warning("Watchdog reset detected at 0x%lx\n",</div><div class='add'>+			   read_c0_errorepc());</div><div class='ctx'> 	/* clear WatchDogReset (W1C) */</div><div class='ctx'> 	tx4938_ccfg_set(TX4938_CCFG_WDRST);</div><div class='ctx'> 	/* do reset on watchdog */</div><div class='hunk'>@@ -33,6 +41,47 @@ void __init tx4938_wdt_init(void)</div><div class='ctx'> 	txx9_wdt_init(TX4938_TMR_REG(2) &amp; 0xfffffffffULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void tx4938_machine_restart(char *command)</div><div class='add'>+{</div><div class='add'>+	local_irq_disable();</div><div class='add'>+	pr_emerg("Rebooting (with %s watchdog reset)...\n",</div><div class='add'>+		 (____raw_readq(&amp;tx4938_ccfgptr-&gt;ccfg) &amp; TX4938_CCFG_WDREXEN) ?</div><div class='add'>+		 "external" : "internal");</div><div class='add'>+	/* clear watchdog status */</div><div class='add'>+	tx4938_ccfg_set(TX4938_CCFG_WDRST);	/* W1C */</div><div class='add'>+	txx9_wdt_now(TX4938_TMR_REG(2) &amp; 0xfffffffffULL);</div><div class='add'>+	while (!(____raw_readq(&amp;tx4938_ccfgptr-&gt;ccfg) &amp; TX4938_CCFG_WDRST))</div><div class='add'>+		;</div><div class='add'>+	mdelay(10);</div><div class='add'>+	if (____raw_readq(&amp;tx4938_ccfgptr-&gt;ccfg) &amp; TX4938_CCFG_WDREXEN) {</div><div class='add'>+		pr_emerg("Rebooting (with internal watchdog reset)...\n");</div><div class='add'>+		/* External WDRST failed.  Do internal watchdog reset */</div><div class='add'>+		tx4938_ccfg_clear(TX4938_CCFG_WDREXEN);</div><div class='add'>+	}</div><div class='add'>+	/* fallback */</div><div class='add'>+	(*_machine_halt)();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void show_registers(struct pt_regs *regs);</div><div class='add'>+static int tx4938_be_handler(struct pt_regs *regs, int is_fixup)</div><div class='add'>+{</div><div class='add'>+	int data = regs-&gt;cp0_cause &amp; 4;</div><div class='add'>+	console_verbose();</div><div class='add'>+	pr_err("%cBE exception at %#lx\n", data ? 'D' : 'I', regs-&gt;cp0_epc);</div><div class='add'>+	pr_err("ccfg:%llx, toea:%llx\n",</div><div class='add'>+	       (unsigned long long)____raw_readq(&amp;tx4938_ccfgptr-&gt;ccfg),</div><div class='add'>+	       (unsigned long long)____raw_readq(&amp;tx4938_ccfgptr-&gt;toea));</div><div class='add'>+#ifdef CONFIG_PCI</div><div class='add'>+	tx4927_report_pcic_status();</div><div class='add'>+#endif</div><div class='add'>+	show_registers(regs);</div><div class='add'>+	panic("BusError!");</div><div class='add'>+}</div><div class='add'>+static void __init tx4938_be_init(void)</div><div class='add'>+{</div><div class='add'>+	board_be_handler = tx4938_be_handler;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct resource tx4938_sdram_resource[4];</div><div class='ctx'> static struct resource tx4938_sram_resource;</div><div class='ctx'> </div><div class='hunk'>@@ -47,6 +96,7 @@ void __init tx4938_setup(void)</div><div class='ctx'> </div><div class='ctx'> 	txx9_reg_res_init(TX4938_REV_PCODE(), TX4938_REG_BASE,</div><div class='ctx'> 			  TX4938_REG_SIZE);</div><div class='add'>+	set_c0_config(TX49_CONF_CWFON);</div><div class='ctx'> </div><div class='ctx'> 	/* SDRAMC,EBUSC are configured by PROM */</div><div class='ctx'> 	for (i = 0; i &lt; 8; i++) {</div><div class='hunk'>@@ -227,6 +277,9 @@ void __init tx4938_setup(void)</div><div class='ctx'> 				   TX4938_CLKCTR_ETH1CKD);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	_machine_restart = tx4938_machine_restart;</div><div class='add'>+	board_be_init = tx4938_be_init;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __init tx4938_time_init(unsigned int tmrnr)</div><div class='hunk'>@@ -268,3 +321,72 @@ void __init tx4938_ethaddr_init(unsigned char *addr0, unsigned char *addr1)</div><div class='ctx'> 	if (addr1 &amp;&amp; (pcfg &amp; TX4938_PCFG_ETH1_SEL))</div><div class='ctx'> 		txx9_ethaddr_init(TXX9_IRQ_BASE + TX4938_IR_ETH1, addr1);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+void __init tx4938_mtd_init(int ch)</div><div class='add'>+{</div><div class='add'>+	struct physmap_flash_data pdata = {</div><div class='add'>+		.width = TX4938_EBUSC_WIDTH(ch) / 8,</div><div class='add'>+	};</div><div class='add'>+	unsigned long start = txx9_ce_res[ch].start;</div><div class='add'>+	unsigned long size = txx9_ce_res[ch].end - start + 1;</div><div class='add'>+</div><div class='add'>+	if (!(TX4938_EBUSC_CR(ch) &amp; 0x8))</div><div class='add'>+		return;	/* disabled */</div><div class='add'>+	txx9_physmap_flash_init(ch, start, size, &amp;pdata);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init tx4938_stop_unused_modules(void)</div><div class='add'>+{</div><div class='add'>+	__u64 pcfg, rst = 0, ckd = 0;</div><div class='add'>+	char buf[128];</div><div class='add'>+</div><div class='add'>+	buf[0] = '\0';</div><div class='add'>+	local_irq_disable();</div><div class='add'>+	pcfg = ____raw_readq(&amp;tx4938_ccfgptr-&gt;pcfg);</div><div class='add'>+	switch (txx9_pcode) {</div><div class='add'>+	case 0x4937:</div><div class='add'>+		if (!(pcfg &amp; TX4938_PCFG_SEL2)) {</div><div class='add'>+			rst |= TX4938_CLKCTR_ACLRST;</div><div class='add'>+			ckd |= TX4938_CLKCTR_ACLCKD;</div><div class='add'>+			strcat(buf, " ACLC");</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case 0x4938:</div><div class='add'>+		if (!(pcfg &amp; TX4938_PCFG_SEL2) ||</div><div class='add'>+		    (pcfg &amp; TX4938_PCFG_ETH0_SEL)) {</div><div class='add'>+			rst |= TX4938_CLKCTR_ACLRST;</div><div class='add'>+			ckd |= TX4938_CLKCTR_ACLCKD;</div><div class='add'>+			strcat(buf, " ACLC");</div><div class='add'>+		}</div><div class='add'>+		if ((pcfg &amp;</div><div class='add'>+		     (TX4938_PCFG_ATA_SEL | TX4938_PCFG_ISA_SEL |</div><div class='add'>+		      TX4938_PCFG_NDF_SEL))</div><div class='add'>+		    != TX4938_PCFG_NDF_SEL) {</div><div class='add'>+			rst |= TX4938_CLKCTR_NDFRST;</div><div class='add'>+			ckd |= TX4938_CLKCTR_NDFCKD;</div><div class='add'>+			strcat(buf, " NDFMC");</div><div class='add'>+		}</div><div class='add'>+		if (!(pcfg &amp; TX4938_PCFG_SPI_SEL)) {</div><div class='add'>+			rst |= TX4938_CLKCTR_SPIRST;</div><div class='add'>+			ckd |= TX4938_CLKCTR_SPICKD;</div><div class='add'>+			strcat(buf, " SPI");</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	if (rst | ckd) {</div><div class='add'>+		txx9_set64(&amp;tx4938_ccfgptr-&gt;clkctr, rst);</div><div class='add'>+		txx9_set64(&amp;tx4938_ccfgptr-&gt;clkctr, ckd);</div><div class='add'>+	}</div><div class='add'>+	local_irq_enable();</div><div class='add'>+	if (buf[0])</div><div class='add'>+		pr_info("%s: stop%s\n", txx9_pcode_str, buf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init tx4938_late_init(void)</div><div class='add'>+{</div><div class='add'>+	if (txx9_pcode != 0x4937 &amp;&amp; txx9_pcode != 0x4938)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	tx4938_stop_unused_modules();</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+late_initcall(tx4938_late_init);</div><div class='head'>diff --git a/arch/mips/txx9/generic/setup_tx4939.c b/arch/mips/txx9/generic/setup_tx4939.c<br/>new file mode 100644<br/>index 000000000000..6c0049a5bbc1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/txx9/generic/setup_tx4939.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/txx9/generic/setup_tx4939.c</a></div><div class='hunk'>@@ -0,0 +1,506 @@</div><div class='add'>+/*</div><div class='add'>+ * TX4939 setup routines</div><div class='add'>+ * Based on linux/arch/mips/txx9/generic/setup_tx4938.c,</div><div class='add'>+ *	    and RBTX49xx patch from CELF patch archive.</div><div class='add'>+ *</div><div class='add'>+ * 2003-2005 (c) MontaVista Software, Inc.</div><div class='add'>+ * (C) Copyright TOSHIBA CORPORATION 2000-2001, 2004-2007</div><div class='add'>+ *</div><div class='add'>+ * This file is subject to the terms and conditions of the GNU General Public</div><div class='add'>+ * License.  See the file "COPYING" in the main directory of this archive</div><div class='add'>+ * for more details.</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/ioport.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/notifier.h&gt;</div><div class='add'>+#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='add'>+#include &lt;linux/param.h&gt;</div><div class='add'>+#include &lt;linux/ptrace.h&gt;</div><div class='add'>+#include &lt;linux/mtd/physmap.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;asm/bootinfo.h&gt;</div><div class='add'>+#include &lt;asm/reboot.h&gt;</div><div class='add'>+#include &lt;asm/traps.h&gt;</div><div class='add'>+#include &lt;asm/txx9irq.h&gt;</div><div class='add'>+#include &lt;asm/txx9tmr.h&gt;</div><div class='add'>+#include &lt;asm/txx9/generic.h&gt;</div><div class='add'>+#include &lt;asm/txx9/tx4939.h&gt;</div><div class='add'>+</div><div class='add'>+static void __init tx4939_wdr_init(void)</div><div class='add'>+{</div><div class='add'>+	/* report watchdog reset status */</div><div class='add'>+	if (____raw_readq(&amp;tx4939_ccfgptr-&gt;ccfg) &amp; TX4939_CCFG_WDRST)</div><div class='add'>+		pr_warning("Watchdog reset detected at 0x%lx\n",</div><div class='add'>+			   read_c0_errorepc());</div><div class='add'>+	/* clear WatchDogReset (W1C) */</div><div class='add'>+	tx4939_ccfg_set(TX4939_CCFG_WDRST);</div><div class='add'>+	/* do reset on watchdog */</div><div class='add'>+	tx4939_ccfg_set(TX4939_CCFG_WR);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init tx4939_wdt_init(void)</div><div class='add'>+{</div><div class='add'>+	txx9_wdt_init(TX4939_TMR_REG(2) &amp; 0xfffffffffULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tx4939_machine_restart(char *command)</div><div class='add'>+{</div><div class='add'>+	local_irq_disable();</div><div class='add'>+	pr_emerg("Rebooting (with %s watchdog reset)...\n",</div><div class='add'>+		 (____raw_readq(&amp;tx4939_ccfgptr-&gt;ccfg) &amp; TX4939_CCFG_WDREXEN) ?</div><div class='add'>+		 "external" : "internal");</div><div class='add'>+	/* clear watchdog status */</div><div class='add'>+	tx4939_ccfg_set(TX4939_CCFG_WDRST);	/* W1C */</div><div class='add'>+	txx9_wdt_now(TX4939_TMR_REG(2) &amp; 0xfffffffffULL);</div><div class='add'>+	while (!(____raw_readq(&amp;tx4939_ccfgptr-&gt;ccfg) &amp; TX4939_CCFG_WDRST))</div><div class='add'>+		;</div><div class='add'>+	mdelay(10);</div><div class='add'>+	if (____raw_readq(&amp;tx4939_ccfgptr-&gt;ccfg) &amp; TX4939_CCFG_WDREXEN) {</div><div class='add'>+		pr_emerg("Rebooting (with internal watchdog reset)...\n");</div><div class='add'>+		/* External WDRST failed.  Do internal watchdog reset */</div><div class='add'>+		tx4939_ccfg_clear(TX4939_CCFG_WDREXEN);</div><div class='add'>+	}</div><div class='add'>+	/* fallback */</div><div class='add'>+	(*_machine_halt)();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void show_registers(struct pt_regs *regs);</div><div class='add'>+static int tx4939_be_handler(struct pt_regs *regs, int is_fixup)</div><div class='add'>+{</div><div class='add'>+	int data = regs-&gt;cp0_cause &amp; 4;</div><div class='add'>+	console_verbose();</div><div class='add'>+	pr_err("%cBE exception at %#lx\n",</div><div class='add'>+	       data ? 'D' : 'I', regs-&gt;cp0_epc);</div><div class='add'>+	pr_err("ccfg:%llx, toea:%llx\n",</div><div class='add'>+	       (unsigned long long)____raw_readq(&amp;tx4939_ccfgptr-&gt;ccfg),</div><div class='add'>+	       (unsigned long long)____raw_readq(&amp;tx4939_ccfgptr-&gt;toea));</div><div class='add'>+#ifdef CONFIG_PCI</div><div class='add'>+	tx4927_report_pcic_status();</div><div class='add'>+#endif</div><div class='add'>+	show_registers(regs);</div><div class='add'>+	panic("BusError!");</div><div class='add'>+}</div><div class='add'>+static void __init tx4939_be_init(void)</div><div class='add'>+{</div><div class='add'>+	board_be_handler = tx4939_be_handler;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct resource tx4939_sdram_resource[4];</div><div class='add'>+static struct resource tx4939_sram_resource;</div><div class='add'>+#define TX4939_SRAM_SIZE 0x800</div><div class='add'>+</div><div class='add'>+void __init tx4939_add_memory_regions(void)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	unsigned long start, size;</div><div class='add'>+	u64 win;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 4; i++) {</div><div class='add'>+		if (!((__u32)____raw_readq(&amp;tx4939_ddrcptr-&gt;winen) &amp; (1 &lt;&lt; i)))</div><div class='add'>+			continue;</div><div class='add'>+		win = ____raw_readq(&amp;tx4939_ddrcptr-&gt;win[i]);</div><div class='add'>+		start = (unsigned long)(win &gt;&gt; 48);</div><div class='add'>+		size = (((unsigned long)(win &gt;&gt; 32) &amp; 0xffff) + 1) - start;</div><div class='add'>+		add_memory_region(start &lt;&lt; 20, size &lt;&lt; 20, BOOT_MEM_RAM);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init tx4939_setup(void)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	__u32 divmode;</div><div class='add'>+	__u64 pcfg;</div><div class='add'>+	int cpuclk = 0;</div><div class='add'>+</div><div class='add'>+	txx9_reg_res_init(TX4939_REV_PCODE(), TX4939_REG_BASE,</div><div class='add'>+			  TX4939_REG_SIZE);</div><div class='add'>+	set_c0_config(TX49_CONF_CWFON);</div><div class='add'>+</div><div class='add'>+	/* SDRAMC,EBUSC are configured by PROM */</div><div class='add'>+	for (i = 0; i &lt; 4; i++) {</div><div class='add'>+		if (!(TX4939_EBUSC_CR(i) &amp; 0x8))</div><div class='add'>+			continue;	/* disabled */</div><div class='add'>+		txx9_ce_res[i].start = (unsigned long)TX4939_EBUSC_BA(i);</div><div class='add'>+		txx9_ce_res[i].end =</div><div class='add'>+			txx9_ce_res[i].start + TX4939_EBUSC_SIZE(i) - 1;</div><div class='add'>+		request_resource(&amp;iomem_resource, &amp;txx9_ce_res[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* clocks */</div><div class='add'>+	if (txx9_master_clock) {</div><div class='add'>+		/* calculate cpu_clock from master_clock */</div><div class='add'>+		divmode = (__u32)____raw_readq(&amp;tx4939_ccfgptr-&gt;ccfg) &amp;</div><div class='add'>+			TX4939_CCFG_MULCLK_MASK;</div><div class='add'>+		cpuclk = txx9_master_clock * 20 / 2;</div><div class='add'>+		switch (divmode) {</div><div class='add'>+		case TX4939_CCFG_MULCLK_8:</div><div class='add'>+			cpuclk = cpuclk / 3 * 4 /* / 6 *  8 */; break;</div><div class='add'>+		case TX4939_CCFG_MULCLK_9:</div><div class='add'>+			cpuclk = cpuclk / 2 * 3 /* / 6 *  9 */; break;</div><div class='add'>+		case TX4939_CCFG_MULCLK_10:</div><div class='add'>+			cpuclk = cpuclk / 3 * 5 /* / 6 * 10 */; break;</div><div class='add'>+		case TX4939_CCFG_MULCLK_11:</div><div class='add'>+			cpuclk = cpuclk / 6 * 11; break;</div><div class='add'>+		case TX4939_CCFG_MULCLK_12:</div><div class='add'>+			cpuclk = cpuclk * 2 /* / 6 * 12 */; break;</div><div class='add'>+		case TX4939_CCFG_MULCLK_13:</div><div class='add'>+			cpuclk = cpuclk / 6 * 13; break;</div><div class='add'>+		case TX4939_CCFG_MULCLK_14:</div><div class='add'>+			cpuclk = cpuclk / 3 * 7 /* / 6 * 14 */; break;</div><div class='add'>+		case TX4939_CCFG_MULCLK_15:</div><div class='add'>+			cpuclk = cpuclk / 2 * 5 /* / 6 * 15 */; break;</div><div class='add'>+		}</div><div class='add'>+		txx9_cpu_clock = cpuclk;</div><div class='add'>+	} else {</div><div class='add'>+		if (txx9_cpu_clock == 0)</div><div class='add'>+			txx9_cpu_clock = 400000000;	/* 400MHz */</div><div class='add'>+		/* calculate master_clock from cpu_clock */</div><div class='add'>+		cpuclk = txx9_cpu_clock;</div><div class='add'>+		divmode = (__u32)____raw_readq(&amp;tx4939_ccfgptr-&gt;ccfg) &amp;</div><div class='add'>+			TX4939_CCFG_MULCLK_MASK;</div><div class='add'>+		switch (divmode) {</div><div class='add'>+		case TX4939_CCFG_MULCLK_8:</div><div class='add'>+			txx9_master_clock = cpuclk * 6 / 8; break;</div><div class='add'>+		case TX4939_CCFG_MULCLK_9:</div><div class='add'>+			txx9_master_clock = cpuclk * 6 / 9; break;</div><div class='add'>+		case TX4939_CCFG_MULCLK_10:</div><div class='add'>+			txx9_master_clock = cpuclk * 6 / 10; break;</div><div class='add'>+		case TX4939_CCFG_MULCLK_11:</div><div class='add'>+			txx9_master_clock = cpuclk * 6 / 11; break;</div><div class='add'>+		case TX4939_CCFG_MULCLK_12:</div><div class='add'>+			txx9_master_clock = cpuclk * 6 / 12; break;</div><div class='add'>+		case TX4939_CCFG_MULCLK_13:</div><div class='add'>+			txx9_master_clock = cpuclk * 6 / 13; break;</div><div class='add'>+		case TX4939_CCFG_MULCLK_14:</div><div class='add'>+			txx9_master_clock = cpuclk * 6 / 14; break;</div><div class='add'>+		case TX4939_CCFG_MULCLK_15:</div><div class='add'>+			txx9_master_clock = cpuclk * 6 / 15; break;</div><div class='add'>+		}</div><div class='add'>+		txx9_master_clock /= 10; /* * 2 / 20 */</div><div class='add'>+	}</div><div class='add'>+	/* calculate gbus_clock from cpu_clock */</div><div class='add'>+	divmode = (__u32)____raw_readq(&amp;tx4939_ccfgptr-&gt;ccfg) &amp;</div><div class='add'>+		TX4939_CCFG_YDIVMODE_MASK;</div><div class='add'>+	txx9_gbus_clock = txx9_cpu_clock;</div><div class='add'>+	switch (divmode) {</div><div class='add'>+	case TX4939_CCFG_YDIVMODE_2:</div><div class='add'>+		txx9_gbus_clock /= 2; break;</div><div class='add'>+	case TX4939_CCFG_YDIVMODE_3:</div><div class='add'>+		txx9_gbus_clock /= 3; break;</div><div class='add'>+	case TX4939_CCFG_YDIVMODE_5:</div><div class='add'>+		txx9_gbus_clock /= 5; break;</div><div class='add'>+	case TX4939_CCFG_YDIVMODE_6:</div><div class='add'>+		txx9_gbus_clock /= 6; break;</div><div class='add'>+	}</div><div class='add'>+	/* change default value to udelay/mdelay take reasonable time */</div><div class='add'>+	loops_per_jiffy = txx9_cpu_clock / HZ / 2;</div><div class='add'>+</div><div class='add'>+	/* CCFG */</div><div class='add'>+	tx4939_wdr_init();</div><div class='add'>+	/* clear BusErrorOnWrite flag (W1C) */</div><div class='add'>+	tx4939_ccfg_set(TX4939_CCFG_WDRST | TX4939_CCFG_BEOW);</div><div class='add'>+	/* enable Timeout BusError */</div><div class='add'>+	if (txx9_ccfg_toeon)</div><div class='add'>+		tx4939_ccfg_set(TX4939_CCFG_TOE);</div><div class='add'>+</div><div class='add'>+	/* DMA selection */</div><div class='add'>+	txx9_clear64(&amp;tx4939_ccfgptr-&gt;pcfg, TX4939_PCFG_DMASEL_ALL);</div><div class='add'>+</div><div class='add'>+	/* Use external clock for external arbiter */</div><div class='add'>+	if (!(____raw_readq(&amp;tx4939_ccfgptr-&gt;ccfg) &amp; TX4939_CCFG_PCIARB))</div><div class='add'>+		txx9_clear64(&amp;tx4939_ccfgptr-&gt;pcfg, TX4939_PCFG_PCICLKEN_ALL);</div><div class='add'>+</div><div class='add'>+	pr_info("%s -- %dMHz(M%dMHz,G%dMHz) CRIR:%08x CCFG:%llx PCFG:%llx\n",</div><div class='add'>+		txx9_pcode_str,</div><div class='add'>+		(cpuclk + 500000) / 1000000,</div><div class='add'>+		(txx9_master_clock + 500000) / 1000000,</div><div class='add'>+		(txx9_gbus_clock + 500000) / 1000000,</div><div class='add'>+		(__u32)____raw_readq(&amp;tx4939_ccfgptr-&gt;crir),</div><div class='add'>+		(unsigned long long)____raw_readq(&amp;tx4939_ccfgptr-&gt;ccfg),</div><div class='add'>+		(unsigned long long)____raw_readq(&amp;tx4939_ccfgptr-&gt;pcfg));</div><div class='add'>+</div><div class='add'>+	pr_info("%s DDRC -- EN:%08x", txx9_pcode_str,</div><div class='add'>+		(__u32)____raw_readq(&amp;tx4939_ddrcptr-&gt;winen));</div><div class='add'>+	for (i = 0; i &lt; 4; i++) {</div><div class='add'>+		__u64 win = ____raw_readq(&amp;tx4939_ddrcptr-&gt;win[i]);</div><div class='add'>+		if (!((__u32)____raw_readq(&amp;tx4939_ddrcptr-&gt;winen) &amp; (1 &lt;&lt; i)))</div><div class='add'>+			continue;	/* disabled */</div><div class='add'>+		printk(KERN_CONT " #%d:%016llx", i, (unsigned long long)win);</div><div class='add'>+		tx4939_sdram_resource[i].name = "DDR SDRAM";</div><div class='add'>+		tx4939_sdram_resource[i].start =</div><div class='add'>+			(unsigned long)(win &gt;&gt; 48) &lt;&lt; 20;</div><div class='add'>+		tx4939_sdram_resource[i].end =</div><div class='add'>+			((((unsigned long)(win &gt;&gt; 32) &amp; 0xffff) + 1) &lt;&lt;</div><div class='add'>+			 20) - 1;</div><div class='add'>+		tx4939_sdram_resource[i].flags = IORESOURCE_MEM;</div><div class='add'>+		request_resource(&amp;iomem_resource, &amp;tx4939_sdram_resource[i]);</div><div class='add'>+	}</div><div class='add'>+	printk(KERN_CONT "\n");</div><div class='add'>+</div><div class='add'>+	/* SRAM */</div><div class='add'>+	if (____raw_readq(&amp;tx4939_sramcptr-&gt;cr) &amp; 1) {</div><div class='add'>+		unsigned int size = TX4939_SRAM_SIZE;</div><div class='add'>+		tx4939_sram_resource.name = "SRAM";</div><div class='add'>+		tx4939_sram_resource.start =</div><div class='add'>+			(____raw_readq(&amp;tx4939_sramcptr-&gt;cr) &gt;&gt; (39-11))</div><div class='add'>+			&amp; ~(size - 1);</div><div class='add'>+		tx4939_sram_resource.end =</div><div class='add'>+			tx4939_sram_resource.start + TX4939_SRAM_SIZE - 1;</div><div class='add'>+		tx4939_sram_resource.flags = IORESOURCE_MEM;</div><div class='add'>+		request_resource(&amp;iomem_resource, &amp;tx4939_sram_resource);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* TMR */</div><div class='add'>+	/* disable all timers */</div><div class='add'>+	for (i = 0; i &lt; TX4939_NR_TMR; i++)</div><div class='add'>+		txx9_tmr_init(TX4939_TMR_REG(i) &amp; 0xfffffffffULL);</div><div class='add'>+</div><div class='add'>+	/* DMA */</div><div class='add'>+	for (i = 0; i &lt; 2; i++)</div><div class='add'>+		____raw_writeq(TX4938_DMA_MCR_MSTEN,</div><div class='add'>+			       (void __iomem *)(TX4939_DMA_REG(i) + 0x50));</div><div class='add'>+</div><div class='add'>+	/* set PCIC1 reset (required to prevent hangup on BIST) */</div><div class='add'>+	txx9_set64(&amp;tx4939_ccfgptr-&gt;clkctr, TX4939_CLKCTR_PCI1RST);</div><div class='add'>+	pcfg = ____raw_readq(&amp;tx4939_ccfgptr-&gt;pcfg);</div><div class='add'>+	if (pcfg &amp; (TX4939_PCFG_ET0MODE | TX4939_PCFG_ET1MODE)) {</div><div class='add'>+		mdelay(1);	/* at least 128 cpu clock */</div><div class='add'>+		/* clear PCIC1 reset */</div><div class='add'>+		txx9_clear64(&amp;tx4939_ccfgptr-&gt;clkctr, TX4939_CLKCTR_PCI1RST);</div><div class='add'>+	} else {</div><div class='add'>+		pr_info("%s: stop PCIC1\n", txx9_pcode_str);</div><div class='add'>+		/* stop PCIC1 */</div><div class='add'>+		txx9_set64(&amp;tx4939_ccfgptr-&gt;clkctr, TX4939_CLKCTR_PCI1CKD);</div><div class='add'>+	}</div><div class='add'>+	if (!(pcfg &amp; TX4939_PCFG_ET0MODE)) {</div><div class='add'>+		pr_info("%s: stop ETH0\n", txx9_pcode_str);</div><div class='add'>+		txx9_set64(&amp;tx4939_ccfgptr-&gt;clkctr, TX4939_CLKCTR_ETH0RST);</div><div class='add'>+		txx9_set64(&amp;tx4939_ccfgptr-&gt;clkctr, TX4939_CLKCTR_ETH0CKD);</div><div class='add'>+	}</div><div class='add'>+	if (!(pcfg &amp; TX4939_PCFG_ET1MODE)) {</div><div class='add'>+		pr_info("%s: stop ETH1\n", txx9_pcode_str);</div><div class='add'>+		txx9_set64(&amp;tx4939_ccfgptr-&gt;clkctr, TX4939_CLKCTR_ETH1RST);</div><div class='add'>+		txx9_set64(&amp;tx4939_ccfgptr-&gt;clkctr, TX4939_CLKCTR_ETH1CKD);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	_machine_restart = tx4939_machine_restart;</div><div class='add'>+	board_be_init = tx4939_be_init;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init tx4939_time_init(unsigned int tmrnr)</div><div class='add'>+{</div><div class='add'>+	if (____raw_readq(&amp;tx4939_ccfgptr-&gt;ccfg) &amp; TX4939_CCFG_TINTDIS)</div><div class='add'>+		txx9_clockevent_init(TX4939_TMR_REG(tmrnr) &amp; 0xfffffffffULL,</div><div class='add'>+				     TXX9_IRQ_BASE + TX4939_IR_TMR(tmrnr),</div><div class='add'>+				     TXX9_IMCLK);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init tx4939_sio_init(unsigned int sclk, unsigned int cts_mask)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	unsigned int ch_mask = 0;</div><div class='add'>+	__u64 pcfg = __raw_readq(&amp;tx4939_ccfgptr-&gt;pcfg);</div><div class='add'>+</div><div class='add'>+	cts_mask |= ~1;	/* only SIO0 have RTS/CTS */</div><div class='add'>+	if ((pcfg &amp; TX4939_PCFG_SIO2MODE_MASK) != TX4939_PCFG_SIO2MODE_SIO0)</div><div class='add'>+		cts_mask |= 1 &lt;&lt; 0; /* disable SIO0 RTS/CTS by PCFG setting */</div><div class='add'>+	if ((pcfg &amp; TX4939_PCFG_SIO2MODE_MASK) != TX4939_PCFG_SIO2MODE_SIO2)</div><div class='add'>+		ch_mask |= 1 &lt;&lt; 2; /* disable SIO2 by PCFG setting */</div><div class='add'>+	if (pcfg &amp; TX4939_PCFG_SIO3MODE)</div><div class='add'>+		ch_mask |= 1 &lt;&lt; 3; /* disable SIO3 by PCFG setting */</div><div class='add'>+	for (i = 0; i &lt; 4; i++) {</div><div class='add'>+		if ((1 &lt;&lt; i) &amp; ch_mask)</div><div class='add'>+			continue;</div><div class='add'>+		txx9_sio_init(TX4939_SIO_REG(i) &amp; 0xfffffffffULL,</div><div class='add'>+			      TXX9_IRQ_BASE + TX4939_IR_SIO(i),</div><div class='add'>+			      i, sclk, (1 &lt;&lt; i) &amp; cts_mask);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_TC35815) || defined(CONFIG_TC35815_MODULE)</div><div class='add'>+static int tx4939_get_eth_speed(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct ethtool_cmd cmd = { ETHTOOL_GSET };</div><div class='add'>+	int speed = 100;	/* default 100Mbps */</div><div class='add'>+	int err;</div><div class='add'>+	if (!dev-&gt;ethtool_ops || !dev-&gt;ethtool_ops-&gt;get_settings)</div><div class='add'>+		return speed;</div><div class='add'>+	err = dev-&gt;ethtool_ops-&gt;get_settings(dev, &amp;cmd);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return speed;</div><div class='add'>+	speed = cmd.speed == SPEED_100 ? 100 : 10;</div><div class='add'>+	return speed;</div><div class='add'>+}</div><div class='add'>+static int tx4939_netdev_event(struct notifier_block *this,</div><div class='add'>+			       unsigned long event,</div><div class='add'>+			       void *ptr)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = ptr;</div><div class='add'>+	if (event == NETDEV_CHANGE &amp;&amp; netif_carrier_ok(dev)) {</div><div class='add'>+		__u64 bit = 0;</div><div class='add'>+		if (dev-&gt;irq == TXX9_IRQ_BASE + TX4939_IR_ETH(0))</div><div class='add'>+			bit = TX4939_PCFG_SPEED0;</div><div class='add'>+		else if (dev-&gt;irq == TXX9_IRQ_BASE + TX4939_IR_ETH(1))</div><div class='add'>+			bit = TX4939_PCFG_SPEED1;</div><div class='add'>+		if (bit) {</div><div class='add'>+			int speed = tx4939_get_eth_speed(dev);</div><div class='add'>+			if (speed == 100)</div><div class='add'>+				txx9_set64(&amp;tx4939_ccfgptr-&gt;pcfg, bit);</div><div class='add'>+			else</div><div class='add'>+				txx9_clear64(&amp;tx4939_ccfgptr-&gt;pcfg, bit);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return NOTIFY_DONE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct notifier_block tx4939_netdev_notifier = {</div><div class='add'>+	.notifier_call = tx4939_netdev_event,</div><div class='add'>+	.priority = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void __init tx4939_ethaddr_init(unsigned char *addr0, unsigned char *addr1)</div><div class='add'>+{</div><div class='add'>+	u64 pcfg = __raw_readq(&amp;tx4939_ccfgptr-&gt;pcfg);</div><div class='add'>+</div><div class='add'>+	if (addr0 &amp;&amp; (pcfg &amp; TX4939_PCFG_ET0MODE))</div><div class='add'>+		txx9_ethaddr_init(TXX9_IRQ_BASE + TX4939_IR_ETH(0), addr0);</div><div class='add'>+	if (addr1 &amp;&amp; (pcfg &amp; TX4939_PCFG_ET1MODE))</div><div class='add'>+		txx9_ethaddr_init(TXX9_IRQ_BASE + TX4939_IR_ETH(1), addr1);</div><div class='add'>+	register_netdevice_notifier(&amp;tx4939_netdev_notifier);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+void __init tx4939_ethaddr_init(unsigned char *addr0, unsigned char *addr1)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+void __init tx4939_mtd_init(int ch)</div><div class='add'>+{</div><div class='add'>+	struct physmap_flash_data pdata = {</div><div class='add'>+		.width = TX4939_EBUSC_WIDTH(ch) / 8,</div><div class='add'>+	};</div><div class='add'>+	unsigned long start = txx9_ce_res[ch].start;</div><div class='add'>+	unsigned long size = txx9_ce_res[ch].end - start + 1;</div><div class='add'>+</div><div class='add'>+	if (!(TX4939_EBUSC_CR(ch) &amp; 0x8))</div><div class='add'>+		return;	/* disabled */</div><div class='add'>+	txx9_physmap_flash_init(ch, start, size, &amp;pdata);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define TX4939_ATA_REG_PHYS(ch) (TX4939_ATA_REG(ch) &amp; 0xfffffffffULL)</div><div class='add'>+void __init tx4939_ata_init(void)</div><div class='add'>+{</div><div class='add'>+	static struct resource ata0_res[] = {</div><div class='add'>+		{</div><div class='add'>+			.start = TX4939_ATA_REG_PHYS(0),</div><div class='add'>+			.end = TX4939_ATA_REG_PHYS(0) + 0x1000 - 1,</div><div class='add'>+			.flags = IORESOURCE_MEM,</div><div class='add'>+		}, {</div><div class='add'>+			.start = TXX9_IRQ_BASE + TX4939_IR_ATA(0),</div><div class='add'>+			.flags = IORESOURCE_IRQ,</div><div class='add'>+		},</div><div class='add'>+	};</div><div class='add'>+	static struct resource ata1_res[] = {</div><div class='add'>+		{</div><div class='add'>+			.start = TX4939_ATA_REG_PHYS(1),</div><div class='add'>+			.end = TX4939_ATA_REG_PHYS(1) + 0x1000 - 1,</div><div class='add'>+			.flags = IORESOURCE_MEM,</div><div class='add'>+		}, {</div><div class='add'>+			.start = TXX9_IRQ_BASE + TX4939_IR_ATA(1),</div><div class='add'>+			.flags = IORESOURCE_IRQ,</div><div class='add'>+		},</div><div class='add'>+	};</div><div class='add'>+	static struct platform_device ata0_dev = {</div><div class='add'>+		.name = "tx4939ide",</div><div class='add'>+		.id = 0,</div><div class='add'>+		.num_resources = ARRAY_SIZE(ata0_res),</div><div class='add'>+		.resource = ata0_res,</div><div class='add'>+	};</div><div class='add'>+	static struct platform_device ata1_dev = {</div><div class='add'>+		.name = "tx4939ide",</div><div class='add'>+		.id = 1,</div><div class='add'>+		.num_resources = ARRAY_SIZE(ata1_res),</div><div class='add'>+		.resource = ata1_res,</div><div class='add'>+	};</div><div class='add'>+	__u64 pcfg = __raw_readq(&amp;tx4939_ccfgptr-&gt;pcfg);</div><div class='add'>+</div><div class='add'>+	if (pcfg &amp; TX4939_PCFG_ATA0MODE)</div><div class='add'>+		platform_device_register(&amp;ata0_dev);</div><div class='add'>+	if ((pcfg &amp; (TX4939_PCFG_ATA1MODE |</div><div class='add'>+		     TX4939_PCFG_ET1MODE |</div><div class='add'>+		     TX4939_PCFG_ET0MODE)) == TX4939_PCFG_ATA1MODE)</div><div class='add'>+		platform_device_register(&amp;ata1_dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init tx4939_stop_unused_modules(void)</div><div class='add'>+{</div><div class='add'>+	__u64 pcfg, rst = 0, ckd = 0;</div><div class='add'>+	char buf[128];</div><div class='add'>+</div><div class='add'>+	buf[0] = '\0';</div><div class='add'>+	local_irq_disable();</div><div class='add'>+	pcfg = ____raw_readq(&amp;tx4939_ccfgptr-&gt;pcfg);</div><div class='add'>+	if ((pcfg &amp; TX4939_PCFG_I2SMODE_MASK) !=</div><div class='add'>+	    TX4939_PCFG_I2SMODE_ACLC) {</div><div class='add'>+		rst |= TX4939_CLKCTR_ACLRST;</div><div class='add'>+		ckd |= TX4939_CLKCTR_ACLCKD;</div><div class='add'>+		strcat(buf, " ACLC");</div><div class='add'>+	}</div><div class='add'>+	if ((pcfg &amp; TX4939_PCFG_I2SMODE_MASK) !=</div><div class='add'>+	    TX4939_PCFG_I2SMODE_I2S &amp;&amp;</div><div class='add'>+	    (pcfg &amp; TX4939_PCFG_I2SMODE_MASK) !=</div><div class='add'>+	    TX4939_PCFG_I2SMODE_I2S_ALT) {</div><div class='add'>+		rst |= TX4939_CLKCTR_I2SRST;</div><div class='add'>+		ckd |= TX4939_CLKCTR_I2SCKD;</div><div class='add'>+		strcat(buf, " I2S");</div><div class='add'>+	}</div><div class='add'>+	if (!(pcfg &amp; TX4939_PCFG_ATA0MODE)) {</div><div class='add'>+		rst |= TX4939_CLKCTR_ATA0RST;</div><div class='add'>+		ckd |= TX4939_CLKCTR_ATA0CKD;</div><div class='add'>+		strcat(buf, " ATA0");</div><div class='add'>+	}</div><div class='add'>+	if (!(pcfg &amp; TX4939_PCFG_ATA1MODE)) {</div><div class='add'>+		rst |= TX4939_CLKCTR_ATA1RST;</div><div class='add'>+		ckd |= TX4939_CLKCTR_ATA1CKD;</div><div class='add'>+		strcat(buf, " ATA1");</div><div class='add'>+	}</div><div class='add'>+	if (pcfg &amp; TX4939_PCFG_SPIMODE) {</div><div class='add'>+		rst |= TX4939_CLKCTR_SPIRST;</div><div class='add'>+		ckd |= TX4939_CLKCTR_SPICKD;</div><div class='add'>+		strcat(buf, " SPI");</div><div class='add'>+	}</div><div class='add'>+	if (!(pcfg &amp; (TX4939_PCFG_VSSMODE | TX4939_PCFG_VPSMODE))) {</div><div class='add'>+		rst |= TX4939_CLKCTR_VPCRST;</div><div class='add'>+		ckd |= TX4939_CLKCTR_VPCCKD;</div><div class='add'>+		strcat(buf, " VPC");</div><div class='add'>+	}</div><div class='add'>+	if ((pcfg &amp; TX4939_PCFG_SIO2MODE_MASK) != TX4939_PCFG_SIO2MODE_SIO2) {</div><div class='add'>+		rst |= TX4939_CLKCTR_SIO2RST;</div><div class='add'>+		ckd |= TX4939_CLKCTR_SIO2CKD;</div><div class='add'>+		strcat(buf, " SIO2");</div><div class='add'>+	}</div><div class='add'>+	if (pcfg &amp; TX4939_PCFG_SIO3MODE) {</div><div class='add'>+		rst |= TX4939_CLKCTR_SIO3RST;</div><div class='add'>+		ckd |= TX4939_CLKCTR_SIO3CKD;</div><div class='add'>+		strcat(buf, " SIO3");</div><div class='add'>+	}</div><div class='add'>+	if (rst | ckd) {</div><div class='add'>+		txx9_set64(&amp;tx4939_ccfgptr-&gt;clkctr, rst);</div><div class='add'>+		txx9_set64(&amp;tx4939_ccfgptr-&gt;clkctr, ckd);</div><div class='add'>+	}</div><div class='add'>+	local_irq_enable();</div><div class='add'>+	if (buf[0])</div><div class='add'>+		pr_info("%s: stop%s\n", txx9_pcode_str, buf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init tx4939_late_init(void)</div><div class='add'>+{</div><div class='add'>+	if (txx9_pcode != 0x4939)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	tx4939_stop_unused_modules();</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+late_initcall(tx4939_late_init);</div><div class='head'>diff --git a/arch/mips/txx9/rbtx4938/spi_eeprom.c b/arch/mips/txx9/generic/spi_eeprom.c<br/>index a7ea8b041c1d..75c347238f47 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/txx9/rbtx4938/spi_eeprom.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/txx9/rbtx4938/spi_eeprom.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/txx9/generic/spi_eeprom.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/txx9/generic/spi_eeprom.c</a></div><div class='hunk'>@@ -18,29 +18,31 @@</div><div class='ctx'> #define AT250X0_PAGE_SIZE	8</div><div class='ctx'> </div><div class='ctx'> /* register board information for at25 driver */</div><div class='del'>-int __init spi_eeprom_register(int chipid)</div><div class='add'>+int __init spi_eeprom_register(int busid, int chipid, int size)</div><div class='ctx'> {</div><div class='del'>-	static struct spi_eeprom eeprom = {</div><div class='del'>-		.name = "at250x0",</div><div class='del'>-		.byte_len = 128,</div><div class='del'>-		.page_size = AT250X0_PAGE_SIZE,</div><div class='del'>-		.flags = EE_ADDR1,</div><div class='del'>-	};</div><div class='ctx'> 	struct spi_board_info info = {</div><div class='ctx'> 		.modalias = "at25",</div><div class='ctx'> 		.max_speed_hz = 1500000,	/* 1.5Mbps */</div><div class='del'>-		.bus_num = 0,</div><div class='add'>+		.bus_num = busid,</div><div class='ctx'> 		.chip_select = chipid,</div><div class='del'>-		.platform_data = &amp;eeprom,</div><div class='ctx'> 		/* Mode 0: High-Active, Sample-Then-Shift */</div><div class='ctx'> 	};</div><div class='del'>-</div><div class='add'>+	struct spi_eeprom *eeprom;</div><div class='add'>+	eeprom = kzalloc(sizeof(*eeprom), GFP_KERNEL);</div><div class='add'>+	if (!eeprom)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	strcpy(eeprom-&gt;name, "at250x0");</div><div class='add'>+	eeprom-&gt;byte_len = size;</div><div class='add'>+	eeprom-&gt;page_size = AT250X0_PAGE_SIZE;</div><div class='add'>+	eeprom-&gt;flags = EE_ADDR1;</div><div class='add'>+	info.platform_data = eeprom;</div><div class='ctx'> 	return spi_register_board_info(&amp;info, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* simple temporary spi driver to provide early access to seeprom. */</div><div class='ctx'> </div><div class='ctx'> static struct read_param {</div><div class='add'>+	int busid;</div><div class='ctx'> 	int chipid;</div><div class='ctx'> 	int address;</div><div class='ctx'> 	unsigned char *buf;</div><div class='hunk'>@@ -57,7 +59,8 @@ static int __init early_seeprom_probe(struct spi_device *spi)</div><div class='ctx'> </div><div class='ctx'> 	dev_info(&amp;spi-&gt;dev, "spiclk %u KHz.\n",</div><div class='ctx'> 		 (spi-&gt;max_speed_hz + 500) / 1000);</div><div class='del'>-	if (read_param-&gt;chipid != spi-&gt;chip_select)</div><div class='add'>+	if (read_param-&gt;busid != spi-&gt;master-&gt;bus_num ||</div><div class='add'>+	    read_param-&gt;chipid != spi-&gt;chip_select)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	while (len &gt; 0) {</div><div class='ctx'> 		/* spi_write_then_read can only work with small chunk */</div><div class='hunk'>@@ -80,11 +83,12 @@ static struct spi_driver early_seeprom_driver __initdata = {</div><div class='ctx'> 	.probe	= early_seeprom_probe,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int __init spi_eeprom_read(int chipid, int address,</div><div class='add'>+int __init spi_eeprom_read(int busid, int chipid, int address,</div><div class='ctx'> 			   unsigned char *buf, int len)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct read_param param = {</div><div class='add'>+		.busid = busid,</div><div class='ctx'> 		.chipid = chipid,</div><div class='ctx'> 		.address = address,</div><div class='ctx'> 		.buf = buf,</div><div class='head'>diff --git a/arch/mips/txx9/jmr3927/prom.c b/arch/mips/txx9/jmr3927/prom.c<br/>index 70c4c8ec3e84..c899c0c087a0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/txx9/jmr3927/prom.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/txx9/jmr3927/prom.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/txx9/jmr3927/prom.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/txx9/jmr3927/prom.c</a></div><div class='hunk'>@@ -47,7 +47,6 @@ void __init jmr3927_prom_init(void)</div><div class='ctx'> 	if ((tx3927_ccfgptr-&gt;ccfg &amp; TX3927_CCFG_TLBOFF) == 0)</div><div class='ctx'> 		printk(KERN_ERR "TX3927 TLB off\n");</div><div class='ctx'> </div><div class='del'>-	prom_init_cmdline();</div><div class='ctx'> 	add_memory_region(0, JMR3927_SDRAM_SIZE, BOOT_MEM_RAM);</div><div class='ctx'> 	txx9_sio_putchar_init(TX3927_SIO_REG(1));</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/txx9/jmr3927/setup.c b/arch/mips/txx9/jmr3927/setup.c<br/>index 87db41be8a56..25e50a7be387 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/txx9/jmr3927/setup.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/txx9/jmr3927/setup.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/txx9/jmr3927/setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/txx9/jmr3927/setup.c</a></div><div class='hunk'>@@ -62,7 +62,6 @@ static void __init jmr3927_time_init(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define DO_WRITE_THROUGH</div><div class='del'>-#define DO_ENABLE_CACHE</div><div class='ctx'> </div><div class='ctx'> static void jmr3927_board_init(void);</div><div class='ctx'> </div><div class='hunk'>@@ -77,11 +76,6 @@ static void __init jmr3927_mem_setup(void)</div><div class='ctx'> 	/* cache setup */</div><div class='ctx'> 	{</div><div class='ctx'> 		unsigned int conf;</div><div class='del'>-#ifdef DO_ENABLE_CACHE</div><div class='del'>-		int mips_ic_disable = 0, mips_dc_disable = 0;</div><div class='del'>-#else</div><div class='del'>-		int mips_ic_disable = 1, mips_dc_disable = 1;</div><div class='del'>-#endif</div><div class='ctx'> #ifdef DO_WRITE_THROUGH</div><div class='ctx'> 		int mips_config_cwfon = 0;</div><div class='ctx'> 		int mips_config_wbon = 0;</div><div class='hunk'>@@ -91,10 +85,7 @@ static void __init jmr3927_mem_setup(void)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 		conf = read_c0_conf();</div><div class='del'>-		conf &amp;= ~(TX39_CONF_ICE | TX39_CONF_DCE |</div><div class='del'>-			  TX39_CONF_WBON | TX39_CONF_CWFON);</div><div class='del'>-		conf |= mips_ic_disable ? 0 : TX39_CONF_ICE;</div><div class='del'>-		conf |= mips_dc_disable ? 0 : TX39_CONF_DCE;</div><div class='add'>+		conf &amp;= ~(TX39_CONF_WBON | TX39_CONF_CWFON);</div><div class='ctx'> 		conf |= mips_config_wbon ? TX39_CONF_WBON : 0;</div><div class='ctx'> 		conf |= mips_config_cwfon ? TX39_CONF_CWFON : 0;</div><div class='ctx'> </div><div class='hunk'>@@ -199,11 +190,25 @@ static void __init jmr3927_rtc_init(void)</div><div class='ctx'> 	platform_device_register_simple("rtc-ds1742", -1, &amp;res, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void __init jmr3927_mtd_init(void)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 2; i++)</div><div class='add'>+		tx3927_mtd_init(i);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void __init jmr3927_device_init(void)</div><div class='ctx'> {</div><div class='add'>+	unsigned long iocled_base = JMR3927_IOC_LED_ADDR - IO_BASE;</div><div class='add'>+#ifdef __LITTLE_ENDIAN</div><div class='add'>+	iocled_base |= 1;</div><div class='add'>+#endif</div><div class='ctx'> 	__swizzle_addr_b = jmr3927_swizzle_addr_b;</div><div class='ctx'> 	jmr3927_rtc_init();</div><div class='ctx'> 	tx3927_wdt_init();</div><div class='add'>+	jmr3927_mtd_init();</div><div class='add'>+	txx9_iocled_init(iocled_base, -1, 8, 1, "green", NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct txx9_board_vec jmr3927_vec __initdata = {</div><div class='head'>diff --git a/arch/mips/txx9/rbtx4927/irq.c b/arch/mips/txx9/rbtx4927/irq.c<br/>index 00cd5231da30..9c14ebb26cb4 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/txx9/rbtx4927/irq.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/txx9/rbtx4927/irq.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/txx9/rbtx4927/irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/txx9/rbtx4927/irq.c</a></div><div class='hunk'>@@ -133,15 +133,20 @@ static int toshiba_rbtx4927_irq_nested(int sw_irq)</div><div class='ctx'> 	u8 level3;</div><div class='ctx'> </div><div class='ctx'> 	level3 = readb(rbtx4927_imstat_addr) &amp; 0x1f;</div><div class='del'>-	if (level3)</div><div class='del'>-		sw_irq = RBTX4927_IRQ_IOC + fls(level3) - 1;</div><div class='del'>-	return sw_irq;</div><div class='add'>+	if (unlikely(!level3))</div><div class='add'>+		return -1;</div><div class='add'>+	return RBTX4927_IRQ_IOC + __fls8(level3);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __init toshiba_rbtx4927_irq_ioc_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	/* mask all IOC interrupts */</div><div class='add'>+	writeb(0, rbtx4927_imask_addr);</div><div class='add'>+	/* clear SoftInt interrupts */</div><div class='add'>+	writeb(0, rbtx4927_softint_addr);</div><div class='add'>+</div><div class='ctx'> 	for (i = RBTX4927_IRQ_IOC;</div><div class='ctx'> 	     i &lt; RBTX4927_IRQ_IOC + RBTX4927_NR_IRQ_IOC; i++)</div><div class='ctx'> 		set_irq_chip_and_handler(i, &amp;toshiba_rbtx4927_irq_ioc_type,</div><div class='head'>diff --git a/arch/mips/txx9/rbtx4927/prom.c b/arch/mips/txx9/rbtx4927/prom.c<br/>index 1dc0a5b1956b..cc97c6a6011b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/txx9/rbtx4927/prom.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/txx9/rbtx4927/prom.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/txx9/rbtx4927/prom.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/txx9/rbtx4927/prom.c</a></div><div class='hunk'>@@ -36,7 +36,6 @@</div><div class='ctx'> </div><div class='ctx'> void __init rbtx4927_prom_init(void)</div><div class='ctx'> {</div><div class='del'>-	prom_init_cmdline();</div><div class='ctx'> 	add_memory_region(0, tx4927_get_mem_size(), BOOT_MEM_RAM);</div><div class='ctx'> 	txx9_sio_putchar_init(TX4927_SIO_REG(0) &amp; 0xfffffffffULL);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/txx9/rbtx4927/setup.c b/arch/mips/txx9/rbtx4927/setup.c<br/>index 0d39bafea794..4a74423b2ba8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/txx9/rbtx4927/setup.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/txx9/rbtx4927/setup.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/txx9/rbtx4927/setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/txx9/rbtx4927/setup.c</a></div><div class='hunk'>@@ -48,6 +48,7 @@</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/gpio.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/reboot.h&gt;</div><div class='ctx'> #include &lt;asm/txx9/generic.h&gt;</div><div class='hunk'>@@ -185,14 +186,8 @@ static void __init rbtx4937_clock_init(void);</div><div class='ctx'> </div><div class='ctx'> static void __init rbtx4927_mem_setup(void)</div><div class='ctx'> {</div><div class='del'>-	u32 cp0_config;</div><div class='ctx'> 	char *argptr;</div><div class='ctx'> </div><div class='del'>-	/* enable caches -- HCP5 does this, pmon does not */</div><div class='del'>-	cp0_config = read_c0_config();</div><div class='del'>-	cp0_config = cp0_config &amp; ~(TX49_CONF_IC | TX49_CONF_DC);</div><div class='del'>-	write_c0_config(cp0_config);</div><div class='del'>-</div><div class='ctx'> 	if (TX4927_REV_PCODE() == 0x4927) {</div><div class='ctx'> 		rbtx4927_clock_init();</div><div class='ctx'> 		tx4927_setup();</div><div class='hunk'>@@ -212,6 +207,14 @@ static void __init rbtx4927_mem_setup(void)</div><div class='ctx'> 	set_io_port_base(KSEG1 + RBTX4927_ISA_IO_OFFSET);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+	/* TX4927-SIO DTR on (PIO[15]) */</div><div class='add'>+	gpio_request(15, "sio-dtr");</div><div class='add'>+	gpio_direction_output(15, 1);</div><div class='add'>+	gpio_request(0, "led");</div><div class='add'>+	gpio_direction_output(0, 1);</div><div class='add'>+	gpio_request(1, "led");</div><div class='add'>+	gpio_direction_output(1, 1);</div><div class='add'>+</div><div class='ctx'> 	tx4927_sio_init(0, 0);</div><div class='ctx'> #ifdef CONFIG_SERIAL_TXX9_CONSOLE</div><div class='ctx'> 	argptr = prom_getcmdline();</div><div class='hunk'>@@ -304,11 +307,21 @@ static void __init rbtx4927_ne_init(void)</div><div class='ctx'> 	platform_device_register_simple("ne", -1, res, ARRAY_SIZE(res));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void __init rbtx4927_mtd_init(void)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 2; i++)</div><div class='add'>+		tx4927_mtd_init(i);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void __init rbtx4927_device_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	toshiba_rbtx4927_rtc_init();</div><div class='ctx'> 	rbtx4927_ne_init();</div><div class='ctx'> 	tx4927_wdt_init();</div><div class='add'>+	rbtx4927_mtd_init();</div><div class='add'>+	txx9_iocled_init(RBTX4927_LED_ADDR - IO_BASE, -1, 3, 1, "green", NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct txx9_board_vec rbtx4927_vec __initdata = {</div><div class='head'>diff --git a/arch/mips/txx9/rbtx4938/Makefile b/arch/mips/txx9/rbtx4938/Makefile<br/>index 9dcc52ae5b9d..f3e1f597b4f1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/txx9/rbtx4938/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/txx9/rbtx4938/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/txx9/rbtx4938/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/txx9/rbtx4938/Makefile</a></div><div class='hunk'>@@ -1,3 +1,3 @@</div><div class='del'>-obj-y	+= prom.o setup.o irq.o spi_eeprom.o</div><div class='add'>+obj-y	+= prom.o setup.o irq.o</div><div class='ctx'> </div><div class='ctx'> EXTRA_CFLAGS += -Werror</div><div class='head'>diff --git a/arch/mips/txx9/rbtx4938/irq.c b/arch/mips/txx9/rbtx4938/irq.c<br/>index ca2f8306ce93..7d21befb8932 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/txx9/rbtx4938/irq.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/txx9/rbtx4938/irq.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/txx9/rbtx4938/irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/txx9/rbtx4938/irq.c</a></div><div class='hunk'>@@ -85,10 +85,10 @@ static int toshiba_rbtx4938_irq_nested(int sw_irq)</div><div class='ctx'> 	u8 level3;</div><div class='ctx'> </div><div class='ctx'> 	level3 = readb(rbtx4938_imstat_addr);</div><div class='del'>-	if (level3)</div><div class='del'>-		/* must use fls so onboard ATA has priority */</div><div class='del'>-		sw_irq = RBTX4938_IRQ_IOC + fls(level3) - 1;</div><div class='del'>-	return sw_irq;</div><div class='add'>+	if (unlikely(!level3))</div><div class='add'>+		return -1;</div><div class='add'>+	/* must use fls so onboard ATA has priority */</div><div class='add'>+	return RBTX4938_IRQ_IOC + __fls8(level3);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __init</div><div class='head'>diff --git a/arch/mips/txx9/rbtx4938/prom.c b/arch/mips/txx9/rbtx4938/prom.c<br/>index d73123cd2ab9..bcb469247e8c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/txx9/rbtx4938/prom.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/txx9/rbtx4938/prom.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/txx9/rbtx4938/prom.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/txx9/rbtx4938/prom.c</a></div><div class='hunk'>@@ -18,9 +18,6 @@</div><div class='ctx'> </div><div class='ctx'> void __init rbtx4938_prom_init(void)</div><div class='ctx'> {</div><div class='del'>-#ifndef CONFIG_TX4938_NAND_BOOT</div><div class='del'>-	prom_init_cmdline();</div><div class='del'>-#endif</div><div class='ctx'> 	add_memory_region(0, tx4938_get_mem_size(), BOOT_MEM_RAM);</div><div class='ctx'> 	txx9_sio_putchar_init(TX4938_SIO_REG(0) &amp; 0xfffffffffULL);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/txx9/rbtx4938/setup.c b/arch/mips/txx9/rbtx4938/setup.c<br/>index 9ab48dec0fe8..e077cc4d3a59 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/txx9/rbtx4938/setup.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mips/txx9/rbtx4938/setup.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/txx9/rbtx4938/setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/txx9/rbtx4938/setup.c</a></div><div class='hunk'>@@ -15,6 +15,7 @@</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/gpio.h&gt;</div><div class='add'>+#include &lt;linux/mtd/physmap.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/reboot.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='hunk'>@@ -110,6 +111,7 @@ static void __init rbtx4938_pci_setup(void)</div><div class='ctx'> #define	SEEPROM2_CS	0	/* IOC */</div><div class='ctx'> #define	SEEPROM3_CS	1	/* IOC */</div><div class='ctx'> #define	SRTC_CS	2	/* IOC */</div><div class='add'>+#define SPI_BUSNO	0</div><div class='ctx'> </div><div class='ctx'> static int __init rbtx4938_ethaddr_init(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -119,7 +121,7 @@ static int __init rbtx4938_ethaddr_init(void)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	/* 0-3: "MAC\0", 4-9:eth0, 10-15:eth1, 16:sum */</div><div class='del'>-	if (spi_eeprom_read(SEEPROM1_CS, 0, dat, sizeof(dat))) {</div><div class='add'>+	if (spi_eeprom_read(SPI_BUSNO, SEEPROM1_CS, 0, dat, sizeof(dat))) {</div><div class='ctx'> 		printk(KERN_ERR "seeprom: read error.\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -173,23 +175,30 @@ static void __init rbtx4938_mem_setup(void)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_TOSHIBA_RBTX4938_MPLEX_PIO58_61</div><div class='del'>-	printk(KERN_INFO "PIOSEL: disabling both ata and nand selection\n");</div><div class='add'>+	pr_info("PIOSEL: disabling both ATA and NAND selection\n");</div><div class='ctx'> 	txx9_clear64(&amp;tx4938_ccfgptr-&gt;pcfg,</div><div class='ctx'> 		     TX4938_PCFG_NDF_SEL | TX4938_PCFG_ATA_SEL);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_TOSHIBA_RBTX4938_MPLEX_NAND</div><div class='del'>-	printk(KERN_INFO "PIOSEL: enabling nand selection\n");</div><div class='add'>+	pr_info("PIOSEL: enabling NAND selection\n");</div><div class='ctx'> 	txx9_set64(&amp;tx4938_ccfgptr-&gt;pcfg, TX4938_PCFG_NDF_SEL);</div><div class='ctx'> 	txx9_clear64(&amp;tx4938_ccfgptr-&gt;pcfg, TX4938_PCFG_ATA_SEL);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_TOSHIBA_RBTX4938_MPLEX_ATA</div><div class='del'>-	printk(KERN_INFO "PIOSEL: enabling ata selection\n");</div><div class='add'>+	pr_info("PIOSEL: enabling ATA selection\n");</div><div class='ctx'> 	txx9_set64(&amp;tx4938_ccfgptr-&gt;pcfg, TX4938_PCFG_ATA_SEL);</div><div class='ctx'> 	txx9_clear64(&amp;tx4938_ccfgptr-&gt;pcfg, TX4938_PCFG_NDF_SEL);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_TOSHIBA_RBTX4938_MPLEX_KEEP</div><div class='add'>+	pcfg = ____raw_readq(&amp;tx4938_ccfgptr-&gt;pcfg);</div><div class='add'>+	pr_info("PIOSEL: NAND %s, ATA %s\n",</div><div class='add'>+		(pcfg &amp; TX4938_PCFG_NDF_SEL) ? "enabled" : "disabled",</div><div class='add'>+		(pcfg &amp; TX4938_PCFG_ATA_SEL) ? "enabled" : "disabled");</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	rbtx4938_spi_setup();</div><div class='ctx'> 	pcfg = ____raw_readq(&amp;tx4938_ccfgptr-&gt;pcfg);	/* updated */</div><div class='ctx'> 	/* fixup piosel */</div><div class='hunk'>@@ -279,9 +288,9 @@ static int __init rbtx4938_spi_init(void)</div><div class='ctx'> 		.mode = SPI_MODE_1 | SPI_CS_HIGH,</div><div class='ctx'> 	};</div><div class='ctx'> 	spi_register_board_info(&amp;srtc_info, 1);</div><div class='del'>-	spi_eeprom_register(SEEPROM1_CS);</div><div class='del'>-	spi_eeprom_register(16 + SEEPROM2_CS);</div><div class='del'>-	spi_eeprom_register(16 + SEEPROM3_CS);</div><div class='add'>+	spi_eeprom_register(SPI_BUSNO, SEEPROM1_CS, 128);</div><div class='add'>+	spi_eeprom_register(SPI_BUSNO, 16 + SEEPROM2_CS, 128);</div><div class='add'>+	spi_eeprom_register(SPI_BUSNO, 16 + SEEPROM3_CS, 128);</div><div class='ctx'> 	gpio_request(16 + SRTC_CS, "rtc-rs5c348");</div><div class='ctx'> 	gpio_direction_output(16 + SRTC_CS, 0);</div><div class='ctx'> 	gpio_request(SEEPROM1_CS, "seeprom1");</div><div class='hunk'>@@ -290,10 +299,46 @@ static int __init rbtx4938_spi_init(void)</div><div class='ctx'> 	gpio_direction_output(16 + SEEPROM2_CS, 1);</div><div class='ctx'> 	gpio_request(16 + SEEPROM3_CS, "seeprom3");</div><div class='ctx'> 	gpio_direction_output(16 + SEEPROM3_CS, 1);</div><div class='del'>-	tx4938_spi_init(0);</div><div class='add'>+	tx4938_spi_init(SPI_BUSNO);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void __init rbtx4938_mtd_init(void)</div><div class='add'>+{</div><div class='add'>+	struct physmap_flash_data pdata = {</div><div class='add'>+		.width = 4,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	switch (readb(rbtx4938_bdipsw_addr) &amp; 7) {</div><div class='add'>+	case 0:</div><div class='add'>+		/* Boot */</div><div class='add'>+		txx9_physmap_flash_init(0, 0x1fc00000, 0x400000, &amp;pdata);</div><div class='add'>+		/* System */</div><div class='add'>+		txx9_physmap_flash_init(1, 0x1e000000, 0x1000000, &amp;pdata);</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		/* System */</div><div class='add'>+		txx9_physmap_flash_init(0, 0x1f000000, 0x1000000, &amp;pdata);</div><div class='add'>+		/* Boot */</div><div class='add'>+		txx9_physmap_flash_init(1, 0x1ec00000, 0x400000, &amp;pdata);</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		/* Ext */</div><div class='add'>+		txx9_physmap_flash_init(0, 0x1f000000, 0x1000000, &amp;pdata);</div><div class='add'>+		/* System */</div><div class='add'>+		txx9_physmap_flash_init(1, 0x1e000000, 0x1000000, &amp;pdata);</div><div class='add'>+		/* Boot */</div><div class='add'>+		txx9_physmap_flash_init(2, 0x1dc00000, 0x400000, &amp;pdata);</div><div class='add'>+		break;</div><div class='add'>+	case 3:</div><div class='add'>+		/* Boot */</div><div class='add'>+		txx9_physmap_flash_init(1, 0x1bc00000, 0x400000, &amp;pdata);</div><div class='add'>+		/* System */</div><div class='add'>+		txx9_physmap_flash_init(2, 0x1a000000, 0x1000000, &amp;pdata);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void __init rbtx4938_arch_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	gpiochip_add(&amp;rbtx4938_spi_gpio_chip);</div><div class='hunk'>@@ -306,6 +351,8 @@ static void __init rbtx4938_device_init(void)</div><div class='ctx'> 	rbtx4938_ethaddr_init();</div><div class='ctx'> 	rbtx4938_ne_init();</div><div class='ctx'> 	tx4938_wdt_init();</div><div class='add'>+	rbtx4938_mtd_init();</div><div class='add'>+	txx9_iocled_init(RBTX4938_LED_ADDR - IO_BASE, -1, 8, 1, "green", NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct txx9_board_vec rbtx4938_vec __initdata = {</div><div class='head'>diff --git a/arch/mips/txx9/rbtx4939/Makefile b/arch/mips/txx9/rbtx4939/Makefile<br/>new file mode 100644<br/>index 000000000000..3232cd03a7d6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/txx9/rbtx4939/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/txx9/rbtx4939/Makefile</a></div><div class='hunk'>@@ -0,0 +1,3 @@</div><div class='add'>+obj-y	 += irq.o setup.o prom.o</div><div class='add'>+</div><div class='add'>+EXTRA_CFLAGS += -Werror</div><div class='head'>diff --git a/arch/mips/txx9/rbtx4939/irq.c b/arch/mips/txx9/rbtx4939/irq.c<br/>new file mode 100644<br/>index 000000000000..500cc0a908e6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/txx9/rbtx4939/irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/txx9/rbtx4939/irq.c</a></div><div class='hunk'>@@ -0,0 +1,96 @@</div><div class='add'>+/*</div><div class='add'>+ * Toshiba RBTX4939 interrupt routines</div><div class='add'>+ * Based on linux/arch/mips/txx9/rbtx4938/irq.c,</div><div class='add'>+ *	    and RBTX49xx patch from CELF patch archive.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2000-2001,2005-2006 Toshiba Corporation</div><div class='add'>+ * 2003-2005 (c) MontaVista Software, Inc. This file is licensed under the</div><div class='add'>+ * terms of the GNU General Public License version 2. This program is</div><div class='add'>+ * licensed "as is" without any warranty of any kind, whether express</div><div class='add'>+ * or implied.</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;asm/mipsregs.h&gt;</div><div class='add'>+#include &lt;asm/txx9/rbtx4939.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * RBTX4939 IOC controller definition</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static void rbtx4939_ioc_irq_unmask(unsigned int irq)</div><div class='add'>+{</div><div class='add'>+	int ioc_nr = irq - RBTX4939_IRQ_IOC;</div><div class='add'>+</div><div class='add'>+	writeb(readb(rbtx4939_ien_addr) | (1 &lt;&lt; ioc_nr), rbtx4939_ien_addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rbtx4939_ioc_irq_mask(unsigned int irq)</div><div class='add'>+{</div><div class='add'>+	int ioc_nr = irq - RBTX4939_IRQ_IOC;</div><div class='add'>+</div><div class='add'>+	writeb(readb(rbtx4939_ien_addr) &amp; ~(1 &lt;&lt; ioc_nr), rbtx4939_ien_addr);</div><div class='add'>+	mmiowb();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct irq_chip rbtx4939_ioc_irq_chip = {</div><div class='add'>+	.name		= "IOC",</div><div class='add'>+	.ack		= rbtx4939_ioc_irq_mask,</div><div class='add'>+	.mask		= rbtx4939_ioc_irq_mask,</div><div class='add'>+	.mask_ack	= rbtx4939_ioc_irq_mask,</div><div class='add'>+	.unmask		= rbtx4939_ioc_irq_unmask,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static inline int rbtx4939_ioc_irqroute(void)</div><div class='add'>+{</div><div class='add'>+	unsigned char istat = readb(rbtx4939_ifac2_addr);</div><div class='add'>+</div><div class='add'>+	if (unlikely(istat == 0))</div><div class='add'>+		return -1;</div><div class='add'>+	return RBTX4939_IRQ_IOC + __fls8(istat);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rbtx4939_irq_dispatch(int pending)</div><div class='add'>+{</div><div class='add'>+	int irq;</div><div class='add'>+</div><div class='add'>+	if (pending &amp; CAUSEF_IP7)</div><div class='add'>+		return MIPS_CPU_IRQ_BASE + 7;</div><div class='add'>+	irq = tx4939_irq();</div><div class='add'>+	if (likely(irq &gt;= 0)) {</div><div class='add'>+		/* redirect IOC interrupts */</div><div class='add'>+		switch (irq) {</div><div class='add'>+		case RBTX4939_IRQ_IOCINT:</div><div class='add'>+			irq = rbtx4939_ioc_irqroute();</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	} else if (pending &amp; CAUSEF_IP0)</div><div class='add'>+		irq = MIPS_CPU_IRQ_BASE + 0;</div><div class='add'>+	else if (pending &amp; CAUSEF_IP1)</div><div class='add'>+		irq = MIPS_CPU_IRQ_BASE + 1;</div><div class='add'>+	else</div><div class='add'>+		irq = -1;</div><div class='add'>+	return irq;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init rbtx4939_irq_setup(void)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* mask all IOC interrupts */</div><div class='add'>+	writeb(0, rbtx4939_ien_addr);</div><div class='add'>+</div><div class='add'>+	/* clear SoftInt interrupts */</div><div class='add'>+	writeb(0, rbtx4939_softint_addr);</div><div class='add'>+</div><div class='add'>+	txx9_irq_dispatch = rbtx4939_irq_dispatch;</div><div class='add'>+</div><div class='add'>+	tx4939_irq_init();</div><div class='add'>+	for (i = RBTX4939_IRQ_IOC;</div><div class='add'>+	     i &lt; RBTX4939_IRQ_IOC + RBTX4939_NR_IRQ_IOC; i++)</div><div class='add'>+		set_irq_chip_and_handler(i, &amp;rbtx4939_ioc_irq_chip,</div><div class='add'>+					 handle_level_irq);</div><div class='add'>+</div><div class='add'>+	set_irq_chained_handler(RBTX4939_IRQ_IOCINT, handle_simple_irq);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/mips/txx9/rbtx4939/prom.c b/arch/mips/txx9/rbtx4939/prom.c<br/>new file mode 100644<br/>index 000000000000..bd277ecb4ad6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/txx9/rbtx4939/prom.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/txx9/rbtx4939/prom.c</a></div><div class='hunk'>@@ -0,0 +1,17 @@</div><div class='add'>+/*</div><div class='add'>+ * rbtx4939 specific prom routines</div><div class='add'>+ *</div><div class='add'>+ * This file is subject to the terms and conditions of the GNU General Public</div><div class='add'>+ * License.  See the file "COPYING" in the main directory of this archive</div><div class='add'>+ * for more details.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;asm/txx9/generic.h&gt;</div><div class='add'>+#include &lt;asm/txx9/rbtx4939.h&gt;</div><div class='add'>+</div><div class='add'>+void __init rbtx4939_prom_init(void)</div><div class='add'>+{</div><div class='add'>+	tx4939_add_memory_regions();</div><div class='add'>+	txx9_sio_putchar_init(TX4939_SIO_REG(0) &amp; 0xfffffffffULL);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/mips/txx9/rbtx4939/setup.c b/arch/mips/txx9/rbtx4939/setup.c<br/>new file mode 100644<br/>index 000000000000..9855d7bccc20<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mips/txx9/rbtx4939/setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mips/txx9/rbtx4939/setup.c</a></div><div class='hunk'>@@ -0,0 +1,307 @@</div><div class='add'>+/*</div><div class='add'>+ * Toshiba RBTX4939 setup routines.</div><div class='add'>+ * Based on linux/arch/mips/txx9/rbtx4938/setup.c,</div><div class='add'>+ *	    and RBTX49xx patch from CELF patch archive.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2000-2001,2005-2007 Toshiba Corporation</div><div class='add'>+ * 2003-2005 (c) MontaVista Software, Inc. This file is licensed under the</div><div class='add'>+ * terms of the GNU General Public License version 2. This program is</div><div class='add'>+ * licensed "as is" without any warranty of any kind, whether express</div><div class='add'>+ * or implied.</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/leds.h&gt;</div><div class='add'>+#include &lt;asm/reboot.h&gt;</div><div class='add'>+#include &lt;asm/txx9/generic.h&gt;</div><div class='add'>+#include &lt;asm/txx9/pci.h&gt;</div><div class='add'>+#include &lt;asm/txx9/rbtx4939.h&gt;</div><div class='add'>+</div><div class='add'>+static void rbtx4939_machine_restart(char *command)</div><div class='add'>+{</div><div class='add'>+	local_irq_disable();</div><div class='add'>+	writeb(1, rbtx4939_reseten_addr);</div><div class='add'>+	writeb(1, rbtx4939_softreset_addr);</div><div class='add'>+	while (1)</div><div class='add'>+		;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init rbtx4939_time_init(void)</div><div class='add'>+{</div><div class='add'>+	tx4939_time_init(0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init rbtx4939_pci_setup(void)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_PCI</div><div class='add'>+	int extarb = !(__raw_readq(&amp;tx4939_ccfgptr-&gt;ccfg) &amp; TX4939_CCFG_PCIARB);</div><div class='add'>+	struct pci_controller *c = &amp;txx9_primary_pcic;</div><div class='add'>+</div><div class='add'>+	register_pci_controller(c);</div><div class='add'>+</div><div class='add'>+	tx4939_report_pciclk();</div><div class='add'>+	tx4927_pcic_setup(tx4939_pcicptr, c, extarb);</div><div class='add'>+	if (!(__raw_readq(&amp;tx4939_ccfgptr-&gt;pcfg) &amp; TX4939_PCFG_ATA1MODE) &amp;&amp;</div><div class='add'>+	    (__raw_readq(&amp;tx4939_ccfgptr-&gt;pcfg) &amp;</div><div class='add'>+	     (TX4939_PCFG_ET0MODE | TX4939_PCFG_ET1MODE))) {</div><div class='add'>+		tx4939_report_pci1clk();</div><div class='add'>+</div><div class='add'>+		/* mem:64K(max), io:64K(max) (enough for ETH0,ETH1) */</div><div class='add'>+		c = txx9_alloc_pci_controller(NULL, 0, 0x10000, 0, 0x10000);</div><div class='add'>+		register_pci_controller(c);</div><div class='add'>+		tx4927_pcic_setup(tx4939_pcic1ptr, c, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tx4939_setup_pcierr_irq();</div><div class='add'>+#endif /* CONFIG_PCI */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned long long default_ebccr[] __initdata = {</div><div class='add'>+	0x01c0000000007608ULL, /* 64M ROM */</div><div class='add'>+	0x017f000000007049ULL, /* 1M IOC */</div><div class='add'>+	0x0180000000408608ULL, /* ISA */</div><div class='add'>+	0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init rbtx4939_ebusc_setup(void)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	unsigned int sp;</div><div class='add'>+</div><div class='add'>+	/* use user-configured speed */</div><div class='add'>+	sp = TX4939_EBUSC_CR(0) &amp; 0x30;</div><div class='add'>+	default_ebccr[0] |= sp;</div><div class='add'>+	default_ebccr[1] |= sp;</div><div class='add'>+	default_ebccr[2] |= sp;</div><div class='add'>+	/* initialise by myself */</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(default_ebccr); i++) {</div><div class='add'>+		if (default_ebccr[i])</div><div class='add'>+			____raw_writeq(default_ebccr[i],</div><div class='add'>+				       &amp;tx4939_ebuscptr-&gt;cr[i]);</div><div class='add'>+		else</div><div class='add'>+			____raw_writeq(____raw_readq(&amp;tx4939_ebuscptr-&gt;cr[i])</div><div class='add'>+				       &amp; ~8,</div><div class='add'>+				       &amp;tx4939_ebuscptr-&gt;cr[i]);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init rbtx4939_update_ioc_pen(void)</div><div class='add'>+{</div><div class='add'>+	__u64 pcfg = ____raw_readq(&amp;tx4939_ccfgptr-&gt;pcfg);</div><div class='add'>+	__u64 ccfg = ____raw_readq(&amp;tx4939_ccfgptr-&gt;ccfg);</div><div class='add'>+	__u8 pe1 = readb(rbtx4939_pe1_addr);</div><div class='add'>+	__u8 pe2 = readb(rbtx4939_pe2_addr);</div><div class='add'>+	__u8 pe3 = readb(rbtx4939_pe3_addr);</div><div class='add'>+	if (pcfg &amp; TX4939_PCFG_ATA0MODE)</div><div class='add'>+		pe1 |= RBTX4939_PE1_ATA(0);</div><div class='add'>+	else</div><div class='add'>+		pe1 &amp;= ~RBTX4939_PE1_ATA(0);</div><div class='add'>+	if (pcfg &amp; TX4939_PCFG_ATA1MODE) {</div><div class='add'>+		pe1 |= RBTX4939_PE1_ATA(1);</div><div class='add'>+		pe1 &amp;= ~(RBTX4939_PE1_RMII(0) | RBTX4939_PE1_RMII(1));</div><div class='add'>+	} else {</div><div class='add'>+		pe1 &amp;= ~RBTX4939_PE1_ATA(1);</div><div class='add'>+		if (pcfg &amp; TX4939_PCFG_ET0MODE)</div><div class='add'>+			pe1 |= RBTX4939_PE1_RMII(0);</div><div class='add'>+		else</div><div class='add'>+			pe1 &amp;= ~RBTX4939_PE1_RMII(0);</div><div class='add'>+		if (pcfg &amp; TX4939_PCFG_ET1MODE)</div><div class='add'>+			pe1 |= RBTX4939_PE1_RMII(1);</div><div class='add'>+		else</div><div class='add'>+			pe1 &amp;= ~RBTX4939_PE1_RMII(1);</div><div class='add'>+	}</div><div class='add'>+	if (ccfg &amp; TX4939_CCFG_PTSEL)</div><div class='add'>+		pe3 &amp;= ~(RBTX4939_PE3_VP | RBTX4939_PE3_VP_P |</div><div class='add'>+			 RBTX4939_PE3_VP_S);</div><div class='add'>+	else {</div><div class='add'>+		__u64 vmode = pcfg &amp;</div><div class='add'>+			(TX4939_PCFG_VSSMODE | TX4939_PCFG_VPSMODE);</div><div class='add'>+		if (vmode == 0)</div><div class='add'>+			pe3 &amp;= ~(RBTX4939_PE3_VP | RBTX4939_PE3_VP_P |</div><div class='add'>+				 RBTX4939_PE3_VP_S);</div><div class='add'>+		else if (vmode == TX4939_PCFG_VPSMODE) {</div><div class='add'>+			pe3 |= RBTX4939_PE3_VP_P;</div><div class='add'>+			pe3 &amp;= ~(RBTX4939_PE3_VP | RBTX4939_PE3_VP_S);</div><div class='add'>+		} else if (vmode == TX4939_PCFG_VSSMODE) {</div><div class='add'>+			pe3 |= RBTX4939_PE3_VP | RBTX4939_PE3_VP_S;</div><div class='add'>+			pe3 &amp;= ~RBTX4939_PE3_VP_P;</div><div class='add'>+		} else {</div><div class='add'>+			pe3 |= RBTX4939_PE3_VP | RBTX4939_PE3_VP_P;</div><div class='add'>+			pe3 &amp;= ~RBTX4939_PE3_VP_S;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (pcfg &amp; TX4939_PCFG_SPIMODE) {</div><div class='add'>+		if (pcfg &amp; TX4939_PCFG_SIO2MODE_GPIO)</div><div class='add'>+			pe2 &amp;= ~(RBTX4939_PE2_SIO2 | RBTX4939_PE2_SIO0);</div><div class='add'>+		else {</div><div class='add'>+			if (pcfg &amp; TX4939_PCFG_SIO2MODE_SIO2) {</div><div class='add'>+				pe2 |= RBTX4939_PE2_SIO2;</div><div class='add'>+				pe2 &amp;= ~RBTX4939_PE2_SIO0;</div><div class='add'>+			} else {</div><div class='add'>+				pe2 |= RBTX4939_PE2_SIO0;</div><div class='add'>+				pe2 &amp;= ~RBTX4939_PE2_SIO2;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if (pcfg &amp; TX4939_PCFG_SIO3MODE)</div><div class='add'>+			pe2 |= RBTX4939_PE2_SIO3;</div><div class='add'>+		else</div><div class='add'>+			pe2 &amp;= ~RBTX4939_PE2_SIO3;</div><div class='add'>+		pe2 &amp;= ~RBTX4939_PE2_SPI;</div><div class='add'>+	} else {</div><div class='add'>+		pe2 |= RBTX4939_PE2_SPI;</div><div class='add'>+		pe2 &amp;= ~(RBTX4939_PE2_SIO3 | RBTX4939_PE2_SIO2 |</div><div class='add'>+			 RBTX4939_PE2_SIO0);</div><div class='add'>+	}</div><div class='add'>+	if ((pcfg &amp; TX4939_PCFG_I2SMODE_MASK) == TX4939_PCFG_I2SMODE_GPIO)</div><div class='add'>+		pe2 |= RBTX4939_PE2_GPIO;</div><div class='add'>+	else</div><div class='add'>+		pe2 &amp;= ~RBTX4939_PE2_GPIO;</div><div class='add'>+	writeb(pe1, rbtx4939_pe1_addr);</div><div class='add'>+	writeb(pe2, rbtx4939_pe2_addr);</div><div class='add'>+	writeb(pe3, rbtx4939_pe3_addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define RBTX4939_MAX_7SEGLEDS	8</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_LEDS_CLASS) || defined(CONFIG_LEDS_CLASS_MODULE)</div><div class='add'>+static u8 led_val[RBTX4939_MAX_7SEGLEDS];</div><div class='add'>+struct rbtx4939_led_data {</div><div class='add'>+	struct led_classdev cdev;</div><div class='add'>+	char name[32];</div><div class='add'>+	unsigned int num;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Use "dot" in 7seg LEDs */</div><div class='add'>+static void rbtx4939_led_brightness_set(struct led_classdev *led_cdev,</div><div class='add'>+					enum led_brightness value)</div><div class='add'>+{</div><div class='add'>+	struct rbtx4939_led_data *led_dat =</div><div class='add'>+		container_of(led_cdev, struct rbtx4939_led_data, cdev);</div><div class='add'>+	unsigned int num = led_dat-&gt;num;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	local_irq_save(flags);</div><div class='add'>+	led_val[num] = (led_val[num] &amp; 0x7f) | (value ? 0x80 : 0);</div><div class='add'>+	writeb(led_val[num], rbtx4939_7seg_addr(num / 4, num % 4));</div><div class='add'>+	local_irq_restore(flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init rbtx4939_led_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct rbtx4939_led_data *leds_data;</div><div class='add'>+	int i;</div><div class='add'>+	static char *default_triggers[] __initdata = {</div><div class='add'>+		"heartbeat",</div><div class='add'>+		"ide-disk",</div><div class='add'>+		"nand-disk",</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	leds_data = kzalloc(sizeof(*leds_data) * RBTX4939_MAX_7SEGLEDS,</div><div class='add'>+			    GFP_KERNEL);</div><div class='add'>+	if (!leds_data)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	for (i = 0; i &lt; RBTX4939_MAX_7SEGLEDS; i++) {</div><div class='add'>+		int rc;</div><div class='add'>+		struct rbtx4939_led_data *led_dat = &amp;leds_data[i];</div><div class='add'>+</div><div class='add'>+		led_dat-&gt;num = i;</div><div class='add'>+		led_dat-&gt;cdev.brightness_set = rbtx4939_led_brightness_set;</div><div class='add'>+		sprintf(led_dat-&gt;name, "rbtx4939:amber:%u", i);</div><div class='add'>+		led_dat-&gt;cdev.name = led_dat-&gt;name;</div><div class='add'>+		if (i &lt; ARRAY_SIZE(default_triggers))</div><div class='add'>+			led_dat-&gt;cdev.default_trigger = default_triggers[i];</div><div class='add'>+		rc = led_classdev_register(&amp;pdev-&gt;dev, &amp;led_dat-&gt;cdev);</div><div class='add'>+		if (rc &lt; 0)</div><div class='add'>+			return rc;</div><div class='add'>+		led_dat-&gt;cdev.brightness_set(&amp;led_dat-&gt;cdev, 0);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct platform_driver rbtx4939_led_driver = {</div><div class='add'>+	.driver  = {</div><div class='add'>+		.name = "rbtx4939-led",</div><div class='add'>+		.owner = THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init rbtx4939_led_setup(void)</div><div class='add'>+{</div><div class='add'>+	platform_device_register_simple("rbtx4939-led", -1, NULL, 0);</div><div class='add'>+	platform_driver_probe(&amp;rbtx4939_led_driver, rbtx4939_led_probe);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline void rbtx4939_led_setup(void)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static void __init rbtx4939_arch_init(void)</div><div class='add'>+{</div><div class='add'>+	rbtx4939_pci_setup();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init rbtx4939_device_init(void)</div><div class='add'>+{</div><div class='add'>+#if defined(CONFIG_TC35815) || defined(CONFIG_TC35815_MODULE)</div><div class='add'>+	int i, j;</div><div class='add'>+	unsigned char ethaddr[2][6];</div><div class='add'>+	for (i = 0; i &lt; 2; i++) {</div><div class='add'>+		unsigned long area = CKSEG1 + 0x1fff0000 + (i * 0x10);</div><div class='add'>+		if (readb(rbtx4939_bdipsw_addr) &amp; 8) {</div><div class='add'>+			u16 buf[3];</div><div class='add'>+			area -= 0x03000000;</div><div class='add'>+			for (j = 0; j &lt; 3; j++)</div><div class='add'>+				buf[j] = le16_to_cpup((u16 *)(area + j * 2));</div><div class='add'>+			memcpy(ethaddr[i], buf, 6);</div><div class='add'>+		} else</div><div class='add'>+			memcpy(ethaddr[i], (void *)area, 6);</div><div class='add'>+	}</div><div class='add'>+	tx4939_ethaddr_init(ethaddr[0], ethaddr[1]);</div><div class='add'>+#endif</div><div class='add'>+	rbtx4939_led_setup();</div><div class='add'>+	tx4939_wdt_init();</div><div class='add'>+	tx4939_ata_init();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init rbtx4939_setup(void)</div><div class='add'>+{</div><div class='add'>+	rbtx4939_ebusc_setup();</div><div class='add'>+	/* always enable ATA0 */</div><div class='add'>+	txx9_set64(&amp;tx4939_ccfgptr-&gt;pcfg, TX4939_PCFG_ATA0MODE);</div><div class='add'>+	rbtx4939_update_ioc_pen();</div><div class='add'>+	if (txx9_master_clock == 0)</div><div class='add'>+		txx9_master_clock = 20000000;</div><div class='add'>+	tx4939_setup();</div><div class='add'>+</div><div class='add'>+	_machine_restart = rbtx4939_machine_restart;</div><div class='add'>+</div><div class='add'>+	pr_info("RBTX4939 (Rev %02x) --- FPGA(Rev %02x) DIPSW:%02x,%02x\n",</div><div class='add'>+		readb(rbtx4939_board_rev_addr), readb(rbtx4939_ioc_rev_addr),</div><div class='add'>+		readb(rbtx4939_udipsw_addr), readb(rbtx4939_bdipsw_addr));</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PCI</div><div class='add'>+	txx9_alloc_pci_controller(&amp;txx9_primary_pcic, 0, 0, 0, 0);</div><div class='add'>+	txx9_board_pcibios_setup = tx4927_pcibios_setup;</div><div class='add'>+#else</div><div class='add'>+	set_io_port_base(RBTX4939_ETHER_BASE);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	tx4939_sio_init(TX4939_SCLK0(txx9_master_clock), 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct txx9_board_vec rbtx4939_vec __initdata = {</div><div class='add'>+	.system = "Tothiba RBTX4939",</div><div class='add'>+	.prom_init = rbtx4939_prom_init,</div><div class='add'>+	.mem_setup = rbtx4939_setup,</div><div class='add'>+	.irq_setup = rbtx4939_irq_setup,</div><div class='add'>+	.time_init = rbtx4939_time_init,</div><div class='add'>+	.device_init = rbtx4939_device_init,</div><div class='add'>+	.arch_init = rbtx4939_arch_init,</div><div class='add'>+#ifdef CONFIG_PCI</div><div class='add'>+	.pci_map_irq = tx4939_pci_map_irq,</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='head'>diff --git a/arch/mn10300/Kconfig b/arch/mn10300/Kconfig<br/>index e856218da90d..dd557c9cf001 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mn10300/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/mn10300/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/mn10300/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/mn10300/Kconfig</a></div><div class='hunk'>@@ -53,9 +53,6 @@ config QUICKLIST</div><div class='ctx'> config ARCH_HAS_ILOG2_U32</div><div class='ctx'> 	def_bool y</div><div class='ctx'> </div><div class='del'>-config ARCH_SUPPORTS_AOUT</div><div class='del'>-	def_bool n</div><div class='del'>-</div><div class='ctx'> # Use the generic interrupt handling code in kernel/irq/</div><div class='ctx'> config GENERIC_HARDIRQS</div><div class='ctx'> 	def_bool y</div><div class='head'>diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig<br/>index a7d4fd353c2b..8313fccced5e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/parisc/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/parisc/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/parisc/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/parisc/Kconfig</a></div><div class='hunk'>@@ -76,9 +76,6 @@ config IRQ_PER_CPU</div><div class='ctx'> 	bool</div><div class='ctx'> 	default y</div><div class='ctx'> </div><div class='del'>-config ARCH_SUPPORTS_AOUT</div><div class='del'>-	def_bool y</div><div class='del'>-</div><div class='ctx'> # unless you want to implement ACPI on PA-RISC ... ;-)</div><div class='ctx'> config PM</div><div class='ctx'> 	bool</div><div class='head'>diff --git a/arch/parisc/kernel/binfmt_elf32.c b/arch/parisc/kernel/binfmt_elf32.c<br/>index ecb10a4f63c6..f61692d2b557 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/parisc/kernel/binfmt_elf32.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/parisc/kernel/binfmt_elf32.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/parisc/kernel/binfmt_elf32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/parisc/kernel/binfmt_elf32.c</a></div><div class='hunk'>@@ -85,7 +85,7 @@ struct elf_prpsinfo32</div><div class='ctx'>  * could set a processor dependent flag in the thread_struct.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define SET_PERSONALITY(ex, ibcs2) \</div><div class='add'>+#define SET_PERSONALITY(ex) \</div><div class='ctx'> 	set_thread_flag(TIF_32BIT); \</div><div class='ctx'> 	current-&gt;thread.map_base = DEFAULT_MAP_BASE32; \</div><div class='ctx'> 	current-&gt;thread.task_size = DEFAULT_TASK_SIZE32 \</div><div class='head'>diff --git a/arch/parisc/kernel/sys_parisc32.c b/arch/parisc/kernel/sys_parisc32.c<br/>index 71efd6a28e2a..0838155b7a88 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/parisc/kernel/sys_parisc32.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/parisc/kernel/sys_parisc32.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/parisc/kernel/sys_parisc32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/parisc/kernel/sys_parisc32.c</a></div><div class='hunk'>@@ -179,111 +179,6 @@ asmlinkage long sys32_sched_rr_get_interval(pid_t pid,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-put_compat_timeval(struct compat_timeval __user *u, struct timeval *t)</div><div class='del'>-{</div><div class='del'>-	struct compat_timeval t32;</div><div class='del'>-	t32.tv_sec = t-&gt;tv_sec;</div><div class='del'>-	t32.tv_usec = t-&gt;tv_usec;</div><div class='del'>-	return copy_to_user(u, &amp;t32, sizeof t32);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline long get_ts32(struct timespec *o, struct compat_timeval __user *i)</div><div class='del'>-{</div><div class='del'>-	long usec;</div><div class='del'>-</div><div class='del'>-	if (__get_user(o-&gt;tv_sec, &amp;i-&gt;tv_sec))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	if (__get_user(usec, &amp;i-&gt;tv_usec))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	o-&gt;tv_nsec = usec * 1000;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-asmlinkage int</div><div class='del'>-sys32_gettimeofday(struct compat_timeval __user *tv, struct timezone __user *tz)</div><div class='del'>-{</div><div class='del'>-    extern void do_gettimeofday(struct timeval *tv);</div><div class='del'>-</div><div class='del'>-    if (tv) {</div><div class='del'>-	    struct timeval ktv;</div><div class='del'>-	    do_gettimeofday(&amp;ktv);</div><div class='del'>-	    if (put_compat_timeval(tv, &amp;ktv))</div><div class='del'>-		    return -EFAULT;</div><div class='del'>-    }</div><div class='del'>-    if (tz) {</div><div class='del'>-	    extern struct timezone sys_tz;</div><div class='del'>-	    if (copy_to_user(tz, &amp;sys_tz, sizeof(sys_tz)))</div><div class='del'>-		    return -EFAULT;</div><div class='del'>-    }</div><div class='del'>-    return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-asmlinkage </div><div class='del'>-int sys32_settimeofday(struct compat_timeval __user *tv, struct timezone __user *tz)</div><div class='del'>-{</div><div class='del'>-	struct timespec kts;</div><div class='del'>-	struct timezone ktz;</div><div class='del'>-</div><div class='del'>- 	if (tv) {</div><div class='del'>-		if (get_ts32(&amp;kts, tv))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-	}</div><div class='del'>-	if (tz) {</div><div class='del'>-		if (copy_from_user(&amp;ktz, tz, sizeof(ktz)))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return do_sys_settimeofday(tv ? &amp;kts : NULL, tz ? &amp;ktz : NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int cp_compat_stat(struct kstat *stat, struct compat_stat __user *statbuf)</div><div class='del'>-{</div><div class='del'>-	compat_ino_t ino;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (stat-&gt;size &gt; MAX_NON_LFS || !new_valid_dev(stat-&gt;dev) ||</div><div class='del'>-	    !new_valid_dev(stat-&gt;rdev))</div><div class='del'>-		return -EOVERFLOW;</div><div class='del'>-</div><div class='del'>-	ino = stat-&gt;ino;</div><div class='del'>-	if (sizeof(ino) &lt; sizeof(stat-&gt;ino) &amp;&amp; ino != stat-&gt;ino)</div><div class='del'>-		return -EOVERFLOW;</div><div class='del'>-</div><div class='del'>-	err  = put_user(new_encode_dev(stat-&gt;dev), &amp;statbuf-&gt;st_dev);</div><div class='del'>-	err |= put_user(ino, &amp;statbuf-&gt;st_ino);</div><div class='del'>-	err |= put_user(stat-&gt;mode, &amp;statbuf-&gt;st_mode);</div><div class='del'>-	err |= put_user(stat-&gt;nlink, &amp;statbuf-&gt;st_nlink);</div><div class='del'>-	err |= put_user(0, &amp;statbuf-&gt;st_reserved1);</div><div class='del'>-	err |= put_user(0, &amp;statbuf-&gt;st_reserved2);</div><div class='del'>-	err |= put_user(new_encode_dev(stat-&gt;rdev), &amp;statbuf-&gt;st_rdev);</div><div class='del'>-	err |= put_user(stat-&gt;size, &amp;statbuf-&gt;st_size);</div><div class='del'>-	err |= put_user(stat-&gt;atime.tv_sec, &amp;statbuf-&gt;st_atime);</div><div class='del'>-	err |= put_user(stat-&gt;atime.tv_nsec, &amp;statbuf-&gt;st_atime_nsec);</div><div class='del'>-	err |= put_user(stat-&gt;mtime.tv_sec, &amp;statbuf-&gt;st_mtime);</div><div class='del'>-	err |= put_user(stat-&gt;mtime.tv_nsec, &amp;statbuf-&gt;st_mtime_nsec);</div><div class='del'>-	err |= put_user(stat-&gt;ctime.tv_sec, &amp;statbuf-&gt;st_ctime);</div><div class='del'>-	err |= put_user(stat-&gt;ctime.tv_nsec, &amp;statbuf-&gt;st_ctime_nsec);</div><div class='del'>-	err |= put_user(stat-&gt;blksize, &amp;statbuf-&gt;st_blksize);</div><div class='del'>-	err |= put_user(stat-&gt;blocks, &amp;statbuf-&gt;st_blocks);</div><div class='del'>-	err |= put_user(0, &amp;statbuf-&gt;__unused1);</div><div class='del'>-	err |= put_user(0, &amp;statbuf-&gt;__unused2);</div><div class='del'>-	err |= put_user(0, &amp;statbuf-&gt;__unused3);</div><div class='del'>-	err |= put_user(0, &amp;statbuf-&gt;__unused4);</div><div class='del'>-	err |= put_user(0, &amp;statbuf-&gt;__unused5);</div><div class='del'>-	err |= put_user(0, &amp;statbuf-&gt;st_fstype); /* not avail */</div><div class='del'>-	err |= put_user(0, &amp;statbuf-&gt;st_realdev); /* not avail */</div><div class='del'>-	err |= put_user(0, &amp;statbuf-&gt;st_basemode); /* not avail */</div><div class='del'>-	err |= put_user(0, &amp;statbuf-&gt;st_spareshort);</div><div class='del'>-	err |= put_user(stat-&gt;uid, &amp;statbuf-&gt;st_uid);</div><div class='del'>-	err |= put_user(stat-&gt;gid, &amp;statbuf-&gt;st_gid);</div><div class='del'>-	err |= put_user(0, &amp;statbuf-&gt;st_spare4[0]);</div><div class='del'>-	err |= put_user(0, &amp;statbuf-&gt;st_spare4[1]);</div><div class='del'>-	err |= put_user(0, &amp;statbuf-&gt;st_spare4[2]);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*** copied from mips64 ***/</div><div class='ctx'> /*</div><div class='ctx'>  * Ooo, nasty.  We need here to frob 32-bit unsigned longs to</div><div class='head'>diff --git a/arch/parisc/kernel/syscall_table.S b/arch/parisc/kernel/syscall_table.S<br/>index 6b5ac38f5a99..c7e59f548817 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/parisc/kernel/syscall_table.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/parisc/kernel/syscall_table.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/parisc/kernel/syscall_table.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/parisc/kernel/syscall_table.S</a></div><div class='hunk'>@@ -149,8 +149,8 @@</div><div class='ctx'> 	ENTRY_COMP(getrlimit)</div><div class='ctx'> 	ENTRY_COMP(getrusage)</div><div class='ctx'> 	/* struct timeval and timezone are maybe?? consistent wide and narrow */</div><div class='del'>-	ENTRY_DIFF(gettimeofday)</div><div class='del'>-	ENTRY_DIFF(settimeofday)</div><div class='add'>+	ENTRY_COMP(gettimeofday)</div><div class='add'>+	ENTRY_COMP(settimeofday)</div><div class='ctx'> 	ENTRY_SAME(getgroups)		/* 80 */</div><div class='ctx'> 	ENTRY_SAME(setgroups)</div><div class='ctx'> 	/* struct socketaddr... */</div><div class='head'>diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig<br/>index 587da5e0990f..380baa1780e9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/Kconfig</a></div><div class='hunk'>@@ -22,6 +22,9 @@ config WORD_SIZE</div><div class='ctx'> config PPC_MERGE</div><div class='ctx'> 	def_bool y</div><div class='ctx'> </div><div class='add'>+config ARCH_PHYS_ADDR_T_64BIT</div><div class='add'>+       def_bool PPC64 || PHYS_64BIT</div><div class='add'>+</div><div class='ctx'> config MMU</div><div class='ctx'> 	bool</div><div class='ctx'> 	default y</div><div class='hunk'>@@ -415,8 +418,11 @@ config PPC_64K_PAGES</div><div class='ctx'> </div><div class='ctx'> config FORCE_MAX_ZONEORDER</div><div class='ctx'> 	int "Maximum zone order"</div><div class='add'>+	range 9 64 if PPC_64K_PAGES</div><div class='ctx'> 	default "9" if PPC_64K_PAGES</div><div class='add'>+	range 13 64 if PPC64 &amp;&amp; !PPC_64K_PAGES</div><div class='ctx'> 	default "13" if PPC64 &amp;&amp; !PPC_64K_PAGES</div><div class='add'>+	range 11 64</div><div class='ctx'> 	default "11"</div><div class='ctx'> 	help</div><div class='ctx'> 	  The kernel memory allocator divides physically contiguous memory</div><div class='hunk'>@@ -806,6 +812,19 @@ config PIN_TLB</div><div class='ctx'> endmenu</div><div class='ctx'> </div><div class='ctx'> if PPC64</div><div class='add'>+config RELOCATABLE</div><div class='add'>+	bool "Build a relocatable kernel"</div><div class='add'>+	help</div><div class='add'>+	  This builds a kernel image that is capable of running anywhere</div><div class='add'>+	  in the RMA (real memory area) at any 16k-aligned base address.</div><div class='add'>+	  The kernel is linked as a position-independent executable (PIE)</div><div class='add'>+	  and contains dynamic relocations which are processed early</div><div class='add'>+	  in the bootup process.</div><div class='add'>+</div><div class='add'>+	  One use is for the kexec on panic case where the recovery kernel</div><div class='add'>+	  must live at a different physical address than the primary</div><div class='add'>+	  kernel.</div><div class='add'>+</div><div class='ctx'> config PAGE_OFFSET</div><div class='ctx'> 	hex</div><div class='ctx'> 	default "0xc000000000000000"</div><div class='head'>diff --git a/arch/powerpc/Kconfig.debug b/arch/powerpc/Kconfig.debug<br/>index 4ebc52a19f0a..15eb27861fc7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/Kconfig.debug?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/Kconfig.debug</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/Kconfig.debug?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/Kconfig.debug</a></div><div class='hunk'>@@ -51,6 +51,11 @@ config FTR_FIXUP_SELFTEST</div><div class='ctx'> 	depends on DEBUG_KERNEL</div><div class='ctx'> 	default n</div><div class='ctx'> </div><div class='add'>+config MSI_BITMAP_SELFTEST</div><div class='add'>+	bool "Run self-tests of the MSI bitmap code."</div><div class='add'>+	depends on DEBUG_KERNEL</div><div class='add'>+	default n</div><div class='add'>+</div><div class='ctx'> config XMON</div><div class='ctx'> 	bool "Include xmon kernel debugger"</div><div class='ctx'> 	depends on DEBUG_KERNEL</div><div class='head'>diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile<br/>index c6be19e9ceae..24dd1a37f8fb 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/Makefile</a></div><div class='hunk'>@@ -63,7 +63,9 @@ override CC	+= -m$(CONFIG_WORD_SIZE)</div><div class='ctx'> override AR	:= GNUTARGET=elf$(CONFIG_WORD_SIZE)-powerpc $(AR)</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='del'>-LDFLAGS_vmlinux	:= -Bstatic</div><div class='add'>+LDFLAGS_vmlinux-yy := -Bstatic</div><div class='add'>+LDFLAGS_vmlinux-$(CONFIG_PPC64)$(CONFIG_RELOCATABLE) := -pie</div><div class='add'>+LDFLAGS_vmlinux	:= $(LDFLAGS_vmlinux-yy)</div><div class='ctx'> </div><div class='ctx'> CFLAGS-$(CONFIG_PPC64)	:= -mminimal-toc -mtraceback=none  -mcall-aixdesc</div><div class='ctx'> CFLAGS-$(CONFIG_PPC32)	:= -ffixed-r2 -mmultiple</div><div class='hunk'>@@ -102,7 +104,10 @@ endif</div><div class='ctx'> KBUILD_CFLAGS += $(call cc-option,-mno-altivec)</div><div class='ctx'> </div><div class='ctx'> # No SPE instruction when building kernel</div><div class='add'>+# (We use all available options to help semi-broken compilers)</div><div class='ctx'> KBUILD_CFLAGS += $(call cc-option,-mno-spe)</div><div class='add'>+KBUILD_CFLAGS += $(call cc-option,-mspe=no)</div><div class='add'>+KBUILD_CFLAGS += $(call cc-option,-mabi=no-spe)</div><div class='ctx'> </div><div class='ctx'> # Enable unit-at-a-time mode when possible. It shrinks the</div><div class='ctx'> # kernel considerably.</div><div class='head'>diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile<br/>index 65d1a8454d2c..aac1406ccba5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/boot/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/Makefile</a></div><div class='hunk'>@@ -310,8 +310,11 @@ $(obj)/dtbImage.%: vmlinux $(wrapperbits) $(obj)/%.dtb</div><div class='ctx'> $(obj)/vmlinux.strip: vmlinux</div><div class='ctx'> 	$(STRIP) -s -R .comment $&lt; -o $@</div><div class='ctx'> </div><div class='add'>+# The iseries hypervisor won't take an ET_DYN executable, so this</div><div class='add'>+# changes the type (byte 17) in the file to ET_EXEC (2).</div><div class='ctx'> $(obj)/zImage.iseries: vmlinux</div><div class='ctx'> 	$(STRIP) -s -R .comment $&lt; -o $@</div><div class='add'>+	printf "\x02" | dd of=$@ conv=notrunc bs=1 seek=17</div><div class='ctx'> </div><div class='ctx'> $(obj)/uImage: vmlinux $(wrapperbits)</div><div class='ctx'> 	$(call if_changed,wrap,uboot)</div><div class='head'>diff --git a/arch/powerpc/boot/addnote.c b/arch/powerpc/boot/addnote.c<br/>index b1e5611b2ab1..dcc9ab2ca823 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/addnote.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/boot/addnote.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/addnote.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/addnote.c</a></div><div class='hunk'>@@ -11,7 +11,12 @@</div><div class='ctx'>  * as published by the Free Software Foundation; either version</div><div class='ctx'>  * 2 of the License, or (at your option) any later version.</div><div class='ctx'>  *</div><div class='del'>- * Usage: addnote zImage</div><div class='add'>+ * Usage: addnote zImage [note.elf]</div><div class='add'>+ *</div><div class='add'>+ * If note.elf is supplied, it is the name of an ELF file that contains</div><div class='add'>+ * an RPA note to use instead of the built-in one.  Alternatively, the</div><div class='add'>+ * note.elf file may be empty, in which case the built-in RPA note is</div><div class='add'>+ * used (this is to simplify how this is invoked from the wrapper script).</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;stdio.h&gt;</div><div class='ctx'> #include &lt;stdlib.h&gt;</div><div class='hunk'>@@ -43,27 +48,29 @@ char rpaname[] = "IBM,RPA-Client-Config";</div><div class='ctx'>  */</div><div class='ctx'> #define N_RPA_DESCR	8</div><div class='ctx'> unsigned int rpanote[N_RPA_DESCR] = {</div><div class='del'>-	0,			/* lparaffinity */</div><div class='del'>-	64,			/* min_rmo_size */</div><div class='add'>+	1,			/* lparaffinity */</div><div class='add'>+	128,			/* min_rmo_size */</div><div class='ctx'> 	0,			/* min_rmo_percent */</div><div class='del'>-	40,			/* max_pft_size */</div><div class='add'>+	46,			/* max_pft_size */</div><div class='ctx'> 	1,			/* splpar */</div><div class='ctx'> 	-1,			/* min_load */</div><div class='del'>-	0,			/* new_mem_def */</div><div class='del'>-	1,			/* ignore_my_client_config */</div><div class='add'>+	1,			/* new_mem_def */</div><div class='add'>+	0,			/* ignore_my_client_config */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define ROUNDUP(len)	(((len) + 3) &amp; ~3)</div><div class='ctx'> </div><div class='ctx'> unsigned char buf[512];</div><div class='add'>+unsigned char notebuf[512];</div><div class='ctx'> </div><div class='del'>-#define GET_16BE(off)	((buf[off] &lt;&lt; 8) + (buf[(off)+1]))</div><div class='del'>-#define GET_32BE(off)	((GET_16BE(off) &lt;&lt; 16) + GET_16BE((off)+2))</div><div class='add'>+#define GET_16BE(b, off)	(((b)[off] &lt;&lt; 8) + ((b)[(off)+1]))</div><div class='add'>+#define GET_32BE(b, off)	((GET_16BE((b), (off)) &lt;&lt; 16) + \</div><div class='add'>+				 GET_16BE((b), (off)+2))</div><div class='ctx'> </div><div class='del'>-#define PUT_16BE(off, v)	(buf[off] = ((v) &gt;&gt; 8) &amp; 0xff, \</div><div class='del'>-				 buf[(off) + 1] = (v) &amp; 0xff)</div><div class='del'>-#define PUT_32BE(off, v)	(PUT_16BE((off), (v) &gt;&gt; 16), \</div><div class='del'>-				 PUT_16BE((off) + 2, (v)))</div><div class='add'>+#define PUT_16BE(b, off, v)	((b)[off] = ((v) &gt;&gt; 8) &amp; 0xff, \</div><div class='add'>+				 (b)[(off) + 1] = (v) &amp; 0xff)</div><div class='add'>+#define PUT_32BE(b, off, v)	(PUT_16BE((b), (off), (v) &gt;&gt; 16), \</div><div class='add'>+				 PUT_16BE((b), (off) + 2, (v)))</div><div class='ctx'> </div><div class='ctx'> /* Structure of an ELF file */</div><div class='ctx'> #define E_IDENT		0	/* ELF header */</div><div class='hunk'>@@ -88,15 +95,71 @@ unsigned char buf[512];</div><div class='ctx'> </div><div class='ctx'> unsigned char elf_magic[4] = { 0x7f, 'E', 'L', 'F' };</div><div class='ctx'> </div><div class='add'>+unsigned char *read_rpanote(const char *fname, int *nnp)</div><div class='add'>+{</div><div class='add'>+	int notefd, nr, i;</div><div class='add'>+	int ph, ps, np;</div><div class='add'>+	int note, notesize;</div><div class='add'>+</div><div class='add'>+	notefd = open(fname, O_RDONLY);</div><div class='add'>+	if (notefd &lt; 0) {</div><div class='add'>+		perror(fname);</div><div class='add'>+		exit(1);</div><div class='add'>+	}</div><div class='add'>+	nr = read(notefd, notebuf, sizeof(notebuf));</div><div class='add'>+	if (nr &lt; 0) {</div><div class='add'>+		perror("read note");</div><div class='add'>+		exit(1);</div><div class='add'>+	}</div><div class='add'>+	if (nr == 0)		/* empty file */</div><div class='add'>+		return NULL;</div><div class='add'>+	if (nr &lt; E_HSIZE ||</div><div class='add'>+	    memcmp(&amp;notebuf[E_IDENT+EI_MAGIC], elf_magic, 4) != 0 ||</div><div class='add'>+	    notebuf[E_IDENT+EI_CLASS] != ELFCLASS32 ||</div><div class='add'>+	    notebuf[E_IDENT+EI_DATA] != ELFDATA2MSB)</div><div class='add'>+		goto notelf;</div><div class='add'>+	close(notefd);</div><div class='add'>+</div><div class='add'>+	/* now look for the RPA-note */</div><div class='add'>+	ph = GET_32BE(notebuf, E_PHOFF);</div><div class='add'>+	ps = GET_16BE(notebuf, E_PHENTSIZE);</div><div class='add'>+	np = GET_16BE(notebuf, E_PHNUM);</div><div class='add'>+	if (ph &lt; E_HSIZE || ps &lt; PH_HSIZE || np &lt; 1)</div><div class='add'>+		goto notelf;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; np; ++i, ph += ps) {</div><div class='add'>+		if (GET_32BE(notebuf, ph + PH_TYPE) != PT_NOTE)</div><div class='add'>+			continue;</div><div class='add'>+		note = GET_32BE(notebuf, ph + PH_OFFSET);</div><div class='add'>+		notesize = GET_32BE(notebuf, ph + PH_FILESZ);</div><div class='add'>+		if (notesize &lt; 34 || note + notesize &gt; nr)</div><div class='add'>+			continue;</div><div class='add'>+		if (GET_32BE(notebuf, note) != strlen(rpaname) + 1 ||</div><div class='add'>+		    GET_32BE(notebuf, note + 8) != 0x12759999 ||</div><div class='add'>+		    strcmp((char *)&amp;notebuf[note + 12], rpaname) != 0)</div><div class='add'>+			continue;</div><div class='add'>+		/* looks like an RPA note, return it */</div><div class='add'>+		*nnp = notesize;</div><div class='add'>+		return &amp;notebuf[note];</div><div class='add'>+	}</div><div class='add'>+	/* no RPA note found */</div><div class='add'>+	return NULL;</div><div class='add'>+</div><div class='add'>+ notelf:</div><div class='add'>+	fprintf(stderr, "%s is not a big-endian 32-bit ELF image\n", fname);</div><div class='add'>+	exit(1);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int</div><div class='ctx'> main(int ac, char **av)</div><div class='ctx'> {</div><div class='ctx'> 	int fd, n, i;</div><div class='ctx'> 	int ph, ps, np;</div><div class='ctx'> 	int nnote, nnote2, ns;</div><div class='add'>+	unsigned char *rpap;</div><div class='ctx'> </div><div class='del'>-	if (ac != 2) {</div><div class='del'>-		fprintf(stderr, "Usage: %s elf-file\n", av[0]);</div><div class='add'>+	if (ac != 2 &amp;&amp; ac != 3) {</div><div class='add'>+		fprintf(stderr, "Usage: %s elf-file [rpanote.elf]\n", av[0]);</div><div class='ctx'> 		exit(1);</div><div class='ctx'> 	}</div><div class='ctx'> 	fd = open(av[1], O_RDWR);</div><div class='hunk'>@@ -107,6 +170,7 @@ main(int ac, char **av)</div><div class='ctx'> </div><div class='ctx'> 	nnote = 12 + ROUNDUP(strlen(arch) + 1) + sizeof(descr);</div><div class='ctx'> 	nnote2 = 12 + ROUNDUP(strlen(rpaname) + 1) + sizeof(rpanote);</div><div class='add'>+	rpap = NULL;</div><div class='ctx'> </div><div class='ctx'> 	n = read(fd, buf, sizeof(buf));</div><div class='ctx'> 	if (n &lt; 0) {</div><div class='hunk'>@@ -124,16 +188,19 @@ main(int ac, char **av)</div><div class='ctx'> 		exit(1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ph = GET_32BE(E_PHOFF);</div><div class='del'>-	ps = GET_16BE(E_PHENTSIZE);</div><div class='del'>-	np = GET_16BE(E_PHNUM);</div><div class='add'>+	if (ac == 3)</div><div class='add'>+		rpap = read_rpanote(av[2], &amp;nnote2);</div><div class='add'>+</div><div class='add'>+	ph = GET_32BE(buf, E_PHOFF);</div><div class='add'>+	ps = GET_16BE(buf, E_PHENTSIZE);</div><div class='add'>+	np = GET_16BE(buf, E_PHNUM);</div><div class='ctx'> 	if (ph &lt; E_HSIZE || ps &lt; PH_HSIZE || np &lt; 1)</div><div class='ctx'> 		goto notelf;</div><div class='ctx'> 	if (ph + (np + 2) * ps + nnote + nnote2 &gt; n)</div><div class='ctx'> 		goto nospace;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; np; ++i) {</div><div class='del'>-		if (GET_32BE(ph + PH_TYPE) == PT_NOTE) {</div><div class='add'>+		if (GET_32BE(buf, ph + PH_TYPE) == PT_NOTE) {</div><div class='ctx'> 			fprintf(stderr, "%s already has a note entry\n",</div><div class='ctx'> 				av[1]);</div><div class='ctx'> 			exit(0);</div><div class='hunk'>@@ -148,37 +215,42 @@ main(int ac, char **av)</div><div class='ctx'> </div><div class='ctx'> 	/* fill in the program header entry */</div><div class='ctx'> 	ns = ph + 2 * ps;</div><div class='del'>-	PUT_32BE(ph + PH_TYPE, PT_NOTE);</div><div class='del'>-	PUT_32BE(ph + PH_OFFSET, ns);</div><div class='del'>-	PUT_32BE(ph + PH_FILESZ, nnote);</div><div class='add'>+	PUT_32BE(buf, ph + PH_TYPE, PT_NOTE);</div><div class='add'>+	PUT_32BE(buf, ph + PH_OFFSET, ns);</div><div class='add'>+	PUT_32BE(buf, ph + PH_FILESZ, nnote);</div><div class='ctx'> </div><div class='ctx'> 	/* fill in the note area we point to */</div><div class='ctx'> 	/* XXX we should probably make this a proper section */</div><div class='del'>-	PUT_32BE(ns, strlen(arch) + 1);</div><div class='del'>-	PUT_32BE(ns + 4, N_DESCR * 4);</div><div class='del'>-	PUT_32BE(ns + 8, 0x1275);</div><div class='add'>+	PUT_32BE(buf, ns, strlen(arch) + 1);</div><div class='add'>+	PUT_32BE(buf, ns + 4, N_DESCR * 4);</div><div class='add'>+	PUT_32BE(buf, ns + 8, 0x1275);</div><div class='ctx'> 	strcpy((char *) &amp;buf[ns + 12], arch);</div><div class='ctx'> 	ns += 12 + strlen(arch) + 1;</div><div class='ctx'> 	for (i = 0; i &lt; N_DESCR; ++i, ns += 4)</div><div class='del'>-		PUT_32BE(ns, descr[i]);</div><div class='add'>+		PUT_32BE(buf, ns, descr[i]);</div><div class='ctx'> </div><div class='ctx'> 	/* fill in the second program header entry and the RPA note area */</div><div class='ctx'> 	ph += ps;</div><div class='del'>-	PUT_32BE(ph + PH_TYPE, PT_NOTE);</div><div class='del'>-	PUT_32BE(ph + PH_OFFSET, ns);</div><div class='del'>-	PUT_32BE(ph + PH_FILESZ, nnote2);</div><div class='add'>+	PUT_32BE(buf, ph + PH_TYPE, PT_NOTE);</div><div class='add'>+	PUT_32BE(buf, ph + PH_OFFSET, ns);</div><div class='add'>+	PUT_32BE(buf, ph + PH_FILESZ, nnote2);</div><div class='ctx'> </div><div class='ctx'> 	/* fill in the note area we point to */</div><div class='del'>-	PUT_32BE(ns, strlen(rpaname) + 1);</div><div class='del'>-	PUT_32BE(ns + 4, sizeof(rpanote));</div><div class='del'>-	PUT_32BE(ns + 8, 0x12759999);</div><div class='del'>-	strcpy((char *) &amp;buf[ns + 12], rpaname);</div><div class='del'>-	ns += 12 + ROUNDUP(strlen(rpaname) + 1);</div><div class='del'>-	for (i = 0; i &lt; N_RPA_DESCR; ++i, ns += 4)</div><div class='del'>-		PUT_32BE(ns, rpanote[i]);</div><div class='add'>+	if (rpap) {</div><div class='add'>+		/* RPA note supplied in file, just copy the whole thing over */</div><div class='add'>+		memcpy(buf + ns, rpap, nnote2);</div><div class='add'>+	} else {</div><div class='add'>+		PUT_32BE(buf, ns, strlen(rpaname) + 1);</div><div class='add'>+		PUT_32BE(buf, ns + 4, sizeof(rpanote));</div><div class='add'>+		PUT_32BE(buf, ns + 8, 0x12759999);</div><div class='add'>+		strcpy((char *) &amp;buf[ns + 12], rpaname);</div><div class='add'>+		ns += 12 + ROUNDUP(strlen(rpaname) + 1);</div><div class='add'>+		for (i = 0; i &lt; N_RPA_DESCR; ++i, ns += 4)</div><div class='add'>+			PUT_32BE(buf, ns, rpanote[i]);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Update the number of program headers */</div><div class='del'>-	PUT_16BE(E_PHNUM, np + 2);</div><div class='add'>+	PUT_16BE(buf, E_PHNUM, np + 2);</div><div class='ctx'> </div><div class='ctx'> 	/* write back */</div><div class='ctx'> 	lseek(fd, (long) 0, SEEK_SET);</div><div class='head'>diff --git a/arch/powerpc/boot/dtc-src/Makefile.dtc b/arch/powerpc/boot/dtc-src/Makefile.dtc<br/>index d607fdb8df8d..6ddf9ecac669 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dtc-src/Makefile.dtc?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/boot/dtc-src/Makefile.dtc</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dtc-src/Makefile.dtc?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dtc-src/Makefile.dtc</a></div><div class='hunk'>@@ -5,21 +5,5 @@</div><div class='ctx'> #</div><div class='ctx'> DTC_SRCS = dtc.c flattree.c fstree.c data.c livetree.c treesource.c srcpos.c \</div><div class='ctx'> 	checks.c</div><div class='del'>-DTC_EXTRA = dtc.h srcpos.h</div><div class='del'>-DTC_LEXFILES = dtc-lexer.l</div><div class='del'>-DTC_BISONFILES = dtc-parser.y</div><div class='del'>-</div><div class='del'>-DTC_LEX_SRCS = $(DTC_LEXFILES:%.l=%.lex.c)</div><div class='del'>-DTC_BISON_SRCS = $(DTC_BISONFILES:%.y=%.tab.c)</div><div class='del'>-DTC_BISON_INCLUDES = $(DTC_BISONFILES:%.y=%.tab.h)</div><div class='del'>-</div><div class='del'>-DTC_GEN_SRCS = $(DTC_LEX_SRCS) $(DTC_BISON_SRCS)</div><div class='del'>-DTC_GEN_ALL = $(DTC_GEN_SRCS) $(DTC_BISON_INCLUDES)</div><div class='add'>+DTC_GEN_SRCS = dtc-lexer.lex.c dtc-parser.tab.c</div><div class='ctx'> DTC_OBJS = $(DTC_SRCS:%.c=%.o) $(DTC_GEN_SRCS:%.c=%.o)</div><div class='del'>-</div><div class='del'>-DTC_CLEANFILES = $(DTC_GEN_ALL)</div><div class='del'>-</div><div class='del'>-# We assume the containing Makefile system can do auto-dependencies for most</div><div class='del'>-# things, but we supply the dependencies on generated header files explicitly</div><div class='del'>-</div><div class='del'>-$(addprefix $(DTC_objdir)/,$(DTC_GEN_SRCS:%.c=%.o)): $(addprefix $(DTC_objdir)/,$(DTC_BISON_INCLUDES))</div><div class='head'>diff --git a/arch/powerpc/boot/dtc-src/checks.c b/arch/powerpc/boot/dtc-src/checks.c<br/>index 2ce961cd414d..95485796f253 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dtc-src/checks.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/boot/dtc-src/checks.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dtc-src/checks.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dtc-src/checks.c</a></div><div class='hunk'>@@ -242,6 +242,42 @@ static void check_duplicate_property_names(struct check *c, struct node *dt,</div><div class='ctx'> }</div><div class='ctx'> NODE_CHECK(duplicate_property_names, NULL, ERROR);</div><div class='ctx'> </div><div class='add'>+#define LOWERCASE	"abcdefghijklmnopqrstuvwxyz"</div><div class='add'>+#define UPPERCASE	"ABCDEFGHIJKLMNOPQRSTUVWXYZ"</div><div class='add'>+#define DIGITS		"0123456789"</div><div class='add'>+#define PROPNODECHARS	LOWERCASE UPPERCASE DIGITS ",._+*#?-"</div><div class='add'>+</div><div class='add'>+static void check_node_name_chars(struct check *c, struct node *dt,</div><div class='add'>+				  struct node *node)</div><div class='add'>+{</div><div class='add'>+	int n = strspn(node-&gt;name, c-&gt;data);</div><div class='add'>+</div><div class='add'>+	if (n &lt; strlen(node-&gt;name))</div><div class='add'>+		FAIL(c, "Bad character '%c' in node %s",</div><div class='add'>+		     node-&gt;name[n], node-&gt;fullpath);</div><div class='add'>+}</div><div class='add'>+NODE_CHECK(node_name_chars, PROPNODECHARS "@", ERROR);</div><div class='add'>+</div><div class='add'>+static void check_node_name_format(struct check *c, struct node *dt,</div><div class='add'>+				   struct node *node)</div><div class='add'>+{</div><div class='add'>+	if (strchr(get_unitname(node), '@'))</div><div class='add'>+		FAIL(c, "Node %s has multiple '@' characters in name",</div><div class='add'>+		     node-&gt;fullpath);</div><div class='add'>+}</div><div class='add'>+NODE_CHECK(node_name_format, NULL, ERROR, &amp;node_name_chars);</div><div class='add'>+</div><div class='add'>+static void check_property_name_chars(struct check *c, struct node *dt,</div><div class='add'>+				      struct node *node, struct property *prop)</div><div class='add'>+{</div><div class='add'>+	int n = strspn(prop-&gt;name, c-&gt;data);</div><div class='add'>+</div><div class='add'>+	if (n &lt; strlen(prop-&gt;name))</div><div class='add'>+		FAIL(c, "Bad character '%c' in property name \"%s\", node %s",</div><div class='add'>+		     prop-&gt;name[n], prop-&gt;name, node-&gt;fullpath);</div><div class='add'>+}</div><div class='add'>+PROP_CHECK(property_name_chars, PROPNODECHARS, ERROR);</div><div class='add'>+</div><div class='ctx'> static void check_explicit_phandles(struct check *c, struct node *root,</div><div class='ctx'> 					  struct node *node)</div><div class='ctx'> {</div><div class='hunk'>@@ -280,16 +316,29 @@ NODE_CHECK(explicit_phandles, NULL, ERROR);</div><div class='ctx'> static void check_name_properties(struct check *c, struct node *root,</div><div class='ctx'> 				  struct node *node)</div><div class='ctx'> {</div><div class='del'>-	struct property *prop;</div><div class='add'>+	struct property **pp, *prop = NULL;</div><div class='add'>+</div><div class='add'>+	for (pp = &amp;node-&gt;proplist; *pp; pp = &amp;((*pp)-&gt;next))</div><div class='add'>+		if (streq((*pp)-&gt;name, "name")) {</div><div class='add'>+			prop = *pp;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	prop = get_property(node, "name");</div><div class='ctx'> 	if (!prop)</div><div class='ctx'> 		return; /* No name property, that's fine */</div><div class='ctx'> </div><div class='ctx'> 	if ((prop-&gt;val.len != node-&gt;basenamelen+1)</div><div class='del'>-	    || (memcmp(prop-&gt;val.val, node-&gt;name, node-&gt;basenamelen) != 0))</div><div class='add'>+	    || (memcmp(prop-&gt;val.val, node-&gt;name, node-&gt;basenamelen) != 0)) {</div><div class='ctx'> 		FAIL(c, "\"name\" property in %s is incorrect (\"%s\" instead"</div><div class='ctx'> 		     " of base node name)", node-&gt;fullpath, prop-&gt;val.val);</div><div class='add'>+	} else {</div><div class='add'>+		/* The name property is correct, and therefore redundant.</div><div class='add'>+		 * Delete it */</div><div class='add'>+		*pp = prop-&gt;next;</div><div class='add'>+		free(prop-&gt;name);</div><div class='add'>+		data_free(prop-&gt;val);</div><div class='add'>+		free(prop);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> CHECK_IS_STRING(name_is_string, "name", ERROR);</div><div class='ctx'> NODE_CHECK(name_properties, NULL, ERROR, &amp;name_is_string);</div><div class='hunk'>@@ -301,23 +350,23 @@ NODE_CHECK(name_properties, NULL, ERROR, &amp;name_is_string);</div><div class='ctx'> static void fixup_phandle_references(struct check *c, struct node *dt,</div><div class='ctx'> 				     struct node *node, struct property *prop)</div><div class='ctx'> {</div><div class='del'>-      struct marker *m = prop-&gt;val.markers;</div><div class='del'>-      struct node *refnode;</div><div class='del'>-      cell_t phandle;</div><div class='del'>-</div><div class='del'>-      for_each_marker_of_type(m, REF_PHANDLE) {</div><div class='del'>-	      assert(m-&gt;offset + sizeof(cell_t) &lt;= prop-&gt;val.len);</div><div class='del'>-</div><div class='del'>-	      refnode = get_node_by_ref(dt, m-&gt;ref);</div><div class='del'>-	      if (! refnode) {</div><div class='del'>-		      FAIL(c, "Reference to non-existent node or label \"%s\"\n",</div><div class='del'>-			   m-&gt;ref);</div><div class='del'>-		      continue;</div><div class='del'>-	      }</div><div class='del'>-</div><div class='del'>-	      phandle = get_node_phandle(dt, refnode);</div><div class='del'>-	      *((cell_t *)(prop-&gt;val.val + m-&gt;offset)) = cpu_to_be32(phandle);</div><div class='del'>-      }</div><div class='add'>+	struct marker *m = prop-&gt;val.markers;</div><div class='add'>+	struct node *refnode;</div><div class='add'>+	cell_t phandle;</div><div class='add'>+</div><div class='add'>+	for_each_marker_of_type(m, REF_PHANDLE) {</div><div class='add'>+		assert(m-&gt;offset + sizeof(cell_t) &lt;= prop-&gt;val.len);</div><div class='add'>+</div><div class='add'>+		refnode = get_node_by_ref(dt, m-&gt;ref);</div><div class='add'>+		if (! refnode) {</div><div class='add'>+			FAIL(c, "Reference to non-existent node or label \"%s\"\n",</div><div class='add'>+			     m-&gt;ref);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		phandle = get_node_phandle(dt, refnode);</div><div class='add'>+		*((cell_t *)(prop-&gt;val.val + m-&gt;offset)) = cpu_to_fdt32(phandle);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> CHECK(phandle_references, NULL, NULL, fixup_phandle_references, NULL, ERROR,</div><div class='ctx'>       &amp;duplicate_node_names, &amp;explicit_phandles);</div><div class='hunk'>@@ -498,6 +547,7 @@ TREE_CHECK(obsolete_chosen_interrupt_controller, NULL, WARN);</div><div class='ctx'> </div><div class='ctx'> static struct check *check_table[] = {</div><div class='ctx'> 	&amp;duplicate_node_names, &amp;duplicate_property_names,</div><div class='add'>+	&amp;node_name_chars, &amp;node_name_format, &amp;property_name_chars,</div><div class='ctx'> 	&amp;name_is_string, &amp;name_properties,</div><div class='ctx'> 	&amp;explicit_phandles,</div><div class='ctx'> 	&amp;phandle_references, &amp;path_references,</div><div class='hunk'>@@ -511,10 +561,7 @@ static struct check *check_table[] = {</div><div class='ctx'> 	&amp;obsolete_chosen_interrupt_controller,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int check_semantics(struct node *dt, int outversion, int boot_cpuid_phys);</div><div class='del'>-</div><div class='del'>-void process_checks(int force, struct boot_info *bi,</div><div class='del'>-		    int checkflag, int outversion, int boot_cpuid_phys)</div><div class='add'>+void process_checks(int force, struct boot_info *bi)</div><div class='ctx'> {</div><div class='ctx'> 	struct node *dt = bi-&gt;dt;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -537,214 +584,4 @@ void process_checks(int force, struct boot_info *bi,</div><div class='ctx'> 				"output forced\n");</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	if (checkflag) {</div><div class='del'>-		if (error) {</div><div class='del'>-			fprintf(stderr, "Warning: Skipping semantic checks due to structural errors\n");</div><div class='del'>-		} else {</div><div class='del'>-			if (!check_semantics(bi-&gt;dt, outversion,</div><div class='del'>-					     boot_cpuid_phys))</div><div class='del'>-				fprintf(stderr, "Warning: Input tree has semantic errors\n");</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Semantic check functions</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define ERRMSG(...) if (quiet &lt; 2) fprintf(stderr, "ERROR: " __VA_ARGS__)</div><div class='del'>-#define WARNMSG(...) if (quiet &lt; 1) fprintf(stderr, "Warning: " __VA_ARGS__)</div><div class='del'>-</div><div class='del'>-#define DO_ERR(...) do {ERRMSG(__VA_ARGS__); ok = 0; } while (0)</div><div class='del'>-</div><div class='del'>-#define CHECK_HAVE(node, propname) \</div><div class='del'>-	do { \</div><div class='del'>-		if (! (prop = get_property((node), (propname)))) \</div><div class='del'>-			DO_ERR("Missing \"%s\" property in %s\n", (propname), \</div><div class='del'>-				(node)-&gt;fullpath); \</div><div class='del'>-	} while (0);</div><div class='del'>-</div><div class='del'>-#define CHECK_HAVE_WARN(node, propname) \</div><div class='del'>-	do { \</div><div class='del'>-		if (! (prop  = get_property((node), (propname)))) \</div><div class='del'>-			WARNMSG("%s has no \"%s\" property\n", \</div><div class='del'>-				(node)-&gt;fullpath, (propname)); \</div><div class='del'>-	} while (0)</div><div class='del'>-</div><div class='del'>-#define CHECK_HAVE_STRING(node, propname) \</div><div class='del'>-	do { \</div><div class='del'>-		CHECK_HAVE((node), (propname)); \</div><div class='del'>-		if (prop &amp;&amp; !data_is_one_string(prop-&gt;val)) \</div><div class='del'>-			DO_ERR("\"%s\" property in %s is not a string\n", \</div><div class='del'>-				(propname), (node)-&gt;fullpath); \</div><div class='del'>-	} while (0)</div><div class='del'>-</div><div class='del'>-#define CHECK_HAVE_STREQ(node, propname, value) \</div><div class='del'>-	do { \</div><div class='del'>-		CHECK_HAVE_STRING((node), (propname)); \</div><div class='del'>-		if (prop &amp;&amp; !streq(prop-&gt;val.val, (value))) \</div><div class='del'>-			DO_ERR("%s has wrong %s, %s (should be %s\n", \</div><div class='del'>-				(node)-&gt;fullpath, (propname), \</div><div class='del'>-				prop-&gt;val.val, (value)); \</div><div class='del'>-	} while (0)</div><div class='del'>-</div><div class='del'>-#define CHECK_HAVE_ONECELL(node, propname) \</div><div class='del'>-	do { \</div><div class='del'>-		CHECK_HAVE((node), (propname)); \</div><div class='del'>-		if (prop &amp;&amp; (prop-&gt;val.len != sizeof(cell_t))) \</div><div class='del'>-			DO_ERR("\"%s\" property in %s has wrong size %d (should be 1 cell)\n", (propname), (node)-&gt;fullpath, prop-&gt;val.len); \</div><div class='del'>-	} while (0)</div><div class='del'>-</div><div class='del'>-#define CHECK_HAVE_WARN_ONECELL(node, propname) \</div><div class='del'>-	do { \</div><div class='del'>-		CHECK_HAVE_WARN((node), (propname)); \</div><div class='del'>-		if (prop &amp;&amp; (prop-&gt;val.len != sizeof(cell_t))) \</div><div class='del'>-			DO_ERR("\"%s\" property in %s has wrong size %d (should be 1 cell)\n", (propname), (node)-&gt;fullpath, prop-&gt;val.len); \</div><div class='del'>-	} while (0)</div><div class='del'>-</div><div class='del'>-#define CHECK_HAVE_WARN_PHANDLE(xnode, propname, root) \</div><div class='del'>-	do { \</div><div class='del'>-		struct node *ref; \</div><div class='del'>-		CHECK_HAVE_WARN_ONECELL((xnode), (propname)); \</div><div class='del'>-		if (prop) {\</div><div class='del'>-			cell_t phandle = propval_cell(prop); \</div><div class='del'>-			if ((phandle == 0) || (phandle == -1)) { \</div><div class='del'>-				DO_ERR("\"%s\" property in %s contains an invalid phandle %x\n", (propname), (xnode)-&gt;fullpath, phandle); \</div><div class='del'>-			} else { \</div><div class='del'>-				ref = get_node_by_phandle((root), propval_cell(prop)); \</div><div class='del'>-				if (! ref) \</div><div class='del'>-					DO_ERR("\"%s\" property in %s refers to non-existant phandle %x\n", (propname), (xnode)-&gt;fullpath, propval_cell(prop)); \</div><div class='del'>-			} \</div><div class='del'>-		} \</div><div class='del'>-	} while (0)</div><div class='del'>-</div><div class='del'>-#define CHECK_HAVE_WARN_STRING(node, propname) \</div><div class='del'>-	do { \</div><div class='del'>-		CHECK_HAVE_WARN((node), (propname)); \</div><div class='del'>-		if (prop &amp;&amp; !data_is_one_string(prop-&gt;val)) \</div><div class='del'>-			DO_ERR("\"%s\" property in %s is not a string\n", \</div><div class='del'>-				(propname), (node)-&gt;fullpath); \</div><div class='del'>-	} while (0)</div><div class='del'>-</div><div class='del'>-static int check_root(struct node *root)</div><div class='del'>-{</div><div class='del'>-	struct property *prop;</div><div class='del'>-	int ok = 1;</div><div class='del'>-</div><div class='del'>-	CHECK_HAVE_STRING(root, "model");</div><div class='del'>-	CHECK_HAVE_WARN(root, "compatible");</div><div class='del'>-</div><div class='del'>-	return ok;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int check_cpus(struct node *root, int outversion, int boot_cpuid_phys)</div><div class='del'>-{</div><div class='del'>-	struct node *cpus, *cpu;</div><div class='del'>-	struct property *prop;</div><div class='del'>-	struct node *bootcpu = NULL;</div><div class='del'>-	int ok = 1;</div><div class='del'>-</div><div class='del'>-	cpus = get_subnode(root, "cpus");</div><div class='del'>-	if (! cpus) {</div><div class='del'>-		ERRMSG("Missing /cpus node\n");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (cpus-&gt;addr_cells != 1)</div><div class='del'>-		DO_ERR("%s has bad #address-cells value %d (should be 1)\n",</div><div class='del'>-		       cpus-&gt;fullpath, cpus-&gt;addr_cells);</div><div class='del'>-	if (cpus-&gt;size_cells != 0)</div><div class='del'>-		DO_ERR("%s has bad #size-cells value %d (should be 0)\n",</div><div class='del'>-		       cpus-&gt;fullpath, cpus-&gt;size_cells);</div><div class='del'>-</div><div class='del'>-	for_each_child(cpus, cpu) {</div><div class='del'>-		CHECK_HAVE_STREQ(cpu, "device_type", "cpu");</div><div class='del'>-</div><div class='del'>-		CHECK_HAVE_ONECELL(cpu, "reg");</div><div class='del'>-		if (prop) {</div><div class='del'>-			cell_t unitnum;</div><div class='del'>-			char *eptr;</div><div class='del'>-</div><div class='del'>-			unitnum = strtol(get_unitname(cpu), &amp;eptr, 16);</div><div class='del'>-			if (*eptr) {</div><div class='del'>-				WARNMSG("%s has bad format unit name %s (should be CPU number\n",</div><div class='del'>-					cpu-&gt;fullpath, get_unitname(cpu));</div><div class='del'>-			} else if (unitnum != propval_cell(prop)) {</div><div class='del'>-				WARNMSG("%s unit name \"%s\" does not match \"reg\" property &lt;%x&gt;\n",</div><div class='del'>-				       cpu-&gt;fullpath, get_unitname(cpu),</div><div class='del'>-				       propval_cell(prop));</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-/* 		CHECK_HAVE_ONECELL(cpu, "d-cache-line-size"); */</div><div class='del'>-/* 		CHECK_HAVE_ONECELL(cpu, "i-cache-line-size"); */</div><div class='del'>-		CHECK_HAVE_ONECELL(cpu, "d-cache-size");</div><div class='del'>-		CHECK_HAVE_ONECELL(cpu, "i-cache-size");</div><div class='del'>-</div><div class='del'>-		CHECK_HAVE_WARN_ONECELL(cpu, "clock-frequency");</div><div class='del'>-		CHECK_HAVE_WARN_ONECELL(cpu, "timebase-frequency");</div><div class='del'>-</div><div class='del'>-		prop = get_property(cpu, "linux,boot-cpu");</div><div class='del'>-		if (prop) {</div><div class='del'>-			if (prop-&gt;val.len)</div><div class='del'>-				WARNMSG("\"linux,boot-cpu\" property in %s is non-empty\n",</div><div class='del'>-					cpu-&gt;fullpath);</div><div class='del'>-			if (bootcpu)</div><div class='del'>-				DO_ERR("Multiple boot cpus (%s and %s)\n",</div><div class='del'>-				       bootcpu-&gt;fullpath, cpu-&gt;fullpath);</div><div class='del'>-			else</div><div class='del'>-				bootcpu = cpu;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (outversion &lt; 2) {</div><div class='del'>-		if (! bootcpu)</div><div class='del'>-			WARNMSG("No cpu has \"linux,boot-cpu\" property\n");</div><div class='del'>-	} else {</div><div class='del'>-		if (bootcpu)</div><div class='del'>-			WARNMSG("\"linux,boot-cpu\" property is deprecated in blob version 2 or higher\n");</div><div class='del'>-		if (boot_cpuid_phys == 0xfeedbeef)</div><div class='del'>-			WARNMSG("physical boot CPU not set.  Use -b option to set\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ok;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int check_memory(struct node *root)</div><div class='del'>-{</div><div class='del'>-	struct node *mem;</div><div class='del'>-	struct property *prop;</div><div class='del'>-	int nnodes = 0;</div><div class='del'>-	int ok = 1;</div><div class='del'>-</div><div class='del'>-	for_each_child(root, mem) {</div><div class='del'>-		if (! strneq(mem-&gt;name, "memory", mem-&gt;basenamelen))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		nnodes++;</div><div class='del'>-</div><div class='del'>-		CHECK_HAVE_STREQ(mem, "device_type", "memory");</div><div class='del'>-		CHECK_HAVE(mem, "reg");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (nnodes == 0) {</div><div class='del'>-		ERRMSG("No memory nodes\n");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ok;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int check_semantics(struct node *dt, int outversion, int boot_cpuid_phys)</div><div class='del'>-{</div><div class='del'>-	int ok = 1;</div><div class='del'>-</div><div class='del'>-	ok = ok &amp;&amp; check_root(dt);</div><div class='del'>-	ok = ok &amp;&amp; check_cpus(dt, outversion, boot_cpuid_phys);</div><div class='del'>-	ok = ok &amp;&amp; check_memory(dt);</div><div class='del'>-	if (! ok)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/boot/dtc-src/data.c b/arch/powerpc/boot/dtc-src/data.c<br/>index a94718c731a9..dd2e3d39d4c1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dtc-src/data.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/boot/dtc-src/data.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dtc-src/data.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dtc-src/data.c</a></div><div class='hunk'>@@ -32,8 +32,6 @@ void data_free(struct data d)</div><div class='ctx'> 		m = nm;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	assert(!d.val || d.asize);</div><div class='del'>-</div><div class='ctx'> 	if (d.val)</div><div class='ctx'> 		free(d.val);</div><div class='ctx'> }</div><div class='hunk'>@@ -43,9 +41,6 @@ struct data data_grow_for(struct data d, int xlen)</div><div class='ctx'> 	struct data nd;</div><div class='ctx'> 	int newsize;</div><div class='ctx'> </div><div class='del'>-	/* we must start with an allocated datum */</div><div class='del'>-	assert(!d.val || d.asize);</div><div class='del'>-</div><div class='ctx'> 	if (xlen == 0)</div><div class='ctx'> 		return d;</div><div class='ctx'> </div><div class='hunk'>@@ -56,11 +51,8 @@ struct data data_grow_for(struct data d, int xlen)</div><div class='ctx'> 	while ((d.len + xlen) &gt; newsize)</div><div class='ctx'> 		newsize *= 2;</div><div class='ctx'> </div><div class='del'>-	nd.asize = newsize;</div><div class='ctx'> 	nd.val = xrealloc(d.val, newsize);</div><div class='ctx'> </div><div class='del'>-	assert(nd.asize &gt;= (d.len + xlen));</div><div class='del'>-</div><div class='ctx'> 	return nd;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -83,16 +75,11 @@ static char get_oct_char(const char *s, int *i)</div><div class='ctx'> 	long val;</div><div class='ctx'> </div><div class='ctx'> 	x[3] = '\0';</div><div class='del'>-	x[0] = s[(*i)];</div><div class='del'>-	if (x[0]) {</div><div class='del'>-		x[1] = s[(*i)+1];</div><div class='del'>-		if (x[1])</div><div class='del'>-			x[2] = s[(*i)+2];</div><div class='del'>-	}</div><div class='add'>+	strncpy(x, s + *i, 3);</div><div class='ctx'> </div><div class='ctx'> 	val = strtol(x, &amp;endx, 8);</div><div class='del'>-	if ((endx - x) == 0)</div><div class='del'>-		fprintf(stderr, "Empty \\nnn escape\n");</div><div class='add'>+</div><div class='add'>+	assert(endx &gt; x);</div><div class='ctx'> </div><div class='ctx'> 	(*i) += endx - x;</div><div class='ctx'> 	return val;</div><div class='hunk'>@@ -105,13 +92,11 @@ static char get_hex_char(const char *s, int *i)</div><div class='ctx'> 	long val;</div><div class='ctx'> </div><div class='ctx'> 	x[2] = '\0';</div><div class='del'>-	x[0] = s[(*i)];</div><div class='del'>-	if (x[0])</div><div class='del'>-		x[1] = s[(*i)+1];</div><div class='add'>+	strncpy(x, s + *i, 2);</div><div class='ctx'> </div><div class='ctx'> 	val = strtol(x, &amp;endx, 16);</div><div class='del'>-	if ((endx - x) == 0)</div><div class='del'>-		fprintf(stderr, "Empty \\x escape\n");</div><div class='add'>+	if (!(endx  &gt; x))</div><div class='add'>+		die("\\x used with no following hex digits\n");</div><div class='ctx'> </div><div class='ctx'> 	(*i) += endx - x;</div><div class='ctx'> 	return val;</div><div class='hunk'>@@ -182,14 +167,29 @@ struct data data_copy_escape_string(const char *s, int len)</div><div class='ctx'> 	return d;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct data data_copy_file(FILE *f, size_t len)</div><div class='add'>+struct data data_copy_file(FILE *f, size_t maxlen)</div><div class='ctx'> {</div><div class='del'>-	struct data d;</div><div class='add'>+	struct data d = empty_data;</div><div class='ctx'> </div><div class='del'>-	d = data_grow_for(empty_data, len);</div><div class='add'>+	while (!feof(f) &amp;&amp; (d.len &lt; maxlen)) {</div><div class='add'>+		size_t chunksize, ret;</div><div class='ctx'> </div><div class='del'>-	d.len = len;</div><div class='del'>-	fread(d.val, len, 1, f);</div><div class='add'>+		if (maxlen == -1)</div><div class='add'>+			chunksize = 4096;</div><div class='add'>+		else</div><div class='add'>+			chunksize = maxlen - d.len;</div><div class='add'>+</div><div class='add'>+		d = data_grow_for(d, chunksize);</div><div class='add'>+		ret = fread(d.val + d.len, 1, chunksize, f);</div><div class='add'>+</div><div class='add'>+		if (ferror(f))</div><div class='add'>+			die("Error reading file into data: %s", strerror(errno));</div><div class='add'>+</div><div class='add'>+		if (d.len + ret &lt; d.len)</div><div class='add'>+			die("Overflow reading file into data\n");</div><div class='add'>+</div><div class='add'>+		d.len += ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return d;</div><div class='ctx'> }</div><div class='hunk'>@@ -247,7 +247,7 @@ struct data data_merge(struct data d1, struct data d2)</div><div class='ctx'> </div><div class='ctx'> struct data data_append_cell(struct data d, cell_t word)</div><div class='ctx'> {</div><div class='del'>-	cell_t beword = cpu_to_be32(word);</div><div class='add'>+	cell_t beword = cpu_to_fdt32(word);</div><div class='ctx'> </div><div class='ctx'> 	return data_append_data(d, &amp;beword, sizeof(beword));</div><div class='ctx'> }</div><div class='hunk'>@@ -256,15 +256,15 @@ struct data data_append_re(struct data d, const struct fdt_reserve_entry *re)</div><div class='ctx'> {</div><div class='ctx'> 	struct fdt_reserve_entry bere;</div><div class='ctx'> </div><div class='del'>-	bere.address = cpu_to_be64(re-&gt;address);</div><div class='del'>-	bere.size = cpu_to_be64(re-&gt;size);</div><div class='add'>+	bere.address = cpu_to_fdt64(re-&gt;address);</div><div class='add'>+	bere.size = cpu_to_fdt64(re-&gt;size);</div><div class='ctx'> </div><div class='ctx'> 	return data_append_data(d, &amp;bere, sizeof(bere));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct data data_append_addr(struct data d, u64 addr)</div><div class='add'>+struct data data_append_addr(struct data d, uint64_t addr)</div><div class='ctx'> {</div><div class='del'>-	u64 beaddr = cpu_to_be64(addr);</div><div class='add'>+	uint64_t beaddr = cpu_to_fdt64(addr);</div><div class='ctx'> </div><div class='ctx'> 	return data_append_data(d, &amp;beaddr, sizeof(beaddr));</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/boot/dtc-src/dtc-lexer.l b/arch/powerpc/boot/dtc-src/dtc-lexer.l<br/>index c811b221b31e..44dbfd3f0976 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dtc-src/dtc-lexer.l?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/boot/dtc-src/dtc-lexer.l</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dtc-src/dtc-lexer.l?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dtc-src/dtc-lexer.l</a></div><div class='hunk'>@@ -28,6 +28,10 @@</div><div class='ctx'> PROPNODECHAR	[a-zA-Z0-9,._+*#?@-]</div><div class='ctx'> PATHCHAR	({PROPNODECHAR}|[/])</div><div class='ctx'> LABEL		[a-zA-Z_][a-zA-Z0-9_]*</div><div class='add'>+STRING		\"([^\\"]|\\.)*\"</div><div class='add'>+WS		[[:space:]]</div><div class='add'>+COMMENT		"/*"([^*]|\*+[^*/])*\*+"/"</div><div class='add'>+LINECOMMENT	"//".*\n</div><div class='ctx'> </div><div class='ctx'> %{</div><div class='ctx'> #include "dtc.h"</div><div class='hunk'>@@ -52,29 +56,26 @@ static int dts_version; /* = 0 */</div><div class='ctx'> 				DPRINT("&lt;V1&gt;\n"); \</div><div class='ctx'> 				BEGIN(V1); \</div><div class='ctx'> 			}</div><div class='add'>+</div><div class='add'>+static void push_input_file(const char *filename);</div><div class='add'>+static int pop_input_file(void);</div><div class='ctx'> %}</div><div class='ctx'> </div><div class='ctx'> %%</div><div class='del'>-&lt;*&gt;"/include/"		BEGIN(INCLUDE);</div><div class='del'>-</div><div class='del'>-&lt;INCLUDE&gt;\"[^"\n]*\"	{</div><div class='del'>-			yytext[strlen(yytext) - 1] = 0;</div><div class='del'>-			if (!push_input_file(yytext + 1)) {</div><div class='del'>-				/* Some unrecoverable error.*/</div><div class='del'>-				exit(1);</div><div class='del'>-			}</div><div class='del'>-			BEGIN_DEFAULT();</div><div class='add'>+&lt;*&gt;"/include/"{WS}*{STRING} {</div><div class='add'>+			char *name = strchr(yytext, '\"') + 1;</div><div class='add'>+			yytext[yyleng-1] = '\0';</div><div class='add'>+			push_input_file(name);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> &lt;*&gt;&lt;&lt;EOF&gt;&gt;		{</div><div class='ctx'> 			if (!pop_input_file()) {</div><div class='ctx'> 				yyterminate();</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-&lt;*&gt;\"([^\\"]|\\.)*\"	{</div><div class='del'>-			yylloc.filenum = srcpos_filenum;</div><div class='add'>+&lt;*&gt;{STRING}	{</div><div class='add'>+			yylloc.file = srcpos_file;</div><div class='ctx'> 			yylloc.first_line = yylineno;</div><div class='ctx'> 			DPRINT("String: %s\n", yytext);</div><div class='ctx'> 			yylval.data = data_copy_escape_string(yytext+1,</div><div class='hunk'>@@ -84,7 +85,7 @@ static int dts_version; /* = 0 */</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> &lt;*&gt;"/dts-v1/"	{</div><div class='del'>-			yylloc.filenum = srcpos_filenum;</div><div class='add'>+			yylloc.file = srcpos_file;</div><div class='ctx'> 			yylloc.first_line = yylineno;</div><div class='ctx'> 			DPRINT("Keyword: /dts-v1/\n");</div><div class='ctx'> 			dts_version = 1;</div><div class='hunk'>@@ -93,7 +94,7 @@ static int dts_version; /* = 0 */</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> &lt;*&gt;"/memreserve/"	{</div><div class='del'>-			yylloc.filenum = srcpos_filenum;</div><div class='add'>+			yylloc.file = srcpos_file;</div><div class='ctx'> 			yylloc.first_line = yylineno;</div><div class='ctx'> 			DPRINT("Keyword: /memreserve/\n");</div><div class='ctx'> 			BEGIN_DEFAULT();</div><div class='hunk'>@@ -101,7 +102,7 @@ static int dts_version; /* = 0 */</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> &lt;*&gt;{LABEL}:	{</div><div class='del'>-			yylloc.filenum = srcpos_filenum;</div><div class='add'>+			yylloc.file = srcpos_file;</div><div class='ctx'> 			yylloc.first_line = yylineno;</div><div class='ctx'> 			DPRINT("Label: %s\n", yytext);</div><div class='ctx'> 			yylval.labelref = strdup(yytext);</div><div class='hunk'>@@ -110,7 +111,7 @@ static int dts_version; /* = 0 */</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> &lt;INITIAL&gt;[bodh]# {</div><div class='del'>-			yylloc.filenum = srcpos_filenum;</div><div class='add'>+			yylloc.file = srcpos_file;</div><div class='ctx'> 			yylloc.first_line = yylineno;</div><div class='ctx'> 			if (*yytext == 'b')</div><div class='ctx'> 				yylval.cbase = 2;</div><div class='hunk'>@@ -125,7 +126,7 @@ static int dts_version; /* = 0 */</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> &lt;INITIAL&gt;[0-9a-fA-F]+	{</div><div class='del'>-			yylloc.filenum = srcpos_filenum;</div><div class='add'>+			yylloc.file = srcpos_file;</div><div class='ctx'> 			yylloc.first_line = yylineno;</div><div class='ctx'> 			yylval.literal = strdup(yytext);</div><div class='ctx'> 			DPRINT("Literal: '%s'\n", yylval.literal);</div><div class='hunk'>@@ -133,7 +134,7 @@ static int dts_version; /* = 0 */</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> &lt;V1&gt;[0-9]+|0[xX][0-9a-fA-F]+      {</div><div class='del'>-			yylloc.filenum = srcpos_filenum;</div><div class='add'>+			yylloc.file = srcpos_file;</div><div class='ctx'> 			yylloc.first_line = yylineno;</div><div class='ctx'> 			yylval.literal = strdup(yytext);</div><div class='ctx'> 			DPRINT("Literal: '%s'\n", yylval.literal);</div><div class='hunk'>@@ -141,7 +142,7 @@ static int dts_version; /* = 0 */</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> \&amp;{LABEL}	{	/* label reference */</div><div class='del'>-			yylloc.filenum = srcpos_filenum;</div><div class='add'>+			yylloc.file = srcpos_file;</div><div class='ctx'> 			yylloc.first_line = yylineno;</div><div class='ctx'> 			DPRINT("Ref: %s\n", yytext+1);</div><div class='ctx'> 			yylval.labelref = strdup(yytext+1);</div><div class='hunk'>@@ -149,7 +150,7 @@ static int dts_version; /* = 0 */</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> "&amp;{/"{PATHCHAR}+\}	{	/* new-style path reference */</div><div class='del'>-			yylloc.filenum = srcpos_filenum;</div><div class='add'>+			yylloc.file = srcpos_file;</div><div class='ctx'> 			yylloc.first_line = yylineno;</div><div class='ctx'> 			yytext[yyleng-1] = '\0';</div><div class='ctx'> 			DPRINT("Ref: %s\n", yytext+2);</div><div class='hunk'>@@ -158,7 +159,7 @@ static int dts_version; /* = 0 */</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> &lt;INITIAL&gt;"&amp;/"{PATHCHAR}+ {	/* old-style path reference */</div><div class='del'>-			yylloc.filenum = srcpos_filenum;</div><div class='add'>+			yylloc.file = srcpos_file;</div><div class='ctx'> 			yylloc.first_line = yylineno;</div><div class='ctx'> 			DPRINT("Ref: %s\n", yytext+1);</div><div class='ctx'> 			yylval.labelref = strdup(yytext+1);</div><div class='hunk'>@@ -166,7 +167,7 @@ static int dts_version; /* = 0 */</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> &lt;BYTESTRING&gt;[0-9a-fA-F]{2} {</div><div class='del'>-			yylloc.filenum = srcpos_filenum;</div><div class='add'>+			yylloc.file = srcpos_file;</div><div class='ctx'> 			yylloc.first_line = yylineno;</div><div class='ctx'> 			yylval.byte = strtol(yytext, NULL, 16);</div><div class='ctx'> 			DPRINT("Byte: %02x\n", (int)yylval.byte);</div><div class='hunk'>@@ -174,7 +175,7 @@ static int dts_version; /* = 0 */</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> &lt;BYTESTRING&gt;"]"	{</div><div class='del'>-			yylloc.filenum = srcpos_filenum;</div><div class='add'>+			yylloc.file = srcpos_file;</div><div class='ctx'> 			yylloc.first_line = yylineno;</div><div class='ctx'> 			DPRINT("/BYTESTRING\n");</div><div class='ctx'> 			BEGIN_DEFAULT();</div><div class='hunk'>@@ -182,7 +183,7 @@ static int dts_version; /* = 0 */</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> &lt;PROPNODENAME&gt;{PROPNODECHAR}+ {</div><div class='del'>-			yylloc.filenum = srcpos_filenum;</div><div class='add'>+			yylloc.file = srcpos_file;</div><div class='ctx'> 			yylloc.first_line = yylineno;</div><div class='ctx'> 			DPRINT("PropNodeName: %s\n", yytext);</div><div class='ctx'> 			yylval.propnodename = strdup(yytext);</div><div class='hunk'>@@ -190,20 +191,19 @@ static int dts_version; /* = 0 */</div><div class='ctx'> 			return DT_PROPNODENAME;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-&lt;*&gt;[[:space:]]+	/* eat whitespace */</div><div class='del'>-</div><div class='del'>-&lt;*&gt;"/*"([^*]|\*+[^*/])*\*+"/"	{</div><div class='del'>-			yylloc.filenum = srcpos_filenum;</div><div class='add'>+"/incbin/"	{</div><div class='add'>+			yylloc.file = srcpos_file;</div><div class='ctx'> 			yylloc.first_line = yylineno;</div><div class='del'>-			DPRINT("Comment: %s\n", yytext);</div><div class='del'>-			/* eat comments */</div><div class='add'>+			DPRINT("Binary Include\n");</div><div class='add'>+			return DT_INCBIN;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-&lt;*&gt;"//".*\n	/* eat line comments */</div><div class='add'>+&lt;*&gt;{WS}+	/* eat whitespace */</div><div class='add'>+&lt;*&gt;{COMMENT}+	/* eat C-style comments */</div><div class='add'>+&lt;*&gt;{LINECOMMENT}+ /* eat C++-style comments */</div><div class='ctx'> </div><div class='ctx'> &lt;*&gt;.		{</div><div class='del'>-			yylloc.filenum = srcpos_filenum;</div><div class='add'>+			yylloc.file = srcpos_file;</div><div class='ctx'> 			yylloc.first_line = yylineno;</div><div class='ctx'> 			DPRINT("Char: %c (\\x%02x)\n", yytext[0],</div><div class='ctx'> 				(unsigned)yytext[0]);</div><div class='hunk'>@@ -227,14 +227,13 @@ static int dts_version; /* = 0 */</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> struct incl_file {</div><div class='del'>-	int filenum;</div><div class='del'>-	FILE *file;</div><div class='add'>+	struct dtc_file *file;</div><div class='ctx'> 	YY_BUFFER_STATE yy_prev_buf;</div><div class='ctx'> 	int yy_prev_lineno;</div><div class='ctx'> 	struct incl_file *prev;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct incl_file *incl_file_stack;</div><div class='add'>+static struct incl_file *incl_file_stack;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -245,36 +244,34 @@ struct incl_file *incl_file_stack;</div><div class='ctx'> static int incl_depth = 0;</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-int push_input_file(const char *filename)</div><div class='add'>+static void push_input_file(const char *filename)</div><div class='ctx'> {</div><div class='del'>-	FILE *f;</div><div class='ctx'> 	struct incl_file *incl_file;</div><div class='add'>+	struct dtc_file *newfile;</div><div class='add'>+	struct search_path search, *searchptr = NULL;</div><div class='ctx'> </div><div class='del'>-	if (!filename) {</div><div class='del'>-		yyerror("No include file name given.");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='add'>+	assert(filename);</div><div class='ctx'> </div><div class='del'>-	if (incl_depth++ &gt;= MAX_INCLUDE_DEPTH) {</div><div class='del'>-		yyerror("Includes nested too deeply");</div><div class='del'>-		return 0;</div><div class='add'>+	if (incl_depth++ &gt;= MAX_INCLUDE_DEPTH)</div><div class='add'>+		die("Includes nested too deeply");</div><div class='add'>+</div><div class='add'>+	if (srcpos_file) {</div><div class='add'>+		search.dir = srcpos_file-&gt;dir;</div><div class='add'>+		search.next = NULL;</div><div class='add'>+		search.prev = NULL;</div><div class='add'>+		searchptr = &amp;search;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	f = dtc_open_file(filename);</div><div class='add'>+	newfile = dtc_open_file(filename, searchptr);</div><div class='ctx'> </div><div class='del'>-	incl_file = malloc(sizeof(struct incl_file));</div><div class='del'>-	if (!incl_file) {</div><div class='del'>-		yyerror("Can not allocate include file space.");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='add'>+	incl_file = xmalloc(sizeof(struct incl_file));</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Save current context.</div><div class='ctx'> 	 */</div><div class='ctx'> 	incl_file-&gt;yy_prev_buf = YY_CURRENT_BUFFER;</div><div class='ctx'> 	incl_file-&gt;yy_prev_lineno = yylineno;</div><div class='del'>-	incl_file-&gt;filenum = srcpos_filenum;</div><div class='del'>-	incl_file-&gt;file = yyin;</div><div class='add'>+	incl_file-&gt;file = srcpos_file;</div><div class='ctx'> 	incl_file-&gt;prev = incl_file_stack;</div><div class='ctx'> </div><div class='ctx'> 	incl_file_stack = incl_file;</div><div class='hunk'>@@ -282,23 +279,21 @@ int push_input_file(const char *filename)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Establish new context.</div><div class='ctx'> 	 */</div><div class='del'>-	srcpos_filenum = lookup_file_name(filename, 0);</div><div class='add'>+	srcpos_file = newfile;</div><div class='ctx'> 	yylineno = 1;</div><div class='del'>-	yyin = f;</div><div class='add'>+	yyin = newfile-&gt;file;</div><div class='ctx'> 	yy_switch_to_buffer(yy_create_buffer(yyin, YY_BUF_SIZE));</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-int pop_input_file(void)</div><div class='add'>+static int pop_input_file(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct incl_file *incl_file;</div><div class='ctx'> </div><div class='ctx'> 	if (incl_file_stack == 0)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	fclose(yyin);</div><div class='add'>+	dtc_close_file(srcpos_file);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Pop.</div><div class='hunk'>@@ -313,16 +308,13 @@ int pop_input_file(void)</div><div class='ctx'> 	yy_delete_buffer(YY_CURRENT_BUFFER);</div><div class='ctx'> 	yy_switch_to_buffer(incl_file-&gt;yy_prev_buf);</div><div class='ctx'> 	yylineno = incl_file-&gt;yy_prev_lineno;</div><div class='del'>-	srcpos_filenum = incl_file-&gt;filenum;</div><div class='del'>-	yyin = incl_file-&gt;file;</div><div class='add'>+	srcpos_file = incl_file-&gt;file;</div><div class='add'>+	yyin = incl_file-&gt;file ? incl_file-&gt;file-&gt;file : NULL;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Free old state.</div><div class='ctx'> 	 */</div><div class='ctx'> 	free(incl_file);</div><div class='ctx'> </div><div class='del'>-	if (YY_CURRENT_BUFFER == 0)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/boot/dtc-src/dtc-lexer.lex.c_shipped b/arch/powerpc/boot/dtc-src/dtc-lexer.lex.c_shipped<br/>index d0f742460f92..ac392cb040f6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dtc-src/dtc-lexer.lex.c_shipped?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/boot/dtc-src/dtc-lexer.lex.c_shipped</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dtc-src/dtc-lexer.lex.c_shipped?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dtc-src/dtc-lexer.lex.c_shipped</a></div><div class='hunk'>@@ -9,7 +9,7 @@</div><div class='ctx'> #define FLEX_SCANNER</div><div class='ctx'> #define YY_FLEX_MAJOR_VERSION 2</div><div class='ctx'> #define YY_FLEX_MINOR_VERSION 5</div><div class='del'>-#define YY_FLEX_SUBMINOR_VERSION 33</div><div class='add'>+#define YY_FLEX_SUBMINOR_VERSION 34</div><div class='ctx'> #if YY_FLEX_SUBMINOR_VERSION &gt; 0</div><div class='ctx'> #define FLEX_BETA</div><div class='ctx'> #endif</div><div class='hunk'>@@ -31,7 +31,7 @@</div><div class='ctx'> </div><div class='ctx'> /* C99 systems have &lt;inttypes.h&gt;. Non-C99 systems may or may not. */</div><div class='ctx'> </div><div class='del'>-#if __STDC_VERSION__ &gt;= 199901L</div><div class='add'>+#if defined (__STDC_VERSION__) &amp;&amp; __STDC_VERSION__ &gt;= 199901L</div><div class='ctx'> </div><div class='ctx'> /* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,</div><div class='ctx'>  * if you want the limit (max/min) macros for int types. </div><div class='hunk'>@@ -94,11 +94,12 @@ typedef unsigned int flex_uint32_t;</div><div class='ctx'> </div><div class='ctx'> #else	/* ! __cplusplus */</div><div class='ctx'> </div><div class='del'>-#if __STDC__</div><div class='add'>+/* C99 requires __STDC__ to be defined as 1. */</div><div class='add'>+#if defined (__STDC__)</div><div class='ctx'> </div><div class='ctx'> #define YY_USE_CONST</div><div class='ctx'> </div><div class='del'>-#endif	/* __STDC__ */</div><div class='add'>+#endif	/* defined (__STDC__) */</div><div class='ctx'> #endif	/* ! __cplusplus */</div><div class='ctx'> </div><div class='ctx'> #ifdef YY_USE_CONST</div><div class='hunk'>@@ -194,11 +195,13 @@ extern FILE *yyin, *yyout;</div><div class='ctx'> /* The following is because we cannot portably get our hands on size_t</div><div class='ctx'>  * (without autoconf's help, which isn't available because we want</div><div class='ctx'>  * flex-generated scanners to compile on their own).</div><div class='add'>+ * Given that the standard has decreed that size_t exists since 1989,</div><div class='add'>+ * I guess we can afford to depend on it. Manoj.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef YY_TYPEDEF_YY_SIZE_T</div><div class='ctx'> #define YY_TYPEDEF_YY_SIZE_T</div><div class='del'>-typedef unsigned int yy_size_t;</div><div class='add'>+typedef size_t yy_size_t;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifndef YY_STRUCT_YY_BUFFER_STATE</div><div class='hunk'>@@ -349,7 +352,7 @@ void yyfree (void *  );</div><div class='ctx'> </div><div class='ctx'> /* Begin user sect3 */</div><div class='ctx'> </div><div class='del'>-#define yywrap() 1</div><div class='add'>+#define yywrap(n) 1</div><div class='ctx'> #define YY_SKIP_YYWRAP</div><div class='ctx'> </div><div class='ctx'> typedef unsigned char YY_CHAR;</div><div class='hunk'>@@ -389,19 +392,20 @@ struct yy_trans_info</div><div class='ctx'> 	flex_int32_t yy_verify;</div><div class='ctx'> 	flex_int32_t yy_nxt;</div><div class='ctx'> 	};</div><div class='del'>-static yyconst flex_int16_t yy_accept[94] =</div><div class='add'>+static yyconst flex_int16_t yy_accept[104] =</div><div class='ctx'>     {   0,</div><div class='ctx'>         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,</div><div class='del'>-       21,   19,   16,   16,   19,   19,   19,    8,    8,   19,</div><div class='del'>-        8,   19,   19,   19,   19,   14,   15,   15,   19,    9,</div><div class='del'>-        9,   16,    0,    3,    0,    0,   10,    0,    0,    0,</div><div class='del'>-        0,    0,    0,    8,    8,    6,    0,    7,    0,    2,</div><div class='del'>-        0,   13,   13,   15,   15,    9,    0,   12,   10,    0,</div><div class='del'>-        0,    0,    0,   18,    0,    0,    0,    2,    9,    0,</div><div class='del'>-       17,    0,    0,    0,   11,    0,    0,    0,    0,    0,</div><div class='del'>-        0,    0,    0,    0,    4,    0,    0,    1,    0,    0,</div><div class='del'>-        0,    5,    0</div><div class='del'>-</div><div class='add'>+       21,   19,   16,   16,   19,   19,   19,    7,    7,   19,</div><div class='add'>+        7,   19,   19,   19,   19,   13,   14,   14,   19,    8,</div><div class='add'>+        8,   16,    0,    2,    0,    0,    9,    0,    0,    0,</div><div class='add'>+        0,    0,    0,    7,    7,    5,    0,    6,    0,   12,</div><div class='add'>+       12,   14,   14,    8,    0,   11,    9,    0,    0,    0,</div><div class='add'>+        0,   18,    0,    0,    0,    0,    8,    0,   17,    0,</div><div class='add'>+        0,    0,    0,    0,   10,    0,    0,    0,    0,    0,</div><div class='add'>+        0,    0,    0,    0,    0,    0,    0,    0,    3,   15,</div><div class='add'>+        0,    0,    0,    0,    0,    0,    0,    0,    1,    0,</div><div class='add'>+</div><div class='add'>+        0,    4,    0</div><div class='ctx'>     } ;</div><div class='ctx'> </div><div class='ctx'> static yyconst flex_int32_t yy_ec[256] =</div><div class='hunk'>@@ -444,122 +448,126 @@ static yyconst flex_int32_t yy_meta[36] =</div><div class='ctx'>         7,    7,    7,    8,    1</div><div class='ctx'>     } ;</div><div class='ctx'> </div><div class='del'>-static yyconst flex_int16_t yy_base[107] =</div><div class='add'>+static yyconst flex_int16_t yy_base[117] =</div><div class='ctx'>     {   0,</div><div class='del'>-        0,    0,   32,    0,   53,    0,   76,    0,  108,  111,</div><div class='del'>-      280,  288,   37,   39,   33,   36,  106,    0,  123,  146,</div><div class='del'>-      255,  251,   45,    0,  159,  288,    0,   53,  108,  172,</div><div class='del'>-      114,  127,  158,  288,  245,    0,    0,  234,  235,  236,</div><div class='del'>-      197,  195,  199,    0,    0,  288,    0,  288,  160,  288,</div><div class='del'>-      183,  288,    0,    0,  183,  182,    0,    0,    0,    0,</div><div class='del'>-      204,  189,  207,  288,  179,  187,  180,  194,    0,  171,</div><div class='del'>-      288,  196,  178,  174,  288,  169,  169,  177,  165,  153,</div><div class='del'>-      143,  155,  137,  118,  288,  122,   42,  288,   36,   36,</div><div class='del'>-       40,  288,  288,  212,  218,  223,  229,  234,  239,  245,</div><div class='del'>-</div><div class='del'>-      251,  255,  262,  270,  275,  280</div><div class='add'>+        0,    0,   30,    0,   44,    0,   67,    0,   97,  105,</div><div class='add'>+      302,  303,   35,   44,   40,   94,  112,    0,  129,  152,</div><div class='add'>+      296,  295,  159,    0,  176,  303,    0,  116,   95,  165,</div><div class='add'>+       49,   46,  102,  303,  296,    0,    0,  288,  290,  293,</div><div class='add'>+      264,  266,  270,    0,    0,  303,    0,  303,  264,  303,</div><div class='add'>+        0,    0,  195,  101,    0,    0,    0,    0,  284,  125,</div><div class='add'>+      277,  265,  225,  230,  216,  218,    0,  202,  224,  221,</div><div class='add'>+      217,  107,  196,  188,  303,  206,  179,  186,  178,  185,</div><div class='add'>+      183,  162,  161,  150,  169,  160,  145,  125,  303,  303,</div><div class='add'>+      137,  109,  190,  103,  203,  167,  108,  197,  303,  123,</div><div class='add'>+</div><div class='add'>+       29,  303,  303,  215,  221,  226,  229,  234,  240,  246,</div><div class='add'>+      250,  257,  265,  270,  275,  282</div><div class='ctx'>     } ;</div><div class='ctx'> </div><div class='del'>-static yyconst flex_int16_t yy_def[107] =</div><div class='add'>+static yyconst flex_int16_t yy_def[117] =</div><div class='ctx'>     {   0,</div><div class='del'>-       93,    1,    1,    3,    3,    5,   93,    7,    3,    3,</div><div class='del'>-       93,   93,   93,   93,   94,   95,   93,   96,   93,   19,</div><div class='del'>-       19,   20,   97,   98,   20,   93,   99,  100,   95,   93,</div><div class='del'>-       93,   93,   94,   93,   94,  101,  102,   93,  103,  104,</div><div class='del'>-       93,   93,   93,   96,   19,   93,   20,   93,   97,   93,</div><div class='del'>-       97,   93,   20,   99,  100,   93,  105,  101,  102,  106,</div><div class='del'>-      103,  103,  104,   93,   93,   93,   93,   94,  105,  106,</div><div class='del'>-       93,   93,   93,   93,   93,   93,   93,   93,   93,   93,</div><div class='del'>-       93,   93,   93,   93,   93,   93,   93,   93,   93,   93,</div><div class='del'>-       93,   93,    0,   93,   93,   93,   93,   93,   93,   93,</div><div class='del'>-</div><div class='del'>-       93,   93,   93,   93,   93,   93</div><div class='add'>+      103,    1,    1,    3,    3,    5,  103,    7,    3,    3,</div><div class='add'>+      103,  103,  103,  103,  104,  105,  103,  106,  103,   19,</div><div class='add'>+       19,   20,  103,  107,   20,  103,  108,  109,  105,  103,</div><div class='add'>+      103,  103,  104,  103,  104,  110,  111,  103,  112,  113,</div><div class='add'>+      103,  103,  103,  106,   19,  103,   20,  103,  103,  103,</div><div class='add'>+       20,  108,  109,  103,  114,  110,  111,  115,  112,  112,</div><div class='add'>+      113,  103,  103,  103,  103,  103,  114,  115,  103,  103,</div><div class='add'>+      103,  103,  103,  103,  103,  103,  103,  103,  103,  103,</div><div class='add'>+      103,  103,  103,  103,  103,  103,  103,  103,  103,  103,</div><div class='add'>+      103,  103,  103,  103,  103,  116,  103,  116,  103,  116,</div><div class='add'>+</div><div class='add'>+      103,  103,    0,  103,  103,  103,  103,  103,  103,  103,</div><div class='add'>+      103,  103,  103,  103,  103,  103</div><div class='ctx'>     } ;</div><div class='ctx'> </div><div class='del'>-static yyconst flex_int16_t yy_nxt[324] =</div><div class='add'>+static yyconst flex_int16_t yy_nxt[339] =</div><div class='ctx'>     {   0,</div><div class='ctx'>        12,   13,   14,   15,   12,   16,   12,   12,   12,   17,</div><div class='ctx'>        18,   18,   18,   12,   19,   20,   20,   12,   12,   21,</div><div class='ctx'>        19,   21,   19,   22,   20,   20,   20,   20,   20,   20,</div><div class='del'>-       20,   20,   20,   12,   12,   23,   34,   12,   32,   32,</div><div class='del'>-       32,   32,   12,   12,   12,   36,   20,   33,   50,   92,</div><div class='del'>-       35,   20,   20,   20,   20,   20,   15,   54,   91,   54,</div><div class='del'>-       54,   54,   51,   24,   24,   24,   46,   25,   90,   38,</div><div class='del'>-       89,   26,   25,   25,   25,   25,   12,   13,   14,   15,</div><div class='del'>-       27,   12,   27,   27,   27,   17,   27,   27,   27,   12,</div><div class='del'>-       28,   28,   28,   12,   12,   28,   28,   28,   28,   28,</div><div class='del'>-</div><div class='del'>-       28,   28,   28,   28,   28,   28,   28,   28,   28,   12,</div><div class='del'>-       12,   15,   39,   29,   15,   40,   29,   93,   30,   31,</div><div class='del'>-       31,   30,   31,   31,   56,   56,   56,   41,   32,   32,</div><div class='del'>-       42,   88,   43,   45,   45,   45,   46,   45,   47,   47,</div><div class='del'>-       87,   38,   45,   45,   45,   45,   47,   47,   47,   47,</div><div class='del'>-       47,   47,   47,   47,   47,   47,   47,   47,   47,   86,</div><div class='del'>-       47,   34,   33,   50,   85,   47,   47,   47,   47,   53,</div><div class='del'>-       53,   53,   84,   53,   83,   35,   82,   51,   53,   53,</div><div class='del'>-       53,   53,   56,   56,   56,   93,   68,   54,   57,   54,</div><div class='del'>-       54,   54,   56,   56,   56,   62,   46,   34,   71,   81,</div><div class='del'>-</div><div class='del'>-       80,   79,   78,   77,   76,   75,   74,   73,   72,   64,</div><div class='del'>-       62,   35,   33,   33,   33,   33,   33,   33,   33,   33,</div><div class='del'>-       37,   67,   66,   37,   37,   37,   44,   65,   44,   49,</div><div class='del'>-       49,   49,   49,   49,   49,   49,   49,   52,   64,   52,</div><div class='del'>-       54,   62,   54,   60,   54,   54,   55,   93,   55,   55,</div><div class='del'>-       55,   55,   58,   58,   58,   48,   58,   58,   59,   48,</div><div class='del'>-       59,   59,   61,   61,   61,   61,   61,   61,   61,   61,</div><div class='del'>-       63,   63,   63,   63,   63,   63,   63,   63,   69,   93,</div><div class='del'>-       69,   70,   70,   70,   93,   70,   70,   11,   93,   93,</div><div class='del'>-       93,   93,   93,   93,   93,   93,   93,   93,   93,   93,</div><div class='del'>-</div><div class='del'>-       93,   93,   93,   93,   93,   93,   93,   93,   93,   93,</div><div class='del'>-       93,   93,   93,   93,   93,   93,   93,   93,   93,   93,</div><div class='del'>-       93,   93,   93</div><div class='add'>+       20,   20,   20,   12,   12,   12,   32,   32,  102,   23,</div><div class='add'>+       12,   12,   12,   34,   20,   32,   32,   32,   32,   20,</div><div class='add'>+       20,   20,   20,   20,   24,   24,   24,   35,   25,   54,</div><div class='add'>+       54,   54,   26,   25,   25,   25,   25,   12,   13,   14,</div><div class='add'>+       15,   27,   12,   27,   27,   27,   23,   27,   27,   27,</div><div class='add'>+       12,   28,   28,   28,   12,   12,   28,   28,   28,   28,</div><div class='add'>+       28,   28,   28,   28,   28,   28,   28,   28,   28,   28,</div><div class='add'>+</div><div class='add'>+       12,   12,   29,   36,  103,   34,   17,   30,   31,   31,</div><div class='add'>+       29,   54,   54,   54,   17,   30,   31,   31,   39,   35,</div><div class='add'>+       52,   40,   52,   52,   52,  103,   78,   38,   38,   46,</div><div class='add'>+      101,   60,   79,   41,   69,   97,   42,   94,   43,   45,</div><div class='add'>+       45,   45,   46,   45,   47,   47,   93,   92,   45,   45,</div><div class='add'>+       45,   45,   47,   47,   47,   47,   47,   47,   47,   47,</div><div class='add'>+       47,   47,   47,   47,   47,   39,   47,   91,   40,   90,</div><div class='add'>+       99,   47,   47,   47,   47,   54,   54,   54,   89,   88,</div><div class='add'>+       41,   55,   87,   49,  100,   43,   51,   51,   51,   86,</div><div class='add'>+       51,   95,   95,   96,   85,   51,   51,   51,   51,   52,</div><div class='add'>+</div><div class='add'>+       99,   52,   52,   52,   95,   95,   96,   84,   46,   83,</div><div class='add'>+       82,   81,   39,   79,  100,   33,   33,   33,   33,   33,</div><div class='add'>+       33,   33,   33,   37,   80,   77,   37,   37,   37,   44,</div><div class='add'>+       40,   44,   50,   76,   50,   52,   75,   52,   74,   52,</div><div class='add'>+       52,   53,   73,   53,   53,   53,   53,   56,   56,   56,</div><div class='add'>+       72,   56,   56,   57,   71,   57,   57,   59,   59,   59,</div><div class='add'>+       59,   59,   59,   59,   59,   61,   61,   61,   61,   61,</div><div class='add'>+       61,   61,   61,   67,   70,   67,   68,   68,   68,   62,</div><div class='add'>+       68,   68,   98,   98,   98,   98,   98,   98,   98,   98,</div><div class='add'>+       60,   66,   65,   64,   63,   62,   60,   58,  103,   48,</div><div class='add'>+</div><div class='add'>+       48,  103,   11,  103,  103,  103,  103,  103,  103,  103,</div><div class='add'>+      103,  103,  103,  103,  103,  103,  103,  103,  103,  103,</div><div class='add'>+      103,  103,  103,  103,  103,  103,  103,  103,  103,  103,</div><div class='add'>+      103,  103,  103,  103,  103,  103,  103,  103</div><div class='ctx'>     } ;</div><div class='ctx'> </div><div class='del'>-static yyconst flex_int16_t yy_chk[324] =</div><div class='add'>+static yyconst flex_int16_t yy_chk[339] =</div><div class='ctx'>     {   0,</div><div class='ctx'>         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,</div><div class='ctx'>         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,</div><div class='ctx'>         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,</div><div class='del'>-        1,    1,    1,    1,    1,    3,   15,    3,   13,   13,</div><div class='del'>-       14,   14,    3,    3,    3,   16,    3,   23,   23,   91,</div><div class='del'>-       15,    3,    3,    3,    3,    3,    5,   28,   90,   28,</div><div class='del'>-       28,   28,   23,    5,    5,    5,   28,    5,   89,   16,</div><div class='del'>-       87,    5,    5,    5,    5,    5,    7,    7,    7,    7,</div><div class='add'>+        1,    1,    1,    1,    1,    3,   13,   13,  101,    3,</div><div class='add'>+        3,    3,    3,   15,    3,   14,   14,   32,   32,    3,</div><div class='add'>+        3,    3,    3,    3,    5,    5,    5,   15,    5,   31,</div><div class='add'>+       31,   31,    5,    5,    5,    5,    5,    7,    7,    7,</div><div class='ctx'>         7,    7,    7,    7,    7,    7,    7,    7,    7,    7,</div><div class='ctx'>         7,    7,    7,    7,    7,    7,    7,    7,    7,    7,</div><div class='del'>-</div><div class='ctx'>         7,    7,    7,    7,    7,    7,    7,    7,    7,    7,</div><div class='del'>-        7,    9,   17,    9,   10,   17,   10,   29,    9,    9,</div><div class='del'>-        9,   10,   10,   10,   31,   31,   31,   17,   32,   32,</div><div class='del'>-       17,   86,   17,   19,   19,   19,   19,   19,   19,   19,</div><div class='del'>-       84,   29,   19,   19,   19,   19,   19,   19,   19,   19,</div><div class='del'>-       19,   19,   19,   19,   19,   19,   20,   20,   20,   83,</div><div class='del'>-       20,   33,   49,   49,   82,   20,   20,   20,   20,   25,</div><div class='del'>-       25,   25,   81,   25,   80,   33,   79,   49,   25,   25,</div><div class='del'>-       25,   25,   30,   30,   30,   51,   51,   55,   30,   55,</div><div class='del'>-       55,   55,   56,   56,   56,   62,   55,   68,   62,   78,</div><div class='del'>-</div><div class='del'>-       77,   76,   74,   73,   72,   70,   67,   66,   65,   63,</div><div class='del'>-       61,   68,   94,   94,   94,   94,   94,   94,   94,   94,</div><div class='del'>-       95,   43,   42,   95,   95,   95,   96,   41,   96,   97,</div><div class='del'>-       97,   97,   97,   97,   97,   97,   97,   98,   40,   98,</div><div class='del'>-       99,   39,   99,   38,   99,   99,  100,   35,  100,  100,</div><div class='del'>-      100,  100,  101,  101,  101,   22,  101,  101,  102,   21,</div><div class='del'>-      102,  102,  103,  103,  103,  103,  103,  103,  103,  103,</div><div class='del'>-      104,  104,  104,  104,  104,  104,  104,  104,  105,   11,</div><div class='del'>-      105,  106,  106,  106,    0,  106,  106,   93,   93,   93,</div><div class='del'>-       93,   93,   93,   93,   93,   93,   93,   93,   93,   93,</div><div class='del'>-</div><div class='del'>-       93,   93,   93,   93,   93,   93,   93,   93,   93,   93,</div><div class='del'>-       93,   93,   93,   93,   93,   93,   93,   93,   93,   93,</div><div class='del'>-       93,   93,   93</div><div class='add'>+</div><div class='add'>+        7,    7,    9,   16,   29,   33,    9,    9,    9,    9,</div><div class='add'>+       10,   54,   54,   54,   10,   10,   10,   10,   17,   33,</div><div class='add'>+       28,   17,   28,   28,   28,  100,   72,   16,   29,   28,</div><div class='add'>+       97,   60,   72,   17,   60,   94,   17,   92,   17,   19,</div><div class='add'>+       19,   19,   19,   19,   19,   19,   91,   88,   19,   19,</div><div class='add'>+       19,   19,   19,   19,   19,   19,   19,   19,   19,   19,</div><div class='add'>+       19,   19,   20,   20,   20,   23,   20,   87,   23,   86,</div><div class='add'>+       96,   20,   20,   20,   20,   30,   30,   30,   85,   84,</div><div class='add'>+       23,   30,   83,   23,   96,   23,   25,   25,   25,   82,</div><div class='add'>+       25,   93,   93,   93,   81,   25,   25,   25,   25,   53,</div><div class='add'>+</div><div class='add'>+       98,   53,   53,   53,   95,   95,   95,   80,   53,   79,</div><div class='add'>+       78,   77,   76,   74,   98,  104,  104,  104,  104,  104,</div><div class='add'>+      104,  104,  104,  105,   73,   71,  105,  105,  105,  106,</div><div class='add'>+       70,  106,  107,   69,  107,  108,   68,  108,   66,  108,</div><div class='add'>+      108,  109,   65,  109,  109,  109,  109,  110,  110,  110,</div><div class='add'>+       64,  110,  110,  111,   63,  111,  111,  112,  112,  112,</div><div class='add'>+      112,  112,  112,  112,  112,  113,  113,  113,  113,  113,</div><div class='add'>+      113,  113,  113,  114,   62,  114,  115,  115,  115,   61,</div><div class='add'>+      115,  115,  116,  116,  116,  116,  116,  116,  116,  116,</div><div class='add'>+       59,   49,   43,   42,   41,   40,   39,   38,   35,   22,</div><div class='add'>+</div><div class='add'>+       21,   11,  103,  103,  103,  103,  103,  103,  103,  103,</div><div class='add'>+      103,  103,  103,  103,  103,  103,  103,  103,  103,  103,</div><div class='add'>+      103,  103,  103,  103,  103,  103,  103,  103,  103,  103,</div><div class='add'>+      103,  103,  103,  103,  103,  103,  103,  103</div><div class='ctx'>     } ;</div><div class='ctx'> </div><div class='ctx'> /* Table of booleans, true if rule could match eol. */</div><div class='ctx'> static yyconst flex_int32_t yy_rule_can_match_eol[21] =</div><div class='ctx'>     {   0,</div><div class='del'>-0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, </div><div class='add'>+1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, </div><div class='ctx'>     0,     };</div><div class='ctx'> </div><div class='ctx'> static yy_state_type yy_last_accepting_state;</div><div class='hunk'>@@ -600,7 +608,7 @@ char *yytext;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#line 33 "dtc-lexer.l"</div><div class='add'>+#line 37 "dtc-lexer.l"</div><div class='ctx'> #include "dtc.h"</div><div class='ctx'> #include "srcpos.h"</div><div class='ctx'> #include "dtc-parser.tab.h"</div><div class='hunk'>@@ -623,7 +631,10 @@ static int dts_version; /* = 0 */</div><div class='ctx'> 				DPRINT("&lt;V1&gt;\n"); \</div><div class='ctx'> 				BEGIN(V1); \</div><div class='ctx'> 			}</div><div class='del'>-#line 627 "dtc-lexer.lex.c"</div><div class='add'>+</div><div class='add'>+static void push_input_file(const char *filename);</div><div class='add'>+static int pop_input_file(void);</div><div class='add'>+#line 638 "dtc-lexer.lex.c"</div><div class='ctx'> </div><div class='ctx'> #define INITIAL 0</div><div class='ctx'> #define INCLUDE 1</div><div class='hunk'>@@ -685,7 +696,7 @@ static int input (void );</div><div class='ctx'> /* This used to be an fputs(), but since the string might contain NUL's,</div><div class='ctx'>  * we now use fwrite().</div><div class='ctx'>  */</div><div class='del'>-#define ECHO (void) fwrite( yytext, yyleng, 1, yyout )</div><div class='add'>+#define ECHO fwrite( yytext, yyleng, 1, yyout )</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,</div><div class='hunk'>@@ -696,7 +707,7 @@ static int input (void );</div><div class='ctx'> 	if ( YY_CURRENT_BUFFER_LVALUE-&gt;yy_is_interactive ) \</div><div class='ctx'> 		{ \</div><div class='ctx'> 		int c = '*'; \</div><div class='del'>-		size_t n; \</div><div class='add'>+		int n; \</div><div class='ctx'> 		for ( n = 0; n &lt; max_size &amp;&amp; \</div><div class='ctx'> 			     (c = getc( yyin )) != EOF &amp;&amp; c != '\n'; ++n ) \</div><div class='ctx'> 			buf[n] = (char) c; \</div><div class='hunk'>@@ -778,9 +789,9 @@ YY_DECL</div><div class='ctx'> 	register char *yy_cp, *yy_bp;</div><div class='ctx'> 	register int yy_act;</div><div class='ctx'>     </div><div class='del'>-#line 57 "dtc-lexer.l"</div><div class='add'>+#line 64 "dtc-lexer.l"</div><div class='ctx'> </div><div class='del'>-#line 784 "dtc-lexer.lex.c"</div><div class='add'>+#line 795 "dtc-lexer.lex.c"</div><div class='ctx'> </div><div class='ctx'> 	if ( !(yy_init) )</div><div class='ctx'> 		{</div><div class='hunk'>@@ -833,13 +844,13 @@ yy_match:</div><div class='ctx'> 			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )</div><div class='ctx'> 				{</div><div class='ctx'> 				yy_current_state = (int) yy_def[yy_current_state];</div><div class='del'>-				if ( yy_current_state &gt;= 94 )</div><div class='add'>+				if ( yy_current_state &gt;= 104 )</div><div class='ctx'> 					yy_c = yy_meta[(unsigned int) yy_c];</div><div class='ctx'> 				}</div><div class='ctx'> 			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];</div><div class='ctx'> 			++yy_cp;</div><div class='ctx'> 			}</div><div class='del'>-		while ( yy_base[yy_current_state] != 288 );</div><div class='add'>+		while ( yy_base[yy_current_state] != 303 );</div><div class='ctx'> </div><div class='ctx'> yy_find_action:</div><div class='ctx'> 		yy_act = yy_accept[yy_current_state];</div><div class='hunk'>@@ -874,20 +885,13 @@ do_action:	/* This label is used only to access EOF actions. */</div><div class='ctx'> 			goto yy_find_action;</div><div class='ctx'> </div><div class='ctx'> case 1:</div><div class='add'>+/* rule 1 can match eol */</div><div class='ctx'> YY_RULE_SETUP</div><div class='del'>-#line 58 "dtc-lexer.l"</div><div class='del'>-BEGIN(INCLUDE);</div><div class='del'>-	YY_BREAK</div><div class='del'>-case 2:</div><div class='del'>-YY_RULE_SETUP</div><div class='del'>-#line 60 "dtc-lexer.l"</div><div class='add'>+#line 65 "dtc-lexer.l"</div><div class='ctx'> {</div><div class='del'>-			yytext[strlen(yytext) - 1] = 0;</div><div class='del'>-			if (!push_input_file(yytext + 1)) {</div><div class='del'>-				/* Some unrecoverable error.*/</div><div class='del'>-				exit(1);</div><div class='del'>-			}</div><div class='del'>-			BEGIN_DEFAULT();</div><div class='add'>+			char *name = strchr(yytext, '\"') + 1;</div><div class='add'>+			yytext[yyleng-1] = '\0';</div><div class='add'>+			push_input_file(name);</div><div class='ctx'> 		}</div><div class='ctx'> 	YY_BREAK</div><div class='ctx'> case YY_STATE_EOF(INITIAL):</div><div class='hunk'>@@ -895,19 +899,19 @@ case YY_STATE_EOF(INCLUDE):</div><div class='ctx'> case YY_STATE_EOF(BYTESTRING):</div><div class='ctx'> case YY_STATE_EOF(PROPNODENAME):</div><div class='ctx'> case YY_STATE_EOF(V1):</div><div class='del'>-#line 70 "dtc-lexer.l"</div><div class='add'>+#line 71 "dtc-lexer.l"</div><div class='ctx'> {</div><div class='ctx'> 			if (!pop_input_file()) {</div><div class='ctx'> 				yyterminate();</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	YY_BREAK</div><div class='del'>-case 3:</div><div class='del'>-/* rule 3 can match eol */</div><div class='add'>+case 2:</div><div class='add'>+/* rule 2 can match eol */</div><div class='ctx'> YY_RULE_SETUP</div><div class='del'>-#line 76 "dtc-lexer.l"</div><div class='add'>+#line 77 "dtc-lexer.l"</div><div class='ctx'> {</div><div class='del'>-			yylloc.filenum = srcpos_filenum;</div><div class='add'>+			yylloc.file = srcpos_file;</div><div class='ctx'> 			yylloc.first_line = yylineno;</div><div class='ctx'> 			DPRINT("String: %s\n", yytext);</div><div class='ctx'> 			yylval.data = data_copy_escape_string(yytext+1,</div><div class='hunk'>@@ -916,11 +920,11 @@ YY_RULE_SETUP</div><div class='ctx'> 			return DT_STRING;</div><div class='ctx'> 		}</div><div class='ctx'> 	YY_BREAK</div><div class='del'>-case 4:</div><div class='add'>+case 3:</div><div class='ctx'> YY_RULE_SETUP</div><div class='del'>-#line 86 "dtc-lexer.l"</div><div class='add'>+#line 87 "dtc-lexer.l"</div><div class='ctx'> {</div><div class='del'>-			yylloc.filenum = srcpos_filenum;</div><div class='add'>+			yylloc.file = srcpos_file;</div><div class='ctx'> 			yylloc.first_line = yylineno;</div><div class='ctx'> 			DPRINT("Keyword: /dts-v1/\n");</div><div class='ctx'> 			dts_version = 1;</div><div class='hunk'>@@ -928,22 +932,22 @@ YY_RULE_SETUP</div><div class='ctx'> 			return DT_V1;</div><div class='ctx'> 		}</div><div class='ctx'> 	YY_BREAK</div><div class='del'>-case 5:</div><div class='add'>+case 4:</div><div class='ctx'> YY_RULE_SETUP</div><div class='del'>-#line 95 "dtc-lexer.l"</div><div class='add'>+#line 96 "dtc-lexer.l"</div><div class='ctx'> {</div><div class='del'>-			yylloc.filenum = srcpos_filenum;</div><div class='add'>+			yylloc.file = srcpos_file;</div><div class='ctx'> 			yylloc.first_line = yylineno;</div><div class='ctx'> 			DPRINT("Keyword: /memreserve/\n");</div><div class='ctx'> 			BEGIN_DEFAULT();</div><div class='ctx'> 			return DT_MEMRESERVE;</div><div class='ctx'> 		}</div><div class='ctx'> 	YY_BREAK</div><div class='del'>-case 6:</div><div class='add'>+case 5:</div><div class='ctx'> YY_RULE_SETUP</div><div class='del'>-#line 103 "dtc-lexer.l"</div><div class='add'>+#line 104 "dtc-lexer.l"</div><div class='ctx'> {</div><div class='del'>-			yylloc.filenum = srcpos_filenum;</div><div class='add'>+			yylloc.file = srcpos_file;</div><div class='ctx'> 			yylloc.first_line = yylineno;</div><div class='ctx'> 			DPRINT("Label: %s\n", yytext);</div><div class='ctx'> 			yylval.labelref = strdup(yytext);</div><div class='hunk'>@@ -951,11 +955,11 @@ YY_RULE_SETUP</div><div class='ctx'> 			return DT_LABEL;</div><div class='ctx'> 		}</div><div class='ctx'> 	YY_BREAK</div><div class='del'>-case 7:</div><div class='add'>+case 6:</div><div class='ctx'> YY_RULE_SETUP</div><div class='del'>-#line 112 "dtc-lexer.l"</div><div class='add'>+#line 113 "dtc-lexer.l"</div><div class='ctx'> {</div><div class='del'>-			yylloc.filenum = srcpos_filenum;</div><div class='add'>+			yylloc.file = srcpos_file;</div><div class='ctx'> 			yylloc.first_line = yylineno;</div><div class='ctx'> 			if (*yytext == 'b')</div><div class='ctx'> 				yylval.cbase = 2;</div><div class='hunk'>@@ -969,44 +973,44 @@ YY_RULE_SETUP</div><div class='ctx'> 			return DT_BASE;</div><div class='ctx'> 		}</div><div class='ctx'> 	YY_BREAK</div><div class='del'>-case 8:</div><div class='add'>+case 7:</div><div class='ctx'> YY_RULE_SETUP</div><div class='del'>-#line 127 "dtc-lexer.l"</div><div class='add'>+#line 128 "dtc-lexer.l"</div><div class='ctx'> {</div><div class='del'>-			yylloc.filenum = srcpos_filenum;</div><div class='add'>+			yylloc.file = srcpos_file;</div><div class='ctx'> 			yylloc.first_line = yylineno;</div><div class='ctx'> 			yylval.literal = strdup(yytext);</div><div class='ctx'> 			DPRINT("Literal: '%s'\n", yylval.literal);</div><div class='ctx'> 			return DT_LEGACYLITERAL;</div><div class='ctx'> 		}</div><div class='ctx'> 	YY_BREAK</div><div class='del'>-case 9:</div><div class='add'>+case 8:</div><div class='ctx'> YY_RULE_SETUP</div><div class='del'>-#line 135 "dtc-lexer.l"</div><div class='add'>+#line 136 "dtc-lexer.l"</div><div class='ctx'> {</div><div class='del'>-			yylloc.filenum = srcpos_filenum;</div><div class='add'>+			yylloc.file = srcpos_file;</div><div class='ctx'> 			yylloc.first_line = yylineno;</div><div class='ctx'> 			yylval.literal = strdup(yytext);</div><div class='ctx'> 			DPRINT("Literal: '%s'\n", yylval.literal);</div><div class='ctx'> 			return DT_LITERAL;</div><div class='ctx'> 		}</div><div class='ctx'> 	YY_BREAK</div><div class='del'>-case 10:</div><div class='add'>+case 9:</div><div class='ctx'> YY_RULE_SETUP</div><div class='del'>-#line 143 "dtc-lexer.l"</div><div class='add'>+#line 144 "dtc-lexer.l"</div><div class='ctx'> {	/* label reference */</div><div class='del'>-			yylloc.filenum = srcpos_filenum;</div><div class='add'>+			yylloc.file = srcpos_file;</div><div class='ctx'> 			yylloc.first_line = yylineno;</div><div class='ctx'> 			DPRINT("Ref: %s\n", yytext+1);</div><div class='ctx'> 			yylval.labelref = strdup(yytext+1);</div><div class='ctx'> 			return DT_REF;</div><div class='ctx'> 		}</div><div class='ctx'> 	YY_BREAK</div><div class='del'>-case 11:</div><div class='add'>+case 10:</div><div class='ctx'> YY_RULE_SETUP</div><div class='del'>-#line 151 "dtc-lexer.l"</div><div class='add'>+#line 152 "dtc-lexer.l"</div><div class='ctx'> {	/* new-style path reference */</div><div class='del'>-			yylloc.filenum = srcpos_filenum;</div><div class='add'>+			yylloc.file = srcpos_file;</div><div class='ctx'> 			yylloc.first_line = yylineno;</div><div class='ctx'> 			yytext[yyleng-1] = '\0';</div><div class='ctx'> 			DPRINT("Ref: %s\n", yytext+2);</div><div class='hunk'>@@ -1014,44 +1018,44 @@ YY_RULE_SETUP</div><div class='ctx'> 			return DT_REF;</div><div class='ctx'> 		}</div><div class='ctx'> 	YY_BREAK</div><div class='del'>-case 12:</div><div class='add'>+case 11:</div><div class='ctx'> YY_RULE_SETUP</div><div class='del'>-#line 160 "dtc-lexer.l"</div><div class='add'>+#line 161 "dtc-lexer.l"</div><div class='ctx'> {	/* old-style path reference */</div><div class='del'>-			yylloc.filenum = srcpos_filenum;</div><div class='add'>+			yylloc.file = srcpos_file;</div><div class='ctx'> 			yylloc.first_line = yylineno;</div><div class='ctx'> 			DPRINT("Ref: %s\n", yytext+1);</div><div class='ctx'> 			yylval.labelref = strdup(yytext+1);</div><div class='ctx'> 			return DT_REF;</div><div class='ctx'> 		}</div><div class='ctx'> 	YY_BREAK</div><div class='del'>-case 13:</div><div class='add'>+case 12:</div><div class='ctx'> YY_RULE_SETUP</div><div class='del'>-#line 168 "dtc-lexer.l"</div><div class='add'>+#line 169 "dtc-lexer.l"</div><div class='ctx'> {</div><div class='del'>-			yylloc.filenum = srcpos_filenum;</div><div class='add'>+			yylloc.file = srcpos_file;</div><div class='ctx'> 			yylloc.first_line = yylineno;</div><div class='ctx'> 			yylval.byte = strtol(yytext, NULL, 16);</div><div class='ctx'> 			DPRINT("Byte: %02x\n", (int)yylval.byte);</div><div class='ctx'> 			return DT_BYTE;</div><div class='ctx'> 		}</div><div class='ctx'> 	YY_BREAK</div><div class='del'>-case 14:</div><div class='add'>+case 13:</div><div class='ctx'> YY_RULE_SETUP</div><div class='del'>-#line 176 "dtc-lexer.l"</div><div class='add'>+#line 177 "dtc-lexer.l"</div><div class='ctx'> {</div><div class='del'>-			yylloc.filenum = srcpos_filenum;</div><div class='add'>+			yylloc.file = srcpos_file;</div><div class='ctx'> 			yylloc.first_line = yylineno;</div><div class='ctx'> 			DPRINT("/BYTESTRING\n");</div><div class='ctx'> 			BEGIN_DEFAULT();</div><div class='ctx'> 			return ']';</div><div class='ctx'> 		}</div><div class='ctx'> 	YY_BREAK</div><div class='del'>-case 15:</div><div class='add'>+case 14:</div><div class='ctx'> YY_RULE_SETUP</div><div class='del'>-#line 184 "dtc-lexer.l"</div><div class='add'>+#line 185 "dtc-lexer.l"</div><div class='ctx'> {</div><div class='del'>-			yylloc.filenum = srcpos_filenum;</div><div class='add'>+			yylloc.file = srcpos_file;</div><div class='ctx'> 			yylloc.first_line = yylineno;</div><div class='ctx'> 			DPRINT("PropNodeName: %s\n", yytext);</div><div class='ctx'> 			yylval.propnodename = strdup(yytext);</div><div class='hunk'>@@ -1059,34 +1063,39 @@ YY_RULE_SETUP</div><div class='ctx'> 			return DT_PROPNODENAME;</div><div class='ctx'> 		}</div><div class='ctx'> 	YY_BREAK</div><div class='add'>+case 15:</div><div class='add'>+YY_RULE_SETUP</div><div class='add'>+#line 194 "dtc-lexer.l"</div><div class='add'>+{</div><div class='add'>+			yylloc.file = srcpos_file;</div><div class='add'>+			yylloc.first_line = yylineno;</div><div class='add'>+			DPRINT("Binary Include\n");</div><div class='add'>+			return DT_INCBIN;</div><div class='add'>+		}</div><div class='add'>+	YY_BREAK</div><div class='ctx'> case 16:</div><div class='ctx'> /* rule 16 can match eol */</div><div class='ctx'> YY_RULE_SETUP</div><div class='del'>-#line 194 "dtc-lexer.l"</div><div class='add'>+#line 201 "dtc-lexer.l"</div><div class='ctx'> /* eat whitespace */</div><div class='ctx'> 	YY_BREAK</div><div class='ctx'> case 17:</div><div class='ctx'> /* rule 17 can match eol */</div><div class='ctx'> YY_RULE_SETUP</div><div class='del'>-#line 196 "dtc-lexer.l"</div><div class='del'>-{</div><div class='del'>-			yylloc.filenum = srcpos_filenum;</div><div class='del'>-			yylloc.first_line = yylineno;</div><div class='del'>-			DPRINT("Comment: %s\n", yytext);</div><div class='del'>-			/* eat comments */</div><div class='del'>-		}</div><div class='add'>+#line 202 "dtc-lexer.l"</div><div class='add'>+/* eat C-style comments */</div><div class='ctx'> 	YY_BREAK</div><div class='ctx'> case 18:</div><div class='ctx'> /* rule 18 can match eol */</div><div class='ctx'> YY_RULE_SETUP</div><div class='ctx'> #line 203 "dtc-lexer.l"</div><div class='del'>-/* eat line comments */</div><div class='add'>+/* eat C++-style comments */</div><div class='ctx'> 	YY_BREAK</div><div class='ctx'> case 19:</div><div class='ctx'> YY_RULE_SETUP</div><div class='ctx'> #line 205 "dtc-lexer.l"</div><div class='ctx'> {</div><div class='del'>-			yylloc.filenum = srcpos_filenum;</div><div class='add'>+			yylloc.file = srcpos_file;</div><div class='ctx'> 			yylloc.first_line = yylineno;</div><div class='ctx'> 			DPRINT("Char: %c (\\x%02x)\n", yytext[0],</div><div class='ctx'> 				(unsigned)yytext[0]);</div><div class='hunk'>@@ -1107,7 +1116,7 @@ YY_RULE_SETUP</div><div class='ctx'> #line 222 "dtc-lexer.l"</div><div class='ctx'> ECHO;</div><div class='ctx'> 	YY_BREAK</div><div class='del'>-#line 1111 "dtc-lexer.lex.c"</div><div class='add'>+#line 1120 "dtc-lexer.lex.c"</div><div class='ctx'> </div><div class='ctx'> 	case YY_END_OF_BUFFER:</div><div class='ctx'> 		{</div><div class='hunk'>@@ -1360,6 +1369,14 @@ static int yy_get_next_buffer (void)</div><div class='ctx'> 	else</div><div class='ctx'> 		ret_val = EOB_ACT_CONTINUE_SCAN;</div><div class='ctx'> </div><div class='add'>+	if ((yy_size_t) ((yy_n_chars) + number_to_move) &gt; YY_CURRENT_BUFFER_LVALUE-&gt;yy_buf_size) {</div><div class='add'>+		/* Extend the array by 50%, plus the number we really need. */</div><div class='add'>+		yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) &gt;&gt; 1);</div><div class='add'>+		YY_CURRENT_BUFFER_LVALUE-&gt;yy_ch_buf = (char *) yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE-&gt;yy_ch_buf,new_size  );</div><div class='add'>+		if ( ! YY_CURRENT_BUFFER_LVALUE-&gt;yy_ch_buf )</div><div class='add'>+			YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	(yy_n_chars) += number_to_move;</div><div class='ctx'> 	YY_CURRENT_BUFFER_LVALUE-&gt;yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR;</div><div class='ctx'> 	YY_CURRENT_BUFFER_LVALUE-&gt;yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR;</div><div class='hunk'>@@ -1389,7 +1406,7 @@ static int yy_get_next_buffer (void)</div><div class='ctx'> 		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )</div><div class='ctx'> 			{</div><div class='ctx'> 			yy_current_state = (int) yy_def[yy_current_state];</div><div class='del'>-			if ( yy_current_state &gt;= 94 )</div><div class='add'>+			if ( yy_current_state &gt;= 104 )</div><div class='ctx'> 				yy_c = yy_meta[(unsigned int) yy_c];</div><div class='ctx'> 			}</div><div class='ctx'> 		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];</div><div class='hunk'>@@ -1417,11 +1434,11 @@ static int yy_get_next_buffer (void)</div><div class='ctx'> 	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )</div><div class='ctx'> 		{</div><div class='ctx'> 		yy_current_state = (int) yy_def[yy_current_state];</div><div class='del'>-		if ( yy_current_state &gt;= 94 )</div><div class='add'>+		if ( yy_current_state &gt;= 104 )</div><div class='ctx'> 			yy_c = yy_meta[(unsigned int) yy_c];</div><div class='ctx'> 		}</div><div class='ctx'> 	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];</div><div class='del'>-	yy_is_jam = (yy_current_state == 93);</div><div class='add'>+	yy_is_jam = (yy_current_state == 103);</div><div class='ctx'> </div><div class='ctx'> 	return yy_is_jam ? 0 : yy_current_state;</div><div class='ctx'> }</div><div class='hunk'>@@ -1743,7 +1760,9 @@ static void yyensure_buffer_stack (void)</div><div class='ctx'> 		(yy_buffer_stack) = (struct yy_buffer_state**)yyalloc</div><div class='ctx'> 								(num_to_alloc * sizeof(struct yy_buffer_state*)</div><div class='ctx'> 								);</div><div class='del'>-		</div><div class='add'>+		if ( ! (yy_buffer_stack) )</div><div class='add'>+			YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" );</div><div class='add'>+								  </div><div class='ctx'> 		memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));</div><div class='ctx'> 				</div><div class='ctx'> 		(yy_buffer_stack_max) = num_to_alloc;</div><div class='hunk'>@@ -1761,6 +1780,8 @@ static void yyensure_buffer_stack (void)</div><div class='ctx'> 								((yy_buffer_stack),</div><div class='ctx'> 								num_to_alloc * sizeof(struct yy_buffer_state*)</div><div class='ctx'> 								);</div><div class='add'>+		if ( ! (yy_buffer_stack) )</div><div class='add'>+			YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" );</div><div class='ctx'> </div><div class='ctx'> 		/* zero only the new slots.*/</div><div class='ctx'> 		memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));</div><div class='hunk'>@@ -2072,14 +2093,13 @@ void yyfree (void * ptr )</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> struct incl_file {</div><div class='del'>-	int filenum;</div><div class='del'>-	FILE *file;</div><div class='add'>+	struct dtc_file *file;</div><div class='ctx'> 	YY_BUFFER_STATE yy_prev_buf;</div><div class='ctx'> 	int yy_prev_lineno;</div><div class='ctx'> 	struct incl_file *prev;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct incl_file *incl_file_stack;</div><div class='add'>+static struct incl_file *incl_file_stack;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -2090,36 +2110,34 @@ struct incl_file *incl_file_stack;</div><div class='ctx'> static int incl_depth = 0;</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-int push_input_file(const char *filename)</div><div class='add'>+static void push_input_file(const char *filename)</div><div class='ctx'> {</div><div class='del'>-	FILE *f;</div><div class='ctx'> 	struct incl_file *incl_file;</div><div class='add'>+	struct dtc_file *newfile;</div><div class='add'>+	struct search_path search, *searchptr = NULL;</div><div class='ctx'> </div><div class='del'>-	if (!filename) {</div><div class='del'>-		yyerror("No include file name given.");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='add'>+	assert(filename);</div><div class='ctx'> </div><div class='del'>-	if (incl_depth++ &gt;= MAX_INCLUDE_DEPTH) {</div><div class='del'>-		yyerror("Includes nested too deeply");</div><div class='del'>-		return 0;</div><div class='add'>+	if (incl_depth++ &gt;= MAX_INCLUDE_DEPTH)</div><div class='add'>+		die("Includes nested too deeply");</div><div class='add'>+</div><div class='add'>+	if (srcpos_file) {</div><div class='add'>+		search.dir = srcpos_file-&gt;dir;</div><div class='add'>+		search.next = NULL;</div><div class='add'>+		search.prev = NULL;</div><div class='add'>+		searchptr = &amp;search;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	f = dtc_open_file(filename);</div><div class='add'>+	newfile = dtc_open_file(filename, searchptr);</div><div class='ctx'> </div><div class='del'>-	incl_file = malloc(sizeof(struct incl_file));</div><div class='del'>-	if (!incl_file) {</div><div class='del'>-		yyerror("Can not allocate include file space.");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='add'>+	incl_file = xmalloc(sizeof(struct incl_file));</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Save current context.</div><div class='ctx'> 	 */</div><div class='ctx'> 	incl_file-&gt;yy_prev_buf = YY_CURRENT_BUFFER;</div><div class='ctx'> 	incl_file-&gt;yy_prev_lineno = yylineno;</div><div class='del'>-	incl_file-&gt;filenum = srcpos_filenum;</div><div class='del'>-	incl_file-&gt;file = yyin;</div><div class='add'>+	incl_file-&gt;file = srcpos_file;</div><div class='ctx'> 	incl_file-&gt;prev = incl_file_stack;</div><div class='ctx'> </div><div class='ctx'> 	incl_file_stack = incl_file;</div><div class='hunk'>@@ -2127,23 +2145,21 @@ int push_input_file(const char *filename)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Establish new context.</div><div class='ctx'> 	 */</div><div class='del'>-	srcpos_filenum = lookup_file_name(filename, 0);</div><div class='add'>+	srcpos_file = newfile;</div><div class='ctx'> 	yylineno = 1;</div><div class='del'>-	yyin = f;</div><div class='add'>+	yyin = newfile-&gt;file;</div><div class='ctx'> 	yy_switch_to_buffer(yy_create_buffer(yyin,YY_BUF_SIZE));</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-int pop_input_file(void)</div><div class='add'>+static int pop_input_file(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct incl_file *incl_file;</div><div class='ctx'> </div><div class='ctx'> 	if (incl_file_stack == 0)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	fclose(yyin);</div><div class='add'>+	dtc_close_file(srcpos_file);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Pop.</div><div class='hunk'>@@ -2158,17 +2174,14 @@ int pop_input_file(void)</div><div class='ctx'> 	yy_delete_buffer(YY_CURRENT_BUFFER);</div><div class='ctx'> 	yy_switch_to_buffer(incl_file-&gt;yy_prev_buf);</div><div class='ctx'> 	yylineno = incl_file-&gt;yy_prev_lineno;</div><div class='del'>-	srcpos_filenum = incl_file-&gt;filenum;</div><div class='del'>-	yyin = incl_file-&gt;file;</div><div class='add'>+	srcpos_file = incl_file-&gt;file;</div><div class='add'>+	yyin = incl_file-&gt;file ? incl_file-&gt;file-&gt;file : NULL;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Free old state.</div><div class='ctx'> 	 */</div><div class='ctx'> 	free(incl_file);</div><div class='ctx'> </div><div class='del'>-	if (YY_CURRENT_BUFFER == 0)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/boot/dtc-src/dtc-parser.tab.c_shipped b/arch/powerpc/boot/dtc-src/dtc-parser.tab.c_shipped<br/>index 28e6ec0296a1..27129377e5d2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dtc-src/dtc-parser.tab.c_shipped?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/boot/dtc-src/dtc-parser.tab.c_shipped</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dtc-src/dtc-parser.tab.c_shipped?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dtc-src/dtc-parser.tab.c_shipped</a></div><div class='hunk'>@@ -75,7 +75,8 @@</div><div class='ctx'>      DT_BYTE = 264,</div><div class='ctx'>      DT_STRING = 265,</div><div class='ctx'>      DT_LABEL = 266,</div><div class='del'>-     DT_REF = 267</div><div class='add'>+     DT_REF = 267,</div><div class='add'>+     DT_INCBIN = 268</div><div class='ctx'>    };</div><div class='ctx'> #endif</div><div class='ctx'> /* Tokens.  */</div><div class='hunk'>@@ -89,6 +90,7 @@</div><div class='ctx'> #define DT_STRING 265</div><div class='ctx'> #define DT_LABEL 266</div><div class='ctx'> #define DT_REF 267</div><div class='add'>+#define DT_INCBIN 268</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -96,14 +98,17 @@</div><div class='ctx'> /* Copy the first part of user declarations.  */</div><div class='ctx'> #line 23 "dtc-parser.y"</div><div class='ctx'> </div><div class='add'>+#include &lt;stdio.h&gt;</div><div class='add'>+</div><div class='ctx'> #include "dtc.h"</div><div class='ctx'> #include "srcpos.h"</div><div class='ctx'> </div><div class='del'>-int yylex(void);</div><div class='del'>-unsigned long long eval_literal(const char *s, int base, int bits);</div><div class='add'>+extern int yylex(void);</div><div class='ctx'> </div><div class='ctx'> extern struct boot_info *the_boot_info;</div><div class='add'>+extern int treesource_error;</div><div class='ctx'> </div><div class='add'>+static unsigned long long eval_literal(const char *s, int base, int bits);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* Enabling traces.  */</div><div class='hunk'>@@ -126,16 +131,16 @@ extern struct boot_info *the_boot_info;</div><div class='ctx'> </div><div class='ctx'> #if ! defined YYSTYPE &amp;&amp; ! defined YYSTYPE_IS_DECLARED</div><div class='ctx'> typedef union YYSTYPE</div><div class='del'>-#line 34 "dtc-parser.y"</div><div class='add'>+#line 37 "dtc-parser.y"</div><div class='ctx'> {</div><div class='ctx'> 	char *propnodename;</div><div class='ctx'> 	char *literal;</div><div class='ctx'> 	char *labelref;</div><div class='ctx'> 	unsigned int cbase;</div><div class='del'>-	u8 byte;</div><div class='add'>+	uint8_t byte;</div><div class='ctx'> 	struct data data;</div><div class='ctx'> </div><div class='del'>-	u64 addr;</div><div class='add'>+	uint64_t addr;</div><div class='ctx'> 	cell_t cell;</div><div class='ctx'> 	struct property *prop;</div><div class='ctx'> 	struct property *proplist;</div><div class='hunk'>@@ -144,7 +149,7 @@ typedef union YYSTYPE</div><div class='ctx'> 	struct reserve_info *re;</div><div class='ctx'> }</div><div class='ctx'> /* Line 187 of yacc.c.  */</div><div class='del'>-#line 148 "dtc-parser.tab.c"</div><div class='add'>+#line 153 "dtc-parser.tab.c"</div><div class='ctx'> 	YYSTYPE;</div><div class='ctx'> # define yystype YYSTYPE /* obsolescent; will be withdrawn */</div><div class='ctx'> # define YYSTYPE_IS_DECLARED 1</div><div class='hunk'>@@ -169,7 +174,7 @@ typedef struct YYLTYPE</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* Line 216 of yacc.c.  */</div><div class='del'>-#line 173 "dtc-parser.tab.c"</div><div class='add'>+#line 178 "dtc-parser.tab.c"</div><div class='ctx'> </div><div class='ctx'> #ifdef short</div><div class='ctx'> # undef short</div><div class='hunk'>@@ -386,20 +391,20 @@ union yyalloc</div><div class='ctx'> /* YYFINAL -- State number of the termination state.  */</div><div class='ctx'> #define YYFINAL  9</div><div class='ctx'> /* YYLAST -- Last index in YYTABLE.  */</div><div class='del'>-#define YYLAST   60</div><div class='add'>+#define YYLAST   73</div><div class='ctx'> </div><div class='ctx'> /* YYNTOKENS -- Number of terminals.  */</div><div class='del'>-#define YYNTOKENS  24</div><div class='add'>+#define YYNTOKENS  27</div><div class='ctx'> /* YYNNTS -- Number of nonterminals.  */</div><div class='ctx'> #define YYNNTS  20</div><div class='ctx'> /* YYNRULES -- Number of rules.  */</div><div class='del'>-#define YYNRULES  43</div><div class='add'>+#define YYNRULES  45</div><div class='ctx'> /* YYNRULES -- Number of states.  */</div><div class='del'>-#define YYNSTATES  67</div><div class='add'>+#define YYNSTATES  76</div><div class='ctx'> </div><div class='ctx'> /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */</div><div class='ctx'> #define YYUNDEFTOK  2</div><div class='del'>-#define YYMAXUTOK   267</div><div class='add'>+#define YYMAXUTOK   268</div><div class='ctx'> </div><div class='ctx'> #define YYTRANSLATE(YYX)						\</div><div class='ctx'>   ((unsigned int) (YYX) &lt;= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)</div><div class='hunk'>@@ -411,15 +416,15 @@ static const yytype_uint8 yytranslate[] =</div><div class='ctx'>        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,</div><div class='ctx'>        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,</div><div class='ctx'>        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,</div><div class='del'>-       2,     2,     2,     2,    23,    14,     2,    15,     2,     2,</div><div class='del'>-       2,     2,     2,     2,     2,     2,     2,     2,     2,    13,</div><div class='del'>-      19,    18,    20,     2,     2,     2,     2,     2,     2,     2,</div><div class='add'>+      24,    26,     2,     2,    25,    15,     2,    16,     2,     2,</div><div class='add'>+       2,     2,     2,     2,     2,     2,     2,     2,     2,    14,</div><div class='add'>+      20,    19,    21,     2,     2,     2,     2,     2,     2,     2,</div><div class='ctx'>        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,</div><div class='ctx'>        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,</div><div class='del'>-       2,    21,     2,    22,     2,     2,     2,     2,     2,     2,</div><div class='add'>+       2,    22,     2,    23,     2,     2,     2,     2,     2,     2,</div><div class='ctx'>        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,</div><div class='ctx'>        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,</div><div class='del'>-       2,     2,     2,    16,     2,    17,     2,     2,     2,     2,</div><div class='add'>+       2,     2,     2,    17,     2,    18,     2,     2,     2,     2,</div><div class='ctx'>        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,</div><div class='ctx'>        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,</div><div class='ctx'>        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,</div><div class='hunk'>@@ -433,7 +438,7 @@ static const yytype_uint8 yytranslate[] =</div><div class='ctx'>        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,</div><div class='ctx'>        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,</div><div class='ctx'>        2,     2,     2,     2,     2,     2,     1,     2,     3,     4,</div><div class='del'>-       5,     6,     7,     8,     9,    10,    11,    12</div><div class='add'>+       5,     6,     7,     8,     9,    10,    11,    12,    13</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #if YYDEBUG</div><div class='hunk'>@@ -443,37 +448,39 @@ static const yytype_uint8 yyprhs[] =</div><div class='ctx'> {</div><div class='ctx'>        0,     0,     3,     8,    11,    12,    15,    21,    22,    25,</div><div class='ctx'>       27,    34,    36,    38,    41,    47,    48,    51,    57,    61,</div><div class='del'>-      64,    69,    74,    77,    80,    81,    84,    87,    88,    91,</div><div class='del'>-      94,    97,    98,   100,   102,   105,   106,   109,   112,   113,</div><div class='del'>-     116,   119,   123,   124</div><div class='add'>+      64,    69,    74,    77,    87,    93,    96,    97,   100,   103,</div><div class='add'>+     104,   107,   110,   113,   114,   116,   118,   121,   122,   125,</div><div class='add'>+     128,   129,   132,   135,   139,   140</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* YYRHS -- A `-1'-separated list of the rules' RHS.  */</div><div class='ctx'> static const yytype_int8 yyrhs[] =</div><div class='ctx'> {</div><div class='del'>-      25,     0,    -1,     3,    13,    26,    31,    -1,    28,    31,</div><div class='del'>-      -1,    -1,    27,    26,    -1,    43,     4,    30,    30,    13,</div><div class='del'>-      -1,    -1,    29,    28,    -1,    27,    -1,    43,     4,    30,</div><div class='del'>-      14,    30,    13,    -1,     6,    -1,     7,    -1,    15,    32,</div><div class='del'>-      -1,    16,    33,    41,    17,    13,    -1,    -1,    33,    34,</div><div class='del'>-      -1,    43,     5,    18,    35,    13,    -1,    43,     5,    13,</div><div class='del'>-      -1,    36,    10,    -1,    36,    19,    37,    20,    -1,    36,</div><div class='del'>-      21,    40,    22,    -1,    36,    12,    -1,    35,    11,    -1,</div><div class='del'>-      -1,    35,    23,    -1,    36,    11,    -1,    -1,    37,    39,</div><div class='del'>-      -1,    37,    12,    -1,    37,    11,    -1,    -1,     8,    -1,</div><div class='del'>-       6,    -1,    38,     7,    -1,    -1,    40,     9,    -1,    40,</div><div class='del'>-      11,    -1,    -1,    42,    41,    -1,    42,    34,    -1,    43,</div><div class='del'>-       5,    32,    -1,    -1,    11,    -1</div><div class='add'>+      28,     0,    -1,     3,    14,    29,    34,    -1,    31,    34,</div><div class='add'>+      -1,    -1,    30,    29,    -1,    46,     4,    33,    33,    14,</div><div class='add'>+      -1,    -1,    32,    31,    -1,    30,    -1,    46,     4,    33,</div><div class='add'>+      15,    33,    14,    -1,     6,    -1,     7,    -1,    16,    35,</div><div class='add'>+      -1,    17,    36,    44,    18,    14,    -1,    -1,    36,    37,</div><div class='add'>+      -1,    46,     5,    19,    38,    14,    -1,    46,     5,    14,</div><div class='add'>+      -1,    39,    10,    -1,    39,    20,    40,    21,    -1,    39,</div><div class='add'>+      22,    43,    23,    -1,    39,    12,    -1,    39,    13,    24,</div><div class='add'>+      10,    25,    33,    25,    33,    26,    -1,    39,    13,    24,</div><div class='add'>+      10,    26,    -1,    38,    11,    -1,    -1,    38,    25,    -1,</div><div class='add'>+      39,    11,    -1,    -1,    40,    42,    -1,    40,    12,    -1,</div><div class='add'>+      40,    11,    -1,    -1,     8,    -1,     6,    -1,    41,     7,</div><div class='add'>+      -1,    -1,    43,     9,    -1,    43,    11,    -1,    -1,    45,</div><div class='add'>+      44,    -1,    45,    37,    -1,    46,     5,    35,    -1,    -1,</div><div class='add'>+      11,    -1</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */</div><div class='ctx'> static const yytype_uint16 yyrline[] =</div><div class='ctx'> {</div><div class='del'>-       0,    85,    85,    89,    97,   100,   107,   115,   118,   125,</div><div class='del'>-     129,   136,   140,   147,   154,   162,   165,   172,   176,   183,</div><div class='del'>-     187,   191,   195,   199,   207,   210,   214,   222,   225,   229,</div><div class='del'>-     234,   242,   245,   249,   253,   261,   264,   268,   276,   279,</div><div class='del'>-     283,   291,   299,   302</div><div class='add'>+       0,    89,    89,    93,   101,   104,   111,   119,   122,   129,</div><div class='add'>+     133,   140,   144,   151,   158,   166,   169,   176,   180,   187,</div><div class='add'>+     191,   195,   199,   203,   220,   231,   239,   242,   246,   254,</div><div class='add'>+     257,   261,   266,   274,   277,   281,   285,   293,   296,   300,</div><div class='add'>+     308,   311,   315,   323,   331,   334</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -484,12 +491,12 @@ static const char *const yytname[] =</div><div class='ctx'> {</div><div class='ctx'>   "$end", "error", "$undefined", "DT_V1", "DT_MEMRESERVE",</div><div class='ctx'>   "DT_PROPNODENAME", "DT_LITERAL", "DT_LEGACYLITERAL", "DT_BASE",</div><div class='del'>-  "DT_BYTE", "DT_STRING", "DT_LABEL", "DT_REF", "';'", "'-'", "'/'", "'{'",</div><div class='del'>-  "'}'", "'='", "'&lt;'", "'&gt;'", "'['", "']'", "','", "$accept", "sourcefile",</div><div class='del'>-  "memreserves", "memreserve", "v0_memreserves", "v0_memreserve", "addr",</div><div class='del'>-  "devicetree", "nodedef", "proplist", "propdef", "propdata",</div><div class='del'>-  "propdataprefix", "celllist", "cellbase", "cellval", "bytestring",</div><div class='del'>-  "subnodes", "subnode", "label", 0</div><div class='add'>+  "DT_BYTE", "DT_STRING", "DT_LABEL", "DT_REF", "DT_INCBIN", "';'", "'-'",</div><div class='add'>+  "'/'", "'{'", "'}'", "'='", "'&lt;'", "'&gt;'", "'['", "']'", "'('", "','",</div><div class='add'>+  "')'", "$accept", "sourcefile", "memreserves", "memreserve",</div><div class='add'>+  "v0_memreserves", "v0_memreserve", "addr", "devicetree", "nodedef",</div><div class='add'>+  "proplist", "propdef", "propdata", "propdataprefix", "celllist",</div><div class='add'>+  "cellbase", "cellval", "bytestring", "subnodes", "subnode", "label", 0</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -499,19 +506,19 @@ static const char *const yytname[] =</div><div class='ctx'> static const yytype_uint16 yytoknum[] =</div><div class='ctx'> {</div><div class='ctx'>        0,   256,   257,   258,   259,   260,   261,   262,   263,   264,</div><div class='del'>-     265,   266,   267,    59,    45,    47,   123,   125,    61,    60,</div><div class='del'>-      62,    91,    93,    44</div><div class='add'>+     265,   266,   267,   268,    59,    45,    47,   123,   125,    61,</div><div class='add'>+      60,    62,    91,    93,    40,    44,    41</div><div class='ctx'> };</div><div class='ctx'> # endif</div><div class='ctx'> </div><div class='ctx'> /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */</div><div class='ctx'> static const yytype_uint8 yyr1[] =</div><div class='ctx'> {</div><div class='del'>-       0,    24,    25,    25,    26,    26,    27,    28,    28,    29,</div><div class='del'>-      29,    30,    30,    31,    32,    33,    33,    34,    34,    35,</div><div class='del'>-      35,    35,    35,    35,    36,    36,    36,    37,    37,    37,</div><div class='del'>-      37,    38,    38,    39,    39,    40,    40,    40,    41,    41,</div><div class='del'>-      41,    42,    43,    43</div><div class='add'>+       0,    27,    28,    28,    29,    29,    30,    31,    31,    32,</div><div class='add'>+      32,    33,    33,    34,    35,    36,    36,    37,    37,    38,</div><div class='add'>+      38,    38,    38,    38,    38,    38,    39,    39,    39,    40,</div><div class='add'>+      40,    40,    40,    41,    41,    42,    42,    43,    43,    43,</div><div class='add'>+      44,    44,    44,    45,    46,    46</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */</div><div class='hunk'>@@ -519,9 +526,9 @@ static const yytype_uint8 yyr2[] =</div><div class='ctx'> {</div><div class='ctx'>        0,     2,     4,     2,     0,     2,     5,     0,     2,     1,</div><div class='ctx'>        6,     1,     1,     2,     5,     0,     2,     5,     3,     2,</div><div class='del'>-       4,     4,     2,     2,     0,     2,     2,     0,     2,     2,</div><div class='del'>-       2,     0,     1,     1,     2,     0,     2,     2,     0,     2,</div><div class='del'>-       2,     3,     0,     1</div><div class='add'>+       4,     4,     2,     9,     5,     2,     0,     2,     2,     0,</div><div class='add'>+       2,     2,     2,     0,     1,     1,     2,     0,     2,     2,</div><div class='add'>+       0,     2,     2,     3,     0,     1</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state</div><div class='hunk'>@@ -529,81 +536,86 @@ static const yytype_uint8 yyr2[] =</div><div class='ctx'>    means the default is an error.  */</div><div class='ctx'> static const yytype_uint8 yydefact[] =</div><div class='ctx'> {</div><div class='del'>-       7,     0,    43,     0,     9,     0,     7,     0,     4,     1,</div><div class='add'>+       7,     0,    45,     0,     9,     0,     7,     0,     4,     1,</div><div class='ctx'>        0,     3,     8,     0,     0,     4,     0,    15,    13,    11,</div><div class='del'>-      12,     0,     2,     5,     0,    38,     0,     0,     0,    16,</div><div class='del'>-       0,    38,     0,     0,     6,     0,    40,    39,     0,    10,</div><div class='del'>-      14,    18,    24,    41,     0,     0,    23,    17,    25,    19,</div><div class='del'>-      26,    22,    27,    35,    31,     0,    33,    32,    30,    29,</div><div class='del'>-      20,     0,    28,    36,    37,    21,    34</div><div class='add'>+      12,     0,     2,     5,     0,    40,     0,     0,     0,    16,</div><div class='add'>+       0,    40,     0,     0,     6,     0,    42,    41,     0,    10,</div><div class='add'>+      14,    18,    26,    43,     0,     0,    25,    17,    27,    19,</div><div class='add'>+      28,    22,     0,    29,    37,     0,    33,     0,     0,    35,</div><div class='add'>+      34,    32,    31,    20,     0,    30,    38,    39,    21,     0,</div><div class='add'>+      24,    36,     0,     0,     0,    23</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* YYDEFGOTO[NTERM-NUM].  */</div><div class='ctx'> static const yytype_int8 yydefgoto[] =</div><div class='ctx'> {</div><div class='ctx'>       -1,     3,    14,     4,     5,     6,    27,    11,    18,    25,</div><div class='del'>-      29,    44,    45,    54,    61,    62,    55,    30,    31,     7</div><div class='add'>+      29,    44,    45,    56,    64,    65,    57,    30,    31,     7</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing</div><div class='ctx'>    STATE-NUM.  */</div><div class='del'>-#define YYPACT_NINF -13</div><div class='add'>+#define YYPACT_NINF -14</div><div class='ctx'> static const yytype_int8 yypact[] =</div><div class='ctx'> {</div><div class='del'>-      23,    11,   -13,    37,   -13,    -4,    18,    39,    18,   -13,</div><div class='del'>-      28,   -13,   -13,    34,    -4,    18,    41,   -13,   -13,   -13,</div><div class='del'>-     -13,    25,   -13,   -13,    34,    -3,    34,    33,    34,   -13,</div><div class='del'>-      30,    -3,    43,    36,   -13,    38,   -13,   -13,    20,   -13,</div><div class='del'>-     -13,   -13,   -13,   -13,     2,     9,   -13,   -13,   -13,   -13,</div><div class='del'>-     -13,   -13,   -13,   -13,    -2,    -6,   -13,   -13,   -13,   -13,</div><div class='del'>-     -13,    45,   -13,   -13,   -13,   -13,   -13</div><div class='add'>+      30,   -11,   -14,     7,   -14,    -1,    27,    13,    27,   -14,</div><div class='add'>+       8,   -14,   -14,    40,    -1,    27,    35,   -14,   -14,   -14,</div><div class='add'>+     -14,    21,   -14,   -14,    40,    24,    40,    28,    40,   -14,</div><div class='add'>+      32,    24,    46,    38,   -14,    39,   -14,   -14,    26,   -14,</div><div class='add'>+     -14,   -14,   -14,   -14,    -9,    10,   -14,   -14,   -14,   -14,</div><div class='add'>+     -14,   -14,    31,   -14,   -14,    44,    -2,     3,    23,   -14,</div><div class='add'>+     -14,   -14,   -14,   -14,    50,   -14,   -14,   -14,   -14,    40,</div><div class='add'>+     -14,   -14,    33,    40,    36,   -14</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* YYPGOTO[NTERM-NUM].  */</div><div class='ctx'> static const yytype_int8 yypgoto[] =</div><div class='ctx'> {</div><div class='del'>-     -13,   -13,    35,    27,    47,   -13,   -12,    40,    17,   -13,</div><div class='del'>-      26,   -13,   -13,   -13,   -13,   -13,   -13,    29,   -13,    -8</div><div class='add'>+     -14,   -14,    48,    29,    53,   -14,   -13,    47,    34,   -14,</div><div class='add'>+      37,   -14,   -14,   -14,   -14,   -14,   -14,    42,   -14,    -7</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If</div><div class='ctx'>    positive, shift that token.  If negative, reduce the rule which</div><div class='ctx'>    number is the opposite.  If zero, do what YYDEFACT says.</div><div class='ctx'>    If YYTABLE_NINF, syntax error.  */</div><div class='del'>-#define YYTABLE_NINF -43</div><div class='add'>+#define YYTABLE_NINF -45</div><div class='ctx'> static const yytype_int8 yytable[] =</div><div class='ctx'> {</div><div class='del'>-      16,    21,   -42,    63,    56,    64,    57,    16,     2,    58,</div><div class='del'>-      59,    10,    28,    46,    33,    47,    65,    32,    60,    49,</div><div class='del'>-      50,    51,   -42,    32,     8,    48,     1,   -42,    52,     2,</div><div class='del'>-      53,    19,    20,    41,     2,    15,    17,     9,    42,    26,</div><div class='del'>-      19,    20,    15,    13,    17,    24,    34,    35,    38,    39,</div><div class='del'>-      23,    40,    66,    12,    22,    43,     0,    36,     0,     0,</div><div class='del'>-      37</div><div class='add'>+      21,    16,    46,     8,    59,    47,    60,     9,    16,    61,</div><div class='add'>+      62,    28,    66,    33,    67,    10,    48,    13,    32,    63,</div><div class='add'>+      49,    50,    51,    52,    32,    17,    68,    19,    20,   -44,</div><div class='add'>+      53,   -44,    54,     1,   -44,     2,    26,    15,     2,    24,</div><div class='add'>+      41,     2,    34,    17,    15,    42,    19,    20,    69,    70,</div><div class='add'>+      35,    38,    39,    40,    58,    55,    72,    71,    73,    12,</div><div class='add'>+      74,    22,    75,    23,     0,     0,     0,     0,    36,     0,</div><div class='add'>+       0,     0,    43,    37</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const yytype_int8 yycheck[] =</div><div class='ctx'> {</div><div class='del'>-       8,    13,     5,     9,     6,    11,     8,    15,    11,    11,</div><div class='del'>-      12,    15,    24,    11,    26,    13,    22,    25,    20,    10,</div><div class='del'>-      11,    12,     4,    31,    13,    23,     3,     4,    19,    11,</div><div class='del'>-      21,     6,     7,    13,    11,     8,    16,     0,    18,    14,</div><div class='del'>-       6,     7,    15,     4,    16,     4,    13,    17,     5,    13,</div><div class='del'>-      15,    13,     7,     6,    14,    38,    -1,    31,    -1,    -1,</div><div class='del'>-      31</div><div class='add'>+      13,     8,    11,    14,     6,    14,     8,     0,    15,    11,</div><div class='add'>+      12,    24,     9,    26,    11,    16,    25,     4,    25,    21,</div><div class='add'>+      10,    11,    12,    13,    31,    17,    23,     6,     7,     5,</div><div class='add'>+      20,     4,    22,     3,     4,    11,    15,     8,    11,     4,</div><div class='add'>+      14,    11,    14,    17,    15,    19,     6,     7,    25,    26,</div><div class='add'>+      18,     5,    14,    14,    10,    24,    69,     7,    25,     6,</div><div class='add'>+      73,    14,    26,    15,    -1,    -1,    -1,    -1,    31,    -1,</div><div class='add'>+      -1,    -1,    38,    31</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing</div><div class='ctx'>    symbol of state STATE-NUM.  */</div><div class='ctx'> static const yytype_uint8 yystos[] =</div><div class='ctx'> {</div><div class='del'>-       0,     3,    11,    25,    27,    28,    29,    43,    13,     0,</div><div class='del'>-      15,    31,    28,     4,    26,    27,    43,    16,    32,     6,</div><div class='del'>-       7,    30,    31,    26,     4,    33,    14,    30,    30,    34,</div><div class='del'>-      41,    42,    43,    30,    13,    17,    34,    41,     5,    13,</div><div class='del'>-      13,    13,    18,    32,    35,    36,    11,    13,    23,    10,</div><div class='del'>-      11,    12,    19,    21,    37,    40,     6,     8,    11,    12,</div><div class='del'>-      20,    38,    39,     9,    11,    22,     7</div><div class='add'>+       0,     3,    11,    28,    30,    31,    32,    46,    14,     0,</div><div class='add'>+      16,    34,    31,     4,    29,    30,    46,    17,    35,     6,</div><div class='add'>+       7,    33,    34,    29,     4,    36,    15,    33,    33,    37,</div><div class='add'>+      44,    45,    46,    33,    14,    18,    37,    44,     5,    14,</div><div class='add'>+      14,    14,    19,    35,    38,    39,    11,    14,    25,    10,</div><div class='add'>+      11,    12,    13,    20,    22,    24,    40,    43,    10,     6,</div><div class='add'>+       8,    11,    12,    21,    41,    42,     9,    11,    23,    25,</div><div class='add'>+      26,     7,    33,    25,    33,    26</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define yyerrok		(yyerrstatus = 0)</div><div class='hunk'>@@ -1440,289 +1452,323 @@ yyreduce:</div><div class='ctx'>   switch (yyn)</div><div class='ctx'>     {</div><div class='ctx'>         case 2:</div><div class='del'>-#line 86 "dtc-parser.y"</div><div class='add'>+#line 90 "dtc-parser.y"</div><div class='ctx'>     {</div><div class='del'>-			the_boot_info = build_boot_info((yyvsp[(3) - (4)].re), (yyvsp[(4) - (4)].node));</div><div class='add'>+			the_boot_info = build_boot_info((yyvsp[(3) - (4)].re), (yyvsp[(4) - (4)].node), 0);</div><div class='ctx'> 		;}</div><div class='ctx'>     break;</div><div class='ctx'> </div><div class='ctx'>   case 3:</div><div class='del'>-#line 90 "dtc-parser.y"</div><div class='add'>+#line 94 "dtc-parser.y"</div><div class='ctx'>     {</div><div class='del'>-			the_boot_info = build_boot_info((yyvsp[(1) - (2)].re), (yyvsp[(2) - (2)].node));</div><div class='add'>+			the_boot_info = build_boot_info((yyvsp[(1) - (2)].re), (yyvsp[(2) - (2)].node), 0);</div><div class='ctx'> 		;}</div><div class='ctx'>     break;</div><div class='ctx'> </div><div class='ctx'>   case 4:</div><div class='del'>-#line 97 "dtc-parser.y"</div><div class='add'>+#line 101 "dtc-parser.y"</div><div class='ctx'>     {</div><div class='ctx'> 			(yyval.re) = NULL;</div><div class='ctx'> 		;}</div><div class='ctx'>     break;</div><div class='ctx'> </div><div class='ctx'>   case 5:</div><div class='del'>-#line 101 "dtc-parser.y"</div><div class='add'>+#line 105 "dtc-parser.y"</div><div class='ctx'>     {</div><div class='ctx'> 			(yyval.re) = chain_reserve_entry((yyvsp[(1) - (2)].re), (yyvsp[(2) - (2)].re));</div><div class='ctx'> 		;}</div><div class='ctx'>     break;</div><div class='ctx'> </div><div class='ctx'>   case 6:</div><div class='del'>-#line 108 "dtc-parser.y"</div><div class='add'>+#line 112 "dtc-parser.y"</div><div class='ctx'>     {</div><div class='ctx'> 			(yyval.re) = build_reserve_entry((yyvsp[(3) - (5)].addr), (yyvsp[(4) - (5)].addr), (yyvsp[(1) - (5)].labelref));</div><div class='ctx'> 		;}</div><div class='ctx'>     break;</div><div class='ctx'> </div><div class='ctx'>   case 7:</div><div class='del'>-#line 115 "dtc-parser.y"</div><div class='add'>+#line 119 "dtc-parser.y"</div><div class='ctx'>     {</div><div class='ctx'> 			(yyval.re) = NULL;</div><div class='ctx'> 		;}</div><div class='ctx'>     break;</div><div class='ctx'> </div><div class='ctx'>   case 8:</div><div class='del'>-#line 119 "dtc-parser.y"</div><div class='add'>+#line 123 "dtc-parser.y"</div><div class='ctx'>     {</div><div class='ctx'> 			(yyval.re) = chain_reserve_entry((yyvsp[(1) - (2)].re), (yyvsp[(2) - (2)].re));</div><div class='ctx'> 		;}</div><div class='ctx'>     break;</div><div class='ctx'> </div><div class='ctx'>   case 9:</div><div class='del'>-#line 126 "dtc-parser.y"</div><div class='add'>+#line 130 "dtc-parser.y"</div><div class='ctx'>     {</div><div class='ctx'> 			(yyval.re) = (yyvsp[(1) - (1)].re);</div><div class='ctx'> 		;}</div><div class='ctx'>     break;</div><div class='ctx'> </div><div class='ctx'>   case 10:</div><div class='del'>-#line 130 "dtc-parser.y"</div><div class='add'>+#line 134 "dtc-parser.y"</div><div class='ctx'>     {</div><div class='ctx'> 			(yyval.re) = build_reserve_entry((yyvsp[(3) - (6)].addr), (yyvsp[(5) - (6)].addr) - (yyvsp[(3) - (6)].addr) + 1, (yyvsp[(1) - (6)].labelref));</div><div class='ctx'> 		;}</div><div class='ctx'>     break;</div><div class='ctx'> </div><div class='ctx'>   case 11:</div><div class='del'>-#line 137 "dtc-parser.y"</div><div class='add'>+#line 141 "dtc-parser.y"</div><div class='ctx'>     {</div><div class='ctx'> 			(yyval.addr) = eval_literal((yyvsp[(1) - (1)].literal), 0, 64);</div><div class='ctx'> 		;}</div><div class='ctx'>     break;</div><div class='ctx'> </div><div class='ctx'>   case 12:</div><div class='del'>-#line 141 "dtc-parser.y"</div><div class='add'>+#line 145 "dtc-parser.y"</div><div class='ctx'>     {</div><div class='ctx'> 			(yyval.addr) = eval_literal((yyvsp[(1) - (1)].literal), 16, 64);</div><div class='ctx'> 		;}</div><div class='ctx'>     break;</div><div class='ctx'> </div><div class='ctx'>   case 13:</div><div class='del'>-#line 148 "dtc-parser.y"</div><div class='add'>+#line 152 "dtc-parser.y"</div><div class='ctx'>     {</div><div class='ctx'> 			(yyval.node) = name_node((yyvsp[(2) - (2)].node), "", NULL);</div><div class='ctx'> 		;}</div><div class='ctx'>     break;</div><div class='ctx'> </div><div class='ctx'>   case 14:</div><div class='del'>-#line 155 "dtc-parser.y"</div><div class='add'>+#line 159 "dtc-parser.y"</div><div class='ctx'>     {</div><div class='ctx'> 			(yyval.node) = build_node((yyvsp[(2) - (5)].proplist), (yyvsp[(3) - (5)].nodelist));</div><div class='ctx'> 		;}</div><div class='ctx'>     break;</div><div class='ctx'> </div><div class='ctx'>   case 15:</div><div class='del'>-#line 162 "dtc-parser.y"</div><div class='add'>+#line 166 "dtc-parser.y"</div><div class='ctx'>     {</div><div class='ctx'> 			(yyval.proplist) = NULL;</div><div class='ctx'> 		;}</div><div class='ctx'>     break;</div><div class='ctx'> </div><div class='ctx'>   case 16:</div><div class='del'>-#line 166 "dtc-parser.y"</div><div class='add'>+#line 170 "dtc-parser.y"</div><div class='ctx'>     {</div><div class='ctx'> 			(yyval.proplist) = chain_property((yyvsp[(2) - (2)].prop), (yyvsp[(1) - (2)].proplist));</div><div class='ctx'> 		;}</div><div class='ctx'>     break;</div><div class='ctx'> </div><div class='ctx'>   case 17:</div><div class='del'>-#line 173 "dtc-parser.y"</div><div class='add'>+#line 177 "dtc-parser.y"</div><div class='ctx'>     {</div><div class='ctx'> 			(yyval.prop) = build_property((yyvsp[(2) - (5)].propnodename), (yyvsp[(4) - (5)].data), (yyvsp[(1) - (5)].labelref));</div><div class='ctx'> 		;}</div><div class='ctx'>     break;</div><div class='ctx'> </div><div class='ctx'>   case 18:</div><div class='del'>-#line 177 "dtc-parser.y"</div><div class='add'>+#line 181 "dtc-parser.y"</div><div class='ctx'>     {</div><div class='ctx'> 			(yyval.prop) = build_property((yyvsp[(2) - (3)].propnodename), empty_data, (yyvsp[(1) - (3)].labelref));</div><div class='ctx'> 		;}</div><div class='ctx'>     break;</div><div class='ctx'> </div><div class='ctx'>   case 19:</div><div class='del'>-#line 184 "dtc-parser.y"</div><div class='add'>+#line 188 "dtc-parser.y"</div><div class='ctx'>     {</div><div class='ctx'> 			(yyval.data) = data_merge((yyvsp[(1) - (2)].data), (yyvsp[(2) - (2)].data));</div><div class='ctx'> 		;}</div><div class='ctx'>     break;</div><div class='ctx'> </div><div class='ctx'>   case 20:</div><div class='del'>-#line 188 "dtc-parser.y"</div><div class='add'>+#line 192 "dtc-parser.y"</div><div class='ctx'>     {</div><div class='ctx'> 			(yyval.data) = data_merge((yyvsp[(1) - (4)].data), (yyvsp[(3) - (4)].data));</div><div class='ctx'> 		;}</div><div class='ctx'>     break;</div><div class='ctx'> </div><div class='ctx'>   case 21:</div><div class='del'>-#line 192 "dtc-parser.y"</div><div class='add'>+#line 196 "dtc-parser.y"</div><div class='ctx'>     {</div><div class='ctx'> 			(yyval.data) = data_merge((yyvsp[(1) - (4)].data), (yyvsp[(3) - (4)].data));</div><div class='ctx'> 		;}</div><div class='ctx'>     break;</div><div class='ctx'> </div><div class='ctx'>   case 22:</div><div class='del'>-#line 196 "dtc-parser.y"</div><div class='add'>+#line 200 "dtc-parser.y"</div><div class='ctx'>     {</div><div class='ctx'> 			(yyval.data) = data_add_marker((yyvsp[(1) - (2)].data), REF_PATH, (yyvsp[(2) - (2)].labelref));</div><div class='ctx'> 		;}</div><div class='ctx'>     break;</div><div class='ctx'> </div><div class='ctx'>   case 23:</div><div class='del'>-#line 200 "dtc-parser.y"</div><div class='add'>+#line 204 "dtc-parser.y"</div><div class='ctx'>     {</div><div class='del'>-			(yyval.data) = data_add_marker((yyvsp[(1) - (2)].data), LABEL, (yyvsp[(2) - (2)].labelref));</div><div class='add'>+			struct search_path path = { srcpos_file-&gt;dir, NULL, NULL };</div><div class='add'>+			struct dtc_file *file = dtc_open_file((yyvsp[(4) - (9)].data).val, &amp;path);</div><div class='add'>+			struct data d = empty_data;</div><div class='add'>+</div><div class='add'>+			if ((yyvsp[(6) - (9)].addr) != 0)</div><div class='add'>+				if (fseek(file-&gt;file, (yyvsp[(6) - (9)].addr), SEEK_SET) != 0)</div><div class='add'>+					yyerrorf("Couldn't seek to offset %llu in \"%s\": %s",</div><div class='add'>+						 (unsigned long long)(yyvsp[(6) - (9)].addr),</div><div class='add'>+						 (yyvsp[(4) - (9)].data).val, strerror(errno));</div><div class='add'>+</div><div class='add'>+			d = data_copy_file(file-&gt;file, (yyvsp[(8) - (9)].addr));</div><div class='add'>+</div><div class='add'>+			(yyval.data) = data_merge((yyvsp[(1) - (9)].data), d);</div><div class='add'>+			dtc_close_file(file);</div><div class='ctx'> 		;}</div><div class='ctx'>     break;</div><div class='ctx'> </div><div class='ctx'>   case 24:</div><div class='del'>-#line 207 "dtc-parser.y"</div><div class='add'>+#line 221 "dtc-parser.y"</div><div class='ctx'>     {</div><div class='del'>-			(yyval.data) = empty_data;</div><div class='add'>+			struct search_path path = { srcpos_file-&gt;dir, NULL, NULL };</div><div class='add'>+			struct dtc_file *file = dtc_open_file((yyvsp[(4) - (5)].data).val, &amp;path);</div><div class='add'>+			struct data d = empty_data;</div><div class='add'>+</div><div class='add'>+			d = data_copy_file(file-&gt;file, -1);</div><div class='add'>+</div><div class='add'>+			(yyval.data) = data_merge((yyvsp[(1) - (5)].data), d);</div><div class='add'>+			dtc_close_file(file);</div><div class='ctx'> 		;}</div><div class='ctx'>     break;</div><div class='ctx'> </div><div class='ctx'>   case 25:</div><div class='del'>-#line 211 "dtc-parser.y"</div><div class='add'>+#line 232 "dtc-parser.y"</div><div class='ctx'>     {</div><div class='del'>-			(yyval.data) = (yyvsp[(1) - (2)].data);</div><div class='add'>+			(yyval.data) = data_add_marker((yyvsp[(1) - (2)].data), LABEL, (yyvsp[(2) - (2)].labelref));</div><div class='ctx'> 		;}</div><div class='ctx'>     break;</div><div class='ctx'> </div><div class='ctx'>   case 26:</div><div class='del'>-#line 215 "dtc-parser.y"</div><div class='add'>+#line 239 "dtc-parser.y"</div><div class='ctx'>     {</div><div class='del'>-			(yyval.data) = data_add_marker((yyvsp[(1) - (2)].data), LABEL, (yyvsp[(2) - (2)].labelref));</div><div class='add'>+			(yyval.data) = empty_data;</div><div class='ctx'> 		;}</div><div class='ctx'>     break;</div><div class='ctx'> </div><div class='ctx'>   case 27:</div><div class='del'>-#line 222 "dtc-parser.y"</div><div class='add'>+#line 243 "dtc-parser.y"</div><div class='ctx'>     {</div><div class='del'>-			(yyval.data) = empty_data;</div><div class='add'>+			(yyval.data) = (yyvsp[(1) - (2)].data);</div><div class='ctx'> 		;}</div><div class='ctx'>     break;</div><div class='ctx'> </div><div class='ctx'>   case 28:</div><div class='del'>-#line 226 "dtc-parser.y"</div><div class='add'>+#line 247 "dtc-parser.y"</div><div class='ctx'>     {</div><div class='del'>-			(yyval.data) = data_append_cell((yyvsp[(1) - (2)].data), (yyvsp[(2) - (2)].cell));</div><div class='add'>+			(yyval.data) = data_add_marker((yyvsp[(1) - (2)].data), LABEL, (yyvsp[(2) - (2)].labelref));</div><div class='ctx'> 		;}</div><div class='ctx'>     break;</div><div class='ctx'> </div><div class='ctx'>   case 29:</div><div class='del'>-#line 230 "dtc-parser.y"</div><div class='add'>+#line 254 "dtc-parser.y"</div><div class='add'>+    {</div><div class='add'>+			(yyval.data) = empty_data;</div><div class='add'>+		;}</div><div class='add'>+    break;</div><div class='add'>+</div><div class='add'>+  case 30:</div><div class='add'>+#line 258 "dtc-parser.y"</div><div class='add'>+    {</div><div class='add'>+			(yyval.data) = data_append_cell((yyvsp[(1) - (2)].data), (yyvsp[(2) - (2)].cell));</div><div class='add'>+		;}</div><div class='add'>+    break;</div><div class='add'>+</div><div class='add'>+  case 31:</div><div class='add'>+#line 262 "dtc-parser.y"</div><div class='ctx'>     {</div><div class='ctx'> 			(yyval.data) = data_append_cell(data_add_marker((yyvsp[(1) - (2)].data), REF_PHANDLE,</div><div class='ctx'> 							      (yyvsp[(2) - (2)].labelref)), -1);</div><div class='ctx'> 		;}</div><div class='ctx'>     break;</div><div class='ctx'> </div><div class='del'>-  case 30:</div><div class='del'>-#line 235 "dtc-parser.y"</div><div class='add'>+  case 32:</div><div class='add'>+#line 267 "dtc-parser.y"</div><div class='ctx'>     {</div><div class='ctx'> 			(yyval.data) = data_add_marker((yyvsp[(1) - (2)].data), LABEL, (yyvsp[(2) - (2)].labelref));</div><div class='ctx'> 		;}</div><div class='ctx'>     break;</div><div class='ctx'> </div><div class='del'>-  case 31:</div><div class='del'>-#line 242 "dtc-parser.y"</div><div class='add'>+  case 33:</div><div class='add'>+#line 274 "dtc-parser.y"</div><div class='ctx'>     {</div><div class='ctx'> 			(yyval.cbase) = 16;</div><div class='ctx'> 		;}</div><div class='ctx'>     break;</div><div class='ctx'> </div><div class='del'>-  case 33:</div><div class='del'>-#line 250 "dtc-parser.y"</div><div class='add'>+  case 35:</div><div class='add'>+#line 282 "dtc-parser.y"</div><div class='ctx'>     {</div><div class='ctx'> 			(yyval.cell) = eval_literal((yyvsp[(1) - (1)].literal), 0, 32);</div><div class='ctx'> 		;}</div><div class='ctx'>     break;</div><div class='ctx'> </div><div class='del'>-  case 34:</div><div class='del'>-#line 254 "dtc-parser.y"</div><div class='add'>+  case 36:</div><div class='add'>+#line 286 "dtc-parser.y"</div><div class='ctx'>     {</div><div class='ctx'> 			(yyval.cell) = eval_literal((yyvsp[(2) - (2)].literal), (yyvsp[(1) - (2)].cbase), 32);</div><div class='ctx'> 		;}</div><div class='ctx'>     break;</div><div class='ctx'> </div><div class='del'>-  case 35:</div><div class='del'>-#line 261 "dtc-parser.y"</div><div class='add'>+  case 37:</div><div class='add'>+#line 293 "dtc-parser.y"</div><div class='ctx'>     {</div><div class='ctx'> 			(yyval.data) = empty_data;</div><div class='ctx'> 		;}</div><div class='ctx'>     break;</div><div class='ctx'> </div><div class='del'>-  case 36:</div><div class='del'>-#line 265 "dtc-parser.y"</div><div class='add'>+  case 38:</div><div class='add'>+#line 297 "dtc-parser.y"</div><div class='ctx'>     {</div><div class='ctx'> 			(yyval.data) = data_append_byte((yyvsp[(1) - (2)].data), (yyvsp[(2) - (2)].byte));</div><div class='ctx'> 		;}</div><div class='ctx'>     break;</div><div class='ctx'> </div><div class='del'>-  case 37:</div><div class='del'>-#line 269 "dtc-parser.y"</div><div class='add'>+  case 39:</div><div class='add'>+#line 301 "dtc-parser.y"</div><div class='ctx'>     {</div><div class='ctx'> 			(yyval.data) = data_add_marker((yyvsp[(1) - (2)].data), LABEL, (yyvsp[(2) - (2)].labelref));</div><div class='ctx'> 		;}</div><div class='ctx'>     break;</div><div class='ctx'> </div><div class='del'>-  case 38:</div><div class='del'>-#line 276 "dtc-parser.y"</div><div class='add'>+  case 40:</div><div class='add'>+#line 308 "dtc-parser.y"</div><div class='ctx'>     {</div><div class='ctx'> 			(yyval.nodelist) = NULL;</div><div class='ctx'> 		;}</div><div class='ctx'>     break;</div><div class='ctx'> </div><div class='del'>-  case 39:</div><div class='del'>-#line 280 "dtc-parser.y"</div><div class='add'>+  case 41:</div><div class='add'>+#line 312 "dtc-parser.y"</div><div class='ctx'>     {</div><div class='ctx'> 			(yyval.nodelist) = chain_node((yyvsp[(1) - (2)].node), (yyvsp[(2) - (2)].nodelist));</div><div class='ctx'> 		;}</div><div class='ctx'>     break;</div><div class='ctx'> </div><div class='del'>-  case 40:</div><div class='del'>-#line 284 "dtc-parser.y"</div><div class='add'>+  case 42:</div><div class='add'>+#line 316 "dtc-parser.y"</div><div class='ctx'>     {</div><div class='del'>-			yyerror("syntax error: properties must precede subnodes\n");</div><div class='add'>+			yyerror("syntax error: properties must precede subnodes");</div><div class='ctx'> 			YYERROR;</div><div class='ctx'> 		;}</div><div class='ctx'>     break;</div><div class='ctx'> </div><div class='del'>-  case 41:</div><div class='del'>-#line 292 "dtc-parser.y"</div><div class='add'>+  case 43:</div><div class='add'>+#line 324 "dtc-parser.y"</div><div class='ctx'>     {</div><div class='ctx'> 			(yyval.node) = name_node((yyvsp[(3) - (3)].node), (yyvsp[(2) - (3)].propnodename), (yyvsp[(1) - (3)].labelref));</div><div class='ctx'> 		;}</div><div class='ctx'>     break;</div><div class='ctx'> </div><div class='del'>-  case 42:</div><div class='del'>-#line 299 "dtc-parser.y"</div><div class='add'>+  case 44:</div><div class='add'>+#line 331 "dtc-parser.y"</div><div class='ctx'>     {</div><div class='ctx'> 			(yyval.labelref) = NULL;</div><div class='ctx'> 		;}</div><div class='ctx'>     break;</div><div class='ctx'> </div><div class='del'>-  case 43:</div><div class='del'>-#line 303 "dtc-parser.y"</div><div class='add'>+  case 45:</div><div class='add'>+#line 335 "dtc-parser.y"</div><div class='ctx'>     {</div><div class='ctx'> 			(yyval.labelref) = (yyvsp[(1) - (1)].labelref);</div><div class='ctx'> 		;}</div><div class='hunk'>@@ -1730,7 +1776,7 @@ yyreduce:</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* Line 1267 of yacc.c.  */</div><div class='del'>-#line 1734 "dtc-parser.tab.c"</div><div class='add'>+#line 1780 "dtc-parser.tab.c"</div><div class='ctx'>       default: break;</div><div class='ctx'>     }</div><div class='ctx'>   YY_SYMBOL_PRINT ("-&gt; $$ =", yyr1[yyn], &amp;yyval, &amp;yyloc);</div><div class='hunk'>@@ -1950,21 +1996,32 @@ yyreturn:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#line 308 "dtc-parser.y"</div><div class='add'>+#line 340 "dtc-parser.y"</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-void yyerror (char const *s)</div><div class='add'>+void yyerrorf(char const *s, ...)</div><div class='ctx'> {</div><div class='del'>-	const char *fname = srcpos_filename_for_num(yylloc.filenum);</div><div class='add'>+	const char *fname = srcpos_file ? srcpos_file-&gt;name : "&lt;no-file&gt;";</div><div class='add'>+	va_list va;</div><div class='add'>+	va_start(va, s);</div><div class='ctx'> </div><div class='ctx'> 	if (strcmp(fname, "-") == 0)</div><div class='ctx'> 		fname = "stdin";</div><div class='ctx'> </div><div class='del'>-	fprintf(stderr, "%s:%d %s\n",</div><div class='del'>-		fname, yylloc.first_line, s);</div><div class='add'>+	fprintf(stderr, "%s:%d ", fname, yylloc.first_line);</div><div class='add'>+	vfprintf(stderr, s, va);</div><div class='add'>+	fprintf(stderr, "\n");</div><div class='add'>+</div><div class='add'>+	treesource_error = 1;</div><div class='add'>+	va_end(va);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void yyerror (char const *s)</div><div class='add'>+{</div><div class='add'>+	yyerrorf("%s", s);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-unsigned long long eval_literal(const char *s, int base, int bits)</div><div class='add'>+static unsigned long long eval_literal(const char *s, int base, int bits)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long long val;</div><div class='ctx'> 	char *e;</div><div class='head'>diff --git a/arch/powerpc/boot/dtc-src/dtc-parser.tab.h_shipped b/arch/powerpc/boot/dtc-src/dtc-parser.tab.h_shipped<br/>index 4707b029ed25..ba99100d55c9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dtc-src/dtc-parser.tab.h_shipped?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/boot/dtc-src/dtc-parser.tab.h_shipped</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dtc-src/dtc-parser.tab.h_shipped?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dtc-src/dtc-parser.tab.h_shipped</a></div><div class='hunk'>@@ -48,7 +48,8 @@</div><div class='ctx'>      DT_BYTE = 264,</div><div class='ctx'>      DT_STRING = 265,</div><div class='ctx'>      DT_LABEL = 266,</div><div class='del'>-     DT_REF = 267</div><div class='add'>+     DT_REF = 267,</div><div class='add'>+     DT_INCBIN = 268</div><div class='ctx'>    };</div><div class='ctx'> #endif</div><div class='ctx'> /* Tokens.  */</div><div class='hunk'>@@ -62,22 +63,23 @@</div><div class='ctx'> #define DT_STRING 265</div><div class='ctx'> #define DT_LABEL 266</div><div class='ctx'> #define DT_REF 267</div><div class='add'>+#define DT_INCBIN 268</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #if ! defined YYSTYPE &amp;&amp; ! defined YYSTYPE_IS_DECLARED</div><div class='ctx'> typedef union YYSTYPE</div><div class='del'>-#line 34 "dtc-parser.y"</div><div class='add'>+#line 37 "dtc-parser.y"</div><div class='ctx'> {</div><div class='ctx'> 	char *propnodename;</div><div class='ctx'> 	char *literal;</div><div class='ctx'> 	char *labelref;</div><div class='ctx'> 	unsigned int cbase;</div><div class='del'>-	u8 byte;</div><div class='add'>+	uint8_t byte;</div><div class='ctx'> 	struct data data;</div><div class='ctx'> </div><div class='del'>-	u64 addr;</div><div class='add'>+	uint64_t addr;</div><div class='ctx'> 	cell_t cell;</div><div class='ctx'> 	struct property *prop;</div><div class='ctx'> 	struct property *proplist;</div><div class='hunk'>@@ -86,7 +88,7 @@ typedef union YYSTYPE</div><div class='ctx'> 	struct reserve_info *re;</div><div class='ctx'> }</div><div class='ctx'> /* Line 1489 of yacc.c.  */</div><div class='del'>-#line 90 "dtc-parser.tab.h"</div><div class='add'>+#line 92 "dtc-parser.tab.h"</div><div class='ctx'> 	YYSTYPE;</div><div class='ctx'> # define yystype YYSTYPE /* obsolescent; will be withdrawn */</div><div class='ctx'> # define YYSTYPE_IS_DECLARED 1</div><div class='head'>diff --git a/arch/powerpc/boot/dtc-src/dtc-parser.y b/arch/powerpc/boot/dtc-src/dtc-parser.y<br/>index 002ea7fef184..b2ab562420ea 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dtc-src/dtc-parser.y?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/boot/dtc-src/dtc-parser.y</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dtc-src/dtc-parser.y?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dtc-src/dtc-parser.y</a></div><div class='hunk'>@@ -21,14 +21,17 @@</div><div class='ctx'> %locations</div><div class='ctx'> </div><div class='ctx'> %{</div><div class='add'>+#include &lt;stdio.h&gt;</div><div class='add'>+</div><div class='ctx'> #include "dtc.h"</div><div class='ctx'> #include "srcpos.h"</div><div class='ctx'> </div><div class='del'>-int yylex(void);</div><div class='del'>-unsigned long long eval_literal(const char *s, int base, int bits);</div><div class='add'>+extern int yylex(void);</div><div class='ctx'> </div><div class='ctx'> extern struct boot_info *the_boot_info;</div><div class='add'>+extern int treesource_error;</div><div class='ctx'> </div><div class='add'>+static unsigned long long eval_literal(const char *s, int base, int bits);</div><div class='ctx'> %}</div><div class='ctx'> </div><div class='ctx'> %union {</div><div class='hunk'>@@ -36,10 +39,10 @@ extern struct boot_info *the_boot_info;</div><div class='ctx'> 	char *literal;</div><div class='ctx'> 	char *labelref;</div><div class='ctx'> 	unsigned int cbase;</div><div class='del'>-	u8 byte;</div><div class='add'>+	uint8_t byte;</div><div class='ctx'> 	struct data data;</div><div class='ctx'> </div><div class='del'>-	u64 addr;</div><div class='add'>+	uint64_t addr;</div><div class='ctx'> 	cell_t cell;</div><div class='ctx'> 	struct property *prop;</div><div class='ctx'> 	struct property *proplist;</div><div class='hunk'>@@ -58,6 +61,7 @@ extern struct boot_info *the_boot_info;</div><div class='ctx'> %token &lt;data&gt; DT_STRING</div><div class='ctx'> %token &lt;labelref&gt; DT_LABEL</div><div class='ctx'> %token &lt;labelref&gt; DT_REF</div><div class='add'>+%token DT_INCBIN</div><div class='ctx'> </div><div class='ctx'> %type &lt;data&gt; propdata</div><div class='ctx'> %type &lt;data&gt; propdataprefix</div><div class='hunk'>@@ -84,11 +88,11 @@ extern struct boot_info *the_boot_info;</div><div class='ctx'> sourcefile:</div><div class='ctx'> 	  DT_V1 ';' memreserves devicetree</div><div class='ctx'> 		{</div><div class='del'>-			the_boot_info = build_boot_info($3, $4);</div><div class='add'>+			the_boot_info = build_boot_info($3, $4, 0);</div><div class='ctx'> 		}</div><div class='ctx'> 	| v0_memreserves devicetree</div><div class='ctx'> 		{</div><div class='del'>-			the_boot_info = build_boot_info($1, $2);</div><div class='add'>+			the_boot_info = build_boot_info($1, $2, 0);</div><div class='ctx'> 		}</div><div class='ctx'> 	;</div><div class='ctx'> </div><div class='hunk'>@@ -196,6 +200,34 @@ propdata:</div><div class='ctx'> 		{</div><div class='ctx'> 			$$ = data_add_marker($1, REF_PATH, $2);</div><div class='ctx'> 		}</div><div class='add'>+	| propdataprefix DT_INCBIN '(' DT_STRING ',' addr ',' addr ')'</div><div class='add'>+		{</div><div class='add'>+			struct search_path path = { srcpos_file-&gt;dir, NULL, NULL };</div><div class='add'>+			struct dtc_file *file = dtc_open_file($4.val, &amp;path);</div><div class='add'>+			struct data d = empty_data;</div><div class='add'>+</div><div class='add'>+			if ($6 != 0)</div><div class='add'>+				if (fseek(file-&gt;file, $6, SEEK_SET) != 0)</div><div class='add'>+					yyerrorf("Couldn't seek to offset %llu in \"%s\": %s",</div><div class='add'>+						 (unsigned long long)$6,</div><div class='add'>+						 $4.val, strerror(errno));</div><div class='add'>+</div><div class='add'>+			d = data_copy_file(file-&gt;file, $8);</div><div class='add'>+</div><div class='add'>+			$$ = data_merge($1, d);</div><div class='add'>+			dtc_close_file(file);</div><div class='add'>+		}</div><div class='add'>+	| propdataprefix DT_INCBIN '(' DT_STRING ')'</div><div class='add'>+		{</div><div class='add'>+			struct search_path path = { srcpos_file-&gt;dir, NULL, NULL };</div><div class='add'>+			struct dtc_file *file = dtc_open_file($4.val, &amp;path);</div><div class='add'>+			struct data d = empty_data;</div><div class='add'>+</div><div class='add'>+			d = data_copy_file(file-&gt;file, -1);</div><div class='add'>+</div><div class='add'>+			$$ = data_merge($1, d);</div><div class='add'>+			dtc_close_file(file);</div><div class='add'>+		}</div><div class='ctx'> 	| propdata DT_LABEL</div><div class='ctx'> 		{</div><div class='ctx'> 			$$ = data_add_marker($1, LABEL, $2);</div><div class='hunk'>@@ -282,7 +314,7 @@ subnodes:</div><div class='ctx'> 		}</div><div class='ctx'> 	| subnode propdef</div><div class='ctx'> 		{</div><div class='del'>-			yyerror("syntax error: properties must precede subnodes\n");</div><div class='add'>+			yyerror("syntax error: properties must precede subnodes");</div><div class='ctx'> 			YYERROR;</div><div class='ctx'> 		}</div><div class='ctx'> 	;</div><div class='hunk'>@@ -307,18 +339,29 @@ label:</div><div class='ctx'> </div><div class='ctx'> %%</div><div class='ctx'> </div><div class='del'>-void yyerror (char const *s)</div><div class='add'>+void yyerrorf(char const *s, ...)</div><div class='ctx'> {</div><div class='del'>-	const char *fname = srcpos_filename_for_num(yylloc.filenum);</div><div class='add'>+	const char *fname = srcpos_file ? srcpos_file-&gt;name : "&lt;no-file&gt;";</div><div class='add'>+	va_list va;</div><div class='add'>+	va_start(va, s);</div><div class='ctx'> </div><div class='ctx'> 	if (strcmp(fname, "-") == 0)</div><div class='ctx'> 		fname = "stdin";</div><div class='ctx'> </div><div class='del'>-	fprintf(stderr, "%s:%d %s\n",</div><div class='del'>-		fname, yylloc.first_line, s);</div><div class='add'>+	fprintf(stderr, "%s:%d ", fname, yylloc.first_line);</div><div class='add'>+	vfprintf(stderr, s, va);</div><div class='add'>+	fprintf(stderr, "\n");</div><div class='add'>+</div><div class='add'>+	treesource_error = 1;</div><div class='add'>+	va_end(va);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void yyerror (char const *s)</div><div class='add'>+{</div><div class='add'>+	yyerrorf("%s", s);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-unsigned long long eval_literal(const char *s, int base, int bits)</div><div class='add'>+static unsigned long long eval_literal(const char *s, int base, int bits)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long long val;</div><div class='ctx'> 	char *e;</div><div class='head'>diff --git a/arch/powerpc/boot/dtc-src/dtc.c b/arch/powerpc/boot/dtc-src/dtc.c<br/>index 01131d7c2d5e..d8fd43b4ac1a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dtc-src/dtc.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/boot/dtc-src/dtc.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dtc-src/dtc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dtc-src/dtc.c</a></div><div class='hunk'>@@ -55,7 +55,7 @@ char *join_path(const char *path, const char *name)</div><div class='ctx'> 	return str;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void fill_fullpaths(struct node *tree, const char *prefix)</div><div class='add'>+static void fill_fullpaths(struct node *tree, const char *prefix)</div><div class='ctx'> {</div><div class='ctx'> 	struct node *child;</div><div class='ctx'> 	const char *unit;</div><div class='hunk'>@@ -106,7 +106,7 @@ static void  __attribute__ ((noreturn)) usage(void)</div><div class='ctx'> 	fprintf(stderr, "\t\tForce - try to produce output even if the input tree has errors\n");</div><div class='ctx'> 	fprintf(stderr, "\t-v\n");</div><div class='ctx'> 	fprintf(stderr, "\t\tPrint DTC version and exit\n");</div><div class='del'>-	exit(2);</div><div class='add'>+	exit(3);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int main(int argc, char *argv[])</div><div class='hunk'>@@ -118,10 +118,9 @@ int main(int argc, char *argv[])</div><div class='ctx'> 	int force = 0, check = 0;</div><div class='ctx'> 	const char *arg;</div><div class='ctx'> 	int opt;</div><div class='del'>-	FILE *inf = NULL;</div><div class='ctx'> 	FILE *outf = NULL;</div><div class='ctx'> 	int outversion = DEFAULT_FDT_VERSION;</div><div class='del'>-	int boot_cpuid_phys = 0xfeedbeef;</div><div class='add'>+	long long cmdline_boot_cpuid = -1;</div><div class='ctx'> </div><div class='ctx'> 	quiet      = 0;</div><div class='ctx'> 	reservenum = 0;</div><div class='hunk'>@@ -161,11 +160,11 @@ int main(int argc, char *argv[])</div><div class='ctx'> 			quiet++;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 'b':</div><div class='del'>-			boot_cpuid_phys = strtol(optarg, NULL, 0);</div><div class='add'>+			cmdline_boot_cpuid = strtoll(optarg, NULL, 0);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 'v':</div><div class='del'>-		    printf("Version: %s\n", DTC_VERSION);</div><div class='del'>-		    exit(0);</div><div class='add'>+			printf("Version: %s\n", DTC_VERSION);</div><div class='add'>+			exit(0);</div><div class='ctx'> 		case 'h':</div><div class='ctx'> 		default:</div><div class='ctx'> 			usage();</div><div class='hunk'>@@ -180,31 +179,27 @@ int main(int argc, char *argv[])</div><div class='ctx'> 		arg = argv[optind];</div><div class='ctx'> </div><div class='ctx'> 	/* minsize and padsize are mutually exclusive */</div><div class='del'>-	if ((minsize) &amp;&amp; (padsize)) {</div><div class='add'>+	if (minsize &amp;&amp; padsize)</div><div class='ctx'> 		die("Can't set both -p and -S\n");</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	fprintf(stderr, "DTC: %s-&gt;%s  on file \"%s\"\n",</div><div class='ctx'> 		inform, outform, arg);</div><div class='ctx'> </div><div class='del'>-	if (streq(inform, "dts")) {</div><div class='add'>+	if (streq(inform, "dts"))</div><div class='ctx'> 		bi = dt_from_source(arg);</div><div class='del'>-	} else if (streq(inform, "fs")) {</div><div class='add'>+	else if (streq(inform, "fs"))</div><div class='ctx'> 		bi = dt_from_fs(arg);</div><div class='del'>-	} else if(streq(inform, "dtb")) {</div><div class='del'>-		inf = dtc_open_file(arg);</div><div class='del'>-		bi = dt_from_blob(inf);</div><div class='del'>-	} else {</div><div class='add'>+	else if(streq(inform, "dtb"))</div><div class='add'>+		bi = dt_from_blob(arg);</div><div class='add'>+	else</div><div class='ctx'> 		die("Unknown input format \"%s\"\n", inform);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	if (inf &amp;&amp; (inf != stdin))</div><div class='del'>-		fclose(inf);</div><div class='add'>+	if (cmdline_boot_cpuid != -1)</div><div class='add'>+		bi-&gt;boot_cpuid_phys = cmdline_boot_cpuid;</div><div class='ctx'> </div><div class='del'>-	if (! bi || ! bi-&gt;dt)</div><div class='del'>-		die("Couldn't read input tree\n");</div><div class='add'>+	fill_fullpaths(bi-&gt;dt, "");</div><div class='add'>+	process_checks(force, bi);</div><div class='ctx'> </div><div class='del'>-	process_checks(force, bi, check, outversion, boot_cpuid_phys);</div><div class='ctx'> </div><div class='ctx'> 	if (streq(outname, "-")) {</div><div class='ctx'> 		outf = stdout;</div><div class='hunk'>@@ -218,9 +213,9 @@ int main(int argc, char *argv[])</div><div class='ctx'> 	if (streq(outform, "dts")) {</div><div class='ctx'> 		dt_to_source(outf, bi);</div><div class='ctx'> 	} else if (streq(outform, "dtb")) {</div><div class='del'>-		dt_to_blob(outf, bi, outversion, boot_cpuid_phys);</div><div class='add'>+		dt_to_blob(outf, bi, outversion);</div><div class='ctx'> 	} else if (streq(outform, "asm")) {</div><div class='del'>-		dt_to_asm(outf, bi, outversion, boot_cpuid_phys);</div><div class='add'>+		dt_to_asm(outf, bi, outversion);</div><div class='ctx'> 	} else if (streq(outform, "null")) {</div><div class='ctx'> 		/* do nothing */</div><div class='ctx'> 	} else {</div><div class='head'>diff --git a/arch/powerpc/boot/dtc-src/dtc.h b/arch/powerpc/boot/dtc-src/dtc.h<br/>index 65281777a167..08d54c870086 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dtc-src/dtc.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/boot/dtc-src/dtc.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dtc-src/dtc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dtc-src/dtc.h</a></div><div class='hunk'>@@ -30,10 +30,8 @@</div><div class='ctx'> #include &lt;ctype.h&gt;</div><div class='ctx'> #include &lt;errno.h&gt;</div><div class='ctx'> #include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;netinet/in.h&gt;</div><div class='del'>-#include &lt;endian.h&gt;</div><div class='del'>-#include &lt;byteswap.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;libfdt_env.h&gt;</div><div class='ctx'> #include &lt;fdt.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define DEFAULT_FDT_VERSION	17</div><div class='hunk'>@@ -75,25 +73,8 @@ static inline void *xrealloc(void *p, size_t len)</div><div class='ctx'> 	return new;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-typedef uint8_t u8;</div><div class='del'>-typedef uint16_t u16;</div><div class='del'>-typedef uint32_t u32;</div><div class='del'>-typedef uint64_t u64;</div><div class='del'>-typedef u32 cell_t;</div><div class='add'>+typedef uint32_t cell_t;</div><div class='ctx'> </div><div class='del'>-#define cpu_to_be16(x)	htons(x)</div><div class='del'>-#define be16_to_cpu(x)	ntohs(x)</div><div class='del'>-</div><div class='del'>-#define cpu_to_be32(x)	htonl(x)</div><div class='del'>-#define be32_to_cpu(x)	ntohl(x)</div><div class='del'>-</div><div class='del'>-#if __BYTE_ORDER == __BIG_ENDIAN</div><div class='del'>-#define cpu_to_be64(x)	(x)</div><div class='del'>-#define be64_to_cpu(x)	(x)</div><div class='del'>-#else</div><div class='del'>-#define cpu_to_be64(x)	bswap_64(x)</div><div class='del'>-#define be64_to_cpu(x)	bswap_64(x)</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> #define streq(a, b)	(strcmp((a), (b)) == 0)</div><div class='ctx'> #define strneq(a, b, n)	(strncmp((a), (b), (n)) == 0)</div><div class='hunk'>@@ -118,7 +99,6 @@ struct  marker {</div><div class='ctx'> struct data {</div><div class='ctx'> 	int len;</div><div class='ctx'> 	char *val;</div><div class='del'>-	int asize;</div><div class='ctx'> 	struct marker *markers;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -145,7 +125,7 @@ struct data data_insert_at_marker(struct data d, struct marker *m,</div><div class='ctx'> struct data data_merge(struct data d1, struct data d2);</div><div class='ctx'> struct data data_append_cell(struct data d, cell_t word);</div><div class='ctx'> struct data data_append_re(struct data d, const struct fdt_reserve_entry *re);</div><div class='del'>-struct data data_append_addr(struct data d, u64 addr);</div><div class='add'>+struct data data_append_addr(struct data d, uint64_t addr);</div><div class='ctx'> struct data data_append_byte(struct data d, uint8_t byte);</div><div class='ctx'> struct data data_append_zeroes(struct data d, int len);</div><div class='ctx'> struct data data_append_align(struct data d, int align);</div><div class='hunk'>@@ -223,7 +203,7 @@ struct reserve_info {</div><div class='ctx'> 	char *label;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct reserve_info *build_reserve_entry(u64 start, u64 len, char *label);</div><div class='add'>+struct reserve_info *build_reserve_entry(uint64_t start, uint64_t len, char *label);</div><div class='ctx'> struct reserve_info *chain_reserve_entry(struct reserve_info *first,</div><div class='ctx'> 					 struct reserve_info *list);</div><div class='ctx'> struct reserve_info *add_reserve_entry(struct reserve_info *list,</div><div class='hunk'>@@ -233,24 +213,22 @@ struct reserve_info *add_reserve_entry(struct reserve_info *list,</div><div class='ctx'> struct boot_info {</div><div class='ctx'> 	struct reserve_info *reservelist;</div><div class='ctx'> 	struct node *dt;		/* the device tree */</div><div class='add'>+	uint32_t boot_cpuid_phys;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct boot_info *build_boot_info(struct reserve_info *reservelist,</div><div class='del'>-				  struct node *tree);</div><div class='add'>+				  struct node *tree, uint32_t boot_cpuid_phys);</div><div class='ctx'> </div><div class='ctx'> /* Checks */</div><div class='ctx'> </div><div class='del'>-void process_checks(int force, struct boot_info *bi,</div><div class='del'>-		    int checkflag, int outversion, int boot_cpuid_phys);</div><div class='add'>+void process_checks(int force, struct boot_info *bi);</div><div class='ctx'> </div><div class='ctx'> /* Flattened trees */</div><div class='ctx'> </div><div class='del'>-void dt_to_blob(FILE *f, struct boot_info *bi, int version,</div><div class='del'>-		int boot_cpuid_phys);</div><div class='del'>-void dt_to_asm(FILE *f, struct boot_info *bi, int version,</div><div class='del'>-	       int boot_cpuid_phys);</div><div class='add'>+void dt_to_blob(FILE *f, struct boot_info *bi, int version);</div><div class='add'>+void dt_to_asm(FILE *f, struct boot_info *bi, int version);</div><div class='ctx'> </div><div class='del'>-struct boot_info *dt_from_blob(FILE *f);</div><div class='add'>+struct boot_info *dt_from_blob(const char *fname);</div><div class='ctx'> </div><div class='ctx'> /* Tree source */</div><div class='ctx'> </div><div class='hunk'>@@ -264,6 +242,5 @@ struct boot_info *dt_from_fs(const char *dirname);</div><div class='ctx'> /* misc */</div><div class='ctx'> </div><div class='ctx'> char *join_path(const char *path, const char *name);</div><div class='del'>-void fill_fullpaths(struct node *tree, const char *prefix);</div><div class='ctx'> </div><div class='ctx'> #endif /* _DTC_H */</div><div class='head'>diff --git a/arch/powerpc/boot/dtc-src/flattree.c b/arch/powerpc/boot/dtc-src/flattree.c<br/>index a7cfb843d334..76acd28c068d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dtc-src/flattree.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/boot/dtc-src/flattree.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dtc-src/flattree.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dtc-src/flattree.c</a></div><div class='hunk'>@@ -19,6 +19,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "dtc.h"</div><div class='add'>+#include "srcpos.h"</div><div class='ctx'> </div><div class='ctx'> #define FTF_FULLPATH	0x1</div><div class='ctx'> #define FTF_VARALIGN	0x2</div><div class='hunk'>@@ -162,28 +163,18 @@ static void asm_emit_data(void *e, struct data d)</div><div class='ctx'> {</div><div class='ctx'> 	FILE *f = e;</div><div class='ctx'> 	int off = 0;</div><div class='del'>-	struct marker *m;</div><div class='add'>+	struct marker *m = d.markers;</div><div class='ctx'> </div><div class='del'>-	m = d.markers;</div><div class='del'>-	while (m) {</div><div class='del'>-		if (m-&gt;type == LABEL)</div><div class='del'>-			emit_offset_label(f, m-&gt;ref, m-&gt;offset);</div><div class='del'>-		m = m-&gt;next;</div><div class='del'>-	}</div><div class='add'>+	for_each_marker_of_type(m, LABEL)</div><div class='add'>+		emit_offset_label(f, m-&gt;ref, m-&gt;offset);</div><div class='ctx'> </div><div class='del'>-	while ((d.len - off) &gt;= sizeof(u32)) {</div><div class='add'>+	while ((d.len - off) &gt;= sizeof(uint32_t)) {</div><div class='ctx'> 		fprintf(f, "\t.long\t0x%x\n",</div><div class='del'>-			be32_to_cpu(*((u32 *)(d.val+off))));</div><div class='del'>-		off += sizeof(u32);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((d.len - off) &gt;= sizeof(u16)) {</div><div class='del'>-		fprintf(f, "\t.short\t0x%hx\n",</div><div class='del'>-			be16_to_cpu(*((u16 *)(d.val+off))));</div><div class='del'>-		off += sizeof(u16);</div><div class='add'>+			fdt32_to_cpu(*((uint32_t *)(d.val+off))));</div><div class='add'>+		off += sizeof(uint32_t);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((d.len - off) &gt;= 1) {</div><div class='add'>+	while ((d.len - off) &gt;= 1) {</div><div class='ctx'> 		fprintf(f, "\t.byte\t0x%hhx\n", d.val[off]);</div><div class='ctx'> 		off += 1;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -336,29 +327,28 @@ static void make_fdt_header(struct fdt_header *fdt,</div><div class='ctx'> </div><div class='ctx'> 	memset(fdt, 0xff, sizeof(*fdt));</div><div class='ctx'> </div><div class='del'>-	fdt-&gt;magic = cpu_to_be32(FDT_MAGIC);</div><div class='del'>-	fdt-&gt;version = cpu_to_be32(vi-&gt;version);</div><div class='del'>-	fdt-&gt;last_comp_version = cpu_to_be32(vi-&gt;last_comp_version);</div><div class='add'>+	fdt-&gt;magic = cpu_to_fdt32(FDT_MAGIC);</div><div class='add'>+	fdt-&gt;version = cpu_to_fdt32(vi-&gt;version);</div><div class='add'>+	fdt-&gt;last_comp_version = cpu_to_fdt32(vi-&gt;last_comp_version);</div><div class='ctx'> </div><div class='ctx'> 	/* Reserve map should be doubleword aligned */</div><div class='ctx'> 	reserve_off = ALIGN(vi-&gt;hdr_size, 8);</div><div class='ctx'> </div><div class='del'>-	fdt-&gt;off_mem_rsvmap = cpu_to_be32(reserve_off);</div><div class='del'>-	fdt-&gt;off_dt_struct = cpu_to_be32(reserve_off + reservesize);</div><div class='del'>-	fdt-&gt;off_dt_strings = cpu_to_be32(reserve_off + reservesize</div><div class='add'>+	fdt-&gt;off_mem_rsvmap = cpu_to_fdt32(reserve_off);</div><div class='add'>+	fdt-&gt;off_dt_struct = cpu_to_fdt32(reserve_off + reservesize);</div><div class='add'>+	fdt-&gt;off_dt_strings = cpu_to_fdt32(reserve_off + reservesize</div><div class='ctx'> 					  + dtsize);</div><div class='del'>-	fdt-&gt;totalsize = cpu_to_be32(reserve_off + reservesize + dtsize + strsize);</div><div class='add'>+	fdt-&gt;totalsize = cpu_to_fdt32(reserve_off + reservesize + dtsize + strsize);</div><div class='ctx'> </div><div class='ctx'> 	if (vi-&gt;flags &amp; FTF_BOOTCPUID)</div><div class='del'>-		fdt-&gt;boot_cpuid_phys = cpu_to_be32(boot_cpuid_phys);</div><div class='add'>+		fdt-&gt;boot_cpuid_phys = cpu_to_fdt32(boot_cpuid_phys);</div><div class='ctx'> 	if (vi-&gt;flags &amp; FTF_STRTABSIZE)</div><div class='del'>-		fdt-&gt;size_dt_strings = cpu_to_be32(strsize);</div><div class='add'>+		fdt-&gt;size_dt_strings = cpu_to_fdt32(strsize);</div><div class='ctx'> 	if (vi-&gt;flags &amp; FTF_STRUCTSIZE)</div><div class='del'>-		fdt-&gt;size_dt_struct = cpu_to_be32(dtsize);</div><div class='add'>+		fdt-&gt;size_dt_struct = cpu_to_fdt32(dtsize);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void dt_to_blob(FILE *f, struct boot_info *bi, int version,</div><div class='del'>-		int boot_cpuid_phys)</div><div class='add'>+void dt_to_blob(FILE *f, struct boot_info *bi, int version)</div><div class='ctx'> {</div><div class='ctx'> 	struct version_info *vi = NULL;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -383,26 +373,26 @@ void dt_to_blob(FILE *f, struct boot_info *bi, int version,</div><div class='ctx'> </div><div class='ctx'> 	/* Make header */</div><div class='ctx'> 	make_fdt_header(&amp;fdt, vi, reservebuf.len, dtbuf.len, strbuf.len,</div><div class='del'>-			boot_cpuid_phys);</div><div class='add'>+			bi-&gt;boot_cpuid_phys);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If the user asked for more space than is used, adjust the totalsize.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (minsize &gt; 0) {</div><div class='del'>-		padlen = minsize - be32_to_cpu(fdt.totalsize);</div><div class='add'>+		padlen = minsize - fdt32_to_cpu(fdt.totalsize);</div><div class='ctx'> 		if ((padlen &lt; 0) &amp;&amp; (quiet &lt; 1))</div><div class='ctx'> 			fprintf(stderr,</div><div class='ctx'> 				"Warning: blob size %d &gt;= minimum size %d\n",</div><div class='del'>-				be32_to_cpu(fdt.totalsize), minsize);</div><div class='add'>+				fdt32_to_cpu(fdt.totalsize), minsize);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (padsize &gt; 0)</div><div class='ctx'> 		padlen = padsize;</div><div class='ctx'> </div><div class='ctx'> 	if (padlen &gt; 0) {</div><div class='del'>-		int tsize = be32_to_cpu(fdt.totalsize);</div><div class='add'>+		int tsize = fdt32_to_cpu(fdt.totalsize);</div><div class='ctx'> 		tsize += padlen;</div><div class='del'>-		fdt.totalsize = cpu_to_be32(tsize);</div><div class='add'>+		fdt.totalsize = cpu_to_fdt32(tsize);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -410,7 +400,7 @@ void dt_to_blob(FILE *f, struct boot_info *bi, int version,</div><div class='ctx'> 	 * the reserve buffer, add the reserve map terminating zeroes,</div><div class='ctx'> 	 * the device tree itself, and finally the strings.</div><div class='ctx'> 	 */</div><div class='del'>-	blob = data_append_data(blob, &amp;fdt, sizeof(fdt));</div><div class='add'>+	blob = data_append_data(blob, &amp;fdt, vi-&gt;hdr_size);</div><div class='ctx'> 	blob = data_append_align(blob, 8);</div><div class='ctx'> 	blob = data_merge(blob, reservebuf);</div><div class='ctx'> 	blob = data_append_zeroes(blob, sizeof(struct fdt_reserve_entry));</div><div class='hunk'>@@ -449,7 +439,7 @@ static void dump_stringtable_asm(FILE *f, struct data strbuf)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void dt_to_asm(FILE *f, struct boot_info *bi, int version, int boot_cpuid_phys)</div><div class='add'>+void dt_to_asm(FILE *f, struct boot_info *bi, int version)</div><div class='ctx'> {</div><div class='ctx'> 	struct version_info *vi = NULL;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -489,7 +479,7 @@ void dt_to_asm(FILE *f, struct boot_info *bi, int version, int boot_cpuid_phys)</div><div class='ctx'> </div><div class='ctx'> 	if (vi-&gt;flags &amp; FTF_BOOTCPUID)</div><div class='ctx'> 		fprintf(f, "\t.long\t%i\t\t\t\t\t/* boot_cpuid_phys */\n",</div><div class='del'>-			boot_cpuid_phys);</div><div class='add'>+			bi-&gt;boot_cpuid_phys);</div><div class='ctx'> </div><div class='ctx'> 	if (vi-&gt;flags &amp; FTF_STRTABSIZE)</div><div class='ctx'> 		fprintf(f, "\t.long\t_%s_strings_end - _%s_strings_start\t/* size_dt_strings */\n",</div><div class='hunk'>@@ -579,15 +569,15 @@ static void flat_read_chunk(struct inbuf *inb, void *p, int len)</div><div class='ctx'> 	inb-&gt;ptr += len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 flat_read_word(struct inbuf *inb)</div><div class='add'>+static uint32_t flat_read_word(struct inbuf *inb)</div><div class='ctx'> {</div><div class='del'>-	u32 val;</div><div class='add'>+	uint32_t val;</div><div class='ctx'> </div><div class='ctx'> 	assert(((inb-&gt;ptr - inb-&gt;base) % sizeof(val)) == 0);</div><div class='ctx'> </div><div class='ctx'> 	flat_read_chunk(inb, &amp;val, sizeof(val));</div><div class='ctx'> </div><div class='del'>-	return be32_to_cpu(val);</div><div class='add'>+	return fdt32_to_cpu(val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void flat_realign(struct inbuf *inb, int align)</div><div class='hunk'>@@ -615,7 +605,7 @@ static char *flat_read_string(struct inbuf *inb)</div><div class='ctx'> </div><div class='ctx'> 	inb-&gt;ptr += len;</div><div class='ctx'> </div><div class='del'>-	flat_realign(inb, sizeof(u32));</div><div class='add'>+	flat_realign(inb, sizeof(uint32_t));</div><div class='ctx'> </div><div class='ctx'> 	return str;</div><div class='ctx'> }</div><div class='hunk'>@@ -632,7 +622,7 @@ static struct data flat_read_data(struct inbuf *inb, int len)</div><div class='ctx'> </div><div class='ctx'> 	flat_read_chunk(inb, d.val, len);</div><div class='ctx'> </div><div class='del'>-	flat_realign(inb, sizeof(u32));</div><div class='add'>+	flat_realign(inb, sizeof(uint32_t));</div><div class='ctx'> </div><div class='ctx'> 	return d;</div><div class='ctx'> }</div><div class='hunk'>@@ -659,7 +649,7 @@ static char *flat_read_stringtable(struct inbuf *inb, int offset)</div><div class='ctx'> static struct property *flat_read_property(struct inbuf *dtbuf,</div><div class='ctx'> 					   struct inbuf *strbuf, int flags)</div><div class='ctx'> {</div><div class='del'>-	u32 proplen, stroff;</div><div class='add'>+	uint32_t proplen, stroff;</div><div class='ctx'> 	char *name;</div><div class='ctx'> 	struct data val;</div><div class='ctx'> </div><div class='hunk'>@@ -693,8 +683,8 @@ static struct reserve_info *flat_read_mem_reserve(struct inbuf *inb)</div><div class='ctx'> 	p = inb-&gt;ptr;</div><div class='ctx'> 	while (1) {</div><div class='ctx'> 		flat_read_chunk(inb, &amp;re, sizeof(re));</div><div class='del'>-		re.address  = be64_to_cpu(re.address);</div><div class='del'>-		re.size = be64_to_cpu(re.size);</div><div class='add'>+		re.address  = fdt64_to_cpu(re.address);</div><div class='add'>+		re.size = fdt64_to_cpu(re.size);</div><div class='ctx'> 		if (re.size == 0)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='hunk'>@@ -708,77 +698,37 @@ static struct reserve_info *flat_read_mem_reserve(struct inbuf *inb)</div><div class='ctx'> </div><div class='ctx'> static char *nodename_from_path(const char *ppath, const char *cpath)</div><div class='ctx'> {</div><div class='del'>-	const char *lslash;</div><div class='ctx'> 	int plen;</div><div class='ctx'> </div><div class='del'>-	lslash = strrchr(cpath, '/');</div><div class='del'>-	if (! lslash)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	plen = lslash - cpath;</div><div class='del'>-</div><div class='del'>-	if (streq(cpath, "/") &amp;&amp; streq(ppath, ""))</div><div class='del'>-		return "";</div><div class='del'>-</div><div class='del'>-	if ((plen == 0) &amp;&amp; streq(ppath, "/"))</div><div class='del'>-		return strdup(lslash+1);</div><div class='del'>-</div><div class='del'>-	if (! strneq(ppath, cpath, plen))</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	return strdup(lslash+1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const char PROPCHAR[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789,._+*#?-";</div><div class='del'>-static const char UNITCHAR[] = "0123456789abcdef,";</div><div class='del'>-</div><div class='del'>-static int check_node_name(const char *name)</div><div class='del'>-{</div><div class='del'>-	const char *atpos;</div><div class='del'>-	int basenamelen;</div><div class='add'>+	plen = strlen(ppath);</div><div class='ctx'> </div><div class='del'>-	atpos = strrchr(name, '@');</div><div class='add'>+	if (!strneq(ppath, cpath, plen))</div><div class='add'>+		die("Path \"%s\" is not valid as a child of \"%s\"\n",</div><div class='add'>+		    cpath, ppath);</div><div class='ctx'> </div><div class='del'>-	if (atpos)</div><div class='del'>-		basenamelen = atpos - name;</div><div class='del'>-	else</div><div class='del'>-		basenamelen = strlen(name);</div><div class='del'>-</div><div class='del'>-	if (strspn(name, PROPCHAR) &lt; basenamelen)</div><div class='del'>-		return -1;</div><div class='add'>+	/* root node is a special case */</div><div class='add'>+	if (!streq(ppath, "/"))</div><div class='add'>+		plen++;</div><div class='ctx'> </div><div class='del'>-	if (atpos</div><div class='del'>-	    &amp;&amp; ((basenamelen + 1 + strspn(atpos+1, UNITCHAR)) &lt; strlen(name)))</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	return basenamelen;</div><div class='add'>+	return strdup(cpath + plen);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct node *unflatten_tree(struct inbuf *dtbuf,</div><div class='ctx'> 				   struct inbuf *strbuf,</div><div class='del'>-				   const char *parent_path, int flags)</div><div class='add'>+				   const char *parent_flatname, int flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct node *node;</div><div class='del'>-	u32 val;</div><div class='add'>+	char *flatname;</div><div class='add'>+	uint32_t val;</div><div class='ctx'> </div><div class='ctx'> 	node = build_node(NULL, NULL);</div><div class='ctx'> </div><div class='del'>-	if (flags &amp; FTF_FULLPATH) {</div><div class='del'>-		node-&gt;fullpath = flat_read_string(dtbuf);</div><div class='del'>-		node-&gt;name = nodename_from_path(parent_path, node-&gt;fullpath);</div><div class='del'>-</div><div class='del'>-		if (! node-&gt;name)</div><div class='del'>-			die("Path \"%s\" is not valid as a child of \"%s\"\n",</div><div class='del'>-			    node-&gt;fullpath, parent_path);</div><div class='del'>-	} else {</div><div class='del'>-		node-&gt;name = flat_read_string(dtbuf);</div><div class='del'>-		node-&gt;fullpath = join_path(parent_path, node-&gt;name);</div><div class='del'>-	}</div><div class='add'>+	flatname = flat_read_string(dtbuf);</div><div class='ctx'> </div><div class='del'>-	node-&gt;basenamelen = check_node_name(node-&gt;name);</div><div class='del'>-	if (node-&gt;basenamelen &lt; 0) {</div><div class='del'>-		fprintf(stderr, "Warning \"%s\" has incorrect format\n", node-&gt;name);</div><div class='del'>-	}</div><div class='add'>+	if (flags &amp; FTF_FULLPATH)</div><div class='add'>+		node-&gt;name = nodename_from_path(parent_flatname, flatname);</div><div class='add'>+	else</div><div class='add'>+		node-&gt;name = flatname;</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='ctx'> 		struct property *prop;</div><div class='hunk'>@@ -795,8 +745,7 @@ static struct node *unflatten_tree(struct inbuf *dtbuf,</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case FDT_BEGIN_NODE:</div><div class='del'>-			child = unflatten_tree(dtbuf,strbuf, node-&gt;fullpath,</div><div class='del'>-					       flags);</div><div class='add'>+			child = unflatten_tree(dtbuf,strbuf, flatname, flags);</div><div class='ctx'> 			add_child(node, child);</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='hunk'>@@ -825,10 +774,11 @@ static struct node *unflatten_tree(struct inbuf *dtbuf,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-struct boot_info *dt_from_blob(FILE *f)</div><div class='add'>+struct boot_info *dt_from_blob(const char *fname)</div><div class='ctx'> {</div><div class='del'>-	u32 magic, totalsize, version, size_str, size_dt;</div><div class='del'>-	u32 off_dt, off_str, off_mem_rsvmap;</div><div class='add'>+	struct dtc_file *dtcf;</div><div class='add'>+	uint32_t magic, totalsize, version, size_dt, boot_cpuid_phys;</div><div class='add'>+	uint32_t off_dt, off_str, off_mem_rsvmap;</div><div class='ctx'> 	int rc;</div><div class='ctx'> 	char *blob;</div><div class='ctx'> 	struct fdt_header *fdt;</div><div class='hunk'>@@ -838,54 +788,56 @@ struct boot_info *dt_from_blob(FILE *f)</div><div class='ctx'> 	int sizeleft;</div><div class='ctx'> 	struct reserve_info *reservelist;</div><div class='ctx'> 	struct node *tree;</div><div class='del'>-	u32 val;</div><div class='add'>+	uint32_t val;</div><div class='ctx'> 	int flags = 0;</div><div class='ctx'> </div><div class='del'>-	rc = fread(&amp;magic, sizeof(magic), 1, f);</div><div class='del'>-	if (ferror(f))</div><div class='add'>+	dtcf = dtc_open_file(fname, NULL);</div><div class='add'>+</div><div class='add'>+	rc = fread(&amp;magic, sizeof(magic), 1, dtcf-&gt;file);</div><div class='add'>+	if (ferror(dtcf-&gt;file))</div><div class='ctx'> 		die("Error reading DT blob magic number: %s\n",</div><div class='ctx'> 		    strerror(errno));</div><div class='ctx'> 	if (rc &lt; 1) {</div><div class='del'>-		if (feof(f))</div><div class='add'>+		if (feof(dtcf-&gt;file))</div><div class='ctx'> 			die("EOF reading DT blob magic number\n");</div><div class='ctx'> 		else</div><div class='ctx'> 			die("Mysterious short read reading magic number\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	magic = be32_to_cpu(magic);</div><div class='add'>+	magic = fdt32_to_cpu(magic);</div><div class='ctx'> 	if (magic != FDT_MAGIC)</div><div class='ctx'> 		die("Blob has incorrect magic number\n");</div><div class='ctx'> </div><div class='del'>-	rc = fread(&amp;totalsize, sizeof(totalsize), 1, f);</div><div class='del'>-	if (ferror(f))</div><div class='add'>+	rc = fread(&amp;totalsize, sizeof(totalsize), 1, dtcf-&gt;file);</div><div class='add'>+	if (ferror(dtcf-&gt;file))</div><div class='ctx'> 		die("Error reading DT blob size: %s\n", strerror(errno));</div><div class='ctx'> 	if (rc &lt; 1) {</div><div class='del'>-		if (feof(f))</div><div class='add'>+		if (feof(dtcf-&gt;file))</div><div class='ctx'> 			die("EOF reading DT blob size\n");</div><div class='ctx'> 		else</div><div class='ctx'> 			die("Mysterious short read reading blob size\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	totalsize = be32_to_cpu(totalsize);</div><div class='add'>+	totalsize = fdt32_to_cpu(totalsize);</div><div class='ctx'> 	if (totalsize &lt; FDT_V1_SIZE)</div><div class='ctx'> 		die("DT blob size (%d) is too small\n", totalsize);</div><div class='ctx'> </div><div class='ctx'> 	blob = xmalloc(totalsize);</div><div class='ctx'> </div><div class='ctx'> 	fdt = (struct fdt_header *)blob;</div><div class='del'>-	fdt-&gt;magic = cpu_to_be32(magic);</div><div class='del'>-	fdt-&gt;totalsize = cpu_to_be32(totalsize);</div><div class='add'>+	fdt-&gt;magic = cpu_to_fdt32(magic);</div><div class='add'>+	fdt-&gt;totalsize = cpu_to_fdt32(totalsize);</div><div class='ctx'> </div><div class='ctx'> 	sizeleft = totalsize - sizeof(magic) - sizeof(totalsize);</div><div class='ctx'> 	p = blob + sizeof(magic)  + sizeof(totalsize);</div><div class='ctx'> </div><div class='ctx'> 	while (sizeleft) {</div><div class='del'>-		if (feof(f))</div><div class='add'>+		if (feof(dtcf-&gt;file))</div><div class='ctx'> 			die("EOF before reading %d bytes of DT blob\n",</div><div class='ctx'> 			    totalsize);</div><div class='ctx'> </div><div class='del'>-		rc = fread(p, 1, sizeleft, f);</div><div class='del'>-		if (ferror(f))</div><div class='add'>+		rc = fread(p, 1, sizeleft, dtcf-&gt;file);</div><div class='add'>+		if (ferror(dtcf-&gt;file))</div><div class='ctx'> 			die("Error reading DT blob: %s\n",</div><div class='ctx'> 			    strerror(errno));</div><div class='ctx'> </div><div class='hunk'>@@ -893,19 +845,11 @@ struct boot_info *dt_from_blob(FILE *f)</div><div class='ctx'> 		p += rc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	off_dt = be32_to_cpu(fdt-&gt;off_dt_struct);</div><div class='del'>-	off_str = be32_to_cpu(fdt-&gt;off_dt_strings);</div><div class='del'>-	off_mem_rsvmap = be32_to_cpu(fdt-&gt;off_mem_rsvmap);</div><div class='del'>-	version = be32_to_cpu(fdt-&gt;version);</div><div class='del'>-</div><div class='del'>-	fprintf(stderr, "\tmagic:\t\t\t0x%x\n", magic);</div><div class='del'>-	fprintf(stderr, "\ttotalsize:\t\t%d\n", totalsize);</div><div class='del'>-	fprintf(stderr, "\toff_dt_struct:\t\t0x%x\n", off_dt);</div><div class='del'>-	fprintf(stderr, "\toff_dt_strings:\t\t0x%x\n", off_str);</div><div class='del'>-	fprintf(stderr, "\toff_mem_rsvmap:\t\t0x%x\n", off_mem_rsvmap);</div><div class='del'>-	fprintf(stderr, "\tversion:\t\t0x%x\n", version );</div><div class='del'>-	fprintf(stderr, "\tlast_comp_version:\t0x%x\n",</div><div class='del'>-		be32_to_cpu(fdt-&gt;last_comp_version));</div><div class='add'>+	off_dt = fdt32_to_cpu(fdt-&gt;off_dt_struct);</div><div class='add'>+	off_str = fdt32_to_cpu(fdt-&gt;off_dt_strings);</div><div class='add'>+	off_mem_rsvmap = fdt32_to_cpu(fdt-&gt;off_mem_rsvmap);</div><div class='add'>+	version = fdt32_to_cpu(fdt-&gt;version);</div><div class='add'>+	boot_cpuid_phys = fdt32_to_cpu(fdt-&gt;boot_cpuid_phys);</div><div class='ctx'> </div><div class='ctx'> 	if (off_mem_rsvmap &gt;= totalsize)</div><div class='ctx'> 		die("Mem Reserve structure offset exceeds total size\n");</div><div class='hunk'>@@ -916,21 +860,17 @@ struct boot_info *dt_from_blob(FILE *f)</div><div class='ctx'> 	if (off_str &gt; totalsize)</div><div class='ctx'> 		die("String table offset exceeds total size\n");</div><div class='ctx'> </div><div class='del'>-	if (version &gt;= 2)</div><div class='del'>-		fprintf(stderr, "\tboot_cpuid_phys:\t0x%x\n",</div><div class='del'>-			be32_to_cpu(fdt-&gt;boot_cpuid_phys));</div><div class='del'>-</div><div class='del'>-	size_str = -1;</div><div class='ctx'> 	if (version &gt;= 3) {</div><div class='del'>-		size_str = be32_to_cpu(fdt-&gt;size_dt_strings);</div><div class='del'>-		fprintf(stderr, "\tsize_dt_strings:\t%d\n", size_str);</div><div class='add'>+		uint32_t size_str = fdt32_to_cpu(fdt-&gt;size_dt_strings);</div><div class='ctx'> 		if (off_str+size_str &gt; totalsize)</div><div class='ctx'> 			die("String table extends past total size\n");</div><div class='add'>+		inbuf_init(&amp;strbuf, blob + off_str, blob + off_str + size_str);</div><div class='add'>+	} else {</div><div class='add'>+		inbuf_init(&amp;strbuf, blob + off_str, blob + totalsize);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (version &gt;= 17) {</div><div class='del'>-		size_dt = be32_to_cpu(fdt-&gt;size_dt_struct);</div><div class='del'>-		fprintf(stderr, "\tsize_dt_struct:\t\t%d\n", size_dt);</div><div class='add'>+		size_dt = fdt32_to_cpu(fdt-&gt;size_dt_struct);</div><div class='ctx'> 		if (off_dt+size_dt &gt; totalsize)</div><div class='ctx'> 			die("Structure block extends past total size\n");</div><div class='ctx'> 	}</div><div class='hunk'>@@ -944,10 +884,6 @@ struct boot_info *dt_from_blob(FILE *f)</div><div class='ctx'> 	inbuf_init(&amp;memresvbuf,</div><div class='ctx'> 		   blob + off_mem_rsvmap, blob + totalsize);</div><div class='ctx'> 	inbuf_init(&amp;dtbuf, blob + off_dt, blob + totalsize);</div><div class='del'>-	if (size_str &gt;= 0)</div><div class='del'>-		inbuf_init(&amp;strbuf, blob + off_str, blob + off_str + size_str);</div><div class='del'>-	else</div><div class='del'>-		inbuf_init(&amp;strbuf, blob + off_str, blob + totalsize);</div><div class='ctx'> </div><div class='ctx'> 	reservelist = flat_read_mem_reserve(&amp;memresvbuf);</div><div class='ctx'> </div><div class='hunk'>@@ -964,5 +900,7 @@ struct boot_info *dt_from_blob(FILE *f)</div><div class='ctx'> </div><div class='ctx'> 	free(blob);</div><div class='ctx'> </div><div class='del'>-	return build_boot_info(reservelist, tree);</div><div class='add'>+	dtc_close_file(dtcf);</div><div class='add'>+</div><div class='add'>+	return build_boot_info(reservelist, tree, boot_cpuid_phys);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/boot/dtc-src/fstree.c b/arch/powerpc/boot/dtc-src/fstree.c<br/>index 2a160a46998e..766b2694d935 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dtc-src/fstree.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/boot/dtc-src/fstree.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dtc-src/fstree.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dtc-src/fstree.c</a></div><div class='hunk'>@@ -31,8 +31,8 @@ static struct node *read_fstree(const char *dirname)</div><div class='ctx'> 	struct node *tree;</div><div class='ctx'> </div><div class='ctx'> 	d = opendir(dirname);</div><div class='del'>-	if (! d)</div><div class='del'>-		die("opendir(): %s\n", strerror(errno));</div><div class='add'>+	if (!d)</div><div class='add'>+		die("Couldn't opendir() \"%s\": %s\n", dirname, strerror(errno));</div><div class='ctx'> </div><div class='ctx'> 	tree = build_node(NULL, NULL);</div><div class='ctx'> </div><div class='hunk'>@@ -87,8 +87,6 @@ struct boot_info *dt_from_fs(const char *dirname)</div><div class='ctx'> 	tree = read_fstree(dirname);</div><div class='ctx'> 	tree = name_node(tree, "", NULL);</div><div class='ctx'> </div><div class='del'>-	fill_fullpaths(tree, "");</div><div class='del'>-</div><div class='del'>-	return build_boot_info(NULL, tree);</div><div class='add'>+	return build_boot_info(NULL, tree, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/boot/dtc-src/libfdt_env.h b/arch/powerpc/boot/dtc-src/libfdt_env.h<br/>new file mode 100644<br/>index 000000000000..449bf602daf1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dtc-src/libfdt_env.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dtc-src/libfdt_env.h</a></div><div class='hunk'>@@ -0,0 +1,23 @@</div><div class='add'>+#ifndef _LIBFDT_ENV_H</div><div class='add'>+#define _LIBFDT_ENV_H</div><div class='add'>+</div><div class='add'>+#include &lt;stddef.h&gt;</div><div class='add'>+#include &lt;stdint.h&gt;</div><div class='add'>+#include &lt;string.h&gt;</div><div class='add'>+</div><div class='add'>+#define _B(n)	((unsigned long long)((uint8_t *)&amp;x)[n])</div><div class='add'>+static inline uint32_t fdt32_to_cpu(uint32_t x)</div><div class='add'>+{</div><div class='add'>+	return (_B(0) &lt;&lt; 24) | (_B(1) &lt;&lt; 16) | (_B(2) &lt;&lt; 8) | _B(3);</div><div class='add'>+}</div><div class='add'>+#define cpu_to_fdt32(x) fdt32_to_cpu(x)</div><div class='add'>+</div><div class='add'>+static inline uint64_t fdt64_to_cpu(uint64_t x)</div><div class='add'>+{</div><div class='add'>+	return (_B(0) &lt;&lt; 56) | (_B(1) &lt;&lt; 48) | (_B(2) &lt;&lt; 40) | (_B(3) &lt;&lt; 32)</div><div class='add'>+		| (_B(4) &lt;&lt; 24) | (_B(5) &lt;&lt; 16) | (_B(6) &lt;&lt; 8) | _B(7);</div><div class='add'>+}</div><div class='add'>+#define cpu_to_fdt64(x) fdt64_to_cpu(x)</div><div class='add'>+#undef _B</div><div class='add'>+</div><div class='add'>+#endif /* _LIBFDT_ENV_H */</div><div class='head'>diff --git a/arch/powerpc/boot/dtc-src/livetree.c b/arch/powerpc/boot/dtc-src/livetree.c<br/>index 6ba0846b4310..0ca3de550b3f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dtc-src/livetree.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/boot/dtc-src/livetree.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dtc-src/livetree.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dtc-src/livetree.c</a></div><div class='hunk'>@@ -115,6 +115,7 @@ void add_child(struct node *parent, struct node *child)</div><div class='ctx'> 	struct node **p;</div><div class='ctx'> </div><div class='ctx'> 	child-&gt;next_sibling = NULL;</div><div class='add'>+	child-&gt;parent = parent;</div><div class='ctx'> </div><div class='ctx'> 	p = &amp;parent-&gt;children;</div><div class='ctx'> 	while (*p)</div><div class='hunk'>@@ -123,7 +124,8 @@ void add_child(struct node *parent, struct node *child)</div><div class='ctx'> 	*p = child;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct reserve_info *build_reserve_entry(u64 address, u64 size, char *label)</div><div class='add'>+struct reserve_info *build_reserve_entry(uint64_t address, uint64_t size,</div><div class='add'>+					 char *label)</div><div class='ctx'> {</div><div class='ctx'> 	struct reserve_info *new = xmalloc(sizeof(*new));</div><div class='ctx'> </div><div class='hunk'>@@ -165,13 +167,14 @@ struct reserve_info *add_reserve_entry(struct reserve_info *list,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct boot_info *build_boot_info(struct reserve_info *reservelist,</div><div class='del'>-				  struct node *tree)</div><div class='add'>+				  struct node *tree, uint32_t boot_cpuid_phys)</div><div class='ctx'> {</div><div class='ctx'> 	struct boot_info *bi;</div><div class='ctx'> </div><div class='ctx'> 	bi = xmalloc(sizeof(*bi));</div><div class='ctx'> 	bi-&gt;reservelist = reservelist;</div><div class='ctx'> 	bi-&gt;dt = tree;</div><div class='add'>+	bi-&gt;boot_cpuid_phys = boot_cpuid_phys;</div><div class='ctx'> </div><div class='ctx'> 	return bi;</div><div class='ctx'> }</div><div class='hunk'>@@ -202,7 +205,7 @@ struct property *get_property(struct node *node, const char *propname)</div><div class='ctx'> cell_t propval_cell(struct property *prop)</div><div class='ctx'> {</div><div class='ctx'> 	assert(prop-&gt;val.len == sizeof(cell_t));</div><div class='del'>-	return be32_to_cpu(*((cell_t *)prop-&gt;val.val));</div><div class='add'>+	return fdt32_to_cpu(*((cell_t *)prop-&gt;val.val));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct node *get_subnode(struct node *node, const char *nodename)</div><div class='head'>diff --git a/arch/powerpc/boot/dtc-src/srcpos.c b/arch/powerpc/boot/dtc-src/srcpos.c<br/>index 352b0fe06fde..9641b7628b4d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dtc-src/srcpos.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/boot/dtc-src/srcpos.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dtc-src/srcpos.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dtc-src/srcpos.c</a></div><div class='hunk'>@@ -20,86 +20,97 @@</div><div class='ctx'> #include "dtc.h"</div><div class='ctx'> #include "srcpos.h"</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Record the complete unique set of opened file names.</div><div class='del'>- * Primarily used to cache source position file names.</div><div class='del'>- */</div><div class='del'>-#define MAX_N_FILE_NAMES	(100)</div><div class='del'>-</div><div class='del'>-const char *file_names[MAX_N_FILE_NAMES];</div><div class='del'>-static int n_file_names = 0;</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Like yylineno, this is the current open file pos.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-int srcpos_filenum = -1;</div><div class='del'>-</div><div class='add'>+struct dtc_file *srcpos_file;</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-FILE *dtc_open_file(const char *fname)</div><div class='add'>+static int dtc_open_one(struct dtc_file *file,</div><div class='add'>+                        const char *search,</div><div class='add'>+                        const char *fname)</div><div class='ctx'> {</div><div class='del'>-	FILE *f;</div><div class='add'>+	char *fullname;</div><div class='ctx'> </div><div class='del'>-	if (lookup_file_name(fname, 1) &lt; 0)</div><div class='del'>-		die("Too many files opened\n");</div><div class='add'>+	if (search) {</div><div class='add'>+		fullname = xmalloc(strlen(search) + strlen(fname) + 2);</div><div class='ctx'> </div><div class='del'>-	if (streq(fname, "-"))</div><div class='del'>-		f = stdin;</div><div class='del'>-	else</div><div class='del'>-		f = fopen(fname, "r");</div><div class='add'>+		strcpy(fullname, search);</div><div class='add'>+		strcat(fullname, "/");</div><div class='add'>+		strcat(fullname, fname);</div><div class='add'>+	} else {</div><div class='add'>+		fullname = strdup(fname);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (! f)</div><div class='del'>-		die("Couldn't open \"%s\": %s\n", fname, strerror(errno));</div><div class='add'>+	file-&gt;file = fopen(fullname, "r");</div><div class='add'>+	if (!file-&gt;file) {</div><div class='add'>+		free(fullname);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return f;</div><div class='add'>+	file-&gt;name = fullname;</div><div class='add'>+	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+struct dtc_file *dtc_open_file(const char *fname,</div><div class='add'>+                               const struct search_path *search)</div><div class='add'>+{</div><div class='add'>+	static const struct search_path default_search = { NULL, NULL, NULL };</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Locate and optionally add filename fname in the file_names[] array.</div><div class='del'>- *</div><div class='del'>- * If the filename is currently not in the array and the boolean</div><div class='del'>- * add_it is non-zero, an attempt to add the filename will be made.</div><div class='del'>- *</div><div class='del'>- * Returns;</div><div class='del'>- *    Index [0..MAX_N_FILE_NAMES) where the filename is kept</div><div class='del'>- *    -1 if the name can not be recorded</div><div class='del'>- */</div><div class='add'>+	struct dtc_file *file;</div><div class='add'>+	const char *slash;</div><div class='ctx'> </div><div class='del'>-int lookup_file_name(const char *fname, int add_it)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='add'>+	file = xmalloc(sizeof(struct dtc_file));</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; n_file_names; i++) {</div><div class='del'>-		if (strcmp(file_names[i], fname) == 0)</div><div class='del'>-			return i;</div><div class='add'>+	slash = strrchr(fname, '/');</div><div class='add'>+	if (slash) {</div><div class='add'>+		char *dir = xmalloc(slash - fname + 1);</div><div class='add'>+</div><div class='add'>+		memcpy(dir, fname, slash - fname);</div><div class='add'>+		dir[slash - fname] = 0;</div><div class='add'>+		file-&gt;dir = dir;</div><div class='add'>+	} else {</div><div class='add'>+		file-&gt;dir = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (add_it) {</div><div class='del'>-		if (n_file_names &lt; MAX_N_FILE_NAMES) {</div><div class='del'>-			file_names[n_file_names] = strdup(fname);</div><div class='del'>-			return n_file_names++;</div><div class='del'>-		}</div><div class='add'>+	if (streq(fname, "-")) {</div><div class='add'>+		file-&gt;name = "stdin";</div><div class='add'>+		file-&gt;file = stdin;</div><div class='add'>+		return file;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='add'>+	if (fname[0] == '/') {</div><div class='add'>+		file-&gt;file = fopen(fname, "r");</div><div class='add'>+		if (!file-&gt;file)</div><div class='add'>+			goto fail;</div><div class='add'>+</div><div class='add'>+		file-&gt;name = strdup(fname);</div><div class='add'>+		return file;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	if (!search)</div><div class='add'>+		search = &amp;default_search;</div><div class='ctx'> </div><div class='del'>-const char *srcpos_filename_for_num(int filenum)</div><div class='del'>-{</div><div class='del'>-	if (0 &lt;= filenum &amp;&amp; filenum &lt; n_file_names) {</div><div class='del'>-		return file_names[filenum];</div><div class='add'>+	while (search) {</div><div class='add'>+		if (dtc_open_one(file, search-&gt;dir, fname))</div><div class='add'>+			return file;</div><div class='add'>+</div><div class='add'>+		if (errno != ENOENT)</div><div class='add'>+			goto fail;</div><div class='add'>+</div><div class='add'>+		search = search-&gt;next;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+fail:</div><div class='add'>+	die("Couldn't open \"%s\": %s\n", fname, strerror(errno));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-const char *srcpos_get_filename(void)</div><div class='add'>+void dtc_close_file(struct dtc_file *file)</div><div class='ctx'> {</div><div class='del'>-	return srcpos_filename_for_num(srcpos_filenum);</div><div class='add'>+	if (fclose(file-&gt;file))</div><div class='add'>+		die("Error closing \"%s\": %s\n", file-&gt;name, strerror(errno));</div><div class='add'>+</div><div class='add'>+	free(file-&gt;dir);</div><div class='add'>+	free(file);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/boot/dtc-src/srcpos.h b/arch/powerpc/boot/dtc-src/srcpos.h<br/>index ce7ab5ba5b46..e17c7c04db8e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dtc-src/srcpos.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/boot/dtc-src/srcpos.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dtc-src/srcpos.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dtc-src/srcpos.h</a></div><div class='hunk'>@@ -22,13 +22,21 @@</div><div class='ctx'>  * array of all opened filenames.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;stdio.h&gt;</div><div class='add'>+</div><div class='add'>+struct dtc_file {</div><div class='add'>+	char *dir;</div><div class='add'>+	const char *name;</div><div class='add'>+	FILE *file;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #if ! defined(YYLTYPE) &amp;&amp; ! defined(YYLTYPE_IS_DECLARED)</div><div class='ctx'> typedef struct YYLTYPE {</div><div class='ctx'>     int first_line;</div><div class='ctx'>     int first_column;</div><div class='ctx'>     int last_line;</div><div class='ctx'>     int last_column;</div><div class='del'>-    int filenum;</div><div class='add'>+    struct dtc_file *file;</div><div class='ctx'> } YYLTYPE;</div><div class='ctx'> </div><div class='ctx'> #define YYLTYPE_IS_DECLARED	1</div><div class='hunk'>@@ -48,7 +56,7 @@ typedef struct YYLTYPE {</div><div class='ctx'> 	  (Current).first_column = YYRHSLOC (Rhs, 1).first_column;	\</div><div class='ctx'> 	  (Current).last_line    = YYRHSLOC (Rhs, N).last_line;		\</div><div class='ctx'> 	  (Current).last_column  = YYRHSLOC (Rhs, N).last_column;	\</div><div class='del'>-	  (Current).filenum      = YYRHSLOC (Rhs, N).filenum;		\</div><div class='add'>+	  (Current).file         = YYRHSLOC (Rhs, N).file;		\</div><div class='ctx'> 	}								\</div><div class='ctx'>       else								\</div><div class='ctx'> 	{								\</div><div class='hunk'>@@ -56,20 +64,22 @@ typedef struct YYLTYPE {</div><div class='ctx'> 	    YYRHSLOC (Rhs, 0).last_line;				\</div><div class='ctx'> 	  (Current).first_column = (Current).last_column =		\</div><div class='ctx'> 	    YYRHSLOC (Rhs, 0).last_column;				\</div><div class='del'>-	  (Current).filenum      = YYRHSLOC (Rhs, 0).filenum;		\</div><div class='add'>+	  (Current).file         = YYRHSLOC (Rhs, 0).file;		\</div><div class='ctx'> 	}								\</div><div class='ctx'>     while (YYID (0))</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> extern void yyerror(char const *);</div><div class='add'>+extern void yyerrorf(char const *, ...) __attribute__((format(printf, 1, 2)));</div><div class='ctx'> </div><div class='del'>-extern int srcpos_filenum;</div><div class='add'>+extern struct dtc_file *srcpos_file;</div><div class='ctx'> </div><div class='del'>-extern int push_input_file(const char *filename);</div><div class='del'>-extern int pop_input_file(void);</div><div class='add'>+struct search_path {</div><div class='add'>+	const char *dir; /* NULL for current directory */</div><div class='add'>+	struct search_path *prev, *next;</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-extern FILE *dtc_open_file(const char *fname);</div><div class='del'>-extern int lookup_file_name(const char *fname, int add_it);</div><div class='del'>-extern const char *srcpos_filename_for_num(int filenum);</div><div class='del'>-const char *srcpos_get_filename(void);</div><div class='add'>+extern struct dtc_file *dtc_open_file(const char *fname,</div><div class='add'>+                                      const struct search_path *search);</div><div class='add'>+extern void dtc_close_file(struct dtc_file *file);</div><div class='head'>diff --git a/arch/powerpc/boot/dtc-src/treesource.c b/arch/powerpc/boot/dtc-src/treesource.c<br/>index a6a776797636..ebeb6eb27907 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dtc-src/treesource.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/boot/dtc-src/treesource.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dtc-src/treesource.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dtc-src/treesource.c</a></div><div class='hunk'>@@ -23,20 +23,23 @@</div><div class='ctx'> </div><div class='ctx'> extern FILE *yyin;</div><div class='ctx'> extern int yyparse(void);</div><div class='del'>-extern void yyerror(char const *);</div><div class='ctx'> </div><div class='ctx'> struct boot_info *the_boot_info;</div><div class='add'>+int treesource_error;</div><div class='ctx'> </div><div class='ctx'> struct boot_info *dt_from_source(const char *fname)</div><div class='ctx'> {</div><div class='ctx'> 	the_boot_info = NULL;</div><div class='add'>+	treesource_error = 0;</div><div class='ctx'> </div><div class='del'>-	push_input_file(fname);</div><div class='add'>+	srcpos_file = dtc_open_file(fname, NULL);</div><div class='add'>+	yyin = srcpos_file-&gt;file;</div><div class='ctx'> </div><div class='ctx'> 	if (yyparse() != 0)</div><div class='del'>-		return NULL;</div><div class='add'>+		die("Unable to parse input tree\n");</div><div class='ctx'> </div><div class='del'>-	fill_fullpaths(the_boot_info-&gt;dt, "");</div><div class='add'>+	if (treesource_error)</div><div class='add'>+		die("Syntax error parsing input tree\n");</div><div class='ctx'> </div><div class='ctx'> 	return the_boot_info;</div><div class='ctx'> }</div><div class='hunk'>@@ -144,7 +147,7 @@ static void write_propval_cells(FILE *f, struct data val)</div><div class='ctx'> 			m = m-&gt;next;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		fprintf(f, "0x%x", be32_to_cpu(*cp++));</div><div class='add'>+		fprintf(f, "0x%x", fdt32_to_cpu(*cp++));</div><div class='ctx'> 		if ((void *)cp &gt;= propend)</div><div class='ctx'> 			break;</div><div class='ctx'> 		fprintf(f, " ");</div><div class='hunk'>@@ -173,7 +176,7 @@ static void write_propval_bytes(FILE *f, struct data val)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		fprintf(f, "%02hhx", *bp++);</div><div class='del'>-		if ((void *)bp &gt;= propend)</div><div class='add'>+		if ((const void *)bp &gt;= propend)</div><div class='ctx'> 			break;</div><div class='ctx'> 		fprintf(f, " ");</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/powerpc/boot/dtc-src/version_gen.h b/arch/powerpc/boot/dtc-src/version_gen.h<br/>index 6c343031538e..658ff42429d6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dtc-src/version_gen.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/boot/dtc-src/version_gen.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dtc-src/version_gen.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dtc-src/version_gen.h</a></div><div class='hunk'>@@ -1 +1 @@</div><div class='del'>-#define DTC_VERSION "DTC 1.0.0-gd6f9b62f"</div><div class='add'>+#define DTC_VERSION "DTC 1.2.0"</div><div class='head'>diff --git a/arch/powerpc/boot/dts/arches.dts b/arch/powerpc/boot/dts/arches.dts<br/>new file mode 100644<br/>index 000000000000..d9113b1e8c1d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dts/arches.dts?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dts/arches.dts</a></div><div class='hunk'>@@ -0,0 +1,293 @@</div><div class='add'>+/*</div><div class='add'>+ * Device Tree Source for AMCC Arches (dual 460GT board)</div><div class='add'>+ *</div><div class='add'>+ * (C) Copyright 2008 Applied Micro Circuits Corporation</div><div class='add'>+ * Victor Gallardo &lt;vgallardo@amcc.com&gt;</div><div class='add'>+ * Adam Graham &lt;agraham@amcc.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * Based on the glacier.dts file</div><div class='add'>+ *   Stefan Roese &lt;sr@denx.de&gt;</div><div class='add'>+ *   Copyright 2008 DENX Software Engineering</div><div class='add'>+ *</div><div class='add'>+ * See file CREDITS for list of people who contributed to this</div><div class='add'>+ * project.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public License as</div><div class='add'>+ * published by the Free Software Foundation; either version 2 of</div><div class='add'>+ * the License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,</div><div class='add'>+ * MA 02111-1307 USA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	#address-cells = &lt;2&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	model = "amcc,arches";</div><div class='add'>+	compatible = "amcc,arches";</div><div class='add'>+	dcr-parent = &lt;&amp;{/cpus/cpu@0}&gt;;</div><div class='add'>+</div><div class='add'>+	aliases {</div><div class='add'>+		ethernet0 = &amp;EMAC0;</div><div class='add'>+		ethernet1 = &amp;EMAC1;</div><div class='add'>+		ethernet2 = &amp;EMAC2;</div><div class='add'>+		serial0 = &amp;UART0;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	cpus {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+		cpu@0 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			model = "PowerPC,460GT";</div><div class='add'>+			reg = &lt;0x00000000&gt;;</div><div class='add'>+			clock-frequency = &lt;0&gt;; /* Filled in by U-Boot */</div><div class='add'>+			timebase-frequency = &lt;0&gt;; /* Filled in by U-Boot */</div><div class='add'>+			i-cache-line-size = &lt;32&gt;;</div><div class='add'>+			d-cache-line-size = &lt;32&gt;;</div><div class='add'>+			i-cache-size = &lt;32768&gt;;</div><div class='add'>+			d-cache-size = &lt;32768&gt;;</div><div class='add'>+			dcr-controller;</div><div class='add'>+			dcr-access-method = "native";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	memory {</div><div class='add'>+		device_type = "memory";</div><div class='add'>+		reg = &lt;0x00000000 0x00000000 0x00000000&gt;; /* Filled in by U-Boot */</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	UIC0: interrupt-controller0 {</div><div class='add'>+		compatible = "ibm,uic-460gt","ibm,uic";</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		cell-index = &lt;0&gt;;</div><div class='add'>+		dcr-reg = &lt;0x0c0 0x009&gt;;</div><div class='add'>+		#address-cells = &lt;0&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		#interrupt-cells = &lt;2&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	UIC1: interrupt-controller1 {</div><div class='add'>+		compatible = "ibm,uic-460gt","ibm,uic";</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		cell-index = &lt;1&gt;;</div><div class='add'>+		dcr-reg = &lt;0x0d0 0x009&gt;;</div><div class='add'>+		#address-cells = &lt;0&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		#interrupt-cells = &lt;2&gt;;</div><div class='add'>+		interrupts = &lt;0x1e 0x4 0x1f 0x4&gt;; /* cascade */</div><div class='add'>+		interrupt-parent = &lt;&amp;UIC0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	UIC2: interrupt-controller2 {</div><div class='add'>+		compatible = "ibm,uic-460gt","ibm,uic";</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		cell-index = &lt;2&gt;;</div><div class='add'>+		dcr-reg = &lt;0x0e0 0x009&gt;;</div><div class='add'>+		#address-cells = &lt;0&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		#interrupt-cells = &lt;2&gt;;</div><div class='add'>+		interrupts = &lt;0xa 0x4 0xb 0x4&gt;; /* cascade */</div><div class='add'>+		interrupt-parent = &lt;&amp;UIC0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	UIC3: interrupt-controller3 {</div><div class='add'>+		compatible = "ibm,uic-460gt","ibm,uic";</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		cell-index = &lt;3&gt;;</div><div class='add'>+		dcr-reg = &lt;0x0f0 0x009&gt;;</div><div class='add'>+		#address-cells = &lt;0&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		#interrupt-cells = &lt;2&gt;;</div><div class='add'>+		interrupts = &lt;0x10 0x4 0x11 0x4&gt;; /* cascade */</div><div class='add'>+		interrupt-parent = &lt;&amp;UIC0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	SDR0: sdr {</div><div class='add'>+		compatible = "ibm,sdr-460gt";</div><div class='add'>+		dcr-reg = &lt;0x00e 0x002&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	CPR0: cpr {</div><div class='add'>+		compatible = "ibm,cpr-460gt";</div><div class='add'>+		dcr-reg = &lt;0x00c 0x002&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	plb {</div><div class='add'>+		compatible = "ibm,plb-460gt", "ibm,plb4";</div><div class='add'>+		#address-cells = &lt;2&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		ranges;</div><div class='add'>+		clock-frequency = &lt;0&gt;; /* Filled in by U-Boot */</div><div class='add'>+</div><div class='add'>+		SDRAM0: sdram {</div><div class='add'>+			compatible = "ibm,sdram-460gt", "ibm,sdram-405gp";</div><div class='add'>+			dcr-reg = &lt;0x010 0x002&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		MAL0: mcmal {</div><div class='add'>+			compatible = "ibm,mcmal-460gt", "ibm,mcmal2";</div><div class='add'>+			dcr-reg = &lt;0x180 0x062&gt;;</div><div class='add'>+			num-tx-chans = &lt;3&gt;;</div><div class='add'>+			num-rx-chans = &lt;24&gt;;</div><div class='add'>+			#address-cells = &lt;0&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			interrupt-parent = &lt;&amp;UIC2&gt;;</div><div class='add'>+			interrupts = &lt;	/*TXEOB*/ 0x6 0x4</div><div class='add'>+					/*RXEOB*/ 0x7 0x4</div><div class='add'>+					/*SERR*/  0x3 0x4</div><div class='add'>+					/*TXDE*/  0x4 0x4</div><div class='add'>+					/*RXDE*/  0x5 0x4&gt;;</div><div class='add'>+			desc-base-addr-high = &lt;0x8&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		POB0: opb {</div><div class='add'>+			compatible = "ibm,opb-460gt", "ibm,opb";</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;1&gt;;</div><div class='add'>+			ranges = &lt;0xb0000000 0x00000004 0xb0000000 0x50000000&gt;;</div><div class='add'>+			clock-frequency = &lt;0&gt;; /* Filled in by U-Boot */</div><div class='add'>+</div><div class='add'>+			EBC0: ebc {</div><div class='add'>+				compatible = "ibm,ebc-460gt", "ibm,ebc";</div><div class='add'>+				dcr-reg = &lt;0x012 0x002&gt;;</div><div class='add'>+				#address-cells = &lt;2&gt;;</div><div class='add'>+				#size-cells = &lt;1&gt;;</div><div class='add'>+				clock-frequency = &lt;0&gt;; /* Filled in by U-Boot */</div><div class='add'>+				/* ranges property is supplied by U-Boot */</div><div class='add'>+				interrupts = &lt;0x6 0x4&gt;;</div><div class='add'>+				interrupt-parent = &lt;&amp;UIC1&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			UART0: serial@ef600300 {</div><div class='add'>+				device_type = "serial";</div><div class='add'>+				compatible = "ns16550";</div><div class='add'>+				reg = &lt;0xef600300 0x00000008&gt;;</div><div class='add'>+				virtual-reg = &lt;0xef600300&gt;;</div><div class='add'>+				clock-frequency = &lt;0&gt;; /* Filled in by U-Boot */</div><div class='add'>+				current-speed = &lt;0&gt;; /* Filled in by U-Boot */</div><div class='add'>+				interrupt-parent = &lt;&amp;UIC1&gt;;</div><div class='add'>+				interrupts = &lt;0x1 0x4&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			IIC0: i2c@ef600700 {</div><div class='add'>+				compatible = "ibm,iic-460gt", "ibm,iic";</div><div class='add'>+				reg = &lt;0xef600700 0x00000014&gt;;</div><div class='add'>+				interrupt-parent = &lt;&amp;UIC0&gt;;</div><div class='add'>+				interrupts = &lt;0x2 0x4&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			IIC1: i2c@ef600800 {</div><div class='add'>+				compatible = "ibm,iic-460gt", "ibm,iic";</div><div class='add'>+				reg = &lt;0xef600800 0x00000014&gt;;</div><div class='add'>+				interrupt-parent = &lt;&amp;UIC0&gt;;</div><div class='add'>+				interrupts = &lt;0x3 0x4&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			TAH0: emac-tah@ef601350 {</div><div class='add'>+				compatible = "ibm,tah-460gt", "ibm,tah";</div><div class='add'>+				reg = &lt;0xef601350 0x00000030&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			TAH1: emac-tah@ef601450 {</div><div class='add'>+				compatible = "ibm,tah-460gt", "ibm,tah";</div><div class='add'>+				reg = &lt;0xef601450 0x00000030&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			EMAC0: ethernet@ef600e00 {</div><div class='add'>+				device_type = "network";</div><div class='add'>+				compatible = "ibm,emac-460gt", "ibm,emac4sync";</div><div class='add'>+				interrupt-parent = &lt;&amp;EMAC0&gt;;</div><div class='add'>+				interrupts = &lt;0x0 0x1&gt;;</div><div class='add'>+				#interrupt-cells = &lt;1&gt;;</div><div class='add'>+				#address-cells = &lt;0&gt;;</div><div class='add'>+				#size-cells = &lt;0&gt;;</div><div class='add'>+				interrupt-map = &lt;/*Status*/ 0x0 &amp;UIC2 0x10 0x4</div><div class='add'>+						 /*Wake*/   0x1 &amp;UIC2 0x14 0x4&gt;;</div><div class='add'>+				reg = &lt;0xef600e00 0x000000c4&gt;;</div><div class='add'>+				local-mac-address = [000000000000]; /* Filled in by U-Boot */</div><div class='add'>+				mal-device = &lt;&amp;MAL0&gt;;</div><div class='add'>+				mal-tx-channel = &lt;0&gt;;</div><div class='add'>+				mal-rx-channel = &lt;0&gt;;</div><div class='add'>+				cell-index = &lt;0&gt;;</div><div class='add'>+				max-frame-size = &lt;9000&gt;;</div><div class='add'>+				rx-fifo-size = &lt;4096&gt;;</div><div class='add'>+				tx-fifo-size = &lt;2048&gt;;</div><div class='add'>+				phy-mode = "sgmii";</div><div class='add'>+				phy-map = &lt;0xffffffff&gt;;</div><div class='add'>+				gpcs-address = &lt;0x0000000a&gt;;</div><div class='add'>+				tah-device = &lt;&amp;TAH0&gt;;</div><div class='add'>+				tah-channel = &lt;0&gt;;</div><div class='add'>+				has-inverted-stacr-oc;</div><div class='add'>+				has-new-stacr-staopc;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			EMAC1: ethernet@ef600f00 {</div><div class='add'>+				device_type = "network";</div><div class='add'>+				compatible = "ibm,emac-460gt", "ibm,emac4sync";</div><div class='add'>+				interrupt-parent = &lt;&amp;EMAC1&gt;;</div><div class='add'>+				interrupts = &lt;0x0 0x1&gt;;</div><div class='add'>+				#interrupt-cells = &lt;1&gt;;</div><div class='add'>+				#address-cells = &lt;0&gt;;</div><div class='add'>+				#size-cells = &lt;0&gt;;</div><div class='add'>+				interrupt-map = &lt;/*Status*/ 0x0 &amp;UIC2 0x11 0x4</div><div class='add'>+						 /*Wake*/   0x1 &amp;UIC2 0x15 0x4&gt;;</div><div class='add'>+				reg = &lt;0xef600f00 0x000000c4&gt;;</div><div class='add'>+				local-mac-address = [000000000000]; /* Filled in by U-Boot */</div><div class='add'>+				mal-device = &lt;&amp;MAL0&gt;;</div><div class='add'>+				mal-tx-channel = &lt;1&gt;;</div><div class='add'>+				mal-rx-channel = &lt;8&gt;;</div><div class='add'>+				cell-index = &lt;1&gt;;</div><div class='add'>+				max-frame-size = &lt;9000&gt;;</div><div class='add'>+				rx-fifo-size = &lt;4096&gt;;</div><div class='add'>+				tx-fifo-size = &lt;2048&gt;;</div><div class='add'>+				phy-mode = "sgmii";</div><div class='add'>+				phy-map = &lt;0x00000000&gt;;</div><div class='add'>+				gpcs-address = &lt;0x0000000b&gt;;</div><div class='add'>+				tah-device = &lt;&amp;TAH1&gt;;</div><div class='add'>+				tah-channel = &lt;1&gt;;</div><div class='add'>+				has-inverted-stacr-oc;</div><div class='add'>+				has-new-stacr-staopc;</div><div class='add'>+				mdio-device = &lt;&amp;EMAC0&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			EMAC2: ethernet@ef601100 {</div><div class='add'>+				device_type = "network";</div><div class='add'>+				compatible = "ibm,emac-460gt", "ibm,emac4sync";</div><div class='add'>+				interrupt-parent = &lt;&amp;EMAC2&gt;;</div><div class='add'>+				interrupts = &lt;0x0 0x1&gt;;</div><div class='add'>+				#interrupt-cells = &lt;1&gt;;</div><div class='add'>+				#address-cells = &lt;0&gt;;</div><div class='add'>+				#size-cells = &lt;0&gt;;</div><div class='add'>+				interrupt-map = &lt;/*Status*/ 0x0 &amp;UIC2 0x12 0x4</div><div class='add'>+						 /*Wake*/   0x1 &amp;UIC2 0x16 0x4&gt;;</div><div class='add'>+				reg = &lt;0xef601100 0x000000c4&gt;;</div><div class='add'>+				local-mac-address = [000000000000]; /* Filled in by U-Boot */</div><div class='add'>+				mal-device = &lt;&amp;MAL0&gt;;</div><div class='add'>+				mal-tx-channel = &lt;2&gt;;</div><div class='add'>+				mal-rx-channel = &lt;16&gt;;</div><div class='add'>+				cell-index = &lt;2&gt;;</div><div class='add'>+				max-frame-size = &lt;9000&gt;;</div><div class='add'>+				rx-fifo-size = &lt;4096&gt;;</div><div class='add'>+				tx-fifo-size = &lt;2048&gt;;</div><div class='add'>+				phy-mode = "sgmii";</div><div class='add'>+				phy-map = &lt;0x00000001&gt;;</div><div class='add'>+				gpcs-address = &lt;0x0000000C&gt;;</div><div class='add'>+				has-inverted-stacr-oc;</div><div class='add'>+				has-new-stacr-staopc;</div><div class='add'>+				mdio-device = &lt;&amp;EMAC0&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/asp834x-redboot.dts b/arch/powerpc/boot/dts/asp834x-redboot.dts<br/>index 8b1bb0e41905..6235fca445de 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dts/asp834x-redboot.dts?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/boot/dts/asp834x-redboot.dts</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dts/asp834x-redboot.dts?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dts/asp834x-redboot.dts</a></div><div class='hunk'>@@ -130,24 +130,28 @@</div><div class='ctx'> 			dma-channel@0 {</div><div class='ctx'> 				compatible = "fsl,mpc8347-dma-channel", "fsl,elo-dma-channel";</div><div class='ctx'> 				reg = &lt;0 0x80&gt;;</div><div class='add'>+				cell-index = &lt;0&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='ctx'> 				interrupts = &lt;71 8&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 			dma-channel@80 {</div><div class='ctx'> 				compatible = "fsl,mpc8347-dma-channel", "fsl,elo-dma-channel";</div><div class='ctx'> 				reg = &lt;0x80 0x80&gt;;</div><div class='add'>+				cell-index = &lt;1&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='ctx'> 				interrupts = &lt;71 8&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 			dma-channel@100 {</div><div class='ctx'> 				compatible = "fsl,mpc8347-dma-channel", "fsl,elo-dma-channel";</div><div class='ctx'> 				reg = &lt;0x100 0x80&gt;;</div><div class='add'>+				cell-index = &lt;2&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='ctx'> 				interrupts = &lt;71 8&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 			dma-channel@180 {</div><div class='ctx'> 				compatible = "fsl,mpc8347-dma-channel", "fsl,elo-dma-channel";</div><div class='ctx'> 				reg = &lt;0x180 0x28&gt;;</div><div class='add'>+				cell-index = &lt;3&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='ctx'> 				interrupts = &lt;71 8&gt;;</div><div class='ctx'> 			};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/gef_sbc610.dts b/arch/powerpc/boot/dts/gef_sbc610.dts<br/>new file mode 100644<br/>index 000000000000..6ed608322ddc<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dts/gef_sbc610.dts?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dts/gef_sbc610.dts</a></div><div class='hunk'>@@ -0,0 +1,293 @@</div><div class='add'>+/*</div><div class='add'>+ * GE Fanuc SBC610 Device Tree Source</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2008 GE Fanuc Intelligent Platforms Embedded Systems, Inc.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute  it and/or modify it</div><div class='add'>+ * under  the terms of  the GNU General  Public License as published by the</div><div class='add'>+ * Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='add'>+ * option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * Based on: SBS CM6 Device Tree Source</div><div class='add'>+ * Copyright 2007 SBS Technologies GmbH &amp; Co. KG</div><div class='add'>+ * And: mpc8641_hpcn.dts (MPC8641 HPCN Device Tree Source)</div><div class='add'>+ * Copyright 2006 Freescale Semiconductor Inc.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Compiled with dtc -I dts -O dtb -o gef_sbc610.dtb gef_sbc610.dts</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "GEF_SBC610";</div><div class='add'>+	compatible = "gef,sbc610";</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+	aliases {</div><div class='add'>+		ethernet0 = &amp;enet0;</div><div class='add'>+		ethernet1 = &amp;enet1;</div><div class='add'>+		serial0 = &amp;serial0;</div><div class='add'>+		serial1 = &amp;serial1;</div><div class='add'>+		pci0 = &amp;pci0;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	cpus {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+		PowerPC,8641@0 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			reg = &lt;0&gt;;</div><div class='add'>+			d-cache-line-size = &lt;32&gt;;	// 32 bytes</div><div class='add'>+			i-cache-line-size = &lt;32&gt;;	// 32 bytes</div><div class='add'>+			d-cache-size = &lt;32768&gt;;		// L1, 32K</div><div class='add'>+			i-cache-size = &lt;32768&gt;;		// L1, 32K</div><div class='add'>+			timebase-frequency = &lt;0&gt;;	// From uboot</div><div class='add'>+			bus-frequency = &lt;0&gt;;		// From uboot</div><div class='add'>+			clock-frequency = &lt;0&gt;;		// From uboot</div><div class='add'>+		};</div><div class='add'>+		PowerPC,8641@1 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			reg = &lt;1&gt;;</div><div class='add'>+			d-cache-line-size = &lt;32&gt;;	// 32 bytes</div><div class='add'>+			i-cache-line-size = &lt;32&gt;;	// 32 bytes</div><div class='add'>+			d-cache-size = &lt;32768&gt;;		// L1, 32K</div><div class='add'>+			i-cache-size = &lt;32768&gt;;		// L1, 32K</div><div class='add'>+			timebase-frequency = &lt;0&gt;;	// From uboot</div><div class='add'>+			bus-frequency = &lt;0&gt;;		// From uboot</div><div class='add'>+			clock-frequency = &lt;0&gt;;		// From uboot</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	memory {</div><div class='add'>+		device_type = "memory";</div><div class='add'>+		reg = &lt;0x0 0x40000000&gt;;	// set by uboot</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	localbus@fef05000 {</div><div class='add'>+		#address-cells = &lt;2&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		compatible = "fsl,mpc8641-localbus", "simple-bus";</div><div class='add'>+		reg = &lt;0xf8005000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;19 2&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='add'>+</div><div class='add'>+		ranges = &lt;0 0 0xff000000 0x01000000     // 16MB Boot flash</div><div class='add'>+			  1 0 0xe8000000 0x08000000     // Paged Flash 0</div><div class='add'>+			  2 0 0xe0000000 0x08000000     // Paged Flash 1</div><div class='add'>+			  3 0 0xfc100000 0x00020000     // NVRAM</div><div class='add'>+			  4 0 0xfc000000 0x00008000     // FPGA</div><div class='add'>+			  5 0 0xfc008000 0x00008000     // AFIX FPGA</div><div class='add'>+			  6 0 0xfd000000 0x00800000     // IO FPGA (8-bit)</div><div class='add'>+			  7 0 0xfd800000 0x00800000&gt;;   // IO FPGA (32-bit)</div><div class='add'>+</div><div class='add'>+		fpga@4,0 {</div><div class='add'>+			compatible = "gef,fpga-regs";</div><div class='add'>+			reg = &lt;0x4 0x0 0x40&gt;;</div><div class='add'>+		};</div><div class='add'>+		gef_pic: pic@4,4000 {</div><div class='add'>+			#interrupt-cells = &lt;1&gt;;</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			compatible = "gef,fpga-pic";</div><div class='add'>+			reg = &lt;0x4 0x4000 0x20&gt;;</div><div class='add'>+			interrupts = &lt;0x8</div><div class='add'>+				      0x9&gt;;</div><div class='add'>+			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='add'>+</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	soc@fef00000 {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		#interrupt-cells = &lt;2&gt;;</div><div class='add'>+		device_type = "soc";</div><div class='add'>+		compatible = "simple-bus";</div><div class='add'>+		ranges = &lt;0x0 0xfef00000 0x00100000&gt;;</div><div class='add'>+		reg = &lt;0xfef00000 0x100000&gt;;	// CCSRBAR 1M</div><div class='add'>+		bus-frequency = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+		i2c1: i2c@3000 {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			compatible = "fsl-i2c";</div><div class='add'>+			reg = &lt;0x3000 0x100&gt;;</div><div class='add'>+			interrupts = &lt;0x2b 0x2&gt;;</div><div class='add'>+			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='add'>+			dfsrr;</div><div class='add'>+</div><div class='add'>+			eti@6b {</div><div class='add'>+				compatible = "dallas,ds1682";</div><div class='add'>+				reg = &lt;0x6b&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		i2c2: i2c@3100 {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			compatible = "fsl-i2c";</div><div class='add'>+			reg = &lt;0x3100 0x100&gt;;</div><div class='add'>+			interrupts = &lt;0x2b 0x2&gt;;</div><div class='add'>+			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='add'>+			dfsrr;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		dma@21300 {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;1&gt;;</div><div class='add'>+			compatible = "fsl,mpc8641-dma", "fsl,eloplus-dma";</div><div class='add'>+			reg = &lt;0x21300 0x4&gt;;</div><div class='add'>+			ranges = &lt;0x0 0x21100 0x200&gt;;</div><div class='add'>+			cell-index = &lt;0&gt;;</div><div class='add'>+			dma-channel@0 {</div><div class='add'>+				compatible = "fsl,mpc8641-dma-channel",</div><div class='add'>+					   "fsl,eloplus-dma-channel";</div><div class='add'>+				reg = &lt;0x0 0x80&gt;;</div><div class='add'>+				cell-index = &lt;0&gt;;</div><div class='add'>+				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='add'>+				interrupts = &lt;20 2&gt;;</div><div class='add'>+			};</div><div class='add'>+			dma-channel@80 {</div><div class='add'>+				compatible = "fsl,mpc8641-dma-channel",</div><div class='add'>+					   "fsl,eloplus-dma-channel";</div><div class='add'>+				reg = &lt;0x80 0x80&gt;;</div><div class='add'>+				cell-index = &lt;1&gt;;</div><div class='add'>+				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='add'>+				interrupts = &lt;21 2&gt;;</div><div class='add'>+			};</div><div class='add'>+			dma-channel@100 {</div><div class='add'>+				compatible = "fsl,mpc8641-dma-channel",</div><div class='add'>+					   "fsl,eloplus-dma-channel";</div><div class='add'>+				reg = &lt;0x100 0x80&gt;;</div><div class='add'>+				cell-index = &lt;2&gt;;</div><div class='add'>+				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='add'>+				interrupts = &lt;22 2&gt;;</div><div class='add'>+			};</div><div class='add'>+			dma-channel@180 {</div><div class='add'>+				compatible = "fsl,mpc8641-dma-channel",</div><div class='add'>+					   "fsl,eloplus-dma-channel";</div><div class='add'>+				reg = &lt;0x180 0x80&gt;;</div><div class='add'>+				cell-index = &lt;3&gt;;</div><div class='add'>+				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='add'>+				interrupts = &lt;23 2&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		mdio@24520 {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			compatible = "fsl,gianfar-mdio";</div><div class='add'>+			reg = &lt;0x24520 0x20&gt;;</div><div class='add'>+</div><div class='add'>+			phy0: ethernet-phy@0 {</div><div class='add'>+				interrupt-parent = &lt;&amp;gef_pic&gt;;</div><div class='add'>+				interrupts = &lt;0x9 0x4&gt;;</div><div class='add'>+				reg = &lt;1&gt;;</div><div class='add'>+			};</div><div class='add'>+			phy2: ethernet-phy@2 {</div><div class='add'>+				interrupt-parent = &lt;&amp;gef_pic&gt;;</div><div class='add'>+				interrupts = &lt;0x8 0x4&gt;;</div><div class='add'>+				reg = &lt;3&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		enet0: ethernet@24000 {</div><div class='add'>+			device_type = "network";</div><div class='add'>+			model = "eTSEC";</div><div class='add'>+			compatible = "gianfar";</div><div class='add'>+			reg = &lt;0x24000 0x1000&gt;;</div><div class='add'>+			local-mac-address = [ 00 00 00 00 00 00 ];</div><div class='add'>+			interrupts = &lt;0x1d 0x2 0x1e 0x2 0x22 0x2&gt;;</div><div class='add'>+			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='add'>+			phy-handle = &lt;&amp;phy0&gt;;</div><div class='add'>+			phy-connection-type = "gmii";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		enet1: ethernet@26000 {</div><div class='add'>+			device_type = "network";</div><div class='add'>+			model = "eTSEC";</div><div class='add'>+			compatible = "gianfar";</div><div class='add'>+			reg = &lt;0x26000 0x1000&gt;;</div><div class='add'>+			local-mac-address = [ 00 00 00 00 00 00 ];</div><div class='add'>+			interrupts = &lt;0x1f 0x2 0x20 0x2 0x21 0x2&gt;;</div><div class='add'>+			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='add'>+			phy-handle = &lt;&amp;phy2&gt;;</div><div class='add'>+			phy-connection-type = "gmii";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		serial0: serial@4500 {</div><div class='add'>+			cell-index = &lt;0&gt;;</div><div class='add'>+			device_type = "serial";</div><div class='add'>+			compatible = "ns16550";</div><div class='add'>+			reg = &lt;0x4500 0x100&gt;;</div><div class='add'>+			clock-frequency = &lt;0&gt;;</div><div class='add'>+			interrupts = &lt;0x2a 0x2&gt;;</div><div class='add'>+			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		serial1: serial@4600 {</div><div class='add'>+			cell-index = &lt;1&gt;;</div><div class='add'>+			device_type = "serial";</div><div class='add'>+			compatible = "ns16550";</div><div class='add'>+			reg = &lt;0x4600 0x100&gt;;</div><div class='add'>+			clock-frequency = &lt;0&gt;;</div><div class='add'>+			interrupts = &lt;0x1c 0x2&gt;;</div><div class='add'>+			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		mpic: pic@40000 {</div><div class='add'>+			clock-frequency = &lt;0&gt;;</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#address-cells = &lt;0&gt;;</div><div class='add'>+			#interrupt-cells = &lt;2&gt;;</div><div class='add'>+			reg = &lt;0x40000 0x40000&gt;;</div><div class='add'>+			compatible = "chrp,open-pic";</div><div class='add'>+			device_type = "open-pic";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		global-utilities@e0000 {</div><div class='add'>+			compatible = "fsl,mpc8641-guts";</div><div class='add'>+			reg = &lt;0xe0000 0x1000&gt;;</div><div class='add'>+			fsl,has-rstcr;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pci0: pcie@fef08000 {</div><div class='add'>+		compatible = "fsl,mpc8641-pcie";</div><div class='add'>+		device_type = "pci";</div><div class='add'>+		#interrupt-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		#address-cells = &lt;3&gt;;</div><div class='add'>+		reg = &lt;0xfef08000 0x1000&gt;;</div><div class='add'>+		bus-range = &lt;0x0 0xff&gt;;</div><div class='add'>+		ranges = &lt;0x02000000 0x0 0x80000000 0x80000000 0x0 0x40000000</div><div class='add'>+			  0x01000000 0x0 0x00000000 0xfe000000 0x0 0x00400000&gt;;</div><div class='add'>+		clock-frequency = &lt;33333333&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='add'>+		interrupts = &lt;0x18 0x2&gt;;</div><div class='add'>+		interrupt-map-mask = &lt;0xf800 0x0 0x0 0x7&gt;;</div><div class='add'>+		interrupt-map = &lt;</div><div class='add'>+			0x0000 0x0 0x0 0x1 &amp;mpic 0x0 0x1</div><div class='add'>+			0x0000 0x0 0x0 0x2 &amp;mpic 0x1 0x1</div><div class='add'>+			0x0000 0x0 0x0 0x3 &amp;mpic 0x2 0x1</div><div class='add'>+			0x0000 0x0 0x0 0x4 &amp;mpic 0x3 0x1</div><div class='add'>+		&gt;;</div><div class='add'>+</div><div class='add'>+		pcie@0 {</div><div class='add'>+			reg = &lt;0 0 0 0 0&gt;;</div><div class='add'>+			#size-cells = &lt;2&gt;;</div><div class='add'>+			#address-cells = &lt;3&gt;;</div><div class='add'>+			device_type = "pci";</div><div class='add'>+			ranges = &lt;0x02000000 0x0 0x80000000</div><div class='add'>+				  0x02000000 0x0 0x80000000</div><div class='add'>+				  0x0 0x40000000</div><div class='add'>+</div><div class='add'>+				  0x01000000 0x0 0x00000000</div><div class='add'>+				  0x01000000 0x0 0x00000000</div><div class='add'>+				  0x0 0x00400000&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/glacier.dts b/arch/powerpc/boot/dts/glacier.dts<br/>index 24cf0dba120c..f3787a27f634 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dts/glacier.dts?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/boot/dts/glacier.dts</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dts/glacier.dts?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dts/glacier.dts</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'> 	#address-cells = &lt;2&gt;;</div><div class='ctx'> 	#size-cells = &lt;1&gt;;</div><div class='ctx'> 	model = "amcc,glacier";</div><div class='del'>-	compatible = "amcc,glacier", "amcc,canyonlands";</div><div class='add'>+	compatible = "amcc,glacier";</div><div class='ctx'> 	dcr-parent = &lt;&amp;{/cpus/cpu@0}&gt;;</div><div class='ctx'> </div><div class='ctx'> 	aliases {</div><div class='head'>diff --git a/arch/powerpc/boot/dts/mgcoge.dts b/arch/powerpc/boot/dts/mgcoge.dts<br/>new file mode 100644<br/>index 000000000000..633255a97557<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dts/mgcoge.dts?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dts/mgcoge.dts</a></div><div class='hunk'>@@ -0,0 +1,174 @@</div><div class='add'>+/*</div><div class='add'>+ * Device Tree for the MGCOGE plattform from keymile</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2008 DENX Software Engineering GmbH</div><div class='add'>+ * Heiko Schocher &lt;hs@denx.de&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute  it and/or modify it</div><div class='add'>+ * under  the terms of  the GNU General  Public License as published by the</div><div class='add'>+ * Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='add'>+ * option) any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+/ {</div><div class='add'>+	model = "MGCOGE";</div><div class='add'>+	compatible = "keymile,mgcoge";</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+	aliases {</div><div class='add'>+		ethernet0 = &amp;eth0;</div><div class='add'>+		serial0 = &amp;smc2;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	cpus {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+		PowerPC,8247@0 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			reg = &lt;0&gt;;</div><div class='add'>+			d-cache-line-size = &lt;32&gt;;</div><div class='add'>+			i-cache-line-size = &lt;32&gt;;</div><div class='add'>+			d-cache-size = &lt;16384&gt;;</div><div class='add'>+			i-cache-size = &lt;16384&gt;;</div><div class='add'>+			timebase-frequency = &lt;0&gt;; /* Filled in by U-Boot */</div><div class='add'>+			clock-frequency = &lt;0&gt;; /* Filled in by U-Boot */</div><div class='add'>+			bus-frequency = &lt;0&gt;; /* Filled in by U-Boot */</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	localbus@f0010100 {</div><div class='add'>+		compatible = "fsl,mpc8247-localbus",</div><div class='add'>+		             "fsl,pq2-localbus",</div><div class='add'>+		             "simple-bus";</div><div class='add'>+		#address-cells = &lt;2&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		reg = &lt;0xf0010100 0x40&gt;;</div><div class='add'>+</div><div class='add'>+		ranges = &lt;0 0 0xfe000000 0x00400000</div><div class='add'>+			  5 0 0x50000000 0x20000000</div><div class='add'>+			&gt;; /* Filled in by U-Boot */</div><div class='add'>+</div><div class='add'>+		flash@0,0 {</div><div class='add'>+			compatible = "cfi-flash";</div><div class='add'>+			reg = &lt;0 0x0 0x400000&gt;;</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;1&gt;;</div><div class='add'>+			bank-width = &lt;1&gt;;</div><div class='add'>+			device-width = &lt;1&gt;;</div><div class='add'>+			partition@0 {</div><div class='add'>+				label = "u-boot";</div><div class='add'>+				reg = &lt;0 0x40000&gt;;</div><div class='add'>+			};</div><div class='add'>+			partition@40000 {</div><div class='add'>+				label = "env";</div><div class='add'>+				reg = &lt;0x40000 0x20000&gt;;</div><div class='add'>+			};</div><div class='add'>+			partition@60000 {</div><div class='add'>+				label = "kernel";</div><div class='add'>+				reg = &lt;0x60000 0x220000&gt;;</div><div class='add'>+			};</div><div class='add'>+			partition@280000 {</div><div class='add'>+				label = "dtb";</div><div class='add'>+				reg = &lt;0x280000 0x20000&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		flash@5,0 {</div><div class='add'>+			compatible = "cfi-flash";</div><div class='add'>+			reg = &lt;5 0x0 0x2000000&gt;;</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;1&gt;;</div><div class='add'>+			bank-width = &lt;2&gt;;</div><div class='add'>+			device-width = &lt;2&gt;;</div><div class='add'>+			partition@0 {</div><div class='add'>+				label = "ramdisk";</div><div class='add'>+				reg = &lt;0 0x7a0000&gt;;</div><div class='add'>+			};</div><div class='add'>+			partition@7a0000 {</div><div class='add'>+				label = "user";</div><div class='add'>+				reg = &lt;0x7a0000 0x1860000&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	memory {</div><div class='add'>+		device_type = "memory";</div><div class='add'>+		reg = &lt;0 0&gt;; /* Filled in by U-Boot */</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	soc@f0000000 {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		compatible = "fsl,mpc8247-immr", "fsl,pq2-soc", "simple-bus";</div><div class='add'>+		ranges = &lt;0x00000000 0xf0000000 0x00053000&gt;;</div><div class='add'>+</div><div class='add'>+		// Temporary until code stops depending on it.</div><div class='add'>+		device_type = "soc";</div><div class='add'>+</div><div class='add'>+		cpm@119c0 {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;1&gt;;</div><div class='add'>+			#interrupt-cells = &lt;2&gt;;</div><div class='add'>+			compatible = "fsl,mpc8247-cpm", "fsl,cpm2",</div><div class='add'>+					"simple-bus";</div><div class='add'>+			reg = &lt;0x119c0 0x30&gt;;</div><div class='add'>+			ranges;</div><div class='add'>+</div><div class='add'>+			muram {</div><div class='add'>+				compatible = "fsl,cpm-muram";</div><div class='add'>+				#address-cells = &lt;1&gt;;</div><div class='add'>+				#size-cells = &lt;1&gt;;</div><div class='add'>+				ranges = &lt;0 0 0x10000&gt;;</div><div class='add'>+</div><div class='add'>+				data@0 {</div><div class='add'>+					compatible = "fsl,cpm-muram-data";</div><div class='add'>+					reg = &lt;0x80 0x1f80 0x9800 0x800&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			brg@119f0 {</div><div class='add'>+				compatible = "fsl,mpc8247-brg",</div><div class='add'>+				             "fsl,cpm2-brg",</div><div class='add'>+				             "fsl,cpm-brg";</div><div class='add'>+				reg = &lt;0x119f0 0x10 0x115f0 0x10&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			/* Monitor port/SMC2 */</div><div class='add'>+			smc2: serial@11a90 {</div><div class='add'>+				device_type = "serial";</div><div class='add'>+				compatible = "fsl,mpc8247-smc-uart",</div><div class='add'>+				             "fsl,cpm2-smc-uart";</div><div class='add'>+				reg = &lt;0x11a90 0x20 0x88fc 0x02&gt;;</div><div class='add'>+				interrupts = &lt;5 8&gt;;</div><div class='add'>+				interrupt-parent = &lt;&amp;PIC&gt;;</div><div class='add'>+				fsl,cpm-brg = &lt;2&gt;;</div><div class='add'>+				fsl,cpm-command = &lt;0x21200000&gt;;</div><div class='add'>+				current-speed = &lt;0&gt;; /* Filled in by U-Boot */</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			eth0: ethernet@11a60 {</div><div class='add'>+				device_type = "network";</div><div class='add'>+				compatible = "fsl,mpc8247-scc-enet",</div><div class='add'>+				             "fsl,cpm2-scc-enet";</div><div class='add'>+				reg = &lt;0x11a60 0x20 0x8300 0x100 0x11390 1&gt;;</div><div class='add'>+				local-mac-address = [ 00 00 00 00 00 00 ]; /* Filled in by U-Boot */</div><div class='add'>+				interrupts = &lt;43 8&gt;;</div><div class='add'>+				interrupt-parent = &lt;&amp;PIC&gt;;</div><div class='add'>+				linux,network-index = &lt;0&gt;;</div><div class='add'>+				fsl,cpm-command = &lt;0xce00000&gt;;</div><div class='add'>+				fixed-link = &lt;0 0 10 0 0&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		PIC: interrupt-controller@10c00 {</div><div class='add'>+			#interrupt-cells = &lt;2&gt;;</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			reg = &lt;0x10c00 0x80&gt;;</div><div class='add'>+			compatible = "fsl,mpc8247-pic", "fsl,pq2-pic";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/mgsuvd.dts b/arch/powerpc/boot/dts/mgsuvd.dts<br/>new file mode 100644<br/>index 000000000000..e4fc53ab42bd<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dts/mgsuvd.dts?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dts/mgsuvd.dts</a></div><div class='hunk'>@@ -0,0 +1,163 @@</div><div class='add'>+/*</div><div class='add'>+ * MGSUVD Device Tree Source</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2008 DENX Software Engineering GmbH</div><div class='add'>+ * Heiko Schocher &lt;hs@denx.de&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute  it and/or modify it</div><div class='add'>+ * under  the terms of  the GNU General  Public License as published by the</div><div class='add'>+ * Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='add'>+ * option) any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+/ {</div><div class='add'>+	model = "MGSUVD";</div><div class='add'>+	compatible = "keymile,mgsuvd";</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+	cpus {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+		PowerPC,852@0 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			reg = &lt;0&gt;;</div><div class='add'>+			d-cache-line-size = &lt;16&gt;;</div><div class='add'>+			i-cache-line-size = &lt;16&gt;;</div><div class='add'>+			d-cache-size = &lt;8192&gt;;</div><div class='add'>+			i-cache-size = &lt;8192&gt;;</div><div class='add'>+			timebase-frequency = &lt;0&gt;;	/* Filled in by u-boot */</div><div class='add'>+			bus-frequency = &lt;0&gt;;		/* Filled in by u-boot */</div><div class='add'>+			clock-frequency = &lt;0&gt;;		/* Filled in by u-boot */</div><div class='add'>+			interrupts = &lt;15 2&gt;;		/* decrementer interrupt */</div><div class='add'>+			interrupt-parent = &lt;&amp;PIC&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	memory {</div><div class='add'>+		device_type = "memory";</div><div class='add'>+		reg = &lt;00000000 0x4000000&gt;;  /* Filled in by u-boot */</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	localbus@fff00100 {</div><div class='add'>+		compatible = "fsl,mpc852-localbus", "fsl,pq1-localbus", "simple-bus";</div><div class='add'>+		#address-cells = &lt;2&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		reg = &lt;0xfff00100 0x40&gt;;</div><div class='add'>+</div><div class='add'>+		ranges = &lt;0 0 0xf0000000 0x01000000&gt;;  /* Filled in by u-boot */</div><div class='add'>+</div><div class='add'>+		flash@0,0 {</div><div class='add'>+			compatible = "cfi-flash";</div><div class='add'>+			reg = &lt;0 0 0x1000000&gt;;</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;1&gt;;</div><div class='add'>+			bank-width = &lt;1&gt;;</div><div class='add'>+			device-width = &lt;1&gt;;</div><div class='add'>+			partition@0 {</div><div class='add'>+				label = "u-boot";</div><div class='add'>+				reg = &lt;0 0x80000&gt;;</div><div class='add'>+			};</div><div class='add'>+			partition@80000 {</div><div class='add'>+				label = "env";</div><div class='add'>+				reg = &lt;0x80000 0x20000&gt;;</div><div class='add'>+			};</div><div class='add'>+			partition@a0000 {</div><div class='add'>+				label = "kernel";</div><div class='add'>+				reg = &lt;0xa0000 0x1e0000&gt;;</div><div class='add'>+			};</div><div class='add'>+			partition@280000 {</div><div class='add'>+				label = "dtb";</div><div class='add'>+				reg = &lt;0x280000 0x20000&gt;;</div><div class='add'>+			};</div><div class='add'>+			partition@2a0000 {</div><div class='add'>+			        label = "root";</div><div class='add'>+			        reg = &lt;0x2a0000 0x500000&gt;;</div><div class='add'>+			};</div><div class='add'>+			partition@7a0000 {</div><div class='add'>+			        label = "user";</div><div class='add'>+			        reg = &lt;0x7a0000 0x860000&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	soc@fff00000 {</div><div class='add'>+		compatible = "fsl,mpc852", "fsl,pq1-soc", "simple-bus";</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		device_type = "soc";</div><div class='add'>+		ranges = &lt;0 0xfff00000 0x00004000&gt;;</div><div class='add'>+</div><div class='add'>+		PIC: interrupt-controller@0 {</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;2&gt;;</div><div class='add'>+			reg = &lt;0 24&gt;;</div><div class='add'>+			compatible = "fsl,mpc852-pic", "fsl,pq1-pic";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpm@9c0 {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;1&gt;;</div><div class='add'>+			compatible = "fsl,mpc852-cpm", "fsl,cpm1", "simple-bus";</div><div class='add'>+			interrupts = &lt;0&gt;;	/* cpm error interrupt */</div><div class='add'>+			interrupt-parent = &lt;&amp;CPM_PIC&gt;;</div><div class='add'>+			reg = &lt;0x9c0 10&gt;;</div><div class='add'>+			ranges;</div><div class='add'>+</div><div class='add'>+			muram@2000 {</div><div class='add'>+				compatible = "fsl,cpm-muram";</div><div class='add'>+				#address-cells = &lt;1&gt;;</div><div class='add'>+				#size-cells = &lt;1&gt;;</div><div class='add'>+				ranges = &lt;0 0x2000 0x2000&gt;;</div><div class='add'>+</div><div class='add'>+				data@0 {</div><div class='add'>+					compatible = "fsl,cpm-muram-data";</div><div class='add'>+					reg = &lt;0x800 0x1800&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			brg@9f0 {</div><div class='add'>+				compatible = "fsl,mpc852-brg",</div><div class='add'>+				             "fsl,cpm1-brg",</div><div class='add'>+				             "fsl,cpm-brg";</div><div class='add'>+				reg = &lt;0x9f0 0x10&gt;;</div><div class='add'>+				clock-frequency = &lt;0&gt;; /* Filled in by u-boot */</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			CPM_PIC: interrupt-controller@930 {</div><div class='add'>+				interrupt-controller;</div><div class='add'>+				#interrupt-cells = &lt;1&gt;;</div><div class='add'>+				interrupts = &lt;5 2 0 2&gt;;</div><div class='add'>+				interrupt-parent = &lt;&amp;PIC&gt;;</div><div class='add'>+				reg = &lt;0x930 0x20&gt;;</div><div class='add'>+				compatible = "fsl,cpm1-pic";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			/* MON-1 */</div><div class='add'>+			serial@a80 {</div><div class='add'>+				device_type = "serial";</div><div class='add'>+				compatible = "fsl,cpm1-smc-uart";</div><div class='add'>+				reg = &lt;0xa80 0x10 0x3fc0 0x40&gt;;</div><div class='add'>+				interrupts = &lt;4&gt;;</div><div class='add'>+				interrupt-parent = &lt;&amp;CPM_PIC&gt;;</div><div class='add'>+				fsl,cpm-brg = &lt;1&gt;;</div><div class='add'>+				fsl,cpm-command = &lt;0x0090&gt;;</div><div class='add'>+				current-speed = &lt;0&gt;; /* Filled in by u-boot */</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ethernet@a40 {</div><div class='add'>+				device_type = "network";</div><div class='add'>+				compatible  = "fsl,mpc866-scc-enet",</div><div class='add'>+				              "fsl,cpm1-scc-enet";</div><div class='add'>+				reg = &lt;0xa40 0x18 0x3e00 0x100&gt;;</div><div class='add'>+				local-mac-address = [ 00 00 00 00 00 00 ];  /* Filled in by u-boot */</div><div class='add'>+				interrupts = &lt;28&gt;;</div><div class='add'>+				interrupt-parent = &lt;&amp;CPM_PIC&gt;;</div><div class='add'>+				fsl,cpm-command = &lt;0x80&gt;;</div><div class='add'>+				fixed-link = &lt;0 0 10 0 0&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/mpc5121ads.dts b/arch/powerpc/boot/dts/mpc5121ads.dts<br/>index 1f9036c317b4..c2b8dbfab79e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dts/mpc5121ads.dts?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/boot/dts/mpc5121ads.dts</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dts/mpc5121ads.dts?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dts/mpc5121ads.dts</a></div><div class='hunk'>@@ -403,7 +403,8 @@</div><div class='ctx'> 		#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;2&gt;;</div><div class='ctx'> 		#address-cells = &lt;3&gt;;</div><div class='del'>-		reg = &lt;0x80008500 0x100&gt;;</div><div class='add'>+		reg = &lt;0x80008500 0x100		/* internal registers */</div><div class='add'>+		       0x80008300 0x8&gt;;		/* config space access registers */</div><div class='ctx'> 		compatible = "fsl,mpc5121-pci";</div><div class='ctx'> 		device_type = "pci";</div><div class='ctx'> 	};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/mpc8313erdb.dts b/arch/powerpc/boot/dts/mpc8313erdb.dts<br/>index 2a94ae0dc8b8..747f27676332 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dts/mpc8313erdb.dts?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/boot/dts/mpc8313erdb.dts</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dts/mpc8313erdb.dts?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dts/mpc8313erdb.dts</a></div><div class='hunk'>@@ -176,24 +176,28 @@</div><div class='ctx'> 			dma-channel@0 {</div><div class='ctx'> 				compatible = "fsl,mpc8313-dma-channel", "fsl,elo-dma-channel";</div><div class='ctx'> 				reg = &lt;0 0x80&gt;;</div><div class='add'>+				cell-index = &lt;0&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='ctx'> 				interrupts = &lt;71 8&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 			dma-channel@80 {</div><div class='ctx'> 				compatible = "fsl,mpc8313-dma-channel", "fsl,elo-dma-channel";</div><div class='ctx'> 				reg = &lt;0x80 0x80&gt;;</div><div class='add'>+				cell-index = &lt;1&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='ctx'> 				interrupts = &lt;71 8&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 			dma-channel@100 {</div><div class='ctx'> 				compatible = "fsl,mpc8313-dma-channel", "fsl,elo-dma-channel";</div><div class='ctx'> 				reg = &lt;0x100 0x80&gt;;</div><div class='add'>+				cell-index = &lt;2&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='ctx'> 				interrupts = &lt;71 8&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 			dma-channel@180 {</div><div class='ctx'> 				compatible = "fsl,mpc8313-dma-channel", "fsl,elo-dma-channel";</div><div class='ctx'> 				reg = &lt;0x180 0x28&gt;;</div><div class='add'>+				cell-index = &lt;3&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='ctx'> 				interrupts = &lt;71 8&gt;;</div><div class='ctx'> 			};</div><div class='hunk'>@@ -359,7 +363,8 @@</div><div class='ctx'> 			#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;2&gt;;</div><div class='ctx'> 			#address-cells = &lt;3&gt;;</div><div class='del'>-			reg = &lt;0xe0008500 0x100&gt;;</div><div class='add'>+			reg = &lt;0xe0008500 0x100		/* internal registers */</div><div class='add'>+			       0xe0008300 0x8&gt;;		/* config space access registers */</div><div class='ctx'> 			compatible = "fsl,mpc8349-pci";</div><div class='ctx'> 			device_type = "pci";</div><div class='ctx'> 		};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/mpc8315erdb.dts b/arch/powerpc/boot/dts/mpc8315erdb.dts<br/>index f704513fb930..7449e54c1a90 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dts/mpc8315erdb.dts?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/boot/dts/mpc8315erdb.dts</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dts/mpc8315erdb.dts?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dts/mpc8315erdb.dts</a></div><div class='hunk'>@@ -144,24 +144,28 @@</div><div class='ctx'> 			dma-channel@0 {</div><div class='ctx'> 				compatible = "fsl,mpc8315-dma-channel", "fsl,elo-dma-channel";</div><div class='ctx'> 				reg = &lt;0 0x80&gt;;</div><div class='add'>+				cell-index = &lt;0&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='ctx'> 				interrupts = &lt;71 8&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 			dma-channel@80 {</div><div class='ctx'> 				compatible = "fsl,mpc8315-dma-channel", "fsl,elo-dma-channel";</div><div class='ctx'> 				reg = &lt;0x80 0x80&gt;;</div><div class='add'>+				cell-index = &lt;1&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='ctx'> 				interrupts = &lt;71 8&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 			dma-channel@100 {</div><div class='ctx'> 				compatible = "fsl,mpc8315-dma-channel", "fsl,elo-dma-channel";</div><div class='ctx'> 				reg = &lt;0x100 0x80&gt;;</div><div class='add'>+				cell-index = &lt;2&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='ctx'> 				interrupts = &lt;71 8&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 			dma-channel@180 {</div><div class='ctx'> 				compatible = "fsl,mpc8315-dma-channel", "fsl,elo-dma-channel";</div><div class='ctx'> 				reg = &lt;0x180 0x28&gt;;</div><div class='add'>+				cell-index = &lt;3&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='ctx'> 				interrupts = &lt;71 8&gt;;</div><div class='ctx'> 			};</div><div class='hunk'>@@ -314,7 +318,8 @@</div><div class='ctx'> 		#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;2&gt;;</div><div class='ctx'> 		#address-cells = &lt;3&gt;;</div><div class='del'>-		reg = &lt;0xe0008500 0x100&gt;;</div><div class='add'>+		reg = &lt;0xe0008500 0x100		/* internal registers */</div><div class='add'>+		       0xe0008300 0x8&gt;;		/* config space access registers */</div><div class='ctx'> 		compatible = "fsl,mpc8349-pci";</div><div class='ctx'> 		device_type = "pci";</div><div class='ctx'> 	};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/mpc832x_mds.dts b/arch/powerpc/boot/dts/mpc832x_mds.dts<br/>index fbc930410ff6..e4cc1768f241 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dts/mpc832x_mds.dts?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/boot/dts/mpc832x_mds.dts</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dts/mpc832x_mds.dts?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dts/mpc832x_mds.dts</a></div><div class='hunk'>@@ -127,24 +127,28 @@</div><div class='ctx'> 			dma-channel@0 {</div><div class='ctx'> 				compatible = "fsl,mpc8323-dma-channel", "fsl,elo-dma-channel";</div><div class='ctx'> 				reg = &lt;0 0x80&gt;;</div><div class='add'>+				cell-index = &lt;0&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='ctx'> 				interrupts = &lt;71 8&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 			dma-channel@80 {</div><div class='ctx'> 				compatible = "fsl,mpc8323-dma-channel", "fsl,elo-dma-channel";</div><div class='ctx'> 				reg = &lt;0x80 0x80&gt;;</div><div class='add'>+				cell-index = &lt;1&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='ctx'> 				interrupts = &lt;71 8&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 			dma-channel@100 {</div><div class='ctx'> 				compatible = "fsl,mpc8323-dma-channel", "fsl,elo-dma-channel";</div><div class='ctx'> 				reg = &lt;0x100 0x80&gt;;</div><div class='add'>+				cell-index = &lt;2&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='ctx'> 				interrupts = &lt;71 8&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 			dma-channel@180 {</div><div class='ctx'> 				compatible = "fsl,mpc8323-dma-channel", "fsl,elo-dma-channel";</div><div class='ctx'> 				reg = &lt;0x180 0x28&gt;;</div><div class='add'>+				cell-index = &lt;3&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='ctx'> 				interrupts = &lt;71 8&gt;;</div><div class='ctx'> 			};</div><div class='hunk'>@@ -419,7 +423,8 @@</div><div class='ctx'> 		#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;2&gt;;</div><div class='ctx'> 		#address-cells = &lt;3&gt;;</div><div class='del'>-		reg = &lt;0xe0008500 0x100&gt;;</div><div class='add'>+		reg = &lt;0xe0008500 0x100		/* internal registers */</div><div class='add'>+		       0xe0008300 0x8&gt;;		/* config space access registers */</div><div class='ctx'> 		compatible = "fsl,mpc8349-pci";</div><div class='ctx'> 		device_type = "pci";</div><div class='ctx'> 	};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/mpc832x_rdb.dts b/arch/powerpc/boot/dts/mpc832x_rdb.dts<br/>index b157d1885a28..226ff066652b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dts/mpc832x_rdb.dts?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/boot/dts/mpc832x_rdb.dts</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dts/mpc832x_rdb.dts?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dts/mpc832x_rdb.dts</a></div><div class='hunk'>@@ -105,24 +105,28 @@</div><div class='ctx'> 			dma-channel@0 {</div><div class='ctx'> 				compatible = "fsl,mpc8323-dma-channel", "fsl,elo-dma-channel";</div><div class='ctx'> 				reg = &lt;0 0x80&gt;;</div><div class='add'>+				cell-index = &lt;0&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='ctx'> 				interrupts = &lt;71 8&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 			dma-channel@80 {</div><div class='ctx'> 				compatible = "fsl,mpc8323-dma-channel", "fsl,elo-dma-channel";</div><div class='ctx'> 				reg = &lt;0x80 0x80&gt;;</div><div class='add'>+				cell-index = &lt;1&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='ctx'> 				interrupts = &lt;71 8&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 			dma-channel@100 {</div><div class='ctx'> 				compatible = "fsl,mpc8323-dma-channel", "fsl,elo-dma-channel";</div><div class='ctx'> 				reg = &lt;0x100 0x80&gt;;</div><div class='add'>+				cell-index = &lt;2&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='ctx'> 				interrupts = &lt;71 8&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 			dma-channel@180 {</div><div class='ctx'> 				compatible = "fsl,mpc8323-dma-channel", "fsl,elo-dma-channel";</div><div class='ctx'> 				reg = &lt;0x180 0x28&gt;;</div><div class='add'>+				cell-index = &lt;3&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='ctx'> 				interrupts = &lt;71 8&gt;;</div><div class='ctx'> 			};</div><div class='hunk'>@@ -327,7 +331,8 @@</div><div class='ctx'> 		#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;2&gt;;</div><div class='ctx'> 		#address-cells = &lt;3&gt;;</div><div class='del'>-		reg = &lt;0xe0008500 0x100&gt;;</div><div class='add'>+		reg = &lt;0xe0008500 0x100		/* internal registers */</div><div class='add'>+		       0xe0008300 0x8&gt;;		/* config space access registers */</div><div class='ctx'> 		compatible = "fsl,mpc8349-pci";</div><div class='ctx'> 		device_type = "pci";</div><div class='ctx'> 	};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/mpc8349emitx.dts b/arch/powerpc/boot/dts/mpc8349emitx.dts<br/>index 700e076ef3f5..5cedf373a1d8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dts/mpc8349emitx.dts?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/boot/dts/mpc8349emitx.dts</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dts/mpc8349emitx.dts?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dts/mpc8349emitx.dts</a></div><div class='hunk'>@@ -106,24 +106,28 @@</div><div class='ctx'> 			dma-channel@0 {</div><div class='ctx'> 				compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";</div><div class='ctx'> 				reg = &lt;0 0x80&gt;;</div><div class='add'>+				cell-index = &lt;0&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='ctx'> 				interrupts = &lt;71 8&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 			dma-channel@80 {</div><div class='ctx'> 				compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";</div><div class='ctx'> 				reg = &lt;0x80 0x80&gt;;</div><div class='add'>+				cell-index = &lt;1&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='ctx'> 				interrupts = &lt;71 8&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 			dma-channel@100 {</div><div class='ctx'> 				compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";</div><div class='ctx'> 				reg = &lt;0x100 0x80&gt;;</div><div class='add'>+				cell-index = &lt;2&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='ctx'> 				interrupts = &lt;71 8&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 			dma-channel@180 {</div><div class='ctx'> 				compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";</div><div class='ctx'> 				reg = &lt;0x180 0x28&gt;;</div><div class='add'>+				cell-index = &lt;3&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='ctx'> 				interrupts = &lt;71 8&gt;;</div><div class='ctx'> 			};</div><div class='hunk'>@@ -250,7 +254,8 @@</div><div class='ctx'> 		#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;2&gt;;</div><div class='ctx'> 		#address-cells = &lt;3&gt;;</div><div class='del'>-		reg = &lt;0xe0008500 0x100&gt;;</div><div class='add'>+		reg = &lt;0xe0008500 0x100		/* internal registers */</div><div class='add'>+		       0xe0008300 0x8&gt;;		/* config space access registers */</div><div class='ctx'> 		compatible = "fsl,mpc8349-pci";</div><div class='ctx'> 		device_type = "pci";</div><div class='ctx'> 	};</div><div class='hunk'>@@ -276,7 +281,8 @@</div><div class='ctx'> 		#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;2&gt;;</div><div class='ctx'> 		#address-cells = &lt;3&gt;;</div><div class='del'>-		reg = &lt;0xe0008600 0x100&gt;;</div><div class='add'>+		reg = &lt;0xe0008600 0x100		/* internal registers */</div><div class='add'>+		       0xe0008380 0x8&gt;;		/* config space access registers */</div><div class='ctx'> 		compatible = "fsl,mpc8349-pci";</div><div class='ctx'> 		device_type = "pci";</div><div class='ctx'> 	};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/mpc8349emitxgp.dts b/arch/powerpc/boot/dts/mpc8349emitxgp.dts<br/>index cdd3063258ea..81ae1d3e9440 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dts/mpc8349emitxgp.dts?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/boot/dts/mpc8349emitxgp.dts</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dts/mpc8349emitxgp.dts?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dts/mpc8349emitxgp.dts</a></div><div class='hunk'>@@ -104,24 +104,28 @@</div><div class='ctx'> 			dma-channel@0 {</div><div class='ctx'> 				compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";</div><div class='ctx'> 				reg = &lt;0 0x80&gt;;</div><div class='add'>+				cell-index = &lt;0&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='ctx'> 				interrupts = &lt;71 8&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 			dma-channel@80 {</div><div class='ctx'> 				compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";</div><div class='ctx'> 				reg = &lt;0x80 0x80&gt;;</div><div class='add'>+				cell-index = &lt;1&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='ctx'> 				interrupts = &lt;71 8&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 			dma-channel@100 {</div><div class='ctx'> 				compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";</div><div class='ctx'> 				reg = &lt;0x100 0x80&gt;;</div><div class='add'>+				cell-index = &lt;2&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='ctx'> 				interrupts = &lt;71 8&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 			dma-channel@180 {</div><div class='ctx'> 				compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";</div><div class='ctx'> 				reg = &lt;0x180 0x28&gt;;</div><div class='add'>+				cell-index = &lt;3&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='ctx'> 				interrupts = &lt;71 8&gt;;</div><div class='ctx'> 			};</div><div class='hunk'>@@ -224,7 +228,8 @@</div><div class='ctx'> 		#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;2&gt;;</div><div class='ctx'> 		#address-cells = &lt;3&gt;;</div><div class='del'>-		reg = &lt;0xe0008600 0x100&gt;;</div><div class='add'>+		reg = &lt;0xe0008600 0x100		/* internal registers */</div><div class='add'>+		       0xe0008380 0x8&gt;;		/* config space access registers */</div><div class='ctx'> 		compatible = "fsl,mpc8349-pci";</div><div class='ctx'> 		device_type = "pci";</div><div class='ctx'> 	};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/mpc834x_mds.dts b/arch/powerpc/boot/dts/mpc834x_mds.dts<br/>index 783241c00240..04bfde3ea605 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dts/mpc834x_mds.dts?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/boot/dts/mpc834x_mds.dts</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dts/mpc834x_mds.dts?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dts/mpc834x_mds.dts</a></div><div class='hunk'>@@ -116,24 +116,28 @@</div><div class='ctx'> 			dma-channel@0 {</div><div class='ctx'> 				compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";</div><div class='ctx'> 				reg = &lt;0 0x80&gt;;</div><div class='add'>+				cell-index = &lt;0&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='ctx'> 				interrupts = &lt;71 8&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 			dma-channel@80 {</div><div class='ctx'> 				compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";</div><div class='ctx'> 				reg = &lt;0x80 0x80&gt;;</div><div class='add'>+				cell-index = &lt;1&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='ctx'> 				interrupts = &lt;71 8&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 			dma-channel@100 {</div><div class='ctx'> 				compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";</div><div class='ctx'> 				reg = &lt;0x100 0x80&gt;;</div><div class='add'>+				cell-index = &lt;2&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='ctx'> 				interrupts = &lt;71 8&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 			dma-channel@180 {</div><div class='ctx'> 				compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";</div><div class='ctx'> 				reg = &lt;0x180 0x28&gt;;</div><div class='add'>+				cell-index = &lt;3&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='ctx'> 				interrupts = &lt;71 8&gt;;</div><div class='ctx'> 			};</div><div class='hunk'>@@ -311,7 +315,8 @@</div><div class='ctx'> 		#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;2&gt;;</div><div class='ctx'> 		#address-cells = &lt;3&gt;;</div><div class='del'>-		reg = &lt;0xe0008500 0x100&gt;;</div><div class='add'>+		reg = &lt;0xe0008500 0x100		/* internal registers */</div><div class='add'>+		       0xe0008300 0x8&gt;;		/* config space access registers */</div><div class='ctx'> 		compatible = "fsl,mpc8349-pci";</div><div class='ctx'> 		device_type = "pci";</div><div class='ctx'> 	};</div><div class='hunk'>@@ -372,7 +377,8 @@</div><div class='ctx'> 		#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;2&gt;;</div><div class='ctx'> 		#address-cells = &lt;3&gt;;</div><div class='del'>-		reg = &lt;0xe0008600 0x100&gt;;</div><div class='add'>+		reg = &lt;0xe0008600 0x100		/* internal registers */</div><div class='add'>+		       0xe0008380 0x8&gt;;		/* config space access registers */</div><div class='ctx'> 		compatible = "fsl,mpc8349-pci";</div><div class='ctx'> 		device_type = "pci";</div><div class='ctx'> 	};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/mpc836x_mds.dts b/arch/powerpc/boot/dts/mpc836x_mds.dts<br/>index a3b76a709951..66a12d2631fb 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dts/mpc836x_mds.dts?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/boot/dts/mpc836x_mds.dts</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dts/mpc836x_mds.dts?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dts/mpc836x_mds.dts</a></div><div class='hunk'>@@ -52,9 +52,26 @@</div><div class='ctx'> 		reg = &lt;0x00000000 0x10000000&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	bcsr@f8000000 {</div><div class='del'>-		device_type = "board-control";</div><div class='del'>-		reg = &lt;0xf8000000 0x8000&gt;;</div><div class='add'>+	localbus@e0005000 {</div><div class='add'>+		#address-cells = &lt;2&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		compatible = "fsl,mpc8360-localbus", "fsl,pq2pro-localbus",</div><div class='add'>+			     "simple-bus";</div><div class='add'>+		reg = &lt;0xe0005000 0xd8&gt;;</div><div class='add'>+		ranges = &lt;0 0 0xfe000000 0x02000000</div><div class='add'>+		          1 0 0xf8000000 0x00008000&gt;;</div><div class='add'>+</div><div class='add'>+		flash@0,0 {</div><div class='add'>+			compatible = "cfi-flash";</div><div class='add'>+			reg = &lt;0 0 0x2000000&gt;;</div><div class='add'>+			bank-width = &lt;2&gt;;</div><div class='add'>+			device-width = &lt;1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		bcsr@1,0 {</div><div class='add'>+			device_type = "board-control";</div><div class='add'>+			reg = &lt;1 0 0x8000&gt;;</div><div class='add'>+		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	soc8360@e0000000 {</div><div class='hunk'>@@ -131,24 +148,28 @@</div><div class='ctx'> 			dma-channel@0 {</div><div class='ctx'> 				compatible = "fsl,mpc8360-dma-channel", "fsl,elo-dma-channel";</div><div class='ctx'> 				reg = &lt;0 0x80&gt;;</div><div class='add'>+				cell-index = &lt;0&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='ctx'> 				interrupts = &lt;71 8&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 			dma-channel@80 {</div><div class='ctx'> 				compatible = "fsl,mpc8360-dma-channel", "fsl,elo-dma-channel";</div><div class='ctx'> 				reg = &lt;0x80 0x80&gt;;</div><div class='add'>+				cell-index = &lt;1&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='ctx'> 				interrupts = &lt;71 8&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 			dma-channel@100 {</div><div class='ctx'> 				compatible = "fsl,mpc8360-dma-channel", "fsl,elo-dma-channel";</div><div class='ctx'> 				reg = &lt;0x100 0x80&gt;;</div><div class='add'>+				cell-index = &lt;2&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='ctx'> 				interrupts = &lt;71 8&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 			dma-channel@180 {</div><div class='ctx'> 				compatible = "fsl,mpc8360-dma-channel", "fsl,elo-dma-channel";</div><div class='ctx'> 				reg = &lt;0x180 0x28&gt;;</div><div class='add'>+				cell-index = &lt;3&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='ctx'> 				interrupts = &lt;71 8&gt;;</div><div class='ctx'> 			};</div><div class='hunk'>@@ -405,7 +426,8 @@</div><div class='ctx'> 		#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;2&gt;;</div><div class='ctx'> 		#address-cells = &lt;3&gt;;</div><div class='del'>-		reg = &lt;0xe0008500 0x100&gt;;</div><div class='add'>+		reg = &lt;0xe0008500 0x100		/* internal registers */</div><div class='add'>+		       0xe0008300 0x8&gt;;		/* config space access registers */</div><div class='ctx'> 		compatible = "fsl,mpc8349-pci";</div><div class='ctx'> 		device_type = "pci";</div><div class='ctx'> 	};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/mpc836x_rdk.dts b/arch/powerpc/boot/dts/mpc836x_rdk.dts<br/>index 89c9202f8bd7..decadf3d9e98 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dts/mpc836x_rdk.dts?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/boot/dts/mpc836x_rdk.dts</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dts/mpc836x_rdk.dts?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dts/mpc836x_rdk.dts</a></div><div class='hunk'>@@ -125,24 +125,28 @@</div><div class='ctx'> 			dma-channel@0 {</div><div class='ctx'> 				compatible = "fsl,mpc8360-dma-channel", "fsl,elo-dma-channel";</div><div class='ctx'> 				reg = &lt;0 0x80&gt;;</div><div class='add'>+				cell-index = &lt;0&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='ctx'> 				interrupts = &lt;71 8&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 			dma-channel@80 {</div><div class='ctx'> 				compatible = "fsl,mpc8360-dma-channel", "fsl,elo-dma-channel";</div><div class='ctx'> 				reg = &lt;0x80 0x80&gt;;</div><div class='add'>+				cell-index = &lt;1&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='ctx'> 				interrupts = &lt;71 8&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 			dma-channel@100 {</div><div class='ctx'> 				compatible = "fsl,mpc8360-dma-channel", "fsl,elo-dma-channel";</div><div class='ctx'> 				reg = &lt;0x100 0x80&gt;;</div><div class='add'>+				cell-index = &lt;2&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='ctx'> 				interrupts = &lt;71 8&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 			dma-channel@180 {</div><div class='ctx'> 				compatible = "fsl,mpc8360-dma-channel", "fsl,elo-dma-channel";</div><div class='ctx'> 				reg = &lt;0x180 0x28&gt;;</div><div class='add'>+				cell-index = &lt;3&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='ctx'> 				interrupts = &lt;71 8&gt;;</div><div class='ctx'> 			};</div><div class='hunk'>@@ -383,6 +387,18 @@</div><div class='ctx'> 			device-width = &lt;1&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		upm@1,0 {</div><div class='add'>+			compatible = "fsl,upm-nand";</div><div class='add'>+			reg = &lt;1 0 1&gt;;</div><div class='add'>+			fsl,upm-addr-offset = &lt;16&gt;;</div><div class='add'>+			fsl,upm-cmd-offset = &lt;8&gt;;</div><div class='add'>+			gpios = &lt;&amp;qe_pio_e 18 0&gt;;</div><div class='add'>+</div><div class='add'>+			flash {</div><div class='add'>+				compatible = "stm,nand512-a";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		display@2,0 {</div><div class='ctx'> 			device_type = "display";</div><div class='ctx'> 			compatible = "fujitsu,MB86277", "fujitsu,mint";</div><div class='hunk'>@@ -405,7 +421,8 @@</div><div class='ctx'> 		#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 		device_type = "pci";</div><div class='ctx'> 		compatible = "fsl,mpc8360-pci", "fsl,mpc8349-pci";</div><div class='del'>-		reg = &lt;0xe0008500 0x100&gt;;</div><div class='add'>+		reg = &lt;0xe0008500 0x100		/* internal registers */</div><div class='add'>+		       0xe0008300 0x8&gt;;		/* config space access registers */</div><div class='ctx'> 		ranges = &lt;0x02000000 0 0x90000000 0x90000000 0 0x10000000</div><div class='ctx'> 			  0x42000000 0 0x80000000 0x80000000 0 0x10000000</div><div class='ctx'> 			  0x01000000 0 0xe0300000 0xe0300000 0 0x00100000&gt;;</div><div class='head'>diff --git a/arch/powerpc/boot/dts/mpc8377_mds.dts b/arch/powerpc/boot/dts/mpc8377_mds.dts<br/>index 432782b6d20a..0484561bd2c0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dts/mpc8377_mds.dts?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/boot/dts/mpc8377_mds.dts</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dts/mpc8377_mds.dts?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dts/mpc8377_mds.dts</a></div><div class='hunk'>@@ -136,6 +136,13 @@</div><div class='ctx'> 			interrupts = &lt;14 0x8&gt;;</div><div class='ctx'> 			interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='ctx'> 			dfsrr;</div><div class='add'>+</div><div class='add'>+			rtc@68 {</div><div class='add'>+				compatible = "dallas,ds1374";</div><div class='add'>+				reg = &lt;0x68&gt;;</div><div class='add'>+				interrupts = &lt;19 0x8&gt;;</div><div class='add'>+				interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='add'>+			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		i2c@3100 {</div><div class='hunk'>@@ -246,24 +253,28 @@</div><div class='ctx'> 			dma-channel@0 {</div><div class='ctx'> 				compatible = "fsl,mpc8377-dma-channel", "fsl,elo-dma-channel";</div><div class='ctx'> 				reg = &lt;0 0x80&gt;;</div><div class='add'>+				cell-index = &lt;0&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='ctx'> 				interrupts = &lt;0x47 8&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 			dma-channel@80 {</div><div class='ctx'> 				compatible = "fsl,mpc8377-dma-channel", "fsl,elo-dma-channel";</div><div class='ctx'> 				reg = &lt;0x80 0x80&gt;;</div><div class='add'>+				cell-index = &lt;1&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='ctx'> 				interrupts = &lt;0x47 8&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 			dma-channel@100 {</div><div class='ctx'> 				compatible = "fsl,mpc8377-dma-channel", "fsl,elo-dma-channel";</div><div class='ctx'> 				reg = &lt;0x100 0x80&gt;;</div><div class='add'>+				cell-index = &lt;2&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='ctx'> 				interrupts = &lt;0x47 8&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 			dma-channel@180 {</div><div class='ctx'> 				compatible = "fsl,mpc8377-dma-channel", "fsl,elo-dma-channel";</div><div class='ctx'> 				reg = &lt;0x180 0x28&gt;;</div><div class='add'>+				cell-index = &lt;3&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='ctx'> 				interrupts = &lt;0x47 8&gt;;</div><div class='ctx'> 			};</div><div class='hunk'>@@ -374,7 +385,8 @@</div><div class='ctx'> 		#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;2&gt;;</div><div class='ctx'> 		#address-cells = &lt;3&gt;;</div><div class='del'>-		reg = &lt;0xe0008500 0x100&gt;;</div><div class='add'>+		reg = &lt;0xe0008500 0x100		/* internal registers */</div><div class='add'>+		       0xe0008300 0x8&gt;;		/* config space access registers */</div><div class='ctx'> 		compatible = "fsl,mpc8349-pci";</div><div class='ctx'> 		device_type = "pci";</div><div class='ctx'> 	};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/mpc8377_rdb.dts b/arch/powerpc/boot/dts/mpc8377_rdb.dts<br/>index ed137aa83d5f..53191ba67aaa 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dts/mpc8377_rdb.dts?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/boot/dts/mpc8377_rdb.dts</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dts/mpc8377_rdb.dts?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dts/mpc8377_rdb.dts</a></div><div class='hunk'>@@ -155,24 +155,28 @@</div><div class='ctx'> 			dma-channel@0 {</div><div class='ctx'> 				compatible = "fsl,mpc8377-dma-channel", "fsl,elo-dma-channel";</div><div class='ctx'> 				reg = &lt;0 0x80&gt;;</div><div class='add'>+				cell-index = &lt;0&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='ctx'> 				interrupts = &lt;71 8&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 			dma-channel@80 {</div><div class='ctx'> 				compatible = "fsl,mpc8377-dma-channel", "fsl,elo-dma-channel";</div><div class='ctx'> 				reg = &lt;0x80 0x80&gt;;</div><div class='add'>+				cell-index = &lt;1&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='ctx'> 				interrupts = &lt;71 8&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 			dma-channel@100 {</div><div class='ctx'> 				compatible = "fsl,mpc8377-dma-channel", "fsl,elo-dma-channel";</div><div class='ctx'> 				reg = &lt;0x100 0x80&gt;;</div><div class='add'>+				cell-index = &lt;2&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='ctx'> 				interrupts = &lt;71 8&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 			dma-channel@180 {</div><div class='ctx'> 				compatible = "fsl,mpc8377-dma-channel", "fsl,elo-dma-channel";</div><div class='ctx'> 				reg = &lt;0x180 0x28&gt;;</div><div class='add'>+				cell-index = &lt;3&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='ctx'> 				interrupts = &lt;71 8&gt;;</div><div class='ctx'> 			};</div><div class='hunk'>@@ -315,7 +319,8 @@</div><div class='ctx'> 		#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;2&gt;;</div><div class='ctx'> 		#address-cells = &lt;3&gt;;</div><div class='del'>-		reg = &lt;0xe0008500 0x100&gt;;</div><div class='add'>+		reg = &lt;0xe0008500 0x100		/* internal registers */</div><div class='add'>+		       0xe0008300 0x8&gt;;		/* config space access registers */</div><div class='ctx'> 		compatible = "fsl,mpc8349-pci";</div><div class='ctx'> 		device_type = "pci";</div><div class='ctx'> 	};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/mpc8378_mds.dts b/arch/powerpc/boot/dts/mpc8378_mds.dts<br/>index ed32c8ddafe3..67a08d2e2ff2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dts/mpc8378_mds.dts?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/boot/dts/mpc8378_mds.dts</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dts/mpc8378_mds.dts?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dts/mpc8378_mds.dts</a></div><div class='hunk'>@@ -136,6 +136,13 @@</div><div class='ctx'> 			interrupts = &lt;14 0x8&gt;;</div><div class='ctx'> 			interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='ctx'> 			dfsrr;</div><div class='add'>+</div><div class='add'>+			rtc@68 {</div><div class='add'>+				compatible = "dallas,ds1374";</div><div class='add'>+				reg = &lt;0x68&gt;;</div><div class='add'>+				interrupts = &lt;19 0x8&gt;;</div><div class='add'>+				interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='add'>+			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		i2c@3100 {</div><div class='hunk'>@@ -170,24 +177,28 @@</div><div class='ctx'> 			dma-channel@0 {</div><div class='ctx'> 				compatible = "fsl,mpc8378-dma-channel", "fsl,elo-dma-channel";</div><div class='ctx'> 				reg = &lt;0 0x80&gt;;</div><div class='add'>+				cell-index = &lt;0&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='ctx'> 				interrupts = &lt;71 8&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 			dma-channel@80 {</div><div class='ctx'> 				compatible = "fsl,mpc8378-dma-channel", "fsl,elo-dma-channel";</div><div class='ctx'> 				reg = &lt;0x80 0x80&gt;;</div><div class='add'>+				cell-index = &lt;1&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='ctx'> 				interrupts = &lt;71 8&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 			dma-channel@100 {</div><div class='ctx'> 				compatible = "fsl,mpc8378-dma-channel", "fsl,elo-dma-channel";</div><div class='ctx'> 				reg = &lt;0x100 0x80&gt;;</div><div class='add'>+				cell-index = &lt;2&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='ctx'> 				interrupts = &lt;71 8&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 			dma-channel@180 {</div><div class='ctx'> 				compatible = "fsl,mpc8378-dma-channel", "fsl,elo-dma-channel";</div><div class='ctx'> 				reg = &lt;0x180 0x28&gt;;</div><div class='add'>+				cell-index = &lt;3&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='ctx'> 				interrupts = &lt;71 8&gt;;</div><div class='ctx'> 			};</div><div class='hunk'>@@ -360,7 +371,8 @@</div><div class='ctx'> 		#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;2&gt;;</div><div class='ctx'> 		#address-cells = &lt;3&gt;;</div><div class='del'>-		reg = &lt;0xe0008500 0x100&gt;;</div><div class='add'>+		reg = &lt;0xe0008500 0x100		/* internal registers */</div><div class='add'>+		       0xe0008300 0x8&gt;;		/* config space access registers */</div><div class='ctx'> 		compatible = "fsl,mpc8349-pci";</div><div class='ctx'> 		device_type = "pci";</div><div class='ctx'> 	};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/mpc8378_rdb.dts b/arch/powerpc/boot/dts/mpc8378_rdb.dts<br/>index 34a7f2f935e1..4a09153d160c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dts/mpc8378_rdb.dts?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/boot/dts/mpc8378_rdb.dts</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dts/mpc8378_rdb.dts?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dts/mpc8378_rdb.dts</a></div><div class='hunk'>@@ -155,24 +155,28 @@</div><div class='ctx'> 			dma-channel@0 {</div><div class='ctx'> 				compatible = "fsl,mpc8378-dma-channel", "fsl,elo-dma-channel";</div><div class='ctx'> 				reg = &lt;0 0x80&gt;;</div><div class='add'>+				cell-index = &lt;0&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='ctx'> 				interrupts = &lt;71 8&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 			dma-channel@80 {</div><div class='ctx'> 				compatible = "fsl,mpc8378-dma-channel", "fsl,elo-dma-channel";</div><div class='ctx'> 				reg = &lt;0x80 0x80&gt;;</div><div class='add'>+				cell-index = &lt;1&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='ctx'> 				interrupts = &lt;71 8&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 			dma-channel@100 {</div><div class='ctx'> 				compatible = "fsl,mpc8378-dma-channel", "fsl,elo-dma-channel";</div><div class='ctx'> 				reg = &lt;0x100 0x80&gt;;</div><div class='add'>+				cell-index = &lt;2&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='ctx'> 				interrupts = &lt;71 8&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 			dma-channel@180 {</div><div class='ctx'> 				compatible = "fsl,mpc8378-dma-channel", "fsl,elo-dma-channel";</div><div class='ctx'> 				reg = &lt;0x180 0x28&gt;;</div><div class='add'>+				cell-index = &lt;3&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='ctx'> 				interrupts = &lt;71 8&gt;;</div><div class='ctx'> 			};</div><div class='hunk'>@@ -301,7 +305,8 @@</div><div class='ctx'> 		#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;2&gt;;</div><div class='ctx'> 		#address-cells = &lt;3&gt;;</div><div class='del'>-		reg = &lt;0xe0008500 0x100&gt;;</div><div class='add'>+		reg = &lt;0xe0008500 0x100		/* internal registers */</div><div class='add'>+		       0xe0008300 0x8&gt;;		/* config space access registers */</div><div class='ctx'> 		compatible = "fsl,mpc8349-pci";</div><div class='ctx'> 		device_type = "pci";</div><div class='ctx'> 	};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/mpc8379_mds.dts b/arch/powerpc/boot/dts/mpc8379_mds.dts<br/>index f4db9ed4a301..323370a2b5ff 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dts/mpc8379_mds.dts?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/boot/dts/mpc8379_mds.dts</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dts/mpc8379_mds.dts?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dts/mpc8379_mds.dts</a></div><div class='hunk'>@@ -136,6 +136,13 @@</div><div class='ctx'> 			interrupts = &lt;14 0x8&gt;;</div><div class='ctx'> 			interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='ctx'> 			dfsrr;</div><div class='add'>+</div><div class='add'>+			rtc@68 {</div><div class='add'>+				compatible = "dallas,ds1374";</div><div class='add'>+				reg = &lt;0x68&gt;;</div><div class='add'>+				interrupts = &lt;19 0x8&gt;;</div><div class='add'>+				interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='add'>+			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		i2c@3100 {</div><div class='hunk'>@@ -170,24 +177,28 @@</div><div class='ctx'> 			dma-channel@0 {</div><div class='ctx'> 				compatible = "fsl,mpc8379-dma-channel", "fsl,elo-dma-channel";</div><div class='ctx'> 				reg = &lt;0 0x80&gt;;</div><div class='add'>+				cell-index = &lt;0&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='ctx'> 				interrupts = &lt;71 8&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 			dma-channel@80 {</div><div class='ctx'> 				compatible = "fsl,mpc8379-dma-channel", "fsl,elo-dma-channel";</div><div class='ctx'> 				reg = &lt;0x80 0x80&gt;;</div><div class='add'>+				cell-index = &lt;1&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='ctx'> 				interrupts = &lt;71 8&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 			dma-channel@100 {</div><div class='ctx'> 				compatible = "fsl,mpc8379-dma-channel", "fsl,elo-dma-channel";</div><div class='ctx'> 				reg = &lt;0x100 0x80&gt;;</div><div class='add'>+				cell-index = &lt;2&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='ctx'> 				interrupts = &lt;71 8&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 			dma-channel@180 {</div><div class='ctx'> 				compatible = "fsl,mpc8379-dma-channel", "fsl,elo-dma-channel";</div><div class='ctx'> 				reg = &lt;0x180 0x28&gt;;</div><div class='add'>+				cell-index = &lt;3&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='ctx'> 				interrupts = &lt;71 8&gt;;</div><div class='ctx'> 			};</div><div class='hunk'>@@ -388,7 +399,8 @@</div><div class='ctx'> 		#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;2&gt;;</div><div class='ctx'> 		#address-cells = &lt;3&gt;;</div><div class='del'>-		reg = &lt;0xe0008500 0x100&gt;;</div><div class='add'>+		reg = &lt;0xe0008500 0x100		/* internal registers */</div><div class='add'>+		       0xe0008300 0x8&gt;;		/* config space access registers */</div><div class='ctx'> 		compatible = "fsl,mpc8349-pci";</div><div class='ctx'> 		device_type = "pci";</div><div class='ctx'> 	};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/mpc8379_rdb.dts b/arch/powerpc/boot/dts/mpc8379_rdb.dts<br/>index e4d7030d50e5..bbd884ac9dc0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dts/mpc8379_rdb.dts?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/boot/dts/mpc8379_rdb.dts</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dts/mpc8379_rdb.dts?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dts/mpc8379_rdb.dts</a></div><div class='hunk'>@@ -155,24 +155,28 @@</div><div class='ctx'> 			dma-channel@0 {</div><div class='ctx'> 				compatible = "fsl,mpc8379-dma-channel", "fsl,elo-dma-channel";</div><div class='ctx'> 				reg = &lt;0 0x80&gt;;</div><div class='add'>+				cell-index = &lt;0&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='ctx'> 				interrupts = &lt;71 8&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 			dma-channel@80 {</div><div class='ctx'> 				compatible = "fsl,mpc8379-dma-channel", "fsl,elo-dma-channel";</div><div class='ctx'> 				reg = &lt;0x80 0x80&gt;;</div><div class='add'>+				cell-index = &lt;1&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='ctx'> 				interrupts = &lt;71 8&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 			dma-channel@100 {</div><div class='ctx'> 				compatible = "fsl,mpc8379-dma-channel", "fsl,elo-dma-channel";</div><div class='ctx'> 				reg = &lt;0x100 0x80&gt;;</div><div class='add'>+				cell-index = &lt;2&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='ctx'> 				interrupts = &lt;71 8&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 			dma-channel@180 {</div><div class='ctx'> 				compatible = "fsl,mpc8379-dma-channel", "fsl,elo-dma-channel";</div><div class='ctx'> 				reg = &lt;0x180 0x28&gt;;</div><div class='add'>+				cell-index = &lt;3&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='ctx'> 				interrupts = &lt;71 8&gt;;</div><div class='ctx'> 			};</div><div class='hunk'>@@ -329,7 +333,8 @@</div><div class='ctx'> 		#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;2&gt;;</div><div class='ctx'> 		#address-cells = &lt;3&gt;;</div><div class='del'>-		reg = &lt;0xe0008500 0x100&gt;;</div><div class='add'>+		reg = &lt;0xe0008500 0x100		/* internal registers */</div><div class='add'>+		       0xe0008300 0x8&gt;;		/* config space access registers */</div><div class='ctx'> 		compatible = "fsl,mpc8349-pci";</div><div class='ctx'> 		device_type = "pci";</div><div class='ctx'> 	};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/mpc8536ds.dts b/arch/powerpc/boot/dts/mpc8536ds.dts<br/>index 1505d6855eff..93fdd99901b6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dts/mpc8536ds.dts?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/boot/dts/mpc8536ds.dts</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dts/mpc8536ds.dts?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dts/mpc8536ds.dts</a></div><div class='hunk'>@@ -91,6 +91,8 @@</div><div class='ctx'> 			rtc@68 {</div><div class='ctx'> 				compatible = "dallas,ds3232";</div><div class='ctx'> 				reg = &lt;0x68&gt;;</div><div class='add'>+				interrupts = &lt;0 0x1&gt;;</div><div class='add'>+				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/boot/dts/mpc8610_hpcd.dts b/arch/powerpc/boot/dts/mpc8610_hpcd.dts<br/>index 584a4f184eb2..f724d72c7b92 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dts/mpc8610_hpcd.dts?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/boot/dts/mpc8610_hpcd.dts</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dts/mpc8610_hpcd.dts?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dts/mpc8610_hpcd.dts</a></div><div class='hunk'>@@ -207,7 +207,7 @@</div><div class='ctx'> 			reg = &lt;0xe4000 0x100&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		i2s@16000 {</div><div class='add'>+		ssi@16000 {</div><div class='ctx'> 			compatible = "fsl,mpc8610-ssi";</div><div class='ctx'> 			cell-index = &lt;0&gt;;</div><div class='ctx'> 			reg = &lt;0x16000 0x100&gt;;</div><div class='hunk'>@@ -215,6 +215,8 @@</div><div class='ctx'> 			interrupts = &lt;62 2&gt;;</div><div class='ctx'> 			fsl,mode = "i2s-slave";</div><div class='ctx'> 			codec-handle = &lt;&amp;cs4270&gt;;</div><div class='add'>+			fsl,playback-dma = &lt;&amp;dma00&gt;;</div><div class='add'>+			fsl,capture-dma = &lt;&amp;dma01&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		ssi@16100 {</div><div class='hunk'>@@ -233,17 +235,17 @@</div><div class='ctx'> 			reg = &lt;0x21300 0x4&gt;; /* DMA general status register */</div><div class='ctx'> 			ranges = &lt;0x0 0x21100 0x200&gt;;</div><div class='ctx'> </div><div class='del'>-			dma-channel@0 {</div><div class='add'>+			dma00: dma-channel@0 {</div><div class='ctx'> 				compatible = "fsl,mpc8610-dma-channel",</div><div class='del'>-					"fsl,eloplus-dma-channel";</div><div class='add'>+					"fsl,ssi-dma-channel";</div><div class='ctx'> 				cell-index = &lt;0&gt;;</div><div class='ctx'> 				reg = &lt;0x0 0x80&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='ctx'> 				interrupts = &lt;20 2&gt;;</div><div class='ctx'> 			};</div><div class='del'>-			dma-channel@1 {</div><div class='add'>+			dma01: dma-channel@1 {</div><div class='ctx'> 				compatible = "fsl,mpc8610-dma-channel",</div><div class='del'>-					"fsl,eloplus-dma-channel";</div><div class='add'>+					"fsl,ssi-dma-channel";</div><div class='ctx'> 				cell-index = &lt;1&gt;;</div><div class='ctx'> 				reg = &lt;0x80 0x80&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='head'>diff --git a/arch/powerpc/boot/dts/sbc8349.dts b/arch/powerpc/boot/dts/sbc8349.dts<br/>index 45f789b56709..0f941f310e44 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dts/sbc8349.dts?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/boot/dts/sbc8349.dts</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dts/sbc8349.dts?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dts/sbc8349.dts</a></div><div class='hunk'>@@ -107,24 +107,28 @@</div><div class='ctx'> 			dma-channel@0 {</div><div class='ctx'> 				compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";</div><div class='ctx'> 				reg = &lt;0 0x80&gt;;</div><div class='add'>+				cell-index = &lt;0&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='ctx'> 				interrupts = &lt;71 8&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 			dma-channel@80 {</div><div class='ctx'> 				compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";</div><div class='ctx'> 				reg = &lt;0x80 0x80&gt;;</div><div class='add'>+				cell-index = &lt;1&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='ctx'> 				interrupts = &lt;71 8&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 			dma-channel@100 {</div><div class='ctx'> 				compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";</div><div class='ctx'> 				reg = &lt;0x100 0x80&gt;;</div><div class='add'>+				cell-index = &lt;2&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='ctx'> 				interrupts = &lt;71 8&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 			dma-channel@180 {</div><div class='ctx'> 				compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";</div><div class='ctx'> 				reg = &lt;0x180 0x28&gt;;</div><div class='add'>+				cell-index = &lt;3&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='ctx'> 				interrupts = &lt;71 8&gt;;</div><div class='ctx'> 			};</div><div class='hunk'>@@ -268,7 +272,8 @@</div><div class='ctx'> 		#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;2&gt;;</div><div class='ctx'> 		#address-cells = &lt;3&gt;;</div><div class='del'>-		reg = &lt;0xe0008500 0x100&gt;;</div><div class='add'>+		reg = &lt;0xe0008500 0x100		/* internal registers */</div><div class='add'>+		       0xe0008300 0x8&gt;;		/* config space access registers */</div><div class='ctx'> 		compatible = "fsl,mpc8349-pci";</div><div class='ctx'> 		device_type = "pci";</div><div class='ctx'> 	};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/sequoia.dts b/arch/powerpc/boot/dts/sequoia.dts<br/>index 72d15f075d34..3b295e8df53f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dts/sequoia.dts?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/boot/dts/sequoia.dts</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dts/sequoia.dts?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dts/sequoia.dts</a></div><div class='hunk'>@@ -246,13 +246,22 @@</div><div class='ctx'> 	   		};</div><div class='ctx'> </div><div class='ctx'> 			IIC0: i2c@ef600700 {</div><div class='add'>+				#address-cells = &lt;1&gt;;</div><div class='add'>+				#size-cells = &lt;0&gt;;</div><div class='ctx'> 				compatible = "ibm,iic-440epx", "ibm,iic";</div><div class='ctx'> 				reg = &lt;0xef600700 0x00000014&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;UIC0&gt;;</div><div class='ctx'> 				interrupts = &lt;0x2 0x4&gt;;</div><div class='add'>+</div><div class='add'>+				hwmon@48 {</div><div class='add'>+					compatible = "adi,ad7414";</div><div class='add'>+					reg = &lt;0x48&gt;;</div><div class='add'>+				};</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			IIC1: i2c@ef600800 {</div><div class='add'>+				#address-cells = &lt;1&gt;;</div><div class='add'>+				#size-cells = &lt;0&gt;;</div><div class='ctx'> 				compatible = "ibm,iic-440epx", "ibm,iic";</div><div class='ctx'> 				reg = &lt;0xef600800 0x00000014&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;UIC0&gt;;</div><div class='head'>diff --git a/arch/powerpc/boot/dts/yosemite.dts b/arch/powerpc/boot/dts/yosemite.dts<br/>index e39422aa0d85..1fa3cb4c4ebb 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dts/yosemite.dts?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/boot/dts/yosemite.dts</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/dts/yosemite.dts?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/dts/yosemite.dts</a></div><div class='hunk'>@@ -15,7 +15,7 @@</div><div class='ctx'> 	#address-cells = &lt;2&gt;;</div><div class='ctx'> 	#size-cells = &lt;1&gt;;</div><div class='ctx'> 	model = "amcc,yosemite";</div><div class='del'>-	compatible = "amcc,yosemite","amcc,bamboo";</div><div class='add'>+	compatible = "amcc,yosemite";</div><div class='ctx'> 	dcr-parent = &lt;&amp;{/cpus/cpu@0}&gt;;</div><div class='ctx'> </div><div class='ctx'> 	aliases {</div><div class='head'>diff --git a/arch/powerpc/boot/elf_util.c b/arch/powerpc/boot/elf_util.c<br/>index 7454aa4cc20c..1567a0c0f05c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/elf_util.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/boot/elf_util.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/elf_util.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/elf_util.c</a></div><div class='hunk'>@@ -27,7 +27,8 @@ int parse_elf64(void *hdr, struct elf_info *info)</div><div class='ctx'> 	      elf64-&gt;e_ident[EI_MAG3]  == ELFMAG3	&amp;&amp;</div><div class='ctx'> 	      elf64-&gt;e_ident[EI_CLASS] == ELFCLASS64	&amp;&amp;</div><div class='ctx'> 	      elf64-&gt;e_ident[EI_DATA]  == ELFDATA2MSB	&amp;&amp;</div><div class='del'>-	      elf64-&gt;e_type            == ET_EXEC	&amp;&amp;</div><div class='add'>+	      (elf64-&gt;e_type            == ET_EXEC ||</div><div class='add'>+	       elf64-&gt;e_type            == ET_DYN)	&amp;&amp;</div><div class='ctx'> 	      elf64-&gt;e_machine         == EM_PPC64))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -58,7 +59,8 @@ int parse_elf32(void *hdr, struct elf_info *info)</div><div class='ctx'> 	      elf32-&gt;e_ident[EI_MAG3]  == ELFMAG3	&amp;&amp;</div><div class='ctx'> 	      elf32-&gt;e_ident[EI_CLASS] == ELFCLASS32	&amp;&amp;</div><div class='ctx'> 	      elf32-&gt;e_ident[EI_DATA]  == ELFDATA2MSB	&amp;&amp;</div><div class='del'>-	      elf32-&gt;e_type            == ET_EXEC	&amp;&amp;</div><div class='add'>+	      (elf32-&gt;e_type            == ET_EXEC ||</div><div class='add'>+	       elf32-&gt;e_type            == ET_DYN)      &amp;&amp;</div><div class='ctx'> 	      elf32-&gt;e_machine         == EM_PPC))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/boot/libfdt/Makefile.libfdt b/arch/powerpc/boot/libfdt/Makefile.libfdt<br/>index 82f9c6a8287b..6c42acfa21ec 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/libfdt/Makefile.libfdt?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/boot/libfdt/Makefile.libfdt</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/libfdt/Makefile.libfdt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/libfdt/Makefile.libfdt</a></div><div class='hunk'>@@ -3,12 +3,6 @@</div><div class='ctx'> # This is not a complete Makefile of itself.  Instead, it is designed to</div><div class='ctx'> # be easily embeddable into other systems of Makefiles.</div><div class='ctx'> #</div><div class='del'>-LIBFDT_SRCS = fdt.c fdt_ro.c fdt_wip.c fdt_sw.c fdt_rw.c fdt_strerror.c</div><div class='ctx'> LIBFDT_INCLUDES = fdt.h libfdt.h</div><div class='del'>-LIBFDT_EXTRA = libfdt_internal.h</div><div class='del'>-LIBFDT_LIB = libfdt/libfdt.a</div><div class='del'>-</div><div class='add'>+LIBFDT_SRCS = fdt.c fdt_ro.c fdt_wip.c fdt_sw.c fdt_rw.c fdt_strerror.c</div><div class='ctx'> LIBFDT_OBJS = $(LIBFDT_SRCS:%.c=%.o)</div><div class='del'>-</div><div class='del'>-$(LIBFDT_objdir)/$(LIBFDT_LIB): $(addprefix $(LIBFDT_objdir)/,$(LIBFDT_OBJS))</div><div class='del'>-</div><div class='head'>diff --git a/arch/powerpc/boot/libfdt/fdt.c b/arch/powerpc/boot/libfdt/fdt.c<br/>index 586a36136db2..2acaec5923ae 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/libfdt/fdt.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/boot/libfdt/fdt.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/libfdt/fdt.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/libfdt/fdt.c</a></div><div class='hunk'>@@ -63,7 +63,7 @@ int fdt_check_header(const void *fdt)</div><div class='ctx'> 			return -FDT_ERR_BADVERSION;</div><div class='ctx'> 		if (fdt_last_comp_version(fdt) &gt; FDT_LAST_SUPPORTED_VERSION)</div><div class='ctx'> 			return -FDT_ERR_BADVERSION;</div><div class='del'>-	} else if (fdt_magic(fdt) == SW_MAGIC) {</div><div class='add'>+	} else if (fdt_magic(fdt) == FDT_SW_MAGIC) {</div><div class='ctx'> 		/* Unfinished sequential-write blob */</div><div class='ctx'> 		if (fdt_size_dt_struct(fdt) == 0)</div><div class='ctx'> 			return -FDT_ERR_BADSTATE;</div><div class='hunk'>@@ -76,7 +76,7 @@ int fdt_check_header(const void *fdt)</div><div class='ctx'> </div><div class='ctx'> const void *fdt_offset_ptr(const void *fdt, int offset, int len)</div><div class='ctx'> {</div><div class='del'>-	const void *p;</div><div class='add'>+	const char *p;</div><div class='ctx'> </div><div class='ctx'> 	if (fdt_version(fdt) &gt;= 0x11)</div><div class='ctx'> 		if (((offset + len) &lt; offset)</div><div class='hunk'>@@ -124,11 +124,59 @@ uint32_t fdt_next_tag(const void *fdt, int offset, int *nextoffset)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (nextoffset)</div><div class='del'>-		*nextoffset = ALIGN(offset, FDT_TAGSIZE);</div><div class='add'>+		*nextoffset = FDT_TAGALIGN(offset);</div><div class='ctx'> </div><div class='ctx'> 	return tag;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int _fdt_check_node_offset(const void *fdt, int offset)</div><div class='add'>+{</div><div class='add'>+	if ((offset &lt; 0) || (offset % FDT_TAGSIZE)</div><div class='add'>+	    || (fdt_next_tag(fdt, offset, &amp;offset) != FDT_BEGIN_NODE))</div><div class='add'>+		return -FDT_ERR_BADOFFSET;</div><div class='add'>+</div><div class='add'>+	return offset;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int fdt_next_node(const void *fdt, int offset, int *depth)</div><div class='add'>+{</div><div class='add'>+	int nextoffset = 0;</div><div class='add'>+	uint32_t tag;</div><div class='add'>+</div><div class='add'>+	if (offset &gt;= 0)</div><div class='add'>+		if ((nextoffset = _fdt_check_node_offset(fdt, offset)) &lt; 0)</div><div class='add'>+			return nextoffset;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		offset = nextoffset;</div><div class='add'>+		tag = fdt_next_tag(fdt, offset, &amp;nextoffset);</div><div class='add'>+</div><div class='add'>+		switch (tag) {</div><div class='add'>+		case FDT_PROP:</div><div class='add'>+		case FDT_NOP:</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case FDT_BEGIN_NODE:</div><div class='add'>+			if (depth)</div><div class='add'>+				(*depth)++;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case FDT_END_NODE:</div><div class='add'>+			if (depth)</div><div class='add'>+				(*depth)--;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case FDT_END:</div><div class='add'>+			return -FDT_ERR_NOTFOUND;</div><div class='add'>+</div><div class='add'>+		default:</div><div class='add'>+			return -FDT_ERR_BADSTRUCTURE;</div><div class='add'>+		}</div><div class='add'>+	} while (tag != FDT_BEGIN_NODE);</div><div class='add'>+</div><div class='add'>+	return offset;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> const char *_fdt_find_string(const char *strtab, int tabsize, const char *s)</div><div class='ctx'> {</div><div class='ctx'> 	int len = strlen(s) + 1;</div><div class='hunk'>@@ -136,17 +184,14 @@ const char *_fdt_find_string(const char *strtab, int tabsize, const char *s)</div><div class='ctx'> 	const char *p;</div><div class='ctx'> </div><div class='ctx'> 	for (p = strtab; p &lt;= last; p++)</div><div class='del'>-		if (memeq(p, s, len))</div><div class='add'>+		if (memcmp(p, s, len) == 0)</div><div class='ctx'> 			return p;</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int fdt_move(const void *fdt, void *buf, int bufsize)</div><div class='ctx'> {</div><div class='del'>-	int err = fdt_check_header(fdt);</div><div class='del'>-</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='add'>+	FDT_CHECK_HEADER(fdt);</div><div class='ctx'> </div><div class='ctx'> 	if (fdt_totalsize(fdt) &gt; bufsize)</div><div class='ctx'> 		return -FDT_ERR_NOSPACE;</div><div class='head'>diff --git a/arch/powerpc/boot/libfdt/fdt_ro.c b/arch/powerpc/boot/libfdt/fdt_ro.c<br/>index 12a37d59f96e..129b532bcc1a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/libfdt/fdt_ro.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/boot/libfdt/fdt_ro.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/libfdt/fdt_ro.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/libfdt/fdt_ro.c</a></div><div class='hunk'>@@ -55,17 +55,10 @@</div><div class='ctx'> </div><div class='ctx'> #include "libfdt_internal.h"</div><div class='ctx'> </div><div class='del'>-#define CHECK_HEADER(fdt) \</div><div class='del'>-	{ \</div><div class='del'>-		int err; \</div><div class='del'>-		if ((err = fdt_check_header(fdt)) != 0) \</div><div class='del'>-			return err; \</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-static int nodename_eq(const void *fdt, int offset,</div><div class='del'>-		       const char *s, int len)</div><div class='add'>+static int _fdt_nodename_eq(const void *fdt, int offset,</div><div class='add'>+			    const char *s, int len)</div><div class='ctx'> {</div><div class='del'>-	const char *p = fdt_offset_ptr(fdt, offset, len+1);</div><div class='add'>+	const char *p = fdt_offset_ptr(fdt, offset + FDT_TAGSIZE, len+1);</div><div class='ctx'> </div><div class='ctx'> 	if (! p)</div><div class='ctx'> 		/* short match */</div><div class='hunk'>@@ -84,12 +77,12 @@ static int nodename_eq(const void *fdt, int offset,</div><div class='ctx'> </div><div class='ctx'> const char *fdt_string(const void *fdt, int stroffset)</div><div class='ctx'> {</div><div class='del'>-	return (char *)fdt + fdt_off_dt_strings(fdt) + stroffset;</div><div class='add'>+	return (const char *)fdt + fdt_off_dt_strings(fdt) + stroffset;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int fdt_get_mem_rsv(const void *fdt, int n, uint64_t *address, uint64_t *size)</div><div class='ctx'> {</div><div class='del'>-	CHECK_HEADER(fdt);</div><div class='add'>+	FDT_CHECK_HEADER(fdt);</div><div class='ctx'> 	*address = fdt64_to_cpu(_fdt_mem_rsv(fdt, n)-&gt;address);</div><div class='ctx'> 	*size = fdt64_to_cpu(_fdt_mem_rsv(fdt, n)-&gt;size);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -104,50 +97,24 @@ int fdt_num_mem_rsv(const void *fdt)</div><div class='ctx'> 	return i;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int fdt_subnode_offset_namelen(const void *fdt, int parentoffset,</div><div class='add'>+int fdt_subnode_offset_namelen(const void *fdt, int offset,</div><div class='ctx'> 			       const char *name, int namelen)</div><div class='ctx'> {</div><div class='del'>-	int level = 0;</div><div class='del'>-	uint32_t tag;</div><div class='del'>-	int offset, nextoffset;</div><div class='del'>-</div><div class='del'>-	CHECK_HEADER(fdt);</div><div class='del'>-</div><div class='del'>-	tag = fdt_next_tag(fdt, parentoffset, &amp;nextoffset);</div><div class='del'>-	if (tag != FDT_BEGIN_NODE)</div><div class='del'>-		return -FDT_ERR_BADOFFSET;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		offset = nextoffset;</div><div class='del'>-		tag = fdt_next_tag(fdt, offset, &amp;nextoffset);</div><div class='del'>-</div><div class='del'>-		switch (tag) {</div><div class='del'>-		case FDT_END:</div><div class='del'>-			return -FDT_ERR_TRUNCATED;</div><div class='del'>-</div><div class='del'>-		case FDT_BEGIN_NODE:</div><div class='del'>-			level++;</div><div class='del'>-			if (level != 1)</div><div class='del'>-				continue;</div><div class='del'>-			if (nodename_eq(fdt, offset+FDT_TAGSIZE, name, namelen))</div><div class='del'>-				/* Found it! */</div><div class='del'>-				return offset;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case FDT_END_NODE:</div><div class='del'>-			level--;</div><div class='del'>-			break;</div><div class='add'>+	int depth;</div><div class='ctx'> </div><div class='del'>-		case FDT_PROP:</div><div class='del'>-		case FDT_NOP:</div><div class='del'>-			break;</div><div class='add'>+	FDT_CHECK_HEADER(fdt);</div><div class='ctx'> </div><div class='del'>-		default:</div><div class='del'>-			return -FDT_ERR_BADSTRUCTURE;</div><div class='del'>-		}</div><div class='del'>-	} while (level &gt;= 0);</div><div class='add'>+	for (depth = 0;</div><div class='add'>+	     offset &gt;= 0;</div><div class='add'>+	     offset = fdt_next_node(fdt, offset, &amp;depth)) {</div><div class='add'>+		if (depth &lt; 0)</div><div class='add'>+			return -FDT_ERR_NOTFOUND;</div><div class='add'>+		else if ((depth == 1)</div><div class='add'>+			 &amp;&amp; _fdt_nodename_eq(fdt, offset, name, namelen))</div><div class='add'>+			return offset;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return -FDT_ERR_NOTFOUND;</div><div class='add'>+	return offset; /* error */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int fdt_subnode_offset(const void *fdt, int parentoffset,</div><div class='hunk'>@@ -162,7 +129,7 @@ int fdt_path_offset(const void *fdt, const char *path)</div><div class='ctx'> 	const char *p = path;</div><div class='ctx'> 	int offset = 0;</div><div class='ctx'> </div><div class='del'>-	CHECK_HEADER(fdt);</div><div class='add'>+	FDT_CHECK_HEADER(fdt);</div><div class='ctx'> </div><div class='ctx'> 	if (*path != '/')</div><div class='ctx'> 		return -FDT_ERR_BADPATH;</div><div class='hunk'>@@ -190,16 +157,12 @@ int fdt_path_offset(const void *fdt, const char *path)</div><div class='ctx'> </div><div class='ctx'> const char *fdt_get_name(const void *fdt, int nodeoffset, int *len)</div><div class='ctx'> {</div><div class='del'>-	const struct fdt_node_header *nh;</div><div class='add'>+	const struct fdt_node_header *nh = _fdt_offset_ptr(fdt, nodeoffset);</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if ((err = fdt_check_header(fdt)) != 0)</div><div class='del'>-		goto fail;</div><div class='del'>-</div><div class='del'>-	err = -FDT_ERR_BADOFFSET;</div><div class='del'>-	nh = fdt_offset_ptr(fdt, nodeoffset, sizeof(*nh));</div><div class='del'>-	if (!nh || (fdt32_to_cpu(nh-&gt;tag) != FDT_BEGIN_NODE))</div><div class='del'>-		goto fail;</div><div class='add'>+	if (((err = fdt_check_header(fdt)) != 0)</div><div class='add'>+	    || ((err = _fdt_check_node_offset(fdt, nodeoffset)) &lt; 0))</div><div class='add'>+			goto fail;</div><div class='ctx'> </div><div class='ctx'> 	if (len)</div><div class='ctx'> 		*len = strlen(nh-&gt;name);</div><div class='hunk'>@@ -222,17 +185,11 @@ const struct fdt_property *fdt_get_property(const void *fdt,</div><div class='ctx'> 	int offset, nextoffset;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if ((err = fdt_check_header(fdt)) != 0)</div><div class='del'>-		goto fail;</div><div class='del'>-</div><div class='del'>-	err = -FDT_ERR_BADOFFSET;</div><div class='del'>-	if (nodeoffset % FDT_TAGSIZE)</div><div class='del'>-		goto fail;</div><div class='del'>-</div><div class='del'>-	tag = fdt_next_tag(fdt, nodeoffset, &amp;nextoffset);</div><div class='del'>-	if (tag != FDT_BEGIN_NODE)</div><div class='del'>-		goto fail;</div><div class='add'>+	if (((err = fdt_check_header(fdt)) != 0)</div><div class='add'>+	    || ((err = _fdt_check_node_offset(fdt, nodeoffset)) &lt; 0))</div><div class='add'>+			goto fail;</div><div class='ctx'> </div><div class='add'>+	nextoffset = err;</div><div class='ctx'> 	do {</div><div class='ctx'> 		offset = nextoffset;</div><div class='ctx'> </div><div class='hunk'>@@ -253,7 +210,7 @@ const struct fdt_property *fdt_get_property(const void *fdt,</div><div class='ctx'> 			if (! prop)</div><div class='ctx'> 				goto fail;</div><div class='ctx'> 			namestroff = fdt32_to_cpu(prop-&gt;nameoff);</div><div class='del'>-			if (streq(fdt_string(fdt, namestroff), name)) {</div><div class='add'>+			if (strcmp(fdt_string(fdt, namestroff), name) == 0) {</div><div class='ctx'> 				/* Found it! */</div><div class='ctx'> 				int len = fdt32_to_cpu(prop-&gt;len);</div><div class='ctx'> 				prop = fdt_offset_ptr(fdt, offset,</div><div class='hunk'>@@ -307,115 +264,91 @@ uint32_t fdt_get_phandle(const void *fdt, int nodeoffset)</div><div class='ctx'> </div><div class='ctx'> int fdt_get_path(const void *fdt, int nodeoffset, char *buf, int buflen)</div><div class='ctx'> {</div><div class='del'>-	uint32_t tag;</div><div class='del'>-	int p = 0, overflow = 0;</div><div class='del'>-	int offset, nextoffset, namelen;</div><div class='add'>+	int pdepth = 0, p = 0;</div><div class='add'>+	int offset, depth, namelen;</div><div class='ctx'> 	const char *name;</div><div class='ctx'> </div><div class='del'>-	CHECK_HEADER(fdt);</div><div class='del'>-</div><div class='del'>-	tag = fdt_next_tag(fdt, 0, &amp;nextoffset);</div><div class='del'>-	if (tag != FDT_BEGIN_NODE)</div><div class='del'>-		return -FDT_ERR_BADSTRUCTURE;</div><div class='add'>+	FDT_CHECK_HEADER(fdt);</div><div class='ctx'> </div><div class='ctx'> 	if (buflen &lt; 2)</div><div class='ctx'> 		return -FDT_ERR_NOSPACE;</div><div class='del'>-	buf[0] = '/';</div><div class='del'>-	p = 1;</div><div class='ctx'> </div><div class='del'>-	while (nextoffset &lt;= nodeoffset) {</div><div class='del'>-		offset = nextoffset;</div><div class='del'>-		tag = fdt_next_tag(fdt, offset, &amp;nextoffset);</div><div class='del'>-		switch (tag) {</div><div class='del'>-		case FDT_END:</div><div class='del'>-			return -FDT_ERR_BADOFFSET;</div><div class='add'>+	for (offset = 0, depth = 0;</div><div class='add'>+	     (offset &gt;= 0) &amp;&amp; (offset &lt;= nodeoffset);</div><div class='add'>+	     offset = fdt_next_node(fdt, offset, &amp;depth)) {</div><div class='add'>+		if (pdepth &lt; depth)</div><div class='add'>+			continue; /* overflowed buffer */</div><div class='ctx'> </div><div class='del'>-		case FDT_BEGIN_NODE:</div><div class='del'>-			name = fdt_get_name(fdt, offset, &amp;namelen);</div><div class='del'>-			if (!name)</div><div class='del'>-				return namelen;</div><div class='del'>-			if (overflow || ((p + namelen + 1) &gt; buflen)) {</div><div class='del'>-				overflow++;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='add'>+		while (pdepth &gt; depth) {</div><div class='add'>+			do {</div><div class='add'>+				p--;</div><div class='add'>+			} while (buf[p-1] != '/');</div><div class='add'>+			pdepth--;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		name = fdt_get_name(fdt, offset, &amp;namelen);</div><div class='add'>+		if (!name)</div><div class='add'>+			return namelen;</div><div class='add'>+		if ((p + namelen + 1) &lt;= buflen) {</div><div class='ctx'> 			memcpy(buf + p, name, namelen);</div><div class='ctx'> 			p += namelen;</div><div class='ctx'> 			buf[p++] = '/';</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case FDT_END_NODE:</div><div class='del'>-			if (overflow) {</div><div class='del'>-				overflow--;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			do {</div><div class='del'>-				p--;</div><div class='del'>-			} while  (buf[p-1] != '/');</div><div class='del'>-			break;</div><div class='add'>+			pdepth++;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		case FDT_PROP:</div><div class='del'>-		case FDT_NOP:</div><div class='del'>-			break;</div><div class='add'>+		if (offset == nodeoffset) {</div><div class='add'>+			if (pdepth &lt; (depth + 1))</div><div class='add'>+				return -FDT_ERR_NOSPACE;</div><div class='ctx'> </div><div class='del'>-		default:</div><div class='del'>-			return -FDT_ERR_BADSTRUCTURE;</div><div class='add'>+			if (p &gt; 1) /* special case so that root path is "/", not "" */</div><div class='add'>+				p--;</div><div class='add'>+			buf[p] = '\0';</div><div class='add'>+			return p;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (overflow)</div><div class='del'>-		return -FDT_ERR_NOSPACE;</div><div class='add'>+	if ((offset == -FDT_ERR_NOTFOUND) || (offset &gt;= 0))</div><div class='add'>+		return -FDT_ERR_BADOFFSET;</div><div class='add'>+	else if (offset == -FDT_ERR_BADOFFSET)</div><div class='add'>+		return -FDT_ERR_BADSTRUCTURE;</div><div class='ctx'> </div><div class='del'>-	if (p &gt; 1) /* special case so that root path is "/", not "" */</div><div class='del'>-		p--;</div><div class='del'>-	buf[p] = '\0';</div><div class='del'>-	return p;</div><div class='add'>+	return offset; /* error from fdt_next_node() */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int fdt_supernode_atdepth_offset(const void *fdt, int nodeoffset,</div><div class='ctx'> 				 int supernodedepth, int *nodedepth)</div><div class='ctx'> {</div><div class='del'>-	int level = -1;</div><div class='del'>-	uint32_t tag;</div><div class='del'>-	int offset, nextoffset = 0;</div><div class='add'>+	int offset, depth;</div><div class='ctx'> 	int supernodeoffset = -FDT_ERR_INTERNAL;</div><div class='ctx'> </div><div class='del'>-	CHECK_HEADER(fdt);</div><div class='add'>+	FDT_CHECK_HEADER(fdt);</div><div class='ctx'> </div><div class='ctx'> 	if (supernodedepth &lt; 0)</div><div class='ctx'> 		return -FDT_ERR_NOTFOUND;</div><div class='ctx'> </div><div class='del'>-	do {</div><div class='del'>-		offset = nextoffset;</div><div class='del'>-		tag = fdt_next_tag(fdt, offset, &amp;nextoffset);</div><div class='del'>-		switch (tag) {</div><div class='del'>-		case FDT_END:</div><div class='del'>-			return -FDT_ERR_BADOFFSET;</div><div class='del'>-</div><div class='del'>-		case FDT_BEGIN_NODE:</div><div class='del'>-			level++;</div><div class='del'>-			if (level == supernodedepth)</div><div class='del'>-				supernodeoffset = offset;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case FDT_END_NODE:</div><div class='del'>-			level--;</div><div class='del'>-			break;</div><div class='add'>+	for (offset = 0, depth = 0;</div><div class='add'>+	     (offset &gt;= 0) &amp;&amp; (offset &lt;= nodeoffset);</div><div class='add'>+	     offset = fdt_next_node(fdt, offset, &amp;depth)) {</div><div class='add'>+		if (depth == supernodedepth)</div><div class='add'>+			supernodeoffset = offset;</div><div class='ctx'> </div><div class='del'>-		case FDT_PROP:</div><div class='del'>-		case FDT_NOP:</div><div class='del'>-			break;</div><div class='add'>+		if (offset == nodeoffset) {</div><div class='add'>+			if (nodedepth)</div><div class='add'>+				*nodedepth = depth;</div><div class='ctx'> </div><div class='del'>-		default:</div><div class='del'>-			return -FDT_ERR_BADSTRUCTURE;</div><div class='add'>+			if (supernodedepth &gt; depth)</div><div class='add'>+				return -FDT_ERR_NOTFOUND;</div><div class='add'>+			else</div><div class='add'>+				return supernodeoffset;</div><div class='ctx'> 		}</div><div class='del'>-	} while (offset &lt; nodeoffset);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (nodedepth)</div><div class='del'>-		*nodedepth = level;</div><div class='add'>+	if ((offset == -FDT_ERR_NOTFOUND) || (offset &gt;= 0))</div><div class='add'>+		return -FDT_ERR_BADOFFSET;</div><div class='add'>+	else if (offset == -FDT_ERR_BADOFFSET)</div><div class='add'>+		return -FDT_ERR_BADSTRUCTURE;</div><div class='ctx'> </div><div class='del'>-	if (supernodedepth &gt; level)</div><div class='del'>-		return -FDT_ERR_NOTFOUND;</div><div class='del'>-	return supernodeoffset;</div><div class='add'>+	return offset; /* error from fdt_next_node() */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int fdt_node_depth(const void *fdt, int nodeoffset)</div><div class='hunk'>@@ -443,51 +376,27 @@ int fdt_node_offset_by_prop_value(const void *fdt, int startoffset,</div><div class='ctx'> 				  const char *propname,</div><div class='ctx'> 				  const void *propval, int proplen)</div><div class='ctx'> {</div><div class='del'>-	uint32_t tag;</div><div class='del'>-	int offset, nextoffset;</div><div class='add'>+	int offset;</div><div class='ctx'> 	const void *val;</div><div class='ctx'> 	int len;</div><div class='ctx'> </div><div class='del'>-	CHECK_HEADER(fdt);</div><div class='del'>-</div><div class='del'>-	if (startoffset &gt;= 0) {</div><div class='del'>-		tag = fdt_next_tag(fdt, startoffset, &amp;nextoffset);</div><div class='del'>-		if (tag != FDT_BEGIN_NODE)</div><div class='del'>-			return -FDT_ERR_BADOFFSET;</div><div class='del'>-	} else {</div><div class='del'>-		nextoffset = 0;</div><div class='del'>-	}</div><div class='add'>+	FDT_CHECK_HEADER(fdt);</div><div class='ctx'> </div><div class='ctx'> 	/* FIXME: The algorithm here is pretty horrible: we scan each</div><div class='ctx'> 	 * property of a node in fdt_getprop(), then if that didn't</div><div class='ctx'> 	 * find what we want, we scan over them again making our way</div><div class='ctx'> 	 * to the next node.  Still it's the easiest to implement</div><div class='ctx'> 	 * approach; performance can come later. */</div><div class='del'>-	do {</div><div class='del'>-		offset = nextoffset;</div><div class='del'>-		tag = fdt_next_tag(fdt, offset, &amp;nextoffset);</div><div class='del'>-</div><div class='del'>-		switch (tag) {</div><div class='del'>-		case FDT_BEGIN_NODE:</div><div class='del'>-			val = fdt_getprop(fdt, offset, propname, &amp;len);</div><div class='del'>-			if (val</div><div class='del'>-			    &amp;&amp; (len == proplen)</div><div class='del'>-			    &amp;&amp; (memcmp(val, propval, len) == 0))</div><div class='del'>-				return offset;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case FDT_PROP:</div><div class='del'>-		case FDT_END:</div><div class='del'>-		case FDT_END_NODE:</div><div class='del'>-		case FDT_NOP:</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		default:</div><div class='del'>-			return -FDT_ERR_BADSTRUCTURE;</div><div class='del'>-		}</div><div class='del'>-	} while (tag != FDT_END);</div><div class='add'>+	for (offset = fdt_next_node(fdt, startoffset, NULL);</div><div class='add'>+	     offset &gt;= 0;</div><div class='add'>+	     offset = fdt_next_node(fdt, offset, NULL)) {</div><div class='add'>+		val = fdt_getprop(fdt, offset, propname, &amp;len);</div><div class='add'>+		if (val &amp;&amp; (len == proplen)</div><div class='add'>+		    &amp;&amp; (memcmp(val, propval, len) == 0))</div><div class='add'>+			return offset;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return -FDT_ERR_NOTFOUND;</div><div class='add'>+	return offset; /* error from fdt_next_node() */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int fdt_node_offset_by_phandle(const void *fdt, uint32_t phandle)</div><div class='hunk'>@@ -499,10 +408,10 @@ int fdt_node_offset_by_phandle(const void *fdt, uint32_t phandle)</div><div class='ctx'> 					     &amp;phandle, sizeof(phandle));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int _stringlist_contains(const void *strlist, int listlen, const char *str)</div><div class='add'>+int _stringlist_contains(const char *strlist, int listlen, const char *str)</div><div class='ctx'> {</div><div class='ctx'> 	int len = strlen(str);</div><div class='del'>-	const void *p;</div><div class='add'>+	const char *p;</div><div class='ctx'> </div><div class='ctx'> 	while (listlen &gt;= len) {</div><div class='ctx'> 		if (memcmp(str, strlist, len+1) == 0)</div><div class='hunk'>@@ -534,50 +443,24 @@ int fdt_node_check_compatible(const void *fdt, int nodeoffset,</div><div class='ctx'> int fdt_node_offset_by_compatible(const void *fdt, int startoffset,</div><div class='ctx'> 				  const char *compatible)</div><div class='ctx'> {</div><div class='del'>-	uint32_t tag;</div><div class='del'>-	int offset, nextoffset;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	CHECK_HEADER(fdt);</div><div class='add'>+	int offset, err;</div><div class='ctx'> </div><div class='del'>-	if (startoffset &gt;= 0) {</div><div class='del'>-		tag = fdt_next_tag(fdt, startoffset, &amp;nextoffset);</div><div class='del'>-		if (tag != FDT_BEGIN_NODE)</div><div class='del'>-			return -FDT_ERR_BADOFFSET;</div><div class='del'>-	} else {</div><div class='del'>-		nextoffset = 0;</div><div class='del'>-	}</div><div class='add'>+	FDT_CHECK_HEADER(fdt);</div><div class='ctx'> </div><div class='ctx'> 	/* FIXME: The algorithm here is pretty horrible: we scan each</div><div class='ctx'> 	 * property of a node in fdt_node_check_compatible(), then if</div><div class='ctx'> 	 * that didn't find what we want, we scan over them again</div><div class='ctx'> 	 * making our way to the next node.  Still it's the easiest to</div><div class='ctx'> 	 * implement approach; performance can come later. */</div><div class='del'>-	do {</div><div class='del'>-		offset = nextoffset;</div><div class='del'>-		tag = fdt_next_tag(fdt, offset, &amp;nextoffset);</div><div class='del'>-</div><div class='del'>-		switch (tag) {</div><div class='del'>-		case FDT_BEGIN_NODE:</div><div class='del'>-			err = fdt_node_check_compatible(fdt, offset,</div><div class='del'>-							compatible);</div><div class='del'>-			if ((err &lt; 0)</div><div class='del'>-			    &amp;&amp; (err != -FDT_ERR_NOTFOUND))</div><div class='del'>-				return err;</div><div class='del'>-			else if (err == 0)</div><div class='del'>-				return offset;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case FDT_PROP:</div><div class='del'>-		case FDT_END:</div><div class='del'>-		case FDT_END_NODE:</div><div class='del'>-		case FDT_NOP:</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		default:</div><div class='del'>-			return -FDT_ERR_BADSTRUCTURE;</div><div class='del'>-		}</div><div class='del'>-	} while (tag != FDT_END);</div><div class='add'>+	for (offset = fdt_next_node(fdt, startoffset, NULL);</div><div class='add'>+	     offset &gt;= 0;</div><div class='add'>+	     offset = fdt_next_node(fdt, offset, NULL)) {</div><div class='add'>+		err = fdt_node_check_compatible(fdt, offset, compatible);</div><div class='add'>+		if ((err &lt; 0) &amp;&amp; (err != -FDT_ERR_NOTFOUND))</div><div class='add'>+			return err;</div><div class='add'>+		else if (err == 0)</div><div class='add'>+			return offset;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return -FDT_ERR_NOTFOUND;</div><div class='add'>+	return offset; /* error from fdt_next_node() */</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/boot/libfdt/fdt_rw.c b/arch/powerpc/boot/libfdt/fdt_rw.c<br/>index 6673f8ec962a..8e7ec4cb7bcd 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/libfdt/fdt_rw.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/boot/libfdt/fdt_rw.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/libfdt/fdt_rw.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/libfdt/fdt_rw.c</a></div><div class='hunk'>@@ -55,10 +55,10 @@</div><div class='ctx'> </div><div class='ctx'> #include "libfdt_internal.h"</div><div class='ctx'> </div><div class='del'>-static int _blocks_misordered(const void *fdt,</div><div class='add'>+static int _fdt_blocks_misordered(const void *fdt,</div><div class='ctx'> 			      int mem_rsv_size, int struct_size)</div><div class='ctx'> {</div><div class='del'>-	return (fdt_off_mem_rsvmap(fdt) &lt; ALIGN(sizeof(struct fdt_header), 8))</div><div class='add'>+	return (fdt_off_mem_rsvmap(fdt) &lt; FDT_ALIGN(sizeof(struct fdt_header), 8))</div><div class='ctx'> 		|| (fdt_off_dt_struct(fdt) &lt;</div><div class='ctx'> 		    (fdt_off_mem_rsvmap(fdt) + mem_rsv_size))</div><div class='ctx'> 		|| (fdt_off_dt_strings(fdt) &lt;</div><div class='hunk'>@@ -67,16 +67,14 @@ static int _blocks_misordered(const void *fdt,</div><div class='ctx'> 		    (fdt_off_dt_strings(fdt) + fdt_size_dt_strings(fdt)));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int rw_check_header(void *fdt)</div><div class='add'>+static int _fdt_rw_check_header(void *fdt)</div><div class='ctx'> {</div><div class='del'>-	int err;</div><div class='add'>+	FDT_CHECK_HEADER(fdt);</div><div class='ctx'> </div><div class='del'>-	if ((err = fdt_check_header(fdt)))</div><div class='del'>-		return err;</div><div class='ctx'> 	if (fdt_version(fdt) &lt; 17)</div><div class='ctx'> 		return -FDT_ERR_BADVERSION;</div><div class='del'>-	if (_blocks_misordered(fdt, sizeof(struct fdt_reserve_entry),</div><div class='del'>-			       fdt_size_dt_struct(fdt)))</div><div class='add'>+	if (_fdt_blocks_misordered(fdt, sizeof(struct fdt_reserve_entry),</div><div class='add'>+				   fdt_size_dt_struct(fdt)))</div><div class='ctx'> 		return -FDT_ERR_BADLAYOUT;</div><div class='ctx'> 	if (fdt_version(fdt) &gt; 17)</div><div class='ctx'> 		fdt_set_version(fdt, 17);</div><div class='hunk'>@@ -84,36 +82,37 @@ static int rw_check_header(void *fdt)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define RW_CHECK_HEADER(fdt) \</div><div class='add'>+#define FDT_RW_CHECK_HEADER(fdt) \</div><div class='ctx'> 	{ \</div><div class='ctx'> 		int err; \</div><div class='del'>-		if ((err = rw_check_header(fdt)) != 0) \</div><div class='add'>+		if ((err = _fdt_rw_check_header(fdt)) != 0) \</div><div class='ctx'> 			return err; \</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-static inline int _blob_data_size(void *fdt)</div><div class='add'>+static inline int _fdt_data_size(void *fdt)</div><div class='ctx'> {</div><div class='ctx'> 	return fdt_off_dt_strings(fdt) + fdt_size_dt_strings(fdt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int _blob_splice(void *fdt, void *p, int oldlen, int newlen)</div><div class='add'>+static int _fdt_splice(void *fdt, void *splicepoint, int oldlen, int newlen)</div><div class='ctx'> {</div><div class='del'>-	void *end = fdt + _blob_data_size(fdt);</div><div class='add'>+	char *p = splicepoint;</div><div class='add'>+	char *end = (char *)fdt + _fdt_data_size(fdt);</div><div class='ctx'> </div><div class='ctx'> 	if (((p + oldlen) &lt; p) || ((p + oldlen) &gt; end))</div><div class='ctx'> 		return -FDT_ERR_BADOFFSET;</div><div class='del'>-	if ((end - oldlen + newlen) &gt; (fdt + fdt_totalsize(fdt)))</div><div class='add'>+	if ((end - oldlen + newlen) &gt; ((char *)fdt + fdt_totalsize(fdt)))</div><div class='ctx'> 		return -FDT_ERR_NOSPACE;</div><div class='ctx'> 	memmove(p + newlen, p + oldlen, end - p - oldlen);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int _blob_splice_mem_rsv(void *fdt, struct fdt_reserve_entry *p,</div><div class='del'>-				int oldn, int newn)</div><div class='add'>+static int _fdt_splice_mem_rsv(void *fdt, struct fdt_reserve_entry *p,</div><div class='add'>+			       int oldn, int newn)</div><div class='ctx'> {</div><div class='ctx'> 	int delta = (newn - oldn) * sizeof(*p);</div><div class='ctx'> 	int err;</div><div class='del'>-	err = _blob_splice(fdt, p, oldn * sizeof(*p), newn * sizeof(*p));</div><div class='add'>+	err = _fdt_splice(fdt, p, oldn * sizeof(*p), newn * sizeof(*p));</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	fdt_set_off_dt_struct(fdt, fdt_off_dt_struct(fdt) + delta);</div><div class='hunk'>@@ -121,13 +120,13 @@ static int _blob_splice_mem_rsv(void *fdt, struct fdt_reserve_entry *p,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int _blob_splice_struct(void *fdt, void *p,</div><div class='del'>-			       int oldlen, int newlen)</div><div class='add'>+static int _fdt_splice_struct(void *fdt, void *p,</div><div class='add'>+			      int oldlen, int newlen)</div><div class='ctx'> {</div><div class='ctx'> 	int delta = newlen - oldlen;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if ((err = _blob_splice(fdt, p, oldlen, newlen)))</div><div class='add'>+	if ((err = _fdt_splice(fdt, p, oldlen, newlen)))</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	fdt_set_size_dt_struct(fdt, fdt_size_dt_struct(fdt) + delta);</div><div class='hunk'>@@ -135,19 +134,20 @@ static int _blob_splice_struct(void *fdt, void *p,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int _blob_splice_string(void *fdt, int newlen)</div><div class='add'>+static int _fdt_splice_string(void *fdt, int newlen)</div><div class='ctx'> {</div><div class='del'>-	void *p = fdt + fdt_off_dt_strings(fdt) + fdt_size_dt_strings(fdt);</div><div class='add'>+	void *p = (char *)fdt</div><div class='add'>+		+ fdt_off_dt_strings(fdt) + fdt_size_dt_strings(fdt);</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if ((err = _blob_splice(fdt, p, 0, newlen)))</div><div class='add'>+	if ((err = _fdt_splice(fdt, p, 0, newlen)))</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	fdt_set_size_dt_strings(fdt, fdt_size_dt_strings(fdt) + newlen);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int _find_add_string(void *fdt, const char *s)</div><div class='add'>+static int _fdt_find_add_string(void *fdt, const char *s)</div><div class='ctx'> {</div><div class='ctx'> 	char *strtab = (char *)fdt + fdt_off_dt_strings(fdt);</div><div class='ctx'> 	const char *p;</div><div class='hunk'>@@ -161,7 +161,7 @@ static int _find_add_string(void *fdt, const char *s)</div><div class='ctx'> 		return (p - strtab);</div><div class='ctx'> </div><div class='ctx'> 	new = strtab + fdt_size_dt_strings(fdt);</div><div class='del'>-	err = _blob_splice_string(fdt, len);</div><div class='add'>+	err = _fdt_splice_string(fdt, len);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -174,11 +174,10 @@ int fdt_add_mem_rsv(void *fdt, uint64_t address, uint64_t size)</div><div class='ctx'> 	struct fdt_reserve_entry *re;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if ((err = rw_check_header(fdt)))</div><div class='del'>-		return err;</div><div class='add'>+	FDT_RW_CHECK_HEADER(fdt);</div><div class='ctx'> </div><div class='ctx'> 	re = _fdt_mem_rsv_w(fdt, fdt_num_mem_rsv(fdt));</div><div class='del'>-	err = _blob_splice_mem_rsv(fdt, re, 0, 1);</div><div class='add'>+	err = _fdt_splice_mem_rsv(fdt, re, 0, 1);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -192,19 +191,19 @@ int fdt_del_mem_rsv(void *fdt, int n)</div><div class='ctx'> 	struct fdt_reserve_entry *re = _fdt_mem_rsv_w(fdt, n);</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if ((err = rw_check_header(fdt)))</div><div class='del'>-		return err;</div><div class='add'>+	FDT_RW_CHECK_HEADER(fdt);</div><div class='add'>+</div><div class='ctx'> 	if (n &gt;= fdt_num_mem_rsv(fdt))</div><div class='ctx'> 		return -FDT_ERR_NOTFOUND;</div><div class='ctx'> </div><div class='del'>-	err = _blob_splice_mem_rsv(fdt, re, 1, 0);</div><div class='add'>+	err = _fdt_splice_mem_rsv(fdt, re, 1, 0);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int _resize_property(void *fdt, int nodeoffset, const char *name, int len,</div><div class='del'>-			    struct fdt_property **prop)</div><div class='add'>+static int _fdt_resize_property(void *fdt, int nodeoffset, const char *name,</div><div class='add'>+				int len, struct fdt_property **prop)</div><div class='ctx'> {</div><div class='ctx'> 	int oldlen;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -213,36 +212,33 @@ static int _resize_property(void *fdt, int nodeoffset, const char *name, int len</div><div class='ctx'> 	if (! (*prop))</div><div class='ctx'> 		return oldlen;</div><div class='ctx'> </div><div class='del'>-	if ((err = _blob_splice_struct(fdt, (*prop)-&gt;data,</div><div class='del'>-				       ALIGN(oldlen, FDT_TAGSIZE),</div><div class='del'>-				       ALIGN(len, FDT_TAGSIZE))))</div><div class='add'>+	if ((err = _fdt_splice_struct(fdt, (*prop)-&gt;data, FDT_TAGALIGN(oldlen),</div><div class='add'>+				      FDT_TAGALIGN(len))))</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	(*prop)-&gt;len = cpu_to_fdt32(len);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int _add_property(void *fdt, int nodeoffset, const char *name, int len,</div><div class='del'>-			 struct fdt_property **prop)</div><div class='add'>+static int _fdt_add_property(void *fdt, int nodeoffset, const char *name,</div><div class='add'>+			     int len, struct fdt_property **prop)</div><div class='ctx'> {</div><div class='del'>-	uint32_t tag;</div><div class='ctx'> 	int proplen;</div><div class='ctx'> 	int nextoffset;</div><div class='ctx'> 	int namestroff;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	tag = fdt_next_tag(fdt, nodeoffset, &amp;nextoffset);</div><div class='del'>-	if (tag != FDT_BEGIN_NODE)</div><div class='del'>-		return -FDT_ERR_BADOFFSET;</div><div class='add'>+	if ((nextoffset = _fdt_check_node_offset(fdt, nodeoffset)) &lt; 0)</div><div class='add'>+		return nextoffset;</div><div class='ctx'> </div><div class='del'>-	namestroff = _find_add_string(fdt, name);</div><div class='add'>+	namestroff = _fdt_find_add_string(fdt, name);</div><div class='ctx'> 	if (namestroff &lt; 0)</div><div class='ctx'> 		return namestroff;</div><div class='ctx'> </div><div class='ctx'> 	*prop = _fdt_offset_ptr_w(fdt, nextoffset);</div><div class='del'>-	proplen = sizeof(**prop) + ALIGN(len, FDT_TAGSIZE);</div><div class='add'>+	proplen = sizeof(**prop) + FDT_TAGALIGN(len);</div><div class='ctx'> </div><div class='del'>-	err = _blob_splice_struct(fdt, *prop, 0, proplen);</div><div class='add'>+	err = _fdt_splice_struct(fdt, *prop, 0, proplen);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -252,18 +248,40 @@ static int _add_property(void *fdt, int nodeoffset, const char *name, int len,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int fdt_set_name(void *fdt, int nodeoffset, const char *name)</div><div class='add'>+{</div><div class='add'>+	char *namep;</div><div class='add'>+	int oldlen, newlen;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	FDT_RW_CHECK_HEADER(fdt);</div><div class='add'>+</div><div class='add'>+	namep = (char *)(uintptr_t)fdt_get_name(fdt, nodeoffset, &amp;oldlen);</div><div class='add'>+	if (!namep)</div><div class='add'>+		return oldlen;</div><div class='add'>+</div><div class='add'>+	newlen = strlen(name);</div><div class='add'>+</div><div class='add'>+	err = _fdt_splice_struct(fdt, namep, FDT_TAGALIGN(oldlen+1),</div><div class='add'>+				 FDT_TAGALIGN(newlen+1));</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	memcpy(namep, name, newlen+1);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int fdt_setprop(void *fdt, int nodeoffset, const char *name,</div><div class='ctx'> 		const void *val, int len)</div><div class='ctx'> {</div><div class='ctx'> 	struct fdt_property *prop;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if ((err = rw_check_header(fdt)))</div><div class='del'>-		return err;</div><div class='add'>+	FDT_RW_CHECK_HEADER(fdt);</div><div class='ctx'> </div><div class='del'>-	err = _resize_property(fdt, nodeoffset, name, len, &amp;prop);</div><div class='add'>+	err = _fdt_resize_property(fdt, nodeoffset, name, len, &amp;prop);</div><div class='ctx'> 	if (err == -FDT_ERR_NOTFOUND)</div><div class='del'>-		err = _add_property(fdt, nodeoffset, name, len, &amp;prop);</div><div class='add'>+		err = _fdt_add_property(fdt, nodeoffset, name, len, &amp;prop);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -276,14 +294,14 @@ int fdt_delprop(void *fdt, int nodeoffset, const char *name)</div><div class='ctx'> 	struct fdt_property *prop;</div><div class='ctx'> 	int len, proplen;</div><div class='ctx'> </div><div class='del'>-	RW_CHECK_HEADER(fdt);</div><div class='add'>+	FDT_RW_CHECK_HEADER(fdt);</div><div class='ctx'> </div><div class='ctx'> 	prop = fdt_get_property_w(fdt, nodeoffset, name, &amp;len);</div><div class='ctx'> 	if (! prop)</div><div class='ctx'> 		return len;</div><div class='ctx'> </div><div class='del'>-	proplen = sizeof(*prop) + ALIGN(len, FDT_TAGSIZE);</div><div class='del'>-	return _blob_splice_struct(fdt, prop, proplen, 0);</div><div class='add'>+	proplen = sizeof(*prop) + FDT_TAGALIGN(len);</div><div class='add'>+	return _fdt_splice_struct(fdt, prop, proplen, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int fdt_add_subnode_namelen(void *fdt, int parentoffset,</div><div class='hunk'>@@ -296,7 +314,7 @@ int fdt_add_subnode_namelen(void *fdt, int parentoffset,</div><div class='ctx'> 	uint32_t tag;</div><div class='ctx'> 	uint32_t *endtag;</div><div class='ctx'> </div><div class='del'>-	RW_CHECK_HEADER(fdt);</div><div class='add'>+	FDT_RW_CHECK_HEADER(fdt);</div><div class='ctx'> </div><div class='ctx'> 	offset = fdt_subnode_offset_namelen(fdt, parentoffset, name, namelen);</div><div class='ctx'> 	if (offset &gt;= 0)</div><div class='hunk'>@@ -309,19 +327,19 @@ int fdt_add_subnode_namelen(void *fdt, int parentoffset,</div><div class='ctx'> 	do {</div><div class='ctx'> 		offset = nextoffset;</div><div class='ctx'> 		tag = fdt_next_tag(fdt, offset, &amp;nextoffset);</div><div class='del'>-	} while (tag == FDT_PROP);</div><div class='add'>+	} while ((tag == FDT_PROP) || (tag == FDT_NOP));</div><div class='ctx'> </div><div class='ctx'> 	nh = _fdt_offset_ptr_w(fdt, offset);</div><div class='del'>-	nodelen = sizeof(*nh) + ALIGN(namelen+1, FDT_TAGSIZE) + FDT_TAGSIZE;</div><div class='add'>+	nodelen = sizeof(*nh) + FDT_TAGALIGN(namelen+1) + FDT_TAGSIZE;</div><div class='ctx'> </div><div class='del'>-	err = _blob_splice_struct(fdt, nh, 0, nodelen);</div><div class='add'>+	err = _fdt_splice_struct(fdt, nh, 0, nodelen);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	nh-&gt;tag = cpu_to_fdt32(FDT_BEGIN_NODE);</div><div class='del'>-	memset(nh-&gt;name, 0, ALIGN(namelen+1, FDT_TAGSIZE));</div><div class='add'>+	memset(nh-&gt;name, 0, FDT_TAGALIGN(namelen+1));</div><div class='ctx'> 	memcpy(nh-&gt;name, name, namelen);</div><div class='del'>-	endtag = (uint32_t *)((void *)nh + nodelen - FDT_TAGSIZE);</div><div class='add'>+	endtag = (uint32_t *)((char *)nh + nodelen - FDT_TAGSIZE);</div><div class='ctx'> 	*endtag = cpu_to_fdt32(FDT_END_NODE);</div><div class='ctx'> </div><div class='ctx'> 	return offset;</div><div class='hunk'>@@ -336,36 +354,36 @@ int fdt_del_node(void *fdt, int nodeoffset)</div><div class='ctx'> {</div><div class='ctx'> 	int endoffset;</div><div class='ctx'> </div><div class='del'>-	RW_CHECK_HEADER(fdt);</div><div class='add'>+	FDT_RW_CHECK_HEADER(fdt);</div><div class='ctx'> </div><div class='ctx'> 	endoffset = _fdt_node_end_offset(fdt, nodeoffset);</div><div class='ctx'> 	if (endoffset &lt; 0)</div><div class='ctx'> 		return endoffset;</div><div class='ctx'> </div><div class='del'>-	return _blob_splice_struct(fdt, _fdt_offset_ptr_w(fdt, nodeoffset),</div><div class='del'>-				   endoffset - nodeoffset, 0);</div><div class='add'>+	return _fdt_splice_struct(fdt, _fdt_offset_ptr_w(fdt, nodeoffset),</div><div class='add'>+				  endoffset - nodeoffset, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void _packblocks(const void *fdt, void *buf,</div><div class='del'>-		       int mem_rsv_size, int struct_size)</div><div class='add'>+static void _fdt_packblocks(const char *old, char *new,</div><div class='add'>+			    int mem_rsv_size, int struct_size)</div><div class='ctx'> {</div><div class='ctx'> 	int mem_rsv_off, struct_off, strings_off;</div><div class='ctx'> </div><div class='del'>-	mem_rsv_off = ALIGN(sizeof(struct fdt_header), 8);</div><div class='add'>+	mem_rsv_off = FDT_ALIGN(sizeof(struct fdt_header), 8);</div><div class='ctx'> 	struct_off = mem_rsv_off + mem_rsv_size;</div><div class='ctx'> 	strings_off = struct_off + struct_size;</div><div class='ctx'> </div><div class='del'>-	memmove(buf + mem_rsv_off, fdt + fdt_off_mem_rsvmap(fdt), mem_rsv_size);</div><div class='del'>-	fdt_set_off_mem_rsvmap(buf, mem_rsv_off);</div><div class='add'>+	memmove(new + mem_rsv_off, old + fdt_off_mem_rsvmap(old), mem_rsv_size);</div><div class='add'>+	fdt_set_off_mem_rsvmap(new, mem_rsv_off);</div><div class='ctx'> </div><div class='del'>-	memmove(buf + struct_off, fdt + fdt_off_dt_struct(fdt), struct_size);</div><div class='del'>-	fdt_set_off_dt_struct(buf, struct_off);</div><div class='del'>-	fdt_set_size_dt_struct(buf, struct_size);</div><div class='add'>+	memmove(new + struct_off, old + fdt_off_dt_struct(old), struct_size);</div><div class='add'>+	fdt_set_off_dt_struct(new, struct_off);</div><div class='add'>+	fdt_set_size_dt_struct(new, struct_size);</div><div class='ctx'> </div><div class='del'>-	memmove(buf + strings_off, fdt + fdt_off_dt_strings(fdt),</div><div class='del'>-		fdt_size_dt_strings(fdt));</div><div class='del'>-	fdt_set_off_dt_strings(buf, strings_off);</div><div class='del'>-	fdt_set_size_dt_strings(buf, fdt_size_dt_strings(fdt));</div><div class='add'>+	memmove(new + strings_off, old + fdt_off_dt_strings(old),</div><div class='add'>+		fdt_size_dt_strings(old));</div><div class='add'>+	fdt_set_off_dt_strings(new, strings_off);</div><div class='add'>+	fdt_set_size_dt_strings(new, fdt_size_dt_strings(old));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int fdt_open_into(const void *fdt, void *buf, int bufsize)</div><div class='hunk'>@@ -373,11 +391,11 @@ int fdt_open_into(const void *fdt, void *buf, int bufsize)</div><div class='ctx'> 	int err;</div><div class='ctx'> 	int mem_rsv_size, struct_size;</div><div class='ctx'> 	int newsize;</div><div class='del'>-	void *tmp;</div><div class='add'>+	const char *fdtstart = fdt;</div><div class='add'>+	const char *fdtend = fdtstart + fdt_totalsize(fdt);</div><div class='add'>+	char *tmp;</div><div class='ctx'> </div><div class='del'>-	err = fdt_check_header(fdt);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='add'>+	FDT_CHECK_HEADER(fdt);</div><div class='ctx'> </div><div class='ctx'> 	mem_rsv_size = (fdt_num_mem_rsv(fdt)+1)</div><div class='ctx'> 		* sizeof(struct fdt_reserve_entry);</div><div class='hunk'>@@ -390,7 +408,7 @@ int fdt_open_into(const void *fdt, void *buf, int bufsize)</div><div class='ctx'> 			;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!_blocks_misordered(fdt, mem_rsv_size, struct_size)) {</div><div class='add'>+	if (!_fdt_blocks_misordered(fdt, mem_rsv_size, struct_size)) {</div><div class='ctx'> 		/* no further work necessary */</div><div class='ctx'> 		err = fdt_move(fdt, buf, bufsize);</div><div class='ctx'> 		if (err)</div><div class='hunk'>@@ -402,22 +420,23 @@ int fdt_open_into(const void *fdt, void *buf, int bufsize)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Need to reorder */</div><div class='del'>-	newsize = ALIGN(sizeof(struct fdt_header), 8) + mem_rsv_size</div><div class='add'>+	newsize = FDT_ALIGN(sizeof(struct fdt_header), 8) + mem_rsv_size</div><div class='ctx'> 		+ struct_size + fdt_size_dt_strings(fdt);</div><div class='ctx'> </div><div class='ctx'> 	if (bufsize &lt; newsize)</div><div class='ctx'> 		return -FDT_ERR_NOSPACE;</div><div class='ctx'> </div><div class='del'>-	if (((buf + newsize) &lt;= fdt)</div><div class='del'>-	    || (buf &gt;= (fdt + fdt_totalsize(fdt)))) {</div><div class='del'>-		tmp = buf;</div><div class='del'>-	} else {</div><div class='del'>-		tmp = (void *)fdt + fdt_totalsize(fdt);</div><div class='del'>-		if ((tmp + newsize) &gt; (buf + bufsize))</div><div class='add'>+	/* First attempt to build converted tree at beginning of buffer */</div><div class='add'>+	tmp = buf;</div><div class='add'>+	/* But if that overlaps with the old tree... */</div><div class='add'>+	if (((tmp + newsize) &gt; fdtstart) &amp;&amp; (tmp &lt; fdtend)) {</div><div class='add'>+		/* Try right after the old tree instead */</div><div class='add'>+		tmp = (char *)(uintptr_t)fdtend;</div><div class='add'>+		if ((tmp + newsize) &gt; ((char *)buf + bufsize))</div><div class='ctx'> 			return -FDT_ERR_NOSPACE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	_packblocks(fdt, tmp, mem_rsv_size, struct_size);</div><div class='add'>+	_fdt_packblocks(fdt, tmp, mem_rsv_size, struct_size);</div><div class='ctx'> 	memmove(buf, tmp, newsize);</div><div class='ctx'> </div><div class='ctx'> 	fdt_set_magic(buf, FDT_MAGIC);</div><div class='hunk'>@@ -432,16 +451,13 @@ int fdt_open_into(const void *fdt, void *buf, int bufsize)</div><div class='ctx'> int fdt_pack(void *fdt)</div><div class='ctx'> {</div><div class='ctx'> 	int mem_rsv_size;</div><div class='del'>-	int err;</div><div class='ctx'> </div><div class='del'>-	err = rw_check_header(fdt);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='add'>+	FDT_RW_CHECK_HEADER(fdt);</div><div class='ctx'> </div><div class='ctx'> 	mem_rsv_size = (fdt_num_mem_rsv(fdt)+1)</div><div class='ctx'> 		* sizeof(struct fdt_reserve_entry);</div><div class='del'>-	_packblocks(fdt, fdt, mem_rsv_size, fdt_size_dt_struct(fdt));</div><div class='del'>-	fdt_set_totalsize(fdt, _blob_data_size(fdt));</div><div class='add'>+	_fdt_packblocks(fdt, fdt, mem_rsv_size, fdt_size_dt_struct(fdt));</div><div class='add'>+	fdt_set_totalsize(fdt, _fdt_data_size(fdt));</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/boot/libfdt/fdt_strerror.c b/arch/powerpc/boot/libfdt/fdt_strerror.c<br/>index f9d32ef5360a..e6c3ceee8c58 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/libfdt/fdt_strerror.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/boot/libfdt/fdt_strerror.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/libfdt/fdt_strerror.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/libfdt/fdt_strerror.c</a></div><div class='hunk'>@@ -55,29 +55,29 @@</div><div class='ctx'> </div><div class='ctx'> #include "libfdt_internal.h"</div><div class='ctx'> </div><div class='del'>-struct errtabent {</div><div class='add'>+struct fdt_errtabent {</div><div class='ctx'> 	const char *str;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define ERRTABENT(val) \</div><div class='add'>+#define FDT_ERRTABENT(val) \</div><div class='ctx'> 	[(val)] = { .str = #val, }</div><div class='ctx'> </div><div class='del'>-static struct errtabent errtable[] = {</div><div class='del'>-	ERRTABENT(FDT_ERR_NOTFOUND),</div><div class='del'>-	ERRTABENT(FDT_ERR_EXISTS),</div><div class='del'>-	ERRTABENT(FDT_ERR_NOSPACE),</div><div class='add'>+static struct fdt_errtabent fdt_errtable[] = {</div><div class='add'>+	FDT_ERRTABENT(FDT_ERR_NOTFOUND),</div><div class='add'>+	FDT_ERRTABENT(FDT_ERR_EXISTS),</div><div class='add'>+	FDT_ERRTABENT(FDT_ERR_NOSPACE),</div><div class='ctx'> </div><div class='del'>-	ERRTABENT(FDT_ERR_BADOFFSET),</div><div class='del'>-	ERRTABENT(FDT_ERR_BADPATH),</div><div class='del'>-	ERRTABENT(FDT_ERR_BADSTATE),</div><div class='add'>+	FDT_ERRTABENT(FDT_ERR_BADOFFSET),</div><div class='add'>+	FDT_ERRTABENT(FDT_ERR_BADPATH),</div><div class='add'>+	FDT_ERRTABENT(FDT_ERR_BADSTATE),</div><div class='ctx'> </div><div class='del'>-	ERRTABENT(FDT_ERR_TRUNCATED),</div><div class='del'>-	ERRTABENT(FDT_ERR_BADMAGIC),</div><div class='del'>-	ERRTABENT(FDT_ERR_BADVERSION),</div><div class='del'>-	ERRTABENT(FDT_ERR_BADSTRUCTURE),</div><div class='del'>-	ERRTABENT(FDT_ERR_BADLAYOUT),</div><div class='add'>+	FDT_ERRTABENT(FDT_ERR_TRUNCATED),</div><div class='add'>+	FDT_ERRTABENT(FDT_ERR_BADMAGIC),</div><div class='add'>+	FDT_ERRTABENT(FDT_ERR_BADVERSION),</div><div class='add'>+	FDT_ERRTABENT(FDT_ERR_BADSTRUCTURE),</div><div class='add'>+	FDT_ERRTABENT(FDT_ERR_BADLAYOUT),</div><div class='ctx'> };</div><div class='del'>-#define ERRTABSIZE	(sizeof(errtable) / sizeof(errtable[0]))</div><div class='add'>+#define FDT_ERRTABSIZE	(sizeof(fdt_errtable) / sizeof(fdt_errtable[0]))</div><div class='ctx'> </div><div class='ctx'> const char *fdt_strerror(int errval)</div><div class='ctx'> {</div><div class='hunk'>@@ -85,8 +85,8 @@ const char *fdt_strerror(int errval)</div><div class='ctx'> 		return "&lt;valid offset/length&gt;";</div><div class='ctx'> 	else if (errval == 0)</div><div class='ctx'> 		return "&lt;no error&gt;";</div><div class='del'>-	else if (errval &gt; -ERRTABSIZE) {</div><div class='del'>-		const char *s = errtable[-errval].str;</div><div class='add'>+	else if (errval &gt; -FDT_ERRTABSIZE) {</div><div class='add'>+		const char *s = fdt_errtable[-errval].str;</div><div class='ctx'> </div><div class='ctx'> 		if (s)</div><div class='ctx'> 			return s;</div><div class='head'>diff --git a/arch/powerpc/boot/libfdt/fdt_sw.c b/arch/powerpc/boot/libfdt/fdt_sw.c<br/>index dda2de34b2e0..698329e0ccaf 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/libfdt/fdt_sw.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/boot/libfdt/fdt_sw.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/libfdt/fdt_sw.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/libfdt/fdt_sw.c</a></div><div class='hunk'>@@ -55,14 +55,22 @@</div><div class='ctx'> </div><div class='ctx'> #include "libfdt_internal.h"</div><div class='ctx'> </div><div class='del'>-static int check_header_sw(void *fdt)</div><div class='add'>+static int _fdt_sw_check_header(void *fdt)</div><div class='ctx'> {</div><div class='del'>-	if (fdt_magic(fdt) != SW_MAGIC)</div><div class='add'>+	if (fdt_magic(fdt) != FDT_SW_MAGIC)</div><div class='ctx'> 		return -FDT_ERR_BADMAGIC;</div><div class='add'>+	/* FIXME: should check more details about the header state */</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void *grab_space(void *fdt, int len)</div><div class='add'>+#define FDT_SW_CHECK_HEADER(fdt) \</div><div class='add'>+	{ \</div><div class='add'>+		int err; \</div><div class='add'>+		if ((err = _fdt_sw_check_header(fdt)) != 0) \</div><div class='add'>+			return err; \</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+static void *_fdt_grab_space(void *fdt, int len)</div><div class='ctx'> {</div><div class='ctx'> 	int offset = fdt_size_dt_struct(fdt);</div><div class='ctx'> 	int spaceleft;</div><div class='hunk'>@@ -86,13 +94,13 @@ int fdt_create(void *buf, int bufsize)</div><div class='ctx'> </div><div class='ctx'> 	memset(buf, 0, bufsize);</div><div class='ctx'> </div><div class='del'>-	fdt_set_magic(fdt, SW_MAGIC);</div><div class='add'>+	fdt_set_magic(fdt, FDT_SW_MAGIC);</div><div class='ctx'> 	fdt_set_version(fdt, FDT_LAST_SUPPORTED_VERSION);</div><div class='ctx'> 	fdt_set_last_comp_version(fdt, FDT_FIRST_SUPPORTED_VERSION);</div><div class='ctx'> 	fdt_set_totalsize(fdt,  bufsize);</div><div class='ctx'> </div><div class='del'>-	fdt_set_off_mem_rsvmap(fdt, ALIGN(sizeof(struct fdt_header),</div><div class='del'>-					  sizeof(struct fdt_reserve_entry)));</div><div class='add'>+	fdt_set_off_mem_rsvmap(fdt, FDT_ALIGN(sizeof(struct fdt_header),</div><div class='add'>+					      sizeof(struct fdt_reserve_entry)));</div><div class='ctx'> 	fdt_set_off_dt_struct(fdt, fdt_off_mem_rsvmap(fdt));</div><div class='ctx'> 	fdt_set_off_dt_strings(fdt, bufsize);</div><div class='ctx'> </div><div class='hunk'>@@ -102,11 +110,10 @@ int fdt_create(void *buf, int bufsize)</div><div class='ctx'> int fdt_add_reservemap_entry(void *fdt, uint64_t addr, uint64_t size)</div><div class='ctx'> {</div><div class='ctx'> 	struct fdt_reserve_entry *re;</div><div class='del'>-	int err = check_header_sw(fdt);</div><div class='ctx'> 	int offset;</div><div class='ctx'> </div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='add'>+	FDT_SW_CHECK_HEADER(fdt);</div><div class='add'>+</div><div class='ctx'> 	if (fdt_size_dt_struct(fdt))</div><div class='ctx'> 		return -FDT_ERR_BADSTATE;</div><div class='ctx'> </div><div class='hunk'>@@ -114,7 +121,7 @@ int fdt_add_reservemap_entry(void *fdt, uint64_t addr, uint64_t size)</div><div class='ctx'> 	if ((offset + sizeof(*re)) &gt; fdt_totalsize(fdt))</div><div class='ctx'> 		return -FDT_ERR_NOSPACE;</div><div class='ctx'> </div><div class='del'>-	re = (struct fdt_reserve_entry *)(fdt + offset);</div><div class='add'>+	re = (struct fdt_reserve_entry *)((char *)fdt + offset);</div><div class='ctx'> 	re-&gt;address = cpu_to_fdt64(addr);</div><div class='ctx'> 	re-&gt;size = cpu_to_fdt64(size);</div><div class='ctx'> </div><div class='hunk'>@@ -131,13 +138,11 @@ int fdt_finish_reservemap(void *fdt)</div><div class='ctx'> int fdt_begin_node(void *fdt, const char *name)</div><div class='ctx'> {</div><div class='ctx'> 	struct fdt_node_header *nh;</div><div class='del'>-	int err = check_header_sw(fdt);</div><div class='ctx'> 	int namelen = strlen(name) + 1;</div><div class='ctx'> </div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='add'>+	FDT_SW_CHECK_HEADER(fdt);</div><div class='ctx'> </div><div class='del'>-	nh = grab_space(fdt, sizeof(*nh) + ALIGN(namelen, FDT_TAGSIZE));</div><div class='add'>+	nh = _fdt_grab_space(fdt, sizeof(*nh) + FDT_TAGALIGN(namelen));</div><div class='ctx'> 	if (! nh)</div><div class='ctx'> 		return -FDT_ERR_NOSPACE;</div><div class='ctx'> </div><div class='hunk'>@@ -149,12 +154,10 @@ int fdt_begin_node(void *fdt, const char *name)</div><div class='ctx'> int fdt_end_node(void *fdt)</div><div class='ctx'> {</div><div class='ctx'> 	uint32_t *en;</div><div class='del'>-	int err = check_header_sw(fdt);</div><div class='ctx'> </div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='add'>+	FDT_SW_CHECK_HEADER(fdt);</div><div class='ctx'> </div><div class='del'>-	en = grab_space(fdt, FDT_TAGSIZE);</div><div class='add'>+	en = _fdt_grab_space(fdt, FDT_TAGSIZE);</div><div class='ctx'> 	if (! en)</div><div class='ctx'> 		return -FDT_ERR_NOSPACE;</div><div class='ctx'> </div><div class='hunk'>@@ -162,7 +165,7 @@ int fdt_end_node(void *fdt)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int find_add_string(void *fdt, const char *s)</div><div class='add'>+static int _fdt_find_add_string(void *fdt, const char *s)</div><div class='ctx'> {</div><div class='ctx'> 	char *strtab = (char *)fdt + fdt_totalsize(fdt);</div><div class='ctx'> 	const char *p;</div><div class='hunk'>@@ -188,17 +191,15 @@ static int find_add_string(void *fdt, const char *s)</div><div class='ctx'> int fdt_property(void *fdt, const char *name, const void *val, int len)</div><div class='ctx'> {</div><div class='ctx'> 	struct fdt_property *prop;</div><div class='del'>-	int err = check_header_sw(fdt);</div><div class='ctx'> 	int nameoff;</div><div class='ctx'> </div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='add'>+	FDT_SW_CHECK_HEADER(fdt);</div><div class='ctx'> </div><div class='del'>-	nameoff = find_add_string(fdt, name);</div><div class='add'>+	nameoff = _fdt_find_add_string(fdt, name);</div><div class='ctx'> 	if (nameoff == 0)</div><div class='ctx'> 		return -FDT_ERR_NOSPACE;</div><div class='ctx'> </div><div class='del'>-	prop = grab_space(fdt, sizeof(*prop) + ALIGN(len, FDT_TAGSIZE));</div><div class='add'>+	prop = _fdt_grab_space(fdt, sizeof(*prop) + FDT_TAGALIGN(len));</div><div class='ctx'> 	if (! prop)</div><div class='ctx'> 		return -FDT_ERR_NOSPACE;</div><div class='ctx'> </div><div class='hunk'>@@ -211,18 +212,16 @@ int fdt_property(void *fdt, const char *name, const void *val, int len)</div><div class='ctx'> </div><div class='ctx'> int fdt_finish(void *fdt)</div><div class='ctx'> {</div><div class='del'>-	int err = check_header_sw(fdt);</div><div class='ctx'> 	char *p = (char *)fdt;</div><div class='ctx'> 	uint32_t *end;</div><div class='ctx'> 	int oldstroffset, newstroffset;</div><div class='ctx'> 	uint32_t tag;</div><div class='ctx'> 	int offset, nextoffset;</div><div class='ctx'> </div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='add'>+	FDT_SW_CHECK_HEADER(fdt);</div><div class='ctx'> </div><div class='ctx'> 	/* Add terminator */</div><div class='del'>-	end = grab_space(fdt, sizeof(*end));</div><div class='add'>+	end = _fdt_grab_space(fdt, sizeof(*end));</div><div class='ctx'> 	if (! end)</div><div class='ctx'> 		return -FDT_ERR_NOSPACE;</div><div class='ctx'> 	*end = cpu_to_fdt32(FDT_END);</div><div class='head'>diff --git a/arch/powerpc/boot/libfdt/fdt_wip.c b/arch/powerpc/boot/libfdt/fdt_wip.c<br/>index 88e24b8318f4..a4652c6e787e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/libfdt/fdt_wip.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/boot/libfdt/fdt_wip.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/libfdt/fdt_wip.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/libfdt/fdt_wip.c</a></div><div class='hunk'>@@ -72,11 +72,11 @@ int fdt_setprop_inplace(void *fdt, int nodeoffset, const char *name,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void nop_region(void *start, int len)</div><div class='add'>+static void _fdt_nop_region(void *start, int len)</div><div class='ctx'> {</div><div class='ctx'> 	uint32_t *p;</div><div class='ctx'> </div><div class='del'>-	for (p = start; (void *)p &lt; (start + len); p++)</div><div class='add'>+	for (p = start; (char *)p &lt; ((char *)start + len); p++)</div><div class='ctx'> 		*p = cpu_to_fdt32(FDT_NOP);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -89,7 +89,7 @@ int fdt_nop_property(void *fdt, int nodeoffset, const char *name)</div><div class='ctx'> 	if (! prop)</div><div class='ctx'> 		return len;</div><div class='ctx'> </div><div class='del'>-	nop_region(prop, len + sizeof(*prop));</div><div class='add'>+	_fdt_nop_region(prop, len + sizeof(*prop));</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -139,6 +139,7 @@ int fdt_nop_node(void *fdt, int nodeoffset)</div><div class='ctx'> 	if (endoffset &lt; 0)</div><div class='ctx'> 		return endoffset;</div><div class='ctx'> </div><div class='del'>-	nop_region(fdt_offset_ptr_w(fdt, nodeoffset, 0), endoffset - nodeoffset);</div><div class='add'>+	_fdt_nop_region(fdt_offset_ptr_w(fdt, nodeoffset, 0),</div><div class='add'>+			endoffset - nodeoffset);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/boot/libfdt/libfdt.h b/arch/powerpc/boot/libfdt/libfdt.h<br/>index 6b2fb92ea357..ce80e4fb41b2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/libfdt/libfdt.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/boot/libfdt/libfdt.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/libfdt/libfdt.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/libfdt/libfdt.h</a></div><div class='hunk'>@@ -125,12 +125,18 @@</div><div class='ctx'> const void *fdt_offset_ptr(const void *fdt, int offset, int checklen);</div><div class='ctx'> static inline void *fdt_offset_ptr_w(void *fdt, int offset, int checklen)</div><div class='ctx'> {</div><div class='del'>-	return (void *)fdt_offset_ptr(fdt, offset, checklen);</div><div class='add'>+	return (void *)(uintptr_t)fdt_offset_ptr(fdt, offset, checklen);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> uint32_t fdt_next_tag(const void *fdt, int offset, int *nextoffset);</div><div class='ctx'> </div><div class='ctx'> /**********************************************************************/</div><div class='add'>+/* Traversal functions                                                */</div><div class='add'>+/**********************************************************************/</div><div class='add'>+</div><div class='add'>+int fdt_next_node(const void *fdt, int offset, int *depth);</div><div class='add'>+</div><div class='add'>+/**********************************************************************/</div><div class='ctx'> /* General functions                                                  */</div><div class='ctx'> /**********************************************************************/</div><div class='ctx'> </div><div class='hunk'>@@ -207,7 +213,7 @@ int fdt_move(const void *fdt, void *buf, int bufsize);</div><div class='ctx'> /**********************************************************************/</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * fdt_string - retreive a string from the strings block of a device tree</div><div class='add'>+ * fdt_string - retrieve a string from the strings block of a device tree</div><div class='ctx'>  * @fdt: pointer to the device tree blob</div><div class='ctx'>  * @stroffset: offset of the string within the strings block (native endian)</div><div class='ctx'>  *</div><div class='hunk'>@@ -221,7 +227,7 @@ int fdt_move(const void *fdt, void *buf, int bufsize);</div><div class='ctx'> const char *fdt_string(const void *fdt, int stroffset);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * fdt_num_mem_rsv - retreive the number of memory reserve map entries</div><div class='add'>+ * fdt_num_mem_rsv - retrieve the number of memory reserve map entries</div><div class='ctx'>  * @fdt: pointer to the device tree blob</div><div class='ctx'>  *</div><div class='ctx'>  * Returns the number of entries in the device tree blob's memory</div><div class='hunk'>@@ -234,7 +240,7 @@ const char *fdt_string(const void *fdt, int stroffset);</div><div class='ctx'> int fdt_num_mem_rsv(const void *fdt);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * fdt_get_mem_rsv - retreive one memory reserve map entry</div><div class='add'>+ * fdt_get_mem_rsv - retrieve one memory reserve map entry</div><div class='ctx'>  * @fdt: pointer to the device tree blob</div><div class='ctx'>  * @address, @size: pointers to 64-bit variables</div><div class='ctx'>  *</div><div class='hunk'>@@ -314,7 +320,7 @@ int fdt_subnode_offset(const void *fdt, int parentoffset, const char *name);</div><div class='ctx'> int fdt_path_offset(const void *fdt, const char *path);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * fdt_get_name - retreive the name of a given node</div><div class='add'>+ * fdt_get_name - retrieve the name of a given node</div><div class='ctx'>  * @fdt: pointer to the device tree blob</div><div class='ctx'>  * @nodeoffset: structure block offset of the starting node</div><div class='ctx'>  * @lenp: pointer to an integer variable (will be overwritten) or NULL</div><div class='hunk'>@@ -346,7 +352,7 @@ const char *fdt_get_name(const void *fdt, int nodeoffset, int *lenp);</div><div class='ctx'>  * fdt_get_property() retrieves a pointer to the fdt_property</div><div class='ctx'>  * structure within the device tree blob corresponding to the property</div><div class='ctx'>  * named 'name' of the node at offset nodeoffset.  If lenp is</div><div class='del'>- * non-NULL, the length of the property value also returned, in the</div><div class='add'>+ * non-NULL, the length of the property value is also returned, in the</div><div class='ctx'>  * integer pointed to by lenp.</div><div class='ctx'>  *</div><div class='ctx'>  * returns:</div><div class='hunk'>@@ -369,8 +375,8 @@ static inline struct fdt_property *fdt_get_property_w(void *fdt, int nodeoffset,</div><div class='ctx'> 						      const char *name,</div><div class='ctx'> 						      int *lenp)</div><div class='ctx'> {</div><div class='del'>-	return (struct fdt_property *)fdt_get_property(fdt, nodeoffset,</div><div class='del'>-						       name, lenp);</div><div class='add'>+	return (struct fdt_property *)(uintptr_t)</div><div class='add'>+		fdt_get_property(fdt, nodeoffset, name, lenp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -383,7 +389,7 @@ static inline struct fdt_property *fdt_get_property_w(void *fdt, int nodeoffset,</div><div class='ctx'>  * fdt_getprop() retrieves a pointer to the value of the property</div><div class='ctx'>  * named 'name' of the node at offset nodeoffset (this will be a</div><div class='ctx'>  * pointer to within the device blob itself, not a copy of the value).</div><div class='del'>- * If lenp is non-NULL, the length of the property value also</div><div class='add'>+ * If lenp is non-NULL, the length of the property value is also</div><div class='ctx'>  * returned, in the integer pointed to by lenp.</div><div class='ctx'>  *</div><div class='ctx'>  * returns:</div><div class='hunk'>@@ -405,11 +411,11 @@ const void *fdt_getprop(const void *fdt, int nodeoffset,</div><div class='ctx'> static inline void *fdt_getprop_w(void *fdt, int nodeoffset,</div><div class='ctx'> 				  const char *name, int *lenp)</div><div class='ctx'> {</div><div class='del'>-	return (void *)fdt_getprop(fdt, nodeoffset, name, lenp);</div><div class='add'>+	return (void *)(uintptr_t)fdt_getprop(fdt, nodeoffset, name, lenp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * fdt_get_phandle - retreive the phandle of a given node</div><div class='add'>+ * fdt_get_phandle - retrieve the phandle of a given node</div><div class='ctx'>  * @fdt: pointer to the device tree blob</div><div class='ctx'>  * @nodeoffset: structure block offset of the node</div><div class='ctx'>  *</div><div class='hunk'>@@ -417,7 +423,7 @@ static inline void *fdt_getprop_w(void *fdt, int nodeoffset,</div><div class='ctx'>  * structure block offset nodeoffset.</div><div class='ctx'>  *</div><div class='ctx'>  * returns:</div><div class='del'>- *	the phandle of the node at nodeoffset, on succes (!= 0, != -1)</div><div class='add'>+ *	the phandle of the node at nodeoffset, on success (!= 0, != -1)</div><div class='ctx'>  *	0, if the node has no phandle, or another error occurs</div><div class='ctx'>  */</div><div class='ctx'> uint32_t fdt_get_phandle(const void *fdt, int nodeoffset);</div><div class='hunk'>@@ -516,7 +522,7 @@ int fdt_node_depth(const void *fdt, int nodeoffset);</div><div class='ctx'>  * structure from the start to nodeoffset, *twice*.</div><div class='ctx'>  *</div><div class='ctx'>  * returns:</div><div class='del'>- *	stucture block offset of the parent of the node at nodeoffset</div><div class='add'>+ *	structure block offset of the parent of the node at nodeoffset</div><div class='ctx'>  *		(&gt;=0), on success</div><div class='ctx'>  * 	-FDT_ERR_BADOFFSET, nodeoffset does not refer to a BEGIN_NODE tag</div><div class='ctx'>  *	-FDT_ERR_BADMAGIC,</div><div class='hunk'>@@ -573,7 +579,7 @@ int fdt_node_offset_by_prop_value(const void *fdt, int startoffset,</div><div class='ctx'>  * @fdt: pointer to the device tree blob</div><div class='ctx'>  * @phandle: phandle value</div><div class='ctx'>  *</div><div class='del'>- * fdt_node_offset_by_prop_value() returns the offset of the node</div><div class='add'>+ * fdt_node_offset_by_phandle() returns the offset of the node</div><div class='ctx'>  * which has the given phandle value.  If there is more than one node</div><div class='ctx'>  * in the tree with the given phandle (an invalid tree), results are</div><div class='ctx'>  * undefined.</div><div class='hunk'>@@ -655,8 +661,65 @@ int fdt_node_offset_by_compatible(const void *fdt, int startoffset,</div><div class='ctx'> /* Write-in-place functions                                           */</div><div class='ctx'> /**********************************************************************/</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * fdt_setprop_inplace - change a property's value, but not its size</div><div class='add'>+ * @fdt: pointer to the device tree blob</div><div class='add'>+ * @nodeoffset: offset of the node whose property to change</div><div class='add'>+ * @name: name of the property to change</div><div class='add'>+ * @val: pointer to data to replace the property value with</div><div class='add'>+ * @len: length of the property value</div><div class='add'>+ *</div><div class='add'>+ * fdt_setprop_inplace() replaces the value of a given property with</div><div class='add'>+ * the data in val, of length len.  This function cannot change the</div><div class='add'>+ * size of a property, and so will only work if len is equal to the</div><div class='add'>+ * current length of the property.</div><div class='add'>+ *</div><div class='add'>+ * This function will alter only the bytes in the blob which contain</div><div class='add'>+ * the given property value, and will not alter or move any other part</div><div class='add'>+ * of the tree.</div><div class='add'>+ *</div><div class='add'>+ * returns:</div><div class='add'>+ *	0, on success</div><div class='add'>+ *	-FDT_ERR_NOSPACE, if len is not equal to the property's current length</div><div class='add'>+ *	-FDT_ERR_NOTFOUND, node does not have the named property</div><div class='add'>+ *	-FDT_ERR_BADOFFSET, nodeoffset did not point to FDT_BEGIN_NODE tag</div><div class='add'>+ *	-FDT_ERR_BADMAGIC,</div><div class='add'>+ *	-FDT_ERR_BADVERSION,</div><div class='add'>+ *	-FDT_ERR_BADSTATE,</div><div class='add'>+ *	-FDT_ERR_BADSTRUCTURE,</div><div class='add'>+ *	-FDT_ERR_TRUNCATED, standard meanings</div><div class='add'>+ */</div><div class='ctx'> int fdt_setprop_inplace(void *fdt, int nodeoffset, const char *name,</div><div class='ctx'> 			const void *val, int len);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * fdt_setprop_inplace_cell - change the value of a single-cell property</div><div class='add'>+ * @fdt: pointer to the device tree blob</div><div class='add'>+ * @nodeoffset: offset of the node whose property to change</div><div class='add'>+ * @name: name of the property to change</div><div class='add'>+ * @val: cell (32-bit integer) value to replace the property with</div><div class='add'>+ *</div><div class='add'>+ * fdt_setprop_inplace_cell() replaces the value of a given property</div><div class='add'>+ * with the 32-bit integer cell value in val, converting val to</div><div class='add'>+ * big-endian if necessary.  This function cannot change the size of a</div><div class='add'>+ * property, and so will only work if the property already exists and</div><div class='add'>+ * has length 4.</div><div class='add'>+ *</div><div class='add'>+ * This function will alter only the bytes in the blob which contain</div><div class='add'>+ * the given property value, and will not alter or move any other part</div><div class='add'>+ * of the tree.</div><div class='add'>+ *</div><div class='add'>+ * returns:</div><div class='add'>+ *	0, on success</div><div class='add'>+ *	-FDT_ERR_NOSPACE, if the property's length is not equal to 4</div><div class='add'>+  *	-FDT_ERR_NOTFOUND, node does not have the named property</div><div class='add'>+ *	-FDT_ERR_BADOFFSET, nodeoffset did not point to FDT_BEGIN_NODE tag</div><div class='add'>+ *	-FDT_ERR_BADMAGIC,</div><div class='add'>+ *	-FDT_ERR_BADVERSION,</div><div class='add'>+ *	-FDT_ERR_BADSTATE,</div><div class='add'>+ *	-FDT_ERR_BADSTRUCTURE,</div><div class='add'>+ *	-FDT_ERR_TRUNCATED, standard meanings</div><div class='add'>+ */</div><div class='ctx'> static inline int fdt_setprop_inplace_cell(void *fdt, int nodeoffset,</div><div class='ctx'> 					   const char *name, uint32_t val)</div><div class='ctx'> {</div><div class='hunk'>@@ -664,7 +727,54 @@ static inline int fdt_setprop_inplace_cell(void *fdt, int nodeoffset,</div><div class='ctx'> 	return fdt_setprop_inplace(fdt, nodeoffset, name, &amp;val, sizeof(val));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * fdt_nop_property - replace a property with nop tags</div><div class='add'>+ * @fdt: pointer to the device tree blob</div><div class='add'>+ * @nodeoffset: offset of the node whose property to nop</div><div class='add'>+ * @name: name of the property to nop</div><div class='add'>+ *</div><div class='add'>+ * fdt_nop_property() will replace a given property's representation</div><div class='add'>+ * in the blob with FDT_NOP tags, effectively removing it from the</div><div class='add'>+ * tree.</div><div class='add'>+ *</div><div class='add'>+ * This function will alter only the bytes in the blob which contain</div><div class='add'>+ * the property, and will not alter or move any other part of the</div><div class='add'>+ * tree.</div><div class='add'>+ *</div><div class='add'>+ * returns:</div><div class='add'>+ *	0, on success</div><div class='add'>+ *	-FDT_ERR_NOTFOUND, node does not have the named property</div><div class='add'>+ *	-FDT_ERR_BADOFFSET, nodeoffset did not point to FDT_BEGIN_NODE tag</div><div class='add'>+ *	-FDT_ERR_BADMAGIC,</div><div class='add'>+ *	-FDT_ERR_BADVERSION,</div><div class='add'>+ *	-FDT_ERR_BADSTATE,</div><div class='add'>+ *	-FDT_ERR_BADSTRUCTURE,</div><div class='add'>+ *	-FDT_ERR_TRUNCATED, standard meanings</div><div class='add'>+ */</div><div class='ctx'> int fdt_nop_property(void *fdt, int nodeoffset, const char *name);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * fdt_nop_node - replace a node (subtree) with nop tags</div><div class='add'>+ * @fdt: pointer to the device tree blob</div><div class='add'>+ * @nodeoffset: offset of the node to nop</div><div class='add'>+ *</div><div class='add'>+ * fdt_nop_node() will replace a given node's representation in the</div><div class='add'>+ * blob, including all its subnodes, if any, with FDT_NOP tags,</div><div class='add'>+ * effectively removing it from the tree.</div><div class='add'>+ *</div><div class='add'>+ * This function will alter only the bytes in the blob which contain</div><div class='add'>+ * the node and its properties and subnodes, and will not alter or</div><div class='add'>+ * move any other part of the tree.</div><div class='add'>+ *</div><div class='add'>+ * returns:</div><div class='add'>+ *	0, on success</div><div class='add'>+ *	-FDT_ERR_BADOFFSET, nodeoffset did not point to FDT_BEGIN_NODE tag</div><div class='add'>+ *	-FDT_ERR_BADMAGIC,</div><div class='add'>+ *	-FDT_ERR_BADVERSION,</div><div class='add'>+ *	-FDT_ERR_BADSTATE,</div><div class='add'>+ *	-FDT_ERR_BADSTRUCTURE,</div><div class='add'>+ *	-FDT_ERR_TRUNCATED, standard meanings</div><div class='add'>+ */</div><div class='ctx'> int fdt_nop_node(void *fdt, int nodeoffset);</div><div class='ctx'> </div><div class='ctx'> /**********************************************************************/</div><div class='hunk'>@@ -693,23 +803,268 @@ int fdt_finish(void *fdt);</div><div class='ctx'> int fdt_open_into(const void *fdt, void *buf, int bufsize);</div><div class='ctx'> int fdt_pack(void *fdt);</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * fdt_add_mem_rsv - add one memory reserve map entry</div><div class='add'>+ * @fdt: pointer to the device tree blob</div><div class='add'>+ * @address, @size: 64-bit values (native endian)</div><div class='add'>+ *</div><div class='add'>+ * Adds a reserve map entry to the given blob reserving a region at</div><div class='add'>+ * address address of length size.</div><div class='add'>+ *</div><div class='add'>+ * This function will insert data into the reserve map and will</div><div class='add'>+ * therefore change the indexes of some entries in the table.</div><div class='add'>+ *</div><div class='add'>+ * returns:</div><div class='add'>+ *	0, on success</div><div class='add'>+ *	-FDT_ERR_NOSPACE, there is insufficient free space in the blob to</div><div class='add'>+ *		contain the new reservation entry</div><div class='add'>+ *	-FDT_ERR_BADMAGIC,</div><div class='add'>+ *	-FDT_ERR_BADVERSION,</div><div class='add'>+ *	-FDT_ERR_BADSTATE,</div><div class='add'>+ *	-FDT_ERR_BADSTRUCTURE,</div><div class='add'>+ *	-FDT_ERR_BADLAYOUT,</div><div class='add'>+ *	-FDT_ERR_TRUNCATED, standard meanings</div><div class='add'>+ */</div><div class='ctx'> int fdt_add_mem_rsv(void *fdt, uint64_t address, uint64_t size);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * fdt_del_mem_rsv - remove a memory reserve map entry</div><div class='add'>+ * @fdt: pointer to the device tree blob</div><div class='add'>+ * @n: entry to remove</div><div class='add'>+ *</div><div class='add'>+ * fdt_del_mem_rsv() removes the n-th memory reserve map entry from</div><div class='add'>+ * the blob.</div><div class='add'>+ *</div><div class='add'>+ * This function will delete data from the reservation table and will</div><div class='add'>+ * therefore change the indexes of some entries in the table.</div><div class='add'>+ *</div><div class='add'>+ * returns:</div><div class='add'>+ *	0, on success</div><div class='add'>+ *	-FDT_ERR_NOTFOUND, there is no entry of the given index (i.e. there</div><div class='add'>+ *		are less than n+1 reserve map entries)</div><div class='add'>+ *	-FDT_ERR_BADMAGIC,</div><div class='add'>+ *	-FDT_ERR_BADVERSION,</div><div class='add'>+ *	-FDT_ERR_BADSTATE,</div><div class='add'>+ *	-FDT_ERR_BADSTRUCTURE,</div><div class='add'>+ *	-FDT_ERR_BADLAYOUT,</div><div class='add'>+ *	-FDT_ERR_TRUNCATED, standard meanings</div><div class='add'>+ */</div><div class='ctx'> int fdt_del_mem_rsv(void *fdt, int n);</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * fdt_set_name - change the name of a given node</div><div class='add'>+ * @fdt: pointer to the device tree blob</div><div class='add'>+ * @nodeoffset: structure block offset of a node</div><div class='add'>+ * @name: name to give the node</div><div class='add'>+ *</div><div class='add'>+ * fdt_set_name() replaces the name (including unit address, if any)</div><div class='add'>+ * of the given node with the given string.  NOTE: this function can't</div><div class='add'>+ * efficiently check if the new name is unique amongst the given</div><div class='add'>+ * node's siblings; results are undefined if this function is invoked</div><div class='add'>+ * with a name equal to one of the given node's siblings.</div><div class='add'>+ *</div><div class='add'>+ * This function may insert or delete data from the blob, and will</div><div class='add'>+ * therefore change the offsets of some existing nodes.</div><div class='add'>+ *</div><div class='add'>+ * returns:</div><div class='add'>+ *	0, on success</div><div class='add'>+ *	-FDT_ERR_NOSPACE, there is insufficient free space in the blob</div><div class='add'>+ *		to contain the new name</div><div class='add'>+ *	-FDT_ERR_BADOFFSET, nodeoffset did not point to FDT_BEGIN_NODE tag</div><div class='add'>+ *	-FDT_ERR_BADMAGIC,</div><div class='add'>+ *	-FDT_ERR_BADVERSION,</div><div class='add'>+ *	-FDT_ERR_BADSTATE, standard meanings</div><div class='add'>+ */</div><div class='add'>+int fdt_set_name(void *fdt, int nodeoffset, const char *name);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * fdt_setprop - create or change a property</div><div class='add'>+ * @fdt: pointer to the device tree blob</div><div class='add'>+ * @nodeoffset: offset of the node whose property to change</div><div class='add'>+ * @name: name of the property to change</div><div class='add'>+ * @val: pointer to data to set the property value to</div><div class='add'>+ * @len: length of the property value</div><div class='add'>+ *</div><div class='add'>+ * fdt_setprop() sets the value of the named property in the given</div><div class='add'>+ * node to the given value and length, creating the property if it</div><div class='add'>+ * does not already exist.</div><div class='add'>+ *</div><div class='add'>+ * This function may insert or delete data from the blob, and will</div><div class='add'>+ * therefore change the offsets of some existing nodes.</div><div class='add'>+ *</div><div class='add'>+ * returns:</div><div class='add'>+ *	0, on success</div><div class='add'>+ *	-FDT_ERR_NOSPACE, there is insufficient free space in the blob to</div><div class='add'>+ *		contain the new property value</div><div class='add'>+ *	-FDT_ERR_BADOFFSET, nodeoffset did not point to FDT_BEGIN_NODE tag</div><div class='add'>+ *	-FDT_ERR_BADLAYOUT,</div><div class='add'>+ *	-FDT_ERR_BADMAGIC,</div><div class='add'>+ *	-FDT_ERR_BADVERSION,</div><div class='add'>+ *	-FDT_ERR_BADSTATE,</div><div class='add'>+ *	-FDT_ERR_BADSTRUCTURE,</div><div class='add'>+ *	-FDT_ERR_BADLAYOUT,</div><div class='add'>+ *	-FDT_ERR_TRUNCATED, standard meanings</div><div class='add'>+ */</div><div class='ctx'> int fdt_setprop(void *fdt, int nodeoffset, const char *name,</div><div class='ctx'> 		const void *val, int len);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * fdt_setprop_cell - set a property to a single cell value</div><div class='add'>+ * @fdt: pointer to the device tree blob</div><div class='add'>+ * @nodeoffset: offset of the node whose property to change</div><div class='add'>+ * @name: name of the property to change</div><div class='add'>+ * @val: 32-bit integer value for the property (native endian)</div><div class='add'>+ *</div><div class='add'>+ * fdt_setprop_cell() sets the value of the named property in the</div><div class='add'>+ * given node to the given cell value (converting to big-endian if</div><div class='add'>+ * necessary), or creates a new property with that value if it does</div><div class='add'>+ * not already exist.</div><div class='add'>+ *</div><div class='add'>+ * This function may insert or delete data from the blob, and will</div><div class='add'>+ * therefore change the offsets of some existing nodes.</div><div class='add'>+ *</div><div class='add'>+ * returns:</div><div class='add'>+ *	0, on success</div><div class='add'>+ *	-FDT_ERR_NOSPACE, there is insufficient free space in the blob to</div><div class='add'>+ *		contain the new property value</div><div class='add'>+ *	-FDT_ERR_BADOFFSET, nodeoffset did not point to FDT_BEGIN_NODE tag</div><div class='add'>+ *	-FDT_ERR_BADLAYOUT,</div><div class='add'>+ *	-FDT_ERR_BADMAGIC,</div><div class='add'>+ *	-FDT_ERR_BADVERSION,</div><div class='add'>+ *	-FDT_ERR_BADSTATE,</div><div class='add'>+ *	-FDT_ERR_BADSTRUCTURE,</div><div class='add'>+ *	-FDT_ERR_BADLAYOUT,</div><div class='add'>+ *	-FDT_ERR_TRUNCATED, standard meanings</div><div class='add'>+ */</div><div class='ctx'> static inline int fdt_setprop_cell(void *fdt, int nodeoffset, const char *name,</div><div class='ctx'> 				   uint32_t val)</div><div class='ctx'> {</div><div class='ctx'> 	val = cpu_to_fdt32(val);</div><div class='ctx'> 	return fdt_setprop(fdt, nodeoffset, name, &amp;val, sizeof(val));</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * fdt_setprop_string - set a property to a string value</div><div class='add'>+ * @fdt: pointer to the device tree blob</div><div class='add'>+ * @nodeoffset: offset of the node whose property to change</div><div class='add'>+ * @name: name of the property to change</div><div class='add'>+ * @str: string value for the property</div><div class='add'>+ *</div><div class='add'>+ * fdt_setprop_string() sets the value of the named property in the</div><div class='add'>+ * given node to the given string value (using the length of the</div><div class='add'>+ * string to determine the new length of the property), or creates a</div><div class='add'>+ * new property with that value if it does not already exist.</div><div class='add'>+ *</div><div class='add'>+ * This function may insert or delete data from the blob, and will</div><div class='add'>+ * therefore change the offsets of some existing nodes.</div><div class='add'>+ *</div><div class='add'>+ * returns:</div><div class='add'>+ *	0, on success</div><div class='add'>+ *	-FDT_ERR_NOSPACE, there is insufficient free space in the blob to</div><div class='add'>+ *		contain the new property value</div><div class='add'>+ *	-FDT_ERR_BADOFFSET, nodeoffset did not point to FDT_BEGIN_NODE tag</div><div class='add'>+ *	-FDT_ERR_BADLAYOUT,</div><div class='add'>+ *	-FDT_ERR_BADMAGIC,</div><div class='add'>+ *	-FDT_ERR_BADVERSION,</div><div class='add'>+ *	-FDT_ERR_BADSTATE,</div><div class='add'>+ *	-FDT_ERR_BADSTRUCTURE,</div><div class='add'>+ *	-FDT_ERR_BADLAYOUT,</div><div class='add'>+ *	-FDT_ERR_TRUNCATED, standard meanings</div><div class='add'>+ */</div><div class='ctx'> #define fdt_setprop_string(fdt, nodeoffset, name, str) \</div><div class='ctx'> 	fdt_setprop((fdt), (nodeoffset), (name), (str), strlen(str)+1)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * fdt_delprop - delete a property</div><div class='add'>+ * @fdt: pointer to the device tree blob</div><div class='add'>+ * @nodeoffset: offset of the node whose property to nop</div><div class='add'>+ * @name: name of the property to nop</div><div class='add'>+ *</div><div class='add'>+ * fdt_del_property() will delete the given property.</div><div class='add'>+ *</div><div class='add'>+ * This function will delete data from the blob, and will therefore</div><div class='add'>+ * change the offsets of some existing nodes.</div><div class='add'>+ *</div><div class='add'>+ * returns:</div><div class='add'>+ *	0, on success</div><div class='add'>+ *	-FDT_ERR_NOTFOUND, node does not have the named property</div><div class='add'>+ *	-FDT_ERR_BADOFFSET, nodeoffset did not point to FDT_BEGIN_NODE tag</div><div class='add'>+ *	-FDT_ERR_BADLAYOUT,</div><div class='add'>+ *	-FDT_ERR_BADMAGIC,</div><div class='add'>+ *	-FDT_ERR_BADVERSION,</div><div class='add'>+ *	-FDT_ERR_BADSTATE,</div><div class='add'>+ *	-FDT_ERR_BADSTRUCTURE,</div><div class='add'>+ *	-FDT_ERR_TRUNCATED, standard meanings</div><div class='add'>+ */</div><div class='ctx'> int fdt_delprop(void *fdt, int nodeoffset, const char *name);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * fdt_add_subnode_namelen - creates a new node based on substring</div><div class='add'>+ * @fdt: pointer to the device tree blob</div><div class='add'>+ * @parentoffset: structure block offset of a node</div><div class='add'>+ * @name: name of the subnode to locate</div><div class='add'>+ * @namelen: number of characters of name to consider</div><div class='add'>+ *</div><div class='add'>+ * Identical to fdt_add_subnode(), but use only the first namelen</div><div class='add'>+ * characters of name as the name of the new node.  This is useful for</div><div class='add'>+ * creating subnodes based on a portion of a larger string, such as a</div><div class='add'>+ * full path.</div><div class='add'>+ */</div><div class='ctx'> int fdt_add_subnode_namelen(void *fdt, int parentoffset,</div><div class='ctx'> 			    const char *name, int namelen);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * fdt_add_subnode - creates a new node</div><div class='add'>+ * @fdt: pointer to the device tree blob</div><div class='add'>+ * @parentoffset: structure block offset of a node</div><div class='add'>+ * @name: name of the subnode to locate</div><div class='add'>+ *</div><div class='add'>+ * fdt_add_subnode() creates a new node as a subnode of the node at</div><div class='add'>+ * structure block offset parentoffset, with the given name (which</div><div class='add'>+ * should include the unit address, if any).</div><div class='add'>+ *</div><div class='add'>+ * This function will insert data into the blob, and will therefore</div><div class='add'>+ * change the offsets of some existing nodes.</div><div class='add'>+</div><div class='add'>+ * returns:</div><div class='add'>+ *	structure block offset of the created nodeequested subnode (&gt;=0), on success</div><div class='add'>+ *	-FDT_ERR_NOTFOUND, if the requested subnode does not exist</div><div class='add'>+ *	-FDT_ERR_BADOFFSET, if parentoffset did not point to an FDT_BEGIN_NODE tag</div><div class='add'>+ *	-FDT_ERR_EXISTS, if the node at parentoffset already has a subnode of</div><div class='add'>+ *		the given name</div><div class='add'>+ *	-FDT_ERR_NOSPACE, if there is insufficient free space in the</div><div class='add'>+ *		blob to contain the new node</div><div class='add'>+ *	-FDT_ERR_NOSPACE</div><div class='add'>+ *	-FDT_ERR_BADLAYOUT</div><div class='add'>+ *      -FDT_ERR_BADMAGIC,</div><div class='add'>+ *	-FDT_ERR_BADVERSION,</div><div class='add'>+ *	-FDT_ERR_BADSTATE,</div><div class='add'>+ *	-FDT_ERR_BADSTRUCTURE,</div><div class='add'>+ *	-FDT_ERR_TRUNCATED, standard meanings.</div><div class='add'>+ */</div><div class='ctx'> int fdt_add_subnode(void *fdt, int parentoffset, const char *name);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * fdt_del_node - delete a node (subtree)</div><div class='add'>+ * @fdt: pointer to the device tree blob</div><div class='add'>+ * @nodeoffset: offset of the node to nop</div><div class='add'>+ *</div><div class='add'>+ * fdt_del_node() will remove the given node, including all its</div><div class='add'>+ * subnodes if any, from the blob.</div><div class='add'>+ *</div><div class='add'>+ * This function will delete data from the blob, and will therefore</div><div class='add'>+ * change the offsets of some existing nodes.</div><div class='add'>+ *</div><div class='add'>+ * returns:</div><div class='add'>+ *	0, on success</div><div class='add'>+ *	-FDT_ERR_BADOFFSET, nodeoffset did not point to FDT_BEGIN_NODE tag</div><div class='add'>+ *	-FDT_ERR_BADLAYOUT,</div><div class='add'>+ *	-FDT_ERR_BADMAGIC,</div><div class='add'>+ *	-FDT_ERR_BADVERSION,</div><div class='add'>+ *	-FDT_ERR_BADSTATE,</div><div class='add'>+ *	-FDT_ERR_BADSTRUCTURE,</div><div class='add'>+ *	-FDT_ERR_TRUNCATED, standard meanings</div><div class='add'>+ */</div><div class='ctx'> int fdt_del_node(void *fdt, int nodeoffset);</div><div class='ctx'> </div><div class='ctx'> /**********************************************************************/</div><div class='head'>diff --git a/arch/powerpc/boot/libfdt/libfdt_internal.h b/arch/powerpc/boot/libfdt/libfdt_internal.h<br/>index 1e60936beb5b..46eb93e4af5c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/libfdt/libfdt_internal.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/boot/libfdt/libfdt_internal.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/libfdt/libfdt_internal.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/libfdt/libfdt_internal.h</a></div><div class='hunk'>@@ -52,38 +52,44 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;fdt.h&gt;</div><div class='ctx'> </div><div class='del'>-#define ALIGN(x, a)	(((x) + (a) - 1) &amp; ~((a) - 1))</div><div class='del'>-#define PALIGN(p, a)	((void *)ALIGN((unsigned long)(p), (a)))</div><div class='add'>+#define FDT_ALIGN(x, a)		(((x) + (a) - 1) &amp; ~((a) - 1))</div><div class='add'>+#define FDT_TAGALIGN(x)		(FDT_ALIGN((x), FDT_TAGSIZE))</div><div class='ctx'> </div><div class='del'>-#define memeq(p, q, n)	(memcmp((p), (q), (n)) == 0)</div><div class='del'>-#define streq(p, q)	(strcmp((p), (q)) == 0)</div><div class='add'>+#define FDT_CHECK_HEADER(fdt) \</div><div class='add'>+	{ \</div><div class='add'>+		int err; \</div><div class='add'>+		if ((err = fdt_check_header(fdt)) != 0) \</div><div class='add'>+			return err; \</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> uint32_t _fdt_next_tag(const void *fdt, int startoffset, int *nextoffset);</div><div class='add'>+int _fdt_check_node_offset(const void *fdt, int offset);</div><div class='ctx'> const char *_fdt_find_string(const char *strtab, int tabsize, const char *s);</div><div class='ctx'> int _fdt_node_end_offset(void *fdt, int nodeoffset);</div><div class='ctx'> </div><div class='ctx'> static inline const void *_fdt_offset_ptr(const void *fdt, int offset)</div><div class='ctx'> {</div><div class='del'>-	return fdt + fdt_off_dt_struct(fdt) + offset;</div><div class='add'>+	return (const char *)fdt + fdt_off_dt_struct(fdt) + offset;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void *_fdt_offset_ptr_w(void *fdt, int offset)</div><div class='ctx'> {</div><div class='del'>-	return (void *)_fdt_offset_ptr(fdt, offset);</div><div class='add'>+	return (void *)(uintptr_t)_fdt_offset_ptr(fdt, offset);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline const struct fdt_reserve_entry *_fdt_mem_rsv(const void *fdt, int n)</div><div class='ctx'> {</div><div class='ctx'> 	const struct fdt_reserve_entry *rsv_table =</div><div class='del'>-		fdt + fdt_off_mem_rsvmap(fdt);</div><div class='add'>+		(const struct fdt_reserve_entry *)</div><div class='add'>+		((const char *)fdt + fdt_off_mem_rsvmap(fdt));</div><div class='ctx'> </div><div class='ctx'> 	return rsv_table + n;</div><div class='ctx'> }</div><div class='ctx'> static inline struct fdt_reserve_entry *_fdt_mem_rsv_w(void *fdt, int n)</div><div class='ctx'> {</div><div class='del'>-	return (void *)_fdt_mem_rsv(fdt, n);</div><div class='add'>+	return (void *)(uintptr_t)_fdt_mem_rsv(fdt, n);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define SW_MAGIC		(~FDT_MAGIC)</div><div class='add'>+#define FDT_SW_MAGIC		(~FDT_MAGIC)</div><div class='ctx'> </div><div class='ctx'> #endif /* _LIBFDT_INTERNAL_H */</div><div class='head'>diff --git a/arch/powerpc/boot/libfdt_env.h b/arch/powerpc/boot/libfdt_env.h<br/>index a4b0fc959ece..c89fdb1b80e1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/libfdt_env.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/boot/libfdt_env.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/libfdt_env.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/libfdt_env.h</a></div><div class='hunk'>@@ -6,6 +6,7 @@</div><div class='ctx'> </div><div class='ctx'> typedef u32 uint32_t;</div><div class='ctx'> typedef u64 uint64_t;</div><div class='add'>+typedef unsigned long uintptr_t;</div><div class='ctx'> </div><div class='ctx'> #define fdt16_to_cpu(x)		(x)</div><div class='ctx'> #define cpu_to_fdt16(x)		(x)</div><div class='head'>diff --git a/arch/powerpc/boot/wrapper b/arch/powerpc/boot/wrapper<br/>index 965c237c122d..ee0dc41d7c56 100755<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/wrapper?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/boot/wrapper</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/boot/wrapper?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/boot/wrapper</a></div><div class='hunk'>@@ -307,7 +307,9 @@ fi</div><div class='ctx'> # post-processing needed for some platforms</div><div class='ctx'> case "$platform" in</div><div class='ctx'> pseries|chrp)</div><div class='del'>-    $objbin/addnote "$ofile"</div><div class='add'>+    ${CROSS}objcopy -O binary -j .fakeelf "$kernel" "$ofile".rpanote</div><div class='add'>+    $objbin/addnote "$ofile" "$ofile".rpanote</div><div class='add'>+    rm -r "$ofile".rpanote</div><div class='ctx'>     ;;</div><div class='ctx'> coff)</div><div class='ctx'>     ${CROSS}objcopy -O aixcoff-rs6000 --set-start "$entry" "$ofile"</div><div class='head'>diff --git a/arch/powerpc/configs/44x/arches_defconfig b/arch/powerpc/configs/44x/arches_defconfig<br/>new file mode 100644<br/>index 000000000000..70f46078eb6a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/configs/44x/arches_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/configs/44x/arches_defconfig</a></div><div class='hunk'>@@ -0,0 +1,767 @@</div><div class='add'>+#</div><div class='add'>+# Automatically generated make config: don't edit</div><div class='add'>+# Linux kernel version: 2.6.27-rc5</div><div class='add'>+# Wed Oct  1 15:54:57 2008</div><div class='add'>+#</div><div class='add'>+# CONFIG_PPC64 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Processor support</div><div class='add'>+#</div><div class='add'>+# CONFIG_6xx is not set</div><div class='add'>+# CONFIG_PPC_85xx is not set</div><div class='add'>+# CONFIG_PPC_8xx is not set</div><div class='add'>+# CONFIG_40x is not set</div><div class='add'>+CONFIG_44x=y</div><div class='add'>+# CONFIG_E200 is not set</div><div class='add'>+CONFIG_PPC_FPU=y</div><div class='add'>+CONFIG_4xx=y</div><div class='add'>+CONFIG_BOOKE=y</div><div class='add'>+CONFIG_PTE_64BIT=y</div><div class='add'>+CONFIG_PHYS_64BIT=y</div><div class='add'>+# CONFIG_PPC_MM_SLICES is not set</div><div class='add'>+CONFIG_NOT_COHERENT_CACHE=y</div><div class='add'>+CONFIG_PPC32=y</div><div class='add'>+CONFIG_WORD_SIZE=32</div><div class='add'>+CONFIG_PPC_MERGE=y</div><div class='add'>+CONFIG_MMU=y</div><div class='add'>+CONFIG_GENERIC_CMOS_UPDATE=y</div><div class='add'>+CONFIG_GENERIC_TIME=y</div><div class='add'>+CONFIG_GENERIC_TIME_VSYSCALL=y</div><div class='add'>+CONFIG_GENERIC_CLOCKEVENTS=y</div><div class='add'>+CONFIG_GENERIC_HARDIRQS=y</div><div class='add'>+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set</div><div class='add'>+CONFIG_IRQ_PER_CPU=y</div><div class='add'>+CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='add'>+CONFIG_LOCKDEP_SUPPORT=y</div><div class='add'>+CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='add'>+CONFIG_ARCH_HAS_ILOG2_U32=y</div><div class='add'>+CONFIG_GENERIC_HWEIGHT=y</div><div class='add'>+CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='add'>+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set</div><div class='add'>+CONFIG_PPC=y</div><div class='add'>+CONFIG_EARLY_PRINTK=y</div><div class='add'>+CONFIG_GENERIC_NVRAM=y</div><div class='add'>+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y</div><div class='add'>+CONFIG_ARCH_MAY_HAVE_PC_FDC=y</div><div class='add'>+CONFIG_PPC_OF=y</div><div class='add'>+CONFIG_OF=y</div><div class='add'>+CONFIG_PPC_UDBG_16550=y</div><div class='add'>+# CONFIG_GENERIC_TBSYNC is not set</div><div class='add'>+CONFIG_AUDIT_ARCH=y</div><div class='add'>+CONFIG_GENERIC_BUG=y</div><div class='add'>+# CONFIG_DEFAULT_UIMAGE is not set</div><div class='add'>+CONFIG_PPC_DCR_NATIVE=y</div><div class='add'>+# CONFIG_PPC_DCR_MMIO is not set</div><div class='add'>+CONFIG_PPC_DCR=y</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# General setup</div><div class='add'>+#</div><div class='add'>+CONFIG_EXPERIMENTAL=y</div><div class='add'>+CONFIG_BROKEN_ON_SMP=y</div><div class='add'>+CONFIG_INIT_ENV_ARG_LIMIT=32</div><div class='add'>+CONFIG_LOCALVERSION=""</div><div class='add'>+CONFIG_LOCALVERSION_AUTO=y</div><div class='add'>+CONFIG_SWAP=y</div><div class='add'>+CONFIG_SYSVIPC=y</div><div class='add'>+CONFIG_SYSVIPC_SYSCTL=y</div><div class='add'>+CONFIG_POSIX_MQUEUE=y</div><div class='add'>+# CONFIG_BSD_PROCESS_ACCT is not set</div><div class='add'>+# CONFIG_TASKSTATS is not set</div><div class='add'>+# CONFIG_AUDIT is not set</div><div class='add'>+# CONFIG_IKCONFIG is not set</div><div class='add'>+CONFIG_LOG_BUF_SHIFT=14</div><div class='add'>+# CONFIG_CGROUPS is not set</div><div class='add'>+# CONFIG_GROUP_SCHED is not set</div><div class='add'>+CONFIG_SYSFS_DEPRECATED=y</div><div class='add'>+CONFIG_SYSFS_DEPRECATED_V2=y</div><div class='add'>+# CONFIG_RELAY is not set</div><div class='add'>+# CONFIG_NAMESPACES is not set</div><div class='add'>+CONFIG_BLK_DEV_INITRD=y</div><div class='add'>+CONFIG_INITRAMFS_SOURCE=""</div><div class='add'>+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set</div><div class='add'>+CONFIG_SYSCTL=y</div><div class='add'>+CONFIG_EMBEDDED=y</div><div class='add'>+CONFIG_SYSCTL_SYSCALL=y</div><div class='add'>+CONFIG_KALLSYMS=y</div><div class='add'>+# CONFIG_KALLSYMS_ALL is not set</div><div class='add'>+# CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='add'>+CONFIG_HOTPLUG=y</div><div class='add'>+CONFIG_PRINTK=y</div><div class='add'>+CONFIG_BUG=y</div><div class='add'>+CONFIG_ELF_CORE=y</div><div class='add'>+CONFIG_COMPAT_BRK=y</div><div class='add'>+CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_FUTEX=y</div><div class='add'>+CONFIG_ANON_INODES=y</div><div class='add'>+CONFIG_EPOLL=y</div><div class='add'>+CONFIG_SIGNALFD=y</div><div class='add'>+CONFIG_TIMERFD=y</div><div class='add'>+CONFIG_EVENTFD=y</div><div class='add'>+CONFIG_SHMEM=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='add'>+CONFIG_SLUB_DEBUG=y</div><div class='add'>+# CONFIG_SLAB is not set</div><div class='add'>+CONFIG_SLUB=y</div><div class='add'>+# CONFIG_SLOB is not set</div><div class='add'>+# CONFIG_PROFILING is not set</div><div class='add'>+# CONFIG_MARKERS is not set</div><div class='add'>+CONFIG_HAVE_OPROFILE=y</div><div class='add'>+# CONFIG_KPROBES is not set</div><div class='add'>+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y</div><div class='add'>+CONFIG_HAVE_IOREMAP_PROT=y</div><div class='add'>+CONFIG_HAVE_KPROBES=y</div><div class='add'>+CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+CONFIG_HAVE_ARCH_TRACEHOOK=y</div><div class='add'>+# CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+# CONFIG_HAVE_CLK is not set</div><div class='add'>+CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='add'>+CONFIG_SLABINFO=y</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='add'>+# CONFIG_TINY_SHMEM is not set</div><div class='add'>+CONFIG_BASE_SMALL=0</div><div class='add'>+CONFIG_MODULES=y</div><div class='add'>+# CONFIG_MODULE_FORCE_LOAD is not set</div><div class='add'>+CONFIG_MODULE_UNLOAD=y</div><div class='add'>+# CONFIG_MODULE_FORCE_UNLOAD is not set</div><div class='add'>+# CONFIG_MODVERSIONS is not set</div><div class='add'>+# CONFIG_MODULE_SRCVERSION_ALL is not set</div><div class='add'>+CONFIG_KMOD=y</div><div class='add'>+CONFIG_BLOCK=y</div><div class='add'>+CONFIG_LBD=y</div><div class='add'>+# CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='add'>+# CONFIG_LSF is not set</div><div class='add'>+# CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IO Schedulers</div><div class='add'>+#</div><div class='add'>+CONFIG_IOSCHED_NOOP=y</div><div class='add'>+CONFIG_IOSCHED_AS=y</div><div class='add'>+CONFIG_IOSCHED_DEADLINE=y</div><div class='add'>+CONFIG_IOSCHED_CFQ=y</div><div class='add'>+CONFIG_DEFAULT_AS=y</div><div class='add'>+# CONFIG_DEFAULT_DEADLINE is not set</div><div class='add'>+# CONFIG_DEFAULT_CFQ is not set</div><div class='add'>+# CONFIG_DEFAULT_NOOP is not set</div><div class='add'>+CONFIG_DEFAULT_IOSCHED="anticipatory"</div><div class='add'>+CONFIG_CLASSIC_RCU=y</div><div class='add'>+CONFIG_PPC4xx_PCI_EXPRESS=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Platform support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PPC_CELL is not set</div><div class='add'>+# CONFIG_PPC_CELL_NATIVE is not set</div><div class='add'>+# CONFIG_PQ2ADS is not set</div><div class='add'>+# CONFIG_BAMBOO is not set</div><div class='add'>+# CONFIG_EBONY is not set</div><div class='add'>+# CONFIG_SAM440EP is not set</div><div class='add'>+# CONFIG_SEQUOIA is not set</div><div class='add'>+# CONFIG_TAISHAN is not set</div><div class='add'>+# CONFIG_KATMAI is not set</div><div class='add'>+# CONFIG_RAINIER is not set</div><div class='add'>+# CONFIG_WARP is not set</div><div class='add'>+CONFIG_ARCHES=y</div><div class='add'>+# CONFIG_CANYONLANDS is not set</div><div class='add'>+# CONFIG_GLACIER is not set</div><div class='add'>+# CONFIG_YOSEMITE is not set</div><div class='add'>+# CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set</div><div class='add'>+CONFIG_PPC44x_SIMPLE=y</div><div class='add'>+CONFIG_460EX=y</div><div class='add'>+# CONFIG_IPIC is not set</div><div class='add'>+# CONFIG_MPIC is not set</div><div class='add'>+# CONFIG_MPIC_WEIRD is not set</div><div class='add'>+# CONFIG_PPC_I8259 is not set</div><div class='add'>+# CONFIG_PPC_RTAS is not set</div><div class='add'>+# CONFIG_MMIO_NVRAM is not set</div><div class='add'>+# CONFIG_PPC_MPC106 is not set</div><div class='add'>+# CONFIG_PPC_970_NAP is not set</div><div class='add'>+# CONFIG_PPC_INDIRECT_IO is not set</div><div class='add'>+# CONFIG_GENERIC_IOMAP is not set</div><div class='add'>+# CONFIG_CPU_FREQ is not set</div><div class='add'>+# CONFIG_FSL_ULI1575 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel options</div><div class='add'>+#</div><div class='add'>+# CONFIG_HIGHMEM is not set</div><div class='add'>+CONFIG_TICK_ONESHOT=y</div><div class='add'>+CONFIG_NO_HZ=y</div><div class='add'>+CONFIG_HIGH_RES_TIMERS=y</div><div class='add'>+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y</div><div class='add'>+# CONFIG_HZ_100 is not set</div><div class='add'>+CONFIG_HZ_250=y</div><div class='add'>+# CONFIG_HZ_300 is not set</div><div class='add'>+# CONFIG_HZ_1000 is not set</div><div class='add'>+CONFIG_HZ=250</div><div class='add'>+CONFIG_SCHED_HRTICK=y</div><div class='add'>+CONFIG_PREEMPT_NONE=y</div><div class='add'>+# CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='add'>+# CONFIG_PREEMPT is not set</div><div class='add'>+CONFIG_BINFMT_ELF=y</div><div class='add'>+# CONFIG_BINFMT_MISC is not set</div><div class='add'>+# CONFIG_MATH_EMULATION is not set</div><div class='add'>+# CONFIG_IOMMU_HELPER is not set</div><div class='add'>+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y</div><div class='add'>+CONFIG_ARCH_HAS_WALK_MEMORY=y</div><div class='add'>+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y</div><div class='add'>+CONFIG_ARCH_FLATMEM_ENABLE=y</div><div class='add'>+CONFIG_ARCH_POPULATES_NODE_MAP=y</div><div class='add'>+CONFIG_SELECT_MEMORY_MODEL=y</div><div class='add'>+CONFIG_FLATMEM_MANUAL=y</div><div class='add'>+# CONFIG_DISCONTIGMEM_MANUAL is not set</div><div class='add'>+# CONFIG_SPARSEMEM_MANUAL is not set</div><div class='add'>+CONFIG_FLATMEM=y</div><div class='add'>+CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='add'>+# CONFIG_SPARSEMEM_STATIC is not set</div><div class='add'>+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='add'>+CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='add'>+CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_MIGRATION=y</div><div class='add'>+CONFIG_RESOURCES_64BIT=y</div><div class='add'>+CONFIG_ZONE_DMA_FLAG=1</div><div class='add'>+CONFIG_BOUNCE=y</div><div class='add'>+CONFIG_VIRT_TO_BUS=y</div><div class='add'>+CONFIG_FORCE_MAX_ZONEORDER=11</div><div class='add'>+CONFIG_PROC_DEVICETREE=y</div><div class='add'>+CONFIG_CMDLINE_BOOL=y</div><div class='add'>+CONFIG_CMDLINE=""</div><div class='add'>+CONFIG_EXTRA_TARGETS=""</div><div class='add'>+CONFIG_SECCOMP=y</div><div class='add'>+CONFIG_ISA_DMA_API=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Bus options</div><div class='add'>+#</div><div class='add'>+CONFIG_ZONE_DMA=y</div><div class='add'>+CONFIG_PPC_INDIRECT_PCI=y</div><div class='add'>+CONFIG_4xx_SOC=y</div><div class='add'>+CONFIG_PPC_PCI_CHOICE=y</div><div class='add'>+CONFIG_PCI=y</div><div class='add'>+CONFIG_PCI_DOMAINS=y</div><div class='add'>+CONFIG_PCI_SYSCALL=y</div><div class='add'>+# CONFIG_PCIEPORTBUS is not set</div><div class='add'>+CONFIG_ARCH_SUPPORTS_MSI=y</div><div class='add'>+# CONFIG_PCI_MSI is not set</div><div class='add'>+CONFIG_PCI_LEGACY=y</div><div class='add'>+# CONFIG_PCI_DEBUG is not set</div><div class='add'>+# CONFIG_PCCARD is not set</div><div class='add'>+# CONFIG_HOTPLUG_PCI is not set</div><div class='add'>+# CONFIG_HAS_RAPIDIO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Advanced setup</div><div class='add'>+#</div><div class='add'>+# CONFIG_ADVANCED_OPTIONS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Default settings for advanced configuration options are used</div><div class='add'>+#</div><div class='add'>+CONFIG_LOWMEM_SIZE=0x30000000</div><div class='add'>+CONFIG_PAGE_OFFSET=0xc0000000</div><div class='add'>+CONFIG_KERNEL_START=0xc0000000</div><div class='add'>+CONFIG_PHYSICAL_START=0x00000000</div><div class='add'>+CONFIG_TASK_SIZE=0xc0000000</div><div class='add'>+CONFIG_CONSISTENT_START=0xff100000</div><div class='add'>+CONFIG_CONSISTENT_SIZE=0x00200000</div><div class='add'>+CONFIG_NET=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking options</div><div class='add'>+#</div><div class='add'>+CONFIG_PACKET=y</div><div class='add'>+# CONFIG_PACKET_MMAP is not set</div><div class='add'>+CONFIG_UNIX=y</div><div class='add'>+# CONFIG_NET_KEY is not set</div><div class='add'>+CONFIG_INET=y</div><div class='add'>+# CONFIG_IP_MULTICAST is not set</div><div class='add'>+# CONFIG_IP_ADVANCED_ROUTER is not set</div><div class='add'>+CONFIG_IP_FIB_HASH=y</div><div class='add'>+CONFIG_IP_PNP=y</div><div class='add'>+CONFIG_IP_PNP_DHCP=y</div><div class='add'>+CONFIG_IP_PNP_BOOTP=y</div><div class='add'>+# CONFIG_IP_PNP_RARP is not set</div><div class='add'>+# CONFIG_NET_IPIP is not set</div><div class='add'>+# CONFIG_NET_IPGRE is not set</div><div class='add'>+# CONFIG_ARPD is not set</div><div class='add'>+# CONFIG_SYN_COOKIES is not set</div><div class='add'>+# CONFIG_INET_AH is not set</div><div class='add'>+# CONFIG_INET_ESP is not set</div><div class='add'>+# CONFIG_INET_IPCOMP is not set</div><div class='add'>+# CONFIG_INET_XFRM_TUNNEL is not set</div><div class='add'>+# CONFIG_INET_TUNNEL is not set</div><div class='add'>+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set</div><div class='add'>+# CONFIG_INET_XFRM_MODE_TUNNEL is not set</div><div class='add'>+# CONFIG_INET_XFRM_MODE_BEET is not set</div><div class='add'>+# CONFIG_INET_LRO is not set</div><div class='add'>+CONFIG_INET_DIAG=y</div><div class='add'>+CONFIG_INET_TCP_DIAG=y</div><div class='add'>+# CONFIG_TCP_CONG_ADVANCED is not set</div><div class='add'>+CONFIG_TCP_CONG_CUBIC=y</div><div class='add'>+CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='add'>+# CONFIG_TCP_MD5SIG is not set</div><div class='add'>+# CONFIG_IPV6 is not set</div><div class='add'>+# CONFIG_NETWORK_SECMARK is not set</div><div class='add'>+# CONFIG_NETFILTER is not set</div><div class='add'>+# CONFIG_IP_DCCP is not set</div><div class='add'>+# CONFIG_IP_SCTP is not set</div><div class='add'>+# CONFIG_TIPC is not set</div><div class='add'>+# CONFIG_ATM is not set</div><div class='add'>+# CONFIG_BRIDGE is not set</div><div class='add'>+# CONFIG_VLAN_8021Q is not set</div><div class='add'>+# CONFIG_DECNET is not set</div><div class='add'>+# CONFIG_LLC2 is not set</div><div class='add'>+# CONFIG_IPX is not set</div><div class='add'>+# CONFIG_ATALK is not set</div><div class='add'>+# CONFIG_X25 is not set</div><div class='add'>+# CONFIG_LAPB is not set</div><div class='add'>+# CONFIG_ECONET is not set</div><div class='add'>+# CONFIG_WAN_ROUTER is not set</div><div class='add'>+# CONFIG_NET_SCHED is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network testing</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_PKTGEN is not set</div><div class='add'>+# CONFIG_HAMRADIO is not set</div><div class='add'>+# CONFIG_CAN is not set</div><div class='add'>+# CONFIG_IRDA is not set</div><div class='add'>+# CONFIG_BT is not set</div><div class='add'>+# CONFIG_AF_RXRPC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless</div><div class='add'>+#</div><div class='add'>+# CONFIG_CFG80211 is not set</div><div class='add'>+# CONFIG_WIRELESS_EXT is not set</div><div class='add'>+# CONFIG_MAC80211 is not set</div><div class='add'>+# CONFIG_IEEE80211 is not set</div><div class='add'>+# CONFIG_RFKILL is not set</div><div class='add'>+# CONFIG_NET_9P is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Device Drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Generic Driver Options</div><div class='add'>+#</div><div class='add'>+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='add'>+CONFIG_STANDALONE=y</div><div class='add'>+CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='add'>+CONFIG_FW_LOADER=y</div><div class='add'>+CONFIG_FIRMWARE_IN_KERNEL=y</div><div class='add'>+CONFIG_EXTRA_FIRMWARE=""</div><div class='add'>+# CONFIG_DEBUG_DRIVER is not set</div><div class='add'>+# CONFIG_DEBUG_DEVRES is not set</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='add'>+CONFIG_CONNECTOR=y</div><div class='add'>+CONFIG_PROC_EVENTS=y</div><div class='add'>+# CONFIG_MTD is not set</div><div class='add'>+CONFIG_OF_DEVICE=y</div><div class='add'>+# CONFIG_PARPORT is not set</div><div class='add'>+CONFIG_BLK_DEV=y</div><div class='add'>+# CONFIG_BLK_DEV_FD is not set</div><div class='add'>+# CONFIG_BLK_CPQ_DA is not set</div><div class='add'>+# CONFIG_BLK_CPQ_CISS_DA is not set</div><div class='add'>+# CONFIG_BLK_DEV_DAC960 is not set</div><div class='add'>+# CONFIG_BLK_DEV_UMEM is not set</div><div class='add'>+# CONFIG_BLK_DEV_COW_COMMON is not set</div><div class='add'>+# CONFIG_BLK_DEV_LOOP is not set</div><div class='add'>+# CONFIG_BLK_DEV_NBD is not set</div><div class='add'>+# CONFIG_BLK_DEV_SX8 is not set</div><div class='add'>+CONFIG_BLK_DEV_RAM=y</div><div class='add'>+CONFIG_BLK_DEV_RAM_COUNT=16</div><div class='add'>+CONFIG_BLK_DEV_RAM_SIZE=35000</div><div class='add'>+# CONFIG_BLK_DEV_XIP is not set</div><div class='add'>+# CONFIG_CDROM_PKTCDVD is not set</div><div class='add'>+# CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+# CONFIG_XILINX_SYSACE is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='add'>+# CONFIG_MISC_DEVICES is not set</div><div class='add'>+CONFIG_HAVE_IDE=y</div><div class='add'>+# CONFIG_IDE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_RAID_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI is not set</div><div class='add'>+# CONFIG_SCSI_DMA is not set</div><div class='add'>+# CONFIG_SCSI_NETLINK is not set</div><div class='add'>+# CONFIG_ATA is not set</div><div class='add'>+# CONFIG_MD is not set</div><div class='add'>+# CONFIG_FUSION is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IEEE 1394 (FireWire) support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Enable only one of the two stacks, unless you know what you are doing</div><div class='add'>+#</div><div class='add'>+# CONFIG_FIREWIRE is not set</div><div class='add'>+# CONFIG_IEEE1394 is not set</div><div class='add'>+# CONFIG_I2O is not set</div><div class='add'>+# CONFIG_MACINTOSH_DRIVERS is not set</div><div class='add'>+CONFIG_NETDEVICES=y</div><div class='add'>+# CONFIG_DUMMY is not set</div><div class='add'>+# CONFIG_BONDING is not set</div><div class='add'>+# CONFIG_MACVLAN is not set</div><div class='add'>+# CONFIG_EQUALIZER is not set</div><div class='add'>+# CONFIG_TUN is not set</div><div class='add'>+# CONFIG_VETH is not set</div><div class='add'>+# CONFIG_ARCNET is not set</div><div class='add'>+# CONFIG_PHYLIB is not set</div><div class='add'>+CONFIG_NET_ETHERNET=y</div><div class='add'>+# CONFIG_MII is not set</div><div class='add'>+# CONFIG_HAPPYMEAL is not set</div><div class='add'>+# CONFIG_SUNGEM is not set</div><div class='add'>+# CONFIG_CASSINI is not set</div><div class='add'>+# CONFIG_NET_VENDOR_3COM is not set</div><div class='add'>+# CONFIG_NET_TULIP is not set</div><div class='add'>+# CONFIG_HP100 is not set</div><div class='add'>+CONFIG_IBM_NEW_EMAC=y</div><div class='add'>+CONFIG_IBM_NEW_EMAC_RXB=256</div><div class='add'>+CONFIG_IBM_NEW_EMAC_TXB=256</div><div class='add'>+CONFIG_IBM_NEW_EMAC_POLL_WEIGHT=32</div><div class='add'>+CONFIG_IBM_NEW_EMAC_RX_COPY_THRESHOLD=256</div><div class='add'>+CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0</div><div class='add'>+# CONFIG_IBM_NEW_EMAC_DEBUG is not set</div><div class='add'>+# CONFIG_IBM_NEW_EMAC_ZMII is not set</div><div class='add'>+# CONFIG_IBM_NEW_EMAC_RGMII is not set</div><div class='add'>+CONFIG_IBM_NEW_EMAC_TAH=y</div><div class='add'>+CONFIG_IBM_NEW_EMAC_EMAC4=y</div><div class='add'>+# CONFIG_NET_PCI is not set</div><div class='add'>+# CONFIG_B44 is not set</div><div class='add'>+# CONFIG_NETDEV_1000 is not set</div><div class='add'>+# CONFIG_NETDEV_10000 is not set</div><div class='add'>+# CONFIG_TR is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless LAN</div><div class='add'>+#</div><div class='add'>+# CONFIG_WLAN_PRE80211 is not set</div><div class='add'>+# CONFIG_WLAN_80211 is not set</div><div class='add'>+# CONFIG_IWLWIFI_LEDS is not set</div><div class='add'>+# CONFIG_WAN is not set</div><div class='add'>+# CONFIG_FDDI is not set</div><div class='add'>+# CONFIG_HIPPI is not set</div><div class='add'>+# CONFIG_PPP is not set</div><div class='add'>+# CONFIG_SLIP is not set</div><div class='add'>+# CONFIG_NETCONSOLE is not set</div><div class='add'>+# CONFIG_NETPOLL is not set</div><div class='add'>+# CONFIG_NET_POLL_CONTROLLER is not set</div><div class='add'>+# CONFIG_ISDN is not set</div><div class='add'>+# CONFIG_PHONE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_INPUT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware I/O ports</div><div class='add'>+#</div><div class='add'>+# CONFIG_SERIO is not set</div><div class='add'>+# CONFIG_GAMEPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Character devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_VT is not set</div><div class='add'>+CONFIG_DEVKMEM=y</div><div class='add'>+# CONFIG_SERIAL_NONSTANDARD is not set</div><div class='add'>+# CONFIG_NOZOMI is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Serial drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIAL_8250=y</div><div class='add'>+CONFIG_SERIAL_8250_CONSOLE=y</div><div class='add'>+# CONFIG_SERIAL_8250_PCI is not set</div><div class='add'>+CONFIG_SERIAL_8250_NR_UARTS=4</div><div class='add'>+CONFIG_SERIAL_8250_RUNTIME_UARTS=4</div><div class='add'>+CONFIG_SERIAL_8250_EXTENDED=y</div><div class='add'>+# CONFIG_SERIAL_8250_MANY_PORTS is not set</div><div class='add'>+CONFIG_SERIAL_8250_SHARE_IRQ=y</div><div class='add'>+# CONFIG_SERIAL_8250_DETECT_IRQ is not set</div><div class='add'>+# CONFIG_SERIAL_8250_RSA is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Non-8250 serial port support</div><div class='add'>+#</div><div class='add'>+# CONFIG_SERIAL_UARTLITE is not set</div><div class='add'>+CONFIG_SERIAL_CORE=y</div><div class='add'>+CONFIG_SERIAL_CORE_CONSOLE=y</div><div class='add'>+# CONFIG_SERIAL_JSM is not set</div><div class='add'>+CONFIG_SERIAL_OF_PLATFORM=y</div><div class='add'>+CONFIG_UNIX98_PTYS=y</div><div class='add'>+CONFIG_LEGACY_PTYS=y</div><div class='add'>+CONFIG_LEGACY_PTY_COUNT=256</div><div class='add'>+# CONFIG_IPMI_HANDLER is not set</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='add'>+# CONFIG_NVRAM is not set</div><div class='add'>+# CONFIG_GEN_RTC is not set</div><div class='add'>+# CONFIG_R3964 is not set</div><div class='add'>+# CONFIG_APPLICOM is not set</div><div class='add'>+# CONFIG_RAW_DRIVER is not set</div><div class='add'>+# CONFIG_TCG_TPM is not set</div><div class='add'>+CONFIG_DEVPORT=y</div><div class='add'>+# CONFIG_I2C is not set</div><div class='add'>+# CONFIG_SPI is not set</div><div class='add'>+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y</div><div class='add'>+# CONFIG_GPIOLIB is not set</div><div class='add'>+# CONFIG_W1 is not set</div><div class='add'>+# CONFIG_POWER_SUPPLY is not set</div><div class='add'>+# CONFIG_HWMON is not set</div><div class='add'>+# CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='add'>+# CONFIG_WATCHDOG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Sonics Silicon Backplane</div><div class='add'>+#</div><div class='add'>+CONFIG_SSB_POSSIBLE=y</div><div class='add'>+# CONFIG_SSB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multifunction device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='add'>+# CONFIG_MFD_SM501 is not set</div><div class='add'>+# CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia core support</div><div class='add'>+#</div><div class='add'>+# CONFIG_VIDEO_DEV is not set</div><div class='add'>+# CONFIG_DVB_CORE is not set</div><div class='add'>+# CONFIG_VIDEO_MEDIA is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_DAB=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics support</div><div class='add'>+#</div><div class='add'>+# CONFIG_AGP is not set</div><div class='add'>+# CONFIG_DRM is not set</div><div class='add'>+# CONFIG_VGASTATE is not set</div><div class='add'>+CONFIG_VIDEO_OUTPUT_CONTROL=m</div><div class='add'>+# CONFIG_FB is not set</div><div class='add'>+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Display device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DISPLAY_SUPPORT is not set</div><div class='add'>+# CONFIG_SOUND is not set</div><div class='add'>+# CONFIG_USB_SUPPORT is not set</div><div class='add'>+# CONFIG_MMC is not set</div><div class='add'>+# CONFIG_MEMSTICK is not set</div><div class='add'>+# CONFIG_NEW_LEDS is not set</div><div class='add'>+# CONFIG_ACCESSIBILITY is not set</div><div class='add'>+# CONFIG_INFINIBAND is not set</div><div class='add'>+# CONFIG_EDAC is not set</div><div class='add'>+# CONFIG_RTC_CLASS is not set</div><div class='add'>+# CONFIG_DMADEVICES is not set</div><div class='add'>+# CONFIG_UIO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# File systems</div><div class='add'>+#</div><div class='add'>+CONFIG_EXT2_FS=y</div><div class='add'>+# CONFIG_EXT2_FS_XATTR is not set</div><div class='add'>+# CONFIG_EXT2_FS_XIP is not set</div><div class='add'>+# CONFIG_EXT3_FS is not set</div><div class='add'>+# CONFIG_EXT4DEV_FS is not set</div><div class='add'>+# CONFIG_REISERFS_FS is not set</div><div class='add'>+# CONFIG_JFS_FS is not set</div><div class='add'>+# CONFIG_FS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_XFS_FS is not set</div><div class='add'>+# CONFIG_OCFS2_FS is not set</div><div class='add'>+CONFIG_DNOTIFY=y</div><div class='add'>+CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='add'>+# CONFIG_QUOTA is not set</div><div class='add'>+# CONFIG_AUTOFS_FS is not set</div><div class='add'>+# CONFIG_AUTOFS4_FS is not set</div><div class='add'>+# CONFIG_FUSE_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CD-ROM/DVD Filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ISO9660_FS is not set</div><div class='add'>+# CONFIG_UDF_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DOS/FAT/NT Filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_MSDOS_FS is not set</div><div class='add'>+# CONFIG_VFAT_FS is not set</div><div class='add'>+# CONFIG_NTFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Pseudo filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_PROC_FS=y</div><div class='add'>+CONFIG_PROC_KCORE=y</div><div class='add'>+CONFIG_PROC_SYSCTL=y</div><div class='add'>+CONFIG_SYSFS=y</div><div class='add'>+CONFIG_TMPFS=y</div><div class='add'>+# CONFIG_TMPFS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_HUGETLB_PAGE is not set</div><div class='add'>+# CONFIG_CONFIGFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ADFS_FS is not set</div><div class='add'>+# CONFIG_AFFS_FS is not set</div><div class='add'>+# CONFIG_HFS_FS is not set</div><div class='add'>+# CONFIG_HFSPLUS_FS is not set</div><div class='add'>+# CONFIG_BEFS_FS is not set</div><div class='add'>+# CONFIG_BFS_FS is not set</div><div class='add'>+# CONFIG_EFS_FS is not set</div><div class='add'>+CONFIG_CRAMFS=y</div><div class='add'>+# CONFIG_VXFS_FS is not set</div><div class='add'>+# CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='add'>+# CONFIG_HPFS_FS is not set</div><div class='add'>+# CONFIG_QNX4FS_FS is not set</div><div class='add'>+# CONFIG_ROMFS_FS is not set</div><div class='add'>+# CONFIG_SYSV_FS is not set</div><div class='add'>+# CONFIG_UFS_FS is not set</div><div class='add'>+CONFIG_NETWORK_FILESYSTEMS=y</div><div class='add'>+CONFIG_NFS_FS=y</div><div class='add'>+CONFIG_NFS_V3=y</div><div class='add'>+# CONFIG_NFS_V3_ACL is not set</div><div class='add'>+# CONFIG_NFS_V4 is not set</div><div class='add'>+CONFIG_ROOT_NFS=y</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='add'>+CONFIG_LOCKD=y</div><div class='add'>+CONFIG_LOCKD_V4=y</div><div class='add'>+CONFIG_NFS_COMMON=y</div><div class='add'>+CONFIG_SUNRPC=y</div><div class='add'>+# CONFIG_RPCSEC_GSS_KRB5 is not set</div><div class='add'>+# CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='add'>+# CONFIG_SMB_FS is not set</div><div class='add'>+# CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_NCP_FS is not set</div><div class='add'>+# CONFIG_CODA_FS is not set</div><div class='add'>+# CONFIG_AFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Partition Types</div><div class='add'>+#</div><div class='add'>+# CONFIG_PARTITION_ADVANCED is not set</div><div class='add'>+CONFIG_MSDOS_PARTITION=y</div><div class='add'>+# CONFIG_NLS is not set</div><div class='add'>+# CONFIG_DLM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Library routines</div><div class='add'>+#</div><div class='add'>+CONFIG_BITREVERSE=y</div><div class='add'>+# CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='add'>+# CONFIG_CRC_CCITT is not set</div><div class='add'>+# CONFIG_CRC16 is not set</div><div class='add'>+# CONFIG_CRC_T10DIF is not set</div><div class='add'>+# CONFIG_CRC_ITU_T is not set</div><div class='add'>+CONFIG_CRC32=y</div><div class='add'>+# CONFIG_CRC7 is not set</div><div class='add'>+# CONFIG_LIBCRC32C is not set</div><div class='add'>+CONFIG_ZLIB_INFLATE=y</div><div class='add'>+CONFIG_PLIST=y</div><div class='add'>+CONFIG_HAS_IOMEM=y</div><div class='add'>+CONFIG_HAS_IOPORT=y</div><div class='add'>+CONFIG_HAS_DMA=y</div><div class='add'>+CONFIG_HAVE_LMB=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel hacking</div><div class='add'>+#</div><div class='add'>+# CONFIG_PRINTK_TIME is not set</div><div class='add'>+CONFIG_ENABLE_WARN_DEPRECATED=y</div><div class='add'>+CONFIG_ENABLE_MUST_CHECK=y</div><div class='add'>+CONFIG_FRAME_WARN=1024</div><div class='add'>+CONFIG_MAGIC_SYSRQ=y</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='add'>+CONFIG_DEBUG_FS=y</div><div class='add'>+# CONFIG_HEADERS_CHECK is not set</div><div class='add'>+CONFIG_DEBUG_KERNEL=y</div><div class='add'>+# CONFIG_DEBUG_SHIRQ is not set</div><div class='add'>+CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set</div><div class='add'>+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0</div><div class='add'>+CONFIG_SCHED_DEBUG=y</div><div class='add'>+# CONFIG_SCHEDSTATS is not set</div><div class='add'>+# CONFIG_TIMER_STATS is not set</div><div class='add'>+# CONFIG_DEBUG_OBJECTS is not set</div><div class='add'>+# CONFIG_SLUB_DEBUG_ON is not set</div><div class='add'>+# CONFIG_SLUB_STATS is not set</div><div class='add'>+# CONFIG_DEBUG_RT_MUTEXES is not set</div><div class='add'>+# CONFIG_RT_MUTEX_TESTER is not set</div><div class='add'>+# CONFIG_DEBUG_SPINLOCK is not set</div><div class='add'>+# CONFIG_DEBUG_MUTEXES is not set</div><div class='add'>+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set</div><div class='add'>+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set</div><div class='add'>+# CONFIG_DEBUG_KOBJECT is not set</div><div class='add'>+# CONFIG_DEBUG_BUGVERBOSE is not set</div><div class='add'>+# CONFIG_DEBUG_INFO is not set</div><div class='add'>+# CONFIG_DEBUG_VM is not set</div><div class='add'>+# CONFIG_DEBUG_WRITECOUNT is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='add'>+# CONFIG_DEBUG_LIST is not set</div><div class='add'>+# CONFIG_DEBUG_SG is not set</div><div class='add'>+# CONFIG_BOOT_PRINTK_DELAY is not set</div><div class='add'>+# CONFIG_RCU_TORTURE_TEST is not set</div><div class='add'>+# CONFIG_BACKTRACE_SELF_TEST is not set</div><div class='add'>+# CONFIG_FAULT_INJECTION is not set</div><div class='add'>+# CONFIG_LATENCYTOP is not set</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='add'>+# CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='add'>+# CONFIG_KGDB is not set</div><div class='add'>+# CONFIG_DEBUG_STACKOVERFLOW is not set</div><div class='add'>+# CONFIG_DEBUG_STACK_USAGE is not set</div><div class='add'>+# CONFIG_DEBUG_PAGEALLOC is not set</div><div class='add'>+# CONFIG_CODE_PATCHING_SELFTEST is not set</div><div class='add'>+# CONFIG_FTR_FIXUP_SELFTEST is not set</div><div class='add'>+# CONFIG_MSI_BITMAP_SELFTEST is not set</div><div class='add'>+# CONFIG_XMON is not set</div><div class='add'>+# CONFIG_IRQSTACKS is not set</div><div class='add'>+# CONFIG_VIRQ_DEBUG is not set</div><div class='add'>+# CONFIG_BDI_SWITCH is not set</div><div class='add'>+# CONFIG_PPC_EARLY_DEBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Security options</div><div class='add'>+#</div><div class='add'>+# CONFIG_KEYS is not set</div><div class='add'>+# CONFIG_SECURITY is not set</div><div class='add'>+# CONFIG_SECURITY_FILE_CAPABILITIES is not set</div><div class='add'>+# CONFIG_CRYPTO is not set</div><div class='add'>+# CONFIG_PPC_CLOCK is not set</div><div class='add'>+# CONFIG_VIRTUALIZATION is not set</div><div class='head'>diff --git a/arch/powerpc/configs/83xx/asp8347_defconfig b/arch/powerpc/configs/83xx/asp8347_defconfig<br/>index 5e6780a088ce..0b1fa20f745c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/configs/83xx/asp8347_defconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/configs/83xx/asp8347_defconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/configs/83xx/asp8347_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/configs/83xx/asp8347_defconfig</a></div><div class='hunk'>@@ -164,11 +164,11 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> #</div><div class='ctx'> CONFIG_PPC_MULTIPLATFORM=y</div><div class='ctx'> CONFIG_CLASSIC32=y</div><div class='del'>-CONFIG_PPC_CHRP=y</div><div class='add'>+# CONFIG_PPC_CHRP is not set</div><div class='add'>+# CONFIG_PPC_PMAC is not set</div><div class='ctx'> # CONFIG_MPC5121_ADS is not set</div><div class='ctx'> # CONFIG_MPC5121_GENERIC is not set</div><div class='ctx'> # CONFIG_PPC_MPC52xx is not set</div><div class='del'>-CONFIG_PPC_PMAC=y</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='ctx'> # CONFIG_PPC_82xx is not set</div><div class='head'>diff --git a/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig b/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig<br/>index 2028337868b4..b7eae2bdf19c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/configs/83xx/mpc8313_rdb_defconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/configs/83xx/mpc8313_rdb_defconfig</a></div><div class='hunk'>@@ -163,11 +163,11 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> #</div><div class='ctx'> CONFIG_PPC_MULTIPLATFORM=y</div><div class='ctx'> CONFIG_CLASSIC32=y</div><div class='del'>-CONFIG_PPC_CHRP=y</div><div class='add'>+# CONFIG_PPC_CHRP is not set</div><div class='add'>+# CONFIG_PPC_PMAC is not set</div><div class='ctx'> # CONFIG_MPC5121_ADS is not set</div><div class='ctx'> # CONFIG_MPC5121_GENERIC is not set</div><div class='ctx'> # CONFIG_PPC_MPC52xx is not set</div><div class='del'>-CONFIG_PPC_PMAC=y</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='ctx'> # CONFIG_PPC_82xx is not set</div><div class='head'>diff --git a/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig b/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig<br/>index dd80eb0a87a1..b0a27a67d8c7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/configs/83xx/mpc8315_rdb_defconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/configs/83xx/mpc8315_rdb_defconfig</a></div><div class='hunk'>@@ -163,11 +163,11 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> #</div><div class='ctx'> CONFIG_PPC_MULTIPLATFORM=y</div><div class='ctx'> CONFIG_CLASSIC32=y</div><div class='del'>-CONFIG_PPC_CHRP=y</div><div class='add'>+# CONFIG_PPC_CHRP is not set</div><div class='add'>+# CONFIG_PPC_PMAC is not set</div><div class='ctx'> # CONFIG_MPC5121_ADS is not set</div><div class='ctx'> # CONFIG_MPC5121_GENERIC is not set</div><div class='ctx'> # CONFIG_PPC_MPC52xx is not set</div><div class='del'>-CONFIG_PPC_PMAC=y</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='ctx'> # CONFIG_PPC_82xx is not set</div><div class='head'>diff --git a/arch/powerpc/configs/83xx/mpc832x_mds_defconfig b/arch/powerpc/configs/83xx/mpc832x_mds_defconfig<br/>index bdf50c8a17e6..ad825bcddd1f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/configs/83xx/mpc832x_mds_defconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/configs/83xx/mpc832x_mds_defconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/configs/83xx/mpc832x_mds_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/configs/83xx/mpc832x_mds_defconfig</a></div><div class='hunk'>@@ -163,11 +163,11 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> #</div><div class='ctx'> CONFIG_PPC_MULTIPLATFORM=y</div><div class='ctx'> CONFIG_CLASSIC32=y</div><div class='del'>-CONFIG_PPC_CHRP=y</div><div class='add'>+# CONFIG_PPC_CHRP is not set</div><div class='add'>+# CONFIG_PPC_PMAC is not set</div><div class='ctx'> # CONFIG_MPC5121_ADS is not set</div><div class='ctx'> # CONFIG_MPC5121_GENERIC is not set</div><div class='ctx'> # CONFIG_PPC_MPC52xx is not set</div><div class='del'>-CONFIG_PPC_PMAC=y</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='ctx'> # CONFIG_PPC_82xx is not set</div><div class='head'>diff --git a/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig b/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig<br/>index 4eef8c95480e..38267501f44d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/configs/83xx/mpc832x_rdb_defconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/configs/83xx/mpc832x_rdb_defconfig</a></div><div class='hunk'>@@ -163,11 +163,11 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> #</div><div class='ctx'> CONFIG_PPC_MULTIPLATFORM=y</div><div class='ctx'> CONFIG_CLASSIC32=y</div><div class='del'>-CONFIG_PPC_CHRP=y</div><div class='add'>+# CONFIG_PPC_CHRP is not set</div><div class='add'>+# CONFIG_PPC_PMAC is not set</div><div class='ctx'> # CONFIG_MPC5121_ADS is not set</div><div class='ctx'> # CONFIG_MPC5121_GENERIC is not set</div><div class='ctx'> # CONFIG_PPC_MPC52xx is not set</div><div class='del'>-CONFIG_PPC_PMAC=y</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='ctx'> # CONFIG_PPC_82xx is not set</div><div class='head'>diff --git a/arch/powerpc/configs/83xx/mpc834x_itx_defconfig b/arch/powerpc/configs/83xx/mpc834x_itx_defconfig<br/>index 8d6513931850..90aab340e7ff 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/configs/83xx/mpc834x_itx_defconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/configs/83xx/mpc834x_itx_defconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/configs/83xx/mpc834x_itx_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/configs/83xx/mpc834x_itx_defconfig</a></div><div class='hunk'>@@ -163,11 +163,11 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> #</div><div class='ctx'> CONFIG_PPC_MULTIPLATFORM=y</div><div class='ctx'> CONFIG_CLASSIC32=y</div><div class='del'>-CONFIG_PPC_CHRP=y</div><div class='add'>+# CONFIG_PPC_CHRP is not set</div><div class='add'>+# CONFIG_PPC_PMAC is not set</div><div class='ctx'> # CONFIG_MPC5121_ADS is not set</div><div class='ctx'> # CONFIG_MPC5121_GENERIC is not set</div><div class='ctx'> # CONFIG_PPC_MPC52xx is not set</div><div class='del'>-CONFIG_PPC_PMAC=y</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='ctx'> # CONFIG_PPC_82xx is not set</div><div class='head'>diff --git a/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig b/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig<br/>index a8afa39d6f76..7458a242d251 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig</a></div><div class='hunk'>@@ -163,11 +163,11 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> #</div><div class='ctx'> CONFIG_PPC_MULTIPLATFORM=y</div><div class='ctx'> CONFIG_CLASSIC32=y</div><div class='del'>-CONFIG_PPC_CHRP=y</div><div class='add'>+# CONFIG_PPC_CHRP is not set</div><div class='add'>+# CONFIG_PPC_PMAC is not set</div><div class='ctx'> # CONFIG_MPC5121_ADS is not set</div><div class='ctx'> # CONFIG_MPC5121_GENERIC is not set</div><div class='ctx'> # CONFIG_PPC_MPC52xx is not set</div><div class='del'>-CONFIG_PPC_PMAC=y</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='ctx'> # CONFIG_PPC_82xx is not set</div><div class='head'>diff --git a/arch/powerpc/configs/83xx/mpc834x_mds_defconfig b/arch/powerpc/configs/83xx/mpc834x_mds_defconfig<br/>index 24c320a36670..1a92798938cf 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/configs/83xx/mpc834x_mds_defconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/configs/83xx/mpc834x_mds_defconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/configs/83xx/mpc834x_mds_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/configs/83xx/mpc834x_mds_defconfig</a></div><div class='hunk'>@@ -163,11 +163,11 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> #</div><div class='ctx'> CONFIG_PPC_MULTIPLATFORM=y</div><div class='ctx'> CONFIG_CLASSIC32=y</div><div class='del'>-CONFIG_PPC_CHRP=y</div><div class='add'>+# CONFIG_PPC_CHRP is not set</div><div class='add'>+# CONFIG_PPC_PMAC is not set</div><div class='ctx'> # CONFIG_MPC5121_ADS is not set</div><div class='ctx'> # CONFIG_MPC5121_GENERIC is not set</div><div class='ctx'> # CONFIG_PPC_MPC52xx is not set</div><div class='del'>-CONFIG_PPC_PMAC=y</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='ctx'> # CONFIG_PPC_82xx is not set</div><div class='head'>diff --git a/arch/powerpc/configs/83xx/mpc836x_mds_defconfig b/arch/powerpc/configs/83xx/mpc836x_mds_defconfig<br/>index e029e9e14622..03d8cede0272 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/configs/83xx/mpc836x_mds_defconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/configs/83xx/mpc836x_mds_defconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/configs/83xx/mpc836x_mds_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/configs/83xx/mpc836x_mds_defconfig</a></div><div class='hunk'>@@ -163,11 +163,11 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> #</div><div class='ctx'> CONFIG_PPC_MULTIPLATFORM=y</div><div class='ctx'> CONFIG_CLASSIC32=y</div><div class='del'>-CONFIG_PPC_CHRP=y</div><div class='add'>+# CONFIG_PPC_CHRP is not set</div><div class='add'>+# CONFIG_PPC_PMAC is not set</div><div class='ctx'> # CONFIG_MPC5121_ADS is not set</div><div class='ctx'> # CONFIG_MPC5121_GENERIC is not set</div><div class='ctx'> # CONFIG_PPC_MPC52xx is not set</div><div class='del'>-CONFIG_PPC_PMAC=y</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='ctx'> # CONFIG_PPC_82xx is not set</div><div class='hunk'>@@ -383,7 +383,84 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> # CONFIG_FW_LOADER is not set</div><div class='ctx'> # CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> # CONFIG_CONNECTOR is not set</div><div class='del'>-# CONFIG_MTD is not set</div><div class='add'>+CONFIG_MTD=y</div><div class='add'>+# CONFIG_MTD_DEBUG is not set</div><div class='add'>+# CONFIG_MTD_CONCAT is not set</div><div class='add'>+CONFIG_MTD_PARTITIONS=y</div><div class='add'>+# CONFIG_MTD_REDBOOT_PARTS is not set</div><div class='add'>+CONFIG_MTD_CMDLINE_PARTS=y</div><div class='add'>+# CONFIG_MTD_OF_PARTS is not set</div><div class='add'>+# CONFIG_MTD_AR7_PARTS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# User Modules And Translation Layers</div><div class='add'>+#</div><div class='add'>+CONFIG_MTD_CHAR=y</div><div class='add'>+CONFIG_MTD_BLKDEVS=y</div><div class='add'>+CONFIG_MTD_BLOCK=y</div><div class='add'>+# CONFIG_FTL is not set</div><div class='add'>+# CONFIG_NFTL is not set</div><div class='add'>+# CONFIG_INFTL is not set</div><div class='add'>+# CONFIG_RFD_FTL is not set</div><div class='add'>+# CONFIG_SSFDC is not set</div><div class='add'>+# CONFIG_MTD_OOPS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# RAM/ROM/Flash chip drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_MTD_CFI=y</div><div class='add'>+# CONFIG_MTD_JEDECPROBE is not set</div><div class='add'>+CONFIG_MTD_GEN_PROBE=y</div><div class='add'>+# CONFIG_MTD_CFI_ADV_OPTIONS is not set</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_1=y</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_2=y</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_4=y</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set</div><div class='add'>+CONFIG_MTD_CFI_I1=y</div><div class='add'>+CONFIG_MTD_CFI_I2=y</div><div class='add'>+# CONFIG_MTD_CFI_I4 is not set</div><div class='add'>+# CONFIG_MTD_CFI_I8 is not set</div><div class='add'>+# CONFIG_MTD_CFI_INTELEXT is not set</div><div class='add'>+CONFIG_MTD_CFI_AMDSTD=y</div><div class='add'>+# CONFIG_MTD_CFI_STAA is not set</div><div class='add'>+CONFIG_MTD_CFI_UTIL=y</div><div class='add'>+# CONFIG_MTD_RAM is not set</div><div class='add'>+# CONFIG_MTD_ROM is not set</div><div class='add'>+# CONFIG_MTD_ABSENT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Mapping drivers for chip access</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_COMPLEX_MAPPINGS is not set</div><div class='add'>+# CONFIG_MTD_PHYSMAP is not set</div><div class='add'>+CONFIG_MTD_PHYSMAP_OF=y</div><div class='add'>+# CONFIG_MTD_INTEL_VR_NOR is not set</div><div class='add'>+# CONFIG_MTD_PLATRAM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Self-contained MTD device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_PMC551 is not set</div><div class='add'>+# CONFIG_MTD_SLRAM is not set</div><div class='add'>+# CONFIG_MTD_PHRAM is not set</div><div class='add'>+# CONFIG_MTD_MTDRAM is not set</div><div class='add'>+# CONFIG_MTD_BLOCK2MTD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Disk-On-Chip Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_DOC2000 is not set</div><div class='add'>+# CONFIG_MTD_DOC2001 is not set</div><div class='add'>+# CONFIG_MTD_DOC2001PLUS is not set</div><div class='add'>+# CONFIG_MTD_NAND is not set</div><div class='add'>+# CONFIG_MTD_ONENAND is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# UBI - Unsorted block images</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_UBI is not set</div><div class='ctx'> CONFIG_OF_DEVICE=y</div><div class='ctx'> CONFIG_OF_I2C=y</div><div class='ctx'> # CONFIG_PARPORT is not set</div><div class='head'>diff --git a/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig b/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig<br/>index 7d674be702fe..cdf84177370a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/configs/83xx/mpc836x_rdk_defconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/configs/83xx/mpc836x_rdk_defconfig</a></div><div class='hunk'>@@ -164,11 +164,11 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> #</div><div class='ctx'> CONFIG_PPC_MULTIPLATFORM=y</div><div class='ctx'> CONFIG_CLASSIC32=y</div><div class='del'>-CONFIG_PPC_CHRP=y</div><div class='add'>+# CONFIG_PPC_CHRP is not set</div><div class='add'>+# CONFIG_PPC_PMAC is not set</div><div class='ctx'> # CONFIG_MPC5121_ADS is not set</div><div class='ctx'> # CONFIG_MPC5121_GENERIC is not set</div><div class='ctx'> # CONFIG_PPC_MPC52xx is not set</div><div class='del'>-CONFIG_PPC_PMAC=y</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='ctx'> # CONFIG_PPC_82xx is not set</div><div class='head'>diff --git a/arch/powerpc/configs/83xx/mpc837x_mds_defconfig b/arch/powerpc/configs/83xx/mpc837x_mds_defconfig<br/>index de472022aa81..97e02d7a5b09 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/configs/83xx/mpc837x_mds_defconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/configs/83xx/mpc837x_mds_defconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/configs/83xx/mpc837x_mds_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/configs/83xx/mpc837x_mds_defconfig</a></div><div class='hunk'>@@ -164,11 +164,11 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> #</div><div class='ctx'> CONFIG_PPC_MULTIPLATFORM=y</div><div class='ctx'> CONFIG_CLASSIC32=y</div><div class='del'>-CONFIG_PPC_CHRP=y</div><div class='add'>+# CONFIG_PPC_CHRP is not set</div><div class='add'>+# CONFIG_PPC_PMAC is not set</div><div class='ctx'> # CONFIG_MPC5121_ADS is not set</div><div class='ctx'> # CONFIG_MPC5121_GENERIC is not set</div><div class='ctx'> # CONFIG_PPC_MPC52xx is not set</div><div class='del'>-CONFIG_PPC_PMAC=y</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='ctx'> # CONFIG_PPC_82xx is not set</div><div class='head'>diff --git a/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig b/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig<br/>index e8d2d691d26c..5ac33054ce2c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/configs/83xx/mpc837x_rdb_defconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/configs/83xx/mpc837x_rdb_defconfig</a></div><div class='hunk'>@@ -164,11 +164,11 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> #</div><div class='ctx'> CONFIG_PPC_MULTIPLATFORM=y</div><div class='ctx'> CONFIG_CLASSIC32=y</div><div class='del'>-CONFIG_PPC_CHRP=y</div><div class='add'>+# CONFIG_PPC_CHRP is not set</div><div class='add'>+# CONFIG_PPC_PMAC is not set</div><div class='ctx'> # CONFIG_MPC5121_ADS is not set</div><div class='ctx'> # CONFIG_MPC5121_GENERIC is not set</div><div class='ctx'> # CONFIG_PPC_MPC52xx is not set</div><div class='del'>-CONFIG_PPC_PMAC=y</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='ctx'> # CONFIG_PPC_82xx is not set</div><div class='head'>diff --git a/arch/powerpc/configs/83xx/sbc834x_defconfig b/arch/powerpc/configs/83xx/sbc834x_defconfig<br/>index 9245a67da200..c359cc2a380e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/configs/83xx/sbc834x_defconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/configs/83xx/sbc834x_defconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/configs/83xx/sbc834x_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/configs/83xx/sbc834x_defconfig</a></div><div class='hunk'>@@ -162,11 +162,11 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> #</div><div class='ctx'> CONFIG_PPC_MULTIPLATFORM=y</div><div class='ctx'> CONFIG_CLASSIC32=y</div><div class='del'>-CONFIG_PPC_CHRP=y</div><div class='add'>+# CONFIG_PPC_CHRP is not set</div><div class='add'>+# CONFIG_PPC_PMAC is not set</div><div class='ctx'> # CONFIG_MPC5121_ADS is not set</div><div class='ctx'> # CONFIG_MPC5121_GENERIC is not set</div><div class='ctx'> # CONFIG_PPC_MPC52xx is not set</div><div class='del'>-CONFIG_PPC_PMAC=y</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='ctx'> # CONFIG_PPC_82xx is not set</div><div class='head'>diff --git a/arch/powerpc/configs/86xx/gef_sbc610_defconfig b/arch/powerpc/configs/86xx/gef_sbc610_defconfig<br/>new file mode 100644<br/>index 000000000000..312d7afbbe44<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/configs/86xx/gef_sbc610_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/configs/86xx/gef_sbc610_defconfig</a></div><div class='hunk'>@@ -0,0 +1,1657 @@</div><div class='add'>+#</div><div class='add'>+# Automatically generated make config: don't edit</div><div class='add'>+# Linux kernel version: 2.6.26-rc5</div><div class='add'>+# Wed Jun 11 12:06:53 2008</div><div class='add'>+#</div><div class='add'>+# CONFIG_PPC64 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Processor support</div><div class='add'>+#</div><div class='add'>+CONFIG_6xx=y</div><div class='add'>+# CONFIG_PPC_85xx is not set</div><div class='add'>+# CONFIG_PPC_8xx is not set</div><div class='add'>+# CONFIG_40x is not set</div><div class='add'>+# CONFIG_44x is not set</div><div class='add'>+# CONFIG_E200 is not set</div><div class='add'>+CONFIG_PPC_FPU=y</div><div class='add'>+CONFIG_ALTIVEC=y</div><div class='add'>+CONFIG_PPC_STD_MMU=y</div><div class='add'>+CONFIG_PPC_STD_MMU_32=y</div><div class='add'>+# CONFIG_PPC_MM_SLICES is not set</div><div class='add'>+CONFIG_SMP=y</div><div class='add'>+CONFIG_NR_CPUS=2</div><div class='add'>+CONFIG_PPC32=y</div><div class='add'>+CONFIG_WORD_SIZE=32</div><div class='add'>+CONFIG_PPC_MERGE=y</div><div class='add'>+CONFIG_MMU=y</div><div class='add'>+CONFIG_GENERIC_CMOS_UPDATE=y</div><div class='add'>+CONFIG_GENERIC_TIME=y</div><div class='add'>+CONFIG_GENERIC_TIME_VSYSCALL=y</div><div class='add'>+CONFIG_GENERIC_CLOCKEVENTS=y</div><div class='add'>+CONFIG_GENERIC_HARDIRQS=y</div><div class='add'>+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set</div><div class='add'>+CONFIG_IRQ_PER_CPU=y</div><div class='add'>+CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_LOCKDEP_SUPPORT=y</div><div class='add'>+CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='add'>+CONFIG_GENERIC_LOCKBREAK=y</div><div class='add'>+CONFIG_ARCH_HAS_ILOG2_U32=y</div><div class='add'>+CONFIG_GENERIC_HWEIGHT=y</div><div class='add'>+CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='add'>+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set</div><div class='add'>+CONFIG_PPC=y</div><div class='add'>+CONFIG_EARLY_PRINTK=y</div><div class='add'>+CONFIG_GENERIC_NVRAM=y</div><div class='add'>+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y</div><div class='add'>+CONFIG_ARCH_MAY_HAVE_PC_FDC=y</div><div class='add'>+CONFIG_PPC_OF=y</div><div class='add'>+CONFIG_OF=y</div><div class='add'>+CONFIG_PPC_UDBG_16550=y</div><div class='add'>+CONFIG_GENERIC_TBSYNC=y</div><div class='add'>+CONFIG_AUDIT_ARCH=y</div><div class='add'>+CONFIG_GENERIC_BUG=y</div><div class='add'>+CONFIG_DEFAULT_UIMAGE=y</div><div class='add'>+# CONFIG_PPC_DCR_NATIVE is not set</div><div class='add'>+# CONFIG_PPC_DCR_MMIO is not set</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# General setup</div><div class='add'>+#</div><div class='add'>+CONFIG_EXPERIMENTAL=y</div><div class='add'>+CONFIG_LOCK_KERNEL=y</div><div class='add'>+CONFIG_INIT_ENV_ARG_LIMIT=32</div><div class='add'>+CONFIG_LOCALVERSION=""</div><div class='add'>+CONFIG_LOCALVERSION_AUTO=y</div><div class='add'>+CONFIG_SWAP=y</div><div class='add'>+CONFIG_SYSVIPC=y</div><div class='add'>+CONFIG_SYSVIPC_SYSCTL=y</div><div class='add'>+CONFIG_POSIX_MQUEUE=y</div><div class='add'>+CONFIG_BSD_PROCESS_ACCT=y</div><div class='add'>+CONFIG_BSD_PROCESS_ACCT_V3=y</div><div class='add'>+# CONFIG_TASKSTATS is not set</div><div class='add'>+# CONFIG_AUDIT is not set</div><div class='add'>+CONFIG_IKCONFIG=y</div><div class='add'>+CONFIG_IKCONFIG_PROC=y</div><div class='add'>+CONFIG_LOG_BUF_SHIFT=14</div><div class='add'>+# CONFIG_CGROUPS is not set</div><div class='add'>+CONFIG_GROUP_SCHED=y</div><div class='add'>+CONFIG_FAIR_GROUP_SCHED=y</div><div class='add'>+# CONFIG_RT_GROUP_SCHED is not set</div><div class='add'>+CONFIG_USER_SCHED=y</div><div class='add'>+# CONFIG_CGROUP_SCHED is not set</div><div class='add'>+CONFIG_SYSFS_DEPRECATED=y</div><div class='add'>+CONFIG_SYSFS_DEPRECATED_V2=y</div><div class='add'>+CONFIG_RELAY=y</div><div class='add'>+# CONFIG_NAMESPACES is not set</div><div class='add'>+CONFIG_BLK_DEV_INITRD=y</div><div class='add'>+CONFIG_INITRAMFS_SOURCE=""</div><div class='add'>+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set</div><div class='add'>+CONFIG_SYSCTL=y</div><div class='add'>+CONFIG_EMBEDDED=y</div><div class='add'>+CONFIG_SYSCTL_SYSCALL=y</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='add'>+CONFIG_KALLSYMS=y</div><div class='add'>+# CONFIG_KALLSYMS_ALL is not set</div><div class='add'>+# CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='add'>+CONFIG_HOTPLUG=y</div><div class='add'>+CONFIG_PRINTK=y</div><div class='add'>+CONFIG_BUG=y</div><div class='add'>+CONFIG_ELF_CORE=y</div><div class='add'>+CONFIG_COMPAT_BRK=y</div><div class='add'>+CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_FUTEX=y</div><div class='add'>+CONFIG_ANON_INODES=y</div><div class='add'>+CONFIG_EPOLL=y</div><div class='add'>+CONFIG_SIGNALFD=y</div><div class='add'>+CONFIG_TIMERFD=y</div><div class='add'>+CONFIG_EVENTFD=y</div><div class='add'>+CONFIG_SHMEM=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='add'>+CONFIG_SLAB=y</div><div class='add'>+# CONFIG_SLUB is not set</div><div class='add'>+# CONFIG_SLOB is not set</div><div class='add'>+# CONFIG_PROFILING is not set</div><div class='add'>+# CONFIG_MARKERS is not set</div><div class='add'>+CONFIG_HAVE_OPROFILE=y</div><div class='add'>+# CONFIG_KPROBES is not set</div><div class='add'>+CONFIG_HAVE_KPROBES=y</div><div class='add'>+CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+# CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+CONFIG_SLABINFO=y</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='add'>+# CONFIG_TINY_SHMEM is not set</div><div class='add'>+CONFIG_BASE_SMALL=0</div><div class='add'>+CONFIG_MODULES=y</div><div class='add'>+# CONFIG_MODULE_FORCE_LOAD is not set</div><div class='add'>+CONFIG_MODULE_UNLOAD=y</div><div class='add'>+# CONFIG_MODULE_FORCE_UNLOAD is not set</div><div class='add'>+# CONFIG_MODVERSIONS is not set</div><div class='add'>+# CONFIG_MODULE_SRCVERSION_ALL is not set</div><div class='add'>+CONFIG_KMOD=y</div><div class='add'>+CONFIG_STOP_MACHINE=y</div><div class='add'>+CONFIG_BLOCK=y</div><div class='add'>+# CONFIG_LBD is not set</div><div class='add'>+# CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='add'>+# CONFIG_LSF is not set</div><div class='add'>+# CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IO Schedulers</div><div class='add'>+#</div><div class='add'>+CONFIG_IOSCHED_NOOP=y</div><div class='add'>+CONFIG_IOSCHED_AS=y</div><div class='add'>+CONFIG_IOSCHED_DEADLINE=y</div><div class='add'>+CONFIG_IOSCHED_CFQ=y</div><div class='add'>+# CONFIG_DEFAULT_AS is not set</div><div class='add'>+# CONFIG_DEFAULT_DEADLINE is not set</div><div class='add'>+CONFIG_DEFAULT_CFQ=y</div><div class='add'>+# CONFIG_DEFAULT_NOOP is not set</div><div class='add'>+CONFIG_DEFAULT_IOSCHED="cfq"</div><div class='add'>+CONFIG_CLASSIC_RCU=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Platform support</div><div class='add'>+#</div><div class='add'>+CONFIG_PPC_MULTIPLATFORM=y</div><div class='add'>+CONFIG_CLASSIC32=y</div><div class='add'>+# CONFIG_PPC_CHRP is not set</div><div class='add'>+# CONFIG_PPC_PMAC is not set</div><div class='add'>+# CONFIG_PPC_82xx is not set</div><div class='add'>+# CONFIG_PPC_83xx is not set</div><div class='add'>+CONFIG_PPC_86xx=y</div><div class='add'>+# CONFIG_PPC_MPC512x is not set</div><div class='add'>+# CONFIG_PPC_MPC5121 is not set</div><div class='add'>+# CONFIG_PPC_CELL is not set</div><div class='add'>+# CONFIG_PPC_CELL_NATIVE is not set</div><div class='add'>+# CONFIG_PQ2ADS is not set</div><div class='add'>+# CONFIG_MPC8641_HPCN is not set</div><div class='add'>+# CONFIG_SBC8641D is not set</div><div class='add'>+# CONFIG_MPC8610_HPCD is not set</div><div class='add'>+CONFIG_GEF_SBC610=y</div><div class='add'>+CONFIG_MPC8641=y</div><div class='add'>+# CONFIG_IPIC is not set</div><div class='add'>+CONFIG_MPIC=y</div><div class='add'>+# CONFIG_MPIC_WEIRD is not set</div><div class='add'>+# CONFIG_PPC_I8259 is not set</div><div class='add'>+# CONFIG_PPC_RTAS is not set</div><div class='add'>+# CONFIG_MMIO_NVRAM is not set</div><div class='add'>+# CONFIG_PPC_MPC106 is not set</div><div class='add'>+# CONFIG_PPC_970_NAP is not set</div><div class='add'>+# CONFIG_PPC_INDIRECT_IO is not set</div><div class='add'>+# CONFIG_GENERIC_IOMAP is not set</div><div class='add'>+# CONFIG_CPU_FREQ is not set</div><div class='add'>+# CONFIG_FSL_ULI1575 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel options</div><div class='add'>+#</div><div class='add'>+# CONFIG_HIGHMEM is not set</div><div class='add'>+CONFIG_TICK_ONESHOT=y</div><div class='add'>+# CONFIG_NO_HZ is not set</div><div class='add'>+CONFIG_HIGH_RES_TIMERS=y</div><div class='add'>+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y</div><div class='add'>+# CONFIG_HZ_100 is not set</div><div class='add'>+# CONFIG_HZ_250 is not set</div><div class='add'>+# CONFIG_HZ_300 is not set</div><div class='add'>+CONFIG_HZ_1000=y</div><div class='add'>+CONFIG_HZ=1000</div><div class='add'>+# CONFIG_SCHED_HRTICK is not set</div><div class='add'>+# CONFIG_PREEMPT_NONE is not set</div><div class='add'>+# CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='add'>+CONFIG_PREEMPT=y</div><div class='add'>+# CONFIG_PREEMPT_RCU is not set</div><div class='add'>+CONFIG_BINFMT_ELF=y</div><div class='add'>+CONFIG_BINFMT_MISC=m</div><div class='add'>+# CONFIG_IOMMU_HELPER is not set</div><div class='add'>+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y</div><div class='add'>+CONFIG_ARCH_HAS_WALK_MEMORY=y</div><div class='add'>+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y</div><div class='add'>+CONFIG_IRQ_ALL_CPUS=y</div><div class='add'>+CONFIG_ARCH_FLATMEM_ENABLE=y</div><div class='add'>+CONFIG_ARCH_POPULATES_NODE_MAP=y</div><div class='add'>+CONFIG_SELECT_MEMORY_MODEL=y</div><div class='add'>+CONFIG_FLATMEM_MANUAL=y</div><div class='add'>+# CONFIG_DISCONTIGMEM_MANUAL is not set</div><div class='add'>+# CONFIG_SPARSEMEM_MANUAL is not set</div><div class='add'>+CONFIG_FLATMEM=y</div><div class='add'>+CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='add'>+# CONFIG_SPARSEMEM_STATIC is not set</div><div class='add'>+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='add'>+CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='add'>+CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+CONFIG_ZONE_DMA_FLAG=1</div><div class='add'>+CONFIG_BOUNCE=y</div><div class='add'>+CONFIG_VIRT_TO_BUS=y</div><div class='add'>+CONFIG_FORCE_MAX_ZONEORDER=11</div><div class='add'>+# CONFIG_PROC_DEVICETREE is not set</div><div class='add'>+# CONFIG_CMDLINE_BOOL is not set</div><div class='add'>+# CONFIG_PM is not set</div><div class='add'>+CONFIG_SECCOMP=y</div><div class='add'>+CONFIG_ISA_DMA_API=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Bus options</div><div class='add'>+#</div><div class='add'>+CONFIG_ZONE_DMA=y</div><div class='add'>+CONFIG_GENERIC_ISA_DMA=y</div><div class='add'>+CONFIG_PPC_INDIRECT_PCI=y</div><div class='add'>+CONFIG_FSL_SOC=y</div><div class='add'>+CONFIG_FSL_PCI=y</div><div class='add'>+CONFIG_PCI=y</div><div class='add'>+CONFIG_PCI_DOMAINS=y</div><div class='add'>+CONFIG_PCI_SYSCALL=y</div><div class='add'>+CONFIG_PCIEPORTBUS=y</div><div class='add'>+CONFIG_PCIEAER=y</div><div class='add'>+# CONFIG_PCIEASPM is not set</div><div class='add'>+CONFIG_ARCH_SUPPORTS_MSI=y</div><div class='add'>+# CONFIG_PCI_MSI is not set</div><div class='add'>+CONFIG_PCI_LEGACY=y</div><div class='add'>+CONFIG_PCI_DEBUG=y</div><div class='add'>+# CONFIG_PCCARD is not set</div><div class='add'>+# CONFIG_HOTPLUG_PCI is not set</div><div class='add'>+CONFIG_HAS_RAPIDIO=y</div><div class='add'>+# CONFIG_RAPIDIO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Advanced setup</div><div class='add'>+#</div><div class='add'>+# CONFIG_ADVANCED_OPTIONS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Default settings for advanced configuration options are used</div><div class='add'>+#</div><div class='add'>+CONFIG_LOWMEM_SIZE=0x30000000</div><div class='add'>+CONFIG_PAGE_OFFSET=0xc0000000</div><div class='add'>+CONFIG_KERNEL_START=0xc0000000</div><div class='add'>+CONFIG_PHYSICAL_START=0x00000000</div><div class='add'>+CONFIG_TASK_SIZE=0xc0000000</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking</div><div class='add'>+#</div><div class='add'>+CONFIG_NET=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking options</div><div class='add'>+#</div><div class='add'>+CONFIG_PACKET=y</div><div class='add'>+CONFIG_PACKET_MMAP=y</div><div class='add'>+CONFIG_UNIX=y</div><div class='add'>+CONFIG_XFRM=y</div><div class='add'>+CONFIG_XFRM_USER=m</div><div class='add'>+# CONFIG_XFRM_SUB_POLICY is not set</div><div class='add'>+# CONFIG_XFRM_MIGRATE is not set</div><div class='add'>+# CONFIG_XFRM_STATISTICS is not set</div><div class='add'>+CONFIG_NET_KEY=m</div><div class='add'>+# CONFIG_NET_KEY_MIGRATE is not set</div><div class='add'>+CONFIG_INET=y</div><div class='add'>+CONFIG_IP_MULTICAST=y</div><div class='add'>+CONFIG_IP_ADVANCED_ROUTER=y</div><div class='add'>+CONFIG_ASK_IP_FIB_HASH=y</div><div class='add'>+# CONFIG_IP_FIB_TRIE is not set</div><div class='add'>+CONFIG_IP_FIB_HASH=y</div><div class='add'>+CONFIG_IP_MULTIPLE_TABLES=y</div><div class='add'>+CONFIG_IP_ROUTE_MULTIPATH=y</div><div class='add'>+CONFIG_IP_ROUTE_VERBOSE=y</div><div class='add'>+CONFIG_IP_PNP=y</div><div class='add'>+CONFIG_IP_PNP_DHCP=y</div><div class='add'>+CONFIG_IP_PNP_BOOTP=y</div><div class='add'>+CONFIG_IP_PNP_RARP=y</div><div class='add'>+CONFIG_NET_IPIP=m</div><div class='add'>+CONFIG_NET_IPGRE=m</div><div class='add'>+CONFIG_NET_IPGRE_BROADCAST=y</div><div class='add'>+CONFIG_IP_MROUTE=y</div><div class='add'>+CONFIG_IP_PIMSM_V1=y</div><div class='add'>+CONFIG_IP_PIMSM_V2=y</div><div class='add'>+# CONFIG_ARPD is not set</div><div class='add'>+CONFIG_SYN_COOKIES=y</div><div class='add'>+CONFIG_INET_AH=m</div><div class='add'>+CONFIG_INET_ESP=m</div><div class='add'>+CONFIG_INET_IPCOMP=m</div><div class='add'>+CONFIG_INET_XFRM_TUNNEL=m</div><div class='add'>+CONFIG_INET_TUNNEL=m</div><div class='add'>+CONFIG_INET_XFRM_MODE_TRANSPORT=y</div><div class='add'>+CONFIG_INET_XFRM_MODE_TUNNEL=y</div><div class='add'>+CONFIG_INET_XFRM_MODE_BEET=y</div><div class='add'>+# CONFIG_INET_LRO is not set</div><div class='add'>+CONFIG_INET_DIAG=y</div><div class='add'>+CONFIG_INET_TCP_DIAG=y</div><div class='add'>+# CONFIG_TCP_CONG_ADVANCED is not set</div><div class='add'>+CONFIG_TCP_CONG_CUBIC=y</div><div class='add'>+CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='add'>+# CONFIG_TCP_MD5SIG is not set</div><div class='add'>+# CONFIG_IP_VS is not set</div><div class='add'>+CONFIG_IPV6=m</div><div class='add'>+# CONFIG_IPV6_PRIVACY is not set</div><div class='add'>+# CONFIG_IPV6_ROUTER_PREF is not set</div><div class='add'>+# CONFIG_IPV6_OPTIMISTIC_DAD is not set</div><div class='add'>+CONFIG_INET6_AH=m</div><div class='add'>+CONFIG_INET6_ESP=m</div><div class='add'>+CONFIG_INET6_IPCOMP=m</div><div class='add'>+# CONFIG_IPV6_MIP6 is not set</div><div class='add'>+CONFIG_INET6_XFRM_TUNNEL=m</div><div class='add'>+CONFIG_INET6_TUNNEL=m</div><div class='add'>+CONFIG_INET6_XFRM_MODE_TRANSPORT=m</div><div class='add'>+CONFIG_INET6_XFRM_MODE_TUNNEL=m</div><div class='add'>+CONFIG_INET6_XFRM_MODE_BEET=m</div><div class='add'>+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set</div><div class='add'>+CONFIG_IPV6_SIT=m</div><div class='add'>+CONFIG_IPV6_NDISC_NODETYPE=y</div><div class='add'>+CONFIG_IPV6_TUNNEL=m</div><div class='add'>+# CONFIG_IPV6_MULTIPLE_TABLES is not set</div><div class='add'>+# CONFIG_IPV6_MROUTE is not set</div><div class='add'>+# CONFIG_NETLABEL is not set</div><div class='add'>+# CONFIG_NETWORK_SECMARK is not set</div><div class='add'>+CONFIG_NETFILTER=y</div><div class='add'>+# CONFIG_NETFILTER_DEBUG is not set</div><div class='add'>+CONFIG_NETFILTER_ADVANCED=y</div><div class='add'>+CONFIG_BRIDGE_NETFILTER=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Core Netfilter Configuration</div><div class='add'>+#</div><div class='add'>+# CONFIG_NETFILTER_NETLINK_QUEUE is not set</div><div class='add'>+# CONFIG_NETFILTER_NETLINK_LOG is not set</div><div class='add'>+# CONFIG_NF_CONNTRACK is not set</div><div class='add'>+CONFIG_NETFILTER_XTABLES=m</div><div class='add'>+# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set</div><div class='add'>+# CONFIG_NETFILTER_XT_TARGET_DSCP is not set</div><div class='add'>+# CONFIG_NETFILTER_XT_TARGET_MARK is not set</div><div class='add'>+# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set</div><div class='add'>+# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set</div><div class='add'>+# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set</div><div class='add'>+# CONFIG_NETFILTER_XT_TARGET_TRACE is not set</div><div class='add'>+# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set</div><div class='add'>+# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set</div><div class='add'>+# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set</div><div class='add'>+# CONFIG_NETFILTER_XT_MATCH_DCCP is not set</div><div class='add'>+# CONFIG_NETFILTER_XT_MATCH_DSCP is not set</div><div class='add'>+# CONFIG_NETFILTER_XT_MATCH_ESP is not set</div><div class='add'>+# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set</div><div class='add'>+# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set</div><div class='add'>+# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set</div><div class='add'>+# CONFIG_NETFILTER_XT_MATCH_MAC is not set</div><div class='add'>+# CONFIG_NETFILTER_XT_MATCH_MARK is not set</div><div class='add'>+# CONFIG_NETFILTER_XT_MATCH_OWNER is not set</div><div class='add'>+# CONFIG_NETFILTER_XT_MATCH_POLICY is not set</div><div class='add'>+# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set</div><div class='add'>+# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set</div><div class='add'>+# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set</div><div class='add'>+# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set</div><div class='add'>+# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set</div><div class='add'>+# CONFIG_NETFILTER_XT_MATCH_REALM is not set</div><div class='add'>+# CONFIG_NETFILTER_XT_MATCH_SCTP is not set</div><div class='add'>+# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set</div><div class='add'>+# CONFIG_NETFILTER_XT_MATCH_STRING is not set</div><div class='add'>+# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set</div><div class='add'>+# CONFIG_NETFILTER_XT_MATCH_TIME is not set</div><div class='add'>+# CONFIG_NETFILTER_XT_MATCH_U32 is not set</div><div class='add'>+# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IP: Netfilter Configuration</div><div class='add'>+#</div><div class='add'>+CONFIG_IP_NF_QUEUE=m</div><div class='add'>+CONFIG_IP_NF_IPTABLES=m</div><div class='add'>+CONFIG_IP_NF_MATCH_RECENT=m</div><div class='add'>+CONFIG_IP_NF_MATCH_ECN=m</div><div class='add'>+# CONFIG_IP_NF_MATCH_AH is not set</div><div class='add'>+CONFIG_IP_NF_MATCH_TTL=m</div><div class='add'>+CONFIG_IP_NF_MATCH_ADDRTYPE=m</div><div class='add'>+CONFIG_IP_NF_FILTER=m</div><div class='add'>+CONFIG_IP_NF_TARGET_REJECT=m</div><div class='add'>+CONFIG_IP_NF_TARGET_LOG=m</div><div class='add'>+CONFIG_IP_NF_TARGET_ULOG=m</div><div class='add'>+CONFIG_IP_NF_MANGLE=m</div><div class='add'>+CONFIG_IP_NF_TARGET_ECN=m</div><div class='add'>+# CONFIG_IP_NF_TARGET_TTL is not set</div><div class='add'>+CONFIG_IP_NF_RAW=m</div><div class='add'>+CONFIG_IP_NF_ARPTABLES=m</div><div class='add'>+CONFIG_IP_NF_ARPFILTER=m</div><div class='add'>+CONFIG_IP_NF_ARP_MANGLE=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IPv6: Netfilter Configuration</div><div class='add'>+#</div><div class='add'>+CONFIG_IP6_NF_QUEUE=m</div><div class='add'>+CONFIG_IP6_NF_IPTABLES=m</div><div class='add'>+CONFIG_IP6_NF_MATCH_RT=m</div><div class='add'>+CONFIG_IP6_NF_MATCH_OPTS=m</div><div class='add'>+CONFIG_IP6_NF_MATCH_FRAG=m</div><div class='add'>+CONFIG_IP6_NF_MATCH_HL=m</div><div class='add'>+CONFIG_IP6_NF_MATCH_IPV6HEADER=m</div><div class='add'>+# CONFIG_IP6_NF_MATCH_AH is not set</div><div class='add'>+# CONFIG_IP6_NF_MATCH_MH is not set</div><div class='add'>+CONFIG_IP6_NF_MATCH_EUI64=m</div><div class='add'>+CONFIG_IP6_NF_FILTER=m</div><div class='add'>+CONFIG_IP6_NF_TARGET_LOG=m</div><div class='add'>+# CONFIG_IP6_NF_TARGET_REJECT is not set</div><div class='add'>+CONFIG_IP6_NF_MANGLE=m</div><div class='add'>+# CONFIG_IP6_NF_TARGET_HL is not set</div><div class='add'>+CONFIG_IP6_NF_RAW=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Bridge: Netfilter Configuration</div><div class='add'>+#</div><div class='add'>+# CONFIG_BRIDGE_NF_EBTABLES is not set</div><div class='add'>+# CONFIG_IP_DCCP is not set</div><div class='add'>+CONFIG_IP_SCTP=m</div><div class='add'>+# CONFIG_SCTP_DBG_MSG is not set</div><div class='add'>+# CONFIG_SCTP_DBG_OBJCNT is not set</div><div class='add'>+# CONFIG_SCTP_HMAC_NONE is not set</div><div class='add'>+# CONFIG_SCTP_HMAC_SHA1 is not set</div><div class='add'>+CONFIG_SCTP_HMAC_MD5=y</div><div class='add'>+CONFIG_TIPC=m</div><div class='add'>+# CONFIG_TIPC_ADVANCED is not set</div><div class='add'>+# CONFIG_TIPC_DEBUG is not set</div><div class='add'>+CONFIG_ATM=m</div><div class='add'>+CONFIG_ATM_CLIP=m</div><div class='add'>+# CONFIG_ATM_CLIP_NO_ICMP is not set</div><div class='add'>+CONFIG_ATM_LANE=m</div><div class='add'>+CONFIG_ATM_MPOA=m</div><div class='add'>+CONFIG_ATM_BR2684=m</div><div class='add'>+# CONFIG_ATM_BR2684_IPFILTER is not set</div><div class='add'>+CONFIG_BRIDGE=m</div><div class='add'>+CONFIG_VLAN_8021Q=m</div><div class='add'>+# CONFIG_DECNET is not set</div><div class='add'>+CONFIG_LLC=m</div><div class='add'>+# CONFIG_LLC2 is not set</div><div class='add'>+# CONFIG_IPX is not set</div><div class='add'>+# CONFIG_ATALK is not set</div><div class='add'>+# CONFIG_X25 is not set</div><div class='add'>+# CONFIG_LAPB is not set</div><div class='add'>+# CONFIG_ECONET is not set</div><div class='add'>+CONFIG_WAN_ROUTER=m</div><div class='add'>+CONFIG_NET_SCHED=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Queueing/Scheduling</div><div class='add'>+#</div><div class='add'>+CONFIG_NET_SCH_CBQ=m</div><div class='add'>+CONFIG_NET_SCH_HTB=m</div><div class='add'>+CONFIG_NET_SCH_HFSC=m</div><div class='add'>+CONFIG_NET_SCH_ATM=m</div><div class='add'>+CONFIG_NET_SCH_PRIO=m</div><div class='add'>+# CONFIG_NET_SCH_RR is not set</div><div class='add'>+CONFIG_NET_SCH_RED=m</div><div class='add'>+CONFIG_NET_SCH_SFQ=m</div><div class='add'>+CONFIG_NET_SCH_TEQL=m</div><div class='add'>+CONFIG_NET_SCH_TBF=m</div><div class='add'>+CONFIG_NET_SCH_GRED=m</div><div class='add'>+CONFIG_NET_SCH_DSMARK=m</div><div class='add'>+CONFIG_NET_SCH_NETEM=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Classification</div><div class='add'>+#</div><div class='add'>+CONFIG_NET_CLS=y</div><div class='add'>+# CONFIG_NET_CLS_BASIC is not set</div><div class='add'>+CONFIG_NET_CLS_TCINDEX=m</div><div class='add'>+CONFIG_NET_CLS_ROUTE4=m</div><div class='add'>+CONFIG_NET_CLS_ROUTE=y</div><div class='add'>+CONFIG_NET_CLS_FW=m</div><div class='add'>+CONFIG_NET_CLS_U32=m</div><div class='add'>+# CONFIG_CLS_U32_PERF is not set</div><div class='add'>+# CONFIG_CLS_U32_MARK is not set</div><div class='add'>+CONFIG_NET_CLS_RSVP=m</div><div class='add'>+CONFIG_NET_CLS_RSVP6=m</div><div class='add'>+# CONFIG_NET_CLS_FLOW is not set</div><div class='add'>+# CONFIG_NET_EMATCH is not set</div><div class='add'>+# CONFIG_NET_CLS_ACT is not set</div><div class='add'>+# CONFIG_NET_CLS_IND is not set</div><div class='add'>+CONFIG_NET_SCH_FIFO=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network testing</div><div class='add'>+#</div><div class='add'>+CONFIG_NET_PKTGEN=m</div><div class='add'>+# CONFIG_HAMRADIO is not set</div><div class='add'>+# CONFIG_CAN is not set</div><div class='add'>+# CONFIG_IRDA is not set</div><div class='add'>+# CONFIG_BT is not set</div><div class='add'>+# CONFIG_AF_RXRPC is not set</div><div class='add'>+CONFIG_FIB_RULES=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless</div><div class='add'>+#</div><div class='add'>+# CONFIG_CFG80211 is not set</div><div class='add'>+# CONFIG_WIRELESS_EXT is not set</div><div class='add'>+# CONFIG_MAC80211 is not set</div><div class='add'>+# CONFIG_IEEE80211 is not set</div><div class='add'>+# CONFIG_RFKILL is not set</div><div class='add'>+# CONFIG_NET_9P is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Device Drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Generic Driver Options</div><div class='add'>+#</div><div class='add'>+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='add'>+CONFIG_STANDALONE=y</div><div class='add'>+CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='add'>+# CONFIG_FW_LOADER is not set</div><div class='add'>+# CONFIG_DEBUG_DRIVER is not set</div><div class='add'>+# CONFIG_DEBUG_DEVRES is not set</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='add'>+# CONFIG_CONNECTOR is not set</div><div class='add'>+CONFIG_MTD=y</div><div class='add'>+# CONFIG_MTD_DEBUG is not set</div><div class='add'>+CONFIG_MTD_CONCAT=y</div><div class='add'>+CONFIG_MTD_PARTITIONS=y</div><div class='add'>+# CONFIG_MTD_REDBOOT_PARTS is not set</div><div class='add'>+# CONFIG_MTD_CMDLINE_PARTS is not set</div><div class='add'>+# CONFIG_MTD_OF_PARTS is not set</div><div class='add'>+# CONFIG_MTD_AR7_PARTS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# User Modules And Translation Layers</div><div class='add'>+#</div><div class='add'>+CONFIG_MTD_CHAR=y</div><div class='add'>+CONFIG_MTD_BLKDEVS=y</div><div class='add'>+CONFIG_MTD_BLOCK=y</div><div class='add'>+# CONFIG_FTL is not set</div><div class='add'>+# CONFIG_NFTL is not set</div><div class='add'>+# CONFIG_INFTL is not set</div><div class='add'>+# CONFIG_RFD_FTL is not set</div><div class='add'>+# CONFIG_SSFDC is not set</div><div class='add'>+# CONFIG_MTD_OOPS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# RAM/ROM/Flash chip drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_MTD_CFI=y</div><div class='add'>+# CONFIG_MTD_JEDECPROBE is not set</div><div class='add'>+CONFIG_MTD_GEN_PROBE=y</div><div class='add'>+CONFIG_MTD_CFI_ADV_OPTIONS=y</div><div class='add'>+# CONFIG_MTD_CFI_NOSWAP is not set</div><div class='add'>+# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set</div><div class='add'>+CONFIG_MTD_CFI_LE_BYTE_SWAP=y</div><div class='add'>+# CONFIG_MTD_CFI_GEOMETRY is not set</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_1=y</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_2=y</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_4=y</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set</div><div class='add'>+CONFIG_MTD_CFI_I1=y</div><div class='add'>+CONFIG_MTD_CFI_I2=y</div><div class='add'>+# CONFIG_MTD_CFI_I4 is not set</div><div class='add'>+# CONFIG_MTD_CFI_I8 is not set</div><div class='add'>+# CONFIG_MTD_OTP is not set</div><div class='add'>+CONFIG_MTD_CFI_INTELEXT=y</div><div class='add'>+CONFIG_MTD_CFI_AMDSTD=y</div><div class='add'>+# CONFIG_MTD_CFI_STAA is not set</div><div class='add'>+CONFIG_MTD_CFI_UTIL=y</div><div class='add'>+# CONFIG_MTD_RAM is not set</div><div class='add'>+# CONFIG_MTD_ROM is not set</div><div class='add'>+# CONFIG_MTD_ABSENT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Mapping drivers for chip access</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_COMPLEX_MAPPINGS is not set</div><div class='add'>+# CONFIG_MTD_PHYSMAP is not set</div><div class='add'>+CONFIG_MTD_PHYSMAP_OF=y</div><div class='add'>+# CONFIG_MTD_INTEL_VR_NOR is not set</div><div class='add'>+# CONFIG_MTD_PLATRAM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Self-contained MTD device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_PMC551 is not set</div><div class='add'>+# CONFIG_MTD_SLRAM is not set</div><div class='add'>+# CONFIG_MTD_PHRAM is not set</div><div class='add'>+# CONFIG_MTD_MTDRAM is not set</div><div class='add'>+# CONFIG_MTD_BLOCK2MTD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Disk-On-Chip Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_DOC2000 is not set</div><div class='add'>+# CONFIG_MTD_DOC2001 is not set</div><div class='add'>+# CONFIG_MTD_DOC2001PLUS is not set</div><div class='add'>+# CONFIG_MTD_NAND is not set</div><div class='add'>+# CONFIG_MTD_ONENAND is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# UBI - Unsorted block images</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_UBI is not set</div><div class='add'>+CONFIG_OF_DEVICE=y</div><div class='add'>+CONFIG_OF_I2C=y</div><div class='add'>+# CONFIG_PARPORT is not set</div><div class='add'>+CONFIG_BLK_DEV=y</div><div class='add'>+# CONFIG_BLK_DEV_FD is not set</div><div class='add'>+# CONFIG_BLK_CPQ_DA is not set</div><div class='add'>+# CONFIG_BLK_CPQ_CISS_DA is not set</div><div class='add'>+# CONFIG_BLK_DEV_DAC960 is not set</div><div class='add'>+# CONFIG_BLK_DEV_UMEM is not set</div><div class='add'>+# CONFIG_BLK_DEV_COW_COMMON is not set</div><div class='add'>+CONFIG_BLK_DEV_LOOP=m</div><div class='add'>+CONFIG_BLK_DEV_CRYPTOLOOP=m</div><div class='add'>+CONFIG_BLK_DEV_NBD=m</div><div class='add'>+# CONFIG_BLK_DEV_SX8 is not set</div><div class='add'>+# CONFIG_BLK_DEV_UB is not set</div><div class='add'>+CONFIG_BLK_DEV_RAM=y</div><div class='add'>+CONFIG_BLK_DEV_RAM_COUNT=16</div><div class='add'>+CONFIG_BLK_DEV_RAM_SIZE=131072</div><div class='add'>+# CONFIG_BLK_DEV_XIP is not set</div><div class='add'>+# CONFIG_CDROM_PKTCDVD is not set</div><div class='add'>+# CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+CONFIG_MISC_DEVICES=y</div><div class='add'>+# CONFIG_PHANTOM is not set</div><div class='add'>+# CONFIG_EEPROM_93CX6 is not set</div><div class='add'>+# CONFIG_SGI_IOC4 is not set</div><div class='add'>+# CONFIG_TIFM_CORE is not set</div><div class='add'>+# CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+CONFIG_HAVE_IDE=y</div><div class='add'>+# CONFIG_IDE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_RAID_ATTRS is not set</div><div class='add'>+CONFIG_SCSI=y</div><div class='add'>+CONFIG_SCSI_DMA=y</div><div class='add'>+# CONFIG_SCSI_TGT is not set</div><div class='add'>+# CONFIG_SCSI_NETLINK is not set</div><div class='add'>+CONFIG_SCSI_PROC_FS=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI support type (disk, tape, CD-ROM)</div><div class='add'>+#</div><div class='add'>+CONFIG_BLK_DEV_SD=y</div><div class='add'>+CONFIG_CHR_DEV_ST=y</div><div class='add'>+# CONFIG_CHR_DEV_OSST is not set</div><div class='add'>+CONFIG_BLK_DEV_SR=y</div><div class='add'>+# CONFIG_BLK_DEV_SR_VENDOR is not set</div><div class='add'>+# CONFIG_CHR_DEV_SG is not set</div><div class='add'>+# CONFIG_CHR_DEV_SCH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs</div><div class='add'>+#</div><div class='add'>+# CONFIG_SCSI_MULTI_LUN is not set</div><div class='add'>+# CONFIG_SCSI_CONSTANTS is not set</div><div class='add'>+# CONFIG_SCSI_LOGGING is not set</div><div class='add'>+# CONFIG_SCSI_SCAN_ASYNC is not set</div><div class='add'>+CONFIG_SCSI_WAIT_SCAN=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI Transports</div><div class='add'>+#</div><div class='add'>+# CONFIG_SCSI_SPI_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_FC_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_ISCSI_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_SAS_LIBSAS is not set</div><div class='add'>+# CONFIG_SCSI_SRP_ATTRS is not set</div><div class='add'>+CONFIG_SCSI_LOWLEVEL=y</div><div class='add'>+# CONFIG_ISCSI_TCP is not set</div><div class='add'>+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set</div><div class='add'>+# CONFIG_SCSI_3W_9XXX is not set</div><div class='add'>+# CONFIG_SCSI_ACARD is not set</div><div class='add'>+# CONFIG_SCSI_AACRAID is not set</div><div class='add'>+# CONFIG_SCSI_AIC7XXX is not set</div><div class='add'>+# CONFIG_SCSI_AIC7XXX_OLD is not set</div><div class='add'>+# CONFIG_SCSI_AIC79XX is not set</div><div class='add'>+# CONFIG_SCSI_AIC94XX is not set</div><div class='add'>+# CONFIG_SCSI_DPT_I2O is not set</div><div class='add'>+# CONFIG_SCSI_ADVANSYS is not set</div><div class='add'>+# CONFIG_SCSI_ARCMSR is not set</div><div class='add'>+# CONFIG_MEGARAID_NEWGEN is not set</div><div class='add'>+# CONFIG_MEGARAID_LEGACY is not set</div><div class='add'>+# CONFIG_MEGARAID_SAS is not set</div><div class='add'>+# CONFIG_SCSI_HPTIOP is not set</div><div class='add'>+# CONFIG_SCSI_BUSLOGIC is not set</div><div class='add'>+# CONFIG_SCSI_DMX3191D is not set</div><div class='add'>+# CONFIG_SCSI_EATA is not set</div><div class='add'>+# CONFIG_SCSI_FUTURE_DOMAIN is not set</div><div class='add'>+# CONFIG_SCSI_GDTH is not set</div><div class='add'>+# CONFIG_SCSI_IPS is not set</div><div class='add'>+# CONFIG_SCSI_INITIO is not set</div><div class='add'>+# CONFIG_SCSI_INIA100 is not set</div><div class='add'>+# CONFIG_SCSI_MVSAS is not set</div><div class='add'>+# CONFIG_SCSI_STEX is not set</div><div class='add'>+# CONFIG_SCSI_SYM53C8XX_2 is not set</div><div class='add'>+# CONFIG_SCSI_IPR is not set</div><div class='add'>+# CONFIG_SCSI_QLOGIC_1280 is not set</div><div class='add'>+# CONFIG_SCSI_QLA_FC is not set</div><div class='add'>+# CONFIG_SCSI_QLA_ISCSI is not set</div><div class='add'>+# CONFIG_SCSI_LPFC is not set</div><div class='add'>+# CONFIG_SCSI_DC395x is not set</div><div class='add'>+# CONFIG_SCSI_DC390T is not set</div><div class='add'>+# CONFIG_SCSI_NSP32 is not set</div><div class='add'>+# CONFIG_SCSI_DEBUG is not set</div><div class='add'>+# CONFIG_SCSI_SRP is not set</div><div class='add'>+CONFIG_ATA=y</div><div class='add'>+# CONFIG_ATA_NONSTANDARD is not set</div><div class='add'>+CONFIG_SATA_PMP=y</div><div class='add'>+# CONFIG_SATA_AHCI is not set</div><div class='add'>+# CONFIG_SATA_SIL24 is not set</div><div class='add'>+# CONFIG_SATA_FSL is not set</div><div class='add'>+CONFIG_ATA_SFF=y</div><div class='add'>+# CONFIG_SATA_SVW is not set</div><div class='add'>+# CONFIG_ATA_PIIX is not set</div><div class='add'>+# CONFIG_SATA_MV is not set</div><div class='add'>+# CONFIG_SATA_NV is not set</div><div class='add'>+# CONFIG_PDC_ADMA is not set</div><div class='add'>+# CONFIG_SATA_QSTOR is not set</div><div class='add'>+# CONFIG_SATA_PROMISE is not set</div><div class='add'>+# CONFIG_SATA_SX4 is not set</div><div class='add'>+CONFIG_SATA_SIL=y</div><div class='add'>+# CONFIG_SATA_SIS is not set</div><div class='add'>+# CONFIG_SATA_ULI is not set</div><div class='add'>+# CONFIG_SATA_VIA is not set</div><div class='add'>+# CONFIG_SATA_VITESSE is not set</div><div class='add'>+# CONFIG_SATA_INIC162X is not set</div><div class='add'>+# CONFIG_PATA_ALI is not set</div><div class='add'>+# CONFIG_PATA_AMD is not set</div><div class='add'>+# CONFIG_PATA_ARTOP is not set</div><div class='add'>+# CONFIG_PATA_ATIIXP is not set</div><div class='add'>+# CONFIG_PATA_CMD640_PCI is not set</div><div class='add'>+# CONFIG_PATA_CMD64X is not set</div><div class='add'>+# CONFIG_PATA_CS5520 is not set</div><div class='add'>+# CONFIG_PATA_CS5530 is not set</div><div class='add'>+# CONFIG_PATA_CYPRESS is not set</div><div class='add'>+# CONFIG_PATA_EFAR is not set</div><div class='add'>+# CONFIG_ATA_GENERIC is not set</div><div class='add'>+# CONFIG_PATA_HPT366 is not set</div><div class='add'>+# CONFIG_PATA_HPT37X is not set</div><div class='add'>+# CONFIG_PATA_HPT3X2N is not set</div><div class='add'>+# CONFIG_PATA_HPT3X3 is not set</div><div class='add'>+# CONFIG_PATA_IT821X is not set</div><div class='add'>+# CONFIG_PATA_IT8213 is not set</div><div class='add'>+# CONFIG_PATA_JMICRON is not set</div><div class='add'>+# CONFIG_PATA_TRIFLEX is not set</div><div class='add'>+# CONFIG_PATA_MARVELL is not set</div><div class='add'>+# CONFIG_PATA_MPIIX is not set</div><div class='add'>+# CONFIG_PATA_OLDPIIX is not set</div><div class='add'>+# CONFIG_PATA_NETCELL is not set</div><div class='add'>+# CONFIG_PATA_NINJA32 is not set</div><div class='add'>+# CONFIG_PATA_NS87410 is not set</div><div class='add'>+# CONFIG_PATA_NS87415 is not set</div><div class='add'>+# CONFIG_PATA_OPTI is not set</div><div class='add'>+# CONFIG_PATA_OPTIDMA is not set</div><div class='add'>+# CONFIG_PATA_PDC_OLD is not set</div><div class='add'>+# CONFIG_PATA_RADISYS is not set</div><div class='add'>+# CONFIG_PATA_RZ1000 is not set</div><div class='add'>+# CONFIG_PATA_SC1200 is not set</div><div class='add'>+# CONFIG_PATA_SERVERWORKS is not set</div><div class='add'>+# CONFIG_PATA_PDC2027X is not set</div><div class='add'>+# CONFIG_PATA_SIL680 is not set</div><div class='add'>+# CONFIG_PATA_SIS is not set</div><div class='add'>+# CONFIG_PATA_VIA is not set</div><div class='add'>+# CONFIG_PATA_WINBOND is not set</div><div class='add'>+# CONFIG_PATA_PLATFORM is not set</div><div class='add'>+# CONFIG_PATA_SCH is not set</div><div class='add'>+# CONFIG_MD is not set</div><div class='add'>+# CONFIG_FUSION is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IEEE 1394 (FireWire) support</div><div class='add'>+#</div><div class='add'>+# CONFIG_FIREWIRE is not set</div><div class='add'>+# CONFIG_IEEE1394 is not set</div><div class='add'>+# CONFIG_I2O is not set</div><div class='add'>+# CONFIG_MACINTOSH_DRIVERS is not set</div><div class='add'>+CONFIG_NETDEVICES=y</div><div class='add'>+# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='add'>+CONFIG_DUMMY=m</div><div class='add'>+CONFIG_BONDING=m</div><div class='add'>+# CONFIG_MACVLAN is not set</div><div class='add'>+# CONFIG_EQUALIZER is not set</div><div class='add'>+CONFIG_TUN=m</div><div class='add'>+# CONFIG_VETH is not set</div><div class='add'>+# CONFIG_ARCNET is not set</div><div class='add'>+CONFIG_PHYLIB=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MII PHY device drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_MARVELL_PHY=y</div><div class='add'>+# CONFIG_DAVICOM_PHY is not set</div><div class='add'>+# CONFIG_QSEMI_PHY is not set</div><div class='add'>+# CONFIG_LXT_PHY is not set</div><div class='add'>+# CONFIG_CICADA_PHY is not set</div><div class='add'>+# CONFIG_VITESSE_PHY is not set</div><div class='add'>+# CONFIG_SMSC_PHY is not set</div><div class='add'>+# CONFIG_BROADCOM_PHY is not set</div><div class='add'>+# CONFIG_ICPLUS_PHY is not set</div><div class='add'>+# CONFIG_REALTEK_PHY is not set</div><div class='add'>+# CONFIG_FIXED_PHY is not set</div><div class='add'>+# CONFIG_MDIO_BITBANG is not set</div><div class='add'>+CONFIG_NET_ETHERNET=y</div><div class='add'>+CONFIG_MII=y</div><div class='add'>+# CONFIG_HAPPYMEAL is not set</div><div class='add'>+# CONFIG_SUNGEM is not set</div><div class='add'>+# CONFIG_CASSINI is not set</div><div class='add'>+# CONFIG_NET_VENDOR_3COM is not set</div><div class='add'>+# CONFIG_NET_TULIP is not set</div><div class='add'>+# CONFIG_HP100 is not set</div><div class='add'>+# CONFIG_IBM_NEW_EMAC_ZMII is not set</div><div class='add'>+# CONFIG_IBM_NEW_EMAC_RGMII is not set</div><div class='add'>+# CONFIG_IBM_NEW_EMAC_TAH is not set</div><div class='add'>+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set</div><div class='add'>+# CONFIG_NET_PCI is not set</div><div class='add'>+# CONFIG_B44 is not set</div><div class='add'>+CONFIG_NETDEV_1000=y</div><div class='add'>+# CONFIG_ACENIC is not set</div><div class='add'>+# CONFIG_DL2K is not set</div><div class='add'>+# CONFIG_E1000 is not set</div><div class='add'>+# CONFIG_E1000E is not set</div><div class='add'>+# CONFIG_E1000E_ENABLED is not set</div><div class='add'>+# CONFIG_IP1000 is not set</div><div class='add'>+# CONFIG_IGB is not set</div><div class='add'>+# CONFIG_NS83820 is not set</div><div class='add'>+# CONFIG_HAMACHI is not set</div><div class='add'>+# CONFIG_YELLOWFIN is not set</div><div class='add'>+# CONFIG_R8169 is not set</div><div class='add'>+# CONFIG_SIS190 is not set</div><div class='add'>+# CONFIG_SKGE is not set</div><div class='add'>+# CONFIG_SKY2 is not set</div><div class='add'>+# CONFIG_VIA_VELOCITY is not set</div><div class='add'>+# CONFIG_TIGON3 is not set</div><div class='add'>+# CONFIG_BNX2 is not set</div><div class='add'>+CONFIG_GIANFAR=y</div><div class='add'>+# CONFIG_GFAR_NAPI is not set</div><div class='add'>+# CONFIG_QLA3XXX is not set</div><div class='add'>+# CONFIG_ATL1 is not set</div><div class='add'>+# CONFIG_NETDEV_10000 is not set</div><div class='add'>+# CONFIG_TR is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless LAN</div><div class='add'>+#</div><div class='add'>+# CONFIG_WLAN_PRE80211 is not set</div><div class='add'>+# CONFIG_WLAN_80211 is not set</div><div class='add'>+# CONFIG_IWLWIFI_LEDS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Network Adapters</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_CATC is not set</div><div class='add'>+# CONFIG_USB_KAWETH is not set</div><div class='add'>+# CONFIG_USB_PEGASUS is not set</div><div class='add'>+# CONFIG_USB_RTL8150 is not set</div><div class='add'>+# CONFIG_USB_USBNET is not set</div><div class='add'>+# CONFIG_WAN is not set</div><div class='add'>+CONFIG_ATM_DRIVERS=y</div><div class='add'>+# CONFIG_ATM_DUMMY is not set</div><div class='add'>+# CONFIG_ATM_TCP is not set</div><div class='add'>+# CONFIG_ATM_LANAI is not set</div><div class='add'>+# CONFIG_ATM_ENI is not set</div><div class='add'>+# CONFIG_ATM_FIRESTREAM is not set</div><div class='add'>+# CONFIG_ATM_ZATM is not set</div><div class='add'>+# CONFIG_ATM_NICSTAR is not set</div><div class='add'>+# CONFIG_ATM_IDT77252 is not set</div><div class='add'>+# CONFIG_ATM_AMBASSADOR is not set</div><div class='add'>+# CONFIG_ATM_HORIZON is not set</div><div class='add'>+# CONFIG_ATM_IA is not set</div><div class='add'>+# CONFIG_ATM_FORE200E_MAYBE is not set</div><div class='add'>+# CONFIG_ATM_HE is not set</div><div class='add'>+# CONFIG_FDDI is not set</div><div class='add'>+# CONFIG_HIPPI is not set</div><div class='add'>+CONFIG_PPP=m</div><div class='add'>+CONFIG_PPP_MULTILINK=y</div><div class='add'>+CONFIG_PPP_FILTER=y</div><div class='add'>+CONFIG_PPP_ASYNC=m</div><div class='add'>+CONFIG_PPP_SYNC_TTY=m</div><div class='add'>+CONFIG_PPP_DEFLATE=m</div><div class='add'>+CONFIG_PPP_BSDCOMP=m</div><div class='add'>+# CONFIG_PPP_MPPE is not set</div><div class='add'>+CONFIG_PPPOE=m</div><div class='add'>+CONFIG_PPPOATM=m</div><div class='add'>+# CONFIG_PPPOL2TP is not set</div><div class='add'>+CONFIG_SLIP=m</div><div class='add'>+CONFIG_SLIP_COMPRESSED=y</div><div class='add'>+CONFIG_SLHC=m</div><div class='add'>+CONFIG_SLIP_SMART=y</div><div class='add'>+CONFIG_SLIP_MODE_SLIP6=y</div><div class='add'>+# CONFIG_NET_FC is not set</div><div class='add'>+CONFIG_NETCONSOLE=y</div><div class='add'>+# CONFIG_NETCONSOLE_DYNAMIC is not set</div><div class='add'>+CONFIG_NETPOLL=y</div><div class='add'>+CONFIG_NETPOLL_TRAP=y</div><div class='add'>+CONFIG_NET_POLL_CONTROLLER=y</div><div class='add'>+# CONFIG_ISDN is not set</div><div class='add'>+# CONFIG_PHONE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input device support</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT=y</div><div class='add'>+# CONFIG_INPUT_FF_MEMLESS is not set</div><div class='add'>+# CONFIG_INPUT_POLLDEV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Userland interfaces</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT_MOUSEDEV=y</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_PSAUX=y</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768</div><div class='add'>+# CONFIG_INPUT_JOYDEV is not set</div><div class='add'>+# CONFIG_INPUT_EVDEV is not set</div><div class='add'>+# CONFIG_INPUT_EVBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_INPUT_KEYBOARD is not set</div><div class='add'>+# CONFIG_INPUT_MOUSE is not set</div><div class='add'>+# CONFIG_INPUT_JOYSTICK is not set</div><div class='add'>+# CONFIG_INPUT_TABLET is not set</div><div class='add'>+# CONFIG_INPUT_TOUCHSCREEN is not set</div><div class='add'>+# CONFIG_INPUT_MISC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware I/O ports</div><div class='add'>+#</div><div class='add'>+# CONFIG_SERIO is not set</div><div class='add'>+# CONFIG_GAMEPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Character devices</div><div class='add'>+#</div><div class='add'>+CONFIG_VT=y</div><div class='add'>+CONFIG_VT_CONSOLE=y</div><div class='add'>+CONFIG_HW_CONSOLE=y</div><div class='add'>+# CONFIG_VT_HW_CONSOLE_BINDING is not set</div><div class='add'>+CONFIG_DEVKMEM=y</div><div class='add'>+# CONFIG_SERIAL_NONSTANDARD is not set</div><div class='add'>+# CONFIG_NOZOMI is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Serial drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIAL_8250=y</div><div class='add'>+CONFIG_SERIAL_8250_CONSOLE=y</div><div class='add'>+# CONFIG_SERIAL_8250_PCI is not set</div><div class='add'>+CONFIG_SERIAL_8250_NR_UARTS=2</div><div class='add'>+CONFIG_SERIAL_8250_RUNTIME_UARTS=2</div><div class='add'>+# CONFIG_SERIAL_8250_EXTENDED is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Non-8250 serial port support</div><div class='add'>+#</div><div class='add'>+# CONFIG_SERIAL_UARTLITE is not set</div><div class='add'>+CONFIG_SERIAL_CORE=y</div><div class='add'>+CONFIG_SERIAL_CORE_CONSOLE=y</div><div class='add'>+# CONFIG_SERIAL_JSM is not set</div><div class='add'>+# CONFIG_SERIAL_OF_PLATFORM is not set</div><div class='add'>+CONFIG_UNIX98_PTYS=y</div><div class='add'>+# CONFIG_LEGACY_PTYS is not set</div><div class='add'>+# CONFIG_IPMI_HANDLER is not set</div><div class='add'>+CONFIG_HW_RANDOM=y</div><div class='add'>+# CONFIG_NVRAM is not set</div><div class='add'>+# CONFIG_R3964 is not set</div><div class='add'>+# CONFIG_APPLICOM is not set</div><div class='add'>+# CONFIG_RAW_DRIVER is not set</div><div class='add'>+# CONFIG_TCG_TPM is not set</div><div class='add'>+CONFIG_DEVPORT=y</div><div class='add'>+CONFIG_I2C=y</div><div class='add'>+CONFIG_I2C_BOARDINFO=y</div><div class='add'>+CONFIG_I2C_CHARDEV=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C Hardware Bus support</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_ALI1535 is not set</div><div class='add'>+# CONFIG_I2C_ALI1563 is not set</div><div class='add'>+# CONFIG_I2C_ALI15X3 is not set</div><div class='add'>+# CONFIG_I2C_AMD756 is not set</div><div class='add'>+# CONFIG_I2C_AMD8111 is not set</div><div class='add'>+# CONFIG_I2C_I801 is not set</div><div class='add'>+# CONFIG_I2C_I810 is not set</div><div class='add'>+# CONFIG_I2C_PIIX4 is not set</div><div class='add'>+CONFIG_I2C_MPC=y</div><div class='add'>+# CONFIG_I2C_NFORCE2 is not set</div><div class='add'>+# CONFIG_I2C_OCORES is not set</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='add'>+# CONFIG_I2C_PROSAVAGE is not set</div><div class='add'>+# CONFIG_I2C_SAVAGE4 is not set</div><div class='add'>+# CONFIG_I2C_SIMTEC is not set</div><div class='add'>+# CONFIG_I2C_SIS5595 is not set</div><div class='add'>+# CONFIG_I2C_SIS630 is not set</div><div class='add'>+# CONFIG_I2C_SIS96X is not set</div><div class='add'>+# CONFIG_I2C_TAOS_EVM is not set</div><div class='add'>+# CONFIG_I2C_STUB is not set</div><div class='add'>+# CONFIG_I2C_TINY_USB is not set</div><div class='add'>+# CONFIG_I2C_VIA is not set</div><div class='add'>+# CONFIG_I2C_VIAPRO is not set</div><div class='add'>+# CONFIG_I2C_VOODOO3 is not set</div><div class='add'>+# CONFIG_I2C_PCA_PLATFORM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous I2C Chip support</div><div class='add'>+#</div><div class='add'>+CONFIG_DS1682=y</div><div class='add'>+# CONFIG_SENSORS_EEPROM is not set</div><div class='add'>+# CONFIG_SENSORS_PCF8574 is not set</div><div class='add'>+# CONFIG_PCF8575 is not set</div><div class='add'>+# CONFIG_SENSORS_PCF8591 is not set</div><div class='add'>+# CONFIG_SENSORS_MAX6875 is not set</div><div class='add'>+# CONFIG_SENSORS_TSL2550 is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_CORE is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_ALGO is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_BUS is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_CHIP is not set</div><div class='add'>+# CONFIG_SPI is not set</div><div class='add'>+# CONFIG_W1 is not set</div><div class='add'>+# CONFIG_POWER_SUPPLY is not set</div><div class='add'>+CONFIG_HWMON=y</div><div class='add'>+# CONFIG_HWMON_VID is not set</div><div class='add'>+# CONFIG_SENSORS_AD7418 is not set</div><div class='add'>+# CONFIG_SENSORS_ADM1021 is not set</div><div class='add'>+# CONFIG_SENSORS_ADM1025 is not set</div><div class='add'>+# CONFIG_SENSORS_ADM1026 is not set</div><div class='add'>+# CONFIG_SENSORS_ADM1029 is not set</div><div class='add'>+# CONFIG_SENSORS_ADM1031 is not set</div><div class='add'>+# CONFIG_SENSORS_ADM9240 is not set</div><div class='add'>+# CONFIG_SENSORS_ADT7470 is not set</div><div class='add'>+# CONFIG_SENSORS_ADT7473 is not set</div><div class='add'>+# CONFIG_SENSORS_ATXP1 is not set</div><div class='add'>+# CONFIG_SENSORS_DS1621 is not set</div><div class='add'>+# CONFIG_SENSORS_I5K_AMB is not set</div><div class='add'>+# CONFIG_SENSORS_F71805F is not set</div><div class='add'>+# CONFIG_SENSORS_F71882FG is not set</div><div class='add'>+# CONFIG_SENSORS_F75375S is not set</div><div class='add'>+# CONFIG_SENSORS_GL518SM is not set</div><div class='add'>+# CONFIG_SENSORS_GL520SM is not set</div><div class='add'>+# CONFIG_SENSORS_IT87 is not set</div><div class='add'>+# CONFIG_SENSORS_LM63 is not set</div><div class='add'>+# CONFIG_SENSORS_LM75 is not set</div><div class='add'>+# CONFIG_SENSORS_LM77 is not set</div><div class='add'>+# CONFIG_SENSORS_LM78 is not set</div><div class='add'>+# CONFIG_SENSORS_LM80 is not set</div><div class='add'>+# CONFIG_SENSORS_LM83 is not set</div><div class='add'>+# CONFIG_SENSORS_LM85 is not set</div><div class='add'>+# CONFIG_SENSORS_LM87 is not set</div><div class='add'>+CONFIG_SENSORS_LM90=y</div><div class='add'>+CONFIG_SENSORS_LM92=y</div><div class='add'>+# CONFIG_SENSORS_LM93 is not set</div><div class='add'>+# CONFIG_SENSORS_MAX1619 is not set</div><div class='add'>+# CONFIG_SENSORS_MAX6650 is not set</div><div class='add'>+# CONFIG_SENSORS_PC87360 is not set</div><div class='add'>+# CONFIG_SENSORS_PC87427 is not set</div><div class='add'>+# CONFIG_SENSORS_SIS5595 is not set</div><div class='add'>+# CONFIG_SENSORS_DME1737 is not set</div><div class='add'>+# CONFIG_SENSORS_SMSC47M1 is not set</div><div class='add'>+# CONFIG_SENSORS_SMSC47M192 is not set</div><div class='add'>+# CONFIG_SENSORS_SMSC47B397 is not set</div><div class='add'>+# CONFIG_SENSORS_ADS7828 is not set</div><div class='add'>+# CONFIG_SENSORS_THMC50 is not set</div><div class='add'>+# CONFIG_SENSORS_VIA686A is not set</div><div class='add'>+# CONFIG_SENSORS_VT1211 is not set</div><div class='add'>+# CONFIG_SENSORS_VT8231 is not set</div><div class='add'>+# CONFIG_SENSORS_W83781D is not set</div><div class='add'>+# CONFIG_SENSORS_W83791D is not set</div><div class='add'>+# CONFIG_SENSORS_W83792D is not set</div><div class='add'>+# CONFIG_SENSORS_W83793 is not set</div><div class='add'>+# CONFIG_SENSORS_W83L785TS is not set</div><div class='add'>+# CONFIG_SENSORS_W83L786NG is not set</div><div class='add'>+# CONFIG_SENSORS_W83627HF is not set</div><div class='add'>+# CONFIG_SENSORS_W83627EHF is not set</div><div class='add'>+# CONFIG_HWMON_DEBUG_CHIP is not set</div><div class='add'>+# CONFIG_THERMAL is not set</div><div class='add'>+CONFIG_WATCHDOG=y</div><div class='add'>+# CONFIG_WATCHDOG_NOWAYOUT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Watchdog Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_SOFT_WATCHDOG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCI-based Watchdog Cards</div><div class='add'>+#</div><div class='add'>+# CONFIG_PCIPCWATCHDOG is not set</div><div class='add'>+# CONFIG_WDTPCI is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB-based Watchdog Cards</div><div class='add'>+#</div><div class='add'>+# CONFIG_USBPCWATCHDOG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Sonics Silicon Backplane</div><div class='add'>+#</div><div class='add'>+CONFIG_SSB_POSSIBLE=y</div><div class='add'>+# CONFIG_SSB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multifunction device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MFD_SM501 is not set</div><div class='add'>+# CONFIG_HTC_PASIC3 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia core support</div><div class='add'>+#</div><div class='add'>+# CONFIG_VIDEO_DEV is not set</div><div class='add'>+# CONFIG_DVB_CORE is not set</div><div class='add'>+# CONFIG_VIDEO_MEDIA is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_DAB=y</div><div class='add'>+# CONFIG_USB_DABUSB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics support</div><div class='add'>+#</div><div class='add'>+# CONFIG_AGP is not set</div><div class='add'>+# CONFIG_DRM is not set</div><div class='add'>+# CONFIG_VGASTATE is not set</div><div class='add'>+CONFIG_VIDEO_OUTPUT_CONTROL=m</div><div class='add'>+# CONFIG_FB is not set</div><div class='add'>+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Display device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DISPLAY_SUPPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Console display driver support</div><div class='add'>+#</div><div class='add'>+CONFIG_VGA_CONSOLE=y</div><div class='add'>+# CONFIG_VGACON_SOFT_SCROLLBACK is not set</div><div class='add'>+CONFIG_DUMMY_CONSOLE=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Sound</div><div class='add'>+#</div><div class='add'>+# CONFIG_SOUND is not set</div><div class='add'>+CONFIG_HID_SUPPORT=y</div><div class='add'>+CONFIG_HID=y</div><div class='add'>+# CONFIG_HID_DEBUG is not set</div><div class='add'>+# CONFIG_HIDRAW is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Input Devices</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_HID=y</div><div class='add'>+# CONFIG_USB_HIDINPUT_POWERBOOK is not set</div><div class='add'>+# CONFIG_HID_FF is not set</div><div class='add'>+# CONFIG_USB_HIDDEV is not set</div><div class='add'>+CONFIG_USB_SUPPORT=y</div><div class='add'>+CONFIG_USB_ARCH_HAS_HCD=y</div><div class='add'>+CONFIG_USB_ARCH_HAS_OHCI=y</div><div class='add'>+CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='add'>+CONFIG_USB=y</div><div class='add'>+# CONFIG_USB_DEBUG is not set</div><div class='add'>+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous USB options</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_DEVICEFS is not set</div><div class='add'>+# CONFIG_USB_DEVICE_CLASS is not set</div><div class='add'>+# CONFIG_USB_DYNAMIC_MINORS is not set</div><div class='add'>+# CONFIG_USB_OTG is not set</div><div class='add'>+# CONFIG_USB_OTG_WHITELIST is not set</div><div class='add'>+# CONFIG_USB_OTG_BLACKLIST_HUB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Host Controller Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_C67X00_HCD is not set</div><div class='add'>+CONFIG_USB_EHCI_HCD=y</div><div class='add'>+# CONFIG_USB_EHCI_ROOT_HUB_TT is not set</div><div class='add'>+# CONFIG_USB_EHCI_TT_NEWSCHED is not set</div><div class='add'>+# CONFIG_USB_EHCI_FSL is not set</div><div class='add'>+# CONFIG_USB_EHCI_HCD_PPC_OF is not set</div><div class='add'>+# CONFIG_USB_ISP116X_HCD is not set</div><div class='add'>+# CONFIG_USB_ISP1760_HCD is not set</div><div class='add'>+CONFIG_USB_OHCI_HCD=y</div><div class='add'>+# CONFIG_USB_OHCI_HCD_PPC_OF is not set</div><div class='add'>+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set</div><div class='add'>+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set</div><div class='add'>+CONFIG_USB_OHCI_LITTLE_ENDIAN=y</div><div class='add'>+# CONFIG_USB_UHCI_HCD is not set</div><div class='add'>+# CONFIG_USB_SL811_HCD is not set</div><div class='add'>+# CONFIG_USB_R8A66597_HCD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Device Class drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_ACM is not set</div><div class='add'>+# CONFIG_USB_PRINTER is not set</div><div class='add'>+# CONFIG_USB_WDM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# may also be needed; see USB_STORAGE Help for more information</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_STORAGE=y</div><div class='add'>+# CONFIG_USB_STORAGE_DEBUG is not set</div><div class='add'>+# CONFIG_USB_STORAGE_DATAFAB is not set</div><div class='add'>+# CONFIG_USB_STORAGE_FREECOM is not set</div><div class='add'>+# CONFIG_USB_STORAGE_ISD200 is not set</div><div class='add'>+# CONFIG_USB_STORAGE_DPCM is not set</div><div class='add'>+# CONFIG_USB_STORAGE_USBAT is not set</div><div class='add'>+# CONFIG_USB_STORAGE_SDDR09 is not set</div><div class='add'>+# CONFIG_USB_STORAGE_SDDR55 is not set</div><div class='add'>+# CONFIG_USB_STORAGE_JUMPSHOT is not set</div><div class='add'>+# CONFIG_USB_STORAGE_ALAUDA is not set</div><div class='add'>+# CONFIG_USB_STORAGE_ONETOUCH is not set</div><div class='add'>+# CONFIG_USB_STORAGE_KARMA is not set</div><div class='add'>+# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set</div><div class='add'>+# CONFIG_USB_LIBUSUAL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Imaging devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_MDC800 is not set</div><div class='add'>+# CONFIG_USB_MICROTEK is not set</div><div class='add'>+# CONFIG_USB_MON is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB port drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_SERIAL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Miscellaneous drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_EMI62 is not set</div><div class='add'>+# CONFIG_USB_EMI26 is not set</div><div class='add'>+# CONFIG_USB_ADUTUX is not set</div><div class='add'>+# CONFIG_USB_AUERSWALD is not set</div><div class='add'>+# CONFIG_USB_RIO500 is not set</div><div class='add'>+# CONFIG_USB_LEGOTOWER is not set</div><div class='add'>+# CONFIG_USB_LCD is not set</div><div class='add'>+# CONFIG_USB_BERRY_CHARGE is not set</div><div class='add'>+# CONFIG_USB_LED is not set</div><div class='add'>+# CONFIG_USB_CYPRESS_CY7C63 is not set</div><div class='add'>+# CONFIG_USB_CYTHERM is not set</div><div class='add'>+# CONFIG_USB_PHIDGET is not set</div><div class='add'>+# CONFIG_USB_IDMOUSE is not set</div><div class='add'>+# CONFIG_USB_FTDI_ELAN is not set</div><div class='add'>+# CONFIG_USB_APPLEDISPLAY is not set</div><div class='add'>+# CONFIG_USB_SISUSBVGA is not set</div><div class='add'>+# CONFIG_USB_LD is not set</div><div class='add'>+# CONFIG_USB_TRANCEVIBRATOR is not set</div><div class='add'>+# CONFIG_USB_IOWARRIOR is not set</div><div class='add'>+# CONFIG_USB_ISIGHTFW is not set</div><div class='add'>+# CONFIG_USB_ATM is not set</div><div class='add'>+# CONFIG_USB_GADGET is not set</div><div class='add'>+# CONFIG_MMC is not set</div><div class='add'>+# CONFIG_MEMSTICK is not set</div><div class='add'>+# CONFIG_NEW_LEDS is not set</div><div class='add'>+# CONFIG_ACCESSIBILITY is not set</div><div class='add'>+# CONFIG_INFINIBAND is not set</div><div class='add'>+# CONFIG_EDAC is not set</div><div class='add'>+CONFIG_RTC_LIB=m</div><div class='add'>+CONFIG_RTC_CLASS=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# RTC interfaces</div><div class='add'>+#</div><div class='add'>+CONFIG_RTC_INTF_SYSFS=y</div><div class='add'>+# CONFIG_RTC_INTF_PROC is not set</div><div class='add'>+CONFIG_RTC_INTF_DEV=y</div><div class='add'>+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set</div><div class='add'>+# CONFIG_RTC_DRV_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C RTC drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_RTC_DRV_DS1307 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1374 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1672 is not set</div><div class='add'>+# CONFIG_RTC_DRV_MAX6900 is not set</div><div class='add'>+# CONFIG_RTC_DRV_RS5C372 is not set</div><div class='add'>+# CONFIG_RTC_DRV_ISL1208 is not set</div><div class='add'>+# CONFIG_RTC_DRV_X1205 is not set</div><div class='add'>+# CONFIG_RTC_DRV_PCF8563 is not set</div><div class='add'>+# CONFIG_RTC_DRV_PCF8583 is not set</div><div class='add'>+# CONFIG_RTC_DRV_M41T80 is not set</div><div class='add'>+# CONFIG_RTC_DRV_S35390A is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI RTC drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Platform RTC drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_RTC_DRV_CMOS is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1511 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1553 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1742 is not set</div><div class='add'>+# CONFIG_RTC_DRV_STK17TA8 is not set</div><div class='add'>+# CONFIG_RTC_DRV_M48T86 is not set</div><div class='add'>+# CONFIG_RTC_DRV_M48T59 is not set</div><div class='add'>+# CONFIG_RTC_DRV_V3020 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# on-CPU RTC drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_RTC_DRV_PPC is not set</div><div class='add'>+# CONFIG_DMADEVICES is not set</div><div class='add'>+# CONFIG_UIO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# File systems</div><div class='add'>+#</div><div class='add'>+CONFIG_EXT2_FS=y</div><div class='add'>+CONFIG_EXT2_FS_XATTR=y</div><div class='add'>+CONFIG_EXT2_FS_POSIX_ACL=y</div><div class='add'>+# CONFIG_EXT2_FS_SECURITY is not set</div><div class='add'>+# CONFIG_EXT2_FS_XIP is not set</div><div class='add'>+CONFIG_EXT3_FS=y</div><div class='add'>+CONFIG_EXT3_FS_XATTR=y</div><div class='add'>+CONFIG_EXT3_FS_POSIX_ACL=y</div><div class='add'>+# CONFIG_EXT3_FS_SECURITY is not set</div><div class='add'>+# CONFIG_EXT4DEV_FS is not set</div><div class='add'>+CONFIG_JBD=y</div><div class='add'>+CONFIG_FS_MBCACHE=y</div><div class='add'>+# CONFIG_REISERFS_FS is not set</div><div class='add'>+# CONFIG_JFS_FS is not set</div><div class='add'>+CONFIG_FS_POSIX_ACL=y</div><div class='add'>+# CONFIG_XFS_FS is not set</div><div class='add'>+# CONFIG_OCFS2_FS is not set</div><div class='add'>+CONFIG_DNOTIFY=y</div><div class='add'>+CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='add'>+# CONFIG_QUOTA is not set</div><div class='add'>+# CONFIG_AUTOFS_FS is not set</div><div class='add'>+# CONFIG_AUTOFS4_FS is not set</div><div class='add'>+# CONFIG_FUSE_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CD-ROM/DVD Filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ISO9660_FS is not set</div><div class='add'>+# CONFIG_UDF_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DOS/FAT/NT Filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_FAT_FS=y</div><div class='add'>+CONFIG_MSDOS_FS=y</div><div class='add'>+CONFIG_VFAT_FS=y</div><div class='add'>+CONFIG_FAT_DEFAULT_CODEPAGE=437</div><div class='add'>+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"</div><div class='add'>+# CONFIG_NTFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Pseudo filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_PROC_FS=y</div><div class='add'>+CONFIG_PROC_KCORE=y</div><div class='add'>+CONFIG_PROC_SYSCTL=y</div><div class='add'>+CONFIG_SYSFS=y</div><div class='add'>+CONFIG_TMPFS=y</div><div class='add'>+# CONFIG_TMPFS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_HUGETLB_PAGE is not set</div><div class='add'>+# CONFIG_CONFIGFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ADFS_FS is not set</div><div class='add'>+# CONFIG_AFFS_FS is not set</div><div class='add'>+# CONFIG_HFS_FS is not set</div><div class='add'>+# CONFIG_HFSPLUS_FS is not set</div><div class='add'>+# CONFIG_BEFS_FS is not set</div><div class='add'>+# CONFIG_BFS_FS is not set</div><div class='add'>+# CONFIG_EFS_FS is not set</div><div class='add'>+# CONFIG_JFFS2_FS is not set</div><div class='add'>+# CONFIG_CRAMFS is not set</div><div class='add'>+# CONFIG_VXFS_FS is not set</div><div class='add'>+# CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_HPFS_FS is not set</div><div class='add'>+# CONFIG_QNX4FS_FS is not set</div><div class='add'>+# CONFIG_ROMFS_FS is not set</div><div class='add'>+# CONFIG_SYSV_FS is not set</div><div class='add'>+# CONFIG_UFS_FS is not set</div><div class='add'>+CONFIG_NETWORK_FILESYSTEMS=y</div><div class='add'>+CONFIG_NFS_FS=y</div><div class='add'>+CONFIG_NFS_V3=y</div><div class='add'>+# CONFIG_NFS_V3_ACL is not set</div><div class='add'>+CONFIG_NFS_V4=y</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='add'>+CONFIG_ROOT_NFS=y</div><div class='add'>+CONFIG_LOCKD=y</div><div class='add'>+CONFIG_LOCKD_V4=y</div><div class='add'>+CONFIG_NFS_COMMON=y</div><div class='add'>+CONFIG_SUNRPC=y</div><div class='add'>+CONFIG_SUNRPC_GSS=y</div><div class='add'>+# CONFIG_SUNRPC_BIND34 is not set</div><div class='add'>+CONFIG_RPCSEC_GSS_KRB5=y</div><div class='add'>+# CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='add'>+# CONFIG_SMB_FS is not set</div><div class='add'>+CONFIG_CIFS=m</div><div class='add'>+# CONFIG_CIFS_STATS is not set</div><div class='add'>+# CONFIG_CIFS_WEAK_PW_HASH is not set</div><div class='add'>+CONFIG_CIFS_XATTR=y</div><div class='add'>+CONFIG_CIFS_POSIX=y</div><div class='add'>+# CONFIG_CIFS_DEBUG2 is not set</div><div class='add'>+# CONFIG_CIFS_EXPERIMENTAL is not set</div><div class='add'>+# CONFIG_NCP_FS is not set</div><div class='add'>+# CONFIG_CODA_FS is not set</div><div class='add'>+# CONFIG_AFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Partition Types</div><div class='add'>+#</div><div class='add'>+# CONFIG_PARTITION_ADVANCED is not set</div><div class='add'>+CONFIG_MSDOS_PARTITION=y</div><div class='add'>+CONFIG_NLS=y</div><div class='add'>+CONFIG_NLS_DEFAULT="iso8859-1"</div><div class='add'>+CONFIG_NLS_CODEPAGE_437=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_737=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_775=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_850=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_852=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_855=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_857=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_860=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_861=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_862=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_863=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_864=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_865=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_866=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_869=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_936=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_950=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_932=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_949=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_874=m</div><div class='add'>+CONFIG_NLS_ISO8859_8=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_1250=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_1251=m</div><div class='add'>+CONFIG_NLS_ASCII=m</div><div class='add'>+CONFIG_NLS_ISO8859_1=m</div><div class='add'>+CONFIG_NLS_ISO8859_2=m</div><div class='add'>+CONFIG_NLS_ISO8859_3=m</div><div class='add'>+CONFIG_NLS_ISO8859_4=m</div><div class='add'>+CONFIG_NLS_ISO8859_5=m</div><div class='add'>+CONFIG_NLS_ISO8859_6=m</div><div class='add'>+CONFIG_NLS_ISO8859_7=m</div><div class='add'>+CONFIG_NLS_ISO8859_9=m</div><div class='add'>+CONFIG_NLS_ISO8859_13=m</div><div class='add'>+CONFIG_NLS_ISO8859_14=m</div><div class='add'>+CONFIG_NLS_ISO8859_15=m</div><div class='add'>+CONFIG_NLS_KOI8_R=m</div><div class='add'>+CONFIG_NLS_KOI8_U=m</div><div class='add'>+CONFIG_NLS_UTF8=m</div><div class='add'>+# CONFIG_DLM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Library routines</div><div class='add'>+#</div><div class='add'>+CONFIG_BITREVERSE=y</div><div class='add'>+# CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='add'>+CONFIG_CRC_CCITT=m</div><div class='add'>+# CONFIG_CRC16 is not set</div><div class='add'>+# CONFIG_CRC_ITU_T is not set</div><div class='add'>+CONFIG_CRC32=y</div><div class='add'>+# CONFIG_CRC7 is not set</div><div class='add'>+CONFIG_LIBCRC32C=m</div><div class='add'>+CONFIG_ZLIB_INFLATE=m</div><div class='add'>+CONFIG_ZLIB_DEFLATE=m</div><div class='add'>+CONFIG_PLIST=y</div><div class='add'>+CONFIG_HAS_IOMEM=y</div><div class='add'>+CONFIG_HAS_IOPORT=y</div><div class='add'>+CONFIG_HAS_DMA=y</div><div class='add'>+CONFIG_HAVE_LMB=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel hacking</div><div class='add'>+#</div><div class='add'>+# CONFIG_PRINTK_TIME is not set</div><div class='add'>+CONFIG_ENABLE_WARN_DEPRECATED=y</div><div class='add'>+CONFIG_ENABLE_MUST_CHECK=y</div><div class='add'>+CONFIG_FRAME_WARN=1024</div><div class='add'>+CONFIG_MAGIC_SYSRQ=y</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='add'>+# CONFIG_DEBUG_FS is not set</div><div class='add'>+# CONFIG_HEADERS_CHECK is not set</div><div class='add'>+CONFIG_DEBUG_KERNEL=y</div><div class='add'>+# CONFIG_DEBUG_SHIRQ is not set</div><div class='add'>+CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+CONFIG_SCHED_DEBUG=y</div><div class='add'>+# CONFIG_SCHEDSTATS is not set</div><div class='add'>+# CONFIG_TIMER_STATS is not set</div><div class='add'>+# CONFIG_DEBUG_OBJECTS is not set</div><div class='add'>+# CONFIG_DEBUG_SLAB is not set</div><div class='add'>+# CONFIG_DEBUG_RT_MUTEXES is not set</div><div class='add'>+# CONFIG_RT_MUTEX_TESTER is not set</div><div class='add'>+# CONFIG_DEBUG_SPINLOCK is not set</div><div class='add'>+# CONFIG_DEBUG_MUTEXES is not set</div><div class='add'>+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set</div><div class='add'>+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set</div><div class='add'>+# CONFIG_DEBUG_KOBJECT is not set</div><div class='add'>+# CONFIG_DEBUG_BUGVERBOSE is not set</div><div class='add'>+CONFIG_DEBUG_INFO=y</div><div class='add'>+# CONFIG_DEBUG_VM is not set</div><div class='add'>+# CONFIG_DEBUG_WRITECOUNT is not set</div><div class='add'>+# CONFIG_DEBUG_LIST is not set</div><div class='add'>+# CONFIG_DEBUG_SG is not set</div><div class='add'>+# CONFIG_BOOT_PRINTK_DELAY is not set</div><div class='add'>+# CONFIG_RCU_TORTURE_TEST is not set</div><div class='add'>+# CONFIG_BACKTRACE_SELF_TEST is not set</div><div class='add'>+# CONFIG_FAULT_INJECTION is not set</div><div class='add'>+# CONFIG_SAMPLES is not set</div><div class='add'>+# CONFIG_DEBUG_STACKOVERFLOW is not set</div><div class='add'>+# CONFIG_DEBUG_STACK_USAGE is not set</div><div class='add'>+# CONFIG_DEBUG_PAGEALLOC is not set</div><div class='add'>+CONFIG_DEBUGGER=y</div><div class='add'>+# CONFIG_XMON is not set</div><div class='add'>+# CONFIG_IRQSTACKS is not set</div><div class='add'>+# CONFIG_BDI_SWITCH is not set</div><div class='add'>+# CONFIG_PPC_EARLY_DEBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Security options</div><div class='add'>+#</div><div class='add'>+# CONFIG_KEYS is not set</div><div class='add'>+CONFIG_SECURITY=y</div><div class='add'>+CONFIG_SECURITY_NETWORK=y</div><div class='add'>+# CONFIG_SECURITY_NETWORK_XFRM is not set</div><div class='add'>+CONFIG_SECURITY_CAPABILITIES=y</div><div class='add'>+# CONFIG_SECURITY_FILE_CAPABILITIES is not set</div><div class='add'>+# CONFIG_SECURITY_ROOTPLUG is not set</div><div class='add'>+CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=0</div><div class='add'>+CONFIG_CRYPTO=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Crypto core or helper</div><div class='add'>+#</div><div class='add'>+CONFIG_CRYPTO_ALGAPI=y</div><div class='add'>+CONFIG_CRYPTO_AEAD=m</div><div class='add'>+CONFIG_CRYPTO_BLKCIPHER=y</div><div class='add'>+CONFIG_CRYPTO_HASH=y</div><div class='add'>+CONFIG_CRYPTO_MANAGER=y</div><div class='add'>+# CONFIG_CRYPTO_GF128MUL is not set</div><div class='add'>+CONFIG_CRYPTO_NULL=m</div><div class='add'>+# CONFIG_CRYPTO_CRYPTD is not set</div><div class='add'>+CONFIG_CRYPTO_AUTHENC=m</div><div class='add'>+CONFIG_CRYPTO_TEST=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Authenticated Encryption with Associated Data</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CCM is not set</div><div class='add'>+# CONFIG_CRYPTO_GCM is not set</div><div class='add'>+# CONFIG_CRYPTO_SEQIV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block modes</div><div class='add'>+#</div><div class='add'>+CONFIG_CRYPTO_CBC=y</div><div class='add'>+# CONFIG_CRYPTO_CTR is not set</div><div class='add'>+# CONFIG_CRYPTO_CTS is not set</div><div class='add'>+CONFIG_CRYPTO_ECB=m</div><div class='add'>+# CONFIG_CRYPTO_LRW is not set</div><div class='add'>+CONFIG_CRYPTO_PCBC=m</div><div class='add'>+# CONFIG_CRYPTO_XTS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hash modes</div><div class='add'>+#</div><div class='add'>+CONFIG_CRYPTO_HMAC=y</div><div class='add'>+# CONFIG_CRYPTO_XCBC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Digest</div><div class='add'>+#</div><div class='add'>+CONFIG_CRYPTO_CRC32C=m</div><div class='add'>+CONFIG_CRYPTO_MD4=m</div><div class='add'>+CONFIG_CRYPTO_MD5=y</div><div class='add'>+CONFIG_CRYPTO_MICHAEL_MIC=m</div><div class='add'>+CONFIG_CRYPTO_SHA1=m</div><div class='add'>+CONFIG_CRYPTO_SHA256=m</div><div class='add'>+CONFIG_CRYPTO_SHA512=m</div><div class='add'>+# CONFIG_CRYPTO_TGR192 is not set</div><div class='add'>+CONFIG_CRYPTO_WP512=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ciphers</div><div class='add'>+#</div><div class='add'>+CONFIG_CRYPTO_AES=m</div><div class='add'>+CONFIG_CRYPTO_ANUBIS=m</div><div class='add'>+CONFIG_CRYPTO_ARC4=m</div><div class='add'>+CONFIG_CRYPTO_BLOWFISH=m</div><div class='add'>+# CONFIG_CRYPTO_CAMELLIA is not set</div><div class='add'>+CONFIG_CRYPTO_CAST5=m</div><div class='add'>+CONFIG_CRYPTO_CAST6=m</div><div class='add'>+CONFIG_CRYPTO_DES=y</div><div class='add'>+# CONFIG_CRYPTO_FCRYPT is not set</div><div class='add'>+CONFIG_CRYPTO_KHAZAD=m</div><div class='add'>+# CONFIG_CRYPTO_SALSA20 is not set</div><div class='add'>+# CONFIG_CRYPTO_SEED is not set</div><div class='add'>+CONFIG_CRYPTO_SERPENT=m</div><div class='add'>+CONFIG_CRYPTO_TEA=m</div><div class='add'>+CONFIG_CRYPTO_TWOFISH=m</div><div class='add'>+CONFIG_CRYPTO_TWOFISH_COMMON=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Compression</div><div class='add'>+#</div><div class='add'>+CONFIG_CRYPTO_DEFLATE=m</div><div class='add'>+# CONFIG_CRYPTO_LZO is not set</div><div class='add'>+# CONFIG_CRYPTO_HW is not set</div><div class='add'>+# CONFIG_PPC_CLOCK is not set</div><div class='add'>+# CONFIG_VIRTUALIZATION is not set</div><div class='head'>diff --git a/arch/powerpc/configs/mpc8610_hpcd_defconfig b/arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig<br/>index 1a9990731eb0..c98c6ee44492 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/configs/mpc8610_hpcd_defconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/configs/mpc8610_hpcd_defconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig</a></div><div class='hunk'>@@ -165,11 +165,11 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> #</div><div class='ctx'> CONFIG_PPC_MULTIPLATFORM=y</div><div class='ctx'> CONFIG_CLASSIC32=y</div><div class='del'>-CONFIG_PPC_CHRP=y</div><div class='add'>+# CONFIG_PPC_CHRP is not set</div><div class='add'>+# CONFIG_PPC_PMAC is not set</div><div class='ctx'> # CONFIG_MPC5121_ADS is not set</div><div class='ctx'> # CONFIG_MPC5121_GENERIC is not set</div><div class='ctx'> # CONFIG_PPC_MPC52xx is not set</div><div class='del'>-CONFIG_PPC_PMAC=y</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='ctx'> # CONFIG_PPC_82xx is not set</div><div class='head'>diff --git a/arch/powerpc/configs/mpc8641_hpcn_defconfig b/arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig<br/>index ea09be31b6ea..444ddf98436d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/configs/mpc8641_hpcn_defconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/configs/mpc8641_hpcn_defconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig</a></div><div class='hunk'>@@ -167,11 +167,11 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> #</div><div class='ctx'> CONFIG_PPC_MULTIPLATFORM=y</div><div class='ctx'> CONFIG_CLASSIC32=y</div><div class='del'>-CONFIG_PPC_CHRP=y</div><div class='add'>+# CONFIG_PPC_CHRP is not set</div><div class='add'>+# CONFIG_PPC_PMAC is not set</div><div class='ctx'> # CONFIG_MPC5121_ADS is not set</div><div class='ctx'> # CONFIG_MPC5121_GENERIC is not set</div><div class='ctx'> # CONFIG_PPC_MPC52xx is not set</div><div class='del'>-CONFIG_PPC_PMAC=y</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='ctx'> # CONFIG_PPC_82xx is not set</div><div class='head'>diff --git a/arch/powerpc/configs/sbc8641d_defconfig b/arch/powerpc/configs/86xx/sbc8641d_defconfig<br/>index f545421f9857..d900f8f376cf 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/configs/sbc8641d_defconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/configs/sbc8641d_defconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/configs/86xx/sbc8641d_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/configs/86xx/sbc8641d_defconfig</a></div><div class='hunk'>@@ -166,11 +166,11 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> #</div><div class='ctx'> CONFIG_PPC_MULTIPLATFORM=y</div><div class='ctx'> CONFIG_CLASSIC32=y</div><div class='del'>-CONFIG_PPC_CHRP=y</div><div class='add'>+# CONFIG_PPC_CHRP is not set</div><div class='add'>+# CONFIG_PPC_PMAC is not set</div><div class='ctx'> # CONFIG_MPC5121_ADS is not set</div><div class='ctx'> # CONFIG_MPC5121_GENERIC is not set</div><div class='ctx'> # CONFIG_PPC_MPC52xx is not set</div><div class='del'>-CONFIG_PPC_PMAC=y</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='ctx'> # CONFIG_PPC_82xx is not set</div><div class='head'>diff --git a/arch/powerpc/configs/ep8248e_defconfig b/arch/powerpc/configs/ep8248e_defconfig<br/>index ef0c6e800508..cd691f770810 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/configs/ep8248e_defconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/configs/ep8248e_defconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/configs/ep8248e_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/configs/ep8248e_defconfig</a></div><div class='hunk'>@@ -150,11 +150,11 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> #</div><div class='ctx'> CONFIG_PPC_MULTIPLATFORM=y</div><div class='ctx'> CONFIG_CLASSIC32=y</div><div class='del'>-CONFIG_PPC_CHRP=y</div><div class='add'>+# CONFIG_PPC_CHRP is not set</div><div class='add'>+# CONFIG_PPC_PMAC is not set</div><div class='ctx'> # CONFIG_MPC5121_ADS is not set</div><div class='ctx'> # CONFIG_MPC5121_GENERIC is not set</div><div class='ctx'> # CONFIG_PPC_MPC52xx is not set</div><div class='del'>-CONFIG_PPC_PMAC=y</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='ctx'> CONFIG_PPC_82xx=y</div><div class='head'>diff --git a/arch/powerpc/configs/mgcoge_defconfig b/arch/powerpc/configs/mgcoge_defconfig<br/>new file mode 100644<br/>index 000000000000..cc9eaba8c9c9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/configs/mgcoge_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/configs/mgcoge_defconfig</a></div><div class='hunk'>@@ -0,0 +1,900 @@</div><div class='add'>+#</div><div class='add'>+# Automatically generated make config: don't edit</div><div class='add'>+# Linux kernel version: 2.6.26-rc2</div><div class='add'>+# Thu May 22 08:18:47 2008</div><div class='add'>+#</div><div class='add'>+# CONFIG_PPC64 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Processor support</div><div class='add'>+#</div><div class='add'>+CONFIG_6xx=y</div><div class='add'>+# CONFIG_PPC_85xx is not set</div><div class='add'>+# CONFIG_PPC_8xx is not set</div><div class='add'>+# CONFIG_40x is not set</div><div class='add'>+# CONFIG_44x is not set</div><div class='add'>+# CONFIG_E200 is not set</div><div class='add'>+CONFIG_PPC_FPU=y</div><div class='add'>+CONFIG_PPC_STD_MMU=y</div><div class='add'>+CONFIG_PPC_STD_MMU_32=y</div><div class='add'>+# CONFIG_PPC_MM_SLICES is not set</div><div class='add'>+# CONFIG_SMP is not set</div><div class='add'>+CONFIG_PPC32=y</div><div class='add'>+CONFIG_WORD_SIZE=32</div><div class='add'>+CONFIG_PPC_MERGE=y</div><div class='add'>+CONFIG_MMU=y</div><div class='add'>+CONFIG_GENERIC_CMOS_UPDATE=y</div><div class='add'>+CONFIG_GENERIC_TIME=y</div><div class='add'>+CONFIG_GENERIC_TIME_VSYSCALL=y</div><div class='add'>+CONFIG_GENERIC_CLOCKEVENTS=y</div><div class='add'>+CONFIG_GENERIC_HARDIRQS=y</div><div class='add'>+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set</div><div class='add'>+CONFIG_IRQ_PER_CPU=y</div><div class='add'>+CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_LOCKDEP_SUPPORT=y</div><div class='add'>+CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='add'>+CONFIG_ARCH_HAS_ILOG2_U32=y</div><div class='add'>+CONFIG_GENERIC_HWEIGHT=y</div><div class='add'>+CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='add'>+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set</div><div class='add'>+CONFIG_PPC=y</div><div class='add'>+CONFIG_EARLY_PRINTK=y</div><div class='add'>+CONFIG_GENERIC_NVRAM=y</div><div class='add'>+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y</div><div class='add'>+CONFIG_ARCH_MAY_HAVE_PC_FDC=y</div><div class='add'>+CONFIG_PPC_OF=y</div><div class='add'>+CONFIG_OF=y</div><div class='add'>+# CONFIG_PPC_UDBG_16550 is not set</div><div class='add'>+# CONFIG_GENERIC_TBSYNC is not set</div><div class='add'>+CONFIG_AUDIT_ARCH=y</div><div class='add'>+CONFIG_GENERIC_BUG=y</div><div class='add'>+# CONFIG_DEFAULT_UIMAGE is not set</div><div class='add'>+# CONFIG_PPC_DCR_NATIVE is not set</div><div class='add'>+# CONFIG_PPC_DCR_MMIO is not set</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# General setup</div><div class='add'>+#</div><div class='add'>+# CONFIG_EXPERIMENTAL is not set</div><div class='add'>+CONFIG_BROKEN_ON_SMP=y</div><div class='add'>+CONFIG_INIT_ENV_ARG_LIMIT=32</div><div class='add'>+CONFIG_LOCALVERSION=""</div><div class='add'>+CONFIG_LOCALVERSION_AUTO=y</div><div class='add'>+CONFIG_SWAP=y</div><div class='add'>+CONFIG_SYSVIPC=y</div><div class='add'>+CONFIG_SYSVIPC_SYSCTL=y</div><div class='add'>+# CONFIG_BSD_PROCESS_ACCT is not set</div><div class='add'>+# CONFIG_TASKSTATS is not set</div><div class='add'>+# CONFIG_AUDIT is not set</div><div class='add'>+CONFIG_IKCONFIG=y</div><div class='add'>+CONFIG_IKCONFIG_PROC=y</div><div class='add'>+CONFIG_LOG_BUF_SHIFT=14</div><div class='add'>+# CONFIG_CGROUPS is not set</div><div class='add'>+CONFIG_SYSFS_DEPRECATED=y</div><div class='add'>+CONFIG_SYSFS_DEPRECATED_V2=y</div><div class='add'>+# CONFIG_RELAY is not set</div><div class='add'>+# CONFIG_NAMESPACES is not set</div><div class='add'>+CONFIG_BLK_DEV_INITRD=y</div><div class='add'>+CONFIG_INITRAMFS_SOURCE=""</div><div class='add'>+CONFIG_CC_OPTIMIZE_FOR_SIZE=y</div><div class='add'>+CONFIG_SYSCTL=y</div><div class='add'>+CONFIG_EMBEDDED=y</div><div class='add'>+CONFIG_SYSCTL_SYSCALL=y</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='add'>+CONFIG_KALLSYMS=y</div><div class='add'>+CONFIG_KALLSYMS_ALL=y</div><div class='add'>+# CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='add'>+CONFIG_HOTPLUG=y</div><div class='add'>+CONFIG_PRINTK=y</div><div class='add'>+CONFIG_BUG=y</div><div class='add'>+CONFIG_ELF_CORE=y</div><div class='add'>+CONFIG_COMPAT_BRK=y</div><div class='add'>+CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_FUTEX=y</div><div class='add'>+CONFIG_ANON_INODES=y</div><div class='add'>+CONFIG_EPOLL=y</div><div class='add'>+CONFIG_SIGNALFD=y</div><div class='add'>+CONFIG_TIMERFD=y</div><div class='add'>+CONFIG_EVENTFD=y</div><div class='add'>+CONFIG_SHMEM=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='add'>+CONFIG_SLAB=y</div><div class='add'>+# CONFIG_SLUB is not set</div><div class='add'>+# CONFIG_SLOB is not set</div><div class='add'>+# CONFIG_PROFILING is not set</div><div class='add'>+# CONFIG_MARKERS is not set</div><div class='add'>+CONFIG_HAVE_OPROFILE=y</div><div class='add'>+CONFIG_HAVE_KPROBES=y</div><div class='add'>+CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+# CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+CONFIG_SLABINFO=y</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='add'>+# CONFIG_TINY_SHMEM is not set</div><div class='add'>+CONFIG_BASE_SMALL=0</div><div class='add'>+# CONFIG_MODULES is not set</div><div class='add'>+CONFIG_BLOCK=y</div><div class='add'>+# CONFIG_LBD is not set</div><div class='add'>+# CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='add'>+# CONFIG_LSF is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IO Schedulers</div><div class='add'>+#</div><div class='add'>+CONFIG_IOSCHED_NOOP=y</div><div class='add'>+# CONFIG_IOSCHED_AS is not set</div><div class='add'>+CONFIG_IOSCHED_DEADLINE=y</div><div class='add'>+# CONFIG_IOSCHED_CFQ is not set</div><div class='add'>+# CONFIG_DEFAULT_AS is not set</div><div class='add'>+CONFIG_DEFAULT_DEADLINE=y</div><div class='add'>+# CONFIG_DEFAULT_CFQ is not set</div><div class='add'>+# CONFIG_DEFAULT_NOOP is not set</div><div class='add'>+CONFIG_DEFAULT_IOSCHED="deadline"</div><div class='add'>+CONFIG_CLASSIC_RCU=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Platform support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PPC_MULTIPLATFORM is not set</div><div class='add'>+CONFIG_PPC_82xx=y</div><div class='add'>+# CONFIG_PPC_83xx is not set</div><div class='add'>+# CONFIG_PPC_86xx is not set</div><div class='add'>+# CONFIG_PPC_MPC512x is not set</div><div class='add'>+# CONFIG_PPC_MPC5121 is not set</div><div class='add'>+# CONFIG_PPC_CELL is not set</div><div class='add'>+# CONFIG_PPC_CELL_NATIVE is not set</div><div class='add'>+# CONFIG_MPC8272_ADS is not set</div><div class='add'>+# CONFIG_PQ2FADS is not set</div><div class='add'>+# CONFIG_EP8248E is not set</div><div class='add'>+CONFIG_MGCOGE=y</div><div class='add'>+# CONFIG_PQ2ADS is not set</div><div class='add'>+CONFIG_8260=y</div><div class='add'>+CONFIG_8272=y</div><div class='add'>+# CONFIG_IPIC is not set</div><div class='add'>+# CONFIG_MPIC is not set</div><div class='add'>+# CONFIG_MPIC_WEIRD is not set</div><div class='add'>+# CONFIG_PPC_I8259 is not set</div><div class='add'>+# CONFIG_PPC_RTAS is not set</div><div class='add'>+# CONFIG_MMIO_NVRAM is not set</div><div class='add'>+# CONFIG_PPC_MPC106 is not set</div><div class='add'>+# CONFIG_PPC_970_NAP is not set</div><div class='add'>+# CONFIG_PPC_INDIRECT_IO is not set</div><div class='add'>+# CONFIG_GENERIC_IOMAP is not set</div><div class='add'>+# CONFIG_CPU_FREQ is not set</div><div class='add'>+CONFIG_CPM2=y</div><div class='add'>+CONFIG_PPC_CPM_NEW_BINDING=y</div><div class='add'>+# CONFIG_FSL_ULI1575 is not set</div><div class='add'>+CONFIG_CPM=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel options</div><div class='add'>+#</div><div class='add'>+# CONFIG_HIGHMEM is not set</div><div class='add'>+# CONFIG_TICK_ONESHOT is not set</div><div class='add'>+# CONFIG_NO_HZ is not set</div><div class='add'>+# CONFIG_HIGH_RES_TIMERS is not set</div><div class='add'>+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y</div><div class='add'>+# CONFIG_HZ_100 is not set</div><div class='add'>+CONFIG_HZ_250=y</div><div class='add'>+# CONFIG_HZ_300 is not set</div><div class='add'>+# CONFIG_HZ_1000 is not set</div><div class='add'>+CONFIG_HZ=250</div><div class='add'>+# CONFIG_SCHED_HRTICK is not set</div><div class='add'>+CONFIG_PREEMPT_NONE=y</div><div class='add'>+# CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='add'>+# CONFIG_PREEMPT is not set</div><div class='add'>+CONFIG_BINFMT_ELF=y</div><div class='add'>+CONFIG_BINFMT_MISC=y</div><div class='add'>+# CONFIG_IOMMU_HELPER is not set</div><div class='add'>+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y</div><div class='add'>+CONFIG_ARCH_HAS_WALK_MEMORY=y</div><div class='add'>+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y</div><div class='add'>+CONFIG_ARCH_FLATMEM_ENABLE=y</div><div class='add'>+CONFIG_ARCH_POPULATES_NODE_MAP=y</div><div class='add'>+CONFIG_FLATMEM=y</div><div class='add'>+CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='add'>+# CONFIG_SPARSEMEM_STATIC is not set</div><div class='add'>+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='add'>+CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='add'>+CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+CONFIG_ZONE_DMA_FLAG=1</div><div class='add'>+CONFIG_BOUNCE=y</div><div class='add'>+CONFIG_VIRT_TO_BUS=y</div><div class='add'>+CONFIG_FORCE_MAX_ZONEORDER=11</div><div class='add'>+CONFIG_PROC_DEVICETREE=y</div><div class='add'>+# CONFIG_CMDLINE_BOOL is not set</div><div class='add'>+# CONFIG_PM is not set</div><div class='add'>+# CONFIG_SECCOMP is not set</div><div class='add'>+CONFIG_ISA_DMA_API=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Bus options</div><div class='add'>+#</div><div class='add'>+CONFIG_ZONE_DMA=y</div><div class='add'>+CONFIG_FSL_SOC=y</div><div class='add'>+# CONFIG_PCI is not set</div><div class='add'>+# CONFIG_PCI_DOMAINS is not set</div><div class='add'>+# CONFIG_PCI_SYSCALL is not set</div><div class='add'>+# CONFIG_ARCH_SUPPORTS_MSI is not set</div><div class='add'>+# CONFIG_PCCARD is not set</div><div class='add'>+# CONFIG_HAS_RAPIDIO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Advanced setup</div><div class='add'>+#</div><div class='add'>+# CONFIG_ADVANCED_OPTIONS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Default settings for advanced configuration options are used</div><div class='add'>+#</div><div class='add'>+CONFIG_LOWMEM_SIZE=0x30000000</div><div class='add'>+CONFIG_PAGE_OFFSET=0xc0000000</div><div class='add'>+CONFIG_KERNEL_START=0xc0000000</div><div class='add'>+CONFIG_PHYSICAL_START=0x00000000</div><div class='add'>+CONFIG_TASK_SIZE=0xc0000000</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking</div><div class='add'>+#</div><div class='add'>+CONFIG_NET=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking options</div><div class='add'>+#</div><div class='add'>+CONFIG_PACKET=y</div><div class='add'>+# CONFIG_PACKET_MMAP is not set</div><div class='add'>+CONFIG_UNIX=y</div><div class='add'>+CONFIG_XFRM=y</div><div class='add'>+# CONFIG_XFRM_USER is not set</div><div class='add'>+# CONFIG_NET_KEY is not set</div><div class='add'>+CONFIG_INET=y</div><div class='add'>+CONFIG_IP_MULTICAST=y</div><div class='add'>+# CONFIG_IP_ADVANCED_ROUTER is not set</div><div class='add'>+CONFIG_IP_FIB_HASH=y</div><div class='add'>+CONFIG_IP_PNP=y</div><div class='add'>+CONFIG_IP_PNP_DHCP=y</div><div class='add'>+CONFIG_IP_PNP_BOOTP=y</div><div class='add'>+# CONFIG_IP_PNP_RARP is not set</div><div class='add'>+# CONFIG_NET_IPIP is not set</div><div class='add'>+# CONFIG_NET_IPGRE is not set</div><div class='add'>+# CONFIG_IP_MROUTE is not set</div><div class='add'>+CONFIG_SYN_COOKIES=y</div><div class='add'>+# CONFIG_INET_AH is not set</div><div class='add'>+# CONFIG_INET_ESP is not set</div><div class='add'>+# CONFIG_INET_IPCOMP is not set</div><div class='add'>+# CONFIG_INET_XFRM_TUNNEL is not set</div><div class='add'>+# CONFIG_INET_TUNNEL is not set</div><div class='add'>+CONFIG_INET_XFRM_MODE_TRANSPORT=y</div><div class='add'>+CONFIG_INET_XFRM_MODE_TUNNEL=y</div><div class='add'>+CONFIG_INET_XFRM_MODE_BEET=y</div><div class='add'>+# CONFIG_INET_LRO is not set</div><div class='add'>+CONFIG_INET_DIAG=y</div><div class='add'>+CONFIG_INET_TCP_DIAG=y</div><div class='add'>+# CONFIG_TCP_CONG_ADVANCED is not set</div><div class='add'>+CONFIG_TCP_CONG_CUBIC=y</div><div class='add'>+CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='add'>+# CONFIG_IP_VS is not set</div><div class='add'>+# CONFIG_IPV6 is not set</div><div class='add'>+# CONFIG_NETWORK_SECMARK is not set</div><div class='add'>+CONFIG_NETFILTER=y</div><div class='add'>+# CONFIG_NETFILTER_DEBUG is not set</div><div class='add'>+CONFIG_NETFILTER_ADVANCED=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Core Netfilter Configuration</div><div class='add'>+#</div><div class='add'>+# CONFIG_NETFILTER_NETLINK_QUEUE is not set</div><div class='add'>+# CONFIG_NETFILTER_NETLINK_LOG is not set</div><div class='add'>+# CONFIG_NF_CONNTRACK is not set</div><div class='add'>+# CONFIG_NETFILTER_XTABLES is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IP: Netfilter Configuration</div><div class='add'>+#</div><div class='add'>+# CONFIG_IP_NF_QUEUE is not set</div><div class='add'>+# CONFIG_IP_NF_IPTABLES is not set</div><div class='add'>+# CONFIG_IP_NF_ARPTABLES is not set</div><div class='add'>+# CONFIG_ATM is not set</div><div class='add'>+# CONFIG_BRIDGE is not set</div><div class='add'>+# CONFIG_VLAN_8021Q is not set</div><div class='add'>+# CONFIG_DECNET is not set</div><div class='add'>+# CONFIG_LLC2 is not set</div><div class='add'>+# CONFIG_IPX is not set</div><div class='add'>+# CONFIG_ATALK is not set</div><div class='add'>+# CONFIG_NET_SCHED is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network testing</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_PKTGEN is not set</div><div class='add'>+# CONFIG_HAMRADIO is not set</div><div class='add'>+# CONFIG_CAN is not set</div><div class='add'>+# CONFIG_IRDA is not set</div><div class='add'>+# CONFIG_BT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless</div><div class='add'>+#</div><div class='add'>+# CONFIG_CFG80211 is not set</div><div class='add'>+# CONFIG_WIRELESS_EXT is not set</div><div class='add'>+# CONFIG_MAC80211 is not set</div><div class='add'>+# CONFIG_IEEE80211 is not set</div><div class='add'>+# CONFIG_RFKILL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Device Drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Generic Driver Options</div><div class='add'>+#</div><div class='add'>+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='add'>+CONFIG_STANDALONE=y</div><div class='add'>+CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='add'>+# CONFIG_FW_LOADER is not set</div><div class='add'>+# CONFIG_DEBUG_DRIVER is not set</div><div class='add'>+# CONFIG_DEBUG_DEVRES is not set</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='add'>+# CONFIG_CONNECTOR is not set</div><div class='add'>+CONFIG_MTD=y</div><div class='add'>+# CONFIG_MTD_DEBUG is not set</div><div class='add'>+CONFIG_MTD_CONCAT=y</div><div class='add'>+CONFIG_MTD_PARTITIONS=y</div><div class='add'>+# CONFIG_MTD_REDBOOT_PARTS is not set</div><div class='add'>+CONFIG_MTD_CMDLINE_PARTS=y</div><div class='add'>+CONFIG_MTD_OF_PARTS=y</div><div class='add'>+# CONFIG_MTD_AR7_PARTS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# User Modules And Translation Layers</div><div class='add'>+#</div><div class='add'>+CONFIG_MTD_CHAR=y</div><div class='add'>+CONFIG_MTD_BLKDEVS=y</div><div class='add'>+# CONFIG_MTD_BLOCK is not set</div><div class='add'>+# CONFIG_MTD_BLOCK_RO is not set</div><div class='add'>+# CONFIG_FTL is not set</div><div class='add'>+# CONFIG_NFTL is not set</div><div class='add'>+# CONFIG_INFTL is not set</div><div class='add'>+# CONFIG_RFD_FTL is not set</div><div class='add'>+# CONFIG_SSFDC is not set</div><div class='add'>+# CONFIG_MTD_OOPS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# RAM/ROM/Flash chip drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_MTD_CFI=y</div><div class='add'>+# CONFIG_MTD_JEDECPROBE is not set</div><div class='add'>+CONFIG_MTD_GEN_PROBE=y</div><div class='add'>+CONFIG_MTD_CFI_ADV_OPTIONS=y</div><div class='add'>+CONFIG_MTD_CFI_NOSWAP=y</div><div class='add'>+# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set</div><div class='add'>+# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set</div><div class='add'>+CONFIG_MTD_CFI_GEOMETRY=y</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_1=y</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_2=y</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_4 is not set</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set</div><div class='add'>+CONFIG_MTD_CFI_I1=y</div><div class='add'>+CONFIG_MTD_CFI_I2=y</div><div class='add'>+# CONFIG_MTD_CFI_I4 is not set</div><div class='add'>+# CONFIG_MTD_CFI_I8 is not set</div><div class='add'>+# CONFIG_MTD_OTP is not set</div><div class='add'>+CONFIG_MTD_CFI_INTELEXT=y</div><div class='add'>+CONFIG_MTD_CFI_AMDSTD=y</div><div class='add'>+# CONFIG_MTD_CFI_STAA is not set</div><div class='add'>+CONFIG_MTD_CFI_UTIL=y</div><div class='add'>+# CONFIG_MTD_RAM is not set</div><div class='add'>+# CONFIG_MTD_ROM is not set</div><div class='add'>+# CONFIG_MTD_ABSENT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Mapping drivers for chip access</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_COMPLEX_MAPPINGS is not set</div><div class='add'>+# CONFIG_MTD_PHYSMAP is not set</div><div class='add'>+CONFIG_MTD_PHYSMAP_OF=y</div><div class='add'>+# CONFIG_MTD_PLATRAM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Self-contained MTD device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_SLRAM is not set</div><div class='add'>+# CONFIG_MTD_PHRAM is not set</div><div class='add'>+# CONFIG_MTD_MTDRAM is not set</div><div class='add'>+# CONFIG_MTD_BLOCK2MTD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Disk-On-Chip Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_DOC2000 is not set</div><div class='add'>+# CONFIG_MTD_DOC2001 is not set</div><div class='add'>+# CONFIG_MTD_DOC2001PLUS is not set</div><div class='add'>+# CONFIG_MTD_NAND is not set</div><div class='add'>+# CONFIG_MTD_ONENAND is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# UBI - Unsorted block images</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_UBI is not set</div><div class='add'>+CONFIG_OF_DEVICE=y</div><div class='add'>+# CONFIG_PARPORT is not set</div><div class='add'>+CONFIG_BLK_DEV=y</div><div class='add'>+# CONFIG_BLK_DEV_FD is not set</div><div class='add'>+# CONFIG_BLK_DEV_COW_COMMON is not set</div><div class='add'>+CONFIG_BLK_DEV_LOOP=y</div><div class='add'>+# CONFIG_BLK_DEV_CRYPTOLOOP is not set</div><div class='add'>+# CONFIG_BLK_DEV_NBD is not set</div><div class='add'>+CONFIG_BLK_DEV_RAM=y</div><div class='add'>+CONFIG_BLK_DEV_RAM_COUNT=16</div><div class='add'>+CONFIG_BLK_DEV_RAM_SIZE=4096</div><div class='add'>+# CONFIG_BLK_DEV_XIP is not set</div><div class='add'>+# CONFIG_CDROM_PKTCDVD is not set</div><div class='add'>+# CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+# CONFIG_MISC_DEVICES is not set</div><div class='add'>+CONFIG_HAVE_IDE=y</div><div class='add'>+# CONFIG_IDE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_RAID_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI is not set</div><div class='add'>+# CONFIG_SCSI_DMA is not set</div><div class='add'>+# CONFIG_SCSI_NETLINK is not set</div><div class='add'>+# CONFIG_ATA is not set</div><div class='add'>+# CONFIG_MD is not set</div><div class='add'>+# CONFIG_MACINTOSH_DRIVERS is not set</div><div class='add'>+CONFIG_NETDEVICES=y</div><div class='add'>+# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='add'>+# CONFIG_DUMMY is not set</div><div class='add'>+# CONFIG_BONDING is not set</div><div class='add'>+# CONFIG_EQUALIZER is not set</div><div class='add'>+# CONFIG_TUN is not set</div><div class='add'>+# CONFIG_VETH is not set</div><div class='add'>+CONFIG_PHYLIB=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MII PHY device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MARVELL_PHY is not set</div><div class='add'>+# CONFIG_DAVICOM_PHY is not set</div><div class='add'>+# CONFIG_QSEMI_PHY is not set</div><div class='add'>+# CONFIG_LXT_PHY is not set</div><div class='add'>+# CONFIG_CICADA_PHY is not set</div><div class='add'>+# CONFIG_VITESSE_PHY is not set</div><div class='add'>+# CONFIG_SMSC_PHY is not set</div><div class='add'>+# CONFIG_BROADCOM_PHY is not set</div><div class='add'>+# CONFIG_ICPLUS_PHY is not set</div><div class='add'>+# CONFIG_REALTEK_PHY is not set</div><div class='add'>+CONFIG_FIXED_PHY=y</div><div class='add'>+# CONFIG_MDIO_BITBANG is not set</div><div class='add'>+CONFIG_NET_ETHERNET=y</div><div class='add'>+CONFIG_MII=y</div><div class='add'>+# CONFIG_IBM_NEW_EMAC_ZMII is not set</div><div class='add'>+# CONFIG_IBM_NEW_EMAC_RGMII is not set</div><div class='add'>+# CONFIG_IBM_NEW_EMAC_TAH is not set</div><div class='add'>+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set</div><div class='add'>+# CONFIG_B44 is not set</div><div class='add'>+CONFIG_FS_ENET=y</div><div class='add'>+CONFIG_FS_ENET_HAS_SCC=y</div><div class='add'>+# CONFIG_FS_ENET_HAS_FCC is not set</div><div class='add'>+# CONFIG_FS_ENET_MDIO_FCC is not set</div><div class='add'>+# CONFIG_NETDEV_1000 is not set</div><div class='add'>+# CONFIG_NETDEV_10000 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless LAN</div><div class='add'>+#</div><div class='add'>+# CONFIG_WLAN_PRE80211 is not set</div><div class='add'>+# CONFIG_WLAN_80211 is not set</div><div class='add'>+# CONFIG_IWLWIFI_LEDS is not set</div><div class='add'>+# CONFIG_WAN is not set</div><div class='add'>+# CONFIG_PPP is not set</div><div class='add'>+# CONFIG_SLIP is not set</div><div class='add'>+# CONFIG_NETPOLL is not set</div><div class='add'>+# CONFIG_NET_POLL_CONTROLLER is not set</div><div class='add'>+# CONFIG_ISDN is not set</div><div class='add'>+# CONFIG_PHONE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_INPUT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware I/O ports</div><div class='add'>+#</div><div class='add'>+# CONFIG_SERIO is not set</div><div class='add'>+# CONFIG_GAMEPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Character devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_VT is not set</div><div class='add'>+CONFIG_DEVKMEM=y</div><div class='add'>+# CONFIG_SERIAL_NONSTANDARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Serial drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_SERIAL_8250 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Non-8250 serial port support</div><div class='add'>+#</div><div class='add'>+# CONFIG_SERIAL_UARTLITE is not set</div><div class='add'>+CONFIG_SERIAL_CORE=y</div><div class='add'>+CONFIG_SERIAL_CORE_CONSOLE=y</div><div class='add'>+CONFIG_SERIAL_CPM=y</div><div class='add'>+CONFIG_SERIAL_CPM_CONSOLE=y</div><div class='add'>+# CONFIG_SERIAL_CPM_SCC1 is not set</div><div class='add'>+# CONFIG_SERIAL_CPM_SCC2 is not set</div><div class='add'>+# CONFIG_SERIAL_CPM_SCC3 is not set</div><div class='add'>+# CONFIG_SERIAL_CPM_SCC4 is not set</div><div class='add'>+CONFIG_SERIAL_CPM_SMC1=y</div><div class='add'>+CONFIG_SERIAL_CPM_SMC2=y</div><div class='add'>+CONFIG_UNIX98_PTYS=y</div><div class='add'>+CONFIG_LEGACY_PTYS=y</div><div class='add'>+CONFIG_LEGACY_PTY_COUNT=256</div><div class='add'>+# CONFIG_IPMI_HANDLER is not set</div><div class='add'>+CONFIG_HW_RANDOM=y</div><div class='add'>+# CONFIG_NVRAM is not set</div><div class='add'>+# CONFIG_GEN_RTC is not set</div><div class='add'>+# CONFIG_R3964 is not set</div><div class='add'>+# CONFIG_RAW_DRIVER is not set</div><div class='add'>+# CONFIG_I2C is not set</div><div class='add'>+# CONFIG_SPI is not set</div><div class='add'>+# CONFIG_W1 is not set</div><div class='add'>+# CONFIG_POWER_SUPPLY is not set</div><div class='add'>+# CONFIG_HWMON is not set</div><div class='add'>+# CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_WATCHDOG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Sonics Silicon Backplane</div><div class='add'>+#</div><div class='add'>+CONFIG_SSB_POSSIBLE=y</div><div class='add'>+# CONFIG_SSB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multifunction device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MFD_SM501 is not set</div><div class='add'>+# CONFIG_HTC_PASIC3 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia core support</div><div class='add'>+#</div><div class='add'>+# CONFIG_VIDEO_DEV is not set</div><div class='add'>+# CONFIG_DVB_CORE is not set</div><div class='add'>+# CONFIG_VIDEO_MEDIA is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_DAB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics support</div><div class='add'>+#</div><div class='add'>+# CONFIG_VGASTATE is not set</div><div class='add'>+# CONFIG_VIDEO_OUTPUT_CONTROL is not set</div><div class='add'>+# CONFIG_FB is not set</div><div class='add'>+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Display device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DISPLAY_SUPPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Sound</div><div class='add'>+#</div><div class='add'>+# CONFIG_SOUND is not set</div><div class='add'>+# CONFIG_USB_SUPPORT is not set</div><div class='add'>+# CONFIG_MMC is not set</div><div class='add'>+# CONFIG_MEMSTICK is not set</div><div class='add'>+# CONFIG_NEW_LEDS is not set</div><div class='add'>+# CONFIG_ACCESSIBILITY is not set</div><div class='add'>+# CONFIG_RTC_CLASS is not set</div><div class='add'>+# CONFIG_DMADEVICES is not set</div><div class='add'>+# CONFIG_UIO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# File systems</div><div class='add'>+#</div><div class='add'>+CONFIG_EXT2_FS=y</div><div class='add'>+# CONFIG_EXT2_FS_XATTR is not set</div><div class='add'>+# CONFIG_EXT2_FS_XIP is not set</div><div class='add'>+CONFIG_EXT3_FS=y</div><div class='add'>+# CONFIG_EXT3_FS_XATTR is not set</div><div class='add'>+CONFIG_JBD=y</div><div class='add'>+# CONFIG_JBD_DEBUG is not set</div><div class='add'>+# CONFIG_REISERFS_FS is not set</div><div class='add'>+# CONFIG_JFS_FS is not set</div><div class='add'>+# CONFIG_FS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_XFS_FS is not set</div><div class='add'>+# CONFIG_OCFS2_FS is not set</div><div class='add'>+CONFIG_DNOTIFY=y</div><div class='add'>+CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='add'>+# CONFIG_QUOTA is not set</div><div class='add'>+# CONFIG_AUTOFS_FS is not set</div><div class='add'>+CONFIG_AUTOFS4_FS=y</div><div class='add'>+# CONFIG_FUSE_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CD-ROM/DVD Filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ISO9660_FS is not set</div><div class='add'>+# CONFIG_UDF_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DOS/FAT/NT Filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_MSDOS_FS is not set</div><div class='add'>+# CONFIG_VFAT_FS is not set</div><div class='add'>+# CONFIG_NTFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Pseudo filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_PROC_FS=y</div><div class='add'>+CONFIG_PROC_KCORE=y</div><div class='add'>+CONFIG_PROC_SYSCTL=y</div><div class='add'>+CONFIG_SYSFS=y</div><div class='add'>+CONFIG_TMPFS=y</div><div class='add'>+# CONFIG_TMPFS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_HUGETLB_PAGE is not set</div><div class='add'>+# CONFIG_CONFIGFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_HFSPLUS_FS is not set</div><div class='add'>+CONFIG_JFFS2_FS=y</div><div class='add'>+CONFIG_JFFS2_FS_DEBUG=0</div><div class='add'>+CONFIG_JFFS2_FS_WRITEBUFFER=y</div><div class='add'>+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set</div><div class='add'>+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set</div><div class='add'>+CONFIG_JFFS2_ZLIB=y</div><div class='add'>+# CONFIG_JFFS2_LZO is not set</div><div class='add'>+CONFIG_JFFS2_RTIME=y</div><div class='add'>+# CONFIG_JFFS2_RUBIN is not set</div><div class='add'>+CONFIG_CRAMFS=y</div><div class='add'>+# CONFIG_VXFS_FS is not set</div><div class='add'>+# CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_HPFS_FS is not set</div><div class='add'>+# CONFIG_QNX4FS_FS is not set</div><div class='add'>+# CONFIG_ROMFS_FS is not set</div><div class='add'>+# CONFIG_SYSV_FS is not set</div><div class='add'>+# CONFIG_UFS_FS is not set</div><div class='add'>+CONFIG_NETWORK_FILESYSTEMS=y</div><div class='add'>+CONFIG_NFS_FS=y</div><div class='add'>+CONFIG_NFS_V3=y</div><div class='add'>+# CONFIG_NFS_V3_ACL is not set</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='add'>+CONFIG_ROOT_NFS=y</div><div class='add'>+CONFIG_LOCKD=y</div><div class='add'>+CONFIG_LOCKD_V4=y</div><div class='add'>+CONFIG_NFS_COMMON=y</div><div class='add'>+CONFIG_SUNRPC=y</div><div class='add'>+# CONFIG_SMB_FS is not set</div><div class='add'>+# CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_NCP_FS is not set</div><div class='add'>+# CONFIG_CODA_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Partition Types</div><div class='add'>+#</div><div class='add'>+CONFIG_PARTITION_ADVANCED=y</div><div class='add'>+# CONFIG_ACORN_PARTITION is not set</div><div class='add'>+# CONFIG_OSF_PARTITION is not set</div><div class='add'>+# CONFIG_AMIGA_PARTITION is not set</div><div class='add'>+# CONFIG_ATARI_PARTITION is not set</div><div class='add'>+# CONFIG_MAC_PARTITION is not set</div><div class='add'>+CONFIG_MSDOS_PARTITION=y</div><div class='add'>+# CONFIG_BSD_DISKLABEL is not set</div><div class='add'>+# CONFIG_MINIX_SUBPARTITION is not set</div><div class='add'>+# CONFIG_SOLARIS_X86_PARTITION is not set</div><div class='add'>+# CONFIG_UNIXWARE_DISKLABEL is not set</div><div class='add'>+# CONFIG_LDM_PARTITION is not set</div><div class='add'>+# CONFIG_SGI_PARTITION is not set</div><div class='add'>+# CONFIG_ULTRIX_PARTITION is not set</div><div class='add'>+# CONFIG_SUN_PARTITION is not set</div><div class='add'>+# CONFIG_KARMA_PARTITION is not set</div><div class='add'>+# CONFIG_EFI_PARTITION is not set</div><div class='add'>+# CONFIG_SYSV68_PARTITION is not set</div><div class='add'>+CONFIG_NLS=y</div><div class='add'>+CONFIG_NLS_DEFAULT="iso8859-1"</div><div class='add'>+CONFIG_NLS_CODEPAGE_437=y</div><div class='add'>+# CONFIG_NLS_CODEPAGE_737 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_775 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_850 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_852 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_855 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_857 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_860 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_861 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_862 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_863 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_864 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_865 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_866 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_869 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_936 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_950 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_932 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_949 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_874 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_8 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_1250 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_1251 is not set</div><div class='add'>+CONFIG_NLS_ASCII=y</div><div class='add'>+CONFIG_NLS_ISO8859_1=y</div><div class='add'>+# CONFIG_NLS_ISO8859_2 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_3 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_4 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_5 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_6 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_7 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_9 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_13 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_14 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_15 is not set</div><div class='add'>+# CONFIG_NLS_KOI8_R is not set</div><div class='add'>+# CONFIG_NLS_KOI8_U is not set</div><div class='add'>+CONFIG_NLS_UTF8=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Library routines</div><div class='add'>+#</div><div class='add'>+CONFIG_BITREVERSE=y</div><div class='add'>+# CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='add'>+# CONFIG_CRC_CCITT is not set</div><div class='add'>+# CONFIG_CRC16 is not set</div><div class='add'>+# CONFIG_CRC_ITU_T is not set</div><div class='add'>+CONFIG_CRC32=y</div><div class='add'>+# CONFIG_CRC7 is not set</div><div class='add'>+# CONFIG_LIBCRC32C is not set</div><div class='add'>+CONFIG_ZLIB_INFLATE=y</div><div class='add'>+CONFIG_ZLIB_DEFLATE=y</div><div class='add'>+CONFIG_PLIST=y</div><div class='add'>+CONFIG_HAS_IOMEM=y</div><div class='add'>+CONFIG_HAS_IOPORT=y</div><div class='add'>+CONFIG_HAS_DMA=y</div><div class='add'>+CONFIG_HAVE_LMB=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel hacking</div><div class='add'>+#</div><div class='add'>+# CONFIG_PRINTK_TIME is not set</div><div class='add'>+CONFIG_ENABLE_WARN_DEPRECATED=y</div><div class='add'>+CONFIG_ENABLE_MUST_CHECK=y</div><div class='add'>+CONFIG_FRAME_WARN=1024</div><div class='add'>+CONFIG_MAGIC_SYSRQ=y</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='add'>+CONFIG_DEBUG_FS=y</div><div class='add'>+# CONFIG_HEADERS_CHECK is not set</div><div class='add'>+CONFIG_DEBUG_KERNEL=y</div><div class='add'>+# CONFIG_DEBUG_SHIRQ is not set</div><div class='add'>+# CONFIG_DETECT_SOFTLOCKUP is not set</div><div class='add'>+# CONFIG_SCHED_DEBUG is not set</div><div class='add'>+# CONFIG_SCHEDSTATS is not set</div><div class='add'>+# CONFIG_TIMER_STATS is not set</div><div class='add'>+# CONFIG_DEBUG_OBJECTS is not set</div><div class='add'>+# CONFIG_DEBUG_SLAB is not set</div><div class='add'>+# CONFIG_DEBUG_RT_MUTEXES is not set</div><div class='add'>+# CONFIG_RT_MUTEX_TESTER is not set</div><div class='add'>+# CONFIG_DEBUG_SPINLOCK is not set</div><div class='add'>+# CONFIG_DEBUG_MUTEXES is not set</div><div class='add'>+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set</div><div class='add'>+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set</div><div class='add'>+# CONFIG_DEBUG_KOBJECT is not set</div><div class='add'>+CONFIG_DEBUG_BUGVERBOSE=y</div><div class='add'>+CONFIG_DEBUG_INFO=y</div><div class='add'>+# CONFIG_DEBUG_VM is not set</div><div class='add'>+# CONFIG_DEBUG_WRITECOUNT is not set</div><div class='add'>+# CONFIG_DEBUG_LIST is not set</div><div class='add'>+# CONFIG_DEBUG_SG is not set</div><div class='add'>+# CONFIG_BOOT_PRINTK_DELAY is not set</div><div class='add'>+# CONFIG_BACKTRACE_SELF_TEST is not set</div><div class='add'>+# CONFIG_FAULT_INJECTION is not set</div><div class='add'>+# CONFIG_SAMPLES is not set</div><div class='add'>+# CONFIG_DEBUG_STACKOVERFLOW is not set</div><div class='add'>+# CONFIG_DEBUG_STACK_USAGE is not set</div><div class='add'>+# CONFIG_DEBUG_PAGEALLOC is not set</div><div class='add'>+# CONFIG_DEBUGGER is not set</div><div class='add'>+# CONFIG_KGDB_CONSOLE is not set</div><div class='add'>+# CONFIG_IRQSTACKS is not set</div><div class='add'>+# CONFIG_VIRQ_DEBUG is not set</div><div class='add'>+CONFIG_BDI_SWITCH=y</div><div class='add'>+# CONFIG_PPC_EARLY_DEBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Security options</div><div class='add'>+#</div><div class='add'>+# CONFIG_KEYS is not set</div><div class='add'>+# CONFIG_SECURITY is not set</div><div class='add'>+CONFIG_CRYPTO=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Crypto core or helper</div><div class='add'>+#</div><div class='add'>+CONFIG_CRYPTO_ALGAPI=y</div><div class='add'>+CONFIG_CRYPTO_BLKCIPHER=y</div><div class='add'>+CONFIG_CRYPTO_MANAGER=y</div><div class='add'>+# CONFIG_CRYPTO_NULL is not set</div><div class='add'>+# CONFIG_CRYPTO_CRYPTD is not set</div><div class='add'>+# CONFIG_CRYPTO_AUTHENC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Authenticated Encryption with Associated Data</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CCM is not set</div><div class='add'>+# CONFIG_CRYPTO_GCM is not set</div><div class='add'>+# CONFIG_CRYPTO_SEQIV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block modes</div><div class='add'>+#</div><div class='add'>+CONFIG_CRYPTO_CBC=y</div><div class='add'>+# CONFIG_CRYPTO_CTR is not set</div><div class='add'>+# CONFIG_CRYPTO_CTS is not set</div><div class='add'>+CONFIG_CRYPTO_ECB=y</div><div class='add'>+CONFIG_CRYPTO_PCBC=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hash modes</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_HMAC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Digest</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CRC32C is not set</div><div class='add'>+# CONFIG_CRYPTO_MD4 is not set</div><div class='add'>+CONFIG_CRYPTO_MD5=y</div><div class='add'>+# CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_SHA1 is not set</div><div class='add'>+# CONFIG_CRYPTO_SHA256 is not set</div><div class='add'>+# CONFIG_CRYPTO_SHA512 is not set</div><div class='add'>+# CONFIG_CRYPTO_TGR192 is not set</div><div class='add'>+# CONFIG_CRYPTO_WP512 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ciphers</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_AES is not set</div><div class='add'>+# CONFIG_CRYPTO_ANUBIS is not set</div><div class='add'>+# CONFIG_CRYPTO_ARC4 is not set</div><div class='add'>+# CONFIG_CRYPTO_BLOWFISH is not set</div><div class='add'>+# CONFIG_CRYPTO_CAMELLIA is not set</div><div class='add'>+# CONFIG_CRYPTO_CAST5 is not set</div><div class='add'>+# CONFIG_CRYPTO_CAST6 is not set</div><div class='add'>+CONFIG_CRYPTO_DES=y</div><div class='add'>+# CONFIG_CRYPTO_FCRYPT is not set</div><div class='add'>+# CONFIG_CRYPTO_KHAZAD is not set</div><div class='add'>+# CONFIG_CRYPTO_SEED is not set</div><div class='add'>+# CONFIG_CRYPTO_SERPENT is not set</div><div class='add'>+# CONFIG_CRYPTO_TEA is not set</div><div class='add'>+# CONFIG_CRYPTO_TWOFISH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Compression</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_DEFLATE is not set</div><div class='add'>+# CONFIG_CRYPTO_LZO is not set</div><div class='add'>+# CONFIG_CRYPTO_HW is not set</div><div class='add'>+# CONFIG_PPC_CLOCK is not set</div><div class='add'>+CONFIG_PPC_LIB_RHEAP=y</div><div class='add'>+# CONFIG_VIRTUALIZATION is not set</div><div class='head'>diff --git a/arch/powerpc/configs/mgsuvd_defconfig b/arch/powerpc/configs/mgsuvd_defconfig<br/>new file mode 100644<br/>index 000000000000..3cd6ce4be827<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/configs/mgsuvd_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/configs/mgsuvd_defconfig</a></div><div class='hunk'>@@ -0,0 +1,872 @@</div><div class='add'>+#</div><div class='add'>+# Automatically generated make config: don't edit</div><div class='add'>+# Linux kernel version: 2.6.26-rc2</div><div class='add'>+# Wed May 21 13:30:33 2008</div><div class='add'>+#</div><div class='add'>+# CONFIG_PPC64 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Processor support</div><div class='add'>+#</div><div class='add'>+# CONFIG_6xx is not set</div><div class='add'>+# CONFIG_PPC_85xx is not set</div><div class='add'>+CONFIG_PPC_8xx=y</div><div class='add'>+# CONFIG_40x is not set</div><div class='add'>+# CONFIG_44x is not set</div><div class='add'>+# CONFIG_E200 is not set</div><div class='add'>+CONFIG_8xx=y</div><div class='add'>+# CONFIG_PPC_MM_SLICES is not set</div><div class='add'>+CONFIG_NOT_COHERENT_CACHE=y</div><div class='add'>+CONFIG_PPC32=y</div><div class='add'>+CONFIG_WORD_SIZE=32</div><div class='add'>+CONFIG_PPC_MERGE=y</div><div class='add'>+CONFIG_MMU=y</div><div class='add'>+CONFIG_GENERIC_CMOS_UPDATE=y</div><div class='add'>+CONFIG_GENERIC_TIME=y</div><div class='add'>+CONFIG_GENERIC_TIME_VSYSCALL=y</div><div class='add'>+CONFIG_GENERIC_CLOCKEVENTS=y</div><div class='add'>+CONFIG_GENERIC_HARDIRQS=y</div><div class='add'>+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set</div><div class='add'>+CONFIG_IRQ_PER_CPU=y</div><div class='add'>+CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_LOCKDEP_SUPPORT=y</div><div class='add'>+CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='add'>+CONFIG_ARCH_HAS_ILOG2_U32=y</div><div class='add'>+CONFIG_GENERIC_HWEIGHT=y</div><div class='add'>+CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='add'>+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set</div><div class='add'>+CONFIG_PPC=y</div><div class='add'>+CONFIG_EARLY_PRINTK=y</div><div class='add'>+CONFIG_GENERIC_NVRAM=y</div><div class='add'>+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y</div><div class='add'>+CONFIG_ARCH_MAY_HAVE_PC_FDC=y</div><div class='add'>+CONFIG_PPC_OF=y</div><div class='add'>+CONFIG_OF=y</div><div class='add'>+# CONFIG_PPC_UDBG_16550 is not set</div><div class='add'>+# CONFIG_GENERIC_TBSYNC is not set</div><div class='add'>+CONFIG_AUDIT_ARCH=y</div><div class='add'>+# CONFIG_DEFAULT_UIMAGE is not set</div><div class='add'>+# CONFIG_PPC_DCR_NATIVE is not set</div><div class='add'>+# CONFIG_PPC_DCR_MMIO is not set</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# General setup</div><div class='add'>+#</div><div class='add'>+CONFIG_EXPERIMENTAL=y</div><div class='add'>+CONFIG_BROKEN_ON_SMP=y</div><div class='add'>+CONFIG_INIT_ENV_ARG_LIMIT=32</div><div class='add'>+CONFIG_LOCALVERSION=""</div><div class='add'>+CONFIG_LOCALVERSION_AUTO=y</div><div class='add'>+# CONFIG_SWAP is not set</div><div class='add'>+CONFIG_SYSVIPC=y</div><div class='add'>+CONFIG_SYSVIPC_SYSCTL=y</div><div class='add'>+# CONFIG_POSIX_MQUEUE is not set</div><div class='add'>+# CONFIG_BSD_PROCESS_ACCT is not set</div><div class='add'>+# CONFIG_TASKSTATS is not set</div><div class='add'>+# CONFIG_AUDIT is not set</div><div class='add'>+# CONFIG_IKCONFIG is not set</div><div class='add'>+CONFIG_LOG_BUF_SHIFT=17</div><div class='add'>+# CONFIG_CGROUPS is not set</div><div class='add'>+CONFIG_GROUP_SCHED=y</div><div class='add'>+CONFIG_FAIR_GROUP_SCHED=y</div><div class='add'>+# CONFIG_RT_GROUP_SCHED is not set</div><div class='add'>+CONFIG_USER_SCHED=y</div><div class='add'>+# CONFIG_CGROUP_SCHED is not set</div><div class='add'>+CONFIG_SYSFS_DEPRECATED=y</div><div class='add'>+CONFIG_SYSFS_DEPRECATED_V2=y</div><div class='add'>+# CONFIG_RELAY is not set</div><div class='add'>+# CONFIG_NAMESPACES is not set</div><div class='add'>+CONFIG_BLK_DEV_INITRD=y</div><div class='add'>+CONFIG_INITRAMFS_SOURCE=""</div><div class='add'>+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set</div><div class='add'>+CONFIG_SYSCTL=y</div><div class='add'>+CONFIG_EMBEDDED=y</div><div class='add'>+# CONFIG_SYSCTL_SYSCALL is not set</div><div class='add'>+CONFIG_KALLSYMS=y</div><div class='add'>+# CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='add'>+# CONFIG_HOTPLUG is not set</div><div class='add'>+CONFIG_PRINTK=y</div><div class='add'>+# CONFIG_BUG is not set</div><div class='add'>+CONFIG_ELF_CORE=y</div><div class='add'>+CONFIG_COMPAT_BRK=y</div><div class='add'>+# CONFIG_BASE_FULL is not set</div><div class='add'>+CONFIG_FUTEX=y</div><div class='add'>+CONFIG_ANON_INODES=y</div><div class='add'>+# CONFIG_EPOLL is not set</div><div class='add'>+CONFIG_SIGNALFD=y</div><div class='add'>+CONFIG_TIMERFD=y</div><div class='add'>+CONFIG_EVENTFD=y</div><div class='add'>+CONFIG_SHMEM=y</div><div class='add'>+# CONFIG_VM_EVENT_COUNTERS is not set</div><div class='add'>+CONFIG_SLAB=y</div><div class='add'>+# CONFIG_SLUB is not set</div><div class='add'>+# CONFIG_SLOB is not set</div><div class='add'>+# CONFIG_PROFILING is not set</div><div class='add'>+# CONFIG_MARKERS is not set</div><div class='add'>+CONFIG_HAVE_OPROFILE=y</div><div class='add'>+CONFIG_HAVE_KPROBES=y</div><div class='add'>+CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+# CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+CONFIG_SLABINFO=y</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='add'>+# CONFIG_TINY_SHMEM is not set</div><div class='add'>+CONFIG_BASE_SMALL=1</div><div class='add'>+# CONFIG_MODULES is not set</div><div class='add'>+CONFIG_BLOCK=y</div><div class='add'>+# CONFIG_LBD is not set</div><div class='add'>+# CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='add'>+# CONFIG_LSF is not set</div><div class='add'>+# CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IO Schedulers</div><div class='add'>+#</div><div class='add'>+CONFIG_IOSCHED_NOOP=y</div><div class='add'>+CONFIG_IOSCHED_AS=y</div><div class='add'>+CONFIG_IOSCHED_DEADLINE=y</div><div class='add'>+CONFIG_IOSCHED_CFQ=y</div><div class='add'>+CONFIG_DEFAULT_AS=y</div><div class='add'>+# CONFIG_DEFAULT_DEADLINE is not set</div><div class='add'>+# CONFIG_DEFAULT_CFQ is not set</div><div class='add'>+# CONFIG_DEFAULT_NOOP is not set</div><div class='add'>+CONFIG_DEFAULT_IOSCHED="anticipatory"</div><div class='add'>+CONFIG_CLASSIC_RCU=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Platform support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PPC_MPC512x is not set</div><div class='add'>+# CONFIG_PPC_MPC5121 is not set</div><div class='add'>+# CONFIG_PPC_CELL is not set</div><div class='add'>+# CONFIG_PPC_CELL_NATIVE is not set</div><div class='add'>+CONFIG_CPM1=y</div><div class='add'>+# CONFIG_MPC8XXFADS is not set</div><div class='add'>+# CONFIG_MPC86XADS is not set</div><div class='add'>+# CONFIG_MPC885ADS is not set</div><div class='add'>+# CONFIG_PPC_EP88XC is not set</div><div class='add'>+# CONFIG_PPC_ADDER875 is not set</div><div class='add'>+CONFIG_PPC_MGSUVD=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MPC8xx CPM Options</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Generic MPC8xx Options</div><div class='add'>+#</div><div class='add'>+CONFIG_8xx_COPYBACK=y</div><div class='add'>+CONFIG_8xx_CPU6=y</div><div class='add'>+CONFIG_8xx_CPU15=y</div><div class='add'>+# CONFIG_NO_UCODE_PATCH is not set</div><div class='add'>+# CONFIG_USB_SOF_UCODE_PATCH is not set</div><div class='add'>+# CONFIG_I2C_SPI_UCODE_PATCH is not set</div><div class='add'>+CONFIG_I2C_SPI_SMC1_UCODE_PATCH=y</div><div class='add'>+CONFIG_UCODE_PATCH=y</div><div class='add'>+# CONFIG_PQ2ADS is not set</div><div class='add'>+# CONFIG_IPIC is not set</div><div class='add'>+# CONFIG_MPIC is not set</div><div class='add'>+# CONFIG_MPIC_WEIRD is not set</div><div class='add'>+# CONFIG_PPC_I8259 is not set</div><div class='add'>+# CONFIG_PPC_RTAS is not set</div><div class='add'>+# CONFIG_MMIO_NVRAM is not set</div><div class='add'>+# CONFIG_PPC_MPC106 is not set</div><div class='add'>+# CONFIG_PPC_970_NAP is not set</div><div class='add'>+# CONFIG_PPC_INDIRECT_IO is not set</div><div class='add'>+# CONFIG_GENERIC_IOMAP is not set</div><div class='add'>+# CONFIG_CPU_FREQ is not set</div><div class='add'>+CONFIG_PPC_CPM_NEW_BINDING=y</div><div class='add'>+# CONFIG_FSL_ULI1575 is not set</div><div class='add'>+CONFIG_CPM=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel options</div><div class='add'>+#</div><div class='add'>+# CONFIG_HIGHMEM is not set</div><div class='add'>+# CONFIG_TICK_ONESHOT is not set</div><div class='add'>+# CONFIG_NO_HZ is not set</div><div class='add'>+# CONFIG_HIGH_RES_TIMERS is not set</div><div class='add'>+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y</div><div class='add'>+# CONFIG_HZ_100 is not set</div><div class='add'>+# CONFIG_HZ_250 is not set</div><div class='add'>+# CONFIG_HZ_300 is not set</div><div class='add'>+CONFIG_HZ_1000=y</div><div class='add'>+CONFIG_HZ=1000</div><div class='add'>+# CONFIG_SCHED_HRTICK is not set</div><div class='add'>+CONFIG_PREEMPT_NONE=y</div><div class='add'>+# CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='add'>+# CONFIG_PREEMPT is not set</div><div class='add'>+CONFIG_BINFMT_ELF=y</div><div class='add'>+# CONFIG_BINFMT_MISC is not set</div><div class='add'>+CONFIG_MATH_EMULATION=y</div><div class='add'>+# CONFIG_IOMMU_HELPER is not set</div><div class='add'>+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y</div><div class='add'>+CONFIG_ARCH_HAS_WALK_MEMORY=y</div><div class='add'>+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y</div><div class='add'>+CONFIG_ARCH_FLATMEM_ENABLE=y</div><div class='add'>+CONFIG_ARCH_POPULATES_NODE_MAP=y</div><div class='add'>+CONFIG_SELECT_MEMORY_MODEL=y</div><div class='add'>+CONFIG_FLATMEM_MANUAL=y</div><div class='add'>+# CONFIG_DISCONTIGMEM_MANUAL is not set</div><div class='add'>+# CONFIG_SPARSEMEM_MANUAL is not set</div><div class='add'>+CONFIG_FLATMEM=y</div><div class='add'>+CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='add'>+# CONFIG_SPARSEMEM_STATIC is not set</div><div class='add'>+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='add'>+CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='add'>+CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+CONFIG_ZONE_DMA_FLAG=1</div><div class='add'>+CONFIG_BOUNCE=y</div><div class='add'>+CONFIG_VIRT_TO_BUS=y</div><div class='add'>+CONFIG_FORCE_MAX_ZONEORDER=11</div><div class='add'>+# CONFIG_PROC_DEVICETREE is not set</div><div class='add'>+# CONFIG_CMDLINE_BOOL is not set</div><div class='add'>+# CONFIG_PM is not set</div><div class='add'>+# CONFIG_SECCOMP is not set</div><div class='add'>+CONFIG_ISA_DMA_API=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Bus options</div><div class='add'>+#</div><div class='add'>+CONFIG_ZONE_DMA=y</div><div class='add'>+CONFIG_FSL_SOC=y</div><div class='add'>+# CONFIG_PCI is not set</div><div class='add'>+# CONFIG_PCI_DOMAINS is not set</div><div class='add'>+# CONFIG_PCI_SYSCALL is not set</div><div class='add'>+# CONFIG_PCI_QSPAN is not set</div><div class='add'>+# CONFIG_ARCH_SUPPORTS_MSI is not set</div><div class='add'>+# CONFIG_HAS_RAPIDIO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Advanced setup</div><div class='add'>+#</div><div class='add'>+# CONFIG_ADVANCED_OPTIONS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Default settings for advanced configuration options are used</div><div class='add'>+#</div><div class='add'>+CONFIG_LOWMEM_SIZE=0x30000000</div><div class='add'>+CONFIG_PAGE_OFFSET=0xc0000000</div><div class='add'>+CONFIG_KERNEL_START=0xc0000000</div><div class='add'>+CONFIG_PHYSICAL_START=0x00000000</div><div class='add'>+CONFIG_TASK_SIZE=0x80000000</div><div class='add'>+CONFIG_CONSISTENT_START=0xfd000000</div><div class='add'>+CONFIG_CONSISTENT_SIZE=0x00200000</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking</div><div class='add'>+#</div><div class='add'>+CONFIG_NET=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking options</div><div class='add'>+#</div><div class='add'>+CONFIG_PACKET=y</div><div class='add'>+# CONFIG_PACKET_MMAP is not set</div><div class='add'>+CONFIG_UNIX=y</div><div class='add'>+CONFIG_XFRM=y</div><div class='add'>+# CONFIG_XFRM_USER is not set</div><div class='add'>+# CONFIG_XFRM_SUB_POLICY is not set</div><div class='add'>+# CONFIG_XFRM_MIGRATE is not set</div><div class='add'>+# CONFIG_XFRM_STATISTICS is not set</div><div class='add'>+# CONFIG_NET_KEY is not set</div><div class='add'>+CONFIG_INET=y</div><div class='add'>+CONFIG_IP_MULTICAST=y</div><div class='add'>+# CONFIG_IP_ADVANCED_ROUTER is not set</div><div class='add'>+CONFIG_IP_FIB_HASH=y</div><div class='add'>+CONFIG_IP_PNP=y</div><div class='add'>+# CONFIG_IP_PNP_DHCP is not set</div><div class='add'>+# CONFIG_IP_PNP_BOOTP is not set</div><div class='add'>+# CONFIG_IP_PNP_RARP is not set</div><div class='add'>+# CONFIG_NET_IPIP is not set</div><div class='add'>+# CONFIG_NET_IPGRE is not set</div><div class='add'>+# CONFIG_IP_MROUTE is not set</div><div class='add'>+# CONFIG_ARPD is not set</div><div class='add'>+CONFIG_SYN_COOKIES=y</div><div class='add'>+# CONFIG_INET_AH is not set</div><div class='add'>+# CONFIG_INET_ESP is not set</div><div class='add'>+# CONFIG_INET_IPCOMP is not set</div><div class='add'>+# CONFIG_INET_XFRM_TUNNEL is not set</div><div class='add'>+# CONFIG_INET_TUNNEL is not set</div><div class='add'>+CONFIG_INET_XFRM_MODE_TRANSPORT=y</div><div class='add'>+CONFIG_INET_XFRM_MODE_TUNNEL=y</div><div class='add'>+CONFIG_INET_XFRM_MODE_BEET=y</div><div class='add'>+# CONFIG_INET_LRO is not set</div><div class='add'>+CONFIG_INET_DIAG=y</div><div class='add'>+CONFIG_INET_TCP_DIAG=y</div><div class='add'>+# CONFIG_TCP_CONG_ADVANCED is not set</div><div class='add'>+CONFIG_TCP_CONG_CUBIC=y</div><div class='add'>+CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='add'>+# CONFIG_TCP_MD5SIG is not set</div><div class='add'>+# CONFIG_IPV6 is not set</div><div class='add'>+# CONFIG_NETWORK_SECMARK is not set</div><div class='add'>+# CONFIG_NETFILTER is not set</div><div class='add'>+# CONFIG_IP_DCCP is not set</div><div class='add'>+# CONFIG_IP_SCTP is not set</div><div class='add'>+# CONFIG_TIPC is not set</div><div class='add'>+# CONFIG_ATM is not set</div><div class='add'>+# CONFIG_BRIDGE is not set</div><div class='add'>+# CONFIG_VLAN_8021Q is not set</div><div class='add'>+# CONFIG_DECNET is not set</div><div class='add'>+# CONFIG_LLC2 is not set</div><div class='add'>+# CONFIG_IPX is not set</div><div class='add'>+# CONFIG_ATALK is not set</div><div class='add'>+# CONFIG_X25 is not set</div><div class='add'>+# CONFIG_LAPB is not set</div><div class='add'>+# CONFIG_ECONET is not set</div><div class='add'>+# CONFIG_WAN_ROUTER is not set</div><div class='add'>+# CONFIG_NET_SCHED is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network testing</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_PKTGEN is not set</div><div class='add'>+# CONFIG_HAMRADIO is not set</div><div class='add'>+# CONFIG_CAN is not set</div><div class='add'>+# CONFIG_IRDA is not set</div><div class='add'>+# CONFIG_BT is not set</div><div class='add'>+# CONFIG_AF_RXRPC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless</div><div class='add'>+#</div><div class='add'>+# CONFIG_CFG80211 is not set</div><div class='add'>+# CONFIG_WIRELESS_EXT is not set</div><div class='add'>+# CONFIG_MAC80211 is not set</div><div class='add'>+# CONFIG_IEEE80211 is not set</div><div class='add'>+# CONFIG_RFKILL is not set</div><div class='add'>+# CONFIG_NET_9P is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Device Drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Generic Driver Options</div><div class='add'>+#</div><div class='add'>+CONFIG_STANDALONE=y</div><div class='add'>+CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='add'>+# CONFIG_CONNECTOR is not set</div><div class='add'>+CONFIG_MTD=y</div><div class='add'>+# CONFIG_MTD_DEBUG is not set</div><div class='add'>+# CONFIG_MTD_CONCAT is not set</div><div class='add'>+CONFIG_MTD_PARTITIONS=y</div><div class='add'>+# CONFIG_MTD_REDBOOT_PARTS is not set</div><div class='add'>+CONFIG_MTD_CMDLINE_PARTS=y</div><div class='add'>+CONFIG_MTD_OF_PARTS=y</div><div class='add'>+# CONFIG_MTD_AR7_PARTS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# User Modules And Translation Layers</div><div class='add'>+#</div><div class='add'>+CONFIG_MTD_CHAR=y</div><div class='add'>+CONFIG_MTD_BLKDEVS=y</div><div class='add'>+CONFIG_MTD_BLOCK=y</div><div class='add'>+# CONFIG_FTL is not set</div><div class='add'>+# CONFIG_NFTL is not set</div><div class='add'>+# CONFIG_INFTL is not set</div><div class='add'>+# CONFIG_RFD_FTL is not set</div><div class='add'>+# CONFIG_SSFDC is not set</div><div class='add'>+# CONFIG_MTD_OOPS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# RAM/ROM/Flash chip drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_MTD_CFI=y</div><div class='add'>+# CONFIG_MTD_JEDECPROBE is not set</div><div class='add'>+CONFIG_MTD_GEN_PROBE=y</div><div class='add'>+CONFIG_MTD_CFI_ADV_OPTIONS=y</div><div class='add'>+CONFIG_MTD_CFI_NOSWAP=y</div><div class='add'>+# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set</div><div class='add'>+# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set</div><div class='add'>+CONFIG_MTD_CFI_GEOMETRY=y</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_1=y</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_2=y</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_4 is not set</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set</div><div class='add'>+CONFIG_MTD_CFI_I1=y</div><div class='add'>+CONFIG_MTD_CFI_I2=y</div><div class='add'>+# CONFIG_MTD_CFI_I4 is not set</div><div class='add'>+# CONFIG_MTD_CFI_I8 is not set</div><div class='add'>+# CONFIG_MTD_OTP is not set</div><div class='add'>+CONFIG_MTD_CFI_INTELEXT=y</div><div class='add'>+CONFIG_MTD_CFI_AMDSTD=y</div><div class='add'>+CONFIG_MTD_CFI_STAA=y</div><div class='add'>+CONFIG_MTD_CFI_UTIL=y</div><div class='add'>+# CONFIG_MTD_RAM is not set</div><div class='add'>+# CONFIG_MTD_ROM is not set</div><div class='add'>+# CONFIG_MTD_ABSENT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Mapping drivers for chip access</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_COMPLEX_MAPPINGS is not set</div><div class='add'>+# CONFIG_MTD_PHYSMAP is not set</div><div class='add'>+CONFIG_MTD_PHYSMAP_OF=y</div><div class='add'>+# CONFIG_MTD_CFI_FLAGADM is not set</div><div class='add'>+# CONFIG_MTD_PLATRAM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Self-contained MTD device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_SLRAM is not set</div><div class='add'>+# CONFIG_MTD_PHRAM is not set</div><div class='add'>+# CONFIG_MTD_MTDRAM is not set</div><div class='add'>+# CONFIG_MTD_BLOCK2MTD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Disk-On-Chip Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_DOC2000 is not set</div><div class='add'>+# CONFIG_MTD_DOC2001 is not set</div><div class='add'>+# CONFIG_MTD_DOC2001PLUS is not set</div><div class='add'>+# CONFIG_MTD_NAND is not set</div><div class='add'>+# CONFIG_MTD_ONENAND is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# UBI - Unsorted block images</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_UBI is not set</div><div class='add'>+CONFIG_OF_DEVICE=y</div><div class='add'>+# CONFIG_PARPORT is not set</div><div class='add'>+CONFIG_BLK_DEV=y</div><div class='add'>+# CONFIG_BLK_DEV_FD is not set</div><div class='add'>+# CONFIG_BLK_DEV_COW_COMMON is not set</div><div class='add'>+CONFIG_BLK_DEV_LOOP=y</div><div class='add'>+# CONFIG_BLK_DEV_CRYPTOLOOP is not set</div><div class='add'>+# CONFIG_BLK_DEV_NBD is not set</div><div class='add'>+CONFIG_BLK_DEV_RAM=y</div><div class='add'>+CONFIG_BLK_DEV_RAM_COUNT=16</div><div class='add'>+CONFIG_BLK_DEV_RAM_SIZE=4096</div><div class='add'>+# CONFIG_BLK_DEV_XIP is not set</div><div class='add'>+# CONFIG_CDROM_PKTCDVD is not set</div><div class='add'>+# CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+# CONFIG_MISC_DEVICES is not set</div><div class='add'>+CONFIG_HAVE_IDE=y</div><div class='add'>+# CONFIG_IDE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_RAID_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI is not set</div><div class='add'>+# CONFIG_SCSI_DMA is not set</div><div class='add'>+# CONFIG_SCSI_NETLINK is not set</div><div class='add'>+# CONFIG_ATA is not set</div><div class='add'>+# CONFIG_MD is not set</div><div class='add'>+# CONFIG_MACINTOSH_DRIVERS is not set</div><div class='add'>+CONFIG_NETDEVICES=y</div><div class='add'>+# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='add'>+# CONFIG_DUMMY is not set</div><div class='add'>+# CONFIG_BONDING is not set</div><div class='add'>+# CONFIG_MACVLAN is not set</div><div class='add'>+# CONFIG_EQUALIZER is not set</div><div class='add'>+# CONFIG_TUN is not set</div><div class='add'>+# CONFIG_VETH is not set</div><div class='add'>+CONFIG_PHYLIB=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MII PHY device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MARVELL_PHY is not set</div><div class='add'>+# CONFIG_DAVICOM_PHY is not set</div><div class='add'>+# CONFIG_QSEMI_PHY is not set</div><div class='add'>+# CONFIG_LXT_PHY is not set</div><div class='add'>+# CONFIG_CICADA_PHY is not set</div><div class='add'>+# CONFIG_VITESSE_PHY is not set</div><div class='add'>+# CONFIG_SMSC_PHY is not set</div><div class='add'>+# CONFIG_BROADCOM_PHY is not set</div><div class='add'>+# CONFIG_ICPLUS_PHY is not set</div><div class='add'>+# CONFIG_REALTEK_PHY is not set</div><div class='add'>+CONFIG_FIXED_PHY=y</div><div class='add'>+# CONFIG_MDIO_BITBANG is not set</div><div class='add'>+CONFIG_NET_ETHERNET=y</div><div class='add'>+CONFIG_MII=y</div><div class='add'>+# CONFIG_IBM_NEW_EMAC_ZMII is not set</div><div class='add'>+# CONFIG_IBM_NEW_EMAC_RGMII is not set</div><div class='add'>+# CONFIG_IBM_NEW_EMAC_TAH is not set</div><div class='add'>+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set</div><div class='add'>+# CONFIG_B44 is not set</div><div class='add'>+CONFIG_FS_ENET=y</div><div class='add'>+CONFIG_FS_ENET_HAS_SCC=y</div><div class='add'>+# CONFIG_FS_ENET_HAS_FEC is not set</div><div class='add'>+# CONFIG_FS_ENET_MDIO_FEC is not set</div><div class='add'>+# CONFIG_NETDEV_1000 is not set</div><div class='add'>+# CONFIG_NETDEV_10000 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless LAN</div><div class='add'>+#</div><div class='add'>+# CONFIG_WLAN_PRE80211 is not set</div><div class='add'>+# CONFIG_WLAN_80211 is not set</div><div class='add'>+# CONFIG_IWLWIFI_LEDS is not set</div><div class='add'>+# CONFIG_WAN is not set</div><div class='add'>+# CONFIG_PPP is not set</div><div class='add'>+# CONFIG_SLIP is not set</div><div class='add'>+# CONFIG_NETCONSOLE is not set</div><div class='add'>+# CONFIG_NETPOLL is not set</div><div class='add'>+# CONFIG_NET_POLL_CONTROLLER is not set</div><div class='add'>+# CONFIG_ISDN is not set</div><div class='add'>+# CONFIG_PHONE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_INPUT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware I/O ports</div><div class='add'>+#</div><div class='add'>+# CONFIG_SERIO is not set</div><div class='add'>+# CONFIG_GAMEPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Character devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_VT is not set</div><div class='add'>+CONFIG_DEVKMEM=y</div><div class='add'>+# CONFIG_SERIAL_NONSTANDARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Serial drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_SERIAL_8250 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Non-8250 serial port support</div><div class='add'>+#</div><div class='add'>+# CONFIG_SERIAL_UARTLITE is not set</div><div class='add'>+CONFIG_SERIAL_CORE=y</div><div class='add'>+CONFIG_SERIAL_CORE_CONSOLE=y</div><div class='add'>+CONFIG_SERIAL_CPM=y</div><div class='add'>+CONFIG_SERIAL_CPM_CONSOLE=y</div><div class='add'>+# CONFIG_SERIAL_CPM_SCC1 is not set</div><div class='add'>+# CONFIG_SERIAL_CPM_SCC2 is not set</div><div class='add'>+# CONFIG_SERIAL_CPM_SCC3 is not set</div><div class='add'>+# CONFIG_SERIAL_CPM_SCC4 is not set</div><div class='add'>+CONFIG_SERIAL_CPM_SMC1=y</div><div class='add'>+# CONFIG_SERIAL_CPM_SMC2 is not set</div><div class='add'>+CONFIG_UNIX98_PTYS=y</div><div class='add'>+# CONFIG_LEGACY_PTYS is not set</div><div class='add'>+# CONFIG_IPMI_HANDLER is not set</div><div class='add'>+CONFIG_HW_RANDOM=y</div><div class='add'>+# CONFIG_NVRAM is not set</div><div class='add'>+CONFIG_GEN_RTC=y</div><div class='add'>+# CONFIG_GEN_RTC_X is not set</div><div class='add'>+# CONFIG_R3964 is not set</div><div class='add'>+# CONFIG_RAW_DRIVER is not set</div><div class='add'>+# CONFIG_TCG_TPM is not set</div><div class='add'>+# CONFIG_I2C is not set</div><div class='add'>+# CONFIG_SPI is not set</div><div class='add'>+# CONFIG_W1 is not set</div><div class='add'>+# CONFIG_POWER_SUPPLY is not set</div><div class='add'>+# CONFIG_HWMON is not set</div><div class='add'>+# CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_WATCHDOG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Sonics Silicon Backplane</div><div class='add'>+#</div><div class='add'>+CONFIG_SSB_POSSIBLE=y</div><div class='add'>+# CONFIG_SSB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multifunction device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MFD_SM501 is not set</div><div class='add'>+# CONFIG_HTC_PASIC3 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia core support</div><div class='add'>+#</div><div class='add'>+# CONFIG_VIDEO_DEV is not set</div><div class='add'>+# CONFIG_DVB_CORE is not set</div><div class='add'>+# CONFIG_VIDEO_MEDIA is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_DAB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics support</div><div class='add'>+#</div><div class='add'>+# CONFIG_VGASTATE is not set</div><div class='add'>+# CONFIG_VIDEO_OUTPUT_CONTROL is not set</div><div class='add'>+# CONFIG_FB is not set</div><div class='add'>+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Display device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DISPLAY_SUPPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Sound</div><div class='add'>+#</div><div class='add'>+# CONFIG_SOUND is not set</div><div class='add'>+# CONFIG_USB_SUPPORT is not set</div><div class='add'>+# CONFIG_MMC is not set</div><div class='add'>+# CONFIG_MEMSTICK is not set</div><div class='add'>+# CONFIG_NEW_LEDS is not set</div><div class='add'>+# CONFIG_ACCESSIBILITY is not set</div><div class='add'>+# CONFIG_EDAC is not set</div><div class='add'>+# CONFIG_RTC_CLASS is not set</div><div class='add'>+# CONFIG_DMADEVICES is not set</div><div class='add'>+# CONFIG_UIO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# File systems</div><div class='add'>+#</div><div class='add'>+CONFIG_EXT2_FS=y</div><div class='add'>+CONFIG_EXT2_FS_XATTR=y</div><div class='add'>+# CONFIG_EXT2_FS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_EXT2_FS_SECURITY is not set</div><div class='add'>+# CONFIG_EXT2_FS_XIP is not set</div><div class='add'>+CONFIG_EXT3_FS=y</div><div class='add'>+CONFIG_EXT3_FS_XATTR=y</div><div class='add'>+# CONFIG_EXT3_FS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_EXT3_FS_SECURITY is not set</div><div class='add'>+# CONFIG_EXT4DEV_FS is not set</div><div class='add'>+CONFIG_JBD=y</div><div class='add'>+# CONFIG_JBD_DEBUG is not set</div><div class='add'>+CONFIG_FS_MBCACHE=y</div><div class='add'>+# CONFIG_REISERFS_FS is not set</div><div class='add'>+# CONFIG_JFS_FS is not set</div><div class='add'>+# CONFIG_FS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_XFS_FS is not set</div><div class='add'>+# CONFIG_OCFS2_FS is not set</div><div class='add'>+CONFIG_DNOTIFY=y</div><div class='add'>+CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='add'>+# CONFIG_QUOTA is not set</div><div class='add'>+# CONFIG_AUTOFS_FS is not set</div><div class='add'>+# CONFIG_AUTOFS4_FS is not set</div><div class='add'>+# CONFIG_FUSE_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CD-ROM/DVD Filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ISO9660_FS is not set</div><div class='add'>+# CONFIG_UDF_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DOS/FAT/NT Filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_MSDOS_FS is not set</div><div class='add'>+# CONFIG_VFAT_FS is not set</div><div class='add'>+# CONFIG_NTFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Pseudo filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_PROC_FS=y</div><div class='add'>+# CONFIG_PROC_KCORE is not set</div><div class='add'>+CONFIG_PROC_SYSCTL=y</div><div class='add'>+CONFIG_SYSFS=y</div><div class='add'>+CONFIG_TMPFS=y</div><div class='add'>+# CONFIG_TMPFS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_HUGETLB_PAGE is not set</div><div class='add'>+# CONFIG_CONFIGFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ADFS_FS is not set</div><div class='add'>+# CONFIG_AFFS_FS is not set</div><div class='add'>+# CONFIG_HFS_FS is not set</div><div class='add'>+# CONFIG_HFSPLUS_FS is not set</div><div class='add'>+# CONFIG_BEFS_FS is not set</div><div class='add'>+# CONFIG_BFS_FS is not set</div><div class='add'>+# CONFIG_EFS_FS is not set</div><div class='add'>+CONFIG_JFFS2_FS=y</div><div class='add'>+CONFIG_JFFS2_FS_DEBUG=0</div><div class='add'>+CONFIG_JFFS2_FS_WRITEBUFFER=y</div><div class='add'>+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set</div><div class='add'>+# CONFIG_JFFS2_SUMMARY is not set</div><div class='add'>+# CONFIG_JFFS2_FS_XATTR is not set</div><div class='add'>+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set</div><div class='add'>+CONFIG_JFFS2_ZLIB=y</div><div class='add'>+# CONFIG_JFFS2_LZO is not set</div><div class='add'>+CONFIG_JFFS2_RTIME=y</div><div class='add'>+# CONFIG_JFFS2_RUBIN is not set</div><div class='add'>+CONFIG_CRAMFS=y</div><div class='add'>+# CONFIG_VXFS_FS is not set</div><div class='add'>+# CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_HPFS_FS is not set</div><div class='add'>+# CONFIG_QNX4FS_FS is not set</div><div class='add'>+# CONFIG_ROMFS_FS is not set</div><div class='add'>+# CONFIG_SYSV_FS is not set</div><div class='add'>+# CONFIG_UFS_FS is not set</div><div class='add'>+CONFIG_NETWORK_FILESYSTEMS=y</div><div class='add'>+CONFIG_NFS_FS=y</div><div class='add'>+CONFIG_NFS_V3=y</div><div class='add'>+# CONFIG_NFS_V3_ACL is not set</div><div class='add'>+# CONFIG_NFS_V4 is not set</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='add'>+CONFIG_ROOT_NFS=y</div><div class='add'>+CONFIG_LOCKD=y</div><div class='add'>+CONFIG_LOCKD_V4=y</div><div class='add'>+CONFIG_NFS_COMMON=y</div><div class='add'>+CONFIG_SUNRPC=y</div><div class='add'>+# CONFIG_SUNRPC_BIND34 is not set</div><div class='add'>+# CONFIG_RPCSEC_GSS_KRB5 is not set</div><div class='add'>+# CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='add'>+# CONFIG_SMB_FS is not set</div><div class='add'>+# CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_NCP_FS is not set</div><div class='add'>+# CONFIG_CODA_FS is not set</div><div class='add'>+# CONFIG_AFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Partition Types</div><div class='add'>+#</div><div class='add'>+CONFIG_PARTITION_ADVANCED=y</div><div class='add'>+# CONFIG_ACORN_PARTITION is not set</div><div class='add'>+# CONFIG_OSF_PARTITION is not set</div><div class='add'>+# CONFIG_AMIGA_PARTITION is not set</div><div class='add'>+# CONFIG_ATARI_PARTITION is not set</div><div class='add'>+# CONFIG_MAC_PARTITION is not set</div><div class='add'>+CONFIG_MSDOS_PARTITION=y</div><div class='add'>+# CONFIG_BSD_DISKLABEL is not set</div><div class='add'>+# CONFIG_MINIX_SUBPARTITION is not set</div><div class='add'>+# CONFIG_SOLARIS_X86_PARTITION is not set</div><div class='add'>+# CONFIG_UNIXWARE_DISKLABEL is not set</div><div class='add'>+# CONFIG_LDM_PARTITION is not set</div><div class='add'>+# CONFIG_SGI_PARTITION is not set</div><div class='add'>+# CONFIG_ULTRIX_PARTITION is not set</div><div class='add'>+# CONFIG_SUN_PARTITION is not set</div><div class='add'>+# CONFIG_KARMA_PARTITION is not set</div><div class='add'>+# CONFIG_EFI_PARTITION is not set</div><div class='add'>+# CONFIG_SYSV68_PARTITION is not set</div><div class='add'>+# CONFIG_NLS is not set</div><div class='add'>+# CONFIG_DLM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Library routines</div><div class='add'>+#</div><div class='add'>+CONFIG_BITREVERSE=y</div><div class='add'>+# CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='add'>+CONFIG_CRC_CCITT=y</div><div class='add'>+# CONFIG_CRC16 is not set</div><div class='add'>+# CONFIG_CRC_ITU_T is not set</div><div class='add'>+CONFIG_CRC32=y</div><div class='add'>+# CONFIG_CRC7 is not set</div><div class='add'>+# CONFIG_LIBCRC32C is not set</div><div class='add'>+CONFIG_ZLIB_INFLATE=y</div><div class='add'>+CONFIG_ZLIB_DEFLATE=y</div><div class='add'>+CONFIG_PLIST=y</div><div class='add'>+CONFIG_HAS_IOMEM=y</div><div class='add'>+CONFIG_HAS_IOPORT=y</div><div class='add'>+CONFIG_HAS_DMA=y</div><div class='add'>+CONFIG_HAVE_LMB=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel hacking</div><div class='add'>+#</div><div class='add'>+# CONFIG_PRINTK_TIME is not set</div><div class='add'>+CONFIG_ENABLE_WARN_DEPRECATED=y</div><div class='add'>+CONFIG_ENABLE_MUST_CHECK=y</div><div class='add'>+CONFIG_FRAME_WARN=1024</div><div class='add'>+# CONFIG_MAGIC_SYSRQ is not set</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='add'>+CONFIG_DEBUG_FS=y</div><div class='add'>+# CONFIG_HEADERS_CHECK is not set</div><div class='add'>+# CONFIG_DEBUG_KERNEL is not set</div><div class='add'>+# CONFIG_SAMPLES is not set</div><div class='add'>+# CONFIG_IRQSTACKS is not set</div><div class='add'>+# CONFIG_VIRQ_DEBUG is not set</div><div class='add'>+# CONFIG_PPC_EARLY_DEBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Security options</div><div class='add'>+#</div><div class='add'>+# CONFIG_KEYS is not set</div><div class='add'>+# CONFIG_SECURITY is not set</div><div class='add'>+# CONFIG_SECURITY_FILE_CAPABILITIES is not set</div><div class='add'>+CONFIG_CRYPTO=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Crypto core or helper</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_MANAGER is not set</div><div class='add'>+# CONFIG_CRYPTO_GF128MUL is not set</div><div class='add'>+# CONFIG_CRYPTO_NULL is not set</div><div class='add'>+# CONFIG_CRYPTO_CRYPTD is not set</div><div class='add'>+# CONFIG_CRYPTO_AUTHENC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Authenticated Encryption with Associated Data</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CCM is not set</div><div class='add'>+# CONFIG_CRYPTO_GCM is not set</div><div class='add'>+# CONFIG_CRYPTO_SEQIV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block modes</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CBC is not set</div><div class='add'>+# CONFIG_CRYPTO_CTR is not set</div><div class='add'>+# CONFIG_CRYPTO_CTS is not set</div><div class='add'>+# CONFIG_CRYPTO_ECB is not set</div><div class='add'>+# CONFIG_CRYPTO_LRW is not set</div><div class='add'>+# CONFIG_CRYPTO_PCBC is not set</div><div class='add'>+# CONFIG_CRYPTO_XTS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hash modes</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_HMAC is not set</div><div class='add'>+# CONFIG_CRYPTO_XCBC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Digest</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CRC32C is not set</div><div class='add'>+# CONFIG_CRYPTO_MD4 is not set</div><div class='add'>+# CONFIG_CRYPTO_MD5 is not set</div><div class='add'>+# CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_SHA1 is not set</div><div class='add'>+# CONFIG_CRYPTO_SHA256 is not set</div><div class='add'>+# CONFIG_CRYPTO_SHA512 is not set</div><div class='add'>+# CONFIG_CRYPTO_TGR192 is not set</div><div class='add'>+# CONFIG_CRYPTO_WP512 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ciphers</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_AES is not set</div><div class='add'>+# CONFIG_CRYPTO_ANUBIS is not set</div><div class='add'>+# CONFIG_CRYPTO_ARC4 is not set</div><div class='add'>+# CONFIG_CRYPTO_BLOWFISH is not set</div><div class='add'>+# CONFIG_CRYPTO_CAMELLIA is not set</div><div class='add'>+# CONFIG_CRYPTO_CAST5 is not set</div><div class='add'>+# CONFIG_CRYPTO_CAST6 is not set</div><div class='add'>+# CONFIG_CRYPTO_DES is not set</div><div class='add'>+# CONFIG_CRYPTO_FCRYPT is not set</div><div class='add'>+# CONFIG_CRYPTO_KHAZAD is not set</div><div class='add'>+# CONFIG_CRYPTO_SALSA20 is not set</div><div class='add'>+# CONFIG_CRYPTO_SEED is not set</div><div class='add'>+# CONFIG_CRYPTO_SERPENT is not set</div><div class='add'>+# CONFIG_CRYPTO_TEA is not set</div><div class='add'>+# CONFIG_CRYPTO_TWOFISH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Compression</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_DEFLATE is not set</div><div class='add'>+# CONFIG_CRYPTO_LZO is not set</div><div class='add'>+CONFIG_CRYPTO_HW=y</div><div class='add'>+# CONFIG_PPC_CLOCK is not set</div><div class='add'>+CONFIG_PPC_LIB_RHEAP=y</div><div class='add'>+# CONFIG_VIRTUALIZATION is not set</div><div class='head'>diff --git a/arch/powerpc/configs/mpc8272_ads_defconfig b/arch/powerpc/configs/mpc8272_ads_defconfig<br/>index 7c435c84c875..ff6f7c475f47 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/configs/mpc8272_ads_defconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/configs/mpc8272_ads_defconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/configs/mpc8272_ads_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/configs/mpc8272_ads_defconfig</a></div><div class='hunk'>@@ -151,11 +151,11 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> #</div><div class='ctx'> CONFIG_PPC_MULTIPLATFORM=y</div><div class='ctx'> CONFIG_CLASSIC32=y</div><div class='del'>-CONFIG_PPC_CHRP=y</div><div class='add'>+# CONFIG_PPC_CHRP is not set</div><div class='add'>+# CONFIG_PPC_PMAC is not set</div><div class='ctx'> # CONFIG_MPC5121_ADS is not set</div><div class='ctx'> # CONFIG_MPC5121_GENERIC is not set</div><div class='ctx'> # CONFIG_PPC_MPC52xx is not set</div><div class='del'>-CONFIG_PPC_PMAC=y</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='ctx'> CONFIG_PPC_82xx=y</div><div class='head'>diff --git a/arch/powerpc/configs/mpc83xx_defconfig b/arch/powerpc/configs/mpc83xx_defconfig<br/>index 916e3df7cc45..991c9bda12a9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/configs/mpc83xx_defconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/configs/mpc83xx_defconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/configs/mpc83xx_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/configs/mpc83xx_defconfig</a></div><div class='hunk'>@@ -166,11 +166,11 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> #</div><div class='ctx'> CONFIG_PPC_MULTIPLATFORM=y</div><div class='ctx'> CONFIG_CLASSIC32=y</div><div class='del'>-CONFIG_PPC_CHRP=y</div><div class='add'>+# CONFIG_PPC_CHRP is not set</div><div class='add'>+# CONFIG_PPC_PMAC is not set</div><div class='ctx'> # CONFIG_MPC5121_ADS is not set</div><div class='ctx'> # CONFIG_MPC5121_GENERIC is not set</div><div class='ctx'> # CONFIG_PPC_MPC52xx is not set</div><div class='del'>-CONFIG_PPC_PMAC=y</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='ctx'> # CONFIG_PPC_82xx is not set</div><div class='head'>diff --git a/arch/powerpc/configs/mpc86xx_defconfig b/arch/powerpc/configs/mpc86xx_defconfig<br/>new file mode 100644<br/>index 000000000000..9d4be820cf1f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/configs/mpc86xx_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/configs/mpc86xx_defconfig</a></div><div class='hunk'>@@ -0,0 +1,1646 @@</div><div class='add'>+#</div><div class='add'>+# Automatically generated make config: don't edit</div><div class='add'>+# Linux kernel version: 2.6.27-rc5</div><div class='add'>+# Tue Sep 23 23:28:38 2008</div><div class='add'>+#</div><div class='add'>+# CONFIG_PPC64 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Processor support</div><div class='add'>+#</div><div class='add'>+CONFIG_6xx=y</div><div class='add'>+# CONFIG_PPC_85xx is not set</div><div class='add'>+# CONFIG_PPC_8xx is not set</div><div class='add'>+# CONFIG_40x is not set</div><div class='add'>+# CONFIG_44x is not set</div><div class='add'>+# CONFIG_E200 is not set</div><div class='add'>+CONFIG_PPC_FPU=y</div><div class='add'>+CONFIG_ALTIVEC=y</div><div class='add'>+CONFIG_PPC_STD_MMU=y</div><div class='add'>+CONFIG_PPC_STD_MMU_32=y</div><div class='add'>+# CONFIG_PPC_MM_SLICES is not set</div><div class='add'>+CONFIG_SMP=y</div><div class='add'>+CONFIG_NR_CPUS=2</div><div class='add'>+CONFIG_PPC32=y</div><div class='add'>+CONFIG_WORD_SIZE=32</div><div class='add'>+CONFIG_PPC_MERGE=y</div><div class='add'>+CONFIG_MMU=y</div><div class='add'>+CONFIG_GENERIC_CMOS_UPDATE=y</div><div class='add'>+CONFIG_GENERIC_TIME=y</div><div class='add'>+CONFIG_GENERIC_TIME_VSYSCALL=y</div><div class='add'>+CONFIG_GENERIC_CLOCKEVENTS=y</div><div class='add'>+CONFIG_GENERIC_HARDIRQS=y</div><div class='add'>+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set</div><div class='add'>+CONFIG_IRQ_PER_CPU=y</div><div class='add'>+CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='add'>+CONFIG_LOCKDEP_SUPPORT=y</div><div class='add'>+CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='add'>+CONFIG_ARCH_HAS_ILOG2_U32=y</div><div class='add'>+CONFIG_GENERIC_HWEIGHT=y</div><div class='add'>+CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='add'>+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set</div><div class='add'>+CONFIG_PPC=y</div><div class='add'>+CONFIG_EARLY_PRINTK=y</div><div class='add'>+CONFIG_GENERIC_NVRAM=y</div><div class='add'>+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y</div><div class='add'>+CONFIG_ARCH_MAY_HAVE_PC_FDC=y</div><div class='add'>+CONFIG_PPC_OF=y</div><div class='add'>+CONFIG_OF=y</div><div class='add'>+CONFIG_PPC_UDBG_16550=y</div><div class='add'>+CONFIG_GENERIC_TBSYNC=y</div><div class='add'>+CONFIG_AUDIT_ARCH=y</div><div class='add'>+CONFIG_GENERIC_BUG=y</div><div class='add'>+CONFIG_DEFAULT_UIMAGE=y</div><div class='add'>+# CONFIG_PPC_DCR_NATIVE is not set</div><div class='add'>+# CONFIG_PPC_DCR_MMIO is not set</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# General setup</div><div class='add'>+#</div><div class='add'>+CONFIG_EXPERIMENTAL=y</div><div class='add'>+CONFIG_LOCK_KERNEL=y</div><div class='add'>+CONFIG_INIT_ENV_ARG_LIMIT=32</div><div class='add'>+CONFIG_LOCALVERSION=""</div><div class='add'>+CONFIG_LOCALVERSION_AUTO=y</div><div class='add'>+CONFIG_SWAP=y</div><div class='add'>+CONFIG_SYSVIPC=y</div><div class='add'>+CONFIG_SYSVIPC_SYSCTL=y</div><div class='add'>+CONFIG_POSIX_MQUEUE=y</div><div class='add'>+CONFIG_BSD_PROCESS_ACCT=y</div><div class='add'>+# CONFIG_BSD_PROCESS_ACCT_V3 is not set</div><div class='add'>+# CONFIG_TASKSTATS is not set</div><div class='add'>+CONFIG_AUDIT=y</div><div class='add'>+# CONFIG_AUDITSYSCALL is not set</div><div class='add'>+CONFIG_IKCONFIG=y</div><div class='add'>+CONFIG_IKCONFIG_PROC=y</div><div class='add'>+CONFIG_LOG_BUF_SHIFT=14</div><div class='add'>+# CONFIG_CGROUPS is not set</div><div class='add'>+CONFIG_GROUP_SCHED=y</div><div class='add'>+# CONFIG_FAIR_GROUP_SCHED is not set</div><div class='add'>+# CONFIG_RT_GROUP_SCHED is not set</div><div class='add'>+CONFIG_USER_SCHED=y</div><div class='add'>+# CONFIG_CGROUP_SCHED is not set</div><div class='add'>+CONFIG_SYSFS_DEPRECATED=y</div><div class='add'>+CONFIG_SYSFS_DEPRECATED_V2=y</div><div class='add'>+# CONFIG_RELAY is not set</div><div class='add'>+# CONFIG_NAMESPACES is not set</div><div class='add'>+CONFIG_BLK_DEV_INITRD=y</div><div class='add'>+CONFIG_INITRAMFS_SOURCE=""</div><div class='add'>+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set</div><div class='add'>+CONFIG_SYSCTL=y</div><div class='add'>+CONFIG_EMBEDDED=y</div><div class='add'>+CONFIG_SYSCTL_SYSCALL=y</div><div class='add'>+CONFIG_KALLSYMS=y</div><div class='add'>+CONFIG_KALLSYMS_ALL=y</div><div class='add'>+CONFIG_KALLSYMS_EXTRA_PASS=y</div><div class='add'>+CONFIG_HOTPLUG=y</div><div class='add'>+CONFIG_PRINTK=y</div><div class='add'>+CONFIG_BUG=y</div><div class='add'>+CONFIG_ELF_CORE=y</div><div class='add'>+CONFIG_COMPAT_BRK=y</div><div class='add'>+CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_FUTEX=y</div><div class='add'>+CONFIG_ANON_INODES=y</div><div class='add'>+CONFIG_EPOLL=y</div><div class='add'>+CONFIG_SIGNALFD=y</div><div class='add'>+CONFIG_TIMERFD=y</div><div class='add'>+CONFIG_EVENTFD=y</div><div class='add'>+CONFIG_SHMEM=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='add'>+CONFIG_SLUB_DEBUG=y</div><div class='add'>+# CONFIG_SLAB is not set</div><div class='add'>+CONFIG_SLUB=y</div><div class='add'>+# CONFIG_SLOB is not set</div><div class='add'>+# CONFIG_PROFILING is not set</div><div class='add'>+# CONFIG_MARKERS is not set</div><div class='add'>+CONFIG_HAVE_OPROFILE=y</div><div class='add'>+# CONFIG_KPROBES is not set</div><div class='add'>+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y</div><div class='add'>+CONFIG_HAVE_IOREMAP_PROT=y</div><div class='add'>+CONFIG_HAVE_KPROBES=y</div><div class='add'>+CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+CONFIG_HAVE_ARCH_TRACEHOOK=y</div><div class='add'>+# CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+CONFIG_USE_GENERIC_SMP_HELPERS=y</div><div class='add'>+# CONFIG_HAVE_CLK is not set</div><div class='add'>+CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='add'>+CONFIG_SLABINFO=y</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='add'>+# CONFIG_TINY_SHMEM is not set</div><div class='add'>+CONFIG_BASE_SMALL=0</div><div class='add'>+CONFIG_MODULES=y</div><div class='add'>+# CONFIG_MODULE_FORCE_LOAD is not set</div><div class='add'>+CONFIG_MODULE_UNLOAD=y</div><div class='add'>+CONFIG_MODULE_FORCE_UNLOAD=y</div><div class='add'>+CONFIG_MODVERSIONS=y</div><div class='add'>+# CONFIG_MODULE_SRCVERSION_ALL is not set</div><div class='add'>+CONFIG_KMOD=y</div><div class='add'>+CONFIG_STOP_MACHINE=y</div><div class='add'>+CONFIG_BLOCK=y</div><div class='add'>+CONFIG_LBD=y</div><div class='add'>+# CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='add'>+# CONFIG_LSF is not set</div><div class='add'>+# CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IO Schedulers</div><div class='add'>+#</div><div class='add'>+CONFIG_IOSCHED_NOOP=y</div><div class='add'>+CONFIG_IOSCHED_AS=y</div><div class='add'>+CONFIG_IOSCHED_DEADLINE=y</div><div class='add'>+CONFIG_IOSCHED_CFQ=y</div><div class='add'>+# CONFIG_DEFAULT_AS is not set</div><div class='add'>+# CONFIG_DEFAULT_DEADLINE is not set</div><div class='add'>+CONFIG_DEFAULT_CFQ=y</div><div class='add'>+# CONFIG_DEFAULT_NOOP is not set</div><div class='add'>+CONFIG_DEFAULT_IOSCHED="cfq"</div><div class='add'>+CONFIG_CLASSIC_RCU=y</div><div class='add'>+# CONFIG_MPC8xxx_GPIO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Platform support</div><div class='add'>+#</div><div class='add'>+CONFIG_PPC_MULTIPLATFORM=y</div><div class='add'>+CONFIG_CLASSIC32=y</div><div class='add'>+# CONFIG_PPC_CHRP is not set</div><div class='add'>+# CONFIG_MPC5121_ADS is not set</div><div class='add'>+# CONFIG_MPC5121_GENERIC is not set</div><div class='add'>+# CONFIG_PPC_MPC52xx is not set</div><div class='add'>+# CONFIG_PPC_PMAC is not set</div><div class='add'>+# CONFIG_PPC_CELL is not set</div><div class='add'>+# CONFIG_PPC_CELL_NATIVE is not set</div><div class='add'>+# CONFIG_PPC_82xx is not set</div><div class='add'>+# CONFIG_PQ2ADS is not set</div><div class='add'>+# CONFIG_PPC_83xx is not set</div><div class='add'>+CONFIG_PPC_86xx=y</div><div class='add'>+CONFIG_MPC8641_HPCN=y</div><div class='add'>+CONFIG_SBC8641D=y</div><div class='add'>+CONFIG_MPC8610_HPCD=y</div><div class='add'>+CONFIG_GEF_SBC610=y</div><div class='add'>+CONFIG_MPC8641=y</div><div class='add'>+CONFIG_MPC8610=y</div><div class='add'>+# CONFIG_IPIC is not set</div><div class='add'>+CONFIG_MPIC=y</div><div class='add'>+# CONFIG_MPIC_WEIRD is not set</div><div class='add'>+CONFIG_PPC_I8259=y</div><div class='add'>+# CONFIG_PPC_RTAS is not set</div><div class='add'>+# CONFIG_MMIO_NVRAM is not set</div><div class='add'>+# CONFIG_PPC_MPC106 is not set</div><div class='add'>+# CONFIG_PPC_970_NAP is not set</div><div class='add'>+# CONFIG_PPC_INDIRECT_IO is not set</div><div class='add'>+# CONFIG_GENERIC_IOMAP is not set</div><div class='add'>+# CONFIG_CPU_FREQ is not set</div><div class='add'>+# CONFIG_TAU is not set</div><div class='add'>+CONFIG_FSL_ULI1575=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel options</div><div class='add'>+#</div><div class='add'>+CONFIG_HIGHMEM=y</div><div class='add'>+CONFIG_TICK_ONESHOT=y</div><div class='add'>+CONFIG_NO_HZ=y</div><div class='add'>+CONFIG_HIGH_RES_TIMERS=y</div><div class='add'>+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y</div><div class='add'>+# CONFIG_HZ_100 is not set</div><div class='add'>+# CONFIG_HZ_250 is not set</div><div class='add'>+# CONFIG_HZ_300 is not set</div><div class='add'>+CONFIG_HZ_1000=y</div><div class='add'>+CONFIG_HZ=1000</div><div class='add'>+CONFIG_SCHED_HRTICK=y</div><div class='add'>+CONFIG_PREEMPT_NONE=y</div><div class='add'>+# CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='add'>+# CONFIG_PREEMPT is not set</div><div class='add'>+CONFIG_BINFMT_ELF=y</div><div class='add'>+CONFIG_BINFMT_MISC=m</div><div class='add'>+# CONFIG_IOMMU_HELPER is not set</div><div class='add'>+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y</div><div class='add'>+CONFIG_ARCH_HAS_WALK_MEMORY=y</div><div class='add'>+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y</div><div class='add'>+# CONFIG_KEXEC is not set</div><div class='add'>+# CONFIG_IRQ_ALL_CPUS is not set</div><div class='add'>+CONFIG_ARCH_FLATMEM_ENABLE=y</div><div class='add'>+CONFIG_ARCH_POPULATES_NODE_MAP=y</div><div class='add'>+CONFIG_SELECT_MEMORY_MODEL=y</div><div class='add'>+CONFIG_FLATMEM_MANUAL=y</div><div class='add'>+# CONFIG_DISCONTIGMEM_MANUAL is not set</div><div class='add'>+# CONFIG_SPARSEMEM_MANUAL is not set</div><div class='add'>+CONFIG_FLATMEM=y</div><div class='add'>+CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='add'>+# CONFIG_SPARSEMEM_STATIC is not set</div><div class='add'>+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='add'>+CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='add'>+CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_MIGRATION=y</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+CONFIG_ZONE_DMA_FLAG=1</div><div class='add'>+CONFIG_BOUNCE=y</div><div class='add'>+CONFIG_VIRT_TO_BUS=y</div><div class='add'>+CONFIG_FORCE_MAX_ZONEORDER=11</div><div class='add'>+CONFIG_PROC_DEVICETREE=y</div><div class='add'>+# CONFIG_CMDLINE_BOOL is not set</div><div class='add'>+CONFIG_EXTRA_TARGETS=""</div><div class='add'>+# CONFIG_PM is not set</div><div class='add'>+CONFIG_SECCOMP=y</div><div class='add'>+CONFIG_ISA_DMA_API=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Bus options</div><div class='add'>+#</div><div class='add'>+CONFIG_ZONE_DMA=y</div><div class='add'>+CONFIG_GENERIC_ISA_DMA=y</div><div class='add'>+CONFIG_PPC_INDIRECT_PCI=y</div><div class='add'>+CONFIG_FSL_SOC=y</div><div class='add'>+CONFIG_FSL_PCI=y</div><div class='add'>+CONFIG_PPC_PCI_CHOICE=y</div><div class='add'>+CONFIG_PCI=y</div><div class='add'>+CONFIG_PCI_DOMAINS=y</div><div class='add'>+CONFIG_PCI_SYSCALL=y</div><div class='add'>+# CONFIG_PCIEPORTBUS is not set</div><div class='add'>+CONFIG_ARCH_SUPPORTS_MSI=y</div><div class='add'>+# CONFIG_PCI_MSI is not set</div><div class='add'>+CONFIG_PCI_LEGACY=y</div><div class='add'>+# CONFIG_PCI_DEBUG is not set</div><div class='add'>+# CONFIG_PCCARD is not set</div><div class='add'>+# CONFIG_HOTPLUG_PCI is not set</div><div class='add'>+CONFIG_HAS_RAPIDIO=y</div><div class='add'>+# CONFIG_RAPIDIO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Advanced setup</div><div class='add'>+#</div><div class='add'>+# CONFIG_ADVANCED_OPTIONS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Default settings for advanced configuration options are used</div><div class='add'>+#</div><div class='add'>+CONFIG_LOWMEM_SIZE=0x30000000</div><div class='add'>+CONFIG_PAGE_OFFSET=0xc0000000</div><div class='add'>+CONFIG_KERNEL_START=0xc0000000</div><div class='add'>+CONFIG_PHYSICAL_START=0x00000000</div><div class='add'>+CONFIG_TASK_SIZE=0xc0000000</div><div class='add'>+CONFIG_NET=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking options</div><div class='add'>+#</div><div class='add'>+CONFIG_PACKET=y</div><div class='add'>+# CONFIG_PACKET_MMAP is not set</div><div class='add'>+CONFIG_UNIX=y</div><div class='add'>+CONFIG_XFRM=y</div><div class='add'>+CONFIG_XFRM_USER=y</div><div class='add'>+# CONFIG_XFRM_SUB_POLICY is not set</div><div class='add'>+# CONFIG_XFRM_MIGRATE is not set</div><div class='add'>+# CONFIG_XFRM_STATISTICS is not set</div><div class='add'>+CONFIG_NET_KEY=m</div><div class='add'>+# CONFIG_NET_KEY_MIGRATE is not set</div><div class='add'>+CONFIG_INET=y</div><div class='add'>+CONFIG_IP_MULTICAST=y</div><div class='add'>+CONFIG_IP_ADVANCED_ROUTER=y</div><div class='add'>+CONFIG_ASK_IP_FIB_HASH=y</div><div class='add'>+# CONFIG_IP_FIB_TRIE is not set</div><div class='add'>+CONFIG_IP_FIB_HASH=y</div><div class='add'>+CONFIG_IP_MULTIPLE_TABLES=y</div><div class='add'>+CONFIG_IP_ROUTE_MULTIPATH=y</div><div class='add'>+CONFIG_IP_ROUTE_VERBOSE=y</div><div class='add'>+CONFIG_IP_PNP=y</div><div class='add'>+CONFIG_IP_PNP_DHCP=y</div><div class='add'>+CONFIG_IP_PNP_BOOTP=y</div><div class='add'>+CONFIG_IP_PNP_RARP=y</div><div class='add'>+CONFIG_NET_IPIP=y</div><div class='add'>+CONFIG_NET_IPGRE=y</div><div class='add'>+CONFIG_NET_IPGRE_BROADCAST=y</div><div class='add'>+CONFIG_IP_MROUTE=y</div><div class='add'>+CONFIG_IP_PIMSM_V1=y</div><div class='add'>+CONFIG_IP_PIMSM_V2=y</div><div class='add'>+CONFIG_ARPD=y</div><div class='add'>+# CONFIG_SYN_COOKIES is not set</div><div class='add'>+# CONFIG_INET_AH is not set</div><div class='add'>+# CONFIG_INET_ESP is not set</div><div class='add'>+# CONFIG_INET_IPCOMP is not set</div><div class='add'>+# CONFIG_INET_XFRM_TUNNEL is not set</div><div class='add'>+CONFIG_INET_TUNNEL=y</div><div class='add'>+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set</div><div class='add'>+# CONFIG_INET_XFRM_MODE_TUNNEL is not set</div><div class='add'>+# CONFIG_INET_XFRM_MODE_BEET is not set</div><div class='add'>+# CONFIG_INET_LRO is not set</div><div class='add'>+CONFIG_INET_DIAG=y</div><div class='add'>+CONFIG_INET_TCP_DIAG=y</div><div class='add'>+# CONFIG_TCP_CONG_ADVANCED is not set</div><div class='add'>+CONFIG_TCP_CONG_CUBIC=y</div><div class='add'>+CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='add'>+# CONFIG_TCP_MD5SIG is not set</div><div class='add'>+CONFIG_IPV6=y</div><div class='add'>+# CONFIG_IPV6_PRIVACY is not set</div><div class='add'>+# CONFIG_IPV6_ROUTER_PREF is not set</div><div class='add'>+# CONFIG_IPV6_OPTIMISTIC_DAD is not set</div><div class='add'>+# CONFIG_INET6_AH is not set</div><div class='add'>+# CONFIG_INET6_ESP is not set</div><div class='add'>+# CONFIG_INET6_IPCOMP is not set</div><div class='add'>+# CONFIG_IPV6_MIP6 is not set</div><div class='add'>+# CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='add'>+# CONFIG_INET6_TUNNEL is not set</div><div class='add'>+CONFIG_INET6_XFRM_MODE_TRANSPORT=y</div><div class='add'>+CONFIG_INET6_XFRM_MODE_TUNNEL=y</div><div class='add'>+CONFIG_INET6_XFRM_MODE_BEET=y</div><div class='add'>+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set</div><div class='add'>+CONFIG_IPV6_SIT=y</div><div class='add'>+CONFIG_IPV6_NDISC_NODETYPE=y</div><div class='add'>+# CONFIG_IPV6_TUNNEL is not set</div><div class='add'>+# CONFIG_IPV6_MULTIPLE_TABLES is not set</div><div class='add'>+# CONFIG_IPV6_MROUTE is not set</div><div class='add'>+# CONFIG_NETWORK_SECMARK is not set</div><div class='add'>+# CONFIG_NETFILTER is not set</div><div class='add'>+# CONFIG_IP_DCCP is not set</div><div class='add'>+CONFIG_IP_SCTP=m</div><div class='add'>+# CONFIG_SCTP_DBG_MSG is not set</div><div class='add'>+# CONFIG_SCTP_DBG_OBJCNT is not set</div><div class='add'>+# CONFIG_SCTP_HMAC_NONE is not set</div><div class='add'>+# CONFIG_SCTP_HMAC_SHA1 is not set</div><div class='add'>+CONFIG_SCTP_HMAC_MD5=y</div><div class='add'>+# CONFIG_TIPC is not set</div><div class='add'>+# CONFIG_ATM is not set</div><div class='add'>+# CONFIG_BRIDGE is not set</div><div class='add'>+# CONFIG_VLAN_8021Q is not set</div><div class='add'>+# CONFIG_DECNET is not set</div><div class='add'>+# CONFIG_LLC2 is not set</div><div class='add'>+# CONFIG_IPX is not set</div><div class='add'>+# CONFIG_ATALK is not set</div><div class='add'>+# CONFIG_X25 is not set</div><div class='add'>+# CONFIG_LAPB is not set</div><div class='add'>+# CONFIG_ECONET is not set</div><div class='add'>+# CONFIG_WAN_ROUTER is not set</div><div class='add'>+# CONFIG_NET_SCHED is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network testing</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_PKTGEN is not set</div><div class='add'>+# CONFIG_HAMRADIO is not set</div><div class='add'>+# CONFIG_CAN is not set</div><div class='add'>+# CONFIG_IRDA is not set</div><div class='add'>+# CONFIG_BT is not set</div><div class='add'>+# CONFIG_AF_RXRPC is not set</div><div class='add'>+CONFIG_FIB_RULES=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless</div><div class='add'>+#</div><div class='add'>+# CONFIG_CFG80211 is not set</div><div class='add'>+# CONFIG_WIRELESS_EXT is not set</div><div class='add'>+# CONFIG_MAC80211 is not set</div><div class='add'>+# CONFIG_IEEE80211 is not set</div><div class='add'>+# CONFIG_RFKILL is not set</div><div class='add'>+# CONFIG_NET_9P is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Device Drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Generic Driver Options</div><div class='add'>+#</div><div class='add'>+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='add'>+CONFIG_STANDALONE=y</div><div class='add'>+CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='add'>+CONFIG_FW_LOADER=y</div><div class='add'>+CONFIG_FIRMWARE_IN_KERNEL=y</div><div class='add'>+CONFIG_EXTRA_FIRMWARE=""</div><div class='add'>+# CONFIG_DEBUG_DRIVER is not set</div><div class='add'>+# CONFIG_DEBUG_DEVRES is not set</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='add'>+# CONFIG_CONNECTOR is not set</div><div class='add'>+# CONFIG_MTD is not set</div><div class='add'>+CONFIG_OF_DEVICE=y</div><div class='add'>+CONFIG_OF_I2C=y</div><div class='add'>+# CONFIG_PARPORT is not set</div><div class='add'>+CONFIG_BLK_DEV=y</div><div class='add'>+# CONFIG_BLK_DEV_FD is not set</div><div class='add'>+# CONFIG_BLK_CPQ_DA is not set</div><div class='add'>+# CONFIG_BLK_CPQ_CISS_DA is not set</div><div class='add'>+# CONFIG_BLK_DEV_DAC960 is not set</div><div class='add'>+# CONFIG_BLK_DEV_UMEM is not set</div><div class='add'>+# CONFIG_BLK_DEV_COW_COMMON is not set</div><div class='add'>+CONFIG_BLK_DEV_LOOP=y</div><div class='add'>+# CONFIG_BLK_DEV_CRYPTOLOOP is not set</div><div class='add'>+CONFIG_BLK_DEV_NBD=y</div><div class='add'>+# CONFIG_BLK_DEV_SX8 is not set</div><div class='add'>+# CONFIG_BLK_DEV_UB is not set</div><div class='add'>+CONFIG_BLK_DEV_RAM=y</div><div class='add'>+CONFIG_BLK_DEV_RAM_COUNT=16</div><div class='add'>+CONFIG_BLK_DEV_RAM_SIZE=131072</div><div class='add'>+# CONFIG_BLK_DEV_XIP is not set</div><div class='add'>+# CONFIG_CDROM_PKTCDVD is not set</div><div class='add'>+# CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='add'>+CONFIG_MISC_DEVICES=y</div><div class='add'>+# CONFIG_PHANTOM is not set</div><div class='add'>+# CONFIG_EEPROM_93CX6 is not set</div><div class='add'>+# CONFIG_SGI_IOC4 is not set</div><div class='add'>+# CONFIG_TIFM_CORE is not set</div><div class='add'>+# CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+# CONFIG_HP_ILO is not set</div><div class='add'>+CONFIG_HAVE_IDE=y</div><div class='add'>+# CONFIG_IDE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_RAID_ATTRS is not set</div><div class='add'>+CONFIG_SCSI=y</div><div class='add'>+CONFIG_SCSI_DMA=y</div><div class='add'>+# CONFIG_SCSI_TGT is not set</div><div class='add'>+# CONFIG_SCSI_NETLINK is not set</div><div class='add'>+CONFIG_SCSI_PROC_FS=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI support type (disk, tape, CD-ROM)</div><div class='add'>+#</div><div class='add'>+CONFIG_BLK_DEV_SD=y</div><div class='add'>+CONFIG_CHR_DEV_ST=y</div><div class='add'>+# CONFIG_CHR_DEV_OSST is not set</div><div class='add'>+CONFIG_BLK_DEV_SR=y</div><div class='add'>+# CONFIG_BLK_DEV_SR_VENDOR is not set</div><div class='add'>+CONFIG_CHR_DEV_SG=y</div><div class='add'>+# CONFIG_CHR_DEV_SCH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs</div><div class='add'>+#</div><div class='add'>+CONFIG_SCSI_MULTI_LUN=y</div><div class='add'>+# CONFIG_SCSI_CONSTANTS is not set</div><div class='add'>+CONFIG_SCSI_LOGGING=y</div><div class='add'>+# CONFIG_SCSI_SCAN_ASYNC is not set</div><div class='add'>+CONFIG_SCSI_WAIT_SCAN=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI Transports</div><div class='add'>+#</div><div class='add'>+# CONFIG_SCSI_SPI_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_FC_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_ISCSI_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_SAS_LIBSAS is not set</div><div class='add'>+# CONFIG_SCSI_SRP_ATTRS is not set</div><div class='add'>+CONFIG_SCSI_LOWLEVEL=y</div><div class='add'>+# CONFIG_ISCSI_TCP is not set</div><div class='add'>+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set</div><div class='add'>+# CONFIG_SCSI_3W_9XXX is not set</div><div class='add'>+# CONFIG_SCSI_ACARD is not set</div><div class='add'>+# CONFIG_SCSI_AACRAID is not set</div><div class='add'>+# CONFIG_SCSI_AIC7XXX is not set</div><div class='add'>+# CONFIG_SCSI_AIC7XXX_OLD is not set</div><div class='add'>+# CONFIG_SCSI_AIC79XX is not set</div><div class='add'>+# CONFIG_SCSI_AIC94XX is not set</div><div class='add'>+# CONFIG_SCSI_DPT_I2O is not set</div><div class='add'>+# CONFIG_SCSI_ADVANSYS is not set</div><div class='add'>+# CONFIG_SCSI_ARCMSR is not set</div><div class='add'>+# CONFIG_MEGARAID_NEWGEN is not set</div><div class='add'>+# CONFIG_MEGARAID_LEGACY is not set</div><div class='add'>+# CONFIG_MEGARAID_SAS is not set</div><div class='add'>+# CONFIG_SCSI_HPTIOP is not set</div><div class='add'>+# CONFIG_SCSI_BUSLOGIC is not set</div><div class='add'>+# CONFIG_SCSI_DMX3191D is not set</div><div class='add'>+# CONFIG_SCSI_EATA is not set</div><div class='add'>+# CONFIG_SCSI_FUTURE_DOMAIN is not set</div><div class='add'>+# CONFIG_SCSI_GDTH is not set</div><div class='add'>+# CONFIG_SCSI_IPS is not set</div><div class='add'>+# CONFIG_SCSI_INITIO is not set</div><div class='add'>+# CONFIG_SCSI_INIA100 is not set</div><div class='add'>+# CONFIG_SCSI_MVSAS is not set</div><div class='add'>+# CONFIG_SCSI_STEX is not set</div><div class='add'>+# CONFIG_SCSI_SYM53C8XX_2 is not set</div><div class='add'>+# CONFIG_SCSI_IPR is not set</div><div class='add'>+# CONFIG_SCSI_QLOGIC_1280 is not set</div><div class='add'>+# CONFIG_SCSI_QLA_FC is not set</div><div class='add'>+# CONFIG_SCSI_QLA_ISCSI is not set</div><div class='add'>+# CONFIG_SCSI_LPFC is not set</div><div class='add'>+# CONFIG_SCSI_DC395x is not set</div><div class='add'>+# CONFIG_SCSI_DC390T is not set</div><div class='add'>+# CONFIG_SCSI_NSP32 is not set</div><div class='add'>+# CONFIG_SCSI_DEBUG is not set</div><div class='add'>+# CONFIG_SCSI_SRP is not set</div><div class='add'>+# CONFIG_SCSI_DH is not set</div><div class='add'>+CONFIG_ATA=y</div><div class='add'>+# CONFIG_ATA_NONSTANDARD is not set</div><div class='add'>+CONFIG_SATA_PMP=y</div><div class='add'>+CONFIG_SATA_AHCI=y</div><div class='add'>+# CONFIG_SATA_SIL24 is not set</div><div class='add'>+# CONFIG_SATA_FSL is not set</div><div class='add'>+CONFIG_ATA_SFF=y</div><div class='add'>+# CONFIG_SATA_SVW is not set</div><div class='add'>+# CONFIG_ATA_PIIX is not set</div><div class='add'>+# CONFIG_SATA_MV is not set</div><div class='add'>+# CONFIG_SATA_NV is not set</div><div class='add'>+# CONFIG_PDC_ADMA is not set</div><div class='add'>+# CONFIG_SATA_QSTOR is not set</div><div class='add'>+# CONFIG_SATA_PROMISE is not set</div><div class='add'>+# CONFIG_SATA_SX4 is not set</div><div class='add'>+# CONFIG_SATA_SIL is not set</div><div class='add'>+# CONFIG_SATA_SIS is not set</div><div class='add'>+# CONFIG_SATA_ULI is not set</div><div class='add'>+# CONFIG_SATA_VIA is not set</div><div class='add'>+# CONFIG_SATA_VITESSE is not set</div><div class='add'>+# CONFIG_SATA_INIC162X is not set</div><div class='add'>+CONFIG_PATA_ALI=y</div><div class='add'>+# CONFIG_PATA_AMD is not set</div><div class='add'>+# CONFIG_PATA_ARTOP is not set</div><div class='add'>+# CONFIG_PATA_ATIIXP is not set</div><div class='add'>+# CONFIG_PATA_CMD640_PCI is not set</div><div class='add'>+# CONFIG_PATA_CMD64X is not set</div><div class='add'>+# CONFIG_PATA_CS5520 is not set</div><div class='add'>+# CONFIG_PATA_CS5530 is not set</div><div class='add'>+# CONFIG_PATA_CYPRESS is not set</div><div class='add'>+# CONFIG_PATA_EFAR is not set</div><div class='add'>+# CONFIG_ATA_GENERIC is not set</div><div class='add'>+# CONFIG_PATA_HPT366 is not set</div><div class='add'>+# CONFIG_PATA_HPT37X is not set</div><div class='add'>+# CONFIG_PATA_HPT3X2N is not set</div><div class='add'>+# CONFIG_PATA_HPT3X3 is not set</div><div class='add'>+# CONFIG_PATA_IT821X is not set</div><div class='add'>+# CONFIG_PATA_IT8213 is not set</div><div class='add'>+# CONFIG_PATA_JMICRON is not set</div><div class='add'>+# CONFIG_PATA_TRIFLEX is not set</div><div class='add'>+# CONFIG_PATA_MARVELL is not set</div><div class='add'>+# CONFIG_PATA_MPIIX is not set</div><div class='add'>+# CONFIG_PATA_OLDPIIX is not set</div><div class='add'>+# CONFIG_PATA_NETCELL is not set</div><div class='add'>+# CONFIG_PATA_NINJA32 is not set</div><div class='add'>+# CONFIG_PATA_NS87410 is not set</div><div class='add'>+# CONFIG_PATA_NS87415 is not set</div><div class='add'>+# CONFIG_PATA_OPTI is not set</div><div class='add'>+# CONFIG_PATA_OPTIDMA is not set</div><div class='add'>+# CONFIG_PATA_PDC_OLD is not set</div><div class='add'>+# CONFIG_PATA_RADISYS is not set</div><div class='add'>+# CONFIG_PATA_RZ1000 is not set</div><div class='add'>+# CONFIG_PATA_SC1200 is not set</div><div class='add'>+# CONFIG_PATA_SERVERWORKS is not set</div><div class='add'>+# CONFIG_PATA_PDC2027X is not set</div><div class='add'>+# CONFIG_PATA_SIL680 is not set</div><div class='add'>+# CONFIG_PATA_SIS is not set</div><div class='add'>+# CONFIG_PATA_VIA is not set</div><div class='add'>+# CONFIG_PATA_WINBOND is not set</div><div class='add'>+# CONFIG_PATA_PLATFORM is not set</div><div class='add'>+# CONFIG_PATA_SCH is not set</div><div class='add'>+# CONFIG_MD is not set</div><div class='add'>+# CONFIG_FUSION is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IEEE 1394 (FireWire) support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Enable only one of the two stacks, unless you know what you are doing</div><div class='add'>+#</div><div class='add'>+# CONFIG_FIREWIRE is not set</div><div class='add'>+# CONFIG_IEEE1394 is not set</div><div class='add'>+# CONFIG_I2O is not set</div><div class='add'>+# CONFIG_MACINTOSH_DRIVERS is not set</div><div class='add'>+CONFIG_NETDEVICES=y</div><div class='add'>+CONFIG_DUMMY=y</div><div class='add'>+# CONFIG_BONDING is not set</div><div class='add'>+# CONFIG_MACVLAN is not set</div><div class='add'>+# CONFIG_EQUALIZER is not set</div><div class='add'>+# CONFIG_TUN is not set</div><div class='add'>+# CONFIG_VETH is not set</div><div class='add'>+# CONFIG_ARCNET is not set</div><div class='add'>+CONFIG_PHYLIB=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MII PHY device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MARVELL_PHY is not set</div><div class='add'>+# CONFIG_DAVICOM_PHY is not set</div><div class='add'>+# CONFIG_QSEMI_PHY is not set</div><div class='add'>+# CONFIG_LXT_PHY is not set</div><div class='add'>+# CONFIG_CICADA_PHY is not set</div><div class='add'>+CONFIG_VITESSE_PHY=y</div><div class='add'>+# CONFIG_SMSC_PHY is not set</div><div class='add'>+# CONFIG_BROADCOM_PHY is not set</div><div class='add'>+# CONFIG_ICPLUS_PHY is not set</div><div class='add'>+# CONFIG_REALTEK_PHY is not set</div><div class='add'>+# CONFIG_FIXED_PHY is not set</div><div class='add'>+# CONFIG_MDIO_BITBANG is not set</div><div class='add'>+CONFIG_NET_ETHERNET=y</div><div class='add'>+CONFIG_MII=y</div><div class='add'>+# CONFIG_HAPPYMEAL is not set</div><div class='add'>+# CONFIG_SUNGEM is not set</div><div class='add'>+# CONFIG_CASSINI is not set</div><div class='add'>+# CONFIG_NET_VENDOR_3COM is not set</div><div class='add'>+# CONFIG_NET_TULIP is not set</div><div class='add'>+# CONFIG_HP100 is not set</div><div class='add'>+# CONFIG_IBM_NEW_EMAC_ZMII is not set</div><div class='add'>+# CONFIG_IBM_NEW_EMAC_RGMII is not set</div><div class='add'>+# CONFIG_IBM_NEW_EMAC_TAH is not set</div><div class='add'>+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set</div><div class='add'>+# CONFIG_NET_PCI is not set</div><div class='add'>+# CONFIG_B44 is not set</div><div class='add'>+CONFIG_NETDEV_1000=y</div><div class='add'>+# CONFIG_ACENIC is not set</div><div class='add'>+# CONFIG_DL2K is not set</div><div class='add'>+# CONFIG_E1000 is not set</div><div class='add'>+# CONFIG_E1000E is not set</div><div class='add'>+# CONFIG_IP1000 is not set</div><div class='add'>+# CONFIG_IGB is not set</div><div class='add'>+# CONFIG_NS83820 is not set</div><div class='add'>+# CONFIG_HAMACHI is not set</div><div class='add'>+# CONFIG_YELLOWFIN is not set</div><div class='add'>+# CONFIG_R8169 is not set</div><div class='add'>+# CONFIG_SIS190 is not set</div><div class='add'>+# CONFIG_SKGE is not set</div><div class='add'>+# CONFIG_SKY2 is not set</div><div class='add'>+# CONFIG_VIA_VELOCITY is not set</div><div class='add'>+# CONFIG_TIGON3 is not set</div><div class='add'>+# CONFIG_BNX2 is not set</div><div class='add'>+CONFIG_GIANFAR=y</div><div class='add'>+# CONFIG_MV643XX_ETH is not set</div><div class='add'>+# CONFIG_QLA3XXX is not set</div><div class='add'>+# CONFIG_ATL1 is not set</div><div class='add'>+# CONFIG_ATL1E is not set</div><div class='add'>+CONFIG_NETDEV_10000=y</div><div class='add'>+# CONFIG_CHELSIO_T1 is not set</div><div class='add'>+# CONFIG_CHELSIO_T3 is not set</div><div class='add'>+# CONFIG_IXGBE is not set</div><div class='add'>+# CONFIG_IXGB is not set</div><div class='add'>+# CONFIG_S2IO is not set</div><div class='add'>+# CONFIG_MYRI10GE is not set</div><div class='add'>+# CONFIG_NETXEN_NIC is not set</div><div class='add'>+# CONFIG_NIU is not set</div><div class='add'>+# CONFIG_MLX4_CORE is not set</div><div class='add'>+# CONFIG_TEHUTI is not set</div><div class='add'>+# CONFIG_BNX2X is not set</div><div class='add'>+# CONFIG_SFC is not set</div><div class='add'>+# CONFIG_TR is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless LAN</div><div class='add'>+#</div><div class='add'>+# CONFIG_WLAN_PRE80211 is not set</div><div class='add'>+# CONFIG_WLAN_80211 is not set</div><div class='add'>+# CONFIG_IWLWIFI_LEDS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Network Adapters</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_CATC is not set</div><div class='add'>+# CONFIG_USB_KAWETH is not set</div><div class='add'>+# CONFIG_USB_PEGASUS is not set</div><div class='add'>+# CONFIG_USB_RTL8150 is not set</div><div class='add'>+# CONFIG_USB_USBNET is not set</div><div class='add'>+# CONFIG_WAN is not set</div><div class='add'>+# CONFIG_FDDI is not set</div><div class='add'>+# CONFIG_HIPPI is not set</div><div class='add'>+# CONFIG_PPP is not set</div><div class='add'>+# CONFIG_SLIP is not set</div><div class='add'>+# CONFIG_NET_FC is not set</div><div class='add'>+# CONFIG_NETCONSOLE is not set</div><div class='add'>+# CONFIG_NETPOLL is not set</div><div class='add'>+# CONFIG_NET_POLL_CONTROLLER is not set</div><div class='add'>+# CONFIG_ISDN is not set</div><div class='add'>+# CONFIG_PHONE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input device support</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT=y</div><div class='add'>+# CONFIG_INPUT_FF_MEMLESS is not set</div><div class='add'>+# CONFIG_INPUT_POLLDEV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Userland interfaces</div><div class='add'>+#</div><div class='add'>+# CONFIG_INPUT_MOUSEDEV is not set</div><div class='add'>+# CONFIG_INPUT_JOYDEV is not set</div><div class='add'>+# CONFIG_INPUT_EVDEV is not set</div><div class='add'>+# CONFIG_INPUT_EVBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_INPUT_KEYBOARD is not set</div><div class='add'>+# CONFIG_INPUT_MOUSE is not set</div><div class='add'>+# CONFIG_INPUT_JOYSTICK is not set</div><div class='add'>+# CONFIG_INPUT_TABLET is not set</div><div class='add'>+# CONFIG_INPUT_TOUCHSCREEN is not set</div><div class='add'>+# CONFIG_INPUT_MISC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware I/O ports</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIO=y</div><div class='add'>+CONFIG_SERIO_I8042=y</div><div class='add'>+CONFIG_SERIO_SERPORT=y</div><div class='add'>+# CONFIG_SERIO_PCIPS2 is not set</div><div class='add'>+CONFIG_SERIO_LIBPS2=y</div><div class='add'>+# CONFIG_SERIO_RAW is not set</div><div class='add'>+# CONFIG_SERIO_XILINX_XPS_PS2 is not set</div><div class='add'>+# CONFIG_GAMEPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Character devices</div><div class='add'>+#</div><div class='add'>+CONFIG_VT=y</div><div class='add'>+CONFIG_CONSOLE_TRANSLATIONS=y</div><div class='add'>+CONFIG_VT_CONSOLE=y</div><div class='add'>+CONFIG_HW_CONSOLE=y</div><div class='add'>+# CONFIG_VT_HW_CONSOLE_BINDING is not set</div><div class='add'>+CONFIG_DEVKMEM=y</div><div class='add'>+# CONFIG_SERIAL_NONSTANDARD is not set</div><div class='add'>+# CONFIG_NOZOMI is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Serial drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIAL_8250=y</div><div class='add'>+CONFIG_SERIAL_8250_CONSOLE=y</div><div class='add'>+CONFIG_SERIAL_8250_PCI=y</div><div class='add'>+CONFIG_SERIAL_8250_NR_UARTS=2</div><div class='add'>+CONFIG_SERIAL_8250_RUNTIME_UARTS=2</div><div class='add'>+CONFIG_SERIAL_8250_EXTENDED=y</div><div class='add'>+CONFIG_SERIAL_8250_MANY_PORTS=y</div><div class='add'>+CONFIG_SERIAL_8250_SHARE_IRQ=y</div><div class='add'>+CONFIG_SERIAL_8250_DETECT_IRQ=y</div><div class='add'>+CONFIG_SERIAL_8250_RSA=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Non-8250 serial port support</div><div class='add'>+#</div><div class='add'>+# CONFIG_SERIAL_UARTLITE is not set</div><div class='add'>+CONFIG_SERIAL_CORE=y</div><div class='add'>+CONFIG_SERIAL_CORE_CONSOLE=y</div><div class='add'>+# CONFIG_SERIAL_JSM is not set</div><div class='add'>+# CONFIG_SERIAL_OF_PLATFORM is not set</div><div class='add'>+CONFIG_UNIX98_PTYS=y</div><div class='add'>+CONFIG_LEGACY_PTYS=y</div><div class='add'>+CONFIG_LEGACY_PTY_COUNT=256</div><div class='add'>+# CONFIG_IPMI_HANDLER is not set</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='add'>+CONFIG_NVRAM=y</div><div class='add'>+# CONFIG_R3964 is not set</div><div class='add'>+# CONFIG_APPLICOM is not set</div><div class='add'>+# CONFIG_RAW_DRIVER is not set</div><div class='add'>+# CONFIG_TCG_TPM is not set</div><div class='add'>+CONFIG_DEVPORT=y</div><div class='add'>+CONFIG_I2C=y</div><div class='add'>+CONFIG_I2C_BOARDINFO=y</div><div class='add'>+# CONFIG_I2C_CHARDEV is not set</div><div class='add'>+CONFIG_I2C_HELPER_AUTO=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C Hardware Bus support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PC SMBus host controller drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_ALI1535 is not set</div><div class='add'>+# CONFIG_I2C_ALI1563 is not set</div><div class='add'>+# CONFIG_I2C_ALI15X3 is not set</div><div class='add'>+# CONFIG_I2C_AMD756 is not set</div><div class='add'>+# CONFIG_I2C_AMD8111 is not set</div><div class='add'>+# CONFIG_I2C_I801 is not set</div><div class='add'>+# CONFIG_I2C_ISCH is not set</div><div class='add'>+# CONFIG_I2C_PIIX4 is not set</div><div class='add'>+# CONFIG_I2C_NFORCE2 is not set</div><div class='add'>+# CONFIG_I2C_SIS5595 is not set</div><div class='add'>+# CONFIG_I2C_SIS630 is not set</div><div class='add'>+# CONFIG_I2C_SIS96X is not set</div><div class='add'>+# CONFIG_I2C_VIA is not set</div><div class='add'>+# CONFIG_I2C_VIAPRO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C system bus drivers (mostly embedded / system-on-chip)</div><div class='add'>+#</div><div class='add'>+CONFIG_I2C_MPC=y</div><div class='add'>+# CONFIG_I2C_OCORES is not set</div><div class='add'>+# CONFIG_I2C_SIMTEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# External I2C/SMBus adapter drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='add'>+# CONFIG_I2C_TAOS_EVM is not set</div><div class='add'>+# CONFIG_I2C_TINY_USB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics adapter I2C/DDC channel drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_VOODOO3 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Other I2C/SMBus bus drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_PCA_PLATFORM is not set</div><div class='add'>+# CONFIG_I2C_STUB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous I2C Chip support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DS1682 is not set</div><div class='add'>+# CONFIG_AT24 is not set</div><div class='add'>+CONFIG_SENSORS_EEPROM=y</div><div class='add'>+# CONFIG_SENSORS_PCF8574 is not set</div><div class='add'>+# CONFIG_PCF8575 is not set</div><div class='add'>+# CONFIG_SENSORS_PCA9539 is not set</div><div class='add'>+# CONFIG_SENSORS_PCF8591 is not set</div><div class='add'>+# CONFIG_SENSORS_MAX6875 is not set</div><div class='add'>+# CONFIG_SENSORS_TSL2550 is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_CORE is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_ALGO is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_BUS is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_CHIP is not set</div><div class='add'>+# CONFIG_SPI is not set</div><div class='add'>+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y</div><div class='add'>+# CONFIG_GPIOLIB is not set</div><div class='add'>+# CONFIG_W1 is not set</div><div class='add'>+# CONFIG_POWER_SUPPLY is not set</div><div class='add'>+# CONFIG_HWMON is not set</div><div class='add'>+# CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='add'>+# CONFIG_WATCHDOG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Sonics Silicon Backplane</div><div class='add'>+#</div><div class='add'>+CONFIG_SSB_POSSIBLE=y</div><div class='add'>+# CONFIG_SSB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multifunction device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='add'>+# CONFIG_MFD_SM501 is not set</div><div class='add'>+# CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia core support</div><div class='add'>+#</div><div class='add'>+# CONFIG_VIDEO_DEV is not set</div><div class='add'>+CONFIG_DVB_CORE=m</div><div class='add'>+CONFIG_VIDEO_MEDIA=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MEDIA_ATTACH is not set</div><div class='add'>+CONFIG_MEDIA_TUNER=m</div><div class='add'>+# CONFIG_MEDIA_TUNER_CUSTOMIZE is not set</div><div class='add'>+CONFIG_MEDIA_TUNER_SIMPLE=m</div><div class='add'>+CONFIG_MEDIA_TUNER_TDA8290=m</div><div class='add'>+CONFIG_MEDIA_TUNER_TDA9887=m</div><div class='add'>+CONFIG_MEDIA_TUNER_TEA5761=m</div><div class='add'>+CONFIG_MEDIA_TUNER_TEA5767=m</div><div class='add'>+CONFIG_MEDIA_TUNER_MT20XX=m</div><div class='add'>+CONFIG_MEDIA_TUNER_XC2028=m</div><div class='add'>+CONFIG_MEDIA_TUNER_XC5000=m</div><div class='add'>+CONFIG_DVB_CAPTURE_DRIVERS=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Supported SAA7146 based PCI Adapters</div><div class='add'>+#</div><div class='add'>+# CONFIG_TTPCI_EEPROM is not set</div><div class='add'>+# CONFIG_DVB_BUDGET_CORE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Supported USB Adapters</div><div class='add'>+#</div><div class='add'>+# CONFIG_DVB_USB is not set</div><div class='add'>+# CONFIG_DVB_TTUSB_BUDGET is not set</div><div class='add'>+# CONFIG_DVB_TTUSB_DEC is not set</div><div class='add'>+# CONFIG_DVB_CINERGYT2 is not set</div><div class='add'>+# CONFIG_DVB_SIANO_SMS1XXX is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Supported FlexCopII (B2C2) Adapters</div><div class='add'>+#</div><div class='add'>+# CONFIG_DVB_B2C2_FLEXCOP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Supported BT878 Adapters</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Supported Pluto2 Adapters</div><div class='add'>+#</div><div class='add'>+# CONFIG_DVB_PLUTO2 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Supported DVB Frontends</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Customise DVB Frontends</div><div class='add'>+#</div><div class='add'>+# CONFIG_DVB_FE_CUSTOMISE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DVB-S (satellite) frontends</div><div class='add'>+#</div><div class='add'>+# CONFIG_DVB_CX24110 is not set</div><div class='add'>+# CONFIG_DVB_CX24123 is not set</div><div class='add'>+# CONFIG_DVB_MT312 is not set</div><div class='add'>+# CONFIG_DVB_S5H1420 is not set</div><div class='add'>+# CONFIG_DVB_STV0299 is not set</div><div class='add'>+# CONFIG_DVB_TDA8083 is not set</div><div class='add'>+# CONFIG_DVB_TDA10086 is not set</div><div class='add'>+# CONFIG_DVB_VES1X93 is not set</div><div class='add'>+# CONFIG_DVB_TUNER_ITD1000 is not set</div><div class='add'>+# CONFIG_DVB_TDA826X is not set</div><div class='add'>+# CONFIG_DVB_TUA6100 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DVB-T (terrestrial) frontends</div><div class='add'>+#</div><div class='add'>+# CONFIG_DVB_SP8870 is not set</div><div class='add'>+# CONFIG_DVB_SP887X is not set</div><div class='add'>+# CONFIG_DVB_CX22700 is not set</div><div class='add'>+# CONFIG_DVB_CX22702 is not set</div><div class='add'>+# CONFIG_DVB_DRX397XD is not set</div><div class='add'>+# CONFIG_DVB_L64781 is not set</div><div class='add'>+# CONFIG_DVB_TDA1004X is not set</div><div class='add'>+# CONFIG_DVB_NXT6000 is not set</div><div class='add'>+# CONFIG_DVB_MT352 is not set</div><div class='add'>+# CONFIG_DVB_ZL10353 is not set</div><div class='add'>+# CONFIG_DVB_DIB3000MB is not set</div><div class='add'>+# CONFIG_DVB_DIB3000MC is not set</div><div class='add'>+# CONFIG_DVB_DIB7000M is not set</div><div class='add'>+# CONFIG_DVB_DIB7000P is not set</div><div class='add'>+# CONFIG_DVB_TDA10048 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DVB-C (cable) frontends</div><div class='add'>+#</div><div class='add'>+# CONFIG_DVB_VES1820 is not set</div><div class='add'>+# CONFIG_DVB_TDA10021 is not set</div><div class='add'>+# CONFIG_DVB_TDA10023 is not set</div><div class='add'>+# CONFIG_DVB_STV0297 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# ATSC (North American/Korean Terrestrial/Cable DTV) frontends</div><div class='add'>+#</div><div class='add'>+# CONFIG_DVB_NXT200X is not set</div><div class='add'>+# CONFIG_DVB_OR51211 is not set</div><div class='add'>+# CONFIG_DVB_OR51132 is not set</div><div class='add'>+# CONFIG_DVB_BCM3510 is not set</div><div class='add'>+# CONFIG_DVB_LGDT330X is not set</div><div class='add'>+# CONFIG_DVB_S5H1409 is not set</div><div class='add'>+# CONFIG_DVB_AU8522 is not set</div><div class='add'>+# CONFIG_DVB_S5H1411 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Digital terrestrial only tuners/PLL</div><div class='add'>+#</div><div class='add'>+# CONFIG_DVB_PLL is not set</div><div class='add'>+# CONFIG_DVB_TUNER_DIB0070 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SEC control devices for DVB-S</div><div class='add'>+#</div><div class='add'>+# CONFIG_DVB_LNBP21 is not set</div><div class='add'>+# CONFIG_DVB_ISL6405 is not set</div><div class='add'>+# CONFIG_DVB_ISL6421 is not set</div><div class='add'>+CONFIG_DAB=y</div><div class='add'>+# CONFIG_USB_DABUSB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics support</div><div class='add'>+#</div><div class='add'>+# CONFIG_AGP is not set</div><div class='add'>+# CONFIG_DRM is not set</div><div class='add'>+# CONFIG_VGASTATE is not set</div><div class='add'>+CONFIG_VIDEO_OUTPUT_CONTROL=y</div><div class='add'>+# CONFIG_FB is not set</div><div class='add'>+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Display device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DISPLAY_SUPPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Console display driver support</div><div class='add'>+#</div><div class='add'>+CONFIG_VGA_CONSOLE=y</div><div class='add'>+# CONFIG_VGACON_SOFT_SCROLLBACK is not set</div><div class='add'>+CONFIG_DUMMY_CONSOLE=y</div><div class='add'>+CONFIG_SOUND=y</div><div class='add'>+CONFIG_SND=y</div><div class='add'>+CONFIG_SND_TIMER=y</div><div class='add'>+CONFIG_SND_PCM=y</div><div class='add'>+# CONFIG_SND_SEQUENCER is not set</div><div class='add'>+CONFIG_SND_OSSEMUL=y</div><div class='add'>+CONFIG_SND_MIXER_OSS=y</div><div class='add'>+CONFIG_SND_PCM_OSS=y</div><div class='add'>+CONFIG_SND_PCM_OSS_PLUGINS=y</div><div class='add'>+# CONFIG_SND_DYNAMIC_MINORS is not set</div><div class='add'>+# CONFIG_SND_SUPPORT_OLD_API is not set</div><div class='add'>+CONFIG_SND_VERBOSE_PROCFS=y</div><div class='add'>+# CONFIG_SND_VERBOSE_PRINTK is not set</div><div class='add'>+# CONFIG_SND_DEBUG is not set</div><div class='add'>+CONFIG_SND_VMASTER=y</div><div class='add'>+CONFIG_SND_AC97_CODEC=y</div><div class='add'>+CONFIG_SND_DRIVERS=y</div><div class='add'>+# CONFIG_SND_DUMMY is not set</div><div class='add'>+# CONFIG_SND_MTPAV is not set</div><div class='add'>+# CONFIG_SND_SERIAL_U16550 is not set</div><div class='add'>+# CONFIG_SND_MPU401 is not set</div><div class='add'>+# CONFIG_SND_AC97_POWER_SAVE is not set</div><div class='add'>+CONFIG_SND_PCI=y</div><div class='add'>+# CONFIG_SND_AD1889 is not set</div><div class='add'>+# CONFIG_SND_ALS300 is not set</div><div class='add'>+# CONFIG_SND_ALS4000 is not set</div><div class='add'>+# CONFIG_SND_ALI5451 is not set</div><div class='add'>+# CONFIG_SND_ATIIXP is not set</div><div class='add'>+# CONFIG_SND_ATIIXP_MODEM is not set</div><div class='add'>+# CONFIG_SND_AU8810 is not set</div><div class='add'>+# CONFIG_SND_AU8820 is not set</div><div class='add'>+# CONFIG_SND_AU8830 is not set</div><div class='add'>+# CONFIG_SND_AW2 is not set</div><div class='add'>+# CONFIG_SND_AZT3328 is not set</div><div class='add'>+# CONFIG_SND_BT87X is not set</div><div class='add'>+# CONFIG_SND_CA0106 is not set</div><div class='add'>+# CONFIG_SND_CMIPCI is not set</div><div class='add'>+# CONFIG_SND_OXYGEN is not set</div><div class='add'>+# CONFIG_SND_CS4281 is not set</div><div class='add'>+# CONFIG_SND_CS46XX is not set</div><div class='add'>+# CONFIG_SND_CS5530 is not set</div><div class='add'>+# CONFIG_SND_DARLA20 is not set</div><div class='add'>+# CONFIG_SND_GINA20 is not set</div><div class='add'>+# CONFIG_SND_LAYLA20 is not set</div><div class='add'>+# CONFIG_SND_DARLA24 is not set</div><div class='add'>+# CONFIG_SND_GINA24 is not set</div><div class='add'>+# CONFIG_SND_LAYLA24 is not set</div><div class='add'>+# CONFIG_SND_MONA is not set</div><div class='add'>+# CONFIG_SND_MIA is not set</div><div class='add'>+# CONFIG_SND_ECHO3G is not set</div><div class='add'>+# CONFIG_SND_INDIGO is not set</div><div class='add'>+# CONFIG_SND_INDIGOIO is not set</div><div class='add'>+# CONFIG_SND_INDIGODJ is not set</div><div class='add'>+# CONFIG_SND_EMU10K1 is not set</div><div class='add'>+# CONFIG_SND_EMU10K1X is not set</div><div class='add'>+# CONFIG_SND_ENS1370 is not set</div><div class='add'>+# CONFIG_SND_ENS1371 is not set</div><div class='add'>+# CONFIG_SND_ES1938 is not set</div><div class='add'>+# CONFIG_SND_ES1968 is not set</div><div class='add'>+# CONFIG_SND_FM801 is not set</div><div class='add'>+# CONFIG_SND_HDA_INTEL is not set</div><div class='add'>+# CONFIG_SND_HDSP is not set</div><div class='add'>+# CONFIG_SND_HDSPM is not set</div><div class='add'>+# CONFIG_SND_HIFIER is not set</div><div class='add'>+# CONFIG_SND_ICE1712 is not set</div><div class='add'>+# CONFIG_SND_ICE1724 is not set</div><div class='add'>+CONFIG_SND_INTEL8X0=y</div><div class='add'>+# CONFIG_SND_INTEL8X0M is not set</div><div class='add'>+# CONFIG_SND_KORG1212 is not set</div><div class='add'>+# CONFIG_SND_MAESTRO3 is not set</div><div class='add'>+# CONFIG_SND_MIXART is not set</div><div class='add'>+# CONFIG_SND_NM256 is not set</div><div class='add'>+# CONFIG_SND_PCXHR is not set</div><div class='add'>+# CONFIG_SND_RIPTIDE is not set</div><div class='add'>+# CONFIG_SND_RME32 is not set</div><div class='add'>+# CONFIG_SND_RME96 is not set</div><div class='add'>+# CONFIG_SND_RME9652 is not set</div><div class='add'>+# CONFIG_SND_SONICVIBES is not set</div><div class='add'>+# CONFIG_SND_TRIDENT is not set</div><div class='add'>+# CONFIG_SND_VIA82XX is not set</div><div class='add'>+# CONFIG_SND_VIA82XX_MODEM is not set</div><div class='add'>+# CONFIG_SND_VIRTUOSO is not set</div><div class='add'>+# CONFIG_SND_VX222 is not set</div><div class='add'>+# CONFIG_SND_YMFPCI is not set</div><div class='add'>+CONFIG_SND_PPC=y</div><div class='add'>+CONFIG_SND_USB=y</div><div class='add'>+# CONFIG_SND_USB_AUDIO is not set</div><div class='add'>+# CONFIG_SND_USB_USX2Y is not set</div><div class='add'>+# CONFIG_SND_USB_CAIAQ is not set</div><div class='add'>+# CONFIG_SND_SOC is not set</div><div class='add'>+# CONFIG_SOUND_PRIME is not set</div><div class='add'>+CONFIG_AC97_BUS=y</div><div class='add'>+CONFIG_HID_SUPPORT=y</div><div class='add'>+CONFIG_HID=y</div><div class='add'>+# CONFIG_HID_DEBUG is not set</div><div class='add'>+# CONFIG_HIDRAW is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Input Devices</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_HID=y</div><div class='add'>+# CONFIG_USB_HIDINPUT_POWERBOOK is not set</div><div class='add'>+# CONFIG_HID_FF is not set</div><div class='add'>+# CONFIG_USB_HIDDEV is not set</div><div class='add'>+CONFIG_USB_SUPPORT=y</div><div class='add'>+CONFIG_USB_ARCH_HAS_HCD=y</div><div class='add'>+CONFIG_USB_ARCH_HAS_OHCI=y</div><div class='add'>+CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='add'>+CONFIG_USB=y</div><div class='add'>+# CONFIG_USB_DEBUG is not set</div><div class='add'>+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous USB options</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_DEVICEFS=y</div><div class='add'>+CONFIG_USB_DEVICE_CLASS=y</div><div class='add'>+# CONFIG_USB_DYNAMIC_MINORS is not set</div><div class='add'>+# CONFIG_USB_OTG is not set</div><div class='add'>+# CONFIG_USB_OTG_WHITELIST is not set</div><div class='add'>+# CONFIG_USB_OTG_BLACKLIST_HUB is not set</div><div class='add'>+CONFIG_USB_MON=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Host Controller Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_C67X00_HCD is not set</div><div class='add'>+CONFIG_USB_EHCI_HCD=y</div><div class='add'>+# CONFIG_USB_EHCI_ROOT_HUB_TT is not set</div><div class='add'>+# CONFIG_USB_EHCI_TT_NEWSCHED is not set</div><div class='add'>+# CONFIG_USB_EHCI_FSL is not set</div><div class='add'>+CONFIG_USB_EHCI_HCD_PPC_OF=y</div><div class='add'>+# CONFIG_USB_ISP116X_HCD is not set</div><div class='add'>+# CONFIG_USB_ISP1760_HCD is not set</div><div class='add'>+CONFIG_USB_OHCI_HCD=y</div><div class='add'>+CONFIG_USB_OHCI_HCD_PPC_OF=y</div><div class='add'>+CONFIG_USB_OHCI_HCD_PPC_OF_BE=y</div><div class='add'>+CONFIG_USB_OHCI_HCD_PPC_OF_LE=y</div><div class='add'>+CONFIG_USB_OHCI_HCD_PCI=y</div><div class='add'>+CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y</div><div class='add'>+CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y</div><div class='add'>+CONFIG_USB_OHCI_LITTLE_ENDIAN=y</div><div class='add'>+# CONFIG_USB_UHCI_HCD is not set</div><div class='add'>+# CONFIG_USB_SL811_HCD is not set</div><div class='add'>+# CONFIG_USB_R8A66597_HCD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Device Class drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_ACM is not set</div><div class='add'>+# CONFIG_USB_PRINTER is not set</div><div class='add'>+# CONFIG_USB_WDM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# may also be needed; see USB_STORAGE Help for more information</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_STORAGE=y</div><div class='add'>+# CONFIG_USB_STORAGE_DEBUG is not set</div><div class='add'>+# CONFIG_USB_STORAGE_DATAFAB is not set</div><div class='add'>+# CONFIG_USB_STORAGE_FREECOM is not set</div><div class='add'>+# CONFIG_USB_STORAGE_ISD200 is not set</div><div class='add'>+# CONFIG_USB_STORAGE_DPCM is not set</div><div class='add'>+# CONFIG_USB_STORAGE_USBAT is not set</div><div class='add'>+# CONFIG_USB_STORAGE_SDDR09 is not set</div><div class='add'>+# CONFIG_USB_STORAGE_SDDR55 is not set</div><div class='add'>+# CONFIG_USB_STORAGE_JUMPSHOT is not set</div><div class='add'>+# CONFIG_USB_STORAGE_ALAUDA is not set</div><div class='add'>+# CONFIG_USB_STORAGE_ONETOUCH is not set</div><div class='add'>+# CONFIG_USB_STORAGE_KARMA is not set</div><div class='add'>+# CONFIG_USB_STORAGE_SIERRA is not set</div><div class='add'>+# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set</div><div class='add'>+# CONFIG_USB_LIBUSUAL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Imaging devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_MDC800 is not set</div><div class='add'>+# CONFIG_USB_MICROTEK is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB port drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_SERIAL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Miscellaneous drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_EMI62 is not set</div><div class='add'>+# CONFIG_USB_EMI26 is not set</div><div class='add'>+# CONFIG_USB_ADUTUX is not set</div><div class='add'>+# CONFIG_USB_RIO500 is not set</div><div class='add'>+# CONFIG_USB_LEGOTOWER is not set</div><div class='add'>+# CONFIG_USB_LCD is not set</div><div class='add'>+# CONFIG_USB_BERRY_CHARGE is not set</div><div class='add'>+# CONFIG_USB_LED is not set</div><div class='add'>+# CONFIG_USB_CYPRESS_CY7C63 is not set</div><div class='add'>+# CONFIG_USB_CYTHERM is not set</div><div class='add'>+# CONFIG_USB_PHIDGET is not set</div><div class='add'>+# CONFIG_USB_IDMOUSE is not set</div><div class='add'>+# CONFIG_USB_FTDI_ELAN is not set</div><div class='add'>+# CONFIG_USB_APPLEDISPLAY is not set</div><div class='add'>+# CONFIG_USB_SISUSBVGA is not set</div><div class='add'>+# CONFIG_USB_LD is not set</div><div class='add'>+# CONFIG_USB_TRANCEVIBRATOR is not set</div><div class='add'>+# CONFIG_USB_IOWARRIOR is not set</div><div class='add'>+# CONFIG_USB_TEST is not set</div><div class='add'>+# CONFIG_USB_ISIGHTFW is not set</div><div class='add'>+# CONFIG_USB_GADGET is not set</div><div class='add'>+# CONFIG_MMC is not set</div><div class='add'>+# CONFIG_MEMSTICK is not set</div><div class='add'>+# CONFIG_NEW_LEDS is not set</div><div class='add'>+# CONFIG_ACCESSIBILITY is not set</div><div class='add'>+# CONFIG_INFINIBAND is not set</div><div class='add'>+# CONFIG_EDAC is not set</div><div class='add'>+CONFIG_RTC_LIB=y</div><div class='add'>+CONFIG_RTC_CLASS=y</div><div class='add'>+CONFIG_RTC_HCTOSYS=y</div><div class='add'>+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"</div><div class='add'>+# CONFIG_RTC_DEBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# RTC interfaces</div><div class='add'>+#</div><div class='add'>+CONFIG_RTC_INTF_SYSFS=y</div><div class='add'>+CONFIG_RTC_INTF_PROC=y</div><div class='add'>+CONFIG_RTC_INTF_DEV=y</div><div class='add'>+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set</div><div class='add'>+# CONFIG_RTC_DRV_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C RTC drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_RTC_DRV_DS1307 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1374 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1672 is not set</div><div class='add'>+# CONFIG_RTC_DRV_MAX6900 is not set</div><div class='add'>+# CONFIG_RTC_DRV_RS5C372 is not set</div><div class='add'>+# CONFIG_RTC_DRV_ISL1208 is not set</div><div class='add'>+# CONFIG_RTC_DRV_X1205 is not set</div><div class='add'>+# CONFIG_RTC_DRV_PCF8563 is not set</div><div class='add'>+# CONFIG_RTC_DRV_PCF8583 is not set</div><div class='add'>+# CONFIG_RTC_DRV_M41T80 is not set</div><div class='add'>+# CONFIG_RTC_DRV_S35390A is not set</div><div class='add'>+# CONFIG_RTC_DRV_FM3130 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI RTC drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Platform RTC drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_RTC_DRV_CMOS=y</div><div class='add'>+# CONFIG_RTC_DRV_DS1511 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1553 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1742 is not set</div><div class='add'>+# CONFIG_RTC_DRV_STK17TA8 is not set</div><div class='add'>+# CONFIG_RTC_DRV_M48T86 is not set</div><div class='add'>+# CONFIG_RTC_DRV_M48T59 is not set</div><div class='add'>+# CONFIG_RTC_DRV_V3020 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# on-CPU RTC drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_RTC_DRV_PPC is not set</div><div class='add'>+# CONFIG_DMADEVICES is not set</div><div class='add'>+# CONFIG_UIO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# File systems</div><div class='add'>+#</div><div class='add'>+CONFIG_EXT2_FS=y</div><div class='add'>+# CONFIG_EXT2_FS_XATTR is not set</div><div class='add'>+# CONFIG_EXT2_FS_XIP is not set</div><div class='add'>+CONFIG_EXT3_FS=y</div><div class='add'>+CONFIG_EXT3_FS_XATTR=y</div><div class='add'>+# CONFIG_EXT3_FS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_EXT3_FS_SECURITY is not set</div><div class='add'>+# CONFIG_EXT4DEV_FS is not set</div><div class='add'>+CONFIG_JBD=y</div><div class='add'>+CONFIG_FS_MBCACHE=y</div><div class='add'>+# CONFIG_REISERFS_FS is not set</div><div class='add'>+# CONFIG_JFS_FS is not set</div><div class='add'>+# CONFIG_FS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_XFS_FS is not set</div><div class='add'>+# CONFIG_OCFS2_FS is not set</div><div class='add'>+CONFIG_DNOTIFY=y</div><div class='add'>+CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='add'>+# CONFIG_QUOTA is not set</div><div class='add'>+# CONFIG_AUTOFS_FS is not set</div><div class='add'>+# CONFIG_AUTOFS4_FS is not set</div><div class='add'>+# CONFIG_FUSE_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CD-ROM/DVD Filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_ISO9660_FS=m</div><div class='add'>+CONFIG_JOLIET=y</div><div class='add'>+CONFIG_ZISOFS=y</div><div class='add'>+CONFIG_UDF_FS=m</div><div class='add'>+CONFIG_UDF_NLS=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DOS/FAT/NT Filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_FAT_FS=y</div><div class='add'>+CONFIG_MSDOS_FS=m</div><div class='add'>+CONFIG_VFAT_FS=y</div><div class='add'>+CONFIG_FAT_DEFAULT_CODEPAGE=437</div><div class='add'>+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"</div><div class='add'>+CONFIG_NTFS_FS=y</div><div class='add'>+# CONFIG_NTFS_DEBUG is not set</div><div class='add'>+# CONFIG_NTFS_RW is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Pseudo filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_PROC_FS=y</div><div class='add'>+CONFIG_PROC_KCORE=y</div><div class='add'>+CONFIG_PROC_SYSCTL=y</div><div class='add'>+CONFIG_SYSFS=y</div><div class='add'>+CONFIG_TMPFS=y</div><div class='add'>+# CONFIG_TMPFS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_HUGETLB_PAGE is not set</div><div class='add'>+# CONFIG_CONFIGFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_ADFS_FS=m</div><div class='add'>+# CONFIG_ADFS_FS_RW is not set</div><div class='add'>+CONFIG_AFFS_FS=m</div><div class='add'>+CONFIG_HFS_FS=m</div><div class='add'>+CONFIG_HFSPLUS_FS=m</div><div class='add'>+CONFIG_BEFS_FS=m</div><div class='add'>+# CONFIG_BEFS_DEBUG is not set</div><div class='add'>+CONFIG_BFS_FS=m</div><div class='add'>+CONFIG_EFS_FS=m</div><div class='add'>+CONFIG_CRAMFS=y</div><div class='add'>+CONFIG_VXFS_FS=m</div><div class='add'>+# CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='add'>+CONFIG_HPFS_FS=m</div><div class='add'>+CONFIG_QNX4FS_FS=m</div><div class='add'>+# CONFIG_ROMFS_FS is not set</div><div class='add'>+CONFIG_SYSV_FS=m</div><div class='add'>+CONFIG_UFS_FS=m</div><div class='add'>+# CONFIG_UFS_FS_WRITE is not set</div><div class='add'>+# CONFIG_UFS_DEBUG is not set</div><div class='add'>+CONFIG_NETWORK_FILESYSTEMS=y</div><div class='add'>+CONFIG_NFS_FS=y</div><div class='add'>+CONFIG_NFS_V3=y</div><div class='add'>+# CONFIG_NFS_V3_ACL is not set</div><div class='add'>+CONFIG_NFS_V4=y</div><div class='add'>+CONFIG_ROOT_NFS=y</div><div class='add'>+CONFIG_NFSD=y</div><div class='add'>+# CONFIG_NFSD_V3 is not set</div><div class='add'>+# CONFIG_NFSD_V4 is not set</div><div class='add'>+CONFIG_LOCKD=y</div><div class='add'>+CONFIG_LOCKD_V4=y</div><div class='add'>+CONFIG_EXPORTFS=y</div><div class='add'>+CONFIG_NFS_COMMON=y</div><div class='add'>+CONFIG_SUNRPC=y</div><div class='add'>+CONFIG_SUNRPC_GSS=y</div><div class='add'>+CONFIG_RPCSEC_GSS_KRB5=y</div><div class='add'>+# CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='add'>+# CONFIG_SMB_FS is not set</div><div class='add'>+# CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_NCP_FS is not set</div><div class='add'>+# CONFIG_CODA_FS is not set</div><div class='add'>+# CONFIG_AFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Partition Types</div><div class='add'>+#</div><div class='add'>+CONFIG_PARTITION_ADVANCED=y</div><div class='add'>+# CONFIG_ACORN_PARTITION is not set</div><div class='add'>+# CONFIG_OSF_PARTITION is not set</div><div class='add'>+# CONFIG_AMIGA_PARTITION is not set</div><div class='add'>+# CONFIG_ATARI_PARTITION is not set</div><div class='add'>+CONFIG_MAC_PARTITION=y</div><div class='add'>+CONFIG_MSDOS_PARTITION=y</div><div class='add'>+# CONFIG_BSD_DISKLABEL is not set</div><div class='add'>+# CONFIG_MINIX_SUBPARTITION is not set</div><div class='add'>+# CONFIG_SOLARIS_X86_PARTITION is not set</div><div class='add'>+# CONFIG_UNIXWARE_DISKLABEL is not set</div><div class='add'>+# CONFIG_LDM_PARTITION is not set</div><div class='add'>+# CONFIG_SGI_PARTITION is not set</div><div class='add'>+# CONFIG_ULTRIX_PARTITION is not set</div><div class='add'>+# CONFIG_SUN_PARTITION is not set</div><div class='add'>+# CONFIG_KARMA_PARTITION is not set</div><div class='add'>+# CONFIG_EFI_PARTITION is not set</div><div class='add'>+# CONFIG_SYSV68_PARTITION is not set</div><div class='add'>+CONFIG_NLS=y</div><div class='add'>+CONFIG_NLS_DEFAULT="iso8859-1"</div><div class='add'>+# CONFIG_NLS_CODEPAGE_437 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_737 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_775 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_850 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_852 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_855 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_857 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_860 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_861 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_862 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_863 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_864 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_865 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_866 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_869 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_936 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_950 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_932 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_949 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_874 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_8 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_1250 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_1251 is not set</div><div class='add'>+# CONFIG_NLS_ASCII is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_1 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_2 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_3 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_4 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_5 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_6 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_7 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_9 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_13 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_14 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_15 is not set</div><div class='add'>+# CONFIG_NLS_KOI8_R is not set</div><div class='add'>+# CONFIG_NLS_KOI8_U is not set</div><div class='add'>+CONFIG_NLS_UTF8=m</div><div class='add'>+# CONFIG_DLM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Library routines</div><div class='add'>+#</div><div class='add'>+CONFIG_BITREVERSE=y</div><div class='add'>+# CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='add'>+# CONFIG_CRC_CCITT is not set</div><div class='add'>+# CONFIG_CRC16 is not set</div><div class='add'>+CONFIG_CRC_T10DIF=y</div><div class='add'>+CONFIG_CRC_ITU_T=m</div><div class='add'>+CONFIG_CRC32=y</div><div class='add'>+# CONFIG_CRC7 is not set</div><div class='add'>+CONFIG_LIBCRC32C=m</div><div class='add'>+CONFIG_ZLIB_INFLATE=y</div><div class='add'>+CONFIG_PLIST=y</div><div class='add'>+CONFIG_HAS_IOMEM=y</div><div class='add'>+CONFIG_HAS_IOPORT=y</div><div class='add'>+CONFIG_HAS_DMA=y</div><div class='add'>+CONFIG_HAVE_LMB=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel hacking</div><div class='add'>+#</div><div class='add'>+# CONFIG_PRINTK_TIME is not set</div><div class='add'>+CONFIG_ENABLE_WARN_DEPRECATED=y</div><div class='add'>+CONFIG_ENABLE_MUST_CHECK=y</div><div class='add'>+CONFIG_FRAME_WARN=1024</div><div class='add'>+# CONFIG_MAGIC_SYSRQ is not set</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='add'>+# CONFIG_DEBUG_FS is not set</div><div class='add'>+# CONFIG_HEADERS_CHECK is not set</div><div class='add'>+CONFIG_DEBUG_KERNEL=y</div><div class='add'>+# CONFIG_DEBUG_SHIRQ is not set</div><div class='add'>+CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set</div><div class='add'>+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0</div><div class='add'>+CONFIG_SCHED_DEBUG=y</div><div class='add'>+# CONFIG_SCHEDSTATS is not set</div><div class='add'>+# CONFIG_TIMER_STATS is not set</div><div class='add'>+# CONFIG_DEBUG_OBJECTS is not set</div><div class='add'>+# CONFIG_SLUB_DEBUG_ON is not set</div><div class='add'>+# CONFIG_SLUB_STATS is not set</div><div class='add'>+# CONFIG_DEBUG_RT_MUTEXES is not set</div><div class='add'>+# CONFIG_RT_MUTEX_TESTER is not set</div><div class='add'>+# CONFIG_DEBUG_SPINLOCK is not set</div><div class='add'>+# CONFIG_DEBUG_MUTEXES is not set</div><div class='add'>+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set</div><div class='add'>+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set</div><div class='add'>+# CONFIG_DEBUG_KOBJECT is not set</div><div class='add'>+# CONFIG_DEBUG_HIGHMEM is not set</div><div class='add'>+# CONFIG_DEBUG_BUGVERBOSE is not set</div><div class='add'>+CONFIG_DEBUG_INFO=y</div><div class='add'>+# CONFIG_DEBUG_VM is not set</div><div class='add'>+# CONFIG_DEBUG_WRITECOUNT is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='add'>+# CONFIG_DEBUG_LIST is not set</div><div class='add'>+# CONFIG_DEBUG_SG is not set</div><div class='add'>+# CONFIG_BOOT_PRINTK_DELAY is not set</div><div class='add'>+# CONFIG_RCU_TORTURE_TEST is not set</div><div class='add'>+# CONFIG_BACKTRACE_SELF_TEST is not set</div><div class='add'>+# CONFIG_FAULT_INJECTION is not set</div><div class='add'>+# CONFIG_LATENCYTOP is not set</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='add'>+# CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='add'>+# CONFIG_KGDB is not set</div><div class='add'>+# CONFIG_DEBUG_STACKOVERFLOW is not set</div><div class='add'>+# CONFIG_DEBUG_STACK_USAGE is not set</div><div class='add'>+# CONFIG_DEBUG_PAGEALLOC is not set</div><div class='add'>+# CONFIG_CODE_PATCHING_SELFTEST is not set</div><div class='add'>+# CONFIG_FTR_FIXUP_SELFTEST is not set</div><div class='add'>+# CONFIG_MSI_BITMAP_SELFTEST is not set</div><div class='add'>+# CONFIG_XMON is not set</div><div class='add'>+# CONFIG_IRQSTACKS is not set</div><div class='add'>+# CONFIG_BDI_SWITCH is not set</div><div class='add'>+# CONFIG_BOOTX_TEXT is not set</div><div class='add'>+# CONFIG_PPC_EARLY_DEBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Security options</div><div class='add'>+#</div><div class='add'>+# CONFIG_KEYS is not set</div><div class='add'>+# CONFIG_SECURITY is not set</div><div class='add'>+# CONFIG_SECURITY_FILE_CAPABILITIES is not set</div><div class='add'>+CONFIG_CRYPTO=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Crypto core or helper</div><div class='add'>+#</div><div class='add'>+CONFIG_CRYPTO_ALGAPI=y</div><div class='add'>+CONFIG_CRYPTO_BLKCIPHER=y</div><div class='add'>+CONFIG_CRYPTO_HASH=y</div><div class='add'>+CONFIG_CRYPTO_MANAGER=y</div><div class='add'>+# CONFIG_CRYPTO_GF128MUL is not set</div><div class='add'>+# CONFIG_CRYPTO_NULL is not set</div><div class='add'>+# CONFIG_CRYPTO_CRYPTD is not set</div><div class='add'>+# CONFIG_CRYPTO_AUTHENC is not set</div><div class='add'>+# CONFIG_CRYPTO_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Authenticated Encryption with Associated Data</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CCM is not set</div><div class='add'>+# CONFIG_CRYPTO_GCM is not set</div><div class='add'>+# CONFIG_CRYPTO_SEQIV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block modes</div><div class='add'>+#</div><div class='add'>+CONFIG_CRYPTO_CBC=y</div><div class='add'>+# CONFIG_CRYPTO_CTR is not set</div><div class='add'>+# CONFIG_CRYPTO_CTS is not set</div><div class='add'>+# CONFIG_CRYPTO_ECB is not set</div><div class='add'>+# CONFIG_CRYPTO_LRW is not set</div><div class='add'>+CONFIG_CRYPTO_PCBC=m</div><div class='add'>+# CONFIG_CRYPTO_XTS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hash modes</div><div class='add'>+#</div><div class='add'>+CONFIG_CRYPTO_HMAC=y</div><div class='add'>+# CONFIG_CRYPTO_XCBC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Digest</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CRC32C is not set</div><div class='add'>+# CONFIG_CRYPTO_MD4 is not set</div><div class='add'>+CONFIG_CRYPTO_MD5=y</div><div class='add'>+# CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='add'>+CONFIG_CRYPTO_SHA1=m</div><div class='add'>+# CONFIG_CRYPTO_SHA256 is not set</div><div class='add'>+# CONFIG_CRYPTO_SHA512 is not set</div><div class='add'>+# CONFIG_CRYPTO_TGR192 is not set</div><div class='add'>+# CONFIG_CRYPTO_WP512 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ciphers</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_AES is not set</div><div class='add'>+# CONFIG_CRYPTO_ANUBIS is not set</div><div class='add'>+# CONFIG_CRYPTO_ARC4 is not set</div><div class='add'>+# CONFIG_CRYPTO_BLOWFISH is not set</div><div class='add'>+# CONFIG_CRYPTO_CAMELLIA is not set</div><div class='add'>+# CONFIG_CRYPTO_CAST5 is not set</div><div class='add'>+# CONFIG_CRYPTO_CAST6 is not set</div><div class='add'>+CONFIG_CRYPTO_DES=y</div><div class='add'>+# CONFIG_CRYPTO_FCRYPT is not set</div><div class='add'>+# CONFIG_CRYPTO_KHAZAD is not set</div><div class='add'>+# CONFIG_CRYPTO_SALSA20 is not set</div><div class='add'>+# CONFIG_CRYPTO_SEED is not set</div><div class='add'>+# CONFIG_CRYPTO_SERPENT is not set</div><div class='add'>+# CONFIG_CRYPTO_TEA is not set</div><div class='add'>+# CONFIG_CRYPTO_TWOFISH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Compression</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_DEFLATE is not set</div><div class='add'>+# CONFIG_CRYPTO_LZO is not set</div><div class='add'>+CONFIG_CRYPTO_HW=y</div><div class='add'>+# CONFIG_CRYPTO_DEV_HIFN_795X is not set</div><div class='add'>+# CONFIG_CRYPTO_DEV_TALITOS is not set</div><div class='add'>+# CONFIG_PPC_CLOCK is not set</div><div class='add'>+# CONFIG_VIRTUALIZATION is not set</div><div class='head'>diff --git a/arch/powerpc/configs/pq2fads_defconfig b/arch/powerpc/configs/pq2fads_defconfig<br/>index b390b7476649..7e17862c38b8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/configs/pq2fads_defconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/configs/pq2fads_defconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/configs/pq2fads_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/configs/pq2fads_defconfig</a></div><div class='hunk'>@@ -152,11 +152,11 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> #</div><div class='ctx'> CONFIG_PPC_MULTIPLATFORM=y</div><div class='ctx'> CONFIG_CLASSIC32=y</div><div class='del'>-CONFIG_PPC_CHRP=y</div><div class='add'>+# CONFIG_PPC_CHRP is not set</div><div class='add'>+# CONFIG_PPC_PMAC is not set</div><div class='ctx'> # CONFIG_MPC5121_ADS is not set</div><div class='ctx'> # CONFIG_MPC5121_GENERIC is not set</div><div class='ctx'> # CONFIG_PPC_MPC52xx is not set</div><div class='del'>-CONFIG_PPC_PMAC=y</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='ctx'> CONFIG_PPC_82xx=y</div><div class='head'>diff --git a/arch/powerpc/include/asm/a.out.h b/arch/powerpc/include/asm/a.out.h<br/>deleted file mode 100644<br/>index 89cead6b176e..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/include/asm/a.out.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/include/asm/a.out.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,20 +0,0 @@</div><div class='del'>-#ifndef _ASM_POWERPC_A_OUT_H</div><div class='del'>-#define _ASM_POWERPC_A_OUT_H</div><div class='del'>-</div><div class='del'>-struct exec</div><div class='del'>-{</div><div class='del'>-	unsigned long a_info;	/* Use macros N_MAGIC, etc for access */</div><div class='del'>-	unsigned a_text;	/* length of text, in bytes */</div><div class='del'>-	unsigned a_data;	/* length of data, in bytes */</div><div class='del'>-	unsigned a_bss;		/* length of uninitialized data area for file, in bytes */</div><div class='del'>-	unsigned a_syms;	/* length of symbol table data in file, in bytes */</div><div class='del'>-	unsigned a_entry;	/* start address */</div><div class='del'>-	unsigned a_trsize;	/* length of relocation info for text, in bytes */</div><div class='del'>-	unsigned a_drsize;	/* length of relocation info for data, in bytes */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define N_TRSIZE(a)	((a).a_trsize)</div><div class='del'>-#define N_DRSIZE(a)	((a).a_drsize)</div><div class='del'>-#define N_SYMSIZE(a)	((a).a_syms)</div><div class='del'>-</div><div class='del'>-#endif /* _ASM_POWERPC_A_OUT_H */</div><div class='head'>diff --git a/arch/powerpc/include/asm/cputable.h b/arch/powerpc/include/asm/cputable.h<br/>index ef8a248dfd55..1e94b07a020e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/include/asm/cputable.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/include/asm/cputable.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/include/asm/cputable.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/include/asm/cputable.h</a></div><div class='hunk'>@@ -62,6 +62,7 @@ enum powerpc_pmc_type {</div><div class='ctx'> 	PPC_PMC_DEFAULT = 0,</div><div class='ctx'> 	PPC_PMC_IBM = 1,</div><div class='ctx'> 	PPC_PMC_PA6T = 2,</div><div class='add'>+	PPC_PMC_G4 = 3,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct pt_regs;</div><div class='hunk'>@@ -192,6 +193,7 @@ extern const char *powerpc_base_platform;</div><div class='ctx'> #define CPU_FTR_NO_SLBIE_B		LONG_ASM_CONST(0x0008000000000000)</div><div class='ctx'> #define CPU_FTR_VSX			LONG_ASM_CONST(0x0010000000000000)</div><div class='ctx'> #define CPU_FTR_SAO			LONG_ASM_CONST(0x0020000000000000)</div><div class='add'>+#define CPU_FTR_CP_USE_DCBTZ		LONG_ASM_CONST(0x0040000000000000)</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='ctx'> </div><div class='hunk'>@@ -387,10 +389,11 @@ extern const char *powerpc_base_platform;</div><div class='ctx'> 	    CPU_FTR_MMCRA | CPU_FTR_CTRL)</div><div class='ctx'> #define CPU_FTRS_POWER4	(CPU_FTR_USE_TB | CPU_FTR_LWSYNC | \</div><div class='ctx'> 	    CPU_FTR_HPTE_TABLE | CPU_FTR_PPCAS_ARCH_V2 | CPU_FTR_CTRL | \</div><div class='del'>-	    CPU_FTR_MMCRA)</div><div class='add'>+	    CPU_FTR_MMCRA | CPU_FTR_CP_USE_DCBTZ)</div><div class='ctx'> #define CPU_FTRS_PPC970	(CPU_FTR_USE_TB | CPU_FTR_LWSYNC | \</div><div class='ctx'> 	    CPU_FTR_HPTE_TABLE | CPU_FTR_PPCAS_ARCH_V2 | CPU_FTR_CTRL | \</div><div class='del'>-	    CPU_FTR_ALTIVEC_COMP | CPU_FTR_CAN_NAP | CPU_FTR_MMCRA)</div><div class='add'>+	    CPU_FTR_ALTIVEC_COMP | CPU_FTR_CAN_NAP | CPU_FTR_MMCRA | \</div><div class='add'>+	    CPU_FTR_CP_USE_DCBTZ)</div><div class='ctx'> #define CPU_FTRS_POWER5	(CPU_FTR_USE_TB | CPU_FTR_LWSYNC | \</div><div class='ctx'> 	    CPU_FTR_HPTE_TABLE | CPU_FTR_PPCAS_ARCH_V2 | CPU_FTR_CTRL | \</div><div class='ctx'> 	    CPU_FTR_MMCRA | CPU_FTR_SMT | \</div><div class='hunk'>@@ -411,7 +414,8 @@ extern const char *powerpc_base_platform;</div><div class='ctx'> #define CPU_FTRS_CELL	(CPU_FTR_USE_TB | CPU_FTR_LWSYNC | \</div><div class='ctx'> 	    CPU_FTR_HPTE_TABLE | CPU_FTR_PPCAS_ARCH_V2 | CPU_FTR_CTRL | \</div><div class='ctx'> 	    CPU_FTR_ALTIVEC_COMP | CPU_FTR_MMCRA | CPU_FTR_SMT | \</div><div class='del'>-	    CPU_FTR_PAUSE_ZERO | CPU_FTR_CI_LARGE_PAGE | CPU_FTR_CELL_TB_BUG)</div><div class='add'>+	    CPU_FTR_PAUSE_ZERO | CPU_FTR_CI_LARGE_PAGE | \</div><div class='add'>+	    CPU_FTR_CELL_TB_BUG | CPU_FTR_CP_USE_DCBTZ)</div><div class='ctx'> #define CPU_FTRS_PA6T (CPU_FTR_USE_TB | CPU_FTR_LWSYNC | \</div><div class='ctx'> 	    CPU_FTR_HPTE_TABLE | CPU_FTR_PPCAS_ARCH_V2 | \</div><div class='ctx'> 	    CPU_FTR_ALTIVEC_COMP | CPU_FTR_CI_LARGE_PAGE | \</div><div class='head'>diff --git a/arch/powerpc/include/asm/dcr-regs.h b/arch/powerpc/include/asm/dcr-regs.h<br/>index 29b0ecef980a..828e3aa1f2fc 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/include/asm/dcr-regs.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/include/asm/dcr-regs.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/include/asm/dcr-regs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/include/asm/dcr-regs.h</a></div><div class='hunk'>@@ -68,6 +68,17 @@</div><div class='ctx'> #define SDR0_UART3		0x0123</div><div class='ctx'> #define SDR0_CUST0		0x4000</div><div class='ctx'> </div><div class='add'>+/* SDR for 405EZ */</div><div class='add'>+#define DCRN_SDR_ICINTSTAT	0x4510</div><div class='add'>+#define ICINTSTAT_ICRX	0x80000000</div><div class='add'>+#define ICINTSTAT_ICTX0	0x40000000</div><div class='add'>+#define ICINTSTAT_ICTX1 0x20000000</div><div class='add'>+#define ICINTSTAT_ICTX	0x60000000</div><div class='add'>+</div><div class='add'>+/* SDRs (460EX/460GT) */</div><div class='add'>+#define SDR0_ETH_CFG		0x4103</div><div class='add'>+#define SDR0_ETH_CFG_ECS	0x00000100	/* EMAC int clk source */</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * All those DCR register addresses are offsets from the base address</div><div class='ctx'>  * for the SRAM0 controller (e.g. 0x20 on 440GX). The base address is</div><div class='head'>diff --git a/arch/powerpc/include/asm/device.h b/arch/powerpc/include/asm/device.h<br/>index 228ab2a315b9..dfd504caccc1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/include/asm/device.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/include/asm/device.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/include/asm/device.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/include/asm/device.h</a></div><div class='hunk'>@@ -16,9 +16,6 @@ struct dev_archdata {</div><div class='ctx'> 	/* DMA operations on that device */</div><div class='ctx'> 	struct dma_mapping_ops	*dma_ops;</div><div class='ctx'> 	void			*dma_data;</div><div class='del'>-</div><div class='del'>-	/* NUMA node if applicable */</div><div class='del'>-	int			numa_node;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #endif /* _ASM_POWERPC_DEVICE_H */</div><div class='head'>diff --git a/arch/powerpc/include/asm/dma-mapping.h b/arch/powerpc/include/asm/dma-mapping.h<br/>index c7ca45f97dd2..fddb229bd74f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/include/asm/dma-mapping.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/include/asm/dma-mapping.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/include/asm/dma-mapping.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/include/asm/dma-mapping.h</a></div><div class='hunk'>@@ -44,8 +44,6 @@ extern void __dma_sync_page(struct page *page, unsigned long offset,</div><div class='ctx'> </div><div class='ctx'> #endif /* ! CONFIG_NOT_COHERENT_CACHE */</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PPC64</div><div class='del'>-</div><div class='ctx'> static inline unsigned long device_to_mask(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	if (dev-&gt;dma_mask &amp;&amp; *dev-&gt;dma_mask)</div><div class='hunk'>@@ -76,8 +74,24 @@ struct dma_mapping_ops {</div><div class='ctx'> 				struct dma_attrs *attrs);</div><div class='ctx'> 	int		(*dma_supported)(struct device *dev, u64 mask);</div><div class='ctx'> 	int		(*set_dma_mask)(struct device *dev, u64 dma_mask);</div><div class='add'>+	dma_addr_t 	(*map_page)(struct device *dev, struct page *page,</div><div class='add'>+				unsigned long offset, size_t size,</div><div class='add'>+				enum dma_data_direction direction,</div><div class='add'>+				struct dma_attrs *attrs);</div><div class='add'>+	void		(*unmap_page)(struct device *dev,</div><div class='add'>+				dma_addr_t dma_address, size_t size,</div><div class='add'>+				enum dma_data_direction direction,</div><div class='add'>+				struct dma_attrs *attrs);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Available generic sets of operations</div><div class='add'>+ */</div><div class='add'>+#ifdef CONFIG_PPC64</div><div class='add'>+extern struct dma_mapping_ops dma_iommu_ops;</div><div class='add'>+#endif</div><div class='add'>+extern struct dma_mapping_ops dma_direct_ops;</div><div class='add'>+</div><div class='ctx'> static inline struct dma_mapping_ops *get_dma_ops(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	/* We don't handle the NULL dev case for ISA for now. We could</div><div class='hunk'>@@ -85,8 +99,19 @@ static inline struct dma_mapping_ops *get_dma_ops(struct device *dev)</div><div class='ctx'> 	 * only ISA DMA device we support is the floppy and we have a hack</div><div class='ctx'> 	 * in the floppy driver directly to get a device for us.</div><div class='ctx'> 	 */</div><div class='del'>-	if (unlikely(dev == NULL || dev-&gt;archdata.dma_ops == NULL))</div><div class='add'>+</div><div class='add'>+	if (unlikely(dev == NULL) || dev-&gt;archdata.dma_ops == NULL) {</div><div class='add'>+#ifdef CONFIG_PPC64</div><div class='ctx'> 		return NULL;</div><div class='add'>+#else</div><div class='add'>+		/* Use default on 32-bit if dma_ops is not set up */</div><div class='add'>+		/* TODO: Long term, we should fix drivers so that dev and</div><div class='add'>+		 * archdata dma_ops are set up for all buses.</div><div class='add'>+		 */</div><div class='add'>+		return &amp;dma_direct_ops;</div><div class='add'>+#endif</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return dev-&gt;archdata.dma_ops;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -123,6 +148,12 @@ static inline int dma_set_mask(struct device *dev, u64 dma_mask)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * TODO: map_/unmap_single will ideally go away, to be completely</div><div class='add'>+ * replaced by map/unmap_page.   Until then, we allow dma_ops to have</div><div class='add'>+ * one or the other, or both by checking to see if the specific</div><div class='add'>+ * function requested exists; and if not, falling back on the other set.</div><div class='add'>+ */</div><div class='ctx'> static inline dma_addr_t dma_map_single_attrs(struct device *dev,</div><div class='ctx'> 					      void *cpu_addr,</div><div class='ctx'> 					      size_t size,</div><div class='hunk'>@@ -132,7 +163,14 @@ static inline dma_addr_t dma_map_single_attrs(struct device *dev,</div><div class='ctx'> 	struct dma_mapping_ops *dma_ops = get_dma_ops(dev);</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(!dma_ops);</div><div class='del'>-	return dma_ops-&gt;map_single(dev, cpu_addr, size, direction, attrs);</div><div class='add'>+</div><div class='add'>+	if (dma_ops-&gt;map_single)</div><div class='add'>+		return dma_ops-&gt;map_single(dev, cpu_addr, size, direction,</div><div class='add'>+					   attrs);</div><div class='add'>+</div><div class='add'>+	return dma_ops-&gt;map_page(dev, virt_to_page(cpu_addr),</div><div class='add'>+				 (unsigned long)cpu_addr % PAGE_SIZE, size,</div><div class='add'>+				 direction, attrs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void dma_unmap_single_attrs(struct device *dev,</div><div class='hunk'>@@ -144,7 +182,13 @@ static inline void dma_unmap_single_attrs(struct device *dev,</div><div class='ctx'> 	struct dma_mapping_ops *dma_ops = get_dma_ops(dev);</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(!dma_ops);</div><div class='del'>-	dma_ops-&gt;unmap_single(dev, dma_addr, size, direction, attrs);</div><div class='add'>+</div><div class='add'>+	if (dma_ops-&gt;unmap_single) {</div><div class='add'>+		dma_ops-&gt;unmap_single(dev, dma_addr, size, direction, attrs);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dma_ops-&gt;unmap_page(dev, dma_addr, size, direction, attrs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline dma_addr_t dma_map_page_attrs(struct device *dev,</div><div class='hunk'>@@ -156,8 +200,13 @@ static inline dma_addr_t dma_map_page_attrs(struct device *dev,</div><div class='ctx'> 	struct dma_mapping_ops *dma_ops = get_dma_ops(dev);</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(!dma_ops);</div><div class='add'>+</div><div class='add'>+	if (dma_ops-&gt;map_page)</div><div class='add'>+		return dma_ops-&gt;map_page(dev, page, offset, size, direction,</div><div class='add'>+					 attrs);</div><div class='add'>+</div><div class='ctx'> 	return dma_ops-&gt;map_single(dev, page_address(page) + offset, size,</div><div class='del'>-			direction, attrs);</div><div class='add'>+				   direction, attrs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void dma_unmap_page_attrs(struct device *dev,</div><div class='hunk'>@@ -169,6 +218,12 @@ static inline void dma_unmap_page_attrs(struct device *dev,</div><div class='ctx'> 	struct dma_mapping_ops *dma_ops = get_dma_ops(dev);</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(!dma_ops);</div><div class='add'>+</div><div class='add'>+	if (dma_ops-&gt;unmap_page) {</div><div class='add'>+		dma_ops-&gt;unmap_page(dev, dma_address, size, direction, attrs);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	dma_ops-&gt;unmap_single(dev, dma_address, size, direction, attrs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -253,126 +308,6 @@ static inline void dma_unmap_sg(struct device *dev, struct scatterlist *sg,</div><div class='ctx'> 	dma_unmap_sg_attrs(dev, sg, nhwentries, direction, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Available generic sets of operations</div><div class='del'>- */</div><div class='del'>-extern struct dma_mapping_ops dma_iommu_ops;</div><div class='del'>-extern struct dma_mapping_ops dma_direct_ops;</div><div class='del'>-</div><div class='del'>-#else /* CONFIG_PPC64 */</div><div class='del'>-</div><div class='del'>-#define dma_supported(dev, mask)	(1)</div><div class='del'>-</div><div class='del'>-static inline int dma_set_mask(struct device *dev, u64 dma_mask)</div><div class='del'>-{</div><div class='del'>-	if (!dev-&gt;dma_mask || !dma_supported(dev, mask))</div><div class='del'>-		return -EIO;</div><div class='del'>-</div><div class='del'>-	*dev-&gt;dma_mask = dma_mask;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void *dma_alloc_coherent(struct device *dev, size_t size,</div><div class='del'>-				       dma_addr_t * dma_handle,</div><div class='del'>-				       gfp_t gfp)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_NOT_COHERENT_CACHE</div><div class='del'>-	return __dma_alloc_coherent(size, dma_handle, gfp);</div><div class='del'>-#else</div><div class='del'>-	void *ret;</div><div class='del'>-	/* ignore region specifiers */</div><div class='del'>-	gfp &amp;= ~(__GFP_DMA | __GFP_HIGHMEM);</div><div class='del'>-</div><div class='del'>-	if (dev == NULL || dev-&gt;coherent_dma_mask &lt; 0xffffffff)</div><div class='del'>-		gfp |= GFP_DMA;</div><div class='del'>-</div><div class='del'>-	ret = (void *)__get_free_pages(gfp, get_order(size));</div><div class='del'>-</div><div class='del'>-	if (ret != NULL) {</div><div class='del'>-		memset(ret, 0, size);</div><div class='del'>-		*dma_handle = virt_to_bus(ret);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-dma_free_coherent(struct device *dev, size_t size, void *vaddr,</div><div class='del'>-		  dma_addr_t dma_handle)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_NOT_COHERENT_CACHE</div><div class='del'>-	__dma_free_coherent(size, vaddr);</div><div class='del'>-#else</div><div class='del'>-	free_pages((unsigned long)vaddr, get_order(size));</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline dma_addr_t</div><div class='del'>-dma_map_single(struct device *dev, void *ptr, size_t size,</div><div class='del'>-	       enum dma_data_direction direction)</div><div class='del'>-{</div><div class='del'>-	BUG_ON(direction == DMA_NONE);</div><div class='del'>-</div><div class='del'>-	__dma_sync(ptr, size, direction);</div><div class='del'>-</div><div class='del'>-	return virt_to_bus(ptr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void dma_unmap_single(struct device *dev, dma_addr_t dma_addr,</div><div class='del'>-				    size_t size,</div><div class='del'>-				    enum dma_data_direction direction)</div><div class='del'>-{</div><div class='del'>-	/* We do nothing. */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline dma_addr_t</div><div class='del'>-dma_map_page(struct device *dev, struct page *page,</div><div class='del'>-	     unsigned long offset, size_t size,</div><div class='del'>-	     enum dma_data_direction direction)</div><div class='del'>-{</div><div class='del'>-	BUG_ON(direction == DMA_NONE);</div><div class='del'>-</div><div class='del'>-	__dma_sync_page(page, offset, size, direction);</div><div class='del'>-</div><div class='del'>-	return page_to_bus(page) + offset;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void dma_unmap_page(struct device *dev, dma_addr_t dma_address,</div><div class='del'>-				  size_t size,</div><div class='del'>-				  enum dma_data_direction direction)</div><div class='del'>-{</div><div class='del'>-	/* We do nothing. */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int</div><div class='del'>-dma_map_sg(struct device *dev, struct scatterlist *sgl, int nents,</div><div class='del'>-	   enum dma_data_direction direction)</div><div class='del'>-{</div><div class='del'>-	struct scatterlist *sg;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	BUG_ON(direction == DMA_NONE);</div><div class='del'>-</div><div class='del'>-	for_each_sg(sgl, sg, nents, i) {</div><div class='del'>-		BUG_ON(!sg_page(sg));</div><div class='del'>-		__dma_sync_page(sg_page(sg), sg-&gt;offset, sg-&gt;length, direction);</div><div class='del'>-		sg-&gt;dma_address = page_to_bus(sg_page(sg)) + sg-&gt;offset;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return nents;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void dma_unmap_sg(struct device *dev, struct scatterlist *sg,</div><div class='del'>-				int nhwentries,</div><div class='del'>-				enum dma_data_direction direction)</div><div class='del'>-{</div><div class='del'>-	/* We don't do anything here. */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* CONFIG_PPC64 */</div><div class='del'>-</div><div class='ctx'> static inline void dma_sync_single_for_cpu(struct device *dev,</div><div class='ctx'> 		dma_addr_t dma_handle, size_t size,</div><div class='ctx'> 		enum dma_data_direction direction)</div><div class='head'>diff --git a/arch/powerpc/include/asm/elf.h b/arch/powerpc/include/asm/elf.h<br/>index 64c6ee22eefd..d812929390e4 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/include/asm/elf.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/include/asm/elf.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/include/asm/elf.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/include/asm/elf.h</a></div><div class='hunk'>@@ -232,7 +232,7 @@ typedef elf_vrregset_t elf_fpxregset_t;</div><div class='ctx'> #endif /* __powerpc64__ */</div><div class='ctx'> </div><div class='ctx'> #ifdef __powerpc64__</div><div class='del'>-# define SET_PERSONALITY(ex, ibcs2)				\</div><div class='add'>+# define SET_PERSONALITY(ex)					\</div><div class='ctx'> do {								\</div><div class='ctx'> 	unsigned long new_flags = 0;				\</div><div class='ctx'> 	if ((ex).e_ident[EI_CLASS] == ELFCLASS32)		\</div><div class='hunk'>@@ -256,7 +256,7 @@ do {								\</div><div class='ctx'> # define elf_read_implies_exec(ex, exec_stk) (test_thread_flag(TIF_32BIT) ? \</div><div class='ctx'> 		(exec_stk != EXSTACK_DISABLE_X) : 0)</div><div class='ctx'> #else </div><div class='del'>-# define SET_PERSONALITY(ex, ibcs2) set_personality((ibcs2)?PER_SVR4:PER_LINUX)</div><div class='add'>+# define SET_PERSONALITY(ex) set_personality(PER_LINUX)</div><div class='ctx'> #endif /* __powerpc64__ */</div><div class='ctx'> </div><div class='ctx'> extern int dcache_bsize;</div><div class='head'>diff --git a/arch/powerpc/include/asm/exception.h b/arch/powerpc/include/asm/exception.h<br/>index 329148b5acc6..d3d4534e3c74 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/include/asm/exception.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/include/asm/exception.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/include/asm/exception.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/include/asm/exception.h</a></div><div class='hunk'>@@ -53,14 +53,8 @@</div><div class='ctx'>  * low halfword of the address, but for Kdump we need the whole low</div><div class='ctx'>  * word.</div><div class='ctx'>  */</div><div class='del'>-#ifdef CONFIG_CRASH_DUMP</div><div class='ctx'> #define LOAD_HANDLER(reg, label)					\</div><div class='del'>-	oris	reg,reg,(label)@h;	/* virt addr of handler ... */	\</div><div class='del'>-	ori	reg,reg,(label)@l;	/* .. and the rest */</div><div class='del'>-#else</div><div class='del'>-#define LOAD_HANDLER(reg, label)					\</div><div class='del'>-	ori	reg,reg,(label)@l;	/* virt addr of handler ... */</div><div class='del'>-#endif</div><div class='add'>+	addi	reg,reg,(label)-_stext;	/* virt addr of handler ... */</div><div class='ctx'> </div><div class='ctx'> #define EXCEPTION_PROLOG_1(area)				\</div><div class='ctx'> 	mfspr	r13,SPRN_SPRG3;		/* get paca address into r13 */	\</div><div class='hunk'>@@ -72,37 +66,12 @@</div><div class='ctx'> 	std	r9,area+EX_R13(r13);					\</div><div class='ctx'> 	mfcr	r9</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Equal to EXCEPTION_PROLOG_PSERIES, except that it forces 64bit mode.</div><div class='del'>- * The firmware calls the registered system_reset_fwnmi and</div><div class='del'>- * machine_check_fwnmi handlers in 32bit mode if the cpu happens to run</div><div class='del'>- * a 32bit application at the time of the event.</div><div class='del'>- * This firmware bug is present on POWER4 and JS20.</div><div class='del'>- */</div><div class='del'>-#define EXCEPTION_PROLOG_PSERIES_FORCE_64BIT(area, label)		\</div><div class='del'>-	EXCEPTION_PROLOG_1(area);					\</div><div class='del'>-	clrrdi	r12,r13,32;		/* get high part of &amp;label */	\</div><div class='del'>-	mfmsr	r10;							\</div><div class='del'>-	/* force 64bit mode */						\</div><div class='del'>-	li	r11,5;			/* MSR_SF_LG|MSR_ISF_LG */	\</div><div class='del'>-	rldimi	r10,r11,61,0;		/* insert into top 3 bits */	\</div><div class='del'>-	/* done 64bit mode */						\</div><div class='del'>-	mfspr	r11,SPRN_SRR0;		/* save SRR0 */			\</div><div class='del'>-	LOAD_HANDLER(r12,label)						\</div><div class='del'>-	ori	r10,r10,MSR_IR|MSR_DR|MSR_RI;				\</div><div class='del'>-	mtspr	SPRN_SRR0,r12;						\</div><div class='del'>-	mfspr	r12,SPRN_SRR1;		/* and SRR1 */			\</div><div class='del'>-	mtspr	SPRN_SRR1,r10;						\</div><div class='del'>-	rfid;								\</div><div class='del'>-	b	.	/* prevent speculative execution */</div><div class='del'>-</div><div class='ctx'> #define EXCEPTION_PROLOG_PSERIES(area, label)				\</div><div class='ctx'> 	EXCEPTION_PROLOG_1(area);					\</div><div class='del'>-	clrrdi	r12,r13,32;		/* get high part of &amp;label */	\</div><div class='del'>-	mfmsr	r10;							\</div><div class='add'>+	ld	r12,PACAKBASE(r13);	/* get high part of &amp;label */	\</div><div class='add'>+	ld	r10,PACAKMSR(r13);	/* get MSR value for kernel */	\</div><div class='ctx'> 	mfspr	r11,SPRN_SRR0;		/* save SRR0 */			\</div><div class='ctx'> 	LOAD_HANDLER(r12,label)						\</div><div class='del'>-	ori	r10,r10,MSR_IR|MSR_DR|MSR_RI;				\</div><div class='ctx'> 	mtspr	SPRN_SRR0,r12;						\</div><div class='ctx'> 	mfspr	r12,SPRN_SRR1;		/* and SRR1 */			\</div><div class='ctx'> 	mtspr	SPRN_SRR1,r10;						\</div><div class='hunk'>@@ -210,11 +179,10 @@ label##_pSeries:							\</div><div class='ctx'> 	std	r10,PACA_EXGEN+EX_R13(r13);				\</div><div class='ctx'> 	std	r11,PACA_EXGEN+EX_R11(r13);				\</div><div class='ctx'> 	std	r12,PACA_EXGEN+EX_R12(r13);				\</div><div class='del'>-	clrrdi	r12,r13,32;		/* get high part of &amp;label */	\</div><div class='del'>-	mfmsr	r10;							\</div><div class='add'>+	ld	r12,PACAKBASE(r13);	/* get high part of &amp;label */	\</div><div class='add'>+	ld	r10,PACAKMSR(r13);	/* get MSR value for kernel */	\</div><div class='ctx'> 	mfspr	r11,SPRN_SRR0;		/* save SRR0 */			\</div><div class='ctx'> 	LOAD_HANDLER(r12,label##_common)				\</div><div class='del'>-	ori	r10,r10,MSR_IR|MSR_DR|MSR_RI;				\</div><div class='ctx'> 	mtspr	SPRN_SRR0,r12;						\</div><div class='ctx'> 	mfspr	r12,SPRN_SRR1;		/* and SRR1 */			\</div><div class='ctx'> 	mtspr	SPRN_SRR1,r10;						\</div><div class='head'>diff --git a/arch/powerpc/include/asm/fsl_lbc.h b/arch/powerpc/include/asm/fsl_lbc.h<br/>index 303f5484c050..63a4f779f531 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/include/asm/fsl_lbc.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/include/asm/fsl_lbc.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/include/asm/fsl_lbc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/include/asm/fsl_lbc.h</a></div><div class='hunk'>@@ -23,9 +23,9 @@</div><div class='ctx'> #ifndef __ASM_FSL_LBC_H</div><div class='ctx'> #define __ASM_FSL_LBC_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/compiler.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct fsl_lbc_bank {</div><div class='ctx'> 	__be32 br;             /**&lt; Base Register  */</div><div class='hunk'>@@ -227,9 +227,6 @@ struct fsl_lbc_regs {</div><div class='ctx'> 	u8 res8[0xF00];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-extern struct fsl_lbc_regs __iomem *fsl_lbc_regs;</div><div class='del'>-extern spinlock_t fsl_lbc_lock;</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * FSL UPM routines</div><div class='ctx'>  */</div><div class='hunk'>@@ -268,44 +265,7 @@ static inline void fsl_upm_end_pattern(struct fsl_upm *upm)</div><div class='ctx'> 		cpu_relax();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * fsl_upm_run_pattern - actually run an UPM pattern</div><div class='del'>- * @upm:	pointer to the fsl_upm structure obtained via fsl_upm_find</div><div class='del'>- * @io_base:	remapped pointer to where memory access should happen</div><div class='del'>- * @mar:	MAR register content during pattern execution</div><div class='del'>- *</div><div class='del'>- * This function triggers dummy write to the memory specified by the io_base,</div><div class='del'>- * thus UPM pattern actually executed. Note that mar usage depends on the</div><div class='del'>- * pre-programmed AMX bits in the UPM RAM.</div><div class='del'>- */</div><div class='del'>-static inline int fsl_upm_run_pattern(struct fsl_upm *upm,</div><div class='del'>-				      void __iomem *io_base, u32 mar)</div><div class='del'>-{</div><div class='del'>-	int ret = 0;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;fsl_lbc_lock, flags);</div><div class='del'>-</div><div class='del'>-	out_be32(&amp;fsl_lbc_regs-&gt;mar, mar &lt;&lt; (32 - upm-&gt;width));</div><div class='del'>-</div><div class='del'>-	switch (upm-&gt;width) {</div><div class='del'>-	case 8:</div><div class='del'>-		out_8(io_base, 0x0);</div><div class='del'>-		break;</div><div class='del'>-	case 16:</div><div class='del'>-		out_be16(io_base, 0x0);</div><div class='del'>-		break;</div><div class='del'>-	case 32:</div><div class='del'>-		out_be32(io_base, 0x0);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;fsl_lbc_lock, flags);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='add'>+extern int fsl_upm_run_pattern(struct fsl_upm *upm, void __iomem *io_base,</div><div class='add'>+			       u32 mar);</div><div class='ctx'> </div><div class='ctx'> #endif /* __ASM_FSL_LBC_H */</div><div class='head'>diff --git a/arch/powerpc/include/asm/highmem.h b/arch/powerpc/include/asm/highmem.h<br/>index 5d99b6489d56..91c589520c0a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/include/asm/highmem.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/include/asm/highmem.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/include/asm/highmem.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/include/asm/highmem.h</a></div><div class='hunk'>@@ -84,7 +84,7 @@ static inline void *kmap_atomic_prot(struct page *page, enum km_type type, pgpro</div><div class='ctx'> #ifdef CONFIG_DEBUG_HIGHMEM</div><div class='ctx'> 	BUG_ON(!pte_none(*(kmap_pte-idx)));</div><div class='ctx'> #endif</div><div class='del'>-	set_pte_at(&amp;init_mm, vaddr, kmap_pte-idx, mk_pte(page, prot));</div><div class='add'>+	__set_pte_at(&amp;init_mm, vaddr, kmap_pte-idx, mk_pte(page, prot));</div><div class='ctx'> 	flush_tlb_page(NULL, vaddr);</div><div class='ctx'> </div><div class='ctx'> 	return (void*) vaddr;</div><div class='head'>diff --git a/arch/powerpc/include/asm/io.h b/arch/powerpc/include/asm/io.h<br/>index 77c7fa025e65..08266d2728b3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/include/asm/io.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/include/asm/io.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/include/asm/io.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/include/asm/io.h</a></div><div class='hunk'>@@ -711,7 +711,7 @@ static inline void * phys_to_virt(unsigned long address)</div><div class='ctx'> /*</div><div class='ctx'>  * Change "struct page" to physical address.</div><div class='ctx'>  */</div><div class='del'>-#define page_to_phys(page)	(page_to_pfn(page) &lt;&lt; PAGE_SHIFT)</div><div class='add'>+#define page_to_phys(page)	((phys_addr_t)page_to_pfn(page) &lt;&lt; PAGE_SHIFT)</div><div class='ctx'> </div><div class='ctx'> /* We do NOT want virtual merging, it would put too much pressure on</div><div class='ctx'>  * our iommu allocator. Instead, we want drivers to be smart enough</div><div class='head'>diff --git a/arch/powerpc/include/asm/irq.h b/arch/powerpc/include/asm/irq.h<br/>index a372f76836c2..0a5137676e1b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/include/asm/irq.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/include/asm/irq.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/include/asm/irq.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/include/asm/irq.h</a></div><div class='hunk'>@@ -236,15 +236,27 @@ extern unsigned int irq_find_mapping(struct irq_host *host,</div><div class='ctx'> extern unsigned int irq_create_direct_mapping(struct irq_host *host);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * irq_radix_revmap - Find a linux virq from a hw irq number.</div><div class='add'>+ * irq_radix_revmap_insert - Insert a hw irq to linux virq number mapping.</div><div class='add'>+ * @host: host owning this hardware interrupt</div><div class='add'>+ * @virq: linux irq number</div><div class='add'>+ * @hwirq: hardware irq number in that host space</div><div class='add'>+ *</div><div class='add'>+ * This is for use by irq controllers that use a radix tree reverse</div><div class='add'>+ * mapping for fast lookup.</div><div class='add'>+ */</div><div class='add'>+extern void irq_radix_revmap_insert(struct irq_host *host, unsigned int virq,</div><div class='add'>+				    irq_hw_number_t hwirq);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * irq_radix_revmap_lookup - Find a linux virq from a hw irq number.</div><div class='ctx'>  * @host: host owning this hardware interrupt</div><div class='ctx'>  * @hwirq: hardware irq number in that host space</div><div class='ctx'>  *</div><div class='ctx'>  * This is a fast path, for use by irq controller code that uses radix tree</div><div class='ctx'>  * revmaps</div><div class='ctx'>  */</div><div class='del'>-extern unsigned int irq_radix_revmap(struct irq_host *host,</div><div class='del'>-				     irq_hw_number_t hwirq);</div><div class='add'>+extern unsigned int irq_radix_revmap_lookup(struct irq_host *host,</div><div class='add'>+					    irq_hw_number_t hwirq);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * irq_linear_revmap - Find a linux virq from a hw irq number.</div><div class='head'>diff --git a/arch/powerpc/include/asm/kvm_host.h b/arch/powerpc/include/asm/kvm_host.h<br/>index 2655e2a4831e..34b52b7180cd 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/include/asm/kvm_host.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/include/asm/kvm_host.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/include/asm/kvm_host.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/include/asm/kvm_host.h</a></div><div class='hunk'>@@ -81,11 +81,17 @@ struct kvm_vcpu_arch {</div><div class='ctx'> 	struct tlbe shadow_tlb[PPC44x_TLB_SIZE];</div><div class='ctx'> 	/* Pages which are referenced in the shadow TLB. */</div><div class='ctx'> 	struct page *shadow_pages[PPC44x_TLB_SIZE];</div><div class='del'>-	/* Copy of the host's TLB. */</div><div class='del'>-	struct tlbe host_tlb[PPC44x_TLB_SIZE];</div><div class='add'>+</div><div class='add'>+	/* Track which TLB entries we've modified in the current exit. */</div><div class='add'>+	u8 shadow_tlb_mod[PPC44x_TLB_SIZE];</div><div class='ctx'> </div><div class='ctx'> 	u32 host_stack;</div><div class='ctx'> 	u32 host_pid;</div><div class='add'>+	u32 host_dbcr0;</div><div class='add'>+	u32 host_dbcr1;</div><div class='add'>+	u32 host_dbcr2;</div><div class='add'>+	u32 host_iac[4];</div><div class='add'>+	u32 host_msr;</div><div class='ctx'> </div><div class='ctx'> 	u64 fpr[32];</div><div class='ctx'> 	u32 gpr[32];</div><div class='hunk'>@@ -123,7 +129,11 @@ struct kvm_vcpu_arch {</div><div class='ctx'> 	u32 ivor[16];</div><div class='ctx'> 	u32 ivpr;</div><div class='ctx'> 	u32 pir;</div><div class='add'>+</div><div class='add'>+	u32 shadow_pid;</div><div class='ctx'> 	u32 pid;</div><div class='add'>+	u32 swap_pid;</div><div class='add'>+</div><div class='ctx'> 	u32 pvr;</div><div class='ctx'> 	u32 ccr0;</div><div class='ctx'> 	u32 ccr1;</div><div class='head'>diff --git a/arch/powerpc/include/asm/kvm_ppc.h b/arch/powerpc/include/asm/kvm_ppc.h<br/>index a8b068792260..8931ba729d2b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/include/asm/kvm_ppc.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/include/asm/kvm_ppc.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/include/asm/kvm_ppc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/include/asm/kvm_ppc.h</a></div><div class='hunk'>@@ -64,6 +64,10 @@ extern void kvmppc_mmu_map(struct kvm_vcpu *vcpu, u64 gvaddr, gfn_t gfn,</div><div class='ctx'> extern void kvmppc_mmu_invalidate(struct kvm_vcpu *vcpu, gva_t eaddr,</div><div class='ctx'>                                   gva_t eend, u32 asid);</div><div class='ctx'> extern void kvmppc_mmu_priv_switch(struct kvm_vcpu *vcpu, int usermode);</div><div class='add'>+extern void kvmppc_mmu_switch_pid(struct kvm_vcpu *vcpu, u32 pid);</div><div class='add'>+</div><div class='add'>+/* XXX Book E specific */</div><div class='add'>+extern void kvmppc_tlbe_set_modified(struct kvm_vcpu *vcpu, unsigned int i);</div><div class='ctx'> </div><div class='ctx'> extern void kvmppc_check_and_deliver_interrupts(struct kvm_vcpu *vcpu);</div><div class='ctx'> </div><div class='hunk'>@@ -92,4 +96,12 @@ static inline void kvmppc_set_msr(struct kvm_vcpu *vcpu, u32 new_msr)</div><div class='ctx'> 		kvm_vcpu_block(vcpu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void kvmppc_set_pid(struct kvm_vcpu *vcpu, u32 new_pid)</div><div class='add'>+{</div><div class='add'>+	if (vcpu-&gt;arch.pid != new_pid) {</div><div class='add'>+		vcpu-&gt;arch.pid = new_pid;</div><div class='add'>+		vcpu-&gt;arch.swap_pid = 1;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif /* __POWERPC_KVM_PPC_H__ */</div><div class='head'>diff --git a/arch/powerpc/include/asm/machdep.h b/arch/powerpc/include/asm/machdep.h<br/>index 893aafd87fde..2740c44ff717 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/include/asm/machdep.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/include/asm/machdep.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/include/asm/machdep.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/include/asm/machdep.h</a></div><div class='hunk'>@@ -88,8 +88,6 @@ struct machdep_calls {</div><div class='ctx'> 	unsigned long	(*tce_get)(struct iommu_table *tbl,</div><div class='ctx'> 				    long index);</div><div class='ctx'> 	void		(*tce_flush)(struct iommu_table *tbl);</div><div class='del'>-	void		(*pci_dma_dev_setup)(struct pci_dev *dev);</div><div class='del'>-	void		(*pci_dma_bus_setup)(struct pci_bus *bus);</div><div class='ctx'> </div><div class='ctx'> 	void __iomem *	(*ioremap)(phys_addr_t addr, unsigned long size,</div><div class='ctx'> 				   unsigned long flags);</div><div class='hunk'>@@ -101,6 +99,9 @@ struct machdep_calls {</div><div class='ctx'> #endif</div><div class='ctx'> #endif /* CONFIG_PPC64 */</div><div class='ctx'> </div><div class='add'>+	void		(*pci_dma_dev_setup)(struct pci_dev *dev);</div><div class='add'>+	void		(*pci_dma_bus_setup)(struct pci_bus *bus);</div><div class='add'>+</div><div class='ctx'> 	int		(*probe)(void);</div><div class='ctx'> 	void		(*setup_arch)(void); /* Optional, may be NULL */</div><div class='ctx'> 	void		(*init_early)(void);</div><div class='head'>diff --git a/arch/powerpc/include/asm/mman.h b/arch/powerpc/include/asm/mman.h<br/>index 9209f755763e..e7b99bac9f48 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/include/asm/mman.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/include/asm/mman.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/include/asm/mman.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/include/asm/mman.h</a></div><div class='hunk'>@@ -44,7 +44,7 @@ static inline unsigned long arch_calc_vm_prot_bits(unsigned long prot)</div><div class='ctx'> </div><div class='ctx'> static inline pgprot_t arch_vm_get_page_prot(unsigned long vm_flags)</div><div class='ctx'> {</div><div class='del'>-	return (vm_flags &amp; VM_SAO) ? __pgprot(_PAGE_SAO) : 0;</div><div class='add'>+	return (vm_flags &amp; VM_SAO) ? __pgprot(_PAGE_SAO) : __pgprot(0);</div><div class='ctx'> }</div><div class='ctx'> #define arch_vm_get_page_prot(vm_flags) arch_vm_get_page_prot(vm_flags)</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/include/asm/mmu-hash64.h b/arch/powerpc/include/asm/mmu-hash64.h<br/>index c2df53c5ceb9..5a441742ffba 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/include/asm/mmu-hash64.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/include/asm/mmu-hash64.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/include/asm/mmu-hash64.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/include/asm/mmu-hash64.h</a></div><div class='hunk'>@@ -437,7 +437,7 @@ typedef struct {</div><div class='ctx'> 	})</div><div class='ctx'> #endif /* 1 */</div><div class='ctx'> </div><div class='del'>-/* This is only valid for addresses &gt;= KERNELBASE */</div><div class='add'>+/* This is only valid for addresses &gt;= PAGE_OFFSET */</div><div class='ctx'> static inline unsigned long get_kernel_vsid(unsigned long ea, int ssize)</div><div class='ctx'> {</div><div class='ctx'> 	if (ssize == MMU_SEGSIZE_256M)</div><div class='head'>diff --git a/arch/powerpc/include/asm/mpic.h b/arch/powerpc/include/asm/mpic.h<br/>index fe566a348a86..34d9ac433ace 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/include/asm/mpic.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/include/asm/mpic.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/include/asm/mpic.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/include/asm/mpic.h</a></div><div class='hunk'>@@ -5,6 +5,7 @@</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/sysdev.h&gt;</div><div class='ctx'> #include &lt;asm/dcr.h&gt;</div><div class='add'>+#include &lt;asm/msi_bitmap.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Global registers</div><div class='hunk'>@@ -301,8 +302,7 @@ struct mpic</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PCI_MSI</div><div class='del'>-	spinlock_t		bitmap_lock;</div><div class='del'>-	unsigned long		*hwirq_bitmap;</div><div class='add'>+	struct msi_bitmap	msi_bitmap;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MPIC_BROKEN_REGREAD</div><div class='head'>diff --git a/arch/powerpc/include/asm/msi_bitmap.h b/arch/powerpc/include/asm/msi_bitmap.h<br/>new file mode 100644<br/>index 000000000000..97ac3f46ae0d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/include/asm/msi_bitmap.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/include/asm/msi_bitmap.h</a></div><div class='hunk'>@@ -0,0 +1,35 @@</div><div class='add'>+#ifndef _POWERPC_SYSDEV_MSI_BITMAP_H</div><div class='add'>+#define _POWERPC_SYSDEV_MSI_BITMAP_H</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2008, Michael Ellerman, IBM Corporation.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public License</div><div class='add'>+ * as published by the Free Software Foundation; version 2 of the</div><div class='add'>+ * License.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;asm/irq.h&gt;</div><div class='add'>+</div><div class='add'>+struct msi_bitmap {</div><div class='add'>+	struct device_node	*of_node;</div><div class='add'>+	unsigned long		*bitmap;</div><div class='add'>+	spinlock_t		lock;</div><div class='add'>+	unsigned int		irq_count;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int msi_bitmap_alloc_hwirqs(struct msi_bitmap *bmp, int num);</div><div class='add'>+void msi_bitmap_free_hwirqs(struct msi_bitmap *bmp, unsigned int offset,</div><div class='add'>+			    unsigned int num);</div><div class='add'>+void msi_bitmap_reserve_hwirq(struct msi_bitmap *bmp, unsigned int hwirq);</div><div class='add'>+</div><div class='add'>+int msi_bitmap_reserve_dt_hwirqs(struct msi_bitmap *bmp);</div><div class='add'>+</div><div class='add'>+int msi_bitmap_alloc(struct msi_bitmap *bmp, unsigned int irq_count,</div><div class='add'>+		     struct device_node *of_node);</div><div class='add'>+void msi_bitmap_free(struct msi_bitmap *bmp);</div><div class='add'>+</div><div class='add'>+#endif /* _POWERPC_SYSDEV_MSI_BITMAP_H */</div><div class='head'>diff --git a/arch/powerpc/include/asm/of_device.h b/arch/powerpc/include/asm/of_device.h<br/>index 3c123990ca2e..a64debf177dc 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/include/asm/of_device.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/include/asm/of_device.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/include/asm/of_device.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/include/asm/of_device.h</a></div><div class='hunk'>@@ -24,8 +24,5 @@ extern struct of_device *of_device_alloc(struct device_node *np,</div><div class='ctx'> extern int of_device_uevent(struct device *dev,</div><div class='ctx'> 			    struct kobj_uevent_env *env);</div><div class='ctx'> </div><div class='del'>-/* This is just here during the transition */</div><div class='del'>-#include &lt;linux/of_device.h&gt;</div><div class='del'>-</div><div class='ctx'> #endif /* __KERNEL__ */</div><div class='ctx'> #endif /* _ASM_POWERPC_OF_DEVICE_H */</div><div class='head'>diff --git a/arch/powerpc/include/asm/of_platform.h b/arch/powerpc/include/asm/of_platform.h<br/>index 18659ef72139..53b46507ffde 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/include/asm/of_platform.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/include/asm/of_platform.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/include/asm/of_platform.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/include/asm/of_platform.h</a></div><div class='hunk'>@@ -11,9 +11,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/* This is just here during the transition */</div><div class='del'>-#include &lt;linux/of_platform.h&gt;</div><div class='del'>-</div><div class='ctx'> /* Platform drivers register/unregister */</div><div class='ctx'> static inline int of_register_platform_driver(struct of_platform_driver *drv)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/powerpc/include/asm/paca.h b/arch/powerpc/include/asm/paca.h<br/>index 6493a395508b..082b3aedf145 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/include/asm/paca.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/include/asm/paca.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/include/asm/paca.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/include/asm/paca.h</a></div><div class='hunk'>@@ -62,6 +62,8 @@ struct paca_struct {</div><div class='ctx'> 	u16 paca_index;			/* Logical processor number */</div><div class='ctx'> </div><div class='ctx'> 	u64 kernel_toc;			/* Kernel TOC address */</div><div class='add'>+	u64 kernelbase;			/* Base address of kernel */</div><div class='add'>+	u64 kernel_msr;			/* MSR while running in kernel */</div><div class='ctx'> 	u64 stab_real;			/* Absolute address of segment table */</div><div class='ctx'> 	u64 stab_addr;			/* Virtual address of segment table */</div><div class='ctx'> 	void *emergency_sp;		/* pointer to emergency stack */</div><div class='head'>diff --git a/arch/powerpc/include/asm/page.h b/arch/powerpc/include/asm/page.h<br/>index e088545cb3f5..64e144505f65 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/include/asm/page.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/include/asm/page.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/include/asm/page.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/include/asm/page.h</a></div><div class='hunk'>@@ -71,15 +71,21 @@</div><div class='ctx'> #define PAGE_OFFSET	ASM_CONST(CONFIG_PAGE_OFFSET)</div><div class='ctx'> #define LOAD_OFFSET	ASM_CONST((CONFIG_KERNEL_START-CONFIG_PHYSICAL_START))</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_RELOCATABLE) &amp;&amp; defined(CONFIG_FLATMEM)</div><div class='add'>+#if defined(CONFIG_RELOCATABLE)</div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='ctx'> extern phys_addr_t memstart_addr;</div><div class='ctx'> extern phys_addr_t kernstart_addr;</div><div class='ctx'> #endif</div><div class='ctx'> #define PHYSICAL_START	kernstart_addr</div><div class='del'>-#define MEMORY_START	memstart_addr</div><div class='ctx'> #else</div><div class='ctx'> #define PHYSICAL_START	ASM_CONST(CONFIG_PHYSICAL_START)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PPC64</div><div class='add'>+#define MEMORY_START	0UL</div><div class='add'>+#elif defined(CONFIG_RELOCATABLE)</div><div class='add'>+#define MEMORY_START	memstart_addr</div><div class='add'>+#else</div><div class='ctx'> #define MEMORY_START	(PHYSICAL_START + PAGE_OFFSET - KERNELBASE)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -92,8 +98,8 @@ extern phys_addr_t kernstart_addr;</div><div class='ctx'> #define pfn_to_kaddr(pfn)	__va((pfn) &lt;&lt; PAGE_SHIFT)</div><div class='ctx'> #define virt_addr_valid(kaddr)	pfn_valid(__pa(kaddr) &gt;&gt; PAGE_SHIFT)</div><div class='ctx'> </div><div class='del'>-#define __va(x) ((void *)((unsigned long)(x) - PHYSICAL_START + KERNELBASE))</div><div class='del'>-#define __pa(x) ((unsigned long)(x) + PHYSICAL_START - KERNELBASE)</div><div class='add'>+#define __va(x) ((void *)((unsigned long)(x) + PAGE_OFFSET - MEMORY_START))</div><div class='add'>+#define __pa(x) ((unsigned long)(x) - PAGE_OFFSET + MEMORY_START)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Unfortunately the PLT is in the BSS in the PPC32 ELF ABI,</div><div class='head'>diff --git a/arch/powerpc/include/asm/page_32.h b/arch/powerpc/include/asm/page_32.h<br/>index ebfae530a379..d77072a32cc6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/include/asm/page_32.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/include/asm/page_32.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/include/asm/page_32.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/include/asm/page_32.h</a></div><div class='hunk'>@@ -13,10 +13,16 @@</div><div class='ctx'> #define ARCH_KMALLOC_MINALIGN	L1_CACHE_BYTES</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PTE_64BIT</div><div class='add'>+#define PTE_FLAGS_OFFSET	4	/* offset of PTE flags, in bytes */</div><div class='add'>+#else</div><div class='add'>+#define PTE_FLAGS_OFFSET	0</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='ctx'> /*</div><div class='ctx'>  * The basic type of a PTE - 64 bits for those CPUs with &gt; 32 bit</div><div class='del'>- * physical addressing.  For now this just the IBM PPC440.</div><div class='add'>+ * physical addressing.</div><div class='ctx'>  */</div><div class='ctx'> #ifdef CONFIG_PTE_64BIT</div><div class='ctx'> typedef unsigned long long pte_basic_t;</div><div class='head'>diff --git a/arch/powerpc/include/asm/pci.h b/arch/powerpc/include/asm/pci.h<br/>index a05a942b1c25..0e52c7828ea4 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/include/asm/pci.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/include/asm/pci.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/include/asm/pci.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/include/asm/pci.h</a></div><div class='hunk'>@@ -60,6 +60,14 @@ static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)</div><div class='ctx'> 	return channel ? 15 : 14;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PCI</div><div class='add'>+extern void set_pci_dma_ops(struct dma_mapping_ops *dma_ops);</div><div class='add'>+extern struct dma_mapping_ops *get_pci_dma_ops(void);</div><div class='add'>+#else	/* CONFIG_PCI */</div><div class='add'>+#define set_pci_dma_ops(d)</div><div class='add'>+#define get_pci_dma_ops()	NULL</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_PPC64</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -70,9 +78,6 @@ static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)</div><div class='ctx'> #define PCI_DISABLE_MWI</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PCI</div><div class='del'>-extern void set_pci_dma_ops(struct dma_mapping_ops *dma_ops);</div><div class='del'>-extern struct dma_mapping_ops *get_pci_dma_ops(void);</div><div class='del'>-</div><div class='ctx'> static inline void pci_dma_burst_advice(struct pci_dev *pdev,</div><div class='ctx'> 					enum pci_dma_burst_strategy *strat,</div><div class='ctx'> 					unsigned long *strategy_parameter)</div><div class='hunk'>@@ -89,9 +94,6 @@ static inline void pci_dma_burst_advice(struct pci_dev *pdev,</div><div class='ctx'> 	*strat = PCI_DMA_BURST_MULTIPLE;</div><div class='ctx'> 	*strategy_parameter = cacheline_size;</div><div class='ctx'> }</div><div class='del'>-#else	/* CONFIG_PCI */</div><div class='del'>-#define set_pci_dma_ops(d)</div><div class='del'>-#define get_pci_dma_ops()	NULL</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #else /* 32-bit */</div><div class='head'>diff --git a/arch/powerpc/include/asm/pgtable-ppc32.h b/arch/powerpc/include/asm/pgtable-ppc32.h<br/>index 6fe39e327047..6ab7c67cb5ab 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/include/asm/pgtable-ppc32.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/include/asm/pgtable-ppc32.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/include/asm/pgtable-ppc32.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/include/asm/pgtable-ppc32.h</a></div><div class='hunk'>@@ -261,6 +261,7 @@ extern int icache_44x_need_flush;</div><div class='ctx'> #define _PAGE_HWEXEC	0x00000004		/* H: Execute permission */</div><div class='ctx'> #define _PAGE_ACCESSED	0x00000008		/* S: Page referenced */</div><div class='ctx'> #define _PAGE_DIRTY	0x00000010		/* S: Page dirty */</div><div class='add'>+#define _PAGE_SPECIAL	0x00000020		/* S: Special page */</div><div class='ctx'> #define _PAGE_USER	0x00000040		/* S: User page */</div><div class='ctx'> #define _PAGE_ENDIAN	0x00000080		/* H: E bit */</div><div class='ctx'> #define _PAGE_GUARDED	0x00000100		/* H: G bit */</div><div class='hunk'>@@ -276,6 +277,7 @@ extern int icache_44x_need_flush;</div><div class='ctx'> /* ERPN in a PTE never gets cleared, ignore it */</div><div class='ctx'> #define _PTE_NONE_MASK	0xffffffff00000000ULL</div><div class='ctx'> </div><div class='add'>+#define __HAVE_ARCH_PTE_SPECIAL</div><div class='ctx'> </div><div class='ctx'> #elif defined(CONFIG_FSL_BOOKE)</div><div class='ctx'> /*</div><div class='hunk'>@@ -305,6 +307,7 @@ extern int icache_44x_need_flush;</div><div class='ctx'> #define _PAGE_COHERENT	0x00100	/* H: M bit */</div><div class='ctx'> #define _PAGE_NO_CACHE	0x00200	/* H: I bit */</div><div class='ctx'> #define _PAGE_WRITETHRU	0x00400	/* H: W bit */</div><div class='add'>+#define _PAGE_SPECIAL	0x00800 /* S: Special page */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PTE_64BIT</div><div class='ctx'> /* ERPN in a PTE never gets cleared, ignore it */</div><div class='hunk'>@@ -315,6 +318,8 @@ extern int icache_44x_need_flush;</div><div class='ctx'> #define _PMD_PRESENT_MASK (PAGE_MASK)</div><div class='ctx'> #define _PMD_BAD	(~PAGE_MASK)</div><div class='ctx'> </div><div class='add'>+#define __HAVE_ARCH_PTE_SPECIAL</div><div class='add'>+</div><div class='ctx'> #elif defined(CONFIG_8xx)</div><div class='ctx'> /* Definitions for 8xx embedded chips. */</div><div class='ctx'> #define _PAGE_PRESENT	0x0001	/* Page is valid */</div><div class='hunk'>@@ -362,8 +367,14 @@ extern int icache_44x_need_flush;</div><div class='ctx'> #define _PAGE_ACCESSED	0x100	/* R: page referenced */</div><div class='ctx'> #define _PAGE_EXEC	0x200	/* software: i-cache coherency required */</div><div class='ctx'> #define _PAGE_RW	0x400	/* software: user write access allowed */</div><div class='add'>+#define _PAGE_SPECIAL	0x800	/* software: Special page */</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PTE_64BIT</div><div class='add'>+/* We never clear the high word of the pte */</div><div class='add'>+#define _PTE_NONE_MASK	(0xffffffff00000000ULL | _PAGE_HASHPTE)</div><div class='add'>+#else</div><div class='ctx'> #define _PTE_NONE_MASK	_PAGE_HASHPTE</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #define _PMD_PRESENT	0</div><div class='ctx'> #define _PMD_PRESENT_MASK (PAGE_MASK)</div><div class='hunk'>@@ -372,6 +383,8 @@ extern int icache_44x_need_flush;</div><div class='ctx'> /* Hash table based platforms need atomic updates of the linux PTE */</div><div class='ctx'> #define PTE_ATOMIC_UPDATES	1</div><div class='ctx'> </div><div class='add'>+#define __HAVE_ARCH_PTE_SPECIAL</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -404,6 +417,9 @@ extern int icache_44x_need_flush;</div><div class='ctx'> #ifndef _PAGE_WRITETHRU</div><div class='ctx'> #define _PAGE_WRITETHRU	0</div><div class='ctx'> #endif</div><div class='add'>+#ifndef _PAGE_SPECIAL</div><div class='add'>+#define _PAGE_SPECIAL	0</div><div class='add'>+#endif</div><div class='ctx'> #ifndef _PMD_PRESENT_MASK</div><div class='ctx'> #define _PMD_PRESENT_MASK	_PMD_PRESENT</div><div class='ctx'> #endif</div><div class='hunk'>@@ -415,11 +431,11 @@ extern int icache_44x_need_flush;</div><div class='ctx'> #define _PAGE_CHG_MASK	(PAGE_MASK | _PAGE_ACCESSED | _PAGE_DIRTY)</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#define PAGE_PROT_BITS	__pgprot(_PAGE_GUARDED | _PAGE_COHERENT | _PAGE_NO_CACHE | \</div><div class='del'>-				 _PAGE_WRITETHRU | _PAGE_ENDIAN | \</div><div class='del'>-				 _PAGE_USER | _PAGE_ACCESSED | \</div><div class='del'>-				 _PAGE_RW | _PAGE_HWWRITE | _PAGE_DIRTY | \</div><div class='del'>-				 _PAGE_EXEC | _PAGE_HWEXEC)</div><div class='add'>+#define PAGE_PROT_BITS	(_PAGE_GUARDED | _PAGE_COHERENT | _PAGE_NO_CACHE | \</div><div class='add'>+			 _PAGE_WRITETHRU | _PAGE_ENDIAN | \</div><div class='add'>+			 _PAGE_USER | _PAGE_ACCESSED | \</div><div class='add'>+			 _PAGE_RW | _PAGE_HWWRITE | _PAGE_DIRTY | \</div><div class='add'>+			 _PAGE_EXEC | _PAGE_HWEXEC)</div><div class='ctx'> /*</div><div class='ctx'>  * Note: the _PAGE_COHERENT bit automatically gets set in the hardware</div><div class='ctx'>  * PTE if CONFIG_SMP is defined (hash_page does this); there is no need</div><div class='hunk'>@@ -517,7 +533,8 @@ extern unsigned long bad_call_to_PMD_PAGE_SIZE(void);</div><div class='ctx'> </div><div class='ctx'> #define pte_none(pte)		((pte_val(pte) &amp; ~_PTE_NONE_MASK) == 0)</div><div class='ctx'> #define pte_present(pte)	(pte_val(pte) &amp; _PAGE_PRESENT)</div><div class='del'>-#define pte_clear(mm,addr,ptep)	do { set_pte_at((mm), (addr), (ptep), __pte(0)); } while (0)</div><div class='add'>+#define pte_clear(mm, addr, ptep) \</div><div class='add'>+	do { pte_update(ptep, ~_PAGE_HASHPTE, 0); } while (0)</div><div class='ctx'> </div><div class='ctx'> #define pmd_none(pmd)		(!pmd_val(pmd))</div><div class='ctx'> #define	pmd_bad(pmd)		(pmd_val(pmd) &amp; _PMD_BAD)</div><div class='hunk'>@@ -533,7 +550,7 @@ static inline int pte_write(pte_t pte)		{ return pte_val(pte) &amp; _PAGE_RW; }</div><div class='ctx'> static inline int pte_dirty(pte_t pte)		{ return pte_val(pte) &amp; _PAGE_DIRTY; }</div><div class='ctx'> static inline int pte_young(pte_t pte)		{ return pte_val(pte) &amp; _PAGE_ACCESSED; }</div><div class='ctx'> static inline int pte_file(pte_t pte)		{ return pte_val(pte) &amp; _PAGE_FILE; }</div><div class='del'>-static inline int pte_special(pte_t pte)	{ return 0; }</div><div class='add'>+static inline int pte_special(pte_t pte)	{ return pte_val(pte) &amp; _PAGE_SPECIAL; }</div><div class='ctx'> </div><div class='ctx'> static inline void pte_uncache(pte_t pte)       { pte_val(pte) |= _PAGE_NO_CACHE; }</div><div class='ctx'> static inline void pte_cache(pte_t pte)         { pte_val(pte) &amp;= ~_PAGE_NO_CACHE; }</div><div class='hunk'>@@ -552,10 +569,10 @@ static inline pte_t pte_mkdirty(pte_t pte) {</div><div class='ctx'> static inline pte_t pte_mkyoung(pte_t pte) {</div><div class='ctx'> 	pte_val(pte) |= _PAGE_ACCESSED; return pte; }</div><div class='ctx'> static inline pte_t pte_mkspecial(pte_t pte) {</div><div class='del'>-	return pte; }</div><div class='del'>-static inline unsigned long pte_pgprot(pte_t pte)</div><div class='add'>+	pte_val(pte) |= _PAGE_SPECIAL; return pte; }</div><div class='add'>+static inline pgprot_t pte_pgprot(pte_t pte)</div><div class='ctx'> {</div><div class='del'>-	return __pgprot(pte_val(pte)) &amp; PAGE_PROT_BITS;</div><div class='add'>+	return __pgprot(pte_val(pte) &amp; PAGE_PROT_BITS);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)</div><div class='hunk'>@@ -575,6 +592,10 @@ extern int flush_hash_pages(unsigned context, unsigned long va,</div><div class='ctx'> extern void add_hash_page(unsigned context, unsigned long va,</div><div class='ctx'> 			  unsigned long pmdval);</div><div class='ctx'> </div><div class='add'>+/* Flush an entry from the TLB/hash table */</div><div class='add'>+extern void flush_hash_entry(struct mm_struct *mm, pte_t *ptep,</div><div class='add'>+			     unsigned long address);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Atomic PTE updates.</div><div class='ctx'>  *</div><div class='hunk'>@@ -612,9 +633,6 @@ static inline unsigned long pte_update(pte_t *p,</div><div class='ctx'> 	return old;</div><div class='ctx'> }</div><div class='ctx'> #else /* CONFIG_PTE_64BIT */</div><div class='del'>-/* TODO: Change that to only modify the low word and move set_pte_at()</div><div class='del'>- * out of line</div><div class='del'>- */</div><div class='ctx'> static inline unsigned long long pte_update(pte_t *p,</div><div class='ctx'> 					    unsigned long clr,</div><div class='ctx'> 					    unsigned long set)</div><div class='hunk'>@@ -652,14 +670,36 @@ static inline unsigned long long pte_update(pte_t *p,</div><div class='ctx'>  * On machines which use an MMU hash table we avoid changing the</div><div class='ctx'>  * _PAGE_HASHPTE bit.</div><div class='ctx'>  */</div><div class='del'>-static inline void set_pte_at(struct mm_struct *mm, unsigned long addr,</div><div class='add'>+</div><div class='add'>+static inline void __set_pte_at(struct mm_struct *mm, unsigned long addr,</div><div class='ctx'> 			      pte_t *ptep, pte_t pte)</div><div class='ctx'> {</div><div class='del'>-#if _PAGE_HASHPTE != 0</div><div class='add'>+#if (_PAGE_HASHPTE != 0) &amp;&amp; defined(CONFIG_SMP) &amp;&amp; !defined(CONFIG_PTE_64BIT)</div><div class='ctx'> 	pte_update(ptep, ~_PAGE_HASHPTE, pte_val(pte) &amp; ~_PAGE_HASHPTE);</div><div class='add'>+#elif defined(CONFIG_PTE_64BIT) &amp;&amp; defined(CONFIG_SMP)</div><div class='add'>+#if _PAGE_HASHPTE != 0</div><div class='add'>+	if (pte_val(*ptep) &amp; _PAGE_HASHPTE)</div><div class='add'>+		flush_hash_entry(mm, ptep, addr);</div><div class='add'>+#endif</div><div class='add'>+	__asm__ __volatile__("\</div><div class='add'>+		stw%U0%X0 %2,%0\n\</div><div class='add'>+		eieio\n\</div><div class='add'>+		stw%U0%X0 %L2,%1"</div><div class='add'>+	: "=m" (*ptep), "=m" (*((unsigned char *)ptep+4))</div><div class='add'>+	: "r" (pte) : "memory");</div><div class='ctx'> #else</div><div class='del'>-	*ptep = pte;</div><div class='add'>+	*ptep = __pte((pte_val(*ptep) &amp; _PAGE_HASHPTE)</div><div class='add'>+		      | (pte_val(pte) &amp; ~_PAGE_HASHPTE));</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void set_pte_at(struct mm_struct *mm, unsigned long addr,</div><div class='add'>+			      pte_t *ptep, pte_t pte)</div><div class='add'>+{</div><div class='add'>+#if defined(CONFIG_PTE_64BIT) &amp;&amp; defined(CONFIG_SMP)</div><div class='add'>+	WARN_ON(pte_present(*ptep));</div><div class='ctx'> #endif</div><div class='add'>+	__set_pte_at(mm, addr, ptep, pte);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/powerpc/include/asm/pgtable-ppc64.h b/arch/powerpc/include/asm/pgtable-ppc64.h<br/>index 4597c491e9b5..4c0a8c62859d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/include/asm/pgtable-ppc64.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/include/asm/pgtable-ppc64.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/include/asm/pgtable-ppc64.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/include/asm/pgtable-ppc64.h</a></div><div class='hunk'>@@ -117,10 +117,10 @@</div><div class='ctx'> #define PAGE_AGP	__pgprot(_PAGE_BASE | _PAGE_WRENABLE | _PAGE_NO_CACHE)</div><div class='ctx'> #define HAVE_PAGE_AGP</div><div class='ctx'> </div><div class='del'>-#define PAGE_PROT_BITS	__pgprot(_PAGE_GUARDED | _PAGE_COHERENT | \</div><div class='del'>-				 _PAGE_NO_CACHE | _PAGE_WRITETHRU | \</div><div class='del'>-				 _PAGE_4K_PFN | _PAGE_RW | _PAGE_USER | \</div><div class='del'>- 				 _PAGE_ACCESSED | _PAGE_DIRTY | _PAGE_EXEC)</div><div class='add'>+#define PAGE_PROT_BITS	(_PAGE_GUARDED | _PAGE_COHERENT | \</div><div class='add'>+			 _PAGE_NO_CACHE | _PAGE_WRITETHRU |		\</div><div class='add'>+			 _PAGE_4K_PFN | _PAGE_RW | _PAGE_USER |		\</div><div class='add'>+			 _PAGE_ACCESSED | _PAGE_DIRTY | _PAGE_EXEC)</div><div class='ctx'> /* PTEIDX nibble */</div><div class='ctx'> #define _PTEIDX_SECONDARY	0x8</div><div class='ctx'> #define _PTEIDX_GROUP_IX	0x7</div><div class='hunk'>@@ -264,9 +264,9 @@ static inline pte_t pte_mkhuge(pte_t pte) {</div><div class='ctx'> 	return pte; }</div><div class='ctx'> static inline pte_t pte_mkspecial(pte_t pte) {</div><div class='ctx'> 	pte_val(pte) |= _PAGE_SPECIAL; return pte; }</div><div class='del'>-static inline unsigned long pte_pgprot(pte_t pte)</div><div class='add'>+static inline pgprot_t pte_pgprot(pte_t pte)</div><div class='ctx'> {</div><div class='del'>-	return __pgprot(pte_val(pte)) &amp; PAGE_PROT_BITS;</div><div class='add'>+	return __pgprot(pte_val(pte) &amp; PAGE_PROT_BITS);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Atomic PTE updates */</div><div class='head'>diff --git a/arch/powerpc/include/asm/ppc_asm.h b/arch/powerpc/include/asm/ppc_asm.h<br/>index 0966899d974b..c4a029ccb4d3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/include/asm/ppc_asm.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/include/asm/ppc_asm.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/include/asm/ppc_asm.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/include/asm/ppc_asm.h</a></div><div class='hunk'>@@ -268,7 +268,7 @@ n:</div><div class='ctx'>  *   Loads the value of the constant expression 'expr' into register 'rn'</div><div class='ctx'>  *   using immediate instructions only.  Use this when it's important not</div><div class='ctx'>  *   to reference other data (i.e. on ppc64 when the TOC pointer is not</div><div class='del'>- *   valid).</div><div class='add'>+ *   valid) and when 'expr' is a constant or absolute address.</div><div class='ctx'>  *</div><div class='ctx'>  * LOAD_REG_ADDR(rn, name)</div><div class='ctx'>  *   Loads the address of label 'name' into register 'rn'.  Use this when</div><div class='head'>diff --git a/arch/powerpc/include/asm/reg_booke.h b/arch/powerpc/include/asm/reg_booke.h<br/>index be980f4ee495..67453766bff1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/include/asm/reg_booke.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/include/asm/reg_booke.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/include/asm/reg_booke.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/include/asm/reg_booke.h</a></div><div class='hunk'>@@ -109,6 +109,7 @@</div><div class='ctx'> #define SPRN_EVPR	0x3D6	/* Exception Vector Prefix Register */</div><div class='ctx'> #define SPRN_L1CSR0	0x3F2	/* L1 Cache Control and Status Register 0 */</div><div class='ctx'> #define SPRN_L1CSR1	0x3F3	/* L1 Cache Control and Status Register 1 */</div><div class='add'>+#define SPRN_MMUCSR0	0x3F4	/* MMU Control and Status Register 0 */</div><div class='ctx'> #define SPRN_PIT	0x3DB	/* Programmable Interval Timer */</div><div class='ctx'> #define SPRN_BUCSR	0x3F5	/* Branch Unit Control and Status */</div><div class='ctx'> #define SPRN_L2CSR0	0x3F9	/* L2 Data Cache Control and Status Register 0 */</div><div class='hunk'>@@ -410,6 +411,12 @@</div><div class='ctx'> #define L2CSR0_L2LOA	0x00000080	/* L2 Cache Lock Overflow Allocate */</div><div class='ctx'> #define L2CSR0_L2LO	0x00000020	/* L2 Cache Lock Overflow */</div><div class='ctx'> </div><div class='add'>+/* Bit definitions for MMUCSR0 */</div><div class='add'>+#define MMUCSR0_TLB1FI	0x00000002	/* TLB1 Flash invalidate */</div><div class='add'>+#define MMUCSR0_TLB0FI	0x00000004	/* TLB0 Flash invalidate */</div><div class='add'>+#define MMUCSR0_TLB2FI	0x00000040	/* TLB2 Flash invalidate */</div><div class='add'>+#define MMUCSR0_TLB3FI	0x00000020	/* TLB3 Flash invalidate */</div><div class='add'>+</div><div class='ctx'> /* Bit definitions for SGR. */</div><div class='ctx'> #define SGR_NORMAL	0		/* Speculative fetching allowed. */</div><div class='ctx'> #define SGR_GUARDED	1		/* Speculative fetching disallowed. */</div><div class='head'>diff --git a/arch/powerpc/include/asm/sections.h b/arch/powerpc/include/asm/sections.h<br/>index 07956f3e7844..6fbce725c710 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/include/asm/sections.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/include/asm/sections.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/include/asm/sections.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/include/asm/sections.h</a></div><div class='hunk'>@@ -18,6 +18,12 @@ static inline int in_kernel_text(unsigned long addr)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int overlaps_kernel_text(unsigned long start, unsigned long end)</div><div class='add'>+{</div><div class='add'>+	return start &lt; (unsigned long)__init_end &amp;&amp;</div><div class='add'>+		(unsigned long)_stext &lt; end;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #undef dereference_function_descriptor</div><div class='ctx'> static inline void *dereference_function_descriptor(void *ptr)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/powerpc/math-emu/sfp-machine.h b/arch/powerpc/include/asm/sfp-machine.h<br/>index 4b17d83cfcdd..ced34f1dc8f8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/sfp-machine.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/math-emu/sfp-machine.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/include/asm/sfp-machine.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/include/asm/sfp-machine.h</a></div><div class='hunk'>@@ -79,27 +79,44 @@</div><div class='ctx'>  * #define _FP_DIV_MEAT_D(R,X,Y)   _FP_DIV_MEAT_2_udiv_64(D,R,X,Y)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define _FP_MUL_MEAT_S(R,X,Y)   _FP_MUL_MEAT_1_wide(S,R,X,Y,umul_ppmm)</div><div class='del'>-#define _FP_MUL_MEAT_D(R,X,Y)   _FP_MUL_MEAT_2_wide(D,R,X,Y,umul_ppmm)</div><div class='add'>+#define _FP_MUL_MEAT_S(R,X,Y)   _FP_MUL_MEAT_1_wide(_FP_WFRACBITS_S,R,X,Y,umul_ppmm)</div><div class='add'>+#define _FP_MUL_MEAT_D(R,X,Y)   _FP_MUL_MEAT_2_wide(_FP_WFRACBITS_D,R,X,Y,umul_ppmm)</div><div class='ctx'> </div><div class='del'>-#define _FP_DIV_MEAT_S(R,X,Y)   _FP_DIV_MEAT_1_udiv(S,R,X,Y)</div><div class='del'>-#define _FP_DIV_MEAT_D(R,X,Y)   _FP_DIV_MEAT_2_udiv_64(D,R,X,Y)</div><div class='add'>+#define _FP_DIV_MEAT_S(R,X,Y)	_FP_DIV_MEAT_1_udiv(S,R,X,Y)</div><div class='add'>+#define _FP_DIV_MEAT_D(R,X,Y)	_FP_DIV_MEAT_2_udiv(D,R,X,Y)</div><div class='ctx'> </div><div class='ctx'> /* These macros define what NaN looks like. They're supposed to expand to</div><div class='ctx'>  * a comma-separated set of 32bit unsigned ints that encode NaN.</div><div class='ctx'>  */</div><div class='del'>-#define _FP_NANFRAC_S		_FP_QNANBIT_S</div><div class='del'>-#define _FP_NANFRAC_D		_FP_QNANBIT_D, 0</div><div class='del'>-#define _FP_NANFRAC_Q           _FP_QNANBIT_Q, 0, 0, 0</div><div class='add'>+#define _FP_NANFRAC_S		((_FP_QNANBIT_S &lt;&lt; 1) - 1)</div><div class='add'>+#define _FP_NANFRAC_D		((_FP_QNANBIT_D &lt;&lt; 1) - 1), -1</div><div class='add'>+#define _FP_NANFRAC_Q		((_FP_QNANBIT_Q &lt;&lt; 1) - 1), -1, -1, -1</div><div class='add'>+#define _FP_NANSIGN_S		0</div><div class='add'>+#define _FP_NANSIGN_D		0</div><div class='add'>+#define _FP_NANSIGN_Q		0</div><div class='ctx'> </div><div class='ctx'> #define _FP_KEEPNANFRACP 1</div><div class='ctx'> </div><div class='add'>+/* Exception flags.  We use the bit positions of the appropriate bits</div><div class='add'>+   in the FPSCR, which also correspond to the FE_* bits.  This makes</div><div class='add'>+   everything easier ;-).  */</div><div class='add'>+#define FP_EX_INVALID         (1 &lt;&lt; (31 - 2))</div><div class='add'>+#define FP_EX_INVALID_SNAN	EFLAG_VXSNAN</div><div class='add'>+#define FP_EX_INVALID_ISI	EFLAG_VXISI</div><div class='add'>+#define FP_EX_INVALID_IDI	EFLAG_VXIDI</div><div class='add'>+#define FP_EX_INVALID_ZDZ	EFLAG_VXZDZ</div><div class='add'>+#define FP_EX_INVALID_IMZ	EFLAG_VXIMZ</div><div class='add'>+#define FP_EX_OVERFLOW        (1 &lt;&lt; (31 - 3))</div><div class='add'>+#define FP_EX_UNDERFLOW       (1 &lt;&lt; (31 - 4))</div><div class='add'>+#define FP_EX_DIVZERO         (1 &lt;&lt; (31 - 5))</div><div class='add'>+#define FP_EX_INEXACT         (1 &lt;&lt; (31 - 6))</div><div class='add'>+</div><div class='ctx'> /* This macro appears to be called when both X and Y are NaNs, and</div><div class='ctx'>  * has to choose one and copy it to R. i386 goes for the larger of the</div><div class='ctx'>  * two, sparc64 just picks Y. I don't understand this at all so I'll</div><div class='ctx'>  * go with sparc64 because it's shorter :-&gt;   -- PMM</div><div class='ctx'>  */</div><div class='del'>-#define _FP_CHOOSENAN(fs, wc, R, X, Y)			\</div><div class='add'>+#define _FP_CHOOSENAN(fs, wc, R, X, Y, OP)		\</div><div class='ctx'>   do {							\</div><div class='ctx'>     R##_s = Y##_s;					\</div><div class='ctx'>     _FP_FRAC_COPY_##wc(R,Y);				\</div><div class='hunk'>@@ -107,62 +124,6 @@</div><div class='ctx'>   } while (0)</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-extern void fp_unpack_d(long *, unsigned long *, unsigned long *,</div><div class='del'>-			long *, long *, void *);</div><div class='del'>-extern int  fp_pack_d(void *, long, unsigned long, unsigned long, long, long);</div><div class='del'>-extern int  fp_pack_ds(void *, long, unsigned long, unsigned long, long, long);</div><div class='del'>-</div><div class='del'>-#define __FP_UNPACK_RAW_1(fs, X, val)			\</div><div class='del'>-  do {							\</div><div class='del'>-    union _FP_UNION_##fs *_flo =			\</div><div class='del'>-    	(union _FP_UNION_##fs *)val;			\</div><div class='del'>-							\</div><div class='del'>-    X##_f = _flo-&gt;bits.frac;				\</div><div class='del'>-    X##_e = _flo-&gt;bits.exp;				\</div><div class='del'>-    X##_s = _flo-&gt;bits.sign;				\</div><div class='del'>-  } while (0)</div><div class='del'>-</div><div class='del'>-#define __FP_UNPACK_RAW_2(fs, X, val)			\</div><div class='del'>-  do {							\</div><div class='del'>-    union _FP_UNION_##fs *_flo =			\</div><div class='del'>-    	(union _FP_UNION_##fs *)val;			\</div><div class='del'>-							\</div><div class='del'>-    X##_f0 = _flo-&gt;bits.frac0;				\</div><div class='del'>-    X##_f1 = _flo-&gt;bits.frac1;				\</div><div class='del'>-    X##_e  = _flo-&gt;bits.exp;				\</div><div class='del'>-    X##_s  = _flo-&gt;bits.sign;				\</div><div class='del'>-  } while (0)</div><div class='del'>-</div><div class='del'>-#define __FP_UNPACK_S(X,val)		\</div><div class='del'>-  do {					\</div><div class='del'>-    __FP_UNPACK_RAW_1(S,X,val);		\</div><div class='del'>-    _FP_UNPACK_CANONICAL(S,1,X);	\</div><div class='del'>-  } while (0)</div><div class='del'>-</div><div class='del'>-#define __FP_UNPACK_D(X,val)		\</div><div class='del'>-	fp_unpack_d(&amp;X##_s, &amp;X##_f1, &amp;X##_f0, &amp;X##_e, &amp;X##_c, val)</div><div class='del'>-</div><div class='del'>-#define __FP_PACK_RAW_1(fs, val, X)			\</div><div class='del'>-  do {							\</div><div class='del'>-    union _FP_UNION_##fs *_flo =			\</div><div class='del'>-    	(union _FP_UNION_##fs *)val;			\</div><div class='del'>-							\</div><div class='del'>-    _flo-&gt;bits.frac = X##_f;				\</div><div class='del'>-    _flo-&gt;bits.exp  = X##_e;				\</div><div class='del'>-    _flo-&gt;bits.sign = X##_s;				\</div><div class='del'>-  } while (0)</div><div class='del'>-</div><div class='del'>-#define __FP_PACK_RAW_2(fs, val, X)			\</div><div class='del'>-  do {							\</div><div class='del'>-    union _FP_UNION_##fs *_flo =			\</div><div class='del'>-    	(union _FP_UNION_##fs *)val;			\</div><div class='del'>-							\</div><div class='del'>-    _flo-&gt;bits.frac0 = X##_f0;				\</div><div class='del'>-    _flo-&gt;bits.frac1 = X##_f1;				\</div><div class='del'>-    _flo-&gt;bits.exp   = X##_e;				\</div><div class='del'>-    _flo-&gt;bits.sign  = X##_s;				\</div><div class='del'>-  } while (0)</div><div class='del'>-</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -182,15 +143,30 @@ extern int  fp_pack_ds(void *, long, unsigned long, unsigned long, long, long);</div><div class='ctx'> #define __FP_PACK_S(val,X)			\</div><div class='ctx'> ({  int __exc = _FP_PACK_CANONICAL(S,1,X);	\</div><div class='ctx'>     if(!__exc || !__FPU_TRAP_P(__exc))		\</div><div class='del'>-        __FP_PACK_RAW_1(S,val,X);		\</div><div class='add'>+        _FP_PACK_RAW_1_P(S,val,X);		\</div><div class='ctx'>     __exc;					\</div><div class='ctx'> })</div><div class='ctx'> </div><div class='ctx'> #define __FP_PACK_D(val,X)			\</div><div class='del'>-	fp_pack_d(val, X##_s, X##_f1, X##_f0, X##_e, X##_c)</div><div class='del'>-</div><div class='del'>-#define __FP_PACK_DS(val,X)			\</div><div class='del'>-	fp_pack_ds(val, X##_s, X##_f1, X##_f0, X##_e, X##_c)</div><div class='add'>+   do {									\</div><div class='add'>+	_FP_PACK_CANONICAL(D, 2, X);					\</div><div class='add'>+	if (!FP_CUR_EXCEPTIONS || !__FPU_TRAP_P(FP_CUR_EXCEPTIONS))	\</div><div class='add'>+		_FP_PACK_RAW_2_P(D, val, X);				\</div><div class='add'>+   } while (0)</div><div class='add'>+</div><div class='add'>+#define __FP_PACK_DS(val,X)							\</div><div class='add'>+   do {										\</div><div class='add'>+	   FP_DECL_S(__X);							\</div><div class='add'>+	   FP_CONV(S, D, 1, 2, __X, X);						\</div><div class='add'>+	   _FP_PACK_CANONICAL(S, 1, __X);					\</div><div class='add'>+	   if (!FP_CUR_EXCEPTIONS || !__FPU_TRAP_P(FP_CUR_EXCEPTIONS)) {	\</div><div class='add'>+		   _FP_UNPACK_CANONICAL(S, 1, __X);				\</div><div class='add'>+		   FP_CONV(D, S, 2, 1, X, __X);					\</div><div class='add'>+		   _FP_PACK_CANONICAL(D, 2, X);					\</div><div class='add'>+		   if (!FP_CUR_EXCEPTIONS || !__FPU_TRAP_P(FP_CUR_EXCEPTIONS))	\</div><div class='add'>+		   _FP_PACK_RAW_2_P(D, val, X);					\</div><div class='add'>+	   }									\</div><div class='add'>+   } while (0)</div><div class='ctx'> </div><div class='ctx'> /* Obtain the current rounding mode. */</div><div class='ctx'> #define FP_ROUNDMODE			\</div><div class='head'>diff --git a/arch/powerpc/include/asm/siginfo.h b/arch/powerpc/include/asm/siginfo.h<br/>index 12f1bce037be..49495b0534ed 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/include/asm/siginfo.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/include/asm/siginfo.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/include/asm/siginfo.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/include/asm/siginfo.h</a></div><div class='hunk'>@@ -15,11 +15,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm-generic/siginfo.h&gt;</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * SIGTRAP si_codes</div><div class='del'>- */</div><div class='del'>-#define TRAP_BRANCH	(__SI_FAULT|3)	/* process taken branch trap */</div><div class='del'>-#define TRAP_HWBKPT	(__SI_FAULT|4)	/* hardware breakpoint or watchpoint */</div><div class='ctx'> #undef NSIGTRAP</div><div class='ctx'> #define NSIGTRAP	4</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/include/asm/smp.h b/arch/powerpc/include/asm/smp.h<br/>index 4d28e1e4521b..1866cec4f967 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/include/asm/smp.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/include/asm/smp.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/include/asm/smp.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/include/asm/smp.h</a></div><div class='hunk'>@@ -56,9 +56,16 @@ extern int smp_hw_index[];</div><div class='ctx'> </div><div class='ctx'> #define raw_smp_processor_id()	(current_thread_info()-&gt;cpu)</div><div class='ctx'> #define hard_smp_processor_id() 	(smp_hw_index[smp_processor_id()])</div><div class='del'>-#define get_hard_smp_processor_id(cpu)	(smp_hw_index[(cpu)])</div><div class='del'>-#define set_hard_smp_processor_id(cpu, phys)\</div><div class='del'>-					(smp_hw_index[(cpu)] = (phys))</div><div class='add'>+</div><div class='add'>+static inline int get_hard_smp_processor_id(int cpu)</div><div class='add'>+{</div><div class='add'>+	return smp_hw_index[cpu];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void set_hard_smp_processor_id(int cpu, int phys)</div><div class='add'>+{</div><div class='add'>+	smp_hw_index[cpu] = phys;</div><div class='add'>+}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> DECLARE_PER_CPU(cpumask_t, cpu_sibling_map);</div><div class='hunk'>@@ -86,15 +93,21 @@ extern void __cpu_die(unsigned int cpu);</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='ctx'> /* for UP */</div><div class='del'>-#define hard_smp_processor_id()		0</div><div class='add'>+#define hard_smp_processor_id()		get_hard_smp_processor_id(0)</div><div class='ctx'> #define smp_setup_cpu_maps()</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_SMP */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PPC64</div><div class='del'>-#define get_hard_smp_processor_id(CPU) (paca[(CPU)].hw_cpu_id)</div><div class='del'>-#define set_hard_smp_processor_id(CPU, VAL) \</div><div class='del'>-	do { (paca[(CPU)].hw_cpu_id = (VAL)); } while (0)</div><div class='add'>+static inline int get_hard_smp_processor_id(int cpu)</div><div class='add'>+{</div><div class='add'>+	return paca[cpu].hw_cpu_id;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void set_hard_smp_processor_id(int cpu, int phys)</div><div class='add'>+{</div><div class='add'>+	paca[cpu].hw_cpu_id = phys;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> extern void smp_release_cpus(void);</div><div class='ctx'> </div><div class='hunk'>@@ -102,10 +115,17 @@ extern void smp_release_cpus(void);</div><div class='ctx'> /* 32-bit */</div><div class='ctx'> #ifndef CONFIG_SMP</div><div class='ctx'> extern int boot_cpuid_phys;</div><div class='del'>-#define get_hard_smp_processor_id(cpu) 	boot_cpuid_phys</div><div class='del'>-#define set_hard_smp_processor_id(cpu, phys)</div><div class='del'>-#endif</div><div class='del'>-#endif</div><div class='add'>+static inline int get_hard_smp_processor_id(int cpu)</div><div class='add'>+{</div><div class='add'>+	return boot_cpuid_phys;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void set_hard_smp_processor_id(int cpu, int phys)</div><div class='add'>+{</div><div class='add'>+	boot_cpuid_phys = phys;</div><div class='add'>+}</div><div class='add'>+#endif /* !CONFIG_SMP */</div><div class='add'>+#endif /* !CONFIG_PPC64 */</div><div class='ctx'> </div><div class='ctx'> extern int smt_enabled_at_boot;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/include/asm/statfs.h b/arch/powerpc/include/asm/statfs.h<br/>index 67024026c10d..5244834583a4 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/include/asm/statfs.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/include/asm/statfs.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/include/asm/statfs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/include/asm/statfs.h</a></div><div class='hunk'>@@ -1,60 +1,6 @@</div><div class='ctx'> #ifndef _ASM_POWERPC_STATFS_H</div><div class='ctx'> #define _ASM_POWERPC_STATFS_H</div><div class='ctx'> </div><div class='del'>-/* For ppc32 we just use the generic definitions, not so simple on ppc64 */</div><div class='del'>-</div><div class='del'>-#ifndef __powerpc64__</div><div class='ctx'> #include &lt;asm-generic/statfs.h&gt;</div><div class='del'>-#else</div><div class='del'>-</div><div class='del'>-#ifndef __KERNEL_STRICT_NAMES</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-typedef __kernel_fsid_t	fsid_t;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * We're already 64-bit, so duplicate the definition</div><div class='del'>- */</div><div class='del'>-struct statfs {</div><div class='del'>-	long f_type;</div><div class='del'>-	long f_bsize;</div><div class='del'>-	long f_blocks;</div><div class='del'>-	long f_bfree;</div><div class='del'>-	long f_bavail;</div><div class='del'>-	long f_files;</div><div class='del'>-	long f_ffree;</div><div class='del'>-	__kernel_fsid_t f_fsid;</div><div class='del'>-	long f_namelen;</div><div class='del'>-	long f_frsize;</div><div class='del'>-	long f_spare[5];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct statfs64 {</div><div class='del'>-	long f_type;</div><div class='del'>-	long f_bsize;</div><div class='del'>-	long f_blocks;</div><div class='del'>-	long f_bfree;</div><div class='del'>-	long f_bavail;</div><div class='del'>-	long f_files;</div><div class='del'>-	long f_ffree;</div><div class='del'>-	__kernel_fsid_t f_fsid;</div><div class='del'>-	long f_namelen;</div><div class='del'>-	long f_frsize;</div><div class='del'>-	long f_spare[5];</div><div class='del'>-};</div><div class='ctx'> </div><div class='del'>-struct compat_statfs64 {</div><div class='del'>-	__u32 f_type;</div><div class='del'>-	__u32 f_bsize;</div><div class='del'>-	__u64 f_blocks;</div><div class='del'>-	__u64 f_bfree;</div><div class='del'>-	__u64 f_bavail;</div><div class='del'>-	__u64 f_files;</div><div class='del'>-	__u64 f_ffree;</div><div class='del'>-	__kernel_fsid_t f_fsid;</div><div class='del'>-	__u32 f_namelen;</div><div class='del'>-	__u32 f_frsize;</div><div class='del'>-	__u32 f_spare[5];</div><div class='del'>-};</div><div class='del'>-#endif /* ! __powerpc64__ */</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/powerpc/include/asm/systbl.h b/arch/powerpc/include/asm/systbl.h<br/>index f6cc7a43b4fa..803def236654 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/include/asm/systbl.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/include/asm/systbl.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/include/asm/systbl.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/include/asm/systbl.h</a></div><div class='hunk'>@@ -32,7 +32,7 @@ COMPAT_SYS_SPU(stime)</div><div class='ctx'> COMPAT_SYS(ptrace)</div><div class='ctx'> SYSCALL_SPU(alarm)</div><div class='ctx'> OLDSYS(fstat)</div><div class='del'>-COMPAT_SYS(pause)</div><div class='add'>+SYSCALL(pause)</div><div class='ctx'> COMPAT_SYS(utime)</div><div class='ctx'> SYSCALL(ni_syscall)</div><div class='ctx'> SYSCALL(ni_syscall)</div><div class='head'>diff --git a/arch/powerpc/include/asm/tlbflush.h b/arch/powerpc/include/asm/tlbflush.h<br/>index 361cd5c7a32b..a2c6bfd85fb7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/include/asm/tlbflush.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/include/asm/tlbflush.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/include/asm/tlbflush.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/include/asm/tlbflush.h</a></div><div class='hunk'>@@ -29,6 +29,9 @@</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> </div><div class='ctx'> extern void _tlbie(unsigned long address, unsigned int pid);</div><div class='add'>+extern void _tlbil_all(void);</div><div class='add'>+extern void _tlbil_pid(unsigned int pid);</div><div class='add'>+extern void _tlbil_va(unsigned long address, unsigned int pid);</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_40x) || defined(CONFIG_8xx)</div><div class='ctx'> #define _tlbia()	asm volatile ("tlbia; sync" : : : "memory")</div><div class='hunk'>@@ -38,31 +41,31 @@ extern void _tlbia(void);</div><div class='ctx'> </div><div class='ctx'> static inline void flush_tlb_mm(struct mm_struct *mm)</div><div class='ctx'> {</div><div class='del'>-	_tlbia();</div><div class='add'>+	_tlbil_pid(mm-&gt;context.id);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void flush_tlb_page(struct vm_area_struct *vma,</div><div class='ctx'> 				  unsigned long vmaddr)</div><div class='ctx'> {</div><div class='del'>-	_tlbie(vmaddr, vma ? vma-&gt;vm_mm-&gt;context.id : 0);</div><div class='add'>+	_tlbil_va(vmaddr, vma ? vma-&gt;vm_mm-&gt;context.id : 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void flush_tlb_page_nohash(struct vm_area_struct *vma,</div><div class='ctx'> 					 unsigned long vmaddr)</div><div class='ctx'> {</div><div class='del'>-	_tlbie(vmaddr, vma ? vma-&gt;vm_mm-&gt;context.id : 0);</div><div class='add'>+	flush_tlb_page(vma, vmaddr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void flush_tlb_range(struct vm_area_struct *vma,</div><div class='ctx'> 				   unsigned long start, unsigned long end)</div><div class='ctx'> {</div><div class='del'>-	_tlbia();</div><div class='add'>+	_tlbil_pid(vma-&gt;vm_mm-&gt;context.id);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void flush_tlb_kernel_range(unsigned long start,</div><div class='ctx'> 					  unsigned long end)</div><div class='ctx'> {</div><div class='del'>-	_tlbia();</div><div class='add'>+	_tlbil_pid(0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #elif defined(CONFIG_PPC32)</div><div class='head'>diff --git a/arch/powerpc/include/asm/types.h b/arch/powerpc/include/asm/types.h<br/>index d3374bc865ba..c004c13f291e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/include/asm/types.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/include/asm/types.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/include/asm/types.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/include/asm/types.h</a></div><div class='hunk'>@@ -48,14 +48,7 @@ typedef struct {</div><div class='ctx'> </div><div class='ctx'> typedef __vector128 vector128;</div><div class='ctx'> </div><div class='del'>-/* Physical address used by some IO functions */</div><div class='del'>-#if defined(CONFIG_PPC64) || defined(CONFIG_PHYS_64BIT)</div><div class='del'>-typedef u64 phys_addr_t;</div><div class='del'>-#else</div><div class='del'>-typedef u32 phys_addr_t;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef __powerpc64__</div><div class='add'>+#if defined(__powerpc64__) || defined(CONFIG_PHYS_64BIT)</div><div class='ctx'> typedef u64 dma_addr_t;</div><div class='ctx'> #else</div><div class='ctx'> typedef u32 dma_addr_t;</div><div class='head'>diff --git a/arch/powerpc/kernel/.gitignore b/arch/powerpc/kernel/.gitignore<br/>new file mode 100644<br/>index 000000000000..c5f676c3c224<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kernel/.gitignore?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kernel/.gitignore</a></div><div class='hunk'>@@ -0,0 +1 @@</div><div class='add'>+vmlinux.lds</div><div class='head'>diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile<br/>index 946daea780f1..fdb58253fa5b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kernel/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/kernel/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kernel/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kernel/Makefile</a></div><div class='hunk'>@@ -28,13 +28,14 @@ endif</div><div class='ctx'> obj-y				:= cputable.o ptrace.o syscalls.o \</div><div class='ctx'> 				   irq.o align.o signal_32.o pmc.o vdso.o \</div><div class='ctx'> 				   init_task.o process.o systbl.o idle.o \</div><div class='del'>-				   signal.o</div><div class='add'>+				   signal.o sysfs.o</div><div class='ctx'> obj-y				+= vdso32/</div><div class='ctx'> obj-$(CONFIG_PPC64)		+= setup_64.o sys_ppc32.o \</div><div class='ctx'> 				   signal_64.o ptrace32.o \</div><div class='ctx'> 				   paca.o cpu_setup_ppc970.o \</div><div class='ctx'> 				   cpu_setup_pa6t.o \</div><div class='del'>-				   firmware.o sysfs.o nvram_64.o</div><div class='add'>+				   firmware.o nvram_64.o</div><div class='add'>+obj64-$(CONFIG_RELOCATABLE)	+= reloc_64.o</div><div class='ctx'> obj-$(CONFIG_PPC64)		+= vdso64/</div><div class='ctx'> obj-$(CONFIG_ALTIVEC)		+= vecemu.o vector.o</div><div class='ctx'> obj-$(CONFIG_PPC_970_NAP)	+= idle_power4.o</div><div class='hunk'>@@ -69,10 +70,10 @@ extra-$(CONFIG_8xx)		:= head_8xx.o</div><div class='ctx'> extra-y				+= vmlinux.lds</div><div class='ctx'> </div><div class='ctx'> obj-y				+= time.o prom.o traps.o setup-common.o \</div><div class='del'>-				   udbg.o misc.o io.o \</div><div class='add'>+				   udbg.o misc.o io.o dma.o \</div><div class='ctx'> 				   misc_$(CONFIG_WORD_SIZE).o</div><div class='ctx'> obj-$(CONFIG_PPC32)		+= entry_32.o setup_32.o</div><div class='del'>-obj-$(CONFIG_PPC64)		+= dma_64.o iommu.o</div><div class='add'>+obj-$(CONFIG_PPC64)		+= dma-iommu.o iommu.o</div><div class='ctx'> obj-$(CONFIG_KGDB)		+= kgdb.o</div><div class='ctx'> obj-$(CONFIG_PPC_MULTIPLATFORM)	+= prom_init.o</div><div class='ctx'> obj-$(CONFIG_MODULES)		+= ppc_ksyms.o</div><div class='head'>diff --git a/arch/powerpc/kernel/asm-offsets.c b/arch/powerpc/kernel/asm-offsets.c<br/>index 92768d3006f7..75c5dd0138fd 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kernel/asm-offsets.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/kernel/asm-offsets.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kernel/asm-offsets.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kernel/asm-offsets.c</a></div><div class='hunk'>@@ -122,6 +122,8 @@ int main(void)</div><div class='ctx'> 	DEFINE(PACASTABRR, offsetof(struct paca_struct, stab_rr));</div><div class='ctx'> 	DEFINE(PACAR1, offsetof(struct paca_struct, saved_r1));</div><div class='ctx'> 	DEFINE(PACATOC, offsetof(struct paca_struct, kernel_toc));</div><div class='add'>+	DEFINE(PACAKBASE, offsetof(struct paca_struct, kernelbase));</div><div class='add'>+	DEFINE(PACAKMSR, offsetof(struct paca_struct, kernel_msr));</div><div class='ctx'> 	DEFINE(PACASOFTIRQEN, offsetof(struct paca_struct, soft_enabled));</div><div class='ctx'> 	DEFINE(PACAHARDIRQEN, offsetof(struct paca_struct, hard_enabled));</div><div class='ctx'> 	DEFINE(PACASLBCACHE, offsetof(struct paca_struct, slb_cache));</div><div class='hunk'>@@ -350,14 +352,15 @@ int main(void)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	DEFINE(PGD_TABLE_SIZE, PGD_TABLE_SIZE);</div><div class='add'>+	DEFINE(PTE_SIZE, sizeof(pte_t));</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_KVM</div><div class='ctx'> 	DEFINE(TLBE_BYTES, sizeof(struct tlbe));</div><div class='ctx'> </div><div class='ctx'> 	DEFINE(VCPU_HOST_STACK, offsetof(struct kvm_vcpu, arch.host_stack));</div><div class='ctx'> 	DEFINE(VCPU_HOST_PID, offsetof(struct kvm_vcpu, arch.host_pid));</div><div class='del'>-	DEFINE(VCPU_HOST_TLB, offsetof(struct kvm_vcpu, arch.host_tlb));</div><div class='ctx'> 	DEFINE(VCPU_SHADOW_TLB, offsetof(struct kvm_vcpu, arch.shadow_tlb));</div><div class='add'>+	DEFINE(VCPU_SHADOW_MOD, offsetof(struct kvm_vcpu, arch.shadow_tlb_mod));</div><div class='ctx'> 	DEFINE(VCPU_GPRS, offsetof(struct kvm_vcpu, arch.gpr));</div><div class='ctx'> 	DEFINE(VCPU_LR, offsetof(struct kvm_vcpu, arch.lr));</div><div class='ctx'> 	DEFINE(VCPU_CR, offsetof(struct kvm_vcpu, arch.cr));</div><div class='hunk'>@@ -369,7 +372,7 @@ int main(void)</div><div class='ctx'> 	DEFINE(VCPU_SPRG5, offsetof(struct kvm_vcpu, arch.sprg5));</div><div class='ctx'> 	DEFINE(VCPU_SPRG6, offsetof(struct kvm_vcpu, arch.sprg6));</div><div class='ctx'> 	DEFINE(VCPU_SPRG7, offsetof(struct kvm_vcpu, arch.sprg7));</div><div class='del'>-	DEFINE(VCPU_PID, offsetof(struct kvm_vcpu, arch.pid));</div><div class='add'>+	DEFINE(VCPU_SHADOW_PID, offsetof(struct kvm_vcpu, arch.shadow_pid));</div><div class='ctx'> </div><div class='ctx'> 	DEFINE(VCPU_LAST_INST, offsetof(struct kvm_vcpu, arch.last_inst));</div><div class='ctx'> 	DEFINE(VCPU_FAULT_DEAR, offsetof(struct kvm_vcpu, arch.fault_dear));</div><div class='head'>diff --git a/arch/powerpc/kernel/btext.c b/arch/powerpc/kernel/btext.c<br/>index d8f0329b1344..26e58630ed7b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kernel/btext.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/kernel/btext.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kernel/btext.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kernel/btext.c</a></div><div class='hunk'>@@ -442,28 +442,26 @@ void btext_drawtext(const char *c, unsigned int len)</div><div class='ctx'> </div><div class='ctx'> void btext_drawhex(unsigned long v)</div><div class='ctx'> {</div><div class='del'>-	char *hex_table = "0123456789abcdef";</div><div class='del'>-</div><div class='ctx'> 	if (!boot_text_mapped)</div><div class='ctx'> 		return;</div><div class='ctx'> #ifdef CONFIG_PPC64</div><div class='del'>-	btext_drawchar(hex_table[(v &gt;&gt; 60) &amp; 0x0000000FUL]);</div><div class='del'>-	btext_drawchar(hex_table[(v &gt;&gt; 56) &amp; 0x0000000FUL]);</div><div class='del'>-	btext_drawchar(hex_table[(v &gt;&gt; 52) &amp; 0x0000000FUL]);</div><div class='del'>-	btext_drawchar(hex_table[(v &gt;&gt; 48) &amp; 0x0000000FUL]);</div><div class='del'>-	btext_drawchar(hex_table[(v &gt;&gt; 44) &amp; 0x0000000FUL]);</div><div class='del'>-	btext_drawchar(hex_table[(v &gt;&gt; 40) &amp; 0x0000000FUL]);</div><div class='del'>-	btext_drawchar(hex_table[(v &gt;&gt; 36) &amp; 0x0000000FUL]);</div><div class='del'>-	btext_drawchar(hex_table[(v &gt;&gt; 32) &amp; 0x0000000FUL]);</div><div class='add'>+	btext_drawchar(hex_asc_hi(v &gt;&gt; 56));</div><div class='add'>+	btext_drawchar(hex_asc_lo(v &gt;&gt; 56));</div><div class='add'>+	btext_drawchar(hex_asc_hi(v &gt;&gt; 48));</div><div class='add'>+	btext_drawchar(hex_asc_lo(v &gt;&gt; 48));</div><div class='add'>+	btext_drawchar(hex_asc_hi(v &gt;&gt; 40));</div><div class='add'>+	btext_drawchar(hex_asc_lo(v &gt;&gt; 40));</div><div class='add'>+	btext_drawchar(hex_asc_hi(v &gt;&gt; 32));</div><div class='add'>+	btext_drawchar(hex_asc_lo(v &gt;&gt; 32));</div><div class='ctx'> #endif</div><div class='del'>-	btext_drawchar(hex_table[(v &gt;&gt; 28) &amp; 0x0000000FUL]);</div><div class='del'>-	btext_drawchar(hex_table[(v &gt;&gt; 24) &amp; 0x0000000FUL]);</div><div class='del'>-	btext_drawchar(hex_table[(v &gt;&gt; 20) &amp; 0x0000000FUL]);</div><div class='del'>-	btext_drawchar(hex_table[(v &gt;&gt; 16) &amp; 0x0000000FUL]);</div><div class='del'>-	btext_drawchar(hex_table[(v &gt;&gt; 12) &amp; 0x0000000FUL]);</div><div class='del'>-	btext_drawchar(hex_table[(v &gt;&gt;  8) &amp; 0x0000000FUL]);</div><div class='del'>-	btext_drawchar(hex_table[(v &gt;&gt;  4) &amp; 0x0000000FUL]);</div><div class='del'>-	btext_drawchar(hex_table[(v &gt;&gt;  0) &amp; 0x0000000FUL]);</div><div class='add'>+	btext_drawchar(hex_asc_hi(v &gt;&gt; 24));</div><div class='add'>+	btext_drawchar(hex_asc_lo(v &gt;&gt; 24));</div><div class='add'>+	btext_drawchar(hex_asc_hi(v &gt;&gt; 16));</div><div class='add'>+	btext_drawchar(hex_asc_lo(v &gt;&gt; 16));</div><div class='add'>+	btext_drawchar(hex_asc_hi(v &gt;&gt; 8));</div><div class='add'>+	btext_drawchar(hex_asc_lo(v &gt;&gt; 8));</div><div class='add'>+	btext_drawchar(hex_asc_hi(v));</div><div class='add'>+	btext_drawchar(hex_asc_lo(v));</div><div class='ctx'> 	btext_drawchar(' ');</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/kernel/cpu_setup_ppc970.S b/arch/powerpc/kernel/cpu_setup_ppc970.S<br/>index bf118c385752..27f2507279d8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kernel/cpu_setup_ppc970.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/kernel/cpu_setup_ppc970.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kernel/cpu_setup_ppc970.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kernel/cpu_setup_ppc970.S</a></div><div class='hunk'>@@ -110,7 +110,7 @@ load_hids:</div><div class='ctx'> 	isync</div><div class='ctx'> </div><div class='ctx'> 	/* Save away cpu state */</div><div class='del'>-	LOAD_REG_IMMEDIATE(r5,cpu_state_storage)</div><div class='add'>+	LOAD_REG_ADDR(r5,cpu_state_storage)</div><div class='ctx'> </div><div class='ctx'> 	/* Save HID0,1,4 and 5 */</div><div class='ctx'> 	mfspr	r3,SPRN_HID0</div><div class='hunk'>@@ -134,7 +134,7 @@ _GLOBAL(__restore_cpu_ppc970)</div><div class='ctx'> 	rldicl.	r0,r0,4,63</div><div class='ctx'> 	beqlr</div><div class='ctx'> </div><div class='del'>-	LOAD_REG_IMMEDIATE(r5,cpu_state_storage)</div><div class='add'>+	LOAD_REG_ADDR(r5,cpu_state_storage)</div><div class='ctx'> 	/* Before accessing memory, we make sure rm_ci is clear */</div><div class='ctx'> 	li	r0,0</div><div class='ctx'> 	mfspr	r3,SPRN_HID4</div><div class='head'>diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c<br/>index 25c273c761d1..e70d0483fb4e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kernel/cputable.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/kernel/cputable.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kernel/cputable.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kernel/cputable.c</a></div><div class='hunk'>@@ -610,6 +610,7 @@ static struct cpu_spec __initdata cpu_specs[] = {</div><div class='ctx'> 		.icache_bsize		= 32,</div><div class='ctx'> 		.dcache_bsize		= 32,</div><div class='ctx'> 		.num_pmcs		= 4,</div><div class='add'>+		.pmc_type		= PPC_PMC_IBM,</div><div class='ctx'> 		.cpu_setup		= __setup_cpu_750cx,</div><div class='ctx'> 		.machine_check		= machine_check_generic,</div><div class='ctx'> 		.platform		= "ppc750",</div><div class='hunk'>@@ -623,6 +624,7 @@ static struct cpu_spec __initdata cpu_specs[] = {</div><div class='ctx'> 		.icache_bsize		= 32,</div><div class='ctx'> 		.dcache_bsize		= 32,</div><div class='ctx'> 		.num_pmcs		= 4,</div><div class='add'>+		.pmc_type		= PPC_PMC_IBM,</div><div class='ctx'> 		.cpu_setup		= __setup_cpu_750cx,</div><div class='ctx'> 		.machine_check		= machine_check_generic,</div><div class='ctx'> 		.platform		= "ppc750",</div><div class='hunk'>@@ -636,6 +638,7 @@ static struct cpu_spec __initdata cpu_specs[] = {</div><div class='ctx'> 		.icache_bsize		= 32,</div><div class='ctx'> 		.dcache_bsize		= 32,</div><div class='ctx'> 		.num_pmcs		= 4,</div><div class='add'>+		.pmc_type		= PPC_PMC_IBM,</div><div class='ctx'> 		.cpu_setup		= __setup_cpu_750cx,</div><div class='ctx'> 		.machine_check		= machine_check_generic,</div><div class='ctx'> 		.platform		= "ppc750",</div><div class='hunk'>@@ -649,6 +652,7 @@ static struct cpu_spec __initdata cpu_specs[] = {</div><div class='ctx'> 		.icache_bsize		= 32,</div><div class='ctx'> 		.dcache_bsize		= 32,</div><div class='ctx'> 		.num_pmcs		= 4,</div><div class='add'>+		.pmc_type		= PPC_PMC_IBM,</div><div class='ctx'> 		.cpu_setup		= __setup_cpu_750,</div><div class='ctx'> 		.machine_check		= machine_check_generic,</div><div class='ctx'> 		.platform		= "ppc750",</div><div class='hunk'>@@ -662,6 +666,7 @@ static struct cpu_spec __initdata cpu_specs[] = {</div><div class='ctx'> 		.icache_bsize		= 32,</div><div class='ctx'> 		.dcache_bsize		= 32,</div><div class='ctx'> 		.num_pmcs		= 4,</div><div class='add'>+		.pmc_type		= PPC_PMC_IBM,</div><div class='ctx'> 		.cpu_setup		= __setup_cpu_750,</div><div class='ctx'> 		.machine_check		= machine_check_generic,</div><div class='ctx'> 		.platform		= "ppc750",</div><div class='hunk'>@@ -675,6 +680,7 @@ static struct cpu_spec __initdata cpu_specs[] = {</div><div class='ctx'> 		.icache_bsize		= 32,</div><div class='ctx'> 		.dcache_bsize		= 32,</div><div class='ctx'> 		.num_pmcs		= 4,</div><div class='add'>+		.pmc_type		= PPC_PMC_IBM,</div><div class='ctx'> 		.cpu_setup		= __setup_cpu_750,</div><div class='ctx'> 		.machine_check		= machine_check_generic,</div><div class='ctx'> 		.platform		= "ppc750",</div><div class='hunk'>@@ -688,6 +694,7 @@ static struct cpu_spec __initdata cpu_specs[] = {</div><div class='ctx'> 		.icache_bsize		= 32,</div><div class='ctx'> 		.dcache_bsize		= 32,</div><div class='ctx'> 		.num_pmcs		= 4,</div><div class='add'>+		.pmc_type		= PPC_PMC_IBM,</div><div class='ctx'> 		.cpu_setup		= __setup_cpu_750,</div><div class='ctx'> 		.machine_check		= machine_check_generic,</div><div class='ctx'> 		.platform		= "ppc750",</div><div class='hunk'>@@ -701,6 +708,7 @@ static struct cpu_spec __initdata cpu_specs[] = {</div><div class='ctx'> 		.icache_bsize		= 32,</div><div class='ctx'> 		.dcache_bsize		= 32,</div><div class='ctx'> 		.num_pmcs		= 4,</div><div class='add'>+		.pmc_type		= PPC_PMC_IBM,</div><div class='ctx'> 		.cpu_setup		= __setup_cpu_750fx,</div><div class='ctx'> 		.machine_check		= machine_check_generic,</div><div class='ctx'> 		.platform		= "ppc750",</div><div class='hunk'>@@ -714,6 +722,7 @@ static struct cpu_spec __initdata cpu_specs[] = {</div><div class='ctx'> 		.icache_bsize		= 32,</div><div class='ctx'> 		.dcache_bsize		= 32,</div><div class='ctx'> 		.num_pmcs		= 4,</div><div class='add'>+		.pmc_type		= PPC_PMC_IBM,</div><div class='ctx'> 		.cpu_setup		= __setup_cpu_750fx,</div><div class='ctx'> 		.machine_check		= machine_check_generic,</div><div class='ctx'> 		.platform		= "ppc750",</div><div class='hunk'>@@ -727,6 +736,7 @@ static struct cpu_spec __initdata cpu_specs[] = {</div><div class='ctx'> 		.icache_bsize		= 32,</div><div class='ctx'> 		.dcache_bsize		= 32,</div><div class='ctx'> 		.num_pmcs		= 4,</div><div class='add'>+		.pmc_type		= PPC_PMC_IBM,</div><div class='ctx'> 		.cpu_setup		= __setup_cpu_750,</div><div class='ctx'> 		.machine_check		= machine_check_generic,</div><div class='ctx'> 		.platform		= "ppc750",</div><div class='hunk'>@@ -741,6 +751,7 @@ static struct cpu_spec __initdata cpu_specs[] = {</div><div class='ctx'> 		.icache_bsize		= 32,</div><div class='ctx'> 		.dcache_bsize		= 32,</div><div class='ctx'> 		.num_pmcs		= 4,</div><div class='add'>+		.pmc_type		= PPC_PMC_G4,</div><div class='ctx'> 		.cpu_setup		= __setup_cpu_7400,</div><div class='ctx'> 		.machine_check		= machine_check_generic,</div><div class='ctx'> 		.platform		= "ppc7400",</div><div class='hunk'>@@ -755,6 +766,7 @@ static struct cpu_spec __initdata cpu_specs[] = {</div><div class='ctx'> 		.icache_bsize		= 32,</div><div class='ctx'> 		.dcache_bsize		= 32,</div><div class='ctx'> 		.num_pmcs		= 4,</div><div class='add'>+		.pmc_type		= PPC_PMC_G4,</div><div class='ctx'> 		.cpu_setup		= __setup_cpu_7400,</div><div class='ctx'> 		.machine_check		= machine_check_generic,</div><div class='ctx'> 		.platform		= "ppc7400",</div><div class='hunk'>@@ -769,6 +781,7 @@ static struct cpu_spec __initdata cpu_specs[] = {</div><div class='ctx'> 		.icache_bsize		= 32,</div><div class='ctx'> 		.dcache_bsize		= 32,</div><div class='ctx'> 		.num_pmcs		= 4,</div><div class='add'>+		.pmc_type		= PPC_PMC_G4,</div><div class='ctx'> 		.cpu_setup		= __setup_cpu_7410,</div><div class='ctx'> 		.machine_check		= machine_check_generic,</div><div class='ctx'> 		.platform		= "ppc7400",</div><div class='hunk'>@@ -783,6 +796,7 @@ static struct cpu_spec __initdata cpu_specs[] = {</div><div class='ctx'> 		.icache_bsize		= 32,</div><div class='ctx'> 		.dcache_bsize		= 32,</div><div class='ctx'> 		.num_pmcs		= 6,</div><div class='add'>+		.pmc_type		= PPC_PMC_G4,</div><div class='ctx'> 		.cpu_setup		= __setup_cpu_745x,</div><div class='ctx'> 		.oprofile_cpu_type      = "ppc/7450",</div><div class='ctx'> 		.oprofile_type		= PPC_OPROFILE_G4,</div><div class='hunk'>@@ -799,6 +813,7 @@ static struct cpu_spec __initdata cpu_specs[] = {</div><div class='ctx'> 		.icache_bsize		= 32,</div><div class='ctx'> 		.dcache_bsize		= 32,</div><div class='ctx'> 		.num_pmcs		= 6,</div><div class='add'>+		.pmc_type		= PPC_PMC_G4,</div><div class='ctx'> 		.cpu_setup		= __setup_cpu_745x,</div><div class='ctx'> 		.oprofile_cpu_type      = "ppc/7450",</div><div class='ctx'> 		.oprofile_type		= PPC_OPROFILE_G4,</div><div class='hunk'>@@ -815,6 +830,7 @@ static struct cpu_spec __initdata cpu_specs[] = {</div><div class='ctx'> 		.icache_bsize		= 32,</div><div class='ctx'> 		.dcache_bsize		= 32,</div><div class='ctx'> 		.num_pmcs		= 6,</div><div class='add'>+		.pmc_type		= PPC_PMC_G4,</div><div class='ctx'> 		.cpu_setup		= __setup_cpu_745x,</div><div class='ctx'> 		.oprofile_cpu_type      = "ppc/7450",</div><div class='ctx'> 		.oprofile_type		= PPC_OPROFILE_G4,</div><div class='hunk'>@@ -831,6 +847,7 @@ static struct cpu_spec __initdata cpu_specs[] = {</div><div class='ctx'> 		.icache_bsize		= 32,</div><div class='ctx'> 		.dcache_bsize		= 32,</div><div class='ctx'> 		.num_pmcs		= 6,</div><div class='add'>+		.pmc_type		= PPC_PMC_G4,</div><div class='ctx'> 		.cpu_setup		= __setup_cpu_745x,</div><div class='ctx'> 		.oprofile_cpu_type      = "ppc/7450",</div><div class='ctx'> 		.oprofile_type		= PPC_OPROFILE_G4,</div><div class='hunk'>@@ -847,6 +864,7 @@ static struct cpu_spec __initdata cpu_specs[] = {</div><div class='ctx'> 		.icache_bsize		= 32,</div><div class='ctx'> 		.dcache_bsize		= 32,</div><div class='ctx'> 		.num_pmcs		= 6,</div><div class='add'>+		.pmc_type		= PPC_PMC_G4,</div><div class='ctx'> 		.cpu_setup		= __setup_cpu_745x,</div><div class='ctx'> 		.oprofile_cpu_type      = "ppc/7450",</div><div class='ctx'> 		.oprofile_type		= PPC_OPROFILE_G4,</div><div class='hunk'>@@ -863,6 +881,7 @@ static struct cpu_spec __initdata cpu_specs[] = {</div><div class='ctx'> 		.icache_bsize		= 32,</div><div class='ctx'> 		.dcache_bsize		= 32,</div><div class='ctx'> 		.num_pmcs		= 6,</div><div class='add'>+		.pmc_type		= PPC_PMC_G4,</div><div class='ctx'> 		.cpu_setup		= __setup_cpu_745x,</div><div class='ctx'> 		.oprofile_cpu_type      = "ppc/7450",</div><div class='ctx'> 		.oprofile_type		= PPC_OPROFILE_G4,</div><div class='hunk'>@@ -879,6 +898,7 @@ static struct cpu_spec __initdata cpu_specs[] = {</div><div class='ctx'> 		.icache_bsize		= 32,</div><div class='ctx'> 		.dcache_bsize		= 32,</div><div class='ctx'> 		.num_pmcs		= 6,</div><div class='add'>+		.pmc_type		= PPC_PMC_G4,</div><div class='ctx'> 		.cpu_setup		= __setup_cpu_745x,</div><div class='ctx'> 		.oprofile_cpu_type      = "ppc/7450",</div><div class='ctx'> 		.oprofile_type		= PPC_OPROFILE_G4,</div><div class='hunk'>@@ -895,6 +915,7 @@ static struct cpu_spec __initdata cpu_specs[] = {</div><div class='ctx'> 		.icache_bsize		= 32,</div><div class='ctx'> 		.dcache_bsize		= 32,</div><div class='ctx'> 		.num_pmcs		= 6,</div><div class='add'>+		.pmc_type		= PPC_PMC_G4,</div><div class='ctx'> 		.cpu_setup		= __setup_cpu_745x,</div><div class='ctx'> 		.oprofile_cpu_type      = "ppc/7450",</div><div class='ctx'> 		.oprofile_type		= PPC_OPROFILE_G4,</div><div class='hunk'>@@ -910,6 +931,7 @@ static struct cpu_spec __initdata cpu_specs[] = {</div><div class='ctx'> 		.icache_bsize		= 32,</div><div class='ctx'> 		.dcache_bsize		= 32,</div><div class='ctx'> 		.num_pmcs		= 6,</div><div class='add'>+		.pmc_type		= PPC_PMC_G4,</div><div class='ctx'> 		.cpu_setup		= __setup_cpu_745x,</div><div class='ctx'> 		.oprofile_cpu_type      = "ppc/7450",</div><div class='ctx'> 		.oprofile_type		= PPC_OPROFILE_G4,</div><div class='hunk'>@@ -926,6 +948,7 @@ static struct cpu_spec __initdata cpu_specs[] = {</div><div class='ctx'> 		.icache_bsize		= 32,</div><div class='ctx'> 		.dcache_bsize		= 32,</div><div class='ctx'> 		.num_pmcs		= 6,</div><div class='add'>+		.pmc_type		= PPC_PMC_G4,</div><div class='ctx'> 		.cpu_setup		= __setup_cpu_745x,</div><div class='ctx'> 		.oprofile_cpu_type      = "ppc/7450",</div><div class='ctx'> 		.oprofile_type		= PPC_OPROFILE_G4,</div><div class='hunk'>@@ -942,6 +965,7 @@ static struct cpu_spec __initdata cpu_specs[] = {</div><div class='ctx'> 		.icache_bsize		= 32,</div><div class='ctx'> 		.dcache_bsize		= 32,</div><div class='ctx'> 		.num_pmcs		= 6,</div><div class='add'>+		.pmc_type		= PPC_PMC_G4,</div><div class='ctx'> 		.cpu_setup		= __setup_cpu_745x,</div><div class='ctx'> 		.oprofile_cpu_type      = "ppc/7450",</div><div class='ctx'> 		.oprofile_type		= PPC_OPROFILE_G4,</div><div class='head'>diff --git a/arch/powerpc/kernel/dma_64.c b/arch/powerpc/kernel/dma-iommu.c<br/>index ae5708e3a312..49248f89ce23 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kernel/dma_64.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/kernel/dma_64.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kernel/dma-iommu.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kernel/dma-iommu.c</a></div><div class='hunk'>@@ -2,14 +2,10 @@</div><div class='ctx'>  * Copyright (C) 2006 Benjamin Herrenschmidt, IBM Corporation</div><div class='ctx'>  *</div><div class='ctx'>  * Provide default implementations of the DMA mapping callbacks for</div><div class='del'>- * directly mapped busses and busses using the iommu infrastructure</div><div class='add'>+ * busses using the iommu infrastructure</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/device.h&gt;</div><div class='del'>-#include &lt;linux/dma-mapping.h&gt;</div><div class='del'>-#include &lt;asm/bug.h&gt;</div><div class='ctx'> #include &lt;asm/iommu.h&gt;</div><div class='del'>-#include &lt;asm/abs_addr.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Generic iommu implementation</div><div class='hunk'>@@ -24,7 +20,7 @@ static void *dma_iommu_alloc_coherent(struct device *dev, size_t size,</div><div class='ctx'> {</div><div class='ctx'> 	return iommu_alloc_coherent(dev, dev-&gt;archdata.dma_data, size,</div><div class='ctx'> 				    dma_handle, device_to_mask(dev), flag,</div><div class='del'>-				    dev-&gt;archdata.numa_node);</div><div class='add'>+				    dev_to_node(dev));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void dma_iommu_free_coherent(struct device *dev, size_t size,</div><div class='hunk'>@@ -105,96 +101,3 @@ struct dma_mapping_ops dma_iommu_ops = {</div><div class='ctx'> 	.dma_supported	= dma_iommu_dma_supported,</div><div class='ctx'> };</div><div class='ctx'> EXPORT_SYMBOL(dma_iommu_ops);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Generic direct DMA implementation</div><div class='del'>- *</div><div class='del'>- * This implementation supports a per-device offset that can be applied if</div><div class='del'>- * the address at which memory is visible to devices is not 0. Platform code</div><div class='del'>- * can set archdata.dma_data to an unsigned long holding the offset. By</div><div class='del'>- * default the offset is zero.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static unsigned long get_dma_direct_offset(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	return (unsigned long)dev-&gt;archdata.dma_data;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void *dma_direct_alloc_coherent(struct device *dev, size_t size,</div><div class='del'>-				       dma_addr_t *dma_handle, gfp_t flag)</div><div class='del'>-{</div><div class='del'>-	struct page *page;</div><div class='del'>-	void *ret;</div><div class='del'>-	int node = dev-&gt;archdata.numa_node;</div><div class='del'>-</div><div class='del'>-	page = alloc_pages_node(node, flag, get_order(size));</div><div class='del'>-	if (page == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-	ret = page_address(page);</div><div class='del'>-	memset(ret, 0, size);</div><div class='del'>-	*dma_handle = virt_to_abs(ret) + get_dma_direct_offset(dev);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dma_direct_free_coherent(struct device *dev, size_t size,</div><div class='del'>-				     void *vaddr, dma_addr_t dma_handle)</div><div class='del'>-{</div><div class='del'>-	free_pages((unsigned long)vaddr, get_order(size));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static dma_addr_t dma_direct_map_single(struct device *dev, void *ptr,</div><div class='del'>-					size_t size,</div><div class='del'>-					enum dma_data_direction direction,</div><div class='del'>-					struct dma_attrs *attrs)</div><div class='del'>-{</div><div class='del'>-	return virt_to_abs(ptr) + get_dma_direct_offset(dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dma_direct_unmap_single(struct device *dev, dma_addr_t dma_addr,</div><div class='del'>-				    size_t size,</div><div class='del'>-				    enum dma_data_direction direction,</div><div class='del'>-				    struct dma_attrs *attrs)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dma_direct_map_sg(struct device *dev, struct scatterlist *sgl,</div><div class='del'>-			     int nents, enum dma_data_direction direction,</div><div class='del'>-			     struct dma_attrs *attrs)</div><div class='del'>-{</div><div class='del'>-	struct scatterlist *sg;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for_each_sg(sgl, sg, nents, i) {</div><div class='del'>-		sg-&gt;dma_address = sg_phys(sg) + get_dma_direct_offset(dev);</div><div class='del'>-		sg-&gt;dma_length = sg-&gt;length;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return nents;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dma_direct_unmap_sg(struct device *dev, struct scatterlist *sg,</div><div class='del'>-				int nents, enum dma_data_direction direction,</div><div class='del'>-				struct dma_attrs *attrs)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dma_direct_dma_supported(struct device *dev, u64 mask)</div><div class='del'>-{</div><div class='del'>-	/* Could be improved to check for memory though it better be</div><div class='del'>-	 * done via some global so platforms can set the limit in case</div><div class='del'>-	 * they have limited DMA windows</div><div class='del'>-	 */</div><div class='del'>-	return mask &gt;= DMA_32BIT_MASK;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct dma_mapping_ops dma_direct_ops = {</div><div class='del'>-	.alloc_coherent	= dma_direct_alloc_coherent,</div><div class='del'>-	.free_coherent	= dma_direct_free_coherent,</div><div class='del'>-	.map_single	= dma_direct_map_single,</div><div class='del'>-	.unmap_single	= dma_direct_unmap_single,</div><div class='del'>-	.map_sg		= dma_direct_map_sg,</div><div class='del'>-	.unmap_sg	= dma_direct_unmap_sg,</div><div class='del'>-	.dma_supported	= dma_direct_dma_supported,</div><div class='del'>-};</div><div class='del'>-EXPORT_SYMBOL(dma_direct_ops);</div><div class='head'>diff --git a/arch/powerpc/kernel/dma.c b/arch/powerpc/kernel/dma.c<br/>new file mode 100644<br/>index 000000000000..1562daf8839a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kernel/dma.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kernel/dma.c</a></div><div class='hunk'>@@ -0,0 +1,131 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2006 Benjamin Herrenschmidt, IBM Corporation</div><div class='add'>+ *</div><div class='add'>+ * Provide default implementations of the DMA mapping callbacks for</div><div class='add'>+ * directly mapped busses.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;asm/bug.h&gt;</div><div class='add'>+#include &lt;asm/abs_addr.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Generic direct DMA implementation</div><div class='add'>+ *</div><div class='add'>+ * This implementation supports a per-device offset that can be applied if</div><div class='add'>+ * the address at which memory is visible to devices is not 0. Platform code</div><div class='add'>+ * can set archdata.dma_data to an unsigned long holding the offset. By</div><div class='add'>+ * default the offset is PCI_DRAM_OFFSET.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static unsigned long get_dma_direct_offset(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	if (dev)</div><div class='add'>+		return (unsigned long)dev-&gt;archdata.dma_data;</div><div class='add'>+</div><div class='add'>+	return PCI_DRAM_OFFSET;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void *dma_direct_alloc_coherent(struct device *dev, size_t size,</div><div class='add'>+				dma_addr_t *dma_handle, gfp_t flag)</div><div class='add'>+{</div><div class='add'>+	void *ret;</div><div class='add'>+#ifdef CONFIG_NOT_COHERENT_CACHE</div><div class='add'>+	ret = __dma_alloc_coherent(size, dma_handle, flag);</div><div class='add'>+	if (ret == NULL)</div><div class='add'>+		return NULL;</div><div class='add'>+	*dma_handle += get_dma_direct_offset(dev);</div><div class='add'>+	return ret;</div><div class='add'>+#else</div><div class='add'>+	struct page *page;</div><div class='add'>+	int node = dev_to_node(dev);</div><div class='add'>+</div><div class='add'>+	/* ignore region specifiers */</div><div class='add'>+	flag  &amp;= ~(__GFP_HIGHMEM);</div><div class='add'>+</div><div class='add'>+	page = alloc_pages_node(node, flag, get_order(size));</div><div class='add'>+	if (page == NULL)</div><div class='add'>+		return NULL;</div><div class='add'>+	ret = page_address(page);</div><div class='add'>+	memset(ret, 0, size);</div><div class='add'>+	*dma_handle = virt_to_abs(ret) + get_dma_direct_offset(dev);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void dma_direct_free_coherent(struct device *dev, size_t size,</div><div class='add'>+			      void *vaddr, dma_addr_t dma_handle)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_NOT_COHERENT_CACHE</div><div class='add'>+	__dma_free_coherent(size, vaddr);</div><div class='add'>+#else</div><div class='add'>+	free_pages((unsigned long)vaddr, get_order(size));</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dma_direct_map_sg(struct device *dev, struct scatterlist *sgl,</div><div class='add'>+			     int nents, enum dma_data_direction direction,</div><div class='add'>+			     struct dma_attrs *attrs)</div><div class='add'>+{</div><div class='add'>+	struct scatterlist *sg;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for_each_sg(sgl, sg, nents, i) {</div><div class='add'>+		sg-&gt;dma_address = sg_phys(sg) + get_dma_direct_offset(dev);</div><div class='add'>+		sg-&gt;dma_length = sg-&gt;length;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return nents;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dma_direct_unmap_sg(struct device *dev, struct scatterlist *sg,</div><div class='add'>+				int nents, enum dma_data_direction direction,</div><div class='add'>+				struct dma_attrs *attrs)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dma_direct_dma_supported(struct device *dev, u64 mask)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_PPC64</div><div class='add'>+	/* Could be improved to check for memory though it better be</div><div class='add'>+	 * done via some global so platforms can set the limit in case</div><div class='add'>+	 * they have limited DMA windows</div><div class='add'>+	 */</div><div class='add'>+	return mask &gt;= DMA_32BIT_MASK;</div><div class='add'>+#else</div><div class='add'>+	return 1;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline dma_addr_t dma_direct_map_page(struct device *dev,</div><div class='add'>+					     struct page *page,</div><div class='add'>+					     unsigned long offset,</div><div class='add'>+					     size_t size,</div><div class='add'>+					     enum dma_data_direction dir,</div><div class='add'>+					     struct dma_attrs *attrs)</div><div class='add'>+{</div><div class='add'>+	BUG_ON(dir == DMA_NONE);</div><div class='add'>+	__dma_sync_page(page, offset, size, dir);</div><div class='add'>+	return page_to_phys(page) + offset + get_dma_direct_offset(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void dma_direct_unmap_page(struct device *dev,</div><div class='add'>+					 dma_addr_t dma_address,</div><div class='add'>+					 size_t size,</div><div class='add'>+					 enum dma_data_direction direction,</div><div class='add'>+					 struct dma_attrs *attrs)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct dma_mapping_ops dma_direct_ops = {</div><div class='add'>+	.alloc_coherent	= dma_direct_alloc_coherent,</div><div class='add'>+	.free_coherent	= dma_direct_free_coherent,</div><div class='add'>+	.map_sg		= dma_direct_map_sg,</div><div class='add'>+	.unmap_sg	= dma_direct_unmap_sg,</div><div class='add'>+	.dma_supported	= dma_direct_dma_supported,</div><div class='add'>+	.map_page	= dma_direct_map_page,</div><div class='add'>+	.unmap_page	= dma_direct_unmap_page,</div><div class='add'>+};</div><div class='add'>+EXPORT_SYMBOL(dma_direct_ops);</div><div class='head'>diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S<br/>index 2d802e97097c..fd8b4bae9b04 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kernel/entry_64.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/kernel/entry_64.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kernel/entry_64.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kernel/entry_64.S</a></div><div class='hunk'>@@ -512,31 +512,12 @@ _GLOBAL(ret_from_except_lite)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> restore:</div><div class='del'>-	ld	r5,SOFTE(r1)</div><div class='del'>-#ifdef CONFIG_PPC_ISERIES</div><div class='ctx'> BEGIN_FW_FTR_SECTION</div><div class='del'>-	cmpdi	0,r5,0</div><div class='del'>-	beq	4f</div><div class='del'>-	/* Check for pending interrupts (iSeries) */</div><div class='del'>-	ld	r3,PACALPPACAPTR(r13)</div><div class='del'>-	ld	r3,LPPACAANYINT(r3)</div><div class='del'>-	cmpdi	r3,0</div><div class='del'>-	beq+	4f			/* skip do_IRQ if no interrupts */</div><div class='del'>-</div><div class='del'>-	li	r3,0</div><div class='del'>-	stb	r3,PACASOFTIRQEN(r13)	/* ensure we are soft-disabled */</div><div class='del'>-#ifdef CONFIG_TRACE_IRQFLAGS</div><div class='del'>-	bl	.trace_hardirqs_off</div><div class='del'>-	mfmsr	r10</div><div class='del'>-#endif</div><div class='del'>-	ori	r10,r10,MSR_EE</div><div class='del'>-	mtmsrd	r10			/* hard-enable again */</div><div class='del'>-	addi	r3,r1,STACK_FRAME_OVERHEAD</div><div class='del'>-	bl	.do_IRQ</div><div class='del'>-	b	.ret_from_except_lite		/* loop back and handle more */</div><div class='del'>-4:</div><div class='del'>-END_FW_FTR_SECTION_IFSET(FW_FEATURE_ISERIES)</div><div class='del'>-#endif</div><div class='add'>+	ld	r5,SOFTE(r1)</div><div class='add'>+FW_FTR_SECTION_ELSE</div><div class='add'>+	b	iseries_check_pending_irqs</div><div class='add'>+ALT_FW_FTR_SECTION_END_IFCLR(FW_FEATURE_ISERIES)</div><div class='add'>+2:</div><div class='ctx'> 	TRACE_AND_RESTORE_IRQ(r5);</div><div class='ctx'> </div><div class='ctx'> 	/* extract EE bit and use it to restore paca-&gt;hard_enabled */</div><div class='hunk'>@@ -592,6 +573,30 @@ END_FW_FTR_SECTION_IFSET(FW_FEATURE_ISERIES)</div><div class='ctx'> 	rfid</div><div class='ctx'> 	b	.	/* prevent speculative execution */</div><div class='ctx'> </div><div class='add'>+iseries_check_pending_irqs:</div><div class='add'>+#ifdef CONFIG_PPC_ISERIES</div><div class='add'>+	ld	r5,SOFTE(r1)</div><div class='add'>+	cmpdi	0,r5,0</div><div class='add'>+	beq	2b</div><div class='add'>+	/* Check for pending interrupts (iSeries) */</div><div class='add'>+	ld	r3,PACALPPACAPTR(r13)</div><div class='add'>+	ld	r3,LPPACAANYINT(r3)</div><div class='add'>+	cmpdi	r3,0</div><div class='add'>+	beq+	2b			/* skip do_IRQ if no interrupts */</div><div class='add'>+</div><div class='add'>+	li	r3,0</div><div class='add'>+	stb	r3,PACASOFTIRQEN(r13)	/* ensure we are soft-disabled */</div><div class='add'>+#ifdef CONFIG_TRACE_IRQFLAGS</div><div class='add'>+	bl	.trace_hardirqs_off</div><div class='add'>+	mfmsr	r10</div><div class='add'>+#endif</div><div class='add'>+	ori	r10,r10,MSR_EE</div><div class='add'>+	mtmsrd	r10			/* hard-enable again */</div><div class='add'>+	addi	r3,r1,STACK_FRAME_OVERHEAD</div><div class='add'>+	bl	.do_IRQ</div><div class='add'>+	b	.ret_from_except_lite		/* loop back and handle more */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> do_work:</div><div class='ctx'> #ifdef CONFIG_PREEMPT</div><div class='ctx'> 	andi.	r0,r3,MSR_PR	/* Returning to user mode? */</div><div class='hunk'>@@ -685,10 +690,6 @@ _GLOBAL(enter_rtas)</div><div class='ctx'> 	std	r7,_DAR(r1)</div><div class='ctx'> 	mfdsisr	r8</div><div class='ctx'> 	std	r8,_DSISR(r1)</div><div class='del'>-	mfsrr0	r9</div><div class='del'>-	std	r9,_SRR0(r1)</div><div class='del'>-	mfsrr1	r10</div><div class='del'>-	std	r10,_SRR1(r1)</div><div class='ctx'> </div><div class='ctx'> 	/* Temporary workaround to clear CR until RTAS can be modified to</div><div class='ctx'> 	 * ignore all bits.</div><div class='hunk'>@@ -749,6 +750,10 @@ _STATIC(rtas_return_loc)</div><div class='ctx'> 	mfspr	r4,SPRN_SPRG3	        /* Get PACA */</div><div class='ctx'> 	clrldi	r4,r4,2			/* convert to realmode address */</div><div class='ctx'> </div><div class='add'>+	bcl	20,31,$+4</div><div class='add'>+0:	mflr	r3</div><div class='add'>+	ld	r3,(1f-0b)(r3)		/* get &amp;.rtas_restore_regs */</div><div class='add'>+</div><div class='ctx'> 	mfmsr   r6</div><div class='ctx'> 	li	r0,MSR_RI</div><div class='ctx'> 	andc	r6,r6,r0</div><div class='hunk'>@@ -756,7 +761,6 @@ _STATIC(rtas_return_loc)</div><div class='ctx'> 	mtmsrd  r6</div><div class='ctx'>         </div><div class='ctx'>         ld	r1,PACAR1(r4)           /* Restore our SP */</div><div class='del'>-	LOAD_REG_IMMEDIATE(r3,.rtas_restore_regs)</div><div class='ctx'>         ld	r4,PACASAVEDMSR(r4)     /* Restore our MSR */</div><div class='ctx'> </div><div class='ctx'> 	mtspr	SPRN_SRR0,r3</div><div class='hunk'>@@ -764,6 +768,9 @@ _STATIC(rtas_return_loc)</div><div class='ctx'> 	rfid</div><div class='ctx'> 	b	.	/* prevent speculative execution */</div><div class='ctx'> </div><div class='add'>+	.align	3</div><div class='add'>+1:	.llong	.rtas_restore_regs</div><div class='add'>+</div><div class='ctx'> _STATIC(rtas_restore_regs)</div><div class='ctx'> 	/* relocation is on at this point */</div><div class='ctx'> 	REST_GPR(2, r1)			/* Restore the TOC */</div><div class='hunk'>@@ -783,10 +790,6 @@ _STATIC(rtas_restore_regs)</div><div class='ctx'> 	mtdar	r7</div><div class='ctx'> 	ld	r8,_DSISR(r1)</div><div class='ctx'> 	mtdsisr	r8</div><div class='del'>-	ld	r9,_SRR0(r1)</div><div class='del'>-	mtsrr0	r9</div><div class='del'>-	ld	r10,_SRR1(r1)</div><div class='del'>-	mtsrr1	r10</div><div class='ctx'> </div><div class='ctx'>         addi	r1,r1,RTAS_FRAME_SIZE	/* Unstack our frame */</div><div class='ctx'> 	ld	r0,16(r1)		/* get return address */</div><div class='head'>diff --git a/arch/powerpc/kernel/head_32.S b/arch/powerpc/kernel/head_32.S<br/>index 8bb657519299..0c326823c6d4 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kernel/head_32.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/kernel/head_32.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kernel/head_32.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kernel/head_32.S</a></div><div class='hunk'>@@ -110,6 +110,12 @@ __start:</div><div class='ctx'> #ifdef CONFIG_PPC_MULTIPLATFORM</div><div class='ctx'> 	cmpwi	0,r5,0</div><div class='ctx'> 	beq	1f</div><div class='add'>+</div><div class='add'>+	/* find out where we are now */</div><div class='add'>+	bcl	20,31,$+4</div><div class='add'>+0:	mflr	r8			/* r8 = runtime addr here */</div><div class='add'>+	addis	r8,r8,(_stext - 0b)@ha</div><div class='add'>+	addi	r8,r8,(_stext - 0b)@l	/* current runtime base addr */</div><div class='ctx'> 	bl	prom_init</div><div class='ctx'> 	trap</div><div class='ctx'> #endif</div><div class='hunk'>@@ -369,13 +375,13 @@ i##n:								\</div><div class='ctx'> DataAccess:</div><div class='ctx'> 	EXCEPTION_PROLOG</div><div class='ctx'> 	mfspr	r10,SPRN_DSISR</div><div class='add'>+	stw	r10,_DSISR(r11)</div><div class='ctx'> 	andis.	r0,r10,0xa470		/* weird error? */</div><div class='ctx'> 	bne	1f			/* if not, try to put a PTE */</div><div class='ctx'> 	mfspr	r4,SPRN_DAR		/* into the hash table */</div><div class='ctx'> 	rlwinm	r3,r10,32-15,21,21	/* DSISR_STORE -&gt; _PAGE_RW */</div><div class='ctx'> 	bl	hash_page</div><div class='del'>-1:	stw	r10,_DSISR(r11)</div><div class='del'>-	mr	r5,r10</div><div class='add'>+1:	lwz	r5,_DSISR(r11)		/* get DSISR value */</div><div class='ctx'> 	mfspr	r4,SPRN_DAR</div><div class='ctx'> 	EXC_XFER_EE_LITE(0x300, handle_page_fault)</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/kernel/head_64.S b/arch/powerpc/kernel/head_64.S<br/>index cc8fb474d520..84856bee33a5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kernel/head_64.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/kernel/head_64.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kernel/head_64.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kernel/head_64.S</a></div><div class='hunk'>@@ -82,7 +82,11 @@ END_FTR_SECTION(0, 1)</div><div class='ctx'> 	/* Catch branch to 0 in real mode */</div><div class='ctx'> 	trap</div><div class='ctx'> </div><div class='del'>-	/* Secondary processors spin on this value until it goes to 1. */</div><div class='add'>+	/* Secondary processors spin on this value until it becomes nonzero.</div><div class='add'>+	 * When it does it contains the real address of the descriptor</div><div class='add'>+	 * of the function that the cpu should jump to to continue</div><div class='add'>+	 * initialization.</div><div class='add'>+	 */</div><div class='ctx'> 	.globl  __secondary_hold_spinloop</div><div class='ctx'> __secondary_hold_spinloop:</div><div class='ctx'> 	.llong	0x0</div><div class='hunk'>@@ -109,8 +113,11 @@ __secondary_hold_acknowledge:</div><div class='ctx'>  * before the bulk of the kernel has been relocated.  This code</div><div class='ctx'>  * is relocated to physical address 0x60 before prom_init is run.</div><div class='ctx'>  * All of it must fit below the first exception vector at 0x100.</div><div class='add'>+ * Use .globl here not _GLOBAL because we want __secondary_hold</div><div class='add'>+ * to be the actual text address, not a descriptor.</div><div class='ctx'>  */</div><div class='del'>-_GLOBAL(__secondary_hold)</div><div class='add'>+	.globl	__secondary_hold</div><div class='add'>+__secondary_hold:</div><div class='ctx'> 	mfmsr	r24</div><div class='ctx'> 	ori	r24,r24,MSR_RI</div><div class='ctx'> 	mtmsrd	r24			/* RI on */</div><div class='hunk'>@@ -121,16 +128,16 @@ _GLOBAL(__secondary_hold)</div><div class='ctx'> 	/* Tell the master cpu we're here */</div><div class='ctx'> 	/* Relocation is off &amp; we are located at an address less */</div><div class='ctx'> 	/* than 0x100, so only need to grab low order offset.    */</div><div class='del'>-	std	r24,__secondary_hold_acknowledge@l(0)</div><div class='add'>+	std	r24,__secondary_hold_acknowledge-_stext(0)</div><div class='ctx'> 	sync</div><div class='ctx'> </div><div class='ctx'> 	/* All secondary cpus wait here until told to start. */</div><div class='del'>-100:	ld	r4,__secondary_hold_spinloop@l(0)</div><div class='del'>-	cmpdi	0,r4,1</div><div class='del'>-	bne	100b</div><div class='add'>+100:	ld	r4,__secondary_hold_spinloop-_stext(0)</div><div class='add'>+	cmpdi	0,r4,0</div><div class='add'>+	beq	100b</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_SMP) || defined(CONFIG_KEXEC)</div><div class='del'>-	LOAD_REG_IMMEDIATE(r4, .generic_secondary_smp_init)</div><div class='add'>+	ld	r4,0(r4)		/* deref function descriptor */</div><div class='ctx'> 	mtctr	r4</div><div class='ctx'> 	mr	r3,r24</div><div class='ctx'> 	bctr</div><div class='hunk'>@@ -147,6 +154,10 @@ exception_marker:</div><div class='ctx'> /*</div><div class='ctx'>  * This is the start of the interrupt handlers for pSeries</div><div class='ctx'>  * This code runs with relocation off.</div><div class='add'>+ * Code from here to __end_interrupts gets copied down to real</div><div class='add'>+ * address 0x100 when we are running a relocatable kernel.</div><div class='add'>+ * Therefore any relative branches in this section must only</div><div class='add'>+ * branch to labels in this section.</div><div class='ctx'>  */</div><div class='ctx'> 	. = 0x100</div><div class='ctx'> 	.globl __start_interrupts</div><div class='hunk'>@@ -200,7 +211,20 @@ data_access_slb_pSeries:</div><div class='ctx'> 	mfspr	r10,SPRN_SPRG1</div><div class='ctx'> 	std	r10,PACA_EXSLB+EX_R13(r13)</div><div class='ctx'> 	mfspr	r12,SPRN_SRR1		/* and SRR1 */</div><div class='del'>-	b	.slb_miss_realmode	/* Rel. branch works in real mode */</div><div class='add'>+#ifndef CONFIG_RELOCATABLE</div><div class='add'>+	b	.slb_miss_realmode</div><div class='add'>+#else</div><div class='add'>+	/*</div><div class='add'>+	 * We can't just use a direct branch to .slb_miss_realmode</div><div class='add'>+	 * because the distance from here to there depends on where</div><div class='add'>+	 * the kernel ends up being put.</div><div class='add'>+	 */</div><div class='add'>+	mfctr	r11</div><div class='add'>+	ld	r10,PACAKBASE(r13)</div><div class='add'>+	LOAD_HANDLER(r10, .slb_miss_realmode)</div><div class='add'>+	mtctr	r10</div><div class='add'>+	bctr</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	STD_EXCEPTION_PSERIES(0x400, instruction_access)</div><div class='ctx'> </div><div class='hunk'>@@ -225,7 +249,15 @@ instruction_access_slb_pSeries:</div><div class='ctx'> 	mfspr	r10,SPRN_SPRG1</div><div class='ctx'> 	std	r10,PACA_EXSLB+EX_R13(r13)</div><div class='ctx'> 	mfspr	r12,SPRN_SRR1		/* and SRR1 */</div><div class='del'>-	b	.slb_miss_realmode	/* Rel. branch works in real mode */</div><div class='add'>+#ifndef CONFIG_RELOCATABLE</div><div class='add'>+	b	.slb_miss_realmode</div><div class='add'>+#else</div><div class='add'>+	mfctr	r11</div><div class='add'>+	ld	r10,PACAKBASE(r13)</div><div class='add'>+	LOAD_HANDLER(r10, .slb_miss_realmode)</div><div class='add'>+	mtctr	r10</div><div class='add'>+	bctr</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	MASKABLE_EXCEPTION_PSERIES(0x500, hardware_interrupt)</div><div class='ctx'> 	STD_EXCEPTION_PSERIES(0x600, alignment)</div><div class='hunk'>@@ -244,14 +276,12 @@ BEGIN_FTR_SECTION</div><div class='ctx'> 	beq-	1f</div><div class='ctx'> END_FTR_SECTION_IFSET(CPU_FTR_REAL_LE)</div><div class='ctx'> 	mr	r9,r13</div><div class='del'>-	mfmsr	r10</div><div class='ctx'> 	mfspr	r13,SPRN_SPRG3</div><div class='ctx'> 	mfspr	r11,SPRN_SRR0</div><div class='del'>-	clrrdi	r12,r13,32</div><div class='del'>-	oris	r12,r12,system_call_common@h</div><div class='del'>-	ori	r12,r12,system_call_common@l</div><div class='add'>+	ld	r12,PACAKBASE(r13)</div><div class='add'>+	ld	r10,PACAKMSR(r13)</div><div class='add'>+	LOAD_HANDLER(r12, system_call_entry)</div><div class='ctx'> 	mtspr	SPRN_SRR0,r12</div><div class='del'>-	ori	r10,r10,MSR_IR|MSR_DR|MSR_RI</div><div class='ctx'> 	mfspr	r12,SPRN_SRR1</div><div class='ctx'> 	mtspr	SPRN_SRR1,r10</div><div class='ctx'> 	rfid</div><div class='hunk'>@@ -325,16 +355,32 @@ do_stab_bolted_pSeries:</div><div class='ctx'> 	mfspr	r12,SPRN_SPRG2</div><div class='ctx'> 	EXCEPTION_PROLOG_PSERIES(PACA_EXSLB, .do_stab_bolted)</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PPC_PSERIES</div><div class='add'>+/*</div><div class='add'>+ * Vectors for the FWNMI option.  Share common code.</div><div class='add'>+ */</div><div class='add'>+	.globl system_reset_fwnmi</div><div class='add'>+      .align 7</div><div class='add'>+system_reset_fwnmi:</div><div class='add'>+	HMT_MEDIUM</div><div class='add'>+	mtspr	SPRN_SPRG1,r13		/* save r13 */</div><div class='add'>+	EXCEPTION_PROLOG_PSERIES(PACA_EXGEN, system_reset_common)</div><div class='add'>+</div><div class='add'>+	.globl machine_check_fwnmi</div><div class='add'>+      .align 7</div><div class='add'>+machine_check_fwnmi:</div><div class='add'>+	HMT_MEDIUM</div><div class='add'>+	mtspr	SPRN_SPRG1,r13		/* save r13 */</div><div class='add'>+	EXCEPTION_PROLOG_PSERIES(PACA_EXMC, machine_check_common)</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_PPC_PSERIES */</div><div class='add'>+</div><div class='add'>+#ifdef __DISABLED__</div><div class='ctx'> /*</div><div class='del'>- * We have some room here  we use that to put</div><div class='del'>- * the peries slb miss user trampoline code so it's reasonably</div><div class='del'>- * away from slb_miss_user_common to avoid problems with rfid</div><div class='del'>- *</div><div class='ctx'>  * This is used for when the SLB miss handler has to go virtual,</div><div class='ctx'>  * which doesn't happen for now anymore but will once we re-implement</div><div class='ctx'>  * dynamic VSIDs for shared page tables</div><div class='ctx'>  */</div><div class='del'>-#ifdef __DISABLED__</div><div class='ctx'> slb_miss_user_pseries:</div><div class='ctx'> 	std	r10,PACA_EXGEN+EX_R10(r13)</div><div class='ctx'> 	std	r11,PACA_EXGEN+EX_R11(r13)</div><div class='hunk'>@@ -357,25 +403,17 @@ slb_miss_user_pseries:</div><div class='ctx'> 	b	.				/* prevent spec. execution */</div><div class='ctx'> #endif /* __DISABLED__ */</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PPC_PSERIES</div><div class='add'>+	.align	7</div><div class='add'>+	.globl	__end_interrupts</div><div class='add'>+__end_interrupts:</div><div class='add'>+</div><div class='ctx'> /*</div><div class='del'>- * Vectors for the FWNMI option.  Share common code.</div><div class='add'>+ * Code from here down to __end_handlers is invoked from the</div><div class='add'>+ * exception prologs above.  Because the prologs assemble the</div><div class='add'>+ * addresses of these handlers using the LOAD_HANDLER macro,</div><div class='add'>+ * which uses an addi instruction, these handlers must be in</div><div class='add'>+ * the first 32k of the kernel image.</div><div class='ctx'>  */</div><div class='del'>-	.globl system_reset_fwnmi</div><div class='del'>-      .align 7</div><div class='del'>-system_reset_fwnmi:</div><div class='del'>-	HMT_MEDIUM</div><div class='del'>-	mtspr	SPRN_SPRG1,r13		/* save r13 */</div><div class='del'>-	EXCEPTION_PROLOG_PSERIES_FORCE_64BIT(PACA_EXGEN, system_reset_common)</div><div class='del'>-</div><div class='del'>-	.globl machine_check_fwnmi</div><div class='del'>-      .align 7</div><div class='del'>-machine_check_fwnmi:</div><div class='del'>-	HMT_MEDIUM</div><div class='del'>-	mtspr	SPRN_SPRG1,r13		/* save r13 */</div><div class='del'>-	EXCEPTION_PROLOG_PSERIES_FORCE_64BIT(PACA_EXMC, machine_check_common)</div><div class='del'>-</div><div class='del'>-#endif /* CONFIG_PPC_PSERIES */</div><div class='ctx'> </div><div class='ctx'> /*** Common interrupt handlers ***/</div><div class='ctx'> </div><div class='hunk'>@@ -414,6 +452,10 @@ machine_check_common:</div><div class='ctx'> 	STD_EXCEPTION_COMMON(0x1800, cbe_thermal, .cbe_thermal_exception)</div><div class='ctx'> #endif /* CONFIG_CBE_RAS */</div><div class='ctx'> </div><div class='add'>+	.align	7</div><div class='add'>+system_call_entry:</div><div class='add'>+	b	system_call_common</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Here we have detected that the kernel stack pointer is bad.</div><div class='ctx'>  * R9 contains the saved CR, r13 points to the paca,</div><div class='hunk'>@@ -457,65 +499,6 @@ bad_stack:</div><div class='ctx'> 	b	1b</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Return from an exception with minimal checks.</div><div class='del'>- * The caller is assumed to have done EXCEPTION_PROLOG_COMMON.</div><div class='del'>- * If interrupts have been enabled, or anything has been</div><div class='del'>- * done that might have changed the scheduling status of</div><div class='del'>- * any task or sent any task a signal, you should use</div><div class='del'>- * ret_from_except or ret_from_except_lite instead of this.</div><div class='del'>- */</div><div class='del'>-fast_exc_return_irq:			/* restores irq state too */</div><div class='del'>-	ld	r3,SOFTE(r1)</div><div class='del'>-	TRACE_AND_RESTORE_IRQ(r3);</div><div class='del'>-	ld	r12,_MSR(r1)</div><div class='del'>-	rldicl	r4,r12,49,63		/* get MSR_EE to LSB */</div><div class='del'>-	stb	r4,PACAHARDIRQEN(r13)	/* restore paca-&gt;hard_enabled */</div><div class='del'>-	b	1f</div><div class='del'>-</div><div class='del'>-	.globl	fast_exception_return</div><div class='del'>-fast_exception_return:</div><div class='del'>-	ld	r12,_MSR(r1)</div><div class='del'>-1:	ld	r11,_NIP(r1)</div><div class='del'>-	andi.	r3,r12,MSR_RI		/* check if RI is set */</div><div class='del'>-	beq-	unrecov_fer</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_VIRT_CPU_ACCOUNTING</div><div class='del'>-	andi.	r3,r12,MSR_PR</div><div class='del'>-	beq	2f</div><div class='del'>-	ACCOUNT_CPU_USER_EXIT(r3, r4)</div><div class='del'>-2:</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	ld	r3,_CCR(r1)</div><div class='del'>-	ld	r4,_LINK(r1)</div><div class='del'>-	ld	r5,_CTR(r1)</div><div class='del'>-	ld	r6,_XER(r1)</div><div class='del'>-	mtcr	r3</div><div class='del'>-	mtlr	r4</div><div class='del'>-	mtctr	r5</div><div class='del'>-	mtxer	r6</div><div class='del'>-	REST_GPR(0, r1)</div><div class='del'>-	REST_8GPRS(2, r1)</div><div class='del'>-</div><div class='del'>-	mfmsr	r10</div><div class='del'>-	rldicl	r10,r10,48,1		/* clear EE */</div><div class='del'>-	rldicr	r10,r10,16,61		/* clear RI (LE is 0 already) */</div><div class='del'>-	mtmsrd	r10,1</div><div class='del'>-</div><div class='del'>-	mtspr	SPRN_SRR1,r12</div><div class='del'>-	mtspr	SPRN_SRR0,r11</div><div class='del'>-	REST_4GPRS(10, r1)</div><div class='del'>-	ld	r1,GPR1(r1)</div><div class='del'>-	rfid</div><div class='del'>-	b	.	/* prevent speculative execution */</div><div class='del'>-</div><div class='del'>-unrecov_fer:</div><div class='del'>-	bl	.save_nvgprs</div><div class='del'>-1:	addi	r3,r1,STACK_FRAME_OVERHEAD</div><div class='del'>-	bl	.unrecoverable_exception</div><div class='del'>-	b	1b</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * Here r13 points to the paca, r9 contains the saved CR,</div><div class='ctx'>  * SRR0 and SRR1 are saved in r11 and r12,</div><div class='ctx'>  * r9 - r13 are saved in paca-&gt;exgen.</div><div class='hunk'>@@ -616,6 +599,9 @@ unrecov_user_slb:</div><div class='ctx'>  */</div><div class='ctx'> _GLOBAL(slb_miss_realmode)</div><div class='ctx'> 	mflr	r10</div><div class='add'>+#ifdef CONFIG_RELOCATABLE</div><div class='add'>+	mtctr	r11</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	stw	r9,PACA_EXSLB+EX_CCR(r13)	/* save CR in exc. frame */</div><div class='ctx'> 	std	r10,PACA_EXSLB+EX_LR(r13)	/* save LR */</div><div class='hunk'>@@ -666,11 +652,10 @@ BEGIN_FW_FTR_SECTION</div><div class='ctx'> END_FW_FTR_SECTION_IFSET(FW_FEATURE_ISERIES)</div><div class='ctx'> #endif /* CONFIG_PPC_ISERIES */</div><div class='ctx'> 	mfspr	r11,SPRN_SRR0</div><div class='del'>-	clrrdi	r10,r13,32</div><div class='add'>+	ld	r10,PACAKBASE(r13)</div><div class='ctx'> 	LOAD_HANDLER(r10,unrecov_slb)</div><div class='ctx'> 	mtspr	SPRN_SRR0,r10</div><div class='del'>-	mfmsr	r10</div><div class='del'>-	ori	r10,r10,MSR_IR|MSR_DR|MSR_RI</div><div class='add'>+	ld	r10,PACAKMSR(r13)</div><div class='ctx'> 	mtspr	SPRN_SRR1,r10</div><div class='ctx'> 	rfid</div><div class='ctx'> 	b	.</div><div class='hunk'>@@ -766,6 +751,85 @@ END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC)</div><div class='ctx'> 	bl	.altivec_unavailable_exception</div><div class='ctx'> 	b	.ret_from_except</div><div class='ctx'> </div><div class='add'>+	.align	7</div><div class='add'>+	.globl vsx_unavailable_common</div><div class='add'>+vsx_unavailable_common:</div><div class='add'>+	EXCEPTION_PROLOG_COMMON(0xf40, PACA_EXGEN)</div><div class='add'>+#ifdef CONFIG_VSX</div><div class='add'>+BEGIN_FTR_SECTION</div><div class='add'>+	bne	.load_up_vsx</div><div class='add'>+1:</div><div class='add'>+END_FTR_SECTION_IFSET(CPU_FTR_VSX)</div><div class='add'>+#endif</div><div class='add'>+	bl	.save_nvgprs</div><div class='add'>+	addi	r3,r1,STACK_FRAME_OVERHEAD</div><div class='add'>+	ENABLE_INTS</div><div class='add'>+	bl	.vsx_unavailable_exception</div><div class='add'>+	b	.ret_from_except</div><div class='add'>+</div><div class='add'>+	.align	7</div><div class='add'>+	.globl	__end_handlers</div><div class='add'>+__end_handlers:</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Return from an exception with minimal checks.</div><div class='add'>+ * The caller is assumed to have done EXCEPTION_PROLOG_COMMON.</div><div class='add'>+ * If interrupts have been enabled, or anything has been</div><div class='add'>+ * done that might have changed the scheduling status of</div><div class='add'>+ * any task or sent any task a signal, you should use</div><div class='add'>+ * ret_from_except or ret_from_except_lite instead of this.</div><div class='add'>+ */</div><div class='add'>+fast_exc_return_irq:			/* restores irq state too */</div><div class='add'>+	ld	r3,SOFTE(r1)</div><div class='add'>+	TRACE_AND_RESTORE_IRQ(r3);</div><div class='add'>+	ld	r12,_MSR(r1)</div><div class='add'>+	rldicl	r4,r12,49,63		/* get MSR_EE to LSB */</div><div class='add'>+	stb	r4,PACAHARDIRQEN(r13)	/* restore paca-&gt;hard_enabled */</div><div class='add'>+	b	1f</div><div class='add'>+</div><div class='add'>+	.globl	fast_exception_return</div><div class='add'>+fast_exception_return:</div><div class='add'>+	ld	r12,_MSR(r1)</div><div class='add'>+1:	ld	r11,_NIP(r1)</div><div class='add'>+	andi.	r3,r12,MSR_RI		/* check if RI is set */</div><div class='add'>+	beq-	unrecov_fer</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_VIRT_CPU_ACCOUNTING</div><div class='add'>+	andi.	r3,r12,MSR_PR</div><div class='add'>+	beq	2f</div><div class='add'>+	ACCOUNT_CPU_USER_EXIT(r3, r4)</div><div class='add'>+2:</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	ld	r3,_CCR(r1)</div><div class='add'>+	ld	r4,_LINK(r1)</div><div class='add'>+	ld	r5,_CTR(r1)</div><div class='add'>+	ld	r6,_XER(r1)</div><div class='add'>+	mtcr	r3</div><div class='add'>+	mtlr	r4</div><div class='add'>+	mtctr	r5</div><div class='add'>+	mtxer	r6</div><div class='add'>+	REST_GPR(0, r1)</div><div class='add'>+	REST_8GPRS(2, r1)</div><div class='add'>+</div><div class='add'>+	mfmsr	r10</div><div class='add'>+	rldicl	r10,r10,48,1		/* clear EE */</div><div class='add'>+	rldicr	r10,r10,16,61		/* clear RI (LE is 0 already) */</div><div class='add'>+	mtmsrd	r10,1</div><div class='add'>+</div><div class='add'>+	mtspr	SPRN_SRR1,r12</div><div class='add'>+	mtspr	SPRN_SRR0,r11</div><div class='add'>+	REST_4GPRS(10, r1)</div><div class='add'>+	ld	r1,GPR1(r1)</div><div class='add'>+	rfid</div><div class='add'>+	b	.	/* prevent speculative execution */</div><div class='add'>+</div><div class='add'>+unrecov_fer:</div><div class='add'>+	bl	.save_nvgprs</div><div class='add'>+1:	addi	r3,r1,STACK_FRAME_OVERHEAD</div><div class='add'>+	bl	.unrecoverable_exception</div><div class='add'>+	b	1b</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_ALTIVEC</div><div class='ctx'> /*</div><div class='ctx'>  * load_up_altivec(unused, unused, tsk)</div><div class='hunk'>@@ -840,22 +904,6 @@ _STATIC(load_up_altivec)</div><div class='ctx'> 	blr</div><div class='ctx'> #endif /* CONFIG_ALTIVEC */</div><div class='ctx'> </div><div class='del'>-	.align	7</div><div class='del'>-	.globl vsx_unavailable_common</div><div class='del'>-vsx_unavailable_common:</div><div class='del'>-	EXCEPTION_PROLOG_COMMON(0xf40, PACA_EXGEN)</div><div class='del'>-#ifdef CONFIG_VSX</div><div class='del'>-BEGIN_FTR_SECTION</div><div class='del'>-	bne	.load_up_vsx</div><div class='del'>-1:</div><div class='del'>-END_FTR_SECTION_IFSET(CPU_FTR_VSX)</div><div class='del'>-#endif</div><div class='del'>-	bl	.save_nvgprs</div><div class='del'>-	addi	r3,r1,STACK_FRAME_OVERHEAD</div><div class='del'>-	ENABLE_INTS</div><div class='del'>-	bl	.vsx_unavailable_exception</div><div class='del'>-	b	.ret_from_except</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_VSX</div><div class='ctx'> /*</div><div class='ctx'>  * load_up_vsx(unused, unused, tsk)</div><div class='hunk'>@@ -1175,11 +1223,14 @@ _GLOBAL(generic_secondary_smp_init)</div><div class='ctx'> 	/* turn on 64-bit mode */</div><div class='ctx'> 	bl	.enable_64b_mode</div><div class='ctx'> </div><div class='add'>+	/* get the TOC pointer (real address) */</div><div class='add'>+	bl	.relative_toc</div><div class='add'>+</div><div class='ctx'> 	/* Set up a paca value for this processor. Since we have the</div><div class='ctx'> 	 * physical cpu id in r24, we need to search the pacas to find</div><div class='ctx'> 	 * which logical id maps to our physical one.</div><div class='ctx'> 	 */</div><div class='del'>-	LOAD_REG_IMMEDIATE(r13, paca)	/* Get base vaddr of paca array	 */</div><div class='add'>+	LOAD_REG_ADDR(r13, paca)	/* Get base vaddr of paca array	 */</div><div class='ctx'> 	li	r5,0			/* logical cpu id                */</div><div class='ctx'> 1:	lhz	r6,PACAHWCPUID(r13)	/* Load HW procid from paca      */</div><div class='ctx'> 	cmpw	r6,r24			/* Compare to our id             */</div><div class='hunk'>@@ -1208,7 +1259,7 @@ _GLOBAL(generic_secondary_smp_init)</div><div class='ctx'> 	sync				/* order paca.run and cur_cpu_spec */</div><div class='ctx'> </div><div class='ctx'> 	/* See if we need to call a cpu state restore handler */</div><div class='del'>-	LOAD_REG_IMMEDIATE(r23, cur_cpu_spec)</div><div class='add'>+	LOAD_REG_ADDR(r23, cur_cpu_spec)</div><div class='ctx'> 	ld	r23,0(r23)</div><div class='ctx'> 	ld	r23,CPU_SPEC_RESTORE(r23)</div><div class='ctx'> 	cmpdi	0,r23,0</div><div class='hunk'>@@ -1224,10 +1275,15 @@ _GLOBAL(generic_secondary_smp_init)</div><div class='ctx'> 	b	__secondary_start</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Turn the MMU off.</div><div class='add'>+ * Assumes we're mapped EA == RA if the MMU is on.</div><div class='add'>+ */</div><div class='ctx'> _STATIC(__mmu_off)</div><div class='ctx'> 	mfmsr	r3</div><div class='ctx'> 	andi.	r0,r3,MSR_IR|MSR_DR</div><div class='ctx'> 	beqlr</div><div class='add'>+	mflr	r4</div><div class='ctx'> 	andc	r3,r3,r0</div><div class='ctx'> 	mtspr	SPRN_SRR0,r4</div><div class='ctx'> 	mtspr	SPRN_SRR1,r3</div><div class='hunk'>@@ -1248,6 +1304,18 @@ _STATIC(__mmu_off)</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> _GLOBAL(__start_initialization_multiplatform)</div><div class='add'>+	/* Make sure we are running in 64 bits mode */</div><div class='add'>+	bl	.enable_64b_mode</div><div class='add'>+</div><div class='add'>+	/* Get TOC pointer (current runtime address) */</div><div class='add'>+	bl	.relative_toc</div><div class='add'>+</div><div class='add'>+	/* find out where we are now */</div><div class='add'>+	bcl	20,31,$+4</div><div class='add'>+0:	mflr	r26			/* r26 = runtime addr here */</div><div class='add'>+	addis	r26,r26,(_stext - 0b)@ha</div><div class='add'>+	addi	r26,r26,(_stext - 0b)@l	/* current runtime base addr */</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Are we booted from a PROM Of-type client-interface ?</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -1259,9 +1327,6 @@ _GLOBAL(__start_initialization_multiplatform)</div><div class='ctx'> 	mr	r31,r3</div><div class='ctx'> 	mr	r30,r4</div><div class='ctx'> </div><div class='del'>-	/* Make sure we are running in 64 bits mode */</div><div class='del'>-	bl	.enable_64b_mode</div><div class='del'>-</div><div class='ctx'> 	/* Setup some critical 970 SPRs before switching MMU off */</div><div class='ctx'> 	mfspr	r0,SPRN_PVR</div><div class='ctx'> 	srwi	r0,r0,16</div><div class='hunk'>@@ -1276,9 +1341,7 @@ _GLOBAL(__start_initialization_multiplatform)</div><div class='ctx'> 1:	bl	.__cpu_preinit_ppc970</div><div class='ctx'> 2:</div><div class='ctx'> </div><div class='del'>-	/* Switch off MMU if not already */</div><div class='del'>-	LOAD_REG_IMMEDIATE(r4, .__after_prom_start - KERNELBASE)</div><div class='del'>-	add	r4,r4,r30</div><div class='add'>+	/* Switch off MMU if not already off */</div><div class='ctx'> 	bl	.__mmu_off</div><div class='ctx'> 	b	.__after_prom_start</div><div class='ctx'> </div><div class='hunk'>@@ -1293,22 +1356,15 @@ _INIT_STATIC(__boot_from_prom)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Align the stack to 16-byte boundary</div><div class='ctx'> 	 * Depending on the size and layout of the ELF sections in the initial</div><div class='del'>-	 * boot binary, the stack pointer will be unalignet on PowerMac</div><div class='add'>+	 * boot binary, the stack pointer may be unaligned on PowerMac</div><div class='ctx'> 	 */</div><div class='ctx'> 	rldicr	r1,r1,0,59</div><div class='ctx'> </div><div class='del'>-	/* Make sure we are running in 64 bits mode */</div><div class='del'>-	bl	.enable_64b_mode</div><div class='del'>-</div><div class='del'>-	/* put a relocation offset into r3 */</div><div class='del'>-	bl	.reloc_offset</div><div class='del'>-</div><div class='del'>-	LOAD_REG_IMMEDIATE(r2,__toc_start)</div><div class='del'>-	addi	r2,r2,0x4000</div><div class='del'>-	addi	r2,r2,0x4000</div><div class='del'>-</div><div class='del'>-	/* Relocate the TOC from a virt addr to a real addr */</div><div class='del'>-	add	r2,r2,r3</div><div class='add'>+#ifdef CONFIG_RELOCATABLE</div><div class='add'>+	/* Relocate code for where we are now */</div><div class='add'>+	mr	r3,r26</div><div class='add'>+	bl	.relocate</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	/* Restore parameters */</div><div class='ctx'> 	mr	r3,r31</div><div class='hunk'>@@ -1318,60 +1374,51 @@ _INIT_STATIC(__boot_from_prom)</div><div class='ctx'> 	mr	r7,r27</div><div class='ctx'> </div><div class='ctx'> 	/* Do all of the interaction with OF client interface */</div><div class='add'>+	mr	r8,r26</div><div class='ctx'> 	bl	.prom_init</div><div class='ctx'> 	/* We never return */</div><div class='ctx'> 	trap</div><div class='ctx'> </div><div class='ctx'> _STATIC(__after_prom_start)</div><div class='add'>+#ifdef CONFIG_RELOCATABLE</div><div class='add'>+	/* process relocations for the final address of the kernel */</div><div class='add'>+	lis	r25,PAGE_OFFSET@highest	/* compute virtual base of kernel */</div><div class='add'>+	sldi	r25,r25,32</div><div class='add'>+	mr	r3,r25</div><div class='add'>+	bl	.relocate</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * We need to run with __start at physical address PHYSICAL_START.</div><div class='add'>+ * We need to run with _stext at physical address PHYSICAL_START.</div><div class='ctx'>  * This will leave some code in the first 256B of</div><div class='ctx'>  * real memory, which are reserved for software use.</div><div class='del'>- * The remainder of the first page is loaded with the fixed</div><div class='del'>- * interrupt vectors.  The next two pages are filled with</div><div class='del'>- * unknown exception placeholders.</div><div class='ctx'>  *</div><div class='ctx'>  * Note: This process overwrites the OF exception vectors.</div><div class='del'>- *	r26 == relocation offset</div><div class='del'>- *	r27 == KERNELBASE</div><div class='ctx'>  */</div><div class='del'>-	bl	.reloc_offset</div><div class='del'>-	mr	r26,r3</div><div class='del'>-	LOAD_REG_IMMEDIATE(r27, KERNELBASE)</div><div class='del'>-</div><div class='del'>-	LOAD_REG_IMMEDIATE(r3, PHYSICAL_START)	/* target addr */</div><div class='del'>-</div><div class='del'>-	// XXX FIXME: Use phys returned by OF (r30)</div><div class='del'>-	add	r4,r27,r26 		/* source addr			 */</div><div class='del'>-					/* current address of _start	 */</div><div class='del'>-					/*   i.e. where we are running	 */</div><div class='del'>-					/*	the source addr		 */</div><div class='del'>-</div><div class='del'>-	cmpdi	r4,0			/* In some cases the loader may  */</div><div class='del'>-	bne	1f</div><div class='del'>-	b	.start_here_multiplatform /* have already put us at zero */</div><div class='del'>-					/* so we can skip the copy.      */</div><div class='del'>-1:	LOAD_REG_IMMEDIATE(r5,copy_to_here) /* # bytes of memory to copy */</div><div class='del'>-	sub	r5,r5,r27</div><div class='del'>-</div><div class='add'>+	li	r3,0			/* target addr */</div><div class='add'>+	mr.	r4,r26			/* In some cases the loader may  */</div><div class='add'>+	beq	9f			/* have already put us at zero */</div><div class='add'>+	lis	r5,(copy_to_here - _stext)@ha</div><div class='add'>+	addi	r5,r5,(copy_to_here - _stext)@l /* # bytes of memory to copy */</div><div class='ctx'> 	li	r6,0x100		/* Start offset, the first 0x100 */</div><div class='ctx'> 					/* bytes were copied earlier.	 */</div><div class='ctx'> </div><div class='ctx'> 	bl	.copy_and_flush		/* copy the first n bytes	 */</div><div class='ctx'> 					/* this includes the code being	 */</div><div class='ctx'> 					/* executed here.		 */</div><div class='del'>-</div><div class='del'>-	LOAD_REG_IMMEDIATE(r0, 4f)	/* Jump to the copy of this code */</div><div class='del'>-	mtctr	r0			/* that we just made/relocated	 */</div><div class='add'>+	addis	r8,r3,(4f - _stext)@ha	/* Jump to the copy of this code */</div><div class='add'>+	addi	r8,r8,(4f - _stext)@l	/* that we just made */</div><div class='add'>+	mtctr	r8</div><div class='ctx'> 	bctr</div><div class='ctx'> </div><div class='del'>-4:	LOAD_REG_IMMEDIATE(r5,klimit)</div><div class='del'>-	add	r5,r5,r26</div><div class='del'>-	ld	r5,0(r5)		/* get the value of klimit */</div><div class='del'>-	sub	r5,r5,r27</div><div class='add'>+4:	/* Now copy the rest of the kernel up to _end */</div><div class='add'>+	addis	r5,r26,(p_end - _stext)@ha</div><div class='add'>+	ld	r5,(p_end - _stext)@l(r5)	/* get _end */</div><div class='ctx'> 	bl	.copy_and_flush		/* copy the rest */</div><div class='del'>-	b	.start_here_multiplatform</div><div class='add'>+</div><div class='add'>+9:	b	.start_here_multiplatform</div><div class='add'>+</div><div class='add'>+p_end:	.llong	_end - _stext</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Copy routine used to copy the kernel to start at physical address 0</div><div class='hunk'>@@ -1436,6 +1483,9 @@ _GLOBAL(pmac_secondary_start)</div><div class='ctx'> 	/* turn on 64-bit mode */</div><div class='ctx'> 	bl	.enable_64b_mode</div><div class='ctx'> </div><div class='add'>+	/* get TOC pointer (real address) */</div><div class='add'>+	bl	.relative_toc</div><div class='add'>+</div><div class='ctx'> 	/* Copy some CPU settings from CPU 0 */</div><div class='ctx'> 	bl	.__restore_cpu_ppc970</div><div class='ctx'> </div><div class='hunk'>@@ -1445,10 +1495,10 @@ _GLOBAL(pmac_secondary_start)</div><div class='ctx'> 	mtmsrd	r3			/* RI on */</div><div class='ctx'> </div><div class='ctx'> 	/* Set up a paca value for this processor. */</div><div class='del'>-	LOAD_REG_IMMEDIATE(r4, paca)	/* Get base vaddr of paca array	*/</div><div class='del'>-	mulli	r13,r24,PACA_SIZE	 /* Calculate vaddr of right paca */</div><div class='add'>+	LOAD_REG_ADDR(r4,paca)		/* Get base vaddr of paca array	*/</div><div class='add'>+	mulli	r13,r24,PACA_SIZE	/* Calculate vaddr of right paca */</div><div class='ctx'> 	add	r13,r13,r4		/* for this processor.		*/</div><div class='del'>-	mtspr	SPRN_SPRG3,r13		 /* Save vaddr of paca in SPRG3	*/</div><div class='add'>+	mtspr	SPRN_SPRG3,r13		/* Save vaddr of paca in SPRG3	*/</div><div class='ctx'> </div><div class='ctx'> 	/* Create a temp kernel stack for use before relocation is on.	*/</div><div class='ctx'> 	ld	r1,PACAEMERGSP(r13)</div><div class='hunk'>@@ -1476,9 +1526,6 @@ __secondary_start:</div><div class='ctx'> 	/* Set thread priority to MEDIUM */</div><div class='ctx'> 	HMT_MEDIUM</div><div class='ctx'> </div><div class='del'>-	/* Load TOC */</div><div class='del'>-	ld	r2,PACATOC(r13)</div><div class='del'>-</div><div class='ctx'> 	/* Do early setup for that CPU (stab, slb, hash table pointer) */</div><div class='ctx'> 	bl	.early_setup_secondary</div><div class='ctx'> </div><div class='hunk'>@@ -1515,9 +1562,11 @@ END_FW_FTR_SECTION_IFCLR(FW_FEATURE_ISERIES)</div><div class='ctx'> </div><div class='ctx'> /* </div><div class='ctx'>  * Running with relocation on at this point.  All we want to do is</div><div class='del'>- * zero the stack back-chain pointer before going into C code.</div><div class='add'>+ * zero the stack back-chain pointer and get the TOC virtual address</div><div class='add'>+ * before going into C code.</div><div class='ctx'>  */</div><div class='ctx'> _GLOBAL(start_secondary_prolog)</div><div class='add'>+	ld	r2,PACATOC(r13)</div><div class='ctx'> 	li	r3,0</div><div class='ctx'> 	std	r3,0(r1)		/* Zero the stack frame pointer	*/</div><div class='ctx'> 	bl	.start_secondary</div><div class='hunk'>@@ -1529,34 +1578,46 @@ _GLOBAL(start_secondary_prolog)</div><div class='ctx'>  */</div><div class='ctx'> _GLOBAL(enable_64b_mode)</div><div class='ctx'> 	mfmsr	r11			/* grab the current MSR */</div><div class='del'>-	li	r12,1</div><div class='del'>-	rldicr	r12,r12,MSR_SF_LG,(63-MSR_SF_LG)</div><div class='del'>-	or	r11,r11,r12</div><div class='del'>-	li	r12,1</div><div class='del'>-	rldicr	r12,r12,MSR_ISF_LG,(63-MSR_ISF_LG)</div><div class='add'>+	li	r12,(MSR_SF | MSR_ISF)@highest</div><div class='add'>+	sldi	r12,r12,48</div><div class='ctx'> 	or	r11,r11,r12</div><div class='ctx'> 	mtmsrd	r11</div><div class='ctx'> 	isync</div><div class='ctx'> 	blr</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * This puts the TOC pointer into r2, offset by 0x8000 (as expected</div><div class='add'>+ * by the toolchain).  It computes the correct value for wherever we</div><div class='add'>+ * are running at the moment, using position-independent code.</div><div class='add'>+ */</div><div class='add'>+_GLOBAL(relative_toc)</div><div class='add'>+	mflr	r0</div><div class='add'>+	bcl	20,31,$+4</div><div class='add'>+0:	mflr	r9</div><div class='add'>+	ld	r2,(p_toc - 0b)(r9)</div><div class='add'>+	add	r2,r2,r9</div><div class='add'>+	mtlr	r0</div><div class='add'>+	blr</div><div class='add'>+</div><div class='add'>+p_toc:	.llong	__toc_start + 0x8000 - 0b</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * This is where the main kernel code starts.</div><div class='ctx'>  */</div><div class='ctx'> _INIT_STATIC(start_here_multiplatform)</div><div class='del'>-	/* get a new offset, now that the kernel has moved. */</div><div class='del'>-	bl	.reloc_offset</div><div class='del'>-	mr	r26,r3</div><div class='add'>+	/* set up the TOC (real address) */</div><div class='add'>+	bl	.relative_toc</div><div class='ctx'> </div><div class='ctx'> 	/* Clear out the BSS. It may have been done in prom_init,</div><div class='ctx'> 	 * already but that's irrelevant since prom_init will soon</div><div class='ctx'> 	 * be detached from the kernel completely. Besides, we need</div><div class='ctx'> 	 * to clear it now for kexec-style entry.</div><div class='ctx'> 	 */</div><div class='del'>-	LOAD_REG_IMMEDIATE(r11,__bss_stop)</div><div class='del'>-	LOAD_REG_IMMEDIATE(r8,__bss_start)</div><div class='add'>+	LOAD_REG_ADDR(r11,__bss_stop)</div><div class='add'>+	LOAD_REG_ADDR(r8,__bss_start)</div><div class='ctx'> 	sub	r11,r11,r8		/* bss size			*/</div><div class='ctx'> 	addi	r11,r11,7		/* round up to an even double word */</div><div class='del'>-	rldicl. r11,r11,61,3		/* shift right by 3		*/</div><div class='add'>+	srdi.	r11,r11,3		/* shift right by 3		*/</div><div class='ctx'> 	beq	4f</div><div class='ctx'> 	addi	r8,r8,-8</div><div class='ctx'> 	li	r0,0</div><div class='hunk'>@@ -1569,35 +1630,35 @@ _INIT_STATIC(start_here_multiplatform)</div><div class='ctx'> 	ori	r6,r6,MSR_RI</div><div class='ctx'> 	mtmsrd	r6			/* RI on */</div><div class='ctx'> </div><div class='del'>-	/* The following gets the stack and TOC set up with the regs */</div><div class='add'>+#ifdef CONFIG_RELOCATABLE</div><div class='add'>+	/* Save the physical address we're running at in kernstart_addr */</div><div class='add'>+	LOAD_REG_ADDR(r4, kernstart_addr)</div><div class='add'>+	clrldi	r0,r25,2</div><div class='add'>+	std	r0,0(r4)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* The following gets the stack set up with the regs */</div><div class='ctx'> 	/* pointing to the real addr of the kernel stack.  This is   */</div><div class='ctx'> 	/* all done to support the C function call below which sets  */</div><div class='ctx'> 	/* up the htab.  This is done because we have relocated the  */</div><div class='ctx'> 	/* kernel but are still running in real mode. */</div><div class='ctx'> </div><div class='del'>-	LOAD_REG_IMMEDIATE(r3,init_thread_union)</div><div class='del'>-	add	r3,r3,r26</div><div class='add'>+	LOAD_REG_ADDR(r3,init_thread_union)</div><div class='ctx'> </div><div class='del'>-	/* set up a stack pointer (physical address) */</div><div class='add'>+	/* set up a stack pointer */</div><div class='ctx'> 	addi	r1,r3,THREAD_SIZE</div><div class='ctx'> 	li	r0,0</div><div class='ctx'> 	stdu	r0,-STACK_FRAME_OVERHEAD(r1)</div><div class='ctx'> </div><div class='del'>-	/* set up the TOC (physical address) */</div><div class='del'>-	LOAD_REG_IMMEDIATE(r2,__toc_start)</div><div class='del'>-	addi	r2,r2,0x4000</div><div class='del'>-	addi	r2,r2,0x4000</div><div class='del'>-	add	r2,r2,r26</div><div class='del'>-</div><div class='ctx'> 	/* Do very early kernel initializations, including initial hash table,</div><div class='ctx'> 	 * stab and slb setup before we turn on relocation.	*/</div><div class='ctx'> </div><div class='ctx'> 	/* Restore parameters passed from prom_init/kexec */</div><div class='ctx'> 	mr	r3,r31</div><div class='del'>- 	bl	.early_setup</div><div class='add'>+	bl	.early_setup		/* also sets r13 and SPRG3 */</div><div class='ctx'> </div><div class='del'>-	LOAD_REG_IMMEDIATE(r3, .start_here_common)</div><div class='del'>-	LOAD_REG_IMMEDIATE(r4, MSR_KERNEL)</div><div class='add'>+	LOAD_REG_ADDR(r3, .start_here_common)</div><div class='add'>+	ld	r4,PACAKMSR(r13)</div><div class='ctx'> 	mtspr	SPRN_SRR0,r3</div><div class='ctx'> 	mtspr	SPRN_SRR1,r4</div><div class='ctx'> 	rfid</div><div class='hunk'>@@ -1606,20 +1667,10 @@ _INIT_STATIC(start_here_multiplatform)</div><div class='ctx'> 	/* This is where all platforms converge execution */</div><div class='ctx'> _INIT_GLOBAL(start_here_common)</div><div class='ctx'> 	/* relocation is on at this point */</div><div class='add'>+	std	r1,PACAKSAVE(r13)</div><div class='ctx'> </div><div class='del'>-	/* The following code sets up the SP and TOC now that we are */</div><div class='del'>-	/* running with translation enabled. */</div><div class='del'>-</div><div class='del'>-	LOAD_REG_IMMEDIATE(r3,init_thread_union)</div><div class='del'>-</div><div class='del'>-	/* set up the stack */</div><div class='del'>-	addi	r1,r3,THREAD_SIZE</div><div class='del'>-	li	r0,0</div><div class='del'>-	stdu	r0,-STACK_FRAME_OVERHEAD(r1)</div><div class='del'>-</div><div class='del'>-	/* Load the TOC */</div><div class='add'>+	/* Load the TOC (virtual address) */</div><div class='ctx'> 	ld	r2,PACATOC(r13)</div><div class='del'>-	std	r1,PACAKSAVE(r13)</div><div class='ctx'> </div><div class='ctx'> 	bl	.setup_system</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/kernel/head_fsl_booke.S b/arch/powerpc/kernel/head_fsl_booke.S<br/>index 3cb52fa0eda3..590304c24dad 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kernel/head_fsl_booke.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/kernel/head_fsl_booke.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kernel/head_fsl_booke.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kernel/head_fsl_booke.S</a></div><div class='hunk'>@@ -422,7 +422,6 @@ skpinv:	addi	r6,r6,1				/* Increment */</div><div class='ctx'>  *   r12 is pointer to the pte</div><div class='ctx'>  */</div><div class='ctx'> #ifdef CONFIG_PTE_64BIT</div><div class='del'>-#define PTE_FLAGS_OFFSET	4</div><div class='ctx'> #define FIND_PTE	\</div><div class='ctx'> 	rlwinm	r12, r10, 13, 19, 29;	/* Compute pgdir/pmd offset */	\</div><div class='ctx'> 	lwzx	r11, r12, r11;		/* Get pgd/pmd entry */		\</div><div class='hunk'>@@ -431,7 +430,6 @@ skpinv:	addi	r6,r6,1				/* Increment */</div><div class='ctx'> 	rlwimi	r12, r10, 23, 20, 28;	/* Compute pte address */	\</div><div class='ctx'> 	lwz	r11, 4(r12);		/* Get pte entry */</div><div class='ctx'> #else</div><div class='del'>-#define PTE_FLAGS_OFFSET	0</div><div class='ctx'> #define FIND_PTE	\</div><div class='ctx'> 	rlwimi	r11, r10, 12, 20, 29;	/* Create L1 (pgdir/pmd) address */	\</div><div class='ctx'> 	lwz	r11, 0(r11);		/* Get L1 entry */			\</div><div class='hunk'>@@ -579,13 +577,19 @@ interrupt_base:</div><div class='ctx'> </div><div class='ctx'> 	FIND_PTE</div><div class='ctx'> 	andc.	r13,r13,r11		/* Check permission */</div><div class='del'>-	bne	2f			/* Bail if permission mismach */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PTE_64BIT</div><div class='del'>-	lwz	r13, 0(r12)</div><div class='add'>+#ifdef CONFIG_SMP</div><div class='add'>+	subf	r10,r11,r12		/* create false data dep */</div><div class='add'>+	lwzx	r13,r11,r10		/* Get upper pte bits */</div><div class='add'>+#else</div><div class='add'>+	lwz	r13,0(r12)		/* Get upper pte bits */</div><div class='add'>+#endif</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	 /* Jump to common tlb load */</div><div class='add'>+	bne	2f			/* Bail if permission/valid mismach */</div><div class='add'>+</div><div class='add'>+	/* Jump to common tlb load */</div><div class='ctx'> 	b	finish_tlb_load</div><div class='ctx'> 2:</div><div class='ctx'> 	/* The bailout.  Restore registers to pre-exception conditions</div><div class='hunk'>@@ -640,12 +644,18 @@ interrupt_base:</div><div class='ctx'> </div><div class='ctx'> 	FIND_PTE</div><div class='ctx'> 	andc.	r13,r13,r11		/* Check permission */</div><div class='del'>-	bne	2f			/* Bail if permission mismach */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PTE_64BIT</div><div class='del'>-	lwz	r13, 0(r12)</div><div class='add'>+#ifdef CONFIG_SMP</div><div class='add'>+	subf	r10,r11,r12		/* create false data dep */</div><div class='add'>+	lwzx	r13,r11,r10		/* Get upper pte bits */</div><div class='add'>+#else</div><div class='add'>+	lwz	r13,0(r12)		/* Get upper pte bits */</div><div class='add'>+#endif</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+	bne	2f			/* Bail if permission mismach */</div><div class='add'>+</div><div class='ctx'> 	/* Jump to common TLB load point */</div><div class='ctx'> 	b	finish_tlb_load</div><div class='ctx'> </div><div class='hunk'>@@ -702,7 +712,7 @@ interrupt_base:</div><div class='ctx'> /*</div><div class='ctx'>  * Both the instruction and data TLB miss get to this</div><div class='ctx'>  * point to load the TLB.</div><div class='del'>- *	r10 - EA of fault</div><div class='add'>+ *	r10 - available to use</div><div class='ctx'>  *	r11 - TLB (info from Linux PTE)</div><div class='ctx'>  *	r12 - available to use</div><div class='ctx'>  *	r13 - upper bits of PTE (if PTE_64BIT) or available to use</div><div class='head'>diff --git a/arch/powerpc/kernel/iommu.c b/arch/powerpc/kernel/iommu.c<br/>index 550a19399bfa..ea1ba89f9c90 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kernel/iommu.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/kernel/iommu.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kernel/iommu.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kernel/iommu.c</a></div><div class='hunk'>@@ -51,17 +51,6 @@ static int protect4gb = 1;</div><div class='ctx'> </div><div class='ctx'> static void __iommu_free(struct iommu_table *, dma_addr_t, unsigned int);</div><div class='ctx'> </div><div class='del'>-static inline unsigned long iommu_num_pages(unsigned long vaddr,</div><div class='del'>-					    unsigned long slen)</div><div class='del'>-{</div><div class='del'>-	unsigned long npages;</div><div class='del'>-</div><div class='del'>-	npages = IOMMU_PAGE_ALIGN(vaddr + slen) - (vaddr &amp; IOMMU_PAGE_MASK);</div><div class='del'>-	npages &gt;&gt;= IOMMU_PAGE_SHIFT;</div><div class='del'>-</div><div class='del'>-	return npages;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int __init setup_protect4gb(char *str)</div><div class='ctx'> {</div><div class='ctx'> 	if (strcmp(str, "on") == 0)</div><div class='hunk'>@@ -325,7 +314,7 @@ int iommu_map_sg(struct device *dev, struct iommu_table *tbl,</div><div class='ctx'> 		}</div><div class='ctx'> 		/* Allocate iommu entries for that segment */</div><div class='ctx'> 		vaddr = (unsigned long) sg_virt(s);</div><div class='del'>-		npages = iommu_num_pages(vaddr, slen);</div><div class='add'>+		npages = iommu_num_pages(vaddr, slen, IOMMU_PAGE_SIZE);</div><div class='ctx'> 		align = 0;</div><div class='ctx'> 		if (IOMMU_PAGE_SHIFT &lt; PAGE_SHIFT &amp;&amp; slen &gt;= PAGE_SIZE &amp;&amp;</div><div class='ctx'> 		    (vaddr &amp; ~PAGE_MASK) == 0)</div><div class='hunk'>@@ -418,7 +407,8 @@ int iommu_map_sg(struct device *dev, struct iommu_table *tbl,</div><div class='ctx'> 			unsigned long vaddr, npages;</div><div class='ctx'> </div><div class='ctx'> 			vaddr = s-&gt;dma_address &amp; IOMMU_PAGE_MASK;</div><div class='del'>-			npages = iommu_num_pages(s-&gt;dma_address, s-&gt;dma_length);</div><div class='add'>+			npages = iommu_num_pages(s-&gt;dma_address, s-&gt;dma_length,</div><div class='add'>+						 IOMMU_PAGE_SIZE);</div><div class='ctx'> 			__iommu_free(tbl, vaddr, npages);</div><div class='ctx'> 			s-&gt;dma_address = DMA_ERROR_CODE;</div><div class='ctx'> 			s-&gt;dma_length = 0;</div><div class='hunk'>@@ -452,7 +442,8 @@ void iommu_unmap_sg(struct iommu_table *tbl, struct scatterlist *sglist,</div><div class='ctx'> </div><div class='ctx'> 		if (sg-&gt;dma_length == 0)</div><div class='ctx'> 			break;</div><div class='del'>-		npages = iommu_num_pages(dma_handle, sg-&gt;dma_length);</div><div class='add'>+		npages = iommu_num_pages(dma_handle, sg-&gt;dma_length,</div><div class='add'>+					 IOMMU_PAGE_SIZE);</div><div class='ctx'> 		__iommu_free(tbl, dma_handle, npages);</div><div class='ctx'> 		sg = sg_next(sg);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -584,7 +575,7 @@ dma_addr_t iommu_map_single(struct device *dev, struct iommu_table *tbl,</div><div class='ctx'> 	BUG_ON(direction == DMA_NONE);</div><div class='ctx'> </div><div class='ctx'> 	uaddr = (unsigned long)vaddr;</div><div class='del'>-	npages = iommu_num_pages(uaddr, size);</div><div class='add'>+	npages = iommu_num_pages(uaddr, size, IOMMU_PAGE_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	if (tbl) {</div><div class='ctx'> 		align = 0;</div><div class='hunk'>@@ -617,7 +608,7 @@ void iommu_unmap_single(struct iommu_table *tbl, dma_addr_t dma_handle,</div><div class='ctx'> 	BUG_ON(direction == DMA_NONE);</div><div class='ctx'> </div><div class='ctx'> 	if (tbl) {</div><div class='del'>-		npages = iommu_num_pages(dma_handle, size);</div><div class='add'>+		npages = iommu_num_pages(dma_handle, size, IOMMU_PAGE_SIZE);</div><div class='ctx'> 		iommu_free(tbl, dma_handle, npages);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c<br/>index d972decf0324..ac222d0ab12e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kernel/irq.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/kernel/irq.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kernel/irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kernel/irq.c</a></div><div class='hunk'>@@ -439,8 +439,8 @@ void do_softirq(void)</div><div class='ctx'> </div><div class='ctx'> static LIST_HEAD(irq_hosts);</div><div class='ctx'> static DEFINE_SPINLOCK(irq_big_lock);</div><div class='del'>-static DEFINE_PER_CPU(unsigned int, irq_radix_reader);</div><div class='del'>-static unsigned int irq_radix_writer;</div><div class='add'>+static unsigned int revmap_trees_allocated;</div><div class='add'>+static DEFINE_MUTEX(revmap_trees_mutex);</div><div class='ctx'> struct irq_map_entry irq_map[NR_IRQS];</div><div class='ctx'> static unsigned int irq_virq_count = NR_IRQS;</div><div class='ctx'> static struct irq_host *irq_default_host;</div><div class='hunk'>@@ -583,57 +583,6 @@ void irq_set_virq_count(unsigned int count)</div><div class='ctx'> 		irq_virq_count = count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* radix tree not lockless safe ! we use a brlock-type mecanism</div><div class='del'>- * for now, until we can use a lockless radix tree</div><div class='del'>- */</div><div class='del'>-static void irq_radix_wrlock(unsigned long *flags)</div><div class='del'>-{</div><div class='del'>-	unsigned int cpu, ok;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;irq_big_lock, *flags);</div><div class='del'>-	irq_radix_writer = 1;</div><div class='del'>-	smp_mb();</div><div class='del'>-	do {</div><div class='del'>-		barrier();</div><div class='del'>-		ok = 1;</div><div class='del'>-		for_each_possible_cpu(cpu) {</div><div class='del'>-			if (per_cpu(irq_radix_reader, cpu)) {</div><div class='del'>-				ok = 0;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		if (!ok)</div><div class='del'>-			cpu_relax();</div><div class='del'>-	} while(!ok);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void irq_radix_wrunlock(unsigned long flags)</div><div class='del'>-{</div><div class='del'>-	smp_wmb();</div><div class='del'>-	irq_radix_writer = 0;</div><div class='del'>-	spin_unlock_irqrestore(&amp;irq_big_lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void irq_radix_rdlock(unsigned long *flags)</div><div class='del'>-{</div><div class='del'>-	local_irq_save(*flags);</div><div class='del'>-	__get_cpu_var(irq_radix_reader) = 1;</div><div class='del'>-	smp_mb();</div><div class='del'>-	if (likely(irq_radix_writer == 0))</div><div class='del'>-		return;</div><div class='del'>-	__get_cpu_var(irq_radix_reader) = 0;</div><div class='del'>-	smp_wmb();</div><div class='del'>-	spin_lock(&amp;irq_big_lock);</div><div class='del'>-	__get_cpu_var(irq_radix_reader) = 1;</div><div class='del'>-	spin_unlock(&amp;irq_big_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void irq_radix_rdunlock(unsigned long flags)</div><div class='del'>-{</div><div class='del'>-	__get_cpu_var(irq_radix_reader) = 0;</div><div class='del'>-	local_irq_restore(flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int irq_setup_virq(struct irq_host *host, unsigned int virq,</div><div class='ctx'> 			    irq_hw_number_t hwirq)</div><div class='ctx'> {</div><div class='hunk'>@@ -788,7 +737,6 @@ void irq_dispose_mapping(unsigned int virq)</div><div class='ctx'> {</div><div class='ctx'> 	struct irq_host *host;</div><div class='ctx'> 	irq_hw_number_t hwirq;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	if (virq == NO_IRQ)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -821,12 +769,16 @@ void irq_dispose_mapping(unsigned int virq)</div><div class='ctx'> 			host-&gt;revmap_data.linear.revmap[hwirq] = NO_IRQ;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case IRQ_HOST_MAP_TREE:</div><div class='del'>-		/* Check if radix tree allocated yet */</div><div class='del'>-		if (host-&gt;revmap_data.tree.gfp_mask == 0)</div><div class='add'>+		/*</div><div class='add'>+		 * Check if radix tree allocated yet, if not then nothing to</div><div class='add'>+		 * remove.</div><div class='add'>+		 */</div><div class='add'>+		smp_rmb();</div><div class='add'>+		if (revmap_trees_allocated &lt; 1)</div><div class='ctx'> 			break;</div><div class='del'>-		irq_radix_wrlock(&amp;flags);</div><div class='add'>+		mutex_lock(&amp;revmap_trees_mutex);</div><div class='ctx'> 		radix_tree_delete(&amp;host-&gt;revmap_data.tree, hwirq);</div><div class='del'>-		irq_radix_wrunlock(flags);</div><div class='add'>+		mutex_unlock(&amp;revmap_trees_mutex);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -875,43 +827,62 @@ unsigned int irq_find_mapping(struct irq_host *host,</div><div class='ctx'> EXPORT_SYMBOL_GPL(irq_find_mapping);</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-unsigned int irq_radix_revmap(struct irq_host *host,</div><div class='del'>-			      irq_hw_number_t hwirq)</div><div class='add'>+unsigned int irq_radix_revmap_lookup(struct irq_host *host,</div><div class='add'>+				     irq_hw_number_t hwirq)</div><div class='ctx'> {</div><div class='del'>-	struct radix_tree_root *tree;</div><div class='ctx'> 	struct irq_map_entry *ptr;</div><div class='ctx'> 	unsigned int virq;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON(host-&gt;revmap_type != IRQ_HOST_MAP_TREE);</div><div class='ctx'> </div><div class='del'>-	/* Check if the radix tree exist yet. We test the value of</div><div class='del'>-	 * the gfp_mask for that. Sneaky but saves another int in the</div><div class='del'>-	 * structure. If not, we fallback to slow mode</div><div class='add'>+	/*</div><div class='add'>+	 * Check if the radix tree exists and has bee initialized.</div><div class='add'>+	 * If not, we fallback to slow mode</div><div class='ctx'> 	 */</div><div class='del'>-	tree = &amp;host-&gt;revmap_data.tree;</div><div class='del'>-	if (tree-&gt;gfp_mask == 0)</div><div class='add'>+	if (revmap_trees_allocated &lt; 2)</div><div class='ctx'> 		return irq_find_mapping(host, hwirq);</div><div class='ctx'> </div><div class='ctx'> 	/* Now try to resolve */</div><div class='del'>-	irq_radix_rdlock(&amp;flags);</div><div class='del'>-	ptr = radix_tree_lookup(tree, hwirq);</div><div class='del'>-	irq_radix_rdunlock(flags);</div><div class='add'>+	/*</div><div class='add'>+	 * No rcu_read_lock(ing) needed, the ptr returned can't go under us</div><div class='add'>+	 * as it's referencing an entry in the static irq_map table.</div><div class='add'>+	 */</div><div class='add'>+	ptr = radix_tree_lookup(&amp;host-&gt;revmap_data.tree, hwirq);</div><div class='ctx'> </div><div class='del'>-	/* Found it, return */</div><div class='del'>-	if (ptr) {</div><div class='add'>+	/*</div><div class='add'>+	 * If found in radix tree, then fine.</div><div class='add'>+	 * Else fallback to linear lookup - this should not happen in practice</div><div class='add'>+	 * as it means that we failed to insert the node in the radix tree.</div><div class='add'>+	 */</div><div class='add'>+	if (ptr)</div><div class='ctx'> 		virq = ptr - irq_map;</div><div class='del'>-		return virq;</div><div class='del'>-	}</div><div class='add'>+	else</div><div class='add'>+		virq = irq_find_mapping(host, hwirq);</div><div class='add'>+</div><div class='add'>+	return virq;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void irq_radix_revmap_insert(struct irq_host *host, unsigned int virq,</div><div class='add'>+			     irq_hw_number_t hwirq)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	WARN_ON(host-&gt;revmap_type != IRQ_HOST_MAP_TREE);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Check if the radix tree exists yet.</div><div class='add'>+	 * If not, then the irq will be inserted into the tree when it gets</div><div class='add'>+	 * initialized.</div><div class='add'>+	 */</div><div class='add'>+	smp_rmb();</div><div class='add'>+	if (revmap_trees_allocated &lt; 1)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	/* If not there, try to insert it */</div><div class='del'>-	virq = irq_find_mapping(host, hwirq);</div><div class='ctx'> 	if (virq != NO_IRQ) {</div><div class='del'>-		irq_radix_wrlock(&amp;flags);</div><div class='del'>-		radix_tree_insert(tree, hwirq, &amp;irq_map[virq]);</div><div class='del'>-		irq_radix_wrunlock(flags);</div><div class='add'>+		mutex_lock(&amp;revmap_trees_mutex);</div><div class='add'>+		radix_tree_insert(&amp;host-&gt;revmap_data.tree, hwirq,</div><div class='add'>+				  &amp;irq_map[virq]);</div><div class='add'>+		mutex_unlock(&amp;revmap_trees_mutex);</div><div class='ctx'> 	}</div><div class='del'>-	return virq;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> unsigned int irq_linear_revmap(struct irq_host *host,</div><div class='hunk'>@@ -1020,14 +991,44 @@ void irq_early_init(void)</div><div class='ctx'> static int irq_late_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct irq_host *h;</div><div class='del'>-	unsigned long flags;</div><div class='add'>+	unsigned int i;</div><div class='ctx'> </div><div class='del'>-	irq_radix_wrlock(&amp;flags);</div><div class='add'>+	/*</div><div class='add'>+	 * No mutual exclusion with respect to accessors of the tree is needed</div><div class='add'>+	 * here as the synchronization is done via the state variable</div><div class='add'>+	 * revmap_trees_allocated.</div><div class='add'>+	 */</div><div class='ctx'> 	list_for_each_entry(h, &amp;irq_hosts, link) {</div><div class='ctx'> 		if (h-&gt;revmap_type == IRQ_HOST_MAP_TREE)</div><div class='del'>-			INIT_RADIX_TREE(&amp;h-&gt;revmap_data.tree, GFP_ATOMIC);</div><div class='add'>+			INIT_RADIX_TREE(&amp;h-&gt;revmap_data.tree, GFP_KERNEL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Make sure the radix trees inits are visible before setting</div><div class='add'>+	 * the flag</div><div class='add'>+	 */</div><div class='add'>+	smp_wmb();</div><div class='add'>+	revmap_trees_allocated = 1;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Insert the reverse mapping for those interrupts already present</div><div class='add'>+	 * in irq_map[].</div><div class='add'>+	 */</div><div class='add'>+	mutex_lock(&amp;revmap_trees_mutex);</div><div class='add'>+	for (i = 0; i &lt; irq_virq_count; i++) {</div><div class='add'>+		if (irq_map[i].host &amp;&amp;</div><div class='add'>+		    (irq_map[i].host-&gt;revmap_type == IRQ_HOST_MAP_TREE))</div><div class='add'>+			radix_tree_insert(&amp;irq_map[i].host-&gt;revmap_data.tree,</div><div class='add'>+					  irq_map[i].hwirq, &amp;irq_map[i]);</div><div class='ctx'> 	}</div><div class='del'>-	irq_radix_wrunlock(flags);</div><div class='add'>+	mutex_unlock(&amp;revmap_trees_mutex);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Make sure the radix trees insertions are visible before setting</div><div class='add'>+	 * the flag</div><div class='add'>+	 */</div><div class='add'>+	smp_wmb();</div><div class='add'>+	revmap_trees_allocated = 2;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/kernel/lparcfg.c b/arch/powerpc/kernel/lparcfg.c<br/>index b3eef30b5131..d051e8cbcd03 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kernel/lparcfg.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/kernel/lparcfg.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kernel/lparcfg.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kernel/lparcfg.c</a></div><div class='hunk'>@@ -510,10 +510,10 @@ static ssize_t update_ppp(u64 *entitlement, u8 *weight)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("%s: current_entitled = %lu, current_weight = %u\n",</div><div class='del'>-	         __FUNCTION__, ppp_data.entitlement, ppp_data.weight);</div><div class='add'>+		 __func__, ppp_data.entitlement, ppp_data.weight);</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("%s: new_entitled = %lu, new_weight = %u\n",</div><div class='del'>-		 __FUNCTION__, new_entitled, new_weight);</div><div class='add'>+		 __func__, new_entitled, new_weight);</div><div class='ctx'> </div><div class='ctx'> 	retval = plpar_hcall_norets(H_SET_PPP, new_entitled, new_weight);</div><div class='ctx'> 	return retval;</div><div class='hunk'>@@ -556,10 +556,10 @@ static ssize_t update_mpp(u64 *entitlement, u8 *weight)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("%s: current_entitled = %lu, current_weight = %u\n",</div><div class='del'>-	         __FUNCTION__, mpp_data.entitled_mem, mpp_data.mem_weight);</div><div class='add'>+	         __func__, mpp_data.entitled_mem, mpp_data.mem_weight);</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("%s: new_entitled = %lu, new_weight = %u\n",</div><div class='del'>-	         __FUNCTION__, new_entitled, new_weight);</div><div class='add'>+		 __func__, new_entitled, new_weight);</div><div class='ctx'> </div><div class='ctx'> 	rc = plpar_hcall_norets(H_SET_MPP, new_entitled, new_weight);</div><div class='ctx'> 	return rc;</div><div class='head'>diff --git a/arch/powerpc/kernel/misc.S b/arch/powerpc/kernel/misc.S<br/>index 85cb6f340846..2d29752cbe16 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kernel/misc.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/kernel/misc.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kernel/misc.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kernel/misc.S</a></div><div class='hunk'>@@ -31,11 +31,14 @@ _GLOBAL(reloc_offset)</div><div class='ctx'> 	mflr	r0</div><div class='ctx'> 	bl	1f</div><div class='ctx'> 1:	mflr	r3</div><div class='del'>-	LOAD_REG_IMMEDIATE(r4,1b)</div><div class='add'>+	PPC_LL	r4,(2f-1b)(r3)</div><div class='ctx'> 	subf	r3,r4,r3</div><div class='ctx'> 	mtlr	r0</div><div class='ctx'> 	blr</div><div class='ctx'> </div><div class='add'>+	.align	3</div><div class='add'>+2:	PPC_LONG 1b</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * add_reloc_offset(x) returns x + reloc_offset().</div><div class='ctx'>  */</div><div class='hunk'>@@ -43,12 +46,15 @@ _GLOBAL(add_reloc_offset)</div><div class='ctx'> 	mflr	r0</div><div class='ctx'> 	bl	1f</div><div class='ctx'> 1:	mflr	r5</div><div class='del'>-	LOAD_REG_IMMEDIATE(r4,1b)</div><div class='add'>+	PPC_LL	r4,(2f-1b)(r5)</div><div class='ctx'> 	subf	r5,r4,r5</div><div class='ctx'> 	add	r3,r3,r5</div><div class='ctx'> 	mtlr	r0</div><div class='ctx'> 	blr</div><div class='ctx'> </div><div class='add'>+	.align	3</div><div class='add'>+2:	PPC_LONG 1b</div><div class='add'>+</div><div class='ctx'> _GLOBAL(kernel_execve)</div><div class='ctx'> 	li	r0,__NR_execve</div><div class='ctx'> 	sc</div><div class='head'>diff --git a/arch/powerpc/kernel/misc_32.S b/arch/powerpc/kernel/misc_32.S<br/>index 7a6dfbca7682..6a9b4bf0d173 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kernel/misc_32.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/kernel/misc_32.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kernel/misc_32.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kernel/misc_32.S</a></div><div class='hunk'>@@ -274,6 +274,10 @@ _GLOBAL(real_writeb)</div><div class='ctx'> /*</div><div class='ctx'>  * Flush MMU TLB</div><div class='ctx'>  */</div><div class='add'>+#ifndef CONFIG_FSL_BOOKE</div><div class='add'>+_GLOBAL(_tlbil_all)</div><div class='add'>+_GLOBAL(_tlbil_pid)</div><div class='add'>+#endif</div><div class='ctx'> _GLOBAL(_tlbia)</div><div class='ctx'> #if defined(CONFIG_40x)</div><div class='ctx'> 	sync			/* Flush to memory before changing mapping */</div><div class='hunk'>@@ -344,6 +348,9 @@ _GLOBAL(_tlbia)</div><div class='ctx'> /*</div><div class='ctx'>  * Flush MMU TLB for a particular address</div><div class='ctx'>  */</div><div class='add'>+#ifndef CONFIG_FSL_BOOKE</div><div class='add'>+_GLOBAL(_tlbil_va)</div><div class='add'>+#endif</div><div class='ctx'> _GLOBAL(_tlbie)</div><div class='ctx'> #if defined(CONFIG_40x)</div><div class='ctx'> 	/* We run the search with interrupts disabled because we have to change</div><div class='hunk'>@@ -436,6 +443,53 @@ _GLOBAL(_tlbie)</div><div class='ctx'> #endif /* ! CONFIG_40x */</div><div class='ctx'> 	blr</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_FSL_BOOKE)</div><div class='add'>+/*</div><div class='add'>+ * Flush MMU TLB, but only on the local processor (no broadcast)</div><div class='add'>+ */</div><div class='add'>+_GLOBAL(_tlbil_all)</div><div class='add'>+#define MMUCSR0_TLBFI	(MMUCSR0_TLB0FI | MMUCSR0_TLB1FI | \</div><div class='add'>+			 MMUCSR0_TLB2FI | MMUCSR0_TLB3FI)</div><div class='add'>+	li	r3,(MMUCSR0_TLBFI)@l</div><div class='add'>+	mtspr	SPRN_MMUCSR0, r3</div><div class='add'>+1:</div><div class='add'>+	mfspr	r3,SPRN_MMUCSR0</div><div class='add'>+	andi.	r3,r3,MMUCSR0_TLBFI@l</div><div class='add'>+	bne	1b</div><div class='add'>+	blr</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Flush MMU TLB for a particular process id, but only on the local processor</div><div class='add'>+ * (no broadcast)</div><div class='add'>+ */</div><div class='add'>+_GLOBAL(_tlbil_pid)</div><div class='add'>+/* we currently do an invalidate all since we don't have per pid invalidate */</div><div class='add'>+	li	r3,(MMUCSR0_TLBFI)@l</div><div class='add'>+	mtspr	SPRN_MMUCSR0, r3</div><div class='add'>+1:</div><div class='add'>+	mfspr	r3,SPRN_MMUCSR0</div><div class='add'>+	andi.	r3,r3,MMUCSR0_TLBFI@l</div><div class='add'>+	bne	1b</div><div class='add'>+	blr</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Flush MMU TLB for a particular address, but only on the local processor</div><div class='add'>+ * (no broadcast)</div><div class='add'>+ */</div><div class='add'>+_GLOBAL(_tlbil_va)</div><div class='add'>+	slwi	r4,r4,16</div><div class='add'>+	mtspr	SPRN_MAS6,r4		/* assume AS=0 for now */</div><div class='add'>+	tlbsx	0,r3</div><div class='add'>+	mfspr	r4,SPRN_MAS1		/* check valid */</div><div class='add'>+	andis.	r3,r4,MAS1_VALID@h</div><div class='add'>+	beqlr</div><div class='add'>+	rlwinm	r4,r4,0,1,31</div><div class='add'>+	mtspr	SPRN_MAS1,r4</div><div class='add'>+	tlbwe</div><div class='add'>+	blr</div><div class='add'>+#endif /* CONFIG_FSL_BOOKE */</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Flush instruction cache.</div><div class='ctx'>  * This is a no-op on the 601.</div><div class='hunk'>@@ -846,8 +900,10 @@ _GLOBAL(kernel_thread)</div><div class='ctx'> 	li	r4,0		/* new sp (unused) */</div><div class='ctx'> 	li	r0,__NR_clone</div><div class='ctx'> 	sc</div><div class='del'>-	cmpwi	0,r3,0		/* parent or child? */</div><div class='del'>-	bne	1f		/* return if parent */</div><div class='add'>+	bns+	1f		/* did system call indicate error? */</div><div class='add'>+	neg	r3,r3		/* if so, make return code negative */</div><div class='add'>+1:	cmpwi	0,r3,0		/* parent or child? */</div><div class='add'>+	bne	2f		/* return if parent */</div><div class='ctx'> 	li	r0,0		/* make top-level stack frame */</div><div class='ctx'> 	stwu	r0,-16(r1)</div><div class='ctx'> 	mtlr	r30		/* fn addr in lr */</div><div class='hunk'>@@ -857,7 +913,7 @@ _GLOBAL(kernel_thread)</div><div class='ctx'> 	li	r0,__NR_exit	/* exit if function returns */</div><div class='ctx'> 	li	r3,0</div><div class='ctx'> 	sc</div><div class='del'>-1:	lwz	r30,8(r1)</div><div class='add'>+2:	lwz	r30,8(r1)</div><div class='ctx'> 	lwz	r31,12(r1)</div><div class='ctx'> 	addi	r1,r1,16</div><div class='ctx'> 	blr</div><div class='head'>diff --git a/arch/powerpc/kernel/misc_64.S b/arch/powerpc/kernel/misc_64.S<br/>index 4dd70cf7bb4e..3053fe5c62f2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kernel/misc_64.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/kernel/misc_64.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kernel/misc_64.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kernel/misc_64.S</a></div><div class='hunk'>@@ -426,8 +426,10 @@ _GLOBAL(kernel_thread)</div><div class='ctx'> 	li	r4,0		/* new sp (unused) */</div><div class='ctx'> 	li	r0,__NR_clone</div><div class='ctx'> 	sc</div><div class='del'>-	cmpdi	0,r3,0		/* parent or child? */</div><div class='del'>-	bne	1f		/* return if parent */</div><div class='add'>+	bns+	1f		/* did system call indicate error? */</div><div class='add'>+	neg	r3,r3		/* if so, make return code negative */</div><div class='add'>+1:	cmpdi	0,r3,0		/* parent or child? */</div><div class='add'>+	bne	2f		/* return if parent */</div><div class='ctx'> 	li	r0,0</div><div class='ctx'> 	stdu	r0,-STACK_FRAME_OVERHEAD(r1)</div><div class='ctx'> 	ld	r2,8(r29)</div><div class='hunk'>@@ -438,7 +440,7 @@ _GLOBAL(kernel_thread)</div><div class='ctx'> 	li	r0,__NR_exit	/* exit after child exits */</div><div class='ctx'>         li	r3,0</div><div class='ctx'> 	sc</div><div class='del'>-1:	addi	r1,r1,STACK_FRAME_OVERHEAD	</div><div class='add'>+2:	addi	r1,r1,STACK_FRAME_OVERHEAD</div><div class='ctx'> 	ld	r29,-24(r1)</div><div class='ctx'> 	ld	r30,-16(r1)</div><div class='ctx'> 	blr</div><div class='head'>diff --git a/arch/powerpc/kernel/of_device.c b/arch/powerpc/kernel/of_device.c<br/>index e9be908f199b..93ae5b169f41 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kernel/of_device.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/kernel/of_device.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kernel/of_device.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kernel/of_device.c</a></div><div class='hunk'>@@ -78,7 +78,7 @@ struct of_device *of_device_alloc(struct device_node *np,</div><div class='ctx'> 	dev-&gt;dev.parent = parent;</div><div class='ctx'> 	dev-&gt;dev.release = of_release_dev;</div><div class='ctx'> 	dev-&gt;dev.archdata.of_node = np;</div><div class='del'>-	dev-&gt;dev.archdata.numa_node = of_node_to_nid(np);</div><div class='add'>+	set_dev_node(&amp;dev-&gt;dev, of_node_to_nid(np));</div><div class='ctx'> </div><div class='ctx'> 	if (bus_id)</div><div class='ctx'> 		strlcpy(dev-&gt;dev.bus_id, bus_id, BUS_ID_SIZE);</div><div class='head'>diff --git a/arch/powerpc/kernel/paca.c b/arch/powerpc/kernel/paca.c<br/>index c9bf17eec31b..48a347133f41 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kernel/paca.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/kernel/paca.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kernel/paca.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kernel/paca.c</a></div><div class='hunk'>@@ -12,6 +12,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/lppaca.h&gt;</div><div class='ctx'> #include &lt;asm/paca.h&gt;</div><div class='add'>+#include &lt;asm/sections.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* This symbol is provided by the linker - let it fill in the paca</div><div class='ctx'>  * field correctly */</div><div class='hunk'>@@ -79,6 +80,8 @@ void __init initialise_pacas(void)</div><div class='ctx'> 		new_paca-&gt;lock_token = 0x8000;</div><div class='ctx'> 		new_paca-&gt;paca_index = cpu;</div><div class='ctx'> 		new_paca-&gt;kernel_toc = kernel_toc;</div><div class='add'>+		new_paca-&gt;kernelbase = (unsigned long) _stext;</div><div class='add'>+		new_paca-&gt;kernel_msr = MSR_KERNEL;</div><div class='ctx'> 		new_paca-&gt;hw_cpu_id = 0xffff;</div><div class='ctx'> 		new_paca-&gt;slb_shadow_ptr = &amp;slb_shadow[cpu];</div><div class='ctx'> 		new_paca-&gt;__current = &amp;init_task;</div><div class='head'>diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c<br/>index ea0c61e09b76..01ce8c38bae6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kernel/pci-common.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/kernel/pci-common.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kernel/pci-common.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kernel/pci-common.c</a></div><div class='hunk'>@@ -56,6 +56,34 @@ resource_size_t isa_mem_base;</div><div class='ctx'> /* Default PCI flags is 0 */</div><div class='ctx'> unsigned int ppc_pci_flags;</div><div class='ctx'> </div><div class='add'>+static struct dma_mapping_ops *pci_dma_ops;</div><div class='add'>+</div><div class='add'>+void set_pci_dma_ops(struct dma_mapping_ops *dma_ops)</div><div class='add'>+{</div><div class='add'>+	pci_dma_ops = dma_ops;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct dma_mapping_ops *get_pci_dma_ops(void)</div><div class='add'>+{</div><div class='add'>+	return pci_dma_ops;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(get_pci_dma_ops);</div><div class='add'>+</div><div class='add'>+int pci_set_dma_mask(struct pci_dev *dev, u64 mask)</div><div class='add'>+{</div><div class='add'>+	return dma_set_mask(&amp;dev-&gt;dev, mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = dma_set_mask(&amp;dev-&gt;dev, mask);</div><div class='add'>+	dev-&gt;dev.coherent_dma_mask = dev-&gt;dma_mask;</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> struct pci_controller *pcibios_alloc_controller(struct device_node *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_controller *phb;</div><div class='hunk'>@@ -180,6 +208,26 @@ char __devinit *pcibios_setup(char *str)</div><div class='ctx'> 	return str;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void __devinit pcibios_setup_new_device(struct pci_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct dev_archdata *sd = &amp;dev-&gt;dev.archdata;</div><div class='add'>+</div><div class='add'>+	sd-&gt;of_node = pci_device_to_OF_node(dev);</div><div class='add'>+</div><div class='add'>+	DBG("PCI: device %s OF node: %s\n", pci_name(dev),</div><div class='add'>+	    sd-&gt;of_node ? sd-&gt;of_node-&gt;full_name : "&lt;none&gt;");</div><div class='add'>+</div><div class='add'>+	sd-&gt;dma_ops = pci_dma_ops;</div><div class='add'>+#ifdef CONFIG_PPC32</div><div class='add'>+	sd-&gt;dma_data = (void *)PCI_DRAM_OFFSET;</div><div class='add'>+#endif</div><div class='add'>+	set_dev_node(&amp;dev-&gt;dev, pcibus_to_node(dev-&gt;bus));</div><div class='add'>+</div><div class='add'>+	if (ppc_md.pci_dma_dev_setup)</div><div class='add'>+		ppc_md.pci_dma_dev_setup(dev);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(pcibios_setup_new_device);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Reads the interrupt pin to determine if interrupt is use by card.</div><div class='ctx'>  * If the interrupt is used, then gets the interrupt line from the</div><div class='hunk'>@@ -371,7 +419,7 @@ pgprot_t pci_phys_mem_access_prot(struct file *file,</div><div class='ctx'> 	struct pci_dev *pdev = NULL;</div><div class='ctx'> 	struct resource *found = NULL;</div><div class='ctx'> 	unsigned long prot = pgprot_val(protection);</div><div class='del'>-	unsigned long offset = pfn &lt;&lt; PAGE_SHIFT;</div><div class='add'>+	resource_size_t offset = ((resource_size_t)pfn) &lt;&lt; PAGE_SHIFT;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (page_is_ram(pfn))</div><div class='hunk'>@@ -422,7 +470,8 @@ pgprot_t pci_phys_mem_access_prot(struct file *file,</div><div class='ctx'> int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,</div><div class='ctx'> 			enum pci_mmap_state mmap_state, int write_combine)</div><div class='ctx'> {</div><div class='del'>-	resource_size_t offset = vma-&gt;vm_pgoff &lt;&lt; PAGE_SHIFT;</div><div class='add'>+	resource_size_t offset =</div><div class='add'>+		((resource_size_t)vma-&gt;vm_pgoff) &lt;&lt; PAGE_SHIFT;</div><div class='ctx'> 	struct resource *rp;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -731,11 +780,6 @@ static void __devinit fixup_resource(struct resource *res, struct pci_dev *dev)</div><div class='ctx'> </div><div class='ctx'> 	res-&gt;start = (res-&gt;start + offset) &amp; mask;</div><div class='ctx'> 	res-&gt;end = (res-&gt;end + offset) &amp; mask;</div><div class='del'>-</div><div class='del'>-	pr_debug("PCI:%s            %016llx-%016llx\n",</div><div class='del'>-		 pci_name(dev),</div><div class='del'>-		 (unsigned long long)res-&gt;start,</div><div class='del'>-		 (unsigned long long)res-&gt;end);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -781,6 +825,11 @@ static void __devinit pcibios_fixup_resources(struct pci_dev *dev)</div><div class='ctx'> 			 (unsigned int)res-&gt;flags);</div><div class='ctx'> </div><div class='ctx'> 		fixup_resource(res, dev);</div><div class='add'>+</div><div class='add'>+		pr_debug("PCI:%s            %016llx-%016llx\n",</div><div class='add'>+			 pci_name(dev),</div><div class='add'>+			 (unsigned long long)res-&gt;start,</div><div class='add'>+			 (unsigned long long)res-&gt;end);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Call machine specific resource fixup */</div><div class='hunk'>@@ -789,58 +838,127 @@ static void __devinit pcibios_fixup_resources(struct pci_dev *dev)</div><div class='ctx'> }</div><div class='ctx'> DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, pcibios_fixup_resources);</div><div class='ctx'> </div><div class='del'>-static void __devinit __pcibios_fixup_bus(struct pci_bus *bus)</div><div class='add'>+/* This function tries to figure out if a bridge resource has been initialized</div><div class='add'>+ * by the firmware or not. It doesn't have to be absolutely bullet proof, but</div><div class='add'>+ * things go more smoothly when it gets it right. It should covers cases such</div><div class='add'>+ * as Apple "closed" bridge resources and bare-metal pSeries unassigned bridges</div><div class='add'>+ */</div><div class='add'>+static int __devinit pcibios_uninitialized_bridge_resource(struct pci_bus *bus,</div><div class='add'>+							   struct resource *res)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_controller *hose = pci_bus_to_host(bus);</div><div class='ctx'> 	struct pci_dev *dev = bus-&gt;self;</div><div class='add'>+	resource_size_t offset;</div><div class='add'>+	u16 command;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-	pr_debug("PCI: Fixup bus %d (%s)\n", bus-&gt;number, dev ? pci_name(dev) : "PHB");</div><div class='add'>+	/* We don't do anything if PCI_PROBE_ONLY is set */</div><div class='add'>+	if (ppc_pci_flags &amp; PPC_PCI_PROBE_ONLY)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-	/* Fixup PCI&lt;-&gt;PCI bridges. Host bridges are handled separately, for</div><div class='del'>-	 * now differently between 32 and 64 bits.</div><div class='del'>-	 */</div><div class='del'>-	if (dev != NULL) {</div><div class='del'>-		struct resource *res;</div><div class='del'>-		int i;</div><div class='add'>+	/* Job is a bit different between memory and IO */</div><div class='add'>+	if (res-&gt;flags &amp; IORESOURCE_MEM) {</div><div class='add'>+		/* If the BAR is non-0 (res != pci_mem_offset) then it's probably been</div><div class='add'>+		 * initialized by somebody</div><div class='add'>+		 */</div><div class='add'>+		if (res-&gt;start != hose-&gt;pci_mem_offset)</div><div class='add'>+			return 0;</div><div class='ctx'> </div><div class='del'>-		for (i = 0; i &lt; PCI_BUS_NUM_RESOURCES; ++i) {</div><div class='del'>-			if ((res = bus-&gt;resource[i]) == NULL)</div><div class='del'>-				continue;</div><div class='del'>-			if (!res-&gt;flags)</div><div class='del'>-				continue;</div><div class='del'>-			if (i &gt;= 3 &amp;&amp; bus-&gt;self-&gt;transparent)</div><div class='del'>-				continue;</div><div class='del'>-			/* On PowerMac, Apple leaves bridge windows open over</div><div class='del'>-			 * an inaccessible region of memory space (0...fffff)</div><div class='del'>-			 * which is somewhat bogus, but that's what they think</div><div class='del'>-			 * means disabled...</div><div class='del'>-			 *</div><div class='del'>-			 * We clear those to force them to be reallocated later</div><div class='del'>-			 *</div><div class='del'>-			 * We detect such regions by the fact that the base is</div><div class='del'>-			 * equal to the pci_mem_offset of the host bridge and</div><div class='del'>-			 * their size is smaller than 1M.</div><div class='del'>-			 */</div><div class='del'>-			if (res-&gt;flags &amp; IORESOURCE_MEM &amp;&amp;</div><div class='del'>-			    res-&gt;start == hose-&gt;pci_mem_offset &amp;&amp;</div><div class='del'>-			    res-&gt;end &lt; 0x100000) {</div><div class='del'>-				printk(KERN_INFO</div><div class='del'>-				       "PCI: Closing bogus Apple Firmware"</div><div class='del'>-				       " region %d on bus 0x%02x\n",</div><div class='del'>-				       i, bus-&gt;number);</div><div class='del'>-				res-&gt;flags = 0;</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='add'>+		/* The BAR is 0, let's check if memory decoding is enabled on</div><div class='add'>+		 * the bridge. If not, we consider it unassigned</div><div class='add'>+		 */</div><div class='add'>+		pci_read_config_word(dev, PCI_COMMAND, &amp;command);</div><div class='add'>+		if ((command &amp; PCI_COMMAND_MEMORY) == 0)</div><div class='add'>+			return 1;</div><div class='ctx'> </div><div class='del'>-			pr_debug("PCI:%s Bus rsrc %d %016llx-%016llx [%x] fixup...\n",</div><div class='del'>-				 pci_name(dev), i,</div><div class='del'>-				 (unsigned long long)res-&gt;start,\</div><div class='del'>-				 (unsigned long long)res-&gt;end,</div><div class='del'>-				 (unsigned int)res-&gt;flags);</div><div class='add'>+		/* Memory decoding is enabled and the BAR is 0. If any of the bridge</div><div class='add'>+		 * resources covers that starting address (0 then it's good enough for</div><div class='add'>+		 * us for memory</div><div class='add'>+		 */</div><div class='add'>+		for (i = 0; i &lt; 3; i++) {</div><div class='add'>+			if ((hose-&gt;mem_resources[i].flags &amp; IORESOURCE_MEM) &amp;&amp;</div><div class='add'>+			    hose-&gt;mem_resources[i].start == hose-&gt;pci_mem_offset)</div><div class='add'>+				return 0;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-			fixup_resource(res, dev);</div><div class='add'>+		/* Well, it starts at 0 and we know it will collide so we may as</div><div class='add'>+		 * well consider it as unassigned. That covers the Apple case.</div><div class='add'>+		 */</div><div class='add'>+		return 1;</div><div class='add'>+	} else {</div><div class='add'>+		/* If the BAR is non-0, then we consider it assigned */</div><div class='add'>+		offset = (unsigned long)hose-&gt;io_base_virt - _IO_BASE;</div><div class='add'>+		if (((res-&gt;start - offset) &amp; 0xfffffffful) != 0)</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		/* Here, we are a bit different than memory as typically IO space</div><div class='add'>+		 * starting at low addresses -is- valid. What we do instead if that</div><div class='add'>+		 * we consider as unassigned anything that doesn't have IO enabled</div><div class='add'>+		 * in the PCI command register, and that's it.</div><div class='add'>+		 */</div><div class='add'>+		pci_read_config_word(dev, PCI_COMMAND, &amp;command);</div><div class='add'>+		if (command &amp; PCI_COMMAND_IO)</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		/* It's starting at 0 and IO is disabled in the bridge, consider</div><div class='add'>+		 * it unassigned</div><div class='add'>+		 */</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Fixup resources of a PCI&lt;-&gt;PCI bridge */</div><div class='add'>+static void __devinit pcibios_fixup_bridge(struct pci_bus *bus)</div><div class='add'>+{</div><div class='add'>+	struct resource *res;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	struct pci_dev *dev = bus-&gt;self;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; PCI_BUS_NUM_RESOURCES; ++i) {</div><div class='add'>+		if ((res = bus-&gt;resource[i]) == NULL)</div><div class='add'>+			continue;</div><div class='add'>+		if (!res-&gt;flags)</div><div class='add'>+			continue;</div><div class='add'>+		if (i &gt;= 3 &amp;&amp; bus-&gt;self-&gt;transparent)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		pr_debug("PCI:%s Bus rsrc %d %016llx-%016llx [%x] fixup...\n",</div><div class='add'>+			 pci_name(dev), i,</div><div class='add'>+			 (unsigned long long)res-&gt;start,\</div><div class='add'>+			 (unsigned long long)res-&gt;end,</div><div class='add'>+			 (unsigned int)res-&gt;flags);</div><div class='add'>+</div><div class='add'>+		/* Perform fixup */</div><div class='add'>+		fixup_resource(res, dev);</div><div class='add'>+</div><div class='add'>+		/* Try to detect uninitialized P2P bridge resources,</div><div class='add'>+		 * and clear them out so they get re-assigned later</div><div class='add'>+		 */</div><div class='add'>+		if (pcibios_uninitialized_bridge_resource(bus, res)) {</div><div class='add'>+			res-&gt;flags = 0;</div><div class='add'>+			pr_debug("PCI:%s            (unassigned)\n", pci_name(dev));</div><div class='add'>+		} else {</div><div class='add'>+</div><div class='add'>+			pr_debug("PCI:%s            %016llx-%016llx\n",</div><div class='add'>+				 pci_name(dev),</div><div class='add'>+				 (unsigned long long)res-&gt;start,</div><div class='add'>+				 (unsigned long long)res-&gt;end);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __devinit __pcibios_fixup_bus(struct pci_bus *bus)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *dev = bus-&gt;self;</div><div class='add'>+</div><div class='add'>+	pr_debug("PCI: Fixup bus %d (%s)\n", bus-&gt;number, dev ? pci_name(dev) : "PHB");</div><div class='add'>+</div><div class='add'>+	/* Fixup PCI&lt;-&gt;PCI bridges. Host bridges are handled separately, for</div><div class='add'>+	 * now differently between 32 and 64 bits.</div><div class='add'>+	 */</div><div class='add'>+	if (dev != NULL)</div><div class='add'>+		pcibios_fixup_bridge(bus);</div><div class='ctx'> </div><div class='ctx'> 	/* Additional setup that is different between 32 and 64 bits for now */</div><div class='ctx'> 	pcibios_do_bus_setup(bus);</div><div class='head'>diff --git a/arch/powerpc/kernel/pci_32.c b/arch/powerpc/kernel/pci_32.c<br/>index 88db4ffaf11c..131b1dfa68c6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kernel/pci_32.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/kernel/pci_32.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kernel/pci_32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kernel/pci_32.c</a></div><div class='hunk'>@@ -53,12 +53,19 @@ LIST_HEAD(hose_list);</div><div class='ctx'> </div><div class='ctx'> static int pci_bus_count;</div><div class='ctx'> </div><div class='add'>+/* This will remain NULL for now, until isa-bridge.c is made common</div><div class='add'>+ * to both 32-bit and 64-bit.</div><div class='add'>+ */</div><div class='add'>+struct pci_dev *isa_bridge_pcidev;</div><div class='add'>+EXPORT_SYMBOL_GPL(isa_bridge_pcidev);</div><div class='add'>+</div><div class='ctx'> static void</div><div class='del'>-fixup_hide_host_resource_fsl(struct pci_dev* dev)</div><div class='add'>+fixup_hide_host_resource_fsl(struct pci_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int i, class = dev-&gt;class &gt;&gt; 8;</div><div class='ctx'> </div><div class='del'>-	if ((class == PCI_CLASS_PROCESSOR_POWERPC) &amp;&amp;</div><div class='add'>+	if ((class == PCI_CLASS_PROCESSOR_POWERPC ||</div><div class='add'>+	     class == PCI_CLASS_BRIDGE_OTHER) &amp;&amp;</div><div class='ctx'> 		(dev-&gt;hdr_type == PCI_HEADER_TYPE_NORMAL) &amp;&amp;</div><div class='ctx'> 		(dev-&gt;bus-&gt;parent == NULL)) {</div><div class='ctx'> 		for (i = 0; i &lt; DEVICE_COUNT_RESOURCE; i++) {</div><div class='hunk'>@@ -424,6 +431,7 @@ void __devinit pcibios_do_bus_setup(struct pci_bus *bus)</div><div class='ctx'> 	unsigned long io_offset;</div><div class='ctx'> 	struct resource *res;</div><div class='ctx'> 	int i;</div><div class='add'>+	struct pci_dev *dev;</div><div class='ctx'> </div><div class='ctx'> 	/* Hookup PHB resources */</div><div class='ctx'> 	io_offset = (unsigned long)hose-&gt;io_base_virt - isa_io_base;</div><div class='hunk'>@@ -457,6 +465,12 @@ void __devinit pcibios_do_bus_setup(struct pci_bus *bus)</div><div class='ctx'> 			bus-&gt;resource[i+1] = res;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	if (ppc_md.pci_dma_bus_setup)</div><div class='add'>+		ppc_md.pci_dma_bus_setup(bus);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(dev, &amp;bus-&gt;devices, bus_list)</div><div class='add'>+		pcibios_setup_new_device(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* the next one is stolen from the alpha port... */</div><div class='head'>diff --git a/arch/powerpc/kernel/pci_64.c b/arch/powerpc/kernel/pci_64.c<br/>index 30eedfc5a566..8247cff1cb3e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kernel/pci_64.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/kernel/pci_64.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kernel/pci_64.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kernel/pci_64.c</a></div><div class='hunk'>@@ -52,35 +52,6 @@ EXPORT_SYMBOL(pci_io_base);</div><div class='ctx'> </div><div class='ctx'> LIST_HEAD(hose_list);</div><div class='ctx'> </div><div class='del'>-static struct dma_mapping_ops *pci_dma_ops;</div><div class='del'>-</div><div class='del'>-void set_pci_dma_ops(struct dma_mapping_ops *dma_ops)</div><div class='del'>-{</div><div class='del'>-	pci_dma_ops = dma_ops;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct dma_mapping_ops *get_pci_dma_ops(void)</div><div class='del'>-{</div><div class='del'>-	return pci_dma_ops;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(get_pci_dma_ops);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-int pci_set_dma_mask(struct pci_dev *dev, u64 mask)</div><div class='del'>-{</div><div class='del'>-	return dma_set_mask(&amp;dev-&gt;dev, mask);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask)</div><div class='del'>-{</div><div class='del'>-	int rc;</div><div class='del'>-</div><div class='del'>-	rc = dma_set_mask(&amp;dev-&gt;dev, mask);</div><div class='del'>-	dev-&gt;dev.coherent_dma_mask = dev-&gt;dma_mask;</div><div class='del'>-</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void fixup_broken_pcnet32(struct pci_dev* dev)</div><div class='ctx'> {</div><div class='ctx'> 	if ((dev-&gt;class&gt;&gt;8 == PCI_CLASS_NETWORK_ETHERNET)) {</div><div class='hunk'>@@ -548,26 +519,6 @@ int __devinit pcibios_map_io_space(struct pci_bus *bus)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(pcibios_map_io_space);</div><div class='ctx'> </div><div class='del'>-void __devinit pcibios_setup_new_device(struct pci_dev *dev)</div><div class='del'>-{</div><div class='del'>-	struct dev_archdata *sd = &amp;dev-&gt;dev.archdata;</div><div class='del'>-</div><div class='del'>-	sd-&gt;of_node = pci_device_to_OF_node(dev);</div><div class='del'>-</div><div class='del'>-	DBG("PCI: device %s OF node: %s\n", pci_name(dev),</div><div class='del'>-	    sd-&gt;of_node ? sd-&gt;of_node-&gt;full_name : "&lt;none&gt;");</div><div class='del'>-</div><div class='del'>-	sd-&gt;dma_ops = pci_dma_ops;</div><div class='del'>-#ifdef CONFIG_NUMA</div><div class='del'>-	sd-&gt;numa_node = pcibus_to_node(dev-&gt;bus);</div><div class='del'>-#else</div><div class='del'>-	sd-&gt;numa_node = -1;</div><div class='del'>-#endif</div><div class='del'>-	if (ppc_md.pci_dma_dev_setup)</div><div class='del'>-		ppc_md.pci_dma_dev_setup(dev);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(pcibios_setup_new_device);</div><div class='del'>-</div><div class='ctx'> void __devinit pcibios_do_bus_setup(struct pci_bus *bus)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev *dev;</div><div class='head'>diff --git a/arch/powerpc/kernel/ppc_ksyms.c b/arch/powerpc/kernel/ppc_ksyms.c<br/>index e1ea4fe5cfbd..8edc2359c419 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kernel/ppc_ksyms.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/kernel/ppc_ksyms.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kernel/ppc_ksyms.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kernel/ppc_ksyms.c</a></div><div class='hunk'>@@ -119,6 +119,9 @@ EXPORT_SYMBOL(flush_instruction_cache);</div><div class='ctx'> EXPORT_SYMBOL(flush_tlb_kernel_range);</div><div class='ctx'> EXPORT_SYMBOL(flush_tlb_page);</div><div class='ctx'> EXPORT_SYMBOL(_tlbie);</div><div class='add'>+#if defined(CONFIG_4xx) || defined(CONFIG_8xx) || defined(CONFIG_FSL_BOOKE)</div><div class='add'>+EXPORT_SYMBOL(_tlbil_va);</div><div class='add'>+#endif</div><div class='ctx'> #endif</div><div class='ctx'> EXPORT_SYMBOL(__flush_icache_range);</div><div class='ctx'> EXPORT_SYMBOL(flush_dcache_range);</div><div class='head'>diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c<br/>index 87d83c56b31e..3a2dc7e6586a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kernel/prom.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/kernel/prom.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kernel/prom.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kernel/prom.c</a></div><div class='hunk'>@@ -888,9 +888,10 @@ static u64 __init dt_mem_next_cell(int s, cell_t **cellp)</div><div class='ctx'>  */</div><div class='ctx'> static int __init early_init_dt_scan_drconf_memory(unsigned long node)</div><div class='ctx'> {</div><div class='del'>-	cell_t *dm, *ls;</div><div class='add'>+	cell_t *dm, *ls, *usm;</div><div class='ctx'> 	unsigned long l, n, flags;</div><div class='ctx'> 	u64 base, size, lmb_size;</div><div class='add'>+	unsigned int is_kexec_kdump = 0, rngs;</div><div class='ctx'> </div><div class='ctx'> 	ls = (cell_t *)of_get_flat_dt_prop(node, "ibm,lmb-size", &amp;l);</div><div class='ctx'> 	if (ls == NULL || l &lt; dt_root_size_cells * sizeof(cell_t))</div><div class='hunk'>@@ -905,6 +906,12 @@ static int __init early_init_dt_scan_drconf_memory(unsigned long node)</div><div class='ctx'> 	if (l &lt; (n * (dt_root_addr_cells + 4) + 1) * sizeof(cell_t))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	/* check if this is a kexec/kdump kernel. */</div><div class='add'>+	usm = (cell_t *)of_get_flat_dt_prop(node, "linux,drconf-usable-memory",</div><div class='add'>+						 &amp;l);</div><div class='add'>+	if (usm != NULL)</div><div class='add'>+		is_kexec_kdump = 1;</div><div class='add'>+</div><div class='ctx'> 	for (; n != 0; --n) {</div><div class='ctx'> 		base = dt_mem_next_cell(dt_root_addr_cells, &amp;dm);</div><div class='ctx'> 		flags = dm[3];</div><div class='hunk'>@@ -915,13 +922,34 @@ static int __init early_init_dt_scan_drconf_memory(unsigned long node)</div><div class='ctx'> 		if ((flags &amp; 0x80) || !(flags &amp; 0x8))</div><div class='ctx'> 			continue;</div><div class='ctx'> 		size = lmb_size;</div><div class='del'>-		if (iommu_is_off) {</div><div class='del'>-			if (base &gt;= 0x80000000ul)</div><div class='add'>+		rngs = 1;</div><div class='add'>+		if (is_kexec_kdump) {</div><div class='add'>+			/*</div><div class='add'>+			 * For each lmb in ibm,dynamic-memory, a corresponding</div><div class='add'>+			 * entry in linux,drconf-usable-memory property contains</div><div class='add'>+			 * a counter 'p' followed by 'p' (base, size) duple.</div><div class='add'>+			 * Now read the counter from</div><div class='add'>+			 * linux,drconf-usable-memory property</div><div class='add'>+			 */</div><div class='add'>+			rngs = dt_mem_next_cell(dt_root_size_cells, &amp;usm);</div><div class='add'>+			if (!rngs) /* there are no (base, size) duple */</div><div class='ctx'> 				continue;</div><div class='del'>-			if ((base + size) &gt; 0x80000000ul)</div><div class='del'>-				size = 0x80000000ul - base;</div><div class='ctx'> 		}</div><div class='del'>-		lmb_add(base, size);</div><div class='add'>+		do {</div><div class='add'>+			if (is_kexec_kdump) {</div><div class='add'>+				base = dt_mem_next_cell(dt_root_addr_cells,</div><div class='add'>+							 &amp;usm);</div><div class='add'>+				size = dt_mem_next_cell(dt_root_size_cells,</div><div class='add'>+							 &amp;usm);</div><div class='add'>+			}</div><div class='add'>+			if (iommu_is_off) {</div><div class='add'>+				if (base &gt;= 0x80000000ul)</div><div class='add'>+					continue;</div><div class='add'>+				if ((base + size) &gt; 0x80000000ul)</div><div class='add'>+					size = 0x80000000ul - base;</div><div class='add'>+			}</div><div class='add'>+			lmb_add(base, size);</div><div class='add'>+		} while (--rngs);</div><div class='ctx'> 	}</div><div class='ctx'> 	lmb_dump_all();</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1164,6 +1192,9 @@ void __init early_init_devtree(void *params)</div><div class='ctx'> </div><div class='ctx'> 	/* Reserve LMB regions used by kernel, initrd, dt, etc... */</div><div class='ctx'> 	lmb_reserve(PHYSICAL_START, __pa(klimit) - PHYSICAL_START);</div><div class='add'>+	/* If relocatable, reserve first 32k for interrupt vectors etc. */</div><div class='add'>+	if (PHYSICAL_START &gt; MEMORY_START)</div><div class='add'>+		lmb_reserve(MEMORY_START, 0x8000);</div><div class='ctx'> 	reserve_kdump_trampoline();</div><div class='ctx'> 	reserve_crashkernel();</div><div class='ctx'> 	early_reserve_mem();</div><div class='head'>diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c<br/>index b72849ac7db3..2fdbc18ae94a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kernel/prom_init.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/kernel/prom_init.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kernel/prom_init.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kernel/prom_init.c</a></div><div class='hunk'>@@ -732,7 +732,7 @@ static struct fake_elf {</div><div class='ctx'> 			u32	ignore_me;</div><div class='ctx'> 		} rpadesc;</div><div class='ctx'> 	} rpanote;</div><div class='del'>-} fake_elf = {</div><div class='add'>+} fake_elf __section(.fakeelf) = {</div><div class='ctx'> 	.elfhdr = {</div><div class='ctx'> 		.e_ident = { 0x7f, 'E', 'L', 'F',</div><div class='ctx'> 			     ELFCLASS32, ELFDATA2MSB, EV_CURRENT },</div><div class='hunk'>@@ -774,13 +774,13 @@ static struct fake_elf {</div><div class='ctx'> 		.type = 0x12759999,</div><div class='ctx'> 		.name = "IBM,RPA-Client-Config",</div><div class='ctx'> 		.rpadesc = {</div><div class='del'>-			.lpar_affinity = 0,</div><div class='del'>-			.min_rmo_size = 64,	/* in megabytes */</div><div class='add'>+			.lpar_affinity = 1,</div><div class='add'>+			.min_rmo_size = 128,	/* in megabytes */</div><div class='ctx'> 			.min_rmo_percent = 0,</div><div class='del'>-			.max_pft_size = 48,	/* 2^48 bytes max PFT size */</div><div class='add'>+			.max_pft_size = 46,	/* 2^46 bytes max PFT size */</div><div class='ctx'> 			.splpar = 1,</div><div class='ctx'> 			.min_load = ~0U,</div><div class='del'>-			.new_mem_def = 0</div><div class='add'>+			.new_mem_def = 1</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='hunk'>@@ -1321,7 +1321,7 @@ static void __init prom_initialize_tce_table(void)</div><div class='ctx'>  *</div><div class='ctx'>  * -- Cort</div><div class='ctx'>  */</div><div class='del'>-extern void __secondary_hold(void);</div><div class='add'>+extern char __secondary_hold;</div><div class='ctx'> extern unsigned long __secondary_hold_spinloop;</div><div class='ctx'> extern unsigned long __secondary_hold_acknowledge;</div><div class='ctx'> </div><div class='hunk'>@@ -1342,13 +1342,7 @@ static void __init prom_hold_cpus(void)</div><div class='ctx'> 		= (void *) LOW_ADDR(__secondary_hold_spinloop);</div><div class='ctx'> 	unsigned long *acknowledge</div><div class='ctx'> 		= (void *) LOW_ADDR(__secondary_hold_acknowledge);</div><div class='del'>-#ifdef CONFIG_PPC64</div><div class='del'>-	/* __secondary_hold is actually a descriptor, not the text address */</div><div class='del'>-	unsigned long secondary_hold</div><div class='del'>-		= __pa(*PTRRELOC((unsigned long *)__secondary_hold));</div><div class='del'>-#else</div><div class='ctx'> 	unsigned long secondary_hold = LOW_ADDR(__secondary_hold);</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> 	prom_debug("prom_hold_cpus: start...\n");</div><div class='ctx'> 	prom_debug("    1) spinloop       = 0x%x\n", (unsigned long)spinloop);</div><div class='hunk'>@@ -2315,13 +2309,14 @@ static void __init prom_check_initrd(unsigned long r3, unsigned long r4)</div><div class='ctx'> </div><div class='ctx'> unsigned long __init prom_init(unsigned long r3, unsigned long r4,</div><div class='ctx'> 			       unsigned long pp,</div><div class='del'>-			       unsigned long r6, unsigned long r7)</div><div class='add'>+			       unsigned long r6, unsigned long r7,</div><div class='add'>+			       unsigned long kbase)</div><div class='ctx'> {	</div><div class='ctx'> 	struct prom_t *_prom;</div><div class='ctx'> 	unsigned long hdr;</div><div class='del'>-	unsigned long offset = reloc_offset();</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PPC32</div><div class='add'>+	unsigned long offset = reloc_offset();</div><div class='ctx'> 	reloc_got2(offset);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -2355,9 +2350,11 @@ unsigned long __init prom_init(unsigned long r3, unsigned long r4,</div><div class='ctx'> 	 */</div><div class='ctx'> 	RELOC(of_platform) = prom_find_machine_type();</div><div class='ctx'> </div><div class='add'>+#ifndef CONFIG_RELOCATABLE</div><div class='ctx'> 	/* Bail if this is a kdump kernel. */</div><div class='ctx'> 	if (PHYSICAL_START &gt; 0)</div><div class='ctx'> 		prom_panic("Error: You can't boot a kdump kernel from OF!\n");</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Check for an initrd</div><div class='hunk'>@@ -2377,7 +2374,7 @@ unsigned long __init prom_init(unsigned long r3, unsigned long r4,</div><div class='ctx'> 	 * Copy the CPU hold code</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (RELOC(of_platform) != PLATFORM_POWERMAC)</div><div class='del'>-		copy_and_flush(0, KERNELBASE + offset, 0x100, 0);</div><div class='add'>+		copy_and_flush(0, kbase, 0x100, 0);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Do early parsing of command line</div><div class='hunk'>@@ -2480,7 +2477,7 @@ unsigned long __init prom_init(unsigned long r3, unsigned long r4,</div><div class='ctx'> 	reloc_got2(-offset);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	__start(hdr, KERNELBASE + offset, 0);</div><div class='add'>+	__start(hdr, kbase, 0);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/kernel/reloc_64.S b/arch/powerpc/kernel/reloc_64.S<br/>new file mode 100644<br/>index 000000000000..b47a0e1ab001<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kernel/reloc_64.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kernel/reloc_64.S</a></div><div class='hunk'>@@ -0,0 +1,87 @@</div><div class='add'>+/*</div><div class='add'>+ * Code to process dynamic relocations in the kernel.</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2008 Paul Mackerras, IBM Corp.</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or</div><div class='add'>+ *  modify it under the terms of the GNU General Public License</div><div class='add'>+ *  as published by the Free Software Foundation; either version</div><div class='add'>+ *  2 of the License, or (at your option) any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;asm/ppc_asm.h&gt;</div><div class='add'>+</div><div class='add'>+RELA = 7</div><div class='add'>+RELACOUNT = 0x6ffffff9</div><div class='add'>+R_PPC64_RELATIVE = 22</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * r3 = desired final address of kernel</div><div class='add'>+ */</div><div class='add'>+_GLOBAL(relocate)</div><div class='add'>+	mflr	r0</div><div class='add'>+	bcl	20,31,$+4</div><div class='add'>+0:	mflr	r12		/* r12 has runtime addr of label 0 */</div><div class='add'>+	mtlr	r0</div><div class='add'>+	ld	r11,(p_dyn - 0b)(r12)</div><div class='add'>+	add	r11,r11,r12	/* r11 has runtime addr of .dynamic section */</div><div class='add'>+	ld	r9,(p_rela - 0b)(r12)</div><div class='add'>+	add	r9,r9,r12	/* r9 has runtime addr of .rela.dyn section */</div><div class='add'>+	ld	r10,(p_st - 0b)(r12)</div><div class='add'>+	add	r10,r10,r12	/* r10 has runtime addr of _stext */</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Scan the dynamic section for the RELA and RELACOUNT entries.</div><div class='add'>+	 */</div><div class='add'>+	li	r7,0</div><div class='add'>+	li	r8,0</div><div class='add'>+1:	ld	r6,0(r11)	/* get tag */</div><div class='add'>+	cmpdi	r6,0</div><div class='add'>+	beq	4f		/* end of list */</div><div class='add'>+	cmpdi	r6,RELA</div><div class='add'>+	bne	2f</div><div class='add'>+	ld	r7,8(r11)	/* get RELA pointer in r7 */</div><div class='add'>+	b	3f</div><div class='add'>+2:	addis	r6,r6,(-RELACOUNT)@ha</div><div class='add'>+	cmpdi	r6,RELACOUNT@l</div><div class='add'>+	bne	3f</div><div class='add'>+	ld	r8,8(r11)	/* get RELACOUNT value in r8 */</div><div class='add'>+3:	addi	r11,r11,16</div><div class='add'>+	b	1b</div><div class='add'>+4:	cmpdi	r7,0		/* check we have both RELA and RELACOUNT */</div><div class='add'>+	cmpdi	cr1,r8,0</div><div class='add'>+	beq	6f</div><div class='add'>+	beq	cr1,6f</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Work out linktime address of _stext and hence the</div><div class='add'>+	 * relocation offset to be applied.</div><div class='add'>+	 * cur_offset [r7] = rela.run [r9] - rela.link [r7]</div><div class='add'>+	 * _stext.link [r10] = _stext.run [r10] - cur_offset [r7]</div><div class='add'>+	 * final_offset [r3] = _stext.final [r3] - _stext.link [r10]</div><div class='add'>+	 */</div><div class='add'>+	subf	r7,r7,r9	/* cur_offset */</div><div class='add'>+	subf	r10,r7,r10</div><div class='add'>+	subf	r3,r10,r3	/* final_offset */</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Run through the list of relocations and process the</div><div class='add'>+	 * R_PPC64_RELATIVE ones.</div><div class='add'>+	 */</div><div class='add'>+	mtctr	r8</div><div class='add'>+5:	lwz	r0,12(9)	/* ELF64_R_TYPE(reloc-&gt;r_info) */</div><div class='add'>+	cmpwi	r0,R_PPC64_RELATIVE</div><div class='add'>+	bne	6f</div><div class='add'>+	ld	r6,0(r9)	/* reloc-&gt;r_offset */</div><div class='add'>+	ld	r0,16(r9)	/* reloc-&gt;r_addend */</div><div class='add'>+	add	r0,r0,r3</div><div class='add'>+	stdx	r0,r7,r6</div><div class='add'>+	addi	r9,r9,24</div><div class='add'>+	bdnz	5b</div><div class='add'>+</div><div class='add'>+6:	blr</div><div class='add'>+</div><div class='add'>+p_dyn:	.llong	__dynamic_start - 0b</div><div class='add'>+p_rela:	.llong	__rela_dyn_start - 0b</div><div class='add'>+p_st:	.llong	_stext - 0b</div><div class='add'>+</div><div class='head'>diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c<br/>index 9cc5a52711e5..5ec56ff03e86 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kernel/setup-common.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/kernel/setup-common.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kernel/setup-common.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kernel/setup-common.c</a></div><div class='hunk'>@@ -254,8 +254,21 @@ static int show_cpuinfo(struct seq_file *m, void *v)</div><div class='ctx'> 	/* If we are a Freescale core do a simple check so</div><div class='ctx'> 	 * we dont have to keep adding cases in the future */</div><div class='ctx'> 	if (PVR_VER(pvr) &amp; 0x8000) {</div><div class='del'>-		maj = PVR_MAJ(pvr);</div><div class='del'>-		min = PVR_MIN(pvr);</div><div class='add'>+		switch (PVR_VER(pvr)) {</div><div class='add'>+		case 0x8000:	/* 7441/7450/7451, Voyager */</div><div class='add'>+		case 0x8001:	/* 7445/7455, Apollo 6 */</div><div class='add'>+		case 0x8002:	/* 7447/7457, Apollo 7 */</div><div class='add'>+		case 0x8003:	/* 7447A, Apollo 7 PM */</div><div class='add'>+		case 0x8004:	/* 7448, Apollo 8 */</div><div class='add'>+		case 0x800c:	/* 7410, Nitro */</div><div class='add'>+			maj = ((pvr &gt;&gt; 8) &amp; 0xF);</div><div class='add'>+			min = PVR_MIN(pvr);</div><div class='add'>+			break;</div><div class='add'>+		default:	/* e500/book-e */</div><div class='add'>+			maj = PVR_MAJ(pvr);</div><div class='add'>+			min = PVR_MIN(pvr);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		switch (PVR_VER(pvr)) {</div><div class='ctx'> 			case 0x0020:	/* 403 family */</div><div class='head'>diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c<br/>index 066e65c59b58..c1a27626a940 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kernel/setup_32.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/kernel/setup_32.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kernel/setup_32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kernel/setup_32.c</a></div><div class='hunk'>@@ -111,7 +111,7 @@ notrace unsigned long __init early_init(unsigned long dt_ptr)</div><div class='ctx'>  * This is called very early on the boot process, after a minimal</div><div class='ctx'>  * MMU environment has been set up but before MMU_init is called.</div><div class='ctx'>  */</div><div class='del'>-notrace void __init machine_init(unsigned long dt_ptr, unsigned long phys)</div><div class='add'>+notrace void __init machine_init(unsigned long dt_ptr)</div><div class='ctx'> {</div><div class='ctx'> 	/* Enable early debugging if any specified (see udbg.h) */</div><div class='ctx'> 	udbg_early_init();</div><div class='hunk'>@@ -209,23 +209,12 @@ EXPORT_SYMBOL(nvram_sync);</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_NVRAM */</div><div class='ctx'> </div><div class='del'>-static DEFINE_PER_CPU(struct cpu, cpu_devices);</div><div class='del'>-</div><div class='ctx'> int __init ppc_init(void)</div><div class='ctx'> {</div><div class='del'>-	int cpu;</div><div class='del'>-</div><div class='ctx'> 	/* clear the progress line */</div><div class='ctx'> 	if (ppc_md.progress)</div><div class='ctx'> 		ppc_md.progress("             ", 0xffff);</div><div class='ctx'> </div><div class='del'>-	/* register CPU devices */</div><div class='del'>-	for_each_possible_cpu(cpu) {</div><div class='del'>-		struct cpu *c = &amp;per_cpu(cpu_devices, cpu);</div><div class='del'>-		c-&gt;hotpluggable = 1;</div><div class='del'>-		register_cpu(c, cpu);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* call platform init */</div><div class='ctx'> 	if (ppc_md.init != NULL) {</div><div class='ctx'> 		ppc_md.init();</div><div class='head'>diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c<br/>index 8b25f51f03bf..843c0af210d0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kernel/setup_64.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/kernel/setup_64.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kernel/setup_64.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kernel/setup_64.c</a></div><div class='hunk'>@@ -255,9 +255,11 @@ void early_setup_secondary(void)</div><div class='ctx'> #endif /* CONFIG_SMP */</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_SMP) || defined(CONFIG_KEXEC)</div><div class='add'>+extern unsigned long __secondary_hold_spinloop;</div><div class='add'>+extern void generic_secondary_smp_init(void);</div><div class='add'>+</div><div class='ctx'> void smp_release_cpus(void)</div><div class='ctx'> {</div><div class='del'>-	extern unsigned long __secondary_hold_spinloop;</div><div class='ctx'> 	unsigned long *ptr;</div><div class='ctx'> </div><div class='ctx'> 	DBG(" -&gt; smp_release_cpus()\n");</div><div class='hunk'>@@ -266,12 +268,11 @@ void smp_release_cpus(void)</div><div class='ctx'> 	 * all now so they can start to spin on their individual paca</div><div class='ctx'> 	 * spinloops. For non SMP kernels, the secondary cpus never get out</div><div class='ctx'> 	 * of the common spinloop.</div><div class='del'>-	 * This is useless but harmless on iSeries, secondaries are already</div><div class='del'>-	 * waiting on their paca spinloops. */</div><div class='add'>+	 */</div><div class='ctx'> </div><div class='ctx'> 	ptr  = (unsigned long *)((unsigned long)&amp;__secondary_hold_spinloop</div><div class='ctx'> 			- PHYSICAL_START);</div><div class='del'>-	*ptr = 1;</div><div class='add'>+	*ptr = __pa(generic_secondary_smp_init);</div><div class='ctx'> 	mb();</div><div class='ctx'> </div><div class='ctx'> 	DBG(" &lt;- smp_release_cpus()\n");</div><div class='head'>diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c<br/>index 5337ca7bb649..ff9f7010097d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kernel/smp.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/kernel/smp.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kernel/smp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kernel/smp.c</a></div><div class='hunk'>@@ -101,8 +101,7 @@ void smp_message_recv(int msg)</div><div class='ctx'> 		generic_smp_call_function_interrupt();</div><div class='ctx'> 		break;</div><div class='ctx'> 	case PPC_MSG_RESCHEDULE:</div><div class='del'>-		/* XXX Do we have to do this? */</div><div class='del'>-		set_need_resched();</div><div class='add'>+		/* we notice need_resched on exit */</div><div class='ctx'> 		break;</div><div class='ctx'> 	case PPC_MSG_CALL_FUNC_SINGLE:</div><div class='ctx'> 		generic_smp_call_function_single_interrupt();</div><div class='hunk'>@@ -453,6 +452,7 @@ int __devinit start_secondary(void *unused)</div><div class='ctx'> 	secondary_cpu_time_init();</div><div class='ctx'> </div><div class='ctx'> 	ipi_call_lock();</div><div class='add'>+	notify_cpu_starting(cpu);</div><div class='ctx'> 	cpu_set(cpu, cpu_online_map);</div><div class='ctx'> 	/* Update sibling maps */</div><div class='ctx'> 	base = cpu_first_thread_in_core(cpu);</div><div class='head'>diff --git a/arch/powerpc/kernel/softemu8xx.c b/arch/powerpc/kernel/softemu8xx.c<br/>index c906c4bf6835..23c8c5e7dc4d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kernel/softemu8xx.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/kernel/softemu8xx.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kernel/softemu8xx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kernel/softemu8xx.c</a></div><div class='hunk'>@@ -23,7 +23,6 @@</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/user.h&gt;</div><div class='del'>-#include &lt;linux/a.out.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='head'>diff --git a/arch/powerpc/kernel/swsusp_asm64.S b/arch/powerpc/kernel/swsusp_asm64.S<br/>index e092c3cbdb9b..86ac1d90d02b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kernel/swsusp_asm64.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/kernel/swsusp_asm64.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kernel/swsusp_asm64.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kernel/swsusp_asm64.S</a></div><div class='hunk'>@@ -133,7 +133,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC)</div><div class='ctx'> </div><div class='ctx'> 	cmpdi	r12,0</div><div class='ctx'> 	beq-	nothing_to_copy</div><div class='del'>-	li	r15,512</div><div class='add'>+	li	r15,PAGE_SIZE&gt;&gt;3</div><div class='ctx'> copyloop:</div><div class='ctx'> 	ld	r13,pbe_address(r12)</div><div class='ctx'> 	ld	r14,pbe_orig_address(r12)</div><div class='head'>diff --git a/arch/powerpc/kernel/sys_ppc32.c b/arch/powerpc/kernel/sys_ppc32.c<br/>index d98634c76060..bb1cfcfdbbbb 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kernel/sys_ppc32.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/kernel/sys_ppc32.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kernel/sys_ppc32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kernel/sys_ppc32.c</a></div><div class='hunk'>@@ -61,42 +61,6 @@ asmlinkage long ppc32_select(u32 n, compat_ulong_t __user *inp,</div><div class='ctx'> 	return compat_sys_select((int)n, inp, outp, exp, compat_ptr(tvp_x));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int cp_compat_stat(struct kstat *stat, struct compat_stat __user *statbuf)</div><div class='del'>-{</div><div class='del'>-	compat_ino_t ino;</div><div class='del'>-	long err;</div><div class='del'>-</div><div class='del'>-	if (stat-&gt;size &gt; MAX_NON_LFS || !new_valid_dev(stat-&gt;dev) ||</div><div class='del'>-	    !new_valid_dev(stat-&gt;rdev))</div><div class='del'>-		return -EOVERFLOW;</div><div class='del'>-</div><div class='del'>-	ino = stat-&gt;ino;</div><div class='del'>-	if (sizeof(ino) &lt; sizeof(stat-&gt;ino) &amp;&amp; ino != stat-&gt;ino)</div><div class='del'>-		return -EOVERFLOW;</div><div class='del'>-</div><div class='del'>-	err  = access_ok(VERIFY_WRITE, statbuf, sizeof(*statbuf)) ? 0 : -EFAULT;</div><div class='del'>-	err |= __put_user(new_encode_dev(stat-&gt;dev), &amp;statbuf-&gt;st_dev);</div><div class='del'>-	err |= __put_user(ino, &amp;statbuf-&gt;st_ino);</div><div class='del'>-	err |= __put_user(stat-&gt;mode, &amp;statbuf-&gt;st_mode);</div><div class='del'>-	err |= __put_user(stat-&gt;nlink, &amp;statbuf-&gt;st_nlink);</div><div class='del'>-	err |= __put_user(stat-&gt;uid, &amp;statbuf-&gt;st_uid);</div><div class='del'>-	err |= __put_user(stat-&gt;gid, &amp;statbuf-&gt;st_gid);</div><div class='del'>-	err |= __put_user(new_encode_dev(stat-&gt;rdev), &amp;statbuf-&gt;st_rdev);</div><div class='del'>-	err |= __put_user(stat-&gt;size, &amp;statbuf-&gt;st_size);</div><div class='del'>-	err |= __put_user(stat-&gt;atime.tv_sec, &amp;statbuf-&gt;st_atime);</div><div class='del'>-	err |= __put_user(stat-&gt;atime.tv_nsec, &amp;statbuf-&gt;st_atime_nsec);</div><div class='del'>-	err |= __put_user(stat-&gt;mtime.tv_sec, &amp;statbuf-&gt;st_mtime);</div><div class='del'>-	err |= __put_user(stat-&gt;mtime.tv_nsec, &amp;statbuf-&gt;st_mtime_nsec);</div><div class='del'>-	err |= __put_user(stat-&gt;ctime.tv_sec, &amp;statbuf-&gt;st_ctime);</div><div class='del'>-	err |= __put_user(stat-&gt;ctime.tv_nsec, &amp;statbuf-&gt;st_ctime_nsec);</div><div class='del'>-	err |= __put_user(stat-&gt;blksize, &amp;statbuf-&gt;st_blksize);</div><div class='del'>-	err |= __put_user(stat-&gt;blocks, &amp;statbuf-&gt;st_blocks);</div><div class='del'>-	err |= __put_user(0, &amp;statbuf-&gt;__unused4[0]);</div><div class='del'>-	err |= __put_user(0, &amp;statbuf-&gt;__unused4[1]);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* Note: it is necessary to treat option as an unsigned int,</div><div class='ctx'>  * with the corresponding cast to a signed int to insure that the </div><div class='ctx'>  * proper conversion (sign extension) between the register representation of a signed int (msr in 32-bit mode)</div><div class='hunk'>@@ -107,77 +71,6 @@ asmlinkage long compat_sys_sysfs(u32 option, u32 arg1, u32 arg2)</div><div class='ctx'> 	return sys_sysfs((int)option, arg1, arg2);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-asmlinkage long compat_sys_pause(void)</div><div class='del'>-{</div><div class='del'>-	current-&gt;state = TASK_INTERRUPTIBLE;</div><div class='del'>-	schedule();</div><div class='del'>-	</div><div class='del'>-	return -ERESTARTNOHAND;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline long get_ts32(struct timespec *o, struct compat_timeval __user *i)</div><div class='del'>-{</div><div class='del'>-	long usec;</div><div class='del'>-</div><div class='del'>-	if (!access_ok(VERIFY_READ, i, sizeof(*i)))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	if (__get_user(o-&gt;tv_sec, &amp;i-&gt;tv_sec))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	if (__get_user(usec, &amp;i-&gt;tv_usec))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	o-&gt;tv_nsec = usec * 1000;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline long put_tv32(struct compat_timeval __user *o, struct timeval *i)</div><div class='del'>-{</div><div class='del'>-	return (!access_ok(VERIFY_WRITE, o, sizeof(*o)) ||</div><div class='del'>-		(__put_user(i-&gt;tv_sec, &amp;o-&gt;tv_sec) |</div><div class='del'>-		 __put_user(i-&gt;tv_usec, &amp;o-&gt;tv_usec)));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Translations due to time_t size differences.  Which affects all</div><div class='del'>-   sorts of things, like timeval and itimerval.  */</div><div class='del'>-extern struct timezone sys_tz;</div><div class='del'>-</div><div class='del'>-asmlinkage long compat_sys_gettimeofday(struct compat_timeval __user *tv, struct timezone __user *tz)</div><div class='del'>-{</div><div class='del'>-	if (tv) {</div><div class='del'>-		struct timeval ktv;</div><div class='del'>-		do_gettimeofday(&amp;ktv);</div><div class='del'>-		if (put_tv32(tv, &amp;ktv))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-	}</div><div class='del'>-	if (tz) {</div><div class='del'>-		if (copy_to_user(tz, &amp;sys_tz, sizeof(sys_tz)))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-asmlinkage long compat_sys_settimeofday(struct compat_timeval __user *tv, struct timezone __user *tz)</div><div class='del'>-{</div><div class='del'>-	struct timespec kts;</div><div class='del'>-	struct timezone ktz;</div><div class='del'>-	</div><div class='del'>- 	if (tv) {</div><div class='del'>-		if (get_ts32(&amp;kts, tv))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-	}</div><div class='del'>-	if (tz) {</div><div class='del'>-		if (copy_from_user(&amp;ktz, tz, sizeof(ktz)))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return do_sys_settimeofday(tv ? &amp;kts : NULL, tz ? &amp;ktz : NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_SYSVIPC</div><div class='ctx'> long compat_sys_ipc(u32 call, u32 first, u32 second, u32 third, compat_uptr_t ptr,</div><div class='ctx'> 	       u32 fifth)</div><div class='head'>diff --git a/arch/powerpc/kernel/sysfs.c b/arch/powerpc/kernel/sysfs.c<br/>index 56d172d16e56..86a2ffccef25 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kernel/sysfs.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/kernel/sysfs.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kernel/sysfs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kernel/sysfs.c</a></div><div class='hunk'>@@ -15,18 +15,24 @@</div><div class='ctx'> #include &lt;asm/firmware.h&gt;</div><div class='ctx'> #include &lt;asm/hvcall.h&gt;</div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='del'>-#include &lt;asm/paca.h&gt;</div><div class='del'>-#include &lt;asm/lppaca.h&gt;</div><div class='ctx'> #include &lt;asm/machdep.h&gt;</div><div class='ctx'> #include &lt;asm/smp.h&gt;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PPC64</div><div class='add'>+#include &lt;asm/paca.h&gt;</div><div class='add'>+#include &lt;asm/lppaca.h&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static DEFINE_PER_CPU(struct cpu, cpu_devices);</div><div class='ctx'> </div><div class='ctx'> static DEFINE_PER_CPU(struct kobject *, cache_toplevel);</div><div class='ctx'> </div><div class='del'>-/* SMT stuff */</div><div class='add'>+/*</div><div class='add'>+ * SMT snooze delay stuff, 64-bit only for now</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PPC64</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PPC_MULTIPLATFORM</div><div class='ctx'> /* Time in microseconds we delay before sleeping in the idle loop */</div><div class='ctx'> DEFINE_PER_CPU(unsigned long, smt_snooze_delay) = { 100 };</div><div class='ctx'> </div><div class='hunk'>@@ -106,7 +112,7 @@ static int __init setup_smt_snooze_delay(char *str)</div><div class='ctx'> }</div><div class='ctx'> __setup("smt-snooze-delay=", setup_smt_snooze_delay);</div><div class='ctx'> </div><div class='del'>-#endif /* CONFIG_PPC_MULTIPLATFORM */</div><div class='add'>+#endif /* CONFIG_PPC64 */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Enabling PMCs will slow partition context switch times so we only do</div><div class='hunk'>@@ -115,7 +121,7 @@ __setup("smt-snooze-delay=", setup_smt_snooze_delay);</div><div class='ctx'> </div><div class='ctx'> static DEFINE_PER_CPU(char, pmcs_enabled);</div><div class='ctx'> </div><div class='del'>-void ppc64_enable_pmcs(void)</div><div class='add'>+void ppc_enable_pmcs(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* Only need to enable them once */</div><div class='ctx'> 	if (__get_cpu_var(pmcs_enabled))</div><div class='hunk'>@@ -126,8 +132,9 @@ void ppc64_enable_pmcs(void)</div><div class='ctx'> 	if (ppc_md.enable_pmcs)</div><div class='ctx'> 		ppc_md.enable_pmcs();</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(ppc64_enable_pmcs);</div><div class='add'>+EXPORT_SYMBOL(ppc_enable_pmcs);</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_6xx) || defined(CONFIG_PPC64)</div><div class='ctx'> /* XXX convert to rusty's on_one_cpu */</div><div class='ctx'> static unsigned long run_on_cpu(unsigned long cpu,</div><div class='ctx'> 			        unsigned long (*func)(unsigned long),</div><div class='hunk'>@@ -146,6 +153,7 @@ static unsigned long run_on_cpu(unsigned long cpu,</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #define SYSFS_PMCSETUP(NAME, ADDRESS) \</div><div class='ctx'> static unsigned long read_##NAME(unsigned long junk) \</div><div class='hunk'>@@ -154,7 +162,7 @@ static unsigned long read_##NAME(unsigned long junk) \</div><div class='ctx'> } \</div><div class='ctx'> static unsigned long write_##NAME(unsigned long val) \</div><div class='ctx'> { \</div><div class='del'>-	ppc64_enable_pmcs(); \</div><div class='add'>+	ppc_enable_pmcs(); \</div><div class='ctx'> 	mtspr(ADDRESS, val); \</div><div class='ctx'> 	return 0; \</div><div class='ctx'> } \</div><div class='hunk'>@@ -184,28 +192,53 @@ static ssize_t __used \</div><div class='ctx'>  * that are implemented on the current processor</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_PPC64)</div><div class='add'>+#define HAS_PPC_PMC_CLASSIC	1</div><div class='add'>+#define HAS_PPC_PMC_IBM		1</div><div class='add'>+#define HAS_PPC_PMC_PA6T	1</div><div class='add'>+#elif defined(CONFIG_6xx)</div><div class='add'>+#define HAS_PPC_PMC_CLASSIC	1</div><div class='add'>+#define HAS_PPC_PMC_IBM		1</div><div class='add'>+#define HAS_PPC_PMC_G4		1</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#ifdef HAS_PPC_PMC_CLASSIC</div><div class='ctx'> SYSFS_PMCSETUP(mmcr0, SPRN_MMCR0);</div><div class='ctx'> SYSFS_PMCSETUP(mmcr1, SPRN_MMCR1);</div><div class='del'>-SYSFS_PMCSETUP(mmcra, SPRN_MMCRA);</div><div class='ctx'> SYSFS_PMCSETUP(pmc1, SPRN_PMC1);</div><div class='ctx'> SYSFS_PMCSETUP(pmc2, SPRN_PMC2);</div><div class='ctx'> SYSFS_PMCSETUP(pmc3, SPRN_PMC3);</div><div class='ctx'> SYSFS_PMCSETUP(pmc4, SPRN_PMC4);</div><div class='ctx'> SYSFS_PMCSETUP(pmc5, SPRN_PMC5);</div><div class='ctx'> SYSFS_PMCSETUP(pmc6, SPRN_PMC6);</div><div class='add'>+</div><div class='add'>+#ifdef HAS_PPC_PMC_G4</div><div class='add'>+SYSFS_PMCSETUP(mmcr2, SPRN_MMCR2);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PPC64</div><div class='ctx'> SYSFS_PMCSETUP(pmc7, SPRN_PMC7);</div><div class='ctx'> SYSFS_PMCSETUP(pmc8, SPRN_PMC8);</div><div class='add'>+</div><div class='add'>+SYSFS_PMCSETUP(mmcra, SPRN_MMCRA);</div><div class='ctx'> SYSFS_PMCSETUP(purr, SPRN_PURR);</div><div class='ctx'> SYSFS_PMCSETUP(spurr, SPRN_SPURR);</div><div class='ctx'> SYSFS_PMCSETUP(dscr, SPRN_DSCR);</div><div class='ctx'> </div><div class='add'>+static SYSDEV_ATTR(mmcra, 0600, show_mmcra, store_mmcra);</div><div class='add'>+static SYSDEV_ATTR(spurr, 0600, show_spurr, NULL);</div><div class='add'>+static SYSDEV_ATTR(dscr, 0600, show_dscr, store_dscr);</div><div class='add'>+static SYSDEV_ATTR(purr, 0600, show_purr, store_purr);</div><div class='add'>+#endif /* CONFIG_PPC64 */</div><div class='add'>+</div><div class='add'>+#ifdef HAS_PPC_PMC_PA6T</div><div class='ctx'> SYSFS_PMCSETUP(pa6t_pmc0, SPRN_PA6T_PMC0);</div><div class='ctx'> SYSFS_PMCSETUP(pa6t_pmc1, SPRN_PA6T_PMC1);</div><div class='ctx'> SYSFS_PMCSETUP(pa6t_pmc2, SPRN_PA6T_PMC2);</div><div class='ctx'> SYSFS_PMCSETUP(pa6t_pmc3, SPRN_PA6T_PMC3);</div><div class='ctx'> SYSFS_PMCSETUP(pa6t_pmc4, SPRN_PA6T_PMC4);</div><div class='ctx'> SYSFS_PMCSETUP(pa6t_pmc5, SPRN_PA6T_PMC5);</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_DEBUG_KERNEL</div><div class='ctx'> SYSFS_PMCSETUP(hid0, SPRN_HID0);</div><div class='ctx'> SYSFS_PMCSETUP(hid1, SPRN_HID1);</div><div class='hunk'>@@ -236,28 +269,37 @@ SYSFS_PMCSETUP(tsr1, SPRN_PA6T_TSR1);</div><div class='ctx'> SYSFS_PMCSETUP(tsr2, SPRN_PA6T_TSR2);</div><div class='ctx'> SYSFS_PMCSETUP(tsr3, SPRN_PA6T_TSR3);</div><div class='ctx'> #endif /* CONFIG_DEBUG_KERNEL */</div><div class='add'>+#endif /* HAS_PPC_PMC_PA6T */</div><div class='ctx'> </div><div class='del'>-static SYSDEV_ATTR(mmcra, 0600, show_mmcra, store_mmcra);</div><div class='del'>-static SYSDEV_ATTR(spurr, 0600, show_spurr, NULL);</div><div class='del'>-static SYSDEV_ATTR(dscr, 0600, show_dscr, store_dscr);</div><div class='del'>-static SYSDEV_ATTR(purr, 0600, show_purr, store_purr);</div><div class='del'>-</div><div class='add'>+#ifdef HAS_PPC_PMC_IBM</div><div class='ctx'> static struct sysdev_attribute ibm_common_attrs[] = {</div><div class='ctx'> 	_SYSDEV_ATTR(mmcr0, 0600, show_mmcr0, store_mmcr0),</div><div class='ctx'> 	_SYSDEV_ATTR(mmcr1, 0600, show_mmcr1, store_mmcr1),</div><div class='ctx'> };</div><div class='add'>+#endif /* HAS_PPC_PMC_G4 */</div><div class='add'>+</div><div class='add'>+#ifdef HAS_PPC_PMC_G4</div><div class='add'>+static struct sysdev_attribute g4_common_attrs[] = {</div><div class='add'>+	_SYSDEV_ATTR(mmcr0, 0600, show_mmcr0, store_mmcr0),</div><div class='add'>+	_SYSDEV_ATTR(mmcr1, 0600, show_mmcr1, store_mmcr1),</div><div class='add'>+	_SYSDEV_ATTR(mmcr2, 0600, show_mmcr2, store_mmcr2),</div><div class='add'>+};</div><div class='add'>+#endif /* HAS_PPC_PMC_G4 */</div><div class='ctx'> </div><div class='del'>-static struct sysdev_attribute ibm_pmc_attrs[] = {</div><div class='add'>+static struct sysdev_attribute classic_pmc_attrs[] = {</div><div class='ctx'> 	_SYSDEV_ATTR(pmc1, 0600, show_pmc1, store_pmc1),</div><div class='ctx'> 	_SYSDEV_ATTR(pmc2, 0600, show_pmc2, store_pmc2),</div><div class='ctx'> 	_SYSDEV_ATTR(pmc3, 0600, show_pmc3, store_pmc3),</div><div class='ctx'> 	_SYSDEV_ATTR(pmc4, 0600, show_pmc4, store_pmc4),</div><div class='ctx'> 	_SYSDEV_ATTR(pmc5, 0600, show_pmc5, store_pmc5),</div><div class='ctx'> 	_SYSDEV_ATTR(pmc6, 0600, show_pmc6, store_pmc6),</div><div class='add'>+#ifdef CONFIG_PPC64</div><div class='ctx'> 	_SYSDEV_ATTR(pmc7, 0600, show_pmc7, store_pmc7),</div><div class='ctx'> 	_SYSDEV_ATTR(pmc8, 0600, show_pmc8, store_pmc8),</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#ifdef HAS_PPC_PMC_PA6T</div><div class='ctx'> static struct sysdev_attribute pa6t_attrs[] = {</div><div class='ctx'> 	_SYSDEV_ATTR(mmcr0, 0600, show_mmcr0, store_mmcr0),</div><div class='ctx'> 	_SYSDEV_ATTR(mmcr1, 0600, show_mmcr1, store_mmcr1),</div><div class='hunk'>@@ -298,6 +340,8 @@ static struct sysdev_attribute pa6t_attrs[] = {</div><div class='ctx'> 	_SYSDEV_ATTR(tsr3, 0600, show_tsr3, store_tsr3),</div><div class='ctx'> #endif /* CONFIG_DEBUG_KERNEL */</div><div class='ctx'> };</div><div class='add'>+#endif /* HAS_PPC_PMC_PA6T */</div><div class='add'>+#endif /* HAS_PPC_PMC_CLASSIC */</div><div class='ctx'> </div><div class='ctx'> struct cache_desc {</div><div class='ctx'> 	struct kobject kobj;</div><div class='hunk'>@@ -588,23 +632,36 @@ static void __cpuinit register_cpu_online(unsigned int cpu)</div><div class='ctx'> 	struct sysdev_attribute *attrs, *pmc_attrs;</div><div class='ctx'> 	int i, nattrs;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PPC64</div><div class='ctx'> 	if (!firmware_has_feature(FW_FEATURE_ISERIES) &amp;&amp;</div><div class='ctx'> 			cpu_has_feature(CPU_FTR_SMT))</div><div class='ctx'> 		sysdev_create_file(s, &amp;attr_smt_snooze_delay);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	/* PMC stuff */</div><div class='ctx'> 	switch (cur_cpu_spec-&gt;pmc_type) {</div><div class='add'>+#ifdef HAS_PPC_PMC_IBM</div><div class='ctx'> 	case PPC_PMC_IBM:</div><div class='ctx'> 		attrs = ibm_common_attrs;</div><div class='ctx'> 		nattrs = sizeof(ibm_common_attrs) / sizeof(struct sysdev_attribute);</div><div class='del'>-		pmc_attrs = ibm_pmc_attrs;</div><div class='add'>+		pmc_attrs = classic_pmc_attrs;</div><div class='ctx'> 		break;</div><div class='add'>+#endif /* HAS_PPC_PMC_IBM */</div><div class='add'>+#ifdef HAS_PPC_PMC_G4</div><div class='add'>+	case PPC_PMC_G4:</div><div class='add'>+		attrs = g4_common_attrs;</div><div class='add'>+		nattrs = sizeof(g4_common_attrs) / sizeof(struct sysdev_attribute);</div><div class='add'>+		pmc_attrs = classic_pmc_attrs;</div><div class='add'>+		break;</div><div class='add'>+#endif /* HAS_PPC_PMC_G4 */</div><div class='add'>+#ifdef HAS_PPC_PMC_PA6T</div><div class='ctx'> 	case PPC_PMC_PA6T:</div><div class='ctx'> 		/* PA Semi starts counting at PMC0 */</div><div class='ctx'> 		attrs = pa6t_attrs;</div><div class='ctx'> 		nattrs = sizeof(pa6t_attrs) / sizeof(struct sysdev_attribute);</div><div class='ctx'> 		pmc_attrs = NULL;</div><div class='ctx'> 		break;</div><div class='add'>+#endif /* HAS_PPC_PMC_PA6T */</div><div class='ctx'> 	default:</div><div class='ctx'> 		attrs = NULL;</div><div class='ctx'> 		nattrs = 0;</div><div class='hunk'>@@ -618,6 +675,7 @@ static void __cpuinit register_cpu_online(unsigned int cpu)</div><div class='ctx'> 		for (i = 0; i &lt; cur_cpu_spec-&gt;num_pmcs; i++)</div><div class='ctx'> 			sysdev_create_file(s, &amp;pmc_attrs[i]);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PPC64</div><div class='ctx'> 	if (cpu_has_feature(CPU_FTR_MMCRA))</div><div class='ctx'> 		sysdev_create_file(s, &amp;attr_mmcra);</div><div class='ctx'> </div><div class='hunk'>@@ -629,6 +687,7 @@ static void __cpuinit register_cpu_online(unsigned int cpu)</div><div class='ctx'> </div><div class='ctx'> 	if (cpu_has_feature(CPU_FTR_DSCR))</div><div class='ctx'> 		sysdev_create_file(s, &amp;attr_dscr);</div><div class='add'>+#endif /* CONFIG_PPC64 */</div><div class='ctx'> </div><div class='ctx'> 	create_cache_info(s);</div><div class='ctx'> }</div><div class='hunk'>@@ -641,16 +700,9 @@ static void remove_cache_info(struct sys_device *sysdev)</div><div class='ctx'> 	int cpu = sysdev-&gt;id;</div><div class='ctx'> </div><div class='ctx'> 	cache_desc = per_cpu(cache_desc, cpu);</div><div class='del'>-	if (cache_desc != NULL) {</div><div class='del'>-		sysfs_remove_file(&amp;cache_desc-&gt;kobj, &amp;cache_size_attr.attr);</div><div class='del'>-		sysfs_remove_file(&amp;cache_desc-&gt;kobj, &amp;cache_line_size_attr.attr);</div><div class='del'>-		sysfs_remove_file(&amp;cache_desc-&gt;kobj, &amp;cache_type_attr.attr);</div><div class='del'>-		sysfs_remove_file(&amp;cache_desc-&gt;kobj, &amp;cache_level_attr.attr);</div><div class='del'>-		sysfs_remove_file(&amp;cache_desc-&gt;kobj, &amp;cache_nr_sets_attr.attr);</div><div class='del'>-		sysfs_remove_file(&amp;cache_desc-&gt;kobj, &amp;cache_assoc_attr.attr);</div><div class='del'>-</div><div class='add'>+	if (cache_desc != NULL)</div><div class='ctx'> 		kobject_put(&amp;cache_desc-&gt;kobj);</div><div class='del'>-	}</div><div class='add'>+</div><div class='ctx'> 	cache_toplevel = per_cpu(cache_toplevel, cpu);</div><div class='ctx'> 	if (cache_toplevel != NULL)</div><div class='ctx'> 		kobject_put(cache_toplevel);</div><div class='hunk'>@@ -671,17 +723,28 @@ static void unregister_cpu_online(unsigned int cpu)</div><div class='ctx'> </div><div class='ctx'> 	/* PMC stuff */</div><div class='ctx'> 	switch (cur_cpu_spec-&gt;pmc_type) {</div><div class='add'>+#ifdef HAS_PPC_PMC_IBM</div><div class='ctx'> 	case PPC_PMC_IBM:</div><div class='ctx'> 		attrs = ibm_common_attrs;</div><div class='ctx'> 		nattrs = sizeof(ibm_common_attrs) / sizeof(struct sysdev_attribute);</div><div class='del'>-		pmc_attrs = ibm_pmc_attrs;</div><div class='add'>+		pmc_attrs = classic_pmc_attrs;</div><div class='add'>+		break;</div><div class='add'>+#endif /* HAS_PPC_PMC_IBM */</div><div class='add'>+#ifdef HAS_PPC_PMC_G4</div><div class='add'>+	case PPC_PMC_G4:</div><div class='add'>+		attrs = g4_common_attrs;</div><div class='add'>+		nattrs = sizeof(g4_common_attrs) / sizeof(struct sysdev_attribute);</div><div class='add'>+		pmc_attrs = classic_pmc_attrs;</div><div class='ctx'> 		break;</div><div class='add'>+#endif /* HAS_PPC_PMC_G4 */</div><div class='add'>+#ifdef HAS_PPC_PMC_PA6T</div><div class='ctx'> 	case PPC_PMC_PA6T:</div><div class='ctx'> 		/* PA Semi starts counting at PMC0 */</div><div class='ctx'> 		attrs = pa6t_attrs;</div><div class='ctx'> 		nattrs = sizeof(pa6t_attrs) / sizeof(struct sysdev_attribute);</div><div class='ctx'> 		pmc_attrs = NULL;</div><div class='ctx'> 		break;</div><div class='add'>+#endif /* HAS_PPC_PMC_PA6T */</div><div class='ctx'> 	default:</div><div class='ctx'> 		attrs = NULL;</div><div class='ctx'> 		nattrs = 0;</div><div class='hunk'>@@ -695,6 +758,7 @@ static void unregister_cpu_online(unsigned int cpu)</div><div class='ctx'> 		for (i = 0; i &lt; cur_cpu_spec-&gt;num_pmcs; i++)</div><div class='ctx'> 			sysdev_remove_file(s, &amp;pmc_attrs[i]);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PPC64</div><div class='ctx'> 	if (cpu_has_feature(CPU_FTR_MMCRA))</div><div class='ctx'> 		sysdev_remove_file(s, &amp;attr_mmcra);</div><div class='ctx'> </div><div class='hunk'>@@ -706,6 +770,7 @@ static void unregister_cpu_online(unsigned int cpu)</div><div class='ctx'> </div><div class='ctx'> 	if (cpu_has_feature(CPU_FTR_DSCR))</div><div class='ctx'> 		sysdev_remove_file(s, &amp;attr_dscr);</div><div class='add'>+#endif /* CONFIG_PPC64 */</div><div class='ctx'> </div><div class='ctx'> 	remove_cache_info(s);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c<br/>index 81ccb8dd1a54..f5def6cf5cd6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kernel/traps.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/kernel/traps.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kernel/traps.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kernel/traps.c</a></div><div class='hunk'>@@ -23,7 +23,6 @@</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/user.h&gt;</div><div class='del'>-#include &lt;linux/a.out.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='head'>diff --git a/arch/powerpc/kernel/vio.c b/arch/powerpc/kernel/vio.c<br/>index 2750fbab1975..434c92a85c03 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kernel/vio.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/kernel/vio.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kernel/vio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kernel/vio.c</a></div><div class='hunk'>@@ -1232,7 +1232,7 @@ struct vio_dev *vio_register_device_node(struct device_node *of_node)</div><div class='ctx'> 	else</div><div class='ctx'> 		viodev-&gt;dev.archdata.dma_ops = &amp;dma_iommu_ops;</div><div class='ctx'> 	viodev-&gt;dev.archdata.dma_data = vio_build_iommu_table(viodev);</div><div class='del'>-	viodev-&gt;dev.archdata.numa_node = of_node_to_nid(of_node);</div><div class='add'>+	set_dev_node(&amp;viodev-&gt;dev, of_node_to_nid(of_node));</div><div class='ctx'> </div><div class='ctx'> 	/* init generic 'struct device' fields: */</div><div class='ctx'> 	viodev-&gt;dev.parent = &amp;vio_bus_device.dev;</div><div class='head'>diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S<br/>index 9f6c1ca1739e..b39c27ed7919 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kernel/vmlinux.lds.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/kernel/vmlinux.lds.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kernel/vmlinux.lds.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kernel/vmlinux.lds.S</a></div><div class='hunk'>@@ -187,6 +187,24 @@ SECTIONS</div><div class='ctx'> 		*(.machine.desc)</div><div class='ctx'> 		__machine_desc_end = . ;</div><div class='ctx'> 	}</div><div class='add'>+	. = ALIGN(8);</div><div class='add'>+	.dynsym : AT(ADDR(.dynsym) - LOAD_OFFSET) { *(.dynsym) }</div><div class='add'>+	.dynstr : AT(ADDR(.dynstr) - LOAD_OFFSET) { *(.dynstr) }</div><div class='add'>+	.dynamic : AT(ADDR(.dynamic) - LOAD_OFFSET)</div><div class='add'>+	{</div><div class='add'>+		__dynamic_start = .;</div><div class='add'>+		*(.dynamic)</div><div class='add'>+	}</div><div class='add'>+	.hash : AT(ADDR(.hash) - LOAD_OFFSET) { *(.hash) }</div><div class='add'>+	.interp : AT(ADDR(.interp) - LOAD_OFFSET) { *(.interp) }</div><div class='add'>+	.rela.dyn : AT(ADDR(.rela.dyn) - LOAD_OFFSET)</div><div class='add'>+	{</div><div class='add'>+		__rela_dyn_start = .;</div><div class='add'>+		*(.rela*)</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Fake ELF header containing RPA note; for addnote */</div><div class='add'>+	.fakeelf : AT(ADDR(.fakeelf) - LOAD_OFFSET) { *(.fakeelf) }</div><div class='ctx'> </div><div class='ctx'> 	/* freed after init ends here */</div><div class='ctx'> 	. = ALIGN(PAGE_SIZE);</div><div class='head'>diff --git a/arch/powerpc/kvm/44x_tlb.c b/arch/powerpc/kvm/44x_tlb.c<br/>index 5a5602da5091..2e227a412bc2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kvm/44x_tlb.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/kvm/44x_tlb.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kvm/44x_tlb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kvm/44x_tlb.c</a></div><div class='hunk'>@@ -19,6 +19,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/kvm.h&gt;</div><div class='ctx'> #include &lt;linux/kvm_host.h&gt;</div><div class='ctx'> #include &lt;linux/highmem.h&gt;</div><div class='ctx'> #include &lt;asm/mmu-44x.h&gt;</div><div class='hunk'>@@ -109,7 +110,6 @@ static int kvmppc_44x_tlbe_is_writable(struct tlbe *tlbe)</div><div class='ctx'> 	return tlbe-&gt;word2 &amp; (PPC44x_TLB_SW|PPC44x_TLB_UW);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Must be called with mmap_sem locked for writing. */</div><div class='ctx'> static void kvmppc_44x_shadow_release(struct kvm_vcpu *vcpu,</div><div class='ctx'>                                       unsigned int index)</div><div class='ctx'> {</div><div class='hunk'>@@ -124,6 +124,11 @@ static void kvmppc_44x_shadow_release(struct kvm_vcpu *vcpu,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void kvmppc_tlbe_set_modified(struct kvm_vcpu *vcpu, unsigned int i)</div><div class='add'>+{</div><div class='add'>+    vcpu-&gt;arch.shadow_tlb_mod[i] = 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Caller must ensure that the specified guest TLB entry is safe to insert into</div><div class='ctx'>  * the shadow TLB. */</div><div class='ctx'> void kvmppc_mmu_map(struct kvm_vcpu *vcpu, u64 gvaddr, gfn_t gfn, u64 asid,</div><div class='hunk'>@@ -142,19 +147,16 @@ void kvmppc_mmu_map(struct kvm_vcpu *vcpu, u64 gvaddr, gfn_t gfn, u64 asid,</div><div class='ctx'> 	stlbe = &amp;vcpu-&gt;arch.shadow_tlb[victim];</div><div class='ctx'> </div><div class='ctx'> 	/* Get reference to new page. */</div><div class='del'>-	down_read(&amp;current-&gt;mm-&gt;mmap_sem);</div><div class='ctx'> 	new_page = gfn_to_page(vcpu-&gt;kvm, gfn);</div><div class='ctx'> 	if (is_error_page(new_page)) {</div><div class='ctx'> 		printk(KERN_ERR "Couldn't get guest page for gfn %lx!\n", gfn);</div><div class='ctx'> 		kvm_release_page_clean(new_page);</div><div class='del'>-		up_read(&amp;current-&gt;mm-&gt;mmap_sem);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	hpaddr = page_to_phys(new_page);</div><div class='ctx'> </div><div class='ctx'> 	/* Drop reference to old page. */</div><div class='ctx'> 	kvmppc_44x_shadow_release(vcpu, victim);</div><div class='del'>-	up_read(&amp;current-&gt;mm-&gt;mmap_sem);</div><div class='ctx'> </div><div class='ctx'> 	vcpu-&gt;arch.shadow_pages[victim] = new_page;</div><div class='ctx'> </div><div class='hunk'>@@ -164,27 +166,30 @@ void kvmppc_mmu_map(struct kvm_vcpu *vcpu, u64 gvaddr, gfn_t gfn, u64 asid,</div><div class='ctx'> </div><div class='ctx'> 	/* XXX what about AS? */</div><div class='ctx'> </div><div class='del'>-	stlbe-&gt;tid = asid &amp; 0xff;</div><div class='add'>+	stlbe-&gt;tid = !(asid &amp; 0xff);</div><div class='ctx'> </div><div class='ctx'> 	/* Force TS=1 for all guest mappings. */</div><div class='ctx'> 	/* For now we hardcode 4KB mappings, but it will be important to</div><div class='ctx'> 	 * use host large pages in the future. */</div><div class='ctx'> 	stlbe-&gt;word0 = (gvaddr &amp; PAGE_MASK) | PPC44x_TLB_VALID | PPC44x_TLB_TS</div><div class='ctx'> 	               | PPC44x_TLB_4K;</div><div class='del'>-</div><div class='ctx'> 	stlbe-&gt;word1 = (hpaddr &amp; 0xfffffc00) | ((hpaddr &gt;&gt; 32) &amp; 0xf);</div><div class='ctx'> 	stlbe-&gt;word2 = kvmppc_44x_tlb_shadow_attrib(flags,</div><div class='ctx'> 	                                            vcpu-&gt;arch.msr &amp; MSR_PR);</div><div class='add'>+	kvmppc_tlbe_set_modified(vcpu, victim);</div><div class='add'>+</div><div class='add'>+	KVMTRACE_5D(STLB_WRITE, vcpu, victim,</div><div class='add'>+			stlbe-&gt;tid, stlbe-&gt;word0, stlbe-&gt;word1, stlbe-&gt;word2,</div><div class='add'>+			handler);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void kvmppc_mmu_invalidate(struct kvm_vcpu *vcpu, gva_t eaddr,</div><div class='ctx'>                            gva_t eend, u32 asid)</div><div class='ctx'> {</div><div class='del'>-	unsigned int pid = asid &amp; 0xff;</div><div class='add'>+	unsigned int pid = !(asid &amp; 0xff);</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	/* XXX Replace loop with fancy data structures. */</div><div class='del'>-	down_write(&amp;current-&gt;mm-&gt;mmap_sem);</div><div class='ctx'> 	for (i = 0; i &lt;= tlb_44x_hwater; i++) {</div><div class='ctx'> 		struct tlbe *stlbe = &amp;vcpu-&gt;arch.shadow_tlb[i];</div><div class='ctx'> 		unsigned int tid;</div><div class='hunk'>@@ -204,21 +209,35 @@ void kvmppc_mmu_invalidate(struct kvm_vcpu *vcpu, gva_t eaddr,</div><div class='ctx'> </div><div class='ctx'> 		kvmppc_44x_shadow_release(vcpu, i);</div><div class='ctx'> 		stlbe-&gt;word0 = 0;</div><div class='add'>+		kvmppc_tlbe_set_modified(vcpu, i);</div><div class='add'>+		KVMTRACE_5D(STLB_INVAL, vcpu, i,</div><div class='add'>+				stlbe-&gt;tid, stlbe-&gt;word0, stlbe-&gt;word1,</div><div class='add'>+				stlbe-&gt;word2, handler);</div><div class='ctx'> 	}</div><div class='del'>-	up_write(&amp;current-&gt;mm-&gt;mmap_sem);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Invalidate all mappings, so that when they fault back in they will get the</div><div class='del'>- * proper permission bits. */</div><div class='add'>+/* Invalidate all mappings on the privilege switch after PID has been changed.</div><div class='add'>+ * The guest always runs with PID=1, so we must clear the entire TLB when</div><div class='add'>+ * switching address spaces. */</div><div class='ctx'> void kvmppc_mmu_priv_switch(struct kvm_vcpu *vcpu, int usermode)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	/* XXX Replace loop with fancy data structures. */</div><div class='del'>-	down_write(&amp;current-&gt;mm-&gt;mmap_sem);</div><div class='del'>-	for (i = 0; i &lt;= tlb_44x_hwater; i++) {</div><div class='del'>-		kvmppc_44x_shadow_release(vcpu, i);</div><div class='del'>-		vcpu-&gt;arch.shadow_tlb[i].word0 = 0;</div><div class='add'>+	if (vcpu-&gt;arch.swap_pid) {</div><div class='add'>+		/* XXX Replace loop with fancy data structures. */</div><div class='add'>+		for (i = 0; i &lt;= tlb_44x_hwater; i++) {</div><div class='add'>+			struct tlbe *stlbe = &amp;vcpu-&gt;arch.shadow_tlb[i];</div><div class='add'>+</div><div class='add'>+			/* Future optimization: clear only userspace mappings. */</div><div class='add'>+			kvmppc_44x_shadow_release(vcpu, i);</div><div class='add'>+			stlbe-&gt;word0 = 0;</div><div class='add'>+			kvmppc_tlbe_set_modified(vcpu, i);</div><div class='add'>+			KVMTRACE_5D(STLB_INVAL, vcpu, i,</div><div class='add'>+			            stlbe-&gt;tid, stlbe-&gt;word0, stlbe-&gt;word1,</div><div class='add'>+			            stlbe-&gt;word2, handler);</div><div class='add'>+		}</div><div class='add'>+		vcpu-&gt;arch.swap_pid = 0;</div><div class='ctx'> 	}</div><div class='del'>-	up_write(&amp;current-&gt;mm-&gt;mmap_sem);</div><div class='add'>+</div><div class='add'>+	vcpu-&gt;arch.shadow_pid = !usermode;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/kvm/Kconfig b/arch/powerpc/kvm/Kconfig<br/>index 6b076010213b..53aaa66b25e5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kvm/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/kvm/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kvm/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kvm/Kconfig</a></div><div class='hunk'>@@ -37,6 +37,17 @@ config KVM_BOOKE_HOST</div><div class='ctx'> 	  Provides host support for KVM on Book E PowerPC processors. Currently</div><div class='ctx'> 	  this works on 440 processors only.</div><div class='ctx'> </div><div class='add'>+config KVM_TRACE</div><div class='add'>+	bool "KVM trace support"</div><div class='add'>+	depends on KVM &amp;&amp; MARKERS &amp;&amp; SYSFS</div><div class='add'>+	select RELAY</div><div class='add'>+	select DEBUG_FS</div><div class='add'>+	default n</div><div class='add'>+	---help---</div><div class='add'>+	  This option allows reading a trace of kvm-related events through</div><div class='add'>+	  relayfs.  Note the ABI is not considered stable and will be</div><div class='add'>+	  modified in future updates.</div><div class='add'>+</div><div class='ctx'> source drivers/virtio/Kconfig</div><div class='ctx'> </div><div class='ctx'> endif # VIRTUALIZATION</div><div class='head'>diff --git a/arch/powerpc/kvm/Makefile b/arch/powerpc/kvm/Makefile<br/>index 04e3449e1f42..2a5d4397ac4b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kvm/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/kvm/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kvm/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kvm/Makefile</a></div><div class='hunk'>@@ -4,9 +4,11 @@</div><div class='ctx'> </div><div class='ctx'> EXTRA_CFLAGS += -Ivirt/kvm -Iarch/powerpc/kvm</div><div class='ctx'> </div><div class='del'>-common-objs = $(addprefix ../../../virt/kvm/, kvm_main.o coalesced_mmio.o)</div><div class='add'>+common-objs-y = $(addprefix ../../../virt/kvm/, kvm_main.o coalesced_mmio.o)</div><div class='ctx'> </div><div class='del'>-kvm-objs := $(common-objs) powerpc.o emulate.o booke_guest.o</div><div class='add'>+common-objs-$(CONFIG_KVM_TRACE)  += $(addprefix ../../../virt/kvm/, kvm_trace.o)</div><div class='add'>+</div><div class='add'>+kvm-objs := $(common-objs-y) powerpc.o emulate.o booke_guest.o</div><div class='ctx'> obj-$(CONFIG_KVM) += kvm.o</div><div class='ctx'> </div><div class='ctx'> AFLAGS_booke_interrupts.o := -I$(obj)</div><div class='head'>diff --git a/arch/powerpc/kvm/booke_guest.c b/arch/powerpc/kvm/booke_guest.c<br/>index 9c8ad850c6e3..7b2591e26bae 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kvm/booke_guest.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/kvm/booke_guest.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kvm/booke_guest.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kvm/booke_guest.c</a></div><div class='hunk'>@@ -410,6 +410,21 @@ int kvmppc_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu,</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	case BOOKE_INTERRUPT_DEBUG: {</div><div class='add'>+		u32 dbsr;</div><div class='add'>+</div><div class='add'>+		vcpu-&gt;arch.pc = mfspr(SPRN_CSRR0);</div><div class='add'>+</div><div class='add'>+		/* clear IAC events in DBSR register */</div><div class='add'>+		dbsr = mfspr(SPRN_DBSR);</div><div class='add'>+		dbsr &amp;= DBSR_IAC1 | DBSR_IAC2 | DBSR_IAC3 | DBSR_IAC4;</div><div class='add'>+		mtspr(SPRN_DBSR, dbsr);</div><div class='add'>+</div><div class='add'>+		run-&gt;exit_reason = KVM_EXIT_DEBUG;</div><div class='add'>+		r = RESUME_HOST;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	default:</div><div class='ctx'> 		printk(KERN_EMERG "exit_nr %d\n", exit_nr);</div><div class='ctx'> 		BUG();</div><div class='hunk'>@@ -471,6 +486,8 @@ int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	vcpu-&gt;arch.msr = 0;</div><div class='ctx'> 	vcpu-&gt;arch.gpr[1] = (16&lt;&lt;20) - 8; /* -8 for the callee-save LR slot */</div><div class='ctx'> </div><div class='add'>+	vcpu-&gt;arch.shadow_pid = 1;</div><div class='add'>+</div><div class='ctx'> 	/* Eye-catching number so we know if the guest takes an interrupt</div><div class='ctx'> 	 * before it's programmed its own IVPR. */</div><div class='ctx'> 	vcpu-&gt;arch.ivpr = 0x55550000;</div><div class='head'>diff --git a/arch/powerpc/kvm/booke_interrupts.S b/arch/powerpc/kvm/booke_interrupts.S<br/>index 3b653b5309b8..95e165baf85f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kvm/booke_interrupts.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/kvm/booke_interrupts.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kvm/booke_interrupts.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kvm/booke_interrupts.S</a></div><div class='hunk'>@@ -42,7 +42,8 @@</div><div class='ctx'> #define HOST_STACK_LR   (HOST_STACK_SIZE + 4) /* In caller stack frame. */</div><div class='ctx'> </div><div class='ctx'> #define NEED_INST_MASK ((1&lt;&lt;BOOKE_INTERRUPT_PROGRAM) | \</div><div class='del'>-                        (1&lt;&lt;BOOKE_INTERRUPT_DTLB_MISS))</div><div class='add'>+                        (1&lt;&lt;BOOKE_INTERRUPT_DTLB_MISS) | \</div><div class='add'>+                        (1&lt;&lt;BOOKE_INTERRUPT_DEBUG))</div><div class='ctx'> </div><div class='ctx'> #define NEED_DEAR_MASK ((1&lt;&lt;BOOKE_INTERRUPT_DATA_STORAGE) | \</div><div class='ctx'>                         (1&lt;&lt;BOOKE_INTERRUPT_DTLB_MISS))</div><div class='hunk'>@@ -331,51 +332,57 @@ lightweight_exit:</div><div class='ctx'> </div><div class='ctx'> 	mfspr	r3, SPRN_PID</div><div class='ctx'> 	stw	r3, VCPU_HOST_PID(r4)</div><div class='del'>-	lwz	r3, VCPU_PID(r4)</div><div class='add'>+	lwz	r3, VCPU_SHADOW_PID(r4)</div><div class='ctx'> 	mtspr	SPRN_PID, r3</div><div class='ctx'> </div><div class='del'>-	/* Prevent all TLB updates. */</div><div class='add'>+	/* Prevent all asynchronous TLB updates. */</div><div class='ctx'> 	mfmsr	r5</div><div class='ctx'> 	lis	r6, (MSR_EE|MSR_CE|MSR_ME|MSR_DE)@h</div><div class='ctx'> 	ori	r6, r6, (MSR_EE|MSR_CE|MSR_ME|MSR_DE)@l</div><div class='ctx'> 	andc	r6, r5, r6</div><div class='ctx'> 	mtmsr	r6</div><div class='ctx'> </div><div class='del'>-	/* Save the host's non-pinned TLB mappings, and load the guest mappings</div><div class='del'>-	 * over them. Leave the host's "pinned" kernel mappings in place. */</div><div class='del'>-	/* XXX optimization: use generation count to avoid swapping unmodified</div><div class='del'>-	 * entries. */</div><div class='add'>+	/* Load the guest mappings, leaving the host's "pinned" kernel mappings</div><div class='add'>+	 * in place. */</div><div class='ctx'> 	mfspr	r10, SPRN_MMUCR			/* Save host MMUCR. */</div><div class='del'>-	lis	r8, tlb_44x_hwater@ha</div><div class='del'>-	lwz	r8, tlb_44x_hwater@l(r8)</div><div class='del'>-	addi	r3, r4, VCPU_HOST_TLB - 4</div><div class='del'>-	addi	r9, r4, VCPU_SHADOW_TLB - 4</div><div class='del'>-	li	r6, 0</div><div class='add'>+	li	r5, PPC44x_TLB_SIZE</div><div class='add'>+	lis	r5, tlb_44x_hwater@ha</div><div class='add'>+	lwz	r5, tlb_44x_hwater@l(r5)</div><div class='add'>+	mtctr	r5</div><div class='add'>+	addi	r9, r4, VCPU_SHADOW_TLB</div><div class='add'>+	addi	r5, r4, VCPU_SHADOW_MOD</div><div class='add'>+	li	r3, 0</div><div class='ctx'> 1:</div><div class='del'>-	/* Save host entry. */</div><div class='del'>-	tlbre	r7, r6, PPC44x_TLB_PAGEID</div><div class='del'>-	mfspr	r5, SPRN_MMUCR</div><div class='del'>-	stwu	r5, 4(r3)</div><div class='del'>-	stwu	r7, 4(r3)</div><div class='del'>-	tlbre	r7, r6, PPC44x_TLB_XLAT</div><div class='del'>-	stwu	r7, 4(r3)</div><div class='del'>-	tlbre	r7, r6, PPC44x_TLB_ATTRIB</div><div class='del'>-	stwu	r7, 4(r3)</div><div class='add'>+	lbzx	r7, r3, r5</div><div class='add'>+	cmpwi	r7, 0</div><div class='add'>+	beq	3f</div><div class='add'>+</div><div class='ctx'> 	/* Load guest entry. */</div><div class='del'>-	lwzu	r7, 4(r9)</div><div class='add'>+	mulli	r11, r3, TLBE_BYTES</div><div class='add'>+	add	r11, r11, r9</div><div class='add'>+	lwz	r7, 0(r11)</div><div class='ctx'> 	mtspr	SPRN_MMUCR, r7</div><div class='del'>-	lwzu	r7, 4(r9)</div><div class='del'>-	tlbwe	r7, r6, PPC44x_TLB_PAGEID</div><div class='del'>-	lwzu	r7, 4(r9)</div><div class='del'>-	tlbwe	r7, r6, PPC44x_TLB_XLAT</div><div class='del'>-	lwzu	r7, 4(r9)</div><div class='del'>-	tlbwe	r7, r6, PPC44x_TLB_ATTRIB</div><div class='del'>-	/* Increment index. */</div><div class='del'>-	addi	r6, r6, 1</div><div class='del'>-	cmpw	r6, r8</div><div class='del'>-	blt	1b</div><div class='add'>+	lwz	r7, 4(r11)</div><div class='add'>+	tlbwe	r7, r3, PPC44x_TLB_PAGEID</div><div class='add'>+	lwz	r7, 8(r11)</div><div class='add'>+	tlbwe	r7, r3, PPC44x_TLB_XLAT</div><div class='add'>+	lwz	r7, 12(r11)</div><div class='add'>+	tlbwe	r7, r3, PPC44x_TLB_ATTRIB</div><div class='add'>+3:</div><div class='add'>+	addi	r3, r3, 1                       /* Increment index. */</div><div class='add'>+	bdnz	1b</div><div class='add'>+</div><div class='ctx'> 	mtspr	SPRN_MMUCR, r10			/* Restore host MMUCR. */</div><div class='ctx'> </div><div class='add'>+	/* Clear bitmap of modified TLB entries */</div><div class='add'>+	li	r5, PPC44x_TLB_SIZE&gt;&gt;2</div><div class='add'>+	mtctr	r5</div><div class='add'>+	addi	r5, r4, VCPU_SHADOW_MOD - 4</div><div class='add'>+	li	r6, 0</div><div class='add'>+1:</div><div class='add'>+	stwu	r6, 4(r5)</div><div class='add'>+	bdnz	1b</div><div class='add'>+</div><div class='ctx'> 	iccci	0, 0 /* XXX hack */</div><div class='ctx'> </div><div class='ctx'> 	/* Load some guest volatiles. */</div><div class='hunk'>@@ -431,6 +438,14 @@ lightweight_exit:</div><div class='ctx'> 	oris	r3, r3, KVMPPC_MSR_MASK@h</div><div class='ctx'> 	ori	r3, r3, KVMPPC_MSR_MASK@l</div><div class='ctx'> 	mtsrr1	r3</div><div class='add'>+</div><div class='add'>+	/* Clear any debug events which occurred since we disabled MSR[DE].</div><div class='add'>+	 * XXX This gives us a 3-instruction window in which a breakpoint</div><div class='add'>+	 * intended for guest context could fire in the host instead. */</div><div class='add'>+	lis	r3, 0xffff</div><div class='add'>+	ori	r3, r3, 0xffff</div><div class='add'>+	mtspr	SPRN_DBSR, r3</div><div class='add'>+</div><div class='ctx'> 	lwz	r3, VCPU_GPR(r3)(r4)</div><div class='ctx'> 	lwz	r4, VCPU_GPR(r4)(r4)</div><div class='ctx'> 	rfi</div><div class='head'>diff --git a/arch/powerpc/kvm/emulate.c b/arch/powerpc/kvm/emulate.c<br/>index 8c605d0a5488..0fce4fbdc20d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kvm/emulate.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/kvm/emulate.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kvm/emulate.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kvm/emulate.c</a></div><div class='hunk'>@@ -170,6 +170,10 @@ static int kvmppc_emul_tlbwe(struct kvm_vcpu *vcpu, u32 inst)</div><div class='ctx'> 		kvmppc_mmu_map(vcpu, eaddr, raddr &gt;&gt; PAGE_SHIFT, asid, flags);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	KVMTRACE_5D(GTLB_WRITE, vcpu, index,</div><div class='add'>+			tlbe-&gt;tid, tlbe-&gt;word0, tlbe-&gt;word1, tlbe-&gt;word2,</div><div class='add'>+			handler);</div><div class='add'>+</div><div class='ctx'> 	return EMULATE_DONE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -504,7 +508,7 @@ int kvmppc_emulate_instruction(struct kvm_run *run, struct kvm_vcpu *vcpu)</div><div class='ctx'> 			case SPRN_MMUCR:</div><div class='ctx'> 				vcpu-&gt;arch.mmucr = vcpu-&gt;arch.gpr[rs]; break;</div><div class='ctx'> 			case SPRN_PID:</div><div class='del'>-				vcpu-&gt;arch.pid = vcpu-&gt;arch.gpr[rs]; break;</div><div class='add'>+				kvmppc_set_pid(vcpu, vcpu-&gt;arch.gpr[rs]); break;</div><div class='ctx'> 			case SPRN_CCR0:</div><div class='ctx'> 				vcpu-&gt;arch.ccr0 = vcpu-&gt;arch.gpr[rs]; break;</div><div class='ctx'> 			case SPRN_CCR1:</div><div class='hunk'>@@ -765,6 +769,8 @@ int kvmppc_emulate_instruction(struct kvm_run *run, struct kvm_vcpu *vcpu)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	KVMTRACE_3D(PPC_INSTR, vcpu, inst, vcpu-&gt;arch.pc, emulated, entryexit);</div><div class='add'>+</div><div class='ctx'> 	if (advance)</div><div class='ctx'> 		vcpu-&gt;arch.pc += 4; /* Advance past emulated instruction. */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c<br/>index 53826a5f6c06..90a6fc422b23 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kvm/powerpc.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/kvm/powerpc.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/kvm/powerpc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/kvm/powerpc.c</a></div><div class='hunk'>@@ -27,6 +27,7 @@</div><div class='ctx'> #include &lt;asm/cputable.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/kvm_ppc.h&gt;</div><div class='add'>+#include &lt;asm/tlbflush.h&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> gfn_t unalias_gfn(struct kvm *kvm, gfn_t gfn)</div><div class='hunk'>@@ -239,18 +240,114 @@ void kvm_arch_vcpu_uninit(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Note: clearing MSR[DE] just means that the debug interrupt will not be</div><div class='add'>+ * delivered *immediately*. Instead, it simply sets the appropriate DBSR bits.</div><div class='add'>+ * If those DBSR bits are still set when MSR[DE] is re-enabled, the interrupt</div><div class='add'>+ * will be delivered as an "imprecise debug event" (which is indicated by</div><div class='add'>+ * DBSR[IDE].</div><div class='add'>+ */</div><div class='add'>+static void kvmppc_disable_debug_interrupts(void)</div><div class='add'>+{</div><div class='add'>+	mtmsr(mfmsr() &amp; ~MSR_DE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void kvmppc_restore_host_debug_state(struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	kvmppc_disable_debug_interrupts();</div><div class='add'>+</div><div class='add'>+	mtspr(SPRN_IAC1, vcpu-&gt;arch.host_iac[0]);</div><div class='add'>+	mtspr(SPRN_IAC2, vcpu-&gt;arch.host_iac[1]);</div><div class='add'>+	mtspr(SPRN_IAC3, vcpu-&gt;arch.host_iac[2]);</div><div class='add'>+	mtspr(SPRN_IAC4, vcpu-&gt;arch.host_iac[3]);</div><div class='add'>+	mtspr(SPRN_DBCR1, vcpu-&gt;arch.host_dbcr1);</div><div class='add'>+	mtspr(SPRN_DBCR2, vcpu-&gt;arch.host_dbcr2);</div><div class='add'>+	mtspr(SPRN_DBCR0, vcpu-&gt;arch.host_dbcr0);</div><div class='add'>+	mtmsr(vcpu-&gt;arch.host_msr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void kvmppc_load_guest_debug_registers(struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	struct kvm_guest_debug *dbg = &amp;vcpu-&gt;guest_debug;</div><div class='add'>+	u32 dbcr0 = 0;</div><div class='add'>+</div><div class='add'>+	vcpu-&gt;arch.host_msr = mfmsr();</div><div class='add'>+	kvmppc_disable_debug_interrupts();</div><div class='add'>+</div><div class='add'>+	/* Save host debug register state. */</div><div class='add'>+	vcpu-&gt;arch.host_iac[0] = mfspr(SPRN_IAC1);</div><div class='add'>+	vcpu-&gt;arch.host_iac[1] = mfspr(SPRN_IAC2);</div><div class='add'>+	vcpu-&gt;arch.host_iac[2] = mfspr(SPRN_IAC3);</div><div class='add'>+	vcpu-&gt;arch.host_iac[3] = mfspr(SPRN_IAC4);</div><div class='add'>+	vcpu-&gt;arch.host_dbcr0 = mfspr(SPRN_DBCR0);</div><div class='add'>+	vcpu-&gt;arch.host_dbcr1 = mfspr(SPRN_DBCR1);</div><div class='add'>+	vcpu-&gt;arch.host_dbcr2 = mfspr(SPRN_DBCR2);</div><div class='add'>+</div><div class='add'>+	/* set registers up for guest */</div><div class='add'>+</div><div class='add'>+	if (dbg-&gt;bp[0]) {</div><div class='add'>+		mtspr(SPRN_IAC1, dbg-&gt;bp[0]);</div><div class='add'>+		dbcr0 |= DBCR0_IAC1 | DBCR0_IDM;</div><div class='add'>+	}</div><div class='add'>+	if (dbg-&gt;bp[1]) {</div><div class='add'>+		mtspr(SPRN_IAC2, dbg-&gt;bp[1]);</div><div class='add'>+		dbcr0 |= DBCR0_IAC2 | DBCR0_IDM;</div><div class='add'>+	}</div><div class='add'>+	if (dbg-&gt;bp[2]) {</div><div class='add'>+		mtspr(SPRN_IAC3, dbg-&gt;bp[2]);</div><div class='add'>+		dbcr0 |= DBCR0_IAC3 | DBCR0_IDM;</div><div class='add'>+	}</div><div class='add'>+	if (dbg-&gt;bp[3]) {</div><div class='add'>+		mtspr(SPRN_IAC4, dbg-&gt;bp[3]);</div><div class='add'>+		dbcr0 |= DBCR0_IAC4 | DBCR0_IDM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mtspr(SPRN_DBCR0, dbcr0);</div><div class='add'>+	mtspr(SPRN_DBCR1, 0);</div><div class='add'>+	mtspr(SPRN_DBCR2, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu)</div><div class='ctx'> {</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (vcpu-&gt;guest_debug.enabled)</div><div class='add'>+		kvmppc_load_guest_debug_registers(vcpu);</div><div class='add'>+</div><div class='add'>+	/* Mark every guest entry in the shadow TLB entry modified, so that they</div><div class='add'>+	 * will all be reloaded on the next vcpu run (instead of being</div><div class='add'>+	 * demand-faulted). */</div><div class='add'>+	for (i = 0; i &lt;= tlb_44x_hwater; i++)</div><div class='add'>+		kvmppc_tlbe_set_modified(vcpu, i);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void kvm_arch_vcpu_put(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='add'>+	if (vcpu-&gt;guest_debug.enabled)</div><div class='add'>+		kvmppc_restore_host_debug_state(vcpu);</div><div class='add'>+</div><div class='add'>+	/* Don't leave guest TLB entries resident when being de-scheduled. */</div><div class='add'>+	/* XXX It would be nice to differentiate between heavyweight exit and</div><div class='add'>+	 * sched_out here, since we could avoid the TLB flush for heavyweight</div><div class='add'>+	 * exits. */</div><div class='add'>+	_tlbia();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int kvm_arch_vcpu_ioctl_debug_guest(struct kvm_vcpu *vcpu,</div><div class='ctx'>                                     struct kvm_debug_guest *dbg)</div><div class='ctx'> {</div><div class='del'>-	return -ENOTSUPP;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	vcpu-&gt;guest_debug.enabled = dbg-&gt;enabled;</div><div class='add'>+	if (vcpu-&gt;guest_debug.enabled) {</div><div class='add'>+		for (i=0; i &lt; ARRAY_SIZE(vcpu-&gt;guest_debug.bp); i++) {</div><div class='add'>+			if (dbg-&gt;breakpoints[i].enabled)</div><div class='add'>+				vcpu-&gt;guest_debug.bp[i] = dbg-&gt;breakpoints[i].address;</div><div class='add'>+			else</div><div class='add'>+				vcpu-&gt;guest_debug.bp[i] = 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void kvmppc_complete_dcr_load(struct kvm_vcpu *vcpu,</div><div class='head'>diff --git a/arch/powerpc/lib/copypage_64.S b/arch/powerpc/lib/copypage_64.S<br/>index f9837f44ac0b..75f3267fdc30 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/lib/copypage_64.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/lib/copypage_64.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/lib/copypage_64.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/lib/copypage_64.S</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2002 Paul Mackerras, IBM Corp.</div><div class='add'>+ * Copyright (C) 2008 Mark Nelson, IBM Corp.</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or</div><div class='ctx'>  * modify it under the terms of the GNU General Public License</div><div class='hunk'>@@ -8,112 +8,100 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/ppc_asm.h&gt;</div><div class='add'>+#include &lt;asm/asm-offsets.h&gt;</div><div class='add'>+</div><div class='add'>+        .section        ".toc","aw"</div><div class='add'>+PPC64_CACHES:</div><div class='add'>+        .tc             ppc64_caches[TC],ppc64_caches</div><div class='add'>+        .section        ".text"</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> _GLOBAL(copy_4K_page)</div><div class='del'>-	std	r31,-8(1)</div><div class='del'>-	std	r30,-16(1)</div><div class='del'>-	std	r29,-24(1)</div><div class='del'>-	std	r28,-32(1)</div><div class='del'>-	std	r27,-40(1)</div><div class='del'>-	std	r26,-48(1)</div><div class='del'>-	std	r25,-56(1)</div><div class='del'>-	std	r24,-64(1)</div><div class='del'>-	std	r23,-72(1)</div><div class='del'>-	std	r22,-80(1)</div><div class='del'>-	std	r21,-88(1)</div><div class='del'>-	std	r20,-96(1)</div><div class='del'>-	li	r5,4096/32 - 1</div><div class='add'>+	li	r5,4096		/* 4K page size */</div><div class='add'>+BEGIN_FTR_SECTION</div><div class='add'>+	ld      r10,PPC64_CACHES@toc(r2)</div><div class='add'>+	lwz	r11,DCACHEL1LOGLINESIZE(r10)	/* log2 of cache line size */</div><div class='add'>+	lwz     r12,DCACHEL1LINESIZE(r10)	/* get cache line size */</div><div class='add'>+	li	r9,0</div><div class='add'>+	srd	r8,r5,r11</div><div class='add'>+</div><div class='add'>+	mtctr	r8</div><div class='add'>+setup:</div><div class='add'>+	dcbt	r9,r4</div><div class='add'>+	dcbz	r9,r3</div><div class='add'>+	add	r9,r9,r12</div><div class='add'>+	bdnz	setup</div><div class='add'>+END_FTR_SECTION_IFSET(CPU_FTR_CP_USE_DCBTZ)</div><div class='ctx'> 	addi	r3,r3,-8</div><div class='del'>-	li	r12,5</div><div class='del'>-0:	addi	r5,r5,-24</div><div class='del'>-	mtctr	r12</div><div class='del'>-	ld	r22,640(4)</div><div class='del'>-	ld	r21,512(4)</div><div class='del'>-	ld	r20,384(4)</div><div class='del'>-	ld	r11,256(4)</div><div class='del'>-	ld	r9,128(4)</div><div class='del'>-	ld	r7,0(4)</div><div class='del'>-	ld	r25,648(4)</div><div class='del'>-	ld	r24,520(4)</div><div class='del'>-	ld	r23,392(4)</div><div class='del'>-	ld	r10,264(4)</div><div class='del'>-	ld	r8,136(4)</div><div class='del'>-	ldu	r6,8(4)</div><div class='del'>-	cmpwi	r5,24</div><div class='del'>-1:	std	r22,648(3)</div><div class='del'>-	std	r21,520(3)</div><div class='del'>-	std	r20,392(3)</div><div class='del'>-	std	r11,264(3)</div><div class='del'>-	std	r9,136(3)</div><div class='del'>-	std	r7,8(3)</div><div class='del'>-	ld	r28,648(4)</div><div class='del'>-	ld	r27,520(4)</div><div class='del'>-	ld	r26,392(4)</div><div class='del'>-	ld	r31,264(4)</div><div class='del'>-	ld	r30,136(4)</div><div class='del'>-	ld	r29,8(4)</div><div class='del'>-	std	r25,656(3)</div><div class='del'>-	std	r24,528(3)</div><div class='del'>-	std	r23,400(3)</div><div class='del'>-	std	r10,272(3)</div><div class='del'>-	std	r8,144(3)</div><div class='del'>-	std	r6,16(3)</div><div class='del'>-	ld	r22,656(4)</div><div class='del'>-	ld	r21,528(4)</div><div class='del'>-	ld	r20,400(4)</div><div class='del'>-	ld	r11,272(4)</div><div class='del'>-	ld	r9,144(4)</div><div class='del'>-	ld	r7,16(4)</div><div class='del'>-	std	r28,664(3)</div><div class='del'>-	std	r27,536(3)</div><div class='del'>-	std	r26,408(3)</div><div class='del'>-	std	r31,280(3)</div><div class='del'>-	std	r30,152(3)</div><div class='del'>-	stdu	r29,24(3)</div><div class='del'>-	ld	r25,664(4)</div><div class='del'>-	ld	r24,536(4)</div><div class='del'>-	ld	r23,408(4)</div><div class='del'>-	ld	r10,280(4)</div><div class='del'>-	ld	r8,152(4)</div><div class='del'>-	ldu	r6,24(4)</div><div class='add'>+	srdi    r8,r5,7		/* page is copied in 128 byte strides */</div><div class='add'>+	addi	r8,r8,-1	/* one stride copied outside loop */</div><div class='add'>+</div><div class='add'>+	mtctr	r8</div><div class='add'>+</div><div class='add'>+	ld	r5,0(r4)</div><div class='add'>+	ld	r6,8(r4)</div><div class='add'>+	ld	r7,16(r4)</div><div class='add'>+	ldu	r8,24(r4)</div><div class='add'>+1:	std	r5,8(r3)</div><div class='add'>+	ld	r9,8(r4)</div><div class='add'>+	std	r6,16(r3)</div><div class='add'>+	ld	r10,16(r4)</div><div class='add'>+	std	r7,24(r3)</div><div class='add'>+	ld	r11,24(r4)</div><div class='add'>+	std	r8,32(r3)</div><div class='add'>+	ld	r12,32(r4)</div><div class='add'>+	std	r9,40(r3)</div><div class='add'>+	ld	r5,40(r4)</div><div class='add'>+	std	r10,48(r3)</div><div class='add'>+	ld	r6,48(r4)</div><div class='add'>+	std	r11,56(r3)</div><div class='add'>+	ld	r7,56(r4)</div><div class='add'>+	std	r12,64(r3)</div><div class='add'>+	ld	r8,64(r4)</div><div class='add'>+	std	r5,72(r3)</div><div class='add'>+	ld	r9,72(r4)</div><div class='add'>+	std	r6,80(r3)</div><div class='add'>+	ld	r10,80(r4)</div><div class='add'>+	std	r7,88(r3)</div><div class='add'>+	ld	r11,88(r4)</div><div class='add'>+	std	r8,96(r3)</div><div class='add'>+	ld	r12,96(r4)</div><div class='add'>+	std	r9,104(r3)</div><div class='add'>+	ld	r5,104(r4)</div><div class='add'>+	std	r10,112(r3)</div><div class='add'>+	ld	r6,112(r4)</div><div class='add'>+	std	r11,120(r3)</div><div class='add'>+	ld	r7,120(r4)</div><div class='add'>+	stdu	r12,128(r3)</div><div class='add'>+	ldu	r8,128(r4)</div><div class='ctx'> 	bdnz	1b</div><div class='del'>-	std	r22,648(3)</div><div class='del'>-	std	r21,520(3)</div><div class='del'>-	std	r20,392(3)</div><div class='del'>-	std	r11,264(3)</div><div class='del'>-	std	r9,136(3)</div><div class='del'>-	std	r7,8(3)</div><div class='del'>-	addi	r4,r4,640</div><div class='del'>-	addi	r3,r3,648</div><div class='del'>-	bge	0b</div><div class='del'>-	mtctr	r5</div><div class='del'>-	ld	r7,0(4)</div><div class='del'>-	ld	r8,8(4)</div><div class='del'>-	ldu	r9,16(4)</div><div class='del'>-3:	ld	r10,8(4)</div><div class='del'>-	std	r7,8(3)</div><div class='del'>-	ld	r7,16(4)</div><div class='del'>-	std	r8,16(3)</div><div class='del'>-	ld	r8,24(4)</div><div class='del'>-	std	r9,24(3)</div><div class='del'>-	ldu	r9,32(4)</div><div class='del'>-	stdu	r10,32(3)</div><div class='del'>-	bdnz	3b</div><div class='del'>-4:	ld	r10,8(4)</div><div class='del'>-	std	r7,8(3)</div><div class='del'>-	std	r8,16(3)</div><div class='del'>-	std	r9,24(3)</div><div class='del'>-	std	r10,32(3)</div><div class='del'>-9:	ld	r20,-96(1)</div><div class='del'>-	ld	r21,-88(1)</div><div class='del'>-	ld	r22,-80(1)</div><div class='del'>-	ld	r23,-72(1)</div><div class='del'>-	ld	r24,-64(1)</div><div class='del'>-	ld	r25,-56(1)</div><div class='del'>-	ld	r26,-48(1)</div><div class='del'>-	ld	r27,-40(1)</div><div class='del'>-	ld	r28,-32(1)</div><div class='del'>-	ld	r29,-24(1)</div><div class='del'>-	ld	r30,-16(1)</div><div class='del'>-	ld	r31,-8(1)</div><div class='add'>+</div><div class='add'>+	std	r5,8(r3)</div><div class='add'>+	ld	r9,8(r4)</div><div class='add'>+	std	r6,16(r3)</div><div class='add'>+	ld	r10,16(r4)</div><div class='add'>+	std	r7,24(r3)</div><div class='add'>+	ld	r11,24(r4)</div><div class='add'>+	std	r8,32(r3)</div><div class='add'>+	ld	r12,32(r4)</div><div class='add'>+	std	r9,40(r3)</div><div class='add'>+	ld	r5,40(r4)</div><div class='add'>+	std	r10,48(r3)</div><div class='add'>+	ld	r6,48(r4)</div><div class='add'>+	std	r11,56(r3)</div><div class='add'>+	ld	r7,56(r4)</div><div class='add'>+	std	r12,64(r3)</div><div class='add'>+	ld	r8,64(r4)</div><div class='add'>+	std	r5,72(r3)</div><div class='add'>+	ld	r9,72(r4)</div><div class='add'>+	std	r6,80(r3)</div><div class='add'>+	ld	r10,80(r4)</div><div class='add'>+	std	r7,88(r3)</div><div class='add'>+	ld	r11,88(r4)</div><div class='add'>+	std	r8,96(r3)</div><div class='add'>+	ld	r12,96(r4)</div><div class='add'>+	std	r9,104(r3)</div><div class='add'>+	std	r10,112(r3)</div><div class='add'>+	std	r11,120(r3)</div><div class='add'>+	std	r12,128(r3)</div><div class='ctx'> 	blr</div><div class='head'>diff --git a/arch/powerpc/lib/dma-noncoherent.c b/arch/powerpc/lib/dma-noncoherent.c<br/>index 5d83907f6591..31734c0969cd 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/lib/dma-noncoherent.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/lib/dma-noncoherent.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/lib/dma-noncoherent.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/lib/dma-noncoherent.c</a></div><div class='hunk'>@@ -203,7 +203,7 @@ __dma_alloc_coherent(size_t size, dma_addr_t *handle, gfp_t gfp)</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Set the "dma handle"</div><div class='ctx'> 		 */</div><div class='del'>-		*handle = page_to_bus(page);</div><div class='add'>+		*handle = page_to_phys(page);</div><div class='ctx'> </div><div class='ctx'> 		do {</div><div class='ctx'> 			BUG_ON(!pte_none(*pte));</div><div class='head'>diff --git a/arch/powerpc/math-emu/Makefile b/arch/powerpc/math-emu/Makefile<br/>index 29bc9126241b..03aa98dd9f0a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/math-emu/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/Makefile</a></div><div class='hunk'>@@ -4,13 +4,14 @@ obj-y				:= math.o fmr.o lfd.o stfd.o</div><div class='ctx'> obj-$(CONFIG_MATH_EMULATION)	+= fabs.o fadd.o fadds.o fcmpo.o fcmpu.o \</div><div class='ctx'> 					fctiw.o fctiwz.o fdiv.o fdivs.o \</div><div class='ctx'> 					fmadd.o fmadds.o fmsub.o fmsubs.o \</div><div class='del'>-					fmul.o fmuls.o fnabs.o fneg.o types.o \</div><div class='add'>+					fmul.o fmuls.o fnabs.o fneg.o \</div><div class='ctx'> 					fnmadd.o fnmadds.o fnmsub.o fnmsubs.o \</div><div class='ctx'> 					fres.o frsp.o frsqrte.o fsel.o lfs.o \</div><div class='ctx'> 					fsqrt.o	fsqrts.o fsub.o fsubs.o \</div><div class='ctx'> 					mcrfs.o mffs.o mtfsb0.o mtfsb1.o \</div><div class='del'>-					mtfsf.o mtfsfi.o stfiwx.o stfs.o \</div><div class='del'>-					udivmodti4.o</div><div class='add'>+					mtfsf.o mtfsfi.o stfiwx.o stfs.o</div><div class='ctx'> </div><div class='ctx'> CFLAGS_fabs.o = -fno-builtin-fabs</div><div class='ctx'> CFLAGS_math.o = -fno-builtin-fabs</div><div class='add'>+</div><div class='add'>+EXTRA_CFLAGS = -I. -Iinclude/math-emu -w</div><div class='head'>diff --git a/arch/powerpc/math-emu/double.h b/arch/powerpc/math-emu/double.h<br/>deleted file mode 100644<br/>index ffba8b67f059..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/double.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/math-emu/double.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,129 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Definitions for IEEE Double Precision</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#if _FP_W_TYPE_SIZE &lt; 32</div><div class='del'>-#error "Here's a nickel kid.  Go buy yourself a real computer."</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#if _FP_W_TYPE_SIZE &lt; 64</div><div class='del'>-#define _FP_FRACTBITS_D		(2 * _FP_W_TYPE_SIZE)</div><div class='del'>-#else</div><div class='del'>-#define _FP_FRACTBITS_D		_FP_W_TYPE_SIZE</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define _FP_FRACBITS_D		53</div><div class='del'>-#define _FP_FRACXBITS_D		(_FP_FRACTBITS_D - _FP_FRACBITS_D)</div><div class='del'>-#define _FP_WFRACBITS_D		(_FP_WORKBITS + _FP_FRACBITS_D)</div><div class='del'>-#define _FP_WFRACXBITS_D	(_FP_FRACTBITS_D - _FP_WFRACBITS_D)</div><div class='del'>-#define _FP_EXPBITS_D		11</div><div class='del'>-#define _FP_EXPBIAS_D		1023</div><div class='del'>-#define _FP_EXPMAX_D		2047</div><div class='del'>-</div><div class='del'>-#define _FP_QNANBIT_D		\</div><div class='del'>-	((_FP_W_TYPE)1 &lt;&lt; ((_FP_FRACBITS_D-2) % _FP_W_TYPE_SIZE))</div><div class='del'>-#define _FP_IMPLBIT_D		\</div><div class='del'>-	((_FP_W_TYPE)1 &lt;&lt; ((_FP_FRACBITS_D-1) % _FP_W_TYPE_SIZE))</div><div class='del'>-#define _FP_OVERFLOW_D		\</div><div class='del'>-	((_FP_W_TYPE)1 &lt;&lt; (_FP_WFRACBITS_D % _FP_W_TYPE_SIZE))</div><div class='del'>-</div><div class='del'>-#if _FP_W_TYPE_SIZE &lt; 64</div><div class='del'>-</div><div class='del'>-union _FP_UNION_D</div><div class='del'>-{</div><div class='del'>-  double flt;</div><div class='del'>-  struct {</div><div class='del'>-#if __BYTE_ORDER == __BIG_ENDIAN</div><div class='del'>-    unsigned sign  : 1;</div><div class='del'>-    unsigned exp   : _FP_EXPBITS_D;</div><div class='del'>-    unsigned frac1 : _FP_FRACBITS_D - (_FP_IMPLBIT_D != 0) - _FP_W_TYPE_SIZE;</div><div class='del'>-    unsigned frac0 : _FP_W_TYPE_SIZE;</div><div class='del'>-#else</div><div class='del'>-    unsigned frac0 : _FP_W_TYPE_SIZE;</div><div class='del'>-    unsigned frac1 : _FP_FRACBITS_D - (_FP_IMPLBIT_D != 0) - _FP_W_TYPE_SIZE;</div><div class='del'>-    unsigned exp   : _FP_EXPBITS_D;</div><div class='del'>-    unsigned sign  : 1;</div><div class='del'>-#endif</div><div class='del'>-  } bits __attribute__((packed));</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define FP_DECL_D(X)		_FP_DECL(2,X)</div><div class='del'>-#define FP_UNPACK_RAW_D(X,val)	_FP_UNPACK_RAW_2(D,X,val)</div><div class='del'>-#define FP_PACK_RAW_D(val,X)	_FP_PACK_RAW_2(D,val,X)</div><div class='del'>-</div><div class='del'>-#define FP_UNPACK_D(X,val)		\</div><div class='del'>-  do {					\</div><div class='del'>-    _FP_UNPACK_RAW_2(D,X,val);		\</div><div class='del'>-    _FP_UNPACK_CANONICAL(D,2,X);	\</div><div class='del'>-  } while (0)</div><div class='del'>-</div><div class='del'>-#define FP_PACK_D(val,X)		\</div><div class='del'>-  do {					\</div><div class='del'>-    _FP_PACK_CANONICAL(D,2,X);		\</div><div class='del'>-    _FP_PACK_RAW_2(D,val,X);		\</div><div class='del'>-  } while (0)</div><div class='del'>-</div><div class='del'>-#define FP_NEG_D(R,X)		_FP_NEG(D,2,R,X)</div><div class='del'>-#define FP_ADD_D(R,X,Y)		_FP_ADD(D,2,R,X,Y)</div><div class='del'>-#define FP_SUB_D(R,X,Y)		_FP_SUB(D,2,R,X,Y)</div><div class='del'>-#define FP_MUL_D(R,X,Y)		_FP_MUL(D,2,R,X,Y)</div><div class='del'>-#define FP_DIV_D(R,X,Y)		_FP_DIV(D,2,R,X,Y)</div><div class='del'>-#define FP_SQRT_D(R,X)		_FP_SQRT(D,2,R,X)</div><div class='del'>-</div><div class='del'>-#define FP_CMP_D(r,X,Y,un)	_FP_CMP(D,2,r,X,Y,un)</div><div class='del'>-#define FP_CMP_EQ_D(r,X,Y)	_FP_CMP_EQ(D,2,r,X,Y)</div><div class='del'>-</div><div class='del'>-#define FP_TO_INT_D(r,X,rsz,rsg)  _FP_TO_INT(D,2,r,X,rsz,rsg)</div><div class='del'>-#define FP_FROM_INT_D(X,r,rs,rt)  _FP_FROM_INT(D,2,X,r,rs,rt)</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-</div><div class='del'>-union _FP_UNION_D</div><div class='del'>-{</div><div class='del'>-  double flt;</div><div class='del'>-  struct {</div><div class='del'>-#if __BYTE_ORDER == __BIG_ENDIAN</div><div class='del'>-    unsigned sign : 1;</div><div class='del'>-    unsigned exp  : _FP_EXPBITS_D;</div><div class='del'>-    unsigned long frac : _FP_FRACBITS_D - (_FP_IMPLBIT_D != 0);</div><div class='del'>-#else</div><div class='del'>-    unsigned long frac : _FP_FRACBITS_D - (_FP_IMPLBIT_D != 0);</div><div class='del'>-    unsigned exp  : _FP_EXPBITS_D;</div><div class='del'>-    unsigned sign : 1;</div><div class='del'>-#endif</div><div class='del'>-  } bits __attribute__((packed));</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define FP_DECL_D(X)		_FP_DECL(1,X)</div><div class='del'>-#define FP_UNPACK_RAW_D(X,val)	_FP_UNPACK_RAW_1(D,X,val)</div><div class='del'>-#define FP_PACK_RAW_D(val,X)	_FP_PACK_RAW_1(D,val,X)</div><div class='del'>-</div><div class='del'>-#define FP_UNPACK_D(X,val)		\</div><div class='del'>-  do {					\</div><div class='del'>-    _FP_UNPACK_RAW_1(D,X,val);		\</div><div class='del'>-    _FP_UNPACK_CANONICAL(D,1,X);	\</div><div class='del'>-  } while (0)</div><div class='del'>-</div><div class='del'>-#define FP_PACK_D(val,X)		\</div><div class='del'>-  do {					\</div><div class='del'>-    _FP_PACK_CANONICAL(D,1,X);		\</div><div class='del'>-    _FP_PACK_RAW_1(D,val,X);		\</div><div class='del'>-  } while (0)</div><div class='del'>-</div><div class='del'>-#define FP_NEG_D(R,X)		_FP_NEG(D,1,R,X)</div><div class='del'>-#define FP_ADD_D(R,X,Y)		_FP_ADD(D,1,R,X,Y)</div><div class='del'>-#define FP_SUB_D(R,X,Y)		_FP_SUB(D,1,R,X,Y)</div><div class='del'>-#define FP_MUL_D(R,X,Y)		_FP_MUL(D,1,R,X,Y)</div><div class='del'>-#define FP_DIV_D(R,X,Y)		_FP_DIV(D,1,R,X,Y)</div><div class='del'>-#define FP_SQRT_D(R,X)		_FP_SQRT(D,1,R,X)</div><div class='del'>-</div><div class='del'>-/* The implementation of _FP_MUL_D and _FP_DIV_D should be chosen by</div><div class='del'>-   the target machine.  */</div><div class='del'>-</div><div class='del'>-#define FP_CMP_D(r,X,Y,un)	_FP_CMP(D,1,r,X,Y,un)</div><div class='del'>-#define FP_CMP_EQ_D(r,X,Y)	_FP_CMP_EQ(D,1,r,X,Y)</div><div class='del'>-</div><div class='del'>-#define FP_TO_INT_D(r,X,rsz,rsg)  _FP_TO_INT(D,1,r,X,rsz,rsg)</div><div class='del'>-#define FP_FROM_INT_D(X,r,rs,rt)  _FP_FROM_INT(D,1,X,r,rs,rt)</div><div class='del'>-</div><div class='del'>-#endif /* W_TYPE_SIZE &lt; 64 */</div><div class='head'>diff --git a/arch/powerpc/math-emu/fadd.c b/arch/powerpc/math-emu/fadd.c<br/>index 7befbbf2c332..04d3b4aa32ce 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/fadd.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/math-emu/fadd.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/fadd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/fadd.c</a></div><div class='hunk'>@@ -2,8 +2,9 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "soft-fp.h"</div><div class='del'>-#include "double.h"</div><div class='add'>+#include &lt;asm/sfp-machine.h&gt;</div><div class='add'>+#include &lt;math-emu/soft-fp.h&gt;</div><div class='add'>+#include &lt;math-emu/double.h&gt;</div><div class='ctx'> </div><div class='ctx'> int</div><div class='ctx'> fadd(void *frD, void *frA, void *frB)</div><div class='hunk'>@@ -11,28 +12,28 @@ fadd(void *frD, void *frA, void *frB)</div><div class='ctx'> 	FP_DECL_D(A);</div><div class='ctx'> 	FP_DECL_D(B);</div><div class='ctx'> 	FP_DECL_D(R);</div><div class='add'>+	FP_DECL_EX;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 	printk("%s: %p %p %p\n", __func__, frD, frA, frB);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	__FP_UNPACK_D(A, frA);</div><div class='del'>-	__FP_UNPACK_D(B, frB);</div><div class='add'>+	FP_UNPACK_DP(A, frA);</div><div class='add'>+	FP_UNPACK_DP(B, frB);</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 	printk("A: %ld %lu %lu %ld (%ld)\n", A_s, A_f1, A_f0, A_e, A_c);</div><div class='ctx'> 	printk("B: %ld %lu %lu %ld (%ld)\n", B_s, B_f1, B_f0, B_e, B_c);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	if (A_s != B_s &amp;&amp; A_c == FP_CLS_INF &amp;&amp; B_c == FP_CLS_INF)</div><div class='del'>-		ret |= EFLAG_VXISI;</div><div class='del'>-</div><div class='ctx'> 	FP_ADD_D(R, A, B);</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 	printk("D: %ld %lu %lu %ld (%ld)\n", R_s, R_f1, R_f0, R_e, R_c);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	return (ret | __FP_PACK_D(frD, R));</div><div class='add'>+	__FP_PACK_D(frD, R);</div><div class='add'>+</div><div class='add'>+	return FP_CUR_EXCEPTIONS;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/math-emu/fadds.c b/arch/powerpc/math-emu/fadds.c<br/>index 2b346b38b480..5930f40a8687 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/fadds.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/math-emu/fadds.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/fadds.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/fadds.c</a></div><div class='hunk'>@@ -2,9 +2,10 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "soft-fp.h"</div><div class='del'>-#include "double.h"</div><div class='del'>-#include "single.h"</div><div class='add'>+#include &lt;asm/sfp-machine.h&gt;</div><div class='add'>+#include &lt;math-emu/soft-fp.h&gt;</div><div class='add'>+#include &lt;math-emu/double.h&gt;</div><div class='add'>+#include &lt;math-emu/single.h&gt;</div><div class='ctx'> </div><div class='ctx'> int</div><div class='ctx'> fadds(void *frD, void *frA, void *frB)</div><div class='hunk'>@@ -12,28 +13,27 @@ fadds(void *frD, void *frA, void *frB)</div><div class='ctx'> 	FP_DECL_D(A);</div><div class='ctx'> 	FP_DECL_D(B);</div><div class='ctx'> 	FP_DECL_D(R);</div><div class='del'>-	int ret = 0;</div><div class='add'>+	FP_DECL_EX;</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 	printk("%s: %p %p %p\n", __func__, frD, frA, frB);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	__FP_UNPACK_D(A, frA);</div><div class='del'>-	__FP_UNPACK_D(B, frB);</div><div class='add'>+	FP_UNPACK_DP(A, frA);</div><div class='add'>+	FP_UNPACK_DP(B, frB);</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 	printk("A: %ld %lu %lu %ld (%ld)\n", A_s, A_f1, A_f0, A_e, A_c);</div><div class='ctx'> 	printk("B: %ld %lu %lu %ld (%ld)\n", B_s, B_f1, B_f0, B_e, B_c);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	if (A_s != B_s &amp;&amp; A_c == FP_CLS_INF &amp;&amp; B_c == FP_CLS_INF)</div><div class='del'>-		ret |= EFLAG_VXISI;</div><div class='del'>-</div><div class='ctx'> 	FP_ADD_D(R, A, B);</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 	printk("D: %ld %lu %lu %ld (%ld)\n", R_s, R_f1, R_f0, R_e, R_c);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	return (ret | __FP_PACK_DS(frD, R));</div><div class='add'>+	__FP_PACK_DS(frD, R);</div><div class='add'>+</div><div class='add'>+	return FP_CUR_EXCEPTIONS;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/math-emu/fcmpo.c b/arch/powerpc/math-emu/fcmpo.c<br/>index 36d689044c63..b5dc4498cd71 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/fcmpo.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/math-emu/fcmpo.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/fcmpo.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/fcmpo.c</a></div><div class='hunk'>@@ -2,14 +2,16 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "soft-fp.h"</div><div class='del'>-#include "double.h"</div><div class='add'>+#include &lt;asm/sfp-machine.h&gt;</div><div class='add'>+#include &lt;math-emu/soft-fp.h&gt;</div><div class='add'>+#include &lt;math-emu/double.h&gt;</div><div class='ctx'> </div><div class='ctx'> int</div><div class='ctx'> fcmpo(u32 *ccr, int crfD, void *frA, void *frB)</div><div class='ctx'> {</div><div class='ctx'> 	FP_DECL_D(A);</div><div class='ctx'> 	FP_DECL_D(B);</div><div class='add'>+	FP_DECL_EX;</div><div class='ctx'> 	int code[4] = { (1 &lt;&lt; 3), (1 &lt;&lt; 1), (1 &lt;&lt; 2), (1 &lt;&lt; 0) };</div><div class='ctx'> 	long cmp;</div><div class='ctx'> 	int ret = 0;</div><div class='hunk'>@@ -18,8 +20,8 @@ fcmpo(u32 *ccr, int crfD, void *frA, void *frB)</div><div class='ctx'> 	printk("%s: %p (%08x) %d %p %p\n", __func__, ccr, *ccr, crfD, frA, frB);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	__FP_UNPACK_D(A, frA);</div><div class='del'>-	__FP_UNPACK_D(B, frB);</div><div class='add'>+	FP_UNPACK_DP(A, frA);</div><div class='add'>+	FP_UNPACK_DP(B, frB);</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 	printk("A: %ld %lu %lu %ld (%ld)\n", A_s, A_f1, A_f0, A_e, A_c);</div><div class='head'>diff --git a/arch/powerpc/math-emu/fcmpu.c b/arch/powerpc/math-emu/fcmpu.c<br/>index 53d93894f2a6..d4fb1babc6ad 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/fcmpu.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/math-emu/fcmpu.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/fcmpu.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/fcmpu.c</a></div><div class='hunk'>@@ -2,14 +2,16 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "soft-fp.h"</div><div class='del'>-#include "double.h"</div><div class='add'>+#include &lt;asm/sfp-machine.h&gt;</div><div class='add'>+#include &lt;math-emu/soft-fp.h&gt;</div><div class='add'>+#include &lt;math-emu/double.h&gt;</div><div class='ctx'> </div><div class='ctx'> int</div><div class='ctx'> fcmpu(u32 *ccr, int crfD, void *frA, void *frB)</div><div class='ctx'> {</div><div class='ctx'> 	FP_DECL_D(A);</div><div class='ctx'> 	FP_DECL_D(B);</div><div class='add'>+	FP_DECL_EX;</div><div class='ctx'> 	int code[4] = { (1 &lt;&lt; 3), (1 &lt;&lt; 1), (1 &lt;&lt; 2), (1 &lt;&lt; 0) };</div><div class='ctx'> 	long cmp;</div><div class='ctx'> </div><div class='hunk'>@@ -17,8 +19,8 @@ fcmpu(u32 *ccr, int crfD, void *frA, void *frB)</div><div class='ctx'> 	printk("%s: %p (%08x) %d %p %p\n", __func__, ccr, *ccr, crfD, frA, frB);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	__FP_UNPACK_D(A, frA);</div><div class='del'>-	__FP_UNPACK_D(B, frB);</div><div class='add'>+	FP_UNPACK_DP(A, frA);</div><div class='add'>+	FP_UNPACK_DP(B, frB);</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 	printk("A: %ld %lu %lu %ld (%ld)\n", A_s, A_f1, A_f0, A_e, A_c);</div><div class='head'>diff --git a/arch/powerpc/math-emu/fctiw.c b/arch/powerpc/math-emu/fctiw.c<br/>index fcd7a95e021d..f694440ddc00 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/fctiw.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/math-emu/fctiw.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/fctiw.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/fctiw.c</a></div><div class='hunk'>@@ -2,16 +2,18 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "soft-fp.h"</div><div class='del'>-#include "double.h"</div><div class='add'>+#include &lt;asm/sfp-machine.h&gt;</div><div class='add'>+#include &lt;math-emu/soft-fp.h&gt;</div><div class='add'>+#include &lt;math-emu/double.h&gt;</div><div class='ctx'> </div><div class='ctx'> int</div><div class='ctx'> fctiw(u32 *frD, void *frB)</div><div class='ctx'> {</div><div class='ctx'> 	FP_DECL_D(B);</div><div class='add'>+	FP_DECL_EX;</div><div class='ctx'> 	unsigned int r;</div><div class='ctx'> </div><div class='del'>-	__FP_UNPACK_D(B, frB);</div><div class='add'>+	FP_UNPACK_DP(B, frB);</div><div class='ctx'> 	FP_TO_INT_D(r, B, 32, 1);</div><div class='ctx'> 	frD[1] = r;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/math-emu/fctiwz.c b/arch/powerpc/math-emu/fctiwz.c<br/>index 1514d59e146e..71e782fd4fe3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/fctiwz.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/math-emu/fctiwz.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/fctiwz.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/fctiwz.c</a></div><div class='hunk'>@@ -2,13 +2,15 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "soft-fp.h"</div><div class='del'>-#include "double.h"</div><div class='add'>+#include &lt;asm/sfp-machine.h&gt;</div><div class='add'>+#include &lt;math-emu/soft-fp.h&gt;</div><div class='add'>+#include &lt;math-emu/double.h&gt;</div><div class='ctx'> </div><div class='ctx'> int</div><div class='ctx'> fctiwz(u32 *frD, void *frB)</div><div class='ctx'> {</div><div class='ctx'> 	FP_DECL_D(B);</div><div class='add'>+	FP_DECL_EX;</div><div class='ctx'> 	u32 fpscr;</div><div class='ctx'> 	unsigned int r;</div><div class='ctx'> </div><div class='hunk'>@@ -16,7 +18,7 @@ fctiwz(u32 *frD, void *frB)</div><div class='ctx'> 	__FPU_FPSCR &amp;= ~(3);</div><div class='ctx'> 	__FPU_FPSCR |= FP_RND_ZERO;</div><div class='ctx'> </div><div class='del'>-	__FP_UNPACK_D(B, frB);</div><div class='add'>+	FP_UNPACK_DP(B, frB);</div><div class='ctx'> 	FP_TO_INT_D(r, B, 32, 1);</div><div class='ctx'> 	frD[1] = r;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/math-emu/fdiv.c b/arch/powerpc/math-emu/fdiv.c<br/>index 18a20fe396b0..2db15097d98e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/fdiv.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/math-emu/fdiv.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/fdiv.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/fdiv.c</a></div><div class='hunk'>@@ -2,8 +2,9 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "soft-fp.h"</div><div class='del'>-#include "double.h"</div><div class='add'>+#include &lt;asm/sfp-machine.h&gt;</div><div class='add'>+#include &lt;math-emu/soft-fp.h&gt;</div><div class='add'>+#include &lt;math-emu/double.h&gt;</div><div class='ctx'> </div><div class='ctx'> int</div><div class='ctx'> fdiv(void *frD, void *frA, void *frB)</div><div class='hunk'>@@ -11,14 +12,15 @@ fdiv(void *frD, void *frA, void *frB)</div><div class='ctx'> 	FP_DECL_D(A);</div><div class='ctx'> 	FP_DECL_D(B);</div><div class='ctx'> 	FP_DECL_D(R);</div><div class='add'>+	FP_DECL_EX;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 	printk("%s: %p %p %p\n", __func__, frD, frA, frB);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	__FP_UNPACK_D(A, frA);</div><div class='del'>-	__FP_UNPACK_D(B, frB);</div><div class='add'>+	FP_UNPACK_DP(A, frA);</div><div class='add'>+	FP_UNPACK_DP(B, frB);</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 	printk("A: %ld %lu %lu %ld (%ld)\n", A_s, A_f1, A_f0, A_e, A_c);</div><div class='hunk'>@@ -49,5 +51,7 @@ fdiv(void *frD, void *frA, void *frB)</div><div class='ctx'> 	printk("D: %ld %lu %lu %ld (%ld)\n", R_s, R_f1, R_f0, R_e, R_c);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	return (ret | __FP_PACK_D(frD, R));</div><div class='add'>+	__FP_PACK_D(frD, R);</div><div class='add'>+</div><div class='add'>+	return FP_CUR_EXCEPTIONS;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/math-emu/fdivs.c b/arch/powerpc/math-emu/fdivs.c<br/>index 24feed689c35..797f6a9a20b5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/fdivs.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/math-emu/fdivs.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/fdivs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/fdivs.c</a></div><div class='hunk'>@@ -2,9 +2,10 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "soft-fp.h"</div><div class='del'>-#include "double.h"</div><div class='del'>-#include "single.h"</div><div class='add'>+#include &lt;asm/sfp-machine.h&gt;</div><div class='add'>+#include &lt;math-emu/soft-fp.h&gt;</div><div class='add'>+#include &lt;math-emu/double.h&gt;</div><div class='add'>+#include &lt;math-emu/single.h&gt;</div><div class='ctx'> </div><div class='ctx'> int</div><div class='ctx'> fdivs(void *frD, void *frA, void *frB)</div><div class='hunk'>@@ -12,14 +13,15 @@ fdivs(void *frD, void *frA, void *frB)</div><div class='ctx'> 	FP_DECL_D(A);</div><div class='ctx'> 	FP_DECL_D(B);</div><div class='ctx'> 	FP_DECL_D(R);</div><div class='add'>+	FP_DECL_EX;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 	printk("%s: %p %p %p\n", __func__, frD, frA, frB);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	__FP_UNPACK_D(A, frA);</div><div class='del'>-	__FP_UNPACK_D(B, frB);</div><div class='add'>+	FP_UNPACK_DP(A, frA);</div><div class='add'>+	FP_UNPACK_DP(B, frB);</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 	printk("A: %ld %lu %lu %ld (%ld)\n", A_s, A_f1, A_f0, A_e, A_c);</div><div class='hunk'>@@ -51,5 +53,7 @@ fdivs(void *frD, void *frA, void *frB)</div><div class='ctx'> 	printk("D: %ld %lu %lu %ld (%ld)\n", R_s, R_f1, R_f0, R_e, R_c);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	return (ret | __FP_PACK_DS(frD, R));</div><div class='add'>+	__FP_PACK_DS(frD, R);</div><div class='add'>+</div><div class='add'>+	return FP_CUR_EXCEPTIONS;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/math-emu/fmadd.c b/arch/powerpc/math-emu/fmadd.c<br/>index dedb465fdc68..925313aa6f82 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/fmadd.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/math-emu/fmadd.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/fmadd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/fmadd.c</a></div><div class='hunk'>@@ -2,8 +2,9 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "soft-fp.h"</div><div class='del'>-#include "double.h"</div><div class='add'>+#include &lt;asm/sfp-machine.h&gt;</div><div class='add'>+#include &lt;math-emu/soft-fp.h&gt;</div><div class='add'>+#include &lt;math-emu/double.h&gt;</div><div class='ctx'> </div><div class='ctx'> int</div><div class='ctx'> fmadd(void *frD, void *frA, void *frB, void *frC)</div><div class='hunk'>@@ -13,15 +14,16 @@ fmadd(void *frD, void *frA, void *frB, void *frC)</div><div class='ctx'> 	FP_DECL_D(B);</div><div class='ctx'> 	FP_DECL_D(C);</div><div class='ctx'> 	FP_DECL_D(T);</div><div class='add'>+	FP_DECL_EX;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 	printk("%s: %p %p %p %p\n", __func__, frD, frA, frB, frC);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	__FP_UNPACK_D(A, frA);</div><div class='del'>-	__FP_UNPACK_D(B, frB);</div><div class='del'>-	__FP_UNPACK_D(C, frC);</div><div class='add'>+	FP_UNPACK_DP(A, frA);</div><div class='add'>+	FP_UNPACK_DP(B, frB);</div><div class='add'>+	FP_UNPACK_DP(C, frC);</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 	printk("A: %ld %lu %lu %ld (%ld)\n", A_s, A_f1, A_f0, A_e, A_c);</div><div class='hunk'>@@ -44,5 +46,7 @@ fmadd(void *frD, void *frA, void *frB, void *frC)</div><div class='ctx'> 	printk("D: %ld %lu %lu %ld (%ld)\n", R_s, R_f1, R_f0, R_e, R_c);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	return (ret | __FP_PACK_D(frD, R));</div><div class='add'>+	__FP_PACK_D(frD, R);</div><div class='add'>+</div><div class='add'>+	return FP_CUR_EXCEPTIONS;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/math-emu/fmadds.c b/arch/powerpc/math-emu/fmadds.c<br/>index 6bbb56d5502c..aea80ef79399 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/fmadds.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/math-emu/fmadds.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/fmadds.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/fmadds.c</a></div><div class='hunk'>@@ -2,9 +2,10 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "soft-fp.h"</div><div class='del'>-#include "double.h"</div><div class='del'>-#include "single.h"</div><div class='add'>+#include &lt;asm/sfp-machine.h&gt;</div><div class='add'>+#include &lt;math-emu/soft-fp.h&gt;</div><div class='add'>+#include &lt;math-emu/double.h&gt;</div><div class='add'>+#include &lt;math-emu/single.h&gt;</div><div class='ctx'> </div><div class='ctx'> int</div><div class='ctx'> fmadds(void *frD, void *frA, void *frB, void *frC)</div><div class='hunk'>@@ -14,15 +15,16 @@ fmadds(void *frD, void *frA, void *frB, void *frC)</div><div class='ctx'> 	FP_DECL_D(B);</div><div class='ctx'> 	FP_DECL_D(C);</div><div class='ctx'> 	FP_DECL_D(T);</div><div class='add'>+	FP_DECL_EX;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 	printk("%s: %p %p %p %p\n", __func__, frD, frA, frB, frC);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	__FP_UNPACK_D(A, frA);</div><div class='del'>-	__FP_UNPACK_D(B, frB);</div><div class='del'>-	__FP_UNPACK_D(C, frC);</div><div class='add'>+	FP_UNPACK_DP(A, frA);</div><div class='add'>+	FP_UNPACK_DP(B, frB);</div><div class='add'>+	FP_UNPACK_DP(C, frC);</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 	printk("A: %ld %lu %lu %ld (%ld)\n", A_s, A_f1, A_f0, A_e, A_c);</div><div class='hunk'>@@ -45,5 +47,7 @@ fmadds(void *frD, void *frA, void *frB, void *frC)</div><div class='ctx'> 	printk("D: %ld %lu %lu %ld (%ld)\n", R_s, R_f1, R_f0, R_e, R_c);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	return (ret | __FP_PACK_DS(frD, R));</div><div class='add'>+	__FP_PACK_DS(frD, R);</div><div class='add'>+</div><div class='add'>+	return FP_CUR_EXCEPTIONS;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/math-emu/fmsub.c b/arch/powerpc/math-emu/fmsub.c<br/>index f311e2c7e67e..a644d525fca6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/fmsub.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/math-emu/fmsub.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/fmsub.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/fmsub.c</a></div><div class='hunk'>@@ -2,8 +2,9 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "soft-fp.h"</div><div class='del'>-#include "double.h"</div><div class='add'>+#include &lt;asm/sfp-machine.h&gt;</div><div class='add'>+#include &lt;math-emu/soft-fp.h&gt;</div><div class='add'>+#include &lt;math-emu/double.h&gt;</div><div class='ctx'> </div><div class='ctx'> int</div><div class='ctx'> fmsub(void *frD, void *frA, void *frB, void *frC)</div><div class='hunk'>@@ -13,15 +14,16 @@ fmsub(void *frD, void *frA, void *frB, void *frC)</div><div class='ctx'> 	FP_DECL_D(B);</div><div class='ctx'> 	FP_DECL_D(C);</div><div class='ctx'> 	FP_DECL_D(T);</div><div class='add'>+	FP_DECL_EX;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 	printk("%s: %p %p %p %p\n", __func__, frD, frA, frB, frC);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	__FP_UNPACK_D(A, frA);</div><div class='del'>-	__FP_UNPACK_D(B, frB);</div><div class='del'>-	__FP_UNPACK_D(C, frC);</div><div class='add'>+	FP_UNPACK_DP(A, frA);</div><div class='add'>+	FP_UNPACK_DP(B, frB);</div><div class='add'>+	FP_UNPACK_DP(C, frC);</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 	printk("A: %ld %lu %lu %ld (%ld)\n", A_s, A_f1, A_f0, A_e, A_c);</div><div class='hunk'>@@ -47,5 +49,7 @@ fmsub(void *frD, void *frA, void *frB, void *frC)</div><div class='ctx'> 	printk("D: %ld %lu %lu %ld (%ld)\n", R_s, R_f1, R_f0, R_e, R_c);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	return (ret | __FP_PACK_D(frD, R));</div><div class='add'>+	__FP_PACK_D(frD, R);</div><div class='add'>+</div><div class='add'>+	return FP_CUR_EXCEPTIONS;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/math-emu/fmsubs.c b/arch/powerpc/math-emu/fmsubs.c<br/>index 81a716d3ee2e..2fdeeb9bb569 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/fmsubs.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/math-emu/fmsubs.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/fmsubs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/fmsubs.c</a></div><div class='hunk'>@@ -2,9 +2,10 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "soft-fp.h"</div><div class='del'>-#include "double.h"</div><div class='del'>-#include "single.h"</div><div class='add'>+#include &lt;asm/sfp-machine.h&gt;</div><div class='add'>+#include &lt;math-emu/soft-fp.h&gt;</div><div class='add'>+#include &lt;math-emu/double.h&gt;</div><div class='add'>+#include &lt;math-emu/single.h&gt;</div><div class='ctx'> </div><div class='ctx'> int</div><div class='ctx'> fmsubs(void *frD, void *frA, void *frB, void *frC)</div><div class='hunk'>@@ -14,15 +15,16 @@ fmsubs(void *frD, void *frA, void *frB, void *frC)</div><div class='ctx'> 	FP_DECL_D(B);</div><div class='ctx'> 	FP_DECL_D(C);</div><div class='ctx'> 	FP_DECL_D(T);</div><div class='add'>+	FP_DECL_EX;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 	printk("%s: %p %p %p %p\n", __func__, frD, frA, frB, frC);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	__FP_UNPACK_D(A, frA);</div><div class='del'>-	__FP_UNPACK_D(B, frB);</div><div class='del'>-	__FP_UNPACK_D(C, frC);</div><div class='add'>+	FP_UNPACK_DP(A, frA);</div><div class='add'>+	FP_UNPACK_DP(B, frB);</div><div class='add'>+	FP_UNPACK_DP(C, frC);</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 	printk("A: %ld %lu %lu %ld (%ld)\n", A_s, A_f1, A_f0, A_e, A_c);</div><div class='hunk'>@@ -48,5 +50,7 @@ fmsubs(void *frD, void *frA, void *frB, void *frC)</div><div class='ctx'> 	printk("D: %ld %lu %lu %ld (%ld)\n", R_s, R_f1, R_f0, R_e, R_c);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	return (ret | __FP_PACK_DS(frD, R));</div><div class='add'>+	__FP_PACK_DS(frD, R);</div><div class='add'>+</div><div class='add'>+	return FP_CUR_EXCEPTIONS;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/math-emu/fmul.c b/arch/powerpc/math-emu/fmul.c<br/>index 2f3d32784a04..391fd17d3440 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/fmul.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/math-emu/fmul.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/fmul.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/fmul.c</a></div><div class='hunk'>@@ -2,8 +2,9 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "soft-fp.h"</div><div class='del'>-#include "double.h"</div><div class='add'>+#include &lt;asm/sfp-machine.h&gt;</div><div class='add'>+#include &lt;math-emu/soft-fp.h&gt;</div><div class='add'>+#include &lt;math-emu/double.h&gt;</div><div class='ctx'> </div><div class='ctx'> int</div><div class='ctx'> fmul(void *frD, void *frA, void *frB)</div><div class='hunk'>@@ -11,14 +12,15 @@ fmul(void *frD, void *frA, void *frB)</div><div class='ctx'> 	FP_DECL_D(A);</div><div class='ctx'> 	FP_DECL_D(B);</div><div class='ctx'> 	FP_DECL_D(R);</div><div class='add'>+	FP_DECL_EX;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 	printk("%s: %p %p %p\n", __func__, frD, frA, frB);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	__FP_UNPACK_D(A, frA);</div><div class='del'>-	__FP_UNPACK_D(B, frB);</div><div class='add'>+	FP_UNPACK_DP(A, frA);</div><div class='add'>+	FP_UNPACK_DP(B, frB);</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 	printk("A: %ld %lu %lu %ld (%ld) [%08lx.%08lx %lx]\n",</div><div class='hunk'>@@ -38,5 +40,7 @@ fmul(void *frD, void *frA, void *frB)</div><div class='ctx'> 	       R_s, R_f1, R_f0, R_e, R_c, R_f1, R_f0, R_e + 1023);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	return (ret | __FP_PACK_D(frD, R));</div><div class='add'>+	__FP_PACK_D(frD, R);</div><div class='add'>+</div><div class='add'>+	return FP_CUR_EXCEPTIONS;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/math-emu/fmuls.c b/arch/powerpc/math-emu/fmuls.c<br/>index 962b5883f784..2d3ec5f7da20 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/fmuls.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/math-emu/fmuls.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/fmuls.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/fmuls.c</a></div><div class='hunk'>@@ -2,9 +2,10 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "soft-fp.h"</div><div class='del'>-#include "double.h"</div><div class='del'>-#include "single.h"</div><div class='add'>+#include &lt;asm/sfp-machine.h&gt;</div><div class='add'>+#include &lt;math-emu/soft-fp.h&gt;</div><div class='add'>+#include &lt;math-emu/double.h&gt;</div><div class='add'>+#include &lt;math-emu/single.h&gt;</div><div class='ctx'> </div><div class='ctx'> int</div><div class='ctx'> fmuls(void *frD, void *frA, void *frB)</div><div class='hunk'>@@ -12,14 +13,15 @@ fmuls(void *frD, void *frA, void *frB)</div><div class='ctx'> 	FP_DECL_D(A);</div><div class='ctx'> 	FP_DECL_D(B);</div><div class='ctx'> 	FP_DECL_D(R);</div><div class='add'>+	FP_DECL_EX;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 	printk("%s: %p %p %p\n", __func__, frD, frA, frB);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	__FP_UNPACK_D(A, frA);</div><div class='del'>-	__FP_UNPACK_D(B, frB);</div><div class='add'>+	FP_UNPACK_DP(A, frA);</div><div class='add'>+	FP_UNPACK_DP(B, frB);</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 	printk("A: %ld %lu %lu %ld (%ld) [%08lx.%08lx %lx]\n",</div><div class='hunk'>@@ -39,5 +41,7 @@ fmuls(void *frD, void *frA, void *frB)</div><div class='ctx'> 	       R_s, R_f1, R_f0, R_e, R_c, R_f1, R_f0, R_e + 1023);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	return (ret | __FP_PACK_DS(frD, R));</div><div class='add'>+	__FP_PACK_DS(frD, R);</div><div class='add'>+</div><div class='add'>+	return FP_CUR_EXCEPTIONS;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/math-emu/fnmadd.c b/arch/powerpc/math-emu/fnmadd.c<br/>index 8cf7827c4fb5..2497b86494e5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/fnmadd.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/math-emu/fnmadd.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/fnmadd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/fnmadd.c</a></div><div class='hunk'>@@ -2,8 +2,9 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "soft-fp.h"</div><div class='del'>-#include "double.h"</div><div class='add'>+#include &lt;asm/sfp-machine.h&gt;</div><div class='add'>+#include &lt;math-emu/soft-fp.h&gt;</div><div class='add'>+#include &lt;math-emu/double.h&gt;</div><div class='ctx'> </div><div class='ctx'> int</div><div class='ctx'> fnmadd(void *frD, void *frA, void *frB, void *frC)</div><div class='hunk'>@@ -13,15 +14,16 @@ fnmadd(void *frD, void *frA, void *frB, void *frC)</div><div class='ctx'> 	FP_DECL_D(B);</div><div class='ctx'> 	FP_DECL_D(C);</div><div class='ctx'> 	FP_DECL_D(T);</div><div class='add'>+	FP_DECL_EX;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 	printk("%s: %p %p %p %p\n", __func__, frD, frA, frB, frC);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	__FP_UNPACK_D(A, frA);</div><div class='del'>-	__FP_UNPACK_D(B, frB);</div><div class='del'>-	__FP_UNPACK_D(C, frC);</div><div class='add'>+	FP_UNPACK_DP(A, frA);</div><div class='add'>+	FP_UNPACK_DP(B, frB);</div><div class='add'>+	FP_UNPACK_DP(C, frC);</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 	printk("A: %ld %lu %lu %ld (%ld)\n", A_s, A_f1, A_f0, A_e, A_c);</div><div class='hunk'>@@ -47,5 +49,7 @@ fnmadd(void *frD, void *frA, void *frB, void *frC)</div><div class='ctx'> 	printk("D: %ld %lu %lu %ld (%ld)\n", R_s, R_f1, R_f0, R_e, R_c);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	return (ret | __FP_PACK_D(frD, R));</div><div class='add'>+	__FP_PACK_D(frD, R);</div><div class='add'>+</div><div class='add'>+	return FP_CUR_EXCEPTIONS;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/math-emu/fnmadds.c b/arch/powerpc/math-emu/fnmadds.c<br/>index f1c4f0f0d807..ee9d71e0b376 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/fnmadds.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/math-emu/fnmadds.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/fnmadds.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/fnmadds.c</a></div><div class='hunk'>@@ -2,9 +2,10 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "soft-fp.h"</div><div class='del'>-#include "double.h"</div><div class='del'>-#include "single.h"</div><div class='add'>+#include &lt;asm/sfp-machine.h&gt;</div><div class='add'>+#include &lt;math-emu/soft-fp.h&gt;</div><div class='add'>+#include &lt;math-emu/double.h&gt;</div><div class='add'>+#include &lt;math-emu/single.h&gt;</div><div class='ctx'> </div><div class='ctx'> int</div><div class='ctx'> fnmadds(void *frD, void *frA, void *frB, void *frC)</div><div class='hunk'>@@ -14,15 +15,16 @@ fnmadds(void *frD, void *frA, void *frB, void *frC)</div><div class='ctx'> 	FP_DECL_D(B);</div><div class='ctx'> 	FP_DECL_D(C);</div><div class='ctx'> 	FP_DECL_D(T);</div><div class='add'>+	FP_DECL_EX;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 	printk("%s: %p %p %p %p\n", __func__, frD, frA, frB, frC);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	__FP_UNPACK_D(A, frA);</div><div class='del'>-	__FP_UNPACK_D(B, frB);</div><div class='del'>-	__FP_UNPACK_D(C, frC);</div><div class='add'>+	FP_UNPACK_DP(A, frA);</div><div class='add'>+	FP_UNPACK_DP(B, frB);</div><div class='add'>+	FP_UNPACK_DP(C, frC);</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 	printk("A: %ld %lu %lu %ld (%ld)\n", A_s, A_f1, A_f0, A_e, A_c);</div><div class='hunk'>@@ -48,5 +50,7 @@ fnmadds(void *frD, void *frA, void *frB, void *frC)</div><div class='ctx'> 	printk("D: %ld %lu %lu %ld (%ld)\n", R_s, R_f1, R_f0, R_e, R_c);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	return (ret | __FP_PACK_DS(frD, R));</div><div class='add'>+	__FP_PACK_DS(frD, R);</div><div class='add'>+</div><div class='add'>+	return FP_CUR_EXCEPTIONS;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/math-emu/fnmsub.c b/arch/powerpc/math-emu/fnmsub.c<br/>index 98944e6e2601..3885a77acc93 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/fnmsub.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/math-emu/fnmsub.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/fnmsub.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/fnmsub.c</a></div><div class='hunk'>@@ -2,8 +2,9 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "soft-fp.h"</div><div class='del'>-#include "double.h"</div><div class='add'>+#include &lt;asm/sfp-machine.h&gt;</div><div class='add'>+#include &lt;math-emu/soft-fp.h&gt;</div><div class='add'>+#include &lt;math-emu/double.h&gt;</div><div class='ctx'> </div><div class='ctx'> int</div><div class='ctx'> fnmsub(void *frD, void *frA, void *frB, void *frC)</div><div class='hunk'>@@ -13,15 +14,16 @@ fnmsub(void *frD, void *frA, void *frB, void *frC)</div><div class='ctx'> 	FP_DECL_D(B);</div><div class='ctx'> 	FP_DECL_D(C);</div><div class='ctx'> 	FP_DECL_D(T);</div><div class='add'>+	FP_DECL_EX;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 	printk("%s: %p %p %p %p\n", __func__, frD, frA, frB, frC);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	__FP_UNPACK_D(A, frA);</div><div class='del'>-	__FP_UNPACK_D(B, frB);</div><div class='del'>-	__FP_UNPACK_D(C, frC);</div><div class='add'>+	FP_UNPACK_DP(A, frA);</div><div class='add'>+	FP_UNPACK_DP(B, frB);</div><div class='add'>+	FP_UNPACK_DP(C, frC);</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 	printk("A: %ld %lu %lu %ld (%ld)\n", A_s, A_f1, A_f0, A_e, A_c);</div><div class='hunk'>@@ -50,5 +52,7 @@ fnmsub(void *frD, void *frA, void *frB, void *frC)</div><div class='ctx'> 	printk("D: %ld %lu %lu %ld (%ld)\n", R_s, R_f1, R_f0, R_e, R_c);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	return (ret | __FP_PACK_D(frD, R));</div><div class='add'>+	__FP_PACK_D(frD, R);</div><div class='add'>+</div><div class='add'>+	return FP_CUR_EXCEPTIONS;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/math-emu/fnmsubs.c b/arch/powerpc/math-emu/fnmsubs.c<br/>index b20f4eb63fb9..f835dfeb0fd1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/fnmsubs.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/math-emu/fnmsubs.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/fnmsubs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/fnmsubs.c</a></div><div class='hunk'>@@ -2,9 +2,10 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "soft-fp.h"</div><div class='del'>-#include "double.h"</div><div class='del'>-#include "single.h"</div><div class='add'>+#include &lt;asm/sfp-machine.h&gt;</div><div class='add'>+#include &lt;math-emu/soft-fp.h&gt;</div><div class='add'>+#include &lt;math-emu/double.h&gt;</div><div class='add'>+#include &lt;math-emu/single.h&gt;</div><div class='ctx'> </div><div class='ctx'> int</div><div class='ctx'> fnmsubs(void *frD, void *frA, void *frB, void *frC)</div><div class='hunk'>@@ -14,15 +15,16 @@ fnmsubs(void *frD, void *frA, void *frB, void *frC)</div><div class='ctx'> 	FP_DECL_D(B);</div><div class='ctx'> 	FP_DECL_D(C);</div><div class='ctx'> 	FP_DECL_D(T);</div><div class='add'>+	FP_DECL_EX;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 	printk("%s: %p %p %p %p\n", __func__, frD, frA, frB, frC);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	__FP_UNPACK_D(A, frA);</div><div class='del'>-	__FP_UNPACK_D(B, frB);</div><div class='del'>-	__FP_UNPACK_D(C, frC);</div><div class='add'>+	FP_UNPACK_DP(A, frA);</div><div class='add'>+	FP_UNPACK_DP(B, frB);</div><div class='add'>+	FP_UNPACK_DP(C, frC);</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 	printk("A: %ld %lu %lu %ld (%ld)\n", A_s, A_f1, A_f0, A_e, A_c);</div><div class='hunk'>@@ -51,5 +53,7 @@ fnmsubs(void *frD, void *frA, void *frB, void *frC)</div><div class='ctx'> 	printk("D: %ld %lu %lu %ld (%ld)\n", R_s, R_f1, R_f0, R_e, R_c);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	return (ret | __FP_PACK_DS(frD, R));</div><div class='add'>+	__FP_PACK_DS(frD, R);</div><div class='add'>+</div><div class='add'>+	return FP_CUR_EXCEPTIONS;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/math-emu/frsp.c b/arch/powerpc/math-emu/frsp.c<br/>index 724ccbc0468e..ddcc14664b1a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/frsp.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/math-emu/frsp.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/frsp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/frsp.c</a></div><div class='hunk'>@@ -2,24 +2,28 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "soft-fp.h"</div><div class='del'>-#include "double.h"</div><div class='del'>-#include "single.h"</div><div class='add'>+#include &lt;asm/sfp-machine.h&gt;</div><div class='add'>+#include &lt;math-emu/soft-fp.h&gt;</div><div class='add'>+#include &lt;math-emu/double.h&gt;</div><div class='add'>+#include &lt;math-emu/single.h&gt;</div><div class='ctx'> </div><div class='ctx'> int</div><div class='ctx'> frsp(void *frD, void *frB)</div><div class='ctx'> {</div><div class='ctx'> 	FP_DECL_D(B);</div><div class='add'>+	FP_DECL_EX;</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 	printk("%s: D %p, B %p\n", __func__, frD, frB);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	__FP_UNPACK_D(B, frB);</div><div class='add'>+	FP_UNPACK_DP(B, frB);</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 	printk("B: %ld %lu %lu %ld (%ld)\n", B_s, B_f1, B_f0, B_e, B_c);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	return __FP_PACK_DS(frD, B);</div><div class='add'>+	__FP_PACK_DS(frD, B);</div><div class='add'>+</div><div class='add'>+	return FP_CUR_EXCEPTIONS;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/math-emu/fsel.c b/arch/powerpc/math-emu/fsel.c<br/>index ecb5f28eb1f3..1b0c14498032 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/fsel.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/math-emu/fsel.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/fsel.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/fsel.c</a></div><div class='hunk'>@@ -2,19 +2,21 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "soft-fp.h"</div><div class='del'>-#include "double.h"</div><div class='add'>+#include &lt;asm/sfp-machine.h&gt;</div><div class='add'>+#include &lt;math-emu/soft-fp.h&gt;</div><div class='add'>+#include &lt;math-emu/double.h&gt;</div><div class='ctx'> </div><div class='ctx'> int</div><div class='ctx'> fsel(u32 *frD, void *frA, u32 *frB, u32 *frC)</div><div class='ctx'> {</div><div class='ctx'> 	FP_DECL_D(A);</div><div class='add'>+	FP_DECL_EX;</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 	printk("%s: %p %p %p %p\n", __func__, frD, frA, frB, frC);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	__FP_UNPACK_D(A, frA);</div><div class='add'>+	FP_UNPACK_DP(A, frA);</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 	printk("A: %ld %lu %lu %ld (%ld)\n", A_s, A_f1, A_f0, A_e, A_c);</div><div class='head'>diff --git a/arch/powerpc/math-emu/fsqrt.c b/arch/powerpc/math-emu/fsqrt.c<br/>index 38ec2b752e9d..3e90072693a0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/fsqrt.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/math-emu/fsqrt.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/fsqrt.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/fsqrt.c</a></div><div class='hunk'>@@ -2,21 +2,23 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "soft-fp.h"</div><div class='del'>-#include "double.h"</div><div class='add'>+#include &lt;asm/sfp-machine.h&gt;</div><div class='add'>+#include &lt;math-emu/soft-fp.h&gt;</div><div class='add'>+#include &lt;math-emu/double.h&gt;</div><div class='ctx'> </div><div class='ctx'> int</div><div class='ctx'> fsqrt(void *frD, void *frB)</div><div class='ctx'> {</div><div class='ctx'> 	FP_DECL_D(B);</div><div class='ctx'> 	FP_DECL_D(R);</div><div class='add'>+	FP_DECL_EX;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 	printk("%s: %p %p %p %p\n", __func__, frD, frB);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	__FP_UNPACK_D(B, frB);</div><div class='add'>+	FP_UNPACK_DP(B, frB);</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 	printk("B: %ld %lu %lu %ld (%ld)\n", B_s, B_f1, B_f0, B_e, B_c);</div><div class='hunk'>@@ -33,5 +35,7 @@ fsqrt(void *frD, void *frB)</div><div class='ctx'> 	printk("R: %ld %lu %lu %ld (%ld)\n", R_s, R_f1, R_f0, R_e, R_c);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	return (ret | __FP_PACK_D(frD, R));</div><div class='add'>+	__FP_PACK_D(frD, R);</div><div class='add'>+</div><div class='add'>+	return FP_CUR_EXCEPTIONS;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/math-emu/fsqrts.c b/arch/powerpc/math-emu/fsqrts.c<br/>index 335263e06ee5..2843be986e2e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/fsqrts.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/math-emu/fsqrts.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/fsqrts.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/fsqrts.c</a></div><div class='hunk'>@@ -2,22 +2,24 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "soft-fp.h"</div><div class='del'>-#include "double.h"</div><div class='del'>-#include "single.h"</div><div class='add'>+#include &lt;asm/sfp-machine.h&gt;</div><div class='add'>+#include &lt;math-emu/soft-fp.h&gt;</div><div class='add'>+#include &lt;math-emu/double.h&gt;</div><div class='add'>+#include &lt;math-emu/single.h&gt;</div><div class='ctx'> </div><div class='ctx'> int</div><div class='ctx'> fsqrts(void *frD, void *frB)</div><div class='ctx'> {</div><div class='ctx'> 	FP_DECL_D(B);</div><div class='ctx'> 	FP_DECL_D(R);</div><div class='add'>+	FP_DECL_EX;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 	printk("%s: %p %p %p %p\n", __func__, frD, frB);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	__FP_UNPACK_D(B, frB);</div><div class='add'>+	FP_UNPACK_DP(B, frB);</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 	printk("B: %ld %lu %lu %ld (%ld)\n", B_s, B_f1, B_f0, B_e, B_c);</div><div class='hunk'>@@ -34,5 +36,7 @@ fsqrts(void *frD, void *frB)</div><div class='ctx'> 	printk("R: %ld %lu %lu %ld (%ld)\n", R_s, R_f1, R_f0, R_e, R_c);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	return (ret | __FP_PACK_DS(frD, R));</div><div class='add'>+	__FP_PACK_DS(frD, R);</div><div class='add'>+</div><div class='add'>+	return FP_CUR_EXCEPTIONS;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/math-emu/fsub.c b/arch/powerpc/math-emu/fsub.c<br/>index 208d20fc52a5..78b09446a0e1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/fsub.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/math-emu/fsub.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/fsub.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/fsub.c</a></div><div class='hunk'>@@ -2,8 +2,9 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "soft-fp.h"</div><div class='del'>-#include "double.h"</div><div class='add'>+#include &lt;asm/sfp-machine.h&gt;</div><div class='add'>+#include &lt;math-emu/soft-fp.h&gt;</div><div class='add'>+#include &lt;math-emu/double.h&gt;</div><div class='ctx'> </div><div class='ctx'> int</div><div class='ctx'> fsub(void *frD, void *frA, void *frB)</div><div class='hunk'>@@ -11,14 +12,15 @@ fsub(void *frD, void *frA, void *frB)</div><div class='ctx'> 	FP_DECL_D(A);</div><div class='ctx'> 	FP_DECL_D(B);</div><div class='ctx'> 	FP_DECL_D(R);</div><div class='add'>+	FP_DECL_EX;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 	printk("%s: %p %p %p\n", __func__, frD, frA, frB);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	__FP_UNPACK_D(A, frA);</div><div class='del'>-	__FP_UNPACK_D(B, frB);</div><div class='add'>+	FP_UNPACK_DP(A, frA);</div><div class='add'>+	FP_UNPACK_DP(B, frB);</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 	printk("A: %ld %lu %lu %ld (%ld)\n", A_s, A_f1, A_f0, A_e, A_c);</div><div class='hunk'>@@ -37,5 +39,7 @@ fsub(void *frD, void *frA, void *frB)</div><div class='ctx'> 	printk("D: %ld %lu %lu %ld (%ld)\n", R_s, R_f1, R_f0, R_e, R_c);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	return (ret | __FP_PACK_D(frD, R));</div><div class='add'>+	__FP_PACK_D(frD, R);</div><div class='add'>+</div><div class='add'>+	return FP_CUR_EXCEPTIONS;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/math-emu/fsubs.c b/arch/powerpc/math-emu/fsubs.c<br/>index 0e61b808c44b..d3bf90863cf2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/fsubs.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/math-emu/fsubs.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/fsubs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/fsubs.c</a></div><div class='hunk'>@@ -2,9 +2,10 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "soft-fp.h"</div><div class='del'>-#include "double.h"</div><div class='del'>-#include "single.h"</div><div class='add'>+#include &lt;asm/sfp-machine.h&gt;</div><div class='add'>+#include &lt;math-emu/soft-fp.h&gt;</div><div class='add'>+#include &lt;math-emu/double.h&gt;</div><div class='add'>+#include &lt;math-emu/single.h&gt;</div><div class='ctx'> </div><div class='ctx'> int</div><div class='ctx'> fsubs(void *frD, void *frA, void *frB)</div><div class='hunk'>@@ -12,14 +13,15 @@ fsubs(void *frD, void *frA, void *frB)</div><div class='ctx'> 	FP_DECL_D(A);</div><div class='ctx'> 	FP_DECL_D(B);</div><div class='ctx'> 	FP_DECL_D(R);</div><div class='add'>+	FP_DECL_EX;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 	printk("%s: %p %p %p\n", __func__, frD, frA, frB);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	__FP_UNPACK_D(A, frA);</div><div class='del'>-	__FP_UNPACK_D(B, frB);</div><div class='add'>+	FP_UNPACK_DP(A, frA);</div><div class='add'>+	FP_UNPACK_DP(B, frB);</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 	printk("A: %ld %lu %lu %ld (%ld)\n", A_s, A_f1, A_f0, A_e, A_c);</div><div class='hunk'>@@ -38,5 +40,7 @@ fsubs(void *frD, void *frA, void *frB)</div><div class='ctx'> 	printk("D: %ld %lu %lu %ld (%ld)\n", R_s, R_f1, R_f0, R_e, R_c);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	return (ret | __FP_PACK_DS(frD, R));</div><div class='add'>+	__FP_PACK_DS(frD, R);</div><div class='add'>+</div><div class='add'>+	return FP_CUR_EXCEPTIONS;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/math-emu/lfd.c b/arch/powerpc/math-emu/lfd.c<br/>index 6ec90b57c61a..79ac76d596c3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/lfd.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/math-emu/lfd.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/lfd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/lfd.c</a></div><div class='hunk'>@@ -2,8 +2,8 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "sfp-machine.h"</div><div class='del'>-#include "double.h"</div><div class='add'>+#include &lt;asm/sfp-machine.h&gt;</div><div class='add'>+#include &lt;math-emu/double.h&gt;</div><div class='ctx'> </div><div class='ctx'> int</div><div class='ctx'> lfd(void *frD, void *ea)</div><div class='head'>diff --git a/arch/powerpc/math-emu/lfs.c b/arch/powerpc/math-emu/lfs.c<br/>index 6f18ebe3a7ff..434ed27be8db 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/lfs.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/math-emu/lfs.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/lfs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/lfs.c</a></div><div class='hunk'>@@ -2,15 +2,17 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "soft-fp.h"</div><div class='del'>-#include "double.h"</div><div class='del'>-#include "single.h"</div><div class='add'>+#include &lt;asm/sfp-machine.h&gt;</div><div class='add'>+#include &lt;math-emu/soft-fp.h&gt;</div><div class='add'>+#include &lt;math-emu/double.h&gt;</div><div class='add'>+#include &lt;math-emu/single.h&gt;</div><div class='ctx'> </div><div class='ctx'> int</div><div class='ctx'> lfs(void *frD, void *ea)</div><div class='ctx'> {</div><div class='ctx'> 	FP_DECL_D(R);</div><div class='ctx'> 	FP_DECL_S(A);</div><div class='add'>+	FP_DECL_EX;</div><div class='ctx'> 	float f;</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='hunk'>@@ -20,7 +22,7 @@ lfs(void *frD, void *ea)</div><div class='ctx'> 	if (copy_from_user(&amp;f, ea, sizeof(float)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-	__FP_UNPACK_S(A, &amp;f);</div><div class='add'>+	FP_UNPACK_S(A, f);</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 	printk("A: %ld %lu %ld (%ld) [%08lx]\n", A_s, A_f, A_e, A_c,</div><div class='hunk'>@@ -33,5 +35,12 @@ lfs(void *frD, void *ea)</div><div class='ctx'> 	printk("R: %ld %lu %lu %ld (%ld)\n", R_s, R_f1, R_f0, R_e, R_c);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	return __FP_PACK_D(frD, R);</div><div class='add'>+	if (R_c == FP_CLS_NAN) {</div><div class='add'>+		R_e = _FP_EXPMAX_D;</div><div class='add'>+		_FP_PACK_RAW_2_P(D, frD, R);</div><div class='add'>+	} else {</div><div class='add'>+		__FP_PACK_D(frD, R);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/math-emu/math.c b/arch/powerpc/math-emu/math.c<br/>index 29e545e0272e..164d55935bd8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/math.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/math-emu/math.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/math.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/math.c</a></div><div class='hunk'>@@ -8,8 +8,8 @@</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/reg.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "sfp-machine.h"</div><div class='del'>-#include "double.h"</div><div class='add'>+#include &lt;asm/sfp-machine.h&gt;</div><div class='add'>+#include &lt;math-emu/double.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define FLOATFUNC(x)	extern int x(void *, void *, void *, void *)</div><div class='ctx'> </div><div class='hunk'>@@ -168,6 +168,8 @@ record_exception(struct pt_regs *regs, int eflag)</div><div class='ctx'> 			fpscr |= FPSCR_ZX;</div><div class='ctx'> 		if (eflag &amp; EFLAG_INEXACT)</div><div class='ctx'> 			fpscr |= FPSCR_XX;</div><div class='add'>+		if (eflag &amp; EFLAG_INVALID)</div><div class='add'>+			fpscr |= FPSCR_VX;</div><div class='ctx'> 		if (eflag &amp; EFLAG_VXSNAN)</div><div class='ctx'> 			fpscr |= FPSCR_VXSNAN;</div><div class='ctx'> 		if (eflag &amp; EFLAG_VXISI)</div><div class='hunk'>@@ -188,7 +190,7 @@ record_exception(struct pt_regs *regs, int eflag)</div><div class='ctx'> 			fpscr |= FPSCR_VXCVI;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	fpscr &amp;= ~(FPSCR_VX);</div><div class='add'>+//	fpscr &amp;= ~(FPSCR_VX);</div><div class='ctx'> 	if (fpscr &amp; (FPSCR_VXSNAN | FPSCR_VXISI | FPSCR_VXIDI |</div><div class='ctx'> 		     FPSCR_VXZDZ | FPSCR_VXIMZ | FPSCR_VXVC |</div><div class='ctx'> 		     FPSCR_VXSOFT | FPSCR_VXSQRT | FPSCR_VXCVI))</div><div class='head'>diff --git a/arch/powerpc/math-emu/mcrfs.c b/arch/powerpc/math-emu/mcrfs.c<br/>index 41ba247faf89..e948d5708e2b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/mcrfs.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/math-emu/mcrfs.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/mcrfs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/mcrfs.c</a></div><div class='hunk'>@@ -2,7 +2,8 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "soft-fp.h"</div><div class='add'>+#include &lt;asm/sfp-machine.h&gt;</div><div class='add'>+#include &lt;math-emu/soft-fp.h&gt;</div><div class='ctx'> </div><div class='ctx'> int</div><div class='ctx'> mcrfs(u32 *ccr, u32 crfD, u32 crfS)</div><div class='head'>diff --git a/arch/powerpc/math-emu/mffs.c b/arch/powerpc/math-emu/mffs.c<br/>index b0e2106e6eb6..5526cf96ede5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/mffs.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/math-emu/mffs.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/mffs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/mffs.c</a></div><div class='hunk'>@@ -2,7 +2,8 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "soft-fp.h"</div><div class='add'>+#include &lt;asm/sfp-machine.h&gt;</div><div class='add'>+#include &lt;math-emu/soft-fp.h&gt;</div><div class='ctx'> </div><div class='ctx'> int</div><div class='ctx'> mffs(u32 *frD)</div><div class='head'>diff --git a/arch/powerpc/math-emu/mtfsb0.c b/arch/powerpc/math-emu/mtfsb0.c<br/>index d3062350ea21..bc985585bca8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/mtfsb0.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/math-emu/mtfsb0.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/mtfsb0.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/mtfsb0.c</a></div><div class='hunk'>@@ -2,7 +2,8 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "soft-fp.h"</div><div class='add'>+#include &lt;asm/sfp-machine.h&gt;</div><div class='add'>+#include &lt;math-emu/soft-fp.h&gt;</div><div class='ctx'> </div><div class='ctx'> int</div><div class='ctx'> mtfsb0(int crbD)</div><div class='head'>diff --git a/arch/powerpc/math-emu/mtfsb1.c b/arch/powerpc/math-emu/mtfsb1.c<br/>index 2e948704b56e..fe6ed5ac85b3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/mtfsb1.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/math-emu/mtfsb1.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/mtfsb1.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/mtfsb1.c</a></div><div class='hunk'>@@ -2,7 +2,8 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "soft-fp.h"</div><div class='add'>+#include &lt;asm/sfp-machine.h&gt;</div><div class='add'>+#include &lt;math-emu/soft-fp.h&gt;</div><div class='ctx'> </div><div class='ctx'> int</div><div class='ctx'> mtfsb1(int crbD)</div><div class='head'>diff --git a/arch/powerpc/math-emu/mtfsf.c b/arch/powerpc/math-emu/mtfsf.c<br/>index 48014d8e3af1..dbce92e4f046 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/mtfsf.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/math-emu/mtfsf.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/mtfsf.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/mtfsf.c</a></div><div class='hunk'>@@ -2,12 +2,14 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "soft-fp.h"</div><div class='add'>+#include &lt;asm/sfp-machine.h&gt;</div><div class='add'>+#include &lt;math-emu/soft-fp.h&gt;</div><div class='ctx'> </div><div class='ctx'> int</div><div class='ctx'> mtfsf(unsigned int FM, u32 *frB)</div><div class='ctx'> {</div><div class='ctx'> 	u32 mask;</div><div class='add'>+	u32 fpscr;</div><div class='ctx'> </div><div class='ctx'> 	if (FM == 0)</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -37,6 +39,22 @@ mtfsf(unsigned int FM, u32 *frB)</div><div class='ctx'> 	__FPU_FPSCR &amp;= ~(mask);</div><div class='ctx'> 	__FPU_FPSCR |= (frB[1] &amp; mask);</div><div class='ctx'> </div><div class='add'>+	__FPU_FPSCR &amp;= ~(FPSCR_VX);</div><div class='add'>+	if (__FPU_FPSCR &amp; (FPSCR_VXSNAN | FPSCR_VXISI | FPSCR_VXIDI |</div><div class='add'>+		     FPSCR_VXZDZ | FPSCR_VXIMZ | FPSCR_VXVC |</div><div class='add'>+		     FPSCR_VXSOFT | FPSCR_VXSQRT | FPSCR_VXCVI))</div><div class='add'>+		__FPU_FPSCR |= FPSCR_VX;</div><div class='add'>+</div><div class='add'>+	fpscr = __FPU_FPSCR;</div><div class='add'>+	fpscr &amp;= ~(FPSCR_FEX);</div><div class='add'>+	if (((fpscr &amp; FPSCR_VX) &amp;&amp; (fpscr &amp; FPSCR_VE)) ||</div><div class='add'>+	    ((fpscr &amp; FPSCR_OX) &amp;&amp; (fpscr &amp; FPSCR_OE)) ||</div><div class='add'>+	    ((fpscr &amp; FPSCR_UX) &amp;&amp; (fpscr &amp; FPSCR_UE)) ||</div><div class='add'>+	    ((fpscr &amp; FPSCR_ZX) &amp;&amp; (fpscr &amp; FPSCR_ZE)) ||</div><div class='add'>+	    ((fpscr &amp; FPSCR_XX) &amp;&amp; (fpscr &amp; FPSCR_XE)))</div><div class='add'>+		fpscr |= FPSCR_FEX;</div><div class='add'>+	__FPU_FPSCR = fpscr;</div><div class='add'>+</div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 	printk("%s: %02x %p: %08lx\n", __func__, FM, frB, __FPU_FPSCR);</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/powerpc/math-emu/mtfsfi.c b/arch/powerpc/math-emu/mtfsfi.c<br/>index 031e20093549..fd2acc26813b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/mtfsfi.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/math-emu/mtfsfi.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/mtfsfi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/mtfsfi.c</a></div><div class='hunk'>@@ -2,7 +2,8 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "soft-fp.h"</div><div class='add'>+#include &lt;asm/sfp-machine.h&gt;</div><div class='add'>+#include &lt;math-emu/soft-fp.h&gt;</div><div class='ctx'> </div><div class='ctx'> int</div><div class='ctx'> mtfsfi(unsigned int crfD, unsigned int IMM)</div><div class='head'>diff --git a/arch/powerpc/math-emu/op-1.h b/arch/powerpc/math-emu/op-1.h<br/>deleted file mode 100644<br/>index c92fa95f562e..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/op-1.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/math-emu/op-1.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,245 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Basic one-word fraction declaration and manipulation.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define _FP_FRAC_DECL_1(X)	_FP_W_TYPE X##_f</div><div class='del'>-#define _FP_FRAC_COPY_1(D,S)	(D##_f = S##_f)</div><div class='del'>-#define _FP_FRAC_SET_1(X,I)	(X##_f = I)</div><div class='del'>-#define _FP_FRAC_HIGH_1(X)	(X##_f)</div><div class='del'>-#define _FP_FRAC_LOW_1(X)	(X##_f)</div><div class='del'>-#define _FP_FRAC_WORD_1(X,w)	(X##_f)</div><div class='del'>-</div><div class='del'>-#define _FP_FRAC_ADDI_1(X,I)	(X##_f += I)</div><div class='del'>-#define _FP_FRAC_SLL_1(X,N)			\</div><div class='del'>-  do {						\</div><div class='del'>-    if (__builtin_constant_p(N) &amp;&amp; (N) == 1)	\</div><div class='del'>-      X##_f += X##_f;				\</div><div class='del'>-    else					\</div><div class='del'>-      X##_f &lt;&lt;= (N);				\</div><div class='del'>-  } while (0)</div><div class='del'>-#define _FP_FRAC_SRL_1(X,N)	(X##_f &gt;&gt;= N)</div><div class='del'>-</div><div class='del'>-/* Right shift with sticky-lsb.  */</div><div class='del'>-#define _FP_FRAC_SRS_1(X,N,sz)	__FP_FRAC_SRS_1(X##_f, N, sz)</div><div class='del'>-</div><div class='del'>-#define __FP_FRAC_SRS_1(X,N,sz)						\</div><div class='del'>-   (X = (X &gt;&gt; (N) | (__builtin_constant_p(N) &amp;&amp; (N) == 1		\</div><div class='del'>-		     ? X &amp; 1 : (X &lt;&lt; (_FP_W_TYPE_SIZE - (N))) != 0)))</div><div class='del'>-</div><div class='del'>-#define _FP_FRAC_ADD_1(R,X,Y)	(R##_f = X##_f + Y##_f)</div><div class='del'>-#define _FP_FRAC_SUB_1(R,X,Y)	(R##_f = X##_f - Y##_f)</div><div class='del'>-#define _FP_FRAC_CLZ_1(z, X)	__FP_CLZ(z, X##_f)</div><div class='del'>-</div><div class='del'>-/* Predicates */</div><div class='del'>-#define _FP_FRAC_NEGP_1(X)	((_FP_WS_TYPE)X##_f &lt; 0)</div><div class='del'>-#define _FP_FRAC_ZEROP_1(X)	(X##_f == 0)</div><div class='del'>-#define _FP_FRAC_OVERP_1(fs,X)	(X##_f &amp; _FP_OVERFLOW_##fs)</div><div class='del'>-#define _FP_FRAC_EQ_1(X, Y)	(X##_f == Y##_f)</div><div class='del'>-#define _FP_FRAC_GE_1(X, Y)	(X##_f &gt;= Y##_f)</div><div class='del'>-#define _FP_FRAC_GT_1(X, Y)	(X##_f &gt; Y##_f)</div><div class='del'>-</div><div class='del'>-#define _FP_ZEROFRAC_1		0</div><div class='del'>-#define _FP_MINFRAC_1		1</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Unpack the raw bits of a native fp value.  Do not classify or</div><div class='del'>- * normalize the data.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define _FP_UNPACK_RAW_1(fs, X, val)				\</div><div class='del'>-  do {								\</div><div class='del'>-    union _FP_UNION_##fs _flo; _flo.flt = (val);		\</div><div class='del'>-								\</div><div class='del'>-    X##_f = _flo.bits.frac;					\</div><div class='del'>-    X##_e = _flo.bits.exp;					\</div><div class='del'>-    X##_s = _flo.bits.sign;					\</div><div class='del'>-  } while (0)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Repack the raw bits of a native fp value.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define _FP_PACK_RAW_1(fs, val, X)				\</div><div class='del'>-  do {								\</div><div class='del'>-    union _FP_UNION_##fs _flo;					\</div><div class='del'>-								\</div><div class='del'>-    _flo.bits.frac = X##_f;					\</div><div class='del'>-    _flo.bits.exp  = X##_e;					\</div><div class='del'>-    _flo.bits.sign = X##_s;					\</div><div class='del'>-								\</div><div class='del'>-    (val) = _flo.flt;						\</div><div class='del'>-  } while (0)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Multiplication algorithms:</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* Basic.  Assuming the host word size is &gt;= 2*FRACBITS, we can do the</div><div class='del'>-   multiplication immediately.  */</div><div class='del'>-</div><div class='del'>-#define _FP_MUL_MEAT_1_imm(fs, R, X, Y)					\</div><div class='del'>-  do {									\</div><div class='del'>-    R##_f = X##_f * Y##_f;						\</div><div class='del'>-    /* Normalize since we know where the msb of the multiplicands	\</div><div class='del'>-       were (bit B), we know that the msb of the of the product is	\</div><div class='del'>-       at either 2B or 2B-1.  */					\</div><div class='del'>-    _FP_FRAC_SRS_1(R, _FP_WFRACBITS_##fs-1, 2*_FP_WFRACBITS_##fs);	\</div><div class='del'>-  } while (0)</div><div class='del'>-</div><div class='del'>-/* Given a 1W * 1W =&gt; 2W primitive, do the extended multiplication.  */</div><div class='del'>-</div><div class='del'>-#define _FP_MUL_MEAT_1_wide(fs, R, X, Y, doit)				\</div><div class='del'>-  do {									\</div><div class='del'>-    _FP_W_TYPE _Z_f0, _Z_f1;						\</div><div class='del'>-    doit(_Z_f1, _Z_f0, X##_f, Y##_f);					\</div><div class='del'>-    /* Normalize since we know where the msb of the multiplicands	\</div><div class='del'>-       were (bit B), we know that the msb of the of the product is	\</div><div class='del'>-       at either 2B or 2B-1.  */					\</div><div class='del'>-    _FP_FRAC_SRS_2(_Z, _FP_WFRACBITS_##fs-1, 2*_FP_WFRACBITS_##fs);	\</div><div class='del'>-    R##_f = _Z_f0;							\</div><div class='del'>-  } while (0)</div><div class='del'>-</div><div class='del'>-/* Finally, a simple widening multiply algorithm.  What fun!  */</div><div class='del'>-</div><div class='del'>-#define _FP_MUL_MEAT_1_hard(fs, R, X, Y)				\</div><div class='del'>-  do {									\</div><div class='del'>-    _FP_W_TYPE _xh, _xl, _yh, _yl, _z_f0, _z_f1, _a_f0, _a_f1;		\</div><div class='del'>-									\</div><div class='del'>-    /* split the words in half */					\</div><div class='del'>-    _xh = X##_f &gt;&gt; (_FP_W_TYPE_SIZE/2);					\</div><div class='del'>-    _xl = X##_f &amp; (((_FP_W_TYPE)1 &lt;&lt; (_FP_W_TYPE_SIZE/2)) - 1);		\</div><div class='del'>-    _yh = Y##_f &gt;&gt; (_FP_W_TYPE_SIZE/2);					\</div><div class='del'>-    _yl = Y##_f &amp; (((_FP_W_TYPE)1 &lt;&lt; (_FP_W_TYPE_SIZE/2)) - 1);		\</div><div class='del'>-									\</div><div class='del'>-    /* multiply the pieces */						\</div><div class='del'>-    _z_f0 = _xl * _yl;							\</div><div class='del'>-    _a_f0 = _xh * _yl;							\</div><div class='del'>-    _a_f1 = _xl * _yh;							\</div><div class='del'>-    _z_f1 = _xh * _yh;							\</div><div class='del'>-									\</div><div class='del'>-    /* reassemble into two full words */				\</div><div class='del'>-    if ((_a_f0 += _a_f1) &lt; _a_f1)					\</div><div class='del'>-      _z_f1 += (_FP_W_TYPE)1 &lt;&lt; (_FP_W_TYPE_SIZE/2);			\</div><div class='del'>-    _a_f1 = _a_f0 &gt;&gt; (_FP_W_TYPE_SIZE/2);				\</div><div class='del'>-    _a_f0 = _a_f0 &lt;&lt; (_FP_W_TYPE_SIZE/2);				\</div><div class='del'>-    _FP_FRAC_ADD_2(_z, _z, _a);						\</div><div class='del'>-									\</div><div class='del'>-    /* normalize */							\</div><div class='del'>-    _FP_FRAC_SRS_2(_z, _FP_WFRACBITS_##fs - 1, 2*_FP_WFRACBITS_##fs);	\</div><div class='del'>-    R##_f = _z_f0;							\</div><div class='del'>-  } while (0)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Division algorithms:</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* Basic.  Assuming the host word size is &gt;= 2*FRACBITS, we can do the</div><div class='del'>-   division immediately.  Give this macro either _FP_DIV_HELP_imm for</div><div class='del'>-   C primitives or _FP_DIV_HELP_ldiv for the ISO function.  Which you</div><div class='del'>-   choose will depend on what the compiler does with divrem4.  */</div><div class='del'>-</div><div class='del'>-#define _FP_DIV_MEAT_1_imm(fs, R, X, Y, doit)		\</div><div class='del'>-  do {							\</div><div class='del'>-    _FP_W_TYPE _q, _r;					\</div><div class='del'>-    X##_f &lt;&lt;= (X##_f &lt; Y##_f				\</div><div class='del'>-	       ? R##_e--, _FP_WFRACBITS_##fs		\</div><div class='del'>-	       : _FP_WFRACBITS_##fs - 1);		\</div><div class='del'>-    doit(_q, _r, X##_f, Y##_f);				\</div><div class='del'>-    R##_f = _q | (_r != 0);				\</div><div class='del'>-  } while (0)</div><div class='del'>-</div><div class='del'>-/* GCC's longlong.h defines a 2W / 1W =&gt; (1W,1W) primitive udiv_qrnnd</div><div class='del'>-   that may be useful in this situation.  This first is for a primitive</div><div class='del'>-   that requires normalization, the second for one that does not.  Look</div><div class='del'>-   for UDIV_NEEDS_NORMALIZATION to tell which your machine needs.  */</div><div class='del'>-</div><div class='del'>-#define _FP_DIV_MEAT_1_udiv_norm(fs, R, X, Y)				\</div><div class='del'>-  do {									\</div><div class='del'>-    _FP_W_TYPE _nh, _nl, _q, _r;					\</div><div class='del'>-									\</div><div class='del'>-    /* Normalize Y -- i.e. make the most significant bit set.  */	\</div><div class='del'>-    Y##_f &lt;&lt;= _FP_WFRACXBITS_##fs - 1;					\</div><div class='del'>-									\</div><div class='del'>-    /* Shift X op correspondingly high, that is, up one full word.  */	\</div><div class='del'>-    if (X##_f &lt;= Y##_f)							\</div><div class='del'>-      {									\</div><div class='del'>-	_nl = 0;							\</div><div class='del'>-	_nh = X##_f;							\</div><div class='del'>-      }									\</div><div class='del'>-    else								\</div><div class='del'>-      {									\</div><div class='del'>-	R##_e++;							\</div><div class='del'>-	_nl = X##_f &lt;&lt; (_FP_W_TYPE_SIZE-1);				\</div><div class='del'>-	_nh = X##_f &gt;&gt; 1;						\</div><div class='del'>-      }									\</div><div class='del'>-    									\</div><div class='del'>-    udiv_qrnnd(_q, _r, _nh, _nl, Y##_f);				\</div><div class='del'>-    R##_f = _q | (_r != 0);						\</div><div class='del'>-  } while (0)</div><div class='del'>-</div><div class='del'>-#define _FP_DIV_MEAT_1_udiv(fs, R, X, Y)		\</div><div class='del'>-  do {							\</div><div class='del'>-    _FP_W_TYPE _nh, _nl, _q, _r;			\</div><div class='del'>-    if (X##_f &lt; Y##_f)					\</div><div class='del'>-      {							\</div><div class='del'>-	R##_e--;					\</div><div class='del'>-	_nl = X##_f &lt;&lt; _FP_WFRACBITS_##fs;		\</div><div class='del'>-	_nh = X##_f &gt;&gt; _FP_WFRACXBITS_##fs;		\</div><div class='del'>-      }							\</div><div class='del'>-    else						\</div><div class='del'>-      {							\</div><div class='del'>-	_nl = X##_f &lt;&lt; (_FP_WFRACBITS_##fs - 1);	\</div><div class='del'>-	_nh = X##_f &gt;&gt; (_FP_WFRACXBITS_##fs + 1);	\</div><div class='del'>-      }							\</div><div class='del'>-    udiv_qrnnd(_q, _r, _nh, _nl, Y##_f);		\</div><div class='del'>-    R##_f = _q | (_r != 0);				\</div><div class='del'>-  } while (0)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Square root algorithms:</div><div class='del'>- * We have just one right now, maybe Newton approximation</div><div class='del'>- * should be added for those machines where division is fast.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define _FP_SQRT_MEAT_1(R, S, T, X, q)			\</div><div class='del'>-  do {							\</div><div class='del'>-    while (q)						\</div><div class='del'>-      {							\</div><div class='del'>-        T##_f = S##_f + q;				\</div><div class='del'>-        if (T##_f &lt;= X##_f)				\</div><div class='del'>-          {						\</div><div class='del'>-            S##_f = T##_f + q;				\</div><div class='del'>-            X##_f -= T##_f;				\</div><div class='del'>-            R##_f += q;					\</div><div class='del'>-          }						\</div><div class='del'>-        _FP_FRAC_SLL_1(X, 1);				\</div><div class='del'>-        q &gt;&gt;= 1;					\</div><div class='del'>-      }							\</div><div class='del'>-  } while (0)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Assembly/disassembly for converting to/from integral types.</div><div class='del'>- * No shifting or overflow handled here.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define _FP_FRAC_ASSEMBLE_1(r, X, rsize)	(r = X##_f)</div><div class='del'>-#define _FP_FRAC_DISASSEMBLE_1(X, r, rsize)	(X##_f = r)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Convert FP values between word sizes</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define _FP_FRAC_CONV_1_1(dfs, sfs, D, S)				\</div><div class='del'>-  do {									\</div><div class='del'>-    D##_f = S##_f;							\</div><div class='del'>-    if (_FP_WFRACBITS_##sfs &gt; _FP_WFRACBITS_##dfs)			\</div><div class='del'>-      _FP_FRAC_SRS_1(D, (_FP_WFRACBITS_##sfs-_FP_WFRACBITS_##dfs),	\</div><div class='del'>-		     _FP_WFRACBITS_##sfs);				\</div><div class='del'>-    else								\</div><div class='del'>-      D##_f &lt;&lt;= _FP_WFRACBITS_##dfs - _FP_WFRACBITS_##sfs;		\</div><div class='del'>-  } while (0)</div><div class='head'>diff --git a/arch/powerpc/math-emu/op-2.h b/arch/powerpc/math-emu/op-2.h<br/>deleted file mode 100644<br/>index 7d6f17cc2929..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/op-2.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/math-emu/op-2.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,434 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Basic two-word fraction declaration and manipulation.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define _FP_FRAC_DECL_2(X)	_FP_W_TYPE X##_f0, X##_f1</div><div class='del'>-#define _FP_FRAC_COPY_2(D,S)	(D##_f0 = S##_f0, D##_f1 = S##_f1)</div><div class='del'>-#define _FP_FRAC_SET_2(X,I)	__FP_FRAC_SET_2(X, I)</div><div class='del'>-#define _FP_FRAC_HIGH_2(X)	(X##_f1)</div><div class='del'>-#define _FP_FRAC_LOW_2(X)	(X##_f0)</div><div class='del'>-#define _FP_FRAC_WORD_2(X,w)	(X##_f##w)</div><div class='del'>-</div><div class='del'>-#define _FP_FRAC_SLL_2(X,N)						\</div><div class='del'>-  do {									\</div><div class='del'>-    if ((N) &lt; _FP_W_TYPE_SIZE)						\</div><div class='del'>-      {									\</div><div class='del'>-        if (__builtin_constant_p(N) &amp;&amp; (N) == 1) 			\</div><div class='del'>-          {								\</div><div class='del'>-            X##_f1 = X##_f1 + X##_f1 + (((_FP_WS_TYPE)(X##_f0)) &lt; 0);	\</div><div class='del'>-            X##_f0 += X##_f0;						\</div><div class='del'>-          }								\</div><div class='del'>-        else								\</div><div class='del'>-          {								\</div><div class='del'>-	    X##_f1 = X##_f1 &lt;&lt; (N) | X##_f0 &gt;&gt; (_FP_W_TYPE_SIZE - (N));	\</div><div class='del'>-	    X##_f0 &lt;&lt;= (N);						\</div><div class='del'>-	  }								\</div><div class='del'>-      }									\</div><div class='del'>-    else								\</div><div class='del'>-      {									\</div><div class='del'>-	X##_f1 = X##_f0 &lt;&lt; ((N) - _FP_W_TYPE_SIZE);			\</div><div class='del'>-	X##_f0 = 0;							\</div><div class='del'>-      }									\</div><div class='del'>-  } while (0)</div><div class='del'>-</div><div class='del'>-#define _FP_FRAC_SRL_2(X,N)						\</div><div class='del'>-  do {									\</div><div class='del'>-    if ((N) &lt; _FP_W_TYPE_SIZE)						\</div><div class='del'>-      {									\</div><div class='del'>-	X##_f0 = X##_f0 &gt;&gt; (N) | X##_f1 &lt;&lt; (_FP_W_TYPE_SIZE - (N));	\</div><div class='del'>-	X##_f1 &gt;&gt;= (N);							\</div><div class='del'>-      }									\</div><div class='del'>-    else								\</div><div class='del'>-      {									\</div><div class='del'>-	X##_f0 = X##_f1 &gt;&gt; ((N) - _FP_W_TYPE_SIZE);			\</div><div class='del'>-	X##_f1 = 0;							\</div><div class='del'>-      }									\</div><div class='del'>-  } while (0)</div><div class='del'>-</div><div class='del'>-/* Right shift with sticky-lsb.  */</div><div class='del'>-#define _FP_FRAC_SRS_2(X,N,sz)						\</div><div class='del'>-  do {									\</div><div class='del'>-    if ((N) &lt; _FP_W_TYPE_SIZE)						\</div><div class='del'>-      {									\</div><div class='del'>-	X##_f0 = (X##_f1 &lt;&lt; (_FP_W_TYPE_SIZE - (N)) | X##_f0 &gt;&gt; (N) |	\</div><div class='del'>-		  (__builtin_constant_p(N) &amp;&amp; (N) == 1			\</div><div class='del'>-		   ? X##_f0 &amp; 1						\</div><div class='del'>-		   : (X##_f0 &lt;&lt; (_FP_W_TYPE_SIZE - (N))) != 0));	\</div><div class='del'>-	X##_f1 &gt;&gt;= (N);							\</div><div class='del'>-      }									\</div><div class='del'>-    else								\</div><div class='del'>-      {									\</div><div class='del'>-	X##_f0 = (X##_f1 &gt;&gt; ((N) - _FP_W_TYPE_SIZE) |			\</div><div class='del'>-	          (((X##_f1 &lt;&lt; (2 * _FP_W_TYPE_SIZE - (N))) |		\</div><div class='del'>-		   X##_f0) != 0));					\</div><div class='del'>-	X##_f1 = 0;							\</div><div class='del'>-      }									\</div><div class='del'>-  } while (0)</div><div class='del'>-</div><div class='del'>-#define _FP_FRAC_ADDI_2(X,I) \</div><div class='del'>-  __FP_FRAC_ADDI_2(X##_f1, X##_f0, I)</div><div class='del'>-</div><div class='del'>-#define _FP_FRAC_ADD_2(R,X,Y) \</div><div class='del'>-  __FP_FRAC_ADD_2(R##_f1, R##_f0, X##_f1, X##_f0, Y##_f1, Y##_f0)</div><div class='del'>-</div><div class='del'>-#define _FP_FRAC_SUB_2(R,X,Y) \</div><div class='del'>-  __FP_FRAC_SUB_2(R##_f1, R##_f0, X##_f1, X##_f0, Y##_f1, Y##_f0)</div><div class='del'>-</div><div class='del'>-#define _FP_FRAC_CLZ_2(R,X)	\</div><div class='del'>-  do {				\</div><div class='del'>-    if (X##_f1)			\</div><div class='del'>-      __FP_CLZ(R,X##_f1);	\</div><div class='del'>-    else 			\</div><div class='del'>-    {				\</div><div class='del'>-      __FP_CLZ(R,X##_f0);	\</div><div class='del'>-      R += _FP_W_TYPE_SIZE;	\</div><div class='del'>-    }				\</div><div class='del'>-  } while(0)</div><div class='del'>-</div><div class='del'>-/* Predicates */</div><div class='del'>-#define _FP_FRAC_NEGP_2(X)	((_FP_WS_TYPE)X##_f1 &lt; 0)</div><div class='del'>-#define _FP_FRAC_ZEROP_2(X)	((X##_f1 | X##_f0) == 0)</div><div class='del'>-#define _FP_FRAC_OVERP_2(fs,X)	(X##_f1 &amp; _FP_OVERFLOW_##fs)</div><div class='del'>-#define _FP_FRAC_EQ_2(X, Y)	(X##_f1 == Y##_f1 &amp;&amp; X##_f0 == Y##_f0)</div><div class='del'>-#define _FP_FRAC_GT_2(X, Y)	\</div><div class='del'>-  ((X##_f1 &gt; Y##_f1) || (X##_f1 == Y##_f1 &amp;&amp; X##_f0 &gt; Y##_f0))</div><div class='del'>-#define _FP_FRAC_GE_2(X, Y)	\</div><div class='del'>-  ((X##_f1 &gt; Y##_f1) || (X##_f1 == Y##_f1 &amp;&amp; X##_f0 &gt;= Y##_f0))</div><div class='del'>-</div><div class='del'>-#define _FP_ZEROFRAC_2		0, 0</div><div class='del'>-#define _FP_MINFRAC_2		0, 1</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Internals</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define __FP_FRAC_SET_2(X,I1,I0)	(X##_f0 = I0, X##_f1 = I1)</div><div class='del'>-</div><div class='del'>-#define __FP_CLZ_2(R, xh, xl)	\</div><div class='del'>-  do {				\</div><div class='del'>-    if (xh)			\</div><div class='del'>-      __FP_CLZ(R,xl);		\</div><div class='del'>-    else 			\</div><div class='del'>-    {				\</div><div class='del'>-      __FP_CLZ(R,xl);		\</div><div class='del'>-      R += _FP_W_TYPE_SIZE;	\</div><div class='del'>-    }				\</div><div class='del'>-  } while(0)</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-</div><div class='del'>-#ifndef __FP_FRAC_ADDI_2</div><div class='del'>-#define __FP_FRAC_ADDI_2(xh, xl, i) \</div><div class='del'>-  (xh += ((xl += i) &lt; i))</div><div class='del'>-#endif</div><div class='del'>-#ifndef __FP_FRAC_ADD_2</div><div class='del'>-#define __FP_FRAC_ADD_2(rh, rl, xh, xl, yh, yl) \</div><div class='del'>-  (rh = xh + yh + ((rl = xl + yl) &lt; xl))</div><div class='del'>-#endif</div><div class='del'>-#ifndef __FP_FRAC_SUB_2</div><div class='del'>-#define __FP_FRAC_SUB_2(rh, rl, xh, xl, yh, yl) \</div><div class='del'>-  (rh = xh - yh - ((rl = xl - yl) &gt; xl))</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-</div><div class='del'>-#undef __FP_FRAC_ADDI_2</div><div class='del'>-#define __FP_FRAC_ADDI_2(xh, xl, i)	add_ssaaaa(xh, xl, xh, xl, 0, i)</div><div class='del'>-#undef __FP_FRAC_ADD_2</div><div class='del'>-#define __FP_FRAC_ADD_2			add_ssaaaa</div><div class='del'>-#undef __FP_FRAC_SUB_2</div><div class='del'>-#define __FP_FRAC_SUB_2			sub_ddmmss</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Unpack the raw bits of a native fp value.  Do not classify or</div><div class='del'>- * normalize the data.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define _FP_UNPACK_RAW_2(fs, X, val)			\</div><div class='del'>-  do {							\</div><div class='del'>-    union _FP_UNION_##fs _flo; _flo.flt = (val);	\</div><div class='del'>-							\</div><div class='del'>-    X##_f0 = _flo.bits.frac0;				\</div><div class='del'>-    X##_f1 = _flo.bits.frac1;				\</div><div class='del'>-    X##_e  = _flo.bits.exp;				\</div><div class='del'>-    X##_s  = _flo.bits.sign;				\</div><div class='del'>-  } while (0)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Repack the raw bits of a native fp value.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define _FP_PACK_RAW_2(fs, val, X)			\</div><div class='del'>-  do {							\</div><div class='del'>-    union _FP_UNION_##fs _flo;				\</div><div class='del'>-							\</div><div class='del'>-    _flo.bits.frac0 = X##_f0;				\</div><div class='del'>-    _flo.bits.frac1 = X##_f1;				\</div><div class='del'>-    _flo.bits.exp   = X##_e;				\</div><div class='del'>-    _flo.bits.sign  = X##_s;				\</div><div class='del'>-							\</div><div class='del'>-    (val) = _flo.flt;					\</div><div class='del'>-  } while (0)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Multiplication algorithms:</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* Given a 1W * 1W =&gt; 2W primitive, do the extended multiplication.  */</div><div class='del'>-</div><div class='del'>-#define _FP_MUL_MEAT_2_wide(fs, R, X, Y, doit)				\</div><div class='del'>-  do {									\</div><div class='del'>-    _FP_FRAC_DECL_4(_z); _FP_FRAC_DECL_2(_b); _FP_FRAC_DECL_2(_c);	\</div><div class='del'>-									\</div><div class='del'>-    doit(_FP_FRAC_WORD_4(_z,1), _FP_FRAC_WORD_4(_z,0), X##_f0, Y##_f0); \</div><div class='del'>-    doit(_b_f1, _b_f0, X##_f0, Y##_f1);					\</div><div class='del'>-    doit(_c_f1, _c_f0, X##_f1, Y##_f0);					\</div><div class='del'>-    doit(_FP_FRAC_WORD_4(_z,3), _FP_FRAC_WORD_4(_z,2), X##_f1, Y##_f1); \</div><div class='del'>-									\</div><div class='del'>-    __FP_FRAC_ADD_4(_FP_FRAC_WORD_4(_z,3),_FP_FRAC_WORD_4(_z,2),	\</div><div class='del'>-		    _FP_FRAC_WORD_4(_z,1),_FP_FRAC_WORD_4(_z,0),	\</div><div class='del'>-		    0, _b_f1, _b_f0, 0,					\</div><div class='del'>-		    _FP_FRAC_WORD_4(_z,3),_FP_FRAC_WORD_4(_z,2),	\</div><div class='del'>-		    _FP_FRAC_WORD_4(_z,1),_FP_FRAC_WORD_4(_z,0));	\</div><div class='del'>-    __FP_FRAC_ADD_4(_FP_FRAC_WORD_4(_z,3),_FP_FRAC_WORD_4(_z,2),	\</div><div class='del'>-		    _FP_FRAC_WORD_4(_z,1),_FP_FRAC_WORD_4(_z,0),	\</div><div class='del'>-		    0, _c_f1, _c_f0, 0,					\</div><div class='del'>-		    _FP_FRAC_WORD_4(_z,3),_FP_FRAC_WORD_4(_z,2),	\</div><div class='del'>-		    _FP_FRAC_WORD_4(_z,1),_FP_FRAC_WORD_4(_z,0));	\</div><div class='del'>-									\</div><div class='del'>-    /* Normalize since we know where the msb of the multiplicands	\</div><div class='del'>-       were (bit B), we know that the msb of the of the product is	\</div><div class='del'>-       at either 2B or 2B-1.  */					\</div><div class='del'>-    _FP_FRAC_SRS_4(_z, _FP_WFRACBITS_##fs-1, 2*_FP_WFRACBITS_##fs);	\</div><div class='del'>-    R##_f0 = _FP_FRAC_WORD_4(_z,0);					\</div><div class='del'>-    R##_f1 = _FP_FRAC_WORD_4(_z,1);					\</div><div class='del'>-  } while (0)</div><div class='del'>-</div><div class='del'>-/* This next macro appears to be totally broken. Fortunately nowhere</div><div class='del'>- * seems to use it :-&gt; The problem is that we define _z[4] but</div><div class='del'>- * then use it in _FP_FRAC_SRS_4, which will attempt to access</div><div class='del'>- * _z_f[n] which will cause an error. The fix probably involves</div><div class='del'>- * declaring it with _FP_FRAC_DECL_4, see previous macro. -- PMM 02/1998</div><div class='del'>- */</div><div class='del'>-#define _FP_MUL_MEAT_2_gmp(fs, R, X, Y)					\</div><div class='del'>-  do {									\</div><div class='del'>-    _FP_W_TYPE _x[2], _y[2], _z[4];					\</div><div class='del'>-    _x[0] = X##_f0; _x[1] = X##_f1;					\</div><div class='del'>-    _y[0] = Y##_f0; _y[1] = Y##_f1;					\</div><div class='del'>-									\</div><div class='del'>-    mpn_mul_n(_z, _x, _y, 2);						\</div><div class='del'>-									\</div><div class='del'>-    /* Normalize since we know where the msb of the multiplicands	\</div><div class='del'>-       were (bit B), we know that the msb of the of the product is	\</div><div class='del'>-       at either 2B or 2B-1.  */					\</div><div class='del'>-    _FP_FRAC_SRS_4(_z, _FP_WFRACBITS##_fs-1, 2*_FP_WFRACBITS_##fs);	\</div><div class='del'>-    R##_f0 = _z[0];							\</div><div class='del'>-    R##_f1 = _z[1];							\</div><div class='del'>-  } while (0)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Division algorithms:</div><div class='del'>- * This seems to be giving me difficulties -- PMM</div><div class='del'>- * Look, NetBSD seems to be able to comment algorithms. Can't you?</div><div class='del'>- * I've thrown printks at the problem.</div><div class='del'>- * This now appears to work, but I still don't really know why.</div><div class='del'>- * Also, I don't think the result is properly normalised...</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define _FP_DIV_MEAT_2_udiv_64(fs, R, X, Y)				\</div><div class='del'>-  do {									\</div><div class='del'>-    extern void _fp_udivmodti4(_FP_W_TYPE q[2], _FP_W_TYPE r[2],	\</div><div class='del'>-			       _FP_W_TYPE n1, _FP_W_TYPE n0,		\</div><div class='del'>-			       _FP_W_TYPE d1, _FP_W_TYPE d0);		\</div><div class='del'>-    _FP_W_TYPE _n_f3, _n_f2, _n_f1, _n_f0, _r_f1, _r_f0;		\</div><div class='del'>-    _FP_W_TYPE _q_f1, _q_f0, _m_f1, _m_f0;				\</div><div class='del'>-    _FP_W_TYPE _rmem[2], _qmem[2];					\</div><div class='del'>-    /* I think this check is to ensure that the result is normalised.   \</div><div class='del'>-     * Assuming X,Y normalised (ie in [1.0,2.0)) X/Y will be in         \</div><div class='del'>-     * [0.5,2.0). Furthermore, it will be less than 1.0 iff X &lt; Y.      \</div><div class='del'>-     * In this case we tweak things. (this is based on comments in      \</div><div class='del'>-     * the NetBSD FPU emulation code. )                                 \</div><div class='del'>-     * We know X,Y are normalised because we ensure this as part of     \</div><div class='del'>-     * the unpacking process. -- PMM                                    \</div><div class='del'>-     */									\</div><div class='del'>-    if (_FP_FRAC_GT_2(X, Y))						\</div><div class='del'>-      {									\</div><div class='del'>-/*	R##_e++; */							\</div><div class='del'>-	_n_f3 = X##_f1 &gt;&gt; 1;						\</div><div class='del'>-	_n_f2 = X##_f1 &lt;&lt; (_FP_W_TYPE_SIZE - 1) | X##_f0 &gt;&gt; 1;		\</div><div class='del'>-	_n_f1 = X##_f0 &lt;&lt; (_FP_W_TYPE_SIZE - 1);			\</div><div class='del'>-	_n_f0 = 0;							\</div><div class='del'>-      }									\</div><div class='del'>-    else								\</div><div class='del'>-      {									\</div><div class='del'>-	R##_e--;							\</div><div class='del'>-	_n_f3 = X##_f1;							\</div><div class='del'>-	_n_f2 = X##_f0;							\</div><div class='del'>-	_n_f1 = _n_f0 = 0;						\</div><div class='del'>-      }									\</div><div class='del'>-									\</div><div class='del'>-    /* Normalize, i.e. make the most significant bit of the 		\</div><div class='del'>-       denominator set.  CHANGED: - 1 to nothing -- PMM */		\</div><div class='del'>-    _FP_FRAC_SLL_2(Y, _FP_WFRACXBITS_##fs /* -1 */);			\</div><div class='del'>-									\</div><div class='del'>-    /* Do the 256/128 bit division given the 128-bit _fp_udivmodtf4 	\</div><div class='del'>-       primitive snagged from libgcc2.c.  */				\</div><div class='del'>-									\</div><div class='del'>-    _fp_udivmodti4(_qmem, _rmem, _n_f3, _n_f2, 0, Y##_f1);		\</div><div class='del'>-    _q_f1 = _qmem[0];							\</div><div class='del'>-    umul_ppmm(_m_f1, _m_f0, _q_f1, Y##_f0);				\</div><div class='del'>-    _r_f1 = _rmem[0];							\</div><div class='del'>-    _r_f0 = _n_f1;							\</div><div class='del'>-    if (_FP_FRAC_GT_2(_m, _r))						\</div><div class='del'>-      {									\</div><div class='del'>-	_q_f1--;							\</div><div class='del'>-	_FP_FRAC_ADD_2(_r, _r, Y);					\</div><div class='del'>-	if (_FP_FRAC_GE_2(_r, Y) &amp;&amp; _FP_FRAC_GT_2(_m, _r))		\</div><div class='del'>-	  {								\</div><div class='del'>-	    _q_f1--;							\</div><div class='del'>-	    _FP_FRAC_ADD_2(_r, _r, Y);					\</div><div class='del'>-	  }								\</div><div class='del'>-      }									\</div><div class='del'>-    _FP_FRAC_SUB_2(_r, _r, _m);						\</div><div class='del'>-									\</div><div class='del'>-    _fp_udivmodti4(_qmem, _rmem, _r_f1, _r_f0, 0, Y##_f1);		\</div><div class='del'>-    _q_f0 = _qmem[0];							\</div><div class='del'>-    umul_ppmm(_m_f1, _m_f0, _q_f0, Y##_f0);				\</div><div class='del'>-    _r_f1 = _rmem[0];							\</div><div class='del'>-    _r_f0 = _n_f0;							\</div><div class='del'>-    if (_FP_FRAC_GT_2(_m, _r))						\</div><div class='del'>-      {									\</div><div class='del'>-	_q_f0--;							\</div><div class='del'>-	_FP_FRAC_ADD_2(_r, _r, Y);					\</div><div class='del'>-	if (_FP_FRAC_GE_2(_r, Y) &amp;&amp; _FP_FRAC_GT_2(_m, _r))		\</div><div class='del'>-	  {								\</div><div class='del'>-	    _q_f0--;							\</div><div class='del'>-	    _FP_FRAC_ADD_2(_r, _r, Y);					\</div><div class='del'>-	  }								\</div><div class='del'>-      }									\</div><div class='del'>-    _FP_FRAC_SUB_2(_r, _r, _m);						\</div><div class='del'>-									\</div><div class='del'>-    R##_f1 = _q_f1;							\</div><div class='del'>-    R##_f0 = _q_f0 | ((_r_f1 | _r_f0) != 0);				\</div><div class='del'>-    /* adjust so answer is normalized again. I'm not sure what the 	\</div><div class='del'>-     * final sz param should be. In practice it's never used since      \</div><div class='del'>-     * N is 1 which is always going to be &lt; _FP_W_TYPE_SIZE...		\</div><div class='del'>-     */									\</div><div class='del'>-    /* _FP_FRAC_SRS_2(R,1,_FP_WFRACBITS_##fs);	*/			\</div><div class='del'>-  } while (0)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define _FP_DIV_MEAT_2_gmp(fs, R, X, Y)					\</div><div class='del'>-  do {									\</div><div class='del'>-    _FP_W_TYPE _x[4], _y[2], _z[4];					\</div><div class='del'>-    _y[0] = Y##_f0; _y[1] = Y##_f1;					\</div><div class='del'>-    _x[0] = _x[3] = 0;							\</div><div class='del'>-    if (_FP_FRAC_GT_2(X, Y))						\</div><div class='del'>-      {									\</div><div class='del'>-	R##_e++;							\</div><div class='del'>-	_x[1] = (X##_f0 &lt;&lt; (_FP_WFRACBITS-1 - _FP_W_TYPE_SIZE) |	\</div><div class='del'>-		 X##_f1 &gt;&gt; (_FP_W_TYPE_SIZE -				\</div><div class='del'>-			    (_FP_WFRACBITS-1 - _FP_W_TYPE_SIZE)));	\</div><div class='del'>-	_x[2] = X##_f1 &lt;&lt; (_FP_WFRACBITS-1 - _FP_W_TYPE_SIZE);		\</div><div class='del'>-      }									\</div><div class='del'>-    else								\</div><div class='del'>-      {									\</div><div class='del'>-	_x[1] = (X##_f0 &lt;&lt; (_FP_WFRACBITS - _FP_W_TYPE_SIZE) |		\</div><div class='del'>-		 X##_f1 &gt;&gt; (_FP_W_TYPE_SIZE -				\</div><div class='del'>-			    (_FP_WFRACBITS - _FP_W_TYPE_SIZE)));	\</div><div class='del'>-	_x[2] = X##_f1 &lt;&lt; (_FP_WFRACBITS - _FP_W_TYPE_SIZE);		\</div><div class='del'>-      }									\</div><div class='del'>-									\</div><div class='del'>-    (void) mpn_divrem (_z, 0, _x, 4, _y, 2);				\</div><div class='del'>-    R##_f1 = _z[1];							\</div><div class='del'>-    R##_f0 = _z[0] | ((_x[0] | _x[1]) != 0);				\</div><div class='del'>-  } while (0)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Square root algorithms:</div><div class='del'>- * We have just one right now, maybe Newton approximation</div><div class='del'>- * should be added for those machines where division is fast.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define _FP_SQRT_MEAT_2(R, S, T, X, q)			\</div><div class='del'>-  do {							\</div><div class='del'>-    while (q)						\</div><div class='del'>-      {							\</div><div class='del'>-        T##_f1 = S##_f1 + q;				\</div><div class='del'>-        if (T##_f1 &lt;= X##_f1)				\</div><div class='del'>-          {						\</div><div class='del'>-            S##_f1 = T##_f1 + q;			\</div><div class='del'>-            X##_f1 -= T##_f1;				\</div><div class='del'>-            R##_f1 += q;				\</div><div class='del'>-          }						\</div><div class='del'>-        _FP_FRAC_SLL_2(X, 1);				\</div><div class='del'>-        q &gt;&gt;= 1;					\</div><div class='del'>-      }							\</div><div class='del'>-    q = (_FP_W_TYPE)1 &lt;&lt; (_FP_W_TYPE_SIZE - 1);		\</div><div class='del'>-    while (q)						\</div><div class='del'>-      {							\</div><div class='del'>-        T##_f0 = S##_f0 + q;				\</div><div class='del'>-        T##_f1 = S##_f1;				\</div><div class='del'>-        if (T##_f1 &lt; X##_f1 || 				\</div><div class='del'>-            (T##_f1 == X##_f1 &amp;&amp; T##_f0 &lt; X##_f0))	\</div><div class='del'>-          {						\</div><div class='del'>-            S##_f0 = T##_f0 + q;			\</div><div class='del'>-            if (((_FP_WS_TYPE)T##_f0) &lt; 0 &amp;&amp;		\</div><div class='del'>-                ((_FP_WS_TYPE)S##_f0) &gt;= 0)		\</div><div class='del'>-              S##_f1++;					\</div><div class='del'>-            _FP_FRAC_SUB_2(X, X, T);			\</div><div class='del'>-            R##_f0 += q;				\</div><div class='del'>-          }						\</div><div class='del'>-        _FP_FRAC_SLL_2(X, 1);				\</div><div class='del'>-        q &gt;&gt;= 1;					\</div><div class='del'>-      }							\</div><div class='del'>-  } while (0)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Assembly/disassembly for converting to/from integral types.</div><div class='del'>- * No shifting or overflow handled here.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define _FP_FRAC_ASSEMBLE_2(r, X, rsize)	\</div><div class='del'>-  do {						\</div><div class='del'>-    if (rsize &lt;= _FP_W_TYPE_SIZE)		\</div><div class='del'>-      r = X##_f0;				\</div><div class='del'>-    else					\</div><div class='del'>-      {						\</div><div class='del'>-	r = X##_f1;				\</div><div class='del'>-	r &lt;&lt;= _FP_W_TYPE_SIZE;			\</div><div class='del'>-	r += X##_f0;				\</div><div class='del'>-      }						\</div><div class='del'>-  } while (0)</div><div class='del'>-</div><div class='del'>-#define _FP_FRAC_DISASSEMBLE_2(X, r, rsize)				\</div><div class='del'>-  do {									\</div><div class='del'>-    X##_f0 = r;								\</div><div class='del'>-    X##_f1 = (rsize &lt;= _FP_W_TYPE_SIZE ? 0 : r &gt;&gt; _FP_W_TYPE_SIZE);	\</div><div class='del'>-  } while (0)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Convert FP values between word sizes</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define _FP_FRAC_CONV_1_2(dfs, sfs, D, S)				\</div><div class='del'>-  do {									\</div><div class='del'>-    _FP_FRAC_SRS_2(S, (_FP_WFRACBITS_##sfs - _FP_WFRACBITS_##dfs),	\</div><div class='del'>-		   _FP_WFRACBITS_##sfs);				\</div><div class='del'>-    D##_f = S##_f0;							\</div><div class='del'>-  } while (0)</div><div class='del'>-</div><div class='del'>-#define _FP_FRAC_CONV_2_1(dfs, sfs, D, S)				\</div><div class='del'>-  do {									\</div><div class='del'>-    D##_f0 = S##_f;							\</div><div class='del'>-    D##_f1 = 0;								\</div><div class='del'>-    _FP_FRAC_SLL_2(D, (_FP_WFRACBITS_##dfs - _FP_WFRACBITS_##sfs));	\</div><div class='del'>-  } while (0)</div><div class='del'>-</div><div class='head'>diff --git a/arch/powerpc/math-emu/op-4.h b/arch/powerpc/math-emu/op-4.h<br/>deleted file mode 100644<br/>index c9ae626070da..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/op-4.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/math-emu/op-4.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,317 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Basic four-word fraction declaration and manipulation.</div><div class='del'>- *</div><div class='del'>- * When adding quadword support for 32 bit machines, we need</div><div class='del'>- * to be a little careful as double multiply uses some of these</div><div class='del'>- * macros: (in op-2.h)</div><div class='del'>- * _FP_MUL_MEAT_2_wide() uses _FP_FRAC_DECL_4, _FP_FRAC_WORD_4,</div><div class='del'>- * _FP_FRAC_ADD_4, _FP_FRAC_SRS_4</div><div class='del'>- * _FP_MUL_MEAT_2_gmp() uses _FP_FRAC_SRS_4 (and should use</div><div class='del'>- * _FP_FRAC_DECL_4: it appears to be broken and is not used</div><div class='del'>- * anywhere anyway. )</div><div class='del'>- *</div><div class='del'>- * I've now fixed all the macros that were here from the sparc64 code.</div><div class='del'>- * [*none* of the shift macros were correct!] -- PMM 02/1998</div><div class='del'>- *</div><div class='del'>- * The only quadword stuff that remains to be coded is:</div><div class='del'>- * 1) the conversion to/from ints, which requires</div><div class='del'>- * that we check (in op-common.h) that the following do the right thing</div><div class='del'>- * for quadwords: _FP_TO_INT(Q,4,r,X,rsz,rsg), _FP_FROM_INT(Q,4,X,r,rs,rt)</div><div class='del'>- * 2) multiply, divide and sqrt, which require:</div><div class='del'>- * _FP_MUL_MEAT_4_*(R,X,Y), _FP_DIV_MEAT_4_*(R,X,Y), _FP_SQRT_MEAT_4(R,S,T,X,q),</div><div class='del'>- * This also needs _FP_MUL_MEAT_Q and _FP_DIV_MEAT_Q to be defined to</div><div class='del'>- * some suitable _FP_MUL_MEAT_4_* macros in sfp-machine.h.</div><div class='del'>- * [we're free to choose whatever FP_MUL_MEAT_4_* macros we need for</div><div class='del'>- * these; they are used nowhere else. ]</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define _FP_FRAC_DECL_4(X)	_FP_W_TYPE X##_f[4]</div><div class='del'>-#define _FP_FRAC_COPY_4(D,S)			\</div><div class='del'>-  (D##_f[0] = S##_f[0], D##_f[1] = S##_f[1],	\</div><div class='del'>-   D##_f[2] = S##_f[2], D##_f[3] = S##_f[3])</div><div class='del'>-/* The _FP_FRAC_SET_n(X,I) macro is intended for use with another</div><div class='del'>- * macro such as _FP_ZEROFRAC_n which returns n comma separated values.</div><div class='del'>- * The result is that we get an expansion of __FP_FRAC_SET_n(X,I0,I1,I2,I3)</div><div class='del'>- * which just assigns the In values to the array X##_f[].</div><div class='del'>- * This is why the number of parameters doesn't appear to match</div><div class='del'>- * at first glance...      -- PMM</div><div class='del'>- */</div><div class='del'>-#define _FP_FRAC_SET_4(X,I)	__FP_FRAC_SET_4(X, I)</div><div class='del'>-#define _FP_FRAC_HIGH_4(X)	(X##_f[3])</div><div class='del'>-#define _FP_FRAC_LOW_4(X)	(X##_f[0])</div><div class='del'>-#define _FP_FRAC_WORD_4(X,w)	(X##_f[w])</div><div class='del'>-</div><div class='del'>-#define _FP_FRAC_SLL_4(X,N)						\</div><div class='del'>-  do {									\</div><div class='del'>-    _FP_I_TYPE _up, _down, _skip, _i;					\</div><div class='del'>-    _skip = (N) / _FP_W_TYPE_SIZE;					\</div><div class='del'>-    _up = (N) % _FP_W_TYPE_SIZE;					\</div><div class='del'>-    _down = _FP_W_TYPE_SIZE - _up;					\</div><div class='del'>-    for (_i = 3; _i &gt; _skip; --_i)					\</div><div class='del'>-      X##_f[_i] = X##_f[_i-_skip] &lt;&lt; _up | X##_f[_i-_skip-1] &gt;&gt; _down;	\</div><div class='del'>-/* bugfixed: was X##_f[_i] &lt;&lt;= _up;  -- PMM 02/1998 */                  \</div><div class='del'>-    X##_f[_i] = X##_f[0] &lt;&lt; _up; 	                                \</div><div class='del'>-    for (--_i; _i &gt;= 0; --_i)						\</div><div class='del'>-      X##_f[_i] = 0;							\</div><div class='del'>-  } while (0)</div><div class='del'>-</div><div class='del'>-/* This one was broken too */</div><div class='del'>-#define _FP_FRAC_SRL_4(X,N)						\</div><div class='del'>-  do {									\</div><div class='del'>-    _FP_I_TYPE _up, _down, _skip, _i;					\</div><div class='del'>-    _skip = (N) / _FP_W_TYPE_SIZE;					\</div><div class='del'>-    _down = (N) % _FP_W_TYPE_SIZE;					\</div><div class='del'>-    _up = _FP_W_TYPE_SIZE - _down;					\</div><div class='del'>-    for (_i = 0; _i &lt; 3-_skip; ++_i)					\</div><div class='del'>-      X##_f[_i] = X##_f[_i+_skip] &gt;&gt; _down | X##_f[_i+_skip+1] &lt;&lt; _up;	\</div><div class='del'>-    X##_f[_i] = X##_f[3] &gt;&gt; _down;			         	\</div><div class='del'>-    for (++_i; _i &lt; 4; ++_i)						\</div><div class='del'>-      X##_f[_i] = 0;							\</div><div class='del'>-  } while (0)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Right shift with sticky-lsb.</div><div class='del'>- * What this actually means is that we do a standard right-shift,</div><div class='del'>- * but that if any of the bits that fall off the right hand side</div><div class='del'>- * were one then we always set the LSbit.</div><div class='del'>- */</div><div class='del'>-#define _FP_FRAC_SRS_4(X,N,size)					\</div><div class='del'>-  do {									\</div><div class='del'>-    _FP_I_TYPE _up, _down, _skip, _i;					\</div><div class='del'>-    _FP_W_TYPE _s;							\</div><div class='del'>-    _skip = (N) / _FP_W_TYPE_SIZE;					\</div><div class='del'>-    _down = (N) % _FP_W_TYPE_SIZE;					\</div><div class='del'>-    _up = _FP_W_TYPE_SIZE - _down;					\</div><div class='del'>-    for (_s = _i = 0; _i &lt; _skip; ++_i)					\</div><div class='del'>-      _s |= X##_f[_i];							\</div><div class='del'>-    _s |= X##_f[_i] &lt;&lt; _up;						\</div><div class='del'>-/* s is now != 0 if we want to set the LSbit */                         \</div><div class='del'>-    for (_i = 0; _i &lt; 3-_skip; ++_i)					\</div><div class='del'>-      X##_f[_i] = X##_f[_i+_skip] &gt;&gt; _down | X##_f[_i+_skip+1] &lt;&lt; _up;	\</div><div class='del'>-    X##_f[_i] = X##_f[3] &gt;&gt; _down;					\</div><div class='del'>-    for (++_i; _i &lt; 4; ++_i)						\</div><div class='del'>-      X##_f[_i] = 0;							\</div><div class='del'>-    /* don't fix the LSB until the very end when we're sure f[0] is stable */ \</div><div class='del'>-    X##_f[0] |= (_s != 0);                                              \</div><div class='del'>-  } while (0)</div><div class='del'>-</div><div class='del'>-#define _FP_FRAC_ADD_4(R,X,Y)						\</div><div class='del'>-  __FP_FRAC_ADD_4(R##_f[3], R##_f[2], R##_f[1], R##_f[0],		\</div><div class='del'>-		  X##_f[3], X##_f[2], X##_f[1], X##_f[0],		\</div><div class='del'>-		  Y##_f[3], Y##_f[2], Y##_f[1], Y##_f[0])</div><div class='del'>-</div><div class='del'>-#define _FP_FRAC_SUB_4(R,X,Y)                                           \</div><div class='del'>-  __FP_FRAC_SUB_4(R##_f[3], R##_f[2], R##_f[1], R##_f[0],		\</div><div class='del'>-		  X##_f[3], X##_f[2], X##_f[1], X##_f[0],		\</div><div class='del'>-		  Y##_f[3], Y##_f[2], Y##_f[1], Y##_f[0])</div><div class='del'>-</div><div class='del'>-#define _FP_FRAC_ADDI_4(X,I)                                            \</div><div class='del'>-  __FP_FRAC_ADDI_4(X##_f[3], X##_f[2], X##_f[1], X##_f[0], I)</div><div class='del'>-</div><div class='del'>-#define _FP_ZEROFRAC_4  0,0,0,0</div><div class='del'>-#define _FP_MINFRAC_4   0,0,0,1</div><div class='del'>-</div><div class='del'>-#define _FP_FRAC_ZEROP_4(X)     ((X##_f[0] | X##_f[1] | X##_f[2] | X##_f[3]) == 0)</div><div class='del'>-#define _FP_FRAC_NEGP_4(X)      ((_FP_WS_TYPE)X##_f[3] &lt; 0)</div><div class='del'>-#define _FP_FRAC_OVERP_4(fs,X)  (X##_f[0] &amp; _FP_OVERFLOW_##fs)</div><div class='del'>-</div><div class='del'>-#define _FP_FRAC_EQ_4(X,Y)                              \</div><div class='del'>- (X##_f[0] == Y##_f[0] &amp;&amp; X##_f[1] == Y##_f[1]          \</div><div class='del'>-  &amp;&amp; X##_f[2] == Y##_f[2] &amp;&amp; X##_f[3] == Y##_f[3])</div><div class='del'>-</div><div class='del'>-#define _FP_FRAC_GT_4(X,Y)                              \</div><div class='del'>- (X##_f[3] &gt; Y##_f[3] ||                                \</div><div class='del'>-  (X##_f[3] == Y##_f[3] &amp;&amp; (X##_f[2] &gt; Y##_f[2] ||      \</div><div class='del'>-   (X##_f[2] == Y##_f[2] &amp;&amp; (X##_f[1] &gt; Y##_f[1] ||     \</div><div class='del'>-    (X##_f[1] == Y##_f[1] &amp;&amp; X##_f[0] &gt; Y##_f[0])       \</div><div class='del'>-   ))                                                   \</div><div class='del'>-  ))                                                    \</div><div class='del'>- )</div><div class='del'>-</div><div class='del'>-#define _FP_FRAC_GE_4(X,Y)                              \</div><div class='del'>- (X##_f[3] &gt; Y##_f[3] ||                                \</div><div class='del'>-  (X##_f[3] == Y##_f[3] &amp;&amp; (X##_f[2] &gt; Y##_f[2] ||      \</div><div class='del'>-   (X##_f[2] == Y##_f[2] &amp;&amp; (X##_f[1] &gt; Y##_f[1] ||     \</div><div class='del'>-    (X##_f[1] == Y##_f[1] &amp;&amp; X##_f[0] &gt;= Y##_f[0])      \</div><div class='del'>-   ))                                                   \</div><div class='del'>-  ))                                                    \</div><div class='del'>- )</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define _FP_FRAC_CLZ_4(R,X)             \</div><div class='del'>-  do {                                  \</div><div class='del'>-    if (X##_f[3])                       \</div><div class='del'>-    {                                   \</div><div class='del'>-        __FP_CLZ(R,X##_f[3]);           \</div><div class='del'>-    }                                   \</div><div class='del'>-    else if (X##_f[2])                  \</div><div class='del'>-    {                                   \</div><div class='del'>-        __FP_CLZ(R,X##_f[2]);           \</div><div class='del'>-        R += _FP_W_TYPE_SIZE;           \</div><div class='del'>-    }                                   \</div><div class='del'>-    else if (X##_f[1])                  \</div><div class='del'>-    {                                   \</div><div class='del'>-        __FP_CLZ(R,X##_f[2]);           \</div><div class='del'>-        R += _FP_W_TYPE_SIZE*2;         \</div><div class='del'>-    }                                   \</div><div class='del'>-    else                                \</div><div class='del'>-    {                                   \</div><div class='del'>-        __FP_CLZ(R,X##_f[0]);           \</div><div class='del'>-        R += _FP_W_TYPE_SIZE*3;         \</div><div class='del'>-    }                                   \</div><div class='del'>-  } while(0)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define _FP_UNPACK_RAW_4(fs, X, val)                            \</div><div class='del'>-  do {                                                          \</div><div class='del'>-    union _FP_UNION_##fs _flo; _flo.flt = (val);        	\</div><div class='del'>-    X##_f[0] = _flo.bits.frac0;                                 \</div><div class='del'>-    X##_f[1] = _flo.bits.frac1;                                 \</div><div class='del'>-    X##_f[2] = _flo.bits.frac2;                                 \</div><div class='del'>-    X##_f[3] = _flo.bits.frac3;                                 \</div><div class='del'>-    X##_e  = _flo.bits.exp;                                     \</div><div class='del'>-    X##_s  = _flo.bits.sign;                                    \</div><div class='del'>-  } while (0)</div><div class='del'>-</div><div class='del'>-#define _FP_PACK_RAW_4(fs, val, X)                              \</div><div class='del'>-  do {                                                          \</div><div class='del'>-    union _FP_UNION_##fs _flo;					\</div><div class='del'>-    _flo.bits.frac0 = X##_f[0];                                 \</div><div class='del'>-    _flo.bits.frac1 = X##_f[1];                                 \</div><div class='del'>-    _flo.bits.frac2 = X##_f[2];                                 \</div><div class='del'>-    _flo.bits.frac3 = X##_f[3];                                 \</div><div class='del'>-    _flo.bits.exp   = X##_e;                                    \</div><div class='del'>-    _flo.bits.sign  = X##_s;                                    \</div><div class='del'>-    (val) = _flo.flt;                                   	\</div><div class='del'>-  } while (0)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Internals</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define __FP_FRAC_SET_4(X,I3,I2,I1,I0)					\</div><div class='del'>-  (X##_f[3] = I3, X##_f[2] = I2, X##_f[1] = I1, X##_f[0] = I0)</div><div class='del'>-</div><div class='del'>-#ifndef __FP_FRAC_ADD_4</div><div class='del'>-#define __FP_FRAC_ADD_4(r3,r2,r1,r0,x3,x2,x1,x0,y3,y2,y1,y0)	\</div><div class='del'>-  do {								\</div><div class='del'>-    int _c1, _c2, _c3;						\</div><div class='del'>-    r0 = x0 + y0;						\</div><div class='del'>-    _c1 = r0 &lt; x0;						\</div><div class='del'>-    r1 = x1 + y1;						\</div><div class='del'>-    _c2 = r1 &lt; x1;						\</div><div class='del'>-    r1 += _c1;							\</div><div class='del'>-    _c2 |= r1 &lt; _c1;						\</div><div class='del'>-    r2 = x2 + y2;						\</div><div class='del'>-    _c3 = r2 &lt; x2;						\</div><div class='del'>-    r2 += _c2;							\</div><div class='del'>-    _c3 |= r2 &lt; _c2;						\</div><div class='del'>-    r3 = x3 + y3 + _c3;						\</div><div class='del'>-  } while (0)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifndef __FP_FRAC_SUB_4</div><div class='del'>-#define __FP_FRAC_SUB_4(r3,r2,r1,r0,x3,x2,x1,x0,y3,y2,y1,y0)	\</div><div class='del'>-  do {								\</div><div class='del'>-    int _c1, _c2, _c3;						\</div><div class='del'>-    r0 = x0 - y0;						\</div><div class='del'>-    _c1 = r0 &gt; x0;						\</div><div class='del'>-    r1 = x1 - y1;						\</div><div class='del'>-    _c2 = r1 &gt; x1;						\</div><div class='del'>-    r1 -= _c1;							\</div><div class='del'>-    _c2 |= r1 &gt; _c1;						\</div><div class='del'>-    r2 = x2 - y2;						\</div><div class='del'>-    _c3 = r2 &gt; x2;						\</div><div class='del'>-    r2 -= _c2;							\</div><div class='del'>-    _c3 |= r2 &gt; _c2;						\</div><div class='del'>-    r3 = x3 - y3 - _c3;						\</div><div class='del'>-  } while (0)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifndef __FP_FRAC_ADDI_4</div><div class='del'>-/* I always wanted to be a lisp programmer :-&gt; */</div><div class='del'>-#define __FP_FRAC_ADDI_4(x3,x2,x1,x0,i)                                 \</div><div class='del'>-  (x3 += ((x2 += ((x1 += ((x0 += i) &lt; x0)) &lt; x1) &lt; x2)))</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* Convert FP values between word sizes. This appears to be more</div><div class='del'>- * complicated than I'd have expected it to be, so these might be</div><div class='del'>- * wrong... These macros are in any case somewhat bogus because they</div><div class='del'>- * use information about what various FRAC_n variables look like</div><div class='del'>- * internally [eg, that 2 word vars are X_f0 and x_f1]. But so do</div><div class='del'>- * the ones in op-2.h and op-1.h.</div><div class='del'>- */</div><div class='del'>-#define _FP_FRAC_CONV_1_4(dfs, sfs, D, S)                               \</div><div class='del'>-   do {                                                                 \</div><div class='del'>-     _FP_FRAC_SRS_4(S, (_FP_WFRACBITS_##sfs - _FP_WFRACBITS_##dfs),     \</div><div class='del'>-                        _FP_WFRACBITS_##sfs);                           \</div><div class='del'>-     D##_f = S##_f[0];                                                   \</div><div class='del'>-  } while (0)</div><div class='del'>-</div><div class='del'>-#define _FP_FRAC_CONV_2_4(dfs, sfs, D, S)                               \</div><div class='del'>-   do {                                                                 \</div><div class='del'>-     _FP_FRAC_SRS_4(S, (_FP_WFRACBITS_##sfs - _FP_WFRACBITS_##dfs),     \</div><div class='del'>-                        _FP_WFRACBITS_##sfs);                           \</div><div class='del'>-     D##_f0 = S##_f[0];                                                  \</div><div class='del'>-     D##_f1 = S##_f[1];                                                  \</div><div class='del'>-  } while (0)</div><div class='del'>-</div><div class='del'>-/* Assembly/disassembly for converting to/from integral types.</div><div class='del'>- * No shifting or overflow handled here.</div><div class='del'>- */</div><div class='del'>-/* Put the FP value X into r, which is an integer of size rsize. */</div><div class='del'>-#define _FP_FRAC_ASSEMBLE_4(r, X, rsize)                                \</div><div class='del'>-  do {                                                                  \</div><div class='del'>-    if (rsize &lt;= _FP_W_TYPE_SIZE)                                       \</div><div class='del'>-      r = X##_f[0];                                                     \</div><div class='del'>-    else if (rsize &lt;= 2*_FP_W_TYPE_SIZE)                                \</div><div class='del'>-    {                                                                   \</div><div class='del'>-      r = X##_f[1];                                                     \</div><div class='del'>-      r &lt;&lt;= _FP_W_TYPE_SIZE;                                            \</div><div class='del'>-      r += X##_f[0];                                                    \</div><div class='del'>-    }                                                                   \</div><div class='del'>-    else                                                                \</div><div class='del'>-    {                                                                   \</div><div class='del'>-      /* I'm feeling lazy so we deal with int == 3words (implausible)*/ \</div><div class='del'>-      /* and int == 4words as a single case.                         */ \</div><div class='del'>-      r = X##_f[3];                                                     \</div><div class='del'>-      r &lt;&lt;= _FP_W_TYPE_SIZE;                                            \</div><div class='del'>-      r += X##_f[2];                                                    \</div><div class='del'>-      r &lt;&lt;= _FP_W_TYPE_SIZE;                                            \</div><div class='del'>-      r += X##_f[1];                                                    \</div><div class='del'>-      r &lt;&lt;= _FP_W_TYPE_SIZE;                                            \</div><div class='del'>-      r += X##_f[0];                                                    \</div><div class='del'>-    }                                                                   \</div><div class='del'>-  } while (0)</div><div class='del'>-</div><div class='del'>-/* "No disassemble Number Five!" */</div><div class='del'>-/* move an integer of size rsize into X's fractional part. We rely on</div><div class='del'>- * the _f[] array consisting of words of size _FP_W_TYPE_SIZE to avoid</div><div class='del'>- * having to mask the values we store into it.</div><div class='del'>- */</div><div class='del'>-#define _FP_FRAC_DISASSEMBLE_4(X, r, rsize)                             \</div><div class='del'>-  do {                                                                  \</div><div class='del'>-    X##_f[0] = r;                                                       \</div><div class='del'>-    X##_f[1] = (rsize &lt;= _FP_W_TYPE_SIZE ? 0 : r &gt;&gt; _FP_W_TYPE_SIZE);   \</div><div class='del'>-    X##_f[2] = (rsize &lt;= 2*_FP_W_TYPE_SIZE ? 0 : r &gt;&gt; 2*_FP_W_TYPE_SIZE); \</div><div class='del'>-    X##_f[3] = (rsize &lt;= 3*_FP_W_TYPE_SIZE ? 0 : r &gt;&gt; 3*_FP_W_TYPE_SIZE); \</div><div class='del'>-  } while (0)</div><div class='del'>-</div><div class='del'>-#define _FP_FRAC_CONV_4_1(dfs, sfs, D, S)                               \</div><div class='del'>-   do {                                                                 \</div><div class='del'>-     D##_f[0] = S##_f;                                                  \</div><div class='del'>-     D##_f[1] = D##_f[2] = D##_f[3] = 0;                                \</div><div class='del'>-     _FP_FRAC_SLL_4(D, (_FP_WFRACBITS_##dfs - _FP_WFRACBITS_##sfs));    \</div><div class='del'>-   } while (0)</div><div class='del'>-</div><div class='del'>-#define _FP_FRAC_CONV_4_2(dfs, sfs, D, S)                               \</div><div class='del'>-   do {                                                                 \</div><div class='del'>-     D##_f[0] = S##_f0;                                                 \</div><div class='del'>-     D##_f[1] = S##_f1;                                                 \</div><div class='del'>-     D##_f[2] = D##_f[3] = 0;                                           \</div><div class='del'>-     _FP_FRAC_SLL_4(D, (_FP_WFRACBITS_##dfs - _FP_WFRACBITS_##sfs));    \</div><div class='del'>-   } while (0)</div><div class='del'>-</div><div class='del'>-/* FIXME! This has to be written */</div><div class='del'>-#define _FP_SQRT_MEAT_4(R, S, T, X, q)</div><div class='head'>diff --git a/arch/powerpc/math-emu/op-common.h b/arch/powerpc/math-emu/op-common.h<br/>deleted file mode 100644<br/>index afb82b6498ce..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/op-common.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/math-emu/op-common.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,688 +0,0 @@</div><div class='del'>-#define _FP_DECL(wc, X)			\</div><div class='del'>-  _FP_I_TYPE X##_c, X##_s, X##_e;	\</div><div class='del'>-  _FP_FRAC_DECL_##wc(X)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Finish truely unpacking a native fp value by classifying the kind</div><div class='del'>- * of fp value and normalizing both the exponent and the fraction.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define _FP_UNPACK_CANONICAL(fs, wc, X)					\</div><div class='del'>-do {									\</div><div class='del'>-  switch (X##_e)							\</div><div class='del'>-  {									\</div><div class='del'>-  default:								\</div><div class='del'>-    _FP_FRAC_HIGH_##wc(X) |= _FP_IMPLBIT_##fs;				\</div><div class='del'>-    _FP_FRAC_SLL_##wc(X, _FP_WORKBITS);					\</div><div class='del'>-    X##_e -= _FP_EXPBIAS_##fs;						\</div><div class='del'>-    X##_c = FP_CLS_NORMAL;						\</div><div class='del'>-    break;								\</div><div class='del'>-									\</div><div class='del'>-  case 0:								\</div><div class='del'>-    if (_FP_FRAC_ZEROP_##wc(X))						\</div><div class='del'>-      X##_c = FP_CLS_ZERO;						\</div><div class='del'>-    else								\</div><div class='del'>-      {									\</div><div class='del'>-	/* a denormalized number */					\</div><div class='del'>-	_FP_I_TYPE _shift;						\</div><div class='del'>-	_FP_FRAC_CLZ_##wc(_shift, X);					\</div><div class='del'>-	_shift -= _FP_FRACXBITS_##fs;					\</div><div class='del'>-	_FP_FRAC_SLL_##wc(X, (_shift+_FP_WORKBITS));			\</div><div class='del'>-	X##_e -= _FP_EXPBIAS_##fs - 1 + _shift;				\</div><div class='del'>-	X##_c = FP_CLS_NORMAL;						\</div><div class='del'>-      }									\</div><div class='del'>-    break;								\</div><div class='del'>-									\</div><div class='del'>-  case _FP_EXPMAX_##fs:							\</div><div class='del'>-    if (_FP_FRAC_ZEROP_##wc(X))						\</div><div class='del'>-      X##_c = FP_CLS_INF;						\</div><div class='del'>-    else								\</div><div class='del'>-      /* we don't differentiate between signaling and quiet nans */	\</div><div class='del'>-      X##_c = FP_CLS_NAN;						\</div><div class='del'>-    break;								\</div><div class='del'>-  }									\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Before packing the bits back into the native fp result, take care</div><div class='del'>- * of such mundane things as rounding and overflow.  Also, for some</div><div class='del'>- * kinds of fp values, the original parts may not have been fully</div><div class='del'>- * extracted -- but that is ok, we can regenerate them now.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define _FP_PACK_CANONICAL(fs, wc, X)				\</div><div class='del'>-({int __ret = 0;						\</div><div class='del'>-  switch (X##_c)						\</div><div class='del'>-  {								\</div><div class='del'>-  case FP_CLS_NORMAL:						\</div><div class='del'>-    X##_e += _FP_EXPBIAS_##fs;					\</div><div class='del'>-    if (X##_e &gt; 0)						\</div><div class='del'>-      {								\</div><div class='del'>-	__ret |= _FP_ROUND(wc, X);				\</div><div class='del'>-	if (_FP_FRAC_OVERP_##wc(fs, X))				\</div><div class='del'>-	  {							\</div><div class='del'>-	    _FP_FRAC_SRL_##wc(X, (_FP_WORKBITS+1));		\</div><div class='del'>-	    X##_e++;						\</div><div class='del'>-	  }							\</div><div class='del'>-	else							\</div><div class='del'>-	  _FP_FRAC_SRL_##wc(X, _FP_WORKBITS);			\</div><div class='del'>-	if (X##_e &gt;= _FP_EXPMAX_##fs)				\</div><div class='del'>-	  {							\</div><div class='del'>-	    /* overflow to infinity */				\</div><div class='del'>-	    X##_e = _FP_EXPMAX_##fs;				\</div><div class='del'>-	    _FP_FRAC_SET_##wc(X, _FP_ZEROFRAC_##wc);		\</div><div class='del'>-            __ret |= EFLAG_OVERFLOW;				\</div><div class='del'>-	  }							\</div><div class='del'>-      }								\</div><div class='del'>-    else							\</div><div class='del'>-      {								\</div><div class='del'>-	/* we've got a denormalized number */			\</div><div class='del'>-	X##_e = -X##_e + 1;					\</div><div class='del'>-	if (X##_e &lt;= _FP_WFRACBITS_##fs)			\</div><div class='del'>-	  {							\</div><div class='del'>-	    _FP_FRAC_SRS_##wc(X, X##_e, _FP_WFRACBITS_##fs);	\</div><div class='del'>-	    _FP_FRAC_SLL_##wc(X, 1);				\</div><div class='del'>-	    if (_FP_FRAC_OVERP_##wc(fs, X))			\</div><div class='del'>-	      {							\</div><div class='del'>-	        X##_e = 1;					\</div><div class='del'>-	        _FP_FRAC_SET_##wc(X, _FP_ZEROFRAC_##wc);	\</div><div class='del'>-	      }							\</div><div class='del'>-	    else						\</div><div class='del'>-	      {							\</div><div class='del'>-		X##_e = 0;					\</div><div class='del'>-		_FP_FRAC_SRL_##wc(X, _FP_WORKBITS+1);		\</div><div class='del'>-                __ret |= EFLAG_UNDERFLOW;			\</div><div class='del'>-	      }							\</div><div class='del'>-	  }							\</div><div class='del'>-	else							\</div><div class='del'>-	  {							\</div><div class='del'>-	    /* underflow to zero */				\</div><div class='del'>-	    X##_e = 0;						\</div><div class='del'>-	    _FP_FRAC_SET_##wc(X, _FP_ZEROFRAC_##wc);		\</div><div class='del'>-            __ret |= EFLAG_UNDERFLOW;				\</div><div class='del'>-	  }							\</div><div class='del'>-      }								\</div><div class='del'>-    break;							\</div><div class='del'>-								\</div><div class='del'>-  case FP_CLS_ZERO:						\</div><div class='del'>-    X##_e = 0;							\</div><div class='del'>-    _FP_FRAC_SET_##wc(X, _FP_ZEROFRAC_##wc);			\</div><div class='del'>-    break;							\</div><div class='del'>-								\</div><div class='del'>-  case FP_CLS_INF:						\</div><div class='del'>-    X##_e = _FP_EXPMAX_##fs;					\</div><div class='del'>-    _FP_FRAC_SET_##wc(X, _FP_ZEROFRAC_##wc);			\</div><div class='del'>-    break;							\</div><div class='del'>-								\</div><div class='del'>-  case FP_CLS_NAN:						\</div><div class='del'>-    X##_e = _FP_EXPMAX_##fs;					\</div><div class='del'>-    if (!_FP_KEEPNANFRACP)					\</div><div class='del'>-      {								\</div><div class='del'>-	_FP_FRAC_SET_##wc(X, _FP_NANFRAC_##fs);			\</div><div class='del'>-	X##_s = 0;						\</div><div class='del'>-      }								\</div><div class='del'>-    else							\</div><div class='del'>-      _FP_FRAC_HIGH_##wc(X) |= _FP_QNANBIT_##fs;		\</div><div class='del'>-    break;							\</div><div class='del'>-  }								\</div><div class='del'>-  __ret;							\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Main addition routine.  The input values should be cooked.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define _FP_ADD(fs, wc, R, X, Y)					     \</div><div class='del'>-do {									     \</div><div class='del'>-  switch (_FP_CLS_COMBINE(X##_c, Y##_c))				     \</div><div class='del'>-  {									     \</div><div class='del'>-  case _FP_CLS_COMBINE(FP_CLS_NORMAL,FP_CLS_NORMAL):			     \</div><div class='del'>-    {									     \</div><div class='del'>-      /* shift the smaller number so that its exponent matches the larger */ \</div><div class='del'>-      _FP_I_TYPE diff = X##_e - Y##_e;					     \</div><div class='del'>-									     \</div><div class='del'>-      if (diff &lt; 0)							     \</div><div class='del'>-	{								     \</div><div class='del'>-	  diff = -diff;							     \</div><div class='del'>-	  if (diff &lt;= _FP_WFRACBITS_##fs)				     \</div><div class='del'>-	    _FP_FRAC_SRS_##wc(X, diff, _FP_WFRACBITS_##fs);		     \</div><div class='del'>-	  else if (!_FP_FRAC_ZEROP_##wc(X))				     \</div><div class='del'>-	    _FP_FRAC_SET_##wc(X, _FP_MINFRAC_##wc);			     \</div><div class='del'>-	  else								     \</div><div class='del'>-	    _FP_FRAC_SET_##wc(X, _FP_ZEROFRAC_##wc);			     \</div><div class='del'>-	  R##_e = Y##_e;						     \</div><div class='del'>-	}								     \</div><div class='del'>-      else								     \</div><div class='del'>-	{								     \</div><div class='del'>-	  if (diff &gt; 0)							     \</div><div class='del'>-	    {								     \</div><div class='del'>-	      if (diff &lt;= _FP_WFRACBITS_##fs)				     \</div><div class='del'>-	        _FP_FRAC_SRS_##wc(Y, diff, _FP_WFRACBITS_##fs);		     \</div><div class='del'>-	      else if (!_FP_FRAC_ZEROP_##wc(Y))				     \</div><div class='del'>-	        _FP_FRAC_SET_##wc(Y, _FP_MINFRAC_##wc);			     \</div><div class='del'>-	      else							     \</div><div class='del'>-	        _FP_FRAC_SET_##wc(Y, _FP_ZEROFRAC_##wc);		     \</div><div class='del'>-	    }								     \</div><div class='del'>-	  R##_e = X##_e;						     \</div><div class='del'>-	}								     \</div><div class='del'>-									     \</div><div class='del'>-      R##_c = FP_CLS_NORMAL;						     \</div><div class='del'>-									     \</div><div class='del'>-      if (X##_s == Y##_s)						     \</div><div class='del'>-	{								     \</div><div class='del'>-	  R##_s = X##_s;						     \</div><div class='del'>-	  _FP_FRAC_ADD_##wc(R, X, Y);					     \</div><div class='del'>-	  if (_FP_FRAC_OVERP_##wc(fs, R))				     \</div><div class='del'>-	    {								     \</div><div class='del'>-	      _FP_FRAC_SRS_##wc(R, 1, _FP_WFRACBITS_##fs);		     \</div><div class='del'>-	      R##_e++;							     \</div><div class='del'>-	    }								     \</div><div class='del'>-	}								     \</div><div class='del'>-      else								     \</div><div class='del'>-	{								     \</div><div class='del'>-	  R##_s = X##_s;						     \</div><div class='del'>-	  _FP_FRAC_SUB_##wc(R, X, Y);					     \</div><div class='del'>-	  if (_FP_FRAC_ZEROP_##wc(R))					     \</div><div class='del'>-	    {								     \</div><div class='del'>-	      /* return an exact zero */				     \</div><div class='del'>-	      if (FP_ROUNDMODE == FP_RND_MINF)				     \</div><div class='del'>-		R##_s |= Y##_s;						     \</div><div class='del'>-	      else							     \</div><div class='del'>-		R##_s &amp;= Y##_s;						     \</div><div class='del'>-	      R##_c = FP_CLS_ZERO;					     \</div><div class='del'>-	    }								     \</div><div class='del'>-	  else								     \</div><div class='del'>-	    {								     \</div><div class='del'>-	      if (_FP_FRAC_NEGP_##wc(R))				     \</div><div class='del'>-		{							     \</div><div class='del'>-		  _FP_FRAC_SUB_##wc(R, Y, X);				     \</div><div class='del'>-		  R##_s = Y##_s;					     \</div><div class='del'>-		}							     \</div><div class='del'>-									     \</div><div class='del'>-	      /* renormalize after subtraction */			     \</div><div class='del'>-	      _FP_FRAC_CLZ_##wc(diff, R);				     \</div><div class='del'>-	      diff -= _FP_WFRACXBITS_##fs;				     \</div><div class='del'>-	      if (diff)							     \</div><div class='del'>-		{							     \</div><div class='del'>-		  R##_e -= diff;					     \</div><div class='del'>-		  _FP_FRAC_SLL_##wc(R, diff);				     \</div><div class='del'>-		}							     \</div><div class='del'>-	    }								     \</div><div class='del'>-	}								     \</div><div class='del'>-      break;								     \</div><div class='del'>-    }									     \</div><div class='del'>-									     \</div><div class='del'>-  case _FP_CLS_COMBINE(FP_CLS_NAN,FP_CLS_NAN):				     \</div><div class='del'>-    _FP_CHOOSENAN(fs, wc, R, X, Y);					     \</div><div class='del'>-    break;								     \</div><div class='del'>-									     \</div><div class='del'>-  case _FP_CLS_COMBINE(FP_CLS_NORMAL,FP_CLS_ZERO):			     \</div><div class='del'>-    R##_e = X##_e;							     \</div><div class='del'>-  case _FP_CLS_COMBINE(FP_CLS_NAN,FP_CLS_NORMAL):			     \</div><div class='del'>-  case _FP_CLS_COMBINE(FP_CLS_NAN,FP_CLS_INF):				     \</div><div class='del'>-  case _FP_CLS_COMBINE(FP_CLS_NAN,FP_CLS_ZERO):				     \</div><div class='del'>-    _FP_FRAC_COPY_##wc(R, X);						     \</div><div class='del'>-    R##_s = X##_s;							     \</div><div class='del'>-    R##_c = X##_c;							     \</div><div class='del'>-    break;								     \</div><div class='del'>-									     \</div><div class='del'>-  case _FP_CLS_COMBINE(FP_CLS_ZERO,FP_CLS_NORMAL):			     \</div><div class='del'>-    R##_e = Y##_e;							     \</div><div class='del'>-  case _FP_CLS_COMBINE(FP_CLS_NORMAL,FP_CLS_NAN):			     \</div><div class='del'>-  case _FP_CLS_COMBINE(FP_CLS_INF,FP_CLS_NAN):				     \</div><div class='del'>-  case _FP_CLS_COMBINE(FP_CLS_ZERO,FP_CLS_NAN):				     \</div><div class='del'>-    _FP_FRAC_COPY_##wc(R, Y);						     \</div><div class='del'>-    R##_s = Y##_s;							     \</div><div class='del'>-    R##_c = Y##_c;							     \</div><div class='del'>-    break;								     \</div><div class='del'>-									     \</div><div class='del'>-  case _FP_CLS_COMBINE(FP_CLS_INF,FP_CLS_INF):				     \</div><div class='del'>-    if (X##_s != Y##_s)							     \</div><div class='del'>-      {									     \</div><div class='del'>-	/* +INF + -INF =&gt; NAN */					     \</div><div class='del'>-	_FP_FRAC_SET_##wc(R, _FP_NANFRAC_##fs);				     \</div><div class='del'>-	R##_s = X##_s ^ Y##_s;						     \</div><div class='del'>-	R##_c = FP_CLS_NAN;						     \</div><div class='del'>-	break;								     \</div><div class='del'>-      }									     \</div><div class='del'>-    /* FALLTHRU */							     \</div><div class='del'>-									     \</div><div class='del'>-  case _FP_CLS_COMBINE(FP_CLS_INF,FP_CLS_NORMAL):			     \</div><div class='del'>-  case _FP_CLS_COMBINE(FP_CLS_INF,FP_CLS_ZERO):				     \</div><div class='del'>-    R##_s = X##_s;							     \</div><div class='del'>-    R##_c = FP_CLS_INF;							     \</div><div class='del'>-    break;								     \</div><div class='del'>-									     \</div><div class='del'>-  case _FP_CLS_COMBINE(FP_CLS_NORMAL,FP_CLS_INF):			     \</div><div class='del'>-  case _FP_CLS_COMBINE(FP_CLS_ZERO,FP_CLS_INF):				     \</div><div class='del'>-    R##_s = Y##_s;							     \</div><div class='del'>-    R##_c = FP_CLS_INF;							     \</div><div class='del'>-    break;								     \</div><div class='del'>-									     \</div><div class='del'>-  case _FP_CLS_COMBINE(FP_CLS_ZERO,FP_CLS_ZERO):			     \</div><div class='del'>-    /* make sure the sign is correct */					     \</div><div class='del'>-    if (FP_ROUNDMODE == FP_RND_MINF)					     \</div><div class='del'>-      R##_s = X##_s | Y##_s;						     \</div><div class='del'>-    else								     \</div><div class='del'>-      R##_s = X##_s &amp; Y##_s;						     \</div><div class='del'>-    R##_c = FP_CLS_ZERO;						     \</div><div class='del'>-    break;								     \</div><div class='del'>-									     \</div><div class='del'>-  default:								     \</div><div class='del'>-    abort();								     \</div><div class='del'>-  }									     \</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Main negation routine.  FIXME -- when we care about setting exception</div><div class='del'>- * bits reliably, this will not do.  We should examine all of the fp classes.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define _FP_NEG(fs, wc, R, X)		\</div><div class='del'>-  do {					\</div><div class='del'>-    _FP_FRAC_COPY_##wc(R, X);		\</div><div class='del'>-    R##_c = X##_c;			\</div><div class='del'>-    R##_e = X##_e;			\</div><div class='del'>-    R##_s = 1 ^ X##_s;			\</div><div class='del'>-  } while (0)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Main multiplication routine.  The input values should be cooked.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define _FP_MUL(fs, wc, R, X, Y)			\</div><div class='del'>-do {							\</div><div class='del'>-  R##_s = X##_s ^ Y##_s;				\</div><div class='del'>-  switch (_FP_CLS_COMBINE(X##_c, Y##_c))		\</div><div class='del'>-  {							\</div><div class='del'>-  case _FP_CLS_COMBINE(FP_CLS_NORMAL,FP_CLS_NORMAL):	\</div><div class='del'>-    R##_c = FP_CLS_NORMAL;				\</div><div class='del'>-    R##_e = X##_e + Y##_e + 1;				\</div><div class='del'>-							\</div><div class='del'>-    _FP_MUL_MEAT_##fs(R,X,Y);				\</div><div class='del'>-							\</div><div class='del'>-    if (_FP_FRAC_OVERP_##wc(fs, R))			\</div><div class='del'>-      _FP_FRAC_SRS_##wc(R, 1, _FP_WFRACBITS_##fs);	\</div><div class='del'>-    else						\</div><div class='del'>-      R##_e--;						\</div><div class='del'>-    break;						\</div><div class='del'>-							\</div><div class='del'>-  case _FP_CLS_COMBINE(FP_CLS_NAN,FP_CLS_NAN):		\</div><div class='del'>-    _FP_CHOOSENAN(fs, wc, R, X, Y);			\</div><div class='del'>-    break;						\</div><div class='del'>-							\</div><div class='del'>-  case _FP_CLS_COMBINE(FP_CLS_NAN,FP_CLS_NORMAL):	\</div><div class='del'>-  case _FP_CLS_COMBINE(FP_CLS_NAN,FP_CLS_INF):		\</div><div class='del'>-  case _FP_CLS_COMBINE(FP_CLS_NAN,FP_CLS_ZERO):		\</div><div class='del'>-    R##_s = X##_s;					\</div><div class='del'>-							\</div><div class='del'>-  case _FP_CLS_COMBINE(FP_CLS_INF,FP_CLS_INF):		\</div><div class='del'>-  case _FP_CLS_COMBINE(FP_CLS_INF,FP_CLS_NORMAL):	\</div><div class='del'>-  case _FP_CLS_COMBINE(FP_CLS_ZERO,FP_CLS_NORMAL):	\</div><div class='del'>-  case _FP_CLS_COMBINE(FP_CLS_ZERO,FP_CLS_ZERO):	\</div><div class='del'>-    _FP_FRAC_COPY_##wc(R, X);				\</div><div class='del'>-    R##_c = X##_c;					\</div><div class='del'>-    break;						\</div><div class='del'>-							\</div><div class='del'>-  case _FP_CLS_COMBINE(FP_CLS_NORMAL,FP_CLS_NAN):	\</div><div class='del'>-  case _FP_CLS_COMBINE(FP_CLS_INF,FP_CLS_NAN):		\</div><div class='del'>-  case _FP_CLS_COMBINE(FP_CLS_ZERO,FP_CLS_NAN):		\</div><div class='del'>-    R##_s = Y##_s;					\</div><div class='del'>-							\</div><div class='del'>-  case _FP_CLS_COMBINE(FP_CLS_NORMAL,FP_CLS_INF):	\</div><div class='del'>-  case _FP_CLS_COMBINE(FP_CLS_NORMAL,FP_CLS_ZERO):	\</div><div class='del'>-    _FP_FRAC_COPY_##wc(R, Y);				\</div><div class='del'>-    R##_c = Y##_c;					\</div><div class='del'>-    break;						\</div><div class='del'>-							\</div><div class='del'>-  case _FP_CLS_COMBINE(FP_CLS_INF,FP_CLS_ZERO):		\</div><div class='del'>-  case _FP_CLS_COMBINE(FP_CLS_ZERO,FP_CLS_INF):		\</div><div class='del'>-    R##_c = FP_CLS_NAN;					\</div><div class='del'>-    _FP_FRAC_SET_##wc(R, _FP_NANFRAC_##fs);		\</div><div class='del'>-    break;						\</div><div class='del'>-							\</div><div class='del'>-  default:						\</div><div class='del'>-    abort();						\</div><div class='del'>-  }							\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Main division routine.  The input values should be cooked.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define _FP_DIV(fs, wc, R, X, Y)			\</div><div class='del'>-do {							\</div><div class='del'>-  R##_s = X##_s ^ Y##_s;				\</div><div class='del'>-  switch (_FP_CLS_COMBINE(X##_c, Y##_c))		\</div><div class='del'>-  {							\</div><div class='del'>-  case _FP_CLS_COMBINE(FP_CLS_NORMAL,FP_CLS_NORMAL):	\</div><div class='del'>-    R##_c = FP_CLS_NORMAL;				\</div><div class='del'>-    R##_e = X##_e - Y##_e;				\</div><div class='del'>-							\</div><div class='del'>-    _FP_DIV_MEAT_##fs(R,X,Y);				\</div><div class='del'>-    break;						\</div><div class='del'>-							\</div><div class='del'>-  case _FP_CLS_COMBINE(FP_CLS_NAN,FP_CLS_NAN):		\</div><div class='del'>-    _FP_CHOOSENAN(fs, wc, R, X, Y);			\</div><div class='del'>-    break;						\</div><div class='del'>-							\</div><div class='del'>-  case _FP_CLS_COMBINE(FP_CLS_NAN,FP_CLS_NORMAL):	\</div><div class='del'>-  case _FP_CLS_COMBINE(FP_CLS_NAN,FP_CLS_INF):		\</div><div class='del'>-  case _FP_CLS_COMBINE(FP_CLS_NAN,FP_CLS_ZERO):		\</div><div class='del'>-    R##_s = X##_s;					\</div><div class='del'>-    _FP_FRAC_COPY_##wc(R, X);				\</div><div class='del'>-    R##_c = X##_c;					\</div><div class='del'>-    break;						\</div><div class='del'>-							\</div><div class='del'>-  case _FP_CLS_COMBINE(FP_CLS_NORMAL,FP_CLS_NAN):	\</div><div class='del'>-  case _FP_CLS_COMBINE(FP_CLS_INF,FP_CLS_NAN):		\</div><div class='del'>-  case _FP_CLS_COMBINE(FP_CLS_ZERO,FP_CLS_NAN):		\</div><div class='del'>-    R##_s = Y##_s;					\</div><div class='del'>-    _FP_FRAC_COPY_##wc(R, Y);				\</div><div class='del'>-    R##_c = Y##_c;					\</div><div class='del'>-    break;						\</div><div class='del'>-							\</div><div class='del'>-  case _FP_CLS_COMBINE(FP_CLS_NORMAL,FP_CLS_INF):	\</div><div class='del'>-  case _FP_CLS_COMBINE(FP_CLS_ZERO,FP_CLS_INF):		\</div><div class='del'>-  case _FP_CLS_COMBINE(FP_CLS_ZERO,FP_CLS_NORMAL):	\</div><div class='del'>-    R##_c = FP_CLS_ZERO;				\</div><div class='del'>-    break;						\</div><div class='del'>-							\</div><div class='del'>-  case _FP_CLS_COMBINE(FP_CLS_NORMAL,FP_CLS_ZERO):	\</div><div class='del'>-  case _FP_CLS_COMBINE(FP_CLS_INF,FP_CLS_ZERO):		\</div><div class='del'>-  case _FP_CLS_COMBINE(FP_CLS_INF,FP_CLS_NORMAL):	\</div><div class='del'>-    R##_c = FP_CLS_INF;					\</div><div class='del'>-    break;						\</div><div class='del'>-							\</div><div class='del'>-  case _FP_CLS_COMBINE(FP_CLS_INF,FP_CLS_INF):		\</div><div class='del'>-  case _FP_CLS_COMBINE(FP_CLS_ZERO,FP_CLS_ZERO):	\</div><div class='del'>-    R##_c = FP_CLS_NAN;					\</div><div class='del'>-    _FP_FRAC_SET_##wc(R, _FP_NANFRAC_##fs);		\</div><div class='del'>-    break;						\</div><div class='del'>-							\</div><div class='del'>-  default:						\</div><div class='del'>-    abort();						\</div><div class='del'>-  }							\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Main differential comparison routine.  The inputs should be raw not</div><div class='del'>- * cooked.  The return is -1,0,1 for normal values, 2 otherwise.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define _FP_CMP(fs, wc, ret, X, Y, un)					\</div><div class='del'>-  do {									\</div><div class='del'>-    /* NANs are unordered */						\</div><div class='del'>-    if ((X##_e == _FP_EXPMAX_##fs &amp;&amp; !_FP_FRAC_ZEROP_##wc(X))		\</div><div class='del'>-	|| (Y##_e == _FP_EXPMAX_##fs &amp;&amp; !_FP_FRAC_ZEROP_##wc(Y)))	\</div><div class='del'>-      {									\</div><div class='del'>-	ret = un;							\</div><div class='del'>-      }									\</div><div class='del'>-    else								\</div><div class='del'>-      {									\</div><div class='del'>-        int __x_zero = (!X##_e &amp;&amp; _FP_FRAC_ZEROP_##wc(X)) ? 1 : 0;	\</div><div class='del'>-        int __y_zero = (!Y##_e &amp;&amp; _FP_FRAC_ZEROP_##wc(Y)) ? 1 : 0;	\</div><div class='del'>-									\</div><div class='del'>-	if (__x_zero &amp;&amp; __y_zero)					\</div><div class='del'>-	  ret = 0;							\</div><div class='del'>-	else if (__x_zero)						\</div><div class='del'>-	  ret = Y##_s ? 1 : -1;						\</div><div class='del'>-	else if (__y_zero)						\</div><div class='del'>-	  ret = X##_s ? -1 : 1;						\</div><div class='del'>-	else if (X##_s != Y##_s)					\</div><div class='del'>-	  ret = X##_s ? -1 : 1;						\</div><div class='del'>-	else if (X##_e &gt; Y##_e)						\</div><div class='del'>-	  ret = X##_s ? -1 : 1;						\</div><div class='del'>-	else if (X##_e &lt; Y##_e)						\</div><div class='del'>-	  ret = X##_s ? 1 : -1;						\</div><div class='del'>-	else if (_FP_FRAC_GT_##wc(X, Y))				\</div><div class='del'>-	  ret = X##_s ? -1 : 1;						\</div><div class='del'>-	else if (_FP_FRAC_GT_##wc(Y, X))				\</div><div class='del'>-	  ret = X##_s ? 1 : -1;						\</div><div class='del'>-	else								\</div><div class='del'>-	  ret = 0;							\</div><div class='del'>-      }									\</div><div class='del'>-  } while (0)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Simplification for strict equality.  */</div><div class='del'>-</div><div class='del'>-#define _FP_CMP_EQ(fs, wc, ret, X, Y)					  \</div><div class='del'>-  do {									  \</div><div class='del'>-    /* NANs are unordered */						  \</div><div class='del'>-    if ((X##_e == _FP_EXPMAX_##fs &amp;&amp; !_FP_FRAC_ZEROP_##wc(X))		  \</div><div class='del'>-	|| (Y##_e == _FP_EXPMAX_##fs &amp;&amp; !_FP_FRAC_ZEROP_##wc(Y)))	  \</div><div class='del'>-      {									  \</div><div class='del'>-	ret = 1;							  \</div><div class='del'>-      }									  \</div><div class='del'>-    else								  \</div><div class='del'>-      {									  \</div><div class='del'>-	ret = !(X##_e == Y##_e						  \</div><div class='del'>-		&amp;&amp; _FP_FRAC_EQ_##wc(X, Y)				  \</div><div class='del'>-		&amp;&amp; (X##_s == Y##_s || !X##_e &amp;&amp; _FP_FRAC_ZEROP_##wc(X))); \</div><div class='del'>-      }									  \</div><div class='del'>-  } while (0)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Main square root routine.  The input value should be cooked.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define _FP_SQRT(fs, wc, R, X)						\</div><div class='del'>-do {									\</div><div class='del'>-    _FP_FRAC_DECL_##wc(T); _FP_FRAC_DECL_##wc(S);			\</div><div class='del'>-    _FP_W_TYPE q;							\</div><div class='del'>-    switch (X##_c)							\</div><div class='del'>-    {									\</div><div class='del'>-    case FP_CLS_NAN:							\</div><div class='del'>-    	R##_s = 0;							\</div><div class='del'>-    	R##_c = FP_CLS_NAN;						\</div><div class='del'>-    	_FP_FRAC_SET_##wc(X, _FP_ZEROFRAC_##wc);			\</div><div class='del'>-    	break;								\</div><div class='del'>-    case FP_CLS_INF:							\</div><div class='del'>-    	if (X##_s)							\</div><div class='del'>-    	  {								\</div><div class='del'>-    	    R##_s = 0;							\</div><div class='del'>-	    R##_c = FP_CLS_NAN; /* sNAN */				\</div><div class='del'>-    	  }								\</div><div class='del'>-    	else								\</div><div class='del'>-    	  {								\</div><div class='del'>-    	    R##_s = 0;							\</div><div class='del'>-    	    R##_c = FP_CLS_INF; /* sqrt(+inf) = +inf */			\</div><div class='del'>-    	  }								\</div><div class='del'>-    	break;								\</div><div class='del'>-    case FP_CLS_ZERO:							\</div><div class='del'>-	R##_s = X##_s;							\</div><div class='del'>-    	R##_c = FP_CLS_ZERO; /* sqrt(+-0) = +-0 */			\</div><div class='del'>-	break;								\</div><div class='del'>-    case FP_CLS_NORMAL:							\</div><div class='del'>-    	R##_s = 0;							\</div><div class='del'>-        if (X##_s)							\</div><div class='del'>-          {								\</div><div class='del'>-	    R##_c = FP_CLS_NAN; /* sNAN */				\</div><div class='del'>-	    break;							\</div><div class='del'>-          }								\</div><div class='del'>-    	R##_c = FP_CLS_NORMAL;						\</div><div class='del'>-        if (X##_e &amp; 1)							\</div><div class='del'>-          _FP_FRAC_SLL_##wc(X, 1);					\</div><div class='del'>-        R##_e = X##_e &gt;&gt; 1;						\</div><div class='del'>-        _FP_FRAC_SET_##wc(S, _FP_ZEROFRAC_##wc);			\</div><div class='del'>-        _FP_FRAC_SET_##wc(R, _FP_ZEROFRAC_##wc);			\</div><div class='del'>-        q = _FP_OVERFLOW_##fs;						\</div><div class='del'>-        _FP_FRAC_SLL_##wc(X, 1);					\</div><div class='del'>-        _FP_SQRT_MEAT_##wc(R, S, T, X, q);				\</div><div class='del'>-        _FP_FRAC_SRL_##wc(R, 1);					\</div><div class='del'>-    }									\</div><div class='del'>-  } while (0)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Convert from FP to integer</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* "When a NaN, infinity, large positive argument &gt;= 2147483648.0, or</div><div class='del'>- * large negative argument &lt;= -2147483649.0 is converted to an integer,</div><div class='del'>- * the invalid_current bit...should be set and fp_exception_IEEE_754 should</div><div class='del'>- * be raised. If the floating point invalid trap is disabled, no trap occurs</div><div class='del'>- * and a numerical result is generated: if the sign bit of the operand</div><div class='del'>- * is 0, the result is 2147483647; if the sign bit of the operand is 1,</div><div class='del'>- * the result is -2147483648."</div><div class='del'>- * Similarly for conversion to extended ints, except that the boundaries</div><div class='del'>- * are &gt;= 2^63, &lt;= -(2^63 + 1), and the results are 2^63 + 1 for s=0 and</div><div class='del'>- * -2^63 for s=1.</div><div class='del'>- * -- SPARC Architecture Manual V9, Appendix B, which specifies how</div><div class='del'>- * SPARCs resolve implementation dependencies in the IEEE-754 spec.</div><div class='del'>- * I don't believe that the code below follows this. I'm not even sure</div><div class='del'>- * it's right!</div><div class='del'>- * It doesn't cope with needing to convert to an n bit integer when there</div><div class='del'>- * is no n bit integer type. Fortunately gcc provides long long so this</div><div class='del'>- * isn't a problem for sparc32.</div><div class='del'>- * I have, however, fixed its NaN handling to conform as above.</div><div class='del'>- *         -- PMM 02/1998</div><div class='del'>- * NB: rsigned is not 'is r declared signed?' but 'should the value stored</div><div class='del'>- * in r be signed or unsigned?'. r is always(?) declared unsigned.</div><div class='del'>- * Comments below are mine, BTW -- PMM</div><div class='del'>- */</div><div class='del'>-#define _FP_TO_INT(fs, wc, r, X, rsize, rsigned)			\</div><div class='del'>-  do {									\</div><div class='del'>-    switch (X##_c)							\</div><div class='del'>-      {									\</div><div class='del'>-      case FP_CLS_NORMAL:						\</div><div class='del'>-	if (X##_e &lt; 0)							\</div><div class='del'>-	  {								\</div><div class='del'>-	  /* case FP_CLS_NAN: see above! */				\</div><div class='del'>-	  case FP_CLS_ZERO:						\</div><div class='del'>-	    r = 0;							\</div><div class='del'>-	  }								\</div><div class='del'>-	else if (X##_e &gt;= rsize - (rsigned != 0))			\</div><div class='del'>-	  {	/* overflow */						\</div><div class='del'>-	  case FP_CLS_NAN:                                              \</div><div class='del'>-          case FP_CLS_INF:						\</div><div class='del'>-	    if (rsigned)						\</div><div class='del'>-	      {								\</div><div class='del'>-		r = 1;							\</div><div class='del'>-		r &lt;&lt;= rsize - 1;					\</div><div class='del'>-		r -= 1 - X##_s;						\</div><div class='del'>-	      }								\</div><div class='del'>-	    else							\</div><div class='del'>-	      {								\</div><div class='del'>-		r = 0;							\</div><div class='del'>-		if (!X##_s)						\</div><div class='del'>-		  r = ~r;						\</div><div class='del'>-	      }								\</div><div class='del'>-	  }								\</div><div class='del'>-	else								\</div><div class='del'>-	  {								\</div><div class='del'>-	    if (_FP_W_TYPE_SIZE*wc &lt; rsize)				\</div><div class='del'>-	      {								\</div><div class='del'>-		_FP_FRAC_ASSEMBLE_##wc(r, X, rsize);			\</div><div class='del'>-		r &lt;&lt;= X##_e - _FP_WFRACBITS_##fs;			\</div><div class='del'>-	      }								\</div><div class='del'>-	    else							\</div><div class='del'>-	      {								\</div><div class='del'>-		if (X##_e &gt;= _FP_WFRACBITS_##fs)			\</div><div class='del'>-		  _FP_FRAC_SLL_##wc(X, (X##_e - _FP_WFRACBITS_##fs + 1));\</div><div class='del'>-		else							\</div><div class='del'>-		  _FP_FRAC_SRL_##wc(X, (_FP_WFRACBITS_##fs - X##_e - 1));\</div><div class='del'>-		_FP_FRAC_ASSEMBLE_##wc(r, X, rsize);			\</div><div class='del'>-	      }								\</div><div class='del'>-	    if (rsigned &amp;&amp; X##_s)					\</div><div class='del'>-	      r = -r;							\</div><div class='del'>-	  }								\</div><div class='del'>-	break;								\</div><div class='del'>-      }									\</div><div class='del'>-  } while (0)</div><div class='del'>-</div><div class='del'>-#define _FP_FROM_INT(fs, wc, X, r, rsize, rtype)			\</div><div class='del'>-  do {									\</div><div class='del'>-    if (r)								\</div><div class='del'>-      {									\</div><div class='del'>-	X##_c = FP_CLS_NORMAL;						\</div><div class='del'>-									\</div><div class='del'>-	if ((X##_s = (r &lt; 0)))						\</div><div class='del'>-	  r = -r;							\</div><div class='del'>-	/* Note that `r' is now considered unsigned, so we don't have	\</div><div class='del'>-	   to worry about the single signed overflow case.  */		\</div><div class='del'>-									\</div><div class='del'>-	if (rsize &lt;= _FP_W_TYPE_SIZE)					\</div><div class='del'>-	  __FP_CLZ(X##_e, r);						\</div><div class='del'>-	else								\</div><div class='del'>-	  __FP_CLZ_2(X##_e, (_FP_W_TYPE)(r &gt;&gt; _FP_W_TYPE_SIZE), 	\</div><div class='del'>-		     (_FP_W_TYPE)r);					\</div><div class='del'>-	if (rsize &lt; _FP_W_TYPE_SIZE)					\</div><div class='del'>-		X##_e -= (_FP_W_TYPE_SIZE - rsize);			\</div><div class='del'>-	X##_e = rsize - X##_e - 1;					\</div><div class='del'>-									\</div><div class='del'>-	if (_FP_FRACBITS_##fs &lt; rsize &amp;&amp; _FP_WFRACBITS_##fs &lt; X##_e)	\</div><div class='del'>-	  __FP_FRAC_SRS_1(r, (X##_e - _FP_WFRACBITS_##fs), rsize);	\</div><div class='del'>-	r &amp;= ~((_FP_W_TYPE)1 &lt;&lt; X##_e);					\</div><div class='del'>-	_FP_FRAC_DISASSEMBLE_##wc(X, ((unsigned rtype)r), rsize);	\</div><div class='del'>-	_FP_FRAC_SLL_##wc(X, (_FP_WFRACBITS_##fs - X##_e - 1));		\</div><div class='del'>-      }									\</div><div class='del'>-    else								\</div><div class='del'>-      {									\</div><div class='del'>-	X##_c = FP_CLS_ZERO, X##_s = 0;					\</div><div class='del'>-      }									\</div><div class='del'>-  } while (0)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define FP_CONV(dfs,sfs,dwc,swc,D,S)			\</div><div class='del'>-  do {							\</div><div class='del'>-    _FP_FRAC_CONV_##dwc##_##swc(dfs, sfs, D, S);	\</div><div class='del'>-    D##_e = S##_e;					\</div><div class='del'>-    D##_c = S##_c;					\</div><div class='del'>-    D##_s = S##_s;					\</div><div class='del'>-  } while (0)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Helper primitives.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* Count leading zeros in a word.  */</div><div class='del'>-</div><div class='del'>-#ifndef __FP_CLZ</div><div class='del'>-#if _FP_W_TYPE_SIZE &lt; 64</div><div class='del'>-/* this is just to shut the compiler up about shifts &gt; word length -- PMM 02/1998 */</div><div class='del'>-#define __FP_CLZ(r, x)				\</div><div class='del'>-  do {						\</div><div class='del'>-    _FP_W_TYPE _t = (x);			\</div><div class='del'>-    r = _FP_W_TYPE_SIZE - 1;			\</div><div class='del'>-    if (_t &gt; 0xffff) r -= 16;			\</div><div class='del'>-    if (_t &gt; 0xffff) _t &gt;&gt;= 16;			\</div><div class='del'>-    if (_t &gt; 0xff) r -= 8;			\</div><div class='del'>-    if (_t &gt; 0xff) _t &gt;&gt;= 8;			\</div><div class='del'>-    if (_t &amp; 0xf0) r -= 4;			\</div><div class='del'>-    if (_t &amp; 0xf0) _t &gt;&gt;= 4;			\</div><div class='del'>-    if (_t &amp; 0xc) r -= 2;			\</div><div class='del'>-    if (_t &amp; 0xc) _t &gt;&gt;= 2;			\</div><div class='del'>-    if (_t &amp; 0x2) r -= 1;			\</div><div class='del'>-  } while (0)</div><div class='del'>-#else /* not _FP_W_TYPE_SIZE &lt; 64 */</div><div class='del'>-#define __FP_CLZ(r, x)				\</div><div class='del'>-  do {						\</div><div class='del'>-    _FP_W_TYPE _t = (x);			\</div><div class='del'>-    r = _FP_W_TYPE_SIZE - 1;			\</div><div class='del'>-    if (_t &gt; 0xffffffff) r -= 32;		\</div><div class='del'>-    if (_t &gt; 0xffffffff) _t &gt;&gt;= 32;		\</div><div class='del'>-    if (_t &gt; 0xffff) r -= 16;			\</div><div class='del'>-    if (_t &gt; 0xffff) _t &gt;&gt;= 16;			\</div><div class='del'>-    if (_t &gt; 0xff) r -= 8;			\</div><div class='del'>-    if (_t &gt; 0xff) _t &gt;&gt;= 8;			\</div><div class='del'>-    if (_t &amp; 0xf0) r -= 4;			\</div><div class='del'>-    if (_t &amp; 0xf0) _t &gt;&gt;= 4;			\</div><div class='del'>-    if (_t &amp; 0xc) r -= 2;			\</div><div class='del'>-    if (_t &amp; 0xc) _t &gt;&gt;= 2;			\</div><div class='del'>-    if (_t &amp; 0x2) r -= 1;			\</div><div class='del'>-  } while (0)</div><div class='del'>-#endif /* not _FP_W_TYPE_SIZE &lt; 64 */</div><div class='del'>-#endif /* ndef __FP_CLZ */</div><div class='del'>-</div><div class='del'>-#define _FP_DIV_HELP_imm(q, r, n, d)		\</div><div class='del'>-  do {						\</div><div class='del'>-    q = n / d, r = n % d;			\</div><div class='del'>-  } while (0)</div><div class='del'>-</div><div class='head'>diff --git a/arch/powerpc/math-emu/single.h b/arch/powerpc/math-emu/single.h<br/>deleted file mode 100644<br/>index f19d99451815..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/single.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/math-emu/single.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,66 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Definitions for IEEE Single Precision</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#if _FP_W_TYPE_SIZE &lt; 32</div><div class='del'>-#error "Here's a nickel kid.  Go buy yourself a real computer."</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define _FP_FRACBITS_S		24</div><div class='del'>-#define _FP_FRACXBITS_S		(_FP_W_TYPE_SIZE - _FP_FRACBITS_S)</div><div class='del'>-#define _FP_WFRACBITS_S		(_FP_WORKBITS + _FP_FRACBITS_S)</div><div class='del'>-#define _FP_WFRACXBITS_S	(_FP_W_TYPE_SIZE - _FP_WFRACBITS_S)</div><div class='del'>-#define _FP_EXPBITS_S		8</div><div class='del'>-#define _FP_EXPBIAS_S		127</div><div class='del'>-#define _FP_EXPMAX_S		255</div><div class='del'>-#define _FP_QNANBIT_S		((_FP_W_TYPE)1 &lt;&lt; (_FP_FRACBITS_S-2))</div><div class='del'>-#define _FP_IMPLBIT_S		((_FP_W_TYPE)1 &lt;&lt; (_FP_FRACBITS_S-1))</div><div class='del'>-#define _FP_OVERFLOW_S		((_FP_W_TYPE)1 &lt;&lt; (_FP_WFRACBITS_S))</div><div class='del'>-</div><div class='del'>-/* The implementation of _FP_MUL_MEAT_S and _FP_DIV_MEAT_S should be</div><div class='del'>-   chosen by the target machine.  */</div><div class='del'>-</div><div class='del'>-union _FP_UNION_S</div><div class='del'>-{</div><div class='del'>-  float flt;</div><div class='del'>-  struct {</div><div class='del'>-#if __BYTE_ORDER == __BIG_ENDIAN</div><div class='del'>-    unsigned sign : 1;</div><div class='del'>-    unsigned exp  : _FP_EXPBITS_S;</div><div class='del'>-    unsigned frac : _FP_FRACBITS_S - (_FP_IMPLBIT_S != 0);</div><div class='del'>-#else</div><div class='del'>-    unsigned frac : _FP_FRACBITS_S - (_FP_IMPLBIT_S != 0);</div><div class='del'>-    unsigned exp  : _FP_EXPBITS_S;</div><div class='del'>-    unsigned sign : 1;</div><div class='del'>-#endif</div><div class='del'>-  } bits __attribute__((packed));</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define FP_DECL_S(X)		_FP_DECL(1,X)</div><div class='del'>-#define FP_UNPACK_RAW_S(X,val)	_FP_UNPACK_RAW_1(S,X,val)</div><div class='del'>-#define FP_PACK_RAW_S(val,X)	_FP_PACK_RAW_1(S,val,X)</div><div class='del'>-</div><div class='del'>-#define FP_UNPACK_S(X,val)		\</div><div class='del'>-  do {					\</div><div class='del'>-    _FP_UNPACK_RAW_1(S,X,val);		\</div><div class='del'>-    _FP_UNPACK_CANONICAL(S,1,X);	\</div><div class='del'>-  } while (0)</div><div class='del'>-</div><div class='del'>-#define FP_PACK_S(val,X)		\</div><div class='del'>-  do {					\</div><div class='del'>-    _FP_PACK_CANONICAL(S,1,X);		\</div><div class='del'>-    _FP_PACK_RAW_1(S,val,X);		\</div><div class='del'>-  } while (0)</div><div class='del'>-</div><div class='del'>-#define FP_NEG_S(R,X)		_FP_NEG(S,1,R,X)</div><div class='del'>-#define FP_ADD_S(R,X,Y)		_FP_ADD(S,1,R,X,Y)</div><div class='del'>-#define FP_SUB_S(R,X,Y)		_FP_SUB(S,1,R,X,Y)</div><div class='del'>-#define FP_MUL_S(R,X,Y)		_FP_MUL(S,1,R,X,Y)</div><div class='del'>-#define FP_DIV_S(R,X,Y)		_FP_DIV(S,1,R,X,Y)</div><div class='del'>-#define FP_SQRT_S(R,X)		_FP_SQRT(S,1,R,X)</div><div class='del'>-</div><div class='del'>-#define FP_CMP_S(r,X,Y,un)	_FP_CMP(S,1,r,X,Y,un)</div><div class='del'>-#define FP_CMP_EQ_S(r,X,Y)	_FP_CMP_EQ(S,1,r,X,Y)</div><div class='del'>-</div><div class='del'>-#define FP_TO_INT_S(r,X,rsz,rsg)  _FP_TO_INT(S,1,r,X,rsz,rsg)</div><div class='del'>-#define FP_FROM_INT_S(X,r,rs,rt)  _FP_FROM_INT(S,1,X,r,rs,rt)</div><div class='head'>diff --git a/arch/powerpc/math-emu/soft-fp.h b/arch/powerpc/math-emu/soft-fp.h<br/>deleted file mode 100644<br/>index cca39598f873..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/soft-fp.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/math-emu/soft-fp.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,104 +0,0 @@</div><div class='del'>-#ifndef SOFT_FP_H</div><div class='del'>-#define SOFT_FP_H</div><div class='del'>-</div><div class='del'>-#include "sfp-machine.h"</div><div class='del'>-</div><div class='del'>-#define _FP_WORKBITS		3</div><div class='del'>-#define _FP_WORK_LSB		((_FP_W_TYPE)1 &lt;&lt; 3)</div><div class='del'>-#define _FP_WORK_ROUND		((_FP_W_TYPE)1 &lt;&lt; 2)</div><div class='del'>-#define _FP_WORK_GUARD		((_FP_W_TYPE)1 &lt;&lt; 1)</div><div class='del'>-#define _FP_WORK_STICKY		((_FP_W_TYPE)1 &lt;&lt; 0)</div><div class='del'>-</div><div class='del'>-#ifndef FP_RND_NEAREST</div><div class='del'>-# define FP_RND_NEAREST		0</div><div class='del'>-# define FP_RND_ZERO		1</div><div class='del'>-# define FP_RND_PINF		2</div><div class='del'>-# define FP_RND_MINF		3</div><div class='del'>-#ifndef FP_ROUNDMODE</div><div class='del'>-# define FP_ROUNDMODE		FP_RND_NEAREST</div><div class='del'>-#endif</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define _FP_ROUND_NEAREST(wc, X)			\</div><div class='del'>-({  int __ret = 0;					\</div><div class='del'>-    int __frac = _FP_FRAC_LOW_##wc(X) &amp; 15;		\</div><div class='del'>-    if (__frac &amp; 7) {					\</div><div class='del'>-      __ret = EFLAG_INEXACT;				\</div><div class='del'>-      if ((__frac &amp; 7) != _FP_WORK_ROUND)		\</div><div class='del'>-        _FP_FRAC_ADDI_##wc(X, _FP_WORK_ROUND);		\</div><div class='del'>-      else if (__frac &amp; _FP_WORK_LSB)			\</div><div class='del'>-        _FP_FRAC_ADDI_##wc(X, _FP_WORK_ROUND);		\</div><div class='del'>-    }							\</div><div class='del'>-    __ret;						\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-#define _FP_ROUND_ZERO(wc, X)				\</div><div class='del'>-({  int __ret = 0;					\</div><div class='del'>-    if (_FP_FRAC_LOW_##wc(X) &amp; 7)			\</div><div class='del'>-      __ret = EFLAG_INEXACT;				\</div><div class='del'>-    __ret;						\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-#define _FP_ROUND_PINF(wc, X)				\</div><div class='del'>-({  int __ret = EFLAG_INEXACT;				\</div><div class='del'>-    if (!X##_s &amp;&amp; (_FP_FRAC_LOW_##wc(X) &amp; 7))		\</div><div class='del'>-      _FP_FRAC_ADDI_##wc(X, _FP_WORK_LSB);		\</div><div class='del'>-    else __ret = 0;					\</div><div class='del'>-    __ret;						\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-#define _FP_ROUND_MINF(wc, X)				\</div><div class='del'>-({  int __ret = EFLAG_INEXACT;				\</div><div class='del'>-    if (X##_s &amp;&amp; (_FP_FRAC_LOW_##wc(X) &amp; 7))		\</div><div class='del'>-      _FP_FRAC_ADDI_##wc(X, _FP_WORK_LSB);		\</div><div class='del'>-    else __ret = 0;					\</div><div class='del'>-    __ret;						\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-#define _FP_ROUND(wc, X)			\</div><div class='del'>-({	int __ret = 0;				\</div><div class='del'>-	switch (FP_ROUNDMODE)			\</div><div class='del'>-	{					\</div><div class='del'>-	  case FP_RND_NEAREST:			\</div><div class='del'>-	    __ret |= _FP_ROUND_NEAREST(wc,X);	\</div><div class='del'>-	    break;				\</div><div class='del'>-	  case FP_RND_ZERO:			\</div><div class='del'>-	    __ret |= _FP_ROUND_ZERO(wc,X);	\</div><div class='del'>-	    break;				\</div><div class='del'>-	  case FP_RND_PINF:			\</div><div class='del'>-	    __ret |= _FP_ROUND_PINF(wc,X);	\</div><div class='del'>-	    break;				\</div><div class='del'>-	  case FP_RND_MINF:			\</div><div class='del'>-	    __ret |= _FP_ROUND_MINF(wc,X);	\</div><div class='del'>-	    break;				\</div><div class='del'>-	};					\</div><div class='del'>-	__ret;					\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-#define FP_CLS_NORMAL		0</div><div class='del'>-#define FP_CLS_ZERO		1</div><div class='del'>-#define FP_CLS_INF		2</div><div class='del'>-#define FP_CLS_NAN		3</div><div class='del'>-</div><div class='del'>-#define _FP_CLS_COMBINE(x,y)	(((x) &lt;&lt; 2) | (y))</div><div class='del'>-</div><div class='del'>-#include "op-1.h"</div><div class='del'>-#include "op-2.h"</div><div class='del'>-#include "op-4.h"</div><div class='del'>-#include "op-common.h"</div><div class='del'>-</div><div class='del'>-/* Sigh.  Silly things longlong.h needs.  */</div><div class='del'>-#define UWtype		_FP_W_TYPE</div><div class='del'>-#define W_TYPE_SIZE	_FP_W_TYPE_SIZE</div><div class='del'>-</div><div class='del'>-typedef int SItype __attribute__((mode(SI)));</div><div class='del'>-typedef int DItype __attribute__((mode(DI)));</div><div class='del'>-typedef unsigned int USItype __attribute__((mode(SI)));</div><div class='del'>-typedef unsigned int UDItype __attribute__((mode(DI)));</div><div class='del'>-#if _FP_W_TYPE_SIZE == 32</div><div class='del'>-typedef unsigned int UHWtype __attribute__((mode(HI)));</div><div class='del'>-#elif _FP_W_TYPE_SIZE == 64</div><div class='del'>-typedef USItype UHWtype;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/arch/powerpc/math-emu/stfs.c b/arch/powerpc/math-emu/stfs.c<br/>index 8689aa48ef69..6122147356d1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/stfs.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/math-emu/stfs.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/stfs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/stfs.c</a></div><div class='hunk'>@@ -2,23 +2,24 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "soft-fp.h"</div><div class='del'>-#include "double.h"</div><div class='del'>-#include "single.h"</div><div class='add'>+#include &lt;asm/sfp-machine.h&gt;</div><div class='add'>+#include &lt;math-emu/soft-fp.h&gt;</div><div class='add'>+#include &lt;math-emu/double.h&gt;</div><div class='add'>+#include &lt;math-emu/single.h&gt;</div><div class='ctx'> </div><div class='ctx'> int</div><div class='ctx'> stfs(void *frS, void *ea)</div><div class='ctx'> {</div><div class='ctx'> 	FP_DECL_D(A);</div><div class='ctx'> 	FP_DECL_S(R);</div><div class='add'>+	FP_DECL_EX;</div><div class='ctx'> 	float f;</div><div class='del'>-	int err;</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 	printk("%s: S %p, ea %p\n", __func__, frS, ea);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	__FP_UNPACK_D(A, frS);</div><div class='add'>+	FP_UNPACK_DP(A, frS);</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 	printk("A: %ld %lu %lu %ld (%ld)\n", A_s, A_f1, A_f0, A_e, A_c);</div><div class='hunk'>@@ -30,12 +31,12 @@ stfs(void *frS, void *ea)</div><div class='ctx'> 	printk("R: %ld %lu %ld (%ld)\n", R_s, R_f, R_e, R_c);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	err = _FP_PACK_CANONICAL(S, 1, R);</div><div class='del'>-	if (!err || !__FPU_TRAP_P(err)) {</div><div class='del'>-		__FP_PACK_RAW_1(S, &amp;f, R);</div><div class='add'>+	_FP_PACK_CANONICAL(S, 1, R);</div><div class='add'>+	if (!FP_CUR_EXCEPTIONS || !__FPU_TRAP_P(FP_CUR_EXCEPTIONS)) {</div><div class='add'>+		_FP_PACK_RAW_1_P(S, &amp;f, R);</div><div class='ctx'> 		if (copy_to_user(ea, &amp;f, sizeof(float)))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return err;</div><div class='add'>+	return FP_CUR_EXCEPTIONS;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/math-emu/types.c b/arch/powerpc/math-emu/types.c<br/>deleted file mode 100644<br/>index e1ed15d829db..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/types.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/math-emu/types.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,51 +0,0 @@</div><div class='del'>-#include "soft-fp.h"</div><div class='del'>-#include "double.h"</div><div class='del'>-#include "single.h"</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-fp_unpack_d(long *_s, unsigned long *_f1, unsigned long *_f0,</div><div class='del'>-	    long *_e, long *_c, void *val)</div><div class='del'>-{</div><div class='del'>-	FP_DECL_D(X);</div><div class='del'>-</div><div class='del'>-	__FP_UNPACK_RAW_2(D, X, val);</div><div class='del'>-</div><div class='del'>-	_FP_UNPACK_CANONICAL(D, 2, X);</div><div class='del'>-</div><div class='del'>-	*_s = X_s;</div><div class='del'>-	*_f1 = X_f1;</div><div class='del'>-	*_f0 = X_f0;</div><div class='del'>-	*_e = X_e;</div><div class='del'>-	*_c = X_c;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-fp_pack_d(void *val, long X_s, unsigned long X_f1,</div><div class='del'>-	  unsigned long X_f0, long X_e, long X_c)</div><div class='del'>-{</div><div class='del'>-	int exc;</div><div class='del'>-</div><div class='del'>-	exc = _FP_PACK_CANONICAL(D, 2, X);</div><div class='del'>-	if (!exc || !__FPU_TRAP_P(exc))</div><div class='del'>-		__FP_PACK_RAW_2(D, val, X);</div><div class='del'>-	return exc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-fp_pack_ds(void *val, long X_s, unsigned long X_f1,</div><div class='del'>-	   unsigned long X_f0, long X_e, long X_c)</div><div class='del'>-{</div><div class='del'>-	FP_DECL_S(__X);</div><div class='del'>-	int exc;</div><div class='del'>-</div><div class='del'>-	FP_CONV(S, D, 1, 2, __X, X);</div><div class='del'>-	exc = _FP_PACK_CANONICAL(S, 1, __X);</div><div class='del'>-	if (!exc || !__FPU_TRAP_P(exc)) {</div><div class='del'>-		_FP_UNPACK_CANONICAL(S, 1, __X);</div><div class='del'>-		FP_CONV(D, S, 2, 1, X, __X);</div><div class='del'>-		exc |= _FP_PACK_CANONICAL(D, 2, X);</div><div class='del'>-		if (!exc || !__FPU_TRAP_P(exc))</div><div class='del'>-			__FP_PACK_RAW_2(D, val, X);</div><div class='del'>-	}</div><div class='del'>-	return exc;</div><div class='del'>-}</div><div class='head'>diff --git a/arch/powerpc/math-emu/udivmodti4.c b/arch/powerpc/math-emu/udivmodti4.c<br/>index 7e112dc1e2f2..6172044ab003 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/udivmodti4.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/math-emu/udivmodti4.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/math-emu/udivmodti4.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/math-emu/udivmodti4.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /* This has so very few changes over libgcc2's __udivmoddi4 it isn't funny.  */</div><div class='ctx'> </div><div class='del'>-#include "soft-fp.h"</div><div class='add'>+#include &lt;math-emu/soft-fp.h&gt;</div><div class='ctx'> </div><div class='ctx'> #undef count_leading_zeros</div><div class='ctx'> #define count_leading_zeros  __FP_CLZ</div><div class='head'>diff --git a/arch/powerpc/mm/fsl_booke_mmu.c b/arch/powerpc/mm/fsl_booke_mmu.c<br/>index ce10e2b1b902..23cee39534fd 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/mm/fsl_booke_mmu.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/mm/fsl_booke_mmu.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/mm/fsl_booke_mmu.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/mm/fsl_booke_mmu.c</a></div><div class='hunk'>@@ -202,7 +202,7 @@ adjust_total_lowmem(void)</div><div class='ctx'> 		cam_max_size = max_lowmem_size;</div><div class='ctx'> </div><div class='ctx'> 	/* adjust lowmem size to max_lowmem_size */</div><div class='del'>-	ram = min(max_lowmem_size, (phys_addr_t)total_lowmem);</div><div class='add'>+	ram = min(max_lowmem_size, total_lowmem);</div><div class='ctx'> </div><div class='ctx'> 	/* Calculate CAM values */</div><div class='ctx'> 	__cam0 = 1UL &lt;&lt; 2 * (__ilog2(ram) / 2);</div><div class='hunk'>@@ -225,7 +225,8 @@ adjust_total_lowmem(void)</div><div class='ctx'> 	printk(KERN_INFO "Memory CAM mapping: CAM0=%ldMb, CAM1=%ldMb,"</div><div class='ctx'> 			" CAM2=%ldMb residual: %ldMb\n",</div><div class='ctx'> 			__cam0 &gt;&gt; 20, __cam1 &gt;&gt; 20, __cam2 &gt;&gt; 20,</div><div class='del'>-			(total_lowmem - __cam0 - __cam1 - __cam2) &gt;&gt; 20);</div><div class='add'>+			(long int)((total_lowmem - __cam0 - __cam1 - __cam2)</div><div class='add'>+				   &gt;&gt; 20));</div><div class='ctx'> 	__max_low_memory = __cam0 + __cam1 + __cam2;</div><div class='ctx'> 	__initial_memory_limit_addr = memstart_addr + __max_low_memory;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/mm/gup.c b/arch/powerpc/mm/gup.c<br/>index 9fdf4d6335e4..28a114db3ba0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/mm/gup.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/mm/gup.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/mm/gup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/mm/gup.c</a></div><div class='hunk'>@@ -41,7 +41,7 @@ static noinline int gup_pte_range(pmd_t pmd, unsigned long addr,</div><div class='ctx'> 		page = pte_page(pte);</div><div class='ctx'> 		if (!page_cache_get_speculative(page))</div><div class='ctx'> 			return 0;</div><div class='del'>-		if (unlikely(pte != *ptep)) {</div><div class='add'>+		if (unlikely(pte_val(pte) != pte_val(*ptep))) {</div><div class='ctx'> 			put_page(page);</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -92,7 +92,7 @@ static noinline int gup_huge_pte(pte_t *ptep, struct hstate *hstate,</div><div class='ctx'> 		*nr -= refs;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='del'>-	if (unlikely(pte != *ptep)) {</div><div class='add'>+	if (unlikely(pte_val(pte) != pte_val(*ptep))) {</div><div class='ctx'> 		/* Could be optimized better */</div><div class='ctx'> 		while (*nr) {</div><div class='ctx'> 			put_page(page);</div><div class='hunk'>@@ -237,7 +237,8 @@ int get_user_pages_fast(unsigned long start, int nr_pages, int write,</div><div class='ctx'> 			pgd_t pgd = *pgdp;</div><div class='ctx'> </div><div class='ctx'> 			VM_BUG_ON(shift != mmu_psize_defs[get_slice_psize(mm, addr)].shift);</div><div class='del'>-			pr_debug("  %016lx: normal pgd %p\n", addr, (void *)pgd);</div><div class='add'>+			pr_debug("  %016lx: normal pgd %p\n", addr,</div><div class='add'>+				 (void *)pgd_val(pgd));</div><div class='ctx'> 			next = pgd_addr_end(addr, end);</div><div class='ctx'> 			if (pgd_none(pgd))</div><div class='ctx'> 				goto slow;</div><div class='head'>diff --git a/arch/powerpc/mm/hash_low_32.S b/arch/powerpc/mm/hash_low_32.S<br/>index b9ba7d930801..7bffb70b9fe2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/mm/hash_low_32.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/mm/hash_low_32.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/mm/hash_low_32.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/mm/hash_low_32.S</a></div><div class='hunk'>@@ -75,7 +75,7 @@ _GLOBAL(hash_page_sync)</div><div class='ctx'>  * Returns to the caller if the access is illegal or there is no</div><div class='ctx'>  * mapping for the address.  Otherwise it places an appropriate PTE</div><div class='ctx'>  * in the hash table and returns from the exception.</div><div class='del'>- * Uses r0, r3 - r8, ctr, lr.</div><div class='add'>+ * Uses r0, r3 - r8, r10, ctr, lr.</div><div class='ctx'>  */</div><div class='ctx'> 	.text</div><div class='ctx'> _GLOBAL(hash_page)</div><div class='hunk'>@@ -106,9 +106,15 @@ _GLOBAL(hash_page)</div><div class='ctx'> 	addi	r5,r5,swapper_pg_dir@l	/* kernel page table */</div><div class='ctx'> 	rlwimi	r3,r9,32-12,29,29	/* MSR_PR -&gt; _PAGE_USER */</div><div class='ctx'> 112:	add	r5,r5,r7		/* convert to phys addr */</div><div class='add'>+#ifndef CONFIG_PTE_64BIT</div><div class='ctx'> 	rlwimi	r5,r4,12,20,29		/* insert top 10 bits of address */</div><div class='ctx'> 	lwz	r8,0(r5)		/* get pmd entry */</div><div class='ctx'> 	rlwinm.	r8,r8,0,0,19		/* extract address of pte page */</div><div class='add'>+#else</div><div class='add'>+	rlwinm	r8,r4,13,19,29		/* Compute pgdir/pmd offset */</div><div class='add'>+	lwzx	r8,r8,r5		/* Get L1 entry */</div><div class='add'>+	rlwinm.	r8,r8,0,0,20		/* extract pt base address */</div><div class='add'>+#endif</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> 	beq-	hash_page_out		/* return if no mapping */</div><div class='ctx'> #else</div><div class='hunk'>@@ -118,7 +124,11 @@ _GLOBAL(hash_page)</div><div class='ctx'> 	   to the address following the rfi. */</div><div class='ctx'> 	beqlr-</div><div class='ctx'> #endif</div><div class='add'>+#ifndef CONFIG_PTE_64BIT</div><div class='ctx'> 	rlwimi	r8,r4,22,20,29		/* insert next 10 bits of address */</div><div class='add'>+#else</div><div class='add'>+	rlwimi	r8,r4,23,20,28		/* compute pte address */</div><div class='add'>+#endif</div><div class='ctx'> 	rlwinm	r0,r3,32-3,24,24	/* _PAGE_RW access -&gt; _PAGE_DIRTY */</div><div class='ctx'> 	ori	r0,r0,_PAGE_ACCESSED|_PAGE_HASHPTE</div><div class='ctx'> </div><div class='hunk'>@@ -127,9 +137,15 @@ _GLOBAL(hash_page)</div><div class='ctx'> 	 * because almost always, there won't be a permission violation</div><div class='ctx'> 	 * and there won't already be an HPTE, and thus we will have</div><div class='ctx'> 	 * to update the PTE to set _PAGE_HASHPTE.  -- paulus.</div><div class='add'>+	 *</div><div class='add'>+	 * If PTE_64BIT is set, the low word is the flags word; use that</div><div class='add'>+	 * word for locking since it contains all the interesting bits.</div><div class='ctx'> 	 */</div><div class='add'>+#if (PTE_FLAGS_OFFSET != 0)</div><div class='add'>+	addi	r8,r8,PTE_FLAGS_OFFSET</div><div class='add'>+#endif</div><div class='ctx'> retry:</div><div class='del'>-	lwarx	r6,0,r8			/* get linux-style pte */</div><div class='add'>+	lwarx	r6,0,r8			/* get linux-style pte, flag word */</div><div class='ctx'> 	andc.	r5,r3,r6		/* check access &amp; ~permission */</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> 	bne-	hash_page_out		/* return if access not permitted */</div><div class='hunk'>@@ -137,6 +153,15 @@ retry:</div><div class='ctx'> 	bnelr-</div><div class='ctx'> #endif</div><div class='ctx'> 	or	r5,r0,r6		/* set accessed/dirty bits */</div><div class='add'>+#ifdef CONFIG_PTE_64BIT</div><div class='add'>+#ifdef CONFIG_SMP</div><div class='add'>+	subf	r10,r6,r8		/* create false data dependency */</div><div class='add'>+	subi	r10,r10,PTE_FLAGS_OFFSET</div><div class='add'>+	lwzx	r10,r6,r10		/* Get upper PTE word */</div><div class='add'>+#else</div><div class='add'>+	lwz	r10,-PTE_FLAGS_OFFSET(r8)</div><div class='add'>+#endif /* CONFIG_SMP */</div><div class='add'>+#endif /* CONFIG_PTE_64BIT */</div><div class='ctx'> 	stwcx.	r5,0,r8			/* attempt to update PTE */</div><div class='ctx'> 	bne-	retry			/* retry if someone got there first */</div><div class='ctx'> </div><div class='hunk'>@@ -203,9 +228,9 @@ _GLOBAL(add_hash_page)</div><div class='ctx'> 	 * we can't take a hash table miss (assuming the code is</div><div class='ctx'> 	 * covered by a BAT).  -- paulus</div><div class='ctx'> 	 */</div><div class='del'>-	mfmsr	r10</div><div class='add'>+	mfmsr	r9</div><div class='ctx'> 	SYNC</div><div class='del'>-	rlwinm	r0,r10,0,17,15		/* clear bit 16 (MSR_EE) */</div><div class='add'>+	rlwinm	r0,r9,0,17,15		/* clear bit 16 (MSR_EE) */</div><div class='ctx'> 	rlwinm	r0,r0,0,28,26		/* clear MSR_DR */</div><div class='ctx'> 	mtmsr	r0</div><div class='ctx'> 	SYNC_601</div><div class='hunk'>@@ -214,14 +239,14 @@ _GLOBAL(add_hash_page)</div><div class='ctx'> 	tophys(r7,0)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='del'>-	addis	r9,r7,mmu_hash_lock@ha</div><div class='del'>-	addi	r9,r9,mmu_hash_lock@l</div><div class='del'>-10:	lwarx	r0,0,r9			/* take the mmu_hash_lock */</div><div class='add'>+	addis	r6,r7,mmu_hash_lock@ha</div><div class='add'>+	addi	r6,r6,mmu_hash_lock@l</div><div class='add'>+10:	lwarx	r0,0,r6			/* take the mmu_hash_lock */</div><div class='ctx'> 	cmpi	0,r0,0</div><div class='ctx'> 	bne-	11f</div><div class='del'>-	stwcx.	r8,0,r9</div><div class='add'>+	stwcx.	r8,0,r6</div><div class='ctx'> 	beq+	12f</div><div class='del'>-11:	lwz	r0,0(r9)</div><div class='add'>+11:	lwz	r0,0(r6)</div><div class='ctx'> 	cmpi	0,r0,0</div><div class='ctx'> 	beq	10b</div><div class='ctx'> 	b	11b</div><div class='hunk'>@@ -234,10 +259,24 @@ _GLOBAL(add_hash_page)</div><div class='ctx'> 	 * HPTE, so we just unlock and return.</div><div class='ctx'> 	 */</div><div class='ctx'> 	mr	r8,r5</div><div class='add'>+#ifndef CONFIG_PTE_64BIT</div><div class='ctx'> 	rlwimi	r8,r4,22,20,29</div><div class='add'>+#else</div><div class='add'>+	rlwimi	r8,r4,23,20,28</div><div class='add'>+	addi	r8,r8,PTE_FLAGS_OFFSET</div><div class='add'>+#endif</div><div class='ctx'> 1:	lwarx	r6,0,r8</div><div class='ctx'> 	andi.	r0,r6,_PAGE_HASHPTE</div><div class='ctx'> 	bne	9f			/* if HASHPTE already set, done */</div><div class='add'>+#ifdef CONFIG_PTE_64BIT</div><div class='add'>+#ifdef CONFIG_SMP</div><div class='add'>+	subf	r10,r6,r8		/* create false data dependency */</div><div class='add'>+	subi	r10,r10,PTE_FLAGS_OFFSET</div><div class='add'>+	lwzx	r10,r6,r10		/* Get upper PTE word */</div><div class='add'>+#else</div><div class='add'>+	lwz	r10,-PTE_FLAGS_OFFSET(r8)</div><div class='add'>+#endif /* CONFIG_SMP */</div><div class='add'>+#endif /* CONFIG_PTE_64BIT */</div><div class='ctx'> 	ori	r5,r6,_PAGE_HASHPTE</div><div class='ctx'> 	stwcx.	r5,0,r8</div><div class='ctx'> 	bne-	1b</div><div class='hunk'>@@ -246,13 +285,15 @@ _GLOBAL(add_hash_page)</div><div class='ctx'> </div><div class='ctx'> 9:</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='add'>+	addis	r6,r7,mmu_hash_lock@ha</div><div class='add'>+	addi	r6,r6,mmu_hash_lock@l</div><div class='ctx'> 	eieio</div><div class='ctx'> 	li	r0,0</div><div class='del'>-	stw	r0,0(r9)		/* clear mmu_hash_lock */</div><div class='add'>+	stw	r0,0(r6)		/* clear mmu_hash_lock */</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	/* reenable interrupts and DR */</div><div class='del'>-	mtmsr	r10</div><div class='add'>+	mtmsr	r9</div><div class='ctx'> 	SYNC_601</div><div class='ctx'> 	isync</div><div class='ctx'> </div><div class='hunk'>@@ -267,7 +308,8 @@ _GLOBAL(add_hash_page)</div><div class='ctx'>  * r5 contains the linux PTE, r6 contains the old value of the</div><div class='ctx'>  * linux PTE (before setting _PAGE_HASHPTE) and r7 contains the</div><div class='ctx'>  * offset to be added to addresses (0 if the MMU is on,</div><div class='del'>- * -KERNELBASE if it is off).</div><div class='add'>+ * -KERNELBASE if it is off).  r10 contains the upper half of</div><div class='add'>+ * the PTE if CONFIG_PTE_64BIT.</div><div class='ctx'>  * On SMP, the caller should have the mmu_hash_lock held.</div><div class='ctx'>  * We assume that the caller has (or will) set the _PAGE_HASHPTE</div><div class='ctx'>  * bit in the linux PTE in memory.  The value passed in r6 should</div><div class='hunk'>@@ -285,7 +327,7 @@ Hash_bits = 12				/* e.g. 256kB hash table */</div><div class='ctx'> Hash_msk = (((1 &lt;&lt; Hash_bits) - 1) * 64)</div><div class='ctx'> </div><div class='ctx'> /* defines for the PTE format for 32-bit PPCs */</div><div class='del'>-#define PTE_SIZE	8</div><div class='add'>+#define HPTE_SIZE	8</div><div class='ctx'> #define PTEG_SIZE	64</div><div class='ctx'> #define LG_PTEG_SIZE	6</div><div class='ctx'> #define LDPTEu		lwzu</div><div class='hunk'>@@ -313,6 +355,11 @@ _GLOBAL(create_hpte)</div><div class='ctx'> BEGIN_FTR_SECTION</div><div class='ctx'> 	ori	r8,r8,_PAGE_COHERENT	/* set M (coherence required) */</div><div class='ctx'> END_FTR_SECTION_IFSET(CPU_FTR_NEED_COHERENT)</div><div class='add'>+#ifdef CONFIG_PTE_64BIT</div><div class='add'>+	/* Put the XPN bits into the PTE */</div><div class='add'>+	rlwimi	r8,r10,8,20,22</div><div class='add'>+	rlwimi	r8,r10,2,29,29</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	/* Construct the high word of the PPC-style PTE (r5) */</div><div class='ctx'> 	rlwinm	r5,r3,7,1,24		/* put VSID in 0x7fffff80 bits */</div><div class='hunk'>@@ -342,8 +389,8 @@ _GLOBAL(hash_page_patch_A)</div><div class='ctx'> </div><div class='ctx'> 	/* Search the primary PTEG for a PTE whose 1st (d)word matches r5 */</div><div class='ctx'> 	mtctr	r0</div><div class='del'>-	addi	r4,r3,-PTE_SIZE</div><div class='del'>-1:	LDPTEu	r6,PTE_SIZE(r4)		/* get next PTE */</div><div class='add'>+	addi	r4,r3,-HPTE_SIZE</div><div class='add'>+1:	LDPTEu	r6,HPTE_SIZE(r4)	/* get next PTE */</div><div class='ctx'> 	CMPPTE	0,r6,r5</div><div class='ctx'> 	bdnzf	2,1b			/* loop while ctr != 0 &amp;&amp; !cr0.eq */</div><div class='ctx'> 	beq+	found_slot</div><div class='hunk'>@@ -353,9 +400,9 @@ _GLOBAL(hash_page_patch_A)</div><div class='ctx'> _GLOBAL(hash_page_patch_B)</div><div class='ctx'> 	xoris	r4,r3,Hash_msk&gt;&gt;16	/* compute secondary hash */</div><div class='ctx'> 	xori	r4,r4,(-PTEG_SIZE &amp; 0xffff)</div><div class='del'>-	addi	r4,r4,-PTE_SIZE</div><div class='add'>+	addi	r4,r4,-HPTE_SIZE</div><div class='ctx'> 	mtctr	r0</div><div class='del'>-2:	LDPTEu	r6,PTE_SIZE(r4)</div><div class='add'>+2:	LDPTEu	r6,HPTE_SIZE(r4)</div><div class='ctx'> 	CMPPTE	0,r6,r5</div><div class='ctx'> 	bdnzf	2,2b</div><div class='ctx'> 	beq+	found_slot</div><div class='hunk'>@@ -363,8 +410,8 @@ _GLOBAL(hash_page_patch_B)</div><div class='ctx'> </div><div class='ctx'> 	/* Search the primary PTEG for an empty slot */</div><div class='ctx'> 10:	mtctr	r0</div><div class='del'>-	addi	r4,r3,-PTE_SIZE		/* search primary PTEG */</div><div class='del'>-1:	LDPTEu	r6,PTE_SIZE(r4)		/* get next PTE */</div><div class='add'>+	addi	r4,r3,-HPTE_SIZE	/* search primary PTEG */</div><div class='add'>+1:	LDPTEu	r6,HPTE_SIZE(r4)	/* get next PTE */</div><div class='ctx'> 	TST_V(r6)			/* test valid bit */</div><div class='ctx'> 	bdnzf	2,1b			/* loop while ctr != 0 &amp;&amp; !cr0.eq */</div><div class='ctx'> 	beq+	found_empty</div><div class='hunk'>@@ -380,9 +427,9 @@ _GLOBAL(hash_page_patch_B)</div><div class='ctx'> _GLOBAL(hash_page_patch_C)</div><div class='ctx'> 	xoris	r4,r3,Hash_msk&gt;&gt;16	/* compute secondary hash */</div><div class='ctx'> 	xori	r4,r4,(-PTEG_SIZE &amp; 0xffff)</div><div class='del'>-	addi	r4,r4,-PTE_SIZE</div><div class='add'>+	addi	r4,r4,-HPTE_SIZE</div><div class='ctx'> 	mtctr	r0</div><div class='del'>-2:	LDPTEu	r6,PTE_SIZE(r4)</div><div class='add'>+2:	LDPTEu	r6,HPTE_SIZE(r4)</div><div class='ctx'> 	TST_V(r6)</div><div class='ctx'> 	bdnzf	2,2b</div><div class='ctx'> 	beq+	found_empty</div><div class='hunk'>@@ -409,11 +456,11 @@ _GLOBAL(hash_page_patch_C)</div><div class='ctx'> </div><div class='ctx'> 1:	addis	r4,r7,next_slot@ha		/* get next evict slot */</div><div class='ctx'> 	lwz	r6,next_slot@l(r4)</div><div class='del'>-	addi	r6,r6,PTE_SIZE			/* search for candidate */</div><div class='del'>-	andi.	r6,r6,7*PTE_SIZE</div><div class='add'>+	addi	r6,r6,HPTE_SIZE			/* search for candidate */</div><div class='add'>+	andi.	r6,r6,7*HPTE_SIZE</div><div class='ctx'> 	stw	r6,next_slot@l(r4)</div><div class='ctx'> 	add	r4,r3,r6</div><div class='del'>-	LDPTE	r0,PTE_SIZE/2(r4)		/* get PTE second word */</div><div class='add'>+	LDPTE	r0,HPTE_SIZE/2(r4)		/* get PTE second word */</div><div class='ctx'> 	clrrwi	r0,r0,12</div><div class='ctx'> 	lis	r6,etext@h</div><div class='ctx'> 	ori	r6,r6,etext@l			/* get etext */</div><div class='hunk'>@@ -426,7 +473,7 @@ _GLOBAL(hash_page_patch_C)</div><div class='ctx'> found_empty:</div><div class='ctx'> 	STPTE	r5,0(r4)</div><div class='ctx'> found_slot:</div><div class='del'>-	STPTE	r8,PTE_SIZE/2(r4)</div><div class='add'>+	STPTE	r8,HPTE_SIZE/2(r4)</div><div class='ctx'> </div><div class='ctx'> #else /* CONFIG_SMP */</div><div class='ctx'> /*</div><div class='hunk'>@@ -452,7 +499,7 @@ found_slot:</div><div class='ctx'> 	STPTE	r5,0(r4)</div><div class='ctx'> 	sync</div><div class='ctx'> 	TLBSYNC</div><div class='del'>-	STPTE	r8,PTE_SIZE/2(r4) /* put in correct RPN, WIMG, PP bits */</div><div class='add'>+	STPTE	r8,HPTE_SIZE/2(r4) /* put in correct RPN, WIMG, PP bits */</div><div class='ctx'> 	sync</div><div class='ctx'> 	SET_V(r5)</div><div class='ctx'> 	STPTE	r5,0(r4)	/* finally set V bit in PTE */</div><div class='hunk'>@@ -499,14 +546,18 @@ _GLOBAL(flush_hash_pages)</div><div class='ctx'> 	isync</div><div class='ctx'> </div><div class='ctx'> 	/* First find a PTE in the range that has _PAGE_HASHPTE set */</div><div class='add'>+#ifndef CONFIG_PTE_64BIT</div><div class='ctx'> 	rlwimi	r5,r4,22,20,29</div><div class='del'>-1:	lwz	r0,0(r5)</div><div class='add'>+#else</div><div class='add'>+	rlwimi	r5,r4,23,20,28</div><div class='add'>+#endif</div><div class='add'>+1:	lwz	r0,PTE_FLAGS_OFFSET(r5)</div><div class='ctx'> 	cmpwi	cr1,r6,1</div><div class='ctx'> 	andi.	r0,r0,_PAGE_HASHPTE</div><div class='ctx'> 	bne	2f</div><div class='ctx'> 	ble	cr1,19f</div><div class='ctx'> 	addi	r4,r4,0x1000</div><div class='del'>-	addi	r5,r5,4</div><div class='add'>+	addi	r5,r5,PTE_SIZE</div><div class='ctx'> 	addi	r6,r6,-1</div><div class='ctx'> 	b	1b</div><div class='ctx'> </div><div class='hunk'>@@ -545,7 +596,10 @@ _GLOBAL(flush_hash_pages)</div><div class='ctx'> 	 * already clear, we're done (for this pte).  If not,</div><div class='ctx'> 	 * clear it (atomically) and proceed.  -- paulus.</div><div class='ctx'> 	 */</div><div class='del'>-33:	lwarx	r8,0,r5			/* fetch the pte */</div><div class='add'>+#if (PTE_FLAGS_OFFSET != 0)</div><div class='add'>+	addi	r5,r5,PTE_FLAGS_OFFSET</div><div class='add'>+#endif</div><div class='add'>+33:	lwarx	r8,0,r5			/* fetch the pte flags word */</div><div class='ctx'> 	andi.	r0,r8,_PAGE_HASHPTE</div><div class='ctx'> 	beq	8f			/* done if HASHPTE is already clear */</div><div class='ctx'> 	rlwinm	r8,r8,0,31,29		/* clear HASHPTE bit */</div><div class='hunk'>@@ -562,8 +616,8 @@ _GLOBAL(flush_hash_patch_A)</div><div class='ctx'> 	/* Search the primary PTEG for a PTE whose 1st (d)word matches r5 */</div><div class='ctx'> 	li	r0,8			/* PTEs/group */</div><div class='ctx'> 	mtctr	r0</div><div class='del'>-	addi	r12,r8,-PTE_SIZE</div><div class='del'>-1:	LDPTEu	r0,PTE_SIZE(r12)	/* get next PTE */</div><div class='add'>+	addi	r12,r8,-HPTE_SIZE</div><div class='add'>+1:	LDPTEu	r0,HPTE_SIZE(r12)	/* get next PTE */</div><div class='ctx'> 	CMPPTE	0,r0,r11</div><div class='ctx'> 	bdnzf	2,1b			/* loop while ctr != 0 &amp;&amp; !cr0.eq */</div><div class='ctx'> 	beq+	3f</div><div class='hunk'>@@ -574,9 +628,9 @@ _GLOBAL(flush_hash_patch_A)</div><div class='ctx'> _GLOBAL(flush_hash_patch_B)</div><div class='ctx'> 	xoris	r12,r8,Hash_msk&gt;&gt;16	/* compute secondary hash */</div><div class='ctx'> 	xori	r12,r12,(-PTEG_SIZE &amp; 0xffff)</div><div class='del'>-	addi	r12,r12,-PTE_SIZE</div><div class='add'>+	addi	r12,r12,-HPTE_SIZE</div><div class='ctx'> 	mtctr	r0</div><div class='del'>-2:	LDPTEu	r0,PTE_SIZE(r12)</div><div class='add'>+2:	LDPTEu	r0,HPTE_SIZE(r12)</div><div class='ctx'> 	CMPPTE	0,r0,r11</div><div class='ctx'> 	bdnzf	2,2b</div><div class='ctx'> 	xori	r11,r11,PTE_H		/* clear H again */</div><div class='hunk'>@@ -590,7 +644,7 @@ _GLOBAL(flush_hash_patch_B)</div><div class='ctx'> </div><div class='ctx'> 8:	ble	cr1,9f			/* if all ptes checked */</div><div class='ctx'> 81:	addi	r6,r6,-1</div><div class='del'>-	addi	r5,r5,4			/* advance to next pte */</div><div class='add'>+	addi	r5,r5,PTE_SIZE</div><div class='ctx'> 	addi	r4,r4,0x1000</div><div class='ctx'> 	lwz	r0,0(r5)		/* check next pte */</div><div class='ctx'> 	cmpwi	cr1,r6,1</div><div class='head'>diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c<br/>index 8920eea34528..5c64af174752 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/mm/hash_utils_64.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/mm/hash_utils_64.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/mm/hash_utils_64.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/mm/hash_utils_64.c</a></div><div class='hunk'>@@ -194,7 +194,7 @@ int htab_bolt_mapping(unsigned long vstart, unsigned long vend,</div><div class='ctx'> 		unsigned long tprot = prot;</div><div class='ctx'> </div><div class='ctx'> 		/* Make kernel text executable */</div><div class='del'>-		if (in_kernel_text(vaddr))</div><div class='add'>+		if (overlaps_kernel_text(vaddr, vaddr + step))</div><div class='ctx'> 			tprot &amp;= ~HPTE_R_N;</div><div class='ctx'> </div><div class='ctx'> 		hash = hpt_hash(va, shift, ssize);</div><div class='hunk'>@@ -348,6 +348,7 @@ static int __init htab_dt_scan_page_sizes(unsigned long node,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_HUGETLB_PAGE</div><div class='ctx'> /* Scan for 16G memory blocks that have been set aside for huge pages</div><div class='ctx'>  * and reserve those blocks for 16G huge pages.</div><div class='ctx'>  */</div><div class='hunk'>@@ -385,6 +386,7 @@ static int __init htab_dt_scan_hugepage_blocks(unsigned long node,</div><div class='ctx'> 	add_gpage(phys_addr, block_size, expected_pages);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+#endif /* CONFIG_HUGETLB_PAGE */</div><div class='ctx'> </div><div class='ctx'> static void __init htab_init_page_sizes(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -539,7 +541,7 @@ static unsigned long __init htab_get_table_size(void)</div><div class='ctx'> void create_section_mapping(unsigned long start, unsigned long end)</div><div class='ctx'> {</div><div class='ctx'> 	BUG_ON(htab_bolt_mapping(start, end, __pa(start),</div><div class='del'>-				 PAGE_KERNEL, mmu_linear_psize,</div><div class='add'>+				 pgprot_val(PAGE_KERNEL), mmu_linear_psize,</div><div class='ctx'> 				 mmu_kernel_ssize));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -647,7 +649,7 @@ void __init htab_initialize(void)</div><div class='ctx'> 		mtspr(SPRN_SDR1, _SDR1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	prot = PAGE_KERNEL;</div><div class='add'>+	prot = pgprot_val(PAGE_KERNEL);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_DEBUG_PAGEALLOC</div><div class='ctx'> 	linear_map_hash_count = lmb_end_of_DRAM() &gt;&gt; PAGE_SHIFT;</div><div class='head'>diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c<br/>index f1c2d55b4377..a117024ab8cd 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/mm/hugetlbpage.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/mm/hugetlbpage.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/mm/hugetlbpage.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/mm/hugetlbpage.c</a></div><div class='hunk'>@@ -128,29 +128,37 @@ static int __hugepte_alloc(struct mm_struct *mm, hugepd_t *hpdp,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Base page size affects how we walk hugetlb page tables */</div><div class='del'>-#ifdef CONFIG_PPC_64K_PAGES</div><div class='del'>-#define hpmd_offset(pud, addr, h)	pmd_offset(pud, addr)</div><div class='del'>-#define hpmd_alloc(mm, pud, addr, h)	pmd_alloc(mm, pud, addr)</div><div class='del'>-#else</div><div class='del'>-static inline</div><div class='del'>-pmd_t *hpmd_offset(pud_t *pud, unsigned long addr, struct hstate *hstate)</div><div class='add'>+</div><div class='add'>+static pud_t *hpud_offset(pgd_t *pgd, unsigned long addr, struct hstate *hstate)</div><div class='add'>+{</div><div class='add'>+	if (huge_page_shift(hstate) &lt; PUD_SHIFT)</div><div class='add'>+		return pud_offset(pgd, addr);</div><div class='add'>+	else</div><div class='add'>+		return (pud_t *) pgd;</div><div class='add'>+}</div><div class='add'>+static pud_t *hpud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long addr,</div><div class='add'>+			 struct hstate *hstate)</div><div class='ctx'> {</div><div class='del'>-	if (huge_page_shift(hstate) == PAGE_SHIFT_64K)</div><div class='add'>+	if (huge_page_shift(hstate) &lt; PUD_SHIFT)</div><div class='add'>+		return pud_alloc(mm, pgd, addr);</div><div class='add'>+	else</div><div class='add'>+		return (pud_t *) pgd;</div><div class='add'>+}</div><div class='add'>+static pmd_t *hpmd_offset(pud_t *pud, unsigned long addr, struct hstate *hstate)</div><div class='add'>+{</div><div class='add'>+	if (huge_page_shift(hstate) &lt; PMD_SHIFT)</div><div class='ctx'> 		return pmd_offset(pud, addr);</div><div class='ctx'> 	else</div><div class='ctx'> 		return (pmd_t *) pud;</div><div class='ctx'> }</div><div class='del'>-static inline</div><div class='del'>-pmd_t *hpmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long addr,</div><div class='del'>-		  struct hstate *hstate)</div><div class='add'>+static pmd_t *hpmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long addr,</div><div class='add'>+			 struct hstate *hstate)</div><div class='ctx'> {</div><div class='del'>-	if (huge_page_shift(hstate) == PAGE_SHIFT_64K)</div><div class='add'>+	if (huge_page_shift(hstate) &lt; PMD_SHIFT)</div><div class='ctx'> 		return pmd_alloc(mm, pud, addr);</div><div class='ctx'> 	else</div><div class='ctx'> 		return (pmd_t *) pud;</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> /* Build list of addresses of gigantic pages.  This function is used in early</div><div class='ctx'>  * boot before the buddy or bootmem allocator is setup.</div><div class='hunk'>@@ -204,7 +212,7 @@ pte_t *huge_pte_offset(struct mm_struct *mm, unsigned long addr)</div><div class='ctx'> </div><div class='ctx'> 	pg = pgd_offset(mm, addr);</div><div class='ctx'> 	if (!pgd_none(*pg)) {</div><div class='del'>-		pu = pud_offset(pg, addr);</div><div class='add'>+		pu = hpud_offset(pg, addr, hstate);</div><div class='ctx'> 		if (!pud_none(*pu)) {</div><div class='ctx'> 			pm = hpmd_offset(pu, addr, hstate);</div><div class='ctx'> 			if (!pmd_none(*pm))</div><div class='hunk'>@@ -233,7 +241,7 @@ pte_t *huge_pte_alloc(struct mm_struct *mm,</div><div class='ctx'> 	addr &amp;= hstate-&gt;mask;</div><div class='ctx'> </div><div class='ctx'> 	pg = pgd_offset(mm, addr);</div><div class='del'>-	pu = pud_alloc(mm, pg, addr);</div><div class='add'>+	pu = hpud_alloc(mm, pg, addr, hstate);</div><div class='ctx'> </div><div class='ctx'> 	if (pu) {</div><div class='ctx'> 		pm = hpmd_alloc(mm, pu, addr, hstate);</div><div class='hunk'>@@ -316,13 +324,7 @@ static void hugetlb_free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,</div><div class='ctx'> 	pud = pud_offset(pgd, addr);</div><div class='ctx'> 	do {</div><div class='ctx'> 		next = pud_addr_end(addr, end);</div><div class='del'>-#ifdef CONFIG_PPC_64K_PAGES</div><div class='del'>-		if (pud_none_or_clear_bad(pud))</div><div class='del'>-			continue;</div><div class='del'>-		hugetlb_free_pmd_range(tlb, pud, addr, next, floor, ceiling,</div><div class='del'>-				       psize);</div><div class='del'>-#else</div><div class='del'>-		if (shift == PAGE_SHIFT_64K) {</div><div class='add'>+		if (shift &lt; PMD_SHIFT) {</div><div class='ctx'> 			if (pud_none_or_clear_bad(pud))</div><div class='ctx'> 				continue;</div><div class='ctx'> 			hugetlb_free_pmd_range(tlb, pud, addr, next, floor,</div><div class='hunk'>@@ -332,7 +334,6 @@ static void hugetlb_free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,</div><div class='ctx'> 				continue;</div><div class='ctx'> 			free_hugepte_range(tlb, (hugepd_t *)pud, psize);</div><div class='ctx'> 		}</div><div class='del'>-#endif</div><div class='ctx'> 	} while (pud++, addr = next, addr != end);</div><div class='ctx'> </div><div class='ctx'> 	start &amp;= PGDIR_MASK;</div><div class='hunk'>@@ -422,9 +423,15 @@ void hugetlb_free_pgd_range(struct mmu_gather *tlb,</div><div class='ctx'> 		psize = get_slice_psize(tlb-&gt;mm, addr);</div><div class='ctx'> 		BUG_ON(!mmu_huge_psizes[psize]);</div><div class='ctx'> 		next = pgd_addr_end(addr, end);</div><div class='del'>-		if (pgd_none_or_clear_bad(pgd))</div><div class='del'>-			continue;</div><div class='del'>-		hugetlb_free_pud_range(tlb, pgd, addr, next, floor, ceiling);</div><div class='add'>+		if (mmu_psize_to_shift(psize) &lt; PUD_SHIFT) {</div><div class='add'>+			if (pgd_none_or_clear_bad(pgd))</div><div class='add'>+				continue;</div><div class='add'>+			hugetlb_free_pud_range(tlb, pgd, addr, next, floor, ceiling);</div><div class='add'>+		} else {</div><div class='add'>+			if (pgd_none(*pgd))</div><div class='add'>+				continue;</div><div class='add'>+			free_hugepte_range(tlb, (hugepd_t *)pgd, psize);</div><div class='add'>+		}</div><div class='ctx'> 	} while (pgd++, addr = next, addr != end);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/mm/init_64.c b/arch/powerpc/mm/init_64.c<br/>index 036fe2f10c77..3e6a6543f53a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/mm/init_64.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/mm/init_64.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/mm/init_64.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/mm/init_64.c</a></div><div class='hunk'>@@ -228,8 +228,8 @@ int __meminit vmemmap_populate(struct page *start_page,</div><div class='ctx'> 			start, p, __pa(p));</div><div class='ctx'> </div><div class='ctx'> 		mapped = htab_bolt_mapping(start, start + page_size, __pa(p),</div><div class='del'>-					   PAGE_KERNEL, mmu_vmemmap_psize,</div><div class='del'>-					   mmu_kernel_ssize);</div><div class='add'>+					   pgprot_val(PAGE_KERNEL),</div><div class='add'>+					   mmu_vmemmap_psize, mmu_kernel_ssize);</div><div class='ctx'> 		BUG_ON(mapped &lt; 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c<br/>index 1c93c255873b..98d7bf99533a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/mm/mem.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/mm/mem.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/mm/mem.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/mm/mem.c</a></div><div class='hunk'>@@ -75,11 +75,10 @@ static inline pte_t *virt_to_kpte(unsigned long vaddr)</div><div class='ctx'> </div><div class='ctx'> int page_is_ram(unsigned long pfn)</div><div class='ctx'> {</div><div class='del'>-	unsigned long paddr = (pfn &lt;&lt; PAGE_SHIFT);</div><div class='del'>-</div><div class='ctx'> #ifndef CONFIG_PPC64	/* XXX for now */</div><div class='del'>-	return paddr &lt; __pa(high_memory);</div><div class='add'>+	return pfn &lt; max_pfn;</div><div class='ctx'> #else</div><div class='add'>+	unsigned long paddr = (pfn &lt;&lt; PAGE_SHIFT);</div><div class='ctx'> 	int i;</div><div class='ctx'> 	for (i=0; i &lt; lmb.memory.cnt; i++) {</div><div class='ctx'> 		unsigned long base;</div><div class='head'>diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c<br/>index d9a181351332..6cf5c71c431f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/mm/numa.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/mm/numa.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/mm/numa.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/mm/numa.c</a></div><div class='hunk'>@@ -89,6 +89,46 @@ static int __cpuinit fake_numa_create_new_node(unsigned long end_pfn,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * get_active_region_work_fn - A helper function for get_node_active_region</div><div class='add'>+ *	Returns datax set to the start_pfn and end_pfn if they contain</div><div class='add'>+ *	the initial value of datax-&gt;start_pfn between them</div><div class='add'>+ * @start_pfn: start page(inclusive) of region to check</div><div class='add'>+ * @end_pfn: end page(exclusive) of region to check</div><div class='add'>+ * @datax: comes in with -&gt;start_pfn set to value to search for and</div><div class='add'>+ *	goes out with active range if it contains it</div><div class='add'>+ * Returns 1 if search value is in range else 0</div><div class='add'>+ */</div><div class='add'>+static int __init get_active_region_work_fn(unsigned long start_pfn,</div><div class='add'>+					unsigned long end_pfn, void *datax)</div><div class='add'>+{</div><div class='add'>+	struct node_active_region *data;</div><div class='add'>+	data = (struct node_active_region *)datax;</div><div class='add'>+</div><div class='add'>+	if (start_pfn &lt;= data-&gt;start_pfn &amp;&amp; end_pfn &gt; data-&gt;start_pfn) {</div><div class='add'>+		data-&gt;start_pfn = start_pfn;</div><div class='add'>+		data-&gt;end_pfn = end_pfn;</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * get_node_active_region - Return active region containing start_pfn</div><div class='add'>+ * @start_pfn: The page to return the region for.</div><div class='add'>+ * @node_ar: Returned set to the active region containing start_pfn</div><div class='add'>+ */</div><div class='add'>+static void __init get_node_active_region(unsigned long start_pfn,</div><div class='add'>+		       struct node_active_region *node_ar)</div><div class='add'>+{</div><div class='add'>+	int nid = early_pfn_to_nid(start_pfn);</div><div class='add'>+</div><div class='add'>+	node_ar-&gt;nid = nid;</div><div class='add'>+	node_ar-&gt;start_pfn = start_pfn;</div><div class='add'>+	work_with_active_regions(nid, get_active_region_work_fn, node_ar);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void __cpuinit map_cpu_to_node(int cpu, int node)</div><div class='ctx'> {</div><div class='ctx'> 	numa_cpu_lookup_table[cpu] = node;</div><div class='hunk'>@@ -150,6 +190,21 @@ static const int *of_get_associativity(struct device_node *dev)</div><div class='ctx'> 	return of_get_property(dev, "ibm,associativity", NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Returns the property linux,drconf-usable-memory if</div><div class='add'>+ * it exists (the property exists only in kexec/kdump kernels,</div><div class='add'>+ * added by kexec-tools)</div><div class='add'>+ */</div><div class='add'>+static const u32 *of_get_usable_memory(struct device_node *memory)</div><div class='add'>+{</div><div class='add'>+	const u32 *prop;</div><div class='add'>+	u32 len;</div><div class='add'>+	prop = of_get_property(memory, "linux,drconf-usable-memory", &amp;len);</div><div class='add'>+	if (!prop || len &lt; sizeof(unsigned int))</div><div class='add'>+		return 0;</div><div class='add'>+	return prop;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Returns nid in the range [0..MAX_NUMNODES-1], or -1 if no useful numa</div><div class='ctx'>  * info is found.</div><div class='ctx'>  */</div><div class='hunk'>@@ -487,14 +542,29 @@ static unsigned long __init numa_enforce_memory_limit(unsigned long start,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Reads the counter for a given entry in</div><div class='add'>+ * linux,drconf-usable-memory property</div><div class='add'>+ */</div><div class='add'>+static inline int __init read_usm_ranges(const u32 **usm)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * For each lmb in ibm,dynamic-memory a corresponding</div><div class='add'>+	 * entry in linux,drconf-usable-memory property contains</div><div class='add'>+	 * a counter followed by that many (base, size) duple.</div><div class='add'>+	 * read the counter from linux,drconf-usable-memory</div><div class='add'>+	 */</div><div class='add'>+	return read_n_cells(n_mem_size_cells, usm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Extract NUMA information from the ibm,dynamic-reconfiguration-memory</div><div class='ctx'>  * node.  This assumes n_mem_{addr,size}_cells have been set.</div><div class='ctx'>  */</div><div class='ctx'> static void __init parse_drconf_memory(struct device_node *memory)</div><div class='ctx'> {</div><div class='del'>-	const u32 *dm;</div><div class='del'>-	unsigned int n, rc;</div><div class='del'>-	unsigned long lmb_size, size;</div><div class='add'>+	const u32 *dm, *usm;</div><div class='add'>+	unsigned int n, rc, ranges, is_kexec_kdump = 0;</div><div class='add'>+	unsigned long lmb_size, base, size, sz;</div><div class='ctx'> 	int nid;</div><div class='ctx'> 	struct assoc_arrays aa;</div><div class='ctx'> </div><div class='hunk'>@@ -510,6 +580,11 @@ static void __init parse_drconf_memory(struct device_node *memory)</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	/* check if this is a kexec/kdump kernel */</div><div class='add'>+	usm = of_get_usable_memory(memory);</div><div class='add'>+	if (usm != NULL)</div><div class='add'>+		is_kexec_kdump = 1;</div><div class='add'>+</div><div class='ctx'> 	for (; n != 0; --n) {</div><div class='ctx'> 		struct of_drconf_cell drmem;</div><div class='ctx'> </div><div class='hunk'>@@ -521,21 +596,31 @@ static void __init parse_drconf_memory(struct device_node *memory)</div><div class='ctx'> 		    || !(drmem.flags &amp; DRCONF_MEM_ASSIGNED))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		nid = of_drconf_to_nid_single(&amp;drmem, &amp;aa);</div><div class='add'>+		base = drmem.base_addr;</div><div class='add'>+		size = lmb_size;</div><div class='add'>+		ranges = 1;</div><div class='ctx'> </div><div class='del'>-		fake_numa_create_new_node(</div><div class='del'>-				((drmem.base_addr + lmb_size) &gt;&gt; PAGE_SHIFT),</div><div class='add'>+		if (is_kexec_kdump) {</div><div class='add'>+			ranges = read_usm_ranges(&amp;usm);</div><div class='add'>+			if (!ranges) /* there are no (base, size) duple */</div><div class='add'>+				continue;</div><div class='add'>+		}</div><div class='add'>+		do {</div><div class='add'>+			if (is_kexec_kdump) {</div><div class='add'>+				base = read_n_cells(n_mem_addr_cells, &amp;usm);</div><div class='add'>+				size = read_n_cells(n_mem_size_cells, &amp;usm);</div><div class='add'>+			}</div><div class='add'>+			nid = of_drconf_to_nid_single(&amp;drmem, &amp;aa);</div><div class='add'>+			fake_numa_create_new_node(</div><div class='add'>+				((base + size) &gt;&gt; PAGE_SHIFT),</div><div class='ctx'> 					   &amp;nid);</div><div class='del'>-</div><div class='del'>-		node_set_online(nid);</div><div class='del'>-</div><div class='del'>-		size = numa_enforce_memory_limit(drmem.base_addr, lmb_size);</div><div class='del'>-		if (!size)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		add_active_range(nid, drmem.base_addr &gt;&gt; PAGE_SHIFT,</div><div class='del'>-				 (drmem.base_addr &gt;&gt; PAGE_SHIFT)</div><div class='del'>-				 + (size &gt;&gt; PAGE_SHIFT));</div><div class='add'>+			node_set_online(nid);</div><div class='add'>+			sz = numa_enforce_memory_limit(base, size);</div><div class='add'>+			if (sz)</div><div class='add'>+				add_active_range(nid, base &gt;&gt; PAGE_SHIFT,</div><div class='add'>+						 (base &gt;&gt; PAGE_SHIFT)</div><div class='add'>+						 + (sz &gt;&gt; PAGE_SHIFT));</div><div class='add'>+		} while (--ranges);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -837,38 +922,50 @@ void __init do_init_bootmem(void)</div><div class='ctx'> 				  start_pfn, end_pfn);</div><div class='ctx'> </div><div class='ctx'> 		free_bootmem_with_active_regions(nid, end_pfn);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		/* Mark reserved regions on this node */</div><div class='del'>-		for (i = 0; i &lt; lmb.reserved.cnt; i++) {</div><div class='del'>-			unsigned long physbase = lmb.reserved.region[i].base;</div><div class='del'>-			unsigned long size = lmb.reserved.region[i].size;</div><div class='del'>-			unsigned long start_paddr = start_pfn &lt;&lt; PAGE_SHIFT;</div><div class='del'>-			unsigned long end_paddr = end_pfn &lt;&lt; PAGE_SHIFT;</div><div class='del'>-</div><div class='del'>-			if (early_pfn_to_nid(physbase &gt;&gt; PAGE_SHIFT) != nid &amp;&amp;</div><div class='del'>-			    early_pfn_to_nid((physbase+size-1) &gt;&gt; PAGE_SHIFT) != nid)</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			if (physbase &lt; end_paddr &amp;&amp;</div><div class='del'>-			    (physbase+size) &gt; start_paddr) {</div><div class='del'>-				/* overlaps */</div><div class='del'>-				if (physbase &lt; start_paddr) {</div><div class='del'>-					size -= start_paddr - physbase;</div><div class='del'>-					physbase = start_paddr;</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-				if (size &gt; end_paddr - physbase)</div><div class='del'>-					size = end_paddr - physbase;</div><div class='del'>-</div><div class='del'>-				dbg("reserve_bootmem %lx %lx\n", physbase,</div><div class='del'>-				    size);</div><div class='del'>-				reserve_bootmem_node(NODE_DATA(nid), physbase,</div><div class='del'>-						     size, BOOTMEM_DEFAULT);</div><div class='del'>-			}</div><div class='add'>+	/* Mark reserved regions */</div><div class='add'>+	for (i = 0; i &lt; lmb.reserved.cnt; i++) {</div><div class='add'>+		unsigned long physbase = lmb.reserved.region[i].base;</div><div class='add'>+		unsigned long size = lmb.reserved.region[i].size;</div><div class='add'>+		unsigned long start_pfn = physbase &gt;&gt; PAGE_SHIFT;</div><div class='add'>+		unsigned long end_pfn = ((physbase + size) &gt;&gt; PAGE_SHIFT);</div><div class='add'>+		struct node_active_region node_ar;</div><div class='add'>+</div><div class='add'>+		get_node_active_region(start_pfn, &amp;node_ar);</div><div class='add'>+		while (start_pfn &lt; end_pfn) {</div><div class='add'>+			/*</div><div class='add'>+			 * if reserved region extends past active region</div><div class='add'>+			 * then trim size to active region</div><div class='add'>+			 */</div><div class='add'>+			if (end_pfn &gt; node_ar.end_pfn)</div><div class='add'>+				size = (node_ar.end_pfn &lt;&lt; PAGE_SHIFT)</div><div class='add'>+					- (start_pfn &lt;&lt; PAGE_SHIFT);</div><div class='add'>+			dbg("reserve_bootmem %lx %lx nid=%d\n", physbase, size,</div><div class='add'>+				node_ar.nid);</div><div class='add'>+			reserve_bootmem_node(NODE_DATA(node_ar.nid), physbase,</div><div class='add'>+						size, BOOTMEM_DEFAULT);</div><div class='add'>+			/*</div><div class='add'>+			 * if reserved region is contained in the active region</div><div class='add'>+			 * then done.</div><div class='add'>+			 */</div><div class='add'>+			if (end_pfn &lt;= node_ar.end_pfn)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * reserved region extends past the active region</div><div class='add'>+			 *   get next active region that contains this</div><div class='add'>+			 *   reserved region</div><div class='add'>+			 */</div><div class='add'>+			start_pfn = node_ar.end_pfn;</div><div class='add'>+			physbase = start_pfn &lt;&lt; PAGE_SHIFT;</div><div class='add'>+			get_node_active_region(start_pfn, &amp;node_ar);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		sparse_memory_present_with_active_regions(nid);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	for_each_online_node(nid)</div><div class='add'>+		sparse_memory_present_with_active_regions(nid);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __init paging_init(void)</div><div class='head'>diff --git a/arch/powerpc/mm/pgtable_32.c b/arch/powerpc/mm/pgtable_32.c<br/>index 2001abdb1912..c31d6d26f0b5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/mm/pgtable_32.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/mm/pgtable_32.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/mm/pgtable_32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/mm/pgtable_32.c</a></div><div class='hunk'>@@ -73,7 +73,7 @@ extern unsigned long p_mapped_by_tlbcam(unsigned long pa);</div><div class='ctx'> #endif /* HAVE_TLBCAM */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PTE_64BIT</div><div class='del'>-/* 44x uses an 8kB pgdir because it has 8-byte Linux PTEs. */</div><div class='add'>+/* Some processors use an 8kB pgdir because they have 8-byte Linux PTEs. */</div><div class='ctx'> #define PGDIR_ORDER	1</div><div class='ctx'> #else</div><div class='ctx'> #define PGDIR_ORDER	0</div><div class='hunk'>@@ -288,7 +288,7 @@ int map_page(unsigned long va, phys_addr_t pa, int flags)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Map in all of physical memory starting at KERNELBASE.</div><div class='add'>+ * Map in a big chunk of physical memory starting at KERNELBASE.</div><div class='ctx'>  */</div><div class='ctx'> void __init mapin_ram(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/powerpc/mm/tlb_32.c b/arch/powerpc/mm/tlb_32.c<br/>index eb4b512d65fa..f9a47fee3927 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/mm/tlb_32.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/mm/tlb_32.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/mm/tlb_32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/mm/tlb_32.c</a></div><div class='hunk'>@@ -45,6 +45,7 @@ void flush_hash_entry(struct mm_struct *mm, pte_t *ptep, unsigned long addr)</div><div class='ctx'> 		flush_hash_pages(mm-&gt;context.id, addr, ptephys, 1);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(flush_hash_entry);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Called by ptep_set_access_flags, must flush on CPUs for which the</div><div class='head'>diff --git a/arch/powerpc/oprofile/cell/vma_map.c b/arch/powerpc/oprofile/cell/vma_map.c<br/>index fff66662d021..258fa4411e9e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/oprofile/cell/vma_map.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/oprofile/cell/vma_map.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/oprofile/cell/vma_map.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/oprofile/cell/vma_map.c</a></div><div class='hunk'>@@ -229,7 +229,7 @@ struct vma_to_fileoffset_map *create_vma_map(const struct spu *aSpu,</div><div class='ctx'> 	 */</div><div class='ctx'> 	overlay_tbl_offset = vma_map_lookup(map, ovly_table_sym,</div><div class='ctx'> 					    aSpu, &amp;grd_val);</div><div class='del'>-	if (overlay_tbl_offset &lt; 0) {</div><div class='add'>+	if (overlay_tbl_offset &gt; 0x10000000) {</div><div class='ctx'> 		printk(KERN_ERR "SPU_PROF: "</div><div class='ctx'> 		       "%s, line %d: Error finding SPU overlay table\n",</div><div class='ctx'> 		       __func__, __LINE__);</div><div class='head'>diff --git a/arch/powerpc/oprofile/op_model_power4.c b/arch/powerpc/oprofile/op_model_power4.c<br/>index 446a8bbb847b..3e3d91f536e0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/oprofile/op_model_power4.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/oprofile/op_model_power4.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/oprofile/op_model_power4.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/oprofile/op_model_power4.c</a></div><div class='hunk'>@@ -64,7 +64,7 @@ static int power4_reg_setup(struct op_counter_config *ctr,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-extern void ppc64_enable_pmcs(void);</div><div class='add'>+extern void ppc_enable_pmcs(void);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Older CPUs require the MMCRA sample bit to be always set, but newer </div><div class='hunk'>@@ -91,7 +91,7 @@ static int power4_cpu_setup(struct op_counter_config *ctr)</div><div class='ctx'> 	unsigned int mmcr0 = mmcr0_val;</div><div class='ctx'> 	unsigned long mmcra = mmcra_val;</div><div class='ctx'> </div><div class='del'>-	ppc64_enable_pmcs();</div><div class='add'>+	ppc_enable_pmcs();</div><div class='ctx'> </div><div class='ctx'> 	/* set the freeze bit */</div><div class='ctx'> 	mmcr0 |= MMCR0_FC;</div><div class='head'>diff --git a/arch/powerpc/platforms/44x/Kconfig b/arch/powerpc/platforms/44x/Kconfig<br/>index 249ba01c6674..79c1154f88d4 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/44x/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/platforms/44x/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/44x/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/44x/Kconfig</a></div><div class='hunk'>@@ -2,6 +2,7 @@ config BAMBOO</div><div class='ctx'> 	bool "Bamboo"</div><div class='ctx'> 	depends on 44x</div><div class='ctx'> 	default n</div><div class='add'>+	select PPC44x_SIMPLE</div><div class='ctx'> 	select 440EP</div><div class='ctx'> 	select PCI</div><div class='ctx'> 	help</div><div class='hunk'>@@ -30,6 +31,7 @@ config SEQUOIA</div><div class='ctx'> 	bool "Sequoia"</div><div class='ctx'> 	depends on 44x</div><div class='ctx'> 	default n</div><div class='add'>+	select PPC44x_SIMPLE</div><div class='ctx'> 	select 440EPX</div><div class='ctx'> 	help</div><div class='ctx'> 	  This option enables support for the AMCC PPC440EPX evaluation board.</div><div class='hunk'>@@ -38,6 +40,7 @@ config TAISHAN</div><div class='ctx'> 	bool "Taishan"</div><div class='ctx'> 	depends on 44x</div><div class='ctx'> 	default n</div><div class='add'>+	select PPC44x_SIMPLE</div><div class='ctx'> 	select 440GX</div><div class='ctx'> 	select PCI</div><div class='ctx'> 	help</div><div class='hunk'>@@ -48,6 +51,7 @@ config KATMAI</div><div class='ctx'> 	bool "Katmai"</div><div class='ctx'> 	depends on 44x</div><div class='ctx'> 	default n</div><div class='add'>+	select PPC44x_SIMPLE</div><div class='ctx'> 	select 440SPe</div><div class='ctx'> 	select PCI</div><div class='ctx'> 	select PPC4xx_PCI_EXPRESS</div><div class='hunk'>@@ -58,6 +62,7 @@ config RAINIER</div><div class='ctx'> 	bool "Rainier"</div><div class='ctx'> 	depends on 44x</div><div class='ctx'> 	default n</div><div class='add'>+	select PPC44x_SIMPLE</div><div class='ctx'> 	select 440GRX</div><div class='ctx'> 	select PCI</div><div class='ctx'> 	help</div><div class='hunk'>@@ -76,20 +81,48 @@ config WARP</div><div class='ctx'> 	  See http://www.pikatechnologies.com/ and follow the "PIKA for Computer</div><div class='ctx'> 	  Telephony Developers" link for more information.</div><div class='ctx'> </div><div class='add'>+config ARCHES</div><div class='add'>+	bool "Arches"</div><div class='add'>+	depends on 44x</div><div class='add'>+	default n</div><div class='add'>+	select PPC44x_SIMPLE</div><div class='add'>+	select 460EX # Odd since it uses 460GT but the effects are the same</div><div class='add'>+	select PCI</div><div class='add'>+	select PPC4xx_PCI_EXPRESS</div><div class='add'>+	help</div><div class='add'>+	  This option enables support for the AMCC Dual PPC460GT evaluation board.</div><div class='add'>+</div><div class='ctx'> config CANYONLANDS</div><div class='ctx'> 	bool "Canyonlands"</div><div class='ctx'> 	depends on 44x</div><div class='ctx'> 	default n</div><div class='add'>+	select PPC44x_SIMPLE</div><div class='ctx'> 	select 460EX</div><div class='ctx'> 	select PCI</div><div class='ctx'> 	select PPC4xx_PCI_EXPRESS</div><div class='add'>+	select IBM_NEW_EMAC_RGMII</div><div class='add'>+	select IBM_NEW_EMAC_ZMII</div><div class='ctx'> 	help</div><div class='ctx'> 	  This option enables support for the AMCC PPC460EX evaluation board.</div><div class='ctx'> </div><div class='add'>+config GLACIER</div><div class='add'>+	bool "Glacier"</div><div class='add'>+	depends on 44x</div><div class='add'>+	default n</div><div class='add'>+	select PPC44x_SIMPLE</div><div class='add'>+	select 460EX # Odd since it uses 460GT but the effects are the same</div><div class='add'>+	select PCI</div><div class='add'>+	select PPC4xx_PCI_EXPRESS</div><div class='add'>+	select IBM_NEW_EMAC_RGMII</div><div class='add'>+	select IBM_NEW_EMAC_ZMII</div><div class='add'>+	help</div><div class='add'>+	  This option enables support for the AMCC PPC460GT evaluation board.</div><div class='add'>+</div><div class='ctx'> config YOSEMITE</div><div class='ctx'> 	bool "Yosemite"</div><div class='ctx'> 	depends on 44x</div><div class='ctx'> 	default n</div><div class='add'>+	select PPC44x_SIMPLE</div><div class='ctx'> 	select 440EP</div><div class='ctx'> 	select PCI</div><div class='ctx'> 	help</div><div class='hunk'>@@ -127,6 +160,13 @@ config XILINX_VIRTEX440_GENERIC_BOARD</div><div class='ctx'> 	  Most Virtex 5 designs should use this unless it needs to do some</div><div class='ctx'> 	  special configuration at board probe time.</div><div class='ctx'> </div><div class='add'>+config PPC44x_SIMPLE</div><div class='add'>+	bool "Simple PowerPC 44x board support"</div><div class='add'>+	depends on 44x</div><div class='add'>+	default n</div><div class='add'>+	help</div><div class='add'>+	  This option enables the simple PowerPC 44x platform support.</div><div class='add'>+</div><div class='ctx'> # 44x specific CPU modules, selected based on the board above.</div><div class='ctx'> config 440EP</div><div class='ctx'> 	bool</div><div class='hunk'>@@ -170,8 +210,6 @@ config 460EX</div><div class='ctx'> 	bool</div><div class='ctx'> 	select PPC_FPU</div><div class='ctx'> 	select IBM_NEW_EMAC_EMAC4</div><div class='del'>-	select IBM_NEW_EMAC_RGMII</div><div class='del'>-	select IBM_NEW_EMAC_ZMII</div><div class='ctx'> 	select IBM_NEW_EMAC_TAH</div><div class='ctx'> </div><div class='ctx'> # 44x errata/workaround config symbols, selected by the CPU models above</div><div class='head'>diff --git a/arch/powerpc/platforms/44x/Makefile b/arch/powerpc/platforms/44x/Makefile<br/>index 8d0b1a192d62..698133180aee 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/44x/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/platforms/44x/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/44x/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/44x/Makefile</a></div><div class='hunk'>@@ -1,13 +1,7 @@</div><div class='ctx'> obj-$(CONFIG_44x)	:= misc_44x.o idle.o</div><div class='add'>+obj-$(CONFIG_PPC44x_SIMPLE) += ppc44x_simple.o</div><div class='ctx'> obj-$(CONFIG_EBONY)	+= ebony.o</div><div class='del'>-obj-$(CONFIG_TAISHAN)	+= taishan.o</div><div class='del'>-obj-$(CONFIG_BAMBOO)	+= bamboo.o</div><div class='del'>-obj-$(CONFIG_YOSEMITE)	+= bamboo.o</div><div class='ctx'> obj-$(CONFIG_SAM440EP) 	+= sam440ep.o</div><div class='del'>-obj-$(CONFIG_SEQUOIA)	+= sequoia.o</div><div class='del'>-obj-$(CONFIG_KATMAI)	+= katmai.o</div><div class='del'>-obj-$(CONFIG_RAINIER)	+= rainier.o</div><div class='ctx'> obj-$(CONFIG_WARP)	+= warp.o</div><div class='ctx'> obj-$(CONFIG_WARP)	+= warp-nand.o</div><div class='del'>-obj-$(CONFIG_CANYONLANDS) += canyonlands.o</div><div class='ctx'> obj-$(CONFIG_XILINX_VIRTEX_5_FXT) += virtex.o</div><div class='head'>diff --git a/arch/powerpc/platforms/44x/bamboo.c b/arch/powerpc/platforms/44x/bamboo.c<br/>deleted file mode 100644<br/>index cef169e95156..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/44x/bamboo.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/platforms/44x/bamboo.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,62 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Bamboo board specific routines</div><div class='del'>- *</div><div class='del'>- * Wade Farnsworth &lt;wfarnsworth@mvista.com&gt;</div><div class='del'>- * Copyright 2004 MontaVista Software Inc.</div><div class='del'>- *</div><div class='del'>- * Rewritten and ported to the merged powerpc tree:</div><div class='del'>- * Josh Boyer &lt;jwboyer@linux.vnet.ibm.com&gt;</div><div class='del'>- * Copyright 2007 IBM Corporation</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute  it and/or modify it</div><div class='del'>- * under  the terms of  the GNU General  Public License as published by the</div><div class='del'>- * Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='del'>- * option) any later version.</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/of_platform.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/machdep.h&gt;</div><div class='del'>-#include &lt;asm/prom.h&gt;</div><div class='del'>-#include &lt;asm/udbg.h&gt;</div><div class='del'>-#include &lt;asm/time.h&gt;</div><div class='del'>-#include &lt;asm/uic.h&gt;</div><div class='del'>-#include &lt;asm/pci-bridge.h&gt;</div><div class='del'>-#include &lt;asm/ppc4xx.h&gt;</div><div class='del'>-</div><div class='del'>-static __initdata struct of_device_id bamboo_of_bus[] = {</div><div class='del'>-	{ .compatible = "ibm,plb4", },</div><div class='del'>-	{ .compatible = "ibm,opb", },</div><div class='del'>-	{ .compatible = "ibm,ebc", },</div><div class='del'>-	{},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init bamboo_device_probe(void)</div><div class='del'>-{</div><div class='del'>-	of_platform_bus_probe(NULL, bamboo_of_bus, NULL);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-machine_device_initcall(bamboo, bamboo_device_probe);</div><div class='del'>-</div><div class='del'>-static int __init bamboo_probe(void)</div><div class='del'>-{</div><div class='del'>-	unsigned long root = of_get_flat_dt_root();</div><div class='del'>-</div><div class='del'>-	if (!of_flat_dt_is_compatible(root, "amcc,bamboo"))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	ppc_pci_flags = PPC_PCI_REASSIGN_ALL_RSRC;</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-define_machine(bamboo) {</div><div class='del'>-	.name 			= "Bamboo",</div><div class='del'>-	.probe 			= bamboo_probe,</div><div class='del'>-	.progress 		= udbg_progress,</div><div class='del'>-	.init_IRQ 		= uic_init_tree,</div><div class='del'>-	.get_irq 		= uic_get_irq,</div><div class='del'>-	.restart		= ppc4xx_reset_system,</div><div class='del'>-	.calibrate_decr 	= generic_calibrate_decr,</div><div class='del'>-};</div><div class='head'>diff --git a/arch/powerpc/platforms/44x/canyonlands.c b/arch/powerpc/platforms/44x/canyonlands.c<br/>deleted file mode 100644<br/>index 3949289f51df..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/44x/canyonlands.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/platforms/44x/canyonlands.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,63 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Canyonlands board specific routines</div><div class='del'>- *</div><div class='del'>- * Copyright 2008 DENX Software Engineering, Stefan Roese &lt;sr@denx.de&gt;</div><div class='del'>- *</div><div class='del'>- * Based on the Katmai code by</div><div class='del'>- * Benjamin Herrenschmidt &lt;benh@kernel.crashing.org&gt;</div><div class='del'>- * Copyright 2007 IBM Corp.</div><div class='del'>- * Josh Boyer &lt;jwboyer@linux.vnet.ibm.com&gt;</div><div class='del'>- * Copyright 2007 IBM Corporation</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute  it and/or modify it</div><div class='del'>- * under  the terms of  the GNU General  Public License as published by the</div><div class='del'>- * Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='del'>- * option) any later version.</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/of_platform.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/machdep.h&gt;</div><div class='del'>-#include &lt;asm/prom.h&gt;</div><div class='del'>-#include &lt;asm/udbg.h&gt;</div><div class='del'>-#include &lt;asm/time.h&gt;</div><div class='del'>-#include &lt;asm/uic.h&gt;</div><div class='del'>-#include &lt;asm/pci-bridge.h&gt;</div><div class='del'>-#include &lt;asm/ppc4xx.h&gt;</div><div class='del'>-</div><div class='del'>-static __initdata struct of_device_id canyonlands_of_bus[] = {</div><div class='del'>-	{ .compatible = "ibm,plb4", },</div><div class='del'>-	{ .compatible = "ibm,opb", },</div><div class='del'>-	{ .compatible = "ibm,ebc", },</div><div class='del'>-	{},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init canyonlands_device_probe(void)</div><div class='del'>-{</div><div class='del'>-	of_platform_bus_probe(NULL, canyonlands_of_bus, NULL);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-machine_device_initcall(canyonlands, canyonlands_device_probe);</div><div class='del'>-</div><div class='del'>-static int __init canyonlands_probe(void)</div><div class='del'>-{</div><div class='del'>-	unsigned long root = of_get_flat_dt_root();</div><div class='del'>-</div><div class='del'>-	if (!of_flat_dt_is_compatible(root, "amcc,canyonlands"))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	ppc_pci_flags = PPC_PCI_REASSIGN_ALL_RSRC;</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-define_machine(canyonlands) {</div><div class='del'>-	.name 				= "Canyonlands",</div><div class='del'>-	.probe 				= canyonlands_probe,</div><div class='del'>-	.progress 			= udbg_progress,</div><div class='del'>-	.init_IRQ 			= uic_init_tree,</div><div class='del'>-	.get_irq 			= uic_get_irq,</div><div class='del'>-	.restart			= ppc4xx_reset_system,</div><div class='del'>-	.calibrate_decr			= generic_calibrate_decr,</div><div class='del'>-};</div><div class='head'>diff --git a/arch/powerpc/platforms/44x/katmai.c b/arch/powerpc/platforms/44x/katmai.c<br/>deleted file mode 100644<br/>index 44f4b3a00ced..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/44x/katmai.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/platforms/44x/katmai.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,62 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Katmai board specific routines</div><div class='del'>- *</div><div class='del'>- * Benjamin Herrenschmidt &lt;benh@kernel.crashing.org&gt;</div><div class='del'>- * Copyright 2007 IBM Corp.</div><div class='del'>- *</div><div class='del'>- * Based on the Bamboo code by</div><div class='del'>- * Josh Boyer &lt;jwboyer@linux.vnet.ibm.com&gt;</div><div class='del'>- * Copyright 2007 IBM Corporation</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute  it and/or modify it</div><div class='del'>- * under  the terms of  the GNU General  Public License as published by the</div><div class='del'>- * Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='del'>- * option) any later version.</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/of_platform.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/machdep.h&gt;</div><div class='del'>-#include &lt;asm/prom.h&gt;</div><div class='del'>-#include &lt;asm/udbg.h&gt;</div><div class='del'>-#include &lt;asm/time.h&gt;</div><div class='del'>-#include &lt;asm/uic.h&gt;</div><div class='del'>-#include &lt;asm/pci-bridge.h&gt;</div><div class='del'>-#include &lt;asm/ppc4xx.h&gt;</div><div class='del'>-</div><div class='del'>-static __initdata struct of_device_id katmai_of_bus[] = {</div><div class='del'>-	{ .compatible = "ibm,plb4", },</div><div class='del'>-	{ .compatible = "ibm,opb", },</div><div class='del'>-	{ .compatible = "ibm,ebc", },</div><div class='del'>-	{},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init katmai_device_probe(void)</div><div class='del'>-{</div><div class='del'>-	of_platform_bus_probe(NULL, katmai_of_bus, NULL);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-machine_device_initcall(katmai, katmai_device_probe);</div><div class='del'>-</div><div class='del'>-static int __init katmai_probe(void)</div><div class='del'>-{</div><div class='del'>-	unsigned long root = of_get_flat_dt_root();</div><div class='del'>-</div><div class='del'>-	if (!of_flat_dt_is_compatible(root, "amcc,katmai"))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	ppc_pci_flags = PPC_PCI_REASSIGN_ALL_RSRC;</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-define_machine(katmai) {</div><div class='del'>-	.name 				= "Katmai",</div><div class='del'>-	.probe 				= katmai_probe,</div><div class='del'>-	.progress 			= udbg_progress,</div><div class='del'>-	.init_IRQ 			= uic_init_tree,</div><div class='del'>-	.get_irq 			= uic_get_irq,</div><div class='del'>-	.restart			= ppc4xx_reset_system,</div><div class='del'>-	.calibrate_decr			= generic_calibrate_decr,</div><div class='del'>-};</div><div class='head'>diff --git a/arch/powerpc/platforms/44x/ppc44x_simple.c b/arch/powerpc/platforms/44x/ppc44x_simple.c<br/>new file mode 100644<br/>index 000000000000..29671262801f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/44x/ppc44x_simple.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/44x/ppc44x_simple.c</a></div><div class='hunk'>@@ -0,0 +1,88 @@</div><div class='add'>+/*</div><div class='add'>+ * Generic PowerPC 44x platform support</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2008 IBM Corporation</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms of the GNU General Public License as published by the</div><div class='add'>+ * Free Software Foundation; version 2 of the License.</div><div class='add'>+ *</div><div class='add'>+ * This implements simple platform support for PowerPC 44x chips.  This is</div><div class='add'>+ * mostly used for eval boards or other simple and "generic" 44x boards.  If</div><div class='add'>+ * your board has custom functions or hardware, then you will likely want to</div><div class='add'>+ * implement your own board.c file to accommodate it.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;asm/machdep.h&gt;</div><div class='add'>+#include &lt;asm/pci-bridge.h&gt;</div><div class='add'>+#include &lt;asm/ppc4xx.h&gt;</div><div class='add'>+#include &lt;asm/prom.h&gt;</div><div class='add'>+#include &lt;asm/time.h&gt;</div><div class='add'>+#include &lt;asm/udbg.h&gt;</div><div class='add'>+#include &lt;asm/uic.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/of_platform.h&gt;</div><div class='add'>+</div><div class='add'>+static __initdata struct of_device_id ppc44x_of_bus[] = {</div><div class='add'>+	{ .compatible = "ibm,plb4", },</div><div class='add'>+	{ .compatible = "ibm,opb", },</div><div class='add'>+	{ .compatible = "ibm,ebc", },</div><div class='add'>+	{ .compatible = "simple-bus", },</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init ppc44x_device_probe(void)</div><div class='add'>+{</div><div class='add'>+	of_platform_bus_probe(NULL, ppc44x_of_bus, NULL);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+machine_device_initcall(ppc44x_simple, ppc44x_device_probe);</div><div class='add'>+</div><div class='add'>+/* This is the list of boards that can be supported by this simple</div><div class='add'>+ * platform code.  This does _not_ mean the boards are compatible,</div><div class='add'>+ * as they most certainly are not from a device tree perspective.</div><div class='add'>+ * However, their differences are handled by the device tree and the</div><div class='add'>+ * drivers and therefore they don't need custom board support files.</div><div class='add'>+ *</div><div class='add'>+ * Again, if your board needs to do things differently then create a</div><div class='add'>+ * board.c file for it rather than adding it to this list.</div><div class='add'>+ */</div><div class='add'>+static char *board[] __initdata = {</div><div class='add'>+	"amcc,arches",</div><div class='add'>+	"amcc,bamboo",</div><div class='add'>+	"amcc,canyonlands",</div><div class='add'>+	"amcc,glacier",</div><div class='add'>+	"ibm,ebony",</div><div class='add'>+	"amcc,katmai",</div><div class='add'>+	"amcc,rainier",</div><div class='add'>+	"amcc,sequoia",</div><div class='add'>+	"amcc,taishan",</div><div class='add'>+	"amcc,yosemite"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init ppc44x_probe(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long root = of_get_flat_dt_root();</div><div class='add'>+	int i = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(board); i++) {</div><div class='add'>+		if (of_flat_dt_is_compatible(root, board[i])) {</div><div class='add'>+			ppc_pci_flags = PPC_PCI_REASSIGN_ALL_RSRC;</div><div class='add'>+			return 1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+define_machine(ppc44x_simple) {</div><div class='add'>+	.name = "PowerPC 44x Platform",</div><div class='add'>+	.probe = ppc44x_probe,</div><div class='add'>+	.progress = udbg_progress,</div><div class='add'>+	.init_IRQ = uic_init_tree,</div><div class='add'>+	.get_irq = uic_get_irq,</div><div class='add'>+	.restart = ppc4xx_reset_system,</div><div class='add'>+	.calibrate_decr = generic_calibrate_decr,</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/platforms/44x/rainier.c b/arch/powerpc/platforms/44x/rainier.c<br/>deleted file mode 100644<br/>index 4f1ff84c4b63..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/44x/rainier.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/platforms/44x/rainier.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,62 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Rainier board specific routines</div><div class='del'>- *</div><div class='del'>- * Valentine Barshak &lt;vbarshak@ru.mvista.com&gt;</div><div class='del'>- * Copyright 2007 MontaVista Software Inc.</div><div class='del'>- *</div><div class='del'>- * Based on the Bamboo code by</div><div class='del'>- * Josh Boyer &lt;jwboyer@linux.vnet.ibm.com&gt;</div><div class='del'>- * Copyright 2007 IBM Corporation</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute  it and/or modify it</div><div class='del'>- * under  the terms of  the GNU General  Public License as published by the</div><div class='del'>- * Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='del'>- * option) any later version.</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/of_platform.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/machdep.h&gt;</div><div class='del'>-#include &lt;asm/prom.h&gt;</div><div class='del'>-#include &lt;asm/udbg.h&gt;</div><div class='del'>-#include &lt;asm/time.h&gt;</div><div class='del'>-#include &lt;asm/uic.h&gt;</div><div class='del'>-#include &lt;asm/pci-bridge.h&gt;</div><div class='del'>-#include &lt;asm/ppc4xx.h&gt;</div><div class='del'>-</div><div class='del'>-static __initdata struct of_device_id rainier_of_bus[] = {</div><div class='del'>-	{ .compatible = "ibm,plb4", },</div><div class='del'>-	{ .compatible = "ibm,opb", },</div><div class='del'>-	{ .compatible = "ibm,ebc", },</div><div class='del'>-	{},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init rainier_device_probe(void)</div><div class='del'>-{</div><div class='del'>-	of_platform_bus_probe(NULL, rainier_of_bus, NULL);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-machine_device_initcall(rainier, rainier_device_probe);</div><div class='del'>-</div><div class='del'>-static int __init rainier_probe(void)</div><div class='del'>-{</div><div class='del'>-	unsigned long root = of_get_flat_dt_root();</div><div class='del'>-</div><div class='del'>-	if (!of_flat_dt_is_compatible(root, "amcc,rainier"))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	ppc_pci_flags = PPC_PCI_REASSIGN_ALL_RSRC;</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-define_machine(rainier) {</div><div class='del'>-	.name 				= "Rainier",</div><div class='del'>-	.probe 				= rainier_probe,</div><div class='del'>-	.progress 			= udbg_progress,</div><div class='del'>-	.init_IRQ 			= uic_init_tree,</div><div class='del'>-	.get_irq 			= uic_get_irq,</div><div class='del'>-	.restart			= ppc4xx_reset_system,</div><div class='del'>-	.calibrate_decr			= generic_calibrate_decr,</div><div class='del'>-};</div><div class='head'>diff --git a/arch/powerpc/platforms/44x/sequoia.c b/arch/powerpc/platforms/44x/sequoia.c<br/>deleted file mode 100644<br/>index 49eb73daacdf..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/44x/sequoia.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/platforms/44x/sequoia.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,63 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Sequoia board specific routines</div><div class='del'>- *</div><div class='del'>- * Valentine Barshak &lt;vbarshak@ru.mvista.com&gt;</div><div class='del'>- * Copyright 2007 MontaVista Software Inc.</div><div class='del'>- *</div><div class='del'>- * Based on the Bamboo code by</div><div class='del'>- * Josh Boyer &lt;jwboyer@linux.vnet.ibm.com&gt;</div><div class='del'>- * Copyright 2007 IBM Corporation</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute  it and/or modify it</div><div class='del'>- * under  the terms of  the GNU General  Public License as published by the</div><div class='del'>- * Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='del'>- * option) any later version.</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/of_platform.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/machdep.h&gt;</div><div class='del'>-#include &lt;asm/prom.h&gt;</div><div class='del'>-#include &lt;asm/udbg.h&gt;</div><div class='del'>-#include &lt;asm/time.h&gt;</div><div class='del'>-#include &lt;asm/uic.h&gt;</div><div class='del'>-#include &lt;asm/pci-bridge.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/ppc4xx.h&gt;</div><div class='del'>-</div><div class='del'>-static __initdata struct of_device_id sequoia_of_bus[] = {</div><div class='del'>-	{ .compatible = "ibm,plb4", },</div><div class='del'>-	{ .compatible = "ibm,opb", },</div><div class='del'>-	{ .compatible = "ibm,ebc", },</div><div class='del'>-	{},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init sequoia_device_probe(void)</div><div class='del'>-{</div><div class='del'>-	of_platform_bus_probe(NULL, sequoia_of_bus, NULL);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-machine_device_initcall(sequoia, sequoia_device_probe);</div><div class='del'>-</div><div class='del'>-static int __init sequoia_probe(void)</div><div class='del'>-{</div><div class='del'>-	unsigned long root = of_get_flat_dt_root();</div><div class='del'>-</div><div class='del'>-	if (!of_flat_dt_is_compatible(root, "amcc,sequoia"))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	ppc_pci_flags = PPC_PCI_REASSIGN_ALL_RSRC;</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-define_machine(sequoia) {</div><div class='del'>-	.name 				= "Sequoia",</div><div class='del'>-	.probe 				= sequoia_probe,</div><div class='del'>-	.progress 			= udbg_progress,</div><div class='del'>-	.init_IRQ 			= uic_init_tree,</div><div class='del'>-	.get_irq 			= uic_get_irq,</div><div class='del'>-	.restart			= ppc4xx_reset_system,</div><div class='del'>-	.calibrate_decr			= generic_calibrate_decr,</div><div class='del'>-};</div><div class='head'>diff --git a/arch/powerpc/platforms/44x/taishan.c b/arch/powerpc/platforms/44x/taishan.c<br/>deleted file mode 100644<br/>index 49c78b2098b4..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/44x/taishan.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/platforms/44x/taishan.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,72 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Taishan board specific routines based off ebony.c code</div><div class='del'>- * original copyrights below</div><div class='del'>- *</div><div class='del'>- * Matt Porter &lt;mporter@kernel.crashing.org&gt;</div><div class='del'>- * Copyright 2002-2005 MontaVista Software Inc.</div><div class='del'>- *</div><div class='del'>- * Eugene Surovegin &lt;eugene.surovegin@zultys.com&gt; or &lt;ebs@ebshome.net&gt;</div><div class='del'>- * Copyright (c) 2003-2005 Zultys Technologies</div><div class='del'>- *</div><div class='del'>- * Rewritten and ported to the merged powerpc tree:</div><div class='del'>- * Copyright 2007 David Gibson &lt;dwg@au1.ibm.com&gt;, IBM Corporation.</div><div class='del'>- *</div><div class='del'>- * Modified from ebony.c for taishan:</div><div class='del'>- * Copyright 2007 Hugh Blemings &lt;hugh@au.ibm.com&gt;, IBM Corporation.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute  it and/or modify it</div><div class='del'>- * under  the terms of  the GNU General  Public License as published by the</div><div class='del'>- * Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='del'>- * option) any later version.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/of_platform.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/machdep.h&gt;</div><div class='del'>-#include &lt;asm/prom.h&gt;</div><div class='del'>-#include &lt;asm/udbg.h&gt;</div><div class='del'>-#include &lt;asm/time.h&gt;</div><div class='del'>-#include &lt;asm/uic.h&gt;</div><div class='del'>-#include &lt;asm/pci-bridge.h&gt;</div><div class='del'>-#include &lt;asm/ppc4xx.h&gt;</div><div class='del'>-</div><div class='del'>-static __initdata struct of_device_id taishan_of_bus[] = {</div><div class='del'>-	{ .compatible = "ibm,plb4", },</div><div class='del'>-	{ .compatible = "ibm,opb", },</div><div class='del'>-	{ .compatible = "ibm,ebc", },</div><div class='del'>-	{},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init taishan_device_probe(void)</div><div class='del'>-{</div><div class='del'>-	of_platform_bus_probe(NULL, taishan_of_bus, NULL);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-machine_device_initcall(taishan, taishan_device_probe);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Called very early, MMU is off, device-tree isn't unflattened</div><div class='del'>- */</div><div class='del'>-static int __init taishan_probe(void)</div><div class='del'>-{</div><div class='del'>-	unsigned long root = of_get_flat_dt_root();</div><div class='del'>-</div><div class='del'>-	if (!of_flat_dt_is_compatible(root, "amcc,taishan"))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	ppc_pci_flags = PPC_PCI_REASSIGN_ALL_RSRC;</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-define_machine(taishan) {</div><div class='del'>-	.name			= "Taishan",</div><div class='del'>-	.probe			= taishan_probe,</div><div class='del'>-	.progress		= udbg_progress,</div><div class='del'>-	.init_IRQ		= uic_init_tree,</div><div class='del'>-	.get_irq		= uic_get_irq,</div><div class='del'>-	.restart		= ppc4xx_reset_system,</div><div class='del'>-	.calibrate_decr		= generic_calibrate_decr,</div><div class='del'>-};</div><div class='head'>diff --git a/arch/powerpc/platforms/512x/Kconfig b/arch/powerpc/platforms/512x/Kconfig<br/>index c62f893ede19..326852c78b8f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/512x/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/platforms/512x/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/512x/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/512x/Kconfig</a></div><div class='hunk'>@@ -3,6 +3,8 @@ config PPC_MPC512x</div><div class='ctx'> 	select FSL_SOC</div><div class='ctx'> 	select IPIC</div><div class='ctx'> 	select PPC_CLOCK</div><div class='add'>+	select PPC_PCI_CHOICE</div><div class='add'>+	select FSL_PCI if PCI</div><div class='ctx'> </div><div class='ctx'> config PPC_MPC5121</div><div class='ctx'> 	bool</div><div class='head'>diff --git a/arch/powerpc/platforms/512x/mpc5121_ads.c b/arch/powerpc/platforms/512x/mpc5121_ads.c<br/>index 5ebf6939a697..441abc488851 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/512x/mpc5121_ads.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/platforms/512x/mpc5121_ads.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/512x/mpc5121_ads.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/512x/mpc5121_ads.c</a></div><div class='hunk'>@@ -22,16 +22,26 @@</div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='ctx'> #include &lt;asm/time.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;sysdev/fsl_pci.h&gt;</div><div class='add'>+</div><div class='ctx'> #include "mpc512x.h"</div><div class='ctx'> #include "mpc5121_ads.h"</div><div class='ctx'> </div><div class='ctx'> static void __init mpc5121_ads_setup_arch(void)</div><div class='ctx'> {</div><div class='add'>+#ifdef CONFIG_PCI</div><div class='add'>+	struct device_node *np;</div><div class='add'>+#endif</div><div class='ctx'> 	printk(KERN_INFO "MPC5121 ADS board from Freescale Semiconductor\n");</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * cpld regs are needed early</div><div class='ctx'> 	 */</div><div class='ctx'> 	mpc5121_ads_cpld_map();</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PCI</div><div class='add'>+	for_each_compatible_node(np, "pci", "fsl,mpc5121-pci")</div><div class='add'>+		mpc83xx_add_bridge(np);</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __init mpc5121_ads_init_IRQ(void)</div><div class='head'>diff --git a/arch/powerpc/platforms/52xx/mpc52xx_common.c b/arch/powerpc/platforms/52xx/mpc52xx_common.c<br/>index 4d5fd1dbd400..044b4e6e8743 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/52xx/mpc52xx_common.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/platforms/52xx/mpc52xx_common.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/52xx/mpc52xx_common.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/52xx/mpc52xx_common.c</a></div><div class='hunk'>@@ -90,7 +90,7 @@ mpc5200_setup_xlb_arbiter(void)</div><div class='ctx'> 	of_node_put(np);</div><div class='ctx'> 	if (!xlb) {</div><div class='ctx'> 		printk(KERN_ERR __FILE__ ": "</div><div class='del'>-			"Error mapping XLB in mpc52xx_setup_cpu().  "</div><div class='add'>+			"Error mapping XLB in mpc52xx_setup_cpu(). "</div><div class='ctx'> 			"Expect some abnormal behavior\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -216,7 +216,8 @@ mpc52xx_restart(char *cmd)</div><div class='ctx'> 		out_be32(&amp;mpc52xx_wdt-&gt;count, 0x000000ff);</div><div class='ctx'> 		out_be32(&amp;mpc52xx_wdt-&gt;mode, 0x00009004);</div><div class='ctx'> 	} else</div><div class='del'>-		printk("mpc52xx_restart: Can't access wdt. "</div><div class='add'>+		printk(KERN_ERR __FILE__ ": "</div><div class='add'>+			"mpc52xx_restart: Can't access wdt. "</div><div class='ctx'> 			"Restart impossible, system halted.\n");</div><div class='ctx'> </div><div class='ctx'> 	while (1);</div><div class='head'>diff --git a/arch/powerpc/platforms/52xx/mpc52xx_pci.c b/arch/powerpc/platforms/52xx/mpc52xx_pci.c<br/>index 5a382bb15f62..b49a18527661 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/52xx/mpc52xx_pci.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/platforms/52xx/mpc52xx_pci.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/52xx/mpc52xx_pci.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/52xx/mpc52xx_pci.c</a></div><div class='hunk'>@@ -265,8 +265,11 @@ mpc52xx_pci_setup(struct pci_controller *hose,</div><div class='ctx'> 	/* Memory windows */</div><div class='ctx'> 	res = &amp;hose-&gt;mem_resources[0];</div><div class='ctx'> 	if (res-&gt;flags) {</div><div class='del'>-		pr_debug("mem_resource[0] = {.start=%x, .end=%x, .flags=%lx}\n",</div><div class='del'>-		         res-&gt;start, res-&gt;end, res-&gt;flags);</div><div class='add'>+		pr_debug("mem_resource[0] = "</div><div class='add'>+		         "{.start=%llx, .end=%llx, .flags=%llx}\n",</div><div class='add'>+		         (unsigned long long)res-&gt;start,</div><div class='add'>+			 (unsigned long long)res-&gt;end,</div><div class='add'>+			 (unsigned long long)res-&gt;flags);</div><div class='ctx'> 		out_be32(&amp;pci_regs-&gt;iw0btar,</div><div class='ctx'> 		         MPC52xx_PCI_IWBTAR_TRANSLATION(res-&gt;start, res-&gt;start,</div><div class='ctx'> 		                  res-&gt;end - res-&gt;start + 1));</div><div class='hunk'>@@ -297,9 +300,11 @@ mpc52xx_pci_setup(struct pci_controller *hose,</div><div class='ctx'> 		printk(KERN_ERR "%s: Didn't find IO resources\n", __FILE__);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='del'>-	pr_debug(".io_resource={.start=%x,.end=%x,.flags=%lx} "</div><div class='add'>+	pr_debug(".io_resource={.start=%llx,.end=%llx,.flags=%llx} "</div><div class='ctx'> 	         ".io_base_phys=0x%p\n",</div><div class='del'>-	         res-&gt;start, res-&gt;end, res-&gt;flags, (void*)hose-&gt;io_base_phys);</div><div class='add'>+	         (unsigned long long)res-&gt;start,</div><div class='add'>+		 (unsigned long long)res-&gt;end,</div><div class='add'>+		 (unsigned long long)res-&gt;flags, (void*)hose-&gt;io_base_phys);</div><div class='ctx'> 	out_be32(&amp;pci_regs-&gt;iw2btar,</div><div class='ctx'> 	         MPC52xx_PCI_IWBTAR_TRANSLATION(hose-&gt;io_base_phys,</div><div class='ctx'> 	                                        res-&gt;start,</div><div class='head'>diff --git a/arch/powerpc/platforms/82xx/Kconfig b/arch/powerpc/platforms/82xx/Kconfig<br/>index 75eb1ede5497..30f008b2f92e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/82xx/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/platforms/82xx/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/82xx/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/82xx/Kconfig</a></div><div class='hunk'>@@ -38,6 +38,14 @@ config EP8248E</div><div class='ctx'> 	  This board is also resold by Freescale as the QUICCStart</div><div class='ctx'> 	  MPC8248 Evaluation System and/or the CWH-PPC-8248N-VE.</div><div class='ctx'> </div><div class='add'>+config MGCOGE</div><div class='add'>+	bool "Keymile MGCOGE"</div><div class='add'>+	select 8272</div><div class='add'>+	select 8260</div><div class='add'>+	select FSL_SOC</div><div class='add'>+	help</div><div class='add'>+	  This enables support for the Keymile MGCOGE board.</div><div class='add'>+</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='ctx'> config PQ2ADS</div><div class='head'>diff --git a/arch/powerpc/platforms/82xx/Makefile b/arch/powerpc/platforms/82xx/Makefile<br/>index 6cd5cd59bf2a..d982793f4dbd 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/82xx/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/platforms/82xx/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/82xx/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/82xx/Makefile</a></div><div class='hunk'>@@ -6,3 +6,4 @@ obj-$(CONFIG_CPM2) += pq2.o</div><div class='ctx'> obj-$(CONFIG_PQ2_ADS_PCI_PIC) += pq2ads-pci-pic.o</div><div class='ctx'> obj-$(CONFIG_PQ2FADS) += pq2fads.o</div><div class='ctx'> obj-$(CONFIG_EP8248E) += ep8248e.o</div><div class='add'>+obj-$(CONFIG_MGCOGE) += mgcoge.o</div><div class='head'>diff --git a/arch/powerpc/platforms/82xx/ep8248e.c b/arch/powerpc/platforms/82xx/ep8248e.c<br/>index d5770fdf7f09..0eb6d7f62241 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/82xx/ep8248e.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/platforms/82xx/ep8248e.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/82xx/ep8248e.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/82xx/ep8248e.c</a></div><div class='hunk'>@@ -137,7 +137,7 @@ static int __devinit ep8248e_mdio_probe(struct of_device *ofdev,</div><div class='ctx'> 		bus-&gt;irq[i] = -1;</div><div class='ctx'> </div><div class='ctx'> 	bus-&gt;name = "ep8248e-mdio-bitbang";</div><div class='del'>-	bus-&gt;dev = &amp;ofdev-&gt;dev;</div><div class='add'>+	bus-&gt;parent = &amp;ofdev-&gt;dev;</div><div class='ctx'> 	snprintf(bus-&gt;id, MII_BUS_ID_SIZE, "%x", res.start);</div><div class='ctx'> </div><div class='ctx'> 	return mdiobus_register(bus);</div><div class='head'>diff --git a/arch/powerpc/platforms/82xx/mgcoge.c b/arch/powerpc/platforms/82xx/mgcoge.c<br/>new file mode 100644<br/>index 000000000000..c2af169c1d1d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/82xx/mgcoge.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/82xx/mgcoge.c</a></div><div class='hunk'>@@ -0,0 +1,129 @@</div><div class='add'>+/*</div><div class='add'>+ * Keymile mgcoge support</div><div class='add'>+ * Copyright 2008 DENX Software Engineering GmbH</div><div class='add'>+ * Author: Heiko Schocher &lt;hs@denx.de&gt;</div><div class='add'>+ *</div><div class='add'>+ * based on code from:</div><div class='add'>+ * Copyright 2007 Freescale Semiconductor, Inc.</div><div class='add'>+ * Author: Scott Wood &lt;scottwood@freescale.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute  it and/or modify it</div><div class='add'>+ * under  the terms of  the GNU General  Public License as published by the</div><div class='add'>+ * Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='add'>+ * option) any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/fsl_devices.h&gt;</div><div class='add'>+#include &lt;linux/of_platform.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/cpm2.h&gt;</div><div class='add'>+#include &lt;asm/udbg.h&gt;</div><div class='add'>+#include &lt;asm/machdep.h&gt;</div><div class='add'>+#include &lt;asm/time.h&gt;</div><div class='add'>+#include &lt;asm/mpc8260.h&gt;</div><div class='add'>+#include &lt;asm/prom.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;sysdev/fsl_soc.h&gt;</div><div class='add'>+#include &lt;sysdev/cpm2_pic.h&gt;</div><div class='add'>+</div><div class='add'>+#include "pq2.h"</div><div class='add'>+</div><div class='add'>+static void __init mgcoge_pic_init(void)</div><div class='add'>+{</div><div class='add'>+	struct device_node *np = of_find_compatible_node(NULL, NULL, "fsl,pq2-pic");</div><div class='add'>+	if (!np) {</div><div class='add'>+		printk(KERN_ERR "PIC init: can not find cpm-pic node\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cpm2_pic_init(np);</div><div class='add'>+	of_node_put(np);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct cpm_pin {</div><div class='add'>+	int port, pin, flags;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static __initdata struct cpm_pin mgcoge_pins[] = {</div><div class='add'>+</div><div class='add'>+	/* SMC2 */</div><div class='add'>+	{1, 8, CPM_PIN_INPUT | CPM_PIN_PRIMARY},</div><div class='add'>+	{1, 9, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},</div><div class='add'>+</div><div class='add'>+	/* SCC4 */</div><div class='add'>+	{3, 25, CPM_PIN_INPUT | CPM_PIN_PRIMARY},</div><div class='add'>+	{3, 24, CPM_PIN_INPUT | CPM_PIN_PRIMARY},</div><div class='add'>+	{3,  9, CPM_PIN_INPUT | CPM_PIN_PRIMARY},</div><div class='add'>+	{3,  8, CPM_PIN_INPUT | CPM_PIN_PRIMARY},</div><div class='add'>+	{4, 22, CPM_PIN_INPUT | CPM_PIN_PRIMARY},</div><div class='add'>+	{4, 21, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init init_ioports(void)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(mgcoge_pins); i++) {</div><div class='add'>+		const struct cpm_pin *pin = &amp;mgcoge_pins[i];</div><div class='add'>+		cpm2_set_pin(pin-&gt;port - 1, pin-&gt;pin, pin-&gt;flags);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cpm2_smc_clk_setup(CPM_CLK_SMC2, CPM_BRG8);</div><div class='add'>+	cpm2_clk_setup(CPM_CLK_SCC4, CPM_CLK7, CPM_CLK_RX);</div><div class='add'>+	cpm2_clk_setup(CPM_CLK_SCC4, CPM_CLK8, CPM_CLK_TX);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init mgcoge_setup_arch(void)</div><div class='add'>+{</div><div class='add'>+	if (ppc_md.progress)</div><div class='add'>+		ppc_md.progress("mgcoge_setup_arch()", 0);</div><div class='add'>+</div><div class='add'>+	cpm2_reset();</div><div class='add'>+</div><div class='add'>+	/* When this is set, snooping CPM DMA from RAM causes</div><div class='add'>+	 * machine checks.  See erratum SIU18.</div><div class='add'>+	 */</div><div class='add'>+	clrbits32(&amp;cpm2_immr-&gt;im_siu_conf.siu_82xx.sc_bcr, MPC82XX_BCR_PLDP);</div><div class='add'>+</div><div class='add'>+	init_ioports();</div><div class='add'>+</div><div class='add'>+	if (ppc_md.progress)</div><div class='add'>+		ppc_md.progress("mgcoge_setup_arch(), finish", 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static  __initdata struct of_device_id of_bus_ids[] = {</div><div class='add'>+	{ .compatible = "simple-bus", },</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init declare_of_platform_devices(void)</div><div class='add'>+{</div><div class='add'>+	of_platform_bus_probe(NULL, of_bus_ids, NULL);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+machine_device_initcall(mgcoge, declare_of_platform_devices);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Called very early, device-tree isn't unflattened</div><div class='add'>+ */</div><div class='add'>+static int __init mgcoge_probe(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long root = of_get_flat_dt_root();</div><div class='add'>+	return of_flat_dt_is_compatible(root, "keymile,mgcoge");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+define_machine(mgcoge)</div><div class='add'>+{</div><div class='add'>+	.name = "Keymile MGCOGE",</div><div class='add'>+	.probe = mgcoge_probe,</div><div class='add'>+	.setup_arch = mgcoge_setup_arch,</div><div class='add'>+	.init_IRQ = mgcoge_pic_init,</div><div class='add'>+	.get_irq = cpm2_get_irq,</div><div class='add'>+	.calibrate_decr = generic_calibrate_decr,</div><div class='add'>+	.restart = pq2_restart,</div><div class='add'>+	.progress = udbg_progress,</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/platforms/83xx/Kconfig b/arch/powerpc/platforms/83xx/Kconfig<br/>index 6159c5d4e5f1..83c664afc897 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/83xx/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/platforms/83xx/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/83xx/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/83xx/Kconfig</a></div><div class='hunk'>@@ -19,7 +19,6 @@ config MPC831x_RDB</div><div class='ctx'> config MPC832x_MDS</div><div class='ctx'> 	bool "Freescale MPC832x MDS"</div><div class='ctx'> 	select DEFAULT_UIMAGE</div><div class='del'>-	select QUICC_ENGINE</div><div class='ctx'> 	select PPC_MPC832x</div><div class='ctx'> 	help</div><div class='ctx'> 	  This option enables support for the MPC832x MDS evaluation board.</div><div class='hunk'>@@ -27,7 +26,6 @@ config MPC832x_MDS</div><div class='ctx'> config MPC832x_RDB</div><div class='ctx'> 	bool "Freescale MPC832x RDB"</div><div class='ctx'> 	select DEFAULT_UIMAGE</div><div class='del'>-	select QUICC_ENGINE</div><div class='ctx'> 	select PPC_MPC832x</div><div class='ctx'> 	help</div><div class='ctx'> 	  This option enables support for the MPC8323 RDB board.</div><div class='hunk'>@@ -57,15 +55,12 @@ config MPC834x_ITX</div><div class='ctx'> config MPC836x_MDS</div><div class='ctx'> 	bool "Freescale MPC836x MDS"</div><div class='ctx'> 	select DEFAULT_UIMAGE</div><div class='del'>-	select QUICC_ENGINE</div><div class='ctx'> 	help</div><div class='ctx'> 	  This option enables support for the MPC836x MDS Processor Board.</div><div class='ctx'> </div><div class='ctx'> config MPC836x_RDK</div><div class='ctx'> 	bool "Freescale/Logic MPC836x RDK"</div><div class='ctx'> 	select DEFAULT_UIMAGE</div><div class='del'>-	select QUICC_ENGINE</div><div class='del'>-	select QE_GPIO</div><div class='ctx'> 	select FSL_GTM</div><div class='ctx'> 	select FSL_LBC</div><div class='ctx'> 	help</div><div class='head'>diff --git a/arch/powerpc/platforms/83xx/mpc837x_mds.c b/arch/powerpc/platforms/83xx/mpc837x_mds.c<br/>index be62de23bead..8bb13c807142 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/83xx/mpc837x_mds.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/platforms/83xx/mpc837x_mds.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/83xx/mpc837x_mds.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/83xx/mpc837x_mds.c</a></div><div class='hunk'>@@ -85,8 +85,14 @@ static void __init mpc837x_mds_setup_arch(void)</div><div class='ctx'> 		ppc_md.progress("mpc837x_mds_setup_arch()", 0);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PCI</div><div class='del'>-	for_each_compatible_node(np, "pci", "fsl,mpc8349-pci")</div><div class='add'>+	for_each_compatible_node(np, "pci", "fsl,mpc8349-pci") {</div><div class='add'>+		if (!of_device_is_available(np)) {</div><div class='add'>+			pr_warning("%s: disabled by the firmware.\n",</div><div class='add'>+				   np-&gt;full_name);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='ctx'> 		mpc83xx_add_bridge(np);</div><div class='add'>+	}</div><div class='ctx'> #endif</div><div class='ctx'> 	mpc837xmds_usb_cfg();</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig<br/>index 291675b0097a..b79dc710ed34 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/85xx/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/platforms/85xx/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/85xx/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/85xx/Kconfig</a></div><div class='hunk'>@@ -33,7 +33,6 @@ config MPC85xx_CDS</div><div class='ctx'> config MPC85xx_MDS</div><div class='ctx'> 	bool "Freescale MPC85xx MDS"</div><div class='ctx'> 	select DEFAULT_UIMAGE</div><div class='del'>-	select QUICC_ENGINE</div><div class='ctx'> 	select PHYLIB</div><div class='ctx'> 	help</div><div class='ctx'> 	  This option enables support for the MPC85xx MDS board</div><div class='head'>diff --git a/arch/powerpc/platforms/85xx/mpc85xx_ads.c b/arch/powerpc/platforms/85xx/mpc85xx_ads.c<br/>index d17807a6b89a..0293e3d3580f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/85xx/mpc85xx_ads.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/platforms/85xx/mpc85xx_ads.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/85xx/mpc85xx_ads.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/85xx/mpc85xx_ads.c</a></div><div class='hunk'>@@ -213,7 +213,6 @@ static void mpc85xx_ads_show_cpuinfo(struct seq_file *m)</div><div class='ctx'> 	svid = mfspr(SPRN_SVR);</div><div class='ctx'> </div><div class='ctx'> 	seq_printf(m, "Vendor\t\t: Freescale Semiconductor\n");</div><div class='del'>-	seq_printf(m, "Machine\t\t: mpc85xx\n");</div><div class='ctx'> 	seq_printf(m, "PVR\t\t: 0x%x\n", pvid);</div><div class='ctx'> 	seq_printf(m, "SVR\t\t: 0x%x\n", svid);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/platforms/85xx/sbc8560.c b/arch/powerpc/platforms/85xx/sbc8560.c<br/>index 6509ade71668..0c9a856f66b6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/85xx/sbc8560.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/platforms/85xx/sbc8560.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/85xx/sbc8560.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/85xx/sbc8560.c</a></div><div class='hunk'>@@ -156,7 +156,7 @@ static void __init init_ioports(void)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(sbc8560_pins); i++) {</div><div class='del'>-		struct cpm_pin *pin = &amp;sbc8560_pins[i];</div><div class='add'>+		const struct cpm_pin *pin = &amp;sbc8560_pins[i];</div><div class='ctx'> 		cpm2_set_pin(pin-&gt;port, pin-&gt;pin, pin-&gt;flags);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -200,7 +200,6 @@ static void sbc8560_show_cpuinfo(struct seq_file *m)</div><div class='ctx'> 	svid = mfspr(SPRN_SVR);</div><div class='ctx'> </div><div class='ctx'> 	seq_printf(m, "Vendor\t\t: Wind River\n");</div><div class='del'>-	seq_printf(m, "Machine\t\t: SBC8560\n");</div><div class='ctx'> 	seq_printf(m, "PVR\t\t: 0x%x\n", pvid);</div><div class='ctx'> 	seq_printf(m, "SVR\t\t: 0x%x\n", svid);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/platforms/86xx/Kconfig b/arch/powerpc/platforms/86xx/Kconfig<br/>index 9355a5269431..77dd797a2580 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/86xx/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/platforms/86xx/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/86xx/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/86xx/Kconfig</a></div><div class='hunk'>@@ -31,6 +31,13 @@ config MPC8610_HPCD</div><div class='ctx'> 	help</div><div class='ctx'> 	  This option enables support for the MPC8610 HPCD board.</div><div class='ctx'> </div><div class='add'>+config GEF_SBC610</div><div class='add'>+	bool "GE Fanuc SBC610"</div><div class='add'>+	select DEFAULT_UIMAGE</div><div class='add'>+	select HAS_RAPIDIO</div><div class='add'>+	help</div><div class='add'>+	  This option enables support for GE Fanuc's SBC610.</div><div class='add'>+</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='ctx'> config MPC8641</div><div class='hunk'>@@ -39,7 +46,7 @@ config MPC8641</div><div class='ctx'> 	select FSL_PCI if PCI</div><div class='ctx'> 	select PPC_UDBG_16550</div><div class='ctx'> 	select MPIC</div><div class='del'>-	default y if MPC8641_HPCN || SBC8641D</div><div class='add'>+	default y if MPC8641_HPCN || SBC8641D || GEF_SBC610</div><div class='ctx'> </div><div class='ctx'> config MPC8610</div><div class='ctx'> 	bool</div><div class='head'>diff --git a/arch/powerpc/platforms/86xx/Makefile b/arch/powerpc/platforms/86xx/Makefile<br/>index 8fee37dec795..4a56ff619afd 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/86xx/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/platforms/86xx/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/86xx/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/86xx/Makefile</a></div><div class='hunk'>@@ -7,3 +7,4 @@ obj-$(CONFIG_SMP)		+= mpc86xx_smp.o</div><div class='ctx'> obj-$(CONFIG_MPC8641_HPCN)	+= mpc86xx_hpcn.o</div><div class='ctx'> obj-$(CONFIG_SBC8641D)		+= sbc8641d.o</div><div class='ctx'> obj-$(CONFIG_MPC8610_HPCD)	+= mpc8610_hpcd.o</div><div class='add'>+obj-$(CONFIG_GEF_SBC610)	+= gef_sbc610.o gef_pic.o</div><div class='head'>diff --git a/arch/powerpc/platforms/86xx/gef_pic.c b/arch/powerpc/platforms/86xx/gef_pic.c<br/>new file mode 100644<br/>index 000000000000..50d0a2b63809<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/86xx/gef_pic.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/86xx/gef_pic.c</a></div><div class='hunk'>@@ -0,0 +1,258 @@</div><div class='add'>+/*</div><div class='add'>+ * Interrupt handling for GE Fanuc's FPGA based PIC</div><div class='add'>+ *</div><div class='add'>+ * Author: Martyn Welch &lt;martyn.welch@gefanuc.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * 2008 (c) GE Fanuc Intelligent Platforms Embedded Systems, Inc.</div><div class='add'>+ *</div><div class='add'>+ * This file is licensed under the terms of the GNU General Public License</div><div class='add'>+ * version 2.  This program is licensed "as is" without any warranty of any</div><div class='add'>+ * kind, whether express or implied.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/stddef.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/byteorder.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/prom.h&gt;</div><div class='add'>+#include &lt;asm/irq.h&gt;</div><div class='add'>+</div><div class='add'>+#include "gef_pic.h"</div><div class='add'>+</div><div class='add'>+#define DEBUG</div><div class='add'>+#undef DEBUG</div><div class='add'>+</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+#define DBG(fmt...) do { printk(KERN_DEBUG "gef_pic: " fmt); } while (0)</div><div class='add'>+#else</div><div class='add'>+#define DBG(fmt...) do { } while (0)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define GEF_PIC_NUM_IRQS	32</div><div class='add'>+</div><div class='add'>+/* Interrupt Controller Interface Registers */</div><div class='add'>+#define GEF_PIC_INTR_STATUS	0x0000</div><div class='add'>+</div><div class='add'>+#define GEF_PIC_INTR_MASK(cpu)	(0x0010 + (0x4 * cpu))</div><div class='add'>+#define GEF_PIC_CPU0_INTR_MASK	GEF_PIC_INTR_MASK(0)</div><div class='add'>+#define GEF_PIC_CPU1_INTR_MASK	GEF_PIC_INTR_MASK(1)</div><div class='add'>+</div><div class='add'>+#define GEF_PIC_MCP_MASK(cpu)	(0x0018 + (0x4 * cpu))</div><div class='add'>+#define GEF_PIC_CPU0_MCP_MASK	GEF_PIC_MCP_MASK(0)</div><div class='add'>+#define GEF_PIC_CPU1_MCP_MASK	GEF_PIC_MCP_MASK(1)</div><div class='add'>+</div><div class='add'>+#define gef_irq_to_hw(virq)    ((unsigned int)irq_map[virq].hwirq)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static DEFINE_SPINLOCK(gef_pic_lock);</div><div class='add'>+</div><div class='add'>+static void __iomem *gef_pic_irq_reg_base;</div><div class='add'>+static struct irq_host *gef_pic_irq_host;</div><div class='add'>+static int gef_pic_cascade_irq;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Interrupt Controller Handling</div><div class='add'>+ *</div><div class='add'>+ * The interrupt controller handles interrupts for most on board interrupts,</div><div class='add'>+ * apart from PCI interrupts. For example on SBC610:</div><div class='add'>+ *</div><div class='add'>+ * 17:31 RO Reserved</div><div class='add'>+ * 16    RO PCI Express Doorbell 3 Status</div><div class='add'>+ * 15    RO PCI Express Doorbell 2 Status</div><div class='add'>+ * 14    RO PCI Express Doorbell 1 Status</div><div class='add'>+ * 13    RO PCI Express Doorbell 0 Status</div><div class='add'>+ * 12    RO Real Time Clock Interrupt Status</div><div class='add'>+ * 11    RO Temperature Interrupt Status</div><div class='add'>+ * 10    RO Temperature Critical Interrupt Status</div><div class='add'>+ * 9     RO Ethernet PHY1 Interrupt Status</div><div class='add'>+ * 8     RO Ethernet PHY3 Interrupt Status</div><div class='add'>+ * 7     RO PEX8548 Interrupt Status</div><div class='add'>+ * 6     RO Reserved</div><div class='add'>+ * 5     RO Watchdog 0 Interrupt Status</div><div class='add'>+ * 4     RO Watchdog 1 Interrupt Status</div><div class='add'>+ * 3     RO AXIS Message FIFO A Interrupt Status</div><div class='add'>+ * 2     RO AXIS Message FIFO B Interrupt Status</div><div class='add'>+ * 1     RO AXIS Message FIFO C Interrupt Status</div><div class='add'>+ * 0     RO AXIS Message FIFO D Interrupt Status</div><div class='add'>+ *</div><div class='add'>+ * Interrupts can be forwarded to one of two output lines. Nothing</div><div class='add'>+ * clever is done, so if the masks are incorrectly set, a single input</div><div class='add'>+ * interrupt could generate interrupts on both output lines!</div><div class='add'>+ *</div><div class='add'>+ * The dual lines are there to allow the chained interrupts to be easily</div><div class='add'>+ * passed into two different cores. We currently do not use this functionality</div><div class='add'>+ * in this driver.</div><div class='add'>+ *</div><div class='add'>+ * Controller can also be configured to generate Machine checks (MCP), again on</div><div class='add'>+ * two lines, to be attached to two different cores. It is suggested that these</div><div class='add'>+ * should be masked out.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+void gef_pic_cascade(unsigned int irq, struct irq_desc *desc)</div><div class='add'>+{</div><div class='add'>+	unsigned int cascade_irq;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * See if we actually have an interrupt, call generic handling code if</div><div class='add'>+	 * we do.</div><div class='add'>+	 */</div><div class='add'>+	cascade_irq = gef_pic_get_irq();</div><div class='add'>+</div><div class='add'>+	if (cascade_irq != NO_IRQ)</div><div class='add'>+		generic_handle_irq(cascade_irq);</div><div class='add'>+</div><div class='add'>+	desc-&gt;chip-&gt;eoi(irq);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void gef_pic_mask(unsigned int virq)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	unsigned int hwirq;</div><div class='add'>+	u32 mask;</div><div class='add'>+</div><div class='add'>+	hwirq = gef_irq_to_hw(virq);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;gef_pic_lock, flags);</div><div class='add'>+	mask = in_be32(gef_pic_irq_reg_base + GEF_PIC_INTR_MASK(0));</div><div class='add'>+	mask &amp;= ~(1 &lt;&lt; hwirq);</div><div class='add'>+	out_be32(gef_pic_irq_reg_base + GEF_PIC_INTR_MASK(0), mask);</div><div class='add'>+	spin_unlock_irqrestore(&amp;gef_pic_lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void gef_pic_mask_ack(unsigned int virq)</div><div class='add'>+{</div><div class='add'>+	/* Don't think we actually have to do anything to ack an interrupt,</div><div class='add'>+	 * we just need to clear down the devices interrupt and it will go away</div><div class='add'>+	 */</div><div class='add'>+	gef_pic_mask(virq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void gef_pic_unmask(unsigned int virq)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	unsigned int hwirq;</div><div class='add'>+	u32 mask;</div><div class='add'>+</div><div class='add'>+	hwirq = gef_irq_to_hw(virq);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;gef_pic_lock, flags);</div><div class='add'>+	mask = in_be32(gef_pic_irq_reg_base + GEF_PIC_INTR_MASK(0));</div><div class='add'>+	mask |= (1 &lt;&lt; hwirq);</div><div class='add'>+	out_be32(gef_pic_irq_reg_base + GEF_PIC_INTR_MASK(0), mask);</div><div class='add'>+	spin_unlock_irqrestore(&amp;gef_pic_lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct irq_chip gef_pic_chip = {</div><div class='add'>+	.typename	= "gefp",</div><div class='add'>+	.mask		= gef_pic_mask,</div><div class='add'>+	.mask_ack	= gef_pic_mask_ack,</div><div class='add'>+	.unmask		= gef_pic_unmask,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* When an interrupt is being configured, this call allows some flexibilty</div><div class='add'>+ * in deciding which irq_chip structure is used</div><div class='add'>+ */</div><div class='add'>+static int gef_pic_host_map(struct irq_host *h, unsigned int virq,</div><div class='add'>+			  irq_hw_number_t hwirq)</div><div class='add'>+{</div><div class='add'>+	/* All interrupts are LEVEL sensitive */</div><div class='add'>+	get_irq_desc(virq)-&gt;status |= IRQ_LEVEL;</div><div class='add'>+	set_irq_chip_and_handler(virq, &amp;gef_pic_chip, handle_level_irq);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gef_pic_host_xlate(struct irq_host *h, struct device_node *ct,</div><div class='add'>+			    u32 *intspec, unsigned int intsize,</div><div class='add'>+			    irq_hw_number_t *out_hwirq, unsigned int *out_flags)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	*out_hwirq = intspec[0];</div><div class='add'>+	if (intsize &gt; 1)</div><div class='add'>+		*out_flags = intspec[1];</div><div class='add'>+	else</div><div class='add'>+		*out_flags = IRQ_TYPE_LEVEL_HIGH;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct irq_host_ops gef_pic_host_ops = {</div><div class='add'>+	.map	= gef_pic_host_map,</div><div class='add'>+	.xlate	= gef_pic_host_xlate,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Initialisation of PIC, this should be called in BSP</div><div class='add'>+ */</div><div class='add'>+void __init gef_pic_init(struct device_node *np)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	/* Map the devices registers into memory */</div><div class='add'>+	gef_pic_irq_reg_base = of_iomap(np, 0);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;gef_pic_lock, flags);</div><div class='add'>+</div><div class='add'>+	/* Initialise everything as masked. */</div><div class='add'>+	out_be32(gef_pic_irq_reg_base + GEF_PIC_CPU0_INTR_MASK, 0);</div><div class='add'>+	out_be32(gef_pic_irq_reg_base + GEF_PIC_CPU1_INTR_MASK, 0);</div><div class='add'>+</div><div class='add'>+	out_be32(gef_pic_irq_reg_base + GEF_PIC_CPU0_MCP_MASK, 0);</div><div class='add'>+	out_be32(gef_pic_irq_reg_base + GEF_PIC_CPU1_MCP_MASK, 0);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;gef_pic_lock, flags);</div><div class='add'>+</div><div class='add'>+	/* Map controller */</div><div class='add'>+	gef_pic_cascade_irq = irq_of_parse_and_map(np, 0);</div><div class='add'>+	if (gef_pic_cascade_irq == NO_IRQ) {</div><div class='add'>+		printk(KERN_ERR "SBC610: failed to map cascade interrupt");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Setup an irq_host structure */</div><div class='add'>+	gef_pic_irq_host = irq_alloc_host(np, IRQ_HOST_MAP_LINEAR,</div><div class='add'>+					  GEF_PIC_NUM_IRQS,</div><div class='add'>+					  &amp;gef_pic_host_ops, NO_IRQ);</div><div class='add'>+	if (gef_pic_irq_host == NULL)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Chain with parent controller */</div><div class='add'>+	set_irq_chained_handler(gef_pic_cascade_irq, gef_pic_cascade);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This is called when we receive an interrupt with apparently comes from this</div><div class='add'>+ * chip - check, returning the highest interrupt generated or return NO_IRQ</div><div class='add'>+ */</div><div class='add'>+unsigned int gef_pic_get_irq(void)</div><div class='add'>+{</div><div class='add'>+	u32 cause, mask, active;</div><div class='add'>+	unsigned int virq = NO_IRQ;</div><div class='add'>+	int hwirq;</div><div class='add'>+</div><div class='add'>+	cause = in_be32(gef_pic_irq_reg_base + GEF_PIC_INTR_STATUS);</div><div class='add'>+</div><div class='add'>+	mask = in_be32(gef_pic_irq_reg_base + GEF_PIC_INTR_MASK(0));</div><div class='add'>+</div><div class='add'>+	active = cause &amp; mask;</div><div class='add'>+</div><div class='add'>+	if (active) {</div><div class='add'>+		for (hwirq = GEF_PIC_NUM_IRQS - 1; hwirq &gt; -1; hwirq--) {</div><div class='add'>+			if (active &amp; (0x1 &lt;&lt; hwirq))</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+		virq = irq_linear_revmap(gef_pic_irq_host,</div><div class='add'>+			(irq_hw_number_t)hwirq);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return virq;</div><div class='add'>+}</div><div class='add'>+</div><div class='head'>diff --git a/arch/powerpc/platforms/86xx/gef_pic.h b/arch/powerpc/platforms/86xx/gef_pic.h<br/>new file mode 100644<br/>index 000000000000..6149916da3f4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/86xx/gef_pic.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/86xx/gef_pic.h</a></div><div class='hunk'>@@ -0,0 +1,11 @@</div><div class='add'>+#ifndef __GEF_PIC_H__</div><div class='add'>+#define __GEF_PIC_H__</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+</div><div class='add'>+void gef_pic_cascade(unsigned int, struct irq_desc *);</div><div class='add'>+unsigned int gef_pic_get_irq(void);</div><div class='add'>+void gef_pic_init(struct device_node *);</div><div class='add'>+</div><div class='add'>+#endif /* __GEF_PIC_H__ */</div><div class='add'>+</div><div class='head'>diff --git a/arch/powerpc/platforms/86xx/gef_sbc610.c b/arch/powerpc/platforms/86xx/gef_sbc610.c<br/>new file mode 100644<br/>index 000000000000..821c45fac18b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/86xx/gef_sbc610.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/86xx/gef_sbc610.c</a></div><div class='hunk'>@@ -0,0 +1,221 @@</div><div class='add'>+/*</div><div class='add'>+ * GE Fanuc SBC610 board support</div><div class='add'>+ *</div><div class='add'>+ * Author: Martyn Welch &lt;martyn.welch@gefanuc.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2008 GE Fanuc Intelligent Platforms Embedded Systems, Inc.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute  it and/or modify it</div><div class='add'>+ * under  the terms of  the GNU General  Public License as published by the</div><div class='add'>+ * Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='add'>+ * option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * Based on: mpc86xx_hpcn.c (MPC86xx HPCN board specific routines)</div><div class='add'>+ * Copyright 2006 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * NEC fixup adapted from arch/mips/pci/fixup-lm2e.c</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/stddef.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/kdev_t.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/seq_file.h&gt;</div><div class='add'>+#include &lt;linux/of_platform.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/system.h&gt;</div><div class='add'>+#include &lt;asm/time.h&gt;</div><div class='add'>+#include &lt;asm/machdep.h&gt;</div><div class='add'>+#include &lt;asm/pci-bridge.h&gt;</div><div class='add'>+#include &lt;asm/mpc86xx.h&gt;</div><div class='add'>+#include &lt;asm/prom.h&gt;</div><div class='add'>+#include &lt;mm/mmu_decl.h&gt;</div><div class='add'>+#include &lt;asm/udbg.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/mpic.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;sysdev/fsl_pci.h&gt;</div><div class='add'>+#include &lt;sysdev/fsl_soc.h&gt;</div><div class='add'>+</div><div class='add'>+#include "mpc86xx.h"</div><div class='add'>+#include "gef_pic.h"</div><div class='add'>+</div><div class='add'>+#undef DEBUG</div><div class='add'>+</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+#define DBG (fmt...) do { printk(KERN_ERR "SBC610: " fmt); } while (0)</div><div class='add'>+#else</div><div class='add'>+#define DBG (fmt...) do { } while (0)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+void __iomem *sbc610_regs;</div><div class='add'>+</div><div class='add'>+static void __init gef_sbc610_init_irq(void)</div><div class='add'>+{</div><div class='add'>+	struct device_node *cascade_node = NULL;</div><div class='add'>+</div><div class='add'>+	mpc86xx_init_irq();</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * There is a simple interrupt handler in the main FPGA, this needs</div><div class='add'>+	 * to be cascaded into the MPIC</div><div class='add'>+	 */</div><div class='add'>+	cascade_node = of_find_compatible_node(NULL, NULL, "gef,fpga-pic");</div><div class='add'>+	if (!cascade_node) {</div><div class='add'>+		printk(KERN_WARNING "SBC610: No FPGA PIC\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	gef_pic_init(cascade_node);</div><div class='add'>+	of_node_put(cascade_node);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init gef_sbc610_setup_arch(void)</div><div class='add'>+{</div><div class='add'>+	struct device_node *regs;</div><div class='add'>+#ifdef CONFIG_PCI</div><div class='add'>+	struct device_node *np;</div><div class='add'>+</div><div class='add'>+	for_each_compatible_node(np, "pci", "fsl,mpc8641-pcie") {</div><div class='add'>+		fsl_add_bridge(np, 1);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "GE Fanuc Intelligent Platforms SBC610 6U VPX SBC\n");</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SMP</div><div class='add'>+	mpc86xx_smp_init();</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* Remap basic board registers */</div><div class='add'>+	regs = of_find_compatible_node(NULL, NULL, "gef,fpga-regs");</div><div class='add'>+	if (regs) {</div><div class='add'>+		sbc610_regs = of_iomap(regs, 0);</div><div class='add'>+		if (sbc610_regs == NULL)</div><div class='add'>+			printk(KERN_WARNING "Unable to map board registers\n");</div><div class='add'>+		of_node_put(regs);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Return the PCB revision */</div><div class='add'>+static unsigned int gef_sbc610_get_pcb_rev(void)</div><div class='add'>+{</div><div class='add'>+	unsigned int reg;</div><div class='add'>+</div><div class='add'>+	reg = ioread32(sbc610_regs);</div><div class='add'>+	return (reg &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Return the board (software) revision */</div><div class='add'>+static unsigned int gef_sbc610_get_board_rev(void)</div><div class='add'>+{</div><div class='add'>+	unsigned int reg;</div><div class='add'>+</div><div class='add'>+	reg = ioread32(sbc610_regs);</div><div class='add'>+	return (reg &gt;&gt; 16) &amp; 0xff;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Return the FPGA revision */</div><div class='add'>+static unsigned int gef_sbc610_get_fpga_rev(void)</div><div class='add'>+{</div><div class='add'>+	unsigned int reg;</div><div class='add'>+</div><div class='add'>+	reg = ioread32(sbc610_regs);</div><div class='add'>+	return (reg &gt;&gt; 24) &amp; 0xf;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void gef_sbc610_show_cpuinfo(struct seq_file *m)</div><div class='add'>+{</div><div class='add'>+	uint memsize = total_memory;</div><div class='add'>+	uint svid = mfspr(SPRN_SVR);</div><div class='add'>+</div><div class='add'>+	seq_printf(m, "Vendor\t\t: GE Fanuc Intelligent Platforms\n");</div><div class='add'>+</div><div class='add'>+	seq_printf(m, "Revision\t: %u%c\n", gef_sbc610_get_pcb_rev(),</div><div class='add'>+		('A' + gef_sbc610_get_board_rev() - 1));</div><div class='add'>+	seq_printf(m, "FPGA Revision\t: %u\n", gef_sbc610_get_fpga_rev());</div><div class='add'>+</div><div class='add'>+	seq_printf(m, "SVR\t\t: 0x%x\n", svid);</div><div class='add'>+	seq_printf(m, "Memory\t\t: %d MB\n", memsize / (1024 * 1024));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init gef_sbc610_nec_fixup(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	unsigned int val;</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "Running NEC uPD720101 Fixup\n");</div><div class='add'>+</div><div class='add'>+	/* Ensure ports 1, 2, 3, 4 &amp; 5 are enabled */</div><div class='add'>+	pci_read_config_dword(pdev, 0xe0, &amp;val);</div><div class='add'>+	pci_write_config_dword(pdev, 0xe0, (val &amp; ~7) | 0x5);</div><div class='add'>+</div><div class='add'>+	/* System clock is 48-MHz Oscillator and EHCI Enabled. */</div><div class='add'>+	pci_write_config_dword(pdev, 0xe4, 1 &lt;&lt; 5);</div><div class='add'>+}</div><div class='add'>+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NEC, PCI_DEVICE_ID_NEC_USB,</div><div class='add'>+	gef_sbc610_nec_fixup);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Called very early, device-tree isn't unflattened</div><div class='add'>+ *</div><div class='add'>+ * This function is called to determine whether the BSP is compatible with the</div><div class='add'>+ * supplied device-tree, which is assumed to be the correct one for the actual</div><div class='add'>+ * board. It is expected thati, in the future, a kernel may support multiple</div><div class='add'>+ * boards.</div><div class='add'>+ */</div><div class='add'>+static int __init gef_sbc610_probe(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long root = of_get_flat_dt_root();</div><div class='add'>+</div><div class='add'>+	if (of_flat_dt_is_compatible(root, "gef,sbc610"))</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long __init mpc86xx_time_init(void)</div><div class='add'>+{</div><div class='add'>+	unsigned int temp;</div><div class='add'>+</div><div class='add'>+	/* Set the time base to zero */</div><div class='add'>+	mtspr(SPRN_TBWL, 0);</div><div class='add'>+	mtspr(SPRN_TBWU, 0);</div><div class='add'>+</div><div class='add'>+	temp = mfspr(SPRN_HID0);</div><div class='add'>+	temp |= HID0_TBEN;</div><div class='add'>+	mtspr(SPRN_HID0, temp);</div><div class='add'>+	asm volatile("isync");</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __initdata struct of_device_id of_bus_ids[] = {</div><div class='add'>+	{ .compatible = "simple-bus", },</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init declare_of_platform_devices(void)</div><div class='add'>+{</div><div class='add'>+	printk(KERN_DEBUG "Probe platform devices\n");</div><div class='add'>+	of_platform_bus_probe(NULL, of_bus_ids, NULL);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+machine_device_initcall(gef_sbc610, declare_of_platform_devices);</div><div class='add'>+</div><div class='add'>+define_machine(gef_sbc610) {</div><div class='add'>+	.name			= "GE Fanuc SBC610",</div><div class='add'>+	.probe			= gef_sbc610_probe,</div><div class='add'>+	.setup_arch		= gef_sbc610_setup_arch,</div><div class='add'>+	.init_IRQ		= gef_sbc610_init_irq,</div><div class='add'>+	.show_cpuinfo		= gef_sbc610_show_cpuinfo,</div><div class='add'>+	.get_irq		= mpic_get_irq,</div><div class='add'>+	.restart		= fsl_rstcr_restart,</div><div class='add'>+	.time_init		= mpc86xx_time_init,</div><div class='add'>+	.calibrate_decr		= generic_calibrate_decr,</div><div class='add'>+	.progress		= udbg_progress,</div><div class='add'>+#ifdef CONFIG_PCI</div><div class='add'>+	.pcibios_fixup_bus	= fsl_pcibios_fixup_bus,</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/platforms/86xx/mpc8610_hpcd.c b/arch/powerpc/platforms/86xx/mpc8610_hpcd.c<br/>index 5eedb710896e..e8d54ac5292c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/86xx/mpc8610_hpcd.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/platforms/86xx/mpc8610_hpcd.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/86xx/mpc8610_hpcd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/86xx/mpc8610_hpcd.c</a></div><div class='hunk'>@@ -238,7 +238,6 @@ static void __init mpc86xx_hpcd_setup_arch(void)</div><div class='ctx'>         }</div><div class='ctx'> #endif</div><div class='ctx'> #if defined(CONFIG_FB_FSL_DIU) || defined(CONFIG_FB_FSL_DIU_MODULE)</div><div class='del'>-	preallocate_diu_videomemory();</div><div class='ctx'> 	diu_ops.get_pixel_format	= mpc8610hpcd_get_pixel_format;</div><div class='ctx'> 	diu_ops.set_gamma_table		= mpc8610hpcd_set_gamma_table;</div><div class='ctx'> 	diu_ops.set_monitor_port	= mpc8610hpcd_set_monitor_port;</div><div class='head'>diff --git a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c<br/>index f712d9c0991b..2672829a71dc 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/platforms/86xx/mpc86xx_hpcn.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/86xx/mpc86xx_hpcn.c</a></div><div class='hunk'>@@ -101,19 +101,11 @@ mpc86xx_hpcn_setup_arch(void)</div><div class='ctx'> static void</div><div class='ctx'> mpc86xx_hpcn_show_cpuinfo(struct seq_file *m)</div><div class='ctx'> {</div><div class='del'>-	struct device_node *root;</div><div class='ctx'> 	uint memsize = total_memory;</div><div class='del'>-	const char *model = "";</div><div class='ctx'> 	uint svid = mfspr(SPRN_SVR);</div><div class='ctx'> </div><div class='ctx'> 	seq_printf(m, "Vendor\t\t: Freescale Semiconductor\n");</div><div class='ctx'> </div><div class='del'>-	root = of_find_node_by_path("/");</div><div class='del'>-	if (root)</div><div class='del'>-		model = of_get_property(root, "model", NULL);</div><div class='del'>-	seq_printf(m, "Machine\t\t: %s\n", model);</div><div class='del'>-	of_node_put(root);</div><div class='del'>-</div><div class='ctx'> 	seq_printf(m, "SVR\t\t: 0x%x\n", svid);</div><div class='ctx'> 	seq_printf(m, "Memory\t\t: %d MB\n", memsize / (1024 * 1024));</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/platforms/86xx/sbc8641d.c b/arch/powerpc/platforms/86xx/sbc8641d.c<br/>index 00e6fad3b3ca..da677a74e2d1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/86xx/sbc8641d.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/platforms/86xx/sbc8641d.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/86xx/sbc8641d.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/86xx/sbc8641d.c</a></div><div class='hunk'>@@ -63,19 +63,11 @@ sbc8641_setup_arch(void)</div><div class='ctx'> static void</div><div class='ctx'> sbc8641_show_cpuinfo(struct seq_file *m)</div><div class='ctx'> {</div><div class='del'>-	struct device_node *root;</div><div class='ctx'> 	uint memsize = total_memory;</div><div class='del'>-	const char *model = "";</div><div class='ctx'> 	uint svid = mfspr(SPRN_SVR);</div><div class='ctx'> </div><div class='ctx'> 	seq_printf(m, "Vendor\t\t: Wind River Systems\n");</div><div class='ctx'> </div><div class='del'>-	root = of_find_node_by_path("/");</div><div class='del'>-	if (root)</div><div class='del'>-		model = of_get_property(root, "model", NULL);</div><div class='del'>-	seq_printf(m, "Machine\t\t: %s\n", model);</div><div class='del'>-	of_node_put(root);</div><div class='del'>-</div><div class='ctx'> 	seq_printf(m, "SVR\t\t: 0x%x\n", svid);</div><div class='ctx'> 	seq_printf(m, "Memory\t\t: %d MB\n", memsize / (1024 * 1024));</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/platforms/8xx/Kconfig b/arch/powerpc/platforms/8xx/Kconfig<br/>index 71d7562e190b..48a920a98e7b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/8xx/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/platforms/8xx/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/8xx/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/8xx/Kconfig</a></div><div class='hunk'>@@ -49,6 +49,12 @@ config PPC_ADDER875</div><div class='ctx'> 	  This enables support for the Analogue &amp; Micro Adder 875</div><div class='ctx'> 	  board.</div><div class='ctx'> </div><div class='add'>+config PPC_MGSUVD</div><div class='add'>+	bool "MGSUVD"</div><div class='add'>+	select CPM1</div><div class='add'>+	help</div><div class='add'>+	  This enables support for the Keymile MGSUVD board.</div><div class='add'>+</div><div class='ctx'> endchoice</div><div class='ctx'> </div><div class='ctx'> menu "Freescale Ethernet driver platform-specific options"</div><div class='head'>diff --git a/arch/powerpc/platforms/8xx/Makefile b/arch/powerpc/platforms/8xx/Makefile<br/>index 7b71d9c8fb45..bdbfd7496018 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/8xx/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/platforms/8xx/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/8xx/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/8xx/Makefile</a></div><div class='hunk'>@@ -6,3 +6,4 @@ obj-$(CONFIG_MPC885ADS)   += mpc885ads_setup.o</div><div class='ctx'> obj-$(CONFIG_MPC86XADS)   += mpc86xads_setup.o</div><div class='ctx'> obj-$(CONFIG_PPC_EP88XC)  += ep88xc.o</div><div class='ctx'> obj-$(CONFIG_PPC_ADDER875) += adder875.o</div><div class='add'>+obj-$(CONFIG_PPC_MGSUVD) += mgsuvd.o</div><div class='head'>diff --git a/arch/powerpc/platforms/8xx/mgsuvd.c b/arch/powerpc/platforms/8xx/mgsuvd.c<br/>new file mode 100644<br/>index 000000000000..ca3cb071772c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/8xx/mgsuvd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/8xx/mgsuvd.c</a></div><div class='hunk'>@@ -0,0 +1,92 @@</div><div class='add'>+/*</div><div class='add'>+ *</div><div class='add'>+ * Platform setup for the Keymile mgsuvd board</div><div class='add'>+ *</div><div class='add'>+ * Heiko Schocher &lt;hs@denx.de&gt;</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2008 DENX Software Engineering GmbH</div><div class='add'>+ *</div><div class='add'>+ * This file is licensed under the terms of the GNU General Public License</div><div class='add'>+ * version 2. This program is licensed "as is" without any warranty of any</div><div class='add'>+ * kind, whether express or implied.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/ioport.h&gt;</div><div class='add'>+#include &lt;linux/of_platform.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/machdep.h&gt;</div><div class='add'>+#include &lt;asm/processor.h&gt;</div><div class='add'>+#include &lt;asm/cpm1.h&gt;</div><div class='add'>+#include &lt;asm/prom.h&gt;</div><div class='add'>+#include &lt;asm/fs_pd.h&gt;</div><div class='add'>+</div><div class='add'>+#include "mpc8xx.h"</div><div class='add'>+</div><div class='add'>+struct cpm_pin {</div><div class='add'>+	int port, pin, flags;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static __initdata struct cpm_pin mgsuvd_pins[] = {</div><div class='add'>+	/* SMC1 */</div><div class='add'>+	{CPM_PORTB, 24, CPM_PIN_INPUT}, /* RX */</div><div class='add'>+	{CPM_PORTB, 25, CPM_PIN_INPUT | CPM_PIN_SECONDARY}, /* TX */</div><div class='add'>+</div><div class='add'>+	/* SCC3 */</div><div class='add'>+	{CPM_PORTA, 10, CPM_PIN_INPUT},</div><div class='add'>+	{CPM_PORTA, 11, CPM_PIN_INPUT},</div><div class='add'>+	{CPM_PORTA, 3, CPM_PIN_INPUT},</div><div class='add'>+	{CPM_PORTA, 2, CPM_PIN_INPUT},</div><div class='add'>+	{CPM_PORTC, 13, CPM_PIN_INPUT},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init init_ioports(void)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(mgsuvd_pins); i++) {</div><div class='add'>+		struct cpm_pin *pin = &amp;mgsuvd_pins[i];</div><div class='add'>+		cpm1_set_pin(pin-&gt;port, pin-&gt;pin, pin-&gt;flags);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	setbits16(&amp;mpc8xx_immr-&gt;im_ioport.iop_pcso, 0x300);</div><div class='add'>+	cpm1_clk_setup(CPM_CLK_SCC3, CPM_CLK5, CPM_CLK_RX);</div><div class='add'>+	cpm1_clk_setup(CPM_CLK_SCC3, CPM_CLK6, CPM_CLK_TX);</div><div class='add'>+	cpm1_clk_setup(CPM_CLK_SMC1, CPM_BRG1, CPM_CLK_RTX);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init mgsuvd_setup_arch(void)</div><div class='add'>+{</div><div class='add'>+	cpm_reset();</div><div class='add'>+	init_ioports();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __initdata struct of_device_id of_bus_ids[] = {</div><div class='add'>+	{ .compatible = "simple-bus" },</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init declare_of_platform_devices(void)</div><div class='add'>+{</div><div class='add'>+	of_platform_bus_probe(NULL, of_bus_ids, NULL);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+machine_device_initcall(mgsuvd, declare_of_platform_devices);</div><div class='add'>+</div><div class='add'>+static int __init mgsuvd_probe(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long root = of_get_flat_dt_root();</div><div class='add'>+	return of_flat_dt_is_compatible(root, "keymile,mgsuvd");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+define_machine(mgsuvd) {</div><div class='add'>+	.name           = "MGSUVD",</div><div class='add'>+	.probe          = mgsuvd_probe,</div><div class='add'>+	.setup_arch     = mgsuvd_setup_arch,</div><div class='add'>+	.init_IRQ       = mpc8xx_pics_init,</div><div class='add'>+	.get_irq        = mpc8xx_get_irq,</div><div class='add'>+	.restart        = mpc8xx_restart,</div><div class='add'>+	.calibrate_decr = mpc8xx_calibrate_decr,</div><div class='add'>+	.set_rtc_time   = mpc8xx_set_rtc_time,</div><div class='add'>+	.get_rtc_time   = mpc8xx_get_rtc_time,</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig<br/>index 4c900efa164e..47e956c871fe 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/platforms/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/Kconfig</a></div><div class='hunk'>@@ -239,7 +239,8 @@ config TAU_AVERAGE</div><div class='ctx'> 	  If in doubt, say N here.</div><div class='ctx'> </div><div class='ctx'> config QUICC_ENGINE</div><div class='del'>-	bool</div><div class='add'>+	bool "Freescale QUICC Engine (QE) Support"</div><div class='add'>+	depends on FSL_SOC</div><div class='ctx'> 	select PPC_LIB_RHEAP</div><div class='ctx'> 	select CRC32</div><div class='ctx'> 	help</div><div class='hunk'>@@ -248,6 +249,15 @@ config QUICC_ENGINE</div><div class='ctx'> 	  Selecting this option means that you wish to build a kernel</div><div class='ctx'> 	  for a machine with a QE coprocessor.</div><div class='ctx'> </div><div class='add'>+config QE_GPIO</div><div class='add'>+	bool "QE GPIO support"</div><div class='add'>+	depends on QUICC_ENGINE</div><div class='add'>+	select GENERIC_GPIO</div><div class='add'>+	select ARCH_REQUIRE_GPIOLIB</div><div class='add'>+	help</div><div class='add'>+	  Say Y here if you're going to use hardware that connects to the</div><div class='add'>+	  QE GPIOs.</div><div class='add'>+</div><div class='ctx'> config CPM2</div><div class='ctx'> 	bool "Enable support for the CPM2 (Communications Processor Module)"</div><div class='ctx'> 	depends on MPC85xx || 8260</div><div class='hunk'>@@ -293,4 +303,13 @@ config OF_RTC</div><div class='ctx'> </div><div class='ctx'> source "arch/powerpc/sysdev/bestcomm/Kconfig"</div><div class='ctx'> </div><div class='add'>+config MPC8xxx_GPIO</div><div class='add'>+	bool "MPC8xxx GPIO support"</div><div class='add'>+	depends on PPC_MPC831x || PPC_MPC834x || PPC_MPC837x || PPC_85xx || PPC_86xx</div><div class='add'>+	select GENERIC_GPIO</div><div class='add'>+	select ARCH_REQUIRE_GPIOLIB</div><div class='add'>+	help</div><div class='add'>+	  Say Y here if you're going to use hardware that connects to the</div><div class='add'>+	  MPC831x/834x/837x/8572/8610 GPIOs.</div><div class='add'>+</div><div class='ctx'> endmenu</div><div class='head'>diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype<br/>index 7f6512733862..548efa55c8fe 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/Kconfig.cputype?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/platforms/Kconfig.cputype</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/Kconfig.cputype?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/Kconfig.cputype</a></div><div class='hunk'>@@ -50,6 +50,7 @@ config 44x</div><div class='ctx'> 	select PPC_UDBG_16550</div><div class='ctx'> 	select 4xx_SOC</div><div class='ctx'> 	select PPC_PCI_CHOICE</div><div class='add'>+	select PHYS_64BIT</div><div class='ctx'> </div><div class='ctx'> config E200</div><div class='ctx'> 	bool "Freescale e200"</div><div class='hunk'>@@ -128,18 +129,19 @@ config FSL_EMB_PERFMON</div><div class='ctx'> </div><div class='ctx'> config PTE_64BIT</div><div class='ctx'> 	bool</div><div class='del'>-	depends on 44x || E500</div><div class='del'>-	default y if 44x</div><div class='del'>-	default y if E500 &amp;&amp; PHYS_64BIT</div><div class='add'>+	depends on 44x || E500 || PPC_86xx</div><div class='add'>+	default y if PHYS_64BIT</div><div class='ctx'> </div><div class='ctx'> config PHYS_64BIT</div><div class='del'>-	bool 'Large physical address support' if E500</div><div class='del'>-	depends on 44x || E500</div><div class='del'>-	select RESOURCES_64BIT</div><div class='del'>-	default y if 44x</div><div class='add'>+	bool 'Large physical address support' if E500 || PPC_86xx</div><div class='add'>+	depends on (44x || E500 || PPC_86xx) &amp;&amp; !PPC_83xx &amp;&amp; !PPC_82xx</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  This option enables kernel support for larger than 32-bit physical</div><div class='del'>-	  addresses.  This features is not be available on all e500 cores.</div><div class='add'>+	  addresses.  This feature may not be available on all cores.</div><div class='add'>+</div><div class='add'>+	  If you have more than 3.5GB of RAM or so, you also need to enable</div><div class='add'>+	  SWIOTLB under Kernel Options for this to work.  The actual number</div><div class='add'>+	  is platform-dependent.</div><div class='ctx'> </div><div class='ctx'> 	  If in doubt, say N here.</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/platforms/cell/iommu.c b/arch/powerpc/platforms/cell/iommu.c<br/>index e06420af5fe9..ef92e7146215 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/cell/iommu.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/platforms/cell/iommu.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/cell/iommu.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/cell/iommu.c</a></div><div class='hunk'>@@ -556,11 +556,11 @@ static struct iommu_table *cell_get_iommu_table(struct device *dev)</div><div class='ctx'> 	 * node's iommu. We -might- do something smarter later though it may</div><div class='ctx'> 	 * never be necessary</div><div class='ctx'> 	 */</div><div class='del'>-	iommu = cell_iommu_for_node(archdata-&gt;numa_node);</div><div class='add'>+	iommu = cell_iommu_for_node(dev_to_node(dev));</div><div class='ctx'> 	if (iommu == NULL || list_empty(&amp;iommu-&gt;windows)) {</div><div class='ctx'> 		printk(KERN_ERR "iommu: missing iommu for %s (node %d)\n",</div><div class='ctx'> 		       archdata-&gt;of_node ? archdata-&gt;of_node-&gt;full_name : "?",</div><div class='del'>-		       archdata-&gt;numa_node);</div><div class='add'>+		       dev_to_node(dev));</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> 	window = list_entry(iommu-&gt;windows.next, struct iommu_window, list);</div><div class='hunk'>@@ -577,7 +577,7 @@ static void *dma_fixed_alloc_coherent(struct device *dev, size_t size,</div><div class='ctx'> 		return iommu_alloc_coherent(dev, cell_get_iommu_table(dev),</div><div class='ctx'> 					    size, dma_handle,</div><div class='ctx'> 					    device_to_mask(dev), flag,</div><div class='del'>-					    dev-&gt;archdata.numa_node);</div><div class='add'>+					    dev_to_node(dev));</div><div class='ctx'> 	else</div><div class='ctx'> 		return dma_direct_ops.alloc_coherent(dev, size, dma_handle,</div><div class='ctx'> 						     flag);</div><div class='head'>diff --git a/arch/powerpc/platforms/cell/spufs/inode.c b/arch/powerpc/platforms/cell/spufs/inode.c<br/>index 690ca7b0dcf6..cb85d237e492 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/cell/spufs/inode.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/platforms/cell/spufs/inode.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/cell/spufs/inode.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/cell/spufs/inode.c</a></div><div class='hunk'>@@ -298,8 +298,8 @@ spufs_mkdir(struct inode *dir, struct dentry *dentry, unsigned int flags,</div><div class='ctx'> </div><div class='ctx'> 	d_instantiate(dentry, inode);</div><div class='ctx'> 	dget(dentry);</div><div class='del'>-	dir-&gt;i_nlink++;</div><div class='del'>-	dentry-&gt;d_inode-&gt;i_nlink++;</div><div class='add'>+	inc_nlink(dir);</div><div class='add'>+	inc_nlink(dentry-&gt;d_inode);</div><div class='ctx'> 	goto out;</div><div class='ctx'> </div><div class='ctx'> out_free_ctx:</div><div class='hunk'>@@ -496,6 +496,8 @@ spufs_create_context(struct inode *inode, struct dentry *dentry,</div><div class='ctx'> 	ret = spufs_context_open(dget(dentry), mntget(mnt));</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		WARN_ON(spufs_rmdir(inode, dentry));</div><div class='add'>+		if (affinity)</div><div class='add'>+			mutex_unlock(&amp;gang-&gt;aff_mutex);</div><div class='ctx'> 		mutex_unlock(&amp;inode-&gt;i_mutex);</div><div class='ctx'> 		spu_forget(SPUFS_I(dentry-&gt;d_inode)-&gt;i_ctx);</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -538,8 +540,8 @@ spufs_mkgang(struct inode *dir, struct dentry *dentry, int mode)</div><div class='ctx'> 	inode-&gt;i_fop = &amp;simple_dir_operations;</div><div class='ctx'> </div><div class='ctx'> 	d_instantiate(dentry, inode);</div><div class='del'>-	dir-&gt;i_nlink++;</div><div class='del'>-	dentry-&gt;d_inode-&gt;i_nlink++;</div><div class='add'>+	inc_nlink(dir);</div><div class='add'>+	inc_nlink(dentry-&gt;d_inode);</div><div class='ctx'> 	return ret;</div><div class='ctx'> </div><div class='ctx'> out_iput:</div><div class='hunk'>@@ -659,7 +661,7 @@ enum {</div><div class='ctx'> 	Opt_uid, Opt_gid, Opt_mode, Opt_debug, Opt_err,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static match_table_t spufs_tokens = {</div><div class='add'>+static const match_table_t spufs_tokens = {</div><div class='ctx'> 	{ Opt_uid,   "uid=%d" },</div><div class='ctx'> 	{ Opt_gid,   "gid=%d" },</div><div class='ctx'> 	{ Opt_mode,  "mode=%o" },</div><div class='hunk'>@@ -755,6 +757,7 @@ spufs_create_root(struct super_block *sb, void *data)</div><div class='ctx'> 	inode-&gt;i_op = &amp;simple_dir_inode_operations;</div><div class='ctx'> 	inode-&gt;i_fop = &amp;simple_dir_operations;</div><div class='ctx'> 	SPUFS_I(inode)-&gt;i_ctx = NULL;</div><div class='add'>+	inc_nlink(inode);</div><div class='ctx'> </div><div class='ctx'> 	ret = -EINVAL;</div><div class='ctx'> 	if (!spufs_parse_options(sb, data, inode))</div><div class='head'>diff --git a/arch/powerpc/platforms/chrp/pci.c b/arch/powerpc/platforms/chrp/pci.c<br/>index 768c262b9368..d3cde6b9d2df 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/chrp/pci.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/platforms/chrp/pci.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/chrp/pci.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/chrp/pci.c</a></div><div class='hunk'>@@ -260,13 +260,13 @@ chrp_find_bridges(void)</div><div class='ctx'> 				dev-&gt;full_name);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='del'>-		hose-&gt;first_busno = bus_range[0];</div><div class='add'>+		hose-&gt;first_busno = hose-&gt;self_busno = bus_range[0];</div><div class='ctx'> 		hose-&gt;last_busno = bus_range[1];</div><div class='ctx'> </div><div class='ctx'> 		model = of_get_property(dev, "model", NULL);</div><div class='ctx'> 		if (model == NULL)</div><div class='ctx'> 			model = "&lt;none&gt;";</div><div class='del'>-		if (of_device_is_compatible(dev, "IBM,python")) {</div><div class='add'>+		if (strncmp(model, "IBM, Python", 11) == 0) {</div><div class='ctx'> 			setup_python(hose, dev);</div><div class='ctx'> 		} else if (is_mot</div><div class='ctx'> 			   || strncmp(model, "Motorola, Grackle", 17) == 0) {</div><div class='head'>diff --git a/arch/powerpc/platforms/chrp/setup.c b/arch/powerpc/platforms/chrp/setup.c<br/>index 1ba7ce5aafae..272d79a8d289 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/chrp/setup.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/platforms/chrp/setup.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/chrp/setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/chrp/setup.c</a></div><div class='hunk'>@@ -17,7 +17,6 @@</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/user.h&gt;</div><div class='del'>-#include &lt;linux/a.out.h&gt;</div><div class='ctx'> #include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/major.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='head'>diff --git a/arch/powerpc/platforms/chrp/time.c b/arch/powerpc/platforms/chrp/time.c<br/>index 96d1e4b3c493..054dfe5b8e77 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/chrp/time.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/platforms/chrp/time.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/chrp/time.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/chrp/time.c</a></div><div class='hunk'>@@ -94,12 +94,12 @@ int chrp_set_rtc_time(struct rtc_time *tmarg)</div><div class='ctx'> 	chrp_cmos_clock_write((save_freq_select|RTC_DIV_RESET2), RTC_FREQ_SELECT);</div><div class='ctx'> </div><div class='ctx'> 	if (!(save_control &amp; RTC_DM_BINARY) || RTC_ALWAYS_BCD) {</div><div class='del'>-		BIN_TO_BCD(tm.tm_sec);</div><div class='del'>-		BIN_TO_BCD(tm.tm_min);</div><div class='del'>-		BIN_TO_BCD(tm.tm_hour);</div><div class='del'>-		BIN_TO_BCD(tm.tm_mon);</div><div class='del'>-		BIN_TO_BCD(tm.tm_mday);</div><div class='del'>-		BIN_TO_BCD(tm.tm_year);</div><div class='add'>+		tm.tm_sec = bin2bcd(tm.tm_sec);</div><div class='add'>+		tm.tm_min = bin2bcd(tm.tm_min);</div><div class='add'>+		tm.tm_hour = bin2bcd(tm.tm_hour);</div><div class='add'>+		tm.tm_mon = bin2bcd(tm.tm_mon);</div><div class='add'>+		tm.tm_mday = bin2bcd(tm.tm_mday);</div><div class='add'>+		tm.tm_year = bin2bcd(tm.tm_year);</div><div class='ctx'> 	}</div><div class='ctx'> 	chrp_cmos_clock_write(tm.tm_sec,RTC_SECONDS);</div><div class='ctx'> 	chrp_cmos_clock_write(tm.tm_min,RTC_MINUTES);</div><div class='hunk'>@@ -136,12 +136,12 @@ void chrp_get_rtc_time(struct rtc_time *tm)</div><div class='ctx'> 	} while (sec != chrp_cmos_clock_read(RTC_SECONDS));</div><div class='ctx'> </div><div class='ctx'> 	if (!(chrp_cmos_clock_read(RTC_CONTROL) &amp; RTC_DM_BINARY) || RTC_ALWAYS_BCD) {</div><div class='del'>-		BCD_TO_BIN(sec);</div><div class='del'>-		BCD_TO_BIN(min);</div><div class='del'>-		BCD_TO_BIN(hour);</div><div class='del'>-		BCD_TO_BIN(day);</div><div class='del'>-		BCD_TO_BIN(mon);</div><div class='del'>-		BCD_TO_BIN(year);</div><div class='add'>+		sec = bcd2bin(sec);</div><div class='add'>+		min = bcd2bin(min);</div><div class='add'>+		hour = bcd2bin(hour);</div><div class='add'>+		day = bcd2bin(day);</div><div class='add'>+		mon = bcd2bin(mon);</div><div class='add'>+		year = bcd2bin(year);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (year &lt; 70)</div><div class='ctx'> 		year += 100;</div><div class='head'>diff --git a/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c b/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c<br/>index 84e2d78b9a62..7a2ba39d7811 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c</a></div><div class='hunk'>@@ -164,7 +164,6 @@ static void __init mpc7448_hpc2_init_IRQ(void)</div><div class='ctx'> void mpc7448_hpc2_show_cpuinfo(struct seq_file *m)</div><div class='ctx'> {</div><div class='ctx'> 	seq_printf(m, "vendor\t\t: Freescale Semiconductor\n");</div><div class='del'>-	seq_printf(m, "machine\t\t: MPC7448hpc2\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void mpc7448_hpc2_restart(char *cmd)</div><div class='head'>diff --git a/arch/powerpc/platforms/iseries/exception.S b/arch/powerpc/platforms/iseries/exception.S<br/>index 8ff330d026ca..2f581521eb9b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/iseries/exception.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/platforms/iseries/exception.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/iseries/exception.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/iseries/exception.S</a></div><div class='hunk'>@@ -38,12 +38,13 @@</div><div class='ctx'> </div><div class='ctx'> 	.globl system_reset_iSeries</div><div class='ctx'> system_reset_iSeries:</div><div class='add'>+	bl	.relative_toc</div><div class='ctx'> 	mfspr	r13,SPRN_SPRG3		/* Get alpaca address */</div><div class='del'>-	LOAD_REG_IMMEDIATE(r23, alpaca)</div><div class='add'>+	LOAD_REG_ADDR(r23, alpaca)</div><div class='ctx'> 	li	r0,ALPACA_SIZE</div><div class='ctx'> 	sub	r23,r13,r23</div><div class='ctx'> 	divdu	r23,r23,r0		/* r23 has cpu number */</div><div class='del'>-	LOAD_REG_IMMEDIATE(r13, paca)</div><div class='add'>+	LOAD_REG_ADDR(r13, paca)</div><div class='ctx'> 	mulli	r0,r23,PACA_SIZE</div><div class='ctx'> 	add	r13,r13,r0</div><div class='ctx'> 	mtspr	SPRN_SPRG3,r13		/* Save it away for the future */</div><div class='hunk'>@@ -60,14 +61,14 @@ system_reset_iSeries:</div><div class='ctx'> 	mtspr	SPRN_CTRLT,r4</div><div class='ctx'> </div><div class='ctx'> /* Spin on __secondary_hold_spinloop until it is updated by the boot cpu. */</div><div class='del'>-/* In the UP case we'll yeild() later, and we will not access the paca anyway */</div><div class='add'>+/* In the UP case we'll yield() later, and we will not access the paca anyway */</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> 1:</div><div class='ctx'> 	HMT_LOW</div><div class='del'>-	LOAD_REG_IMMEDIATE(r23, __secondary_hold_spinloop)</div><div class='add'>+	LOAD_REG_ADDR(r23, __secondary_hold_spinloop)</div><div class='ctx'> 	ld	r23,0(r23)</div><div class='ctx'> 	sync</div><div class='del'>-	LOAD_REG_IMMEDIATE(r3,current_set)</div><div class='add'>+	LOAD_REG_ADDR(r3,current_set)</div><div class='ctx'> 	sldi	r28,r24,3		/* get current_set[cpu#] */</div><div class='ctx'> 	ldx	r3,r3,r28</div><div class='ctx'> 	addi	r1,r3,THREAD_SIZE</div><div class='hunk'>@@ -90,7 +91,7 @@ system_reset_iSeries:</div><div class='ctx'> 	lbz	r23,PACAPROCSTART(r13)	/* Test if this processor</div><div class='ctx'> 					 * should start */</div><div class='ctx'> 	sync</div><div class='del'>-	LOAD_REG_IMMEDIATE(r3,current_set)</div><div class='add'>+	LOAD_REG_ADDR(r3,current_set)</div><div class='ctx'> 	sldi	r28,r24,3		/* get current_set[cpu#] */</div><div class='ctx'> 	ldx	r3,r3,r28</div><div class='ctx'> 	addi	r1,r3,THREAD_SIZE</div><div class='hunk'>@@ -255,8 +256,8 @@ hardware_interrupt_iSeries_masked:</div><div class='ctx'> </div><div class='ctx'> _INIT_STATIC(__start_initialization_iSeries)</div><div class='ctx'> 	/* Clear out the BSS */</div><div class='del'>-	LOAD_REG_IMMEDIATE(r11,__bss_stop)</div><div class='del'>-	LOAD_REG_IMMEDIATE(r8,__bss_start)</div><div class='add'>+	LOAD_REG_ADDR(r11,__bss_stop)</div><div class='add'>+	LOAD_REG_ADDR(r8,__bss_start)</div><div class='ctx'> 	sub	r11,r11,r8		/* bss size			*/</div><div class='ctx'> 	addi	r11,r11,7		/* round up to an even double word */</div><div class='ctx'> 	rldicl. r11,r11,61,3		/* shift right by 3		*/</div><div class='hunk'>@@ -267,15 +268,11 @@ _INIT_STATIC(__start_initialization_iSeries)</div><div class='ctx'> 3:	stdu	r0,8(r8)</div><div class='ctx'> 	bdnz	3b</div><div class='ctx'> 4:</div><div class='del'>-	LOAD_REG_IMMEDIATE(r1,init_thread_union)</div><div class='add'>+	LOAD_REG_ADDR(r1,init_thread_union)</div><div class='ctx'> 	addi	r1,r1,THREAD_SIZE</div><div class='ctx'> 	li	r0,0</div><div class='ctx'> 	stdu	r0,-STACK_FRAME_OVERHEAD(r1)</div><div class='ctx'> </div><div class='del'>-	LOAD_REG_IMMEDIATE(r2,__toc_start)</div><div class='del'>-	addi	r2,r2,0x4000</div><div class='del'>-	addi	r2,r2,0x4000</div><div class='del'>-</div><div class='ctx'> 	bl	.iSeries_early_setup</div><div class='ctx'> 	bl	.early_setup</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/platforms/iseries/mf.c b/arch/powerpc/platforms/iseries/mf.c<br/>index 731d7b157749..3689c2413d24 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/iseries/mf.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/platforms/iseries/mf.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/iseries/mf.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/iseries/mf.c</a></div><div class='hunk'>@@ -722,13 +722,13 @@ static int mf_set_rtc(struct rtc_time *tm)</div><div class='ctx'> 	day = tm-&gt;tm_mday;</div><div class='ctx'> 	mon = tm-&gt;tm_mon + 1;</div><div class='ctx'> </div><div class='del'>-	BIN_TO_BCD(sec);</div><div class='del'>-	BIN_TO_BCD(min);</div><div class='del'>-	BIN_TO_BCD(hour);</div><div class='del'>-	BIN_TO_BCD(mon);</div><div class='del'>-	BIN_TO_BCD(day);</div><div class='del'>-	BIN_TO_BCD(y1);</div><div class='del'>-	BIN_TO_BCD(y2);</div><div class='add'>+	sec = bin2bcd(sec);</div><div class='add'>+	min = bin2bcd(min);</div><div class='add'>+	hour = bin2bcd(hour);</div><div class='add'>+	mon = bin2bcd(mon);</div><div class='add'>+	day = bin2bcd(day);</div><div class='add'>+	y1 = bin2bcd(y1);</div><div class='add'>+	y2 = bin2bcd(y2);</div><div class='ctx'> </div><div class='ctx'> 	memset(ce_time, 0, sizeof(ce_time));</div><div class='ctx'> 	ce_time[3] = 0x41;</div><div class='hunk'>@@ -777,12 +777,12 @@ static int rtc_set_tm(int rc, u8 *ce_msg, struct rtc_time *tm)</div><div class='ctx'> 		u8 day = ce_msg[10];</div><div class='ctx'> 		u8 mon = ce_msg[11];</div><div class='ctx'> </div><div class='del'>-		BCD_TO_BIN(sec);</div><div class='del'>-		BCD_TO_BIN(min);</div><div class='del'>-		BCD_TO_BIN(hour);</div><div class='del'>-		BCD_TO_BIN(day);</div><div class='del'>-		BCD_TO_BIN(mon);</div><div class='del'>-		BCD_TO_BIN(year);</div><div class='add'>+		sec = bcd2bin(sec);</div><div class='add'>+		min = bcd2bin(min);</div><div class='add'>+		hour = bcd2bin(hour);</div><div class='add'>+		day = bcd2bin(day);</div><div class='add'>+		mon = bcd2bin(mon);</div><div class='add'>+		year = bcd2bin(year);</div><div class='ctx'> </div><div class='ctx'> 		if (year &lt;= 69)</div><div class='ctx'> 			year += 100;</div><div class='head'>diff --git a/arch/powerpc/platforms/maple/setup.c b/arch/powerpc/platforms/maple/setup.c<br/>index 364714757cf1..d4c61c3c9669 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/maple/setup.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/platforms/maple/setup.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/maple/setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/maple/setup.c</a></div><div class='hunk'>@@ -23,7 +23,6 @@</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/user.h&gt;</div><div class='del'>-#include &lt;linux/a.out.h&gt;</div><div class='ctx'> #include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='head'>diff --git a/arch/powerpc/platforms/maple/time.c b/arch/powerpc/platforms/maple/time.c<br/>index 53bca132fb48..eac569dee27c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/maple/time.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/platforms/maple/time.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/maple/time.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/maple/time.c</a></div><div class='hunk'>@@ -68,12 +68,12 @@ void maple_get_rtc_time(struct rtc_time *tm)</div><div class='ctx'> </div><div class='ctx'> 	if (!(maple_clock_read(RTC_CONTROL) &amp; RTC_DM_BINARY)</div><div class='ctx'> 	    || RTC_ALWAYS_BCD) {</div><div class='del'>-		BCD_TO_BIN(tm-&gt;tm_sec);</div><div class='del'>-		BCD_TO_BIN(tm-&gt;tm_min);</div><div class='del'>-		BCD_TO_BIN(tm-&gt;tm_hour);</div><div class='del'>-		BCD_TO_BIN(tm-&gt;tm_mday);</div><div class='del'>-		BCD_TO_BIN(tm-&gt;tm_mon);</div><div class='del'>-		BCD_TO_BIN(tm-&gt;tm_year);</div><div class='add'>+		tm-&gt;tm_sec = bcd2bin(tm-&gt;tm_sec);</div><div class='add'>+		tm-&gt;tm_min = bcd2bin(tm-&gt;tm_min);</div><div class='add'>+		tm-&gt;tm_hour = bcd2bin(tm-&gt;tm_hour);</div><div class='add'>+		tm-&gt;tm_mday = bcd2bin(tm-&gt;tm_mday);</div><div class='add'>+		tm-&gt;tm_mon = bcd2bin(tm-&gt;tm_mon);</div><div class='add'>+		tm-&gt;tm_year = bcd2bin(tm-&gt;tm_year);</div><div class='ctx'> 	  }</div><div class='ctx'> 	if ((tm-&gt;tm_year + 1900) &lt; 1970)</div><div class='ctx'> 		tm-&gt;tm_year += 100;</div><div class='hunk'>@@ -104,12 +104,12 @@ int maple_set_rtc_time(struct rtc_time *tm)</div><div class='ctx'> 	year = tm-&gt;tm_year;</div><div class='ctx'> </div><div class='ctx'> 	if (!(save_control &amp; RTC_DM_BINARY) || RTC_ALWAYS_BCD) {</div><div class='del'>-		BIN_TO_BCD(sec);</div><div class='del'>-		BIN_TO_BCD(min);</div><div class='del'>-		BIN_TO_BCD(hour);</div><div class='del'>-		BIN_TO_BCD(mon);</div><div class='del'>-		BIN_TO_BCD(mday);</div><div class='del'>-		BIN_TO_BCD(year);</div><div class='add'>+		sec = bin2bcd(sec);</div><div class='add'>+		min = bin2bcd(min);</div><div class='add'>+		hour = bin2bcd(hour);</div><div class='add'>+		mon = bin2bcd(mon);</div><div class='add'>+		mday = bin2bcd(mday);</div><div class='add'>+		year = bin2bcd(year);</div><div class='ctx'> 	}</div><div class='ctx'> 	maple_clock_write(sec, RTC_SECONDS);</div><div class='ctx'> 	maple_clock_write(min, RTC_MINUTES);</div><div class='head'>diff --git a/arch/powerpc/platforms/pasemi/gpio_mdio.c b/arch/powerpc/platforms/pasemi/gpio_mdio.c<br/>index ab6955412ba4..75cc165d5bee 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/pasemi/gpio_mdio.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/platforms/pasemi/gpio_mdio.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/pasemi/gpio_mdio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/pasemi/gpio_mdio.c</a></div><div class='hunk'>@@ -230,7 +230,7 @@ static int __devinit gpio_mdio_probe(struct of_device *ofdev,</div><div class='ctx'> 	if (!priv)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	new_bus = kzalloc(sizeof(struct mii_bus), GFP_KERNEL);</div><div class='add'>+	new_bus = mdiobus_alloc();</div><div class='ctx'> </div><div class='ctx'> 	if (!new_bus)</div><div class='ctx'> 		goto out_free_priv;</div><div class='hunk'>@@ -272,7 +272,7 @@ static int __devinit gpio_mdio_probe(struct of_device *ofdev,</div><div class='ctx'> 	prop = of_get_property(np, "mdio-pin", NULL);</div><div class='ctx'> 	priv-&gt;mdio_pin = *prop;</div><div class='ctx'> </div><div class='del'>-	new_bus-&gt;dev = dev;</div><div class='add'>+	new_bus-&gt;parent = dev;</div><div class='ctx'> 	dev_set_drvdata(dev, new_bus);</div><div class='ctx'> </div><div class='ctx'> 	err = mdiobus_register(new_bus);</div><div class='hunk'>@@ -306,7 +306,7 @@ static int gpio_mdio_remove(struct of_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	kfree(bus-&gt;priv);</div><div class='ctx'> 	bus-&gt;priv = NULL;</div><div class='del'>-	kfree(bus);</div><div class='add'>+	mdiobus_free(bus);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/platforms/powermac/feature.c b/arch/powerpc/platforms/powermac/feature.c<br/>index 5169ecc37123..e6c0040ee797 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/powermac/feature.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/platforms/powermac/feature.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/powermac/feature.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/powermac/feature.c</a></div><div class='hunk'>@@ -2677,7 +2677,7 @@ static void __init probe_one_macio(const char *name, const char *compat, int typ</div><div class='ctx'> 	macio_chips[i].of_node	= node;</div><div class='ctx'> 	macio_chips[i].type	= type;</div><div class='ctx'> 	macio_chips[i].base	= base;</div><div class='del'>-	macio_chips[i].flags	= MACIO_FLAG_SCCB_ON | MACIO_FLAG_SCCB_ON;</div><div class='add'>+	macio_chips[i].flags	= MACIO_FLAG_SCCA_ON | MACIO_FLAG_SCCB_ON;</div><div class='ctx'> 	macio_chips[i].name	= macio_names[type];</div><div class='ctx'> 	revp = of_get_property(node, "revision-id", NULL);</div><div class='ctx'> 	if (revp)</div><div class='head'>diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platforms/powermac/setup.c<br/>index 88ccf3a08a9c..82c14d203d8b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/powermac/setup.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/platforms/powermac/setup.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/powermac/setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/powermac/setup.c</a></div><div class='hunk'>@@ -33,7 +33,6 @@</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/user.h&gt;</div><div class='del'>-#include &lt;linux/a.out.h&gt;</div><div class='ctx'> #include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='head'>diff --git a/arch/powerpc/platforms/powermac/smp.c b/arch/powerpc/platforms/powermac/smp.c<br/>index 4ae3d00e0bdd..40f72c2a4699 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/powermac/smp.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/platforms/powermac/smp.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/powermac/smp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/powermac/smp.c</a></div><div class='hunk'>@@ -787,7 +787,7 @@ static void __devinit smp_core99_kick_cpu(int nr)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int save_vector;</div><div class='ctx'> 	unsigned long target, flags;</div><div class='del'>-	unsigned int *vector = (unsigned int *)(KERNELBASE+0x100);</div><div class='add'>+	unsigned int *vector = (unsigned int *)(PAGE_OFFSET+0x100);</div><div class='ctx'> </div><div class='ctx'> 	if (nr &lt; 0 || nr &gt; 3)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -801,7 +801,7 @@ static void __devinit smp_core99_kick_cpu(int nr)</div><div class='ctx'> 	save_vector = *vector;</div><div class='ctx'> </div><div class='ctx'> 	/* Setup fake reset vector that does</div><div class='del'>-	 *   b __secondary_start_pmac_0 + nr*8 - KERNELBASE</div><div class='add'>+	 *   b __secondary_start_pmac_0 + nr*8</div><div class='ctx'> 	 */</div><div class='ctx'> 	target = (unsigned long) __secondary_start_pmac_0 + nr * 8;</div><div class='ctx'> 	patch_branch(vector, target, BRANCH_SET_LINK);</div><div class='head'>diff --git a/arch/powerpc/platforms/powermac/time.c b/arch/powerpc/platforms/powermac/time.c<br/>index bbbefd64ab59..59eb840d8ce2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/powermac/time.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/platforms/powermac/time.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/powermac/time.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/powermac/time.c</a></div><div class='hunk'>@@ -93,11 +93,14 @@ static void to_rtc_time(unsigned long now, struct rtc_time *tm)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_ADB_CUDA) || defined(CONFIG_ADB_PMU) || \</div><div class='add'>+    defined(CONFIG_PMAC_SMU)</div><div class='ctx'> static unsigned long from_rtc_time(struct rtc_time *tm)</div><div class='ctx'> {</div><div class='ctx'> 	return mktime(tm-&gt;tm_year+1900, tm-&gt;tm_mon+1, tm-&gt;tm_mday,</div><div class='ctx'> 		      tm-&gt;tm_hour, tm-&gt;tm_min, tm-&gt;tm_sec);</div><div class='ctx'> }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ADB_CUDA</div><div class='ctx'> static unsigned long cuda_get_time(void)</div><div class='head'>diff --git a/arch/powerpc/platforms/ps3/system-bus.c b/arch/powerpc/platforms/ps3/system-bus.c<br/>index 280ee88cb0b0..a789bf58ca8b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/ps3/system-bus.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/platforms/ps3/system-bus.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/ps3/system-bus.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/ps3/system-bus.c</a></div><div class='hunk'>@@ -762,7 +762,7 @@ int ps3_system_bus_device_register(struct ps3_system_bus_device *dev)</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;core.archdata.of_node = NULL;</div><div class='del'>-	dev-&gt;core.archdata.numa_node = 0;</div><div class='add'>+	set_dev_node(&amp;dev-&gt;core, 0);</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("%s:%d add %s\n", __func__, __LINE__, dev-&gt;core.bus_id);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/platforms/pseries/cmm.c b/arch/powerpc/platforms/pseries/cmm.c<br/>index 38fe32a7cc70..5cd4d2761620 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/pseries/cmm.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/platforms/pseries/cmm.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/pseries/cmm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/pseries/cmm.c</a></div><div class='hunk'>@@ -121,7 +121,7 @@ static long cmm_alloc_pages(long nr)</div><div class='ctx'> 			npa = (struct cmm_page_array *)__get_free_page(GFP_NOIO | __GFP_NOWARN |</div><div class='ctx'> 								       __GFP_NORETRY | __GFP_NOMEMALLOC);</div><div class='ctx'> 			if (!npa) {</div><div class='del'>-				pr_info("%s: Can not allocate new page list\n", __FUNCTION__);</div><div class='add'>+				pr_info("%s: Can not allocate new page list\n", __func__);</div><div class='ctx'> 				free_page(addr);</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -138,7 +138,7 @@ static long cmm_alloc_pages(long nr)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if ((rc = plpar_page_set_loaned(__pa(addr)))) {</div><div class='del'>-			pr_err("%s: Can not set page to loaned. rc=%ld\n", __FUNCTION__, rc);</div><div class='add'>+			pr_err("%s: Can not set page to loaned. rc=%ld\n", __func__, rc);</div><div class='ctx'> 			spin_unlock(&amp;cmm_lock);</div><div class='ctx'> 			free_page(addr);</div><div class='ctx'> 			break;</div><div class='head'>diff --git a/arch/powerpc/platforms/pseries/eeh_driver.c b/arch/powerpc/platforms/pseries/eeh_driver.c<br/>index 8c1ca477c52c..0ad56ff7b4a0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/pseries/eeh_driver.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/platforms/pseries/eeh_driver.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/pseries/eeh_driver.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/pseries/eeh_driver.c</a></div><div class='hunk'>@@ -41,7 +41,7 @@ static inline const char * pcid_name (struct pci_dev *pdev)</div><div class='ctx'> 	return "";</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef DEBUG</div><div class='add'>+#if 0</div><div class='ctx'> static void print_device_node_tree(struct pci_dn *pdn, int dent)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='head'>diff --git a/arch/powerpc/platforms/pseries/hotplug-memory.c b/arch/powerpc/platforms/pseries/hotplug-memory.c<br/>index a1a368dd2d99..140d02a5232a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/pseries/hotplug-memory.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/platforms/pseries/hotplug-memory.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/pseries/hotplug-memory.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/pseries/hotplug-memory.c</a></div><div class='hunk'>@@ -21,7 +21,7 @@ static int pseries_remove_lmb(unsigned long base, unsigned int lmb_size)</div><div class='ctx'> 	struct zone *zone;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	start_pfn = base &gt;&gt; PFN_SECTION_SHIFT;</div><div class='add'>+	start_pfn = base &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> 	zone = page_zone(pfn_to_page(start_pfn));</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='head'>diff --git a/arch/powerpc/platforms/pseries/reconfig.c b/arch/powerpc/platforms/pseries/reconfig.c<br/>index 7637bd38c795..c591a25b0b0d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/pseries/reconfig.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/platforms/pseries/reconfig.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/pseries/reconfig.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/pseries/reconfig.c</a></div><div class='hunk'>@@ -466,11 +466,11 @@ static int do_update_property(char *buf, size_t bufsize)</div><div class='ctx'> 		else</div><div class='ctx'> 			action = PSERIES_DRCONF_MEM_REMOVE;</div><div class='ctx'> </div><div class='del'>-		blocking_notifier_call_chain(&amp;pSeries_reconfig_chain,</div><div class='del'>-					     action, value);</div><div class='add'>+		rc = blocking_notifier_call_chain(&amp;pSeries_reconfig_chain,</div><div class='add'>+						  action, value);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/arch/powerpc/platforms/pseries/rtasd.c b/arch/powerpc/platforms/pseries/rtasd.c<br/>index c9ffd8c225f1..f4e55be2eea9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/pseries/rtasd.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/platforms/pseries/rtasd.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/pseries/rtasd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/pseries/rtasd.c</a></div><div class='hunk'>@@ -295,19 +295,29 @@ static ssize_t rtas_log_read(struct file * file, char __user * buf,</div><div class='ctx'> 	if (!tmp)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> 	spin_lock_irqsave(&amp;rtasd_log_lock, s);</div><div class='ctx'> 	/* if it's 0, then we know we got the last one (the one in NVRAM) */</div><div class='del'>-	if (rtas_log_size == 0 &amp;&amp; logging_enabled)</div><div class='del'>-		nvram_clear_error_log();</div><div class='del'>-	spin_unlock_irqrestore(&amp;rtasd_log_lock, s);</div><div class='add'>+	while (rtas_log_size == 0) {</div><div class='add'>+		if (file-&gt;f_flags &amp; O_NONBLOCK) {</div><div class='add'>+			spin_unlock_irqrestore(&amp;rtasd_log_lock, s);</div><div class='add'>+			error = -EAGAIN;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='add'>+		if (!logging_enabled) {</div><div class='add'>+			spin_unlock_irqrestore(&amp;rtasd_log_lock, s);</div><div class='add'>+			error = -ENODATA;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		nvram_clear_error_log();</div><div class='ctx'> </div><div class='del'>-	error = wait_event_interruptible(rtas_log_wait, rtas_log_size);</div><div class='del'>-	if (error)</div><div class='del'>-		goto out;</div><div class='add'>+		spin_unlock_irqrestore(&amp;rtasd_log_lock, s);</div><div class='add'>+		error = wait_event_interruptible(rtas_log_wait, rtas_log_size);</div><div class='add'>+		if (error)</div><div class='add'>+			goto out;</div><div class='add'>+		spin_lock_irqsave(&amp;rtasd_log_lock, s);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;rtasd_log_lock, s);</div><div class='ctx'> 	offset = rtas_error_log_buffer_max * (rtas_log_start &amp; LOG_NUMBER_MASK);</div><div class='ctx'> 	memcpy(tmp, &amp;rtas_log_buf[offset], count);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c<br/>index 7b01d67b4e48..ec341707e41b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/pseries/setup.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/platforms/pseries/setup.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/pseries/setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/pseries/setup.c</a></div><div class='hunk'>@@ -25,7 +25,6 @@</div><div class='ctx'> #include &lt;linux/unistd.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/user.h&gt;</div><div class='del'>-#include &lt;linux/a.out.h&gt;</div><div class='ctx'> #include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/major.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='head'>diff --git a/arch/powerpc/platforms/pseries/smp.c b/arch/powerpc/platforms/pseries/smp.c<br/>index 9d8f8c84ab89..e00f96baa381 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/pseries/smp.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/platforms/pseries/smp.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/pseries/smp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/pseries/smp.c</a></div><div class='hunk'>@@ -37,7 +37,6 @@</div><div class='ctx'> #include &lt;asm/paca.h&gt;</div><div class='ctx'> #include &lt;asm/time.h&gt;</div><div class='ctx'> #include &lt;asm/machdep.h&gt;</div><div class='del'>-#include "xics.h"</div><div class='ctx'> #include &lt;asm/cputable.h&gt;</div><div class='ctx'> #include &lt;asm/firmware.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='hunk'>@@ -49,6 +48,7 @@</div><div class='ctx'> </div><div class='ctx'> #include "plpar_wrappers.h"</div><div class='ctx'> #include "pseries.h"</div><div class='add'>+#include "xics.h"</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -105,36 +105,6 @@ static inline int __devinit smp_startup_cpu(unsigned int lcpu)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_XICS</div><div class='del'>-static inline void smp_xics_do_message(int cpu, int msg)</div><div class='del'>-{</div><div class='del'>-	set_bit(msg, &amp;xics_ipi_message[cpu].value);</div><div class='del'>-	mb();</div><div class='del'>-	xics_cause_IPI(cpu);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void smp_xics_message_pass(int target, int msg)</div><div class='del'>-{</div><div class='del'>-	unsigned int i;</div><div class='del'>-</div><div class='del'>-	if (target &lt; NR_CPUS) {</div><div class='del'>-		smp_xics_do_message(target, msg);</div><div class='del'>-	} else {</div><div class='del'>-		for_each_online_cpu(i) {</div><div class='del'>-			if (target == MSG_ALL_BUT_SELF</div><div class='del'>-			    &amp;&amp; i == smp_processor_id())</div><div class='del'>-				continue;</div><div class='del'>-			smp_xics_do_message(i, msg);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init smp_xics_probe(void)</div><div class='del'>-{</div><div class='del'>-	xics_request_IPIs();</div><div class='del'>-</div><div class='del'>-	return cpus_weight(cpu_possible_map);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void __devinit smp_xics_setup_cpu(int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	if (cpu != boot_cpuid)</div><div class='head'>diff --git a/arch/powerpc/platforms/pseries/xics.c b/arch/powerpc/platforms/pseries/xics.c<br/>index 0fc830f576f5..e1904774a70f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/pseries/xics.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/platforms/pseries/xics.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/pseries/xics.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/pseries/xics.c</a></div><div class='hunk'>@@ -9,32 +9,30 @@</div><div class='ctx'>  *  2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/threads.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/gfp.h&gt;</div><div class='ctx'> #include &lt;linux/radix-tree.h&gt;</div><div class='ctx'> #include &lt;linux/cpu.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/firmware.h&gt;</div><div class='del'>-#include &lt;asm/prom.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/smp.h&gt;</div><div class='ctx'> #include &lt;asm/rtas.h&gt;</div><div class='ctx'> #include &lt;asm/hvcall.h&gt;</div><div class='ctx'> #include &lt;asm/machdep.h&gt;</div><div class='del'>-#include &lt;asm/i8259.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "xics.h"</div><div class='ctx'> #include "plpar_wrappers.h"</div><div class='ctx'> </div><div class='add'>+static struct irq_host *xics_host;</div><div class='add'>+</div><div class='ctx'> #define XICS_IPI		2</div><div class='ctx'> #define XICS_IRQ_SPURIOUS	0</div><div class='ctx'> </div><div class='hunk'>@@ -47,6 +45,20 @@</div><div class='ctx'>  */</div><div class='ctx'> #define IPI_PRIORITY		4</div><div class='ctx'> </div><div class='add'>+static unsigned int default_server = 0xFF;</div><div class='add'>+static unsigned int default_distrib_server = 0;</div><div class='add'>+static unsigned int interrupt_server_size = 8;</div><div class='add'>+</div><div class='add'>+/* RTAS service tokens */</div><div class='add'>+static int ibm_get_xive;</div><div class='add'>+static int ibm_set_xive;</div><div class='add'>+static int ibm_int_on;</div><div class='add'>+static int ibm_int_off;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Direct hardware low level accessors */</div><div class='add'>+</div><div class='add'>+/* The part of the interrupt presentation layer that we care about */</div><div class='ctx'> struct xics_ipl {</div><div class='ctx'> 	union {</div><div class='ctx'> 		u32 word;</div><div class='hunk'>@@ -65,27 +77,6 @@ struct xics_ipl {</div><div class='ctx'> </div><div class='ctx'> static struct xics_ipl __iomem *xics_per_cpu[NR_CPUS];</div><div class='ctx'> </div><div class='del'>-static unsigned int default_server = 0xFF;</div><div class='del'>-static unsigned int default_distrib_server = 0;</div><div class='del'>-static unsigned int interrupt_server_size = 8;</div><div class='del'>-</div><div class='del'>-static struct irq_host *xics_host;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * XICS only has a single IPI, so encode the messages per CPU</div><div class='del'>- */</div><div class='del'>-struct xics_ipi_struct xics_ipi_message[NR_CPUS] __cacheline_aligned;</div><div class='del'>-</div><div class='del'>-/* RTAS service tokens */</div><div class='del'>-static int ibm_get_xive;</div><div class='del'>-static int ibm_set_xive;</div><div class='del'>-static int ibm_int_on;</div><div class='del'>-static int ibm_int_off;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Direct HW low level accessors */</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> static inline unsigned int direct_xirr_info_get(void)</div><div class='ctx'> {</div><div class='ctx'> 	int cpu = smp_processor_id();</div><div class='hunk'>@@ -93,7 +84,7 @@ static inline unsigned int direct_xirr_info_get(void)</div><div class='ctx'> 	return in_be32(&amp;xics_per_cpu[cpu]-&gt;xirr.word);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void direct_xirr_info_set(int value)</div><div class='add'>+static inline void direct_xirr_info_set(unsigned int value)</div><div class='ctx'> {</div><div class='ctx'> 	int cpu = smp_processor_id();</div><div class='ctx'> </div><div class='hunk'>@@ -115,7 +106,6 @@ static inline void direct_qirr_info(int n_cpu, u8 value)</div><div class='ctx'> </div><div class='ctx'> /* LPAR low level accessors */</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> static inline unsigned int lpar_xirr_info_get(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long lpar_rc;</div><div class='hunk'>@@ -127,15 +117,14 @@ static inline unsigned int lpar_xirr_info_get(void)</div><div class='ctx'> 	return (unsigned int)return_value;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void lpar_xirr_info_set(int value)</div><div class='add'>+static inline void lpar_xirr_info_set(unsigned int value)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long lpar_rc;</div><div class='del'>-	unsigned long val64 = value &amp; 0xffffffff;</div><div class='ctx'> </div><div class='del'>-	lpar_rc = plpar_eoi(val64);</div><div class='add'>+	lpar_rc = plpar_eoi(value);</div><div class='ctx'> 	if (lpar_rc != H_SUCCESS)</div><div class='del'>-		panic("bad return code EOI - rc = %ld, value=%lx\n", lpar_rc,</div><div class='del'>-		      val64);</div><div class='add'>+		panic("bad return code EOI - rc = %ld, value=%x\n", lpar_rc,</div><div class='add'>+		      value);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void lpar_cppr_info(u8 value)</div><div class='hunk'>@@ -157,48 +146,7 @@ static inline void lpar_qirr_info(int n_cpu , u8 value)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-/* High level handlers and init code */</div><div class='del'>-</div><div class='del'>-static void xics_update_irq_servers(void)</div><div class='del'>-{</div><div class='del'>-	int i, j;</div><div class='del'>-	struct device_node *np;</div><div class='del'>-	u32 ilen;</div><div class='del'>-	const u32 *ireg, *isize;</div><div class='del'>-	u32 hcpuid;</div><div class='del'>-</div><div class='del'>-	/* Find the server numbers for the boot cpu. */</div><div class='del'>-	np = of_get_cpu_node(boot_cpuid, NULL);</div><div class='del'>-	BUG_ON(!np);</div><div class='del'>-</div><div class='del'>-	ireg = of_get_property(np, "ibm,ppc-interrupt-gserver#s", &amp;ilen);</div><div class='del'>-	if (!ireg) {</div><div class='del'>-		of_node_put(np);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	i = ilen / sizeof(int);</div><div class='del'>-	hcpuid = get_hard_smp_processor_id(boot_cpuid);</div><div class='del'>-</div><div class='del'>-	/* Global interrupt distribution server is specified in the last</div><div class='del'>-	 * entry of "ibm,ppc-interrupt-gserver#s" property. Get the last</div><div class='del'>-	 * entry fom this property for current boot cpu id and use it as</div><div class='del'>-	 * default distribution server</div><div class='del'>-	 */</div><div class='del'>-	for (j = 0; j &lt; i; j += 2) {</div><div class='del'>-		if (ireg[j] == hcpuid) {</div><div class='del'>-			default_server = hcpuid;</div><div class='del'>-			default_distrib_server = ireg[j+1];</div><div class='del'>-</div><div class='del'>-			isize = of_get_property(np,</div><div class='del'>-					"ibm,interrupt-server#-size", NULL);</div><div class='del'>-			if (isize)</div><div class='del'>-				interrupt_server_size = *isize;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	of_node_put(np);</div><div class='del'>-}</div><div class='add'>+/* Interface to generic irq subsystem */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> static int get_irq_server(unsigned int virq, unsigned int strict_check)</div><div class='hunk'>@@ -208,9 +156,6 @@ static int get_irq_server(unsigned int virq, unsigned int strict_check)</div><div class='ctx'> 	cpumask_t cpumask = irq_desc[virq].affinity;</div><div class='ctx'> 	cpumask_t tmp = CPU_MASK_NONE;</div><div class='ctx'> </div><div class='del'>-	if (! cpu_isset(default_server, cpu_online_map))</div><div class='del'>-		xics_update_irq_servers();</div><div class='del'>-</div><div class='ctx'> 	if (!distribute_irqs)</div><div class='ctx'> 		return default_server;</div><div class='ctx'> </div><div class='hunk'>@@ -238,7 +183,6 @@ static int get_irq_server(unsigned int virq, unsigned int strict_check)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> static void xics_unmask_irq(unsigned int virq)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int irq;</div><div class='hunk'>@@ -257,21 +201,28 @@ static void xics_unmask_irq(unsigned int virq)</div><div class='ctx'> 	call_status = rtas_call(ibm_set_xive, 3, 1, NULL, irq, server,</div><div class='ctx'> 				DEFAULT_PRIORITY);</div><div class='ctx'> 	if (call_status != 0) {</div><div class='del'>-		printk(KERN_ERR "xics_enable_irq: irq=%u: ibm_set_xive "</div><div class='del'>-		       "returned %d\n", irq, call_status);</div><div class='del'>-		printk("set_xive %x, server %x\n", ibm_set_xive, server);</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+			"%s: ibm_set_xive irq %u server %x returned %d\n",</div><div class='add'>+			__func__, irq, server, call_status);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Now unmask the interrupt (often a no-op) */</div><div class='ctx'> 	call_status = rtas_call(ibm_int_on, 1, 1, NULL, irq);</div><div class='ctx'> 	if (call_status != 0) {</div><div class='del'>-		printk(KERN_ERR "xics_enable_irq: irq=%u: ibm_int_on "</div><div class='del'>-		       "returned %d\n", irq, call_status);</div><div class='add'>+		printk(KERN_ERR "%s: ibm_int_on irq=%u returned %d\n",</div><div class='add'>+			__func__, irq, call_status);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static unsigned int xics_startup(unsigned int virq)</div><div class='add'>+{</div><div class='add'>+	/* unmask it */</div><div class='add'>+	xics_unmask_irq(virq);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void xics_mask_real_irq(unsigned int irq)</div><div class='ctx'> {</div><div class='ctx'> 	int call_status;</div><div class='hunk'>@@ -281,8 +232,8 @@ static void xics_mask_real_irq(unsigned int irq)</div><div class='ctx'> </div><div class='ctx'> 	call_status = rtas_call(ibm_int_off, 1, 1, NULL, irq);</div><div class='ctx'> 	if (call_status != 0) {</div><div class='del'>-		printk(KERN_ERR "xics_disable_real_irq: irq=%u: "</div><div class='del'>-		       "ibm_int_off returned %d\n", irq, call_status);</div><div class='add'>+		printk(KERN_ERR "%s: ibm_int_off irq=%u returned %d\n",</div><div class='add'>+			__func__, irq, call_status);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -290,8 +241,8 @@ static void xics_mask_real_irq(unsigned int irq)</div><div class='ctx'> 	call_status = rtas_call(ibm_set_xive, 3, 1, NULL, irq,</div><div class='ctx'> 				default_server, 0xff);</div><div class='ctx'> 	if (call_status != 0) {</div><div class='del'>-		printk(KERN_ERR "xics_disable_irq: irq=%u: ibm_set_xive(0xff)"</div><div class='del'>-		       " returned %d\n", irq, call_status);</div><div class='add'>+		printk(KERN_ERR "%s: ibm_set_xive(0xff) irq=%u returned %d\n",</div><div class='add'>+			__func__, irq, call_status);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -308,132 +259,77 @@ static void xics_mask_irq(unsigned int virq)</div><div class='ctx'> 	xics_mask_real_irq(irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned int xics_startup(unsigned int virq)</div><div class='del'>-{</div><div class='del'>-	unsigned int irq;</div><div class='del'>-</div><div class='del'>-	/* force a reverse mapping of the interrupt so it gets in the cache */</div><div class='del'>-	irq = (unsigned int)irq_map[virq].hwirq;</div><div class='del'>-	irq_radix_revmap(xics_host, irq);</div><div class='del'>-</div><div class='del'>-	/* unmask it */</div><div class='del'>-	xics_unmask_irq(virq);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void xics_eoi_direct(unsigned int virq)</div><div class='add'>+static void xics_mask_unknown_vec(unsigned int vec)</div><div class='ctx'> {</div><div class='del'>-	unsigned int irq = (unsigned int)irq_map[virq].hwirq;</div><div class='del'>-</div><div class='del'>-	iosync();</div><div class='del'>-	direct_xirr_info_set((0xff &lt;&lt; 24) | irq);</div><div class='add'>+	printk(KERN_ERR "Interrupt %u (real) is invalid, disabling it.\n", vec);</div><div class='add'>+	xics_mask_real_irq(vec);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static void xics_eoi_lpar(unsigned int virq)</div><div class='add'>+static inline unsigned int xics_xirr_vector(unsigned int xirr)</div><div class='ctx'> {</div><div class='del'>-	unsigned int irq = (unsigned int)irq_map[virq].hwirq;</div><div class='del'>-</div><div class='del'>-	iosync();</div><div class='del'>-	lpar_xirr_info_set((0xff &lt;&lt; 24) | irq);</div><div class='add'>+	/*</div><div class='add'>+	 * The top byte is the old cppr, to be restored on EOI.</div><div class='add'>+	 * The remaining 24 bits are the vector.</div><div class='add'>+	 */</div><div class='add'>+	return xirr &amp; 0x00ffffff;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline unsigned int xics_remap_irq(unsigned int vec)</div><div class='add'>+static unsigned int xics_get_irq_direct(void)</div><div class='ctx'> {</div><div class='add'>+	unsigned int xirr = direct_xirr_info_get();</div><div class='add'>+	unsigned int vec = xics_xirr_vector(xirr);</div><div class='ctx'> 	unsigned int irq;</div><div class='ctx'> </div><div class='del'>-	vec &amp;= 0x00ffffff;</div><div class='del'>-</div><div class='ctx'> 	if (vec == XICS_IRQ_SPURIOUS)</div><div class='ctx'> 		return NO_IRQ;</div><div class='del'>-	irq = irq_radix_revmap(xics_host, vec);</div><div class='add'>+</div><div class='add'>+	irq = irq_radix_revmap_lookup(xics_host, vec);</div><div class='ctx'> 	if (likely(irq != NO_IRQ))</div><div class='ctx'> 		return irq;</div><div class='ctx'> </div><div class='del'>-	printk(KERN_ERR "Interrupt %u (real) is invalid,"</div><div class='del'>-	       " disabling it.\n", vec);</div><div class='del'>-	xics_mask_real_irq(vec);</div><div class='del'>-	return NO_IRQ;</div><div class='del'>-}</div><div class='add'>+	/* We don't have a linux mapping, so have rtas mask it. */</div><div class='add'>+	xics_mask_unknown_vec(vec);</div><div class='ctx'> </div><div class='del'>-static unsigned int xics_get_irq_direct(void)</div><div class='del'>-{</div><div class='del'>-	return xics_remap_irq(direct_xirr_info_get());</div><div class='add'>+	/* We might learn about it later, so EOI it */</div><div class='add'>+	direct_xirr_info_set(xirr);</div><div class='add'>+	return NO_IRQ;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static unsigned int xics_get_irq_lpar(void)</div><div class='ctx'> {</div><div class='del'>-	return xics_remap_irq(lpar_xirr_info_get());</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SMP</div><div class='del'>-</div><div class='del'>-static irqreturn_t xics_ipi_dispatch(int cpu)</div><div class='del'>-{</div><div class='del'>-	WARN_ON(cpu_is_offline(cpu));</div><div class='add'>+	unsigned int xirr = lpar_xirr_info_get();</div><div class='add'>+	unsigned int vec = xics_xirr_vector(xirr);</div><div class='add'>+	unsigned int irq;</div><div class='ctx'> </div><div class='del'>-	while (xics_ipi_message[cpu].value) {</div><div class='del'>-		if (test_and_clear_bit(PPC_MSG_CALL_FUNCTION,</div><div class='del'>-				       &amp;xics_ipi_message[cpu].value)) {</div><div class='del'>-			mb();</div><div class='del'>-			smp_message_recv(PPC_MSG_CALL_FUNCTION);</div><div class='del'>-		}</div><div class='del'>-		if (test_and_clear_bit(PPC_MSG_RESCHEDULE,</div><div class='del'>-				       &amp;xics_ipi_message[cpu].value)) {</div><div class='del'>-			mb();</div><div class='del'>-			smp_message_recv(PPC_MSG_RESCHEDULE);</div><div class='del'>-		}</div><div class='del'>-		if (test_and_clear_bit(PPC_MSG_CALL_FUNC_SINGLE,</div><div class='del'>-				       &amp;xics_ipi_message[cpu].value)) {</div><div class='del'>-			mb();</div><div class='del'>-			smp_message_recv(PPC_MSG_CALL_FUNC_SINGLE);</div><div class='del'>-		}</div><div class='del'>-#if defined(CONFIG_DEBUGGER) || defined(CONFIG_KEXEC)</div><div class='del'>-		if (test_and_clear_bit(PPC_MSG_DEBUGGER_BREAK,</div><div class='del'>-				       &amp;xics_ipi_message[cpu].value)) {</div><div class='del'>-			mb();</div><div class='del'>-			smp_message_recv(PPC_MSG_DEBUGGER_BREAK);</div><div class='del'>-		}</div><div class='del'>-#endif</div><div class='del'>-	}</div><div class='del'>-	return IRQ_HANDLED;</div><div class='del'>-}</div><div class='add'>+	if (vec == XICS_IRQ_SPURIOUS)</div><div class='add'>+		return NO_IRQ;</div><div class='ctx'> </div><div class='del'>-static irqreturn_t xics_ipi_action_direct(int irq, void *dev_id)</div><div class='del'>-{</div><div class='del'>-	int cpu = smp_processor_id();</div><div class='add'>+	irq = irq_radix_revmap_lookup(xics_host, vec);</div><div class='add'>+	if (likely(irq != NO_IRQ))</div><div class='add'>+		return irq;</div><div class='ctx'> </div><div class='del'>-	direct_qirr_info(cpu, 0xff);</div><div class='add'>+	/* We don't have a linux mapping, so have RTAS mask it. */</div><div class='add'>+	xics_mask_unknown_vec(vec);</div><div class='ctx'> </div><div class='del'>-	return xics_ipi_dispatch(cpu);</div><div class='add'>+	/* We might learn about it later, so EOI it */</div><div class='add'>+	lpar_xirr_info_set(xirr);</div><div class='add'>+	return NO_IRQ;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static irqreturn_t xics_ipi_action_lpar(int irq, void *dev_id)</div><div class='add'>+static void xics_eoi_direct(unsigned int virq)</div><div class='ctx'> {</div><div class='del'>-	int cpu = smp_processor_id();</div><div class='del'>-</div><div class='del'>-	lpar_qirr_info(cpu, 0xff);</div><div class='add'>+	unsigned int irq = (unsigned int)irq_map[virq].hwirq;</div><div class='ctx'> </div><div class='del'>-	return xics_ipi_dispatch(cpu);</div><div class='add'>+	iosync();</div><div class='add'>+	direct_xirr_info_set((0xff &lt;&lt; 24) | irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void xics_cause_IPI(int cpu)</div><div class='add'>+static void xics_eoi_lpar(unsigned int virq)</div><div class='ctx'> {</div><div class='del'>-	if (firmware_has_feature(FW_FEATURE_LPAR))</div><div class='del'>-		lpar_qirr_info(cpu, IPI_PRIORITY);</div><div class='del'>-	else</div><div class='del'>-		direct_qirr_info(cpu, IPI_PRIORITY);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* CONFIG_SMP */</div><div class='add'>+	unsigned int irq = (unsigned int)irq_map[virq].hwirq;</div><div class='ctx'> </div><div class='del'>-static void xics_set_cpu_priority(unsigned char cppr)</div><div class='del'>-{</div><div class='del'>-	if (firmware_has_feature(FW_FEATURE_LPAR))</div><div class='del'>-		lpar_cppr_info(cppr);</div><div class='del'>-	else</div><div class='del'>-		direct_cppr_info(cppr);</div><div class='ctx'> 	iosync();</div><div class='add'>+	lpar_xirr_info_set((0xff &lt;&lt; 24) | irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void xics_set_affinity(unsigned int virq, cpumask_t cpumask)</div><div class='hunk'>@@ -450,8 +346,8 @@ static void xics_set_affinity(unsigned int virq, cpumask_t cpumask)</div><div class='ctx'> 	status = rtas_call(ibm_get_xive, 1, 3, xics_status, irq);</div><div class='ctx'> </div><div class='ctx'> 	if (status) {</div><div class='del'>-		printk(KERN_ERR "xics_set_affinity: irq=%u ibm,get-xive "</div><div class='del'>-		       "returns %d\n", irq, status);</div><div class='add'>+		printk(KERN_ERR "%s: ibm,get-xive irq=%u returns %d\n",</div><div class='add'>+			__func__, irq, status);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -463,8 +359,9 @@ static void xics_set_affinity(unsigned int virq, cpumask_t cpumask)</div><div class='ctx'> 	if (irq_server == -1) {</div><div class='ctx'> 		char cpulist[128];</div><div class='ctx'> 		cpumask_scnprintf(cpulist, sizeof(cpulist), cpumask);</div><div class='del'>-		printk(KERN_WARNING "xics_set_affinity: No online cpus in "</div><div class='del'>-				"the mask %s for irq %d\n", cpulist, virq);</div><div class='add'>+		printk(KERN_WARNING</div><div class='add'>+			"%s: No online cpus in the mask %s for irq %d\n",</div><div class='add'>+			__func__, cpulist, virq);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -472,28 +369,12 @@ static void xics_set_affinity(unsigned int virq, cpumask_t cpumask)</div><div class='ctx'> 				irq, irq_server, xics_status[1]);</div><div class='ctx'> </div><div class='ctx'> 	if (status) {</div><div class='del'>-		printk(KERN_ERR "xics_set_affinity: irq=%u ibm,set-xive "</div><div class='del'>-		       "returns %d\n", irq, status);</div><div class='add'>+		printk(KERN_ERR "%s: ibm,set-xive irq=%u returns %d\n",</div><div class='add'>+			__func__, irq, status);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void xics_setup_cpu(void)</div><div class='del'>-{</div><div class='del'>-	xics_set_cpu_priority(0xff);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Put the calling processor into the GIQ.  This is really only</div><div class='del'>-	 * necessary from a secondary thread as the OF start-cpu interface</div><div class='del'>-	 * performs this function for us on primary threads.</div><div class='del'>-	 *</div><div class='del'>-	 * XXX: undo of teardown on kexec needs this too, as may hotplug</div><div class='del'>-	 */</div><div class='del'>-	rtas_set_indicator_fast(GLOBAL_INTERRUPT_QUEUE,</div><div class='del'>-		(1UL &lt;&lt; interrupt_server_size) - 1 - default_distrib_server, 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> static struct irq_chip xics_pic_direct = {</div><div class='ctx'> 	.typename = " XICS     ",</div><div class='ctx'> 	.startup = xics_startup,</div><div class='hunk'>@@ -503,7 +384,6 @@ static struct irq_chip xics_pic_direct = {</div><div class='ctx'> 	.set_affinity = xics_set_affinity</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> static struct irq_chip xics_pic_lpar = {</div><div class='ctx'> 	.typename = " XICS     ",</div><div class='ctx'> 	.startup = xics_startup,</div><div class='hunk'>@@ -513,6 +393,9 @@ static struct irq_chip xics_pic_lpar = {</div><div class='ctx'> 	.set_affinity = xics_set_affinity</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+/* Interface to arch irq controller subsystem layer */</div><div class='add'>+</div><div class='ctx'> /* Points to the irq_chip we're actually using */</div><div class='ctx'> static struct irq_chip *xics_irq_chip;</div><div class='ctx'> </div><div class='hunk'>@@ -530,6 +413,9 @@ static int xics_host_map(struct irq_host *h, unsigned int virq,</div><div class='ctx'> {</div><div class='ctx'> 	pr_debug("xics: map virq %d, hwirq 0x%lx\n", virq, hw);</div><div class='ctx'> </div><div class='add'>+	/* Insert the interrupt mapping into the radix tree for fast lookup */</div><div class='add'>+	irq_radix_revmap_insert(xics_host, virq, hw);</div><div class='add'>+</div><div class='ctx'> 	get_irq_desc(virq)-&gt;status |= IRQ_LEVEL;</div><div class='ctx'> 	set_irq_chip_and_handler(virq, xics_irq_chip, handle_fasteoi_irq);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -569,10 +455,169 @@ static void __init xics_init_host(void)</div><div class='ctx'> 	irq_set_default_host(xics_host);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+/* Inter-processor interrupt support */</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SMP</div><div class='add'>+/*</div><div class='add'>+ * XICS only has a single IPI, so encode the messages per CPU</div><div class='add'>+ */</div><div class='add'>+struct xics_ipi_struct {</div><div class='add'>+        unsigned long value;</div><div class='add'>+	} ____cacheline_aligned;</div><div class='add'>+</div><div class='add'>+static struct xics_ipi_struct xics_ipi_message[NR_CPUS] __cacheline_aligned;</div><div class='add'>+</div><div class='add'>+static inline void smp_xics_do_message(int cpu, int msg)</div><div class='add'>+{</div><div class='add'>+	set_bit(msg, &amp;xics_ipi_message[cpu].value);</div><div class='add'>+	mb();</div><div class='add'>+	if (firmware_has_feature(FW_FEATURE_LPAR))</div><div class='add'>+		lpar_qirr_info(cpu, IPI_PRIORITY);</div><div class='add'>+	else</div><div class='add'>+		direct_qirr_info(cpu, IPI_PRIORITY);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void smp_xics_message_pass(int target, int msg)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	if (target &lt; NR_CPUS) {</div><div class='add'>+		smp_xics_do_message(target, msg);</div><div class='add'>+	} else {</div><div class='add'>+		for_each_online_cpu(i) {</div><div class='add'>+			if (target == MSG_ALL_BUT_SELF</div><div class='add'>+			    &amp;&amp; i == smp_processor_id())</div><div class='add'>+				continue;</div><div class='add'>+			smp_xics_do_message(i, msg);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t xics_ipi_dispatch(int cpu)</div><div class='add'>+{</div><div class='add'>+	WARN_ON(cpu_is_offline(cpu));</div><div class='add'>+</div><div class='add'>+	mb();	/* order mmio clearing qirr */</div><div class='add'>+	while (xics_ipi_message[cpu].value) {</div><div class='add'>+		if (test_and_clear_bit(PPC_MSG_CALL_FUNCTION,</div><div class='add'>+				       &amp;xics_ipi_message[cpu].value)) {</div><div class='add'>+			smp_message_recv(PPC_MSG_CALL_FUNCTION);</div><div class='add'>+		}</div><div class='add'>+		if (test_and_clear_bit(PPC_MSG_RESCHEDULE,</div><div class='add'>+				       &amp;xics_ipi_message[cpu].value)) {</div><div class='add'>+			smp_message_recv(PPC_MSG_RESCHEDULE);</div><div class='add'>+		}</div><div class='add'>+		if (test_and_clear_bit(PPC_MSG_CALL_FUNC_SINGLE,</div><div class='add'>+				       &amp;xics_ipi_message[cpu].value)) {</div><div class='add'>+			smp_message_recv(PPC_MSG_CALL_FUNC_SINGLE);</div><div class='add'>+		}</div><div class='add'>+#if defined(CONFIG_DEBUGGER) || defined(CONFIG_KEXEC)</div><div class='add'>+		if (test_and_clear_bit(PPC_MSG_DEBUGGER_BREAK,</div><div class='add'>+				       &amp;xics_ipi_message[cpu].value)) {</div><div class='add'>+			smp_message_recv(PPC_MSG_DEBUGGER_BREAK);</div><div class='add'>+		}</div><div class='add'>+#endif</div><div class='add'>+	}</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t xics_ipi_action_direct(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	int cpu = smp_processor_id();</div><div class='add'>+</div><div class='add'>+	direct_qirr_info(cpu, 0xff);</div><div class='add'>+</div><div class='add'>+	return xics_ipi_dispatch(cpu);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t xics_ipi_action_lpar(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	int cpu = smp_processor_id();</div><div class='add'>+</div><div class='add'>+	lpar_qirr_info(cpu, 0xff);</div><div class='add'>+</div><div class='add'>+	return xics_ipi_dispatch(cpu);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void xics_request_ipi(void)</div><div class='add'>+{</div><div class='add'>+	unsigned int ipi;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	ipi = irq_create_mapping(xics_host, XICS_IPI);</div><div class='add'>+	BUG_ON(ipi == NO_IRQ);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * IPIs are marked IRQF_DISABLED as they must run with irqs</div><div class='add'>+	 * disabled</div><div class='add'>+	 */</div><div class='add'>+	set_irq_handler(ipi, handle_percpu_irq);</div><div class='add'>+	if (firmware_has_feature(FW_FEATURE_LPAR))</div><div class='add'>+		rc = request_irq(ipi, xics_ipi_action_lpar,</div><div class='add'>+				IRQF_DISABLED|IRQF_PERCPU, "IPI", NULL);</div><div class='add'>+	else</div><div class='add'>+		rc = request_irq(ipi, xics_ipi_action_direct,</div><div class='add'>+				IRQF_DISABLED|IRQF_PERCPU, "IPI", NULL);</div><div class='add'>+	BUG_ON(rc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int __init smp_xics_probe(void)</div><div class='add'>+{</div><div class='add'>+	xics_request_ipi();</div><div class='add'>+</div><div class='add'>+	return cpus_weight(cpu_possible_map);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_SMP */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Initialization */</div><div class='add'>+</div><div class='add'>+static void xics_update_irq_servers(void)</div><div class='add'>+{</div><div class='add'>+	int i, j;</div><div class='add'>+	struct device_node *np;</div><div class='add'>+	u32 ilen;</div><div class='add'>+	const u32 *ireg, *isize;</div><div class='add'>+	u32 hcpuid;</div><div class='add'>+</div><div class='add'>+	/* Find the server numbers for the boot cpu. */</div><div class='add'>+	np = of_get_cpu_node(boot_cpuid, NULL);</div><div class='add'>+	BUG_ON(!np);</div><div class='add'>+</div><div class='add'>+	ireg = of_get_property(np, "ibm,ppc-interrupt-gserver#s", &amp;ilen);</div><div class='add'>+	if (!ireg) {</div><div class='add'>+		of_node_put(np);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	i = ilen / sizeof(int);</div><div class='add'>+	hcpuid = get_hard_smp_processor_id(boot_cpuid);</div><div class='add'>+</div><div class='add'>+	/* Global interrupt distribution server is specified in the last</div><div class='add'>+	 * entry of "ibm,ppc-interrupt-gserver#s" property. Get the last</div><div class='add'>+	 * entry fom this property for current boot cpu id and use it as</div><div class='add'>+	 * default distribution server</div><div class='add'>+	 */</div><div class='add'>+	for (j = 0; j &lt; i; j += 2) {</div><div class='add'>+		if (ireg[j] == hcpuid) {</div><div class='add'>+			default_server = hcpuid;</div><div class='add'>+			default_distrib_server = ireg[j+1];</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* get the bit size of server numbers */</div><div class='add'>+	isize = of_get_property(np, "ibm,interrupt-server#-size", NULL);</div><div class='add'>+	if (isize)</div><div class='add'>+		interrupt_server_size = *isize;</div><div class='add'>+</div><div class='add'>+	of_node_put(np);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void __init xics_map_one_cpu(int hw_id, unsigned long addr,</div><div class='ctx'> 				     unsigned long size)</div><div class='ctx'> {</div><div class='del'>-#ifdef CONFIG_SMP</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	/* This may look gross but it's good enough for now, we don't quite</div><div class='hunk'>@@ -586,11 +631,6 @@ static void __init xics_map_one_cpu(int hw_id, unsigned long addr,</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-#else</div><div class='del'>-	if (hw_id != 0)</div><div class='del'>-		return;</div><div class='del'>-	xics_per_cpu[0] = ioremap(addr, size);</div><div class='del'>-#endif /* CONFIG_SMP */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __init xics_init_one_node(struct device_node *np,</div><div class='hunk'>@@ -652,15 +692,17 @@ void __init xics_init_IRQ(void)</div><div class='ctx'> </div><div class='ctx'> 	for_each_node_by_type(np, "PowerPC-External-Interrupt-Presentation") {</div><div class='ctx'> 		found = 1;</div><div class='del'>-		if (firmware_has_feature(FW_FEATURE_LPAR))</div><div class='add'>+		if (firmware_has_feature(FW_FEATURE_LPAR)) {</div><div class='add'>+			of_node_put(np);</div><div class='ctx'> 			break;</div><div class='add'>+			}</div><div class='ctx'> 		xics_init_one_node(np, &amp;indx);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (found == 0)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	xics_init_host();</div><div class='ctx'> 	xics_update_irq_servers();</div><div class='add'>+	xics_init_host();</div><div class='ctx'> </div><div class='ctx'> 	if (firmware_has_feature(FW_FEATURE_LPAR))</div><div class='ctx'> 		ppc_md.get_irq = xics_get_irq_lpar;</div><div class='hunk'>@@ -672,30 +714,31 @@ void __init xics_init_IRQ(void)</div><div class='ctx'> 	ppc64_boot_msg(0x21, "XICS Done");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Cpu startup, shutdown, and hotplug */</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SMP</div><div class='del'>-void xics_request_IPIs(void)</div><div class='add'>+static void xics_set_cpu_priority(unsigned char cppr)</div><div class='ctx'> {</div><div class='del'>-	unsigned int ipi;</div><div class='del'>-	int rc;</div><div class='del'>-</div><div class='del'>-	ipi = irq_create_mapping(xics_host, XICS_IPI);</div><div class='del'>-	BUG_ON(ipi == NO_IRQ);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * IPIs are marked IRQF_DISABLED as they must run with irqs</div><div class='del'>-	 * disabled</div><div class='del'>-	 */</div><div class='del'>-	set_irq_handler(ipi, handle_percpu_irq);</div><div class='ctx'> 	if (firmware_has_feature(FW_FEATURE_LPAR))</div><div class='del'>-		rc = request_irq(ipi, xics_ipi_action_lpar, IRQF_DISABLED,</div><div class='del'>-				"IPI", NULL);</div><div class='add'>+		lpar_cppr_info(cppr);</div><div class='ctx'> 	else</div><div class='del'>-		rc = request_irq(ipi, xics_ipi_action_direct, IRQF_DISABLED,</div><div class='del'>-				"IPI", NULL);</div><div class='del'>-	BUG_ON(rc);</div><div class='add'>+		direct_cppr_info(cppr);</div><div class='add'>+	iosync();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Have the calling processor join or leave the specified global queue */</div><div class='add'>+static void xics_set_cpu_giq(unsigned int gserver, unsigned int join)</div><div class='add'>+{</div><div class='add'>+	int status = rtas_set_indicator_fast(GLOBAL_INTERRUPT_QUEUE,</div><div class='add'>+		(1UL &lt;&lt; interrupt_server_size) - 1 - gserver, join);</div><div class='add'>+	WARN_ON(status &lt; 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void xics_setup_cpu(void)</div><div class='add'>+{</div><div class='add'>+	xics_set_cpu_priority(0xff);</div><div class='add'>+</div><div class='add'>+	xics_set_cpu_giq(default_distrib_server, 1);</div><div class='ctx'> }</div><div class='del'>-#endif /* CONFIG_SMP */</div><div class='ctx'> </div><div class='ctx'> void xics_teardown_cpu(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -703,9 +746,7 @@ void xics_teardown_cpu(void)</div><div class='ctx'> </div><div class='ctx'> 	xics_set_cpu_priority(0);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Clear IPI</div><div class='del'>-	 */</div><div class='add'>+	/* Clear any pending IPI request */</div><div class='ctx'> 	if (firmware_has_feature(FW_FEATURE_LPAR))</div><div class='ctx'> 		lpar_qirr_info(cpu, 0xff);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -714,34 +755,28 @@ void xics_teardown_cpu(void)</div><div class='ctx'> </div><div class='ctx'> void xics_kexec_teardown_cpu(int secondary)</div><div class='ctx'> {</div><div class='del'>-	unsigned int ipi;</div><div class='del'>-	struct irq_desc *desc;</div><div class='del'>-</div><div class='ctx'> 	xics_teardown_cpu();</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * we need to EOI the IPI</div><div class='add'>+	 * we take the ipi irq but and never return so we</div><div class='add'>+	 * need to EOI the IPI, but want to leave our priority 0</div><div class='ctx'> 	 *</div><div class='del'>-	 * probably need to check all the other interrupts too</div><div class='add'>+	 * should we check all the other interrupts too?</div><div class='ctx'> 	 * should we be flagging idle loop instead?</div><div class='ctx'> 	 * or creating some task to be scheduled?</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	ipi = irq_find_mapping(xics_host, XICS_IPI);</div><div class='del'>-	if (ipi == XICS_IRQ_SPURIOUS)</div><div class='del'>-		return;</div><div class='del'>-	desc = get_irq_desc(ipi);</div><div class='del'>-	if (desc-&gt;chip &amp;&amp; desc-&gt;chip-&gt;eoi)</div><div class='del'>-		desc-&gt;chip-&gt;eoi(ipi);</div><div class='add'>+	if (firmware_has_feature(FW_FEATURE_LPAR))</div><div class='add'>+		lpar_xirr_info_set((0x00 &lt;&lt; 24) | XICS_IPI);</div><div class='add'>+	else</div><div class='add'>+		direct_xirr_info_set((0x00 &lt;&lt; 24) | XICS_IPI);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Some machines need to have at least one cpu in the GIQ,</div><div class='ctx'> 	 * so leave the master cpu in the group.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (secondary)</div><div class='del'>-		rtas_set_indicator_fast(GLOBAL_INTERRUPT_QUEUE,</div><div class='del'>-				   (1UL &lt;&lt; interrupt_server_size) - 1 -</div><div class='del'>-				   default_distrib_server, 0);</div><div class='add'>+		xics_set_cpu_giq(default_distrib_server, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_HOTPLUG_CPU</div><div class='hunk'>@@ -749,17 +784,18 @@ void xics_kexec_teardown_cpu(int secondary)</div><div class='ctx'> /* Interrupts are disabled. */</div><div class='ctx'> void xics_migrate_irqs_away(void)</div><div class='ctx'> {</div><div class='del'>-	int status;</div><div class='ctx'> 	int cpu = smp_processor_id(), hw_cpu = hard_smp_processor_id();</div><div class='ctx'> 	unsigned int irq, virq;</div><div class='ctx'> </div><div class='add'>+	/* If we used to be the default server, move to the new "boot_cpuid" */</div><div class='add'>+	if (hw_cpu == default_server)</div><div class='add'>+		xics_update_irq_servers();</div><div class='add'>+</div><div class='ctx'> 	/* Reject any interrupt that was queued to us... */</div><div class='ctx'> 	xics_set_cpu_priority(0);</div><div class='ctx'> </div><div class='del'>-	/* remove ourselves from the global interrupt queue */</div><div class='del'>-	status = rtas_set_indicator_fast(GLOBAL_INTERRUPT_QUEUE,</div><div class='del'>-		(1UL &lt;&lt; interrupt_server_size) - 1 - default_distrib_server, 0);</div><div class='del'>-	WARN_ON(status &lt; 0);</div><div class='add'>+	/* Remove ourselves from the global interrupt queue */</div><div class='add'>+	xics_set_cpu_giq(default_distrib_server, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* Allow IPIs again... */</div><div class='ctx'> 	xics_set_cpu_priority(DEFAULT_PRIORITY);</div><div class='hunk'>@@ -767,6 +803,7 @@ void xics_migrate_irqs_away(void)</div><div class='ctx'> 	for_each_irq(virq) {</div><div class='ctx'> 		struct irq_desc *desc;</div><div class='ctx'> 		int xics_status[2];</div><div class='add'>+		int status;</div><div class='ctx'> 		unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 		/* We cant set affinity on ISA interrupts */</div><div class='hunk'>@@ -790,9 +827,8 @@ void xics_migrate_irqs_away(void)</div><div class='ctx'> </div><div class='ctx'> 		status = rtas_call(ibm_get_xive, 1, 3, xics_status, irq);</div><div class='ctx'> 		if (status) {</div><div class='del'>-			printk(KERN_ERR "migrate_irqs_away: irq=%u "</div><div class='del'>-					"ibm,get-xive returns %d\n",</div><div class='del'>-					virq, status);</div><div class='add'>+			printk(KERN_ERR "%s: ibm,get-xive irq=%u returns %d\n",</div><div class='add'>+					__func__, irq, status);</div><div class='ctx'> 			goto unlock;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/platforms/pseries/xics.h b/arch/powerpc/platforms/pseries/xics.h<br/>index 1c5321ae8f2f..d1d5a83039ae 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/pseries/xics.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/platforms/pseries/xics.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/platforms/pseries/xics.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/platforms/pseries/xics.h</a></div><div class='hunk'>@@ -12,20 +12,12 @@</div><div class='ctx'> #ifndef _POWERPC_KERNEL_XICS_H</div><div class='ctx'> #define _POWERPC_KERNEL_XICS_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/cache.h&gt;</div><div class='del'>-</div><div class='ctx'> extern void xics_init_IRQ(void);</div><div class='ctx'> extern void xics_setup_cpu(void);</div><div class='ctx'> extern void xics_teardown_cpu(void);</div><div class='ctx'> extern void xics_kexec_teardown_cpu(int secondary);</div><div class='del'>-extern void xics_cause_IPI(int cpu);</div><div class='del'>-extern  void xics_request_IPIs(void);</div><div class='ctx'> extern void xics_migrate_irqs_away(void);</div><div class='del'>-</div><div class='del'>-struct xics_ipi_struct {</div><div class='del'>-	volatile unsigned long value;</div><div class='del'>-} ____cacheline_aligned;</div><div class='del'>-</div><div class='del'>-extern struct xics_ipi_struct xics_ipi_message[NR_CPUS] __cacheline_aligned;</div><div class='add'>+extern int smp_xics_probe(void);</div><div class='add'>+extern void smp_xics_message_pass(int target, int msg);</div><div class='ctx'> </div><div class='ctx'> #endif /* _POWERPC_KERNEL_XICS_H */</div><div class='head'>diff --git a/arch/powerpc/sysdev/Kconfig b/arch/powerpc/sysdev/Kconfig<br/>index 72fb35b9ebca..396582835cb5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/sysdev/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/sysdev/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/sysdev/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/sysdev/Kconfig</a></div><div class='hunk'>@@ -6,3 +6,9 @@ config PPC4xx_PCI_EXPRESS</div><div class='ctx'> 	bool</div><div class='ctx'> 	depends on PCI &amp;&amp; 4xx</div><div class='ctx'> 	default n</div><div class='add'>+</div><div class='add'>+config PPC_MSI_BITMAP</div><div class='add'>+	bool</div><div class='add'>+	depends on PCI_MSI</div><div class='add'>+	default y if MPIC</div><div class='add'>+	default y if FSL_PCI</div><div class='head'>diff --git a/arch/powerpc/sysdev/Makefile b/arch/powerpc/sysdev/Makefile<br/>index a90054b56d5c..a44709a94f97 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/sysdev/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/sysdev/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/sysdev/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/sysdev/Makefile</a></div><div class='hunk'>@@ -5,6 +5,7 @@ endif</div><div class='ctx'> mpic-msi-obj-$(CONFIG_PCI_MSI)	+= mpic_msi.o mpic_u3msi.o mpic_pasemi_msi.o</div><div class='ctx'> obj-$(CONFIG_MPIC)		+= mpic.o $(mpic-msi-obj-y)</div><div class='ctx'> fsl-msi-obj-$(CONFIG_PCI_MSI)	+= fsl_msi.o</div><div class='add'>+obj-$(CONFIG_PPC_MSI_BITMAP)	+= msi_bitmap.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_PPC_MPC106)	+= grackle.o</div><div class='ctx'> obj-$(CONFIG_PPC_DCR_NATIVE)	+= dcr-low.o</div><div class='hunk'>@@ -15,6 +16,7 @@ obj-$(CONFIG_FSL_SOC)		+= fsl_soc.o</div><div class='ctx'> obj-$(CONFIG_FSL_PCI)		+= fsl_pci.o $(fsl-msi-obj-y)</div><div class='ctx'> obj-$(CONFIG_FSL_LBC)		+= fsl_lbc.o</div><div class='ctx'> obj-$(CONFIG_FSL_GTM)		+= fsl_gtm.o</div><div class='add'>+obj-$(CONFIG_MPC8xxx_GPIO)	+= mpc8xxx_gpio.o</div><div class='ctx'> obj-$(CONFIG_RAPIDIO)		+= fsl_rio.o</div><div class='ctx'> obj-$(CONFIG_TSI108_BRIDGE)	+= tsi108_pci.o tsi108_dev.o</div><div class='ctx'> obj-$(CONFIG_QUICC_ENGINE)	+= qe_lib/</div><div class='hunk'>@@ -36,15 +38,12 @@ ifeq ($(CONFIG_PCI),y)</div><div class='ctx'> obj-$(CONFIG_4xx)		+= ppc4xx_pci.o</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='del'>-# Temporary hack until we have migrated to asm-powerpc</div><div class='del'>-ifeq ($(ARCH),powerpc)</div><div class='ctx'> obj-$(CONFIG_CPM)		+= cpm_common.o</div><div class='ctx'> obj-$(CONFIG_CPM2)		+= cpm2.o cpm2_pic.o</div><div class='ctx'> obj-$(CONFIG_QUICC_ENGINE)	+= cpm_common.o</div><div class='ctx'> obj-$(CONFIG_PPC_DCR)		+= dcr.o</div><div class='ctx'> obj-$(CONFIG_8xx)		+= mpc8xx_pic.o cpm1.o</div><div class='ctx'> obj-$(CONFIG_UCODE_PATCH)	+= micropatch.o</div><div class='del'>-endif</div><div class='ctx'> </div><div class='ctx'> ifeq ($(CONFIG_SUSPEND),y)</div><div class='ctx'> obj-$(CONFIG_6xx)		+= 6xx-suspend.o</div><div class='head'>diff --git a/arch/powerpc/sysdev/cpm1.c b/arch/powerpc/sysdev/cpm1.c<br/>index 4a04823e8423..490473ce8103 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/sysdev/cpm1.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/sysdev/cpm1.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/sysdev/cpm1.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/sysdev/cpm1.c</a></div><div class='hunk'>@@ -546,15 +546,11 @@ static int cpm1_gpio16_get(struct gpio_chip *gc, unsigned int gpio)</div><div class='ctx'> 	return !!(in_be16(&amp;iop-&gt;dat) &amp; pin_mask);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void cpm1_gpio16_set(struct gpio_chip *gc, unsigned int gpio, int value)</div><div class='add'>+static void __cpm1_gpio16_set(struct of_mm_gpio_chip *mm_gc, u16 pin_mask,</div><div class='add'>+	int value)</div><div class='ctx'> {</div><div class='del'>-	struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);</div><div class='ctx'> 	struct cpm1_gpio16_chip *cpm1_gc = to_cpm1_gpio16_chip(mm_gc);</div><div class='ctx'> 	struct cpm_ioport16 __iomem *iop = mm_gc-&gt;regs;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	u16 pin_mask = 1 &lt;&lt; (15 - gpio);</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;cpm1_gc-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	if (value)</div><div class='ctx'> 		cpm1_gc-&gt;cpdata |= pin_mask;</div><div class='hunk'>@@ -562,6 +558,18 @@ static void cpm1_gpio16_set(struct gpio_chip *gc, unsigned int gpio, int value)</div><div class='ctx'> 		cpm1_gc-&gt;cpdata &amp;= ~pin_mask;</div><div class='ctx'> </div><div class='ctx'> 	out_be16(&amp;iop-&gt;dat, cpm1_gc-&gt;cpdata);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cpm1_gpio16_set(struct gpio_chip *gc, unsigned int gpio, int value)</div><div class='add'>+{</div><div class='add'>+	struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);</div><div class='add'>+	struct cpm1_gpio16_chip *cpm1_gc = to_cpm1_gpio16_chip(mm_gc);</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u16 pin_mask = 1 &lt;&lt; (15 - gpio);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;cpm1_gc-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	__cpm1_gpio16_set(mm_gc, pin_mask, value);</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;cpm1_gc-&gt;lock, flags);</div><div class='ctx'> }</div><div class='hunk'>@@ -569,14 +577,17 @@ static void cpm1_gpio16_set(struct gpio_chip *gc, unsigned int gpio, int value)</div><div class='ctx'> static int cpm1_gpio16_dir_out(struct gpio_chip *gc, unsigned int gpio, int val)</div><div class='ctx'> {</div><div class='ctx'> 	struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);</div><div class='add'>+	struct cpm1_gpio16_chip *cpm1_gc = to_cpm1_gpio16_chip(mm_gc);</div><div class='ctx'> 	struct cpm_ioport16 __iomem *iop = mm_gc-&gt;regs;</div><div class='del'>-	u16 pin_mask;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u16 pin_mask = 1 &lt;&lt; (15 - gpio);</div><div class='ctx'> </div><div class='del'>-	pin_mask = 1 &lt;&lt; (15 - gpio);</div><div class='add'>+	spin_lock_irqsave(&amp;cpm1_gc-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	setbits16(&amp;iop-&gt;dir, pin_mask);</div><div class='add'>+	__cpm1_gpio16_set(mm_gc, pin_mask, val);</div><div class='ctx'> </div><div class='del'>-	cpm1_gpio16_set(gc, gpio, val);</div><div class='add'>+	spin_unlock_irqrestore(&amp;cpm1_gc-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -584,13 +595,17 @@ static int cpm1_gpio16_dir_out(struct gpio_chip *gc, unsigned int gpio, int val)</div><div class='ctx'> static int cpm1_gpio16_dir_in(struct gpio_chip *gc, unsigned int gpio)</div><div class='ctx'> {</div><div class='ctx'> 	struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);</div><div class='add'>+	struct cpm1_gpio16_chip *cpm1_gc = to_cpm1_gpio16_chip(mm_gc);</div><div class='ctx'> 	struct cpm_ioport16 __iomem *iop = mm_gc-&gt;regs;</div><div class='del'>-	u16 pin_mask;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u16 pin_mask = 1 &lt;&lt; (15 - gpio);</div><div class='ctx'> </div><div class='del'>-	pin_mask = 1 &lt;&lt; (15 - gpio);</div><div class='add'>+	spin_lock_irqsave(&amp;cpm1_gc-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	clrbits16(&amp;iop-&gt;dir, pin_mask);</div><div class='ctx'> </div><div class='add'>+	spin_unlock_irqrestore(&amp;cpm1_gc-&gt;lock, flags);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -655,15 +670,11 @@ static int cpm1_gpio32_get(struct gpio_chip *gc, unsigned int gpio)</div><div class='ctx'> 	return !!(in_be32(&amp;iop-&gt;dat) &amp; pin_mask);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void cpm1_gpio32_set(struct gpio_chip *gc, unsigned int gpio, int value)</div><div class='add'>+static void __cpm1_gpio32_set(struct of_mm_gpio_chip *mm_gc, u32 pin_mask,</div><div class='add'>+	int value)</div><div class='ctx'> {</div><div class='del'>-	struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);</div><div class='ctx'> 	struct cpm1_gpio32_chip *cpm1_gc = to_cpm1_gpio32_chip(mm_gc);</div><div class='ctx'> 	struct cpm_ioport32b __iomem *iop = mm_gc-&gt;regs;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	u32 pin_mask = 1 &lt;&lt; (31 - gpio);</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;cpm1_gc-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	if (value)</div><div class='ctx'> 		cpm1_gc-&gt;cpdata |= pin_mask;</div><div class='hunk'>@@ -671,6 +682,18 @@ static void cpm1_gpio32_set(struct gpio_chip *gc, unsigned int gpio, int value)</div><div class='ctx'> 		cpm1_gc-&gt;cpdata &amp;= ~pin_mask;</div><div class='ctx'> </div><div class='ctx'> 	out_be32(&amp;iop-&gt;dat, cpm1_gc-&gt;cpdata);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cpm1_gpio32_set(struct gpio_chip *gc, unsigned int gpio, int value)</div><div class='add'>+{</div><div class='add'>+	struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);</div><div class='add'>+	struct cpm1_gpio32_chip *cpm1_gc = to_cpm1_gpio32_chip(mm_gc);</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u32 pin_mask = 1 &lt;&lt; (31 - gpio);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;cpm1_gc-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	__cpm1_gpio32_set(mm_gc, pin_mask, value);</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;cpm1_gc-&gt;lock, flags);</div><div class='ctx'> }</div><div class='hunk'>@@ -678,14 +701,17 @@ static void cpm1_gpio32_set(struct gpio_chip *gc, unsigned int gpio, int value)</div><div class='ctx'> static int cpm1_gpio32_dir_out(struct gpio_chip *gc, unsigned int gpio, int val)</div><div class='ctx'> {</div><div class='ctx'> 	struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);</div><div class='add'>+	struct cpm1_gpio32_chip *cpm1_gc = to_cpm1_gpio32_chip(mm_gc);</div><div class='ctx'> 	struct cpm_ioport32b __iomem *iop = mm_gc-&gt;regs;</div><div class='del'>-	u32 pin_mask;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u32 pin_mask = 1 &lt;&lt; (31 - gpio);</div><div class='ctx'> </div><div class='del'>-	pin_mask = 1 &lt;&lt; (31 - gpio);</div><div class='add'>+	spin_lock_irqsave(&amp;cpm1_gc-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	setbits32(&amp;iop-&gt;dir, pin_mask);</div><div class='add'>+	__cpm1_gpio32_set(mm_gc, pin_mask, val);</div><div class='ctx'> </div><div class='del'>-	cpm1_gpio32_set(gc, gpio, val);</div><div class='add'>+	spin_unlock_irqrestore(&amp;cpm1_gc-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -693,13 +719,17 @@ static int cpm1_gpio32_dir_out(struct gpio_chip *gc, unsigned int gpio, int val)</div><div class='ctx'> static int cpm1_gpio32_dir_in(struct gpio_chip *gc, unsigned int gpio)</div><div class='ctx'> {</div><div class='ctx'> 	struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);</div><div class='add'>+	struct cpm1_gpio32_chip *cpm1_gc = to_cpm1_gpio32_chip(mm_gc);</div><div class='ctx'> 	struct cpm_ioport32b __iomem *iop = mm_gc-&gt;regs;</div><div class='del'>-	u32 pin_mask;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u32 pin_mask = 1 &lt;&lt; (31 - gpio);</div><div class='ctx'> </div><div class='del'>-	pin_mask = 1 &lt;&lt; (31 - gpio);</div><div class='add'>+	spin_lock_irqsave(&amp;cpm1_gc-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	clrbits32(&amp;iop-&gt;dir, pin_mask);</div><div class='ctx'> </div><div class='add'>+	spin_unlock_irqrestore(&amp;cpm1_gc-&gt;lock, flags);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/sysdev/fsl_lbc.c b/arch/powerpc/sysdev/fsl_lbc.c<br/>index 422c8faef593..0494ee55920f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/sysdev/fsl_lbc.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/sysdev/fsl_lbc.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/sysdev/fsl_lbc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/sysdev/fsl_lbc.c</a></div><div class='hunk'>@@ -11,14 +11,19 @@</div><div class='ctx'>  * (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/compiler.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;asm/prom.h&gt;</div><div class='ctx'> #include &lt;asm/fsl_lbc.h&gt;</div><div class='ctx'> </div><div class='del'>-spinlock_t fsl_lbc_lock = __SPIN_LOCK_UNLOCKED(fsl_lbc_lock);</div><div class='del'>-</div><div class='del'>-struct fsl_lbc_regs __iomem *fsl_lbc_regs;</div><div class='del'>-EXPORT_SYMBOL(fsl_lbc_regs);</div><div class='add'>+static spinlock_t fsl_lbc_lock = __SPIN_LOCK_UNLOCKED(fsl_lbc_lock);</div><div class='add'>+static struct fsl_lbc_regs __iomem *fsl_lbc_regs;</div><div class='ctx'> </div><div class='ctx'> static char __initdata *compat_lbc[] = {</div><div class='ctx'> 	"fsl,pq2-localbus",</div><div class='hunk'>@@ -127,3 +132,43 @@ int fsl_upm_find(phys_addr_t addr_base, struct fsl_upm *upm)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(fsl_upm_find);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * fsl_upm_run_pattern - actually run an UPM pattern</div><div class='add'>+ * @upm:	pointer to the fsl_upm structure obtained via fsl_upm_find</div><div class='add'>+ * @io_base:	remapped pointer to where memory access should happen</div><div class='add'>+ * @mar:	MAR register content during pattern execution</div><div class='add'>+ *</div><div class='add'>+ * This function triggers dummy write to the memory specified by the io_base,</div><div class='add'>+ * thus UPM pattern actually executed. Note that mar usage depends on the</div><div class='add'>+ * pre-programmed AMX bits in the UPM RAM.</div><div class='add'>+ */</div><div class='add'>+int fsl_upm_run_pattern(struct fsl_upm *upm, void __iomem *io_base, u32 mar)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;fsl_lbc_lock, flags);</div><div class='add'>+</div><div class='add'>+	out_be32(&amp;fsl_lbc_regs-&gt;mar, mar &lt;&lt; (32 - upm-&gt;width));</div><div class='add'>+</div><div class='add'>+	switch (upm-&gt;width) {</div><div class='add'>+	case 8:</div><div class='add'>+		out_8(io_base, 0x0);</div><div class='add'>+		break;</div><div class='add'>+	case 16:</div><div class='add'>+		out_be16(io_base, 0x0);</div><div class='add'>+		break;</div><div class='add'>+	case 32:</div><div class='add'>+		out_be32(io_base, 0x0);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;fsl_lbc_lock, flags);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(fsl_upm_run_pattern);</div><div class='head'>diff --git a/arch/powerpc/sysdev/fsl_msi.c b/arch/powerpc/sysdev/fsl_msi.c<br/>index 2c5187cc8a24..f25ce818d40a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/sysdev/fsl_msi.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/sysdev/fsl_msi.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/sysdev/fsl_msi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/sysdev/fsl_msi.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='del'>-#include &lt;linux/bitmap.h&gt;</div><div class='ctx'> #include &lt;linux/msi.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/of_platform.h&gt;</div><div class='hunk'>@@ -67,95 +66,22 @@ static struct irq_host_ops fsl_msi_host_ops = {</div><div class='ctx'> 	.map = fsl_msi_host_map,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static irq_hw_number_t fsl_msi_alloc_hwirqs(struct fsl_msi *msi, int num)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int order = get_count_order(num);</div><div class='del'>-	int offset;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;msi-&gt;bitmap_lock, flags);</div><div class='del'>-</div><div class='del'>-	offset = bitmap_find_free_region(msi-&gt;fsl_msi_bitmap,</div><div class='del'>-					NR_MSI_IRQS, order);</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;msi-&gt;bitmap_lock, flags);</div><div class='del'>-</div><div class='del'>-	pr_debug("%s: allocated 0x%x (2^%d) at offset 0x%x\n",</div><div class='del'>-		__func__, num, order, offset);</div><div class='del'>-</div><div class='del'>-	return offset;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void fsl_msi_free_hwirqs(struct fsl_msi *msi, int offset, int num)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int order = get_count_order(num);</div><div class='del'>-</div><div class='del'>-	pr_debug("%s: freeing 0x%x (2^%d) at offset 0x%x\n",</div><div class='del'>-		__func__, num, order, offset);</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;msi-&gt;bitmap_lock, flags);</div><div class='del'>-	bitmap_release_region(msi-&gt;fsl_msi_bitmap, offset, order);</div><div class='del'>-	spin_unlock_irqrestore(&amp;msi-&gt;bitmap_lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int fsl_msi_free_dt_hwirqs(struct fsl_msi *msi)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	int len;</div><div class='del'>-	const u32 *p;</div><div class='del'>-</div><div class='del'>-	bitmap_allocate_region(msi-&gt;fsl_msi_bitmap, 0,</div><div class='del'>-		       get_count_order(NR_MSI_IRQS));</div><div class='del'>-</div><div class='del'>-	p = of_get_property(msi-&gt;of_node, "msi-available-ranges", &amp;len);</div><div class='del'>-</div><div class='del'>-	if (!p) {</div><div class='del'>-		/* No msi-available-ranges property,</div><div class='del'>-		 * All the 256 MSI interrupts can be used</div><div class='del'>-		 */</div><div class='del'>-		fsl_msi_free_hwirqs(msi, 0, 0x100);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((len % (2 * sizeof(u32))) != 0) {</div><div class='del'>-		printk(KERN_WARNING "fsl_msi: Malformed msi-available-ranges "</div><div class='del'>-		       "property on %s\n", msi-&gt;of_node-&gt;full_name);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Format is: (&lt;u32 start&gt; &lt;u32 count&gt;)+ */</div><div class='del'>-	len /= 2 * sizeof(u32);</div><div class='del'>-	for (i = 0; i &lt; len; i++, p += 2)</div><div class='del'>-		fsl_msi_free_hwirqs(msi, *p, *(p + 1));</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int fsl_msi_init_allocator(struct fsl_msi *msi_data)</div><div class='ctx'> {</div><div class='ctx'> 	int rc;</div><div class='del'>-	int size = BITS_TO_LONGS(NR_MSI_IRQS) * sizeof(u32);</div><div class='ctx'> </div><div class='del'>-	msi_data-&gt;fsl_msi_bitmap = kzalloc(size, GFP_KERNEL);</div><div class='add'>+	rc = msi_bitmap_alloc(&amp;msi_data-&gt;bitmap, NR_MSI_IRQS,</div><div class='add'>+			      msi_data-&gt;irqhost-&gt;of_node);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='ctx'> </div><div class='del'>-	if (msi_data-&gt;fsl_msi_bitmap == NULL) {</div><div class='del'>-		pr_debug("%s: ENOMEM allocating allocator bitmap!\n",</div><div class='del'>-				__func__);</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	rc = msi_bitmap_reserve_dt_hwirqs(&amp;msi_data-&gt;bitmap);</div><div class='add'>+	if (rc &lt; 0) {</div><div class='add'>+		msi_bitmap_free(&amp;msi_data-&gt;bitmap);</div><div class='add'>+		return rc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rc = fsl_msi_free_dt_hwirqs(msi_data);</div><div class='del'>-	if (rc)</div><div class='del'>-		goto out_free;</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='del'>-out_free:</div><div class='del'>-	kfree(msi_data-&gt;fsl_msi_bitmap);</div><div class='del'>-</div><div class='del'>-	msi_data-&gt;fsl_msi_bitmap = NULL;</div><div class='del'>-	return rc;</div><div class='del'>-</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int fsl_msi_check_device(struct pci_dev *pdev, int nvec, int type)</div><div class='hunk'>@@ -175,7 +101,8 @@ static void fsl_teardown_msi_irqs(struct pci_dev *pdev)</div><div class='ctx'> 		if (entry-&gt;irq == NO_IRQ)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		set_irq_msi(entry-&gt;irq, NULL);</div><div class='del'>-		fsl_msi_free_hwirqs(msi_data, virq_to_hw(entry-&gt;irq), 1);</div><div class='add'>+		msi_bitmap_free_hwirqs(&amp;msi_data-&gt;bitmap,</div><div class='add'>+				       virq_to_hw(entry-&gt;irq), 1);</div><div class='ctx'> 		irq_dispose_mapping(entry-&gt;irq);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -197,15 +124,14 @@ static void fsl_compose_msi_msg(struct pci_dev *pdev, int hwirq,</div><div class='ctx'> </div><div class='ctx'> static int fsl_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)</div><div class='ctx'> {</div><div class='del'>-	irq_hw_number_t hwirq;</div><div class='del'>-	int rc;</div><div class='add'>+	int rc, hwirq;</div><div class='ctx'> 	unsigned int virq;</div><div class='ctx'> 	struct msi_desc *entry;</div><div class='ctx'> 	struct msi_msg msg;</div><div class='ctx'> 	struct fsl_msi *msi_data = fsl_msi;</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(entry, &amp;pdev-&gt;msi_list, list) {</div><div class='del'>-		hwirq = fsl_msi_alloc_hwirqs(msi_data, 1);</div><div class='add'>+		hwirq = msi_bitmap_alloc_hwirqs(&amp;msi_data-&gt;bitmap, 1);</div><div class='ctx'> 		if (hwirq &lt; 0) {</div><div class='ctx'> 			rc = hwirq;</div><div class='ctx'> 			pr_debug("%s: fail allocating msi interrupt\n",</div><div class='hunk'>@@ -216,9 +142,9 @@ static int fsl_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)</div><div class='ctx'> 		virq = irq_create_mapping(msi_data-&gt;irqhost, hwirq);</div><div class='ctx'> </div><div class='ctx'> 		if (virq == NO_IRQ) {</div><div class='del'>-			pr_debug("%s: fail mapping hwirq 0x%lx\n",</div><div class='add'>+			pr_debug("%s: fail mapping hwirq 0x%x\n",</div><div class='ctx'> 					__func__, hwirq);</div><div class='del'>-			fsl_msi_free_hwirqs(msi_data, hwirq, 1);</div><div class='add'>+			msi_bitmap_free_hwirqs(&amp;msi_data-&gt;bitmap, hwirq, 1);</div><div class='ctx'> 			rc = -ENOSPC;</div><div class='ctx'> 			goto out_free;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -317,14 +243,11 @@ static int __devinit fsl_of_msi_probe(struct of_device *dev,</div><div class='ctx'> 		goto error_out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	msi-&gt;of_node = of_node_get(dev-&gt;node);</div><div class='add'>+	msi-&gt;irqhost = irq_alloc_host(dev-&gt;node, IRQ_HOST_MAP_LINEAR,</div><div class='add'>+				      NR_MSI_IRQS, &amp;fsl_msi_host_ops, 0);</div><div class='ctx'> </div><div class='del'>-	msi-&gt;irqhost = irq_alloc_host(of_node_get(dev-&gt;node),</div><div class='del'>-				IRQ_HOST_MAP_LINEAR,</div><div class='del'>-				NR_MSI_IRQS, &amp;fsl_msi_host_ops, 0);</div><div class='ctx'> 	if (msi-&gt;irqhost == NULL) {</div><div class='ctx'> 		dev_err(&amp;dev-&gt;dev, "No memory for MSI irqhost\n");</div><div class='del'>-		of_node_put(dev-&gt;node);</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto error_out;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/powerpc/sysdev/fsl_msi.h b/arch/powerpc/sysdev/fsl_msi.h<br/>index a653468521fa..331c7e7025b7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/sysdev/fsl_msi.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/sysdev/fsl_msi.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/sysdev/fsl_msi.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/sysdev/fsl_msi.h</a></div><div class='hunk'>@@ -13,6 +13,8 @@</div><div class='ctx'> #ifndef _POWERPC_SYSDEV_FSL_MSI_H</div><div class='ctx'> #define _POWERPC_SYSDEV_FSL_MSI_H</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/msi_bitmap.h&gt;</div><div class='add'>+</div><div class='ctx'> #define NR_MSI_REG		8</div><div class='ctx'> #define IRQS_PER_MSI_REG	32</div><div class='ctx'> #define NR_MSI_IRQS	(NR_MSI_REG * IRQS_PER_MSI_REG)</div><div class='hunk'>@@ -22,9 +24,6 @@</div><div class='ctx'> #define FSL_PIC_IP_IPIC	0x00000002</div><div class='ctx'> </div><div class='ctx'> struct fsl_msi {</div><div class='del'>-	/* Device node of the MSI interrupt*/</div><div class='del'>-	struct device_node *of_node;</div><div class='del'>-</div><div class='ctx'> 	struct irq_host *irqhost;</div><div class='ctx'> </div><div class='ctx'> 	unsigned long cascade_irq;</div><div class='hunk'>@@ -34,8 +33,7 @@ struct fsl_msi {</div><div class='ctx'> 	void __iomem *msi_regs;</div><div class='ctx'> 	u32 feature;</div><div class='ctx'> </div><div class='del'>-	unsigned long *fsl_msi_bitmap;</div><div class='del'>-	spinlock_t bitmap_lock;</div><div class='add'>+	struct msi_bitmap bitmap;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #endif /* _POWERPC_SYSDEV_FSL_MSI_H */</div><div class='head'>diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c<br/>index 61e6d77efa4f..5b264eb4b1f7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/sysdev/fsl_pci.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/sysdev/fsl_pci.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/sysdev/fsl_pci.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/sysdev/fsl_pci.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*</div><div class='del'>- * MPC85xx/86xx PCI/PCIE support routing.</div><div class='add'>+ * MPC83xx/85xx/86xx PCI/PCIE support routing.</div><div class='ctx'>  *</div><div class='del'>- * Copyright 2007 Freescale Semiconductor, Inc</div><div class='add'>+ * Copyright 2007,2008 Freescale Semiconductor, Inc</div><div class='ctx'>  *</div><div class='ctx'>  * Initial author: Xianghua Xiao &lt;x.xiao@freescale.com&gt;</div><div class='ctx'>  * Recode: ZHANG WEI &lt;wei.zhang@freescale.com&gt;</div><div class='hunk'>@@ -251,20 +251,47 @@ DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_MPC8641D, quirk_fsl_pcie_header);</div><div class='ctx'> DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_MPC8610, quirk_fsl_pcie_header);</div><div class='ctx'> #endif /* CONFIG_PPC_85xx || CONFIG_PPC_86xx */</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_PPC_83xx)</div><div class='add'>+#if defined(CONFIG_PPC_83xx) || defined(CONFIG_PPC_MPC512x)</div><div class='ctx'> int __init mpc83xx_add_bridge(struct device_node *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int len;</div><div class='ctx'> 	struct pci_controller *hose;</div><div class='del'>-	struct resource rsrc;</div><div class='add'>+	struct resource rsrc_reg;</div><div class='add'>+	struct resource rsrc_cfg;</div><div class='ctx'> 	const int *bus_range;</div><div class='del'>-	int primary = 1, has_address = 0;</div><div class='del'>-	phys_addr_t immr = get_immrbase();</div><div class='add'>+	int primary;</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("Adding PCI host bridge %s\n", dev-&gt;full_name);</div><div class='ctx'> </div><div class='ctx'> 	/* Fetch host bridge registers address */</div><div class='del'>-	has_address = (of_address_to_resource(dev, 0, &amp;rsrc) == 0);</div><div class='add'>+	if (of_address_to_resource(dev, 0, &amp;rsrc_reg)) {</div><div class='add'>+		printk(KERN_WARNING "Can't get pci register base!\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(&amp;rsrc_cfg, 0, sizeof(rsrc_cfg));</div><div class='add'>+</div><div class='add'>+	if (of_address_to_resource(dev, 1, &amp;rsrc_cfg)) {</div><div class='add'>+		printk(KERN_WARNING</div><div class='add'>+			"No pci config register base in dev tree, "</div><div class='add'>+			"using default\n");</div><div class='add'>+		/*</div><div class='add'>+		 * MPC83xx supports up to two host controllers</div><div class='add'>+		 * 	one at 0x8500 has config space registers at 0x8300</div><div class='add'>+		 * 	one at 0x8600 has config space registers at 0x8380</div><div class='add'>+		 */</div><div class='add'>+		if ((rsrc_reg.start &amp; 0xfffff) == 0x8500)</div><div class='add'>+			rsrc_cfg.start = (rsrc_reg.start &amp; 0xfff00000) + 0x8300;</div><div class='add'>+		else if ((rsrc_reg.start &amp; 0xfffff) == 0x8600)</div><div class='add'>+			rsrc_cfg.start = (rsrc_reg.start &amp; 0xfff00000) + 0x8380;</div><div class='add'>+	}</div><div class='add'>+	/*</div><div class='add'>+	 * Controller at offset 0x8500 is primary</div><div class='add'>+	 */</div><div class='add'>+	if ((rsrc_reg.start &amp; 0xfffff) == 0x8500)</div><div class='add'>+		primary = 1;</div><div class='add'>+	else</div><div class='add'>+		primary = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Get bus range if any */</div><div class='ctx'> 	bus_range = of_get_property(dev, "bus-range", &amp;len);</div><div class='hunk'>@@ -281,22 +308,11 @@ int __init mpc83xx_add_bridge(struct device_node *dev)</div><div class='ctx'> 	hose-&gt;first_busno = bus_range ? bus_range[0] : 0;</div><div class='ctx'> 	hose-&gt;last_busno = bus_range ? bus_range[1] : 0xff;</div><div class='ctx'> </div><div class='del'>-	/* MPC83xx supports up to two host controllers one at 0x8500 from immrbar</div><div class='del'>-	 * the other at 0x8600, we consider the 0x8500 the primary controller</div><div class='del'>-	 */</div><div class='del'>-	/* PCI 1 */</div><div class='del'>-	if ((rsrc.start &amp; 0xfffff) == 0x8500) {</div><div class='del'>-		setup_indirect_pci(hose, immr + 0x8300, immr + 0x8304, 0);</div><div class='del'>-	}</div><div class='del'>-	/* PCI 2 */</div><div class='del'>-	if ((rsrc.start &amp; 0xfffff) == 0x8600) {</div><div class='del'>-		setup_indirect_pci(hose, immr + 0x8380, immr + 0x8384, 0);</div><div class='del'>-		primary = 0;</div><div class='del'>-	}</div><div class='add'>+	setup_indirect_pci(hose, rsrc_cfg.start, rsrc_cfg.start + 4, 0);</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "Found MPC83xx PCI host bridge at 0x%016llx. "</div><div class='add'>+	printk(KERN_INFO "Found FSL PCI host bridge at 0x%016llx. "</div><div class='ctx'> 	       "Firmware bus number: %d-&gt;%d\n",</div><div class='del'>-	       (unsigned long long)rsrc.start, hose-&gt;first_busno,</div><div class='add'>+	       (unsigned long long)rsrc_reg.start, hose-&gt;first_busno,</div><div class='ctx'> 	       hose-&gt;last_busno);</div><div class='ctx'> </div><div class='ctx'> 	pr_debug(" -&gt;Hose at 0x%p, cfg_addr=0x%p,cfg_data=0x%p\n",</div><div class='head'>diff --git a/arch/powerpc/sysdev/fsl_soc.c b/arch/powerpc/sysdev/fsl_soc.c<br/>index 214388e11807..01b884b25696 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/sysdev/fsl_soc.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/sysdev/fsl_soc.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/sysdev/fsl_soc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/sysdev/fsl_soc.c</a></div><div class='hunk'>@@ -412,53 +412,6 @@ err:</div><div class='ctx'> </div><div class='ctx'> arch_initcall(gfar_of_init);</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PPC_83xx</div><div class='del'>-static int __init mpc83xx_wdt_init(void)</div><div class='del'>-{</div><div class='del'>-	struct resource r;</div><div class='del'>-	struct device_node *np;</div><div class='del'>-	struct platform_device *dev;</div><div class='del'>-	u32 freq = fsl_get_sys_freq();</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	np = of_find_compatible_node(NULL, "watchdog", "mpc83xx_wdt");</div><div class='del'>-</div><div class='del'>-	if (!np) {</div><div class='del'>-		ret = -ENODEV;</div><div class='del'>-		goto nodev;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memset(&amp;r, 0, sizeof(r));</div><div class='del'>-</div><div class='del'>-	ret = of_address_to_resource(np, 0, &amp;r);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	dev = platform_device_register_simple("mpc83xx_wdt", 0, &amp;r, 1);</div><div class='del'>-	if (IS_ERR(dev)) {</div><div class='del'>-		ret = PTR_ERR(dev);</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = platform_device_add_data(dev, &amp;freq, sizeof(freq));</div><div class='del'>-	if (ret)</div><div class='del'>-		goto unreg;</div><div class='del'>-</div><div class='del'>-	of_node_put(np);</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-unreg:</div><div class='del'>-	platform_device_unregister(dev);</div><div class='del'>-err:</div><div class='del'>-	of_node_put(np);</div><div class='del'>-nodev:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-arch_initcall(mpc83xx_wdt_init);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> static enum fsl_usb2_phy_modes determine_usb_phy(const char *phy_type)</div><div class='ctx'> {</div><div class='ctx'> 	if (!phy_type)</div><div class='hunk'>@@ -767,42 +720,6 @@ void fsl_rstcr_restart(char *cmd)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_FB_FSL_DIU) || defined(CONFIG_FB_FSL_DIU_MODULE)</div><div class='del'>-struct platform_diu_data_ops diu_ops = {</div><div class='del'>-	.diu_size = 1280 * 1024 * 4,	/* default one 1280x1024 buffer */</div><div class='del'>-};</div><div class='add'>+struct platform_diu_data_ops diu_ops;</div><div class='ctx'> EXPORT_SYMBOL(diu_ops);</div><div class='del'>-</div><div class='del'>-int __init preallocate_diu_videomemory(void)</div><div class='del'>-{</div><div class='del'>-	pr_debug("diu_size=%lu\n", diu_ops.diu_size);</div><div class='del'>-</div><div class='del'>-	diu_ops.diu_mem = __alloc_bootmem(diu_ops.diu_size, 8, 0);</div><div class='del'>-	if (!diu_ops.diu_mem) {</div><div class='del'>-		printk(KERN_ERR "fsl-diu: cannot allocate %lu bytes\n",</div><div class='del'>-			diu_ops.diu_size);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pr_debug("diu_mem=%p\n", diu_ops.diu_mem);</div><div class='del'>-</div><div class='del'>-	rh_init(&amp;diu_ops.diu_rh_info, 4096, ARRAY_SIZE(diu_ops.diu_rh_block),</div><div class='del'>-		diu_ops.diu_rh_block);</div><div class='del'>-	return rh_attach_region(&amp;diu_ops.diu_rh_info,</div><div class='del'>-				(unsigned long) diu_ops.diu_mem,</div><div class='del'>-				diu_ops.diu_size);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init early_parse_diufb(char *p)</div><div class='del'>-{</div><div class='del'>-	if (!p)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	diu_ops.diu_size = _ALIGN_UP(memparse(p, &amp;p), 8);</div><div class='del'>-</div><div class='del'>-	pr_debug("diu_size=%lu\n", diu_ops.diu_size);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-early_param("diufb", early_parse_diufb);</div><div class='del'>-</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/powerpc/sysdev/fsl_soc.h b/arch/powerpc/sysdev/fsl_soc.h<br/>index 024299887352..60f7f227327c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/sysdev/fsl_soc.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/sysdev/fsl_soc.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/sysdev/fsl_soc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/sysdev/fsl_soc.h</a></div><div class='hunk'>@@ -20,14 +20,7 @@ extern int fsl_spi_init(struct spi_board_info *board_infos,</div><div class='ctx'> extern void fsl_rstcr_restart(char *cmd);</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_FB_FSL_DIU) || defined(CONFIG_FB_FSL_DIU_MODULE)</div><div class='del'>-#include &lt;linux/bootmem.h&gt;</div><div class='del'>-#include &lt;asm/rheap.h&gt;</div><div class='ctx'> struct platform_diu_data_ops {</div><div class='del'>-	rh_block_t diu_rh_block[16];</div><div class='del'>-	rh_info_t diu_rh_info;</div><div class='del'>-	unsigned long diu_size;</div><div class='del'>-	void *diu_mem;</div><div class='del'>-</div><div class='ctx'> 	unsigned int (*get_pixel_format) (unsigned int bits_per_pixel,</div><div class='ctx'> 		int monitor_port);</div><div class='ctx'> 	void (*set_gamma_table) (int monitor_port, char *gamma_table_base);</div><div class='hunk'>@@ -38,7 +31,6 @@ struct platform_diu_data_ops {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern struct platform_diu_data_ops diu_ops;</div><div class='del'>-int __init preallocate_diu_videomemory(void);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/powerpc/sysdev/mpc8xxx_gpio.c b/arch/powerpc/sysdev/mpc8xxx_gpio.c<br/>new file mode 100644<br/>index 000000000000..103eace36194<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/sysdev/mpc8xxx_gpio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/sysdev/mpc8xxx_gpio.c</a></div><div class='hunk'>@@ -0,0 +1,171 @@</div><div class='add'>+/*</div><div class='add'>+ * GPIOs on MPC8349/8572/8610 and compatible</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2008 Peter Korsgaard &lt;jacmet@sunsite.dk&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file is licensed under the terms of the GNU General Public License</div><div class='add'>+ * version 2.  This program is licensed "as is" without any warranty of any</div><div class='add'>+ * kind, whether express or implied.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_gpio.h&gt;</div><div class='add'>+#include &lt;linux/gpio.h&gt;</div><div class='add'>+</div><div class='add'>+#define MPC8XXX_GPIO_PINS	32</div><div class='add'>+</div><div class='add'>+#define GPIO_DIR		0x00</div><div class='add'>+#define GPIO_ODR		0x04</div><div class='add'>+#define GPIO_DAT		0x08</div><div class='add'>+#define GPIO_IER		0x0c</div><div class='add'>+#define GPIO_IMR		0x10</div><div class='add'>+#define GPIO_ICR		0x14</div><div class='add'>+</div><div class='add'>+struct mpc8xxx_gpio_chip {</div><div class='add'>+	struct of_mm_gpio_chip mm_gc;</div><div class='add'>+	spinlock_t lock;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * shadowed data register to be able to clear/set output pins in</div><div class='add'>+	 * open drain mode safely</div><div class='add'>+	 */</div><div class='add'>+	u32 data;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline u32 mpc8xxx_gpio2mask(unsigned int gpio)</div><div class='add'>+{</div><div class='add'>+	return 1u &lt;&lt; (MPC8XXX_GPIO_PINS - 1 - gpio);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct mpc8xxx_gpio_chip *</div><div class='add'>+to_mpc8xxx_gpio_chip(struct of_mm_gpio_chip *mm)</div><div class='add'>+{</div><div class='add'>+	return container_of(mm, struct mpc8xxx_gpio_chip, mm_gc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mpc8xxx_gpio_save_regs(struct of_mm_gpio_chip *mm)</div><div class='add'>+{</div><div class='add'>+	struct mpc8xxx_gpio_chip *mpc8xxx_gc = to_mpc8xxx_gpio_chip(mm);</div><div class='add'>+</div><div class='add'>+	mpc8xxx_gc-&gt;data = in_be32(mm-&gt;regs + GPIO_DAT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mpc8xxx_gpio_get(struct gpio_chip *gc, unsigned int gpio)</div><div class='add'>+{</div><div class='add'>+	struct of_mm_gpio_chip *mm = to_of_mm_gpio_chip(gc);</div><div class='add'>+</div><div class='add'>+	return in_be32(mm-&gt;regs + GPIO_DAT) &amp; mpc8xxx_gpio2mask(gpio);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mpc8xxx_gpio_set(struct gpio_chip *gc, unsigned int gpio, int val)</div><div class='add'>+{</div><div class='add'>+	struct of_mm_gpio_chip *mm = to_of_mm_gpio_chip(gc);</div><div class='add'>+	struct mpc8xxx_gpio_chip *mpc8xxx_gc = to_mpc8xxx_gpio_chip(mm);</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;mpc8xxx_gc-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	if (val)</div><div class='add'>+		mpc8xxx_gc-&gt;data |= mpc8xxx_gpio2mask(gpio);</div><div class='add'>+	else</div><div class='add'>+		mpc8xxx_gc-&gt;data &amp;= ~mpc8xxx_gpio2mask(gpio);</div><div class='add'>+</div><div class='add'>+	out_be32(mm-&gt;regs + GPIO_DAT, mpc8xxx_gc-&gt;data);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;mpc8xxx_gc-&gt;lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mpc8xxx_gpio_dir_in(struct gpio_chip *gc, unsigned int gpio)</div><div class='add'>+{</div><div class='add'>+	struct of_mm_gpio_chip *mm = to_of_mm_gpio_chip(gc);</div><div class='add'>+	struct mpc8xxx_gpio_chip *mpc8xxx_gc = to_mpc8xxx_gpio_chip(mm);</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;mpc8xxx_gc-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	clrbits32(mm-&gt;regs + GPIO_DIR, mpc8xxx_gpio2mask(gpio));</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;mpc8xxx_gc-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mpc8xxx_gpio_dir_out(struct gpio_chip *gc, unsigned int gpio, int val)</div><div class='add'>+{</div><div class='add'>+	struct of_mm_gpio_chip *mm = to_of_mm_gpio_chip(gc);</div><div class='add'>+	struct mpc8xxx_gpio_chip *mpc8xxx_gc = to_mpc8xxx_gpio_chip(mm);</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	mpc8xxx_gpio_set(gc, gpio, val);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;mpc8xxx_gc-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	setbits32(mm-&gt;regs + GPIO_DIR, mpc8xxx_gpio2mask(gpio));</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;mpc8xxx_gc-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init mpc8xxx_add_controller(struct device_node *np)</div><div class='add'>+{</div><div class='add'>+	struct mpc8xxx_gpio_chip *mpc8xxx_gc;</div><div class='add'>+	struct of_mm_gpio_chip *mm_gc;</div><div class='add'>+	struct of_gpio_chip *of_gc;</div><div class='add'>+	struct gpio_chip *gc;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mpc8xxx_gc = kzalloc(sizeof(*mpc8xxx_gc), GFP_KERNEL);</div><div class='add'>+	if (!mpc8xxx_gc) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;mpc8xxx_gc-&gt;lock);</div><div class='add'>+</div><div class='add'>+	mm_gc = &amp;mpc8xxx_gc-&gt;mm_gc;</div><div class='add'>+	of_gc = &amp;mm_gc-&gt;of_gc;</div><div class='add'>+	gc = &amp;of_gc-&gt;gc;</div><div class='add'>+</div><div class='add'>+	mm_gc-&gt;save_regs = mpc8xxx_gpio_save_regs;</div><div class='add'>+	of_gc-&gt;gpio_cells = 2;</div><div class='add'>+	gc-&gt;ngpio = MPC8XXX_GPIO_PINS;</div><div class='add'>+	gc-&gt;direction_input = mpc8xxx_gpio_dir_in;</div><div class='add'>+	gc-&gt;direction_output = mpc8xxx_gpio_dir_out;</div><div class='add'>+	gc-&gt;get = mpc8xxx_gpio_get;</div><div class='add'>+	gc-&gt;set = mpc8xxx_gpio_set;</div><div class='add'>+</div><div class='add'>+	ret = of_mm_gpiochip_add(np, mm_gc);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	pr_err("%s: registration failed with status %d\n",</div><div class='add'>+	       np-&gt;full_name, ret);</div><div class='add'>+	kfree(mpc8xxx_gc);</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init mpc8xxx_add_gpiochips(void)</div><div class='add'>+{</div><div class='add'>+	struct device_node *np;</div><div class='add'>+</div><div class='add'>+	for_each_compatible_node(np, NULL, "fsl,mpc8349-gpio")</div><div class='add'>+		mpc8xxx_add_controller(np);</div><div class='add'>+</div><div class='add'>+	for_each_compatible_node(np, NULL, "fsl,mpc8572-gpio")</div><div class='add'>+		mpc8xxx_add_controller(np);</div><div class='add'>+</div><div class='add'>+	for_each_compatible_node(np, NULL, "fsl,mpc8610-gpio")</div><div class='add'>+		mpc8xxx_add_controller(np);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+arch_initcall(mpc8xxx_add_gpiochips);</div><div class='head'>diff --git a/arch/powerpc/sysdev/mpic.h b/arch/powerpc/sysdev/mpic.h<br/>index fbf8a266941c..6209c62a426d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/sysdev/mpic.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/sysdev/mpic.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/sysdev/mpic.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/sysdev/mpic.h</a></div><div class='hunk'>@@ -14,8 +14,6 @@</div><div class='ctx'> #ifdef CONFIG_PCI_MSI</div><div class='ctx'> extern void mpic_msi_reserve_hwirq(struct mpic *mpic, irq_hw_number_t hwirq);</div><div class='ctx'> extern int mpic_msi_init_allocator(struct mpic *mpic);</div><div class='del'>-extern irq_hw_number_t mpic_msi_alloc_hwirqs(struct mpic *mpic, int num);</div><div class='del'>-extern void mpic_msi_free_hwirqs(struct mpic *mpic, int offset, int num);</div><div class='ctx'> extern int mpic_u3msi_init(struct mpic *mpic);</div><div class='ctx'> extern int mpic_pasemi_msi_init(struct mpic *mpic);</div><div class='ctx'> #else</div><div class='head'>diff --git a/arch/powerpc/sysdev/mpic_msi.c b/arch/powerpc/sysdev/mpic_msi.c<br/>index de3e5e8bc324..1d44eee80fa1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/sysdev/mpic_msi.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/sysdev/mpic_msi.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/sysdev/mpic_msi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/sysdev/mpic_msi.c</a></div><div class='hunk'>@@ -15,59 +15,17 @@</div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='ctx'> #include &lt;asm/hw_irq.h&gt;</div><div class='ctx'> #include &lt;asm/ppc-pci.h&gt;</div><div class='add'>+#include &lt;asm/msi_bitmap.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;sysdev/mpic.h&gt;</div><div class='ctx'> </div><div class='del'>-static void __mpic_msi_reserve_hwirq(struct mpic *mpic, irq_hw_number_t hwirq)</div><div class='del'>-{</div><div class='del'>-	pr_debug("mpic: reserving hwirq 0x%lx\n", hwirq);</div><div class='del'>-	bitmap_allocate_region(mpic-&gt;hwirq_bitmap, hwirq, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void mpic_msi_reserve_hwirq(struct mpic *mpic, irq_hw_number_t hwirq)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='ctx'> 	/* The mpic calls this even when there is no allocator setup */</div><div class='del'>-	if (!mpic-&gt;hwirq_bitmap)</div><div class='add'>+	if (!mpic-&gt;msi_bitmap.bitmap)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;mpic-&gt;bitmap_lock, flags);</div><div class='del'>-	__mpic_msi_reserve_hwirq(mpic, hwirq);</div><div class='del'>-	spin_unlock_irqrestore(&amp;mpic-&gt;bitmap_lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-irq_hw_number_t mpic_msi_alloc_hwirqs(struct mpic *mpic, int num)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int offset, order = get_count_order(num);</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;mpic-&gt;bitmap_lock, flags);</div><div class='del'>-	/*</div><div class='del'>-	 * This is fast, but stricter than we need. We might want to add</div><div class='del'>-	 * a fallback routine which does a linear search with no alignment.</div><div class='del'>-	 */</div><div class='del'>-	offset = bitmap_find_free_region(mpic-&gt;hwirq_bitmap, mpic-&gt;irq_count,</div><div class='del'>-					 order);</div><div class='del'>-	spin_unlock_irqrestore(&amp;mpic-&gt;bitmap_lock, flags);</div><div class='del'>-</div><div class='del'>-	pr_debug("mpic: allocated 0x%x (2^%d) at offset 0x%x\n",</div><div class='del'>-		 num, order, offset);</div><div class='del'>-</div><div class='del'>-	return offset;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void mpic_msi_free_hwirqs(struct mpic *mpic, int offset, int num)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int order = get_count_order(num);</div><div class='del'>-</div><div class='del'>-	pr_debug("mpic: freeing 0x%x (2^%d) at offset 0x%x\n",</div><div class='del'>-		 num, order, offset);</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;mpic-&gt;bitmap_lock, flags);</div><div class='del'>-	bitmap_release_region(mpic-&gt;hwirq_bitmap, offset, order);</div><div class='del'>-	spin_unlock_irqrestore(&amp;mpic-&gt;bitmap_lock, flags);</div><div class='add'>+	msi_bitmap_reserve_hwirq(&amp;mpic-&gt;msi_bitmap, hwirq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MPIC_U3_HT_IRQS</div><div class='hunk'>@@ -83,13 +41,13 @@ static int mpic_msi_reserve_u3_hwirqs(struct mpic *mpic)</div><div class='ctx'> </div><div class='ctx'> 	/* Reserve source numbers we know are reserved in the HW */</div><div class='ctx'> 	for (i = 0;   i &lt; 8;   i++)</div><div class='del'>-		__mpic_msi_reserve_hwirq(mpic, i);</div><div class='add'>+		msi_bitmap_reserve_hwirq(&amp;mpic-&gt;msi_bitmap, i);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 42;  i &lt; 46;  i++)</div><div class='del'>-		__mpic_msi_reserve_hwirq(mpic, i);</div><div class='add'>+		msi_bitmap_reserve_hwirq(&amp;mpic-&gt;msi_bitmap, i);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 100; i &lt; 105; i++)</div><div class='del'>-		__mpic_msi_reserve_hwirq(mpic, i);</div><div class='add'>+		msi_bitmap_reserve_hwirq(&amp;mpic-&gt;msi_bitmap, i);</div><div class='ctx'> </div><div class='ctx'> 	np = NULL;</div><div class='ctx'> 	while ((np = of_find_all_nodes(np))) {</div><div class='hunk'>@@ -99,7 +57,7 @@ static int mpic_msi_reserve_u3_hwirqs(struct mpic *mpic)</div><div class='ctx'> 		while (of_irq_map_one(np, index++, &amp;oirq) == 0) {</div><div class='ctx'> 			ops-&gt;xlate(mpic-&gt;irqhost, NULL, oirq.specifier,</div><div class='ctx'> 						oirq.size, &amp;hwirq, &amp;flags);</div><div class='del'>-			__mpic_msi_reserve_hwirq(mpic, hwirq);</div><div class='add'>+			msi_bitmap_reserve_hwirq(&amp;mpic-&gt;msi_bitmap, hwirq);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -112,70 +70,25 @@ static int mpic_msi_reserve_u3_hwirqs(struct mpic *mpic)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static int mpic_msi_reserve_dt_hwirqs(struct mpic *mpic)</div><div class='del'>-{</div><div class='del'>-	int i, len;</div><div class='del'>-	const u32 *p;</div><div class='del'>-</div><div class='del'>-	p = of_get_property(mpic-&gt;irqhost-&gt;of_node,</div><div class='del'>-			    "msi-available-ranges", &amp;len);</div><div class='del'>-	if (!p) {</div><div class='del'>-		pr_debug("mpic: no msi-available-ranges property found on %s\n",</div><div class='del'>-			  mpic-&gt;irqhost-&gt;of_node-&gt;full_name);</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (len % 8 != 0) {</div><div class='del'>-		printk(KERN_WARNING "mpic: Malformed msi-available-ranges "</div><div class='del'>-		       "property on %s\n", mpic-&gt;irqhost-&gt;of_node-&gt;full_name);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bitmap_allocate_region(mpic-&gt;hwirq_bitmap, 0,</div><div class='del'>-			       get_count_order(mpic-&gt;irq_count));</div><div class='del'>-</div><div class='del'>-	/* Format is: (&lt;u32 start&gt; &lt;u32 count&gt;)+ */</div><div class='del'>-	len /= sizeof(u32);</div><div class='del'>-	for (i = 0; i &lt; len / 2; i++, p += 2)</div><div class='del'>-		mpic_msi_free_hwirqs(mpic, *p, *(p + 1));</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> int mpic_msi_init_allocator(struct mpic *mpic)</div><div class='ctx'> {</div><div class='del'>-	int rc, size;</div><div class='del'>-</div><div class='del'>-	BUG_ON(mpic-&gt;hwirq_bitmap);</div><div class='del'>-	spin_lock_init(&amp;mpic-&gt;bitmap_lock);</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='del'>-	size = BITS_TO_LONGS(mpic-&gt;irq_count) * sizeof(long);</div><div class='del'>-	pr_debug("mpic: allocator bitmap size is 0x%x bytes\n", size);</div><div class='add'>+	rc = msi_bitmap_alloc(&amp;mpic-&gt;msi_bitmap, mpic-&gt;irq_count,</div><div class='add'>+			      mpic-&gt;irqhost-&gt;of_node);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='ctx'> </div><div class='del'>-	mpic-&gt;hwirq_bitmap = alloc_maybe_bootmem(size, GFP_KERNEL);</div><div class='del'>-</div><div class='del'>-	if (!mpic-&gt;hwirq_bitmap) {</div><div class='del'>-		pr_debug("mpic: ENOMEM allocating allocator bitmap!\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memset(mpic-&gt;hwirq_bitmap, 0, size);</div><div class='del'>-</div><div class='del'>-	rc = mpic_msi_reserve_dt_hwirqs(mpic);</div><div class='del'>-	if (rc) {</div><div class='add'>+	rc = msi_bitmap_reserve_dt_hwirqs(&amp;mpic-&gt;msi_bitmap);</div><div class='add'>+	if (rc &gt; 0) {</div><div class='ctx'> 		if (mpic-&gt;flags &amp; MPIC_U3_HT_IRQS)</div><div class='ctx'> 			rc = mpic_msi_reserve_u3_hwirqs(mpic);</div><div class='ctx'> </div><div class='del'>-		if (rc)</div><div class='del'>-			goto out_free;</div><div class='add'>+		if (rc) {</div><div class='add'>+			msi_bitmap_free(&amp;mpic-&gt;msi_bitmap);</div><div class='add'>+			return rc;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='del'>- out_free:</div><div class='del'>-	if (mem_init_done)</div><div class='del'>-		kfree(mpic-&gt;hwirq_bitmap);</div><div class='del'>-</div><div class='del'>-	mpic-&gt;hwirq_bitmap = NULL;</div><div class='del'>-	return rc;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/sysdev/mpic_pasemi_msi.c b/arch/powerpc/sysdev/mpic_pasemi_msi.c<br/>index 68aff6076675..656cb772b691 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/sysdev/mpic_pasemi_msi.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/sysdev/mpic_pasemi_msi.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/sysdev/mpic_pasemi_msi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/sysdev/mpic_pasemi_msi.c</a></div><div class='hunk'>@@ -22,6 +22,7 @@</div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='ctx'> #include &lt;asm/hw_irq.h&gt;</div><div class='ctx'> #include &lt;asm/ppc-pci.h&gt;</div><div class='add'>+#include &lt;asm/msi_bitmap.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "mpic.h"</div><div class='ctx'> </div><div class='hunk'>@@ -81,8 +82,8 @@ static void pasemi_msi_teardown_msi_irqs(struct pci_dev *pdev)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		set_irq_msi(entry-&gt;irq, NULL);</div><div class='del'>-		mpic_msi_free_hwirqs(msi_mpic, virq_to_hw(entry-&gt;irq),</div><div class='del'>-				     ALLOC_CHUNK);</div><div class='add'>+		msi_bitmap_free_hwirqs(&amp;msi_mpic-&gt;msi_bitmap,</div><div class='add'>+				       virq_to_hw(entry-&gt;irq), ALLOC_CHUNK);</div><div class='ctx'> 		irq_dispose_mapping(entry-&gt;irq);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -91,11 +92,10 @@ static void pasemi_msi_teardown_msi_irqs(struct pci_dev *pdev)</div><div class='ctx'> </div><div class='ctx'> static int pasemi_msi_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)</div><div class='ctx'> {</div><div class='del'>-	irq_hw_number_t hwirq;</div><div class='ctx'> 	unsigned int virq;</div><div class='ctx'> 	struct msi_desc *entry;</div><div class='ctx'> 	struct msi_msg msg;</div><div class='del'>-	int ret;</div><div class='add'>+	int hwirq;</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("pasemi_msi_setup_msi_irqs, pdev %p nvec %d type %d\n",</div><div class='ctx'> 		 pdev, nvec, type);</div><div class='hunk'>@@ -109,17 +109,19 @@ static int pasemi_msi_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)</div><div class='ctx'> 		 * few MSIs for someone, but restrictions will apply to how the</div><div class='ctx'> 		 * sources can be changed independently.</div><div class='ctx'> 		 */</div><div class='del'>-		ret = mpic_msi_alloc_hwirqs(msi_mpic, ALLOC_CHUNK);</div><div class='del'>-		hwirq = ret;</div><div class='del'>-		if (ret &lt; 0) {</div><div class='add'>+		hwirq = msi_bitmap_alloc_hwirqs(&amp;msi_mpic-&gt;msi_bitmap,</div><div class='add'>+						ALLOC_CHUNK);</div><div class='add'>+		if (hwirq &lt; 0) {</div><div class='ctx'> 			pr_debug("pasemi_msi: failed allocating hwirq\n");</div><div class='ctx'> 			return hwirq;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		virq = irq_create_mapping(msi_mpic-&gt;irqhost, hwirq);</div><div class='ctx'> 		if (virq == NO_IRQ) {</div><div class='del'>-			pr_debug("pasemi_msi: failed mapping hwirq 0x%lx\n", hwirq);</div><div class='del'>-			mpic_msi_free_hwirqs(msi_mpic, hwirq, ALLOC_CHUNK);</div><div class='add'>+			pr_debug("pasemi_msi: failed mapping hwirq 0x%x\n",</div><div class='add'>+				  hwirq);</div><div class='add'>+			msi_bitmap_free_hwirqs(&amp;msi_mpic-&gt;msi_bitmap, hwirq,</div><div class='add'>+					       ALLOC_CHUNK);</div><div class='ctx'> 			return -ENOSPC;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -133,8 +135,8 @@ static int pasemi_msi_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)</div><div class='ctx'> 		set_irq_chip(virq, &amp;mpic_pasemi_msi_chip);</div><div class='ctx'> 		set_irq_type(virq, IRQ_TYPE_EDGE_RISING);</div><div class='ctx'> </div><div class='del'>-		pr_debug("pasemi_msi: allocated virq 0x%x (hw 0x%lx) addr 0x%x\n",</div><div class='del'>-			  virq, hwirq, msg.address_lo);</div><div class='add'>+		pr_debug("pasemi_msi: allocated virq 0x%x (hw 0x%x) " \</div><div class='add'>+			 "addr 0x%x\n", virq, hwirq, msg.address_lo);</div><div class='ctx'> </div><div class='ctx'> 		/* Likewise, the device writes [0...511] into the target</div><div class='ctx'> 		 * register to generate MSI [512...1023]</div><div class='head'>diff --git a/arch/powerpc/sysdev/mpic_u3msi.c b/arch/powerpc/sysdev/mpic_u3msi.c<br/>index 6e2f8686fdfc..0a8f5a9e87c9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/sysdev/mpic_u3msi.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/sysdev/mpic_u3msi.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/sysdev/mpic_u3msi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/sysdev/mpic_u3msi.c</a></div><div class='hunk'>@@ -16,6 +16,7 @@</div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='ctx'> #include &lt;asm/hw_irq.h&gt;</div><div class='ctx'> #include &lt;asm/ppc-pci.h&gt;</div><div class='add'>+#include &lt;asm/msi_bitmap.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "mpic.h"</div><div class='ctx'> </div><div class='hunk'>@@ -101,7 +102,8 @@ static void u3msi_teardown_msi_irqs(struct pci_dev *pdev)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		set_irq_msi(entry-&gt;irq, NULL);</div><div class='del'>-		mpic_msi_free_hwirqs(msi_mpic, virq_to_hw(entry-&gt;irq), 1);</div><div class='add'>+		msi_bitmap_free_hwirqs(&amp;msi_mpic-&gt;msi_bitmap,</div><div class='add'>+				       virq_to_hw(entry-&gt;irq), 1);</div><div class='ctx'> 		irq_dispose_mapping(entry-&gt;irq);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -110,29 +112,27 @@ static void u3msi_teardown_msi_irqs(struct pci_dev *pdev)</div><div class='ctx'> </div><div class='ctx'> static int u3msi_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)</div><div class='ctx'> {</div><div class='del'>-	irq_hw_number_t hwirq;</div><div class='ctx'> 	unsigned int virq;</div><div class='ctx'> 	struct msi_desc *entry;</div><div class='ctx'> 	struct msi_msg msg;</div><div class='ctx'> 	u64 addr;</div><div class='del'>-	int ret;</div><div class='add'>+	int hwirq;</div><div class='ctx'> </div><div class='ctx'> 	addr = find_ht_magic_addr(pdev);</div><div class='ctx'> 	msg.address_lo = addr &amp; 0xFFFFFFFF;</div><div class='ctx'> 	msg.address_hi = addr &gt;&gt; 32;</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(entry, &amp;pdev-&gt;msi_list, list) {</div><div class='del'>-		ret = mpic_msi_alloc_hwirqs(msi_mpic, 1);</div><div class='del'>-		if (ret &lt; 0) {</div><div class='add'>+		hwirq = msi_bitmap_alloc_hwirqs(&amp;msi_mpic-&gt;msi_bitmap, 1);</div><div class='add'>+		if (hwirq &lt; 0) {</div><div class='ctx'> 			pr_debug("u3msi: failed allocating hwirq\n");</div><div class='del'>-			return ret;</div><div class='add'>+			return hwirq;</div><div class='ctx'> 		}</div><div class='del'>-		hwirq = ret;</div><div class='ctx'> </div><div class='ctx'> 		virq = irq_create_mapping(msi_mpic-&gt;irqhost, hwirq);</div><div class='ctx'> 		if (virq == NO_IRQ) {</div><div class='del'>-			pr_debug("u3msi: failed mapping hwirq 0x%lx\n", hwirq);</div><div class='del'>-			mpic_msi_free_hwirqs(msi_mpic, hwirq, 1);</div><div class='add'>+			pr_debug("u3msi: failed mapping hwirq 0x%x\n", hwirq);</div><div class='add'>+			msi_bitmap_free_hwirqs(&amp;msi_mpic-&gt;msi_bitmap, hwirq, 1);</div><div class='ctx'> 			return -ENOSPC;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -140,8 +140,8 @@ static int u3msi_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)</div><div class='ctx'> 		set_irq_chip(virq, &amp;mpic_u3msi_chip);</div><div class='ctx'> 		set_irq_type(virq, IRQ_TYPE_EDGE_RISING);</div><div class='ctx'> </div><div class='del'>-		pr_debug("u3msi: allocated virq 0x%x (hw 0x%lx) addr 0x%lx\n",</div><div class='del'>-			  virq, hwirq, addr);</div><div class='add'>+		pr_debug("u3msi: allocated virq 0x%x (hw 0x%x) addr 0x%lx\n",</div><div class='add'>+			  virq, hwirq, (unsigned long)addr);</div><div class='ctx'> </div><div class='ctx'> 		msg.data = hwirq;</div><div class='ctx'> 		write_msi_msg(virq, &amp;msg);</div><div class='head'>diff --git a/arch/powerpc/sysdev/msi_bitmap.c b/arch/powerpc/sysdev/msi_bitmap.c<br/>new file mode 100644<br/>index 000000000000..f84217b8863a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/sysdev/msi_bitmap.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/sysdev/msi_bitmap.c</a></div><div class='hunk'>@@ -0,0 +1,247 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2006-2008, Michael Ellerman, IBM Corporation.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public License</div><div class='add'>+ * as published by the Free Software Foundation; version 2 of the</div><div class='add'>+ * License.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/bitmap.h&gt;</div><div class='add'>+#include &lt;asm/msi_bitmap.h&gt;</div><div class='add'>+</div><div class='add'>+int msi_bitmap_alloc_hwirqs(struct msi_bitmap *bmp, int num)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int offset, order = get_count_order(num);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;bmp-&gt;lock, flags);</div><div class='add'>+	/*</div><div class='add'>+	 * This is fast, but stricter than we need. We might want to add</div><div class='add'>+	 * a fallback routine which does a linear search with no alignment.</div><div class='add'>+	 */</div><div class='add'>+	offset = bitmap_find_free_region(bmp-&gt;bitmap, bmp-&gt;irq_count, order);</div><div class='add'>+	spin_unlock_irqrestore(&amp;bmp-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	pr_debug("msi_bitmap: allocated 0x%x (2^%d) at offset 0x%x\n",</div><div class='add'>+		 num, order, offset);</div><div class='add'>+</div><div class='add'>+	return offset;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void msi_bitmap_free_hwirqs(struct msi_bitmap *bmp, unsigned int offset,</div><div class='add'>+			    unsigned int num)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int order = get_count_order(num);</div><div class='add'>+</div><div class='add'>+	pr_debug("msi_bitmap: freeing 0x%x (2^%d) at offset 0x%x\n",</div><div class='add'>+		 num, order, offset);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;bmp-&gt;lock, flags);</div><div class='add'>+	bitmap_release_region(bmp-&gt;bitmap, offset, order);</div><div class='add'>+	spin_unlock_irqrestore(&amp;bmp-&gt;lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void msi_bitmap_reserve_hwirq(struct msi_bitmap *bmp, unsigned int hwirq)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	pr_debug("msi_bitmap: reserving hwirq 0x%x\n", hwirq);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;bmp-&gt;lock, flags);</div><div class='add'>+	bitmap_allocate_region(bmp-&gt;bitmap, hwirq, 0);</div><div class='add'>+	spin_unlock_irqrestore(&amp;bmp-&gt;lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * msi_bitmap_reserve_dt_hwirqs - Reserve irqs specified in the device tree.</div><div class='add'>+ * @bmp: pointer to the MSI bitmap.</div><div class='add'>+ *</div><div class='add'>+ * Looks in the device tree to see if there is a property specifying which</div><div class='add'>+ * irqs can be used for MSI. If found those irqs reserved in the device tree</div><div class='add'>+ * are reserved in the bitmap.</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 for success, &lt; 0 if there was an error, and &gt; 0 if no property</div><div class='add'>+ * was found in the device tree.</div><div class='add'>+ **/</div><div class='add'>+int msi_bitmap_reserve_dt_hwirqs(struct msi_bitmap *bmp)</div><div class='add'>+{</div><div class='add'>+	int i, j, len;</div><div class='add'>+	const u32 *p;</div><div class='add'>+</div><div class='add'>+	if (!bmp-&gt;of_node)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	p = of_get_property(bmp-&gt;of_node, "msi-available-ranges", &amp;len);</div><div class='add'>+	if (!p) {</div><div class='add'>+		pr_debug("msi_bitmap: no msi-available-ranges property " \</div><div class='add'>+			 "found on %s\n", bmp-&gt;of_node-&gt;full_name);</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (len % (2 * sizeof(u32)) != 0) {</div><div class='add'>+		printk(KERN_WARNING "msi_bitmap: Malformed msi-available-ranges"</div><div class='add'>+		       " property on %s\n", bmp-&gt;of_node-&gt;full_name);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bitmap_allocate_region(bmp-&gt;bitmap, 0, get_count_order(bmp-&gt;irq_count));</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;bmp-&gt;lock);</div><div class='add'>+</div><div class='add'>+	/* Format is: (&lt;u32 start&gt; &lt;u32 count&gt;)+ */</div><div class='add'>+	len /= 2 * sizeof(u32);</div><div class='add'>+	for (i = 0; i &lt; len; i++, p += 2) {</div><div class='add'>+		for (j = 0; j &lt; *(p + 1); j++)</div><div class='add'>+			bitmap_release_region(bmp-&gt;bitmap, *p + j, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;bmp-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int msi_bitmap_alloc(struct msi_bitmap *bmp, unsigned int irq_count,</div><div class='add'>+		     struct device_node *of_node)</div><div class='add'>+{</div><div class='add'>+	int size;</div><div class='add'>+</div><div class='add'>+	if (!irq_count)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	size = BITS_TO_LONGS(irq_count) * sizeof(long);</div><div class='add'>+	pr_debug("msi_bitmap: allocator bitmap size is 0x%x bytes\n", size);</div><div class='add'>+</div><div class='add'>+	bmp-&gt;bitmap = zalloc_maybe_bootmem(size, GFP_KERNEL);</div><div class='add'>+	if (!bmp-&gt;bitmap) {</div><div class='add'>+		pr_debug("msi_bitmap: ENOMEM allocating allocator bitmap!\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* We zalloc'ed the bitmap, so all irqs are free by default */</div><div class='add'>+	spin_lock_init(&amp;bmp-&gt;lock);</div><div class='add'>+	bmp-&gt;of_node = of_node_get(of_node);</div><div class='add'>+	bmp-&gt;irq_count = irq_count;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void msi_bitmap_free(struct msi_bitmap *bmp)</div><div class='add'>+{</div><div class='add'>+	/* we can't free the bitmap we don't know if it's bootmem etc. */</div><div class='add'>+	of_node_put(bmp-&gt;of_node);</div><div class='add'>+	bmp-&gt;bitmap = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_MSI_BITMAP_SELFTEST</div><div class='add'>+</div><div class='add'>+#define check(x)	\</div><div class='add'>+	if (!(x)) printk("msi_bitmap: test failed at line %d\n", __LINE__);</div><div class='add'>+</div><div class='add'>+void test_basics(void)</div><div class='add'>+{</div><div class='add'>+	struct msi_bitmap bmp;</div><div class='add'>+	int i, size = 512;</div><div class='add'>+</div><div class='add'>+	/* Can't allocate a bitmap of 0 irqs */</div><div class='add'>+	check(msi_bitmap_alloc(&amp;bmp, 0, NULL) != 0);</div><div class='add'>+</div><div class='add'>+	/* of_node may be NULL */</div><div class='add'>+	check(0 == msi_bitmap_alloc(&amp;bmp, size, NULL));</div><div class='add'>+</div><div class='add'>+	/* Should all be free by default */</div><div class='add'>+	check(0 == bitmap_find_free_region(bmp.bitmap, size,</div><div class='add'>+					   get_count_order(size)));</div><div class='add'>+	bitmap_release_region(bmp.bitmap, 0, get_count_order(size));</div><div class='add'>+</div><div class='add'>+	/* With no node, there's no msi-available-ranges, so expect &gt; 0 */</div><div class='add'>+	check(msi_bitmap_reserve_dt_hwirqs(&amp;bmp) &gt; 0);</div><div class='add'>+</div><div class='add'>+	/* Should all still be free */</div><div class='add'>+	check(0 == bitmap_find_free_region(bmp.bitmap, size,</div><div class='add'>+					   get_count_order(size)));</div><div class='add'>+	bitmap_release_region(bmp.bitmap, 0, get_count_order(size));</div><div class='add'>+</div><div class='add'>+	/* Check we can fill it up and then no more */</div><div class='add'>+	for (i = 0; i &lt; size; i++)</div><div class='add'>+		check(msi_bitmap_alloc_hwirqs(&amp;bmp, 1) &gt;= 0);</div><div class='add'>+</div><div class='add'>+	check(msi_bitmap_alloc_hwirqs(&amp;bmp, 1) &lt; 0);</div><div class='add'>+</div><div class='add'>+	/* Should all be allocated */</div><div class='add'>+	check(bitmap_find_free_region(bmp.bitmap, size, 0) &lt; 0);</div><div class='add'>+</div><div class='add'>+	/* And if we free one we can then allocate another */</div><div class='add'>+	msi_bitmap_free_hwirqs(&amp;bmp, size / 2, 1);</div><div class='add'>+	check(msi_bitmap_alloc_hwirqs(&amp;bmp, 1) == size / 2);</div><div class='add'>+</div><div class='add'>+	msi_bitmap_free(&amp;bmp);</div><div class='add'>+</div><div class='add'>+	/* Clients may check bitmap == NULL for "not-allocated" */</div><div class='add'>+	check(bmp.bitmap == NULL);</div><div class='add'>+</div><div class='add'>+	kfree(bmp.bitmap);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void test_of_node(void)</div><div class='add'>+{</div><div class='add'>+	u32 prop_data[] = { 10, 10, 25, 3, 40, 1, 100, 100, 200, 20 };</div><div class='add'>+	const char *expected_str = "0-9,20-24,28-39,41-99,220-255";</div><div class='add'>+	char *prop_name = "msi-available-ranges";</div><div class='add'>+	char *node_name = "/fakenode";</div><div class='add'>+	struct device_node of_node;</div><div class='add'>+	struct property prop;</div><div class='add'>+	struct msi_bitmap bmp;</div><div class='add'>+	int size = 256;</div><div class='add'>+	DECLARE_BITMAP(expected, size);</div><div class='add'>+</div><div class='add'>+	/* There should really be a struct device_node allocator */</div><div class='add'>+	memset(&amp;of_node, 0, sizeof(of_node));</div><div class='add'>+	kref_init(&amp;of_node.kref);</div><div class='add'>+	of_node.full_name = node_name;</div><div class='add'>+</div><div class='add'>+	check(0 == msi_bitmap_alloc(&amp;bmp, size, &amp;of_node));</div><div class='add'>+</div><div class='add'>+	/* No msi-available-ranges, so expect &gt; 0 */</div><div class='add'>+	check(msi_bitmap_reserve_dt_hwirqs(&amp;bmp) &gt; 0);</div><div class='add'>+</div><div class='add'>+	/* Should all still be free */</div><div class='add'>+	check(0 == bitmap_find_free_region(bmp.bitmap, size,</div><div class='add'>+					   get_count_order(size)));</div><div class='add'>+	bitmap_release_region(bmp.bitmap, 0, get_count_order(size));</div><div class='add'>+</div><div class='add'>+	/* Now create a fake msi-available-ranges property */</div><div class='add'>+</div><div class='add'>+	/* There should really .. oh whatever */</div><div class='add'>+	memset(&amp;prop, 0, sizeof(prop));</div><div class='add'>+	prop.name = prop_name;</div><div class='add'>+	prop.value = &amp;prop_data;</div><div class='add'>+	prop.length = sizeof(prop_data);</div><div class='add'>+</div><div class='add'>+	of_node.properties = &amp;prop;</div><div class='add'>+</div><div class='add'>+	/* msi-available-ranges, so expect == 0 */</div><div class='add'>+	check(msi_bitmap_reserve_dt_hwirqs(&amp;bmp) == 0);</div><div class='add'>+</div><div class='add'>+	/* Check we got the expected result */</div><div class='add'>+	check(0 == bitmap_parselist(expected_str, expected, size));</div><div class='add'>+	check(bitmap_equal(expected, bmp.bitmap, size));</div><div class='add'>+</div><div class='add'>+	msi_bitmap_free(&amp;bmp);</div><div class='add'>+	kfree(bmp.bitmap);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int msi_bitmap_selftest(void)</div><div class='add'>+{</div><div class='add'>+	printk(KERN_DEBUG "Running MSI bitmap self-tests ...\n");</div><div class='add'>+</div><div class='add'>+	test_basics();</div><div class='add'>+	test_of_node();</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+late_initcall(msi_bitmap_selftest);</div><div class='add'>+#endif /* CONFIG_MSI_BITMAP_SELFTEST */</div><div class='head'>diff --git a/arch/powerpc/sysdev/mv64x60_dev.c b/arch/powerpc/sysdev/mv64x60_dev.c<br/>index 32e0ad0ebea8..b6bd775d2e22 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/sysdev/mv64x60_dev.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/sysdev/mv64x60_dev.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/sysdev/mv64x60_dev.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/sysdev/mv64x60_dev.c</a></div><div class='hunk'>@@ -293,10 +293,8 @@ static int __init mv64x60_eth_device_setup(struct device_node *np, int id,</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	prop = of_get_property(phy, "reg", NULL);</div><div class='del'>-	if (prop) {</div><div class='del'>-		pdata.force_phy_addr = 1;</div><div class='del'>-		pdata.phy_addr = *prop;</div><div class='del'>-	}</div><div class='add'>+	if (prop)</div><div class='add'>+		pdata.phy_addr = MV643XX_ETH_PHY_ADDR(*prop);</div><div class='ctx'> </div><div class='ctx'> 	of_node_put(phy);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/sysdev/ppc4xx_pci.c b/arch/powerpc/sysdev/ppc4xx_pci.c<br/>index fb368dfde5d4..d3e4d61030b5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/sysdev/ppc4xx_pci.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/sysdev/ppc4xx_pci.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/sysdev/ppc4xx_pci.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/sysdev/ppc4xx_pci.c</a></div><div class='hunk'>@@ -30,24 +30,19 @@</div><div class='ctx'> #include &lt;asm/machdep.h&gt;</div><div class='ctx'> #include &lt;asm/dcr.h&gt;</div><div class='ctx'> #include &lt;asm/dcr-regs.h&gt;</div><div class='add'>+#include &lt;mm/mmu_decl.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "ppc4xx_pci.h"</div><div class='ctx'> </div><div class='ctx'> static int dma_offset_set;</div><div class='ctx'> </div><div class='del'>-/* Move that to a useable header */</div><div class='del'>-extern unsigned long total_memory;</div><div class='del'>-</div><div class='ctx'> #define U64_TO_U32_LOW(val)	((u32)((val) &amp; 0x00000000ffffffffULL))</div><div class='ctx'> #define U64_TO_U32_HIGH(val)	((u32)((val) &gt;&gt; 32))</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_RESOURCES_64BIT</div><div class='del'>-#define RES_TO_U32_LOW(val)	U64_TO_U32_LOW(val)</div><div class='del'>-#define RES_TO_U32_HIGH(val)	U64_TO_U32_HIGH(val)</div><div class='del'>-#else</div><div class='del'>-#define RES_TO_U32_LOW(val)	(val)</div><div class='del'>-#define RES_TO_U32_HIGH(val)	(0)</div><div class='del'>-#endif</div><div class='add'>+#define RES_TO_U32_LOW(val)	\</div><div class='add'>+	((sizeof(resource_size_t) &gt; sizeof(u32)) ? U64_TO_U32_LOW(val) : (val))</div><div class='add'>+#define RES_TO_U32_HIGH(val)	\</div><div class='add'>+	((sizeof(resource_size_t) &gt; sizeof(u32)) ? U64_TO_U32_HIGH(val) : (0))</div><div class='ctx'> </div><div class='ctx'> static inline int ppc440spe_revA(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -105,7 +100,8 @@ static int __init ppc4xx_parse_dma_ranges(struct pci_controller *hose,</div><div class='ctx'> </div><div class='ctx'> 	/* Default */</div><div class='ctx'> 	res-&gt;start = 0;</div><div class='del'>-	res-&gt;end = size = 0x80000000;</div><div class='add'>+	size = 0x80000000;</div><div class='add'>+	res-&gt;end = size - 1;</div><div class='ctx'> 	res-&gt;flags = IORESOURCE_MEM | IORESOURCE_PREFETCH;</div><div class='ctx'> </div><div class='ctx'> 	/* Get dma-ranges property */</div><div class='hunk'>@@ -145,12 +141,11 @@ static int __init ppc4xx_parse_dma_ranges(struct pci_controller *hose,</div><div class='ctx'> </div><div class='ctx'> 		/* Use that */</div><div class='ctx'> 		res-&gt;start = pci_addr;</div><div class='del'>-#ifndef CONFIG_RESOURCES_64BIT</div><div class='ctx'> 		/* Beware of 32 bits resources */</div><div class='del'>-		if ((pci_addr + size) &gt; 0x100000000ull)</div><div class='add'>+		if (sizeof(resource_size_t) == sizeof(u32) &amp;&amp;</div><div class='add'>+		    (pci_addr + size) &gt; 0x100000000ull)</div><div class='ctx'> 			res-&gt;end = 0xffffffff;</div><div class='ctx'> 		else</div><div class='del'>-#endif</div><div class='ctx'> 			res-&gt;end = res-&gt;start + size - 1;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -167,13 +162,13 @@ static int __init ppc4xx_parse_dma_ranges(struct pci_controller *hose,</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (size &lt; total_memory) {</div><div class='ctx'> 		printk(KERN_ERR "%s: dma-ranges too small "</div><div class='del'>-		       "(size=%llx total_memory=%lx)\n",</div><div class='del'>-		       hose-&gt;dn-&gt;full_name, size, total_memory);</div><div class='add'>+		       "(size=%llx total_memory=%llx)\n",</div><div class='add'>+		       hose-&gt;dn-&gt;full_name, size, (u64)total_memory);</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Check we are a power of 2 size and that base is a multiple of size*/</div><div class='del'>-	if (!is_power_of_2(size) ||</div><div class='add'>+	if ((size &amp; (size - 1)) != 0  ||</div><div class='ctx'> 	    (res-&gt;start &amp; (size - 1)) != 0) {</div><div class='ctx'> 		printk(KERN_ERR "%s: dma-ranges unaligned\n",</div><div class='ctx'> 		       hose-&gt;dn-&gt;full_name);</div><div class='hunk'>@@ -277,9 +272,16 @@ static void __init ppc4xx_probe_pci_bridge(struct device_node *np)</div><div class='ctx'> 	const int *bus_range;</div><div class='ctx'> 	int primary = 0;</div><div class='ctx'> </div><div class='add'>+	/* Check if device is enabled */</div><div class='add'>+	if (!of_device_is_available(np)) {</div><div class='add'>+		printk(KERN_INFO "%s: Port disabled via device-tree\n",</div><div class='add'>+		       np-&gt;full_name);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Fetch config space registers address */</div><div class='ctx'> 	if (of_address_to_resource(np, 0, &amp;rsrc_cfg)) {</div><div class='del'>-		printk(KERN_ERR "%s:Can't get PCI config register base !",</div><div class='add'>+		printk(KERN_ERR "%s: Can't get PCI config register base !",</div><div class='ctx'> 		       np-&gt;full_name);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -810,7 +812,7 @@ static int ppc460ex_pciex_init_port_hw(struct ppc4xx_pciex_port *port)</div><div class='ctx'> 	switch (port-&gt;index) {</div><div class='ctx'> 	case 0:</div><div class='ctx'> 		mtdcri(SDR0, PESDR0_460EX_L0CDRCTL, 0x00003230);</div><div class='del'>-		mtdcri(SDR0, PESDR0_460EX_L0DRV, 0x00000136);</div><div class='add'>+		mtdcri(SDR0, PESDR0_460EX_L0DRV, 0x00000130);</div><div class='ctx'> 		mtdcri(SDR0, PESDR0_460EX_L0CLK, 0x00000006);</div><div class='ctx'> </div><div class='ctx'> 		mtdcri(SDR0, PESDR0_460EX_PHY_CTL_RST,0x10000000);</div><div class='hunk'>@@ -821,10 +823,10 @@ static int ppc460ex_pciex_init_port_hw(struct ppc4xx_pciex_port *port)</div><div class='ctx'> 		mtdcri(SDR0, PESDR1_460EX_L1CDRCTL, 0x00003230);</div><div class='ctx'> 		mtdcri(SDR0, PESDR1_460EX_L2CDRCTL, 0x00003230);</div><div class='ctx'> 		mtdcri(SDR0, PESDR1_460EX_L3CDRCTL, 0x00003230);</div><div class='del'>-		mtdcri(SDR0, PESDR1_460EX_L0DRV, 0x00000136);</div><div class='del'>-		mtdcri(SDR0, PESDR1_460EX_L1DRV, 0x00000136);</div><div class='del'>-		mtdcri(SDR0, PESDR1_460EX_L2DRV, 0x00000136);</div><div class='del'>-		mtdcri(SDR0, PESDR1_460EX_L3DRV, 0x00000136);</div><div class='add'>+		mtdcri(SDR0, PESDR1_460EX_L0DRV, 0x00000130);</div><div class='add'>+		mtdcri(SDR0, PESDR1_460EX_L1DRV, 0x00000130);</div><div class='add'>+		mtdcri(SDR0, PESDR1_460EX_L2DRV, 0x00000130);</div><div class='add'>+		mtdcri(SDR0, PESDR1_460EX_L3DRV, 0x00000130);</div><div class='ctx'> 		mtdcri(SDR0, PESDR1_460EX_L0CLK, 0x00000006);</div><div class='ctx'> 		mtdcri(SDR0, PESDR1_460EX_L1CLK, 0x00000006);</div><div class='ctx'> 		mtdcri(SDR0, PESDR1_460EX_L2CLK, 0x00000006);</div><div class='head'>diff --git a/arch/powerpc/sysdev/qe_lib/Kconfig b/arch/powerpc/sysdev/qe_lib/Kconfig<br/>index 1ce546462be5..76ffbc48d4b9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/sysdev/qe_lib/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/powerpc/sysdev/qe_lib/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/powerpc/sysdev/qe_lib/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/powerpc/sysdev/qe_lib/Kconfig</a></div><div class='hunk'>@@ -24,12 +24,3 @@ config QE_USB</div><div class='ctx'> 	bool</div><div class='ctx'> 	help</div><div class='ctx'> 	  QE USB Host Controller support</div><div class='del'>-</div><div class='del'>-config QE_GPIO</div><div class='del'>-	bool "QE GPIO support"</div><div class='del'>-	depends on QUICC_ENGINE</div><div class='del'>-	select GENERIC_GPIO</div><div class='del'>-	select ARCH_REQUIRE_GPIOLIB</div><div class='del'>-	help</div><div class='del'>-	  Say Y here if you're going to use hardware that connects to the</div><div class='del'>-	  QE GPIOs.</div><div class='head'>diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig<br/>index 8d41908e2513..bc581d8a7cd9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/s390/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/s390/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/s390/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/s390/Kconfig</a></div><div class='hunk'>@@ -74,6 +74,7 @@ config S390</div><div class='ctx'> 	select HAVE_KPROBES</div><div class='ctx'> 	select HAVE_KRETPROBES</div><div class='ctx'> 	select HAVE_KVM if 64BIT</div><div class='add'>+	select HAVE_ARCH_TRACEHOOK</div><div class='ctx'> </div><div class='ctx'> source "init/Kconfig"</div><div class='ctx'> </div><div class='hunk'>@@ -564,13 +565,16 @@ config ZFCPDUMP</div><div class='ctx'> 	  Refer to &lt;file:Documentation/s390/zfcpdump.txt&gt; for more details on this.</div><div class='ctx'> </div><div class='ctx'> config S390_GUEST</div><div class='del'>-bool "s390 guest support (EXPERIMENTAL)"</div><div class='add'>+bool "s390 guest support for KVM (EXPERIMENTAL)"</div><div class='ctx'> 	depends on 64BIT &amp;&amp; EXPERIMENTAL</div><div class='ctx'> 	select VIRTIO</div><div class='ctx'> 	select VIRTIO_RING</div><div class='ctx'> 	select VIRTIO_CONSOLE</div><div class='ctx'> 	help</div><div class='del'>-	  Select this option if you want to run the kernel under s390 linux</div><div class='add'>+	  Select this option if you want to run the kernel as a guest under</div><div class='add'>+	  the KVM hypervisor. This will add detection for KVM as well  as a</div><div class='add'>+	  virtio transport. If KVM is detected, the virtio console will be</div><div class='add'>+	  the default console.</div><div class='ctx'> endmenu</div><div class='ctx'> </div><div class='ctx'> source "net/Kconfig"</div><div class='head'>diff --git a/arch/s390/hypfs/inode.c b/arch/s390/hypfs/inode.c<br/>index 7383781f3e6a..36313801cd5c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/s390/hypfs/inode.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/s390/hypfs/inode.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/s390/hypfs/inode.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/s390/hypfs/inode.c</a></div><div class='hunk'>@@ -219,7 +219,7 @@ static int hypfs_release(struct inode *inode, struct file *filp)</div><div class='ctx'> </div><div class='ctx'> enum { opt_uid, opt_gid, opt_err };</div><div class='ctx'> </div><div class='del'>-static match_table_t hypfs_tokens = {</div><div class='add'>+static const match_table_t hypfs_tokens = {</div><div class='ctx'> 	{opt_uid, "uid=%u"},</div><div class='ctx'> 	{opt_gid, "gid=%u"},</div><div class='ctx'> 	{opt_err, NULL}</div><div class='head'>diff --git a/arch/s390/include/asm/dasd.h b/arch/s390/include/asm/dasd.h<br/>index 3f002e13d024..55b2b80cdf6e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/s390/include/asm/dasd.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/s390/include/asm/dasd.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/s390/include/asm/dasd.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/s390/include/asm/dasd.h</a></div><div class='hunk'>@@ -3,6 +3,8 @@</div><div class='ctx'>  * Author(s)......: Holger Smolinski &lt;Holger.Smolinski@de.ibm.com&gt;</div><div class='ctx'>  * Bugreports.to..: &lt;Linux390@de.ibm.com&gt;</div><div class='ctx'>  * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999,2000</div><div class='add'>+ * EMC Symmetrix ioctl Copyright EMC Corporation, 2008</div><div class='add'>+ * Author.........: Nigel Hislop &lt;hislop_nigel@emc.com&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * This file is the interface of the DASD device driver, which is exported to user space</div><div class='ctx'>  * any future changes wrt the API will result in a change of the APIVERSION reported</div><div class='hunk'>@@ -202,6 +204,16 @@ typedef struct attrib_data_t {</div><div class='ctx'> #define DASD_SEQ_PRESTAGE  0x4</div><div class='ctx'> #define DASD_REC_ACCESS    0x5</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Perform EMC Symmetrix I/O</div><div class='add'>+ */</div><div class='add'>+typedef struct dasd_symmio_parms {</div><div class='add'>+	unsigned char reserved[8];	/* compat with older releases */</div><div class='add'>+	unsigned long long psf_data;	/* char * cast to u64 */</div><div class='add'>+	unsigned long long rssd_result; /* char * cast to u64 */</div><div class='add'>+	int psf_data_len;</div><div class='add'>+	int rssd_result_len;</div><div class='add'>+} __attribute__ ((packed)) dasd_symmio_parms_t;</div><div class='ctx'> </div><div class='ctx'> /********************************************************************************</div><div class='ctx'>  * SECTION: Definition of IOCTLs</div><div class='hunk'>@@ -247,6 +259,7 @@ typedef struct attrib_data_t {</div><div class='ctx'> /* Set Attributes (cache operations) */</div><div class='ctx'> #define BIODASDSATTR   _IOW(DASD_IOCTL_LETTER,2,attrib_data_t) </div><div class='ctx'> </div><div class='add'>+#define BIODASDSYMMIO  _IOWR(DASD_IOCTL_LETTER, 240, dasd_symmio_parms_t)</div><div class='ctx'> </div><div class='ctx'> #endif				/* DASD_H */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/s390/include/asm/delay.h b/arch/s390/include/asm/delay.h<br/>index 78357314c450..a356c958e260 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/s390/include/asm/delay.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/s390/include/asm/delay.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/s390/include/asm/delay.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/s390/include/asm/delay.h</a></div><div class='hunk'>@@ -15,6 +15,7 @@</div><div class='ctx'> #define _S390_DELAY_H</div><div class='ctx'> </div><div class='ctx'> extern void __udelay(unsigned long usecs);</div><div class='add'>+extern void udelay_simple(unsigned long usecs);</div><div class='ctx'> extern void __delay(unsigned long loops);</div><div class='ctx'> </div><div class='ctx'> #define udelay(n) __udelay(n)</div><div class='head'>diff --git a/arch/s390/include/asm/elf.h b/arch/s390/include/asm/elf.h<br/>index 3cad56923815..261785ab5b22 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/s390/include/asm/elf.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/s390/include/asm/elf.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/s390/include/asm/elf.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/s390/include/asm/elf.h</a></div><div class='hunk'>@@ -166,13 +166,11 @@ extern char elf_platform[];</div><div class='ctx'> #define ELF_PLATFORM (elf_platform)</div><div class='ctx'> </div><div class='ctx'> #ifndef __s390x__</div><div class='del'>-#define SET_PERSONALITY(ex, ibcs2) set_personality((ibcs2)?PER_SVR4:PER_LINUX)</div><div class='add'>+#define SET_PERSONALITY(ex) set_personality(PER_LINUX)</div><div class='ctx'> #else /* __s390x__ */</div><div class='del'>-#define SET_PERSONALITY(ex, ibcs2)			\</div><div class='add'>+#define SET_PERSONALITY(ex)				\</div><div class='ctx'> do {							\</div><div class='del'>-	if (ibcs2)					\</div><div class='del'>-		set_personality(PER_SVR4);		\</div><div class='del'>-	else if (current-&gt;personality != PER_LINUX32)	\</div><div class='add'>+	if (current-&gt;personality != PER_LINUX32)	\</div><div class='ctx'> 		set_personality(PER_LINUX);		\</div><div class='ctx'> 	if ((ex).e_ident[EI_CLASS] == ELFCLASS32)	\</div><div class='ctx'> 		set_thread_flag(TIF_31BIT);		\</div><div class='head'>diff --git a/arch/s390/include/asm/pgtable.h b/arch/s390/include/asm/pgtable.h<br/>index 0bdb704ae051..1a928f84afd6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/s390/include/asm/pgtable.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/s390/include/asm/pgtable.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/s390/include/asm/pgtable.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/s390/include/asm/pgtable.h</a></div><div class='hunk'>@@ -281,6 +281,9 @@ extern char empty_zero_page[PAGE_SIZE];</div><div class='ctx'> #define RCP_GR_BIT	50</div><div class='ctx'> #define RCP_GC_BIT	49</div><div class='ctx'> </div><div class='add'>+/* User dirty bit for KVM's migration feature */</div><div class='add'>+#define KVM_UD_BIT	47</div><div class='add'>+</div><div class='ctx'> #ifndef __s390x__</div><div class='ctx'> </div><div class='ctx'> /* Bits in the segment table address-space-control-element */</div><div class='hunk'>@@ -575,12 +578,16 @@ static inline void ptep_rcp_copy(pte_t *ptep)</div><div class='ctx'> 	unsigned long *pgste = (unsigned long *) (ptep + PTRS_PER_PTE);</div><div class='ctx'> </div><div class='ctx'> 	skey = page_get_storage_key(page_to_phys(page));</div><div class='del'>-	if (skey &amp; _PAGE_CHANGED)</div><div class='add'>+	if (skey &amp; _PAGE_CHANGED) {</div><div class='ctx'> 		set_bit_simple(RCP_GC_BIT, pgste);</div><div class='add'>+		set_bit_simple(KVM_UD_BIT, pgste);</div><div class='add'>+	}</div><div class='ctx'> 	if (skey &amp; _PAGE_REFERENCED)</div><div class='ctx'> 		set_bit_simple(RCP_GR_BIT, pgste);</div><div class='del'>-	if (test_and_clear_bit_simple(RCP_HC_BIT, pgste))</div><div class='add'>+	if (test_and_clear_bit_simple(RCP_HC_BIT, pgste)) {</div><div class='ctx'> 		SetPageDirty(page);</div><div class='add'>+		set_bit_simple(KVM_UD_BIT, pgste);</div><div class='add'>+	}</div><div class='ctx'> 	if (test_and_clear_bit_simple(RCP_HR_BIT, pgste))</div><div class='ctx'> 		SetPageReferenced(page);</div><div class='ctx'> #endif</div><div class='hunk'>@@ -744,6 +751,40 @@ static inline pte_t pte_mkspecial(pte_t pte)</div><div class='ctx'> 	return pte;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PGSTE</div><div class='add'>+/*</div><div class='add'>+ * Get (and clear) the user dirty bit for a PTE.</div><div class='add'>+ */</div><div class='add'>+static inline int kvm_s390_test_and_clear_page_dirty(struct mm_struct *mm,</div><div class='add'>+						     pte_t *ptep)</div><div class='add'>+{</div><div class='add'>+	int dirty;</div><div class='add'>+	unsigned long *pgste;</div><div class='add'>+	struct page *page;</div><div class='add'>+	unsigned int skey;</div><div class='add'>+</div><div class='add'>+	if (!mm-&gt;context.pgstes)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	rcp_lock(ptep);</div><div class='add'>+	pgste = (unsigned long *) (ptep + PTRS_PER_PTE);</div><div class='add'>+	page = virt_to_page(pte_val(*ptep));</div><div class='add'>+	skey = page_get_storage_key(page_to_phys(page));</div><div class='add'>+	if (skey &amp; _PAGE_CHANGED) {</div><div class='add'>+		set_bit_simple(RCP_GC_BIT, pgste);</div><div class='add'>+		set_bit_simple(KVM_UD_BIT, pgste);</div><div class='add'>+	}</div><div class='add'>+	if (test_and_clear_bit_simple(RCP_HC_BIT, pgste)) {</div><div class='add'>+		SetPageDirty(page);</div><div class='add'>+		set_bit_simple(KVM_UD_BIT, pgste);</div><div class='add'>+	}</div><div class='add'>+	dirty = test_and_clear_bit_simple(KVM_UD_BIT, pgste);</div><div class='add'>+	if (skey &amp; _PAGE_CHANGED)</div><div class='add'>+		page_clear_dirty(page);</div><div class='add'>+	rcp_unlock(ptep);</div><div class='add'>+	return dirty;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_YOUNG</div><div class='ctx'> static inline int ptep_test_and_clear_young(struct vm_area_struct *vma,</div><div class='ctx'> 					    unsigned long addr, pte_t *ptep)</div><div class='head'>diff --git a/arch/s390/include/asm/ptrace.h b/arch/s390/include/asm/ptrace.h<br/>index af2c9ac28a07..a7226f8143fb 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/s390/include/asm/ptrace.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/s390/include/asm/ptrace.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/s390/include/asm/ptrace.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/s390/include/asm/ptrace.h</a></div><div class='hunk'>@@ -490,6 +490,7 @@ extern void user_disable_single_step(struct task_struct *);</div><div class='ctx'> </div><div class='ctx'> #define user_mode(regs) (((regs)-&gt;psw.mask &amp; PSW_MASK_PSTATE) != 0)</div><div class='ctx'> #define instruction_pointer(regs) ((regs)-&gt;psw.addr &amp; PSW_ADDR_INSN)</div><div class='add'>+#define user_stack_pointer(regs)((regs)-&gt;gprs[15])</div><div class='ctx'> #define regs_return_value(regs)((regs)-&gt;gprs[2])</div><div class='ctx'> #define profile_pc(regs) instruction_pointer(regs)</div><div class='ctx'> extern void show_regs(struct pt_regs * regs);</div><div class='head'>diff --git a/arch/s390/include/asm/qdio.h b/arch/s390/include/asm/qdio.h<br/>index 6813772171f2..4734c3f05354 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/s390/include/asm/qdio.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/s390/include/asm/qdio.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/s390/include/asm/qdio.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/s390/include/asm/qdio.h</a></div><div class='hunk'>@@ -299,7 +299,13 @@ struct qdio_ssqd_desc {</div><div class='ctx'> 	u8 mbccnt;</div><div class='ctx'> 	u16 qdioac2;</div><div class='ctx'> 	u64 sch_token;</div><div class='del'>-	u64:64;</div><div class='add'>+	u8 mro;</div><div class='add'>+	u8 mri;</div><div class='add'>+	u8:8;</div><div class='add'>+	u8 sbalic;</div><div class='add'>+	u16:16;</div><div class='add'>+	u8:8;</div><div class='add'>+	u8 mmwc;</div><div class='ctx'> } __attribute__ ((packed));</div><div class='ctx'> </div><div class='ctx'> /* params are: ccw_device, qdio_error, queue_number,</div><div class='head'>diff --git a/arch/s390/include/asm/statfs.h b/arch/s390/include/asm/statfs.h<br/>index 099a45579190..06cc70307ece 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/s390/include/asm/statfs.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/s390/include/asm/statfs.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/s390/include/asm/statfs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/s390/include/asm/statfs.h</a></div><div class='hunk'>@@ -12,19 +12,16 @@</div><div class='ctx'> #ifndef __s390x__</div><div class='ctx'> #include &lt;asm-generic/statfs.h&gt;</div><div class='ctx'> #else</div><div class='add'>+/*</div><div class='add'>+ * We can't use &lt;asm-generic/statfs.h&gt; because in 64-bit mode</div><div class='add'>+ * we mix ints of different sizes in our struct statfs.</div><div class='add'>+ */</div><div class='ctx'> </div><div class='ctx'> #ifndef __KERNEL_STRICT_NAMES</div><div class='del'>-</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='del'>-</div><div class='ctx'> typedef __kernel_fsid_t	fsid_t;</div><div class='del'>-</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * This is ugly -- we're already 64-bit clean, so just duplicate the </div><div class='del'>- * definitions.</div><div class='del'>- */</div><div class='ctx'> struct statfs {</div><div class='ctx'> 	int  f_type;</div><div class='ctx'> 	int  f_bsize;</div><div class='head'>diff --git a/arch/s390/include/asm/syscall.h b/arch/s390/include/asm/syscall.h<br/>new file mode 100644<br/>index 000000000000..6e623971fbb9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/s390/include/asm/syscall.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/s390/include/asm/syscall.h</a></div><div class='hunk'>@@ -0,0 +1,80 @@</div><div class='add'>+/*</div><div class='add'>+ * Access to user system call parameters and results</div><div class='add'>+ *</div><div class='add'>+ *  Copyright IBM Corp. 2008</div><div class='add'>+ *  Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com)</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License (version 2 only)</div><div class='add'>+ * as published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _ASM_SYSCALL_H</div><div class='add'>+#define _ASM_SYSCALL_H	1</div><div class='add'>+</div><div class='add'>+#include &lt;asm/ptrace.h&gt;</div><div class='add'>+</div><div class='add'>+static inline long syscall_get_nr(struct task_struct *task,</div><div class='add'>+				  struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	if (regs-&gt;trap != __LC_SVC_OLD_PSW)</div><div class='add'>+		return -1;</div><div class='add'>+	return regs-&gt;gprs[2];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void syscall_rollback(struct task_struct *task,</div><div class='add'>+				    struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	regs-&gt;gprs[2] = regs-&gt;orig_gpr2;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline long syscall_get_error(struct task_struct *task,</div><div class='add'>+				     struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	return (regs-&gt;gprs[2] &gt;= -4096UL) ? -regs-&gt;gprs[2] : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline long syscall_get_return_value(struct task_struct *task,</div><div class='add'>+					    struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	return regs-&gt;gprs[2];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void syscall_set_return_value(struct task_struct *task,</div><div class='add'>+					    struct pt_regs *regs,</div><div class='add'>+					    int error, long val)</div><div class='add'>+{</div><div class='add'>+	regs-&gt;gprs[2] = error ? -error : val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void syscall_get_arguments(struct task_struct *task,</div><div class='add'>+					 struct pt_regs *regs,</div><div class='add'>+					 unsigned int i, unsigned int n,</div><div class='add'>+					 unsigned long *args)</div><div class='add'>+{</div><div class='add'>+	BUG_ON(i + n &gt; 6);</div><div class='add'>+#ifdef CONFIG_COMPAT</div><div class='add'>+	if (test_tsk_thread_flag(task, TIF_31BIT)) {</div><div class='add'>+		if (i + n == 6)</div><div class='add'>+			args[--n] = (u32) regs-&gt;args[0];</div><div class='add'>+		while (n-- &gt; 0)</div><div class='add'>+			args[n] = (u32) regs-&gt;gprs[2 + i + n];</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	if (i + n == 6)</div><div class='add'>+		args[--n] = regs-&gt;args[0];</div><div class='add'>+	memcpy(args, &amp;regs-&gt;gprs[2 + i], n * sizeof(args[0]));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void syscall_set_arguments(struct task_struct *task,</div><div class='add'>+					 struct pt_regs *regs,</div><div class='add'>+					 unsigned int i, unsigned int n,</div><div class='add'>+					 const unsigned long *args)</div><div class='add'>+{</div><div class='add'>+	BUG_ON(i + n &gt; 6);</div><div class='add'>+	if (i + n == 6)</div><div class='add'>+		regs-&gt;args[0] = args[--n];</div><div class='add'>+	memcpy(&amp;regs-&gt;gprs[2 + i], args, n * sizeof(args[0]));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif	/* _ASM_SYSCALL_H */</div><div class='head'>diff --git a/arch/s390/include/asm/thread_info.h b/arch/s390/include/asm/thread_info.h<br/>index 91a8f93ad355..ea40a9d690fc 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/s390/include/asm/thread_info.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/s390/include/asm/thread_info.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/s390/include/asm/thread_info.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/s390/include/asm/thread_info.h</a></div><div class='hunk'>@@ -86,6 +86,7 @@ static inline struct thread_info *current_thread_info(void)</div><div class='ctx'>  * thread information flags bit numbers</div><div class='ctx'>  */</div><div class='ctx'> #define TIF_SYSCALL_TRACE	0	/* syscall trace active */</div><div class='add'>+#define TIF_NOTIFY_RESUME	1	/* callback before returning to user */</div><div class='ctx'> #define TIF_SIGPENDING		2	/* signal pending */</div><div class='ctx'> #define TIF_NEED_RESCHED	3	/* rescheduling necessary */</div><div class='ctx'> #define TIF_RESTART_SVC		4	/* restart svc with new svc number */</div><div class='hunk'>@@ -100,6 +101,7 @@ static inline struct thread_info *current_thread_info(void)</div><div class='ctx'> #define TIF_RESTORE_SIGMASK	20	/* restore signal mask in do_signal() */</div><div class='ctx'> </div><div class='ctx'> #define _TIF_SYSCALL_TRACE	(1&lt;&lt;TIF_SYSCALL_TRACE)</div><div class='add'>+#define _TIF_NOTIFY_RESUME	(1&lt;&lt;TIF_NOTIFY_RESUME)</div><div class='ctx'> #define _TIF_RESTORE_SIGMASK	(1&lt;&lt;TIF_RESTORE_SIGMASK)</div><div class='ctx'> #define _TIF_SIGPENDING		(1&lt;&lt;TIF_SIGPENDING)</div><div class='ctx'> #define _TIF_NEED_RESCHED	(1&lt;&lt;TIF_NEED_RESCHED)</div><div class='head'>diff --git a/arch/s390/kernel/compat_linux.c b/arch/s390/kernel/compat_linux.c<br/>index d7f22226fc4e..4646382af34f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/s390/kernel/compat_linux.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/s390/kernel/compat_linux.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/s390/kernel/compat_linux.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/s390/kernel/compat_linux.c</a></div><div class='hunk'>@@ -279,22 +279,6 @@ asmlinkage long sys32_getegid16(void)</div><div class='ctx'> 	return high2lowgid(current-&gt;egid);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* 32-bit timeval and related flotsam.  */</div><div class='del'>-</div><div class='del'>-static inline long get_tv32(struct timeval *o, struct compat_timeval __user *i)</div><div class='del'>-{</div><div class='del'>-	return (!access_ok(VERIFY_READ, o, sizeof(*o)) ||</div><div class='del'>-		(__get_user(o-&gt;tv_sec, &amp;i-&gt;tv_sec) ||</div><div class='del'>-		 __get_user(o-&gt;tv_usec, &amp;i-&gt;tv_usec)));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline long put_tv32(struct compat_timeval __user *o, struct timeval *i)</div><div class='del'>-{</div><div class='del'>-	return (!access_ok(VERIFY_WRITE, o, sizeof(*o)) ||</div><div class='del'>-		(__put_user(i-&gt;tv_sec, &amp;o-&gt;tv_sec) ||</div><div class='del'>-		 __put_user(i-&gt;tv_usec, &amp;o-&gt;tv_usec)));</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * sys32_ipc() is the de-multiplexer for the SysV IPC calls in 32bit emulation.</div><div class='ctx'>  *</div><div class='hunk'>@@ -362,41 +346,6 @@ asmlinkage long sys32_ftruncate64(unsigned int fd, unsigned long high, unsigned</div><div class='ctx'> 		return sys_ftruncate(fd, (high &lt;&lt; 32) | low);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int cp_compat_stat(struct kstat *stat, struct compat_stat __user *statbuf)</div><div class='del'>-{</div><div class='del'>-	compat_ino_t ino;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (!old_valid_dev(stat-&gt;dev) || !old_valid_dev(stat-&gt;rdev))</div><div class='del'>-		return -EOVERFLOW;</div><div class='del'>-</div><div class='del'>-	ino = stat-&gt;ino;</div><div class='del'>-	if (sizeof(ino) &lt; sizeof(stat-&gt;ino) &amp;&amp; ino != stat-&gt;ino)</div><div class='del'>-		return -EOVERFLOW;</div><div class='del'>-</div><div class='del'>-	err = put_user(old_encode_dev(stat-&gt;dev), &amp;statbuf-&gt;st_dev);</div><div class='del'>-	err |= put_user(stat-&gt;ino, &amp;statbuf-&gt;st_ino);</div><div class='del'>-	err |= put_user(stat-&gt;mode, &amp;statbuf-&gt;st_mode);</div><div class='del'>-	err |= put_user(stat-&gt;nlink, &amp;statbuf-&gt;st_nlink);</div><div class='del'>-	err |= put_user(high2lowuid(stat-&gt;uid), &amp;statbuf-&gt;st_uid);</div><div class='del'>-	err |= put_user(high2lowgid(stat-&gt;gid), &amp;statbuf-&gt;st_gid);</div><div class='del'>-	err |= put_user(old_encode_dev(stat-&gt;rdev), &amp;statbuf-&gt;st_rdev);</div><div class='del'>-	err |= put_user(stat-&gt;size, &amp;statbuf-&gt;st_size);</div><div class='del'>-	err |= put_user(stat-&gt;atime.tv_sec, &amp;statbuf-&gt;st_atime);</div><div class='del'>-	err |= put_user(stat-&gt;atime.tv_nsec, &amp;statbuf-&gt;st_atime_nsec);</div><div class='del'>-	err |= put_user(stat-&gt;mtime.tv_sec, &amp;statbuf-&gt;st_mtime);</div><div class='del'>-	err |= put_user(stat-&gt;mtime.tv_nsec, &amp;statbuf-&gt;st_mtime_nsec);</div><div class='del'>-	err |= put_user(stat-&gt;ctime.tv_sec, &amp;statbuf-&gt;st_ctime);</div><div class='del'>-	err |= put_user(stat-&gt;ctime.tv_nsec, &amp;statbuf-&gt;st_ctime_nsec);</div><div class='del'>-	err |= put_user(stat-&gt;blksize, &amp;statbuf-&gt;st_blksize);</div><div class='del'>-	err |= put_user(stat-&gt;blocks, &amp;statbuf-&gt;st_blocks);</div><div class='del'>-/* fixme</div><div class='del'>-	err |= put_user(0, &amp;statbuf-&gt;__unused4[0]);</div><div class='del'>-	err |= put_user(0, &amp;statbuf-&gt;__unused4[1]);</div><div class='del'>-*/</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> asmlinkage long sys32_sched_rr_get_interval(compat_pid_t pid,</div><div class='ctx'> 				struct compat_timespec __user *interval)</div><div class='ctx'> {</div><div class='hunk'>@@ -557,65 +506,6 @@ sys32_delete_module(const char __user *name_user, unsigned int flags)</div><div class='ctx'> </div><div class='ctx'> #endif  /* CONFIG_MODULES */</div><div class='ctx'> </div><div class='del'>-/* Translations due to time_t size differences.  Which affects all</div><div class='del'>-   sorts of things, like timeval and itimerval.  */</div><div class='del'>-</div><div class='del'>-extern struct timezone sys_tz;</div><div class='del'>-</div><div class='del'>-asmlinkage long sys32_gettimeofday(struct compat_timeval __user *tv, struct timezone __user *tz)</div><div class='del'>-{</div><div class='del'>-	if (tv) {</div><div class='del'>-		struct timeval ktv;</div><div class='del'>-		do_gettimeofday(&amp;ktv);</div><div class='del'>-		if (put_tv32(tv, &amp;ktv))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-	}</div><div class='del'>-	if (tz) {</div><div class='del'>-		if (copy_to_user(tz, &amp;sys_tz, sizeof(sys_tz)))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline long get_ts32(struct timespec *o, struct compat_timeval __user *i)</div><div class='del'>-{</div><div class='del'>-	long usec;</div><div class='del'>-</div><div class='del'>-	if (!access_ok(VERIFY_READ, i, sizeof(*i)))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	if (__get_user(o-&gt;tv_sec, &amp;i-&gt;tv_sec))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	if (__get_user(usec, &amp;i-&gt;tv_usec))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	o-&gt;tv_nsec = usec * 1000;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-asmlinkage long sys32_settimeofday(struct compat_timeval __user *tv, struct timezone __user *tz)</div><div class='del'>-{</div><div class='del'>-	struct timespec kts;</div><div class='del'>-	struct timezone ktz;</div><div class='del'>-</div><div class='del'>- 	if (tv) {</div><div class='del'>-		if (get_ts32(&amp;kts, tv))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-	}</div><div class='del'>-	if (tz) {</div><div class='del'>-		if (copy_from_user(&amp;ktz, tz, sizeof(ktz)))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return do_sys_settimeofday(tv ? &amp;kts : NULL, tz ? &amp;ktz : NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* These are here just in case some old sparc32 binary calls it. */</div><div class='del'>-asmlinkage long sys32_pause(void)</div><div class='del'>-{</div><div class='del'>-	current-&gt;state = TASK_INTERRUPTIBLE;</div><div class='del'>-	schedule();</div><div class='del'>-	return -ERESTARTNOHAND;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> asmlinkage long sys32_pread64(unsigned int fd, char __user *ubuf,</div><div class='ctx'> 				size_t count, u32 poshi, u32 poslo)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/s390/kernel/compat_linux.h b/arch/s390/kernel/compat_linux.h<br/>index 20723a062017..836a28842900 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/s390/kernel/compat_linux.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/s390/kernel/compat_linux.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/s390/kernel/compat_linux.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/s390/kernel/compat_linux.h</a></div><div class='hunk'>@@ -202,11 +202,6 @@ long sys32_execve(void);</div><div class='ctx'> long sys32_init_module(void __user *umod, unsigned long len,</div><div class='ctx'> 		       const char __user *uargs);</div><div class='ctx'> long sys32_delete_module(const char __user *name_user, unsigned int flags);</div><div class='del'>-long sys32_gettimeofday(struct compat_timeval __user *tv,</div><div class='del'>-			struct timezone __user *tz);</div><div class='del'>-long sys32_settimeofday(struct compat_timeval __user *tv,</div><div class='del'>-			struct timezone __user *tz);</div><div class='del'>-long sys32_pause(void);</div><div class='ctx'> long sys32_pread64(unsigned int fd, char __user *ubuf, size_t count,</div><div class='ctx'> 		   u32 poshi, u32 poslo);</div><div class='ctx'> long sys32_pwrite64(unsigned int fd, const char __user *ubuf,</div><div class='head'>diff --git a/arch/s390/kernel/compat_wrapper.S b/arch/s390/kernel/compat_wrapper.S<br/>index 328a20e880b5..fc2c97197a53 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/s390/kernel/compat_wrapper.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/s390/kernel/compat_wrapper.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/s390/kernel/compat_wrapper.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/s390/kernel/compat_wrapper.S</a></div><div class='hunk'>@@ -128,8 +128,6 @@ sys32_alarm_wrapper:</div><div class='ctx'> 	llgfr	%r2,%r2			# unsigned int</div><div class='ctx'> 	jg	sys_alarm		# branch to system call</div><div class='ctx'> </div><div class='del'>-#sys32_pause_wrapper			# void</div><div class='del'>-</div><div class='ctx'> 	.globl	compat_sys_utime_wrapper</div><div class='ctx'> compat_sys_utime_wrapper:</div><div class='ctx'> 	llgtr	%r2,%r2			# char *</div><div class='hunk'>@@ -334,17 +332,17 @@ compat_sys_getrusage_wrapper:</div><div class='ctx'> 	llgtr	%r3,%r3			# struct rusage_emu31 *</div><div class='ctx'> 	jg	compat_sys_getrusage	# branch to system call</div><div class='ctx'> </div><div class='del'>-	.globl	sys32_gettimeofday_wrapper</div><div class='del'>-sys32_gettimeofday_wrapper:</div><div class='add'>+	.globl	compat_sys_gettimeofday_wrapper</div><div class='add'>+compat_sys_gettimeofday_wrapper:</div><div class='ctx'> 	llgtr	%r2,%r2			# struct timeval_emu31 *</div><div class='ctx'> 	llgtr	%r3,%r3			# struct timezone *</div><div class='del'>-	jg	sys32_gettimeofday	# branch to system call</div><div class='add'>+	jg	compat_sys_gettimeofday	# branch to system call</div><div class='ctx'> </div><div class='del'>-	.globl	sys32_settimeofday_wrapper</div><div class='del'>-sys32_settimeofday_wrapper:</div><div class='add'>+	.globl	compat_sys_settimeofday_wrapper</div><div class='add'>+compat_sys_settimeofday_wrapper:</div><div class='ctx'> 	llgtr	%r2,%r2			# struct timeval_emu31 *</div><div class='ctx'> 	llgtr	%r3,%r3			# struct timezone *</div><div class='del'>-	jg	sys32_settimeofday	# branch to system call</div><div class='add'>+	jg	compat_sys_settimeofday	# branch to system call</div><div class='ctx'> </div><div class='ctx'> 	.globl	sys32_getgroups16_wrapper</div><div class='ctx'> sys32_getgroups16_wrapper:</div><div class='head'>diff --git a/arch/s390/kernel/entry.S b/arch/s390/kernel/entry.S<br/>index 708cf9cf9a35..ed500ef799b7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/s390/kernel/entry.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/s390/kernel/entry.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/s390/kernel/entry.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/s390/kernel/entry.S</a></div><div class='hunk'>@@ -49,9 +49,9 @@ SP_ILC	     =	STACK_FRAME_OVERHEAD + __PT_ILC</div><div class='ctx'> SP_TRAP      =	STACK_FRAME_OVERHEAD + __PT_TRAP</div><div class='ctx'> SP_SIZE      =	STACK_FRAME_OVERHEAD + __PT_SIZE</div><div class='ctx'> </div><div class='del'>-_TIF_WORK_SVC = (_TIF_SIGPENDING | _TIF_NEED_RESCHED | \</div><div class='add'>+_TIF_WORK_SVC = (_TIF_SIGPENDING | _TIF_NOTIFY_RESUME | _TIF_NEED_RESCHED | \</div><div class='ctx'> 		 _TIF_MCCK_PENDING | _TIF_RESTART_SVC | _TIF_SINGLE_STEP )</div><div class='del'>-_TIF_WORK_INT = (_TIF_SIGPENDING | _TIF_NEED_RESCHED | \</div><div class='add'>+_TIF_WORK_INT = (_TIF_SIGPENDING | _TIF_NOTIFY_RESUME | _TIF_NEED_RESCHED | \</div><div class='ctx'> 		 _TIF_MCCK_PENDING)</div><div class='ctx'> </div><div class='ctx'> STACK_SHIFT = PAGE_SHIFT + THREAD_ORDER</div><div class='hunk'>@@ -318,6 +318,8 @@ sysc_work:</div><div class='ctx'> 	bo	BASED(sysc_reschedule)</div><div class='ctx'> 	tm	__TI_flags+3(%r9),_TIF_SIGPENDING</div><div class='ctx'> 	bnz	BASED(sysc_sigpending)</div><div class='add'>+	tm	__TI_flags+3(%r9),_TIF_NOTIFY_RESUME</div><div class='add'>+	bnz	BASED(sysc_notify_resume)</div><div class='ctx'> 	tm	__TI_flags+3(%r9),_TIF_RESTART_SVC</div><div class='ctx'> 	bo	BASED(sysc_restart)</div><div class='ctx'> 	tm	__TI_flags+3(%r9),_TIF_SINGLE_STEP</div><div class='hunk'>@@ -356,6 +358,16 @@ sysc_sigpending:</div><div class='ctx'> 	b	BASED(sysc_work_loop)</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# _TIF_NOTIFY_RESUME is set, call do_notify_resume</div><div class='add'>+#</div><div class='add'>+sysc_notify_resume:</div><div class='add'>+	la	%r2,SP_PTREGS(%r15)	# load pt_regs</div><div class='add'>+	l	%r1,BASED(.Ldo_notify_resume)</div><div class='add'>+	la	%r14,BASED(sysc_work_loop)</div><div class='add'>+	br	%r1			# call do_notify_resume</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # _TIF_RESTART_SVC is set, set up registers and restart svc</div><div class='ctx'> #</div><div class='ctx'> sysc_restart:</div><div class='hunk'>@@ -378,20 +390,21 @@ sysc_singlestep:</div><div class='ctx'> 	br	%r1			# branch to do_single_step</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# call trace before and after sys_call</div><div class='add'>+# call tracehook_report_syscall_entry/tracehook_report_syscall_exit before</div><div class='add'>+# and after the system call</div><div class='ctx'> #</div><div class='ctx'> sysc_tracesys:</div><div class='del'>-	l	%r1,BASED(.Ltrace)</div><div class='add'>+	l	%r1,BASED(.Ltrace_entry)</div><div class='ctx'> 	la	%r2,SP_PTREGS(%r15)	# load pt_regs</div><div class='ctx'> 	la	%r3,0</div><div class='ctx'> 	srl	%r7,2</div><div class='ctx'> 	st	%r7,SP_R2(%r15)</div><div class='ctx'> 	basr	%r14,%r1</div><div class='del'>-	clc	SP_R2(4,%r15),BASED(.Lnr_syscalls)</div><div class='add'>+	cl	%r2,BASED(.Lnr_syscalls)</div><div class='ctx'> 	bnl	BASED(sysc_tracenogo)</div><div class='ctx'> 	l	%r8,BASED(.Lsysc_table)</div><div class='del'>-	l	%r7,SP_R2(%r15) 	# strace might have changed the</div><div class='del'>-	sll	%r7,2			#  system call</div><div class='add'>+	lr	%r7,%r2</div><div class='add'>+	sll	%r7,2			# *4</div><div class='ctx'> 	l	%r8,0(%r7,%r8)</div><div class='ctx'> sysc_tracego:</div><div class='ctx'> 	lm	%r3,%r6,SP_R3(%r15)</div><div class='hunk'>@@ -401,9 +414,8 @@ sysc_tracego:</div><div class='ctx'> sysc_tracenogo:</div><div class='ctx'> 	tm	__TI_flags+3(%r9),(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT)</div><div class='ctx'> 	bz	BASED(sysc_return)</div><div class='del'>-	l	%r1,BASED(.Ltrace)</div><div class='add'>+	l	%r1,BASED(.Ltrace_exit)</div><div class='ctx'> 	la	%r2,SP_PTREGS(%r15)	# load pt_regs</div><div class='del'>-	la	%r3,1</div><div class='ctx'> 	la	%r14,BASED(sysc_return)</div><div class='ctx'> 	br	%r1</div><div class='ctx'> </div><div class='hunk'>@@ -666,6 +678,8 @@ io_work_loop:</div><div class='ctx'> 	bo	BASED(io_reschedule)</div><div class='ctx'> 	tm	__TI_flags+3(%r9),_TIF_SIGPENDING</div><div class='ctx'> 	bnz	BASED(io_sigpending)</div><div class='add'>+	tm	__TI_flags+3(%r9),_TIF_NOTIFY_RESUME</div><div class='add'>+	bnz	BASED(io_notify_resume)</div><div class='ctx'> 	b	BASED(io_restore)</div><div class='ctx'> io_work_done:</div><div class='ctx'> </div><div class='hunk'>@@ -704,6 +718,19 @@ io_sigpending:</div><div class='ctx'> 	TRACE_IRQS_OFF</div><div class='ctx'> 	b	BASED(io_work_loop)</div><div class='ctx'> </div><div class='add'>+#</div><div class='add'>+# _TIF_SIGPENDING is set, call do_signal</div><div class='add'>+#</div><div class='add'>+io_notify_resume:</div><div class='add'>+	TRACE_IRQS_ON</div><div class='add'>+	stosm	__SF_EMPTY(%r15),0x03	# reenable interrupts</div><div class='add'>+	la	%r2,SP_PTREGS(%r15)	# load pt_regs</div><div class='add'>+	l	%r1,BASED(.Ldo_notify_resume)</div><div class='add'>+	basr	%r14,%r1		# call do_signal</div><div class='add'>+	stnsm	__SF_EMPTY(%r15),0xfc	# disable I/O and ext. interrupts</div><div class='add'>+	TRACE_IRQS_OFF</div><div class='add'>+	b	BASED(io_work_loop)</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * External interrupt handler routine</div><div class='ctx'>  */</div><div class='hunk'>@@ -1070,6 +1097,8 @@ cleanup_io_leave_insn:</div><div class='ctx'> .Ldo_IRQ:	.long	do_IRQ</div><div class='ctx'> .Ldo_extint:	.long	do_extint</div><div class='ctx'> .Ldo_signal:	.long	do_signal</div><div class='add'>+.Ldo_notify_resume:</div><div class='add'>+		.long	do_notify_resume</div><div class='ctx'> .Lhandle_per:	.long	do_single_step</div><div class='ctx'> .Ldo_execve:	.long	do_execve</div><div class='ctx'> .Lexecve_tail:	.long	execve_tail</div><div class='hunk'>@@ -1079,7 +1108,8 @@ cleanup_io_leave_insn:</div><div class='ctx'> .Lpreempt_schedule_irq:</div><div class='ctx'> 		.long	preempt_schedule_irq</div><div class='ctx'> #endif</div><div class='del'>-.Ltrace:	.long	syscall_trace</div><div class='add'>+.Ltrace_entry:	.long	do_syscall_trace_enter</div><div class='add'>+.Ltrace_exit:	.long	do_syscall_trace_exit</div><div class='ctx'> .Lschedtail:	.long	schedule_tail</div><div class='ctx'> .Lsysc_table:	.long	sys_call_table</div><div class='ctx'> #ifdef CONFIG_TRACE_IRQFLAGS</div><div class='head'>diff --git a/arch/s390/kernel/entry64.S b/arch/s390/kernel/entry64.S<br/>index fee10177dbfc..d7ce150453f2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/s390/kernel/entry64.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/s390/kernel/entry64.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/s390/kernel/entry64.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/s390/kernel/entry64.S</a></div><div class='hunk'>@@ -52,9 +52,9 @@ SP_SIZE      =	STACK_FRAME_OVERHEAD + __PT_SIZE</div><div class='ctx'> STACK_SHIFT = PAGE_SHIFT + THREAD_ORDER</div><div class='ctx'> STACK_SIZE  = 1 &lt;&lt; STACK_SHIFT</div><div class='ctx'> </div><div class='del'>-_TIF_WORK_SVC = (_TIF_SIGPENDING | _TIF_NEED_RESCHED | \</div><div class='add'>+_TIF_WORK_SVC = (_TIF_SIGPENDING | _TIF_NOTIFY_RESUME | _TIF_NEED_RESCHED | \</div><div class='ctx'> 		 _TIF_MCCK_PENDING | _TIF_RESTART_SVC | _TIF_SINGLE_STEP )</div><div class='del'>-_TIF_WORK_INT = (_TIF_SIGPENDING | _TIF_NEED_RESCHED | \</div><div class='add'>+_TIF_WORK_INT = (_TIF_SIGPENDING | _TIF_NOTIFY_RESUME | _TIF_NEED_RESCHED | \</div><div class='ctx'> 		 _TIF_MCCK_PENDING)</div><div class='ctx'> </div><div class='ctx'> #define BASED(name) name-system_call(%r13)</div><div class='hunk'>@@ -310,6 +310,8 @@ sysc_work:</div><div class='ctx'> 	jo	sysc_reschedule</div><div class='ctx'> 	tm	__TI_flags+7(%r9),_TIF_SIGPENDING</div><div class='ctx'> 	jnz	sysc_sigpending</div><div class='add'>+	tm	__TI_flags+7(%r9),_TIF_NOTIFY_RESUME</div><div class='add'>+	jnz	sysc_notify_resume</div><div class='ctx'> 	tm	__TI_flags+7(%r9),_TIF_RESTART_SVC</div><div class='ctx'> 	jo	sysc_restart</div><div class='ctx'> 	tm	__TI_flags+7(%r9),_TIF_SINGLE_STEP</div><div class='hunk'>@@ -345,6 +347,14 @@ sysc_sigpending:</div><div class='ctx'> 	j	sysc_work_loop</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# _TIF_NOTIFY_RESUME is set, call do_notify_resume</div><div class='add'>+#</div><div class='add'>+sysc_notify_resume:</div><div class='add'>+	la	%r2,SP_PTREGS(%r15)	# load pt_regs</div><div class='add'>+	larl	%r14,sysc_work_loop</div><div class='add'>+	jg	do_notify_resume	# call do_notify_resume</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # _TIF_RESTART_SVC is set, set up registers and restart svc</div><div class='ctx'> #</div><div class='ctx'> sysc_restart:</div><div class='hunk'>@@ -367,20 +377,19 @@ sysc_singlestep:</div><div class='ctx'> 	jg	do_single_step		# branch to do_sigtrap</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# call syscall_trace before and after system call</div><div class='del'>-# special linkage: %r12 contains the return address for trace_svc</div><div class='add'>+# call tracehook_report_syscall_entry/tracehook_report_syscall_exit before</div><div class='add'>+# and after the system call</div><div class='ctx'> #</div><div class='ctx'> sysc_tracesys:</div><div class='ctx'> 	la	%r2,SP_PTREGS(%r15)	# load pt_regs</div><div class='ctx'> 	la	%r3,0</div><div class='ctx'> 	srl	%r7,2</div><div class='ctx'> 	stg	%r7,SP_R2(%r15)</div><div class='del'>-	brasl	%r14,syscall_trace</div><div class='add'>+	brasl	%r14,do_syscall_trace_enter</div><div class='ctx'> 	lghi	%r0,NR_syscalls</div><div class='del'>-	clg	%r0,SP_R2(%r15)</div><div class='add'>+	clgr	%r0,%r2</div><div class='ctx'> 	jnh	sysc_tracenogo</div><div class='del'>-	lg	%r7,SP_R2(%r15)		# strace might have changed the</div><div class='del'>-	sll	%r7,2			# system call</div><div class='add'>+	slag	%r7,%r2,2		# *4</div><div class='ctx'> 	lgf	%r8,0(%r7,%r10)</div><div class='ctx'> sysc_tracego:</div><div class='ctx'> 	lmg	%r3,%r6,SP_R3(%r15)</div><div class='hunk'>@@ -391,9 +400,8 @@ sysc_tracenogo:</div><div class='ctx'> 	tm	__TI_flags+7(%r9),(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT)</div><div class='ctx'> 	jz	sysc_return</div><div class='ctx'> 	la	%r2,SP_PTREGS(%r15)	# load pt_regs</div><div class='del'>-	la	%r3,1</div><div class='ctx'> 	larl	%r14,sysc_return	# return point is sysc_return</div><div class='del'>-	jg	syscall_trace</div><div class='add'>+	jg	do_syscall_trace_exit</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # a new process exits the kernel with ret_from_fork</div><div class='hunk'>@@ -672,6 +680,8 @@ io_work_loop:</div><div class='ctx'> 	jo	io_reschedule</div><div class='ctx'> 	tm	__TI_flags+7(%r9),_TIF_SIGPENDING</div><div class='ctx'> 	jnz	io_sigpending</div><div class='add'>+	tm	__TI_flags+7(%r9),_TIF_NOTIFY_RESUME</div><div class='add'>+	jnz	io_notify_resume</div><div class='ctx'> 	j	io_restore</div><div class='ctx'> io_work_done:</div><div class='ctx'> </div><div class='hunk'>@@ -712,6 +722,18 @@ io_sigpending:</div><div class='ctx'> 	TRACE_IRQS_OFF</div><div class='ctx'> 	j	io_work_loop</div><div class='ctx'> </div><div class='add'>+#</div><div class='add'>+# _TIF_NOTIFY_RESUME or is set, call do_notify_resume</div><div class='add'>+#</div><div class='add'>+io_notify_resume:</div><div class='add'>+	TRACE_IRQS_ON</div><div class='add'>+	stosm	__SF_EMPTY(%r15),0x03	# reenable interrupts</div><div class='add'>+	la	%r2,SP_PTREGS(%r15)	# load pt_regs</div><div class='add'>+	brasl	%r14,do_notify_resume	# call do_notify_resume</div><div class='add'>+	stnsm	__SF_EMPTY(%r15),0xfc	# disable I/O and ext. interrupts</div><div class='add'>+	TRACE_IRQS_OFF</div><div class='add'>+	j	io_work_loop</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * External interrupt handler routine</div><div class='ctx'>  */</div><div class='head'>diff --git a/arch/s390/kernel/ptrace.c b/arch/s390/kernel/ptrace.c<br/>index c8b08289eb87..1f31be1ecc4b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/s390/kernel/ptrace.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/s390/kernel/ptrace.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/s390/kernel/ptrace.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/s390/kernel/ptrace.c</a></div><div class='hunk'>@@ -35,6 +35,7 @@</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/elf.h&gt;</div><div class='ctx'> #include &lt;linux/regset.h&gt;</div><div class='add'>+#include &lt;linux/tracehook.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/segment.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='hunk'>@@ -639,40 +640,44 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request,</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-asmlinkage void</div><div class='del'>-syscall_trace(struct pt_regs *regs, int entryexit)</div><div class='add'>+asmlinkage long do_syscall_trace_enter(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='del'>-	if (unlikely(current-&gt;audit_context) &amp;&amp; entryexit)</div><div class='del'>-		audit_syscall_exit(AUDITSC_RESULT(regs-&gt;gprs[2]), regs-&gt;gprs[2]);</div><div class='del'>-</div><div class='del'>-	if (!test_thread_flag(TIF_SYSCALL_TRACE))</div><div class='del'>-		goto out;</div><div class='del'>-	if (!(current-&gt;ptrace &amp; PT_PTRACED))</div><div class='del'>-		goto out;</div><div class='del'>-	ptrace_notify(SIGTRAP | ((current-&gt;ptrace &amp; PT_TRACESYSGOOD)</div><div class='del'>-				 ? 0x80 : 0));</div><div class='add'>+	long ret;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * If the debuffer has set an invalid system call number,</div><div class='del'>-	 * we prepare to skip the system call restart handling.</div><div class='add'>+	 * The sysc_tracesys code in entry.S stored the system</div><div class='add'>+	 * call number to gprs[2].</div><div class='ctx'> 	 */</div><div class='del'>-	if (!entryexit &amp;&amp; regs-&gt;gprs[2] &gt;= NR_syscalls)</div><div class='add'>+	ret = regs-&gt;gprs[2];</div><div class='add'>+	if (test_thread_flag(TIF_SYSCALL_TRACE) &amp;&amp;</div><div class='add'>+	    (tracehook_report_syscall_entry(regs) ||</div><div class='add'>+	     regs-&gt;gprs[2] &gt;= NR_syscalls)) {</div><div class='add'>+		/*</div><div class='add'>+		 * Tracing decided this syscall should not happen or the</div><div class='add'>+		 * debugger stored an invalid system call number. Skip</div><div class='add'>+		 * the system call and the system call restart handling.</div><div class='add'>+		 */</div><div class='ctx'> 		regs-&gt;trap = -1;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * this isn't the same as continuing with a signal, but it will do</div><div class='del'>-	 * for normal use.  strace only continues with a signal if the</div><div class='del'>-	 * stopping signal is not SIGTRAP.  -brl</div><div class='del'>-	 */</div><div class='del'>-	if (current-&gt;exit_code) {</div><div class='del'>-		send_sig(current-&gt;exit_code, current, 1);</div><div class='del'>-		current-&gt;exit_code = 0;</div><div class='add'>+		ret = -1;</div><div class='ctx'> 	}</div><div class='del'>- out:</div><div class='del'>-	if (unlikely(current-&gt;audit_context) &amp;&amp; !entryexit)</div><div class='del'>-		audit_syscall_entry(test_thread_flag(TIF_31BIT)?AUDIT_ARCH_S390:AUDIT_ARCH_S390X,</div><div class='del'>-				    regs-&gt;gprs[2], regs-&gt;orig_gpr2, regs-&gt;gprs[3],</div><div class='del'>-				    regs-&gt;gprs[4], regs-&gt;gprs[5]);</div><div class='add'>+</div><div class='add'>+	if (unlikely(current-&gt;audit_context))</div><div class='add'>+		audit_syscall_entry(test_thread_flag(TIF_31BIT) ?</div><div class='add'>+					AUDIT_ARCH_S390 : AUDIT_ARCH_S390X,</div><div class='add'>+				    regs-&gt;gprs[2], regs-&gt;orig_gpr2,</div><div class='add'>+				    regs-&gt;gprs[3], regs-&gt;gprs[4],</div><div class='add'>+				    regs-&gt;gprs[5]);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+asmlinkage void do_syscall_trace_exit(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	if (unlikely(current-&gt;audit_context))</div><div class='add'>+		audit_syscall_exit(AUDITSC_RESULT(regs-&gt;gprs[2]),</div><div class='add'>+				   regs-&gt;gprs[2]);</div><div class='add'>+</div><div class='add'>+	if (test_thread_flag(TIF_SYSCALL_TRACE))</div><div class='add'>+		tracehook_report_syscall_exit(regs, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/s390/kernel/signal.c b/arch/s390/kernel/signal.c<br/>index b97682040215..4f7fc3059a8e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/s390/kernel/signal.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/s390/kernel/signal.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/s390/kernel/signal.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/s390/kernel/signal.c</a></div><div class='hunk'>@@ -24,6 +24,7 @@</div><div class='ctx'> #include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/personality.h&gt;</div><div class='ctx'> #include &lt;linux/binfmts.h&gt;</div><div class='add'>+#include &lt;linux/tracehook.h&gt;</div><div class='ctx'> #include &lt;asm/ucontext.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/lowcore.h&gt;</div><div class='hunk'>@@ -507,6 +508,12 @@ void do_signal(struct pt_regs *regs)</div><div class='ctx'> 			 */</div><div class='ctx'> 			if (current-&gt;thread.per_info.single_step)</div><div class='ctx'> 				set_thread_flag(TIF_SINGLE_STEP);</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * Let tracing know that we've done the handler setup.</div><div class='add'>+			 */</div><div class='add'>+			tracehook_signal_handler(signr, &amp;info, &amp;ka, regs,</div><div class='add'>+					 test_thread_flag(TIF_SINGLE_STEP));</div><div class='ctx'> 		}</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -526,3 +533,9 @@ void do_signal(struct pt_regs *regs)</div><div class='ctx'> 		set_thread_flag(TIF_RESTART_SVC);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+void do_notify_resume(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	clear_thread_flag(TIF_NOTIFY_RESUME);</div><div class='add'>+	tracehook_notify_resume(regs);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c<br/>index 00b9b4dec5eb..9e8b1f9b8f4d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/s390/kernel/smp.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/s390/kernel/smp.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/s390/kernel/smp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/s390/kernel/smp.c</a></div><div class='hunk'>@@ -585,6 +585,8 @@ int __cpuinit start_secondary(void *cpuvoid)</div><div class='ctx'> 	/* Enable pfault pseudo page faults on this cpu. */</div><div class='ctx'> 	pfault_init();</div><div class='ctx'> </div><div class='add'>+	/* call cpu notifiers */</div><div class='add'>+	notify_cpu_starting(smp_processor_id());</div><div class='ctx'> 	/* Mark this cpu as online */</div><div class='ctx'> 	spin_lock(&amp;call_lock);</div><div class='ctx'> 	cpu_set(smp_processor_id(), cpu_online_map);</div><div class='head'>diff --git a/arch/s390/kernel/syscalls.S b/arch/s390/kernel/syscalls.S<br/>index c66d35e55142..2d61787949d5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/s390/kernel/syscalls.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/s390/kernel/syscalls.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/s390/kernel/syscalls.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/s390/kernel/syscalls.S</a></div><div class='hunk'>@@ -37,7 +37,7 @@ SYSCALL(sys_stime,sys_ni_syscall,sys32_stime_wrapper)		/* 25 old stime syscall *</div><div class='ctx'> SYSCALL(sys_ptrace,sys_ptrace,sys32_ptrace_wrapper)</div><div class='ctx'> SYSCALL(sys_alarm,sys_alarm,sys32_alarm_wrapper)</div><div class='ctx'> NI_SYSCALL							/* old fstat syscall */</div><div class='del'>-SYSCALL(sys_pause,sys_pause,sys32_pause)</div><div class='add'>+SYSCALL(sys_pause,sys_pause,sys_pause)</div><div class='ctx'> SYSCALL(sys_utime,sys_utime,compat_sys_utime_wrapper)		/* 30 */</div><div class='ctx'> NI_SYSCALL							/* old stty syscall */</div><div class='ctx'> NI_SYSCALL							/* old gtty syscall */</div><div class='hunk'>@@ -86,8 +86,8 @@ SYSCALL(sys_sethostname,sys_sethostname,sys32_sethostname_wrapper)</div><div class='ctx'> SYSCALL(sys_setrlimit,sys_setrlimit,compat_sys_setrlimit_wrapper)	/* 75 */</div><div class='ctx'> SYSCALL(sys_old_getrlimit,sys_getrlimit,compat_sys_old_getrlimit_wrapper)</div><div class='ctx'> SYSCALL(sys_getrusage,sys_getrusage,compat_sys_getrusage_wrapper)</div><div class='del'>-SYSCALL(sys_gettimeofday,sys_gettimeofday,sys32_gettimeofday_wrapper)</div><div class='del'>-SYSCALL(sys_settimeofday,sys_settimeofday,sys32_settimeofday_wrapper)</div><div class='add'>+SYSCALL(sys_gettimeofday,sys_gettimeofday,compat_sys_gettimeofday_wrapper)</div><div class='add'>+SYSCALL(sys_settimeofday,sys_settimeofday,compat_sys_settimeofday_wrapper)</div><div class='ctx'> SYSCALL(sys_getgroups16,sys_ni_syscall,sys32_getgroups16_wrapper)	/* 80 old getgroups16 syscall */</div><div class='ctx'> SYSCALL(sys_setgroups16,sys_ni_syscall,sys32_setgroups16_wrapper)	/* old setgroups16 syscall */</div><div class='ctx'> NI_SYSCALL							/* old select syscall */</div><div class='head'>diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c<br/>index 06acb1a18bbc..b94e9e3b694a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/s390/kernel/time.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/s390/kernel/time.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/s390/kernel/time.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/s390/kernel/time.c</a></div><div class='hunk'>@@ -1356,7 +1356,7 @@ static void __init stp_reset(void)</div><div class='ctx'> </div><div class='ctx'> 	stp_page = alloc_bootmem_pages(PAGE_SIZE);</div><div class='ctx'> 	rc = chsc_sstpc(stp_page, STP_OP_CTRL, 0x0000);</div><div class='del'>-	if (rc == 1)</div><div class='add'>+	if (rc == 0)</div><div class='ctx'> 		set_bit(CLOCK_SYNC_HAS_STP, &amp;clock_sync_flags);</div><div class='ctx'> 	else if (stp_online) {</div><div class='ctx'> 		printk(KERN_WARNING "Running on non STP capable machine.\n");</div><div class='head'>diff --git a/arch/s390/kvm/priv.c b/arch/s390/kvm/priv.c<br/>index d1faf5c54405..cce40ff2913b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/s390/kvm/priv.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/s390/kvm/priv.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/s390/kvm/priv.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/s390/kvm/priv.c</a></div><div class='hunk'>@@ -157,8 +157,8 @@ static int handle_stfl(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	vcpu-&gt;stat.instruction_stfl++;</div><div class='del'>-	facility_list &amp;= ~(1UL&lt;&lt;24); /* no stfle */</div><div class='del'>-	facility_list &amp;= ~(1UL&lt;&lt;23); /* no large pages */</div><div class='add'>+	/* only pass the facility bits, which we can handle */</div><div class='add'>+	facility_list &amp;= 0xfe00fff3;</div><div class='ctx'> </div><div class='ctx'> 	rc = copy_to_guest(vcpu, offsetof(struct _lowcore, stfl_fac_list),</div><div class='ctx'> 			   &amp;facility_list, sizeof(facility_list));</div><div class='head'>diff --git a/arch/s390/lib/delay.c b/arch/s390/lib/delay.c<br/>index 0953cee05efc..6ccb9fab055a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/s390/lib/delay.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/s390/lib/delay.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/s390/lib/delay.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/s390/lib/delay.c</a></div><div class='hunk'>@@ -92,3 +92,16 @@ out:</div><div class='ctx'> 	local_irq_restore(flags);</div><div class='ctx'> 	preempt_enable();</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Simple udelay variant. To be used on startup and reboot</div><div class='add'>+ * when the interrupt handler isn't working.</div><div class='add'>+ */</div><div class='add'>+void udelay_simple(unsigned long usecs)</div><div class='add'>+{</div><div class='add'>+	u64 end;</div><div class='add'>+</div><div class='add'>+	end = get_clock() + ((u64) usecs &lt;&lt; 12);</div><div class='add'>+	while (get_clock() &lt; end)</div><div class='add'>+		cpu_relax();</div><div class='add'>+}</div><div class='head'>diff --git a/arch/s390/mm/extmem.c b/arch/s390/mm/extmem.c<br/>index f231f5ec74b6..580fc64cc735 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/s390/mm/extmem.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/s390/mm/extmem.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/s390/mm/extmem.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/s390/mm/extmem.c</a></div><div class='hunk'>@@ -43,20 +43,40 @@</div><div class='ctx'> #define DCSS_FINDSEG    0x0c</div><div class='ctx'> #define DCSS_LOADNOLY   0x10</div><div class='ctx'> #define DCSS_SEGEXT     0x18</div><div class='add'>+#define DCSS_LOADSHRX	0x20</div><div class='add'>+#define DCSS_LOADNSRX	0x24</div><div class='add'>+#define DCSS_FINDSEGX	0x2c</div><div class='add'>+#define DCSS_SEGEXTX	0x38</div><div class='ctx'> #define DCSS_FINDSEGA   0x0c</div><div class='ctx'> </div><div class='ctx'> struct qrange {</div><div class='del'>-	unsigned int  start; // 3byte start address, 1 byte type</div><div class='del'>-	unsigned int  end;   // 3byte end address, 1 byte reserved</div><div class='add'>+	unsigned long  start; /* last byte type */</div><div class='add'>+	unsigned long  end;   /* last byte reserved */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct qout64 {</div><div class='add'>+	unsigned long segstart;</div><div class='add'>+	unsigned long segend;</div><div class='add'>+	int segcnt;</div><div class='add'>+	int segrcnt;</div><div class='add'>+	struct qrange range[6];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_64BIT</div><div class='add'>+struct qrange_old {</div><div class='add'>+	unsigned int start; /* last byte type */</div><div class='add'>+	unsigned int end;   /* last byte reserved */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* output area format for the Diag x'64' old subcode x'18' */</div><div class='add'>+struct qout64_old {</div><div class='ctx'> 	int segstart;</div><div class='ctx'> 	int segend;</div><div class='ctx'> 	int segcnt;</div><div class='ctx'> 	int segrcnt;</div><div class='del'>-	struct qrange range[6];</div><div class='add'>+	struct qrange_old range[6];</div><div class='ctx'> };</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> struct qin64 {</div><div class='ctx'> 	char qopcode;</div><div class='hunk'>@@ -86,6 +106,55 @@ static DEFINE_MUTEX(dcss_lock);</div><div class='ctx'> static LIST_HEAD(dcss_list);</div><div class='ctx'> static char *segtype_string[] = { "SW", "EW", "SR", "ER", "SN", "EN", "SC",</div><div class='ctx'> 					"EW/EN-MIXED" };</div><div class='add'>+static int loadshr_scode, loadnsr_scode, findseg_scode;</div><div class='add'>+static int segext_scode, purgeseg_scode;</div><div class='add'>+static int scode_set;</div><div class='add'>+</div><div class='add'>+/* set correct Diag x'64' subcodes. */</div><div class='add'>+static int</div><div class='add'>+dcss_set_subcodes(void)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_64BIT</div><div class='add'>+	char *name = kmalloc(8 * sizeof(char), GFP_DMA);</div><div class='add'>+	unsigned long rx, ry;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (name == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	rx = (unsigned long) name;</div><div class='add'>+	ry = DCSS_FINDSEGX;</div><div class='add'>+</div><div class='add'>+	strcpy(name, "dummy");</div><div class='add'>+	asm volatile(</div><div class='add'>+		"	diag	%0,%1,0x64\n"</div><div class='add'>+		"0:	ipm	%2\n"</div><div class='add'>+		"	srl	%2,28\n"</div><div class='add'>+		"	j	2f\n"</div><div class='add'>+		"1:	la	%2,3\n"</div><div class='add'>+		"2:\n"</div><div class='add'>+		EX_TABLE(0b, 1b)</div><div class='add'>+		: "+d" (rx), "+d" (ry), "=d" (rc) : : "cc");</div><div class='add'>+</div><div class='add'>+	kfree(name);</div><div class='add'>+	/* Diag x'64' new subcodes are supported, set to new subcodes */</div><div class='add'>+	if (rc != 3) {</div><div class='add'>+		loadshr_scode = DCSS_LOADSHRX;</div><div class='add'>+		loadnsr_scode = DCSS_LOADNSRX;</div><div class='add'>+		purgeseg_scode = DCSS_PURGESEG;</div><div class='add'>+		findseg_scode = DCSS_FINDSEGX;</div><div class='add'>+		segext_scode = DCSS_SEGEXTX;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	/* Diag x'64' new subcodes are not supported, set to old subcodes */</div><div class='add'>+	loadshr_scode = DCSS_LOADNOLY;</div><div class='add'>+	loadnsr_scode = DCSS_LOADNSR;</div><div class='add'>+	purgeseg_scode = DCSS_PURGESEG;</div><div class='add'>+	findseg_scode = DCSS_FINDSEG;</div><div class='add'>+	segext_scode = DCSS_SEGEXT;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Create the 8 bytes, ebcdic VM segment name from</div><div class='hunk'>@@ -135,25 +204,45 @@ segment_by_name (char *name)</div><div class='ctx'>  * Perform a function on a dcss segment.</div><div class='ctx'>  */</div><div class='ctx'> static inline int</div><div class='del'>-dcss_diag (__u8 func, void *parameter,</div><div class='add'>+dcss_diag(int *func, void *parameter,</div><div class='ctx'>            unsigned long *ret1, unsigned long *ret2)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long rx, ry;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='add'>+	if (scode_set == 0) {</div><div class='add'>+		rc = dcss_set_subcodes();</div><div class='add'>+		if (rc &lt; 0)</div><div class='add'>+			return rc;</div><div class='add'>+		scode_set = 1;</div><div class='add'>+	}</div><div class='ctx'> 	rx = (unsigned long) parameter;</div><div class='del'>-	ry = (unsigned long) func;</div><div class='del'>-	asm volatile(</div><div class='add'>+	ry = (unsigned long) *func;</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_64BIT</div><div class='del'>-		"	sam31\n"</div><div class='del'>-		"	diag	%0,%1,0x64\n"</div><div class='del'>-		"	sam64\n"</div><div class='add'>+	/* 64-bit Diag x'64' new subcode, keep in 64-bit addressing mode */</div><div class='add'>+	if (*func &gt; DCSS_SEGEXT)</div><div class='add'>+		asm volatile(</div><div class='add'>+			"	diag	%0,%1,0x64\n"</div><div class='add'>+			"	ipm	%2\n"</div><div class='add'>+			"	srl	%2,28\n"</div><div class='add'>+			: "+d" (rx), "+d" (ry), "=d" (rc) : : "cc");</div><div class='add'>+	/* 31-bit Diag x'64' old subcode, switch to 31-bit addressing mode */</div><div class='add'>+	else</div><div class='add'>+		asm volatile(</div><div class='add'>+			"	sam31\n"</div><div class='add'>+			"	diag	%0,%1,0x64\n"</div><div class='add'>+			"	sam64\n"</div><div class='add'>+			"	ipm	%2\n"</div><div class='add'>+			"	srl	%2,28\n"</div><div class='add'>+			: "+d" (rx), "+d" (ry), "=d" (rc) : : "cc");</div><div class='ctx'> #else</div><div class='add'>+	asm volatile(</div><div class='ctx'> 		"	diag	%0,%1,0x64\n"</div><div class='del'>-#endif</div><div class='ctx'> 		"	ipm	%2\n"</div><div class='ctx'> 		"	srl	%2,28\n"</div><div class='ctx'> 		: "+d" (rx), "+d" (ry), "=d" (rc) : : "cc");</div><div class='add'>+#endif</div><div class='ctx'> 	*ret1 = rx;</div><div class='ctx'> 	*ret2 = ry;</div><div class='ctx'> 	return rc;</div><div class='hunk'>@@ -190,14 +279,45 @@ query_segment_type (struct dcss_segment *seg)</div><div class='ctx'> 	qin-&gt;qoutlen = sizeof(struct qout64);</div><div class='ctx'> 	memcpy (qin-&gt;qname, seg-&gt;dcss_name, 8);</div><div class='ctx'> </div><div class='del'>-	diag_cc = dcss_diag (DCSS_SEGEXT, qin, &amp;dummy, &amp;vmrc);</div><div class='add'>+	diag_cc = dcss_diag(&amp;segext_scode, qin, &amp;dummy, &amp;vmrc);</div><div class='ctx'> </div><div class='add'>+	if (diag_cc &lt; 0) {</div><div class='add'>+		rc = diag_cc;</div><div class='add'>+		goto out_free;</div><div class='add'>+	}</div><div class='ctx'> 	if (diag_cc &gt; 1) {</div><div class='ctx'> 		PRINT_WARN ("segment_type: diag returned error %ld\n", vmrc);</div><div class='ctx'> 		rc = dcss_diag_translate_rc (vmrc);</div><div class='ctx'> 		goto out_free;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_64BIT</div><div class='add'>+	/* Only old format of output area of Diagnose x'64' is supported,</div><div class='add'>+	   copy data for the new format. */</div><div class='add'>+	if (segext_scode == DCSS_SEGEXT) {</div><div class='add'>+		struct qout64_old *qout_old;</div><div class='add'>+		qout_old = kzalloc(sizeof(struct qout64_old), GFP_DMA);</div><div class='add'>+		if (qout_old == NULL) {</div><div class='add'>+			rc = -ENOMEM;</div><div class='add'>+			goto out_free;</div><div class='add'>+		}</div><div class='add'>+		memcpy(qout_old, qout, sizeof(struct qout64_old));</div><div class='add'>+		qout-&gt;segstart = (unsigned long) qout_old-&gt;segstart;</div><div class='add'>+		qout-&gt;segend = (unsigned long) qout_old-&gt;segend;</div><div class='add'>+		qout-&gt;segcnt = qout_old-&gt;segcnt;</div><div class='add'>+		qout-&gt;segrcnt = qout_old-&gt;segrcnt;</div><div class='add'>+</div><div class='add'>+		if (qout-&gt;segcnt &gt; 6)</div><div class='add'>+			qout-&gt;segrcnt = 6;</div><div class='add'>+		for (i = 0; i &lt; qout-&gt;segrcnt; i++) {</div><div class='add'>+			qout-&gt;range[i].start =</div><div class='add'>+				(unsigned long) qout_old-&gt;range[i].start;</div><div class='add'>+			qout-&gt;range[i].end =</div><div class='add'>+				(unsigned long) qout_old-&gt;range[i].end;</div><div class='add'>+		}</div><div class='add'>+		kfree(qout_old);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='ctx'> 	if (qout-&gt;segcnt &gt; 6) {</div><div class='ctx'> 		rc = -ENOTSUPP;</div><div class='ctx'> 		goto out_free;</div><div class='hunk'>@@ -269,6 +389,30 @@ segment_type (char* name)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * check if segment collides with other segments that are currently loaded</div><div class='add'>+ * returns 1 if this is the case, 0 if no collision was found</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+segment_overlaps_others (struct dcss_segment *seg)</div><div class='add'>+{</div><div class='add'>+	struct list_head *l;</div><div class='add'>+	struct dcss_segment *tmp;</div><div class='add'>+</div><div class='add'>+	BUG_ON(!mutex_is_locked(&amp;dcss_lock));</div><div class='add'>+	list_for_each(l, &amp;dcss_list) {</div><div class='add'>+		tmp = list_entry(l, struct dcss_segment, list);</div><div class='add'>+		if ((tmp-&gt;start_addr &gt;&gt; 20) &gt; (seg-&gt;end &gt;&gt; 20))</div><div class='add'>+			continue;</div><div class='add'>+		if ((tmp-&gt;end &gt;&gt; 20) &lt; (seg-&gt;start_addr &gt;&gt; 20))</div><div class='add'>+			continue;</div><div class='add'>+		if (seg == tmp)</div><div class='add'>+			continue;</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * real segment loading function, called from segment_load</div><div class='ctx'>  */</div><div class='ctx'> static int</div><div class='hunk'>@@ -276,7 +420,8 @@ __segment_load (char *name, int do_nonshared, unsigned long *addr, unsigned long</div><div class='ctx'> {</div><div class='ctx'> 	struct dcss_segment *seg = kmalloc(sizeof(struct dcss_segment),</div><div class='ctx'> 			GFP_DMA);</div><div class='del'>-	int dcss_command, rc, diag_cc;</div><div class='add'>+	int rc, diag_cc;</div><div class='add'>+	unsigned long start_addr, end_addr, dummy;</div><div class='ctx'> </div><div class='ctx'> 	if (seg == NULL) {</div><div class='ctx'> 		rc = -ENOMEM;</div><div class='hunk'>@@ -287,6 +432,13 @@ __segment_load (char *name, int do_nonshared, unsigned long *addr, unsigned long</div><div class='ctx'> 	if (rc &lt; 0)</div><div class='ctx'> 		goto out_free;</div><div class='ctx'> </div><div class='add'>+	if (loadshr_scode == DCSS_LOADSHRX) {</div><div class='add'>+		if (segment_overlaps_others(seg)) {</div><div class='add'>+			rc = -EBUSY;</div><div class='add'>+			goto out_free;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	rc = vmem_add_mapping(seg-&gt;start_addr, seg-&gt;end - seg-&gt;start_addr + 1);</div><div class='ctx'> </div><div class='ctx'> 	if (rc)</div><div class='hunk'>@@ -316,20 +468,28 @@ __segment_load (char *name, int do_nonshared, unsigned long *addr, unsigned long</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (do_nonshared)</div><div class='del'>-		dcss_command = DCSS_LOADNSR;</div><div class='add'>+		diag_cc = dcss_diag(&amp;loadnsr_scode, seg-&gt;dcss_name,</div><div class='add'>+				&amp;start_addr, &amp;end_addr);</div><div class='ctx'> 	else</div><div class='del'>-		dcss_command = DCSS_LOADNOLY;</div><div class='del'>-</div><div class='del'>-	diag_cc = dcss_diag(dcss_command, seg-&gt;dcss_name,</div><div class='del'>-			&amp;seg-&gt;start_addr, &amp;seg-&gt;end);</div><div class='add'>+		diag_cc = dcss_diag(&amp;loadshr_scode, seg-&gt;dcss_name,</div><div class='add'>+				&amp;start_addr, &amp;end_addr);</div><div class='add'>+	if (diag_cc &lt; 0) {</div><div class='add'>+		dcss_diag(&amp;purgeseg_scode, seg-&gt;dcss_name,</div><div class='add'>+				&amp;dummy, &amp;dummy);</div><div class='add'>+		rc = diag_cc;</div><div class='add'>+		goto out_resource;</div><div class='add'>+	}</div><div class='ctx'> 	if (diag_cc &gt; 1) {</div><div class='ctx'> 		PRINT_WARN ("segment_load: could not load segment %s - "</div><div class='del'>-				"diag returned error (%ld)\n",name,seg-&gt;end);</div><div class='del'>-		rc = dcss_diag_translate_rc (seg-&gt;end);</div><div class='del'>-		dcss_diag(DCSS_PURGESEG, seg-&gt;dcss_name,</div><div class='del'>-				&amp;seg-&gt;start_addr, &amp;seg-&gt;end);</div><div class='add'>+				"diag returned error (%ld)\n",</div><div class='add'>+				name, end_addr);</div><div class='add'>+		rc = dcss_diag_translate_rc(end_addr);</div><div class='add'>+		dcss_diag(&amp;purgeseg_scode, seg-&gt;dcss_name,</div><div class='add'>+				&amp;dummy, &amp;dummy);</div><div class='ctx'> 		goto out_resource;</div><div class='ctx'> 	}</div><div class='add'>+	seg-&gt;start_addr = start_addr;</div><div class='add'>+	seg-&gt;end = end_addr;</div><div class='ctx'> 	seg-&gt;do_nonshared = do_nonshared;</div><div class='ctx'> 	atomic_set(&amp;seg-&gt;ref_count, 1);</div><div class='ctx'> 	list_add(&amp;seg-&gt;list, &amp;dcss_list);</div><div class='hunk'>@@ -423,8 +583,8 @@ int</div><div class='ctx'> segment_modify_shared (char *name, int do_nonshared)</div><div class='ctx'> {</div><div class='ctx'> 	struct dcss_segment *seg;</div><div class='del'>-	unsigned long dummy;</div><div class='del'>-	int dcss_command, rc, diag_cc;</div><div class='add'>+	unsigned long start_addr, end_addr, dummy;</div><div class='add'>+	int rc, diag_cc;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;dcss_lock);</div><div class='ctx'> 	seg = segment_by_name (name);</div><div class='hunk'>@@ -445,38 +605,51 @@ segment_modify_shared (char *name, int do_nonshared)</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> 	}</div><div class='ctx'> 	release_resource(seg-&gt;res);</div><div class='del'>-	if (do_nonshared) {</div><div class='del'>-		dcss_command = DCSS_LOADNSR;</div><div class='add'>+	if (do_nonshared)</div><div class='ctx'> 		seg-&gt;res-&gt;flags &amp;= ~IORESOURCE_READONLY;</div><div class='del'>-	} else {</div><div class='del'>-		dcss_command = DCSS_LOADNOLY;</div><div class='add'>+	else</div><div class='ctx'> 		if (seg-&gt;vm_segtype == SEG_TYPE_SR ||</div><div class='ctx'> 		    seg-&gt;vm_segtype == SEG_TYPE_ER)</div><div class='ctx'> 			seg-&gt;res-&gt;flags |= IORESOURCE_READONLY;</div><div class='del'>-	}</div><div class='add'>+</div><div class='ctx'> 	if (request_resource(&amp;iomem_resource, seg-&gt;res)) {</div><div class='ctx'> 		PRINT_WARN("segment_modify_shared: could not reload segment %s"</div><div class='ctx'> 			   " - overlapping resources\n", name);</div><div class='ctx'> 		rc = -EBUSY;</div><div class='ctx'> 		kfree(seg-&gt;res);</div><div class='del'>-		goto out_del;</div><div class='add'>+		goto out_del_mem;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dcss_diag(&amp;purgeseg_scode, seg-&gt;dcss_name, &amp;dummy, &amp;dummy);</div><div class='add'>+	if (do_nonshared)</div><div class='add'>+		diag_cc = dcss_diag(&amp;loadnsr_scode, seg-&gt;dcss_name,</div><div class='add'>+				&amp;start_addr, &amp;end_addr);</div><div class='add'>+	else</div><div class='add'>+		diag_cc = dcss_diag(&amp;loadshr_scode, seg-&gt;dcss_name,</div><div class='add'>+				&amp;start_addr, &amp;end_addr);</div><div class='add'>+	if (diag_cc &lt; 0) {</div><div class='add'>+		rc = diag_cc;</div><div class='add'>+		goto out_del_res;</div><div class='ctx'> 	}</div><div class='del'>-	dcss_diag(DCSS_PURGESEG, seg-&gt;dcss_name, &amp;dummy, &amp;dummy);</div><div class='del'>-	diag_cc = dcss_diag(dcss_command, seg-&gt;dcss_name,</div><div class='del'>-			&amp;seg-&gt;start_addr, &amp;seg-&gt;end);</div><div class='ctx'> 	if (diag_cc &gt; 1) {</div><div class='ctx'> 		PRINT_WARN ("segment_modify_shared: could not reload segment %s"</div><div class='del'>-				" - diag returned error (%ld)\n",name,seg-&gt;end);</div><div class='del'>-		rc = dcss_diag_translate_rc (seg-&gt;end);</div><div class='del'>-		goto out_del;</div><div class='add'>+				" - diag returned error (%ld)\n",</div><div class='add'>+				name, end_addr);</div><div class='add'>+		rc = dcss_diag_translate_rc(end_addr);</div><div class='add'>+		goto out_del_res;</div><div class='ctx'> 	}</div><div class='add'>+	seg-&gt;start_addr = start_addr;</div><div class='add'>+	seg-&gt;end = end_addr;</div><div class='ctx'> 	seg-&gt;do_nonshared = do_nonshared;</div><div class='ctx'> 	rc = 0;</div><div class='ctx'> 	goto out_unlock;</div><div class='del'>- out_del:</div><div class='add'>+ out_del_res:</div><div class='add'>+	release_resource(seg-&gt;res);</div><div class='add'>+	kfree(seg-&gt;res);</div><div class='add'>+ out_del_mem:</div><div class='ctx'> 	vmem_remove_mapping(seg-&gt;start_addr, seg-&gt;end - seg-&gt;start_addr + 1);</div><div class='ctx'> 	list_del(&amp;seg-&gt;list);</div><div class='del'>-	dcss_diag(DCSS_PURGESEG, seg-&gt;dcss_name, &amp;dummy, &amp;dummy);</div><div class='add'>+	dcss_diag(&amp;purgeseg_scode, seg-&gt;dcss_name, &amp;dummy, &amp;dummy);</div><div class='ctx'> 	kfree(seg);</div><div class='ctx'>  out_unlock:</div><div class='ctx'> 	mutex_unlock(&amp;dcss_lock);</div><div class='hunk'>@@ -510,7 +683,7 @@ segment_unload(char *name)</div><div class='ctx'> 	kfree(seg-&gt;res);</div><div class='ctx'> 	vmem_remove_mapping(seg-&gt;start_addr, seg-&gt;end - seg-&gt;start_addr + 1);</div><div class='ctx'> 	list_del(&amp;seg-&gt;list);</div><div class='del'>-	dcss_diag(DCSS_PURGESEG, seg-&gt;dcss_name, &amp;dummy, &amp;dummy);</div><div class='add'>+	dcss_diag(&amp;purgeseg_scode, seg-&gt;dcss_name, &amp;dummy, &amp;dummy);</div><div class='ctx'> 	kfree(seg);</div><div class='ctx'> out_unlock:</div><div class='ctx'> 	mutex_unlock(&amp;dcss_lock);</div><div class='hunk'>@@ -545,7 +718,7 @@ segment_save(char *name)</div><div class='ctx'> 	endpfn = (seg-&gt;end) &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> 	sprintf(cmd1, "DEFSEG %s", name);</div><div class='ctx'> 	for (i=0; i&lt;seg-&gt;segcnt; i++) {</div><div class='del'>-		sprintf(cmd1+strlen(cmd1), " %X-%X %s",</div><div class='add'>+		sprintf(cmd1+strlen(cmd1), " %lX-%lX %s",</div><div class='ctx'> 			seg-&gt;range[i].start &gt;&gt; PAGE_SHIFT,</div><div class='ctx'> 			seg-&gt;range[i].end &gt;&gt; PAGE_SHIFT,</div><div class='ctx'> 			segtype_string[seg-&gt;range[i].start &amp; 0xff]);</div><div class='head'>diff --git a/arch/sh/include/asm/elf.h b/arch/sh/include/asm/elf.h<br/>index f01449a8d378..ee02db110f0d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sh/include/asm/elf.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sh/include/asm/elf.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sh/include/asm/elf.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sh/include/asm/elf.h</a></div><div class='hunk'>@@ -189,7 +189,7 @@ do {									\</div><div class='ctx'> } while (0)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#define SET_PERSONALITY(ex, ibcs2) set_personality(PER_LINUX_32BIT)</div><div class='add'>+#define SET_PERSONALITY(ex) set_personality(PER_LINUX_32BIT)</div><div class='ctx'> struct task_struct;</div><div class='ctx'> extern int dump_task_regs (struct task_struct *, elf_gregset_t *);</div><div class='ctx'> extern int dump_task_fpu (struct task_struct *, elf_fpregset_t *);</div><div class='head'>diff --git a/arch/sh/kernel/smp.c b/arch/sh/kernel/smp.c<br/>index 60c50841143e..001778f9adaf 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sh/kernel/smp.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sh/kernel/smp.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sh/kernel/smp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sh/kernel/smp.c</a></div><div class='hunk'>@@ -82,6 +82,8 @@ asmlinkage void __cpuinit start_secondary(void)</div><div class='ctx'> </div><div class='ctx'> 	preempt_disable();</div><div class='ctx'> </div><div class='add'>+	notify_cpu_starting(smp_processor_id());</div><div class='add'>+</div><div class='ctx'> 	local_irq_enable();</div><div class='ctx'> </div><div class='ctx'> 	calibrate_delay();</div><div class='head'>diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig<br/>index a214002114ed..97671dac12a6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/Kconfig</a></div><div class='hunk'>@@ -20,6 +20,11 @@ config GENERIC_ISA_DMA</div><div class='ctx'> 	bool</div><div class='ctx'> 	default y</div><div class='ctx'> </div><div class='add'>+config GENERIC_GPIO</div><div class='add'>+	bool</div><div class='add'>+	help</div><div class='add'>+	  Generic GPIO API support</div><div class='add'>+</div><div class='ctx'> config ARCH_NO_VIRT_TO_BUS</div><div class='ctx'> 	def_bool y</div><div class='ctx'> </div><div class='hunk'>@@ -69,6 +74,9 @@ config SPARC</div><div class='ctx'> 	select HAVE_OPROFILE</div><div class='ctx'> 	select HAVE_ARCH_KGDB if !SMP</div><div class='ctx'> 	select HAVE_ARCH_TRACEHOOK</div><div class='add'>+	select ARCH_WANT_OPTIONAL_GPIOLIB</div><div class='add'>+	select RTC_CLASS</div><div class='add'>+	select RTC_DRV_M48T59</div><div class='ctx'> </div><div class='ctx'> # Identify this as a Sparc32 build</div><div class='ctx'> config SPARC32</div><div class='hunk'>@@ -204,17 +212,6 @@ config SUN_PM</div><div class='ctx'> 	  Enable power management and CPU standby features on supported</div><div class='ctx'> 	  SPARC platforms.</div><div class='ctx'> </div><div class='del'>-config SUN4</div><div class='del'>-	bool "Support for SUN4 machines (disables SUN4[CDM] support)"</div><div class='del'>-	depends on !SMP</div><div class='del'>-	default n</div><div class='del'>-	help</div><div class='del'>-	  Say Y here if, and only if, your machine is a sun4. Note that</div><div class='del'>-	  a kernel compiled with this option will run only on sun4.</div><div class='del'>-	  (And the current version will probably work only on sun4/330.)</div><div class='del'>-</div><div class='del'>-if !SUN4</div><div class='del'>-</div><div class='ctx'> config PCI</div><div class='ctx'> 	bool "Support for PCI and PS/2 keyboard/mouse"</div><div class='ctx'> 	help</div><div class='hunk'>@@ -227,11 +224,6 @@ config PCI_SYSCALL</div><div class='ctx'> </div><div class='ctx'> source "drivers/pci/Kconfig"</div><div class='ctx'> </div><div class='del'>-endif</div><div class='del'>-</div><div class='del'>-config NO_DMA</div><div class='del'>-	def_bool !PCI</div><div class='del'>-</div><div class='ctx'> config SUN_OPENPROMFS</div><div class='ctx'> 	tristate "Openprom tree appears in /proc/openprom"</div><div class='ctx'> 	help</div><div class='hunk'>@@ -263,9 +255,7 @@ source "net/Kconfig"</div><div class='ctx'> </div><div class='ctx'> source "drivers/Kconfig"</div><div class='ctx'> </div><div class='del'>-if !SUN4</div><div class='ctx'> source "drivers/sbus/char/Kconfig"</div><div class='del'>-endif</div><div class='ctx'> </div><div class='ctx'> # This one must be before the filesystem configs. -DaveM</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sparc/include/asm/Kbuild b/arch/sparc/include/asm/Kbuild<br/>index a5f0ce734ff7..2d2769d766ec 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/Kbuild?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/include/asm/Kbuild</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/Kbuild?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/Kbuild</a></div><div class='hunk'>@@ -15,14 +15,11 @@ header-y += signal_32.h</div><div class='ctx'> header-y += signal_64.h</div><div class='ctx'> header-y += stat_32.h</div><div class='ctx'> header-y += stat_64.h</div><div class='del'>-header-y += statfs_32.h</div><div class='del'>-header-y += statfs_64.h</div><div class='ctx'> header-y += unistd_32.h</div><div class='ctx'> header-y += unistd_64.h</div><div class='ctx'> </div><div class='ctx'> header-y += apc.h</div><div class='ctx'> header-y += asi.h</div><div class='del'>-header-y += bpp.h</div><div class='ctx'> header-y += display7seg.h</div><div class='ctx'> header-y += envctrl.h</div><div class='ctx'> header-y += fbio.h</div><div class='hunk'>@@ -41,5 +38,4 @@ header-y += reg_64.h</div><div class='ctx'> header-y += traps.h</div><div class='ctx'> header-y += uctx.h</div><div class='ctx'> header-y += utrap.h</div><div class='del'>-header-y += vfc_ioctls.h</div><div class='ctx'> header-y += watchdog.h</div><div class='head'>diff --git a/arch/sparc/include/asm/asmmacro.h b/arch/sparc/include/asm/asmmacro.h<br/>index a619a4d97aae..a995bf8aba3f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/asmmacro.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/include/asm/asmmacro.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/asmmacro.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/asmmacro.h</a></div><div class='hunk'>@@ -34,12 +34,7 @@</div><div class='ctx'> /* sun4 probably wants half word accesses to ASI_SEGMAP, while sun4c+</div><div class='ctx'>    likes byte accesses. These are to avoid ifdef mania. */</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SUN4</div><div class='del'>-#define lduXa	lduha</div><div class='del'>-#define stXa	stha</div><div class='del'>-#else</div><div class='ctx'> #define lduXa	lduba</div><div class='ctx'> #define stXa	stba</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> #endif /* !(_SPARC_ASMMACRO_H) */</div><div class='head'>diff --git a/arch/sparc/include/asm/bpp.h b/arch/sparc/include/asm/bpp.h<br/>deleted file mode 100644<br/>index 31f515e499a7..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/bpp.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/include/asm/bpp.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,73 +0,0 @@</div><div class='del'>-#ifndef _SPARC_BPP_H</div><div class='del'>-#define _SPARC_BPP_H</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Copyright (c) 1995 Picture Elements</div><div class='del'>- *	Stephen Williams</div><div class='del'>- *	Gus Baldauf</div><div class='del'>- *</div><div class='del'>- * Linux/SPARC port by Peter Zaitcev.</div><div class='del'>- * Integration into SPARC tree by Tom Dyas.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include  &lt;linux/ioctl.h&gt;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This is a driver that supports IEEE Std 1284-1994 communications</div><div class='del'>- * with compliant or compatible devices. It will use whatever features</div><div class='del'>- * the device supports, prefering those that are typically faster.</div><div class='del'>- *</div><div class='del'>- * When the device is opened, it is left in COMPATIBILITY mode, and</div><div class='del'>- * writes work like any printer device. The driver only attempt to</div><div class='del'>- * negotiate 1284 modes when needed so that plugs can be pulled,</div><div class='del'>- * switch boxes switched, etc., without disrupting things. It will</div><div class='del'>- * also leave the device in compatibility mode when closed.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This driver also supplies ioctls to manually manipulate the</div><div class='del'>- * pins. This is great for testing devices, or writing code to deal</div><div class='del'>- * with bizzarro-mode of the ACME Special TurboThingy Plus.</div><div class='del'>- *</div><div class='del'>- * NOTE: These ioctl currently do not interact well with</div><div class='del'>- * read/write. Caveat emptor.</div><div class='del'>- *</div><div class='del'>- * PUT_PINS allows us to assign the sense of all the pins, including</div><div class='del'>- * the data pins if being driven by the host. The GET_PINS returns the</div><div class='del'>- * pins that the peripheral drives, including data if appropriate.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-# define BPP_PUT_PINS _IOW('B', 1, int)</div><div class='del'>-# define BPP_GET_PINS _IOR('B', 2, char) /* that's bogus - should've been _IO */</div><div class='del'>-# define BPP_PUT_DATA _IOW('B', 3, int)</div><div class='del'>-# define BPP_GET_DATA _IOR('B', 4, char) /* ditto */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Set the data bus to input mode. Disengage the data bin driver and</div><div class='del'>- * be prepared to read values from the peripheral. If the arg is 0,</div><div class='del'>- * then revert the bus to output mode.</div><div class='del'>- */</div><div class='del'>-# define BPP_SET_INPUT _IOW('B', 5, int)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * These bits apply to the PUT operation...</div><div class='del'>- */</div><div class='del'>-# define BPP_PP_nStrobe   0x0001</div><div class='del'>-# define BPP_PP_nAutoFd   0x0002</div><div class='del'>-# define BPP_PP_nInit     0x0004</div><div class='del'>-# define BPP_PP_nSelectIn 0x0008</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * These apply to the GET operation, which also reads the current value</div><div class='del'>- * of the previously put values. A bit mask of these will be returned</div><div class='del'>- * as a bit mask in the return code of the ioctl().</div><div class='del'>- */</div><div class='del'>-# define BPP_GP_nAck   0x0100</div><div class='del'>-# define BPP_GP_Busy   0x0200</div><div class='del'>-# define BPP_GP_PError 0x0400</div><div class='del'>-# define BPP_GP_Select 0x0800</div><div class='del'>-# define BPP_GP_nFault 0x1000</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/arch/sparc/include/asm/bugs.h b/arch/sparc/include/asm/bugs.h<br/>index e179bc12f64a..61d86bbbe2b2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/bugs.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/include/asm/bugs.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/bugs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/bugs.h</a></div><div class='hunk'>@@ -7,10 +7,6 @@</div><div class='ctx'> #include &lt;asm/cpudata.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SPARC64</div><div class='del'>-#include &lt;asm/sstate.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> extern unsigned long loops_per_jiffy;</div><div class='ctx'> </div><div class='ctx'> static void __init check_bugs(void)</div><div class='hunk'>@@ -18,7 +14,4 @@ static void __init check_bugs(void)</div><div class='ctx'> #if defined(CONFIG_SPARC32) &amp;&amp; !defined(CONFIG_SMP)</div><div class='ctx'> 	cpu_data(0).udelay_val = loops_per_jiffy;</div><div class='ctx'> #endif</div><div class='del'>-#ifdef CONFIG_SPARC64</div><div class='del'>-	sstate_running();</div><div class='del'>-#endif</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/sparc/include/asm/cpudata_64.h b/arch/sparc/include/asm/cpudata_64.h<br/>index 532975ecfe10..7da7c13d23c4 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/cpudata_64.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/include/asm/cpudata_64.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/cpudata_64.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/cpudata_64.h</a></div><div class='hunk'>@@ -86,7 +86,6 @@ extern struct trap_per_cpu trap_block[NR_CPUS];</div><div class='ctx'> extern void init_cur_cpu_trap(struct thread_info *);</div><div class='ctx'> extern void setup_tba(void);</div><div class='ctx'> extern int ncpus_probed;</div><div class='del'>-extern void __init cpu_probe(void);</div><div class='ctx'> extern const struct seq_operations cpuinfo_op;</div><div class='ctx'> </div><div class='ctx'> extern unsigned long real_hard_smp_processor_id(void);</div><div class='head'>diff --git a/arch/sparc/include/asm/dma-mapping_32.h b/arch/sparc/include/asm/dma-mapping_32.h<br/>index f3a641e6b2c8..8a57ea0573e6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/dma-mapping_32.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/include/asm/dma-mapping_32.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/dma-mapping_32.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/dma-mapping_32.h</a></div><div class='hunk'>@@ -1,11 +1,60 @@</div><div class='ctx'> #ifndef _ASM_SPARC_DMA_MAPPING_H</div><div class='ctx'> #define _ASM_SPARC_DMA_MAPPING_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-#include &lt;asm-generic/dma-mapping.h&gt;</div><div class='del'>-#else</div><div class='del'>-#include &lt;asm-generic/dma-mapping-broken.h&gt;</div><div class='del'>-#endif /* PCI */</div><div class='add'>+struct device;</div><div class='add'>+struct scatterlist;</div><div class='add'>+struct page;</div><div class='add'>+</div><div class='add'>+#define DMA_ERROR_CODE	(~(dma_addr_t)0x0)</div><div class='add'>+</div><div class='add'>+extern int dma_supported(struct device *dev, u64 mask);</div><div class='add'>+extern int dma_set_mask(struct device *dev, u64 dma_mask);</div><div class='add'>+extern void *dma_alloc_coherent(struct device *dev, size_t size,</div><div class='add'>+				dma_addr_t *dma_handle, gfp_t flag);</div><div class='add'>+extern void dma_free_coherent(struct device *dev, size_t size,</div><div class='add'>+			      void *cpu_addr, dma_addr_t dma_handle);</div><div class='add'>+extern dma_addr_t dma_map_single(struct device *dev, void *cpu_addr,</div><div class='add'>+				 size_t size,</div><div class='add'>+				 enum dma_data_direction direction);</div><div class='add'>+extern void dma_unmap_single(struct device *dev, dma_addr_t dma_addr,</div><div class='add'>+			     size_t size,</div><div class='add'>+			     enum dma_data_direction direction);</div><div class='add'>+extern dma_addr_t dma_map_page(struct device *dev, struct page *page,</div><div class='add'>+			       unsigned long offset, size_t size,</div><div class='add'>+			       enum dma_data_direction direction);</div><div class='add'>+extern void dma_unmap_page(struct device *dev, dma_addr_t dma_address,</div><div class='add'>+			   size_t size, enum dma_data_direction direction);</div><div class='add'>+extern int dma_map_sg(struct device *dev, struct scatterlist *sg,</div><div class='add'>+		      int nents, enum dma_data_direction direction);</div><div class='add'>+extern void dma_unmap_sg(struct device *dev, struct scatterlist *sg,</div><div class='add'>+			 int nents, enum dma_data_direction direction);</div><div class='add'>+extern void dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma_handle,</div><div class='add'>+				    size_t size,</div><div class='add'>+				    enum dma_data_direction direction);</div><div class='add'>+extern void dma_sync_single_for_device(struct device *dev,</div><div class='add'>+				       dma_addr_t dma_handle,</div><div class='add'>+				       size_t size,</div><div class='add'>+				       enum dma_data_direction direction);</div><div class='add'>+extern void dma_sync_single_range_for_cpu(struct device *dev,</div><div class='add'>+					  dma_addr_t dma_handle,</div><div class='add'>+					  unsigned long offset,</div><div class='add'>+					  size_t size,</div><div class='add'>+					  enum dma_data_direction direction);</div><div class='add'>+extern void dma_sync_single_range_for_device(struct device *dev,</div><div class='add'>+					     dma_addr_t dma_handle,</div><div class='add'>+					     unsigned long offset, size_t size,</div><div class='add'>+					     enum dma_data_direction direction);</div><div class='add'>+extern void dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg,</div><div class='add'>+				int nelems, enum dma_data_direction direction);</div><div class='add'>+extern void dma_sync_sg_for_device(struct device *dev,</div><div class='add'>+				   struct scatterlist *sg, int nelems,</div><div class='add'>+				   enum dma_data_direction direction);</div><div class='add'>+extern int dma_mapping_error(struct device *dev, dma_addr_t dma_addr);</div><div class='add'>+extern int dma_get_cache_alignment(void);</div><div class='add'>+</div><div class='add'>+#define dma_alloc_noncoherent	dma_alloc_coherent</div><div class='add'>+#define dma_free_noncoherent	dma_free_coherent</div><div class='ctx'> </div><div class='ctx'> #endif /* _ASM_SPARC_DMA_MAPPING_H */</div><div class='head'>diff --git a/arch/sparc/include/asm/dma.h b/arch/sparc/include/asm/dma.h<br/>index aa1d90ac04c5..b554927bbaf6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/dma.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/include/asm/dma.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/dma.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/dma.h</a></div><div class='hunk'>@@ -1,8 +1,139 @@</div><div class='del'>-#ifndef ___ASM_SPARC_DMA_H</div><div class='del'>-#define ___ASM_SPARC_DMA_H</div><div class='del'>-#if defined(__sparc__) &amp;&amp; defined(__arch64__)</div><div class='del'>-#include &lt;asm/dma_64.h&gt;</div><div class='add'>+#ifndef _ASM_SPARC_DMA_H</div><div class='add'>+#define _ASM_SPARC_DMA_H</div><div class='add'>+</div><div class='add'>+/* These are irrelevant for Sparc DMA, but we leave it in so that</div><div class='add'>+ * things can compile.</div><div class='add'>+ */</div><div class='add'>+#define MAX_DMA_CHANNELS 8</div><div class='add'>+#define DMA_MODE_READ    1</div><div class='add'>+#define DMA_MODE_WRITE   2</div><div class='add'>+#define MAX_DMA_ADDRESS  (~0UL)</div><div class='add'>+</div><div class='add'>+/* Useful constants */</div><div class='add'>+#define SIZE_16MB      (16*1024*1024)</div><div class='add'>+#define SIZE_64K       (64*1024)</div><div class='add'>+</div><div class='add'>+/* SBUS DMA controller reg offsets */</div><div class='add'>+#define DMA_CSR		0x00UL		/* rw  DMA control/status register    0x00   */</div><div class='add'>+#define DMA_ADDR	0x04UL		/* rw  DMA transfer address register  0x04   */</div><div class='add'>+#define DMA_COUNT	0x08UL		/* rw  DMA transfer count register    0x08   */</div><div class='add'>+#define DMA_TEST	0x0cUL		/* rw  DMA test/debug register        0x0c   */</div><div class='add'>+</div><div class='add'>+/* Fields in the cond_reg register */</div><div class='add'>+/* First, the version identification bits */</div><div class='add'>+#define DMA_DEVICE_ID    0xf0000000        /* Device identification bits */</div><div class='add'>+#define DMA_VERS0        0x00000000        /* Sunray DMA version */</div><div class='add'>+#define DMA_ESCV1        0x40000000        /* DMA ESC Version 1 */</div><div class='add'>+#define DMA_VERS1        0x80000000        /* DMA rev 1 */</div><div class='add'>+#define DMA_VERS2        0xa0000000        /* DMA rev 2 */</div><div class='add'>+#define DMA_VERHME       0xb0000000        /* DMA hme gate array */</div><div class='add'>+#define DMA_VERSPLUS     0x90000000        /* DMA rev 1 PLUS */</div><div class='add'>+</div><div class='add'>+#define DMA_HNDL_INTR    0x00000001        /* An IRQ needs to be handled */</div><div class='add'>+#define DMA_HNDL_ERROR   0x00000002        /* We need to take an error */</div><div class='add'>+#define DMA_FIFO_ISDRAIN 0x0000000c        /* The DMA FIFO is draining */</div><div class='add'>+#define DMA_INT_ENAB     0x00000010        /* Turn on interrupts */</div><div class='add'>+#define DMA_FIFO_INV     0x00000020        /* Invalidate the FIFO */</div><div class='add'>+#define DMA_ACC_SZ_ERR   0x00000040        /* The access size was bad */</div><div class='add'>+#define DMA_FIFO_STDRAIN 0x00000040        /* DMA_VERS1 Drain the FIFO */</div><div class='add'>+#define DMA_RST_SCSI     0x00000080        /* Reset the SCSI controller */</div><div class='add'>+#define DMA_RST_ENET     DMA_RST_SCSI      /* Reset the ENET controller */</div><div class='add'>+#define DMA_ST_WRITE     0x00000100        /* write from device to memory */</div><div class='add'>+#define DMA_ENABLE       0x00000200        /* Fire up DMA, handle requests */</div><div class='add'>+#define DMA_PEND_READ    0x00000400        /* DMA_VERS1/0/PLUS Pending Read */</div><div class='add'>+#define DMA_ESC_BURST    0x00000800        /* 1=16byte 0=32byte */</div><div class='add'>+#define DMA_READ_AHEAD   0x00001800        /* DMA read ahead partial longword */</div><div class='add'>+#define DMA_DSBL_RD_DRN  0x00001000        /* No EC drain on slave reads */</div><div class='add'>+#define DMA_BCNT_ENAB    0x00002000        /* If on, use the byte counter */</div><div class='add'>+#define DMA_TERM_CNTR    0x00004000        /* Terminal counter */</div><div class='add'>+#define DMA_SCSI_SBUS64  0x00008000        /* HME: Enable 64-bit SBUS mode. */</div><div class='add'>+#define DMA_CSR_DISAB    0x00010000        /* No FIFO drains during csr */</div><div class='add'>+#define DMA_SCSI_DISAB   0x00020000        /* No FIFO drains during reg */</div><div class='add'>+#define DMA_DSBL_WR_INV  0x00020000        /* No EC inval. on slave writes */</div><div class='add'>+#define DMA_ADD_ENABLE   0x00040000        /* Special ESC DVMA optimization */</div><div class='add'>+#define DMA_E_BURSTS	 0x000c0000	   /* ENET: SBUS r/w burst mask */</div><div class='add'>+#define DMA_E_BURST32	 0x00040000	   /* ENET: SBUS 32 byte r/w burst */</div><div class='add'>+#define DMA_E_BURST16	 0x00000000	   /* ENET: SBUS 16 byte r/w burst */</div><div class='add'>+#define DMA_BRST_SZ      0x000c0000        /* SCSI: SBUS r/w burst size */</div><div class='add'>+#define DMA_BRST64       0x000c0000        /* SCSI: 64byte bursts (HME on UltraSparc only) */</div><div class='add'>+#define DMA_BRST32       0x00040000        /* SCSI: 32byte bursts */</div><div class='add'>+#define DMA_BRST16       0x00000000        /* SCSI: 16byte bursts */</div><div class='add'>+#define DMA_BRST0        0x00080000        /* SCSI: no bursts (non-HME gate arrays) */</div><div class='add'>+#define DMA_ADDR_DISAB   0x00100000        /* No FIFO drains during addr */</div><div class='add'>+#define DMA_2CLKS        0x00200000        /* Each transfer = 2 clock ticks */</div><div class='add'>+#define DMA_3CLKS        0x00400000        /* Each transfer = 3 clock ticks */</div><div class='add'>+#define DMA_EN_ENETAUI   DMA_3CLKS         /* Put lance into AUI-cable mode */</div><div class='add'>+#define DMA_CNTR_DISAB   0x00800000        /* No IRQ when DMA_TERM_CNTR set */</div><div class='add'>+#define DMA_AUTO_NADDR   0x01000000        /* Use "auto nxt addr" feature */</div><div class='add'>+#define DMA_SCSI_ON      0x02000000        /* Enable SCSI dma */</div><div class='add'>+#define DMA_PARITY_OFF   0x02000000        /* HME: disable parity checking */</div><div class='add'>+#define DMA_LOADED_ADDR  0x04000000        /* Address has been loaded */</div><div class='add'>+#define DMA_LOADED_NADDR 0x08000000        /* Next address has been loaded */</div><div class='add'>+#define DMA_RESET_FAS366 0x08000000        /* HME: Assert RESET to FAS366 */</div><div class='add'>+</div><div class='add'>+/* Values describing the burst-size property from the PROM */</div><div class='add'>+#define DMA_BURST1       0x01</div><div class='add'>+#define DMA_BURST2       0x02</div><div class='add'>+#define DMA_BURST4       0x04</div><div class='add'>+#define DMA_BURST8       0x08</div><div class='add'>+#define DMA_BURST16      0x10</div><div class='add'>+#define DMA_BURST32      0x20</div><div class='add'>+#define DMA_BURST64      0x40</div><div class='add'>+#define DMA_BURSTBITS    0x7f</div><div class='add'>+</div><div class='add'>+/* From PCI */</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PCI</div><div class='add'>+extern int isa_dma_bridge_buggy;</div><div class='ctx'> #else</div><div class='del'>-#include &lt;asm/dma_32.h&gt;</div><div class='add'>+#define isa_dma_bridge_buggy 	(0)</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SPARC32</div><div class='add'>+</div><div class='add'>+/* Routines for data transfer buffers. */</div><div class='add'>+BTFIXUPDEF_CALL(char *, mmu_lockarea, char *, unsigned long)</div><div class='add'>+BTFIXUPDEF_CALL(void,   mmu_unlockarea, char *, unsigned long)</div><div class='add'>+</div><div class='add'>+#define mmu_lockarea(vaddr,len) BTFIXUP_CALL(mmu_lockarea)(vaddr,len)</div><div class='add'>+#define mmu_unlockarea(vaddr,len) BTFIXUP_CALL(mmu_unlockarea)(vaddr,len)</div><div class='add'>+</div><div class='add'>+struct page;</div><div class='add'>+struct device;</div><div class='add'>+struct scatterlist;</div><div class='add'>+</div><div class='add'>+/* These are implementations for sbus_map_sg/sbus_unmap_sg... collapse later */</div><div class='add'>+BTFIXUPDEF_CALL(__u32, mmu_get_scsi_one, struct device *, char *, unsigned long)</div><div class='add'>+BTFIXUPDEF_CALL(void,  mmu_get_scsi_sgl, struct device *, struct scatterlist *, int)</div><div class='add'>+BTFIXUPDEF_CALL(void,  mmu_release_scsi_one, struct device *, __u32, unsigned long)</div><div class='add'>+BTFIXUPDEF_CALL(void,  mmu_release_scsi_sgl, struct device *, struct scatterlist *, int)</div><div class='add'>+</div><div class='add'>+#define mmu_get_scsi_one(dev,vaddr,len) BTFIXUP_CALL(mmu_get_scsi_one)(dev,vaddr,len)</div><div class='add'>+#define mmu_get_scsi_sgl(dev,sg,sz) BTFIXUP_CALL(mmu_get_scsi_sgl)(dev,sg,sz)</div><div class='add'>+#define mmu_release_scsi_one(dev,vaddr,len) BTFIXUP_CALL(mmu_release_scsi_one)(dev,vaddr,len)</div><div class='add'>+#define mmu_release_scsi_sgl(dev,sg,sz) BTFIXUP_CALL(mmu_release_scsi_sgl)(dev,sg,sz)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * mmu_map/unmap are provided by iommu/iounit; Invalid to call on IIep.</div><div class='add'>+ *</div><div class='add'>+ * The mmu_map_dma_area establishes two mappings in one go.</div><div class='add'>+ * These mappings point to pages normally mapped at 'va' (linear address).</div><div class='add'>+ * First mapping is for CPU visible address at 'a', uncached.</div><div class='add'>+ * This is an alias, but it works because it is an uncached mapping.</div><div class='add'>+ * Second mapping is for device visible address, or "bus" address.</div><div class='add'>+ * The bus address is returned at '*pba'.</div><div class='add'>+ *</div><div class='add'>+ * These functions seem distinct, but are hard to split. On sun4c,</div><div class='add'>+ * at least for now, 'a' is equal to bus address, and retured in *pba.</div><div class='add'>+ * On sun4m, page attributes depend on the CPU type, so we have to</div><div class='add'>+ * know if we are mapping RAM or I/O, so it has to be an additional argument</div><div class='add'>+ * to a separate mapping function for CPU visible mappings.</div><div class='add'>+ */</div><div class='add'>+BTFIXUPDEF_CALL(int, mmu_map_dma_area, struct device *, dma_addr_t *, unsigned long, unsigned long, int len)</div><div class='add'>+BTFIXUPDEF_CALL(void, mmu_unmap_dma_area, struct device *, unsigned long busa, int len)</div><div class='add'>+</div><div class='add'>+#define mmu_map_dma_area(dev,pba,va,a,len) BTFIXUP_CALL(mmu_map_dma_area)(dev,pba,va,a,len)</div><div class='add'>+#define mmu_unmap_dma_area(dev,ba,len) BTFIXUP_CALL(mmu_unmap_dma_area)(dev,ba,len)</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='add'>+#endif /* !(_ASM_SPARC_DMA_H) */</div><div class='head'>diff --git a/arch/sparc/include/asm/dma_32.h b/arch/sparc/include/asm/dma_32.h<br/>deleted file mode 100644<br/>index cf7189c0079b..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/dma_32.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/include/asm/dma_32.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,288 +0,0 @@</div><div class='del'>-/* include/asm/dma.h</div><div class='del'>- *</div><div class='del'>- * Copyright 1995 (C) David S. Miller (davem@davemloft.net)</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _ASM_SPARC_DMA_H</div><div class='del'>-#define _ASM_SPARC_DMA_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/vac-ops.h&gt;  /* for invalidate's, etc. */</div><div class='del'>-#include &lt;asm/sbus.h&gt;</div><div class='del'>-#include &lt;asm/delay.h&gt;</div><div class='del'>-#include &lt;asm/oplib.h&gt;</div><div class='del'>-#include &lt;asm/system.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='del'>-</div><div class='del'>-struct page;</div><div class='del'>-extern spinlock_t  dma_spin_lock;</div><div class='del'>-</div><div class='del'>-static inline unsigned long claim_dma_lock(void)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	spin_lock_irqsave(&amp;dma_spin_lock, flags);</div><div class='del'>-	return flags;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void release_dma_lock(unsigned long flags)</div><div class='del'>-{</div><div class='del'>-	spin_unlock_irqrestore(&amp;dma_spin_lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* These are irrelevant for Sparc DMA, but we leave it in so that</div><div class='del'>- * things can compile.</div><div class='del'>- */</div><div class='del'>-#define MAX_DMA_CHANNELS 8</div><div class='del'>-#define MAX_DMA_ADDRESS  (~0UL)</div><div class='del'>-#define DMA_MODE_READ    1</div><div class='del'>-#define DMA_MODE_WRITE   2</div><div class='del'>-</div><div class='del'>-/* Useful constants */</div><div class='del'>-#define SIZE_16MB      (16*1024*1024)</div><div class='del'>-#define SIZE_64K       (64*1024)</div><div class='del'>-</div><div class='del'>-/* SBUS DMA controller reg offsets */</div><div class='del'>-#define DMA_CSR		0x00UL		/* rw  DMA control/status register    0x00   */</div><div class='del'>-#define DMA_ADDR	0x04UL		/* rw  DMA transfer address register  0x04   */</div><div class='del'>-#define DMA_COUNT	0x08UL		/* rw  DMA transfer count register    0x08   */</div><div class='del'>-#define DMA_TEST	0x0cUL		/* rw  DMA test/debug register        0x0c   */</div><div class='del'>-</div><div class='del'>-/* DVMA chip revisions */</div><div class='del'>-enum dvma_rev {</div><div class='del'>-	dvmarev0,</div><div class='del'>-	dvmaesc1,</div><div class='del'>-	dvmarev1,</div><div class='del'>-	dvmarev2,</div><div class='del'>-	dvmarev3,</div><div class='del'>-	dvmarevplus,</div><div class='del'>-	dvmahme</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define DMA_HASCOUNT(rev)  ((rev)==dvmaesc1)</div><div class='del'>-</div><div class='del'>-/* Linux DMA information structure, filled during probe. */</div><div class='del'>-struct sbus_dma {</div><div class='del'>-	struct sbus_dma *next;</div><div class='del'>-	struct sbus_dev *sdev;</div><div class='del'>-	void __iomem *regs;</div><div class='del'>-</div><div class='del'>-	/* Status, misc info */</div><div class='del'>-	int node;                /* Prom node for this DMA device */</div><div class='del'>-	int running;             /* Are we doing DMA now? */</div><div class='del'>-	int allocated;           /* Are we "owned" by anyone yet? */</div><div class='del'>-</div><div class='del'>-	/* Transfer information. */</div><div class='del'>-	unsigned long addr;      /* Start address of current transfer */</div><div class='del'>-	int nbytes;              /* Size of current transfer */</div><div class='del'>-	int realbytes;           /* For splitting up large transfers, etc. */</div><div class='del'>-</div><div class='del'>-	/* DMA revision */</div><div class='del'>-	enum dvma_rev revision;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-extern struct sbus_dma *dma_chain;</div><div class='del'>-</div><div class='del'>-/* Broken hardware... */</div><div class='del'>-#ifdef CONFIG_SUN4</div><div class='del'>-/* Have to sort this out. Does rev0 work fine on sun4[cmd] without isbroken?</div><div class='del'>- * Or is rev0 present only on sun4 boxes? -jj */</div><div class='del'>-#define DMA_ISBROKEN(dma)    ((dma)-&gt;revision == dvmarev0 || (dma)-&gt;revision == dvmarev1)</div><div class='del'>-#else</div><div class='del'>-#define DMA_ISBROKEN(dma)    ((dma)-&gt;revision == dvmarev1)</div><div class='del'>-#endif</div><div class='del'>-#define DMA_ISESC1(dma)      ((dma)-&gt;revision == dvmaesc1)</div><div class='del'>-</div><div class='del'>-/* Main routines in dma.c */</div><div class='del'>-extern void dvma_init(struct sbus_bus *);</div><div class='del'>-</div><div class='del'>-/* Fields in the cond_reg register */</div><div class='del'>-/* First, the version identification bits */</div><div class='del'>-#define DMA_DEVICE_ID    0xf0000000        /* Device identification bits */</div><div class='del'>-#define DMA_VERS0        0x00000000        /* Sunray DMA version */</div><div class='del'>-#define DMA_ESCV1        0x40000000        /* DMA ESC Version 1 */</div><div class='del'>-#define DMA_VERS1        0x80000000        /* DMA rev 1 */</div><div class='del'>-#define DMA_VERS2        0xa0000000        /* DMA rev 2 */</div><div class='del'>-#define DMA_VERHME       0xb0000000        /* DMA hme gate array */</div><div class='del'>-#define DMA_VERSPLUS     0x90000000        /* DMA rev 1 PLUS */</div><div class='del'>-</div><div class='del'>-#define DMA_HNDL_INTR    0x00000001        /* An IRQ needs to be handled */</div><div class='del'>-#define DMA_HNDL_ERROR   0x00000002        /* We need to take an error */</div><div class='del'>-#define DMA_FIFO_ISDRAIN 0x0000000c        /* The DMA FIFO is draining */</div><div class='del'>-#define DMA_INT_ENAB     0x00000010        /* Turn on interrupts */</div><div class='del'>-#define DMA_FIFO_INV     0x00000020        /* Invalidate the FIFO */</div><div class='del'>-#define DMA_ACC_SZ_ERR   0x00000040        /* The access size was bad */</div><div class='del'>-#define DMA_FIFO_STDRAIN 0x00000040        /* DMA_VERS1 Drain the FIFO */</div><div class='del'>-#define DMA_RST_SCSI     0x00000080        /* Reset the SCSI controller */</div><div class='del'>-#define DMA_RST_ENET     DMA_RST_SCSI      /* Reset the ENET controller */</div><div class='del'>-#define DMA_RST_BPP      DMA_RST_SCSI      /* Reset the BPP controller */</div><div class='del'>-#define DMA_ST_WRITE     0x00000100        /* write from device to memory */</div><div class='del'>-#define DMA_ENABLE       0x00000200        /* Fire up DMA, handle requests */</div><div class='del'>-#define DMA_PEND_READ    0x00000400        /* DMA_VERS1/0/PLUS Pending Read */</div><div class='del'>-#define DMA_ESC_BURST    0x00000800        /* 1=16byte 0=32byte */</div><div class='del'>-#define DMA_READ_AHEAD   0x00001800        /* DMA read ahead partial longword */</div><div class='del'>-#define DMA_DSBL_RD_DRN  0x00001000        /* No EC drain on slave reads */</div><div class='del'>-#define DMA_BCNT_ENAB    0x00002000        /* If on, use the byte counter */</div><div class='del'>-#define DMA_TERM_CNTR    0x00004000        /* Terminal counter */</div><div class='del'>-#define DMA_SCSI_SBUS64  0x00008000        /* HME: Enable 64-bit SBUS mode. */</div><div class='del'>-#define DMA_CSR_DISAB    0x00010000        /* No FIFO drains during csr */</div><div class='del'>-#define DMA_SCSI_DISAB   0x00020000        /* No FIFO drains during reg */</div><div class='del'>-#define DMA_DSBL_WR_INV  0x00020000        /* No EC inval. on slave writes */</div><div class='del'>-#define DMA_ADD_ENABLE   0x00040000        /* Special ESC DVMA optimization */</div><div class='del'>-#define DMA_E_BURSTS	 0x000c0000	   /* ENET: SBUS r/w burst mask */</div><div class='del'>-#define DMA_E_BURST32	 0x00040000	   /* ENET: SBUS 32 byte r/w burst */</div><div class='del'>-#define DMA_E_BURST16	 0x00000000	   /* ENET: SBUS 16 byte r/w burst */</div><div class='del'>-#define DMA_BRST_SZ      0x000c0000        /* SCSI: SBUS r/w burst size */</div><div class='del'>-#define DMA_BRST64       0x00080000        /* SCSI: 64byte bursts (HME on UltraSparc only) */</div><div class='del'>-#define DMA_BRST32       0x00040000        /* SCSI/BPP: 32byte bursts */</div><div class='del'>-#define DMA_BRST16       0x00000000        /* SCSI/BPP: 16byte bursts */</div><div class='del'>-#define DMA_BRST0        0x00080000        /* SCSI: no bursts (non-HME gate arrays) */</div><div class='del'>-#define DMA_ADDR_DISAB   0x00100000        /* No FIFO drains during addr */</div><div class='del'>-#define DMA_2CLKS        0x00200000        /* Each transfer = 2 clock ticks */</div><div class='del'>-#define DMA_3CLKS        0x00400000        /* Each transfer = 3 clock ticks */</div><div class='del'>-#define DMA_EN_ENETAUI   DMA_3CLKS         /* Put lance into AUI-cable mode */</div><div class='del'>-#define DMA_CNTR_DISAB   0x00800000        /* No IRQ when DMA_TERM_CNTR set */</div><div class='del'>-#define DMA_AUTO_NADDR   0x01000000        /* Use "auto nxt addr" feature */</div><div class='del'>-#define DMA_SCSI_ON      0x02000000        /* Enable SCSI dma */</div><div class='del'>-#define DMA_BPP_ON       DMA_SCSI_ON       /* Enable BPP dma */</div><div class='del'>-#define DMA_PARITY_OFF   0x02000000        /* HME: disable parity checking */</div><div class='del'>-#define DMA_LOADED_ADDR  0x04000000        /* Address has been loaded */</div><div class='del'>-#define DMA_LOADED_NADDR 0x08000000        /* Next address has been loaded */</div><div class='del'>-#define DMA_RESET_FAS366 0x08000000        /* HME: Assert RESET to FAS366 */</div><div class='del'>-</div><div class='del'>-/* Values describing the burst-size property from the PROM */</div><div class='del'>-#define DMA_BURST1       0x01</div><div class='del'>-#define DMA_BURST2       0x02</div><div class='del'>-#define DMA_BURST4       0x04</div><div class='del'>-#define DMA_BURST8       0x08</div><div class='del'>-#define DMA_BURST16      0x10</div><div class='del'>-#define DMA_BURST32      0x20</div><div class='del'>-#define DMA_BURST64      0x40</div><div class='del'>-#define DMA_BURSTBITS    0x7f</div><div class='del'>-</div><div class='del'>-/* Determine highest possible final transfer address given a base */</div><div class='del'>-#define DMA_MAXEND(addr) (0x01000000UL-(((unsigned long)(addr))&amp;0x00ffffffUL))</div><div class='del'>-</div><div class='del'>-/* Yes, I hack a lot of elisp in my spare time... */</div><div class='del'>-#define DMA_ERROR_P(regs)  ((((regs)-&gt;cond_reg) &amp; DMA_HNDL_ERROR))</div><div class='del'>-#define DMA_IRQ_P(regs)    ((((regs)-&gt;cond_reg) &amp; (DMA_HNDL_INTR | DMA_HNDL_ERROR)))</div><div class='del'>-#define DMA_WRITE_P(regs)  ((((regs)-&gt;cond_reg) &amp; DMA_ST_WRITE))</div><div class='del'>-#define DMA_OFF(regs)      ((((regs)-&gt;cond_reg) &amp;= (~DMA_ENABLE)))</div><div class='del'>-#define DMA_INTSOFF(regs)  ((((regs)-&gt;cond_reg) &amp;= (~DMA_INT_ENAB)))</div><div class='del'>-#define DMA_INTSON(regs)   ((((regs)-&gt;cond_reg) |= (DMA_INT_ENAB)))</div><div class='del'>-#define DMA_PUNTFIFO(regs) ((((regs)-&gt;cond_reg) |= DMA_FIFO_INV))</div><div class='del'>-#define DMA_SETSTART(regs, addr)  ((((regs)-&gt;st_addr) = (char *) addr))</div><div class='del'>-#define DMA_BEGINDMA_W(regs) \</div><div class='del'>-        ((((regs)-&gt;cond_reg |= (DMA_ST_WRITE|DMA_ENABLE|DMA_INT_ENAB))))</div><div class='del'>-#define DMA_BEGINDMA_R(regs) \</div><div class='del'>-        ((((regs)-&gt;cond_reg |= ((DMA_ENABLE|DMA_INT_ENAB)&amp;(~DMA_ST_WRITE)))))</div><div class='del'>-</div><div class='del'>-/* For certain DMA chips, we need to disable ints upon irq entry</div><div class='del'>- * and turn them back on when we are done.  So in any ESP interrupt</div><div class='del'>- * handler you *must* call DMA_IRQ_ENTRY upon entry and DMA_IRQ_EXIT</div><div class='del'>- * when leaving the handler.  You have been warned...</div><div class='del'>- */</div><div class='del'>-#define DMA_IRQ_ENTRY(dma, dregs) do { \</div><div class='del'>-        if(DMA_ISBROKEN(dma)) DMA_INTSOFF(dregs); \</div><div class='del'>-   } while (0)</div><div class='del'>-</div><div class='del'>-#define DMA_IRQ_EXIT(dma, dregs) do { \</div><div class='del'>-	if(DMA_ISBROKEN(dma)) DMA_INTSON(dregs); \</div><div class='del'>-   } while(0)</div><div class='del'>-</div><div class='del'>-#if 0	/* P3 this stuff is inline in ledma.c:init_restart_ledma() */</div><div class='del'>-/* Pause until counter runs out or BIT isn't set in the DMA condition</div><div class='del'>- * register.</div><div class='del'>- */</div><div class='del'>-static inline void sparc_dma_pause(struct sparc_dma_registers *regs,</div><div class='del'>-				       unsigned long bit)</div><div class='del'>-{</div><div class='del'>-	int ctr = 50000;   /* Let's find some bugs ;) */</div><div class='del'>-</div><div class='del'>-	/* Busy wait until the bit is not set any more */</div><div class='del'>-	while((regs-&gt;cond_reg&amp;bit) &amp;&amp; (ctr&gt;0)) {</div><div class='del'>-		ctr--;</div><div class='del'>-		__delay(5);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Check for bogus outcome. */</div><div class='del'>-	if(!ctr)</div><div class='del'>-		panic("DMA timeout");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Reset the friggin' thing... */</div><div class='del'>-#define DMA_RESET(dma) do { \</div><div class='del'>-	struct sparc_dma_registers *regs = dma-&gt;regs;                      \</div><div class='del'>-	/* Let the current FIFO drain itself */                            \</div><div class='del'>-	sparc_dma_pause(regs, (DMA_FIFO_ISDRAIN));                         \</div><div class='del'>-	/* Reset the logic */                                              \</div><div class='del'>-	regs-&gt;cond_reg |= (DMA_RST_SCSI);     /* assert */                 \</div><div class='del'>-	__delay(400);                         /* let the bits set ;) */    \</div><div class='del'>-	regs-&gt;cond_reg &amp;= ~(DMA_RST_SCSI);    /* de-assert */              \</div><div class='del'>-	sparc_dma_enable_interrupts(regs);    /* Re-enable interrupts */   \</div><div class='del'>-	/* Enable FAST transfers if available */                           \</div><div class='del'>-	if(dma-&gt;revision&gt;dvmarev1) regs-&gt;cond_reg |= DMA_3CLKS;            \</div><div class='del'>-	dma-&gt;running = 0;                                                  \</div><div class='del'>-} while(0)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define for_each_dvma(dma) \</div><div class='del'>-        for((dma) = dma_chain; (dma); (dma) = (dma)-&gt;next)</div><div class='del'>-</div><div class='del'>-extern int get_dma_list(char *);</div><div class='del'>-extern int request_dma(unsigned int, __const__ char *);</div><div class='del'>-extern void free_dma(unsigned int);</div><div class='del'>-</div><div class='del'>-/* From PCI */</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-extern int isa_dma_bridge_buggy;</div><div class='del'>-#else</div><div class='del'>-#define isa_dma_bridge_buggy	(0)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* Routines for data transfer buffers. */</div><div class='del'>-BTFIXUPDEF_CALL(char *, mmu_lockarea, char *, unsigned long)</div><div class='del'>-BTFIXUPDEF_CALL(void,   mmu_unlockarea, char *, unsigned long)</div><div class='del'>-</div><div class='del'>-#define mmu_lockarea(vaddr,len) BTFIXUP_CALL(mmu_lockarea)(vaddr,len)</div><div class='del'>-#define mmu_unlockarea(vaddr,len) BTFIXUP_CALL(mmu_unlockarea)(vaddr,len)</div><div class='del'>-</div><div class='del'>-/* These are implementations for sbus_map_sg/sbus_unmap_sg... collapse later */</div><div class='del'>-BTFIXUPDEF_CALL(__u32, mmu_get_scsi_one, char *, unsigned long, struct sbus_bus *sbus)</div><div class='del'>-BTFIXUPDEF_CALL(void,  mmu_get_scsi_sgl, struct scatterlist *, int, struct sbus_bus *sbus)</div><div class='del'>-BTFIXUPDEF_CALL(void,  mmu_release_scsi_one, __u32, unsigned long, struct sbus_bus *sbus)</div><div class='del'>-BTFIXUPDEF_CALL(void,  mmu_release_scsi_sgl, struct scatterlist *, int, struct sbus_bus *sbus)</div><div class='del'>-</div><div class='del'>-#define mmu_get_scsi_one(vaddr,len,sbus) BTFIXUP_CALL(mmu_get_scsi_one)(vaddr,len,sbus)</div><div class='del'>-#define mmu_get_scsi_sgl(sg,sz,sbus) BTFIXUP_CALL(mmu_get_scsi_sgl)(sg,sz,sbus)</div><div class='del'>-#define mmu_release_scsi_one(vaddr,len,sbus) BTFIXUP_CALL(mmu_release_scsi_one)(vaddr,len,sbus)</div><div class='del'>-#define mmu_release_scsi_sgl(sg,sz,sbus) BTFIXUP_CALL(mmu_release_scsi_sgl)(sg,sz,sbus)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * mmu_map/unmap are provided by iommu/iounit; Invalid to call on IIep.</div><div class='del'>- *</div><div class='del'>- * The mmu_map_dma_area establishes two mappings in one go.</div><div class='del'>- * These mappings point to pages normally mapped at 'va' (linear address).</div><div class='del'>- * First mapping is for CPU visible address at 'a', uncached.</div><div class='del'>- * This is an alias, but it works because it is an uncached mapping.</div><div class='del'>- * Second mapping is for device visible address, or "bus" address.</div><div class='del'>- * The bus address is returned at '*pba'.</div><div class='del'>- *</div><div class='del'>- * These functions seem distinct, but are hard to split. On sun4c,</div><div class='del'>- * at least for now, 'a' is equal to bus address, and retured in *pba.</div><div class='del'>- * On sun4m, page attributes depend on the CPU type, so we have to</div><div class='del'>- * know if we are mapping RAM or I/O, so it has to be an additional argument</div><div class='del'>- * to a separate mapping function for CPU visible mappings.</div><div class='del'>- */</div><div class='del'>-BTFIXUPDEF_CALL(int,  mmu_map_dma_area, dma_addr_t *, unsigned long, unsigned long, int len)</div><div class='del'>-BTFIXUPDEF_CALL(struct page *, mmu_translate_dvma, unsigned long busa)</div><div class='del'>-BTFIXUPDEF_CALL(void,  mmu_unmap_dma_area, unsigned long busa, int len)</div><div class='del'>-</div><div class='del'>-#define mmu_map_dma_area(pba,va,a,len) BTFIXUP_CALL(mmu_map_dma_area)(pba,va,a,len)</div><div class='del'>-#define mmu_unmap_dma_area(ba,len) BTFIXUP_CALL(mmu_unmap_dma_area)(ba,len)</div><div class='del'>-#define mmu_translate_dvma(ba)     BTFIXUP_CALL(mmu_translate_dvma)(ba)</div><div class='del'>-</div><div class='del'>-#endif /* !(_ASM_SPARC_DMA_H) */</div><div class='head'>diff --git a/arch/sparc/include/asm/dma_64.h b/arch/sparc/include/asm/dma_64.h<br/>deleted file mode 100644<br/>index 46a8aecffc02..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/dma_64.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/include/asm/dma_64.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,205 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * include/asm/dma.h</div><div class='del'>- *</div><div class='del'>- * Copyright 1996 (C) David S. Miller (davem@caip.rutgers.edu)</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _ASM_SPARC64_DMA_H</div><div class='del'>-#define _ASM_SPARC64_DMA_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/sbus.h&gt;</div><div class='del'>-#include &lt;asm/delay.h&gt;</div><div class='del'>-#include &lt;asm/oplib.h&gt;</div><div class='del'>-</div><div class='del'>-/* These are irrelevant for Sparc DMA, but we leave it in so that</div><div class='del'>- * things can compile.</div><div class='del'>- */</div><div class='del'>-#define MAX_DMA_CHANNELS 8</div><div class='del'>-#define DMA_MODE_READ    1</div><div class='del'>-#define DMA_MODE_WRITE   2</div><div class='del'>-#define MAX_DMA_ADDRESS  (~0UL)</div><div class='del'>-</div><div class='del'>-/* Useful constants */</div><div class='del'>-#define SIZE_16MB      (16*1024*1024)</div><div class='del'>-#define SIZE_64K       (64*1024)</div><div class='del'>-</div><div class='del'>-/* SBUS DMA controller reg offsets */</div><div class='del'>-#define DMA_CSR		0x00UL		/* rw  DMA control/status register    0x00   */</div><div class='del'>-#define DMA_ADDR	0x04UL		/* rw  DMA transfer address register  0x04   */</div><div class='del'>-#define DMA_COUNT	0x08UL		/* rw  DMA transfer count register    0x08   */</div><div class='del'>-#define DMA_TEST	0x0cUL		/* rw  DMA test/debug register        0x0c   */</div><div class='del'>-</div><div class='del'>-/* DVMA chip revisions */</div><div class='del'>-enum dvma_rev {</div><div class='del'>-	dvmarev0,</div><div class='del'>-	dvmaesc1,</div><div class='del'>-	dvmarev1,</div><div class='del'>-	dvmarev2,</div><div class='del'>-	dvmarev3,</div><div class='del'>-	dvmarevplus,</div><div class='del'>-	dvmahme</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define DMA_HASCOUNT(rev)  ((rev)==dvmaesc1)</div><div class='del'>-</div><div class='del'>-/* Linux DMA information structure, filled during probe. */</div><div class='del'>-struct sbus_dma {</div><div class='del'>-	struct sbus_dma *next;</div><div class='del'>-	struct sbus_dev *sdev;</div><div class='del'>-	void __iomem *regs;</div><div class='del'>-</div><div class='del'>-	/* Status, misc info */</div><div class='del'>-	int node;                /* Prom node for this DMA device */</div><div class='del'>-	int running;             /* Are we doing DMA now? */</div><div class='del'>-	int allocated;           /* Are we "owned" by anyone yet? */</div><div class='del'>-</div><div class='del'>-	/* Transfer information. */</div><div class='del'>-	u32 addr;                /* Start address of current transfer */</div><div class='del'>-	int nbytes;              /* Size of current transfer */</div><div class='del'>-	int realbytes;           /* For splitting up large transfers, etc. */</div><div class='del'>-</div><div class='del'>-	/* DMA revision */</div><div class='del'>-	enum dvma_rev revision;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-extern struct sbus_dma *dma_chain;</div><div class='del'>-</div><div class='del'>-/* Broken hardware... */</div><div class='del'>-#define DMA_ISBROKEN(dma)    ((dma)-&gt;revision == dvmarev1)</div><div class='del'>-#define DMA_ISESC1(dma)      ((dma)-&gt;revision == dvmaesc1)</div><div class='del'>-</div><div class='del'>-/* Main routines in dma.c */</div><div class='del'>-extern void dvma_init(struct sbus_bus *);</div><div class='del'>-</div><div class='del'>-/* Fields in the cond_reg register */</div><div class='del'>-/* First, the version identification bits */</div><div class='del'>-#define DMA_DEVICE_ID    0xf0000000        /* Device identification bits */</div><div class='del'>-#define DMA_VERS0        0x00000000        /* Sunray DMA version */</div><div class='del'>-#define DMA_ESCV1        0x40000000        /* DMA ESC Version 1 */</div><div class='del'>-#define DMA_VERS1        0x80000000        /* DMA rev 1 */</div><div class='del'>-#define DMA_VERS2        0xa0000000        /* DMA rev 2 */</div><div class='del'>-#define DMA_VERHME       0xb0000000        /* DMA hme gate array */</div><div class='del'>-#define DMA_VERSPLUS     0x90000000        /* DMA rev 1 PLUS */</div><div class='del'>-</div><div class='del'>-#define DMA_HNDL_INTR    0x00000001        /* An IRQ needs to be handled */</div><div class='del'>-#define DMA_HNDL_ERROR   0x00000002        /* We need to take an error */</div><div class='del'>-#define DMA_FIFO_ISDRAIN 0x0000000c        /* The DMA FIFO is draining */</div><div class='del'>-#define DMA_INT_ENAB     0x00000010        /* Turn on interrupts */</div><div class='del'>-#define DMA_FIFO_INV     0x00000020        /* Invalidate the FIFO */</div><div class='del'>-#define DMA_ACC_SZ_ERR   0x00000040        /* The access size was bad */</div><div class='del'>-#define DMA_FIFO_STDRAIN 0x00000040        /* DMA_VERS1 Drain the FIFO */</div><div class='del'>-#define DMA_RST_SCSI     0x00000080        /* Reset the SCSI controller */</div><div class='del'>-#define DMA_RST_ENET     DMA_RST_SCSI      /* Reset the ENET controller */</div><div class='del'>-#define DMA_ST_WRITE     0x00000100        /* write from device to memory */</div><div class='del'>-#define DMA_ENABLE       0x00000200        /* Fire up DMA, handle requests */</div><div class='del'>-#define DMA_PEND_READ    0x00000400        /* DMA_VERS1/0/PLUS Pending Read */</div><div class='del'>-#define DMA_ESC_BURST    0x00000800        /* 1=16byte 0=32byte */</div><div class='del'>-#define DMA_READ_AHEAD   0x00001800        /* DMA read ahead partial longword */</div><div class='del'>-#define DMA_DSBL_RD_DRN  0x00001000        /* No EC drain on slave reads */</div><div class='del'>-#define DMA_BCNT_ENAB    0x00002000        /* If on, use the byte counter */</div><div class='del'>-#define DMA_TERM_CNTR    0x00004000        /* Terminal counter */</div><div class='del'>-#define DMA_SCSI_SBUS64  0x00008000        /* HME: Enable 64-bit SBUS mode. */</div><div class='del'>-#define DMA_CSR_DISAB    0x00010000        /* No FIFO drains during csr */</div><div class='del'>-#define DMA_SCSI_DISAB   0x00020000        /* No FIFO drains during reg */</div><div class='del'>-#define DMA_DSBL_WR_INV  0x00020000        /* No EC inval. on slave writes */</div><div class='del'>-#define DMA_ADD_ENABLE   0x00040000        /* Special ESC DVMA optimization */</div><div class='del'>-#define DMA_E_BURSTS	 0x000c0000	   /* ENET: SBUS r/w burst mask */</div><div class='del'>-#define DMA_E_BURST32	 0x00040000	   /* ENET: SBUS 32 byte r/w burst */</div><div class='del'>-#define DMA_E_BURST16	 0x00000000	   /* ENET: SBUS 16 byte r/w burst */</div><div class='del'>-#define DMA_BRST_SZ      0x000c0000        /* SCSI: SBUS r/w burst size */</div><div class='del'>-#define DMA_BRST64       0x000c0000        /* SCSI: 64byte bursts (HME on UltraSparc only) */</div><div class='del'>-#define DMA_BRST32       0x00040000        /* SCSI: 32byte bursts */</div><div class='del'>-#define DMA_BRST16       0x00000000        /* SCSI: 16byte bursts */</div><div class='del'>-#define DMA_BRST0        0x00080000        /* SCSI: no bursts (non-HME gate arrays) */</div><div class='del'>-#define DMA_ADDR_DISAB   0x00100000        /* No FIFO drains during addr */</div><div class='del'>-#define DMA_2CLKS        0x00200000        /* Each transfer = 2 clock ticks */</div><div class='del'>-#define DMA_3CLKS        0x00400000        /* Each transfer = 3 clock ticks */</div><div class='del'>-#define DMA_EN_ENETAUI   DMA_3CLKS         /* Put lance into AUI-cable mode */</div><div class='del'>-#define DMA_CNTR_DISAB   0x00800000        /* No IRQ when DMA_TERM_CNTR set */</div><div class='del'>-#define DMA_AUTO_NADDR   0x01000000        /* Use "auto nxt addr" feature */</div><div class='del'>-#define DMA_SCSI_ON      0x02000000        /* Enable SCSI dma */</div><div class='del'>-#define DMA_PARITY_OFF   0x02000000        /* HME: disable parity checking */</div><div class='del'>-#define DMA_LOADED_ADDR  0x04000000        /* Address has been loaded */</div><div class='del'>-#define DMA_LOADED_NADDR 0x08000000        /* Next address has been loaded */</div><div class='del'>-#define DMA_RESET_FAS366 0x08000000        /* HME: Assert RESET to FAS366 */</div><div class='del'>-</div><div class='del'>-/* Values describing the burst-size property from the PROM */</div><div class='del'>-#define DMA_BURST1       0x01</div><div class='del'>-#define DMA_BURST2       0x02</div><div class='del'>-#define DMA_BURST4       0x04</div><div class='del'>-#define DMA_BURST8       0x08</div><div class='del'>-#define DMA_BURST16      0x10</div><div class='del'>-#define DMA_BURST32      0x20</div><div class='del'>-#define DMA_BURST64      0x40</div><div class='del'>-#define DMA_BURSTBITS    0x7f</div><div class='del'>-</div><div class='del'>-/* Determine highest possible final transfer address given a base */</div><div class='del'>-#define DMA_MAXEND(addr) (0x01000000UL-(((unsigned long)(addr))&amp;0x00ffffffUL))</div><div class='del'>-</div><div class='del'>-/* Yes, I hack a lot of elisp in my spare time... */</div><div class='del'>-#define DMA_ERROR_P(regs)  ((sbus_readl((regs) + DMA_CSR) &amp; DMA_HNDL_ERROR))</div><div class='del'>-#define DMA_IRQ_P(regs)    ((sbus_readl((regs) + DMA_CSR)) &amp; (DMA_HNDL_INTR | DMA_HNDL_ERROR))</div><div class='del'>-#define DMA_WRITE_P(regs)  ((sbus_readl((regs) + DMA_CSR) &amp; DMA_ST_WRITE))</div><div class='del'>-#define DMA_OFF(__regs)		\</div><div class='del'>-do {	u32 tmp = sbus_readl((__regs) + DMA_CSR); \</div><div class='del'>-	tmp &amp;= ~DMA_ENABLE; \</div><div class='del'>-	sbus_writel(tmp, (__regs) + DMA_CSR); \</div><div class='del'>-} while(0)</div><div class='del'>-#define DMA_INTSOFF(__regs)	\</div><div class='del'>-do {	u32 tmp = sbus_readl((__regs) + DMA_CSR); \</div><div class='del'>-	tmp &amp;= ~DMA_INT_ENAB; \</div><div class='del'>-	sbus_writel(tmp, (__regs) + DMA_CSR); \</div><div class='del'>-} while(0)</div><div class='del'>-#define DMA_INTSON(__regs)	\</div><div class='del'>-do {	u32 tmp = sbus_readl((__regs) + DMA_CSR); \</div><div class='del'>-	tmp |= DMA_INT_ENAB; \</div><div class='del'>-	sbus_writel(tmp, (__regs) + DMA_CSR); \</div><div class='del'>-} while(0)</div><div class='del'>-#define DMA_PUNTFIFO(__regs)	\</div><div class='del'>-do {	u32 tmp = sbus_readl((__regs) + DMA_CSR); \</div><div class='del'>-	tmp |= DMA_FIFO_INV; \</div><div class='del'>-	sbus_writel(tmp, (__regs) + DMA_CSR); \</div><div class='del'>-} while(0)</div><div class='del'>-#define DMA_SETSTART(__regs, __addr)	\</div><div class='del'>-	sbus_writel((u32)(__addr), (__regs) + DMA_ADDR);</div><div class='del'>-#define DMA_BEGINDMA_W(__regs)	\</div><div class='del'>-do {	u32 tmp = sbus_readl((__regs) + DMA_CSR); \</div><div class='del'>-	tmp |= (DMA_ST_WRITE|DMA_ENABLE|DMA_INT_ENAB); \</div><div class='del'>-	sbus_writel(tmp, (__regs) + DMA_CSR); \</div><div class='del'>-} while(0)</div><div class='del'>-#define DMA_BEGINDMA_R(__regs)	\</div><div class='del'>-do {	u32 tmp = sbus_readl((__regs) + DMA_CSR); \</div><div class='del'>-	tmp |= (DMA_ENABLE|DMA_INT_ENAB); \</div><div class='del'>-	tmp &amp;= ~DMA_ST_WRITE; \</div><div class='del'>-	sbus_writel(tmp, (__regs) + DMA_CSR); \</div><div class='del'>-} while(0)</div><div class='del'>-</div><div class='del'>-/* For certain DMA chips, we need to disable ints upon irq entry</div><div class='del'>- * and turn them back on when we are done.  So in any ESP interrupt</div><div class='del'>- * handler you *must* call DMA_IRQ_ENTRY upon entry and DMA_IRQ_EXIT</div><div class='del'>- * when leaving the handler.  You have been warned...</div><div class='del'>- */</div><div class='del'>-#define DMA_IRQ_ENTRY(dma, dregs) do { \</div><div class='del'>-        if(DMA_ISBROKEN(dma)) DMA_INTSOFF(dregs); \</div><div class='del'>-   } while (0)</div><div class='del'>-</div><div class='del'>-#define DMA_IRQ_EXIT(dma, dregs) do { \</div><div class='del'>-	if(DMA_ISBROKEN(dma)) DMA_INTSON(dregs); \</div><div class='del'>-   } while(0)</div><div class='del'>-</div><div class='del'>-#define for_each_dvma(dma) \</div><div class='del'>-        for((dma) = dma_chain; (dma); (dma) = (dma)-&gt;next)</div><div class='del'>-</div><div class='del'>-/* From PCI */</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-extern int isa_dma_bridge_buggy;</div><div class='del'>-#else</div><div class='del'>-#define isa_dma_bridge_buggy 	(0)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#endif /* !(_ASM_SPARC64_DMA_H) */</div><div class='head'>diff --git a/arch/sparc/include/asm/ebus.h b/arch/sparc/include/asm/ebus.h<br/>deleted file mode 100644<br/>index 83a6d16c22e6..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/ebus.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/include/asm/ebus.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,8 +0,0 @@</div><div class='del'>-#ifndef ___ASM_SPARC_EBUS_H</div><div class='del'>-#define ___ASM_SPARC_EBUS_H</div><div class='del'>-#if defined(__sparc__) &amp;&amp; defined(__arch64__)</div><div class='del'>-#include &lt;asm/ebus_64.h&gt;</div><div class='del'>-#else</div><div class='del'>-#include &lt;asm/ebus_32.h&gt;</div><div class='del'>-#endif</div><div class='del'>-#endif</div><div class='head'>diff --git a/arch/sparc/include/asm/ebus_32.h b/arch/sparc/include/asm/ebus_32.h<br/>deleted file mode 100644<br/>index f91f0b267ce1..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/ebus_32.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/include/asm/ebus_32.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,99 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * ebus.h: PCI to Ebus pseudo driver software state.</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1997 Eddie C. Dost (ecd@skynet.be)</div><div class='del'>- *</div><div class='del'>- * Adopted for sparc by V. Roganov and G. Raiko.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __SPARC_EBUS_H</div><div class='del'>-#define __SPARC_EBUS_H</div><div class='del'>-</div><div class='del'>-#ifndef _LINUX_IOPORT_H</div><div class='del'>-#include &lt;linux/ioport.h&gt;</div><div class='del'>-#endif</div><div class='del'>-#include &lt;linux/of_device.h&gt;</div><div class='del'>-#include &lt;asm/oplib.h&gt;</div><div class='del'>-#include &lt;asm/prom.h&gt;</div><div class='del'>-</div><div class='del'>-struct linux_ebus_child {</div><div class='del'>-	struct linux_ebus_child		*next;</div><div class='del'>-	struct linux_ebus_device	*parent;</div><div class='del'>-	struct linux_ebus		*bus;</div><div class='del'>-	struct device_node		*prom_node;</div><div class='del'>-	struct resource			 resource[PROMREG_MAX];</div><div class='del'>-	int				 num_addrs;</div><div class='del'>-	unsigned int			 irqs[PROMINTR_MAX];</div><div class='del'>-	int				 num_irqs;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct linux_ebus_device {</div><div class='del'>-	struct of_device		ofdev;</div><div class='del'>-	struct linux_ebus_device	*next;</div><div class='del'>-	struct linux_ebus_child		*children;</div><div class='del'>-	struct linux_ebus		*bus;</div><div class='del'>-	struct device_node		*prom_node;</div><div class='del'>-	struct resource			 resource[PROMREG_MAX];</div><div class='del'>-	int				 num_addrs;</div><div class='del'>-	unsigned int			 irqs[PROMINTR_MAX];</div><div class='del'>-	int				 num_irqs;</div><div class='del'>-};</div><div class='del'>-#define to_ebus_device(d) container_of(d, struct linux_ebus_device, ofdev.dev)</div><div class='del'>-</div><div class='del'>-struct linux_ebus {</div><div class='del'>-	struct of_device		ofdev;</div><div class='del'>-	struct linux_ebus		*next;</div><div class='del'>-	struct linux_ebus_device	*devices;</div><div class='del'>-	struct linux_pbm_info		*parent;</div><div class='del'>-	struct pci_dev			*self;</div><div class='del'>-	struct device_node		*prom_node;</div><div class='del'>-};</div><div class='del'>-#define to_ebus(d) container_of(d, struct linux_ebus, ofdev.dev)</div><div class='del'>-</div><div class='del'>-struct linux_ebus_dma {</div><div class='del'>-	unsigned int dcsr;</div><div class='del'>-	unsigned int dacr;</div><div class='del'>-	unsigned int dbcr;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define EBUS_DCSR_INT_PEND	0x00000001</div><div class='del'>-#define EBUS_DCSR_ERR_PEND	0x00000002</div><div class='del'>-#define EBUS_DCSR_DRAIN		0x00000004</div><div class='del'>-#define EBUS_DCSR_INT_EN	0x00000010</div><div class='del'>-#define EBUS_DCSR_RESET		0x00000080</div><div class='del'>-#define EBUS_DCSR_WRITE		0x00000100</div><div class='del'>-#define EBUS_DCSR_EN_DMA	0x00000200</div><div class='del'>-#define EBUS_DCSR_CYC_PEND	0x00000400</div><div class='del'>-#define EBUS_DCSR_DIAG_RD_DONE	0x00000800</div><div class='del'>-#define EBUS_DCSR_DIAG_WR_DONE	0x00001000</div><div class='del'>-#define EBUS_DCSR_EN_CNT	0x00002000</div><div class='del'>-#define EBUS_DCSR_TC		0x00004000</div><div class='del'>-#define EBUS_DCSR_DIS_CSR_DRN	0x00010000</div><div class='del'>-#define EBUS_DCSR_BURST_SZ_MASK	0x000c0000</div><div class='del'>-#define EBUS_DCSR_BURST_SZ_1	0x00080000</div><div class='del'>-#define EBUS_DCSR_BURST_SZ_4	0x00000000</div><div class='del'>-#define EBUS_DCSR_BURST_SZ_8	0x00040000</div><div class='del'>-#define EBUS_DCSR_BURST_SZ_16	0x000c0000</div><div class='del'>-#define EBUS_DCSR_DIAG_EN	0x00100000</div><div class='del'>-#define EBUS_DCSR_DIS_ERR_PEND	0x00400000</div><div class='del'>-#define EBUS_DCSR_TCI_DIS	0x00800000</div><div class='del'>-#define EBUS_DCSR_EN_NEXT	0x01000000</div><div class='del'>-#define EBUS_DCSR_DMA_ON	0x02000000</div><div class='del'>-#define EBUS_DCSR_A_LOADED	0x04000000</div><div class='del'>-#define EBUS_DCSR_NA_LOADED	0x08000000</div><div class='del'>-#define EBUS_DCSR_DEV_ID_MASK	0xf0000000</div><div class='del'>-</div><div class='del'>-extern struct linux_ebus		*ebus_chain;</div><div class='del'>-</div><div class='del'>-extern void ebus_init(void);</div><div class='del'>-</div><div class='del'>-#define for_each_ebus(bus)						\</div><div class='del'>-        for((bus) = ebus_chain; (bus); (bus) = (bus)-&gt;next)</div><div class='del'>-</div><div class='del'>-#define for_each_ebusdev(dev, bus)					\</div><div class='del'>-        for((dev) = (bus)-&gt;devices; (dev); (dev) = (dev)-&gt;next)</div><div class='del'>-</div><div class='del'>-#define for_each_edevchild(dev, child)					\</div><div class='del'>-        for((child) = (dev)-&gt;children; (child); (child) = (child)-&gt;next)</div><div class='del'>-</div><div class='del'>-#endif /* !(__SPARC_EBUS_H) */</div><div class='head'>diff --git a/arch/sparc/include/asm/ebus_64.h b/arch/sparc/include/asm/ebus_64.h<br/>deleted file mode 100644<br/>index 14c6a111f60c..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/ebus_64.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/include/asm/ebus_64.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,95 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * ebus.h: PCI to Ebus pseudo driver software state.</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1997 Eddie C. Dost (ecd@skynet.be)</div><div class='del'>- * Copyright (C) 1999 David S. Miller (davem@redhat.com)</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __SPARC64_EBUS_H</div><div class='del'>-#define __SPARC64_EBUS_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/of_device.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/oplib.h&gt;</div><div class='del'>-#include &lt;asm/prom.h&gt;</div><div class='del'>-</div><div class='del'>-struct linux_ebus_child {</div><div class='del'>-	struct linux_ebus_child		*next;</div><div class='del'>-	struct linux_ebus_device	*parent;</div><div class='del'>-	struct linux_ebus		*bus;</div><div class='del'>-	struct device_node		*prom_node;</div><div class='del'>-	struct resource			 resource[PROMREG_MAX];</div><div class='del'>-	int				 num_addrs;</div><div class='del'>-	unsigned int			 irqs[PROMINTR_MAX];</div><div class='del'>-	int				 num_irqs;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct linux_ebus_device {</div><div class='del'>-	struct of_device		ofdev;</div><div class='del'>-	struct linux_ebus_device	*next;</div><div class='del'>-	struct linux_ebus_child		*children;</div><div class='del'>-	struct linux_ebus		*bus;</div><div class='del'>-	struct device_node		*prom_node;</div><div class='del'>-	struct resource			 resource[PROMREG_MAX];</div><div class='del'>-	int				 num_addrs;</div><div class='del'>-	unsigned int			 irqs[PROMINTR_MAX];</div><div class='del'>-	int				 num_irqs;</div><div class='del'>-};</div><div class='del'>-#define to_ebus_device(d) container_of(d, struct linux_ebus_device, ofdev.dev)</div><div class='del'>-</div><div class='del'>-struct linux_ebus {</div><div class='del'>-	struct of_device		ofdev;</div><div class='del'>-	struct linux_ebus		*next;</div><div class='del'>-	struct linux_ebus_device	*devices;</div><div class='del'>-	struct pci_dev			*self;</div><div class='del'>-	int				 index;</div><div class='del'>-	int				 is_rio;</div><div class='del'>-	struct device_node		*prom_node;</div><div class='del'>-};</div><div class='del'>-#define to_ebus(d) container_of(d, struct linux_ebus, ofdev.dev)</div><div class='del'>-</div><div class='del'>-struct ebus_dma_info {</div><div class='del'>-	spinlock_t	lock;</div><div class='del'>-	void __iomem	*regs;</div><div class='del'>-</div><div class='del'>-	unsigned int	flags;</div><div class='del'>-#define EBUS_DMA_FLAG_USE_EBDMA_HANDLER		0x00000001</div><div class='del'>-#define EBUS_DMA_FLAG_TCI_DISABLE		0x00000002</div><div class='del'>-</div><div class='del'>-	/* These are only valid is EBUS_DMA_FLAG_USE_EBDMA_HANDLER is</div><div class='del'>-	 * set.</div><div class='del'>-	 */</div><div class='del'>-	void (*callback)(struct ebus_dma_info *p, int event, void *cookie);</div><div class='del'>-	void *client_cookie;</div><div class='del'>-	unsigned int	irq;</div><div class='del'>-#define EBUS_DMA_EVENT_ERROR	1</div><div class='del'>-#define EBUS_DMA_EVENT_DMA	2</div><div class='del'>-#define EBUS_DMA_EVENT_DEVICE	4</div><div class='del'>-</div><div class='del'>-	unsigned char	name[64];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-extern int ebus_dma_register(struct ebus_dma_info *p);</div><div class='del'>-extern int ebus_dma_irq_enable(struct ebus_dma_info *p, int on);</div><div class='del'>-extern void ebus_dma_unregister(struct ebus_dma_info *p);</div><div class='del'>-extern int ebus_dma_request(struct ebus_dma_info *p, dma_addr_t bus_addr,</div><div class='del'>-			    size_t len);</div><div class='del'>-extern void ebus_dma_prepare(struct ebus_dma_info *p, int write);</div><div class='del'>-extern unsigned int ebus_dma_residue(struct ebus_dma_info *p);</div><div class='del'>-extern unsigned int ebus_dma_addr(struct ebus_dma_info *p);</div><div class='del'>-extern void ebus_dma_enable(struct ebus_dma_info *p, int on);</div><div class='del'>-</div><div class='del'>-extern struct linux_ebus		*ebus_chain;</div><div class='del'>-</div><div class='del'>-extern void ebus_init(void);</div><div class='del'>-</div><div class='del'>-#define for_each_ebus(bus)						\</div><div class='del'>-        for((bus) = ebus_chain; (bus); (bus) = (bus)-&gt;next)</div><div class='del'>-</div><div class='del'>-#define for_each_ebusdev(dev, bus)					\</div><div class='del'>-        for((dev) = (bus)-&gt;devices; (dev); (dev) = (dev)-&gt;next)</div><div class='del'>-</div><div class='del'>-#define for_each_edevchild(dev, child)					\</div><div class='del'>-        for((child) = (dev)-&gt;children; (child); (child) = (child)-&gt;next)</div><div class='del'>-</div><div class='del'>-#endif /* !(__SPARC64_EBUS_H) */</div><div class='head'>diff --git a/arch/sparc/include/asm/ebus_dma.h b/arch/sparc/include/asm/ebus_dma.h<br/>new file mode 100644<br/>index 000000000000..f07a5b541c98<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/ebus_dma.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/ebus_dma.h</a></div><div class='hunk'>@@ -0,0 +1,35 @@</div><div class='add'>+#ifndef __ASM_SPARC_EBUS_DMA_H</div><div class='add'>+#define __ASM_SPARC_EBUS_DMA_H</div><div class='add'>+</div><div class='add'>+struct ebus_dma_info {</div><div class='add'>+	spinlock_t	lock;</div><div class='add'>+	void __iomem	*regs;</div><div class='add'>+</div><div class='add'>+	unsigned int	flags;</div><div class='add'>+#define EBUS_DMA_FLAG_USE_EBDMA_HANDLER		0x00000001</div><div class='add'>+#define EBUS_DMA_FLAG_TCI_DISABLE		0x00000002</div><div class='add'>+</div><div class='add'>+	/* These are only valid is EBUS_DMA_FLAG_USE_EBDMA_HANDLER is</div><div class='add'>+	 * set.</div><div class='add'>+	 */</div><div class='add'>+	void (*callback)(struct ebus_dma_info *p, int event, void *cookie);</div><div class='add'>+	void *client_cookie;</div><div class='add'>+	unsigned int	irq;</div><div class='add'>+#define EBUS_DMA_EVENT_ERROR	1</div><div class='add'>+#define EBUS_DMA_EVENT_DMA	2</div><div class='add'>+#define EBUS_DMA_EVENT_DEVICE	4</div><div class='add'>+</div><div class='add'>+	unsigned char	name[64];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern int ebus_dma_register(struct ebus_dma_info *p);</div><div class='add'>+extern int ebus_dma_irq_enable(struct ebus_dma_info *p, int on);</div><div class='add'>+extern void ebus_dma_unregister(struct ebus_dma_info *p);</div><div class='add'>+extern int ebus_dma_request(struct ebus_dma_info *p, dma_addr_t bus_addr,</div><div class='add'>+			    size_t len);</div><div class='add'>+extern void ebus_dma_prepare(struct ebus_dma_info *p, int write);</div><div class='add'>+extern unsigned int ebus_dma_residue(struct ebus_dma_info *p);</div><div class='add'>+extern unsigned int ebus_dma_addr(struct ebus_dma_info *p);</div><div class='add'>+extern void ebus_dma_enable(struct ebus_dma_info *p, int on);</div><div class='add'>+</div><div class='add'>+#endif /* __ASM_SPARC_EBUS_DMA_H */</div><div class='head'>diff --git a/arch/sparc/include/asm/elf_32.h b/arch/sparc/include/asm/elf_32.h<br/>index d043f80bc2fd..381a1b5256d6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/elf_32.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/include/asm/elf_32.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/elf_32.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/elf_32.h</a></div><div class='hunk'>@@ -105,11 +105,8 @@ typedef struct {</div><div class='ctx'> #define ELF_DATA	ELFDATA2MSB</div><div class='ctx'> </div><div class='ctx'> #define USE_ELF_CORE_DUMP</div><div class='del'>-#ifndef CONFIG_SUN4</div><div class='add'>+</div><div class='ctx'> #define ELF_EXEC_PAGESIZE	4096</div><div class='del'>-#else</div><div class='del'>-#define ELF_EXEC_PAGESIZE	8192</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* This is the location that an ET_DYN program is loaded if exec'ed.  Typical</div><div class='hunk'>@@ -126,7 +123,7 @@ typedef struct {</div><div class='ctx'> /* Sun4c has none of the capabilities, most sun4m's have them all.</div><div class='ctx'>  * XXX This is gross, set some global variable at boot time. -DaveM</div><div class='ctx'>  */</div><div class='del'>-#define ELF_HWCAP	((ARCH_SUN4C_SUN4) ? 0 : \</div><div class='add'>+#define ELF_HWCAP	((ARCH_SUN4C) ? 0 : \</div><div class='ctx'> 			 (HWCAP_SPARC_FLUSH | HWCAP_SPARC_STBAR | \</div><div class='ctx'> 			  HWCAP_SPARC_SWAP | \</div><div class='ctx'> 			  ((srmmu_modtype != Cypress &amp;&amp; \</div><div class='hunk'>@@ -140,6 +137,6 @@ typedef struct {</div><div class='ctx'> </div><div class='ctx'> #define ELF_PLATFORM	(NULL)</div><div class='ctx'> </div><div class='del'>-#define SET_PERSONALITY(ex, ibcs2) set_personality((ibcs2)?PER_SVR4:PER_LINUX)</div><div class='add'>+#define SET_PERSONALITY(ex) set_personality(PER_LINUX)</div><div class='ctx'> </div><div class='ctx'> #endif /* !(__ASMSPARC_ELF_H) */</div><div class='head'>diff --git a/arch/sparc/include/asm/elf_64.h b/arch/sparc/include/asm/elf_64.h<br/>index 0818a1308f4e..425c2f9be6d5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/elf_64.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/include/asm/elf_64.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/elf_64.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/elf_64.h</a></div><div class='hunk'>@@ -195,7 +195,7 @@ static inline unsigned int sparc64_elf_hwcap(void)</div><div class='ctx'> </div><div class='ctx'> #define ELF_PLATFORM	(NULL)</div><div class='ctx'> </div><div class='del'>-#define SET_PERSONALITY(ex, ibcs2)			\</div><div class='add'>+#define SET_PERSONALITY(ex)				\</div><div class='ctx'> do {	unsigned long new_flags = current_thread_info()-&gt;flags; \</div><div class='ctx'> 	new_flags &amp;= _TIF_32BIT;			\</div><div class='ctx'> 	if ((ex).e_ident[EI_CLASS] == ELFCLASS32)	\</div><div class='hunk'>@@ -208,9 +208,7 @@ do {	unsigned long new_flags = current_thread_info()-&gt;flags; \</div><div class='ctx'> 	else						\</div><div class='ctx'> 		clear_thread_flag(TIF_ABI_PENDING);	\</div><div class='ctx'> 	/* flush_thread will update pgd cache */	\</div><div class='del'>-	if (ibcs2)					\</div><div class='del'>-		set_personality(PER_SVR4);		\</div><div class='del'>-	else if (current-&gt;personality != PER_LINUX32)	\</div><div class='add'>+	if (current-&gt;personality != PER_LINUX32)	\</div><div class='ctx'> 		set_personality(PER_LINUX);		\</div><div class='ctx'> } while (0)</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sparc/include/asm/fhc.h b/arch/sparc/include/asm/fhc.h<br/>index 788cbc46a116..57f1b303ad54 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/fhc.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/include/asm/fhc.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/fhc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/fhc.h</a></div><div class='hunk'>@@ -1,5 +1,4 @@</div><div class='del'>-/*</div><div class='del'>- * fhc.h: Structures for central/fhc pseudo driver on Sunfire/Starfire/Wildfire.</div><div class='add'>+/* fhc.h: FHC and Clock board register definitions.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 1997, 1999 David S. Miller (davem@redhat.com)</div><div class='ctx'>  */</div><div class='hunk'>@@ -7,14 +6,6 @@</div><div class='ctx'> #ifndef _SPARC64_FHC_H</div><div class='ctx'> #define _SPARC64_FHC_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/timer.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/oplib.h&gt;</div><div class='del'>-#include &lt;asm/prom.h&gt;</div><div class='del'>-#include &lt;asm/upa.h&gt;</div><div class='del'>-</div><div class='del'>-struct linux_fhc;</div><div class='del'>-</div><div class='ctx'> /* Clock board register offsets. */</div><div class='ctx'> #define CLOCK_CTRL	0x00UL	/* Main control */</div><div class='ctx'> #define CLOCK_STAT1	0x10UL	/* Status one */</div><div class='hunk'>@@ -29,21 +20,7 @@ struct linux_fhc;</div><div class='ctx'> #define CLOCK_CTRL_MLED		0x02	/* Mid LED, 1 == on */</div><div class='ctx'> #define CLOCK_CTRL_RLED		0x01	/* RIght LED, 1 == on */</div><div class='ctx'> </div><div class='del'>-struct linux_central {</div><div class='del'>-	struct linux_fhc		*child;</div><div class='del'>-	unsigned long			cfreg;</div><div class='del'>-	unsigned long			clkregs;</div><div class='del'>-	unsigned long			clkver;</div><div class='del'>-	int				slots;</div><div class='del'>-	struct device_node		*prom_node;</div><div class='del'>-</div><div class='del'>-	struct linux_prom_ranges	central_ranges[PROMREG_MAX];</div><div class='del'>-	int				num_central_ranges;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /* Firehose controller register offsets */</div><div class='del'>-struct fhc_regs {</div><div class='del'>-	unsigned long			pregs;	/* FHC internal regs */</div><div class='ctx'> #define FHC_PREGS_ID	0x00UL	/* FHC ID */</div><div class='ctx'> #define  FHC_ID_VERS		0xf0000000 /* Version of this FHC		*/</div><div class='ctx'> #define  FHC_ID_PARTID		0x0ffff000 /* Part ID code (0x0f9f == FHC)	*/</div><div class='hunk'>@@ -90,32 +67,14 @@ struct fhc_regs {</div><div class='ctx'> #define  FHC_JTAG_CTRL_MENAB	0x80000000 /* Indicates this is JTAG Master	 */</div><div class='ctx'> #define  FHC_JTAG_CTRL_MNONE	0x40000000 /* Indicates no JTAG Master present	 */</div><div class='ctx'> #define FHC_PREGS_JCMD	0x100UL	/* FHC JTAG Command Register */</div><div class='del'>-	unsigned long			ireg;	/* FHC IGN reg */</div><div class='ctx'> #define FHC_IREG_IGN	0x00UL	/* This FHC's IGN */</div><div class='del'>-	unsigned long			ffregs;	/* FHC fanfail regs */</div><div class='ctx'> #define FHC_FFREGS_IMAP	0x00UL	/* FHC Fanfail IMAP */</div><div class='ctx'> #define FHC_FFREGS_ICLR	0x10UL	/* FHC Fanfail ICLR */</div><div class='del'>-	unsigned long			sregs;	/* FHC system regs */</div><div class='ctx'> #define FHC_SREGS_IMAP	0x00UL	/* FHC System IMAP */</div><div class='ctx'> #define FHC_SREGS_ICLR	0x10UL	/* FHC System ICLR */</div><div class='del'>-	unsigned long			uregs;	/* FHC uart regs */</div><div class='ctx'> #define FHC_UREGS_IMAP	0x00UL	/* FHC Uart IMAP */</div><div class='ctx'> #define FHC_UREGS_ICLR	0x10UL	/* FHC Uart ICLR */</div><div class='del'>-	unsigned long			tregs;	/* FHC TOD regs */</div><div class='ctx'> #define FHC_TREGS_IMAP	0x00UL	/* FHC TOD IMAP */</div><div class='ctx'> #define FHC_TREGS_ICLR	0x10UL	/* FHC TOD ICLR */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct linux_fhc {</div><div class='del'>-	struct linux_fhc		*next;</div><div class='del'>-	struct linux_central		*parent;	/* NULL if not central FHC */</div><div class='del'>-	struct fhc_regs			fhc_regs;</div><div class='del'>-	int				board;</div><div class='del'>-	int				jtag_master;</div><div class='del'>-	struct device_node		*prom_node;</div><div class='del'>-</div><div class='del'>-	struct linux_prom_ranges	fhc_ranges[PROMREG_MAX];</div><div class='del'>-	int				num_fhc_ranges;</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> #endif /* !(_SPARC64_FHC_H) */</div><div class='head'>diff --git a/arch/sparc/include/asm/floppy_32.h b/arch/sparc/include/asm/floppy_32.h<br/>index ae3f00bf22ff..c792830636de 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/floppy_32.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/include/asm/floppy_32.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/floppy_32.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/floppy_32.h</a></div><div class='hunk'>@@ -6,6 +6,9 @@</div><div class='ctx'> #ifndef __ASM_SPARC_FLOPPY_H</div><div class='ctx'> #define __ASM_SPARC_FLOPPY_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_device.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='hunk'>@@ -343,7 +346,7 @@ static int sun_floppy_init(void)</div><div class='ctx'> 	r.flags = fd_regs[0].which_io;</div><div class='ctx'> 	r.start = fd_regs[0].phys_addr;</div><div class='ctx'> 	sun_fdc = (struct sun_flpy_controller *)</div><div class='del'>-	    sbus_ioremap(&amp;r, 0, fd_regs[0].reg_size, "floppy");</div><div class='add'>+	    of_ioremap(&amp;r, 0, fd_regs[0].reg_size, "floppy");</div><div class='ctx'> </div><div class='ctx'> 	/* Last minute sanity check... */</div><div class='ctx'> 	if(sun_fdc-&gt;status_82072 == 0xff) {</div><div class='hunk'>@@ -385,4 +388,15 @@ static int sparc_eject(void)</div><div class='ctx'> </div><div class='ctx'> #define EXTRA_FLOPPY_PARAMS</div><div class='ctx'> </div><div class='add'>+static DEFINE_SPINLOCK(dma_spin_lock);</div><div class='add'>+</div><div class='add'>+#define claim_dma_lock() \</div><div class='add'>+({	unsigned long flags; \</div><div class='add'>+	spin_lock_irqsave(&amp;dma_spin_lock, flags); \</div><div class='add'>+	flags; \</div><div class='add'>+})</div><div class='add'>+</div><div class='add'>+#define release_dma_lock(__flags) \</div><div class='add'>+	spin_unlock_irqrestore(&amp;dma_spin_lock, __flags);</div><div class='add'>+</div><div class='ctx'> #endif /* !(__ASM_SPARC_FLOPPY_H) */</div><div class='head'>diff --git a/arch/sparc/include/asm/floppy_64.h b/arch/sparc/include/asm/floppy_64.h<br/>index c39db1060bc7..36439d67ad71 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/floppy_64.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/include/asm/floppy_64.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/floppy_64.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/floppy_64.h</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /* floppy.h: Sparc specific parts of the Floppy driver.</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 1996, 2007 David S. Miller (davem@davemloft.net)</div><div class='add'>+ * Copyright (C) 1996, 2007, 2008 David S. Miller (davem@davemloft.net)</div><div class='ctx'>  * Copyright (C) 1997 Jakub Jelinek (jj@sunsite.mff.cuni.cz)</div><div class='ctx'>  *</div><div class='ctx'>  * Ultra/PCI support added: Sep 1997  Eddie C. Dost  (ecd@skynet.be)</div><div class='hunk'>@@ -9,18 +9,11 @@</div><div class='ctx'> #ifndef __ASM_SPARC64_FLOPPY_H</div><div class='ctx'> #define __ASM_SPARC64_FLOPPY_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_device.h&gt;</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/page.h&gt;</div><div class='del'>-#include &lt;asm/pgtable.h&gt;</div><div class='del'>-#include &lt;asm/system.h&gt;</div><div class='del'>-#include &lt;asm/idprom.h&gt;</div><div class='del'>-#include &lt;asm/oplib.h&gt;</div><div class='ctx'> #include &lt;asm/auxio.h&gt;</div><div class='del'>-#include &lt;asm/sbus.h&gt;</div><div class='del'>-#include &lt;asm/irq.h&gt;</div><div class='del'>-</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Define this to enable exchanging drive 0 and 1 if only drive 1 is</div><div class='hunk'>@@ -50,7 +43,7 @@ struct sun_flpy_controller {</div><div class='ctx'> /* You'll only ever find one controller on an Ultra anyways. */</div><div class='ctx'> static struct sun_flpy_controller *sun_fdc = (struct sun_flpy_controller *)-1;</div><div class='ctx'> unsigned long fdc_status;</div><div class='del'>-static struct sbus_dev *floppy_sdev = NULL;</div><div class='add'>+static struct of_device *floppy_op = NULL;</div><div class='ctx'> </div><div class='ctx'> struct sun_floppy_ops {</div><div class='ctx'> 	unsigned char	(*fd_inb) (unsigned long port);</div><div class='hunk'>@@ -291,12 +284,11 @@ static int sun_fd_eject(int drive)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-#include &lt;asm/ebus.h&gt;</div><div class='add'>+#include &lt;asm/ebus_dma.h&gt;</div><div class='ctx'> #include &lt;asm/ns87303.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct ebus_dma_info sun_pci_fd_ebus_dma;</div><div class='del'>-static struct pci_dev *sun_pci_ebus_dev;</div><div class='add'>+static struct device *sun_floppy_dev;</div><div class='ctx'> static int sun_pci_broken_drive = -1;</div><div class='ctx'> </div><div class='ctx'> struct sun_pci_dma_op {</div><div class='hunk'>@@ -377,7 +369,7 @@ static void sun_pci_fd_enable_dma(void)</div><div class='ctx'> 	sun_pci_dma_pending.addr = -1U;</div><div class='ctx'> </div><div class='ctx'> 	sun_pci_dma_current.addr =</div><div class='del'>-		pci_map_single(sun_pci_ebus_dev,</div><div class='add'>+		dma_map_single(sun_floppy_dev,</div><div class='ctx'> 			       sun_pci_dma_current.buf,</div><div class='ctx'> 			       sun_pci_dma_current.len,</div><div class='ctx'> 			       sun_pci_dma_current.direction);</div><div class='hunk'>@@ -394,7 +386,7 @@ static void sun_pci_fd_disable_dma(void)</div><div class='ctx'> {</div><div class='ctx'> 	ebus_dma_enable(&amp;sun_pci_fd_ebus_dma, 0);</div><div class='ctx'> 	if (sun_pci_dma_current.addr != -1U)</div><div class='del'>-		pci_unmap_single(sun_pci_ebus_dev,</div><div class='add'>+		dma_unmap_single(sun_floppy_dev,</div><div class='ctx'> 				 sun_pci_dma_current.addr,</div><div class='ctx'> 				 sun_pci_dma_current.len,</div><div class='ctx'> 				 sun_pci_dma_current.direction);</div><div class='hunk'>@@ -404,9 +396,9 @@ static void sun_pci_fd_disable_dma(void)</div><div class='ctx'> static void sun_pci_fd_set_dma_mode(int mode)</div><div class='ctx'> {</div><div class='ctx'> 	if (mode == DMA_MODE_WRITE)</div><div class='del'>-		sun_pci_dma_pending.direction = PCI_DMA_TODEVICE;</div><div class='add'>+		sun_pci_dma_pending.direction = DMA_TO_DEVICE;</div><div class='ctx'> 	else</div><div class='del'>-		sun_pci_dma_pending.direction = PCI_DMA_FROMDEVICE;</div><div class='add'>+		sun_pci_dma_pending.direction = DMA_FROM_DEVICE;</div><div class='ctx'> </div><div class='ctx'> 	ebus_dma_prepare(&amp;sun_pci_fd_ebus_dma, mode != DMA_MODE_WRITE);</div><div class='ctx'> }</div><div class='hunk'>@@ -538,80 +530,84 @@ static int sun_pci_fd_test_drive(unsigned long port, int drive)</div><div class='ctx'> #undef MSR</div><div class='ctx'> #undef DOR</div><div class='ctx'> </div><div class='del'>-#endif /* CONFIG_PCI */</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-static int __init ebus_fdthree_p(struct linux_ebus_device *edev)</div><div class='add'>+static int __init ebus_fdthree_p(struct device_node *dp)</div><div class='ctx'> {</div><div class='del'>-	if (!strcmp(edev-&gt;prom_node-&gt;name, "fdthree"))</div><div class='add'>+	if (!strcmp(dp-&gt;name, "fdthree"))</div><div class='ctx'> 		return 1;</div><div class='del'>-	if (!strcmp(edev-&gt;prom_node-&gt;name, "floppy")) {</div><div class='add'>+	if (!strcmp(dp-&gt;name, "floppy")) {</div><div class='ctx'> 		const char *compat;</div><div class='ctx'> </div><div class='del'>-		compat = of_get_property(edev-&gt;prom_node,</div><div class='del'>-					 "compatible", NULL);</div><div class='add'>+		compat = of_get_property(dp, "compatible", NULL);</div><div class='ctx'> 		if (compat &amp;&amp; !strcmp(compat, "fdthree"))</div><div class='ctx'> 			return 1;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> static unsigned long __init sun_floppy_init(void)</div><div class='ctx'> {</div><div class='del'>-	char state[128];</div><div class='del'>-	struct sbus_bus *bus;</div><div class='del'>-	struct sbus_dev *sdev = NULL;</div><div class='ctx'> 	static int initialized = 0;</div><div class='add'>+	struct device_node *dp;</div><div class='add'>+	struct of_device *op;</div><div class='add'>+	const char *prop;</div><div class='add'>+	char state[128];</div><div class='ctx'> </div><div class='ctx'> 	if (initialized)</div><div class='ctx'> 		return sun_floppy_types[0];</div><div class='ctx'> 	initialized = 1;</div><div class='ctx'> </div><div class='del'>-	for_all_sbusdev (sdev, bus) {</div><div class='del'>-		if (!strcmp(sdev-&gt;prom_name, "SUNW,fdtwo"))</div><div class='add'>+	op = NULL;</div><div class='add'>+</div><div class='add'>+	for_each_node_by_name(dp, "SUNW,fdtwo") {</div><div class='add'>+		if (strcmp(dp-&gt;parent-&gt;name, "sbus"))</div><div class='add'>+			continue;</div><div class='add'>+		op = of_find_device_by_node(dp);</div><div class='add'>+		if (op)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='del'>-	if(sdev) {</div><div class='del'>-		floppy_sdev = sdev;</div><div class='del'>-		FLOPPY_IRQ = sdev-&gt;irqs[0];</div><div class='add'>+	if (op) {</div><div class='add'>+		floppy_op = op;</div><div class='add'>+		FLOPPY_IRQ = op-&gt;irqs[0];</div><div class='ctx'> 	} else {</div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-		struct linux_ebus *ebus;</div><div class='del'>-		struct linux_ebus_device *edev = NULL;</div><div class='del'>-		unsigned long config = 0;</div><div class='add'>+		struct device_node *ebus_dp;</div><div class='ctx'> 		void __iomem *auxio_reg;</div><div class='ctx'> 		const char *state_prop;</div><div class='add'>+		unsigned long config;</div><div class='ctx'> </div><div class='del'>-		for_each_ebus(ebus) {</div><div class='del'>-			for_each_ebusdev(edev, ebus) {</div><div class='del'>-				if (ebus_fdthree_p(edev))</div><div class='del'>-					goto ebus_done;</div><div class='add'>+		dp = NULL;</div><div class='add'>+		for_each_node_by_name(ebus_dp, "ebus") {</div><div class='add'>+			for (dp = ebus_dp-&gt;child; dp; dp = dp-&gt;sibling) {</div><div class='add'>+				if (ebus_fdthree_p(dp))</div><div class='add'>+					goto found_fdthree;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-	ebus_done:</div><div class='del'>-		if (!edev)</div><div class='add'>+	found_fdthree:</div><div class='add'>+		if (!dp)</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		op = of_find_device_by_node(dp);</div><div class='add'>+		if (!op)</div><div class='ctx'> 			return 0;</div><div class='ctx'> </div><div class='del'>-		state_prop = of_get_property(edev-&gt;prom_node, "status", NULL);</div><div class='add'>+		state_prop = of_get_property(op-&gt;node, "status", NULL);</div><div class='ctx'> 		if (state_prop &amp;&amp; !strncmp(state_prop, "disabled", 8))</div><div class='ctx'> 			return 0;</div><div class='ctx'> </div><div class='del'>-		FLOPPY_IRQ = edev-&gt;irqs[0];</div><div class='add'>+		FLOPPY_IRQ = op-&gt;irqs[0];</div><div class='ctx'> </div><div class='ctx'> 		/* Make sure the high density bit is set, some systems</div><div class='ctx'> 		 * (most notably Ultra5/Ultra10) come up with it clear.</div><div class='ctx'> 		 */</div><div class='del'>-		auxio_reg = (void __iomem *) edev-&gt;resource[2].start;</div><div class='add'>+		auxio_reg = (void __iomem *) op-&gt;resource[2].start;</div><div class='ctx'> 		writel(readl(auxio_reg)|0x2, auxio_reg);</div><div class='ctx'> </div><div class='del'>-		sun_pci_ebus_dev = ebus-&gt;self;</div><div class='add'>+		sun_floppy_dev = &amp;op-&gt;dev;</div><div class='ctx'> </div><div class='ctx'> 		spin_lock_init(&amp;sun_pci_fd_ebus_dma.lock);</div><div class='ctx'> </div><div class='ctx'> 		/* XXX ioremap */</div><div class='ctx'> 		sun_pci_fd_ebus_dma.regs = (void __iomem *)</div><div class='del'>-			edev-&gt;resource[1].start;</div><div class='add'>+			op-&gt;resource[1].start;</div><div class='ctx'> 		if (!sun_pci_fd_ebus_dma.regs)</div><div class='ctx'> 			return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -625,7 +621,7 @@ static unsigned long __init sun_floppy_init(void)</div><div class='ctx'> 			return 0;</div><div class='ctx'> </div><div class='ctx'> 		/* XXX ioremap */</div><div class='del'>-		sun_fdc = (struct sun_flpy_controller *)edev-&gt;resource[0].start;</div><div class='add'>+		sun_fdc = (struct sun_flpy_controller *) op-&gt;resource[0].start;</div><div class='ctx'> </div><div class='ctx'> 		sun_fdops.fd_inb = sun_pci_fd_inb;</div><div class='ctx'> 		sun_fdops.fd_outb = sun_pci_fd_outb;</div><div class='hunk'>@@ -662,12 +658,15 @@ static unsigned long __init sun_floppy_init(void)</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Find NS87303 SuperIO config registers (through ecpp).</div><div class='ctx'> 		 */</div><div class='del'>-		for_each_ebus(ebus) {</div><div class='del'>-			for_each_ebusdev(edev, ebus) {</div><div class='del'>-				if (!strcmp(edev-&gt;prom_node-&gt;name, "ecpp")) {</div><div class='del'>-					config = edev-&gt;resource[1].start;</div><div class='del'>-					goto config_done;</div><div class='del'>-				}</div><div class='add'>+		config = 0;</div><div class='add'>+		for (dp = ebus_dp-&gt;child; dp; dp = dp-&gt;sibling) {</div><div class='add'>+			if (!strcmp(dp-&gt;name, "ecpp")) {</div><div class='add'>+				struct of_device *ecpp_op;</div><div class='add'>+</div><div class='add'>+				ecpp_op = of_find_device_by_node(dp);</div><div class='add'>+				if (ecpp_op)</div><div class='add'>+					config = ecpp_op-&gt;resource[1].start;</div><div class='add'>+				goto config_done;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	config_done:</div><div class='hunk'>@@ -716,26 +715,23 @@ static unsigned long __init sun_floppy_init(void)</div><div class='ctx'> #endif /* PCI_FDC_SWAP_DRIVES */</div><div class='ctx'> </div><div class='ctx'> 		return sun_floppy_types[0];</div><div class='del'>-#else</div><div class='del'>-		return 0;</div><div class='del'>-#endif</div><div class='ctx'> 	}</div><div class='del'>-	prom_getproperty(sdev-&gt;prom_node, "status", state, sizeof(state));</div><div class='del'>-	if(!strncmp(state, "disabled", 8))</div><div class='add'>+	prop = of_get_property(op-&gt;node, "status", NULL);</div><div class='add'>+	if (prop &amp;&amp; !strncmp(state, "disabled", 8))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * We cannot do sbus_ioremap here: it does request_region,</div><div class='add'>+	 * We cannot do of_ioremap here: it does request_region,</div><div class='ctx'> 	 * which the generic floppy driver tries to do once again.</div><div class='ctx'> 	 * But we must use the sdev resource values as they have</div><div class='ctx'> 	 * had parent ranges applied.</div><div class='ctx'> 	 */</div><div class='ctx'> 	sun_fdc = (struct sun_flpy_controller *)</div><div class='del'>-		(sdev-&gt;resource[0].start +</div><div class='del'>-		 ((sdev-&gt;resource[0].flags &amp; 0x1ffUL) &lt;&lt; 32UL));</div><div class='add'>+		(op-&gt;resource[0].start +</div><div class='add'>+		 ((op-&gt;resource[0].flags &amp; 0x1ffUL) &lt;&lt; 32UL));</div><div class='ctx'> </div><div class='ctx'> 	/* Last minute sanity check... */</div><div class='del'>-	if(sbus_readb(&amp;sun_fdc-&gt;status1_82077) == 0xff) {</div><div class='add'>+	if (sbus_readb(&amp;sun_fdc-&gt;status1_82077) == 0xff) {</div><div class='ctx'> 		sun_fdc = (struct sun_flpy_controller *)-1;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/sparc/include/asm/gpio.h b/arch/sparc/include/asm/gpio.h<br/>new file mode 100644<br/>index 000000000000..a0e3ac0af599<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/gpio.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/gpio.h</a></div><div class='hunk'>@@ -0,0 +1,36 @@</div><div class='add'>+#ifndef __ASM_SPARC_GPIO_H</div><div class='add'>+#define __ASM_SPARC_GPIO_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;asm-generic/gpio.h&gt;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_GPIOLIB</div><div class='add'>+</div><div class='add'>+static inline int gpio_get_value(unsigned int gpio)</div><div class='add'>+{</div><div class='add'>+	return __gpio_get_value(gpio);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void gpio_set_value(unsigned int gpio, int value)</div><div class='add'>+{</div><div class='add'>+	__gpio_set_value(gpio, value);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int gpio_cansleep(unsigned int gpio)</div><div class='add'>+{</div><div class='add'>+	return __gpio_cansleep(gpio);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int gpio_to_irq(unsigned int gpio)</div><div class='add'>+{</div><div class='add'>+	return -ENOSYS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int irq_to_gpio(unsigned int irq)</div><div class='add'>+{</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_GPIOLIB */</div><div class='add'>+</div><div class='add'>+#endif /* __ASM_SPARC_GPIO_H */</div><div class='head'>diff --git a/arch/sparc/include/asm/io-unit.h b/arch/sparc/include/asm/io-unit.h<br/>index 96823b47fd45..01ab2f613e91 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/io-unit.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/include/asm/io-unit.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/io-unit.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/io-unit.h</a></div><div class='hunk'>@@ -55,8 +55,4 @@ struct iounit_struct {</div><div class='ctx'> #define IOUNIT_BMAPM_START	IOUNIT_BMAP2_END</div><div class='ctx'> #define IOUNIT_BMAPM_END	((IOUNIT_DMA_SIZE - IOUNIT_DVMA_SIZE) &gt;&gt; PAGE_SHIFT)</div><div class='ctx'> </div><div class='del'>-extern __u32 iounit_map_dma_init(struct sbus_bus *, int);</div><div class='del'>-#define iounit_map_dma_finish(sbus, addr, len) mmu_release_scsi_one(addr, len, sbus)</div><div class='del'>-extern __u32 iounit_map_dma_page(__u32, void *, struct sbus_bus *);</div><div class='del'>-</div><div class='ctx'> #endif /* !(_SPARC_IO_UNIT_H) */</div><div class='head'>diff --git a/arch/sparc/include/asm/io_32.h b/arch/sparc/include/asm/io_32.h<br/>index 10d7da450070..93fe21e02c86 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/io_32.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/include/asm/io_32.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/io_32.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/io_32.h</a></div><div class='hunk'>@@ -293,14 +293,6 @@ extern void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max);</div><div class='ctx'> extern void pci_iounmap(struct pci_dev *dev, void __iomem *);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Bus number may be in res-&gt;flags... somewhere.</div><div class='del'>- */</div><div class='del'>-extern void __iomem *sbus_ioremap(struct resource *res, unsigned long offset,</div><div class='del'>-    unsigned long size, char *name);</div><div class='del'>-extern void sbus_iounmap(volatile void __iomem *vaddr, unsigned long size);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * At the moment, we do not use CMOS_READ anywhere outside of rtc.c,</div><div class='ctx'>  * so rtc_port is static in it. This should not change unless a new</div><div class='ctx'>  * hardware pops up.</div><div class='hunk'>@@ -308,6 +300,17 @@ extern void sbus_iounmap(volatile void __iomem *vaddr, unsigned long size);</div><div class='ctx'> #define RTC_PORT(x)   (rtc_port + (x))</div><div class='ctx'> #define RTC_ALWAYS_BCD  0</div><div class='ctx'> </div><div class='add'>+static inline int sbus_can_dma_64bit(void)</div><div class='add'>+{</div><div class='add'>+	return 0; /* actually, sparc_cpu_model==sun4d */</div><div class='add'>+}</div><div class='add'>+static inline int sbus_can_burst64(void)</div><div class='add'>+{</div><div class='add'>+	return 0; /* actually, sparc_cpu_model==sun4d */</div><div class='add'>+}</div><div class='add'>+struct device;</div><div class='add'>+extern void sbus_set_sbus64(struct device *, int);</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #define __ARCH_HAS_NO_PAGE_ZERO_MAPPED		1</div><div class='head'>diff --git a/arch/sparc/include/asm/io_64.h b/arch/sparc/include/asm/io_64.h<br/>index 0bff078ffdd0..4aee21dc9c6f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/io_64.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/include/asm/io_64.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/io_64.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/io_64.h</a></div><div class='hunk'>@@ -482,18 +482,16 @@ struct pci_dev;</div><div class='ctx'> extern void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max);</div><div class='ctx'> extern void pci_iounmap(struct pci_dev *dev, void __iomem *);</div><div class='ctx'> </div><div class='del'>-/* Similarly for SBUS. */</div><div class='del'>-#define sbus_ioremap(__res, __offset, __size, __name) \</div><div class='del'>-({	unsigned long __ret; \</div><div class='del'>-	__ret  = (__res)-&gt;start + (((__res)-&gt;flags &amp; 0x1ffUL) &lt;&lt; 32UL); \</div><div class='del'>-	__ret += (unsigned long) (__offset); \</div><div class='del'>-	if (! request_region((__ret), (__size), (__name))) \</div><div class='del'>-		__ret = 0UL; \</div><div class='del'>-	(void __iomem *) __ret; \</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-#define sbus_iounmap(__addr, __size)	\</div><div class='del'>-	release_region((unsigned long)(__addr), (__size))</div><div class='add'>+static inline int sbus_can_dma_64bit(void)</div><div class='add'>+{</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+static inline int sbus_can_burst64(void)</div><div class='add'>+{</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+struct device;</div><div class='add'>+extern void sbus_set_sbus64(struct device *, int);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Convert a physical pointer to a virtual kernel pointer for /dev/mem</div><div class='head'>diff --git a/arch/sparc/include/asm/iommu_64.h b/arch/sparc/include/asm/iommu_64.h<br/>index d7b9afcba08b..caf798b56191 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/iommu_64.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/include/asm/iommu_64.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/iommu_64.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/iommu_64.h</a></div><div class='hunk'>@@ -48,6 +48,9 @@ struct strbuf {</div><div class='ctx'> 	unsigned long		strbuf_control;</div><div class='ctx'> 	unsigned long		strbuf_pflush;</div><div class='ctx'> 	unsigned long		strbuf_fsync;</div><div class='add'>+	unsigned long		strbuf_err_stat;</div><div class='add'>+	unsigned long		strbuf_tag_diag;</div><div class='add'>+	unsigned long		strbuf_line_diag;</div><div class='ctx'> 	unsigned long		strbuf_ctxflush;</div><div class='ctx'> 	unsigned long		strbuf_ctxmatch_base;</div><div class='ctx'> 	unsigned long		strbuf_flushflag_pa;</div><div class='head'>diff --git a/arch/sparc/include/asm/irq_64.h b/arch/sparc/include/asm/irq_64.h<br/>index e3dd9303643d..71673eca3660 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/irq_64.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/include/asm/irq_64.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/irq_64.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/irq_64.h</a></div><div class='hunk'>@@ -56,7 +56,6 @@ extern unsigned int sun4u_build_msi(u32 portid, unsigned int *virt_irq_p,</div><div class='ctx'> 				    unsigned long imap_base,</div><div class='ctx'> 				    unsigned long iclr_base);</div><div class='ctx'> extern void sun4u_destroy_msi(unsigned int virt_irq);</div><div class='del'>-extern unsigned int sbus_build_irq(void *sbus, unsigned int ino);</div><div class='ctx'> </div><div class='ctx'> extern unsigned char virt_irq_alloc(unsigned int dev_handle,</div><div class='ctx'> 				    unsigned int dev_ino);</div><div class='head'>diff --git a/arch/sparc/include/asm/mc146818rtc_64.h b/arch/sparc/include/asm/mc146818rtc_64.h<br/>index e9c0fcc25c6f..7238d174e0e3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/mc146818rtc_64.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/include/asm/mc146818rtc_64.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/mc146818rtc_64.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/mc146818rtc_64.h</a></div><div class='hunk'>@@ -7,12 +7,8 @@</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifndef RTC_PORT</div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-extern unsigned long ds1287_regs;</div><div class='del'>-#else</div><div class='del'>-#define ds1287_regs (0UL)</div><div class='del'>-#endif</div><div class='del'>-#define RTC_PORT(x)	(ds1287_regs + (x))</div><div class='add'>+extern unsigned long cmos_regs;</div><div class='add'>+#define RTC_PORT(x)	(cmos_regs + (x))</div><div class='ctx'> #define RTC_ALWAYS_BCD	0</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -29,6 +25,4 @@ outb_p((addr),RTC_PORT(0)); \</div><div class='ctx'> outb_p((val),RTC_PORT(1)); \</div><div class='ctx'> })</div><div class='ctx'> </div><div class='del'>-#define RTC_IRQ 8</div><div class='del'>-</div><div class='ctx'> #endif /* __ASM_SPARC64_MC146818RTC_H */</div><div class='head'>diff --git a/arch/sparc/include/asm/memctrl.h b/arch/sparc/include/asm/memctrl.h<br/>new file mode 100644<br/>index 000000000000..4065c56af7b6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/memctrl.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/memctrl.h</a></div><div class='hunk'>@@ -0,0 +1,9 @@</div><div class='add'>+#ifndef _SPARC_MEMCTRL_H</div><div class='add'>+#define _SPARC_MEMCTRL_H</div><div class='add'>+</div><div class='add'>+typedef int (*dimm_printer_t)(int synd_code, unsigned long paddr, char *buf, int buflen);</div><div class='add'>+</div><div class='add'>+int register_dimm_printer(dimm_printer_t func);</div><div class='add'>+void unregister_dimm_printer(dimm_printer_t func);</div><div class='add'>+</div><div class='add'>+#endif /* _SPARC_MEMCTRL_H */</div><div class='head'>diff --git a/arch/sparc/include/asm/mostek.h b/arch/sparc/include/asm/mostek.h<br/>deleted file mode 100644<br/>index 433be3e0a69b..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/mostek.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/include/asm/mostek.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,8 +0,0 @@</div><div class='del'>-#ifndef ___ASM_SPARC_MOSTEK_H</div><div class='del'>-#define ___ASM_SPARC_MOSTEK_H</div><div class='del'>-#if defined(__sparc__) &amp;&amp; defined(__arch64__)</div><div class='del'>-#include &lt;asm/mostek_64.h&gt;</div><div class='del'>-#else</div><div class='del'>-#include &lt;asm/mostek_32.h&gt;</div><div class='del'>-#endif</div><div class='del'>-#endif</div><div class='head'>diff --git a/arch/sparc/include/asm/mostek_32.h b/arch/sparc/include/asm/mostek_32.h<br/>deleted file mode 100644<br/>index a99590c4c507..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/mostek_32.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/include/asm/mostek_32.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,171 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * mostek.h:  Describes the various Mostek time of day clock registers.</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)</div><div class='del'>- * Copyright (C) 1996 Thomas K. Dyas (tdyas@eden.rutgers.edu)</div><div class='del'>- * Added intersil code 05/25/98 Chris Davis (cdavis@cois.on.ca)</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _SPARC_MOSTEK_H</div><div class='del'>-#define _SPARC_MOSTEK_H</div><div class='del'>-</div><div class='del'>-#include &lt;asm/idprom.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-</div><div class='del'>-/*       M48T02 Register Map (adapted from Sun NVRAM/Hostid FAQ)</div><div class='del'>- *</div><div class='del'>- *                             Data</div><div class='del'>- * Address                                                 Function</div><div class='del'>- *        Bit 7 Bit 6 Bit 5 Bit 4Bit 3 Bit 2 Bit 1 Bit 0</div><div class='del'>- *   7ff  -     -     -     -    -     -     -     -       Year 00-99</div><div class='del'>- *   7fe  0     0     0     -    -     -     -     -      Month 01-12</div><div class='del'>- *   7fd  0     0     -     -    -     -     -     -       Date 01-31</div><div class='del'>- *   7fc  0     FT    0     0    0     -     -     -        Day 01-07</div><div class='del'>- *   7fb  KS    0     -     -    -     -     -     -      Hours 00-23</div><div class='del'>- *   7fa  0     -     -     -    -     -     -     -    Minutes 00-59</div><div class='del'>- *   7f9  ST    -     -     -    -     -     -     -    Seconds 00-59</div><div class='del'>- *   7f8  W     R     S     -    -     -     -     -    Control</div><div class='del'>- *</div><div class='del'>- *   * ST is STOP BIT</div><div class='del'>- *   * W is WRITE BIT</div><div class='del'>- *   * R is READ BIT</div><div class='del'>- *   * S is SIGN BIT</div><div class='del'>- *   * FT is FREQ TEST BIT</div><div class='del'>- *   * KS is KICK START BIT</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* The Mostek 48t02 real time clock and NVRAM chip. The registers</div><div class='del'>- * other than the control register are in binary coded decimal. Some</div><div class='del'>- * control bits also live outside the control register.</div><div class='del'>- */</div><div class='del'>-#define mostek_read(_addr)		readb(_addr)</div><div class='del'>-#define mostek_write(_addr,_val)	writeb(_val, _addr)</div><div class='del'>-#define MOSTEK_EEPROM		0x0000UL</div><div class='del'>-#define MOSTEK_IDPROM		0x07d8UL</div><div class='del'>-#define MOSTEK_CREG		0x07f8UL</div><div class='del'>-#define MOSTEK_SEC		0x07f9UL</div><div class='del'>-#define MOSTEK_MIN		0x07faUL</div><div class='del'>-#define MOSTEK_HOUR		0x07fbUL</div><div class='del'>-#define MOSTEK_DOW		0x07fcUL</div><div class='del'>-#define MOSTEK_DOM		0x07fdUL</div><div class='del'>-#define MOSTEK_MONTH		0x07feUL</div><div class='del'>-#define MOSTEK_YEAR		0x07ffUL</div><div class='del'>-</div><div class='del'>-struct mostek48t02 {</div><div class='del'>-	volatile char eeprom[2008];	/* This is the eeprom, don't touch! */</div><div class='del'>-	struct idprom idprom;		/* The idprom lives here. */</div><div class='del'>-	volatile unsigned char creg;	/* Control register */</div><div class='del'>-	volatile unsigned char sec;	/* Seconds (0-59) */</div><div class='del'>-	volatile unsigned char min;	/* Minutes (0-59) */</div><div class='del'>-	volatile unsigned char hour;	/* Hour (0-23) */</div><div class='del'>-	volatile unsigned char dow;	/* Day of the week (1-7) */</div><div class='del'>-	volatile unsigned char dom;	/* Day of the month (1-31) */</div><div class='del'>-	volatile unsigned char month;	/* Month of year (1-12) */</div><div class='del'>-	volatile unsigned char year;	/* Year (0-99) */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-extern spinlock_t mostek_lock;</div><div class='del'>-extern void __iomem *mstk48t02_regs;</div><div class='del'>-</div><div class='del'>-/* Control register values. */</div><div class='del'>-#define	MSTK_CREG_WRITE	0x80	/* Must set this before placing values. */</div><div class='del'>-#define	MSTK_CREG_READ	0x40	/* Stop updates to allow a clean read. */</div><div class='del'>-#define	MSTK_CREG_SIGN	0x20	/* Slow/speed clock in calibration mode. */</div><div class='del'>-</div><div class='del'>-/* Control bits that live in the other registers. */</div><div class='del'>-#define	MSTK_STOP	0x80	/* Stop the clock oscillator. (sec) */</div><div class='del'>-#define	MSTK_KICK_START	0x80	/* Kick start the clock chip. (hour) */</div><div class='del'>-#define MSTK_FREQ_TEST	0x40	/* Frequency test mode. (day) */</div><div class='del'>-</div><div class='del'>-#define MSTK_YEAR_ZERO       1968   /* If year reg has zero, it is 1968. */</div><div class='del'>-#define MSTK_CVT_YEAR(yr)  ((yr) + MSTK_YEAR_ZERO)</div><div class='del'>-</div><div class='del'>-/* Masks that define how much space each value takes up. */</div><div class='del'>-#define	MSTK_SEC_MASK	0x7f</div><div class='del'>-#define	MSTK_MIN_MASK	0x7f</div><div class='del'>-#define	MSTK_HOUR_MASK	0x3f</div><div class='del'>-#define	MSTK_DOW_MASK	0x07</div><div class='del'>-#define	MSTK_DOM_MASK	0x3f</div><div class='del'>-#define	MSTK_MONTH_MASK	0x1f</div><div class='del'>-#define	MSTK_YEAR_MASK	0xffU</div><div class='del'>-</div><div class='del'>-/* Binary coded decimal conversion macros. */</div><div class='del'>-#define MSTK_REGVAL_TO_DECIMAL(x)  (((x) &amp; 0x0F) + 0x0A * ((x) &gt;&gt; 0x04))</div><div class='del'>-#define MSTK_DECIMAL_TO_REGVAL(x)  ((((x) / 0x0A) &lt;&lt; 0x04) + ((x) % 0x0A))</div><div class='del'>-</div><div class='del'>-/* Generic register set and get macros for internal use. */</div><div class='del'>-#define MSTK_GET(regs,var,mask) (MSTK_REGVAL_TO_DECIMAL(((struct mostek48t02 *)regs)-&gt;var &amp; MSTK_ ## mask ## _MASK))</div><div class='del'>-#define MSTK_SET(regs,var,value,mask) do { ((struct mostek48t02 *)regs)-&gt;var &amp;= ~(MSTK_ ## mask ## _MASK); ((struct mostek48t02 *)regs)-&gt;var |= MSTK_DECIMAL_TO_REGVAL(value) &amp; (MSTK_ ## mask ## _MASK); } while (0)</div><div class='del'>-</div><div class='del'>-/* Macros to make register access easier on our fingers. These give you</div><div class='del'>- * the decimal value of the register requested if applicable. You pass</div><div class='del'>- * the a pointer to a 'struct mostek48t02'.</div><div class='del'>- */</div><div class='del'>-#define	MSTK_REG_CREG(regs)	(((struct mostek48t02 *)regs)-&gt;creg)</div><div class='del'>-#define	MSTK_REG_SEC(regs)	MSTK_GET(regs,sec,SEC)</div><div class='del'>-#define	MSTK_REG_MIN(regs)	MSTK_GET(regs,min,MIN)</div><div class='del'>-#define	MSTK_REG_HOUR(regs)	MSTK_GET(regs,hour,HOUR)</div><div class='del'>-#define	MSTK_REG_DOW(regs)	MSTK_GET(regs,dow,DOW)</div><div class='del'>-#define	MSTK_REG_DOM(regs)	MSTK_GET(regs,dom,DOM)</div><div class='del'>-#define	MSTK_REG_MONTH(regs)	MSTK_GET(regs,month,MONTH)</div><div class='del'>-#define	MSTK_REG_YEAR(regs)	MSTK_GET(regs,year,YEAR)</div><div class='del'>-</div><div class='del'>-#define	MSTK_SET_REG_SEC(regs,value)	MSTK_SET(regs,sec,value,SEC)</div><div class='del'>-#define	MSTK_SET_REG_MIN(regs,value)	MSTK_SET(regs,min,value,MIN)</div><div class='del'>-#define	MSTK_SET_REG_HOUR(regs,value)	MSTK_SET(regs,hour,value,HOUR)</div><div class='del'>-#define	MSTK_SET_REG_DOW(regs,value)	MSTK_SET(regs,dow,value,DOW)</div><div class='del'>-#define	MSTK_SET_REG_DOM(regs,value)	MSTK_SET(regs,dom,value,DOM)</div><div class='del'>-#define	MSTK_SET_REG_MONTH(regs,value)	MSTK_SET(regs,month,value,MONTH)</div><div class='del'>-#define	MSTK_SET_REG_YEAR(regs,value)	MSTK_SET(regs,year,value,YEAR)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* The Mostek 48t08 clock chip. Found on Sun4m's I think. It has the</div><div class='del'>- * same (basically) layout of the 48t02 chip except for the extra</div><div class='del'>- * NVRAM on board (8 KB against the 48t02's 2 KB).</div><div class='del'>- */</div><div class='del'>-struct mostek48t08 {</div><div class='del'>-	char offset[6*1024];         /* Magic things may be here, who knows? */</div><div class='del'>-	struct mostek48t02 regs;     /* Here is what we are interested in.   */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SUN4</div><div class='del'>-enum sparc_clock_type {	MSTK48T02, MSTK48T08, \</div><div class='del'>-INTERSIL, MSTK_INVALID };</div><div class='del'>-#else</div><div class='del'>-enum sparc_clock_type {	MSTK48T02, MSTK48T08, \</div><div class='del'>-MSTK_INVALID };</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SUN4</div><div class='del'>-/* intersil on a sun 4/260 code  data from harris doc */</div><div class='del'>-struct intersil_dt {</div><div class='del'>-        volatile unsigned char int_csec;</div><div class='del'>-        volatile unsigned char int_hour;</div><div class='del'>-        volatile unsigned char int_min;</div><div class='del'>-        volatile unsigned char int_sec;</div><div class='del'>-        volatile unsigned char int_month;</div><div class='del'>-        volatile unsigned char int_day;</div><div class='del'>-        volatile unsigned char int_year;</div><div class='del'>-        volatile unsigned char int_dow;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct intersil {</div><div class='del'>-	struct intersil_dt clk;</div><div class='del'>-	struct intersil_dt cmp;</div><div class='del'>-	volatile unsigned char int_intr_reg;</div><div class='del'>-	volatile unsigned char int_cmd_reg;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define INTERSIL_STOP        0x0</div><div class='del'>-#define INTERSIL_START       0x8</div><div class='del'>-#define INTERSIL_INTR_DISABLE   0x0</div><div class='del'>-#define INTERSIL_INTR_ENABLE   0x10</div><div class='del'>-#define INTERSIL_32K		0x0</div><div class='del'>-#define INTERSIL_NORMAL		0x0</div><div class='del'>-#define INTERSIL_24H		0x4</div><div class='del'>-#define INTERSIL_INT_100HZ	0x2</div><div class='del'>-</div><div class='del'>-/* end of intersil info */</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#endif /* !(_SPARC_MOSTEK_H) */</div><div class='head'>diff --git a/arch/sparc/include/asm/mostek_64.h b/arch/sparc/include/asm/mostek_64.h<br/>deleted file mode 100644<br/>index c5652de2ace2..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/mostek_64.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/include/asm/mostek_64.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,143 +0,0 @@</div><div class='del'>-/* mostek.h:  Describes the various Mostek time of day clock registers.</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1995 David S. Miller (davem@davemloft.net)</div><div class='del'>- * Copyright (C) 1996 Thomas K. Dyas (tdyas@eden.rutgers.edu)</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _SPARC64_MOSTEK_H</div><div class='del'>-#define _SPARC64_MOSTEK_H</div><div class='del'>-</div><div class='del'>-#include &lt;asm/idprom.h&gt;</div><div class='del'>-</div><div class='del'>-/*       M48T02 Register Map (adapted from Sun NVRAM/Hostid FAQ)</div><div class='del'>- *</div><div class='del'>- *                             Data</div><div class='del'>- * Address                                                 Function</div><div class='del'>- *        Bit 7 Bit 6 Bit 5 Bit 4Bit 3 Bit 2 Bit 1 Bit 0</div><div class='del'>- *   7ff  -     -     -     -    -     -     -     -       Year 00-99</div><div class='del'>- *   7fe  0     0     0     -    -     -     -     -      Month 01-12</div><div class='del'>- *   7fd  0     0     -     -    -     -     -     -       Date 01-31</div><div class='del'>- *   7fc  0     FT    0     0    0     -     -     -        Day 01-07</div><div class='del'>- *   7fb  KS    0     -     -    -     -     -     -      Hours 00-23</div><div class='del'>- *   7fa  0     -     -     -    -     -     -     -    Minutes 00-59</div><div class='del'>- *   7f9  ST    -     -     -    -     -     -     -    Seconds 00-59</div><div class='del'>- *   7f8  W     R     S     -    -     -     -     -    Control</div><div class='del'>- *</div><div class='del'>- *   * ST is STOP BIT</div><div class='del'>- *   * W is WRITE BIT</div><div class='del'>- *   * R is READ BIT</div><div class='del'>- *   * S is SIGN BIT</div><div class='del'>- *   * FT is FREQ TEST BIT</div><div class='del'>- *   * KS is KICK START BIT</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* The Mostek 48t02 real time clock and NVRAM chip. The registers</div><div class='del'>- * other than the control register are in binary coded decimal. Some</div><div class='del'>- * control bits also live outside the control register.</div><div class='del'>- *</div><div class='del'>- * We now deal with physical addresses for I/O to the chip. -DaveM</div><div class='del'>- */</div><div class='del'>-static inline u8 mostek_read(void __iomem *addr)</div><div class='del'>-{</div><div class='del'>-	u8 ret;</div><div class='del'>-</div><div class='del'>-	__asm__ __volatile__("lduba	[%1] %2, %0"</div><div class='del'>-			     : "=r" (ret)</div><div class='del'>-			     : "r" (addr), "i" (ASI_PHYS_BYPASS_EC_E));</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void mostek_write(void __iomem *addr, u8 val)</div><div class='del'>-{</div><div class='del'>-	__asm__ __volatile__("stba	%0, [%1] %2"</div><div class='del'>-			     : /* no outputs */</div><div class='del'>-			     : "r" (val), "r" (addr), "i" (ASI_PHYS_BYPASS_EC_E));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define MOSTEK_EEPROM		0x0000UL</div><div class='del'>-#define MOSTEK_IDPROM		0x07d8UL</div><div class='del'>-#define MOSTEK_CREG		0x07f8UL</div><div class='del'>-#define MOSTEK_SEC		0x07f9UL</div><div class='del'>-#define MOSTEK_MIN		0x07faUL</div><div class='del'>-#define MOSTEK_HOUR		0x07fbUL</div><div class='del'>-#define MOSTEK_DOW		0x07fcUL</div><div class='del'>-#define MOSTEK_DOM		0x07fdUL</div><div class='del'>-#define MOSTEK_MONTH		0x07feUL</div><div class='del'>-#define MOSTEK_YEAR		0x07ffUL</div><div class='del'>-</div><div class='del'>-extern spinlock_t mostek_lock;</div><div class='del'>-extern void __iomem *mstk48t02_regs;</div><div class='del'>-</div><div class='del'>-/* Control register values. */</div><div class='del'>-#define	MSTK_CREG_WRITE	0x80	/* Must set this before placing values. */</div><div class='del'>-#define	MSTK_CREG_READ	0x40	/* Stop updates to allow a clean read. */</div><div class='del'>-#define	MSTK_CREG_SIGN	0x20	/* Slow/speed clock in calibration mode. */</div><div class='del'>-</div><div class='del'>-/* Control bits that live in the other registers. */</div><div class='del'>-#define	MSTK_STOP	0x80	/* Stop the clock oscillator. (sec) */</div><div class='del'>-#define	MSTK_KICK_START	0x80	/* Kick start the clock chip. (hour) */</div><div class='del'>-#define MSTK_FREQ_TEST	0x40	/* Frequency test mode. (day) */</div><div class='del'>-</div><div class='del'>-#define MSTK_YEAR_ZERO       1968   /* If year reg has zero, it is 1968. */</div><div class='del'>-#define MSTK_CVT_YEAR(yr)  ((yr) + MSTK_YEAR_ZERO)</div><div class='del'>-</div><div class='del'>-/* Masks that define how much space each value takes up. */</div><div class='del'>-#define	MSTK_SEC_MASK	0x7f</div><div class='del'>-#define	MSTK_MIN_MASK	0x7f</div><div class='del'>-#define	MSTK_HOUR_MASK	0x3f</div><div class='del'>-#define	MSTK_DOW_MASK	0x07</div><div class='del'>-#define	MSTK_DOM_MASK	0x3f</div><div class='del'>-#define	MSTK_MONTH_MASK	0x1f</div><div class='del'>-#define	MSTK_YEAR_MASK	0xffU</div><div class='del'>-</div><div class='del'>-/* Binary coded decimal conversion macros. */</div><div class='del'>-#define MSTK_REGVAL_TO_DECIMAL(x)  (((x) &amp; 0x0F) + 0x0A * ((x) &gt;&gt; 0x04))</div><div class='del'>-#define MSTK_DECIMAL_TO_REGVAL(x)  ((((x) / 0x0A) &lt;&lt; 0x04) + ((x) % 0x0A))</div><div class='del'>-</div><div class='del'>-/* Generic register set and get macros for internal use. */</div><div class='del'>-#define MSTK_GET(regs,name)	\</div><div class='del'>-	(MSTK_REGVAL_TO_DECIMAL(mostek_read(regs + MOSTEK_ ## name) &amp; MSTK_ ## name ## _MASK))</div><div class='del'>-#define MSTK_SET(regs,name,value) \</div><div class='del'>-do {	u8 __val = mostek_read(regs + MOSTEK_ ## name); \</div><div class='del'>-	__val &amp;= ~(MSTK_ ## name ## _MASK); \</div><div class='del'>-	__val |= (MSTK_DECIMAL_TO_REGVAL(value) &amp; \</div><div class='del'>-		  (MSTK_ ## name ## _MASK)); \</div><div class='del'>-	mostek_write(regs + MOSTEK_ ## name, __val); \</div><div class='del'>-} while(0)</div><div class='del'>-</div><div class='del'>-/* Macros to make register access easier on our fingers. These give you</div><div class='del'>- * the decimal value of the register requested if applicable. You pass</div><div class='del'>- * the a pointer to a 'struct mostek48t02'.</div><div class='del'>- */</div><div class='del'>-#define	MSTK_REG_CREG(regs)	(mostek_read((regs) + MOSTEK_CREG))</div><div class='del'>-#define	MSTK_REG_SEC(regs)	MSTK_GET(regs,SEC)</div><div class='del'>-#define	MSTK_REG_MIN(regs)	MSTK_GET(regs,MIN)</div><div class='del'>-#define	MSTK_REG_HOUR(regs)	MSTK_GET(regs,HOUR)</div><div class='del'>-#define	MSTK_REG_DOW(regs)	MSTK_GET(regs,DOW)</div><div class='del'>-#define	MSTK_REG_DOM(regs)	MSTK_GET(regs,DOM)</div><div class='del'>-#define	MSTK_REG_MONTH(regs)	MSTK_GET(regs,MONTH)</div><div class='del'>-#define	MSTK_REG_YEAR(regs)	MSTK_GET(regs,YEAR)</div><div class='del'>-</div><div class='del'>-#define	MSTK_SET_REG_SEC(regs,value)	MSTK_SET(regs,SEC,value)</div><div class='del'>-#define	MSTK_SET_REG_MIN(regs,value)	MSTK_SET(regs,MIN,value)</div><div class='del'>-#define	MSTK_SET_REG_HOUR(regs,value)	MSTK_SET(regs,HOUR,value)</div><div class='del'>-#define	MSTK_SET_REG_DOW(regs,value)	MSTK_SET(regs,DOW,value)</div><div class='del'>-#define	MSTK_SET_REG_DOM(regs,value)	MSTK_SET(regs,DOM,value)</div><div class='del'>-#define	MSTK_SET_REG_MONTH(regs,value)	MSTK_SET(regs,MONTH,value)</div><div class='del'>-#define	MSTK_SET_REG_YEAR(regs,value)	MSTK_SET(regs,YEAR,value)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* The Mostek 48t08 clock chip. Found on Sun4m's I think. It has the</div><div class='del'>- * same (basically) layout of the 48t02 chip except for the extra</div><div class='del'>- * NVRAM on board (8 KB against the 48t02's 2 KB).</div><div class='del'>- */</div><div class='del'>-#define MOSTEK_48T08_OFFSET	0x0000UL	/* Lower NVRAM portions */</div><div class='del'>-#define MOSTEK_48T08_48T02	0x1800UL	/* Offset to 48T02 chip */</div><div class='del'>-</div><div class='del'>-/* SUN5 systems usually have 48t59 model clock chipsets.  But we keep the older</div><div class='del'>- * clock chip definitions around just in case.</div><div class='del'>- */</div><div class='del'>-#define MOSTEK_48T59_OFFSET	0x0000UL	/* Lower NVRAM portions */</div><div class='del'>-#define MOSTEK_48T59_48T02	0x1800UL	/* Offset to 48T02 chip */</div><div class='del'>-</div><div class='del'>-#endif /* !(_SPARC64_MOSTEK_H) */</div><div class='head'>diff --git a/arch/sparc/include/asm/obio.h b/arch/sparc/include/asm/obio.h<br/>index 1a7544ceb574..4ade0c8a2c79 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/obio.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/include/asm/obio.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/obio.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/obio.h</a></div><div class='hunk'>@@ -155,17 +155,6 @@ static inline void bw_set_ctrl(int cpu, unsigned ctrl)</div><div class='ctx'> 			      "i" (ASI_M_CTL));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-extern unsigned char cpu_leds[32];</div><div class='del'>-</div><div class='del'>-static inline void show_leds(int cpuid)</div><div class='del'>-{</div><div class='del'>-	cpuid &amp;= 0x1e;</div><div class='del'>-	__asm__ __volatile__ ("stba %0, [%1] %2" : :</div><div class='del'>-			      "r" ((cpu_leds[cpuid] &lt;&lt; 4) | cpu_leds[cpuid+1]),</div><div class='del'>-			      "r" (ECSR_BASE(cpuid) | BB_LEDS),</div><div class='del'>-			      "i" (ASI_M_CTL));</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline unsigned cc_get_ipen(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned pending;</div><div class='head'>diff --git a/arch/sparc/include/asm/of_device.h b/arch/sparc/include/asm/of_device.h<br/>index bba777a416d3..a5d9811f9697 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/of_device.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/include/asm/of_device.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/of_device.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/of_device.h</a></div><div class='hunk'>@@ -30,6 +30,8 @@ struct of_device</div><div class='ctx'> extern void __iomem *of_ioremap(struct resource *res, unsigned long offset, unsigned long size, char *name);</div><div class='ctx'> extern void of_iounmap(struct resource *res, void __iomem *base, unsigned long size);</div><div class='ctx'> </div><div class='add'>+extern void of_propagate_archdata(struct of_device *bus);</div><div class='add'>+</div><div class='ctx'> /* This is just here during the transition */</div><div class='ctx'> #include &lt;linux/of_platform.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sparc/include/asm/of_platform.h b/arch/sparc/include/asm/of_platform.h<br/>index 2348ab90a57c..90da99059f83 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/of_platform.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/include/asm/of_platform.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/of_platform.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/of_platform.h</a></div><div class='hunk'>@@ -13,9 +13,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-extern struct bus_type ebus_bus_type;</div><div class='del'>-extern struct bus_type sbus_bus_type;</div><div class='del'>-</div><div class='ctx'> #define of_bus_type	of_platform_bus_type	/* for compatibility */</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/sparc/include/asm/oplib_32.h b/arch/sparc/include/asm/oplib_32.h<br/>index b2631da259e0..699da05235c8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/oplib_32.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/include/asm/oplib_32.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/oplib_32.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/oplib_32.h</a></div><div class='hunk'>@@ -21,7 +21,6 @@ enum prom_major_version {</div><div class='ctx'> 	PROM_V2,      /* sun4c and early sun4m V2 prom */</div><div class='ctx'> 	PROM_V3,      /* sun4m and later, up to sun4d/sun4e machines V3 */</div><div class='ctx'> 	PROM_P1275,   /* IEEE compliant ISA based Sun PROM, only sun4u */</div><div class='del'>-	PROM_SUN4,    /* Old sun4 proms are totally different, but we'll shoehorn it to make it fit */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern enum prom_major_version prom_vers;</div><div class='head'>diff --git a/arch/sparc/include/asm/page_32.h b/arch/sparc/include/asm/page_32.h<br/>index cf5fb70ca1c1..d1806edc0958 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/page_32.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/include/asm/page_32.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/page_32.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/page_32.h</a></div><div class='hunk'>@@ -8,11 +8,8 @@</div><div class='ctx'> #ifndef _SPARC_PAGE_H</div><div class='ctx'> #define _SPARC_PAGE_H</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SUN4</div><div class='del'>-#define PAGE_SHIFT   13</div><div class='del'>-#else</div><div class='ctx'> #define PAGE_SHIFT   12</div><div class='del'>-#endif</div><div class='add'>+</div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='ctx'> /* I have my suspicions... -DaveM */</div><div class='ctx'> #define PAGE_SIZE    (1UL &lt;&lt; PAGE_SHIFT)</div><div class='head'>diff --git a/arch/sparc/include/asm/page_64.h b/arch/sparc/include/asm/page_64.h<br/>index b579b910ef51..4274ed13ddb2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/page_64.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/include/asm/page_64.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/page_64.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/page_64.h</a></div><div class='hunk'>@@ -38,6 +38,8 @@</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='ctx'> </div><div class='add'>+#define WANT_PAGE_VIRTUAL</div><div class='add'>+</div><div class='ctx'> extern void _clear_page(void *page);</div><div class='ctx'> #define clear_page(X)	_clear_page((void *)(X))</div><div class='ctx'> struct page;</div><div class='head'>diff --git a/arch/sparc/include/asm/parport.h b/arch/sparc/include/asm/parport.h<br/>index d9830621c906..dff3f0253aa8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/parport.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/include/asm/parport.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/parport.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/parport.h</a></div><div class='hunk'>@@ -8,7 +8,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/of_device.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/ebus.h&gt;</div><div class='add'>+#include &lt;asm/ebus_dma.h&gt;</div><div class='ctx'> #include &lt;asm/ns87303.h&gt;</div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -215,7 +215,7 @@ static int __devexit ecpp_remove(struct of_device *op)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct of_device_id ecpp_match[] = {</div><div class='add'>+static const struct of_device_id ecpp_match[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.name = "ecpp",</div><div class='ctx'> 	},</div><div class='head'>diff --git a/arch/sparc/include/asm/pci_32.h b/arch/sparc/include/asm/pci_32.h<br/>index 0ee949d220c0..b41c4c198159 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/pci_32.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/include/asm/pci_32.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/pci_32.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/pci_32.h</a></div><div class='hunk'>@@ -3,6 +3,8 @@</div><div class='ctx'> </div><div class='ctx'> #ifdef __KERNEL__</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+</div><div class='ctx'> /* Can be used to override the logic in pci_scan_bus for skipping</div><div class='ctx'>  * already-configured bus numbers - to be used for buggy BIOSes</div><div class='ctx'>  * or architectures with incomplete PCI setup by the loader.</div><div class='head'>diff --git a/arch/sparc/include/asm/pgtable_32.h b/arch/sparc/include/asm/pgtable_32.h<br/>index 08237fda8874..e0cabe790ec1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/pgtable_32.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/include/asm/pgtable_32.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/pgtable_32.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/pgtable_32.h</a></div><div class='hunk'>@@ -14,11 +14,7 @@</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/swap.h&gt;</div><div class='ctx'> #include &lt;asm/types.h&gt;</div><div class='del'>-#ifdef CONFIG_SUN4</div><div class='del'>-#include &lt;asm/pgtsun4.h&gt;</div><div class='del'>-#else</div><div class='ctx'> #include &lt;asm/pgtsun4c.h&gt;</div><div class='del'>-#endif</div><div class='ctx'> #include &lt;asm/pgtsrmmu.h&gt;</div><div class='ctx'> #include &lt;asm/vac-ops.h&gt;</div><div class='ctx'> #include &lt;asm/oplib.h&gt;</div><div class='head'>diff --git a/arch/sparc/include/asm/pgtable_64.h b/arch/sparc/include/asm/pgtable_64.h<br/>index bb9ec2cce355..b049abf9902f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/pgtable_64.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/include/asm/pgtable_64.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/pgtable_64.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/pgtable_64.h</a></div><div class='hunk'>@@ -770,6 +770,8 @@ extern void sun4v_patch_tlb_handlers(void);</div><div class='ctx'> </div><div class='ctx'> extern unsigned long cmdline_memory_size;</div><div class='ctx'> </div><div class='add'>+extern asmlinkage void do_sparc64_fault(struct pt_regs *regs);</div><div class='add'>+</div><div class='ctx'> #endif /* !(__ASSEMBLY__) */</div><div class='ctx'> </div><div class='ctx'> #endif /* !(_SPARC64_PGTABLE_H) */</div><div class='head'>diff --git a/arch/sparc/include/asm/prom.h b/arch/sparc/include/asm/prom.h<br/>index fd55522481cd..900d44714f8d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/prom.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/include/asm/prom.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/prom.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/prom.h</a></div><div class='hunk'>@@ -18,6 +18,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;asm/atomic.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define OF_ROOT_NODE_ADDR_CELLS_DEFAULT	2</div><div class='hunk'>@@ -73,6 +74,7 @@ struct of_irq_controller {</div><div class='ctx'> </div><div class='ctx'> extern struct device_node *of_find_node_by_cpuid(int cpuid);</div><div class='ctx'> extern int of_set_property(struct device_node *node, const char *name, void *val, int len);</div><div class='add'>+extern struct mutex of_set_property_mutex;</div><div class='ctx'> extern int of_getintprop_default(struct device_node *np,</div><div class='ctx'> 				 const char *name,</div><div class='ctx'> 				 int def);</div><div class='hunk'>@@ -94,6 +96,16 @@ static inline void of_node_put(struct device_node *node)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* These routines are here to provide compatibility with how powerpc</div><div class='add'>+ * handles IRQ mapping for OF device nodes.  We precompute and permanently</div><div class='add'>+ * register them in the of_device objects, whereas powerpc computes them</div><div class='add'>+ * on request.</div><div class='add'>+ */</div><div class='add'>+extern unsigned int irq_of_parse_and_map(struct device_node *node, int index);</div><div class='add'>+static inline void irq_dispose_mapping(unsigned int virq)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * NB:  This is here while we transition from using asm/prom.h</div><div class='ctx'>  * to linux/of.h</div><div class='head'>diff --git a/arch/sparc/include/asm/ptrace_64.h b/arch/sparc/include/asm/ptrace_64.h<br/>index 06e4914c13f4..3d3e9c161d8b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/ptrace_64.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/include/asm/ptrace_64.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/ptrace_64.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/ptrace_64.h</a></div><div class='hunk'>@@ -113,6 +113,8 @@ struct sparc_trapf {</div><div class='ctx'> </div><div class='ctx'> #ifdef __KERNEL__</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/threads.h&gt;</div><div class='add'>+</div><div class='ctx'> static inline int pt_regs_trap_type(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	return regs-&gt;magic &amp; 0x1ff;</div><div class='hunk'>@@ -138,6 +140,7 @@ struct global_reg_snapshot {</div><div class='ctx'> 	struct thread_info	*thread;</div><div class='ctx'> 	unsigned long		pad1;</div><div class='ctx'> };</div><div class='add'>+extern struct global_reg_snapshot global_reg_snapshot[NR_CPUS];</div><div class='ctx'> </div><div class='ctx'> #define __ARCH_WANT_COMPAT_SYS_PTRACE</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sparc/include/asm/reboot.h b/arch/sparc/include/asm/reboot.h<br/>deleted file mode 100644<br/>index 3f3f43f5be5e..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/reboot.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/include/asm/reboot.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,6 +0,0 @@</div><div class='del'>-#ifndef _SPARC64_REBOOT_H</div><div class='del'>-#define _SPARC64_REBOOT_H</div><div class='del'>-</div><div class='del'>-extern void machine_alt_power_off(void);</div><div class='del'>-</div><div class='del'>-#endif /* _SPARC64_REBOOT_H */</div><div class='head'>diff --git a/arch/sparc/include/asm/rtc.h b/arch/sparc/include/asm/rtc.h<br/>deleted file mode 100644<br/>index f9ecb1fe2ecd..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/rtc.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/include/asm/rtc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,26 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * rtc.h: Definitions for access to the Mostek real time clock</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1996 Thomas K. Dyas (tdyas@eden.rutgers.edu)</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _RTC_H</div><div class='del'>-#define _RTC_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/ioctl.h&gt;</div><div class='del'>-</div><div class='del'>-struct rtc_time</div><div class='del'>-{</div><div class='del'>-	int	sec;	/* Seconds (0-59) */</div><div class='del'>-	int	min;	/* Minutes (0-59) */</div><div class='del'>-	int	hour;	/* Hour (0-23) */</div><div class='del'>-	int	dow;	/* Day of the week (1-7) */</div><div class='del'>-	int	dom;	/* Day of the month (1-31) */</div><div class='del'>-	int	month;	/* Month of year (1-12) */</div><div class='del'>-	int	year;	/* Year (0-99) */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define RTCGET _IOR('p', 20, struct rtc_time)</div><div class='del'>-#define RTCSET _IOW('p', 21, struct rtc_time)</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/arch/sparc/include/asm/sbus.h b/arch/sparc/include/asm/sbus.h<br/>deleted file mode 100644<br/>index f82481ab44db..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/sbus.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/include/asm/sbus.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,8 +0,0 @@</div><div class='del'>-#ifndef ___ASM_SPARC_SBUS_H</div><div class='del'>-#define ___ASM_SPARC_SBUS_H</div><div class='del'>-#if defined(__sparc__) &amp;&amp; defined(__arch64__)</div><div class='del'>-#include &lt;asm/sbus_64.h&gt;</div><div class='del'>-#else</div><div class='del'>-#include &lt;asm/sbus_32.h&gt;</div><div class='del'>-#endif</div><div class='del'>-#endif</div><div class='head'>diff --git a/arch/sparc/include/asm/sbus_32.h b/arch/sparc/include/asm/sbus_32.h<br/>deleted file mode 100644<br/>index a7b4fa21931d..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/sbus_32.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/include/asm/sbus_32.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,153 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * sbus.h:  Defines for the Sun SBus.</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _SPARC_SBUS_H</div><div class='del'>-#define _SPARC_SBUS_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/dma-mapping.h&gt;</div><div class='del'>-#include &lt;linux/ioport.h&gt;</div><div class='del'>-#include &lt;linux/of_device.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/oplib.h&gt;</div><div class='del'>-#include &lt;asm/prom.h&gt;</div><div class='del'>-#include &lt;asm/scatterlist.h&gt;</div><div class='del'>-</div><div class='del'>-/* We scan which devices are on the SBus using the PROM node device</div><div class='del'>- * tree.  SBus devices are described in two different ways.  You can</div><div class='del'>- * either get an absolute address at which to access the device, or</div><div class='del'>- * you can get a SBus 'slot' number and an offset within that slot.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* The base address at which to calculate device OBIO addresses. */</div><div class='del'>-#define SUN_SBUS_BVADDR        0xf8000000</div><div class='del'>-#define SBUS_OFF_MASK          0x01ffffff</div><div class='del'>-</div><div class='del'>-/* These routines are used to calculate device address from slot</div><div class='del'>- * numbers + offsets, and vice versa.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static inline unsigned long sbus_devaddr(int slotnum, unsigned long offset)</div><div class='del'>-{</div><div class='del'>-  return (unsigned long) (SUN_SBUS_BVADDR+((slotnum)&lt;&lt;25)+(offset));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int sbus_dev_slot(unsigned long dev_addr)</div><div class='del'>-{</div><div class='del'>-  return (int) (((dev_addr)-SUN_SBUS_BVADDR)&gt;&gt;25);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct sbus_bus;</div><div class='del'>-</div><div class='del'>-/* Linux SBUS device tables */</div><div class='del'>-struct sbus_dev {</div><div class='del'>-	struct of_device	ofdev;</div><div class='del'>-	struct sbus_bus		*bus;</div><div class='del'>-	struct sbus_dev		*next;</div><div class='del'>-	struct sbus_dev		*child;</div><div class='del'>-	struct sbus_dev		*parent;</div><div class='del'>-	int prom_node;</div><div class='del'>-	char prom_name[64];</div><div class='del'>-	int slot;</div><div class='del'>-</div><div class='del'>-	struct resource resource[PROMREG_MAX];</div><div class='del'>-</div><div class='del'>-	struct linux_prom_registers reg_addrs[PROMREG_MAX];</div><div class='del'>-	int num_registers;</div><div class='del'>-</div><div class='del'>-	struct linux_prom_ranges device_ranges[PROMREG_MAX];</div><div class='del'>-	int num_device_ranges;</div><div class='del'>-</div><div class='del'>-	unsigned int irqs[4];</div><div class='del'>-	int num_irqs;</div><div class='del'>-};</div><div class='del'>-#define to_sbus_device(d) container_of(d, struct sbus_dev, ofdev.dev)</div><div class='del'>-</div><div class='del'>-/* This struct describes the SBus(s) found on this machine. */</div><div class='del'>-struct sbus_bus {</div><div class='del'>-	struct of_device	ofdev;</div><div class='del'>-	struct sbus_dev		*devices;	/* Link to devices on this SBus */</div><div class='del'>-	struct sbus_bus		*next;		/* next SBus, if more than one SBus */</div><div class='del'>-	int			prom_node;	/* PROM device tree node for this SBus */</div><div class='del'>-	char			prom_name[64];  /* Usually "sbus" or "sbi" */</div><div class='del'>-	int			clock_freq;</div><div class='del'>-</div><div class='del'>-	struct linux_prom_ranges sbus_ranges[PROMREG_MAX];</div><div class='del'>-	int num_sbus_ranges;</div><div class='del'>-</div><div class='del'>-	int devid;</div><div class='del'>-	int board;</div><div class='del'>-};</div><div class='del'>-#define to_sbus(d) container_of(d, struct sbus_bus, ofdev.dev)</div><div class='del'>-</div><div class='del'>-extern struct sbus_bus *sbus_root;</div><div class='del'>-</div><div class='del'>-static inline int</div><div class='del'>-sbus_is_slave(struct sbus_dev *dev)</div><div class='del'>-{</div><div class='del'>-	/* XXX Have to write this for sun4c's */</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Device probing routines could find these handy */</div><div class='del'>-#define for_each_sbus(bus) \</div><div class='del'>-        for((bus) = sbus_root; (bus); (bus)=(bus)-&gt;next)</div><div class='del'>-</div><div class='del'>-#define for_each_sbusdev(device, bus) \</div><div class='del'>-        for((device) = (bus)-&gt;devices; (device); (device)=(device)-&gt;next)</div><div class='del'>-</div><div class='del'>-#define for_all_sbusdev(device, bus) \</div><div class='del'>-	for ((bus) = sbus_root; (bus); (bus) = (bus)-&gt;next) \</div><div class='del'>-		for ((device) = (bus)-&gt;devices; (device); (device) = (device)-&gt;next)</div><div class='del'>-</div><div class='del'>-/* Driver DVMA interfaces. */</div><div class='del'>-#define sbus_can_dma_64bit(sdev)	(0) /* actually, sparc_cpu_model==sun4d */</div><div class='del'>-#define sbus_can_burst64(sdev)		(0) /* actually, sparc_cpu_model==sun4d */</div><div class='del'>-extern void sbus_set_sbus64(struct sbus_dev *, int);</div><div class='del'>-extern void sbus_fill_device_irq(struct sbus_dev *);</div><div class='del'>-</div><div class='del'>-/* These yield IOMMU mappings in consistent mode. */</div><div class='del'>-extern void *sbus_alloc_consistent(struct sbus_dev *, long, u32 *dma_addrp);</div><div class='del'>-extern void sbus_free_consistent(struct sbus_dev *, long, void *, u32);</div><div class='del'>-void prom_adjust_ranges(struct linux_prom_ranges *, int,</div><div class='del'>-			struct linux_prom_ranges *, int);</div><div class='del'>-</div><div class='del'>-#define SBUS_DMA_BIDIRECTIONAL	DMA_BIDIRECTIONAL</div><div class='del'>-#define SBUS_DMA_TODEVICE	DMA_TO_DEVICE</div><div class='del'>-#define SBUS_DMA_FROMDEVICE	DMA_FROM_DEVICE</div><div class='del'>-#define	SBUS_DMA_NONE		DMA_NONE</div><div class='del'>-</div><div class='del'>-/* All the rest use streaming mode mappings. */</div><div class='del'>-extern dma_addr_t sbus_map_single(struct sbus_dev *, void *, size_t, int);</div><div class='del'>-extern void sbus_unmap_single(struct sbus_dev *, dma_addr_t, size_t, int);</div><div class='del'>-extern int sbus_map_sg(struct sbus_dev *, struct scatterlist *, int, int);</div><div class='del'>-extern void sbus_unmap_sg(struct sbus_dev *, struct scatterlist *, int, int);</div><div class='del'>-</div><div class='del'>-/* Finally, allow explicit synchronization of streamable mappings. */</div><div class='del'>-extern void sbus_dma_sync_single_for_cpu(struct sbus_dev *, dma_addr_t, size_t, int);</div><div class='del'>-#define sbus_dma_sync_single sbus_dma_sync_single_for_cpu</div><div class='del'>-extern void sbus_dma_sync_single_for_device(struct sbus_dev *, dma_addr_t, size_t, int);</div><div class='del'>-extern void sbus_dma_sync_sg_for_cpu(struct sbus_dev *, struct scatterlist *, int, int);</div><div class='del'>-#define sbus_dma_sync_sg sbus_dma_sync_sg_for_cpu</div><div class='del'>-extern void sbus_dma_sync_sg_for_device(struct sbus_dev *, struct scatterlist *, int, int);</div><div class='del'>-</div><div class='del'>-/* Eric Brower (ebrower@usa.net)</div><div class='del'>- * Translate SBus interrupt levels to ino values--</div><div class='del'>- * this is used when converting sbus "interrupts" OBP</div><div class='del'>- * node values to "intr" node values, and is platform</div><div class='del'>- * dependent.  If only we could call OBP with</div><div class='del'>- * "sbus-intr&gt;cpu (sbint -- ino)" from kernel...</div><div class='del'>- * See .../drivers/sbus/sbus.c for details.</div><div class='del'>- */</div><div class='del'>-BTFIXUPDEF_CALL(unsigned int, sbint_to_irq, struct sbus_dev *sdev, unsigned int)</div><div class='del'>-#define sbint_to_irq(sdev, sbint) BTFIXUP_CALL(sbint_to_irq)(sdev, sbint)</div><div class='del'>-</div><div class='del'>-extern void sbus_arch_bus_ranges_init(struct device_node *, struct sbus_bus *);</div><div class='del'>-extern void sbus_setup_iommu(struct sbus_bus *, struct device_node *);</div><div class='del'>-extern void sbus_setup_arch_props(struct sbus_bus *, struct device_node *);</div><div class='del'>-extern int sbus_arch_preinit(void);</div><div class='del'>-extern void sbus_arch_postinit(void);</div><div class='del'>-</div><div class='del'>-#endif /* !(_SPARC_SBUS_H) */</div><div class='head'>diff --git a/arch/sparc/include/asm/sbus_64.h b/arch/sparc/include/asm/sbus_64.h<br/>deleted file mode 100644<br/>index b606c14343fb..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/sbus_64.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/include/asm/sbus_64.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,190 +0,0 @@</div><div class='del'>-/* sbus.h: Defines for the Sun SBus.</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1996, 1999, 2007 David S. Miller (davem@davemloft.net)</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _SPARC64_SBUS_H</div><div class='del'>-#define _SPARC64_SBUS_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/dma-mapping.h&gt;</div><div class='del'>-#include &lt;linux/ioport.h&gt;</div><div class='del'>-#include &lt;linux/of_device.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/oplib.h&gt;</div><div class='del'>-#include &lt;asm/prom.h&gt;</div><div class='del'>-#include &lt;asm/iommu.h&gt;</div><div class='del'>-#include &lt;asm/scatterlist.h&gt;</div><div class='del'>-</div><div class='del'>-/* We scan which devices are on the SBus using the PROM node device</div><div class='del'>- * tree.  SBus devices are described in two different ways.  You can</div><div class='del'>- * either get an absolute address at which to access the device, or</div><div class='del'>- * you can get a SBus 'slot' number and an offset within that slot.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* The base address at which to calculate device OBIO addresses. */</div><div class='del'>-#define SUN_SBUS_BVADDR        0x00000000</div><div class='del'>-#define SBUS_OFF_MASK          0x0fffffff</div><div class='del'>-</div><div class='del'>-/* These routines are used to calculate device address from slot</div><div class='del'>- * numbers + offsets, and vice versa.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static inline unsigned long sbus_devaddr(int slotnum, unsigned long offset)</div><div class='del'>-{</div><div class='del'>-  return (unsigned long) (SUN_SBUS_BVADDR+((slotnum)&lt;&lt;28)+(offset));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int sbus_dev_slot(unsigned long dev_addr)</div><div class='del'>-{</div><div class='del'>-  return (int) (((dev_addr)-SUN_SBUS_BVADDR)&gt;&gt;28);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct sbus_bus;</div><div class='del'>-</div><div class='del'>-/* Linux SBUS device tables */</div><div class='del'>-struct sbus_dev {</div><div class='del'>-	struct of_device	ofdev;</div><div class='del'>-	struct sbus_bus		*bus;</div><div class='del'>-	struct sbus_dev		*next;</div><div class='del'>-	struct sbus_dev		*child;</div><div class='del'>-	struct sbus_dev		*parent;</div><div class='del'>-	int prom_node;</div><div class='del'>-	char prom_name[64];</div><div class='del'>-	int slot;</div><div class='del'>-</div><div class='del'>-	struct resource resource[PROMREG_MAX];</div><div class='del'>-</div><div class='del'>-	struct linux_prom_registers reg_addrs[PROMREG_MAX];</div><div class='del'>-	int num_registers;</div><div class='del'>-</div><div class='del'>-	struct linux_prom_ranges device_ranges[PROMREG_MAX];</div><div class='del'>-	int num_device_ranges;</div><div class='del'>-</div><div class='del'>-	unsigned int irqs[4];</div><div class='del'>-	int num_irqs;</div><div class='del'>-};</div><div class='del'>-#define to_sbus_device(d) container_of(d, struct sbus_dev, ofdev.dev)</div><div class='del'>-</div><div class='del'>-/* This struct describes the SBus(s) found on this machine. */</div><div class='del'>-struct sbus_bus {</div><div class='del'>-	struct of_device	ofdev;</div><div class='del'>-	struct sbus_dev		*devices;	/* Tree of SBUS devices	*/</div><div class='del'>-	struct sbus_bus		*next;		/* Next SBUS in system	*/</div><div class='del'>-	int			prom_node;      /* OBP node of SBUS	*/</div><div class='del'>-	char			prom_name[64];	/* Usually "sbus" or "sbi" */</div><div class='del'>-	int			clock_freq;</div><div class='del'>-</div><div class='del'>-	struct linux_prom_ranges sbus_ranges[PROMREG_MAX];</div><div class='del'>-	int num_sbus_ranges;</div><div class='del'>-</div><div class='del'>-	int portid;</div><div class='del'>-};</div><div class='del'>-#define to_sbus(d) container_of(d, struct sbus_bus, ofdev.dev)</div><div class='del'>-</div><div class='del'>-extern struct sbus_bus *sbus_root;</div><div class='del'>-</div><div class='del'>-/* Device probing routines could find these handy */</div><div class='del'>-#define for_each_sbus(bus) \</div><div class='del'>-        for((bus) = sbus_root; (bus); (bus)=(bus)-&gt;next)</div><div class='del'>-</div><div class='del'>-#define for_each_sbusdev(device, bus) \</div><div class='del'>-        for((device) = (bus)-&gt;devices; (device); (device)=(device)-&gt;next)</div><div class='del'>-</div><div class='del'>-#define for_all_sbusdev(device, bus) \</div><div class='del'>-	for ((bus) = sbus_root; (bus); (bus) = (bus)-&gt;next) \</div><div class='del'>-		for ((device) = (bus)-&gt;devices; (device); (device) = (device)-&gt;next)</div><div class='del'>-</div><div class='del'>-/* Driver DVMA interfaces. */</div><div class='del'>-#define sbus_can_dma_64bit(sdev)	(1)</div><div class='del'>-#define sbus_can_burst64(sdev)		(1)</div><div class='del'>-extern void sbus_set_sbus64(struct sbus_dev *, int);</div><div class='del'>-extern void sbus_fill_device_irq(struct sbus_dev *);</div><div class='del'>-</div><div class='del'>-static inline void *sbus_alloc_consistent(struct sbus_dev *sdev , size_t size,</div><div class='del'>-					  dma_addr_t *dma_handle)</div><div class='del'>-{</div><div class='del'>-	return dma_alloc_coherent(&amp;sdev-&gt;ofdev.dev, size,</div><div class='del'>-				  dma_handle, GFP_ATOMIC);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void sbus_free_consistent(struct sbus_dev *sdev, size_t size,</div><div class='del'>-					void *vaddr, dma_addr_t dma_handle)</div><div class='del'>-{</div><div class='del'>-	return dma_free_coherent(&amp;sdev-&gt;ofdev.dev, size, vaddr, dma_handle);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define SBUS_DMA_BIDIRECTIONAL	DMA_BIDIRECTIONAL</div><div class='del'>-#define SBUS_DMA_TODEVICE	DMA_TO_DEVICE</div><div class='del'>-#define SBUS_DMA_FROMDEVICE	DMA_FROM_DEVICE</div><div class='del'>-#define	SBUS_DMA_NONE		DMA_NONE</div><div class='del'>-</div><div class='del'>-/* All the rest use streaming mode mappings. */</div><div class='del'>-static inline dma_addr_t sbus_map_single(struct sbus_dev *sdev, void *ptr,</div><div class='del'>-					 size_t size, int direction)</div><div class='del'>-{</div><div class='del'>-	return dma_map_single(&amp;sdev-&gt;ofdev.dev, ptr, size,</div><div class='del'>-			      (enum dma_data_direction) direction);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void sbus_unmap_single(struct sbus_dev *sdev,</div><div class='del'>-				     dma_addr_t dma_addr, size_t size,</div><div class='del'>-				     int direction)</div><div class='del'>-{</div><div class='del'>-	dma_unmap_single(&amp;sdev-&gt;ofdev.dev, dma_addr, size,</div><div class='del'>-			 (enum dma_data_direction) direction);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int sbus_map_sg(struct sbus_dev *sdev, struct scatterlist *sg,</div><div class='del'>-			      int nents, int direction)</div><div class='del'>-{</div><div class='del'>-	return dma_map_sg(&amp;sdev-&gt;ofdev.dev, sg, nents,</div><div class='del'>-			  (enum dma_data_direction) direction);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void sbus_unmap_sg(struct sbus_dev *sdev, struct scatterlist *sg,</div><div class='del'>-				 int nents, int direction)</div><div class='del'>-{</div><div class='del'>-	dma_unmap_sg(&amp;sdev-&gt;ofdev.dev, sg, nents,</div><div class='del'>-		     (enum dma_data_direction) direction);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Finally, allow explicit synchronization of streamable mappings. */</div><div class='del'>-static inline void sbus_dma_sync_single_for_cpu(struct sbus_dev *sdev,</div><div class='del'>-						dma_addr_t dma_handle,</div><div class='del'>-						size_t size, int direction)</div><div class='del'>-{</div><div class='del'>-	dma_sync_single_for_cpu(&amp;sdev-&gt;ofdev.dev, dma_handle, size,</div><div class='del'>-				(enum dma_data_direction) direction);</div><div class='del'>-}</div><div class='del'>-#define sbus_dma_sync_single sbus_dma_sync_single_for_cpu</div><div class='del'>-</div><div class='del'>-static inline void sbus_dma_sync_single_for_device(struct sbus_dev *sdev,</div><div class='del'>-						   dma_addr_t dma_handle,</div><div class='del'>-						   size_t size, int direction)</div><div class='del'>-{</div><div class='del'>-	/* No flushing needed to sync cpu writes to the device.  */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void sbus_dma_sync_sg_for_cpu(struct sbus_dev *sdev,</div><div class='del'>-					    struct scatterlist *sg,</div><div class='del'>-					    int nents, int direction)</div><div class='del'>-{</div><div class='del'>-	dma_sync_sg_for_cpu(&amp;sdev-&gt;ofdev.dev, sg, nents,</div><div class='del'>-			    (enum dma_data_direction) direction);</div><div class='del'>-}</div><div class='del'>-#define sbus_dma_sync_sg sbus_dma_sync_sg_for_cpu</div><div class='del'>-</div><div class='del'>-static inline void sbus_dma_sync_sg_for_device(struct sbus_dev *sdev,</div><div class='del'>-					       struct scatterlist *sg,</div><div class='del'>-					       int nents, int direction)</div><div class='del'>-{</div><div class='del'>-	/* No flushing needed to sync cpu writes to the device.  */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-extern void sbus_arch_bus_ranges_init(struct device_node *, struct sbus_bus *);</div><div class='del'>-extern void sbus_setup_iommu(struct sbus_bus *, struct device_node *);</div><div class='del'>-extern void sbus_setup_arch_props(struct sbus_bus *, struct device_node *);</div><div class='del'>-extern int sbus_arch_preinit(void);</div><div class='del'>-extern void sbus_arch_postinit(void);</div><div class='del'>-</div><div class='del'>-#endif /* !(_SPARC64_SBUS_H) */</div><div class='head'>diff --git a/arch/sparc/include/asm/serial.h b/arch/sparc/include/asm/serial.h<br/>new file mode 100644<br/>index 000000000000..f90d61c28059<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/serial.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/serial.h</a></div><div class='hunk'>@@ -0,0 +1,6 @@</div><div class='add'>+#ifndef __SPARC_SERIAL_H</div><div class='add'>+#define __SPARC_SERIAL_H</div><div class='add'>+</div><div class='add'>+#define BASE_BAUD ( 1843200 / 16 )</div><div class='add'>+</div><div class='add'>+#endif /* __SPARC_SERIAL_H */</div><div class='head'>diff --git a/arch/sparc/include/asm/spinlock_32.h b/arch/sparc/include/asm/spinlock_32.h<br/>index de2249b267c6..bf2d532593e3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/spinlock_32.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/include/asm/spinlock_32.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/spinlock_32.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/spinlock_32.h</a></div><div class='hunk'>@@ -6,8 +6,6 @@</div><div class='ctx'> #ifndef __SPARC_SPINLOCK_H</div><div class='ctx'> #define __SPARC_SPINLOCK_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/threads.h&gt;	/* For NR_CPUS */</div><div class='del'>-</div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/psr.h&gt;</div><div class='head'>diff --git a/arch/sparc/include/asm/spinlock_64.h b/arch/sparc/include/asm/spinlock_64.h<br/>index 0006fe9f8c7a..120cfe4577c7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/spinlock_64.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/include/asm/spinlock_64.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/spinlock_64.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/spinlock_64.h</a></div><div class='hunk'>@@ -6,8 +6,6 @@</div><div class='ctx'> #ifndef __SPARC64_SPINLOCK_H</div><div class='ctx'> #define __SPARC64_SPINLOCK_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/threads.h&gt;	/* For NR_CPUS */</div><div class='del'>-</div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='ctx'> </div><div class='ctx'> /* To get debugging spinlocks which detect and catch</div><div class='head'>diff --git a/arch/sparc/include/asm/sstate.h b/arch/sparc/include/asm/sstate.h<br/>deleted file mode 100644<br/>index a7c35dbcb281..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/sstate.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/include/asm/sstate.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,13 +0,0 @@</div><div class='del'>-#ifndef _SPARC64_SSTATE_H</div><div class='del'>-#define _SPARC64_SSTATE_H</div><div class='del'>-</div><div class='del'>-extern void sstate_booting(void);</div><div class='del'>-extern void sstate_running(void);</div><div class='del'>-extern void sstate_halt(void);</div><div class='del'>-extern void sstate_poweroff(void);</div><div class='del'>-extern void sstate_panic(void);</div><div class='del'>-extern void sstate_reboot(void);</div><div class='del'>-</div><div class='del'>-extern void sun4v_sstate_init(void);</div><div class='del'>-</div><div class='del'>-#endif /* _SPARC64_SSTATE_H */</div><div class='head'>diff --git a/arch/sparc/include/asm/starfire.h b/arch/sparc/include/asm/starfire.h<br/>index 07bafd31e33c..d56ce60a5992 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/starfire.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/include/asm/starfire.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/starfire.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/starfire.h</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'> extern int this_is_starfire;</div><div class='ctx'> </div><div class='ctx'> extern void check_if_starfire(void);</div><div class='del'>-extern void starfire_cpu_setup(void);</div><div class='ctx'> extern int starfire_hard_smp_processor_id(void);</div><div class='ctx'> extern void starfire_hookup(int);</div><div class='ctx'> extern unsigned int starfire_translate(unsigned long imap, unsigned int upaid);</div><div class='head'>diff --git a/arch/sparc/include/asm/statfs.h b/arch/sparc/include/asm/statfs.h<br/>index 5e937a73743d..55e607ad461d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/statfs.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/include/asm/statfs.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/statfs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/statfs.h</a></div><div class='hunk'>@@ -1,8 +1,6 @@</div><div class='ctx'> #ifndef ___ASM_SPARC_STATFS_H</div><div class='ctx'> #define ___ASM_SPARC_STATFS_H</div><div class='del'>-#if defined(__sparc__) &amp;&amp; defined(__arch64__)</div><div class='del'>-#include &lt;asm/statfs_64.h&gt;</div><div class='del'>-#else</div><div class='del'>-#include &lt;asm/statfs_32.h&gt;</div><div class='del'>-#endif</div><div class='add'>+</div><div class='add'>+#include &lt;asm-generic/statfs.h&gt;</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/sparc/include/asm/statfs_32.h b/arch/sparc/include/asm/statfs_32.h<br/>deleted file mode 100644<br/>index 304520fa8863..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/statfs_32.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/include/asm/statfs_32.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,6 +0,0 @@</div><div class='del'>-#ifndef _SPARC_STATFS_H</div><div class='del'>-#define _SPARC_STATFS_H</div><div class='del'>-</div><div class='del'>-#include &lt;asm-generic/statfs.h&gt;</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/arch/sparc/include/asm/statfs_64.h b/arch/sparc/include/asm/statfs_64.h<br/>deleted file mode 100644<br/>index 79b3c890a5fa..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/statfs_64.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/include/asm/statfs_64.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,54 +0,0 @@</div><div class='del'>-#ifndef _SPARC64_STATFS_H</div><div class='del'>-#define _SPARC64_STATFS_H</div><div class='del'>-</div><div class='del'>-#ifndef __KERNEL_STRICT_NAMES</div><div class='del'>-</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-</div><div class='del'>-typedef __kernel_fsid_t	fsid_t;</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-struct statfs {</div><div class='del'>-	long f_type;</div><div class='del'>-	long f_bsize;</div><div class='del'>-	long f_blocks;</div><div class='del'>-	long f_bfree;</div><div class='del'>-	long f_bavail;</div><div class='del'>-	long f_files;</div><div class='del'>-	long f_ffree;</div><div class='del'>-	__kernel_fsid_t f_fsid;</div><div class='del'>-	long f_namelen;</div><div class='del'>-	long f_frsize;</div><div class='del'>-	long f_spare[5];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct statfs64 {</div><div class='del'>-	long f_type;</div><div class='del'>-	long f_bsize;</div><div class='del'>-	long f_blocks;</div><div class='del'>-	long f_bfree;</div><div class='del'>-	long f_bavail;</div><div class='del'>-	long f_files;</div><div class='del'>-	long f_ffree;</div><div class='del'>-	__kernel_fsid_t f_fsid;</div><div class='del'>-	long f_namelen;</div><div class='del'>-	long f_frsize;</div><div class='del'>-	long f_spare[5];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct compat_statfs64 {</div><div class='del'>-	__u32 f_type;</div><div class='del'>-	__u32 f_bsize;</div><div class='del'>-	__u64 f_blocks;</div><div class='del'>-	__u64 f_bfree;</div><div class='del'>-	__u64 f_bavail;</div><div class='del'>-	__u64 f_files;</div><div class='del'>-	__u64 f_ffree;</div><div class='del'>-	__kernel_fsid_t f_fsid;</div><div class='del'>-	__u32 f_namelen;</div><div class='del'>-	__u32 f_frsize;</div><div class='del'>-	__u32 f_spare[5];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/arch/sparc/include/asm/sun4paddr.h b/arch/sparc/include/asm/sun4paddr.h<br/>deleted file mode 100644<br/>index d52985f19f42..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/sun4paddr.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/include/asm/sun4paddr.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,56 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * sun4paddr.h:  Various physical addresses on sun4 machines</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1997 Anton Blanchard (anton@progsoc.uts.edu.au)</div><div class='del'>- * Copyright (C) 1998 Chris Davis (cdavis@cois.on.ca)</div><div class='del'>- * </div><div class='del'>- * Now supports more sun4's</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _SPARC_SUN4PADDR_H</div><div class='del'>-#define _SPARC_SUN4PADDR_H</div><div class='del'>-</div><div class='del'>-#define SUN4_IE_PHYSADDR		0xf5000000</div><div class='del'>-#define SUN4_UNUSED_PHYSADDR		0</div><div class='del'>-</div><div class='del'>-/* these work for me */</div><div class='del'>-#define SUN4_200_MEMREG_PHYSADDR	0xf4000000</div><div class='del'>-#define SUN4_200_CLOCK_PHYSADDR		0xf3000000</div><div class='del'>-#define SUN4_200_BWTWO_PHYSADDR		0xfd000000</div><div class='del'>-#define SUN4_200_ETH_PHYSADDR		0xf6000000</div><div class='del'>-#define SUN4_200_SI_PHYSADDR		0xff200000</div><div class='del'>-</div><div class='del'>-/* these were here before */</div><div class='del'>-#define SUN4_300_MEMREG_PHYSADDR	0xf4000000</div><div class='del'>-#define SUN4_300_CLOCK_PHYSADDR		0xf2000000</div><div class='del'>-#define SUN4_300_TIMER_PHYSADDR		0xef000000</div><div class='del'>-#define SUN4_300_ETH_PHYSADDR		0xf9000000</div><div class='del'>-#define SUN4_300_BWTWO_PHYSADDR		0xfb400000</div><div class='del'>-#define SUN4_300_DMA_PHYSADDR		0xfa001000</div><div class='del'>-#define SUN4_300_ESP_PHYSADDR		0xfa000000</div><div class='del'>-</div><div class='del'>-/* Are these right? */</div><div class='del'>-#define SUN4_400_MEMREG_PHYSADDR	0xf4000000</div><div class='del'>-#define SUN4_400_CLOCK_PHYSADDR		0xf2000000</div><div class='del'>-#define SUN4_400_TIMER_PHYSADDR		0xef000000</div><div class='del'>-#define SUN4_400_ETH_PHYSADDR		0xf9000000</div><div class='del'>-#define SUN4_400_BWTWO_PHYSADDR		0xfb400000</div><div class='del'>-#define SUN4_400_DMA_PHYSADDR		0xfa001000</div><div class='del'>-#define SUN4_400_ESP_PHYSADDR		0xfa000000</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>-	these are the actual values set and used in the code. Unused items set </div><div class='del'>-	to SUN_UNUSED_PHYSADDR </div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-extern int sun4_memreg_physaddr; /* memory register (ecc?) */</div><div class='del'>-extern int sun4_clock_physaddr;  /* system clock */</div><div class='del'>-extern int sun4_timer_physaddr;  /* timer, where applicable */</div><div class='del'>-extern int sun4_eth_physaddr;    /* onboard ethernet (ie/le) */</div><div class='del'>-extern int sun4_si_physaddr;     /* sun3 scsi adapter */</div><div class='del'>-extern int sun4_bwtwo_physaddr;  /* onboard bw2 */</div><div class='del'>-extern int sun4_dma_physaddr;    /* scsi dma */</div><div class='del'>-extern int sun4_esp_physaddr;    /* esp scsi */</div><div class='del'>-extern int sun4_ie_physaddr;     /* interrupt enable */</div><div class='del'>-</div><div class='del'>-#endif /* !(_SPARC_SUN4PADDR_H) */</div><div class='head'>diff --git a/arch/sparc/include/asm/sun4prom.h b/arch/sparc/include/asm/sun4prom.h<br/>deleted file mode 100644<br/>index 9c8b4cbf629a..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/sun4prom.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/include/asm/sun4prom.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,83 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * sun4prom.h -- interface to sun4 PROM monitor.  We don't use most of this,</div><div class='del'>- *               so most of these are just placeholders.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _SUN4PROM_H_</div><div class='del'>-#define _SUN4PROM_H_</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Although this looks similar to an romvec for a OpenProm machine, it is </div><div class='del'>- * actually closer to what was used in the Sun2 and Sun3.</div><div class='del'>- *</div><div class='del'>- * V2 entries exist only in version 2 PROMs and later, V3 in version 3 and later.</div><div class='del'>- * </div><div class='del'>- * Many of the function prototypes are guesses.  Some are certainly wrong.</div><div class='del'>- * Use with care.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	char		*initSP;		/* Initial system stack ptr */</div><div class='del'>-	void		(*startmon)(void);	/* Initial PC for hardware */</div><div class='del'>-	int		*diagberr;		/* Bus err handler for diags */</div><div class='del'>-	struct linux_arguments_v0 **bootParam; /* Info for bootstrapped pgm */</div><div class='del'>- 	unsigned int	*memorysize;		/* Usable memory in bytes */</div><div class='del'>-	unsigned char	(*getchar)(void);	/* Get char from input device */ </div><div class='del'>-	void		(*putchar)(char);	/* Put char to output device */</div><div class='del'>-	int		(*mayget)(void);	/* Maybe get char, or -1 */</div><div class='del'>-	int		(*mayput)(int);		/* Maybe put char, or -1 */</div><div class='del'>-	unsigned char	*echo;			/* Should getchar echo? */</div><div class='del'>-	unsigned char	*insource;		/* Input source selector */</div><div class='del'>-	unsigned char	*outsink;		/* Output sink selector */</div><div class='del'>-	int		(*getkey)(void);	/* Get next key if one exists */</div><div class='del'>-	void		(*initgetkey)(void);	/* Initialize get key */</div><div class='del'>-	unsigned int	*translation;		/* Kbd translation selector */</div><div class='del'>-	unsigned char	*keybid;		/* Keyboard ID byte */</div><div class='del'>-	int		*screen_x;		/* V2: Screen x pos (r/o) */</div><div class='del'>-	int		*screen_y;		/* V2: Screen y pos (r/o) */</div><div class='del'>-	struct keybuf	*keybuf;		/* Up/down keycode buffer */</div><div class='del'>-	char		*monid;			/* Monitor version ID */</div><div class='del'>-	void		(*fbwritechar)(char);	/* Write a character to FB */</div><div class='del'>-	int		*fbAddr;		/* Address of frame buffer */</div><div class='del'>-	char		**font;			/* Font table for FB */</div><div class='del'>-	void		(*fbwritestr)(char *);	/* Write string to FB */</div><div class='del'>-	void		(*reboot)(char *);	/* e.g. reboot("sd()vmlinux") */</div><div class='del'>-	unsigned char	*linebuf;		/* The line input buffer */</div><div class='del'>-	unsigned char	**lineptr;		/* Cur pointer into linebuf */</div><div class='del'>-	int		*linesize;		/* length of line in linebuf */</div><div class='del'>-	void		(*getline)(char *);	/* Get line from user */</div><div class='del'>-	unsigned char	(*getnextchar)(void);	/* Get next char from linebuf */</div><div class='del'>-	unsigned char	(*peeknextchar)(void);	/* Peek at next char */</div><div class='del'>-	int		*fbthere;		/* =1 if frame buffer there */</div><div class='del'>-	int		(*getnum)(void);	/* Grab hex num from line */</div><div class='del'>-	int		(*printf)(char *, ...);	/* See prom_printf() instead */ </div><div class='del'>-	void		(*printhex)(int);	/* Format N digits in hex */</div><div class='del'>-	unsigned char	*leds;			/* RAM copy of LED register */</div><div class='del'>-	void		(*setLEDs)(unsigned char *);	/* Sets LED's and RAM copy */</div><div class='del'>-	void		(*NMIaddr)(void *);	/* Addr for level 7 vector */</div><div class='del'>-	void		(*abortentry)(void);	/* Entry for keyboard abort */</div><div class='del'>-	int		*nmiclock;		/* Counts up in msec */</div><div class='del'>-	int		*FBtype;		/* Frame buffer type */</div><div class='del'>- 	unsigned int	romvecversion;		/* Version number for this romvec */</div><div class='del'>-	struct globram  *globram;		/* monitor global variables ??? */</div><div class='del'>-	void *		kbdaddr;		/* Addr of keyboard in use */</div><div class='del'>-	int		*keyrinit;		/* ms before kbd repeat */</div><div class='del'>-	unsigned char	*keyrtick; 		/* ms between repetitions */</div><div class='del'>-	unsigned int	*memoryavail;		/* V1: Main mem usable size */</div><div class='del'>-	long		*resetaddr;		/* where to jump on a reset */</div><div class='del'>-	long		*resetmap;		/* pgmap entry for resetaddr */</div><div class='del'>-	void		(*exittomon)(void);	/* Exit from user program */</div><div class='del'>-	unsigned char	**memorybitmap;		/* V1: &amp;{0 or &amp;bits} */</div><div class='del'>-	void		(*setcxsegmap)(int ctxt, char *va, int pmeg);	/* Set seg in any context */</div><div class='del'>-	void		(**vector_cmd)(void *);	/* V2: Handler for 'v' cmd */</div><div class='del'>-	unsigned long	*expectedtrapsig;	/* V3: Location of the expected trap signal */</div><div class='del'>-	unsigned long	*trapvectorbasetable;	/* V3: Address of the trap vector table */</div><div class='del'>-	int		unused1;</div><div class='del'>-	int		unused2;</div><div class='del'>-	int		unused3;</div><div class='del'>-	int		unused4;</div><div class='del'>-} linux_sun4_romvec;</div><div class='del'>-</div><div class='del'>-extern linux_sun4_romvec *sun4_romvec;</div><div class='del'>-</div><div class='del'>-#endif /* _SUN4PROM_H_ */</div><div class='head'>diff --git a/arch/sparc/include/asm/system_32.h b/arch/sparc/include/asm/system_32.h<br/>index b4b024445fc9..8623fc48fe24 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/system_32.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/include/asm/system_32.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/system_32.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/system_32.h</a></div><div class='hunk'>@@ -34,13 +34,7 @@ enum sparc_cpu {</div><div class='ctx'> </div><div class='ctx'> extern enum sparc_cpu sparc_cpu_model;</div><div class='ctx'> </div><div class='del'>-#ifndef CONFIG_SUN4</div><div class='del'>-#define ARCH_SUN4C_SUN4 (sparc_cpu_model==sun4c)</div><div class='del'>-#define ARCH_SUN4 0</div><div class='del'>-#else</div><div class='del'>-#define ARCH_SUN4C_SUN4 1</div><div class='del'>-#define ARCH_SUN4 1</div><div class='del'>-#endif</div><div class='add'>+#define ARCH_SUN4C (sparc_cpu_model==sun4c)</div><div class='ctx'> </div><div class='ctx'> #define SUN4M_NCPUS            4              /* Architectural limit of sun4m. */</div><div class='ctx'> </div><div class='hunk'>@@ -55,6 +49,7 @@ extern unsigned long empty_zero_page;</div><div class='ctx'> extern void sun_do_break(void);</div><div class='ctx'> extern int serial_console;</div><div class='ctx'> extern int stop_a_enabled;</div><div class='add'>+extern int scons_pwroff;</div><div class='ctx'> </div><div class='ctx'> static inline int con_is_present(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/sparc/include/asm/system_64.h b/arch/sparc/include/asm/system_64.h<br/>index db9e742a406a..8759f2a1b837 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/system_64.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/include/asm/system_64.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/system_64.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/system_64.h</a></div><div class='hunk'>@@ -26,9 +26,8 @@ enum sparc_cpu {</div><div class='ctx'> </div><div class='ctx'> #define sparc_cpu_model sun4u</div><div class='ctx'> </div><div class='del'>-/* This cannot ever be a sun4c nor sun4 :) That's just history. */</div><div class='del'>-#define ARCH_SUN4C_SUN4 0</div><div class='del'>-#define ARCH_SUN4 0</div><div class='add'>+/* This cannot ever be a sun4c :) That's just history. */</div><div class='add'>+#define ARCH_SUN4C 0</div><div class='ctx'> </div><div class='ctx'> extern char reboot_command[];</div><div class='ctx'> </div><div class='hunk'>@@ -118,6 +117,7 @@ do {	__asm__ __volatile__("ba,pt	%%xcc, 1f\n\t" \</div><div class='ctx'> </div><div class='ctx'> extern void sun_do_break(void);</div><div class='ctx'> extern int stop_a_enabled;</div><div class='add'>+extern int scons_pwroff;</div><div class='ctx'> </div><div class='ctx'> extern void fault_in_user_windows(void);</div><div class='ctx'> extern void synchronize_user_stack(void);</div><div class='head'>diff --git a/arch/sparc/include/asm/thread_info_32.h b/arch/sparc/include/asm/thread_info_32.h<br/>index cbb892d0dff0..29899fd5b1b2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/thread_info_32.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/include/asm/thread_info_32.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/thread_info_32.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/thread_info_32.h</a></div><div class='hunk'>@@ -80,11 +80,7 @@ register struct thread_info *current_thread_info_reg asm("g6");</div><div class='ctx'> /*</div><div class='ctx'>  * thread information allocation</div><div class='ctx'>  */</div><div class='del'>-#if PAGE_SHIFT == 13</div><div class='del'>-#define THREAD_INFO_ORDER  0</div><div class='del'>-#else /* PAGE_SHIFT */</div><div class='ctx'> #define THREAD_INFO_ORDER  1</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> #define __HAVE_ARCH_THREAD_INFO_ALLOCATOR</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sparc/include/asm/timer_32.h b/arch/sparc/include/asm/timer_32.h<br/>index 361e53898dd7..2ec030ef3810 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/timer_32.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/include/asm/timer_32.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/timer_32.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/timer_32.h</a></div><div class='hunk'>@@ -9,96 +9,9 @@</div><div class='ctx'> #define _SPARC_TIMER_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/system.h&gt;  /* For SUN4M_NCPUS */</div><div class='del'>-#include &lt;asm/sun4paddr.h&gt;</div><div class='ctx'> #include &lt;asm/btfixup.h&gt;</div><div class='ctx'> </div><div class='del'>-/* Timer structures. The interrupt timer has two properties which</div><div class='del'>- * are the counter (which is handled in do_timer in sched.c) and the limit.</div><div class='del'>- * This limit is where the timer's counter 'wraps' around. Oddly enough,</div><div class='del'>- * the sun4c timer when it hits the limit wraps back to 1 and not zero</div><div class='del'>- * thus when calculating the value at which it will fire a microsecond you</div><div class='del'>- * must adjust by one.  Thanks SUN for designing such great hardware ;(</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* Note that I am only going to use the timer that interrupts at</div><div class='del'>- * Sparc IRQ 10.  There is another one available that can fire at</div><div class='del'>- * IRQ 14. Currently it is left untouched, we keep the PROM's limit</div><div class='del'>- * register value and let the prom take these interrupts.  This allows</div><div class='del'>- * L1-A to work.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-struct sun4c_timer_info {</div><div class='del'>-  __volatile__ unsigned int cur_count10;</div><div class='del'>-  __volatile__ unsigned int timer_limit10;</div><div class='del'>-  __volatile__ unsigned int cur_count14;</div><div class='del'>-  __volatile__ unsigned int timer_limit14;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define SUN4C_TIMER_PHYSADDR   0xf3000000</div><div class='del'>-#ifdef CONFIG_SUN4</div><div class='del'>-#define SUN_TIMER_PHYSADDR SUN4_300_TIMER_PHYSADDR</div><div class='del'>-#else</div><div class='del'>-#define SUN_TIMER_PHYSADDR SUN4C_TIMER_PHYSADDR</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* A sun4m has two blocks of registers which are probably of the same</div><div class='del'>- * structure. LSI Logic's L64851 is told to _decrement_ from the limit</div><div class='del'>- * value. Aurora behaves similarly but its limit value is compacted in</div><div class='del'>- * other fashion (it's wider). Documented fields are defined here.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* As with the interrupt register, we have two classes of timer registers</div><div class='del'>- * which are per-cpu and master.  Per-cpu timers only hit that cpu and are</div><div class='del'>- * only level 14 ticks, master timer hits all cpus and is level 10.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define SUN4M_PRM_CNT_L       0x80000000</div><div class='del'>-#define SUN4M_PRM_CNT_LVALUE  0x7FFFFC00</div><div class='del'>-</div><div class='del'>-struct sun4m_timer_percpu_info {</div><div class='del'>-  __volatile__ unsigned int l14_timer_limit;    /* Initial value is 0x009c4000 */</div><div class='del'>-  __volatile__ unsigned int l14_cur_count;</div><div class='del'>-</div><div class='del'>-  /* This register appears to be write only and/or inaccessible</div><div class='del'>-   * on Uni-Processor sun4m machines.</div><div class='del'>-   */</div><div class='del'>-  __volatile__ unsigned int l14_limit_noclear;  /* Data access error is here */</div><div class='del'>-</div><div class='del'>-  __volatile__ unsigned int cntrl;            /* =1 after POST on Aurora */</div><div class='del'>-  __volatile__ unsigned char space[PAGE_SIZE - 16];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct sun4m_timer_regs {</div><div class='del'>-	struct sun4m_timer_percpu_info cpu_timers[SUN4M_NCPUS];</div><div class='del'>-	volatile unsigned int l10_timer_limit;</div><div class='del'>-	volatile unsigned int l10_cur_count;</div><div class='del'>-</div><div class='del'>-	/* Again, this appears to be write only and/or inaccessible</div><div class='del'>-	 * on uni-processor sun4m machines.</div><div class='del'>-	 */</div><div class='del'>-	volatile unsigned int l10_limit_noclear;</div><div class='del'>-</div><div class='del'>-	/* This register too, it must be magic. */</div><div class='del'>-	volatile unsigned int foobar;</div><div class='del'>-</div><div class='del'>-	volatile unsigned int cfg;     /* equals zero at boot time... */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define SUN4D_PRM_CNT_L       0x80000000</div><div class='del'>-#define SUN4D_PRM_CNT_LVALUE  0x7FFFFC00</div><div class='del'>-</div><div class='del'>-struct sun4d_timer_regs {</div><div class='del'>-	volatile unsigned int l10_timer_limit;</div><div class='del'>-	volatile unsigned int l10_cur_countx;</div><div class='del'>-	volatile unsigned int l10_limit_noclear;</div><div class='del'>-	volatile unsigned int ctrl;</div><div class='del'>-	volatile unsigned int l10_cur_count;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-extern struct sun4d_timer_regs *sun4d_timers;</div><div class='del'>-</div><div class='ctx'> extern __volatile__ unsigned int *master_l10_counter;</div><div class='del'>-extern __volatile__ unsigned int *master_l10_limit;</div><div class='ctx'> </div><div class='ctx'> /* FIXME: Make do_[gs]ettimeofday btfixup calls */</div><div class='ctx'> BTFIXUPDEF_CALL(int, bus_do_settimeofday, struct timespec *tv)</div><div class='head'>diff --git a/arch/sparc/include/asm/vac-ops.h b/arch/sparc/include/asm/vac-ops.h<br/>index d10527611f11..a63e88ef0426 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/vac-ops.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/include/asm/vac-ops.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/vac-ops.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/vac-ops.h</a></div><div class='hunk'>@@ -76,11 +76,7 @@</div><div class='ctx'>  * cacheable bit in the pte's of all such pages.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SUN4</div><div class='del'>-#define S4CVAC_BADBITS     0x0001e000</div><div class='del'>-#else</div><div class='ctx'> #define S4CVAC_BADBITS    0x0000f000</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> /* The following is true if vaddr1 and vaddr2 would cause</div><div class='ctx'>  * a 'bad alias'.</div><div class='hunk'>@@ -94,10 +90,7 @@</div><div class='ctx'>  */</div><div class='ctx'> struct sun4c_vac_props {</div><div class='ctx'> 	unsigned int num_bytes;     /* Size of the cache */</div><div class='del'>-	unsigned int num_lines;     /* Number of cache lines */</div><div class='ctx'> 	unsigned int do_hwflushes;  /* Hardware flushing available? */</div><div class='del'>-	enum { VAC_NONE, VAC_WRITE_THROUGH,</div><div class='del'>-	    VAC_WRITE_BACK } type;  /* What type of VAC? */</div><div class='ctx'> 	unsigned int linesize;      /* Size of each line in bytes */</div><div class='ctx'> 	unsigned int log2lsize;     /* log2(linesize) */</div><div class='ctx'> 	unsigned int on;            /* VAC is enabled */</div><div class='head'>diff --git a/arch/sparc/include/asm/vfc_ioctls.h b/arch/sparc/include/asm/vfc_ioctls.h<br/>deleted file mode 100644<br/>index af8b69007b22..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/vfc_ioctls.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/include/asm/vfc_ioctls.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,58 +0,0 @@</div><div class='del'>-/* Copyright (c) 1996 by Manish Vachharajani */</div><div class='del'>-</div><div class='del'>-#ifndef _LINUX_VFC_IOCTLS_H_</div><div class='del'>-#define	_LINUX_VFC_IOCTLS_H_</div><div class='del'>-</div><div class='del'>-	/* IOCTLs */</div><div class='del'>-#define VFC_IOCTL(a)          (('j' &lt;&lt; 8) | a)</div><div class='del'>-#define VFCGCTRL	(VFC_IOCTL (0))	        /* get vfc attributes */</div><div class='del'>-#define VFCSCTRL	(VFC_IOCTL (1))  	/* set vfc attributes */</div><div class='del'>-#define VFCGVID		(VFC_IOCTL (2)) 	/* get video decoder attributes */</div><div class='del'>-#define VFCSVID		(VFC_IOCTL (3))	        /* set video decoder attributes */</div><div class='del'>-#define VFCHUE		(VFC_IOCTL (4))   	/* set hue */</div><div class='del'>-#define VFCPORTCHG	(VFC_IOCTL (5))  	/* change port */</div><div class='del'>-#define VFCRDINFO	(VFC_IOCTL (6))  	/* read info */</div><div class='del'>-</div><div class='del'>-	/* Options for setting the vfc attributes and status */</div><div class='del'>-#define MEMPRST		0x1	/* reset FIFO ptr. */</div><div class='del'>-#define CAPTRCMD	0x2	/* start capture and wait */</div><div class='del'>-#define DIAGMODE	0x3	/* diag mode */</div><div class='del'>-#define NORMMODE	0x4	/* normal mode */</div><div class='del'>-#define CAPTRSTR	0x5	/* start capture */</div><div class='del'>-#define CAPTRWAIT	0x6	/* wait for capture to finish */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* Options for the decoder */</div><div class='del'>-#define STD_NTSC	0x1	/* NTSC mode */</div><div class='del'>-#define STD_PAL		0x2	/* PAL mode */</div><div class='del'>-#define COLOR_ON	0x3	/* force color ON */</div><div class='del'>-#define MONO		0x4	/* force color OFF */</div><div class='del'>-</div><div class='del'>-	/* Values returned by ioctl 2 */</div><div class='del'>-</div><div class='del'>-#define NO_LOCK	        1</div><div class='del'>-#define NTSC_COLOR	2</div><div class='del'>-#define NTSC_NOCOLOR    3</div><div class='del'>-#define PAL_COLOR	4</div><div class='del'>-#define PAL_NOCOLOR	5</div><div class='del'>-</div><div class='del'>-/* Not too sure what this does yet */</div><div class='del'>-	/* Options for setting Field number */</div><div class='del'>-#define ODD_FIELD	0x1</div><div class='del'>-#define EVEN_FIELD	0x0</div><div class='del'>-#define ACTIVE_ONLY     0x2</div><div class='del'>-#define NON_ACTIVE	0x0</div><div class='del'>-</div><div class='del'>-/* Debug options */</div><div class='del'>-#define VFC_I2C_SEND 0</div><div class='del'>-#define VFC_I2C_RECV 1</div><div class='del'>-</div><div class='del'>-struct vfc_debug_inout</div><div class='del'>-{</div><div class='del'>-	unsigned long addr;</div><div class='del'>-	unsigned long ret;</div><div class='del'>-	unsigned long len;</div><div class='del'>-	unsigned char __user *buffer;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif /* _LINUX_VFC_IOCTLS_H_ */</div><div class='head'>diff --git a/arch/sparc/include/asm/visasm.h b/arch/sparc/include/asm/visasm.h<br/>index de797b9bf552..39ca301920db 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/visasm.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/include/asm/visasm.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/include/asm/visasm.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/include/asm/visasm.h</a></div><div class='hunk'>@@ -57,6 +57,7 @@ static inline void save_and_clear_fpu(void) {</div><div class='ctx'> "		" : : "i" (FPRS_FEF|FPRS_DU) :</div><div class='ctx'> 		"o5", "g1", "g2", "g3", "g7", "cc");</div><div class='ctx'> }</div><div class='add'>+extern int vis_emul(struct pt_regs *, unsigned int);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #endif /* _SPARC64_ASI_H */</div><div class='head'>diff --git a/arch/sparc/kernel/Makefile b/arch/sparc/kernel/Makefile<br/>index 6e03a2a7863c..2d6582095099 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/kernel/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/kernel/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/kernel/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/kernel/Makefile</a></div><div class='hunk'>@@ -13,15 +13,13 @@ obj-y    := entry.o wof.o wuf.o etrap.o rtrap.o traps.o $(IRQ_OBJS) \</div><div class='ctx'> 	    time.o windows.o cpu.o devices.o \</div><div class='ctx'> 	    tadpole.o tick14.o ptrace.o \</div><div class='ctx'> 	    unaligned.o una_asm.o muldiv.o \</div><div class='del'>-	    prom.o of_device.o devres.o</div><div class='add'>+	    prom.o of_device.o devres.o dma.o</div><div class='ctx'> </div><div class='ctx'> devres-y = ../../../kernel/irq/devres.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_PCI) += pcic.o</div><div class='del'>-obj-$(CONFIG_SUN4) += sun4setup.o</div><div class='ctx'> obj-$(CONFIG_SMP) += trampoline.o smp.o sun4m_smp.o sun4d_smp.o</div><div class='ctx'> obj-$(CONFIG_SUN_AUXIO) += auxio.o</div><div class='del'>-obj-$(CONFIG_PCI) += ebus.o</div><div class='ctx'> obj-$(CONFIG_SUN_PM) += apc.o pmc.o</div><div class='ctx'> obj-$(CONFIG_MODULES) += module.o sparc_ksyms.o</div><div class='ctx'> obj-$(CONFIG_SPARC_LED) += led.o</div><div class='head'>diff --git a/arch/sparc/kernel/apc.c b/arch/sparc/kernel/apc.c<br/>index 5267d48fb2c6..4dd1ba752ce6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/kernel/apc.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/kernel/apc.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/kernel/apc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/kernel/apc.c</a></div><div class='hunk'>@@ -12,9 +12,10 @@</div><div class='ctx'> #include &lt;linux/miscdevice.h&gt;</div><div class='ctx'> #include &lt;linux/smp_lock.h&gt;</div><div class='ctx'> #include &lt;linux/pm.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/sbus.h&gt;</div><div class='ctx'> #include &lt;asm/oplib.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/auxio.h&gt;</div><div class='hunk'>@@ -29,11 +30,10 @@</div><div class='ctx'> #define APC_OBPNAME	"power-management"</div><div class='ctx'> #define APC_DEVNAME "apc"</div><div class='ctx'> </div><div class='del'>-volatile static u8 __iomem *regs; </div><div class='del'>-static int apc_regsize;</div><div class='add'>+static u8 __iomem *regs;</div><div class='ctx'> static int apc_no_idle __initdata = 0;</div><div class='ctx'> </div><div class='del'>-#define apc_readb(offs)			(sbus_readb(regs+offs))</div><div class='add'>+#define apc_readb(offs)		(sbus_readb(regs+offs))</div><div class='ctx'> #define apc_writeb(val, offs) 	(sbus_writeb(val, regs+offs))</div><div class='ctx'> </div><div class='ctx'> /* Specify "apc=noidle" on the kernel command line to </div><div class='hunk'>@@ -69,9 +69,9 @@ static void apc_swift_idle(void)</div><div class='ctx'> #endif</div><div class='ctx'> } </div><div class='ctx'> </div><div class='del'>-static inline void apc_free(void)</div><div class='add'>+static inline void apc_free(struct of_device *op)</div><div class='ctx'> {</div><div class='del'>-	sbus_iounmap(regs, apc_regsize);</div><div class='add'>+	of_iounmap(&amp;op-&gt;resource[0], regs, resource_size(&amp;op-&gt;resource[0]));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int apc_open(struct inode *inode, struct file *f)</div><div class='hunk'>@@ -153,52 +153,56 @@ static const struct file_operations apc_fops = {</div><div class='ctx'> </div><div class='ctx'> static struct miscdevice apc_miscdev = { APC_MINOR, APC_DEVNAME, &amp;apc_fops };</div><div class='ctx'> </div><div class='del'>-static int __init apc_probe(void)</div><div class='add'>+static int __devinit apc_probe(struct of_device *op,</div><div class='add'>+			       const struct of_device_id *match)</div><div class='ctx'> {</div><div class='del'>-	struct sbus_bus *sbus = NULL;</div><div class='del'>-	struct sbus_dev *sdev = NULL;</div><div class='del'>-	int iTmp = 0;</div><div class='del'>-</div><div class='del'>-	for_each_sbus(sbus) {</div><div class='del'>-		for_each_sbusdev(sdev, sbus) {</div><div class='del'>-			if (!strcmp(sdev-&gt;prom_name, APC_OBPNAME)) {</div><div class='del'>-				goto sbus_done;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-sbus_done:</div><div class='del'>-	if (!sdev) {</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	apc_regsize = sdev-&gt;reg_addrs[0].reg_size;</div><div class='del'>-	regs = sbus_ioremap(&amp;sdev-&gt;resource[0], 0, </div><div class='del'>-				   apc_regsize, APC_OBPNAME);</div><div class='del'>-	if(!regs) {</div><div class='add'>+	regs = of_ioremap(&amp;op-&gt;resource[0], 0,</div><div class='add'>+			  resource_size(&amp;op-&gt;resource[0]), APC_OBPNAME);</div><div class='add'>+	if (!regs) {</div><div class='ctx'> 		printk(KERN_ERR "%s: unable to map registers\n", APC_DEVNAME);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	iTmp = misc_register(&amp;apc_miscdev);</div><div class='del'>-	if (iTmp != 0) {</div><div class='add'>+	err = misc_register(&amp;apc_miscdev);</div><div class='add'>+	if (err) {</div><div class='ctx'> 		printk(KERN_ERR "%s: unable to register device\n", APC_DEVNAME);</div><div class='del'>-		apc_free();</div><div class='add'>+		apc_free(op);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Assign power management IDLE handler */</div><div class='del'>-	if(!apc_no_idle)</div><div class='add'>+	if (!apc_no_idle)</div><div class='ctx'> 		pm_idle = apc_swift_idle;	</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_INFO "%s: power management initialized%s\n", </div><div class='del'>-		APC_DEVNAME, apc_no_idle ? " (CPU idle disabled)" : "");</div><div class='add'>+	       APC_DEVNAME, apc_no_idle ? " (CPU idle disabled)" : "");</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct of_device_id __initdata apc_match[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = APC_OBPNAME,</div><div class='add'>+	},</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, apc_match);</div><div class='add'>+</div><div class='add'>+static struct of_platform_driver apc_driver = {</div><div class='add'>+	.name		= "apc",</div><div class='add'>+	.match_table	= apc_match,</div><div class='add'>+	.probe		= apc_probe,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init apc_init(void)</div><div class='add'>+{</div><div class='add'>+	return of_register_driver(&amp;apc_driver, &amp;of_bus_type);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* This driver is not critical to the boot process</div><div class='ctx'>  * and is easiest to ioremap when SBus is already</div><div class='ctx'>  * initialized, so we install ourselves thusly:</div><div class='ctx'>  */</div><div class='del'>-__initcall(apc_probe);</div><div class='del'>-</div><div class='add'>+__initcall(apc_init);</div><div class='head'>diff --git a/arch/sparc/kernel/auxio.c b/arch/sparc/kernel/auxio.c<br/>index baf4ed3fb0f3..09c857215a52 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/kernel/auxio.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/kernel/auxio.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/kernel/auxio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/kernel/auxio.c</a></div><div class='hunk'>@@ -6,6 +6,8 @@</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_device.h&gt;</div><div class='ctx'> #include &lt;asm/oplib.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/auxio.h&gt;</div><div class='hunk'>@@ -59,7 +61,7 @@ void __init auxio_probe(void)</div><div class='ctx'> 	r.flags = auxregs[0].which_io &amp; 0xF;</div><div class='ctx'> 	r.start = auxregs[0].phys_addr;</div><div class='ctx'> 	r.end = auxregs[0].phys_addr + auxregs[0].reg_size - 1;</div><div class='del'>-	auxio_register = sbus_ioremap(&amp;r, 0, auxregs[0].reg_size, "auxio");</div><div class='add'>+	auxio_register = of_ioremap(&amp;r, 0, auxregs[0].reg_size, "auxio");</div><div class='ctx'> 	/* Fix the address on sun4m and sun4c. */</div><div class='ctx'> 	if((((unsigned long) auxregs[0].phys_addr) &amp; 3) == 3 ||</div><div class='ctx'> 	   sparc_cpu_model == sun4c)</div><div class='hunk'>@@ -128,7 +130,7 @@ void __init auxio_power_probe(void)</div><div class='ctx'> 	r.flags = regs.which_io &amp; 0xF;</div><div class='ctx'> 	r.start = regs.phys_addr;</div><div class='ctx'> 	r.end = regs.phys_addr + regs.reg_size - 1;</div><div class='del'>-	auxio_power_register = (unsigned char *) sbus_ioremap(&amp;r, 0,</div><div class='add'>+	auxio_power_register = (unsigned char *) of_ioremap(&amp;r, 0,</div><div class='ctx'> 	    regs.reg_size, "auxpower");</div><div class='ctx'> </div><div class='ctx'> 	/* Display a quick message on the console. */</div><div class='head'>diff --git a/arch/sparc/kernel/devices.c b/arch/sparc/kernel/devices.c<br/>index b240b8863fd0..ad656b044b8c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/kernel/devices.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/kernel/devices.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/kernel/devices.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/kernel/devices.c</a></div><div class='hunk'>@@ -143,7 +143,7 @@ void __init device_scan(void)</div><div class='ctx'> #endif</div><div class='ctx'> 	clock_stop_probe();</div><div class='ctx'> </div><div class='del'>-	if (ARCH_SUN4C_SUN4)</div><div class='add'>+	if (ARCH_SUN4C)</div><div class='ctx'> 		sun4c_probe_memerr_reg();</div><div class='ctx'> </div><div class='ctx'> 	return;</div><div class='head'>diff --git a/arch/sparc/kernel/dma.c b/arch/sparc/kernel/dma.c<br/>new file mode 100644<br/>index 000000000000..ebc8403b035e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/kernel/dma.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/kernel/dma.c</a></div><div class='hunk'>@@ -0,0 +1,227 @@</div><div class='add'>+/* dma.c: PCI and SBUS DMA accessors for 32-bit sparc.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2008 David S. Miller &lt;davem@davemloft.net&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/scatterlist.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PCI</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#include "dma.h"</div><div class='add'>+</div><div class='add'>+int dma_supported(struct device *dev, u64 mask)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_PCI</div><div class='add'>+	if (dev-&gt;bus == &amp;pci_bus_type)</div><div class='add'>+		return pci_dma_supported(to_pci_dev(dev), mask);</div><div class='add'>+#endif</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dma_supported);</div><div class='add'>+</div><div class='add'>+int dma_set_mask(struct device *dev, u64 dma_mask)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_PCI</div><div class='add'>+	if (dev-&gt;bus == &amp;pci_bus_type)</div><div class='add'>+		return pci_set_dma_mask(to_pci_dev(dev), dma_mask);</div><div class='add'>+#endif</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dma_set_mask);</div><div class='add'>+</div><div class='add'>+void *dma_alloc_coherent(struct device *dev, size_t size,</div><div class='add'>+			 dma_addr_t *dma_handle, gfp_t flag)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_PCI</div><div class='add'>+	if (dev-&gt;bus == &amp;pci_bus_type)</div><div class='add'>+		return pci_alloc_consistent(to_pci_dev(dev), size, dma_handle);</div><div class='add'>+#endif</div><div class='add'>+	return sbus_alloc_consistent(dev, size, dma_handle);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dma_alloc_coherent);</div><div class='add'>+</div><div class='add'>+void dma_free_coherent(struct device *dev, size_t size,</div><div class='add'>+		       void *cpu_addr, dma_addr_t dma_handle)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_PCI</div><div class='add'>+	if (dev-&gt;bus == &amp;pci_bus_type) {</div><div class='add'>+		pci_free_consistent(to_pci_dev(dev), size,</div><div class='add'>+				    cpu_addr, dma_handle);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	sbus_free_consistent(dev, size, cpu_addr, dma_handle);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dma_free_coherent);</div><div class='add'>+</div><div class='add'>+dma_addr_t dma_map_single(struct device *dev, void *cpu_addr,</div><div class='add'>+			  size_t size, enum dma_data_direction direction)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_PCI</div><div class='add'>+	if (dev-&gt;bus == &amp;pci_bus_type)</div><div class='add'>+		return pci_map_single(to_pci_dev(dev), cpu_addr,</div><div class='add'>+				      size, (int)direction);</div><div class='add'>+#endif</div><div class='add'>+	return sbus_map_single(dev, cpu_addr, size, (int)direction);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dma_map_single);</div><div class='add'>+</div><div class='add'>+void dma_unmap_single(struct device *dev, dma_addr_t dma_addr,</div><div class='add'>+		      size_t size,</div><div class='add'>+		      enum dma_data_direction direction)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_PCI</div><div class='add'>+	if (dev-&gt;bus == &amp;pci_bus_type) {</div><div class='add'>+		pci_unmap_single(to_pci_dev(dev), dma_addr,</div><div class='add'>+				 size, (int)direction);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	sbus_unmap_single(dev, dma_addr, size, (int)direction);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dma_unmap_single);</div><div class='add'>+</div><div class='add'>+dma_addr_t dma_map_page(struct device *dev, struct page *page,</div><div class='add'>+			unsigned long offset, size_t size,</div><div class='add'>+			enum dma_data_direction direction)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_PCI</div><div class='add'>+	if (dev-&gt;bus == &amp;pci_bus_type)</div><div class='add'>+		return pci_map_page(to_pci_dev(dev), page, offset,</div><div class='add'>+				    size, (int)direction);</div><div class='add'>+#endif</div><div class='add'>+	return sbus_map_single(dev, page_address(page) + offset,</div><div class='add'>+			       size, (int)direction);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dma_map_page);</div><div class='add'>+</div><div class='add'>+void dma_unmap_page(struct device *dev, dma_addr_t dma_address,</div><div class='add'>+		    size_t size, enum dma_data_direction direction)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_PCI</div><div class='add'>+	if (dev-&gt;bus == &amp;pci_bus_type) {</div><div class='add'>+		pci_unmap_page(to_pci_dev(dev), dma_address,</div><div class='add'>+			       size, (int)direction);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	sbus_unmap_single(dev, dma_address, size, (int)direction);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dma_unmap_page);</div><div class='add'>+</div><div class='add'>+int dma_map_sg(struct device *dev, struct scatterlist *sg,</div><div class='add'>+			     int nents, enum dma_data_direction direction)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_PCI</div><div class='add'>+	if (dev-&gt;bus == &amp;pci_bus_type)</div><div class='add'>+		return pci_map_sg(to_pci_dev(dev), sg, nents, (int)direction);</div><div class='add'>+#endif</div><div class='add'>+	return sbus_map_sg(dev, sg, nents, direction);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dma_map_sg);</div><div class='add'>+</div><div class='add'>+void dma_unmap_sg(struct device *dev, struct scatterlist *sg,</div><div class='add'>+		  int nents, enum dma_data_direction direction)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_PCI</div><div class='add'>+	if (dev-&gt;bus == &amp;pci_bus_type) {</div><div class='add'>+		pci_unmap_sg(to_pci_dev(dev), sg, nents, (int)direction);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	sbus_unmap_sg(dev, sg, nents, (int)direction);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dma_unmap_sg);</div><div class='add'>+</div><div class='add'>+void dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma_handle,</div><div class='add'>+			     size_t size, enum dma_data_direction direction)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_PCI</div><div class='add'>+	if (dev-&gt;bus == &amp;pci_bus_type) {</div><div class='add'>+		pci_dma_sync_single_for_cpu(to_pci_dev(dev), dma_handle,</div><div class='add'>+					    size, (int)direction);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	sbus_dma_sync_single_for_cpu(dev, dma_handle, size, (int) direction);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dma_sync_single_for_cpu);</div><div class='add'>+</div><div class='add'>+void dma_sync_single_for_device(struct device *dev, dma_addr_t dma_handle,</div><div class='add'>+				size_t size, enum dma_data_direction direction)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_PCI</div><div class='add'>+	if (dev-&gt;bus == &amp;pci_bus_type) {</div><div class='add'>+		pci_dma_sync_single_for_device(to_pci_dev(dev), dma_handle,</div><div class='add'>+					       size, (int)direction);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	sbus_dma_sync_single_for_device(dev, dma_handle, size, (int) direction);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dma_sync_single_for_device);</div><div class='add'>+</div><div class='add'>+void dma_sync_single_range_for_cpu(struct device *dev,</div><div class='add'>+				   dma_addr_t dma_handle,</div><div class='add'>+				   unsigned long offset,</div><div class='add'>+				   size_t size,</div><div class='add'>+				   enum dma_data_direction direction)</div><div class='add'>+{</div><div class='add'>+	dma_sync_single_for_cpu(dev, dma_handle+offset, size, direction);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dma_sync_single_range_for_cpu);</div><div class='add'>+</div><div class='add'>+void dma_sync_single_range_for_device(struct device *dev, dma_addr_t dma_handle,</div><div class='add'>+				      unsigned long offset, size_t size,</div><div class='add'>+				      enum dma_data_direction direction)</div><div class='add'>+{</div><div class='add'>+	dma_sync_single_for_device(dev, dma_handle+offset, size, direction);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dma_sync_single_range_for_device);</div><div class='add'>+</div><div class='add'>+void dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg,</div><div class='add'>+			 int nelems, enum dma_data_direction direction)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_PCI</div><div class='add'>+	if (dev-&gt;bus == &amp;pci_bus_type) {</div><div class='add'>+		pci_dma_sync_sg_for_cpu(to_pci_dev(dev), sg,</div><div class='add'>+					nelems, (int)direction);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	BUG();</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dma_sync_sg_for_cpu);</div><div class='add'>+</div><div class='add'>+void dma_sync_sg_for_device(struct device *dev,</div><div class='add'>+			    struct scatterlist *sg, int nelems,</div><div class='add'>+			    enum dma_data_direction direction)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_PCI</div><div class='add'>+	if (dev-&gt;bus == &amp;pci_bus_type) {</div><div class='add'>+		pci_dma_sync_sg_for_device(to_pci_dev(dev), sg,</div><div class='add'>+					   nelems, (int)direction);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	BUG();</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dma_sync_sg_for_device);</div><div class='add'>+</div><div class='add'>+int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)</div><div class='add'>+{</div><div class='add'>+	return (dma_addr == DMA_ERROR_CODE);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dma_mapping_error);</div><div class='add'>+</div><div class='add'>+int dma_get_cache_alignment(void)</div><div class='add'>+{</div><div class='add'>+	return 32;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dma_get_cache_alignment);</div><div class='head'>diff --git a/arch/sparc/kernel/dma.h b/arch/sparc/kernel/dma.h<br/>new file mode 100644<br/>index 000000000000..f8d8951adb53<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/kernel/dma.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/kernel/dma.h</a></div><div class='hunk'>@@ -0,0 +1,14 @@</div><div class='add'>+void *sbus_alloc_consistent(struct device *dev, long len, u32 *dma_addrp);</div><div class='add'>+void sbus_free_consistent(struct device *dev, long n, void *p, u32 ba);</div><div class='add'>+dma_addr_t sbus_map_single(struct device *dev, void *va,</div><div class='add'>+			   size_t len, int direction);</div><div class='add'>+void sbus_unmap_single(struct device *dev, dma_addr_t ba,</div><div class='add'>+		       size_t n, int direction);</div><div class='add'>+int sbus_map_sg(struct device *dev, struct scatterlist *sg,</div><div class='add'>+		int n, int direction);</div><div class='add'>+void sbus_unmap_sg(struct device *dev, struct scatterlist *sg,</div><div class='add'>+		   int n, int direction);</div><div class='add'>+void sbus_dma_sync_single_for_cpu(struct device *dev, dma_addr_t ba,</div><div class='add'>+				  size_t size, int direction);</div><div class='add'>+void sbus_dma_sync_single_for_device(struct device *dev, dma_addr_t ba,</div><div class='add'>+				     size_t size, int direction);</div><div class='head'>diff --git a/arch/sparc/kernel/ebus.c b/arch/sparc/kernel/ebus.c<br/>deleted file mode 100644<br/>index 97294232259c..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/kernel/ebus.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/kernel/ebus.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,393 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * ebus.c: PCI to EBus bridge device.</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1997  Eddie C. Dost  (ecd@skynet.be)</div><div class='del'>- *</div><div class='del'>- * Adopted for sparc by V. Roganov and G. Raiko.</div><div class='del'>- * Fixes for different platforms by Pete Zaitcev.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/system.h&gt;</div><div class='del'>-#include &lt;asm/page.h&gt;</div><div class='del'>-#include &lt;asm/pbm.h&gt;</div><div class='del'>-#include &lt;asm/ebus.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/oplib.h&gt;</div><div class='del'>-#include &lt;asm/prom.h&gt;</div><div class='del'>-#include &lt;asm/bpp.h&gt;</div><div class='del'>-</div><div class='del'>-struct linux_ebus *ebus_chain = NULL;</div><div class='del'>-</div><div class='del'>-/* We are together with pcic.c under CONFIG_PCI. */</div><div class='del'>-extern unsigned int pcic_pin_to_irq(unsigned int, const char *name);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * IRQ Blacklist</div><div class='del'>- * Here we list PROMs and systems that are known to supply crap as IRQ numbers.</div><div class='del'>- */</div><div class='del'>-struct ebus_device_irq {</div><div class='del'>-	char *name;</div><div class='del'>-	unsigned int pin;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct ebus_system_entry {</div><div class='del'>-	char *esname;</div><div class='del'>-	struct ebus_device_irq *ipt;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct ebus_device_irq je1_1[] = {</div><div class='del'>-	{ "8042",		 3 },</div><div class='del'>-	{ "SUNW,CS4231",	 0 },</div><div class='del'>-	{ "parallel",		 0 },</div><div class='del'>-	{ "se",			 2 },</div><div class='del'>-	{ NULL, 0 }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Gleb's JE1 supplied reasonable pin numbers, but mine did not (OBP 2.32).</div><div class='del'>- * Blacklist the sucker... Note that Gleb's system will work.</div><div class='del'>- */</div><div class='del'>-static struct ebus_system_entry ebus_blacklist[] = {</div><div class='del'>-	{ "SUNW,JavaEngine1", je1_1 },</div><div class='del'>-	{ NULL, NULL }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct ebus_device_irq *ebus_blackp = NULL;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- */</div><div class='del'>-static inline unsigned long ebus_alloc(size_t size)</div><div class='del'>-{</div><div class='del'>-	return (unsigned long)kmalloc(size, GFP_ATOMIC);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- */</div><div class='del'>-static int __init ebus_blacklist_irq(const char *name)</div><div class='del'>-{</div><div class='del'>-	struct ebus_device_irq *dp;</div><div class='del'>-</div><div class='del'>-	if ((dp = ebus_blackp) != NULL) {</div><div class='del'>-		for (; dp-&gt;name != NULL; dp++) {</div><div class='del'>-			if (strcmp(name, dp-&gt;name) == 0) {</div><div class='del'>-				return pcic_pin_to_irq(dp-&gt;pin, name);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __init fill_ebus_child(struct device_node *dp,</div><div class='del'>-				   struct linux_ebus_child *dev)</div><div class='del'>-{</div><div class='del'>-	const int *regs;</div><div class='del'>-	const int *irqs;</div><div class='del'>-	int i, len;</div><div class='del'>-</div><div class='del'>-	dev-&gt;prom_node = dp;</div><div class='del'>-	regs = of_get_property(dp, "reg", &amp;len);</div><div class='del'>-	if (!regs)</div><div class='del'>-		len = 0;</div><div class='del'>-	dev-&gt;num_addrs = len / sizeof(regs[0]);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; dev-&gt;num_addrs; i++) {</div><div class='del'>-		if (regs[i] &gt;= dev-&gt;parent-&gt;num_addrs) {</div><div class='del'>-			prom_printf("UGH: property for %s was %d, need &lt; %d\n",</div><div class='del'>-				    dev-&gt;prom_node-&gt;name, len,</div><div class='del'>-				    dev-&gt;parent-&gt;num_addrs);</div><div class='del'>-			panic(__func__);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* XXX resource */</div><div class='del'>-		dev-&gt;resource[i].start =</div><div class='del'>-			dev-&gt;parent-&gt;resource[regs[i]].start;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; PROMINTR_MAX; i++)</div><div class='del'>-		dev-&gt;irqs[i] = PCI_IRQ_NONE;</div><div class='del'>-</div><div class='del'>-	if ((dev-&gt;irqs[0] = ebus_blacklist_irq(dev-&gt;prom_node-&gt;name)) != 0) {</div><div class='del'>-		dev-&gt;num_irqs = 1;</div><div class='del'>-	} else {</div><div class='del'>-		irqs = of_get_property(dp, "interrupts", &amp;len);</div><div class='del'>-		if (!irqs) {</div><div class='del'>-			dev-&gt;num_irqs = 0;</div><div class='del'>-			dev-&gt;irqs[0] = 0;</div><div class='del'>-			if (dev-&gt;parent-&gt;num_irqs != 0) {</div><div class='del'>-				dev-&gt;num_irqs = 1;</div><div class='del'>-				dev-&gt;irqs[0] = dev-&gt;parent-&gt;irqs[0];</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			dev-&gt;num_irqs = len / sizeof(irqs[0]);</div><div class='del'>-			if (irqs[0] == 0 || irqs[0] &gt;= 8) {</div><div class='del'>-				/*</div><div class='del'>-				 * XXX Zero is a valid pin number...</div><div class='del'>-				 * This works as long as Ebus is not wired</div><div class='del'>-				 * to INTA#.</div><div class='del'>-				 */</div><div class='del'>-				printk("EBUS: %s got bad irq %d from PROM\n",</div><div class='del'>-				       dev-&gt;prom_node-&gt;name, irqs[0]);</div><div class='del'>-				dev-&gt;num_irqs = 0;</div><div class='del'>-				dev-&gt;irqs[0] = 0;</div><div class='del'>-			} else {</div><div class='del'>-				dev-&gt;irqs[0] =</div><div class='del'>-					pcic_pin_to_irq(irqs[0],</div><div class='del'>-							dev-&gt;prom_node-&gt;name);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __init fill_ebus_device(struct device_node *dp,</div><div class='del'>-				    struct linux_ebus_device *dev)</div><div class='del'>-{</div><div class='del'>-	const struct linux_prom_registers *regs;</div><div class='del'>-	struct linux_ebus_child *child;</div><div class='del'>-	struct dev_archdata *sd;</div><div class='del'>-	const int *irqs;</div><div class='del'>-	int i, n, len;</div><div class='del'>-	unsigned long baseaddr;</div><div class='del'>-</div><div class='del'>-	dev-&gt;prom_node = dp;</div><div class='del'>-</div><div class='del'>-	regs = of_get_property(dp, "reg", &amp;len);</div><div class='del'>-	if (!regs)</div><div class='del'>-		len = 0;</div><div class='del'>-	if (len % sizeof(struct linux_prom_registers)) {</div><div class='del'>-		prom_printf("UGH: proplen for %s was %d, need multiple of %d\n",</div><div class='del'>-			    dev-&gt;prom_node-&gt;name, len,</div><div class='del'>-			    (int)sizeof(struct linux_prom_registers));</div><div class='del'>-		panic(__func__);</div><div class='del'>-	}</div><div class='del'>-	dev-&gt;num_addrs = len / sizeof(struct linux_prom_registers);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; dev-&gt;num_addrs; i++) {</div><div class='del'>-		/*</div><div class='del'>-		 * XXX Collect JE-1 PROM</div><div class='del'>-		 * </div><div class='del'>-		 * Example - JS-E with 3.11:</div><div class='del'>-		 *  /ebus</div><div class='del'>-		 *      regs </div><div class='del'>-		 *        0x00000000, 0x0, 0x00000000, 0x0, 0x00000000,</div><div class='del'>-		 *        0x82000010, 0x0, 0xf0000000, 0x0, 0x01000000,</div><div class='del'>-		 *        0x82000014, 0x0, 0x38800000, 0x0, 0x00800000,</div><div class='del'>-		 *      ranges</div><div class='del'>-		 *        0x00, 0x00000000, 0x02000010, 0x0, 0x0, 0x01000000,</div><div class='del'>-		 *        0x01, 0x01000000, 0x02000014, 0x0, 0x0, 0x00800000,</div><div class='del'>-		 *  /ebus/8042</div><div class='del'>-		 *      regs</div><div class='del'>-		 *        0x00000001, 0x00300060, 0x00000008,</div><div class='del'>-		 *        0x00000001, 0x00300060, 0x00000008,</div><div class='del'>-		 */</div><div class='del'>-		n = regs[i].which_io;</div><div class='del'>-		if (n &gt;= 4) {</div><div class='del'>-			/* XXX This is copied from old JE-1 by Gleb. */</div><div class='del'>-			n = (regs[i].which_io - 0x10) &gt;&gt; 2;</div><div class='del'>-		} else {</div><div class='del'>-			;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * XXX Now as we have regions, why don't we make an on-demand allocation...</div><div class='del'>- */</div><div class='del'>-		dev-&gt;resource[i].start = 0;</div><div class='del'>-		if ((baseaddr = dev-&gt;bus-&gt;self-&gt;resource[n].start +</div><div class='del'>-		    regs[i].phys_addr) != 0) {</div><div class='del'>-			/* dev-&gt;resource[i].name = dev-&gt;prom_name; */</div><div class='del'>-			if ((baseaddr = (unsigned long) ioremap(baseaddr,</div><div class='del'>-			    regs[i].reg_size)) == 0) {</div><div class='del'>-				panic("ebus: unable to remap dev %s",</div><div class='del'>-				      dev-&gt;prom_node-&gt;name);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		dev-&gt;resource[i].start = baseaddr;	/* XXX Unaligned */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; PROMINTR_MAX; i++)</div><div class='del'>-		dev-&gt;irqs[i] = PCI_IRQ_NONE;</div><div class='del'>-</div><div class='del'>-	if ((dev-&gt;irqs[0] = ebus_blacklist_irq(dev-&gt;prom_node-&gt;name)) != 0) {</div><div class='del'>-		dev-&gt;num_irqs = 1;</div><div class='del'>-	} else {</div><div class='del'>-		irqs = of_get_property(dp, "interrupts", &amp;len);</div><div class='del'>-		if (!irqs) {</div><div class='del'>-			dev-&gt;num_irqs = 0;</div><div class='del'>-			if ((dev-&gt;irqs[0] = dev-&gt;bus-&gt;self-&gt;irq) != 0) {</div><div class='del'>-				dev-&gt;num_irqs = 1;</div><div class='del'>-/* P3 */ /* printk("EBUS: child %s irq %d from parent\n", dev-&gt;prom_name, dev-&gt;irqs[0]); */</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			dev-&gt;num_irqs = 1;  /* dev-&gt;num_irqs = len / sizeof(irqs[0]); */</div><div class='del'>-			if (irqs[0] == 0 || irqs[0] &gt;= 8) {</div><div class='del'>-				/* See above for the parent. XXX */</div><div class='del'>-				printk("EBUS: %s got bad irq %d from PROM\n",</div><div class='del'>-				       dev-&gt;prom_node-&gt;name, irqs[0]);</div><div class='del'>-				dev-&gt;num_irqs = 0;</div><div class='del'>-				dev-&gt;irqs[0] = 0;</div><div class='del'>-			} else {</div><div class='del'>-				dev-&gt;irqs[0] =</div><div class='del'>-					pcic_pin_to_irq(irqs[0],</div><div class='del'>-							dev-&gt;prom_node-&gt;name);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	sd = &amp;dev-&gt;ofdev.dev.archdata;</div><div class='del'>-	sd-&gt;prom_node = dp;</div><div class='del'>-	sd-&gt;op = &amp;dev-&gt;ofdev;</div><div class='del'>-	sd-&gt;iommu = dev-&gt;bus-&gt;ofdev.dev.parent-&gt;archdata.iommu;</div><div class='del'>-</div><div class='del'>-	dev-&gt;ofdev.node = dp;</div><div class='del'>-	dev-&gt;ofdev.dev.parent = &amp;dev-&gt;bus-&gt;ofdev.dev;</div><div class='del'>-	dev-&gt;ofdev.dev.bus = &amp;ebus_bus_type;</div><div class='del'>-	sprintf(dev-&gt;ofdev.dev.bus_id, "ebus[%08x]", dp-&gt;node);</div><div class='del'>-</div><div class='del'>-	/* Register with core */</div><div class='del'>-	if (of_device_register(&amp;dev-&gt;ofdev) != 0)</div><div class='del'>-		printk(KERN_DEBUG "ebus: device registration error for %s!\n",</div><div class='del'>-		       dp-&gt;path_component_name);</div><div class='del'>-</div><div class='del'>-	if ((dp = dp-&gt;child) != NULL) {</div><div class='del'>-		dev-&gt;children = (struct linux_ebus_child *)</div><div class='del'>-			ebus_alloc(sizeof(struct linux_ebus_child));</div><div class='del'>-</div><div class='del'>-		child = dev-&gt;children;</div><div class='del'>-		child-&gt;next = NULL;</div><div class='del'>-		child-&gt;parent = dev;</div><div class='del'>-		child-&gt;bus = dev-&gt;bus;</div><div class='del'>-		fill_ebus_child(dp, child);</div><div class='del'>-</div><div class='del'>-		while ((dp = dp-&gt;sibling) != NULL) {</div><div class='del'>-			child-&gt;next = (struct linux_ebus_child *)</div><div class='del'>-				ebus_alloc(sizeof(struct linux_ebus_child));</div><div class='del'>-</div><div class='del'>-			child = child-&gt;next;</div><div class='del'>-			child-&gt;next = NULL;</div><div class='del'>-			child-&gt;parent = dev;</div><div class='del'>-			child-&gt;bus = dev-&gt;bus;</div><div class='del'>-			fill_ebus_child(dp, child);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __init ebus_init(void)</div><div class='del'>-{</div><div class='del'>-	const struct linux_prom_pci_registers *regs;</div><div class='del'>-	struct linux_pbm_info *pbm;</div><div class='del'>-	struct linux_ebus_device *dev;</div><div class='del'>-	struct linux_ebus *ebus;</div><div class='del'>-	struct ebus_system_entry *sp;</div><div class='del'>-	struct pci_dev *pdev;</div><div class='del'>-	struct pcidev_cookie *cookie;</div><div class='del'>-	struct device_node *dp;</div><div class='del'>-	struct resource *p;</div><div class='del'>-	unsigned short pci_command;</div><div class='del'>-	int len, reg, nreg;</div><div class='del'>-	int num_ebus = 0;</div><div class='del'>-</div><div class='del'>-	dp = of_find_node_by_path("/");</div><div class='del'>-	for (sp = ebus_blacklist; sp-&gt;esname != NULL; sp++) {</div><div class='del'>-		if (strcmp(dp-&gt;name, sp-&gt;esname) == 0) {</div><div class='del'>-			ebus_blackp = sp-&gt;ipt;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pdev = pci_get_device(PCI_VENDOR_ID_SUN, PCI_DEVICE_ID_SUN_EBUS, NULL);</div><div class='del'>-	if (!pdev)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	cookie = pdev-&gt;sysdata;</div><div class='del'>-	dp = cookie-&gt;prom_node;</div><div class='del'>-</div><div class='del'>-	ebus_chain = ebus = (struct linux_ebus *)</div><div class='del'>-			ebus_alloc(sizeof(struct linux_ebus));</div><div class='del'>-	ebus-&gt;next = NULL;</div><div class='del'>-</div><div class='del'>-	while (dp) {</div><div class='del'>-		struct device_node *nd;</div><div class='del'>-</div><div class='del'>-		ebus-&gt;prom_node = dp;</div><div class='del'>-		ebus-&gt;self = pdev;</div><div class='del'>-		ebus-&gt;parent = pbm = cookie-&gt;pbm;</div><div class='del'>-</div><div class='del'>-		/* Enable BUS Master. */</div><div class='del'>-		pci_read_config_word(pdev, PCI_COMMAND, &amp;pci_command);</div><div class='del'>-		pci_command |= PCI_COMMAND_MASTER;</div><div class='del'>-		pci_write_config_word(pdev, PCI_COMMAND, pci_command);</div><div class='del'>-</div><div class='del'>-		regs = of_get_property(dp, "reg", &amp;len);</div><div class='del'>-		if (!regs) {</div><div class='del'>-			prom_printf("%s: can't find reg property\n",</div><div class='del'>-				    __func__);</div><div class='del'>-			prom_halt();</div><div class='del'>-		}</div><div class='del'>-		nreg = len / sizeof(struct linux_prom_pci_registers);</div><div class='del'>-</div><div class='del'>-		p = &amp;ebus-&gt;self-&gt;resource[0];</div><div class='del'>-		for (reg = 0; reg &lt; nreg; reg++) {</div><div class='del'>-			if (!(regs[reg].which_io &amp; 0x03000000))</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			(p++)-&gt;start = regs[reg].phys_lo;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ebus-&gt;ofdev.node = dp;</div><div class='del'>-		ebus-&gt;ofdev.dev.parent = &amp;pdev-&gt;dev;</div><div class='del'>-		ebus-&gt;ofdev.dev.bus = &amp;ebus_bus_type;</div><div class='del'>-		sprintf(ebus-&gt;ofdev.dev.bus_id, "ebus%d", num_ebus);</div><div class='del'>-</div><div class='del'>-		/* Register with core */</div><div class='del'>-		if (of_device_register(&amp;ebus-&gt;ofdev) != 0)</div><div class='del'>-			printk(KERN_DEBUG "ebus: device registration error for %s!\n",</div><div class='del'>-			       dp-&gt;path_component_name);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-		nd = dp-&gt;child;</div><div class='del'>-		if (!nd)</div><div class='del'>-			goto next_ebus;</div><div class='del'>-</div><div class='del'>-		ebus-&gt;devices = (struct linux_ebus_device *)</div><div class='del'>-				ebus_alloc(sizeof(struct linux_ebus_device));</div><div class='del'>-</div><div class='del'>-		dev = ebus-&gt;devices;</div><div class='del'>-		dev-&gt;next = NULL;</div><div class='del'>-		dev-&gt;children = NULL;</div><div class='del'>-		dev-&gt;bus = ebus;</div><div class='del'>-		fill_ebus_device(nd, dev);</div><div class='del'>-</div><div class='del'>-		while ((nd = nd-&gt;sibling) != NULL) {</div><div class='del'>-			dev-&gt;next = (struct linux_ebus_device *)</div><div class='del'>-				ebus_alloc(sizeof(struct linux_ebus_device));</div><div class='del'>-</div><div class='del'>-			dev = dev-&gt;next;</div><div class='del'>-			dev-&gt;next = NULL;</div><div class='del'>-			dev-&gt;children = NULL;</div><div class='del'>-			dev-&gt;bus = ebus;</div><div class='del'>-			fill_ebus_device(nd, dev);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	next_ebus:</div><div class='del'>-		pdev = pci_get_device(PCI_VENDOR_ID_SUN,</div><div class='del'>-				       PCI_DEVICE_ID_SUN_EBUS, pdev);</div><div class='del'>-		if (!pdev)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		cookie = pdev-&gt;sysdata;</div><div class='del'>-		dp = cookie-&gt;prom_node;</div><div class='del'>-</div><div class='del'>-		ebus-&gt;next = (struct linux_ebus *)</div><div class='del'>-			ebus_alloc(sizeof(struct linux_ebus));</div><div class='del'>-		ebus = ebus-&gt;next;</div><div class='del'>-		ebus-&gt;next = NULL;</div><div class='del'>-		++num_ebus;</div><div class='del'>-	}</div><div class='del'>-	if (pdev)</div><div class='del'>-		pci_dev_put(pdev);</div><div class='del'>-}</div><div class='head'>diff --git a/arch/sparc/kernel/entry.S b/arch/sparc/kernel/entry.S<br/>index e8cdf715a546..faf9ccd9ef5d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/kernel/entry.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/kernel/entry.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/kernel/entry.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/kernel/entry.S</a></div><div class='hunk'>@@ -20,11 +20,7 @@</div><div class='ctx'> #include &lt;asm/memreg.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='del'>-#ifdef CONFIG_SUN4</div><div class='del'>-#include &lt;asm/pgtsun4.h&gt;</div><div class='del'>-#else</div><div class='ctx'> #include &lt;asm/pgtsun4c.h&gt;</div><div class='del'>-#endif</div><div class='ctx'> #include &lt;asm/winmacro.h&gt;</div><div class='ctx'> #include &lt;asm/signal.h&gt;</div><div class='ctx'> #include &lt;asm/obio.h&gt;</div><div class='hunk'>@@ -276,17 +272,18 @@ smp4m_ticker:</div><div class='ctx'> 	 */</div><div class='ctx'> maybe_smp4m_msg:</div><div class='ctx'> 	GET_PROCESSOR4M_ID(o3)</div><div class='del'>-	set	sun4m_interrupts, %l5</div><div class='del'>-	ld	[%l5], %o5</div><div class='add'>+	sethi	%hi(sun4m_irq_percpu), %l5</div><div class='add'>+	sll	%o3, 2, %o3</div><div class='add'>+	or	%l5, %lo(sun4m_irq_percpu), %o5</div><div class='ctx'> 	sethi	%hi(0x40000000), %o2</div><div class='del'>-	sll	%o3, 12, %o3</div><div class='ctx'> 	ld	[%o5 + %o3], %o1</div><div class='del'>-	andcc	%o1, %o2, %g0</div><div class='add'>+	ld	[%o1 + 0x00], %o3	! sun4m_irq_percpu[cpu]-&gt;pending</div><div class='add'>+	andcc	%o3, %o2, %g0</div><div class='ctx'> 	be,a	smp4m_ticker</div><div class='ctx'> 	 cmp	%l7, 14</div><div class='del'>-	st	%o2, [%o5 + 0x4]</div><div class='add'>+	st	%o2, [%o1 + 0x04]	! sun4m_irq_percpu[cpu]-&gt;clear=0x40000000</div><div class='ctx'> 	WRITE_PAUSE</div><div class='del'>-	ld	[%o5], %g0</div><div class='add'>+	ld	[%o1 + 0x00], %g0	! sun4m_irq_percpu[cpu]-&gt;pending</div><div class='ctx'> 	WRITE_PAUSE</div><div class='ctx'> 	or	%l0, PSR_PIL, %l4</div><div class='ctx'> 	wr	%l4, 0x0, %psr</div><div class='hunk'>@@ -304,16 +301,16 @@ linux_trap_ipi15_sun4m:</div><div class='ctx'> 	SAVE_ALL</div><div class='ctx'> 	sethi	%hi(0x80000000), %o2</div><div class='ctx'> 	GET_PROCESSOR4M_ID(o0)</div><div class='del'>-	set	sun4m_interrupts, %l5</div><div class='del'>-	ld	[%l5], %o5</div><div class='del'>-	sll	%o0, 12, %o0</div><div class='del'>-	add	%o5, %o0, %o5</div><div class='del'>-	ld	[%o5], %o3</div><div class='add'>+	sethi	%hi(sun4m_irq_percpu), %l5</div><div class='add'>+	or	%l5, %lo(sun4m_irq_percpu), %o5</div><div class='add'>+	sll	%o0, 2, %o0</div><div class='add'>+	ld	[%o5 + %o0], %o5</div><div class='add'>+	ld	[%o5 + 0x00], %o3	! sun4m_irq_percpu[cpu]-&gt;pending</div><div class='ctx'> 	andcc	%o3, %o2, %g0</div><div class='ctx'> 	be	1f			! Must be an NMI async memory error</div><div class='del'>-	 st	%o2, [%o5 + 4]</div><div class='add'>+	 st	%o2, [%o5 + 0x04]	! sun4m_irq_percpu[cpu]-&gt;clear=0x80000000</div><div class='ctx'> 	WRITE_PAUSE</div><div class='del'>-	ld	[%o5], %g0</div><div class='add'>+	ld	[%o5 + 0x00], %g0	! sun4m_irq_percpu[cpu]-&gt;pending</div><div class='ctx'> 	WRITE_PAUSE</div><div class='ctx'> 	or	%l0, PSR_PIL, %l4</div><div class='ctx'> 	wr	%l4, 0x0, %psr</div><div class='hunk'>@@ -327,12 +324,11 @@ linux_trap_ipi15_sun4m:</div><div class='ctx'> 1:</div><div class='ctx'> 	/* NMI async memory error handling. */</div><div class='ctx'> 	sethi	%hi(0x80000000), %l4</div><div class='del'>-	sethi	%hi(0x4000), %o3</div><div class='del'>-	sub	%o5, %o0, %o5</div><div class='del'>-	add	%o5, %o3, %l5</div><div class='del'>-	st	%l4, [%l5 + 0xc]</div><div class='add'>+	sethi	%hi(sun4m_irq_global), %o5</div><div class='add'>+	ld	[%o5 + %lo(sun4m_irq_global)], %l5</div><div class='add'>+	st	%l4, [%l5 + 0x0c]	! sun4m_irq_global-&gt;mask_set=0x80000000</div><div class='ctx'> 	WRITE_PAUSE</div><div class='del'>-	ld	[%l5], %g0</div><div class='add'>+	ld	[%l5 + 0x00], %g0	! sun4m_irq_global-&gt;pending</div><div class='ctx'> 	WRITE_PAUSE</div><div class='ctx'> 	or	%l0, PSR_PIL, %l4</div><div class='ctx'> 	wr	%l4, 0x0, %psr</div><div class='hunk'>@@ -341,9 +337,9 @@ linux_trap_ipi15_sun4m:</div><div class='ctx'> 	WRITE_PAUSE</div><div class='ctx'> 	call	sun4m_nmi</div><div class='ctx'> 	 nop</div><div class='del'>-	st	%l4, [%l5 + 0x8]</div><div class='add'>+	st	%l4, [%l5 + 0x08]	! sun4m_irq_global-&gt;mask_clear=0x80000000</div><div class='ctx'> 	WRITE_PAUSE</div><div class='del'>-	ld	[%l5], %g0</div><div class='add'>+	ld	[%l5 + 0x00], %g0	! sun4m_irq_global-&gt;pending</div><div class='ctx'> 	WRITE_PAUSE</div><div class='ctx'> 	RESTORE_ALL</div><div class='ctx'> </div><div class='hunk'>@@ -775,11 +771,7 @@ vac_linesize_patch_32:		subcc	%l7, 32, %l7</div><div class='ctx'>  * Ugly, but we cant use hardware flushing on the sun4 and we'd require</div><div class='ctx'>  * two instructions (Anton)</div><div class='ctx'>  */</div><div class='del'>-#ifdef CONFIG_SUN4</div><div class='del'>-vac_hwflush_patch1_on:		nop</div><div class='del'>-#else</div><div class='ctx'> vac_hwflush_patch1_on:		addcc	%l7, -PAGE_SIZE, %l7</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> vac_hwflush_patch2_on:		sta	%g0, [%l3 + %l7] ASI_HWFLUSHSEG</div><div class='ctx'> </div><div class='hunk'>@@ -798,42 +790,10 @@ vac_hwflush_patch2_on:		sta	%g0, [%l3 + %l7] ASI_HWFLUSHSEG</div><div class='ctx'> ! %l7 = 1 for textfault</div><div class='ctx'> ! We want error in %l5, vaddr in %l6</div><div class='ctx'> sun4c_fault:</div><div class='del'>-#ifdef CONFIG_SUN4</div><div class='del'>-	sethi	%hi(sun4c_memerr_reg), %l4</div><div class='del'>-	ld	[%l4+%lo(sun4c_memerr_reg)], %l4  ! memerr ctrl reg addr</div><div class='del'>-	ld	[%l4], %l6		! memerr ctrl reg</div><div class='del'>-	ld	[%l4 + 4], %l5		! memerr vaddr reg</div><div class='del'>-	andcc	%l6, 0x80, %g0		! check for error type</div><div class='del'>-	st	%g0, [%l4 + 4]		! clear the error</div><div class='del'>-	be	0f			! normal error</div><div class='del'>-	 sethi	%hi(AC_BUS_ERROR), %l4	! bus err reg addr</div><div class='del'>-</div><div class='del'>-	call	prom_halt	! something weird happened</div><div class='del'>-					! what exactly did happen?</div><div class='del'>-					! what should we do here?</div><div class='del'>-</div><div class='del'>-0:	or	%l4, %lo(AC_BUS_ERROR), %l4	! bus err reg addr</div><div class='del'>-	lduba	[%l4] ASI_CONTROL, %l6	! bus err reg</div><div class='del'>-</div><div class='del'>-	cmp    %l7, 1			! text fault?</div><div class='del'>-	be	1f			! yes</div><div class='del'>-	 nop</div><div class='del'>-</div><div class='del'>-	ld     [%l1], %l4		! load instruction that caused fault</div><div class='del'>-	srl	%l4, 21, %l4</div><div class='del'>-	andcc	%l4, 1, %g0		! store instruction?</div><div class='del'>-</div><div class='del'>-	be	1f			! no</div><div class='del'>-	 sethi	%hi(SUN4C_SYNC_BADWRITE), %l4 ! yep</div><div class='del'>-					! %lo(SUN4C_SYNC_BADWRITE) = 0</div><div class='del'>-	or	%l4, %l6, %l6		! set write bit to emulate sun4c</div><div class='del'>-1:</div><div class='del'>-#else</div><div class='ctx'> 	sethi	%hi(AC_SYNC_ERR), %l4</div><div class='ctx'> 	add	%l4, 0x4, %l6			! AC_SYNC_VA in %l6</div><div class='ctx'> 	lda	[%l6] ASI_CONTROL, %l5		! Address</div><div class='ctx'> 	lda	[%l4] ASI_CONTROL, %l6		! Error, retained for a bit</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> 	andn	%l5, 0xfff, %l5			! Encode all info into l7</div><div class='ctx'> 	srl	%l6, 14, %l4</div><div class='hunk'>@@ -880,12 +840,7 @@ sun4c_fault:</div><div class='ctx'> 	or      %l4, %lo(swapper_pg_dir), %l4</div><div class='ctx'> 	sll     %l6, 2, %l6</div><div class='ctx'> 	ld      [%l4 + %l6], %l4</div><div class='del'>-#ifdef CONFIG_SUN4</div><div class='del'>-	sethi	%hi(PAGE_MASK), %l6</div><div class='del'>-	andcc	%l4, %l6, %g0</div><div class='del'>-#else</div><div class='ctx'> 	andcc   %l4, PAGE_MASK, %g0</div><div class='del'>-#endif</div><div class='ctx'> 	be      sun4c_fault_fromuser</div><div class='ctx'> 	 lduXa  [%l5] ASI_SEGMAP, %l4</div><div class='ctx'> </div><div class='hunk'>@@ -937,11 +892,7 @@ invalid_segment_patch1:</div><div class='ctx'> 	ld	[%l6 + 0x08], %l3	! tmp = entry-&gt;vaddr</div><div class='ctx'> </div><div class='ctx'> 	! Flush segment from the cache.</div><div class='del'>-#ifdef CONFIG_SUN4</div><div class='del'>-	sethi	%hi((128 * 1024)), %l7</div><div class='del'>-#else</div><div class='ctx'> 	sethi	%hi((64 * 1024)), %l7</div><div class='del'>-#endif</div><div class='ctx'> 9:</div><div class='ctx'> vac_hwflush_patch1:</div><div class='ctx'> vac_linesize_patch:</div><div class='hunk'>@@ -1029,12 +980,7 @@ invalid_segment_patch2:</div><div class='ctx'> 	or	%l4, %lo(swapper_pg_dir), %l4</div><div class='ctx'> 	sll	%l3, 2, %l3</div><div class='ctx'> 	ld	[%l4 + %l3], %l4</div><div class='del'>-#ifndef CONFIG_SUN4</div><div class='ctx'> 	and	%l4, PAGE_MASK, %l4</div><div class='del'>-#else</div><div class='del'>-	sethi	%hi(PAGE_MASK), %l6</div><div class='del'>-	and	%l4, %l6, %l4</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> 	srl	%l5, (PAGE_SHIFT - 2), %l6</div><div class='ctx'> 	and	%l6, ((SUN4C_PTRS_PER_PTE - 1) &lt;&lt; 2), %l6</div><div class='head'>diff --git a/arch/sparc/kernel/head.S b/arch/sparc/kernel/head.S<br/>index 50d9a16af795..2d325fd84579 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/kernel/head.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/kernel/head.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/kernel/head.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/kernel/head.S</a></div><div class='hunk'>@@ -63,15 +63,9 @@ cputypvar_sun4m:</div><div class='ctx'> </div><div class='ctx'> 	.align 4</div><div class='ctx'> </div><div class='del'>-#ifndef CONFIG_SUN4</div><div class='ctx'> sun4_notsup:</div><div class='del'>-	.asciz	"Sparc-Linux sun4 needs a specially compiled kernel, turn CONFIG_SUN4 on.\n\n"</div><div class='add'>+	.asciz	"Sparc-Linux sun4 support does no longer exist.\n\n"</div><div class='ctx'> 	.align 4</div><div class='del'>-#else</div><div class='del'>-sun4cdm_notsup:</div><div class='del'>-	.asciz	"Kernel compiled with CONFIG_SUN4 cannot run on SUN4C/SUN4M/SUN4D\nTurn CONFIG_SUN4 off.\n\n"</div><div class='del'>-	.align 4</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> sun4e_notsup:</div><div class='ctx'>         .asciz  "Sparc-Linux sun4e support does not exist\n\n"</div><div class='hunk'>@@ -780,15 +774,6 @@ execute_in_high_mem:</div><div class='ctx'> 		 nop</div><div class='ctx'> </div><div class='ctx'> found_version:</div><div class='del'>-#ifdef CONFIG_SUN4</div><div class='del'>-/* For people who try sun4 kernels, even if Configure.help advises them. */</div><div class='del'>-		ld	[%g7 + 0x68], %o1</div><div class='del'>-		set	sun4cdm_notsup, %o0</div><div class='del'>-		call	%o1</div><div class='del'>-		 nop</div><div class='del'>-		b	halt_me</div><div class='del'>-		 nop</div><div class='del'>-#endif</div><div class='ctx'> /* Get the machine type via the mysterious romvec node operations. */</div><div class='ctx'> </div><div class='ctx'> 		add	%g7, 0x1c, %l1		</div><div class='hunk'>@@ -1150,15 +1135,6 @@ sun4c_continue_boot:</div><div class='ctx'> 		 nop</div><div class='ctx'> </div><div class='ctx'> sun4_init:</div><div class='del'>-#ifdef CONFIG_SUN4</div><div class='del'>-/* There, happy now Adrian? */</div><div class='del'>-		set	cputypval, %o2		! Let everyone know we</div><div class='del'>-		set	' ', %o0			! are a "sun4 " architecture</div><div class='del'>-		stb	%o0, [%o2 + 0x4]		</div><div class='del'>-</div><div class='del'>-		b got_prop </div><div class='del'>-		 nop</div><div class='del'>-#else</div><div class='ctx'> 		sethi   %hi(SUN4_PROM_VECTOR+0x84), %o1</div><div class='ctx'> 		ld      [%o1 + %lo(SUN4_PROM_VECTOR+0x84)], %o1</div><div class='ctx'> 		set     sun4_notsup, %o0</div><div class='hunk'>@@ -1170,7 +1146,7 @@ sun4_init:</div><div class='ctx'> 		 nop</div><div class='ctx'> 1:		ba      1b                      ! Cannot exit into KMON</div><div class='ctx'> 		 nop</div><div class='del'>-#endif</div><div class='add'>+</div><div class='ctx'> no_sun4e_here:</div><div class='ctx'> 		ld	[%g7 + 0x68], %o1</div><div class='ctx'> 		set	sun4e_notsup, %o0</div><div class='head'>diff --git a/arch/sparc/kernel/idprom.c b/arch/sparc/kernel/idprom.c<br/>index fc511f3c4c18..223a6582e1e2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/kernel/idprom.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/kernel/idprom.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/kernel/idprom.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/kernel/idprom.c</a></div><div class='hunk'>@@ -12,10 +12,6 @@</div><div class='ctx'> #include &lt;asm/oplib.h&gt;</div><div class='ctx'> #include &lt;asm/idprom.h&gt;</div><div class='ctx'> #include &lt;asm/machines.h&gt;  /* Fun with Sun released architectures. */</div><div class='del'>-#ifdef CONFIG_SUN4</div><div class='del'>-#include &lt;asm/sun4paddr.h&gt;</div><div class='del'>-extern void sun4setup(void);</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> struct idprom *idprom;</div><div class='ctx'> static struct idprom idprom_buffer;</div><div class='hunk'>@@ -101,7 +97,4 @@ void __init idprom_init(void)</div><div class='ctx'> 		    idprom-&gt;id_ethaddr[0], idprom-&gt;id_ethaddr[1],</div><div class='ctx'> 		    idprom-&gt;id_ethaddr[2], idprom-&gt;id_ethaddr[3],</div><div class='ctx'> 		    idprom-&gt;id_ethaddr[4], idprom-&gt;id_ethaddr[5]);</div><div class='del'>-#ifdef CONFIG_SUN4</div><div class='del'>-	sun4setup();</div><div class='del'>-#endif</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/sparc/kernel/ioport.c b/arch/sparc/kernel/ioport.c<br/>index 2a8a847764d8..4f025b36934b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/kernel/ioport.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/kernel/ioport.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/kernel/ioport.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/kernel/ioport.c</a></div><div class='hunk'>@@ -42,10 +42,13 @@</div><div class='ctx'> #include &lt;asm/vaddrs.h&gt;</div><div class='ctx'> #include &lt;asm/oplib.h&gt;</div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='del'>-#include &lt;asm/sbus.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/pgalloc.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='add'>+#include &lt;asm/iommu.h&gt;</div><div class='add'>+#include &lt;asm/io-unit.h&gt;</div><div class='add'>+</div><div class='add'>+#include "dma.h"</div><div class='ctx'> </div><div class='ctx'> #define mmu_inval_dma_area(p, l)	/* Anton pulled it out for 2.4.0-xx */</div><div class='ctx'> </div><div class='hunk'>@@ -139,15 +142,6 @@ void iounmap(volatile void __iomem *virtual)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- */</div><div class='del'>-void __iomem *sbus_ioremap(struct resource *phyres, unsigned long offset,</div><div class='del'>-    unsigned long size, char *name)</div><div class='del'>-{</div><div class='del'>-	return _sparc_alloc_io(phyres-&gt;flags &amp; 0xF,</div><div class='del'>-	    phyres-&gt;start + offset, size, name);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void __iomem *of_ioremap(struct resource *res, unsigned long offset,</div><div class='ctx'> 			 unsigned long size, char *name)</div><div class='ctx'> {</div><div class='hunk'>@@ -164,13 +158,6 @@ void of_iounmap(struct resource *res, void __iomem *base, unsigned long size)</div><div class='ctx'> EXPORT_SYMBOL(of_iounmap);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- */</div><div class='del'>-void sbus_iounmap(volatile void __iomem *addr, unsigned long size)</div><div class='del'>-{</div><div class='del'>-	iounmap(addr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * Meat of mapping</div><div class='ctx'>  */</div><div class='ctx'> static void __iomem *_sparc_alloc_io(unsigned int busno, unsigned long phys,</div><div class='hunk'>@@ -246,63 +233,19 @@ static void _sparc_free_io(struct resource *res)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SBUS</div><div class='ctx'> </div><div class='del'>-void sbus_set_sbus64(struct sbus_dev *sdev, int x)</div><div class='add'>+void sbus_set_sbus64(struct device *dev, int x)</div><div class='ctx'> {</div><div class='ctx'> 	printk("sbus_set_sbus64: unsupported\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-extern unsigned int sun4d_build_irq(struct sbus_dev *sdev, int irq);</div><div class='del'>-void __init sbus_fill_device_irq(struct sbus_dev *sdev)</div><div class='del'>-{</div><div class='del'>-	struct linux_prom_irqs irqs[PROMINTR_MAX];</div><div class='del'>-	int len;</div><div class='del'>-</div><div class='del'>-	len = prom_getproperty(sdev-&gt;prom_node, "intr",</div><div class='del'>-			       (char *)irqs, sizeof(irqs));</div><div class='del'>-	if (len != -1) {</div><div class='del'>-		sdev-&gt;num_irqs = len / 8;</div><div class='del'>-		if (sdev-&gt;num_irqs == 0) {</div><div class='del'>-			sdev-&gt;irqs[0] = 0;</div><div class='del'>-		} else if (sparc_cpu_model == sun4d) {</div><div class='del'>-			for (len = 0; len &lt; sdev-&gt;num_irqs; len++)</div><div class='del'>-				sdev-&gt;irqs[len] =</div><div class='del'>-					sun4d_build_irq(sdev, irqs[len].pri);</div><div class='del'>-		} else {</div><div class='del'>-			for (len = 0; len &lt; sdev-&gt;num_irqs; len++)</div><div class='del'>-				sdev-&gt;irqs[len] = irqs[len].pri;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		int interrupts[PROMINTR_MAX];</div><div class='del'>-</div><div class='del'>-		/* No "intr" node found-- check for "interrupts" node.</div><div class='del'>-		 * This node contains SBus interrupt levels, not IPLs</div><div class='del'>-		 * as in "intr", and no vector values.  We convert</div><div class='del'>-		 * SBus interrupt levels to PILs (platform specific).</div><div class='del'>-		 */</div><div class='del'>-		len = prom_getproperty(sdev-&gt;prom_node, "interrupts",</div><div class='del'>-				       (char *)interrupts, sizeof(interrupts));</div><div class='del'>-		if (len == -1) {</div><div class='del'>-			sdev-&gt;irqs[0] = 0;</div><div class='del'>-			sdev-&gt;num_irqs = 0;</div><div class='del'>-		} else {</div><div class='del'>-			sdev-&gt;num_irqs = len / sizeof(int);</div><div class='del'>-			for (len = 0; len &lt; sdev-&gt;num_irqs; len++) {</div><div class='del'>-				sdev-&gt;irqs[len] =</div><div class='del'>-					sbint_to_irq(sdev, interrupts[len]);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	} </div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Allocate a chunk of memory suitable for DMA.</div><div class='ctx'>  * Typically devices use them for control blocks.</div><div class='ctx'>  * CPU may access them without any explicit flushing.</div><div class='del'>- *</div><div class='del'>- * XXX Some clever people know that sdev is not used and supply NULL. Watch.</div><div class='ctx'>  */</div><div class='del'>-void *sbus_alloc_consistent(struct sbus_dev *sdev, long len, u32 *dma_addrp)</div><div class='add'>+void *sbus_alloc_consistent(struct device *dev, long len, u32 *dma_addrp)</div><div class='ctx'> {</div><div class='add'>+	struct of_device *op = to_of_device(dev);</div><div class='ctx'> 	unsigned long len_total = (len + PAGE_SIZE-1) &amp; PAGE_MASK;</div><div class='ctx'> 	unsigned long va;</div><div class='ctx'> 	struct resource *res;</div><div class='hunk'>@@ -336,13 +279,10 @@ void *sbus_alloc_consistent(struct sbus_dev *sdev, long len, u32 *dma_addrp)</div><div class='ctx'> 	 * XXX That's where sdev would be used. Currently we load</div><div class='ctx'> 	 * all iommu tables with the same translations.</div><div class='ctx'> 	 */</div><div class='del'>-	if (mmu_map_dma_area(dma_addrp, va, res-&gt;start, len_total) != 0)</div><div class='add'>+	if (mmu_map_dma_area(dev, dma_addrp, va, res-&gt;start, len_total) != 0)</div><div class='ctx'> 		goto err_noiommu;</div><div class='ctx'> </div><div class='del'>-	/* Set the resource name, if known. */</div><div class='del'>-	if (sdev) {</div><div class='del'>-		res-&gt;name = sdev-&gt;prom_name;</div><div class='del'>-	}</div><div class='add'>+	res-&gt;name = op-&gt;node-&gt;name;</div><div class='ctx'> </div><div class='ctx'> 	return (void *)(unsigned long)res-&gt;start;</div><div class='ctx'> </div><div class='hunk'>@@ -356,7 +296,7 @@ err_nopages:</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void sbus_free_consistent(struct sbus_dev *sdev, long n, void *p, u32 ba)</div><div class='add'>+void sbus_free_consistent(struct device *dev, long n, void *p, u32 ba)</div><div class='ctx'> {</div><div class='ctx'> 	struct resource *res;</div><div class='ctx'> 	struct page *pgv;</div><div class='hunk'>@@ -383,8 +323,8 @@ void sbus_free_consistent(struct sbus_dev *sdev, long n, void *p, u32 ba)</div><div class='ctx'> 	kfree(res);</div><div class='ctx'> </div><div class='ctx'> 	/* mmu_inval_dma_area(va, n); */ /* it's consistent, isn't it */</div><div class='del'>-	pgv = mmu_translate_dvma(ba);</div><div class='del'>-	mmu_unmap_dma_area(ba, n);</div><div class='add'>+	pgv = virt_to_page(p);</div><div class='add'>+	mmu_unmap_dma_area(dev, ba, n);</div><div class='ctx'> </div><div class='ctx'> 	__free_pages(pgv, get_order(n));</div><div class='ctx'> }</div><div class='hunk'>@@ -394,7 +334,7 @@ void sbus_free_consistent(struct sbus_dev *sdev, long n, void *p, u32 ba)</div><div class='ctx'>  * CPU view of this memory may be inconsistent with</div><div class='ctx'>  * a device view and explicit flushing is necessary.</div><div class='ctx'>  */</div><div class='del'>-dma_addr_t sbus_map_single(struct sbus_dev *sdev, void *va, size_t len, int direction)</div><div class='add'>+dma_addr_t sbus_map_single(struct device *dev, void *va, size_t len, int direction)</div><div class='ctx'> {</div><div class='ctx'> 	/* XXX why are some lengths signed, others unsigned? */</div><div class='ctx'> 	if (len &lt;= 0) {</div><div class='hunk'>@@ -404,17 +344,17 @@ dma_addr_t sbus_map_single(struct sbus_dev *sdev, void *va, size_t len, int dire</div><div class='ctx'> 	if (len &gt; 256*1024) {			/* __get_free_pages() limit */</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='del'>-	return mmu_get_scsi_one(va, len, sdev-&gt;bus);</div><div class='add'>+	return mmu_get_scsi_one(dev, va, len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void sbus_unmap_single(struct sbus_dev *sdev, dma_addr_t ba, size_t n, int direction)</div><div class='add'>+void sbus_unmap_single(struct device *dev, dma_addr_t ba, size_t n, int direction)</div><div class='ctx'> {</div><div class='del'>-	mmu_release_scsi_one(ba, n, sdev-&gt;bus);</div><div class='add'>+	mmu_release_scsi_one(dev, ba, n);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int sbus_map_sg(struct sbus_dev *sdev, struct scatterlist *sg, int n, int direction)</div><div class='add'>+int sbus_map_sg(struct device *dev, struct scatterlist *sg, int n, int direction)</div><div class='ctx'> {</div><div class='del'>-	mmu_get_scsi_sgl(sg, n, sdev-&gt;bus);</div><div class='add'>+	mmu_get_scsi_sgl(dev, sg, n);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * XXX sparc64 can return a partial length here. sun4c should do this</div><div class='hunk'>@@ -423,145 +363,28 @@ int sbus_map_sg(struct sbus_dev *sdev, struct scatterlist *sg, int n, int direct</div><div class='ctx'> 	return n;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void sbus_unmap_sg(struct sbus_dev *sdev, struct scatterlist *sg, int n, int direction)</div><div class='del'>-{</div><div class='del'>-	mmu_release_scsi_sgl(sg, n, sdev-&gt;bus);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- */</div><div class='del'>-void sbus_dma_sync_single_for_cpu(struct sbus_dev *sdev, dma_addr_t ba, size_t size, int direction)</div><div class='del'>-{</div><div class='del'>-#if 0</div><div class='del'>-	unsigned long va;</div><div class='del'>-	struct resource *res;</div><div class='del'>-</div><div class='del'>-	/* We do not need the resource, just print a message if invalid. */</div><div class='del'>-	res = _sparc_find_resource(&amp;_sparc_dvma, ba);</div><div class='del'>-	if (res == NULL)</div><div class='del'>-		panic("sbus_dma_sync_single: 0x%x\n", ba);</div><div class='del'>-</div><div class='del'>-	va = page_address(mmu_translate_dvma(ba)); /* XXX higmem */</div><div class='del'>-	/*</div><div class='del'>-	 * XXX This bogosity will be fixed with the iommu rewrite coming soon</div><div class='del'>-	 * to a kernel near you. - Anton</div><div class='del'>-	 */</div><div class='del'>-	/* mmu_inval_dma_area(va, (size + PAGE_SIZE-1) &amp; PAGE_MASK); */</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void sbus_dma_sync_single_for_device(struct sbus_dev *sdev, dma_addr_t ba, size_t size, int direction)</div><div class='add'>+void sbus_unmap_sg(struct device *dev, struct scatterlist *sg, int n, int direction)</div><div class='ctx'> {</div><div class='del'>-#if 0</div><div class='del'>-	unsigned long va;</div><div class='del'>-	struct resource *res;</div><div class='del'>-</div><div class='del'>-	/* We do not need the resource, just print a message if invalid. */</div><div class='del'>-	res = _sparc_find_resource(&amp;_sparc_dvma, ba);</div><div class='del'>-	if (res == NULL)</div><div class='del'>-		panic("sbus_dma_sync_single: 0x%x\n", ba);</div><div class='del'>-</div><div class='del'>-	va = page_address(mmu_translate_dvma(ba)); /* XXX higmem */</div><div class='del'>-	/*</div><div class='del'>-	 * XXX This bogosity will be fixed with the iommu rewrite coming soon</div><div class='del'>-	 * to a kernel near you. - Anton</div><div class='del'>-	 */</div><div class='del'>-	/* mmu_inval_dma_area(va, (size + PAGE_SIZE-1) &amp; PAGE_MASK); */</div><div class='del'>-#endif</div><div class='add'>+	mmu_release_scsi_sgl(dev, sg, n);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void sbus_dma_sync_sg_for_cpu(struct sbus_dev *sdev, struct scatterlist *sg, int n, int direction)</div><div class='add'>+void sbus_dma_sync_single_for_cpu(struct device *dev, dma_addr_t ba, size_t size, int direction)</div><div class='ctx'> {</div><div class='del'>-	printk("sbus_dma_sync_sg_for_cpu: not implemented yet\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void sbus_dma_sync_sg_for_device(struct sbus_dev *sdev, struct scatterlist *sg, int n, int direction)</div><div class='add'>+void sbus_dma_sync_single_for_device(struct device *dev, dma_addr_t ba, size_t size, int direction)</div><div class='ctx'> {</div><div class='del'>-	printk("sbus_dma_sync_sg_for_device: not implemented yet\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Support code for sbus_init().  */</div><div class='del'>-/*</div><div class='del'>- * XXX This functions appears to be a distorted version of</div><div class='del'>- * prom_sbus_ranges_init(), with all sun4d stuff cut away.</div><div class='del'>- * Ask DaveM what is going on here, how is sun4d supposed to work... XXX</div><div class='del'>- */</div><div class='del'>-/* added back sun4d patch from Thomas Bogendoerfer - should be OK (crn) */</div><div class='del'>-void __init sbus_arch_bus_ranges_init(struct device_node *pn, struct sbus_bus *sbus)</div><div class='del'>-{</div><div class='del'>-	int parent_node = pn-&gt;node;</div><div class='del'>-</div><div class='del'>-	if (sparc_cpu_model == sun4d) {</div><div class='del'>-		struct linux_prom_ranges iounit_ranges[PROMREG_MAX];</div><div class='del'>-		int num_iounit_ranges, len;</div><div class='del'>-</div><div class='del'>-		len = prom_getproperty(parent_node, "ranges",</div><div class='del'>-				       (char *) iounit_ranges,</div><div class='del'>-				       sizeof (iounit_ranges));</div><div class='del'>-		if (len != -1) {</div><div class='del'>-			num_iounit_ranges =</div><div class='del'>-				(len / sizeof(struct linux_prom_ranges));</div><div class='del'>-			prom_adjust_ranges(sbus-&gt;sbus_ranges,</div><div class='del'>-					   sbus-&gt;num_sbus_ranges,</div><div class='del'>-					   iounit_ranges, num_iounit_ranges);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init sbus_setup_iommu(struct sbus_bus *sbus, struct device_node *dp)</div><div class='del'>-{</div><div class='del'>-#ifndef CONFIG_SUN4</div><div class='del'>-	struct device_node *parent = dp-&gt;parent;</div><div class='del'>-</div><div class='del'>-	if (sparc_cpu_model != sun4d &amp;&amp;</div><div class='del'>-	    parent != NULL &amp;&amp;</div><div class='del'>-	    !strcmp(parent-&gt;name, "iommu")) {</div><div class='del'>-		extern void iommu_init(int iommu_node, struct sbus_bus *sbus);</div><div class='del'>-</div><div class='del'>-		iommu_init(parent-&gt;node, sbus);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (sparc_cpu_model == sun4d) {</div><div class='del'>-		extern void iounit_init(int sbi_node, int iounit_node,</div><div class='del'>-					struct sbus_bus *sbus);</div><div class='del'>-</div><div class='del'>-		iounit_init(dp-&gt;node, parent-&gt;node, sbus);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __init sbus_setup_arch_props(struct sbus_bus *sbus, struct device_node *dp)</div><div class='del'>-{</div><div class='del'>-	if (sparc_cpu_model == sun4d) {</div><div class='del'>-		struct device_node *parent = dp-&gt;parent;</div><div class='del'>-</div><div class='del'>-		sbus-&gt;devid = of_getintprop_default(parent, "device-id", 0);</div><div class='del'>-		sbus-&gt;board = of_getintprop_default(parent, "board#", 0);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int __init sbus_arch_preinit(void)</div><div class='add'>+static int __init sparc_register_ioport(void)</div><div class='ctx'> {</div><div class='ctx'> 	register_proc_sparc_ioport();</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SUN4</div><div class='del'>-	{</div><div class='del'>-		extern void sun4_dvma_init(void);</div><div class='del'>-		sun4_dvma_init();</div><div class='del'>-	}</div><div class='del'>-	return 1;</div><div class='del'>-#else</div><div class='ctx'> 	return 0;</div><div class='del'>-#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init sbus_arch_postinit(void)</div><div class='del'>-{</div><div class='del'>-	if (sparc_cpu_model == sun4d) {</div><div class='del'>-		extern void sun4d_init_sbi_irq(void);</div><div class='del'>-		sun4d_init_sbi_irq();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='add'>+arch_initcall(sparc_register_ioport);</div><div class='add'>+</div><div class='ctx'> #endif /* CONFIG_SBUS */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PCI</div><div class='head'>diff --git a/arch/sparc/kernel/irq.h b/arch/sparc/kernel/irq.h<br/>index 32ef3ebd0a88..db7513881530 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/kernel/irq.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/kernel/irq.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/kernel/irq.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/kernel/irq.h</a></div><div class='hunk'>@@ -13,7 +13,6 @@ BTFIXUPDEF_CALL(void, enable_irq, unsigned int)</div><div class='ctx'> BTFIXUPDEF_CALL(void, disable_pil_irq, unsigned int)</div><div class='ctx'> BTFIXUPDEF_CALL(void, enable_pil_irq, unsigned int)</div><div class='ctx'> BTFIXUPDEF_CALL(void, clear_clock_irq, void)</div><div class='del'>-BTFIXUPDEF_CALL(void, clear_profile_irq, int)</div><div class='ctx'> BTFIXUPDEF_CALL(void, load_profile_irq, int, unsigned int)</div><div class='ctx'> </div><div class='ctx'> static inline void __disable_irq(unsigned int irq)</div><div class='hunk'>@@ -41,11 +40,6 @@ static inline void clear_clock_irq(void)</div><div class='ctx'> 	BTFIXUP_CALL(clear_clock_irq)();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void clear_profile_irq(int irq)</div><div class='del'>-{</div><div class='del'>-	BTFIXUP_CALL(clear_profile_irq)(irq);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline void load_profile_irq(int cpu, int limit)</div><div class='ctx'> {</div><div class='ctx'> 	BTFIXUP_CALL(load_profile_irq)(cpu, limit);</div><div class='head'>diff --git a/arch/sparc/kernel/of_device.c b/arch/sparc/kernel/of_device.c<br/>index f58c537446a8..0837bd52e28f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/kernel/of_device.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/kernel/of_device.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/kernel/of_device.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/kernel/of_device.c</a></div><div class='hunk'>@@ -29,15 +29,38 @@ struct of_device *of_find_device_by_node(struct device_node *dp)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(of_find_device_by_node);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-struct bus_type ebus_bus_type;</div><div class='del'>-EXPORT_SYMBOL(ebus_bus_type);</div><div class='del'>-#endif</div><div class='add'>+unsigned int irq_of_parse_and_map(struct device_node *node, int index)</div><div class='add'>+{</div><div class='add'>+	struct of_device *op = of_find_device_by_node(node);</div><div class='add'>+</div><div class='add'>+	if (!op || index &gt;= op-&gt;num_irqs)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return op-&gt;irqs[index];</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(irq_of_parse_and_map);</div><div class='add'>+</div><div class='add'>+/* Take the archdata values for IOMMU, STC, and HOSTDATA found in</div><div class='add'>+ * BUS and propagate to all child of_device objects.</div><div class='add'>+ */</div><div class='add'>+void of_propagate_archdata(struct of_device *bus)</div><div class='add'>+{</div><div class='add'>+	struct dev_archdata *bus_sd = &amp;bus-&gt;dev.archdata;</div><div class='add'>+	struct device_node *bus_dp = bus-&gt;node;</div><div class='add'>+	struct device_node *dp;</div><div class='add'>+</div><div class='add'>+	for (dp = bus_dp-&gt;child; dp; dp = dp-&gt;sibling) {</div><div class='add'>+		struct of_device *op = of_find_device_by_node(dp);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SBUS</div><div class='del'>-struct bus_type sbus_bus_type;</div><div class='del'>-EXPORT_SYMBOL(sbus_bus_type);</div><div class='del'>-#endif</div><div class='add'>+		op-&gt;dev.archdata.iommu = bus_sd-&gt;iommu;</div><div class='add'>+		op-&gt;dev.archdata.stc = bus_sd-&gt;stc;</div><div class='add'>+		op-&gt;dev.archdata.host_controller = bus_sd-&gt;host_controller;</div><div class='add'>+		op-&gt;dev.archdata.numa_node = bus_sd-&gt;numa_node;</div><div class='add'>+</div><div class='add'>+		if (dp-&gt;child)</div><div class='add'>+			of_propagate_archdata(op);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> struct bus_type of_platform_bus_type;</div><div class='ctx'> EXPORT_SYMBOL(of_platform_bus_type);</div><div class='hunk'>@@ -327,6 +350,27 @@ static int __init build_one_resource(struct device_node *parent,</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int __init use_1to1_mapping(struct device_node *pp)</div><div class='add'>+{</div><div class='add'>+	/* If we have a ranges property in the parent, use it.  */</div><div class='add'>+	if (of_find_property(pp, "ranges", NULL) != NULL)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Some SBUS devices use intermediate nodes to express</div><div class='add'>+	 * hierarchy within the device itself.  These aren't</div><div class='add'>+	 * real bus nodes, and don't have a 'ranges' property.</div><div class='add'>+	 * But, we should still pass the translation work up</div><div class='add'>+	 * to the SBUS itself.</div><div class='add'>+	 */</div><div class='add'>+	if (!strcmp(pp-&gt;name, "dma") ||</div><div class='add'>+	    !strcmp(pp-&gt;name, "espdma") ||</div><div class='add'>+	    !strcmp(pp-&gt;name, "ledma") ||</div><div class='add'>+	    !strcmp(pp-&gt;name, "lebuffer"))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int of_resource_verbose;</div><div class='ctx'> </div><div class='ctx'> static void __init build_device_resources(struct of_device *op,</div><div class='hunk'>@@ -373,10 +417,7 @@ static void __init build_device_resources(struct of_device *op,</div><div class='ctx'> </div><div class='ctx'> 		flags = bus-&gt;get_flags(reg, 0);</div><div class='ctx'> </div><div class='del'>-		/* If the immediate parent has no ranges property to apply,</div><div class='del'>-		 * just use a 1&lt;-&gt;1 mapping.</div><div class='del'>-		 */</div><div class='del'>-		if (of_find_property(pp, "ranges", NULL) == NULL) {</div><div class='add'>+		if (use_1to1_mapping(pp)) {</div><div class='ctx'> 			result = of_read_addr(addr, na);</div><div class='ctx'> 			goto build_res;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -565,15 +606,6 @@ static int __init of_bus_driver_init(void)</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	err = of_bus_type_init(&amp;of_platform_bus_type, "of");</div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-	if (!err)</div><div class='del'>-		err = of_bus_type_init(&amp;ebus_bus_type, "ebus");</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_SBUS</div><div class='del'>-	if (!err)</div><div class='del'>-		err = of_bus_type_init(&amp;sbus_bus_type, "sbus");</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	if (!err)</div><div class='ctx'> 		scan_of_devices();</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sparc/kernel/pcic.c b/arch/sparc/kernel/pcic.c<br/>index a6a6f9823370..462584e55fba 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/kernel/pcic.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/kernel/pcic.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/kernel/pcic.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/kernel/pcic.c</a></div><div class='hunk'>@@ -17,8 +17,6 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/jiffies.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/ebus.h&gt;</div><div class='del'>-#include &lt;asm/sbus.h&gt; /* for sanity check... */</div><div class='ctx'> #include &lt;asm/swift.h&gt; /* for cache flushing. */</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -430,7 +428,6 @@ static int __init pcic_init(void)</div><div class='ctx'> </div><div class='ctx'> 	pcic_pbm_scan_bus(pcic);</div><div class='ctx'> </div><div class='del'>-	ebus_init();</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -493,10 +490,6 @@ static void pcic_map_pci_device(struct linux_pcic *pcic,</div><div class='ctx'> 				 * do ioremap() before accessing PC-style I/O,</div><div class='ctx'> 				 * we supply virtual, ready to access address.</div><div class='ctx'> 				 *</div><div class='del'>-				 * Ebus devices do not come here even if</div><div class='del'>-				 * CheerIO makes a similar conversion.</div><div class='del'>-				 * See ebus.c for details.</div><div class='del'>-				 *</div><div class='ctx'> 				 * Note that request_region()</div><div class='ctx'> 				 * works for these devices.</div><div class='ctx'> 				 *</div><div class='hunk'>@@ -677,7 +670,7 @@ void __devinit pcibios_fixup_bus(struct pci_bus *bus)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * pcic_pin_to_irq() is exported to ebus.c.</div><div class='add'>+ * pcic_pin_to_irq() is exported to bus probing code</div><div class='ctx'>  */</div><div class='ctx'> unsigned int</div><div class='ctx'> pcic_pin_to_irq(unsigned int pin, const char *name)</div><div class='hunk'>@@ -904,11 +897,6 @@ static void pcic_enable_irq(unsigned int irq_nr)</div><div class='ctx'> 	local_irq_restore(flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void pcic_clear_profile_irq(int cpu)</div><div class='del'>-{</div><div class='del'>-	printk("PCIC: unimplemented code: FILE=%s LINE=%d", __FILE__, __LINE__);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void pcic_load_profile_irq(int cpu, unsigned int limit)</div><div class='ctx'> {</div><div class='ctx'> 	printk("PCIC: unimplemented code: FILE=%s LINE=%d", __FILE__, __LINE__);</div><div class='hunk'>@@ -934,7 +922,6 @@ void __init sun4m_pci_init_IRQ(void)</div><div class='ctx'> 	BTFIXUPSET_CALL(enable_pil_irq, pcic_enable_pil_irq, BTFIXUPCALL_NORM);</div><div class='ctx'> 	BTFIXUPSET_CALL(disable_pil_irq, pcic_disable_pil_irq, BTFIXUPCALL_NORM);</div><div class='ctx'> 	BTFIXUPSET_CALL(clear_clock_irq, pcic_clear_clock_irq, BTFIXUPCALL_NORM);</div><div class='del'>-	BTFIXUPSET_CALL(clear_profile_irq, pcic_clear_profile_irq, BTFIXUPCALL_NORM);</div><div class='ctx'> 	BTFIXUPSET_CALL(load_profile_irq, pcic_load_profile_irq, BTFIXUPCALL_NORM);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sparc/kernel/pmc.c b/arch/sparc/kernel/pmc.c<br/>index 7eca8871ff47..2afcfab4f11c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/kernel/pmc.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/kernel/pmc.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/kernel/pmc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/kernel/pmc.c</a></div><div class='hunk'>@@ -8,11 +8,11 @@</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/miscdevice.h&gt;</div><div class='ctx'> #include &lt;linux/pm.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/sbus.h&gt;</div><div class='ctx'> #include &lt;asm/oplib.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/auxio.h&gt;</div><div class='hunk'>@@ -23,17 +23,15 @@</div><div class='ctx'>  * #define PMC_NO_IDLE</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define PMC_MINOR	MISC_DYNAMIC_MINOR</div><div class='ctx'> #define PMC_OBPNAME	"SUNW,pmc"</div><div class='ctx'> #define PMC_DEVNAME "pmc"</div><div class='ctx'> </div><div class='ctx'> #define PMC_IDLE_REG	0x00</div><div class='ctx'> #define PMC_IDLE_ON		0x01</div><div class='ctx'> </div><div class='del'>-volatile static u8 __iomem *regs; </div><div class='del'>-static int pmc_regsize;</div><div class='add'>+static u8 __iomem *regs;</div><div class='ctx'> </div><div class='del'>-#define pmc_readb(offs)			(sbus_readb(regs+offs))</div><div class='add'>+#define pmc_readb(offs)		(sbus_readb(regs+offs))</div><div class='ctx'> #define pmc_writeb(val, offs) 	(sbus_writeb(val, regs+offs))</div><div class='ctx'> </div><div class='ctx'> /* </div><div class='hunk'>@@ -53,31 +51,11 @@ void pmc_swift_idle(void)</div><div class='ctx'> #endif</div><div class='ctx'> } </div><div class='ctx'> </div><div class='del'>-static inline void pmc_free(void)</div><div class='add'>+static int __devinit pmc_probe(struct of_device *op,</div><div class='add'>+			       const struct of_device_id *match)</div><div class='ctx'> {</div><div class='del'>-	sbus_iounmap(regs, pmc_regsize);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init pmc_probe(void)</div><div class='del'>-{</div><div class='del'>-	struct sbus_bus *sbus = NULL;</div><div class='del'>-	struct sbus_dev *sdev = NULL;</div><div class='del'>-	for_each_sbus(sbus) {</div><div class='del'>-		for_each_sbusdev(sdev, sbus) {</div><div class='del'>-			if (!strcmp(sdev-&gt;prom_name, PMC_OBPNAME)) {</div><div class='del'>-				goto sbus_done;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-sbus_done:</div><div class='del'>-	if (!sdev) {</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pmc_regsize = sdev-&gt;reg_addrs[0].reg_size;</div><div class='del'>-	regs = sbus_ioremap(&amp;sdev-&gt;resource[0], 0, </div><div class='del'>-				   pmc_regsize, PMC_OBPNAME);</div><div class='add'>+	regs = of_ioremap(&amp;op-&gt;resource[0], 0,</div><div class='add'>+			  resource_size(&amp;op-&gt;resource[0]), PMC_OBPNAME);</div><div class='ctx'> 	if (!regs) {</div><div class='ctx'> 		printk(KERN_ERR "%s: unable to map registers\n", PMC_DEVNAME);</div><div class='ctx'> 		return -ENODEV;</div><div class='hunk'>@@ -92,8 +70,27 @@ sbus_done:</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct of_device_id __initdata pmc_match[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = PMC_OBPNAME,</div><div class='add'>+	},</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, pmc_match);</div><div class='add'>+</div><div class='add'>+static struct of_platform_driver pmc_driver = {</div><div class='add'>+	.name		= "pmc",</div><div class='add'>+	.match_table	= pmc_match,</div><div class='add'>+	.probe		= pmc_probe,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init pmc_init(void)</div><div class='add'>+{</div><div class='add'>+	return of_register_driver(&amp;pmc_driver, &amp;of_bus_type);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* This driver is not critical to the boot process</div><div class='ctx'>  * and is easiest to ioremap when SBus is already</div><div class='ctx'>  * initialized, so we install ourselves thusly:</div><div class='ctx'>  */</div><div class='del'>-__initcall(pmc_probe);</div><div class='add'>+__initcall(pmc_init);</div><div class='head'>diff --git a/arch/sparc/kernel/process.c b/arch/sparc/kernel/process.c<br/>index 4bb430940a61..e8c43ffe317e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/kernel/process.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/kernel/process.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/kernel/process.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/kernel/process.c</a></div><div class='hunk'>@@ -75,7 +75,7 @@ void cpu_idle(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* endless idle loop with no priority at all */</div><div class='ctx'> 	for (;;) {</div><div class='del'>-		if (ARCH_SUN4C_SUN4) {</div><div class='add'>+		if (ARCH_SUN4C) {</div><div class='ctx'> 			static int count = HZ;</div><div class='ctx'> 			static unsigned long last_jiffies;</div><div class='ctx'> 			static unsigned long last_faults;</div><div class='head'>diff --git a/arch/sparc/kernel/prom.c b/arch/sparc/kernel/prom.c<br/>index cd4fb79aa3a8..eee5efcfe50e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/kernel/prom.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/kernel/prom.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/kernel/prom.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/kernel/prom.c</a></div><div class='hunk'>@@ -54,6 +54,9 @@ int of_getintprop_default(struct device_node *np, const char *name, int def)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(of_getintprop_default);</div><div class='ctx'> </div><div class='add'>+DEFINE_MUTEX(of_set_property_mutex);</div><div class='add'>+EXPORT_SYMBOL(of_set_property_mutex);</div><div class='add'>+</div><div class='ctx'> int of_set_property(struct device_node *dp, const char *name, void *val, int len)</div><div class='ctx'> {</div><div class='ctx'> 	struct property **prevp;</div><div class='hunk'>@@ -77,7 +80,10 @@ int of_set_property(struct device_node *dp, const char *name, void *val, int len</div><div class='ctx'> 			void *old_val = prop-&gt;value;</div><div class='ctx'> 			int ret;</div><div class='ctx'> </div><div class='add'>+			mutex_lock(&amp;of_set_property_mutex);</div><div class='ctx'> 			ret = prom_setprop(dp-&gt;node, (char *) name, val, len);</div><div class='add'>+			mutex_unlock(&amp;of_set_property_mutex);</div><div class='add'>+</div><div class='ctx'> 			err = -EINVAL;</div><div class='ctx'> 			if (ret &gt;= 0) {</div><div class='ctx'> 				prop-&gt;value = new_val;</div><div class='hunk'>@@ -436,7 +442,6 @@ static void __init of_console_init(void)</div><div class='ctx'> </div><div class='ctx'> 	switch (prom_vers) {</div><div class='ctx'> 	case PROM_V0:</div><div class='del'>-	case PROM_SUN4:</div><div class='ctx'> 		skip = 0;</div><div class='ctx'> 		switch (*romvec-&gt;pv_stdout) {</div><div class='ctx'> 		case PROMDEV_SCREEN:</div><div class='head'>diff --git a/arch/sparc/kernel/setup.c b/arch/sparc/kernel/setup.c<br/>index 9e451b21202e..24fe3078bd4b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/kernel/setup.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/kernel/setup.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/kernel/setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/kernel/setup.c</a></div><div class='hunk'>@@ -213,23 +213,25 @@ void __init setup_arch(char **cmdline_p)</div><div class='ctx'> 	/* Initialize PROM console and command line. */</div><div class='ctx'> 	*cmdline_p = prom_getbootargs();</div><div class='ctx'> 	strcpy(boot_command_line, *cmdline_p);</div><div class='add'>+	parse_early_param();</div><div class='ctx'> </div><div class='ctx'> 	/* Set sparc_cpu_model */</div><div class='ctx'> 	sparc_cpu_model = sun_unknown;</div><div class='del'>-	if(!strcmp(&amp;cputypval,"sun4 ")) { sparc_cpu_model=sun4; }</div><div class='del'>-	if(!strcmp(&amp;cputypval,"sun4c")) { sparc_cpu_model=sun4c; }</div><div class='del'>-	if(!strcmp(&amp;cputypval,"sun4m")) { sparc_cpu_model=sun4m; }</div><div class='del'>-	if(!strcmp(&amp;cputypval,"sun4s")) { sparc_cpu_model=sun4m; }  /* CP-1200 with PROM 2.30 -E */</div><div class='del'>-	if(!strcmp(&amp;cputypval,"sun4d")) { sparc_cpu_model=sun4d; }</div><div class='del'>-	if(!strcmp(&amp;cputypval,"sun4e")) { sparc_cpu_model=sun4e; }</div><div class='del'>-	if(!strcmp(&amp;cputypval,"sun4u")) { sparc_cpu_model=sun4u; }</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SUN4</div><div class='del'>-	if (sparc_cpu_model != sun4) {</div><div class='del'>-		prom_printf("This kernel is for Sun4 architecture only.\n");</div><div class='del'>-		prom_halt();</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='add'>+	if (!strcmp(&amp;cputypval,"sun4 "))</div><div class='add'>+		sparc_cpu_model = sun4;</div><div class='add'>+	if (!strcmp(&amp;cputypval,"sun4c"))</div><div class='add'>+		sparc_cpu_model = sun4c;</div><div class='add'>+	if (!strcmp(&amp;cputypval,"sun4m"))</div><div class='add'>+		sparc_cpu_model = sun4m;</div><div class='add'>+	if (!strcmp(&amp;cputypval,"sun4s"))</div><div class='add'>+		sparc_cpu_model = sun4m; /* CP-1200 with PROM 2.30 -E */</div><div class='add'>+	if (!strcmp(&amp;cputypval,"sun4d"))</div><div class='add'>+		sparc_cpu_model = sun4d;</div><div class='add'>+	if (!strcmp(&amp;cputypval,"sun4e"))</div><div class='add'>+		sparc_cpu_model = sun4e;</div><div class='add'>+	if (!strcmp(&amp;cputypval,"sun4u"))</div><div class='add'>+		sparc_cpu_model = sun4u;</div><div class='add'>+</div><div class='ctx'> 	printk("ARCH: ");</div><div class='ctx'> 	switch(sparc_cpu_model) {</div><div class='ctx'> 	case sun4:</div><div class='hunk'>@@ -263,7 +265,7 @@ void __init setup_arch(char **cmdline_p)</div><div class='ctx'> 	boot_flags_init(*cmdline_p);</div><div class='ctx'> </div><div class='ctx'> 	idprom_init();</div><div class='del'>-	if (ARCH_SUN4C_SUN4)</div><div class='add'>+	if (ARCH_SUN4C)</div><div class='ctx'> 		sun4c_probe_vac();</div><div class='ctx'> 	load_mmu();</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sparc/kernel/sparc_ksyms.c b/arch/sparc/kernel/sparc_ksyms.c<br/>index b23cea5ca5d1..b0dfff848653 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/kernel/sparc_ksyms.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/kernel/sparc_ksyms.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/kernel/sparc_ksyms.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/kernel/sparc_ksyms.c</a></div><div class='hunk'>@@ -38,17 +38,12 @@</div><div class='ctx'> #include &lt;asm/idprom.h&gt;</div><div class='ctx'> #include &lt;asm/head.h&gt;</div><div class='ctx'> #include &lt;asm/smp.h&gt;</div><div class='del'>-#include &lt;asm/mostek.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/checksum.h&gt;</div><div class='ctx'> #ifdef CONFIG_SBUS</div><div class='del'>-#include &lt;asm/sbus.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='ctx'> #endif</div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-#include &lt;asm/ebus.h&gt;</div><div class='del'>-#endif</div><div class='ctx'> #include &lt;asm/io-unit.h&gt;</div><div class='ctx'> #include &lt;asm/bug.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -127,16 +122,11 @@ EXPORT_SYMBOL(phys_cpu_present_map);</div><div class='ctx'> EXPORT_SYMBOL(__udelay);</div><div class='ctx'> EXPORT_SYMBOL(__ndelay);</div><div class='ctx'> EXPORT_SYMBOL(rtc_lock);</div><div class='del'>-EXPORT_SYMBOL(mostek_lock);</div><div class='del'>-EXPORT_SYMBOL(mstk48t02_regs);</div><div class='ctx'> #ifdef CONFIG_SUN_AUXIO</div><div class='ctx'> EXPORT_SYMBOL(set_auxio);</div><div class='ctx'> EXPORT_SYMBOL(get_auxio);</div><div class='ctx'> #endif</div><div class='ctx'> EXPORT_SYMBOL(io_remap_pfn_range);</div><div class='del'>-  /* P3: iounit_xxx may be needed, sun4d users */</div><div class='del'>-/* EXPORT_SYMBOL(iounit_map_dma_init); */</div><div class='del'>-/* EXPORT_SYMBOL(iounit_map_dma_page); */</div><div class='ctx'> </div><div class='ctx'> #ifndef CONFIG_SMP</div><div class='ctx'> EXPORT_SYMBOL(BTFIXUP_CALL(___xchg32));</div><div class='hunk'>@@ -153,24 +143,9 @@ EXPORT_SYMBOL(BTFIXUP_CALL(mmu_release_scsi_one));</div><div class='ctx'> EXPORT_SYMBOL(BTFIXUP_CALL(pgprot_noncached));</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SBUS</div><div class='del'>-EXPORT_SYMBOL(sbus_root);</div><div class='del'>-EXPORT_SYMBOL(dma_chain);</div><div class='ctx'> EXPORT_SYMBOL(sbus_set_sbus64);</div><div class='del'>-EXPORT_SYMBOL(sbus_alloc_consistent);</div><div class='del'>-EXPORT_SYMBOL(sbus_free_consistent);</div><div class='del'>-EXPORT_SYMBOL(sbus_map_single);</div><div class='del'>-EXPORT_SYMBOL(sbus_unmap_single);</div><div class='del'>-EXPORT_SYMBOL(sbus_map_sg);</div><div class='del'>-EXPORT_SYMBOL(sbus_unmap_sg);</div><div class='del'>-EXPORT_SYMBOL(sbus_dma_sync_single_for_cpu);</div><div class='del'>-EXPORT_SYMBOL(sbus_dma_sync_single_for_device);</div><div class='del'>-EXPORT_SYMBOL(sbus_dma_sync_sg_for_cpu);</div><div class='del'>-EXPORT_SYMBOL(sbus_dma_sync_sg_for_device);</div><div class='del'>-EXPORT_SYMBOL(sbus_iounmap);</div><div class='del'>-EXPORT_SYMBOL(sbus_ioremap);</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_PCI</div><div class='del'>-EXPORT_SYMBOL(ebus_chain);</div><div class='ctx'> EXPORT_SYMBOL(insb);</div><div class='ctx'> EXPORT_SYMBOL(outsb);</div><div class='ctx'> EXPORT_SYMBOL(insw);</div><div class='head'>diff --git a/arch/sparc/kernel/sun4c_irq.c b/arch/sparc/kernel/sun4c_irq.c<br/>index 340fc395fe2d..5dc8a5769489 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/kernel/sun4c_irq.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/kernel/sun4c_irq.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/kernel/sun4c_irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/kernel/sun4c_irq.c</a></div><div class='hunk'>@@ -18,6 +18,8 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_device.h&gt;</div><div class='ctx'> #include "irq.h"</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='hunk'>@@ -31,15 +33,8 @@</div><div class='ctx'> #include &lt;asm/traps.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/sun4paddr.h&gt;</div><div class='ctx'> #include &lt;asm/idprom.h&gt;</div><div class='ctx'> #include &lt;asm/machines.h&gt;</div><div class='del'>-#include &lt;asm/sbus.h&gt;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-static struct resource sun4c_timer_eb = { "sun4c_timer" };</div><div class='del'>-static struct resource sun4c_intr_eb = { "sun4c_intr" };</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Bit field defines for the interrupt registers on various</div><div class='hunk'>@@ -64,19 +59,7 @@ static struct resource sun4c_intr_eb = { "sun4c_intr" };</div><div class='ctx'>  *</div><div class='ctx'>  * so don't go making it static, like I tried. sigh.</div><div class='ctx'>  */</div><div class='del'>-unsigned char *interrupt_enable = NULL;</div><div class='del'>-</div><div class='del'>-static int sun4c_pil_map[] = { 0, 1, 2, 3, 5, 7, 8, 9 };</div><div class='del'>-</div><div class='del'>-static unsigned int sun4c_sbint_to_irq(struct sbus_dev *sdev,</div><div class='del'>-				       unsigned int sbint)</div><div class='del'>-{</div><div class='del'>-	if (sbint &gt;= sizeof(sun4c_pil_map)) {</div><div class='del'>-		printk(KERN_ERR "%s: bogus SBINT %d\n", sdev-&gt;prom_name, sbint);</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='del'>-	return sun4c_pil_map[sbint];</div><div class='del'>-}</div><div class='add'>+unsigned char __iomem *interrupt_enable = NULL;</div><div class='ctx'> </div><div class='ctx'> static void sun4c_disable_irq(unsigned int irq_nr)</div><div class='ctx'> {</div><div class='hunk'>@@ -85,7 +68,7 @@ static void sun4c_disable_irq(unsigned int irq_nr)</div><div class='ctx'>     </div><div class='ctx'> 	local_irq_save(flags);</div><div class='ctx'> 	irq_nr &amp;= (NR_IRQS - 1);</div><div class='del'>-	current_mask = *interrupt_enable;</div><div class='add'>+	current_mask = sbus_readb(interrupt_enable);</div><div class='ctx'> 	switch(irq_nr) {</div><div class='ctx'> 	case 1:</div><div class='ctx'> 		new_mask = ((current_mask) &amp; (~(SUN4C_INT_E1)));</div><div class='hunk'>@@ -103,7 +86,7 @@ static void sun4c_disable_irq(unsigned int irq_nr)</div><div class='ctx'> 		local_irq_restore(flags);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='del'>-	*interrupt_enable = new_mask;</div><div class='add'>+	sbus_writeb(new_mask, interrupt_enable);</div><div class='ctx'> 	local_irq_restore(flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -114,7 +97,7 @@ static void sun4c_enable_irq(unsigned int irq_nr)</div><div class='ctx'>     </div><div class='ctx'> 	local_irq_save(flags);</div><div class='ctx'> 	irq_nr &amp;= (NR_IRQS - 1);</div><div class='del'>-	current_mask = *interrupt_enable;</div><div class='add'>+	current_mask = sbus_readb(interrupt_enable);</div><div class='ctx'> 	switch(irq_nr) {</div><div class='ctx'> 	case 1:</div><div class='ctx'> 		new_mask = ((current_mask) | SUN4C_INT_E1);</div><div class='hunk'>@@ -132,37 +115,22 @@ static void sun4c_enable_irq(unsigned int irq_nr)</div><div class='ctx'> 		local_irq_restore(flags);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='del'>-	*interrupt_enable = new_mask;</div><div class='add'>+	sbus_writeb(new_mask, interrupt_enable);</div><div class='ctx'> 	local_irq_restore(flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define TIMER_IRQ  	10    /* Also at level 14, but we ignore that one. */</div><div class='del'>-#define PROFILE_IRQ	14    /* Level14 ticker.. used by OBP for polling */</div><div class='del'>-</div><div class='del'>-volatile struct sun4c_timer_info *sun4c_timers;</div><div class='add'>+struct sun4c_timer_info {</div><div class='add'>+	u32		l10_count;</div><div class='add'>+	u32		l10_limit;</div><div class='add'>+	u32		l14_count;</div><div class='add'>+	u32		l14_limit;</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SUN4</div><div class='del'>-/* This is an ugly hack to work around the</div><div class='del'>-   current timer code, and make it work with </div><div class='del'>-   the sun4/260 intersil </div><div class='del'>-   */</div><div class='del'>-volatile struct sun4c_timer_info sun4_timer;</div><div class='del'>-#endif</div><div class='add'>+static struct sun4c_timer_info __iomem *sun4c_timers;</div><div class='ctx'> </div><div class='ctx'> static void sun4c_clear_clock_irq(void)</div><div class='ctx'> {</div><div class='del'>-	volatile unsigned int clear_intr;</div><div class='del'>-#ifdef CONFIG_SUN4</div><div class='del'>-	if (idprom-&gt;id_machtype == (SM_SUN4 | SM_4_260)) </div><div class='del'>-	  clear_intr = sun4_timer.timer_limit10;</div><div class='del'>-	else</div><div class='del'>-#endif</div><div class='del'>-	clear_intr = sun4c_timers-&gt;timer_limit10;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void sun4c_clear_profile_irq(int cpu)</div><div class='del'>-{</div><div class='del'>-	/* Errm.. not sure how to do this.. */</div><div class='add'>+	sbus_readl(&amp;sun4c_timers-&gt;l10_limit);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sun4c_load_profile_irq(int cpu, unsigned int limit)</div><div class='hunk'>@@ -172,41 +140,48 @@ static void sun4c_load_profile_irq(int cpu, unsigned int limit)</div><div class='ctx'> </div><div class='ctx'> static void __init sun4c_init_timers(irq_handler_t counter_fn)</div><div class='ctx'> {</div><div class='del'>-	int irq;</div><div class='add'>+	const struct linux_prom_irqs *irq;</div><div class='add'>+	struct device_node *dp;</div><div class='add'>+	const u32 *addr;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	dp = of_find_node_by_name(NULL, "counter-timer");</div><div class='add'>+	if (!dp) {</div><div class='add'>+		prom_printf("sun4c_init_timers: Unable to find counter-timer\n");</div><div class='add'>+		prom_halt();</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	/* Map the Timer chip, this is implemented in hardware inside</div><div class='del'>-	 * the cache chip on the sun4c.</div><div class='del'>-	 */</div><div class='del'>-#ifdef CONFIG_SUN4</div><div class='del'>-	if (idprom-&gt;id_machtype == (SM_SUN4 | SM_4_260))</div><div class='del'>-		sun4c_timers = &amp;sun4_timer;</div><div class='del'>-	else</div><div class='del'>-#endif</div><div class='del'>-	sun4c_timers = ioremap(SUN_TIMER_PHYSADDR,</div><div class='del'>-	    sizeof(struct sun4c_timer_info));</div><div class='add'>+	addr = of_get_property(dp, "address", NULL);</div><div class='add'>+	if (!addr) {</div><div class='add'>+		prom_printf("sun4c_init_timers: No address property\n");</div><div class='add'>+		prom_halt();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sun4c_timers = (void __iomem *) (unsigned long) addr[0];</div><div class='add'>+</div><div class='add'>+	irq = of_get_property(dp, "intr", NULL);</div><div class='add'>+	if (!irq) {</div><div class='add'>+		prom_printf("sun4c_init_timers: No intr property\n");</div><div class='add'>+		prom_halt();</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Have the level 10 timer tick at 100HZ.  We don't touch the</div><div class='ctx'> 	 * level 14 timer limit since we are letting the prom handle</div><div class='ctx'> 	 * them until we have a real console driver so L1-A works.</div><div class='ctx'> 	 */</div><div class='del'>-	sun4c_timers-&gt;timer_limit10 = (((1000000/HZ) + 1) &lt;&lt; 10);</div><div class='del'>-	master_l10_counter = &amp;sun4c_timers-&gt;cur_count10;</div><div class='del'>-	master_l10_limit = &amp;sun4c_timers-&gt;timer_limit10;</div><div class='add'>+	sbus_writel((((1000000/HZ) + 1) &lt;&lt; 10), &amp;sun4c_timers-&gt;l10_limit);</div><div class='ctx'> </div><div class='del'>-	irq = request_irq(TIMER_IRQ,</div><div class='del'>-			  counter_fn,</div><div class='add'>+	master_l10_counter = &amp;sun4c_timers-&gt;l10_count;</div><div class='add'>+</div><div class='add'>+	err = request_irq(irq[0].pri, counter_fn,</div><div class='ctx'> 			  (IRQF_DISABLED | SA_STATIC_ALLOC),</div><div class='ctx'> 			  "timer", NULL);</div><div class='del'>-	if (irq) {</div><div class='del'>-		prom_printf("time_init: unable to attach IRQ%d\n",TIMER_IRQ);</div><div class='add'>+	if (err) {</div><div class='add'>+		prom_printf("sun4c_init_timers: request_irq() fails with %d\n", err);</div><div class='ctx'> 		prom_halt();</div><div class='ctx'> 	}</div><div class='ctx'>     </div><div class='del'>-#if 0</div><div class='del'>-	/* This does not work on 4/330 */</div><div class='del'>-	sun4c_enable_irq(10);</div><div class='del'>-#endif</div><div class='del'>-	claim_ticker14(NULL, PROFILE_IRQ, 0);</div><div class='add'>+	sun4c_disable_irq(irq[1].pri);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='hunk'>@@ -215,41 +190,28 @@ static void sun4c_nop(void) {}</div><div class='ctx'> </div><div class='ctx'> void __init sun4c_init_IRQ(void)</div><div class='ctx'> {</div><div class='del'>-	struct linux_prom_registers int_regs[2];</div><div class='del'>-	int ie_node;</div><div class='add'>+	struct device_node *dp;</div><div class='add'>+	const u32 *addr;</div><div class='ctx'> </div><div class='del'>-	if (ARCH_SUN4) {</div><div class='del'>-		interrupt_enable = (char *)</div><div class='del'>-		    ioremap(sun4_ie_physaddr, PAGE_SIZE);</div><div class='del'>-	} else {</div><div class='del'>-		struct resource phyres;</div><div class='del'>-</div><div class='del'>-		ie_node = prom_searchsiblings (prom_getchild(prom_root_node),</div><div class='del'>-				       	"interrupt-enable");</div><div class='del'>-		if(ie_node == 0)</div><div class='del'>-			panic("Cannot find /interrupt-enable node");</div><div class='add'>+	dp = of_find_node_by_name(NULL, "interrupt-enable");</div><div class='add'>+	if (!dp) {</div><div class='add'>+		prom_printf("sun4c_init_IRQ: Unable to find interrupt-enable\n");</div><div class='add'>+		prom_halt();</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		/* Depending on the "address" property is bad news... */</div><div class='del'>-		interrupt_enable = NULL;</div><div class='del'>-		if (prom_getproperty(ie_node, "reg", (char *) int_regs,</div><div class='del'>-				     sizeof(int_regs)) != -1) {</div><div class='del'>-			memset(&amp;phyres, 0, sizeof(struct resource));</div><div class='del'>-			phyres.flags = int_regs[0].which_io;</div><div class='del'>-			phyres.start = int_regs[0].phys_addr;</div><div class='del'>-			interrupt_enable = (char *) sbus_ioremap(&amp;phyres, 0,</div><div class='del'>-			    int_regs[0].reg_size, "sun4c_intr");</div><div class='del'>-		}</div><div class='add'>+	addr = of_get_property(dp, "address", NULL);</div><div class='add'>+	if (!addr) {</div><div class='add'>+		prom_printf("sun4c_init_IRQ: No address property\n");</div><div class='add'>+		prom_halt();</div><div class='ctx'> 	}</div><div class='del'>-	if (!interrupt_enable)</div><div class='del'>-		panic("Cannot map interrupt_enable");</div><div class='ctx'> </div><div class='del'>-	BTFIXUPSET_CALL(sbint_to_irq, sun4c_sbint_to_irq, BTFIXUPCALL_NORM);</div><div class='add'>+	interrupt_enable = (void __iomem *) (unsigned long) addr[0];</div><div class='add'>+</div><div class='ctx'> 	BTFIXUPSET_CALL(enable_irq, sun4c_enable_irq, BTFIXUPCALL_NORM);</div><div class='ctx'> 	BTFIXUPSET_CALL(disable_irq, sun4c_disable_irq, BTFIXUPCALL_NORM);</div><div class='ctx'> 	BTFIXUPSET_CALL(enable_pil_irq, sun4c_enable_irq, BTFIXUPCALL_NORM);</div><div class='ctx'> 	BTFIXUPSET_CALL(disable_pil_irq, sun4c_disable_irq, BTFIXUPCALL_NORM);</div><div class='ctx'> 	BTFIXUPSET_CALL(clear_clock_irq, sun4c_clear_clock_irq, BTFIXUPCALL_NORM);</div><div class='del'>-	BTFIXUPSET_CALL(clear_profile_irq, sun4c_clear_profile_irq, BTFIXUPCALL_NOP);</div><div class='ctx'> 	BTFIXUPSET_CALL(load_profile_irq, sun4c_load_profile_irq, BTFIXUPCALL_NOP);</div><div class='ctx'> 	sparc_init_timers = sun4c_init_timers;</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='hunk'>@@ -257,6 +219,6 @@ void __init sun4c_init_IRQ(void)</div><div class='ctx'> 	BTFIXUPSET_CALL(clear_cpu_int, sun4c_nop, BTFIXUPCALL_NOP);</div><div class='ctx'> 	BTFIXUPSET_CALL(set_irq_udt, sun4c_nop, BTFIXUPCALL_NOP);</div><div class='ctx'> #endif</div><div class='del'>-	*interrupt_enable = (SUN4C_INT_ENABLE);</div><div class='add'>+	sbus_writeb(SUN4C_INT_ENABLE, interrupt_enable);</div><div class='ctx'> 	/* Cannot enable interrupts until OBP ticker is disabled. */</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/sparc/kernel/sun4d_irq.c b/arch/sparc/kernel/sun4d_irq.c<br/>index 1290b5998f83..d3cb76ce418b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/kernel/sun4d_irq.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/kernel/sun4d_irq.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/kernel/sun4d_irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/kernel/sun4d_irq.c</a></div><div class='hunk'>@@ -19,6 +19,8 @@</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='hunk'>@@ -34,7 +36,6 @@</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/pgalloc.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='del'>-#include &lt;asm/sbus.h&gt;</div><div class='ctx'> #include &lt;asm/sbi.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #include &lt;asm/irq_regs.h&gt;</div><div class='hunk'>@@ -44,16 +45,22 @@</div><div class='ctx'> /* If you trust current SCSI layer to handle different SCSI IRQs, enable this. I don't trust it... -jj */</div><div class='ctx'> /* #define DISTRIBUTE_IRQS */</div><div class='ctx'> </div><div class='del'>-struct sun4d_timer_regs *sun4d_timers;</div><div class='add'>+struct sun4d_timer_regs {</div><div class='add'>+	u32	l10_timer_limit;</div><div class='add'>+	u32	l10_cur_countx;</div><div class='add'>+	u32	l10_limit_noclear;</div><div class='add'>+	u32	ctrl;</div><div class='add'>+	u32	l10_cur_count;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct sun4d_timer_regs __iomem *sun4d_timers;</div><div class='add'>+</div><div class='ctx'> #define TIMER_IRQ	10</div><div class='ctx'> </div><div class='ctx'> #define MAX_STATIC_ALLOC	4</div><div class='ctx'> extern struct irqaction static_irqaction[MAX_STATIC_ALLOC];</div><div class='ctx'> extern int static_irq_count;</div><div class='del'>-unsigned char cpu_leds[32];</div><div class='del'>-#ifdef CONFIG_SMP</div><div class='ctx'> static unsigned char sbus_tid[32];</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> static struct irqaction *irq_action[NR_IRQS];</div><div class='ctx'> extern spinlock_t irq_action_lock;</div><div class='hunk'>@@ -72,9 +79,9 @@ static int sbus_to_pil[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int nsbi;</div><div class='del'>-#ifdef CONFIG_SMP</div><div class='add'>+</div><div class='add'>+/* Exported for sun4d_smp.c */</div><div class='ctx'> DEFINE_SPINLOCK(sun4d_imsk_lock);</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> int show_sun4d_interrupts(struct seq_file *p, void *v)</div><div class='ctx'> {</div><div class='hunk'>@@ -257,26 +264,6 @@ void sun4d_handler_irq(int irq, struct pt_regs * regs)</div><div class='ctx'> 	set_irq_regs(old_regs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-unsigned int sun4d_build_irq(struct sbus_dev *sdev, int irq)</div><div class='del'>-{</div><div class='del'>-	int sbusl = pil_to_sbus[irq];</div><div class='del'>-</div><div class='del'>-	if (sbusl)</div><div class='del'>-		return ((sdev-&gt;bus-&gt;board + 1) &lt;&lt; 5) + (sbusl &lt;&lt; 2) + sdev-&gt;slot;</div><div class='del'>-	else</div><div class='del'>-		return irq;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned int sun4d_sbint_to_irq(struct sbus_dev *sdev,</div><div class='del'>-				       unsigned int sbint)</div><div class='del'>-{</div><div class='del'>-	if (sbint &gt;= sizeof(sbus_to_pil)) {</div><div class='del'>-		printk(KERN_ERR "%s: bogus SBINT %d\n", sdev-&gt;prom_name, sbint);</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='del'>-	return sun4d_build_irq(sdev, sbus_to_pil[sbint]);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> int sun4d_request_irq(unsigned int irq,</div><div class='ctx'> 		irq_handler_t handler,</div><div class='ctx'> 		unsigned long irqflags, const char * devname, void *dev_id)</div><div class='hunk'>@@ -360,36 +347,28 @@ out:</div><div class='ctx'> </div><div class='ctx'> static void sun4d_disable_irq(unsigned int irq)</div><div class='ctx'> {</div><div class='del'>-#ifdef CONFIG_SMP</div><div class='ctx'> 	int tid = sbus_tid[(irq &gt;&gt; 5) - 1];</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-#endif	</div><div class='ctx'> 	</div><div class='del'>-	if (irq &lt; NR_IRQS) return;</div><div class='del'>-#ifdef CONFIG_SMP</div><div class='add'>+	if (irq &lt; NR_IRQS)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	spin_lock_irqsave(&amp;sun4d_imsk_lock, flags);</div><div class='ctx'> 	cc_set_imsk_other(tid, cc_get_imsk_other(tid) | (1 &lt;&lt; sbus_to_pil[(irq &gt;&gt; 2) &amp; 7]));</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;sun4d_imsk_lock, flags);</div><div class='del'>-#else		</div><div class='del'>-	cc_set_imsk(cc_get_imsk() | (1 &lt;&lt; sbus_to_pil[(irq &gt;&gt; 2) &amp; 7]));</div><div class='del'>-#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sun4d_enable_irq(unsigned int irq)</div><div class='ctx'> {</div><div class='del'>-#ifdef CONFIG_SMP</div><div class='ctx'> 	int tid = sbus_tid[(irq &gt;&gt; 5) - 1];</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-#endif	</div><div class='ctx'> 	</div><div class='del'>-	if (irq &lt; NR_IRQS) return;</div><div class='del'>-#ifdef CONFIG_SMP</div><div class='add'>+	if (irq &lt; NR_IRQS)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	spin_lock_irqsave(&amp;sun4d_imsk_lock, flags);</div><div class='ctx'> 	cc_set_imsk_other(tid, cc_get_imsk_other(tid) &amp; ~(1 &lt;&lt; sbus_to_pil[(irq &gt;&gt; 2) &amp; 7]));</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;sun4d_imsk_lock, flags);</div><div class='del'>-#else		</div><div class='del'>-	cc_set_imsk(cc_get_imsk() &amp; ~(1 &lt;&lt; sbus_to_pil[(irq &gt;&gt; 2) &amp; 7]));</div><div class='del'>-#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='hunk'>@@ -409,47 +388,55 @@ static void sun4d_set_udt(int cpu)</div><div class='ctx'> /* Setup IRQ distribution scheme. */</div><div class='ctx'> void __init sun4d_distribute_irqs(void)</div><div class='ctx'> {</div><div class='add'>+	struct device_node *dp;</div><div class='add'>+</div><div class='ctx'> #ifdef DISTRIBUTE_IRQS</div><div class='del'>-	struct sbus_bus *sbus;</div><div class='del'>-	unsigned long sbus_serving_map;</div><div class='add'>+	cpumask_t sbus_serving_map;</div><div class='ctx'> </div><div class='ctx'> 	sbus_serving_map = cpu_present_map;</div><div class='del'>-	for_each_sbus(sbus) {</div><div class='del'>-		if ((sbus-&gt;board * 2) == boot_cpu_id &amp;&amp; (cpu_present_map &amp; (1 &lt;&lt; (sbus-&gt;board * 2 + 1))))</div><div class='del'>-			sbus_tid[sbus-&gt;board] = (sbus-&gt;board * 2 + 1);</div><div class='del'>-		else if (cpu_present_map &amp; (1 &lt;&lt; (sbus-&gt;board * 2)))</div><div class='del'>-			sbus_tid[sbus-&gt;board] = (sbus-&gt;board * 2);</div><div class='del'>-		else if (cpu_present_map &amp; (1 &lt;&lt; (sbus-&gt;board * 2 + 1)))</div><div class='del'>-			sbus_tid[sbus-&gt;board] = (sbus-&gt;board * 2 + 1);</div><div class='add'>+	for_each_node_by_name(dp, "sbi") {</div><div class='add'>+		int board = of_getintprop_default(dp, "board#", 0);</div><div class='add'>+</div><div class='add'>+		if ((board * 2) == boot_cpu_id &amp;&amp; cpu_isset(board * 2 + 1, cpu_present_map))</div><div class='add'>+			sbus_tid[board] = (board * 2 + 1);</div><div class='add'>+		else if (cpu_isset(board * 2, cpu_present_map))</div><div class='add'>+			sbus_tid[board] = (board * 2);</div><div class='add'>+		else if (cpu_isset(board * 2 + 1, cpu_present_map))</div><div class='add'>+			sbus_tid[board] = (board * 2 + 1);</div><div class='ctx'> 		else</div><div class='del'>-			sbus_tid[sbus-&gt;board] = 0xff;</div><div class='del'>-		if (sbus_tid[sbus-&gt;board] != 0xff)</div><div class='del'>-			sbus_serving_map &amp;= ~(1 &lt;&lt; sbus_tid[sbus-&gt;board]);</div><div class='add'>+			sbus_tid[board] = 0xff;</div><div class='add'>+		if (sbus_tid[board] != 0xff)</div><div class='add'>+			cpu_clear(sbus_tid[board], sbus_serving_map);</div><div class='ctx'> 	}</div><div class='del'>-	for_each_sbus(sbus)</div><div class='del'>-		if (sbus_tid[sbus-&gt;board] == 0xff) {</div><div class='add'>+	for_each_node_by_name(dp, "sbi") {</div><div class='add'>+		int board = of_getintprop_default(dp, "board#", 0);</div><div class='add'>+		if (sbus_tid[board] == 0xff) {</div><div class='ctx'> 			int i = 31;</div><div class='ctx'> 				</div><div class='del'>-			if (!sbus_serving_map)</div><div class='add'>+			if (cpus_empty(sbus_serving_map))</div><div class='ctx'> 				sbus_serving_map = cpu_present_map;</div><div class='del'>-			while (!(sbus_serving_map &amp; (1 &lt;&lt; i)))</div><div class='add'>+			while (cpu_isset(i, sbus_serving_map))</div><div class='ctx'> 				i--;</div><div class='del'>-			sbus_tid[sbus-&gt;board] = i;</div><div class='del'>-			sbus_serving_map &amp;= ~(1 &lt;&lt; i);</div><div class='add'>+			sbus_tid[board] = i;</div><div class='add'>+			cpu_clear(i, sbus_serving_map);</div><div class='ctx'> 		}</div><div class='del'>-	for_each_sbus(sbus) {</div><div class='del'>-		printk("sbus%d IRQs directed to CPU%d\n", sbus-&gt;board, sbus_tid[sbus-&gt;board]);</div><div class='del'>-		set_sbi_tid(sbus-&gt;devid, sbus_tid[sbus-&gt;board] &lt;&lt; 3);</div><div class='add'>+	}</div><div class='add'>+	for_each_node_by_name(dp, "sbi") {</div><div class='add'>+		int devid = of_getintprop_default(dp, "device-id", 0);</div><div class='add'>+		int board = of_getintprop_default(dp, "board#", 0);</div><div class='add'>+		printk("sbus%d IRQs directed to CPU%d\n", board, sbus_tid[board]);</div><div class='add'>+		set_sbi_tid(devid, sbus_tid[board] &lt;&lt; 3);</div><div class='ctx'> 	}</div><div class='ctx'> #else</div><div class='del'>-	struct sbus_bus *sbus;</div><div class='ctx'> 	int cpuid = cpu_logical_map(1);</div><div class='ctx'> </div><div class='ctx'> 	if (cpuid == -1)</div><div class='ctx'> 		cpuid = cpu_logical_map(0);</div><div class='del'>-	for_each_sbus(sbus) {</div><div class='del'>-		sbus_tid[sbus-&gt;board] = cpuid;</div><div class='del'>-		set_sbi_tid(sbus-&gt;devid, cpuid &lt;&lt; 3);</div><div class='add'>+	for_each_node_by_name(dp, "sbi") {</div><div class='add'>+		int devid = of_getintprop_default(dp, "device-id", 0);</div><div class='add'>+		int board = of_getintprop_default(dp, "board#", 0);</div><div class='add'>+		sbus_tid[board] = cpuid;</div><div class='add'>+		set_sbi_tid(devid, cpuid &lt;&lt; 3);</div><div class='ctx'> 	}</div><div class='ctx'> 	printk("All sbus IRQs directed to CPU%d\n", cpuid);</div><div class='ctx'> #endif</div><div class='hunk'>@@ -458,13 +445,7 @@ void __init sun4d_distribute_irqs(void)</div><div class='ctx'>  </div><div class='ctx'> static void sun4d_clear_clock_irq(void)</div><div class='ctx'> {</div><div class='del'>-	volatile unsigned int clear_intr;</div><div class='del'>-	clear_intr = sun4d_timers-&gt;l10_timer_limit;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void sun4d_clear_profile_irq(int cpu)</div><div class='del'>-{</div><div class='del'>-	bw_get_prof_limit(cpu);</div><div class='add'>+	sbus_readl(&amp;sun4d_timers-&gt;l10_timer_limit);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sun4d_load_profile_irq(int cpu, unsigned int limit)</div><div class='hunk'>@@ -472,98 +453,121 @@ static void sun4d_load_profile_irq(int cpu, unsigned int limit)</div><div class='ctx'> 	bw_set_prof_limit(cpu, limit);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __init sun4d_init_timers(irq_handler_t counter_fn)</div><div class='add'>+static void __init sun4d_load_profile_irqs(void)</div><div class='ctx'> {</div><div class='del'>-	int irq;</div><div class='del'>-	int cpu;</div><div class='del'>-	struct resource r;</div><div class='del'>-	int mid;</div><div class='add'>+	int cpu = 0, mid;</div><div class='ctx'> </div><div class='del'>-	/* Map the User Timer registers. */</div><div class='del'>-	memset(&amp;r, 0, sizeof(r));</div><div class='add'>+	while (!cpu_find_by_instance(cpu, NULL, &amp;mid)) {</div><div class='add'>+		sun4d_load_profile_irq(mid &gt;&gt; 3, 0);</div><div class='add'>+		cpu++;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init sun4d_fixup_trap_table(void)</div><div class='add'>+{</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='del'>-	r.start = CSR_BASE(boot_cpu_id)+BW_TIMER_LIMIT;</div><div class='del'>-#else</div><div class='del'>-	r.start = CSR_BASE(0)+BW_TIMER_LIMIT;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	extern unsigned long lvl14_save[4];</div><div class='add'>+	struct tt_entry *trap_table = &amp;sparc_ttable[SP_TRAP_IRQ1 + (14 - 1)];</div><div class='add'>+	extern unsigned int real_irq_entry[], smp4d_ticker[];</div><div class='add'>+	extern unsigned int patchme_maybe_smp_msg[];</div><div class='add'>+</div><div class='add'>+	/* Adjust so that we jump directly to smp4d_ticker */</div><div class='add'>+	lvl14_save[2] += smp4d_ticker - real_irq_entry;</div><div class='add'>+</div><div class='add'>+	/* For SMP we use the level 14 ticker, however the bootup code</div><div class='add'>+	 * has copied the firmware's level 14 vector into the boot cpu's</div><div class='add'>+	 * trap table, we must fix this now or we get squashed.</div><div class='add'>+	 */</div><div class='add'>+	local_irq_save(flags);</div><div class='add'>+	patchme_maybe_smp_msg[0] = 0x01000000; /* NOP out the branch */</div><div class='add'>+	trap_table-&gt;inst_one = lvl14_save[0];</div><div class='add'>+	trap_table-&gt;inst_two = lvl14_save[1];</div><div class='add'>+	trap_table-&gt;inst_three = lvl14_save[2];</div><div class='add'>+	trap_table-&gt;inst_four = lvl14_save[3];</div><div class='add'>+	local_flush_cache_all();</div><div class='add'>+	local_irq_restore(flags);</div><div class='ctx'> #endif</div><div class='del'>-	r.flags = 0xf;</div><div class='del'>-	sun4d_timers = (struct sun4d_timer_regs *) sbus_ioremap(&amp;r, 0,</div><div class='del'>-	    PAGE_SIZE, "user timer");</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	sun4d_timers-&gt;l10_timer_limit =  (((1000000/HZ) + 1) &lt;&lt; 10);</div><div class='del'>-	master_l10_counter = &amp;sun4d_timers-&gt;l10_cur_count;</div><div class='del'>-	master_l10_limit = &amp;sun4d_timers-&gt;l10_timer_limit;</div><div class='add'>+static void __init sun4d_init_timers(irq_handler_t counter_fn)</div><div class='add'>+{</div><div class='add'>+	struct device_node *dp;</div><div class='add'>+	struct resource res;</div><div class='add'>+	const u32 *reg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	dp = of_find_node_by_name(NULL, "cpu-unit");</div><div class='add'>+	if (!dp) {</div><div class='add'>+		prom_printf("sun4d_init_timers: Unable to find cpu-unit\n");</div><div class='add'>+		prom_halt();</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	irq = request_irq(TIMER_IRQ,</div><div class='del'>-			  counter_fn,</div><div class='del'>-			  (IRQF_DISABLED | SA_STATIC_ALLOC),</div><div class='del'>-			  "timer", NULL);</div><div class='del'>-	if (irq) {</div><div class='del'>-		prom_printf("time_init: unable to attach IRQ%d\n",TIMER_IRQ);</div><div class='add'>+	/* Which cpu-unit we use is arbitrary, we can view the bootbus timer</div><div class='add'>+	 * registers via any cpu's mapping.  The first 'reg' property is the</div><div class='add'>+	 * bootbus.</div><div class='add'>+	 */</div><div class='add'>+	reg = of_get_property(dp, "reg", NULL);</div><div class='add'>+	if (!reg) {</div><div class='add'>+		prom_printf("sun4d_init_timers: No reg property\n");</div><div class='ctx'> 		prom_halt();</div><div class='ctx'> 	}</div><div class='del'>-	</div><div class='del'>-	/* Enable user timer free run for CPU 0 in BW */</div><div class='del'>-	/* bw_set_ctrl(0, bw_get_ctrl(0) | BW_CTRL_USER_TIMER); */</div><div class='ctx'> </div><div class='del'>-	cpu = 0;</div><div class='del'>-	while (!cpu_find_by_instance(cpu, NULL, &amp;mid)) {</div><div class='del'>-		sun4d_load_profile_irq(mid &gt;&gt; 3, 0);</div><div class='del'>-		cpu++;</div><div class='add'>+	res.start = reg[1];</div><div class='add'>+	res.end = reg[2] - 1;</div><div class='add'>+	res.flags = reg[0] &amp; 0xff;</div><div class='add'>+	sun4d_timers = of_ioremap(&amp;res, BW_TIMER_LIMIT,</div><div class='add'>+				  sizeof(struct sun4d_timer_regs), "user timer");</div><div class='add'>+	if (!sun4d_timers) {</div><div class='add'>+		prom_printf("sun4d_init_timers: Can't map timer regs\n");</div><div class='add'>+		prom_halt();</div><div class='ctx'> 	}</div><div class='del'>-		</div><div class='del'>-#ifdef CONFIG_SMP</div><div class='del'>-	{</div><div class='del'>-		unsigned long flags;</div><div class='del'>-		extern unsigned long lvl14_save[4];</div><div class='del'>-		struct tt_entry *trap_table = &amp;sparc_ttable[SP_TRAP_IRQ1 + (14 - 1)];</div><div class='del'>-		extern unsigned int real_irq_entry[], smp4d_ticker[];</div><div class='del'>-		extern unsigned int patchme_maybe_smp_msg[];</div><div class='del'>-</div><div class='del'>-		/* Adjust so that we jump directly to smp4d_ticker */</div><div class='del'>-		lvl14_save[2] += smp4d_ticker - real_irq_entry;</div><div class='del'>-</div><div class='del'>-		/* For SMP we use the level 14 ticker, however the bootup code</div><div class='del'>-		 * has copied the firmware's level 14 vector into the boot cpu's</div><div class='del'>-		 * trap table, we must fix this now or we get squashed.</div><div class='del'>-		 */</div><div class='del'>-		local_irq_save(flags);</div><div class='del'>-		patchme_maybe_smp_msg[0] = 0x01000000; /* NOP out the branch */</div><div class='del'>-		trap_table-&gt;inst_one = lvl14_save[0];</div><div class='del'>-		trap_table-&gt;inst_two = lvl14_save[1];</div><div class='del'>-		trap_table-&gt;inst_three = lvl14_save[2];</div><div class='del'>-		trap_table-&gt;inst_four = lvl14_save[3];</div><div class='del'>-		local_flush_cache_all();</div><div class='del'>-		local_irq_restore(flags);</div><div class='add'>+</div><div class='add'>+	sbus_writel((((1000000/HZ) + 1) &lt;&lt; 10), &amp;sun4d_timers-&gt;l10_timer_limit);</div><div class='add'>+</div><div class='add'>+	master_l10_counter = &amp;sun4d_timers-&gt;l10_cur_count;</div><div class='add'>+</div><div class='add'>+	err = request_irq(TIMER_IRQ, counter_fn,</div><div class='add'>+			  (IRQF_DISABLED | SA_STATIC_ALLOC),</div><div class='add'>+			  "timer", NULL);</div><div class='add'>+	if (err) {</div><div class='add'>+		prom_printf("sun4d_init_timers: request_irq() failed with %d\n", err);</div><div class='add'>+		prom_halt();</div><div class='ctx'> 	}</div><div class='del'>-#endif</div><div class='add'>+	sun4d_load_profile_irqs();</div><div class='add'>+	sun4d_fixup_trap_table();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __init sun4d_init_sbi_irq(void)</div><div class='ctx'> {</div><div class='del'>-	struct sbus_bus *sbus;</div><div class='del'>-	unsigned mask;</div><div class='add'>+	struct device_node *dp;</div><div class='add'>+	int target_cpu = 0;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SMP</div><div class='add'>+	target_cpu = boot_cpu_id;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	nsbi = 0;</div><div class='del'>-	for_each_sbus(sbus)</div><div class='add'>+	for_each_node_by_name(dp, "sbi")</div><div class='ctx'> 		nsbi++;</div><div class='ctx'> 	sbus_actions = kzalloc (nsbi * 8 * 4 * sizeof(struct sbus_action), GFP_ATOMIC);</div><div class='ctx'> 	if (!sbus_actions) {</div><div class='ctx'> 		prom_printf("SUN4D: Cannot allocate sbus_actions, halting.\n");</div><div class='ctx'> 		prom_halt();</div><div class='ctx'> 	}</div><div class='del'>-	for_each_sbus(sbus) {</div><div class='del'>-#ifdef CONFIG_SMP	</div><div class='del'>-		extern unsigned char boot_cpu_id;</div><div class='del'>-		</div><div class='del'>-		set_sbi_tid(sbus-&gt;devid, boot_cpu_id &lt;&lt; 3);</div><div class='del'>-		sbus_tid[sbus-&gt;board] = boot_cpu_id;</div><div class='del'>-#endif</div><div class='add'>+	for_each_node_by_name(dp, "sbi") {</div><div class='add'>+		int devid = of_getintprop_default(dp, "device-id", 0);</div><div class='add'>+		int board = of_getintprop_default(dp, "board#", 0);</div><div class='add'>+		unsigned int mask;</div><div class='add'>+</div><div class='add'>+		set_sbi_tid(devid, target_cpu &lt;&lt; 3);</div><div class='add'>+		sbus_tid[board] = target_cpu;</div><div class='add'>+</div><div class='ctx'> 		/* Get rid of pending irqs from PROM */</div><div class='del'>-		mask = acquire_sbi(sbus-&gt;devid, 0xffffffff);</div><div class='add'>+		mask = acquire_sbi(devid, 0xffffffff);</div><div class='ctx'> 		if (mask) {</div><div class='del'>-			printk ("Clearing pending IRQs %08x on SBI %d\n", mask, sbus-&gt;board);</div><div class='del'>-			release_sbi(sbus-&gt;devid, mask);</div><div class='add'>+			printk ("Clearing pending IRQs %08x on SBI %d\n", mask, board);</div><div class='add'>+			release_sbi(devid, mask);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -572,11 +576,9 @@ void __init sun4d_init_IRQ(void)</div><div class='ctx'> {</div><div class='ctx'> 	local_irq_disable();</div><div class='ctx'> </div><div class='del'>-	BTFIXUPSET_CALL(sbint_to_irq, sun4d_sbint_to_irq, BTFIXUPCALL_NORM);</div><div class='ctx'> 	BTFIXUPSET_CALL(enable_irq, sun4d_enable_irq, BTFIXUPCALL_NORM);</div><div class='ctx'> 	BTFIXUPSET_CALL(disable_irq, sun4d_disable_irq, BTFIXUPCALL_NORM);</div><div class='ctx'> 	BTFIXUPSET_CALL(clear_clock_irq, sun4d_clear_clock_irq, BTFIXUPCALL_NORM);</div><div class='del'>-	BTFIXUPSET_CALL(clear_profile_irq, sun4d_clear_profile_irq, BTFIXUPCALL_NORM);</div><div class='ctx'> 	BTFIXUPSET_CALL(load_profile_irq, sun4d_load_profile_irq, BTFIXUPCALL_NORM);</div><div class='ctx'> 	sparc_init_timers = sun4d_init_timers;</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='head'>diff --git a/arch/sparc/kernel/sun4d_smp.c b/arch/sparc/kernel/sun4d_smp.c<br/>index 69596402a500..7a6a5e795928 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/kernel/sun4d_smp.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/kernel/sun4d_smp.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/kernel/sun4d_smp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/kernel/sun4d_smp.c</a></div><div class='hunk'>@@ -20,6 +20,7 @@</div><div class='ctx'> #include &lt;linux/swap.h&gt;</div><div class='ctx'> #include &lt;linux/profile.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/cpu.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='ctx'> #include &lt;asm/atomic.h&gt;</div><div class='hunk'>@@ -30,7 +31,6 @@</div><div class='ctx'> #include &lt;asm/pgalloc.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/oplib.h&gt;</div><div class='del'>-#include &lt;asm/sbus.h&gt;</div><div class='ctx'> #include &lt;asm/sbi.h&gt;</div><div class='ctx'> #include &lt;asm/tlbflush.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='hunk'>@@ -72,6 +72,17 @@ static void smp_setup_percpu_timer(void);</div><div class='ctx'> extern void cpu_probe(void);</div><div class='ctx'> extern void sun4d_distribute_irqs(void);</div><div class='ctx'> </div><div class='add'>+static unsigned char cpu_leds[32];</div><div class='add'>+</div><div class='add'>+static inline void show_leds(int cpuid)</div><div class='add'>+{</div><div class='add'>+	cpuid &amp;= 0x1e;</div><div class='add'>+	__asm__ __volatile__ ("stba %0, [%1] %2" : :</div><div class='add'>+			      "r" ((cpu_leds[cpuid] &lt;&lt; 4) | cpu_leds[cpuid+1]),</div><div class='add'>+			      "r" (ECSR_BASE(cpuid) | BB_LEDS),</div><div class='add'>+			      "i" (ASI_M_CTL));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void __init smp4d_callin(void)</div><div class='ctx'> {</div><div class='ctx'> 	int cpuid = hard_smp4d_processor_id();</div><div class='hunk'>@@ -88,6 +99,7 @@ void __init smp4d_callin(void)</div><div class='ctx'> 	local_flush_cache_all();</div><div class='ctx'> 	local_flush_tlb_all();</div><div class='ctx'> </div><div class='add'>+	notify_cpu_starting(cpuid);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Unblock the master CPU _only_ when the scheduler state</div><div class='ctx'> 	 * of all secondary CPUs will be up-to-date, so after</div><div class='head'>diff --git a/arch/sparc/kernel/sun4m_irq.c b/arch/sparc/kernel/sun4m_irq.c<br/>index 94e02de960ea..f10317179ee6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/kernel/sun4m_irq.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/kernel/sun4m_irq.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/kernel/sun4m_irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/kernel/sun4m_irq.c</a></div><div class='hunk'>@@ -20,6 +20,8 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='hunk'>@@ -35,59 +37,27 @@</div><div class='ctx'> #include &lt;asm/smp.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/sbus.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "irq.h"</div><div class='ctx'> </div><div class='del'>-/* On the sun4m, just like the timers, we have both per-cpu and master</div><div class='del'>- * interrupt registers.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* These registers are used for sending/receiving irqs from/to</div><div class='del'>- * different cpu's.</div><div class='del'>- */</div><div class='del'>-struct sun4m_intreg_percpu {</div><div class='del'>-	unsigned int tbt;        /* Interrupts still pending for this cpu. */</div><div class='del'>-</div><div class='del'>-	/* These next two registers are WRITE-ONLY and are only</div><div class='del'>-	 * "on bit" sensitive, "off bits" written have NO affect.</div><div class='del'>-	 */</div><div class='del'>-	unsigned int clear;  /* Clear this cpus irqs here. */</div><div class='del'>-	unsigned int set;    /* Set this cpus irqs here. */</div><div class='del'>-	unsigned char space[PAGE_SIZE - 12];</div><div class='add'>+struct sun4m_irq_percpu {</div><div class='add'>+	u32		pending;</div><div class='add'>+	u32		clear;</div><div class='add'>+	u32		set;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * djhr</div><div class='del'>- * Actually the clear and set fields in this struct are misleading..</div><div class='del'>- * according to the SLAVIO manual (and the same applies for the SEC)</div><div class='del'>- * the clear field clears bits in the mask which will ENABLE that IRQ</div><div class='del'>- * the set field sets bits in the mask to DISABLE the IRQ.</div><div class='del'>- *</div><div class='del'>- * Also the undirected_xx address in the SLAVIO is defined as</div><div class='del'>- * RESERVED and write only..</div><div class='del'>- *</div><div class='del'>- * DAVEM_NOTE: The SLAVIO only specifies behavior on uniprocessor</div><div class='del'>- *             sun4m machines, for MP the layout makes more sense.</div><div class='del'>- */</div><div class='del'>-struct sun4m_intregs {</div><div class='del'>-	struct sun4m_intreg_percpu cpu_intregs[SUN4M_NCPUS];</div><div class='del'>-	unsigned int tbt;                /* IRQ's that are still pending. */</div><div class='del'>-	unsigned int irqs;               /* Master IRQ bits. */</div><div class='del'>-</div><div class='del'>-	/* Again, like the above, two these registers are WRITE-ONLY. */</div><div class='del'>-	unsigned int clear;              /* Clear master IRQ's by setting bits here. */</div><div class='del'>-	unsigned int set;                /* Set master IRQ's by setting bits here. */</div><div class='del'>-</div><div class='del'>-	/* This register is both READ and WRITE. */</div><div class='del'>-	unsigned int undirected_target;  /* Which cpu gets undirected irqs. */</div><div class='add'>+struct sun4m_irq_global {</div><div class='add'>+	u32		pending;</div><div class='add'>+	u32		mask;</div><div class='add'>+	u32		mask_clear;</div><div class='add'>+	u32		mask_set;</div><div class='add'>+	u32		interrupt_target;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static unsigned long dummy;</div><div class='del'>-</div><div class='del'>-struct sun4m_intregs *sun4m_interrupts;</div><div class='del'>-unsigned long *irq_rcvreg = &amp;dummy;</div><div class='add'>+/* Code in entry.S needs to get at these register mappings.  */</div><div class='add'>+struct sun4m_irq_percpu __iomem *sun4m_irq_percpu[SUN4M_NCPUS];</div><div class='add'>+struct sun4m_irq_global __iomem *sun4m_irq_global;</div><div class='ctx'> </div><div class='ctx'> /* Dave Redman (djhr@tadpole.co.uk)</div><div class='ctx'>  * The sun4m interrupt registers.</div><div class='hunk'>@@ -101,8 +71,9 @@ unsigned long *irq_rcvreg = &amp;dummy;</div><div class='ctx'> </div><div class='ctx'> #define	SUN4M_INT_MASKALL	0x80000000	  /* mask all interrupts */</div><div class='ctx'> #define	SUN4M_INT_MODULE_ERR	0x40000000	  /* module error */</div><div class='del'>-#define	SUN4M_INT_M2S_WRITE	0x20000000	  /* write buffer error */</div><div class='del'>-#define	SUN4M_INT_ECC		0x10000000	  /* ecc memory error */</div><div class='add'>+#define	SUN4M_INT_M2S_WRITE_ERR	0x20000000	  /* write buffer error */</div><div class='add'>+#define	SUN4M_INT_ECC_ERR	0x10000000	  /* ecc memory error */</div><div class='add'>+#define	SUN4M_INT_VME_ERR	0x08000000	  /* vme async error */</div><div class='ctx'> #define	SUN4M_INT_FLOPPY	0x00400000	  /* floppy disk */</div><div class='ctx'> #define	SUN4M_INT_MODULE	0x00200000	  /* module interrupt */</div><div class='ctx'> #define	SUN4M_INT_VIDEO		0x00100000	  /* onboard video */</div><div class='hunk'>@@ -113,75 +84,126 @@ unsigned long *irq_rcvreg = &amp;dummy;</div><div class='ctx'> #define	SUN4M_INT_SERIAL	0x00008000	  /* serial ports */</div><div class='ctx'> #define	SUN4M_INT_KBDMS		0x00004000	  /* keyboard/mouse */</div><div class='ctx'> #define	SUN4M_INT_SBUSBITS	0x00003F80	  /* sbus int bits */</div><div class='add'>+#define	SUN4M_INT_VMEBITS	0x0000007F	  /* vme int bits */</div><div class='add'>+</div><div class='add'>+#define	SUN4M_INT_ERROR		(SUN4M_INT_MODULE_ERR |    \</div><div class='add'>+				 SUN4M_INT_M2S_WRITE_ERR | \</div><div class='add'>+				 SUN4M_INT_ECC_ERR |       \</div><div class='add'>+				 SUN4M_INT_VME_ERR)</div><div class='ctx'> </div><div class='ctx'> #define SUN4M_INT_SBUS(x)	(1 &lt;&lt; (x+7))</div><div class='ctx'> #define SUN4M_INT_VME(x)	(1 &lt;&lt; (x))</div><div class='ctx'> </div><div class='del'>-/* These tables only apply for interrupts greater than 15..</div><div class='del'>- * </div><div class='del'>- * any intr value below 0x10 is considered to be a soft-int</div><div class='del'>- * this may be useful or it may not.. but that's how I've done it.</div><div class='del'>- * and it won't clash with what OBP is telling us about devices.</div><div class='add'>+/* Interrupt levels used by OBP */</div><div class='add'>+#define	OBP_INT_LEVEL_SOFT	0x10</div><div class='add'>+#define	OBP_INT_LEVEL_ONBOARD	0x20</div><div class='add'>+#define	OBP_INT_LEVEL_SBUS	0x30</div><div class='add'>+#define	OBP_INT_LEVEL_VME	0x40</div><div class='add'>+</div><div class='add'>+/* Interrupt level assignment on sun4m:</div><div class='add'>+ *</div><div class='add'>+ *	level		source</div><div class='add'>+ * ------------------------------------------------------------</div><div class='add'>+ *        1		softint-1</div><div class='add'>+ *	  2		softint-2, VME/SBUS level 1</div><div class='add'>+ *	  3		softint-3, VME/SBUS level 2</div><div class='add'>+ *	  4		softint-4, onboard SCSI</div><div class='add'>+ *	  5		softint-5, VME/SBUS level 3</div><div class='add'>+ *	  6		softint-6, onboard ETHERNET</div><div class='add'>+ *	  7		softint-7, VME/SBUS level 4</div><div class='add'>+ *	  8		softint-8, onboard VIDEO</div><div class='add'>+ *	  9		softint-9, VME/SBUS level 5, Module Interrupt</div><div class='add'>+ *	 10		softint-10, system counter/timer</div><div class='add'>+ *	 11		softint-11, VME/SBUS level 6, Floppy</div><div class='add'>+ *	 12		softint-12, Keyboard/Mouse, Serial</div><div class='add'>+ *	 13		softint-13, VME/SBUS level 7, ISDN Audio</div><div class='add'>+ *	 14		softint-14, per-processor counter/timer</div><div class='add'>+ *	 15		softint-15, Asynchronous Errors (broadcast)</div><div class='ctx'>  *</div><div class='del'>- * take an encoded intr value and lookup if it's valid</div><div class='del'>- * then get the mask bits that match from irq_mask</div><div class='add'>+ * Each interrupt source is masked distinctly in the sun4m interrupt</div><div class='add'>+ * registers.  The PIL level alone is therefore ambiguous, since multiple</div><div class='add'>+ * interrupt sources map to a single PIL.</div><div class='ctx'>  *</div><div class='del'>- * P3: Translation from irq 0x0d to mask 0x2000 is for MrCoffee.</div><div class='add'>+ * This ambiguity is resolved in the 'intr' property for device nodes</div><div class='add'>+ * in the OF device tree.  Each 'intr' property entry is composed of</div><div class='add'>+ * two 32-bit words.  The first word is the IRQ priority value, which</div><div class='add'>+ * is what we're intersted in.  The second word is the IRQ vector, which</div><div class='add'>+ * is unused.</div><div class='add'>+ *</div><div class='add'>+ * The low 4 bits of the IRQ priority indicate the PIL, and the upper</div><div class='add'>+ * 4 bits indicate onboard vs. SBUS leveled vs. VME leveled.  0x20</div><div class='add'>+ * means onboard, 0x30 means SBUS leveled, and 0x40 means VME leveled.</div><div class='add'>+ *</div><div class='add'>+ * For example, an 'intr' IRQ priority value of 0x24 is onboard SCSI</div><div class='add'>+ * whereas a value of 0x33 is SBUS level 2.  Here are some sample</div><div class='add'>+ * 'intr' property IRQ priority values from ss4, ss5, ss10, ss20, and</div><div class='add'>+ * Tadpole S3 GX systems.</div><div class='add'>+ *</div><div class='add'>+ * esp: 	0x24	onboard ESP SCSI</div><div class='add'>+ * le:  	0x26	onboard Lance ETHERNET</div><div class='add'>+ * p9100:	0x32	SBUS level 1 P9100 video</div><div class='add'>+ * bpp:  	0x33	SBUS level 2 BPP parallel port device</div><div class='add'>+ * DBRI:	0x39	SBUS level 5 DBRI ISDN audio</div><div class='add'>+ * SUNW,leo:	0x39	SBUS level 5 LEO video</div><div class='add'>+ * pcmcia:	0x3b	SBUS level 6 PCMCIA controller</div><div class='add'>+ * uctrl:	0x3b	SBUS level 6 UCTRL device</div><div class='add'>+ * modem:	0x3d	SBUS level 7 MODEM</div><div class='add'>+ * zs:		0x2c	onboard keyboard/mouse/serial</div><div class='add'>+ * floppy:	0x2b	onboard Floppy</div><div class='add'>+ * power:	0x22	onboard power device (XXX unknown mask bit XXX)</div><div class='ctx'>  */</div><div class='del'>-static unsigned char irq_xlate[32] = {</div><div class='del'>-    /*  0,  1,  2,  3,  4,  5,  6,  7,  8,  9,  a,  b,  c,  d,  e,  f */</div><div class='del'>-	0,  0,  0,  0,  1,  0,  2,  0,  3,  0,  4,  5,  6, 14,  0,  7,</div><div class='del'>-	0,  0,  8,  9,  0, 10,  0, 11,  0, 12,  0, 13,  0, 14,  0,  0</div><div class='del'>-};</div><div class='ctx'> </div><div class='del'>-static unsigned long irq_mask[] = {</div><div class='del'>-	0,						  /* illegal index */</div><div class='del'>-	SUN4M_INT_SCSI,				  	  /*  1 irq 4 */</div><div class='del'>-	SUN4M_INT_ETHERNET,				  /*  2 irq 6 */</div><div class='del'>-	SUN4M_INT_VIDEO,				  /*  3 irq 8 */</div><div class='del'>-	SUN4M_INT_REALTIME,				  /*  4 irq 10 */</div><div class='del'>-	SUN4M_INT_FLOPPY,				  /*  5 irq 11 */</div><div class='del'>-	(SUN4M_INT_SERIAL | SUN4M_INT_KBDMS),	  	  /*  6 irq 12 */</div><div class='del'>-	SUN4M_INT_MODULE_ERR,			  	  /*  7 irq 15 */</div><div class='del'>-	SUN4M_INT_SBUS(0),				  /*  8 irq 2 */</div><div class='del'>-	SUN4M_INT_SBUS(1),				  /*  9 irq 3 */</div><div class='del'>-	SUN4M_INT_SBUS(2),				  /* 10 irq 5 */</div><div class='del'>-	SUN4M_INT_SBUS(3),				  /* 11 irq 7 */</div><div class='del'>-	SUN4M_INT_SBUS(4),				  /* 12 irq 9 */</div><div class='del'>-	SUN4M_INT_SBUS(5),				  /* 13 irq 11 */</div><div class='del'>-	SUN4M_INT_SBUS(6)				  /* 14 irq 13 */</div><div class='add'>+static unsigned long irq_mask[0x50] = {</div><div class='add'>+	/* SMP */</div><div class='add'>+	0,  SUN4M_SOFT_INT(1),</div><div class='add'>+	SUN4M_SOFT_INT(2),  SUN4M_SOFT_INT(3),</div><div class='add'>+	SUN4M_SOFT_INT(4),  SUN4M_SOFT_INT(5),</div><div class='add'>+	SUN4M_SOFT_INT(6),  SUN4M_SOFT_INT(7),</div><div class='add'>+	SUN4M_SOFT_INT(8),  SUN4M_SOFT_INT(9),</div><div class='add'>+	SUN4M_SOFT_INT(10), SUN4M_SOFT_INT(11),</div><div class='add'>+	SUN4M_SOFT_INT(12), SUN4M_SOFT_INT(13),</div><div class='add'>+	SUN4M_SOFT_INT(14), SUN4M_SOFT_INT(15),</div><div class='add'>+	/* soft */</div><div class='add'>+	0,  SUN4M_SOFT_INT(1),</div><div class='add'>+	SUN4M_SOFT_INT(2),  SUN4M_SOFT_INT(3),</div><div class='add'>+	SUN4M_SOFT_INT(4),  SUN4M_SOFT_INT(5),</div><div class='add'>+	SUN4M_SOFT_INT(6),  SUN4M_SOFT_INT(7),</div><div class='add'>+	SUN4M_SOFT_INT(8),  SUN4M_SOFT_INT(9),</div><div class='add'>+	SUN4M_SOFT_INT(10), SUN4M_SOFT_INT(11),</div><div class='add'>+	SUN4M_SOFT_INT(12), SUN4M_SOFT_INT(13),</div><div class='add'>+	SUN4M_SOFT_INT(14), SUN4M_SOFT_INT(15),</div><div class='add'>+	/* onboard */</div><div class='add'>+	0, 0, 0, 0,</div><div class='add'>+	SUN4M_INT_SCSI,  0, SUN4M_INT_ETHERNET, 0,</div><div class='add'>+	SUN4M_INT_VIDEO, SUN4M_INT_MODULE,</div><div class='add'>+	SUN4M_INT_REALTIME, SUN4M_INT_FLOPPY,</div><div class='add'>+	(SUN4M_INT_SERIAL | SUN4M_INT_KBDMS),</div><div class='add'>+	SUN4M_INT_AUDIO, 0, SUN4M_INT_MODULE_ERR,</div><div class='add'>+	/* sbus */</div><div class='add'>+	0, 0, SUN4M_INT_SBUS(0), SUN4M_INT_SBUS(1),</div><div class='add'>+	0, SUN4M_INT_SBUS(2), 0, SUN4M_INT_SBUS(3),</div><div class='add'>+	0, SUN4M_INT_SBUS(4), 0, SUN4M_INT_SBUS(5),</div><div class='add'>+	0, SUN4M_INT_SBUS(6), 0, 0,</div><div class='add'>+	/* vme */</div><div class='add'>+	0, 0, SUN4M_INT_VME(0), SUN4M_INT_VME(1),</div><div class='add'>+	0, SUN4M_INT_VME(2), 0, SUN4M_INT_VME(3),</div><div class='add'>+	0, SUN4M_INT_VME(4), 0, SUN4M_INT_VME(5),</div><div class='add'>+	0, SUN4M_INT_VME(6), 0, 0</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int sun4m_pil_map[] = { 0, 2, 3, 5, 7, 9, 11, 13 };</div><div class='del'>-</div><div class='del'>-static unsigned int sun4m_sbint_to_irq(struct sbus_dev *sdev,</div><div class='del'>-				       unsigned int sbint)</div><div class='del'>-{</div><div class='del'>-	if (sbint &gt;= sizeof(sun4m_pil_map)) {</div><div class='del'>-		printk(KERN_ERR "%s: bogus SBINT %d\n", sdev-&gt;prom_name, sbint);</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='del'>-	return sun4m_pil_map[sbint] | 0x30;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static unsigned long sun4m_get_irqmask(unsigned int irq)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long mask;</div><div class='ctx'>     </div><div class='del'>-	if (irq &gt; 0x20) {</div><div class='del'>-		/* OBIO/SBUS interrupts */</div><div class='del'>-		irq &amp;= 0x1f;</div><div class='del'>-		mask = irq_mask[irq_xlate[irq]];</div><div class='del'>-		if (!mask)</div><div class='del'>-			printk("sun4m_get_irqmask: IRQ%d has no valid mask!\n",irq);</div><div class='del'>-	} else {</div><div class='del'>-		/* Soft Interrupts will come here.</div><div class='del'>-		 * Currently there is no way to trigger them but I'm sure</div><div class='del'>-		 * something could be cooked up.</div><div class='del'>-		 */</div><div class='del'>-		irq &amp;= 0xf;</div><div class='del'>-		mask = SUN4M_SOFT_INT(irq);</div><div class='del'>-	}</div><div class='add'>+	if (irq &lt; 0x50)</div><div class='add'>+		mask = irq_mask[irq];</div><div class='add'>+	else</div><div class='add'>+		mask = 0;</div><div class='add'>+</div><div class='add'>+	if (!mask)</div><div class='add'>+		printk(KERN_ERR "sun4m_get_irqmask: IRQ%d has no valid mask!\n",</div><div class='add'>+		       irq);</div><div class='add'>+</div><div class='ctx'> 	return mask;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -193,9 +215,9 @@ static void sun4m_disable_irq(unsigned int irq_nr)</div><div class='ctx'> 	mask = sun4m_get_irqmask(irq_nr);</div><div class='ctx'> 	local_irq_save(flags);</div><div class='ctx'> 	if (irq_nr &gt; 15)</div><div class='del'>-		sun4m_interrupts-&gt;set = mask;</div><div class='add'>+		sbus_writel(mask, &amp;sun4m_irq_global-&gt;mask_set);</div><div class='ctx'> 	else</div><div class='del'>-		sun4m_interrupts-&gt;cpu_intregs[cpu].set = mask;</div><div class='add'>+		sbus_writel(mask, &amp;sun4m_irq_percpu[cpu]-&gt;set);</div><div class='ctx'> 	local_irq_restore(flags);    </div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -212,13 +234,13 @@ static void sun4m_enable_irq(unsigned int irq_nr)</div><div class='ctx'> 		mask = sun4m_get_irqmask(irq_nr);</div><div class='ctx'> 		local_irq_save(flags);</div><div class='ctx'> 		if (irq_nr &gt; 15)</div><div class='del'>-			sun4m_interrupts-&gt;clear = mask;</div><div class='add'>+			sbus_writel(mask, &amp;sun4m_irq_global-&gt;mask_clear);</div><div class='ctx'> 		else</div><div class='del'>-			sun4m_interrupts-&gt;cpu_intregs[cpu].clear = mask;</div><div class='add'>+			sbus_writel(mask, &amp;sun4m_irq_percpu[cpu]-&gt;clear);</div><div class='ctx'> 		local_irq_restore(flags);    </div><div class='ctx'> 	} else {</div><div class='ctx'> 		local_irq_save(flags);</div><div class='del'>-		sun4m_interrupts-&gt;clear = SUN4M_INT_FLOPPY;</div><div class='add'>+		sbus_writel(SUN4M_INT_FLOPPY, &amp;sun4m_irq_global-&gt;mask_clear);</div><div class='ctx'> 		local_irq_restore(flags);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -236,10 +258,10 @@ static unsigned long cpu_pil_to_imask[16] = {</div><div class='ctx'> /*9*/	SUN4M_INT_SBUS(4) | SUN4M_INT_VME(4) | SUN4M_INT_MODULE_ERR,</div><div class='ctx'> /*10*/	SUN4M_INT_REALTIME,</div><div class='ctx'> /*11*/	SUN4M_INT_SBUS(5) | SUN4M_INT_VME(5) | SUN4M_INT_FLOPPY,</div><div class='del'>-/*12*/	SUN4M_INT_SERIAL | SUN4M_INT_KBDMS,</div><div class='del'>-/*13*/	SUN4M_INT_AUDIO,</div><div class='add'>+/*12*/	SUN4M_INT_SERIAL  | SUN4M_INT_KBDMS,</div><div class='add'>+/*13*/	SUN4M_INT_SBUS(6) | SUN4M_INT_VME(6) | SUN4M_INT_AUDIO,</div><div class='ctx'> /*14*/	SUN4M_INT_E14,</div><div class='del'>-/*15*/	0x00000000</div><div class='add'>+/*15*/	SUN4M_INT_ERROR</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* We assume the caller has disabled local interrupts when these are called,</div><div class='hunk'>@@ -247,126 +269,141 @@ static unsigned long cpu_pil_to_imask[16] = {</div><div class='ctx'>  */</div><div class='ctx'> static void sun4m_disable_pil_irq(unsigned int pil)</div><div class='ctx'> {</div><div class='del'>-	sun4m_interrupts-&gt;set = cpu_pil_to_imask[pil];</div><div class='add'>+	sbus_writel(cpu_pil_to_imask[pil], &amp;sun4m_irq_global-&gt;mask_set);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sun4m_enable_pil_irq(unsigned int pil)</div><div class='ctx'> {</div><div class='del'>-	sun4m_interrupts-&gt;clear = cpu_pil_to_imask[pil];</div><div class='add'>+	sbus_writel(cpu_pil_to_imask[pil], &amp;sun4m_irq_global-&gt;mask_clear);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> static void sun4m_send_ipi(int cpu, int level)</div><div class='ctx'> {</div><div class='del'>-	unsigned long mask;</div><div class='del'>-</div><div class='del'>-	mask = sun4m_get_irqmask(level);</div><div class='del'>-	sun4m_interrupts-&gt;cpu_intregs[cpu].set = mask;</div><div class='add'>+	unsigned long mask = sun4m_get_irqmask(level);</div><div class='add'>+	sbus_writel(mask, &amp;sun4m_irq_percpu[cpu]-&gt;set);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sun4m_clear_ipi(int cpu, int level)</div><div class='ctx'> {</div><div class='del'>-	unsigned long mask;</div><div class='del'>-</div><div class='del'>-	mask = sun4m_get_irqmask(level);</div><div class='del'>-	sun4m_interrupts-&gt;cpu_intregs[cpu].clear = mask;</div><div class='add'>+	unsigned long mask = sun4m_get_irqmask(level);</div><div class='add'>+	sbus_writel(mask, &amp;sun4m_irq_percpu[cpu]-&gt;clear);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sun4m_set_udt(int cpu)</div><div class='ctx'> {</div><div class='del'>-	sun4m_interrupts-&gt;undirected_target = cpu;</div><div class='add'>+	sbus_writel(cpu, &amp;sun4m_irq_global-&gt;interrupt_target);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#define OBIO_INTR	0x20</div><div class='del'>-#define TIMER_IRQ  	(OBIO_INTR | 10)</div><div class='del'>-#define PROFILE_IRQ	(OBIO_INTR | 14)</div><div class='add'>+struct sun4m_timer_percpu {</div><div class='add'>+	u32		l14_limit;</div><div class='add'>+	u32		l14_count;</div><div class='add'>+	u32		l14_limit_noclear;</div><div class='add'>+	u32		user_timer_start_stop;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct sun4m_timer_percpu __iomem *timers_percpu[SUN4M_NCPUS];</div><div class='add'>+</div><div class='add'>+struct sun4m_timer_global {</div><div class='add'>+	u32		l10_limit;</div><div class='add'>+	u32		l10_count;</div><div class='add'>+	u32		l10_limit_noclear;</div><div class='add'>+	u32		reserved;</div><div class='add'>+	u32		timer_config;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct sun4m_timer_global __iomem *timers_global;</div><div class='add'>+</div><div class='add'>+#define TIMER_IRQ  	(OBP_INT_LEVEL_ONBOARD | 10)</div><div class='ctx'> </div><div class='del'>-static struct sun4m_timer_regs *sun4m_timers;</div><div class='ctx'> unsigned int lvl14_resolution = (((1000000/HZ) + 1) &lt;&lt; 10);</div><div class='ctx'> </div><div class='ctx'> static void sun4m_clear_clock_irq(void)</div><div class='ctx'> {</div><div class='del'>-	volatile unsigned int clear_intr;</div><div class='del'>-	clear_intr = sun4m_timers-&gt;l10_timer_limit;</div><div class='add'>+	sbus_readl(&amp;timers_global-&gt;l10_limit);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void sun4m_clear_profile_irq(int cpu)</div><div class='add'>+void sun4m_nmi(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='del'>-	volatile unsigned int clear;</div><div class='del'>-    </div><div class='del'>-	clear = sun4m_timers-&gt;cpu_timers[cpu].l14_timer_limit;</div><div class='add'>+	unsigned long afsr, afar, si;</div><div class='add'>+</div><div class='add'>+	printk(KERN_ERR "Aieee: sun4m NMI received!\n");</div><div class='add'>+	/* XXX HyperSparc hack XXX */</div><div class='add'>+	__asm__ __volatile__("mov 0x500, %%g1\n\t"</div><div class='add'>+			     "lda [%%g1] 0x4, %0\n\t"</div><div class='add'>+			     "mov 0x600, %%g1\n\t"</div><div class='add'>+			     "lda [%%g1] 0x4, %1\n\t" :</div><div class='add'>+			     "=r" (afsr), "=r" (afar));</div><div class='add'>+	printk(KERN_ERR "afsr=%08lx afar=%08lx\n", afsr, afar);</div><div class='add'>+	si = sbus_readl(&amp;sun4m_irq_global-&gt;pending);</div><div class='add'>+	printk(KERN_ERR "si=%08lx\n", si);</div><div class='add'>+	if (si &amp; SUN4M_INT_MODULE_ERR)</div><div class='add'>+		printk(KERN_ERR "Module async error\n");</div><div class='add'>+	if (si &amp; SUN4M_INT_M2S_WRITE_ERR)</div><div class='add'>+		printk(KERN_ERR "MBus/SBus async error\n");</div><div class='add'>+	if (si &amp; SUN4M_INT_ECC_ERR)</div><div class='add'>+		printk(KERN_ERR "ECC memory error\n");</div><div class='add'>+	if (si &amp; SUN4M_INT_VME_ERR)</div><div class='add'>+		printk(KERN_ERR "VME async error\n");</div><div class='add'>+	printk(KERN_ERR "you lose buddy boy...\n");</div><div class='add'>+	show_regs(regs);</div><div class='add'>+	prom_halt();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Exported for sun4m_smp.c */</div><div class='add'>+void sun4m_clear_profile_irq(int cpu)</div><div class='add'>+{</div><div class='add'>+	sbus_readl(&amp;timers_percpu[cpu]-&gt;l14_limit);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sun4m_load_profile_irq(int cpu, unsigned int limit)</div><div class='ctx'> {</div><div class='del'>-	sun4m_timers-&gt;cpu_timers[cpu].l14_timer_limit = limit;</div><div class='add'>+	sbus_writel(limit, &amp;timers_percpu[cpu]-&gt;l14_limit);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __init sun4m_init_timers(irq_handler_t counter_fn)</div><div class='ctx'> {</div><div class='del'>-	int reg_count, irq, cpu;</div><div class='del'>-	struct linux_prom_registers cnt_regs[PROMREG_MAX];</div><div class='del'>-	int obio_node, cnt_node;</div><div class='del'>-	struct resource r;</div><div class='del'>-</div><div class='del'>-	cnt_node = 0;</div><div class='del'>-	if((obio_node =</div><div class='del'>-	    prom_searchsiblings (prom_getchild(prom_root_node), "obio")) == 0 ||</div><div class='del'>-	   (obio_node = prom_getchild (obio_node)) == 0 ||</div><div class='del'>-	   (cnt_node = prom_searchsiblings (obio_node, "counter")) == 0) {</div><div class='del'>-		prom_printf("Cannot find /obio/counter node\n");</div><div class='del'>-		prom_halt();</div><div class='add'>+	struct device_node *dp = of_find_node_by_name(NULL, "counter");</div><div class='add'>+	int i, err, len, num_cpu_timers;</div><div class='add'>+	const u32 *addr;</div><div class='add'>+</div><div class='add'>+	if (!dp) {</div><div class='add'>+		printk(KERN_ERR "sun4m_init_timers: No 'counter' node.\n");</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='del'>-	reg_count = prom_getproperty(cnt_node, "reg",</div><div class='del'>-				     (void *) cnt_regs, sizeof(cnt_regs));</div><div class='del'>-	reg_count = (reg_count/sizeof(struct linux_prom_registers));</div><div class='del'>-    </div><div class='del'>-	/* Apply the obio ranges to the timer registers. */</div><div class='del'>-	prom_apply_obio_ranges(cnt_regs, reg_count);</div><div class='del'>-    </div><div class='del'>-	cnt_regs[4].phys_addr = cnt_regs[reg_count-1].phys_addr;</div><div class='del'>-	cnt_regs[4].reg_size = cnt_regs[reg_count-1].reg_size;</div><div class='del'>-	cnt_regs[4].which_io = cnt_regs[reg_count-1].which_io;</div><div class='del'>-	for(obio_node = 1; obio_node &lt; 4; obio_node++) {</div><div class='del'>-		cnt_regs[obio_node].phys_addr =</div><div class='del'>-			cnt_regs[obio_node-1].phys_addr + PAGE_SIZE;</div><div class='del'>-		cnt_regs[obio_node].reg_size = cnt_regs[obio_node-1].reg_size;</div><div class='del'>-		cnt_regs[obio_node].which_io = cnt_regs[obio_node-1].which_io;</div><div class='add'>+</div><div class='add'>+	addr = of_get_property(dp, "address", &amp;len);</div><div class='add'>+	if (!addr) {</div><div class='add'>+		printk(KERN_ERR "sun4m_init_timers: No 'address' prop.\n");</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	memset((char*)&amp;r, 0, sizeof(struct resource));</div><div class='del'>-	/* Map the per-cpu Counter registers. */</div><div class='del'>-	r.flags = cnt_regs[0].which_io;</div><div class='del'>-	r.start = cnt_regs[0].phys_addr;</div><div class='del'>-	sun4m_timers = (struct sun4m_timer_regs *) sbus_ioremap(&amp;r, 0,</div><div class='del'>-	    PAGE_SIZE*SUN4M_NCPUS, "sun4m_cpu_cnt");</div><div class='del'>-	/* Map the system Counter register. */</div><div class='del'>-	/* XXX Here we expect consequent calls to yeld adjusent maps. */</div><div class='del'>-	r.flags = cnt_regs[4].which_io;</div><div class='del'>-	r.start = cnt_regs[4].phys_addr;</div><div class='del'>-	sbus_ioremap(&amp;r, 0, cnt_regs[4].reg_size, "sun4m_sys_cnt");</div><div class='del'>-</div><div class='del'>-	sun4m_timers-&gt;l10_timer_limit =  (((1000000/HZ) + 1) &lt;&lt; 10);</div><div class='del'>-	master_l10_counter = &amp;sun4m_timers-&gt;l10_cur_count;</div><div class='del'>-	master_l10_limit = &amp;sun4m_timers-&gt;l10_timer_limit;</div><div class='del'>-</div><div class='del'>-	irq = request_irq(TIMER_IRQ,</div><div class='del'>-			  counter_fn,</div><div class='del'>-			  (IRQF_DISABLED | SA_STATIC_ALLOC),</div><div class='del'>-			  "timer", NULL);</div><div class='del'>-	if (irq) {</div><div class='del'>-		prom_printf("time_init: unable to attach IRQ%d\n",TIMER_IRQ);</div><div class='del'>-		prom_halt();</div><div class='add'>+	num_cpu_timers = (len / sizeof(u32)) - 1;</div><div class='add'>+	for (i = 0; i &lt; num_cpu_timers; i++) {</div><div class='add'>+		timers_percpu[i] = (void __iomem *)</div><div class='add'>+			(unsigned long) addr[i];</div><div class='ctx'> 	}</div><div class='del'>-   </div><div class='del'>-	if (!cpu_find_by_instance(1, NULL, NULL)) {</div><div class='del'>-		for(cpu = 0; cpu &lt; 4; cpu++)</div><div class='del'>-			sun4m_timers-&gt;cpu_timers[cpu].l14_timer_limit = 0;</div><div class='del'>-		sun4m_interrupts-&gt;set = SUN4M_INT_E14;</div><div class='del'>-	} else {</div><div class='del'>-		sun4m_timers-&gt;cpu_timers[0].l14_timer_limit = 0;</div><div class='add'>+	timers_global = (void __iomem *)</div><div class='add'>+		(unsigned long) addr[num_cpu_timers];</div><div class='add'>+</div><div class='add'>+	sbus_writel((((1000000/HZ) + 1) &lt;&lt; 10), &amp;timers_global-&gt;l10_limit);</div><div class='add'>+</div><div class='add'>+	master_l10_counter = &amp;timers_global-&gt;l10_count;</div><div class='add'>+</div><div class='add'>+	err = request_irq(TIMER_IRQ, counter_fn,</div><div class='add'>+			  (IRQF_DISABLED | SA_STATIC_ALLOC), "timer", NULL);</div><div class='add'>+	if (err) {</div><div class='add'>+		printk(KERN_ERR "sun4m_init_timers: Register IRQ error %d.\n",</div><div class='add'>+			err);</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num_cpu_timers; i++)</div><div class='add'>+		sbus_writel(0, &amp;timers_percpu[i]-&gt;l14_limit);</div><div class='add'>+	if (num_cpu_timers == 4)</div><div class='add'>+		sbus_writel(SUN4M_INT_E14, &amp;sun4m_irq_global-&gt;mask_set);</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> 	{</div><div class='ctx'> 		unsigned long flags;</div><div class='hunk'>@@ -390,70 +427,43 @@ static void __init sun4m_init_timers(irq_handler_t counter_fn)</div><div class='ctx'> </div><div class='ctx'> void __init sun4m_init_IRQ(void)</div><div class='ctx'> {</div><div class='del'>-	int ie_node,i;</div><div class='del'>-	struct linux_prom_registers int_regs[PROMREG_MAX];</div><div class='del'>-	int num_regs;</div><div class='del'>-	struct resource r;</div><div class='del'>-	int mid;</div><div class='del'>-    </div><div class='del'>-	local_irq_disable();</div><div class='del'>-	if((ie_node = prom_searchsiblings(prom_getchild(prom_root_node), "obio")) == 0 ||</div><div class='del'>-	   (ie_node = prom_getchild (ie_node)) == 0 ||</div><div class='del'>-	   (ie_node = prom_searchsiblings (ie_node, "interrupt")) == 0) {</div><div class='del'>-		prom_printf("Cannot find /obio/interrupt node\n");</div><div class='del'>-		prom_halt();</div><div class='add'>+	struct device_node *dp = of_find_node_by_name(NULL, "interrupt");</div><div class='add'>+	int len, i, mid, num_cpu_iregs;</div><div class='add'>+	const u32 *addr;</div><div class='add'>+</div><div class='add'>+	if (!dp) {</div><div class='add'>+		printk(KERN_ERR "sun4m_init_IRQ: No 'interrupt' node.\n");</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='del'>-	num_regs = prom_getproperty(ie_node, "reg", (char *) int_regs,</div><div class='del'>-				    sizeof(int_regs));</div><div class='del'>-	num_regs = (num_regs/sizeof(struct linux_prom_registers));</div><div class='del'>-    </div><div class='del'>-	/* Apply the obio ranges to these registers. */</div><div class='del'>-	prom_apply_obio_ranges(int_regs, num_regs);</div><div class='del'>-    </div><div class='del'>-	int_regs[4].phys_addr = int_regs[num_regs-1].phys_addr;</div><div class='del'>-	int_regs[4].reg_size = int_regs[num_regs-1].reg_size;</div><div class='del'>-	int_regs[4].which_io = int_regs[num_regs-1].which_io;</div><div class='del'>-	for(ie_node = 1; ie_node &lt; 4; ie_node++) {</div><div class='del'>-		int_regs[ie_node].phys_addr = int_regs[ie_node-1].phys_addr + PAGE_SIZE;</div><div class='del'>-		int_regs[ie_node].reg_size = int_regs[ie_node-1].reg_size;</div><div class='del'>-		int_regs[ie_node].which_io = int_regs[ie_node-1].which_io;</div><div class='add'>+</div><div class='add'>+	addr = of_get_property(dp, "address", &amp;len);</div><div class='add'>+	if (!addr) {</div><div class='add'>+		printk(KERN_ERR "sun4m_init_IRQ: No 'address' prop.\n");</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	memset((char *)&amp;r, 0, sizeof(struct resource));</div><div class='del'>-	/* Map the interrupt registers for all possible cpus. */</div><div class='del'>-	r.flags = int_regs[0].which_io;</div><div class='del'>-	r.start = int_regs[0].phys_addr;</div><div class='del'>-	sun4m_interrupts = (struct sun4m_intregs *) sbus_ioremap(&amp;r, 0,</div><div class='del'>-	    PAGE_SIZE*SUN4M_NCPUS, "interrupts_percpu");</div><div class='add'>+	num_cpu_iregs = (len / sizeof(u32)) - 1;</div><div class='add'>+	for (i = 0; i &lt; num_cpu_iregs; i++) {</div><div class='add'>+		sun4m_irq_percpu[i] = (void __iomem *)</div><div class='add'>+			(unsigned long) addr[i];</div><div class='add'>+	}</div><div class='add'>+	sun4m_irq_global = (void __iomem *)</div><div class='add'>+		(unsigned long) addr[num_cpu_iregs];</div><div class='ctx'> </div><div class='del'>-	/* Map the system interrupt control registers. */</div><div class='del'>-	r.flags = int_regs[4].which_io;</div><div class='del'>-	r.start = int_regs[4].phys_addr;</div><div class='del'>-	sbus_ioremap(&amp;r, 0, int_regs[4].reg_size, "interrupts_system");</div><div class='add'>+	local_irq_disable();</div><div class='ctx'> </div><div class='del'>-	sun4m_interrupts-&gt;set = ~SUN4M_INT_MASKALL;</div><div class='add'>+	sbus_writel(~SUN4M_INT_MASKALL, &amp;sun4m_irq_global-&gt;mask_set);</div><div class='ctx'> 	for (i = 0; !cpu_find_by_instance(i, NULL, &amp;mid); i++)</div><div class='del'>-		sun4m_interrupts-&gt;cpu_intregs[mid].clear = ~0x17fff;</div><div class='del'>-</div><div class='del'>-	if (!cpu_find_by_instance(1, NULL, NULL)) {</div><div class='del'>-		/* system wide interrupts go to cpu 0, this should always</div><div class='del'>-		 * be safe because it is guaranteed to be fitted or OBP doesn't</div><div class='del'>-		 * come up</div><div class='del'>-		 *</div><div class='del'>-		 * Not sure, but writing here on SLAVIO systems may puke</div><div class='del'>-		 * so I don't do it unless there is more than 1 cpu.</div><div class='del'>-		 */</div><div class='del'>-		irq_rcvreg = (unsigned long *)</div><div class='del'>-				&amp;sun4m_interrupts-&gt;undirected_target;</div><div class='del'>-		sun4m_interrupts-&gt;undirected_target = 0;</div><div class='del'>-	}</div><div class='del'>-	BTFIXUPSET_CALL(sbint_to_irq, sun4m_sbint_to_irq, BTFIXUPCALL_NORM);</div><div class='add'>+		sbus_writel(~0x17fff, &amp;sun4m_irq_percpu[mid]-&gt;clear);</div><div class='add'>+</div><div class='add'>+	if (num_cpu_iregs == 4)</div><div class='add'>+		sbus_writel(0, &amp;sun4m_irq_global-&gt;interrupt_target);</div><div class='add'>+</div><div class='ctx'> 	BTFIXUPSET_CALL(enable_irq, sun4m_enable_irq, BTFIXUPCALL_NORM);</div><div class='ctx'> 	BTFIXUPSET_CALL(disable_irq, sun4m_disable_irq, BTFIXUPCALL_NORM);</div><div class='ctx'> 	BTFIXUPSET_CALL(enable_pil_irq, sun4m_enable_pil_irq, BTFIXUPCALL_NORM);</div><div class='ctx'> 	BTFIXUPSET_CALL(disable_pil_irq, sun4m_disable_pil_irq, BTFIXUPCALL_NORM);</div><div class='ctx'> 	BTFIXUPSET_CALL(clear_clock_irq, sun4m_clear_clock_irq, BTFIXUPCALL_NORM);</div><div class='del'>-	BTFIXUPSET_CALL(clear_profile_irq, sun4m_clear_profile_irq, BTFIXUPCALL_NORM);</div><div class='ctx'> 	BTFIXUPSET_CALL(load_profile_irq, sun4m_load_profile_irq, BTFIXUPCALL_NORM);</div><div class='ctx'> 	sparc_init_timers = sun4m_init_timers;</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='hunk'>@@ -461,5 +471,6 @@ void __init sun4m_init_IRQ(void)</div><div class='ctx'> 	BTFIXUPSET_CALL(clear_cpu_int, sun4m_clear_ipi, BTFIXUPCALL_NORM);</div><div class='ctx'> 	BTFIXUPSET_CALL(set_irq_udt, sun4m_set_udt, BTFIXUPCALL_NORM);</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> 	/* Cannot enable interrupts until OBP ticker is disabled. */</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/sparc/kernel/sun4m_smp.c b/arch/sparc/kernel/sun4m_smp.c<br/>index a14a76ac7f36..5fc386d08c47 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/kernel/sun4m_smp.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/kernel/sun4m_smp.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/kernel/sun4m_smp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/kernel/sun4m_smp.c</a></div><div class='hunk'>@@ -17,6 +17,7 @@</div><div class='ctx'> #include &lt;linux/swap.h&gt;</div><div class='ctx'> #include &lt;linux/profile.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/cpu.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #include &lt;asm/tlbflush.h&gt;</div><div class='hunk'>@@ -71,6 +72,8 @@ void __cpuinit smp4m_callin(void)</div><div class='ctx'> 	local_flush_cache_all();</div><div class='ctx'> 	local_flush_tlb_all();</div><div class='ctx'> </div><div class='add'>+	notify_cpu_starting(cpuid);</div><div class='add'>+</div><div class='ctx'> 	/* Get our local ticker going. */</div><div class='ctx'> 	smp_setup_percpu_timer();</div><div class='ctx'> </div><div class='hunk'>@@ -313,6 +316,8 @@ void smp4m_cross_call_irq(void)</div><div class='ctx'> 	ccall_info.processors_out[i] = 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+extern void sun4m_clear_profile_irq(int cpu);</div><div class='add'>+</div><div class='ctx'> void smp4m_percpu_timer_interrupt(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	struct pt_regs *old_regs;</div><div class='hunk'>@@ -320,7 +325,7 @@ void smp4m_percpu_timer_interrupt(struct pt_regs *regs)</div><div class='ctx'> </div><div class='ctx'> 	old_regs = set_irq_regs(regs);</div><div class='ctx'> </div><div class='del'>-	clear_profile_irq(cpu);</div><div class='add'>+	sun4m_clear_profile_irq(cpu);</div><div class='ctx'> </div><div class='ctx'> 	profile_tick(CPU_PROFILING);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sparc/kernel/sun4setup.c b/arch/sparc/kernel/sun4setup.c<br/>deleted file mode 100644<br/>index 229a52f55f16..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/kernel/sun4setup.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/kernel/sun4setup.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,75 +0,0 @@</div><div class='del'>-/* sun4setup.c: Setup the hardware address of various items in the sun4</div><div class='del'>- * 		architecture. Called from idprom_init</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1998 Chris G. Davis (cdavis@cois.on.ca)</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;asm/page.h&gt;</div><div class='del'>-#include &lt;asm/oplib.h&gt;</div><div class='del'>-#include &lt;asm/idprom.h&gt;</div><div class='del'>-#include &lt;asm/sun4paddr.h&gt;</div><div class='del'>-#include &lt;asm/machines.h&gt;</div><div class='del'>-</div><div class='del'>-int sun4_memreg_physaddr;</div><div class='del'>-int sun4_ie_physaddr;</div><div class='del'>-int sun4_clock_physaddr;</div><div class='del'>-int sun4_timer_physaddr;</div><div class='del'>-int sun4_eth_physaddr;</div><div class='del'>-int sun4_si_physaddr;</div><div class='del'>-int sun4_bwtwo_physaddr;</div><div class='del'>-int sun4_zs0_physaddr;</div><div class='del'>-int sun4_zs1_physaddr;</div><div class='del'>-int sun4_dma_physaddr;</div><div class='del'>-int sun4_esp_physaddr;</div><div class='del'>-int sun4_ie_physaddr; </div><div class='del'>-</div><div class='del'>-void __init sun4setup(void)</div><div class='del'>-{</div><div class='del'>-	printk("Sun4 Hardware Setup v1.0 18/May/98 Chris Davis (cdavis@cois.on.ca). ");</div><div class='del'>-	/*</div><div class='del'>-	  setup standard sun4 info</div><div class='del'>-	  */</div><div class='del'>-	sun4_ie_physaddr=SUN4_IE_PHYSADDR;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	  setup model specific info</div><div class='del'>-	  */</div><div class='del'>-	switch(idprom-&gt;id_machtype) {</div><div class='del'>-		case (SM_SUN4 | SM_4_260 ):</div><div class='del'>-			printk("Setup for a SUN4/260\n");</div><div class='del'>-			sun4_memreg_physaddr=SUN4_200_MEMREG_PHYSADDR;</div><div class='del'>-			sun4_clock_physaddr=SUN4_200_CLOCK_PHYSADDR;</div><div class='del'>-			sun4_timer_physaddr=SUN4_UNUSED_PHYSADDR;</div><div class='del'>-			sun4_eth_physaddr=SUN4_200_ETH_PHYSADDR;</div><div class='del'>-			sun4_si_physaddr=SUN4_200_SI_PHYSADDR;</div><div class='del'>-			sun4_bwtwo_physaddr=SUN4_200_BWTWO_PHYSADDR;</div><div class='del'>-			sun4_dma_physaddr=SUN4_UNUSED_PHYSADDR;</div><div class='del'>-			sun4_esp_physaddr=SUN4_UNUSED_PHYSADDR;</div><div class='del'>-			break;</div><div class='del'>-		case (SM_SUN4 | SM_4_330 ):</div><div class='del'>-			printk("Setup for a SUN4/330\n");</div><div class='del'>-			sun4_memreg_physaddr=SUN4_300_MEMREG_PHYSADDR;</div><div class='del'>-			sun4_clock_physaddr=SUN4_300_CLOCK_PHYSADDR;</div><div class='del'>-			sun4_timer_physaddr=SUN4_300_TIMER_PHYSADDR;</div><div class='del'>-			sun4_eth_physaddr=SUN4_300_ETH_PHYSADDR;</div><div class='del'>-			sun4_si_physaddr=SUN4_UNUSED_PHYSADDR;</div><div class='del'>-			sun4_bwtwo_physaddr=SUN4_300_BWTWO_PHYSADDR;</div><div class='del'>-			sun4_dma_physaddr=SUN4_300_DMA_PHYSADDR;</div><div class='del'>-			sun4_esp_physaddr=SUN4_300_ESP_PHYSADDR;</div><div class='del'>-			break;</div><div class='del'>-		case (SM_SUN4 | SM_4_470 ):</div><div class='del'>-			printk("Setup for a SUN4/470\n");</div><div class='del'>-			sun4_memreg_physaddr=SUN4_400_MEMREG_PHYSADDR;</div><div class='del'>-			sun4_clock_physaddr=SUN4_400_CLOCK_PHYSADDR;</div><div class='del'>-			sun4_timer_physaddr=SUN4_400_TIMER_PHYSADDR;</div><div class='del'>-			sun4_eth_physaddr=SUN4_400_ETH_PHYSADDR;</div><div class='del'>-			sun4_si_physaddr=SUN4_UNUSED_PHYSADDR;</div><div class='del'>-			sun4_bwtwo_physaddr=SUN4_400_BWTWO_PHYSADDR;</div><div class='del'>-			sun4_dma_physaddr=SUN4_400_DMA_PHYSADDR;</div><div class='del'>-			sun4_esp_physaddr=SUN4_400_ESP_PHYSADDR;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/arch/sparc/kernel/sys_sparc.c b/arch/sparc/kernel/sys_sparc.c<br/>index 4d73421559c3..03035c852a43 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/kernel/sys_sparc.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/kernel/sys_sparc.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/kernel/sys_sparc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/kernel/sys_sparc.c</a></div><div class='hunk'>@@ -53,7 +53,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi</div><div class='ctx'> 	/* See asm-sparc/uaccess.h */</div><div class='ctx'> 	if (len &gt; TASK_SIZE - PAGE_SIZE)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	if (ARCH_SUN4C_SUN4 &amp;&amp; len &gt; 0x20000000)</div><div class='add'>+	if (ARCH_SUN4C &amp;&amp; len &gt; 0x20000000)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	if (!addr)</div><div class='ctx'> 		addr = TASK_UNMAPPED_BASE;</div><div class='hunk'>@@ -65,7 +65,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi</div><div class='ctx'> </div><div class='ctx'> 	for (vmm = find_vma(current-&gt;mm, addr); ; vmm = vmm-&gt;vm_next) {</div><div class='ctx'> 		/* At this point:  (!vmm || addr &lt; vmm-&gt;vm_end). */</div><div class='del'>-		if (ARCH_SUN4C_SUN4 &amp;&amp; addr &lt; 0xe0000000 &amp;&amp; 0x20000000 - len &lt; addr) {</div><div class='add'>+		if (ARCH_SUN4C &amp;&amp; addr &lt; 0xe0000000 &amp;&amp; 0x20000000 - len &lt; addr) {</div><div class='ctx'> 			addr = PAGE_OFFSET;</div><div class='ctx'> 			vmm = find_vma(current-&gt;mm, PAGE_OFFSET);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -81,7 +81,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi</div><div class='ctx'> </div><div class='ctx'> asmlinkage unsigned long sparc_brk(unsigned long brk)</div><div class='ctx'> {</div><div class='del'>-	if(ARCH_SUN4C_SUN4) {</div><div class='add'>+	if(ARCH_SUN4C) {</div><div class='ctx'> 		if ((brk &amp; 0xe0000000) != (current-&gt;mm-&gt;brk &amp; 0xe0000000))</div><div class='ctx'> 			return current-&gt;mm-&gt;brk;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -221,7 +221,7 @@ out:</div><div class='ctx'> </div><div class='ctx'> int sparc_mmap_check(unsigned long addr, unsigned long len)</div><div class='ctx'> {</div><div class='del'>-	if (ARCH_SUN4C_SUN4 &amp;&amp;</div><div class='add'>+	if (ARCH_SUN4C &amp;&amp;</div><div class='ctx'> 	    (len &gt; 0x20000000 ||</div><div class='ctx'> 	     (addr &lt; 0xe0000000 &amp;&amp; addr + len &gt; 0x20000000)))</div><div class='ctx'> 		return -EINVAL;</div><div class='head'>diff --git a/arch/sparc/kernel/tick14.c b/arch/sparc/kernel/tick14.c<br/>index 707bfda86570..138bbf5f8724 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/kernel/tick14.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/kernel/tick14.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/kernel/tick14.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/kernel/tick14.c</a></div><div class='hunk'>@@ -1,31 +1,12 @@</div><div class='ctx'> /* tick14.c</div><div class='del'>- * linux/arch/sparc/kernel/tick14.c</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 1996 David Redman (djhr@tadpole.co.uk)</div><div class='ctx'>  *</div><div class='ctx'>  * This file handles the Sparc specific level14 ticker</div><div class='ctx'>  * This is really useful for profiling OBP uses it for keyboard</div><div class='ctx'>  * aborts and other stuff.</div><div class='del'>- *</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/param.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/timex.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/oplib.h&gt;</div><div class='del'>-#include &lt;asm/timer.h&gt;</div><div class='del'>-#include &lt;asm/mostek.h&gt;</div><div class='del'>-#include &lt;asm/system.h&gt;</div><div class='del'>-#include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-</div><div class='del'>-#include "irq.h"</div><div class='ctx'> </div><div class='ctx'> extern unsigned long lvl14_save[5];</div><div class='ctx'> static unsigned long *linux_lvl14 = NULL;</div><div class='hunk'>@@ -56,31 +37,3 @@ void install_obp_ticker(void)</div><div class='ctx'> 	linux_lvl14[2] =  obp_lvl14[2];</div><div class='ctx'> 	linux_lvl14[3] =  obp_lvl14[3]; </div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-void claim_ticker14(irq_handler_t handler,</div><div class='del'>-		    int irq_nr, unsigned int timeout )</div><div class='del'>-{</div><div class='del'>-	int cpu = smp_processor_id();</div><div class='del'>-</div><div class='del'>-	/* first we copy the obp handler instructions</div><div class='del'>-	 */</div><div class='del'>-	__disable_irq(irq_nr);</div><div class='del'>-	if (!handler)</div><div class='del'>-		return;</div><div class='del'>-    </div><div class='del'>-	linux_lvl14 = (unsigned long *)lvl14_save[4];</div><div class='del'>-	obp_lvl14[0] = linux_lvl14[0];</div><div class='del'>-	obp_lvl14[1] = linux_lvl14[1];</div><div class='del'>-	obp_lvl14[2] = linux_lvl14[2];</div><div class='del'>-	obp_lvl14[3] = linux_lvl14[3];</div><div class='del'>-</div><div class='del'>-	if (!request_irq(irq_nr,</div><div class='del'>-			 handler,</div><div class='del'>-			 (IRQF_DISABLED | SA_STATIC_ALLOC),</div><div class='del'>-			 "counter14",</div><div class='del'>-			 NULL)) {</div><div class='del'>-		install_linux_ticker();</div><div class='del'>-		load_profile_irq(cpu, timeout);</div><div class='del'>-		__enable_irq(irq_nr);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='head'>diff --git a/arch/sparc/kernel/time.c b/arch/sparc/kernel/time.c<br/>index 0762f5db1924..62c1d94cb434 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/kernel/time.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/kernel/time.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/kernel/time.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/kernel/time.c</a></div><div class='hunk'>@@ -23,22 +23,24 @@</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='add'>+#include &lt;linux/rtc.h&gt;</div><div class='add'>+#include &lt;linux/rtc/m48t59.h&gt;</div><div class='ctx'> #include &lt;linux/timex.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/profile.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='ctx'> #include &lt;linux/of_device.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/oplib.h&gt;</div><div class='ctx'> #include &lt;asm/timer.h&gt;</div><div class='del'>-#include &lt;asm/mostek.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/idprom.h&gt;</div><div class='ctx'> #include &lt;asm/machines.h&gt;</div><div class='del'>-#include &lt;asm/sun4paddr.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/pcic.h&gt;</div><div class='ctx'> #include &lt;asm/irq_regs.h&gt;</div><div class='hunk'>@@ -46,34 +48,9 @@</div><div class='ctx'> #include "irq.h"</div><div class='ctx'> </div><div class='ctx'> DEFINE_SPINLOCK(rtc_lock);</div><div class='del'>-static enum sparc_clock_type sp_clock_typ;</div><div class='del'>-DEFINE_SPINLOCK(mostek_lock);</div><div class='del'>-void __iomem *mstk48t02_regs = NULL;</div><div class='del'>-static struct mostek48t08 __iomem *mstk48t08_regs = NULL;</div><div class='ctx'> static int set_rtc_mmss(unsigned long);</div><div class='ctx'> static int sbus_do_settimeofday(struct timespec *tv);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SUN4</div><div class='del'>-struct intersil *intersil_clock;</div><div class='del'>-#define intersil_cmd(intersil_reg, intsil_cmd) intersil_reg-&gt;int_cmd_reg = \</div><div class='del'>-	(intsil_cmd)</div><div class='del'>-</div><div class='del'>-#define intersil_intr(intersil_reg, intsil_cmd) intersil_reg-&gt;int_intr_reg = \</div><div class='del'>-	(intsil_cmd)</div><div class='del'>-</div><div class='del'>-#define intersil_start(intersil_reg) intersil_cmd(intersil_reg, \</div><div class='del'>-	( INTERSIL_START | INTERSIL_32K | INTERSIL_NORMAL | INTERSIL_24H |\</div><div class='del'>-	  INTERSIL_INTR_ENABLE))</div><div class='del'>-</div><div class='del'>-#define intersil_stop(intersil_reg) intersil_cmd(intersil_reg, \</div><div class='del'>-	( INTERSIL_STOP | INTERSIL_32K | INTERSIL_NORMAL | INTERSIL_24H |\</div><div class='del'>-	  INTERSIL_INTR_ENABLE))</div><div class='del'>-</div><div class='del'>-#define intersil_read_intr(intersil_reg, towhere) towhere = \</div><div class='del'>-	intersil_reg-&gt;int_intr_reg</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> unsigned long profile_pc(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	extern char __copy_user_begin[], __copy_user_end[];</div><div class='hunk'>@@ -96,7 +73,6 @@ unsigned long profile_pc(struct pt_regs *regs)</div><div class='ctx'> EXPORT_SYMBOL(profile_pc);</div><div class='ctx'> </div><div class='ctx'> __volatile__ unsigned int *master_l10_counter;</div><div class='del'>-__volatile__ unsigned int *master_l10_limit;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * timer_interrupt() needs to keep up the real-time clock,</div><div class='hunk'>@@ -116,15 +92,7 @@ static irqreturn_t timer_interrupt(int dummy, void *dev_id)</div><div class='ctx'> </div><div class='ctx'> 	/* Protect counter clear so that do_gettimeoffset works */</div><div class='ctx'> 	write_seqlock(&amp;xtime_lock);</div><div class='del'>-#ifdef CONFIG_SUN4</div><div class='del'>-	if((idprom-&gt;id_machtype == (SM_SUN4 | SM_4_260)) ||</div><div class='del'>-	   (idprom-&gt;id_machtype == (SM_SUN4 | SM_4_110))) {</div><div class='del'>-		int temp;</div><div class='del'>-        	intersil_read_intr(intersil_clock, temp);</div><div class='del'>-		/* re-enable the irq */</div><div class='del'>-		enable_pil_irq(10);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='add'>+</div><div class='ctx'> 	clear_clock_irq();</div><div class='ctx'> </div><div class='ctx'> 	do_timer(1);</div><div class='hunk'>@@ -147,157 +115,56 @@ static irqreturn_t timer_interrupt(int dummy, void *dev_id)</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Kick start a stopped clock (procedure from the Sun NVRAM/hostid FAQ). */</div><div class='del'>-static void __devinit kick_start_clock(void)</div><div class='add'>+static unsigned char mostek_read_byte(struct device *dev, u32 ofs)</div><div class='ctx'> {</div><div class='del'>-	struct mostek48t02 *regs = (struct mostek48t02 *)mstk48t02_regs;</div><div class='del'>-	unsigned char sec;</div><div class='del'>-	int i, count;</div><div class='del'>-</div><div class='del'>-	prom_printf("CLOCK: Clock was stopped. Kick start ");</div><div class='del'>-</div><div class='del'>-	spin_lock_irq(&amp;mostek_lock);</div><div class='del'>-</div><div class='del'>-	/* Turn on the kick start bit to start the oscillator. */</div><div class='del'>-	regs-&gt;creg |= MSTK_CREG_WRITE;</div><div class='del'>-	regs-&gt;sec &amp;= ~MSTK_STOP;</div><div class='del'>-	regs-&gt;hour |= MSTK_KICK_START;</div><div class='del'>-	regs-&gt;creg &amp;= ~MSTK_CREG_WRITE;</div><div class='del'>-</div><div class='del'>-	spin_unlock_irq(&amp;mostek_lock);</div><div class='del'>-</div><div class='del'>-	/* Delay to allow the clock oscillator to start. */</div><div class='del'>-	sec = MSTK_REG_SEC(regs);</div><div class='del'>-	for (i = 0; i &lt; 3; i++) {</div><div class='del'>-		while (sec == MSTK_REG_SEC(regs))</div><div class='del'>-			for (count = 0; count &lt; 100000; count++)</div><div class='del'>-				/* nothing */ ;</div><div class='del'>-		prom_printf(".");</div><div class='del'>-		sec = regs-&gt;sec;</div><div class='del'>-	}</div><div class='del'>-	prom_printf("\n");</div><div class='del'>-</div><div class='del'>-	spin_lock_irq(&amp;mostek_lock);</div><div class='del'>-</div><div class='del'>-	/* Turn off kick start and set a "valid" time and date. */</div><div class='del'>-	regs-&gt;creg |= MSTK_CREG_WRITE;</div><div class='del'>-	regs-&gt;hour &amp;= ~MSTK_KICK_START;</div><div class='del'>-	MSTK_SET_REG_SEC(regs,0);</div><div class='del'>-	MSTK_SET_REG_MIN(regs,0);</div><div class='del'>-	MSTK_SET_REG_HOUR(regs,0);</div><div class='del'>-	MSTK_SET_REG_DOW(regs,5);</div><div class='del'>-	MSTK_SET_REG_DOM(regs,1);</div><div class='del'>-	MSTK_SET_REG_MONTH(regs,8);</div><div class='del'>-	MSTK_SET_REG_YEAR(regs,1996 - MSTK_YEAR_ZERO);</div><div class='del'>-	regs-&gt;creg &amp;= ~MSTK_CREG_WRITE;</div><div class='del'>-</div><div class='del'>-	spin_unlock_irq(&amp;mostek_lock);</div><div class='del'>-</div><div class='del'>-	/* Ensure the kick start bit is off. If it isn't, turn it off. */</div><div class='del'>-	while (regs-&gt;hour &amp; MSTK_KICK_START) {</div><div class='del'>-		prom_printf("CLOCK: Kick start still on!\n");</div><div class='del'>-</div><div class='del'>-		spin_lock_irq(&amp;mostek_lock);</div><div class='del'>-		regs-&gt;creg |= MSTK_CREG_WRITE;</div><div class='del'>-		regs-&gt;hour &amp;= ~MSTK_KICK_START;</div><div class='del'>-		regs-&gt;creg &amp;= ~MSTK_CREG_WRITE;</div><div class='del'>-		spin_unlock_irq(&amp;mostek_lock);</div><div class='add'>+	struct platform_device *pdev = to_platform_device(dev);</div><div class='add'>+	struct m48t59_plat_data *pdata = pdev-&gt;dev.platform_data;</div><div class='add'>+	void __iomem *regs = pdata-&gt;ioaddr;</div><div class='add'>+	unsigned char val = readb(regs + ofs);</div><div class='add'>+</div><div class='add'>+	/* the year 0 is 1968 */</div><div class='add'>+	if (ofs == pdata-&gt;offset + M48T59_YEAR) {</div><div class='add'>+		val += 0x68;</div><div class='add'>+		if ((val &amp; 0xf) &gt; 9)</div><div class='add'>+			val += 6;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	prom_printf("CLOCK: Kick start procedure successful.\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Return nonzero if the clock chip battery is low. */</div><div class='del'>-static inline int has_low_battery(void)</div><div class='del'>-{</div><div class='del'>-	struct mostek48t02 *regs = (struct mostek48t02 *)mstk48t02_regs;</div><div class='del'>-	unsigned char data1, data2;</div><div class='del'>-</div><div class='del'>-	spin_lock_irq(&amp;mostek_lock);</div><div class='del'>-	data1 = regs-&gt;eeprom[0];	/* Read some data. */</div><div class='del'>-	regs-&gt;eeprom[0] = ~data1;	/* Write back the complement. */</div><div class='del'>-	data2 = regs-&gt;eeprom[0];	/* Read back the complement. */</div><div class='del'>-	regs-&gt;eeprom[0] = data1;	/* Restore the original value. */</div><div class='del'>-	spin_unlock_irq(&amp;mostek_lock);</div><div class='del'>-</div><div class='del'>-	return (data1 == data2);	/* Was the write blocked? */</div><div class='add'>+	return val;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devinit mostek_set_system_time(void)</div><div class='add'>+static void mostek_write_byte(struct device *dev, u32 ofs, u8 val)</div><div class='ctx'> {</div><div class='del'>-	unsigned int year, mon, day, hour, min, sec;</div><div class='del'>-	struct mostek48t02 *mregs;</div><div class='del'>-</div><div class='del'>-	mregs = (struct mostek48t02 *)mstk48t02_regs;</div><div class='del'>-	if(!mregs) {</div><div class='del'>-		prom_printf("Something wrong, clock regs not mapped yet.\n");</div><div class='del'>-		prom_halt();</div><div class='del'>-	}		</div><div class='del'>-	spin_lock_irq(&amp;mostek_lock);</div><div class='del'>-	mregs-&gt;creg |= MSTK_CREG_READ;</div><div class='del'>-	sec = MSTK_REG_SEC(mregs);</div><div class='del'>-	min = MSTK_REG_MIN(mregs);</div><div class='del'>-	hour = MSTK_REG_HOUR(mregs);</div><div class='del'>-	day = MSTK_REG_DOM(mregs);</div><div class='del'>-	mon = MSTK_REG_MONTH(mregs);</div><div class='del'>-	year = MSTK_CVT_YEAR( MSTK_REG_YEAR(mregs) );</div><div class='del'>-	xtime.tv_sec = mktime(year, mon, day, hour, min, sec);</div><div class='del'>-	xtime.tv_nsec = (INITIAL_JIFFIES % HZ) * (NSEC_PER_SEC / HZ);</div><div class='del'>-        set_normalized_timespec(&amp;wall_to_monotonic,</div><div class='del'>-                                -xtime.tv_sec, -xtime.tv_nsec);</div><div class='del'>-	mregs-&gt;creg &amp;= ~MSTK_CREG_READ;</div><div class='del'>-	spin_unlock_irq(&amp;mostek_lock);</div><div class='add'>+	struct platform_device *pdev = to_platform_device(dev);</div><div class='add'>+	struct m48t59_plat_data *pdata = pdev-&gt;dev.platform_data;</div><div class='add'>+	void __iomem *regs = pdata-&gt;ioaddr;</div><div class='add'>+</div><div class='add'>+	if (ofs == pdata-&gt;offset + M48T59_YEAR) {</div><div class='add'>+		if (val &lt; 0x68)</div><div class='add'>+			val += 0x32;</div><div class='add'>+		else</div><div class='add'>+			val -= 0x68;</div><div class='add'>+		if ((val &amp; 0xf) &gt; 9)</div><div class='add'>+			val += 6;</div><div class='add'>+		if ((val &amp; 0xf0) &gt; 0x9A)</div><div class='add'>+			val += 0x60;</div><div class='add'>+	}</div><div class='add'>+	writeb(val, regs + ofs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Probe for the real time clock chip on Sun4 */</div><div class='del'>-static inline void sun4_clock_probe(void)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_SUN4</div><div class='del'>-	int temp;</div><div class='del'>-	struct resource r;</div><div class='del'>-</div><div class='del'>-	memset(&amp;r, 0, sizeof(r));</div><div class='del'>-	if( idprom-&gt;id_machtype == (SM_SUN4 | SM_4_330) ) {</div><div class='del'>-		sp_clock_typ = MSTK48T02;</div><div class='del'>-		r.start = sun4_clock_physaddr;</div><div class='del'>-		mstk48t02_regs = sbus_ioremap(&amp;r, 0,</div><div class='del'>-				       sizeof(struct mostek48t02), NULL);</div><div class='del'>-		mstk48t08_regs = NULL;  /* To catch weirdness */</div><div class='del'>-		intersil_clock = NULL;  /* just in case */</div><div class='del'>-</div><div class='del'>-		/* Kick start the clock if it is completely stopped. */</div><div class='del'>-		if (mostek_read(mstk48t02_regs + MOSTEK_SEC) &amp; MSTK_STOP)</div><div class='del'>-			kick_start_clock();</div><div class='del'>-	} else if( idprom-&gt;id_machtype == (SM_SUN4 | SM_4_260)) {</div><div class='del'>-		/* intersil setup code */</div><div class='del'>-		printk("Clock: INTERSIL at %8x ",sun4_clock_physaddr);</div><div class='del'>-		sp_clock_typ = INTERSIL;</div><div class='del'>-		r.start = sun4_clock_physaddr;</div><div class='del'>-		intersil_clock = (struct intersil *) </div><div class='del'>-		    sbus_ioremap(&amp;r, 0, sizeof(*intersil_clock), "intersil");</div><div class='del'>-		mstk48t02_regs = 0;  /* just be sure */</div><div class='del'>-		mstk48t08_regs = NULL;  /* ditto */</div><div class='del'>-		/* initialise the clock */</div><div class='del'>-</div><div class='del'>-		intersil_intr(intersil_clock,INTERSIL_INT_100HZ);</div><div class='del'>-</div><div class='del'>-		intersil_start(intersil_clock);</div><div class='del'>-</div><div class='del'>-		intersil_read_intr(intersil_clock, temp);</div><div class='del'>-                while (!(temp &amp; 0x80))</div><div class='del'>-                        intersil_read_intr(intersil_clock, temp);</div><div class='del'>-</div><div class='del'>-                intersil_read_intr(intersil_clock, temp);</div><div class='del'>-                while (!(temp &amp; 0x80))</div><div class='del'>-                        intersil_read_intr(intersil_clock, temp);</div><div class='del'>-</div><div class='del'>-		intersil_stop(intersil_clock);</div><div class='add'>+static struct m48t59_plat_data m48t59_data = {</div><div class='add'>+	.read_byte = mostek_read_byte,</div><div class='add'>+	.write_byte = mostek_write_byte,</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='add'>+/* resource is set at runtime */</div><div class='add'>+static struct platform_device m48t59_rtc = {</div><div class='add'>+	.name		= "rtc-m48t59",</div><div class='add'>+	.id		= 0,</div><div class='add'>+	.num_resources	= 1,</div><div class='add'>+	.dev	= {</div><div class='add'>+		.platform_data = &amp;m48t59_data,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-#ifndef CONFIG_SUN4</div><div class='ctx'> static int __devinit clock_probe(struct of_device *op, const struct of_device_id *match)</div><div class='ctx'> {</div><div class='ctx'> 	struct device_node *dp = op-&gt;node;</div><div class='hunk'>@@ -306,38 +173,26 @@ static int __devinit clock_probe(struct of_device *op, const struct of_device_id</div><div class='ctx'> 	if (!model)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='add'>+	m48t59_rtc.resource = &amp;op-&gt;resource[0];</div><div class='ctx'> 	if (!strcmp(model, "mk48t02")) {</div><div class='del'>-		sp_clock_typ = MSTK48T02;</div><div class='del'>-</div><div class='ctx'> 		/* Map the clock register io area read-only */</div><div class='del'>-		mstk48t02_regs = of_ioremap(&amp;op-&gt;resource[0], 0,</div><div class='del'>-					    sizeof(struct mostek48t02),</div><div class='del'>-					    "mk48t02");</div><div class='del'>-		mstk48t08_regs = NULL;  /* To catch weirdness */</div><div class='add'>+		m48t59_data.ioaddr = of_ioremap(&amp;op-&gt;resource[0], 0,</div><div class='add'>+						2048, "rtc-m48t59");</div><div class='add'>+		m48t59_data.type = M48T59RTC_TYPE_M48T02;</div><div class='ctx'> 	} else if (!strcmp(model, "mk48t08")) {</div><div class='del'>-		sp_clock_typ = MSTK48T08;</div><div class='del'>-		mstk48t08_regs = of_ioremap(&amp;op-&gt;resource[0], 0,</div><div class='del'>-					    sizeof(struct mostek48t08),</div><div class='del'>-					    "mk48t08");</div><div class='del'>-</div><div class='del'>-		mstk48t02_regs = &amp;mstk48t08_regs-&gt;regs;</div><div class='add'>+		m48t59_data.ioaddr = of_ioremap(&amp;op-&gt;resource[0], 0,</div><div class='add'>+						8192, "rtc-m48t59");</div><div class='add'>+		m48t59_data.type = M48T59RTC_TYPE_M48T08;</div><div class='ctx'> 	} else</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	/* Report a low battery voltage condition. */</div><div class='del'>-	if (has_low_battery())</div><div class='del'>-		printk(KERN_CRIT "NVRAM: Low battery voltage!\n");</div><div class='del'>-</div><div class='del'>-	/* Kick start the clock if it is completely stopped. */</div><div class='del'>-	if (mostek_read(mstk48t02_regs + MOSTEK_SEC) &amp; MSTK_STOP)</div><div class='del'>-		kick_start_clock();</div><div class='del'>-</div><div class='del'>-	mostek_set_system_time();</div><div class='add'>+	if (platform_device_register(&amp;m48t59_rtc) &lt; 0)</div><div class='add'>+		printk(KERN_ERR "Registering RTC device failed\n");</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct of_device_id clock_match[] = {</div><div class='add'>+static struct of_device_id __initdata clock_match[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.name = "eeprom",</div><div class='ctx'> 	},</div><div class='hunk'>@@ -348,7 +203,7 @@ static struct of_platform_driver clock_driver = {</div><div class='ctx'> 	.match_table	= clock_match,</div><div class='ctx'> 	.probe		= clock_probe,</div><div class='ctx'> 	.driver		= {</div><div class='del'>-		.name	= "clock",</div><div class='add'>+		.name	= "rtc",</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -364,7 +219,6 @@ static int __init clock_init(void)</div><div class='ctx'>  * need to see the clock registers.</div><div class='ctx'>  */</div><div class='ctx'> fs_initcall(clock_init);</div><div class='del'>-#endif /* !CONFIG_SUN4 */</div><div class='ctx'> </div><div class='ctx'> static void __init sbus_time_init(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -372,51 +226,8 @@ static void __init sbus_time_init(void)</div><div class='ctx'> 	BTFIXUPSET_CALL(bus_do_settimeofday, sbus_do_settimeofday, BTFIXUPCALL_NORM);</div><div class='ctx'> 	btfixup();</div><div class='ctx'> </div><div class='del'>-	if (ARCH_SUN4)</div><div class='del'>-		sun4_clock_probe();</div><div class='del'>-</div><div class='ctx'> 	sparc_init_timers(timer_interrupt);</div><div class='ctx'> 	</div><div class='del'>-#ifdef CONFIG_SUN4</div><div class='del'>-	if(idprom-&gt;id_machtype == (SM_SUN4 | SM_4_330)) {</div><div class='del'>-		mostek_set_system_time();</div><div class='del'>-	} else if(idprom-&gt;id_machtype == (SM_SUN4 | SM_4_260) ) {</div><div class='del'>-		/* initialise the intersil on sun4 */</div><div class='del'>-		unsigned int year, mon, day, hour, min, sec;</div><div class='del'>-		int temp;</div><div class='del'>-		struct intersil *iregs;</div><div class='del'>-</div><div class='del'>-		iregs=intersil_clock;</div><div class='del'>-		if(!iregs) {</div><div class='del'>-			prom_printf("Something wrong, clock regs not mapped yet.\n");</div><div class='del'>-			prom_halt();</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		intersil_intr(intersil_clock,INTERSIL_INT_100HZ);</div><div class='del'>-		disable_pil_irq(10);</div><div class='del'>-		intersil_stop(iregs);</div><div class='del'>-		intersil_read_intr(intersil_clock, temp);</div><div class='del'>-</div><div class='del'>-		temp = iregs-&gt;clk.int_csec;</div><div class='del'>-</div><div class='del'>-		sec = iregs-&gt;clk.int_sec;</div><div class='del'>-		min = iregs-&gt;clk.int_min;</div><div class='del'>-		hour = iregs-&gt;clk.int_hour;</div><div class='del'>-		day = iregs-&gt;clk.int_day;</div><div class='del'>-		mon = iregs-&gt;clk.int_month;</div><div class='del'>-		year = MSTK_CVT_YEAR(iregs-&gt;clk.int_year);</div><div class='del'>-</div><div class='del'>-		enable_pil_irq(10);</div><div class='del'>-		intersil_start(iregs);</div><div class='del'>-</div><div class='del'>-		xtime.tv_sec = mktime(year, mon, day, hour, min, sec);</div><div class='del'>-		xtime.tv_nsec = (INITIAL_JIFFIES % HZ) * (NSEC_PER_SEC / HZ);</div><div class='del'>-	        set_normalized_timespec(&amp;wall_to_monotonic,</div><div class='del'>- 	                               -xtime.tv_sec, -xtime.tv_nsec);</div><div class='del'>-		printk("%u/%u/%u %u:%u:%u\n",day,mon,year,hour,min,sec);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	/* Now that OBP ticker has been silenced, it is safe to enable IRQ. */</div><div class='ctx'> 	local_irq_enable();</div><div class='ctx'> }</div><div class='hunk'>@@ -522,80 +333,15 @@ static int sbus_do_settimeofday(struct timespec *tv)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * BUG: This routine does not handle hour overflow properly; it just</div><div class='del'>- *      sets the minutes. Usually you won't notice until after reboot!</div><div class='del'>- */</div><div class='del'>-static int set_rtc_mmss(unsigned long nowtime)</div><div class='add'>+static int set_rtc_mmss(unsigned long secs)</div><div class='ctx'> {</div><div class='del'>-	int real_seconds, real_minutes, mostek_minutes;</div><div class='del'>-	struct mostek48t02 *regs = (struct mostek48t02 *)mstk48t02_regs;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-#ifdef CONFIG_SUN4</div><div class='del'>-	struct intersil *iregs = intersil_clock;</div><div class='del'>-	int temp;</div><div class='del'>-#endif</div><div class='add'>+	struct rtc_device *rtc = rtc_class_open("rtc0");</div><div class='add'>+	int err = -1;</div><div class='ctx'> </div><div class='del'>-	/* Not having a register set can lead to trouble. */</div><div class='del'>-	if (!regs) {</div><div class='del'>-#ifdef CONFIG_SUN4</div><div class='del'>-		if(!iregs)</div><div class='del'>-		return -1;</div><div class='del'>-	 	else {</div><div class='del'>-			temp = iregs-&gt;clk.int_csec;</div><div class='del'>-</div><div class='del'>-			mostek_minutes = iregs-&gt;clk.int_min;</div><div class='del'>-</div><div class='del'>-			real_seconds = nowtime % 60;</div><div class='del'>-			real_minutes = nowtime / 60;</div><div class='del'>-			if (((abs(real_minutes - mostek_minutes) + 15)/30) &amp; 1)</div><div class='del'>-				real_minutes += 30;	/* correct for half hour time zone */</div><div class='del'>-			real_minutes %= 60;</div><div class='del'>-</div><div class='del'>-			if (abs(real_minutes - mostek_minutes) &lt; 30) {</div><div class='del'>-				intersil_stop(iregs);</div><div class='del'>-				iregs-&gt;clk.int_sec=real_seconds;</div><div class='del'>-				iregs-&gt;clk.int_min=real_minutes;</div><div class='del'>-				intersil_start(iregs);</div><div class='del'>-			} else {</div><div class='del'>-				printk(KERN_WARNING</div><div class='del'>-			       "set_rtc_mmss: can't update from %d to %d\n",</div><div class='del'>-				       mostek_minutes, real_minutes);</div><div class='del'>-				return -1;</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-#endif</div><div class='add'>+	if (rtc) {</div><div class='add'>+		err = rtc_set_mmss(rtc, secs);</div><div class='add'>+		rtc_class_close(rtc);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;mostek_lock, flags);</div><div class='del'>-	/* Read the current RTC minutes. */</div><div class='del'>-	regs-&gt;creg |= MSTK_CREG_READ;</div><div class='del'>-	mostek_minutes = MSTK_REG_MIN(regs);</div><div class='del'>-	regs-&gt;creg &amp;= ~MSTK_CREG_READ;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * since we're only adjusting minutes and seconds,</div><div class='del'>-	 * don't interfere with hour overflow. This avoids</div><div class='del'>-	 * messing with unknown time zones but requires your</div><div class='del'>-	 * RTC not to be off by more than 15 minutes</div><div class='del'>-	 */</div><div class='del'>-	real_seconds = nowtime % 60;</div><div class='del'>-	real_minutes = nowtime / 60;</div><div class='del'>-	if (((abs(real_minutes - mostek_minutes) + 15)/30) &amp; 1)</div><div class='del'>-		real_minutes += 30;	/* correct for half hour time zone */</div><div class='del'>-	real_minutes %= 60;</div><div class='del'>-</div><div class='del'>-	if (abs(real_minutes - mostek_minutes) &lt; 30) {</div><div class='del'>-		regs-&gt;creg |= MSTK_CREG_WRITE;</div><div class='del'>-		MSTK_SET_REG_SEC(regs,real_seconds);</div><div class='del'>-		MSTK_SET_REG_MIN(regs,real_minutes);</div><div class='del'>-		regs-&gt;creg &amp;= ~MSTK_CREG_WRITE;</div><div class='del'>-		spin_unlock_irqrestore(&amp;mostek_lock, flags);</div><div class='del'>-		return 0;</div><div class='del'>-	} else {</div><div class='del'>-		spin_unlock_irqrestore(&amp;mostek_lock, flags);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/sparc/kernel/traps.c b/arch/sparc/kernel/traps.c<br/>index 5d45d5fd8c99..2b7d50659036 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/kernel/traps.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/kernel/traps.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/kernel/traps.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/kernel/traps.c</a></div><div class='hunk'>@@ -43,23 +43,6 @@ void syscall_trace_exit(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void sun4m_nmi(struct pt_regs *regs)</div><div class='del'>-{</div><div class='del'>-	unsigned long afsr, afar;</div><div class='del'>-</div><div class='del'>-	printk("Aieee: sun4m NMI received!\n");</div><div class='del'>-	/* XXX HyperSparc hack XXX */</div><div class='del'>-	__asm__ __volatile__("mov 0x500, %%g1\n\t"</div><div class='del'>-			     "lda [%%g1] 0x4, %0\n\t"</div><div class='del'>-			     "mov 0x600, %%g1\n\t"</div><div class='del'>-			     "lda [%%g1] 0x4, %1\n\t" :</div><div class='del'>-			     "=r" (afsr), "=r" (afar));</div><div class='del'>-	printk("afsr=%08lx afar=%08lx\n", afsr, afar);</div><div class='del'>-	printk("you lose buddy boy...\n");</div><div class='del'>-	show_regs(regs);</div><div class='del'>-	prom_halt();</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void sun4d_nmi(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	printk("Aieee: sun4d NMI received!\n");</div><div class='head'>diff --git a/arch/sparc/mm/Makefile b/arch/sparc/mm/Makefile<br/>index 109c8b22cb38..ea88955d97ff 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/mm/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/mm/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/mm/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/mm/Makefile</a></div><div class='hunk'>@@ -3,13 +3,8 @@</div><div class='ctx'> </div><div class='ctx'> EXTRA_AFLAGS := -ansi</div><div class='ctx'> </div><div class='del'>-obj-y    := fault.o init.o loadmmu.o generic.o extable.o btfixup.o</div><div class='del'>-</div><div class='del'>-ifeq ($(CONFIG_SUN4),y)</div><div class='del'>-obj-y	 += nosrmmu.o</div><div class='del'>-else</div><div class='del'>-obj-y	 += srmmu.o iommu.o io-unit.o hypersparc.o viking.o tsunami.o swift.o</div><div class='del'>-endif</div><div class='add'>+obj-y	:= fault.o init.o loadmmu.o generic.o extable.o btfixup.o \</div><div class='add'>+	    srmmu.o iommu.o io-unit.o hypersparc.o viking.o tsunami.o swift.o</div><div class='ctx'> </div><div class='ctx'> ifdef CONFIG_HIGHMEM</div><div class='ctx'> obj-y	+= highmem.o</div><div class='head'>diff --git a/arch/sparc/mm/btfixup.c b/arch/sparc/mm/btfixup.c<br/>index a312d127d47a..5175ac2f4820 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/mm/btfixup.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/mm/btfixup.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/mm/btfixup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/mm/btfixup.c</a></div><div class='hunk'>@@ -20,11 +20,7 @@</div><div class='ctx'> </div><div class='ctx'> extern char *srmmu_name;</div><div class='ctx'> static char version[] __initdata = "Boot time fixup v1.6. 4/Mar/98 Jakub Jelinek (jj@ultra.linux.cz). Patching kernel for ";</div><div class='del'>-#ifdef CONFIG_SUN4</div><div class='del'>-static char str_sun4c[] __initdata = "sun4\n";</div><div class='del'>-#else</div><div class='ctx'> static char str_sun4c[] __initdata = "sun4c\n";</div><div class='del'>-#endif</div><div class='ctx'> static char str_srmmu[] __initdata = "srmmu[%s]/";</div><div class='ctx'> static char str_iommu[] __initdata = "iommu\n";</div><div class='ctx'> static char str_iounit[] __initdata = "io-unit\n";</div><div class='hunk'>@@ -86,7 +82,7 @@ void __init btfixup(void)</div><div class='ctx'> 	if (!visited) {</div><div class='ctx'> 		visited++;</div><div class='ctx'> 		printk(version);</div><div class='del'>-		if (ARCH_SUN4C_SUN4)</div><div class='add'>+		if (ARCH_SUN4C)</div><div class='ctx'> 			printk(str_sun4c);</div><div class='ctx'> 		else {</div><div class='ctx'> 			printk(str_srmmu, srmmu_name);</div><div class='head'>diff --git a/arch/sparc/mm/fault.c b/arch/sparc/mm/fault.c<br/>index 3604c2e86709..a507e1174662 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/mm/fault.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/mm/fault.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/mm/fault.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/mm/fault.c</a></div><div class='hunk'>@@ -191,7 +191,7 @@ asmlinkage void do_sparc_fault(struct pt_regs *regs, int text_fault, int write,</div><div class='ctx'> 	 * only copy the information from the master page table,</div><div class='ctx'> 	 * nothing more.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!ARCH_SUN4C_SUN4 &amp;&amp; address &gt;= TASK_SIZE)</div><div class='add'>+	if (!ARCH_SUN4C &amp;&amp; address &gt;= TASK_SIZE)</div><div class='ctx'> 		goto vmalloc_fault;</div><div class='ctx'> </div><div class='ctx'> 	info.si_code = SEGV_MAPERR;</div><div class='head'>diff --git a/arch/sparc/mm/init.c b/arch/sparc/mm/init.c<br/>index e103f1bb3777..677c1e187a23 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/mm/init.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/mm/init.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/mm/init.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/mm/init.c</a></div><div class='hunk'>@@ -23,6 +23,7 @@</div><div class='ctx'> #include &lt;linux/highmem.h&gt;</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='ctx'> #include &lt;linux/pagemap.h&gt;</div><div class='add'>+#include &lt;linux/poison.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/vac-ops.h&gt;</div><div class='hunk'>@@ -480,6 +481,7 @@ void free_initmem (void)</div><div class='ctx'> 	for (; addr &lt; (unsigned long)(&amp;__init_end); addr += PAGE_SIZE) {</div><div class='ctx'> 		struct page *p;</div><div class='ctx'> </div><div class='add'>+		memset((void *)addr, POISON_FREE_INITMEM, PAGE_SIZE);</div><div class='ctx'> 		p = virt_to_page(addr);</div><div class='ctx'> </div><div class='ctx'> 		ClearPageReserved(p);</div><div class='hunk'>@@ -488,20 +490,26 @@ void free_initmem (void)</div><div class='ctx'> 		totalram_pages++;</div><div class='ctx'> 		num_physpages++;</div><div class='ctx'> 	}</div><div class='del'>-	printk (KERN_INFO "Freeing unused kernel memory: %dk freed\n", (&amp;__init_end - &amp;__init_begin) &gt;&gt; 10);</div><div class='add'>+	printk(KERN_INFO "Freeing unused kernel memory: %dk freed\n",</div><div class='add'>+		(&amp;__init_end - &amp;__init_begin) &gt;&gt; 10);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_BLK_DEV_INITRD</div><div class='ctx'> void free_initrd_mem(unsigned long start, unsigned long end)</div><div class='ctx'> {</div><div class='ctx'> 	if (start &lt; end)</div><div class='del'>-		printk (KERN_INFO "Freeing initrd memory: %ldk freed\n", (end - start) &gt;&gt; 10);</div><div class='add'>+		printk(KERN_INFO "Freeing initrd memory: %ldk freed\n",</div><div class='add'>+			(end - start) &gt;&gt; 10);</div><div class='ctx'> 	for (; start &lt; end; start += PAGE_SIZE) {</div><div class='del'>-		struct page *p = virt_to_page(start);</div><div class='add'>+		struct page *p;</div><div class='add'>+</div><div class='add'>+		memset((void *)start, POISON_FREE_INITMEM, PAGE_SIZE);</div><div class='add'>+		p = virt_to_page(start);</div><div class='ctx'> </div><div class='ctx'> 		ClearPageReserved(p);</div><div class='ctx'> 		init_page_count(p);</div><div class='ctx'> 		__free_page(p);</div><div class='add'>+		totalram_pages++;</div><div class='ctx'> 		num_physpages++;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/sparc/mm/io-unit.c b/arch/sparc/mm/io-unit.c<br/>index f167835db3df..daadf5f88050 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/mm/io-unit.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/mm/io-unit.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/mm/io-unit.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/mm/io-unit.c</a></div><div class='hunk'>@@ -12,10 +12,11 @@</div><div class='ctx'> #include &lt;linux/highmem.h&gt;	/* pte_offset_map =&gt; kmap_atomic */</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='ctx'> #include &lt;linux/scatterlist.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/pgalloc.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='del'>-#include &lt;asm/sbus.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/io-unit.h&gt;</div><div class='ctx'> #include &lt;asm/mxcc.h&gt;</div><div class='hunk'>@@ -34,13 +35,10 @@</div><div class='ctx'> #define IOPERM        (IOUPTE_CACHE | IOUPTE_WRITE | IOUPTE_VALID)</div><div class='ctx'> #define MKIOPTE(phys) __iopte((((phys)&gt;&gt;4) &amp; IOUPTE_PAGE) | IOPERM)</div><div class='ctx'> </div><div class='del'>-void __init</div><div class='del'>-iounit_init(int sbi_node, int io_node, struct sbus_bus *sbus)</div><div class='add'>+static void __init iounit_iommu_init(struct of_device *op)</div><div class='ctx'> {</div><div class='del'>-	iopte_t *xpt, *xptend;</div><div class='ctx'> 	struct iounit_struct *iounit;</div><div class='del'>-	struct linux_prom_registers iommu_promregs[PROMREG_MAX];</div><div class='del'>-	struct resource r;</div><div class='add'>+	iopte_t *xpt, *xptend;</div><div class='ctx'> </div><div class='ctx'> 	iounit = kzalloc(sizeof(struct iounit_struct), GFP_ATOMIC);</div><div class='ctx'> 	if (!iounit) {</div><div class='hunk'>@@ -55,18 +53,13 @@ iounit_init(int sbi_node, int io_node, struct sbus_bus *sbus)</div><div class='ctx'> 	iounit-&gt;rotor[1] = IOUNIT_BMAP2_START;</div><div class='ctx'> 	iounit-&gt;rotor[2] = IOUNIT_BMAPM_START;</div><div class='ctx'> </div><div class='del'>-	xpt = NULL;</div><div class='del'>-	if(prom_getproperty(sbi_node, "reg", (void *) iommu_promregs,</div><div class='del'>-			    sizeof(iommu_promregs)) != -1) {</div><div class='del'>-		prom_apply_generic_ranges(io_node, 0, iommu_promregs, 3);</div><div class='del'>-		memset(&amp;r, 0, sizeof(r));</div><div class='del'>-		r.flags = iommu_promregs[2].which_io;</div><div class='del'>-		r.start = iommu_promregs[2].phys_addr;</div><div class='del'>-		xpt = (iopte_t *) sbus_ioremap(&amp;r, 0, PAGE_SIZE * 16, "XPT");</div><div class='add'>+	xpt = of_ioremap(&amp;op-&gt;resource[2], 0, PAGE_SIZE * 16, "XPT");</div><div class='add'>+	if (!xpt) {</div><div class='add'>+		prom_printf("SUN4D: Cannot map External Page Table.");</div><div class='add'>+		prom_halt();</div><div class='ctx'> 	}</div><div class='del'>-	if(!xpt) panic("Cannot map External Page Table.");</div><div class='ctx'> 	</div><div class='del'>-	sbus-&gt;ofdev.dev.archdata.iommu = iounit;</div><div class='add'>+	op-&gt;dev.archdata.iommu = iounit;</div><div class='ctx'> 	iounit-&gt;page_table = xpt;</div><div class='ctx'> 	spin_lock_init(&amp;iounit-&gt;lock);</div><div class='ctx'> 	</div><div class='hunk'>@@ -75,6 +68,25 @@ iounit_init(int sbi_node, int io_node, struct sbus_bus *sbus)</div><div class='ctx'> 	     	iopte_val(*xpt++) = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int __init iounit_init(void)</div><div class='add'>+{</div><div class='add'>+	extern void sun4d_init_sbi_irq(void);</div><div class='add'>+	struct device_node *dp;</div><div class='add'>+</div><div class='add'>+	for_each_node_by_name(dp, "sbi") {</div><div class='add'>+		struct of_device *op = of_find_device_by_node(dp);</div><div class='add'>+</div><div class='add'>+		iounit_iommu_init(op);</div><div class='add'>+		of_propagate_archdata(op);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sun4d_init_sbi_irq();</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+subsys_initcall(iounit_init);</div><div class='add'>+</div><div class='ctx'> /* One has to hold iounit-&gt;lock to call this */</div><div class='ctx'> static unsigned long iounit_get_area(struct iounit_struct *iounit, unsigned long vaddr, int size)</div><div class='ctx'> {</div><div class='hunk'>@@ -124,10 +136,10 @@ nexti:	scan = find_next_zero_bit(iounit-&gt;bmap, limit, scan);</div><div class='ctx'> 	return vaddr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static __u32 iounit_get_scsi_one(char *vaddr, unsigned long len, struct sbus_bus *sbus)</div><div class='add'>+static __u32 iounit_get_scsi_one(struct device *dev, char *vaddr, unsigned long len)</div><div class='ctx'> {</div><div class='add'>+	struct iounit_struct *iounit = dev-&gt;archdata.iommu;</div><div class='ctx'> 	unsigned long ret, flags;</div><div class='del'>-	struct iounit_struct *iounit = sbus-&gt;ofdev.dev.archdata.iommu;</div><div class='ctx'> 	</div><div class='ctx'> 	spin_lock_irqsave(&amp;iounit-&gt;lock, flags);</div><div class='ctx'> 	ret = iounit_get_area(iounit, (unsigned long)vaddr, len);</div><div class='hunk'>@@ -135,10 +147,10 @@ static __u32 iounit_get_scsi_one(char *vaddr, unsigned long len, struct sbus_bus</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iounit_get_scsi_sgl(struct scatterlist *sg, int sz, struct sbus_bus *sbus)</div><div class='add'>+static void iounit_get_scsi_sgl(struct device *dev, struct scatterlist *sg, int sz)</div><div class='ctx'> {</div><div class='add'>+	struct iounit_struct *iounit = dev-&gt;archdata.iommu;</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	struct iounit_struct *iounit = sbus-&gt;ofdev.dev.archdata.iommu;</div><div class='ctx'> </div><div class='ctx'> 	/* FIXME: Cache some resolved pages - often several sg entries are to the same page */</div><div class='ctx'> 	spin_lock_irqsave(&amp;iounit-&gt;lock, flags);</div><div class='hunk'>@@ -151,10 +163,10 @@ static void iounit_get_scsi_sgl(struct scatterlist *sg, int sz, struct sbus_bus</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;iounit-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iounit_release_scsi_one(__u32 vaddr, unsigned long len, struct sbus_bus *sbus)</div><div class='add'>+static void iounit_release_scsi_one(struct device *dev, __u32 vaddr, unsigned long len)</div><div class='ctx'> {</div><div class='add'>+	struct iounit_struct *iounit = dev-&gt;archdata.iommu;</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	struct iounit_struct *iounit = sbus-&gt;ofdev.dev.archdata.iommu;</div><div class='ctx'> 	</div><div class='ctx'> 	spin_lock_irqsave(&amp;iounit-&gt;lock, flags);</div><div class='ctx'> 	len = ((vaddr &amp; ~PAGE_MASK) + len + (PAGE_SIZE-1)) &gt;&gt; PAGE_SHIFT;</div><div class='hunk'>@@ -165,11 +177,11 @@ static void iounit_release_scsi_one(__u32 vaddr, unsigned long len, struct sbus_</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;iounit-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iounit_release_scsi_sgl(struct scatterlist *sg, int sz, struct sbus_bus *sbus)</div><div class='add'>+static void iounit_release_scsi_sgl(struct device *dev, struct scatterlist *sg, int sz)</div><div class='ctx'> {</div><div class='add'>+	struct iounit_struct *iounit = dev-&gt;archdata.iommu;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	unsigned long vaddr, len;</div><div class='del'>-	struct iounit_struct *iounit = sbus-&gt;ofdev.dev.archdata.iommu;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;iounit-&gt;lock, flags);</div><div class='ctx'> 	while (sz != 0) {</div><div class='hunk'>@@ -185,12 +197,12 @@ static void iounit_release_scsi_sgl(struct scatterlist *sg, int sz, struct sbus_</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SBUS</div><div class='del'>-static int iounit_map_dma_area(dma_addr_t *pba, unsigned long va, __u32 addr, int len)</div><div class='add'>+static int iounit_map_dma_area(struct device *dev, dma_addr_t *pba, unsigned long va, __u32 addr, int len)</div><div class='ctx'> {</div><div class='add'>+	struct iounit_struct *iounit = dev-&gt;archdata.iommu;</div><div class='ctx'> 	unsigned long page, end;</div><div class='ctx'> 	pgprot_t dvma_prot;</div><div class='ctx'> 	iopte_t *iopte;</div><div class='del'>-	struct sbus_bus *sbus;</div><div class='ctx'> </div><div class='ctx'> 	*pba = addr;</div><div class='ctx'> </div><div class='hunk'>@@ -212,12 +224,8 @@ static int iounit_map_dma_area(dma_addr_t *pba, unsigned long va, __u32 addr, in</div><div class='ctx'> 			</div><div class='ctx'> 			i = ((addr - IOUNIT_DMA_BASE) &gt;&gt; PAGE_SHIFT);</div><div class='ctx'> </div><div class='del'>-			for_each_sbus(sbus) {</div><div class='del'>-				struct iounit_struct *iounit = sbus-&gt;ofdev.dev.archdata.iommu;</div><div class='del'>-</div><div class='del'>-				iopte = (iopte_t *)(iounit-&gt;page_table + i);</div><div class='del'>-				*iopte = MKIOPTE(__pa(page));</div><div class='del'>-			}</div><div class='add'>+			iopte = (iopte_t *)(iounit-&gt;page_table + i);</div><div class='add'>+			*iopte = MKIOPTE(__pa(page));</div><div class='ctx'> 		}</div><div class='ctx'> 		addr += PAGE_SIZE;</div><div class='ctx'> 		va += PAGE_SIZE;</div><div class='hunk'>@@ -228,23 +236,10 @@ static int iounit_map_dma_area(dma_addr_t *pba, unsigned long va, __u32 addr, in</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iounit_unmap_dma_area(unsigned long addr, int len)</div><div class='add'>+static void iounit_unmap_dma_area(struct device *dev, unsigned long addr, int len)</div><div class='ctx'> {</div><div class='ctx'> 	/* XXX Somebody please fill this in */</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-/* XXX We do not pass sbus device here, bad. */</div><div class='del'>-static struct page *iounit_translate_dvma(unsigned long addr)</div><div class='del'>-{</div><div class='del'>-	struct sbus_bus *sbus = sbus_root;	/* They are all the same */</div><div class='del'>-	struct iounit_struct *iounit = sbus-&gt;ofdev.dev.archdata.iommu;</div><div class='del'>-	int i;</div><div class='del'>-	iopte_t *iopte;</div><div class='del'>-</div><div class='del'>-	i = ((addr - IOUNIT_DMA_BASE) &gt;&gt; PAGE_SHIFT);</div><div class='del'>-	iopte = (iopte_t *)(iounit-&gt;page_table + i);</div><div class='del'>-	return pfn_to_page(iopte_val(*iopte) &gt;&gt; (PAGE_SHIFT-4)); /* XXX sun4d guru, help */</div><div class='del'>-}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static char *iounit_lockarea(char *vaddr, unsigned long len)</div><div class='hunk'>@@ -271,54 +266,5 @@ void __init ld_mmu_iounit(void)</div><div class='ctx'> #ifdef CONFIG_SBUS</div><div class='ctx'> 	BTFIXUPSET_CALL(mmu_map_dma_area, iounit_map_dma_area, BTFIXUPCALL_NORM);</div><div class='ctx'> 	BTFIXUPSET_CALL(mmu_unmap_dma_area, iounit_unmap_dma_area, BTFIXUPCALL_NORM);</div><div class='del'>-	BTFIXUPSET_CALL(mmu_translate_dvma, iounit_translate_dvma, BTFIXUPCALL_NORM);</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-__u32 iounit_map_dma_init(struct sbus_bus *sbus, int size)</div><div class='del'>-{</div><div class='del'>-	int i, j, k, npages;</div><div class='del'>-	unsigned long rotor, scan, limit;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	__u32 ret;</div><div class='del'>-	struct iounit_struct *iounit = sbus-&gt;ofdev.dev.archdata.iommu;</div><div class='del'>-</div><div class='del'>-        npages = (size + (PAGE_SIZE-1)) &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	i = 0x0213;</div><div class='del'>-	spin_lock_irqsave(&amp;iounit-&gt;lock, flags);</div><div class='del'>-next:	j = (i &amp; 15);</div><div class='del'>-	rotor = iounit-&gt;rotor[j - 1];</div><div class='del'>-	limit = iounit-&gt;limit[j];</div><div class='del'>-	scan = rotor;</div><div class='del'>-nexti:	scan = find_next_zero_bit(iounit-&gt;bmap, limit, scan);</div><div class='del'>-	if (scan + npages &gt; limit) {</div><div class='del'>-		if (limit != rotor) {</div><div class='del'>-			limit = rotor;</div><div class='del'>-			scan = iounit-&gt;limit[j - 1];</div><div class='del'>-			goto nexti;</div><div class='del'>-		}</div><div class='del'>-		i &gt;&gt;= 4;</div><div class='del'>-		if (!(i &amp; 15))</div><div class='del'>-			panic("iounit_map_dma_init: Couldn't find free iopte slots for %d bytes\n", size);</div><div class='del'>-		goto next;</div><div class='del'>-	}</div><div class='del'>-	for (k = 1, scan++; k &lt; npages; k++)</div><div class='del'>-		if (test_bit(scan++, iounit-&gt;bmap))</div><div class='del'>-			goto nexti;</div><div class='del'>-	iounit-&gt;rotor[j - 1] = (scan &lt; limit) ? scan : iounit-&gt;limit[j - 1];</div><div class='del'>-	scan -= npages;</div><div class='del'>-	ret = IOUNIT_DMA_BASE + (scan &lt;&lt; PAGE_SHIFT);</div><div class='del'>-	for (k = 0; k &lt; npages; k++, scan++)</div><div class='del'>-		set_bit(scan, iounit-&gt;bmap);</div><div class='del'>-	spin_unlock_irqrestore(&amp;iounit-&gt;lock, flags);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-__u32 iounit_map_dma_page(__u32 vaddr, void *addr, struct sbus_bus *sbus)</div><div class='del'>-{</div><div class='del'>-	int scan = (vaddr - IOUNIT_DMA_BASE) &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	struct iounit_struct *iounit = sbus-&gt;ofdev.dev.archdata.iommu;</div><div class='del'>-	</div><div class='del'>-	iounit-&gt;page_table[scan] = MKIOPTE(__pa(((unsigned long)addr) &amp; PAGE_MASK));</div><div class='del'>-	return vaddr + (((unsigned long)addr) &amp; ~PAGE_MASK);</div><div class='del'>-}</div><div class='head'>diff --git a/arch/sparc/mm/iommu.c b/arch/sparc/mm/iommu.c<br/>index 4b934270f05e..e7a499e3aa3c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/mm/iommu.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/mm/iommu.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/mm/iommu.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/mm/iommu.c</a></div><div class='hunk'>@@ -13,10 +13,11 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/highmem.h&gt;	/* pte_offset_map =&gt; kmap_atomic */</div><div class='ctx'> #include &lt;linux/scatterlist.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/pgalloc.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='del'>-#include &lt;asm/sbus.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/mxcc.h&gt;</div><div class='ctx'> #include &lt;asm/mbus.h&gt;</div><div class='hunk'>@@ -55,30 +56,21 @@ static pgprot_t dvma_prot;		/* Consistent mapping pte flags */</div><div class='ctx'> #define IOPERM        (IOPTE_CACHE | IOPTE_WRITE | IOPTE_VALID)</div><div class='ctx'> #define MKIOPTE(pfn, perm) (((((pfn)&lt;&lt;8) &amp; IOPTE_PAGE) | (perm)) &amp; ~IOPTE_WAZ)</div><div class='ctx'> </div><div class='del'>-void __init</div><div class='del'>-iommu_init(int iommund, struct sbus_bus *sbus)</div><div class='add'>+static void __init sbus_iommu_init(struct of_device *op)</div><div class='ctx'> {</div><div class='del'>-	unsigned int impl, vers;</div><div class='del'>-	unsigned long tmp;</div><div class='ctx'> 	struct iommu_struct *iommu;</div><div class='del'>-	struct linux_prom_registers iommu_promregs[PROMREG_MAX];</div><div class='del'>-	struct resource r;</div><div class='add'>+	unsigned int impl, vers;</div><div class='ctx'> 	unsigned long *bitmap;</div><div class='add'>+	unsigned long tmp;</div><div class='ctx'> </div><div class='ctx'> 	iommu = kmalloc(sizeof(struct iommu_struct), GFP_ATOMIC);</div><div class='ctx'> 	if (!iommu) {</div><div class='ctx'> 		prom_printf("Unable to allocate iommu structure\n");</div><div class='ctx'> 		prom_halt();</div><div class='ctx'> 	}</div><div class='del'>-	iommu-&gt;regs = NULL;</div><div class='del'>-	if (prom_getproperty(iommund, "reg", (void *) iommu_promregs,</div><div class='del'>-			 sizeof(iommu_promregs)) != -1) {</div><div class='del'>-		memset(&amp;r, 0, sizeof(r));</div><div class='del'>-		r.flags = iommu_promregs[0].which_io;</div><div class='del'>-		r.start = iommu_promregs[0].phys_addr;</div><div class='del'>-		iommu-&gt;regs = (struct iommu_regs *)</div><div class='del'>-			sbus_ioremap(&amp;r, 0, PAGE_SIZE * 3, "iommu_regs");</div><div class='del'>-	}</div><div class='add'>+</div><div class='add'>+	iommu-&gt;regs = of_ioremap(&amp;op-&gt;resource[0], 0, PAGE_SIZE * 3,</div><div class='add'>+				 "iommu_regs");</div><div class='ctx'> 	if (!iommu-&gt;regs) {</div><div class='ctx'> 		prom_printf("Cannot map IOMMU registers\n");</div><div class='ctx'> 		prom_halt();</div><div class='hunk'>@@ -128,13 +120,29 @@ iommu_init(int iommund, struct sbus_bus *sbus)</div><div class='ctx'> 	else</div><div class='ctx'> 		iommu-&gt;usemap.num_colors = 1;</div><div class='ctx'> </div><div class='del'>-	printk("IOMMU: impl %d vers %d table 0x%p[%d B] map [%d b]\n",</div><div class='del'>-	    impl, vers, iommu-&gt;page_table,</div><div class='del'>-	    (int)(IOMMU_NPTES*sizeof(iopte_t)), (int)IOMMU_NPTES);</div><div class='add'>+	printk(KERN_INFO "IOMMU: impl %d vers %d table 0x%p[%d B] map [%d b]\n",</div><div class='add'>+	       impl, vers, iommu-&gt;page_table,</div><div class='add'>+	       (int)(IOMMU_NPTES*sizeof(iopte_t)), (int)IOMMU_NPTES);</div><div class='add'>+</div><div class='add'>+	op-&gt;dev.archdata.iommu = iommu;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init iommu_init(void)</div><div class='add'>+{</div><div class='add'>+	struct device_node *dp;</div><div class='add'>+</div><div class='add'>+	for_each_node_by_name(dp, "iommu") {</div><div class='add'>+		struct of_device *op = of_find_device_by_node(dp);</div><div class='add'>+</div><div class='add'>+		sbus_iommu_init(op);</div><div class='add'>+		of_propagate_archdata(op);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	sbus-&gt;ofdev.dev.archdata.iommu = iommu;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+subsys_initcall(iommu_init);</div><div class='add'>+</div><div class='ctx'> /* This begs to be btfixup-ed by srmmu. */</div><div class='ctx'> /* Flush the iotlb entries to ram. */</div><div class='ctx'> /* This could be better if we didn't have to flush whole pages. */</div><div class='hunk'>@@ -164,9 +172,9 @@ static void iommu_flush_iotlb(iopte_t *iopte, unsigned int niopte)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 iommu_get_one(struct page *page, int npages, struct sbus_bus *sbus)</div><div class='add'>+static u32 iommu_get_one(struct device *dev, struct page *page, int npages)</div><div class='ctx'> {</div><div class='del'>-	struct iommu_struct *iommu = sbus-&gt;ofdev.dev.archdata.iommu;</div><div class='add'>+	struct iommu_struct *iommu = dev-&gt;archdata.iommu;</div><div class='ctx'> 	int ioptex;</div><div class='ctx'> 	iopte_t *iopte, *iopte0;</div><div class='ctx'> 	unsigned int busa, busa0;</div><div class='hunk'>@@ -194,8 +202,7 @@ static u32 iommu_get_one(struct page *page, int npages, struct sbus_bus *sbus)</div><div class='ctx'> 	return busa0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 iommu_get_scsi_one(char *vaddr, unsigned int len,</div><div class='del'>-    struct sbus_bus *sbus)</div><div class='add'>+static u32 iommu_get_scsi_one(struct device *dev, char *vaddr, unsigned int len)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long off;</div><div class='ctx'> 	int npages;</div><div class='hunk'>@@ -205,22 +212,22 @@ static u32 iommu_get_scsi_one(char *vaddr, unsigned int len,</div><div class='ctx'> 	off = (unsigned long)vaddr &amp; ~PAGE_MASK;</div><div class='ctx'> 	npages = (off + len + PAGE_SIZE-1) &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> 	page = virt_to_page((unsigned long)vaddr &amp; PAGE_MASK);</div><div class='del'>-	busa = iommu_get_one(page, npages, sbus);</div><div class='add'>+	busa = iommu_get_one(dev, page, npages);</div><div class='ctx'> 	return busa + off;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static __u32 iommu_get_scsi_one_noflush(char *vaddr, unsigned long len, struct sbus_bus *sbus)</div><div class='add'>+static __u32 iommu_get_scsi_one_noflush(struct device *dev, char *vaddr, unsigned long len)</div><div class='ctx'> {</div><div class='del'>-	return iommu_get_scsi_one(vaddr, len, sbus);</div><div class='add'>+	return iommu_get_scsi_one(dev, vaddr, len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static __u32 iommu_get_scsi_one_gflush(char *vaddr, unsigned long len, struct sbus_bus *sbus)</div><div class='add'>+static __u32 iommu_get_scsi_one_gflush(struct device *dev, char *vaddr, unsigned long len)</div><div class='ctx'> {</div><div class='ctx'> 	flush_page_for_dma(0);</div><div class='del'>-	return iommu_get_scsi_one(vaddr, len, sbus);</div><div class='add'>+	return iommu_get_scsi_one(dev, vaddr, len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static __u32 iommu_get_scsi_one_pflush(char *vaddr, unsigned long len, struct sbus_bus *sbus)</div><div class='add'>+static __u32 iommu_get_scsi_one_pflush(struct device *dev, char *vaddr, unsigned long len)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long page = ((unsigned long) vaddr) &amp; PAGE_MASK;</div><div class='ctx'> </div><div class='hunk'>@@ -228,23 +235,23 @@ static __u32 iommu_get_scsi_one_pflush(char *vaddr, unsigned long len, struct sb</div><div class='ctx'> 		flush_page_for_dma(page);</div><div class='ctx'> 		page += PAGE_SIZE;</div><div class='ctx'> 	}</div><div class='del'>-	return iommu_get_scsi_one(vaddr, len, sbus);</div><div class='add'>+	return iommu_get_scsi_one(dev, vaddr, len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iommu_get_scsi_sgl_noflush(struct scatterlist *sg, int sz, struct sbus_bus *sbus)</div><div class='add'>+static void iommu_get_scsi_sgl_noflush(struct device *dev, struct scatterlist *sg, int sz)</div><div class='ctx'> {</div><div class='ctx'> 	int n;</div><div class='ctx'> </div><div class='ctx'> 	while (sz != 0) {</div><div class='ctx'> 		--sz;</div><div class='ctx'> 		n = (sg-&gt;length + sg-&gt;offset + PAGE_SIZE-1) &gt;&gt; PAGE_SHIFT;</div><div class='del'>-		sg-&gt;dvma_address = iommu_get_one(sg_page(sg), n, sbus) + sg-&gt;offset;</div><div class='add'>+		sg-&gt;dvma_address = iommu_get_one(dev, sg_page(sg), n) + sg-&gt;offset;</div><div class='ctx'> 		sg-&gt;dvma_length = (__u32) sg-&gt;length;</div><div class='ctx'> 		sg = sg_next(sg);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iommu_get_scsi_sgl_gflush(struct scatterlist *sg, int sz, struct sbus_bus *sbus)</div><div class='add'>+static void iommu_get_scsi_sgl_gflush(struct device *dev, struct scatterlist *sg, int sz)</div><div class='ctx'> {</div><div class='ctx'> 	int n;</div><div class='ctx'> </div><div class='hunk'>@@ -252,13 +259,13 @@ static void iommu_get_scsi_sgl_gflush(struct scatterlist *sg, int sz, struct sbu</div><div class='ctx'> 	while (sz != 0) {</div><div class='ctx'> 		--sz;</div><div class='ctx'> 		n = (sg-&gt;length + sg-&gt;offset + PAGE_SIZE-1) &gt;&gt; PAGE_SHIFT;</div><div class='del'>-		sg-&gt;dvma_address = iommu_get_one(sg_page(sg), n, sbus) + sg-&gt;offset;</div><div class='add'>+		sg-&gt;dvma_address = iommu_get_one(dev, sg_page(sg), n) + sg-&gt;offset;</div><div class='ctx'> 		sg-&gt;dvma_length = (__u32) sg-&gt;length;</div><div class='ctx'> 		sg = sg_next(sg);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iommu_get_scsi_sgl_pflush(struct scatterlist *sg, int sz, struct sbus_bus *sbus)</div><div class='add'>+static void iommu_get_scsi_sgl_pflush(struct device *dev, struct scatterlist *sg, int sz)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long page, oldpage = 0;</div><div class='ctx'> 	int n, i;</div><div class='hunk'>@@ -283,15 +290,15 @@ static void iommu_get_scsi_sgl_pflush(struct scatterlist *sg, int sz, struct sbu</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		sg-&gt;dvma_address = iommu_get_one(sg_page(sg), n, sbus) + sg-&gt;offset;</div><div class='add'>+		sg-&gt;dvma_address = iommu_get_one(dev, sg_page(sg), n) + sg-&gt;offset;</div><div class='ctx'> 		sg-&gt;dvma_length = (__u32) sg-&gt;length;</div><div class='ctx'> 		sg = sg_next(sg);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iommu_release_one(u32 busa, int npages, struct sbus_bus *sbus)</div><div class='add'>+static void iommu_release_one(struct device *dev, u32 busa, int npages)</div><div class='ctx'> {</div><div class='del'>-	struct iommu_struct *iommu = sbus-&gt;ofdev.dev.archdata.iommu;</div><div class='add'>+	struct iommu_struct *iommu = dev-&gt;archdata.iommu;</div><div class='ctx'> 	int ioptex;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -305,17 +312,17 @@ static void iommu_release_one(u32 busa, int npages, struct sbus_bus *sbus)</div><div class='ctx'> 	bit_map_clear(&amp;iommu-&gt;usemap, ioptex, npages);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iommu_release_scsi_one(__u32 vaddr, unsigned long len, struct sbus_bus *sbus)</div><div class='add'>+static void iommu_release_scsi_one(struct device *dev, __u32 vaddr, unsigned long len)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long off;</div><div class='ctx'> 	int npages;</div><div class='ctx'> </div><div class='ctx'> 	off = vaddr &amp; ~PAGE_MASK;</div><div class='ctx'> 	npages = (off + len + PAGE_SIZE-1) &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	iommu_release_one(vaddr &amp; PAGE_MASK, npages, sbus);</div><div class='add'>+	iommu_release_one(dev, vaddr &amp; PAGE_MASK, npages);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iommu_release_scsi_sgl(struct scatterlist *sg, int sz, struct sbus_bus *sbus)</div><div class='add'>+static void iommu_release_scsi_sgl(struct device *dev, struct scatterlist *sg, int sz)</div><div class='ctx'> {</div><div class='ctx'> 	int n;</div><div class='ctx'> </div><div class='hunk'>@@ -323,18 +330,18 @@ static void iommu_release_scsi_sgl(struct scatterlist *sg, int sz, struct sbus_b</div><div class='ctx'> 		--sz;</div><div class='ctx'> </div><div class='ctx'> 		n = (sg-&gt;length + sg-&gt;offset + PAGE_SIZE-1) &gt;&gt; PAGE_SHIFT;</div><div class='del'>-		iommu_release_one(sg-&gt;dvma_address &amp; PAGE_MASK, n, sbus);</div><div class='add'>+		iommu_release_one(dev, sg-&gt;dvma_address &amp; PAGE_MASK, n);</div><div class='ctx'> 		sg-&gt;dvma_address = 0x21212121;</div><div class='ctx'> 		sg = sg_next(sg);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SBUS</div><div class='del'>-static int iommu_map_dma_area(dma_addr_t *pba, unsigned long va,</div><div class='del'>-    unsigned long addr, int len)</div><div class='add'>+static int iommu_map_dma_area(struct device *dev, dma_addr_t *pba, unsigned long va,</div><div class='add'>+			      unsigned long addr, int len)</div><div class='ctx'> {</div><div class='add'>+	struct iommu_struct *iommu = dev-&gt;archdata.iommu;</div><div class='ctx'> 	unsigned long page, end;</div><div class='del'>-	struct iommu_struct *iommu = sbus_root-&gt;ofdev.dev.archdata.iommu;</div><div class='ctx'> 	iopte_t *iopte = iommu-&gt;page_table;</div><div class='ctx'> 	iopte_t *first;</div><div class='ctx'> 	int ioptex;</div><div class='hunk'>@@ -397,9 +404,9 @@ static int iommu_map_dma_area(dma_addr_t *pba, unsigned long va,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iommu_unmap_dma_area(unsigned long busa, int len)</div><div class='add'>+static void iommu_unmap_dma_area(struct device *dev, unsigned long busa, int len)</div><div class='ctx'> {</div><div class='del'>-	struct iommu_struct *iommu = sbus_root-&gt;ofdev.dev.archdata.iommu;</div><div class='add'>+	struct iommu_struct *iommu = dev-&gt;archdata.iommu;</div><div class='ctx'> 	iopte_t *iopte = iommu-&gt;page_table;</div><div class='ctx'> 	unsigned long end;</div><div class='ctx'> 	int ioptex = (busa - iommu-&gt;start) &gt;&gt; PAGE_SHIFT;</div><div class='hunk'>@@ -417,15 +424,6 @@ static void iommu_unmap_dma_area(unsigned long busa, int len)</div><div class='ctx'> 	iommu_invalidate(iommu-&gt;regs);</div><div class='ctx'> 	bit_map_clear(&amp;iommu-&gt;usemap, ioptex, len &gt;&gt; PAGE_SHIFT);</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-static struct page *iommu_translate_dvma(unsigned long busa)</div><div class='del'>-{</div><div class='del'>-	struct iommu_struct *iommu = sbus_root-&gt;ofdev.dev.archdata.iommu;</div><div class='del'>-	iopte_t *iopte = iommu-&gt;page_table;</div><div class='del'>-</div><div class='del'>-	iopte += ((busa - iommu-&gt;start) &gt;&gt; PAGE_SHIFT);</div><div class='del'>-	return pfn_to_page((iopte_val(*iopte) &amp; IOPTE_PAGE) &gt;&gt; (PAGE_SHIFT-4));</div><div class='del'>-}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static char *iommu_lockarea(char *vaddr, unsigned long len)</div><div class='hunk'>@@ -461,7 +459,6 @@ void __init ld_mmu_iommu(void)</div><div class='ctx'> #ifdef CONFIG_SBUS</div><div class='ctx'> 	BTFIXUPSET_CALL(mmu_map_dma_area, iommu_map_dma_area, BTFIXUPCALL_NORM);</div><div class='ctx'> 	BTFIXUPSET_CALL(mmu_unmap_dma_area, iommu_unmap_dma_area, BTFIXUPCALL_NORM);</div><div class='del'>-	BTFIXUPSET_CALL(mmu_translate_dvma, iommu_translate_dvma, BTFIXUPCALL_NORM);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	if (viking_mxcc_present || srmmu_modtype == HyperSparc) {</div><div class='head'>diff --git a/arch/sparc/mm/nosrmmu.c b/arch/sparc/mm/nosrmmu.c<br/>deleted file mode 100644<br/>index 3701f70fc30a..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/mm/nosrmmu.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/mm/nosrmmu.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,59 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * nosrmmu.c: This file is a bunch of dummies for sun4 compiles, </div><div class='del'>- *         so that it does not need srmmu and avoid ifdefs.</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz)</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;asm/mbus.h&gt;</div><div class='del'>-#include &lt;asm/sbus.h&gt;</div><div class='del'>-</div><div class='del'>-static char shouldnothappen[] __initdata = "SUN4 kernel can only run on SUN4\n";</div><div class='del'>-</div><div class='del'>-enum mbus_module srmmu_modtype;</div><div class='del'>-void *srmmu_nocache_pool;</div><div class='del'>-</div><div class='del'>-int vac_cache_size = 0;</div><div class='del'>-</div><div class='del'>-static void __init should_not_happen(void)</div><div class='del'>-{</div><div class='del'>-	prom_printf(shouldnothappen);</div><div class='del'>-	prom_halt();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __init srmmu_frob_mem_map(unsigned long start_mem)</div><div class='del'>-{</div><div class='del'>-	should_not_happen();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-unsigned long __init srmmu_paging_init(unsigned long start_mem, unsigned long end_mem)</div><div class='del'>-{</div><div class='del'>-	should_not_happen();</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __init ld_mmu_srmmu(void)</div><div class='del'>-{</div><div class='del'>-	should_not_happen();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void srmmu_mapioaddr(unsigned long physaddr, unsigned long virt_addr, int bus_type, int rdonly)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void srmmu_unmapioaddr(unsigned long virt_addr)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-__u32 iounit_map_dma_init(struct sbus_bus *sbus, int size)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-__u32 iounit_map_dma_page(__u32 vaddr, void *addr, struct sbus_bus *sbus)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/arch/sparc/mm/srmmu.c b/arch/sparc/mm/srmmu.c<br/>index ee30462598fc..6a5d7cabc044 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/mm/srmmu.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/mm/srmmu.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/mm/srmmu.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/mm/srmmu.c</a></div><div class='hunk'>@@ -31,7 +31,6 @@</div><div class='ctx'> #include &lt;asm/mbus.h&gt;</div><div class='ctx'> #include &lt;asm/cache.h&gt;</div><div class='ctx'> #include &lt;asm/oplib.h&gt;</div><div class='del'>-#include &lt;asm/sbus.h&gt;</div><div class='ctx'> #include &lt;asm/asi.h&gt;</div><div class='ctx'> #include &lt;asm/msi.h&gt;</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='head'>diff --git a/arch/sparc/mm/sun4c.c b/arch/sparc/mm/sun4c.c<br/>index d1782f6368be..fe65aeeb3947 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/mm/sun4c.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/mm/sun4c.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/mm/sun4c.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/mm/sun4c.c</a></div><div class='hunk'>@@ -31,7 +31,6 @@</div><div class='ctx'> #include &lt;asm/oplib.h&gt;</div><div class='ctx'> #include &lt;asm/openprom.h&gt;</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='del'>-#include &lt;asm/sun4paddr.h&gt;</div><div class='ctx'> #include &lt;asm/highmem.h&gt;</div><div class='ctx'> #include &lt;asm/btfixup.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='hunk'>@@ -52,15 +51,11 @@ extern int num_segmaps, num_contexts;</div><div class='ctx'> </div><div class='ctx'> extern unsigned long page_kernel;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SUN4</div><div class='del'>-#define SUN4C_VAC_SIZE sun4c_vacinfo.num_bytes</div><div class='del'>-#else</div><div class='ctx'> /* That's it, we prom_halt() on sun4c if the cache size is something other than 65536.</div><div class='ctx'>  * So let's save some cycles and just use that everywhere except for that bootup</div><div class='ctx'>  * sanity check.</div><div class='ctx'>  */</div><div class='ctx'> #define SUN4C_VAC_SIZE 65536</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> #define SUN4C_KERNEL_BUCKETS 32</div><div class='ctx'> </div><div class='hunk'>@@ -285,75 +280,32 @@ void __init sun4c_probe_vac(void)</div><div class='ctx'> {</div><div class='ctx'> 	sun4c_disable_vac();</div><div class='ctx'> </div><div class='del'>-	if (ARCH_SUN4) {</div><div class='del'>-		switch (idprom-&gt;id_machtype) {</div><div class='del'>-</div><div class='del'>-		case (SM_SUN4|SM_4_110):</div><div class='del'>-			sun4c_vacinfo.type = VAC_NONE;</div><div class='del'>-			sun4c_vacinfo.num_bytes = 0;</div><div class='del'>-			sun4c_vacinfo.linesize = 0;</div><div class='del'>-			sun4c_vacinfo.do_hwflushes = 0;</div><div class='del'>-			prom_printf("No VAC. Get some bucks and buy a real computer.");</div><div class='del'>-			prom_halt();</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case (SM_SUN4|SM_4_260):</div><div class='del'>-			sun4c_vacinfo.type = VAC_WRITE_BACK;</div><div class='del'>-			sun4c_vacinfo.num_bytes = 128 * 1024;</div><div class='del'>-			sun4c_vacinfo.linesize = 16;</div><div class='del'>-			sun4c_vacinfo.do_hwflushes = 0;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case (SM_SUN4|SM_4_330):</div><div class='del'>-			sun4c_vacinfo.type = VAC_WRITE_THROUGH;</div><div class='del'>-			sun4c_vacinfo.num_bytes = 128 * 1024;</div><div class='del'>-			sun4c_vacinfo.linesize = 16;</div><div class='del'>-			sun4c_vacinfo.do_hwflushes = 0;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case (SM_SUN4|SM_4_470):</div><div class='del'>-			sun4c_vacinfo.type = VAC_WRITE_BACK;</div><div class='del'>-			sun4c_vacinfo.num_bytes = 128 * 1024;</div><div class='del'>-			sun4c_vacinfo.linesize = 32;</div><div class='del'>-			sun4c_vacinfo.do_hwflushes = 0;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		default:</div><div class='del'>-			prom_printf("Cannot initialize VAC - weird sun4 model idprom-&gt;id_machtype = %d", idprom-&gt;id_machtype);</div><div class='del'>-			prom_halt();</div><div class='del'>-		};</div><div class='add'>+	if ((idprom-&gt;id_machtype == (SM_SUN4C | SM_4C_SS1)) ||</div><div class='add'>+	    (idprom-&gt;id_machtype == (SM_SUN4C | SM_4C_SS1PLUS))) {</div><div class='add'>+		/* PROM on SS1 lacks this info, to be super safe we</div><div class='add'>+		 * hard code it here since this arch is cast in stone.</div><div class='add'>+		 */</div><div class='add'>+		sun4c_vacinfo.num_bytes = 65536;</div><div class='add'>+		sun4c_vacinfo.linesize = 16;</div><div class='ctx'> 	} else {</div><div class='del'>-		sun4c_vacinfo.type = VAC_WRITE_THROUGH;</div><div class='add'>+		sun4c_vacinfo.num_bytes =</div><div class='add'>+		 prom_getintdefault(prom_root_node, "vac-size", 65536);</div><div class='add'>+		sun4c_vacinfo.linesize =</div><div class='add'>+		 prom_getintdefault(prom_root_node, "vac-linesize", 16);</div><div class='add'>+	}</div><div class='add'>+	sun4c_vacinfo.do_hwflushes =</div><div class='add'>+	 prom_getintdefault(prom_root_node, "vac-hwflush", 0);</div><div class='ctx'> </div><div class='del'>-		if ((idprom-&gt;id_machtype == (SM_SUN4C | SM_4C_SS1)) ||</div><div class='del'>-		    (idprom-&gt;id_machtype == (SM_SUN4C | SM_4C_SS1PLUS))) {</div><div class='del'>-			/* PROM on SS1 lacks this info, to be super safe we</div><div class='del'>-			 * hard code it here since this arch is cast in stone.</div><div class='del'>-			 */</div><div class='del'>-			sun4c_vacinfo.num_bytes = 65536;</div><div class='del'>-			sun4c_vacinfo.linesize = 16;</div><div class='del'>-		} else {</div><div class='del'>-			sun4c_vacinfo.num_bytes =</div><div class='del'>-			 prom_getintdefault(prom_root_node, "vac-size", 65536);</div><div class='del'>-			sun4c_vacinfo.linesize =</div><div class='del'>-			 prom_getintdefault(prom_root_node, "vac-linesize", 16);</div><div class='del'>-		}</div><div class='add'>+	if (sun4c_vacinfo.do_hwflushes == 0)</div><div class='ctx'> 		sun4c_vacinfo.do_hwflushes =</div><div class='del'>-		 prom_getintdefault(prom_root_node, "vac-hwflush", 0);</div><div class='del'>-</div><div class='del'>-		if (sun4c_vacinfo.do_hwflushes == 0)</div><div class='del'>-			sun4c_vacinfo.do_hwflushes =</div><div class='del'>-			 prom_getintdefault(prom_root_node, "vac_hwflush", 0);</div><div class='add'>+		 prom_getintdefault(prom_root_node, "vac_hwflush", 0);</div><div class='ctx'> </div><div class='del'>-		if (sun4c_vacinfo.num_bytes != 65536) {</div><div class='del'>-			prom_printf("WEIRD Sun4C VAC cache size, "</div><div class='del'>-				    "tell sparclinux@vger.kernel.org");</div><div class='del'>-			prom_halt();</div><div class='del'>-		}</div><div class='add'>+	if (sun4c_vacinfo.num_bytes != 65536) {</div><div class='add'>+		prom_printf("WEIRD Sun4C VAC cache size, "</div><div class='add'>+			    "tell sparclinux@vger.kernel.org");</div><div class='add'>+		prom_halt();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	sun4c_vacinfo.num_lines =</div><div class='del'>-		(sun4c_vacinfo.num_bytes / sun4c_vacinfo.linesize);</div><div class='ctx'> 	switch (sun4c_vacinfo.linesize) {</div><div class='ctx'> 	case 16:</div><div class='ctx'> 		sun4c_vacinfo.log2lsize = 4;</div><div class='hunk'>@@ -447,49 +399,18 @@ static void __init patch_kernel_fault_handler(void)</div><div class='ctx'> </div><div class='ctx'> static void __init sun4c_probe_mmu(void)</div><div class='ctx'> {</div><div class='del'>-	if (ARCH_SUN4) {</div><div class='del'>-		switch (idprom-&gt;id_machtype) {</div><div class='del'>-		case (SM_SUN4|SM_4_110):</div><div class='del'>-			prom_printf("No support for 4100 yet\n");</div><div class='del'>-			prom_halt();</div><div class='del'>-			num_segmaps = 256;</div><div class='del'>-			num_contexts = 8;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case (SM_SUN4|SM_4_260):</div><div class='del'>-			/* should be 512 segmaps. when it get fixed */</div><div class='del'>-			num_segmaps = 256;</div><div class='del'>-			num_contexts = 16;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case (SM_SUN4|SM_4_330):</div><div class='del'>-			num_segmaps = 256;</div><div class='del'>-			num_contexts = 16;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case (SM_SUN4|SM_4_470):</div><div class='del'>-			/* should be 1024 segmaps. when it get fixed */</div><div class='del'>-			num_segmaps = 256;</div><div class='del'>-			num_contexts = 64;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			prom_printf("Invalid SUN4 model\n");</div><div class='del'>-			prom_halt();</div><div class='del'>-		};</div><div class='add'>+	if ((idprom-&gt;id_machtype == (SM_SUN4C | SM_4C_SS1)) ||</div><div class='add'>+	    (idprom-&gt;id_machtype == (SM_SUN4C | SM_4C_SS1PLUS))) {</div><div class='add'>+		/* Hardcode these just to be safe, PROM on SS1 does</div><div class='add'>+		* not have this info available in the root node.</div><div class='add'>+		*/</div><div class='add'>+		num_segmaps = 128;</div><div class='add'>+		num_contexts = 8;</div><div class='ctx'> 	} else {</div><div class='del'>-		if ((idprom-&gt;id_machtype == (SM_SUN4C | SM_4C_SS1)) ||</div><div class='del'>-		    (idprom-&gt;id_machtype == (SM_SUN4C | SM_4C_SS1PLUS))) {</div><div class='del'>-			/* Hardcode these just to be safe, PROM on SS1 does</div><div class='del'>-		 	* not have this info available in the root node.</div><div class='del'>-		 	*/</div><div class='del'>-			num_segmaps = 128;</div><div class='del'>-			num_contexts = 8;</div><div class='del'>-		} else {</div><div class='del'>-			num_segmaps =</div><div class='del'>-			    prom_getintdefault(prom_root_node, "mmu-npmg", 128);</div><div class='del'>-			num_contexts =</div><div class='del'>-			    prom_getintdefault(prom_root_node, "mmu-nctx", 0x8);</div><div class='del'>-		}</div><div class='add'>+		num_segmaps =</div><div class='add'>+		    prom_getintdefault(prom_root_node, "mmu-npmg", 128);</div><div class='add'>+		num_contexts =</div><div class='add'>+		    prom_getintdefault(prom_root_node, "mmu-nctx", 0x8);</div><div class='ctx'> 	}</div><div class='ctx'> 	patch_kernel_fault_handler();</div><div class='ctx'> }</div><div class='hunk'>@@ -501,18 +422,14 @@ void __init sun4c_probe_memerr_reg(void)</div><div class='ctx'> 	int node;</div><div class='ctx'> 	struct linux_prom_registers regs[1];</div><div class='ctx'> </div><div class='del'>-	if (ARCH_SUN4) {</div><div class='del'>-		sun4c_memerr_reg = ioremap(sun4_memreg_physaddr, PAGE_SIZE);</div><div class='del'>-	} else {</div><div class='del'>-		node = prom_getchild(prom_root_node);</div><div class='del'>-		node = prom_searchsiblings(prom_root_node, "memory-error");</div><div class='del'>-		if (!node)</div><div class='del'>-			return;</div><div class='del'>-		if (prom_getproperty(node, "reg", (char *)regs, sizeof(regs)) &lt;= 0)</div><div class='del'>-			return;</div><div class='del'>-		/* hmm I think regs[0].which_io is zero here anyways */</div><div class='del'>-		sun4c_memerr_reg = ioremap(regs[0].phys_addr, regs[0].reg_size);</div><div class='del'>-	}</div><div class='add'>+	node = prom_getchild(prom_root_node);</div><div class='add'>+	node = prom_searchsiblings(prom_root_node, "memory-error");</div><div class='add'>+	if (!node)</div><div class='add'>+		return;</div><div class='add'>+	if (prom_getproperty(node, "reg", (char *)regs, sizeof(regs)) &lt;= 0)</div><div class='add'>+		return;</div><div class='add'>+	/* hmm I think regs[0].which_io is zero here anyways */</div><div class='add'>+	sun4c_memerr_reg = ioremap(regs[0].phys_addr, regs[0].reg_size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void sun4c_init_ss2_cache_bug(void)</div><div class='hunk'>@@ -521,7 +438,6 @@ static inline void sun4c_init_ss2_cache_bug(void)</div><div class='ctx'> </div><div class='ctx'> 	if ((idprom-&gt;id_machtype == (SM_SUN4C | SM_4C_SS2)) ||</div><div class='ctx'> 	    (idprom-&gt;id_machtype == (SM_SUN4C | SM_4C_IPX)) ||</div><div class='del'>-	    (idprom-&gt;id_machtype == (SM_SUN4 | SM_4_330)) ||</div><div class='ctx'> 	    (idprom-&gt;id_machtype == (SM_SUN4C | SM_4C_ELC))) {</div><div class='ctx'> 		/* Whee.. */</div><div class='ctx'> 		printk("SS2 cache bug detected, uncaching trap table page\n");</div><div class='hunk'>@@ -532,8 +448,8 @@ static inline void sun4c_init_ss2_cache_bug(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Addr is always aligned on a page boundary for us already. */</div><div class='del'>-static int sun4c_map_dma_area(dma_addr_t *pba, unsigned long va,</div><div class='del'>-    unsigned long addr, int len)</div><div class='add'>+static int sun4c_map_dma_area(struct device *dev, dma_addr_t *pba, unsigned long va,</div><div class='add'>+			      unsigned long addr, int len)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long page, end;</div><div class='ctx'> </div><div class='hunk'>@@ -555,14 +471,7 @@ static int sun4c_map_dma_area(dma_addr_t *pba, unsigned long va,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct page *sun4c_translate_dvma(unsigned long busa)</div><div class='del'>-{</div><div class='del'>-	/* Fortunately for us, bus_addr == uncached_virt in sun4c. */</div><div class='del'>-	unsigned long pte = sun4c_get_pte(busa);</div><div class='del'>-	return pfn_to_page(pte &amp; SUN4C_PFN_MASK);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void sun4c_unmap_dma_area(unsigned long busa, int len)</div><div class='add'>+static void sun4c_unmap_dma_area(struct device *dev, unsigned long busa, int len)</div><div class='ctx'> {</div><div class='ctx'> 	/* Fortunately for us, bus_addr == uncached_virt in sun4c. */</div><div class='ctx'> 	/* XXX Implement this */</div><div class='hunk'>@@ -624,11 +533,7 @@ static inline void sun4c_init_map_kernelprom(unsigned long kernel_end)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long vaddr;</div><div class='ctx'> 	unsigned char pseg, ctx;</div><div class='del'>-#ifdef CONFIG_SUN4</div><div class='del'>-	/* sun4/110 and 260 have no kadb. */</div><div class='del'>-	if ((idprom-&gt;id_machtype != (SM_SUN4 | SM_4_260)) &amp;&amp; </div><div class='del'>-	    (idprom-&gt;id_machtype != (SM_SUN4 | SM_4_110))) {</div><div class='del'>-#endif</div><div class='add'>+</div><div class='ctx'> 	for (vaddr = KADB_DEBUGGER_BEGVM;</div><div class='ctx'> 	     vaddr &lt; LINUX_OPPROM_ENDVM;</div><div class='ctx'> 	     vaddr += SUN4C_REAL_PGDIR_SIZE) {</div><div class='hunk'>@@ -640,9 +545,7 @@ static inline void sun4c_init_map_kernelprom(unsigned long kernel_end)</div><div class='ctx'> 			fix_permissions(vaddr, _SUN4C_PAGE_PRIV, 0);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-#ifdef CONFIG_SUN4</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='add'>+</div><div class='ctx'> 	for (vaddr = KERNBASE; vaddr &lt; kernel_end; vaddr += SUN4C_REAL_PGDIR_SIZE) {</div><div class='ctx'> 		pseg = sun4c_get_segmap(vaddr);</div><div class='ctx'> 		mmu_entry_pool[pseg].locked = 1;</div><div class='hunk'>@@ -1048,14 +951,10 @@ static struct thread_info *sun4c_alloc_thread_info(void)</div><div class='ctx'> 	 * so we must flush the cache to guarantee consistency.</div><div class='ctx'> 	 */</div><div class='ctx'> 	sun4c_flush_page(pages);</div><div class='del'>-#ifndef CONFIG_SUN4	</div><div class='ctx'> 	sun4c_flush_page(pages + PAGE_SIZE);</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> 	sun4c_put_pte(addr, BUCKET_PTE(pages));</div><div class='del'>-#ifndef CONFIG_SUN4	</div><div class='ctx'> 	sun4c_put_pte(addr + PAGE_SIZE, BUCKET_PTE(pages + PAGE_SIZE));</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_DEBUG_STACK_USAGE</div><div class='ctx'> 	memset((void *)addr, 0, PAGE_SIZE &lt;&lt; THREAD_INFO_ORDER);</div><div class='hunk'>@@ -1072,13 +971,11 @@ static void sun4c_free_thread_info(struct thread_info *ti)</div><div class='ctx'> </div><div class='ctx'> 	/* We are deleting a mapping, so the flush here is mandatory. */</div><div class='ctx'> 	sun4c_flush_page(tiaddr);</div><div class='del'>-#ifndef CONFIG_SUN4	</div><div class='ctx'> 	sun4c_flush_page(tiaddr + PAGE_SIZE);</div><div class='del'>-#endif</div><div class='add'>+</div><div class='ctx'> 	sun4c_put_pte(tiaddr, 0);</div><div class='del'>-#ifndef CONFIG_SUN4	</div><div class='ctx'> 	sun4c_put_pte(tiaddr + PAGE_SIZE, 0);</div><div class='del'>-#endif</div><div class='add'>+</div><div class='ctx'> 	sun4c_bucket[entry] = BUCKET_EMPTY;</div><div class='ctx'> 	if (entry &lt; sun4c_lowbucket_avail)</div><div class='ctx'> 		sun4c_lowbucket_avail = entry;</div><div class='hunk'>@@ -1211,7 +1108,7 @@ static void sun4c_unlockarea(char *vaddr, unsigned long size)</div><div class='ctx'>  * by implication and fool the page locking code above</div><div class='ctx'>  * if passed to by mistake.</div><div class='ctx'>  */</div><div class='del'>-static __u32 sun4c_get_scsi_one(char *bufptr, unsigned long len, struct sbus_bus *sbus)</div><div class='add'>+static __u32 sun4c_get_scsi_one(struct device *dev, char *bufptr, unsigned long len)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long page;</div><div class='ctx'> </div><div class='hunk'>@@ -1223,7 +1120,7 @@ static __u32 sun4c_get_scsi_one(char *bufptr, unsigned long len, struct sbus_bus</div><div class='ctx'> 	return (__u32)sun4c_lockarea(bufptr, len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void sun4c_get_scsi_sgl(struct scatterlist *sg, int sz, struct sbus_bus *sbus)</div><div class='add'>+static void sun4c_get_scsi_sgl(struct device *dev, struct scatterlist *sg, int sz)</div><div class='ctx'> {</div><div class='ctx'> 	while (sz != 0) {</div><div class='ctx'> 		--sz;</div><div class='hunk'>@@ -1233,14 +1130,14 @@ static void sun4c_get_scsi_sgl(struct scatterlist *sg, int sz, struct sbus_bus *</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void sun4c_release_scsi_one(__u32 bufptr, unsigned long len, struct sbus_bus *sbus)</div><div class='add'>+static void sun4c_release_scsi_one(struct device *dev, __u32 bufptr, unsigned long len)</div><div class='ctx'> {</div><div class='ctx'> 	if (bufptr &lt; sun4c_iobuffer_start)</div><div class='ctx'> 		return; /* On kernel stack or similar, see above */</div><div class='ctx'> 	sun4c_unlockarea((char *)bufptr, len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void sun4c_release_scsi_sgl(struct scatterlist *sg, int sz, struct sbus_bus *sbus)</div><div class='add'>+static void sun4c_release_scsi_sgl(struct device *dev, struct scatterlist *sg, int sz)</div><div class='ctx'> {</div><div class='ctx'> 	while (sz != 0) {</div><div class='ctx'> 		--sz;</div><div class='hunk'>@@ -2263,7 +2160,6 @@ void __init ld_mmu_sun4c(void)</div><div class='ctx'> </div><div class='ctx'> 	BTFIXUPSET_CALL(mmu_map_dma_area, sun4c_map_dma_area, BTFIXUPCALL_NORM);</div><div class='ctx'> 	BTFIXUPSET_CALL(mmu_unmap_dma_area, sun4c_unmap_dma_area, BTFIXUPCALL_NORM);</div><div class='del'>-	BTFIXUPSET_CALL(mmu_translate_dvma, sun4c_translate_dvma, BTFIXUPCALL_NORM);</div><div class='ctx'> </div><div class='ctx'> 	BTFIXUPSET_CALL(sparc_mapiorange, sun4c_mapiorange, BTFIXUPCALL_NORM);</div><div class='ctx'> 	BTFIXUPSET_CALL(sparc_unmapiorange, sun4c_unmapiorange, BTFIXUPCALL_NORM);</div><div class='head'>diff --git a/arch/sparc/prom/Makefile b/arch/sparc/prom/Makefile<br/>index 7f5eacfcfbcf..8f7e18546c97 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/prom/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/prom/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/prom/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/prom/Makefile</a></div><div class='hunk'>@@ -4,5 +4,3 @@</div><div class='ctx'> </div><div class='ctx'> lib-y := bootstr.o devmap.o devops.o init.o memory.o misc.o mp.o \</div><div class='ctx'> 	 palloc.o ranges.o segment.o console.o printf.o tree.o</div><div class='del'>-</div><div class='del'>-lib-$(CONFIG_SUN4) += sun4prom.o</div><div class='head'>diff --git a/arch/sparc/prom/bootstr.c b/arch/sparc/prom/bootstr.c<br/>index 5a35c768ff7c..916831da7e67 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/prom/bootstr.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/prom/bootstr.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/prom/bootstr.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/prom/bootstr.c</a></div><div class='hunk'>@@ -6,15 +6,12 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;asm/oplib.h&gt;</div><div class='del'>-#include &lt;asm/sun4prom.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define BARG_LEN  256</div><div class='ctx'> static char barg_buf[BARG_LEN] = { 0 };</div><div class='ctx'> static char fetched __initdata = 0;</div><div class='ctx'> </div><div class='del'>-extern linux_sun4_romvec *sun4_romvec;</div><div class='del'>-</div><div class='ctx'> char * __init</div><div class='ctx'> prom_getbootargs(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -28,7 +25,6 @@ prom_getbootargs(void)</div><div class='ctx'> </div><div class='ctx'> 	switch(prom_vers) {</div><div class='ctx'> 	case PROM_V0:</div><div class='del'>-	case PROM_SUN4:</div><div class='ctx'> 		cp = barg_buf;</div><div class='ctx'> 		/* Start from 1 and go over fd(0,0,0)kernel */</div><div class='ctx'> 		for(iter = 1; iter &lt; 8; iter++) {</div><div class='head'>diff --git a/arch/sparc/prom/console.c b/arch/sparc/prom/console.c<br/>index 790057a34616..b3075d73fc19 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/prom/console.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/prom/console.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/prom/console.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/prom/console.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;asm/openprom.h&gt;</div><div class='del'>-#include &lt;asm/sun4prom.h&gt;</div><div class='ctx'> #include &lt;asm/oplib.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='hunk'>@@ -30,7 +29,6 @@ prom_nbgetchar(void)</div><div class='ctx'> 	spin_lock_irqsave(&amp;prom_lock, flags);</div><div class='ctx'> 	switch(prom_vers) {</div><div class='ctx'> 	case PROM_V0:</div><div class='del'>-	case PROM_SUN4:</div><div class='ctx'> 		i = (*(romvec-&gt;pv_nbgetchar))();</div><div class='ctx'> 		break;</div><div class='ctx'> 	case PROM_V2:</div><div class='hunk'>@@ -63,7 +61,6 @@ prom_nbputchar(char c)</div><div class='ctx'> 	spin_lock_irqsave(&amp;prom_lock, flags);</div><div class='ctx'> 	switch(prom_vers) {</div><div class='ctx'> 	case PROM_V0:</div><div class='del'>-	case PROM_SUN4:</div><div class='ctx'> 		i = (*(romvec-&gt;pv_nbputchar))(c);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case PROM_V2:</div><div class='head'>diff --git a/arch/sparc/prom/init.c b/arch/sparc/prom/init.c<br/>index 729f87066945..873217c6d823 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/prom/init.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/prom/init.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/prom/init.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/prom/init.c</a></div><div class='hunk'>@@ -11,12 +11,10 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/openprom.h&gt;</div><div class='ctx'> #include &lt;asm/oplib.h&gt;</div><div class='del'>-#include &lt;asm/sun4prom.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct linux_romvec *romvec;</div><div class='ctx'> enum prom_major_version prom_vers;</div><div class='ctx'> unsigned int prom_rev, prom_prev;</div><div class='del'>-linux_sun4_romvec *sun4_romvec;</div><div class='ctx'> </div><div class='ctx'> /* The root node of the prom device tree. */</div><div class='ctx'> int prom_root_node;</div><div class='hunk'>@@ -34,10 +32,6 @@ extern void prom_ranges_init(void);</div><div class='ctx'> </div><div class='ctx'> void __init prom_init(struct linux_romvec *rp)</div><div class='ctx'> {</div><div class='del'>-#ifdef CONFIG_SUN4</div><div class='del'>-	extern struct linux_romvec *sun4_prom_init(void);</div><div class='del'>-	rp = sun4_prom_init();</div><div class='del'>-#endif</div><div class='ctx'> 	romvec = rp;</div><div class='ctx'> </div><div class='ctx'> 	switch(romvec-&gt;pv_romvers) {</div><div class='hunk'>@@ -50,9 +44,6 @@ void __init prom_init(struct linux_romvec *rp)</div><div class='ctx'> 	case 3:</div><div class='ctx'> 		prom_vers = PROM_V3;</div><div class='ctx'> 		break;</div><div class='del'>-	case 40:</div><div class='del'>-		prom_vers = PROM_SUN4;</div><div class='del'>-		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		prom_printf("PROMLIB: Bad PROM version %d\n",</div><div class='ctx'> 			    romvec-&gt;pv_romvers);</div><div class='hunk'>@@ -76,11 +67,8 @@ void __init prom_init(struct linux_romvec *rp)</div><div class='ctx'> </div><div class='ctx'> 	prom_ranges_init();</div><div class='ctx'> </div><div class='del'>-#ifndef CONFIG_SUN4</div><div class='del'>-	/* SUN4 prints this in sun4_prom_init */</div><div class='ctx'> 	printk("PROMLIB: Sun Boot Prom Version %d Revision %d\n",</div><div class='ctx'> 	       romvec-&gt;pv_romvers, prom_rev);</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> 	/* Initialization successful. */</div><div class='ctx'> 	return;</div><div class='head'>diff --git a/arch/sparc/prom/memory.c b/arch/sparc/prom/memory.c<br/>index 947f047dc95a..fac7899a29c3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/prom/memory.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/prom/memory.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/prom/memory.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/prom/memory.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/openprom.h&gt;</div><div class='del'>-#include &lt;asm/sun4prom.h&gt;</div><div class='ctx'> #include &lt;asm/oplib.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -46,15 +45,6 @@ static int __init prom_meminit_v2(void)</div><div class='ctx'> 	return num_ents;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init prom_meminit_sun4(void)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_SUN4</div><div class='del'>-	sp_banks[0].base_addr = 0;</div><div class='del'>-	sp_banks[0].num_bytes = *(sun4_romvec-&gt;memoryavail);</div><div class='del'>-#endif</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int sp_banks_cmp(const void *a, const void *b)</div><div class='ctx'> {</div><div class='ctx'> 	const struct sparc_phys_banks *x = a, *y = b;</div><div class='hunk'>@@ -81,10 +71,6 @@ void __init prom_meminit(void)</div><div class='ctx'> 		num_ents = prom_meminit_v2();</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case PROM_SUN4:</div><div class='del'>-		num_ents = prom_meminit_sun4();</div><div class='del'>-		break;</div><div class='del'>-</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/sparc/prom/ranges.c b/arch/sparc/prom/ranges.c<br/>index f9b7def35f6e..64579a376419 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/prom/ranges.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/prom/ranges.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/prom/ranges.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc/prom/ranges.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'> #include &lt;asm/openprom.h&gt;</div><div class='ctx'> #include &lt;asm/oplib.h&gt;</div><div class='ctx'> #include &lt;asm/types.h&gt;</div><div class='del'>-#include &lt;asm/sbus.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct linux_prom_ranges promlib_obio_ranges[PROMREG_MAX];</div><div class='head'>diff --git a/arch/sparc/prom/sun4prom.c b/arch/sparc/prom/sun4prom.c<br/>deleted file mode 100644<br/>index 00390a2652aa..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc/prom/sun4prom.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc/prom/sun4prom.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,161 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 1996 The Australian National University.</div><div class='del'>- * Copyright (C) 1996 Fujitsu Laboratories Limited</div><div class='del'>- * Copyright (C) 1997 Michael A. Griffith (grif@acm.org)</div><div class='del'>- * Copyright (C) 1997 Sun Weenie (ko@ko.reno.nv.us)</div><div class='del'>- * Copyright (C) 1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz)</div><div class='del'>- * </div><div class='del'>- * This software may be distributed under the terms of the Gnu</div><div class='del'>- * Public License version 2 or later</div><div class='del'>- *</div><div class='del'>- * fake a really simple Sun prom for the SUN4</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;asm/oplib.h&gt;</div><div class='del'>-#include &lt;asm/idprom.h&gt; </div><div class='del'>-#include &lt;asm/machines.h&gt; </div><div class='del'>-#include &lt;asm/sun4prom.h&gt;</div><div class='del'>-#include &lt;asm/asi.h&gt;</div><div class='del'>-#include &lt;asm/contregs.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-</div><div class='del'>-static struct linux_romvec sun4romvec;</div><div class='del'>-static struct idprom sun4_idprom;</div><div class='del'>-</div><div class='del'>-struct property {</div><div class='del'>-	char *name;</div><div class='del'>-	char *value;</div><div class='del'>-	int length;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct node {</div><div class='del'>-	int level;</div><div class='del'>-	struct property *properties;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct property null_properties = { NULL, NULL, -1 };</div><div class='del'>-</div><div class='del'>-struct property root_properties[] = {</div><div class='del'>-	{"device_type", "cpu", 4},</div><div class='del'>-	{"idprom", (char *)&amp;sun4_idprom, sizeof(struct idprom)},</div><div class='del'>-	{NULL, NULL, -1}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct node nodes[] = {</div><div class='del'>-	{ 0, &amp;null_properties }, </div><div class='del'>-	{ 0, root_properties },</div><div class='del'>-	{ -1,&amp;null_properties }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int no_nextnode(int node)</div><div class='del'>-{</div><div class='del'>-	if (nodes[node].level == nodes[node+1].level)</div><div class='del'>-		return node+1;</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int no_child(int node)</div><div class='del'>-{</div><div class='del'>-	if (nodes[node].level == nodes[node+1].level-1)</div><div class='del'>-		return node+1;</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct property *find_property(int node,char *name)</div><div class='del'>-{</div><div class='del'>-	struct property *prop = &amp;nodes[node].properties[0];</div><div class='del'>-	while (prop &amp;&amp; prop-&gt;name) {</div><div class='del'>-		if (strcmp(prop-&gt;name,name) == 0) return prop;</div><div class='del'>-		prop++;</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int no_proplen(int node,char *name)</div><div class='del'>-{</div><div class='del'>-	struct property *prop = find_property(node,name);</div><div class='del'>-	if (prop) return prop-&gt;length;</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int no_getprop(int node,char *name,char *value)</div><div class='del'>-{</div><div class='del'>-	struct property *prop = find_property(node,name);</div><div class='del'>-	if (prop) {</div><div class='del'>-		memcpy(value,prop-&gt;value,prop-&gt;length);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int no_setprop(int node,char *name,char *value,int len)</div><div class='del'>-{</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *no_nextprop(int node,char *name)</div><div class='del'>-{</div><div class='del'>-	struct property *prop = find_property(node,name);</div><div class='del'>-	if (prop) return prop[1].name;</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct linux_nodeops sun4_nodeops = {</div><div class='del'>-	no_nextnode,</div><div class='del'>-	no_child,</div><div class='del'>-	no_proplen,</div><div class='del'>-	no_getprop,</div><div class='del'>-	no_setprop,</div><div class='del'>-	no_nextprop</div><div class='del'>-};</div><div class='del'>-	</div><div class='del'>-static int synch_hook;</div><div class='del'>-</div><div class='del'>-struct linux_romvec * __init sun4_prom_init(void)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	unsigned char x;</div><div class='del'>-	char *p;</div><div class='del'>-                                </div><div class='del'>-	p = (char *)&amp;sun4_idprom;</div><div class='del'>-	for (i = 0; i &lt; sizeof(sun4_idprom); i++) {</div><div class='del'>-		__asm__ __volatile__ ("lduba [%1] %2, %0" : "=r" (x) :</div><div class='del'>-				      "r" (AC_IDPROM + i), "i" (ASI_CONTROL));</div><div class='del'>-		*p++ = x;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memset(&amp;sun4romvec,0,sizeof(sun4romvec));</div><div class='del'>-</div><div class='del'>-	sun4_romvec = (linux_sun4_romvec *) SUN4_PROM_VECTOR;</div><div class='del'>-</div><div class='del'>-	sun4romvec.pv_romvers = 40;</div><div class='del'>-	sun4romvec.pv_nodeops = &amp;sun4_nodeops;</div><div class='del'>-	sun4romvec.pv_reboot = sun4_romvec-&gt;reboot;</div><div class='del'>-	sun4romvec.pv_abort = sun4_romvec-&gt;abortentry;</div><div class='del'>-	sun4romvec.pv_halt = sun4_romvec-&gt;exittomon;</div><div class='del'>-	sun4romvec.pv_synchook = (void (**)(void))&amp;synch_hook;</div><div class='del'>-	sun4romvec.pv_setctxt = sun4_romvec-&gt;setcxsegmap;</div><div class='del'>-	sun4romvec.pv_v0bootargs = sun4_romvec-&gt;bootParam;</div><div class='del'>-	sun4romvec.pv_nbgetchar = sun4_romvec-&gt;mayget;</div><div class='del'>-	sun4romvec.pv_nbputchar = sun4_romvec-&gt;mayput;</div><div class='del'>-	sun4romvec.pv_stdin = sun4_romvec-&gt;insource;</div><div class='del'>-	sun4romvec.pv_stdout = sun4_romvec-&gt;outsink;</div><div class='del'>-	</div><div class='del'>-	/*</div><div class='del'>-	 * We turn on the LEDs to let folks without monitors or</div><div class='del'>-	 * terminals know we booted.   Nothing too fancy now.  They</div><div class='del'>-	 * are all on, except for LED 5, which blinks.   When we</div><div class='del'>-	 * have more time, we can teach the penguin to say "By your</div><div class='del'>-	 * command" or "Activating turbo boost, Michael". :-)</div><div class='del'>-	 */</div><div class='del'>-	sun4_romvec-&gt;setLEDs(NULL);</div><div class='del'>-	</div><div class='del'>-	printk("PROMLIB: Old Sun4 boot PROM monitor %s, romvec version %d\n",</div><div class='del'>-		sun4_romvec-&gt;monid,</div><div class='del'>-		sun4_romvec-&gt;romvecversion);</div><div class='del'>-</div><div class='del'>-	return &amp;sun4romvec;</div><div class='del'>-}</div><div class='head'>diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig<br/>index 36b4b7ab9cfb..5446e2a499b1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc64/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/Kconfig</a></div><div class='hunk'>@@ -18,6 +18,13 @@ config SPARC64</div><div class='ctx'> 	select HAVE_ARCH_KGDB</div><div class='ctx'> 	select USE_GENERIC_SMP_HELPERS if SMP</div><div class='ctx'> 	select HAVE_ARCH_TRACEHOOK</div><div class='add'>+	select ARCH_WANT_OPTIONAL_GPIOLIB</div><div class='add'>+	select RTC_CLASS</div><div class='add'>+	select RTC_DRV_M48T59</div><div class='add'>+	select RTC_DRV_CMOS</div><div class='add'>+	select RTC_DRV_BQ4802</div><div class='add'>+	select RTC_DRV_SUN4V</div><div class='add'>+	select RTC_DRV_STARFIRE</div><div class='ctx'> </div><div class='ctx'> config GENERIC_TIME</div><div class='ctx'> 	bool</div><div class='hunk'>@@ -31,6 +38,11 @@ config GENERIC_CLOCKEVENTS</div><div class='ctx'> 	bool</div><div class='ctx'> 	default y</div><div class='ctx'> </div><div class='add'>+config GENERIC_GPIO</div><div class='add'>+	bool</div><div class='add'>+	help</div><div class='add'>+	  Generic GPIO API support</div><div class='add'>+</div><div class='ctx'> config 64BIT</div><div class='ctx'> 	def_bool y</div><div class='ctx'> </div><div class='hunk'>@@ -185,6 +197,17 @@ config US2E_FREQ</div><div class='ctx'> </div><div class='ctx'> 	  If in doubt, say N.</div><div class='ctx'> </div><div class='add'>+config US3_MC</div><div class='add'>+	tristate "UltraSPARC-III Memory Controller driver"</div><div class='add'>+	default y</div><div class='add'>+	help</div><div class='add'>+	  This adds a driver for the UltraSPARC-III memory controller.</div><div class='add'>+	  Loading this driver allows exact mnemonic strings to be</div><div class='add'>+	  printed in the event of a memory error, so that the faulty DIMM</div><div class='add'>+	  on the motherboard can be matched to the error.</div><div class='add'>+</div><div class='add'>+	  If in doubt, say Y, as this information can be very useful.</div><div class='add'>+</div><div class='ctx'> # Global things across all Sun machines.</div><div class='ctx'> config GENERIC_LOCKBREAK</div><div class='ctx'> 	bool</div><div class='head'>diff --git a/arch/sparc64/Makefile b/arch/sparc64/Makefile<br/>index b785a395b12f..c7214abc0d84 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc64/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/Makefile</a></div><div class='hunk'>@@ -7,7 +7,7 @@</div><div class='ctx'> # Copyright (C) 1998 Jakub Jelinek (jj@ultra.linux.cz)</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-CHECKFLAGS	+= -D__sparc__ -D__sparc_v9__ -m64</div><div class='add'>+CHECKFLAGS	+= -D__sparc__ -D__sparc_v9__ -D__arch64__ -m64</div><div class='ctx'> </div><div class='ctx'> # Undefine sparc when processing vmlinux.lds - it is used</div><div class='ctx'> # And teach CPP we are doing 64 bit builds (for this case)</div><div class='head'>diff --git a/arch/sparc64/kernel/Makefile b/arch/sparc64/kernel/Makefile<br/>index 418b5782096e..c0b8009ab196 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc64/kernel/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/Makefile</a></div><div class='hunk'>@@ -7,16 +7,16 @@ EXTRA_CFLAGS := -Werror</div><div class='ctx'> </div><div class='ctx'> extra-y		:= head.o init_task.o vmlinux.lds</div><div class='ctx'> </div><div class='del'>-obj-y		:= process.o setup.o cpu.o idprom.o \</div><div class='add'>+obj-y		:= process.o setup.o cpu.o idprom.o reboot.o \</div><div class='ctx'> 		   traps.o auxio.o una_asm.o sysfs.o iommu.o \</div><div class='ctx'> 		   irq.o ptrace.o time.o sys_sparc.o signal.o \</div><div class='del'>-		   unaligned.o central.o pci.o starfire.o \</div><div class='del'>-		   power.o sbus.o sparc64_ksyms.o chmc.o \</div><div class='add'>+		   unaligned.o central.o starfire.o \</div><div class='add'>+		   power.o sbus.o sparc64_ksyms.o ebus.o \</div><div class='ctx'> 		   visemul.o prom.o of_device.o hvapi.o sstate.o mdesc.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_DYNAMIC_FTRACE) += ftrace.o</div><div class='ctx'> obj-$(CONFIG_STACKTRACE) += stacktrace.o</div><div class='del'>-obj-$(CONFIG_PCI)	 += ebus.o pci_common.o \</div><div class='add'>+obj-$(CONFIG_PCI)	 += pci.o pci_common.o psycho_common.o \</div><div class='ctx'> 			    pci_psycho.o pci_sabre.o pci_schizo.o \</div><div class='ctx'> 			    pci_sun4v.o pci_sun4v_asm.o pci_fire.o</div><div class='ctx'> obj-$(CONFIG_PCI_MSI)	+= pci_msi.o</div><div class='hunk'>@@ -25,6 +25,7 @@ obj-$(CONFIG_COMPAT) += sys32.o sys_sparc32.o signal32.o</div><div class='ctx'> obj-$(CONFIG_MODULES) += module.o</div><div class='ctx'> obj-$(CONFIG_US3_FREQ) += us3_cpufreq.o</div><div class='ctx'> obj-$(CONFIG_US2E_FREQ) += us2e_cpufreq.o</div><div class='add'>+obj-$(CONFIG_US3_MC) += chmc.o</div><div class='ctx'> obj-$(CONFIG_KPROBES) += kprobes.o</div><div class='ctx'> obj-$(CONFIG_SUN_LDOMS) += ldc.o vio.o viohs.o ds.o</div><div class='ctx'> obj-$(CONFIG_AUDIT) += audit.o</div><div class='head'>diff --git a/arch/sparc64/kernel/auxio.c b/arch/sparc64/kernel/auxio.c<br/>index dd5c7bf87619..858beda86524 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/auxio.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc64/kernel/auxio.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/auxio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/auxio.c</a></div><div class='hunk'>@@ -109,7 +109,7 @@ void auxio_set_lte(int on)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct of_device_id auxio_match[] = {</div><div class='add'>+static struct of_device_id __initdata auxio_match[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.name = "auxio",</div><div class='ctx'> 	},</div><div class='head'>diff --git a/arch/sparc64/kernel/central.c b/arch/sparc64/kernel/central.c<br/>index f2e87d0d7e1d..05f1c916db06 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/central.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc64/kernel/central.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/central.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/central.c</a></div><div class='hunk'>@@ -1,461 +1,268 @@</div><div class='ctx'> /* central.c: Central FHC driver for Sunfire/Starfire/Wildfire.</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 1997, 1999 David S. Miller (davem@davemloft.net)</div><div class='add'>+ * Copyright (C) 1997, 1999, 2008 David S. Miller (davem@davemloft.net)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/timer.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/bootmem.h&gt;</div><div class='add'>+#include &lt;linux/of_device.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/fhc.h&gt;</div><div class='del'>-#include &lt;asm/starfire.h&gt;</div><div class='del'>-</div><div class='del'>-static struct linux_central *central_bus = NULL;</div><div class='del'>-static struct linux_fhc *fhc_list = NULL;</div><div class='add'>+#include &lt;asm/upa.h&gt;</div><div class='add'>+</div><div class='add'>+struct clock_board {</div><div class='add'>+	void __iomem		*clock_freq_regs;</div><div class='add'>+	void __iomem		*clock_regs;</div><div class='add'>+	void __iomem		*clock_ver_reg;</div><div class='add'>+	int			num_slots;</div><div class='add'>+	struct resource		leds_resource;</div><div class='add'>+	struct platform_device	leds_pdev;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct fhc {</div><div class='add'>+	void __iomem		*pregs;</div><div class='add'>+	bool			central;</div><div class='add'>+	bool			jtag_master;</div><div class='add'>+	int			board_num;</div><div class='add'>+	struct resource		leds_resource;</div><div class='add'>+	struct platform_device	leds_pdev;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __devinit clock_board_calc_nslots(struct clock_board *p)</div><div class='add'>+{</div><div class='add'>+	u8 reg = upa_readb(p-&gt;clock_regs + CLOCK_STAT1) &amp; 0xc0;</div><div class='ctx'> </div><div class='del'>-#define IS_CENTRAL_FHC(__fhc)	((__fhc) == central_bus-&gt;child)</div><div class='add'>+	switch (reg) {</div><div class='add'>+	case 0x40:</div><div class='add'>+		return 16;</div><div class='ctx'> </div><div class='del'>-static void central_probe_failure(int line)</div><div class='del'>-{</div><div class='del'>-	prom_printf("CENTRAL: Critical device probe failure at central.c:%d\n",</div><div class='del'>-		    line);</div><div class='del'>-	prom_halt();</div><div class='del'>-}</div><div class='add'>+	case 0xc0:</div><div class='add'>+		return 8;</div><div class='ctx'> </div><div class='del'>-static void central_ranges_init(struct linux_central *central)</div><div class='del'>-{</div><div class='del'>-	struct device_node *dp = central-&gt;prom_node;</div><div class='del'>-	const void *pval;</div><div class='del'>-	int len;</div><div class='del'>-	</div><div class='del'>-	central-&gt;num_central_ranges = 0;</div><div class='del'>-	pval = of_get_property(dp, "ranges", &amp;len);</div><div class='del'>-	if (pval) {</div><div class='del'>-		memcpy(central-&gt;central_ranges, pval, len);</div><div class='del'>-		central-&gt;num_central_ranges =</div><div class='del'>-			(len / sizeof(struct linux_prom_ranges));</div><div class='add'>+	case 0x80:</div><div class='add'>+		reg = 0;</div><div class='add'>+		if (p-&gt;clock_ver_reg)</div><div class='add'>+			reg = upa_readb(p-&gt;clock_ver_reg);</div><div class='add'>+		if (reg) {</div><div class='add'>+			if (reg &amp; 0x80)</div><div class='add'>+				return 4;</div><div class='add'>+			else</div><div class='add'>+				return 5;</div><div class='add'>+		}</div><div class='add'>+		/* Fallthrough */</div><div class='add'>+	default:</div><div class='add'>+		return 4;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void fhc_ranges_init(struct linux_fhc *fhc)</div><div class='add'>+static int __devinit clock_board_probe(struct of_device *op,</div><div class='add'>+				       const struct of_device_id *match)</div><div class='ctx'> {</div><div class='del'>-	struct device_node *dp = fhc-&gt;prom_node;</div><div class='del'>-	const void *pval;</div><div class='del'>-	int len;</div><div class='del'>-	</div><div class='del'>-	fhc-&gt;num_fhc_ranges = 0;</div><div class='del'>-	pval = of_get_property(dp, "ranges", &amp;len);</div><div class='del'>-	if (pval) {</div><div class='del'>-		memcpy(fhc-&gt;fhc_ranges, pval, len);</div><div class='del'>-		fhc-&gt;num_fhc_ranges =</div><div class='del'>-			(len / sizeof(struct linux_prom_ranges));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='add'>+	struct clock_board *p = kzalloc(sizeof(*p), GFP_KERNEL);</div><div class='add'>+	int err = -ENOMEM;</div><div class='ctx'> </div><div class='del'>-/* Range application routines are exported to various drivers,</div><div class='del'>- * so do not __init this.</div><div class='del'>- */</div><div class='del'>-static void adjust_regs(struct linux_prom_registers *regp, int nregs,</div><div class='del'>-			struct linux_prom_ranges *rangep, int nranges)</div><div class='del'>-{</div><div class='del'>-	int regc, rngc;</div><div class='del'>-</div><div class='del'>-	for (regc = 0; regc &lt; nregs; regc++) {</div><div class='del'>-		for (rngc = 0; rngc &lt; nranges; rngc++)</div><div class='del'>-			if (regp[regc].which_io == rangep[rngc].ot_child_space)</div><div class='del'>-				break; /* Fount it */</div><div class='del'>-		if (rngc == nranges) /* oops */</div><div class='del'>-			central_probe_failure(__LINE__);</div><div class='del'>-		regp[regc].which_io = rangep[rngc].ot_parent_space;</div><div class='del'>-		regp[regc].phys_addr -= rangep[rngc].ot_child_base;</div><div class='del'>-		regp[regc].phys_addr += rangep[rngc].ot_parent_base;</div><div class='add'>+	if (!p) {</div><div class='add'>+		printk(KERN_ERR "clock_board: Cannot allocate struct clock_board\n");</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-/* Apply probed fhc ranges to registers passed, if no ranges return. */</div><div class='del'>-static void apply_fhc_ranges(struct linux_fhc *fhc,</div><div class='del'>-			     struct linux_prom_registers *regs,</div><div class='del'>-			     int nregs)</div><div class='del'>-{</div><div class='del'>-	if (fhc-&gt;num_fhc_ranges)</div><div class='del'>-		adjust_regs(regs, nregs, fhc-&gt;fhc_ranges,</div><div class='del'>-			    fhc-&gt;num_fhc_ranges);</div><div class='del'>-}</div><div class='add'>+	p-&gt;clock_freq_regs = of_ioremap(&amp;op-&gt;resource[0], 0,</div><div class='add'>+					resource_size(&amp;op-&gt;resource[0]),</div><div class='add'>+					"clock_board_freq");</div><div class='add'>+	if (!p-&gt;clock_freq_regs) {</div><div class='add'>+		printk(KERN_ERR "clock_board: Cannot map clock_freq_regs\n");</div><div class='add'>+		goto out_free;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-/* Apply probed central ranges to registers passed, if no ranges return. */</div><div class='del'>-static void apply_central_ranges(struct linux_central *central,</div><div class='del'>-				 struct linux_prom_registers *regs, int nregs)</div><div class='del'>-{</div><div class='del'>-	if (central-&gt;num_central_ranges)</div><div class='del'>-		adjust_regs(regs, nregs, central-&gt;central_ranges,</div><div class='del'>-			    central-&gt;num_central_ranges);</div><div class='del'>-}</div><div class='add'>+	p-&gt;clock_regs = of_ioremap(&amp;op-&gt;resource[1], 0,</div><div class='add'>+				   resource_size(&amp;op-&gt;resource[1]),</div><div class='add'>+				   "clock_board_regs");</div><div class='add'>+	if (!p-&gt;clock_regs) {</div><div class='add'>+		printk(KERN_ERR "clock_board: Cannot map clock_regs\n");</div><div class='add'>+		goto out_unmap_clock_freq_regs;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-static void * __init central_alloc_bootmem(unsigned long size)</div><div class='del'>-{</div><div class='del'>-	void *ret;</div><div class='add'>+	if (op-&gt;resource[2].flags) {</div><div class='add'>+		p-&gt;clock_ver_reg = of_ioremap(&amp;op-&gt;resource[2], 0,</div><div class='add'>+					      resource_size(&amp;op-&gt;resource[2]),</div><div class='add'>+					      "clock_ver_reg");</div><div class='add'>+		if (!p-&gt;clock_ver_reg) {</div><div class='add'>+			printk(KERN_ERR "clock_board: Cannot map clock_ver_reg\n");</div><div class='add'>+			goto out_unmap_clock_regs;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	ret = __alloc_bootmem(size, SMP_CACHE_BYTES, 0UL);</div><div class='del'>-	if (ret != NULL)</div><div class='del'>-		memset(ret, 0, size);</div><div class='add'>+	p-&gt;num_slots = clock_board_calc_nslots(p);</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='add'>+	p-&gt;leds_resource.start = (unsigned long)</div><div class='add'>+		(p-&gt;clock_regs + CLOCK_CTRL);</div><div class='add'>+	p-&gt;leds_resource.end = p-&gt;leds_resource.end;</div><div class='add'>+	p-&gt;leds_resource.name = "leds";</div><div class='ctx'> </div><div class='del'>-static unsigned long prom_reg_to_paddr(struct linux_prom_registers *r)</div><div class='del'>-{</div><div class='del'>-	unsigned long ret = ((unsigned long) r-&gt;which_io) &lt;&lt; 32;</div><div class='add'>+	p-&gt;leds_pdev.name = "sunfire-clockboard-leds";</div><div class='add'>+	p-&gt;leds_pdev.resource = &amp;p-&gt;leds_resource;</div><div class='add'>+	p-&gt;leds_pdev.num_resources = 1;</div><div class='add'>+	p-&gt;leds_pdev.dev.parent = &amp;op-&gt;dev;</div><div class='ctx'> </div><div class='del'>-	return ret | (unsigned long) r-&gt;phys_addr;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __init probe_other_fhcs(void)</div><div class='del'>-{</div><div class='del'>-	struct device_node *dp;</div><div class='del'>-	const struct linux_prom64_registers *fpregs;</div><div class='del'>-</div><div class='del'>-	for_each_node_by_name(dp, "fhc") {</div><div class='del'>-		struct linux_fhc *fhc;</div><div class='del'>-		int board;</div><div class='del'>-		u32 tmp;</div><div class='del'>-</div><div class='del'>-		if (dp-&gt;parent &amp;&amp;</div><div class='del'>-		    dp-&gt;parent-&gt;parent != NULL)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		fhc = (struct linux_fhc *)</div><div class='del'>-			central_alloc_bootmem(sizeof(struct linux_fhc));</div><div class='del'>-		if (fhc == NULL)</div><div class='del'>-			central_probe_failure(__LINE__);</div><div class='del'>-</div><div class='del'>-		/* Link it into the FHC chain. */</div><div class='del'>-		fhc-&gt;next = fhc_list;</div><div class='del'>-		fhc_list = fhc;</div><div class='del'>-</div><div class='del'>-		/* Toplevel FHCs have no parent. */</div><div class='del'>-		fhc-&gt;parent = NULL;</div><div class='del'>-		</div><div class='del'>-		fhc-&gt;prom_node = dp;</div><div class='del'>-		fhc_ranges_init(fhc);</div><div class='del'>-</div><div class='del'>-		/* Non-central FHC's have 64-bit OBP format registers. */</div><div class='del'>-		fpregs = of_get_property(dp, "reg", NULL);</div><div class='del'>-		if (!fpregs)</div><div class='del'>-			central_probe_failure(__LINE__);</div><div class='del'>-</div><div class='del'>-		/* Only central FHC needs special ranges applied. */</div><div class='del'>-		fhc-&gt;fhc_regs.pregs = fpregs[0].phys_addr;</div><div class='del'>-		fhc-&gt;fhc_regs.ireg = fpregs[1].phys_addr;</div><div class='del'>-		fhc-&gt;fhc_regs.ffregs = fpregs[2].phys_addr;</div><div class='del'>-		fhc-&gt;fhc_regs.sregs = fpregs[3].phys_addr;</div><div class='del'>-		fhc-&gt;fhc_regs.uregs = fpregs[4].phys_addr;</div><div class='del'>-		fhc-&gt;fhc_regs.tregs = fpregs[5].phys_addr;</div><div class='del'>-</div><div class='del'>-		board = of_getintprop_default(dp, "board#", -1);</div><div class='del'>-		fhc-&gt;board = board;</div><div class='del'>-</div><div class='del'>-		tmp = upa_readl(fhc-&gt;fhc_regs.pregs + FHC_PREGS_JCTRL);</div><div class='del'>-		if ((tmp &amp; FHC_JTAG_CTRL_MENAB) != 0)</div><div class='del'>-			fhc-&gt;jtag_master = 1;</div><div class='del'>-		else</div><div class='del'>-			fhc-&gt;jtag_master = 0;</div><div class='del'>-</div><div class='del'>-		tmp = upa_readl(fhc-&gt;fhc_regs.pregs + FHC_PREGS_ID);</div><div class='del'>-		printk("FHC(board %d): Version[%x] PartID[%x] Manuf[%x] %s\n",</div><div class='del'>-		       board,</div><div class='del'>-		       (tmp &amp; FHC_ID_VERS) &gt;&gt; 28,</div><div class='del'>-		       (tmp &amp; FHC_ID_PARTID) &gt;&gt; 12,</div><div class='del'>-		       (tmp &amp; FHC_ID_MANUF) &gt;&gt; 1,</div><div class='del'>-		       (fhc-&gt;jtag_master ? "(JTAG Master)" : ""));</div><div class='del'>-		</div><div class='del'>-		/* This bit must be set in all non-central FHC's in</div><div class='del'>-		 * the system.  When it is clear, this identifies</div><div class='del'>-		 * the central board.</div><div class='del'>-		 */</div><div class='del'>-		tmp = upa_readl(fhc-&gt;fhc_regs.pregs + FHC_PREGS_CTRL);</div><div class='del'>-		tmp |= FHC_CONTROL_IXIST;</div><div class='del'>-		upa_writel(tmp, fhc-&gt;fhc_regs.pregs + FHC_PREGS_CTRL);</div><div class='add'>+	err = platform_device_register(&amp;p-&gt;leds_pdev);</div><div class='add'>+	if (err) {</div><div class='add'>+		printk(KERN_ERR "clock_board: Could not register LEDS "</div><div class='add'>+		       "platform device\n");</div><div class='add'>+		goto out_unmap_clock_ver_reg;</div><div class='ctx'> 	}</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-static void probe_clock_board(struct linux_central *central,</div><div class='del'>-			      struct linux_fhc *fhc,</div><div class='del'>-			      struct device_node *fp)</div><div class='del'>-{</div><div class='del'>-	struct device_node *dp;</div><div class='del'>-	struct linux_prom_registers cregs[3];</div><div class='del'>-	const struct linux_prom_registers *pr;</div><div class='del'>-	int nslots, tmp, nregs;</div><div class='del'>-</div><div class='del'>-	dp = fp-&gt;child;</div><div class='del'>-	while (dp) {</div><div class='del'>-		if (!strcmp(dp-&gt;name, "clock-board"))</div><div class='del'>-			break;</div><div class='del'>-		dp = dp-&gt;sibling;</div><div class='del'>-	}</div><div class='del'>-	if (!dp)</div><div class='del'>-		central_probe_failure(__LINE__);</div><div class='add'>+	printk(KERN_INFO "clock_board: Detected %d slot Enterprise system.\n",</div><div class='add'>+	       p-&gt;num_slots);</div><div class='ctx'> </div><div class='del'>-	pr = of_get_property(dp, "reg", &amp;nregs);</div><div class='del'>-	if (!pr)</div><div class='del'>-		central_probe_failure(__LINE__);</div><div class='add'>+	err = 0;</div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='ctx'> </div><div class='del'>-	memcpy(cregs, pr, nregs);</div><div class='del'>-	nregs /= sizeof(struct linux_prom_registers);</div><div class='add'>+out_unmap_clock_ver_reg:</div><div class='add'>+	if (p-&gt;clock_ver_reg)</div><div class='add'>+		of_iounmap(&amp;op-&gt;resource[2], p-&gt;clock_ver_reg,</div><div class='add'>+			   resource_size(&amp;op-&gt;resource[2]));</div><div class='ctx'> </div><div class='del'>-	apply_fhc_ranges(fhc, &amp;cregs[0], nregs);</div><div class='del'>-	apply_central_ranges(central, &amp;cregs[0], nregs);</div><div class='del'>-	central-&gt;cfreg = prom_reg_to_paddr(&amp;cregs[0]);</div><div class='del'>-	central-&gt;clkregs = prom_reg_to_paddr(&amp;cregs[1]);</div><div class='add'>+out_unmap_clock_regs:</div><div class='add'>+	of_iounmap(&amp;op-&gt;resource[1], p-&gt;clock_regs,</div><div class='add'>+		   resource_size(&amp;op-&gt;resource[1]));</div><div class='ctx'> </div><div class='del'>-	if (nregs == 2)</div><div class='del'>-		central-&gt;clkver = 0UL;</div><div class='del'>-	else</div><div class='del'>-		central-&gt;clkver = prom_reg_to_paddr(&amp;cregs[2]);</div><div class='add'>+out_unmap_clock_freq_regs:</div><div class='add'>+	of_iounmap(&amp;op-&gt;resource[0], p-&gt;clock_freq_regs,</div><div class='add'>+		   resource_size(&amp;op-&gt;resource[0]));</div><div class='ctx'> </div><div class='del'>-	tmp = upa_readb(central-&gt;clkregs + CLOCK_STAT1);</div><div class='del'>-	tmp &amp;= 0xc0;</div><div class='del'>-	switch(tmp) {</div><div class='del'>-	case 0x40:</div><div class='del'>-		nslots = 16;</div><div class='del'>-		break;</div><div class='del'>-	case 0xc0:</div><div class='del'>-		nslots = 8;</div><div class='del'>-		break;</div><div class='del'>-	case 0x80:</div><div class='del'>-		if (central-&gt;clkver != 0UL &amp;&amp;</div><div class='del'>-		   upa_readb(central-&gt;clkver) != 0) {</div><div class='del'>-			if ((upa_readb(central-&gt;clkver) &amp; 0x80) != 0)</div><div class='del'>-				nslots = 4;</div><div class='del'>-			else</div><div class='del'>-				nslots = 5;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	default:</div><div class='del'>-		nslots = 4;</div><div class='del'>-		break;</div><div class='del'>-	};</div><div class='del'>-	central-&gt;slots = nslots;</div><div class='del'>-	printk("CENTRAL: Detected %d slot Enterprise system. cfreg[%02x] cver[%02x]\n",</div><div class='del'>-	       central-&gt;slots, upa_readb(central-&gt;cfreg),</div><div class='del'>-	       (central-&gt;clkver ? upa_readb(central-&gt;clkver) : 0x00));</div><div class='add'>+out_free:</div><div class='add'>+	kfree(p);</div><div class='add'>+	goto out;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ZAP(unsigned long iclr, unsigned long imap)</div><div class='add'>+static struct of_device_id __initdata clock_board_match[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "clock-board",</div><div class='add'>+	},</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct of_platform_driver clock_board_driver = {</div><div class='add'>+	.match_table	= clock_board_match,</div><div class='add'>+	.probe		= clock_board_probe,</div><div class='add'>+	.driver		= {</div><div class='add'>+		.name	= "clock_board",</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __devinit fhc_probe(struct of_device *op,</div><div class='add'>+			       const struct of_device_id *match)</div><div class='ctx'> {</div><div class='del'>-	u32 imap_tmp;</div><div class='del'>-</div><div class='del'>-	upa_writel(0, iclr);</div><div class='del'>-	upa_readl(iclr);</div><div class='del'>-	imap_tmp = upa_readl(imap);</div><div class='del'>-	imap_tmp &amp;= ~(0x80000000);</div><div class='del'>-	upa_writel(imap_tmp, imap);</div><div class='del'>-	upa_readl(imap);</div><div class='del'>-}</div><div class='add'>+	struct fhc *p = kzalloc(sizeof(*p), GFP_KERNEL);</div><div class='add'>+	int err = -ENOMEM;</div><div class='add'>+	u32 reg;</div><div class='ctx'> </div><div class='del'>-static void init_all_fhc_hw(void)</div><div class='del'>-{</div><div class='del'>-	struct linux_fhc *fhc;</div><div class='del'>-</div><div class='del'>-	for (fhc = fhc_list; fhc != NULL; fhc = fhc-&gt;next) {</div><div class='del'>-		u32 tmp;</div><div class='del'>-</div><div class='del'>-		/* Clear all of the interrupt mapping registers</div><div class='del'>-		 * just in case OBP left them in a foul state.</div><div class='del'>-		 */</div><div class='del'>-		ZAP(fhc-&gt;fhc_regs.ffregs + FHC_FFREGS_ICLR,</div><div class='del'>-		    fhc-&gt;fhc_regs.ffregs + FHC_FFREGS_IMAP);</div><div class='del'>-		ZAP(fhc-&gt;fhc_regs.sregs + FHC_SREGS_ICLR,</div><div class='del'>-		    fhc-&gt;fhc_regs.sregs + FHC_SREGS_IMAP);</div><div class='del'>-		ZAP(fhc-&gt;fhc_regs.uregs + FHC_UREGS_ICLR,</div><div class='del'>-		    fhc-&gt;fhc_regs.uregs + FHC_UREGS_IMAP);</div><div class='del'>-		ZAP(fhc-&gt;fhc_regs.tregs + FHC_TREGS_ICLR,</div><div class='del'>-		    fhc-&gt;fhc_regs.tregs + FHC_TREGS_IMAP);</div><div class='del'>-</div><div class='del'>-		/* Setup FHC control register. */</div><div class='del'>-		tmp = upa_readl(fhc-&gt;fhc_regs.pregs + FHC_PREGS_CTRL);</div><div class='del'>-</div><div class='del'>-		/* All non-central boards have this bit set. */</div><div class='del'>-		if (! IS_CENTRAL_FHC(fhc))</div><div class='del'>-			tmp |= FHC_CONTROL_IXIST;</div><div class='del'>-</div><div class='del'>-		/* For all FHCs, clear the firmware synchronization</div><div class='del'>-		 * line and both low power mode enables.</div><div class='del'>-		 */</div><div class='del'>-		tmp &amp;= ~(FHC_CONTROL_AOFF | FHC_CONTROL_BOFF |</div><div class='del'>-			 FHC_CONTROL_SLINE);</div><div class='del'>-</div><div class='del'>-		upa_writel(tmp, fhc-&gt;fhc_regs.pregs + FHC_PREGS_CTRL);</div><div class='del'>-		upa_readl(fhc-&gt;fhc_regs.pregs + FHC_PREGS_CTRL);</div><div class='add'>+	if (!p) {</div><div class='add'>+		printk(KERN_ERR "fhc: Cannot allocate struct fhc\n");</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-}</div><div class='add'>+	if (!strcmp(op-&gt;node-&gt;parent-&gt;name, "central"))</div><div class='add'>+		p-&gt;central = true;</div><div class='ctx'> </div><div class='del'>-void __init central_probe(void)</div><div class='del'>-{</div><div class='del'>-	struct linux_prom_registers fpregs[6];</div><div class='del'>-	const struct linux_prom_registers *pr;</div><div class='del'>-	struct linux_fhc *fhc;</div><div class='del'>-	struct device_node *dp, *fp;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	dp = of_find_node_by_name(NULL, "central");</div><div class='del'>-	if (!dp) {</div><div class='del'>-		if (this_is_starfire)</div><div class='del'>-			starfire_cpu_setup();</div><div class='del'>-		return;</div><div class='add'>+	p-&gt;pregs = of_ioremap(&amp;op-&gt;resource[0], 0,</div><div class='add'>+			      resource_size(&amp;op-&gt;resource[0]),</div><div class='add'>+			      "fhc_pregs");</div><div class='add'>+	if (!p-&gt;pregs) {</div><div class='add'>+		printk(KERN_ERR "fhc: Cannot map pregs\n");</div><div class='add'>+		goto out_free;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Ok we got one, grab some memory for software state. */</div><div class='del'>-	central_bus = (struct linux_central *)</div><div class='del'>-		central_alloc_bootmem(sizeof(struct linux_central));</div><div class='del'>-	if (central_bus == NULL)</div><div class='del'>-		central_probe_failure(__LINE__);</div><div class='del'>-</div><div class='del'>-	fhc = (struct linux_fhc *)</div><div class='del'>-		central_alloc_bootmem(sizeof(struct linux_fhc));</div><div class='del'>-	if (fhc == NULL)</div><div class='del'>-		central_probe_failure(__LINE__);</div><div class='del'>-</div><div class='del'>-	/* First init central. */</div><div class='del'>-	central_bus-&gt;child = fhc;</div><div class='del'>-	central_bus-&gt;prom_node = dp;</div><div class='del'>-	central_ranges_init(central_bus);</div><div class='del'>-</div><div class='del'>-	/* And then central's FHC. */</div><div class='del'>-	fhc-&gt;next = fhc_list;</div><div class='del'>-	fhc_list = fhc;</div><div class='del'>-</div><div class='del'>-	fhc-&gt;parent = central_bus;</div><div class='del'>-	fp = dp-&gt;child;</div><div class='del'>-	while (fp) {</div><div class='del'>-		if (!strcmp(fp-&gt;name, "fhc"))</div><div class='del'>-			break;</div><div class='del'>-		fp = fp-&gt;sibling;</div><div class='add'>+	if (p-&gt;central) {</div><div class='add'>+		reg = upa_readl(p-&gt;pregs + FHC_PREGS_BSR);</div><div class='add'>+		p-&gt;board_num = ((reg &gt;&gt; 16) &amp; 1) | ((reg &gt;&gt; 12) &amp; 0x0e);</div><div class='add'>+	} else {</div><div class='add'>+		p-&gt;board_num = of_getintprop_default(op-&gt;node, "board#", -1);</div><div class='add'>+		if (p-&gt;board_num == -1) {</div><div class='add'>+			printk(KERN_ERR "fhc: No board# property\n");</div><div class='add'>+			goto out_unmap_pregs;</div><div class='add'>+		}</div><div class='add'>+		if (upa_readl(p-&gt;pregs + FHC_PREGS_JCTRL) &amp; FHC_JTAG_CTRL_MENAB)</div><div class='add'>+			p-&gt;jtag_master = true;</div><div class='ctx'> 	}</div><div class='del'>-	if (!fp)</div><div class='del'>-		central_probe_failure(__LINE__);</div><div class='del'>-</div><div class='del'>-	fhc-&gt;prom_node = fp;</div><div class='del'>-	fhc_ranges_init(fhc);</div><div class='del'>-</div><div class='del'>-	/* Now, map in FHC register set. */</div><div class='del'>-	pr = of_get_property(fp, "reg", NULL);</div><div class='del'>-	if (!pr)</div><div class='del'>-		central_probe_failure(__LINE__);</div><div class='del'>-	memcpy(fpregs, pr, sizeof(fpregs));</div><div class='del'>-</div><div class='del'>-	apply_central_ranges(central_bus, &amp;fpregs[0], 6);</div><div class='del'>-	</div><div class='del'>-	fhc-&gt;fhc_regs.pregs = prom_reg_to_paddr(&amp;fpregs[0]);</div><div class='del'>-	fhc-&gt;fhc_regs.ireg = prom_reg_to_paddr(&amp;fpregs[1]);</div><div class='del'>-	fhc-&gt;fhc_regs.ffregs = prom_reg_to_paddr(&amp;fpregs[2]);</div><div class='del'>-	fhc-&gt;fhc_regs.sregs = prom_reg_to_paddr(&amp;fpregs[3]);</div><div class='del'>-	fhc-&gt;fhc_regs.uregs = prom_reg_to_paddr(&amp;fpregs[4]);</div><div class='del'>-	fhc-&gt;fhc_regs.tregs = prom_reg_to_paddr(&amp;fpregs[5]);</div><div class='del'>-</div><div class='del'>-	/* Obtain board number from board status register, Central's</div><div class='del'>-	 * FHC lacks "board#" property.</div><div class='del'>-	 */</div><div class='del'>-	err = upa_readl(fhc-&gt;fhc_regs.pregs + FHC_PREGS_BSR);</div><div class='del'>-	fhc-&gt;board = (((err &gt;&gt; 16) &amp; 0x01) |</div><div class='del'>-		      ((err &gt;&gt; 12) &amp; 0x0e));</div><div class='del'>-</div><div class='del'>-	fhc-&gt;jtag_master = 0;</div><div class='del'>-</div><div class='del'>-	/* Attach the clock board registers for CENTRAL. */</div><div class='del'>-	probe_clock_board(central_bus, fhc, fp);</div><div class='del'>-</div><div class='del'>-	err = upa_readl(fhc-&gt;fhc_regs.pregs + FHC_PREGS_ID);</div><div class='del'>-	printk("FHC(board %d): Version[%x] PartID[%x] Manuf[%x] (CENTRAL)\n",</div><div class='del'>-	       fhc-&gt;board,</div><div class='del'>-	       ((err &amp; FHC_ID_VERS) &gt;&gt; 28),</div><div class='del'>-	       ((err &amp; FHC_ID_PARTID) &gt;&gt; 12),</div><div class='del'>-	       ((err &amp; FHC_ID_MANUF) &gt;&gt; 1));</div><div class='del'>-</div><div class='del'>-	probe_other_fhcs();</div><div class='del'>-</div><div class='del'>-	init_all_fhc_hw();</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-static inline void fhc_ledblink(struct linux_fhc *fhc, int on)</div><div class='del'>-{</div><div class='del'>-	u32 tmp;</div><div class='add'>+	if (!p-&gt;central) {</div><div class='add'>+		p-&gt;leds_resource.start = (unsigned long)</div><div class='add'>+			(p-&gt;pregs + FHC_PREGS_CTRL);</div><div class='add'>+		p-&gt;leds_resource.end = p-&gt;leds_resource.end;</div><div class='add'>+		p-&gt;leds_resource.name = "leds";</div><div class='add'>+</div><div class='add'>+		p-&gt;leds_pdev.name = "sunfire-fhc-leds";</div><div class='add'>+		p-&gt;leds_pdev.resource = &amp;p-&gt;leds_resource;</div><div class='add'>+		p-&gt;leds_pdev.num_resources = 1;</div><div class='add'>+		p-&gt;leds_pdev.dev.parent = &amp;op-&gt;dev;</div><div class='add'>+</div><div class='add'>+		err = platform_device_register(&amp;p-&gt;leds_pdev);</div><div class='add'>+		if (err) {</div><div class='add'>+			printk(KERN_ERR "fhc: Could not register LEDS "</div><div class='add'>+			       "platform device\n");</div><div class='add'>+			goto out_unmap_pregs;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	reg = upa_readl(p-&gt;pregs + FHC_PREGS_CTRL);</div><div class='ctx'> </div><div class='del'>-	tmp = upa_readl(fhc-&gt;fhc_regs.pregs + FHC_PREGS_CTRL);</div><div class='add'>+	if (!p-&gt;central)</div><div class='add'>+		reg |= FHC_CONTROL_IXIST;</div><div class='ctx'> </div><div class='del'>-	/* NOTE: reverse logic on this bit */</div><div class='del'>-	if (on)</div><div class='del'>-		tmp &amp;= ~(FHC_CONTROL_RLED);</div><div class='del'>-	else</div><div class='del'>-		tmp |= FHC_CONTROL_RLED;</div><div class='del'>-	tmp &amp;= ~(FHC_CONTROL_AOFF | FHC_CONTROL_BOFF | FHC_CONTROL_SLINE);</div><div class='add'>+	reg &amp;= ~(FHC_CONTROL_AOFF |</div><div class='add'>+		 FHC_CONTROL_BOFF |</div><div class='add'>+		 FHC_CONTROL_SLINE);</div><div class='ctx'> </div><div class='del'>-	upa_writel(tmp, fhc-&gt;fhc_regs.pregs + FHC_PREGS_CTRL);</div><div class='del'>-	upa_readl(fhc-&gt;fhc_regs.pregs + FHC_PREGS_CTRL);</div><div class='del'>-}</div><div class='add'>+	upa_writel(reg, p-&gt;pregs + FHC_PREGS_CTRL);</div><div class='add'>+	upa_readl(p-&gt;pregs + FHC_PREGS_CTRL);</div><div class='ctx'> </div><div class='del'>-static inline void central_ledblink(struct linux_central *central, int on)</div><div class='del'>-{</div><div class='del'>-	u8 tmp;</div><div class='del'>-</div><div class='del'>-	tmp = upa_readb(central-&gt;clkregs + CLOCK_CTRL);</div><div class='add'>+	reg = upa_readl(p-&gt;pregs + FHC_PREGS_ID);</div><div class='add'>+	printk(KERN_INFO "fhc: Board #%d, Version[%x] PartID[%x] Manuf[%x] %s\n",</div><div class='add'>+	       p-&gt;board_num,</div><div class='add'>+	       (reg &amp; FHC_ID_VERS) &gt;&gt; 28,</div><div class='add'>+	       (reg &amp; FHC_ID_PARTID) &gt;&gt; 12,</div><div class='add'>+	       (reg &amp; FHC_ID_MANUF) &gt;&gt; 1,</div><div class='add'>+	       (p-&gt;jtag_master ?</div><div class='add'>+		"(JTAG Master)" :</div><div class='add'>+		(p-&gt;central ? "(Central)" : "")));</div><div class='ctx'> </div><div class='del'>-	/* NOTE: reverse logic on this bit */</div><div class='del'>-	if (on)</div><div class='del'>-		tmp &amp;= ~(CLOCK_CTRL_RLED);</div><div class='del'>-	else</div><div class='del'>-		tmp |= CLOCK_CTRL_RLED;</div><div class='add'>+	err = 0;</div><div class='ctx'> </div><div class='del'>-	upa_writeb(tmp, central-&gt;clkregs + CLOCK_CTRL);</div><div class='del'>-	upa_readb(central-&gt;clkregs + CLOCK_CTRL);</div><div class='del'>-}</div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='ctx'> </div><div class='del'>-static struct timer_list sftimer;</div><div class='del'>-static int led_state;</div><div class='add'>+out_unmap_pregs:</div><div class='add'>+	of_iounmap(&amp;op-&gt;resource[0], p-&gt;pregs, resource_size(&amp;op-&gt;resource[0]));</div><div class='ctx'> </div><div class='del'>-static void sunfire_timer(unsigned long __ignored)</div><div class='del'>-{</div><div class='del'>-	struct linux_fhc *fhc;</div><div class='del'>-</div><div class='del'>-	central_ledblink(central_bus, led_state);</div><div class='del'>-	for (fhc = fhc_list; fhc != NULL; fhc = fhc-&gt;next)</div><div class='del'>-		if (! IS_CENTRAL_FHC(fhc))</div><div class='del'>-			fhc_ledblink(fhc, led_state);</div><div class='del'>-	led_state = ! led_state;</div><div class='del'>-	sftimer.expires = jiffies + (HZ &gt;&gt; 1);</div><div class='del'>-	add_timer(&amp;sftimer);</div><div class='add'>+out_free:</div><div class='add'>+	kfree(p);</div><div class='add'>+	goto out;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* After PCI/SBUS busses have been probed, this is called to perform</div><div class='del'>- * final initialization of all FireHose Controllers in the system.</div><div class='del'>- */</div><div class='del'>-void firetruck_init(void)</div><div class='add'>+static struct of_device_id __initdata fhc_match[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "fhc",</div><div class='add'>+	},</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct of_platform_driver fhc_driver = {</div><div class='add'>+	.match_table	= fhc_match,</div><div class='add'>+	.probe		= fhc_probe,</div><div class='add'>+	.driver		= {</div><div class='add'>+		.name	= "fhc",</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init sunfire_init(void)</div><div class='ctx'> {</div><div class='del'>-	struct linux_central *central = central_bus;</div><div class='del'>-	u8 ctrl;</div><div class='del'>-</div><div class='del'>-	/* No central bus, nothing to do. */</div><div class='del'>-	if (central == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* OBP leaves it on, turn it off so clock board timer LED</div><div class='del'>-	 * is in sync with FHC ones.</div><div class='del'>-	 */</div><div class='del'>-	ctrl = upa_readb(central-&gt;clkregs + CLOCK_CTRL);</div><div class='del'>-	ctrl &amp;= ~(CLOCK_CTRL_RLED);</div><div class='del'>-	upa_writeb(ctrl, central-&gt;clkregs + CLOCK_CTRL);</div><div class='del'>-</div><div class='del'>-	led_state = 0;</div><div class='del'>-	init_timer(&amp;sftimer);</div><div class='del'>-	sftimer.data = 0;</div><div class='del'>-	sftimer.function = &amp;sunfire_timer;</div><div class='del'>-	sftimer.expires = jiffies + (HZ &gt;&gt; 1);</div><div class='del'>-	add_timer(&amp;sftimer);</div><div class='add'>+	(void) of_register_driver(&amp;fhc_driver, &amp;of_platform_bus_type);</div><div class='add'>+	(void) of_register_driver(&amp;clock_board_driver, &amp;of_platform_bus_type);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+subsys_initcall(sunfire_init);</div><div class='head'>diff --git a/arch/sparc64/kernel/chmc.c b/arch/sparc64/kernel/chmc.c<br/>index 6d4f02e8a4cf..3b9f4d6e14a9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/chmc.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc64/kernel/chmc.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/chmc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/chmc.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='del'>-/* memctrlr.c: Driver for UltraSPARC-III memory controller.</div><div class='add'>+/* chmc.c: Driver for UltraSPARC-III memory controller.</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2001, 2007 David S. Miller (davem@davemloft.net)</div><div class='add'>+ * Copyright (C) 2001, 2007, 2008 David S. Miller (davem@davemloft.net)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -13,45 +13,64 @@</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_device.h&gt;</div><div class='ctx'> #include &lt;asm/spitfire.h&gt;</div><div class='ctx'> #include &lt;asm/chmctrl.h&gt;</div><div class='ctx'> #include &lt;asm/cpudata.h&gt;</div><div class='ctx'> #include &lt;asm/oplib.h&gt;</div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='add'>+#include &lt;asm/head.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/memctrl.h&gt;</div><div class='add'>+</div><div class='add'>+#define DRV_MODULE_NAME		"chmc"</div><div class='add'>+#define PFX DRV_MODULE_NAME	": "</div><div class='add'>+#define DRV_MODULE_VERSION	"0.2"</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("David S. Miller (davem@davemloft.net)");</div><div class='add'>+MODULE_DESCRIPTION("UltraSPARC-III memory controller driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_VERSION(DRV_MODULE_VERSION);</div><div class='add'>+</div><div class='add'>+static int mc_type;</div><div class='add'>+#define MC_TYPE_SAFARI		1</div><div class='add'>+#define MC_TYPE_JBUS		2</div><div class='add'>+</div><div class='add'>+static dimm_printer_t us3mc_dimm_printer;</div><div class='ctx'> </div><div class='ctx'> #define CHMCTRL_NDGRPS	2</div><div class='ctx'> #define CHMCTRL_NDIMMS	4</div><div class='ctx'> </div><div class='del'>-#define DIMMS_PER_MC	(CHMCTRL_NDGRPS * CHMCTRL_NDIMMS)</div><div class='add'>+#define CHMC_DIMMS_PER_MC	(CHMCTRL_NDGRPS * CHMCTRL_NDIMMS)</div><div class='ctx'> </div><div class='ctx'> /* OBP memory-layout property format. */</div><div class='del'>-struct obp_map {</div><div class='add'>+struct chmc_obp_map {</div><div class='ctx'> 	unsigned char	dimm_map[144];</div><div class='ctx'> 	unsigned char	pin_map[576];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define DIMM_LABEL_SZ	8</div><div class='ctx'> </div><div class='del'>-struct obp_mem_layout {</div><div class='add'>+struct chmc_obp_mem_layout {</div><div class='ctx'> 	/* One max 8-byte string label per DIMM.  Usually</div><div class='ctx'> 	 * this matches the label on the motherboard where</div><div class='ctx'> 	 * that DIMM resides.</div><div class='ctx'> 	 */</div><div class='del'>-	char		dimm_labels[DIMMS_PER_MC][DIMM_LABEL_SZ];</div><div class='add'>+	char			dimm_labels[CHMC_DIMMS_PER_MC][DIMM_LABEL_SZ];</div><div class='ctx'> </div><div class='ctx'> 	/* If symmetric use map[0], else it is</div><div class='ctx'> 	 * asymmetric and map[1] should be used.</div><div class='ctx'> 	 */</div><div class='del'>-	char		symmetric;</div><div class='add'>+	char			symmetric;</div><div class='ctx'> </div><div class='del'>-	struct obp_map	map[2];</div><div class='add'>+	struct chmc_obp_map	map[2];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define CHMCTRL_NBANKS	4</div><div class='ctx'> </div><div class='del'>-struct bank_info {</div><div class='del'>-	struct mctrl_info	*mp;</div><div class='add'>+struct chmc_bank_info {</div><div class='add'>+	struct chmc		*p;</div><div class='ctx'> 	int			bank_id;</div><div class='ctx'> </div><div class='ctx'> 	u64			raw_reg;</div><div class='hunk'>@@ -65,28 +84,406 @@ struct bank_info {</div><div class='ctx'> 	unsigned long		size;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct mctrl_info {</div><div class='del'>-	struct list_head	list;</div><div class='del'>-	int			portid;</div><div class='add'>+struct chmc {</div><div class='add'>+	struct list_head		list;</div><div class='add'>+	int				portid;</div><div class='add'>+</div><div class='add'>+	struct chmc_obp_mem_layout	layout_prop;</div><div class='add'>+	int				layout_size;</div><div class='add'>+</div><div class='add'>+	void __iomem			*regs;</div><div class='ctx'> </div><div class='del'>-	struct obp_mem_layout	layout_prop;</div><div class='del'>-	int			layout_size;</div><div class='add'>+	u64				timing_control1;</div><div class='add'>+	u64				timing_control2;</div><div class='add'>+	u64				timing_control3;</div><div class='add'>+	u64				timing_control4;</div><div class='add'>+	u64				memaddr_control;</div><div class='ctx'> </div><div class='del'>-	void __iomem		*regs;</div><div class='add'>+	struct chmc_bank_info		logical_banks[CHMCTRL_NBANKS];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define JBUSMC_REGS_SIZE		8</div><div class='add'>+</div><div class='add'>+#define JB_MC_REG1_DIMM2_BANK3		0x8000000000000000UL</div><div class='add'>+#define JB_MC_REG1_DIMM1_BANK1		0x4000000000000000UL</div><div class='add'>+#define JB_MC_REG1_DIMM2_BANK2		0x2000000000000000UL</div><div class='add'>+#define JB_MC_REG1_DIMM1_BANK0		0x1000000000000000UL</div><div class='add'>+#define JB_MC_REG1_XOR			0x0000010000000000UL</div><div class='add'>+#define JB_MC_REG1_ADDR_GEN_2		0x000000e000000000UL</div><div class='add'>+#define JB_MC_REG1_ADDR_GEN_2_SHIFT	37</div><div class='add'>+#define JB_MC_REG1_ADDR_GEN_1		0x0000001c00000000UL</div><div class='add'>+#define JB_MC_REG1_ADDR_GEN_1_SHIFT	34</div><div class='add'>+#define JB_MC_REG1_INTERLEAVE		0x0000000001800000UL</div><div class='add'>+#define JB_MC_REG1_INTERLEAVE_SHIFT	23</div><div class='add'>+#define JB_MC_REG1_DIMM2_PTYPE		0x0000000000200000UL</div><div class='add'>+#define JB_MC_REG1_DIMM2_PTYPE_SHIFT	21</div><div class='add'>+#define JB_MC_REG1_DIMM1_PTYPE		0x0000000000100000UL</div><div class='add'>+#define JB_MC_REG1_DIMM1_PTYPE_SHIFT	20</div><div class='add'>+</div><div class='add'>+#define PART_TYPE_X8		0</div><div class='add'>+#define PART_TYPE_X4		1</div><div class='add'>+</div><div class='add'>+#define INTERLEAVE_NONE		0</div><div class='add'>+#define INTERLEAVE_SAME		1</div><div class='add'>+#define INTERLEAVE_INTERNAL	2</div><div class='add'>+#define INTERLEAVE_BOTH		3</div><div class='add'>+</div><div class='add'>+#define ADDR_GEN_128MB		0</div><div class='add'>+#define ADDR_GEN_256MB		1</div><div class='add'>+#define ADDR_GEN_512MB		2</div><div class='add'>+#define ADDR_GEN_1GB		3</div><div class='add'>+</div><div class='add'>+#define JB_NUM_DIMM_GROUPS	2</div><div class='add'>+#define JB_NUM_DIMMS_PER_GROUP	2</div><div class='add'>+#define JB_NUM_DIMMS		(JB_NUM_DIMM_GROUPS * JB_NUM_DIMMS_PER_GROUP)</div><div class='add'>+</div><div class='add'>+struct jbusmc_obp_map {</div><div class='add'>+	unsigned char	dimm_map[18];</div><div class='add'>+	unsigned char	pin_map[144];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct jbusmc_obp_mem_layout {</div><div class='add'>+	/* One max 8-byte string label per DIMM.  Usually</div><div class='add'>+	 * this matches the label on the motherboard where</div><div class='add'>+	 * that DIMM resides.</div><div class='add'>+	 */</div><div class='add'>+	char		dimm_labels[JB_NUM_DIMMS][DIMM_LABEL_SZ];</div><div class='add'>+</div><div class='add'>+	/* If symmetric use map[0], else it is</div><div class='add'>+	 * asymmetric and map[1] should be used.</div><div class='add'>+	 */</div><div class='add'>+	char			symmetric;</div><div class='add'>+</div><div class='add'>+	struct jbusmc_obp_map	map;</div><div class='add'>+</div><div class='add'>+	char			_pad;</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-	u64			timing_control1;</div><div class='del'>-	u64			timing_control2;</div><div class='del'>-	u64			timing_control3;</div><div class='del'>-	u64			timing_control4;</div><div class='del'>-	u64			memaddr_control;</div><div class='add'>+struct jbusmc_dimm_group {</div><div class='add'>+	struct jbusmc			*controller;</div><div class='add'>+	int				index;</div><div class='add'>+	u64				base_addr;</div><div class='add'>+	u64				size;</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-	struct bank_info	logical_banks[CHMCTRL_NBANKS];</div><div class='add'>+struct jbusmc {</div><div class='add'>+	void __iomem			*regs;</div><div class='add'>+	u64				mc_reg_1;</div><div class='add'>+	u32				portid;</div><div class='add'>+	struct jbusmc_obp_mem_layout	layout;</div><div class='add'>+	int				layout_len;</div><div class='add'>+	int				num_dimm_groups;</div><div class='add'>+	struct jbusmc_dimm_group	dimm_groups[JB_NUM_DIMM_GROUPS];</div><div class='add'>+	struct list_head		list;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static DEFINE_SPINLOCK(mctrl_list_lock);</div><div class='ctx'> static LIST_HEAD(mctrl_list);</div><div class='ctx'> </div><div class='add'>+static void mc_list_add(struct list_head *list)</div><div class='add'>+{</div><div class='add'>+	spin_lock(&amp;mctrl_list_lock);</div><div class='add'>+	list_add(list, &amp;mctrl_list);</div><div class='add'>+	spin_unlock(&amp;mctrl_list_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mc_list_del(struct list_head *list)</div><div class='add'>+{</div><div class='add'>+	spin_lock(&amp;mctrl_list_lock);</div><div class='add'>+	list_del_init(list);</div><div class='add'>+	spin_unlock(&amp;mctrl_list_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define SYNDROME_MIN	-1</div><div class='add'>+#define SYNDROME_MAX	144</div><div class='add'>+</div><div class='add'>+/* Covert syndrome code into the way the bits are positioned</div><div class='add'>+ * on the bus.</div><div class='add'>+ */</div><div class='add'>+static int syndrome_to_qword_code(int syndrome_code)</div><div class='add'>+{</div><div class='add'>+	if (syndrome_code &lt; 128)</div><div class='add'>+		syndrome_code += 16;</div><div class='add'>+	else if (syndrome_code &lt; 128 + 9)</div><div class='add'>+		syndrome_code -= (128 - 7);</div><div class='add'>+	else if (syndrome_code &lt; (128 + 9 + 3))</div><div class='add'>+		syndrome_code -= (128 + 9 - 4);</div><div class='add'>+	else</div><div class='add'>+		syndrome_code -= (128 + 9 + 3);</div><div class='add'>+	return syndrome_code;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* All this magic has to do with how a cache line comes over the wire</div><div class='add'>+ * on Safari and JBUS.  A 64-bit line comes over in 1 or more quadword</div><div class='add'>+ * cycles, each of which transmit ECC/MTAG info as well as the actual</div><div class='add'>+ * data.</div><div class='add'>+ */</div><div class='add'>+#define L2_LINE_SIZE		64</div><div class='add'>+#define L2_LINE_ADDR_MSK	(L2_LINE_SIZE - 1)</div><div class='add'>+#define QW_PER_LINE		4</div><div class='add'>+#define QW_BYTES		(L2_LINE_SIZE / QW_PER_LINE)</div><div class='add'>+#define QW_BITS			144</div><div class='add'>+#define SAFARI_LAST_BIT		(576 - 1)</div><div class='add'>+#define JBUS_LAST_BIT		(144 - 1)</div><div class='add'>+</div><div class='add'>+static void get_pin_and_dimm_str(int syndrome_code, unsigned long paddr,</div><div class='add'>+				 int *pin_p, char **dimm_str_p, void *_prop,</div><div class='add'>+				 int base_dimm_offset)</div><div class='add'>+{</div><div class='add'>+	int qword_code = syndrome_to_qword_code(syndrome_code);</div><div class='add'>+	int cache_line_offset;</div><div class='add'>+	int offset_inverse;</div><div class='add'>+	int dimm_map_index;</div><div class='add'>+	int map_val;</div><div class='add'>+</div><div class='add'>+	if (mc_type == MC_TYPE_JBUS) {</div><div class='add'>+		struct jbusmc_obp_mem_layout *p = _prop;</div><div class='add'>+</div><div class='add'>+		/* JBUS */</div><div class='add'>+		cache_line_offset = qword_code;</div><div class='add'>+		offset_inverse = (JBUS_LAST_BIT - cache_line_offset);</div><div class='add'>+		dimm_map_index = offset_inverse / 8;</div><div class='add'>+		map_val = p-&gt;map.dimm_map[dimm_map_index];</div><div class='add'>+		map_val = ((map_val &gt;&gt; ((7 - (offset_inverse &amp; 7)))) &amp; 1);</div><div class='add'>+		*dimm_str_p = p-&gt;dimm_labels[base_dimm_offset + map_val];</div><div class='add'>+		*pin_p = p-&gt;map.pin_map[cache_line_offset];</div><div class='add'>+	} else {</div><div class='add'>+		struct chmc_obp_mem_layout *p = _prop;</div><div class='add'>+		struct chmc_obp_map *mp;</div><div class='add'>+		int qword;</div><div class='add'>+</div><div class='add'>+		/* Safari */</div><div class='add'>+		if (p-&gt;symmetric)</div><div class='add'>+			mp = &amp;p-&gt;map[0];</div><div class='add'>+		else</div><div class='add'>+			mp = &amp;p-&gt;map[1];</div><div class='add'>+</div><div class='add'>+		qword = (paddr &amp; L2_LINE_ADDR_MSK) / QW_BYTES;</div><div class='add'>+		cache_line_offset = ((3 - qword) * QW_BITS) + qword_code;</div><div class='add'>+		offset_inverse = (SAFARI_LAST_BIT - cache_line_offset);</div><div class='add'>+		dimm_map_index = offset_inverse &gt;&gt; 2;</div><div class='add'>+		map_val = mp-&gt;dimm_map[dimm_map_index];</div><div class='add'>+		map_val = ((map_val &gt;&gt; ((3 - (offset_inverse &amp; 3)) &lt;&lt; 1)) &amp; 0x3);</div><div class='add'>+		*dimm_str_p = p-&gt;dimm_labels[base_dimm_offset + map_val];</div><div class='add'>+		*pin_p = mp-&gt;pin_map[cache_line_offset];</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct jbusmc_dimm_group *jbusmc_find_dimm_group(unsigned long phys_addr)</div><div class='add'>+{</div><div class='add'>+	struct jbusmc *p;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(p, &amp;mctrl_list, list) {</div><div class='add'>+		int i;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; p-&gt;num_dimm_groups; i++) {</div><div class='add'>+			struct jbusmc_dimm_group *dp = &amp;p-&gt;dimm_groups[i];</div><div class='add'>+</div><div class='add'>+			if (phys_addr &lt; dp-&gt;base_addr ||</div><div class='add'>+			    (dp-&gt;base_addr + dp-&gt;size) &lt;= phys_addr)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			return dp;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int jbusmc_print_dimm(int syndrome_code,</div><div class='add'>+			     unsigned long phys_addr,</div><div class='add'>+			     char *buf, int buflen)</div><div class='add'>+{</div><div class='add'>+	struct jbusmc_obp_mem_layout *prop;</div><div class='add'>+	struct jbusmc_dimm_group *dp;</div><div class='add'>+	struct jbusmc *p;</div><div class='add'>+	int first_dimm;</div><div class='add'>+</div><div class='add'>+	dp = jbusmc_find_dimm_group(phys_addr);</div><div class='add'>+	if (dp == NULL ||</div><div class='add'>+	    syndrome_code &lt; SYNDROME_MIN ||</div><div class='add'>+	    syndrome_code &gt; SYNDROME_MAX) {</div><div class='add'>+		buf[0] = '?';</div><div class='add'>+		buf[1] = '?';</div><div class='add'>+		buf[2] = '?';</div><div class='add'>+		buf[3] = '\0';</div><div class='add'>+	}</div><div class='add'>+	p = dp-&gt;controller;</div><div class='add'>+	prop = &amp;p-&gt;layout;</div><div class='add'>+</div><div class='add'>+	first_dimm = dp-&gt;index * JB_NUM_DIMMS_PER_GROUP;</div><div class='add'>+</div><div class='add'>+	if (syndrome_code != SYNDROME_MIN) {</div><div class='add'>+		char *dimm_str;</div><div class='add'>+		int pin;</div><div class='add'>+</div><div class='add'>+		get_pin_and_dimm_str(syndrome_code, phys_addr, &amp;pin,</div><div class='add'>+				     &amp;dimm_str, prop, first_dimm);</div><div class='add'>+		sprintf(buf, "%s, pin %3d", dimm_str, pin);</div><div class='add'>+	} else {</div><div class='add'>+		int dimm;</div><div class='add'>+</div><div class='add'>+		/* Multi-bit error, we just dump out all the</div><div class='add'>+		 * dimm labels associated with this dimm group.</div><div class='add'>+		 */</div><div class='add'>+		for (dimm = 0; dimm &lt; JB_NUM_DIMMS_PER_GROUP; dimm++) {</div><div class='add'>+			sprintf(buf, "%s ",</div><div class='add'>+				prop-&gt;dimm_labels[first_dimm + dimm]);</div><div class='add'>+			buf += strlen(buf);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u64 __devinit jbusmc_dimm_group_size(u64 base,</div><div class='add'>+					    const struct linux_prom64_registers *mem_regs,</div><div class='add'>+					    int num_mem_regs)</div><div class='add'>+{</div><div class='add'>+	u64 max = base + (8UL * 1024 * 1024 * 1024);</div><div class='add'>+	u64 max_seen = base;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num_mem_regs; i++) {</div><div class='add'>+		const struct linux_prom64_registers *ent;</div><div class='add'>+		u64 this_base;</div><div class='add'>+		u64 this_end;</div><div class='add'>+</div><div class='add'>+		ent = &amp;mem_regs[i];</div><div class='add'>+		this_base = ent-&gt;phys_addr;</div><div class='add'>+		this_end = this_base + ent-&gt;reg_size;</div><div class='add'>+		if (base &lt; this_base || base &gt;= this_end)</div><div class='add'>+			continue;</div><div class='add'>+		if (this_end &gt; max)</div><div class='add'>+			this_end = max;</div><div class='add'>+		if (this_end &gt; max_seen)</div><div class='add'>+			max_seen = this_end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return max_seen - base;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __devinit jbusmc_construct_one_dimm_group(struct jbusmc *p,</div><div class='add'>+						      unsigned long index,</div><div class='add'>+						      const struct linux_prom64_registers *mem_regs,</div><div class='add'>+						      int num_mem_regs)</div><div class='add'>+{</div><div class='add'>+	struct jbusmc_dimm_group *dp = &amp;p-&gt;dimm_groups[index];</div><div class='add'>+</div><div class='add'>+	dp-&gt;controller = p;</div><div class='add'>+	dp-&gt;index = index;</div><div class='add'>+</div><div class='add'>+	dp-&gt;base_addr  = (p-&gt;portid * (64UL * 1024 * 1024 * 1024));</div><div class='add'>+	dp-&gt;base_addr += (index * (8UL * 1024 * 1024 * 1024));</div><div class='add'>+	dp-&gt;size = jbusmc_dimm_group_size(dp-&gt;base_addr, mem_regs, num_mem_regs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __devinit jbusmc_construct_dimm_groups(struct jbusmc *p,</div><div class='add'>+						   const struct linux_prom64_registers *mem_regs,</div><div class='add'>+						   int num_mem_regs)</div><div class='add'>+{</div><div class='add'>+	if (p-&gt;mc_reg_1 &amp; JB_MC_REG1_DIMM1_BANK0) {</div><div class='add'>+		jbusmc_construct_one_dimm_group(p, 0, mem_regs, num_mem_regs);</div><div class='add'>+		p-&gt;num_dimm_groups++;</div><div class='add'>+	}</div><div class='add'>+	if (p-&gt;mc_reg_1 &amp; JB_MC_REG1_DIMM2_BANK2) {</div><div class='add'>+		jbusmc_construct_one_dimm_group(p, 1, mem_regs, num_mem_regs);</div><div class='add'>+		p-&gt;num_dimm_groups++;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devinit jbusmc_probe(struct of_device *op,</div><div class='add'>+				  const struct of_device_id *match)</div><div class='add'>+{</div><div class='add'>+	const struct linux_prom64_registers *mem_regs;</div><div class='add'>+	struct device_node *mem_node;</div><div class='add'>+	int err, len, num_mem_regs;</div><div class='add'>+	struct jbusmc *p;</div><div class='add'>+	const u32 *prop;</div><div class='add'>+	const void *ml;</div><div class='add'>+</div><div class='add'>+	err = -ENODEV;</div><div class='add'>+	mem_node = of_find_node_by_path("/memory");</div><div class='add'>+	if (!mem_node) {</div><div class='add'>+		printk(KERN_ERR PFX "Cannot find /memory node.\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	mem_regs = of_get_property(mem_node, "reg", &amp;len);</div><div class='add'>+	if (!mem_regs) {</div><div class='add'>+		printk(KERN_ERR PFX "Cannot get reg property of /memory node.\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	num_mem_regs = len / sizeof(*mem_regs);</div><div class='add'>+</div><div class='add'>+	err = -ENOMEM;</div><div class='add'>+	p = kzalloc(sizeof(*p), GFP_KERNEL);</div><div class='add'>+	if (!p) {</div><div class='add'>+		printk(KERN_ERR PFX "Cannot allocate struct jbusmc.\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;p-&gt;list);</div><div class='add'>+</div><div class='add'>+	err = -ENODEV;</div><div class='add'>+	prop = of_get_property(op-&gt;node, "portid", &amp;len);</div><div class='add'>+	if (!prop || len != 4) {</div><div class='add'>+		printk(KERN_ERR PFX "Cannot find portid.\n");</div><div class='add'>+		goto out_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	p-&gt;portid = *prop;</div><div class='add'>+</div><div class='add'>+	prop = of_get_property(op-&gt;node, "memory-control-register-1", &amp;len);</div><div class='add'>+	if (!prop || len != 8) {</div><div class='add'>+		printk(KERN_ERR PFX "Cannot get memory control register 1.\n");</div><div class='add'>+		goto out_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	p-&gt;mc_reg_1 = ((u64)prop[0] &lt;&lt; 32) | (u64) prop[1];</div><div class='add'>+</div><div class='add'>+	err = -ENOMEM;</div><div class='add'>+	p-&gt;regs = of_ioremap(&amp;op-&gt;resource[0], 0, JBUSMC_REGS_SIZE, "jbusmc");</div><div class='add'>+	if (!p-&gt;regs) {</div><div class='add'>+		printk(KERN_ERR PFX "Cannot map jbusmc regs.\n");</div><div class='add'>+		goto out_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = -ENODEV;</div><div class='add'>+	ml = of_get_property(op-&gt;node, "memory-layout", &amp;p-&gt;layout_len);</div><div class='add'>+	if (!ml) {</div><div class='add'>+		printk(KERN_ERR PFX "Cannot get memory layout property.\n");</div><div class='add'>+		goto out_iounmap;</div><div class='add'>+	}</div><div class='add'>+	if (p-&gt;layout_len &gt; sizeof(p-&gt;layout)) {</div><div class='add'>+		printk(KERN_ERR PFX "Unexpected memory-layout size %d\n",</div><div class='add'>+		       p-&gt;layout_len);</div><div class='add'>+		goto out_iounmap;</div><div class='add'>+	}</div><div class='add'>+	memcpy(&amp;p-&gt;layout, ml, p-&gt;layout_len);</div><div class='add'>+</div><div class='add'>+	jbusmc_construct_dimm_groups(p, mem_regs, num_mem_regs);</div><div class='add'>+</div><div class='add'>+	mc_list_add(&amp;p-&gt;list);</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO PFX "UltraSPARC-IIIi memory controller at %s\n",</div><div class='add'>+	       op-&gt;node-&gt;full_name);</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(&amp;op-&gt;dev, p);</div><div class='add'>+</div><div class='add'>+	err = 0;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='add'>+</div><div class='add'>+out_iounmap:</div><div class='add'>+	of_iounmap(&amp;op-&gt;resource[0], p-&gt;regs, JBUSMC_REGS_SIZE);</div><div class='add'>+</div><div class='add'>+out_free:</div><div class='add'>+	kfree(p);</div><div class='add'>+	goto out;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Does BANK decode PHYS_ADDR? */</div><div class='del'>-static int bank_match(struct bank_info *bp, unsigned long phys_addr)</div><div class='add'>+static int chmc_bank_match(struct chmc_bank_info *bp, unsigned long phys_addr)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long upper_bits = (phys_addr &amp; PA_UPPER_BITS) &gt;&gt; PA_UPPER_BITS_SHIFT;</div><div class='ctx'> 	unsigned long lower_bits = (phys_addr &amp; PA_LOWER_BITS) &gt;&gt; PA_LOWER_BITS_SHIFT;</div><div class='hunk'>@@ -118,25 +515,18 @@ static int bank_match(struct bank_info *bp, unsigned long phys_addr)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Given PHYS_ADDR, search memory controller banks for a match. */</div><div class='del'>-static struct bank_info *find_bank(unsigned long phys_addr)</div><div class='add'>+static struct chmc_bank_info *chmc_find_bank(unsigned long phys_addr)</div><div class='ctx'> {</div><div class='del'>-	struct list_head *mctrl_head = &amp;mctrl_list;</div><div class='del'>-	struct list_head *mctrl_entry = mctrl_head-&gt;next;</div><div class='add'>+	struct chmc *p;</div><div class='ctx'> </div><div class='del'>-	for (;;) {</div><div class='del'>-		struct mctrl_info *mp =</div><div class='del'>-			list_entry(mctrl_entry, struct mctrl_info, list);</div><div class='add'>+	list_for_each_entry(p, &amp;mctrl_list, list) {</div><div class='ctx'> 		int bank_no;</div><div class='ctx'> </div><div class='del'>-		if (mctrl_entry == mctrl_head)</div><div class='del'>-			break;</div><div class='del'>-		mctrl_entry = mctrl_entry-&gt;next;</div><div class='del'>-</div><div class='ctx'> 		for (bank_no = 0; bank_no &lt; CHMCTRL_NBANKS; bank_no++) {</div><div class='del'>-			struct bank_info *bp;</div><div class='add'>+			struct chmc_bank_info *bp;</div><div class='ctx'> </div><div class='del'>-			bp = &amp;mp-&gt;logical_banks[bank_no];</div><div class='del'>-			if (bank_match(bp, phys_addr))</div><div class='add'>+			bp = &amp;p-&gt;logical_banks[bank_no];</div><div class='add'>+			if (chmc_bank_match(bp, phys_addr))</div><div class='ctx'> 				return bp;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -145,17 +535,15 @@ static struct bank_info *find_bank(unsigned long phys_addr)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* This is the main purpose of this driver. */</div><div class='del'>-#define SYNDROME_MIN	-1</div><div class='del'>-#define SYNDROME_MAX	144</div><div class='del'>-int chmc_getunumber(int syndrome_code,</div><div class='del'>-		    unsigned long phys_addr,</div><div class='del'>-		    char *buf, int buflen)</div><div class='add'>+static int chmc_print_dimm(int syndrome_code,</div><div class='add'>+			   unsigned long phys_addr,</div><div class='add'>+			   char *buf, int buflen)</div><div class='ctx'> {</div><div class='del'>-	struct bank_info *bp;</div><div class='del'>-	struct obp_mem_layout *prop;</div><div class='add'>+	struct chmc_bank_info *bp;</div><div class='add'>+	struct chmc_obp_mem_layout *prop;</div><div class='ctx'> 	int bank_in_controller, first_dimm;</div><div class='ctx'> </div><div class='del'>-	bp = find_bank(phys_addr);</div><div class='add'>+	bp = chmc_find_bank(phys_addr);</div><div class='ctx'> 	if (bp == NULL ||</div><div class='ctx'> 	    syndrome_code &lt; SYNDROME_MIN ||</div><div class='ctx'> 	    syndrome_code &gt; SYNDROME_MAX) {</div><div class='hunk'>@@ -166,60 +554,18 @@ int chmc_getunumber(int syndrome_code,</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	prop = &amp;bp-&gt;mp-&gt;layout_prop;</div><div class='add'>+	prop = &amp;bp-&gt;p-&gt;layout_prop;</div><div class='ctx'> 	bank_in_controller = bp-&gt;bank_id &amp; (CHMCTRL_NBANKS - 1);</div><div class='ctx'> 	first_dimm  = (bank_in_controller &amp; (CHMCTRL_NDGRPS - 1));</div><div class='ctx'> 	first_dimm *= CHMCTRL_NDIMMS;</div><div class='ctx'> </div><div class='ctx'> 	if (syndrome_code != SYNDROME_MIN) {</div><div class='del'>-		struct obp_map *map;</div><div class='del'>-		int qword, where_in_line, where, map_index, map_offset;</div><div class='del'>-		unsigned int map_val;</div><div class='add'>+		char *dimm_str;</div><div class='add'>+		int pin;</div><div class='ctx'> </div><div class='del'>-		/* Yaay, single bit error so we can figure out</div><div class='del'>-		 * the exact dimm.</div><div class='del'>-		 */</div><div class='del'>-		if (prop-&gt;symmetric)</div><div class='del'>-			map = &amp;prop-&gt;map[0];</div><div class='del'>-		else</div><div class='del'>-			map = &amp;prop-&gt;map[1];</div><div class='del'>-</div><div class='del'>-		/* Covert syndrome code into the way the bits are</div><div class='del'>-		 * positioned on the bus.</div><div class='del'>-		 */</div><div class='del'>-		if (syndrome_code &lt; 144 - 16)</div><div class='del'>-			syndrome_code += 16;</div><div class='del'>-		else if (syndrome_code &lt; 144)</div><div class='del'>-			syndrome_code -= (144 - 7);</div><div class='del'>-		else if (syndrome_code &lt; (144 + 3))</div><div class='del'>-			syndrome_code -= (144 + 3 - 4);</div><div class='del'>-		else</div><div class='del'>-			syndrome_code -= 144 + 3;</div><div class='del'>-</div><div class='del'>-		/* All this magic has to do with how a cache line</div><div class='del'>-		 * comes over the wire on Safari.  A 64-bit line</div><div class='del'>-		 * comes over in 4 quadword cycles, each of which</div><div class='del'>-		 * transmit ECC/MTAG info as well as the actual</div><div class='del'>-		 * data.  144 bits per quadword, 576 total.</div><div class='del'>-		 */</div><div class='del'>-#define LINE_SIZE	64</div><div class='del'>-#define LINE_ADDR_MSK	(LINE_SIZE - 1)</div><div class='del'>-#define QW_PER_LINE	4</div><div class='del'>-#define QW_BYTES	(LINE_SIZE / QW_PER_LINE)</div><div class='del'>-#define QW_BITS		144</div><div class='del'>-#define LAST_BIT	(576 - 1)</div><div class='del'>-</div><div class='del'>-		qword = (phys_addr &amp; LINE_ADDR_MSK) / QW_BYTES;</div><div class='del'>-		where_in_line = ((3 - qword) * QW_BITS) + syndrome_code;</div><div class='del'>-		where = (LAST_BIT - where_in_line);</div><div class='del'>-		map_index = where &gt;&gt; 2;</div><div class='del'>-		map_offset = where &amp; 0x3;</div><div class='del'>-		map_val = map-&gt;dimm_map[map_index];</div><div class='del'>-		map_val = ((map_val &gt;&gt; ((3 - map_offset) &lt;&lt; 1)) &amp; (2 - 1));</div><div class='del'>-</div><div class='del'>-		sprintf(buf, "%s, pin %3d",</div><div class='del'>-			prop-&gt;dimm_labels[first_dimm + map_val],</div><div class='del'>-			map-&gt;pin_map[where_in_line]);</div><div class='add'>+		get_pin_and_dimm_str(syndrome_code, phys_addr, &amp;pin,</div><div class='add'>+				     &amp;dimm_str, prop, first_dimm);</div><div class='add'>+		sprintf(buf, "%s, pin %3d", dimm_str, pin);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		int dimm;</div><div class='ctx'> </div><div class='hunk'>@@ -240,7 +586,7 @@ int chmc_getunumber(int syndrome_code,</div><div class='ctx'>  * the code is executing, you must use special ASI load/store else</div><div class='ctx'>  * you go through the global mapping.</div><div class='ctx'>  */</div><div class='del'>-static u64 read_mcreg(struct mctrl_info *mp, unsigned long offset)</div><div class='add'>+static u64 chmc_read_mcreg(struct chmc *p, unsigned long offset)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long ret, this_cpu;</div><div class='ctx'> </div><div class='hunk'>@@ -248,14 +594,14 @@ static u64 read_mcreg(struct mctrl_info *mp, unsigned long offset)</div><div class='ctx'> </div><div class='ctx'> 	this_cpu = real_hard_smp_processor_id();</div><div class='ctx'> </div><div class='del'>-	if (mp-&gt;portid == this_cpu) {</div><div class='add'>+	if (p-&gt;portid == this_cpu) {</div><div class='ctx'> 		__asm__ __volatile__("ldxa	[%1] %2, %0"</div><div class='ctx'> 				     : "=r" (ret)</div><div class='ctx'> 				     : "r" (offset), "i" (ASI_MCU_CTRL_REG));</div><div class='ctx'> 	} else {</div><div class='ctx'> 		__asm__ __volatile__("ldxa	[%1] %2, %0"</div><div class='ctx'> 				     : "=r" (ret)</div><div class='del'>-				     : "r" (mp-&gt;regs + offset),</div><div class='add'>+				     : "r" (p-&gt;regs + offset),</div><div class='ctx'> 				       "i" (ASI_PHYS_BYPASS_EC_E));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -265,178 +611,253 @@ static u64 read_mcreg(struct mctrl_info *mp, unsigned long offset)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #if 0 /* currently unused */</div><div class='del'>-static void write_mcreg(struct mctrl_info *mp, unsigned long offset, u64 val)</div><div class='add'>+static void chmc_write_mcreg(struct chmc *p, unsigned long offset, u64 val)</div><div class='ctx'> {</div><div class='del'>-	if (mp-&gt;portid == smp_processor_id()) {</div><div class='add'>+	if (p-&gt;portid == smp_processor_id()) {</div><div class='ctx'> 		__asm__ __volatile__("stxa	%0, [%1] %2"</div><div class='ctx'> 				     : : "r" (val),</div><div class='ctx'> 				         "r" (offset), "i" (ASI_MCU_CTRL_REG));</div><div class='ctx'> 	} else {</div><div class='ctx'> 		__asm__ __volatile__("ldxa	%0, [%1] %2"</div><div class='ctx'> 				     : : "r" (val),</div><div class='del'>-				         "r" (mp-&gt;regs + offset),</div><div class='add'>+				         "r" (p-&gt;regs + offset),</div><div class='ctx'> 				         "i" (ASI_PHYS_BYPASS_EC_E));</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static void interpret_one_decode_reg(struct mctrl_info *mp, int which_bank, u64 val)</div><div class='add'>+static void chmc_interpret_one_decode_reg(struct chmc *p, int which_bank, u64 val)</div><div class='ctx'> {</div><div class='del'>-	struct bank_info *p = &amp;mp-&gt;logical_banks[which_bank];</div><div class='del'>-</div><div class='del'>-	p-&gt;mp = mp;</div><div class='del'>-	p-&gt;bank_id = (CHMCTRL_NBANKS * mp-&gt;portid) + which_bank;</div><div class='del'>-	p-&gt;raw_reg = val;</div><div class='del'>-	p-&gt;valid = (val &amp; MEM_DECODE_VALID) &gt;&gt; MEM_DECODE_VALID_SHIFT;</div><div class='del'>-	p-&gt;uk = (val &amp; MEM_DECODE_UK) &gt;&gt; MEM_DECODE_UK_SHIFT;</div><div class='del'>-	p-&gt;um = (val &amp; MEM_DECODE_UM) &gt;&gt; MEM_DECODE_UM_SHIFT;</div><div class='del'>-	p-&gt;lk = (val &amp; MEM_DECODE_LK) &gt;&gt; MEM_DECODE_LK_SHIFT;</div><div class='del'>-	p-&gt;lm = (val &amp; MEM_DECODE_LM) &gt;&gt; MEM_DECODE_LM_SHIFT;</div><div class='del'>-</div><div class='del'>-	p-&gt;base  =  (p-&gt;um);</div><div class='del'>-	p-&gt;base &amp;= ~(p-&gt;uk);</div><div class='del'>-	p-&gt;base &lt;&lt;= PA_UPPER_BITS_SHIFT;</div><div class='del'>-</div><div class='del'>-	switch(p-&gt;lk) {</div><div class='add'>+	struct chmc_bank_info *bp = &amp;p-&gt;logical_banks[which_bank];</div><div class='add'>+</div><div class='add'>+	bp-&gt;p = p;</div><div class='add'>+	bp-&gt;bank_id = (CHMCTRL_NBANKS * p-&gt;portid) + which_bank;</div><div class='add'>+	bp-&gt;raw_reg = val;</div><div class='add'>+	bp-&gt;valid = (val &amp; MEM_DECODE_VALID) &gt;&gt; MEM_DECODE_VALID_SHIFT;</div><div class='add'>+	bp-&gt;uk = (val &amp; MEM_DECODE_UK) &gt;&gt; MEM_DECODE_UK_SHIFT;</div><div class='add'>+	bp-&gt;um = (val &amp; MEM_DECODE_UM) &gt;&gt; MEM_DECODE_UM_SHIFT;</div><div class='add'>+	bp-&gt;lk = (val &amp; MEM_DECODE_LK) &gt;&gt; MEM_DECODE_LK_SHIFT;</div><div class='add'>+	bp-&gt;lm = (val &amp; MEM_DECODE_LM) &gt;&gt; MEM_DECODE_LM_SHIFT;</div><div class='add'>+</div><div class='add'>+	bp-&gt;base  =  (bp-&gt;um);</div><div class='add'>+	bp-&gt;base &amp;= ~(bp-&gt;uk);</div><div class='add'>+	bp-&gt;base &lt;&lt;= PA_UPPER_BITS_SHIFT;</div><div class='add'>+</div><div class='add'>+	switch(bp-&gt;lk) {</div><div class='ctx'> 	case 0xf:</div><div class='ctx'> 	default:</div><div class='del'>-		p-&gt;interleave = 1;</div><div class='add'>+		bp-&gt;interleave = 1;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case 0xe:</div><div class='del'>-		p-&gt;interleave = 2;</div><div class='add'>+		bp-&gt;interleave = 2;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case 0xc:</div><div class='del'>-		p-&gt;interleave = 4;</div><div class='add'>+		bp-&gt;interleave = 4;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case 0x8:</div><div class='del'>-		p-&gt;interleave = 8;</div><div class='add'>+		bp-&gt;interleave = 8;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case 0x0:</div><div class='del'>-		p-&gt;interleave = 16;</div><div class='add'>+		bp-&gt;interleave = 16;</div><div class='ctx'> 		break;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	/* UK[10] is reserved, and UK[11] is not set for the SDRAM</div><div class='ctx'> 	 * bank size definition.</div><div class='ctx'> 	 */</div><div class='del'>-	p-&gt;size = (((unsigned long)p-&gt;uk &amp;</div><div class='del'>-		    ((1UL &lt;&lt; 10UL) - 1UL)) + 1UL) &lt;&lt; PA_UPPER_BITS_SHIFT;</div><div class='del'>-	p-&gt;size /= p-&gt;interleave;</div><div class='add'>+	bp-&gt;size = (((unsigned long)bp-&gt;uk &amp;</div><div class='add'>+		     ((1UL &lt;&lt; 10UL) - 1UL)) + 1UL) &lt;&lt; PA_UPPER_BITS_SHIFT;</div><div class='add'>+	bp-&gt;size /= bp-&gt;interleave;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void fetch_decode_regs(struct mctrl_info *mp)</div><div class='add'>+static void chmc_fetch_decode_regs(struct chmc *p)</div><div class='ctx'> {</div><div class='del'>-	if (mp-&gt;layout_size == 0)</div><div class='add'>+	if (p-&gt;layout_size == 0)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	interpret_one_decode_reg(mp, 0,</div><div class='del'>-				 read_mcreg(mp, CHMCTRL_DECODE1));</div><div class='del'>-	interpret_one_decode_reg(mp, 1,</div><div class='del'>-				 read_mcreg(mp, CHMCTRL_DECODE2));</div><div class='del'>-	interpret_one_decode_reg(mp, 2,</div><div class='del'>-				 read_mcreg(mp, CHMCTRL_DECODE3));</div><div class='del'>-	interpret_one_decode_reg(mp, 3,</div><div class='del'>-				 read_mcreg(mp, CHMCTRL_DECODE4));</div><div class='add'>+	chmc_interpret_one_decode_reg(p, 0,</div><div class='add'>+				      chmc_read_mcreg(p, CHMCTRL_DECODE1));</div><div class='add'>+	chmc_interpret_one_decode_reg(p, 1,</div><div class='add'>+				      chmc_read_mcreg(p, CHMCTRL_DECODE2));</div><div class='add'>+	chmc_interpret_one_decode_reg(p, 2,</div><div class='add'>+				      chmc_read_mcreg(p, CHMCTRL_DECODE3));</div><div class='add'>+	chmc_interpret_one_decode_reg(p, 3,</div><div class='add'>+				      chmc_read_mcreg(p, CHMCTRL_DECODE4));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int init_one_mctrl(struct device_node *dp)</div><div class='add'>+static int __devinit chmc_probe(struct of_device *op,</div><div class='add'>+				const struct of_device_id *match)</div><div class='ctx'> {</div><div class='del'>-	struct mctrl_info *mp = kzalloc(sizeof(*mp), GFP_KERNEL);</div><div class='del'>-	int portid = of_getintprop_default(dp, "portid", -1);</div><div class='del'>-	const struct linux_prom64_registers *regs;</div><div class='add'>+	struct device_node *dp = op-&gt;node;</div><div class='add'>+	unsigned long ver;</div><div class='ctx'> 	const void *pval;</div><div class='del'>-	int len;</div><div class='add'>+	int len, portid;</div><div class='add'>+	struct chmc *p;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = -ENODEV;</div><div class='add'>+	__asm__ ("rdpr %%ver, %0" : "=r" (ver));</div><div class='add'>+	if ((ver &gt;&gt; 32UL) == __JALAPENO_ID ||</div><div class='add'>+	    (ver &gt;&gt; 32UL) == __SERRANO_ID)</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='del'>-	if (!mp)</div><div class='del'>-		return -1;</div><div class='add'>+	portid = of_getintprop_default(dp, "portid", -1);</div><div class='ctx'> 	if (portid == -1)</div><div class='del'>-		goto fail;</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='del'>-	mp-&gt;portid = portid;</div><div class='ctx'> 	pval = of_get_property(dp, "memory-layout", &amp;len);</div><div class='del'>-	mp-&gt;layout_size = len;</div><div class='del'>-	if (!pval)</div><div class='del'>-		mp-&gt;layout_size = 0;</div><div class='del'>-	else {</div><div class='del'>-		if (mp-&gt;layout_size &gt; sizeof(mp-&gt;layout_prop))</div><div class='del'>-			goto fail;</div><div class='del'>-		memcpy(&amp;mp-&gt;layout_prop, pval, len);</div><div class='add'>+	if (pval &amp;&amp; len &gt; sizeof(p-&gt;layout_prop)) {</div><div class='add'>+		printk(KERN_ERR PFX "Unexpected memory-layout property "</div><div class='add'>+		       "size %d.\n", len);</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	regs = of_get_property(dp, "reg", NULL);</div><div class='del'>-	if (!regs || regs-&gt;reg_size != 0x48)</div><div class='del'>-		goto fail;</div><div class='add'>+	err = -ENOMEM;</div><div class='add'>+	p = kzalloc(sizeof(*p), GFP_KERNEL);</div><div class='add'>+	if (!p) {</div><div class='add'>+		printk(KERN_ERR PFX "Could not allocate struct chmc.\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	mp-&gt;regs = ioremap(regs-&gt;phys_addr, regs-&gt;reg_size);</div><div class='del'>-	if (mp-&gt;regs == NULL)</div><div class='del'>-		goto fail;</div><div class='add'>+	p-&gt;portid = portid;</div><div class='add'>+	p-&gt;layout_size = len;</div><div class='add'>+	if (!pval)</div><div class='add'>+		p-&gt;layout_size = 0;</div><div class='add'>+	else</div><div class='add'>+		memcpy(&amp;p-&gt;layout_prop, pval, len);</div><div class='add'>+</div><div class='add'>+	p-&gt;regs = of_ioremap(&amp;op-&gt;resource[0], 0, 0x48, "chmc");</div><div class='add'>+	if (!p-&gt;regs) {</div><div class='add'>+		printk(KERN_ERR PFX "Could not map registers.\n");</div><div class='add'>+		goto out_free;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (mp-&gt;layout_size != 0UL) {</div><div class='del'>-		mp-&gt;timing_control1 = read_mcreg(mp, CHMCTRL_TCTRL1);</div><div class='del'>-		mp-&gt;timing_control2 = read_mcreg(mp, CHMCTRL_TCTRL2);</div><div class='del'>-		mp-&gt;timing_control3 = read_mcreg(mp, CHMCTRL_TCTRL3);</div><div class='del'>-		mp-&gt;timing_control4 = read_mcreg(mp, CHMCTRL_TCTRL4);</div><div class='del'>-		mp-&gt;memaddr_control = read_mcreg(mp, CHMCTRL_MACTRL);</div><div class='add'>+	if (p-&gt;layout_size != 0UL) {</div><div class='add'>+		p-&gt;timing_control1 = chmc_read_mcreg(p, CHMCTRL_TCTRL1);</div><div class='add'>+		p-&gt;timing_control2 = chmc_read_mcreg(p, CHMCTRL_TCTRL2);</div><div class='add'>+		p-&gt;timing_control3 = chmc_read_mcreg(p, CHMCTRL_TCTRL3);</div><div class='add'>+		p-&gt;timing_control4 = chmc_read_mcreg(p, CHMCTRL_TCTRL4);</div><div class='add'>+		p-&gt;memaddr_control = chmc_read_mcreg(p, CHMCTRL_MACTRL);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	fetch_decode_regs(mp);</div><div class='add'>+	chmc_fetch_decode_regs(p);</div><div class='ctx'> </div><div class='del'>-	list_add(&amp;mp-&gt;list, &amp;mctrl_list);</div><div class='add'>+	mc_list_add(&amp;p-&gt;list);</div><div class='ctx'> </div><div class='del'>-	/* Report the device. */</div><div class='del'>-	printk(KERN_INFO "%s: US3 memory controller at %p [%s]\n",</div><div class='add'>+	printk(KERN_INFO PFX "UltraSPARC-III memory controller at %s [%s]\n",</div><div class='ctx'> 	       dp-&gt;full_name,</div><div class='del'>-	       mp-&gt;regs, (mp-&gt;layout_size ? "ACTIVE" : "INACTIVE"));</div><div class='add'>+	       (p-&gt;layout_size ? "ACTIVE" : "INACTIVE"));</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	dev_set_drvdata(&amp;op-&gt;dev, p);</div><div class='add'>+</div><div class='add'>+	err = 0;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='add'>+</div><div class='add'>+out_free:</div><div class='add'>+	kfree(p);</div><div class='add'>+	goto out;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-fail:</div><div class='del'>-	if (mp) {</div><div class='del'>-		if (mp-&gt;regs != NULL)</div><div class='del'>-			iounmap(mp-&gt;regs);</div><div class='del'>-		kfree(mp);</div><div class='add'>+static int __devinit us3mc_probe(struct of_device *op,</div><div class='add'>+				const struct of_device_id *match)</div><div class='add'>+{</div><div class='add'>+	if (mc_type == MC_TYPE_SAFARI)</div><div class='add'>+		return chmc_probe(op, match);</div><div class='add'>+	else if (mc_type == MC_TYPE_JBUS)</div><div class='add'>+		return jbusmc_probe(op, match);</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __devexit chmc_destroy(struct of_device *op, struct chmc *p)</div><div class='add'>+{</div><div class='add'>+	list_del(&amp;p-&gt;list);</div><div class='add'>+	of_iounmap(&amp;op-&gt;resource[0], p-&gt;regs, 0x48);</div><div class='add'>+	kfree(p);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __devexit jbusmc_destroy(struct of_device *op, struct jbusmc *p)</div><div class='add'>+{</div><div class='add'>+	mc_list_del(&amp;p-&gt;list);</div><div class='add'>+	of_iounmap(&amp;op-&gt;resource[0], p-&gt;regs, JBUSMC_REGS_SIZE);</div><div class='add'>+	kfree(p);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devexit us3mc_remove(struct of_device *op)</div><div class='add'>+{</div><div class='add'>+	void *p = dev_get_drvdata(&amp;op-&gt;dev);</div><div class='add'>+</div><div class='add'>+	if (p) {</div><div class='add'>+		if (mc_type == MC_TYPE_SAFARI)</div><div class='add'>+			chmc_destroy(op, p);</div><div class='add'>+		else if (mc_type == MC_TYPE_JBUS)</div><div class='add'>+			jbusmc_destroy(op, p);</div><div class='ctx'> 	}</div><div class='del'>-	return -1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct of_device_id us3mc_match[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "memory-controller",</div><div class='add'>+	},</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, us3mc_match);</div><div class='add'>+</div><div class='add'>+static struct of_platform_driver us3mc_driver = {</div><div class='add'>+	.name		= "us3mc",</div><div class='add'>+	.match_table	= us3mc_match,</div><div class='add'>+	.probe		= us3mc_probe,</div><div class='add'>+	.remove		= __devexit_p(us3mc_remove),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline bool us3mc_platform(void)</div><div class='add'>+{</div><div class='add'>+	if (tlb_type == cheetah || tlb_type == cheetah_plus)</div><div class='add'>+		return true;</div><div class='add'>+	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init chmc_init(void)</div><div class='add'>+static int __init us3mc_init(void)</div><div class='ctx'> {</div><div class='del'>-	struct device_node *dp;</div><div class='add'>+	unsigned long ver;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	/* This driver is only for cheetah platforms. */</div><div class='del'>-	if (tlb_type != cheetah &amp;&amp; tlb_type != cheetah_plus)</div><div class='add'>+	if (!us3mc_platform())</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	for_each_node_by_name(dp, "memory-controller")</div><div class='del'>-		init_one_mctrl(dp);</div><div class='add'>+	__asm__ __volatile__("rdpr %%ver, %0" : "=r" (ver));</div><div class='add'>+	if ((ver &gt;&gt; 32UL) == __JALAPENO_ID ||</div><div class='add'>+	    (ver &gt;&gt; 32UL) == __SERRANO_ID) {</div><div class='add'>+		mc_type = MC_TYPE_JBUS;</div><div class='add'>+		us3mc_dimm_printer = jbusmc_print_dimm;</div><div class='add'>+	} else {</div><div class='add'>+		mc_type = MC_TYPE_SAFARI;</div><div class='add'>+		us3mc_dimm_printer = chmc_print_dimm;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	for_each_node_by_name(dp, "mc-us3")</div><div class='del'>-		init_one_mctrl(dp);</div><div class='add'>+	ret = register_dimm_printer(us3mc_dimm_printer);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	if (!ret) {</div><div class='add'>+		ret = of_register_driver(&amp;us3mc_driver, &amp;of_bus_type);</div><div class='add'>+		if (ret)</div><div class='add'>+			unregister_dimm_printer(us3mc_dimm_printer);</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __exit chmc_cleanup(void)</div><div class='add'>+static void __exit us3mc_cleanup(void)</div><div class='ctx'> {</div><div class='del'>-	struct list_head *head = &amp;mctrl_list;</div><div class='del'>-	struct list_head *tmp = head-&gt;next;</div><div class='del'>-</div><div class='del'>-	for (;;) {</div><div class='del'>-		struct mctrl_info *p =</div><div class='del'>-			list_entry(tmp, struct mctrl_info, list);</div><div class='del'>-		if (tmp == head)</div><div class='del'>-			break;</div><div class='del'>-		tmp = tmp-&gt;next;</div><div class='del'>-</div><div class='del'>-		list_del(&amp;p-&gt;list);</div><div class='del'>-		iounmap(p-&gt;regs);</div><div class='del'>-		kfree(p);</div><div class='add'>+	if (us3mc_platform()) {</div><div class='add'>+		unregister_dimm_printer(us3mc_dimm_printer);</div><div class='add'>+		of_unregister_driver(&amp;us3mc_driver);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(chmc_init);</div><div class='del'>-module_exit(chmc_cleanup);</div><div class='add'>+module_init(us3mc_init);</div><div class='add'>+module_exit(us3mc_cleanup);</div><div class='head'>diff --git a/arch/sparc64/kernel/cpu.c b/arch/sparc64/kernel/cpu.c<br/>index 0097c08dc600..0c9ac83ed0a8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/cpu.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc64/kernel/cpu.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/cpu.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/cpu.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /* cpu.c: Dinky routines to look for the kind of Sparc cpu</div><div class='ctx'>  *        we are on.</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 1996, 2007 David S. Miller (davem@davemloft.net)</div><div class='add'>+ * Copyright (C) 1996, 2007, 2008 David S. Miller (davem@davemloft.net)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -19,53 +19,86 @@</div><div class='ctx'> </div><div class='ctx'> DEFINE_PER_CPU(cpuinfo_sparc, __cpu_data) = { 0 };</div><div class='ctx'> </div><div class='del'>-struct cpu_iu_info {</div><div class='del'>-  short manuf;</div><div class='del'>-  short impl;</div><div class='del'>-  char* cpu_name;   /* should be enough I hope... */</div><div class='add'>+struct cpu_chip_info {</div><div class='add'>+	unsigned short	manuf;</div><div class='add'>+	unsigned short	impl;</div><div class='add'>+	const char	*cpu_name;</div><div class='add'>+	const char	*fp_name;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct cpu_fp_info {</div><div class='del'>-  short manuf;</div><div class='del'>-  short impl;</div><div class='del'>-  char fpu_vers;</div><div class='del'>-  char* fp_name;</div><div class='add'>+static const struct cpu_chip_info cpu_chips[] = {</div><div class='add'>+	{</div><div class='add'>+		.manuf		= 0x17,</div><div class='add'>+		.impl		= 0x10,</div><div class='add'>+		.cpu_name	= "TI UltraSparc I   (SpitFire)",</div><div class='add'>+		.fp_name	= "UltraSparc I integrated FPU",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.manuf		= 0x22,</div><div class='add'>+		.impl		= 0x10,</div><div class='add'>+		.cpu_name	= "TI UltraSparc I   (SpitFire)",</div><div class='add'>+		.fp_name	= "UltraSparc I integrated FPU",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.manuf		= 0x17,</div><div class='add'>+		.impl		= 0x11,</div><div class='add'>+		.cpu_name	= "TI UltraSparc II  (BlackBird)",</div><div class='add'>+		.fp_name	= "UltraSparc II integrated FPU",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.manuf		= 0x17,</div><div class='add'>+		.impl		= 0x12,</div><div class='add'>+		.cpu_name	= "TI UltraSparc IIi (Sabre)",</div><div class='add'>+		.fp_name	= "UltraSparc IIi integrated FPU",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.manuf		= 0x17,</div><div class='add'>+		.impl		= 0x13,</div><div class='add'>+		.cpu_name	= "TI UltraSparc IIe (Hummingbird)",</div><div class='add'>+		.fp_name	= "UltraSparc IIe integrated FPU",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.manuf		= 0x3e,</div><div class='add'>+		.impl		= 0x14,</div><div class='add'>+		.cpu_name	= "TI UltraSparc III (Cheetah)",</div><div class='add'>+		.fp_name	= "UltraSparc III integrated FPU",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.manuf		= 0x3e,</div><div class='add'>+		.impl		= 0x15,</div><div class='add'>+		.cpu_name	= "TI UltraSparc III+ (Cheetah+)",</div><div class='add'>+		.fp_name	= "UltraSparc III+ integrated FPU",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.manuf		= 0x3e,</div><div class='add'>+		.impl		= 0x16,</div><div class='add'>+		.cpu_name	= "TI UltraSparc IIIi (Jalapeno)",</div><div class='add'>+		.fp_name	= "UltraSparc IIIi integrated FPU",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.manuf		= 0x3e,</div><div class='add'>+		.impl		= 0x18,</div><div class='add'>+		.cpu_name	= "TI UltraSparc IV (Jaguar)",</div><div class='add'>+		.fp_name	= "UltraSparc IV integrated FPU",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.manuf		= 0x3e,</div><div class='add'>+		.impl		= 0x19,</div><div class='add'>+		.cpu_name	= "TI UltraSparc IV+ (Panther)",</div><div class='add'>+		.fp_name	= "UltraSparc IV+ integrated FPU",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.manuf		= 0x3e,</div><div class='add'>+		.impl		= 0x22,</div><div class='add'>+		.cpu_name	= "TI UltraSparc IIIi+ (Serrano)",</div><div class='add'>+		.fp_name	= "UltraSparc IIIi+ integrated FPU",</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct cpu_fp_info linux_sparc_fpu[] = {</div><div class='del'>-  { 0x17, 0x10, 0, "UltraSparc I integrated FPU"},</div><div class='del'>-  { 0x22, 0x10, 0, "UltraSparc I integrated FPU"},</div><div class='del'>-  { 0x17, 0x11, 0, "UltraSparc II integrated FPU"},</div><div class='del'>-  { 0x17, 0x12, 0, "UltraSparc IIi integrated FPU"},</div><div class='del'>-  { 0x17, 0x13, 0, "UltraSparc IIe integrated FPU"},</div><div class='del'>-  { 0x3e, 0x14, 0, "UltraSparc III integrated FPU"},</div><div class='del'>-  { 0x3e, 0x15, 0, "UltraSparc III+ integrated FPU"},</div><div class='del'>-  { 0x3e, 0x16, 0, "UltraSparc IIIi integrated FPU"},</div><div class='del'>-  { 0x3e, 0x18, 0, "UltraSparc IV integrated FPU"},</div><div class='del'>-  { 0x3e, 0x19, 0, "UltraSparc IV+ integrated FPU"},</div><div class='del'>-  { 0x3e, 0x22, 0, "UltraSparc IIIi+ integrated FPU"},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define NSPARCFPU  ARRAY_SIZE(linux_sparc_fpu)</div><div class='del'>-</div><div class='del'>-static struct cpu_iu_info linux_sparc_chips[] = {</div><div class='del'>-  { 0x17, 0x10, "TI UltraSparc I   (SpitFire)"},</div><div class='del'>-  { 0x22, 0x10, "TI UltraSparc I   (SpitFire)"},</div><div class='del'>-  { 0x17, 0x11, "TI UltraSparc II  (BlackBird)"},</div><div class='del'>-  { 0x17, 0x12, "TI UltraSparc IIi (Sabre)"},</div><div class='del'>-  { 0x17, 0x13, "TI UltraSparc IIe (Hummingbird)"},</div><div class='del'>-  { 0x3e, 0x14, "TI UltraSparc III (Cheetah)"},</div><div class='del'>-  { 0x3e, 0x15, "TI UltraSparc III+ (Cheetah+)"},</div><div class='del'>-  { 0x3e, 0x16, "TI UltraSparc IIIi (Jalapeno)"},</div><div class='del'>-  { 0x3e, 0x18, "TI UltraSparc IV (Jaguar)"},</div><div class='del'>-  { 0x3e, 0x19, "TI UltraSparc IV+ (Panther)"},</div><div class='del'>-  { 0x3e, 0x22, "TI UltraSparc IIIi+ (Serrano)"},</div><div class='del'>-};</div><div class='add'>+#define NSPARCCHIPS ARRAY_SIZE(linux_sparc_chips)</div><div class='ctx'> </div><div class='del'>-#define NSPARCCHIPS  ARRAY_SIZE(linux_sparc_chips)</div><div class='del'>-</div><div class='del'>-char *sparc_cpu_type;</div><div class='del'>-char *sparc_fpu_type;</div><div class='add'>+const char *sparc_cpu_type;</div><div class='add'>+const char *sparc_fpu_type;</div><div class='ctx'> </div><div class='ctx'> static void __init sun4v_cpu_probe(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -89,68 +122,45 @@ static void __init sun4v_cpu_probe(void)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init cpu_probe(void)</div><div class='add'>+static const struct cpu_chip_info * __init find_cpu_chip(unsigned short manuf,</div><div class='add'>+							 unsigned short impl)</div><div class='ctx'> {</div><div class='del'>-	unsigned long ver, fpu_vers, manuf, impl, fprs;</div><div class='ctx'> 	int i;</div><div class='del'>-	</div><div class='del'>-	if (tlb_type == hypervisor) {</div><div class='del'>-		sun4v_cpu_probe();</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	fprs = fprs_read();</div><div class='del'>-	fprs_write(FPRS_FEF);</div><div class='del'>-	__asm__ __volatile__ ("rdpr %%ver, %0; stx %%fsr, [%1]"</div><div class='del'>-			      : "=&amp;r" (ver)</div><div class='del'>-			      : "r" (&amp;fpu_vers));</div><div class='del'>-	fprs_write(fprs);</div><div class='del'>-	</div><div class='del'>-	manuf = ((ver &gt;&gt; 48) &amp; 0xffff);</div><div class='del'>-	impl = ((ver &gt;&gt; 32) &amp; 0xffff);</div><div class='del'>-</div><div class='del'>-	fpu_vers = ((fpu_vers &gt;&gt; 17) &amp; 0x7);</div><div class='del'>-</div><div class='del'>-retry:</div><div class='del'>-	for (i = 0; i &lt; NSPARCCHIPS; i++) {</div><div class='del'>-		if (linux_sparc_chips[i].manuf == manuf) {</div><div class='del'>-			if (linux_sparc_chips[i].impl == impl) {</div><div class='del'>-				sparc_cpu_type =</div><div class='del'>-					linux_sparc_chips[i].cpu_name;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(cpu_chips); i++) {</div><div class='add'>+		const struct cpu_chip_info *p = &amp;cpu_chips[i];</div><div class='ctx'> </div><div class='del'>-	if (i == NSPARCCHIPS) {</div><div class='del'>- 		/* Maybe it is a cheetah+ derivative, report it as cheetah+</div><div class='del'>- 		 * in that case until we learn the real names.</div><div class='del'>- 		 */</div><div class='del'>- 		if (manuf == 0x3e &amp;&amp;</div><div class='del'>- 		    impl &gt; 0x15) {</div><div class='del'>- 			impl = 0x15;</div><div class='del'>- 			goto retry;</div><div class='del'>- 		} else {</div><div class='del'>- 			printk("DEBUG: manuf[%lx] impl[%lx]\n",</div><div class='del'>- 			       manuf, impl);</div><div class='del'>- 		}</div><div class='del'>-		sparc_cpu_type = "Unknown CPU";</div><div class='add'>+		if (p-&gt;manuf == manuf &amp;&amp; p-&gt;impl == impl)</div><div class='add'>+			return p;</div><div class='ctx'> 	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; NSPARCFPU; i++) {</div><div class='del'>-		if (linux_sparc_fpu[i].manuf == manuf &amp;&amp;</div><div class='del'>-		    linux_sparc_fpu[i].impl == impl) {</div><div class='del'>-			if (linux_sparc_fpu[i].fpu_vers == fpu_vers) {</div><div class='del'>-				sparc_fpu_type =</div><div class='del'>-					linux_sparc_fpu[i].fp_name;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='add'>+static int __init cpu_type_probe(void)</div><div class='add'>+{</div><div class='add'>+	if (tlb_type == hypervisor) {</div><div class='add'>+		sun4v_cpu_probe();</div><div class='add'>+	} else {</div><div class='add'>+		unsigned long ver, manuf, impl;</div><div class='add'>+		const struct cpu_chip_info *p;</div><div class='add'>+	</div><div class='add'>+		__asm__ __volatile__("rdpr %%ver, %0" : "=r" (ver));</div><div class='add'>+	</div><div class='add'>+		manuf = ((ver &gt;&gt; 48) &amp; 0xffff);</div><div class='add'>+		impl = ((ver &gt;&gt; 32) &amp; 0xffff);</div><div class='add'>+</div><div class='add'>+		p = find_cpu_chip(manuf, impl);</div><div class='add'>+		if (p) {</div><div class='add'>+			sparc_cpu_type = p-&gt;cpu_name;</div><div class='add'>+			sparc_fpu_type = p-&gt;fp_name;</div><div class='add'>+		} else {</div><div class='add'>+			printk(KERN_ERR "CPU: Unknown chip, manuf[%lx] impl[%lx]\n",</div><div class='add'>+			       manuf, impl);</div><div class='add'>+			sparc_cpu_type = "Unknown CPU";</div><div class='add'>+			sparc_fpu_type = "Unknown FPU";</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	if (i == NSPARCFPU) {</div><div class='del'>- 		printk("DEBUG: manuf[%lx] impl[%lx] fsr.vers[%lx]\n",</div><div class='del'>- 		       manuf, impl, fpu_vers);</div><div class='del'>-		sparc_fpu_type = "Unknown FPU";</div><div class='del'>-	}</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+arch_initcall(cpu_type_probe);</div><div class='head'>diff --git a/arch/sparc64/kernel/ds.c b/arch/sparc64/kernel/ds.c<br/>index d0fa5aa38934..f52e0534d91d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/ds.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc64/kernel/ds.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/ds.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/ds.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /* ds.c: Domain Services driver for Logical Domains</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2007 David S. Miller &lt;davem@davemloft.net&gt;</div><div class='add'>+ * Copyright (C) 2007, 2008 David S. Miller &lt;davem@davemloft.net&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -1217,7 +1217,7 @@ static int ds_remove(struct vio_dev *vdev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct vio_device_id ds_match[] = {</div><div class='add'>+static struct vio_device_id __initdata ds_match[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.type = "domain-services-port",</div><div class='ctx'> 	},</div><div class='head'>diff --git a/arch/sparc64/kernel/ebus.c b/arch/sparc64/kernel/ebus.c<br/>index 60d36d142559..77dbf6d45faf 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/ebus.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc64/kernel/ebus.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/ebus.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/ebus.c</a></div><div class='hunk'>@@ -1,5 +1,4 @@</div><div class='del'>-/*</div><div class='del'>- * ebus.c: PCI to EBus bridge device.</div><div class='add'>+/* ebus.c: EBUS DMA library code.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 1997  Eddie C. Dost  (ecd@skynet.be)</div><div class='ctx'>  * Copyright (C) 1999  David S. Miller (davem@redhat.com)</div><div class='hunk'>@@ -9,23 +8,11 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/of_device.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/system.h&gt;</div><div class='del'>-#include &lt;asm/page.h&gt;</div><div class='del'>-#include &lt;asm/ebus.h&gt;</div><div class='del'>-#include &lt;asm/oplib.h&gt;</div><div class='del'>-#include &lt;asm/prom.h&gt;</div><div class='del'>-#include &lt;asm/bpp.h&gt;</div><div class='del'>-#include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='del'>-/* EBUS dma library. */</div><div class='add'>+#include &lt;asm/ebus_dma.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define EBDMA_CSR	0x00UL	/* Control/Status */</div><div class='ctx'> #define EBDMA_ADDR	0x04UL	/* DMA Address */</div><div class='hunk'>@@ -268,283 +255,3 @@ void ebus_dma_enable(struct ebus_dma_info *p, int on)</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;p-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ebus_dma_enable);</div><div class='del'>-</div><div class='del'>-struct linux_ebus *ebus_chain = NULL;</div><div class='del'>-</div><div class='del'>-static inline void *ebus_alloc(size_t size)</div><div class='del'>-{</div><div class='del'>-	void *mem;</div><div class='del'>-</div><div class='del'>-	mem = kzalloc(size, GFP_ATOMIC);</div><div class='del'>-	if (!mem)</div><div class='del'>-		panic("ebus_alloc: out of memory");</div><div class='del'>-	return mem;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __init fill_ebus_child(struct device_node *dp,</div><div class='del'>-				   struct linux_ebus_child *dev,</div><div class='del'>-				   int non_standard_regs)</div><div class='del'>-{</div><div class='del'>-	struct of_device *op;</div><div class='del'>-	const int *regs;</div><div class='del'>-	int i, len;</div><div class='del'>-</div><div class='del'>-	dev-&gt;prom_node = dp;</div><div class='del'>-	printk(" (%s)", dp-&gt;name);</div><div class='del'>-</div><div class='del'>-	regs = of_get_property(dp, "reg", &amp;len);</div><div class='del'>-	if (!regs)</div><div class='del'>-		dev-&gt;num_addrs = 0;</div><div class='del'>-	else</div><div class='del'>-		dev-&gt;num_addrs = len / sizeof(regs[0]);</div><div class='del'>-</div><div class='del'>-	if (non_standard_regs) {</div><div class='del'>-		/* This is to handle reg properties which are not</div><div class='del'>-		 * in the parent relative format.  One example are</div><div class='del'>-		 * children of the i2c device on CompactPCI systems.</div><div class='del'>-		 *</div><div class='del'>-		 * So, for such devices we just record the property</div><div class='del'>-		 * raw in the child resources.</div><div class='del'>-		 */</div><div class='del'>-		for (i = 0; i &lt; dev-&gt;num_addrs; i++)</div><div class='del'>-			dev-&gt;resource[i].start = regs[i];</div><div class='del'>-	} else {</div><div class='del'>-		for (i = 0; i &lt; dev-&gt;num_addrs; i++) {</div><div class='del'>-			int rnum = regs[i];</div><div class='del'>-			if (rnum &gt;= dev-&gt;parent-&gt;num_addrs) {</div><div class='del'>-				prom_printf("UGH: property for %s was %d, need &lt; %d\n",</div><div class='del'>-					    dp-&gt;name, len, dev-&gt;parent-&gt;num_addrs);</div><div class='del'>-				prom_halt();</div><div class='del'>-			}</div><div class='del'>-			dev-&gt;resource[i].start = dev-&gt;parent-&gt;resource[i].start;</div><div class='del'>-			dev-&gt;resource[i].end = dev-&gt;parent-&gt;resource[i].end;</div><div class='del'>-			dev-&gt;resource[i].flags = IORESOURCE_MEM;</div><div class='del'>-			dev-&gt;resource[i].name = dp-&gt;name;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	op = of_find_device_by_node(dp);</div><div class='del'>-	if (!op) {</div><div class='del'>-		dev-&gt;num_irqs = 0;</div><div class='del'>-	} else {</div><div class='del'>-		dev-&gt;num_irqs = op-&gt;num_irqs;</div><div class='del'>-		for (i = 0; i &lt; dev-&gt;num_irqs; i++)</div><div class='del'>-			dev-&gt;irqs[i] = op-&gt;irqs[i];</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!dev-&gt;num_irqs) {</div><div class='del'>-		/*</div><div class='del'>-		 * Oh, well, some PROMs don't export interrupts</div><div class='del'>-		 * property to children of EBus devices...</div><div class='del'>-		 *</div><div class='del'>-		 * Be smart about PS/2 keyboard and mouse.</div><div class='del'>-		 */</div><div class='del'>-		if (!strcmp(dev-&gt;parent-&gt;prom_node-&gt;name, "8042")) {</div><div class='del'>-			if (!strcmp(dev-&gt;prom_node-&gt;name, "kb_ps2")) {</div><div class='del'>-				dev-&gt;num_irqs = 1;</div><div class='del'>-				dev-&gt;irqs[0] = dev-&gt;parent-&gt;irqs[0];</div><div class='del'>-			} else {</div><div class='del'>-				dev-&gt;num_irqs = 1;</div><div class='del'>-				dev-&gt;irqs[0] = dev-&gt;parent-&gt;irqs[1];</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init child_regs_nonstandard(struct linux_ebus_device *dev)</div><div class='del'>-{</div><div class='del'>-	if (!strcmp(dev-&gt;prom_node-&gt;name, "i2c") ||</div><div class='del'>-	    !strcmp(dev-&gt;prom_node-&gt;name, "SUNW,lombus"))</div><div class='del'>-		return 1;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __init fill_ebus_device(struct device_node *dp, struct linux_ebus_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct linux_ebus_child *child;</div><div class='del'>-	struct dev_archdata *sd;</div><div class='del'>-	struct of_device *op;</div><div class='del'>-	int i, len;</div><div class='del'>-</div><div class='del'>-	dev-&gt;prom_node = dp;</div><div class='del'>-</div><div class='del'>-	printk(" [%s", dp-&gt;name);</div><div class='del'>-</div><div class='del'>-	op = of_find_device_by_node(dp);</div><div class='del'>-	if (!op) {</div><div class='del'>-		dev-&gt;num_addrs = 0;</div><div class='del'>-		dev-&gt;num_irqs = 0;</div><div class='del'>-	} else {</div><div class='del'>-		const int *regs = of_get_property(dp, "reg", &amp;len);</div><div class='del'>-</div><div class='del'>-		if (!regs)</div><div class='del'>-			len = 0;</div><div class='del'>-		dev-&gt;num_addrs = len / sizeof(struct linux_prom_registers);</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; dev-&gt;num_addrs; i++)</div><div class='del'>-			memcpy(&amp;dev-&gt;resource[i],</div><div class='del'>-			       &amp;op-&gt;resource[i],</div><div class='del'>-			       sizeof(struct resource));</div><div class='del'>-</div><div class='del'>-		dev-&gt;num_irqs = op-&gt;num_irqs;</div><div class='del'>-		for (i = 0; i &lt; dev-&gt;num_irqs; i++)</div><div class='del'>-			dev-&gt;irqs[i] = op-&gt;irqs[i];</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	sd = &amp;dev-&gt;ofdev.dev.archdata;</div><div class='del'>-	sd-&gt;prom_node = dp;</div><div class='del'>-	sd-&gt;op = &amp;dev-&gt;ofdev;</div><div class='del'>-	sd-&gt;iommu = dev-&gt;bus-&gt;ofdev.dev.parent-&gt;archdata.iommu;</div><div class='del'>-	sd-&gt;stc = dev-&gt;bus-&gt;ofdev.dev.parent-&gt;archdata.stc;</div><div class='del'>-	sd-&gt;numa_node = dev-&gt;bus-&gt;ofdev.dev.parent-&gt;archdata.numa_node;</div><div class='del'>-</div><div class='del'>-	dev-&gt;ofdev.node = dp;</div><div class='del'>-	dev-&gt;ofdev.dev.parent = &amp;dev-&gt;bus-&gt;ofdev.dev;</div><div class='del'>-	dev-&gt;ofdev.dev.bus = &amp;ebus_bus_type;</div><div class='del'>-	dev_set_name(&amp;dev-&gt;ofdev.dev, "ebus[%08x]", dp-&gt;node);</div><div class='del'>-</div><div class='del'>-	/* Register with core */</div><div class='del'>-	if (of_device_register(&amp;dev-&gt;ofdev) != 0)</div><div class='del'>-		printk(KERN_DEBUG "ebus: device registration error for %s!\n",</div><div class='del'>-		       dp-&gt;path_component_name);</div><div class='del'>-</div><div class='del'>-	dp = dp-&gt;child;</div><div class='del'>-	if (dp) {</div><div class='del'>-		printk(" -&gt;");</div><div class='del'>-		dev-&gt;children = ebus_alloc(sizeof(struct linux_ebus_child));</div><div class='del'>-</div><div class='del'>-		child = dev-&gt;children;</div><div class='del'>-		child-&gt;next = NULL;</div><div class='del'>-		child-&gt;parent = dev;</div><div class='del'>-		child-&gt;bus = dev-&gt;bus;</div><div class='del'>-		fill_ebus_child(dp, child,</div><div class='del'>-				child_regs_nonstandard(dev));</div><div class='del'>-</div><div class='del'>-		while ((dp = dp-&gt;sibling) != NULL) {</div><div class='del'>-			child-&gt;next = ebus_alloc(sizeof(struct linux_ebus_child));</div><div class='del'>-</div><div class='del'>-			child = child-&gt;next;</div><div class='del'>-			child-&gt;next = NULL;</div><div class='del'>-			child-&gt;parent = dev;</div><div class='del'>-			child-&gt;bus = dev-&gt;bus;</div><div class='del'>-			fill_ebus_child(dp, child,</div><div class='del'>-					child_regs_nonstandard(dev));</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	printk("]");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct pci_dev *find_next_ebus(struct pci_dev *start, int *is_rio_p)</div><div class='del'>-{</div><div class='del'>-	struct pci_dev *pdev = start;</div><div class='del'>-</div><div class='del'>-	while ((pdev = pci_get_device(PCI_VENDOR_ID_SUN, PCI_ANY_ID, pdev)))</div><div class='del'>-		if (pdev-&gt;device == PCI_DEVICE_ID_SUN_EBUS ||</div><div class='del'>-			pdev-&gt;device == PCI_DEVICE_ID_SUN_RIO_EBUS)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-	*is_rio_p = !!(pdev &amp;&amp; (pdev-&gt;device == PCI_DEVICE_ID_SUN_RIO_EBUS));</div><div class='del'>-</div><div class='del'>-	return pdev;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __init ebus_init(void)</div><div class='del'>-{</div><div class='del'>-	struct linux_ebus_device *dev;</div><div class='del'>-	struct linux_ebus *ebus;</div><div class='del'>-	struct pci_dev *pdev;</div><div class='del'>-	struct device_node *dp;</div><div class='del'>-	int is_rio;</div><div class='del'>-	int num_ebus = 0;</div><div class='del'>-</div><div class='del'>-	pdev = find_next_ebus(NULL, &amp;is_rio);</div><div class='del'>-	if (!pdev) {</div><div class='del'>-		printk("ebus: No EBus's found.\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dp = pci_device_to_OF_node(pdev);</div><div class='del'>-</div><div class='del'>-	ebus_chain = ebus = ebus_alloc(sizeof(struct linux_ebus));</div><div class='del'>-	ebus-&gt;next = NULL;</div><div class='del'>-	ebus-&gt;is_rio = is_rio;</div><div class='del'>-</div><div class='del'>-	while (dp) {</div><div class='del'>-		struct device_node *child;</div><div class='del'>-</div><div class='del'>-		/* SUNW,pci-qfe uses four empty ebuses on it.</div><div class='del'>-		   I think we should not consider them here,</div><div class='del'>-		   as they have half of the properties this</div><div class='del'>-		   code expects and once we do PCI hot-plug,</div><div class='del'>-		   we'd have to tweak with the ebus_chain</div><div class='del'>-		   in the runtime after initialization. -jj */</div><div class='del'>-		if (!dp-&gt;child) {</div><div class='del'>-			pdev = find_next_ebus(pdev, &amp;is_rio);</div><div class='del'>-			if (!pdev) {</div><div class='del'>-				if (ebus == ebus_chain) {</div><div class='del'>-					ebus_chain = NULL;</div><div class='del'>-					printk("ebus: No EBus's found.\n");</div><div class='del'>-					return;</div><div class='del'>-				}</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			ebus-&gt;is_rio = is_rio;</div><div class='del'>-			dp = pci_device_to_OF_node(pdev);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		printk("ebus%d:", num_ebus);</div><div class='del'>-</div><div class='del'>-		ebus-&gt;index = num_ebus;</div><div class='del'>-		ebus-&gt;prom_node = dp;</div><div class='del'>-		ebus-&gt;self = pdev;</div><div class='del'>-</div><div class='del'>-		ebus-&gt;ofdev.node = dp;</div><div class='del'>-		ebus-&gt;ofdev.dev.parent = &amp;pdev-&gt;dev;</div><div class='del'>-		ebus-&gt;ofdev.dev.bus = &amp;ebus_bus_type;</div><div class='del'>-		dev_set_name(&amp;ebus-&gt;ofdev.dev, "ebus%d", num_ebus);</div><div class='del'>-</div><div class='del'>-		/* Register with core */</div><div class='del'>-		if (of_device_register(&amp;ebus-&gt;ofdev) != 0)</div><div class='del'>-			printk(KERN_DEBUG "ebus: device registration error for %s!\n",</div><div class='del'>-			       dp-&gt;path_component_name);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-		child = dp-&gt;child;</div><div class='del'>-		if (!child)</div><div class='del'>-			goto next_ebus;</div><div class='del'>-</div><div class='del'>-		ebus-&gt;devices = ebus_alloc(sizeof(struct linux_ebus_device));</div><div class='del'>-</div><div class='del'>-		dev = ebus-&gt;devices;</div><div class='del'>-		dev-&gt;next = NULL;</div><div class='del'>-		dev-&gt;children = NULL;</div><div class='del'>-		dev-&gt;bus = ebus;</div><div class='del'>-		fill_ebus_device(child, dev);</div><div class='del'>-</div><div class='del'>-		while ((child = child-&gt;sibling) != NULL) {</div><div class='del'>-			dev-&gt;next = ebus_alloc(sizeof(struct linux_ebus_device));</div><div class='del'>-</div><div class='del'>-			dev = dev-&gt;next;</div><div class='del'>-			dev-&gt;next = NULL;</div><div class='del'>-			dev-&gt;children = NULL;</div><div class='del'>-			dev-&gt;bus = ebus;</div><div class='del'>-			fill_ebus_device(child, dev);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	next_ebus:</div><div class='del'>-		printk("\n");</div><div class='del'>-</div><div class='del'>-		pdev = find_next_ebus(pdev, &amp;is_rio);</div><div class='del'>-		if (!pdev)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		dp = pci_device_to_OF_node(pdev);</div><div class='del'>-</div><div class='del'>-		ebus-&gt;next = ebus_alloc(sizeof(struct linux_ebus));</div><div class='del'>-		ebus = ebus-&gt;next;</div><div class='del'>-		ebus-&gt;next = NULL;</div><div class='del'>-		ebus-&gt;is_rio = is_rio;</div><div class='del'>-		++num_ebus;</div><div class='del'>-	}</div><div class='del'>-	pci_dev_put(pdev); /* XXX for the case, when ebusnd is 0, is it OK? */</div><div class='del'>-}</div><div class='head'>diff --git a/arch/sparc64/kernel/entry.h b/arch/sparc64/kernel/entry.h<br/>index fc294a292899..34d7ab5e10d2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/entry.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc64/kernel/entry.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/entry.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/entry.h</a></div><div class='hunk'>@@ -5,8 +5,8 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='del'>-extern char *sparc_cpu_type;</div><div class='del'>-extern char *sparc_fpu_type;</div><div class='add'>+extern const char *sparc_cpu_type;</div><div class='add'>+extern const char *sparc_fpu_type;</div><div class='ctx'> </div><div class='ctx'> extern void __init per_cpu_patch(void);</div><div class='ctx'> extern void __init sun4v_patch(void);</div><div class='hunk'>@@ -22,7 +22,8 @@ extern void do_notify_resume(struct pt_regs *regs,</div><div class='ctx'> 			     unsigned long orig_i0,</div><div class='ctx'> 			     unsigned long thread_info_flags);</div><div class='ctx'> </div><div class='del'>-extern asmlinkage int syscall_trace(struct pt_regs *regs, int syscall_exit_p);</div><div class='add'>+extern asmlinkage int syscall_trace_enter(struct pt_regs *regs);</div><div class='add'>+extern asmlinkage void syscall_trace_leave(struct pt_regs *regs);</div><div class='ctx'> </div><div class='ctx'> extern void bad_trap_tl1(struct pt_regs *regs, long lvl);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sparc64/kernel/head.S b/arch/sparc64/kernel/head.S<br/>index c9afef093d51..353226fa0239 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/head.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc64/kernel/head.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/head.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/head.S</a></div><div class='hunk'>@@ -10,6 +10,7 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/threads.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/thread_info.h&gt;</div><div class='ctx'> #include &lt;asm/asi.h&gt;</div><div class='ctx'> #include &lt;asm/pstate.h&gt;</div><div class='head'>diff --git a/arch/sparc64/kernel/hvapi.c b/arch/sparc64/kernel/hvapi.c<br/>index 691760b5b012..1d272c3b5740 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/hvapi.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc64/kernel/hvapi.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/hvapi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/hvapi.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/hypervisor.h&gt;</div><div class='ctx'> #include &lt;asm/oplib.h&gt;</div><div class='del'>-#include &lt;asm/sstate.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* If the hypervisor indicates that the API setting</div><div class='ctx'>  * calls are unsupported, by returning HV_EBADTRAP or</div><div class='hunk'>@@ -184,8 +183,6 @@ void __init sun4v_hvapi_init(void)</div><div class='ctx'> 	if (sun4v_hvapi_register(group, major, &amp;minor))</div><div class='ctx'> 		goto bad;</div><div class='ctx'> </div><div class='del'>-	sun4v_sstate_init();</div><div class='del'>-</div><div class='ctx'> 	return;</div><div class='ctx'> </div><div class='ctx'> bad:</div><div class='head'>diff --git a/arch/sparc64/kernel/hvcalls.S b/arch/sparc64/kernel/hvcalls.S<br/>index a2810f3ac70f..e066269d1594 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/hvcalls.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc64/kernel/hvcalls.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/hvcalls.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/hvcalls.S</a></div><div class='hunk'>@@ -3,89 +3,75 @@</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * returns %o0: sysino</div><div class='ctx'> 	 */</div><div class='del'>-	.globl	sun4v_devino_to_sysino</div><div class='del'>-	.type	sun4v_devino_to_sysino,#function</div><div class='del'>-sun4v_devino_to_sysino:</div><div class='add'>+ENTRY(sun4v_devino_to_sysino)</div><div class='ctx'> 	mov	HV_FAST_INTR_DEVINO2SYSINO, %o5</div><div class='ctx'> 	ta	HV_FAST_TRAP</div><div class='ctx'> 	retl</div><div class='ctx'> 	 mov	%o1, %o0</div><div class='del'>-	.size	sun4v_devino_to_sysino, .-sun4v_devino_to_sysino</div><div class='add'>+ENDPROC(sun4v_devino_to_sysino)</div><div class='ctx'> </div><div class='ctx'> 	/* %o0: sysino</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * returns %o0: intr_enabled (HV_INTR_{DISABLED,ENABLED})</div><div class='ctx'> 	 */</div><div class='del'>-	.globl	sun4v_intr_getenabled</div><div class='del'>-	.type	sun4v_intr_getenabled,#function</div><div class='del'>-sun4v_intr_getenabled:</div><div class='add'>+ENTRY(sun4v_intr_getenabled)</div><div class='ctx'> 	mov	HV_FAST_INTR_GETENABLED, %o5</div><div class='ctx'> 	ta	HV_FAST_TRAP</div><div class='ctx'> 	retl</div><div class='ctx'> 	 mov	%o1, %o0</div><div class='del'>-	.size	sun4v_intr_getenabled, .-sun4v_intr_getenabled</div><div class='add'>+ENDPROC(sun4v_intr_getenabled)</div><div class='ctx'> </div><div class='ctx'> 	/* %o0: sysino</div><div class='ctx'> 	 * %o1: intr_enabled (HV_INTR_{DISABLED,ENABLED})</div><div class='ctx'> 	 */</div><div class='del'>-	.globl	sun4v_intr_setenabled</div><div class='del'>-	.type	sun4v_intr_setenabled,#function</div><div class='del'>-sun4v_intr_setenabled:</div><div class='add'>+ENTRY(sun4v_intr_setenabled)</div><div class='ctx'> 	mov	HV_FAST_INTR_SETENABLED, %o5</div><div class='ctx'> 	ta	HV_FAST_TRAP</div><div class='ctx'> 	retl</div><div class='ctx'> 	 nop</div><div class='del'>-	.size	sun4v_intr_setenabled, .-sun4v_intr_setenabled</div><div class='add'>+ENDPROC(sun4v_intr_setenabled)</div><div class='ctx'> </div><div class='ctx'> 	/* %o0: sysino</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * returns %o0: intr_state (HV_INTR_STATE_*)</div><div class='ctx'> 	 */</div><div class='del'>-	.globl	sun4v_intr_getstate</div><div class='del'>-	.type	sun4v_intr_getstate,#function</div><div class='del'>-sun4v_intr_getstate:</div><div class='add'>+ENTRY(sun4v_intr_getstate)</div><div class='ctx'> 	mov	HV_FAST_INTR_GETSTATE, %o5</div><div class='ctx'> 	ta	HV_FAST_TRAP</div><div class='ctx'> 	retl</div><div class='ctx'> 	 mov	%o1, %o0</div><div class='del'>-	.size	sun4v_intr_getstate, .-sun4v_intr_getstate</div><div class='add'>+ENDPROC(sun4v_intr_getstate)</div><div class='ctx'> </div><div class='ctx'> 	/* %o0: sysino</div><div class='ctx'> 	 * %o1: intr_state (HV_INTR_STATE_*)</div><div class='ctx'> 	 */</div><div class='del'>-	.globl	sun4v_intr_setstate</div><div class='del'>-	.type	sun4v_intr_setstate,#function</div><div class='del'>-sun4v_intr_setstate:</div><div class='add'>+ENTRY(sun4v_intr_setstate)</div><div class='ctx'> 	mov	HV_FAST_INTR_SETSTATE, %o5</div><div class='ctx'> 	ta	HV_FAST_TRAP</div><div class='ctx'> 	retl</div><div class='ctx'> 	 nop</div><div class='del'>-	.size	sun4v_intr_setstate, .-sun4v_intr_setstate</div><div class='add'>+ENDPROC(sun4v_intr_setstate)</div><div class='ctx'> </div><div class='ctx'> 	/* %o0: sysino</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * returns %o0: cpuid</div><div class='ctx'> 	 */</div><div class='del'>-	.globl	sun4v_intr_gettarget</div><div class='del'>-	.type	sun4v_intr_gettarget,#function</div><div class='del'>-sun4v_intr_gettarget:</div><div class='add'>+ENTRY(sun4v_intr_gettarget)</div><div class='ctx'> 	mov	HV_FAST_INTR_GETTARGET, %o5</div><div class='ctx'> 	ta	HV_FAST_TRAP</div><div class='ctx'> 	retl</div><div class='ctx'> 	 mov	%o1, %o0</div><div class='del'>-	.size	sun4v_intr_gettarget, .-sun4v_intr_gettarget</div><div class='add'>+ENDPROC(sun4v_intr_gettarget)</div><div class='ctx'> </div><div class='ctx'> 	/* %o0: sysino</div><div class='ctx'> 	 * %o1: cpuid</div><div class='ctx'> 	 */</div><div class='del'>-	.globl	sun4v_intr_settarget</div><div class='del'>-	.type	sun4v_intr_settarget,#function</div><div class='del'>-sun4v_intr_settarget:</div><div class='add'>+ENTRY(sun4v_intr_settarget)</div><div class='ctx'> 	mov	HV_FAST_INTR_SETTARGET, %o5</div><div class='ctx'> 	ta	HV_FAST_TRAP</div><div class='ctx'> 	retl</div><div class='ctx'> 	 nop</div><div class='del'>-	.size	sun4v_intr_settarget, .-sun4v_intr_settarget</div><div class='add'>+ENDPROC(sun4v_intr_settarget)</div><div class='ctx'> </div><div class='ctx'> 	/* %o0:	cpuid</div><div class='ctx'> 	 * %o1: pc</div><div class='hunk'>@@ -94,37 +80,31 @@ sun4v_intr_settarget:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * returns %o0:	status</div><div class='ctx'> 	 */</div><div class='del'>-	.globl	sun4v_cpu_start</div><div class='del'>-	.type	sun4v_cpu_start,#function</div><div class='del'>-sun4v_cpu_start:</div><div class='add'>+ENTRY(sun4v_cpu_start)</div><div class='ctx'> 	mov	HV_FAST_CPU_START, %o5</div><div class='ctx'> 	ta	HV_FAST_TRAP</div><div class='ctx'> 	retl</div><div class='ctx'> 	 nop</div><div class='del'>-	.size	sun4v_cpu_start, .-sun4v_cpu_start</div><div class='add'>+ENDPROC(sun4v_cpu_start)</div><div class='ctx'> </div><div class='ctx'> 	/* %o0:	cpuid</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * returns %o0: status</div><div class='ctx'> 	 */</div><div class='del'>-	.globl	sun4v_cpu_stop</div><div class='del'>-	.type	sun4v_cpu_stop,#function</div><div class='del'>-sun4v_cpu_stop:</div><div class='add'>+ENTRY(sun4v_cpu_stop)</div><div class='ctx'> 	mov	HV_FAST_CPU_STOP, %o5</div><div class='ctx'> 	ta	HV_FAST_TRAP</div><div class='ctx'> 	retl</div><div class='ctx'> 	 nop</div><div class='del'>-	.size	sun4v_cpu_stop, .-sun4v_cpu_stop</div><div class='add'>+ENDPROC(sun4v_cpu_stop)</div><div class='ctx'> </div><div class='ctx'> 	/* returns %o0:	status  */</div><div class='del'>-	.globl	sun4v_cpu_yield</div><div class='del'>-	.type	sun4v_cpu_yield, #function</div><div class='del'>-sun4v_cpu_yield:</div><div class='add'>+ENTRY(sun4v_cpu_yield)</div><div class='ctx'> 	mov	HV_FAST_CPU_YIELD, %o5</div><div class='ctx'> 	ta	HV_FAST_TRAP</div><div class='ctx'> 	retl</div><div class='ctx'> 	 nop</div><div class='del'>-	.size	sun4v_cpu_yield, .-sun4v_cpu_yield</div><div class='add'>+ENDPROC(sun4v_cpu_yield)</div><div class='ctx'> </div><div class='ctx'> 	/* %o0:	type</div><div class='ctx'> 	 * %o1:	queue paddr</div><div class='hunk'>@@ -132,14 +112,12 @@ sun4v_cpu_yield:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * returns %o0:	status</div><div class='ctx'> 	 */</div><div class='del'>-	.globl	sun4v_cpu_qconf</div><div class='del'>-	.type	sun4v_cpu_qconf,#function</div><div class='del'>-sun4v_cpu_qconf:</div><div class='add'>+ENTRY(sun4v_cpu_qconf)</div><div class='ctx'> 	mov	HV_FAST_CPU_QCONF, %o5</div><div class='ctx'> 	ta	HV_FAST_TRAP</div><div class='ctx'> 	retl</div><div class='ctx'> 	 nop</div><div class='del'>-	.size	sun4v_cpu_qconf, .-sun4v_cpu_qconf</div><div class='add'>+ENDPROC(sun4v_cpu_qconf)</div><div class='ctx'> </div><div class='ctx'> 	/* %o0:	num cpus in cpu list</div><div class='ctx'> 	 * %o1:	cpu list paddr</div><div class='hunk'>@@ -147,23 +125,19 @@ sun4v_cpu_qconf:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * returns %o0: status</div><div class='ctx'> 	 */</div><div class='del'>-	.globl	sun4v_cpu_mondo_send</div><div class='del'>-	.type	sun4v_cpu_mondo_send,#function</div><div class='del'>-sun4v_cpu_mondo_send:</div><div class='add'>+ENTRY(sun4v_cpu_mondo_send)</div><div class='ctx'> 	mov	HV_FAST_CPU_MONDO_SEND, %o5</div><div class='ctx'> 	ta	HV_FAST_TRAP</div><div class='ctx'> 	retl</div><div class='ctx'> 	 nop</div><div class='del'>-	.size	sun4v_cpu_mondo_send, .-sun4v_cpu_mondo_send</div><div class='add'>+ENDPROC(sun4v_cpu_mondo_send)</div><div class='ctx'> </div><div class='ctx'> 	/* %o0:	CPU ID</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * returns %o0:	-status if status non-zero, else</div><div class='ctx'> 	 *         %o0:	cpu state as HV_CPU_STATE_*</div><div class='ctx'> 	 */</div><div class='del'>-	.globl	sun4v_cpu_state</div><div class='del'>-	.type	sun4v_cpu_state,#function</div><div class='del'>-sun4v_cpu_state:</div><div class='add'>+ENTRY(sun4v_cpu_state)</div><div class='ctx'> 	mov	HV_FAST_CPU_STATE, %o5</div><div class='ctx'> 	ta	HV_FAST_TRAP</div><div class='ctx'> 	brnz,pn	%o0, 1f</div><div class='hunk'>@@ -171,7 +145,7 @@ sun4v_cpu_state:</div><div class='ctx'> 	mov	%o1, %o0</div><div class='ctx'> 1:	retl</div><div class='ctx'> 	 nop</div><div class='del'>-	.size	sun4v_cpu_state, .-sun4v_cpu_state</div><div class='add'>+ENDPROC(sun4v_cpu_state)</div><div class='ctx'> </div><div class='ctx'> 	/* %o0: virtual address</div><div class='ctx'> 	 * %o1: must be zero</div><div class='hunk'>@@ -180,28 +154,24 @@ sun4v_cpu_state:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * returns %o0: status</div><div class='ctx'> 	 */</div><div class='del'>-	.globl	sun4v_mmu_map_perm_addr</div><div class='del'>-	.type	sun4v_mmu_map_perm_addr,#function</div><div class='del'>-sun4v_mmu_map_perm_addr:</div><div class='add'>+ENTRY(sun4v_mmu_map_perm_addr)</div><div class='ctx'> 	mov	HV_FAST_MMU_MAP_PERM_ADDR, %o5</div><div class='ctx'> 	ta	HV_FAST_TRAP</div><div class='ctx'> 	retl</div><div class='ctx'> 	 nop</div><div class='del'>-	.size	sun4v_mmu_map_perm_addr, .-sun4v_mmu_map_perm_addr</div><div class='add'>+ENDPROC(sun4v_mmu_map_perm_addr)</div><div class='ctx'> </div><div class='ctx'> 	/* %o0: number of TSB descriptions</div><div class='ctx'> 	 * %o1: TSB descriptions real address</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * returns %o0: status</div><div class='ctx'> 	 */</div><div class='del'>-	.globl	sun4v_mmu_tsb_ctx0</div><div class='del'>-	.type	sun4v_mmu_tsb_ctx0,#function</div><div class='del'>-sun4v_mmu_tsb_ctx0:</div><div class='add'>+ENTRY(sun4v_mmu_tsb_ctx0)</div><div class='ctx'> 	mov	HV_FAST_MMU_TSB_CTX0, %o5</div><div class='ctx'> 	ta	HV_FAST_TRAP</div><div class='ctx'> 	retl</div><div class='ctx'> 	 nop</div><div class='del'>-	.size	sun4v_mmu_tsb_ctx0, .-sun4v_mmu_tsb_ctx0</div><div class='add'>+ENDPROC(sun4v_mmu_tsb_ctx0)</div><div class='ctx'> </div><div class='ctx'> 	/* %o0:	API group number</div><div class='ctx'> 	 * %o1: pointer to unsigned long major number storage</div><div class='hunk'>@@ -209,9 +179,7 @@ sun4v_mmu_tsb_ctx0:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * returns %o0: status</div><div class='ctx'> 	 */</div><div class='del'>-	.globl	sun4v_get_version</div><div class='del'>-	.type	sun4v_get_version,#function</div><div class='del'>-sun4v_get_version:</div><div class='add'>+ENTRY(sun4v_get_version)</div><div class='ctx'> 	mov	HV_CORE_GET_VER, %o5</div><div class='ctx'> 	mov	%o1, %o3</div><div class='ctx'> 	mov	%o2, %o4</div><div class='hunk'>@@ -219,7 +187,7 @@ sun4v_get_version:</div><div class='ctx'> 	stx	%o1, [%o3]</div><div class='ctx'> 	retl</div><div class='ctx'> 	 stx	%o2, [%o4]</div><div class='del'>-	.size	sun4v_get_version, .-sun4v_get_version</div><div class='add'>+ENDPROC(sun4v_get_version)</div><div class='ctx'> </div><div class='ctx'> 	/* %o0: API group number</div><div class='ctx'> 	 * %o1: desired major number</div><div class='hunk'>@@ -228,51 +196,43 @@ sun4v_get_version:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * returns %o0: status</div><div class='ctx'> 	 */</div><div class='del'>-	.globl	sun4v_set_version</div><div class='del'>-	.type	sun4v_set_version,#function</div><div class='del'>-sun4v_set_version:</div><div class='add'>+ENTRY(sun4v_set_version)</div><div class='ctx'> 	mov	HV_CORE_SET_VER, %o5</div><div class='ctx'> 	mov	%o3, %o4</div><div class='ctx'> 	ta	HV_CORE_TRAP</div><div class='ctx'> 	retl</div><div class='ctx'> 	 stx	%o1, [%o4]</div><div class='del'>-	.size	sun4v_set_version, .-sun4v_set_version</div><div class='add'>+ENDPROC(sun4v_set_version)</div><div class='ctx'> </div><div class='ctx'> 	/* %o0: pointer to unsigned long time</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * returns %o0: status</div><div class='ctx'> 	 */</div><div class='del'>-	.globl	sun4v_tod_get</div><div class='del'>-	.type	sun4v_tod_get,#function</div><div class='del'>-sun4v_tod_get:</div><div class='add'>+ENTRY(sun4v_tod_get)</div><div class='ctx'> 	mov	%o0, %o4</div><div class='ctx'> 	mov	HV_FAST_TOD_GET, %o5</div><div class='ctx'> 	ta	HV_FAST_TRAP</div><div class='ctx'> 	stx	%o1, [%o4]</div><div class='ctx'> 	retl</div><div class='ctx'> 	 nop</div><div class='del'>-	.size	sun4v_tod_get, .-sun4v_tod_get</div><div class='add'>+ENDPROC(sun4v_tod_get)</div><div class='ctx'> </div><div class='ctx'> 	/* %o0: time</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * returns %o0: status</div><div class='ctx'> 	 */</div><div class='del'>-	.globl	sun4v_tod_set</div><div class='del'>-	.type	sun4v_tod_set,#function</div><div class='del'>-sun4v_tod_set:</div><div class='add'>+ENTRY(sun4v_tod_set)</div><div class='ctx'> 	mov	HV_FAST_TOD_SET, %o5</div><div class='ctx'> 	ta	HV_FAST_TRAP</div><div class='ctx'> 	retl</div><div class='ctx'> 	 nop</div><div class='del'>-	.size	sun4v_tod_set, .-sun4v_tod_set</div><div class='add'>+ENDPROC(sun4v_tod_set)</div><div class='ctx'> </div><div class='ctx'> 	/* %o0: pointer to unsigned long status</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * returns %o0: signed character</div><div class='ctx'> 	 */</div><div class='del'>-	.globl	sun4v_con_getchar</div><div class='del'>-	.type	sun4v_con_getchar,#function</div><div class='del'>-sun4v_con_getchar:</div><div class='add'>+ENTRY(sun4v_con_getchar)</div><div class='ctx'> 	mov	%o0, %o4</div><div class='ctx'> 	mov	HV_FAST_CONS_GETCHAR, %o5</div><div class='ctx'> 	clr	%o0</div><div class='hunk'>@@ -281,20 +241,18 @@ sun4v_con_getchar:</div><div class='ctx'> 	stx	%o0, [%o4]</div><div class='ctx'> 	retl</div><div class='ctx'> 	 sra	%o1, 0, %o0</div><div class='del'>-	.size	sun4v_con_getchar, .-sun4v_con_getchar</div><div class='add'>+ENDPROC(sun4v_con_getchar)</div><div class='ctx'> </div><div class='ctx'> 	/* %o0: signed long character</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * returns %o0: status</div><div class='ctx'> 	 */</div><div class='del'>-	.globl	sun4v_con_putchar</div><div class='del'>-	.type	sun4v_con_putchar,#function</div><div class='del'>-sun4v_con_putchar:</div><div class='add'>+ENTRY(sun4v_con_putchar)</div><div class='ctx'> 	mov	HV_FAST_CONS_PUTCHAR, %o5</div><div class='ctx'> 	ta	HV_FAST_TRAP</div><div class='ctx'> 	retl</div><div class='ctx'> 	 sra	%o0, 0, %o0</div><div class='del'>-	.size	sun4v_con_putchar, .-sun4v_con_putchar</div><div class='add'>+ENDPROC(sun4v_con_putchar)</div><div class='ctx'> </div><div class='ctx'> 	/* %o0: buffer real address</div><div class='ctx'> 	 * %o1: buffer size</div><div class='hunk'>@@ -302,9 +260,7 @@ sun4v_con_putchar:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * returns %o0: status</div><div class='ctx'> 	 */</div><div class='del'>-	.globl	sun4v_con_read</div><div class='del'>-	.type	sun4v_con_read,#function</div><div class='del'>-sun4v_con_read:</div><div class='add'>+ENTRY(sun4v_con_read)</div><div class='ctx'> 	mov	%o2, %o4</div><div class='ctx'> 	mov	HV_FAST_CONS_READ, %o5</div><div class='ctx'> 	ta	HV_FAST_TRAP</div><div class='hunk'>@@ -318,7 +274,7 @@ sun4v_con_read:</div><div class='ctx'> 	stx	%o1, [%o4]</div><div class='ctx'> 1:	retl</div><div class='ctx'> 	 nop</div><div class='del'>-	.size	sun4v_con_read, .-sun4v_con_read</div><div class='add'>+ENDPROC(sun4v_con_read)</div><div class='ctx'> </div><div class='ctx'> 	/* %o0: buffer real address</div><div class='ctx'> 	 * %o1: buffer size</div><div class='hunk'>@@ -326,43 +282,37 @@ sun4v_con_read:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * returns %o0: status</div><div class='ctx'> 	 */</div><div class='del'>-	.globl	sun4v_con_write</div><div class='del'>-	.type	sun4v_con_write,#function</div><div class='del'>-sun4v_con_write:</div><div class='add'>+ENTRY(sun4v_con_write)</div><div class='ctx'> 	mov	%o2, %o4</div><div class='ctx'> 	mov	HV_FAST_CONS_WRITE, %o5</div><div class='ctx'> 	ta	HV_FAST_TRAP</div><div class='ctx'> 	stx	%o1, [%o4]</div><div class='ctx'> 	retl</div><div class='ctx'> 	 nop</div><div class='del'>-	.size	sun4v_con_write, .-sun4v_con_write</div><div class='add'>+ENDPROC(sun4v_con_write)</div><div class='ctx'> </div><div class='ctx'> 	/* %o0:	soft state</div><div class='ctx'> 	 * %o1:	address of description string</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * returns %o0: status</div><div class='ctx'> 	 */</div><div class='del'>-	.globl	sun4v_mach_set_soft_state</div><div class='del'>-	.type	sun4v_mach_set_soft_state,#function</div><div class='del'>-sun4v_mach_set_soft_state:</div><div class='add'>+ENTRY(sun4v_mach_set_soft_state)</div><div class='ctx'> 	mov	HV_FAST_MACH_SET_SOFT_STATE, %o5</div><div class='ctx'> 	ta	HV_FAST_TRAP</div><div class='ctx'> 	retl</div><div class='ctx'> 	 nop</div><div class='del'>-	.size	sun4v_mach_set_soft_state, .-sun4v_mach_set_soft_state</div><div class='add'>+ENDPROC(sun4v_mach_set_soft_state)</div><div class='ctx'> </div><div class='ctx'> 	/* %o0: exit code</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * Does not return.</div><div class='ctx'> 	 */</div><div class='del'>-	.globl	sun4v_mach_exit</div><div class='del'>-	.type	sun4v_mach_exit,#function</div><div class='del'>-sun4v_mach_exit:</div><div class='add'>+ENTRY(sun4v_mach_exit)</div><div class='ctx'> 	mov	HV_FAST_MACH_EXIT, %o5</div><div class='ctx'> 	ta	HV_FAST_TRAP</div><div class='ctx'> 	retl</div><div class='ctx'> 	 nop</div><div class='del'>-	.size	sun4v_mach_exit, .-sun4v_mach_exit</div><div class='add'>+ENDPROC(sun4v_mach_exit)</div><div class='ctx'> </div><div class='ctx'> 	/* %o0: buffer real address</div><div class='ctx'> 	 * %o1: buffer length</div><div class='hunk'>@@ -370,44 +320,38 @@ sun4v_mach_exit:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * returns %o0: status</div><div class='ctx'> 	 */</div><div class='del'>-	.globl	sun4v_mach_desc</div><div class='del'>-	.type	sun4v_mach_desc,#function</div><div class='del'>-sun4v_mach_desc:</div><div class='add'>+ENTRY(sun4v_mach_desc)</div><div class='ctx'> 	mov	%o2, %o4</div><div class='ctx'> 	mov	HV_FAST_MACH_DESC, %o5</div><div class='ctx'> 	ta	HV_FAST_TRAP</div><div class='ctx'> 	stx	%o1, [%o4]</div><div class='ctx'> 	retl</div><div class='ctx'> 	 nop</div><div class='del'>-	.size	sun4v_mach_desc, .-sun4v_mach_desc</div><div class='add'>+ENDPROC(sun4v_mach_desc)</div><div class='ctx'> </div><div class='ctx'> 	/* %o0: new timeout in milliseconds</div><div class='ctx'> 	 * %o1: pointer to unsigned long orig_timeout</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * returns %o0: status</div><div class='ctx'> 	 */</div><div class='del'>-	.globl	sun4v_mach_set_watchdog</div><div class='del'>-	.type	sun4v_mach_set_watchdog,#function</div><div class='del'>-sun4v_mach_set_watchdog:</div><div class='add'>+ENTRY(sun4v_mach_set_watchdog)</div><div class='ctx'> 	mov	%o1, %o4</div><div class='ctx'> 	mov	HV_FAST_MACH_SET_WATCHDOG, %o5</div><div class='ctx'> 	ta	HV_FAST_TRAP</div><div class='ctx'> 	stx	%o1, [%o4]</div><div class='ctx'> 	retl</div><div class='ctx'> 	 nop</div><div class='del'>-	.size	sun4v_mach_set_watchdog, .-sun4v_mach_set_watchdog</div><div class='add'>+ENDPROC(sun4v_mach_set_watchdog)</div><div class='ctx'> </div><div class='ctx'> 	/* No inputs and does not return.  */</div><div class='del'>-	.globl	sun4v_mach_sir</div><div class='del'>-	.type	sun4v_mach_sir,#function</div><div class='del'>-sun4v_mach_sir:</div><div class='add'>+ENTRY(sun4v_mach_sir)</div><div class='ctx'> 	mov	%o1, %o4</div><div class='ctx'> 	mov	HV_FAST_MACH_SIR, %o5</div><div class='ctx'> 	ta	HV_FAST_TRAP</div><div class='ctx'> 	stx	%o1, [%o4]</div><div class='ctx'> 	retl</div><div class='ctx'> 	 nop</div><div class='del'>-	.size	sun4v_mach_sir, .-sun4v_mach_sir</div><div class='add'>+ENDPROC(sun4v_mach_sir)</div><div class='ctx'> </div><div class='ctx'> 	/* %o0: channel</div><div class='ctx'> 	 * %o1:	ra</div><div class='hunk'>@@ -415,14 +359,12 @@ sun4v_mach_sir:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * returns %o0:	status</div><div class='ctx'> 	 */</div><div class='del'>-	.globl	sun4v_ldc_tx_qconf</div><div class='del'>-	.type	sun4v_ldc_tx_qconf,#function</div><div class='del'>-sun4v_ldc_tx_qconf:</div><div class='add'>+ENTRY(sun4v_ldc_tx_qconf)</div><div class='ctx'> 	mov	HV_FAST_LDC_TX_QCONF, %o5</div><div class='ctx'> 	ta	HV_FAST_TRAP</div><div class='ctx'> 	retl</div><div class='ctx'> 	 nop</div><div class='del'>-	.size	sun4v_ldc_tx_qconf, .-sun4v_ldc_tx_qconf</div><div class='add'>+ENDPROC(sun4v_ldc_tx_qconf)</div><div class='ctx'> </div><div class='ctx'> 	/* %o0: channel</div><div class='ctx'> 	 * %o1:	pointer to unsigned long ra</div><div class='hunk'>@@ -430,9 +372,7 @@ sun4v_ldc_tx_qconf:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * returns %o0:	status</div><div class='ctx'> 	 */</div><div class='del'>-	.globl	sun4v_ldc_tx_qinfo</div><div class='del'>-	.type	sun4v_ldc_tx_qinfo,#function</div><div class='del'>-sun4v_ldc_tx_qinfo:</div><div class='add'>+ENTRY(sun4v_ldc_tx_qinfo)</div><div class='ctx'> 	mov	%o1, %g1</div><div class='ctx'> 	mov	%o2, %g2</div><div class='ctx'> 	mov	HV_FAST_LDC_TX_QINFO, %o5</div><div class='hunk'>@@ -441,7 +381,7 @@ sun4v_ldc_tx_qinfo:</div><div class='ctx'> 	stx	%o2, [%g2]</div><div class='ctx'> 	retl</div><div class='ctx'> 	 nop</div><div class='del'>-	.size	sun4v_ldc_tx_qinfo, .-sun4v_ldc_tx_qinfo</div><div class='add'>+ENDPROC(sun4v_ldc_tx_qinfo)</div><div class='ctx'> </div><div class='ctx'> 	/* %o0: channel</div><div class='ctx'> 	 * %o1:	pointer to unsigned long head_off</div><div class='hunk'>@@ -450,9 +390,7 @@ sun4v_ldc_tx_qinfo:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * returns %o0:	status</div><div class='ctx'> 	 */</div><div class='del'>-	.globl	sun4v_ldc_tx_get_state</div><div class='del'>-	.type	sun4v_ldc_tx_get_state,#function</div><div class='del'>-sun4v_ldc_tx_get_state:</div><div class='add'>+ENTRY(sun4v_ldc_tx_get_state)</div><div class='ctx'> 	mov	%o1, %g1</div><div class='ctx'> 	mov	%o2, %g2</div><div class='ctx'> 	mov	%o3, %g3</div><div class='hunk'>@@ -463,21 +401,19 @@ sun4v_ldc_tx_get_state:</div><div class='ctx'> 	stx	%o3, [%g3]</div><div class='ctx'> 	retl</div><div class='ctx'> 	 nop</div><div class='del'>-	.size	sun4v_ldc_tx_get_state, .-sun4v_ldc_tx_get_state</div><div class='add'>+ENDPROC(sun4v_ldc_tx_get_state)</div><div class='ctx'> </div><div class='ctx'> 	/* %o0: channel</div><div class='ctx'> 	 * %o1:	tail_off</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * returns %o0:	status</div><div class='ctx'> 	 */</div><div class='del'>-	.globl	sun4v_ldc_tx_set_qtail</div><div class='del'>-	.type	sun4v_ldc_tx_set_qtail,#function</div><div class='del'>-sun4v_ldc_tx_set_qtail:</div><div class='add'>+ENTRY(sun4v_ldc_tx_set_qtail)</div><div class='ctx'> 	mov	HV_FAST_LDC_TX_SET_QTAIL, %o5</div><div class='ctx'> 	ta	HV_FAST_TRAP</div><div class='ctx'> 	retl</div><div class='ctx'> 	 nop</div><div class='del'>-	.size	sun4v_ldc_tx_set_qtail, .-sun4v_ldc_tx_set_qtail</div><div class='add'>+ENDPROC(sun4v_ldc_tx_set_qtail)</div><div class='ctx'> </div><div class='ctx'> 	/* %o0: channel</div><div class='ctx'> 	 * %o1:	ra</div><div class='hunk'>@@ -485,14 +421,12 @@ sun4v_ldc_tx_set_qtail:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * returns %o0:	status</div><div class='ctx'> 	 */</div><div class='del'>-	.globl	sun4v_ldc_rx_qconf</div><div class='del'>-	.type	sun4v_ldc_rx_qconf,#function</div><div class='del'>-sun4v_ldc_rx_qconf:</div><div class='add'>+ENTRY(sun4v_ldc_rx_qconf)</div><div class='ctx'> 	mov	HV_FAST_LDC_RX_QCONF, %o5</div><div class='ctx'> 	ta	HV_FAST_TRAP</div><div class='ctx'> 	retl</div><div class='ctx'> 	 nop</div><div class='del'>-	.size	sun4v_ldc_rx_qconf, .-sun4v_ldc_rx_qconf</div><div class='add'>+ENDPROC(sun4v_ldc_rx_qconf)</div><div class='ctx'> </div><div class='ctx'> 	/* %o0: channel</div><div class='ctx'> 	 * %o1:	pointer to unsigned long ra</div><div class='hunk'>@@ -500,9 +434,7 @@ sun4v_ldc_rx_qconf:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * returns %o0:	status</div><div class='ctx'> 	 */</div><div class='del'>-	.globl	sun4v_ldc_rx_qinfo</div><div class='del'>-	.type	sun4v_ldc_rx_qinfo,#function</div><div class='del'>-sun4v_ldc_rx_qinfo:</div><div class='add'>+ENTRY(sun4v_ldc_rx_qinfo)</div><div class='ctx'> 	mov	%o1, %g1</div><div class='ctx'> 	mov	%o2, %g2</div><div class='ctx'> 	mov	HV_FAST_LDC_RX_QINFO, %o5</div><div class='hunk'>@@ -511,7 +443,7 @@ sun4v_ldc_rx_qinfo:</div><div class='ctx'> 	stx	%o2, [%g2]</div><div class='ctx'> 	retl</div><div class='ctx'> 	 nop</div><div class='del'>-	.size	sun4v_ldc_rx_qinfo, .-sun4v_ldc_rx_qinfo</div><div class='add'>+ENDPROC(sun4v_ldc_rx_qinfo)</div><div class='ctx'> </div><div class='ctx'> 	/* %o0: channel</div><div class='ctx'> 	 * %o1:	pointer to unsigned long head_off</div><div class='hunk'>@@ -520,9 +452,7 @@ sun4v_ldc_rx_qinfo:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * returns %o0:	status</div><div class='ctx'> 	 */</div><div class='del'>-	.globl	sun4v_ldc_rx_get_state</div><div class='del'>-	.type	sun4v_ldc_rx_get_state,#function</div><div class='del'>-sun4v_ldc_rx_get_state:</div><div class='add'>+ENTRY(sun4v_ldc_rx_get_state)</div><div class='ctx'> 	mov	%o1, %g1</div><div class='ctx'> 	mov	%o2, %g2</div><div class='ctx'> 	mov	%o3, %g3</div><div class='hunk'>@@ -533,21 +463,19 @@ sun4v_ldc_rx_get_state:</div><div class='ctx'> 	stx	%o3, [%g3]</div><div class='ctx'> 	retl</div><div class='ctx'> 	 nop</div><div class='del'>-	.size	sun4v_ldc_rx_get_state, .-sun4v_ldc_rx_get_state</div><div class='add'>+ENDPROC(sun4v_ldc_rx_get_state)</div><div class='ctx'> </div><div class='ctx'> 	/* %o0: channel</div><div class='ctx'> 	 * %o1:	head_off</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * returns %o0:	status</div><div class='ctx'> 	 */</div><div class='del'>-	.globl	sun4v_ldc_rx_set_qhead</div><div class='del'>-	.type	sun4v_ldc_rx_set_qhead,#function</div><div class='del'>-sun4v_ldc_rx_set_qhead:</div><div class='add'>+ENTRY(sun4v_ldc_rx_set_qhead)</div><div class='ctx'> 	mov	HV_FAST_LDC_RX_SET_QHEAD, %o5</div><div class='ctx'> 	ta	HV_FAST_TRAP</div><div class='ctx'> 	retl</div><div class='ctx'> 	 nop</div><div class='del'>-	.size	sun4v_ldc_rx_set_qhead, .-sun4v_ldc_rx_set_qhead</div><div class='add'>+ENDPROC(sun4v_ldc_rx_set_qhead)</div><div class='ctx'> </div><div class='ctx'> 	/* %o0: channel</div><div class='ctx'> 	 * %o1:	ra</div><div class='hunk'>@@ -555,14 +483,12 @@ sun4v_ldc_rx_set_qhead:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * returns %o0: status</div><div class='ctx'> 	 */</div><div class='del'>-	.globl	sun4v_ldc_set_map_table</div><div class='del'>-	.type	sun4v_ldc_set_map_table,#function</div><div class='del'>-sun4v_ldc_set_map_table:</div><div class='add'>+ENTRY(sun4v_ldc_set_map_table)</div><div class='ctx'> 	mov	HV_FAST_LDC_SET_MAP_TABLE, %o5</div><div class='ctx'> 	ta	HV_FAST_TRAP</div><div class='ctx'> 	retl</div><div class='ctx'> 	 nop</div><div class='del'>-	.size	sun4v_ldc_set_map_table, .-sun4v_ldc_set_map_table</div><div class='add'>+ENDPROC(sun4v_ldc_set_map_table)</div><div class='ctx'> </div><div class='ctx'> 	/* %o0: channel</div><div class='ctx'> 	 * %o1:	pointer to unsigned long ra</div><div class='hunk'>@@ -570,9 +496,7 @@ sun4v_ldc_set_map_table:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * returns %o0: status</div><div class='ctx'> 	 */</div><div class='del'>-	.globl	sun4v_ldc_get_map_table</div><div class='del'>-	.type	sun4v_ldc_get_map_table,#function</div><div class='del'>-sun4v_ldc_get_map_table:</div><div class='add'>+ENTRY(sun4v_ldc_get_map_table)</div><div class='ctx'> 	mov	%o1, %g1</div><div class='ctx'> 	mov	%o2, %g2</div><div class='ctx'> 	mov	HV_FAST_LDC_GET_MAP_TABLE, %o5</div><div class='hunk'>@@ -581,7 +505,7 @@ sun4v_ldc_get_map_table:</div><div class='ctx'> 	stx	%o2, [%g2]</div><div class='ctx'> 	retl</div><div class='ctx'> 	 nop</div><div class='del'>-	.size	sun4v_ldc_get_map_table, .-sun4v_ldc_get_map_table</div><div class='add'>+ENDPROC(sun4v_ldc_get_map_table)</div><div class='ctx'> </div><div class='ctx'> 	/* %o0:	channel</div><div class='ctx'> 	 * %o1:	dir_code</div><div class='hunk'>@@ -592,16 +516,14 @@ sun4v_ldc_get_map_table:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * returns %o0:	status</div><div class='ctx'> 	 */</div><div class='del'>-	.globl	sun4v_ldc_copy</div><div class='del'>-	.type	sun4v_ldc_copy,#function</div><div class='del'>-sun4v_ldc_copy:</div><div class='add'>+ENTRY(sun4v_ldc_copy)</div><div class='ctx'> 	mov	%o5, %g1</div><div class='ctx'> 	mov	HV_FAST_LDC_COPY, %o5</div><div class='ctx'> 	ta	HV_FAST_TRAP</div><div class='ctx'> 	stx	%o1, [%g1]</div><div class='ctx'> 	retl</div><div class='ctx'> 	 nop</div><div class='del'>-	.size	sun4v_ldc_copy, .-sun4v_ldc_copy</div><div class='add'>+ENDPROC(sun4v_ldc_copy)</div><div class='ctx'> </div><div class='ctx'> 	/* %o0:	channel</div><div class='ctx'> 	 * %o1:	cookie</div><div class='hunk'>@@ -610,9 +532,7 @@ sun4v_ldc_copy:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * returns %o0:	status</div><div class='ctx'> 	 */</div><div class='del'>-	.globl	sun4v_ldc_mapin</div><div class='del'>-	.type	sun4v_ldc_mapin,#function</div><div class='del'>-sun4v_ldc_mapin:</div><div class='add'>+ENTRY(sun4v_ldc_mapin)</div><div class='ctx'> 	mov	%o2, %g1</div><div class='ctx'> 	mov	%o3, %g2</div><div class='ctx'> 	mov	HV_FAST_LDC_MAPIN, %o5</div><div class='hunk'>@@ -621,20 +541,18 @@ sun4v_ldc_mapin:</div><div class='ctx'> 	stx	%o2, [%g2]</div><div class='ctx'> 	retl</div><div class='ctx'> 	 nop</div><div class='del'>-	.size	sun4v_ldc_mapin, .-sun4v_ldc_mapin</div><div class='add'>+ENDPROC(sun4v_ldc_mapin)</div><div class='ctx'> </div><div class='ctx'> 	/* %o0:	ra</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * returns %o0:	status</div><div class='ctx'> 	 */</div><div class='del'>-	.globl	sun4v_ldc_unmap</div><div class='del'>-	.type	sun4v_ldc_unmap,#function</div><div class='del'>-sun4v_ldc_unmap:</div><div class='add'>+ENTRY(sun4v_ldc_unmap)</div><div class='ctx'> 	mov	HV_FAST_LDC_UNMAP, %o5</div><div class='ctx'> 	ta	HV_FAST_TRAP</div><div class='ctx'> 	retl</div><div class='ctx'> 	 nop</div><div class='del'>-	.size	sun4v_ldc_unmap, .-sun4v_ldc_unmap</div><div class='add'>+ENDPROC(sun4v_ldc_unmap)</div><div class='ctx'> </div><div class='ctx'> 	/* %o0: channel</div><div class='ctx'> 	 * %o1:	cookie</div><div class='hunk'>@@ -642,14 +560,12 @@ sun4v_ldc_unmap:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * returns %o0:	status</div><div class='ctx'> 	 */</div><div class='del'>-	.globl	sun4v_ldc_revoke</div><div class='del'>-	.type	sun4v_ldc_revoke,#function</div><div class='del'>-sun4v_ldc_revoke:</div><div class='add'>+ENTRY(sun4v_ldc_revoke)</div><div class='ctx'> 	mov	HV_FAST_LDC_REVOKE, %o5</div><div class='ctx'> 	ta	HV_FAST_TRAP</div><div class='ctx'> 	retl</div><div class='ctx'> 	 nop</div><div class='del'>-	.size	sun4v_ldc_revoke, .-sun4v_ldc_revoke</div><div class='add'>+ENDPROC(sun4v_ldc_revoke)</div><div class='ctx'> </div><div class='ctx'> 	/* %o0: device handle</div><div class='ctx'> 	 * %o1:	device INO</div><div class='hunk'>@@ -657,16 +573,14 @@ sun4v_ldc_revoke:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * returns %o0: status</div><div class='ctx'> 	 */</div><div class='del'>-	.globl	sun4v_vintr_get_cookie</div><div class='del'>-	.type	sun4v_vintr_get_cookie,#function</div><div class='del'>-sun4v_vintr_get_cookie:</div><div class='add'>+ENTRY(sun4v_vintr_get_cookie)</div><div class='ctx'> 	mov	%o2, %g1</div><div class='ctx'> 	mov	HV_FAST_VINTR_GET_COOKIE, %o5</div><div class='ctx'> 	ta	HV_FAST_TRAP</div><div class='ctx'> 	stx	%o1, [%g1]</div><div class='ctx'> 	retl</div><div class='ctx'> 	 nop</div><div class='del'>-	.size	sun4v_vintr_get_cookie, .-sun4v_vintr_get_cookie</div><div class='add'>+ENDPROC(sun4v_vintr_get_cookie)</div><div class='ctx'> </div><div class='ctx'> 	/* %o0: device handle</div><div class='ctx'> 	 * %o1:	device INO</div><div class='hunk'>@@ -674,14 +588,12 @@ sun4v_vintr_get_cookie:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * returns %o0: status</div><div class='ctx'> 	 */</div><div class='del'>-	.globl	sun4v_vintr_set_cookie</div><div class='del'>-	.type	sun4v_vintr_set_cookie,#function</div><div class='del'>-sun4v_vintr_set_cookie:</div><div class='add'>+ENTRY(sun4v_vintr_set_cookie)</div><div class='ctx'> 	mov	HV_FAST_VINTR_SET_COOKIE, %o5</div><div class='ctx'> 	ta	HV_FAST_TRAP</div><div class='ctx'> 	retl</div><div class='ctx'> 	 nop</div><div class='del'>-	.size	sun4v_vintr_set_cookie, .-sun4v_vintr_set_cookie</div><div class='add'>+ENDPROC(sun4v_vintr_set_cookie)</div><div class='ctx'> </div><div class='ctx'> 	/* %o0: device handle</div><div class='ctx'> 	 * %o1:	device INO</div><div class='hunk'>@@ -689,16 +601,14 @@ sun4v_vintr_set_cookie:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * returns %o0: status</div><div class='ctx'> 	 */</div><div class='del'>-	.globl	sun4v_vintr_get_valid</div><div class='del'>-	.type	sun4v_vintr_get_valid,#function</div><div class='del'>-sun4v_vintr_get_valid:</div><div class='add'>+ENTRY(sun4v_vintr_get_valid)</div><div class='ctx'> 	mov	%o2, %g1</div><div class='ctx'> 	mov	HV_FAST_VINTR_GET_VALID, %o5</div><div class='ctx'> 	ta	HV_FAST_TRAP</div><div class='ctx'> 	stx	%o1, [%g1]</div><div class='ctx'> 	retl</div><div class='ctx'> 	 nop</div><div class='del'>-	.size	sun4v_vintr_get_valid, .-sun4v_vintr_get_valid</div><div class='add'>+ENDPROC(sun4v_vintr_get_valid)</div><div class='ctx'> </div><div class='ctx'> 	/* %o0: device handle</div><div class='ctx'> 	 * %o1:	device INO</div><div class='hunk'>@@ -706,14 +616,12 @@ sun4v_vintr_get_valid:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * returns %o0: status</div><div class='ctx'> 	 */</div><div class='del'>-	.globl	sun4v_vintr_set_valid</div><div class='del'>-	.type	sun4v_vintr_set_valid,#function</div><div class='del'>-sun4v_vintr_set_valid:</div><div class='add'>+ENTRY(sun4v_vintr_set_valid)</div><div class='ctx'> 	mov	HV_FAST_VINTR_SET_VALID, %o5</div><div class='ctx'> 	ta	HV_FAST_TRAP</div><div class='ctx'> 	retl</div><div class='ctx'> 	 nop</div><div class='del'>-	.size	sun4v_vintr_set_valid, .-sun4v_vintr_set_valid</div><div class='add'>+ENDPROC(sun4v_vintr_set_valid)</div><div class='ctx'> </div><div class='ctx'> 	/* %o0: device handle</div><div class='ctx'> 	 * %o1:	device INO</div><div class='hunk'>@@ -721,16 +629,14 @@ sun4v_vintr_set_valid:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * returns %o0: status</div><div class='ctx'> 	 */</div><div class='del'>-	.globl	sun4v_vintr_get_state</div><div class='del'>-	.type	sun4v_vintr_get_state,#function</div><div class='del'>-sun4v_vintr_get_state:</div><div class='add'>+ENTRY(sun4v_vintr_get_state)</div><div class='ctx'> 	mov	%o2, %g1</div><div class='ctx'> 	mov	HV_FAST_VINTR_GET_STATE, %o5</div><div class='ctx'> 	ta	HV_FAST_TRAP</div><div class='ctx'> 	stx	%o1, [%g1]</div><div class='ctx'> 	retl</div><div class='ctx'> 	 nop</div><div class='del'>-	.size	sun4v_vintr_get_state, .-sun4v_vintr_get_state</div><div class='add'>+ENDPROC(sun4v_vintr_get_state)</div><div class='ctx'> </div><div class='ctx'> 	/* %o0: device handle</div><div class='ctx'> 	 * %o1:	device INO</div><div class='hunk'>@@ -738,14 +644,12 @@ sun4v_vintr_get_state:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * returns %o0: status</div><div class='ctx'> 	 */</div><div class='del'>-	.globl	sun4v_vintr_set_state</div><div class='del'>-	.type	sun4v_vintr_set_state,#function</div><div class='del'>-sun4v_vintr_set_state:</div><div class='add'>+ENTRY(sun4v_vintr_set_state)</div><div class='ctx'> 	mov	HV_FAST_VINTR_SET_STATE, %o5</div><div class='ctx'> 	ta	HV_FAST_TRAP</div><div class='ctx'> 	retl</div><div class='ctx'> 	 nop</div><div class='del'>-	.size	sun4v_vintr_set_state, .-sun4v_vintr_set_state</div><div class='add'>+ENDPROC(sun4v_vintr_set_state)</div><div class='ctx'> </div><div class='ctx'> 	/* %o0: device handle</div><div class='ctx'> 	 * %o1:	device INO</div><div class='hunk'>@@ -753,16 +657,14 @@ sun4v_vintr_set_state:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * returns %o0: status</div><div class='ctx'> 	 */</div><div class='del'>-	.globl	sun4v_vintr_get_target</div><div class='del'>-	.type	sun4v_vintr_get_target,#function</div><div class='del'>-sun4v_vintr_get_target:</div><div class='add'>+ENTRY(sun4v_vintr_get_target)</div><div class='ctx'> 	mov	%o2, %g1</div><div class='ctx'> 	mov	HV_FAST_VINTR_GET_TARGET, %o5</div><div class='ctx'> 	ta	HV_FAST_TRAP</div><div class='ctx'> 	stx	%o1, [%g1]</div><div class='ctx'> 	retl</div><div class='ctx'> 	 nop</div><div class='del'>-	.size	sun4v_vintr_get_target, .-sun4v_vintr_get_target</div><div class='add'>+ENDPROC(sun4v_vintr_get_target)</div><div class='ctx'> </div><div class='ctx'> 	/* %o0: device handle</div><div class='ctx'> 	 * %o1:	device INO</div><div class='hunk'>@@ -770,14 +672,12 @@ sun4v_vintr_get_target:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * returns %o0: status</div><div class='ctx'> 	 */</div><div class='del'>-	.globl	sun4v_vintr_set_target</div><div class='del'>-	.type	sun4v_vintr_set_target,#function</div><div class='del'>-sun4v_vintr_set_target:</div><div class='add'>+ENTRY(sun4v_vintr_set_target)</div><div class='ctx'> 	mov	HV_FAST_VINTR_SET_TARGET, %o5</div><div class='ctx'> 	ta	HV_FAST_TRAP</div><div class='ctx'> 	retl</div><div class='ctx'> 	 nop</div><div class='del'>-	.size	sun4v_vintr_set_target, .-sun4v_vintr_set_target</div><div class='add'>+ENDPROC(sun4v_vintr_set_target)</div><div class='ctx'> </div><div class='ctx'> 	/* %o0: NCS sub-function</div><div class='ctx'> 	 * %o1:	sub-function arg real-address</div><div class='hunk'>@@ -785,18 +685,14 @@ sun4v_vintr_set_target:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * returns %o0:	status</div><div class='ctx'> 	 */</div><div class='del'>-	.globl	sun4v_ncs_request</div><div class='del'>-	.type	sun4v_ncs_request,#function</div><div class='del'>-sun4v_ncs_request:</div><div class='add'>+ENTRY(sun4v_ncs_request)</div><div class='ctx'> 	mov	HV_FAST_NCS_REQUEST, %o5</div><div class='ctx'> 	ta	HV_FAST_TRAP</div><div class='ctx'> 	retl</div><div class='ctx'> 	 nop</div><div class='del'>-	.size	sun4v_ncs_request, .-sun4v_ncs_request</div><div class='add'>+ENDPROC(sun4v_ncs_request)</div><div class='ctx'> </div><div class='del'>-	.globl	sun4v_svc_send</div><div class='del'>-	.type	sun4v_svc_send,#function</div><div class='del'>-sun4v_svc_send:</div><div class='add'>+ENTRY(sun4v_svc_send)</div><div class='ctx'> 	save	%sp, -192, %sp</div><div class='ctx'> 	mov	%i0, %o0</div><div class='ctx'> 	mov	%i1, %o1</div><div class='hunk'>@@ -806,11 +702,9 @@ sun4v_svc_send:</div><div class='ctx'> 	stx	%o1, [%i3]</div><div class='ctx'> 	ret</div><div class='ctx'> 	restore</div><div class='del'>-	.size	sun4v_svc_send, .-sun4v_svc_send</div><div class='add'>+ENDPROC(sun4v_svc_send)</div><div class='ctx'> </div><div class='del'>-	.globl	sun4v_svc_recv</div><div class='del'>-	.type	sun4v_svc_recv,#function</div><div class='del'>-sun4v_svc_recv:</div><div class='add'>+ENTRY(sun4v_svc_recv)</div><div class='ctx'> 	save	%sp, -192, %sp</div><div class='ctx'> 	mov	%i0, %o0</div><div class='ctx'> 	mov	%i1, %o1</div><div class='hunk'>@@ -820,62 +714,50 @@ sun4v_svc_recv:</div><div class='ctx'> 	stx	%o1, [%i3]</div><div class='ctx'> 	ret</div><div class='ctx'> 	restore</div><div class='del'>-	.size	sun4v_svc_recv, .-sun4v_svc_recv</div><div class='add'>+ENDPROC(sun4v_svc_recv)</div><div class='ctx'> </div><div class='del'>-	.globl	sun4v_svc_getstatus</div><div class='del'>-	.type	sun4v_svc_getstatus,#function</div><div class='del'>-sun4v_svc_getstatus:</div><div class='add'>+ENTRY(sun4v_svc_getstatus)</div><div class='ctx'> 	mov	HV_FAST_SVC_GETSTATUS, %o5</div><div class='ctx'> 	mov	%o1, %o4</div><div class='ctx'> 	ta	HV_FAST_TRAP</div><div class='ctx'> 	stx	%o1, [%o4]</div><div class='ctx'> 	retl</div><div class='ctx'> 	 nop</div><div class='del'>-	.size	sun4v_svc_getstatus, .-sun4v_svc_getstatus</div><div class='add'>+ENDPROC(sun4v_svc_getstatus)</div><div class='ctx'> </div><div class='del'>-	.globl	sun4v_svc_setstatus</div><div class='del'>-	.type	sun4v_svc_setstatus,#function</div><div class='del'>-sun4v_svc_setstatus:</div><div class='add'>+ENTRY(sun4v_svc_setstatus)</div><div class='ctx'> 	mov	HV_FAST_SVC_SETSTATUS, %o5</div><div class='ctx'> 	ta	HV_FAST_TRAP</div><div class='ctx'> 	retl</div><div class='ctx'> 	 nop</div><div class='del'>-	.size	sun4v_svc_setstatus, .-sun4v_svc_setstatus</div><div class='add'>+ENDPROC(sun4v_svc_setstatus)</div><div class='ctx'> </div><div class='del'>-	.globl	sun4v_svc_clrstatus</div><div class='del'>-	.type	sun4v_svc_clrstatus,#function</div><div class='del'>-sun4v_svc_clrstatus:</div><div class='add'>+ENTRY(sun4v_svc_clrstatus)</div><div class='ctx'> 	mov	HV_FAST_SVC_CLRSTATUS, %o5</div><div class='ctx'> 	ta	HV_FAST_TRAP</div><div class='ctx'> 	retl</div><div class='ctx'> 	 nop</div><div class='del'>-	.size	sun4v_svc_clrstatus, .-sun4v_svc_clrstatus</div><div class='add'>+ENDPROC(sun4v_svc_clrstatus)</div><div class='ctx'> </div><div class='del'>-	.globl	sun4v_mmustat_conf</div><div class='del'>-	.type	sun4v_mmustat_conf,#function</div><div class='del'>-sun4v_mmustat_conf:</div><div class='add'>+ENTRY(sun4v_mmustat_conf)</div><div class='ctx'> 	mov	%o1, %o4</div><div class='ctx'> 	mov	HV_FAST_MMUSTAT_CONF, %o5</div><div class='ctx'> 	ta	HV_FAST_TRAP</div><div class='ctx'> 	stx	%o1, [%o4]</div><div class='ctx'> 	retl</div><div class='ctx'> 	 nop</div><div class='del'>-	.size	sun4v_mmustat_conf, .-sun4v_mmustat_conf</div><div class='add'>+ENDPROC(sun4v_mmustat_conf)</div><div class='ctx'> </div><div class='del'>-	.globl	sun4v_mmustat_info</div><div class='del'>-	.type	sun4v_mmustat_info,#function</div><div class='del'>-sun4v_mmustat_info:</div><div class='add'>+ENTRY(sun4v_mmustat_info)</div><div class='ctx'> 	mov	%o0, %o4</div><div class='ctx'> 	mov	HV_FAST_MMUSTAT_INFO, %o5</div><div class='ctx'> 	ta	HV_FAST_TRAP</div><div class='ctx'> 	stx	%o1, [%o4]</div><div class='ctx'> 	retl</div><div class='ctx'> 	 nop</div><div class='del'>-	.size	sun4v_mmustat_info, .-sun4v_mmustat_info</div><div class='add'>+ENDPROC(sun4v_mmustat_info)</div><div class='ctx'> </div><div class='del'>-	.globl	sun4v_mmu_demap_all</div><div class='del'>-	.type	sun4v_mmu_demap_all,#function</div><div class='del'>-sun4v_mmu_demap_all:</div><div class='add'>+ENTRY(sun4v_mmu_demap_all)</div><div class='ctx'> 	clr	%o0</div><div class='ctx'> 	clr	%o1</div><div class='ctx'> 	mov	HV_MMU_ALL, %o2</div><div class='hunk'>@@ -883,4 +765,4 @@ sun4v_mmu_demap_all:</div><div class='ctx'> 	ta	HV_FAST_TRAP</div><div class='ctx'> 	retl</div><div class='ctx'> 	 nop</div><div class='del'>-	.size	sun4v_mmu_demap_all, .-sun4v_mmu_demap_all</div><div class='add'>+ENDPROC(sun4v_mmu_demap_all)</div><div class='head'>diff --git a/arch/sparc64/kernel/iommu.c b/arch/sparc64/kernel/iommu.c<br/>index 2a37a6ca2a16..1cc1995531e2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/iommu.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc64/kernel/iommu.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/iommu.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/iommu.c</a></div><div class='hunk'>@@ -575,7 +575,7 @@ static int dma_4u_map_sg(struct device *dev, struct scatterlist *sglist,</div><div class='ctx'> 		}</div><div class='ctx'> 		/* Allocate iommu entries for that segment */</div><div class='ctx'> 		paddr = (unsigned long) SG_ENT_PHYS_ADDRESS(s);</div><div class='del'>-		npages = iommu_num_pages(paddr, slen);</div><div class='add'>+		npages = iommu_num_pages(paddr, slen, IO_PAGE_SIZE);</div><div class='ctx'> 		entry = iommu_range_alloc(dev, iommu, npages, &amp;handle);</div><div class='ctx'> </div><div class='ctx'> 		/* Handle failure */</div><div class='hunk'>@@ -647,7 +647,8 @@ iommu_map_failed:</div><div class='ctx'> 			iopte_t *base;</div><div class='ctx'> </div><div class='ctx'> 			vaddr = s-&gt;dma_address &amp; IO_PAGE_MASK;</div><div class='del'>-			npages = iommu_num_pages(s-&gt;dma_address, s-&gt;dma_length);</div><div class='add'>+			npages = iommu_num_pages(s-&gt;dma_address, s-&gt;dma_length,</div><div class='add'>+						 IO_PAGE_SIZE);</div><div class='ctx'> 			iommu_range_free(iommu, vaddr, npages);</div><div class='ctx'> </div><div class='ctx'> 			entry = (vaddr - iommu-&gt;page_table_map_base)</div><div class='hunk'>@@ -715,7 +716,7 @@ static void dma_4u_unmap_sg(struct device *dev, struct scatterlist *sglist,</div><div class='ctx'> </div><div class='ctx'> 		if (!len)</div><div class='ctx'> 			break;</div><div class='del'>-		npages = iommu_num_pages(dma_handle, len);</div><div class='add'>+		npages = iommu_num_pages(dma_handle, len, IO_PAGE_SIZE);</div><div class='ctx'> 		iommu_range_free(iommu, dma_handle, npages);</div><div class='ctx'> </div><div class='ctx'> 		entry = ((dma_handle - iommu-&gt;page_table_map_base)</div><div class='head'>diff --git a/arch/sparc64/kernel/iommu_common.h b/arch/sparc64/kernel/iommu_common.h<br/>index 53b19c8231a9..591f5879039c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/iommu_common.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc64/kernel/iommu_common.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/iommu_common.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/iommu_common.h</a></div><div class='hunk'>@@ -35,17 +35,6 @@</div><div class='ctx'> </div><div class='ctx'> #define SG_ENT_PHYS_ADDRESS(SG)	(__pa(sg_virt((SG))))</div><div class='ctx'> </div><div class='del'>-static inline unsigned long iommu_num_pages(unsigned long vaddr,</div><div class='del'>-					    unsigned long slen)</div><div class='del'>-{</div><div class='del'>-	unsigned long npages;</div><div class='del'>-</div><div class='del'>-	npages = IO_PAGE_ALIGN(vaddr + slen) - (vaddr &amp; IO_PAGE_MASK);</div><div class='del'>-	npages &gt;&gt;= IO_PAGE_SHIFT;</div><div class='del'>-</div><div class='del'>-	return npages;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline int is_span_boundary(unsigned long entry,</div><div class='ctx'> 				   unsigned long shift,</div><div class='ctx'> 				   unsigned long boundary_size,</div><div class='hunk'>@@ -53,7 +42,8 @@ static inline int is_span_boundary(unsigned long entry,</div><div class='ctx'> 				   struct scatterlist *sg)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long paddr = SG_ENT_PHYS_ADDRESS(outs);</div><div class='del'>-	int nr = iommu_num_pages(paddr, outs-&gt;dma_length + sg-&gt;length);</div><div class='add'>+	int nr = iommu_num_pages(paddr, outs-&gt;dma_length + sg-&gt;length,</div><div class='add'>+				 IO_PAGE_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	return iommu_is_span_boundary(entry, nr, shift, boundary_size);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/sparc64/kernel/irq.c b/arch/sparc64/kernel/irq.c<br/>index 7495bc774685..52fc836f464d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/irq.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc64/kernel/irq.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/irq.c</a></div><div class='hunk'>@@ -29,7 +29,6 @@</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/sbus.h&gt;</div><div class='ctx'> #include &lt;asm/iommu.h&gt;</div><div class='ctx'> #include &lt;asm/upa.h&gt;</div><div class='ctx'> #include &lt;asm/oplib.h&gt;</div><div class='head'>diff --git a/arch/sparc64/kernel/of_device.c b/arch/sparc64/kernel/of_device.c<br/>index 100ebd527499..0f616ae3246c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/of_device.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc64/kernel/of_device.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/of_device.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/of_device.c</a></div><div class='hunk'>@@ -55,15 +55,38 @@ struct of_device *of_find_device_by_node(struct device_node *dp)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(of_find_device_by_node);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-struct bus_type ebus_bus_type;</div><div class='del'>-EXPORT_SYMBOL(ebus_bus_type);</div><div class='del'>-#endif</div><div class='add'>+unsigned int irq_of_parse_and_map(struct device_node *node, int index)</div><div class='add'>+{</div><div class='add'>+	struct of_device *op = of_find_device_by_node(node);</div><div class='add'>+</div><div class='add'>+	if (!op || index &gt;= op-&gt;num_irqs)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return op-&gt;irqs[index];</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(irq_of_parse_and_map);</div><div class='add'>+</div><div class='add'>+/* Take the archdata values for IOMMU, STC, and HOSTDATA found in</div><div class='add'>+ * BUS and propagate to all child of_device objects.</div><div class='add'>+ */</div><div class='add'>+void of_propagate_archdata(struct of_device *bus)</div><div class='add'>+{</div><div class='add'>+	struct dev_archdata *bus_sd = &amp;bus-&gt;dev.archdata;</div><div class='add'>+	struct device_node *bus_dp = bus-&gt;node;</div><div class='add'>+	struct device_node *dp;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SBUS</div><div class='del'>-struct bus_type sbus_bus_type;</div><div class='del'>-EXPORT_SYMBOL(sbus_bus_type);</div><div class='del'>-#endif</div><div class='add'>+	for (dp = bus_dp-&gt;child; dp; dp = dp-&gt;sibling) {</div><div class='add'>+		struct of_device *op = of_find_device_by_node(dp);</div><div class='add'>+</div><div class='add'>+		op-&gt;dev.archdata.iommu = bus_sd-&gt;iommu;</div><div class='add'>+		op-&gt;dev.archdata.stc = bus_sd-&gt;stc;</div><div class='add'>+		op-&gt;dev.archdata.host_controller = bus_sd-&gt;host_controller;</div><div class='add'>+		op-&gt;dev.archdata.numa_node = bus_sd-&gt;numa_node;</div><div class='add'>+</div><div class='add'>+		if (dp-&gt;child)</div><div class='add'>+			of_propagate_archdata(op);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> struct bus_type of_platform_bus_type;</div><div class='ctx'> EXPORT_SYMBOL(of_platform_bus_type);</div><div class='hunk'>@@ -378,8 +401,7 @@ static int __init build_one_resource(struct device_node *parent,</div><div class='ctx'> 				     int na, int ns, int pna)</div><div class='ctx'> {</div><div class='ctx'> 	const u32 *ranges;</div><div class='del'>-	unsigned int rlen;</div><div class='del'>-	int rone;</div><div class='add'>+	int rone, rlen;</div><div class='ctx'> </div><div class='ctx'> 	ranges = of_get_property(parent, "ranges", &amp;rlen);</div><div class='ctx'> 	if (ranges == NULL || rlen == 0) {</div><div class='hunk'>@@ -421,8 +443,17 @@ static int __init use_1to1_mapping(struct device_node *pp)</div><div class='ctx'> </div><div class='ctx'> 	/* If the parent is the dma node of an ISA bus, pass</div><div class='ctx'> 	 * the translation up to the root.</div><div class='add'>+	 *</div><div class='add'>+	 * Some SBUS devices use intermediate nodes to express</div><div class='add'>+	 * hierarchy within the device itself.  These aren't</div><div class='add'>+	 * real bus nodes, and don't have a 'ranges' property.</div><div class='add'>+	 * But, we should still pass the translation work up</div><div class='add'>+	 * to the SBUS itself.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!strcmp(pp-&gt;name, "dma"))</div><div class='add'>+	if (!strcmp(pp-&gt;name, "dma") ||</div><div class='add'>+	    !strcmp(pp-&gt;name, "espdma") ||</div><div class='add'>+	    !strcmp(pp-&gt;name, "ledma") ||</div><div class='add'>+	    !strcmp(pp-&gt;name, "lebuffer"))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Similarly for all PCI bridges, if we get this far</div><div class='hunk'>@@ -844,15 +875,6 @@ static int __init of_bus_driver_init(void)</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	err = of_bus_type_init(&amp;of_platform_bus_type, "of");</div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-	if (!err)</div><div class='del'>-		err = of_bus_type_init(&amp;ebus_bus_type, "ebus");</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_SBUS</div><div class='del'>-	if (!err)</div><div class='del'>-		err = of_bus_type_init(&amp;sbus_bus_type, "sbus");</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	if (!err)</div><div class='ctx'> 		scan_of_devices();</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sparc64/kernel/pci.c b/arch/sparc64/kernel/pci.c<br/>index 80dad76f8b81..242ac1ccae7d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/pci.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc64/kernel/pci.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/pci.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/pci.c</a></div><div class='hunk'>@@ -18,32 +18,17 @@</div><div class='ctx'> #include &lt;linux/msi.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/ebus.h&gt;</div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='ctx'> #include &lt;asm/apb.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "pci_impl.h"</div><div class='ctx'> </div><div class='del'>-#ifndef CONFIG_PCI</div><div class='del'>-/* A "nop" PCI implementation. */</div><div class='del'>-asmlinkage int sys_pciconfig_read(unsigned long bus, unsigned long dfn,</div><div class='del'>-				  unsigned long off, unsigned long len,</div><div class='del'>-				  unsigned char *buf)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-asmlinkage int sys_pciconfig_write(unsigned long bus, unsigned long dfn,</div><div class='del'>-				   unsigned long off, unsigned long len,</div><div class='del'>-				   unsigned char *buf)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-</div><div class='ctx'> /* List of all PCI controllers found in the system. */</div><div class='ctx'> struct pci_pbm_info *pci_pbm_root = NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -179,97 +164,6 @@ void pci_config_write32(u32 *addr, u32 val)</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;pci_poke_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Probe for all PCI controllers in the system. */</div><div class='del'>-extern void sabre_init(struct device_node *, const char *);</div><div class='del'>-extern void psycho_init(struct device_node *, const char *);</div><div class='del'>-extern void schizo_init(struct device_node *, const char *);</div><div class='del'>-extern void schizo_plus_init(struct device_node *, const char *);</div><div class='del'>-extern void tomatillo_init(struct device_node *, const char *);</div><div class='del'>-extern void sun4v_pci_init(struct device_node *, const char *);</div><div class='del'>-extern void fire_pci_init(struct device_node *, const char *);</div><div class='del'>-</div><div class='del'>-static struct {</div><div class='del'>-	char *model_name;</div><div class='del'>-	void (*init)(struct device_node *, const char *);</div><div class='del'>-} pci_controller_table[] __initdata = {</div><div class='del'>-	{ "SUNW,sabre", sabre_init },</div><div class='del'>-	{ "pci108e,a000", sabre_init },</div><div class='del'>-	{ "pci108e,a001", sabre_init },</div><div class='del'>-	{ "SUNW,psycho", psycho_init },</div><div class='del'>-	{ "pci108e,8000", psycho_init },</div><div class='del'>-	{ "SUNW,schizo", schizo_init },</div><div class='del'>-	{ "pci108e,8001", schizo_init },</div><div class='del'>-	{ "SUNW,schizo+", schizo_plus_init },</div><div class='del'>-	{ "pci108e,8002", schizo_plus_init },</div><div class='del'>-	{ "SUNW,tomatillo", tomatillo_init },</div><div class='del'>-	{ "pci108e,a801", tomatillo_init },</div><div class='del'>-	{ "SUNW,sun4v-pci", sun4v_pci_init },</div><div class='del'>-	{ "pciex108e,80f0", fire_pci_init },</div><div class='del'>-};</div><div class='del'>-#define PCI_NUM_CONTROLLER_TYPES	ARRAY_SIZE(pci_controller_table)</div><div class='del'>-</div><div class='del'>-static int __init pci_controller_init(const char *model_name, int namelen, struct device_node *dp)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; PCI_NUM_CONTROLLER_TYPES; i++) {</div><div class='del'>-		if (!strncmp(model_name,</div><div class='del'>-			     pci_controller_table[i].model_name,</div><div class='del'>-			     namelen)) {</div><div class='del'>-			pci_controller_table[i].init(dp, model_name);</div><div class='del'>-			return 1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init pci_controller_scan(int (*handler)(const char *, int, struct device_node *))</div><div class='del'>-{</div><div class='del'>-	struct device_node *dp;</div><div class='del'>-	int count = 0;</div><div class='del'>-</div><div class='del'>-	for_each_node_by_name(dp, "pci") {</div><div class='del'>-		struct property *prop;</div><div class='del'>-		int len;</div><div class='del'>-</div><div class='del'>-		prop = of_find_property(dp, "model", &amp;len);</div><div class='del'>-		if (!prop)</div><div class='del'>-			prop = of_find_property(dp, "compatible", &amp;len);</div><div class='del'>-</div><div class='del'>-		if (prop) {</div><div class='del'>-			const char *model = prop-&gt;value;</div><div class='del'>-			int item_len = 0;</div><div class='del'>-</div><div class='del'>-			/* Our value may be a multi-valued string in the</div><div class='del'>-			 * case of some compatible properties. For sanity,</div><div class='del'>-			 * only try the first one.</div><div class='del'>-			 */</div><div class='del'>-			while (model[item_len] &amp;&amp; len) {</div><div class='del'>-				len--;</div><div class='del'>-				item_len++;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (handler(model, item_len, dp))</div><div class='del'>-				count++;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Find each controller in the system, attach and initialize</div><div class='del'>- * software state structure for each and link into the</div><div class='del'>- * pci_pbm_root.  Setup the controller enough such</div><div class='del'>- * that bus scanning can be done.</div><div class='del'>- */</div><div class='del'>-static void __init pci_controller_probe(void)</div><div class='del'>-{</div><div class='del'>-	printk("PCI: Probing for controllers.\n");</div><div class='del'>-</div><div class='del'>-	pci_controller_scan(pci_controller_init);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int ofpci_verbose;</div><div class='ctx'> </div><div class='ctx'> static int __init ofpci_debug(char *str)</div><div class='hunk'>@@ -348,11 +242,12 @@ static void pci_parse_of_addrs(struct of_device *op,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct pci_dev *of_create_pci_dev(struct pci_pbm_info *pbm,</div><div class='del'>-				  struct device_node *node,</div><div class='del'>-				  struct pci_bus *bus, int devfn)</div><div class='add'>+static struct pci_dev *of_create_pci_dev(struct pci_pbm_info *pbm,</div><div class='add'>+					 struct device_node *node,</div><div class='add'>+					 struct pci_bus *bus, int devfn)</div><div class='ctx'> {</div><div class='ctx'> 	struct dev_archdata *sd;</div><div class='add'>+	struct of_device *op;</div><div class='ctx'> 	struct pci_dev *dev;</div><div class='ctx'> 	const char *type;</div><div class='ctx'> 	u32 class;</div><div class='hunk'>@@ -366,14 +261,17 @@ struct pci_dev *of_create_pci_dev(struct pci_pbm_info *pbm,</div><div class='ctx'> 	sd-&gt;stc = &amp;pbm-&gt;stc;</div><div class='ctx'> 	sd-&gt;host_controller = pbm;</div><div class='ctx'> 	sd-&gt;prom_node = node;</div><div class='del'>-	sd-&gt;op = of_find_device_by_node(node);</div><div class='add'>+	sd-&gt;op = op = of_find_device_by_node(node);</div><div class='ctx'> 	sd-&gt;numa_node = pbm-&gt;numa_node;</div><div class='ctx'> </div><div class='del'>-	sd = &amp;sd-&gt;op-&gt;dev.archdata;</div><div class='add'>+	sd = &amp;op-&gt;dev.archdata;</div><div class='ctx'> 	sd-&gt;iommu = pbm-&gt;iommu;</div><div class='ctx'> 	sd-&gt;stc = &amp;pbm-&gt;stc;</div><div class='ctx'> 	sd-&gt;numa_node = pbm-&gt;numa_node;</div><div class='ctx'> </div><div class='add'>+	if (!strcmp(node-&gt;name, "ebus"))</div><div class='add'>+		of_propagate_archdata(op);</div><div class='add'>+</div><div class='ctx'> 	type = of_get_property(node, "device_type", NULL);</div><div class='ctx'> 	if (type == NULL)</div><div class='ctx'> 		type = "";</div><div class='hunk'>@@ -775,15 +673,15 @@ static void __devinit pci_bus_register_of_sysfs(struct pci_bus *bus)</div><div class='ctx'> 		pci_bus_register_of_sysfs(child_bus);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct pci_bus * __devinit pci_scan_one_pbm(struct pci_pbm_info *pbm)</div><div class='add'>+struct pci_bus * __devinit pci_scan_one_pbm(struct pci_pbm_info *pbm,</div><div class='add'>+					    struct device *parent)</div><div class='ctx'> {</div><div class='del'>-	struct device_node *node = pbm-&gt;prom_node;</div><div class='add'>+	struct device_node *node = pbm-&gt;op-&gt;node;</div><div class='ctx'> 	struct pci_bus *bus;</div><div class='ctx'> </div><div class='ctx'> 	printk("PCI: Scanning PBM %s\n", node-&gt;full_name);</div><div class='ctx'> </div><div class='del'>-	/* XXX parent device? XXX */</div><div class='del'>-	bus = pci_create_bus(NULL, pbm-&gt;pci_first_busno, pbm-&gt;pci_ops, pbm);</div><div class='add'>+	bus = pci_create_bus(parent, pbm-&gt;pci_first_busno, pbm-&gt;pci_ops, pbm);</div><div class='ctx'> 	if (!bus) {</div><div class='ctx'> 		printk(KERN_ERR "Failed to create bus for %s\n",</div><div class='ctx'> 		       node-&gt;full_name);</div><div class='hunk'>@@ -802,32 +700,6 @@ struct pci_bus * __devinit pci_scan_one_pbm(struct pci_pbm_info *pbm)</div><div class='ctx'> 	return bus;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __init pci_scan_each_controller_bus(void)</div><div class='del'>-{</div><div class='del'>-	struct pci_pbm_info *pbm;</div><div class='del'>-</div><div class='del'>-	for (pbm = pci_pbm_root; pbm; pbm = pbm-&gt;next)</div><div class='del'>-		pbm-&gt;scan_bus(pbm);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-extern void power_init(void);</div><div class='del'>-</div><div class='del'>-static int __init pcibios_init(void)</div><div class='del'>-{</div><div class='del'>-	pci_controller_probe();</div><div class='del'>-	if (pci_pbm_root == NULL)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	pci_scan_each_controller_bus();</div><div class='del'>-</div><div class='del'>-	ebus_init();</div><div class='del'>-	power_init();</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-subsys_initcall(pcibios_init);</div><div class='del'>-</div><div class='ctx'> void __devinit pcibios_fixup_bus(struct pci_bus *pbus)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_pbm_info *pbm = pbus-&gt;sysdata;</div><div class='hunk'>@@ -1105,14 +977,14 @@ int pcibus_to_node(struct pci_bus *pbus)</div><div class='ctx'> EXPORT_SYMBOL(pcibus_to_node);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-/* Return the domain nuber for this pci bus */</div><div class='add'>+/* Return the domain number for this pci bus */</div><div class='ctx'> </div><div class='ctx'> int pci_domain_nr(struct pci_bus *pbus)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_pbm_info *pbm = pbus-&gt;sysdata;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (pbm == NULL || pbm-&gt;parent == NULL) {</div><div class='add'>+	if (!pbm) {</div><div class='ctx'> 		ret = -ENXIO;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ret = pbm-&gt;index;</div><div class='hunk'>@@ -1126,7 +998,7 @@ EXPORT_SYMBOL(pci_domain_nr);</div><div class='ctx'> int arch_setup_msi_irq(struct pci_dev *pdev, struct msi_desc *desc)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_pbm_info *pbm = pdev-&gt;dev.archdata.host_controller;</div><div class='del'>-	int virt_irq;</div><div class='add'>+	unsigned int virt_irq;</div><div class='ctx'> </div><div class='ctx'> 	if (!pbm-&gt;setup_msi_irq)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -1140,10 +1012,8 @@ void arch_teardown_msi_irq(unsigned int virt_irq)</div><div class='ctx'> 	struct pci_dev *pdev = entry-&gt;dev;</div><div class='ctx'> 	struct pci_pbm_info *pbm = pdev-&gt;dev.archdata.host_controller;</div><div class='ctx'> </div><div class='del'>-	if (!pbm-&gt;teardown_msi_irq)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	return pbm-&gt;teardown_msi_irq(virt_irq, pdev);</div><div class='add'>+	if (pbm-&gt;teardown_msi_irq)</div><div class='add'>+		pbm-&gt;teardown_msi_irq(virt_irq, pdev);</div><div class='ctx'> }</div><div class='ctx'> #endif /* !(CONFIG_PCI_MSI) */</div><div class='ctx'> </div><div class='hunk'>@@ -1215,5 +1085,3 @@ void pci_resource_to_user(const struct pci_dev *pdev, int bar,</div><div class='ctx'> 	*start = rp-&gt;start - offset;</div><div class='ctx'> 	*end = rp-&gt;end - offset;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-#endif /* !(CONFIG_PCI) */</div><div class='head'>diff --git a/arch/sparc64/kernel/pci_common.c b/arch/sparc64/kernel/pci_common.c<br/>index 09a5ec200c61..23b88082d0b2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/pci_common.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc64/kernel/pci_common.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/pci_common.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/pci_common.c</a></div><div class='hunk'>@@ -314,12 +314,12 @@ struct pci_ops sun4v_pci_ops = {</div><div class='ctx'> </div><div class='ctx'> void pci_get_pbm_props(struct pci_pbm_info *pbm)</div><div class='ctx'> {</div><div class='del'>-	const u32 *val = of_get_property(pbm-&gt;prom_node, "bus-range", NULL);</div><div class='add'>+	const u32 *val = of_get_property(pbm-&gt;op-&gt;node, "bus-range", NULL);</div><div class='ctx'> </div><div class='ctx'> 	pbm-&gt;pci_first_busno = val[0];</div><div class='ctx'> 	pbm-&gt;pci_last_busno = val[1];</div><div class='ctx'> </div><div class='del'>-	val = of_get_property(pbm-&gt;prom_node, "ino-bitmap", NULL);</div><div class='add'>+	val = of_get_property(pbm-&gt;op-&gt;node, "ino-bitmap", NULL);</div><div class='ctx'> 	if (val) {</div><div class='ctx'> 		pbm-&gt;ino_bitmap = (((u64)val[1] &lt;&lt; 32UL) |</div><div class='ctx'> 				   ((u64)val[0] &lt;&lt;  0UL));</div><div class='hunk'>@@ -365,7 +365,7 @@ static void pci_register_legacy_regions(struct resource *io_res,</div><div class='ctx'> </div><div class='ctx'> static void pci_register_iommu_region(struct pci_pbm_info *pbm)</div><div class='ctx'> {</div><div class='del'>-	const u32 *vdma = of_get_property(pbm-&gt;prom_node, "virtual-dma", NULL);</div><div class='add'>+	const u32 *vdma = of_get_property(pbm-&gt;op-&gt;node, "virtual-dma", NULL);</div><div class='ctx'> </div><div class='ctx'> 	if (vdma) {</div><div class='ctx'> 		struct resource *rp = kmalloc(sizeof(*rp), GFP_KERNEL);</div><div class='hunk'>@@ -389,7 +389,7 @@ void pci_determine_mem_io_space(struct pci_pbm_info *pbm)</div><div class='ctx'> 	int num_pbm_ranges;</div><div class='ctx'> </div><div class='ctx'> 	saw_mem = saw_io = 0;</div><div class='del'>-	pbm_ranges = of_get_property(pbm-&gt;prom_node, "ranges", &amp;i);</div><div class='add'>+	pbm_ranges = of_get_property(pbm-&gt;op-&gt;node, "ranges", &amp;i);</div><div class='ctx'> 	if (!pbm_ranges) {</div><div class='ctx'> 		prom_printf("PCI: Fatal error, missing PBM ranges property "</div><div class='ctx'> 			    " for %s\n",</div><div class='head'>diff --git a/arch/sparc64/kernel/pci_fire.c b/arch/sparc64/kernel/pci_fire.c<br/>index d23bb6f53cda..9462b68f4894 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/pci_fire.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc64/kernel/pci_fire.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/pci_fire.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/pci_fire.c</a></div><div class='hunk'>@@ -8,34 +8,16 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/msi.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='add'>+#include &lt;linux/of_device.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/oplib.h&gt;</div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='add'>+#include &lt;asm/upa.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "pci_impl.h"</div><div class='ctx'> </div><div class='del'>-#define fire_read(__reg) \</div><div class='del'>-({	u64 __ret; \</div><div class='del'>-	__asm__ __volatile__("ldxa [%1] %2, %0" \</div><div class='del'>-			     : "=r" (__ret) \</div><div class='del'>-			     : "r" (__reg), "i" (ASI_PHYS_BYPASS_EC_E) \</div><div class='del'>-			     : "memory"); \</div><div class='del'>-	__ret; \</div><div class='del'>-})</div><div class='del'>-#define fire_write(__reg, __val) \</div><div class='del'>-	__asm__ __volatile__("stxa %0, [%1] %2" \</div><div class='del'>-			     : /* no outputs */ \</div><div class='del'>-			     : "r" (__val), "r" (__reg), \</div><div class='del'>-			       "i" (ASI_PHYS_BYPASS_EC_E) \</div><div class='del'>-			     : "memory")</div><div class='del'>-</div><div class='del'>-static void __init pci_fire_scan_bus(struct pci_pbm_info *pbm)</div><div class='del'>-{</div><div class='del'>-	pbm-&gt;pci_bus = pci_scan_one_pbm(pbm);</div><div class='del'>-</div><div class='del'>-	/* XXX register error interrupt handlers XXX */</div><div class='del'>-}</div><div class='add'>+#define DRIVER_NAME	"fire"</div><div class='add'>+#define PFX		DRIVER_NAME ": "</div><div class='ctx'> </div><div class='ctx'> #define FIRE_IOMMU_CONTROL	0x40000UL</div><div class='ctx'> #define FIRE_IOMMU_TSBBASE	0x40008UL</div><div class='hunk'>@@ -69,21 +51,21 @@ static int pci_fire_pbm_iommu_init(struct pci_pbm_info *pbm)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Invalidate TLB Entries.</div><div class='ctx'> 	 */</div><div class='del'>-	fire_write(iommu-&gt;iommu_flushinv, ~(u64)0);</div><div class='add'>+	upa_writeq(~(u64)0, iommu-&gt;iommu_flushinv);</div><div class='ctx'> </div><div class='ctx'> 	err = iommu_table_init(iommu, tsbsize * 8 * 1024, vdma[0], dma_mask,</div><div class='ctx'> 			       pbm-&gt;numa_node);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	fire_write(iommu-&gt;iommu_tsbbase, __pa(iommu-&gt;page_table) | 0x7UL);</div><div class='add'>+	upa_writeq(__pa(iommu-&gt;page_table) | 0x7UL, iommu-&gt;iommu_tsbbase);</div><div class='ctx'> </div><div class='del'>-	control = fire_read(iommu-&gt;iommu_control);</div><div class='add'>+	control = upa_readq(iommu-&gt;iommu_control);</div><div class='ctx'> 	control |= (0x00000400 /* TSB cache snoop enable */	|</div><div class='ctx'> 		    0x00000300 /* Cache mode */			|</div><div class='ctx'> 		    0x00000002 /* Bypass enable */		|</div><div class='ctx'> 		    0x00000001 /* Translation enable */);</div><div class='del'>-	fire_write(iommu-&gt;iommu_control, control);</div><div class='add'>+	upa_writeq(control, iommu-&gt;iommu_control);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -165,7 +147,7 @@ struct pci_msiq_entry {</div><div class='ctx'> static int pci_fire_get_head(struct pci_pbm_info *pbm, unsigned long msiqid,</div><div class='ctx'> 			     unsigned long *head)</div><div class='ctx'> {</div><div class='del'>-	*head = fire_read(pbm-&gt;pbm_regs + EVENT_QUEUE_HEAD(msiqid));</div><div class='add'>+	*head = upa_readq(pbm-&gt;pbm_regs + EVENT_QUEUE_HEAD(msiqid));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -191,8 +173,7 @@ static int pci_fire_dequeue_msi(struct pci_pbm_info *pbm, unsigned long msiqid,</div><div class='ctx'> 	*msi = msi_num = ((ep-&gt;word0 &amp; MSIQ_WORD0_DATA0) &gt;&gt;</div><div class='ctx'> 			  MSIQ_WORD0_DATA0_SHIFT);</div><div class='ctx'> </div><div class='del'>-	fire_write(pbm-&gt;pbm_regs + MSI_CLEAR(msi_num),</div><div class='del'>-		   MSI_CLEAR_EQWR_N);</div><div class='add'>+	upa_writeq(MSI_CLEAR_EQWR_N, pbm-&gt;pbm_regs + MSI_CLEAR(msi_num));</div><div class='ctx'> </div><div class='ctx'> 	/* Clear the entry.  */</div><div class='ctx'> 	ep-&gt;word0 &amp;= ~MSIQ_WORD0_FMT_TYPE;</div><div class='hunk'>@@ -208,7 +189,7 @@ static int pci_fire_dequeue_msi(struct pci_pbm_info *pbm, unsigned long msiqid,</div><div class='ctx'> static int pci_fire_set_head(struct pci_pbm_info *pbm, unsigned long msiqid,</div><div class='ctx'> 			     unsigned long head)</div><div class='ctx'> {</div><div class='del'>-	fire_write(pbm-&gt;pbm_regs + EVENT_QUEUE_HEAD(msiqid), head);</div><div class='add'>+	upa_writeq(head, pbm-&gt;pbm_regs + EVENT_QUEUE_HEAD(msiqid));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -217,17 +198,16 @@ static int pci_fire_msi_setup(struct pci_pbm_info *pbm, unsigned long msiqid,</div><div class='ctx'> {</div><div class='ctx'> 	u64 val;</div><div class='ctx'> </div><div class='del'>-	val = fire_read(pbm-&gt;pbm_regs + MSI_MAP(msi));</div><div class='add'>+	val = upa_readq(pbm-&gt;pbm_regs + MSI_MAP(msi));</div><div class='ctx'> 	val &amp;= ~(MSI_MAP_EQNUM);</div><div class='ctx'> 	val |= msiqid;</div><div class='del'>-	fire_write(pbm-&gt;pbm_regs + MSI_MAP(msi), val);</div><div class='add'>+	upa_writeq(val, pbm-&gt;pbm_regs + MSI_MAP(msi));</div><div class='ctx'> </div><div class='del'>-	fire_write(pbm-&gt;pbm_regs + MSI_CLEAR(msi),</div><div class='del'>-		   MSI_CLEAR_EQWR_N);</div><div class='add'>+	upa_writeq(MSI_CLEAR_EQWR_N, pbm-&gt;pbm_regs + MSI_CLEAR(msi));</div><div class='ctx'> </div><div class='del'>-	val = fire_read(pbm-&gt;pbm_regs + MSI_MAP(msi));</div><div class='add'>+	val = upa_readq(pbm-&gt;pbm_regs + MSI_MAP(msi));</div><div class='ctx'> 	val |= MSI_MAP_VALID;</div><div class='del'>-	fire_write(pbm-&gt;pbm_regs + MSI_MAP(msi), val);</div><div class='add'>+	upa_writeq(val, pbm-&gt;pbm_regs + MSI_MAP(msi));</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -237,12 +217,12 @@ static int pci_fire_msi_teardown(struct pci_pbm_info *pbm, unsigned long msi)</div><div class='ctx'> 	unsigned long msiqid;</div><div class='ctx'> 	u64 val;</div><div class='ctx'> </div><div class='del'>-	val = fire_read(pbm-&gt;pbm_regs + MSI_MAP(msi));</div><div class='add'>+	val = upa_readq(pbm-&gt;pbm_regs + MSI_MAP(msi));</div><div class='ctx'> 	msiqid = (val &amp; MSI_MAP_EQNUM);</div><div class='ctx'> </div><div class='ctx'> 	val &amp;= ~MSI_MAP_VALID;</div><div class='ctx'> </div><div class='del'>-	fire_write(pbm-&gt;pbm_regs + MSI_MAP(msi), val);</div><div class='add'>+	upa_writeq(val, pbm-&gt;pbm_regs + MSI_MAP(msi));</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -261,22 +241,19 @@ static int pci_fire_msiq_alloc(struct pci_pbm_info *pbm)</div><div class='ctx'> 	memset((char *)pages, 0, PAGE_SIZE &lt;&lt; order);</div><div class='ctx'> 	pbm-&gt;msi_queues = (void *) pages;</div><div class='ctx'> </div><div class='del'>-	fire_write(pbm-&gt;pbm_regs + EVENT_QUEUE_BASE_ADDR_REG,</div><div class='del'>-		   (EVENT_QUEUE_BASE_ADDR_ALL_ONES |</div><div class='del'>-		    __pa(pbm-&gt;msi_queues)));</div><div class='add'>+	upa_writeq((EVENT_QUEUE_BASE_ADDR_ALL_ONES |</div><div class='add'>+		    __pa(pbm-&gt;msi_queues)),</div><div class='add'>+		   pbm-&gt;pbm_regs + EVENT_QUEUE_BASE_ADDR_REG);</div><div class='ctx'> </div><div class='del'>-	fire_write(pbm-&gt;pbm_regs + IMONDO_DATA0,</div><div class='del'>-		   pbm-&gt;portid &lt;&lt; 6);</div><div class='del'>-	fire_write(pbm-&gt;pbm_regs + IMONDO_DATA1, 0);</div><div class='add'>+	upa_writeq(pbm-&gt;portid &lt;&lt; 6, pbm-&gt;pbm_regs + IMONDO_DATA0);</div><div class='add'>+	upa_writeq(0, pbm-&gt;pbm_regs + IMONDO_DATA1);</div><div class='ctx'> </div><div class='del'>-	fire_write(pbm-&gt;pbm_regs + MSI_32BIT_ADDR,</div><div class='del'>-		   pbm-&gt;msi32_start);</div><div class='del'>-	fire_write(pbm-&gt;pbm_regs + MSI_64BIT_ADDR,</div><div class='del'>-		   pbm-&gt;msi64_start);</div><div class='add'>+	upa_writeq(pbm-&gt;msi32_start, pbm-&gt;pbm_regs + MSI_32BIT_ADDR);</div><div class='add'>+	upa_writeq(pbm-&gt;msi64_start, pbm-&gt;pbm_regs + MSI_64BIT_ADDR);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; pbm-&gt;msiq_num; i++) {</div><div class='del'>-		fire_write(pbm-&gt;pbm_regs + EVENT_QUEUE_HEAD(i), 0);</div><div class='del'>-		fire_write(pbm-&gt;pbm_regs + EVENT_QUEUE_TAIL(i), 0);</div><div class='add'>+		upa_writeq(0, pbm-&gt;pbm_regs + EVENT_QUEUE_HEAD(i));</div><div class='add'>+		upa_writeq(0, pbm-&gt;pbm_regs + EVENT_QUEUE_TAIL(i));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -310,9 +287,9 @@ static int pci_fire_msiq_build_irq(struct pci_pbm_info *pbm,</div><div class='ctx'> 	/* XXX iterate amongst the 4 IRQ controllers XXX */</div><div class='ctx'> 	int_ctrlr = (1UL &lt;&lt; 6);</div><div class='ctx'> </div><div class='del'>-	val = fire_read(imap_reg);</div><div class='add'>+	val = upa_readq(imap_reg);</div><div class='ctx'> 	val |= (1UL &lt;&lt; 63) | int_ctrlr;</div><div class='del'>-	fire_write(imap_reg, val);</div><div class='add'>+	upa_writeq(val, imap_reg);</div><div class='ctx'> </div><div class='ctx'> 	fixup = ((pbm-&gt;portid &lt;&lt; 6) | devino) - int_ctrlr;</div><div class='ctx'> </div><div class='hunk'>@@ -320,9 +297,8 @@ static int pci_fire_msiq_build_irq(struct pci_pbm_info *pbm,</div><div class='ctx'> 	if (!virt_irq)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	fire_write(pbm-&gt;pbm_regs +</div><div class='del'>-		   EVENT_QUEUE_CONTROL_SET(msiqid),</div><div class='del'>-		   EVENT_QUEUE_CONTROL_SET_EN);</div><div class='add'>+	upa_writeq(EVENT_QUEUE_CONTROL_SET_EN,</div><div class='add'>+		   pbm-&gt;pbm_regs + EVENT_QUEUE_CONTROL_SET(msiqid));</div><div class='ctx'> </div><div class='ctx'> 	return virt_irq;</div><div class='ctx'> }</div><div class='hunk'>@@ -390,77 +366,65 @@ static void pci_fire_hw_init(struct pci_pbm_info *pbm)</div><div class='ctx'> {</div><div class='ctx'> 	u64 val;</div><div class='ctx'> </div><div class='del'>-	fire_write(pbm-&gt;controller_regs + FIRE_PARITY_CONTROL,</div><div class='del'>-		   FIRE_PARITY_ENAB);</div><div class='add'>+	upa_writeq(FIRE_PARITY_ENAB,</div><div class='add'>+		   pbm-&gt;controller_regs + FIRE_PARITY_CONTROL);</div><div class='ctx'> </div><div class='del'>-	fire_write(pbm-&gt;controller_regs + FIRE_FATAL_RESET_CTL,</div><div class='del'>-		   (FIRE_FATAL_RESET_SPARE |</div><div class='add'>+	upa_writeq((FIRE_FATAL_RESET_SPARE |</div><div class='ctx'> 		    FIRE_FATAL_RESET_MB |</div><div class='ctx'> 		    FIRE_FATAL_RESET_CPE |</div><div class='ctx'> 		    FIRE_FATAL_RESET_APE |</div><div class='ctx'> 		    FIRE_FATAL_RESET_PIO |</div><div class='ctx'> 		    FIRE_FATAL_RESET_JW |</div><div class='ctx'> 		    FIRE_FATAL_RESET_JI |</div><div class='del'>-		    FIRE_FATAL_RESET_JR));</div><div class='add'>+		    FIRE_FATAL_RESET_JR),</div><div class='add'>+		   pbm-&gt;controller_regs + FIRE_FATAL_RESET_CTL);</div><div class='ctx'> </div><div class='del'>-	fire_write(pbm-&gt;controller_regs + FIRE_CORE_INTR_ENABLE, ~(u64)0);</div><div class='add'>+	upa_writeq(~(u64)0, pbm-&gt;controller_regs + FIRE_CORE_INTR_ENABLE);</div><div class='ctx'> </div><div class='del'>-	val = fire_read(pbm-&gt;pbm_regs + FIRE_TLU_CTRL);</div><div class='add'>+	val = upa_readq(pbm-&gt;pbm_regs + FIRE_TLU_CTRL);</div><div class='ctx'> 	val |= (FIRE_TLU_CTRL_TIM |</div><div class='ctx'> 		FIRE_TLU_CTRL_QDET |</div><div class='ctx'> 		FIRE_TLU_CTRL_CFG);</div><div class='del'>-	fire_write(pbm-&gt;pbm_regs + FIRE_TLU_CTRL, val);</div><div class='del'>-	fire_write(pbm-&gt;pbm_regs + FIRE_TLU_DEV_CTRL, 0);</div><div class='del'>-	fire_write(pbm-&gt;pbm_regs + FIRE_TLU_LINK_CTRL,</div><div class='del'>-		   FIRE_TLU_LINK_CTRL_CLK);</div><div class='del'>-</div><div class='del'>-	fire_write(pbm-&gt;pbm_regs + FIRE_LPU_RESET, 0);</div><div class='del'>-	fire_write(pbm-&gt;pbm_regs + FIRE_LPU_LLCFG,</div><div class='del'>-		   FIRE_LPU_LLCFG_VC0);</div><div class='del'>-	fire_write(pbm-&gt;pbm_regs + FIRE_LPU_FCTRL_UCTRL,</div><div class='del'>-		   (FIRE_LPU_FCTRL_UCTRL_N |</div><div class='del'>-		    FIRE_LPU_FCTRL_UCTRL_P));</div><div class='del'>-	fire_write(pbm-&gt;pbm_regs + FIRE_LPU_TXL_FIFOP,</div><div class='del'>-		   ((0xffff &lt;&lt; 16) | (0x0000 &lt;&lt; 0)));</div><div class='del'>-	fire_write(pbm-&gt;pbm_regs + FIRE_LPU_LTSSM_CFG2, 3000000);</div><div class='del'>-	fire_write(pbm-&gt;pbm_regs + FIRE_LPU_LTSSM_CFG3, 500000);</div><div class='del'>-	fire_write(pbm-&gt;pbm_regs + FIRE_LPU_LTSSM_CFG4,</div><div class='del'>-		   (2 &lt;&lt; 16) | (140 &lt;&lt; 8));</div><div class='del'>-	fire_write(pbm-&gt;pbm_regs + FIRE_LPU_LTSSM_CFG5, 0);</div><div class='del'>-</div><div class='del'>-	fire_write(pbm-&gt;pbm_regs + FIRE_DMC_IENAB, ~(u64)0);</div><div class='del'>-	fire_write(pbm-&gt;pbm_regs + FIRE_DMC_DBG_SEL_A, 0);</div><div class='del'>-	fire_write(pbm-&gt;pbm_regs + FIRE_DMC_DBG_SEL_B, 0);</div><div class='del'>-</div><div class='del'>-	fire_write(pbm-&gt;pbm_regs + FIRE_PEC_IENAB, ~(u64)0);</div><div class='add'>+	upa_writeq(val, pbm-&gt;pbm_regs + FIRE_TLU_CTRL);</div><div class='add'>+	upa_writeq(0, pbm-&gt;pbm_regs + FIRE_TLU_DEV_CTRL);</div><div class='add'>+	upa_writeq(FIRE_TLU_LINK_CTRL_CLK,</div><div class='add'>+		   pbm-&gt;pbm_regs + FIRE_TLU_LINK_CTRL);</div><div class='add'>+</div><div class='add'>+	upa_writeq(0, pbm-&gt;pbm_regs + FIRE_LPU_RESET);</div><div class='add'>+	upa_writeq(FIRE_LPU_LLCFG_VC0, pbm-&gt;pbm_regs + FIRE_LPU_LLCFG);</div><div class='add'>+	upa_writeq((FIRE_LPU_FCTRL_UCTRL_N | FIRE_LPU_FCTRL_UCTRL_P),</div><div class='add'>+		   pbm-&gt;pbm_regs + FIRE_LPU_FCTRL_UCTRL);</div><div class='add'>+	upa_writeq(((0xffff &lt;&lt; 16) | (0x0000 &lt;&lt; 0)),</div><div class='add'>+		   pbm-&gt;pbm_regs + FIRE_LPU_TXL_FIFOP);</div><div class='add'>+	upa_writeq(3000000, pbm-&gt;pbm_regs + FIRE_LPU_LTSSM_CFG2);</div><div class='add'>+	upa_writeq(500000, pbm-&gt;pbm_regs + FIRE_LPU_LTSSM_CFG3);</div><div class='add'>+	upa_writeq((2 &lt;&lt; 16) | (140 &lt;&lt; 8),</div><div class='add'>+		   pbm-&gt;pbm_regs + FIRE_LPU_LTSSM_CFG4);</div><div class='add'>+	upa_writeq(0, pbm-&gt;pbm_regs + FIRE_LPU_LTSSM_CFG5);</div><div class='add'>+</div><div class='add'>+	upa_writeq(~(u64)0, pbm-&gt;pbm_regs + FIRE_DMC_IENAB);</div><div class='add'>+	upa_writeq(0, pbm-&gt;pbm_regs + FIRE_DMC_DBG_SEL_A);</div><div class='add'>+	upa_writeq(0, pbm-&gt;pbm_regs + FIRE_DMC_DBG_SEL_B);</div><div class='add'>+</div><div class='add'>+	upa_writeq(~(u64)0, pbm-&gt;pbm_regs + FIRE_PEC_IENAB);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init pci_fire_pbm_init(struct pci_controller_info *p,</div><div class='del'>-				    struct device_node *dp, u32 portid)</div><div class='add'>+static int __init pci_fire_pbm_init(struct pci_pbm_info *pbm,</div><div class='add'>+				    struct of_device *op, u32 portid)</div><div class='ctx'> {</div><div class='ctx'> 	const struct linux_prom64_registers *regs;</div><div class='del'>-	struct pci_pbm_info *pbm;</div><div class='add'>+	struct device_node *dp = op-&gt;node;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if ((portid &amp; 1) == 0)</div><div class='del'>-		pbm = &amp;p-&gt;pbm_A;</div><div class='del'>-	else</div><div class='del'>-		pbm = &amp;p-&gt;pbm_B;</div><div class='del'>-</div><div class='del'>-	pbm-&gt;next = pci_pbm_root;</div><div class='del'>-	pci_pbm_root = pbm;</div><div class='del'>-</div><div class='ctx'> 	pbm-&gt;numa_node = -1;</div><div class='ctx'> </div><div class='del'>-	pbm-&gt;scan_bus = pci_fire_scan_bus;</div><div class='ctx'> 	pbm-&gt;pci_ops = &amp;sun4u_pci_ops;</div><div class='ctx'> 	pbm-&gt;config_space_reg_bits = 12;</div><div class='ctx'> </div><div class='ctx'> 	pbm-&gt;index = pci_num_pbms++;</div><div class='ctx'> </div><div class='ctx'> 	pbm-&gt;portid = portid;</div><div class='del'>-	pbm-&gt;parent = p;</div><div class='del'>-	pbm-&gt;prom_node = dp;</div><div class='add'>+	pbm-&gt;op = op;</div><div class='ctx'> 	pbm-&gt;name = dp-&gt;full_name;</div><div class='ctx'> </div><div class='ctx'> 	regs = of_get_property(dp, "reg", NULL);</div><div class='hunk'>@@ -481,53 +445,77 @@ static int __init pci_fire_pbm_init(struct pci_controller_info *p,</div><div class='ctx'> </div><div class='ctx'> 	pci_fire_msi_init(pbm);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='add'>+	pbm-&gt;pci_bus = pci_scan_one_pbm(pbm, &amp;op-&gt;dev);</div><div class='add'>+</div><div class='add'>+	/* XXX register error interrupt handlers XXX */</div><div class='add'>+</div><div class='add'>+	pbm-&gt;next = pci_pbm_root;</div><div class='add'>+	pci_pbm_root = pbm;</div><div class='ctx'> </div><div class='del'>-static inline int portid_compare(u32 x, u32 y)</div><div class='del'>-{</div><div class='del'>-	if (x == (y ^ 1))</div><div class='del'>-		return 1;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init fire_pci_init(struct device_node *dp, const char *model_name)</div><div class='add'>+static int __devinit fire_probe(struct of_device *op,</div><div class='add'>+				const struct of_device_id *match)</div><div class='ctx'> {</div><div class='del'>-	struct pci_controller_info *p;</div><div class='del'>-	u32 portid = of_getintprop_default(dp, "portid", 0xff);</div><div class='del'>-	struct iommu *iommu;</div><div class='add'>+	struct device_node *dp = op-&gt;node;</div><div class='ctx'> 	struct pci_pbm_info *pbm;</div><div class='add'>+	struct iommu *iommu;</div><div class='add'>+	u32 portid;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	for (pbm = pci_pbm_root; pbm; pbm = pbm-&gt;next) {</div><div class='del'>-		if (portid_compare(pbm-&gt;portid, portid)) {</div><div class='del'>-			if (pci_fire_pbm_init(pbm-&gt;parent, dp, portid))</div><div class='del'>-				goto fatal_memory_error;</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='add'>+	portid = of_getintprop_default(dp, "portid", 0xff);</div><div class='add'>+</div><div class='add'>+	err = -ENOMEM;</div><div class='add'>+	pbm = kzalloc(sizeof(*pbm), GFP_KERNEL);</div><div class='add'>+	if (!pbm) {</div><div class='add'>+		printk(KERN_ERR PFX "Cannot allocate pci_pbminfo.\n");</div><div class='add'>+		goto out_err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	p = kzalloc(sizeof(struct pci_controller_info), GFP_ATOMIC);</div><div class='del'>-	if (!p)</div><div class='del'>-		goto fatal_memory_error;</div><div class='add'>+	iommu = kzalloc(sizeof(struct iommu), GFP_KERNEL);</div><div class='add'>+	if (!iommu) {</div><div class='add'>+		printk(KERN_ERR PFX "Cannot allocate PBM iommu.\n");</div><div class='add'>+		goto out_free_controller;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	iommu = kzalloc(sizeof(struct iommu), GFP_ATOMIC);</div><div class='del'>-	if (!iommu)</div><div class='del'>-		goto fatal_memory_error;</div><div class='add'>+	pbm-&gt;iommu = iommu;</div><div class='ctx'> </div><div class='del'>-	p-&gt;pbm_A.iommu = iommu;</div><div class='add'>+	err = pci_fire_pbm_init(pbm, op, portid);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_free_iommu;</div><div class='ctx'> </div><div class='del'>-	iommu = kzalloc(sizeof(struct iommu), GFP_ATOMIC);</div><div class='del'>-	if (!iommu)</div><div class='del'>-		goto fatal_memory_error;</div><div class='add'>+	dev_set_drvdata(&amp;op-&gt;dev, pbm);</div><div class='ctx'> </div><div class='del'>-	p-&gt;pbm_B.iommu = iommu;</div><div class='add'>+	return 0;</div><div class='ctx'> </div><div class='del'>-	if (pci_fire_pbm_init(p, dp, portid))</div><div class='del'>-		goto fatal_memory_error;</div><div class='add'>+out_free_iommu:</div><div class='add'>+	kfree(pbm-&gt;iommu);</div><div class='add'>+			</div><div class='add'>+out_free_controller:</div><div class='add'>+	kfree(pbm);</div><div class='ctx'> </div><div class='del'>-	return;</div><div class='add'>+out_err:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct of_device_id __initdata fire_match[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "pci",</div><div class='add'>+		.compatible = "pciex108e,80f0",</div><div class='add'>+	},</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-fatal_memory_error:</div><div class='del'>-	prom_printf("PCI_FIRE: Fatal memory allocation error.\n");</div><div class='del'>-	prom_halt();</div><div class='add'>+static struct of_platform_driver fire_driver = {</div><div class='add'>+	.name		= DRIVER_NAME,</div><div class='add'>+	.match_table	= fire_match,</div><div class='add'>+	.probe		= fire_probe,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init fire_init(void)</div><div class='add'>+{</div><div class='add'>+	return of_register_driver(&amp;fire_driver, &amp;of_bus_type);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+subsys_initcall(fire_init);</div><div class='head'>diff --git a/arch/sparc64/kernel/pci_impl.h b/arch/sparc64/kernel/pci_impl.h<br/>index c385d126be11..03186824327e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/pci_impl.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc64/kernel/pci_impl.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/pci_impl.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/pci_impl.h</a></div><div class='hunk'>@@ -10,6 +10,7 @@</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/msi.h&gt;</div><div class='add'>+#include &lt;linux/of_device.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='ctx'> #include &lt;asm/iommu.h&gt;</div><div class='hunk'>@@ -56,15 +57,11 @@ struct sparc64_msiq_cookie {</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-struct pci_controller_info;</div><div class='del'>-</div><div class='ctx'> struct pci_pbm_info {</div><div class='ctx'> 	struct pci_pbm_info		*next;</div><div class='add'>+	struct pci_pbm_info		*sibling;</div><div class='ctx'> 	int				index;</div><div class='ctx'> </div><div class='del'>-	/* PCI controller we sit under. */</div><div class='del'>-	struct pci_controller_info	*parent;</div><div class='del'>-</div><div class='ctx'> 	/* Physical address base of controller registers. */</div><div class='ctx'> 	unsigned long			controller_regs;</div><div class='ctx'> </div><div class='hunk'>@@ -94,7 +91,7 @@ struct pci_pbm_info {</div><div class='ctx'> 	char				*name;</div><div class='ctx'> </div><div class='ctx'> 	/* OBP specific information. */</div><div class='del'>-	struct device_node		*prom_node;</div><div class='add'>+	struct of_device		*op;</div><div class='ctx'> 	u64				ino_bitmap;</div><div class='ctx'> </div><div class='ctx'> 	/* PBM I/O and Memory space resources. */</div><div class='hunk'>@@ -107,6 +104,10 @@ struct pci_pbm_info {</div><div class='ctx'> 	/* This will be 12 on PCI-E controllers, 8 elsewhere.  */</div><div class='ctx'> 	unsigned long			config_space_reg_bits;</div><div class='ctx'> </div><div class='add'>+	unsigned long			pci_afsr;</div><div class='add'>+	unsigned long			pci_afar;</div><div class='add'>+	unsigned long			pci_csr;</div><div class='add'>+</div><div class='ctx'> 	/* State of 66MHz capabilities on this PBM. */</div><div class='ctx'> 	int				is_66mhz_capable;</div><div class='ctx'> 	int				all_devs_66mhz;</div><div class='hunk'>@@ -146,25 +147,19 @@ struct pci_pbm_info {</div><div class='ctx'> 	unsigned int			pci_first_busno;</div><div class='ctx'> 	unsigned int			pci_last_busno;</div><div class='ctx'> 	struct pci_bus			*pci_bus;</div><div class='del'>-	void (*scan_bus)(struct pci_pbm_info *);</div><div class='ctx'> 	struct pci_ops			*pci_ops;</div><div class='ctx'> </div><div class='ctx'> 	int				numa_node;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct pci_controller_info {</div><div class='del'>-	/* The PCI bus modules controlled by us. */</div><div class='del'>-	struct pci_pbm_info		pbm_A;</div><div class='del'>-	struct pci_pbm_info		pbm_B;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> extern struct pci_pbm_info *pci_pbm_root;</div><div class='ctx'> </div><div class='ctx'> extern int pci_num_pbms;</div><div class='ctx'> </div><div class='ctx'> /* PCI bus scanning and fixup support. */</div><div class='ctx'> extern void pci_get_pbm_props(struct pci_pbm_info *pbm);</div><div class='del'>-extern struct pci_bus *pci_scan_one_pbm(struct pci_pbm_info *pbm);</div><div class='add'>+extern struct pci_bus *pci_scan_one_pbm(struct pci_pbm_info *pbm,</div><div class='add'>+					struct device *parent);</div><div class='ctx'> extern void pci_determine_mem_io_space(struct pci_pbm_info *pbm);</div><div class='ctx'> </div><div class='ctx'> /* Error reporting support. */</div><div class='hunk'>@@ -183,4 +178,8 @@ extern void pci_config_write32(u32 *addr, u32 val);</div><div class='ctx'> extern struct pci_ops sun4u_pci_ops;</div><div class='ctx'> extern struct pci_ops sun4v_pci_ops;</div><div class='ctx'> </div><div class='add'>+extern volatile int pci_poke_in_progress;</div><div class='add'>+extern volatile int pci_poke_cpu;</div><div class='add'>+extern volatile int pci_poke_faulted;</div><div class='add'>+</div><div class='ctx'> #endif /* !(PCI_IMPL_H) */</div><div class='head'>diff --git a/arch/sparc64/kernel/pci_msi.c b/arch/sparc64/kernel/pci_msi.c<br/>index 60c71e350212..2e680f34f727 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/pci_msi.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc64/kernel/pci_msi.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/pci_msi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/pci_msi.c</a></div><div class='hunk'>@@ -323,7 +323,7 @@ void sparc64_pbm_msi_init(struct pci_pbm_info *pbm,</div><div class='ctx'> 	const u32 *val;</div><div class='ctx'> 	int len;</div><div class='ctx'> </div><div class='del'>-	val = of_get_property(pbm-&gt;prom_node, "#msi-eqs", &amp;len);</div><div class='add'>+	val = of_get_property(pbm-&gt;op-&gt;node, "#msi-eqs", &amp;len);</div><div class='ctx'> 	if (!val || len != 4)</div><div class='ctx'> 		goto no_msi;</div><div class='ctx'> 	pbm-&gt;msiq_num = *val;</div><div class='hunk'>@@ -346,16 +346,16 @@ void sparc64_pbm_msi_init(struct pci_pbm_info *pbm,</div><div class='ctx'> 			u32 msi64_len;</div><div class='ctx'> 		} *arng;</div><div class='ctx'> </div><div class='del'>-		val = of_get_property(pbm-&gt;prom_node, "msi-eq-size", &amp;len);</div><div class='add'>+		val = of_get_property(pbm-&gt;op-&gt;node, "msi-eq-size", &amp;len);</div><div class='ctx'> 		if (!val || len != 4)</div><div class='ctx'> 			goto no_msi;</div><div class='ctx'> </div><div class='ctx'> 		pbm-&gt;msiq_ent_count = *val;</div><div class='ctx'> </div><div class='del'>-		mqp = of_get_property(pbm-&gt;prom_node,</div><div class='add'>+		mqp = of_get_property(pbm-&gt;op-&gt;node,</div><div class='ctx'> 				      "msi-eq-to-devino", &amp;len);</div><div class='ctx'> 		if (!mqp)</div><div class='del'>-			mqp = of_get_property(pbm-&gt;prom_node,</div><div class='add'>+			mqp = of_get_property(pbm-&gt;op-&gt;node,</div><div class='ctx'> 					      "msi-eq-devino", &amp;len);</div><div class='ctx'> 		if (!mqp || len != sizeof(struct msiq_prop))</div><div class='ctx'> 			goto no_msi;</div><div class='hunk'>@@ -363,27 +363,27 @@ void sparc64_pbm_msi_init(struct pci_pbm_info *pbm,</div><div class='ctx'> 		pbm-&gt;msiq_first = mqp-&gt;first_msiq;</div><div class='ctx'> 		pbm-&gt;msiq_first_devino = mqp-&gt;first_devino;</div><div class='ctx'> </div><div class='del'>-		val = of_get_property(pbm-&gt;prom_node, "#msi", &amp;len);</div><div class='add'>+		val = of_get_property(pbm-&gt;op-&gt;node, "#msi", &amp;len);</div><div class='ctx'> 		if (!val || len != 4)</div><div class='ctx'> 			goto no_msi;</div><div class='ctx'> 		pbm-&gt;msi_num = *val;</div><div class='ctx'> </div><div class='del'>-		mrng = of_get_property(pbm-&gt;prom_node, "msi-ranges", &amp;len);</div><div class='add'>+		mrng = of_get_property(pbm-&gt;op-&gt;node, "msi-ranges", &amp;len);</div><div class='ctx'> 		if (!mrng || len != sizeof(struct msi_range_prop))</div><div class='ctx'> 			goto no_msi;</div><div class='ctx'> 		pbm-&gt;msi_first = mrng-&gt;first_msi;</div><div class='ctx'> </div><div class='del'>-		val = of_get_property(pbm-&gt;prom_node, "msi-data-mask", &amp;len);</div><div class='add'>+		val = of_get_property(pbm-&gt;op-&gt;node, "msi-data-mask", &amp;len);</div><div class='ctx'> 		if (!val || len != 4)</div><div class='ctx'> 			goto no_msi;</div><div class='ctx'> 		pbm-&gt;msi_data_mask = *val;</div><div class='ctx'> </div><div class='del'>-		val = of_get_property(pbm-&gt;prom_node, "msix-data-width", &amp;len);</div><div class='add'>+		val = of_get_property(pbm-&gt;op-&gt;node, "msix-data-width", &amp;len);</div><div class='ctx'> 		if (!val || len != 4)</div><div class='ctx'> 			goto no_msi;</div><div class='ctx'> 		pbm-&gt;msix_data_width = *val;</div><div class='ctx'> </div><div class='del'>-		arng = of_get_property(pbm-&gt;prom_node, "msi-address-ranges",</div><div class='add'>+		arng = of_get_property(pbm-&gt;op-&gt;node, "msi-address-ranges",</div><div class='ctx'> 				       &amp;len);</div><div class='ctx'> 		if (!arng || len != sizeof(struct addr_range_prop))</div><div class='ctx'> 			goto no_msi;</div><div class='head'>diff --git a/arch/sparc64/kernel/pci_psycho.c b/arch/sparc64/kernel/pci_psycho.c<br/>index f85b6bebb0be..dfb3ec892987 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/pci_psycho.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc64/kernel/pci_psycho.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/pci_psycho.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/pci_psycho.c</a></div><div class='hunk'>@@ -17,29 +17,14 @@</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/starfire.h&gt;</div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='del'>-#include &lt;asm/oplib.h&gt;</div><div class='add'>+#include &lt;asm/upa.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "pci_impl.h"</div><div class='ctx'> #include "iommu_common.h"</div><div class='add'>+#include "psycho_common.h"</div><div class='ctx'> </div><div class='del'>-/* All PSYCHO registers are 64-bits.  The following accessor</div><div class='del'>- * routines are how they are accessed.  The REG parameter</div><div class='del'>- * is a physical address.</div><div class='del'>- */</div><div class='del'>-#define psycho_read(__reg) \</div><div class='del'>-({	u64 __ret; \</div><div class='del'>-	__asm__ __volatile__("ldxa [%1] %2, %0" \</div><div class='del'>-			     : "=r" (__ret) \</div><div class='del'>-			     : "r" (__reg), "i" (ASI_PHYS_BYPASS_EC_E) \</div><div class='del'>-			     : "memory"); \</div><div class='del'>-	__ret; \</div><div class='del'>-})</div><div class='del'>-#define psycho_write(__reg, __val) \</div><div class='del'>-	__asm__ __volatile__("stxa %0, [%1] %2" \</div><div class='del'>-			     : /* no outputs */ \</div><div class='del'>-			     : "r" (__val), "r" (__reg), \</div><div class='del'>-			       "i" (ASI_PHYS_BYPASS_EC_E) \</div><div class='del'>-			     : "memory")</div><div class='add'>+#define DRIVER_NAME	"psycho"</div><div class='add'>+#define PFX		DRIVER_NAME ": "</div><div class='ctx'> </div><div class='ctx'> /* Misc. PSYCHO PCI controller register offsets and definitions. */</div><div class='ctx'> #define PSYCHO_CONTROL		0x0010UL</div><div class='hunk'>@@ -67,37 +52,7 @@</div><div class='ctx'> #define  PSYCHO_PCICTRL_RESV4	 0x00000000000000c0UL /* Reserved                     */</div><div class='ctx'> #define  PSYCHO_PCICTRL_AEN	 0x000000000000003fUL /* PCI DVMA Arbitration Enable  */</div><div class='ctx'> </div><div class='del'>-/* U2P Programmer's Manual, page 13-55, configuration space</div><div class='del'>- * address format:</div><div class='del'>- * </div><div class='del'>- *  32             24 23 16 15    11 10       8 7   2  1 0</div><div class='del'>- * ---------------------------------------------------------</div><div class='del'>- * |0 0 0 0 0 0 0 0 1| bus | device | function | reg | 0 0 |</div><div class='del'>- * ---------------------------------------------------------</div><div class='del'>- */</div><div class='del'>-#define PSYCHO_CONFIG_BASE(PBM)	\</div><div class='del'>-	((PBM)-&gt;config_space | (1UL &lt;&lt; 24))</div><div class='del'>-#define PSYCHO_CONFIG_ENCODE(BUS, DEVFN, REG)	\</div><div class='del'>-	(((unsigned long)(BUS)   &lt;&lt; 16) |	\</div><div class='del'>-	 ((unsigned long)(DEVFN) &lt;&lt; 8)  |	\</div><div class='del'>-	 ((unsigned long)(REG)))</div><div class='del'>-</div><div class='del'>-static void *psycho_pci_config_mkaddr(struct pci_pbm_info *pbm,</div><div class='del'>-				      unsigned char bus,</div><div class='del'>-				      unsigned int devfn,</div><div class='del'>-				      int where)</div><div class='del'>-{</div><div class='del'>-	if (!pbm)</div><div class='del'>-		return NULL;</div><div class='del'>-	return (void *)</div><div class='del'>-		(PSYCHO_CONFIG_BASE(pbm) |</div><div class='del'>-		 PSYCHO_CONFIG_ENCODE(bus, devfn, where));</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* PSYCHO error handling support. */</div><div class='del'>-enum psycho_error_type {</div><div class='del'>-	UE_ERR, CE_ERR, PCI_ERR</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> /* Helper function of IOMMU error checking, which checks out</div><div class='ctx'>  * the state of the streaming buffers.  The IOMMU lock is</div><div class='hunk'>@@ -122,129 +77,10 @@ enum psycho_error_type {</div><div class='ctx'> #define PSYCHO_STC_DATA_B	0xc000UL</div><div class='ctx'> #define PSYCHO_STC_ERR_A	0xb400UL</div><div class='ctx'> #define PSYCHO_STC_ERR_B	0xc400UL</div><div class='del'>-#define  PSYCHO_STCERR_WRITE	 0x0000000000000002UL	/* Write Error */</div><div class='del'>-#define  PSYCHO_STCERR_READ	 0x0000000000000001UL	/* Read Error */</div><div class='ctx'> #define PSYCHO_STC_TAG_A	0xb800UL</div><div class='ctx'> #define PSYCHO_STC_TAG_B	0xc800UL</div><div class='del'>-#define  PSYCHO_STCTAG_PPN	 0x0fffffff00000000UL	/* Physical Page Number */</div><div class='del'>-#define  PSYCHO_STCTAG_VPN	 0x00000000ffffe000UL	/* Virtual Page Number */</div><div class='del'>-#define  PSYCHO_STCTAG_VALID	 0x0000000000000002UL	/* Valid */</div><div class='del'>-#define  PSYCHO_STCTAG_WRITE	 0x0000000000000001UL	/* Writable */</div><div class='ctx'> #define PSYCHO_STC_LINE_A	0xb900UL</div><div class='ctx'> #define PSYCHO_STC_LINE_B	0xc900UL</div><div class='del'>-#define  PSYCHO_STCLINE_LINDX	 0x0000000001e00000UL	/* LRU Index */</div><div class='del'>-#define  PSYCHO_STCLINE_SPTR	 0x00000000001f8000UL	/* Dirty Data Start Pointer */</div><div class='del'>-#define  PSYCHO_STCLINE_LADDR	 0x0000000000007f00UL	/* Line Address */</div><div class='del'>-#define  PSYCHO_STCLINE_EPTR	 0x00000000000000fcUL	/* Dirty Data End Pointer */</div><div class='del'>-#define  PSYCHO_STCLINE_VALID	 0x0000000000000002UL	/* Valid */</div><div class='del'>-#define  PSYCHO_STCLINE_FOFN	 0x0000000000000001UL	/* Fetch Outstanding / Flush Necessary */</div><div class='del'>-</div><div class='del'>-static DEFINE_SPINLOCK(stc_buf_lock);</div><div class='del'>-static unsigned long stc_error_buf[128];</div><div class='del'>-static unsigned long stc_tag_buf[16];</div><div class='del'>-static unsigned long stc_line_buf[16];</div><div class='del'>-</div><div class='del'>-static void __psycho_check_one_stc(struct pci_pbm_info *pbm,</div><div class='del'>-				   int is_pbm_a)</div><div class='del'>-{</div><div class='del'>-	struct strbuf *strbuf = &amp;pbm-&gt;stc;</div><div class='del'>-	unsigned long regbase = pbm-&gt;controller_regs;</div><div class='del'>-	unsigned long err_base, tag_base, line_base;</div><div class='del'>-	u64 control;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (is_pbm_a) {</div><div class='del'>-		err_base = regbase + PSYCHO_STC_ERR_A;</div><div class='del'>-		tag_base = regbase + PSYCHO_STC_TAG_A;</div><div class='del'>-		line_base = regbase + PSYCHO_STC_LINE_A;</div><div class='del'>-	} else {</div><div class='del'>-		err_base = regbase + PSYCHO_STC_ERR_B;</div><div class='del'>-		tag_base = regbase + PSYCHO_STC_TAG_B;</div><div class='del'>-		line_base = regbase + PSYCHO_STC_LINE_B;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;stc_buf_lock);</div><div class='del'>-</div><div class='del'>-	/* This is __REALLY__ dangerous.  When we put the</div><div class='del'>-	 * streaming buffer into diagnostic mode to probe</div><div class='del'>-	 * it's tags and error status, we _must_ clear all</div><div class='del'>-	 * of the line tag valid bits before re-enabling</div><div class='del'>-	 * the streaming buffer.  If any dirty data lives</div><div class='del'>-	 * in the STC when we do this, we will end up</div><div class='del'>-	 * invalidating it before it has a chance to reach</div><div class='del'>-	 * main memory.</div><div class='del'>-	 */</div><div class='del'>-	control = psycho_read(strbuf-&gt;strbuf_control);</div><div class='del'>-	psycho_write(strbuf-&gt;strbuf_control,</div><div class='del'>-		     (control | PSYCHO_STRBUF_CTRL_DENAB));</div><div class='del'>-	for (i = 0; i &lt; 128; i++) {</div><div class='del'>-		unsigned long val;</div><div class='del'>-</div><div class='del'>-		val = psycho_read(err_base + (i * 8UL));</div><div class='del'>-		psycho_write(err_base + (i * 8UL), 0UL);</div><div class='del'>-		stc_error_buf[i] = val;</div><div class='del'>-	}</div><div class='del'>-	for (i = 0; i &lt; 16; i++) {</div><div class='del'>-		stc_tag_buf[i] = psycho_read(tag_base + (i * 8UL));</div><div class='del'>-		stc_line_buf[i] = psycho_read(line_base + (i * 8UL));</div><div class='del'>-		psycho_write(tag_base + (i * 8UL), 0UL);</div><div class='del'>-		psycho_write(line_base + (i * 8UL), 0UL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* OK, state is logged, exit diagnostic mode. */</div><div class='del'>-	psycho_write(strbuf-&gt;strbuf_control, control);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 16; i++) {</div><div class='del'>-		int j, saw_error, first, last;</div><div class='del'>-</div><div class='del'>-		saw_error = 0;</div><div class='del'>-		first = i * 8;</div><div class='del'>-		last = first + 8;</div><div class='del'>-		for (j = first; j &lt; last; j++) {</div><div class='del'>-			unsigned long errval = stc_error_buf[j];</div><div class='del'>-			if (errval != 0) {</div><div class='del'>-				saw_error++;</div><div class='del'>-				printk("%s: STC_ERR(%d)[wr(%d)rd(%d)]\n",</div><div class='del'>-				       pbm-&gt;name,</div><div class='del'>-				       j,</div><div class='del'>-				       (errval &amp; PSYCHO_STCERR_WRITE) ? 1 : 0,</div><div class='del'>-				       (errval &amp; PSYCHO_STCERR_READ) ? 1 : 0);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		if (saw_error != 0) {</div><div class='del'>-			unsigned long tagval = stc_tag_buf[i];</div><div class='del'>-			unsigned long lineval = stc_line_buf[i];</div><div class='del'>-			printk("%s: STC_TAG(%d)[PA(%016lx)VA(%08lx)V(%d)W(%d)]\n",</div><div class='del'>-			       pbm-&gt;name,</div><div class='del'>-			       i,</div><div class='del'>-			       ((tagval &amp; PSYCHO_STCTAG_PPN) &gt;&gt; 19UL),</div><div class='del'>-			       (tagval &amp; PSYCHO_STCTAG_VPN),</div><div class='del'>-			       ((tagval &amp; PSYCHO_STCTAG_VALID) ? 1 : 0),</div><div class='del'>-			       ((tagval &amp; PSYCHO_STCTAG_WRITE) ? 1 : 0));</div><div class='del'>-			printk("%s: STC_LINE(%d)[LIDX(%lx)SP(%lx)LADDR(%lx)EP(%lx)"</div><div class='del'>-			       "V(%d)FOFN(%d)]\n",</div><div class='del'>-			       pbm-&gt;name,</div><div class='del'>-			       i,</div><div class='del'>-			       ((lineval &amp; PSYCHO_STCLINE_LINDX) &gt;&gt; 21UL),</div><div class='del'>-			       ((lineval &amp; PSYCHO_STCLINE_SPTR) &gt;&gt; 15UL),</div><div class='del'>-			       ((lineval &amp; PSYCHO_STCLINE_LADDR) &gt;&gt; 8UL),</div><div class='del'>-			       ((lineval &amp; PSYCHO_STCLINE_EPTR) &gt;&gt; 2UL),</div><div class='del'>-			       ((lineval &amp; PSYCHO_STCLINE_VALID) ? 1 : 0),</div><div class='del'>-			       ((lineval &amp; PSYCHO_STCLINE_FOFN) ? 1 : 0));</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_unlock(&amp;stc_buf_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __psycho_check_stc_error(struct pci_pbm_info *pbm,</div><div class='del'>-				     unsigned long afsr,</div><div class='del'>-				     unsigned long afar,</div><div class='del'>-				     enum psycho_error_type type)</div><div class='del'>-{</div><div class='del'>-	__psycho_check_one_stc(pbm,</div><div class='del'>-			       (pbm == &amp;pbm-&gt;parent-&gt;pbm_A));</div><div class='del'>-}</div><div class='ctx'> </div><div class='ctx'> /* When an Uncorrectable Error or a PCI Error happens, we</div><div class='ctx'>  * interrogate the IOMMU state to see if it is the cause.</div><div class='hunk'>@@ -271,122 +107,7 @@ static void __psycho_check_stc_error(struct pci_pbm_info *pbm,</div><div class='ctx'> #define PSYCHO_IOMMU_TSBBASE	0x0208UL</div><div class='ctx'> #define PSYCHO_IOMMU_FLUSH	0x0210UL</div><div class='ctx'> #define PSYCHO_IOMMU_TAG	0xa580UL</div><div class='del'>-#define  PSYCHO_IOMMU_TAG_ERRSTS (0x3UL &lt;&lt; 23UL)</div><div class='del'>-#define  PSYCHO_IOMMU_TAG_ERR	 (0x1UL &lt;&lt; 22UL)</div><div class='del'>-#define  PSYCHO_IOMMU_TAG_WRITE	 (0x1UL &lt;&lt; 21UL)</div><div class='del'>-#define  PSYCHO_IOMMU_TAG_STREAM (0x1UL &lt;&lt; 20UL)</div><div class='del'>-#define  PSYCHO_IOMMU_TAG_SIZE	 (0x1UL &lt;&lt; 19UL)</div><div class='del'>-#define  PSYCHO_IOMMU_TAG_VPAGE	 0x7ffffUL</div><div class='ctx'> #define PSYCHO_IOMMU_DATA	0xa600UL</div><div class='del'>-#define  PSYCHO_IOMMU_DATA_VALID (1UL &lt;&lt; 30UL)</div><div class='del'>-#define  PSYCHO_IOMMU_DATA_CACHE (1UL &lt;&lt; 28UL)</div><div class='del'>-#define  PSYCHO_IOMMU_DATA_PPAGE 0xfffffffUL</div><div class='del'>-static void psycho_check_iommu_error(struct pci_pbm_info *pbm,</div><div class='del'>-				     unsigned long afsr,</div><div class='del'>-				     unsigned long afar,</div><div class='del'>-				     enum psycho_error_type type)</div><div class='del'>-{</div><div class='del'>-	struct iommu *iommu = pbm-&gt;iommu;</div><div class='del'>-	unsigned long iommu_tag[16];</div><div class='del'>-	unsigned long iommu_data[16];</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	u64 control;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;iommu-&gt;lock, flags);</div><div class='del'>-	control = psycho_read(iommu-&gt;iommu_control);</div><div class='del'>-	if (control &amp; PSYCHO_IOMMU_CTRL_XLTEERR) {</div><div class='del'>-		char *type_string;</div><div class='del'>-</div><div class='del'>-		/* Clear the error encountered bit. */</div><div class='del'>-		control &amp;= ~PSYCHO_IOMMU_CTRL_XLTEERR;</div><div class='del'>-		psycho_write(iommu-&gt;iommu_control, control);</div><div class='del'>-</div><div class='del'>-		switch((control &amp; PSYCHO_IOMMU_CTRL_XLTESTAT) &gt;&gt; 25UL) {</div><div class='del'>-		case 0:</div><div class='del'>-			type_string = "Protection Error";</div><div class='del'>-			break;</div><div class='del'>-		case 1:</div><div class='del'>-			type_string = "Invalid Error";</div><div class='del'>-			break;</div><div class='del'>-		case 2:</div><div class='del'>-			type_string = "TimeOut Error";</div><div class='del'>-			break;</div><div class='del'>-		case 3:</div><div class='del'>-		default:</div><div class='del'>-			type_string = "ECC Error";</div><div class='del'>-			break;</div><div class='del'>-		};</div><div class='del'>-		printk("%s: IOMMU Error, type[%s]\n",</div><div class='del'>-		       pbm-&gt;name, type_string);</div><div class='del'>-</div><div class='del'>-		/* Put the IOMMU into diagnostic mode and probe</div><div class='del'>-		 * it's TLB for entries with error status.</div><div class='del'>-		 *</div><div class='del'>-		 * It is very possible for another DVMA to occur</div><div class='del'>-		 * while we do this probe, and corrupt the system</div><div class='del'>-		 * further.  But we are so screwed at this point</div><div class='del'>-		 * that we are likely to crash hard anyways, so</div><div class='del'>-		 * get as much diagnostic information to the</div><div class='del'>-		 * console as we can.</div><div class='del'>-		 */</div><div class='del'>-		psycho_write(iommu-&gt;iommu_control,</div><div class='del'>-			     control | PSYCHO_IOMMU_CTRL_DENAB);</div><div class='del'>-		for (i = 0; i &lt; 16; i++) {</div><div class='del'>-			unsigned long base = pbm-&gt;controller_regs;</div><div class='del'>-</div><div class='del'>-			iommu_tag[i] =</div><div class='del'>-				psycho_read(base + PSYCHO_IOMMU_TAG + (i * 8UL));</div><div class='del'>-			iommu_data[i] =</div><div class='del'>-				psycho_read(base + PSYCHO_IOMMU_DATA + (i * 8UL));</div><div class='del'>-</div><div class='del'>-			/* Now clear out the entry. */</div><div class='del'>-			psycho_write(base + PSYCHO_IOMMU_TAG + (i * 8UL), 0);</div><div class='del'>-			psycho_write(base + PSYCHO_IOMMU_DATA + (i * 8UL), 0);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Leave diagnostic mode. */</div><div class='del'>-		psycho_write(iommu-&gt;iommu_control, control);</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; 16; i++) {</div><div class='del'>-			unsigned long tag, data;</div><div class='del'>-</div><div class='del'>-			tag = iommu_tag[i];</div><div class='del'>-			if (!(tag &amp; PSYCHO_IOMMU_TAG_ERR))</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			data = iommu_data[i];</div><div class='del'>-			switch((tag &amp; PSYCHO_IOMMU_TAG_ERRSTS) &gt;&gt; 23UL) {</div><div class='del'>-			case 0:</div><div class='del'>-				type_string = "Protection Error";</div><div class='del'>-				break;</div><div class='del'>-			case 1:</div><div class='del'>-				type_string = "Invalid Error";</div><div class='del'>-				break;</div><div class='del'>-			case 2:</div><div class='del'>-				type_string = "TimeOut Error";</div><div class='del'>-				break;</div><div class='del'>-			case 3:</div><div class='del'>-			default:</div><div class='del'>-				type_string = "ECC Error";</div><div class='del'>-				break;</div><div class='del'>-			};</div><div class='del'>-			printk("%s: IOMMU TAG(%d)[error(%s) wr(%d) str(%d) sz(%dK) vpg(%08lx)]\n",</div><div class='del'>-			       pbm-&gt;name, i, type_string,</div><div class='del'>-			       ((tag &amp; PSYCHO_IOMMU_TAG_WRITE) ? 1 : 0),</div><div class='del'>-			       ((tag &amp; PSYCHO_IOMMU_TAG_STREAM) ? 1 : 0),</div><div class='del'>-			       ((tag &amp; PSYCHO_IOMMU_TAG_SIZE) ? 64 : 8),</div><div class='del'>-			       (tag &amp; PSYCHO_IOMMU_TAG_VPAGE) &lt;&lt; IOMMU_PAGE_SHIFT);</div><div class='del'>-			printk("%s: IOMMU DATA(%d)[valid(%d) cache(%d) ppg(%016lx)]\n",</div><div class='del'>-			       pbm-&gt;name, i,</div><div class='del'>-			       ((data &amp; PSYCHO_IOMMU_DATA_VALID) ? 1 : 0),</div><div class='del'>-			       ((data &amp; PSYCHO_IOMMU_DATA_CACHE) ? 1 : 0),</div><div class='del'>-			       (data &amp; PSYCHO_IOMMU_DATA_PPAGE) &lt;&lt; IOMMU_PAGE_SHIFT);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	__psycho_check_stc_error(pbm, afsr, afar, type);</div><div class='del'>-	spin_unlock_irqrestore(&amp;iommu-&gt;lock, flags);</div><div class='del'>-}</div><div class='ctx'> </div><div class='ctx'> /* Uncorrectable Errors.  Cause of the error and the address are</div><div class='ctx'>  * recorded in the UE_AFSR and UE_AFAR of PSYCHO.  They are errors</div><div class='hunk'>@@ -410,15 +131,14 @@ static void psycho_check_iommu_error(struct pci_pbm_info *pbm,</div><div class='ctx'> static irqreturn_t psycho_ue_intr(int irq, void *dev_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_pbm_info *pbm = dev_id;</div><div class='del'>-	struct pci_controller_info *p = pbm-&gt;parent;</div><div class='ctx'> 	unsigned long afsr_reg = pbm-&gt;controller_regs + PSYCHO_UE_AFSR;</div><div class='ctx'> 	unsigned long afar_reg = pbm-&gt;controller_regs + PSYCHO_UE_AFAR;</div><div class='ctx'> 	unsigned long afsr, afar, error_bits;</div><div class='ctx'> 	int reported;</div><div class='ctx'> </div><div class='ctx'> 	/* Latch uncorrectable error status. */</div><div class='del'>-	afar = psycho_read(afar_reg);</div><div class='del'>-	afsr = psycho_read(afsr_reg);</div><div class='add'>+	afar = upa_readq(afar_reg);</div><div class='add'>+	afsr = upa_readq(afsr_reg);</div><div class='ctx'> </div><div class='ctx'> 	/* Clear the primary/secondary error status bits. */</div><div class='ctx'> 	error_bits = afsr &amp;</div><div class='hunk'>@@ -426,7 +146,7 @@ static irqreturn_t psycho_ue_intr(int irq, void *dev_id)</div><div class='ctx'> 		 PSYCHO_UEAFSR_SPIO | PSYCHO_UEAFSR_SDRD | PSYCHO_UEAFSR_SDWR);</div><div class='ctx'> 	if (!error_bits)</div><div class='ctx'> 		return IRQ_NONE;</div><div class='del'>-	psycho_write(afsr_reg, error_bits);</div><div class='add'>+	upa_writeq(error_bits, afsr_reg);</div><div class='ctx'> </div><div class='ctx'> 	/* Log the error. */</div><div class='ctx'> 	printk("%s: Uncorrectable Error, primary error type[%s]\n",</div><div class='hunk'>@@ -463,8 +183,9 @@ static irqreturn_t psycho_ue_intr(int irq, void *dev_id)</div><div class='ctx'> 	printk("]\n");</div><div class='ctx'> </div><div class='ctx'> 	/* Interrogate both IOMMUs for error status. */</div><div class='del'>-	psycho_check_iommu_error(&amp;p-&gt;pbm_A, afsr, afar, UE_ERR);</div><div class='del'>-	psycho_check_iommu_error(&amp;p-&gt;pbm_B, afsr, afar, UE_ERR);</div><div class='add'>+	psycho_check_iommu_error(pbm, afsr, afar, UE_ERR);</div><div class='add'>+	if (pbm-&gt;sibling)</div><div class='add'>+		psycho_check_iommu_error(pbm-&gt;sibling, afsr, afar, UE_ERR);</div><div class='ctx'> </div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='hunk'>@@ -495,8 +216,8 @@ static irqreturn_t psycho_ce_intr(int irq, void *dev_id)</div><div class='ctx'> 	int reported;</div><div class='ctx'> </div><div class='ctx'> 	/* Latch error status. */</div><div class='del'>-	afar = psycho_read(afar_reg);</div><div class='del'>-	afsr = psycho_read(afsr_reg);</div><div class='add'>+	afar = upa_readq(afar_reg);</div><div class='add'>+	afsr = upa_readq(afsr_reg);</div><div class='ctx'> </div><div class='ctx'> 	/* Clear primary/secondary error status bits. */</div><div class='ctx'> 	error_bits = afsr &amp;</div><div class='hunk'>@@ -504,7 +225,7 @@ static irqreturn_t psycho_ce_intr(int irq, void *dev_id)</div><div class='ctx'> 		 PSYCHO_CEAFSR_SPIO | PSYCHO_CEAFSR_SDRD | PSYCHO_CEAFSR_SDWR);</div><div class='ctx'> 	if (!error_bits)</div><div class='ctx'> 		return IRQ_NONE;</div><div class='del'>-	psycho_write(afsr_reg, error_bits);</div><div class='add'>+	upa_writeq(error_bits, afsr_reg);</div><div class='ctx'> </div><div class='ctx'> 	/* Log the error. */</div><div class='ctx'> 	printk("%s: Correctable Error, primary error type[%s]\n",</div><div class='hunk'>@@ -554,164 +275,9 @@ static irqreturn_t psycho_ce_intr(int irq, void *dev_id)</div><div class='ctx'>  */</div><div class='ctx'> #define PSYCHO_PCI_AFSR_A	0x2010UL</div><div class='ctx'> #define PSYCHO_PCI_AFSR_B	0x4010UL</div><div class='del'>-#define  PSYCHO_PCIAFSR_PMA	0x8000000000000000UL /* Primary Master Abort Error   */</div><div class='del'>-#define  PSYCHO_PCIAFSR_PTA	0x4000000000000000UL /* Primary Target Abort Error   */</div><div class='del'>-#define  PSYCHO_PCIAFSR_PRTRY	0x2000000000000000UL /* Primary Excessive Retries    */</div><div class='del'>-#define  PSYCHO_PCIAFSR_PPERR	0x1000000000000000UL /* Primary Parity Error         */</div><div class='del'>-#define  PSYCHO_PCIAFSR_SMA	0x0800000000000000UL /* Secondary Master Abort Error */</div><div class='del'>-#define  PSYCHO_PCIAFSR_STA	0x0400000000000000UL /* Secondary Target Abort Error */</div><div class='del'>-#define  PSYCHO_PCIAFSR_SRTRY	0x0200000000000000UL /* Secondary Excessive Retries  */</div><div class='del'>-#define  PSYCHO_PCIAFSR_SPERR	0x0100000000000000UL /* Secondary Parity Error       */</div><div class='del'>-#define  PSYCHO_PCIAFSR_RESV1	0x00ff000000000000UL /* Reserved                     */</div><div class='del'>-#define  PSYCHO_PCIAFSR_BMSK	0x0000ffff00000000UL /* Bytemask of failed transfer  */</div><div class='del'>-#define  PSYCHO_PCIAFSR_BLK	0x0000000080000000UL /* Trans was block operation    */</div><div class='del'>-#define  PSYCHO_PCIAFSR_RESV2	0x0000000040000000UL /* Reserved                     */</div><div class='del'>-#define  PSYCHO_PCIAFSR_MID	0x000000003e000000UL /* MID causing the error        */</div><div class='del'>-#define  PSYCHO_PCIAFSR_RESV3	0x0000000001ffffffUL /* Reserved                     */</div><div class='ctx'> #define PSYCHO_PCI_AFAR_A	0x2018UL</div><div class='ctx'> #define PSYCHO_PCI_AFAR_B	0x4018UL</div><div class='ctx'> </div><div class='del'>-static irqreturn_t psycho_pcierr_intr_other(struct pci_pbm_info *pbm, int is_pbm_a)</div><div class='del'>-{</div><div class='del'>-	unsigned long csr_reg, csr, csr_error_bits;</div><div class='del'>-	irqreturn_t ret = IRQ_NONE;</div><div class='del'>-	u16 stat, *addr;</div><div class='del'>-</div><div class='del'>-	if (is_pbm_a) {</div><div class='del'>-		csr_reg = pbm-&gt;controller_regs + PSYCHO_PCIA_CTRL;</div><div class='del'>-	} else {</div><div class='del'>-		csr_reg = pbm-&gt;controller_regs + PSYCHO_PCIB_CTRL;</div><div class='del'>-	}</div><div class='del'>-	csr = psycho_read(csr_reg);</div><div class='del'>-	csr_error_bits =</div><div class='del'>-		csr &amp; (PSYCHO_PCICTRL_SBH_ERR | PSYCHO_PCICTRL_SERR);</div><div class='del'>-	if (csr_error_bits) {</div><div class='del'>-		/* Clear the errors.  */</div><div class='del'>-		psycho_write(csr_reg, csr);</div><div class='del'>-</div><div class='del'>-		/* Log 'em.  */</div><div class='del'>-		if (csr_error_bits &amp; PSYCHO_PCICTRL_SBH_ERR)</div><div class='del'>-			printk("%s: PCI streaming byte hole error asserted.\n",</div><div class='del'>-			       pbm-&gt;name);</div><div class='del'>-		if (csr_error_bits &amp; PSYCHO_PCICTRL_SERR)</div><div class='del'>-			printk("%s: PCI SERR signal asserted.\n", pbm-&gt;name);</div><div class='del'>-		ret = IRQ_HANDLED;</div><div class='del'>-	}</div><div class='del'>-	addr = psycho_pci_config_mkaddr(pbm, pbm-&gt;pci_first_busno,</div><div class='del'>-					0, PCI_STATUS);</div><div class='del'>-	pci_config_read16(addr, &amp;stat);</div><div class='del'>-	if (stat &amp; (PCI_STATUS_PARITY |</div><div class='del'>-		    PCI_STATUS_SIG_TARGET_ABORT |</div><div class='del'>-		    PCI_STATUS_REC_TARGET_ABORT |</div><div class='del'>-		    PCI_STATUS_REC_MASTER_ABORT |</div><div class='del'>-		    PCI_STATUS_SIG_SYSTEM_ERROR)) {</div><div class='del'>-		printk("%s: PCI bus error, PCI_STATUS[%04x]\n",</div><div class='del'>-		       pbm-&gt;name, stat);</div><div class='del'>-		pci_config_write16(addr, 0xffff);</div><div class='del'>-		ret = IRQ_HANDLED;</div><div class='del'>-	}</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static irqreturn_t psycho_pcierr_intr(int irq, void *dev_id)</div><div class='del'>-{</div><div class='del'>-	struct pci_pbm_info *pbm = dev_id;</div><div class='del'>-	struct pci_controller_info *p = pbm-&gt;parent;</div><div class='del'>-	unsigned long afsr_reg, afar_reg;</div><div class='del'>-	unsigned long afsr, afar, error_bits;</div><div class='del'>-	int is_pbm_a, reported;</div><div class='del'>-</div><div class='del'>-	is_pbm_a = (pbm == &amp;pbm-&gt;parent-&gt;pbm_A);</div><div class='del'>-	if (is_pbm_a) {</div><div class='del'>-		afsr_reg = p-&gt;pbm_A.controller_regs + PSYCHO_PCI_AFSR_A;</div><div class='del'>-		afar_reg = p-&gt;pbm_A.controller_regs + PSYCHO_PCI_AFAR_A;</div><div class='del'>-	} else {</div><div class='del'>-		afsr_reg = p-&gt;pbm_A.controller_regs + PSYCHO_PCI_AFSR_B;</div><div class='del'>-		afar_reg = p-&gt;pbm_A.controller_regs + PSYCHO_PCI_AFAR_B;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Latch error status. */</div><div class='del'>-	afar = psycho_read(afar_reg);</div><div class='del'>-	afsr = psycho_read(afsr_reg);</div><div class='del'>-</div><div class='del'>-	/* Clear primary/secondary error status bits. */</div><div class='del'>-	error_bits = afsr &amp;</div><div class='del'>-		(PSYCHO_PCIAFSR_PMA | PSYCHO_PCIAFSR_PTA |</div><div class='del'>-		 PSYCHO_PCIAFSR_PRTRY | PSYCHO_PCIAFSR_PPERR |</div><div class='del'>-		 PSYCHO_PCIAFSR_SMA | PSYCHO_PCIAFSR_STA |</div><div class='del'>-		 PSYCHO_PCIAFSR_SRTRY | PSYCHO_PCIAFSR_SPERR);</div><div class='del'>-	if (!error_bits)</div><div class='del'>-		return psycho_pcierr_intr_other(pbm, is_pbm_a);</div><div class='del'>-	psycho_write(afsr_reg, error_bits);</div><div class='del'>-</div><div class='del'>-	/* Log the error. */</div><div class='del'>-	printk("%s: PCI Error, primary error type[%s]\n",</div><div class='del'>-	       pbm-&gt;name,</div><div class='del'>-	       (((error_bits &amp; PSYCHO_PCIAFSR_PMA) ?</div><div class='del'>-		 "Master Abort" :</div><div class='del'>-		 ((error_bits &amp; PSYCHO_PCIAFSR_PTA) ?</div><div class='del'>-		  "Target Abort" :</div><div class='del'>-		  ((error_bits &amp; PSYCHO_PCIAFSR_PRTRY) ?</div><div class='del'>-		   "Excessive Retries" :</div><div class='del'>-		   ((error_bits &amp; PSYCHO_PCIAFSR_PPERR) ?</div><div class='del'>-		    "Parity Error" : "???"))))));</div><div class='del'>-	printk("%s: bytemask[%04lx] UPA_MID[%02lx] was_block(%d)\n",</div><div class='del'>-	       pbm-&gt;name,</div><div class='del'>-	       (afsr &amp; PSYCHO_PCIAFSR_BMSK) &gt;&gt; 32UL,</div><div class='del'>-	       (afsr &amp; PSYCHO_PCIAFSR_MID) &gt;&gt; 25UL,</div><div class='del'>-	       (afsr &amp; PSYCHO_PCIAFSR_BLK) ? 1 : 0);</div><div class='del'>-	printk("%s: PCI AFAR [%016lx]\n", pbm-&gt;name, afar);</div><div class='del'>-	printk("%s: PCI Secondary errors [", pbm-&gt;name);</div><div class='del'>-	reported = 0;</div><div class='del'>-	if (afsr &amp; PSYCHO_PCIAFSR_SMA) {</div><div class='del'>-		reported++;</div><div class='del'>-		printk("(Master Abort)");</div><div class='del'>-	}</div><div class='del'>-	if (afsr &amp; PSYCHO_PCIAFSR_STA) {</div><div class='del'>-		reported++;</div><div class='del'>-		printk("(Target Abort)");</div><div class='del'>-	}</div><div class='del'>-	if (afsr &amp; PSYCHO_PCIAFSR_SRTRY) {</div><div class='del'>-		reported++;</div><div class='del'>-		printk("(Excessive Retries)");</div><div class='del'>-	}</div><div class='del'>-	if (afsr &amp; PSYCHO_PCIAFSR_SPERR) {</div><div class='del'>-		reported++;</div><div class='del'>-		printk("(Parity Error)");</div><div class='del'>-	}</div><div class='del'>-	if (!reported)</div><div class='del'>-		printk("(none)");</div><div class='del'>-	printk("]\n");</div><div class='del'>-</div><div class='del'>-	/* For the error types shown, scan PBM's PCI bus for devices</div><div class='del'>-	 * which have logged that error type.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/* If we see a Target Abort, this could be the result of an</div><div class='del'>-	 * IOMMU translation error of some sort.  It is extremely</div><div class='del'>-	 * useful to log this information as usually it indicates</div><div class='del'>-	 * a bug in the IOMMU support code or a PCI device driver.</div><div class='del'>-	 */</div><div class='del'>-	if (error_bits &amp; (PSYCHO_PCIAFSR_PTA | PSYCHO_PCIAFSR_STA)) {</div><div class='del'>-		psycho_check_iommu_error(pbm, afsr, afar, PCI_ERR);</div><div class='del'>-		pci_scan_for_target_abort(pbm, pbm-&gt;pci_bus);</div><div class='del'>-	}</div><div class='del'>-	if (error_bits &amp; (PSYCHO_PCIAFSR_PMA | PSYCHO_PCIAFSR_SMA))</div><div class='del'>-		pci_scan_for_master_abort(pbm, pbm-&gt;pci_bus);</div><div class='del'>-</div><div class='del'>-	/* For excessive retries, PSYCHO/PBM will abort the device</div><div class='del'>-	 * and there is no way to specifically check for excessive</div><div class='del'>-	 * retries in the config space status registers.  So what</div><div class='del'>-	 * we hope is that we'll catch it via the master/target</div><div class='del'>-	 * abort events.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (error_bits &amp; (PSYCHO_PCIAFSR_PPERR | PSYCHO_PCIAFSR_SPERR))</div><div class='del'>-		pci_scan_for_parity_error(pbm, pbm-&gt;pci_bus);</div><div class='del'>-</div><div class='del'>-	return IRQ_HANDLED;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* XXX What about PowerFail/PowerManagement??? -DaveM */</div><div class='ctx'> #define PSYCHO_ECC_CTRL		0x0020</div><div class='ctx'> #define  PSYCHO_ECCCTRL_EE	 0x8000000000000000UL /* Enable ECC Checking */</div><div class='hunk'>@@ -719,7 +285,7 @@ static irqreturn_t psycho_pcierr_intr(int irq, void *dev_id)</div><div class='ctx'> #define  PSYCHO_ECCCTRL_CE	 0x2000000000000000UL /* Enable CE INterrupts */</div><div class='ctx'> static void psycho_register_error_handlers(struct pci_pbm_info *pbm)</div><div class='ctx'> {</div><div class='del'>-	struct of_device *op = of_find_device_by_node(pbm-&gt;prom_node);</div><div class='add'>+	struct of_device *op = of_find_device_by_node(pbm-&gt;op-&gt;node);</div><div class='ctx'> 	unsigned long base = pbm-&gt;controller_regs;</div><div class='ctx'> 	u64 tmp;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -762,27 +328,26 @@ static void psycho_register_error_handlers(struct pci_pbm_info *pbm)</div><div class='ctx'> 		       "err=%d\n", pbm-&gt;name, err);</div><div class='ctx'> </div><div class='ctx'> 	/* Enable UE and CE interrupts for controller. */</div><div class='del'>-	psycho_write(base + PSYCHO_ECC_CTRL,</div><div class='del'>-		     (PSYCHO_ECCCTRL_EE |</div><div class='del'>-		      PSYCHO_ECCCTRL_UE |</div><div class='del'>-		      PSYCHO_ECCCTRL_CE));</div><div class='add'>+	upa_writeq((PSYCHO_ECCCTRL_EE |</div><div class='add'>+		    PSYCHO_ECCCTRL_UE |</div><div class='add'>+		    PSYCHO_ECCCTRL_CE), base + PSYCHO_ECC_CTRL);</div><div class='ctx'> </div><div class='ctx'> 	/* Enable PCI Error interrupts and clear error</div><div class='ctx'> 	 * bits for each PBM.</div><div class='ctx'> 	 */</div><div class='del'>-	tmp = psycho_read(base + PSYCHO_PCIA_CTRL);</div><div class='add'>+	tmp = upa_readq(base + PSYCHO_PCIA_CTRL);</div><div class='ctx'> 	tmp |= (PSYCHO_PCICTRL_SERR |</div><div class='ctx'> 		PSYCHO_PCICTRL_SBH_ERR |</div><div class='ctx'> 		PSYCHO_PCICTRL_EEN);</div><div class='ctx'> 	tmp &amp;= ~(PSYCHO_PCICTRL_SBH_INT);</div><div class='del'>-	psycho_write(base + PSYCHO_PCIA_CTRL, tmp);</div><div class='add'>+	upa_writeq(tmp, base + PSYCHO_PCIA_CTRL);</div><div class='ctx'> 		     </div><div class='del'>-	tmp = psycho_read(base + PSYCHO_PCIB_CTRL);</div><div class='add'>+	tmp = upa_readq(base + PSYCHO_PCIB_CTRL);</div><div class='ctx'> 	tmp |= (PSYCHO_PCICTRL_SERR |</div><div class='ctx'> 		PSYCHO_PCICTRL_SBH_ERR |</div><div class='ctx'> 		PSYCHO_PCICTRL_EEN);</div><div class='ctx'> 	tmp &amp;= ~(PSYCHO_PCICTRL_SBH_INT);</div><div class='del'>-	psycho_write(base + PSYCHO_PCIB_CTRL, tmp);</div><div class='add'>+	upa_writeq(tmp, base + PSYCHO_PCIB_CTRL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* PSYCHO boot time probing and initialization. */</div><div class='hunk'>@@ -803,11 +368,12 @@ static void pbm_config_busmastering(struct pci_pbm_info *pbm)</div><div class='ctx'> 	pci_config_write8(addr, 64);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __init psycho_scan_bus(struct pci_pbm_info *pbm)</div><div class='add'>+static void __init psycho_scan_bus(struct pci_pbm_info *pbm,</div><div class='add'>+				   struct device *parent)</div><div class='ctx'> {</div><div class='ctx'> 	pbm_config_busmastering(pbm);</div><div class='ctx'> 	pbm-&gt;is_66mhz_capable = 0;</div><div class='del'>-	pbm-&gt;pci_bus = pci_scan_one_pbm(pbm);</div><div class='add'>+	pbm-&gt;pci_bus = pci_scan_one_pbm(pbm, parent);</div><div class='ctx'> </div><div class='ctx'> 	/* After the PCI bus scan is complete, we can register</div><div class='ctx'> 	 * the error interrupt handlers.</div><div class='hunk'>@@ -815,61 +381,6 @@ static void __init psycho_scan_bus(struct pci_pbm_info *pbm)</div><div class='ctx'> 	psycho_register_error_handlers(pbm);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int psycho_iommu_init(struct pci_pbm_info *pbm)</div><div class='del'>-{</div><div class='del'>-	struct iommu *iommu = pbm-&gt;iommu;</div><div class='del'>-	unsigned long i;</div><div class='del'>-	u64 control;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	/* Register addresses. */</div><div class='del'>-	iommu-&gt;iommu_control  = pbm-&gt;controller_regs + PSYCHO_IOMMU_CONTROL;</div><div class='del'>-	iommu-&gt;iommu_tsbbase  = pbm-&gt;controller_regs + PSYCHO_IOMMU_TSBBASE;</div><div class='del'>-	iommu-&gt;iommu_flush    = pbm-&gt;controller_regs + PSYCHO_IOMMU_FLUSH;</div><div class='del'>-	iommu-&gt;iommu_tags     = iommu-&gt;iommu_flush + (0xa580UL - 0x0210UL);</div><div class='del'>-</div><div class='del'>-	/* PSYCHO's IOMMU lacks ctx flushing. */</div><div class='del'>-	iommu-&gt;iommu_ctxflush = 0;</div><div class='del'>-</div><div class='del'>-	/* We use the main control register of PSYCHO as the write</div><div class='del'>-	 * completion register.</div><div class='del'>-	 */</div><div class='del'>-	iommu-&gt;write_complete_reg = pbm-&gt;controller_regs + PSYCHO_CONTROL;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Invalidate TLB Entries.</div><div class='del'>-	 */</div><div class='del'>-	control = psycho_read(pbm-&gt;controller_regs + PSYCHO_IOMMU_CONTROL);</div><div class='del'>-	control |= PSYCHO_IOMMU_CTRL_DENAB;</div><div class='del'>-	psycho_write(pbm-&gt;controller_regs + PSYCHO_IOMMU_CONTROL, control);</div><div class='del'>-	for(i = 0; i &lt; 16; i++) {</div><div class='del'>-		psycho_write(pbm-&gt;controller_regs + PSYCHO_IOMMU_TAG + (i * 8UL), 0);</div><div class='del'>-		psycho_write(pbm-&gt;controller_regs + PSYCHO_IOMMU_DATA + (i * 8UL), 0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Leave diag mode enabled for full-flushing done</div><div class='del'>-	 * in pci_iommu.c</div><div class='del'>-	 */</div><div class='del'>-	err = iommu_table_init(iommu, IO_TSB_SIZE, 0xc0000000, 0xffffffff,</div><div class='del'>-			       pbm-&gt;numa_node);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	psycho_write(pbm-&gt;controller_regs + PSYCHO_IOMMU_TSBBASE,</div><div class='del'>-		     __pa(iommu-&gt;page_table));</div><div class='del'>-</div><div class='del'>-	control = psycho_read(pbm-&gt;controller_regs + PSYCHO_IOMMU_CONTROL);</div><div class='del'>-	control &amp;= ~(PSYCHO_IOMMU_CTRL_TSBSZ | PSYCHO_IOMMU_CTRL_TBWSZ);</div><div class='del'>-	control |= (PSYCHO_IOMMU_TSBSZ_128K | PSYCHO_IOMMU_CTRL_ENAB);</div><div class='del'>-	psycho_write(pbm-&gt;controller_regs + PSYCHO_IOMMU_CONTROL, control);</div><div class='del'>-</div><div class='del'>-	/* If necessary, hook us up for starfire IRQ translations. */</div><div class='del'>-	if (this_is_starfire)</div><div class='del'>-		starfire_hookup(pbm-&gt;portid);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #define PSYCHO_IRQ_RETRY	0x1a00UL</div><div class='ctx'> #define PSYCHO_PCIA_DIAG	0x2020UL</div><div class='ctx'> #define PSYCHO_PCIB_DIAG	0x4020UL</div><div class='hunk'>@@ -886,28 +397,28 @@ static void psycho_controller_hwinit(struct pci_pbm_info *pbm)</div><div class='ctx'> {</div><div class='ctx'> 	u64 tmp;</div><div class='ctx'> </div><div class='del'>-	psycho_write(pbm-&gt;controller_regs + PSYCHO_IRQ_RETRY, 5);</div><div class='add'>+	upa_writeq(5, pbm-&gt;controller_regs + PSYCHO_IRQ_RETRY);</div><div class='ctx'> </div><div class='ctx'> 	/* Enable arbiter for all PCI slots. */</div><div class='del'>-	tmp = psycho_read(pbm-&gt;controller_regs + PSYCHO_PCIA_CTRL);</div><div class='add'>+	tmp = upa_readq(pbm-&gt;controller_regs + PSYCHO_PCIA_CTRL);</div><div class='ctx'> 	tmp |= PSYCHO_PCICTRL_AEN;</div><div class='del'>-	psycho_write(pbm-&gt;controller_regs + PSYCHO_PCIA_CTRL, tmp);</div><div class='add'>+	upa_writeq(tmp, pbm-&gt;controller_regs + PSYCHO_PCIA_CTRL);</div><div class='ctx'> </div><div class='del'>-	tmp = psycho_read(pbm-&gt;controller_regs + PSYCHO_PCIB_CTRL);</div><div class='add'>+	tmp = upa_readq(pbm-&gt;controller_regs + PSYCHO_PCIB_CTRL);</div><div class='ctx'> 	tmp |= PSYCHO_PCICTRL_AEN;</div><div class='del'>-	psycho_write(pbm-&gt;controller_regs + PSYCHO_PCIB_CTRL, tmp);</div><div class='add'>+	upa_writeq(tmp, pbm-&gt;controller_regs + PSYCHO_PCIB_CTRL);</div><div class='ctx'> </div><div class='ctx'> 	/* Disable DMA write / PIO read synchronization on</div><div class='ctx'> 	 * both PCI bus segments.</div><div class='ctx'> 	 * [ U2P Erratum 1243770, STP2223BGA data sheet ]</div><div class='ctx'> 	 */</div><div class='del'>-	tmp = psycho_read(pbm-&gt;controller_regs + PSYCHO_PCIA_DIAG);</div><div class='add'>+	tmp = upa_readq(pbm-&gt;controller_regs + PSYCHO_PCIA_DIAG);</div><div class='ctx'> 	tmp |= PSYCHO_PCIDIAG_DDWSYNC;</div><div class='del'>-	psycho_write(pbm-&gt;controller_regs + PSYCHO_PCIA_DIAG, tmp);</div><div class='add'>+	upa_writeq(tmp, pbm-&gt;controller_regs + PSYCHO_PCIA_DIAG);</div><div class='ctx'> </div><div class='del'>-	tmp = psycho_read(pbm-&gt;controller_regs + PSYCHO_PCIB_DIAG);</div><div class='add'>+	tmp = upa_readq(pbm-&gt;controller_regs + PSYCHO_PCIB_DIAG);</div><div class='ctx'> 	tmp |= PSYCHO_PCIDIAG_DDWSYNC;</div><div class='del'>-	psycho_write(pbm-&gt;controller_regs + PSYCHO_PCIB_DIAG, tmp);</div><div class='add'>+	upa_writeq(tmp, pbm-&gt;controller_regs + PSYCHO_PCIB_DIAG);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void psycho_pbm_strbuf_init(struct pci_pbm_info *pbm,</div><div class='hunk'>@@ -920,10 +431,16 @@ static void psycho_pbm_strbuf_init(struct pci_pbm_info *pbm,</div><div class='ctx'> 		pbm-&gt;stc.strbuf_control  = base + PSYCHO_STRBUF_CONTROL_A;</div><div class='ctx'> 		pbm-&gt;stc.strbuf_pflush   = base + PSYCHO_STRBUF_FLUSH_A;</div><div class='ctx'> 		pbm-&gt;stc.strbuf_fsync    = base + PSYCHO_STRBUF_FSYNC_A;</div><div class='add'>+		pbm-&gt;stc.strbuf_err_stat = base + PSYCHO_STC_ERR_A;</div><div class='add'>+		pbm-&gt;stc.strbuf_tag_diag = base + PSYCHO_STC_TAG_A;</div><div class='add'>+		pbm-&gt;stc.strbuf_line_diag= base + PSYCHO_STC_LINE_A;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		pbm-&gt;stc.strbuf_control  = base + PSYCHO_STRBUF_CONTROL_B;</div><div class='ctx'> 		pbm-&gt;stc.strbuf_pflush   = base + PSYCHO_STRBUF_FLUSH_B;</div><div class='ctx'> 		pbm-&gt;stc.strbuf_fsync    = base + PSYCHO_STRBUF_FSYNC_B;</div><div class='add'>+		pbm-&gt;stc.strbuf_err_stat = base + PSYCHO_STC_ERR_B;</div><div class='add'>+		pbm-&gt;stc.strbuf_tag_diag = base + PSYCHO_STC_TAG_B;</div><div class='add'>+		pbm-&gt;stc.strbuf_line_diag= base + PSYCHO_STC_LINE_B;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* PSYCHO's streaming buffer lacks ctx flushing. */</div><div class='ctx'> 	pbm-&gt;stc.strbuf_ctxflush      = 0;</div><div class='hunk'>@@ -946,7 +463,7 @@ static void psycho_pbm_strbuf_init(struct pci_pbm_info *pbm,</div><div class='ctx'> 	 */</div><div class='ctx'> #undef PSYCHO_STRBUF_RERUN_ENABLE</div><div class='ctx'> #undef PSYCHO_STRBUF_RERUN_DISABLE</div><div class='del'>-	control = psycho_read(pbm-&gt;stc.strbuf_control);</div><div class='add'>+	control = upa_readq(pbm-&gt;stc.strbuf_control);</div><div class='ctx'> 	control |= PSYCHO_STRBUF_CTRL_ENAB;</div><div class='ctx'> 	control &amp;= ~(PSYCHO_STRBUF_CTRL_LENAB | PSYCHO_STRBUF_CTRL_LPTR);</div><div class='ctx'> #ifdef PSYCHO_STRBUF_RERUN_ENABLE</div><div class='hunk'>@@ -956,7 +473,7 @@ static void psycho_pbm_strbuf_init(struct pci_pbm_info *pbm,</div><div class='ctx'> 	control |= PSYCHO_STRBUF_CTRL_RRDIS;</div><div class='ctx'> #endif</div><div class='ctx'> #endif</div><div class='del'>-	psycho_write(pbm-&gt;stc.strbuf_control, control);</div><div class='add'>+	upa_writeq(control, pbm-&gt;stc.strbuf_control);</div><div class='ctx'> </div><div class='ctx'> 	pbm-&gt;stc.strbuf_enabled = 1;</div><div class='ctx'> }</div><div class='hunk'>@@ -968,111 +485,134 @@ static void psycho_pbm_strbuf_init(struct pci_pbm_info *pbm,</div><div class='ctx'> #define PSYCHO_MEMSPACE_B	0x180000000UL</div><div class='ctx'> #define PSYCHO_MEMSPACE_SIZE	0x07fffffffUL</div><div class='ctx'> </div><div class='del'>-static void __init psycho_pbm_init(struct pci_controller_info *p,</div><div class='del'>-			    struct device_node *dp, int is_pbm_a)</div><div class='add'>+static void __init psycho_pbm_init(struct pci_pbm_info *pbm,</div><div class='add'>+				   struct of_device *op, int is_pbm_a)</div><div class='ctx'> {</div><div class='del'>-	struct property *prop;</div><div class='del'>-	struct pci_pbm_info *pbm;</div><div class='del'>-</div><div class='del'>-	if (is_pbm_a)</div><div class='del'>-		pbm = &amp;p-&gt;pbm_A;</div><div class='del'>-	else</div><div class='del'>-		pbm = &amp;p-&gt;pbm_B;</div><div class='del'>-</div><div class='del'>-	pbm-&gt;next = pci_pbm_root;</div><div class='del'>-	pci_pbm_root = pbm;</div><div class='del'>-</div><div class='del'>-	pbm-&gt;numa_node = -1;</div><div class='del'>-</div><div class='del'>-	pbm-&gt;scan_bus = psycho_scan_bus;</div><div class='del'>-	pbm-&gt;pci_ops = &amp;sun4u_pci_ops;</div><div class='del'>-	pbm-&gt;config_space_reg_bits = 8;</div><div class='del'>-</div><div class='del'>-	pbm-&gt;index = pci_num_pbms++;</div><div class='del'>-</div><div class='del'>-	pbm-&gt;chip_type = PBM_CHIP_TYPE_PSYCHO;</div><div class='del'>-	pbm-&gt;chip_version = 0;</div><div class='del'>-	prop = of_find_property(dp, "version#", NULL);</div><div class='del'>-	if (prop)</div><div class='del'>-		pbm-&gt;chip_version = *(int *) prop-&gt;value;</div><div class='del'>-	pbm-&gt;chip_revision = 0;</div><div class='del'>-	prop = of_find_property(dp, "module-revision#", NULL);</div><div class='del'>-	if (prop)</div><div class='del'>-		pbm-&gt;chip_revision = *(int *) prop-&gt;value;</div><div class='del'>-</div><div class='del'>-	pbm-&gt;parent = p;</div><div class='del'>-	pbm-&gt;prom_node = dp;</div><div class='del'>-	pbm-&gt;name = dp-&gt;full_name;</div><div class='del'>-</div><div class='del'>-	printk("%s: PSYCHO PCI Bus Module ver[%x:%x]\n",</div><div class='del'>-	       pbm-&gt;name,</div><div class='del'>-	       pbm-&gt;chip_version, pbm-&gt;chip_revision);</div><div class='del'>-</div><div class='del'>-	pci_determine_mem_io_space(pbm);</div><div class='add'>+	psycho_pbm_init_common(pbm, op, "PSYCHO", PBM_CHIP_TYPE_PSYCHO);</div><div class='add'>+	psycho_pbm_strbuf_init(pbm, is_pbm_a);</div><div class='add'>+	psycho_scan_bus(pbm, &amp;op-&gt;dev);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	pci_get_pbm_props(pbm);</div><div class='add'>+static struct pci_pbm_info * __devinit psycho_find_sibling(u32 upa_portid)</div><div class='add'>+{</div><div class='add'>+	struct pci_pbm_info *pbm;</div><div class='ctx'> </div><div class='del'>-	psycho_pbm_strbuf_init(pbm, is_pbm_a);</div><div class='add'>+	for (pbm = pci_pbm_root; pbm; pbm = pbm-&gt;next) {</div><div class='add'>+		if (pbm-&gt;portid == upa_portid)</div><div class='add'>+			return pbm;</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define PSYCHO_CONFIGSPACE	0x001000000UL</div><div class='ctx'> </div><div class='del'>-void __init psycho_init(struct device_node *dp, char *model_name)</div><div class='add'>+static int __devinit psycho_probe(struct of_device *op,</div><div class='add'>+				  const struct of_device_id *match)</div><div class='ctx'> {</div><div class='del'>-	struct linux_prom64_registers *pr_regs;</div><div class='del'>-	struct pci_controller_info *p;</div><div class='add'>+	const struct linux_prom64_registers *pr_regs;</div><div class='add'>+	struct device_node *dp = op-&gt;node;</div><div class='ctx'> 	struct pci_pbm_info *pbm;</div><div class='ctx'> 	struct iommu *iommu;</div><div class='del'>-	struct property *prop;</div><div class='add'>+	int is_pbm_a, err;</div><div class='ctx'> 	u32 upa_portid;</div><div class='del'>-	int is_pbm_a;</div><div class='ctx'> </div><div class='del'>-	upa_portid = 0xff;</div><div class='del'>-	prop = of_find_property(dp, "upa-portid", NULL);</div><div class='del'>-	if (prop)</div><div class='del'>-		upa_portid = *(u32 *) prop-&gt;value;</div><div class='add'>+	upa_portid = of_getintprop_default(dp, "upa-portid", 0xff);</div><div class='ctx'> </div><div class='del'>-	for (pbm = pci_pbm_root; pbm; pbm = pbm-&gt;next) {</div><div class='del'>-		struct pci_controller_info *p = pbm-&gt;parent;</div><div class='add'>+	err = -ENOMEM;</div><div class='add'>+	pbm = kzalloc(sizeof(*pbm), GFP_KERNEL);</div><div class='add'>+	if (!pbm) {</div><div class='add'>+		printk(KERN_ERR PFX "Cannot allocate pci_pbm_info.\n");</div><div class='add'>+		goto out_err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		if (p-&gt;pbm_A.portid == upa_portid) {</div><div class='del'>-			is_pbm_a = (p-&gt;pbm_A.prom_node == NULL);</div><div class='del'>-			psycho_pbm_init(p, dp, is_pbm_a);</div><div class='del'>-			return;</div><div class='add'>+	pbm-&gt;sibling = psycho_find_sibling(upa_portid);</div><div class='add'>+	if (pbm-&gt;sibling) {</div><div class='add'>+		iommu = pbm-&gt;sibling-&gt;iommu;</div><div class='add'>+	} else {</div><div class='add'>+		iommu = kzalloc(sizeof(struct iommu), GFP_KERNEL);</div><div class='add'>+		if (!iommu) {</div><div class='add'>+			printk(KERN_ERR PFX "Cannot allocate PBM iommu.\n");</div><div class='add'>+			goto out_free_controller;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	p = kzalloc(sizeof(struct pci_controller_info), GFP_ATOMIC);</div><div class='del'>-	if (!p)</div><div class='del'>-		goto fatal_memory_error;</div><div class='del'>-	iommu = kzalloc(sizeof(struct iommu), GFP_ATOMIC);</div><div class='del'>-	if (!iommu)</div><div class='del'>-		goto fatal_memory_error;</div><div class='add'>+	pbm-&gt;iommu = iommu;</div><div class='add'>+	pbm-&gt;portid = upa_portid;</div><div class='ctx'> </div><div class='del'>-	p-&gt;pbm_A.iommu = p-&gt;pbm_B.iommu = iommu;</div><div class='add'>+	pr_regs = of_get_property(dp, "reg", NULL);</div><div class='add'>+	err = -ENODEV;</div><div class='add'>+	if (!pr_regs) {</div><div class='add'>+		printk(KERN_ERR PFX "No reg property.\n");</div><div class='add'>+		goto out_free_iommu;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	p-&gt;pbm_A.portid = upa_portid;</div><div class='del'>-	p-&gt;pbm_B.portid = upa_portid;</div><div class='add'>+	is_pbm_a = ((pr_regs[0].phys_addr &amp; 0x6000) == 0x2000);</div><div class='ctx'> </div><div class='del'>-	prop = of_find_property(dp, "reg", NULL);</div><div class='del'>-	pr_regs = prop-&gt;value;</div><div class='add'>+	pbm-&gt;controller_regs = pr_regs[2].phys_addr;</div><div class='add'>+	pbm-&gt;config_space = (pr_regs[2].phys_addr + PSYCHO_CONFIGSPACE);</div><div class='ctx'> </div><div class='del'>-	p-&gt;pbm_A.controller_regs = pr_regs[2].phys_addr;</div><div class='del'>-	p-&gt;pbm_B.controller_regs = pr_regs[2].phys_addr;</div><div class='add'>+	if (is_pbm_a) {</div><div class='add'>+		pbm-&gt;pci_afsr = pbm-&gt;controller_regs + PSYCHO_PCI_AFSR_A;</div><div class='add'>+		pbm-&gt;pci_afar = pbm-&gt;controller_regs + PSYCHO_PCI_AFAR_A;</div><div class='add'>+		pbm-&gt;pci_csr  = pbm-&gt;controller_regs + PSYCHO_PCIA_CTRL;</div><div class='add'>+	} else {</div><div class='add'>+		pbm-&gt;pci_afsr = pbm-&gt;controller_regs + PSYCHO_PCI_AFSR_B;</div><div class='add'>+		pbm-&gt;pci_afar = pbm-&gt;controller_regs + PSYCHO_PCI_AFAR_B;</div><div class='add'>+		pbm-&gt;pci_csr  = pbm-&gt;controller_regs + PSYCHO_PCIB_CTRL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	p-&gt;pbm_A.config_space = p-&gt;pbm_B.config_space =</div><div class='del'>-		(pr_regs[2].phys_addr + PSYCHO_CONFIGSPACE);</div><div class='add'>+	psycho_controller_hwinit(pbm);</div><div class='add'>+	if (!pbm-&gt;sibling) {</div><div class='add'>+		err = psycho_iommu_init(pbm, 128, 0xc0000000,</div><div class='add'>+					0xffffffff, PSYCHO_CONTROL);</div><div class='add'>+		if (err)</div><div class='add'>+			goto out_free_iommu;</div><div class='ctx'> </div><div class='del'>-	psycho_controller_hwinit(&amp;p-&gt;pbm_A);</div><div class='add'>+		/* If necessary, hook us up for starfire IRQ translations. */</div><div class='add'>+		if (this_is_starfire)</div><div class='add'>+			starfire_hookup(pbm-&gt;portid);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (psycho_iommu_init(&amp;p-&gt;pbm_A))</div><div class='del'>-		goto fatal_memory_error;</div><div class='add'>+	psycho_pbm_init(pbm, op, is_pbm_a);</div><div class='ctx'> </div><div class='del'>-	is_pbm_a = ((pr_regs[0].phys_addr &amp; 0x6000) == 0x2000);</div><div class='del'>-	psycho_pbm_init(p, dp, is_pbm_a);</div><div class='del'>-	return;</div><div class='add'>+	pbm-&gt;next = pci_pbm_root;</div><div class='add'>+	pci_pbm_root = pbm;</div><div class='add'>+</div><div class='add'>+	if (pbm-&gt;sibling)</div><div class='add'>+		pbm-&gt;sibling-&gt;sibling = pbm;</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(&amp;op-&gt;dev, pbm);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_free_iommu:</div><div class='add'>+	if (!pbm-&gt;sibling)</div><div class='add'>+		kfree(pbm-&gt;iommu);</div><div class='ctx'> </div><div class='del'>-fatal_memory_error:</div><div class='del'>-	prom_printf("PSYCHO: Fatal memory allocation error.\n");</div><div class='del'>-	prom_halt();</div><div class='add'>+out_free_controller:</div><div class='add'>+	kfree(pbm);</div><div class='add'>+</div><div class='add'>+out_err:</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static struct of_device_id __initdata psycho_match[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "pci",</div><div class='add'>+		.compatible = "pci108e,8000",</div><div class='add'>+	},</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct of_platform_driver psycho_driver = {</div><div class='add'>+	.name		= DRIVER_NAME,</div><div class='add'>+	.match_table	= psycho_match,</div><div class='add'>+	.probe		= psycho_probe,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init psycho_init(void)</div><div class='add'>+{</div><div class='add'>+	return of_register_driver(&amp;psycho_driver, &amp;of_bus_type);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+subsys_initcall(psycho_init);</div><div class='head'>diff --git a/arch/sparc64/kernel/pci_sabre.c b/arch/sparc64/kernel/pci_sabre.c<br/>index ade5184e75d1..713257b6963c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/pci_sabre.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc64/kernel/pci_sabre.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/pci_sabre.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/pci_sabre.c</a></div><div class='hunk'>@@ -16,31 +16,15 @@</div><div class='ctx'> #include &lt;asm/apb.h&gt;</div><div class='ctx'> #include &lt;asm/iommu.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/smp.h&gt;</div><div class='del'>-#include &lt;asm/oplib.h&gt;</div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='add'>+#include &lt;asm/upa.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "pci_impl.h"</div><div class='ctx'> #include "iommu_common.h"</div><div class='add'>+#include "psycho_common.h"</div><div class='ctx'> </div><div class='del'>-/* All SABRE registers are 64-bits.  The following accessor</div><div class='del'>- * routines are how they are accessed.  The REG parameter</div><div class='del'>- * is a physical address.</div><div class='del'>- */</div><div class='del'>-#define sabre_read(__reg) \</div><div class='del'>-({	u64 __ret; \</div><div class='del'>-	__asm__ __volatile__("ldxa [%1] %2, %0" \</div><div class='del'>-			     : "=r" (__ret) \</div><div class='del'>-			     : "r" (__reg), "i" (ASI_PHYS_BYPASS_EC_E) \</div><div class='del'>-			     : "memory"); \</div><div class='del'>-	__ret; \</div><div class='del'>-})</div><div class='del'>-#define sabre_write(__reg, __val) \</div><div class='del'>-	__asm__ __volatile__("stxa %0, [%1] %2" \</div><div class='del'>-			     : /* no outputs */ \</div><div class='del'>-			     : "r" (__val), "r" (__reg), \</div><div class='del'>-			       "i" (ASI_PHYS_BYPASS_EC_E) \</div><div class='del'>-			     : "memory")</div><div class='add'>+#define DRIVER_NAME	"sabre"</div><div class='add'>+#define PFX		DRIVER_NAME ": "</div><div class='ctx'> </div><div class='ctx'> /* SABRE PCI controller register offsets and definitions. */</div><div class='ctx'> #define SABRE_UE_AFSR		0x0030UL</div><div class='hunk'>@@ -208,95 +192,6 @@</div><div class='ctx'> static int hummingbird_p;</div><div class='ctx'> static struct pci_bus *sabre_root_bus;</div><div class='ctx'> </div><div class='del'>-/* SABRE error handling support. */</div><div class='del'>-static void sabre_check_iommu_error(struct pci_pbm_info *pbm,</div><div class='del'>-				    unsigned long afsr,</div><div class='del'>-				    unsigned long afar)</div><div class='del'>-{</div><div class='del'>-	struct iommu *iommu = pbm-&gt;iommu;</div><div class='del'>-	unsigned long iommu_tag[16];</div><div class='del'>-	unsigned long iommu_data[16];</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	u64 control;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;iommu-&gt;lock, flags);</div><div class='del'>-	control = sabre_read(iommu-&gt;iommu_control);</div><div class='del'>-	if (control &amp; SABRE_IOMMUCTRL_ERR) {</div><div class='del'>-		char *type_string;</div><div class='del'>-</div><div class='del'>-		/* Clear the error encountered bit.</div><div class='del'>-		 * NOTE: On Sabre this is write 1 to clear,</div><div class='del'>-		 *       which is different from Psycho.</div><div class='del'>-		 */</div><div class='del'>-		sabre_write(iommu-&gt;iommu_control, control);</div><div class='del'>-		switch((control &amp; SABRE_IOMMUCTRL_ERRSTS) &gt;&gt; 25UL) {</div><div class='del'>-		case 1:</div><div class='del'>-			type_string = "Invalid Error";</div><div class='del'>-			break;</div><div class='del'>-		case 3:</div><div class='del'>-			type_string = "ECC Error";</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			type_string = "Unknown";</div><div class='del'>-			break;</div><div class='del'>-		};</div><div class='del'>-		printk("%s: IOMMU Error, type[%s]\n",</div><div class='del'>-		       pbm-&gt;name, type_string);</div><div class='del'>-</div><div class='del'>-		/* Enter diagnostic mode and probe for error'd</div><div class='del'>-		 * entries in the IOTLB.</div><div class='del'>-		 */</div><div class='del'>-		control &amp;= ~(SABRE_IOMMUCTRL_ERRSTS | SABRE_IOMMUCTRL_ERR);</div><div class='del'>-		sabre_write(iommu-&gt;iommu_control,</div><div class='del'>-			    (control | SABRE_IOMMUCTRL_DENAB));</div><div class='del'>-		for (i = 0; i &lt; 16; i++) {</div><div class='del'>-			unsigned long base = pbm-&gt;controller_regs;</div><div class='del'>-</div><div class='del'>-			iommu_tag[i] =</div><div class='del'>-				sabre_read(base + SABRE_IOMMU_TAG + (i * 8UL));</div><div class='del'>-			iommu_data[i] =</div><div class='del'>-				sabre_read(base + SABRE_IOMMU_DATA + (i * 8UL));</div><div class='del'>-			sabre_write(base + SABRE_IOMMU_TAG + (i * 8UL), 0);</div><div class='del'>-			sabre_write(base + SABRE_IOMMU_DATA + (i * 8UL), 0);</div><div class='del'>-		}</div><div class='del'>-		sabre_write(iommu-&gt;iommu_control, control);</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; 16; i++) {</div><div class='del'>-			unsigned long tag, data;</div><div class='del'>-</div><div class='del'>-			tag = iommu_tag[i];</div><div class='del'>-			if (!(tag &amp; SABRE_IOMMUTAG_ERR))</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			data = iommu_data[i];</div><div class='del'>-			switch((tag &amp; SABRE_IOMMUTAG_ERRSTS) &gt;&gt; 23UL) {</div><div class='del'>-			case 1:</div><div class='del'>-				type_string = "Invalid Error";</div><div class='del'>-				break;</div><div class='del'>-			case 3:</div><div class='del'>-				type_string = "ECC Error";</div><div class='del'>-				break;</div><div class='del'>-			default:</div><div class='del'>-				type_string = "Unknown";</div><div class='del'>-				break;</div><div class='del'>-			};</div><div class='del'>-			printk("%s: IOMMU TAG(%d)[RAW(%016lx)error(%s)wr(%d)sz(%dK)vpg(%08lx)]\n",</div><div class='del'>-			       pbm-&gt;name, i, tag, type_string,</div><div class='del'>-			       ((tag &amp; SABRE_IOMMUTAG_WRITE) ? 1 : 0),</div><div class='del'>-			       ((tag &amp; SABRE_IOMMUTAG_SIZE) ? 64 : 8),</div><div class='del'>-			       ((tag &amp; SABRE_IOMMUTAG_VPN) &lt;&lt; IOMMU_PAGE_SHIFT));</div><div class='del'>-			printk("%s: IOMMU DATA(%d)[RAW(%016lx)valid(%d)used(%d)cache(%d)ppg(%016lx)\n",</div><div class='del'>-			       pbm-&gt;name, i, data,</div><div class='del'>-			       ((data &amp; SABRE_IOMMUDATA_VALID) ? 1 : 0),</div><div class='del'>-			       ((data &amp; SABRE_IOMMUDATA_USED) ? 1 : 0),</div><div class='del'>-			       ((data &amp; SABRE_IOMMUDATA_CACHE) ? 1 : 0),</div><div class='del'>-			       ((data &amp; SABRE_IOMMUDATA_PPN) &lt;&lt; IOMMU_PAGE_SHIFT));</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;iommu-&gt;lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static irqreturn_t sabre_ue_intr(int irq, void *dev_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_pbm_info *pbm = dev_id;</div><div class='hunk'>@@ -306,8 +201,8 @@ static irqreturn_t sabre_ue_intr(int irq, void *dev_id)</div><div class='ctx'> 	int reported;</div><div class='ctx'> </div><div class='ctx'> 	/* Latch uncorrectable error status. */</div><div class='del'>-	afar = sabre_read(afar_reg);</div><div class='del'>-	afsr = sabre_read(afsr_reg);</div><div class='add'>+	afar = upa_readq(afar_reg);</div><div class='add'>+	afsr = upa_readq(afsr_reg);</div><div class='ctx'> </div><div class='ctx'> 	/* Clear the primary/secondary error status bits. */</div><div class='ctx'> 	error_bits = afsr &amp;</div><div class='hunk'>@@ -316,7 +211,7 @@ static irqreturn_t sabre_ue_intr(int irq, void *dev_id)</div><div class='ctx'> 		 SABRE_UEAFSR_SDTE | SABRE_UEAFSR_PDTE);</div><div class='ctx'> 	if (!error_bits)</div><div class='ctx'> 		return IRQ_NONE;</div><div class='del'>-	sabre_write(afsr_reg, error_bits);</div><div class='add'>+	upa_writeq(error_bits, afsr_reg);</div><div class='ctx'> </div><div class='ctx'> 	/* Log the error. */</div><div class='ctx'> 	printk("%s: Uncorrectable Error, primary error type[%s%s]\n",</div><div class='hunk'>@@ -352,7 +247,7 @@ static irqreturn_t sabre_ue_intr(int irq, void *dev_id)</div><div class='ctx'> 	printk("]\n");</div><div class='ctx'> </div><div class='ctx'> 	/* Interrogate IOMMU for error status. */</div><div class='del'>-	sabre_check_iommu_error(pbm, afsr, afar);</div><div class='add'>+	psycho_check_iommu_error(pbm, afsr, afar, UE_ERR);</div><div class='ctx'> </div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='hunk'>@@ -366,8 +261,8 @@ static irqreturn_t sabre_ce_intr(int irq, void *dev_id)</div><div class='ctx'> 	int reported;</div><div class='ctx'> </div><div class='ctx'> 	/* Latch error status. */</div><div class='del'>-	afar = sabre_read(afar_reg);</div><div class='del'>-	afsr = sabre_read(afsr_reg);</div><div class='add'>+	afar = upa_readq(afar_reg);</div><div class='add'>+	afsr = upa_readq(afsr_reg);</div><div class='ctx'> </div><div class='ctx'> 	/* Clear primary/secondary error status bits. */</div><div class='ctx'> 	error_bits = afsr &amp;</div><div class='hunk'>@@ -375,7 +270,7 @@ static irqreturn_t sabre_ce_intr(int irq, void *dev_id)</div><div class='ctx'> 		 SABRE_CEAFSR_SDRD | SABRE_CEAFSR_SDWR);</div><div class='ctx'> 	if (!error_bits)</div><div class='ctx'> 		return IRQ_NONE;</div><div class='del'>-	sabre_write(afsr_reg, error_bits);</div><div class='add'>+	upa_writeq(error_bits, afsr_reg);</div><div class='ctx'> </div><div class='ctx'> 	/* Log the error. */</div><div class='ctx'> 	printk("%s: Correctable Error, primary error type[%s]\n",</div><div class='hunk'>@@ -413,136 +308,9 @@ static irqreturn_t sabre_ce_intr(int irq, void *dev_id)</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static irqreturn_t sabre_pcierr_intr_other(struct pci_pbm_info *pbm)</div><div class='del'>-{</div><div class='del'>-	unsigned long csr_reg, csr, csr_error_bits;</div><div class='del'>-	irqreturn_t ret = IRQ_NONE;</div><div class='del'>-	u16 stat;</div><div class='del'>-</div><div class='del'>-	csr_reg = pbm-&gt;controller_regs + SABRE_PCICTRL;</div><div class='del'>-	csr = sabre_read(csr_reg);</div><div class='del'>-	csr_error_bits =</div><div class='del'>-		csr &amp; SABRE_PCICTRL_SERR;</div><div class='del'>-	if (csr_error_bits) {</div><div class='del'>-		/* Clear the errors.  */</div><div class='del'>-		sabre_write(csr_reg, csr);</div><div class='del'>-</div><div class='del'>-		/* Log 'em.  */</div><div class='del'>-		if (csr_error_bits &amp; SABRE_PCICTRL_SERR)</div><div class='del'>-			printk("%s: PCI SERR signal asserted.\n",</div><div class='del'>-			       pbm-&gt;name);</div><div class='del'>-		ret = IRQ_HANDLED;</div><div class='del'>-	}</div><div class='del'>-	pci_bus_read_config_word(sabre_root_bus, 0,</div><div class='del'>-				 PCI_STATUS, &amp;stat);</div><div class='del'>-	if (stat &amp; (PCI_STATUS_PARITY |</div><div class='del'>-		    PCI_STATUS_SIG_TARGET_ABORT |</div><div class='del'>-		    PCI_STATUS_REC_TARGET_ABORT |</div><div class='del'>-		    PCI_STATUS_REC_MASTER_ABORT |</div><div class='del'>-		    PCI_STATUS_SIG_SYSTEM_ERROR)) {</div><div class='del'>-		printk("%s: PCI bus error, PCI_STATUS[%04x]\n",</div><div class='del'>-		       pbm-&gt;name, stat);</div><div class='del'>-		pci_bus_write_config_word(sabre_root_bus, 0,</div><div class='del'>-					  PCI_STATUS, 0xffff);</div><div class='del'>-		ret = IRQ_HANDLED;</div><div class='del'>-	}</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static irqreturn_t sabre_pcierr_intr(int irq, void *dev_id)</div><div class='del'>-{</div><div class='del'>-	struct pci_pbm_info *pbm = dev_id;</div><div class='del'>-	unsigned long afsr_reg, afar_reg;</div><div class='del'>-	unsigned long afsr, afar, error_bits;</div><div class='del'>-	int reported;</div><div class='del'>-</div><div class='del'>-	afsr_reg = pbm-&gt;controller_regs + SABRE_PIOAFSR;</div><div class='del'>-	afar_reg = pbm-&gt;controller_regs + SABRE_PIOAFAR;</div><div class='del'>-</div><div class='del'>-	/* Latch error status. */</div><div class='del'>-	afar = sabre_read(afar_reg);</div><div class='del'>-	afsr = sabre_read(afsr_reg);</div><div class='del'>-</div><div class='del'>-	/* Clear primary/secondary error status bits. */</div><div class='del'>-	error_bits = afsr &amp;</div><div class='del'>-		(SABRE_PIOAFSR_PMA | SABRE_PIOAFSR_PTA |</div><div class='del'>-		 SABRE_PIOAFSR_PRTRY | SABRE_PIOAFSR_PPERR |</div><div class='del'>-		 SABRE_PIOAFSR_SMA | SABRE_PIOAFSR_STA |</div><div class='del'>-		 SABRE_PIOAFSR_SRTRY | SABRE_PIOAFSR_SPERR);</div><div class='del'>-	if (!error_bits)</div><div class='del'>-		return sabre_pcierr_intr_other(pbm);</div><div class='del'>-	sabre_write(afsr_reg, error_bits);</div><div class='del'>-</div><div class='del'>-	/* Log the error. */</div><div class='del'>-	printk("%s: PCI Error, primary error type[%s]\n",</div><div class='del'>-	       pbm-&gt;name,</div><div class='del'>-	       (((error_bits &amp; SABRE_PIOAFSR_PMA) ?</div><div class='del'>-		 "Master Abort" :</div><div class='del'>-		 ((error_bits &amp; SABRE_PIOAFSR_PTA) ?</div><div class='del'>-		  "Target Abort" :</div><div class='del'>-		  ((error_bits &amp; SABRE_PIOAFSR_PRTRY) ?</div><div class='del'>-		   "Excessive Retries" :</div><div class='del'>-		   ((error_bits &amp; SABRE_PIOAFSR_PPERR) ?</div><div class='del'>-		    "Parity Error" : "???"))))));</div><div class='del'>-	printk("%s: bytemask[%04lx] was_block(%d)\n",</div><div class='del'>-	       pbm-&gt;name,</div><div class='del'>-	       (afsr &amp; SABRE_PIOAFSR_BMSK) &gt;&gt; 32UL,</div><div class='del'>-	       (afsr &amp; SABRE_PIOAFSR_BLK) ? 1 : 0);</div><div class='del'>-	printk("%s: PCI AFAR [%016lx]\n", pbm-&gt;name, afar);</div><div class='del'>-	printk("%s: PCI Secondary errors [", pbm-&gt;name);</div><div class='del'>-	reported = 0;</div><div class='del'>-	if (afsr &amp; SABRE_PIOAFSR_SMA) {</div><div class='del'>-		reported++;</div><div class='del'>-		printk("(Master Abort)");</div><div class='del'>-	}</div><div class='del'>-	if (afsr &amp; SABRE_PIOAFSR_STA) {</div><div class='del'>-		reported++;</div><div class='del'>-		printk("(Target Abort)");</div><div class='del'>-	}</div><div class='del'>-	if (afsr &amp; SABRE_PIOAFSR_SRTRY) {</div><div class='del'>-		reported++;</div><div class='del'>-		printk("(Excessive Retries)");</div><div class='del'>-	}</div><div class='del'>-	if (afsr &amp; SABRE_PIOAFSR_SPERR) {</div><div class='del'>-		reported++;</div><div class='del'>-		printk("(Parity Error)");</div><div class='del'>-	}</div><div class='del'>-	if (!reported)</div><div class='del'>-		printk("(none)");</div><div class='del'>-	printk("]\n");</div><div class='del'>-</div><div class='del'>-	/* For the error types shown, scan both PCI buses for devices</div><div class='del'>-	 * which have logged that error type.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/* If we see a Target Abort, this could be the result of an</div><div class='del'>-	 * IOMMU translation error of some sort.  It is extremely</div><div class='del'>-	 * useful to log this information as usually it indicates</div><div class='del'>-	 * a bug in the IOMMU support code or a PCI device driver.</div><div class='del'>-	 */</div><div class='del'>-	if (error_bits &amp; (SABRE_PIOAFSR_PTA | SABRE_PIOAFSR_STA)) {</div><div class='del'>-		sabre_check_iommu_error(pbm, afsr, afar);</div><div class='del'>-		pci_scan_for_target_abort(pbm, pbm-&gt;pci_bus);</div><div class='del'>-	}</div><div class='del'>-	if (error_bits &amp; (SABRE_PIOAFSR_PMA | SABRE_PIOAFSR_SMA))</div><div class='del'>-		pci_scan_for_master_abort(pbm, pbm-&gt;pci_bus);</div><div class='del'>-</div><div class='del'>-	/* For excessive retries, SABRE/PBM will abort the device</div><div class='del'>-	 * and there is no way to specifically check for excessive</div><div class='del'>-	 * retries in the config space status registers.  So what</div><div class='del'>-	 * we hope is that we'll catch it via the master/target</div><div class='del'>-	 * abort events.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (error_bits &amp; (SABRE_PIOAFSR_PPERR | SABRE_PIOAFSR_SPERR))</div><div class='del'>-		pci_scan_for_parity_error(pbm, pbm-&gt;pci_bus);</div><div class='del'>-</div><div class='del'>-	return IRQ_HANDLED;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void sabre_register_error_handlers(struct pci_pbm_info *pbm)</div><div class='ctx'> {</div><div class='del'>-	struct device_node *dp = pbm-&gt;prom_node;</div><div class='add'>+	struct device_node *dp = pbm-&gt;op-&gt;node;</div><div class='ctx'> 	struct of_device *op;</div><div class='ctx'> 	unsigned long base = pbm-&gt;controller_regs;</div><div class='ctx'> 	u64 tmp;</div><div class='hunk'>@@ -568,33 +336,34 @@ static void sabre_register_error_handlers(struct pci_pbm_info *pbm)</div><div class='ctx'> 	 * registering the handler so that we don't get spurious</div><div class='ctx'> 	 * interrupts.</div><div class='ctx'> 	 */</div><div class='del'>-	sabre_write(base + SABRE_UE_AFSR,</div><div class='del'>-		    (SABRE_UEAFSR_PDRD | SABRE_UEAFSR_PDWR |</div><div class='del'>-		     SABRE_UEAFSR_SDRD | SABRE_UEAFSR_SDWR |</div><div class='del'>-		     SABRE_UEAFSR_SDTE | SABRE_UEAFSR_PDTE));</div><div class='add'>+	upa_writeq((SABRE_UEAFSR_PDRD | SABRE_UEAFSR_PDWR |</div><div class='add'>+		    SABRE_UEAFSR_SDRD | SABRE_UEAFSR_SDWR |</div><div class='add'>+		    SABRE_UEAFSR_SDTE | SABRE_UEAFSR_PDTE),</div><div class='add'>+		   base + SABRE_UE_AFSR);</div><div class='ctx'> </div><div class='ctx'> 	err = request_irq(op-&gt;irqs[1], sabre_ue_intr, 0, "SABRE_UE", pbm);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		printk(KERN_WARNING "%s: Couldn't register UE, err=%d.\n",</div><div class='ctx'> 		       pbm-&gt;name, err);</div><div class='ctx'> </div><div class='del'>-	sabre_write(base + SABRE_CE_AFSR,</div><div class='del'>-		    (SABRE_CEAFSR_PDRD | SABRE_CEAFSR_PDWR |</div><div class='del'>-		     SABRE_CEAFSR_SDRD | SABRE_CEAFSR_SDWR));</div><div class='add'>+	upa_writeq((SABRE_CEAFSR_PDRD | SABRE_CEAFSR_PDWR |</div><div class='add'>+		    SABRE_CEAFSR_SDRD | SABRE_CEAFSR_SDWR),</div><div class='add'>+		   base + SABRE_CE_AFSR);</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> 	err = request_irq(op-&gt;irqs[2], sabre_ce_intr, 0, "SABRE_CE", pbm);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		printk(KERN_WARNING "%s: Couldn't register CE, err=%d.\n",</div><div class='ctx'> 		       pbm-&gt;name, err);</div><div class='del'>-	err = request_irq(op-&gt;irqs[0], sabre_pcierr_intr, 0,</div><div class='add'>+	err = request_irq(op-&gt;irqs[0], psycho_pcierr_intr, 0,</div><div class='ctx'> 			  "SABRE_PCIERR", pbm);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		printk(KERN_WARNING "%s: Couldn't register PCIERR, err=%d.\n",</div><div class='ctx'> 		       pbm-&gt;name, err);</div><div class='ctx'> </div><div class='del'>-	tmp = sabre_read(base + SABRE_PCICTRL);</div><div class='add'>+	tmp = upa_readq(base + SABRE_PCICTRL);</div><div class='ctx'> 	tmp |= SABRE_PCICTRL_ERREN;</div><div class='del'>-	sabre_write(base + SABRE_PCICTRL, tmp);</div><div class='add'>+	upa_writeq(tmp, base + SABRE_PCICTRL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void apb_init(struct pci_bus *sabre_bus)</div><div class='hunk'>@@ -633,7 +402,8 @@ static void apb_init(struct pci_bus *sabre_bus)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __init sabre_scan_bus(struct pci_pbm_info *pbm)</div><div class='add'>+static void __init sabre_scan_bus(struct pci_pbm_info *pbm,</div><div class='add'>+				  struct device *parent)</div><div class='ctx'> {</div><div class='ctx'> 	static int once;</div><div class='ctx'> </div><div class='hunk'>@@ -656,12 +426,12 @@ static void __init sabre_scan_bus(struct pci_pbm_info *pbm)</div><div class='ctx'> 	 * to live at bus 0.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (once != 0) {</div><div class='del'>-		prom_printf("SABRE: Multiple controllers unsupported.\n");</div><div class='del'>-		prom_halt();</div><div class='add'>+		printk(KERN_ERR PFX "Multiple controllers unsupported.\n");</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	once++;</div><div class='ctx'> </div><div class='del'>-	pbm-&gt;pci_bus = pci_scan_one_pbm(pbm);</div><div class='add'>+	pbm-&gt;pci_bus = pci_scan_one_pbm(pbm, parent);</div><div class='ctx'> 	if (!pbm-&gt;pci_bus)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -672,133 +442,58 @@ static void __init sabre_scan_bus(struct pci_pbm_info *pbm)</div><div class='ctx'> 	sabre_register_error_handlers(pbm);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int sabre_iommu_init(struct pci_pbm_info *pbm,</div><div class='del'>-			    int tsbsize, unsigned long dvma_offset,</div><div class='del'>-			    u32 dma_mask)</div><div class='del'>-{</div><div class='del'>-	struct iommu *iommu = pbm-&gt;iommu;</div><div class='del'>-	unsigned long i;</div><div class='del'>-	u64 control;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	/* Register addresses. */</div><div class='del'>-	iommu-&gt;iommu_control  = pbm-&gt;controller_regs + SABRE_IOMMU_CONTROL;</div><div class='del'>-	iommu-&gt;iommu_tsbbase  = pbm-&gt;controller_regs + SABRE_IOMMU_TSBBASE;</div><div class='del'>-	iommu-&gt;iommu_flush    = pbm-&gt;controller_regs + SABRE_IOMMU_FLUSH;</div><div class='del'>-	iommu-&gt;iommu_tags     = iommu-&gt;iommu_flush + (0xa580UL - 0x0210UL);</div><div class='del'>-	iommu-&gt;write_complete_reg = pbm-&gt;controller_regs + SABRE_WRSYNC;</div><div class='del'>-	/* Sabre's IOMMU lacks ctx flushing. */</div><div class='del'>-	iommu-&gt;iommu_ctxflush = 0;</div><div class='del'>-                                        </div><div class='del'>-	/* Invalidate TLB Entries. */</div><div class='del'>-	control = sabre_read(pbm-&gt;controller_regs + SABRE_IOMMU_CONTROL);</div><div class='del'>-	control |= SABRE_IOMMUCTRL_DENAB;</div><div class='del'>-	sabre_write(pbm-&gt;controller_regs + SABRE_IOMMU_CONTROL, control);</div><div class='del'>-</div><div class='del'>-	for(i = 0; i &lt; 16; i++) {</div><div class='del'>-		sabre_write(pbm-&gt;controller_regs + SABRE_IOMMU_TAG + (i * 8UL), 0);</div><div class='del'>-		sabre_write(pbm-&gt;controller_regs + SABRE_IOMMU_DATA + (i * 8UL), 0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Leave diag mode enabled for full-flushing done</div><div class='del'>-	 * in pci_iommu.c</div><div class='del'>-	 */</div><div class='del'>-	err = iommu_table_init(iommu, tsbsize * 1024 * 8,</div><div class='del'>-			       dvma_offset, dma_mask, pbm-&gt;numa_node);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	sabre_write(pbm-&gt;controller_regs + SABRE_IOMMU_TSBBASE,</div><div class='del'>-		    __pa(iommu-&gt;page_table));</div><div class='del'>-</div><div class='del'>-	control = sabre_read(pbm-&gt;controller_regs + SABRE_IOMMU_CONTROL);</div><div class='del'>-	control &amp;= ~(SABRE_IOMMUCTRL_TSBSZ | SABRE_IOMMUCTRL_TBWSZ);</div><div class='del'>-	control |= SABRE_IOMMUCTRL_ENAB;</div><div class='del'>-	switch(tsbsize) {</div><div class='del'>-	case 64:</div><div class='del'>-		control |= SABRE_IOMMU_TSBSZ_64K;</div><div class='del'>-		break;</div><div class='del'>-	case 128:</div><div class='del'>-		control |= SABRE_IOMMU_TSBSZ_128K;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		prom_printf("iommu_init: Illegal TSB size %d\n", tsbsize);</div><div class='del'>-		prom_halt();</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	sabre_write(pbm-&gt;controller_regs + SABRE_IOMMU_CONTROL, control);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __init sabre_pbm_init(struct pci_controller_info *p,</div><div class='del'>-				  struct pci_pbm_info *pbm, struct device_node *dp)</div><div class='add'>+static void __init sabre_pbm_init(struct pci_pbm_info *pbm,</div><div class='add'>+				  struct of_device *op)</div><div class='ctx'> {</div><div class='del'>-	pbm-&gt;name = dp-&gt;full_name;</div><div class='del'>-	printk("%s: SABRE PCI Bus Module\n", pbm-&gt;name);</div><div class='del'>-</div><div class='del'>-	pbm-&gt;numa_node = -1;</div><div class='del'>-</div><div class='del'>-	pbm-&gt;scan_bus = sabre_scan_bus;</div><div class='del'>-	pbm-&gt;pci_ops = &amp;sun4u_pci_ops;</div><div class='del'>-	pbm-&gt;config_space_reg_bits = 8;</div><div class='del'>-</div><div class='del'>-	pbm-&gt;index = pci_num_pbms++;</div><div class='del'>-</div><div class='del'>-	pbm-&gt;chip_type = PBM_CHIP_TYPE_SABRE;</div><div class='del'>-	pbm-&gt;parent = p;</div><div class='del'>-	pbm-&gt;prom_node = dp;</div><div class='del'>-	pci_get_pbm_props(pbm);</div><div class='del'>-</div><div class='del'>-	pci_determine_mem_io_space(pbm);</div><div class='add'>+	psycho_pbm_init_common(pbm, op, "SABRE", PBM_CHIP_TYPE_SABRE);</div><div class='add'>+	pbm-&gt;pci_afsr = pbm-&gt;controller_regs + SABRE_PIOAFSR;</div><div class='add'>+	pbm-&gt;pci_afar = pbm-&gt;controller_regs + SABRE_PIOAFAR;</div><div class='add'>+	pbm-&gt;pci_csr = pbm-&gt;controller_regs + SABRE_PCICTRL;</div><div class='add'>+	sabre_scan_bus(pbm, &amp;op-&gt;dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init sabre_init(struct device_node *dp, char *model_name)</div><div class='add'>+static int __devinit sabre_probe(struct of_device *op,</div><div class='add'>+				 const struct of_device_id *match)</div><div class='ctx'> {</div><div class='ctx'> 	const struct linux_prom64_registers *pr_regs;</div><div class='del'>-	struct pci_controller_info *p;</div><div class='add'>+	struct device_node *dp = op-&gt;node;</div><div class='ctx'> 	struct pci_pbm_info *pbm;</div><div class='add'>+	u32 upa_portid, dma_mask;</div><div class='ctx'> 	struct iommu *iommu;</div><div class='del'>-	int tsbsize;</div><div class='add'>+	int tsbsize, err;</div><div class='ctx'> 	const u32 *vdma;</div><div class='del'>-	u32 upa_portid, dma_mask;</div><div class='ctx'> 	u64 clear_irq;</div><div class='ctx'> </div><div class='del'>-	hummingbird_p = 0;</div><div class='del'>-	if (!strcmp(model_name, "pci108e,a001"))</div><div class='del'>-		hummingbird_p = 1;</div><div class='del'>-	else if (!strcmp(model_name, "SUNW,sabre")) {</div><div class='del'>-		const char *compat = of_get_property(dp, "compatible", NULL);</div><div class='del'>-		if (compat &amp;&amp; !strcmp(compat, "pci108e,a001"))</div><div class='del'>-			hummingbird_p = 1;</div><div class='del'>-		if (!hummingbird_p) {</div><div class='del'>-			struct device_node *dp;</div><div class='del'>-</div><div class='del'>-			/* Of course, Sun has to encode things a thousand</div><div class='del'>-			 * different ways, inconsistently.</div><div class='del'>-			 */</div><div class='del'>-			for_each_node_by_type(dp, "cpu") {</div><div class='del'>-				if (!strcmp(dp-&gt;name, "SUNW,UltraSPARC-IIe"))</div><div class='del'>-					hummingbird_p = 1;</div><div class='del'>-			}</div><div class='add'>+	hummingbird_p = (match-&gt;data != NULL);</div><div class='add'>+	if (!hummingbird_p) {</div><div class='add'>+		struct device_node *cpu_dp;</div><div class='add'>+</div><div class='add'>+		/* Of course, Sun has to encode things a thousand</div><div class='add'>+		 * different ways, inconsistently.</div><div class='add'>+		 */</div><div class='add'>+		for_each_node_by_type(cpu_dp, "cpu") {</div><div class='add'>+			if (!strcmp(cpu_dp-&gt;name, "SUNW,UltraSPARC-IIe"))</div><div class='add'>+				hummingbird_p = 1;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	p = kzalloc(sizeof(*p), GFP_ATOMIC);</div><div class='del'>-	if (!p)</div><div class='del'>-		goto fatal_memory_error;</div><div class='add'>+	err = -ENOMEM;</div><div class='add'>+	pbm = kzalloc(sizeof(*pbm), GFP_KERNEL);</div><div class='add'>+	if (!pbm) {</div><div class='add'>+		printk(KERN_ERR PFX "Cannot allocate pci_pbm_info.\n");</div><div class='add'>+		goto out_err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iommu = kzalloc(sizeof(*iommu), GFP_KERNEL);</div><div class='add'>+	if (!iommu) {</div><div class='add'>+		printk(KERN_ERR PFX "Cannot allocate PBM iommu.\n");</div><div class='add'>+		goto out_free_controller;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	iommu = kzalloc(sizeof(*iommu), GFP_ATOMIC);</div><div class='del'>-	if (!iommu)</div><div class='del'>-		goto fatal_memory_error;</div><div class='del'>-	pbm = &amp;p-&gt;pbm_A;</div><div class='ctx'> 	pbm-&gt;iommu = iommu;</div><div class='ctx'> </div><div class='ctx'> 	upa_portid = of_getintprop_default(dp, "upa-portid", 0xff);</div><div class='ctx'> </div><div class='del'>-	pbm-&gt;next = pci_pbm_root;</div><div class='del'>-	pci_pbm_root = pbm;</div><div class='del'>-</div><div class='ctx'> 	pbm-&gt;portid = upa_portid;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -806,6 +501,11 @@ void __init sabre_init(struct device_node *dp, char *model_name)</div><div class='ctx'> 	 */</div><div class='ctx'> 	</div><div class='ctx'> 	pr_regs = of_get_property(dp, "reg", NULL);</div><div class='add'>+	err = -ENODEV;</div><div class='add'>+	if (!pr_regs) {</div><div class='add'>+		printk(KERN_ERR PFX "No reg property\n");</div><div class='add'>+		goto out_free_iommu;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * First REG in property is base of entire SABRE register space.</div><div class='hunk'>@@ -816,22 +516,25 @@ void __init sabre_init(struct device_node *dp, char *model_name)</div><div class='ctx'> </div><div class='ctx'> 	/* PCI first */</div><div class='ctx'> 	for (clear_irq = SABRE_ICLR_A_SLOT0; clear_irq &lt; SABRE_ICLR_B_SLOT0 + 0x80; clear_irq += 8)</div><div class='del'>-		sabre_write(pbm-&gt;controller_regs + clear_irq, 0x0UL);</div><div class='add'>+		upa_writeq(0x0UL, pbm-&gt;controller_regs + clear_irq);</div><div class='ctx'> </div><div class='ctx'> 	/* Then OBIO */</div><div class='ctx'> 	for (clear_irq = SABRE_ICLR_SCSI; clear_irq &lt; SABRE_ICLR_SCSI + 0x80; clear_irq += 8)</div><div class='del'>-		sabre_write(pbm-&gt;controller_regs + clear_irq, 0x0UL);</div><div class='add'>+		upa_writeq(0x0UL, pbm-&gt;controller_regs + clear_irq);</div><div class='ctx'> </div><div class='ctx'> 	/* Error interrupts are enabled later after the bus scan. */</div><div class='del'>-	sabre_write(pbm-&gt;controller_regs + SABRE_PCICTRL,</div><div class='del'>-		    (SABRE_PCICTRL_MRLEN   | SABRE_PCICTRL_SERR |</div><div class='del'>-		     SABRE_PCICTRL_ARBPARK | SABRE_PCICTRL_AEN));</div><div class='add'>+	upa_writeq((SABRE_PCICTRL_MRLEN   | SABRE_PCICTRL_SERR |</div><div class='add'>+		    SABRE_PCICTRL_ARBPARK | SABRE_PCICTRL_AEN),</div><div class='add'>+		   pbm-&gt;controller_regs + SABRE_PCICTRL);</div><div class='ctx'> </div><div class='ctx'> 	/* Now map in PCI config space for entire SABRE. */</div><div class='del'>-	pbm-&gt;config_space =</div><div class='del'>-		(pbm-&gt;controller_regs + SABRE_CONFIGSPACE);</div><div class='add'>+	pbm-&gt;config_space = pbm-&gt;controller_regs + SABRE_CONFIGSPACE;</div><div class='ctx'> </div><div class='ctx'> 	vdma = of_get_property(dp, "virtual-dma", NULL);</div><div class='add'>+	if (!vdma) {</div><div class='add'>+		printk(KERN_ERR PFX "No virtual-dma property\n");</div><div class='add'>+		goto out_free_iommu;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	dma_mask = vdma[0];</div><div class='ctx'> 	switch(vdma[1]) {</div><div class='hunk'>@@ -849,20 +552,58 @@ void __init sabre_init(struct device_node *dp, char *model_name)</div><div class='ctx'> 			tsbsize = 128;</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='del'>-			prom_printf("SABRE: strange virtual-dma size.\n");</div><div class='del'>-			prom_halt();</div><div class='add'>+			printk(KERN_ERR PFX "Strange virtual-dma size.\n");</div><div class='add'>+			goto out_free_iommu;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (sabre_iommu_init(pbm, tsbsize, vdma[0], dma_mask))</div><div class='del'>-		goto fatal_memory_error;</div><div class='add'>+	err = psycho_iommu_init(pbm, tsbsize, vdma[0], dma_mask, SABRE_WRSYNC);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_free_iommu;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Look for APB underneath.</div><div class='ctx'> 	 */</div><div class='del'>-	sabre_pbm_init(p, pbm, dp);</div><div class='del'>-	return;</div><div class='add'>+	sabre_pbm_init(pbm, op);</div><div class='ctx'> </div><div class='del'>-fatal_memory_error:</div><div class='del'>-	prom_printf("SABRE: Fatal memory allocation error.\n");</div><div class='del'>-	prom_halt();</div><div class='add'>+	pbm-&gt;next = pci_pbm_root;</div><div class='add'>+	pci_pbm_root = pbm;</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(&amp;op-&gt;dev, pbm);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_free_iommu:</div><div class='add'>+	kfree(pbm-&gt;iommu);</div><div class='add'>+</div><div class='add'>+out_free_controller:</div><div class='add'>+	kfree(pbm);</div><div class='add'>+</div><div class='add'>+out_err:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct of_device_id __initdata sabre_match[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "pci",</div><div class='add'>+		.compatible = "pci108e,a001",</div><div class='add'>+		.data = (void *) 1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "pci",</div><div class='add'>+		.compatible = "pci108e,a000",</div><div class='add'>+	},</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct of_platform_driver sabre_driver = {</div><div class='add'>+	.name		= DRIVER_NAME,</div><div class='add'>+	.match_table	= sabre_match,</div><div class='add'>+	.probe		= sabre_probe,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init sabre_init(void)</div><div class='add'>+{</div><div class='add'>+	return of_register_driver(&amp;sabre_driver, &amp;of_bus_type);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+subsys_initcall(sabre_init);</div><div class='head'>diff --git a/arch/sparc64/kernel/pci_schizo.c b/arch/sparc64/kernel/pci_schizo.c<br/>index 9248c6737f0e..45d9dba1ba11 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/pci_schizo.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc64/kernel/pci_schizo.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/pci_schizo.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/pci_schizo.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /* pci_schizo.c: SCHIZO/TOMATILLO specific PCI controller support.</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2001, 2002, 2003, 2007 David S. Miller (davem@davemloft.net)</div><div class='add'>+ * Copyright (C) 2001, 2002, 2003, 2007, 2008 David S. Miller (davem@davemloft.net)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -13,32 +13,15 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/iommu.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/upa.h&gt;</div><div class='ctx'> #include &lt;asm/pstate.h&gt;</div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='del'>-#include &lt;asm/oplib.h&gt;</div><div class='add'>+#include &lt;asm/upa.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "pci_impl.h"</div><div class='ctx'> #include "iommu_common.h"</div><div class='ctx'> </div><div class='del'>-/* All SCHIZO registers are 64-bits.  The following accessor</div><div class='del'>- * routines are how they are accessed.  The REG parameter</div><div class='del'>- * is a physical address.</div><div class='del'>- */</div><div class='del'>-#define schizo_read(__reg) \</div><div class='del'>-({	u64 __ret; \</div><div class='del'>-	__asm__ __volatile__("ldxa [%1] %2, %0" \</div><div class='del'>-			     : "=r" (__ret) \</div><div class='del'>-			     : "r" (__reg), "i" (ASI_PHYS_BYPASS_EC_E) \</div><div class='del'>-			     : "memory"); \</div><div class='del'>-	__ret; \</div><div class='del'>-})</div><div class='del'>-#define schizo_write(__reg, __val) \</div><div class='del'>-	__asm__ __volatile__("stxa %0, [%1] %2" \</div><div class='del'>-			     : /* no outputs */ \</div><div class='del'>-			     : "r" (__val), "r" (__reg), \</div><div class='del'>-			       "i" (ASI_PHYS_BYPASS_EC_E) \</div><div class='del'>-			     : "memory")</div><div class='add'>+#define DRIVER_NAME	"schizo"</div><div class='add'>+#define PFX		DRIVER_NAME ": "</div><div class='ctx'> </div><div class='ctx'> /* This is a convention that at least Excalibur and Merlin</div><div class='ctx'>  * follow.  I suppose the SCHIZO used in Starcat and friends</div><div class='hunk'>@@ -163,25 +146,25 @@ static void __schizo_check_stc_error_pbm(struct pci_pbm_info *pbm,</div><div class='ctx'> 	 * invalidating it before it has a chance to reach</div><div class='ctx'> 	 * main memory.</div><div class='ctx'> 	 */</div><div class='del'>-	control = schizo_read(strbuf-&gt;strbuf_control);</div><div class='del'>-	schizo_write(strbuf-&gt;strbuf_control,</div><div class='del'>-		     (control | SCHIZO_STRBUF_CTRL_DENAB));</div><div class='add'>+	control = upa_readq(strbuf-&gt;strbuf_control);</div><div class='add'>+	upa_writeq((control | SCHIZO_STRBUF_CTRL_DENAB),</div><div class='add'>+		   strbuf-&gt;strbuf_control);</div><div class='ctx'> 	for (i = 0; i &lt; 128; i++) {</div><div class='ctx'> 		unsigned long val;</div><div class='ctx'> </div><div class='del'>-		val = schizo_read(err_base + (i * 8UL));</div><div class='del'>-		schizo_write(err_base + (i * 8UL), 0UL);</div><div class='add'>+		val = upa_readq(err_base + (i * 8UL));</div><div class='add'>+		upa_writeq(0UL, err_base + (i * 8UL));</div><div class='ctx'> 		stc_error_buf[i] = val;</div><div class='ctx'> 	}</div><div class='ctx'> 	for (i = 0; i &lt; 16; i++) {</div><div class='del'>-		stc_tag_buf[i] = schizo_read(tag_base + (i * 8UL));</div><div class='del'>-		stc_line_buf[i] = schizo_read(line_base + (i * 8UL));</div><div class='del'>-		schizo_write(tag_base + (i * 8UL), 0UL);</div><div class='del'>-		schizo_write(line_base + (i * 8UL), 0UL);</div><div class='add'>+		stc_tag_buf[i] = upa_readq(tag_base + (i * 8UL));</div><div class='add'>+		stc_line_buf[i] = upa_readq(line_base + (i * 8UL));</div><div class='add'>+		upa_writeq(0UL, tag_base + (i * 8UL));</div><div class='add'>+		upa_writeq(0UL, line_base + (i * 8UL));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* OK, state is logged, exit diagnostic mode. */</div><div class='del'>-	schizo_write(strbuf-&gt;strbuf_control, control);</div><div class='add'>+	upa_writeq(control, strbuf-&gt;strbuf_control);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 16; i++) {</div><div class='ctx'> 		int j, saw_error, first, last;</div><div class='hunk'>@@ -258,14 +241,14 @@ static void schizo_check_iommu_error_pbm(struct pci_pbm_info *pbm,</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;iommu-&gt;lock, flags);</div><div class='del'>-	control = schizo_read(iommu-&gt;iommu_control);</div><div class='add'>+	control = upa_readq(iommu-&gt;iommu_control);</div><div class='ctx'> 	if (control &amp; SCHIZO_IOMMU_CTRL_XLTEERR) {</div><div class='ctx'> 		unsigned long base;</div><div class='ctx'> 		char *type_string;</div><div class='ctx'> </div><div class='ctx'> 		/* Clear the error encountered bit. */</div><div class='ctx'> 		control &amp;= ~SCHIZO_IOMMU_CTRL_XLTEERR;</div><div class='del'>-		schizo_write(iommu-&gt;iommu_control, control);</div><div class='add'>+		upa_writeq(control, iommu-&gt;iommu_control);</div><div class='ctx'> </div><div class='ctx'> 		switch((control &amp; SCHIZO_IOMMU_CTRL_XLTESTAT) &gt;&gt; 25UL) {</div><div class='ctx'> 		case 0:</div><div class='hunk'>@@ -295,24 +278,24 @@ static void schizo_check_iommu_error_pbm(struct pci_pbm_info *pbm,</div><div class='ctx'> 		 * get as much diagnostic information to the</div><div class='ctx'> 		 * console as we can.</div><div class='ctx'> 		 */</div><div class='del'>-		schizo_write(iommu-&gt;iommu_control,</div><div class='del'>-			     control | SCHIZO_IOMMU_CTRL_DENAB);</div><div class='add'>+		upa_writeq(control | SCHIZO_IOMMU_CTRL_DENAB,</div><div class='add'>+			   iommu-&gt;iommu_control);</div><div class='ctx'> </div><div class='ctx'> 		base = pbm-&gt;pbm_regs;</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; i &lt; 16; i++) {</div><div class='ctx'> 			iommu_tag[i] =</div><div class='del'>-				schizo_read(base + SCHIZO_IOMMU_TAG + (i * 8UL));</div><div class='add'>+				upa_readq(base + SCHIZO_IOMMU_TAG + (i * 8UL));</div><div class='ctx'> 			iommu_data[i] =</div><div class='del'>-				schizo_read(base + SCHIZO_IOMMU_DATA + (i * 8UL));</div><div class='add'>+				upa_readq(base + SCHIZO_IOMMU_DATA + (i * 8UL));</div><div class='ctx'> </div><div class='ctx'> 			/* Now clear out the entry. */</div><div class='del'>-			schizo_write(base + SCHIZO_IOMMU_TAG + (i * 8UL), 0);</div><div class='del'>-			schizo_write(base + SCHIZO_IOMMU_DATA + (i * 8UL), 0);</div><div class='add'>+			upa_writeq(0, base + SCHIZO_IOMMU_TAG + (i * 8UL));</div><div class='add'>+			upa_writeq(0, base + SCHIZO_IOMMU_DATA + (i * 8UL));</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Leave diagnostic mode. */</div><div class='del'>-		schizo_write(iommu-&gt;iommu_control, control);</div><div class='add'>+		upa_writeq(control, iommu-&gt;iommu_control);</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; i &lt; 16; i++) {</div><div class='ctx'> 			unsigned long tag, data;</div><div class='hunk'>@@ -357,11 +340,12 @@ static void schizo_check_iommu_error_pbm(struct pci_pbm_info *pbm,</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;iommu-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void schizo_check_iommu_error(struct pci_controller_info *p,</div><div class='add'>+static void schizo_check_iommu_error(struct pci_pbm_info *pbm,</div><div class='ctx'> 				     enum schizo_error_type type)</div><div class='ctx'> {</div><div class='del'>-	schizo_check_iommu_error_pbm(&amp;p-&gt;pbm_A, type);</div><div class='del'>-	schizo_check_iommu_error_pbm(&amp;p-&gt;pbm_B, type);</div><div class='add'>+	schizo_check_iommu_error_pbm(pbm, type);</div><div class='add'>+	if (pbm-&gt;sibling)</div><div class='add'>+		schizo_check_iommu_error_pbm(pbm-&gt;sibling, type);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Uncorrectable ECC error status gathering. */</div><div class='hunk'>@@ -386,14 +370,13 @@ static void schizo_check_iommu_error(struct pci_controller_info *p,</div><div class='ctx'> static irqreturn_t schizo_ue_intr(int irq, void *dev_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_pbm_info *pbm = dev_id;</div><div class='del'>-	struct pci_controller_info *p = pbm-&gt;parent;</div><div class='ctx'> 	unsigned long afsr_reg = pbm-&gt;controller_regs + SCHIZO_UE_AFSR;</div><div class='ctx'> 	unsigned long afar_reg = pbm-&gt;controller_regs + SCHIZO_UE_AFAR;</div><div class='ctx'> 	unsigned long afsr, afar, error_bits;</div><div class='ctx'> 	int reported, limit;</div><div class='ctx'> </div><div class='ctx'> 	/* Latch uncorrectable error status. */</div><div class='del'>-	afar = schizo_read(afar_reg);</div><div class='add'>+	afar = upa_readq(afar_reg);</div><div class='ctx'> </div><div class='ctx'> 	/* If either of the error pending bits are set in the</div><div class='ctx'> 	 * AFSR, the error status is being actively updated by</div><div class='hunk'>@@ -401,7 +384,7 @@ static irqreturn_t schizo_ue_intr(int irq, void *dev_id)</div><div class='ctx'> 	 */</div><div class='ctx'> 	limit = 1000;</div><div class='ctx'> 	do {</div><div class='del'>-		afsr = schizo_read(afsr_reg);</div><div class='add'>+		afsr = upa_readq(afsr_reg);</div><div class='ctx'> 	} while ((afsr &amp; SCHIZO_UEAFSR_ERRPNDG) != 0 &amp;&amp; --limit);</div><div class='ctx'> </div><div class='ctx'> 	/* Clear the primary/secondary error status bits. */</div><div class='hunk'>@@ -410,7 +393,7 @@ static irqreturn_t schizo_ue_intr(int irq, void *dev_id)</div><div class='ctx'> 		 SCHIZO_UEAFSR_SPIO | SCHIZO_UEAFSR_SDMA);</div><div class='ctx'> 	if (!error_bits)</div><div class='ctx'> 		return IRQ_NONE;</div><div class='del'>-	schizo_write(afsr_reg, error_bits);</div><div class='add'>+	upa_writeq(error_bits, afsr_reg);</div><div class='ctx'> </div><div class='ctx'> 	/* Log the error. */</div><div class='ctx'> 	printk("%s: Uncorrectable Error, primary error type[%s]\n",</div><div class='hunk'>@@ -449,7 +432,7 @@ static irqreturn_t schizo_ue_intr(int irq, void *dev_id)</div><div class='ctx'> 	printk("]\n");</div><div class='ctx'> </div><div class='ctx'> 	/* Interrogate IOMMU for error status. */</div><div class='del'>-	schizo_check_iommu_error(p, UE_ERR);</div><div class='add'>+	schizo_check_iommu_error(pbm, UE_ERR);</div><div class='ctx'> </div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='hunk'>@@ -481,7 +464,7 @@ static irqreturn_t schizo_ce_intr(int irq, void *dev_id)</div><div class='ctx'> 	int reported, limit;</div><div class='ctx'> </div><div class='ctx'> 	/* Latch error status. */</div><div class='del'>-	afar = schizo_read(afar_reg);</div><div class='add'>+	afar = upa_readq(afar_reg);</div><div class='ctx'> </div><div class='ctx'> 	/* If either of the error pending bits are set in the</div><div class='ctx'> 	 * AFSR, the error status is being actively updated by</div><div class='hunk'>@@ -489,7 +472,7 @@ static irqreturn_t schizo_ce_intr(int irq, void *dev_id)</div><div class='ctx'> 	 */</div><div class='ctx'> 	limit = 1000;</div><div class='ctx'> 	do {</div><div class='del'>-		afsr = schizo_read(afsr_reg);</div><div class='add'>+		afsr = upa_readq(afsr_reg);</div><div class='ctx'> 	} while ((afsr &amp; SCHIZO_UEAFSR_ERRPNDG) != 0 &amp;&amp; --limit);</div><div class='ctx'> </div><div class='ctx'> 	/* Clear primary/secondary error status bits. */</div><div class='hunk'>@@ -498,7 +481,7 @@ static irqreturn_t schizo_ce_intr(int irq, void *dev_id)</div><div class='ctx'> 		 SCHIZO_CEAFSR_SPIO | SCHIZO_CEAFSR_SDMA);</div><div class='ctx'> 	if (!error_bits)</div><div class='ctx'> 		return IRQ_NONE;</div><div class='del'>-	schizo_write(afsr_reg, error_bits);</div><div class='add'>+	upa_writeq(error_bits, afsr_reg);</div><div class='ctx'> </div><div class='ctx'> 	/* Log the error. */</div><div class='ctx'> 	printk("%s: Correctable Error, primary error type[%s]\n",</div><div class='hunk'>@@ -600,7 +583,7 @@ static irqreturn_t schizo_pcierr_intr_other(struct pci_pbm_info *pbm)</div><div class='ctx'> 	u16 stat;</div><div class='ctx'> </div><div class='ctx'> 	csr_reg = pbm-&gt;pbm_regs + SCHIZO_PCI_CTRL;</div><div class='del'>-	csr = schizo_read(csr_reg);</div><div class='add'>+	csr = upa_readq(csr_reg);</div><div class='ctx'> 	csr_error_bits =</div><div class='ctx'> 		csr &amp; (SCHIZO_PCICTRL_BUS_UNUS |</div><div class='ctx'> 		       SCHIZO_PCICTRL_TTO_ERR |</div><div class='hunk'>@@ -610,7 +593,7 @@ static irqreturn_t schizo_pcierr_intr_other(struct pci_pbm_info *pbm)</div><div class='ctx'> 		       SCHIZO_PCICTRL_SERR);</div><div class='ctx'> 	if (csr_error_bits) {</div><div class='ctx'> 		/* Clear the errors.  */</div><div class='del'>-		schizo_write(csr_reg, csr);</div><div class='add'>+		upa_writeq(csr, csr_reg);</div><div class='ctx'> </div><div class='ctx'> 		/* Log 'em.  */</div><div class='ctx'> 		if (csr_error_bits &amp; SCHIZO_PCICTRL_BUS_UNUS)</div><div class='hunk'>@@ -650,7 +633,6 @@ static irqreturn_t schizo_pcierr_intr_other(struct pci_pbm_info *pbm)</div><div class='ctx'> static irqreturn_t schizo_pcierr_intr(int irq, void *dev_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_pbm_info *pbm = dev_id;</div><div class='del'>-	struct pci_controller_info *p = pbm-&gt;parent;</div><div class='ctx'> 	unsigned long afsr_reg, afar_reg, base;</div><div class='ctx'> 	unsigned long afsr, afar, error_bits;</div><div class='ctx'> 	int reported;</div><div class='hunk'>@@ -661,8 +643,8 @@ static irqreturn_t schizo_pcierr_intr(int irq, void *dev_id)</div><div class='ctx'> 	afar_reg = base + SCHIZO_PCI_AFAR;</div><div class='ctx'> </div><div class='ctx'> 	/* Latch error status. */</div><div class='del'>-	afar = schizo_read(afar_reg);</div><div class='del'>-	afsr = schizo_read(afsr_reg);</div><div class='add'>+	afar = upa_readq(afar_reg);</div><div class='add'>+	afsr = upa_readq(afsr_reg);</div><div class='ctx'> </div><div class='ctx'> 	/* Clear primary/secondary error status bits. */</div><div class='ctx'> 	error_bits = afsr &amp;</div><div class='hunk'>@@ -674,7 +656,7 @@ static irqreturn_t schizo_pcierr_intr(int irq, void *dev_id)</div><div class='ctx'> 		 SCHIZO_PCIAFSR_STTO | SCHIZO_PCIAFSR_SUNUS);</div><div class='ctx'> 	if (!error_bits)</div><div class='ctx'> 		return schizo_pcierr_intr_other(pbm);</div><div class='del'>-	schizo_write(afsr_reg, error_bits);</div><div class='add'>+	upa_writeq(error_bits, afsr_reg);</div><div class='ctx'> </div><div class='ctx'> 	/* Log the error. */</div><div class='ctx'> 	printk("%s: PCI Error, primary error type[%s]\n",</div><div class='hunk'>@@ -744,7 +726,7 @@ static irqreturn_t schizo_pcierr_intr(int irq, void *dev_id)</div><div class='ctx'> 	 * a bug in the IOMMU support code or a PCI device driver.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (error_bits &amp; (SCHIZO_PCIAFSR_PTA | SCHIZO_PCIAFSR_STA)) {</div><div class='del'>-		schizo_check_iommu_error(p, PCI_ERR);</div><div class='add'>+		schizo_check_iommu_error(pbm, PCI_ERR);</div><div class='ctx'> 		pci_scan_for_target_abort(pbm, pbm-&gt;pci_bus);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (error_bits &amp; (SCHIZO_PCIAFSR_PMA | SCHIZO_PCIAFSR_SMA))</div><div class='hunk'>@@ -805,12 +787,11 @@ static irqreturn_t schizo_pcierr_intr(int irq, void *dev_id)</div><div class='ctx'> static irqreturn_t schizo_safarierr_intr(int irq, void *dev_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_pbm_info *pbm = dev_id;</div><div class='del'>-	struct pci_controller_info *p = pbm-&gt;parent;</div><div class='ctx'> 	u64 errlog;</div><div class='ctx'> </div><div class='del'>-	errlog = schizo_read(pbm-&gt;controller_regs + SCHIZO_SAFARI_ERRLOG);</div><div class='del'>-	schizo_write(pbm-&gt;controller_regs + SCHIZO_SAFARI_ERRLOG,</div><div class='del'>-		     errlog &amp; ~(SAFARI_ERRLOG_ERROUT));</div><div class='add'>+	errlog = upa_readq(pbm-&gt;controller_regs + SCHIZO_SAFARI_ERRLOG);</div><div class='add'>+	upa_writeq(errlog &amp; ~(SAFARI_ERRLOG_ERROUT),</div><div class='add'>+		   pbm-&gt;controller_regs + SCHIZO_SAFARI_ERRLOG);</div><div class='ctx'> </div><div class='ctx'> 	if (!(errlog &amp; BUS_ERROR_UNMAP)) {</div><div class='ctx'> 		printk("%s: Unexpected Safari/JBUS error interrupt, errlog[%016lx]\n",</div><div class='hunk'>@@ -821,7 +802,7 @@ static irqreturn_t schizo_safarierr_intr(int irq, void *dev_id)</div><div class='ctx'> </div><div class='ctx'> 	printk("%s: Safari/JBUS interrupt, UNMAPPED error, interrogating IOMMUs.\n",</div><div class='ctx'> 	       pbm-&gt;name);</div><div class='del'>-	schizo_check_iommu_error(p, SAFARI_ERR);</div><div class='add'>+	schizo_check_iommu_error(pbm, SAFARI_ERR);</div><div class='ctx'> </div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='hunk'>@@ -863,7 +844,7 @@ static int pbm_routes_this_ino(struct pci_pbm_info *pbm, u32 ino)</div><div class='ctx'>  */</div><div class='ctx'> static void tomatillo_register_error_handlers(struct pci_pbm_info *pbm)</div><div class='ctx'> {</div><div class='del'>-	struct of_device *op = of_find_device_by_node(pbm-&gt;prom_node);</div><div class='add'>+	struct of_device *op = of_find_device_by_node(pbm-&gt;op-&gt;node);</div><div class='ctx'> 	u64 tmp, err_mask, err_no_mask;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -910,10 +891,9 @@ static void tomatillo_register_error_handlers(struct pci_pbm_info *pbm)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Enable UE and CE interrupts for controller. */</div><div class='del'>-	schizo_write(pbm-&gt;controller_regs + SCHIZO_ECC_CTRL,</div><div class='del'>-		     (SCHIZO_ECCCTRL_EE |</div><div class='del'>-		      SCHIZO_ECCCTRL_UE |</div><div class='del'>-		      SCHIZO_ECCCTRL_CE));</div><div class='add'>+	upa_writeq((SCHIZO_ECCCTRL_EE |</div><div class='add'>+		    SCHIZO_ECCCTRL_UE |</div><div class='add'>+		    SCHIZO_ECCCTRL_CE), pbm-&gt;controller_regs + SCHIZO_ECC_CTRL);</div><div class='ctx'> </div><div class='ctx'> 	/* Enable PCI Error interrupts and clear error</div><div class='ctx'> 	 * bits.</div><div class='hunk'>@@ -926,10 +906,10 @@ static void tomatillo_register_error_handlers(struct pci_pbm_info *pbm)</div><div class='ctx'> </div><div class='ctx'> 	err_no_mask = SCHIZO_PCICTRL_DTO_ERR;</div><div class='ctx'> </div><div class='del'>-	tmp = schizo_read(pbm-&gt;pbm_regs + SCHIZO_PCI_CTRL);</div><div class='add'>+	tmp = upa_readq(pbm-&gt;pbm_regs + SCHIZO_PCI_CTRL);</div><div class='ctx'> 	tmp |= err_mask;</div><div class='ctx'> 	tmp &amp;= ~err_no_mask;</div><div class='del'>-	schizo_write(pbm-&gt;pbm_regs + SCHIZO_PCI_CTRL, tmp);</div><div class='add'>+	upa_writeq(tmp, pbm-&gt;pbm_regs + SCHIZO_PCI_CTRL);</div><div class='ctx'> </div><div class='ctx'> 	err_mask = (SCHIZO_PCIAFSR_PMA | SCHIZO_PCIAFSR_PTA |</div><div class='ctx'> 		    SCHIZO_PCIAFSR_PRTRY | SCHIZO_PCIAFSR_PPERR |</div><div class='hunk'>@@ -938,7 +918,7 @@ static void tomatillo_register_error_handlers(struct pci_pbm_info *pbm)</div><div class='ctx'> 		    SCHIZO_PCIAFSR_SRTRY | SCHIZO_PCIAFSR_SPERR |</div><div class='ctx'> 		    SCHIZO_PCIAFSR_STTO);</div><div class='ctx'> </div><div class='del'>-	schizo_write(pbm-&gt;pbm_regs + SCHIZO_PCI_AFSR, err_mask);</div><div class='add'>+	upa_writeq(err_mask, pbm-&gt;pbm_regs + SCHIZO_PCI_AFSR);</div><div class='ctx'> </div><div class='ctx'> 	err_mask = (BUS_ERROR_BADCMD | BUS_ERROR_SNOOP_GR |</div><div class='ctx'> 		    BUS_ERROR_SNOOP_PCI | BUS_ERROR_SNOOP_RD |</div><div class='hunk'>@@ -950,16 +930,16 @@ static void tomatillo_register_error_handlers(struct pci_pbm_info *pbm)</div><div class='ctx'> 		    BUS_ERROR_APERR | BUS_ERROR_UNMAP |</div><div class='ctx'> 		    BUS_ERROR_BUSERR | BUS_ERROR_TIMEOUT);</div><div class='ctx'> </div><div class='del'>-	schizo_write(pbm-&gt;controller_regs + SCHIZO_SAFARI_ERRCTRL,</div><div class='del'>-		     (SCHIZO_SAFERRCTRL_EN | err_mask));</div><div class='add'>+	upa_writeq((SCHIZO_SAFERRCTRL_EN | err_mask),</div><div class='add'>+		   pbm-&gt;controller_regs + SCHIZO_SAFARI_ERRCTRL);</div><div class='ctx'> </div><div class='del'>-	schizo_write(pbm-&gt;controller_regs + SCHIZO_SAFARI_IRQCTRL,</div><div class='del'>-		     (SCHIZO_SAFIRQCTRL_EN | (BUS_ERROR_UNMAP)));</div><div class='add'>+	upa_writeq((SCHIZO_SAFIRQCTRL_EN | (BUS_ERROR_UNMAP)),</div><div class='add'>+		   pbm-&gt;controller_regs + SCHIZO_SAFARI_IRQCTRL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void schizo_register_error_handlers(struct pci_pbm_info *pbm)</div><div class='ctx'> {</div><div class='del'>-	struct of_device *op = of_find_device_by_node(pbm-&gt;prom_node);</div><div class='add'>+	struct of_device *op = of_find_device_by_node(pbm-&gt;op-&gt;node);</div><div class='ctx'> 	u64 tmp, err_mask, err_no_mask;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -1006,10 +986,9 @@ static void schizo_register_error_handlers(struct pci_pbm_info *pbm)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Enable UE and CE interrupts for controller. */</div><div class='del'>-	schizo_write(pbm-&gt;controller_regs + SCHIZO_ECC_CTRL,</div><div class='del'>-		     (SCHIZO_ECCCTRL_EE |</div><div class='del'>-		      SCHIZO_ECCCTRL_UE |</div><div class='del'>-		      SCHIZO_ECCCTRL_CE));</div><div class='add'>+	upa_writeq((SCHIZO_ECCCTRL_EE |</div><div class='add'>+		    SCHIZO_ECCCTRL_UE |</div><div class='add'>+		    SCHIZO_ECCCTRL_CE), pbm-&gt;controller_regs + SCHIZO_ECC_CTRL);</div><div class='ctx'> </div><div class='ctx'> 	err_mask = (SCHIZO_PCICTRL_BUS_UNUS |</div><div class='ctx'> 		    SCHIZO_PCICTRL_ESLCK |</div><div class='hunk'>@@ -1025,18 +1004,18 @@ static void schizo_register_error_handlers(struct pci_pbm_info *pbm)</div><div class='ctx'> 	/* Enable PCI Error interrupts and clear error</div><div class='ctx'> 	 * bits for each PBM.</div><div class='ctx'> 	 */</div><div class='del'>-	tmp = schizo_read(pbm-&gt;pbm_regs + SCHIZO_PCI_CTRL);</div><div class='add'>+	tmp = upa_readq(pbm-&gt;pbm_regs + SCHIZO_PCI_CTRL);</div><div class='ctx'> 	tmp |= err_mask;</div><div class='ctx'> 	tmp &amp;= ~err_no_mask;</div><div class='del'>-	schizo_write(pbm-&gt;pbm_regs + SCHIZO_PCI_CTRL, tmp);</div><div class='add'>+	upa_writeq(tmp, pbm-&gt;pbm_regs + SCHIZO_PCI_CTRL);</div><div class='ctx'> </div><div class='del'>-	schizo_write(pbm-&gt;pbm_regs + SCHIZO_PCI_AFSR,</div><div class='del'>-		     (SCHIZO_PCIAFSR_PMA | SCHIZO_PCIAFSR_PTA |</div><div class='del'>-		      SCHIZO_PCIAFSR_PRTRY | SCHIZO_PCIAFSR_PPERR |</div><div class='del'>-		      SCHIZO_PCIAFSR_PTTO | SCHIZO_PCIAFSR_PUNUS |</div><div class='del'>-		      SCHIZO_PCIAFSR_SMA | SCHIZO_PCIAFSR_STA |</div><div class='del'>-		      SCHIZO_PCIAFSR_SRTRY | SCHIZO_PCIAFSR_SPERR |</div><div class='del'>-		      SCHIZO_PCIAFSR_STTO | SCHIZO_PCIAFSR_SUNUS));</div><div class='add'>+	upa_writeq((SCHIZO_PCIAFSR_PMA | SCHIZO_PCIAFSR_PTA |</div><div class='add'>+		    SCHIZO_PCIAFSR_PRTRY | SCHIZO_PCIAFSR_PPERR |</div><div class='add'>+		    SCHIZO_PCIAFSR_PTTO | SCHIZO_PCIAFSR_PUNUS |</div><div class='add'>+		    SCHIZO_PCIAFSR_SMA | SCHIZO_PCIAFSR_STA |</div><div class='add'>+		    SCHIZO_PCIAFSR_SRTRY | SCHIZO_PCIAFSR_SPERR |</div><div class='add'>+		    SCHIZO_PCIAFSR_STTO | SCHIZO_PCIAFSR_SUNUS),</div><div class='add'>+		   pbm-&gt;pbm_regs + SCHIZO_PCI_AFSR);</div><div class='ctx'> </div><div class='ctx'> 	/* Make all Safari error conditions fatal except unmapped</div><div class='ctx'> 	 * errors which we make generate interrupts.</div><div class='hunk'>@@ -1063,8 +1042,8 @@ static void schizo_register_error_handlers(struct pci_pbm_info *pbm)</div><div class='ctx'> 		      BUS_ERROR_CPU0PS | BUS_ERROR_CPU0PB);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	schizo_write(pbm-&gt;controller_regs + SCHIZO_SAFARI_ERRCTRL,</div><div class='del'>-		     (SCHIZO_SAFERRCTRL_EN | err_mask));</div><div class='add'>+	upa_writeq((SCHIZO_SAFERRCTRL_EN | err_mask),</div><div class='add'>+		   pbm-&gt;controller_regs + SCHIZO_SAFARI_ERRCTRL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void pbm_config_busmastering(struct pci_pbm_info *pbm)</div><div class='hunk'>@@ -1084,14 +1063,15 @@ static void pbm_config_busmastering(struct pci_pbm_info *pbm)</div><div class='ctx'> 	pci_config_write8(addr, 64);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __init schizo_scan_bus(struct pci_pbm_info *pbm)</div><div class='add'>+static void __devinit schizo_scan_bus(struct pci_pbm_info *pbm,</div><div class='add'>+				      struct device *parent)</div><div class='ctx'> {</div><div class='ctx'> 	pbm_config_busmastering(pbm);</div><div class='ctx'> 	pbm-&gt;is_66mhz_capable =</div><div class='del'>-		(of_find_property(pbm-&gt;prom_node, "66mhz-capable", NULL)</div><div class='add'>+		(of_find_property(pbm-&gt;op-&gt;node, "66mhz-capable", NULL)</div><div class='ctx'> 		 != NULL);</div><div class='ctx'> </div><div class='del'>-	pbm-&gt;pci_bus = pci_scan_one_pbm(pbm);</div><div class='add'>+	pbm-&gt;pci_bus = pci_scan_one_pbm(pbm, parent);</div><div class='ctx'> </div><div class='ctx'> 	if (pbm-&gt;chip_type == PBM_CHIP_TYPE_TOMATILLO)</div><div class='ctx'> 		tomatillo_register_error_handlers(pbm);</div><div class='hunk'>@@ -1133,12 +1113,12 @@ static void schizo_pbm_strbuf_init(struct pci_pbm_info *pbm)</div><div class='ctx'> 	 * streaming buffer and leave the rerun-disable</div><div class='ctx'> 	 * setting however OBP set it.</div><div class='ctx'> 	 */</div><div class='del'>-	control = schizo_read(pbm-&gt;stc.strbuf_control);</div><div class='add'>+	control = upa_readq(pbm-&gt;stc.strbuf_control);</div><div class='ctx'> 	control &amp;= ~(SCHIZO_STRBUF_CTRL_LPTR |</div><div class='ctx'> 		     SCHIZO_STRBUF_CTRL_LENAB |</div><div class='ctx'> 		     SCHIZO_STRBUF_CTRL_DENAB);</div><div class='ctx'> 	control |= SCHIZO_STRBUF_CTRL_ENAB;</div><div class='del'>-	schizo_write(pbm-&gt;stc.strbuf_control, control);</div><div class='add'>+	upa_writeq(control, pbm-&gt;stc.strbuf_control);</div><div class='ctx'> </div><div class='ctx'> 	pbm-&gt;stc.strbuf_enabled = 1;</div><div class='ctx'> }</div><div class='hunk'>@@ -1150,24 +1130,17 @@ static void schizo_pbm_strbuf_init(struct pci_pbm_info *pbm)</div><div class='ctx'> </div><div class='ctx'> static int schizo_pbm_iommu_init(struct pci_pbm_info *pbm)</div><div class='ctx'> {</div><div class='del'>-	struct iommu *iommu = pbm-&gt;iommu;</div><div class='add'>+	static const u32 vdma_default[] = { 0xc0000000, 0x40000000 };</div><div class='ctx'> 	unsigned long i, tagbase, database;</div><div class='del'>-	struct property *prop;</div><div class='del'>-	u32 vdma[2], dma_mask;</div><div class='add'>+	struct iommu *iommu = pbm-&gt;iommu;</div><div class='ctx'> 	int tsbsize, err;</div><div class='add'>+	const u32 *vdma;</div><div class='add'>+	u32 dma_mask;</div><div class='ctx'> 	u64 control;</div><div class='ctx'> </div><div class='del'>-	prop = of_find_property(pbm-&gt;prom_node, "virtual-dma", NULL);</div><div class='del'>-	if (prop) {</div><div class='del'>-		u32 *val = prop-&gt;value;</div><div class='del'>-</div><div class='del'>-		vdma[0] = val[0];</div><div class='del'>-		vdma[1] = val[1];</div><div class='del'>-	} else {</div><div class='del'>-		/* No property, use default values. */</div><div class='del'>-		vdma[0] = 0xc0000000;</div><div class='del'>-		vdma[1] = 0x40000000;</div><div class='del'>-	}</div><div class='add'>+	vdma = of_get_property(pbm-&gt;op-&gt;node, "virtual-dma", NULL);</div><div class='add'>+	if (!vdma)</div><div class='add'>+		vdma = vdma_default;</div><div class='ctx'> </div><div class='ctx'> 	dma_mask = vdma[0];</div><div class='ctx'> 	switch (vdma[1]) {</div><div class='hunk'>@@ -1187,9 +1160,9 @@ static int schizo_pbm_iommu_init(struct pci_pbm_info *pbm)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		default:</div><div class='del'>-			prom_printf("SCHIZO: strange virtual-dma size.\n");</div><div class='del'>-			prom_halt();</div><div class='del'>-	};</div><div class='add'>+			printk(KERN_ERR PFX "Strange virtual-dma size.\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Register addresses, SCHIZO has iommu ctx flushing. */</div><div class='ctx'> 	iommu-&gt;iommu_control  = pbm-&gt;pbm_regs + SCHIZO_IOMMU_CONTROL;</div><div class='hunk'>@@ -1206,15 +1179,15 @@ static int schizo_pbm_iommu_init(struct pci_pbm_info *pbm)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Invalidate TLB Entries.</div><div class='ctx'> 	 */</div><div class='del'>-	control = schizo_read(iommu-&gt;iommu_control);</div><div class='add'>+	control = upa_readq(iommu-&gt;iommu_control);</div><div class='ctx'> 	control |= SCHIZO_IOMMU_CTRL_DENAB;</div><div class='del'>-	schizo_write(iommu-&gt;iommu_control, control);</div><div class='add'>+	upa_writeq(control, iommu-&gt;iommu_control);</div><div class='ctx'> </div><div class='ctx'> 	tagbase = SCHIZO_IOMMU_TAG, database = SCHIZO_IOMMU_DATA;</div><div class='ctx'> </div><div class='del'>-	for(i = 0; i &lt; 16; i++) {</div><div class='del'>-		schizo_write(pbm-&gt;pbm_regs + tagbase + (i * 8UL), 0);</div><div class='del'>-		schizo_write(pbm-&gt;pbm_regs + database + (i * 8UL), 0);</div><div class='add'>+	for (i = 0; i &lt; 16; i++) {</div><div class='add'>+		upa_writeq(0, pbm-&gt;pbm_regs + tagbase + (i * 8UL));</div><div class='add'>+		upa_writeq(0, pbm-&gt;pbm_regs + database + (i * 8UL));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Leave diag mode enabled for full-flushing done</div><div class='hunk'>@@ -1222,12 +1195,14 @@ static int schizo_pbm_iommu_init(struct pci_pbm_info *pbm)</div><div class='ctx'> 	 */</div><div class='ctx'> 	err = iommu_table_init(iommu, tsbsize * 8 * 1024, vdma[0], dma_mask,</div><div class='ctx'> 			       pbm-&gt;numa_node);</div><div class='del'>-	if (err)</div><div class='add'>+	if (err) {</div><div class='add'>+		printk(KERN_ERR PFX "iommu_table_init() fails with %d\n", err);</div><div class='ctx'> 		return err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	schizo_write(iommu-&gt;iommu_tsbbase, __pa(iommu-&gt;page_table));</div><div class='add'>+	upa_writeq(__pa(iommu-&gt;page_table), iommu-&gt;iommu_tsbbase);</div><div class='ctx'> </div><div class='del'>-	control = schizo_read(iommu-&gt;iommu_control);</div><div class='add'>+	control = upa_readq(iommu-&gt;iommu_control);</div><div class='ctx'> 	control &amp;= ~(SCHIZO_IOMMU_CTRL_TSBSZ | SCHIZO_IOMMU_CTRL_TBWSZ);</div><div class='ctx'> 	switch (tsbsize) {</div><div class='ctx'> 	case 64:</div><div class='hunk'>@@ -1236,10 +1211,10 @@ static int schizo_pbm_iommu_init(struct pci_pbm_info *pbm)</div><div class='ctx'> 	case 128:</div><div class='ctx'> 		control |= SCHIZO_IOMMU_TSBSZ_128K;</div><div class='ctx'> 		break;</div><div class='del'>-	};</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	control |= SCHIZO_IOMMU_CTRL_ENAB;</div><div class='del'>-	schizo_write(iommu-&gt;iommu_control, control);</div><div class='add'>+	upa_writeq(control, iommu-&gt;iommu_control);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1280,12 +1255,11 @@ static int schizo_pbm_iommu_init(struct pci_pbm_info *pbm)</div><div class='ctx'> </div><div class='ctx'> static void schizo_pbm_hw_init(struct pci_pbm_info *pbm)</div><div class='ctx'> {</div><div class='del'>-	struct property *prop;</div><div class='ctx'> 	u64 tmp;</div><div class='ctx'> </div><div class='del'>-	schizo_write(pbm-&gt;pbm_regs + SCHIZO_PCI_IRQ_RETRY, 5);</div><div class='add'>+	upa_writeq(5, pbm-&gt;pbm_regs + SCHIZO_PCI_IRQ_RETRY);</div><div class='ctx'> </div><div class='del'>-	tmp = schizo_read(pbm-&gt;pbm_regs + SCHIZO_PCI_CTRL);</div><div class='add'>+	tmp = upa_readq(pbm-&gt;pbm_regs + SCHIZO_PCI_CTRL);</div><div class='ctx'> </div><div class='ctx'> 	/* Enable arbiter for all PCI slots.  */</div><div class='ctx'> 	tmp |= 0xff;</div><div class='hunk'>@@ -1294,8 +1268,7 @@ static void schizo_pbm_hw_init(struct pci_pbm_info *pbm)</div><div class='ctx'> 	    pbm-&gt;chip_version &gt;= 0x2)</div><div class='ctx'> 		tmp |= 0x3UL &lt;&lt; SCHIZO_PCICTRL_PTO_SHIFT;</div><div class='ctx'> </div><div class='del'>-	prop = of_find_property(pbm-&gt;prom_node, "no-bus-parking", NULL);</div><div class='del'>-	if (!prop)</div><div class='add'>+	if (!of_find_property(pbm-&gt;op-&gt;node, "no-bus-parking", NULL))</div><div class='ctx'> 		tmp |= SCHIZO_PCICTRL_PARK;</div><div class='ctx'> 	else</div><div class='ctx'> 		tmp &amp;= ~SCHIZO_PCICTRL_PARK;</div><div class='hunk'>@@ -1311,13 +1284,13 @@ static void schizo_pbm_hw_init(struct pci_pbm_info *pbm)</div><div class='ctx'> 			SCHIZO_PCICTRL_RDO_PREF |</div><div class='ctx'> 			SCHIZO_PCICTRL_RDL_PREF);</div><div class='ctx'> </div><div class='del'>-	schizo_write(pbm-&gt;pbm_regs + SCHIZO_PCI_CTRL, tmp);</div><div class='add'>+	upa_writeq(tmp, pbm-&gt;pbm_regs + SCHIZO_PCI_CTRL);</div><div class='ctx'> </div><div class='del'>-	tmp = schizo_read(pbm-&gt;pbm_regs + SCHIZO_PCI_DIAG);</div><div class='add'>+	tmp = upa_readq(pbm-&gt;pbm_regs + SCHIZO_PCI_DIAG);</div><div class='ctx'> 	tmp &amp;= ~(SCHIZO_PCIDIAG_D_RTRYARB |</div><div class='ctx'> 		 SCHIZO_PCIDIAG_D_RETRY |</div><div class='ctx'> 		 SCHIZO_PCIDIAG_D_INTSYNC);</div><div class='del'>-	schizo_write(pbm-&gt;pbm_regs + SCHIZO_PCI_DIAG, tmp);</div><div class='add'>+	upa_writeq(tmp, pbm-&gt;pbm_regs + SCHIZO_PCI_DIAG);</div><div class='ctx'> </div><div class='ctx'> 	if (pbm-&gt;chip_type == PBM_CHIP_TYPE_TOMATILLO) {</div><div class='ctx'> 		/* Clear prefetch lengths to workaround a bug in</div><div class='hunk'>@@ -1329,17 +1302,16 @@ static void schizo_pbm_hw_init(struct pci_pbm_info *pbm)</div><div class='ctx'> 		       TOMATILLO_IOC_RDONE_CPENAB |</div><div class='ctx'> 		       TOMATILLO_IOC_RDLINE_CPENAB);</div><div class='ctx'> </div><div class='del'>-		schizo_write(pbm-&gt;pbm_regs + TOMATILLO_PCI_IOC_CSR,</div><div class='del'>-			     tmp);</div><div class='add'>+		upa_writeq(tmp, pbm-&gt;pbm_regs + TOMATILLO_PCI_IOC_CSR);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init schizo_pbm_init(struct pci_controller_info *p,</div><div class='del'>-				  struct device_node *dp, u32 portid,</div><div class='del'>-				  int chip_type)</div><div class='add'>+static int __devinit schizo_pbm_init(struct pci_pbm_info *pbm,</div><div class='add'>+				     struct of_device *op, u32 portid,</div><div class='add'>+				     int chip_type)</div><div class='ctx'> {</div><div class='ctx'> 	const struct linux_prom64_registers *regs;</div><div class='del'>-	struct pci_pbm_info *pbm;</div><div class='add'>+	struct device_node *dp = op-&gt;node;</div><div class='ctx'> 	const char *chipset_name;</div><div class='ctx'> 	int is_pbm_a, err;</div><div class='ctx'> </div><div class='hunk'>@@ -1372,25 +1344,19 @@ static int __init schizo_pbm_init(struct pci_controller_info *p,</div><div class='ctx'> 	regs = of_get_property(dp, "reg", NULL);</div><div class='ctx'> </div><div class='ctx'> 	is_pbm_a = ((regs[0].phys_addr &amp; 0x00700000) == 0x00600000);</div><div class='del'>-	if (is_pbm_a)</div><div class='del'>-		pbm = &amp;p-&gt;pbm_A;</div><div class='del'>-	else</div><div class='del'>-		pbm = &amp;p-&gt;pbm_B;</div><div class='ctx'> </div><div class='ctx'> 	pbm-&gt;next = pci_pbm_root;</div><div class='ctx'> 	pci_pbm_root = pbm;</div><div class='ctx'> </div><div class='ctx'> 	pbm-&gt;numa_node = -1;</div><div class='ctx'> </div><div class='del'>-	pbm-&gt;scan_bus = schizo_scan_bus;</div><div class='ctx'> 	pbm-&gt;pci_ops = &amp;sun4u_pci_ops;</div><div class='ctx'> 	pbm-&gt;config_space_reg_bits = 8;</div><div class='ctx'> </div><div class='ctx'> 	pbm-&gt;index = pci_num_pbms++;</div><div class='ctx'> </div><div class='ctx'> 	pbm-&gt;portid = portid;</div><div class='del'>-	pbm-&gt;parent = p;</div><div class='del'>-	pbm-&gt;prom_node = dp;</div><div class='add'>+	pbm-&gt;op = op;</div><div class='ctx'> </div><div class='ctx'> 	pbm-&gt;chip_type = chip_type;</div><div class='ctx'> 	pbm-&gt;chip_version = of_getintprop_default(dp, "version#", 0);</div><div class='hunk'>@@ -1420,6 +1386,8 @@ static int __init schizo_pbm_init(struct pci_controller_info *p,</div><div class='ctx'> </div><div class='ctx'> 	schizo_pbm_strbuf_init(pbm);</div><div class='ctx'> </div><div class='add'>+	schizo_scan_bus(pbm, &amp;op-&gt;dev);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1433,62 +1401,104 @@ static inline int portid_compare(u32 x, u32 y, int chip_type)</div><div class='ctx'> 	return (x == y);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __init __schizo_init(struct device_node *dp, char *model_name,</div><div class='del'>-				 int chip_type)</div><div class='add'>+static struct pci_pbm_info * __devinit schizo_find_sibling(u32 portid,</div><div class='add'>+							   int chip_type)</div><div class='ctx'> {</div><div class='del'>-	struct pci_controller_info *p;</div><div class='add'>+	struct pci_pbm_info *pbm;</div><div class='add'>+</div><div class='add'>+	for (pbm = pci_pbm_root; pbm; pbm = pbm-&gt;next) {</div><div class='add'>+		if (portid_compare(pbm-&gt;portid, portid, chip_type))</div><div class='add'>+			return pbm;</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devinit __schizo_init(struct of_device *op, unsigned long chip_type)</div><div class='add'>+{</div><div class='add'>+	struct device_node *dp = op-&gt;node;</div><div class='ctx'> 	struct pci_pbm_info *pbm;</div><div class='ctx'> 	struct iommu *iommu;</div><div class='ctx'> 	u32 portid;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	portid = of_getintprop_default(dp, "portid", 0xff);</div><div class='ctx'> </div><div class='del'>-	for (pbm = pci_pbm_root; pbm; pbm = pbm-&gt;next) {</div><div class='del'>-		if (portid_compare(pbm-&gt;portid, portid, chip_type)) {</div><div class='del'>-			if (schizo_pbm_init(pbm-&gt;parent, dp,</div><div class='del'>-					    portid, chip_type))</div><div class='del'>-				goto fatal_memory_error;</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='add'>+	err = -ENOMEM;</div><div class='add'>+	pbm = kzalloc(sizeof(*pbm), GFP_KERNEL);</div><div class='add'>+	if (!pbm) {</div><div class='add'>+		printk(KERN_ERR PFX "Cannot allocate pci_pbm_info.\n");</div><div class='add'>+		goto out_err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pbm-&gt;sibling = schizo_find_sibling(portid, chip_type);</div><div class='add'>+</div><div class='add'>+	iommu = kzalloc(sizeof(struct iommu), GFP_KERNEL);</div><div class='add'>+	if (!iommu) {</div><div class='add'>+		printk(KERN_ERR PFX "Cannot allocate PBM A iommu.\n");</div><div class='add'>+		goto out_free_pbm;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	p = kzalloc(sizeof(struct pci_controller_info), GFP_ATOMIC);</div><div class='del'>-	if (!p)</div><div class='del'>-		goto fatal_memory_error;</div><div class='add'>+	pbm-&gt;iommu = iommu;</div><div class='ctx'> </div><div class='del'>-	iommu = kzalloc(sizeof(struct iommu), GFP_ATOMIC);</div><div class='del'>-	if (!iommu)</div><div class='del'>-		goto fatal_memory_error;</div><div class='add'>+	if (schizo_pbm_init(pbm, op, portid, chip_type))</div><div class='add'>+		goto out_free_iommu;</div><div class='ctx'> </div><div class='del'>-	p-&gt;pbm_A.iommu = iommu;</div><div class='add'>+	if (pbm-&gt;sibling)</div><div class='add'>+		pbm-&gt;sibling-&gt;sibling = pbm;</div><div class='ctx'> </div><div class='del'>-	iommu = kzalloc(sizeof(struct iommu), GFP_ATOMIC);</div><div class='del'>-	if (!iommu)</div><div class='del'>-		goto fatal_memory_error;</div><div class='add'>+	dev_set_drvdata(&amp;op-&gt;dev, pbm);</div><div class='ctx'> </div><div class='del'>-	p-&gt;pbm_B.iommu = iommu;</div><div class='add'>+	return 0;</div><div class='ctx'> </div><div class='del'>-	if (schizo_pbm_init(p, dp, portid, chip_type))</div><div class='del'>-		goto fatal_memory_error;</div><div class='add'>+out_free_iommu:</div><div class='add'>+	kfree(pbm-&gt;iommu);</div><div class='ctx'> </div><div class='del'>-	return;</div><div class='add'>+out_free_pbm:</div><div class='add'>+	kfree(pbm);</div><div class='ctx'> </div><div class='del'>-fatal_memory_error:</div><div class='del'>-	prom_printf("SCHIZO: Fatal memory allocation error.\n");</div><div class='del'>-	prom_halt();</div><div class='add'>+out_err:</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init schizo_init(struct device_node *dp, char *model_name)</div><div class='add'>+static int __devinit schizo_probe(struct of_device *op,</div><div class='add'>+				  const struct of_device_id *match)</div><div class='ctx'> {</div><div class='del'>-	__schizo_init(dp, model_name, PBM_CHIP_TYPE_SCHIZO);</div><div class='add'>+	return __schizo_init(op, (unsigned long) match-&gt;data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init schizo_plus_init(struct device_node *dp, char *model_name)</div><div class='del'>-{</div><div class='del'>-	__schizo_init(dp, model_name, PBM_CHIP_TYPE_SCHIZO_PLUS);</div><div class='del'>-}</div><div class='add'>+/* The ordering of this table is very important.  Some Tomatillo</div><div class='add'>+ * nodes announce that they are compatible with both pci108e,a801</div><div class='add'>+ * and pci108e,8001.  So list the chips in reverse chronological</div><div class='add'>+ * order.</div><div class='add'>+ */</div><div class='add'>+static struct of_device_id __initdata schizo_match[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "pci",</div><div class='add'>+		.compatible = "pci108e,a801",</div><div class='add'>+		.data = (void *) PBM_CHIP_TYPE_TOMATILLO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "pci",</div><div class='add'>+		.compatible = "pci108e,8002",</div><div class='add'>+		.data = (void *) PBM_CHIP_TYPE_SCHIZO_PLUS,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "pci",</div><div class='add'>+		.compatible = "pci108e,8001",</div><div class='add'>+		.data = (void *) PBM_CHIP_TYPE_SCHIZO,</div><div class='add'>+	},</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-void __init tomatillo_init(struct device_node *dp, char *model_name)</div><div class='add'>+static struct of_platform_driver schizo_driver = {</div><div class='add'>+	.name		= DRIVER_NAME,</div><div class='add'>+	.match_table	= schizo_match,</div><div class='add'>+	.probe		= schizo_probe,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init schizo_init(void)</div><div class='ctx'> {</div><div class='del'>-	__schizo_init(dp, model_name, PBM_CHIP_TYPE_TOMATILLO);</div><div class='add'>+	return of_register_driver(&amp;schizo_driver, &amp;of_bus_type);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+subsys_initcall(schizo_init);</div><div class='head'>diff --git a/arch/sparc64/kernel/pci_sun4v.c b/arch/sparc64/kernel/pci_sun4v.c<br/>index a104c80d319d..34a1fded3941 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/pci_sun4v.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc64/kernel/pci_sun4v.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/pci_sun4v.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/pci_sun4v.c</a></div><div class='hunk'>@@ -13,12 +13,10 @@</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/msi.h&gt;</div><div class='ctx'> #include &lt;linux/log2.h&gt;</div><div class='add'>+#include &lt;linux/of_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/iommu.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/upa.h&gt;</div><div class='del'>-#include &lt;asm/pstate.h&gt;</div><div class='del'>-#include &lt;asm/oplib.h&gt;</div><div class='ctx'> #include &lt;asm/hypervisor.h&gt;</div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -27,6 +25,9 @@</div><div class='ctx'> </div><div class='ctx'> #include "pci_sun4v.h"</div><div class='ctx'> </div><div class='add'>+#define DRIVER_NAME	"pci_sun4v"</div><div class='add'>+#define PFX		DRIVER_NAME ": "</div><div class='add'>+</div><div class='ctx'> static unsigned long vpci_major = 1;</div><div class='ctx'> static unsigned long vpci_minor = 1;</div><div class='ctx'> </div><div class='hunk'>@@ -41,6 +42,7 @@ struct iommu_batch {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static DEFINE_PER_CPU(struct iommu_batch, iommu_batch);</div><div class='add'>+static int iommu_batch_initialized;</div><div class='ctx'> </div><div class='ctx'> /* Interrupts must be disabled.  */</div><div class='ctx'> static inline void iommu_batch_start(struct device *dev, unsigned long prot, unsigned long entry)</div><div class='hunk'>@@ -382,7 +384,7 @@ static int dma_4v_map_sg(struct device *dev, struct scatterlist *sglist,</div><div class='ctx'> 		}</div><div class='ctx'> 		/* Allocate iommu entries for that segment */</div><div class='ctx'> 		paddr = (unsigned long) SG_ENT_PHYS_ADDRESS(s);</div><div class='del'>-		npages = iommu_num_pages(paddr, slen);</div><div class='add'>+		npages = iommu_num_pages(paddr, slen, IO_PAGE_SIZE);</div><div class='ctx'> 		entry = iommu_range_alloc(dev, iommu, npages, &amp;handle);</div><div class='ctx'> </div><div class='ctx'> 		/* Handle failure */</div><div class='hunk'>@@ -459,7 +461,8 @@ iommu_map_failed:</div><div class='ctx'> 			unsigned long vaddr, npages;</div><div class='ctx'> </div><div class='ctx'> 			vaddr = s-&gt;dma_address &amp; IO_PAGE_MASK;</div><div class='del'>-			npages = iommu_num_pages(s-&gt;dma_address, s-&gt;dma_length);</div><div class='add'>+			npages = iommu_num_pages(s-&gt;dma_address, s-&gt;dma_length,</div><div class='add'>+						 IO_PAGE_SIZE);</div><div class='ctx'> 			iommu_range_free(iommu, vaddr, npages);</div><div class='ctx'> 			/* XXX demap? XXX */</div><div class='ctx'> 			s-&gt;dma_address = DMA_ERROR_CODE;</div><div class='hunk'>@@ -498,7 +501,7 @@ static void dma_4v_unmap_sg(struct device *dev, struct scatterlist *sglist,</div><div class='ctx'> </div><div class='ctx'> 		if (!len)</div><div class='ctx'> 			break;</div><div class='del'>-		npages = iommu_num_pages(dma_handle, len);</div><div class='add'>+		npages = iommu_num_pages(dma_handle, len, IO_PAGE_SIZE);</div><div class='ctx'> 		iommu_range_free(iommu, dma_handle, npages);</div><div class='ctx'> </div><div class='ctx'> 		entry = ((dma_handle - iommu-&gt;page_table_map_base) &gt;&gt; IO_PAGE_SHIFT);</div><div class='hunk'>@@ -542,15 +545,16 @@ static const struct dma_ops sun4v_dma_ops = {</div><div class='ctx'> 	.sync_sg_for_cpu		= dma_4v_sync_sg_for_cpu,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void __init pci_sun4v_scan_bus(struct pci_pbm_info *pbm)</div><div class='add'>+static void __init pci_sun4v_scan_bus(struct pci_pbm_info *pbm,</div><div class='add'>+				      struct device *parent)</div><div class='ctx'> {</div><div class='ctx'> 	struct property *prop;</div><div class='ctx'> 	struct device_node *dp;</div><div class='ctx'> </div><div class='del'>-	dp = pbm-&gt;prom_node;</div><div class='add'>+	dp = pbm-&gt;op-&gt;node;</div><div class='ctx'> 	prop = of_find_property(dp, "66mhz-capable", NULL);</div><div class='ctx'> 	pbm-&gt;is_66mhz_capable = (prop != NULL);</div><div class='del'>-	pbm-&gt;pci_bus = pci_scan_one_pbm(pbm);</div><div class='add'>+	pbm-&gt;pci_bus = pci_scan_one_pbm(pbm, parent);</div><div class='ctx'> </div><div class='ctx'> 	/* XXX register error interrupt handlers XXX */</div><div class='ctx'> }</div><div class='hunk'>@@ -583,29 +587,22 @@ static unsigned long __init probe_existing_entries(struct pci_pbm_info *pbm,</div><div class='ctx'> 	return cnt;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __init pci_sun4v_iommu_init(struct pci_pbm_info *pbm)</div><div class='add'>+static int __init pci_sun4v_iommu_init(struct pci_pbm_info *pbm)</div><div class='ctx'> {</div><div class='add'>+	static const u32 vdma_default[] = { 0x80000000, 0x80000000 };</div><div class='ctx'> 	struct iommu *iommu = pbm-&gt;iommu;</div><div class='del'>-	struct property *prop;</div><div class='ctx'> 	unsigned long num_tsb_entries, sz, tsbsize;</div><div class='del'>-	u32 vdma[2], dma_mask, dma_offset;</div><div class='del'>-</div><div class='del'>-	prop = of_find_property(pbm-&gt;prom_node, "virtual-dma", NULL);</div><div class='del'>-	if (prop) {</div><div class='del'>-		u32 *val = prop-&gt;value;</div><div class='del'>-</div><div class='del'>-		vdma[0] = val[0];</div><div class='del'>-		vdma[1] = val[1];</div><div class='del'>-	} else {</div><div class='del'>-		/* No property, use default values. */</div><div class='del'>-		vdma[0] = 0x80000000;</div><div class='del'>-		vdma[1] = 0x80000000;</div><div class='del'>-	}</div><div class='add'>+	u32 dma_mask, dma_offset;</div><div class='add'>+	const u32 *vdma;</div><div class='add'>+</div><div class='add'>+	vdma = of_get_property(pbm-&gt;op-&gt;node, "virtual-dma", NULL);</div><div class='add'>+	if (!vdma)</div><div class='add'>+		vdma = vdma_default;</div><div class='ctx'> </div><div class='ctx'> 	if ((vdma[0] | vdma[1]) &amp; ~IO_PAGE_MASK) {</div><div class='del'>-		prom_printf("PCI-SUN4V: strange virtual-dma[%08x:%08x].\n",</div><div class='del'>-			    vdma[0], vdma[1]);</div><div class='del'>-		prom_halt();</div><div class='add'>+		printk(KERN_ERR PFX "Strange virtual-dma[%08x:%08x].\n",</div><div class='add'>+		       vdma[0], vdma[1]);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	dma_mask = (roundup_pow_of_two(vdma[1]) - 1UL);</div><div class='hunk'>@@ -625,8 +622,8 @@ static void __init pci_sun4v_iommu_init(struct pci_pbm_info *pbm)</div><div class='ctx'> 	sz = (sz + 7UL) &amp; ~7UL;</div><div class='ctx'> 	iommu-&gt;arena.map = kzalloc(sz, GFP_KERNEL);</div><div class='ctx'> 	if (!iommu-&gt;arena.map) {</div><div class='del'>-		prom_printf("PCI_IOMMU: Error, kmalloc(arena.map) failed.\n");</div><div class='del'>-		prom_halt();</div><div class='add'>+		printk(KERN_ERR PFX "Error, kmalloc(arena.map) failed.\n");</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> 	iommu-&gt;arena.limit = num_tsb_entries;</div><div class='ctx'> </div><div class='hunk'>@@ -634,6 +631,8 @@ static void __init pci_sun4v_iommu_init(struct pci_pbm_info *pbm)</div><div class='ctx'> 	if (sz)</div><div class='ctx'> 		printk("%s: Imported %lu TSB entries from OBP\n",</div><div class='ctx'> 		       pbm-&gt;name, sz);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PCI_MSI</div><div class='hunk'>@@ -890,29 +889,20 @@ static void pci_sun4v_msi_init(struct pci_pbm_info *pbm)</div><div class='ctx'> }</div><div class='ctx'> #endif /* !(CONFIG_PCI_MSI) */</div><div class='ctx'> </div><div class='del'>-static void __init pci_sun4v_pbm_init(struct pci_controller_info *p,</div><div class='del'>-				      struct device_node *dp, u32 devhandle)</div><div class='add'>+static int __init pci_sun4v_pbm_init(struct pci_pbm_info *pbm,</div><div class='add'>+				     struct of_device *op, u32 devhandle)</div><div class='ctx'> {</div><div class='del'>-	struct pci_pbm_info *pbm;</div><div class='del'>-</div><div class='del'>-	if (devhandle &amp; 0x40)</div><div class='del'>-		pbm = &amp;p-&gt;pbm_B;</div><div class='del'>-	else</div><div class='del'>-		pbm = &amp;p-&gt;pbm_A;</div><div class='del'>-</div><div class='del'>-	pbm-&gt;next = pci_pbm_root;</div><div class='del'>-	pci_pbm_root = pbm;</div><div class='add'>+	struct device_node *dp = op-&gt;node;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	pbm-&gt;numa_node = of_node_to_nid(dp);</div><div class='ctx'> </div><div class='del'>-	pbm-&gt;scan_bus = pci_sun4v_scan_bus;</div><div class='ctx'> 	pbm-&gt;pci_ops = &amp;sun4v_pci_ops;</div><div class='ctx'> 	pbm-&gt;config_space_reg_bits = 12;</div><div class='ctx'> </div><div class='ctx'> 	pbm-&gt;index = pci_num_pbms++;</div><div class='ctx'> </div><div class='del'>-	pbm-&gt;parent = p;</div><div class='del'>-	pbm-&gt;prom_node = dp;</div><div class='add'>+	pbm-&gt;op = op;</div><div class='ctx'> </div><div class='ctx'> 	pbm-&gt;devhandle = devhandle;</div><div class='ctx'> </div><div class='hunk'>@@ -924,82 +914,120 @@ static void __init pci_sun4v_pbm_init(struct pci_controller_info *p,</div><div class='ctx'> 	pci_determine_mem_io_space(pbm);</div><div class='ctx'> </div><div class='ctx'> 	pci_get_pbm_props(pbm);</div><div class='del'>-	pci_sun4v_iommu_init(pbm);</div><div class='add'>+</div><div class='add'>+	err = pci_sun4v_iommu_init(pbm);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='ctx'> 	pci_sun4v_msi_init(pbm);</div><div class='add'>+</div><div class='add'>+	pci_sun4v_scan_bus(pbm, &amp;op-&gt;dev);</div><div class='add'>+</div><div class='add'>+	pbm-&gt;next = pci_pbm_root;</div><div class='add'>+	pci_pbm_root = pbm;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init sun4v_pci_init(struct device_node *dp, char *model_name)</div><div class='add'>+static int __devinit pci_sun4v_probe(struct of_device *op,</div><div class='add'>+				     const struct of_device_id *match)</div><div class='ctx'> {</div><div class='add'>+	const struct linux_prom64_registers *regs;</div><div class='ctx'> 	static int hvapi_negotiated = 0;</div><div class='del'>-	struct pci_controller_info *p;</div><div class='ctx'> 	struct pci_pbm_info *pbm;</div><div class='add'>+	struct device_node *dp;</div><div class='ctx'> 	struct iommu *iommu;</div><div class='del'>-	struct property *prop;</div><div class='del'>-	struct linux_prom64_registers *regs;</div><div class='ctx'> 	u32 devhandle;</div><div class='del'>-	int i;</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	dp = op-&gt;node;</div><div class='ctx'> </div><div class='ctx'> 	if (!hvapi_negotiated++) {</div><div class='del'>-		int err = sun4v_hvapi_register(HV_GRP_PCI,</div><div class='del'>-					       vpci_major,</div><div class='del'>-					       &amp;vpci_minor);</div><div class='add'>+		err = sun4v_hvapi_register(HV_GRP_PCI,</div><div class='add'>+					   vpci_major,</div><div class='add'>+					   &amp;vpci_minor);</div><div class='ctx'> </div><div class='ctx'> 		if (err) {</div><div class='del'>-			prom_printf("SUN4V_PCI: Could not register hvapi, "</div><div class='del'>-				    "err=%d\n", err);</div><div class='del'>-			prom_halt();</div><div class='add'>+			printk(KERN_ERR PFX "Could not register hvapi, "</div><div class='add'>+			       "err=%d\n", err);</div><div class='add'>+			return err;</div><div class='ctx'> 		}</div><div class='del'>-		printk("SUN4V_PCI: Registered hvapi major[%lu] minor[%lu]\n",</div><div class='add'>+		printk(KERN_INFO PFX "Registered hvapi major[%lu] minor[%lu]\n",</div><div class='ctx'> 		       vpci_major, vpci_minor);</div><div class='ctx'> </div><div class='ctx'> 		dma_ops = &amp;sun4v_dma_ops;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	prop = of_find_property(dp, "reg", NULL);</div><div class='del'>-	if (!prop) {</div><div class='del'>-		prom_printf("SUN4V_PCI: Could not find config registers\n");</div><div class='del'>-		prom_halt();</div><div class='add'>+	regs = of_get_property(dp, "reg", NULL);</div><div class='add'>+	err = -ENODEV;</div><div class='add'>+	if (!regs) {</div><div class='add'>+		printk(KERN_ERR PFX "Could not find config registers\n");</div><div class='add'>+		goto out_err;</div><div class='ctx'> 	}</div><div class='del'>-	regs = prop-&gt;value;</div><div class='del'>-</div><div class='ctx'> 	devhandle = (regs-&gt;phys_addr &gt;&gt; 32UL) &amp; 0x0fffffff;</div><div class='ctx'> </div><div class='del'>-	for (pbm = pci_pbm_root; pbm; pbm = pbm-&gt;next) {</div><div class='del'>-		if (pbm-&gt;devhandle == (devhandle ^ 0x40)) {</div><div class='del'>-			pci_sun4v_pbm_init(pbm-&gt;parent, dp, devhandle);</div><div class='del'>-			return;</div><div class='add'>+	err = -ENOMEM;</div><div class='add'>+	if (!iommu_batch_initialized) {</div><div class='add'>+		for_each_possible_cpu(i) {</div><div class='add'>+			unsigned long page = get_zeroed_page(GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+			if (!page)</div><div class='add'>+				goto out_err;</div><div class='add'>+</div><div class='add'>+			per_cpu(iommu_batch, i).pglist = (u64 *) page;</div><div class='ctx'> 		}</div><div class='add'>+		iommu_batch_initialized = 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for_each_possible_cpu(i) {</div><div class='del'>-		unsigned long page = get_zeroed_page(GFP_ATOMIC);</div><div class='del'>-</div><div class='del'>-		if (!page)</div><div class='del'>-			goto fatal_memory_error;</div><div class='add'>+	pbm = kzalloc(sizeof(*pbm), GFP_KERNEL);</div><div class='add'>+	if (!pbm) {</div><div class='add'>+		printk(KERN_ERR PFX "Could not allocate pci_pbm_info\n");</div><div class='add'>+		goto out_err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		per_cpu(iommu_batch, i).pglist = (u64 *) page;</div><div class='add'>+	iommu = kzalloc(sizeof(struct iommu), GFP_KERNEL);</div><div class='add'>+	if (!iommu) {</div><div class='add'>+		printk(KERN_ERR PFX "Could not allocate pbm iommu\n");</div><div class='add'>+		goto out_free_controller;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	p = kzalloc(sizeof(struct pci_controller_info), GFP_ATOMIC);</div><div class='del'>-	if (!p)</div><div class='del'>-		goto fatal_memory_error;</div><div class='add'>+	pbm-&gt;iommu = iommu;</div><div class='ctx'> </div><div class='del'>-	iommu = kzalloc(sizeof(struct iommu), GFP_ATOMIC);</div><div class='del'>-	if (!iommu)</div><div class='del'>-		goto fatal_memory_error;</div><div class='add'>+	err = pci_sun4v_pbm_init(pbm, op, devhandle);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_free_iommu;</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(&amp;op-&gt;dev, pbm);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_free_iommu:</div><div class='add'>+	kfree(pbm-&gt;iommu);</div><div class='ctx'> </div><div class='del'>-	p-&gt;pbm_A.iommu = iommu;</div><div class='add'>+out_free_controller:</div><div class='add'>+	kfree(pbm);</div><div class='ctx'> </div><div class='del'>-	iommu = kzalloc(sizeof(struct iommu), GFP_ATOMIC);</div><div class='del'>-	if (!iommu)</div><div class='del'>-		goto fatal_memory_error;</div><div class='add'>+out_err:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	p-&gt;pbm_B.iommu = iommu;</div><div class='add'>+static struct of_device_id __initdata pci_sun4v_match[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "pci",</div><div class='add'>+		.compatible = "SUNW,sun4v-pci",</div><div class='add'>+	},</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-	pci_sun4v_pbm_init(p, dp, devhandle);</div><div class='del'>-	return;</div><div class='add'>+static struct of_platform_driver pci_sun4v_driver = {</div><div class='add'>+	.name		= DRIVER_NAME,</div><div class='add'>+	.match_table	= pci_sun4v_match,</div><div class='add'>+	.probe		= pci_sun4v_probe,</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-fatal_memory_error:</div><div class='del'>-	prom_printf("SUN4V_PCI: Fatal memory allocation error.\n");</div><div class='del'>-	prom_halt();</div><div class='add'>+static int __init pci_sun4v_init(void)</div><div class='add'>+{</div><div class='add'>+	return of_register_driver(&amp;pci_sun4v_driver, &amp;of_bus_type);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+subsys_initcall(pci_sun4v_init);</div><div class='head'>diff --git a/arch/sparc64/kernel/pci_sun4v_asm.S b/arch/sparc64/kernel/pci_sun4v_asm.S<br/>index ecb81f389b06..e606d46c6815 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/pci_sun4v_asm.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc64/kernel/pci_sun4v_asm.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/pci_sun4v_asm.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/pci_sun4v_asm.S</a></div><div class='hunk'>@@ -1,8 +1,9 @@</div><div class='ctx'> /* pci_sun4v_asm: Hypervisor calls for PCI support.</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2006 David S. Miller &lt;davem@davemloft.net&gt;</div><div class='add'>+ * Copyright (C) 2006, 2008 David S. Miller &lt;davem@davemloft.net&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/hypervisor.h&gt;</div><div class='ctx'> </div><div class='ctx'> 	/* %o0: devhandle</div><div class='hunk'>@@ -14,8 +15,7 @@</div><div class='ctx'> 	 * returns %o0:	-status if status was non-zero, else</div><div class='ctx'> 	 *         %o0:	num pages mapped</div><div class='ctx'> 	 */</div><div class='del'>-	.globl	pci_sun4v_iommu_map</div><div class='del'>-pci_sun4v_iommu_map:</div><div class='add'>+ENTRY(pci_sun4v_iommu_map)</div><div class='ctx'> 	mov	%o5, %g1</div><div class='ctx'> 	mov	HV_FAST_PCI_IOMMU_MAP, %o5</div><div class='ctx'> 	ta	HV_FAST_TRAP</div><div class='hunk'>@@ -24,6 +24,7 @@ pci_sun4v_iommu_map:</div><div class='ctx'> 	mov	%o1, %o0</div><div class='ctx'> 1:	retl</div><div class='ctx'> 	 nop</div><div class='add'>+ENDPROC(pci_sun4v_iommu_map)</div><div class='ctx'> </div><div class='ctx'> 	/* %o0: devhandle</div><div class='ctx'> 	 * %o1:	tsbid</div><div class='hunk'>@@ -31,12 +32,12 @@ pci_sun4v_iommu_map:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * returns %o0:	num ttes demapped</div><div class='ctx'> 	 */</div><div class='del'>-	.globl	pci_sun4v_iommu_demap</div><div class='del'>-pci_sun4v_iommu_demap:</div><div class='add'>+ENTRY(pci_sun4v_iommu_demap)</div><div class='ctx'> 	mov	HV_FAST_PCI_IOMMU_DEMAP, %o5</div><div class='ctx'> 	ta	HV_FAST_TRAP</div><div class='ctx'> 	retl</div><div class='ctx'> 	 mov	%o1, %o0</div><div class='add'>+ENDPROC(pci_sun4v_iommu_demap)</div><div class='ctx'> </div><div class='ctx'> 	/* %o0: devhandle</div><div class='ctx'> 	 * %o1:	tsbid</div><div class='hunk'>@@ -45,8 +46,7 @@ pci_sun4v_iommu_demap:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * returns %o0:	status</div><div class='ctx'> 	 */</div><div class='del'>-	.globl	pci_sun4v_iommu_getmap</div><div class='del'>-pci_sun4v_iommu_getmap:</div><div class='add'>+ENTRY(pci_sun4v_iommu_getmap)</div><div class='ctx'> 	mov	%o2, %o4</div><div class='ctx'> 	mov	HV_FAST_PCI_IOMMU_GETMAP, %o5</div><div class='ctx'> 	ta	HV_FAST_TRAP</div><div class='hunk'>@@ -54,6 +54,7 @@ pci_sun4v_iommu_getmap:</div><div class='ctx'> 	stx	%o2, [%o3]</div><div class='ctx'> 	retl</div><div class='ctx'> 	 mov	%o0, %o0</div><div class='add'>+ENDPROC(pci_sun4v_iommu_getmap)</div><div class='ctx'> </div><div class='ctx'> 	/* %o0: devhandle</div><div class='ctx'> 	 * %o1:	pci_device</div><div class='hunk'>@@ -65,14 +66,14 @@ pci_sun4v_iommu_getmap:</div><div class='ctx'> 	 * If there is an error, the data will be returned</div><div class='ctx'> 	 * as all 1's.</div><div class='ctx'> 	 */</div><div class='del'>-	.globl	pci_sun4v_config_get</div><div class='del'>-pci_sun4v_config_get:</div><div class='add'>+ENTRY(pci_sun4v_config_get)</div><div class='ctx'> 	mov	HV_FAST_PCI_CONFIG_GET, %o5</div><div class='ctx'> 	ta	HV_FAST_TRAP</div><div class='ctx'> 	brnz,a,pn %o1, 1f</div><div class='ctx'> 	 mov	-1, %o2</div><div class='ctx'> 1:	retl</div><div class='ctx'> 	 mov	%o2, %o0</div><div class='add'>+ENDPROC(pci_sun4v_config_get)</div><div class='ctx'> </div><div class='ctx'> 	/* %o0: devhandle</div><div class='ctx'> 	 * %o1:	pci_device</div><div class='hunk'>@@ -85,14 +86,14 @@ pci_sun4v_config_get:</div><div class='ctx'> 	 * status will be zero if the operation completed</div><div class='ctx'> 	 * successfully, else -1 if not</div><div class='ctx'> 	 */</div><div class='del'>-	.globl	pci_sun4v_config_put</div><div class='del'>-pci_sun4v_config_put:</div><div class='add'>+ENTRY(pci_sun4v_config_put)</div><div class='ctx'> 	mov	HV_FAST_PCI_CONFIG_PUT, %o5</div><div class='ctx'> 	ta	HV_FAST_TRAP</div><div class='ctx'> 	brnz,a,pn %o1, 1f</div><div class='ctx'> 	 mov	-1, %o1</div><div class='ctx'> 1:	retl</div><div class='ctx'> 	 mov	%o1, %o0</div><div class='add'>+ENDPROC(pci_sun4v_config_put)</div><div class='ctx'> </div><div class='ctx'> 	/* %o0: devhandle</div><div class='ctx'> 	 * %o1: msiqid</div><div class='hunk'>@@ -104,12 +105,12 @@ pci_sun4v_config_put:</div><div class='ctx'> 	 * status will be zero if the operation completed</div><div class='ctx'> 	 * successfully, else -1 if not</div><div class='ctx'> 	 */</div><div class='del'>-	.globl	pci_sun4v_msiq_conf</div><div class='del'>-pci_sun4v_msiq_conf:</div><div class='add'>+ENTRY(pci_sun4v_msiq_conf)</div><div class='ctx'> 	mov	HV_FAST_PCI_MSIQ_CONF, %o5</div><div class='ctx'> 	ta	HV_FAST_TRAP</div><div class='ctx'> 	retl</div><div class='ctx'> 	 mov	%o0, %o0</div><div class='add'>+ENDPROC(pci_sun4v_msiq_conf)</div><div class='ctx'> </div><div class='ctx'> 	/* %o0: devhandle</div><div class='ctx'> 	 * %o1: msiqid</div><div class='hunk'>@@ -118,8 +119,7 @@ pci_sun4v_msiq_conf:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * returns %o0: status</div><div class='ctx'> 	 */</div><div class='del'>-	.globl	pci_sun4v_msiq_info</div><div class='del'>-pci_sun4v_msiq_info:</div><div class='add'>+ENTRY(pci_sun4v_msiq_info)</div><div class='ctx'> 	mov	%o2, %o4</div><div class='ctx'> 	mov	HV_FAST_PCI_MSIQ_INFO, %o5</div><div class='ctx'> 	ta	HV_FAST_TRAP</div><div class='hunk'>@@ -127,6 +127,7 @@ pci_sun4v_msiq_info:</div><div class='ctx'> 	stx	%o2, [%o3]</div><div class='ctx'> 	retl</div><div class='ctx'> 	 mov	%o0, %o0</div><div class='add'>+ENDPROC(pci_sun4v_msiq_info)</div><div class='ctx'> </div><div class='ctx'> 	/* %o0: devhandle</div><div class='ctx'> 	 * %o1: msiqid</div><div class='hunk'>@@ -134,13 +135,13 @@ pci_sun4v_msiq_info:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * returns %o0: status</div><div class='ctx'> 	 */</div><div class='del'>-	.globl	pci_sun4v_msiq_getvalid</div><div class='del'>-pci_sun4v_msiq_getvalid:</div><div class='add'>+ENTRY(pci_sun4v_msiq_getvalid)</div><div class='ctx'> 	mov	HV_FAST_PCI_MSIQ_GETVALID, %o5</div><div class='ctx'> 	ta	HV_FAST_TRAP</div><div class='ctx'> 	stx	%o1, [%o2]</div><div class='ctx'> 	retl</div><div class='ctx'> 	 mov	%o0, %o0</div><div class='add'>+ENDPROC(pci_sun4v_msiq_getvalid)</div><div class='ctx'> </div><div class='ctx'> 	/* %o0: devhandle</div><div class='ctx'> 	 * %o1: msiqid</div><div class='hunk'>@@ -148,12 +149,12 @@ pci_sun4v_msiq_getvalid:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * returns %o0: status</div><div class='ctx'> 	 */</div><div class='del'>-	.globl	pci_sun4v_msiq_setvalid</div><div class='del'>-pci_sun4v_msiq_setvalid:</div><div class='add'>+ENTRY(pci_sun4v_msiq_setvalid)</div><div class='ctx'> 	mov	HV_FAST_PCI_MSIQ_SETVALID, %o5</div><div class='ctx'> 	ta	HV_FAST_TRAP</div><div class='ctx'> 	retl</div><div class='ctx'> 	 mov	%o0, %o0</div><div class='add'>+ENDPROC(pci_sun4v_msiq_setvalid)</div><div class='ctx'> </div><div class='ctx'> 	/* %o0: devhandle</div><div class='ctx'> 	 * %o1: msiqid</div><div class='hunk'>@@ -161,13 +162,13 @@ pci_sun4v_msiq_setvalid:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * returns %o0: status</div><div class='ctx'> 	 */</div><div class='del'>-	.globl	pci_sun4v_msiq_getstate</div><div class='del'>-pci_sun4v_msiq_getstate:</div><div class='add'>+ENTRY(pci_sun4v_msiq_getstate)</div><div class='ctx'> 	mov	HV_FAST_PCI_MSIQ_GETSTATE, %o5</div><div class='ctx'> 	ta	HV_FAST_TRAP</div><div class='ctx'> 	stx	%o1, [%o2]</div><div class='ctx'> 	retl</div><div class='ctx'> 	 mov	%o0, %o0</div><div class='add'>+ENDPROC(pci_sun4v_msiq_getstate)</div><div class='ctx'> </div><div class='ctx'> 	/* %o0: devhandle</div><div class='ctx'> 	 * %o1: msiqid</div><div class='hunk'>@@ -175,12 +176,12 @@ pci_sun4v_msiq_getstate:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * returns %o0: status</div><div class='ctx'> 	 */</div><div class='del'>-	.globl	pci_sun4v_msiq_setstate</div><div class='del'>-pci_sun4v_msiq_setstate:</div><div class='add'>+ENTRY(pci_sun4v_msiq_setstate)</div><div class='ctx'> 	mov	HV_FAST_PCI_MSIQ_SETSTATE, %o5</div><div class='ctx'> 	ta	HV_FAST_TRAP</div><div class='ctx'> 	retl</div><div class='ctx'> 	 mov	%o0, %o0</div><div class='add'>+ENDPROC(pci_sun4v_msiq_setstate)</div><div class='ctx'> </div><div class='ctx'> 	/* %o0: devhandle</div><div class='ctx'> 	 * %o1: msiqid</div><div class='hunk'>@@ -188,13 +189,13 @@ pci_sun4v_msiq_setstate:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * returns %o0: status</div><div class='ctx'> 	 */</div><div class='del'>-	.globl	pci_sun4v_msiq_gethead</div><div class='del'>-pci_sun4v_msiq_gethead:</div><div class='add'>+ENTRY(pci_sun4v_msiq_gethead)</div><div class='ctx'> 	mov	HV_FAST_PCI_MSIQ_GETHEAD, %o5</div><div class='ctx'> 	ta	HV_FAST_TRAP</div><div class='ctx'> 	stx	%o1, [%o2]</div><div class='ctx'> 	retl</div><div class='ctx'> 	 mov	%o0, %o0</div><div class='add'>+ENDPROC(pci_sun4v_msiq_gethead)</div><div class='ctx'> </div><div class='ctx'> 	/* %o0: devhandle</div><div class='ctx'> 	 * %o1: msiqid</div><div class='hunk'>@@ -202,12 +203,12 @@ pci_sun4v_msiq_gethead:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * returns %o0: status</div><div class='ctx'> 	 */</div><div class='del'>-	.globl	pci_sun4v_msiq_sethead</div><div class='del'>-pci_sun4v_msiq_sethead:</div><div class='add'>+ENTRY(pci_sun4v_msiq_sethead)</div><div class='ctx'> 	mov	HV_FAST_PCI_MSIQ_SETHEAD, %o5</div><div class='ctx'> 	ta	HV_FAST_TRAP</div><div class='ctx'> 	retl</div><div class='ctx'> 	 mov	%o0, %o0</div><div class='add'>+ENDPROC(pci_sun4v_msiq_sethead)</div><div class='ctx'> </div><div class='ctx'> 	/* %o0: devhandle</div><div class='ctx'> 	 * %o1: msiqid</div><div class='hunk'>@@ -215,13 +216,13 @@ pci_sun4v_msiq_sethead:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * returns %o0: status</div><div class='ctx'> 	 */</div><div class='del'>-	.globl	pci_sun4v_msiq_gettail</div><div class='del'>-pci_sun4v_msiq_gettail:</div><div class='add'>+ENTRY(pci_sun4v_msiq_gettail)</div><div class='ctx'> 	mov	HV_FAST_PCI_MSIQ_GETTAIL, %o5</div><div class='ctx'> 	ta	HV_FAST_TRAP</div><div class='ctx'> 	stx	%o1, [%o2]</div><div class='ctx'> 	retl</div><div class='ctx'> 	 mov	%o0, %o0</div><div class='add'>+ENDPROC(pci_sun4v_msiq_gettail)</div><div class='ctx'> </div><div class='ctx'> 	/* %o0: devhandle</div><div class='ctx'> 	 * %o1: msinum</div><div class='hunk'>@@ -229,13 +230,13 @@ pci_sun4v_msiq_gettail:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * returns %o0: status</div><div class='ctx'> 	 */</div><div class='del'>-	.globl	pci_sun4v_msi_getvalid</div><div class='del'>-pci_sun4v_msi_getvalid:</div><div class='add'>+ENTRY(pci_sun4v_msi_getvalid)</div><div class='ctx'> 	mov	HV_FAST_PCI_MSI_GETVALID, %o5</div><div class='ctx'> 	ta	HV_FAST_TRAP</div><div class='ctx'> 	stx	%o1, [%o2]</div><div class='ctx'> 	retl</div><div class='ctx'> 	 mov	%o0, %o0</div><div class='add'>+ENDPROC(pci_sun4v_msi_getvalid)</div><div class='ctx'> </div><div class='ctx'> 	/* %o0: devhandle</div><div class='ctx'> 	 * %o1: msinum</div><div class='hunk'>@@ -243,12 +244,12 @@ pci_sun4v_msi_getvalid:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * returns %o0: status</div><div class='ctx'> 	 */</div><div class='del'>-	.globl	pci_sun4v_msi_setvalid</div><div class='del'>-pci_sun4v_msi_setvalid:</div><div class='add'>+ENTRY(pci_sun4v_msi_setvalid)</div><div class='ctx'> 	mov	HV_FAST_PCI_MSI_SETVALID, %o5</div><div class='ctx'> 	ta	HV_FAST_TRAP</div><div class='ctx'> 	retl</div><div class='ctx'> 	 mov	%o0, %o0</div><div class='add'>+ENDPROC(pci_sun4v_msi_setvalid)</div><div class='ctx'> </div><div class='ctx'> 	/* %o0: devhandle</div><div class='ctx'> 	 * %o1: msinum</div><div class='hunk'>@@ -256,13 +257,13 @@ pci_sun4v_msi_setvalid:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * returns %o0: status</div><div class='ctx'> 	 */</div><div class='del'>-	.globl	pci_sun4v_msi_getmsiq</div><div class='del'>-pci_sun4v_msi_getmsiq:</div><div class='add'>+ENTRY(pci_sun4v_msi_getmsiq)</div><div class='ctx'> 	mov	HV_FAST_PCI_MSI_GETMSIQ, %o5</div><div class='ctx'> 	ta	HV_FAST_TRAP</div><div class='ctx'> 	stx	%o1, [%o2]</div><div class='ctx'> 	retl</div><div class='ctx'> 	 mov	%o0, %o0</div><div class='add'>+ENDPROC(pci_sun4v_msi_getmsiq)</div><div class='ctx'> </div><div class='ctx'> 	/* %o0: devhandle</div><div class='ctx'> 	 * %o1: msinum</div><div class='hunk'>@@ -271,12 +272,12 @@ pci_sun4v_msi_getmsiq:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * returns %o0: status</div><div class='ctx'> 	 */</div><div class='del'>-	.globl	pci_sun4v_msi_setmsiq</div><div class='del'>-pci_sun4v_msi_setmsiq:</div><div class='add'>+ENTRY(pci_sun4v_msi_setmsiq)</div><div class='ctx'> 	mov	HV_FAST_PCI_MSI_SETMSIQ, %o5</div><div class='ctx'> 	ta	HV_FAST_TRAP</div><div class='ctx'> 	retl</div><div class='ctx'> 	 mov	%o0, %o0</div><div class='add'>+ENDPROC(pci_sun4v_msi_setmsiq)</div><div class='ctx'> </div><div class='ctx'> 	/* %o0: devhandle</div><div class='ctx'> 	 * %o1: msinum</div><div class='hunk'>@@ -284,13 +285,13 @@ pci_sun4v_msi_setmsiq:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * returns %o0: status</div><div class='ctx'> 	 */</div><div class='del'>-	.globl	pci_sun4v_msi_getstate</div><div class='del'>-pci_sun4v_msi_getstate:</div><div class='add'>+ENTRY(pci_sun4v_msi_getstate)</div><div class='ctx'> 	mov	HV_FAST_PCI_MSI_GETSTATE, %o5</div><div class='ctx'> 	ta	HV_FAST_TRAP</div><div class='ctx'> 	stx	%o1, [%o2]</div><div class='ctx'> 	retl</div><div class='ctx'> 	 mov	%o0, %o0</div><div class='add'>+ENDPROC(pci_sun4v_msi_getstate)</div><div class='ctx'> </div><div class='ctx'> 	/* %o0: devhandle</div><div class='ctx'> 	 * %o1: msinum</div><div class='hunk'>@@ -298,12 +299,12 @@ pci_sun4v_msi_getstate:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * returns %o0: status</div><div class='ctx'> 	 */</div><div class='del'>-	.globl	pci_sun4v_msi_setstate</div><div class='del'>-pci_sun4v_msi_setstate:</div><div class='add'>+ENTRY(pci_sun4v_msi_setstate)</div><div class='ctx'> 	mov	HV_FAST_PCI_MSI_SETSTATE, %o5</div><div class='ctx'> 	ta	HV_FAST_TRAP</div><div class='ctx'> 	retl</div><div class='ctx'> 	 mov	%o0, %o0</div><div class='add'>+ENDPROC(pci_sun4v_msi_setstate)</div><div class='ctx'> </div><div class='ctx'> 	/* %o0: devhandle</div><div class='ctx'> 	 * %o1: msinum</div><div class='hunk'>@@ -311,13 +312,13 @@ pci_sun4v_msi_setstate:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * returns %o0: status</div><div class='ctx'> 	 */</div><div class='del'>-	.globl	pci_sun4v_msg_getmsiq</div><div class='del'>-pci_sun4v_msg_getmsiq:</div><div class='add'>+ENTRY(pci_sun4v_msg_getmsiq)</div><div class='ctx'> 	mov	HV_FAST_PCI_MSG_GETMSIQ, %o5</div><div class='ctx'> 	ta	HV_FAST_TRAP</div><div class='ctx'> 	stx	%o1, [%o2]</div><div class='ctx'> 	retl</div><div class='ctx'> 	 mov	%o0, %o0</div><div class='add'>+ENDPROC(pci_sun4v_msg_getmsiq)</div><div class='ctx'> </div><div class='ctx'> 	/* %o0: devhandle</div><div class='ctx'> 	 * %o1: msinum</div><div class='hunk'>@@ -325,12 +326,12 @@ pci_sun4v_msg_getmsiq:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * returns %o0: status</div><div class='ctx'> 	 */</div><div class='del'>-	.globl	pci_sun4v_msg_setmsiq</div><div class='del'>-pci_sun4v_msg_setmsiq:</div><div class='add'>+ENTRY(pci_sun4v_msg_setmsiq)</div><div class='ctx'> 	mov	HV_FAST_PCI_MSG_SETMSIQ, %o5</div><div class='ctx'> 	ta	HV_FAST_TRAP</div><div class='ctx'> 	retl</div><div class='ctx'> 	 mov	%o0, %o0</div><div class='add'>+ENDPROC(pci_sun4v_msg_setmsiq)</div><div class='ctx'> </div><div class='ctx'> 	/* %o0: devhandle</div><div class='ctx'> 	 * %o1: msinum</div><div class='hunk'>@@ -338,13 +339,13 @@ pci_sun4v_msg_setmsiq:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * returns %o0: status</div><div class='ctx'> 	 */</div><div class='del'>-	.globl	pci_sun4v_msg_getvalid</div><div class='del'>-pci_sun4v_msg_getvalid:</div><div class='add'>+ENTRY(pci_sun4v_msg_getvalid)</div><div class='ctx'> 	mov	HV_FAST_PCI_MSG_GETVALID, %o5</div><div class='ctx'> 	ta	HV_FAST_TRAP</div><div class='ctx'> 	stx	%o1, [%o2]</div><div class='ctx'> 	retl</div><div class='ctx'> 	 mov	%o0, %o0</div><div class='add'>+ENDPROC(pci_sun4v_msg_getvalid)</div><div class='ctx'> </div><div class='ctx'> 	/* %o0: devhandle</div><div class='ctx'> 	 * %o1: msinum</div><div class='hunk'>@@ -352,10 +353,10 @@ pci_sun4v_msg_getvalid:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * returns %o0: status</div><div class='ctx'> 	 */</div><div class='del'>-	.globl	pci_sun4v_msg_setvalid</div><div class='del'>-pci_sun4v_msg_setvalid:</div><div class='add'>+ENTRY(pci_sun4v_msg_setvalid)</div><div class='ctx'> 	mov	HV_FAST_PCI_MSG_SETVALID, %o5</div><div class='ctx'> 	ta	HV_FAST_TRAP</div><div class='ctx'> 	retl</div><div class='ctx'> 	 mov	%o0, %o0</div><div class='add'>+ENDPROC(pci_sun4v_msg_setvalid)</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sparc64/kernel/power.c b/arch/sparc64/kernel/power.c<br/>index 3bb987a6d03c..076cad7f9757 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/power.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc64/kernel/power.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/power.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/power.c</a></div><div class='hunk'>@@ -1,34 +1,17 @@</div><div class='ctx'> /* power.c: Power management driver.</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 1999, 2007 David S. Miller (davem@davemloft.net)</div><div class='add'>+ * Copyright (C) 1999, 2007, 2008 David S. Miller (davem@davemloft.net)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/signal.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/pm.h&gt;</div><div class='del'>-#include &lt;linux/syscalls.h&gt;</div><div class='ctx'> #include &lt;linux/reboot.h&gt;</div><div class='ctx'> #include &lt;linux/of_device.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/system.h&gt;</div><div class='del'>-#include &lt;asm/auxio.h&gt;</div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/sstate.h&gt;</div><div class='del'>-#include &lt;asm/reboot.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;linux/unistd.h&gt;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * sysctl - toggle power-off restriction for serial console </div><div class='del'>- * systems in machine_power_off()</div><div class='del'>- */</div><div class='del'>-int scons_pwroff = 1; </div><div class='ctx'> </div><div class='ctx'> static void __iomem *power_reg;</div><div class='ctx'> </div><div class='hunk'>@@ -40,31 +23,6 @@ static irqreturn_t power_handler(int irq, void *dev_id)</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void (*poweroff_method)(void) = machine_alt_power_off;</div><div class='del'>-</div><div class='del'>-void machine_power_off(void)</div><div class='del'>-{</div><div class='del'>-	sstate_poweroff();</div><div class='del'>-	if (strcmp(of_console_device-&gt;type, "serial") || scons_pwroff) {</div><div class='del'>-		if (power_reg) {</div><div class='del'>-			/* Both register bits seem to have the</div><div class='del'>-			 * same effect, so until I figure out</div><div class='del'>-			 * what the difference is...</div><div class='del'>-			 */</div><div class='del'>-			writel(AUXIO_PCIO_CPWR_OFF | AUXIO_PCIO_SPWR_OFF, power_reg);</div><div class='del'>-		} else {</div><div class='del'>-			if (poweroff_method != NULL) {</div><div class='del'>-				poweroff_method();</div><div class='del'>-				/* not reached */</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	machine_halt();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void (*pm_power_off)(void) = machine_power_off;</div><div class='del'>-EXPORT_SYMBOL(pm_power_off);</div><div class='del'>-</div><div class='ctx'> static int __init has_button_interrupt(unsigned int irq, struct device_node *dp)</div><div class='ctx'> {</div><div class='ctx'> 	if (irq == 0xffffffff)</div><div class='hunk'>@@ -85,8 +43,6 @@ static int __devinit power_probe(struct of_device *op, const struct of_device_id</div><div class='ctx'> 	printk(KERN_INFO "%s: Control reg at %lx\n",</div><div class='ctx'> 	       op-&gt;node-&gt;name, res-&gt;start);</div><div class='ctx'> </div><div class='del'>-	poweroff_method = machine_halt;  /* able to use the standard halt */</div><div class='del'>-</div><div class='ctx'> 	if (has_button_interrupt(irq, op-&gt;node)) {</div><div class='ctx'> 		if (request_irq(irq,</div><div class='ctx'> 				power_handler, 0, "power", NULL) &lt; 0)</div><div class='hunk'>@@ -96,7 +52,7 @@ static int __devinit power_probe(struct of_device *op, const struct of_device_id</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct of_device_id power_match[] = {</div><div class='add'>+static struct of_device_id __initdata power_match[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.name = "power",</div><div class='ctx'> 	},</div><div class='hunk'>@@ -111,8 +67,9 @@ static struct of_platform_driver power_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-void __init power_init(void)</div><div class='add'>+static int __init power_init(void)</div><div class='ctx'> {</div><div class='del'>-	of_register_driver(&amp;power_driver, &amp;of_platform_bus_type);</div><div class='del'>-	return;</div><div class='add'>+	return of_register_driver(&amp;power_driver, &amp;of_platform_bus_type);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+device_initcall(power_init);</div><div class='head'>diff --git a/arch/sparc64/kernel/process.c b/arch/sparc64/kernel/process.c<br/>index 15f4178592e7..d5e2acef9877 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/process.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc64/kernel/process.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/process.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/process.c</a></div><div class='hunk'>@@ -22,7 +22,6 @@</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/user.h&gt;</div><div class='del'>-#include &lt;linux/reboot.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/compat.h&gt;</div><div class='ctx'> #include &lt;linux/tick.h&gt;</div><div class='hunk'>@@ -31,7 +30,6 @@</div><div class='ctx'> #include &lt;linux/elfcore.h&gt;</div><div class='ctx'> #include &lt;linux/sysrq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/oplib.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='hunk'>@@ -46,8 +44,6 @@</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='ctx'> #include &lt;asm/unistd.h&gt;</div><div class='ctx'> #include &lt;asm/hypervisor.h&gt;</div><div class='del'>-#include &lt;asm/sstate.h&gt;</div><div class='del'>-#include &lt;asm/reboot.h&gt;</div><div class='ctx'> #include &lt;asm/syscalls.h&gt;</div><div class='ctx'> #include &lt;asm/irq_regs.h&gt;</div><div class='ctx'> #include &lt;asm/smp.h&gt;</div><div class='hunk'>@@ -115,35 +111,6 @@ void cpu_idle(void)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void machine_halt(void)</div><div class='del'>-{</div><div class='del'>-	sstate_halt();</div><div class='del'>-	prom_halt();</div><div class='del'>-	panic("Halt failed!");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void machine_alt_power_off(void)</div><div class='del'>-{</div><div class='del'>-	sstate_poweroff();</div><div class='del'>-	prom_halt_power_off();</div><div class='del'>-	panic("Power-off failed!");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void machine_restart(char * cmd)</div><div class='del'>-{</div><div class='del'>-	char *p;</div><div class='del'>-	</div><div class='del'>-	sstate_reboot();</div><div class='del'>-	p = strchr (reboot_command, '\n');</div><div class='del'>-	if (p) *p = 0;</div><div class='del'>-	if (cmd)</div><div class='del'>-		prom_reboot(cmd);</div><div class='del'>-	if (*reboot_command)</div><div class='del'>-		prom_reboot(reboot_command);</div><div class='del'>-	prom_reboot("");</div><div class='del'>-	panic("Reboot failed!");</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='ctx'> static void show_regwindow32(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='hunk'>@@ -248,7 +215,6 @@ static void __global_reg_self(struct thread_info *tp, struct pt_regs *regs,</div><div class='ctx'> 	global_reg_snapshot[this_cpu].o7 = regs-&gt;u_regs[UREG_I7];</div><div class='ctx'> </div><div class='ctx'> 	if (regs-&gt;tstate &amp; TSTATE_PRIV) {</div><div class='del'>-		struct thread_info *tp = current_thread_info();</div><div class='ctx'> 		struct reg_window *rw;</div><div class='ctx'> </div><div class='ctx'> 		rw = (struct reg_window *)</div><div class='hunk'>@@ -304,7 +270,6 @@ void __trigger_all_cpu_backtrace(void)</div><div class='ctx'> </div><div class='ctx'> 	for_each_online_cpu(cpu) {</div><div class='ctx'> 		struct global_reg_snapshot *gp = &amp;global_reg_snapshot[cpu];</div><div class='del'>-		struct thread_info *tp;</div><div class='ctx'> </div><div class='ctx'> 		__global_reg_poll(gp);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sparc64/kernel/prom.c b/arch/sparc64/kernel/prom.c<br/>index 7151513f156e..dbba82f9b142 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/prom.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc64/kernel/prom.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/prom.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/prom.c</a></div><div class='hunk'>@@ -38,7 +38,7 @@ struct device_node *of_find_node_by_phandle(phandle handle)</div><div class='ctx'> {</div><div class='ctx'> 	struct device_node *np;</div><div class='ctx'> </div><div class='del'>-	for (np = allnodes; np != 0; np = np-&gt;allnext)</div><div class='add'>+	for (np = allnodes; np; np = np-&gt;allnext)</div><div class='ctx'> 		if (np-&gt;node == handle)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='hunk'>@@ -59,6 +59,9 @@ int of_getintprop_default(struct device_node *np, const char *name, int def)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(of_getintprop_default);</div><div class='ctx'> </div><div class='add'>+DEFINE_MUTEX(of_set_property_mutex);</div><div class='add'>+EXPORT_SYMBOL(of_set_property_mutex);</div><div class='add'>+</div><div class='ctx'> int of_set_property(struct device_node *dp, const char *name, void *val, int len)</div><div class='ctx'> {</div><div class='ctx'> 	struct property **prevp;</div><div class='hunk'>@@ -82,7 +85,10 @@ int of_set_property(struct device_node *dp, const char *name, void *val, int len</div><div class='ctx'> 			void *old_val = prop-&gt;value;</div><div class='ctx'> 			int ret;</div><div class='ctx'> </div><div class='add'>+			mutex_lock(&amp;of_set_property_mutex);</div><div class='ctx'> 			ret = prom_setprop(dp-&gt;node, name, val, len);</div><div class='add'>+			mutex_unlock(&amp;of_set_property_mutex);</div><div class='add'>+</div><div class='ctx'> 			err = -EINVAL;</div><div class='ctx'> 			if (ret &gt;= 0) {</div><div class='ctx'> 				prop-&gt;value = new_val;</div><div class='hunk'>@@ -945,22 +951,30 @@ static void __init irq_trans_init(struct device_node *dp)</div><div class='ctx'> 		for (i = 0; i &lt; ARRAY_SIZE(pci_irq_trans_table); i++) {</div><div class='ctx'> 			struct irq_trans *t = &amp;pci_irq_trans_table[i];</div><div class='ctx'> </div><div class='del'>-			if (!strcmp(model, t-&gt;name))</div><div class='del'>-				return t-&gt;init(dp);</div><div class='add'>+			if (!strcmp(model, t-&gt;name)) {</div><div class='add'>+				t-&gt;init(dp);</div><div class='add'>+				return;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_SBUS</div><div class='ctx'> 	if (!strcmp(dp-&gt;name, "sbus") ||</div><div class='del'>-	    !strcmp(dp-&gt;name, "sbi"))</div><div class='del'>-		return sbus_irq_trans_init(dp);</div><div class='add'>+	    !strcmp(dp-&gt;name, "sbi")) {</div><div class='add'>+		sbus_irq_trans_init(dp);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> #endif</div><div class='ctx'> 	if (!strcmp(dp-&gt;name, "fhc") &amp;&amp;</div><div class='del'>-	    !strcmp(dp-&gt;parent-&gt;name, "central"))</div><div class='del'>-		return central_irq_trans_init(dp);</div><div class='add'>+	    !strcmp(dp-&gt;parent-&gt;name, "central")) {</div><div class='add'>+		central_irq_trans_init(dp);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> 	if (!strcmp(dp-&gt;name, "virtual-devices") ||</div><div class='del'>-	    !strcmp(dp-&gt;name, "niu"))</div><div class='del'>-		return sun4v_vdev_irq_trans_init(dp);</div><div class='add'>+	    !strcmp(dp-&gt;name, "niu")) {</div><div class='add'>+		sun4v_vdev_irq_trans_init(dp);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int is_root_node(const struct device_node *dp)</div><div class='hunk'>@@ -1231,32 +1245,49 @@ static void __init __build_path_component(struct device_node *dp, char *tmp_buf)</div><div class='ctx'> </div><div class='ctx'> 	if (parent != NULL) {</div><div class='ctx'> 		if (!strcmp(parent-&gt;type, "pci") ||</div><div class='del'>-		    !strcmp(parent-&gt;type, "pciex"))</div><div class='del'>-			return pci_path_component(dp, tmp_buf);</div><div class='del'>-		if (!strcmp(parent-&gt;type, "sbus"))</div><div class='del'>-			return sbus_path_component(dp, tmp_buf);</div><div class='del'>-		if (!strcmp(parent-&gt;type, "upa"))</div><div class='del'>-			return upa_path_component(dp, tmp_buf);</div><div class='del'>-		if (!strcmp(parent-&gt;type, "ebus"))</div><div class='del'>-			return ebus_path_component(dp, tmp_buf);</div><div class='add'>+		    !strcmp(parent-&gt;type, "pciex")) {</div><div class='add'>+			pci_path_component(dp, tmp_buf);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+		if (!strcmp(parent-&gt;type, "sbus")) {</div><div class='add'>+			sbus_path_component(dp, tmp_buf);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+		if (!strcmp(parent-&gt;type, "upa")) {</div><div class='add'>+			upa_path_component(dp, tmp_buf);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+		if (!strcmp(parent-&gt;type, "ebus")) {</div><div class='add'>+			ebus_path_component(dp, tmp_buf);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='ctx'> 		if (!strcmp(parent-&gt;name, "usb") ||</div><div class='del'>-		    !strcmp(parent-&gt;name, "hub"))</div><div class='del'>-			return usb_path_component(dp, tmp_buf);</div><div class='del'>-		if (!strcmp(parent-&gt;type, "i2c"))</div><div class='del'>-			return i2c_path_component(dp, tmp_buf);</div><div class='del'>-		if (!strcmp(parent-&gt;type, "firewire"))</div><div class='del'>-			return ieee1394_path_component(dp, tmp_buf);</div><div class='del'>-		if (!strcmp(parent-&gt;type, "virtual-devices"))</div><div class='del'>-			return vdev_path_component(dp, tmp_buf);</div><div class='del'>-</div><div class='add'>+		    !strcmp(parent-&gt;name, "hub")) {</div><div class='add'>+			usb_path_component(dp, tmp_buf);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+		if (!strcmp(parent-&gt;type, "i2c")) {</div><div class='add'>+			i2c_path_component(dp, tmp_buf);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+		if (!strcmp(parent-&gt;type, "firewire")) {</div><div class='add'>+			ieee1394_path_component(dp, tmp_buf);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+		if (!strcmp(parent-&gt;type, "virtual-devices")) {</div><div class='add'>+			vdev_path_component(dp, tmp_buf);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='ctx'> 		/* "isa" is handled with platform naming */</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Use platform naming convention.  */</div><div class='del'>-	if (tlb_type == hypervisor)</div><div class='del'>-		return sun4v_path_component(dp, tmp_buf);</div><div class='del'>-	else</div><div class='del'>-		return sun4u_path_component(dp, tmp_buf);</div><div class='add'>+	if (tlb_type == hypervisor) {</div><div class='add'>+		sun4v_path_component(dp, tmp_buf);</div><div class='add'>+		return;</div><div class='add'>+	} else {</div><div class='add'>+		sun4u_path_component(dp, tmp_buf);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static char * __init build_path_component(struct device_node *dp)</div><div class='head'>diff --git a/arch/sparc64/kernel/psycho_common.c b/arch/sparc64/kernel/psycho_common.c<br/>new file mode 100644<br/>index 000000000000..790996428c14<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/psycho_common.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/psycho_common.c</a></div><div class='hunk'>@@ -0,0 +1,470 @@</div><div class='add'>+/* psycho_common.c: Code common to PSYCHO and derivative PCI controllers.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2008 David S. Miller &lt;davem@davemloft.net&gt;</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/upa.h&gt;</div><div class='add'>+</div><div class='add'>+#include "pci_impl.h"</div><div class='add'>+#include "iommu_common.h"</div><div class='add'>+#include "psycho_common.h"</div><div class='add'>+</div><div class='add'>+#define  PSYCHO_STRBUF_CTRL_DENAB	0x0000000000000002UL</div><div class='add'>+#define  PSYCHO_STCERR_WRITE		0x0000000000000002UL</div><div class='add'>+#define  PSYCHO_STCERR_READ		0x0000000000000001UL</div><div class='add'>+#define  PSYCHO_STCTAG_PPN		0x0fffffff00000000UL</div><div class='add'>+#define  PSYCHO_STCTAG_VPN		0x00000000ffffe000UL</div><div class='add'>+#define  PSYCHO_STCTAG_VALID		0x0000000000000002UL</div><div class='add'>+#define  PSYCHO_STCTAG_WRITE		0x0000000000000001UL</div><div class='add'>+#define  PSYCHO_STCLINE_LINDX		0x0000000001e00000UL</div><div class='add'>+#define  PSYCHO_STCLINE_SPTR		0x00000000001f8000UL</div><div class='add'>+#define  PSYCHO_STCLINE_LADDR		0x0000000000007f00UL</div><div class='add'>+#define  PSYCHO_STCLINE_EPTR		0x00000000000000fcUL</div><div class='add'>+#define  PSYCHO_STCLINE_VALID		0x0000000000000002UL</div><div class='add'>+#define  PSYCHO_STCLINE_FOFN		0x0000000000000001UL</div><div class='add'>+</div><div class='add'>+static DEFINE_SPINLOCK(stc_buf_lock);</div><div class='add'>+static unsigned long stc_error_buf[128];</div><div class='add'>+static unsigned long stc_tag_buf[16];</div><div class='add'>+static unsigned long stc_line_buf[16];</div><div class='add'>+</div><div class='add'>+static void psycho_check_stc_error(struct pci_pbm_info *pbm)</div><div class='add'>+{</div><div class='add'>+	unsigned long err_base, tag_base, line_base;</div><div class='add'>+	struct strbuf *strbuf = &amp;pbm-&gt;stc;</div><div class='add'>+	u64 control;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!strbuf-&gt;strbuf_control)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	err_base = strbuf-&gt;strbuf_err_stat;</div><div class='add'>+	tag_base = strbuf-&gt;strbuf_tag_diag;</div><div class='add'>+	line_base = strbuf-&gt;strbuf_line_diag;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;stc_buf_lock);</div><div class='add'>+</div><div class='add'>+	/* This is __REALLY__ dangerous.  When we put the streaming</div><div class='add'>+	 * buffer into diagnostic mode to probe it's tags and error</div><div class='add'>+	 * status, we _must_ clear all of the line tag valid bits</div><div class='add'>+	 * before re-enabling the streaming buffer.  If any dirty data</div><div class='add'>+	 * lives in the STC when we do this, we will end up</div><div class='add'>+	 * invalidating it before it has a chance to reach main</div><div class='add'>+	 * memory.</div><div class='add'>+	 */</div><div class='add'>+	control = upa_readq(strbuf-&gt;strbuf_control);</div><div class='add'>+	upa_writeq(control | PSYCHO_STRBUF_CTRL_DENAB, strbuf-&gt;strbuf_control);</div><div class='add'>+	for (i = 0; i &lt; 128; i++) {</div><div class='add'>+		u64 val;</div><div class='add'>+</div><div class='add'>+		val = upa_readq(err_base + (i * 8UL));</div><div class='add'>+		upa_writeq(0UL, err_base + (i * 8UL));</div><div class='add'>+		stc_error_buf[i] = val;</div><div class='add'>+	}</div><div class='add'>+	for (i = 0; i &lt; 16; i++) {</div><div class='add'>+		stc_tag_buf[i] = upa_readq(tag_base + (i * 8UL));</div><div class='add'>+		stc_line_buf[i] = upa_readq(line_base + (i * 8UL));</div><div class='add'>+		upa_writeq(0UL, tag_base + (i * 8UL));</div><div class='add'>+		upa_writeq(0UL, line_base + (i * 8UL));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* OK, state is logged, exit diagnostic mode. */</div><div class='add'>+	upa_writeq(control, strbuf-&gt;strbuf_control);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 16; i++) {</div><div class='add'>+		int j, saw_error, first, last;</div><div class='add'>+</div><div class='add'>+		saw_error = 0;</div><div class='add'>+		first = i * 8;</div><div class='add'>+		last = first + 8;</div><div class='add'>+		for (j = first; j &lt; last; j++) {</div><div class='add'>+			u64 errval = stc_error_buf[j];</div><div class='add'>+			if (errval != 0) {</div><div class='add'>+				saw_error++;</div><div class='add'>+				printk(KERN_ERR "%s: STC_ERR(%d)[wr(%d)"</div><div class='add'>+				       "rd(%d)]\n",</div><div class='add'>+				       pbm-&gt;name,</div><div class='add'>+				       j,</div><div class='add'>+				       (errval &amp; PSYCHO_STCERR_WRITE) ? 1 : 0,</div><div class='add'>+				       (errval &amp; PSYCHO_STCERR_READ) ? 1 : 0);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if (saw_error != 0) {</div><div class='add'>+			u64 tagval = stc_tag_buf[i];</div><div class='add'>+			u64 lineval = stc_line_buf[i];</div><div class='add'>+			printk(KERN_ERR "%s: STC_TAG(%d)[PA(%016lx)VA(%08lx)"</div><div class='add'>+			       "V(%d)W(%d)]\n",</div><div class='add'>+			       pbm-&gt;name,</div><div class='add'>+			       i,</div><div class='add'>+			       ((tagval &amp; PSYCHO_STCTAG_PPN) &gt;&gt; 19UL),</div><div class='add'>+			       (tagval &amp; PSYCHO_STCTAG_VPN),</div><div class='add'>+			       ((tagval &amp; PSYCHO_STCTAG_VALID) ? 1 : 0),</div><div class='add'>+			       ((tagval &amp; PSYCHO_STCTAG_WRITE) ? 1 : 0));</div><div class='add'>+			printk(KERN_ERR "%s: STC_LINE(%d)[LIDX(%lx)SP(%lx)"</div><div class='add'>+			       "LADDR(%lx)EP(%lx)V(%d)FOFN(%d)]\n",</div><div class='add'>+			       pbm-&gt;name,</div><div class='add'>+			       i,</div><div class='add'>+			       ((lineval &amp; PSYCHO_STCLINE_LINDX) &gt;&gt; 21UL),</div><div class='add'>+			       ((lineval &amp; PSYCHO_STCLINE_SPTR) &gt;&gt; 15UL),</div><div class='add'>+			       ((lineval &amp; PSYCHO_STCLINE_LADDR) &gt;&gt; 8UL),</div><div class='add'>+			       ((lineval &amp; PSYCHO_STCLINE_EPTR) &gt;&gt; 2UL),</div><div class='add'>+			       ((lineval &amp; PSYCHO_STCLINE_VALID) ? 1 : 0),</div><div class='add'>+			       ((lineval &amp; PSYCHO_STCLINE_FOFN) ? 1 : 0));</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;stc_buf_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define PSYCHO_IOMMU_TAG		0xa580UL</div><div class='add'>+#define PSYCHO_IOMMU_DATA		0xa600UL</div><div class='add'>+</div><div class='add'>+static void psycho_record_iommu_tags_and_data(struct pci_pbm_info *pbm,</div><div class='add'>+					      u64 *tag, u64 *data)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 16; i++) {</div><div class='add'>+		unsigned long base = pbm-&gt;controller_regs;</div><div class='add'>+		unsigned long off = i * 8UL;</div><div class='add'>+</div><div class='add'>+		tag[i] = upa_readq(base + PSYCHO_IOMMU_TAG+off);</div><div class='add'>+		data[i] = upa_readq(base + PSYCHO_IOMMU_DATA+off);</div><div class='add'>+</div><div class='add'>+		/* Now clear out the entry. */</div><div class='add'>+		upa_writeq(0, base + PSYCHO_IOMMU_TAG + off);</div><div class='add'>+		upa_writeq(0, base + PSYCHO_IOMMU_DATA + off);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define  PSYCHO_IOMMU_TAG_ERRSTS (0x3UL &lt;&lt; 23UL)</div><div class='add'>+#define  PSYCHO_IOMMU_TAG_ERR	 (0x1UL &lt;&lt; 22UL)</div><div class='add'>+#define  PSYCHO_IOMMU_TAG_WRITE	 (0x1UL &lt;&lt; 21UL)</div><div class='add'>+#define  PSYCHO_IOMMU_TAG_STREAM (0x1UL &lt;&lt; 20UL)</div><div class='add'>+#define  PSYCHO_IOMMU_TAG_SIZE	 (0x1UL &lt;&lt; 19UL)</div><div class='add'>+#define  PSYCHO_IOMMU_TAG_VPAGE	 0x7ffffUL</div><div class='add'>+#define  PSYCHO_IOMMU_DATA_VALID (1UL &lt;&lt; 30UL)</div><div class='add'>+#define  PSYCHO_IOMMU_DATA_CACHE (1UL &lt;&lt; 28UL)</div><div class='add'>+#define  PSYCHO_IOMMU_DATA_PPAGE 0xfffffffUL</div><div class='add'>+</div><div class='add'>+static void psycho_dump_iommu_tags_and_data(struct pci_pbm_info *pbm,</div><div class='add'>+					    u64 *tag, u64 *data)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 16; i++) {</div><div class='add'>+		u64 tag_val, data_val;</div><div class='add'>+		const char *type_str;</div><div class='add'>+		tag_val = tag[i];</div><div class='add'>+		if (!(tag_val &amp; PSYCHO_IOMMU_TAG_ERR))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		data_val = data[i];</div><div class='add'>+		switch((tag_val &amp; PSYCHO_IOMMU_TAG_ERRSTS) &gt;&gt; 23UL) {</div><div class='add'>+		case 0:</div><div class='add'>+			type_str = "Protection Error";</div><div class='add'>+			break;</div><div class='add'>+		case 1:</div><div class='add'>+			type_str = "Invalid Error";</div><div class='add'>+			break;</div><div class='add'>+		case 2:</div><div class='add'>+			type_str = "TimeOut Error";</div><div class='add'>+			break;</div><div class='add'>+		case 3:</div><div class='add'>+		default:</div><div class='add'>+			type_str = "ECC Error";</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		printk(KERN_ERR "%s: IOMMU TAG(%d)[error(%s) wr(%d) "</div><div class='add'>+		       "str(%d) sz(%dK) vpg(%08lx)]\n",</div><div class='add'>+		       pbm-&gt;name, i, type_str,</div><div class='add'>+		       ((tag_val &amp; PSYCHO_IOMMU_TAG_WRITE) ? 1 : 0),</div><div class='add'>+		       ((tag_val &amp; PSYCHO_IOMMU_TAG_STREAM) ? 1 : 0),</div><div class='add'>+		       ((tag_val &amp; PSYCHO_IOMMU_TAG_SIZE) ? 64 : 8),</div><div class='add'>+		       (tag_val &amp; PSYCHO_IOMMU_TAG_VPAGE) &lt;&lt; IOMMU_PAGE_SHIFT);</div><div class='add'>+		printk(KERN_ERR "%s: IOMMU DATA(%d)[valid(%d) cache(%d) "</div><div class='add'>+		       "ppg(%016lx)]\n",</div><div class='add'>+		       pbm-&gt;name, i,</div><div class='add'>+		       ((data_val &amp; PSYCHO_IOMMU_DATA_VALID) ? 1 : 0),</div><div class='add'>+		       ((data_val &amp; PSYCHO_IOMMU_DATA_CACHE) ? 1 : 0),</div><div class='add'>+		       (data_val &amp; PSYCHO_IOMMU_DATA_PPAGE)&lt;&lt;IOMMU_PAGE_SHIFT);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define  PSYCHO_IOMMU_CTRL_XLTESTAT	0x0000000006000000UL</div><div class='add'>+#define  PSYCHO_IOMMU_CTRL_XLTEERR	0x0000000001000000UL</div><div class='add'>+</div><div class='add'>+void psycho_check_iommu_error(struct pci_pbm_info *pbm,</div><div class='add'>+			      unsigned long afsr,</div><div class='add'>+			      unsigned long afar,</div><div class='add'>+			      enum psycho_error_type type)</div><div class='add'>+{</div><div class='add'>+	u64 control, iommu_tag[16], iommu_data[16];</div><div class='add'>+	struct iommu *iommu = pbm-&gt;iommu;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;iommu-&gt;lock, flags);</div><div class='add'>+	control = upa_readq(iommu-&gt;iommu_control);</div><div class='add'>+	if (control &amp; PSYCHO_IOMMU_CTRL_XLTEERR) {</div><div class='add'>+		const char *type_str;</div><div class='add'>+</div><div class='add'>+		control &amp;= ~PSYCHO_IOMMU_CTRL_XLTEERR;</div><div class='add'>+		upa_writeq(control, iommu-&gt;iommu_control);</div><div class='add'>+</div><div class='add'>+		switch ((control &amp; PSYCHO_IOMMU_CTRL_XLTESTAT) &gt;&gt; 25UL) {</div><div class='add'>+		case 0:</div><div class='add'>+			type_str = "Protection Error";</div><div class='add'>+			break;</div><div class='add'>+		case 1:</div><div class='add'>+			type_str = "Invalid Error";</div><div class='add'>+			break;</div><div class='add'>+		case 2:</div><div class='add'>+			type_str = "TimeOut Error";</div><div class='add'>+			break;</div><div class='add'>+		case 3:</div><div class='add'>+		default:</div><div class='add'>+			type_str = "ECC Error";</div><div class='add'>+			break;</div><div class='add'>+		};</div><div class='add'>+		printk(KERN_ERR "%s: IOMMU Error, type[%s]\n",</div><div class='add'>+		       pbm-&gt;name, type_str);</div><div class='add'>+</div><div class='add'>+		/* It is very possible for another DVMA to occur while</div><div class='add'>+		 * we do this probe, and corrupt the system further.</div><div class='add'>+		 * But we are so screwed at this point that we are</div><div class='add'>+		 * likely to crash hard anyways, so get as much</div><div class='add'>+		 * diagnostic information to the console as we can.</div><div class='add'>+		 */</div><div class='add'>+		psycho_record_iommu_tags_and_data(pbm, iommu_tag, iommu_data);</div><div class='add'>+		psycho_dump_iommu_tags_and_data(pbm, iommu_tag, iommu_data);</div><div class='add'>+	}</div><div class='add'>+	psycho_check_stc_error(pbm);</div><div class='add'>+	spin_unlock_irqrestore(&amp;iommu-&gt;lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define  PSYCHO_PCICTRL_SBH_ERR	 0x0000000800000000UL</div><div class='add'>+#define  PSYCHO_PCICTRL_SERR	 0x0000000400000000UL</div><div class='add'>+</div><div class='add'>+static irqreturn_t psycho_pcierr_intr_other(struct pci_pbm_info *pbm)</div><div class='add'>+{</div><div class='add'>+	irqreturn_t ret = IRQ_NONE;</div><div class='add'>+	u64 csr, csr_error_bits;</div><div class='add'>+	u16 stat, *addr;</div><div class='add'>+</div><div class='add'>+	csr = upa_readq(pbm-&gt;pci_csr);</div><div class='add'>+	csr_error_bits = csr &amp; (PSYCHO_PCICTRL_SBH_ERR | PSYCHO_PCICTRL_SERR);</div><div class='add'>+	if (csr_error_bits) {</div><div class='add'>+		/* Clear the errors.  */</div><div class='add'>+		upa_writeq(csr, pbm-&gt;pci_csr);</div><div class='add'>+</div><div class='add'>+		/* Log 'em.  */</div><div class='add'>+		if (csr_error_bits &amp; PSYCHO_PCICTRL_SBH_ERR)</div><div class='add'>+			printk(KERN_ERR "%s: PCI streaming byte hole "</div><div class='add'>+			       "error asserted.\n", pbm-&gt;name);</div><div class='add'>+		if (csr_error_bits &amp; PSYCHO_PCICTRL_SERR)</div><div class='add'>+			printk(KERN_ERR "%s: PCI SERR signal asserted.\n",</div><div class='add'>+			       pbm-&gt;name);</div><div class='add'>+		ret = IRQ_HANDLED;</div><div class='add'>+	}</div><div class='add'>+	addr = psycho_pci_config_mkaddr(pbm, pbm-&gt;pci_first_busno,</div><div class='add'>+					0, PCI_STATUS);</div><div class='add'>+	pci_config_read16(addr, &amp;stat);</div><div class='add'>+	if (stat &amp; (PCI_STATUS_PARITY |</div><div class='add'>+		    PCI_STATUS_SIG_TARGET_ABORT |</div><div class='add'>+		    PCI_STATUS_REC_TARGET_ABORT |</div><div class='add'>+		    PCI_STATUS_REC_MASTER_ABORT |</div><div class='add'>+		    PCI_STATUS_SIG_SYSTEM_ERROR)) {</div><div class='add'>+		printk(KERN_ERR "%s: PCI bus error, PCI_STATUS[%04x]\n",</div><div class='add'>+		       pbm-&gt;name, stat);</div><div class='add'>+		pci_config_write16(addr, 0xffff);</div><div class='add'>+		ret = IRQ_HANDLED;</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define  PSYCHO_PCIAFSR_PMA	0x8000000000000000UL</div><div class='add'>+#define  PSYCHO_PCIAFSR_PTA	0x4000000000000000UL</div><div class='add'>+#define  PSYCHO_PCIAFSR_PRTRY	0x2000000000000000UL</div><div class='add'>+#define  PSYCHO_PCIAFSR_PPERR	0x1000000000000000UL</div><div class='add'>+#define  PSYCHO_PCIAFSR_SMA	0x0800000000000000UL</div><div class='add'>+#define  PSYCHO_PCIAFSR_STA	0x0400000000000000UL</div><div class='add'>+#define  PSYCHO_PCIAFSR_SRTRY	0x0200000000000000UL</div><div class='add'>+#define  PSYCHO_PCIAFSR_SPERR	0x0100000000000000UL</div><div class='add'>+#define  PSYCHO_PCIAFSR_RESV1	0x00ff000000000000UL</div><div class='add'>+#define  PSYCHO_PCIAFSR_BMSK	0x0000ffff00000000UL</div><div class='add'>+#define  PSYCHO_PCIAFSR_BLK	0x0000000080000000UL</div><div class='add'>+#define  PSYCHO_PCIAFSR_RESV2	0x0000000040000000UL</div><div class='add'>+#define  PSYCHO_PCIAFSR_MID	0x000000003e000000UL</div><div class='add'>+#define  PSYCHO_PCIAFSR_RESV3	0x0000000001ffffffUL</div><div class='add'>+</div><div class='add'>+irqreturn_t psycho_pcierr_intr(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	struct pci_pbm_info *pbm = dev_id;</div><div class='add'>+	u64 afsr, afar, error_bits;</div><div class='add'>+	int reported;</div><div class='add'>+</div><div class='add'>+	afsr = upa_readq(pbm-&gt;pci_afsr);</div><div class='add'>+	afar = upa_readq(pbm-&gt;pci_afar);</div><div class='add'>+	error_bits = afsr &amp;</div><div class='add'>+		(PSYCHO_PCIAFSR_PMA | PSYCHO_PCIAFSR_PTA |</div><div class='add'>+		 PSYCHO_PCIAFSR_PRTRY | PSYCHO_PCIAFSR_PPERR |</div><div class='add'>+		 PSYCHO_PCIAFSR_SMA | PSYCHO_PCIAFSR_STA |</div><div class='add'>+		 PSYCHO_PCIAFSR_SRTRY | PSYCHO_PCIAFSR_SPERR);</div><div class='add'>+	if (!error_bits)</div><div class='add'>+		return psycho_pcierr_intr_other(pbm);</div><div class='add'>+	upa_writeq(error_bits, pbm-&gt;pci_afsr);</div><div class='add'>+	printk(KERN_ERR "%s: PCI Error, primary error type[%s]\n",</div><div class='add'>+	       pbm-&gt;name,</div><div class='add'>+	       (((error_bits &amp; PSYCHO_PCIAFSR_PMA) ?</div><div class='add'>+		 "Master Abort" :</div><div class='add'>+		 ((error_bits &amp; PSYCHO_PCIAFSR_PTA) ?</div><div class='add'>+		  "Target Abort" :</div><div class='add'>+		  ((error_bits &amp; PSYCHO_PCIAFSR_PRTRY) ?</div><div class='add'>+		   "Excessive Retries" :</div><div class='add'>+		   ((error_bits &amp; PSYCHO_PCIAFSR_PPERR) ?</div><div class='add'>+		    "Parity Error" : "???"))))));</div><div class='add'>+	printk(KERN_ERR "%s: bytemask[%04lx] UPA_MID[%02lx] was_block(%d)\n",</div><div class='add'>+	       pbm-&gt;name,</div><div class='add'>+	       (afsr &amp; PSYCHO_PCIAFSR_BMSK) &gt;&gt; 32UL,</div><div class='add'>+	       (afsr &amp; PSYCHO_PCIAFSR_MID) &gt;&gt; 25UL,</div><div class='add'>+	       (afsr &amp; PSYCHO_PCIAFSR_BLK) ? 1 : 0);</div><div class='add'>+	printk(KERN_ERR "%s: PCI AFAR [%016lx]\n", pbm-&gt;name, afar);</div><div class='add'>+	printk(KERN_ERR "%s: PCI Secondary errors [", pbm-&gt;name);</div><div class='add'>+	reported = 0;</div><div class='add'>+	if (afsr &amp; PSYCHO_PCIAFSR_SMA) {</div><div class='add'>+		reported++;</div><div class='add'>+		printk("(Master Abort)");</div><div class='add'>+	}</div><div class='add'>+	if (afsr &amp; PSYCHO_PCIAFSR_STA) {</div><div class='add'>+		reported++;</div><div class='add'>+		printk("(Target Abort)");</div><div class='add'>+	}</div><div class='add'>+	if (afsr &amp; PSYCHO_PCIAFSR_SRTRY) {</div><div class='add'>+		reported++;</div><div class='add'>+		printk("(Excessive Retries)");</div><div class='add'>+	}</div><div class='add'>+	if (afsr &amp; PSYCHO_PCIAFSR_SPERR) {</div><div class='add'>+		reported++;</div><div class='add'>+		printk("(Parity Error)");</div><div class='add'>+	}</div><div class='add'>+	if (!reported)</div><div class='add'>+		printk("(none)");</div><div class='add'>+	printk("]\n");</div><div class='add'>+</div><div class='add'>+	if (error_bits &amp; (PSYCHO_PCIAFSR_PTA | PSYCHO_PCIAFSR_STA)) {</div><div class='add'>+		psycho_check_iommu_error(pbm, afsr, afar, PCI_ERR);</div><div class='add'>+		pci_scan_for_target_abort(pbm, pbm-&gt;pci_bus);</div><div class='add'>+	}</div><div class='add'>+	if (error_bits &amp; (PSYCHO_PCIAFSR_PMA | PSYCHO_PCIAFSR_SMA))</div><div class='add'>+		pci_scan_for_master_abort(pbm, pbm-&gt;pci_bus);</div><div class='add'>+</div><div class='add'>+	if (error_bits &amp; (PSYCHO_PCIAFSR_PPERR | PSYCHO_PCIAFSR_SPERR))</div><div class='add'>+		pci_scan_for_parity_error(pbm, pbm-&gt;pci_bus);</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void psycho_iommu_flush(struct pci_pbm_info *pbm)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 16; i++) {</div><div class='add'>+		unsigned long off = i * 8;</div><div class='add'>+</div><div class='add'>+		upa_writeq(0, pbm-&gt;controller_regs + PSYCHO_IOMMU_TAG + off);</div><div class='add'>+		upa_writeq(0, pbm-&gt;controller_regs + PSYCHO_IOMMU_DATA + off);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define PSYCHO_IOMMU_CONTROL		0x0200UL</div><div class='add'>+#define  PSYCHO_IOMMU_CTRL_TSBSZ	0x0000000000070000UL</div><div class='add'>+#define  PSYCHO_IOMMU_TSBSZ_1K      	0x0000000000000000UL</div><div class='add'>+#define  PSYCHO_IOMMU_TSBSZ_2K      	0x0000000000010000UL</div><div class='add'>+#define  PSYCHO_IOMMU_TSBSZ_4K      	0x0000000000020000UL</div><div class='add'>+#define  PSYCHO_IOMMU_TSBSZ_8K      	0x0000000000030000UL</div><div class='add'>+#define  PSYCHO_IOMMU_TSBSZ_16K     	0x0000000000040000UL</div><div class='add'>+#define  PSYCHO_IOMMU_TSBSZ_32K     	0x0000000000050000UL</div><div class='add'>+#define  PSYCHO_IOMMU_TSBSZ_64K     	0x0000000000060000UL</div><div class='add'>+#define  PSYCHO_IOMMU_TSBSZ_128K    	0x0000000000070000UL</div><div class='add'>+#define  PSYCHO_IOMMU_CTRL_TBWSZ    	0x0000000000000004UL</div><div class='add'>+#define  PSYCHO_IOMMU_CTRL_DENAB    	0x0000000000000002UL</div><div class='add'>+#define  PSYCHO_IOMMU_CTRL_ENAB     	0x0000000000000001UL</div><div class='add'>+#define PSYCHO_IOMMU_FLUSH		0x0210UL</div><div class='add'>+#define PSYCHO_IOMMU_TSBBASE		0x0208UL</div><div class='add'>+</div><div class='add'>+int psycho_iommu_init(struct pci_pbm_info *pbm, int tsbsize,</div><div class='add'>+		      u32 dvma_offset, u32 dma_mask,</div><div class='add'>+		      unsigned long write_complete_offset)</div><div class='add'>+{</div><div class='add'>+	struct iommu *iommu = pbm-&gt;iommu;</div><div class='add'>+	u64 control;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	iommu-&gt;iommu_control  = pbm-&gt;controller_regs + PSYCHO_IOMMU_CONTROL;</div><div class='add'>+	iommu-&gt;iommu_tsbbase  = pbm-&gt;controller_regs + PSYCHO_IOMMU_TSBBASE;</div><div class='add'>+	iommu-&gt;iommu_flush    = pbm-&gt;controller_regs + PSYCHO_IOMMU_FLUSH;</div><div class='add'>+	iommu-&gt;iommu_tags     = pbm-&gt;controller_regs + PSYCHO_IOMMU_TAG;</div><div class='add'>+	iommu-&gt;write_complete_reg = (pbm-&gt;controller_regs +</div><div class='add'>+				     write_complete_offset);</div><div class='add'>+</div><div class='add'>+	iommu-&gt;iommu_ctxflush = 0;</div><div class='add'>+</div><div class='add'>+	control = upa_readq(iommu-&gt;iommu_control);</div><div class='add'>+	control |= PSYCHO_IOMMU_CTRL_DENAB;</div><div class='add'>+	upa_writeq(control, iommu-&gt;iommu_control);</div><div class='add'>+</div><div class='add'>+	psycho_iommu_flush(pbm);</div><div class='add'>+</div><div class='add'>+	/* Leave diag mode enabled for full-flushing done in pci_iommu.c */</div><div class='add'>+	err = iommu_table_init(iommu, tsbsize * 1024 * 8,</div><div class='add'>+			       dvma_offset, dma_mask, pbm-&gt;numa_node);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	upa_writeq(__pa(iommu-&gt;page_table), iommu-&gt;iommu_tsbbase);</div><div class='add'>+</div><div class='add'>+	control = upa_readq(iommu-&gt;iommu_control);</div><div class='add'>+	control &amp;= ~(PSYCHO_IOMMU_CTRL_TSBSZ | PSYCHO_IOMMU_CTRL_TBWSZ);</div><div class='add'>+	control |= PSYCHO_IOMMU_CTRL_ENAB;</div><div class='add'>+</div><div class='add'>+	switch (tsbsize) {</div><div class='add'>+	case 64:</div><div class='add'>+		control |= PSYCHO_IOMMU_TSBSZ_64K;</div><div class='add'>+		break;</div><div class='add'>+	case 128:</div><div class='add'>+		control |= PSYCHO_IOMMU_TSBSZ_128K;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	upa_writeq(control, iommu-&gt;iommu_control);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void psycho_pbm_init_common(struct pci_pbm_info *pbm, struct of_device *op,</div><div class='add'>+			    const char *chip_name, int chip_type)</div><div class='add'>+{</div><div class='add'>+	struct device_node *dp = op-&gt;node;</div><div class='add'>+</div><div class='add'>+	pbm-&gt;name = dp-&gt;full_name;</div><div class='add'>+	pbm-&gt;numa_node = -1;</div><div class='add'>+	pbm-&gt;chip_type = chip_type;</div><div class='add'>+	pbm-&gt;chip_version = of_getintprop_default(dp, "version#", 0);</div><div class='add'>+	pbm-&gt;chip_revision = of_getintprop_default(dp, "module-revision#", 0);</div><div class='add'>+	pbm-&gt;op = op;</div><div class='add'>+	pbm-&gt;pci_ops = &amp;sun4u_pci_ops;</div><div class='add'>+	pbm-&gt;config_space_reg_bits = 8;</div><div class='add'>+	pbm-&gt;index = pci_num_pbms++;</div><div class='add'>+	pci_get_pbm_props(pbm);</div><div class='add'>+	pci_determine_mem_io_space(pbm);</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "%s: %s PCI Bus Module ver[%x:%x]\n",</div><div class='add'>+	       pbm-&gt;name, chip_name,</div><div class='add'>+	       pbm-&gt;chip_version, pbm-&gt;chip_revision);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/sparc64/kernel/psycho_common.h b/arch/sparc64/kernel/psycho_common.h<br/>new file mode 100644<br/>index 000000000000..092c278ef28d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/psycho_common.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/psycho_common.h</a></div><div class='hunk'>@@ -0,0 +1,48 @@</div><div class='add'>+#ifndef _PSYCHO_COMMON_H</div><div class='add'>+#define _PSYCHO_COMMON_H</div><div class='add'>+</div><div class='add'>+/* U2P Programmer's Manual, page 13-55, configuration space</div><div class='add'>+ * address format:</div><div class='add'>+ * </div><div class='add'>+ *  32             24 23 16 15    11 10       8 7   2  1 0</div><div class='add'>+ * ---------------------------------------------------------</div><div class='add'>+ * |0 0 0 0 0 0 0 0 1| bus | device | function | reg | 0 0 |</div><div class='add'>+ * ---------------------------------------------------------</div><div class='add'>+ */</div><div class='add'>+#define PSYCHO_CONFIG_BASE(PBM)	\</div><div class='add'>+	((PBM)-&gt;config_space | (1UL &lt;&lt; 24))</div><div class='add'>+#define PSYCHO_CONFIG_ENCODE(BUS, DEVFN, REG)	\</div><div class='add'>+	(((unsigned long)(BUS)   &lt;&lt; 16) |	\</div><div class='add'>+	 ((unsigned long)(DEVFN) &lt;&lt; 8)  |	\</div><div class='add'>+	 ((unsigned long)(REG)))</div><div class='add'>+</div><div class='add'>+static inline void *psycho_pci_config_mkaddr(struct pci_pbm_info *pbm,</div><div class='add'>+					     unsigned char bus,</div><div class='add'>+					     unsigned int devfn,</div><div class='add'>+					     int where)</div><div class='add'>+{</div><div class='add'>+	return (void *)</div><div class='add'>+		(PSYCHO_CONFIG_BASE(pbm) |</div><div class='add'>+		 PSYCHO_CONFIG_ENCODE(bus, devfn, where));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+enum psycho_error_type {</div><div class='add'>+	UE_ERR, CE_ERR, PCI_ERR</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern void psycho_check_iommu_error(struct pci_pbm_info *pbm,</div><div class='add'>+				     unsigned long afsr,</div><div class='add'>+				     unsigned long afar,</div><div class='add'>+				     enum psycho_error_type type);</div><div class='add'>+</div><div class='add'>+extern irqreturn_t psycho_pcierr_intr(int irq, void *dev_id);</div><div class='add'>+</div><div class='add'>+extern int psycho_iommu_init(struct pci_pbm_info *pbm, int tsbsize,</div><div class='add'>+			     u32 dvma_offset, u32 dma_mask,</div><div class='add'>+			     unsigned long write_complete_offset);</div><div class='add'>+</div><div class='add'>+extern void psycho_pbm_init_common(struct pci_pbm_info *pbm,</div><div class='add'>+				   struct of_device *op,</div><div class='add'>+				   const char *chip_name, int chip_type);</div><div class='add'>+</div><div class='add'>+#endif /* _PSYCHO_COMMON_H */</div><div class='head'>diff --git a/arch/sparc64/kernel/ptrace.c b/arch/sparc64/kernel/ptrace.c<br/>index 10306e476e38..f43adbc773ca 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/ptrace.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc64/kernel/ptrace.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/ptrace.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/ptrace.c</a></div><div class='hunk'>@@ -1050,31 +1050,17 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-asmlinkage int syscall_trace(struct pt_regs *regs, int syscall_exit_p)</div><div class='add'>+asmlinkage int syscall_trace_enter(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* do the secure computing check first */</div><div class='ctx'> 	secure_computing(regs-&gt;u_regs[UREG_G1]);</div><div class='ctx'> </div><div class='del'>-	if (unlikely(current-&gt;audit_context) &amp;&amp; syscall_exit_p) {</div><div class='del'>-		unsigned long tstate = regs-&gt;tstate;</div><div class='del'>-		int result = AUDITSC_SUCCESS;</div><div class='del'>-</div><div class='del'>-		if (unlikely(tstate &amp; (TSTATE_XCARRY | TSTATE_ICARRY)))</div><div class='del'>-			result = AUDITSC_FAILURE;</div><div class='del'>-</div><div class='del'>-		audit_syscall_exit(result, regs-&gt;u_regs[UREG_I0]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (test_thread_flag(TIF_SYSCALL_TRACE)) {</div><div class='del'>-		if (syscall_exit_p)</div><div class='del'>-			tracehook_report_syscall_exit(regs, 0);</div><div class='del'>-		else</div><div class='del'>-			ret = tracehook_report_syscall_entry(regs);</div><div class='del'>-	}</div><div class='add'>+	if (test_thread_flag(TIF_SYSCALL_TRACE))</div><div class='add'>+		ret = tracehook_report_syscall_entry(regs);</div><div class='ctx'> </div><div class='del'>-	if (unlikely(current-&gt;audit_context) &amp;&amp; !syscall_exit_p &amp;&amp; !ret)</div><div class='add'>+	if (unlikely(current-&gt;audit_context) &amp;&amp; !ret)</div><div class='ctx'> 		audit_syscall_entry((test_thread_flag(TIF_32BIT) ?</div><div class='ctx'> 				     AUDIT_ARCH_SPARC :</div><div class='ctx'> 				     AUDIT_ARCH_SPARC64),</div><div class='hunk'>@@ -1086,3 +1072,19 @@ asmlinkage int syscall_trace(struct pt_regs *regs, int syscall_exit_p)</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+asmlinkage void syscall_trace_leave(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	if (unlikely(current-&gt;audit_context)) {</div><div class='add'>+		unsigned long tstate = regs-&gt;tstate;</div><div class='add'>+		int result = AUDITSC_SUCCESS;</div><div class='add'>+</div><div class='add'>+		if (unlikely(tstate &amp; (TSTATE_XCARRY | TSTATE_ICARRY)))</div><div class='add'>+			result = AUDITSC_FAILURE;</div><div class='add'>+</div><div class='add'>+		audit_syscall_exit(result, regs-&gt;u_regs[UREG_I0]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (test_thread_flag(TIF_SYSCALL_TRACE))</div><div class='add'>+		tracehook_report_syscall_exit(regs, 0);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/sparc64/kernel/reboot.c b/arch/sparc64/kernel/reboot.c<br/>new file mode 100644<br/>index 000000000000..ef89d3d69748<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/reboot.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/reboot.c</a></div><div class='hunk'>@@ -0,0 +1,53 @@</div><div class='add'>+/* reboot.c: reboot/shutdown/halt/poweroff handling</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2008 David S. Miller &lt;davem@davemloft.net&gt;</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/reboot.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/pm.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/system.h&gt;</div><div class='add'>+#include &lt;asm/oplib.h&gt;</div><div class='add'>+#include &lt;asm/prom.h&gt;</div><div class='add'>+</div><div class='add'>+/* sysctl - toggle power-off restriction for serial console</div><div class='add'>+ * systems in machine_power_off()</div><div class='add'>+ */</div><div class='add'>+int scons_pwroff = 1;</div><div class='add'>+</div><div class='add'>+/* This isn't actually used, it exists merely to satisfy the</div><div class='add'>+ * reference in kernel/sys.c</div><div class='add'>+ */</div><div class='add'>+void (*pm_power_off)(void) = machine_power_off;</div><div class='add'>+EXPORT_SYMBOL(pm_power_off);</div><div class='add'>+</div><div class='add'>+void machine_power_off(void)</div><div class='add'>+{</div><div class='add'>+	if (strcmp(of_console_device-&gt;type, "serial") || scons_pwroff)</div><div class='add'>+		prom_halt_power_off();</div><div class='add'>+</div><div class='add'>+	prom_halt();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void machine_halt(void)</div><div class='add'>+{</div><div class='add'>+	prom_halt();</div><div class='add'>+	panic("Halt failed!");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void machine_restart(char *cmd)</div><div class='add'>+{</div><div class='add'>+	char *p;</div><div class='add'>+</div><div class='add'>+	p = strchr(reboot_command, '\n');</div><div class='add'>+	if (p)</div><div class='add'>+		*p = 0;</div><div class='add'>+	if (cmd)</div><div class='add'>+		prom_reboot(cmd);</div><div class='add'>+	if (*reboot_command)</div><div class='add'>+		prom_reboot(reboot_command);</div><div class='add'>+	prom_reboot("");</div><div class='add'>+	panic("Reboot failed!");</div><div class='add'>+}</div><div class='add'>+</div><div class='head'>diff --git a/arch/sparc64/kernel/sbus.c b/arch/sparc64/kernel/sbus.c<br/>index e33a8a660e9e..2ead310066d1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/sbus.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc64/kernel/sbus.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/sbus.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/sbus.c</a></div><div class='hunk'>@@ -11,15 +11,17 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='del'>-#include &lt;asm/sbus.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/upa.h&gt;</div><div class='ctx'> #include &lt;asm/cache.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='add'>+#include &lt;asm/oplib.h&gt;</div><div class='ctx'> #include &lt;asm/starfire.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "iommu_common.h"</div><div class='hunk'>@@ -52,13 +54,23 @@</div><div class='ctx'> #define STRBUF_TAG_VALID	0x02UL</div><div class='ctx'> </div><div class='ctx'> /* Enable 64-bit DVMA mode for the given device. */</div><div class='del'>-void sbus_set_sbus64(struct sbus_dev *sdev, int bursts)</div><div class='add'>+void sbus_set_sbus64(struct device *dev, int bursts)</div><div class='ctx'> {</div><div class='del'>-	struct iommu *iommu = sdev-&gt;ofdev.dev.archdata.iommu;</div><div class='del'>-	int slot = sdev-&gt;slot;</div><div class='add'>+	struct iommu *iommu = dev-&gt;archdata.iommu;</div><div class='add'>+	struct of_device *op = to_of_device(dev);</div><div class='add'>+	const struct linux_prom_registers *regs;</div><div class='ctx'> 	unsigned long cfg_reg;</div><div class='add'>+	int slot;</div><div class='ctx'> 	u64 val;</div><div class='ctx'> </div><div class='add'>+	regs = of_get_property(op-&gt;node, "reg", NULL);</div><div class='add'>+	if (!regs) {</div><div class='add'>+		printk(KERN_ERR "sbus_set_sbus64: Cannot find regs for %s\n",</div><div class='add'>+		       op-&gt;node-&gt;full_name);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	slot = regs-&gt;which_io;</div><div class='add'>+</div><div class='ctx'> 	cfg_reg = iommu-&gt;write_complete_reg;</div><div class='ctx'> 	switch (slot) {</div><div class='ctx'> 	case 0:</div><div class='hunk'>@@ -191,10 +203,9 @@ static unsigned long sysio_imap_to_iclr(unsigned long imap)</div><div class='ctx'> 	return imap + diff;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-unsigned int sbus_build_irq(void *buscookie, unsigned int ino)</div><div class='add'>+static unsigned int sbus_build_irq(struct of_device *op, unsigned int ino)</div><div class='ctx'> {</div><div class='del'>-	struct sbus_bus *sbus = (struct sbus_bus *)buscookie;</div><div class='del'>-	struct iommu *iommu = sbus-&gt;ofdev.dev.archdata.iommu;</div><div class='add'>+	struct iommu *iommu = op-&gt;dev.archdata.iommu;</div><div class='ctx'> 	unsigned long reg_base = iommu-&gt;write_complete_reg - 0x2000UL;</div><div class='ctx'> 	unsigned long imap, iclr;</div><div class='ctx'> 	int sbus_level = 0;</div><div class='hunk'>@@ -255,12 +266,12 @@ unsigned int sbus_build_irq(void *buscookie, unsigned int ino)</div><div class='ctx'> #define  SYSIO_UEAFSR_RESV2 0x0000001fffffffffUL /* Reserved                  */</div><div class='ctx'> static irqreturn_t sysio_ue_handler(int irq, void *dev_id)</div><div class='ctx'> {</div><div class='del'>-	struct sbus_bus *sbus = dev_id;</div><div class='del'>-	struct iommu *iommu = sbus-&gt;ofdev.dev.archdata.iommu;</div><div class='add'>+	struct of_device *op = dev_id;</div><div class='add'>+	struct iommu *iommu = op-&gt;dev.archdata.iommu;</div><div class='ctx'> 	unsigned long reg_base = iommu-&gt;write_complete_reg - 0x2000UL;</div><div class='ctx'> 	unsigned long afsr_reg, afar_reg;</div><div class='ctx'> 	unsigned long afsr, afar, error_bits;</div><div class='del'>-	int reported;</div><div class='add'>+	int reported, portid;</div><div class='ctx'> </div><div class='ctx'> 	afsr_reg = reg_base + SYSIO_UE_AFSR;</div><div class='ctx'> 	afar_reg = reg_base + SYSIO_UE_AFAR;</div><div class='hunk'>@@ -275,9 +286,11 @@ static irqreturn_t sysio_ue_handler(int irq, void *dev_id)</div><div class='ctx'> 		 SYSIO_UEAFSR_SPIO | SYSIO_UEAFSR_SDRD | SYSIO_UEAFSR_SDWR);</div><div class='ctx'> 	upa_writeq(error_bits, afsr_reg);</div><div class='ctx'> </div><div class='add'>+	portid = of_getintprop_default(op-&gt;node, "portid", -1);</div><div class='add'>+</div><div class='ctx'> 	/* Log the error. */</div><div class='ctx'> 	printk("SYSIO[%x]: Uncorrectable ECC Error, primary error type[%s]\n",</div><div class='del'>-	       sbus-&gt;portid,</div><div class='add'>+	       portid,</div><div class='ctx'> 	       (((error_bits &amp; SYSIO_UEAFSR_PPIO) ?</div><div class='ctx'> 		 "PIO" :</div><div class='ctx'> 		 ((error_bits &amp; SYSIO_UEAFSR_PDRD) ?</div><div class='hunk'>@@ -285,12 +298,12 @@ static irqreturn_t sysio_ue_handler(int irq, void *dev_id)</div><div class='ctx'> 		  ((error_bits &amp; SYSIO_UEAFSR_PDWR) ?</div><div class='ctx'> 		   "DVMA Write" : "???")))));</div><div class='ctx'> 	printk("SYSIO[%x]: DOFF[%lx] SIZE[%lx] MID[%lx]\n",</div><div class='del'>-	       sbus-&gt;portid,</div><div class='add'>+	       portid,</div><div class='ctx'> 	       (afsr &amp; SYSIO_UEAFSR_DOFF) &gt;&gt; 45UL,</div><div class='ctx'> 	       (afsr &amp; SYSIO_UEAFSR_SIZE) &gt;&gt; 42UL,</div><div class='ctx'> 	       (afsr &amp; SYSIO_UEAFSR_MID) &gt;&gt; 37UL);</div><div class='del'>-	printk("SYSIO[%x]: AFAR[%016lx]\n", sbus-&gt;portid, afar);</div><div class='del'>-	printk("SYSIO[%x]: Secondary UE errors [", sbus-&gt;portid);</div><div class='add'>+	printk("SYSIO[%x]: AFAR[%016lx]\n", portid, afar);</div><div class='add'>+	printk("SYSIO[%x]: Secondary UE errors [", portid);</div><div class='ctx'> 	reported = 0;</div><div class='ctx'> 	if (afsr &amp; SYSIO_UEAFSR_SPIO) {</div><div class='ctx'> 		reported++;</div><div class='hunk'>@@ -327,12 +340,12 @@ static irqreturn_t sysio_ue_handler(int irq, void *dev_id)</div><div class='ctx'> #define  SYSIO_CEAFSR_RESV2 0x0000001fffffffffUL /* Reserved                  */</div><div class='ctx'> static irqreturn_t sysio_ce_handler(int irq, void *dev_id)</div><div class='ctx'> {</div><div class='del'>-	struct sbus_bus *sbus = dev_id;</div><div class='del'>-	struct iommu *iommu = sbus-&gt;ofdev.dev.archdata.iommu;</div><div class='add'>+	struct of_device *op = dev_id;</div><div class='add'>+	struct iommu *iommu = op-&gt;dev.archdata.iommu;</div><div class='ctx'> 	unsigned long reg_base = iommu-&gt;write_complete_reg - 0x2000UL;</div><div class='ctx'> 	unsigned long afsr_reg, afar_reg;</div><div class='ctx'> 	unsigned long afsr, afar, error_bits;</div><div class='del'>-	int reported;</div><div class='add'>+	int reported, portid;</div><div class='ctx'> </div><div class='ctx'> 	afsr_reg = reg_base + SYSIO_CE_AFSR;</div><div class='ctx'> 	afar_reg = reg_base + SYSIO_CE_AFAR;</div><div class='hunk'>@@ -347,8 +360,10 @@ static irqreturn_t sysio_ce_handler(int irq, void *dev_id)</div><div class='ctx'> 		 SYSIO_CEAFSR_SPIO | SYSIO_CEAFSR_SDRD | SYSIO_CEAFSR_SDWR);</div><div class='ctx'> 	upa_writeq(error_bits, afsr_reg);</div><div class='ctx'> </div><div class='add'>+	portid = of_getintprop_default(op-&gt;node, "portid", -1);</div><div class='add'>+</div><div class='ctx'> 	printk("SYSIO[%x]: Correctable ECC Error, primary error type[%s]\n",</div><div class='del'>-	       sbus-&gt;portid,</div><div class='add'>+	       portid,</div><div class='ctx'> 	       (((error_bits &amp; SYSIO_CEAFSR_PPIO) ?</div><div class='ctx'> 		 "PIO" :</div><div class='ctx'> 		 ((error_bits &amp; SYSIO_CEAFSR_PDRD) ?</div><div class='hunk'>@@ -360,14 +375,14 @@ static irqreturn_t sysio_ce_handler(int irq, void *dev_id)</div><div class='ctx'> 	 * XXX UDB CE trap handler does... -DaveM</div><div class='ctx'> 	 */</div><div class='ctx'> 	printk("SYSIO[%x]: DOFF[%lx] ECC Syndrome[%lx] Size[%lx] MID[%lx]\n",</div><div class='del'>-	       sbus-&gt;portid,</div><div class='add'>+	       portid,</div><div class='ctx'> 	       (afsr &amp; SYSIO_CEAFSR_DOFF) &gt;&gt; 45UL,</div><div class='ctx'> 	       (afsr &amp; SYSIO_CEAFSR_ESYND) &gt;&gt; 48UL,</div><div class='ctx'> 	       (afsr &amp; SYSIO_CEAFSR_SIZE) &gt;&gt; 42UL,</div><div class='ctx'> 	       (afsr &amp; SYSIO_CEAFSR_MID) &gt;&gt; 37UL);</div><div class='del'>-	printk("SYSIO[%x]: AFAR[%016lx]\n", sbus-&gt;portid, afar);</div><div class='add'>+	printk("SYSIO[%x]: AFAR[%016lx]\n", portid, afar);</div><div class='ctx'> </div><div class='del'>-	printk("SYSIO[%x]: Secondary CE errors [", sbus-&gt;portid);</div><div class='add'>+	printk("SYSIO[%x]: Secondary CE errors [", portid);</div><div class='ctx'> 	reported = 0;</div><div class='ctx'> 	if (afsr &amp; SYSIO_CEAFSR_SPIO) {</div><div class='ctx'> 		reported++;</div><div class='hunk'>@@ -404,11 +419,11 @@ static irqreturn_t sysio_ce_handler(int irq, void *dev_id)</div><div class='ctx'> #define  SYSIO_SBAFSR_RESV3 0x0000001fffffffffUL /* Reserved                  */</div><div class='ctx'> static irqreturn_t sysio_sbus_error_handler(int irq, void *dev_id)</div><div class='ctx'> {</div><div class='del'>-	struct sbus_bus *sbus = dev_id;</div><div class='del'>-	struct iommu *iommu = sbus-&gt;ofdev.dev.archdata.iommu;</div><div class='add'>+	struct of_device *op = dev_id;</div><div class='add'>+	struct iommu *iommu = op-&gt;dev.archdata.iommu;</div><div class='ctx'> 	unsigned long afsr_reg, afar_reg, reg_base;</div><div class='ctx'> 	unsigned long afsr, afar, error_bits;</div><div class='del'>-	int reported;</div><div class='add'>+	int reported, portid;</div><div class='ctx'> </div><div class='ctx'> 	reg_base = iommu-&gt;write_complete_reg - 0x2000UL;</div><div class='ctx'> 	afsr_reg = reg_base + SYSIO_SBUS_AFSR;</div><div class='hunk'>@@ -423,9 +438,11 @@ static irqreturn_t sysio_sbus_error_handler(int irq, void *dev_id)</div><div class='ctx'> 		 SYSIO_SBAFSR_SLE | SYSIO_SBAFSR_STO | SYSIO_SBAFSR_SBERR);</div><div class='ctx'> 	upa_writeq(error_bits, afsr_reg);</div><div class='ctx'> </div><div class='add'>+	portid = of_getintprop_default(op-&gt;node, "portid", -1);</div><div class='add'>+</div><div class='ctx'> 	/* Log the error. */</div><div class='ctx'> 	printk("SYSIO[%x]: SBUS Error, primary error type[%s] read(%d)\n",</div><div class='del'>-	       sbus-&gt;portid,</div><div class='add'>+	       portid,</div><div class='ctx'> 	       (((error_bits &amp; SYSIO_SBAFSR_PLE) ?</div><div class='ctx'> 		 "Late PIO Error" :</div><div class='ctx'> 		 ((error_bits &amp; SYSIO_SBAFSR_PTO) ?</div><div class='hunk'>@@ -434,11 +451,11 @@ static irqreturn_t sysio_sbus_error_handler(int irq, void *dev_id)</div><div class='ctx'> 		   "Error Ack" : "???")))),</div><div class='ctx'> 	       (afsr &amp; SYSIO_SBAFSR_RD) ? 1 : 0);</div><div class='ctx'> 	printk("SYSIO[%x]: size[%lx] MID[%lx]\n",</div><div class='del'>-	       sbus-&gt;portid,</div><div class='add'>+	       portid,</div><div class='ctx'> 	       (afsr &amp; SYSIO_SBAFSR_SIZE) &gt;&gt; 42UL,</div><div class='ctx'> 	       (afsr &amp; SYSIO_SBAFSR_MID) &gt;&gt; 37UL);</div><div class='del'>-	printk("SYSIO[%x]: AFAR[%016lx]\n", sbus-&gt;portid, afar);</div><div class='del'>-	printk("SYSIO[%x]: Secondary SBUS errors [", sbus-&gt;portid);</div><div class='add'>+	printk("SYSIO[%x]: AFAR[%016lx]\n", portid, afar);</div><div class='add'>+	printk("SYSIO[%x]: Secondary SBUS errors [", portid);</div><div class='ctx'> 	reported = 0;</div><div class='ctx'> 	if (afsr &amp; SYSIO_SBAFSR_SLE) {</div><div class='ctx'> 		reported++;</div><div class='hunk'>@@ -470,34 +487,37 @@ static irqreturn_t sysio_sbus_error_handler(int irq, void *dev_id)</div><div class='ctx'> #define SYSIO_CE_INO		0x35</div><div class='ctx'> #define SYSIO_SBUSERR_INO	0x36</div><div class='ctx'> </div><div class='del'>-static void __init sysio_register_error_handlers(struct sbus_bus *sbus)</div><div class='add'>+static void __init sysio_register_error_handlers(struct of_device *op)</div><div class='ctx'> {</div><div class='del'>-	struct iommu *iommu = sbus-&gt;ofdev.dev.archdata.iommu;</div><div class='add'>+	struct iommu *iommu = op-&gt;dev.archdata.iommu;</div><div class='ctx'> 	unsigned long reg_base = iommu-&gt;write_complete_reg - 0x2000UL;</div><div class='ctx'> 	unsigned int irq;</div><div class='ctx'> 	u64 control;</div><div class='add'>+	int portid;</div><div class='add'>+</div><div class='add'>+	portid = of_getintprop_default(op-&gt;node, "portid", -1);</div><div class='ctx'> </div><div class='del'>-	irq = sbus_build_irq(sbus, SYSIO_UE_INO);</div><div class='add'>+	irq = sbus_build_irq(op, SYSIO_UE_INO);</div><div class='ctx'> 	if (request_irq(irq, sysio_ue_handler, 0,</div><div class='del'>-			"SYSIO_UE", sbus) &lt; 0) {</div><div class='add'>+			"SYSIO_UE", op) &lt; 0) {</div><div class='ctx'> 		prom_printf("SYSIO[%x]: Cannot register UE interrupt.\n",</div><div class='del'>-			    sbus-&gt;portid);</div><div class='add'>+			    portid);</div><div class='ctx'> 		prom_halt();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	irq = sbus_build_irq(sbus, SYSIO_CE_INO);</div><div class='add'>+	irq = sbus_build_irq(op, SYSIO_CE_INO);</div><div class='ctx'> 	if (request_irq(irq, sysio_ce_handler, 0,</div><div class='del'>-			"SYSIO_CE", sbus) &lt; 0) {</div><div class='add'>+			"SYSIO_CE", op) &lt; 0) {</div><div class='ctx'> 		prom_printf("SYSIO[%x]: Cannot register CE interrupt.\n",</div><div class='del'>-			    sbus-&gt;portid);</div><div class='add'>+			    portid);</div><div class='ctx'> 		prom_halt();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	irq = sbus_build_irq(sbus, SYSIO_SBUSERR_INO);</div><div class='add'>+	irq = sbus_build_irq(op, SYSIO_SBUSERR_INO);</div><div class='ctx'> 	if (request_irq(irq, sysio_sbus_error_handler, 0,</div><div class='del'>-			"SYSIO_SBERR", sbus) &lt; 0) {</div><div class='add'>+			"SYSIO_SBERR", op) &lt; 0) {</div><div class='ctx'> 		prom_printf("SYSIO[%x]: Cannot register SBUS Error interrupt.\n",</div><div class='del'>-			    sbus-&gt;portid);</div><div class='add'>+			    portid);</div><div class='ctx'> 		prom_halt();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -513,19 +533,15 @@ static void __init sysio_register_error_handlers(struct sbus_bus *sbus)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Boot time initialization. */</div><div class='del'>-static void __init sbus_iommu_init(int __node, struct sbus_bus *sbus)</div><div class='add'>+static void __init sbus_iommu_init(struct of_device *op)</div><div class='ctx'> {</div><div class='ctx'> 	const struct linux_prom64_registers *pr;</div><div class='del'>-	struct device_node *dp;</div><div class='add'>+	struct device_node *dp = op-&gt;node;</div><div class='ctx'> 	struct iommu *iommu;</div><div class='ctx'> 	struct strbuf *strbuf;</div><div class='ctx'> 	unsigned long regs, reg_base;</div><div class='add'>+	int i, portid;</div><div class='ctx'> 	u64 control;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	dp = of_find_node_by_phandle(__node);</div><div class='del'>-</div><div class='del'>-	sbus-&gt;portid = of_getintprop_default(dp, "upa-portid", -1);</div><div class='ctx'> </div><div class='ctx'> 	pr = of_get_property(dp, "reg", NULL);</div><div class='ctx'> 	if (!pr) {</div><div class='hunk'>@@ -542,9 +558,9 @@ static void __init sbus_iommu_init(int __node, struct sbus_bus *sbus)</div><div class='ctx'> 	if (!strbuf)</div><div class='ctx'> 		goto fatal_memory_error;</div><div class='ctx'> </div><div class='del'>-	sbus-&gt;ofdev.dev.archdata.iommu = iommu;</div><div class='del'>-	sbus-&gt;ofdev.dev.archdata.stc = strbuf;</div><div class='del'>-	sbus-&gt;ofdev.dev.archdata.numa_node = -1;</div><div class='add'>+	op-&gt;dev.archdata.iommu = iommu;</div><div class='add'>+	op-&gt;dev.archdata.stc = strbuf;</div><div class='add'>+	op-&gt;dev.archdata.numa_node = -1;</div><div class='ctx'> </div><div class='ctx'> 	reg_base = regs + SYSIO_IOMMUREG_BASE;</div><div class='ctx'> 	iommu-&gt;iommu_control = reg_base + IOMMU_CONTROL;</div><div class='hunk'>@@ -572,8 +588,9 @@ static void __init sbus_iommu_init(int __node, struct sbus_bus *sbus)</div><div class='ctx'> 	 */</div><div class='ctx'> 	iommu-&gt;write_complete_reg = regs + 0x2000UL;</div><div class='ctx'> </div><div class='del'>-	printk("SYSIO: UPA portID %x, at %016lx\n",</div><div class='del'>-	       sbus-&gt;portid, regs);</div><div class='add'>+	portid = of_getintprop_default(op-&gt;node, "portid", -1);</div><div class='add'>+	printk(KERN_INFO "SYSIO: UPA portID %x, at %016lx\n",</div><div class='add'>+	       portid, regs);</div><div class='ctx'> </div><div class='ctx'> 	/* Setup for TSB_SIZE=7, TBW_SIZE=0, MMU_DE=1, MMU_EN=1 */</div><div class='ctx'> 	if (iommu_table_init(iommu, IO_TSB_SIZE, MAP_BASE, 0xffffffff, -1))</div><div class='hunk'>@@ -631,56 +648,27 @@ static void __init sbus_iommu_init(int __node, struct sbus_bus *sbus)</div><div class='ctx'> </div><div class='ctx'> 	/* Now some Xfire specific grot... */</div><div class='ctx'> 	if (this_is_starfire)</div><div class='del'>-		starfire_hookup(sbus-&gt;portid);</div><div class='add'>+		starfire_hookup(portid);</div><div class='ctx'> </div><div class='del'>-	sysio_register_error_handlers(sbus);</div><div class='add'>+	sysio_register_error_handlers(op);</div><div class='ctx'> 	return;</div><div class='ctx'> </div><div class='ctx'> fatal_memory_error:</div><div class='ctx'> 	prom_printf("sbus_iommu_init: Fatal memory allocation error.\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void sbus_fill_device_irq(struct sbus_dev *sdev)</div><div class='add'>+static int __init sbus_init(void)</div><div class='ctx'> {</div><div class='del'>-	struct device_node *dp = of_find_node_by_phandle(sdev-&gt;prom_node);</div><div class='del'>-	const struct linux_prom_irqs *irqs;</div><div class='del'>-</div><div class='del'>-	irqs = of_get_property(dp, "interrupts", NULL);</div><div class='del'>-	if (!irqs) {</div><div class='del'>-		sdev-&gt;irqs[0] = 0;</div><div class='del'>-		sdev-&gt;num_irqs = 0;</div><div class='del'>-	} else {</div><div class='del'>-		unsigned int pri = irqs[0].pri;</div><div class='add'>+	struct device_node *dp;</div><div class='ctx'> </div><div class='del'>-		sdev-&gt;num_irqs = 1;</div><div class='del'>-		if (pri &lt; 0x20)</div><div class='del'>-			pri += sdev-&gt;slot * 8;</div><div class='add'>+	for_each_node_by_name(dp, "sbus") {</div><div class='add'>+		struct of_device *op = of_find_device_by_node(dp);</div><div class='ctx'> </div><div class='del'>-		sdev-&gt;irqs[0] =	sbus_build_irq(sdev-&gt;bus, pri);</div><div class='add'>+		sbus_iommu_init(op);</div><div class='add'>+		of_propagate_archdata(op);</div><div class='ctx'> 	}</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-void __init sbus_arch_bus_ranges_init(struct device_node *pn, struct sbus_bus *sbus)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __init sbus_setup_iommu(struct sbus_bus *sbus, struct device_node *dp)</div><div class='del'>-{</div><div class='del'>-	sbus_iommu_init(dp-&gt;node, sbus);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __init sbus_setup_arch_props(struct sbus_bus *sbus, struct device_node *dp)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int __init sbus_arch_preinit(void)</div><div class='del'>-{</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init sbus_arch_postinit(void)</div><div class='del'>-{</div><div class='del'>-	extern void firetruck_init(void);</div><div class='del'>-</div><div class='del'>-	firetruck_init();</div><div class='del'>-}</div><div class='add'>+subsys_initcall(sbus_init);</div><div class='head'>diff --git a/arch/sparc64/kernel/smp.c b/arch/sparc64/kernel/smp.c<br/>index 2be166c544ca..e5627118e613 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/smp.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc64/kernel/smp.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/smp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/smp.c</a></div><div class='hunk'>@@ -21,6 +21,7 @@</div><div class='ctx'> #include &lt;linux/jiffies.h&gt;</div><div class='ctx'> #include &lt;linux/profile.h&gt;</div><div class='ctx'> #include &lt;linux/lmb.h&gt;</div><div class='add'>+#include &lt;linux/cpu.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/head.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='hunk'>@@ -115,6 +116,9 @@ void __cpuinit smp_callin(void)</div><div class='ctx'> 	atomic_inc(&amp;init_mm.mm_count);</div><div class='ctx'> 	current-&gt;active_mm = &amp;init_mm;</div><div class='ctx'> </div><div class='add'>+	/* inform the notifiers about the new cpu */</div><div class='add'>+	notify_cpu_starting(cpuid);</div><div class='add'>+</div><div class='ctx'> 	while (!cpu_isset(cpuid, smp_commenced_mask))</div><div class='ctx'> 		rmb();</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sparc64/kernel/sparc64_ksyms.c b/arch/sparc64/kernel/sparc64_ksyms.c<br/>index 0804f71df6cb..30bba8b0a3b0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/sparc64_ksyms.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc64/kernel/sparc64_ksyms.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/sparc64_ksyms.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/sparc64_ksyms.c</a></div><div class='hunk'>@@ -36,7 +36,6 @@</div><div class='ctx'> #include &lt;asm/elf.h&gt;</div><div class='ctx'> #include &lt;asm/head.h&gt;</div><div class='ctx'> #include &lt;asm/smp.h&gt;</div><div class='del'>-#include &lt;asm/mostek.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/checksum.h&gt;</div><div class='hunk'>@@ -44,12 +43,8 @@</div><div class='ctx'> #include &lt;asm/pgalloc.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #ifdef CONFIG_SBUS</div><div class='del'>-#include &lt;asm/sbus.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='ctx'> #endif</div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-#include &lt;asm/ebus.h&gt;</div><div class='del'>-#endif</div><div class='ctx'> #include &lt;asm/ns87303.h&gt;</div><div class='ctx'> #include &lt;asm/timer.h&gt;</div><div class='ctx'> #include &lt;asm/cpudata.h&gt;</div><div class='hunk'>@@ -68,7 +63,6 @@ extern void *__memscan_zero(void *, size_t);</div><div class='ctx'> extern void *__memscan_generic(void *, int, size_t);</div><div class='ctx'> extern int __memcmp(const void *, const void *, __kernel_size_t);</div><div class='ctx'> extern __kernel_size_t strlen(const char *);</div><div class='del'>-extern void syscall_trace(struct pt_regs *, int);</div><div class='ctx'> extern void sys_sigsuspend(void);</div><div class='ctx'> extern int compat_sys_ioctl(unsigned int fd, unsigned int cmd, u32 arg);</div><div class='ctx'> extern int (*handle_mathemu)(struct pt_regs *, struct fpustate *);</div><div class='hunk'>@@ -154,26 +148,12 @@ EXPORT_SYMBOL(flush_dcache_page);</div><div class='ctx'> EXPORT_SYMBOL(__flush_dcache_range);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(mostek_lock);</div><div class='del'>-EXPORT_SYMBOL(mstk48t02_regs);</div><div class='ctx'> #ifdef CONFIG_SUN_AUXIO</div><div class='ctx'> EXPORT_SYMBOL(auxio_set_led);</div><div class='ctx'> EXPORT_SYMBOL(auxio_set_lte);</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_SBUS</div><div class='del'>-EXPORT_SYMBOL(sbus_root);</div><div class='del'>-EXPORT_SYMBOL(dma_chain);</div><div class='ctx'> EXPORT_SYMBOL(sbus_set_sbus64);</div><div class='del'>-EXPORT_SYMBOL(sbus_alloc_consistent);</div><div class='del'>-EXPORT_SYMBOL(sbus_free_consistent);</div><div class='del'>-EXPORT_SYMBOL(sbus_map_single);</div><div class='del'>-EXPORT_SYMBOL(sbus_unmap_single);</div><div class='del'>-EXPORT_SYMBOL(sbus_map_sg);</div><div class='del'>-EXPORT_SYMBOL(sbus_unmap_sg);</div><div class='del'>-EXPORT_SYMBOL(sbus_dma_sync_single_for_cpu);</div><div class='del'>-EXPORT_SYMBOL(sbus_dma_sync_single_for_device);</div><div class='del'>-EXPORT_SYMBOL(sbus_dma_sync_sg_for_cpu);</div><div class='del'>-EXPORT_SYMBOL(sbus_dma_sync_sg_for_device);</div><div class='ctx'> #endif</div><div class='ctx'> EXPORT_SYMBOL(outsb);</div><div class='ctx'> EXPORT_SYMBOL(outsw);</div><div class='hunk'>@@ -182,7 +162,6 @@ EXPORT_SYMBOL(insb);</div><div class='ctx'> EXPORT_SYMBOL(insw);</div><div class='ctx'> EXPORT_SYMBOL(insl);</div><div class='ctx'> #ifdef CONFIG_PCI</div><div class='del'>-EXPORT_SYMBOL(ebus_chain);</div><div class='ctx'> EXPORT_SYMBOL(pci_alloc_consistent);</div><div class='ctx'> EXPORT_SYMBOL(pci_free_consistent);</div><div class='ctx'> EXPORT_SYMBOL(pci_map_single);</div><div class='hunk'>@@ -300,3 +279,5 @@ EXPORT_SYMBOL(xor_niagara_2);</div><div class='ctx'> EXPORT_SYMBOL(xor_niagara_3);</div><div class='ctx'> EXPORT_SYMBOL(xor_niagara_4);</div><div class='ctx'> EXPORT_SYMBOL(xor_niagara_5);</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL_GPL(real_hard_smp_processor_id);</div><div class='head'>diff --git a/arch/sparc64/kernel/sstate.c b/arch/sparc64/kernel/sstate.c<br/>index 5b6e75b7f052..8cdbe5946b43 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/sstate.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc64/kernel/sstate.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/sstate.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/sstate.c</a></div><div class='hunk'>@@ -1,14 +1,15 @@</div><div class='ctx'> /* sstate.c: System soft state support.</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2007 David S. Miller &lt;davem@davemloft.net&gt;</div><div class='add'>+ * Copyright (C) 2007, 2008 David S. Miller &lt;davem@davemloft.net&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/notifier.h&gt;</div><div class='add'>+#include &lt;linux/reboot.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/hypervisor.h&gt;</div><div class='del'>-#include &lt;asm/sstate.h&gt;</div><div class='add'>+#include &lt;asm/spitfire.h&gt;</div><div class='ctx'> #include &lt;asm/oplib.h&gt;</div><div class='ctx'> #include &lt;asm/head.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='hunk'>@@ -50,31 +51,34 @@ static const char rebooting_msg[32] __attribute__((aligned(32))) =</div><div class='ctx'> static const char panicing_msg[32] __attribute__((aligned(32))) =</div><div class='ctx'> 	"Linux panicing";</div><div class='ctx'> </div><div class='del'>-void sstate_booting(void)</div><div class='add'>+static int sstate_reboot_call(struct notifier_block *np, unsigned long type, void *_unused)</div><div class='ctx'> {</div><div class='del'>-	do_set_sstate(HV_SOFT_STATE_TRANSITION, booting_msg);</div><div class='del'>-}</div><div class='add'>+	const char *msg;</div><div class='ctx'> </div><div class='del'>-void sstate_running(void)</div><div class='del'>-{</div><div class='del'>-	do_set_sstate(HV_SOFT_STATE_NORMAL, running_msg);</div><div class='del'>-}</div><div class='add'>+	switch (type) {</div><div class='add'>+	case SYS_DOWN:</div><div class='add'>+	default:</div><div class='add'>+		msg = rebooting_msg;</div><div class='add'>+		break;</div><div class='ctx'> </div><div class='del'>-void sstate_halt(void)</div><div class='del'>-{</div><div class='del'>-	do_set_sstate(HV_SOFT_STATE_TRANSITION, halting_msg);</div><div class='del'>-}</div><div class='add'>+	case SYS_HALT:</div><div class='add'>+		msg = halting_msg;</div><div class='add'>+		break;</div><div class='ctx'> </div><div class='del'>-void sstate_poweroff(void)</div><div class='del'>-{</div><div class='del'>-	do_set_sstate(HV_SOFT_STATE_TRANSITION, poweroff_msg);</div><div class='del'>-}</div><div class='add'>+	case SYS_POWER_OFF:</div><div class='add'>+		msg = poweroff_msg;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-void sstate_reboot(void)</div><div class='del'>-{</div><div class='del'>-	do_set_sstate(HV_SOFT_STATE_TRANSITION, rebooting_msg);</div><div class='add'>+	do_set_sstate(HV_SOFT_STATE_TRANSITION, msg);</div><div class='add'>+</div><div class='add'>+	return NOTIFY_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct notifier_block sstate_reboot_notifier = {</div><div class='add'>+	.notifier_call = sstate_reboot_call,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int sstate_panic_event(struct notifier_block *n, unsigned long event, void *ptr)</div><div class='ctx'> {</div><div class='ctx'> 	do_set_sstate(HV_SOFT_STATE_TRANSITION, panicing_msg);</div><div class='hunk'>@@ -87,18 +91,37 @@ static struct notifier_block sstate_panic_block = {</div><div class='ctx'> 	.priority	=	INT_MAX,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-void __init sun4v_sstate_init(void)</div><div class='add'>+static int __init sstate_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long major, minor;</div><div class='ctx'> </div><div class='add'>+	if (tlb_type != hypervisor)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	major = 1;</div><div class='ctx'> 	minor = 0;</div><div class='ctx'> 	if (sun4v_hvapi_register(HV_GRP_SOFT_STATE, major, &amp;minor))</div><div class='del'>-		return;</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	hv_supports_soft_state = 1;</div><div class='ctx'> </div><div class='ctx'> 	prom_sun4v_guest_soft_state();</div><div class='add'>+</div><div class='add'>+	do_set_sstate(HV_SOFT_STATE_TRANSITION, booting_msg);</div><div class='add'>+</div><div class='ctx'> 	atomic_notifier_chain_register(&amp;panic_notifier_list,</div><div class='ctx'> 				       &amp;sstate_panic_block);</div><div class='add'>+	register_reboot_notifier(&amp;sstate_reboot_notifier);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+core_initcall(sstate_init);</div><div class='add'>+</div><div class='add'>+static int __init sstate_running(void)</div><div class='add'>+{</div><div class='add'>+	do_set_sstate(HV_SOFT_STATE_NORMAL, running_msg);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+late_initcall(sstate_running);</div><div class='head'>diff --git a/arch/sparc64/kernel/starfire.c b/arch/sparc64/kernel/starfire.c<br/>index 7461581b3bb9..060d0f3a6151 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/starfire.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc64/kernel/starfire.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/starfire.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/starfire.c</a></div><div class='hunk'>@@ -28,11 +28,6 @@ void check_if_starfire(void)</div><div class='ctx'> 		this_is_starfire = 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void starfire_cpu_setup(void)</div><div class='del'>-{</div><div class='del'>-	/* Currently, nothing to do.  */</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> int starfire_hard_smp_processor_id(void)</div><div class='ctx'> {</div><div class='ctx'> 	return upa_readl(0x1fff40000d0UL);</div><div class='head'>diff --git a/arch/sparc64/kernel/sys_sparc32.c b/arch/sparc64/kernel/sys_sparc32.c<br/>index 3d118531baff..e800503879e4 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/sys_sparc32.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc64/kernel/sys_sparc32.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/sys_sparc32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/sys_sparc32.c</a></div><div class='hunk'>@@ -58,15 +58,6 @@</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='ctx'> #include &lt;asm/compat_signal.h&gt;</div><div class='ctx'> </div><div class='del'>-/* 32-bit timeval and related flotsam.  */</div><div class='del'>-</div><div class='del'>-static inline long put_tv32(struct compat_timeval __user *o, struct timeval *i)</div><div class='del'>-{</div><div class='del'>-	return (!access_ok(VERIFY_WRITE, o, sizeof(*o)) ||</div><div class='del'>-		(__put_user(i-&gt;tv_sec, &amp;o-&gt;tv_sec) |</div><div class='del'>-		 __put_user(i-&gt;tv_usec, &amp;o-&gt;tv_usec)));</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_SYSVIPC                                                        </div><div class='ctx'> asmlinkage long compat_sys_ipc(u32 call, u32 first, u32 second, u32 third, compat_uptr_t ptr, u32 fifth)</div><div class='ctx'> {</div><div class='hunk'>@@ -148,41 +139,6 @@ asmlinkage long sys32_ftruncate64(unsigned int fd, unsigned long high, unsigned</div><div class='ctx'> 		return sys_ftruncate(fd, (high &lt;&lt; 32) | low);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int cp_compat_stat(struct kstat *stat, struct compat_stat __user *statbuf)</div><div class='del'>-{</div><div class='del'>-	compat_ino_t ino;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (stat-&gt;size &gt; MAX_NON_LFS || !old_valid_dev(stat-&gt;dev) ||</div><div class='del'>-	    !old_valid_dev(stat-&gt;rdev))</div><div class='del'>-		return -EOVERFLOW;</div><div class='del'>-</div><div class='del'>-	ino = stat-&gt;ino;</div><div class='del'>-	if (sizeof(ino) &lt; sizeof(stat-&gt;ino) &amp;&amp; ino != stat-&gt;ino)</div><div class='del'>-		return -EOVERFLOW;</div><div class='del'>-</div><div class='del'>-	err  = put_user(old_encode_dev(stat-&gt;dev), &amp;statbuf-&gt;st_dev);</div><div class='del'>-	err |= put_user(stat-&gt;ino, &amp;statbuf-&gt;st_ino);</div><div class='del'>-	err |= put_user(stat-&gt;mode, &amp;statbuf-&gt;st_mode);</div><div class='del'>-	err |= put_user(stat-&gt;nlink, &amp;statbuf-&gt;st_nlink);</div><div class='del'>-	err |= put_user(high2lowuid(stat-&gt;uid), &amp;statbuf-&gt;st_uid);</div><div class='del'>-	err |= put_user(high2lowgid(stat-&gt;gid), &amp;statbuf-&gt;st_gid);</div><div class='del'>-	err |= put_user(old_encode_dev(stat-&gt;rdev), &amp;statbuf-&gt;st_rdev);</div><div class='del'>-	err |= put_user(stat-&gt;size, &amp;statbuf-&gt;st_size);</div><div class='del'>-	err |= put_user(stat-&gt;atime.tv_sec, &amp;statbuf-&gt;st_atime);</div><div class='del'>-	err |= put_user(stat-&gt;atime.tv_nsec, &amp;statbuf-&gt;st_atime_nsec);</div><div class='del'>-	err |= put_user(stat-&gt;mtime.tv_sec, &amp;statbuf-&gt;st_mtime);</div><div class='del'>-	err |= put_user(stat-&gt;mtime.tv_nsec, &amp;statbuf-&gt;st_mtime_nsec);</div><div class='del'>-	err |= put_user(stat-&gt;ctime.tv_sec, &amp;statbuf-&gt;st_ctime);</div><div class='del'>-	err |= put_user(stat-&gt;ctime.tv_nsec, &amp;statbuf-&gt;st_ctime_nsec);</div><div class='del'>-	err |= put_user(stat-&gt;blksize, &amp;statbuf-&gt;st_blksize);</div><div class='del'>-	err |= put_user(stat-&gt;blocks, &amp;statbuf-&gt;st_blocks);</div><div class='del'>-	err |= put_user(0, &amp;statbuf-&gt;__unused4[0]);</div><div class='del'>-	err |= put_user(0, &amp;statbuf-&gt;__unused4[1]);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int cp_compat_stat64(struct kstat *stat,</div><div class='ctx'> 			    struct compat_stat64 __user *statbuf)</div><div class='ctx'> {</div><div class='hunk'>@@ -522,67 +478,6 @@ asmlinkage long sys32_delete_module(const char __user *name_user)</div><div class='ctx'> </div><div class='ctx'> #endif  /* CONFIG_MODULES */</div><div class='ctx'> </div><div class='del'>-/* Translations due to time_t size differences.  Which affects all</div><div class='del'>-   sorts of things, like timeval and itimerval.  */</div><div class='del'>-</div><div class='del'>-extern struct timezone sys_tz;</div><div class='del'>-</div><div class='del'>-asmlinkage long sys32_gettimeofday(struct compat_timeval __user *tv,</div><div class='del'>-				   struct timezone __user *tz)</div><div class='del'>-{</div><div class='del'>-	if (tv) {</div><div class='del'>-		struct timeval ktv;</div><div class='del'>-		do_gettimeofday(&amp;ktv);</div><div class='del'>-		if (put_tv32(tv, &amp;ktv))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-	}</div><div class='del'>-	if (tz) {</div><div class='del'>-		if (copy_to_user(tz, &amp;sys_tz, sizeof(sys_tz)))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline long get_ts32(struct timespec *o, struct compat_timeval __user *i)</div><div class='del'>-{</div><div class='del'>-	long usec;</div><div class='del'>-</div><div class='del'>-	if (!access_ok(VERIFY_READ, i, sizeof(*i)))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	if (__get_user(o-&gt;tv_sec, &amp;i-&gt;tv_sec))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	if (__get_user(usec, &amp;i-&gt;tv_usec))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	o-&gt;tv_nsec = usec * 1000;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-asmlinkage long sys32_settimeofday(struct compat_timeval __user *tv,</div><div class='del'>-				   struct timezone __user *tz)</div><div class='del'>-{</div><div class='del'>-	struct timespec kts;</div><div class='del'>-	struct timezone ktz;</div><div class='del'>-</div><div class='del'>- 	if (tv) {</div><div class='del'>-		if (get_ts32(&amp;kts, tv))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-	}</div><div class='del'>-	if (tz) {</div><div class='del'>-		if (copy_from_user(&amp;ktz, tz, sizeof(ktz)))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return do_sys_settimeofday(tv ? &amp;kts : NULL, tz ? &amp;ktz : NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* These are here just in case some old sparc32 binary calls it. */</div><div class='del'>-asmlinkage long sys32_pause(void)</div><div class='del'>-{</div><div class='del'>-	current-&gt;state = TASK_INTERRUPTIBLE;</div><div class='del'>-	schedule();</div><div class='del'>-	return -ERESTARTNOHAND;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> asmlinkage compat_ssize_t sys32_pread64(unsigned int fd,</div><div class='ctx'> 					char __user *ubuf,</div><div class='ctx'> 					compat_size_t count,</div><div class='head'>diff --git a/arch/sparc64/kernel/syscalls.S b/arch/sparc64/kernel/syscalls.S<br/>index a2f24270ed8a..7a6786a71363 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/syscalls.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc64/kernel/syscalls.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/syscalls.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/syscalls.S</a></div><div class='hunk'>@@ -65,9 +65,8 @@ sys32_rt_sigreturn:</div><div class='ctx'> 	andcc	%l5, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT), %g0</div><div class='ctx'> 	be,pt	%icc, rtrap</div><div class='ctx'> 	 nop</div><div class='del'>-	add	%sp, PTREGS_OFF, %o0</div><div class='del'>-	call	syscall_trace</div><div class='del'>-	 mov	1, %o1</div><div class='add'>+	call	syscall_trace_leave</div><div class='add'>+	 add	%sp, PTREGS_OFF, %o0</div><div class='ctx'> 	ba,pt	%xcc, rtrap</div><div class='ctx'> 	 nop</div><div class='ctx'> </div><div class='hunk'>@@ -159,9 +158,8 @@ linux_sparc_ni_syscall:</div><div class='ctx'> 	 or	%l7, %lo(sys_ni_syscall), %l7</div><div class='ctx'> </div><div class='ctx'> linux_syscall_trace32:</div><div class='del'>-	add	%sp, PTREGS_OFF, %o0</div><div class='del'>-	call	syscall_trace</div><div class='del'>-	 clr	%o1</div><div class='add'>+	call	syscall_trace_enter</div><div class='add'>+	 add	%sp, PTREGS_OFF, %o0</div><div class='ctx'> 	brnz,pn	%o0, 3f</div><div class='ctx'> 	 mov	-ENOSYS, %o0</div><div class='ctx'> 	srl	%i0, 0, %o0</div><div class='hunk'>@@ -172,9 +170,8 @@ linux_syscall_trace32:</div><div class='ctx'> 	 srl	%i3, 0, %o3</div><div class='ctx'> </div><div class='ctx'> linux_syscall_trace:</div><div class='del'>-	add	%sp, PTREGS_OFF, %o0</div><div class='del'>-	call	syscall_trace</div><div class='del'>-	 clr	%o1</div><div class='add'>+	call	syscall_trace_enter</div><div class='add'>+	 add	%sp, PTREGS_OFF, %o0</div><div class='ctx'> 	brnz,pn	%o0, 3f</div><div class='ctx'> 	 mov	-ENOSYS, %o0</div><div class='ctx'> 	mov	%i0, %o0</div><div class='hunk'>@@ -275,9 +272,8 @@ ret_sys_call:</div><div class='ctx'> 	b,pt	%xcc, rtrap</div><div class='ctx'> 	 stx	%l2, [%sp + PTREGS_OFF + PT_V9_TNPC]</div><div class='ctx'> linux_syscall_trace2:</div><div class='del'>-	add	%sp, PTREGS_OFF, %o0</div><div class='del'>-	call	syscall_trace</div><div class='del'>-	 mov	1, %o1</div><div class='add'>+	call	syscall_trace_leave</div><div class='add'>+	 add	%sp, PTREGS_OFF, %o0</div><div class='ctx'> 	stx	%l1, [%sp + PTREGS_OFF + PT_V9_TPC]</div><div class='ctx'> 	ba,pt	%xcc, rtrap</div><div class='ctx'> 	 stx	%l2, [%sp + PTREGS_OFF + PT_V9_TNPC]</div><div class='head'>diff --git a/arch/sparc64/kernel/systbls.S b/arch/sparc64/kernel/systbls.S<br/>index 0fdbf3ba956e..b2fa4c163638 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/systbls.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc64/kernel/systbls.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/systbls.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/systbls.S</a></div><div class='hunk'>@@ -23,7 +23,7 @@ sys_call_table32:</div><div class='ctx'> /*10*/  .word sys_unlink, sunos_execv, sys_chdir, sys_chown16, sys32_mknod</div><div class='ctx'> /*15*/	.word sys_chmod, sys_lchown16, sparc_brk, sys32_perfctr, sys32_lseek</div><div class='ctx'> /*20*/	.word sys_getpid, sys_capget, sys_capset, sys_setuid16, sys_getuid16</div><div class='del'>-/*25*/	.word sys32_vmsplice, compat_sys_ptrace, sys_alarm, sys32_sigaltstack, sys32_pause</div><div class='add'>+/*25*/	.word sys32_vmsplice, compat_sys_ptrace, sys_alarm, sys32_sigaltstack, sys_pause</div><div class='ctx'> /*30*/	.word compat_sys_utime, sys_lchown, sys_fchown, sys32_access, sys32_nice</div><div class='ctx'> 	.word sys_chown, sys_sync, sys32_kill, compat_sys_newstat, sys32_sendfile</div><div class='ctx'> /*40*/	.word compat_sys_newlstat, sys_dup, sys_pipe, compat_sys_times, sys_getuid</div><div class='hunk'>@@ -41,8 +41,8 @@ sys_call_table32:</div><div class='ctx'> /*100*/ .word sys32_getpriority, sys32_rt_sigreturn, sys32_rt_sigaction, sys32_rt_sigprocmask, sys32_rt_sigpending</div><div class='ctx'> 	.word compat_sys_rt_sigtimedwait, sys32_rt_sigqueueinfo, compat_sys_rt_sigsuspend, sys_setresuid, sys_getresuid</div><div class='ctx'> /*110*/	.word sys_setresgid, sys_getresgid, sys_setregid, sys_nis_syscall, sys_nis_syscall</div><div class='del'>-	.word sys32_getgroups, sys32_gettimeofday, sys32_getrusage, sys_nis_syscall, sys_getcwd</div><div class='del'>-/*120*/	.word compat_sys_readv, compat_sys_writev, sys32_settimeofday, sys_fchown16, sys_fchmod</div><div class='add'>+	.word sys32_getgroups, compat_sys_gettimeofday, sys32_getrusage, sys_nis_syscall, sys_getcwd</div><div class='add'>+/*120*/	.word compat_sys_readv, compat_sys_writev, compat_sys_settimeofday, sys_fchown16, sys_fchmod</div><div class='ctx'> 	.word sys_nis_syscall, sys_setreuid16, sys_setregid16, sys_rename, sys_truncate</div><div class='ctx'> /*130*/	.word sys_ftruncate, sys_flock, compat_sys_lstat64, sys_nis_syscall, sys_nis_syscall</div><div class='ctx'> 	.word sys_nis_syscall, sys32_mkdir, sys_rmdir, compat_sys_utimes, compat_sys_stat64</div><div class='head'>diff --git a/arch/sparc64/kernel/time.c b/arch/sparc64/kernel/time.c<br/>index cc16fdcf98af..80d71a5ce1e3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/time.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc64/kernel/time.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/time.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/time.c</a></div><div class='hunk'>@@ -30,13 +30,14 @@</div><div class='ctx'> #include &lt;linux/percpu.h&gt;</div><div class='ctx'> #include &lt;linux/miscdevice.h&gt;</div><div class='ctx'> #include &lt;linux/rtc.h&gt;</div><div class='add'>+#include &lt;linux/rtc/m48t59.h&gt;</div><div class='ctx'> #include &lt;linux/kernel_stat.h&gt;</div><div class='ctx'> #include &lt;linux/clockchips.h&gt;</div><div class='ctx'> #include &lt;linux/clocksource.h&gt;</div><div class='ctx'> #include &lt;linux/of_device.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/oplib.h&gt;</div><div class='del'>-#include &lt;asm/mostek.h&gt;</div><div class='ctx'> #include &lt;asm/timer.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='hunk'>@@ -50,18 +51,7 @@</div><div class='ctx'> </div><div class='ctx'> #include "entry.h"</div><div class='ctx'> </div><div class='del'>-DEFINE_SPINLOCK(mostek_lock);</div><div class='ctx'> DEFINE_SPINLOCK(rtc_lock);</div><div class='del'>-void __iomem *mstk48t02_regs = NULL;</div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-unsigned long ds1287_regs = 0UL;</div><div class='del'>-static void __iomem *bq4802_regs;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static void __iomem *mstk48t08_regs;</div><div class='del'>-static void __iomem *mstk48t59_regs;</div><div class='del'>-</div><div class='del'>-static int set_rtc_mmss(unsigned long);</div><div class='ctx'> </div><div class='ctx'> #define TICK_PRIV_BIT	(1UL &lt;&lt; 63)</div><div class='ctx'> #define TICKCMP_IRQ_BIT	(1UL &lt;&lt; 63)</div><div class='hunk'>@@ -405,313 +395,167 @@ static unsigned long timer_ticks_per_nsec_quotient __read_mostly;</div><div class='ctx'> </div><div class='ctx'> int update_persistent_clock(struct timespec now)</div><div class='ctx'> {</div><div class='del'>-	return set_rtc_mmss(now.tv_sec);</div><div class='del'>-}</div><div class='add'>+	struct rtc_device *rtc = rtc_class_open("rtc0");</div><div class='add'>+	int err = -1;</div><div class='ctx'> </div><div class='del'>-/* Kick start a stopped clock (procedure from the Sun NVRAM/hostid FAQ). */</div><div class='del'>-static void __init kick_start_clock(void)</div><div class='del'>-{</div><div class='del'>-	void __iomem *regs = mstk48t02_regs;</div><div class='del'>-	u8 sec, tmp;</div><div class='del'>-	int i, count;</div><div class='del'>-</div><div class='del'>-	prom_printf("CLOCK: Clock was stopped. Kick start ");</div><div class='del'>-</div><div class='del'>-	spin_lock_irq(&amp;mostek_lock);</div><div class='del'>-</div><div class='del'>-	/* Turn on the kick start bit to start the oscillator. */</div><div class='del'>-	tmp = mostek_read(regs + MOSTEK_CREG);</div><div class='del'>-	tmp |= MSTK_CREG_WRITE;</div><div class='del'>-	mostek_write(regs + MOSTEK_CREG, tmp);</div><div class='del'>-	tmp = mostek_read(regs + MOSTEK_SEC);</div><div class='del'>-	tmp &amp;= ~MSTK_STOP;</div><div class='del'>-	mostek_write(regs + MOSTEK_SEC, tmp);</div><div class='del'>-	tmp = mostek_read(regs + MOSTEK_HOUR);</div><div class='del'>-	tmp |= MSTK_KICK_START;</div><div class='del'>-	mostek_write(regs + MOSTEK_HOUR, tmp);</div><div class='del'>-	tmp = mostek_read(regs + MOSTEK_CREG);</div><div class='del'>-	tmp &amp;= ~MSTK_CREG_WRITE;</div><div class='del'>-	mostek_write(regs + MOSTEK_CREG, tmp);</div><div class='del'>-</div><div class='del'>-	spin_unlock_irq(&amp;mostek_lock);</div><div class='del'>-</div><div class='del'>-	/* Delay to allow the clock oscillator to start. */</div><div class='del'>-	sec = MSTK_REG_SEC(regs);</div><div class='del'>-	for (i = 0; i &lt; 3; i++) {</div><div class='del'>-		while (sec == MSTK_REG_SEC(regs))</div><div class='del'>-			for (count = 0; count &lt; 100000; count++)</div><div class='del'>-				/* nothing */ ;</div><div class='del'>-		prom_printf(".");</div><div class='del'>-		sec = MSTK_REG_SEC(regs);</div><div class='del'>-	}</div><div class='del'>-	prom_printf("\n");</div><div class='del'>-</div><div class='del'>-	spin_lock_irq(&amp;mostek_lock);</div><div class='del'>-</div><div class='del'>-	/* Turn off kick start and set a "valid" time and date. */</div><div class='del'>-	tmp = mostek_read(regs + MOSTEK_CREG);</div><div class='del'>-	tmp |= MSTK_CREG_WRITE;</div><div class='del'>-	mostek_write(regs + MOSTEK_CREG, tmp);</div><div class='del'>-	tmp = mostek_read(regs + MOSTEK_HOUR);</div><div class='del'>-	tmp &amp;= ~MSTK_KICK_START;</div><div class='del'>-	mostek_write(regs + MOSTEK_HOUR, tmp);</div><div class='del'>-	MSTK_SET_REG_SEC(regs,0);</div><div class='del'>-	MSTK_SET_REG_MIN(regs,0);</div><div class='del'>-	MSTK_SET_REG_HOUR(regs,0);</div><div class='del'>-	MSTK_SET_REG_DOW(regs,5);</div><div class='del'>-	MSTK_SET_REG_DOM(regs,1);</div><div class='del'>-	MSTK_SET_REG_MONTH(regs,8);</div><div class='del'>-	MSTK_SET_REG_YEAR(regs,1996 - MSTK_YEAR_ZERO);</div><div class='del'>-	tmp = mostek_read(regs + MOSTEK_CREG);</div><div class='del'>-	tmp &amp;= ~MSTK_CREG_WRITE;</div><div class='del'>-	mostek_write(regs + MOSTEK_CREG, tmp);</div><div class='del'>-</div><div class='del'>-	spin_unlock_irq(&amp;mostek_lock);</div><div class='del'>-</div><div class='del'>-	/* Ensure the kick start bit is off. If it isn't, turn it off. */</div><div class='del'>-	while (mostek_read(regs + MOSTEK_HOUR) &amp; MSTK_KICK_START) {</div><div class='del'>-		prom_printf("CLOCK: Kick start still on!\n");</div><div class='del'>-</div><div class='del'>-		spin_lock_irq(&amp;mostek_lock);</div><div class='del'>-</div><div class='del'>-		tmp = mostek_read(regs + MOSTEK_CREG);</div><div class='del'>-		tmp |= MSTK_CREG_WRITE;</div><div class='del'>-		mostek_write(regs + MOSTEK_CREG, tmp);</div><div class='del'>-</div><div class='del'>-		tmp = mostek_read(regs + MOSTEK_HOUR);</div><div class='del'>-		tmp &amp;= ~MSTK_KICK_START;</div><div class='del'>-		mostek_write(regs + MOSTEK_HOUR, tmp);</div><div class='del'>-</div><div class='del'>-		tmp = mostek_read(regs + MOSTEK_CREG);</div><div class='del'>-		tmp &amp;= ~MSTK_CREG_WRITE;</div><div class='del'>-		mostek_write(regs + MOSTEK_CREG, tmp);</div><div class='del'>-</div><div class='del'>-		spin_unlock_irq(&amp;mostek_lock);</div><div class='add'>+	if (rtc) {</div><div class='add'>+		err = rtc_set_mmss(rtc, now.tv_sec);</div><div class='add'>+		rtc_class_close(rtc);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	prom_printf("CLOCK: Kick start procedure successful.\n");</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Return nonzero if the clock chip battery is low. */</div><div class='del'>-static int __init has_low_battery(void)</div><div class='del'>-{</div><div class='del'>-	void __iomem *regs = mstk48t02_regs;</div><div class='del'>-	u8 data1, data2;</div><div class='del'>-</div><div class='del'>-	spin_lock_irq(&amp;mostek_lock);</div><div class='add'>+unsigned long cmos_regs;</div><div class='add'>+EXPORT_SYMBOL(cmos_regs);</div><div class='ctx'> </div><div class='del'>-	data1 = mostek_read(regs + MOSTEK_EEPROM);	/* Read some data. */</div><div class='del'>-	mostek_write(regs + MOSTEK_EEPROM, ~data1);	/* Write back the complement. */</div><div class='del'>-	data2 = mostek_read(regs + MOSTEK_EEPROM);	/* Read back the complement. */</div><div class='del'>-	mostek_write(regs + MOSTEK_EEPROM, data1);	/* Restore original value. */</div><div class='add'>+static struct resource rtc_cmos_resource;</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irq(&amp;mostek_lock);</div><div class='del'>-</div><div class='del'>-	return (data1 == data2);	/* Was the write blocked? */</div><div class='del'>-}</div><div class='add'>+static struct platform_device rtc_cmos_device = {</div><div class='add'>+	.name		= "rtc_cmos",</div><div class='add'>+	.id		= -1,</div><div class='add'>+	.resource	= &amp;rtc_cmos_resource,</div><div class='add'>+	.num_resources	= 1,</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-static void __init mostek_set_system_time(void __iomem *mregs)</div><div class='add'>+static int __devinit rtc_probe(struct of_device *op, const struct of_device_id *match)</div><div class='ctx'> {</div><div class='del'>-	unsigned int year, mon, day, hour, min, sec;</div><div class='del'>-	u8 tmp;</div><div class='del'>-</div><div class='del'>-	spin_lock_irq(&amp;mostek_lock);</div><div class='add'>+	struct resource *r;</div><div class='ctx'> </div><div class='del'>-	/* Traditional Mostek chip. */</div><div class='del'>-	tmp = mostek_read(mregs + MOSTEK_CREG);</div><div class='del'>-	tmp |= MSTK_CREG_READ;</div><div class='del'>-	mostek_write(mregs + MOSTEK_CREG, tmp);</div><div class='add'>+	printk(KERN_INFO "%s: RTC regs at 0x%lx\n",</div><div class='add'>+	       op-&gt;node-&gt;full_name, op-&gt;resource[0].start);</div><div class='ctx'> </div><div class='del'>-	sec = MSTK_REG_SEC(mregs);</div><div class='del'>-	min = MSTK_REG_MIN(mregs);</div><div class='del'>-	hour = MSTK_REG_HOUR(mregs);</div><div class='del'>-	day = MSTK_REG_DOM(mregs);</div><div class='del'>-	mon = MSTK_REG_MONTH(mregs);</div><div class='del'>-	year = MSTK_CVT_YEAR( MSTK_REG_YEAR(mregs) );</div><div class='del'>-</div><div class='del'>-	xtime.tv_sec = mktime(year, mon, day, hour, min, sec);</div><div class='del'>-	xtime.tv_nsec = (INITIAL_JIFFIES % HZ) * (NSEC_PER_SEC / HZ);</div><div class='del'>-	set_normalized_timespec(&amp;wall_to_monotonic,</div><div class='del'>- 	                        -xtime.tv_sec, -xtime.tv_nsec);</div><div class='add'>+	/* The CMOS RTC driver only accepts IORESOURCE_IO, so cons</div><div class='add'>+	 * up a fake resource so that the probe works for all cases.</div><div class='add'>+	 * When the RTC is behind an ISA bus it will have IORESOURCE_IO</div><div class='add'>+	 * already, whereas when it's behind EBUS is will be IORESOURCE_MEM.</div><div class='add'>+	 */</div><div class='ctx'> </div><div class='del'>-	tmp = mostek_read(mregs + MOSTEK_CREG);</div><div class='del'>-	tmp &amp;= ~MSTK_CREG_READ;</div><div class='del'>-	mostek_write(mregs + MOSTEK_CREG, tmp);</div><div class='add'>+	r = &amp;rtc_cmos_resource;</div><div class='add'>+	r-&gt;flags = IORESOURCE_IO;</div><div class='add'>+	r-&gt;name = op-&gt;resource[0].name;</div><div class='add'>+	r-&gt;start = op-&gt;resource[0].start;</div><div class='add'>+	r-&gt;end = op-&gt;resource[0].end;</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irq(&amp;mostek_lock);</div><div class='add'>+	cmos_regs = op-&gt;resource[0].start;</div><div class='add'>+	return platform_device_register(&amp;rtc_cmos_device);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Probe for the real time clock chip. */</div><div class='del'>-static void __init set_system_time(void)</div><div class='del'>-{</div><div class='del'>-	unsigned int year, mon, day, hour, min, sec;</div><div class='del'>-	void __iomem *mregs = mstk48t02_regs;</div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-	unsigned long dregs = ds1287_regs;</div><div class='del'>-	void __iomem *bregs = bq4802_regs;</div><div class='del'>-#else</div><div class='del'>-	unsigned long dregs = 0UL;</div><div class='del'>-	void __iomem *bregs = 0UL;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (!mregs &amp;&amp; !dregs &amp;&amp; !bregs) {</div><div class='del'>-		prom_printf("Something wrong, clock regs not mapped yet.\n");</div><div class='del'>-		prom_halt();</div><div class='del'>-	}		</div><div class='del'>-</div><div class='del'>-	if (mregs) {</div><div class='del'>-		mostek_set_system_time(mregs);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (bregs) {</div><div class='del'>-		unsigned char val = readb(bregs + 0x0e);</div><div class='del'>-		unsigned int century;</div><div class='add'>+static struct of_device_id __initdata rtc_match[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "rtc",</div><div class='add'>+		.compatible = "m5819",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "rtc",</div><div class='add'>+		.compatible = "isa-m5819p",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "rtc",</div><div class='add'>+		.compatible = "isa-m5823p",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "rtc",</div><div class='add'>+		.compatible = "ds1287",</div><div class='add'>+	},</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-		/* BQ4802 RTC chip. */</div><div class='add'>+static struct of_platform_driver rtc_driver = {</div><div class='add'>+	.match_table	= rtc_match,</div><div class='add'>+	.probe		= rtc_probe,</div><div class='add'>+	.driver		= {</div><div class='add'>+		.name	= "rtc",</div><div class='add'>+	},</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-		writeb(val | 0x08, bregs + 0x0e);</div><div class='add'>+static struct platform_device rtc_bq4802_device = {</div><div class='add'>+	.name		= "rtc-bq4802",</div><div class='add'>+	.id		= -1,</div><div class='add'>+	.num_resources	= 1,</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-		sec  = readb(bregs + 0x00);</div><div class='del'>-		min  = readb(bregs + 0x02);</div><div class='del'>-		hour = readb(bregs + 0x04);</div><div class='del'>-		day  = readb(bregs + 0x06);</div><div class='del'>-		mon  = readb(bregs + 0x09);</div><div class='del'>-		year = readb(bregs + 0x0a);</div><div class='del'>-		century = readb(bregs + 0x0f);</div><div class='add'>+static int __devinit bq4802_probe(struct of_device *op, const struct of_device_id *match)</div><div class='add'>+{</div><div class='ctx'> </div><div class='del'>-		writeb(val, bregs + 0x0e);</div><div class='add'>+	printk(KERN_INFO "%s: BQ4802 regs at 0x%lx\n",</div><div class='add'>+	       op-&gt;node-&gt;full_name, op-&gt;resource[0].start);</div><div class='ctx'> </div><div class='del'>-		BCD_TO_BIN(sec);</div><div class='del'>-		BCD_TO_BIN(min);</div><div class='del'>-		BCD_TO_BIN(hour);</div><div class='del'>-		BCD_TO_BIN(day);</div><div class='del'>-		BCD_TO_BIN(mon);</div><div class='del'>-		BCD_TO_BIN(year);</div><div class='del'>-		BCD_TO_BIN(century);</div><div class='add'>+	rtc_bq4802_device.resource = &amp;op-&gt;resource[0];</div><div class='add'>+	return platform_device_register(&amp;rtc_bq4802_device);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		year += (century * 100);</div><div class='del'>-	} else {</div><div class='del'>-		/* Dallas 12887 RTC chip. */</div><div class='del'>-</div><div class='del'>-		do {</div><div class='del'>-			sec  = CMOS_READ(RTC_SECONDS);</div><div class='del'>-			min  = CMOS_READ(RTC_MINUTES);</div><div class='del'>-			hour = CMOS_READ(RTC_HOURS);</div><div class='del'>-			day  = CMOS_READ(RTC_DAY_OF_MONTH);</div><div class='del'>-			mon  = CMOS_READ(RTC_MONTH);</div><div class='del'>-			year = CMOS_READ(RTC_YEAR);</div><div class='del'>-		} while (sec != CMOS_READ(RTC_SECONDS));</div><div class='del'>-</div><div class='del'>-		if (!(CMOS_READ(RTC_CONTROL) &amp; RTC_DM_BINARY) || RTC_ALWAYS_BCD) {</div><div class='del'>-			BCD_TO_BIN(sec);</div><div class='del'>-			BCD_TO_BIN(min);</div><div class='del'>-			BCD_TO_BIN(hour);</div><div class='del'>-			BCD_TO_BIN(day);</div><div class='del'>-			BCD_TO_BIN(mon);</div><div class='del'>-			BCD_TO_BIN(year);</div><div class='del'>-		}</div><div class='del'>-		if ((year += 1900) &lt; 1970)</div><div class='del'>-			year += 100;</div><div class='del'>-	}</div><div class='add'>+static struct of_device_id __initdata bq4802_match[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "rtc",</div><div class='add'>+		.compatible = "bq4802",</div><div class='add'>+	},</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-	xtime.tv_sec = mktime(year, mon, day, hour, min, sec);</div><div class='del'>-	xtime.tv_nsec = (INITIAL_JIFFIES % HZ) * (NSEC_PER_SEC / HZ);</div><div class='del'>-	set_normalized_timespec(&amp;wall_to_monotonic,</div><div class='del'>- 	                        -xtime.tv_sec, -xtime.tv_nsec);</div><div class='del'>-}</div><div class='add'>+static struct of_platform_driver bq4802_driver = {</div><div class='add'>+	.match_table	= bq4802_match,</div><div class='add'>+	.probe		= bq4802_probe,</div><div class='add'>+	.driver		= {</div><div class='add'>+		.name	= "bq4802",</div><div class='add'>+	},</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-/* davem suggests we keep this within the 4M locked kernel image */</div><div class='del'>-static u32 starfire_get_time(void)</div><div class='add'>+static unsigned char mostek_read_byte(struct device *dev, u32 ofs)</div><div class='ctx'> {</div><div class='del'>-	static char obp_gettod[32];</div><div class='del'>-	static u32 unix_tod;</div><div class='add'>+	struct platform_device *pdev = to_platform_device(dev);</div><div class='add'>+	struct m48t59_plat_data *pdata = pdev-&gt;dev.platform_data;</div><div class='add'>+	void __iomem *regs;</div><div class='add'>+	unsigned char val;</div><div class='ctx'> </div><div class='del'>-	sprintf(obp_gettod, "h# %08x unix-gettod",</div><div class='del'>-		(unsigned int) (long) &amp;unix_tod);</div><div class='del'>-	prom_feval(obp_gettod);</div><div class='add'>+	regs = (void __iomem *) pdev-&gt;resource[0].start;</div><div class='add'>+	val = readb(regs + ofs);</div><div class='ctx'> </div><div class='del'>-	return unix_tod;</div><div class='add'>+	/* the year 0 is 1968 */</div><div class='add'>+	if (ofs == pdata-&gt;offset + M48T59_YEAR) {</div><div class='add'>+		val += 0x68;</div><div class='add'>+		if ((val &amp; 0xf) &gt; 9)</div><div class='add'>+			val += 6;</div><div class='add'>+	}</div><div class='add'>+	return val;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int starfire_set_time(u32 val)</div><div class='add'>+static void mostek_write_byte(struct device *dev, u32 ofs, u8 val)</div><div class='ctx'> {</div><div class='del'>-	/* Do nothing, time is set using the service processor</div><div class='del'>-	 * console on this platform.</div><div class='del'>-	 */</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='add'>+	struct platform_device *pdev = to_platform_device(dev);</div><div class='add'>+	struct m48t59_plat_data *pdata = pdev-&gt;dev.platform_data;</div><div class='add'>+	void __iomem *regs;</div><div class='ctx'> </div><div class='del'>-static u32 hypervisor_get_time(void)</div><div class='del'>-{</div><div class='del'>-	unsigned long ret, time;</div><div class='del'>-	int retries = 10000;</div><div class='del'>-</div><div class='del'>-retry:</div><div class='del'>-	ret = sun4v_tod_get(&amp;time);</div><div class='del'>-	if (ret == HV_EOK)</div><div class='del'>-		return time;</div><div class='del'>-	if (ret == HV_EWOULDBLOCK) {</div><div class='del'>-		if (--retries &gt; 0) {</div><div class='del'>-			udelay(100);</div><div class='del'>-			goto retry;</div><div class='del'>-		}</div><div class='del'>-		printk(KERN_WARNING "SUN4V: tod_get() timed out.\n");</div><div class='del'>-		return 0;</div><div class='add'>+	regs = (void __iomem *) pdev-&gt;resource[0].start;</div><div class='add'>+	if (ofs == pdata-&gt;offset + M48T59_YEAR) {</div><div class='add'>+		if (val &lt; 0x68)</div><div class='add'>+			val += 0x32;</div><div class='add'>+		else</div><div class='add'>+			val -= 0x68;</div><div class='add'>+		if ((val &amp; 0xf) &gt; 9)</div><div class='add'>+			val += 6;</div><div class='add'>+		if ((val &amp; 0xf0) &gt; 0x9A)</div><div class='add'>+			val += 0x60;</div><div class='ctx'> 	}</div><div class='del'>-	printk(KERN_WARNING "SUN4V: tod_get() not supported.\n");</div><div class='del'>-	return 0;</div><div class='add'>+	writeb(val, regs + ofs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int hypervisor_set_time(u32 secs)</div><div class='del'>-{</div><div class='del'>-	unsigned long ret;</div><div class='del'>-	int retries = 10000;</div><div class='del'>-</div><div class='del'>-retry:</div><div class='del'>-	ret = sun4v_tod_set(secs);</div><div class='del'>-	if (ret == HV_EOK)</div><div class='del'>-		return 0;</div><div class='del'>-	if (ret == HV_EWOULDBLOCK) {</div><div class='del'>-		if (--retries &gt; 0) {</div><div class='del'>-			udelay(100);</div><div class='del'>-			goto retry;</div><div class='del'>-		}</div><div class='del'>-		printk(KERN_WARNING "SUN4V: tod_set() timed out.\n");</div><div class='del'>-		return -EAGAIN;</div><div class='del'>-	}</div><div class='del'>-	printk(KERN_WARNING "SUN4V: tod_set() not supported.\n");</div><div class='del'>-	return -EOPNOTSUPP;</div><div class='del'>-}</div><div class='add'>+static struct m48t59_plat_data m48t59_data = {</div><div class='add'>+	.read_byte	= mostek_read_byte,</div><div class='add'>+	.write_byte	= mostek_write_byte,</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-static int __init clock_model_matches(const char *model)</div><div class='del'>-{</div><div class='del'>-	if (strcmp(model, "mk48t02") &amp;&amp;</div><div class='del'>-	    strcmp(model, "mk48t08") &amp;&amp;</div><div class='del'>-	    strcmp(model, "mk48t59") &amp;&amp;</div><div class='del'>-	    strcmp(model, "m5819") &amp;&amp;</div><div class='del'>-	    strcmp(model, "m5819p") &amp;&amp;</div><div class='del'>-	    strcmp(model, "m5823") &amp;&amp;</div><div class='del'>-	    strcmp(model, "ds1287") &amp;&amp;</div><div class='del'>-	    strcmp(model, "bq4802"))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='add'>+static struct platform_device m48t59_rtc = {</div><div class='add'>+	.name		= "rtc-m48t59",</div><div class='add'>+	.id		= 0,</div><div class='add'>+	.num_resources	= 1,</div><div class='add'>+	.dev	= {</div><div class='add'>+		.platform_data = &amp;m48t59_data,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-static int __devinit clock_probe(struct of_device *op, const struct of_device_id *match)</div><div class='add'>+static int __devinit mostek_probe(struct of_device *op, const struct of_device_id *match)</div><div class='ctx'> {</div><div class='ctx'> 	struct device_node *dp = op-&gt;node;</div><div class='del'>-	const char *model = of_get_property(dp, "model", NULL);</div><div class='del'>-	const char *compat = of_get_property(dp, "compatible", NULL);</div><div class='del'>-	unsigned long size, flags;</div><div class='del'>-	void __iomem *regs;</div><div class='del'>-</div><div class='del'>-	if (!model)</div><div class='del'>-		model = compat;</div><div class='del'>-</div><div class='del'>-	if (!model || !clock_model_matches(model))</div><div class='del'>-		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	/* On an Enterprise system there can be multiple mostek clocks.</div><div class='ctx'> 	 * We should only match the one that is on the central FHC bus.</div><div class='hunk'>@@ -720,88 +564,51 @@ static int __devinit clock_probe(struct of_device *op, const struct of_device_id</div><div class='ctx'> 	    strcmp(dp-&gt;parent-&gt;parent-&gt;name, "central") != 0)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	size = (op-&gt;resource[0].end - op-&gt;resource[0].start) + 1;</div><div class='del'>-	regs = of_ioremap(&amp;op-&gt;resource[0], 0, size, "clock");</div><div class='del'>-	if (!regs)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-	if (!strcmp(model, "ds1287") ||</div><div class='del'>-	    !strcmp(model, "m5819") ||</div><div class='del'>-	    !strcmp(model, "m5819p") ||</div><div class='del'>-	    !strcmp(model, "m5823")) {</div><div class='del'>-		ds1287_regs = (unsigned long) regs;</div><div class='del'>-	} else if (!strcmp(model, "bq4802")) {</div><div class='del'>-		bq4802_regs = regs;</div><div class='del'>-	} else</div><div class='del'>-#endif</div><div class='del'>-	if (model[5] == '0' &amp;&amp; model[6] == '2') {</div><div class='del'>-		mstk48t02_regs = regs;</div><div class='del'>-	} else if(model[5] == '0' &amp;&amp; model[6] == '8') {</div><div class='del'>-		mstk48t08_regs = regs;</div><div class='del'>-		mstk48t02_regs = mstk48t08_regs + MOSTEK_48T08_48T02;</div><div class='del'>-	} else {</div><div class='del'>-		mstk48t59_regs = regs;</div><div class='del'>-		mstk48t02_regs = mstk48t59_regs + MOSTEK_48T59_48T02;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printk(KERN_INFO "%s: Clock regs at %p\n", dp-&gt;full_name, regs);</div><div class='del'>-</div><div class='del'>-	local_irq_save(flags);</div><div class='del'>-</div><div class='del'>-	if (mstk48t02_regs != NULL) {</div><div class='del'>-		/* Report a low battery voltage condition. */</div><div class='del'>-		if (has_low_battery())</div><div class='del'>-			prom_printf("NVRAM: Low battery voltage!\n");</div><div class='del'>-</div><div class='del'>-		/* Kick start the clock if it is completely stopped. */</div><div class='del'>-		if (mostek_read(mstk48t02_regs + MOSTEK_SEC) &amp; MSTK_STOP)</div><div class='del'>-			kick_start_clock();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	set_system_time();</div><div class='del'>-	</div><div class='del'>-	local_irq_restore(flags);</div><div class='add'>+	printk(KERN_INFO "%s: Mostek regs at 0x%lx\n",</div><div class='add'>+	       dp-&gt;full_name, op-&gt;resource[0].start);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	m48t59_rtc.resource = &amp;op-&gt;resource[0];</div><div class='add'>+	return platform_device_register(&amp;m48t59_rtc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct of_device_id clock_match[] = {</div><div class='add'>+static struct of_device_id __initdata mostek_match[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.name = "eeprom",</div><div class='ctx'> 	},</div><div class='del'>-	{</div><div class='del'>-		.name = "rtc",</div><div class='del'>-	},</div><div class='ctx'> 	{},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct of_platform_driver clock_driver = {</div><div class='del'>-	.match_table	= clock_match,</div><div class='del'>-	.probe		= clock_probe,</div><div class='add'>+static struct of_platform_driver mostek_driver = {</div><div class='add'>+	.match_table	= mostek_match,</div><div class='add'>+	.probe		= mostek_probe,</div><div class='ctx'> 	.driver		= {</div><div class='del'>-		.name	= "clock",</div><div class='add'>+		.name	= "mostek",</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct platform_device rtc_sun4v_device = {</div><div class='add'>+	.name		= "rtc-sun4v",</div><div class='add'>+	.id		= -1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device rtc_starfire_device = {</div><div class='add'>+	.name		= "rtc-starfire",</div><div class='add'>+	.id		= -1,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int __init clock_init(void)</div><div class='ctx'> {</div><div class='del'>-	if (this_is_starfire) {</div><div class='del'>-		xtime.tv_sec = starfire_get_time();</div><div class='del'>-		xtime.tv_nsec = (INITIAL_JIFFIES % HZ) * (NSEC_PER_SEC / HZ);</div><div class='del'>-		set_normalized_timespec(&amp;wall_to_monotonic,</div><div class='del'>-		                        -xtime.tv_sec, -xtime.tv_nsec);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	if (tlb_type == hypervisor) {</div><div class='del'>-		xtime.tv_sec = hypervisor_get_time();</div><div class='del'>-		xtime.tv_nsec = (INITIAL_JIFFIES % HZ) * (NSEC_PER_SEC / HZ);</div><div class='del'>-		set_normalized_timespec(&amp;wall_to_monotonic,</div><div class='del'>-		                        -xtime.tv_sec, -xtime.tv_nsec);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='add'>+	if (this_is_starfire)</div><div class='add'>+		return platform_device_register(&amp;rtc_starfire_device);</div><div class='add'>+</div><div class='add'>+	if (tlb_type == hypervisor)</div><div class='add'>+		return platform_device_register(&amp;rtc_sun4v_device);</div><div class='add'>+</div><div class='add'>+	(void) of_register_driver(&amp;rtc_driver, &amp;of_platform_bus_type);</div><div class='add'>+	(void) of_register_driver(&amp;mostek_driver, &amp;of_platform_bus_type);</div><div class='add'>+	(void) of_register_driver(&amp;bq4802_driver, &amp;of_platform_bus_type);</div><div class='ctx'> </div><div class='del'>-	return of_register_driver(&amp;clock_driver, &amp;of_platform_bus_type);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Must be after subsys_initcall() so that busses are probed.  Must</div><div class='hunk'>@@ -814,7 +621,7 @@ fs_initcall(clock_init);</div><div class='ctx'> static unsigned long sparc64_init_timers(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct device_node *dp;</div><div class='del'>-	unsigned long clock;</div><div class='add'>+	unsigned long freq;</div><div class='ctx'> </div><div class='ctx'> 	dp = of_find_node_by_path("/");</div><div class='ctx'> 	if (tlb_type == spitfire) {</div><div class='hunk'>@@ -827,17 +634,17 @@ static unsigned long sparc64_init_timers(void)</div><div class='ctx'> 		if (manuf == 0x17 &amp;&amp; impl == 0x13) {</div><div class='ctx'> 			/* Hummingbird, aka Ultra-IIe */</div><div class='ctx'> 			tick_ops = &amp;hbtick_operations;</div><div class='del'>-			clock = of_getintprop_default(dp, "stick-frequency", 0);</div><div class='add'>+			freq = of_getintprop_default(dp, "stick-frequency", 0);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			tick_ops = &amp;tick_operations;</div><div class='del'>-			clock = local_cpu_data().clock_tick;</div><div class='add'>+			freq = local_cpu_data().clock_tick;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		tick_ops = &amp;stick_operations;</div><div class='del'>-		clock = of_getintprop_default(dp, "stick-frequency", 0);</div><div class='add'>+		freq = of_getintprop_default(dp, "stick-frequency", 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return clock;</div><div class='add'>+	return freq;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct freq_table {</div><div class='hunk'>@@ -1029,16 +836,16 @@ EXPORT_SYMBOL(udelay);</div><div class='ctx'> </div><div class='ctx'> void __init time_init(void)</div><div class='ctx'> {</div><div class='del'>-	unsigned long clock = sparc64_init_timers();</div><div class='add'>+	unsigned long freq = sparc64_init_timers();</div><div class='ctx'> </div><div class='del'>-	tb_ticks_per_usec = clock / USEC_PER_SEC;</div><div class='add'>+	tb_ticks_per_usec = freq / USEC_PER_SEC;</div><div class='ctx'> </div><div class='ctx'> 	timer_ticks_per_nsec_quotient =</div><div class='del'>-		clocksource_hz2mult(clock, SPARC64_NSEC_PER_CYC_SHIFT);</div><div class='add'>+		clocksource_hz2mult(freq, SPARC64_NSEC_PER_CYC_SHIFT);</div><div class='ctx'> </div><div class='ctx'> 	clocksource_tick.name = tick_ops-&gt;name;</div><div class='ctx'> 	clocksource_tick.mult =</div><div class='del'>-		clocksource_hz2mult(clock,</div><div class='add'>+		clocksource_hz2mult(freq,</div><div class='ctx'> 				    clocksource_tick.shift);</div><div class='ctx'> 	clocksource_tick.read = tick_ops-&gt;get_tick;</div><div class='ctx'> </div><div class='hunk'>@@ -1049,7 +856,7 @@ void __init time_init(void)</div><div class='ctx'> </div><div class='ctx'> 	sparc64_clockevent.name = tick_ops-&gt;name;</div><div class='ctx'> </div><div class='del'>-	setup_clockevent_multiplier(clock);</div><div class='add'>+	setup_clockevent_multiplier(freq);</div><div class='ctx'> </div><div class='ctx'> 	sparc64_clockevent.max_delta_ns =</div><div class='ctx'> 		clockevent_delta2ns(0x7fffffffffffffffUL, &amp;sparc64_clockevent);</div><div class='hunk'>@@ -1070,672 +877,8 @@ unsigned long long sched_clock(void)</div><div class='ctx'> 		&gt;&gt; SPARC64_NSEC_PER_CYC_SHIFT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int set_rtc_mmss(unsigned long nowtime)</div><div class='del'>-{</div><div class='del'>-	int real_seconds, real_minutes, chip_minutes;</div><div class='del'>-	void __iomem *mregs = mstk48t02_regs;</div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-	unsigned long dregs = ds1287_regs;</div><div class='del'>-	void __iomem *bregs = bq4802_regs;</div><div class='del'>-#else</div><div class='del'>-	unsigned long dregs = 0UL;</div><div class='del'>-	void __iomem *bregs = 0UL;</div><div class='del'>-#endif</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	u8 tmp;</div><div class='del'>-</div><div class='del'>-	/* </div><div class='del'>-	 * Not having a register set can lead to trouble.</div><div class='del'>-	 * Also starfire doesn't have a tod clock.</div><div class='del'>-	 */</div><div class='del'>-	if (!mregs &amp;&amp; !dregs &amp;&amp; !bregs)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	if (mregs) {</div><div class='del'>-		spin_lock_irqsave(&amp;mostek_lock, flags);</div><div class='del'>-</div><div class='del'>-		/* Read the current RTC minutes. */</div><div class='del'>-		tmp = mostek_read(mregs + MOSTEK_CREG);</div><div class='del'>-		tmp |= MSTK_CREG_READ;</div><div class='del'>-		mostek_write(mregs + MOSTEK_CREG, tmp);</div><div class='del'>-</div><div class='del'>-		chip_minutes = MSTK_REG_MIN(mregs);</div><div class='del'>-</div><div class='del'>-		tmp = mostek_read(mregs + MOSTEK_CREG);</div><div class='del'>-		tmp &amp;= ~MSTK_CREG_READ;</div><div class='del'>-		mostek_write(mregs + MOSTEK_CREG, tmp);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * since we're only adjusting minutes and seconds,</div><div class='del'>-		 * don't interfere with hour overflow. This avoids</div><div class='del'>-		 * messing with unknown time zones but requires your</div><div class='del'>-		 * RTC not to be off by more than 15 minutes</div><div class='del'>-		 */</div><div class='del'>-		real_seconds = nowtime % 60;</div><div class='del'>-		real_minutes = nowtime / 60;</div><div class='del'>-		if (((abs(real_minutes - chip_minutes) + 15)/30) &amp; 1)</div><div class='del'>-			real_minutes += 30;	/* correct for half hour time zone */</div><div class='del'>-		real_minutes %= 60;</div><div class='del'>-</div><div class='del'>-		if (abs(real_minutes - chip_minutes) &lt; 30) {</div><div class='del'>-			tmp = mostek_read(mregs + MOSTEK_CREG);</div><div class='del'>-			tmp |= MSTK_CREG_WRITE;</div><div class='del'>-			mostek_write(mregs + MOSTEK_CREG, tmp);</div><div class='del'>-</div><div class='del'>-			MSTK_SET_REG_SEC(mregs,real_seconds);</div><div class='del'>-			MSTK_SET_REG_MIN(mregs,real_minutes);</div><div class='del'>-</div><div class='del'>-			tmp = mostek_read(mregs + MOSTEK_CREG);</div><div class='del'>-			tmp &amp;= ~MSTK_CREG_WRITE;</div><div class='del'>-			mostek_write(mregs + MOSTEK_CREG, tmp);</div><div class='del'>-</div><div class='del'>-			spin_unlock_irqrestore(&amp;mostek_lock, flags);</div><div class='del'>-</div><div class='del'>-			return 0;</div><div class='del'>-		} else {</div><div class='del'>-			spin_unlock_irqrestore(&amp;mostek_lock, flags);</div><div class='del'>-</div><div class='del'>-			return -1;</div><div class='del'>-		}</div><div class='del'>-	} else if (bregs) {</div><div class='del'>-		int retval = 0;</div><div class='del'>-		unsigned char val = readb(bregs + 0x0e);</div><div class='del'>-</div><div class='del'>-		/* BQ4802 RTC chip. */</div><div class='del'>-</div><div class='del'>-		writeb(val | 0x08, bregs + 0x0e);</div><div class='del'>-</div><div class='del'>-		chip_minutes = readb(bregs + 0x02);</div><div class='del'>-		BCD_TO_BIN(chip_minutes);</div><div class='del'>-		real_seconds = nowtime % 60;</div><div class='del'>-		real_minutes = nowtime / 60;</div><div class='del'>-		if (((abs(real_minutes - chip_minutes) + 15)/30) &amp; 1)</div><div class='del'>-			real_minutes += 30;</div><div class='del'>-		real_minutes %= 60;</div><div class='del'>-</div><div class='del'>-		if (abs(real_minutes - chip_minutes) &lt; 30) {</div><div class='del'>-			BIN_TO_BCD(real_seconds);</div><div class='del'>-			BIN_TO_BCD(real_minutes);</div><div class='del'>-			writeb(real_seconds, bregs + 0x00);</div><div class='del'>-			writeb(real_minutes, bregs + 0x02);</div><div class='del'>-		} else {</div><div class='del'>-			printk(KERN_WARNING</div><div class='del'>-			       "set_rtc_mmss: can't update from %d to %d\n",</div><div class='del'>-			       chip_minutes, real_minutes);</div><div class='del'>-			retval = -1;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		writeb(val, bregs + 0x0e);</div><div class='del'>-</div><div class='del'>-		return retval;</div><div class='del'>-	} else {</div><div class='del'>-		int retval = 0;</div><div class='del'>-		unsigned char save_control, save_freq_select;</div><div class='del'>-</div><div class='del'>-		/* Stolen from arch/i386/kernel/time.c, see there for</div><div class='del'>-		 * credits and descriptive comments.</div><div class='del'>-		 */</div><div class='del'>-		spin_lock_irqsave(&amp;rtc_lock, flags);</div><div class='del'>-		save_control = CMOS_READ(RTC_CONTROL); /* tell the clock it's being set */</div><div class='del'>-		CMOS_WRITE((save_control|RTC_SET), RTC_CONTROL);</div><div class='del'>-</div><div class='del'>-		save_freq_select = CMOS_READ(RTC_FREQ_SELECT); /* stop and reset prescaler */</div><div class='del'>-		CMOS_WRITE((save_freq_select|RTC_DIV_RESET2), RTC_FREQ_SELECT);</div><div class='del'>-</div><div class='del'>-		chip_minutes = CMOS_READ(RTC_MINUTES);</div><div class='del'>-		if (!(save_control &amp; RTC_DM_BINARY) || RTC_ALWAYS_BCD)</div><div class='del'>-			BCD_TO_BIN(chip_minutes);</div><div class='del'>-		real_seconds = nowtime % 60;</div><div class='del'>-		real_minutes = nowtime / 60;</div><div class='del'>-		if (((abs(real_minutes - chip_minutes) + 15)/30) &amp; 1)</div><div class='del'>-			real_minutes += 30;</div><div class='del'>-		real_minutes %= 60;</div><div class='del'>-</div><div class='del'>-		if (abs(real_minutes - chip_minutes) &lt; 30) {</div><div class='del'>-			if (!(save_control &amp; RTC_DM_BINARY) || RTC_ALWAYS_BCD) {</div><div class='del'>-				BIN_TO_BCD(real_seconds);</div><div class='del'>-				BIN_TO_BCD(real_minutes);</div><div class='del'>-			}</div><div class='del'>-			CMOS_WRITE(real_seconds,RTC_SECONDS);</div><div class='del'>-			CMOS_WRITE(real_minutes,RTC_MINUTES);</div><div class='del'>-		} else {</div><div class='del'>-			printk(KERN_WARNING</div><div class='del'>-			       "set_rtc_mmss: can't update from %d to %d\n",</div><div class='del'>-			       chip_minutes, real_minutes);</div><div class='del'>-			retval = -1;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		CMOS_WRITE(save_control, RTC_CONTROL);</div><div class='del'>-		CMOS_WRITE(save_freq_select, RTC_FREQ_SELECT);</div><div class='del'>-		spin_unlock_irqrestore(&amp;rtc_lock, flags);</div><div class='del'>-</div><div class='del'>-		return retval;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define RTC_IS_OPEN		0x01	/* means /dev/rtc is in use	*/</div><div class='del'>-static unsigned char mini_rtc_status;	/* bitmapped status byte.	*/</div><div class='del'>-</div><div class='del'>-#define FEBRUARY	2</div><div class='del'>-#define	STARTOFTIME	1970</div><div class='del'>-#define SECDAY		86400L</div><div class='del'>-#define SECYR		(SECDAY * 365)</div><div class='del'>-#define	leapyear(year)		((year) % 4 == 0 &amp;&amp; \</div><div class='del'>-				 ((year) % 100 != 0 || (year) % 400 == 0))</div><div class='del'>-#define	days_in_year(a) 	(leapyear(a) ? 366 : 365)</div><div class='del'>-#define	days_in_month(a) 	(month_days[(a) - 1])</div><div class='del'>-</div><div class='del'>-static int month_days[12] = {</div><div class='del'>-	31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This only works for the Gregorian calendar - i.e. after 1752 (in the UK)</div><div class='del'>- */</div><div class='del'>-static void GregorianDay(struct rtc_time * tm)</div><div class='del'>-{</div><div class='del'>-	int leapsToDate;</div><div class='del'>-	int lastYear;</div><div class='del'>-	int day;</div><div class='del'>-	int MonthOffset[] = { 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334 };</div><div class='del'>-</div><div class='del'>-	lastYear = tm-&gt;tm_year - 1;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Number of leap corrections to apply up to end of last year</div><div class='del'>-	 */</div><div class='del'>-	leapsToDate = lastYear / 4 - lastYear / 100 + lastYear / 400;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * This year is a leap year if it is divisible by 4 except when it is</div><div class='del'>-	 * divisible by 100 unless it is divisible by 400</div><div class='del'>-	 *</div><div class='del'>-	 * e.g. 1904 was a leap year, 1900 was not, 1996 is, and 2000 was</div><div class='del'>-	 */</div><div class='del'>-	day = tm-&gt;tm_mon &gt; 2 &amp;&amp; leapyear(tm-&gt;tm_year);</div><div class='del'>-</div><div class='del'>-	day += lastYear*365 + leapsToDate + MonthOffset[tm-&gt;tm_mon-1] +</div><div class='del'>-		   tm-&gt;tm_mday;</div><div class='del'>-</div><div class='del'>-	tm-&gt;tm_wday = day % 7;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void to_tm(int tim, struct rtc_time *tm)</div><div class='del'>-{</div><div class='del'>-	register int    i;</div><div class='del'>-	register long   hms, day;</div><div class='del'>-</div><div class='del'>-	day = tim / SECDAY;</div><div class='del'>-	hms = tim % SECDAY;</div><div class='del'>-</div><div class='del'>-	/* Hours, minutes, seconds are easy */</div><div class='del'>-	tm-&gt;tm_hour = hms / 3600;</div><div class='del'>-	tm-&gt;tm_min = (hms % 3600) / 60;</div><div class='del'>-	tm-&gt;tm_sec = (hms % 3600) % 60;</div><div class='del'>-</div><div class='del'>-	/* Number of years in days */</div><div class='del'>-	for (i = STARTOFTIME; day &gt;= days_in_year(i); i++)</div><div class='del'>-		day -= days_in_year(i);</div><div class='del'>-	tm-&gt;tm_year = i;</div><div class='del'>-</div><div class='del'>-	/* Number of months in days left */</div><div class='del'>-	if (leapyear(tm-&gt;tm_year))</div><div class='del'>-		days_in_month(FEBRUARY) = 29;</div><div class='del'>-	for (i = 1; day &gt;= days_in_month(i); i++)</div><div class='del'>-		day -= days_in_month(i);</div><div class='del'>-	days_in_month(FEBRUARY) = 28;</div><div class='del'>-	tm-&gt;tm_mon = i;</div><div class='del'>-</div><div class='del'>-	/* Days are what is left over (+1) from all that. */</div><div class='del'>-	tm-&gt;tm_mday = day + 1;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Determine the day of week</div><div class='del'>-	 */</div><div class='del'>-	GregorianDay(tm);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Both Starfire and SUN4V give us seconds since Jan 1st, 1970,</div><div class='del'>- * aka Unix time.  So we have to convert to/from rtc_time.</div><div class='del'>- */</div><div class='del'>-static void starfire_get_rtc_time(struct rtc_time *time)</div><div class='del'>-{</div><div class='del'>-	u32 seconds = starfire_get_time();</div><div class='del'>-</div><div class='del'>-	to_tm(seconds, time);</div><div class='del'>-	time-&gt;tm_year -= 1900;</div><div class='del'>-	time-&gt;tm_mon -= 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int starfire_set_rtc_time(struct rtc_time *time)</div><div class='del'>-{</div><div class='del'>-	u32 seconds = mktime(time-&gt;tm_year + 1900, time-&gt;tm_mon + 1,</div><div class='del'>-			     time-&gt;tm_mday, time-&gt;tm_hour,</div><div class='del'>-			     time-&gt;tm_min, time-&gt;tm_sec);</div><div class='del'>-</div><div class='del'>-	return starfire_set_time(seconds);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void hypervisor_get_rtc_time(struct rtc_time *time)</div><div class='del'>-{</div><div class='del'>-	u32 seconds = hypervisor_get_time();</div><div class='del'>-</div><div class='del'>-	to_tm(seconds, time);</div><div class='del'>-	time-&gt;tm_year -= 1900;</div><div class='del'>-	time-&gt;tm_mon -= 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int hypervisor_set_rtc_time(struct rtc_time *time)</div><div class='del'>-{</div><div class='del'>-	u32 seconds = mktime(time-&gt;tm_year + 1900, time-&gt;tm_mon + 1,</div><div class='del'>-			     time-&gt;tm_mday, time-&gt;tm_hour,</div><div class='del'>-			     time-&gt;tm_min, time-&gt;tm_sec);</div><div class='del'>-</div><div class='del'>-	return hypervisor_set_time(seconds);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-static void bq4802_get_rtc_time(struct rtc_time *time)</div><div class='del'>-{</div><div class='del'>-	unsigned char val = readb(bq4802_regs + 0x0e);</div><div class='del'>-	unsigned int century;</div><div class='del'>-</div><div class='del'>-	writeb(val | 0x08, bq4802_regs + 0x0e);</div><div class='del'>-</div><div class='del'>-	time-&gt;tm_sec = readb(bq4802_regs + 0x00);</div><div class='del'>-	time-&gt;tm_min = readb(bq4802_regs + 0x02);</div><div class='del'>-	time-&gt;tm_hour = readb(bq4802_regs + 0x04);</div><div class='del'>-	time-&gt;tm_mday = readb(bq4802_regs + 0x06);</div><div class='del'>-	time-&gt;tm_mon = readb(bq4802_regs + 0x09);</div><div class='del'>-	time-&gt;tm_year = readb(bq4802_regs + 0x0a);</div><div class='del'>-	time-&gt;tm_wday = readb(bq4802_regs + 0x08);</div><div class='del'>-	century = readb(bq4802_regs + 0x0f);</div><div class='del'>-</div><div class='del'>-	writeb(val, bq4802_regs + 0x0e);</div><div class='del'>-</div><div class='del'>-	BCD_TO_BIN(time-&gt;tm_sec);</div><div class='del'>-	BCD_TO_BIN(time-&gt;tm_min);</div><div class='del'>-	BCD_TO_BIN(time-&gt;tm_hour);</div><div class='del'>-	BCD_TO_BIN(time-&gt;tm_mday);</div><div class='del'>-	BCD_TO_BIN(time-&gt;tm_mon);</div><div class='del'>-	BCD_TO_BIN(time-&gt;tm_year);</div><div class='del'>-	BCD_TO_BIN(time-&gt;tm_wday);</div><div class='del'>-	BCD_TO_BIN(century);</div><div class='del'>-</div><div class='del'>-	time-&gt;tm_year += (century * 100);</div><div class='del'>-	time-&gt;tm_year -= 1900;</div><div class='del'>-</div><div class='del'>-	time-&gt;tm_mon--;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bq4802_set_rtc_time(struct rtc_time *time)</div><div class='del'>-{</div><div class='del'>-	unsigned char val = readb(bq4802_regs + 0x0e);</div><div class='del'>-	unsigned char sec, min, hrs, day, mon, yrs, century;</div><div class='del'>-	unsigned int year;</div><div class='del'>-</div><div class='del'>-	year = time-&gt;tm_year + 1900;</div><div class='del'>-	century = year / 100;</div><div class='del'>-	yrs = year % 100;</div><div class='del'>-</div><div class='del'>-	mon = time-&gt;tm_mon + 1;   /* tm_mon starts at zero */</div><div class='del'>-	day = time-&gt;tm_mday;</div><div class='del'>-	hrs = time-&gt;tm_hour;</div><div class='del'>-	min = time-&gt;tm_min;</div><div class='del'>-	sec = time-&gt;tm_sec;</div><div class='del'>-</div><div class='del'>-	BIN_TO_BCD(sec);</div><div class='del'>-	BIN_TO_BCD(min);</div><div class='del'>-	BIN_TO_BCD(hrs);</div><div class='del'>-	BIN_TO_BCD(day);</div><div class='del'>-	BIN_TO_BCD(mon);</div><div class='del'>-	BIN_TO_BCD(yrs);</div><div class='del'>-	BIN_TO_BCD(century);</div><div class='del'>-</div><div class='del'>-	writeb(val | 0x08, bq4802_regs + 0x0e);</div><div class='del'>-</div><div class='del'>-	writeb(sec, bq4802_regs + 0x00);</div><div class='del'>-	writeb(min, bq4802_regs + 0x02);</div><div class='del'>-	writeb(hrs, bq4802_regs + 0x04);</div><div class='del'>-	writeb(day, bq4802_regs + 0x06);</div><div class='del'>-	writeb(mon, bq4802_regs + 0x09);</div><div class='del'>-	writeb(yrs, bq4802_regs + 0x0a);</div><div class='del'>-	writeb(century, bq4802_regs + 0x0f);</div><div class='del'>-</div><div class='del'>-	writeb(val, bq4802_regs + 0x0e);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void cmos_get_rtc_time(struct rtc_time *rtc_tm)</div><div class='del'>-{</div><div class='del'>-	unsigned char ctrl;</div><div class='del'>-</div><div class='del'>-	rtc_tm-&gt;tm_sec = CMOS_READ(RTC_SECONDS);</div><div class='del'>-	rtc_tm-&gt;tm_min = CMOS_READ(RTC_MINUTES);</div><div class='del'>-	rtc_tm-&gt;tm_hour = CMOS_READ(RTC_HOURS);</div><div class='del'>-	rtc_tm-&gt;tm_mday = CMOS_READ(RTC_DAY_OF_MONTH);</div><div class='del'>-	rtc_tm-&gt;tm_mon = CMOS_READ(RTC_MONTH);</div><div class='del'>-	rtc_tm-&gt;tm_year = CMOS_READ(RTC_YEAR);</div><div class='del'>-	rtc_tm-&gt;tm_wday = CMOS_READ(RTC_DAY_OF_WEEK);</div><div class='del'>-</div><div class='del'>-	ctrl = CMOS_READ(RTC_CONTROL);</div><div class='del'>-	if (!(ctrl &amp; RTC_DM_BINARY) || RTC_ALWAYS_BCD) {</div><div class='del'>-		BCD_TO_BIN(rtc_tm-&gt;tm_sec);</div><div class='del'>-		BCD_TO_BIN(rtc_tm-&gt;tm_min);</div><div class='del'>-		BCD_TO_BIN(rtc_tm-&gt;tm_hour);</div><div class='del'>-		BCD_TO_BIN(rtc_tm-&gt;tm_mday);</div><div class='del'>-		BCD_TO_BIN(rtc_tm-&gt;tm_mon);</div><div class='del'>-		BCD_TO_BIN(rtc_tm-&gt;tm_year);</div><div class='del'>-		BCD_TO_BIN(rtc_tm-&gt;tm_wday);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (rtc_tm-&gt;tm_year &lt;= 69)</div><div class='del'>-		rtc_tm-&gt;tm_year += 100;</div><div class='del'>-</div><div class='del'>-	rtc_tm-&gt;tm_mon--;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cmos_set_rtc_time(struct rtc_time *rtc_tm)</div><div class='del'>-{</div><div class='del'>-	unsigned char mon, day, hrs, min, sec;</div><div class='del'>-	unsigned char save_control, save_freq_select;</div><div class='del'>-	unsigned int yrs;</div><div class='del'>-</div><div class='del'>-	yrs = rtc_tm-&gt;tm_year;</div><div class='del'>-	mon = rtc_tm-&gt;tm_mon + 1;</div><div class='del'>-	day = rtc_tm-&gt;tm_mday;</div><div class='del'>-	hrs = rtc_tm-&gt;tm_hour;</div><div class='del'>-	min = rtc_tm-&gt;tm_min;</div><div class='del'>-	sec = rtc_tm-&gt;tm_sec;</div><div class='del'>-</div><div class='del'>-	if (yrs &gt;= 100)</div><div class='del'>-		yrs -= 100;</div><div class='del'>-</div><div class='del'>-	if (!(CMOS_READ(RTC_CONTROL) &amp; RTC_DM_BINARY) || RTC_ALWAYS_BCD) {</div><div class='del'>-		BIN_TO_BCD(sec);</div><div class='del'>-		BIN_TO_BCD(min);</div><div class='del'>-		BIN_TO_BCD(hrs);</div><div class='del'>-		BIN_TO_BCD(day);</div><div class='del'>-		BIN_TO_BCD(mon);</div><div class='del'>-		BIN_TO_BCD(yrs);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	save_control = CMOS_READ(RTC_CONTROL);</div><div class='del'>-	CMOS_WRITE((save_control|RTC_SET), RTC_CONTROL);</div><div class='del'>-	save_freq_select = CMOS_READ(RTC_FREQ_SELECT);</div><div class='del'>-	CMOS_WRITE((save_freq_select|RTC_DIV_RESET2), RTC_FREQ_SELECT);</div><div class='del'>-</div><div class='del'>-	CMOS_WRITE(yrs, RTC_YEAR);</div><div class='del'>-	CMOS_WRITE(mon, RTC_MONTH);</div><div class='del'>-	CMOS_WRITE(day, RTC_DAY_OF_MONTH);</div><div class='del'>-	CMOS_WRITE(hrs, RTC_HOURS);</div><div class='del'>-	CMOS_WRITE(min, RTC_MINUTES);</div><div class='del'>-	CMOS_WRITE(sec, RTC_SECONDS);</div><div class='del'>-</div><div class='del'>-	CMOS_WRITE(save_control, RTC_CONTROL);</div><div class='del'>-	CMOS_WRITE(save_freq_select, RTC_FREQ_SELECT);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif /* CONFIG_PCI */</div><div class='del'>-</div><div class='del'>-static void mostek_get_rtc_time(struct rtc_time *rtc_tm)</div><div class='del'>-{</div><div class='del'>-	void __iomem *regs = mstk48t02_regs;</div><div class='del'>-	u8 tmp;</div><div class='del'>-</div><div class='del'>-	spin_lock_irq(&amp;mostek_lock);</div><div class='del'>-</div><div class='del'>-	tmp = mostek_read(regs + MOSTEK_CREG);</div><div class='del'>-	tmp |= MSTK_CREG_READ;</div><div class='del'>-	mostek_write(regs + MOSTEK_CREG, tmp);</div><div class='del'>-</div><div class='del'>-	rtc_tm-&gt;tm_sec = MSTK_REG_SEC(regs);</div><div class='del'>-	rtc_tm-&gt;tm_min = MSTK_REG_MIN(regs);</div><div class='del'>-	rtc_tm-&gt;tm_hour = MSTK_REG_HOUR(regs);</div><div class='del'>-	rtc_tm-&gt;tm_mday = MSTK_REG_DOM(regs);</div><div class='del'>-	rtc_tm-&gt;tm_mon = MSTK_REG_MONTH(regs);</div><div class='del'>-	rtc_tm-&gt;tm_year = MSTK_CVT_YEAR( MSTK_REG_YEAR(regs) );</div><div class='del'>-	rtc_tm-&gt;tm_wday = MSTK_REG_DOW(regs);</div><div class='del'>-</div><div class='del'>-	tmp = mostek_read(regs + MOSTEK_CREG);</div><div class='del'>-	tmp &amp;= ~MSTK_CREG_READ;</div><div class='del'>-	mostek_write(regs + MOSTEK_CREG, tmp);</div><div class='del'>-</div><div class='del'>-	spin_unlock_irq(&amp;mostek_lock);</div><div class='del'>-</div><div class='del'>-	rtc_tm-&gt;tm_mon--;</div><div class='del'>-	rtc_tm-&gt;tm_wday--;</div><div class='del'>-	rtc_tm-&gt;tm_year -= 1900;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mostek_set_rtc_time(struct rtc_time *rtc_tm)</div><div class='del'>-{</div><div class='del'>-	unsigned char mon, day, hrs, min, sec, wday;</div><div class='del'>-	void __iomem *regs = mstk48t02_regs;</div><div class='del'>-	unsigned int yrs;</div><div class='del'>-	u8 tmp;</div><div class='del'>-</div><div class='del'>-	yrs = rtc_tm-&gt;tm_year + 1900;</div><div class='del'>-	mon = rtc_tm-&gt;tm_mon + 1;</div><div class='del'>-	day = rtc_tm-&gt;tm_mday;</div><div class='del'>-	wday = rtc_tm-&gt;tm_wday + 1;</div><div class='del'>-	hrs = rtc_tm-&gt;tm_hour;</div><div class='del'>-	min = rtc_tm-&gt;tm_min;</div><div class='del'>-	sec = rtc_tm-&gt;tm_sec;</div><div class='del'>-</div><div class='del'>-	spin_lock_irq(&amp;mostek_lock);</div><div class='del'>-</div><div class='del'>-	tmp = mostek_read(regs + MOSTEK_CREG);</div><div class='del'>-	tmp |= MSTK_CREG_WRITE;</div><div class='del'>-	mostek_write(regs + MOSTEK_CREG, tmp);</div><div class='del'>-</div><div class='del'>-	MSTK_SET_REG_SEC(regs, sec);</div><div class='del'>-	MSTK_SET_REG_MIN(regs, min);</div><div class='del'>-	MSTK_SET_REG_HOUR(regs, hrs);</div><div class='del'>-	MSTK_SET_REG_DOW(regs, wday);</div><div class='del'>-	MSTK_SET_REG_DOM(regs, day);</div><div class='del'>-	MSTK_SET_REG_MONTH(regs, mon);</div><div class='del'>-	MSTK_SET_REG_YEAR(regs, yrs - MSTK_YEAR_ZERO);</div><div class='del'>-</div><div class='del'>-	tmp = mostek_read(regs + MOSTEK_CREG);</div><div class='del'>-	tmp &amp;= ~MSTK_CREG_WRITE;</div><div class='del'>-	mostek_write(regs + MOSTEK_CREG, tmp);</div><div class='del'>-</div><div class='del'>-	spin_unlock_irq(&amp;mostek_lock);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct mini_rtc_ops {</div><div class='del'>-	void (*get_rtc_time)(struct rtc_time *);</div><div class='del'>-	int (*set_rtc_time)(struct rtc_time *);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct mini_rtc_ops starfire_rtc_ops = {</div><div class='del'>-	.get_rtc_time = starfire_get_rtc_time,</div><div class='del'>-	.set_rtc_time = starfire_set_rtc_time,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct mini_rtc_ops hypervisor_rtc_ops = {</div><div class='del'>-	.get_rtc_time = hypervisor_get_rtc_time,</div><div class='del'>-	.set_rtc_time = hypervisor_set_rtc_time,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-static struct mini_rtc_ops bq4802_rtc_ops = {</div><div class='del'>-	.get_rtc_time = bq4802_get_rtc_time,</div><div class='del'>-	.set_rtc_time = bq4802_set_rtc_time,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct mini_rtc_ops cmos_rtc_ops = {</div><div class='del'>-	.get_rtc_time = cmos_get_rtc_time,</div><div class='del'>-	.set_rtc_time = cmos_set_rtc_time,</div><div class='del'>-};</div><div class='del'>-#endif /* CONFIG_PCI */</div><div class='del'>-</div><div class='del'>-static struct mini_rtc_ops mostek_rtc_ops = {</div><div class='del'>-	.get_rtc_time = mostek_get_rtc_time,</div><div class='del'>-	.set_rtc_time = mostek_set_rtc_time,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct mini_rtc_ops *mini_rtc_ops;</div><div class='del'>-</div><div class='del'>-static inline void mini_get_rtc_time(struct rtc_time *time)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;rtc_lock, flags);</div><div class='del'>-	mini_rtc_ops-&gt;get_rtc_time(time);</div><div class='del'>-	spin_unlock_irqrestore(&amp;rtc_lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int mini_set_rtc_time(struct rtc_time *time)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;rtc_lock, flags);</div><div class='del'>-	err = mini_rtc_ops-&gt;set_rtc_time(time);</div><div class='del'>-	spin_unlock_irqrestore(&amp;rtc_lock, flags);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mini_rtc_ioctl(struct inode *inode, struct file *file,</div><div class='del'>-			  unsigned int cmd, unsigned long arg)</div><div class='del'>-{</div><div class='del'>-	struct rtc_time wtime;</div><div class='del'>-	void __user *argp = (void __user *)arg;</div><div class='del'>-</div><div class='del'>-	switch (cmd) {</div><div class='del'>-</div><div class='del'>-	case RTC_PLL_GET:</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	case RTC_PLL_SET:</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	case RTC_UIE_OFF:	/* disable ints from RTC updates.	*/</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	case RTC_UIE_ON:	/* enable ints for RTC updates.	*/</div><div class='del'>-	        return -EINVAL;</div><div class='del'>-</div><div class='del'>-	case RTC_RD_TIME:	/* Read the time/date from RTC	*/</div><div class='del'>-		/* this doesn't get week-day, who cares */</div><div class='del'>-		memset(&amp;wtime, 0, sizeof(wtime));</div><div class='del'>-		mini_get_rtc_time(&amp;wtime);</div><div class='del'>-</div><div class='del'>-		return copy_to_user(argp, &amp;wtime, sizeof(wtime)) ? -EFAULT : 0;</div><div class='del'>-</div><div class='del'>-	case RTC_SET_TIME:	/* Set the RTC */</div><div class='del'>-	    {</div><div class='del'>-		int year, days;</div><div class='del'>-</div><div class='del'>-		if (!capable(CAP_SYS_TIME))</div><div class='del'>-			return -EACCES;</div><div class='del'>-</div><div class='del'>-		if (copy_from_user(&amp;wtime, argp, sizeof(wtime)))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-</div><div class='del'>-		year = wtime.tm_year + 1900;</div><div class='del'>-		days = month_days[wtime.tm_mon] +</div><div class='del'>-		       ((wtime.tm_mon == 1) &amp;&amp; leapyear(year));</div><div class='del'>-</div><div class='del'>-		if ((wtime.tm_mon &lt; 0 || wtime.tm_mon &gt; 11) ||</div><div class='del'>-		    (wtime.tm_mday &lt; 1))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='del'>-		if (wtime.tm_mday &lt; 0 || wtime.tm_mday &gt; days)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='del'>-		if (wtime.tm_hour &lt; 0 || wtime.tm_hour &gt;= 24 ||</div><div class='del'>-		    wtime.tm_min &lt; 0 || wtime.tm_min &gt;= 60 ||</div><div class='del'>-		    wtime.tm_sec &lt; 0 || wtime.tm_sec &gt;= 60)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='del'>-		return mini_set_rtc_time(&amp;wtime);</div><div class='del'>-	    }</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return -EINVAL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mini_rtc_open(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	lock_kernel();</div><div class='del'>-	if (mini_rtc_status &amp; RTC_IS_OPEN) {</div><div class='del'>-		unlock_kernel();</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mini_rtc_status |= RTC_IS_OPEN;</div><div class='del'>-	unlock_kernel();</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mini_rtc_release(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	mini_rtc_status &amp;= ~RTC_IS_OPEN;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static const struct file_operations mini_rtc_fops = {</div><div class='del'>-	.owner		= THIS_MODULE,</div><div class='del'>-	.ioctl		= mini_rtc_ioctl,</div><div class='del'>-	.open		= mini_rtc_open,</div><div class='del'>-	.release	= mini_rtc_release,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct miscdevice rtc_mini_dev =</div><div class='del'>-{</div><div class='del'>-	.minor		= RTC_MINOR,</div><div class='del'>-	.name		= "rtc",</div><div class='del'>-	.fops		= &amp;mini_rtc_fops,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init rtc_mini_init(void)</div><div class='del'>-{</div><div class='del'>-	int retval;</div><div class='del'>-</div><div class='del'>-	if (tlb_type == hypervisor)</div><div class='del'>-		mini_rtc_ops = &amp;hypervisor_rtc_ops;</div><div class='del'>-	else if (this_is_starfire)</div><div class='del'>-		mini_rtc_ops = &amp;starfire_rtc_ops;</div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-	else if (bq4802_regs)</div><div class='del'>-		mini_rtc_ops = &amp;bq4802_rtc_ops;</div><div class='del'>-	else if (ds1287_regs)</div><div class='del'>-		mini_rtc_ops = &amp;cmos_rtc_ops;</div><div class='del'>-#endif /* CONFIG_PCI */</div><div class='del'>-	else if (mstk48t02_regs)</div><div class='del'>-		mini_rtc_ops = &amp;mostek_rtc_ops;</div><div class='del'>-	else</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	printk(KERN_INFO "Mini RTC Driver\n");</div><div class='del'>-</div><div class='del'>-	retval = misc_register(&amp;rtc_mini_dev);</div><div class='del'>-	if (retval &lt; 0)</div><div class='del'>-		return retval;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit rtc_mini_exit(void)</div><div class='del'>-{</div><div class='del'>-	misc_deregister(&amp;rtc_mini_dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> int __devinit read_current_timer(unsigned long *timer_val)</div><div class='ctx'> {</div><div class='ctx'> 	*timer_val = tick_ops-&gt;get_tick();</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-module_init(rtc_mini_init);</div><div class='del'>-module_exit(rtc_mini_exit);</div><div class='head'>diff --git a/arch/sparc64/kernel/traps.c b/arch/sparc64/kernel/traps.c<br/>index c824df13f589..81ccd22e78d4 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/traps.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc64/kernel/traps.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/traps.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/traps.c</a></div><div class='hunk'>@@ -38,6 +38,7 @@</div><div class='ctx'> #include &lt;asm/timer.h&gt;</div><div class='ctx'> #include &lt;asm/head.h&gt;</div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='add'>+#include &lt;asm/memctrl.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "entry.h"</div><div class='ctx'> #include "kstack.h"</div><div class='hunk'>@@ -129,6 +130,56 @@ void do_BUG(const char *file, int line)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+static DEFINE_SPINLOCK(dimm_handler_lock);</div><div class='add'>+static dimm_printer_t dimm_handler;</div><div class='add'>+</div><div class='add'>+static int sprintf_dimm(int synd_code, unsigned long paddr, char *buf, int buflen)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int ret = -ENODEV;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;dimm_handler_lock, flags);</div><div class='add'>+	if (dimm_handler) {</div><div class='add'>+		ret = dimm_handler(synd_code, paddr, buf, buflen);</div><div class='add'>+	} else if (tlb_type == spitfire) {</div><div class='add'>+		if (prom_getunumber(synd_code, paddr, buf, buflen) == -1)</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+		else</div><div class='add'>+			ret = 0;</div><div class='add'>+	} else</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+	spin_unlock_irqrestore(&amp;dimm_handler_lock, flags);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int register_dimm_printer(dimm_printer_t func)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;dimm_handler_lock, flags);</div><div class='add'>+	if (!dimm_handler)</div><div class='add'>+		dimm_handler = func;</div><div class='add'>+	else</div><div class='add'>+		ret = -EEXIST;</div><div class='add'>+	spin_unlock_irqrestore(&amp;dimm_handler_lock, flags);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(register_dimm_printer);</div><div class='add'>+</div><div class='add'>+void unregister_dimm_printer(dimm_printer_t func)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;dimm_handler_lock, flags);</div><div class='add'>+	if (dimm_handler == func)</div><div class='add'>+		dimm_handler = NULL;</div><div class='add'>+	spin_unlock_irqrestore(&amp;dimm_handler_lock, flags);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(unregister_dimm_printer);</div><div class='add'>+</div><div class='ctx'> void spitfire_insn_access_exception(struct pt_regs *regs, unsigned long sfsr, unsigned long sfar)</div><div class='ctx'> {</div><div class='ctx'> 	siginfo_t info;</div><div class='hunk'>@@ -291,10 +342,7 @@ void sun4v_data_access_exception_tl1(struct pt_regs *regs, unsigned long addr, u</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PCI</div><div class='del'>-/* This is really pathetic... */</div><div class='del'>-extern volatile int pci_poke_in_progress;</div><div class='del'>-extern volatile int pci_poke_cpu;</div><div class='del'>-extern volatile int pci_poke_faulted;</div><div class='add'>+#include "pci_impl.h"</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* When access exceptions happen, we must do this. */</div><div class='hunk'>@@ -376,8 +424,7 @@ static void spitfire_log_udb_syndrome(unsigned long afar, unsigned long udbh, un</div><div class='ctx'> </div><div class='ctx'> 	if (udbl &amp; bit) {</div><div class='ctx'> 		scode = ecc_syndrome_table[udbl &amp; 0xff];</div><div class='del'>-		if (prom_getunumber(scode, afar,</div><div class='del'>-				    memmod_str, sizeof(memmod_str)) == -1)</div><div class='add'>+		if (sprintf_dimm(scode, afar, memmod_str, sizeof(memmod_str)) &lt; 0)</div><div class='ctx'> 			p = syndrome_unknown;</div><div class='ctx'> 		else</div><div class='ctx'> 			p = memmod_str;</div><div class='hunk'>@@ -388,8 +435,7 @@ static void spitfire_log_udb_syndrome(unsigned long afar, unsigned long udbh, un</div><div class='ctx'> </div><div class='ctx'> 	if (udbh &amp; bit) {</div><div class='ctx'> 		scode = ecc_syndrome_table[udbh &amp; 0xff];</div><div class='del'>-		if (prom_getunumber(scode, afar,</div><div class='del'>-				    memmod_str, sizeof(memmod_str)) == -1)</div><div class='add'>+		if (sprintf_dimm(scode, afar, memmod_str, sizeof(memmod_str)) &lt; 0)</div><div class='ctx'> 			p = syndrome_unknown;</div><div class='ctx'> 		else</div><div class='ctx'> 			p = memmod_str;</div><div class='hunk'>@@ -1062,8 +1108,6 @@ static const char *cheetah_get_string(unsigned long bit)</div><div class='ctx'> 	return "???";</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-extern int chmc_getunumber(int, unsigned long, char *, int);</div><div class='del'>-</div><div class='ctx'> static void cheetah_log_errors(struct pt_regs *regs, struct cheetah_err_info *info,</div><div class='ctx'> 			       unsigned long afsr, unsigned long afar, int recoverable)</div><div class='ctx'> {</div><div class='hunk'>@@ -1105,7 +1149,7 @@ static void cheetah_log_errors(struct pt_regs *regs, struct cheetah_err_info *in</div><div class='ctx'> </div><div class='ctx'> 		syndrome = (afsr &amp; CHAFSR_E_SYNDROME) &gt;&gt; CHAFSR_E_SYNDROME_SHIFT;</div><div class='ctx'> 		syndrome = cheetah_ecc_syntab[syndrome];</div><div class='del'>-		ret = chmc_getunumber(syndrome, afar, unum, sizeof(unum));</div><div class='add'>+		ret = sprintf_dimm(syndrome, afar, unum, sizeof(unum));</div><div class='ctx'> 		if (ret != -1)</div><div class='ctx'> 			printk("%s" "ERROR(%d): AFAR E-syndrome [%s]\n",</div><div class='ctx'> 			       (recoverable ? KERN_WARNING : KERN_CRIT),</div><div class='hunk'>@@ -1116,7 +1160,7 @@ static void cheetah_log_errors(struct pt_regs *regs, struct cheetah_err_info *in</div><div class='ctx'> </div><div class='ctx'> 		syndrome = (afsr &amp; CHAFSR_M_SYNDROME) &gt;&gt; CHAFSR_M_SYNDROME_SHIFT;</div><div class='ctx'> 		syndrome = cheetah_mtag_syntab[syndrome];</div><div class='del'>-		ret = chmc_getunumber(syndrome, afar, unum, sizeof(unum));</div><div class='add'>+		ret = sprintf_dimm(syndrome, afar, unum, sizeof(unum));</div><div class='ctx'> 		if (ret != -1)</div><div class='ctx'> 			printk("%s" "ERROR(%d): AFAR M-syndrome [%s]\n",</div><div class='ctx'> 			       (recoverable ? KERN_WARNING : KERN_CRIT),</div><div class='hunk'>@@ -2224,7 +2268,6 @@ void die_if_kernel(char *str, struct pt_regs *regs)</div><div class='ctx'> </div><div class='ctx'> extern int handle_popc(u32 insn, struct pt_regs *regs);</div><div class='ctx'> extern int handle_ldf_stq(u32 insn, struct pt_regs *regs);</div><div class='del'>-extern int vis_emul(struct pt_regs *, unsigned int);</div><div class='ctx'> </div><div class='ctx'> void do_illegal_instruction(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/sparc64/kernel/us3_cpufreq.c b/arch/sparc64/kernel/us3_cpufreq.c<br/>index 47e3acafb5be..365b6464e2ce 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/us3_cpufreq.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc64/kernel/us3_cpufreq.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/us3_cpufreq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/us3_cpufreq.c</a></div><div class='hunk'>@@ -183,7 +183,6 @@ static int __init us3_freq_cpu_init(struct cpufreq_policy *policy)</div><div class='ctx'> 	table[3].index = 0;</div><div class='ctx'> 	table[3].frequency = CPUFREQ_TABLE_END;</div><div class='ctx'> </div><div class='del'>-	policy-&gt;governor = CPUFREQ_DEFAULT_GOVERNOR;</div><div class='ctx'> 	policy-&gt;cpuinfo.transition_latency = 0;</div><div class='ctx'> 	policy-&gt;cur = clock_tick;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sparc64/kernel/vio.c b/arch/sparc64/kernel/vio.c<br/>index a490077891a4..92b1f8ec01de 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/vio.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc64/kernel/vio.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/vio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/vio.c</a></div><div class='hunk'>@@ -152,7 +152,7 @@ show_pciobppath_attr(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> static DEVICE_ATTR(obppath, S_IRUSR | S_IRGRP | S_IROTH,</div><div class='ctx'> 		   show_pciobppath_attr, NULL);</div><div class='ctx'> </div><div class='del'>-struct device_node *cdev_node;</div><div class='add'>+static struct device_node *cdev_node;</div><div class='ctx'> </div><div class='ctx'> static struct vio_dev *root_vdev;</div><div class='ctx'> static u64 cdev_cfg_handle;</div><div class='hunk'>@@ -371,9 +371,9 @@ static struct mdesc_notifier_client vio_ds_notifier = {</div><div class='ctx'> 	.node_name	= "domain-services-port",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-const char *channel_devices_node = "channel-devices";</div><div class='del'>-const char *channel_devices_compat = "SUNW,sun4v-channel-devices";</div><div class='del'>-const char *cfg_handle_prop = "cfg-handle";</div><div class='add'>+static const char *channel_devices_node = "channel-devices";</div><div class='add'>+static const char *channel_devices_compat = "SUNW,sun4v-channel-devices";</div><div class='add'>+static const char *cfg_handle_prop = "cfg-handle";</div><div class='ctx'> </div><div class='ctx'> static int __init vio_init(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/sparc64/kernel/visemul.c b/arch/sparc64/kernel/visemul.c<br/>index c3fd64706b53..9e05cb5cb855 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/visemul.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc64/kernel/visemul.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/kernel/visemul.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/kernel/visemul.c</a></div><div class='hunk'>@@ -243,7 +243,7 @@ static inline unsigned int *fps_regaddr(struct fpustate *f,</div><div class='ctx'> struct edge_tab {</div><div class='ctx'> 	u16 left, right;</div><div class='ctx'> };</div><div class='del'>-struct edge_tab edge8_tab[8] = {</div><div class='add'>+static struct edge_tab edge8_tab[8] = {</div><div class='ctx'> 	{ 0xff, 0x80 },</div><div class='ctx'> 	{ 0x7f, 0xc0 },</div><div class='ctx'> 	{ 0x3f, 0xe0 },</div><div class='hunk'>@@ -253,7 +253,7 @@ struct edge_tab edge8_tab[8] = {</div><div class='ctx'> 	{ 0x03, 0xfe },</div><div class='ctx'> 	{ 0x01, 0xff },</div><div class='ctx'> };</div><div class='del'>-struct edge_tab edge8_tab_l[8] = {</div><div class='add'>+static struct edge_tab edge8_tab_l[8] = {</div><div class='ctx'> 	{ 0xff, 0x01 },</div><div class='ctx'> 	{ 0xfe, 0x03 },</div><div class='ctx'> 	{ 0xfc, 0x07 },</div><div class='hunk'>@@ -263,23 +263,23 @@ struct edge_tab edge8_tab_l[8] = {</div><div class='ctx'> 	{ 0xc0, 0x7f },</div><div class='ctx'> 	{ 0x80, 0xff },</div><div class='ctx'> };</div><div class='del'>-struct edge_tab edge16_tab[4] = {</div><div class='add'>+static struct edge_tab edge16_tab[4] = {</div><div class='ctx'> 	{ 0xf, 0x8 },</div><div class='ctx'> 	{ 0x7, 0xc },</div><div class='ctx'> 	{ 0x3, 0xe },</div><div class='ctx'> 	{ 0x1, 0xf },</div><div class='ctx'> };</div><div class='del'>-struct edge_tab edge16_tab_l[4] = {</div><div class='add'>+static struct edge_tab edge16_tab_l[4] = {</div><div class='ctx'> 	{ 0xf, 0x1 },</div><div class='ctx'> 	{ 0xe, 0x3 },</div><div class='ctx'> 	{ 0xc, 0x7 },</div><div class='ctx'> 	{ 0x8, 0xf },</div><div class='ctx'> };</div><div class='del'>-struct edge_tab edge32_tab[2] = {</div><div class='add'>+static struct edge_tab edge32_tab[2] = {</div><div class='ctx'> 	{ 0x3, 0x2 },</div><div class='ctx'> 	{ 0x1, 0x3 },</div><div class='ctx'> };</div><div class='del'>-struct edge_tab edge32_tab_l[2] = {</div><div class='add'>+static struct edge_tab edge32_tab_l[2] = {</div><div class='ctx'> 	{ 0x3, 0x1 },</div><div class='ctx'> 	{ 0x2, 0x3 },</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/sparc64/mm/fault.c b/arch/sparc64/mm/fault.c<br/>index ea7d7ae76bc2..a9e474bf6385 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/mm/fault.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc64/mm/fault.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/mm/fault.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/mm/fault.c</a></div><div class='hunk'>@@ -51,43 +51,6 @@ static inline int notify_page_fault(struct pt_regs *regs)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * To debug kernel to catch accesses to certain virtual/physical addresses.</div><div class='del'>- * Mode = 0 selects physical watchpoints, mode = 1 selects virtual watchpoints.</div><div class='del'>- * flags = VM_READ watches memread accesses, flags = VM_WRITE watches memwrite accesses.</div><div class='del'>- * Caller passes in a 64bit aligned addr, with mask set to the bytes that need to be</div><div class='del'>- * watched. This is only useful on a single cpu machine for now. After the watchpoint</div><div class='del'>- * is detected, the process causing it will be killed, thus preventing an infinite loop.</div><div class='del'>- */</div><div class='del'>-void set_brkpt(unsigned long addr, unsigned char mask, int flags, int mode)</div><div class='del'>-{</div><div class='del'>-	unsigned long lsubits;</div><div class='del'>-</div><div class='del'>-	__asm__ __volatile__("ldxa [%%g0] %1, %0"</div><div class='del'>-			     : "=r" (lsubits)</div><div class='del'>-			     : "i" (ASI_LSU_CONTROL));</div><div class='del'>-	lsubits &amp;= ~(LSU_CONTROL_PM | LSU_CONTROL_VM |</div><div class='del'>-		     LSU_CONTROL_PR | LSU_CONTROL_VR |</div><div class='del'>-		     LSU_CONTROL_PW | LSU_CONTROL_VW);</div><div class='del'>-</div><div class='del'>-	__asm__ __volatile__("stxa	%0, [%1] %2\n\t"</div><div class='del'>-			     "membar	#Sync"</div><div class='del'>-			     : /* no outputs */</div><div class='del'>-			     : "r" (addr), "r" (mode ? VIRT_WATCHPOINT : PHYS_WATCHPOINT),</div><div class='del'>-			       "i" (ASI_DMMU));</div><div class='del'>-</div><div class='del'>-	lsubits |= ((unsigned long)mask &lt;&lt; (mode ? 25 : 33));</div><div class='del'>-	if (flags &amp; VM_READ)</div><div class='del'>-		lsubits |= (mode ? LSU_CONTROL_VR : LSU_CONTROL_PR);</div><div class='del'>-	if (flags &amp; VM_WRITE)</div><div class='del'>-		lsubits |= (mode ? LSU_CONTROL_VW : LSU_CONTROL_PW);</div><div class='del'>-	__asm__ __volatile__("stxa %0, [%%g0] %1\n\t"</div><div class='del'>-			     "membar #Sync"</div><div class='del'>-			     : /* no outputs */</div><div class='del'>-			     : "r" (lsubits), "i" (ASI_LSU_CONTROL)</div><div class='del'>-			     : "memory");</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void __kprobes unhandled_fault(unsigned long address,</div><div class='ctx'> 				      struct task_struct *tsk,</div><div class='ctx'> 				      struct pt_regs *regs)</div><div class='head'>diff --git a/arch/sparc64/mm/init.c b/arch/sparc64/mm/init.c<br/>index a41df7bef035..3c10daf8fc01 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/mm/init.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc64/mm/init.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/mm/init.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/mm/init.c</a></div><div class='hunk'>@@ -46,15 +46,11 @@</div><div class='ctx'> #include &lt;asm/tsb.h&gt;</div><div class='ctx'> #include &lt;asm/hypervisor.h&gt;</div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='del'>-#include &lt;asm/sstate.h&gt;</div><div class='ctx'> #include &lt;asm/mdesc.h&gt;</div><div class='ctx'> #include &lt;asm/cpudata.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#define MAX_PHYS_ADDRESS	(1UL &lt;&lt; 42UL)</div><div class='del'>-#define KPTE_BITMAP_CHUNK_SZ	(256UL * 1024UL * 1024UL)</div><div class='del'>-#define KPTE_BITMAP_BYTES	\</div><div class='del'>-	((MAX_PHYS_ADDRESS / KPTE_BITMAP_CHUNK_SZ) / 8)</div><div class='add'>+#include "init.h"</div><div class='ctx'> </div><div class='ctx'> unsigned long kern_linear_pte_xor[2] __read_mostly;</div><div class='ctx'> </div><div class='hunk'>@@ -416,17 +412,9 @@ void mmu_info(struct seq_file *m)</div><div class='ctx'> #endif /* CONFIG_DEBUG_DCFLUSH */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct linux_prom_translation {</div><div class='del'>-	unsigned long virt;</div><div class='del'>-	unsigned long size;</div><div class='del'>-	unsigned long data;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Exported for kernel TLB miss handling in ktlb.S */</div><div class='ctx'> struct linux_prom_translation prom_trans[512] __read_mostly;</div><div class='ctx'> unsigned int prom_trans_ents __read_mostly;</div><div class='ctx'> </div><div class='del'>-/* Exported for SMP bootup purposes. */</div><div class='ctx'> unsigned long kern_locked_tte_data;</div><div class='ctx'> </div><div class='ctx'> /* The obp translations are saved based on 8k pagesize, since obp can</div><div class='hunk'>@@ -938,6 +926,10 @@ int of_node_to_nid(struct device_node *dp)</div><div class='ctx'> 	int count, nid;</div><div class='ctx'> 	u64 grp;</div><div class='ctx'> </div><div class='add'>+	/* This is the right thing to do on currently supported</div><div class='add'>+	 * SUN4U NUMA platforms as well, as the PCI controller does</div><div class='add'>+	 * not sit behind any particular memory controller.</div><div class='add'>+	 */</div><div class='ctx'> 	if (!mlgroups)</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='hunk'>@@ -1206,8 +1198,44 @@ out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int __init numa_parse_jbus(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long cpu, index;</div><div class='add'>+</div><div class='add'>+	/* NUMA node id is encoded in bits 36 and higher, and there is</div><div class='add'>+	 * a 1-to-1 mapping from CPU ID to NUMA node ID.</div><div class='add'>+	 */</div><div class='add'>+	index = 0;</div><div class='add'>+	for_each_present_cpu(cpu) {</div><div class='add'>+		numa_cpu_lookup_table[cpu] = index;</div><div class='add'>+		numa_cpumask_lookup_table[index] = cpumask_of_cpu(cpu);</div><div class='add'>+		node_masks[index].mask = ~((1UL &lt;&lt; 36UL) - 1UL);</div><div class='add'>+		node_masks[index].val = cpu &lt;&lt; 36UL;</div><div class='add'>+</div><div class='add'>+		index++;</div><div class='add'>+	}</div><div class='add'>+	num_node_masks = index;</div><div class='add'>+</div><div class='add'>+	add_node_ranges();</div><div class='add'>+</div><div class='add'>+	for (index = 0; index &lt; num_node_masks; index++) {</div><div class='add'>+		allocate_node_data(index);</div><div class='add'>+		node_set_online(index);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int __init numa_parse_sun4u(void)</div><div class='ctx'> {</div><div class='add'>+	if (tlb_type == cheetah || tlb_type == cheetah_plus) {</div><div class='add'>+		unsigned long ver;</div><div class='add'>+</div><div class='add'>+		__asm__ ("rdpr %%ver, %0" : "=r" (ver));</div><div class='add'>+		if ((ver &gt;&gt; 32UL) == __JALAPENO_ID ||</div><div class='add'>+		    (ver &gt;&gt; 32UL) == __SERRANO_ID)</div><div class='add'>+			return numa_parse_jbus();</div><div class='add'>+	}</div><div class='ctx'> 	return -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1633,8 +1661,6 @@ void __cpuinit sun4v_ktsb_register(void)</div><div class='ctx'> </div><div class='ctx'> /* paging_init() sets up the page tables */</div><div class='ctx'> </div><div class='del'>-extern void central_probe(void);</div><div class='del'>-</div><div class='ctx'> static unsigned long last_valid_pfn;</div><div class='ctx'> pgd_t swapper_pg_dir[2048];</div><div class='ctx'> </div><div class='hunk'>@@ -1679,8 +1705,6 @@ void __init paging_init(void)</div><div class='ctx'> 	kern_base = (prom_boot_mapping_phys_low &gt;&gt; 22UL) &lt;&lt; 22UL;</div><div class='ctx'> 	kern_size = (unsigned long)&amp;_end - (unsigned long)KERNBASE;</div><div class='ctx'> </div><div class='del'>-	sstate_booting();</div><div class='del'>-</div><div class='ctx'> 	/* Invalidate both kernel TSBs.  */</div><div class='ctx'> 	memset(swapper_tsb, 0x40, sizeof(swapper_tsb));</div><div class='ctx'> #ifndef CONFIG_DEBUG_PAGEALLOC</div><div class='hunk'>@@ -1803,9 +1827,6 @@ void __init paging_init(void)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	printk("Booting Linux...\n");</div><div class='del'>-</div><div class='del'>-	central_probe();</div><div class='del'>-	cpu_probe();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int __init page_in_phys_avail(unsigned long paddr)</div><div class='hunk'>@@ -2032,7 +2053,6 @@ pgprot_t PAGE_COPY __read_mostly;</div><div class='ctx'> pgprot_t PAGE_SHARED __read_mostly;</div><div class='ctx'> EXPORT_SYMBOL(PAGE_SHARED);</div><div class='ctx'> </div><div class='del'>-pgprot_t PAGE_EXEC __read_mostly;</div><div class='ctx'> unsigned long pg_iobits __read_mostly;</div><div class='ctx'> </div><div class='ctx'> unsigned long _PAGE_IE __read_mostly;</div><div class='hunk'>@@ -2045,14 +2065,6 @@ unsigned long _PAGE_CACHE __read_mostly;</div><div class='ctx'> EXPORT_SYMBOL(_PAGE_CACHE);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SPARSEMEM_VMEMMAP</div><div class='del'>-</div><div class='del'>-#define VMEMMAP_CHUNK_SHIFT	22</div><div class='del'>-#define VMEMMAP_CHUNK		(1UL &lt;&lt; VMEMMAP_CHUNK_SHIFT)</div><div class='del'>-#define VMEMMAP_CHUNK_MASK	~(VMEMMAP_CHUNK - 1UL)</div><div class='del'>-#define VMEMMAP_ALIGN(x)	(((x)+VMEMMAP_CHUNK-1UL)&amp;VMEMMAP_CHUNK_MASK)</div><div class='del'>-</div><div class='del'>-#define VMEMMAP_SIZE	((((1UL &lt;&lt; MAX_PHYSADDR_BITS) &gt;&gt; PAGE_SHIFT) * \</div><div class='del'>-			  sizeof(struct page *)) &gt;&gt; VMEMMAP_CHUNK_SHIFT)</div><div class='ctx'> unsigned long vmemmap_table[VMEMMAP_SIZE];</div><div class='ctx'> </div><div class='ctx'> int __meminit vmemmap_populate(struct page *start, unsigned long nr, int node)</div><div class='hunk'>@@ -2136,7 +2148,6 @@ static void __init sun4u_pgprot_init(void)</div><div class='ctx'> 				       _PAGE_CACHE_4U | _PAGE_P_4U |</div><div class='ctx'> 				       __ACCESS_BITS_4U | __DIRTY_BITS_4U |</div><div class='ctx'> 				       _PAGE_EXEC_4U | _PAGE_L_4U);</div><div class='del'>-	PAGE_EXEC = __pgprot(_PAGE_EXEC_4U);</div><div class='ctx'> </div><div class='ctx'> 	_PAGE_IE = _PAGE_IE_4U;</div><div class='ctx'> 	_PAGE_E = _PAGE_E_4U;</div><div class='hunk'>@@ -2147,10 +2158,10 @@ static void __init sun4u_pgprot_init(void)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_DEBUG_PAGEALLOC</div><div class='ctx'> 	kern_linear_pte_xor[0] = (_PAGE_VALID | _PAGE_SZBITS_4U) ^</div><div class='del'>-		0xfffff80000000000;</div><div class='add'>+		0xfffff80000000000UL;</div><div class='ctx'> #else</div><div class='ctx'> 	kern_linear_pte_xor[0] = (_PAGE_VALID | _PAGE_SZ4MB_4U) ^</div><div class='del'>-		0xfffff80000000000;</div><div class='add'>+		0xfffff80000000000UL;</div><div class='ctx'> #endif</div><div class='ctx'> 	kern_linear_pte_xor[0] |= (_PAGE_CP_4U | _PAGE_CV_4U |</div><div class='ctx'> 				   _PAGE_P_4U | _PAGE_W_4U);</div><div class='hunk'>@@ -2188,7 +2199,6 @@ static void __init sun4v_pgprot_init(void)</div><div class='ctx'> 				__ACCESS_BITS_4V | __DIRTY_BITS_4V |</div><div class='ctx'> 				_PAGE_EXEC_4V);</div><div class='ctx'> 	PAGE_KERNEL_LOCKED = PAGE_KERNEL;</div><div class='del'>-	PAGE_EXEC = __pgprot(_PAGE_EXEC_4V);</div><div class='ctx'> </div><div class='ctx'> 	_PAGE_IE = _PAGE_IE_4V;</div><div class='ctx'> 	_PAGE_E = _PAGE_E_4V;</div><div class='hunk'>@@ -2196,20 +2206,20 @@ static void __init sun4v_pgprot_init(void)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_DEBUG_PAGEALLOC</div><div class='ctx'> 	kern_linear_pte_xor[0] = (_PAGE_VALID | _PAGE_SZBITS_4V) ^</div><div class='del'>-		0xfffff80000000000;</div><div class='add'>+		0xfffff80000000000UL;</div><div class='ctx'> #else</div><div class='ctx'> 	kern_linear_pte_xor[0] = (_PAGE_VALID | _PAGE_SZ4MB_4V) ^</div><div class='del'>-		0xfffff80000000000;</div><div class='add'>+		0xfffff80000000000UL;</div><div class='ctx'> #endif</div><div class='ctx'> 	kern_linear_pte_xor[0] |= (_PAGE_CP_4V | _PAGE_CV_4V |</div><div class='ctx'> 				   _PAGE_P_4V | _PAGE_W_4V);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_DEBUG_PAGEALLOC</div><div class='ctx'> 	kern_linear_pte_xor[1] = (_PAGE_VALID | _PAGE_SZBITS_4V) ^</div><div class='del'>-		0xfffff80000000000;</div><div class='add'>+		0xfffff80000000000UL;</div><div class='ctx'> #else</div><div class='ctx'> 	kern_linear_pte_xor[1] = (_PAGE_VALID | _PAGE_SZ256MB_4V) ^</div><div class='del'>-		0xfffff80000000000;</div><div class='add'>+		0xfffff80000000000UL;</div><div class='ctx'> #endif</div><div class='ctx'> 	kern_linear_pte_xor[1] |= (_PAGE_CP_4V | _PAGE_CV_4V |</div><div class='ctx'> 				   _PAGE_P_4V | _PAGE_W_4V);</div><div class='head'>diff --git a/arch/sparc64/mm/init.h b/arch/sparc64/mm/init.h<br/>new file mode 100644<br/>index 000000000000..16063870a489<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/mm/init.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/mm/init.h</a></div><div class='hunk'>@@ -0,0 +1,49 @@</div><div class='add'>+#ifndef _SPARC64_MM_INIT_H</div><div class='add'>+#define _SPARC64_MM_INIT_H</div><div class='add'>+</div><div class='add'>+/* Most of the symbols in this file are defined in init.c and</div><div class='add'>+ * marked non-static so that assembler code can get at them.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define MAX_PHYS_ADDRESS	(1UL &lt;&lt; 42UL)</div><div class='add'>+#define KPTE_BITMAP_CHUNK_SZ	(256UL * 1024UL * 1024UL)</div><div class='add'>+#define KPTE_BITMAP_BYTES	\</div><div class='add'>+	((MAX_PHYS_ADDRESS / KPTE_BITMAP_CHUNK_SZ) / 8)</div><div class='add'>+</div><div class='add'>+extern unsigned long kern_linear_pte_xor[2];</div><div class='add'>+extern unsigned long kpte_linear_bitmap[KPTE_BITMAP_BYTES / sizeof(unsigned long)];</div><div class='add'>+extern unsigned int sparc64_highest_unlocked_tlb_ent;</div><div class='add'>+extern unsigned long sparc64_kern_pri_context;</div><div class='add'>+extern unsigned long sparc64_kern_pri_nuc_bits;</div><div class='add'>+extern unsigned long sparc64_kern_sec_context;</div><div class='add'>+extern void mmu_info(struct seq_file *m);</div><div class='add'>+</div><div class='add'>+struct linux_prom_translation {</div><div class='add'>+	unsigned long virt;</div><div class='add'>+	unsigned long size;</div><div class='add'>+	unsigned long data;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Exported for kernel TLB miss handling in ktlb.S */</div><div class='add'>+extern struct linux_prom_translation prom_trans[512];</div><div class='add'>+extern unsigned int prom_trans_ents;</div><div class='add'>+</div><div class='add'>+/* Exported for SMP bootup purposes. */</div><div class='add'>+extern unsigned long kern_locked_tte_data;</div><div class='add'>+</div><div class='add'>+extern void prom_world(int enter);</div><div class='add'>+</div><div class='add'>+extern void free_initmem(void);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SPARSEMEM_VMEMMAP</div><div class='add'>+#define VMEMMAP_CHUNK_SHIFT	22</div><div class='add'>+#define VMEMMAP_CHUNK		(1UL &lt;&lt; VMEMMAP_CHUNK_SHIFT)</div><div class='add'>+#define VMEMMAP_CHUNK_MASK	~(VMEMMAP_CHUNK - 1UL)</div><div class='add'>+#define VMEMMAP_ALIGN(x)	(((x)+VMEMMAP_CHUNK-1UL)&amp;VMEMMAP_CHUNK_MASK)</div><div class='add'>+</div><div class='add'>+#define VMEMMAP_SIZE	((((1UL &lt;&lt; MAX_PHYSADDR_BITS) &gt;&gt; PAGE_SHIFT) * \</div><div class='add'>+			  sizeof(struct page *)) &gt;&gt; VMEMMAP_CHUNK_SHIFT)</div><div class='add'>+extern unsigned long vmemmap_table[VMEMMAP_SIZE];</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif /* _SPARC64_MM_INIT_H */</div><div class='head'>diff --git a/arch/sparc64/mm/tlb.c b/arch/sparc64/mm/tlb.c<br/>index ae24919cba7c..d8f21e24a82f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/mm/tlb.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/sparc64/mm/tlb.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/sparc64/mm/tlb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/sparc64/mm/tlb.c</a></div><div class='hunk'>@@ -19,7 +19,7 @@</div><div class='ctx'> </div><div class='ctx'> /* Heavily inspired by the ppc64 code.  */</div><div class='ctx'> </div><div class='del'>-DEFINE_PER_CPU(struct mmu_gather, mmu_gathers) = { 0, };</div><div class='add'>+DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);</div><div class='ctx'> </div><div class='ctx'> void flush_tlb_pending(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/um/Kconfig.char b/arch/um/Kconfig.char<br/>index 1b238ebae6b3..70dabd1e0652 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/um/Kconfig.char?id=c15895ef30c2c03e99802951787183039a349d32'>arch/um/Kconfig.char</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/um/Kconfig.char?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/um/Kconfig.char</a></div><div class='hunk'>@@ -203,6 +203,10 @@ config SOUND</div><div class='ctx'> 	tristate</div><div class='ctx'> 	default UML_SOUND</div><div class='ctx'> </div><div class='add'>+config SOUND_OSS_CORE</div><div class='add'>+	bool</div><div class='add'>+	default UML_SOUND</div><div class='add'>+</div><div class='ctx'> config HOSTAUDIO</div><div class='ctx'> 	tristate</div><div class='ctx'> 	default UML_SOUND</div><div class='head'>diff --git a/arch/um/Kconfig.i386 b/arch/um/Kconfig.i386<br/>index e09edfa560da..1f57c113df6d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/um/Kconfig.i386?id=c15895ef30c2c03e99802951787183039a349d32'>arch/um/Kconfig.i386</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/um/Kconfig.i386?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/um/Kconfig.i386</a></div><div class='hunk'>@@ -9,8 +9,9 @@ config UML_X86</div><div class='ctx'> 	default y</div><div class='ctx'> </div><div class='ctx'> config X86_32</div><div class='del'>-       bool</div><div class='del'>-       default y</div><div class='add'>+	bool</div><div class='add'>+	default y</div><div class='add'>+  	select HAVE_AOUT</div><div class='ctx'> </div><div class='ctx'> config RWSEM_XCHGADD_ALGORITHM</div><div class='ctx'> 	def_bool y</div><div class='hunk'>@@ -42,6 +43,3 @@ config ARCH_REUSE_HOST_VSYSCALL_AREA</div><div class='ctx'> config GENERIC_HWEIGHT</div><div class='ctx'> 	bool</div><div class='ctx'> 	default y</div><div class='del'>-</div><div class='del'>-config ARCH_SUPPORTS_AOUT</div><div class='del'>-	def_bool y</div><div class='head'>diff --git a/arch/um/Kconfig.x86_64 b/arch/um/Kconfig.x86_64<br/>index 5696e7b374b3..40b3407cfe16 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/um/Kconfig.x86_64?id=c15895ef30c2c03e99802951787183039a349d32'>arch/um/Kconfig.x86_64</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/um/Kconfig.x86_64?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/um/Kconfig.x86_64</a></div><div class='hunk'>@@ -37,6 +37,3 @@ config SMP_BROKEN</div><div class='ctx'> config GENERIC_HWEIGHT</div><div class='ctx'> 	bool</div><div class='ctx'> 	default y</div><div class='del'>-</div><div class='del'>-config ARCH_SUPPORTS_AOUT</div><div class='del'>-	def_bool y</div><div class='head'>diff --git a/arch/um/drivers/line.c b/arch/um/drivers/line.c<br/>index d741f35d7b3a..14a102e877d6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/um/drivers/line.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/um/drivers/line.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/um/drivers/line.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/um/drivers/line.c</a></div><div class='hunk'>@@ -275,6 +275,8 @@ int line_ioctl(struct tty_struct *tty, struct file * file,</div><div class='ctx'> 	case TIOCGLTC:</div><div class='ctx'> 	case TIOCSLTC:</div><div class='ctx'> #endif</div><div class='add'>+	/* Note: these are out of date as we now have TCGETS2 etc but this</div><div class='add'>+	   whole lot should probably go away */</div><div class='ctx'> 	case TCGETS:</div><div class='ctx'> 	case TCSETSF:</div><div class='ctx'> 	case TCSETSW:</div><div class='head'>diff --git a/arch/um/kernel/exec.c b/arch/um/kernel/exec.c<br/>index f5d7f4569ba7..598711c62c82 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/um/kernel/exec.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/um/kernel/exec.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/um/kernel/exec.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/um/kernel/exec.c</a></div><div class='hunk'>@@ -42,23 +42,11 @@ void start_thread(struct pt_regs *regs, unsigned long eip, unsigned long esp)</div><div class='ctx'> 	PT_REGS_SP(regs) = esp;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_TTY_LOG</div><div class='del'>-extern void log_exec(char **argv, void *tty);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> static long execve1(char *file, char __user * __user *argv,</div><div class='ctx'> 		    char __user *__user *env)</div><div class='ctx'> {</div><div class='ctx'> 	long error;</div><div class='del'>-#ifdef CONFIG_TTY_LOG</div><div class='del'>-	struct tty_struct *tty;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;tty_mutex);</div><div class='del'>-	tty = get_current_tty();</div><div class='del'>-	if (tty)</div><div class='del'>-		log_exec(argv, tty);</div><div class='del'>-	mutex_unlock(&amp;tty_mutex);</div><div class='del'>-#endif</div><div class='ctx'> 	error = do_execve(file, argv, env, &amp;current-&gt;thread.regs);</div><div class='ctx'> 	if (error == 0) {</div><div class='ctx'> 		task_lock(current);</div><div class='head'>diff --git a/arch/um/kernel/smp.c b/arch/um/kernel/smp.c<br/>index be2d50c3aa95..045772142844 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/um/kernel/smp.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/um/kernel/smp.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/um/kernel/smp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/um/kernel/smp.c</a></div><div class='hunk'>@@ -85,6 +85,7 @@ static int idle_proc(void *cpup)</div><div class='ctx'> 	while (!cpu_isset(cpu, smp_commenced_mask))</div><div class='ctx'> 		cpu_relax();</div><div class='ctx'> </div><div class='add'>+	notify_cpu_starting(cpu);</div><div class='ctx'> 	cpu_set(cpu, cpu_online_map);</div><div class='ctx'> 	default_idle();</div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/arch/um/os-Linux/Makefile b/arch/um/os-Linux/Makefile<br/>index 8a48d6a30064..d66f0388f091 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/um/os-Linux/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>arch/um/os-Linux/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/um/os-Linux/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/um/os-Linux/Makefile</a></div><div class='hunk'>@@ -7,9 +7,6 @@ obj-y = aio.o elf_aux.o execvp.o file.o helper.o irq.o main.o mem.o process.o \</div><div class='ctx'> 	registers.o sigio.o signal.o start_up.o time.o tty.o uaccess.o \</div><div class='ctx'> 	umid.o tls.o user_syms.o util.o drivers/ sys-$(SUBARCH)/ skas/</div><div class='ctx'> </div><div class='del'>-obj-$(CONFIG_TTY_LOG) += tty_log.o</div><div class='del'>-user-objs-$(CONFIG_TTY_LOG) += tty_log.o</div><div class='del'>-</div><div class='ctx'> USER_OBJS := $(user-objs-y) aio.o elf_aux.o execvp.o file.o helper.o irq.o \</div><div class='ctx'> 	main.o mem.o process.o registers.o sigio.o signal.o start_up.o time.o \</div><div class='ctx'> 	tty.o tls.o uaccess.o umid.o util.o</div><div class='head'>diff --git a/arch/um/os-Linux/tty_log.c b/arch/um/os-Linux/tty_log.c<br/>deleted file mode 100644<br/>index cc648e6fd3a2..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/um/os-Linux/tty_log.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/um/os-Linux/tty_log.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,217 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 2002 Jeff Dike (jdike@karaya.com) and</div><div class='del'>- * geoffrey hing &lt;ghing@net.ohio-state.edu&gt;</div><div class='del'>- * Licensed under the GPL</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;sys/time.h&gt;</div><div class='del'>-#include "init.h"</div><div class='del'>-#include "user.h"</div><div class='del'>-#include "os.h"</div><div class='del'>-</div><div class='del'>-#define TTY_LOG_DIR "./"</div><div class='del'>-</div><div class='del'>-/* Set early in boot and then unchanged */</div><div class='del'>-static char *tty_log_dir = TTY_LOG_DIR;</div><div class='del'>-static int tty_log_fd = -1;</div><div class='del'>-</div><div class='del'>-#define TTY_LOG_OPEN 1</div><div class='del'>-#define TTY_LOG_CLOSE 2</div><div class='del'>-#define TTY_LOG_WRITE 3</div><div class='del'>-#define TTY_LOG_EXEC 4</div><div class='del'>-</div><div class='del'>-#define TTY_READ 1</div><div class='del'>-#define TTY_WRITE 2</div><div class='del'>-</div><div class='del'>-struct tty_log_buf {</div><div class='del'>-	int what;</div><div class='del'>-	unsigned long tty;</div><div class='del'>-	int len;</div><div class='del'>-	int direction;</div><div class='del'>-	unsigned long sec;</div><div class='del'>-	unsigned long usec;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int open_tty_log(void *tty, void *current_tty)</div><div class='del'>-{</div><div class='del'>-	struct timeval tv;</div><div class='del'>-	struct tty_log_buf data;</div><div class='del'>-	char buf[strlen(tty_log_dir) + sizeof("01234567890-01234567\0")];</div><div class='del'>-	int fd;</div><div class='del'>-</div><div class='del'>-	gettimeofday(&amp;tv, NULL);</div><div class='del'>-	if(tty_log_fd != -1){</div><div class='del'>-		data = ((struct tty_log_buf) { .what 	= TTY_LOG_OPEN,</div><div class='del'>-					       .tty  = (unsigned long) tty,</div><div class='del'>-					       .len  = sizeof(current_tty),</div><div class='del'>-					       .direction = 0,</div><div class='del'>-					       .sec = tv.tv_sec,</div><div class='del'>-					       .usec = tv.tv_usec } );</div><div class='del'>-		write(tty_log_fd, &amp;data, sizeof(data));</div><div class='del'>-		write(tty_log_fd, &amp;current_tty, data.len);</div><div class='del'>-		return tty_log_fd;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	sprintf(buf, "%s/%0u-%0u", tty_log_dir, (unsigned int) tv.tv_sec,</div><div class='del'>- 		(unsigned int) tv.tv_usec);</div><div class='del'>-</div><div class='del'>-	fd = os_open_file(buf, of_append(of_create(of_rdwr(OPENFLAGS()))),</div><div class='del'>-			  0644);</div><div class='del'>-	if(fd &lt; 0){</div><div class='del'>-		printk("open_tty_log : couldn't open '%s', errno = %d\n",</div><div class='del'>-		       buf, -fd);</div><div class='del'>-	}</div><div class='del'>-	return fd;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void close_tty_log(int fd, void *tty)</div><div class='del'>-{</div><div class='del'>-	struct tty_log_buf data;</div><div class='del'>-	struct timeval tv;</div><div class='del'>-</div><div class='del'>-	if(tty_log_fd != -1){</div><div class='del'>-		gettimeofday(&amp;tv, NULL);</div><div class='del'>-		data = ((struct tty_log_buf) { .what 	= TTY_LOG_CLOSE,</div><div class='del'>-					       .tty  = (unsigned long) tty,</div><div class='del'>-					       .len  = 0,</div><div class='del'>-					       .direction = 0,</div><div class='del'>-					       .sec = tv.tv_sec,</div><div class='del'>-					       .usec = tv.tv_usec } );</div><div class='del'>-		write(tty_log_fd, &amp;data, sizeof(data));</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	os_close_file(fd);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int log_chunk(int fd, const char *buf, int len)</div><div class='del'>-{</div><div class='del'>-	int total = 0, try, missed, n;</div><div class='del'>-	char chunk[64];</div><div class='del'>-</div><div class='del'>-	while(len &gt; 0){</div><div class='del'>-		try = (len &gt; sizeof(chunk)) ? sizeof(chunk) : len;</div><div class='del'>-		missed = copy_from_user_proc(chunk, (char *) buf, try);</div><div class='del'>-		try -= missed;</div><div class='del'>-		n = write(fd, chunk, try);</div><div class='del'>-		if(n != try) {</div><div class='del'>-			if(n &lt; 0)</div><div class='del'>-				return -errno;</div><div class='del'>-			return -EIO;</div><div class='del'>-		}</div><div class='del'>-		if(missed != 0)</div><div class='del'>-			return -EFAULT;</div><div class='del'>-</div><div class='del'>-		len -= try;</div><div class='del'>-		total += try;</div><div class='del'>-		buf += try;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return total;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int write_tty_log(int fd, const char *buf, int len, void *tty, int is_read)</div><div class='del'>-{</div><div class='del'>-	struct timeval tv;</div><div class='del'>-	struct tty_log_buf data;</div><div class='del'>-	int direction;</div><div class='del'>-</div><div class='del'>-	if(fd == tty_log_fd){</div><div class='del'>-		gettimeofday(&amp;tv, NULL);</div><div class='del'>-		direction = is_read ? TTY_READ : TTY_WRITE;</div><div class='del'>-		data = ((struct tty_log_buf) { .what 	= TTY_LOG_WRITE,</div><div class='del'>-					       .tty  = (unsigned long) tty,</div><div class='del'>-					       .len  = len,</div><div class='del'>-					       .direction = direction,</div><div class='del'>-					       .sec = tv.tv_sec,</div><div class='del'>-					       .usec = tv.tv_usec } );</div><div class='del'>-		write(tty_log_fd, &amp;data, sizeof(data));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return log_chunk(fd, buf, len);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void log_exec(char **argv, void *tty)</div><div class='del'>-{</div><div class='del'>-	struct timeval tv;</div><div class='del'>-	struct tty_log_buf data;</div><div class='del'>-	char **ptr,*arg;</div><div class='del'>-	int len;</div><div class='del'>-</div><div class='del'>-	if(tty_log_fd == -1) return;</div><div class='del'>-</div><div class='del'>-	gettimeofday(&amp;tv, NULL);</div><div class='del'>-</div><div class='del'>-	len = 0;</div><div class='del'>-	for(ptr = argv; ; ptr++){</div><div class='del'>-		if(copy_from_user_proc(&amp;arg, ptr, sizeof(arg)))</div><div class='del'>-			return;</div><div class='del'>-		if(arg == NULL) break;</div><div class='del'>-		len += strlen_user_proc(arg);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	data = ((struct tty_log_buf) { .what 	= TTY_LOG_EXEC,</div><div class='del'>-				       .tty  = (unsigned long) tty,</div><div class='del'>-				       .len  = len,</div><div class='del'>-				       .direction = 0,</div><div class='del'>-				       .sec = tv.tv_sec,</div><div class='del'>-				       .usec = tv.tv_usec } );</div><div class='del'>-	write(tty_log_fd, &amp;data, sizeof(data));</div><div class='del'>-</div><div class='del'>-	for(ptr = argv; ; ptr++){</div><div class='del'>-		if(copy_from_user_proc(&amp;arg, ptr, sizeof(arg)))</div><div class='del'>-			return;</div><div class='del'>-		if(arg == NULL) break;</div><div class='del'>-		log_chunk(tty_log_fd, arg, strlen_user_proc(arg));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-extern void register_tty_logger(int (*opener)(void *, void *),</div><div class='del'>-				int (*writer)(int, const char *, int,</div><div class='del'>-					      void *, int),</div><div class='del'>-				void (*closer)(int, void *));</div><div class='del'>-</div><div class='del'>-static int register_logger(void)</div><div class='del'>-{</div><div class='del'>-	register_tty_logger(open_tty_log, write_tty_log, close_tty_log);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-__uml_initcall(register_logger);</div><div class='del'>-</div><div class='del'>-static int __init set_tty_log_dir(char *name, int *add)</div><div class='del'>-{</div><div class='del'>-	tty_log_dir = name;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-__uml_setup("tty_log_dir=", set_tty_log_dir,</div><div class='del'>-"tty_log_dir=&lt;directory&gt;\n"</div><div class='del'>-"    This is used to specify the directory where the logs of all pty\n"</div><div class='del'>-"    data from this UML machine will be written.\n\n"</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-static int __init set_tty_log_fd(char *name, int *add)</div><div class='del'>-{</div><div class='del'>-	char *end;</div><div class='del'>-</div><div class='del'>-	tty_log_fd = strtoul(name, &amp;end, 0);</div><div class='del'>-	if((*end != '\0') || (end == name)){</div><div class='del'>-		printf("set_tty_log_fd - strtoul failed on '%s'\n", name);</div><div class='del'>-		tty_log_fd = -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*add = 0;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-__uml_setup("tty_log_fd=", set_tty_log_fd,</div><div class='del'>-"tty_log_fd=&lt;fd&gt;\n"</div><div class='del'>-"    This is used to specify a preconfigured file descriptor to which all\n"</div><div class='del'>-"    tty data will be written.  Preconfigure the descriptor with something\n"</div><div class='del'>-"    like '10&gt;tty_log tty_log_fd=10'.\n\n"</div><div class='del'>-);</div><div class='head'>diff --git a/arch/um/sys-x86_64/syscall_table.c b/arch/um/sys-x86_64/syscall_table.c<br/>index c128eb897008..32f5fbe2d0d2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/um/sys-x86_64/syscall_table.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/um/sys-x86_64/syscall_table.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/um/sys-x86_64/syscall_table.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/um/sys-x86_64/syscall_table.c</a></div><div class='hunk'>@@ -41,12 +41,12 @@</div><div class='ctx'> #define stub_rt_sigreturn sys_rt_sigreturn</div><div class='ctx'> </div><div class='ctx'> #define __SYSCALL(nr, sym) extern asmlinkage void sym(void) ;</div><div class='del'>-#undef _ASM_X86_64_UNISTD_H_</div><div class='add'>+#undef ASM_X86__UNISTD_64_H</div><div class='ctx'> #include &lt;asm-x86/unistd_64.h&gt;</div><div class='ctx'> </div><div class='ctx'> #undef __SYSCALL</div><div class='ctx'> #define __SYSCALL(nr, sym) [ nr ] = sym,</div><div class='del'>-#undef _ASM_X86_64_UNISTD_H_</div><div class='add'>+#undef ASM_X86__UNISTD_64_H</div><div class='ctx'> </div><div class='ctx'> typedef void (*sys_call_ptr_t)(void);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig<br/>index ed92864d1325..bd3c2c53873e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/Kconfig</a></div><div class='hunk'>@@ -18,6 +18,7 @@ config X86_64</div><div class='ctx'> ### Arch settings</div><div class='ctx'> config X86</div><div class='ctx'> 	def_bool y</div><div class='add'>+	select HAVE_AOUT if X86_32</div><div class='ctx'> 	select HAVE_UNSTABLE_SCHED_CLOCK</div><div class='ctx'> 	select HAVE_IDE</div><div class='ctx'> 	select HAVE_OPROFILE</div><div class='hunk'>@@ -29,6 +30,7 @@ config X86</div><div class='ctx'> 	select HAVE_FTRACE</div><div class='ctx'> 	select HAVE_KVM if ((X86_32 &amp;&amp; !X86_VOYAGER &amp;&amp; !X86_VISWS &amp;&amp; !X86_NUMAQ) || X86_64)</div><div class='ctx'> 	select HAVE_ARCH_KGDB if !X86_VOYAGER</div><div class='add'>+	select HAVE_ARCH_TRACEHOOK</div><div class='ctx'> 	select HAVE_GENERIC_DMA_COHERENT if X86_32</div><div class='ctx'> 	select HAVE_EFFICIENT_UNALIGNED_ACCESS</div><div class='ctx'> </div><div class='hunk'>@@ -37,10 +39,6 @@ config ARCH_DEFCONFIG</div><div class='ctx'> 	default "arch/x86/configs/i386_defconfig" if X86_32</div><div class='ctx'> 	default "arch/x86/configs/x86_64_defconfig" if X86_64</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-config GENERIC_LOCKBREAK</div><div class='del'>-	def_bool n</div><div class='del'>-</div><div class='ctx'> config GENERIC_TIME</div><div class='ctx'> 	def_bool y</div><div class='ctx'> </div><div class='hunk'>@@ -93,7 +91,7 @@ config GENERIC_HWEIGHT</div><div class='ctx'> 	def_bool y</div><div class='ctx'> </div><div class='ctx'> config GENERIC_GPIO</div><div class='del'>-	def_bool n</div><div class='add'>+	bool</div><div class='ctx'> </div><div class='ctx'> config ARCH_MAY_HAVE_PC_FDC</div><div class='ctx'> 	def_bool y</div><div class='hunk'>@@ -104,12 +102,6 @@ config RWSEM_GENERIC_SPINLOCK</div><div class='ctx'> config RWSEM_XCHGADD_ALGORITHM</div><div class='ctx'> 	def_bool X86_XADD</div><div class='ctx'> </div><div class='del'>-config ARCH_HAS_ILOG2_U32</div><div class='del'>-	def_bool n</div><div class='del'>-</div><div class='del'>-config ARCH_HAS_ILOG2_U64</div><div class='del'>-	def_bool n</div><div class='del'>-</div><div class='ctx'> config ARCH_HAS_CPU_IDLE_WAIT</div><div class='ctx'> 	def_bool y</div><div class='ctx'> </div><div class='hunk'>@@ -151,9 +143,6 @@ config AUDIT_ARCH</div><div class='ctx'> 	bool</div><div class='ctx'> 	default X86_64</div><div class='ctx'> </div><div class='del'>-config ARCH_SUPPORTS_AOUT</div><div class='del'>-	def_bool y</div><div class='del'>-</div><div class='ctx'> config ARCH_SUPPORTS_OPTIMIZED_INLINING</div><div class='ctx'> 	def_bool y</div><div class='ctx'> </div><div class='hunk'>@@ -553,6 +542,7 @@ config CALGARY_IOMMU_ENABLED_BY_DEFAULT</div><div class='ctx'> config AMD_IOMMU</div><div class='ctx'> 	bool "AMD IOMMU support"</div><div class='ctx'> 	select SWIOTLB</div><div class='add'>+	select PCI_MSI</div><div class='ctx'> 	depends on X86_64 &amp;&amp; PCI &amp;&amp; ACPI</div><div class='ctx'> 	help</div><div class='ctx'> 	  With this option you can enable support for AMD IOMMU hardware in</div><div class='hunk'>@@ -758,9 +748,8 @@ config I8K</div><div class='ctx'> 	  Say N otherwise.</div><div class='ctx'> </div><div class='ctx'> config X86_REBOOTFIXUPS</div><div class='del'>-	def_bool n</div><div class='del'>-	prompt "Enable X86 board specific fixups for reboot"</div><div class='del'>-	depends on X86_32 &amp;&amp; X86</div><div class='add'>+	bool "Enable X86 board specific fixups for reboot"</div><div class='add'>+	depends on X86_32</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  This enables chipset and/or board specific fixups to be done</div><div class='ctx'> 	  in order to get reboot to work correctly. This is only needed on</div><div class='hunk'>@@ -776,23 +765,45 @@ config X86_REBOOTFIXUPS</div><div class='ctx'> 	  Say N otherwise.</div><div class='ctx'> </div><div class='ctx'> config MICROCODE</div><div class='del'>-	tristate "/dev/cpu/microcode - Intel IA32 CPU microcode support"</div><div class='add'>+	tristate "/dev/cpu/microcode - microcode support"</div><div class='ctx'> 	select FW_LOADER</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  If you say Y here, you will be able to update the microcode on</div><div class='del'>-	  Intel processors in the IA32 family, e.g. Pentium Pro, Pentium II,</div><div class='del'>-	  Pentium III, Pentium 4, Xeon etc.  You will obviously need the</div><div class='del'>-	  actual microcode binary data itself which is not shipped with the</div><div class='del'>-	  Linux kernel.</div><div class='add'>+	  certain Intel and AMD processors. The Intel support is for the</div><div class='add'>+	  IA32 family, e.g. Pentium Pro, Pentium II, Pentium III,</div><div class='add'>+	  Pentium 4, Xeon etc. The AMD support is for family 0x10 and</div><div class='add'>+	  0x11 processors, e.g. Opteron, Phenom and Turion 64 Ultra.</div><div class='add'>+	  You will obviously need the actual microcode binary data itself</div><div class='add'>+	  which is not shipped with the Linux kernel.</div><div class='ctx'> </div><div class='del'>-	  For latest news and information on obtaining all the required</div><div class='del'>-	  ingredients for this driver, check:</div><div class='del'>-	  &lt;http://www.urbanmyth.org/microcode/&gt;.</div><div class='add'>+	  This option selects the general module only, you need to select</div><div class='add'>+	  at least one vendor specific module as well.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='ctx'> 	  module will be called microcode.</div><div class='ctx'> </div><div class='del'>-config MICROCODE_OLD_INTERFACE</div><div class='add'>+config MICROCODE_INTEL</div><div class='add'>+       bool "Intel microcode patch loading support"</div><div class='add'>+       depends on MICROCODE</div><div class='add'>+       default MICROCODE</div><div class='add'>+       select FW_LOADER</div><div class='add'>+       --help---</div><div class='add'>+         This options enables microcode patch loading support for Intel</div><div class='add'>+         processors.</div><div class='add'>+</div><div class='add'>+         For latest news and information on obtaining all the required</div><div class='add'>+         Intel ingredients for this driver, check:</div><div class='add'>+         &lt;http://www.urbanmyth.org/microcode/&gt;.</div><div class='add'>+</div><div class='add'>+config MICROCODE_AMD</div><div class='add'>+       bool "AMD microcode patch loading support"</div><div class='add'>+       depends on MICROCODE</div><div class='add'>+       select FW_LOADER</div><div class='add'>+       --help---</div><div class='add'>+         If you select this option, microcode patch loading support for AMD</div><div class='add'>+	 processors will be enabled.</div><div class='add'>+</div><div class='add'>+   config MICROCODE_OLD_INTERFACE</div><div class='ctx'> 	def_bool y</div><div class='ctx'> 	depends on MICROCODE</div><div class='ctx'> </div><div class='hunk'>@@ -922,16 +933,17 @@ config HIGHMEM</div><div class='ctx'> 	depends on X86_32 &amp;&amp; (HIGHMEM64G || HIGHMEM4G)</div><div class='ctx'> </div><div class='ctx'> config X86_PAE</div><div class='del'>-	def_bool n</div><div class='del'>-	prompt "PAE (Physical Address Extension) Support"</div><div class='add'>+	bool "PAE (Physical Address Extension) Support"</div><div class='ctx'> 	depends on X86_32 &amp;&amp; !HIGHMEM4G</div><div class='del'>-	select RESOURCES_64BIT</div><div class='ctx'> 	help</div><div class='ctx'> 	  PAE is required for NX support, and furthermore enables</div><div class='ctx'> 	  larger swapspace support for non-overcommit purposes. It</div><div class='ctx'> 	  has the cost of more pagetable lookup overhead, and also</div><div class='ctx'> 	  consumes more pagetable space per process.</div><div class='ctx'> </div><div class='add'>+config ARCH_PHYS_ADDR_T_64BIT</div><div class='add'>+       def_bool X86_64 || X86_PAE</div><div class='add'>+</div><div class='ctx'> # Common NUMA Features</div><div class='ctx'> config NUMA</div><div class='ctx'> 	bool "Numa Memory Allocation and Scheduler Support (EXPERIMENTAL)"</div><div class='hunk'>@@ -1020,7 +1032,7 @@ config HAVE_ARCH_ALLOC_REMAP</div><div class='ctx'> </div><div class='ctx'> config ARCH_FLATMEM_ENABLE</div><div class='ctx'> 	def_bool y</div><div class='del'>-	depends on X86_32 &amp;&amp; ARCH_SELECT_MEMORY_MODEL &amp;&amp; X86_PC &amp;&amp; !NUMA</div><div class='add'>+	depends on X86_32 &amp;&amp; ARCH_SELECT_MEMORY_MODEL &amp;&amp; !NUMA</div><div class='ctx'> </div><div class='ctx'> config ARCH_DISCONTIGMEM_ENABLE</div><div class='ctx'> 	def_bool y</div><div class='hunk'>@@ -1036,7 +1048,7 @@ config ARCH_SPARSEMEM_DEFAULT</div><div class='ctx'> </div><div class='ctx'> config ARCH_SPARSEMEM_ENABLE</div><div class='ctx'> 	def_bool y</div><div class='del'>-	depends on X86_64 || NUMA || (EXPERIMENTAL &amp;&amp; X86_PC)</div><div class='add'>+	depends on X86_64 || NUMA || (EXPERIMENTAL &amp;&amp; X86_PC) || X86_GENERICARCH</div><div class='ctx'> 	select SPARSEMEM_STATIC if X86_32</div><div class='ctx'> 	select SPARSEMEM_VMEMMAP_ENABLE if X86_64</div><div class='ctx'> </div><div class='hunk'>@@ -1059,6 +1071,56 @@ config HIGHPTE</div><div class='ctx'> 	  low memory.  Setting this option will put user-space page table</div><div class='ctx'> 	  entries in high memory.</div><div class='ctx'> </div><div class='add'>+config X86_CHECK_BIOS_CORRUPTION</div><div class='add'>+        bool "Check for low memory corruption"</div><div class='add'>+	help</div><div class='add'>+	 Periodically check for memory corruption in low memory, which</div><div class='add'>+	 is suspected to be caused by BIOS.  Even when enabled in the</div><div class='add'>+	 configuration, it is disabled at runtime.  Enable it by</div><div class='add'>+	 setting "memory_corruption_check=1" on the kernel command</div><div class='add'>+	 line.  By default it scans the low 64k of memory every 60</div><div class='add'>+	 seconds; see the memory_corruption_check_size and</div><div class='add'>+	 memory_corruption_check_period parameters in</div><div class='add'>+	 Documentation/kernel-parameters.txt to adjust this.</div><div class='add'>+</div><div class='add'>+	 When enabled with the default parameters, this option has</div><div class='add'>+	 almost no overhead, as it reserves a relatively small amount</div><div class='add'>+	 of memory and scans it infrequently.  It both detects corruption</div><div class='add'>+	 and prevents it from affecting the running system.</div><div class='add'>+</div><div class='add'>+	 It is, however, intended as a diagnostic tool; if repeatable</div><div class='add'>+	 BIOS-originated corruption always affects the same memory,</div><div class='add'>+	 you can use memmap= to prevent the kernel from using that</div><div class='add'>+	 memory.</div><div class='add'>+</div><div class='add'>+config X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK</div><div class='add'>+        bool "Set the default setting of memory_corruption_check"</div><div class='add'>+	depends on X86_CHECK_BIOS_CORRUPTION</div><div class='add'>+	default y</div><div class='add'>+	help</div><div class='add'>+	 Set whether the default state of memory_corruption_check is</div><div class='add'>+	 on or off.</div><div class='add'>+</div><div class='add'>+config X86_RESERVE_LOW_64K</div><div class='add'>+        bool "Reserve low 64K of RAM on AMI/Phoenix BIOSen"</div><div class='add'>+	default y</div><div class='add'>+	help</div><div class='add'>+	 Reserve the first 64K of physical RAM on BIOSes that are known</div><div class='add'>+	 to potentially corrupt that memory range. A numbers of BIOSes are</div><div class='add'>+	 known to utilize this area during suspend/resume, so it must not</div><div class='add'>+	 be used by the kernel.</div><div class='add'>+</div><div class='add'>+	 Set this to N if you are absolutely sure that you trust the BIOS</div><div class='add'>+	 to get all its memory reservations and usages right.</div><div class='add'>+</div><div class='add'>+	 If you have doubts about the BIOS (e.g. suspend/resume does not</div><div class='add'>+	 work or there's kernel crashes after certain hardware hotplug</div><div class='add'>+	 events) and it's not AMI or Phoenix, then you might want to enable</div><div class='add'>+	 X86_CHECK_BIOS_CORRUPTION=y to allow the kernel to check typical</div><div class='add'>+	 corruption patterns.</div><div class='add'>+</div><div class='add'>+	 Say Y if unsure.</div><div class='add'>+</div><div class='ctx'> config MATH_EMULATION</div><div class='ctx'> 	bool</div><div class='ctx'> 	prompt "Math emulation" if X86_32</div><div class='hunk'>@@ -1117,10 +1179,10 @@ config MTRR</div><div class='ctx'> 	  You can safely say Y even if your machine doesn't have MTRRs, you'll</div><div class='ctx'> 	  just add about 9 KB to your kernel.</div><div class='ctx'> </div><div class='del'>-	  See &lt;file:Documentation/mtrr.txt&gt; for more information.</div><div class='add'>+	  See &lt;file:Documentation/x86/mtrr.txt&gt; for more information.</div><div class='ctx'> </div><div class='ctx'> config MTRR_SANITIZER</div><div class='del'>-	bool</div><div class='add'>+	def_bool y</div><div class='ctx'> 	prompt "MTRR cleanup support"</div><div class='ctx'> 	depends on MTRR</div><div class='ctx'> 	help</div><div class='hunk'>@@ -1131,7 +1193,7 @@ config MTRR_SANITIZER</div><div class='ctx'> 	  The largest mtrr entry size for a continous block can be set with</div><div class='ctx'> 	  mtrr_chunk_size.</div><div class='ctx'> </div><div class='del'>-	  If unsure, say N.</div><div class='add'>+	  If unsure, say Y.</div><div class='ctx'> </div><div class='ctx'> config MTRR_SANITIZER_ENABLE_DEFAULT</div><div class='ctx'> 	int "MTRR cleanup enable value (0-1)"</div><div class='hunk'>@@ -1166,8 +1228,7 @@ config X86_PAT</div><div class='ctx'> 	  If unsure, say Y.</div><div class='ctx'> </div><div class='ctx'> config EFI</div><div class='del'>-	def_bool n</div><div class='del'>-	prompt "EFI runtime service support"</div><div class='add'>+	bool "EFI runtime service support"</div><div class='ctx'> 	depends on ACPI</div><div class='ctx'> 	---help---</div><div class='ctx'> 	This enables the kernel to use EFI runtime services that are</div><div class='hunk'>@@ -1191,7 +1252,6 @@ config IRQBALANCE</div><div class='ctx'> config SECCOMP</div><div class='ctx'> 	def_bool y</div><div class='ctx'> 	prompt "Enable seccomp to safely compute untrusted bytecode"</div><div class='del'>-	depends on PROC_FS</div><div class='ctx'> 	help</div><div class='ctx'> 	  This kernel feature is useful for number crunching applications</div><div class='ctx'> 	  that may need to compute untrusted bytecode during their</div><div class='hunk'>@@ -1199,7 +1259,7 @@ config SECCOMP</div><div class='ctx'> 	  the process as file descriptors supporting the read/write</div><div class='ctx'> 	  syscalls, it's possible to isolate those applications in</div><div class='ctx'> 	  their own address space using seccomp. Once seccomp is</div><div class='del'>-	  enabled via /proc/&lt;pid&gt;/seccomp, it cannot be disabled</div><div class='add'>+	  enabled via prctl(PR_SET_SECCOMP), it cannot be disabled</div><div class='ctx'> 	  and the task is only allowed to execute a few safe syscalls</div><div class='ctx'> 	  defined by each seccomp mode.</div><div class='ctx'> </div><div class='hunk'>@@ -1356,14 +1416,14 @@ config PHYSICAL_ALIGN</div><div class='ctx'> 	  Don't change this unless you know what you are doing.</div><div class='ctx'> </div><div class='ctx'> config HOTPLUG_CPU</div><div class='del'>-	bool "Support for suspend on SMP and hot-pluggable CPUs (EXPERIMENTAL)"</div><div class='del'>-	depends on SMP &amp;&amp; HOTPLUG &amp;&amp; EXPERIMENTAL &amp;&amp; !X86_VOYAGER</div><div class='add'>+	bool "Support for hot-pluggable CPUs"</div><div class='add'>+	depends on SMP &amp;&amp; HOTPLUG &amp;&amp; !X86_VOYAGER</div><div class='ctx'> 	---help---</div><div class='del'>-	  Say Y here to experiment with turning CPUs off and on, and to</div><div class='del'>-	  enable suspend on SMP systems. CPUs can be controlled through</div><div class='del'>-	  /sys/devices/system/cpu.</div><div class='del'>-	  Say N if you want to disable CPU hotplug and don't need to</div><div class='del'>-	  suspend.</div><div class='add'>+	  Say Y here to allow turning CPUs off and on. CPUs can be</div><div class='add'>+	  controlled through /sys/devices/system/cpu.</div><div class='add'>+	  ( Note: power management support will enable this option</div><div class='add'>+	    automatically on SMP systems. )</div><div class='add'>+	  Say N if you want to disable CPU hotplug.</div><div class='ctx'> </div><div class='ctx'> config COMPAT_VDSO</div><div class='ctx'> 	def_bool y</div><div class='hunk'>@@ -1378,6 +1438,51 @@ config COMPAT_VDSO</div><div class='ctx'> </div><div class='ctx'> 	  If unsure, say Y.</div><div class='ctx'> </div><div class='add'>+config CMDLINE_BOOL</div><div class='add'>+	bool "Built-in kernel command line"</div><div class='add'>+	default n</div><div class='add'>+	help</div><div class='add'>+	  Allow for specifying boot arguments to the kernel at</div><div class='add'>+	  build time.  On some systems (e.g. embedded ones), it is</div><div class='add'>+	  necessary or convenient to provide some or all of the</div><div class='add'>+	  kernel boot arguments with the kernel itself (that is,</div><div class='add'>+	  to not rely on the boot loader to provide them.)</div><div class='add'>+</div><div class='add'>+	  To compile command line arguments into the kernel,</div><div class='add'>+	  set this option to 'Y', then fill in the</div><div class='add'>+	  the boot arguments in CONFIG_CMDLINE.</div><div class='add'>+</div><div class='add'>+	  Systems with fully functional boot loaders (i.e. non-embedded)</div><div class='add'>+	  should leave this option set to 'N'.</div><div class='add'>+</div><div class='add'>+config CMDLINE</div><div class='add'>+	string "Built-in kernel command string"</div><div class='add'>+	depends on CMDLINE_BOOL</div><div class='add'>+	default ""</div><div class='add'>+	help</div><div class='add'>+	  Enter arguments here that should be compiled into the kernel</div><div class='add'>+	  image and used at boot time.  If the boot loader provides a</div><div class='add'>+	  command line at boot time, it is appended to this string to</div><div class='add'>+	  form the full kernel command line, when the system boots.</div><div class='add'>+</div><div class='add'>+	  However, you can use the CONFIG_CMDLINE_OVERRIDE option to</div><div class='add'>+	  change this behavior.</div><div class='add'>+</div><div class='add'>+	  In most cases, the command line (whether built-in or provided</div><div class='add'>+	  by the boot loader) should specify the device for the root</div><div class='add'>+	  file system.</div><div class='add'>+</div><div class='add'>+config CMDLINE_OVERRIDE</div><div class='add'>+	bool "Built-in command line overrides boot loader arguments"</div><div class='add'>+	default n</div><div class='add'>+	depends on CMDLINE_BOOL</div><div class='add'>+	help</div><div class='add'>+	  Set this option to 'Y' to have the kernel ignore the boot loader</div><div class='add'>+	  command line, and use ONLY the built-in command line.</div><div class='add'>+</div><div class='add'>+	  This is used to work around broken boot loaders.  This should</div><div class='add'>+	  be set to 'N' under normal conditions.</div><div class='add'>+</div><div class='ctx'> endmenu</div><div class='ctx'> </div><div class='ctx'> config ARCH_ENABLE_MEMORY_HOTPLUG</div><div class='hunk'>@@ -1643,6 +1748,14 @@ config DMAR_FLOPPY_WA</div><div class='ctx'> 	 workaround will setup a 1:1 mapping for the first</div><div class='ctx'> 	 16M to make floppy (an ISA device) work.</div><div class='ctx'> </div><div class='add'>+config INTR_REMAP</div><div class='add'>+	bool "Support for Interrupt Remapping (EXPERIMENTAL)"</div><div class='add'>+	depends on X86_64 &amp;&amp; X86_IO_APIC &amp;&amp; PCI_MSI &amp;&amp; ACPI &amp;&amp; EXPERIMENTAL</div><div class='add'>+	help</div><div class='add'>+	 Supports Interrupt remapping for IO-APIC and MSI devices.</div><div class='add'>+	 To use x2apic mode in the CPU's which support x2APIC enhancements or</div><div class='add'>+	 to support platforms with CPU's having &gt; 8 bit APIC ID, say Y.</div><div class='add'>+</div><div class='ctx'> source "drivers/pci/pcie/Kconfig"</div><div class='ctx'> </div><div class='ctx'> source "drivers/pci/Kconfig"</div><div class='hunk'>@@ -1759,7 +1872,7 @@ config IA32_EMULATION</div><div class='ctx'> </div><div class='ctx'> config IA32_AOUT</div><div class='ctx'>        tristate "IA32 a.out support"</div><div class='del'>-       depends on IA32_EMULATION &amp;&amp; ARCH_SUPPORTS_AOUT</div><div class='add'>+       depends on IA32_EMULATION</div><div class='ctx'>        help</div><div class='ctx'>          Support old a.out binaries in the 32bit emulation.</div><div class='ctx'> </div><div class='hunk'>@@ -1773,7 +1886,7 @@ config COMPAT_FOR_U64_ALIGNMENT</div><div class='ctx'> </div><div class='ctx'> config SYSVIPC_COMPAT</div><div class='ctx'> 	def_bool y</div><div class='del'>-	depends on X86_64 &amp;&amp; COMPAT &amp;&amp; SYSVIPC</div><div class='add'>+	depends on COMPAT &amp;&amp; SYSVIPC</div><div class='ctx'> </div><div class='ctx'> endmenu</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu<br/>index b225219c448c..0b7c4a3f0651 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/Kconfig.cpu?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/Kconfig.cpu</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/Kconfig.cpu?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/Kconfig.cpu</a></div><div class='hunk'>@@ -38,8 +38,7 @@ config M386</div><div class='ctx'> 	  - "Crusoe" for the Transmeta Crusoe series.</div><div class='ctx'> 	  - "Efficeon" for the Transmeta Efficeon series.</div><div class='ctx'> 	  - "Winchip-C6" for original IDT Winchip.</div><div class='del'>-	  - "Winchip-2" for IDT Winchip 2.</div><div class='del'>-	  - "Winchip-2A" for IDT Winchips with 3dNow! capabilities.</div><div class='add'>+	  - "Winchip-2" for IDT Winchips with 3dNow! capabilities.</div><div class='ctx'> 	  - "GeodeGX1" for Geode GX1 (Cyrix MediaGX).</div><div class='ctx'> 	  - "Geode GX/LX" For AMD Geode GX and LX processors.</div><div class='ctx'> 	  - "CyrixIII/VIA C3" for VIA Cyrix III or VIA C3.</div><div class='hunk'>@@ -194,19 +193,11 @@ config MWINCHIPC6</div><div class='ctx'> 	  treat this chip as a 586TSC with some extended instructions</div><div class='ctx'> 	  and alignment requirements.</div><div class='ctx'> </div><div class='del'>-config MWINCHIP2</div><div class='del'>-	bool "Winchip-2"</div><div class='del'>-	depends on X86_32</div><div class='del'>-	help</div><div class='del'>-	  Select this for an IDT Winchip-2.  Linux and GCC</div><div class='del'>-	  treat this chip as a 586TSC with some extended instructions</div><div class='del'>-	  and alignment requirements.</div><div class='del'>-</div><div class='ctx'> config MWINCHIP3D</div><div class='del'>-	bool "Winchip-2A/Winchip-3"</div><div class='add'>+	bool "Winchip-2/Winchip-2A/Winchip-3"</div><div class='ctx'> 	depends on X86_32</div><div class='ctx'> 	help</div><div class='del'>-	  Select this for an IDT Winchip-2A or 3.  Linux and GCC</div><div class='add'>+	  Select this for an IDT Winchip-2, 2A or 3.  Linux and GCC</div><div class='ctx'> 	  treat this chip as a 586TSC with some extended instructions</div><div class='ctx'> 	  and alignment requirements.  Also enable out of order memory</div><div class='ctx'> 	  stores for this CPU, which can increase performance of some</div><div class='hunk'>@@ -318,7 +309,7 @@ config X86_L1_CACHE_SHIFT</div><div class='ctx'> 	int</div><div class='ctx'> 	default "7" if MPENTIUM4 || X86_GENERIC || GENERIC_CPU || MPSC</div><div class='ctx'> 	default "4" if X86_ELAN || M486 || M386 || MGEODEGX1</div><div class='del'>-	default "5" if MWINCHIP3D || MWINCHIP2 || MWINCHIPC6 || MCRUSOE || MEFFICEON || MCYRIXIII || MK6 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || MVIAC3_2 || MGEODE_LX</div><div class='add'>+	default "5" if MWINCHIP3D || MWINCHIPC6 || MCRUSOE || MEFFICEON || MCYRIXIII || MK6 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || MVIAC3_2 || MGEODE_LX</div><div class='ctx'> 	default "6" if MK7 || MK8 || MPENTIUMM || MCORE2 || MVIAC7</div><div class='ctx'> </div><div class='ctx'> config X86_XADD</div><div class='hunk'>@@ -360,7 +351,7 @@ config X86_POPAD_OK</div><div class='ctx'> </div><div class='ctx'> config X86_ALIGNMENT_16</div><div class='ctx'> 	def_bool y</div><div class='del'>-	depends on MWINCHIP3D || MWINCHIP2 || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK6 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1</div><div class='add'>+	depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK6 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1</div><div class='ctx'> </div><div class='ctx'> config X86_INTEL_USERCOPY</div><div class='ctx'> 	def_bool y</div><div class='hunk'>@@ -368,7 +359,7 @@ config X86_INTEL_USERCOPY</div><div class='ctx'> </div><div class='ctx'> config X86_USE_PPRO_CHECKSUM</div><div class='ctx'> 	def_bool y</div><div class='del'>-	depends on MWINCHIP3D || MWINCHIP2 || MWINCHIPC6 || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MK8 || MVIAC3_2 || MEFFICEON || MGEODE_LX || MCORE2</div><div class='add'>+	depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MK8 || MVIAC3_2 || MEFFICEON || MGEODE_LX || MCORE2</div><div class='ctx'> </div><div class='ctx'> config X86_USE_3DNOW</div><div class='ctx'> 	def_bool y</div><div class='hunk'>@@ -376,7 +367,7 @@ config X86_USE_3DNOW</div><div class='ctx'> </div><div class='ctx'> config X86_OOSTORE</div><div class='ctx'> 	def_bool y</div><div class='del'>-	depends on (MWINCHIP3D || MWINCHIP2 || MWINCHIPC6) &amp;&amp; MTRR</div><div class='add'>+	depends on (MWINCHIP3D || MWINCHIPC6) &amp;&amp; MTRR</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # P6_NOPs are a relatively minor optimization that require a family &gt;=</div><div class='hunk'>@@ -396,7 +387,7 @@ config X86_P6_NOP</div><div class='ctx'> </div><div class='ctx'> config X86_TSC</div><div class='ctx'> 	def_bool y</div><div class='del'>-	depends on ((MWINCHIP3D || MWINCHIP2 || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MVIAC7 || MGEODEGX1 || MGEODE_LX || MCORE2) &amp;&amp; !X86_NUMAQ) || X86_64</div><div class='add'>+	depends on ((MWINCHIP3D || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MVIAC7 || MGEODEGX1 || MGEODE_LX || MCORE2) &amp;&amp; !X86_NUMAQ) || X86_64</div><div class='ctx'> </div><div class='ctx'> config X86_CMPXCHG64</div><div class='ctx'> 	def_bool y</div><div class='hunk'>@@ -406,7 +397,7 @@ config X86_CMPXCHG64</div><div class='ctx'> # generates cmov.</div><div class='ctx'> config X86_CMOV</div><div class='ctx'> 	def_bool y</div><div class='del'>-	depends on (MK7 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || X86_64)</div><div class='add'>+	depends on (MK8 || MK7 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64)</div><div class='ctx'> </div><div class='ctx'> config X86_MINIMUM_CPU_FAMILY</div><div class='ctx'> 	int</div><div class='hunk'>@@ -417,4 +408,124 @@ config X86_MINIMUM_CPU_FAMILY</div><div class='ctx'> </div><div class='ctx'> config X86_DEBUGCTLMSR</div><div class='ctx'> 	def_bool y</div><div class='del'>-	depends on !(MK6 || MWINCHIPC6 || MWINCHIP2 || MWINCHIP3D || MCYRIXIII || M586MMX || M586TSC || M586 || M486 || M386)</div><div class='add'>+	depends on !(MK6 || MWINCHIPC6 || MWINCHIP3D || MCYRIXIII || M586MMX || M586TSC || M586 || M486 || M386)</div><div class='add'>+</div><div class='add'>+menuconfig PROCESSOR_SELECT</div><div class='add'>+	bool "Supported processor vendors" if EMBEDDED</div><div class='add'>+	help</div><div class='add'>+	  This lets you choose what x86 vendor support code your kernel</div><div class='add'>+	  will include.</div><div class='add'>+</div><div class='add'>+config CPU_SUP_INTEL</div><div class='add'>+	default y</div><div class='add'>+	bool "Support Intel processors" if PROCESSOR_SELECT</div><div class='add'>+	help</div><div class='add'>+	  This enables detection, tunings and quirks for Intel processors</div><div class='add'>+</div><div class='add'>+	  You need this enabled if you want your kernel to run on an</div><div class='add'>+	  Intel CPU. Disabling this option on other types of CPUs</div><div class='add'>+	  makes the kernel a tiny bit smaller. Disabling it on an Intel</div><div class='add'>+	  CPU might render the kernel unbootable.</div><div class='add'>+</div><div class='add'>+	  If unsure, say N.</div><div class='add'>+</div><div class='add'>+config CPU_SUP_CYRIX_32</div><div class='add'>+	default y</div><div class='add'>+	bool "Support Cyrix processors" if PROCESSOR_SELECT</div><div class='add'>+	depends on !64BIT</div><div class='add'>+	help</div><div class='add'>+	  This enables detection, tunings and quirks for Cyrix processors</div><div class='add'>+</div><div class='add'>+	  You need this enabled if you want your kernel to run on a</div><div class='add'>+	  Cyrix CPU. Disabling this option on other types of CPUs</div><div class='add'>+	  makes the kernel a tiny bit smaller. Disabling it on a Cyrix</div><div class='add'>+	  CPU might render the kernel unbootable.</div><div class='add'>+</div><div class='add'>+	  If unsure, say N.</div><div class='add'>+</div><div class='add'>+config CPU_SUP_AMD</div><div class='add'>+	default y</div><div class='add'>+	bool "Support AMD processors" if PROCESSOR_SELECT</div><div class='add'>+	help</div><div class='add'>+	  This enables detection, tunings and quirks for AMD processors</div><div class='add'>+</div><div class='add'>+	  You need this enabled if you want your kernel to run on an</div><div class='add'>+	  AMD CPU. Disabling this option on other types of CPUs</div><div class='add'>+	  makes the kernel a tiny bit smaller. Disabling it on an AMD</div><div class='add'>+	  CPU might render the kernel unbootable.</div><div class='add'>+</div><div class='add'>+	  If unsure, say N.</div><div class='add'>+</div><div class='add'>+config CPU_SUP_CENTAUR_32</div><div class='add'>+	default y</div><div class='add'>+	bool "Support Centaur processors" if PROCESSOR_SELECT</div><div class='add'>+	depends on !64BIT</div><div class='add'>+	help</div><div class='add'>+	  This enables detection, tunings and quirks for Centaur processors</div><div class='add'>+</div><div class='add'>+	  You need this enabled if you want your kernel to run on a</div><div class='add'>+	  Centaur CPU. Disabling this option on other types of CPUs</div><div class='add'>+	  makes the kernel a tiny bit smaller. Disabling it on a Centaur</div><div class='add'>+	  CPU might render the kernel unbootable.</div><div class='add'>+</div><div class='add'>+	  If unsure, say N.</div><div class='add'>+</div><div class='add'>+config CPU_SUP_CENTAUR_64</div><div class='add'>+	default y</div><div class='add'>+	bool "Support Centaur processors" if PROCESSOR_SELECT</div><div class='add'>+	depends on 64BIT</div><div class='add'>+	help</div><div class='add'>+	  This enables detection, tunings and quirks for Centaur processors</div><div class='add'>+</div><div class='add'>+	  You need this enabled if you want your kernel to run on a</div><div class='add'>+	  Centaur CPU. Disabling this option on other types of CPUs</div><div class='add'>+	  makes the kernel a tiny bit smaller. Disabling it on a Centaur</div><div class='add'>+	  CPU might render the kernel unbootable.</div><div class='add'>+</div><div class='add'>+	  If unsure, say N.</div><div class='add'>+</div><div class='add'>+config CPU_SUP_TRANSMETA_32</div><div class='add'>+	default y</div><div class='add'>+	bool "Support Transmeta processors" if PROCESSOR_SELECT</div><div class='add'>+	depends on !64BIT</div><div class='add'>+	help</div><div class='add'>+	  This enables detection, tunings and quirks for Transmeta processors</div><div class='add'>+</div><div class='add'>+	  You need this enabled if you want your kernel to run on a</div><div class='add'>+	  Transmeta CPU. Disabling this option on other types of CPUs</div><div class='add'>+	  makes the kernel a tiny bit smaller. Disabling it on a Transmeta</div><div class='add'>+	  CPU might render the kernel unbootable.</div><div class='add'>+</div><div class='add'>+	  If unsure, say N.</div><div class='add'>+</div><div class='add'>+config CPU_SUP_UMC_32</div><div class='add'>+	default y</div><div class='add'>+	bool "Support UMC processors" if PROCESSOR_SELECT</div><div class='add'>+	depends on !64BIT</div><div class='add'>+	help</div><div class='add'>+	  This enables detection, tunings and quirks for UMC processors</div><div class='add'>+</div><div class='add'>+	  You need this enabled if you want your kernel to run on a</div><div class='add'>+	  UMC CPU. Disabling this option on other types of CPUs</div><div class='add'>+	  makes the kernel a tiny bit smaller. Disabling it on a UMC</div><div class='add'>+	  CPU might render the kernel unbootable.</div><div class='add'>+</div><div class='add'>+	  If unsure, say N.</div><div class='add'>+</div><div class='add'>+config X86_DS</div><div class='add'>+	bool "Debug Store support"</div><div class='add'>+	default y</div><div class='add'>+	help</div><div class='add'>+	  Add support for Debug Store.</div><div class='add'>+	  This allows the kernel to provide a memory buffer to the hardware</div><div class='add'>+	  to store various profiling and tracing events.</div><div class='add'>+</div><div class='add'>+config X86_PTRACE_BTS</div><div class='add'>+	bool "ptrace interface to Branch Trace Store"</div><div class='add'>+	default y</div><div class='add'>+	depends on (X86_DS &amp;&amp; X86_DEBUGCTLMSR)</div><div class='add'>+	help</div><div class='add'>+	  Add a ptrace interface to allow collecting an execution trace</div><div class='add'>+	  of the traced task.</div><div class='add'>+	  This collects control flow changes in a (cyclic) buffer and allows</div><div class='add'>+	  debuggers to fill in the gaps and show an execution trace of the debuggee.</div><div class='head'>diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug<br/>index 092f019e033a..2a3dfbd5e677 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/Kconfig.debug?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/Kconfig.debug</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/Kconfig.debug?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/Kconfig.debug</a></div><div class='hunk'>@@ -43,6 +43,19 @@ config EARLY_PRINTK</div><div class='ctx'> 	  with klogd/syslogd or the X server. You should normally N here,</div><div class='ctx'> 	  unless you want to debug such a crash.</div><div class='ctx'> </div><div class='add'>+config EARLY_PRINTK_DBGP</div><div class='add'>+	bool "Early printk via EHCI debug port"</div><div class='add'>+	default n</div><div class='add'>+	depends on EARLY_PRINTK &amp;&amp; PCI</div><div class='add'>+	help</div><div class='add'>+	  Write kernel log output directly into the EHCI debug port.</div><div class='add'>+</div><div class='add'>+	  This is useful for kernel debugging when your machine crashes very</div><div class='add'>+	  early before the console code is initialized. For normal operation</div><div class='add'>+	  it is not recommended because it looks ugly and doesn't cooperate</div><div class='add'>+	  with klogd/syslogd or the X server. You should normally N here,</div><div class='add'>+	  unless you want to debug such a crash. You need usb debug device.</div><div class='add'>+</div><div class='ctx'> config DEBUG_STACKOVERFLOW</div><div class='ctx'> 	bool "Check for stack overflows"</div><div class='ctx'> 	depends on DEBUG_KERNEL</div><div class='head'>diff --git a/arch/x86/Makefile_32.cpu b/arch/x86/Makefile_32.cpu<br/>index e372b584e919..80177ec052f0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/Makefile_32.cpu?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/Makefile_32.cpu</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/Makefile_32.cpu?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/Makefile_32.cpu</a></div><div class='hunk'>@@ -28,7 +28,6 @@ cflags-$(CONFIG_MK8)		+= $(call cc-option,-march=k8,-march=athlon)</div><div class='ctx'> cflags-$(CONFIG_MCRUSOE)	+= -march=i686 $(align)-functions=0 $(align)-jumps=0 $(align)-loops=0</div><div class='ctx'> cflags-$(CONFIG_MEFFICEON)	+= -march=i686 $(call tune,pentium3) $(align)-functions=0 $(align)-jumps=0 $(align)-loops=0</div><div class='ctx'> cflags-$(CONFIG_MWINCHIPC6)	+= $(call cc-option,-march=winchip-c6,-march=i586)</div><div class='del'>-cflags-$(CONFIG_MWINCHIP2)	+= $(call cc-option,-march=winchip2,-march=i586)</div><div class='ctx'> cflags-$(CONFIG_MWINCHIP3D)	+= $(call cc-option,-march=winchip2,-march=i586)</div><div class='ctx'> cflags-$(CONFIG_MCYRIXIII)	+= $(call cc-option,-march=c3,-march=i486) $(align)-functions=0 $(align)-jumps=0 $(align)-loops=0</div><div class='ctx'> cflags-$(CONFIG_MVIAC3_2)	+= $(call cc-option,-march=c3-2,-march=i686)</div><div class='hunk'>@@ -45,3 +44,8 @@ cflags-$(CONFIG_MGEODEGX1)	+= -march=pentium-mmx</div><div class='ctx'> # cpu entries</div><div class='ctx'> cflags-$(CONFIG_X86_GENERIC) 	+= $(call tune,generic,$(call tune,i686))</div><div class='ctx'> </div><div class='add'>+# Bug fix for binutils: this option is required in order to keep</div><div class='add'>+# binutils from generating NOPL instructions against our will.</div><div class='add'>+ifneq ($(CONFIG_X86_P6_NOP),y)</div><div class='add'>+cflags-y			+= $(call cc-option,-Wa$(comma)-mtune=generic32,)</div><div class='add'>+endif</div><div class='head'>diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile<br/>index 7ee102f9c4f8..cd48c7210016 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/boot/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/boot/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/boot/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/boot/Makefile</a></div><div class='hunk'>@@ -72,9 +72,7 @@ KBUILD_CFLAGS	:= $(LINUXINCLUDE) -g -Os -D_SETUP -D__KERNEL__ \</div><div class='ctx'> KBUILD_CFLAGS +=   $(call cc-option,-m32)</div><div class='ctx'> KBUILD_AFLAGS	:= $(KBUILD_CFLAGS) -D__ASSEMBLY__</div><div class='ctx'> </div><div class='del'>-$(obj)/zImage:  IMAGE_OFFSET := 0x1000</div><div class='ctx'> $(obj)/zImage:  asflags-y := $(SVGA_MODE) $(RAMDISK)</div><div class='del'>-$(obj)/bzImage: IMAGE_OFFSET := 0x100000</div><div class='ctx'> $(obj)/bzImage: ccflags-y := -D__BIG_KERNEL__</div><div class='ctx'> $(obj)/bzImage: asflags-y := $(SVGA_MODE) $(RAMDISK) -D__BIG_KERNEL__</div><div class='ctx'> $(obj)/bzImage: BUILDFLAGS   := -b</div><div class='hunk'>@@ -117,7 +115,7 @@ $(obj)/setup.bin: $(obj)/setup.elf FORCE</div><div class='ctx'> 	$(call if_changed,objcopy)</div><div class='ctx'> </div><div class='ctx'> $(obj)/compressed/vmlinux: FORCE</div><div class='del'>-	$(Q)$(MAKE) $(build)=$(obj)/compressed IMAGE_OFFSET=$(IMAGE_OFFSET) $@</div><div class='add'>+	$(Q)$(MAKE) $(build)=$(obj)/compressed $@</div><div class='ctx'> </div><div class='ctx'> # Set this if you want to pass append arguments to the zdisk/fdimage/isoimage kernel</div><div class='ctx'> FDARGS =</div><div class='hunk'>@@ -181,6 +179,7 @@ isoimage: $(BOOTIMAGE)</div><div class='ctx'> 	mkisofs -J -r -o $(obj)/image.iso -b isolinux.bin -c boot.cat \</div><div class='ctx'> 		-no-emul-boot -boot-load-size 4 -boot-info-table \</div><div class='ctx'> 		$(obj)/isoimage</div><div class='add'>+	isohybrid $(obj)/image.iso 2&gt;/dev/null || true</div><div class='ctx'> 	rm -rf $(obj)/isoimage</div><div class='ctx'> </div><div class='ctx'> zlilo: $(BOOTIMAGE)</div><div class='head'>diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile<br/>index 92fdd35bd93e..1771c804e02f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/boot/compressed/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/boot/compressed/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/boot/compressed/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/boot/compressed/Makefile</a></div><div class='hunk'>@@ -27,9 +27,8 @@ $(obj)/vmlinux.bin: vmlinux FORCE</div><div class='ctx'> 	$(call if_changed,objcopy)</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-ifeq ($(CONFIG_X86_32),y)</div><div class='del'>-targets += vmlinux.bin.all vmlinux.relocs</div><div class='del'>-hostprogs-y := relocs</div><div class='add'>+targets += vmlinux.bin.all vmlinux.relocs relocs</div><div class='add'>+hostprogs-$(CONFIG_X86_32) += relocs</div><div class='ctx'> </div><div class='ctx'> quiet_cmd_relocs = RELOCS  $@</div><div class='ctx'>       cmd_relocs = $(obj)/relocs $&lt; &gt; $@;$(obj)/relocs --abs-relocs $&lt;</div><div class='hunk'>@@ -43,6 +42,8 @@ quiet_cmd_relocbin = BUILD   $@</div><div class='ctx'> $(obj)/vmlinux.bin.all: $(vmlinux.bin.all-y) FORCE</div><div class='ctx'> 	$(call if_changed,relocbin)</div><div class='ctx'> </div><div class='add'>+ifeq ($(CONFIG_X86_32),y)</div><div class='add'>+</div><div class='ctx'> ifdef CONFIG_RELOCATABLE</div><div class='ctx'> $(obj)/vmlinux.bin.gz: $(obj)/vmlinux.bin.all FORCE</div><div class='ctx'> 	$(call if_changed,gzip)</div><div class='hunk'>@@ -59,6 +60,5 @@ $(obj)/vmlinux.bin.gz: $(obj)/vmlinux.bin FORCE</div><div class='ctx'> LDFLAGS_piggy.o := -r --format binary --oformat elf64-x86-64 -T</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> $(obj)/piggy.o: $(obj)/vmlinux.scr $(obj)/vmlinux.bin.gz FORCE</div><div class='ctx'> 	$(call if_changed,ld)</div><div class='head'>diff --git a/arch/x86/boot/compressed/head_32.S b/arch/x86/boot/compressed/head_32.S<br/>index ba7736cf2ec7..29c5fbf08392 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/boot/compressed/head_32.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/boot/compressed/head_32.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/boot/compressed/head_32.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/boot/compressed/head_32.S</a></div><div class='hunk'>@@ -137,14 +137,15 @@ relocated:</div><div class='ctx'>  */</div><div class='ctx'> 	movl output_len(%ebx), %eax</div><div class='ctx'> 	pushl %eax</div><div class='add'>+			# push arguments for decompress_kernel:</div><div class='ctx'> 	pushl %ebp	# output address</div><div class='ctx'> 	movl input_len(%ebx), %eax</div><div class='ctx'> 	pushl %eax	# input_len</div><div class='ctx'> 	leal input_data(%ebx), %eax</div><div class='ctx'> 	pushl %eax	# input_data</div><div class='ctx'> 	leal boot_heap(%ebx), %eax</div><div class='del'>-	pushl %eax	# heap area as third argument</div><div class='del'>-	pushl %esi	# real mode pointer as second arg</div><div class='add'>+	pushl %eax	# heap area</div><div class='add'>+	pushl %esi	# real mode pointer</div><div class='ctx'> 	call decompress_kernel</div><div class='ctx'> 	addl $20, %esp</div><div class='ctx'> 	popl %ecx</div><div class='head'>diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c<br/>index 9fea73706479..5780d361105b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/boot/compressed/misc.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/boot/compressed/misc.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/boot/compressed/misc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/boot/compressed/misc.c</a></div><div class='hunk'>@@ -16,7 +16,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #undef CONFIG_PARAVIRT</div><div class='ctx'> #ifdef CONFIG_X86_32</div><div class='del'>-#define _ASM_DESC_H_ 1</div><div class='add'>+#define ASM_X86__DESC_H 1</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_X86_64</div><div class='hunk'>@@ -27,7 +27,7 @@</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;linux/screen_info.h&gt;</div><div class='ctx'> #include &lt;linux/elf.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/boot.h&gt;</div><div class='ctx'> #include &lt;asm/bootparam.h&gt;</div><div class='hunk'>@@ -251,7 +251,7 @@ static void __putstr(int error, const char *s)</div><div class='ctx'> 				y--;</div><div class='ctx'> 			}</div><div class='ctx'> 		} else {</div><div class='del'>-			vidmem [(x + cols * y) * 2] = c;</div><div class='add'>+			vidmem[(x + cols * y) * 2] = c;</div><div class='ctx'> 			if (++x &gt;= cols) {</div><div class='ctx'> 				x = 0;</div><div class='ctx'> 				if (++y &gt;= lines) {</div><div class='hunk'>@@ -277,7 +277,8 @@ static void *memset(void *s, int c, unsigned n)</div><div class='ctx'> 	int i;</div><div class='ctx'> 	char *ss = s;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; n; i++) ss[i] = c;</div><div class='add'>+	for (i = 0; i &lt; n; i++)</div><div class='add'>+		ss[i] = c;</div><div class='ctx'> 	return s;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -287,7 +288,8 @@ static void *memcpy(void *dest, const void *src, unsigned n)</div><div class='ctx'> 	const char *s = src;</div><div class='ctx'> 	char *d = dest;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; n; i++) d[i] = s[i];</div><div class='add'>+	for (i = 0; i &lt; n; i++)</div><div class='add'>+		d[i] = s[i];</div><div class='ctx'> 	return dest;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/boot/cpu.c b/arch/x86/boot/cpu.c<br/>index 75298fe2edca..6ec6bb6e9957 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/boot/cpu.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/boot/cpu.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/boot/cpu.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/boot/cpu.c</a></div><div class='hunk'>@@ -59,17 +59,18 @@ int validate_cpu(void)</div><div class='ctx'> 			u32 e = err_flags[i];</div><div class='ctx'> </div><div class='ctx'> 			for (j = 0; j &lt; 32; j++) {</div><div class='del'>-				int n = (i &lt;&lt; 5)+j;</div><div class='del'>-				if (*msg_strs &lt; n) {</div><div class='add'>+				if (msg_strs[0] &lt; i ||</div><div class='add'>+				    (msg_strs[0] == i &amp;&amp; msg_strs[1] &lt; j)) {</div><div class='ctx'> 					/* Skip to the next string */</div><div class='del'>-					do {</div><div class='del'>-						msg_strs++;</div><div class='del'>-					} while (*msg_strs);</div><div class='del'>-					msg_strs++;</div><div class='add'>+					msg_strs += 2;</div><div class='add'>+					while (*msg_strs++)</div><div class='add'>+						;</div><div class='ctx'> 				}</div><div class='ctx'> 				if (e &amp; 1) {</div><div class='del'>-					if (*msg_strs == n &amp;&amp; msg_strs[1])</div><div class='del'>-						printf("%s ", msg_strs+1);</div><div class='add'>+					if (msg_strs[0] == i &amp;&amp;</div><div class='add'>+					    msg_strs[1] == j &amp;&amp;</div><div class='add'>+					    msg_strs[2])</div><div class='add'>+						printf("%s ", msg_strs+2);</div><div class='ctx'> 					else</div><div class='ctx'> 						printf("%d:%d ", i, j);</div><div class='ctx'> 				}</div><div class='head'>diff --git a/arch/x86/boot/edd.c b/arch/x86/boot/edd.c<br/>index d93cbc6464d0..1aae8f3e5ca1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/boot/edd.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/boot/edd.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/boot/edd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/boot/edd.c</a></div><div class='hunk'>@@ -41,6 +41,7 @@ static u32 read_mbr_sig(u8 devno, struct edd_info *ei, u32 *mbrsig)</div><div class='ctx'> 	char *mbrbuf_ptr, *mbrbuf_end;</div><div class='ctx'> 	u32 buf_base, mbr_base;</div><div class='ctx'> 	extern char _end[];</div><div class='add'>+	u16 mbr_magic;</div><div class='ctx'> </div><div class='ctx'> 	sector_size = ei-&gt;params.bytes_per_sector;</div><div class='ctx'> 	if (!sector_size)</div><div class='hunk'>@@ -58,11 +59,15 @@ static u32 read_mbr_sig(u8 devno, struct edd_info *ei, u32 *mbrsig)</div><div class='ctx'> 	if (mbrbuf_end &gt; (char *)(size_t)boot_params.hdr.heap_end_ptr)</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='add'>+	memset(mbrbuf_ptr, 0, sector_size);</div><div class='ctx'> 	if (read_mbr(devno, mbrbuf_ptr))</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='ctx'> 	*mbrsig = *(u32 *)&amp;mbrbuf_ptr[EDD_MBR_SIG_OFFSET];</div><div class='del'>-	return 0;</div><div class='add'>+	mbr_magic = *(u16 *)&amp;mbrbuf_ptr[510];</div><div class='add'>+</div><div class='add'>+	/* check for valid MBR magic */</div><div class='add'>+	return mbr_magic == 0xAA55 ? 0 : -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int get_edd_info(u8 devno, struct edd_info *ei)</div><div class='head'>diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S<br/>index af86e431acfa..b993062e9a5f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/boot/header.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/boot/header.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/boot/header.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/boot/header.S</a></div><div class='hunk'>@@ -30,7 +30,6 @@ SYSSEG		= DEF_SYSSEG		/* system loaded at 0x10000 (65536) */</div><div class='ctx'> SYSSIZE		= DEF_SYSSIZE		/* system size: # of 16-byte clicks */</div><div class='ctx'> 					/* to be loaded */</div><div class='ctx'> ROOT_DEV	= 0			/* ROOT_DEV is now written by "build" */</div><div class='del'>-SWAP_DEV	= 0			/* SWAP_DEV is now written by "build" */</div><div class='ctx'> </div><div class='ctx'> #ifndef SVGA_MODE</div><div class='ctx'> #define SVGA_MODE ASK_VGA</div><div class='head'>diff --git a/arch/x86/boot/mkcpustr.c b/arch/x86/boot/mkcpustr.c<br/>index bbe76953bae9..8ef60f20b371 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/boot/mkcpustr.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/boot/mkcpustr.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/boot/mkcpustr.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/boot/mkcpustr.c</a></div><div class='hunk'>@@ -15,33 +15,33 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;stdio.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "../kernel/cpu/feature_names.c"</div><div class='del'>-</div><div class='del'>-#if NCAPFLAGS &gt; 8</div><div class='del'>-# error "Need to adjust the boot code handling of CPUID strings"</div><div class='del'>-#endif</div><div class='add'>+#include "../kernel/cpu/capflags.c"</div><div class='ctx'> </div><div class='ctx'> int main(void)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='add'>+	int i, j;</div><div class='ctx'> 	const char *str;</div><div class='ctx'> </div><div class='ctx'> 	printf("static const char x86_cap_strs[] = \n");</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; NCAPINTS*32; i++) {</div><div class='del'>-		str = x86_cap_flags[i];</div><div class='del'>-</div><div class='del'>-		if (i == NCAPINTS*32-1) {</div><div class='del'>-			/* The last entry must be unconditional; this</div><div class='del'>-			   also consumes the compiler-added null character */</div><div class='del'>-			if (!str)</div><div class='del'>-				str = "";</div><div class='del'>-			printf("\t\"\\x%02x\"\"%s\"\n", i, str);</div><div class='del'>-		} else if (str) {</div><div class='del'>-			printf("#if REQUIRED_MASK%d &amp; (1 &lt;&lt; %d)\n"</div><div class='del'>-			       "\t\"\\x%02x\"\"%s\\0\"\n"</div><div class='del'>-			       "#endif\n",</div><div class='del'>-			       i &gt;&gt; 5, i &amp; 31, i, str);</div><div class='add'>+	for (i = 0; i &lt; NCAPINTS; i++) {</div><div class='add'>+		for (j = 0; j &lt; 32; j++) {</div><div class='add'>+			str = x86_cap_flags[i*32+j];</div><div class='add'>+</div><div class='add'>+			if (i == NCAPINTS-1 &amp;&amp; j == 31) {</div><div class='add'>+				/* The last entry must be unconditional; this</div><div class='add'>+				   also consumes the compiler-added null</div><div class='add'>+				   character */</div><div class='add'>+				if (!str)</div><div class='add'>+					str = "";</div><div class='add'>+				printf("\t\"\\x%02x\\x%02x\"\"%s\"\n",</div><div class='add'>+				       i, j, str);</div><div class='add'>+			} else if (str) {</div><div class='add'>+				printf("#if REQUIRED_MASK%d &amp; (1 &lt;&lt; %d)\n"</div><div class='add'>+				       "\t\"\\x%02x\\x%02x\"\"%s\\0\"\n"</div><div class='add'>+				       "#endif\n",</div><div class='add'>+				       i, j, i, j, str);</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	printf("\t;\n");</div><div class='head'>diff --git a/arch/x86/boot/video-vesa.c b/arch/x86/boot/video-vesa.c<br/>index 401ad998ad08..99b3079dc6ab 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/boot/video-vesa.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/boot/video-vesa.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/boot/video-vesa.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/boot/video-vesa.c</a></div><div class='hunk'>@@ -88,14 +88,11 @@ static int vesa_probe(void)</div><div class='ctx'> 			   (vminfo.memory_layout == 4 ||</div><div class='ctx'> 			    vminfo.memory_layout == 6) &amp;&amp;</div><div class='ctx'> 			   vminfo.memory_planes == 1) {</div><div class='del'>-#ifdef CONFIG_FB</div><div class='add'>+#ifdef CONFIG_FB_BOOT_VESA_SUPPORT</div><div class='ctx'> 			/* Graphics mode, color, linear frame buffer</div><div class='ctx'> 			   supported.  Only register the mode if</div><div class='ctx'> 			   if framebuffer is configured, however,</div><div class='del'>-			   otherwise the user will be left without a screen.</div><div class='del'>-			   We don't require CONFIG_FB_VESA, however, since</div><div class='del'>-			   some of the other framebuffer drivers can use</div><div class='del'>-			   this mode-setting, too. */</div><div class='add'>+			   otherwise the user will be left without a screen. */</div><div class='ctx'> 			mi = GET_HEAP(struct mode_info, 1);</div><div class='ctx'> 			mi-&gt;mode = mode + VIDEO_FIRST_VESA;</div><div class='ctx'> 			mi-&gt;depth = vminfo.bpp;</div><div class='hunk'>@@ -133,10 +130,12 @@ static int vesa_set_mode(struct mode_info *mode)</div><div class='ctx'> 	if ((vminfo.mode_attr &amp; 0x15) == 0x05) {</div><div class='ctx'> 		/* It's a supported text mode */</div><div class='ctx'> 		is_graphic = 0;</div><div class='add'>+#ifdef CONFIG_FB_BOOT_VESA_SUPPORT</div><div class='ctx'> 	} else if ((vminfo.mode_attr &amp; 0x99) == 0x99) {</div><div class='ctx'> 		/* It's a graphics mode with linear frame buffer */</div><div class='ctx'> 		is_graphic = 1;</div><div class='ctx'> 		vesa_mode |= 0x4000; /* Request linear frame buffer */</div><div class='add'>+#endif</div><div class='ctx'> 	} else {</div><div class='ctx'> 		return -1;	/* Invalid mode */</div><div class='ctx'> 	}</div><div class='hunk'>@@ -224,7 +223,7 @@ static void vesa_store_pm_info(void)</div><div class='ctx'> static void vesa_store_mode_params_graphics(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* Tell the kernel we're in VESA graphics mode */</div><div class='del'>-	boot_params.screen_info.orig_video_isVGA = 0x23;</div><div class='add'>+	boot_params.screen_info.orig_video_isVGA = VIDEO_TYPE_VLFB;</div><div class='ctx'> </div><div class='ctx'> 	/* Mode parameters */</div><div class='ctx'> 	boot_params.screen_info.vesa_attributes = vminfo.mode_attr;</div><div class='head'>diff --git a/arch/x86/configs/i386_defconfig b/arch/x86/configs/i386_defconfig<br/>index 104275e191a8..52d0359719d7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/configs/i386_defconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/configs/i386_defconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/configs/i386_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/configs/i386_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.27-rc4</div><div class='del'>-# Mon Aug 25 15:04:00 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc5</div><div class='add'>+# Wed Sep  3 17:23:09 2008</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_64BIT is not set</div><div class='ctx'> CONFIG_X86_32=y</div><div class='hunk'>@@ -202,7 +202,7 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y</div><div class='ctx'> # CONFIG_M586 is not set</div><div class='ctx'> # CONFIG_M586TSC is not set</div><div class='ctx'> # CONFIG_M586MMX is not set</div><div class='del'>-# CONFIG_M686 is not set</div><div class='add'>+CONFIG_M686=y</div><div class='ctx'> # CONFIG_MPENTIUMII is not set</div><div class='ctx'> # CONFIG_MPENTIUMIII is not set</div><div class='ctx'> # CONFIG_MPENTIUMM is not set</div><div class='hunk'>@@ -213,7 +213,6 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y</div><div class='ctx'> # CONFIG_MCRUSOE is not set</div><div class='ctx'> # CONFIG_MEFFICEON is not set</div><div class='ctx'> # CONFIG_MWINCHIPC6 is not set</div><div class='del'>-# CONFIG_MWINCHIP2 is not set</div><div class='ctx'> # CONFIG_MWINCHIP3D is not set</div><div class='ctx'> # CONFIG_MGEODEGX1 is not set</div><div class='ctx'> # CONFIG_MGEODE_LX is not set</div><div class='hunk'>@@ -221,13 +220,14 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y</div><div class='ctx'> # CONFIG_MVIAC3_2 is not set</div><div class='ctx'> # CONFIG_MVIAC7 is not set</div><div class='ctx'> # CONFIG_MPSC is not set</div><div class='del'>-CONFIG_MCORE2=y</div><div class='add'>+# CONFIG_MCORE2 is not set</div><div class='ctx'> # CONFIG_GENERIC_CPU is not set</div><div class='ctx'> CONFIG_X86_GENERIC=y</div><div class='ctx'> CONFIG_X86_CPU=y</div><div class='ctx'> CONFIG_X86_CMPXCHG=y</div><div class='ctx'> CONFIG_X86_L1_CACHE_SHIFT=7</div><div class='ctx'> CONFIG_X86_XADD=y</div><div class='add'>+# CONFIG_X86_PPRO_FENCE is not set</div><div class='ctx'> CONFIG_X86_WP_WORKS_OK=y</div><div class='ctx'> CONFIG_X86_INVLPG=y</div><div class='ctx'> CONFIG_X86_BSWAP=y</div><div class='hunk'>@@ -235,14 +235,15 @@ CONFIG_X86_POPAD_OK=y</div><div class='ctx'> CONFIG_X86_INTEL_USERCOPY=y</div><div class='ctx'> CONFIG_X86_USE_PPRO_CHECKSUM=y</div><div class='ctx'> CONFIG_X86_TSC=y</div><div class='add'>+CONFIG_X86_CMOV=y</div><div class='ctx'> CONFIG_X86_MINIMUM_CPU_FAMILY=4</div><div class='ctx'> CONFIG_X86_DEBUGCTLMSR=y</div><div class='ctx'> CONFIG_HPET_TIMER=y</div><div class='ctx'> CONFIG_HPET_EMULATE_RTC=y</div><div class='ctx'> CONFIG_DMI=y</div><div class='ctx'> # CONFIG_IOMMU_HELPER is not set</div><div class='del'>-CONFIG_NR_CPUS=4</div><div class='del'>-# CONFIG_SCHED_SMT is not set</div><div class='add'>+CONFIG_NR_CPUS=64</div><div class='add'>+CONFIG_SCHED_SMT=y</div><div class='ctx'> CONFIG_SCHED_MC=y</div><div class='ctx'> # CONFIG_PREEMPT_NONE is not set</div><div class='ctx'> CONFIG_PREEMPT_VOLUNTARY=y</div><div class='hunk'>@@ -254,7 +255,8 @@ CONFIG_VM86=y</div><div class='ctx'> # CONFIG_TOSHIBA is not set</div><div class='ctx'> # CONFIG_I8K is not set</div><div class='ctx'> CONFIG_X86_REBOOTFIXUPS=y</div><div class='del'>-# CONFIG_MICROCODE is not set</div><div class='add'>+CONFIG_MICROCODE=y</div><div class='add'>+CONFIG_MICROCODE_OLD_INTERFACE=y</div><div class='ctx'> CONFIG_X86_MSR=y</div><div class='ctx'> CONFIG_X86_CPUID=y</div><div class='ctx'> # CONFIG_NOHIGHMEM is not set</div><div class='hunk'>@@ -1532,7 +1534,6 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=y</div><div class='ctx'> CONFIG_VGA_CONSOLE=y</div><div class='ctx'> CONFIG_VGACON_SOFT_SCROLLBACK=y</div><div class='ctx'> CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64</div><div class='del'>-CONFIG_VIDEO_SELECT=y</div><div class='ctx'> CONFIG_DUMMY_CONSOLE=y</div><div class='ctx'> # CONFIG_FRAMEBUFFER_CONSOLE is not set</div><div class='ctx'> CONFIG_LOGO=y</div><div class='hunk'>@@ -2115,7 +2116,7 @@ CONFIG_IO_DELAY_0X80=y</div><div class='ctx'> CONFIG_DEFAULT_IO_DELAY_TYPE=0</div><div class='ctx'> CONFIG_DEBUG_BOOT_PARAMS=y</div><div class='ctx'> # CONFIG_CPA_DEBUG is not set</div><div class='del'>-# CONFIG_OPTIMIZE_INLINING is not set</div><div class='add'>+CONFIG_OPTIMIZE_INLINING=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Security options</div><div class='head'>diff --git a/arch/x86/configs/x86_64_defconfig b/arch/x86/configs/x86_64_defconfig<br/>index 678c8acefe04..f0a03d7a7d63 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/configs/x86_64_defconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/configs/x86_64_defconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/configs/x86_64_defconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/configs/x86_64_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.27-rc4</div><div class='del'>-# Mon Aug 25 14:40:46 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc5</div><div class='add'>+# Wed Sep  3 17:13:39 2008</div><div class='ctx'> #</div><div class='ctx'> CONFIG_64BIT=y</div><div class='ctx'> # CONFIG_X86_32 is not set</div><div class='hunk'>@@ -210,7 +210,6 @@ CONFIG_X86_PC=y</div><div class='ctx'> # CONFIG_MCRUSOE is not set</div><div class='ctx'> # CONFIG_MEFFICEON is not set</div><div class='ctx'> # CONFIG_MWINCHIPC6 is not set</div><div class='del'>-# CONFIG_MWINCHIP2 is not set</div><div class='ctx'> # CONFIG_MWINCHIP3D is not set</div><div class='ctx'> # CONFIG_MGEODEGX1 is not set</div><div class='ctx'> # CONFIG_MGEODE_LX is not set</div><div class='hunk'>@@ -218,17 +217,14 @@ CONFIG_X86_PC=y</div><div class='ctx'> # CONFIG_MVIAC3_2 is not set</div><div class='ctx'> # CONFIG_MVIAC7 is not set</div><div class='ctx'> # CONFIG_MPSC is not set</div><div class='del'>-CONFIG_MCORE2=y</div><div class='del'>-# CONFIG_GENERIC_CPU is not set</div><div class='add'>+# CONFIG_MCORE2 is not set</div><div class='add'>+CONFIG_GENERIC_CPU=y</div><div class='ctx'> CONFIG_X86_CPU=y</div><div class='del'>-CONFIG_X86_L1_CACHE_BYTES=64</div><div class='del'>-CONFIG_X86_INTERNODE_CACHE_BYTES=64</div><div class='add'>+CONFIG_X86_L1_CACHE_BYTES=128</div><div class='add'>+CONFIG_X86_INTERNODE_CACHE_BYTES=128</div><div class='ctx'> CONFIG_X86_CMPXCHG=y</div><div class='del'>-CONFIG_X86_L1_CACHE_SHIFT=6</div><div class='add'>+CONFIG_X86_L1_CACHE_SHIFT=7</div><div class='ctx'> CONFIG_X86_WP_WORKS_OK=y</div><div class='del'>-CONFIG_X86_INTEL_USERCOPY=y</div><div class='del'>-CONFIG_X86_USE_PPRO_CHECKSUM=y</div><div class='del'>-CONFIG_X86_P6_NOP=y</div><div class='ctx'> CONFIG_X86_TSC=y</div><div class='ctx'> CONFIG_X86_CMPXCHG64=y</div><div class='ctx'> CONFIG_X86_CMOV=y</div><div class='hunk'>@@ -243,9 +239,8 @@ CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y</div><div class='ctx'> CONFIG_AMD_IOMMU=y</div><div class='ctx'> CONFIG_SWIOTLB=y</div><div class='ctx'> CONFIG_IOMMU_HELPER=y</div><div class='del'>-# CONFIG_MAXSMP is not set</div><div class='del'>-CONFIG_NR_CPUS=4</div><div class='del'>-# CONFIG_SCHED_SMT is not set</div><div class='add'>+CONFIG_NR_CPUS=64</div><div class='add'>+CONFIG_SCHED_SMT=y</div><div class='ctx'> CONFIG_SCHED_MC=y</div><div class='ctx'> # CONFIG_PREEMPT_NONE is not set</div><div class='ctx'> CONFIG_PREEMPT_VOLUNTARY=y</div><div class='hunk'>@@ -254,7 +249,8 @@ CONFIG_X86_LOCAL_APIC=y</div><div class='ctx'> CONFIG_X86_IO_APIC=y</div><div class='ctx'> # CONFIG_X86_MCE is not set</div><div class='ctx'> # CONFIG_I8K is not set</div><div class='del'>-# CONFIG_MICROCODE is not set</div><div class='add'>+CONFIG_MICROCODE=y</div><div class='add'>+CONFIG_MICROCODE_OLD_INTERFACE=y</div><div class='ctx'> CONFIG_X86_MSR=y</div><div class='ctx'> CONFIG_X86_CPUID=y</div><div class='ctx'> CONFIG_NUMA=y</div><div class='hunk'>@@ -290,7 +286,7 @@ CONFIG_BOUNCE=y</div><div class='ctx'> CONFIG_VIRT_TO_BUS=y</div><div class='ctx'> CONFIG_MTRR=y</div><div class='ctx'> # CONFIG_MTRR_SANITIZER is not set</div><div class='del'>-# CONFIG_X86_PAT is not set</div><div class='add'>+CONFIG_X86_PAT=y</div><div class='ctx'> CONFIG_EFI=y</div><div class='ctx'> CONFIG_SECCOMP=y</div><div class='ctx'> # CONFIG_HZ_100 is not set</div><div class='hunk'>@@ -1508,7 +1504,6 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=y</div><div class='ctx'> CONFIG_VGA_CONSOLE=y</div><div class='ctx'> CONFIG_VGACON_SOFT_SCROLLBACK=y</div><div class='ctx'> CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64</div><div class='del'>-CONFIG_VIDEO_SELECT=y</div><div class='ctx'> CONFIG_DUMMY_CONSOLE=y</div><div class='ctx'> # CONFIG_FRAMEBUFFER_CONSOLE is not set</div><div class='ctx'> CONFIG_LOGO=y</div><div class='hunk'>@@ -2089,7 +2084,7 @@ CONFIG_IO_DELAY_0X80=y</div><div class='ctx'> CONFIG_DEFAULT_IO_DELAY_TYPE=0</div><div class='ctx'> CONFIG_DEBUG_BOOT_PARAMS=y</div><div class='ctx'> # CONFIG_CPA_DEBUG is not set</div><div class='del'>-# CONFIG_OPTIMIZE_INLINING is not set</div><div class='add'>+CONFIG_OPTIMIZE_INLINING=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Security options</div><div class='head'>diff --git a/arch/x86/crypto/Makefile b/arch/x86/crypto/Makefile<br/>index 3874c2de5403..903de4aa5094 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/crypto/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/crypto/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/crypto/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/crypto/Makefile</a></div><div class='hunk'>@@ -10,6 +10,8 @@ obj-$(CONFIG_CRYPTO_AES_X86_64) += aes-x86_64.o</div><div class='ctx'> obj-$(CONFIG_CRYPTO_TWOFISH_X86_64) += twofish-x86_64.o</div><div class='ctx'> obj-$(CONFIG_CRYPTO_SALSA20_X86_64) += salsa20-x86_64.o</div><div class='ctx'> </div><div class='add'>+obj-$(CONFIG_CRYPTO_CRC32C_INTEL) += crc32c-intel.o</div><div class='add'>+</div><div class='ctx'> aes-i586-y := aes-i586-asm_32.o aes_glue.o</div><div class='ctx'> twofish-i586-y := twofish-i586-asm_32.o twofish_glue.o</div><div class='ctx'> salsa20-i586-y := salsa20-i586-asm_32.o salsa20_glue.o</div><div class='head'>diff --git a/arch/x86/crypto/crc32c-intel.c b/arch/x86/crypto/crc32c-intel.c<br/>new file mode 100644<br/>index 000000000000..070afc5b6c94<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/crypto/crc32c-intel.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/crypto/crc32c-intel.c</a></div><div class='hunk'>@@ -0,0 +1,197 @@</div><div class='add'>+/*</div><div class='add'>+ * Using hardware provided CRC32 instruction to accelerate the CRC32 disposal.</div><div class='add'>+ * CRC32C polynomial:0x1EDC6F41(BE)/0x82F63B78(LE)</div><div class='add'>+ * CRC32 is a new instruction in Intel SSE4.2, the reference can be found at:</div><div class='add'>+ * http://www.intel.com/products/processor/manuals/</div><div class='add'>+ * Intel(R) 64 and IA-32 Architectures Software Developer's Manual</div><div class='add'>+ * Volume 2A: Instruction Set Reference, A-M</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2008 Austin Zhang &lt;austin_zhang@linux.intel.com&gt;</div><div class='add'>+ * Copyright (c) 2008 Kent Liu &lt;kent.liu@intel.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms of the GNU General Public License as published by the Free</div><div class='add'>+ * Software Foundation; either version 2 of the License, or (at your option)</div><div class='add'>+ * any later version.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;crypto/internal/hash.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/cpufeature.h&gt;</div><div class='add'>+</div><div class='add'>+#define CHKSUM_BLOCK_SIZE	1</div><div class='add'>+#define CHKSUM_DIGEST_SIZE	4</div><div class='add'>+</div><div class='add'>+#define SCALE_F	sizeof(unsigned long)</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='add'>+#define REX_PRE "0x48, "</div><div class='add'>+#else</div><div class='add'>+#define REX_PRE</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static u32 crc32c_intel_le_hw_byte(u32 crc, unsigned char const *data, size_t length)</div><div class='add'>+{</div><div class='add'>+	while (length--) {</div><div class='add'>+		__asm__ __volatile__(</div><div class='add'>+			".byte 0xf2, 0xf, 0x38, 0xf0, 0xf1"</div><div class='add'>+			:"=S"(crc)</div><div class='add'>+			:"0"(crc), "c"(*data)</div><div class='add'>+		);</div><div class='add'>+		data++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return crc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 __pure crc32c_intel_le_hw(u32 crc, unsigned char const *p, size_t len)</div><div class='add'>+{</div><div class='add'>+	unsigned int iquotient = len / SCALE_F;</div><div class='add'>+	unsigned int iremainder = len % SCALE_F;</div><div class='add'>+	unsigned long *ptmp = (unsigned long *)p;</div><div class='add'>+</div><div class='add'>+	while (iquotient--) {</div><div class='add'>+		__asm__ __volatile__(</div><div class='add'>+			".byte 0xf2, " REX_PRE "0xf, 0x38, 0xf1, 0xf1;"</div><div class='add'>+			:"=S"(crc)</div><div class='add'>+			:"0"(crc), "c"(*ptmp)</div><div class='add'>+		);</div><div class='add'>+		ptmp++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (iremainder)</div><div class='add'>+		crc = crc32c_intel_le_hw_byte(crc, (unsigned char *)ptmp,</div><div class='add'>+				 iremainder);</div><div class='add'>+</div><div class='add'>+	return crc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Setting the seed allows arbitrary accumulators and flexible XOR policy</div><div class='add'>+ * If your algorithm starts with ~0, then XOR with ~0 before you set</div><div class='add'>+ * the seed.</div><div class='add'>+ */</div><div class='add'>+static int crc32c_intel_setkey(struct crypto_ahash *hash, const u8 *key,</div><div class='add'>+			unsigned int keylen)</div><div class='add'>+{</div><div class='add'>+	u32 *mctx = crypto_ahash_ctx(hash);</div><div class='add'>+</div><div class='add'>+	if (keylen != sizeof(u32)) {</div><div class='add'>+		crypto_ahash_set_flags(hash, CRYPTO_TFM_RES_BAD_KEY_LEN);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	*mctx = le32_to_cpup((__le32 *)key);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int crc32c_intel_init(struct ahash_request *req)</div><div class='add'>+{</div><div class='add'>+	u32 *mctx = crypto_ahash_ctx(crypto_ahash_reqtfm(req));</div><div class='add'>+	u32 *crcp = ahash_request_ctx(req);</div><div class='add'>+</div><div class='add'>+	*crcp = *mctx;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int crc32c_intel_update(struct ahash_request *req)</div><div class='add'>+{</div><div class='add'>+	struct crypto_hash_walk walk;</div><div class='add'>+	u32 *crcp = ahash_request_ctx(req);</div><div class='add'>+	u32 crc = *crcp;</div><div class='add'>+	int nbytes;</div><div class='add'>+</div><div class='add'>+	for (nbytes = crypto_hash_walk_first(req, &amp;walk); nbytes;</div><div class='add'>+	   nbytes = crypto_hash_walk_done(&amp;walk, 0))</div><div class='add'>+	crc = crc32c_intel_le_hw(crc, walk.data, nbytes);</div><div class='add'>+</div><div class='add'>+	*crcp = crc;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int crc32c_intel_final(struct ahash_request *req)</div><div class='add'>+{</div><div class='add'>+	u32 *crcp = ahash_request_ctx(req);</div><div class='add'>+</div><div class='add'>+	*(__le32 *)req-&gt;result = ~cpu_to_le32p(crcp);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int crc32c_intel_digest(struct ahash_request *req)</div><div class='add'>+{</div><div class='add'>+	struct crypto_hash_walk walk;</div><div class='add'>+	u32 *mctx = crypto_ahash_ctx(crypto_ahash_reqtfm(req));</div><div class='add'>+	u32 crc = *mctx;</div><div class='add'>+	int nbytes;</div><div class='add'>+</div><div class='add'>+	for (nbytes = crypto_hash_walk_first(req, &amp;walk); nbytes;</div><div class='add'>+	   nbytes = crypto_hash_walk_done(&amp;walk, 0))</div><div class='add'>+		crc = crc32c_intel_le_hw(crc, walk.data, nbytes);</div><div class='add'>+</div><div class='add'>+	*(__le32 *)req-&gt;result = ~cpu_to_le32(crc);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int crc32c_intel_cra_init(struct crypto_tfm *tfm)</div><div class='add'>+{</div><div class='add'>+	u32 *key = crypto_tfm_ctx(tfm);</div><div class='add'>+</div><div class='add'>+	*key = ~0;</div><div class='add'>+</div><div class='add'>+	tfm-&gt;crt_ahash.reqsize = sizeof(u32);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct crypto_alg alg = {</div><div class='add'>+	.cra_name               =       "crc32c",</div><div class='add'>+	.cra_driver_name        =       "crc32c-intel",</div><div class='add'>+	.cra_priority           =       200,</div><div class='add'>+	.cra_flags              =       CRYPTO_ALG_TYPE_AHASH,</div><div class='add'>+	.cra_blocksize          =       CHKSUM_BLOCK_SIZE,</div><div class='add'>+	.cra_alignmask          =       3,</div><div class='add'>+	.cra_ctxsize            =       sizeof(u32),</div><div class='add'>+	.cra_module             =       THIS_MODULE,</div><div class='add'>+	.cra_list               =       LIST_HEAD_INIT(alg.cra_list),</div><div class='add'>+	.cra_init               =       crc32c_intel_cra_init,</div><div class='add'>+	.cra_type               =       &amp;crypto_ahash_type,</div><div class='add'>+	.cra_u                  =       {</div><div class='add'>+		.ahash = {</div><div class='add'>+			.digestsize    =       CHKSUM_DIGEST_SIZE,</div><div class='add'>+			.setkey        =       crc32c_intel_setkey,</div><div class='add'>+			.init          =       crc32c_intel_init,</div><div class='add'>+			.update        =       crc32c_intel_update,</div><div class='add'>+			.final         =       crc32c_intel_final,</div><div class='add'>+			.digest        =       crc32c_intel_digest,</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int __init crc32c_intel_mod_init(void)</div><div class='add'>+{</div><div class='add'>+	if (cpu_has_xmm4_2)</div><div class='add'>+		return crypto_register_alg(&amp;alg);</div><div class='add'>+	else</div><div class='add'>+		return -ENODEV;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit crc32c_intel_mod_fini(void)</div><div class='add'>+{</div><div class='add'>+	crypto_unregister_alg(&amp;alg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(crc32c_intel_mod_init);</div><div class='add'>+module_exit(crc32c_intel_mod_fini);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Austin Zhang &lt;austin.zhang@intel.com&gt;, Kent Liu &lt;kent.liu@intel.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("CRC32c (Castagnoli) optimization using Intel Hardware.");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='add'>+MODULE_ALIAS("crc32c");</div><div class='add'>+MODULE_ALIAS("crc32c-intel");</div><div class='add'>+</div><div class='head'>diff --git a/arch/x86/ia32/ia32_aout.c b/arch/x86/ia32/ia32_aout.c<br/>index a0e1dbe67dc1..127ec3f07214 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/ia32/ia32_aout.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/ia32/ia32_aout.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/ia32/ia32_aout.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/ia32/ia32_aout.c</a></div><div class='hunk'>@@ -85,8 +85,10 @@ static void dump_thread32(struct pt_regs *regs, struct user32 *dump)</div><div class='ctx'> 	dump-&gt;regs.ax = regs-&gt;ax;</div><div class='ctx'> 	dump-&gt;regs.ds = current-&gt;thread.ds;</div><div class='ctx'> 	dump-&gt;regs.es = current-&gt;thread.es;</div><div class='del'>-	asm("movl %%fs,%0" : "=r" (fs)); dump-&gt;regs.fs = fs;</div><div class='del'>-	asm("movl %%gs,%0" : "=r" (gs)); dump-&gt;regs.gs = gs;</div><div class='add'>+	savesegment(fs, fs);</div><div class='add'>+	dump-&gt;regs.fs = fs;</div><div class='add'>+	savesegment(gs, gs);</div><div class='add'>+	dump-&gt;regs.gs = gs;</div><div class='ctx'> 	dump-&gt;regs.orig_ax = regs-&gt;orig_ax;</div><div class='ctx'> 	dump-&gt;regs.ip = regs-&gt;ip;</div><div class='ctx'> 	dump-&gt;regs.cs = regs-&gt;cs;</div><div class='hunk'>@@ -430,8 +432,9 @@ beyond_if:</div><div class='ctx'> 	current-&gt;mm-&gt;start_stack =</div><div class='ctx'> 		(unsigned long)create_aout_tables((char __user *)bprm-&gt;p, bprm);</div><div class='ctx'> 	/* start thread */</div><div class='del'>-	asm volatile("movl %0,%%fs" :: "r" (0)); \</div><div class='del'>-	asm volatile("movl %0,%%es; movl %0,%%ds": :"r" (__USER32_DS));</div><div class='add'>+	loadsegment(fs, 0);</div><div class='add'>+	loadsegment(ds, __USER32_DS);</div><div class='add'>+	loadsegment(es, __USER32_DS);</div><div class='ctx'> 	load_gs_index(0);</div><div class='ctx'> 	(regs)-&gt;ip = ex.a_entry;</div><div class='ctx'> 	(regs)-&gt;sp = current-&gt;mm-&gt;start_stack;</div><div class='head'>diff --git a/arch/x86/ia32/ia32_signal.c b/arch/x86/ia32/ia32_signal.c<br/>index 20af4c79579a..4bc02b23674b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/ia32/ia32_signal.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/ia32/ia32_signal.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/ia32/ia32_signal.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/ia32/ia32_signal.c</a></div><div class='hunk'>@@ -179,9 +179,10 @@ struct sigframe</div><div class='ctx'> 	u32 pretcode;</div><div class='ctx'> 	int sig;</div><div class='ctx'> 	struct sigcontext_ia32 sc;</div><div class='del'>-	struct _fpstate_ia32 fpstate;</div><div class='add'>+	struct _fpstate_ia32 fpstate_unused; /* look at kernel/sigframe.h */</div><div class='ctx'> 	unsigned int extramask[_COMPAT_NSIG_WORDS-1];</div><div class='ctx'> 	char retcode[8];</div><div class='add'>+	/* fp state follows here */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct rt_sigframe</div><div class='hunk'>@@ -192,8 +193,8 @@ struct rt_sigframe</div><div class='ctx'> 	u32 puc;</div><div class='ctx'> 	compat_siginfo_t info;</div><div class='ctx'> 	struct ucontext_ia32 uc;</div><div class='del'>-	struct _fpstate_ia32 fpstate;</div><div class='ctx'> 	char retcode[8];</div><div class='add'>+	/* fp state follows here */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define COPY(x)		{ 		\</div><div class='hunk'>@@ -206,7 +207,7 @@ struct rt_sigframe</div><div class='ctx'> 	{ unsigned int cur;						\</div><div class='ctx'> 	  unsigned short pre;						\</div><div class='ctx'> 	  err |= __get_user(pre, &amp;sc-&gt;seg);				\</div><div class='del'>-	  asm volatile("movl %%" #seg ",%0" : "=r" (cur));		\</div><div class='add'>+	  savesegment(seg, cur);					\</div><div class='ctx'> 	  pre |= mask;							\</div><div class='ctx'> 	  if (pre != cur) loadsegment(seg, pre); }</div><div class='ctx'> </div><div class='hunk'>@@ -215,7 +216,7 @@ static int ia32_restore_sigcontext(struct pt_regs *regs,</div><div class='ctx'> 				   unsigned int *peax)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int tmpflags, gs, oldgs, err = 0;</div><div class='del'>-	struct _fpstate_ia32 __user *buf;</div><div class='add'>+	void __user *buf;</div><div class='ctx'> 	u32 tmp;</div><div class='ctx'> </div><div class='ctx'> 	/* Always make any pending restarted system calls return -EINTR */</div><div class='hunk'>@@ -235,7 +236,7 @@ static int ia32_restore_sigcontext(struct pt_regs *regs,</div><div class='ctx'> 	 */</div><div class='ctx'> 	err |= __get_user(gs, &amp;sc-&gt;gs);</div><div class='ctx'> 	gs |= 3;</div><div class='del'>-	asm("movl %%gs,%0" : "=r" (oldgs));</div><div class='add'>+	savesegment(gs, oldgs);</div><div class='ctx'> 	if (gs != oldgs)</div><div class='ctx'> 		load_gs_index(gs);</div><div class='ctx'> </div><div class='hunk'>@@ -259,26 +260,12 @@ static int ia32_restore_sigcontext(struct pt_regs *regs,</div><div class='ctx'> </div><div class='ctx'> 	err |= __get_user(tmp, &amp;sc-&gt;fpstate);</div><div class='ctx'> 	buf = compat_ptr(tmp);</div><div class='del'>-	if (buf) {</div><div class='del'>-		if (!access_ok(VERIFY_READ, buf, sizeof(*buf)))</div><div class='del'>-			goto badframe;</div><div class='del'>-		err |= restore_i387_ia32(buf);</div><div class='del'>-	} else {</div><div class='del'>-		struct task_struct *me = current;</div><div class='del'>-</div><div class='del'>-		if (used_math()) {</div><div class='del'>-			clear_fpu(me);</div><div class='del'>-			clear_used_math();</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	err |= restore_i387_xstate_ia32(buf);</div><div class='ctx'> </div><div class='ctx'> 	err |= __get_user(tmp, &amp;sc-&gt;ax);</div><div class='ctx'> 	*peax = tmp;</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='del'>-</div><div class='del'>-badframe:</div><div class='del'>-	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> asmlinkage long sys32_sigreturn(struct pt_regs *regs)</div><div class='hunk'>@@ -350,46 +337,42 @@ badframe:</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static int ia32_setup_sigcontext(struct sigcontext_ia32 __user *sc,</div><div class='del'>-				 struct _fpstate_ia32 __user *fpstate,</div><div class='add'>+				 void __user *fpstate,</div><div class='ctx'> 				 struct pt_regs *regs, unsigned int mask)</div><div class='ctx'> {</div><div class='ctx'> 	int tmp, err = 0;</div><div class='ctx'> </div><div class='del'>-	tmp = 0;</div><div class='del'>-	__asm__("movl %%gs,%0" : "=r"(tmp): "0"(tmp));</div><div class='add'>+	savesegment(gs, tmp);</div><div class='ctx'> 	err |= __put_user(tmp, (unsigned int __user *)&amp;sc-&gt;gs);</div><div class='del'>-	__asm__("movl %%fs,%0" : "=r"(tmp): "0"(tmp));</div><div class='add'>+	savesegment(fs, tmp);</div><div class='ctx'> 	err |= __put_user(tmp, (unsigned int __user *)&amp;sc-&gt;fs);</div><div class='del'>-	__asm__("movl %%ds,%0" : "=r"(tmp): "0"(tmp));</div><div class='add'>+	savesegment(ds, tmp);</div><div class='ctx'> 	err |= __put_user(tmp, (unsigned int __user *)&amp;sc-&gt;ds);</div><div class='del'>-	__asm__("movl %%es,%0" : "=r"(tmp): "0"(tmp));</div><div class='add'>+	savesegment(es, tmp);</div><div class='ctx'> 	err |= __put_user(tmp, (unsigned int __user *)&amp;sc-&gt;es);</div><div class='ctx'> </div><div class='del'>-	err |= __put_user((u32)regs-&gt;di, &amp;sc-&gt;di);</div><div class='del'>-	err |= __put_user((u32)regs-&gt;si, &amp;sc-&gt;si);</div><div class='del'>-	err |= __put_user((u32)regs-&gt;bp, &amp;sc-&gt;bp);</div><div class='del'>-	err |= __put_user((u32)regs-&gt;sp, &amp;sc-&gt;sp);</div><div class='del'>-	err |= __put_user((u32)regs-&gt;bx, &amp;sc-&gt;bx);</div><div class='del'>-	err |= __put_user((u32)regs-&gt;dx, &amp;sc-&gt;dx);</div><div class='del'>-	err |= __put_user((u32)regs-&gt;cx, &amp;sc-&gt;cx);</div><div class='del'>-	err |= __put_user((u32)regs-&gt;ax, &amp;sc-&gt;ax);</div><div class='del'>-	err |= __put_user((u32)regs-&gt;cs, &amp;sc-&gt;cs);</div><div class='del'>-	err |= __put_user((u32)regs-&gt;ss, &amp;sc-&gt;ss);</div><div class='add'>+	err |= __put_user(regs-&gt;di, &amp;sc-&gt;di);</div><div class='add'>+	err |= __put_user(regs-&gt;si, &amp;sc-&gt;si);</div><div class='add'>+	err |= __put_user(regs-&gt;bp, &amp;sc-&gt;bp);</div><div class='add'>+	err |= __put_user(regs-&gt;sp, &amp;sc-&gt;sp);</div><div class='add'>+	err |= __put_user(regs-&gt;bx, &amp;sc-&gt;bx);</div><div class='add'>+	err |= __put_user(regs-&gt;dx, &amp;sc-&gt;dx);</div><div class='add'>+	err |= __put_user(regs-&gt;cx, &amp;sc-&gt;cx);</div><div class='add'>+	err |= __put_user(regs-&gt;ax, &amp;sc-&gt;ax);</div><div class='add'>+	err |= __put_user(regs-&gt;cs, &amp;sc-&gt;cs);</div><div class='add'>+	err |= __put_user(regs-&gt;ss, &amp;sc-&gt;ss);</div><div class='ctx'> 	err |= __put_user(current-&gt;thread.trap_no, &amp;sc-&gt;trapno);</div><div class='ctx'> 	err |= __put_user(current-&gt;thread.error_code, &amp;sc-&gt;err);</div><div class='del'>-	err |= __put_user((u32)regs-&gt;ip, &amp;sc-&gt;ip);</div><div class='del'>-	err |= __put_user((u32)regs-&gt;flags, &amp;sc-&gt;flags);</div><div class='del'>-	err |= __put_user((u32)regs-&gt;sp, &amp;sc-&gt;sp_at_signal);</div><div class='add'>+	err |= __put_user(regs-&gt;ip, &amp;sc-&gt;ip);</div><div class='add'>+	err |= __put_user(regs-&gt;flags, &amp;sc-&gt;flags);</div><div class='add'>+	err |= __put_user(regs-&gt;sp, &amp;sc-&gt;sp_at_signal);</div><div class='ctx'> </div><div class='del'>-	tmp = save_i387_ia32(fpstate);</div><div class='add'>+	tmp = save_i387_xstate_ia32(fpstate);</div><div class='ctx'> 	if (tmp &lt; 0)</div><div class='ctx'> 		err = -EFAULT;</div><div class='del'>-	else {</div><div class='del'>-		clear_used_math();</div><div class='del'>-		stts();</div><div class='add'>+	else</div><div class='ctx'> 		err |= __put_user(ptr_to_compat(tmp ? fpstate : NULL),</div><div class='ctx'> 					&amp;sc-&gt;fpstate);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	/* non-iBCS2 extensions.. */</div><div class='ctx'> 	err |= __put_user(mask, &amp;sc-&gt;oldmask);</div><div class='hunk'>@@ -402,7 +385,8 @@ static int ia32_setup_sigcontext(struct sigcontext_ia32 __user *sc,</div><div class='ctx'>  * Determine which stack to use..</div><div class='ctx'>  */</div><div class='ctx'> static void __user *get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,</div><div class='del'>-				 size_t frame_size)</div><div class='add'>+				 size_t frame_size,</div><div class='add'>+				 void **fpstate)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long sp;</div><div class='ctx'> </div><div class='hunk'>@@ -421,6 +405,11 @@ static void __user *get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,</div><div class='ctx'> 		 ka-&gt;sa.sa_restorer)</div><div class='ctx'> 		sp = (unsigned long) ka-&gt;sa.sa_restorer;</div><div class='ctx'> </div><div class='add'>+	if (used_math()) {</div><div class='add'>+		sp = sp - sig_xstate_ia32_size;</div><div class='add'>+		*fpstate = (struct _fpstate_ia32 *) sp;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	sp -= frame_size;</div><div class='ctx'> 	/* Align the stack pointer according to the i386 ABI,</div><div class='ctx'> 	 * i.e. so that on function entry ((sp + 4) &amp; 15) == 0. */</div><div class='hunk'>@@ -434,6 +423,7 @@ int ia32_setup_frame(int sig, struct k_sigaction *ka,</div><div class='ctx'> 	struct sigframe __user *frame;</div><div class='ctx'> 	void __user *restorer;</div><div class='ctx'> 	int err = 0;</div><div class='add'>+	void __user *fpstate = NULL;</div><div class='ctx'> </div><div class='ctx'> 	/* copy_to_user optimizes that into a single 8 byte store */</div><div class='ctx'> 	static const struct {</div><div class='hunk'>@@ -448,25 +438,21 @@ int ia32_setup_frame(int sig, struct k_sigaction *ka,</div><div class='ctx'> 		0,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	frame = get_sigframe(ka, regs, sizeof(*frame));</div><div class='add'>+	frame = get_sigframe(ka, regs, sizeof(*frame), &amp;fpstate);</div><div class='ctx'> </div><div class='ctx'> 	if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))</div><div class='del'>-		goto give_sigsegv;</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-	err |= __put_user(sig, &amp;frame-&gt;sig);</div><div class='del'>-	if (err)</div><div class='del'>-		goto give_sigsegv;</div><div class='add'>+	if (__put_user(sig, &amp;frame-&gt;sig))</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-	err |= ia32_setup_sigcontext(&amp;frame-&gt;sc, &amp;frame-&gt;fpstate, regs,</div><div class='del'>-					set-&gt;sig[0]);</div><div class='del'>-	if (err)</div><div class='del'>-		goto give_sigsegv;</div><div class='add'>+	if (ia32_setup_sigcontext(&amp;frame-&gt;sc, fpstate, regs, set-&gt;sig[0]))</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	if (_COMPAT_NSIG_WORDS &gt; 1) {</div><div class='del'>-		err |= __copy_to_user(frame-&gt;extramask, &amp;set-&gt;sig[1],</div><div class='del'>-				      sizeof(frame-&gt;extramask));</div><div class='del'>-		if (err)</div><div class='del'>-			goto give_sigsegv;</div><div class='add'>+		if (__copy_to_user(frame-&gt;extramask, &amp;set-&gt;sig[1],</div><div class='add'>+				   sizeof(frame-&gt;extramask)))</div><div class='add'>+			return -EFAULT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ka-&gt;sa.sa_flags &amp; SA_RESTORER) {</div><div class='hunk'>@@ -487,7 +473,7 @@ int ia32_setup_frame(int sig, struct k_sigaction *ka,</div><div class='ctx'> 	 */</div><div class='ctx'> 	err |= __copy_to_user(frame-&gt;retcode, &amp;code, 8);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto give_sigsegv;</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	/* Set up registers for signal handler */</div><div class='ctx'> 	regs-&gt;sp = (unsigned long) frame;</div><div class='hunk'>@@ -498,8 +484,8 @@ int ia32_setup_frame(int sig, struct k_sigaction *ka,</div><div class='ctx'> 	regs-&gt;dx = 0;</div><div class='ctx'> 	regs-&gt;cx = 0;</div><div class='ctx'> </div><div class='del'>-	asm volatile("movl %0,%%ds" :: "r" (__USER32_DS));</div><div class='del'>-	asm volatile("movl %0,%%es" :: "r" (__USER32_DS));</div><div class='add'>+	loadsegment(ds, __USER32_DS);</div><div class='add'>+	loadsegment(es, __USER32_DS);</div><div class='ctx'> </div><div class='ctx'> 	regs-&gt;cs = __USER32_CS;</div><div class='ctx'> 	regs-&gt;ss = __USER32_DS;</div><div class='hunk'>@@ -510,10 +496,6 @@ int ia32_setup_frame(int sig, struct k_sigaction *ka,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='del'>-give_sigsegv:</div><div class='del'>-	force_sigsegv(sig, current);</div><div class='del'>-	return -EFAULT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,</div><div class='hunk'>@@ -522,6 +504,7 @@ int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,</div><div class='ctx'> 	struct rt_sigframe __user *frame;</div><div class='ctx'> 	void __user *restorer;</div><div class='ctx'> 	int err = 0;</div><div class='add'>+	void __user *fpstate = NULL;</div><div class='ctx'> </div><div class='ctx'> 	/* __copy_to_user optimizes that into a single 8 byte store */</div><div class='ctx'> 	static const struct {</div><div class='hunk'>@@ -537,30 +520,33 @@ int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,</div><div class='ctx'> 		0,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	frame = get_sigframe(ka, regs, sizeof(*frame));</div><div class='add'>+	frame = get_sigframe(ka, regs, sizeof(*frame), &amp;fpstate);</div><div class='ctx'> </div><div class='ctx'> 	if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))</div><div class='del'>-		goto give_sigsegv;</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	err |= __put_user(sig, &amp;frame-&gt;sig);</div><div class='ctx'> 	err |= __put_user(ptr_to_compat(&amp;frame-&gt;info), &amp;frame-&gt;pinfo);</div><div class='ctx'> 	err |= __put_user(ptr_to_compat(&amp;frame-&gt;uc), &amp;frame-&gt;puc);</div><div class='ctx'> 	err |= copy_siginfo_to_user32(&amp;frame-&gt;info, info);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto give_sigsegv;</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	/* Create the ucontext.  */</div><div class='del'>-	err |= __put_user(0, &amp;frame-&gt;uc.uc_flags);</div><div class='add'>+	if (cpu_has_xsave)</div><div class='add'>+		err |= __put_user(UC_FP_XSTATE, &amp;frame-&gt;uc.uc_flags);</div><div class='add'>+	else</div><div class='add'>+		err |= __put_user(0, &amp;frame-&gt;uc.uc_flags);</div><div class='ctx'> 	err |= __put_user(0, &amp;frame-&gt;uc.uc_link);</div><div class='ctx'> 	err |= __put_user(current-&gt;sas_ss_sp, &amp;frame-&gt;uc.uc_stack.ss_sp);</div><div class='ctx'> 	err |= __put_user(sas_ss_flags(regs-&gt;sp),</div><div class='ctx'> 			  &amp;frame-&gt;uc.uc_stack.ss_flags);</div><div class='ctx'> 	err |= __put_user(current-&gt;sas_ss_size, &amp;frame-&gt;uc.uc_stack.ss_size);</div><div class='del'>-	err |= ia32_setup_sigcontext(&amp;frame-&gt;uc.uc_mcontext, &amp;frame-&gt;fpstate,</div><div class='add'>+	err |= ia32_setup_sigcontext(&amp;frame-&gt;uc.uc_mcontext, fpstate,</div><div class='ctx'> 				     regs, set-&gt;sig[0]);</div><div class='ctx'> 	err |= __copy_to_user(&amp;frame-&gt;uc.uc_sigmask, set, sizeof(*set));</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto give_sigsegv;</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	if (ka-&gt;sa.sa_flags &amp; SA_RESTORER)</div><div class='ctx'> 		restorer = ka-&gt;sa.sa_restorer;</div><div class='hunk'>@@ -575,7 +561,7 @@ int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,</div><div class='ctx'> 	 */</div><div class='ctx'> 	err |= __copy_to_user(frame-&gt;retcode, &amp;code, 8);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto give_sigsegv;</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	/* Set up registers for signal handler */</div><div class='ctx'> 	regs-&gt;sp = (unsigned long) frame;</div><div class='hunk'>@@ -591,8 +577,8 @@ int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,</div><div class='ctx'> 	regs-&gt;dx = (unsigned long) &amp;frame-&gt;info;</div><div class='ctx'> 	regs-&gt;cx = (unsigned long) &amp;frame-&gt;uc;</div><div class='ctx'> </div><div class='del'>-	asm volatile("movl %0,%%ds" :: "r" (__USER32_DS));</div><div class='del'>-	asm volatile("movl %0,%%es" :: "r" (__USER32_DS));</div><div class='add'>+	loadsegment(ds, __USER32_DS);</div><div class='add'>+	loadsegment(es, __USER32_DS);</div><div class='ctx'> </div><div class='ctx'> 	regs-&gt;cs = __USER32_CS;</div><div class='ctx'> 	regs-&gt;ss = __USER32_DS;</div><div class='hunk'>@@ -603,8 +589,4 @@ int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='del'>-give_sigsegv:</div><div class='del'>-	force_sigsegv(sig, current);</div><div class='del'>-	return -EFAULT;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S<br/>index ffc1bb4fed7d..256b00b61892 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/ia32/ia32entry.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/ia32/ia32entry.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/ia32/ia32entry.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/ia32/ia32entry.S</a></div><div class='hunk'>@@ -39,11 +39,11 @@</div><div class='ctx'> 	.endm </div><div class='ctx'> </div><div class='ctx'> 	/* clobbers %eax */	</div><div class='del'>-	.macro  CLEAR_RREGS</div><div class='add'>+	.macro  CLEAR_RREGS _r9=rax</div><div class='ctx'> 	xorl 	%eax,%eax</div><div class='ctx'> 	movq	%rax,R11(%rsp)</div><div class='ctx'> 	movq	%rax,R10(%rsp)</div><div class='del'>-	movq	%rax,R9(%rsp)</div><div class='add'>+	movq	%\_r9,R9(%rsp)</div><div class='ctx'> 	movq	%rax,R8(%rsp)</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='hunk'>@@ -52,11 +52,10 @@</div><div class='ctx'> 	 * We don't reload %eax because syscall_trace_enter() returned</div><div class='ctx'> 	 * the value it wants us to use in the table lookup.</div><div class='ctx'> 	 */</div><div class='del'>-	.macro LOAD_ARGS32 offset</div><div class='del'>-	movl \offset(%rsp),%r11d</div><div class='del'>-	movl \offset+8(%rsp),%r10d</div><div class='add'>+	.macro LOAD_ARGS32 offset, _r9=0</div><div class='add'>+	.if \_r9</div><div class='ctx'> 	movl \offset+16(%rsp),%r9d</div><div class='del'>-	movl \offset+24(%rsp),%r8d</div><div class='add'>+	.endif</div><div class='ctx'> 	movl \offset+40(%rsp),%ecx</div><div class='ctx'> 	movl \offset+48(%rsp),%edx</div><div class='ctx'> 	movl \offset+56(%rsp),%esi</div><div class='hunk'>@@ -145,7 +144,7 @@ ENTRY(ia32_sysenter_target)</div><div class='ctx'> 	SAVE_ARGS 0,0,1</div><div class='ctx'>  	/* no need to do an access_ok check here because rbp has been</div><div class='ctx'>  	   32bit zero extended */ </div><div class='del'>-1:	movl	(%rbp),%r9d</div><div class='add'>+1:	movl	(%rbp),%ebp</div><div class='ctx'>  	.section __ex_table,"a"</div><div class='ctx'>  	.quad 1b,ia32_badarg</div><div class='ctx'>  	.previous	</div><div class='hunk'>@@ -157,7 +156,7 @@ ENTRY(ia32_sysenter_target)</div><div class='ctx'> 	cmpl	$(IA32_NR_syscalls-1),%eax</div><div class='ctx'> 	ja	ia32_badsys</div><div class='ctx'> sysenter_do_call:</div><div class='del'>-	IA32_ARG_FIXUP 1</div><div class='add'>+	IA32_ARG_FIXUP</div><div class='ctx'> sysenter_dispatch:</div><div class='ctx'> 	call	*ia32_sys_call_table(,%rax,8)</div><div class='ctx'> 	movq	%rax,RAX-ARGOFFSET(%rsp)</div><div class='hunk'>@@ -234,20 +233,17 @@ sysexit_audit:</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> sysenter_tracesys:</div><div class='del'>-	xchgl	%r9d,%ebp</div><div class='ctx'> #ifdef CONFIG_AUDITSYSCALL</div><div class='ctx'> 	testl	$(_TIF_WORK_SYSCALL_ENTRY &amp; ~_TIF_SYSCALL_AUDIT),TI_flags(%r10)</div><div class='ctx'> 	jz	sysenter_auditsys</div><div class='ctx'> #endif</div><div class='ctx'> 	SAVE_REST</div><div class='ctx'> 	CLEAR_RREGS</div><div class='del'>-	movq	%r9,R9(%rsp)</div><div class='ctx'> 	movq	$-ENOSYS,RAX(%rsp)/* ptrace can change this for a bad syscall */</div><div class='ctx'> 	movq	%rsp,%rdi        /* &amp;pt_regs -&gt; arg1 */</div><div class='ctx'> 	call	syscall_trace_enter</div><div class='ctx'> 	LOAD_ARGS32 ARGOFFSET  /* reload args from stack in case ptrace changed it */</div><div class='ctx'> 	RESTORE_REST</div><div class='del'>-	xchgl	%ebp,%r9d</div><div class='ctx'> 	cmpl	$(IA32_NR_syscalls-1),%eax</div><div class='ctx'> 	ja	int_ret_from_sys_call /* sysenter_tracesys has set RAX(%rsp) */</div><div class='ctx'> 	jmp	sysenter_do_call</div><div class='hunk'>@@ -314,9 +310,9 @@ ENTRY(ia32_cstar_target)</div><div class='ctx'> 	testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r10)</div><div class='ctx'> 	CFI_REMEMBER_STATE</div><div class='ctx'> 	jnz   cstar_tracesys</div><div class='del'>-cstar_do_call:	</div><div class='ctx'> 	cmpl $IA32_NR_syscalls-1,%eax</div><div class='ctx'> 	ja  ia32_badsys</div><div class='add'>+cstar_do_call:</div><div class='ctx'> 	IA32_ARG_FIXUP 1</div><div class='ctx'> cstar_dispatch:</div><div class='ctx'> 	call *ia32_sys_call_table(,%rax,8)</div><div class='hunk'>@@ -357,15 +353,13 @@ cstar_tracesys:</div><div class='ctx'> #endif</div><div class='ctx'> 	xchgl %r9d,%ebp</div><div class='ctx'> 	SAVE_REST</div><div class='del'>-	CLEAR_RREGS</div><div class='del'>-	movq %r9,R9(%rsp)</div><div class='add'>+	CLEAR_RREGS r9</div><div class='ctx'> 	movq $-ENOSYS,RAX(%rsp)	/* ptrace can change this for a bad syscall */</div><div class='ctx'> 	movq %rsp,%rdi        /* &amp;pt_regs -&gt; arg1 */</div><div class='ctx'> 	call syscall_trace_enter</div><div class='del'>-	LOAD_ARGS32 ARGOFFSET  /* reload args from stack in case ptrace changed it */</div><div class='add'>+	LOAD_ARGS32 ARGOFFSET, 1  /* reload args from stack in case ptrace changed it */</div><div class='ctx'> 	RESTORE_REST</div><div class='ctx'> 	xchgl %ebp,%r9d</div><div class='del'>-	movl RSP-ARGOFFSET(%rsp), %r8d</div><div class='ctx'> 	cmpl $(IA32_NR_syscalls-1),%eax</div><div class='ctx'> 	ja int_ret_from_sys_call /* cstar_tracesys has set RAX(%rsp) */</div><div class='ctx'> 	jmp cstar_do_call</div><div class='hunk'>@@ -577,8 +571,8 @@ ia32_sys_call_table:</div><div class='ctx'> 	.quad compat_sys_setrlimit	/* 75 */</div><div class='ctx'> 	.quad compat_sys_old_getrlimit	/* old_getrlimit */</div><div class='ctx'> 	.quad compat_sys_getrusage</div><div class='del'>-	.quad sys32_gettimeofday</div><div class='del'>-	.quad sys32_settimeofday</div><div class='add'>+	.quad compat_sys_gettimeofday</div><div class='add'>+	.quad compat_sys_settimeofday</div><div class='ctx'> 	.quad sys_getgroups16	/* 80 */</div><div class='ctx'> 	.quad sys_setgroups16</div><div class='ctx'> 	.quad sys32_old_select</div><div class='head'>diff --git a/arch/x86/ia32/sys_ia32.c b/arch/x86/ia32/sys_ia32.c<br/>index d3c64088b981..2e09dcd3c0a6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/ia32/sys_ia32.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/ia32/sys_ia32.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/ia32/sys_ia32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/ia32/sys_ia32.c</a></div><div class='hunk'>@@ -49,41 +49,6 @@</div><div class='ctx'> </div><div class='ctx'> #define AA(__x)		((unsigned long)(__x))</div><div class='ctx'> </div><div class='del'>-int cp_compat_stat(struct kstat *kbuf, struct compat_stat __user *ubuf)</div><div class='del'>-{</div><div class='del'>-	compat_ino_t ino;</div><div class='del'>-</div><div class='del'>-	typeof(ubuf-&gt;st_uid) uid = 0;</div><div class='del'>-	typeof(ubuf-&gt;st_gid) gid = 0;</div><div class='del'>-	SET_UID(uid, kbuf-&gt;uid);</div><div class='del'>-	SET_GID(gid, kbuf-&gt;gid);</div><div class='del'>-	if (!old_valid_dev(kbuf-&gt;dev) || !old_valid_dev(kbuf-&gt;rdev))</div><div class='del'>-		return -EOVERFLOW;</div><div class='del'>-	if (kbuf-&gt;size &gt;= 0x7fffffff)</div><div class='del'>-		return -EOVERFLOW;</div><div class='del'>-	ino = kbuf-&gt;ino;</div><div class='del'>-	if (sizeof(ino) &lt; sizeof(kbuf-&gt;ino) &amp;&amp; ino != kbuf-&gt;ino)</div><div class='del'>-		return -EOVERFLOW;</div><div class='del'>-	if (!access_ok(VERIFY_WRITE, ubuf, sizeof(struct compat_stat)) ||</div><div class='del'>-	    __put_user(old_encode_dev(kbuf-&gt;dev), &amp;ubuf-&gt;st_dev) ||</div><div class='del'>-	    __put_user(ino, &amp;ubuf-&gt;st_ino) ||</div><div class='del'>-	    __put_user(kbuf-&gt;mode, &amp;ubuf-&gt;st_mode) ||</div><div class='del'>-	    __put_user(kbuf-&gt;nlink, &amp;ubuf-&gt;st_nlink) ||</div><div class='del'>-	    __put_user(uid, &amp;ubuf-&gt;st_uid) ||</div><div class='del'>-	    __put_user(gid, &amp;ubuf-&gt;st_gid) ||</div><div class='del'>-	    __put_user(old_encode_dev(kbuf-&gt;rdev), &amp;ubuf-&gt;st_rdev) ||</div><div class='del'>-	    __put_user(kbuf-&gt;size, &amp;ubuf-&gt;st_size) ||</div><div class='del'>-	    __put_user(kbuf-&gt;atime.tv_sec, &amp;ubuf-&gt;st_atime) ||</div><div class='del'>-	    __put_user(kbuf-&gt;atime.tv_nsec, &amp;ubuf-&gt;st_atime_nsec) ||</div><div class='del'>-	    __put_user(kbuf-&gt;mtime.tv_sec, &amp;ubuf-&gt;st_mtime) ||</div><div class='del'>-	    __put_user(kbuf-&gt;mtime.tv_nsec, &amp;ubuf-&gt;st_mtime_nsec) ||</div><div class='del'>-	    __put_user(kbuf-&gt;ctime.tv_sec, &amp;ubuf-&gt;st_ctime) ||</div><div class='del'>-	    __put_user(kbuf-&gt;ctime.tv_nsec, &amp;ubuf-&gt;st_ctime_nsec) ||</div><div class='del'>-	    __put_user(kbuf-&gt;blksize, &amp;ubuf-&gt;st_blksize) ||</div><div class='del'>-	    __put_user(kbuf-&gt;blocks, &amp;ubuf-&gt;st_blocks))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='ctx'> </div><div class='ctx'> asmlinkage long sys32_truncate64(char __user *filename,</div><div class='ctx'> 				 unsigned long offset_low,</div><div class='hunk'>@@ -402,75 +367,11 @@ asmlinkage long sys32_rt_sigprocmask(int how, compat_sigset_t __user *set,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline long get_tv32(struct timeval *o, struct compat_timeval __user *i)</div><div class='del'>-{</div><div class='del'>-	int err = -EFAULT;</div><div class='del'>-</div><div class='del'>-	if (access_ok(VERIFY_READ, i, sizeof(*i))) {</div><div class='del'>-		err = __get_user(o-&gt;tv_sec, &amp;i-&gt;tv_sec);</div><div class='del'>-		err |= __get_user(o-&gt;tv_usec, &amp;i-&gt;tv_usec);</div><div class='del'>-	}</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline long put_tv32(struct compat_timeval __user *o, struct timeval *i)</div><div class='del'>-{</div><div class='del'>-	int err = -EFAULT;</div><div class='del'>-</div><div class='del'>-	if (access_ok(VERIFY_WRITE, o, sizeof(*o))) {</div><div class='del'>-		err = __put_user(i-&gt;tv_sec, &amp;o-&gt;tv_sec);</div><div class='del'>-		err |= __put_user(i-&gt;tv_usec, &amp;o-&gt;tv_usec);</div><div class='del'>-	}</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> asmlinkage long sys32_alarm(unsigned int seconds)</div><div class='ctx'> {</div><div class='ctx'> 	return alarm_setitimer(seconds);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Translations due to time_t size differences. Which affects all</div><div class='del'>- * sorts of things, like timeval and itimerval.</div><div class='del'>- */</div><div class='del'>-asmlinkage long sys32_gettimeofday(struct compat_timeval __user *tv,</div><div class='del'>-				   struct timezone __user *tz)</div><div class='del'>-{</div><div class='del'>-	if (tv) {</div><div class='del'>-		struct timeval ktv;</div><div class='del'>-</div><div class='del'>-		do_gettimeofday(&amp;ktv);</div><div class='del'>-		if (put_tv32(tv, &amp;ktv))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-	}</div><div class='del'>-	if (tz) {</div><div class='del'>-		if (copy_to_user(tz, &amp;sys_tz, sizeof(sys_tz)))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-asmlinkage long sys32_settimeofday(struct compat_timeval __user *tv,</div><div class='del'>-				   struct timezone __user *tz)</div><div class='del'>-{</div><div class='del'>-	struct timeval ktv;</div><div class='del'>-	struct timespec kts;</div><div class='del'>-	struct timezone ktz;</div><div class='del'>-</div><div class='del'>-	if (tv) {</div><div class='del'>-		if (get_tv32(&amp;ktv, tv))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		kts.tv_sec = ktv.tv_sec;</div><div class='del'>-		kts.tv_nsec = ktv.tv_usec * NSEC_PER_USEC;</div><div class='del'>-	}</div><div class='del'>-	if (tz) {</div><div class='del'>-		if (copy_from_user(&amp;ktz, tz, sizeof(ktz)))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return do_sys_settimeofday(tv ? &amp;kts : NULL, tz ? &amp;ktz : NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> struct sel_arg_struct {</div><div class='ctx'> 	unsigned int n;</div><div class='ctx'> 	unsigned int inp;</div><div class='hunk'>@@ -556,15 +457,6 @@ asmlinkage long sys32_rt_sigqueueinfo(int pid, int sig,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* These are here just in case some old ia32 binary calls it. */</div><div class='del'>-asmlinkage long sys32_pause(void)</div><div class='del'>-{</div><div class='del'>-	current-&gt;state = TASK_INTERRUPTIBLE;</div><div class='del'>-	schedule();</div><div class='del'>-	return -ERESTARTNOHAND;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_SYSCTL_SYSCALL</div><div class='ctx'> struct sysctl_ia32 {</div><div class='ctx'> 	unsigned int	name;</div><div class='head'>diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile<br/>index 3db651fc8ec5..0d41f0343dc0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/Makefile</a></div><div class='hunk'>@@ -10,7 +10,7 @@ ifdef CONFIG_FTRACE</div><div class='ctx'> # Do not profile debug and lowlevel utilities</div><div class='ctx'> CFLAGS_REMOVE_tsc.o = -pg</div><div class='ctx'> CFLAGS_REMOVE_rtc.o = -pg</div><div class='del'>-CFLAGS_REMOVE_paravirt.o = -pg</div><div class='add'>+CFLAGS_REMOVE_paravirt-spinlocks.o = -pg</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -23,7 +23,7 @@ CFLAGS_hpet.o		:= $(nostackp)</div><div class='ctx'> CFLAGS_tsc.o		:= $(nostackp)</div><div class='ctx'> </div><div class='ctx'> obj-y			:= process_$(BITS).o signal_$(BITS).o entry_$(BITS).o</div><div class='del'>-obj-y			+= traps_$(BITS).o irq_$(BITS).o</div><div class='add'>+obj-y			+= traps.o irq_$(BITS).o dumpstack_$(BITS).o</div><div class='ctx'> obj-y			+= time_$(BITS).o ioport.o ldt.o</div><div class='ctx'> obj-y			+= setup.o i8259.o irqinit_$(BITS).o setup_percpu.o</div><div class='ctx'> obj-$(CONFIG_X86_VISWS)	+= visws_quirks.o</div><div class='hunk'>@@ -38,7 +38,7 @@ obj-y			+= tsc.o io_delay.o rtc.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_X86_TRAMPOLINE)	+= trampoline.o</div><div class='ctx'> obj-y				+= process.o</div><div class='del'>-obj-y				+= i387.o</div><div class='add'>+obj-y				+= i387.o xsave.o</div><div class='ctx'> obj-y				+= ptrace.o</div><div class='ctx'> obj-y				+= ds.o</div><div class='ctx'> obj-$(CONFIG_X86_32)		+= tls.o</div><div class='hunk'>@@ -51,7 +51,6 @@ obj-$(CONFIG_X86_BIOS_REBOOT)	+= reboot.o</div><div class='ctx'> obj-$(CONFIG_MCA)		+= mca_32.o</div><div class='ctx'> obj-$(CONFIG_X86_MSR)		+= msr.o</div><div class='ctx'> obj-$(CONFIG_X86_CPUID)		+= cpuid.o</div><div class='del'>-obj-$(CONFIG_MICROCODE)		+= microcode.o</div><div class='ctx'> obj-$(CONFIG_PCI)		+= early-quirks.o</div><div class='ctx'> apm-y				:= apm_32.o</div><div class='ctx'> obj-$(CONFIG_APM)		+= apm.o</div><div class='hunk'>@@ -69,6 +68,7 @@ obj-$(CONFIG_KEXEC)		+= machine_kexec_$(BITS).o</div><div class='ctx'> obj-$(CONFIG_KEXEC)		+= relocate_kernel_$(BITS).o crash.o</div><div class='ctx'> obj-$(CONFIG_CRASH_DUMP)	+= crash_dump_$(BITS).o</div><div class='ctx'> obj-$(CONFIG_X86_NUMAQ)		+= numaq_32.o</div><div class='add'>+obj-$(CONFIG_X86_ES7000)	+= es7000_32.o</div><div class='ctx'> obj-$(CONFIG_X86_SUMMIT_NUMA)	+= summit_32.o</div><div class='ctx'> obj-y				+= vsmp_64.o</div><div class='ctx'> obj-$(CONFIG_KPROBES)		+= kprobes.o</div><div class='hunk'>@@ -89,7 +89,7 @@ obj-$(CONFIG_DEBUG_NX_TEST)	+= test_nx.o</div><div class='ctx'> obj-$(CONFIG_VMI)		+= vmi_32.o vmiclock_32.o</div><div class='ctx'> obj-$(CONFIG_KVM_GUEST)		+= kvm.o</div><div class='ctx'> obj-$(CONFIG_KVM_CLOCK)		+= kvmclock.o</div><div class='del'>-obj-$(CONFIG_PARAVIRT)		+= paravirt.o paravirt_patch_$(BITS).o</div><div class='add'>+obj-$(CONFIG_PARAVIRT)		+= paravirt.o paravirt_patch_$(BITS).o paravirt-spinlocks.o</div><div class='ctx'> obj-$(CONFIG_PARAVIRT_CLOCK)	+= pvclock.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_PCSPKR_PLATFORM)	+= pcspeaker.o</div><div class='hunk'>@@ -99,11 +99,18 @@ scx200-y			+= scx200_32.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_OLPC)		+= olpc.o</div><div class='ctx'> </div><div class='add'>+microcode-y				:= microcode_core.o</div><div class='add'>+microcode-$(CONFIG_MICROCODE_INTEL)	+= microcode_intel.o</div><div class='add'>+microcode-$(CONFIG_MICROCODE_AMD)	+= microcode_amd.o</div><div class='add'>+obj-$(CONFIG_MICROCODE)			+= microcode.o</div><div class='add'>+</div><div class='ctx'> ###</div><div class='ctx'> # 64 bit specific files</div><div class='ctx'> ifeq ($(CONFIG_X86_64),y)</div><div class='ctx'>         obj-y				+= genapic_64.o genapic_flat_64.o genx2apic_uv_x.o tlb_uv.o</div><div class='ctx'> 	obj-y				+= bios_uv.o</div><div class='add'>+        obj-y				+= genx2apic_cluster.o</div><div class='add'>+        obj-y				+= genx2apic_phys.o</div><div class='ctx'>         obj-$(CONFIG_X86_PM_TIMER)	+= pmtimer_64.o</div><div class='ctx'>         obj-$(CONFIG_AUDIT)		+= audit_64.o</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c<br/>index c102af85df9c..eb875cdc7367 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/acpi/boot.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/acpi/boot.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/acpi/boot.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/acpi/boot.c</a></div><div class='hunk'>@@ -58,7 +58,6 @@ EXPORT_SYMBOL(acpi_disabled);</div><div class='ctx'> #ifdef	CONFIG_X86_64</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/proto.h&gt;</div><div class='del'>-#include &lt;asm/genapic.h&gt;</div><div class='ctx'> </div><div class='ctx'> #else				/* X86 */</div><div class='ctx'> </div><div class='hunk'>@@ -97,8 +96,6 @@ static u64 acpi_lapic_addr __initdata = APIC_DEFAULT_PHYS_BASE;</div><div class='ctx'> #warning ACPI uses CMPXCHG, i486 and later hardware</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static int acpi_mcfg_64bit_base_addr __initdata = FALSE;</div><div class='del'>-</div><div class='ctx'> /* --------------------------------------------------------------------------</div><div class='ctx'>                               Boot-time Configuration</div><div class='ctx'>    -------------------------------------------------------------------------- */</div><div class='hunk'>@@ -160,6 +157,8 @@ char *__init __acpi_map_table(unsigned long phys, unsigned long size)</div><div class='ctx'> struct acpi_mcfg_allocation *pci_mmcfg_config;</div><div class='ctx'> int pci_mmcfg_config_num;</div><div class='ctx'> </div><div class='add'>+static int acpi_mcfg_64bit_base_addr __initdata = FALSE;</div><div class='add'>+</div><div class='ctx'> static int __init acpi_mcfg_oem_check(struct acpi_table_mcfg *mcfg)</div><div class='ctx'> {</div><div class='ctx'> 	if (!strcmp(mcfg-&gt;header.oem_id, "SGI"))</div><div class='hunk'>@@ -253,10 +252,8 @@ static void __cpuinit acpi_register_lapic(int id, u8 enabled)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_X86_32</div><div class='ctx'> 	if (boot_cpu_physical_apicid != -1U)</div><div class='ctx'> 		ver = apic_version[boot_cpu_physical_apicid];</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> 	generic_processor_info(id, ver);</div><div class='ctx'> }</div><div class='hunk'>@@ -775,11 +772,9 @@ static void __init acpi_register_lapic_address(unsigned long address)</div><div class='ctx'> </div><div class='ctx'> 	set_fixmap_nocache(FIX_APIC_BASE, address);</div><div class='ctx'> 	if (boot_cpu_physical_apicid == -1U) {</div><div class='del'>-		boot_cpu_physical_apicid  = GET_APIC_ID(read_apic_id());</div><div class='del'>-#ifdef CONFIG_X86_32</div><div class='add'>+		boot_cpu_physical_apicid  = read_apic_id();</div><div class='ctx'> 		apic_version[boot_cpu_physical_apicid] =</div><div class='ctx'> 			 GET_APIC_VERSION(apic_read(APIC_LVR));</div><div class='del'>-#endif</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1351,7 +1346,9 @@ static void __init acpi_process_madt(void)</div><div class='ctx'> 				acpi_ioapic = 1;</div><div class='ctx'> </div><div class='ctx'> 				smp_found_config = 1;</div><div class='add'>+#ifdef CONFIG_X86_32</div><div class='ctx'> 				setup_apic_routing();</div><div class='add'>+#endif</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		if (error == -EINVAL) {</div><div class='hunk'>@@ -1421,8 +1418,16 @@ static int __init force_acpi_ht(const struct dmi_system_id *d)</div><div class='ctx'>  */</div><div class='ctx'> static int __init dmi_ignore_irq0_timer_override(const struct dmi_system_id *d)</div><div class='ctx'> {</div><div class='del'>-	pr_notice("%s detected: Ignoring BIOS IRQ0 pin2 override\n", d-&gt;ident);</div><div class='del'>-	acpi_skip_timer_override = 1;</div><div class='add'>+	/*</div><div class='add'>+	 * The ati_ixp4x0_rev() early PCI quirk should have set</div><div class='add'>+	 * the acpi_skip_timer_override flag already:</div><div class='add'>+	 */</div><div class='add'>+	if (!acpi_skip_timer_override) {</div><div class='add'>+		WARN(1, KERN_ERR "ati_ixp4x0 quirk not complete.\n");</div><div class='add'>+		pr_notice("%s detected: Ignoring BIOS IRQ0 pin2 override\n",</div><div class='add'>+			d-&gt;ident);</div><div class='add'>+		acpi_skip_timer_override = 1;</div><div class='add'>+	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c<br/>index 65a0c1b48696..a84ac7b570e6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/alternative.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/alternative.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/alternative.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/alternative.c</a></div><div class='hunk'>@@ -231,25 +231,25 @@ static void alternatives_smp_lock(u8 **start, u8 **end, u8 *text, u8 *text_end)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		if (*ptr &gt; text_end)</div><div class='ctx'> 			continue;</div><div class='del'>-		text_poke(*ptr, ((unsigned char []){0xf0}), 1); /* add lock prefix */</div><div class='add'>+		/* turn DS segment override prefix into lock prefix */</div><div class='add'>+		text_poke(*ptr, ((unsigned char []){0xf0}), 1);</div><div class='ctx'> 	};</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void alternatives_smp_unlock(u8 **start, u8 **end, u8 *text, u8 *text_end)</div><div class='ctx'> {</div><div class='ctx'> 	u8 **ptr;</div><div class='del'>-	char insn[1];</div><div class='ctx'> </div><div class='ctx'> 	if (noreplace_smp)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	add_nops(insn, 1);</div><div class='ctx'> 	for (ptr = start; ptr &lt; end; ptr++) {</div><div class='ctx'> 		if (*ptr &lt; text)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		if (*ptr &gt; text_end)</div><div class='ctx'> 			continue;</div><div class='del'>-		text_poke(*ptr, insn, 1);</div><div class='add'>+		/* turn lock prefix into DS segment override prefix */</div><div class='add'>+		text_poke(*ptr, ((unsigned char []){0x3E}), 1);</div><div class='ctx'> 	};</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -444,7 +444,7 @@ void __init alternative_instructions(void)</div><div class='ctx'> 					    _text, _etext);</div><div class='ctx'> </div><div class='ctx'> 		/* Only switch to UP mode if we don't immediately boot others */</div><div class='del'>-		if (num_possible_cpus() == 1 || setup_max_cpus &lt;= 1)</div><div class='add'>+		if (num_present_cpus() == 1 || setup_max_cpus &lt;= 1)</div><div class='ctx'> 			alternatives_smp_switch(0);</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/x86/kernel/amd_iommu.c b/arch/x86/kernel/amd_iommu.c<br/>index 042fdc27bc92..a8fd9ebdc8e2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/amd_iommu.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/amd_iommu.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/amd_iommu.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/amd_iommu.c</a></div><div class='hunk'>@@ -33,6 +33,10 @@</div><div class='ctx'> </div><div class='ctx'> static DEFINE_RWLOCK(amd_iommu_devtable_lock);</div><div class='ctx'> </div><div class='add'>+/* A list of preallocated protection domains */</div><div class='add'>+static LIST_HEAD(iommu_pd_list);</div><div class='add'>+static DEFINE_SPINLOCK(iommu_pd_list_lock);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * general struct to manage commands send to an IOMMU</div><div class='ctx'>  */</div><div class='hunk'>@@ -51,6 +55,102 @@ static int iommu_has_npcache(struct amd_iommu *iommu)</div><div class='ctx'> </div><div class='ctx'> /****************************************************************************</div><div class='ctx'>  *</div><div class='add'>+ * Interrupt handling functions</div><div class='add'>+ *</div><div class='add'>+ ****************************************************************************/</div><div class='add'>+</div><div class='add'>+static void iommu_print_event(void *__evt)</div><div class='add'>+{</div><div class='add'>+	u32 *event = __evt;</div><div class='add'>+	int type  = (event[1] &gt;&gt; EVENT_TYPE_SHIFT)  &amp; EVENT_TYPE_MASK;</div><div class='add'>+	int devid = (event[0] &gt;&gt; EVENT_DEVID_SHIFT) &amp; EVENT_DEVID_MASK;</div><div class='add'>+	int domid = (event[1] &gt;&gt; EVENT_DOMID_SHIFT) &amp; EVENT_DOMID_MASK;</div><div class='add'>+	int flags = (event[1] &gt;&gt; EVENT_FLAGS_SHIFT) &amp; EVENT_FLAGS_MASK;</div><div class='add'>+	u64 address = (u64)(((u64)event[3]) &lt;&lt; 32) | event[2];</div><div class='add'>+</div><div class='add'>+	printk(KERN_ERR "AMD IOMMU: Event logged [");</div><div class='add'>+</div><div class='add'>+	switch (type) {</div><div class='add'>+	case EVENT_TYPE_ILL_DEV:</div><div class='add'>+		printk("ILLEGAL_DEV_TABLE_ENTRY device=%02x:%02x.%x "</div><div class='add'>+		       "address=0x%016llx flags=0x%04x]\n",</div><div class='add'>+		       PCI_BUS(devid), PCI_SLOT(devid), PCI_FUNC(devid),</div><div class='add'>+		       address, flags);</div><div class='add'>+		break;</div><div class='add'>+	case EVENT_TYPE_IO_FAULT:</div><div class='add'>+		printk("IO_PAGE_FAULT device=%02x:%02x.%x "</div><div class='add'>+		       "domain=0x%04x address=0x%016llx flags=0x%04x]\n",</div><div class='add'>+		       PCI_BUS(devid), PCI_SLOT(devid), PCI_FUNC(devid),</div><div class='add'>+		       domid, address, flags);</div><div class='add'>+		break;</div><div class='add'>+	case EVENT_TYPE_DEV_TAB_ERR:</div><div class='add'>+		printk("DEV_TAB_HARDWARE_ERROR device=%02x:%02x.%x "</div><div class='add'>+		       "address=0x%016llx flags=0x%04x]\n",</div><div class='add'>+		       PCI_BUS(devid), PCI_SLOT(devid), PCI_FUNC(devid),</div><div class='add'>+		       address, flags);</div><div class='add'>+		break;</div><div class='add'>+	case EVENT_TYPE_PAGE_TAB_ERR:</div><div class='add'>+		printk("PAGE_TAB_HARDWARE_ERROR device=%02x:%02x.%x "</div><div class='add'>+		       "domain=0x%04x address=0x%016llx flags=0x%04x]\n",</div><div class='add'>+		       PCI_BUS(devid), PCI_SLOT(devid), PCI_FUNC(devid),</div><div class='add'>+		       domid, address, flags);</div><div class='add'>+		break;</div><div class='add'>+	case EVENT_TYPE_ILL_CMD:</div><div class='add'>+		printk("ILLEGAL_COMMAND_ERROR address=0x%016llx]\n", address);</div><div class='add'>+		break;</div><div class='add'>+	case EVENT_TYPE_CMD_HARD_ERR:</div><div class='add'>+		printk("COMMAND_HARDWARE_ERROR address=0x%016llx "</div><div class='add'>+		       "flags=0x%04x]\n", address, flags);</div><div class='add'>+		break;</div><div class='add'>+	case EVENT_TYPE_IOTLB_INV_TO:</div><div class='add'>+		printk("IOTLB_INV_TIMEOUT device=%02x:%02x.%x "</div><div class='add'>+		       "address=0x%016llx]\n",</div><div class='add'>+		       PCI_BUS(devid), PCI_SLOT(devid), PCI_FUNC(devid),</div><div class='add'>+		       address);</div><div class='add'>+		break;</div><div class='add'>+	case EVENT_TYPE_INV_DEV_REQ:</div><div class='add'>+		printk("INVALID_DEVICE_REQUEST device=%02x:%02x.%x "</div><div class='add'>+		       "address=0x%016llx flags=0x%04x]\n",</div><div class='add'>+		       PCI_BUS(devid), PCI_SLOT(devid), PCI_FUNC(devid),</div><div class='add'>+		       address, flags);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		printk(KERN_ERR "UNKNOWN type=0x%02x]\n", type);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iommu_poll_events(struct amd_iommu *iommu)</div><div class='add'>+{</div><div class='add'>+	u32 head, tail;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;iommu-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	head = readl(iommu-&gt;mmio_base + MMIO_EVT_HEAD_OFFSET);</div><div class='add'>+	tail = readl(iommu-&gt;mmio_base + MMIO_EVT_TAIL_OFFSET);</div><div class='add'>+</div><div class='add'>+	while (head != tail) {</div><div class='add'>+		iommu_print_event(iommu-&gt;evt_buf + head);</div><div class='add'>+		head = (head + EVENT_ENTRY_SIZE) % iommu-&gt;evt_buf_size;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	writel(head, iommu-&gt;mmio_base + MMIO_EVT_HEAD_OFFSET);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;iommu-&gt;lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+irqreturn_t amd_iommu_int_handler(int irq, void *data)</div><div class='add'>+{</div><div class='add'>+	struct amd_iommu *iommu;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(iommu, &amp;amd_iommu_list, list)</div><div class='add'>+		iommu_poll_events(iommu);</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/****************************************************************************</div><div class='add'>+ *</div><div class='ctx'>  * IOMMU command queuing functions</div><div class='ctx'>  *</div><div class='ctx'>  ****************************************************************************/</div><div class='hunk'>@@ -195,7 +295,7 @@ static int iommu_flush_pages(struct amd_iommu *iommu, u16 domid,</div><div class='ctx'> 		u64 address, size_t size)</div><div class='ctx'> {</div><div class='ctx'> 	int s = 0;</div><div class='del'>-	unsigned pages = iommu_num_pages(address, size);</div><div class='add'>+	unsigned pages = iommu_num_pages(address, size, PAGE_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	address &amp;= PAGE_MASK;</div><div class='ctx'> </div><div class='hunk'>@@ -213,6 +313,14 @@ static int iommu_flush_pages(struct amd_iommu *iommu, u16 domid,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Flush the whole IO/TLB for a given protection domain */</div><div class='add'>+static void iommu_flush_tlb(struct amd_iommu *iommu, u16 domid)</div><div class='add'>+{</div><div class='add'>+	u64 address = CMD_INV_IOMMU_ALL_PAGES_ADDRESS;</div><div class='add'>+</div><div class='add'>+	iommu_queue_inv_iommu_pages(iommu, address, domid, 0, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /****************************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * The functions below are used the create the page table mappings for</div><div class='hunk'>@@ -372,11 +480,6 @@ static int init_unity_mappings_for_device(struct dma_ops_domain *dma_dom,</div><div class='ctx'>  * efficient allocator.</div><div class='ctx'>  *</div><div class='ctx'>  ****************************************************************************/</div><div class='del'>-static unsigned long dma_mask_to_pages(unsigned long mask)</div><div class='del'>-{</div><div class='del'>-	return (mask &gt;&gt; PAGE_SHIFT) +</div><div class='del'>-		(PAGE_ALIGN(mask &amp; ~PAGE_MASK) &gt;&gt; PAGE_SHIFT);</div><div class='del'>-}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * The address allocator core function.</div><div class='hunk'>@@ -385,25 +488,31 @@ static unsigned long dma_mask_to_pages(unsigned long mask)</div><div class='ctx'>  */</div><div class='ctx'> static unsigned long dma_ops_alloc_addresses(struct device *dev,</div><div class='ctx'> 					     struct dma_ops_domain *dom,</div><div class='del'>-					     unsigned int pages)</div><div class='add'>+					     unsigned int pages,</div><div class='add'>+					     unsigned long align_mask,</div><div class='add'>+					     u64 dma_mask)</div><div class='ctx'> {</div><div class='del'>-	unsigned long limit = dma_mask_to_pages(*dev-&gt;dma_mask);</div><div class='add'>+	unsigned long limit;</div><div class='ctx'> 	unsigned long address;</div><div class='del'>-	unsigned long size = dom-&gt;aperture_size &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> 	unsigned long boundary_size;</div><div class='ctx'> </div><div class='ctx'> 	boundary_size = ALIGN(dma_get_seg_boundary(dev) + 1,</div><div class='ctx'> 			PAGE_SIZE) &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	limit = limit &lt; size ? limit : size;</div><div class='add'>+	limit = iommu_device_max_index(dom-&gt;aperture_size &gt;&gt; PAGE_SHIFT, 0,</div><div class='add'>+				       dma_mask &gt;&gt; PAGE_SHIFT);</div><div class='ctx'> </div><div class='del'>-	if (dom-&gt;next_bit &gt;= limit)</div><div class='add'>+	if (dom-&gt;next_bit &gt;= limit) {</div><div class='ctx'> 		dom-&gt;next_bit = 0;</div><div class='add'>+		dom-&gt;need_flush = true;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	address = iommu_area_alloc(dom-&gt;bitmap, limit, dom-&gt;next_bit, pages,</div><div class='del'>-			0 , boundary_size, 0);</div><div class='del'>-	if (address == -1)</div><div class='add'>+				   0 , boundary_size, align_mask);</div><div class='add'>+	if (address == -1) {</div><div class='ctx'> 		address = iommu_area_alloc(dom-&gt;bitmap, limit, 0, pages,</div><div class='del'>-				0, boundary_size, 0);</div><div class='add'>+				0, boundary_size, align_mask);</div><div class='add'>+		dom-&gt;need_flush = true;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (likely(address != -1)) {</div><div class='ctx'> 		dom-&gt;next_bit = address + pages;</div><div class='hunk'>@@ -469,7 +578,7 @@ static void dma_ops_reserve_addresses(struct dma_ops_domain *dom,</div><div class='ctx'> 	if (start_page + pages &gt; last_page)</div><div class='ctx'> 		pages = last_page - start_page;</div><div class='ctx'> </div><div class='del'>-	set_bit_string(dom-&gt;bitmap, start_page, pages);</div><div class='add'>+	iommu_area_reserve(dom-&gt;bitmap, start_page, pages);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void dma_ops_free_pagetable(struct dma_ops_domain *dma_dom)</div><div class='hunk'>@@ -563,12 +672,16 @@ static struct dma_ops_domain *dma_ops_domain_alloc(struct amd_iommu *iommu,</div><div class='ctx'> 	dma_dom-&gt;bitmap[0] = 1;</div><div class='ctx'> 	dma_dom-&gt;next_bit = 0;</div><div class='ctx'> </div><div class='add'>+	dma_dom-&gt;need_flush = false;</div><div class='add'>+	dma_dom-&gt;target_dev = 0xffff;</div><div class='add'>+</div><div class='ctx'> 	/* Intialize the exclusion range if necessary */</div><div class='ctx'> 	if (iommu-&gt;exclusion_start &amp;&amp;</div><div class='ctx'> 	    iommu-&gt;exclusion_start &lt; dma_dom-&gt;aperture_size) {</div><div class='ctx'> 		unsigned long startpage = iommu-&gt;exclusion_start &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> 		int pages = iommu_num_pages(iommu-&gt;exclusion_start,</div><div class='del'>-					    iommu-&gt;exclusion_length);</div><div class='add'>+					    iommu-&gt;exclusion_length,</div><div class='add'>+					    PAGE_SIZE);</div><div class='ctx'> 		dma_ops_reserve_addresses(dma_dom, startpage, pages);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -633,12 +746,13 @@ static void set_device_domain(struct amd_iommu *iommu,</div><div class='ctx'> </div><div class='ctx'> 	u64 pte_root = virt_to_phys(domain-&gt;pt_root);</div><div class='ctx'> </div><div class='del'>-	pte_root |= (domain-&gt;mode &amp; 0x07) &lt;&lt; 9;</div><div class='del'>-	pte_root |= IOMMU_PTE_IR | IOMMU_PTE_IW | IOMMU_PTE_P | 2;</div><div class='add'>+	pte_root |= (domain-&gt;mode &amp; DEV_ENTRY_MODE_MASK)</div><div class='add'>+		    &lt;&lt; DEV_ENTRY_MODE_SHIFT;</div><div class='add'>+	pte_root |= IOMMU_PTE_IR | IOMMU_PTE_IW | IOMMU_PTE_P | IOMMU_PTE_TV;</div><div class='ctx'> </div><div class='ctx'> 	write_lock_irqsave(&amp;amd_iommu_devtable_lock, flags);</div><div class='del'>-	amd_iommu_dev_table[devid].data[0] = pte_root;</div><div class='del'>-	amd_iommu_dev_table[devid].data[1] = pte_root &gt;&gt; 32;</div><div class='add'>+	amd_iommu_dev_table[devid].data[0] = lower_32_bits(pte_root);</div><div class='add'>+	amd_iommu_dev_table[devid].data[1] = upper_32_bits(pte_root);</div><div class='ctx'> 	amd_iommu_dev_table[devid].data[2] = domain-&gt;id;</div><div class='ctx'> </div><div class='ctx'> 	amd_iommu_pd_table[devid] = domain;</div><div class='hunk'>@@ -656,6 +770,45 @@ static void set_device_domain(struct amd_iommu *iommu,</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * This function checks if the driver got a valid device from the caller to</div><div class='add'>+ * avoid dereferencing invalid pointers.</div><div class='add'>+ */</div><div class='add'>+static bool check_device(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	if (!dev || !dev-&gt;dma_mask)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * In this function the list of preallocated protection domains is traversed to</div><div class='add'>+ * find the domain for a specific device</div><div class='add'>+ */</div><div class='add'>+static struct dma_ops_domain *find_protection_domain(u16 devid)</div><div class='add'>+{</div><div class='add'>+	struct dma_ops_domain *entry, *ret = NULL;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	if (list_empty(&amp;iommu_pd_list))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;iommu_pd_list_lock, flags);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(entry, &amp;iommu_pd_list, list) {</div><div class='add'>+		if (entry-&gt;target_dev == devid) {</div><div class='add'>+			ret = entry;</div><div class='add'>+			list_del(&amp;ret-&gt;list);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;iommu_pd_list_lock, flags);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * In the dma_ops path we only have the struct device. This function</div><div class='ctx'>  * finds the corresponding IOMMU, the protection domain and the</div><div class='ctx'>  * requestor id for a given device.</div><div class='hunk'>@@ -671,27 +824,30 @@ static int get_device_resources(struct device *dev,</div><div class='ctx'> 	struct pci_dev *pcidev;</div><div class='ctx'> 	u16 _bdf;</div><div class='ctx'> </div><div class='del'>-	BUG_ON(!dev || dev-&gt;bus != &amp;pci_bus_type || !dev-&gt;dma_mask);</div><div class='add'>+	*iommu = NULL;</div><div class='add'>+	*domain = NULL;</div><div class='add'>+	*bdf = 0xffff;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;bus != &amp;pci_bus_type)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	pcidev = to_pci_dev(dev);</div><div class='ctx'> 	_bdf = calc_devid(pcidev-&gt;bus-&gt;number, pcidev-&gt;devfn);</div><div class='ctx'> </div><div class='ctx'> 	/* device not translated by any IOMMU in the system? */</div><div class='del'>-	if (_bdf &gt; amd_iommu_last_bdf) {</div><div class='del'>-		*iommu = NULL;</div><div class='del'>-		*domain = NULL;</div><div class='del'>-		*bdf = 0xffff;</div><div class='add'>+	if (_bdf &gt; amd_iommu_last_bdf)</div><div class='ctx'> 		return 0;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	*bdf = amd_iommu_alias_table[_bdf];</div><div class='ctx'> </div><div class='ctx'> 	*iommu = amd_iommu_rlookup_table[*bdf];</div><div class='ctx'> 	if (*iommu == NULL)</div><div class='ctx'> 		return 0;</div><div class='del'>-	dma_dom = (*iommu)-&gt;default_dom;</div><div class='ctx'> 	*domain = domain_for_device(*bdf);</div><div class='ctx'> 	if (*domain == NULL) {</div><div class='add'>+		dma_dom = find_protection_domain(*bdf);</div><div class='add'>+		if (!dma_dom)</div><div class='add'>+			dma_dom = (*iommu)-&gt;default_dom;</div><div class='ctx'> 		*domain = &amp;dma_dom-&gt;domain;</div><div class='ctx'> 		set_device_domain(*iommu, *domain, *bdf);</div><div class='ctx'> 		printk(KERN_INFO "AMD IOMMU: Using protection domain %d for "</div><div class='hunk'>@@ -770,17 +926,24 @@ static dma_addr_t __map_single(struct device *dev,</div><div class='ctx'> 			       struct dma_ops_domain *dma_dom,</div><div class='ctx'> 			       phys_addr_t paddr,</div><div class='ctx'> 			       size_t size,</div><div class='del'>-			       int dir)</div><div class='add'>+			       int dir,</div><div class='add'>+			       bool align,</div><div class='add'>+			       u64 dma_mask)</div><div class='ctx'> {</div><div class='ctx'> 	dma_addr_t offset = paddr &amp; ~PAGE_MASK;</div><div class='ctx'> 	dma_addr_t address, start;</div><div class='ctx'> 	unsigned int pages;</div><div class='add'>+	unsigned long align_mask = 0;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	pages = iommu_num_pages(paddr, size);</div><div class='add'>+	pages = iommu_num_pages(paddr, size, PAGE_SIZE);</div><div class='ctx'> 	paddr &amp;= PAGE_MASK;</div><div class='ctx'> </div><div class='del'>-	address = dma_ops_alloc_addresses(dev, dma_dom, pages);</div><div class='add'>+	if (align)</div><div class='add'>+		align_mask = (1UL &lt;&lt; get_order(size)) - 1;</div><div class='add'>+</div><div class='add'>+	address = dma_ops_alloc_addresses(dev, dma_dom, pages, align_mask,</div><div class='add'>+					  dma_mask);</div><div class='ctx'> 	if (unlikely(address == bad_dma_address))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -792,6 +955,12 @@ static dma_addr_t __map_single(struct device *dev,</div><div class='ctx'> 	}</div><div class='ctx'> 	address += offset;</div><div class='ctx'> </div><div class='add'>+	if (unlikely(dma_dom-&gt;need_flush &amp;&amp; !amd_iommu_unmap_flush)) {</div><div class='add'>+		iommu_flush_tlb(iommu, dma_dom-&gt;domain.id);</div><div class='add'>+		dma_dom-&gt;need_flush = false;</div><div class='add'>+	} else if (unlikely(iommu_has_npcache(iommu)))</div><div class='add'>+		iommu_flush_pages(iommu, dma_dom-&gt;domain.id, address, size);</div><div class='add'>+</div><div class='ctx'> out:</div><div class='ctx'> 	return address;</div><div class='ctx'> }</div><div class='hunk'>@@ -812,7 +981,7 @@ static void __unmap_single(struct amd_iommu *iommu,</div><div class='ctx'> 	if ((dma_addr == 0) || (dma_addr + size &gt; dma_dom-&gt;aperture_size))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	pages = iommu_num_pages(dma_addr, size);</div><div class='add'>+	pages = iommu_num_pages(dma_addr, size, PAGE_SIZE);</div><div class='ctx'> 	dma_addr &amp;= PAGE_MASK;</div><div class='ctx'> 	start = dma_addr;</div><div class='ctx'> </div><div class='hunk'>@@ -822,6 +991,9 @@ static void __unmap_single(struct amd_iommu *iommu,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dma_ops_free_addresses(dma_dom, dma_addr, pages);</div><div class='add'>+</div><div class='add'>+	if (amd_iommu_unmap_flush)</div><div class='add'>+		iommu_flush_pages(iommu, dma_dom-&gt;domain.id, dma_addr, size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -835,6 +1007,12 @@ static dma_addr_t map_single(struct device *dev, phys_addr_t paddr,</div><div class='ctx'> 	struct protection_domain *domain;</div><div class='ctx'> 	u16 devid;</div><div class='ctx'> 	dma_addr_t addr;</div><div class='add'>+	u64 dma_mask;</div><div class='add'>+</div><div class='add'>+	if (!check_device(dev))</div><div class='add'>+		return bad_dma_address;</div><div class='add'>+</div><div class='add'>+	dma_mask = *dev-&gt;dma_mask;</div><div class='ctx'> </div><div class='ctx'> 	get_device_resources(dev, &amp;iommu, &amp;domain, &amp;devid);</div><div class='ctx'> </div><div class='hunk'>@@ -843,14 +1021,12 @@ static dma_addr_t map_single(struct device *dev, phys_addr_t paddr,</div><div class='ctx'> 		return (dma_addr_t)paddr;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;domain-&gt;lock, flags);</div><div class='del'>-	addr = __map_single(dev, iommu, domain-&gt;priv, paddr, size, dir);</div><div class='add'>+	addr = __map_single(dev, iommu, domain-&gt;priv, paddr, size, dir, false,</div><div class='add'>+			    dma_mask);</div><div class='ctx'> 	if (addr == bad_dma_address)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	if (iommu_has_npcache(iommu))</div><div class='del'>-		iommu_flush_pages(iommu, domain-&gt;id, addr, size);</div><div class='del'>-</div><div class='del'>-	if (iommu-&gt;need_sync)</div><div class='add'>+	if (unlikely(iommu-&gt;need_sync))</div><div class='ctx'> 		iommu_completion_wait(iommu);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='hunk'>@@ -870,7 +1046,8 @@ static void unmap_single(struct device *dev, dma_addr_t dma_addr,</div><div class='ctx'> 	struct protection_domain *domain;</div><div class='ctx'> 	u16 devid;</div><div class='ctx'> </div><div class='del'>-	if (!get_device_resources(dev, &amp;iommu, &amp;domain, &amp;devid))</div><div class='add'>+	if (!check_device(dev) ||</div><div class='add'>+	    !get_device_resources(dev, &amp;iommu, &amp;domain, &amp;devid))</div><div class='ctx'> 		/* device not handled by any AMD IOMMU */</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -878,9 +1055,7 @@ static void unmap_single(struct device *dev, dma_addr_t dma_addr,</div><div class='ctx'> </div><div class='ctx'> 	__unmap_single(iommu, domain-&gt;priv, dma_addr, size, dir);</div><div class='ctx'> </div><div class='del'>-	iommu_flush_pages(iommu, domain-&gt;id, dma_addr, size);</div><div class='del'>-</div><div class='del'>-	if (iommu-&gt;need_sync)</div><div class='add'>+	if (unlikely(iommu-&gt;need_sync))</div><div class='ctx'> 		iommu_completion_wait(iommu);</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;domain-&gt;lock, flags);</div><div class='hunk'>@@ -919,6 +1094,12 @@ static int map_sg(struct device *dev, struct scatterlist *sglist,</div><div class='ctx'> 	struct scatterlist *s;</div><div class='ctx'> 	phys_addr_t paddr;</div><div class='ctx'> 	int mapped_elems = 0;</div><div class='add'>+	u64 dma_mask;</div><div class='add'>+</div><div class='add'>+	if (!check_device(dev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	dma_mask = *dev-&gt;dma_mask;</div><div class='ctx'> </div><div class='ctx'> 	get_device_resources(dev, &amp;iommu, &amp;domain, &amp;devid);</div><div class='ctx'> </div><div class='hunk'>@@ -931,19 +1112,17 @@ static int map_sg(struct device *dev, struct scatterlist *sglist,</div><div class='ctx'> 		paddr = sg_phys(s);</div><div class='ctx'> </div><div class='ctx'> 		s-&gt;dma_address = __map_single(dev, iommu, domain-&gt;priv,</div><div class='del'>-					      paddr, s-&gt;length, dir);</div><div class='add'>+					      paddr, s-&gt;length, dir, false,</div><div class='add'>+					      dma_mask);</div><div class='ctx'> </div><div class='ctx'> 		if (s-&gt;dma_address) {</div><div class='ctx'> 			s-&gt;dma_length = s-&gt;length;</div><div class='ctx'> 			mapped_elems++;</div><div class='ctx'> 		} else</div><div class='ctx'> 			goto unmap;</div><div class='del'>-		if (iommu_has_npcache(iommu))</div><div class='del'>-			iommu_flush_pages(iommu, domain-&gt;id, s-&gt;dma_address,</div><div class='del'>-					  s-&gt;dma_length);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (iommu-&gt;need_sync)</div><div class='add'>+	if (unlikely(iommu-&gt;need_sync))</div><div class='ctx'> 		iommu_completion_wait(iommu);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='hunk'>@@ -977,7 +1156,8 @@ static void unmap_sg(struct device *dev, struct scatterlist *sglist,</div><div class='ctx'> 	u16 devid;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	if (!get_device_resources(dev, &amp;iommu, &amp;domain, &amp;devid))</div><div class='add'>+	if (!check_device(dev) ||</div><div class='add'>+	    !get_device_resources(dev, &amp;iommu, &amp;domain, &amp;devid))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;domain-&gt;lock, flags);</div><div class='hunk'>@@ -985,12 +1165,10 @@ static void unmap_sg(struct device *dev, struct scatterlist *sglist,</div><div class='ctx'> 	for_each_sg(sglist, s, nelems, i) {</div><div class='ctx'> 		__unmap_single(iommu, domain-&gt;priv, s-&gt;dma_address,</div><div class='ctx'> 			       s-&gt;dma_length, dir);</div><div class='del'>-		iommu_flush_pages(iommu, domain-&gt;id, s-&gt;dma_address,</div><div class='del'>-				  s-&gt;dma_length);</div><div class='ctx'> 		s-&gt;dma_address = s-&gt;dma_length = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (iommu-&gt;need_sync)</div><div class='add'>+	if (unlikely(iommu-&gt;need_sync))</div><div class='ctx'> 		iommu_completion_wait(iommu);</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;domain-&gt;lock, flags);</div><div class='hunk'>@@ -1008,25 +1186,33 @@ static void *alloc_coherent(struct device *dev, size_t size,</div><div class='ctx'> 	struct protection_domain *domain;</div><div class='ctx'> 	u16 devid;</div><div class='ctx'> 	phys_addr_t paddr;</div><div class='add'>+	u64 dma_mask = dev-&gt;coherent_dma_mask;</div><div class='add'>+</div><div class='add'>+	if (!check_device(dev))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	if (!get_device_resources(dev, &amp;iommu, &amp;domain, &amp;devid))</div><div class='add'>+		flag &amp;= ~(__GFP_DMA | __GFP_HIGHMEM | __GFP_DMA32);</div><div class='ctx'> </div><div class='add'>+	flag |= __GFP_ZERO;</div><div class='ctx'> 	virt_addr = (void *)__get_free_pages(flag, get_order(size));</div><div class='ctx'> 	if (!virt_addr)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	memset(virt_addr, 0, size);</div><div class='ctx'> 	paddr = virt_to_phys(virt_addr);</div><div class='ctx'> </div><div class='del'>-	get_device_resources(dev, &amp;iommu, &amp;domain, &amp;devid);</div><div class='del'>-</div><div class='ctx'> 	if (!iommu || !domain) {</div><div class='ctx'> 		*dma_addr = (dma_addr_t)paddr;</div><div class='ctx'> 		return virt_addr;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (!dma_mask)</div><div class='add'>+		dma_mask = *dev-&gt;dma_mask;</div><div class='add'>+</div><div class='ctx'> 	spin_lock_irqsave(&amp;domain-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	*dma_addr = __map_single(dev, iommu, domain-&gt;priv, paddr,</div><div class='del'>-				 size, DMA_BIDIRECTIONAL);</div><div class='add'>+				 size, DMA_BIDIRECTIONAL, true, dma_mask);</div><div class='ctx'> </div><div class='ctx'> 	if (*dma_addr == bad_dma_address) {</div><div class='ctx'> 		free_pages((unsigned long)virt_addr, get_order(size));</div><div class='hunk'>@@ -1034,10 +1220,7 @@ static void *alloc_coherent(struct device *dev, size_t size,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (iommu_has_npcache(iommu))</div><div class='del'>-		iommu_flush_pages(iommu, domain-&gt;id, *dma_addr, size);</div><div class='del'>-</div><div class='del'>-	if (iommu-&gt;need_sync)</div><div class='add'>+	if (unlikely(iommu-&gt;need_sync))</div><div class='ctx'> 		iommu_completion_wait(iommu);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='hunk'>@@ -1048,8 +1231,6 @@ out:</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * The exported free_coherent function for dma_ops.</div><div class='del'>- * FIXME: fix the generic x86 DMA layer so that it actually calls that</div><div class='del'>- *        function.</div><div class='ctx'>  */</div><div class='ctx'> static void free_coherent(struct device *dev, size_t size,</div><div class='ctx'> 			  void *virt_addr, dma_addr_t dma_addr)</div><div class='hunk'>@@ -1059,6 +1240,9 @@ static void free_coherent(struct device *dev, size_t size,</div><div class='ctx'> 	struct protection_domain *domain;</div><div class='ctx'> 	u16 devid;</div><div class='ctx'> </div><div class='add'>+	if (!check_device(dev))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	get_device_resources(dev, &amp;iommu, &amp;domain, &amp;devid);</div><div class='ctx'> </div><div class='ctx'> 	if (!iommu || !domain)</div><div class='hunk'>@@ -1067,9 +1251,8 @@ static void free_coherent(struct device *dev, size_t size,</div><div class='ctx'> 	spin_lock_irqsave(&amp;domain-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	__unmap_single(iommu, domain-&gt;priv, dma_addr, size, DMA_BIDIRECTIONAL);</div><div class='del'>-	iommu_flush_pages(iommu, domain-&gt;id, dma_addr, size);</div><div class='ctx'> </div><div class='del'>-	if (iommu-&gt;need_sync)</div><div class='add'>+	if (unlikely(iommu-&gt;need_sync))</div><div class='ctx'> 		iommu_completion_wait(iommu);</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;domain-&gt;lock, flags);</div><div class='hunk'>@@ -1079,6 +1262,30 @@ free_mem:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * This function is called by the DMA layer to find out if we can handle a</div><div class='add'>+ * particular device. It is part of the dma_ops.</div><div class='add'>+ */</div><div class='add'>+static int amd_iommu_dma_supported(struct device *dev, u64 mask)</div><div class='add'>+{</div><div class='add'>+	u16 bdf;</div><div class='add'>+	struct pci_dev *pcidev;</div><div class='add'>+</div><div class='add'>+	/* No device or no PCI device */</div><div class='add'>+	if (!dev || dev-&gt;bus != &amp;pci_bus_type)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	pcidev = to_pci_dev(dev);</div><div class='add'>+</div><div class='add'>+	bdf = calc_devid(pcidev-&gt;bus-&gt;number, pcidev-&gt;devfn);</div><div class='add'>+</div><div class='add'>+	/* Out of our scope? */</div><div class='add'>+	if (bdf &gt; amd_iommu_last_bdf)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * The function for pre-allocating protection domains.</div><div class='ctx'>  *</div><div class='ctx'>  * If the driver core informs the DMA layer if a driver grabs a device</div><div class='hunk'>@@ -1107,10 +1314,9 @@ void prealloc_protection_domains(void)</div><div class='ctx'> 		if (!dma_dom)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		init_unity_mappings_for_device(dma_dom, devid);</div><div class='del'>-		set_device_domain(iommu, &amp;dma_dom-&gt;domain, devid);</div><div class='del'>-		printk(KERN_INFO "AMD IOMMU: Allocated domain %d for device ",</div><div class='del'>-		       dma_dom-&gt;domain.id);</div><div class='del'>-		print_devid(devid, 1);</div><div class='add'>+		dma_dom-&gt;target_dev = devid;</div><div class='add'>+</div><div class='add'>+		list_add_tail(&amp;dma_dom-&gt;list, &amp;iommu_pd_list);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1121,6 +1327,7 @@ static struct dma_mapping_ops amd_iommu_dma_ops = {</div><div class='ctx'> 	.unmap_single = unmap_single,</div><div class='ctx'> 	.map_sg = map_sg,</div><div class='ctx'> 	.unmap_sg = unmap_sg,</div><div class='add'>+	.dma_supported = amd_iommu_dma_supported,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/x86/kernel/amd_iommu_init.c b/arch/x86/kernel/amd_iommu_init.c<br/>index a69cc0f52042..4cd8083c58be 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/amd_iommu_init.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/amd_iommu_init.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/amd_iommu_init.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/amd_iommu_init.c</a></div><div class='hunk'>@@ -22,6 +22,8 @@</div><div class='ctx'> #include &lt;linux/gfp.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/msi.h&gt;</div><div class='ctx'> #include &lt;asm/pci-direct.h&gt;</div><div class='ctx'> #include &lt;asm/amd_iommu_types.h&gt;</div><div class='ctx'> #include &lt;asm/amd_iommu.h&gt;</div><div class='hunk'>@@ -30,7 +32,6 @@</div><div class='ctx'> /*</div><div class='ctx'>  * definitions for the ACPI scanning code</div><div class='ctx'>  */</div><div class='del'>-#define PCI_BUS(x) (((x) &gt;&gt; 8) &amp; 0xff)</div><div class='ctx'> #define IVRS_HEADER_LENGTH 48</div><div class='ctx'> </div><div class='ctx'> #define ACPI_IVHD_TYPE                  0x10</div><div class='hunk'>@@ -121,6 +122,7 @@ LIST_HEAD(amd_iommu_unity_map);		/* a list of required unity mappings</div><div class='ctx'> 					   we find in ACPI */</div><div class='ctx'> unsigned amd_iommu_aperture_order = 26; /* size of aperture in power of 2 */</div><div class='ctx'> int amd_iommu_isolate;			/* if 1, device isolation is enabled */</div><div class='add'>+bool amd_iommu_unmap_flush;		/* if true, flush on every unmap */</div><div class='ctx'> </div><div class='ctx'> LIST_HEAD(amd_iommu_list);		/* list of all AMD IOMMUs in the</div><div class='ctx'> 					   system */</div><div class='hunk'>@@ -234,7 +236,7 @@ static void __init iommu_feature_disable(struct amd_iommu *iommu, u8 bit)</div><div class='ctx'> {</div><div class='ctx'> 	u32 ctrl;</div><div class='ctx'> </div><div class='del'>-	ctrl = (u64)readl(iommu-&gt;mmio_base + MMIO_CONTROL_OFFSET);</div><div class='add'>+	ctrl = readl(iommu-&gt;mmio_base + MMIO_CONTROL_OFFSET);</div><div class='ctx'> 	ctrl &amp;= ~(1 &lt;&lt; bit);</div><div class='ctx'> 	writel(ctrl, iommu-&gt;mmio_base + MMIO_CONTROL_OFFSET);</div><div class='ctx'> }</div><div class='hunk'>@@ -242,13 +244,23 @@ static void __init iommu_feature_disable(struct amd_iommu *iommu, u8 bit)</div><div class='ctx'> /* Function to enable the hardware */</div><div class='ctx'> void __init iommu_enable(struct amd_iommu *iommu)</div><div class='ctx'> {</div><div class='del'>-	printk(KERN_INFO "AMD IOMMU: Enabling IOMMU at ");</div><div class='del'>-	print_devid(iommu-&gt;devid, 0);</div><div class='del'>-	printk(" cap 0x%hx\n", iommu-&gt;cap_ptr);</div><div class='add'>+	printk(KERN_INFO "AMD IOMMU: Enabling IOMMU "</div><div class='add'>+	       "at %02x:%02x.%x cap 0x%hx\n",</div><div class='add'>+	       iommu-&gt;dev-&gt;bus-&gt;number,</div><div class='add'>+	       PCI_SLOT(iommu-&gt;dev-&gt;devfn),</div><div class='add'>+	       PCI_FUNC(iommu-&gt;dev-&gt;devfn),</div><div class='add'>+	       iommu-&gt;cap_ptr);</div><div class='ctx'> </div><div class='ctx'> 	iommu_feature_enable(iommu, CONTROL_IOMMU_EN);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Function to enable IOMMU event logging and event interrupts */</div><div class='add'>+void __init iommu_enable_event_logging(struct amd_iommu *iommu)</div><div class='add'>+{</div><div class='add'>+	iommu_feature_enable(iommu, CONTROL_EVT_LOG_EN);</div><div class='add'>+	iommu_feature_enable(iommu, CONTROL_EVT_INT_EN);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * mapping and unmapping functions for the IOMMU MMIO space. Each AMD IOMMU in</div><div class='ctx'>  * the system has one.</div><div class='hunk'>@@ -286,6 +298,14 @@ static void __init iommu_unmap_mmio_space(struct amd_iommu *iommu)</div><div class='ctx'>  ****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * This function calculates the length of a given IVHD entry</div><div class='add'>+ */</div><div class='add'>+static inline int ivhd_entry_length(u8 *ivhd)</div><div class='add'>+{</div><div class='add'>+	return 0x04 &lt;&lt; (*ivhd &gt;&gt; 6);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * This function reads the last device id the IOMMU has to handle from the PCI</div><div class='ctx'>  * capability header for this IOMMU</div><div class='ctx'>  */</div><div class='hunk'>@@ -329,7 +349,7 @@ static int __init find_last_devid_from_ivhd(struct ivhd_header *h)</div><div class='ctx'> 		default:</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		p += 0x04 &lt;&lt; (*p &gt;&gt; 6);</div><div class='add'>+		p += ivhd_entry_length(p);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON(p != end);</div><div class='hunk'>@@ -414,7 +434,32 @@ static u8 * __init alloc_command_buffer(struct amd_iommu *iommu)</div><div class='ctx'> </div><div class='ctx'> static void __init free_command_buffer(struct amd_iommu *iommu)</div><div class='ctx'> {</div><div class='del'>-	free_pages((unsigned long)iommu-&gt;cmd_buf, get_order(CMD_BUFFER_SIZE));</div><div class='add'>+	free_pages((unsigned long)iommu-&gt;cmd_buf,</div><div class='add'>+		   get_order(iommu-&gt;cmd_buf_size));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* allocates the memory where the IOMMU will log its events to */</div><div class='add'>+static u8 * __init alloc_event_buffer(struct amd_iommu *iommu)</div><div class='add'>+{</div><div class='add'>+	u64 entry;</div><div class='add'>+	iommu-&gt;evt_buf = (u8 *)__get_free_pages(GFP_KERNEL | __GFP_ZERO,</div><div class='add'>+						get_order(EVT_BUFFER_SIZE));</div><div class='add'>+</div><div class='add'>+	if (iommu-&gt;evt_buf == NULL)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	entry = (u64)virt_to_phys(iommu-&gt;evt_buf) | EVT_LEN_MASK;</div><div class='add'>+	memcpy_toio(iommu-&gt;mmio_base + MMIO_EVT_BUF_OFFSET,</div><div class='add'>+		    &amp;entry, sizeof(entry));</div><div class='add'>+</div><div class='add'>+	iommu-&gt;evt_buf_size = EVT_BUFFER_SIZE;</div><div class='add'>+</div><div class='add'>+	return iommu-&gt;evt_buf;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init free_event_buffer(struct amd_iommu *iommu)</div><div class='add'>+{</div><div class='add'>+	free_pages((unsigned long)iommu-&gt;evt_buf, get_order(EVT_BUFFER_SIZE));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* sets a specific bit in the device table entry. */</div><div class='hunk'>@@ -487,19 +532,21 @@ static void __init set_device_exclusion_range(u16 devid, struct ivmd_header *m)</div><div class='ctx'>  */</div><div class='ctx'> static void __init init_iommu_from_pci(struct amd_iommu *iommu)</div><div class='ctx'> {</div><div class='del'>-	int bus = PCI_BUS(iommu-&gt;devid);</div><div class='del'>-	int dev = PCI_SLOT(iommu-&gt;devid);</div><div class='del'>-	int fn  = PCI_FUNC(iommu-&gt;devid);</div><div class='ctx'> 	int cap_ptr = iommu-&gt;cap_ptr;</div><div class='del'>-	u32 range;</div><div class='add'>+	u32 range, misc;</div><div class='ctx'> </div><div class='del'>-	iommu-&gt;cap = read_pci_config(bus, dev, fn, cap_ptr+MMIO_CAP_HDR_OFFSET);</div><div class='add'>+	pci_read_config_dword(iommu-&gt;dev, cap_ptr + MMIO_CAP_HDR_OFFSET,</div><div class='add'>+			      &amp;iommu-&gt;cap);</div><div class='add'>+	pci_read_config_dword(iommu-&gt;dev, cap_ptr + MMIO_RANGE_OFFSET,</div><div class='add'>+			      &amp;range);</div><div class='add'>+	pci_read_config_dword(iommu-&gt;dev, cap_ptr + MMIO_MISC_OFFSET,</div><div class='add'>+			      &amp;misc);</div><div class='ctx'> </div><div class='del'>-	range = read_pci_config(bus, dev, fn, cap_ptr+MMIO_RANGE_OFFSET);</div><div class='ctx'> 	iommu-&gt;first_device = calc_devid(MMIO_GET_BUS(range),</div><div class='ctx'> 					 MMIO_GET_FD(range));</div><div class='ctx'> 	iommu-&gt;last_device = calc_devid(MMIO_GET_BUS(range),</div><div class='ctx'> 					MMIO_GET_LD(range));</div><div class='add'>+	iommu-&gt;evt_msi_num = MMIO_MSI_NUM(misc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -604,7 +651,7 @@ static void __init init_iommu_from_acpi(struct amd_iommu *iommu,</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		p += 0x04 &lt;&lt; (e-&gt;type &gt;&gt; 6);</div><div class='add'>+		p += ivhd_entry_length(p);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -622,6 +669,7 @@ static int __init init_iommu_devices(struct amd_iommu *iommu)</div><div class='ctx'> static void __init free_iommu_one(struct amd_iommu *iommu)</div><div class='ctx'> {</div><div class='ctx'> 	free_command_buffer(iommu);</div><div class='add'>+	free_event_buffer(iommu);</div><div class='ctx'> 	iommu_unmap_mmio_space(iommu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -649,8 +697,12 @@ static int __init init_iommu_one(struct amd_iommu *iommu, struct ivhd_header *h)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Copy data from ACPI table entry to the iommu struct</div><div class='ctx'> 	 */</div><div class='del'>-	iommu-&gt;devid = h-&gt;devid;</div><div class='add'>+	iommu-&gt;dev = pci_get_bus_and_slot(PCI_BUS(h-&gt;devid), h-&gt;devid &amp; 0xff);</div><div class='add'>+	if (!iommu-&gt;dev)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='ctx'> 	iommu-&gt;cap_ptr = h-&gt;cap_ptr;</div><div class='add'>+	iommu-&gt;pci_seg = h-&gt;pci_seg;</div><div class='ctx'> 	iommu-&gt;mmio_phys = h-&gt;mmio_phys;</div><div class='ctx'> 	iommu-&gt;mmio_base = iommu_map_mmio_space(h-&gt;mmio_phys);</div><div class='ctx'> 	if (!iommu-&gt;mmio_base)</div><div class='hunk'>@@ -661,11 +713,17 @@ static int __init init_iommu_one(struct amd_iommu *iommu, struct ivhd_header *h)</div><div class='ctx'> 	if (!iommu-&gt;cmd_buf)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='add'>+	iommu-&gt;evt_buf = alloc_event_buffer(iommu);</div><div class='add'>+	if (!iommu-&gt;evt_buf)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	iommu-&gt;int_enabled = false;</div><div class='add'>+</div><div class='ctx'> 	init_iommu_from_pci(iommu);</div><div class='ctx'> 	init_iommu_from_acpi(iommu, h);</div><div class='ctx'> 	init_iommu_devices(iommu);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return pci_enable_device(iommu-&gt;dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -706,6 +764,95 @@ static int __init init_iommu_all(struct acpi_table_header *table)</div><div class='ctx'> </div><div class='ctx'> /****************************************************************************</div><div class='ctx'>  *</div><div class='add'>+ * The following functions initialize the MSI interrupts for all IOMMUs</div><div class='add'>+ * in the system. Its a bit challenging because there could be multiple</div><div class='add'>+ * IOMMUs per PCI BDF but we can call pci_enable_msi(x) only once per</div><div class='add'>+ * pci_dev.</div><div class='add'>+ *</div><div class='add'>+ ****************************************************************************/</div><div class='add'>+</div><div class='add'>+static int __init iommu_setup_msix(struct amd_iommu *iommu)</div><div class='add'>+{</div><div class='add'>+	struct amd_iommu *curr;</div><div class='add'>+	struct msix_entry entries[32]; /* only 32 supported by AMD IOMMU */</div><div class='add'>+	int nvec = 0, i;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(curr, &amp;amd_iommu_list, list) {</div><div class='add'>+		if (curr-&gt;dev == iommu-&gt;dev) {</div><div class='add'>+			entries[nvec].entry = curr-&gt;evt_msi_num;</div><div class='add'>+			entries[nvec].vector = 0;</div><div class='add'>+			curr-&gt;int_enabled = true;</div><div class='add'>+			nvec++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pci_enable_msix(iommu-&gt;dev, entries, nvec)) {</div><div class='add'>+		pci_disable_msix(iommu-&gt;dev);</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; nvec; ++i) {</div><div class='add'>+		int r = request_irq(entries-&gt;vector, amd_iommu_int_handler,</div><div class='add'>+				    IRQF_SAMPLE_RANDOM,</div><div class='add'>+				    "AMD IOMMU",</div><div class='add'>+				    NULL);</div><div class='add'>+		if (r)</div><div class='add'>+			goto out_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_free:</div><div class='add'>+	for (i -= 1; i &gt;= 0; --i)</div><div class='add'>+		free_irq(entries-&gt;vector, NULL);</div><div class='add'>+</div><div class='add'>+	pci_disable_msix(iommu-&gt;dev);</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init iommu_setup_msi(struct amd_iommu *iommu)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+	struct amd_iommu *curr;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(curr, &amp;amd_iommu_list, list) {</div><div class='add'>+		if (curr-&gt;dev == iommu-&gt;dev)</div><div class='add'>+			curr-&gt;int_enabled = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	if (pci_enable_msi(iommu-&gt;dev))</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	r = request_irq(iommu-&gt;dev-&gt;irq, amd_iommu_int_handler,</div><div class='add'>+			IRQF_SAMPLE_RANDOM,</div><div class='add'>+			"AMD IOMMU",</div><div class='add'>+			NULL);</div><div class='add'>+</div><div class='add'>+	if (r) {</div><div class='add'>+		pci_disable_msi(iommu-&gt;dev);</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init iommu_init_msi(struct amd_iommu *iommu)</div><div class='add'>+{</div><div class='add'>+	if (iommu-&gt;int_enabled)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (pci_find_capability(iommu-&gt;dev, PCI_CAP_ID_MSIX))</div><div class='add'>+		return iommu_setup_msix(iommu);</div><div class='add'>+	else if (pci_find_capability(iommu-&gt;dev, PCI_CAP_ID_MSI))</div><div class='add'>+		return iommu_setup_msi(iommu);</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/****************************************************************************</div><div class='add'>+ *</div><div class='ctx'>  * The next functions belong to the third pass of parsing the ACPI</div><div class='ctx'>  * table. In this last pass the memory mapping requirements are</div><div class='ctx'>  * gathered (like exclusion and unity mapping reanges).</div><div class='hunk'>@@ -811,7 +958,6 @@ static void init_device_table(void)</div><div class='ctx'> 	for (devid = 0; devid &lt;= amd_iommu_last_bdf; ++devid) {</div><div class='ctx'> 		set_dev_entry_bit(devid, DEV_ENTRY_VALID);</div><div class='ctx'> 		set_dev_entry_bit(devid, DEV_ENTRY_TRANSLATION);</div><div class='del'>-		set_dev_entry_bit(devid, DEV_ENTRY_NO_PAGE_FAULT);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -825,6 +971,8 @@ static void __init enable_iommus(void)</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(iommu, &amp;amd_iommu_list, list) {</div><div class='ctx'> 		iommu_set_exclusion_range(iommu);</div><div class='add'>+		iommu_init_msi(iommu);</div><div class='add'>+		iommu_enable_event_logging(iommu);</div><div class='ctx'> 		iommu_enable(iommu);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -995,11 +1143,17 @@ int __init amd_iommu_init(void)</div><div class='ctx'> 	else</div><div class='ctx'> 		printk("disabled\n");</div><div class='ctx'> </div><div class='add'>+	if (amd_iommu_unmap_flush)</div><div class='add'>+		printk(KERN_INFO "AMD IOMMU: IO/TLB flush on unmap enabled\n");</div><div class='add'>+	else</div><div class='add'>+		printk(KERN_INFO "AMD IOMMU: Lazy IO/TLB flushing enabled\n");</div><div class='add'>+</div><div class='ctx'> out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> </div><div class='ctx'> free:</div><div class='del'>-	free_pages((unsigned long)amd_iommu_pd_alloc_bitmap, 1);</div><div class='add'>+	free_pages((unsigned long)amd_iommu_pd_alloc_bitmap,</div><div class='add'>+		   get_order(MAX_DOMAIN_ID/8));</div><div class='ctx'> </div><div class='ctx'> 	free_pages((unsigned long)amd_iommu_pd_table,</div><div class='ctx'> 		   get_order(rlookup_table_size));</div><div class='hunk'>@@ -1057,8 +1211,10 @@ void __init amd_iommu_detect(void)</div><div class='ctx'> static int __init parse_amd_iommu_options(char *str)</div><div class='ctx'> {</div><div class='ctx'> 	for (; *str; ++str) {</div><div class='del'>-		if (strcmp(str, "isolate") == 0)</div><div class='add'>+		if (strncmp(str, "isolate", 7) == 0)</div><div class='ctx'> 			amd_iommu_isolate = 1;</div><div class='add'>+		if (strncmp(str, "fullflush", 11) == 0)</div><div class='add'>+			amd_iommu_unmap_flush = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='head'>diff --git a/arch/x86/kernel/aperture_64.c b/arch/x86/kernel/aperture_64.c<br/>index 44e21826db11..9a32b37ee2ee 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/aperture_64.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/aperture_64.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/aperture_64.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/aperture_64.c</a></div><div class='hunk'>@@ -455,11 +455,11 @@ out:</div><div class='ctx'> 		   force_iommu ||</div><div class='ctx'> 		   valid_agp ||</div><div class='ctx'> 		   fallback_aper_force) {</div><div class='del'>-		printk(KERN_ERR</div><div class='add'>+		printk(KERN_INFO</div><div class='ctx'> 			"Your BIOS doesn't leave a aperture memory hole\n");</div><div class='del'>-		printk(KERN_ERR</div><div class='add'>+		printk(KERN_INFO</div><div class='ctx'> 			"Please enable the IOMMU option in the BIOS setup\n");</div><div class='del'>-		printk(KERN_ERR</div><div class='add'>+		printk(KERN_INFO</div><div class='ctx'> 			"This costs you %d MB of RAM\n",</div><div class='ctx'> 				32 &lt;&lt; fallback_aper_order);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kernel/apic_32.c b/arch/x86/kernel/apic_32.c<br/>index f88bd0d982b0..21c831d96af3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/apic_32.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/apic_32.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/apic_32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/apic_32.c</a></div><div class='hunk'>@@ -60,10 +60,8 @@ unsigned long mp_lapic_addr;</div><div class='ctx'> static int force_enable_local_apic;</div><div class='ctx'> int disable_apic;</div><div class='ctx'> </div><div class='del'>-/* Local APIC timer verification ok */</div><div class='del'>-static int local_apic_timer_verify_ok;</div><div class='ctx'> /* Disable local APIC timer from the kernel commandline or via dmi quirk */</div><div class='del'>-static int local_apic_timer_disabled;</div><div class='add'>+static int disable_apic_timer __cpuinitdata;</div><div class='ctx'> /* Local APIC timer works in C2 */</div><div class='ctx'> int local_apic_timer_c2_ok;</div><div class='ctx'> EXPORT_SYMBOL_GPL(local_apic_timer_c2_ok);</div><div class='hunk'>@@ -130,7 +128,11 @@ static inline int lapic_get_version(void)</div><div class='ctx'>  */</div><div class='ctx'> static inline int lapic_is_integrated(void)</div><div class='ctx'> {</div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='add'>+	return 1;</div><div class='add'>+#else</div><div class='ctx'> 	return APIC_INTEGRATED(lapic_get_version());</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -145,13 +147,18 @@ static int modern_apic(void)</div><div class='ctx'> 	return lapic_get_version() &gt;= 0x14;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void apic_wait_icr_idle(void)</div><div class='add'>+/*</div><div class='add'>+ * Paravirt kernels also might be using these below ops. So we still</div><div class='add'>+ * use generic apic_read()/apic_write(), which might be pointing to different</div><div class='add'>+ * ops in PARAVIRT case.</div><div class='add'>+ */</div><div class='add'>+void xapic_wait_icr_idle(void)</div><div class='ctx'> {</div><div class='ctx'> 	while (apic_read(APIC_ICR) &amp; APIC_ICR_BUSY)</div><div class='ctx'> 		cpu_relax();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u32 safe_apic_wait_icr_idle(void)</div><div class='add'>+u32 safe_xapic_wait_icr_idle(void)</div><div class='ctx'> {</div><div class='ctx'> 	u32 send_status;</div><div class='ctx'> 	int timeout;</div><div class='hunk'>@@ -167,16 +174,48 @@ u32 safe_apic_wait_icr_idle(void)</div><div class='ctx'> 	return send_status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void xapic_icr_write(u32 low, u32 id)</div><div class='add'>+{</div><div class='add'>+	apic_write(APIC_ICR2, SET_APIC_DEST_FIELD(id));</div><div class='add'>+	apic_write(APIC_ICR, low);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u64 xapic_icr_read(void)</div><div class='add'>+{</div><div class='add'>+	u32 icr1, icr2;</div><div class='add'>+</div><div class='add'>+	icr2 = apic_read(APIC_ICR2);</div><div class='add'>+	icr1 = apic_read(APIC_ICR);</div><div class='add'>+</div><div class='add'>+	return icr1 | ((u64)icr2 &lt;&lt; 32);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct apic_ops xapic_ops = {</div><div class='add'>+	.read = native_apic_mem_read,</div><div class='add'>+	.write = native_apic_mem_write,</div><div class='add'>+	.icr_read = xapic_icr_read,</div><div class='add'>+	.icr_write = xapic_icr_write,</div><div class='add'>+	.wait_icr_idle = xapic_wait_icr_idle,</div><div class='add'>+	.safe_wait_icr_idle = safe_xapic_wait_icr_idle,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct apic_ops __read_mostly *apic_ops = &amp;xapic_ops;</div><div class='add'>+EXPORT_SYMBOL_GPL(apic_ops);</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * enable_NMI_through_LVT0 - enable NMI through local vector table 0</div><div class='ctx'>  */</div><div class='ctx'> void __cpuinit enable_NMI_through_LVT0(void)</div><div class='ctx'> {</div><div class='del'>-	unsigned int v = APIC_DM_NMI;</div><div class='add'>+	unsigned int v;</div><div class='ctx'> </div><div class='del'>-	/* Level triggered for 82489DX */</div><div class='add'>+	/* unmask and set to NMI */</div><div class='add'>+	v = APIC_DM_NMI;</div><div class='add'>+</div><div class='add'>+	/* Level triggered for 82489DX (32bit mode) */</div><div class='ctx'> 	if (!lapic_is_integrated())</div><div class='ctx'> 		v |= APIC_LVT_LEVEL_TRIGGER;</div><div class='add'>+</div><div class='ctx'> 	apic_write(APIC_LVT0, v);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -193,9 +232,13 @@ int get_physical_broadcast(void)</div><div class='ctx'>  */</div><div class='ctx'> int lapic_get_maxlvt(void)</div><div class='ctx'> {</div><div class='del'>-	unsigned int v = apic_read(APIC_LVR);</div><div class='add'>+	unsigned int v;</div><div class='ctx'> </div><div class='del'>-	/* 82489DXs do not report # of LVT entries. */</div><div class='add'>+	v = apic_read(APIC_LVR);</div><div class='add'>+	/*</div><div class='add'>+	 * - we always have APIC integrated on 64bit mode</div><div class='add'>+	 * - 82489DXs do not report # of LVT entries</div><div class='add'>+	 */</div><div class='ctx'> 	return APIC_INTEGRATED(GET_APIC_VERSION(v)) ? GET_APIC_MAXLVT(v) : 2;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -203,8 +246,12 @@ int lapic_get_maxlvt(void)</div><div class='ctx'>  * Local APIC timer</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/* Clock divisor is set to 16 */</div><div class='add'>+/* Clock divisor */</div><div class='add'>+#ifdef CONFG_X86_64</div><div class='add'>+#define APIC_DIVISOR 1</div><div class='add'>+#else</div><div class='ctx'> #define APIC_DIVISOR 16</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * This function sets up the local APIC timer, with a timeout of</div><div class='hunk'>@@ -212,6 +259,9 @@ int lapic_get_maxlvt(void)</div><div class='ctx'>  * this function twice on the boot CPU, once with a bogus timeout</div><div class='ctx'>  * value, second time for real. The other (noncalibrating) CPUs</div><div class='ctx'>  * call this function only once, with the real, calibrated value.</div><div class='add'>+ *</div><div class='add'>+ * We do reads before writes even if unnecessary, to get around the</div><div class='add'>+ * P5 APIC double write bug.</div><div class='ctx'>  */</div><div class='ctx'> static void __setup_APIC_LVTT(unsigned int clocks, int oneshot, int irqen)</div><div class='ctx'> {</div><div class='hunk'>@@ -233,14 +283,48 @@ static void __setup_APIC_LVTT(unsigned int clocks, int oneshot, int irqen)</div><div class='ctx'> 	 */</div><div class='ctx'> 	tmp_value = apic_read(APIC_TDCR);</div><div class='ctx'> 	apic_write(APIC_TDCR,</div><div class='del'>-		   (tmp_value &amp; ~(APIC_TDR_DIV_1 | APIC_TDR_DIV_TMBASE)) |</div><div class='del'>-		   APIC_TDR_DIV_16);</div><div class='add'>+		(tmp_value &amp; ~(APIC_TDR_DIV_1 | APIC_TDR_DIV_TMBASE)) |</div><div class='add'>+		APIC_TDR_DIV_16);</div><div class='ctx'> </div><div class='ctx'> 	if (!oneshot)</div><div class='ctx'> 		apic_write(APIC_TMICT, clocks / APIC_DIVISOR);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Setup extended LVT, AMD specific (K8, family 10h)</div><div class='add'>+ *</div><div class='add'>+ * Vector mappings are hard coded. On K8 only offset 0 (APIC500) and</div><div class='add'>+ * MCE interrupts are supported. Thus MCE offset must be set to 0.</div><div class='add'>+ *</div><div class='add'>+ * If mask=1, the LVT entry does not generate interrupts while mask=0</div><div class='add'>+ * enables the vector. See also the BKDGs.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define APIC_EILVT_LVTOFF_MCE 0</div><div class='add'>+#define APIC_EILVT_LVTOFF_IBS 1</div><div class='add'>+</div><div class='add'>+static void setup_APIC_eilvt(u8 lvt_off, u8 vector, u8 msg_type, u8 mask)</div><div class='add'>+{</div><div class='add'>+	unsigned long reg = (lvt_off &lt;&lt; 4) + APIC_EILVT0;</div><div class='add'>+	unsigned int  v   = (mask &lt;&lt; 16) | (msg_type &lt;&lt; 8) | vector;</div><div class='add'>+</div><div class='add'>+	apic_write(reg, v);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u8 setup_APIC_eilvt_mce(u8 vector, u8 msg_type, u8 mask)</div><div class='add'>+{</div><div class='add'>+	setup_APIC_eilvt(APIC_EILVT_LVTOFF_MCE, vector, msg_type, mask);</div><div class='add'>+	return APIC_EILVT_LVTOFF_MCE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u8 setup_APIC_eilvt_ibs(u8 vector, u8 msg_type, u8 mask)</div><div class='add'>+{</div><div class='add'>+	setup_APIC_eilvt(APIC_EILVT_LVTOFF_IBS, vector, msg_type, mask);</div><div class='add'>+	return APIC_EILVT_LVTOFF_IBS;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(setup_APIC_eilvt_ibs);</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Program the next event, relative to now</div><div class='ctx'>  */</div><div class='ctx'> static int lapic_next_event(unsigned long delta,</div><div class='hunk'>@@ -259,8 +343,8 @@ static void lapic_timer_setup(enum clock_event_mode mode,</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	unsigned int v;</div><div class='ctx'> </div><div class='del'>-	/* Lapic used for broadcast ? */</div><div class='del'>-	if (!local_apic_timer_verify_ok)</div><div class='add'>+	/* Lapic used as dummy for broadcast ? */</div><div class='add'>+	if (evt-&gt;features &amp; CLOCK_EVT_FEAT_DUMMY)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	local_irq_save(flags);</div><div class='hunk'>@@ -473,7 +557,7 @@ static int __init calibrate_APIC_clock(void)</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	local_apic_timer_verify_ok = 1;</div><div class='add'>+	levt-&gt;features &amp;= ~CLOCK_EVT_FEAT_DUMMY;</div><div class='ctx'> </div><div class='ctx'> 	/* We trust the pm timer based calibration */</div><div class='ctx'> 	if (!pm_referenced) {</div><div class='hunk'>@@ -507,11 +591,11 @@ static int __init calibrate_APIC_clock(void)</div><div class='ctx'> 		if (deltaj &gt;= LAPIC_CAL_LOOPS-2 &amp;&amp; deltaj &lt;= LAPIC_CAL_LOOPS+2)</div><div class='ctx'> 			apic_printk(APIC_VERBOSE, "... jiffies result ok\n");</div><div class='ctx'> 		else</div><div class='del'>-			local_apic_timer_verify_ok = 0;</div><div class='add'>+			levt-&gt;features |= CLOCK_EVT_FEAT_DUMMY;</div><div class='ctx'> 	} else</div><div class='ctx'> 		local_irq_enable();</div><div class='ctx'> </div><div class='del'>-	if (!local_apic_timer_verify_ok) {</div><div class='add'>+	if (levt-&gt;features &amp; CLOCK_EVT_FEAT_DUMMY) {</div><div class='ctx'> 		printk(KERN_WARNING</div><div class='ctx'> 		       "APIC timer disabled due to verification failure.\n");</div><div class='ctx'> 			return -1;</div><div class='hunk'>@@ -533,7 +617,8 @@ void __init setup_boot_APIC_clock(void)</div><div class='ctx'> 	 * timer as a dummy clock event source on SMP systems, so the</div><div class='ctx'> 	 * broadcast mechanism is used. On UP systems simply ignore it.</div><div class='ctx'> 	 */</div><div class='del'>-	if (local_apic_timer_disabled) {</div><div class='add'>+	if (disable_apic_timer) {</div><div class='add'>+		printk(KERN_INFO "Disabling APIC timer\n");</div><div class='ctx'> 		/* No broadcast on UP ! */</div><div class='ctx'> 		if (num_possible_cpus() &gt; 1) {</div><div class='ctx'> 			lapic_clockevent.mult = 1;</div><div class='hunk'>@@ -602,7 +687,11 @@ static void local_apic_timer_interrupt(void)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * the NMI deadlock-detector uses this.</div><div class='ctx'> 	 */</div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='add'>+	add_pda(apic_timer_irqs, 1);</div><div class='add'>+#else</div><div class='ctx'> 	per_cpu(irq_stat, cpu).apic_timer_irqs++;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	evt-&gt;event_handler(evt);</div><div class='ctx'> }</div><div class='hunk'>@@ -642,35 +731,6 @@ int setup_profiling_timer(unsigned int multiplier)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Setup extended LVT, AMD specific (K8, family 10h)</div><div class='del'>- *</div><div class='del'>- * Vector mappings are hard coded. On K8 only offset 0 (APIC500) and</div><div class='del'>- * MCE interrupts are supported. Thus MCE offset must be set to 0.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define APIC_EILVT_LVTOFF_MCE 0</div><div class='del'>-#define APIC_EILVT_LVTOFF_IBS 1</div><div class='del'>-</div><div class='del'>-static void setup_APIC_eilvt(u8 lvt_off, u8 vector, u8 msg_type, u8 mask)</div><div class='del'>-{</div><div class='del'>-	unsigned long reg = (lvt_off &lt;&lt; 4) + APIC_EILVT0;</div><div class='del'>-	unsigned int  v   = (mask &lt;&lt; 16) | (msg_type &lt;&lt; 8) | vector;</div><div class='del'>-	apic_write(reg, v);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u8 setup_APIC_eilvt_mce(u8 vector, u8 msg_type, u8 mask)</div><div class='del'>-{</div><div class='del'>-	setup_APIC_eilvt(APIC_EILVT_LVTOFF_MCE, vector, msg_type, mask);</div><div class='del'>-	return APIC_EILVT_LVTOFF_MCE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u8 setup_APIC_eilvt_ibs(u8 vector, u8 msg_type, u8 mask)</div><div class='del'>-{</div><div class='del'>-	setup_APIC_eilvt(APIC_EILVT_LVTOFF_IBS, vector, msg_type, mask);</div><div class='del'>-	return APIC_EILVT_LVTOFF_IBS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * Local APIC start and shutdown</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -715,7 +775,7 @@ void clear_local_APIC(void)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* lets not touch this if we didn't frob it */</div><div class='del'>-#ifdef CONFIG_X86_MCE_P4THERMAL</div><div class='add'>+#if defined(CONFIG_X86_MCE_P4THERMAL) || defined(X86_MCE_INTEL)</div><div class='ctx'> 	if (maxlvt &gt;= 5) {</div><div class='ctx'> 		v = apic_read(APIC_LVTTHMR);</div><div class='ctx'> 		apic_write(APIC_LVTTHMR, v | APIC_LVT_MASKED);</div><div class='hunk'>@@ -732,10 +792,6 @@ void clear_local_APIC(void)</div><div class='ctx'> 	if (maxlvt &gt;= 4)</div><div class='ctx'> 		apic_write(APIC_LVTPC, APIC_LVT_MASKED);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_X86_MCE_P4THERMAL</div><div class='del'>-	if (maxlvt &gt;= 5)</div><div class='del'>-		apic_write(APIC_LVTTHMR, APIC_LVT_MASKED);</div><div class='del'>-#endif</div><div class='ctx'> 	/* Integrated APIC (!82489DX) ? */</div><div class='ctx'> 	if (lapic_is_integrated()) {</div><div class='ctx'> 		if (maxlvt &gt; 3)</div><div class='hunk'>@@ -750,7 +806,7 @@ void clear_local_APIC(void)</div><div class='ctx'>  */</div><div class='ctx'> void disable_local_APIC(void)</div><div class='ctx'> {</div><div class='del'>-	unsigned long value;</div><div class='add'>+	unsigned int value;</div><div class='ctx'> </div><div class='ctx'> 	clear_local_APIC();</div><div class='ctx'> </div><div class='hunk'>@@ -762,6 +818,7 @@ void disable_local_APIC(void)</div><div class='ctx'> 	value &amp;= ~APIC_SPIV_APIC_ENABLED;</div><div class='ctx'> 	apic_write(APIC_SPIV, value);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_X86_32</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * When LAPIC was disabled by the BIOS and enabled by the kernel,</div><div class='ctx'> 	 * restore the disabled state.</div><div class='hunk'>@@ -773,6 +830,7 @@ void disable_local_APIC(void)</div><div class='ctx'> 		l &amp;= ~MSR_IA32_APICBASE_ENABLE;</div><div class='ctx'> 		wrmsr(MSR_IA32_APICBASE, l, h);</div><div class='ctx'> 	}</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -789,11 +847,15 @@ void lapic_shutdown(void)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	local_irq_save(flags);</div><div class='del'>-	clear_local_APIC();</div><div class='ctx'> </div><div class='del'>-	if (enabled_via_apicbase)</div><div class='add'>+#ifdef CONFIG_X86_32</div><div class='add'>+	if (!enabled_via_apicbase)</div><div class='add'>+		clear_local_APIC();</div><div class='add'>+	else</div><div class='add'>+#endif</div><div class='ctx'> 		disable_local_APIC();</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> 	local_irq_restore(flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -838,6 +900,12 @@ int __init verify_local_APIC(void)</div><div class='ctx'> 	 */</div><div class='ctx'> 	reg0 = apic_read(APIC_ID);</div><div class='ctx'> 	apic_printk(APIC_DEBUG, "Getting ID: %x\n", reg0);</div><div class='add'>+	apic_write(APIC_ID, reg0 ^ APIC_ID_MASK);</div><div class='add'>+	reg1 = apic_read(APIC_ID);</div><div class='add'>+	apic_printk(APIC_DEBUG, "Getting ID: %x\n", reg1);</div><div class='add'>+	apic_write(APIC_ID, reg0);</div><div class='add'>+	if (reg1 != (reg0 ^ APIC_ID_MASK))</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The next two are just to see if we have sane values.</div><div class='hunk'>@@ -863,14 +931,15 @@ void __init sync_Arb_IDs(void)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (modern_apic() || boot_cpu_data.x86_vendor == X86_VENDOR_AMD)</div><div class='ctx'> 		return;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Wait for idle.</div><div class='ctx'> 	 */</div><div class='ctx'> 	apic_wait_icr_idle();</div><div class='ctx'> </div><div class='ctx'> 	apic_printk(APIC_DEBUG, "Synchronizing Arb IDs.\n");</div><div class='del'>-	apic_write(APIC_ICR,</div><div class='del'>-		   APIC_DEST_ALLINC | APIC_INT_LEVELTRIG | APIC_DM_INIT);</div><div class='add'>+	apic_write(APIC_ICR, APIC_DEST_ALLINC |</div><div class='add'>+			APIC_INT_LEVELTRIG | APIC_DM_INIT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -878,7 +947,7 @@ void __init sync_Arb_IDs(void)</div><div class='ctx'>  */</div><div class='ctx'> void __init init_bsp_APIC(void)</div><div class='ctx'> {</div><div class='del'>-	unsigned long value;</div><div class='add'>+	unsigned int value;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Don't do the setup now if we have a SMP BIOS as the</div><div class='hunk'>@@ -899,11 +968,13 @@ void __init init_bsp_APIC(void)</div><div class='ctx'> 	value &amp;= ~APIC_VECTOR_MASK;</div><div class='ctx'> 	value |= APIC_SPIV_APIC_ENABLED;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_X86_32</div><div class='ctx'> 	/* This bit is reserved on P4/Xeon and should be cleared */</div><div class='ctx'> 	if ((boot_cpu_data.x86_vendor == X86_VENDOR_INTEL) &amp;&amp;</div><div class='ctx'> 	    (boot_cpu_data.x86 == 15))</div><div class='ctx'> 		value &amp;= ~APIC_SPIV_FOCUS_DISABLED;</div><div class='ctx'> 	else</div><div class='add'>+#endif</div><div class='ctx'> 		value |= APIC_SPIV_FOCUS_DISABLED;</div><div class='ctx'> 	value |= SPURIOUS_APIC_VECTOR;</div><div class='ctx'> 	apic_write(APIC_SPIV, value);</div><div class='hunk'>@@ -922,6 +993,16 @@ static void __cpuinit lapic_setup_esr(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long oldvalue, value, maxlvt;</div><div class='ctx'> 	if (lapic_is_integrated() &amp;&amp; !esr_disable) {</div><div class='add'>+		if (esr_disable) {</div><div class='add'>+			/*</div><div class='add'>+			 * Something untraceable is creating bad interrupts on</div><div class='add'>+			 * secondary quads ... for the moment, just leave the</div><div class='add'>+			 * ESR disabled - we can't do anything useful with the</div><div class='add'>+			 * errors anyway - mbligh</div><div class='add'>+			 */</div><div class='add'>+			printk(KERN_INFO "Leaving ESR disabled.\n");</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='ctx'> 		/* !82489DX */</div><div class='ctx'> 		maxlvt = lapic_get_maxlvt();</div><div class='ctx'> 		if (maxlvt &gt; 3)		/* Due to the Pentium erratum 3AP. */</div><div class='hunk'>@@ -942,16 +1023,7 @@ static void __cpuinit lapic_setup_esr(void)</div><div class='ctx'> 				"vector: 0x%08lx  after: 0x%08lx\n",</div><div class='ctx'> 				oldvalue, value);</div><div class='ctx'> 	} else {</div><div class='del'>-		if (esr_disable)</div><div class='del'>-			/*</div><div class='del'>-			 * Something untraceable is creating bad interrupts on</div><div class='del'>-			 * secondary quads ... for the moment, just leave the</div><div class='del'>-			 * ESR disabled - we can't do anything useful with the</div><div class='del'>-			 * errors anyway - mbligh</div><div class='del'>-			 */</div><div class='del'>-			printk(KERN_INFO "Leaving ESR disabled.\n");</div><div class='del'>-		else</div><div class='del'>-			printk(KERN_INFO "No ESR for 82489DX.\n");</div><div class='add'>+		printk(KERN_INFO "No ESR for 82489DX.\n");</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1089,13 +1161,17 @@ void __cpuinit setup_local_APIC(void)</div><div class='ctx'> </div><div class='ctx'> void __cpuinit end_local_APIC_setup(void)</div><div class='ctx'> {</div><div class='del'>-	unsigned long value;</div><div class='del'>-</div><div class='ctx'> 	lapic_setup_esr();</div><div class='del'>-	/* Disable the local apic timer */</div><div class='del'>-	value = apic_read(APIC_LVTT);</div><div class='del'>-	value |= (APIC_LVT_MASKED | LOCAL_TIMER_VECTOR);</div><div class='del'>-	apic_write(APIC_LVTT, value);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_X86_32</div><div class='add'>+	{</div><div class='add'>+		unsigned int value;</div><div class='add'>+		/* Disable the local apic timer */</div><div class='add'>+		value = apic_read(APIC_LVTT);</div><div class='add'>+		value |= (APIC_LVT_MASKED | LOCAL_TIMER_VECTOR);</div><div class='add'>+		apic_write(APIC_LVTT, value);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	setup_apic_nmi_watchdog(NULL);</div><div class='ctx'> 	apic_pm_activate();</div><div class='hunk'>@@ -1205,7 +1281,7 @@ void __init init_apic_mappings(void)</div><div class='ctx'> 	 * default configuration (or the MP table is broken).</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (boot_cpu_physical_apicid == -1U)</div><div class='del'>-		boot_cpu_physical_apicid = GET_APIC_ID(read_apic_id());</div><div class='add'>+		boot_cpu_physical_apicid = read_apic_id();</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1242,7 +1318,7 @@ int __init APIC_init_uniprocessor(void)</div><div class='ctx'> 	 * might be zero if read from MP tables. Get it from LAPIC.</div><div class='ctx'> 	 */</div><div class='ctx'> #ifdef CONFIG_CRASH_DUMP</div><div class='del'>-	boot_cpu_physical_apicid = GET_APIC_ID(read_apic_id());</div><div class='add'>+	boot_cpu_physical_apicid = read_apic_id();</div><div class='ctx'> #endif</div><div class='ctx'> 	physid_set_mask_of_physid(boot_cpu_physical_apicid, &amp;phys_cpu_present_map);</div><div class='ctx'> </div><div class='hunk'>@@ -1321,59 +1397,12 @@ void smp_error_interrupt(struct pt_regs *regs)</div><div class='ctx'> 	irq_exit();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SMP</div><div class='del'>-void __init smp_intr_init(void)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * IRQ0 must be given a fixed assignment and initialized,</div><div class='del'>-	 * because it's used before the IO-APIC is set up.</div><div class='del'>-	 */</div><div class='del'>-	set_intr_gate(FIRST_DEVICE_VECTOR, interrupt[0]);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * The reschedule interrupt is a CPU-to-CPU reschedule-helper</div><div class='del'>-	 * IPI, driven by wakeup.</div><div class='del'>-	 */</div><div class='del'>-	alloc_intr_gate(RESCHEDULE_VECTOR, reschedule_interrupt);</div><div class='del'>-</div><div class='del'>-	/* IPI for invalidation */</div><div class='del'>-	alloc_intr_gate(INVALIDATE_TLB_VECTOR, invalidate_interrupt);</div><div class='del'>-</div><div class='del'>-	/* IPI for generic function call */</div><div class='del'>-	alloc_intr_gate(CALL_FUNCTION_VECTOR, call_function_interrupt);</div><div class='del'>-</div><div class='del'>-	/* IPI for single call function */</div><div class='del'>-	set_intr_gate(CALL_FUNCTION_SINGLE_VECTOR,</div><div class='del'>-				call_function_single_interrupt);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Initialize APIC interrupts</div><div class='del'>- */</div><div class='del'>-void __init apic_intr_init(void)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_SMP</div><div class='del'>-	smp_intr_init();</div><div class='del'>-#endif</div><div class='del'>-	/* self generated IPI for local APIC timer */</div><div class='del'>-	alloc_intr_gate(LOCAL_TIMER_VECTOR, apic_timer_interrupt);</div><div class='del'>-</div><div class='del'>-	/* IPI vectors for APIC spurious and error interrupts */</div><div class='del'>-	alloc_intr_gate(SPURIOUS_APIC_VECTOR, spurious_interrupt);</div><div class='del'>-	alloc_intr_gate(ERROR_APIC_VECTOR, error_interrupt);</div><div class='del'>-</div><div class='del'>-	/* thermal monitor LVT interrupt */</div><div class='del'>-#ifdef CONFIG_X86_MCE_P4THERMAL</div><div class='del'>-	alloc_intr_gate(THERMAL_APIC_VECTOR, thermal_interrupt);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * connect_bsp_APIC - attach the APIC to the interrupt system</div><div class='ctx'>  */</div><div class='ctx'> void __init connect_bsp_APIC(void)</div><div class='ctx'> {</div><div class='add'>+#ifdef CONFIG_X86_32</div><div class='ctx'> 	if (pic_mode) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Do not trust the local APIC being empty at bootup.</div><div class='hunk'>@@ -1388,6 +1417,7 @@ void __init connect_bsp_APIC(void)</div><div class='ctx'> 		outb(0x70, 0x22);</div><div class='ctx'> 		outb(0x01, 0x23);</div><div class='ctx'> 	}</div><div class='add'>+#endif</div><div class='ctx'> 	enable_apic_mode();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1400,6 +1430,9 @@ void __init connect_bsp_APIC(void)</div><div class='ctx'>  */</div><div class='ctx'> void disconnect_bsp_APIC(int virt_wire_setup)</div><div class='ctx'> {</div><div class='add'>+	unsigned int value;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_X86_32</div><div class='ctx'> 	if (pic_mode) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Put the board back into PIC mode (has an effect only on</div><div class='hunk'>@@ -1411,54 +1444,53 @@ void disconnect_bsp_APIC(int virt_wire_setup)</div><div class='ctx'> 				"entering PIC mode.\n");</div><div class='ctx'> 		outb(0x70, 0x22);</div><div class='ctx'> 		outb(0x00, 0x23);</div><div class='del'>-	} else {</div><div class='del'>-		/* Go back to Virtual Wire compatibility mode */</div><div class='del'>-		unsigned long value;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='del'>-		/* For the spurious interrupt use vector F, and enable it */</div><div class='del'>-		value = apic_read(APIC_SPIV);</div><div class='del'>-		value &amp;= ~APIC_VECTOR_MASK;</div><div class='del'>-		value |= APIC_SPIV_APIC_ENABLED;</div><div class='del'>-		value |= 0xf;</div><div class='del'>-		apic_write(APIC_SPIV, value);</div><div class='add'>+	/* Go back to Virtual Wire compatibility mode */</div><div class='ctx'> </div><div class='del'>-		if (!virt_wire_setup) {</div><div class='del'>-			/*</div><div class='del'>-			 * For LVT0 make it edge triggered, active high,</div><div class='del'>-			 * external and enabled</div><div class='del'>-			 */</div><div class='del'>-			value = apic_read(APIC_LVT0);</div><div class='del'>-			value &amp;= ~(APIC_MODE_MASK | APIC_SEND_PENDING |</div><div class='del'>-				APIC_INPUT_POLARITY | APIC_LVT_REMOTE_IRR |</div><div class='del'>-				APIC_LVT_LEVEL_TRIGGER | APIC_LVT_MASKED);</div><div class='del'>-			value |= APIC_LVT_REMOTE_IRR | APIC_SEND_PENDING;</div><div class='del'>-			value = SET_APIC_DELIVERY_MODE(value, APIC_MODE_EXTINT);</div><div class='del'>-			apic_write(APIC_LVT0, value);</div><div class='del'>-		} else {</div><div class='del'>-			/* Disable LVT0 */</div><div class='del'>-			apic_write(APIC_LVT0, APIC_LVT_MASKED);</div><div class='del'>-		}</div><div class='add'>+	/* For the spurious interrupt use vector F, and enable it */</div><div class='add'>+	value = apic_read(APIC_SPIV);</div><div class='add'>+	value &amp;= ~APIC_VECTOR_MASK;</div><div class='add'>+	value |= APIC_SPIV_APIC_ENABLED;</div><div class='add'>+	value |= 0xf;</div><div class='add'>+	apic_write(APIC_SPIV, value);</div><div class='ctx'> </div><div class='add'>+	if (!virt_wire_setup) {</div><div class='ctx'> 		/*</div><div class='del'>-		 * For LVT1 make it edge triggered, active high, nmi and</div><div class='del'>-		 * enabled</div><div class='add'>+		 * For LVT0 make it edge triggered, active high,</div><div class='add'>+		 * external and enabled</div><div class='ctx'> 		 */</div><div class='del'>-		value = apic_read(APIC_LVT1);</div><div class='del'>-		value &amp;= ~(</div><div class='del'>-			APIC_MODE_MASK | APIC_SEND_PENDING |</div><div class='add'>+		value = apic_read(APIC_LVT0);</div><div class='add'>+		value &amp;= ~(APIC_MODE_MASK | APIC_SEND_PENDING |</div><div class='ctx'> 			APIC_INPUT_POLARITY | APIC_LVT_REMOTE_IRR |</div><div class='ctx'> 			APIC_LVT_LEVEL_TRIGGER | APIC_LVT_MASKED);</div><div class='ctx'> 		value |= APIC_LVT_REMOTE_IRR | APIC_SEND_PENDING;</div><div class='del'>-		value = SET_APIC_DELIVERY_MODE(value, APIC_MODE_NMI);</div><div class='del'>-		apic_write(APIC_LVT1, value);</div><div class='add'>+		value = SET_APIC_DELIVERY_MODE(value, APIC_MODE_EXTINT);</div><div class='add'>+		apic_write(APIC_LVT0, value);</div><div class='add'>+	} else {</div><div class='add'>+		/* Disable LVT0 */</div><div class='add'>+		apic_write(APIC_LVT0, APIC_LVT_MASKED);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * For LVT1 make it edge triggered, active high,</div><div class='add'>+	 * nmi and enabled</div><div class='add'>+	 */</div><div class='add'>+	value = apic_read(APIC_LVT1);</div><div class='add'>+	value &amp;= ~(APIC_MODE_MASK | APIC_SEND_PENDING |</div><div class='add'>+			APIC_INPUT_POLARITY | APIC_LVT_REMOTE_IRR |</div><div class='add'>+			APIC_LVT_LEVEL_TRIGGER | APIC_LVT_MASKED);</div><div class='add'>+	value |= APIC_LVT_REMOTE_IRR | APIC_SEND_PENDING;</div><div class='add'>+	value = SET_APIC_DELIVERY_MODE(value, APIC_MODE_NMI);</div><div class='add'>+	apic_write(APIC_LVT1, value);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __cpuinit generic_processor_info(int apicid, int version)</div><div class='ctx'> {</div><div class='ctx'> 	int cpu;</div><div class='ctx'> 	cpumask_t tmp_map;</div><div class='del'>-	physid_mask_t phys_cpu;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Validate version</div><div class='hunk'>@@ -1471,9 +1503,6 @@ void __cpuinit generic_processor_info(int apicid, int version)</div><div class='ctx'> 	}</div><div class='ctx'> 	apic_version[apicid] = version;</div><div class='ctx'> </div><div class='del'>-	phys_cpu = apicid_to_cpu_present(apicid);</div><div class='del'>-	physids_or(phys_cpu_present_map, phys_cpu_present_map, phys_cpu);</div><div class='del'>-</div><div class='ctx'> 	if (num_processors &gt;= NR_CPUS) {</div><div class='ctx'> 		printk(KERN_WARNING "WARNING: NR_CPUS limit of %i reached."</div><div class='ctx'> 			"  Processor ignored.\n", NR_CPUS);</div><div class='hunk'>@@ -1484,17 +1513,19 @@ void __cpuinit generic_processor_info(int apicid, int version)</div><div class='ctx'> 	cpus_complement(tmp_map, cpu_present_map);</div><div class='ctx'> 	cpu = first_cpu(tmp_map);</div><div class='ctx'> </div><div class='del'>-	if (apicid == boot_cpu_physical_apicid)</div><div class='add'>+	physid_set(apicid, phys_cpu_present_map);</div><div class='add'>+	if (apicid == boot_cpu_physical_apicid) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * x86_bios_cpu_apicid is required to have processors listed</div><div class='ctx'> 		 * in same order as logical cpu numbers. Hence the first</div><div class='ctx'> 		 * entry is BSP, and so on.</div><div class='ctx'> 		 */</div><div class='ctx'> 		cpu = 0;</div><div class='del'>-</div><div class='add'>+	}</div><div class='ctx'> 	if (apicid &gt; max_physical_apicid)</div><div class='ctx'> 		max_physical_apicid = apicid;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_X86_32</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Would be preferable to switch to bigsmp when CONFIG_HOTPLUG_CPU=y</div><div class='ctx'> 	 * but we need to work other dependencies like SMP_SUSPEND etc</div><div class='hunk'>@@ -1514,7 +1545,9 @@ void __cpuinit generic_processor_info(int apicid, int version)</div><div class='ctx'> 			def_to_bigsmp = 1;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-#ifdef CONFIG_SMP</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_X86_SMP) || defined(CONFIG_X86_64)</div><div class='ctx'> 	/* are we being called early in kernel startup? */</div><div class='ctx'> 	if (early_per_cpu_ptr(x86_cpu_to_apicid)) {</div><div class='ctx'> 		u16 *cpu_to_apicid = early_per_cpu_ptr(x86_cpu_to_apicid);</div><div class='hunk'>@@ -1527,6 +1560,7 @@ void __cpuinit generic_processor_info(int apicid, int version)</div><div class='ctx'> 		per_cpu(x86_bios_cpu_apicid, cpu) = apicid;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> 	cpu_set(cpu, cpu_possible_map);</div><div class='ctx'> 	cpu_set(cpu, cpu_present_map);</div><div class='ctx'> }</div><div class='hunk'>@@ -1537,6 +1571,11 @@ void __cpuinit generic_processor_info(int apicid, int version)</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> </div><div class='ctx'> static struct {</div><div class='add'>+	/*</div><div class='add'>+	 * 'active' is true if the local APIC was enabled by us and</div><div class='add'>+	 * not the BIOS; this signifies that we are also responsible</div><div class='add'>+	 * for disabling it before entering apm/acpi suspend</div><div class='add'>+	 */</div><div class='ctx'> 	int active;</div><div class='ctx'> 	/* r/w apic fields */</div><div class='ctx'> 	unsigned int apic_id;</div><div class='hunk'>@@ -1577,7 +1616,7 @@ static int lapic_suspend(struct sys_device *dev, pm_message_t state)</div><div class='ctx'> 	apic_pm_state.apic_lvterr = apic_read(APIC_LVTERR);</div><div class='ctx'> 	apic_pm_state.apic_tmict = apic_read(APIC_TMICT);</div><div class='ctx'> 	apic_pm_state.apic_tdcr = apic_read(APIC_TDCR);</div><div class='del'>-#ifdef CONFIG_X86_MCE_P4THERMAL</div><div class='add'>+#if defined(CONFIG_X86_MCE_P4THERMAL) || defined(CONFIG_X86_MCE_INTEL)</div><div class='ctx'> 	if (maxlvt &gt;= 5)</div><div class='ctx'> 		apic_pm_state.apic_thmr = apic_read(APIC_LVTTHMR);</div><div class='ctx'> #endif</div><div class='hunk'>@@ -1601,16 +1640,23 @@ static int lapic_resume(struct sys_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	local_irq_save(flags);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Make sure the APICBASE points to the right address</div><div class='del'>-	 *</div><div class='del'>-	 * FIXME! This will be wrong if we ever support suspend on</div><div class='del'>-	 * SMP! We'll need to do this as part of the CPU restore!</div><div class='del'>-	 */</div><div class='del'>-	rdmsr(MSR_IA32_APICBASE, l, h);</div><div class='del'>-	l &amp;= ~MSR_IA32_APICBASE_BASE;</div><div class='del'>-	l |= MSR_IA32_APICBASE_ENABLE | mp_lapic_addr;</div><div class='del'>-	wrmsr(MSR_IA32_APICBASE, l, h);</div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='add'>+	if (x2apic)</div><div class='add'>+		enable_x2apic();</div><div class='add'>+	else</div><div class='add'>+#endif</div><div class='add'>+	{</div><div class='add'>+		/*</div><div class='add'>+		 * Make sure the APICBASE points to the right address</div><div class='add'>+		 *</div><div class='add'>+		 * FIXME! This will be wrong if we ever support suspend on</div><div class='add'>+		 * SMP! We'll need to do this as part of the CPU restore!</div><div class='add'>+		 */</div><div class='add'>+		rdmsr(MSR_IA32_APICBASE, l, h);</div><div class='add'>+		l &amp;= ~MSR_IA32_APICBASE_BASE;</div><div class='add'>+		l |= MSR_IA32_APICBASE_ENABLE | mp_lapic_addr;</div><div class='add'>+		wrmsr(MSR_IA32_APICBASE, l, h);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	apic_write(APIC_LVTERR, ERROR_APIC_VECTOR | APIC_LVT_MASKED);</div><div class='ctx'> 	apic_write(APIC_ID, apic_pm_state.apic_id);</div><div class='hunk'>@@ -1620,7 +1666,7 @@ static int lapic_resume(struct sys_device *dev)</div><div class='ctx'> 	apic_write(APIC_SPIV, apic_pm_state.apic_spiv);</div><div class='ctx'> 	apic_write(APIC_LVT0, apic_pm_state.apic_lvt0);</div><div class='ctx'> 	apic_write(APIC_LVT1, apic_pm_state.apic_lvt1);</div><div class='del'>-#ifdef CONFIG_X86_MCE_P4THERMAL</div><div class='add'>+#if defined(CONFIG_X86_MCE_P4THERMAL) || defined(CONFIG_X86_MCE_INTEL)</div><div class='ctx'> 	if (maxlvt &gt;= 5)</div><div class='ctx'> 		apic_write(APIC_LVTTHMR, apic_pm_state.apic_thmr);</div><div class='ctx'> #endif</div><div class='hunk'>@@ -1634,7 +1680,9 @@ static int lapic_resume(struct sys_device *dev)</div><div class='ctx'> 	apic_write(APIC_LVTERR, apic_pm_state.apic_lvterr);</div><div class='ctx'> 	apic_write(APIC_ESR, 0);</div><div class='ctx'> 	apic_read(APIC_ESR);</div><div class='add'>+</div><div class='ctx'> 	local_irq_restore(flags);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1690,20 +1738,20 @@ static int __init parse_lapic(char *arg)</div><div class='ctx'> }</div><div class='ctx'> early_param("lapic", parse_lapic);</div><div class='ctx'> </div><div class='del'>-static int __init parse_nolapic(char *arg)</div><div class='add'>+static int __init setup_disableapic(char *arg)</div><div class='ctx'> {</div><div class='ctx'> 	disable_apic = 1;</div><div class='ctx'> 	setup_clear_cpu_cap(X86_FEATURE_APIC);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-early_param("nolapic", parse_nolapic);</div><div class='add'>+early_param("disableapic", setup_disableapic);</div><div class='ctx'> </div><div class='del'>-static int __init parse_disable_lapic_timer(char *arg)</div><div class='add'>+/* same as disableapic, for compatibility */</div><div class='add'>+static int __init setup_nolapic(char *arg)</div><div class='ctx'> {</div><div class='del'>-	local_apic_timer_disabled = 1;</div><div class='del'>-	return 0;</div><div class='add'>+	return setup_disableapic(arg);</div><div class='ctx'> }</div><div class='del'>-early_param("nolapic_timer", parse_disable_lapic_timer);</div><div class='add'>+early_param("nolapic", setup_nolapic);</div><div class='ctx'> </div><div class='ctx'> static int __init parse_lapic_timer_c2_ok(char *arg)</div><div class='ctx'> {</div><div class='hunk'>@@ -1712,15 +1760,40 @@ static int __init parse_lapic_timer_c2_ok(char *arg)</div><div class='ctx'> }</div><div class='ctx'> early_param("lapic_timer_c2_ok", parse_lapic_timer_c2_ok);</div><div class='ctx'> </div><div class='add'>+static int __init parse_disable_apic_timer(char *arg)</div><div class='add'>+{</div><div class='add'>+	disable_apic_timer = 1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+early_param("noapictimer", parse_disable_apic_timer);</div><div class='add'>+</div><div class='add'>+static int __init parse_nolapic_timer(char *arg)</div><div class='add'>+{</div><div class='add'>+	disable_apic_timer = 1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+early_param("nolapic_timer", parse_nolapic_timer);</div><div class='add'>+</div><div class='ctx'> static int __init apic_set_verbosity(char *arg)</div><div class='ctx'> {</div><div class='del'>-	if (!arg)</div><div class='add'>+	if (!arg)  {</div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='add'>+		skip_ioapic_setup = 0;</div><div class='add'>+		ioapic_force = 1;</div><div class='add'>+		return 0;</div><div class='add'>+#endif</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (strcmp(arg, "debug") == 0)</div><div class='add'>+	if (strcmp("debug", arg) == 0)</div><div class='ctx'> 		apic_verbosity = APIC_DEBUG;</div><div class='del'>-	else if (strcmp(arg, "verbose") == 0)</div><div class='add'>+	else if (strcmp("verbose", arg) == 0)</div><div class='ctx'> 		apic_verbosity = APIC_VERBOSE;</div><div class='add'>+	else {</div><div class='add'>+		printk(KERN_WARNING "APIC Verbosity level %s not recognised"</div><div class='add'>+			" use apic=verbose or apic=debug\n", arg);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c<br/>index 446c062e831c..94ddb69ae15e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/apic_64.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/apic_64.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/apic_64.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/apic_64.c</a></div><div class='hunk'>@@ -27,6 +27,7 @@</div><div class='ctx'> #include &lt;linux/clockchips.h&gt;</div><div class='ctx'> #include &lt;linux/acpi_pmtmr.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/dmar.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/atomic.h&gt;</div><div class='ctx'> #include &lt;asm/smp.h&gt;</div><div class='hunk'>@@ -39,13 +40,20 @@</div><div class='ctx'> #include &lt;asm/proto.h&gt;</div><div class='ctx'> #include &lt;asm/timex.h&gt;</div><div class='ctx'> #include &lt;asm/apic.h&gt;</div><div class='add'>+#include &lt;asm/i8259.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach_ipi.h&gt;</div><div class='ctx'> #include &lt;mach_apic.h&gt;</div><div class='ctx'> </div><div class='add'>+/* Disable local APIC timer from the kernel commandline or via dmi quirk */</div><div class='ctx'> static int disable_apic_timer __cpuinitdata;</div><div class='ctx'> static int apic_calibrate_pmtmr __initdata;</div><div class='ctx'> int disable_apic;</div><div class='add'>+int disable_x2apic;</div><div class='add'>+int x2apic;</div><div class='add'>+</div><div class='add'>+/* x2apic enabled before OS handover */</div><div class='add'>+int x2apic_preenabled;</div><div class='ctx'> </div><div class='ctx'> /* Local APIC timer works in C2 */</div><div class='ctx'> int local_apic_timer_c2_ok;</div><div class='hunk'>@@ -73,6 +81,9 @@ static void lapic_timer_setup(enum clock_event_mode mode,</div><div class='ctx'> static void lapic_timer_broadcast(cpumask_t mask);</div><div class='ctx'> static void apic_pm_activate(void);</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * The local apic timer can be used for any function which is CPU local.</div><div class='add'>+ */</div><div class='ctx'> static struct clock_event_device lapic_clockevent = {</div><div class='ctx'> 	.name		= "lapic",</div><div class='ctx'> 	.features	= CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT</div><div class='hunk'>@@ -99,11 +110,15 @@ static inline int lapic_get_version(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Check, if the APIC is integrated or a seperate chip</div><div class='add'>+ * Check, if the APIC is integrated or a separate chip</div><div class='ctx'>  */</div><div class='ctx'> static inline int lapic_is_integrated(void)</div><div class='ctx'> {</div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='ctx'> 	return 1;</div><div class='add'>+#else</div><div class='add'>+	return APIC_INTEGRATED(lapic_get_version());</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -118,13 +133,18 @@ static int modern_apic(void)</div><div class='ctx'> 	return lapic_get_version() &gt;= 0x14;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void apic_wait_icr_idle(void)</div><div class='add'>+/*</div><div class='add'>+ * Paravirt kernels also might be using these below ops. So we still</div><div class='add'>+ * use generic apic_read()/apic_write(), which might be pointing to different</div><div class='add'>+ * ops in PARAVIRT case.</div><div class='add'>+ */</div><div class='add'>+void xapic_wait_icr_idle(void)</div><div class='ctx'> {</div><div class='ctx'> 	while (apic_read(APIC_ICR) &amp; APIC_ICR_BUSY)</div><div class='ctx'> 		cpu_relax();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u32 safe_apic_wait_icr_idle(void)</div><div class='add'>+u32 safe_xapic_wait_icr_idle(void)</div><div class='ctx'> {</div><div class='ctx'> 	u32 send_status;</div><div class='ctx'> 	int timeout;</div><div class='hunk'>@@ -140,6 +160,68 @@ u32 safe_apic_wait_icr_idle(void)</div><div class='ctx'> 	return send_status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void xapic_icr_write(u32 low, u32 id)</div><div class='add'>+{</div><div class='add'>+	apic_write(APIC_ICR2, SET_APIC_DEST_FIELD(id));</div><div class='add'>+	apic_write(APIC_ICR, low);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u64 xapic_icr_read(void)</div><div class='add'>+{</div><div class='add'>+	u32 icr1, icr2;</div><div class='add'>+</div><div class='add'>+	icr2 = apic_read(APIC_ICR2);</div><div class='add'>+	icr1 = apic_read(APIC_ICR);</div><div class='add'>+</div><div class='add'>+	return icr1 | ((u64)icr2 &lt;&lt; 32);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct apic_ops xapic_ops = {</div><div class='add'>+	.read = native_apic_mem_read,</div><div class='add'>+	.write = native_apic_mem_write,</div><div class='add'>+	.icr_read = xapic_icr_read,</div><div class='add'>+	.icr_write = xapic_icr_write,</div><div class='add'>+	.wait_icr_idle = xapic_wait_icr_idle,</div><div class='add'>+	.safe_wait_icr_idle = safe_xapic_wait_icr_idle,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct apic_ops __read_mostly *apic_ops = &amp;xapic_ops;</div><div class='add'>+EXPORT_SYMBOL_GPL(apic_ops);</div><div class='add'>+</div><div class='add'>+static void x2apic_wait_icr_idle(void)</div><div class='add'>+{</div><div class='add'>+	/* no need to wait for icr idle in x2apic */</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 safe_x2apic_wait_icr_idle(void)</div><div class='add'>+{</div><div class='add'>+	/* no need to wait for icr idle in x2apic */</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void x2apic_icr_write(u32 low, u32 id)</div><div class='add'>+{</div><div class='add'>+	wrmsrl(APIC_BASE_MSR + (APIC_ICR &gt;&gt; 4), ((__u64) id) &lt;&lt; 32 | low);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u64 x2apic_icr_read(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long val;</div><div class='add'>+</div><div class='add'>+	rdmsrl(APIC_BASE_MSR + (APIC_ICR &gt;&gt; 4), val);</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct apic_ops x2apic_ops = {</div><div class='add'>+	.read = native_apic_msr_read,</div><div class='add'>+	.write = native_apic_msr_write,</div><div class='add'>+	.icr_read = x2apic_icr_read,</div><div class='add'>+	.icr_write = x2apic_icr_write,</div><div class='add'>+	.wait_icr_idle = x2apic_wait_icr_idle,</div><div class='add'>+	.safe_wait_icr_idle = safe_x2apic_wait_icr_idle,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * enable_NMI_through_LVT0 - enable NMI through local vector table 0</div><div class='ctx'>  */</div><div class='hunk'>@@ -149,6 +231,11 @@ void __cpuinit enable_NMI_through_LVT0(void)</div><div class='ctx'> </div><div class='ctx'> 	/* unmask and set to NMI */</div><div class='ctx'> 	v = APIC_DM_NMI;</div><div class='add'>+</div><div class='add'>+	/* Level triggered for 82489DX (32bit mode) */</div><div class='add'>+	if (!lapic_is_integrated())</div><div class='add'>+		v |= APIC_LVT_LEVEL_TRIGGER;</div><div class='add'>+</div><div class='ctx'> 	apic_write(APIC_LVT0, v);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -157,14 +244,28 @@ void __cpuinit enable_NMI_through_LVT0(void)</div><div class='ctx'>  */</div><div class='ctx'> int lapic_get_maxlvt(void)</div><div class='ctx'> {</div><div class='del'>-	unsigned int v, maxlvt;</div><div class='add'>+	unsigned int v;</div><div class='ctx'> </div><div class='ctx'> 	v = apic_read(APIC_LVR);</div><div class='del'>-	maxlvt = GET_APIC_MAXLVT(v);</div><div class='del'>-	return maxlvt;</div><div class='add'>+	/*</div><div class='add'>+	 * - we always have APIC integrated on 64bit mode</div><div class='add'>+	 * - 82489DXs do not report # of LVT entries</div><div class='add'>+	 */</div><div class='add'>+	return APIC_INTEGRATED(GET_APIC_VERSION(v)) ? GET_APIC_MAXLVT(v) : 2;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Local APIC timer</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* Clock divisor */</div><div class='add'>+#ifdef CONFG_X86_64</div><div class='add'>+#define APIC_DIVISOR 1</div><div class='add'>+#else</div><div class='add'>+#define APIC_DIVISOR 16</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * This function sets up the local APIC timer, with a timeout of</div><div class='ctx'>  * 'clocks' APIC bus clock. During calibration we actually call</div><div class='ctx'>  * this function twice on the boot CPU, once with a bogus timeout</div><div class='hunk'>@@ -174,7 +275,6 @@ int lapic_get_maxlvt(void)</div><div class='ctx'>  * We do reads before writes even if unnecessary, to get around the</div><div class='ctx'>  * P5 APIC double write bug.</div><div class='ctx'>  */</div><div class='del'>-</div><div class='ctx'> static void __setup_APIC_LVTT(unsigned int clocks, int oneshot, int irqen)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int lvtt_value, tmp_value;</div><div class='hunk'>@@ -182,6 +282,9 @@ static void __setup_APIC_LVTT(unsigned int clocks, int oneshot, int irqen)</div><div class='ctx'> 	lvtt_value = LOCAL_TIMER_VECTOR;</div><div class='ctx'> 	if (!oneshot)</div><div class='ctx'> 		lvtt_value |= APIC_LVT_TIMER_PERIODIC;</div><div class='add'>+	if (!lapic_is_integrated())</div><div class='add'>+		lvtt_value |= SET_APIC_TIMER_BASE(APIC_TIMER_BASE_DIV);</div><div class='add'>+</div><div class='ctx'> 	if (!irqen)</div><div class='ctx'> 		lvtt_value |= APIC_LVT_MASKED;</div><div class='ctx'> </div><div class='hunk'>@@ -191,12 +294,12 @@ static void __setup_APIC_LVTT(unsigned int clocks, int oneshot, int irqen)</div><div class='ctx'> 	 * Divide PICLK by 16</div><div class='ctx'> 	 */</div><div class='ctx'> 	tmp_value = apic_read(APIC_TDCR);</div><div class='del'>-	apic_write(APIC_TDCR, (tmp_value</div><div class='del'>-				&amp; ~(APIC_TDR_DIV_1 | APIC_TDR_DIV_TMBASE))</div><div class='del'>-				| APIC_TDR_DIV_16);</div><div class='add'>+	apic_write(APIC_TDCR,</div><div class='add'>+		(tmp_value &amp; ~(APIC_TDR_DIV_1 | APIC_TDR_DIV_TMBASE)) |</div><div class='add'>+		APIC_TDR_DIV_16);</div><div class='ctx'> </div><div class='ctx'> 	if (!oneshot)</div><div class='del'>-		apic_write(APIC_TMICT, clocks);</div><div class='add'>+		apic_write(APIC_TMICT, clocks / APIC_DIVISOR);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -204,6 +307,9 @@ static void __setup_APIC_LVTT(unsigned int clocks, int oneshot, int irqen)</div><div class='ctx'>  *</div><div class='ctx'>  * Vector mappings are hard coded. On K8 only offset 0 (APIC500) and</div><div class='ctx'>  * MCE interrupts are supported. Thus MCE offset must be set to 0.</div><div class='add'>+ *</div><div class='add'>+ * If mask=1, the LVT entry does not generate interrupts while mask=0</div><div class='add'>+ * enables the vector. See also the BKDGs.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define APIC_EILVT_LVTOFF_MCE 0</div><div class='hunk'>@@ -228,6 +334,7 @@ u8 setup_APIC_eilvt_ibs(u8 vector, u8 msg_type, u8 mask)</div><div class='ctx'> 	setup_APIC_eilvt(APIC_EILVT_LVTOFF_IBS, vector, msg_type, mask);</div><div class='ctx'> 	return APIC_EILVT_LVTOFF_IBS;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(setup_APIC_eilvt_ibs);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Program the next event, relative to now</div><div class='hunk'>@@ -366,7 +473,7 @@ static int __init calibrate_APIC_clock(void)</div><div class='ctx'> 	lapic_clockevent.min_delta_ns =</div><div class='ctx'> 		clockevent_delta2ns(0xF, &amp;lapic_clockevent);</div><div class='ctx'> </div><div class='del'>-	calibration_result = result / HZ;</div><div class='add'>+	calibration_result = (result * APIC_DIVISOR) / HZ;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Do a sanity check on the APIC calibration result</div><div class='hunk'>@@ -388,10 +495,10 @@ static int __init calibrate_APIC_clock(void)</div><div class='ctx'> void __init setup_boot_APIC_clock(void)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='del'>-	 * The local apic timer can be disabled via the kernel commandline.</div><div class='del'>-	 * Register the lapic timer as a dummy clock event source on SMP</div><div class='del'>-	 * systems, so the broadcast mechanism is used. On UP systems simply</div><div class='del'>-	 * ignore it.</div><div class='add'>+	 * The local apic timer can be disabled via the kernel</div><div class='add'>+	 * commandline or from the CPU detection code. Register the lapic</div><div class='add'>+	 * timer as a dummy clock event source on SMP systems, so the</div><div class='add'>+	 * broadcast mechanism is used. On UP systems simply ignore it.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (disable_apic_timer) {</div><div class='ctx'> 		printk(KERN_INFO "Disabling APIC timer\n");</div><div class='hunk'>@@ -403,7 +510,9 @@ void __init setup_boot_APIC_clock(void)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "Using local APIC timer interrupts.\n");</div><div class='add'>+	apic_printk(APIC_VERBOSE, "Using local APIC timer interrupts.\n"</div><div class='add'>+		    "calibrating APIC timer ...\n");</div><div class='add'>+</div><div class='ctx'> 	if (calibrate_APIC_clock()) {</div><div class='ctx'> 		/* No broadcast on UP ! */</div><div class='ctx'> 		if (num_possible_cpus() &gt; 1)</div><div class='hunk'>@@ -422,6 +531,7 @@ void __init setup_boot_APIC_clock(void)</div><div class='ctx'> 		printk(KERN_WARNING "APIC timer registered as dummy,"</div><div class='ctx'> 			" due to nmi_watchdog=%d!\n", nmi_watchdog);</div><div class='ctx'> </div><div class='add'>+	/* Setup the lapic or request the broadcast */</div><div class='ctx'> 	setup_APIC_timer();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -460,7 +570,11 @@ static void local_apic_timer_interrupt(void)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * the NMI deadlock-detector uses this.</div><div class='ctx'> 	 */</div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='ctx'> 	add_pda(apic_timer_irqs, 1);</div><div class='add'>+#else</div><div class='add'>+	per_cpu(irq_stat, cpu).apic_timer_irqs++;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	evt-&gt;event_handler(evt);</div><div class='ctx'> }</div><div class='hunk'>@@ -491,6 +605,7 @@ void smp_apic_timer_interrupt(struct pt_regs *regs)</div><div class='ctx'> 	irq_enter();</div><div class='ctx'> 	local_apic_timer_interrupt();</div><div class='ctx'> 	irq_exit();</div><div class='add'>+</div><div class='ctx'> 	set_irq_regs(old_regs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -544,6 +659,13 @@ void clear_local_APIC(void)</div><div class='ctx'> 		apic_write(APIC_LVTPC, v | APIC_LVT_MASKED);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* lets not touch this if we didn't frob it */</div><div class='add'>+#if defined(CONFIG_X86_MCE_P4THERMAL) || defined(X86_MCE_INTEL)</div><div class='add'>+	if (maxlvt &gt;= 5) {</div><div class='add'>+		v = apic_read(APIC_LVTTHMR);</div><div class='add'>+		apic_write(APIC_LVTTHMR, v | APIC_LVT_MASKED);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Clean APIC state for other OSs:</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -554,8 +676,14 @@ void clear_local_APIC(void)</div><div class='ctx'> 		apic_write(APIC_LVTERR, APIC_LVT_MASKED);</div><div class='ctx'> 	if (maxlvt &gt;= 4)</div><div class='ctx'> 		apic_write(APIC_LVTPC, APIC_LVT_MASKED);</div><div class='del'>-	apic_write(APIC_ESR, 0);</div><div class='del'>-	apic_read(APIC_ESR);</div><div class='add'>+</div><div class='add'>+	/* Integrated APIC (!82489DX) ? */</div><div class='add'>+	if (lapic_is_integrated()) {</div><div class='add'>+		if (maxlvt &gt; 3)</div><div class='add'>+			/* Clear ESR due to Pentium errata 3AP and 11AP */</div><div class='add'>+			apic_write(APIC_ESR, 0);</div><div class='add'>+		apic_read(APIC_ESR);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -574,8 +702,28 @@ void disable_local_APIC(void)</div><div class='ctx'> 	value = apic_read(APIC_SPIV);</div><div class='ctx'> 	value &amp;= ~APIC_SPIV_APIC_ENABLED;</div><div class='ctx'> 	apic_write(APIC_SPIV, value);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_X86_32</div><div class='add'>+	/*</div><div class='add'>+	 * When LAPIC was disabled by the BIOS and enabled by the kernel,</div><div class='add'>+	 * restore the disabled state.</div><div class='add'>+	 */</div><div class='add'>+	if (enabled_via_apicbase) {</div><div class='add'>+		unsigned int l, h;</div><div class='add'>+</div><div class='add'>+		rdmsr(MSR_IA32_APICBASE, l, h);</div><div class='add'>+		l &amp;= ~MSR_IA32_APICBASE_ENABLE;</div><div class='add'>+		wrmsr(MSR_IA32_APICBASE, l, h);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * If Linux enabled the LAPIC against the BIOS default disable it down before</div><div class='add'>+ * re-entering the BIOS on shutdown.  Otherwise the BIOS may get confused and</div><div class='add'>+ * not power-off.  Additionally clear all LVT entries before disable_local_APIC</div><div class='add'>+ * for the case where Linux didn't enable the LAPIC.</div><div class='add'>+ */</div><div class='ctx'> void lapic_shutdown(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='hunk'>@@ -585,7 +733,13 @@ void lapic_shutdown(void)</div><div class='ctx'> </div><div class='ctx'> 	local_irq_save(flags);</div><div class='ctx'> </div><div class='del'>-	disable_local_APIC();</div><div class='add'>+#ifdef CONFIG_X86_32</div><div class='add'>+	if (!enabled_via_apicbase)</div><div class='add'>+		clear_local_APIC();</div><div class='add'>+	else</div><div class='add'>+#endif</div><div class='add'>+		disable_local_APIC();</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> 	local_irq_restore(flags);</div><div class='ctx'> }</div><div class='hunk'>@@ -629,10 +783,10 @@ int __init verify_local_APIC(void)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The ID register is read/write in a real APIC.</div><div class='ctx'> 	 */</div><div class='del'>-	reg0 = read_apic_id();</div><div class='add'>+	reg0 = apic_read(APIC_ID);</div><div class='ctx'> 	apic_printk(APIC_DEBUG, "Getting ID: %x\n", reg0);</div><div class='ctx'> 	apic_write(APIC_ID, reg0 ^ APIC_ID_MASK);</div><div class='del'>-	reg1 = read_apic_id();</div><div class='add'>+	reg1 = apic_read(APIC_ID);</div><div class='ctx'> 	apic_printk(APIC_DEBUG, "Getting ID: %x\n", reg1);</div><div class='ctx'> 	apic_write(APIC_ID, reg0);</div><div class='ctx'> 	if (reg1 != (reg0 ^ APIC_ID_MASK))</div><div class='hunk'>@@ -656,8 +810,11 @@ int __init verify_local_APIC(void)</div><div class='ctx'>  */</div><div class='ctx'> void __init sync_Arb_IDs(void)</div><div class='ctx'> {</div><div class='del'>-	/* Unsupported on P4 - see Intel Dev. Manual Vol. 3, Ch. 8.6.1 */</div><div class='del'>-	if (modern_apic())</div><div class='add'>+	/*</div><div class='add'>+	 * Unsupported on P4 - see Intel Dev. Manual Vol. 3, Ch. 8.6.1 And not</div><div class='add'>+	 * needed on AMD.</div><div class='add'>+	 */</div><div class='add'>+	if (modern_apic() || boot_cpu_data.x86_vendor == X86_VENDOR_AMD)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -666,8 +823,8 @@ void __init sync_Arb_IDs(void)</div><div class='ctx'> 	apic_wait_icr_idle();</div><div class='ctx'> </div><div class='ctx'> 	apic_printk(APIC_DEBUG, "Synchronizing Arb IDs.\n");</div><div class='del'>-	apic_write(APIC_ICR, APIC_DEST_ALLINC | APIC_INT_LEVELTRIG</div><div class='del'>-				| APIC_DM_INIT);</div><div class='add'>+	apic_write(APIC_ICR, APIC_DEST_ALLINC |</div><div class='add'>+			APIC_INT_LEVELTRIG | APIC_DM_INIT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -684,8 +841,6 @@ void __init init_bsp_APIC(void)</div><div class='ctx'> 	if (smp_found_config || !cpu_has_apic)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	value = apic_read(APIC_LVR);</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Do not trust the local APIC being empty at bootup.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -697,7 +852,15 @@ void __init init_bsp_APIC(void)</div><div class='ctx'> 	value = apic_read(APIC_SPIV);</div><div class='ctx'> 	value &amp;= ~APIC_VECTOR_MASK;</div><div class='ctx'> 	value |= APIC_SPIV_APIC_ENABLED;</div><div class='del'>-	value |= APIC_SPIV_FOCUS_DISABLED;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_X86_32</div><div class='add'>+	/* This bit is reserved on P4/Xeon and should be cleared */</div><div class='add'>+	if ((boot_cpu_data.x86_vendor == X86_VENDOR_INTEL) &amp;&amp;</div><div class='add'>+	    (boot_cpu_data.x86 == 15))</div><div class='add'>+		value &amp;= ~APIC_SPIV_FOCUS_DISABLED;</div><div class='add'>+	else</div><div class='add'>+#endif</div><div class='add'>+		value |= APIC_SPIV_FOCUS_DISABLED;</div><div class='ctx'> 	value |= SPURIOUS_APIC_VECTOR;</div><div class='ctx'> 	apic_write(APIC_SPIV, value);</div><div class='ctx'> </div><div class='hunk'>@@ -706,9 +869,50 @@ void __init init_bsp_APIC(void)</div><div class='ctx'> 	 */</div><div class='ctx'> 	apic_write(APIC_LVT0, APIC_DM_EXTINT);</div><div class='ctx'> 	value = APIC_DM_NMI;</div><div class='add'>+	if (!lapic_is_integrated())		/* 82489DX */</div><div class='add'>+		value |= APIC_LVT_LEVEL_TRIGGER;</div><div class='ctx'> 	apic_write(APIC_LVT1, value);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void __cpuinit lapic_setup_esr(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long oldvalue, value, maxlvt;</div><div class='add'>+	if (lapic_is_integrated() &amp;&amp; !esr_disable) {</div><div class='add'>+		if (esr_disable) {</div><div class='add'>+			/*</div><div class='add'>+			 * Something untraceable is creating bad interrupts on</div><div class='add'>+			 * secondary quads ... for the moment, just leave the</div><div class='add'>+			 * ESR disabled - we can't do anything useful with the</div><div class='add'>+			 * errors anyway - mbligh</div><div class='add'>+			 */</div><div class='add'>+			printk(KERN_INFO "Leaving ESR disabled.\n");</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+		/* !82489DX */</div><div class='add'>+		maxlvt = lapic_get_maxlvt();</div><div class='add'>+		if (maxlvt &gt; 3)		/* Due to the Pentium erratum 3AP. */</div><div class='add'>+			apic_write(APIC_ESR, 0);</div><div class='add'>+		oldvalue = apic_read(APIC_ESR);</div><div class='add'>+</div><div class='add'>+		/* enables sending errors */</div><div class='add'>+		value = ERROR_APIC_VECTOR;</div><div class='add'>+		apic_write(APIC_LVTERR, value);</div><div class='add'>+		/*</div><div class='add'>+		 * spec says clear errors after enabling vector.</div><div class='add'>+		 */</div><div class='add'>+		if (maxlvt &gt; 3)</div><div class='add'>+			apic_write(APIC_ESR, 0);</div><div class='add'>+		value = apic_read(APIC_ESR);</div><div class='add'>+		if (value != oldvalue)</div><div class='add'>+			apic_printk(APIC_VERBOSE, "ESR value before enabling "</div><div class='add'>+				"vector: 0x%08lx  after: 0x%08lx\n",</div><div class='add'>+				oldvalue, value);</div><div class='add'>+	} else {</div><div class='add'>+		printk(KERN_INFO "No ESR for 82489DX.\n");</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * setup_local_APIC - setup the local APIC</div><div class='ctx'>  */</div><div class='hunk'>@@ -814,25 +1018,143 @@ void __cpuinit setup_local_APIC(void)</div><div class='ctx'> 	preempt_enable();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __cpuinit lapic_setup_esr(void)</div><div class='del'>-{</div><div class='del'>-	unsigned maxlvt = lapic_get_maxlvt();</div><div class='del'>-</div><div class='del'>-	apic_write(APIC_LVTERR, ERROR_APIC_VECTOR);</div><div class='del'>-	/*</div><div class='del'>-	 * spec says clear errors after enabling vector.</div><div class='del'>-	 */</div><div class='del'>-	if (maxlvt &gt; 3)</div><div class='del'>-		apic_write(APIC_ESR, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void __cpuinit end_local_APIC_setup(void)</div><div class='ctx'> {</div><div class='ctx'> 	lapic_setup_esr();</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_X86_32</div><div class='add'>+	{</div><div class='add'>+		unsigned int value;</div><div class='add'>+		/* Disable the local apic timer */</div><div class='add'>+		value = apic_read(APIC_LVTT);</div><div class='add'>+		value |= (APIC_LVT_MASKED | LOCAL_TIMER_VECTOR);</div><div class='add'>+		apic_write(APIC_LVTT, value);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	setup_apic_nmi_watchdog(NULL);</div><div class='ctx'> 	apic_pm_activate();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void check_x2apic(void)</div><div class='add'>+{</div><div class='add'>+	int msr, msr2;</div><div class='add'>+</div><div class='add'>+	rdmsr(MSR_IA32_APICBASE, msr, msr2);</div><div class='add'>+</div><div class='add'>+	if (msr &amp; X2APIC_ENABLE) {</div><div class='add'>+		printk("x2apic enabled by BIOS, switching to x2apic ops\n");</div><div class='add'>+		x2apic_preenabled = x2apic = 1;</div><div class='add'>+		apic_ops = &amp;x2apic_ops;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void enable_x2apic(void)</div><div class='add'>+{</div><div class='add'>+	int msr, msr2;</div><div class='add'>+</div><div class='add'>+	rdmsr(MSR_IA32_APICBASE, msr, msr2);</div><div class='add'>+	if (!(msr &amp; X2APIC_ENABLE)) {</div><div class='add'>+		printk("Enabling x2apic\n");</div><div class='add'>+		wrmsr(MSR_IA32_APICBASE, msr | X2APIC_ENABLE, 0);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void enable_IR_x2apic(void)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_INTR_REMAP</div><div class='add'>+	int ret;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	if (!cpu_has_x2apic)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!x2apic_preenabled &amp;&amp; disable_x2apic) {</div><div class='add'>+		printk(KERN_INFO</div><div class='add'>+		       "Skipped enabling x2apic and Interrupt-remapping "</div><div class='add'>+		       "because of nox2apic\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (x2apic_preenabled &amp;&amp; disable_x2apic)</div><div class='add'>+		panic("Bios already enabled x2apic, can't enforce nox2apic");</div><div class='add'>+</div><div class='add'>+	if (!x2apic_preenabled &amp;&amp; skip_ioapic_setup) {</div><div class='add'>+		printk(KERN_INFO</div><div class='add'>+		       "Skipped enabling x2apic and Interrupt-remapping "</div><div class='add'>+		       "because of skipping io-apic setup\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = dmar_table_init();</div><div class='add'>+	if (ret) {</div><div class='add'>+		printk(KERN_INFO</div><div class='add'>+		       "dmar_table_init() failed with %d:\n", ret);</div><div class='add'>+</div><div class='add'>+		if (x2apic_preenabled)</div><div class='add'>+			panic("x2apic enabled by bios. But IR enabling failed");</div><div class='add'>+		else</div><div class='add'>+			printk(KERN_INFO</div><div class='add'>+			       "Not enabling x2apic,Intr-remapping\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	local_irq_save(flags);</div><div class='add'>+	mask_8259A();</div><div class='add'>+	save_mask_IO_APIC_setup();</div><div class='add'>+</div><div class='add'>+	ret = enable_intr_remapping(1);</div><div class='add'>+</div><div class='add'>+	if (ret &amp;&amp; x2apic_preenabled) {</div><div class='add'>+		local_irq_restore(flags);</div><div class='add'>+		panic("x2apic enabled by bios. But IR enabling failed");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	if (!x2apic) {</div><div class='add'>+		x2apic = 1;</div><div class='add'>+		apic_ops = &amp;x2apic_ops;</div><div class='add'>+		enable_x2apic();</div><div class='add'>+	}</div><div class='add'>+end:</div><div class='add'>+	if (ret)</div><div class='add'>+		/*</div><div class='add'>+		 * IR enabling failed</div><div class='add'>+		 */</div><div class='add'>+		restore_IO_APIC_setup();</div><div class='add'>+	else</div><div class='add'>+		reinit_intr_remapped_IO_APIC(x2apic_preenabled);</div><div class='add'>+</div><div class='add'>+	unmask_8259A();</div><div class='add'>+	local_irq_restore(flags);</div><div class='add'>+</div><div class='add'>+	if (!ret) {</div><div class='add'>+		if (!x2apic_preenabled)</div><div class='add'>+			printk(KERN_INFO</div><div class='add'>+			       "Enabled x2apic and interrupt-remapping\n");</div><div class='add'>+		else</div><div class='add'>+			printk(KERN_INFO</div><div class='add'>+			       "Enabled Interrupt-remapping\n");</div><div class='add'>+	} else</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "Failed to enable Interrupt-remapping and x2apic\n");</div><div class='add'>+#else</div><div class='add'>+	if (!cpu_has_x2apic)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (x2apic_preenabled)</div><div class='add'>+		panic("x2apic enabled prior OS handover,"</div><div class='add'>+		      " enable CONFIG_INTR_REMAP");</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "Enable CONFIG_INTR_REMAP for enabling intr-remapping "</div><div class='add'>+	       " and x2apic\n");</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Detect and enable local APICs on non-SMP boards.</div><div class='ctx'>  * Original code written by Keir Fraser.</div><div class='hunk'>@@ -872,7 +1194,7 @@ void __init early_init_lapic_mapping(void)</div><div class='ctx'> 	 * Fetch the APIC ID of the BSP in case we have a</div><div class='ctx'> 	 * default configuration (or the MP table is broken).</div><div class='ctx'> 	 */</div><div class='del'>-	boot_cpu_physical_apicid = GET_APIC_ID(read_apic_id());</div><div class='add'>+	boot_cpu_physical_apicid = read_apic_id();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -880,6 +1202,11 @@ void __init early_init_lapic_mapping(void)</div><div class='ctx'>  */</div><div class='ctx'> void __init init_apic_mappings(void)</div><div class='ctx'> {</div><div class='add'>+	if (x2apic) {</div><div class='add'>+		boot_cpu_physical_apicid = read_apic_id();</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If no local APIC can be found then set up a fake all</div><div class='ctx'> 	 * zeroes page to simulate the local APIC and another</div><div class='hunk'>@@ -899,13 +1226,15 @@ void __init init_apic_mappings(void)</div><div class='ctx'> 	 * Fetch the APIC ID of the BSP in case we have a</div><div class='ctx'> 	 * default configuration (or the MP table is broken).</div><div class='ctx'> 	 */</div><div class='del'>-	boot_cpu_physical_apicid = GET_APIC_ID(read_apic_id());</div><div class='add'>+	boot_cpu_physical_apicid = read_apic_id();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * This initializes the IO-APIC and APIC hardware if this is</div><div class='ctx'>  * a UP kernel.</div><div class='ctx'>  */</div><div class='add'>+int apic_version[MAX_APICS];</div><div class='add'>+</div><div class='ctx'> int __init APIC_init_uniprocessor(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (disable_apic) {</div><div class='hunk'>@@ -918,6 +1247,9 @@ int __init APIC_init_uniprocessor(void)</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	enable_IR_x2apic();</div><div class='add'>+	setup_apic_routing();</div><div class='add'>+</div><div class='ctx'> 	verify_local_APIC();</div><div class='ctx'> </div><div class='ctx'> 	connect_bsp_APIC();</div><div class='hunk'>@@ -1004,17 +1336,57 @@ asmlinkage void smp_error_interrupt(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *  * connect_bsp_APIC - attach the APIC to the interrupt system</div><div class='del'>- *   */</div><div class='add'>+ * connect_bsp_APIC - attach the APIC to the interrupt system</div><div class='add'>+ */</div><div class='ctx'> void __init connect_bsp_APIC(void)</div><div class='ctx'> {</div><div class='add'>+#ifdef CONFIG_X86_32</div><div class='add'>+	if (pic_mode) {</div><div class='add'>+		/*</div><div class='add'>+		 * Do not trust the local APIC being empty at bootup.</div><div class='add'>+		 */</div><div class='add'>+		clear_local_APIC();</div><div class='add'>+		/*</div><div class='add'>+		 * PIC mode, enable APIC mode in the IMCR, i.e.  connect BSP's</div><div class='add'>+		 * local APIC to INT and NMI lines.</div><div class='add'>+		 */</div><div class='add'>+		apic_printk(APIC_VERBOSE, "leaving PIC mode, "</div><div class='add'>+				"enabling APIC mode.\n");</div><div class='add'>+		outb(0x70, 0x22);</div><div class='add'>+		outb(0x01, 0x23);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='ctx'> 	enable_apic_mode();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * disconnect_bsp_APIC - detach the APIC from the interrupt system</div><div class='add'>+ * @virt_wire_setup:	indicates, whether virtual wire mode is selected</div><div class='add'>+ *</div><div class='add'>+ * Virtual wire mode is necessary to deliver legacy interrupts even when the</div><div class='add'>+ * APIC is disabled.</div><div class='add'>+ */</div><div class='ctx'> void disconnect_bsp_APIC(int virt_wire_setup)</div><div class='ctx'> {</div><div class='add'>+	unsigned int value;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_X86_32</div><div class='add'>+	if (pic_mode) {</div><div class='add'>+		/*</div><div class='add'>+		 * Put the board back into PIC mode (has an effect only on</div><div class='add'>+		 * certain older boards).  Note that APIC interrupts, including</div><div class='add'>+		 * IPIs, won't work beyond this point!  The only exception are</div><div class='add'>+		 * INIT IPIs.</div><div class='add'>+		 */</div><div class='add'>+		apic_printk(APIC_VERBOSE, "disabling APIC mode, "</div><div class='add'>+				"entering PIC mode.\n");</div><div class='add'>+		outb(0x70, 0x22);</div><div class='add'>+		outb(0x00, 0x23);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	/* Go back to Virtual Wire compatibility mode */</div><div class='del'>-	unsigned long value;</div><div class='ctx'> </div><div class='ctx'> 	/* For the spurious interrupt use vector F, and enable it */</div><div class='ctx'> 	value = apic_read(APIC_SPIV);</div><div class='hunk'>@@ -1040,7 +1412,10 @@ void disconnect_bsp_APIC(int virt_wire_setup)</div><div class='ctx'> 		apic_write(APIC_LVT0, APIC_LVT_MASKED);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* For LVT1 make it edge triggered, active high, nmi and enabled */</div><div class='add'>+	/*</div><div class='add'>+	 * For LVT1 make it edge triggered, active high,</div><div class='add'>+	 * nmi and enabled</div><div class='add'>+	 */</div><div class='ctx'> 	value = apic_read(APIC_LVT1);</div><div class='ctx'> 	value &amp;= ~(APIC_MODE_MASK | APIC_SEND_PENDING |</div><div class='ctx'> 			APIC_INPUT_POLARITY | APIC_LVT_REMOTE_IRR |</div><div class='hunk'>@@ -1055,9 +1430,20 @@ void __cpuinit generic_processor_info(int apicid, int version)</div><div class='ctx'> 	int cpu;</div><div class='ctx'> 	cpumask_t tmp_map;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Validate version</div><div class='add'>+	 */</div><div class='add'>+	if (version == 0x0) {</div><div class='add'>+		printk(KERN_WARNING "BIOS bug, APIC version is 0 for CPU#%d! "</div><div class='add'>+				"fixing up to 0x10. (tell your hw vendor)\n",</div><div class='add'>+				version);</div><div class='add'>+		version = 0x10;</div><div class='add'>+	}</div><div class='add'>+	apic_version[apicid] = version;</div><div class='add'>+</div><div class='ctx'> 	if (num_processors &gt;= NR_CPUS) {</div><div class='ctx'> 		printk(KERN_WARNING "WARNING: NR_CPUS limit of %i reached."</div><div class='del'>-		       " Processor ignored.\n", NR_CPUS);</div><div class='add'>+			"  Processor ignored.\n", NR_CPUS);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1077,6 +1463,29 @@ void __cpuinit generic_processor_info(int apicid, int version)</div><div class='ctx'> 	if (apicid &gt; max_physical_apicid)</div><div class='ctx'> 		max_physical_apicid = apicid;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_X86_32</div><div class='add'>+	/*</div><div class='add'>+	 * Would be preferable to switch to bigsmp when CONFIG_HOTPLUG_CPU=y</div><div class='add'>+	 * but we need to work other dependencies like SMP_SUSPEND etc</div><div class='add'>+	 * before this can be done without some confusion.</div><div class='add'>+	 * if (CPU_HOTPLUG_ENABLED || num_processors &gt; 8)</div><div class='add'>+	 *       - Ashok Raj &lt;ashok.raj@intel.com&gt;</div><div class='add'>+	 */</div><div class='add'>+	if (max_physical_apicid &gt;= 8) {</div><div class='add'>+		switch (boot_cpu_data.x86_vendor) {</div><div class='add'>+		case X86_VENDOR_INTEL:</div><div class='add'>+			if (!APIC_XAPIC(version)) {</div><div class='add'>+				def_to_bigsmp = 0;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			/* If P4 and above fall through */</div><div class='add'>+		case X86_VENDOR_AMD:</div><div class='add'>+			def_to_bigsmp = 1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_X86_SMP) || defined(CONFIG_X86_64)</div><div class='ctx'> 	/* are we being called early in kernel startup? */</div><div class='ctx'> 	if (early_per_cpu_ptr(x86_cpu_to_apicid)) {</div><div class='ctx'> 		u16 *cpu_to_apicid = early_per_cpu_ptr(x86_cpu_to_apicid);</div><div class='hunk'>@@ -1088,20 +1497,28 @@ void __cpuinit generic_processor_info(int apicid, int version)</div><div class='ctx'> 		per_cpu(x86_cpu_to_apicid, cpu) = apicid;</div><div class='ctx'> 		per_cpu(x86_bios_cpu_apicid, cpu) = apicid;</div><div class='ctx'> 	}</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	cpu_set(cpu, cpu_possible_map);</div><div class='ctx'> 	cpu_set(cpu, cpu_present_map);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int hard_smp_processor_id(void)</div><div class='add'>+{</div><div class='add'>+	return read_apic_id();</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Power management</div><div class='ctx'>  */</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> </div><div class='ctx'> static struct {</div><div class='del'>-	/* 'active' is true if the local APIC was enabled by us and</div><div class='del'>-	   not the BIOS; this signifies that we are also responsible</div><div class='del'>-	   for disabling it before entering apm/acpi suspend */</div><div class='add'>+	/*</div><div class='add'>+	 * 'active' is true if the local APIC was enabled by us and</div><div class='add'>+	 * not the BIOS; this signifies that we are also responsible</div><div class='add'>+	 * for disabling it before entering apm/acpi suspend</div><div class='add'>+	 */</div><div class='ctx'> 	int active;</div><div class='ctx'> 	/* r/w apic fields */</div><div class='ctx'> 	unsigned int apic_id;</div><div class='hunk'>@@ -1129,7 +1546,7 @@ static int lapic_suspend(struct sys_device *dev, pm_message_t state)</div><div class='ctx'> </div><div class='ctx'> 	maxlvt = lapic_get_maxlvt();</div><div class='ctx'> </div><div class='del'>-	apic_pm_state.apic_id = read_apic_id();</div><div class='add'>+	apic_pm_state.apic_id = apic_read(APIC_ID);</div><div class='ctx'> 	apic_pm_state.apic_taskpri = apic_read(APIC_TASKPRI);</div><div class='ctx'> 	apic_pm_state.apic_ldr = apic_read(APIC_LDR);</div><div class='ctx'> 	apic_pm_state.apic_dfr = apic_read(APIC_DFR);</div><div class='hunk'>@@ -1142,10 +1559,11 @@ static int lapic_suspend(struct sys_device *dev, pm_message_t state)</div><div class='ctx'> 	apic_pm_state.apic_lvterr = apic_read(APIC_LVTERR);</div><div class='ctx'> 	apic_pm_state.apic_tmict = apic_read(APIC_TMICT);</div><div class='ctx'> 	apic_pm_state.apic_tdcr = apic_read(APIC_TDCR);</div><div class='del'>-#ifdef CONFIG_X86_MCE_INTEL</div><div class='add'>+#if defined(CONFIG_X86_MCE_P4THERMAL) || defined(CONFIG_X86_MCE_INTEL)</div><div class='ctx'> 	if (maxlvt &gt;= 5)</div><div class='ctx'> 		apic_pm_state.apic_thmr = apic_read(APIC_LVTTHMR);</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> 	local_irq_save(flags);</div><div class='ctx'> 	disable_local_APIC();</div><div class='ctx'> 	local_irq_restore(flags);</div><div class='hunk'>@@ -1164,10 +1582,25 @@ static int lapic_resume(struct sys_device *dev)</div><div class='ctx'> 	maxlvt = lapic_get_maxlvt();</div><div class='ctx'> </div><div class='ctx'> 	local_irq_save(flags);</div><div class='del'>-	rdmsr(MSR_IA32_APICBASE, l, h);</div><div class='del'>-	l &amp;= ~MSR_IA32_APICBASE_BASE;</div><div class='del'>-	l |= MSR_IA32_APICBASE_ENABLE | mp_lapic_addr;</div><div class='del'>-	wrmsr(MSR_IA32_APICBASE, l, h);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='add'>+	if (x2apic)</div><div class='add'>+		enable_x2apic();</div><div class='add'>+	else</div><div class='add'>+#endif</div><div class='add'>+	{</div><div class='add'>+		/*</div><div class='add'>+		 * Make sure the APICBASE points to the right address</div><div class='add'>+		 *</div><div class='add'>+		 * FIXME! This will be wrong if we ever support suspend on</div><div class='add'>+		 * SMP! We'll need to do this as part of the CPU restore!</div><div class='add'>+		 */</div><div class='add'>+		rdmsr(MSR_IA32_APICBASE, l, h);</div><div class='add'>+		l &amp;= ~MSR_IA32_APICBASE_BASE;</div><div class='add'>+		l |= MSR_IA32_APICBASE_ENABLE | mp_lapic_addr;</div><div class='add'>+		wrmsr(MSR_IA32_APICBASE, l, h);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	apic_write(APIC_LVTERR, ERROR_APIC_VECTOR | APIC_LVT_MASKED);</div><div class='ctx'> 	apic_write(APIC_ID, apic_pm_state.apic_id);</div><div class='ctx'> 	apic_write(APIC_DFR, apic_pm_state.apic_dfr);</div><div class='hunk'>@@ -1176,7 +1609,7 @@ static int lapic_resume(struct sys_device *dev)</div><div class='ctx'> 	apic_write(APIC_SPIV, apic_pm_state.apic_spiv);</div><div class='ctx'> 	apic_write(APIC_LVT0, apic_pm_state.apic_lvt0);</div><div class='ctx'> 	apic_write(APIC_LVT1, apic_pm_state.apic_lvt1);</div><div class='del'>-#ifdef CONFIG_X86_MCE_INTEL</div><div class='add'>+#if defined(CONFIG_X86_MCE_P4THERMAL) || defined(CONFIG_X86_MCE_INTEL)</div><div class='ctx'> 	if (maxlvt &gt;= 5)</div><div class='ctx'> 		apic_write(APIC_LVTTHMR, apic_pm_state.apic_thmr);</div><div class='ctx'> #endif</div><div class='hunk'>@@ -1190,10 +1623,17 @@ static int lapic_resume(struct sys_device *dev)</div><div class='ctx'> 	apic_write(APIC_LVTERR, apic_pm_state.apic_lvterr);</div><div class='ctx'> 	apic_write(APIC_ESR, 0);</div><div class='ctx'> 	apic_read(APIC_ESR);</div><div class='add'>+</div><div class='ctx'> 	local_irq_restore(flags);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * This device has no shutdown method - fully functioning local APICs</div><div class='add'>+ * are needed on every CPU up until machine_halt/restart/poweroff.</div><div class='add'>+ */</div><div class='add'>+</div><div class='ctx'> static struct sysdev_class lapic_sysclass = {</div><div class='ctx'> 	.name		= "lapic",</div><div class='ctx'> 	.resume		= lapic_resume,</div><div class='hunk'>@@ -1307,31 +1747,19 @@ __cpuinit int apic_is_clustered_box(void)</div><div class='ctx'> 	return (clusters &gt; 2);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * APIC command line parameters</div><div class='del'>- */</div><div class='del'>-static int __init apic_set_verbosity(char *str)</div><div class='add'>+static __init int setup_nox2apic(char *str)</div><div class='ctx'> {</div><div class='del'>-	if (str == NULL)  {</div><div class='del'>-		skip_ioapic_setup = 0;</div><div class='del'>-		ioapic_force = 1;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	if (strcmp("debug", str) == 0)</div><div class='del'>-		apic_verbosity = APIC_DEBUG;</div><div class='del'>-	else if (strcmp("verbose", str) == 0)</div><div class='del'>-		apic_verbosity = APIC_VERBOSE;</div><div class='del'>-	else {</div><div class='del'>-		printk(KERN_WARNING "APIC Verbosity level %s not recognised"</div><div class='del'>-				" use apic=verbose or apic=debug\n", str);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='add'>+	disable_x2apic = 1;</div><div class='add'>+	clear_cpu_cap(&amp;boot_cpu_data, X86_FEATURE_X2APIC);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-early_param("apic", apic_set_verbosity);</div><div class='add'>+early_param("nox2apic", setup_nox2apic);</div><div class='add'>+</div><div class='ctx'> </div><div class='del'>-static __init int setup_disableapic(char *str)</div><div class='add'>+/*</div><div class='add'>+ * APIC command line parameters</div><div class='add'>+ */</div><div class='add'>+static int __init setup_disableapic(char *arg)</div><div class='ctx'> {</div><div class='ctx'> 	disable_apic = 1;</div><div class='ctx'> 	setup_clear_cpu_cap(X86_FEATURE_APIC);</div><div class='hunk'>@@ -1340,9 +1768,9 @@ static __init int setup_disableapic(char *str)</div><div class='ctx'> early_param("disableapic", setup_disableapic);</div><div class='ctx'> </div><div class='ctx'> /* same as disableapic, for compatibility */</div><div class='del'>-static __init int setup_nolapic(char *str)</div><div class='add'>+static int __init setup_nolapic(char *arg)</div><div class='ctx'> {</div><div class='del'>-	return setup_disableapic(str);</div><div class='add'>+	return setup_disableapic(arg);</div><div class='ctx'> }</div><div class='ctx'> early_param("nolapic", setup_nolapic);</div><div class='ctx'> </div><div class='hunk'>@@ -1353,14 +1781,19 @@ static int __init parse_lapic_timer_c2_ok(char *arg)</div><div class='ctx'> }</div><div class='ctx'> early_param("lapic_timer_c2_ok", parse_lapic_timer_c2_ok);</div><div class='ctx'> </div><div class='del'>-static __init int setup_noapictimer(char *str)</div><div class='add'>+static int __init parse_disable_apic_timer(char *arg)</div><div class='ctx'> {</div><div class='del'>-	if (str[0] != ' ' &amp;&amp; str[0] != 0)</div><div class='del'>-		return 0;</div><div class='ctx'> 	disable_apic_timer = 1;</div><div class='del'>-	return 1;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='del'>-__setup("noapictimer", setup_noapictimer);</div><div class='add'>+early_param("noapictimer", parse_disable_apic_timer);</div><div class='add'>+</div><div class='add'>+static int __init parse_nolapic_timer(char *arg)</div><div class='add'>+{</div><div class='add'>+	disable_apic_timer = 1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+early_param("nolapic_timer", parse_nolapic_timer);</div><div class='ctx'> </div><div class='ctx'> static __init int setup_apicpmtimer(char *s)</div><div class='ctx'> {</div><div class='hunk'>@@ -1370,6 +1803,31 @@ static __init int setup_apicpmtimer(char *s)</div><div class='ctx'> }</div><div class='ctx'> __setup("apicpmtimer", setup_apicpmtimer);</div><div class='ctx'> </div><div class='add'>+static int __init apic_set_verbosity(char *arg)</div><div class='add'>+{</div><div class='add'>+	if (!arg)  {</div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='add'>+		skip_ioapic_setup = 0;</div><div class='add'>+		ioapic_force = 1;</div><div class='add'>+		return 0;</div><div class='add'>+#endif</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (strcmp("debug", arg) == 0)</div><div class='add'>+		apic_verbosity = APIC_DEBUG;</div><div class='add'>+	else if (strcmp("verbose", arg) == 0)</div><div class='add'>+		apic_verbosity = APIC_VERBOSE;</div><div class='add'>+	else {</div><div class='add'>+		printk(KERN_WARNING "APIC Verbosity level %s not recognised"</div><div class='add'>+			" use apic=verbose or apic=debug\n", arg);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+early_param("apic", apic_set_verbosity);</div><div class='add'>+</div><div class='ctx'> static int __init lapic_insert_resource(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (!apic_phys)</div><div class='head'>diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c<br/>index 732d1f4e10ee..5145a6e72bbb 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/apm_32.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/apm_32.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/apm_32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/apm_32.c</a></div><div class='hunk'>@@ -228,7 +228,6 @@</div><div class='ctx'> #include &lt;linux/suspend.h&gt;</div><div class='ctx'> #include &lt;linux/kthread.h&gt;</div><div class='ctx'> #include &lt;linux/jiffies.h&gt;</div><div class='del'>-#include &lt;linux/smp_lock.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='head'>diff --git a/arch/x86/kernel/asm-offsets_64.c b/arch/x86/kernel/asm-offsets_64.c<br/>index aa89387006fe..505543a75a56 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/asm-offsets_64.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/asm-offsets_64.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/asm-offsets_64.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/asm-offsets_64.c</a></div><div class='hunk'>@@ -22,7 +22,7 @@</div><div class='ctx'> </div><div class='ctx'> #define __NO_STUBS 1</div><div class='ctx'> #undef __SYSCALL</div><div class='del'>-#undef _ASM_X86_64_UNISTD_H_</div><div class='add'>+#undef ASM_X86__UNISTD_64_H</div><div class='ctx'> #define __SYSCALL(nr, sym) [nr] = 1,</div><div class='ctx'> static char syscalls[] = {</div><div class='ctx'> #include &lt;asm/unistd.h&gt;</div><div class='head'>diff --git a/arch/x86/kernel/bios_uv.c b/arch/x86/kernel/bios_uv.c<br/>index c639bd55391c..fdd585f9c53d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/bios_uv.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/bios_uv.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/bios_uv.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/bios_uv.c</a></div><div class='hunk'>@@ -25,11 +25,11 @@ x86_bios_strerror(long status)</div><div class='ctx'> {</div><div class='ctx'> 	const char *str;</div><div class='ctx'> 	switch (status) {</div><div class='del'>-	case  0: str = "Call completed without error"; break;</div><div class='del'>-	case -1: str = "Not implemented"; break;</div><div class='del'>-	case -2: str = "Invalid argument"; break;</div><div class='del'>-	case -3: str = "Call completed with error"; break;</div><div class='del'>-	default: str = "Unknown BIOS status code"; break;</div><div class='add'>+	case  0: str = "Call completed without error";	break;</div><div class='add'>+	case -1: str = "Not implemented";		break;</div><div class='add'>+	case -2: str = "Invalid argument";		break;</div><div class='add'>+	case -3: str = "Call completed with error";	break;</div><div class='add'>+	default: str = "Unknown BIOS status code";	break;</div><div class='ctx'> 	}</div><div class='ctx'> 	return str;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile<br/>index ee76eaad3001..7f0b45a5d788 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/cpu/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/cpu/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/cpu/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/cpu/Makefile</a></div><div class='hunk'>@@ -3,22 +3,30 @@</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> obj-y			:= intel_cacheinfo.o addon_cpuid_features.o</div><div class='del'>-obj-y			+= proc.o feature_names.o</div><div class='del'>-</div><div class='del'>-obj-$(CONFIG_X86_32)	+= common.o bugs.o</div><div class='del'>-obj-$(CONFIG_X86_64)	+= common_64.o bugs_64.o</div><div class='del'>-obj-$(CONFIG_X86_32)	+= amd.o</div><div class='del'>-obj-$(CONFIG_X86_64)	+= amd_64.o</div><div class='del'>-obj-$(CONFIG_X86_32)	+= cyrix.o</div><div class='del'>-obj-$(CONFIG_X86_32)	+= centaur.o</div><div class='del'>-obj-$(CONFIG_X86_64)	+= centaur_64.o</div><div class='del'>-obj-$(CONFIG_X86_32)	+= transmeta.o</div><div class='del'>-obj-$(CONFIG_X86_32)	+= intel.o</div><div class='del'>-obj-$(CONFIG_X86_64)	+= intel_64.o</div><div class='del'>-obj-$(CONFIG_X86_32)	+= umc.o</div><div class='add'>+obj-y			+= proc.o capflags.o powerflags.o common.o</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_X86_32)	+= bugs.o cmpxchg.o</div><div class='add'>+obj-$(CONFIG_X86_64)	+= bugs_64.o</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_CPU_SUP_INTEL)		+= intel.o</div><div class='add'>+obj-$(CONFIG_CPU_SUP_AMD)		+= amd.o</div><div class='add'>+obj-$(CONFIG_CPU_SUP_CYRIX_32)		+= cyrix.o</div><div class='add'>+obj-$(CONFIG_CPU_SUP_CENTAUR_32)	+= centaur.o</div><div class='add'>+obj-$(CONFIG_CPU_SUP_CENTAUR_64)	+= centaur_64.o</div><div class='add'>+obj-$(CONFIG_CPU_SUP_TRANSMETA_32)	+= transmeta.o</div><div class='add'>+obj-$(CONFIG_CPU_SUP_UMC_32)		+= umc.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_X86_MCE)	+= mcheck/</div><div class='ctx'> obj-$(CONFIG_MTRR)	+= mtrr/</div><div class='ctx'> obj-$(CONFIG_CPU_FREQ)	+= cpufreq/</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_X86_LOCAL_APIC) += perfctr-watchdog.o</div><div class='add'>+</div><div class='add'>+quiet_cmd_mkcapflags = MKCAP   $@</div><div class='add'>+      cmd_mkcapflags = $(PERL) $(srctree)/$(src)/mkcapflags.pl $&lt; $@</div><div class='add'>+</div><div class='add'>+cpufeature = $(src)/../../../../include/asm-x86/cpufeature.h</div><div class='add'>+</div><div class='add'>+targets += capflags.c</div><div class='add'>+$(obj)/capflags.c: $(cpufeature) $(src)/mkcapflags.pl FORCE</div><div class='add'>+	$(call if_changed,mkcapflags)</div><div class='head'>diff --git a/arch/x86/kernel/cpu/addon_cpuid_features.c b/arch/x86/kernel/cpu/addon_cpuid_features.c<br/>index a6ef672adbba..0d9c993aa93e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/cpu/addon_cpuid_features.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/cpu/addon_cpuid_features.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/cpu/addon_cpuid_features.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/cpu/addon_cpuid_features.c</a></div><div class='hunk'>@@ -7,6 +7,8 @@</div><div class='ctx'> #include &lt;asm/pat.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;mach_apic.h&gt;</div><div class='add'>+</div><div class='ctx'> struct cpuid_bit {</div><div class='ctx'> 	u16 feature;</div><div class='ctx'> 	u8 reg;</div><div class='hunk'>@@ -48,6 +50,92 @@ void __cpuinit init_scattered_cpuid_features(struct cpuinfo_x86 *c)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* leaf 0xb SMT level */</div><div class='add'>+#define SMT_LEVEL	0</div><div class='add'>+</div><div class='add'>+/* leaf 0xb sub-leaf types */</div><div class='add'>+#define INVALID_TYPE	0</div><div class='add'>+#define SMT_TYPE	1</div><div class='add'>+#define CORE_TYPE	2</div><div class='add'>+</div><div class='add'>+#define LEAFB_SUBTYPE(ecx)		(((ecx) &gt;&gt; 8) &amp; 0xff)</div><div class='add'>+#define BITS_SHIFT_NEXT_LEVEL(eax)	((eax) &amp; 0x1f)</div><div class='add'>+#define LEVEL_MAX_SIBLINGS(ebx)		((ebx) &amp; 0xffff)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Check for extended topology enumeration cpuid leaf 0xb and if it</div><div class='add'>+ * exists, use it for populating initial_apicid and cpu topology</div><div class='add'>+ * detection.</div><div class='add'>+ */</div><div class='add'>+void __cpuinit detect_extended_topology(struct cpuinfo_x86 *c)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_SMP</div><div class='add'>+	unsigned int eax, ebx, ecx, edx, sub_index;</div><div class='add'>+	unsigned int ht_mask_width, core_plus_mask_width;</div><div class='add'>+	unsigned int core_select_mask, core_level_siblings;</div><div class='add'>+</div><div class='add'>+	if (c-&gt;cpuid_level &lt; 0xb)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	cpuid_count(0xb, SMT_LEVEL, &amp;eax, &amp;ebx, &amp;ecx, &amp;edx);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * check if the cpuid leaf 0xb is actually implemented.</div><div class='add'>+	 */</div><div class='add'>+	if (ebx == 0 || (LEAFB_SUBTYPE(ecx) != SMT_TYPE))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	set_cpu_cap(c, X86_FEATURE_XTOPOLOGY);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * initial apic id, which also represents 32-bit extended x2apic id.</div><div class='add'>+	 */</div><div class='add'>+	c-&gt;initial_apicid = edx;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Populate HT related information from sub-leaf level 0.</div><div class='add'>+	 */</div><div class='add'>+	core_level_siblings = smp_num_siblings = LEVEL_MAX_SIBLINGS(ebx);</div><div class='add'>+	core_plus_mask_width = ht_mask_width = BITS_SHIFT_NEXT_LEVEL(eax);</div><div class='add'>+</div><div class='add'>+	sub_index = 1;</div><div class='add'>+	do {</div><div class='add'>+		cpuid_count(0xb, sub_index, &amp;eax, &amp;ebx, &amp;ecx, &amp;edx);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Check for the Core type in the implemented sub leaves.</div><div class='add'>+		 */</div><div class='add'>+		if (LEAFB_SUBTYPE(ecx) == CORE_TYPE) {</div><div class='add'>+			core_level_siblings = LEVEL_MAX_SIBLINGS(ebx);</div><div class='add'>+			core_plus_mask_width = BITS_SHIFT_NEXT_LEVEL(eax);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		sub_index++;</div><div class='add'>+	} while (LEAFB_SUBTYPE(ecx) != INVALID_TYPE);</div><div class='add'>+</div><div class='add'>+	core_select_mask = (~(-1 &lt;&lt; core_plus_mask_width)) &gt;&gt; ht_mask_width;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_X86_32</div><div class='add'>+	c-&gt;cpu_core_id = phys_pkg_id(c-&gt;initial_apicid, ht_mask_width)</div><div class='add'>+						 &amp; core_select_mask;</div><div class='add'>+	c-&gt;phys_proc_id = phys_pkg_id(c-&gt;initial_apicid, core_plus_mask_width);</div><div class='add'>+#else</div><div class='add'>+	c-&gt;cpu_core_id = phys_pkg_id(ht_mask_width) &amp; core_select_mask;</div><div class='add'>+	c-&gt;phys_proc_id = phys_pkg_id(core_plus_mask_width);</div><div class='add'>+#endif</div><div class='add'>+	c-&gt;x86_max_cores = (core_level_siblings / smp_num_siblings);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO  "CPU: Physical Processor ID: %d\n",</div><div class='add'>+	       c-&gt;phys_proc_id);</div><div class='add'>+	if (c-&gt;x86_max_cores &gt; 1)</div><div class='add'>+		printk(KERN_INFO  "CPU: Processor Core ID: %d\n",</div><div class='add'>+		       c-&gt;cpu_core_id);</div><div class='add'>+	return;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_X86_PAT</div><div class='ctx'> void __cpuinit validate_pat_support(struct cpuinfo_x86 *c)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c<br/>index 18514ed26104..32e73520adf7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/cpu/amd.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/cpu/amd.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/cpu/amd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/cpu/amd.c</a></div><div class='hunk'>@@ -1,13 +1,22 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/apic.h&gt;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='add'>+# include &lt;asm/numa_64.h&gt;</div><div class='add'>+# include &lt;asm/mmconfig.h&gt;</div><div class='add'>+# include &lt;asm/cacheflush.h&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #include &lt;mach_apic.h&gt;</div><div class='add'>+</div><div class='ctx'> #include "cpu.h"</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_X86_32</div><div class='ctx'> /*</div><div class='ctx'>  *	B step AMD K6 before B 9730xxxx have hardware bugs that can cause</div><div class='ctx'>  *	misexecution of code under Linux. Owners of such processors should</div><div class='hunk'>@@ -24,26 +33,273 @@</div><div class='ctx'> extern void vide(void);</div><div class='ctx'> __asm__(".align 4\nvide: ret");</div><div class='ctx'> </div><div class='del'>-static void __cpuinit early_init_amd(struct cpuinfo_x86 *c)</div><div class='add'>+static void __cpuinit init_amd_k5(struct cpuinfo_x86 *c)</div><div class='ctx'> {</div><div class='del'>-	if (cpuid_eax(0x80000000) &gt;= 0x80000007) {</div><div class='del'>-		c-&gt;x86_power = cpuid_edx(0x80000007);</div><div class='del'>-		if (c-&gt;x86_power &amp; (1&lt;&lt;8))</div><div class='del'>-			set_cpu_cap(c, X86_FEATURE_CONSTANT_TSC);</div><div class='add'>+/*</div><div class='add'>+ * General Systems BIOSen alias the cpu frequency registers</div><div class='add'>+ * of the Elan at 0x000df000. Unfortuantly, one of the Linux</div><div class='add'>+ * drivers subsequently pokes it, and changes the CPU speed.</div><div class='add'>+ * Workaround : Remove the unneeded alias.</div><div class='add'>+ */</div><div class='add'>+#define CBAR		(0xfffc) /* Configuration Base Address  (32-bit) */</div><div class='add'>+#define CBAR_ENB	(0x80000000)</div><div class='add'>+#define CBAR_KEY	(0X000000CB)</div><div class='add'>+	if (c-&gt;x86_model == 9 || c-&gt;x86_model == 10) {</div><div class='add'>+		if (inl (CBAR) &amp; CBAR_ENB)</div><div class='add'>+			outl (0 | CBAR_KEY, CBAR);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	/*  Set MTRR capability flag if appropriate */</div><div class='del'>-	if (c-&gt;x86_model == 13 || c-&gt;x86_model == 9 ||</div><div class='del'>-	   (c-&gt;x86_model == 8 &amp;&amp; c-&gt;x86_mask &gt;= 8))</div><div class='del'>-		set_cpu_cap(c, X86_FEATURE_K6_MTRR);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __cpuinit init_amd(struct cpuinfo_x86 *c)</div><div class='add'>+</div><div class='add'>+static void __cpuinit init_amd_k6(struct cpuinfo_x86 *c)</div><div class='ctx'> {</div><div class='ctx'> 	u32 l, h;</div><div class='ctx'> 	int mbytes = num_physpages &gt;&gt; (20-PAGE_SHIFT);</div><div class='del'>-	int r;</div><div class='ctx'> </div><div class='add'>+	if (c-&gt;x86_model &lt; 6) {</div><div class='add'>+		/* Based on AMD doc 20734R - June 2000 */</div><div class='add'>+		if (c-&gt;x86_model == 0) {</div><div class='add'>+			clear_cpu_cap(c, X86_FEATURE_APIC);</div><div class='add'>+			set_cpu_cap(c, X86_FEATURE_PGE);</div><div class='add'>+		}</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (c-&gt;x86_model == 6 &amp;&amp; c-&gt;x86_mask == 1) {</div><div class='add'>+		const int K6_BUG_LOOP = 1000000;</div><div class='add'>+		int n;</div><div class='add'>+		void (*f_vide)(void);</div><div class='add'>+		unsigned long d, d2;</div><div class='add'>+</div><div class='add'>+		printk(KERN_INFO "AMD K6 stepping B detected - ");</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * It looks like AMD fixed the 2.6.2 bug and improved indirect</div><div class='add'>+		 * calls at the same time.</div><div class='add'>+		 */</div><div class='add'>+</div><div class='add'>+		n = K6_BUG_LOOP;</div><div class='add'>+		f_vide = vide;</div><div class='add'>+		rdtscl(d);</div><div class='add'>+		while (n--)</div><div class='add'>+			f_vide();</div><div class='add'>+		rdtscl(d2);</div><div class='add'>+		d = d2-d;</div><div class='add'>+</div><div class='add'>+		if (d &gt; 20*K6_BUG_LOOP)</div><div class='add'>+			printk("system stability may be impaired when more than 32 MB are used.\n");</div><div class='add'>+		else</div><div class='add'>+			printk("probably OK (after B9730xxxx).\n");</div><div class='add'>+		printk(KERN_INFO "Please see http://membres.lycos.fr/poulot/k6bug.html\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* K6 with old style WHCR */</div><div class='add'>+	if (c-&gt;x86_model &lt; 8 ||</div><div class='add'>+	   (c-&gt;x86_model == 8 &amp;&amp; c-&gt;x86_mask &lt; 8)) {</div><div class='add'>+		/* We can only write allocate on the low 508Mb */</div><div class='add'>+		if (mbytes &gt; 508)</div><div class='add'>+			mbytes = 508;</div><div class='add'>+</div><div class='add'>+		rdmsr(MSR_K6_WHCR, l, h);</div><div class='add'>+		if ((l&amp;0x0000FFFF) == 0) {</div><div class='add'>+			unsigned long flags;</div><div class='add'>+			l = (1&lt;&lt;0)|((mbytes/4)&lt;&lt;1);</div><div class='add'>+			local_irq_save(flags);</div><div class='add'>+			wbinvd();</div><div class='add'>+			wrmsr(MSR_K6_WHCR, l, h);</div><div class='add'>+			local_irq_restore(flags);</div><div class='add'>+			printk(KERN_INFO "Enabling old style K6 write allocation for %d Mb\n",</div><div class='add'>+				mbytes);</div><div class='add'>+		}</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((c-&gt;x86_model == 8 &amp;&amp; c-&gt;x86_mask &gt; 7) ||</div><div class='add'>+	     c-&gt;x86_model == 9 || c-&gt;x86_model == 13) {</div><div class='add'>+		/* The more serious chips .. */</div><div class='add'>+</div><div class='add'>+		if (mbytes &gt; 4092)</div><div class='add'>+			mbytes = 4092;</div><div class='add'>+</div><div class='add'>+		rdmsr(MSR_K6_WHCR, l, h);</div><div class='add'>+		if ((l&amp;0xFFFF0000) == 0) {</div><div class='add'>+			unsigned long flags;</div><div class='add'>+			l = ((mbytes&gt;&gt;2)&lt;&lt;22)|(1&lt;&lt;16);</div><div class='add'>+			local_irq_save(flags);</div><div class='add'>+			wbinvd();</div><div class='add'>+			wrmsr(MSR_K6_WHCR, l, h);</div><div class='add'>+			local_irq_restore(flags);</div><div class='add'>+			printk(KERN_INFO "Enabling new style K6 write allocation for %d Mb\n",</div><div class='add'>+				mbytes);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (c-&gt;x86_model == 10) {</div><div class='add'>+		/* AMD Geode LX is model 10 */</div><div class='add'>+		/* placeholder for any needed mods */</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __cpuinit init_amd_k7(struct cpuinfo_x86 *c)</div><div class='add'>+{</div><div class='add'>+	u32 l, h;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Bit 15 of Athlon specific MSR 15, needs to be 0</div><div class='add'>+	 * to enable SSE on Palomino/Morgan/Barton CPU's.</div><div class='add'>+	 * If the BIOS didn't enable it already, enable it here.</div><div class='add'>+	 */</div><div class='add'>+	if (c-&gt;x86_model &gt;= 6 &amp;&amp; c-&gt;x86_model &lt;= 10) {</div><div class='add'>+		if (!cpu_has(c, X86_FEATURE_XMM)) {</div><div class='add'>+			printk(KERN_INFO "Enabling disabled K7/SSE Support.\n");</div><div class='add'>+			rdmsr(MSR_K7_HWCR, l, h);</div><div class='add'>+			l &amp;= ~0x00008000;</div><div class='add'>+			wrmsr(MSR_K7_HWCR, l, h);</div><div class='add'>+			set_cpu_cap(c, X86_FEATURE_XMM);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * It's been determined by AMD that Athlons since model 8 stepping 1</div><div class='add'>+	 * are more robust with CLK_CTL set to 200xxxxx instead of 600xxxxx</div><div class='add'>+	 * As per AMD technical note 27212 0.2</div><div class='add'>+	 */</div><div class='add'>+	if ((c-&gt;x86_model == 8 &amp;&amp; c-&gt;x86_mask &gt;= 1) || (c-&gt;x86_model &gt; 8)) {</div><div class='add'>+		rdmsr(MSR_K7_CLK_CTL, l, h);</div><div class='add'>+		if ((l &amp; 0xfff00000) != 0x20000000) {</div><div class='add'>+			printk ("CPU: CLK_CTL MSR was %x. Reprogramming to %x\n", l,</div><div class='add'>+				((l &amp; 0x000fffff)|0x20000000));</div><div class='add'>+			wrmsr(MSR_K7_CLK_CTL, (l &amp; 0x000fffff)|0x20000000, h);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	set_cpu_cap(c, X86_FEATURE_K7);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_NUMA) &amp;&amp; defined(CONFIG_X86_64)</div><div class='add'>+static int __cpuinit nearby_node(int apicid)</div><div class='add'>+{</div><div class='add'>+	int i, node;</div><div class='add'>+</div><div class='add'>+	for (i = apicid - 1; i &gt;= 0; i--) {</div><div class='add'>+		node = apicid_to_node[i];</div><div class='add'>+		if (node != NUMA_NO_NODE &amp;&amp; node_online(node))</div><div class='add'>+			return node;</div><div class='add'>+	}</div><div class='add'>+	for (i = apicid + 1; i &lt; MAX_LOCAL_APIC; i++) {</div><div class='add'>+		node = apicid_to_node[i];</div><div class='add'>+		if (node != NUMA_NO_NODE &amp;&amp; node_online(node))</div><div class='add'>+			return node;</div><div class='add'>+	}</div><div class='add'>+	return first_node(node_online_map); /* Shouldn't happen */</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * On a AMD dual core setup the lower bits of the APIC id distingush the cores.</div><div class='add'>+ * Assumes number of cores is a power of two.</div><div class='add'>+ */</div><div class='add'>+static void __cpuinit amd_detect_cmp(struct cpuinfo_x86 *c)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_X86_HT</div><div class='add'>+	unsigned bits;</div><div class='add'>+</div><div class='add'>+	bits = c-&gt;x86_coreid_bits;</div><div class='add'>+</div><div class='add'>+	/* Low order bits define the core id (index of core in socket) */</div><div class='add'>+	c-&gt;cpu_core_id = c-&gt;initial_apicid &amp; ((1 &lt;&lt; bits)-1);</div><div class='add'>+	/* Convert the initial APIC ID into the socket ID */</div><div class='add'>+	c-&gt;phys_proc_id = c-&gt;initial_apicid &gt;&gt; bits;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __cpuinit srat_detect_node(struct cpuinfo_x86 *c)</div><div class='add'>+{</div><div class='add'>+#if defined(CONFIG_NUMA) &amp;&amp; defined(CONFIG_X86_64)</div><div class='add'>+	int cpu = smp_processor_id();</div><div class='add'>+	int node;</div><div class='add'>+	unsigned apicid = hard_smp_processor_id();</div><div class='add'>+</div><div class='add'>+	node = c-&gt;phys_proc_id;</div><div class='add'>+	if (apicid_to_node[apicid] != NUMA_NO_NODE)</div><div class='add'>+		node = apicid_to_node[apicid];</div><div class='add'>+	if (!node_online(node)) {</div><div class='add'>+		/* Two possibilities here:</div><div class='add'>+		   - The CPU is missing memory and no node was created.</div><div class='add'>+		   In that case try picking one from a nearby CPU</div><div class='add'>+		   - The APIC IDs differ from the HyperTransport node IDs</div><div class='add'>+		   which the K8 northbridge parsing fills in.</div><div class='add'>+		   Assume they are all increased by a constant offset,</div><div class='add'>+		   but in the same order as the HT nodeids.</div><div class='add'>+		   If that doesn't result in a usable node fall back to the</div><div class='add'>+		   path for the previous case.  */</div><div class='add'>+</div><div class='add'>+		int ht_nodeid = c-&gt;initial_apicid;</div><div class='add'>+</div><div class='add'>+		if (ht_nodeid &gt;= 0 &amp;&amp;</div><div class='add'>+		    apicid_to_node[ht_nodeid] != NUMA_NO_NODE)</div><div class='add'>+			node = apicid_to_node[ht_nodeid];</div><div class='add'>+		/* Pick a nearby node */</div><div class='add'>+		if (!node_online(node))</div><div class='add'>+			node = nearby_node(apicid);</div><div class='add'>+	}</div><div class='add'>+	numa_set_node(cpu, node);</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "CPU %d/%x -&gt; Node %d\n", cpu, apicid, node);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __cpuinit early_init_amd_mc(struct cpuinfo_x86 *c)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_X86_HT</div><div class='add'>+	unsigned bits, ecx;</div><div class='add'>+</div><div class='add'>+	/* Multi core CPU? */</div><div class='add'>+	if (c-&gt;extended_cpuid_level &lt; 0x80000008)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ecx = cpuid_ecx(0x80000008);</div><div class='add'>+</div><div class='add'>+	c-&gt;x86_max_cores = (ecx &amp; 0xff) + 1;</div><div class='add'>+</div><div class='add'>+	/* CPU telling us the core id bits shift? */</div><div class='add'>+	bits = (ecx &gt;&gt; 12) &amp; 0xF;</div><div class='add'>+</div><div class='add'>+	/* Otherwise recompute */</div><div class='add'>+	if (bits == 0) {</div><div class='add'>+		while ((1 &lt;&lt; bits) &lt; c-&gt;x86_max_cores)</div><div class='add'>+			bits++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	c-&gt;x86_coreid_bits = bits;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __cpuinit early_init_amd(struct cpuinfo_x86 *c)</div><div class='add'>+{</div><div class='add'>+	early_init_amd_mc(c);</div><div class='add'>+</div><div class='add'>+	/* c-&gt;x86_power is 8000_0007 edx. Bit 8 is constant TSC */</div><div class='add'>+	if (c-&gt;x86_power &amp; (1&lt;&lt;8))</div><div class='add'>+		set_cpu_cap(c, X86_FEATURE_CONSTANT_TSC);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='add'>+	set_cpu_cap(c, X86_FEATURE_SYSCALL32);</div><div class='add'>+#else</div><div class='add'>+	/*  Set MTRR capability flag if appropriate */</div><div class='add'>+	if (c-&gt;x86 == 5)</div><div class='add'>+		if (c-&gt;x86_model == 13 || c-&gt;x86_model == 9 ||</div><div class='add'>+		    (c-&gt;x86_model == 8 &amp;&amp; c-&gt;x86_mask &gt;= 8))</div><div class='add'>+			set_cpu_cap(c, X86_FEATURE_K6_MTRR);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __cpuinit init_amd(struct cpuinfo_x86 *c)</div><div class='add'>+{</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> 	unsigned long long value;</div><div class='ctx'> </div><div class='hunk'>@@ -54,7 +310,7 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c)</div><div class='ctx'> 	 * Errata 63 for SH-B3 steppings</div><div class='ctx'> 	 * Errata 122 for all steppings (F+ have it disabled by default)</div><div class='ctx'> 	 */</div><div class='del'>-	if (c-&gt;x86 == 15) {</div><div class='add'>+	if (c-&gt;x86 == 0xf) {</div><div class='ctx'> 		rdmsrl(MSR_K7_HWCR, value);</div><div class='ctx'> 		value |= 1 &lt;&lt; 6;</div><div class='ctx'> 		wrmsrl(MSR_K7_HWCR, value);</div><div class='hunk'>@@ -64,209 +320,119 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c)</div><div class='ctx'> 	early_init_amd(c);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 *	FIXME: We should handle the K5 here. Set up the write</div><div class='del'>-	 *	range and also turn on MSR 83 bits 4 and 31 (write alloc,</div><div class='del'>-	 *	no bus pipeline)</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/*</div><div class='ctx'> 	 * Bit 31 in normal CPUID used for nonstandard 3DNow ID;</div><div class='ctx'> 	 * 3DNow is IDd by bit 31 in extended CPUID (1*32+31) anyway</div><div class='ctx'> 	 */</div><div class='ctx'> 	clear_cpu_cap(c, 0*32+31);</div><div class='ctx'> </div><div class='del'>-	r = get_model_name(c);</div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='add'>+	/* On C+ stepping K8 rep microcode works well for copy/memset */</div><div class='add'>+	if (c-&gt;x86 == 0xf) {</div><div class='add'>+		u32 level;</div><div class='ctx'> </div><div class='del'>-	switch (c-&gt;x86) {</div><div class='del'>-	case 4:</div><div class='del'>-		/*</div><div class='del'>-		 * General Systems BIOSen alias the cpu frequency registers</div><div class='del'>-		 * of the Elan at 0x000df000. Unfortuantly, one of the Linux</div><div class='del'>-		 * drivers subsequently pokes it, and changes the CPU speed.</div><div class='del'>-		 * Workaround : Remove the unneeded alias.</div><div class='del'>-		 */</div><div class='del'>-#define CBAR		(0xfffc) /* Configuration Base Address  (32-bit) */</div><div class='del'>-#define CBAR_ENB	(0x80000000)</div><div class='del'>-#define CBAR_KEY	(0X000000CB)</div><div class='del'>-			if (c-&gt;x86_model == 9 || c-&gt;x86_model == 10) {</div><div class='del'>-				if (inl (CBAR) &amp; CBAR_ENB)</div><div class='del'>-					outl (0 | CBAR_KEY, CBAR);</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-	case 5:</div><div class='del'>-			if (c-&gt;x86_model &lt; 6) {</div><div class='del'>-				/* Based on AMD doc 20734R - June 2000 */</div><div class='del'>-				if (c-&gt;x86_model == 0) {</div><div class='del'>-					clear_cpu_cap(c, X86_FEATURE_APIC);</div><div class='del'>-					set_cpu_cap(c, X86_FEATURE_PGE);</div><div class='del'>-				}</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (c-&gt;x86_model == 6 &amp;&amp; c-&gt;x86_mask == 1) {</div><div class='del'>-				const int K6_BUG_LOOP = 1000000;</div><div class='del'>-				int n;</div><div class='del'>-				void (*f_vide)(void);</div><div class='del'>-				unsigned long d, d2;</div><div class='del'>-</div><div class='del'>-				printk(KERN_INFO "AMD K6 stepping B detected - ");</div><div class='del'>-</div><div class='del'>-				/*</div><div class='del'>-				 * It looks like AMD fixed the 2.6.2 bug and improved indirect</div><div class='del'>-				 * calls at the same time.</div><div class='del'>-				 */</div><div class='del'>-</div><div class='del'>-				n = K6_BUG_LOOP;</div><div class='del'>-				f_vide = vide;</div><div class='del'>-				rdtscl(d);</div><div class='del'>-				while (n--)</div><div class='del'>-					f_vide();</div><div class='del'>-				rdtscl(d2);</div><div class='del'>-				d = d2-d;</div><div class='del'>-</div><div class='del'>-				if (d &gt; 20*K6_BUG_LOOP)</div><div class='del'>-					printk("system stability may be impaired when more than 32 MB are used.\n");</div><div class='del'>-				else</div><div class='del'>-					printk("probably OK (after B9730xxxx).\n");</div><div class='del'>-				printk(KERN_INFO "Please see http://membres.lycos.fr/poulot/k6bug.html\n");</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* K6 with old style WHCR */</div><div class='del'>-			if (c-&gt;x86_model &lt; 8 ||</div><div class='del'>-			   (c-&gt;x86_model == 8 &amp;&amp; c-&gt;x86_mask &lt; 8)) {</div><div class='del'>-				/* We can only write allocate on the low 508Mb */</div><div class='del'>-				if (mbytes &gt; 508)</div><div class='del'>-					mbytes = 508;</div><div class='del'>-</div><div class='del'>-				rdmsr(MSR_K6_WHCR, l, h);</div><div class='del'>-				if ((l&amp;0x0000FFFF) == 0) {</div><div class='del'>-					unsigned long flags;</div><div class='del'>-					l = (1&lt;&lt;0)|((mbytes/4)&lt;&lt;1);</div><div class='del'>-					local_irq_save(flags);</div><div class='del'>-					wbinvd();</div><div class='del'>-					wrmsr(MSR_K6_WHCR, l, h);</div><div class='del'>-					local_irq_restore(flags);</div><div class='del'>-					printk(KERN_INFO "Enabling old style K6 write allocation for %d Mb\n",</div><div class='del'>-						mbytes);</div><div class='del'>-				}</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if ((c-&gt;x86_model == 8 &amp;&amp; c-&gt;x86_mask &gt; 7) ||</div><div class='del'>-			     c-&gt;x86_model == 9 || c-&gt;x86_model == 13) {</div><div class='del'>-				/* The more serious chips .. */</div><div class='del'>-</div><div class='del'>-				if (mbytes &gt; 4092)</div><div class='del'>-					mbytes = 4092;</div><div class='del'>-</div><div class='del'>-				rdmsr(MSR_K6_WHCR, l, h);</div><div class='del'>-				if ((l&amp;0xFFFF0000) == 0) {</div><div class='del'>-					unsigned long flags;</div><div class='del'>-					l = ((mbytes&gt;&gt;2)&lt;&lt;22)|(1&lt;&lt;16);</div><div class='del'>-					local_irq_save(flags);</div><div class='del'>-					wbinvd();</div><div class='del'>-					wrmsr(MSR_K6_WHCR, l, h);</div><div class='del'>-					local_irq_restore(flags);</div><div class='del'>-					printk(KERN_INFO "Enabling new style K6 write allocation for %d Mb\n",</div><div class='del'>-						mbytes);</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (c-&gt;x86_model == 10) {</div><div class='del'>-				/* AMD Geode LX is model 10 */</div><div class='del'>-				/* placeholder for any needed mods */</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-	case 6: /* An Athlon/Duron */</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * Bit 15 of Athlon specific MSR 15, needs to be 0</div><div class='del'>-			 * to enable SSE on Palomino/Morgan/Barton CPU's.</div><div class='del'>-			 * If the BIOS didn't enable it already, enable it here.</div><div class='del'>-			 */</div><div class='del'>-			if (c-&gt;x86_model &gt;= 6 &amp;&amp; c-&gt;x86_model &lt;= 10) {</div><div class='del'>-				if (!cpu_has(c, X86_FEATURE_XMM)) {</div><div class='del'>-					printk(KERN_INFO "Enabling disabled K7/SSE Support.\n");</div><div class='del'>-					rdmsr(MSR_K7_HWCR, l, h);</div><div class='del'>-					l &amp;= ~0x00008000;</div><div class='del'>-					wrmsr(MSR_K7_HWCR, l, h);</div><div class='del'>-					set_cpu_cap(c, X86_FEATURE_XMM);</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * It's been determined by AMD that Athlons since model 8 stepping 1</div><div class='del'>-			 * are more robust with CLK_CTL set to 200xxxxx instead of 600xxxxx</div><div class='del'>-			 * As per AMD technical note 27212 0.2</div><div class='del'>-			 */</div><div class='del'>-			if ((c-&gt;x86_model == 8 &amp;&amp; c-&gt;x86_mask &gt;= 1) || (c-&gt;x86_model &gt; 8)) {</div><div class='del'>-				rdmsr(MSR_K7_CLK_CTL, l, h);</div><div class='del'>-				if ((l &amp; 0xfff00000) != 0x20000000) {</div><div class='del'>-					printk ("CPU: CLK_CTL MSR was %x. Reprogramming to %x\n", l,</div><div class='del'>-						((l &amp; 0x000fffff)|0x20000000));</div><div class='del'>-					wrmsr(MSR_K7_CLK_CTL, (l &amp; 0x000fffff)|0x20000000, h);</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='add'>+		level = cpuid_eax(1);</div><div class='add'>+		if((level &gt;= 0x0f48 &amp;&amp; level &lt; 0x0f50) || level &gt;= 0x0f58)</div><div class='add'>+			set_cpu_cap(c, X86_FEATURE_REP_GOOD);</div><div class='ctx'> 	}</div><div class='add'>+	if (c-&gt;x86 == 0x10 || c-&gt;x86 == 0x11)</div><div class='add'>+		set_cpu_cap(c, X86_FEATURE_REP_GOOD);</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 *	FIXME: We should handle the K5 here. Set up the write</div><div class='add'>+	 *	range and also turn on MSR 83 bits 4 and 31 (write alloc,</div><div class='add'>+	 *	no bus pipeline)</div><div class='add'>+	 */</div><div class='ctx'> </div><div class='ctx'> 	switch (c-&gt;x86) {</div><div class='del'>-	case 15:</div><div class='del'>-	/* Use K8 tuning for Fam10h and Fam11h */</div><div class='del'>-	case 0x10:</div><div class='del'>-	case 0x11:</div><div class='del'>-		set_cpu_cap(c, X86_FEATURE_K8);</div><div class='add'>+	case 4:</div><div class='add'>+		init_amd_k5(c);</div><div class='ctx'> 		break;</div><div class='del'>-	case 6:</div><div class='del'>-		set_cpu_cap(c, X86_FEATURE_K7);</div><div class='add'>+	case 5:</div><div class='add'>+		init_amd_k6(c);</div><div class='add'>+		break;</div><div class='add'>+	case 6: /* An Athlon/Duron */</div><div class='add'>+		init_amd_k7(c);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	/* K6s reports MCEs but don't actually have all the MSRs */</div><div class='add'>+	if (c-&gt;x86 &lt; 6)</div><div class='add'>+		clear_cpu_cap(c, X86_FEATURE_MCE);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* Enable workaround for FXSAVE leak */</div><div class='ctx'> 	if (c-&gt;x86 &gt;= 6)</div><div class='ctx'> 		set_cpu_cap(c, X86_FEATURE_FXSAVE_LEAK);</div><div class='ctx'> </div><div class='del'>-	display_cacheinfo(c);</div><div class='del'>-</div><div class='del'>-	if (cpuid_eax(0x80000000) &gt;= 0x80000008)</div><div class='del'>-		c-&gt;x86_max_cores = (cpuid_ecx(0x80000008) &amp; 0xff) + 1;</div><div class='add'>+	if (!c-&gt;x86_model_id[0]) {</div><div class='add'>+		switch (c-&gt;x86) {</div><div class='add'>+		case 0xf:</div><div class='add'>+			/* Should distinguish Models here, but this is only</div><div class='add'>+			   a fallback anyways. */</div><div class='add'>+			strcpy(c-&gt;x86_model_id, "Hammer");</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_X86_HT</div><div class='del'>-	/*</div><div class='del'>-	 * On a AMD multi core setup the lower bits of the APIC id</div><div class='del'>-	 * distinguish the cores.</div><div class='del'>-	 */</div><div class='del'>-	if (c-&gt;x86_max_cores &gt; 1) {</div><div class='del'>-		int cpu = smp_processor_id();</div><div class='del'>-		unsigned bits = (cpuid_ecx(0x80000008) &gt;&gt; 12) &amp; 0xf;</div><div class='add'>+	display_cacheinfo(c);</div><div class='ctx'> </div><div class='del'>-		if (bits == 0) {</div><div class='del'>-			while ((1 &lt;&lt; bits) &lt; c-&gt;x86_max_cores)</div><div class='del'>-				bits++;</div><div class='del'>-		}</div><div class='del'>-		c-&gt;cpu_core_id = c-&gt;phys_proc_id &amp; ((1&lt;&lt;bits)-1);</div><div class='del'>-		c-&gt;phys_proc_id &gt;&gt;= bits;</div><div class='del'>-		printk(KERN_INFO "CPU %d(%d) -&gt; Core %d\n",</div><div class='del'>-		       cpu, c-&gt;x86_max_cores, c-&gt;cpu_core_id);</div><div class='add'>+	/* Multi core CPU? */</div><div class='add'>+	if (c-&gt;extended_cpuid_level &gt;= 0x80000008) {</div><div class='add'>+		amd_detect_cmp(c);</div><div class='add'>+		srat_detect_node(c);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_X86_32</div><div class='add'>+	detect_ht(c);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	if (cpuid_eax(0x80000000) &gt;= 0x80000006) {</div><div class='del'>-		if ((c-&gt;x86 == 0x10) &amp;&amp; (cpuid_edx(0x80000006) &amp; 0xf000))</div><div class='add'>+	if (c-&gt;extended_cpuid_level &gt;= 0x80000006) {</div><div class='add'>+		if ((c-&gt;x86 &gt;= 0x0f) &amp;&amp; (cpuid_edx(0x80000006) &amp; 0xf000))</div><div class='ctx'> 			num_cache_leaves = 4;</div><div class='ctx'> 		else</div><div class='ctx'> 			num_cache_leaves = 3;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* K6s reports MCEs but don't actually have all the MSRs */</div><div class='del'>-	if (c-&gt;x86 &lt; 6)</div><div class='del'>-		clear_cpu_cap(c, X86_FEATURE_MCE);</div><div class='add'>+	if (c-&gt;x86 &gt;= 0xf &amp;&amp; c-&gt;x86 &lt;= 0x11)</div><div class='add'>+		set_cpu_cap(c, X86_FEATURE_K8);</div><div class='ctx'> </div><div class='del'>-	if (cpu_has_xmm2)</div><div class='add'>+	if (cpu_has_xmm2) {</div><div class='add'>+		/* MFENCE stops RDTSC speculation */</div><div class='ctx'> 		set_cpu_cap(c, X86_FEATURE_MFENCE_RDTSC);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='add'>+	if (c-&gt;x86 == 0x10) {</div><div class='add'>+		/* do this for boot cpu */</div><div class='add'>+		if (c == &amp;boot_cpu_data)</div><div class='add'>+			check_enable_amd_mmconf_dmi();</div><div class='add'>+</div><div class='add'>+		fam10h_check_enable_mmcfg();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (c == &amp;boot_cpu_data &amp;&amp; c-&gt;x86 &gt;= 0xf &amp;&amp; c-&gt;x86 &lt;= 0x11) {</div><div class='add'>+		unsigned long long tseg;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Split up direct mapping around the TSEG SMM area.</div><div class='add'>+		 * Don't do it for gbpages because there seems very little</div><div class='add'>+		 * benefit in doing so.</div><div class='add'>+		 */</div><div class='add'>+		if (!rdmsrl_safe(MSR_K8_TSEG_ADDR, &amp;tseg)) {</div><div class='add'>+		    printk(KERN_DEBUG "tseg: %010llx\n", tseg);</div><div class='add'>+		    if ((tseg&gt;&gt;PMD_SHIFT) &lt;</div><div class='add'>+				(max_low_pfn_mapped&gt;&gt;(PMD_SHIFT-PAGE_SHIFT)) ||</div><div class='add'>+			((tseg&gt;&gt;PMD_SHIFT) &lt;</div><div class='add'>+				(max_pfn_mapped&gt;&gt;(PMD_SHIFT-PAGE_SHIFT)) &amp;&amp;</div><div class='add'>+			 (tseg&gt;&gt;PMD_SHIFT) &gt;= (1ULL&lt;&lt;(32 - PMD_SHIFT))))</div><div class='add'>+			set_memory_4k((unsigned long)__va(tseg), 1);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_X86_32</div><div class='ctx'> static unsigned int __cpuinit amd_size_cache(struct cpuinfo_x86 *c, unsigned int size)</div><div class='ctx'> {</div><div class='ctx'> 	/* AMD errata T13 (order #21922) */</div><div class='hunk'>@@ -279,10 +445,12 @@ static unsigned int __cpuinit amd_size_cache(struct cpuinfo_x86 *c, unsigned int</div><div class='ctx'> 	}</div><div class='ctx'> 	return size;</div><div class='ctx'> }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> static struct cpu_dev amd_cpu_dev __cpuinitdata = {</div><div class='ctx'> 	.c_vendor	= "AMD",</div><div class='ctx'> 	.c_ident	= { "AuthenticAMD" },</div><div class='add'>+#ifdef CONFIG_X86_32</div><div class='ctx'> 	.c_models = {</div><div class='ctx'> 		{ .vendor = X86_VENDOR_AMD, .family = 4, .model_names =</div><div class='ctx'> 		  {</div><div class='hunk'>@@ -295,9 +463,11 @@ static struct cpu_dev amd_cpu_dev __cpuinitdata = {</div><div class='ctx'> 		  }</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='add'>+	.c_size_cache	= amd_size_cache,</div><div class='add'>+#endif</div><div class='ctx'> 	.c_early_init   = early_init_amd,</div><div class='ctx'> 	.c_init		= init_amd,</div><div class='del'>-	.c_size_cache	= amd_size_cache,</div><div class='add'>+	.c_x86_vendor	= X86_VENDOR_AMD,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-cpu_vendor_dev_register(X86_VENDOR_AMD, &amp;amd_cpu_dev);</div><div class='add'>+cpu_dev_register(amd_cpu_dev);</div><div class='head'>diff --git a/arch/x86/kernel/cpu/amd_64.c b/arch/x86/kernel/cpu/amd_64.c<br/>deleted file mode 100644<br/>index d1692b2a41ff..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/cpu/amd_64.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/cpu/amd_64.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,224 +0,0 @@</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/mm.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/numa_64.h&gt;</div><div class='del'>-#include &lt;asm/mmconfig.h&gt;</div><div class='del'>-#include &lt;asm/cacheflush.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;mach_apic.h&gt;</div><div class='del'>-</div><div class='del'>-#include "cpu.h"</div><div class='del'>-</div><div class='del'>-int force_mwait __cpuinitdata;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_NUMA</div><div class='del'>-static int __cpuinit nearby_node(int apicid)</div><div class='del'>-{</div><div class='del'>-	int i, node;</div><div class='del'>-</div><div class='del'>-	for (i = apicid - 1; i &gt;= 0; i--) {</div><div class='del'>-		node = apicid_to_node[i];</div><div class='del'>-		if (node != NUMA_NO_NODE &amp;&amp; node_online(node))</div><div class='del'>-			return node;</div><div class='del'>-	}</div><div class='del'>-	for (i = apicid + 1; i &lt; MAX_LOCAL_APIC; i++) {</div><div class='del'>-		node = apicid_to_node[i];</div><div class='del'>-		if (node != NUMA_NO_NODE &amp;&amp; node_online(node))</div><div class='del'>-			return node;</div><div class='del'>-	}</div><div class='del'>-	return first_node(node_online_map); /* Shouldn't happen */</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * On a AMD dual core setup the lower bits of the APIC id distingush the cores.</div><div class='del'>- * Assumes number of cores is a power of two.</div><div class='del'>- */</div><div class='del'>-static void __cpuinit amd_detect_cmp(struct cpuinfo_x86 *c)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_SMP</div><div class='del'>-	unsigned bits;</div><div class='del'>-#ifdef CONFIG_NUMA</div><div class='del'>-	int cpu = smp_processor_id();</div><div class='del'>-	int node = 0;</div><div class='del'>-	unsigned apicid = hard_smp_processor_id();</div><div class='del'>-#endif</div><div class='del'>-	bits = c-&gt;x86_coreid_bits;</div><div class='del'>-</div><div class='del'>-	/* Low order bits define the core id (index of core in socket) */</div><div class='del'>-	c-&gt;cpu_core_id = c-&gt;initial_apicid &amp; ((1 &lt;&lt; bits)-1);</div><div class='del'>-	/* Convert the initial APIC ID into the socket ID */</div><div class='del'>-	c-&gt;phys_proc_id = c-&gt;initial_apicid &gt;&gt; bits;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_NUMA</div><div class='del'>-	node = c-&gt;phys_proc_id;</div><div class='del'>-	if (apicid_to_node[apicid] != NUMA_NO_NODE)</div><div class='del'>-		node = apicid_to_node[apicid];</div><div class='del'>-	if (!node_online(node)) {</div><div class='del'>-		/* Two possibilities here:</div><div class='del'>-		   - The CPU is missing memory and no node was created.</div><div class='del'>-		   In that case try picking one from a nearby CPU</div><div class='del'>-		   - The APIC IDs differ from the HyperTransport node IDs</div><div class='del'>-		   which the K8 northbridge parsing fills in.</div><div class='del'>-		   Assume they are all increased by a constant offset,</div><div class='del'>-		   but in the same order as the HT nodeids.</div><div class='del'>-		   If that doesn't result in a usable node fall back to the</div><div class='del'>-		   path for the previous case.  */</div><div class='del'>-</div><div class='del'>-		int ht_nodeid = c-&gt;initial_apicid;</div><div class='del'>-</div><div class='del'>-		if (ht_nodeid &gt;= 0 &amp;&amp;</div><div class='del'>-		    apicid_to_node[ht_nodeid] != NUMA_NO_NODE)</div><div class='del'>-			node = apicid_to_node[ht_nodeid];</div><div class='del'>-		/* Pick a nearby node */</div><div class='del'>-		if (!node_online(node))</div><div class='del'>-			node = nearby_node(apicid);</div><div class='del'>-	}</div><div class='del'>-	numa_set_node(cpu, node);</div><div class='del'>-</div><div class='del'>-	printk(KERN_INFO "CPU %d/%x -&gt; Node %d\n", cpu, apicid, node);</div><div class='del'>-#endif</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __cpuinit early_init_amd_mc(struct cpuinfo_x86 *c)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_SMP</div><div class='del'>-	unsigned bits, ecx;</div><div class='del'>-</div><div class='del'>-	/* Multi core CPU? */</div><div class='del'>-	if (c-&gt;extended_cpuid_level &lt; 0x80000008)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	ecx = cpuid_ecx(0x80000008);</div><div class='del'>-</div><div class='del'>-	c-&gt;x86_max_cores = (ecx &amp; 0xff) + 1;</div><div class='del'>-</div><div class='del'>-	/* CPU telling us the core id bits shift? */</div><div class='del'>-	bits = (ecx &gt;&gt; 12) &amp; 0xF;</div><div class='del'>-</div><div class='del'>-	/* Otherwise recompute */</div><div class='del'>-	if (bits == 0) {</div><div class='del'>-		while ((1 &lt;&lt; bits) &lt; c-&gt;x86_max_cores)</div><div class='del'>-			bits++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	c-&gt;x86_coreid_bits = bits;</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __cpuinit early_init_amd(struct cpuinfo_x86 *c)</div><div class='del'>-{</div><div class='del'>-	early_init_amd_mc(c);</div><div class='del'>-</div><div class='del'>-	/* c-&gt;x86_power is 8000_0007 edx. Bit 8 is constant TSC */</div><div class='del'>-	if (c-&gt;x86_power &amp; (1&lt;&lt;8))</div><div class='del'>-		set_cpu_cap(c, X86_FEATURE_CONSTANT_TSC);</div><div class='del'>-</div><div class='del'>-	set_cpu_cap(c, X86_FEATURE_SYSCALL32);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __cpuinit init_amd(struct cpuinfo_x86 *c)</div><div class='del'>-{</div><div class='del'>-	unsigned level;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SMP</div><div class='del'>-	unsigned long value;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Disable TLB flush filter by setting HWCR.FFDIS on K8</div><div class='del'>-	 * bit 6 of msr C001_0015</div><div class='del'>-	 *</div><div class='del'>-	 * Errata 63 for SH-B3 steppings</div><div class='del'>-	 * Errata 122 for all steppings (F+ have it disabled by default)</div><div class='del'>-	 */</div><div class='del'>-	if (c-&gt;x86 == 0xf) {</div><div class='del'>-		rdmsrl(MSR_K8_HWCR, value);</div><div class='del'>-		value |= 1 &lt;&lt; 6;</div><div class='del'>-		wrmsrl(MSR_K8_HWCR, value);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* Bit 31 in normal CPUID used for nonstandard 3DNow ID;</div><div class='del'>-	   3DNow is IDd by bit 31 in extended CPUID (1*32+31) anyway */</div><div class='del'>-	clear_cpu_cap(c, 0*32+31);</div><div class='del'>-</div><div class='del'>-	/* On C+ stepping K8 rep microcode works well for copy/memset */</div><div class='del'>-	if (c-&gt;x86 == 0xf) {</div><div class='del'>-		level = cpuid_eax(1);</div><div class='del'>-		if((level &gt;= 0x0f48 &amp;&amp; level &lt; 0x0f50) || level &gt;= 0x0f58)</div><div class='del'>-			set_cpu_cap(c, X86_FEATURE_REP_GOOD);</div><div class='del'>-	}</div><div class='del'>-	if (c-&gt;x86 == 0x10 || c-&gt;x86 == 0x11)</div><div class='del'>-		set_cpu_cap(c, X86_FEATURE_REP_GOOD);</div><div class='del'>-</div><div class='del'>-	/* Enable workaround for FXSAVE leak */</div><div class='del'>-	if (c-&gt;x86 &gt;= 6)</div><div class='del'>-		set_cpu_cap(c, X86_FEATURE_FXSAVE_LEAK);</div><div class='del'>-</div><div class='del'>-	level = get_model_name(c);</div><div class='del'>-	if (!level) {</div><div class='del'>-		switch (c-&gt;x86) {</div><div class='del'>-		case 0xf:</div><div class='del'>-			/* Should distinguish Models here, but this is only</div><div class='del'>-			   a fallback anyways. */</div><div class='del'>-			strcpy(c-&gt;x86_model_id, "Hammer");</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	display_cacheinfo(c);</div><div class='del'>-</div><div class='del'>-	/* Multi core CPU? */</div><div class='del'>-	if (c-&gt;extended_cpuid_level &gt;= 0x80000008)</div><div class='del'>-		amd_detect_cmp(c);</div><div class='del'>-</div><div class='del'>-	if (c-&gt;extended_cpuid_level &gt;= 0x80000006 &amp;&amp;</div><div class='del'>-		(cpuid_edx(0x80000006) &amp; 0xf000))</div><div class='del'>-		num_cache_leaves = 4;</div><div class='del'>-	else</div><div class='del'>-		num_cache_leaves = 3;</div><div class='del'>-</div><div class='del'>-	if (c-&gt;x86 &gt;= 0xf &amp;&amp; c-&gt;x86 &lt;= 0x11)</div><div class='del'>-		set_cpu_cap(c, X86_FEATURE_K8);</div><div class='del'>-</div><div class='del'>-	/* MFENCE stops RDTSC speculation */</div><div class='del'>-	set_cpu_cap(c, X86_FEATURE_MFENCE_RDTSC);</div><div class='del'>-</div><div class='del'>-	if (c-&gt;x86 == 0x10) {</div><div class='del'>-		/* do this for boot cpu */</div><div class='del'>-		if (c == &amp;boot_cpu_data)</div><div class='del'>-			check_enable_amd_mmconf_dmi();</div><div class='del'>-</div><div class='del'>-		fam10h_check_enable_mmcfg();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (c == &amp;boot_cpu_data &amp;&amp; c-&gt;x86 &gt;= 0xf &amp;&amp; c-&gt;x86 &lt;= 0x11) {</div><div class='del'>-		unsigned long long tseg;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Split up direct mapping around the TSEG SMM area.</div><div class='del'>-		 * Don't do it for gbpages because there seems very little</div><div class='del'>-		 * benefit in doing so.</div><div class='del'>-		 */</div><div class='del'>-		if (!rdmsrl_safe(MSR_K8_TSEG_ADDR, &amp;tseg)) {</div><div class='del'>-		    printk(KERN_DEBUG "tseg: %010llx\n", tseg);</div><div class='del'>-		    if ((tseg&gt;&gt;PMD_SHIFT) &lt;</div><div class='del'>-				(max_low_pfn_mapped&gt;&gt;(PMD_SHIFT-PAGE_SHIFT)) ||</div><div class='del'>-			((tseg&gt;&gt;PMD_SHIFT) &lt;</div><div class='del'>-				(max_pfn_mapped&gt;&gt;(PMD_SHIFT-PAGE_SHIFT)) &amp;&amp;</div><div class='del'>-			 (tseg&gt;&gt;PMD_SHIFT) &gt;= (1ULL&lt;&lt;(32 - PMD_SHIFT))))</div><div class='del'>-			set_memory_4k((unsigned long)__va(tseg), 1);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct cpu_dev amd_cpu_dev __cpuinitdata = {</div><div class='del'>-	.c_vendor	= "AMD",</div><div class='del'>-	.c_ident	= { "AuthenticAMD" },</div><div class='del'>-	.c_early_init   = early_init_amd,</div><div class='del'>-	.c_init		= init_amd,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-cpu_vendor_dev_register(X86_VENDOR_AMD, &amp;amd_cpu_dev);</div><div class='del'>-</div><div class='head'>diff --git a/arch/x86/kernel/cpu/centaur.c b/arch/x86/kernel/cpu/centaur.c<br/>index a0534c04d38a..89bfdd9cacc6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/cpu/centaur.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/cpu/centaur.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/cpu/centaur.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/cpu/centaur.c</a></div><div class='hunk'>@@ -289,7 +289,6 @@ static void __cpuinit init_c3(struct cpuinfo_x86 *c)</div><div class='ctx'> 	if (c-&gt;x86_model &gt;= 6 &amp;&amp; c-&gt;x86_model &lt; 9)</div><div class='ctx'> 		set_cpu_cap(c, X86_FEATURE_3DNOW);</div><div class='ctx'> </div><div class='del'>-	get_model_name(c);</div><div class='ctx'> 	display_cacheinfo(c);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -475,6 +474,7 @@ static struct cpu_dev centaur_cpu_dev __cpuinitdata = {</div><div class='ctx'> 	.c_early_init	= early_init_centaur,</div><div class='ctx'> 	.c_init		= init_centaur,</div><div class='ctx'> 	.c_size_cache	= centaur_size_cache,</div><div class='add'>+	.c_x86_vendor	= X86_VENDOR_CENTAUR,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-cpu_vendor_dev_register(X86_VENDOR_CENTAUR, &amp;centaur_cpu_dev);</div><div class='add'>+cpu_dev_register(centaur_cpu_dev);</div><div class='head'>diff --git a/arch/x86/kernel/cpu/centaur_64.c b/arch/x86/kernel/cpu/centaur_64.c<br/>index 1d181c40e2e1..a1625f5a1e78 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/cpu/centaur_64.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/cpu/centaur_64.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/cpu/centaur_64.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/cpu/centaur_64.c</a></div><div class='hunk'>@@ -16,9 +16,10 @@ static void __cpuinit early_init_centaur(struct cpuinfo_x86 *c)</div><div class='ctx'> </div><div class='ctx'> static void __cpuinit init_centaur(struct cpuinfo_x86 *c)</div><div class='ctx'> {</div><div class='add'>+	early_init_centaur(c);</div><div class='add'>+</div><div class='ctx'> 	if (c-&gt;x86 == 0x6 &amp;&amp; c-&gt;x86_model &gt;= 0xf) {</div><div class='ctx'> 		c-&gt;x86_cache_alignment = c-&gt;x86_clflush_size * 2;</div><div class='del'>-		set_cpu_cap(c, X86_FEATURE_CONSTANT_TSC);</div><div class='ctx'> 		set_cpu_cap(c, X86_FEATURE_REP_GOOD);</div><div class='ctx'> 	}</div><div class='ctx'> 	set_cpu_cap(c, X86_FEATURE_LFENCE_RDTSC);</div><div class='hunk'>@@ -29,7 +30,8 @@ static struct cpu_dev centaur_cpu_dev __cpuinitdata = {</div><div class='ctx'> 	.c_ident	= { "CentaurHauls" },</div><div class='ctx'> 	.c_early_init	= early_init_centaur,</div><div class='ctx'> 	.c_init		= init_centaur,</div><div class='add'>+	.c_x86_vendor	= X86_VENDOR_CENTAUR,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-cpu_vendor_dev_register(X86_VENDOR_CENTAUR, &amp;centaur_cpu_dev);</div><div class='add'>+cpu_dev_register(centaur_cpu_dev);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kernel/cpu/cmpxchg.c b/arch/x86/kernel/cpu/cmpxchg.c<br/>new file mode 100644<br/>index 000000000000..2056ccf572cc<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/cpu/cmpxchg.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/cpu/cmpxchg.c</a></div><div class='hunk'>@@ -0,0 +1,72 @@</div><div class='add'>+/*</div><div class='add'>+ * cmpxchg*() fallbacks for CPU not supporting these instructions</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/smp.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+</div><div class='add'>+#ifndef CONFIG_X86_CMPXCHG</div><div class='add'>+unsigned long cmpxchg_386_u8(volatile void *ptr, u8 old, u8 new)</div><div class='add'>+{</div><div class='add'>+	u8 prev;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	/* Poor man's cmpxchg for 386. Unsuitable for SMP */</div><div class='add'>+	local_irq_save(flags);</div><div class='add'>+	prev = *(u8 *)ptr;</div><div class='add'>+	if (prev == old)</div><div class='add'>+		*(u8 *)ptr = new;</div><div class='add'>+	local_irq_restore(flags);</div><div class='add'>+	return prev;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(cmpxchg_386_u8);</div><div class='add'>+</div><div class='add'>+unsigned long cmpxchg_386_u16(volatile void *ptr, u16 old, u16 new)</div><div class='add'>+{</div><div class='add'>+	u16 prev;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	/* Poor man's cmpxchg for 386. Unsuitable for SMP */</div><div class='add'>+	local_irq_save(flags);</div><div class='add'>+	prev = *(u16 *)ptr;</div><div class='add'>+	if (prev == old)</div><div class='add'>+		*(u16 *)ptr = new;</div><div class='add'>+	local_irq_restore(flags);</div><div class='add'>+	return prev;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(cmpxchg_386_u16);</div><div class='add'>+</div><div class='add'>+unsigned long cmpxchg_386_u32(volatile void *ptr, u32 old, u32 new)</div><div class='add'>+{</div><div class='add'>+	u32 prev;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	/* Poor man's cmpxchg for 386. Unsuitable for SMP */</div><div class='add'>+	local_irq_save(flags);</div><div class='add'>+	prev = *(u32 *)ptr;</div><div class='add'>+	if (prev == old)</div><div class='add'>+		*(u32 *)ptr = new;</div><div class='add'>+	local_irq_restore(flags);</div><div class='add'>+	return prev;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(cmpxchg_386_u32);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef CONFIG_X86_CMPXCHG64</div><div class='add'>+unsigned long long cmpxchg_486_u64(volatile void *ptr, u64 old, u64 new)</div><div class='add'>+{</div><div class='add'>+	u64 prev;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	/* Poor man's cmpxchg8b for 386 and 486. Unsuitable for SMP */</div><div class='add'>+	local_irq_save(flags);</div><div class='add'>+	prev = *(u64 *)ptr;</div><div class='add'>+	if (prev == old)</div><div class='add'>+		*(u64 *)ptr = new;</div><div class='add'>+	local_irq_restore(flags);</div><div class='add'>+	return prev;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(cmpxchg_486_u64);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='head'>diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c<br/>index 4e456bd955bb..25581dcb280e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/cpu/common.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/cpu/common.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/cpu/common.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/cpu/common.c</a></div><div class='hunk'>@@ -1,28 +1,62 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/bootmem.h&gt;</div><div class='add'>+#include &lt;linux/bitops.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/kgdb.h&gt;</div><div class='add'>+#include &lt;linux/topology.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/percpu.h&gt;</div><div class='del'>-#include &lt;linux/bootmem.h&gt;</div><div class='del'>-#include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/i387.h&gt;</div><div class='ctx'> #include &lt;asm/msr.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='ctx'> #include &lt;asm/mtrr.h&gt;</div><div class='ctx'> #include &lt;asm/mce.h&gt;</div><div class='ctx'> #include &lt;asm/pat.h&gt;</div><div class='ctx'> #include &lt;asm/asm.h&gt;</div><div class='add'>+#include &lt;asm/numa.h&gt;</div><div class='ctx'> #ifdef CONFIG_X86_LOCAL_APIC</div><div class='ctx'> #include &lt;asm/mpspec.h&gt;</div><div class='ctx'> #include &lt;asm/apic.h&gt;</div><div class='ctx'> #include &lt;mach_apic.h&gt;</div><div class='add'>+#include &lt;asm/genapic.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/pda.h&gt;</div><div class='add'>+#include &lt;asm/pgtable.h&gt;</div><div class='add'>+#include &lt;asm/processor.h&gt;</div><div class='add'>+#include &lt;asm/desc.h&gt;</div><div class='add'>+#include &lt;asm/atomic.h&gt;</div><div class='add'>+#include &lt;asm/proto.h&gt;</div><div class='add'>+#include &lt;asm/sections.h&gt;</div><div class='add'>+#include &lt;asm/setup.h&gt;</div><div class='add'>+</div><div class='ctx'> #include "cpu.h"</div><div class='ctx'> </div><div class='add'>+static struct cpu_dev *this_cpu __cpuinitdata;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='add'>+/* We need valid kernel segments for data and code in long mode too</div><div class='add'>+ * IRET will check the segment types  kkeil 2000/10/28</div><div class='add'>+ * Also sysret mandates a special GDT layout</div><div class='add'>+ */</div><div class='add'>+/* The TLS descriptors are currently at a different place compared to i386.</div><div class='add'>+   Hopefully nobody expects them at a fixed place (Wine?) */</div><div class='ctx'> DEFINE_PER_CPU(struct gdt_page, gdt_page) = { .gdt = {</div><div class='add'>+	[GDT_ENTRY_KERNEL32_CS] = { { { 0x0000ffff, 0x00cf9b00 } } },</div><div class='add'>+	[GDT_ENTRY_KERNEL_CS] = { { { 0x0000ffff, 0x00af9b00 } } },</div><div class='add'>+	[GDT_ENTRY_KERNEL_DS] = { { { 0x0000ffff, 0x00cf9300 } } },</div><div class='add'>+	[GDT_ENTRY_DEFAULT_USER32_CS] = { { { 0x0000ffff, 0x00cffb00 } } },</div><div class='add'>+	[GDT_ENTRY_DEFAULT_USER_DS] = { { { 0x0000ffff, 0x00cff300 } } },</div><div class='add'>+	[GDT_ENTRY_DEFAULT_USER_CS] = { { { 0x0000ffff, 0x00affb00 } } },</div><div class='add'>+} };</div><div class='add'>+#else</div><div class='add'>+DEFINE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page) = { .gdt = {</div><div class='ctx'> 	[GDT_ENTRY_KERNEL_CS] = { { { 0x0000ffff, 0x00cf9a00 } } },</div><div class='ctx'> 	[GDT_ENTRY_KERNEL_DS] = { { { 0x0000ffff, 0x00cf9200 } } },</div><div class='ctx'> 	[GDT_ENTRY_DEFAULT_USER_CS] = { { { 0x0000ffff, 0x00cffa00 } } },</div><div class='hunk'>@@ -56,17 +90,157 @@ DEFINE_PER_CPU(struct gdt_page, gdt_page) = { .gdt = {</div><div class='ctx'> 	[GDT_ENTRY_ESPFIX_SS] = { { { 0x00000000, 0x00c09200 } } },</div><div class='ctx'> 	[GDT_ENTRY_PERCPU] = { { { 0x00000000, 0x00000000 } } },</div><div class='ctx'> } };</div><div class='add'>+#endif</div><div class='ctx'> EXPORT_PER_CPU_SYMBOL_GPL(gdt_page);</div><div class='ctx'> </div><div class='del'>-__u32 cleared_cpu_caps[NCAPINTS] __cpuinitdata;</div><div class='del'>-</div><div class='add'>+#ifdef CONFIG_X86_32</div><div class='ctx'> static int cachesize_override __cpuinitdata = -1;</div><div class='ctx'> static int disable_x86_serial_nr __cpuinitdata = 1;</div><div class='ctx'> </div><div class='del'>-struct cpu_dev *cpu_devs[X86_VENDOR_NUM] = {};</div><div class='add'>+static int __init cachesize_setup(char *str)</div><div class='add'>+{</div><div class='add'>+	get_option(&amp;str, &amp;cachesize_override);</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+__setup("cachesize=", cachesize_setup);</div><div class='add'>+</div><div class='add'>+static int __init x86_fxsr_setup(char *s)</div><div class='add'>+{</div><div class='add'>+	setup_clear_cpu_cap(X86_FEATURE_FXSR);</div><div class='add'>+	setup_clear_cpu_cap(X86_FEATURE_XMM);</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+__setup("nofxsr", x86_fxsr_setup);</div><div class='add'>+</div><div class='add'>+static int __init x86_sep_setup(char *s)</div><div class='add'>+{</div><div class='add'>+	setup_clear_cpu_cap(X86_FEATURE_SEP);</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+__setup("nosep", x86_sep_setup);</div><div class='add'>+</div><div class='add'>+/* Standard macro to see if a specific flag is changeable */</div><div class='add'>+static inline int flag_is_changeable_p(u32 flag)</div><div class='add'>+{</div><div class='add'>+	u32 f1, f2;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Cyrix and IDT cpus allow disabling of CPUID</div><div class='add'>+	 * so the code below may return different results</div><div class='add'>+	 * when it is executed before and after enabling</div><div class='add'>+	 * the CPUID. Add "volatile" to not allow gcc to</div><div class='add'>+	 * optimize the subsequent calls to this function.</div><div class='add'>+	 */</div><div class='add'>+	asm volatile ("pushfl\n\t"</div><div class='add'>+		      "pushfl\n\t"</div><div class='add'>+		      "popl %0\n\t"</div><div class='add'>+		      "movl %0,%1\n\t"</div><div class='add'>+		      "xorl %2,%0\n\t"</div><div class='add'>+		      "pushl %0\n\t"</div><div class='add'>+		      "popfl\n\t"</div><div class='add'>+		      "pushfl\n\t"</div><div class='add'>+		      "popl %0\n\t"</div><div class='add'>+		      "popfl\n\t"</div><div class='add'>+		      : "=&amp;r" (f1), "=&amp;r" (f2)</div><div class='add'>+		      : "ir" (flag));</div><div class='add'>+</div><div class='add'>+	return ((f1^f2) &amp; flag) != 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Probe for the CPUID instruction */</div><div class='add'>+static int __cpuinit have_cpuid_p(void)</div><div class='add'>+{</div><div class='add'>+	return flag_is_changeable_p(X86_EFLAGS_ID);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __cpuinit squash_the_stupid_serial_number(struct cpuinfo_x86 *c)</div><div class='add'>+{</div><div class='add'>+	if (cpu_has(c, X86_FEATURE_PN) &amp;&amp; disable_x86_serial_nr) {</div><div class='add'>+		/* Disable processor serial number */</div><div class='add'>+		unsigned long lo, hi;</div><div class='add'>+		rdmsr(MSR_IA32_BBL_CR_CTL, lo, hi);</div><div class='add'>+		lo |= 0x200000;</div><div class='add'>+		wrmsr(MSR_IA32_BBL_CR_CTL, lo, hi);</div><div class='add'>+		printk(KERN_NOTICE "CPU serial number disabled.\n");</div><div class='add'>+		clear_cpu_cap(c, X86_FEATURE_PN);</div><div class='add'>+</div><div class='add'>+		/* Disabling the serial number may affect the cpuid level */</div><div class='add'>+		c-&gt;cpuid_level = cpuid_eax(0);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init x86_serial_nr_setup(char *s)</div><div class='add'>+{</div><div class='add'>+	disable_x86_serial_nr = 0;</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+__setup("serialnumber", x86_serial_nr_setup);</div><div class='add'>+#else</div><div class='add'>+static inline int flag_is_changeable_p(u32 flag)</div><div class='add'>+{</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+/* Probe for the CPUID instruction */</div><div class='add'>+static inline int have_cpuid_p(void)</div><div class='add'>+{</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+static inline void squash_the_stupid_serial_number(struct cpuinfo_x86 *c)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Naming convention should be: &lt;Name&gt; [(&lt;Codename&gt;)]</div><div class='add'>+ * This table only is used unless init_&lt;vendor&gt;() below doesn't set it;</div><div class='add'>+ * in particular, if CPUID levels 0x80000002..4 are supported, this isn't used</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* Look up CPU names by table lookup. */</div><div class='add'>+static char __cpuinit *table_lookup_model(struct cpuinfo_x86 *c)</div><div class='add'>+{</div><div class='add'>+	struct cpu_model_info *info;</div><div class='add'>+</div><div class='add'>+	if (c-&gt;x86_model &gt;= 16)</div><div class='add'>+		return NULL;	/* Range check */</div><div class='add'>+</div><div class='add'>+	if (!this_cpu)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	info = this_cpu-&gt;c_models;</div><div class='add'>+</div><div class='add'>+	while (info &amp;&amp; info-&gt;family) {</div><div class='add'>+		if (info-&gt;family == c-&gt;x86)</div><div class='add'>+			return info-&gt;model_names[c-&gt;x86_model];</div><div class='add'>+		info++;</div><div class='add'>+	}</div><div class='add'>+	return NULL;		/* Not found */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__u32 cleared_cpu_caps[NCAPINTS] __cpuinitdata;</div><div class='add'>+</div><div class='add'>+/* Current gdt points %fs at the "master" per-cpu area: after this,</div><div class='add'>+ * it's on the real one. */</div><div class='add'>+void switch_to_new_gdt(void)</div><div class='add'>+{</div><div class='add'>+	struct desc_ptr gdt_descr;</div><div class='add'>+</div><div class='add'>+	gdt_descr.address = (long)get_cpu_gdt_table(smp_processor_id());</div><div class='add'>+	gdt_descr.size = GDT_SIZE - 1;</div><div class='add'>+	load_gdt(&amp;gdt_descr);</div><div class='add'>+#ifdef CONFIG_X86_32</div><div class='add'>+	asm("mov %0, %%fs" : : "r" (__KERNEL_PERCPU) : "memory");</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct cpu_dev *cpu_devs[X86_VENDOR_NUM] = {};</div><div class='ctx'> </div><div class='ctx'> static void __cpuinit default_init(struct cpuinfo_x86 *c)</div><div class='ctx'> {</div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='add'>+	display_cacheinfo(c);</div><div class='add'>+#else</div><div class='ctx'> 	/* Not much we can do here... */</div><div class='ctx'> 	/* Check if at least it has cpuid */</div><div class='ctx'> 	if (c-&gt;cpuid_level == -1) {</div><div class='hunk'>@@ -76,28 +250,22 @@ static void __cpuinit default_init(struct cpuinfo_x86 *c)</div><div class='ctx'> 		else if (c-&gt;x86 == 3)</div><div class='ctx'> 			strcpy(c-&gt;x86_model_id, "386");</div><div class='ctx'> 	}</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct cpu_dev __cpuinitdata default_cpu = {</div><div class='ctx'> 	.c_init	= default_init,</div><div class='ctx'> 	.c_vendor = "Unknown",</div><div class='add'>+	.c_x86_vendor = X86_VENDOR_UNKNOWN,</div><div class='ctx'> };</div><div class='del'>-static struct cpu_dev *this_cpu __cpuinitdata = &amp;default_cpu;</div><div class='del'>-</div><div class='del'>-static int __init cachesize_setup(char *str)</div><div class='del'>-{</div><div class='del'>-	get_option(&amp;str, &amp;cachesize_override);</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-__setup("cachesize=", cachesize_setup);</div><div class='ctx'> </div><div class='del'>-int __cpuinit get_model_name(struct cpuinfo_x86 *c)</div><div class='add'>+static void __cpuinit get_model_name(struct cpuinfo_x86 *c)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int *v;</div><div class='ctx'> 	char *p, *q;</div><div class='ctx'> </div><div class='del'>-	if (cpuid_eax(0x80000000) &lt; 0x80000004)</div><div class='del'>-		return 0;</div><div class='add'>+	if (c-&gt;extended_cpuid_level &lt; 0x80000004)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	v = (unsigned int *) c-&gt;x86_model_id;</div><div class='ctx'> 	cpuid(0x80000002, &amp;v[0], &amp;v[1], &amp;v[2], &amp;v[3]);</div><div class='hunk'>@@ -116,30 +284,34 @@ int __cpuinit get_model_name(struct cpuinfo_x86 *c)</div><div class='ctx'> 	     while (q &lt;= &amp;c-&gt;x86_model_id[48])</div><div class='ctx'> 		  *q++ = '\0';	/* Zero-pad the rest */</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> void __cpuinit display_cacheinfo(struct cpuinfo_x86 *c)</div><div class='ctx'> {</div><div class='del'>-	unsigned int n, dummy, ecx, edx, l2size;</div><div class='add'>+	unsigned int n, dummy, ebx, ecx, edx, l2size;</div><div class='ctx'> </div><div class='del'>-	n = cpuid_eax(0x80000000);</div><div class='add'>+	n = c-&gt;extended_cpuid_level;</div><div class='ctx'> </div><div class='ctx'> 	if (n &gt;= 0x80000005) {</div><div class='del'>-		cpuid(0x80000005, &amp;dummy, &amp;dummy, &amp;ecx, &amp;edx);</div><div class='add'>+		cpuid(0x80000005, &amp;dummy, &amp;ebx, &amp;ecx, &amp;edx);</div><div class='ctx'> 		printk(KERN_INFO "CPU: L1 I Cache: %dK (%d bytes/line), D cache %dK (%d bytes/line)\n",</div><div class='del'>-			edx&gt;&gt;24, edx&amp;0xFF, ecx&gt;&gt;24, ecx&amp;0xFF);</div><div class='del'>-		c-&gt;x86_cache_size = (ecx&gt;&gt;24)+(edx&gt;&gt;24);</div><div class='add'>+				edx&gt;&gt;24, edx&amp;0xFF, ecx&gt;&gt;24, ecx&amp;0xFF);</div><div class='add'>+		c-&gt;x86_cache_size = (ecx&gt;&gt;24) + (edx&gt;&gt;24);</div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='add'>+		/* On K8 L1 TLB is inclusive, so don't count it */</div><div class='add'>+		c-&gt;x86_tlbsize = 0;</div><div class='add'>+#endif</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (n &lt; 0x80000006)	/* Some chips just has a large L1. */</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	ecx = cpuid_ecx(0x80000006);</div><div class='add'>+	cpuid(0x80000006, &amp;dummy, &amp;ebx, &amp;ecx, &amp;edx);</div><div class='ctx'> 	l2size = ecx &gt;&gt; 16;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='add'>+	c-&gt;x86_tlbsize += ((ebx &gt;&gt; 16) &amp; 0xfff) + (ebx &amp; 0xfff);</div><div class='add'>+#else</div><div class='ctx'> 	/* do processor-specific cache resizing */</div><div class='ctx'> 	if (this_cpu-&gt;c_size_cache)</div><div class='ctx'> 		l2size = this_cpu-&gt;c_size_cache(c, l2size);</div><div class='hunk'>@@ -150,116 +322,106 @@ void __cpuinit display_cacheinfo(struct cpuinfo_x86 *c)</div><div class='ctx'> </div><div class='ctx'> 	if (l2size == 0)</div><div class='ctx'> 		return;		/* Again, no L2 cache is possible */</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	c-&gt;x86_cache_size = l2size;</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_INFO "CPU: L2 Cache: %dK (%d bytes/line)\n",</div><div class='del'>-	       l2size, ecx &amp; 0xFF);</div><div class='add'>+			l2size, ecx &amp; 0xFF);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Naming convention should be: &lt;Name&gt; [(&lt;Codename&gt;)]</div><div class='del'>- * This table only is used unless init_&lt;vendor&gt;() below doesn't set it;</div><div class='del'>- * in particular, if CPUID levels 0x80000002..4 are supported, this isn't used</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* Look up CPU names by table lookup. */</div><div class='del'>-static char __cpuinit *table_lookup_model(struct cpuinfo_x86 *c)</div><div class='add'>+void __cpuinit detect_ht(struct cpuinfo_x86 *c)</div><div class='ctx'> {</div><div class='del'>-	struct cpu_model_info *info;</div><div class='add'>+#ifdef CONFIG_X86_HT</div><div class='add'>+	u32 eax, ebx, ecx, edx;</div><div class='add'>+	int index_msb, core_bits;</div><div class='ctx'> </div><div class='del'>-	if (c-&gt;x86_model &gt;= 16)</div><div class='del'>-		return NULL;	/* Range check */</div><div class='add'>+	if (!cpu_has(c, X86_FEATURE_HT))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	if (!this_cpu)</div><div class='del'>-		return NULL;</div><div class='add'>+	if (cpu_has(c, X86_FEATURE_CMP_LEGACY))</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='del'>-	info = this_cpu-&gt;c_models;</div><div class='add'>+	if (cpu_has(c, X86_FEATURE_XTOPOLOGY))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	while (info &amp;&amp; info-&gt;family) {</div><div class='del'>-		if (info-&gt;family == c-&gt;x86)</div><div class='del'>-			return info-&gt;model_names[c-&gt;x86_model];</div><div class='del'>-		info++;</div><div class='add'>+	cpuid(1, &amp;eax, &amp;ebx, &amp;ecx, &amp;edx);</div><div class='add'>+</div><div class='add'>+	smp_num_siblings = (ebx &amp; 0xff0000) &gt;&gt; 16;</div><div class='add'>+</div><div class='add'>+	if (smp_num_siblings == 1) {</div><div class='add'>+		printk(KERN_INFO  "CPU: Hyper-Threading is disabled\n");</div><div class='add'>+	} else if (smp_num_siblings &gt; 1) {</div><div class='add'>+</div><div class='add'>+		if (smp_num_siblings &gt; NR_CPUS) {</div><div class='add'>+			printk(KERN_WARNING "CPU: Unsupported number of siblings %d",</div><div class='add'>+					smp_num_siblings);</div><div class='add'>+			smp_num_siblings = 1;</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		index_msb = get_count_order(smp_num_siblings);</div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='add'>+		c-&gt;phys_proc_id = phys_pkg_id(index_msb);</div><div class='add'>+#else</div><div class='add'>+		c-&gt;phys_proc_id = phys_pkg_id(c-&gt;initial_apicid, index_msb);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+		smp_num_siblings = smp_num_siblings / c-&gt;x86_max_cores;</div><div class='add'>+</div><div class='add'>+		index_msb = get_count_order(smp_num_siblings);</div><div class='add'>+</div><div class='add'>+		core_bits = get_count_order(c-&gt;x86_max_cores);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='add'>+		c-&gt;cpu_core_id = phys_pkg_id(index_msb) &amp;</div><div class='add'>+					       ((1 &lt;&lt; core_bits) - 1);</div><div class='add'>+#else</div><div class='add'>+		c-&gt;cpu_core_id = phys_pkg_id(c-&gt;initial_apicid, index_msb) &amp;</div><div class='add'>+					       ((1 &lt;&lt; core_bits) - 1);</div><div class='add'>+#endif</div><div class='ctx'> 	}</div><div class='del'>-	return NULL;		/* Not found */</div><div class='del'>-}</div><div class='ctx'> </div><div class='add'>+out:</div><div class='add'>+	if ((c-&gt;x86_max_cores * smp_num_siblings) &gt; 1) {</div><div class='add'>+		printk(KERN_INFO  "CPU: Physical Processor ID: %d\n",</div><div class='add'>+		       c-&gt;phys_proc_id);</div><div class='add'>+		printk(KERN_INFO  "CPU: Processor Core ID: %d\n",</div><div class='add'>+		       c-&gt;cpu_core_id);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-static void __cpuinit get_cpu_vendor(struct cpuinfo_x86 *c, int early)</div><div class='add'>+static void __cpuinit get_cpu_vendor(struct cpuinfo_x86 *c)</div><div class='ctx'> {</div><div class='ctx'> 	char *v = c-&gt;x86_vendor_id;</div><div class='ctx'> 	int i;</div><div class='ctx'> 	static int printed;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; X86_VENDOR_NUM; i++) {</div><div class='del'>-		if (cpu_devs[i]) {</div><div class='del'>-			if (!strcmp(v, cpu_devs[i]-&gt;c_ident[0]) ||</div><div class='del'>-			    (cpu_devs[i]-&gt;c_ident[1] &amp;&amp;</div><div class='del'>-			     !strcmp(v, cpu_devs[i]-&gt;c_ident[1]))) {</div><div class='del'>-				c-&gt;x86_vendor = i;</div><div class='del'>-				if (!early)</div><div class='del'>-					this_cpu = cpu_devs[i];</div><div class='del'>-				return;</div><div class='del'>-			}</div><div class='add'>+		if (!cpu_devs[i])</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (!strcmp(v, cpu_devs[i]-&gt;c_ident[0]) ||</div><div class='add'>+		    (cpu_devs[i]-&gt;c_ident[1] &amp;&amp;</div><div class='add'>+		     !strcmp(v, cpu_devs[i]-&gt;c_ident[1]))) {</div><div class='add'>+			this_cpu = cpu_devs[i];</div><div class='add'>+			c-&gt;x86_vendor = this_cpu-&gt;c_x86_vendor;</div><div class='add'>+			return;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	if (!printed) {</div><div class='ctx'> 		printed++;</div><div class='del'>-		printk(KERN_ERR "CPU: Vendor unknown, using generic init.\n");</div><div class='add'>+		printk(KERN_ERR "CPU: vendor_id '%s' unknown, using generic init.\n", v);</div><div class='ctx'> 		printk(KERN_ERR "CPU: Your system may be unstable.\n");</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	c-&gt;x86_vendor = X86_VENDOR_UNKNOWN;</div><div class='ctx'> 	this_cpu = &amp;default_cpu;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static int __init x86_fxsr_setup(char *s)</div><div class='del'>-{</div><div class='del'>-	setup_clear_cpu_cap(X86_FEATURE_FXSR);</div><div class='del'>-	setup_clear_cpu_cap(X86_FEATURE_XMM);</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-__setup("nofxsr", x86_fxsr_setup);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int __init x86_sep_setup(char *s)</div><div class='del'>-{</div><div class='del'>-	setup_clear_cpu_cap(X86_FEATURE_SEP);</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-__setup("nosep", x86_sep_setup);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Standard macro to see if a specific flag is changeable */</div><div class='del'>-static inline int flag_is_changeable_p(u32 flag)</div><div class='del'>-{</div><div class='del'>-	u32 f1, f2;</div><div class='del'>-</div><div class='del'>-	asm("pushfl\n\t"</div><div class='del'>-	    "pushfl\n\t"</div><div class='del'>-	    "popl %0\n\t"</div><div class='del'>-	    "movl %0,%1\n\t"</div><div class='del'>-	    "xorl %2,%0\n\t"</div><div class='del'>-	    "pushl %0\n\t"</div><div class='del'>-	    "popfl\n\t"</div><div class='del'>-	    "pushfl\n\t"</div><div class='del'>-	    "popl %0\n\t"</div><div class='del'>-	    "popfl\n\t"</div><div class='del'>-	    : "=&amp;r" (f1), "=&amp;r" (f2)</div><div class='del'>-	    : "ir" (flag));</div><div class='del'>-</div><div class='del'>-	return ((f1^f2) &amp; flag) != 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Probe for the CPUID instruction */</div><div class='del'>-static int __cpuinit have_cpuid_p(void)</div><div class='del'>-{</div><div class='del'>-	return flag_is_changeable_p(X86_EFLAGS_ID);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __init cpu_detect(struct cpuinfo_x86 *c)</div><div class='add'>+void __cpuinit cpu_detect(struct cpuinfo_x86 *c)</div><div class='ctx'> {</div><div class='ctx'> 	/* Get vendor name */</div><div class='ctx'> 	cpuid(0x00000000, (unsigned int *)&amp;c-&gt;cpuid_level,</div><div class='hunk'>@@ -268,50 +430,87 @@ void __init cpu_detect(struct cpuinfo_x86 *c)</div><div class='ctx'> 	      (unsigned int *)&amp;c-&gt;x86_vendor_id[4]);</div><div class='ctx'> </div><div class='ctx'> 	c-&gt;x86 = 4;</div><div class='add'>+	/* Intel-defined flags: level 0x00000001 */</div><div class='ctx'> 	if (c-&gt;cpuid_level &gt;= 0x00000001) {</div><div class='ctx'> 		u32 junk, tfms, cap0, misc;</div><div class='ctx'> 		cpuid(0x00000001, &amp;tfms, &amp;misc, &amp;junk, &amp;cap0);</div><div class='del'>-		c-&gt;x86 = (tfms &gt;&gt; 8) &amp; 15;</div><div class='del'>-		c-&gt;x86_model = (tfms &gt;&gt; 4) &amp; 15;</div><div class='add'>+		c-&gt;x86 = (tfms &gt;&gt; 8) &amp; 0xf;</div><div class='add'>+		c-&gt;x86_model = (tfms &gt;&gt; 4) &amp; 0xf;</div><div class='add'>+		c-&gt;x86_mask = tfms &amp; 0xf;</div><div class='ctx'> 		if (c-&gt;x86 == 0xf)</div><div class='ctx'> 			c-&gt;x86 += (tfms &gt;&gt; 20) &amp; 0xff;</div><div class='ctx'> 		if (c-&gt;x86 &gt;= 0x6)</div><div class='del'>-			c-&gt;x86_model += ((tfms &gt;&gt; 16) &amp; 0xF) &lt;&lt; 4;</div><div class='del'>-		c-&gt;x86_mask = tfms &amp; 15;</div><div class='add'>+			c-&gt;x86_model += ((tfms &gt;&gt; 16) &amp; 0xf) &lt;&lt; 4;</div><div class='ctx'> 		if (cap0 &amp; (1&lt;&lt;19)) {</div><div class='del'>-			c-&gt;x86_cache_alignment = ((misc &gt;&gt; 8) &amp; 0xff) * 8;</div><div class='ctx'> 			c-&gt;x86_clflush_size = ((misc &gt;&gt; 8) &amp; 0xff) * 8;</div><div class='add'>+			c-&gt;x86_cache_alignment = c-&gt;x86_clflush_size;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='del'>-static void __cpuinit early_get_cap(struct cpuinfo_x86 *c)</div><div class='add'>+</div><div class='add'>+static void __cpuinit get_cpu_cap(struct cpuinfo_x86 *c)</div><div class='ctx'> {</div><div class='ctx'> 	u32 tfms, xlvl;</div><div class='del'>-	unsigned int ebx;</div><div class='add'>+	u32 ebx;</div><div class='ctx'> </div><div class='del'>-	memset(&amp;c-&gt;x86_capability, 0, sizeof c-&gt;x86_capability);</div><div class='del'>-	if (have_cpuid_p()) {</div><div class='del'>-		/* Intel-defined flags: level 0x00000001 */</div><div class='del'>-		if (c-&gt;cpuid_level &gt;= 0x00000001) {</div><div class='del'>-			u32 capability, excap;</div><div class='del'>-			cpuid(0x00000001, &amp;tfms, &amp;ebx, &amp;excap, &amp;capability);</div><div class='del'>-			c-&gt;x86_capability[0] = capability;</div><div class='del'>-			c-&gt;x86_capability[4] = excap;</div><div class='del'>-		}</div><div class='add'>+	/* Intel-defined flags: level 0x00000001 */</div><div class='add'>+	if (c-&gt;cpuid_level &gt;= 0x00000001) {</div><div class='add'>+		u32 capability, excap;</div><div class='add'>+		cpuid(0x00000001, &amp;tfms, &amp;ebx, &amp;excap, &amp;capability);</div><div class='add'>+		c-&gt;x86_capability[0] = capability;</div><div class='add'>+		c-&gt;x86_capability[4] = excap;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		/* AMD-defined flags: level 0x80000001 */</div><div class='del'>-		xlvl = cpuid_eax(0x80000000);</div><div class='del'>-		if ((xlvl &amp; 0xffff0000) == 0x80000000) {</div><div class='del'>-			if (xlvl &gt;= 0x80000001) {</div><div class='del'>-				c-&gt;x86_capability[1] = cpuid_edx(0x80000001);</div><div class='del'>-				c-&gt;x86_capability[6] = cpuid_ecx(0x80000001);</div><div class='del'>-			}</div><div class='add'>+	/* AMD-defined flags: level 0x80000001 */</div><div class='add'>+	xlvl = cpuid_eax(0x80000000);</div><div class='add'>+	c-&gt;extended_cpuid_level = xlvl;</div><div class='add'>+	if ((xlvl &amp; 0xffff0000) == 0x80000000) {</div><div class='add'>+		if (xlvl &gt;= 0x80000001) {</div><div class='add'>+			c-&gt;x86_capability[1] = cpuid_edx(0x80000001);</div><div class='add'>+			c-&gt;x86_capability[6] = cpuid_ecx(0x80000001);</div><div class='ctx'> 		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='add'>+	if (c-&gt;extended_cpuid_level &gt;= 0x80000008) {</div><div class='add'>+		u32 eax = cpuid_eax(0x80000008);</div><div class='ctx'> </div><div class='add'>+		c-&gt;x86_virt_bits = (eax &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+		c-&gt;x86_phys_bits = eax &amp; 0xff;</div><div class='ctx'> 	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	if (c-&gt;extended_cpuid_level &gt;= 0x80000007)</div><div class='add'>+		c-&gt;x86_power = cpuid_edx(0x80000007);</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void __cpuinit identify_cpu_without_cpuid(struct cpuinfo_x86 *c)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_X86_32</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * First of all, decide if this is a 486 or higher</div><div class='add'>+	 * It's a 486 if we can modify the AC flag</div><div class='add'>+	 */</div><div class='add'>+	if (flag_is_changeable_p(X86_EFLAGS_AC))</div><div class='add'>+		c-&gt;x86 = 4;</div><div class='add'>+	else</div><div class='add'>+		c-&gt;x86 = 3;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; X86_VENDOR_NUM; i++)</div><div class='add'>+		if (cpu_devs[i] &amp;&amp; cpu_devs[i]-&gt;c_identify) {</div><div class='add'>+			c-&gt;x86_vendor_id[0] = 0;</div><div class='add'>+			cpu_devs[i]-&gt;c_identify(c);</div><div class='add'>+			if (c-&gt;x86_vendor_id[0]) {</div><div class='add'>+				get_cpu_vendor(c);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Do minimum CPU detection early.</div><div class='ctx'>  * Fields really needed: vendor, cpuid_level, family, model, mask,</div><div class='hunk'>@@ -321,25 +520,61 @@ static void __cpuinit early_get_cap(struct cpuinfo_x86 *c)</div><div class='ctx'>  * WARNING: this function is only called on the BP.  Don't add code here</div><div class='ctx'>  * that is supposed to run on all CPUs.</div><div class='ctx'>  */</div><div class='del'>-static void __init early_cpu_detect(void)</div><div class='add'>+static void __init early_identify_cpu(struct cpuinfo_x86 *c)</div><div class='ctx'> {</div><div class='del'>-	struct cpuinfo_x86 *c = &amp;boot_cpu_data;</div><div class='del'>-</div><div class='del'>-	c-&gt;x86_cache_alignment = 32;</div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='add'>+	c-&gt;x86_clflush_size = 64;</div><div class='add'>+#else</div><div class='ctx'> 	c-&gt;x86_clflush_size = 32;</div><div class='add'>+#endif</div><div class='add'>+	c-&gt;x86_cache_alignment = c-&gt;x86_clflush_size;</div><div class='add'>+</div><div class='add'>+	memset(&amp;c-&gt;x86_capability, 0, sizeof c-&gt;x86_capability);</div><div class='add'>+	c-&gt;extended_cpuid_level = 0;</div><div class='add'>+</div><div class='add'>+	if (!have_cpuid_p())</div><div class='add'>+		identify_cpu_without_cpuid(c);</div><div class='ctx'> </div><div class='add'>+	/* cyrix could have cpuid enabled via c_identify()*/</div><div class='ctx'> 	if (!have_cpuid_p())</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	cpu_detect(c);</div><div class='ctx'> </div><div class='del'>-	get_cpu_vendor(c, 1);</div><div class='add'>+	get_cpu_vendor(c);</div><div class='add'>+</div><div class='add'>+	get_cpu_cap(c);</div><div class='ctx'> </div><div class='del'>-	early_get_cap(c);</div><div class='add'>+	if (this_cpu-&gt;c_early_init)</div><div class='add'>+		this_cpu-&gt;c_early_init(c);</div><div class='ctx'> </div><div class='del'>-	if (c-&gt;x86_vendor != X86_VENDOR_UNKNOWN &amp;&amp;</div><div class='del'>-	    cpu_devs[c-&gt;x86_vendor]-&gt;c_early_init)</div><div class='del'>-		cpu_devs[c-&gt;x86_vendor]-&gt;c_early_init(c);</div><div class='add'>+	validate_pat_support(c);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init early_cpu_init(void)</div><div class='add'>+{</div><div class='add'>+	struct cpu_dev **cdev;</div><div class='add'>+	int count = 0;</div><div class='add'>+</div><div class='add'>+	printk("KERNEL supported cpus:\n");</div><div class='add'>+	for (cdev = __x86_cpu_dev_start; cdev &lt; __x86_cpu_dev_end; cdev++) {</div><div class='add'>+		struct cpu_dev *cpudev = *cdev;</div><div class='add'>+		unsigned int j;</div><div class='add'>+</div><div class='add'>+		if (count &gt;= X86_VENDOR_NUM)</div><div class='add'>+			break;</div><div class='add'>+		cpu_devs[count] = cpudev;</div><div class='add'>+		count++;</div><div class='add'>+</div><div class='add'>+		for (j = 0; j &lt; 2; j++) {</div><div class='add'>+			if (!cpudev-&gt;c_ident[j])</div><div class='add'>+				continue;</div><div class='add'>+			printk("  %s %s\n", cpudev-&gt;c_vendor,</div><div class='add'>+				cpudev-&gt;c_ident[j]);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	early_identify_cpu(&amp;boot_cpu_data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -357,86 +592,41 @@ static void __cpuinit detect_nopl(struct cpuinfo_x86 *c)</div><div class='ctx'> </div><div class='ctx'> static void __cpuinit generic_identify(struct cpuinfo_x86 *c)</div><div class='ctx'> {</div><div class='del'>-	u32 tfms, xlvl;</div><div class='del'>-	unsigned int ebx;</div><div class='del'>-</div><div class='del'>-	if (have_cpuid_p()) {</div><div class='del'>-		/* Get vendor name */</div><div class='del'>-		cpuid(0x00000000, (unsigned int *)&amp;c-&gt;cpuid_level,</div><div class='del'>-		      (unsigned int *)&amp;c-&gt;x86_vendor_id[0],</div><div class='del'>-		      (unsigned int *)&amp;c-&gt;x86_vendor_id[8],</div><div class='del'>-		      (unsigned int *)&amp;c-&gt;x86_vendor_id[4]);</div><div class='del'>-</div><div class='del'>-		get_cpu_vendor(c, 0);</div><div class='del'>-		/* Initialize the standard set of capabilities */</div><div class='del'>-		/* Note that the vendor-specific code below might override */</div><div class='del'>-		/* Intel-defined flags: level 0x00000001 */</div><div class='del'>-		if (c-&gt;cpuid_level &gt;= 0x00000001) {</div><div class='del'>-			u32 capability, excap;</div><div class='del'>-			cpuid(0x00000001, &amp;tfms, &amp;ebx, &amp;excap, &amp;capability);</div><div class='del'>-			c-&gt;x86_capability[0] = capability;</div><div class='del'>-			c-&gt;x86_capability[4] = excap;</div><div class='del'>-			c-&gt;x86 = (tfms &gt;&gt; 8) &amp; 15;</div><div class='del'>-			c-&gt;x86_model = (tfms &gt;&gt; 4) &amp; 15;</div><div class='del'>-			if (c-&gt;x86 == 0xf)</div><div class='del'>-				c-&gt;x86 += (tfms &gt;&gt; 20) &amp; 0xff;</div><div class='del'>-			if (c-&gt;x86 &gt;= 0x6)</div><div class='del'>-				c-&gt;x86_model += ((tfms &gt;&gt; 16) &amp; 0xF) &lt;&lt; 4;</div><div class='del'>-			c-&gt;x86_mask = tfms &amp; 15;</div><div class='del'>-			c-&gt;initial_apicid = (ebx &gt;&gt; 24) &amp; 0xFF;</div><div class='del'>-#ifdef CONFIG_X86_HT</div><div class='del'>-			c-&gt;apicid = phys_pkg_id(c-&gt;initial_apicid, 0);</div><div class='del'>-			c-&gt;phys_proc_id = c-&gt;initial_apicid;</div><div class='del'>-#else</div><div class='del'>-			c-&gt;apicid = c-&gt;initial_apicid;</div><div class='del'>-#endif</div><div class='del'>-			if (test_cpu_cap(c, X86_FEATURE_CLFLSH))</div><div class='del'>-				c-&gt;x86_clflush_size = ((ebx &gt;&gt; 8) &amp; 0xff) * 8;</div><div class='del'>-		} else {</div><div class='del'>-			/* Have CPUID level 0 only - unheard of */</div><div class='del'>-			c-&gt;x86 = 4;</div><div class='del'>-		}</div><div class='add'>+	c-&gt;extended_cpuid_level = 0;</div><div class='ctx'> </div><div class='del'>-		/* AMD-defined flags: level 0x80000001 */</div><div class='del'>-		xlvl = cpuid_eax(0x80000000);</div><div class='del'>-		if ((xlvl &amp; 0xffff0000) == 0x80000000) {</div><div class='del'>-			if (xlvl &gt;= 0x80000001) {</div><div class='del'>-				c-&gt;x86_capability[1] = cpuid_edx(0x80000001);</div><div class='del'>-				c-&gt;x86_capability[6] = cpuid_ecx(0x80000001);</div><div class='del'>-			}</div><div class='del'>-			if (xlvl &gt;= 0x80000004)</div><div class='del'>-				get_model_name(c); /* Default name */</div><div class='del'>-		}</div><div class='add'>+	if (!have_cpuid_p())</div><div class='add'>+		identify_cpu_without_cpuid(c);</div><div class='ctx'> </div><div class='del'>-		init_scattered_cpuid_features(c);</div><div class='del'>-		detect_nopl(c);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='add'>+	/* cyrix could have cpuid enabled via c_identify()*/</div><div class='add'>+	if (!have_cpuid_p())</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-static void __cpuinit squash_the_stupid_serial_number(struct cpuinfo_x86 *c)</div><div class='del'>-{</div><div class='del'>-	if (cpu_has(c, X86_FEATURE_PN) &amp;&amp; disable_x86_serial_nr) {</div><div class='del'>-		/* Disable processor serial number */</div><div class='del'>-		unsigned long lo, hi;</div><div class='del'>-		rdmsr(MSR_IA32_BBL_CR_CTL, lo, hi);</div><div class='del'>-		lo |= 0x200000;</div><div class='del'>-		wrmsr(MSR_IA32_BBL_CR_CTL, lo, hi);</div><div class='del'>-		printk(KERN_NOTICE "CPU serial number disabled.\n");</div><div class='del'>-		clear_cpu_cap(c, X86_FEATURE_PN);</div><div class='add'>+	cpu_detect(c);</div><div class='ctx'> </div><div class='del'>-		/* Disabling the serial number may affect the cpuid level */</div><div class='del'>-		c-&gt;cpuid_level = cpuid_eax(0);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='add'>+	get_cpu_vendor(c);</div><div class='ctx'> </div><div class='del'>-static int __init x86_serial_nr_setup(char *s)</div><div class='del'>-{</div><div class='del'>-	disable_x86_serial_nr = 0;</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-__setup("serialnumber", x86_serial_nr_setup);</div><div class='add'>+	get_cpu_cap(c);</div><div class='add'>+</div><div class='add'>+	if (c-&gt;cpuid_level &gt;= 0x00000001) {</div><div class='add'>+		c-&gt;initial_apicid = (cpuid_ebx(1) &gt;&gt; 24) &amp; 0xFF;</div><div class='add'>+#ifdef CONFIG_X86_32</div><div class='add'>+# ifdef CONFIG_X86_HT</div><div class='add'>+		c-&gt;apicid = phys_pkg_id(c-&gt;initial_apicid, 0);</div><div class='add'>+# else</div><div class='add'>+		c-&gt;apicid = c-&gt;initial_apicid;</div><div class='add'>+# endif</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_X86_HT</div><div class='add'>+		c-&gt;phys_proc_id = c-&gt;initial_apicid;</div><div class='add'>+#endif</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	get_model_name(c); /* Default name */</div><div class='add'>+</div><div class='add'>+	init_scattered_cpuid_features(c);</div><div class='add'>+	detect_nopl(c);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * This does the hard work of actually picking apart the CPU stuff...</div><div class='hunk'>@@ -448,30 +638,29 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c)</div><div class='ctx'> 	c-&gt;loops_per_jiffy = loops_per_jiffy;</div><div class='ctx'> 	c-&gt;x86_cache_size = -1;</div><div class='ctx'> 	c-&gt;x86_vendor = X86_VENDOR_UNKNOWN;</div><div class='del'>-	c-&gt;cpuid_level = -1;	/* CPUID not detected */</div><div class='ctx'> 	c-&gt;x86_model = c-&gt;x86_mask = 0;	/* So far unknown... */</div><div class='ctx'> 	c-&gt;x86_vendor_id[0] = '\0'; /* Unset */</div><div class='ctx'> 	c-&gt;x86_model_id[0] = '\0';  /* Unset */</div><div class='ctx'> 	c-&gt;x86_max_cores = 1;</div><div class='add'>+	c-&gt;x86_coreid_bits = 0;</div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='add'>+	c-&gt;x86_clflush_size = 64;</div><div class='add'>+#else</div><div class='add'>+	c-&gt;cpuid_level = -1;	/* CPUID not detected */</div><div class='ctx'> 	c-&gt;x86_clflush_size = 32;</div><div class='add'>+#endif</div><div class='add'>+	c-&gt;x86_cache_alignment = c-&gt;x86_clflush_size;</div><div class='ctx'> 	memset(&amp;c-&gt;x86_capability, 0, sizeof c-&gt;x86_capability);</div><div class='ctx'> </div><div class='del'>-	if (!have_cpuid_p()) {</div><div class='del'>-		/*</div><div class='del'>-		 * First of all, decide if this is a 486 or higher</div><div class='del'>-		 * It's a 486 if we can modify the AC flag</div><div class='del'>-		 */</div><div class='del'>-		if (flag_is_changeable_p(X86_EFLAGS_AC))</div><div class='del'>-			c-&gt;x86 = 4;</div><div class='del'>-		else</div><div class='del'>-			c-&gt;x86 = 3;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	generic_identify(c);</div><div class='ctx'> </div><div class='ctx'> 	if (this_cpu-&gt;c_identify)</div><div class='ctx'> 		this_cpu-&gt;c_identify(c);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='add'>+	c-&gt;apicid = phys_pkg_id(0);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Vendor-specific initialization.  In this section we</div><div class='ctx'> 	 * canonicalize the feature flags, meaning if there are</div><div class='hunk'>@@ -505,6 +694,10 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c)</div><div class='ctx'> 				c-&gt;x86, c-&gt;x86_model);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='add'>+	detect_ht(c);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * On SMP, boot_cpu_data holds the common feature set between</div><div class='ctx'> 	 * all CPUs; so make sure that we indicate which features are</div><div class='hunk'>@@ -513,7 +706,7 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (c != &amp;boot_cpu_data) {</div><div class='ctx'> 		/* AND the already accumulated flags with these */</div><div class='del'>-		for (i = 0 ; i &lt; NCAPINTS ; i++)</div><div class='add'>+		for (i = 0; i &lt; NCAPINTS; i++)</div><div class='ctx'> 			boot_cpu_data.x86_capability[i] &amp;= c-&gt;x86_capability[i];</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -521,72 +714,91 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c)</div><div class='ctx'> 	for (i = 0; i &lt; NCAPINTS; i++)</div><div class='ctx'> 		c-&gt;x86_capability[i] &amp;= ~cleared_cpu_caps[i];</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_X86_MCE</div><div class='ctx'> 	/* Init Machine Check Exception if available. */</div><div class='ctx'> 	mcheck_init(c);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	select_idle_routine(c);</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_NUMA) &amp;&amp; defined(CONFIG_X86_64)</div><div class='add'>+	numa_add_cpu(smp_processor_id());</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='add'>+static void vgetcpu_set_mode(void)</div><div class='add'>+{</div><div class='add'>+	if (cpu_has(&amp;boot_cpu_data, X86_FEATURE_RDTSCP))</div><div class='add'>+		vgetcpu_mode = VGETCPU_RDTSCP;</div><div class='add'>+	else</div><div class='add'>+		vgetcpu_mode = VGETCPU_LSL;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> void __init identify_boot_cpu(void)</div><div class='ctx'> {</div><div class='ctx'> 	identify_cpu(&amp;boot_cpu_data);</div><div class='add'>+#ifdef CONFIG_X86_32</div><div class='ctx'> 	sysenter_setup();</div><div class='ctx'> 	enable_sep_cpu();</div><div class='add'>+#else</div><div class='add'>+	vgetcpu_set_mode();</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __cpuinit identify_secondary_cpu(struct cpuinfo_x86 *c)</div><div class='ctx'> {</div><div class='ctx'> 	BUG_ON(c == &amp;boot_cpu_data);</div><div class='ctx'> 	identify_cpu(c);</div><div class='add'>+#ifdef CONFIG_X86_32</div><div class='ctx'> 	enable_sep_cpu();</div><div class='add'>+#endif</div><div class='ctx'> 	mtrr_ap_init();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_X86_HT</div><div class='del'>-void __cpuinit detect_ht(struct cpuinfo_x86 *c)</div><div class='del'>-{</div><div class='del'>-	u32 	eax, ebx, ecx, edx;</div><div class='del'>-	int 	index_msb, core_bits;</div><div class='del'>-</div><div class='del'>-	cpuid(1, &amp;eax, &amp;ebx, &amp;ecx, &amp;edx);</div><div class='del'>-</div><div class='del'>-	if (!cpu_has(c, X86_FEATURE_HT) || cpu_has(c, X86_FEATURE_CMP_LEGACY))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	smp_num_siblings = (ebx &amp; 0xff0000) &gt;&gt; 16;</div><div class='add'>+struct msr_range {</div><div class='add'>+	unsigned min;</div><div class='add'>+	unsigned max;</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-	if (smp_num_siblings == 1) {</div><div class='del'>-		printk(KERN_INFO  "CPU: Hyper-Threading is disabled\n");</div><div class='del'>-	} else if (smp_num_siblings &gt; 1) {</div><div class='add'>+static struct msr_range msr_range_array[] __cpuinitdata = {</div><div class='add'>+	{ 0x00000000, 0x00000418},</div><div class='add'>+	{ 0xc0000000, 0xc000040b},</div><div class='add'>+	{ 0xc0010000, 0xc0010142},</div><div class='add'>+	{ 0xc0011000, 0xc001103b},</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-		if (smp_num_siblings &gt; NR_CPUS) {</div><div class='del'>-			printk(KERN_WARNING "CPU: Unsupported number of the "</div><div class='del'>-					"siblings %d", smp_num_siblings);</div><div class='del'>-			smp_num_siblings = 1;</div><div class='del'>-			return;</div><div class='add'>+static void __cpuinit print_cpu_msr(void)</div><div class='add'>+{</div><div class='add'>+	unsigned index;</div><div class='add'>+	u64 val;</div><div class='add'>+	int i;</div><div class='add'>+	unsigned index_min, index_max;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(msr_range_array); i++) {</div><div class='add'>+		index_min = msr_range_array[i].min;</div><div class='add'>+		index_max = msr_range_array[i].max;</div><div class='add'>+		for (index = index_min; index &lt; index_max; index++) {</div><div class='add'>+			if (rdmsrl_amd_safe(index, &amp;val))</div><div class='add'>+				continue;</div><div class='add'>+			printk(KERN_INFO " MSR%08x: %016llx\n", index, val);</div><div class='ctx'> 		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		index_msb = get_count_order(smp_num_siblings);</div><div class='del'>-		c-&gt;phys_proc_id = phys_pkg_id(c-&gt;initial_apicid, index_msb);</div><div class='del'>-</div><div class='del'>-		printk(KERN_INFO  "CPU: Physical Processor ID: %d\n",</div><div class='del'>-		       c-&gt;phys_proc_id);</div><div class='del'>-</div><div class='del'>-		smp_num_siblings = smp_num_siblings / c-&gt;x86_max_cores;</div><div class='del'>-</div><div class='del'>-		index_msb = get_count_order(smp_num_siblings) ;</div><div class='del'>-</div><div class='del'>-		core_bits = get_count_order(c-&gt;x86_max_cores);</div><div class='add'>+static int show_msr __cpuinitdata;</div><div class='add'>+static __init int setup_show_msr(char *arg)</div><div class='add'>+{</div><div class='add'>+	int num;</div><div class='ctx'> </div><div class='del'>-		c-&gt;cpu_core_id = phys_pkg_id(c-&gt;initial_apicid, index_msb) &amp;</div><div class='del'>-					       ((1 &lt;&lt; core_bits) - 1);</div><div class='add'>+	get_option(&amp;arg, &amp;num);</div><div class='ctx'> </div><div class='del'>-		if (c-&gt;x86_max_cores &gt; 1)</div><div class='del'>-			printk(KERN_INFO  "CPU: Processor Core ID: %d\n",</div><div class='del'>-			       c-&gt;cpu_core_id);</div><div class='del'>-	}</div><div class='add'>+	if (num &gt; 0)</div><div class='add'>+		show_msr = num;</div><div class='add'>+	return 1;</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='add'>+__setup("show_msr=", setup_show_msr);</div><div class='ctx'> </div><div class='ctx'> static __init int setup_noclflush(char *arg)</div><div class='ctx'> {</div><div class='hunk'>@@ -604,18 +816,26 @@ void __cpuinit print_cpu_info(struct cpuinfo_x86 *c)</div><div class='ctx'> 	else if (c-&gt;cpuid_level &gt;= 0)</div><div class='ctx'> 		vendor = c-&gt;x86_vendor_id;</div><div class='ctx'> </div><div class='del'>-	if (vendor &amp;&amp; strncmp(c-&gt;x86_model_id, vendor, strlen(vendor)))</div><div class='del'>-		printk("%s ", vendor);</div><div class='add'>+	if (vendor &amp;&amp; !strstr(c-&gt;x86_model_id, vendor))</div><div class='add'>+		printk(KERN_CONT "%s ", vendor);</div><div class='ctx'> </div><div class='del'>-	if (!c-&gt;x86_model_id[0])</div><div class='del'>-		printk("%d86", c-&gt;x86);</div><div class='add'>+	if (c-&gt;x86_model_id[0])</div><div class='add'>+		printk(KERN_CONT "%s", c-&gt;x86_model_id);</div><div class='ctx'> 	else</div><div class='del'>-		printk("%s", c-&gt;x86_model_id);</div><div class='add'>+		printk(KERN_CONT "%d86", c-&gt;x86);</div><div class='ctx'> </div><div class='ctx'> 	if (c-&gt;x86_mask || c-&gt;cpuid_level &gt;= 0)</div><div class='del'>-		printk(" stepping %02x\n", c-&gt;x86_mask);</div><div class='add'>+		printk(KERN_CONT " stepping %02x\n", c-&gt;x86_mask);</div><div class='ctx'> 	else</div><div class='del'>-		printk("\n");</div><div class='add'>+		printk(KERN_CONT "\n");</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SMP</div><div class='add'>+	if (c-&gt;cpu_index &lt; show_msr)</div><div class='add'>+		print_cpu_msr();</div><div class='add'>+#else</div><div class='add'>+	if (show_msr)</div><div class='add'>+		print_cpu_msr();</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static __init int setup_disablecpuid(char *arg)</div><div class='hunk'>@@ -631,19 +851,89 @@ __setup("clearcpuid=", setup_disablecpuid);</div><div class='ctx'> </div><div class='ctx'> cpumask_t cpu_initialized __cpuinitdata = CPU_MASK_NONE;</div><div class='ctx'> </div><div class='del'>-void __init early_cpu_init(void)</div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='add'>+struct x8664_pda **_cpu_pda __read_mostly;</div><div class='add'>+EXPORT_SYMBOL(_cpu_pda);</div><div class='add'>+</div><div class='add'>+struct desc_ptr idt_descr = { 256 * 16 - 1, (unsigned long) idt_table };</div><div class='add'>+</div><div class='add'>+char boot_cpu_stack[IRQSTACKSIZE] __page_aligned_bss;</div><div class='add'>+</div><div class='add'>+void __cpuinit pda_init(int cpu)</div><div class='ctx'> {</div><div class='del'>-	struct cpu_vendor_dev *cvdev;</div><div class='add'>+	struct x8664_pda *pda = cpu_pda(cpu);</div><div class='add'>+</div><div class='add'>+	/* Setup up data that may be needed in __get_free_pages early */</div><div class='add'>+	loadsegment(fs, 0);</div><div class='add'>+	loadsegment(gs, 0);</div><div class='add'>+	/* Memory clobbers used to order PDA accessed */</div><div class='add'>+	mb();</div><div class='add'>+	wrmsrl(MSR_GS_BASE, pda);</div><div class='add'>+	mb();</div><div class='add'>+</div><div class='add'>+	pda-&gt;cpunumber = cpu;</div><div class='add'>+	pda-&gt;irqcount = -1;</div><div class='add'>+	pda-&gt;kernelstack = (unsigned long)stack_thread_info() -</div><div class='add'>+				 PDA_STACKOFFSET + THREAD_SIZE;</div><div class='add'>+	pda-&gt;active_mm = &amp;init_mm;</div><div class='add'>+	pda-&gt;mmu_state = 0;</div><div class='add'>+</div><div class='add'>+	if (cpu == 0) {</div><div class='add'>+		/* others are initialized in smpboot.c */</div><div class='add'>+		pda-&gt;pcurrent = &amp;init_task;</div><div class='add'>+		pda-&gt;irqstackptr = boot_cpu_stack;</div><div class='add'>+		pda-&gt;irqstackptr += IRQSTACKSIZE - 64;</div><div class='add'>+	} else {</div><div class='add'>+		if (!pda-&gt;irqstackptr) {</div><div class='add'>+			pda-&gt;irqstackptr = (char *)</div><div class='add'>+				__get_free_pages(GFP_ATOMIC, IRQSTACK_ORDER);</div><div class='add'>+			if (!pda-&gt;irqstackptr)</div><div class='add'>+				panic("cannot allocate irqstack for cpu %d",</div><div class='add'>+				      cpu);</div><div class='add'>+			pda-&gt;irqstackptr += IRQSTACKSIZE - 64;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (pda-&gt;nodenumber == 0 &amp;&amp; cpu_to_node(cpu) != NUMA_NO_NODE)</div><div class='add'>+			pda-&gt;nodenumber = cpu_to_node(cpu);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+char boot_exception_stacks[(N_EXCEPTION_STACKS - 1) * EXCEPTION_STKSZ +</div><div class='add'>+			   DEBUG_STKSZ] __page_aligned_bss;</div><div class='ctx'> </div><div class='del'>-	for (cvdev = __x86cpuvendor_start ;</div><div class='del'>-	     cvdev &lt; __x86cpuvendor_end   ;</div><div class='del'>-	     cvdev++)</div><div class='del'>-		cpu_devs[cvdev-&gt;vendor] = cvdev-&gt;cpu_dev;</div><div class='add'>+extern asmlinkage void ignore_sysret(void);</div><div class='ctx'> </div><div class='del'>-	early_cpu_detect();</div><div class='del'>-	validate_pat_support(&amp;boot_cpu_data);</div><div class='add'>+/* May not be marked __init: used by software suspend */</div><div class='add'>+void syscall_init(void)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * LSTAR and STAR live in a bit strange symbiosis.</div><div class='add'>+	 * They both write to the same internal register. STAR allows to</div><div class='add'>+	 * set CS/DS but only a 32bit target. LSTAR sets the 64bit rip.</div><div class='add'>+	 */</div><div class='add'>+	wrmsrl(MSR_STAR,  ((u64)__USER32_CS)&lt;&lt;48  | ((u64)__KERNEL_CS)&lt;&lt;32);</div><div class='add'>+	wrmsrl(MSR_LSTAR, system_call);</div><div class='add'>+	wrmsrl(MSR_CSTAR, ignore_sysret);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_IA32_EMULATION</div><div class='add'>+	syscall32_cpu_init();</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* Flags to clear on syscall */</div><div class='add'>+	wrmsrl(MSR_SYSCALL_MASK,</div><div class='add'>+	       X86_EFLAGS_TF|X86_EFLAGS_DF|X86_EFLAGS_IF|X86_EFLAGS_IOPL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+unsigned long kernel_eflags;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Copies of the original ist values from the tss are only accessed during</div><div class='add'>+ * debugging, no special alignment required.</div><div class='add'>+ */</div><div class='add'>+DEFINE_PER_CPU(struct orig_ist, orig_ist);</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='ctx'> /* Make sure %fs is initialized properly in idle threads */</div><div class='ctx'> struct pt_regs * __cpuinit idle_regs(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='hunk'>@@ -651,25 +941,136 @@ struct pt_regs * __cpuinit idle_regs(struct pt_regs *regs)</div><div class='ctx'> 	regs-&gt;fs = __KERNEL_PERCPU;</div><div class='ctx'> 	return regs;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-/* Current gdt points %fs at the "master" per-cpu area: after this,</div><div class='del'>- * it's on the real one. */</div><div class='del'>-void switch_to_new_gdt(void)</div><div class='del'>-{</div><div class='del'>-	struct desc_ptr gdt_descr;</div><div class='del'>-</div><div class='del'>-	gdt_descr.address = (long)get_cpu_gdt_table(smp_processor_id());</div><div class='del'>-	gdt_descr.size = GDT_SIZE - 1;</div><div class='del'>-	load_gdt(&amp;gdt_descr);</div><div class='del'>-	asm("mov %0, %%fs" : : "r" (__KERNEL_PERCPU) : "memory");</div><div class='del'>-}</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * cpu_init() initializes state that is per-CPU. Some data is already</div><div class='ctx'>  * initialized (naturally) in the bootstrap process, such as the GDT</div><div class='ctx'>  * and IDT. We reload them nevertheless, this function acts as a</div><div class='ctx'>  * 'CPU state barrier', nothing should get across.</div><div class='add'>+ * A lot of state is already set up in PDA init for 64 bit</div><div class='ctx'>  */</div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='add'>+void __cpuinit cpu_init(void)</div><div class='add'>+{</div><div class='add'>+	int cpu = stack_smp_processor_id();</div><div class='add'>+	struct tss_struct *t = &amp;per_cpu(init_tss, cpu);</div><div class='add'>+	struct orig_ist *orig_ist = &amp;per_cpu(orig_ist, cpu);</div><div class='add'>+	unsigned long v;</div><div class='add'>+	char *estacks = NULL;</div><div class='add'>+	struct task_struct *me;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* CPU 0 is initialised in head64.c */</div><div class='add'>+	if (cpu != 0)</div><div class='add'>+		pda_init(cpu);</div><div class='add'>+	else</div><div class='add'>+		estacks = boot_exception_stacks;</div><div class='add'>+</div><div class='add'>+	me = current;</div><div class='add'>+</div><div class='add'>+	if (cpu_test_and_set(cpu, cpu_initialized))</div><div class='add'>+		panic("CPU#%d already initialized!\n", cpu);</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "Initializing CPU#%d\n", cpu);</div><div class='add'>+</div><div class='add'>+	clear_in_cr4(X86_CR4_VME|X86_CR4_PVI|X86_CR4_TSD|X86_CR4_DE);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Initialize the per-CPU GDT with the boot GDT,</div><div class='add'>+	 * and set up the GDT descriptor:</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	switch_to_new_gdt();</div><div class='add'>+	load_idt((const struct desc_ptr *)&amp;idt_descr);</div><div class='add'>+</div><div class='add'>+	memset(me-&gt;thread.tls_array, 0, GDT_ENTRY_TLS_ENTRIES * 8);</div><div class='add'>+	syscall_init();</div><div class='add'>+</div><div class='add'>+	wrmsrl(MSR_FS_BASE, 0);</div><div class='add'>+	wrmsrl(MSR_KERNEL_GS_BASE, 0);</div><div class='add'>+	barrier();</div><div class='add'>+</div><div class='add'>+	check_efer();</div><div class='add'>+	if (cpu != 0 &amp;&amp; x2apic)</div><div class='add'>+		enable_x2apic();</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * set up and load the per-CPU TSS</div><div class='add'>+	 */</div><div class='add'>+	if (!orig_ist-&gt;ist[0]) {</div><div class='add'>+		static const unsigned int order[N_EXCEPTION_STACKS] = {</div><div class='add'>+		  [0 ... N_EXCEPTION_STACKS - 1] = EXCEPTION_STACK_ORDER,</div><div class='add'>+		  [DEBUG_STACK - 1] = DEBUG_STACK_ORDER</div><div class='add'>+		};</div><div class='add'>+		for (v = 0; v &lt; N_EXCEPTION_STACKS; v++) {</div><div class='add'>+			if (cpu) {</div><div class='add'>+				estacks = (char *)__get_free_pages(GFP_ATOMIC, order[v]);</div><div class='add'>+				if (!estacks)</div><div class='add'>+					panic("Cannot allocate exception "</div><div class='add'>+					      "stack %ld %d\n", v, cpu);</div><div class='add'>+			}</div><div class='add'>+			estacks += PAGE_SIZE &lt;&lt; order[v];</div><div class='add'>+			orig_ist-&gt;ist[v] = t-&gt;x86_tss.ist[v] =</div><div class='add'>+					(unsigned long)estacks;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	t-&gt;x86_tss.io_bitmap_base = offsetof(struct tss_struct, io_bitmap);</div><div class='add'>+	/*</div><div class='add'>+	 * &lt;= is required because the CPU will access up to</div><div class='add'>+	 * 8 bits beyond the end of the IO permission bitmap.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt;= IO_BITMAP_LONGS; i++)</div><div class='add'>+		t-&gt;io_bitmap[i] = ~0UL;</div><div class='add'>+</div><div class='add'>+	atomic_inc(&amp;init_mm.mm_count);</div><div class='add'>+	me-&gt;active_mm = &amp;init_mm;</div><div class='add'>+	if (me-&gt;mm)</div><div class='add'>+		BUG();</div><div class='add'>+	enter_lazy_tlb(&amp;init_mm, me);</div><div class='add'>+</div><div class='add'>+	load_sp0(t, &amp;current-&gt;thread);</div><div class='add'>+	set_tss_desc(cpu, t);</div><div class='add'>+	load_TR_desc();</div><div class='add'>+	load_LDT(&amp;init_mm.context);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_KGDB</div><div class='add'>+	/*</div><div class='add'>+	 * If the kgdb is connected no debug regs should be altered.  This</div><div class='add'>+	 * is only applicable when KGDB and a KGDB I/O module are built</div><div class='add'>+	 * into the kernel and you are using early debugging with</div><div class='add'>+	 * kgdbwait. KGDB will control the kernel HW breakpoint registers.</div><div class='add'>+	 */</div><div class='add'>+	if (kgdb_connected &amp;&amp; arch_kgdb_ops.correct_hw_break)</div><div class='add'>+		arch_kgdb_ops.correct_hw_break();</div><div class='add'>+	else {</div><div class='add'>+#endif</div><div class='add'>+	/*</div><div class='add'>+	 * Clear all 6 debug registers:</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	set_debugreg(0UL, 0);</div><div class='add'>+	set_debugreg(0UL, 1);</div><div class='add'>+	set_debugreg(0UL, 2);</div><div class='add'>+	set_debugreg(0UL, 3);</div><div class='add'>+	set_debugreg(0UL, 6);</div><div class='add'>+	set_debugreg(0UL, 7);</div><div class='add'>+#ifdef CONFIG_KGDB</div><div class='add'>+	/* If the kgdb is connected no debug regs should be altered. */</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	fpu_init();</div><div class='add'>+</div><div class='add'>+	raw_local_save_flags(kernel_eflags);</div><div class='add'>+</div><div class='add'>+	if (is_uv_system())</div><div class='add'>+		uv_cpu_init();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='ctx'> void __cpuinit cpu_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int cpu = smp_processor_id();</div><div class='hunk'>@@ -723,19 +1124,21 @@ void __cpuinit cpu_init(void)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Force FPU initialization:</div><div class='ctx'> 	 */</div><div class='del'>-	current_thread_info()-&gt;status = 0;</div><div class='add'>+	if (cpu_has_xsave)</div><div class='add'>+		current_thread_info()-&gt;status = TS_XSAVE;</div><div class='add'>+	else</div><div class='add'>+		current_thread_info()-&gt;status = 0;</div><div class='ctx'> 	clear_used_math();</div><div class='ctx'> 	mxcsr_feature_mask_init();</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_HOTPLUG_CPU</div><div class='del'>-void __cpuinit cpu_uninit(void)</div><div class='del'>-{</div><div class='del'>-	int cpu = raw_smp_processor_id();</div><div class='del'>-	cpu_clear(cpu, cpu_initialized);</div><div class='add'>+	/*</div><div class='add'>+	 * Boot processor to setup the FP and extended state context info.</div><div class='add'>+	 */</div><div class='add'>+	if (!smp_processor_id())</div><div class='add'>+		init_thread_xstate();</div><div class='ctx'> </div><div class='del'>-	/* lazy TLB state */</div><div class='del'>-	per_cpu(cpu_tlbstate, cpu).state = 0;</div><div class='del'>-	per_cpu(cpu_tlbstate, cpu).active_mm = &amp;init_mm;</div><div class='add'>+	xsave_init();</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/x86/kernel/cpu/common_64.c b/arch/x86/kernel/cpu/common_64.c<br/>deleted file mode 100644<br/>index a11f5d4477cd..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/cpu/common_64.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/cpu/common_64.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,712 +0,0 @@</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/bootmem.h&gt;</div><div class='del'>-#include &lt;linux/bitops.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/kgdb.h&gt;</div><div class='del'>-#include &lt;linux/topology.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/smp.h&gt;</div><div class='del'>-#include &lt;linux/percpu.h&gt;</div><div class='del'>-#include &lt;asm/i387.h&gt;</div><div class='del'>-#include &lt;asm/msr.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/linkage.h&gt;</div><div class='del'>-#include &lt;asm/mmu_context.h&gt;</div><div class='del'>-#include &lt;asm/mtrr.h&gt;</div><div class='del'>-#include &lt;asm/mce.h&gt;</div><div class='del'>-#include &lt;asm/pat.h&gt;</div><div class='del'>-#include &lt;asm/asm.h&gt;</div><div class='del'>-#include &lt;asm/numa.h&gt;</div><div class='del'>-#ifdef CONFIG_X86_LOCAL_APIC</div><div class='del'>-#include &lt;asm/mpspec.h&gt;</div><div class='del'>-#include &lt;asm/apic.h&gt;</div><div class='del'>-#include &lt;mach_apic.h&gt;</div><div class='del'>-#endif</div><div class='del'>-#include &lt;asm/pda.h&gt;</div><div class='del'>-#include &lt;asm/pgtable.h&gt;</div><div class='del'>-#include &lt;asm/processor.h&gt;</div><div class='del'>-#include &lt;asm/desc.h&gt;</div><div class='del'>-#include &lt;asm/atomic.h&gt;</div><div class='del'>-#include &lt;asm/proto.h&gt;</div><div class='del'>-#include &lt;asm/sections.h&gt;</div><div class='del'>-#include &lt;asm/setup.h&gt;</div><div class='del'>-#include &lt;asm/genapic.h&gt;</div><div class='del'>-</div><div class='del'>-#include "cpu.h"</div><div class='del'>-</div><div class='del'>-/* We need valid kernel segments for data and code in long mode too</div><div class='del'>- * IRET will check the segment types  kkeil 2000/10/28</div><div class='del'>- * Also sysret mandates a special GDT layout</div><div class='del'>- */</div><div class='del'>-/* The TLS descriptors are currently at a different place compared to i386.</div><div class='del'>-   Hopefully nobody expects them at a fixed place (Wine?) */</div><div class='del'>-DEFINE_PER_CPU(struct gdt_page, gdt_page) = { .gdt = {</div><div class='del'>-	[GDT_ENTRY_KERNEL32_CS] = { { { 0x0000ffff, 0x00cf9b00 } } },</div><div class='del'>-	[GDT_ENTRY_KERNEL_CS] = { { { 0x0000ffff, 0x00af9b00 } } },</div><div class='del'>-	[GDT_ENTRY_KERNEL_DS] = { { { 0x0000ffff, 0x00cf9300 } } },</div><div class='del'>-	[GDT_ENTRY_DEFAULT_USER32_CS] = { { { 0x0000ffff, 0x00cffb00 } } },</div><div class='del'>-	[GDT_ENTRY_DEFAULT_USER_DS] = { { { 0x0000ffff, 0x00cff300 } } },</div><div class='del'>-	[GDT_ENTRY_DEFAULT_USER_CS] = { { { 0x0000ffff, 0x00affb00 } } },</div><div class='del'>-} };</div><div class='del'>-EXPORT_PER_CPU_SYMBOL_GPL(gdt_page);</div><div class='del'>-</div><div class='del'>-__u32 cleared_cpu_caps[NCAPINTS] __cpuinitdata;</div><div class='del'>-</div><div class='del'>-/* Current gdt points %fs at the "master" per-cpu area: after this,</div><div class='del'>- * it's on the real one. */</div><div class='del'>-void switch_to_new_gdt(void)</div><div class='del'>-{</div><div class='del'>-	struct desc_ptr gdt_descr;</div><div class='del'>-</div><div class='del'>-	gdt_descr.address = (long)get_cpu_gdt_table(smp_processor_id());</div><div class='del'>-	gdt_descr.size = GDT_SIZE - 1;</div><div class='del'>-	load_gdt(&amp;gdt_descr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct cpu_dev *cpu_devs[X86_VENDOR_NUM] = {};</div><div class='del'>-</div><div class='del'>-static void __cpuinit default_init(struct cpuinfo_x86 *c)</div><div class='del'>-{</div><div class='del'>-	display_cacheinfo(c);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct cpu_dev __cpuinitdata default_cpu = {</div><div class='del'>-	.c_init	= default_init,</div><div class='del'>-	.c_vendor = "Unknown",</div><div class='del'>-};</div><div class='del'>-static struct cpu_dev *this_cpu __cpuinitdata = &amp;default_cpu;</div><div class='del'>-</div><div class='del'>-int __cpuinit get_model_name(struct cpuinfo_x86 *c)</div><div class='del'>-{</div><div class='del'>-	unsigned int *v;</div><div class='del'>-</div><div class='del'>-	if (c-&gt;extended_cpuid_level &lt; 0x80000004)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	v = (unsigned int *) c-&gt;x86_model_id;</div><div class='del'>-	cpuid(0x80000002, &amp;v[0], &amp;v[1], &amp;v[2], &amp;v[3]);</div><div class='del'>-	cpuid(0x80000003, &amp;v[4], &amp;v[5], &amp;v[6], &amp;v[7]);</div><div class='del'>-	cpuid(0x80000004, &amp;v[8], &amp;v[9], &amp;v[10], &amp;v[11]);</div><div class='del'>-	c-&gt;x86_model_id[48] = 0;</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void __cpuinit display_cacheinfo(struct cpuinfo_x86 *c)</div><div class='del'>-{</div><div class='del'>-	unsigned int n, dummy, ebx, ecx, edx;</div><div class='del'>-</div><div class='del'>-	n = c-&gt;extended_cpuid_level;</div><div class='del'>-</div><div class='del'>-	if (n &gt;= 0x80000005) {</div><div class='del'>-		cpuid(0x80000005, &amp;dummy, &amp;ebx, &amp;ecx, &amp;edx);</div><div class='del'>-		printk(KERN_INFO "CPU: L1 I Cache: %dK (%d bytes/line), "</div><div class='del'>-		       "D cache %dK (%d bytes/line)\n",</div><div class='del'>-		       edx&gt;&gt;24, edx&amp;0xFF, ecx&gt;&gt;24, ecx&amp;0xFF);</div><div class='del'>-		c-&gt;x86_cache_size = (ecx&gt;&gt;24) + (edx&gt;&gt;24);</div><div class='del'>-		/* On K8 L1 TLB is inclusive, so don't count it */</div><div class='del'>-		c-&gt;x86_tlbsize = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (n &gt;= 0x80000006) {</div><div class='del'>-		cpuid(0x80000006, &amp;dummy, &amp;ebx, &amp;ecx, &amp;edx);</div><div class='del'>-		ecx = cpuid_ecx(0x80000006);</div><div class='del'>-		c-&gt;x86_cache_size = ecx &gt;&gt; 16;</div><div class='del'>-		c-&gt;x86_tlbsize += ((ebx &gt;&gt; 16) &amp; 0xfff) + (ebx &amp; 0xfff);</div><div class='del'>-</div><div class='del'>-		printk(KERN_INFO "CPU: L2 Cache: %dK (%d bytes/line)\n",</div><div class='del'>-		c-&gt;x86_cache_size, ecx &amp; 0xFF);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __cpuinit detect_ht(struct cpuinfo_x86 *c)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_SMP</div><div class='del'>-	u32 eax, ebx, ecx, edx;</div><div class='del'>-	int index_msb, core_bits;</div><div class='del'>-</div><div class='del'>-	cpuid(1, &amp;eax, &amp;ebx, &amp;ecx, &amp;edx);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	if (!cpu_has(c, X86_FEATURE_HT))</div><div class='del'>-		return;</div><div class='del'>-	if (cpu_has(c, X86_FEATURE_CMP_LEGACY))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	smp_num_siblings = (ebx &amp; 0xff0000) &gt;&gt; 16;</div><div class='del'>-</div><div class='del'>-	if (smp_num_siblings == 1) {</div><div class='del'>-		printk(KERN_INFO  "CPU: Hyper-Threading is disabled\n");</div><div class='del'>-	} else if (smp_num_siblings &gt; 1) {</div><div class='del'>-</div><div class='del'>-		if (smp_num_siblings &gt; NR_CPUS) {</div><div class='del'>-			printk(KERN_WARNING "CPU: Unsupported number of "</div><div class='del'>-			       "siblings %d", smp_num_siblings);</div><div class='del'>-			smp_num_siblings = 1;</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		index_msb = get_count_order(smp_num_siblings);</div><div class='del'>-		c-&gt;phys_proc_id = phys_pkg_id(index_msb);</div><div class='del'>-</div><div class='del'>-		smp_num_siblings = smp_num_siblings / c-&gt;x86_max_cores;</div><div class='del'>-</div><div class='del'>-		index_msb = get_count_order(smp_num_siblings);</div><div class='del'>-</div><div class='del'>-		core_bits = get_count_order(c-&gt;x86_max_cores);</div><div class='del'>-</div><div class='del'>-		c-&gt;cpu_core_id = phys_pkg_id(index_msb) &amp;</div><div class='del'>-					       ((1 &lt;&lt; core_bits) - 1);</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	if ((c-&gt;x86_max_cores * smp_num_siblings) &gt; 1) {</div><div class='del'>-		printk(KERN_INFO  "CPU: Physical Processor ID: %d\n",</div><div class='del'>-		       c-&gt;phys_proc_id);</div><div class='del'>-		printk(KERN_INFO  "CPU: Processor Core ID: %d\n",</div><div class='del'>-		       c-&gt;cpu_core_id);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __cpuinit get_cpu_vendor(struct cpuinfo_x86 *c)</div><div class='del'>-{</div><div class='del'>-	char *v = c-&gt;x86_vendor_id;</div><div class='del'>-	int i;</div><div class='del'>-	static int printed;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; X86_VENDOR_NUM; i++) {</div><div class='del'>-		if (cpu_devs[i]) {</div><div class='del'>-			if (!strcmp(v, cpu_devs[i]-&gt;c_ident[0]) ||</div><div class='del'>-			    (cpu_devs[i]-&gt;c_ident[1] &amp;&amp;</div><div class='del'>-			    !strcmp(v, cpu_devs[i]-&gt;c_ident[1]))) {</div><div class='del'>-				c-&gt;x86_vendor = i;</div><div class='del'>-				this_cpu = cpu_devs[i];</div><div class='del'>-				return;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (!printed) {</div><div class='del'>-		printed++;</div><div class='del'>-		printk(KERN_ERR "CPU: Vendor unknown, using generic init.\n");</div><div class='del'>-		printk(KERN_ERR "CPU: Your system may be unstable.\n");</div><div class='del'>-	}</div><div class='del'>-	c-&gt;x86_vendor = X86_VENDOR_UNKNOWN;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __init early_cpu_support_print(void)</div><div class='del'>-{</div><div class='del'>-	int i,j;</div><div class='del'>-	struct cpu_dev *cpu_devx;</div><div class='del'>-</div><div class='del'>-	printk("KERNEL supported cpus:\n");</div><div class='del'>-	for (i = 0; i &lt; X86_VENDOR_NUM; i++) {</div><div class='del'>-		cpu_devx = cpu_devs[i];</div><div class='del'>-		if (!cpu_devx)</div><div class='del'>-			continue;</div><div class='del'>-		for (j = 0; j &lt; 2; j++) {</div><div class='del'>-			if (!cpu_devx-&gt;c_ident[j])</div><div class='del'>-				continue;</div><div class='del'>-			printk("  %s %s\n", cpu_devx-&gt;c_vendor,</div><div class='del'>-				cpu_devx-&gt;c_ident[j]);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The NOPL instruction is supposed to exist on all CPUs with</div><div class='del'>- * family &gt;= 6, unfortunately, that's not true in practice because</div><div class='del'>- * of early VIA chips and (more importantly) broken virtualizers that</div><div class='del'>- * are not easy to detect.  Hence, probe for it based on first</div><div class='del'>- * principles.</div><div class='del'>- *</div><div class='del'>- * Note: no 64-bit chip is known to lack these, but put the code here</div><div class='del'>- * for consistency with 32 bits, and to make it utterly trivial to</div><div class='del'>- * diagnose the problem should it ever surface.</div><div class='del'>- */</div><div class='del'>-static void __cpuinit detect_nopl(struct cpuinfo_x86 *c)</div><div class='del'>-{</div><div class='del'>-	const u32 nopl_signature = 0x888c53b1; /* Random number */</div><div class='del'>-	u32 has_nopl = nopl_signature;</div><div class='del'>-</div><div class='del'>-	clear_cpu_cap(c, X86_FEATURE_NOPL);</div><div class='del'>-	if (c-&gt;x86 &gt;= 6) {</div><div class='del'>-		asm volatile("\n"</div><div class='del'>-			     "1:      .byte 0x0f,0x1f,0xc0\n" /* nopl %eax */</div><div class='del'>-			     "2:\n"</div><div class='del'>-			     "        .section .fixup,\"ax\"\n"</div><div class='del'>-			     "3:      xor %0,%0\n"</div><div class='del'>-			     "        jmp 2b\n"</div><div class='del'>-			     "        .previous\n"</div><div class='del'>-			     _ASM_EXTABLE(1b,3b)</div><div class='del'>-			     : "+a" (has_nopl));</div><div class='del'>-</div><div class='del'>-		if (has_nopl == nopl_signature)</div><div class='del'>-			set_cpu_cap(c, X86_FEATURE_NOPL);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __cpuinit early_identify_cpu(struct cpuinfo_x86 *c);</div><div class='del'>-</div><div class='del'>-void __init early_cpu_init(void)</div><div class='del'>-{</div><div class='del'>-        struct cpu_vendor_dev *cvdev;</div><div class='del'>-</div><div class='del'>-        for (cvdev = __x86cpuvendor_start ;</div><div class='del'>-             cvdev &lt; __x86cpuvendor_end   ;</div><div class='del'>-             cvdev++)</div><div class='del'>-                cpu_devs[cvdev-&gt;vendor] = cvdev-&gt;cpu_dev;</div><div class='del'>-	early_cpu_support_print();</div><div class='del'>-	early_identify_cpu(&amp;boot_cpu_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Do some early cpuid on the boot CPU to get some parameter that are</div><div class='del'>-   needed before check_bugs. Everything advanced is in identify_cpu</div><div class='del'>-   below. */</div><div class='del'>-static void __cpuinit early_identify_cpu(struct cpuinfo_x86 *c)</div><div class='del'>-{</div><div class='del'>-	u32 tfms, xlvl;</div><div class='del'>-</div><div class='del'>-	c-&gt;loops_per_jiffy = loops_per_jiffy;</div><div class='del'>-	c-&gt;x86_cache_size = -1;</div><div class='del'>-	c-&gt;x86_vendor = X86_VENDOR_UNKNOWN;</div><div class='del'>-	c-&gt;x86_model = c-&gt;x86_mask = 0;	/* So far unknown... */</div><div class='del'>-	c-&gt;x86_vendor_id[0] = '\0'; /* Unset */</div><div class='del'>-	c-&gt;x86_model_id[0] = '\0';  /* Unset */</div><div class='del'>-	c-&gt;x86_clflush_size = 64;</div><div class='del'>-	c-&gt;x86_cache_alignment = c-&gt;x86_clflush_size;</div><div class='del'>-	c-&gt;x86_max_cores = 1;</div><div class='del'>-	c-&gt;x86_coreid_bits = 0;</div><div class='del'>-	c-&gt;extended_cpuid_level = 0;</div><div class='del'>-	memset(&amp;c-&gt;x86_capability, 0, sizeof c-&gt;x86_capability);</div><div class='del'>-</div><div class='del'>-	/* Get vendor name */</div><div class='del'>-	cpuid(0x00000000, (unsigned int *)&amp;c-&gt;cpuid_level,</div><div class='del'>-	      (unsigned int *)&amp;c-&gt;x86_vendor_id[0],</div><div class='del'>-	      (unsigned int *)&amp;c-&gt;x86_vendor_id[8],</div><div class='del'>-	      (unsigned int *)&amp;c-&gt;x86_vendor_id[4]);</div><div class='del'>-</div><div class='del'>-	get_cpu_vendor(c);</div><div class='del'>-</div><div class='del'>-	/* Initialize the standard set of capabilities */</div><div class='del'>-	/* Note that the vendor-specific code below might override */</div><div class='del'>-</div><div class='del'>-	/* Intel-defined flags: level 0x00000001 */</div><div class='del'>-	if (c-&gt;cpuid_level &gt;= 0x00000001) {</div><div class='del'>-		__u32 misc;</div><div class='del'>-		cpuid(0x00000001, &amp;tfms, &amp;misc, &amp;c-&gt;x86_capability[4],</div><div class='del'>-		      &amp;c-&gt;x86_capability[0]);</div><div class='del'>-		c-&gt;x86 = (tfms &gt;&gt; 8) &amp; 0xf;</div><div class='del'>-		c-&gt;x86_model = (tfms &gt;&gt; 4) &amp; 0xf;</div><div class='del'>-		c-&gt;x86_mask = tfms &amp; 0xf;</div><div class='del'>-		if (c-&gt;x86 == 0xf)</div><div class='del'>-			c-&gt;x86 += (tfms &gt;&gt; 20) &amp; 0xff;</div><div class='del'>-		if (c-&gt;x86 &gt;= 0x6)</div><div class='del'>-			c-&gt;x86_model += ((tfms &gt;&gt; 16) &amp; 0xF) &lt;&lt; 4;</div><div class='del'>-		if (test_cpu_cap(c, X86_FEATURE_CLFLSH))</div><div class='del'>-			c-&gt;x86_clflush_size = ((misc &gt;&gt; 8) &amp; 0xff) * 8;</div><div class='del'>-	} else {</div><div class='del'>-		/* Have CPUID level 0 only - unheard of */</div><div class='del'>-		c-&gt;x86 = 4;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	c-&gt;initial_apicid = (cpuid_ebx(1) &gt;&gt; 24) &amp; 0xff;</div><div class='del'>-#ifdef CONFIG_SMP</div><div class='del'>-	c-&gt;phys_proc_id = c-&gt;initial_apicid;</div><div class='del'>-#endif</div><div class='del'>-	/* AMD-defined flags: level 0x80000001 */</div><div class='del'>-	xlvl = cpuid_eax(0x80000000);</div><div class='del'>-	c-&gt;extended_cpuid_level = xlvl;</div><div class='del'>-	if ((xlvl &amp; 0xffff0000) == 0x80000000) {</div><div class='del'>-		if (xlvl &gt;= 0x80000001) {</div><div class='del'>-			c-&gt;x86_capability[1] = cpuid_edx(0x80000001);</div><div class='del'>-			c-&gt;x86_capability[6] = cpuid_ecx(0x80000001);</div><div class='del'>-		}</div><div class='del'>-		if (xlvl &gt;= 0x80000004)</div><div class='del'>-			get_model_name(c); /* Default name */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Transmeta-defined flags: level 0x80860001 */</div><div class='del'>-	xlvl = cpuid_eax(0x80860000);</div><div class='del'>-	if ((xlvl &amp; 0xffff0000) == 0x80860000) {</div><div class='del'>-		/* Don't set x86_cpuid_level here for now to not confuse. */</div><div class='del'>-		if (xlvl &gt;= 0x80860001)</div><div class='del'>-			c-&gt;x86_capability[2] = cpuid_edx(0x80860001);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (c-&gt;extended_cpuid_level &gt;= 0x80000007)</div><div class='del'>-		c-&gt;x86_power = cpuid_edx(0x80000007);</div><div class='del'>-</div><div class='del'>-	if (c-&gt;extended_cpuid_level &gt;= 0x80000008) {</div><div class='del'>-		u32 eax = cpuid_eax(0x80000008);</div><div class='del'>-</div><div class='del'>-		c-&gt;x86_virt_bits = (eax &gt;&gt; 8) &amp; 0xff;</div><div class='del'>-		c-&gt;x86_phys_bits = eax &amp; 0xff;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	detect_nopl(c);</div><div class='del'>-</div><div class='del'>-	if (c-&gt;x86_vendor != X86_VENDOR_UNKNOWN &amp;&amp;</div><div class='del'>-	    cpu_devs[c-&gt;x86_vendor]-&gt;c_early_init)</div><div class='del'>-		cpu_devs[c-&gt;x86_vendor]-&gt;c_early_init(c);</div><div class='del'>-</div><div class='del'>-	validate_pat_support(c);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This does the hard work of actually picking apart the CPU stuff...</div><div class='del'>- */</div><div class='del'>-static void __cpuinit identify_cpu(struct cpuinfo_x86 *c)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	early_identify_cpu(c);</div><div class='del'>-</div><div class='del'>-	init_scattered_cpuid_features(c);</div><div class='del'>-</div><div class='del'>-	c-&gt;apicid = phys_pkg_id(0);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Vendor-specific initialization.  In this section we</div><div class='del'>-	 * canonicalize the feature flags, meaning if there are</div><div class='del'>-	 * features a certain CPU supports which CPUID doesn't</div><div class='del'>-	 * tell us, CPUID claiming incorrect flags, or other bugs,</div><div class='del'>-	 * we handle them here.</div><div class='del'>-	 *</div><div class='del'>-	 * At the end of this section, c-&gt;x86_capability better</div><div class='del'>-	 * indicate the features this CPU genuinely supports!</div><div class='del'>-	 */</div><div class='del'>-	if (this_cpu-&gt;c_init)</div><div class='del'>-		this_cpu-&gt;c_init(c);</div><div class='del'>-</div><div class='del'>-	detect_ht(c);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * On SMP, boot_cpu_data holds the common feature set between</div><div class='del'>-	 * all CPUs; so make sure that we indicate which features are</div><div class='del'>-	 * common between the CPUs.  The first time this routine gets</div><div class='del'>-	 * executed, c == &amp;boot_cpu_data.</div><div class='del'>-	 */</div><div class='del'>-	if (c != &amp;boot_cpu_data) {</div><div class='del'>-		/* AND the already accumulated flags with these */</div><div class='del'>-		for (i = 0; i &lt; NCAPINTS; i++)</div><div class='del'>-			boot_cpu_data.x86_capability[i] &amp;= c-&gt;x86_capability[i];</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Clear all flags overriden by options */</div><div class='del'>-	for (i = 0; i &lt; NCAPINTS; i++)</div><div class='del'>-		c-&gt;x86_capability[i] &amp;= ~cleared_cpu_caps[i];</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_X86_MCE</div><div class='del'>-	mcheck_init(c);</div><div class='del'>-#endif</div><div class='del'>-	select_idle_routine(c);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_NUMA</div><div class='del'>-	numa_add_cpu(smp_processor_id());</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __cpuinit identify_boot_cpu(void)</div><div class='del'>-{</div><div class='del'>-	identify_cpu(&amp;boot_cpu_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __cpuinit identify_secondary_cpu(struct cpuinfo_x86 *c)</div><div class='del'>-{</div><div class='del'>-	BUG_ON(c == &amp;boot_cpu_data);</div><div class='del'>-	identify_cpu(c);</div><div class='del'>-	mtrr_ap_init();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static __init int setup_noclflush(char *arg)</div><div class='del'>-{</div><div class='del'>-	setup_clear_cpu_cap(X86_FEATURE_CLFLSH);</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-__setup("noclflush", setup_noclflush);</div><div class='del'>-</div><div class='del'>-void __cpuinit print_cpu_info(struct cpuinfo_x86 *c)</div><div class='del'>-{</div><div class='del'>-	if (c-&gt;x86_model_id[0])</div><div class='del'>-		printk(KERN_CONT "%s", c-&gt;x86_model_id);</div><div class='del'>-</div><div class='del'>-	if (c-&gt;x86_mask || c-&gt;cpuid_level &gt;= 0)</div><div class='del'>-		printk(KERN_CONT " stepping %02x\n", c-&gt;x86_mask);</div><div class='del'>-	else</div><div class='del'>-		printk(KERN_CONT "\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static __init int setup_disablecpuid(char *arg)</div><div class='del'>-{</div><div class='del'>-	int bit;</div><div class='del'>-	if (get_option(&amp;arg, &amp;bit) &amp;&amp; bit &lt; NCAPINTS*32)</div><div class='del'>-		setup_clear_cpu_cap(bit);</div><div class='del'>-	else</div><div class='del'>-		return 0;</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-__setup("clearcpuid=", setup_disablecpuid);</div><div class='del'>-</div><div class='del'>-cpumask_t cpu_initialized __cpuinitdata = CPU_MASK_NONE;</div><div class='del'>-</div><div class='del'>-struct x8664_pda **_cpu_pda __read_mostly;</div><div class='del'>-EXPORT_SYMBOL(_cpu_pda);</div><div class='del'>-</div><div class='del'>-struct desc_ptr idt_descr = { 256 * 16 - 1, (unsigned long) idt_table };</div><div class='del'>-</div><div class='del'>-char boot_cpu_stack[IRQSTACKSIZE] __page_aligned_bss;</div><div class='del'>-</div><div class='del'>-unsigned long __supported_pte_mask __read_mostly = ~0UL;</div><div class='del'>-EXPORT_SYMBOL_GPL(__supported_pte_mask);</div><div class='del'>-</div><div class='del'>-static int do_not_nx __cpuinitdata;</div><div class='del'>-</div><div class='del'>-/* noexec=on|off</div><div class='del'>-Control non executable mappings for 64bit processes.</div><div class='del'>-</div><div class='del'>-on	Enable(default)</div><div class='del'>-off	Disable</div><div class='del'>-*/</div><div class='del'>-static int __init nonx_setup(char *str)</div><div class='del'>-{</div><div class='del'>-	if (!str)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	if (!strncmp(str, "on", 2)) {</div><div class='del'>-		__supported_pte_mask |= _PAGE_NX;</div><div class='del'>-		do_not_nx = 0;</div><div class='del'>-	} else if (!strncmp(str, "off", 3)) {</div><div class='del'>-		do_not_nx = 1;</div><div class='del'>-		__supported_pte_mask &amp;= ~_PAGE_NX;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-early_param("noexec", nonx_setup);</div><div class='del'>-</div><div class='del'>-int force_personality32;</div><div class='del'>-</div><div class='del'>-/* noexec32=on|off</div><div class='del'>-Control non executable heap for 32bit processes.</div><div class='del'>-To control the stack too use noexec=off</div><div class='del'>-</div><div class='del'>-on	PROT_READ does not imply PROT_EXEC for 32bit processes (default)</div><div class='del'>-off	PROT_READ implies PROT_EXEC</div><div class='del'>-*/</div><div class='del'>-static int __init nonx32_setup(char *str)</div><div class='del'>-{</div><div class='del'>-	if (!strcmp(str, "on"))</div><div class='del'>-		force_personality32 &amp;= ~READ_IMPLIES_EXEC;</div><div class='del'>-	else if (!strcmp(str, "off"))</div><div class='del'>-		force_personality32 |= READ_IMPLIES_EXEC;</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-__setup("noexec32=", nonx32_setup);</div><div class='del'>-</div><div class='del'>-void pda_init(int cpu)</div><div class='del'>-{</div><div class='del'>-	struct x8664_pda *pda = cpu_pda(cpu);</div><div class='del'>-</div><div class='del'>-	/* Setup up data that may be needed in __get_free_pages early */</div><div class='del'>-	loadsegment(fs, 0);</div><div class='del'>-	loadsegment(gs, 0);</div><div class='del'>-	/* Memory clobbers used to order PDA accessed */</div><div class='del'>-	mb();</div><div class='del'>-	wrmsrl(MSR_GS_BASE, pda);</div><div class='del'>-	mb();</div><div class='del'>-</div><div class='del'>-	pda-&gt;cpunumber = cpu;</div><div class='del'>-	pda-&gt;irqcount = -1;</div><div class='del'>-	pda-&gt;kernelstack = (unsigned long)stack_thread_info() -</div><div class='del'>-				 PDA_STACKOFFSET + THREAD_SIZE;</div><div class='del'>-	pda-&gt;active_mm = &amp;init_mm;</div><div class='del'>-	pda-&gt;mmu_state = 0;</div><div class='del'>-</div><div class='del'>-	if (cpu == 0) {</div><div class='del'>-		/* others are initialized in smpboot.c */</div><div class='del'>-		pda-&gt;pcurrent = &amp;init_task;</div><div class='del'>-		pda-&gt;irqstackptr = boot_cpu_stack;</div><div class='del'>-		pda-&gt;irqstackptr += IRQSTACKSIZE - 64;</div><div class='del'>-	} else {</div><div class='del'>-		if (!pda-&gt;irqstackptr) {</div><div class='del'>-			pda-&gt;irqstackptr = (char *)</div><div class='del'>-				__get_free_pages(GFP_ATOMIC, IRQSTACK_ORDER);</div><div class='del'>-			if (!pda-&gt;irqstackptr)</div><div class='del'>-				panic("cannot allocate irqstack for cpu %d",</div><div class='del'>-				      cpu);</div><div class='del'>-			pda-&gt;irqstackptr += IRQSTACKSIZE - 64;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (pda-&gt;nodenumber == 0 &amp;&amp; cpu_to_node(cpu) != NUMA_NO_NODE)</div><div class='del'>-			pda-&gt;nodenumber = cpu_to_node(cpu);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char boot_exception_stacks[(N_EXCEPTION_STACKS - 1) * EXCEPTION_STKSZ +</div><div class='del'>-			   DEBUG_STKSZ] __page_aligned_bss;</div><div class='del'>-</div><div class='del'>-extern asmlinkage void ignore_sysret(void);</div><div class='del'>-</div><div class='del'>-/* May not be marked __init: used by software suspend */</div><div class='del'>-void syscall_init(void)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * LSTAR and STAR live in a bit strange symbiosis.</div><div class='del'>-	 * They both write to the same internal register. STAR allows to</div><div class='del'>-	 * set CS/DS but only a 32bit target. LSTAR sets the 64bit rip.</div><div class='del'>-	 */</div><div class='del'>-	wrmsrl(MSR_STAR,  ((u64)__USER32_CS)&lt;&lt;48  | ((u64)__KERNEL_CS)&lt;&lt;32);</div><div class='del'>-	wrmsrl(MSR_LSTAR, system_call);</div><div class='del'>-	wrmsrl(MSR_CSTAR, ignore_sysret);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_IA32_EMULATION</div><div class='del'>-	syscall32_cpu_init();</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* Flags to clear on syscall */</div><div class='del'>-	wrmsrl(MSR_SYSCALL_MASK,</div><div class='del'>-	       X86_EFLAGS_TF|X86_EFLAGS_DF|X86_EFLAGS_IF|X86_EFLAGS_IOPL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __cpuinit check_efer(void)</div><div class='del'>-{</div><div class='del'>-	unsigned long efer;</div><div class='del'>-</div><div class='del'>-	rdmsrl(MSR_EFER, efer);</div><div class='del'>-	if (!(efer &amp; EFER_NX) || do_not_nx)</div><div class='del'>-		__supported_pte_mask &amp;= ~_PAGE_NX;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-unsigned long kernel_eflags;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Copies of the original ist values from the tss are only accessed during</div><div class='del'>- * debugging, no special alignment required.</div><div class='del'>- */</div><div class='del'>-DEFINE_PER_CPU(struct orig_ist, orig_ist);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * cpu_init() initializes state that is per-CPU. Some data is already</div><div class='del'>- * initialized (naturally) in the bootstrap process, such as the GDT</div><div class='del'>- * and IDT. We reload them nevertheless, this function acts as a</div><div class='del'>- * 'CPU state barrier', nothing should get across.</div><div class='del'>- * A lot of state is already set up in PDA init.</div><div class='del'>- */</div><div class='del'>-void __cpuinit cpu_init(void)</div><div class='del'>-{</div><div class='del'>-	int cpu = stack_smp_processor_id();</div><div class='del'>-	struct tss_struct *t = &amp;per_cpu(init_tss, cpu);</div><div class='del'>-	struct orig_ist *orig_ist = &amp;per_cpu(orig_ist, cpu);</div><div class='del'>-	unsigned long v;</div><div class='del'>-	char *estacks = NULL;</div><div class='del'>-	struct task_struct *me;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* CPU 0 is initialised in head64.c */</div><div class='del'>-	if (cpu != 0)</div><div class='del'>-		pda_init(cpu);</div><div class='del'>-	else</div><div class='del'>-		estacks = boot_exception_stacks;</div><div class='del'>-</div><div class='del'>-	me = current;</div><div class='del'>-</div><div class='del'>-	if (cpu_test_and_set(cpu, cpu_initialized))</div><div class='del'>-		panic("CPU#%d already initialized!\n", cpu);</div><div class='del'>-</div><div class='del'>-	printk(KERN_INFO "Initializing CPU#%d\n", cpu);</div><div class='del'>-</div><div class='del'>-	clear_in_cr4(X86_CR4_VME|X86_CR4_PVI|X86_CR4_TSD|X86_CR4_DE);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Initialize the per-CPU GDT with the boot GDT,</div><div class='del'>-	 * and set up the GDT descriptor:</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	switch_to_new_gdt();</div><div class='del'>-	load_idt((const struct desc_ptr *)&amp;idt_descr);</div><div class='del'>-</div><div class='del'>-	memset(me-&gt;thread.tls_array, 0, GDT_ENTRY_TLS_ENTRIES * 8);</div><div class='del'>-	syscall_init();</div><div class='del'>-</div><div class='del'>-	wrmsrl(MSR_FS_BASE, 0);</div><div class='del'>-	wrmsrl(MSR_KERNEL_GS_BASE, 0);</div><div class='del'>-	barrier();</div><div class='del'>-</div><div class='del'>-	check_efer();</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * set up and load the per-CPU TSS</div><div class='del'>-	 */</div><div class='del'>-	if (!orig_ist-&gt;ist[0]) {</div><div class='del'>-		static const unsigned int order[N_EXCEPTION_STACKS] = {</div><div class='del'>-		  [0 ... N_EXCEPTION_STACKS - 1] = EXCEPTION_STACK_ORDER,</div><div class='del'>-		  [DEBUG_STACK - 1] = DEBUG_STACK_ORDER</div><div class='del'>-		};</div><div class='del'>-		for (v = 0; v &lt; N_EXCEPTION_STACKS; v++) {</div><div class='del'>-			if (cpu) {</div><div class='del'>-				estacks = (char *)__get_free_pages(GFP_ATOMIC, order[v]);</div><div class='del'>-				if (!estacks)</div><div class='del'>-					panic("Cannot allocate exception "</div><div class='del'>-					      "stack %ld %d\n", v, cpu);</div><div class='del'>-			}</div><div class='del'>-			estacks += PAGE_SIZE &lt;&lt; order[v];</div><div class='del'>-			orig_ist-&gt;ist[v] = t-&gt;x86_tss.ist[v] =</div><div class='del'>-					(unsigned long)estacks;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	t-&gt;x86_tss.io_bitmap_base = offsetof(struct tss_struct, io_bitmap);</div><div class='del'>-	/*</div><div class='del'>-	 * &lt;= is required because the CPU will access up to</div><div class='del'>-	 * 8 bits beyond the end of the IO permission bitmap.</div><div class='del'>-	 */</div><div class='del'>-	for (i = 0; i &lt;= IO_BITMAP_LONGS; i++)</div><div class='del'>-		t-&gt;io_bitmap[i] = ~0UL;</div><div class='del'>-</div><div class='del'>-	atomic_inc(&amp;init_mm.mm_count);</div><div class='del'>-	me-&gt;active_mm = &amp;init_mm;</div><div class='del'>-	if (me-&gt;mm)</div><div class='del'>-		BUG();</div><div class='del'>-	enter_lazy_tlb(&amp;init_mm, me);</div><div class='del'>-</div><div class='del'>-	load_sp0(t, &amp;current-&gt;thread);</div><div class='del'>-	set_tss_desc(cpu, t);</div><div class='del'>-	load_TR_desc();</div><div class='del'>-	load_LDT(&amp;init_mm.context);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_KGDB</div><div class='del'>-	/*</div><div class='del'>-	 * If the kgdb is connected no debug regs should be altered.  This</div><div class='del'>-	 * is only applicable when KGDB and a KGDB I/O module are built</div><div class='del'>-	 * into the kernel and you are using early debugging with</div><div class='del'>-	 * kgdbwait. KGDB will control the kernel HW breakpoint registers.</div><div class='del'>-	 */</div><div class='del'>-	if (kgdb_connected &amp;&amp; arch_kgdb_ops.correct_hw_break)</div><div class='del'>-		arch_kgdb_ops.correct_hw_break();</div><div class='del'>-	else {</div><div class='del'>-#endif</div><div class='del'>-	/*</div><div class='del'>-	 * Clear all 6 debug registers:</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	set_debugreg(0UL, 0);</div><div class='del'>-	set_debugreg(0UL, 1);</div><div class='del'>-	set_debugreg(0UL, 2);</div><div class='del'>-	set_debugreg(0UL, 3);</div><div class='del'>-	set_debugreg(0UL, 6);</div><div class='del'>-	set_debugreg(0UL, 7);</div><div class='del'>-#ifdef CONFIG_KGDB</div><div class='del'>-	/* If the kgdb is connected no debug regs should be altered. */</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	fpu_init();</div><div class='del'>-</div><div class='del'>-	raw_local_save_flags(kernel_eflags);</div><div class='del'>-</div><div class='del'>-	if (is_uv_system())</div><div class='del'>-		uv_cpu_init();</div><div class='del'>-}</div><div class='head'>diff --git a/arch/x86/kernel/cpu/cpu.h b/arch/x86/kernel/cpu/cpu.h<br/>index 4d894e8565fe..de4094a39210 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/cpu/cpu.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/cpu/cpu.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/cpu/cpu.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/cpu/cpu.h</a></div><div class='hunk'>@@ -21,23 +21,16 @@ struct cpu_dev {</div><div class='ctx'> 	void		(*c_init)(struct cpuinfo_x86 * c);</div><div class='ctx'> 	void		(*c_identify)(struct cpuinfo_x86 * c);</div><div class='ctx'> 	unsigned int	(*c_size_cache)(struct cpuinfo_x86 * c, unsigned int size);</div><div class='add'>+	int	c_x86_vendor;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-extern struct cpu_dev * cpu_devs [X86_VENDOR_NUM];</div><div class='add'>+#define cpu_dev_register(cpu_devX) \</div><div class='add'>+	static struct cpu_dev *__cpu_dev_##cpu_devX __used \</div><div class='add'>+	__attribute__((__section__(".x86_cpu_dev.init"))) = \</div><div class='add'>+	&amp;cpu_devX;</div><div class='ctx'> </div><div class='del'>-struct cpu_vendor_dev {</div><div class='del'>-	int vendor;</div><div class='del'>-	struct cpu_dev *cpu_dev;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define cpu_vendor_dev_register(cpu_vendor_id, cpu_dev) \</div><div class='del'>-	static struct cpu_vendor_dev __cpu_vendor_dev_##cpu_vendor_id __used \</div><div class='del'>-	__attribute__((__section__(".x86cpuvendor.init"))) = \</div><div class='del'>-	{ cpu_vendor_id, cpu_dev }</div><div class='del'>-</div><div class='del'>-extern struct cpu_vendor_dev __x86cpuvendor_start[], __x86cpuvendor_end[];</div><div class='add'>+extern struct cpu_dev *__x86_cpu_dev_start[], *__x86_cpu_dev_end[];</div><div class='ctx'> </div><div class='del'>-extern int get_model_name(struct cpuinfo_x86 *c);</div><div class='ctx'> extern void display_cacheinfo(struct cpuinfo_x86 *c);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c b/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c<br/>index dd097b835839..c24c4a487b7c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c</a></div><div class='hunk'>@@ -256,7 +256,8 @@ static u32 get_cur_val(const cpumask_t *mask)</div><div class='ctx'>  * Only IA32_APERF/IA32_MPERF ratio is architecturally defined and</div><div class='ctx'>  * no meaning should be associated with absolute values of these MSRs.</div><div class='ctx'>  */</div><div class='del'>-static unsigned int get_measured_perf(unsigned int cpu)</div><div class='add'>+static unsigned int get_measured_perf(struct cpufreq_policy *policy,</div><div class='add'>+				      unsigned int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	union {</div><div class='ctx'> 		struct {</div><div class='hunk'>@@ -326,7 +327,7 @@ static unsigned int get_measured_perf(unsigned int cpu)</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	retval = per_cpu(drv_data, cpu)-&gt;max_freq * perf_percent / 100;</div><div class='add'>+	retval = per_cpu(drv_data, policy-&gt;cpu)-&gt;max_freq * perf_percent / 100;</div><div class='ctx'> </div><div class='ctx'> 	put_cpu();</div><div class='ctx'> 	set_cpus_allowed_ptr(current, &amp;saved_mask);</div><div class='hunk'>@@ -785,7 +786,11 @@ static int __init acpi_cpufreq_init(void)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	return cpufreq_register_driver(&amp;acpi_cpufreq_driver);</div><div class='add'>+	ret = cpufreq_register_driver(&amp;acpi_cpufreq_driver);</div><div class='add'>+	if (ret)</div><div class='add'>+		free_percpu(acpi_perf_data);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit acpi_cpufreq_exit(void)</div><div class='hunk'>@@ -795,8 +800,6 @@ static void __exit acpi_cpufreq_exit(void)</div><div class='ctx'> 	cpufreq_unregister_driver(&amp;acpi_cpufreq_driver);</div><div class='ctx'> </div><div class='ctx'> 	free_percpu(acpi_perf_data);</div><div class='del'>-</div><div class='del'>-	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_param(acpi_pstate_strict, uint, 0644);</div><div class='head'>diff --git a/arch/x86/kernel/cpu/cpufreq/elanfreq.c b/arch/x86/kernel/cpu/cpufreq/elanfreq.c<br/>index e4a4bf870e94..fe613c93b366 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/cpu/cpufreq/elanfreq.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/cpu/cpufreq/elanfreq.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/cpu/cpufreq/elanfreq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/cpu/cpufreq/elanfreq.c</a></div><div class='hunk'>@@ -25,8 +25,8 @@</div><div class='ctx'> #include &lt;linux/cpufreq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/msr.h&gt;</div><div class='del'>-#include &lt;asm/timex.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/timex.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define REG_CSCIR 0x22		/* Chip Setup and Control Index Register    */</div><div class='ctx'> #define REG_CSCDR 0x23		/* Chip Setup and Control Data  Register    */</div><div class='hunk'>@@ -82,7 +82,7 @@ static unsigned int elanfreq_get_cpu_frequency(unsigned int cpu)</div><div class='ctx'> 	u8 clockspeed_reg;    /* Clock Speed Register */</div><div class='ctx'> </div><div class='ctx'> 	local_irq_disable();</div><div class='del'>-	outb_p(0x80,REG_CSCIR);</div><div class='add'>+	outb_p(0x80, REG_CSCIR);</div><div class='ctx'> 	clockspeed_reg = inb_p(REG_CSCDR);</div><div class='ctx'> 	local_irq_enable();</div><div class='ctx'> </div><div class='hunk'>@@ -98,10 +98,10 @@ static unsigned int elanfreq_get_cpu_frequency(unsigned int cpu)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* 33 MHz is not 32 MHz... */</div><div class='del'>-	if ((clockspeed_reg &amp; 0xE0)==0xA0)</div><div class='add'>+	if ((clockspeed_reg &amp; 0xE0) == 0xA0)</div><div class='ctx'> 		return 33000;</div><div class='ctx'> </div><div class='del'>-	return ((1&lt;&lt;((clockspeed_reg &amp; 0xE0) &gt;&gt; 5)) * 1000);</div><div class='add'>+	return (1&lt;&lt;((clockspeed_reg &amp; 0xE0) &gt;&gt; 5)) * 1000;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -117,7 +117,7 @@ static unsigned int elanfreq_get_cpu_frequency(unsigned int cpu)</div><div class='ctx'>  *	There is no return value.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static void elanfreq_set_cpu_state (unsigned int state)</div><div class='add'>+static void elanfreq_set_cpu_state(unsigned int state)</div><div class='ctx'> {</div><div class='ctx'> 	struct cpufreq_freqs    freqs;</div><div class='ctx'> </div><div class='hunk'>@@ -144,20 +144,20 @@ static void elanfreq_set_cpu_state (unsigned int state)</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	local_irq_disable();</div><div class='del'>-	outb_p(0x40,REG_CSCIR);		/* Disable hyperspeed mode */</div><div class='del'>-	outb_p(0x00,REG_CSCDR);</div><div class='add'>+	outb_p(0x40, REG_CSCIR);		/* Disable hyperspeed mode */</div><div class='add'>+	outb_p(0x00, REG_CSCDR);</div><div class='ctx'> 	local_irq_enable();		/* wait till internal pipelines and */</div><div class='ctx'> 	udelay(1000);			/* buffers have cleaned up          */</div><div class='ctx'> </div><div class='ctx'> 	local_irq_disable();</div><div class='ctx'> </div><div class='ctx'> 	/* now, set the CPU clock speed register (0x80) */</div><div class='del'>-	outb_p(0x80,REG_CSCIR);</div><div class='del'>-	outb_p(elan_multiplier[state].val80h,REG_CSCDR);</div><div class='add'>+	outb_p(0x80, REG_CSCIR);</div><div class='add'>+	outb_p(elan_multiplier[state].val80h, REG_CSCDR);</div><div class='ctx'> </div><div class='ctx'> 	/* now, the hyperspeed bit in PMU Force Mode Register (0x40) */</div><div class='del'>-	outb_p(0x40,REG_CSCIR);</div><div class='del'>-	outb_p(elan_multiplier[state].val40h,REG_CSCDR);</div><div class='add'>+	outb_p(0x40, REG_CSCIR);</div><div class='add'>+	outb_p(elan_multiplier[state].val40h, REG_CSCDR);</div><div class='ctx'> 	udelay(10000);</div><div class='ctx'> 	local_irq_enable();</div><div class='ctx'> </div><div class='hunk'>@@ -173,12 +173,12 @@ static void elanfreq_set_cpu_state (unsigned int state)</div><div class='ctx'>  *	for the hardware supported by the driver.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static int elanfreq_verify (struct cpufreq_policy *policy)</div><div class='add'>+static int elanfreq_verify(struct cpufreq_policy *policy)</div><div class='ctx'> {</div><div class='ctx'> 	return cpufreq_frequency_table_verify(policy, &amp;elanfreq_table[0]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int elanfreq_target (struct cpufreq_policy *policy,</div><div class='add'>+static int elanfreq_target(struct cpufreq_policy *policy,</div><div class='ctx'> 			    unsigned int target_freq,</div><div class='ctx'> 			    unsigned int relation)</div><div class='ctx'> {</div><div class='hunk'>@@ -205,7 +205,7 @@ static int elanfreq_cpu_init(struct cpufreq_policy *policy)</div><div class='ctx'> </div><div class='ctx'> 	/* capability check */</div><div class='ctx'> 	if ((c-&gt;x86_vendor != X86_VENDOR_AMD) ||</div><div class='del'>-	    (c-&gt;x86 != 4) || (c-&gt;x86_model!=10))</div><div class='add'>+	    (c-&gt;x86 != 4) || (c-&gt;x86_model != 10))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	/* max freq */</div><div class='hunk'>@@ -213,7 +213,7 @@ static int elanfreq_cpu_init(struct cpufreq_policy *policy)</div><div class='ctx'> 		max_freq = elanfreq_get_cpu_frequency(0);</div><div class='ctx'> </div><div class='ctx'> 	/* table init */</div><div class='del'>-	for (i=0; (elanfreq_table[i].frequency != CPUFREQ_TABLE_END); i++) {</div><div class='add'>+	for (i = 0; (elanfreq_table[i].frequency != CPUFREQ_TABLE_END); i++) {</div><div class='ctx'> 		if (elanfreq_table[i].frequency &gt; max_freq)</div><div class='ctx'> 			elanfreq_table[i].frequency = CPUFREQ_ENTRY_INVALID;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -224,7 +224,7 @@ static int elanfreq_cpu_init(struct cpufreq_policy *policy)</div><div class='ctx'> </div><div class='ctx'> 	result = cpufreq_frequency_table_cpuinfo(policy, elanfreq_table);</div><div class='ctx'> 	if (result)</div><div class='del'>-		return (result);</div><div class='add'>+		return result;</div><div class='ctx'> </div><div class='ctx'> 	cpufreq_frequency_table_get_attr(elanfreq_table, policy-&gt;cpu);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -260,7 +260,7 @@ __setup("elanfreq=", elanfreq_setup);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static struct freq_attr* elanfreq_attr[] = {</div><div class='add'>+static struct freq_attr *elanfreq_attr[] = {</div><div class='ctx'> 	&amp;cpufreq_freq_attr_scaling_available_freqs,</div><div class='ctx'> 	NULL,</div><div class='ctx'> };</div><div class='hunk'>@@ -284,9 +284,9 @@ static int __init elanfreq_init(void)</div><div class='ctx'> </div><div class='ctx'> 	/* Test if we have the right hardware */</div><div class='ctx'> 	if ((c-&gt;x86_vendor != X86_VENDOR_AMD) ||</div><div class='del'>-		(c-&gt;x86 != 4) || (c-&gt;x86_model!=10)) {</div><div class='add'>+		(c-&gt;x86 != 4) || (c-&gt;x86_model != 10)) {</div><div class='ctx'> 		printk(KERN_INFO "elanfreq: error: no Elan processor found!\n");</div><div class='del'>-                return -ENODEV;</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> 	return cpufreq_register_driver(&amp;elanfreq_driver);</div><div class='ctx'> }</div><div class='hunk'>@@ -298,7 +298,7 @@ static void __exit elanfreq_exit(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-module_param (max_freq, int, 0444);</div><div class='add'>+module_param(max_freq, int, 0444);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("Robert Schwebel &lt;r.schwebel@pengutronix.de&gt;, Sven Geggus &lt;sven@geggus.net&gt;");</div><div class='head'>diff --git a/arch/x86/kernel/cpu/cpufreq/powernow-k6.c b/arch/x86/kernel/cpu/cpufreq/powernow-k6.c<br/>index eb9b62b0830c..b5ced806a316 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/cpu/cpufreq/powernow-k6.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/cpu/cpufreq/powernow-k6.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/cpu/cpufreq/powernow-k6.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/cpu/cpufreq/powernow-k6.c</a></div><div class='hunk'>@@ -15,12 +15,11 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/msr.h&gt;</div><div class='del'>-#include &lt;asm/timex.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/timex.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-#define POWERNOW_IOPORT 0xfff0         /* it doesn't matter where, as long</div><div class='del'>-					  as it is unused */</div><div class='add'>+#define POWERNOW_IOPORT 0xfff0          /* it doesn't matter where, as long</div><div class='add'>+					   as it is unused */</div><div class='ctx'> </div><div class='ctx'> static unsigned int                     busfreq;   /* FSB, in 10 kHz */</div><div class='ctx'> static unsigned int                     max_multiplier;</div><div class='hunk'>@@ -53,7 +52,7 @@ static int powernow_k6_get_cpu_multiplier(void)</div><div class='ctx'> </div><div class='ctx'> 	msrval = POWERNOW_IOPORT + 0x1;</div><div class='ctx'> 	wrmsr(MSR_K6_EPMR, msrval, 0); /* enable the PowerNow port */</div><div class='del'>-	invalue=inl(POWERNOW_IOPORT + 0x8);</div><div class='add'>+	invalue = inl(POWERNOW_IOPORT + 0x8);</div><div class='ctx'> 	msrval = POWERNOW_IOPORT + 0x0;</div><div class='ctx'> 	wrmsr(MSR_K6_EPMR, msrval, 0); /* disable it again */</div><div class='ctx'> </div><div class='hunk'>@@ -67,9 +66,9 @@ static int powernow_k6_get_cpu_multiplier(void)</div><div class='ctx'>  *</div><div class='ctx'>  *   Tries to change the PowerNow! multiplier</div><div class='ctx'>  */</div><div class='del'>-static void powernow_k6_set_state (unsigned int best_i)</div><div class='add'>+static void powernow_k6_set_state(unsigned int best_i)</div><div class='ctx'> {</div><div class='del'>-	unsigned long           outvalue=0, invalue=0;</div><div class='add'>+	unsigned long           outvalue = 0, invalue = 0;</div><div class='ctx'> 	unsigned long           msrval;</div><div class='ctx'> 	struct cpufreq_freqs    freqs;</div><div class='ctx'> </div><div class='hunk'>@@ -90,10 +89,10 @@ static void powernow_k6_set_state (unsigned int best_i)</div><div class='ctx'> </div><div class='ctx'> 	msrval = POWERNOW_IOPORT + 0x1;</div><div class='ctx'> 	wrmsr(MSR_K6_EPMR, msrval, 0); /* enable the PowerNow port */</div><div class='del'>-	invalue=inl(POWERNOW_IOPORT + 0x8);</div><div class='add'>+	invalue = inl(POWERNOW_IOPORT + 0x8);</div><div class='ctx'> 	invalue = invalue &amp; 0xf;</div><div class='ctx'> 	outvalue = outvalue | invalue;</div><div class='del'>-	outl(outvalue ,(POWERNOW_IOPORT + 0x8));</div><div class='add'>+	outl(outvalue , (POWERNOW_IOPORT + 0x8));</div><div class='ctx'> 	msrval = POWERNOW_IOPORT + 0x0;</div><div class='ctx'> 	wrmsr(MSR_K6_EPMR, msrval, 0); /* disable it again */</div><div class='ctx'> </div><div class='hunk'>@@ -124,7 +123,7 @@ static int powernow_k6_verify(struct cpufreq_policy *policy)</div><div class='ctx'>  *</div><div class='ctx'>  * sets a new CPUFreq policy</div><div class='ctx'>  */</div><div class='del'>-static int powernow_k6_target (struct cpufreq_policy *policy,</div><div class='add'>+static int powernow_k6_target(struct cpufreq_policy *policy,</div><div class='ctx'> 			       unsigned int target_freq,</div><div class='ctx'> 			       unsigned int relation)</div><div class='ctx'> {</div><div class='hunk'>@@ -152,7 +151,7 @@ static int powernow_k6_cpu_init(struct cpufreq_policy *policy)</div><div class='ctx'> 	busfreq = cpu_khz / max_multiplier;</div><div class='ctx'> </div><div class='ctx'> 	/* table init */</div><div class='del'>-	for (i=0; (clock_ratio[i].frequency != CPUFREQ_TABLE_END); i++) {</div><div class='add'>+	for (i = 0; (clock_ratio[i].frequency != CPUFREQ_TABLE_END); i++) {</div><div class='ctx'> 		if (clock_ratio[i].index &gt; max_multiplier)</div><div class='ctx'> 			clock_ratio[i].frequency = CPUFREQ_ENTRY_INVALID;</div><div class='ctx'> 		else</div><div class='hunk'>@@ -165,7 +164,7 @@ static int powernow_k6_cpu_init(struct cpufreq_policy *policy)</div><div class='ctx'> </div><div class='ctx'> 	result = cpufreq_frequency_table_cpuinfo(policy, clock_ratio);</div><div class='ctx'> 	if (result)</div><div class='del'>-		return (result);</div><div class='add'>+		return result;</div><div class='ctx'> </div><div class='ctx'> 	cpufreq_frequency_table_get_attr(clock_ratio, policy-&gt;cpu);</div><div class='ctx'> </div><div class='hunk'>@@ -176,8 +175,8 @@ static int powernow_k6_cpu_init(struct cpufreq_policy *policy)</div><div class='ctx'> static int powernow_k6_cpu_exit(struct cpufreq_policy *policy)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int i;</div><div class='del'>-	for (i=0; i&lt;8; i++) {</div><div class='del'>-		if (i==max_multiplier)</div><div class='add'>+	for (i = 0; i &lt; 8; i++) {</div><div class='add'>+		if (i == max_multiplier)</div><div class='ctx'> 			powernow_k6_set_state(i);</div><div class='ctx'> 	}</div><div class='ctx'> 	cpufreq_frequency_table_put_attr(policy-&gt;cpu);</div><div class='hunk'>@@ -189,7 +188,7 @@ static unsigned int powernow_k6_get(unsigned int cpu)</div><div class='ctx'> 	return busfreq * powernow_k6_get_cpu_multiplier();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct freq_attr* powernow_k6_attr[] = {</div><div class='add'>+static struct freq_attr *powernow_k6_attr[] = {</div><div class='ctx'> 	&amp;cpufreq_freq_attr_scaling_available_freqs,</div><div class='ctx'> 	NULL,</div><div class='ctx'> };</div><div class='hunk'>@@ -227,7 +226,7 @@ static int __init powernow_k6_init(void)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (cpufreq_register_driver(&amp;powernow_k6_driver)) {</div><div class='del'>-		release_region (POWERNOW_IOPORT, 16);</div><div class='add'>+		release_region(POWERNOW_IOPORT, 16);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -243,13 +242,13 @@ static int __init powernow_k6_init(void)</div><div class='ctx'> static void __exit powernow_k6_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	cpufreq_unregister_driver(&amp;powernow_k6_driver);</div><div class='del'>-	release_region (POWERNOW_IOPORT, 16);</div><div class='add'>+	release_region(POWERNOW_IOPORT, 16);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-MODULE_AUTHOR ("Arjan van de Ven &lt;arjanv@redhat.com&gt;, Dave Jones &lt;davej@codemonkey.org.uk&gt;, Dominik Brodowski &lt;linux@brodo.de&gt;");</div><div class='del'>-MODULE_DESCRIPTION ("PowerNow! driver for AMD K6-2+ / K6-3+ processors.");</div><div class='del'>-MODULE_LICENSE ("GPL");</div><div class='add'>+MODULE_AUTHOR("Arjan van de Ven &lt;arjanv@redhat.com&gt;, Dave Jones &lt;davej@codemonkey.org.uk&gt;, Dominik Brodowski &lt;linux@brodo.de&gt;");</div><div class='add'>+MODULE_DESCRIPTION("PowerNow! driver for AMD K6-2+ / K6-3+ processors.");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='ctx'> module_init(powernow_k6_init);</div><div class='ctx'> module_exit(powernow_k6_exit);</div><div class='head'>diff --git a/arch/x86/kernel/cpu/cyrix.c b/arch/x86/kernel/cpu/cyrix.c<br/>index 898a5a2002ed..ffd0f5ed071a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/cpu/cyrix.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/cpu/cyrix.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/cpu/cyrix.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/cpu/cyrix.c</a></div><div class='hunk'>@@ -121,7 +121,7 @@ static void __cpuinit set_cx86_reorder(void)</div><div class='ctx'> 	setCx86(CX86_CCR3, (ccr3 &amp; 0x0f) | 0x10); /* enable MAPEN */</div><div class='ctx'> </div><div class='ctx'> 	/* Load/Store Serialize to mem access disable (=reorder it) */</div><div class='del'>-	setCx86(CX86_PCR0, getCx86(CX86_PCR0) &amp; ~0x80);</div><div class='add'>+	setCx86_old(CX86_PCR0, getCx86_old(CX86_PCR0) &amp; ~0x80);</div><div class='ctx'> 	/* set load/store serialize from 1GB to 4GB */</div><div class='ctx'> 	ccr3 |= 0xe0;</div><div class='ctx'> 	setCx86(CX86_CCR3, ccr3);</div><div class='hunk'>@@ -132,11 +132,11 @@ static void __cpuinit set_cx86_memwb(void)</div><div class='ctx'> 	printk(KERN_INFO "Enable Memory-Write-back mode on Cyrix/NSC processor.\n");</div><div class='ctx'> </div><div class='ctx'> 	/* CCR2 bit 2: unlock NW bit */</div><div class='del'>-	setCx86(CX86_CCR2, getCx86(CX86_CCR2) &amp; ~0x04);</div><div class='add'>+	setCx86_old(CX86_CCR2, getCx86_old(CX86_CCR2) &amp; ~0x04);</div><div class='ctx'> 	/* set 'Not Write-through' */</div><div class='ctx'> 	write_cr0(read_cr0() | X86_CR0_NW);</div><div class='ctx'> 	/* CCR2 bit 2: lock NW bit and set WT1 */</div><div class='del'>-	setCx86(CX86_CCR2, getCx86(CX86_CCR2) | 0x14);</div><div class='add'>+	setCx86_old(CX86_CCR2, getCx86_old(CX86_CCR2) | 0x14);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -150,14 +150,14 @@ static void __cpuinit geode_configure(void)</div><div class='ctx'> 	local_irq_save(flags);</div><div class='ctx'> </div><div class='ctx'> 	/* Suspend on halt power saving and enable #SUSP pin */</div><div class='del'>-	setCx86(CX86_CCR2, getCx86(CX86_CCR2) | 0x88);</div><div class='add'>+	setCx86_old(CX86_CCR2, getCx86_old(CX86_CCR2) | 0x88);</div><div class='ctx'> </div><div class='ctx'> 	ccr3 = getCx86(CX86_CCR3);</div><div class='ctx'> 	setCx86(CX86_CCR3, (ccr3 &amp; 0x0f) | 0x10);	/* enable MAPEN */</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 	/* FPU fast, DTE cache, Mem bypass */</div><div class='del'>-	setCx86(CX86_CCR4, getCx86(CX86_CCR4) | 0x38);</div><div class='add'>+	setCx86_old(CX86_CCR4, getCx86_old(CX86_CCR4) | 0x38);</div><div class='ctx'> 	setCx86(CX86_CCR3, ccr3);			/* disable MAPEN */</div><div class='ctx'> </div><div class='ctx'> 	set_cx86_memwb();</div><div class='hunk'>@@ -291,7 +291,7 @@ static void __cpuinit init_cyrix(struct cpuinfo_x86 *c)</div><div class='ctx'> 		/* GXm supports extended cpuid levels 'ala' AMD */</div><div class='ctx'> 		if (c-&gt;cpuid_level == 2) {</div><div class='ctx'> 			/* Enable cxMMX extensions (GX1 Datasheet 54) */</div><div class='del'>-			setCx86(CX86_CCR7, getCx86(CX86_CCR7) | 1);</div><div class='add'>+			setCx86_old(CX86_CCR7, getCx86_old(CX86_CCR7) | 1);</div><div class='ctx'> </div><div class='ctx'> 			/*</div><div class='ctx'> 			 * GXm : 0x30 ... 0x5f GXm  datasheet 51</div><div class='hunk'>@@ -301,7 +301,6 @@ static void __cpuinit init_cyrix(struct cpuinfo_x86 *c)</div><div class='ctx'> 			 */</div><div class='ctx'> 			if ((0x30 &lt;= dir1 &amp;&amp; dir1 &lt;= 0x6f) || (0x80 &lt;= dir1 &amp;&amp; dir1 &lt;= 0x8f))</div><div class='ctx'> 				geode_configure();</div><div class='del'>-			get_model_name(c);  /* get CPU marketing name */</div><div class='ctx'> 			return;</div><div class='ctx'> 		} else { /* MediaGX */</div><div class='ctx'> 			Cx86_cb[2] = (dir0_lsn &amp; 1) ? '3' : '4';</div><div class='hunk'>@@ -314,7 +313,7 @@ static void __cpuinit init_cyrix(struct cpuinfo_x86 *c)</div><div class='ctx'> 		if (dir1 &gt; 7) {</div><div class='ctx'> 			dir0_msn++;  /* M II */</div><div class='ctx'> 			/* Enable MMX extensions (App note 108) */</div><div class='del'>-			setCx86(CX86_CCR7, getCx86(CX86_CCR7)|1);</div><div class='add'>+			setCx86_old(CX86_CCR7, getCx86_old(CX86_CCR7)|1);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			c-&gt;coma_bug = 1;      /* 6x86MX, it has the bug. */</div><div class='ctx'> 		}</div><div class='hunk'>@@ -429,7 +428,7 @@ static void __cpuinit cyrix_identify(struct cpuinfo_x86 *c)</div><div class='ctx'> 			local_irq_save(flags);</div><div class='ctx'> 			ccr3 = getCx86(CX86_CCR3);</div><div class='ctx'> 			setCx86(CX86_CCR3, (ccr3 &amp; 0x0f) | 0x10);       /* enable MAPEN  */</div><div class='del'>-			setCx86(CX86_CCR4, getCx86(CX86_CCR4) | 0x80);  /* enable cpuid  */</div><div class='add'>+			setCx86_old(CX86_CCR4, getCx86_old(CX86_CCR4) | 0x80);  /* enable cpuid  */</div><div class='ctx'> 			setCx86(CX86_CCR3, ccr3);                       /* disable MAPEN */</div><div class='ctx'> 			local_irq_restore(flags);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -442,14 +441,16 @@ static struct cpu_dev cyrix_cpu_dev __cpuinitdata = {</div><div class='ctx'> 	.c_early_init	= early_init_cyrix,</div><div class='ctx'> 	.c_init		= init_cyrix,</div><div class='ctx'> 	.c_identify	= cyrix_identify,</div><div class='add'>+	.c_x86_vendor	= X86_VENDOR_CYRIX,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-cpu_vendor_dev_register(X86_VENDOR_CYRIX, &amp;cyrix_cpu_dev);</div><div class='add'>+cpu_dev_register(cyrix_cpu_dev);</div><div class='ctx'> </div><div class='ctx'> static struct cpu_dev nsc_cpu_dev __cpuinitdata = {</div><div class='ctx'> 	.c_vendor	= "NSC",</div><div class='ctx'> 	.c_ident	= { "Geode by NSC" },</div><div class='ctx'> 	.c_init		= init_nsc,</div><div class='add'>+	.c_x86_vendor	= X86_VENDOR_NSC,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-cpu_vendor_dev_register(X86_VENDOR_NSC, &amp;nsc_cpu_dev);</div><div class='add'>+cpu_dev_register(nsc_cpu_dev);</div><div class='head'>diff --git a/arch/x86/kernel/cpu/feature_names.c b/arch/x86/kernel/cpu/feature_names.c<br/>deleted file mode 100644<br/>index c9017799497c..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/cpu/feature_names.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/cpu/feature_names.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,84 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Strings for the various x86 capability flags.</div><div class='del'>- *</div><div class='del'>- * This file must not contain any executable code.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;asm/cpufeature.h&gt;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * These flag bits must match the definitions in &lt;asm/cpufeature.h&gt;.</div><div class='del'>- * NULL means this bit is undefined or reserved; either way it doesn't</div><div class='del'>- * have meaning as far as Linux is concerned.  Note that it's important</div><div class='del'>- * to realize there is a difference between this table and CPUID -- if</div><div class='del'>- * applications want to get the raw CPUID data, they should access</div><div class='del'>- * /dev/cpu/&lt;cpu_nr&gt;/cpuid instead.</div><div class='del'>- */</div><div class='del'>-const char * const x86_cap_flags[NCAPINTS*32] = {</div><div class='del'>-	/* Intel-defined */</div><div class='del'>-	"fpu", "vme", "de", "pse", "tsc", "msr", "pae", "mce",</div><div class='del'>-	"cx8", "apic", NULL, "sep", "mtrr", "pge", "mca", "cmov",</div><div class='del'>-	"pat", "pse36", "pn", "clflush", NULL, "dts", "acpi", "mmx",</div><div class='del'>-	"fxsr", "sse", "sse2", "ss", "ht", "tm", "ia64", "pbe",</div><div class='del'>-</div><div class='del'>-	/* AMD-defined */</div><div class='del'>-	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,</div><div class='del'>-	NULL, NULL, NULL, "syscall", NULL, NULL, NULL, NULL,</div><div class='del'>-	NULL, NULL, NULL, "mp", "nx", NULL, "mmxext", NULL,</div><div class='del'>-	NULL, "fxsr_opt", "pdpe1gb", "rdtscp", NULL, "lm",</div><div class='del'>-	"3dnowext", "3dnow",</div><div class='del'>-</div><div class='del'>-	/* Transmeta-defined */</div><div class='del'>-	"recovery", "longrun", NULL, "lrti", NULL, NULL, NULL, NULL,</div><div class='del'>-	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,</div><div class='del'>-	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,</div><div class='del'>-	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,</div><div class='del'>-</div><div class='del'>-	/* Other (Linux-defined) */</div><div class='del'>-	"cxmmx", "k6_mtrr", "cyrix_arr", "centaur_mcr",</div><div class='del'>-	NULL, NULL, NULL, NULL,</div><div class='del'>-	"constant_tsc", "up", NULL, "arch_perfmon",</div><div class='del'>-	"pebs", "bts", NULL, NULL,</div><div class='del'>-	"rep_good", NULL, NULL, NULL,</div><div class='del'>-	"nopl", NULL, NULL, NULL,</div><div class='del'>-	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,</div><div class='del'>-</div><div class='del'>-	/* Intel-defined (#2) */</div><div class='del'>-	"pni", NULL, NULL, "monitor", "ds_cpl", "vmx", "smx", "est",</div><div class='del'>-	"tm2", "ssse3", "cid", NULL, NULL, "cx16", "xtpr", NULL,</div><div class='del'>-	NULL, NULL, "dca", "sse4_1", "sse4_2", NULL, NULL, "popcnt",</div><div class='del'>-	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,</div><div class='del'>-</div><div class='del'>-	/* VIA/Cyrix/Centaur-defined */</div><div class='del'>-	NULL, NULL, "rng", "rng_en", NULL, NULL, "ace", "ace_en",</div><div class='del'>-	"ace2", "ace2_en", "phe", "phe_en", "pmm", "pmm_en", NULL, NULL,</div><div class='del'>-	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,</div><div class='del'>-	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,</div><div class='del'>-</div><div class='del'>-	/* AMD-defined (#2) */</div><div class='del'>-	"lahf_lm", "cmp_legacy", "svm", "extapic",</div><div class='del'>-	"cr8_legacy", "abm", "sse4a", "misalignsse",</div><div class='del'>-	"3dnowprefetch", "osvw", "ibs", "sse5",</div><div class='del'>-	"skinit", "wdt", NULL, NULL,</div><div class='del'>-	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,</div><div class='del'>-	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,</div><div class='del'>-</div><div class='del'>-	/* Auxiliary (Linux-defined) */</div><div class='del'>-	"ida", NULL, NULL, NULL, NULL, NULL, NULL, NULL,</div><div class='del'>-	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,</div><div class='del'>-	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,</div><div class='del'>-	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const char *const x86_power_flags[32] = {</div><div class='del'>-	"ts",	/* temperature sensor */</div><div class='del'>-	"fid",  /* frequency id control */</div><div class='del'>-	"vid",  /* voltage id control */</div><div class='del'>-	"ttp",  /* thermal trip */</div><div class='del'>-	"tm",</div><div class='del'>-	"stc",</div><div class='del'>-	"100mhzsteps",</div><div class='del'>-	"hwpstate",</div><div class='del'>-	"",	/* tsc invariant mapped to constant_tsc */</div><div class='del'>-		/* nothing */</div><div class='del'>-};</div><div class='head'>diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c<br/>index b75f2569b8f8..99468dbd08da 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/cpu/intel.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/cpu/intel.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/cpu/intel.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/cpu/intel.c</a></div><div class='hunk'>@@ -15,6 +15,11 @@</div><div class='ctx'> #include &lt;asm/ds.h&gt;</div><div class='ctx'> #include &lt;asm/bugs.h&gt;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='add'>+#include &lt;asm/topology.h&gt;</div><div class='add'>+#include &lt;asm/numa_64.h&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #include "cpu.h"</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_X86_LOCAL_APIC</div><div class='hunk'>@@ -23,23 +28,22 @@</div><div class='ctx'> #include &lt;mach_apic.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_X86_INTEL_USERCOPY</div><div class='del'>-/*</div><div class='del'>- * Alignment at which movsl is preferred for bulk memory copies.</div><div class='del'>- */</div><div class='del'>-struct movsl_mask movsl_mask __read_mostly;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> static void __cpuinit early_init_intel(struct cpuinfo_x86 *c)</div><div class='ctx'> {</div><div class='del'>-	/* Netburst reports 64 bytes clflush size, but does IO in 128 bytes */</div><div class='del'>-	if (c-&gt;x86 == 15 &amp;&amp; c-&gt;x86_cache_alignment == 64)</div><div class='del'>-		c-&gt;x86_cache_alignment = 128;</div><div class='ctx'> 	if ((c-&gt;x86 == 0xf &amp;&amp; c-&gt;x86_model &gt;= 0x03) ||</div><div class='ctx'> 		(c-&gt;x86 == 0x6 &amp;&amp; c-&gt;x86_model &gt;= 0x0e))</div><div class='ctx'> 		set_cpu_cap(c, X86_FEATURE_CONSTANT_TSC);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='add'>+	set_cpu_cap(c, X86_FEATURE_SYSENTER32);</div><div class='add'>+#else</div><div class='add'>+	/* Netburst reports 64 bytes clflush size, but does IO in 128 bytes */</div><div class='add'>+	if (c-&gt;x86 == 15 &amp;&amp; c-&gt;x86_cache_alignment == 64)</div><div class='add'>+		c-&gt;x86_cache_alignment = 128;</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_X86_32</div><div class='ctx'> /*</div><div class='ctx'>  *	Early probe support logic for ppro memory erratum #50</div><div class='ctx'>  *</div><div class='hunk'>@@ -59,15 +63,54 @@ int __cpuinit ppro_with_ram_bug(void)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_X86_F00F_BUG</div><div class='add'>+static void __cpuinit trap_init_f00f_bug(void)</div><div class='add'>+{</div><div class='add'>+	__set_fixmap(FIX_F00F_IDT, __pa(&amp;idt_table), PAGE_KERNEL_RO);</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * P4 Xeon errata 037 workaround.</div><div class='del'>- * Hardware prefetcher may cause stale data to be loaded into the cache.</div><div class='del'>- */</div><div class='del'>-static void __cpuinit Intel_errata_workarounds(struct cpuinfo_x86 *c)</div><div class='add'>+	/*</div><div class='add'>+	 * Update the IDT descriptor and reload the IDT so that</div><div class='add'>+	 * it uses the read-only mapped virtual address.</div><div class='add'>+	 */</div><div class='add'>+	idt_descr.address = fix_to_virt(FIX_F00F_IDT);</div><div class='add'>+	load_idt(&amp;idt_descr);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static void __cpuinit intel_workarounds(struct cpuinfo_x86 *c)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long lo, hi;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_X86_F00F_BUG</div><div class='add'>+	/*</div><div class='add'>+	 * All current models of Pentium and Pentium with MMX technology CPUs</div><div class='add'>+	 * have the F0 0F bug, which lets nonprivileged users lock up the system.</div><div class='add'>+	 * Note that the workaround only should be initialized once...</div><div class='add'>+	 */</div><div class='add'>+	c-&gt;f00f_bug = 0;</div><div class='add'>+	if (!paravirt_enabled() &amp;&amp; c-&gt;x86 == 5) {</div><div class='add'>+		static int f00f_workaround_enabled;</div><div class='add'>+</div><div class='add'>+		c-&gt;f00f_bug = 1;</div><div class='add'>+		if (!f00f_workaround_enabled) {</div><div class='add'>+			trap_init_f00f_bug();</div><div class='add'>+			printk(KERN_NOTICE "Intel Pentium with F0 0F bug - workaround enabled.\n");</div><div class='add'>+			f00f_workaround_enabled = 1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * SEP CPUID bug: Pentium Pro reports SEP but doesn't have it until</div><div class='add'>+	 * model 3 mask 3</div><div class='add'>+	 */</div><div class='add'>+	if ((c-&gt;x86&lt;&lt;8 | c-&gt;x86_model&lt;&lt;4 | c-&gt;x86_mask) &lt; 0x633)</div><div class='add'>+		clear_cpu_cap(c, X86_FEATURE_SEP);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * P4 Xeon errata 037 workaround.</div><div class='add'>+	 * Hardware prefetcher may cause stale data to be loaded into the cache.</div><div class='add'>+	 */</div><div class='ctx'> 	if ((c-&gt;x86 == 15) &amp;&amp; (c-&gt;x86_model == 1) &amp;&amp; (c-&gt;x86_mask == 1)) {</div><div class='ctx'> 		rdmsr(MSR_IA32_MISC_ENABLE, lo, hi);</div><div class='ctx'> 		if ((lo &amp; (1&lt;&lt;9)) == 0) {</div><div class='hunk'>@@ -77,13 +120,68 @@ static void __cpuinit Intel_errata_workarounds(struct cpuinfo_x86 *c)</div><div class='ctx'> 			wrmsr (MSR_IA32_MISC_ENABLE, lo, hi);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * See if we have a good local APIC by checking for buggy Pentia,</div><div class='add'>+	 * i.e. all B steppings and the C2 stepping of P54C when using their</div><div class='add'>+	 * integrated APIC (see 11AP erratum in "Pentium Processor</div><div class='add'>+	 * Specification Update").</div><div class='add'>+	 */</div><div class='add'>+	if (cpu_has_apic &amp;&amp; (c-&gt;x86&lt;&lt;8 | c-&gt;x86_model&lt;&lt;4) == 0x520 &amp;&amp;</div><div class='add'>+	    (c-&gt;x86_mask &lt; 0x6 || c-&gt;x86_mask == 0xb))</div><div class='add'>+		set_cpu_cap(c, X86_FEATURE_11AP);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_X86_INTEL_USERCOPY</div><div class='add'>+	/*</div><div class='add'>+	 * Set up the preferred alignment for movsl bulk memory moves</div><div class='add'>+	 */</div><div class='add'>+	switch (c-&gt;x86) {</div><div class='add'>+	case 4:		/* 486: untested */</div><div class='add'>+		break;</div><div class='add'>+	case 5:		/* Old Pentia: untested */</div><div class='add'>+		break;</div><div class='add'>+	case 6:		/* PII/PIII only like movsl with 8-byte alignment */</div><div class='add'>+		movsl_mask.mask = 7;</div><div class='add'>+		break;</div><div class='add'>+	case 15:	/* P4 is OK down to 8-byte alignment */</div><div class='add'>+		movsl_mask.mask = 7;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_X86_NUMAQ</div><div class='add'>+	numaq_tsc_disable();</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='add'>+#else</div><div class='add'>+static void __cpuinit intel_workarounds(struct cpuinfo_x86 *c)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='add'>+static void __cpuinit srat_detect_node(void)</div><div class='add'>+{</div><div class='add'>+#if defined(CONFIG_NUMA) &amp;&amp; defined(CONFIG_X86_64)</div><div class='add'>+	unsigned node;</div><div class='add'>+	int cpu = smp_processor_id();</div><div class='add'>+	int apicid = hard_smp_processor_id();</div><div class='add'>+</div><div class='add'>+	/* Don't do the funky fallback heuristics the AMD version employs</div><div class='add'>+	   for now. */</div><div class='add'>+	node = apicid_to_node[apicid];</div><div class='add'>+	if (node == NUMA_NO_NODE || !node_online(node))</div><div class='add'>+		node = first_node(node_online_map);</div><div class='add'>+	numa_set_node(cpu, node);</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "CPU %d/%x -&gt; Node %d\n", cpu, apicid, node);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * find out the number of processor cores on the die</div><div class='ctx'>  */</div><div class='del'>-static int __cpuinit num_cpu_cores(struct cpuinfo_x86 *c)</div><div class='add'>+static int __cpuinit intel_num_cpu_cores(struct cpuinfo_x86 *c)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int eax, ebx, ecx, edx;</div><div class='ctx'> </div><div class='hunk'>@@ -98,45 +196,51 @@ static int __cpuinit num_cpu_cores(struct cpuinfo_x86 *c)</div><div class='ctx'> 		return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_X86_F00F_BUG</div><div class='del'>-static void __cpuinit trap_init_f00f_bug(void)</div><div class='add'>+static void __cpuinit detect_vmx_virtcap(struct cpuinfo_x86 *c)</div><div class='ctx'> {</div><div class='del'>-	__set_fixmap(FIX_F00F_IDT, __pa(&amp;idt_table), PAGE_KERNEL_RO);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Update the IDT descriptor and reload the IDT so that</div><div class='del'>-	 * it uses the read-only mapped virtual address.</div><div class='del'>-	 */</div><div class='del'>-	idt_descr.address = fix_to_virt(FIX_F00F_IDT);</div><div class='del'>-	load_idt(&amp;idt_descr);</div><div class='add'>+	/* Intel VMX MSR indicated features */</div><div class='add'>+#define X86_VMX_FEATURE_PROC_CTLS_TPR_SHADOW	0x00200000</div><div class='add'>+#define X86_VMX_FEATURE_PROC_CTLS_VNMI		0x00400000</div><div class='add'>+#define X86_VMX_FEATURE_PROC_CTLS_2ND_CTLS	0x80000000</div><div class='add'>+#define X86_VMX_FEATURE_PROC_CTLS2_VIRT_APIC	0x00000001</div><div class='add'>+#define X86_VMX_FEATURE_PROC_CTLS2_EPT		0x00000002</div><div class='add'>+#define X86_VMX_FEATURE_PROC_CTLS2_VPID		0x00000020</div><div class='add'>+</div><div class='add'>+	u32 vmx_msr_low, vmx_msr_high, msr_ctl, msr_ctl2;</div><div class='add'>+</div><div class='add'>+	clear_cpu_cap(c, X86_FEATURE_TPR_SHADOW);</div><div class='add'>+	clear_cpu_cap(c, X86_FEATURE_VNMI);</div><div class='add'>+	clear_cpu_cap(c, X86_FEATURE_FLEXPRIORITY);</div><div class='add'>+	clear_cpu_cap(c, X86_FEATURE_EPT);</div><div class='add'>+	clear_cpu_cap(c, X86_FEATURE_VPID);</div><div class='add'>+</div><div class='add'>+	rdmsr(MSR_IA32_VMX_PROCBASED_CTLS, vmx_msr_low, vmx_msr_high);</div><div class='add'>+	msr_ctl = vmx_msr_high | vmx_msr_low;</div><div class='add'>+	if (msr_ctl &amp; X86_VMX_FEATURE_PROC_CTLS_TPR_SHADOW)</div><div class='add'>+		set_cpu_cap(c, X86_FEATURE_TPR_SHADOW);</div><div class='add'>+	if (msr_ctl &amp; X86_VMX_FEATURE_PROC_CTLS_VNMI)</div><div class='add'>+		set_cpu_cap(c, X86_FEATURE_VNMI);</div><div class='add'>+	if (msr_ctl &amp; X86_VMX_FEATURE_PROC_CTLS_2ND_CTLS) {</div><div class='add'>+		rdmsr(MSR_IA32_VMX_PROCBASED_CTLS2,</div><div class='add'>+		      vmx_msr_low, vmx_msr_high);</div><div class='add'>+		msr_ctl2 = vmx_msr_high | vmx_msr_low;</div><div class='add'>+		if ((msr_ctl2 &amp; X86_VMX_FEATURE_PROC_CTLS2_VIRT_APIC) &amp;&amp;</div><div class='add'>+		    (msr_ctl &amp; X86_VMX_FEATURE_PROC_CTLS_TPR_SHADOW))</div><div class='add'>+			set_cpu_cap(c, X86_FEATURE_FLEXPRIORITY);</div><div class='add'>+		if (msr_ctl2 &amp; X86_VMX_FEATURE_PROC_CTLS2_EPT)</div><div class='add'>+			set_cpu_cap(c, X86_FEATURE_EPT);</div><div class='add'>+		if (msr_ctl2 &amp; X86_VMX_FEATURE_PROC_CTLS2_VPID)</div><div class='add'>+			set_cpu_cap(c, X86_FEATURE_VPID);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> static void __cpuinit init_intel(struct cpuinfo_x86 *c)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int l2 = 0;</div><div class='del'>-	char *p = NULL;</div><div class='ctx'> </div><div class='ctx'> 	early_init_intel(c);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_X86_F00F_BUG</div><div class='del'>-	/*</div><div class='del'>-	 * All current models of Pentium and Pentium with MMX technology CPUs</div><div class='del'>-	 * have the F0 0F bug, which lets nonprivileged users lock up the system.</div><div class='del'>-	 * Note that the workaround only should be initialized once...</div><div class='del'>-	 */</div><div class='del'>-	c-&gt;f00f_bug = 0;</div><div class='del'>-	if (!paravirt_enabled() &amp;&amp; c-&gt;x86 == 5) {</div><div class='del'>-		static int f00f_workaround_enabled;</div><div class='del'>-</div><div class='del'>-		c-&gt;f00f_bug = 1;</div><div class='del'>-		if (!f00f_workaround_enabled) {</div><div class='del'>-			trap_init_f00f_bug();</div><div class='del'>-			printk(KERN_NOTICE "Intel Pentium with F0 0F bug - workaround enabled.\n");</div><div class='del'>-			f00f_workaround_enabled = 1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='add'>+	intel_workarounds(c);</div><div class='ctx'> </div><div class='ctx'> 	l2 = init_intel_cacheinfo(c);</div><div class='ctx'> 	if (c-&gt;cpuid_level &gt; 9) {</div><div class='hunk'>@@ -146,16 +250,32 @@ static void __cpuinit init_intel(struct cpuinfo_x86 *c)</div><div class='ctx'> 			set_cpu_cap(c, X86_FEATURE_ARCH_PERFMON);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* SEP CPUID bug: Pentium Pro reports SEP but doesn't have it until model 3 mask 3 */</div><div class='del'>-	if ((c-&gt;x86&lt;&lt;8 | c-&gt;x86_model&lt;&lt;4 | c-&gt;x86_mask) &lt; 0x633)</div><div class='del'>-		clear_cpu_cap(c, X86_FEATURE_SEP);</div><div class='add'>+	if (cpu_has_xmm2)</div><div class='add'>+		set_cpu_cap(c, X86_FEATURE_LFENCE_RDTSC);</div><div class='add'>+	if (cpu_has_ds) {</div><div class='add'>+		unsigned int l1;</div><div class='add'>+		rdmsr(MSR_IA32_MISC_ENABLE, l1, l2);</div><div class='add'>+		if (!(l1 &amp; (1&lt;&lt;11)))</div><div class='add'>+			set_cpu_cap(c, X86_FEATURE_BTS);</div><div class='add'>+		if (!(l1 &amp; (1&lt;&lt;12)))</div><div class='add'>+			set_cpu_cap(c, X86_FEATURE_PEBS);</div><div class='add'>+		ds_init_intel(c);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='add'>+	if (c-&gt;x86 == 15)</div><div class='add'>+		c-&gt;x86_cache_alignment = c-&gt;x86_clflush_size * 2;</div><div class='add'>+	if (c-&gt;x86 == 6)</div><div class='add'>+		set_cpu_cap(c, X86_FEATURE_REP_GOOD);</div><div class='add'>+#else</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Names for the Pentium II/Celeron processors</div><div class='ctx'> 	 * detectable only by also checking the cache size.</div><div class='ctx'> 	 * Dixon is NOT a Celeron.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (c-&gt;x86 == 6) {</div><div class='add'>+		char *p = NULL;</div><div class='add'>+</div><div class='ctx'> 		switch (c-&gt;x86_model) {</div><div class='ctx'> 		case 5:</div><div class='ctx'> 			if (c-&gt;x86_mask == 0) {</div><div class='hunk'>@@ -178,70 +298,41 @@ static void __cpuinit init_intel(struct cpuinfo_x86 *c)</div><div class='ctx'> 				p = "Celeron (Coppermine)";</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (p)</div><div class='del'>-		strcpy(c-&gt;x86_model_id, p);</div><div class='del'>-</div><div class='del'>-	c-&gt;x86_max_cores = num_cpu_cores(c);</div><div class='del'>-</div><div class='del'>-	detect_ht(c);</div><div class='ctx'> </div><div class='del'>-	/* Work around errata */</div><div class='del'>-	Intel_errata_workarounds(c);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_X86_INTEL_USERCOPY</div><div class='del'>-	/*</div><div class='del'>-	 * Set up the preferred alignment for movsl bulk memory moves</div><div class='del'>-	 */</div><div class='del'>-	switch (c-&gt;x86) {</div><div class='del'>-	case 4:		/* 486: untested */</div><div class='del'>-		break;</div><div class='del'>-	case 5:		/* Old Pentia: untested */</div><div class='del'>-		break;</div><div class='del'>-	case 6:		/* PII/PIII only like movsl with 8-byte alignment */</div><div class='del'>-		movsl_mask.mask = 7;</div><div class='del'>-		break;</div><div class='del'>-	case 15:	/* P4 is OK down to 8-byte alignment */</div><div class='del'>-		movsl_mask.mask = 7;</div><div class='del'>-		break;</div><div class='add'>+		if (p)</div><div class='add'>+			strcpy(c-&gt;x86_model_id, p);</div><div class='ctx'> 	}</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='del'>-	if (cpu_has_xmm2)</div><div class='del'>-		set_cpu_cap(c, X86_FEATURE_LFENCE_RDTSC);</div><div class='del'>-	if (c-&gt;x86 == 15) {</div><div class='add'>+	if (c-&gt;x86 == 15)</div><div class='ctx'> 		set_cpu_cap(c, X86_FEATURE_P4);</div><div class='del'>-	}</div><div class='ctx'> 	if (c-&gt;x86 == 6)</div><div class='ctx'> 		set_cpu_cap(c, X86_FEATURE_P3);</div><div class='del'>-	if (cpu_has_ds) {</div><div class='del'>-		unsigned int l1;</div><div class='del'>-		rdmsr(MSR_IA32_MISC_ENABLE, l1, l2);</div><div class='del'>-		if (!(l1 &amp; (1&lt;&lt;11)))</div><div class='del'>-			set_cpu_cap(c, X86_FEATURE_BTS);</div><div class='del'>-		if (!(l1 &amp; (1&lt;&lt;12)))</div><div class='del'>-			set_cpu_cap(c, X86_FEATURE_PEBS);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	if (cpu_has_bts)</div><div class='del'>-		ds_init_intel(c);</div><div class='add'>+		ptrace_bts_init_intel(c);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * See if we have a good local APIC by checking for buggy Pentia,</div><div class='del'>-	 * i.e. all B steppings and the C2 stepping of P54C when using their</div><div class='del'>-	 * integrated APIC (see 11AP erratum in "Pentium Processor</div><div class='del'>-	 * Specification Update").</div><div class='del'>-	 */</div><div class='del'>-	if (cpu_has_apic &amp;&amp; (c-&gt;x86&lt;&lt;8 | c-&gt;x86_model&lt;&lt;4) == 0x520 &amp;&amp;</div><div class='del'>-	    (c-&gt;x86_mask &lt; 0x6 || c-&gt;x86_mask == 0xb))</div><div class='del'>-		set_cpu_cap(c, X86_FEATURE_11AP);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_X86_NUMAQ</div><div class='del'>-	numaq_tsc_disable();</div><div class='add'>+	detect_extended_topology(c);</div><div class='add'>+	if (!cpu_has(c, X86_FEATURE_XTOPOLOGY)) {</div><div class='add'>+		/*</div><div class='add'>+		 * let's use the legacy cpuid vector 0x1 and 0x4 for topology</div><div class='add'>+		 * detection.</div><div class='add'>+		 */</div><div class='add'>+		c-&gt;x86_max_cores = intel_num_cpu_cores(c);</div><div class='add'>+#ifdef CONFIG_X86_32</div><div class='add'>+		detect_ht(c);</div><div class='ctx'> #endif</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Work around errata */</div><div class='add'>+	srat_detect_node();</div><div class='add'>+</div><div class='add'>+	if (cpu_has(c, X86_FEATURE_VMX))</div><div class='add'>+		detect_vmx_virtcap(c);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_X86_32</div><div class='ctx'> static unsigned int __cpuinit intel_size_cache(struct cpuinfo_x86 *c, unsigned int size)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -254,10 +345,12 @@ static unsigned int __cpuinit intel_size_cache(struct cpuinfo_x86 *c, unsigned i</div><div class='ctx'> 		size = 256;</div><div class='ctx'> 	return size;</div><div class='ctx'> }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> static struct cpu_dev intel_cpu_dev __cpuinitdata = {</div><div class='ctx'> 	.c_vendor	= "Intel",</div><div class='ctx'> 	.c_ident	= { "GenuineIntel" },</div><div class='add'>+#ifdef CONFIG_X86_32</div><div class='ctx'> 	.c_models = {</div><div class='ctx'> 		{ .vendor = X86_VENDOR_INTEL, .family = 4, .model_names =</div><div class='ctx'> 		  {</div><div class='hunk'>@@ -307,76 +400,12 @@ static struct cpu_dev intel_cpu_dev __cpuinitdata = {</div><div class='ctx'> 		  }</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='add'>+	.c_size_cache	= intel_size_cache,</div><div class='add'>+#endif</div><div class='ctx'> 	.c_early_init   = early_init_intel,</div><div class='ctx'> 	.c_init		= init_intel,</div><div class='del'>-	.c_size_cache	= intel_size_cache,</div><div class='add'>+	.c_x86_vendor	= X86_VENDOR_INTEL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-cpu_vendor_dev_register(X86_VENDOR_INTEL, &amp;intel_cpu_dev);</div><div class='del'>-</div><div class='del'>-#ifndef CONFIG_X86_CMPXCHG</div><div class='del'>-unsigned long cmpxchg_386_u8(volatile void *ptr, u8 old, u8 new)</div><div class='del'>-{</div><div class='del'>-	u8 prev;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	/* Poor man's cmpxchg for 386. Unsuitable for SMP */</div><div class='del'>-	local_irq_save(flags);</div><div class='del'>-	prev = *(u8 *)ptr;</div><div class='del'>-	if (prev == old)</div><div class='del'>-		*(u8 *)ptr = new;</div><div class='del'>-	local_irq_restore(flags);</div><div class='del'>-	return prev;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(cmpxchg_386_u8);</div><div class='del'>-</div><div class='del'>-unsigned long cmpxchg_386_u16(volatile void *ptr, u16 old, u16 new)</div><div class='del'>-{</div><div class='del'>-	u16 prev;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	/* Poor man's cmpxchg for 386. Unsuitable for SMP */</div><div class='del'>-	local_irq_save(flags);</div><div class='del'>-	prev = *(u16 *)ptr;</div><div class='del'>-	if (prev == old)</div><div class='del'>-		*(u16 *)ptr = new;</div><div class='del'>-	local_irq_restore(flags);</div><div class='del'>-	return prev;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(cmpxchg_386_u16);</div><div class='del'>-</div><div class='del'>-unsigned long cmpxchg_386_u32(volatile void *ptr, u32 old, u32 new)</div><div class='del'>-{</div><div class='del'>-	u32 prev;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	/* Poor man's cmpxchg for 386. Unsuitable for SMP */</div><div class='del'>-	local_irq_save(flags);</div><div class='del'>-	prev = *(u32 *)ptr;</div><div class='del'>-	if (prev == old)</div><div class='del'>-		*(u32 *)ptr = new;</div><div class='del'>-	local_irq_restore(flags);</div><div class='del'>-	return prev;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(cmpxchg_386_u32);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifndef CONFIG_X86_CMPXCHG64</div><div class='del'>-unsigned long long cmpxchg_486_u64(volatile void *ptr, u64 old, u64 new)</div><div class='del'>-{</div><div class='del'>-	u64 prev;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	/* Poor man's cmpxchg8b for 386 and 486. Unsuitable for SMP */</div><div class='del'>-	local_irq_save(flags);</div><div class='del'>-	prev = *(u64 *)ptr;</div><div class='del'>-	if (prev == old)</div><div class='del'>-		*(u64 *)ptr = new;</div><div class='del'>-	local_irq_restore(flags);</div><div class='del'>-	return prev;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(cmpxchg_486_u64);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* arch_initcall(intel_cpu_init); */</div><div class='add'>+cpu_dev_register(intel_cpu_dev);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kernel/cpu/intel_64.c b/arch/x86/kernel/cpu/intel_64.c<br/>deleted file mode 100644<br/>index 1019c58d39f0..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/cpu/intel_64.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/cpu/intel_64.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,95 +0,0 @@</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/smp.h&gt;</div><div class='del'>-#include &lt;asm/processor.h&gt;</div><div class='del'>-#include &lt;asm/ptrace.h&gt;</div><div class='del'>-#include &lt;asm/topology.h&gt;</div><div class='del'>-#include &lt;asm/numa_64.h&gt;</div><div class='del'>-</div><div class='del'>-#include "cpu.h"</div><div class='del'>-</div><div class='del'>-static void __cpuinit early_init_intel(struct cpuinfo_x86 *c)</div><div class='del'>-{</div><div class='del'>-	if ((c-&gt;x86 == 0xf &amp;&amp; c-&gt;x86_model &gt;= 0x03) ||</div><div class='del'>-	    (c-&gt;x86 == 0x6 &amp;&amp; c-&gt;x86_model &gt;= 0x0e))</div><div class='del'>-		set_cpu_cap(c, X86_FEATURE_CONSTANT_TSC);</div><div class='del'>-</div><div class='del'>-	set_cpu_cap(c, X86_FEATURE_SYSENTER32);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * find out the number of processor cores on the die</div><div class='del'>- */</div><div class='del'>-static int __cpuinit intel_num_cpu_cores(struct cpuinfo_x86 *c)</div><div class='del'>-{</div><div class='del'>-	unsigned int eax, t;</div><div class='del'>-</div><div class='del'>-	if (c-&gt;cpuid_level &lt; 4)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	cpuid_count(4, 0, &amp;eax, &amp;t, &amp;t, &amp;t);</div><div class='del'>-</div><div class='del'>-	if (eax &amp; 0x1f)</div><div class='del'>-		return ((eax &gt;&gt; 26) + 1);</div><div class='del'>-	else</div><div class='del'>-		return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __cpuinit srat_detect_node(void)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_NUMA</div><div class='del'>-	unsigned node;</div><div class='del'>-	int cpu = smp_processor_id();</div><div class='del'>-	int apicid = hard_smp_processor_id();</div><div class='del'>-</div><div class='del'>-	/* Don't do the funky fallback heuristics the AMD version employs</div><div class='del'>-	   for now. */</div><div class='del'>-	node = apicid_to_node[apicid];</div><div class='del'>-	if (node == NUMA_NO_NODE || !node_online(node))</div><div class='del'>-		node = first_node(node_online_map);</div><div class='del'>-	numa_set_node(cpu, node);</div><div class='del'>-</div><div class='del'>-	printk(KERN_INFO "CPU %d/%x -&gt; Node %d\n", cpu, apicid, node);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __cpuinit init_intel(struct cpuinfo_x86 *c)</div><div class='del'>-{</div><div class='del'>-	init_intel_cacheinfo(c);</div><div class='del'>-	if (c-&gt;cpuid_level &gt; 9) {</div><div class='del'>-		unsigned eax = cpuid_eax(10);</div><div class='del'>-		/* Check for version and the number of counters */</div><div class='del'>-		if ((eax &amp; 0xff) &amp;&amp; (((eax&gt;&gt;8) &amp; 0xff) &gt; 1))</div><div class='del'>-			set_cpu_cap(c, X86_FEATURE_ARCH_PERFMON);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (cpu_has_ds) {</div><div class='del'>-		unsigned int l1, l2;</div><div class='del'>-		rdmsr(MSR_IA32_MISC_ENABLE, l1, l2);</div><div class='del'>-		if (!(l1 &amp; (1&lt;&lt;11)))</div><div class='del'>-			set_cpu_cap(c, X86_FEATURE_BTS);</div><div class='del'>-		if (!(l1 &amp; (1&lt;&lt;12)))</div><div class='del'>-			set_cpu_cap(c, X86_FEATURE_PEBS);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	if (cpu_has_bts)</div><div class='del'>-		ds_init_intel(c);</div><div class='del'>-</div><div class='del'>-	if (c-&gt;x86 == 15)</div><div class='del'>-		c-&gt;x86_cache_alignment = c-&gt;x86_clflush_size * 2;</div><div class='del'>-	if (c-&gt;x86 == 6)</div><div class='del'>-		set_cpu_cap(c, X86_FEATURE_REP_GOOD);</div><div class='del'>-	set_cpu_cap(c, X86_FEATURE_LFENCE_RDTSC);</div><div class='del'>-	c-&gt;x86_max_cores = intel_num_cpu_cores(c);</div><div class='del'>-</div><div class='del'>-	srat_detect_node();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct cpu_dev intel_cpu_dev __cpuinitdata = {</div><div class='del'>-	.c_vendor	= "Intel",</div><div class='del'>-	.c_ident	= { "GenuineIntel" },</div><div class='del'>-	.c_early_init   = early_init_intel,</div><div class='del'>-	.c_init		= init_intel,</div><div class='del'>-};</div><div class='del'>-cpu_vendor_dev_register(X86_VENDOR_INTEL, &amp;intel_cpu_dev);</div><div class='del'>-</div><div class='head'>diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c<br/>index 6b0a10b002f1..3f46afbb1cf1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/cpu/intel_cacheinfo.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/cpu/intel_cacheinfo.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/cpu/intel_cacheinfo.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/cpu/intel_cacheinfo.c</a></div><div class='hunk'>@@ -1,8 +1,8 @@</div><div class='ctx'> /*</div><div class='del'>- *      Routines to indentify caches on Intel CPU.</div><div class='add'>+ *	Routines to indentify caches on Intel CPU.</div><div class='ctx'>  *</div><div class='del'>- *      Changes:</div><div class='del'>- *      Venkatesh Pallipadi	: Adding cache identification through cpuid(4)</div><div class='add'>+ *	Changes:</div><div class='add'>+ *	Venkatesh Pallipadi	: Adding cache identification through cpuid(4)</div><div class='ctx'>  *		Ashok Raj &lt;ashok.raj@intel.com&gt;: Work with CPU hotplug infrastructure.</div><div class='ctx'>  *	Andi Kleen / Andreas Herrmann	: CPUID4 emulation on AMD.</div><div class='ctx'>  */</div><div class='hunk'>@@ -13,6 +13,7 @@</div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='ctx'> #include &lt;linux/cpu.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/smp.h&gt;</div><div class='hunk'>@@ -130,9 +131,18 @@ struct _cpuid4_info {</div><div class='ctx'> 	union _cpuid4_leaf_ebx ebx;</div><div class='ctx'> 	union _cpuid4_leaf_ecx ecx;</div><div class='ctx'> 	unsigned long size;</div><div class='add'>+	unsigned long can_disable;</div><div class='ctx'> 	cpumask_t shared_cpu_map;	/* future?: only cpus/node is needed */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PCI</div><div class='add'>+static struct pci_device_id k8_nb_id[] = {</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, 0x1103) },</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, 0x1203) },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> unsigned short			num_cache_leaves;</div><div class='ctx'> </div><div class='ctx'> /* AMD doesn't have CPUID4. Emulate it here to report the same</div><div class='hunk'>@@ -182,9 +192,10 @@ static unsigned short assocs[] __cpuinitdata = {</div><div class='ctx'> static unsigned char levels[] __cpuinitdata = { 1, 1, 2, 3 };</div><div class='ctx'> static unsigned char types[] __cpuinitdata = { 1, 2, 3, 3 };</div><div class='ctx'> </div><div class='del'>-static void __cpuinit amd_cpuid4(int leaf, union _cpuid4_leaf_eax *eax,</div><div class='del'>-		       union _cpuid4_leaf_ebx *ebx,</div><div class='del'>-		       union _cpuid4_leaf_ecx *ecx)</div><div class='add'>+static void __cpuinit</div><div class='add'>+amd_cpuid4(int leaf, union _cpuid4_leaf_eax *eax,</div><div class='add'>+		     union _cpuid4_leaf_ebx *ebx,</div><div class='add'>+		     union _cpuid4_leaf_ecx *ecx)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned dummy;</div><div class='ctx'> 	unsigned line_size, lines_per_tag, assoc, size_in_kb;</div><div class='hunk'>@@ -251,27 +262,40 @@ static void __cpuinit amd_cpuid4(int leaf, union _cpuid4_leaf_eax *eax,</div><div class='ctx'> 		(ebx-&gt;split.ways_of_associativity + 1) - 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __cpuinit cpuid4_cache_lookup(int index, struct _cpuid4_info *this_leaf)</div><div class='add'>+static void __cpuinit</div><div class='add'>+amd_check_l3_disable(int index, struct _cpuid4_info *this_leaf)</div><div class='add'>+{</div><div class='add'>+	if (index &lt; 3)</div><div class='add'>+		return;</div><div class='add'>+	this_leaf-&gt;can_disable = 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+__cpuinit cpuid4_cache_lookup(int index, struct _cpuid4_info *this_leaf)</div><div class='ctx'> {</div><div class='ctx'> 	union _cpuid4_leaf_eax 	eax;</div><div class='ctx'> 	union _cpuid4_leaf_ebx 	ebx;</div><div class='ctx'> 	union _cpuid4_leaf_ecx 	ecx;</div><div class='ctx'> 	unsigned		edx;</div><div class='ctx'> </div><div class='del'>-	if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD)</div><div class='add'>+	if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD) {</div><div class='ctx'> 		amd_cpuid4(index, &amp;eax, &amp;ebx, &amp;ecx);</div><div class='del'>-	else</div><div class='del'>-		cpuid_count(4, index, &amp;eax.full, &amp;ebx.full, &amp;ecx.full,  &amp;edx);</div><div class='add'>+		if (boot_cpu_data.x86 &gt;= 0x10)</div><div class='add'>+			amd_check_l3_disable(index, this_leaf);</div><div class='add'>+	} else {</div><div class='add'>+		cpuid_count(4, index, &amp;eax.full, &amp;ebx.full, &amp;ecx.full, &amp;edx);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (eax.split.type == CACHE_TYPE_NULL)</div><div class='ctx'> 		return -EIO; /* better error ? */</div><div class='ctx'> </div><div class='ctx'> 	this_leaf-&gt;eax = eax;</div><div class='ctx'> 	this_leaf-&gt;ebx = ebx;</div><div class='ctx'> 	this_leaf-&gt;ecx = ecx;</div><div class='del'>-	this_leaf-&gt;size = (ecx.split.number_of_sets + 1) *</div><div class='del'>-		(ebx.split.coherency_line_size + 1) *</div><div class='del'>-		(ebx.split.physical_line_partition + 1) *</div><div class='del'>-		(ebx.split.ways_of_associativity + 1);</div><div class='add'>+	this_leaf-&gt;size = (ecx.split.number_of_sets          + 1) *</div><div class='add'>+			  (ebx.split.coherency_line_size     + 1) *</div><div class='add'>+			  (ebx.split.physical_line_partition + 1) *</div><div class='add'>+			  (ebx.split.ways_of_associativity   + 1);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -453,7 +477,7 @@ unsigned int __cpuinit init_intel_cacheinfo(struct cpuinfo_x86 *c)</div><div class='ctx'> </div><div class='ctx'> /* pointer to _cpuid4_info array (for each cache leaf) */</div><div class='ctx'> static DEFINE_PER_CPU(struct _cpuid4_info *, cpuid4_info);</div><div class='del'>-#define CPUID4_INFO_IDX(x, y)    (&amp;((per_cpu(cpuid4_info, x))[y]))</div><div class='add'>+#define CPUID4_INFO_IDX(x, y)	(&amp;((per_cpu(cpuid4_info, x))[y]))</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> static void __cpuinit cache_shared_cpu_map_setup(unsigned int cpu, int index)</div><div class='hunk'>@@ -490,7 +514,7 @@ static void __cpuinit cache_remove_shared_cpu_map(unsigned int cpu, int index)</div><div class='ctx'> </div><div class='ctx'> 	this_leaf = CPUID4_INFO_IDX(cpu, index);</div><div class='ctx'> 	for_each_cpu_mask_nr(sibling, this_leaf-&gt;shared_cpu_map) {</div><div class='del'>-		sibling_leaf = CPUID4_INFO_IDX(sibling, index);	</div><div class='add'>+		sibling_leaf = CPUID4_INFO_IDX(sibling, index);</div><div class='ctx'> 		cpu_clear(cpu, sibling_leaf-&gt;shared_cpu_map);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -572,7 +596,7 @@ struct _index_kobject {</div><div class='ctx'> </div><div class='ctx'> /* pointer to array of kobjects for cpuX/cache/indexY */</div><div class='ctx'> static DEFINE_PER_CPU(struct _index_kobject *, index_kobject);</div><div class='del'>-#define INDEX_KOBJECT_PTR(x, y)    (&amp;((per_cpu(index_kobject, x))[y]))</div><div class='add'>+#define INDEX_KOBJECT_PTR(x, y)		(&amp;((per_cpu(index_kobject, x))[y]))</div><div class='ctx'> </div><div class='ctx'> #define show_one_plus(file_name, object, val)				\</div><div class='ctx'> static ssize_t show_##file_name						\</div><div class='hunk'>@@ -637,6 +661,99 @@ static ssize_t show_type(struct _cpuid4_info *this_leaf, char *buf) {</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define to_object(k)	container_of(k, struct _index_kobject, kobj)</div><div class='add'>+#define to_attr(a)	container_of(a, struct _cache_attr, attr)</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PCI</div><div class='add'>+static struct pci_dev *get_k8_northbridge(int node)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *dev = NULL;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt;= node; i++) {</div><div class='add'>+		do {</div><div class='add'>+			dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev);</div><div class='add'>+			if (!dev)</div><div class='add'>+				break;</div><div class='add'>+		} while (!pci_match_id(&amp;k8_nb_id[0], dev));</div><div class='add'>+		if (!dev)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	return dev;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static struct pci_dev *get_k8_northbridge(int node)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static ssize_t show_cache_disable(struct _cpuid4_info *this_leaf, char *buf)</div><div class='add'>+{</div><div class='add'>+	int node = cpu_to_node(first_cpu(this_leaf-&gt;shared_cpu_map));</div><div class='add'>+	struct pci_dev *dev = NULL;</div><div class='add'>+	ssize_t ret = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!this_leaf-&gt;can_disable)</div><div class='add'>+		return sprintf(buf, "Feature not enabled\n");</div><div class='add'>+</div><div class='add'>+	dev = get_k8_northbridge(node);</div><div class='add'>+	if (!dev) {</div><div class='add'>+		printk(KERN_ERR "Attempting AMD northbridge operation on a system with no northbridge\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 2; i++) {</div><div class='add'>+		unsigned int reg;</div><div class='add'>+</div><div class='add'>+		pci_read_config_dword(dev, 0x1BC + i * 4, &amp;reg);</div><div class='add'>+</div><div class='add'>+		ret += sprintf(buf, "%sEntry: %d\n", buf, i);</div><div class='add'>+		ret += sprintf(buf, "%sReads:  %s\tNew Entries: %s\n",  </div><div class='add'>+			buf,</div><div class='add'>+			reg &amp; 0x80000000 ? "Disabled" : "Allowed",</div><div class='add'>+			reg &amp; 0x40000000 ? "Disabled" : "Allowed");</div><div class='add'>+		ret += sprintf(buf, "%sSubCache: %x\tIndex: %x\n",</div><div class='add'>+			buf, (reg &amp; 0x30000) &gt;&gt; 16, reg &amp; 0xfff);</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+store_cache_disable(struct _cpuid4_info *this_leaf, const char *buf,</div><div class='add'>+		    size_t count)</div><div class='add'>+{</div><div class='add'>+	int node = cpu_to_node(first_cpu(this_leaf-&gt;shared_cpu_map));</div><div class='add'>+	struct pci_dev *dev = NULL;</div><div class='add'>+	unsigned int ret, index, val;</div><div class='add'>+</div><div class='add'>+	if (!this_leaf-&gt;can_disable)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (strlen(buf) &gt; 15)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ret = sscanf(buf, "%x %x", &amp;index, &amp;val);</div><div class='add'>+	if (ret != 2)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (index &gt; 1)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	val |= 0xc0000000;</div><div class='add'>+	dev = get_k8_northbridge(node);</div><div class='add'>+	if (!dev) {</div><div class='add'>+		printk(KERN_ERR "Attempting AMD northbridge operation on a system with no northbridge\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pci_write_config_dword(dev, 0x1BC + index * 4, val &amp; ~0x40000000);</div><div class='add'>+	wbinvd();</div><div class='add'>+	pci_write_config_dword(dev, 0x1BC + index * 4, val);</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> struct _cache_attr {</div><div class='ctx'> 	struct attribute attr;</div><div class='ctx'> 	ssize_t (*show)(struct _cpuid4_info *, char *);</div><div class='hunk'>@@ -657,6 +774,8 @@ define_one_ro(size);</div><div class='ctx'> define_one_ro(shared_cpu_map);</div><div class='ctx'> define_one_ro(shared_cpu_list);</div><div class='ctx'> </div><div class='add'>+static struct _cache_attr cache_disable = __ATTR(cache_disable, 0644, show_cache_disable, store_cache_disable);</div><div class='add'>+</div><div class='ctx'> static struct attribute * default_attrs[] = {</div><div class='ctx'> 	&amp;type.attr,</div><div class='ctx'> 	&amp;level.attr,</div><div class='hunk'>@@ -667,12 +786,10 @@ static struct attribute * default_attrs[] = {</div><div class='ctx'> 	&amp;size.attr,</div><div class='ctx'> 	&amp;shared_cpu_map.attr,</div><div class='ctx'> 	&amp;shared_cpu_list.attr,</div><div class='add'>+	&amp;cache_disable.attr,</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define to_object(k) container_of(k, struct _index_kobject, kobj)</div><div class='del'>-#define to_attr(a) container_of(a, struct _cache_attr, attr)</div><div class='del'>-</div><div class='ctx'> static ssize_t show(struct kobject * kobj, struct attribute * attr, char * buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct _cache_attr *fattr = to_attr(attr);</div><div class='hunk'>@@ -682,14 +799,22 @@ static ssize_t show(struct kobject * kobj, struct attribute * attr, char * buf)</div><div class='ctx'> 	ret = fattr-&gt;show ?</div><div class='ctx'> 		fattr-&gt;show(CPUID4_INFO_IDX(this_leaf-&gt;cpu, this_leaf-&gt;index),</div><div class='ctx'> 			buf) :</div><div class='del'>-	       	0;</div><div class='add'>+		0;</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t store(struct kobject * kobj, struct attribute * attr,</div><div class='ctx'> 		     const char * buf, size_t count)</div><div class='ctx'> {</div><div class='del'>-	return 0;</div><div class='add'>+	struct _cache_attr *fattr = to_attr(attr);</div><div class='add'>+	struct _index_kobject *this_leaf = to_object(kobj);</div><div class='add'>+	ssize_t ret;</div><div class='add'>+</div><div class='add'>+	ret = fattr-&gt;store ?</div><div class='add'>+		fattr-&gt;store(CPUID4_INFO_IDX(this_leaf-&gt;cpu, this_leaf-&gt;index),</div><div class='add'>+			buf, count) :</div><div class='add'>+		0;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct sysfs_ops sysfs_ops = {</div><div class='head'>diff --git a/arch/x86/kernel/cpu/mcheck/mce_64.c b/arch/x86/kernel/cpu/mcheck/mce_64.c<br/>index 726a5fcdf341..4b031a4ac856 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/cpu/mcheck/mce_64.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/cpu/mcheck/mce_64.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/cpu/mcheck/mce_64.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/cpu/mcheck/mce_64.c</a></div><div class='hunk'>@@ -860,7 +860,7 @@ error:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mce_remove_device(unsigned int cpu)</div><div class='add'>+static __cpuinit void mce_remove_device(unsigned int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kernel/cpu/mkcapflags.pl b/arch/x86/kernel/cpu/mkcapflags.pl<br/>new file mode 100644<br/>index 000000000000..dfea390e1608<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/cpu/mkcapflags.pl?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/cpu/mkcapflags.pl</a></div><div class='hunk'>@@ -0,0 +1,32 @@</div><div class='add'>+#!/usr/bin/perl</div><div class='add'>+#</div><div class='add'>+# Generate the x86_cap_flags[] array from include/asm-x86/cpufeature.h</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+($in, $out) = @ARGV;</div><div class='add'>+</div><div class='add'>+open(IN, "&lt; $in\0")   or die "$0: cannot open: $in: $!\n";</div><div class='add'>+open(OUT, "&gt; $out\0") or die "$0: cannot create: $out: $!\n";</div><div class='add'>+</div><div class='add'>+print OUT "#include &lt;asm/cpufeature.h&gt;\n\n";</div><div class='add'>+print OUT "const char * const x86_cap_flags[NCAPINTS*32] = {\n";</div><div class='add'>+</div><div class='add'>+while (defined($line = &lt;IN&gt;)) {</div><div class='add'>+	if ($line =~ /^\s*\#\s*define\s+(X86_FEATURE_(\S+))\s+(.*)$/) {</div><div class='add'>+		$macro = $1;</div><div class='add'>+		$feature = $2;</div><div class='add'>+		$tail = $3;</div><div class='add'>+		if ($tail =~ /\/\*\s*\"([^"]*)\".*\*\//) {</div><div class='add'>+			$feature = $1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if ($feature ne '') {</div><div class='add'>+			printf OUT "\t%-32s = \"%s\",\n",</div><div class='add'>+				"[$macro]", "\L$feature";</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+print OUT "};\n";</div><div class='add'>+</div><div class='add'>+close(IN);</div><div class='add'>+close(OUT);</div><div class='head'>diff --git a/arch/x86/kernel/cpu/mtrr/generic.c b/arch/x86/kernel/cpu/mtrr/generic.c<br/>index cb7d3b6a80eb..4e8d77f01eeb 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/cpu/mtrr/generic.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/cpu/mtrr/generic.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/cpu/mtrr/generic.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/cpu/mtrr/generic.c</a></div><div class='hunk'>@@ -401,12 +401,7 @@ static void generic_get_mtrr(unsigned int reg, unsigned long *base,</div><div class='ctx'> 		tmp |= ~((1&lt;&lt;(hi - 1)) - 1);</div><div class='ctx'> </div><div class='ctx'> 		if (tmp != mask_lo) {</div><div class='del'>-			static int once = 1;</div><div class='del'>-</div><div class='del'>-			if (once) {</div><div class='del'>-				printk(KERN_INFO "mtrr: your BIOS has set up an incorrect mask, fixing it up.\n");</div><div class='del'>-				once = 0;</div><div class='del'>-			}</div><div class='add'>+			WARN_ONCE(1, KERN_INFO "mtrr: your BIOS has set up an incorrect mask, fixing it up.\n");</div><div class='ctx'> 			mask_lo = tmp;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/x86/kernel/cpu/mtrr/if.c b/arch/x86/kernel/cpu/mtrr/if.c<br/>index 84c480bb3715..4c4214690dd1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/cpu/mtrr/if.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/cpu/mtrr/if.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/cpu/mtrr/if.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/cpu/mtrr/if.c</a></div><div class='hunk'>@@ -405,9 +405,9 @@ static int mtrr_seq_show(struct seq_file *seq, void *offset)</div><div class='ctx'> 			}</div><div class='ctx'> 			/* RED-PEN: base can be &gt; 32bit */ </div><div class='ctx'> 			len += seq_printf(seq, </div><div class='del'>-				   "reg%02i: base=0x%05lx000 (%4luMB), size=%4lu%cB: %s, count=%d\n",</div><div class='add'>+				   "reg%02i: base=0x%06lx000 (%5luMB), size=%5lu%cB, count=%d: %s\n",</div><div class='ctx'> 			     i, base, base &gt;&gt; (20 - PAGE_SHIFT), size, factor,</div><div class='del'>-			     mtrr_attrib_to_str(type), mtrr_usage_table[i]);</div><div class='add'>+			     mtrr_usage_table[i], mtrr_attrib_to_str(type));</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c<br/>index 885c8265e6b5..c78c04821ea1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/cpu/mtrr/main.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/cpu/mtrr/main.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/cpu/mtrr/main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/cpu/mtrr/main.c</a></div><div class='hunk'>@@ -729,7 +729,7 @@ struct var_mtrr_range_state {</div><div class='ctx'> 	mtrr_type type;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct var_mtrr_range_state __initdata range_state[RANGE_NUM];</div><div class='add'>+static struct var_mtrr_range_state __initdata range_state[RANGE_NUM];</div><div class='ctx'> static int __initdata debug_print;</div><div class='ctx'> </div><div class='ctx'> static int __init</div><div class='hunk'>@@ -759,7 +759,8 @@ x86_get_mtrr_mem_range(struct res_range *range, int nr_range,</div><div class='ctx'> 	/* take out UC ranges */</div><div class='ctx'> 	for (i = 0; i &lt; num_var_ranges; i++) {</div><div class='ctx'> 		type = range_state[i].type;</div><div class='del'>-		if (type != MTRR_TYPE_UNCACHABLE)</div><div class='add'>+		if (type != MTRR_TYPE_UNCACHABLE &amp;&amp;</div><div class='add'>+		    type != MTRR_TYPE_WRPROT)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		size = range_state[i].size_pfn;</div><div class='ctx'> 		if (!size)</div><div class='hunk'>@@ -836,6 +837,13 @@ static int __init enable_mtrr_cleanup_setup(char *str)</div><div class='ctx'> }</div><div class='ctx'> early_param("enable_mtrr_cleanup", enable_mtrr_cleanup_setup);</div><div class='ctx'> </div><div class='add'>+static int __init mtrr_cleanup_debug_setup(char *str)</div><div class='add'>+{</div><div class='add'>+	debug_print = 1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+early_param("mtrr_cleanup_debug", mtrr_cleanup_debug_setup);</div><div class='add'>+</div><div class='ctx'> struct var_mtrr_state {</div><div class='ctx'> 	unsigned long	range_startk;</div><div class='ctx'> 	unsigned long	range_sizek;</div><div class='hunk'>@@ -898,6 +906,27 @@ set_var_mtrr_all(unsigned int address_bits)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static unsigned long to_size_factor(unsigned long sizek, char *factorp)</div><div class='add'>+{</div><div class='add'>+	char factor;</div><div class='add'>+	unsigned long base = sizek;</div><div class='add'>+</div><div class='add'>+	if (base &amp; ((1&lt;&lt;10) - 1)) {</div><div class='add'>+		/* not MB alignment */</div><div class='add'>+		factor = 'K';</div><div class='add'>+	} else if (base &amp; ((1&lt;&lt;20) - 1)){</div><div class='add'>+		factor = 'M';</div><div class='add'>+		base &gt;&gt;= 10;</div><div class='add'>+	} else {</div><div class='add'>+		factor = 'G';</div><div class='add'>+		base &gt;&gt;= 20;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*factorp = factor;</div><div class='add'>+</div><div class='add'>+	return base;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static unsigned int __init</div><div class='ctx'> range_to_mtrr(unsigned int reg, unsigned long range_startk,</div><div class='ctx'> 	      unsigned long range_sizek, unsigned char type)</div><div class='hunk'>@@ -919,13 +948,21 @@ range_to_mtrr(unsigned int reg, unsigned long range_startk,</div><div class='ctx'> 			align = max_align;</div><div class='ctx'> </div><div class='ctx'> 		sizek = 1 &lt;&lt; align;</div><div class='del'>-		if (debug_print)</div><div class='add'>+		if (debug_print) {</div><div class='add'>+			char start_factor = 'K', size_factor = 'K';</div><div class='add'>+			unsigned long start_base, size_base;</div><div class='add'>+</div><div class='add'>+			start_base = to_size_factor(range_startk, &amp;start_factor),</div><div class='add'>+			size_base = to_size_factor(sizek, &amp;size_factor),</div><div class='add'>+</div><div class='ctx'> 			printk(KERN_DEBUG "Setting variable MTRR %d, "</div><div class='del'>-				"base: %ldMB, range: %ldMB, type %s\n",</div><div class='del'>-				reg, range_startk &gt;&gt; 10, sizek &gt;&gt; 10,</div><div class='add'>+				"base: %ld%cB, range: %ld%cB, type %s\n",</div><div class='add'>+				reg, start_base, start_factor,</div><div class='add'>+				size_base, size_factor,</div><div class='ctx'> 				(type == MTRR_TYPE_UNCACHABLE)?"UC":</div><div class='ctx'> 				    ((type == MTRR_TYPE_WRBACK)?"WB":"Other")</div><div class='ctx'> 				);</div><div class='add'>+		}</div><div class='ctx'> 		save_var_mtrr(reg++, range_startk, sizek, type);</div><div class='ctx'> 		range_startk += sizek;</div><div class='ctx'> 		range_sizek -= sizek;</div><div class='hunk'>@@ -970,6 +1007,8 @@ range_to_mtrr_with_hole(struct var_mtrr_state *state, unsigned long basek,</div><div class='ctx'> 	/* try to append some small hole */</div><div class='ctx'> 	range0_basek = state-&gt;range_startk;</div><div class='ctx'> 	range0_sizek = ALIGN(state-&gt;range_sizek, chunk_sizek);</div><div class='add'>+</div><div class='add'>+	/* no increase */</div><div class='ctx'> 	if (range0_sizek == state-&gt;range_sizek) {</div><div class='ctx'> 		if (debug_print)</div><div class='ctx'> 			printk(KERN_DEBUG "rangeX: %016lx - %016lx\n",</div><div class='hunk'>@@ -980,13 +1019,40 @@ range_to_mtrr_with_hole(struct var_mtrr_state *state, unsigned long basek,</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	range0_sizek -= chunk_sizek;</div><div class='del'>-	if (range0_sizek &amp;&amp; sizek) {</div><div class='del'>-	    while (range0_basek + range0_sizek &gt; (basek + sizek)) {</div><div class='del'>-		range0_sizek -= chunk_sizek;</div><div class='del'>-		if (!range0_sizek)</div><div class='del'>-			break;</div><div class='del'>-	    }</div><div class='add'>+	/* only cut back, when it is not the last */</div><div class='add'>+	if (sizek) {</div><div class='add'>+		while (range0_basek + range0_sizek &gt; (basek + sizek)) {</div><div class='add'>+			if (range0_sizek &gt;= chunk_sizek)</div><div class='add'>+				range0_sizek -= chunk_sizek;</div><div class='add'>+			else</div><div class='add'>+				range0_sizek = 0;</div><div class='add'>+</div><div class='add'>+			if (!range0_sizek)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+second_try:</div><div class='add'>+	range_basek = range0_basek + range0_sizek;</div><div class='add'>+</div><div class='add'>+	/* one hole in the middle */</div><div class='add'>+	if (range_basek &gt; basek &amp;&amp; range_basek &lt;= (basek + sizek))</div><div class='add'>+		second_sizek = range_basek - basek;</div><div class='add'>+</div><div class='add'>+	if (range0_sizek &gt; state-&gt;range_sizek) {</div><div class='add'>+</div><div class='add'>+		/* one hole in middle or at end */</div><div class='add'>+		hole_sizek = range0_sizek - state-&gt;range_sizek - second_sizek;</div><div class='add'>+</div><div class='add'>+		/* hole size should be less than half of range0 size */</div><div class='add'>+		if (hole_sizek &gt;= (range0_sizek &gt;&gt; 1) &amp;&amp;</div><div class='add'>+		    range0_sizek &gt;= chunk_sizek) {</div><div class='add'>+			range0_sizek -= chunk_sizek;</div><div class='add'>+			second_sizek = 0;</div><div class='add'>+			hole_sizek = 0;</div><div class='add'>+</div><div class='add'>+			goto second_try;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (range0_sizek) {</div><div class='hunk'>@@ -996,50 +1062,28 @@ range_to_mtrr_with_hole(struct var_mtrr_state *state, unsigned long basek,</div><div class='ctx'> 				(range0_basek + range0_sizek)&lt;&lt;10);</div><div class='ctx'> 		state-&gt;reg = range_to_mtrr(state-&gt;reg, range0_basek,</div><div class='ctx'> 				range0_sizek, MTRR_TYPE_WRBACK);</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	range_basek = range0_basek + range0_sizek;</div><div class='del'>-	range_sizek = chunk_sizek;</div><div class='del'>-</div><div class='del'>-	if (range_basek + range_sizek &gt; basek &amp;&amp;</div><div class='del'>-	    range_basek + range_sizek &lt;= (basek + sizek)) {</div><div class='del'>-		/* one hole */</div><div class='del'>-		second_basek = basek;</div><div class='del'>-		second_sizek = range_basek + range_sizek - basek;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* if last piece, only could one hole near end */</div><div class='del'>-	if ((second_basek || !basek) &amp;&amp;</div><div class='del'>-	    range_sizek - (state-&gt;range_sizek - range0_sizek) - second_sizek &lt;</div><div class='del'>-	    (chunk_sizek &gt;&gt; 1)) {</div><div class='del'>-		/*</div><div class='del'>-		 * one hole in middle (second_sizek is 0) or at end</div><div class='del'>-		 * (second_sizek is 0 )</div><div class='del'>-		 */</div><div class='del'>-		hole_sizek = range_sizek - (state-&gt;range_sizek - range0_sizek)</div><div class='del'>-				 - second_sizek;</div><div class='del'>-		hole_basek = range_basek + range_sizek - hole_sizek</div><div class='del'>-				 - second_sizek;</div><div class='del'>-	} else {</div><div class='del'>-		/* fallback for big hole, or several holes */</div><div class='add'>+	if (range0_sizek &lt; state-&gt;range_sizek) {</div><div class='add'>+		/* need to handle left over */</div><div class='ctx'> 		range_sizek = state-&gt;range_sizek - range0_sizek;</div><div class='del'>-		second_basek = 0;</div><div class='del'>-		second_sizek = 0;</div><div class='add'>+</div><div class='add'>+		if (debug_print)</div><div class='add'>+			printk(KERN_DEBUG "range: %016lx - %016lx\n",</div><div class='add'>+				 range_basek&lt;&lt;10,</div><div class='add'>+				 (range_basek + range_sizek)&lt;&lt;10);</div><div class='add'>+		state-&gt;reg = range_to_mtrr(state-&gt;reg, range_basek,</div><div class='add'>+				 range_sizek, MTRR_TYPE_WRBACK);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (debug_print)</div><div class='del'>-		printk(KERN_DEBUG "range: %016lx - %016lx\n", range_basek&lt;&lt;10,</div><div class='del'>-			 (range_basek + range_sizek)&lt;&lt;10);</div><div class='del'>-	state-&gt;reg = range_to_mtrr(state-&gt;reg, range_basek, range_sizek,</div><div class='del'>-					 MTRR_TYPE_WRBACK);</div><div class='ctx'> 	if (hole_sizek) {</div><div class='add'>+		hole_basek = range_basek - hole_sizek - second_sizek;</div><div class='ctx'> 		if (debug_print)</div><div class='ctx'> 			printk(KERN_DEBUG "hole: %016lx - %016lx\n",</div><div class='del'>-				 hole_basek&lt;&lt;10, (hole_basek + hole_sizek)&lt;&lt;10);</div><div class='del'>-		state-&gt;reg = range_to_mtrr(state-&gt;reg, hole_basek, hole_sizek,</div><div class='del'>-						 MTRR_TYPE_UNCACHABLE);</div><div class='del'>-</div><div class='add'>+				 hole_basek&lt;&lt;10,</div><div class='add'>+				 (hole_basek + hole_sizek)&lt;&lt;10);</div><div class='add'>+		state-&gt;reg = range_to_mtrr(state-&gt;reg, hole_basek,</div><div class='add'>+				 hole_sizek, MTRR_TYPE_UNCACHABLE);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return second_sizek;</div><div class='hunk'>@@ -1154,11 +1198,11 @@ struct mtrr_cleanup_result {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * gran_size: 1M, 2M, ..., 2G</div><div class='del'>- * chunk size: gran_size, ..., 4G</div><div class='del'>- * so we need (2+13)*6</div><div class='add'>+ * gran_size: 64K, 128K, 256K, 512K, 1M, 2M, ..., 2G</div><div class='add'>+ * chunk size: gran_size, ..., 2G</div><div class='add'>+ * so we need (1+16)*8</div><div class='ctx'>  */</div><div class='del'>-#define NUM_RESULT	90</div><div class='add'>+#define NUM_RESULT	136</div><div class='ctx'> #define PSHIFT		(PAGE_SHIFT - 10)</div><div class='ctx'> </div><div class='ctx'> static struct mtrr_cleanup_result __initdata result[NUM_RESULT];</div><div class='hunk'>@@ -1168,13 +1212,14 @@ static unsigned long __initdata min_loss_pfn[RANGE_NUM];</div><div class='ctx'> static int __init mtrr_cleanup(unsigned address_bits)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long extra_remove_base, extra_remove_size;</div><div class='del'>-	unsigned long i, base, size, def, dummy;</div><div class='add'>+	unsigned long base, size, def, dummy;</div><div class='ctx'> 	mtrr_type type;</div><div class='ctx'> 	int nr_range, nr_range_new;</div><div class='ctx'> 	u64 chunk_size, gran_size;</div><div class='ctx'> 	unsigned long range_sums, range_sums_new;</div><div class='ctx'> 	int index_good;</div><div class='ctx'> 	int num_reg_good;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	/* extra one for all 0 */</div><div class='ctx'> 	int num[MTRR_NUM_TYPES + 1];</div><div class='hunk'>@@ -1204,6 +1249,8 @@ static int __init mtrr_cleanup(unsigned address_bits)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		if (!size)</div><div class='ctx'> 			type = MTRR_NUM_TYPES;</div><div class='add'>+		if (type == MTRR_TYPE_WRPROT)</div><div class='add'>+			type = MTRR_TYPE_UNCACHABLE;</div><div class='ctx'> 		num[type]++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1216,23 +1263,57 @@ static int __init mtrr_cleanup(unsigned address_bits)</div><div class='ctx'> 		num_var_ranges - num[MTRR_NUM_TYPES])</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	/* print original var MTRRs at first, for debugging: */</div><div class='add'>+	printk(KERN_DEBUG "original variable MTRRs\n");</div><div class='add'>+	for (i = 0; i &lt; num_var_ranges; i++) {</div><div class='add'>+		char start_factor = 'K', size_factor = 'K';</div><div class='add'>+		unsigned long start_base, size_base;</div><div class='add'>+</div><div class='add'>+		size_base = range_state[i].size_pfn &lt;&lt; (PAGE_SHIFT - 10);</div><div class='add'>+		if (!size_base)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		size_base = to_size_factor(size_base, &amp;size_factor),</div><div class='add'>+		start_base = range_state[i].base_pfn &lt;&lt; (PAGE_SHIFT - 10);</div><div class='add'>+		start_base = to_size_factor(start_base, &amp;start_factor),</div><div class='add'>+		type = range_state[i].type;</div><div class='add'>+</div><div class='add'>+		printk(KERN_DEBUG "reg %d, base: %ld%cB, range: %ld%cB, type %s\n",</div><div class='add'>+			i, start_base, start_factor,</div><div class='add'>+			size_base, size_factor,</div><div class='add'>+			(type == MTRR_TYPE_UNCACHABLE) ? "UC" :</div><div class='add'>+			    ((type == MTRR_TYPE_WRPROT) ? "WP" :</div><div class='add'>+			     ((type == MTRR_TYPE_WRBACK) ? "WB" : "Other"))</div><div class='add'>+			);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	memset(range, 0, sizeof(range));</div><div class='ctx'> 	extra_remove_size = 0;</div><div class='del'>-	if (mtrr_tom2) {</div><div class='del'>-		extra_remove_base = 1 &lt;&lt; (32 - PAGE_SHIFT);</div><div class='add'>+	extra_remove_base = 1 &lt;&lt; (32 - PAGE_SHIFT);</div><div class='add'>+	if (mtrr_tom2)</div><div class='ctx'> 		extra_remove_size =</div><div class='ctx'> 			(mtrr_tom2 &gt;&gt; PAGE_SHIFT) - extra_remove_base;</div><div class='del'>-	}</div><div class='ctx'> 	nr_range = x86_get_mtrr_mem_range(range, 0, extra_remove_base,</div><div class='ctx'> 					  extra_remove_size);</div><div class='add'>+	/*</div><div class='add'>+	 * [0, 1M) should always be coverred by var mtrr with WB</div><div class='add'>+	 * and fixed mtrrs should take effective before var mtrr for it</div><div class='add'>+	 */</div><div class='add'>+	nr_range = add_range_with_merge(range, nr_range, 0,</div><div class='add'>+					(1ULL&lt;&lt;(20 - PAGE_SHIFT)) - 1);</div><div class='add'>+	/* sort the ranges */</div><div class='add'>+	sort(range, nr_range, sizeof(struct res_range), cmp_range, NULL);</div><div class='add'>+</div><div class='ctx'> 	range_sums = sum_ranges(range, nr_range);</div><div class='ctx'> 	printk(KERN_INFO "total RAM coverred: %ldM\n",</div><div class='ctx'> 	       range_sums &gt;&gt; (20 - PAGE_SHIFT));</div><div class='ctx'> </div><div class='ctx'> 	if (mtrr_chunk_size &amp;&amp; mtrr_gran_size) {</div><div class='ctx'> 		int num_reg;</div><div class='add'>+		char gran_factor, chunk_factor, lose_factor;</div><div class='add'>+		unsigned long gran_base, chunk_base, lose_base;</div><div class='ctx'> </div><div class='del'>-		debug_print = 1;</div><div class='add'>+		debug_print++;</div><div class='ctx'> 		/* convert ranges to var ranges state */</div><div class='ctx'> 		num_reg = x86_setup_var_mtrrs(range, nr_range, mtrr_chunk_size,</div><div class='ctx'> 					      mtrr_gran_size);</div><div class='hunk'>@@ -1256,34 +1337,48 @@ static int __init mtrr_cleanup(unsigned address_bits)</div><div class='ctx'> 			result[i].lose_cover_sizek =</div><div class='ctx'> 				(range_sums - range_sums_new) &lt;&lt; PSHIFT;</div><div class='ctx'> </div><div class='del'>-		printk(KERN_INFO "%sgran_size: %ldM \tchunk_size: %ldM \t",</div><div class='del'>-			 result[i].bad?"*BAD*":" ", result[i].gran_sizek &gt;&gt; 10,</div><div class='del'>-			 result[i].chunk_sizek &gt;&gt; 10);</div><div class='del'>-		printk(KERN_CONT "num_reg: %d  \tlose cover RAM: %s%ldM \n",</div><div class='add'>+		gran_base = to_size_factor(result[i].gran_sizek, &amp;gran_factor),</div><div class='add'>+		chunk_base = to_size_factor(result[i].chunk_sizek, &amp;chunk_factor),</div><div class='add'>+		lose_base = to_size_factor(result[i].lose_cover_sizek, &amp;lose_factor),</div><div class='add'>+		printk(KERN_INFO "%sgran_size: %ld%c \tchunk_size: %ld%c \t",</div><div class='add'>+			 result[i].bad?"*BAD*":" ",</div><div class='add'>+			 gran_base, gran_factor, chunk_base, chunk_factor);</div><div class='add'>+		printk(KERN_CONT "num_reg: %d  \tlose cover RAM: %s%ld%c\n",</div><div class='ctx'> 			 result[i].num_reg, result[i].bad?"-":"",</div><div class='del'>-			 result[i].lose_cover_sizek &gt;&gt; 10);</div><div class='add'>+			 lose_base, lose_factor);</div><div class='ctx'> 		if (!result[i].bad) {</div><div class='ctx'> 			set_var_mtrr_all(address_bits);</div><div class='ctx'> 			return 1;</div><div class='ctx'> 		}</div><div class='ctx'> 		printk(KERN_INFO "invalid mtrr_gran_size or mtrr_chunk_size, "</div><div class='ctx'> 		       "will find optimal one\n");</div><div class='del'>-		debug_print = 0;</div><div class='add'>+		debug_print--;</div><div class='ctx'> 		memset(result, 0, sizeof(result[0]));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	i = 0;</div><div class='ctx'> 	memset(min_loss_pfn, 0xff, sizeof(min_loss_pfn));</div><div class='ctx'> 	memset(result, 0, sizeof(result));</div><div class='del'>-	for (gran_size = (1ULL&lt;&lt;20); gran_size &lt; (1ULL&lt;&lt;32); gran_size &lt;&lt;= 1) {</div><div class='del'>-		for (chunk_size = gran_size; chunk_size &lt; (1ULL&lt;&lt;33);</div><div class='add'>+	for (gran_size = (1ULL&lt;&lt;16); gran_size &lt; (1ULL&lt;&lt;32); gran_size &lt;&lt;= 1) {</div><div class='add'>+		char gran_factor;</div><div class='add'>+		unsigned long gran_base;</div><div class='add'>+</div><div class='add'>+		if (debug_print)</div><div class='add'>+			gran_base = to_size_factor(gran_size &gt;&gt; 10, &amp;gran_factor);</div><div class='add'>+</div><div class='add'>+		for (chunk_size = gran_size; chunk_size &lt; (1ULL&lt;&lt;32);</div><div class='ctx'> 		     chunk_size &lt;&lt;= 1) {</div><div class='ctx'> 			int num_reg;</div><div class='ctx'> </div><div class='del'>-			if (debug_print)</div><div class='del'>-				printk(KERN_INFO</div><div class='del'>-			       "\ngran_size: %lldM   chunk_size_size: %lldM\n",</div><div class='del'>-				       gran_size &gt;&gt; 20, chunk_size &gt;&gt; 20);</div><div class='add'>+			if (debug_print) {</div><div class='add'>+				char chunk_factor;</div><div class='add'>+				unsigned long chunk_base;</div><div class='add'>+</div><div class='add'>+				chunk_base = to_size_factor(chunk_size&gt;&gt;10, &amp;chunk_factor),</div><div class='add'>+				printk(KERN_INFO "\n");</div><div class='add'>+				printk(KERN_INFO "gran_size: %ld%c   chunk_size: %ld%c \n",</div><div class='add'>+				       gran_base, gran_factor, chunk_base, chunk_factor);</div><div class='add'>+			}</div><div class='ctx'> 			if (i &gt;= NUM_RESULT)</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='hunk'>@@ -1326,12 +1421,18 @@ static int __init mtrr_cleanup(unsigned address_bits)</div><div class='ctx'> </div><div class='ctx'> 	/* print out all */</div><div class='ctx'> 	for (i = 0; i &lt; NUM_RESULT; i++) {</div><div class='del'>-		printk(KERN_INFO "%sgran_size: %ldM \tchunk_size: %ldM \t",</div><div class='del'>-		       result[i].bad?"*BAD* ":" ", result[i].gran_sizek &gt;&gt; 10,</div><div class='del'>-		       result[i].chunk_sizek &gt;&gt; 10);</div><div class='del'>-		printk(KERN_CONT "num_reg: %d \tlose RAM: %s%ldM\n",</div><div class='del'>-		       result[i].num_reg, result[i].bad?"-":"",</div><div class='del'>-		       result[i].lose_cover_sizek &gt;&gt; 10);</div><div class='add'>+		char gran_factor, chunk_factor, lose_factor;</div><div class='add'>+		unsigned long gran_base, chunk_base, lose_base;</div><div class='add'>+</div><div class='add'>+		gran_base = to_size_factor(result[i].gran_sizek, &amp;gran_factor),</div><div class='add'>+		chunk_base = to_size_factor(result[i].chunk_sizek, &amp;chunk_factor),</div><div class='add'>+		lose_base = to_size_factor(result[i].lose_cover_sizek, &amp;lose_factor),</div><div class='add'>+		printk(KERN_INFO "%sgran_size: %ld%c \tchunk_size: %ld%c \t",</div><div class='add'>+			 result[i].bad?"*BAD*":" ",</div><div class='add'>+			 gran_base, gran_factor, chunk_base, chunk_factor);</div><div class='add'>+		printk(KERN_CONT "num_reg: %d  \tlose cover RAM: %s%ld%c\n",</div><div class='add'>+			 result[i].num_reg, result[i].bad?"-":"",</div><div class='add'>+			 lose_base, lose_factor);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* try to find the optimal index */</div><div class='hunk'>@@ -1339,10 +1440,8 @@ static int __init mtrr_cleanup(unsigned address_bits)</div><div class='ctx'> 		nr_mtrr_spare_reg = num_var_ranges - 1;</div><div class='ctx'> 	num_reg_good = -1;</div><div class='ctx'> 	for (i = num_var_ranges - nr_mtrr_spare_reg; i &gt; 0; i--) {</div><div class='del'>-		if (!min_loss_pfn[i]) {</div><div class='add'>+		if (!min_loss_pfn[i])</div><div class='ctx'> 			num_reg_good = i;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	index_good = -1;</div><div class='hunk'>@@ -1358,21 +1457,26 @@ static int __init mtrr_cleanup(unsigned address_bits)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (index_good != -1) {</div><div class='add'>+		char gran_factor, chunk_factor, lose_factor;</div><div class='add'>+		unsigned long gran_base, chunk_base, lose_base;</div><div class='add'>+</div><div class='ctx'> 		printk(KERN_INFO "Found optimal setting for mtrr clean up\n");</div><div class='ctx'> 		i = index_good;</div><div class='del'>-		printk(KERN_INFO "gran_size: %ldM \tchunk_size: %ldM \t",</div><div class='del'>-				result[i].gran_sizek &gt;&gt; 10,</div><div class='del'>-				result[i].chunk_sizek &gt;&gt; 10);</div><div class='del'>-		printk(KERN_CONT "num_reg: %d \tlose RAM: %ldM\n",</div><div class='del'>-				result[i].num_reg,</div><div class='del'>-				result[i].lose_cover_sizek &gt;&gt; 10);</div><div class='add'>+		gran_base = to_size_factor(result[i].gran_sizek, &amp;gran_factor),</div><div class='add'>+		chunk_base = to_size_factor(result[i].chunk_sizek, &amp;chunk_factor),</div><div class='add'>+		lose_base = to_size_factor(result[i].lose_cover_sizek, &amp;lose_factor),</div><div class='add'>+		printk(KERN_INFO "gran_size: %ld%c \tchunk_size: %ld%c \t",</div><div class='add'>+			 gran_base, gran_factor, chunk_base, chunk_factor);</div><div class='add'>+		printk(KERN_CONT "num_reg: %d  \tlose RAM: %ld%c\n",</div><div class='add'>+			 result[i].num_reg, lose_base, lose_factor);</div><div class='ctx'> 		/* convert ranges to var ranges state */</div><div class='ctx'> 		chunk_size = result[i].chunk_sizek;</div><div class='ctx'> 		chunk_size &lt;&lt;= 10;</div><div class='ctx'> 		gran_size = result[i].gran_sizek;</div><div class='ctx'> 		gran_size &lt;&lt;= 10;</div><div class='del'>-		debug_print = 1;</div><div class='add'>+		debug_print++;</div><div class='ctx'> 		x86_setup_var_mtrrs(range, nr_range, chunk_size, gran_size);</div><div class='add'>+		debug_print--;</div><div class='ctx'> 		set_var_mtrr_all(address_bits);</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/x86/kernel/cpu/perfctr-watchdog.c b/arch/x86/kernel/cpu/perfctr-watchdog.c<br/>index 05cc22dbd4ff..6bff382094f5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/cpu/perfctr-watchdog.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/cpu/perfctr-watchdog.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/cpu/perfctr-watchdog.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/cpu/perfctr-watchdog.c</a></div><div class='hunk'>@@ -295,13 +295,19 @@ static int setup_k7_watchdog(unsigned nmi_hz)</div><div class='ctx'> 	/* setup the timer */</div><div class='ctx'> 	wrmsr(evntsel_msr, evntsel, 0);</div><div class='ctx'> 	write_watchdog_counter(perfctr_msr, "K7_PERFCTR0",nmi_hz);</div><div class='del'>-	apic_write(APIC_LVTPC, APIC_DM_NMI);</div><div class='del'>-	evntsel |= K7_EVNTSEL_ENABLE;</div><div class='del'>-	wrmsr(evntsel_msr, evntsel, 0);</div><div class='ctx'> </div><div class='add'>+	/* initialize the wd struct before enabling */</div><div class='ctx'> 	wd-&gt;perfctr_msr = perfctr_msr;</div><div class='ctx'> 	wd-&gt;evntsel_msr = evntsel_msr;</div><div class='ctx'> 	wd-&gt;cccr_msr = 0;  /* unused */</div><div class='add'>+</div><div class='add'>+	/* ok, everything is initialized, announce that we're set */</div><div class='add'>+	cpu_nmi_set_wd_enabled();</div><div class='add'>+</div><div class='add'>+	apic_write(APIC_LVTPC, APIC_DM_NMI);</div><div class='add'>+	evntsel |= K7_EVNTSEL_ENABLE;</div><div class='add'>+	wrmsr(evntsel_msr, evntsel, 0);</div><div class='add'>+</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -379,13 +385,19 @@ static int setup_p6_watchdog(unsigned nmi_hz)</div><div class='ctx'> 	wrmsr(evntsel_msr, evntsel, 0);</div><div class='ctx'> 	nmi_hz = adjust_for_32bit_ctr(nmi_hz);</div><div class='ctx'> 	write_watchdog_counter32(perfctr_msr, "P6_PERFCTR0",nmi_hz);</div><div class='del'>-	apic_write(APIC_LVTPC, APIC_DM_NMI);</div><div class='del'>-	evntsel |= P6_EVNTSEL0_ENABLE;</div><div class='del'>-	wrmsr(evntsel_msr, evntsel, 0);</div><div class='ctx'> </div><div class='add'>+	/* initialize the wd struct before enabling */</div><div class='ctx'> 	wd-&gt;perfctr_msr = perfctr_msr;</div><div class='ctx'> 	wd-&gt;evntsel_msr = evntsel_msr;</div><div class='ctx'> 	wd-&gt;cccr_msr = 0;  /* unused */</div><div class='add'>+</div><div class='add'>+	/* ok, everything is initialized, announce that we're set */</div><div class='add'>+	cpu_nmi_set_wd_enabled();</div><div class='add'>+</div><div class='add'>+	apic_write(APIC_LVTPC, APIC_DM_NMI);</div><div class='add'>+	evntsel |= P6_EVNTSEL0_ENABLE;</div><div class='add'>+	wrmsr(evntsel_msr, evntsel, 0);</div><div class='add'>+</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -432,6 +444,27 @@ static const struct wd_ops p6_wd_ops = {</div><div class='ctx'> #define P4_CCCR_ENABLE		(1 &lt;&lt; 12)</div><div class='ctx'> #define P4_CCCR_OVF 		(1 &lt;&lt; 31)</div><div class='ctx'> </div><div class='add'>+#define P4_CONTROLS 18</div><div class='add'>+static unsigned int p4_controls[18] = {</div><div class='add'>+	MSR_P4_BPU_CCCR0,</div><div class='add'>+	MSR_P4_BPU_CCCR1,</div><div class='add'>+	MSR_P4_BPU_CCCR2,</div><div class='add'>+	MSR_P4_BPU_CCCR3,</div><div class='add'>+	MSR_P4_MS_CCCR0,</div><div class='add'>+	MSR_P4_MS_CCCR1,</div><div class='add'>+	MSR_P4_MS_CCCR2,</div><div class='add'>+	MSR_P4_MS_CCCR3,</div><div class='add'>+	MSR_P4_FLAME_CCCR0,</div><div class='add'>+	MSR_P4_FLAME_CCCR1,</div><div class='add'>+	MSR_P4_FLAME_CCCR2,</div><div class='add'>+	MSR_P4_FLAME_CCCR3,</div><div class='add'>+	MSR_P4_IQ_CCCR0,</div><div class='add'>+	MSR_P4_IQ_CCCR1,</div><div class='add'>+	MSR_P4_IQ_CCCR2,</div><div class='add'>+	MSR_P4_IQ_CCCR3,</div><div class='add'>+	MSR_P4_IQ_CCCR4,</div><div class='add'>+	MSR_P4_IQ_CCCR5,</div><div class='add'>+};</div><div class='ctx'> /*</div><div class='ctx'>  * Set up IQ_COUNTER0 to behave like a clock, by having IQ_CCCR0 filter</div><div class='ctx'>  * CRU_ESCR0 (with any non-null event selector) through a complemented</div><div class='hunk'>@@ -473,6 +506,26 @@ static int setup_p4_watchdog(unsigned nmi_hz)</div><div class='ctx'> 		evntsel_msr = MSR_P4_CRU_ESCR0;</div><div class='ctx'> 		cccr_msr = MSR_P4_IQ_CCCR0;</div><div class='ctx'> 		cccr_val = P4_CCCR_OVF_PMI0 | P4_CCCR_ESCR_SELECT(4);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * If we're on the kdump kernel or other situation, we may</div><div class='add'>+		 * still have other performance counter registers set to</div><div class='add'>+		 * interrupt and they'll keep interrupting forever because</div><div class='add'>+		 * of the P4_CCCR_OVF quirk. So we need to ACK all the</div><div class='add'>+		 * pending interrupts and disable all the registers here,</div><div class='add'>+		 * before reenabling the NMI delivery. Refer to p4_rearm()</div><div class='add'>+		 * about the P4_CCCR_OVF quirk.</div><div class='add'>+		 */</div><div class='add'>+		if (reset_devices) {</div><div class='add'>+			unsigned int low, high;</div><div class='add'>+			int i;</div><div class='add'>+</div><div class='add'>+			for (i = 0; i &lt; P4_CONTROLS; i++) {</div><div class='add'>+				rdmsr(p4_controls[i], low, high);</div><div class='add'>+				low &amp;= ~(P4_CCCR_ENABLE | P4_CCCR_OVF);</div><div class='add'>+				wrmsr(p4_controls[i], low, high);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* logical cpu 1 */</div><div class='ctx'> 		perfctr_msr = MSR_P4_IQ_PERFCTR1;</div><div class='hunk'>@@ -499,12 +552,17 @@ static int setup_p4_watchdog(unsigned nmi_hz)</div><div class='ctx'> 	wrmsr(evntsel_msr, evntsel, 0);</div><div class='ctx'> 	wrmsr(cccr_msr, cccr_val, 0);</div><div class='ctx'> 	write_watchdog_counter(perfctr_msr, "P4_IQ_COUNTER0", nmi_hz);</div><div class='del'>-	apic_write(APIC_LVTPC, APIC_DM_NMI);</div><div class='del'>-	cccr_val |= P4_CCCR_ENABLE;</div><div class='del'>-	wrmsr(cccr_msr, cccr_val, 0);</div><div class='add'>+</div><div class='ctx'> 	wd-&gt;perfctr_msr = perfctr_msr;</div><div class='ctx'> 	wd-&gt;evntsel_msr = evntsel_msr;</div><div class='ctx'> 	wd-&gt;cccr_msr = cccr_msr;</div><div class='add'>+</div><div class='add'>+	/* ok, everything is initialized, announce that we're set */</div><div class='add'>+	cpu_nmi_set_wd_enabled();</div><div class='add'>+</div><div class='add'>+	apic_write(APIC_LVTPC, APIC_DM_NMI);</div><div class='add'>+	cccr_val |= P4_CCCR_ENABLE;</div><div class='add'>+	wrmsr(cccr_msr, cccr_val, 0);</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -620,13 +678,17 @@ static int setup_intel_arch_watchdog(unsigned nmi_hz)</div><div class='ctx'> 	wrmsr(evntsel_msr, evntsel, 0);</div><div class='ctx'> 	nmi_hz = adjust_for_32bit_ctr(nmi_hz);</div><div class='ctx'> 	write_watchdog_counter32(perfctr_msr, "INTEL_ARCH_PERFCTR0", nmi_hz);</div><div class='del'>-	apic_write(APIC_LVTPC, APIC_DM_NMI);</div><div class='del'>-	evntsel |= ARCH_PERFMON_EVENTSEL0_ENABLE;</div><div class='del'>-	wrmsr(evntsel_msr, evntsel, 0);</div><div class='ctx'> </div><div class='ctx'> 	wd-&gt;perfctr_msr = perfctr_msr;</div><div class='ctx'> 	wd-&gt;evntsel_msr = evntsel_msr;</div><div class='ctx'> 	wd-&gt;cccr_msr = 0;  /* unused */</div><div class='add'>+</div><div class='add'>+	/* ok, everything is initialized, announce that we're set */</div><div class='add'>+	cpu_nmi_set_wd_enabled();</div><div class='add'>+</div><div class='add'>+	apic_write(APIC_LVTPC, APIC_DM_NMI);</div><div class='add'>+	evntsel |= ARCH_PERFMON_EVENTSEL0_ENABLE;</div><div class='add'>+	wrmsr(evntsel_msr, evntsel, 0);</div><div class='ctx'> 	intel_arch_wd_ops.checkbit = 1ULL &lt;&lt; (eax.split.bit_width - 1);</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/x86/kernel/cpu/powerflags.c b/arch/x86/kernel/cpu/powerflags.c<br/>new file mode 100644<br/>index 000000000000..5abbea297e0c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/cpu/powerflags.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/cpu/powerflags.c</a></div><div class='hunk'>@@ -0,0 +1,20 @@</div><div class='add'>+/*</div><div class='add'>+ * Strings for the various x86 power flags</div><div class='add'>+ *</div><div class='add'>+ * This file must not contain any executable code.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;asm/cpufeature.h&gt;</div><div class='add'>+</div><div class='add'>+const char *const x86_power_flags[32] = {</div><div class='add'>+	"ts",	/* temperature sensor */</div><div class='add'>+	"fid",  /* frequency id control */</div><div class='add'>+	"vid",  /* voltage id control */</div><div class='add'>+	"ttp",  /* thermal trip */</div><div class='add'>+	"tm",</div><div class='add'>+	"stc",</div><div class='add'>+	"100mhzsteps",</div><div class='add'>+	"hwpstate",</div><div class='add'>+	"",	/* tsc invariant mapped to constant_tsc */</div><div class='add'>+		/* nothing */</div><div class='add'>+};</div><div class='head'>diff --git a/arch/x86/kernel/cpu/transmeta.c b/arch/x86/kernel/cpu/transmeta.c<br/>index b911a2c61b8f..52b3fefbd5af 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/cpu/transmeta.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/cpu/transmeta.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/cpu/transmeta.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/cpu/transmeta.c</a></div><div class='hunk'>@@ -5,6 +5,18 @@</div><div class='ctx'> #include &lt;asm/msr.h&gt;</div><div class='ctx'> #include "cpu.h"</div><div class='ctx'> </div><div class='add'>+static void __cpuinit early_init_transmeta(struct cpuinfo_x86 *c)</div><div class='add'>+{</div><div class='add'>+	u32 xlvl;</div><div class='add'>+</div><div class='add'>+	/* Transmeta-defined flags: level 0x80860001 */</div><div class='add'>+	xlvl = cpuid_eax(0x80860000);</div><div class='add'>+	if ((xlvl &amp; 0xffff0000) == 0x80860000) {</div><div class='add'>+		if (xlvl &gt;= 0x80860001)</div><div class='add'>+			c-&gt;x86_capability[2] = cpuid_edx(0x80860001);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void __cpuinit init_transmeta(struct cpuinfo_x86 *c)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int cap_mask, uk, max, dummy;</div><div class='hunk'>@@ -12,7 +24,8 @@ static void __cpuinit init_transmeta(struct cpuinfo_x86 *c)</div><div class='ctx'> 	unsigned int cpu_rev, cpu_freq = 0, cpu_flags, new_cpu_rev;</div><div class='ctx'> 	char cpu_info[65];</div><div class='ctx'> </div><div class='del'>-	get_model_name(c);	/* Same as AMD/Cyrix */</div><div class='add'>+	early_init_transmeta(c);</div><div class='add'>+</div><div class='ctx'> 	display_cacheinfo(c);</div><div class='ctx'> </div><div class='ctx'> 	/* Print CMS and CPU revision */</div><div class='hunk'>@@ -85,23 +98,12 @@ static void __cpuinit init_transmeta(struct cpuinfo_x86 *c)</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __cpuinit transmeta_identify(struct cpuinfo_x86 *c)</div><div class='del'>-{</div><div class='del'>-	u32 xlvl;</div><div class='del'>-</div><div class='del'>-	/* Transmeta-defined flags: level 0x80860001 */</div><div class='del'>-	xlvl = cpuid_eax(0x80860000);</div><div class='del'>-	if ((xlvl &amp; 0xffff0000) == 0x80860000) {</div><div class='del'>-		if (xlvl &gt;= 0x80860001)</div><div class='del'>-			c-&gt;x86_capability[2] = cpuid_edx(0x80860001);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static struct cpu_dev transmeta_cpu_dev __cpuinitdata = {</div><div class='ctx'> 	.c_vendor	= "Transmeta",</div><div class='ctx'> 	.c_ident	= { "GenuineTMx86", "TransmetaCPU" },</div><div class='add'>+	.c_early_init	= early_init_transmeta,</div><div class='ctx'> 	.c_init		= init_transmeta,</div><div class='del'>-	.c_identify	= transmeta_identify,</div><div class='add'>+	.c_x86_vendor	= X86_VENDOR_TRANSMETA,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-cpu_vendor_dev_register(X86_VENDOR_TRANSMETA, &amp;transmeta_cpu_dev);</div><div class='add'>+cpu_dev_register(transmeta_cpu_dev);</div><div class='head'>diff --git a/arch/x86/kernel/cpu/umc.c b/arch/x86/kernel/cpu/umc.c<br/>index b1fc90989d75..e777f79e0960 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/cpu/umc.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/cpu/umc.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/cpu/umc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/cpu/umc.c</a></div><div class='hunk'>@@ -19,7 +19,8 @@ static struct cpu_dev umc_cpu_dev __cpuinitdata = {</div><div class='ctx'> 		  }</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='add'>+	.c_x86_vendor	= X86_VENDOR_UMC,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-cpu_vendor_dev_register(X86_VENDOR_UMC, &amp;umc_cpu_dev);</div><div class='add'>+cpu_dev_register(umc_cpu_dev);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kernel/cpuid.c b/arch/x86/kernel/cpuid.c<br/>index 8e9cd6a8ec12..72cefd1e649b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/cpuid.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/cpuid.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/cpuid.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/cpuid.c</a></div><div class='hunk'>@@ -36,7 +36,6 @@</div><div class='ctx'> #include &lt;linux/smp_lock.h&gt;</div><div class='ctx'> #include &lt;linux/major.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='del'>-#include &lt;linux/smp_lock.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/cpu.h&gt;</div><div class='ctx'> #include &lt;linux/notifier.h&gt;</div><div class='hunk'>@@ -148,8 +147,8 @@ static __cpuinit int cpuid_device_create(int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev;</div><div class='ctx'> </div><div class='del'>-	dev = device_create_drvdata(cpuid_class, NULL, MKDEV(CPUID_MAJOR, cpu),</div><div class='del'>-				    NULL, "cpu%d", cpu);</div><div class='add'>+	dev = device_create(cpuid_class, NULL, MKDEV(CPUID_MAJOR, cpu), NULL,</div><div class='add'>+			    "cpu%d", cpu);</div><div class='ctx'> 	return IS_ERR(dev) ? PTR_ERR(dev) : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kernel/crash_dump_64.c b/arch/x86/kernel/crash_dump_64.c<br/>index 15e6c6bc4a46..e90a60ef10c2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/crash_dump_64.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/crash_dump_64.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/crash_dump_64.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/crash_dump_64.c</a></div><div class='hunk'>@@ -7,9 +7,8 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/crash_dump.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * copy_oldmem_page - copy one page from "oldmem"</div><div class='hunk'>@@ -25,7 +24,7 @@</div><div class='ctx'>  * in the current kernel. We stitch up a pte, similar to kmap_atomic.</div><div class='ctx'>  */</div><div class='ctx'> ssize_t copy_oldmem_page(unsigned long pfn, char *buf,</div><div class='del'>-                               size_t csize, unsigned long offset, int userbuf)</div><div class='add'>+		size_t csize, unsigned long offset, int userbuf)</div><div class='ctx'> {</div><div class='ctx'> 	void  *vaddr;</div><div class='ctx'> </div><div class='hunk'>@@ -33,14 +32,16 @@ ssize_t copy_oldmem_page(unsigned long pfn, char *buf,</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	vaddr = ioremap(pfn &lt;&lt; PAGE_SHIFT, PAGE_SIZE);</div><div class='add'>+	if (!vaddr)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	if (userbuf) {</div><div class='del'>-		if (copy_to_user(buf, (vaddr + offset), csize)) {</div><div class='add'>+		if (copy_to_user(buf, vaddr + offset, csize)) {</div><div class='ctx'> 			iounmap(vaddr);</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else</div><div class='del'>-	memcpy(buf, (vaddr + offset), csize);</div><div class='add'>+		memcpy(buf, vaddr + offset, csize);</div><div class='ctx'> </div><div class='ctx'> 	iounmap(vaddr);</div><div class='ctx'> 	return csize;</div><div class='head'>diff --git a/arch/x86/kernel/doublefault_32.c b/arch/x86/kernel/doublefault_32.c<br/>index a47798b59f07..b4f14c6c09d9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/doublefault_32.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/doublefault_32.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/doublefault_32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/doublefault_32.c</a></div><div class='hunk'>@@ -66,6 +66,6 @@ struct tss_struct doublefault_tss __cacheline_aligned = {</div><div class='ctx'> 		.ds		= __USER_DS,</div><div class='ctx'> 		.fs		= __KERNEL_PERCPU,</div><div class='ctx'> </div><div class='del'>-		.__cr3		= __pa(swapper_pg_dir)</div><div class='add'>+		.__cr3		= __pa_nodebug(swapper_pg_dir),</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/x86/kernel/ds.c b/arch/x86/kernel/ds.c<br/>index 11c11b8ec48d..2b69994fd3a8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/ds.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/ds.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/ds.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/ds.c</a></div><div class='hunk'>@@ -2,26 +2,49 @@</div><div class='ctx'>  * Debug Store support</div><div class='ctx'>  *</div><div class='ctx'>  * This provides a low-level interface to the hardware's Debug Store</div><div class='del'>- * feature that is used for last branch recording (LBR) and</div><div class='add'>+ * feature that is used for branch trace store (BTS) and</div><div class='ctx'>  * precise-event based sampling (PEBS).</div><div class='ctx'>  *</div><div class='del'>- * Different architectures use a different DS layout/pointer size.</div><div class='del'>- * The below functions therefore work on a void*.</div><div class='add'>+ * It manages:</div><div class='add'>+ * - per-thread and per-cpu allocation of BTS and PEBS</div><div class='add'>+ * - buffer memory allocation (optional)</div><div class='add'>+ * - buffer overflow handling</div><div class='add'>+ * - buffer access</div><div class='ctx'>  *</div><div class='add'>+ * It assumes:</div><div class='add'>+ * - get_task_struct on all parameter tasks</div><div class='add'>+ * - current is allowed to trace parameter tasks</div><div class='ctx'>  *</div><div class='del'>- * Since there is no user for PEBS, yet, only LBR (or branch</div><div class='del'>- * trace store, BTS) is supported.</div><div class='ctx'>  *</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2007 Intel Corporation.</div><div class='del'>- * Markus Metzger &lt;markus.t.metzger@intel.com&gt;, Dec 2007</div><div class='add'>+ * Copyright (C) 2007-2008 Intel Corporation.</div><div class='add'>+ * Markus Metzger &lt;markus.t.metzger@intel.com&gt;, 2007-2008</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_X86_DS</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/ds.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The configuration for a particular DS hardware implementation.</div><div class='add'>+ */</div><div class='add'>+struct ds_configuration {</div><div class='add'>+	/* the size of the DS structure in bytes */</div><div class='add'>+	unsigned char  sizeof_ds;</div><div class='add'>+	/* the size of one pointer-typed field in the DS structure in bytes;</div><div class='add'>+	   this covers the first 8 fields related to buffer management. */</div><div class='add'>+	unsigned char  sizeof_field;</div><div class='add'>+	/* the size of a BTS/PEBS record in bytes */</div><div class='add'>+	unsigned char  sizeof_rec[2];</div><div class='add'>+};</div><div class='add'>+static struct ds_configuration ds_cfg;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -44,378 +67,747 @@</div><div class='ctx'>  *   (interrupt occurs when write pointer passes interrupt pointer)</div><div class='ctx'>  * - value to which counter is reset following counter overflow</div><div class='ctx'>  *</div><div class='del'>- * On later architectures, the last branch recording hardware uses</div><div class='del'>- * 64bit pointers even in 32bit mode.</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * Branch Trace Store (BTS) records store information about control</div><div class='del'>- * flow changes. They at least provide the following information:</div><div class='del'>- * - source linear address</div><div class='del'>- * - destination linear address</div><div class='add'>+ * Later architectures use 64bit pointers throughout, whereas earlier</div><div class='add'>+ * architectures use 32bit pointers in 32bit mode.</div><div class='ctx'>  *</div><div class='del'>- * Netburst supported a predicated bit that had been dropped in later</div><div class='del'>- * architectures. We do not suppor it.</div><div class='ctx'>  *</div><div class='add'>+ * We compute the base address for the first 8 fields based on:</div><div class='add'>+ * - the field size stored in the DS configuration</div><div class='add'>+ * - the relative field position</div><div class='add'>+ * - an offset giving the start of the respective region</div><div class='ctx'>  *</div><div class='del'>- * In order to abstract from the actual DS and BTS layout, we describe</div><div class='del'>- * the access to the relevant fields.</div><div class='del'>- * Thanks to Andi Kleen for proposing this design.</div><div class='add'>+ * This offset is further used to index various arrays holding</div><div class='add'>+ * information for BTS and PEBS at the respective index.</div><div class='ctx'>  *</div><div class='del'>- * The implementation, however, is not as general as it might seem. In</div><div class='del'>- * order to stay somewhat simple and efficient, we assume an</div><div class='del'>- * underlying unsigned type (mostly a pointer type) and we expect the</div><div class='del'>- * field to be at least as big as that type.</div><div class='add'>+ * On later 32bit processors, we only access the lower 32bit of the</div><div class='add'>+ * 64bit pointer fields. The upper halves will be zeroed out.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * A special from_ip address to indicate that the BTS record is an</div><div class='del'>- * info record that needs to be interpreted or skipped.</div><div class='del'>- */</div><div class='del'>-#define BTS_ESCAPE_ADDRESS (-1)</div><div class='add'>+enum ds_field {</div><div class='add'>+	ds_buffer_base = 0,</div><div class='add'>+	ds_index,</div><div class='add'>+	ds_absolute_maximum,</div><div class='add'>+	ds_interrupt_threshold,</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * A field access descriptor</div><div class='del'>- */</div><div class='del'>-struct access_desc {</div><div class='del'>-	unsigned char offset;</div><div class='del'>-	unsigned char size;</div><div class='add'>+enum ds_qualifier {</div><div class='add'>+	ds_bts  = 0,</div><div class='add'>+	ds_pebs</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static inline unsigned long ds_get(const unsigned char *base,</div><div class='add'>+				   enum ds_qualifier qual, enum ds_field field)</div><div class='add'>+{</div><div class='add'>+	base += (ds_cfg.sizeof_field * (field + (4 * qual)));</div><div class='add'>+	return *(unsigned long *)base;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void ds_set(unsigned char *base, enum ds_qualifier qual,</div><div class='add'>+			  enum ds_field field, unsigned long value)</div><div class='add'>+{</div><div class='add'>+	base += (ds_cfg.sizeof_field * (field + (4 * qual)));</div><div class='add'>+	(*(unsigned long *)base) = value;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> /*</div><div class='del'>- * The configuration for a particular DS/BTS hardware implementation.</div><div class='add'>+ * Locking is done only for allocating BTS or PEBS resources and for</div><div class='add'>+ * guarding context and buffer memory allocation.</div><div class='add'>+ *</div><div class='add'>+ * Most functions require the current task to own the ds context part</div><div class='add'>+ * they are going to access. All the locking is done when validating</div><div class='add'>+ * access to the context.</div><div class='ctx'>  */</div><div class='del'>-struct ds_configuration {</div><div class='del'>-	/* the DS configuration */</div><div class='del'>-	unsigned char  sizeof_ds;</div><div class='del'>-	struct access_desc bts_buffer_base;</div><div class='del'>-	struct access_desc bts_index;</div><div class='del'>-	struct access_desc bts_absolute_maximum;</div><div class='del'>-	struct access_desc bts_interrupt_threshold;</div><div class='del'>-	/* the BTS configuration */</div><div class='del'>-	unsigned char  sizeof_bts;</div><div class='del'>-	struct access_desc from_ip;</div><div class='del'>-	struct access_desc to_ip;</div><div class='del'>-	/* BTS variants used to store additional information like</div><div class='del'>-	   timestamps */</div><div class='del'>-	struct access_desc info_type;</div><div class='del'>-	struct access_desc info_data;</div><div class='del'>-	unsigned long debugctl_mask;</div><div class='del'>-};</div><div class='add'>+static spinlock_t ds_lock = __SPIN_LOCK_UNLOCKED(ds_lock);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * The global configuration used by the below accessor functions</div><div class='add'>+ * Validate that the current task is allowed to access the BTS/PEBS</div><div class='add'>+ * buffer of the parameter task.</div><div class='add'>+ *</div><div class='add'>+ * Returns 0, if access is granted; -Eerrno, otherwise.</div><div class='ctx'>  */</div><div class='del'>-static struct ds_configuration ds_cfg;</div><div class='add'>+static inline int ds_validate_access(struct ds_context *context,</div><div class='add'>+				     enum ds_qualifier qual)</div><div class='add'>+{</div><div class='add'>+	if (!context)</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	if (context-&gt;owner[qual] == current)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return -EPERM;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Accessor functions for some DS and BTS fields using the above</div><div class='del'>- * global ptrace_bts_cfg.</div><div class='add'>+ * We either support (system-wide) per-cpu or per-thread allocation.</div><div class='add'>+ * We distinguish the two based on the task_struct pointer, where a</div><div class='add'>+ * NULL pointer indicates per-cpu allocation for the current cpu.</div><div class='add'>+ *</div><div class='add'>+ * Allocations are use-counted. As soon as resources are allocated,</div><div class='add'>+ * further allocations must be of the same type (per-cpu or</div><div class='add'>+ * per-thread). We model this by counting allocations (i.e. the number</div><div class='add'>+ * of tracers of a certain type) for one type negatively:</div><div class='add'>+ *   =0  no tracers</div><div class='add'>+ *   &gt;0  number of per-thread tracers</div><div class='add'>+ *   &lt;0  number of per-cpu tracers</div><div class='add'>+ *</div><div class='add'>+ * The below functions to get and put tracers and to check the</div><div class='add'>+ * allocation type require the ds_lock to be held by the caller.</div><div class='add'>+ *</div><div class='add'>+ * Tracers essentially gives the number of ds contexts for a certain</div><div class='add'>+ * type of allocation.</div><div class='ctx'>  */</div><div class='del'>-static inline unsigned long get_bts_buffer_base(char *base)</div><div class='add'>+static long tracers;</div><div class='add'>+</div><div class='add'>+static inline void get_tracer(struct task_struct *task)</div><div class='ctx'> {</div><div class='del'>-	return *(unsigned long *)(base + ds_cfg.bts_buffer_base.offset);</div><div class='add'>+	tracers += (task ? 1 : -1);</div><div class='ctx'> }</div><div class='del'>-static inline void set_bts_buffer_base(char *base, unsigned long value)</div><div class='add'>+</div><div class='add'>+static inline void put_tracer(struct task_struct *task)</div><div class='ctx'> {</div><div class='del'>-	(*(unsigned long *)(base + ds_cfg.bts_buffer_base.offset)) = value;</div><div class='add'>+	tracers -= (task ? 1 : -1);</div><div class='ctx'> }</div><div class='del'>-static inline unsigned long get_bts_index(char *base)</div><div class='add'>+</div><div class='add'>+static inline int check_tracer(struct task_struct *task)</div><div class='ctx'> {</div><div class='del'>-	return *(unsigned long *)(base + ds_cfg.bts_index.offset);</div><div class='add'>+	return (task ? (tracers &gt;= 0) : (tracers &lt;= 0));</div><div class='ctx'> }</div><div class='del'>-static inline void set_bts_index(char *base, unsigned long value)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The DS context is either attached to a thread or to a cpu:</div><div class='add'>+ * - in the former case, the thread_struct contains a pointer to the</div><div class='add'>+ *   attached context.</div><div class='add'>+ * - in the latter case, we use a static array of per-cpu context</div><div class='add'>+ *   pointers.</div><div class='add'>+ *</div><div class='add'>+ * Contexts are use-counted. They are allocated on first access and</div><div class='add'>+ * deallocated when the last user puts the context.</div><div class='add'>+ *</div><div class='add'>+ * We distinguish between an allocating and a non-allocating get of a</div><div class='add'>+ * context:</div><div class='add'>+ * - the allocating get is used for requesting BTS/PEBS resources. It</div><div class='add'>+ *   requires the caller to hold the global ds_lock.</div><div class='add'>+ * - the non-allocating get is used for all other cases. A</div><div class='add'>+ *   non-existing context indicates an error. It acquires and releases</div><div class='add'>+ *   the ds_lock itself for obtaining the context.</div><div class='add'>+ *</div><div class='add'>+ * A context and its DS configuration are allocated and deallocated</div><div class='add'>+ * together. A context always has a DS configuration of the</div><div class='add'>+ * appropriate size.</div><div class='add'>+ */</div><div class='add'>+static DEFINE_PER_CPU(struct ds_context *, system_context);</div><div class='add'>+</div><div class='add'>+#define this_system_context per_cpu(system_context, smp_processor_id())</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Returns the pointer to the parameter task's context or to the</div><div class='add'>+ * system-wide context, if task is NULL.</div><div class='add'>+ *</div><div class='add'>+ * Increases the use count of the returned context, if not NULL.</div><div class='add'>+ */</div><div class='add'>+static inline struct ds_context *ds_get_context(struct task_struct *task)</div><div class='ctx'> {</div><div class='del'>-	(*(unsigned long *)(base + ds_cfg.bts_index.offset)) = value;</div><div class='add'>+	struct ds_context *context;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;ds_lock);</div><div class='add'>+</div><div class='add'>+	context = (task ? task-&gt;thread.ds_ctx : this_system_context);</div><div class='add'>+	if (context)</div><div class='add'>+		context-&gt;count++;</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;ds_lock);</div><div class='add'>+</div><div class='add'>+	return context;</div><div class='ctx'> }</div><div class='del'>-static inline unsigned long get_bts_absolute_maximum(char *base)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Same as ds_get_context, but allocates the context and it's DS</div><div class='add'>+ * structure, if necessary; returns NULL; if out of memory.</div><div class='add'>+ *</div><div class='add'>+ * pre: requires ds_lock to be held</div><div class='add'>+ */</div><div class='add'>+static inline struct ds_context *ds_alloc_context(struct task_struct *task)</div><div class='ctx'> {</div><div class='del'>-	return *(unsigned long *)(base + ds_cfg.bts_absolute_maximum.offset);</div><div class='add'>+	struct ds_context **p_context =</div><div class='add'>+		(task ? &amp;task-&gt;thread.ds_ctx : &amp;this_system_context);</div><div class='add'>+	struct ds_context *context = *p_context;</div><div class='add'>+</div><div class='add'>+	if (!context) {</div><div class='add'>+		context = kzalloc(sizeof(*context), GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+		if (!context)</div><div class='add'>+			return NULL;</div><div class='add'>+</div><div class='add'>+		context-&gt;ds = kzalloc(ds_cfg.sizeof_ds, GFP_KERNEL);</div><div class='add'>+		if (!context-&gt;ds) {</div><div class='add'>+			kfree(context);</div><div class='add'>+			return NULL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		*p_context = context;</div><div class='add'>+</div><div class='add'>+		context-&gt;this = p_context;</div><div class='add'>+		context-&gt;task = task;</div><div class='add'>+</div><div class='add'>+		if (task)</div><div class='add'>+			set_tsk_thread_flag(task, TIF_DS_AREA_MSR);</div><div class='add'>+</div><div class='add'>+		if (!task || (task == current))</div><div class='add'>+			wrmsr(MSR_IA32_DS_AREA, (unsigned long)context-&gt;ds, 0);</div><div class='add'>+</div><div class='add'>+		get_tracer(task);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	context-&gt;count++;</div><div class='add'>+</div><div class='add'>+	return context;</div><div class='ctx'> }</div><div class='del'>-static inline void set_bts_absolute_maximum(char *base, unsigned long value)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Decreases the use count of the parameter context, if not NULL.</div><div class='add'>+ * Deallocates the context, if the use count reaches zero.</div><div class='add'>+ */</div><div class='add'>+static inline void ds_put_context(struct ds_context *context)</div><div class='ctx'> {</div><div class='del'>-	(*(unsigned long *)(base + ds_cfg.bts_absolute_maximum.offset)) = value;</div><div class='add'>+	if (!context)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;ds_lock);</div><div class='add'>+</div><div class='add'>+	if (--context-&gt;count)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	*(context-&gt;this) = NULL;</div><div class='add'>+</div><div class='add'>+	if (context-&gt;task)</div><div class='add'>+		clear_tsk_thread_flag(context-&gt;task, TIF_DS_AREA_MSR);</div><div class='add'>+</div><div class='add'>+	if (!context-&gt;task || (context-&gt;task == current))</div><div class='add'>+		wrmsrl(MSR_IA32_DS_AREA, 0);</div><div class='add'>+</div><div class='add'>+	put_tracer(context-&gt;task);</div><div class='add'>+</div><div class='add'>+	/* free any leftover buffers from tracers that did not</div><div class='add'>+	 * deallocate them properly. */</div><div class='add'>+	kfree(context-&gt;buffer[ds_bts]);</div><div class='add'>+	kfree(context-&gt;buffer[ds_pebs]);</div><div class='add'>+	kfree(context-&gt;ds);</div><div class='add'>+	kfree(context);</div><div class='add'>+ out:</div><div class='add'>+	spin_unlock(&amp;ds_lock);</div><div class='ctx'> }</div><div class='del'>-static inline unsigned long get_bts_interrupt_threshold(char *base)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Handle a buffer overflow</div><div class='add'>+ *</div><div class='add'>+ * task: the task whose buffers are overflowing;</div><div class='add'>+ *       NULL for a buffer overflow on the current cpu</div><div class='add'>+ * context: the ds context</div><div class='add'>+ * qual: the buffer type</div><div class='add'>+ */</div><div class='add'>+static void ds_overflow(struct task_struct *task, struct ds_context *context,</div><div class='add'>+			enum ds_qualifier qual)</div><div class='ctx'> {</div><div class='del'>-	return *(unsigned long *)(base + ds_cfg.bts_interrupt_threshold.offset);</div><div class='add'>+	if (!context)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (context-&gt;callback[qual])</div><div class='add'>+		(*context-&gt;callback[qual])(task);</div><div class='add'>+</div><div class='add'>+	/* todo: do some more overflow handling */</div><div class='ctx'> }</div><div class='del'>-static inline void set_bts_interrupt_threshold(char *base, unsigned long value)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Allocate a non-pageable buffer of the parameter size.</div><div class='add'>+ * Checks the memory and the locked memory rlimit.</div><div class='add'>+ *</div><div class='add'>+ * Returns the buffer, if successful;</div><div class='add'>+ *         NULL, if out of memory or rlimit exceeded.</div><div class='add'>+ *</div><div class='add'>+ * size: the requested buffer size in bytes</div><div class='add'>+ * pages (out): if not NULL, contains the number of pages reserved</div><div class='add'>+ */</div><div class='add'>+static inline void *ds_allocate_buffer(size_t size, unsigned int *pages)</div><div class='ctx'> {</div><div class='del'>-	(*(unsigned long *)(base + ds_cfg.bts_interrupt_threshold.offset)) = value;</div><div class='add'>+	unsigned long rlim, vm, pgsz;</div><div class='add'>+	void *buffer;</div><div class='add'>+</div><div class='add'>+	pgsz = PAGE_ALIGN(size) &gt;&gt; PAGE_SHIFT;</div><div class='add'>+</div><div class='add'>+	rlim = current-&gt;signal-&gt;rlim[RLIMIT_AS].rlim_cur &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	vm   = current-&gt;mm-&gt;total_vm  + pgsz;</div><div class='add'>+	if (rlim &lt; vm)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	rlim = current-&gt;signal-&gt;rlim[RLIMIT_MEMLOCK].rlim_cur &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	vm   = current-&gt;mm-&gt;locked_vm  + pgsz;</div><div class='add'>+	if (rlim &lt; vm)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	buffer = kzalloc(size, GFP_KERNEL);</div><div class='add'>+	if (!buffer)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	current-&gt;mm-&gt;total_vm  += pgsz;</div><div class='add'>+	current-&gt;mm-&gt;locked_vm += pgsz;</div><div class='add'>+</div><div class='add'>+	if (pages)</div><div class='add'>+		*pages = pgsz;</div><div class='add'>+</div><div class='add'>+	return buffer;</div><div class='ctx'> }</div><div class='del'>-static inline unsigned long get_from_ip(char *base)</div><div class='add'>+</div><div class='add'>+static int ds_request(struct task_struct *task, void *base, size_t size,</div><div class='add'>+		      ds_ovfl_callback_t ovfl, enum ds_qualifier qual)</div><div class='ctx'> {</div><div class='del'>-	return *(unsigned long *)(base + ds_cfg.from_ip.offset);</div><div class='add'>+	struct ds_context *context;</div><div class='add'>+	unsigned long buffer, adj;</div><div class='add'>+	const unsigned long alignment = (1 &lt;&lt; 3);</div><div class='add'>+	int error = 0;</div><div class='add'>+</div><div class='add'>+	if (!ds_cfg.sizeof_ds)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	/* we require some space to do alignment adjustments below */</div><div class='add'>+	if (size &lt; (alignment + ds_cfg.sizeof_rec[qual]))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* buffer overflow notification is not yet implemented */</div><div class='add'>+	if (ovfl)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;ds_lock);</div><div class='add'>+</div><div class='add'>+	if (!check_tracer(task))</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	error = -ENOMEM;</div><div class='add'>+	context = ds_alloc_context(task);</div><div class='add'>+	if (!context)</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='add'>+	error = -EALREADY;</div><div class='add'>+	if (context-&gt;owner[qual] == current)</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	error = -EPERM;</div><div class='add'>+	if (context-&gt;owner[qual] != NULL)</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	context-&gt;owner[qual] = current;</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;ds_lock);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	error = -ENOMEM;</div><div class='add'>+	if (!base) {</div><div class='add'>+		base = ds_allocate_buffer(size, &amp;context-&gt;pages[qual]);</div><div class='add'>+		if (!base)</div><div class='add'>+			goto out_release;</div><div class='add'>+</div><div class='add'>+		context-&gt;buffer[qual]   = base;</div><div class='add'>+	}</div><div class='add'>+	error = 0;</div><div class='add'>+</div><div class='add'>+	context-&gt;callback[qual] = ovfl;</div><div class='add'>+</div><div class='add'>+	/* adjust the buffer address and size to meet alignment</div><div class='add'>+	 * constraints:</div><div class='add'>+	 * - buffer is double-word aligned</div><div class='add'>+	 * - size is multiple of record size</div><div class='add'>+	 *</div><div class='add'>+	 * We checked the size at the very beginning; we have enough</div><div class='add'>+	 * space to do the adjustment.</div><div class='add'>+	 */</div><div class='add'>+	buffer = (unsigned long)base;</div><div class='add'>+</div><div class='add'>+	adj = ALIGN(buffer, alignment) - buffer;</div><div class='add'>+	buffer += adj;</div><div class='add'>+	size   -= adj;</div><div class='add'>+</div><div class='add'>+	size /= ds_cfg.sizeof_rec[qual];</div><div class='add'>+	size *= ds_cfg.sizeof_rec[qual];</div><div class='add'>+</div><div class='add'>+	ds_set(context-&gt;ds, qual, ds_buffer_base, buffer);</div><div class='add'>+	ds_set(context-&gt;ds, qual, ds_index, buffer);</div><div class='add'>+	ds_set(context-&gt;ds, qual, ds_absolute_maximum, buffer + size);</div><div class='add'>+</div><div class='add'>+	if (ovfl) {</div><div class='add'>+		/* todo: select a suitable interrupt threshold */</div><div class='add'>+	} else</div><div class='add'>+		ds_set(context-&gt;ds, qual,</div><div class='add'>+		       ds_interrupt_threshold, buffer + size + 1);</div><div class='add'>+</div><div class='add'>+	/* we keep the context until ds_release */</div><div class='add'>+	return error;</div><div class='add'>+</div><div class='add'>+ out_release:</div><div class='add'>+	context-&gt;owner[qual] = NULL;</div><div class='add'>+	ds_put_context(context);</div><div class='add'>+	return error;</div><div class='add'>+</div><div class='add'>+ out_unlock:</div><div class='add'>+	spin_unlock(&amp;ds_lock);</div><div class='add'>+	ds_put_context(context);</div><div class='add'>+	return error;</div><div class='ctx'> }</div><div class='del'>-static inline void set_from_ip(char *base, unsigned long value)</div><div class='add'>+</div><div class='add'>+int ds_request_bts(struct task_struct *task, void *base, size_t size,</div><div class='add'>+		   ds_ovfl_callback_t ovfl)</div><div class='ctx'> {</div><div class='del'>-	(*(unsigned long *)(base + ds_cfg.from_ip.offset)) = value;</div><div class='add'>+	return ds_request(task, base, size, ovfl, ds_bts);</div><div class='ctx'> }</div><div class='del'>-static inline unsigned long get_to_ip(char *base)</div><div class='add'>+</div><div class='add'>+int ds_request_pebs(struct task_struct *task, void *base, size_t size,</div><div class='add'>+		    ds_ovfl_callback_t ovfl)</div><div class='ctx'> {</div><div class='del'>-	return *(unsigned long *)(base + ds_cfg.to_ip.offset);</div><div class='add'>+	return ds_request(task, base, size, ovfl, ds_pebs);</div><div class='ctx'> }</div><div class='del'>-static inline void set_to_ip(char *base, unsigned long value)</div><div class='add'>+</div><div class='add'>+static int ds_release(struct task_struct *task, enum ds_qualifier qual)</div><div class='ctx'> {</div><div class='del'>-	(*(unsigned long *)(base + ds_cfg.to_ip.offset)) = value;</div><div class='add'>+	struct ds_context *context;</div><div class='add'>+	int error;</div><div class='add'>+</div><div class='add'>+	context = ds_get_context(task);</div><div class='add'>+	error = ds_validate_access(context, qual);</div><div class='add'>+	if (error &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	kfree(context-&gt;buffer[qual]);</div><div class='add'>+	context-&gt;buffer[qual] = NULL;</div><div class='add'>+</div><div class='add'>+	current-&gt;mm-&gt;total_vm  -= context-&gt;pages[qual];</div><div class='add'>+	current-&gt;mm-&gt;locked_vm -= context-&gt;pages[qual];</div><div class='add'>+	context-&gt;pages[qual] = 0;</div><div class='add'>+	context-&gt;owner[qual] = NULL;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * we put the context twice:</div><div class='add'>+	 *   once for the ds_get_context</div><div class='add'>+	 *   once for the corresponding ds_request</div><div class='add'>+	 */</div><div class='add'>+	ds_put_context(context);</div><div class='add'>+ out:</div><div class='add'>+	ds_put_context(context);</div><div class='add'>+	return error;</div><div class='ctx'> }</div><div class='del'>-static inline unsigned char get_info_type(char *base)</div><div class='add'>+</div><div class='add'>+int ds_release_bts(struct task_struct *task)</div><div class='ctx'> {</div><div class='del'>-	return *(unsigned char *)(base + ds_cfg.info_type.offset);</div><div class='add'>+	return ds_release(task, ds_bts);</div><div class='ctx'> }</div><div class='del'>-static inline void set_info_type(char *base, unsigned char value)</div><div class='add'>+</div><div class='add'>+int ds_release_pebs(struct task_struct *task)</div><div class='ctx'> {</div><div class='del'>-	(*(unsigned char *)(base + ds_cfg.info_type.offset)) = value;</div><div class='add'>+	return ds_release(task, ds_pebs);</div><div class='ctx'> }</div><div class='del'>-static inline unsigned long get_info_data(char *base)</div><div class='add'>+</div><div class='add'>+static int ds_get_index(struct task_struct *task, size_t *pos,</div><div class='add'>+			enum ds_qualifier qual)</div><div class='ctx'> {</div><div class='del'>-	return *(unsigned long *)(base + ds_cfg.info_data.offset);</div><div class='add'>+	struct ds_context *context;</div><div class='add'>+	unsigned long base, index;</div><div class='add'>+	int error;</div><div class='add'>+</div><div class='add'>+	context = ds_get_context(task);</div><div class='add'>+	error = ds_validate_access(context, qual);</div><div class='add'>+	if (error &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	base  = ds_get(context-&gt;ds, qual, ds_buffer_base);</div><div class='add'>+	index = ds_get(context-&gt;ds, qual, ds_index);</div><div class='add'>+</div><div class='add'>+	error = ((index - base) / ds_cfg.sizeof_rec[qual]);</div><div class='add'>+	if (pos)</div><div class='add'>+		*pos = error;</div><div class='add'>+ out:</div><div class='add'>+	ds_put_context(context);</div><div class='add'>+	return error;</div><div class='ctx'> }</div><div class='del'>-static inline void set_info_data(char *base, unsigned long value)</div><div class='add'>+</div><div class='add'>+int ds_get_bts_index(struct task_struct *task, size_t *pos)</div><div class='ctx'> {</div><div class='del'>-	(*(unsigned long *)(base + ds_cfg.info_data.offset)) = value;</div><div class='add'>+	return ds_get_index(task, pos, ds_bts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int ds_get_pebs_index(struct task_struct *task, size_t *pos)</div><div class='add'>+{</div><div class='add'>+	return ds_get_index(task, pos, ds_pebs);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-int ds_allocate(void **dsp, size_t bts_size_in_bytes)</div><div class='add'>+static int ds_get_end(struct task_struct *task, size_t *pos,</div><div class='add'>+		      enum ds_qualifier qual)</div><div class='ctx'> {</div><div class='del'>-	size_t bts_size_in_records;</div><div class='del'>-	unsigned long bts;</div><div class='del'>-	void *ds;</div><div class='add'>+	struct ds_context *context;</div><div class='add'>+	unsigned long base, end;</div><div class='add'>+	int error;</div><div class='add'>+</div><div class='add'>+	context = ds_get_context(task);</div><div class='add'>+	error = ds_validate_access(context, qual);</div><div class='add'>+	if (error &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	base = ds_get(context-&gt;ds, qual, ds_buffer_base);</div><div class='add'>+	end  = ds_get(context-&gt;ds, qual, ds_absolute_maximum);</div><div class='add'>+</div><div class='add'>+	error = ((end - base) / ds_cfg.sizeof_rec[qual]);</div><div class='add'>+	if (pos)</div><div class='add'>+		*pos = error;</div><div class='add'>+ out:</div><div class='add'>+	ds_put_context(context);</div><div class='add'>+	return error;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (!ds_cfg.sizeof_ds || !ds_cfg.sizeof_bts)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='add'>+int ds_get_bts_end(struct task_struct *task, size_t *pos)</div><div class='add'>+{</div><div class='add'>+	return ds_get_end(task, pos, ds_bts);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (bts_size_in_bytes &lt; 0)</div><div class='del'>-		return -EINVAL;</div><div class='add'>+int ds_get_pebs_end(struct task_struct *task, size_t *pos)</div><div class='add'>+{</div><div class='add'>+	return ds_get_end(task, pos, ds_pebs);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	bts_size_in_records =</div><div class='del'>-		bts_size_in_bytes / ds_cfg.sizeof_bts;</div><div class='del'>-	bts_size_in_bytes =</div><div class='del'>-		bts_size_in_records * ds_cfg.sizeof_bts;</div><div class='add'>+static int ds_access(struct task_struct *task, size_t index,</div><div class='add'>+		     const void **record, enum ds_qualifier qual)</div><div class='add'>+{</div><div class='add'>+	struct ds_context *context;</div><div class='add'>+	unsigned long base, idx;</div><div class='add'>+	int error;</div><div class='ctx'> </div><div class='del'>-	if (bts_size_in_bytes &lt;= 0)</div><div class='add'>+	if (!record)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	bts = (unsigned long)kzalloc(bts_size_in_bytes, GFP_KERNEL);</div><div class='del'>-</div><div class='del'>-	if (!bts)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	context = ds_get_context(task);</div><div class='add'>+	error = ds_validate_access(context, qual);</div><div class='add'>+	if (error &lt; 0)</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='del'>-	ds = kzalloc(ds_cfg.sizeof_ds, GFP_KERNEL);</div><div class='add'>+	base = ds_get(context-&gt;ds, qual, ds_buffer_base);</div><div class='add'>+	idx = base + (index * ds_cfg.sizeof_rec[qual]);</div><div class='ctx'> </div><div class='del'>-	if (!ds) {</div><div class='del'>-		kfree((void *)bts);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	set_bts_buffer_base(ds, bts);</div><div class='del'>-	set_bts_index(ds, bts);</div><div class='del'>-	set_bts_absolute_maximum(ds, bts + bts_size_in_bytes);</div><div class='del'>-	set_bts_interrupt_threshold(ds, bts + bts_size_in_bytes + 1);</div><div class='add'>+	error = -EINVAL;</div><div class='add'>+	if (idx &gt; ds_get(context-&gt;ds, qual, ds_absolute_maximum))</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='del'>-	*dsp = ds;</div><div class='del'>-	return 0;</div><div class='add'>+	*record = (const void *)idx;</div><div class='add'>+	error = ds_cfg.sizeof_rec[qual];</div><div class='add'>+ out:</div><div class='add'>+	ds_put_context(context);</div><div class='add'>+	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ds_free(void **dsp)</div><div class='add'>+int ds_access_bts(struct task_struct *task, size_t index, const void **record)</div><div class='ctx'> {</div><div class='del'>-	if (*dsp) {</div><div class='del'>-		kfree((void *)get_bts_buffer_base(*dsp));</div><div class='del'>-		kfree(*dsp);</div><div class='del'>-		*dsp = NULL;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='add'>+	return ds_access(task, index, record, ds_bts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ds_get_bts_size(void *ds)</div><div class='add'>+int ds_access_pebs(struct task_struct *task, size_t index, const void **record)</div><div class='ctx'> {</div><div class='del'>-	int size_in_bytes;</div><div class='del'>-</div><div class='del'>-	if (!ds_cfg.sizeof_ds || !ds_cfg.sizeof_bts)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	if (!ds)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	size_in_bytes =</div><div class='del'>-		get_bts_absolute_maximum(ds) -</div><div class='del'>-		get_bts_buffer_base(ds);</div><div class='del'>-	return size_in_bytes;</div><div class='add'>+	return ds_access(task, index, record, ds_pebs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ds_get_bts_end(void *ds)</div><div class='add'>+static int ds_write(struct task_struct *task, const void *record, size_t size,</div><div class='add'>+		    enum ds_qualifier qual, int force)</div><div class='ctx'> {</div><div class='del'>-	int size_in_bytes = ds_get_bts_size(ds);</div><div class='del'>-</div><div class='del'>-	if (size_in_bytes &lt;= 0)</div><div class='del'>-		return size_in_bytes;</div><div class='add'>+	struct ds_context *context;</div><div class='add'>+	int error;</div><div class='ctx'> </div><div class='del'>-	return size_in_bytes / ds_cfg.sizeof_bts;</div><div class='del'>-}</div><div class='add'>+	if (!record)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-int ds_get_bts_index(void *ds)</div><div class='del'>-{</div><div class='del'>-	int index_offset_in_bytes;</div><div class='add'>+	error = -EPERM;</div><div class='add'>+	context = ds_get_context(task);</div><div class='add'>+	if (!context)</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='del'>-	if (!ds_cfg.sizeof_ds || !ds_cfg.sizeof_bts)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='add'>+	if (!force) {</div><div class='add'>+		error = ds_validate_access(context, qual);</div><div class='add'>+		if (error &lt; 0)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	index_offset_in_bytes =</div><div class='del'>-		get_bts_index(ds) -</div><div class='del'>-		get_bts_buffer_base(ds);</div><div class='add'>+	error = 0;</div><div class='add'>+	while (size) {</div><div class='add'>+		unsigned long base, index, end, write_end, int_th;</div><div class='add'>+		unsigned long write_size, adj_write_size;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * write as much as possible without producing an</div><div class='add'>+		 * overflow interrupt.</div><div class='add'>+		 *</div><div class='add'>+		 * interrupt_threshold must either be</div><div class='add'>+		 * - bigger than absolute_maximum or</div><div class='add'>+		 * - point to a record between buffer_base and absolute_maximum</div><div class='add'>+		 *</div><div class='add'>+		 * index points to a valid record.</div><div class='add'>+		 */</div><div class='add'>+		base   = ds_get(context-&gt;ds, qual, ds_buffer_base);</div><div class='add'>+		index  = ds_get(context-&gt;ds, qual, ds_index);</div><div class='add'>+		end    = ds_get(context-&gt;ds, qual, ds_absolute_maximum);</div><div class='add'>+		int_th = ds_get(context-&gt;ds, qual, ds_interrupt_threshold);</div><div class='add'>+</div><div class='add'>+		write_end = min(end, int_th);</div><div class='add'>+</div><div class='add'>+		/* if we are already beyond the interrupt threshold,</div><div class='add'>+		 * we fill the entire buffer */</div><div class='add'>+		if (write_end &lt;= index)</div><div class='add'>+			write_end = end;</div><div class='add'>+</div><div class='add'>+		if (write_end &lt;= index)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		write_size = min((unsigned long) size, write_end - index);</div><div class='add'>+		memcpy((void *)index, record, write_size);</div><div class='add'>+</div><div class='add'>+		record = (const char *)record + write_size;</div><div class='add'>+		size  -= write_size;</div><div class='add'>+		error += write_size;</div><div class='add'>+</div><div class='add'>+		adj_write_size = write_size / ds_cfg.sizeof_rec[qual];</div><div class='add'>+		adj_write_size *= ds_cfg.sizeof_rec[qual];</div><div class='add'>+</div><div class='add'>+		/* zero out trailing bytes */</div><div class='add'>+		memset((char *)index + write_size, 0,</div><div class='add'>+		       adj_write_size - write_size);</div><div class='add'>+		index += adj_write_size;</div><div class='add'>+</div><div class='add'>+		if (index &gt;= end)</div><div class='add'>+			index = base;</div><div class='add'>+		ds_set(context-&gt;ds, qual, ds_index, index);</div><div class='add'>+</div><div class='add'>+		if (index &gt;= int_th)</div><div class='add'>+			ds_overflow(task, context, qual);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return index_offset_in_bytes / ds_cfg.sizeof_bts;</div><div class='add'>+ out:</div><div class='add'>+	ds_put_context(context);</div><div class='add'>+	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ds_set_overflow(void *ds, int method)</div><div class='add'>+int ds_write_bts(struct task_struct *task, const void *record, size_t size)</div><div class='ctx'> {</div><div class='del'>-	switch (method) {</div><div class='del'>-	case DS_O_SIGNAL:</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-	case DS_O_WRAP:</div><div class='del'>-		return 0;</div><div class='del'>-	default:</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='add'>+	return ds_write(task, record, size, ds_bts, /* force = */ 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ds_get_overflow(void *ds)</div><div class='add'>+int ds_write_pebs(struct task_struct *task, const void *record, size_t size)</div><div class='ctx'> {</div><div class='del'>-	return DS_O_WRAP;</div><div class='add'>+	return ds_write(task, record, size, ds_pebs, /* force = */ 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ds_clear(void *ds)</div><div class='add'>+int ds_unchecked_write_bts(struct task_struct *task,</div><div class='add'>+			   const void *record, size_t size)</div><div class='ctx'> {</div><div class='del'>-	int bts_size = ds_get_bts_size(ds);</div><div class='del'>-	unsigned long bts_base;</div><div class='del'>-</div><div class='del'>-	if (bts_size &lt;= 0)</div><div class='del'>-		return bts_size;</div><div class='del'>-</div><div class='del'>-	bts_base = get_bts_buffer_base(ds);</div><div class='del'>-	memset((void *)bts_base, 0, bts_size);</div><div class='del'>-</div><div class='del'>-	set_bts_index(ds, bts_base);</div><div class='del'>-	return 0;</div><div class='add'>+	return ds_write(task, record, size, ds_bts, /* force = */ 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ds_read_bts(void *ds, int index, struct bts_struct *out)</div><div class='add'>+int ds_unchecked_write_pebs(struct task_struct *task,</div><div class='add'>+			    const void *record, size_t size)</div><div class='ctx'> {</div><div class='del'>-	void *bts;</div><div class='add'>+	return ds_write(task, record, size, ds_pebs, /* force = */ 1);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (!ds_cfg.sizeof_ds || !ds_cfg.sizeof_bts)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='add'>+static int ds_reset_or_clear(struct task_struct *task,</div><div class='add'>+			     enum ds_qualifier qual, int clear)</div><div class='add'>+{</div><div class='add'>+	struct ds_context *context;</div><div class='add'>+	unsigned long base, end;</div><div class='add'>+	int error;</div><div class='ctx'> </div><div class='del'>-	if (index &lt; 0)</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	context = ds_get_context(task);</div><div class='add'>+	error = ds_validate_access(context, qual);</div><div class='add'>+	if (error &lt; 0)</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='del'>-	if (index &gt;= ds_get_bts_size(ds))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	base = ds_get(context-&gt;ds, qual, ds_buffer_base);</div><div class='add'>+	end  = ds_get(context-&gt;ds, qual, ds_absolute_maximum);</div><div class='ctx'> </div><div class='del'>-	bts = (void *)(get_bts_buffer_base(ds) + (index * ds_cfg.sizeof_bts));</div><div class='add'>+	if (clear)</div><div class='add'>+		memset((void *)base, 0, end - base);</div><div class='ctx'> </div><div class='del'>-	memset(out, 0, sizeof(*out));</div><div class='del'>-	if (get_from_ip(bts) == BTS_ESCAPE_ADDRESS) {</div><div class='del'>-		out-&gt;qualifier       = get_info_type(bts);</div><div class='del'>-		out-&gt;variant.jiffies = get_info_data(bts);</div><div class='del'>-	} else {</div><div class='del'>-		out-&gt;qualifier = BTS_BRANCH;</div><div class='del'>-		out-&gt;variant.lbr.from_ip = get_from_ip(bts);</div><div class='del'>-		out-&gt;variant.lbr.to_ip   = get_to_ip(bts);</div><div class='del'>-	}</div><div class='add'>+	ds_set(context-&gt;ds, qual, ds_index, base);</div><div class='ctx'> </div><div class='del'>-	return sizeof(*out);;</div><div class='add'>+	error = 0;</div><div class='add'>+ out:</div><div class='add'>+	ds_put_context(context);</div><div class='add'>+	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ds_write_bts(void *ds, const struct bts_struct *in)</div><div class='add'>+int ds_reset_bts(struct task_struct *task)</div><div class='ctx'> {</div><div class='del'>-	unsigned long bts;</div><div class='del'>-</div><div class='del'>-	if (!ds_cfg.sizeof_ds || !ds_cfg.sizeof_bts)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	if (ds_get_bts_size(ds) &lt;= 0)</div><div class='del'>-		return -ENXIO;</div><div class='add'>+	return ds_reset_or_clear(task, ds_bts, /* clear = */ 0);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	bts = get_bts_index(ds);</div><div class='add'>+int ds_reset_pebs(struct task_struct *task)</div><div class='add'>+{</div><div class='add'>+	return ds_reset_or_clear(task, ds_pebs, /* clear = */ 0);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	memset((void *)bts, 0, ds_cfg.sizeof_bts);</div><div class='del'>-	switch (in-&gt;qualifier) {</div><div class='del'>-	case BTS_INVALID:</div><div class='del'>-		break;</div><div class='add'>+int ds_clear_bts(struct task_struct *task)</div><div class='add'>+{</div><div class='add'>+	return ds_reset_or_clear(task, ds_bts, /* clear = */ 1);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	case BTS_BRANCH:</div><div class='del'>-		set_from_ip((void *)bts, in-&gt;variant.lbr.from_ip);</div><div class='del'>-		set_to_ip((void *)bts, in-&gt;variant.lbr.to_ip);</div><div class='del'>-		break;</div><div class='add'>+int ds_clear_pebs(struct task_struct *task)</div><div class='add'>+{</div><div class='add'>+	return ds_reset_or_clear(task, ds_pebs, /* clear = */ 1);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	case BTS_TASK_ARRIVES:</div><div class='del'>-	case BTS_TASK_DEPARTS:</div><div class='del'>-		set_from_ip((void *)bts, BTS_ESCAPE_ADDRESS);</div><div class='del'>-		set_info_type((void *)bts, in-&gt;qualifier);</div><div class='del'>-		set_info_data((void *)bts, in-&gt;variant.jiffies);</div><div class='del'>-		break;</div><div class='add'>+int ds_get_pebs_reset(struct task_struct *task, u64 *value)</div><div class='add'>+{</div><div class='add'>+	struct ds_context *context;</div><div class='add'>+	int error;</div><div class='ctx'> </div><div class='del'>-	default:</div><div class='add'>+	if (!value)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	bts = bts + ds_cfg.sizeof_bts;</div><div class='del'>-	if (bts &gt;= get_bts_absolute_maximum(ds))</div><div class='del'>-		bts = get_bts_buffer_base(ds);</div><div class='del'>-	set_bts_index(ds, bts);</div><div class='add'>+	context = ds_get_context(task);</div><div class='add'>+	error = ds_validate_access(context, ds_pebs);</div><div class='add'>+	if (error &lt; 0)</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='del'>-	return ds_cfg.sizeof_bts;</div><div class='add'>+	*value = *(u64 *)(context-&gt;ds + (ds_cfg.sizeof_field * 8));</div><div class='add'>+</div><div class='add'>+	error = 0;</div><div class='add'>+ out:</div><div class='add'>+	ds_put_context(context);</div><div class='add'>+	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-unsigned long ds_debugctl_mask(void)</div><div class='add'>+int ds_set_pebs_reset(struct task_struct *task, u64 value)</div><div class='ctx'> {</div><div class='del'>-	return ds_cfg.debugctl_mask;</div><div class='del'>-}</div><div class='add'>+	struct ds_context *context;</div><div class='add'>+	int error;</div><div class='ctx'> </div><div class='del'>-#ifdef __i386__</div><div class='del'>-static const struct ds_configuration ds_cfg_netburst = {</div><div class='del'>-	.sizeof_ds = 9 * 4,</div><div class='del'>-	.bts_buffer_base = { 0, 4 },</div><div class='del'>-	.bts_index = { 4, 4 },</div><div class='del'>-	.bts_absolute_maximum = { 8, 4 },</div><div class='del'>-	.bts_interrupt_threshold = { 12, 4 },</div><div class='del'>-	.sizeof_bts = 3 * 4,</div><div class='del'>-	.from_ip = { 0, 4 },</div><div class='del'>-	.to_ip = { 4, 4 },</div><div class='del'>-	.info_type = { 4, 1 },</div><div class='del'>-	.info_data = { 8, 4 },</div><div class='del'>-	.debugctl_mask = (1&lt;&lt;2)|(1&lt;&lt;3)</div><div class='del'>-};</div><div class='add'>+	context = ds_get_context(task);</div><div class='add'>+	error = ds_validate_access(context, ds_pebs);</div><div class='add'>+	if (error &lt; 0)</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='del'>-static const struct ds_configuration ds_cfg_pentium_m = {</div><div class='del'>-	.sizeof_ds = 9 * 4,</div><div class='del'>-	.bts_buffer_base = { 0, 4 },</div><div class='del'>-	.bts_index = { 4, 4 },</div><div class='del'>-	.bts_absolute_maximum = { 8, 4 },</div><div class='del'>-	.bts_interrupt_threshold = { 12, 4 },</div><div class='del'>-	.sizeof_bts = 3 * 4,</div><div class='del'>-	.from_ip = { 0, 4 },</div><div class='del'>-	.to_ip = { 4, 4 },</div><div class='del'>-	.info_type = { 4, 1 },</div><div class='del'>-	.info_data = { 8, 4 },</div><div class='del'>-	.debugctl_mask = (1&lt;&lt;6)|(1&lt;&lt;7)</div><div class='add'>+	*(u64 *)(context-&gt;ds + (ds_cfg.sizeof_field * 8)) = value;</div><div class='add'>+</div><div class='add'>+	error = 0;</div><div class='add'>+ out:</div><div class='add'>+	ds_put_context(context);</div><div class='add'>+	return error;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct ds_configuration ds_cfg_var = {</div><div class='add'>+	.sizeof_ds    = sizeof(long) * 12,</div><div class='add'>+	.sizeof_field = sizeof(long),</div><div class='add'>+	.sizeof_rec[ds_bts]   = sizeof(long) * 3,</div><div class='add'>+	.sizeof_rec[ds_pebs]  = sizeof(long) * 10</div><div class='ctx'> };</div><div class='del'>-#endif /* _i386_ */</div><div class='del'>-</div><div class='del'>-static const struct ds_configuration ds_cfg_core2 = {</div><div class='del'>-	.sizeof_ds = 9 * 8,</div><div class='del'>-	.bts_buffer_base = { 0, 8 },</div><div class='del'>-	.bts_index = { 8, 8 },</div><div class='del'>-	.bts_absolute_maximum = { 16, 8 },</div><div class='del'>-	.bts_interrupt_threshold = { 24, 8 },</div><div class='del'>-	.sizeof_bts = 3 * 8,</div><div class='del'>-	.from_ip = { 0, 8 },</div><div class='del'>-	.to_ip = { 8, 8 },</div><div class='del'>-	.info_type = { 8, 1 },</div><div class='del'>-	.info_data = { 16, 8 },</div><div class='del'>-	.debugctl_mask = (1&lt;&lt;6)|(1&lt;&lt;7)|(1&lt;&lt;9)</div><div class='add'>+static const struct ds_configuration ds_cfg_64 = {</div><div class='add'>+	.sizeof_ds    = 8 * 12,</div><div class='add'>+	.sizeof_field = 8,</div><div class='add'>+	.sizeof_rec[ds_bts]   = 8 * 3,</div><div class='add'>+	.sizeof_rec[ds_pebs]  = 8 * 10</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline void</div><div class='hunk'>@@ -429,14 +821,13 @@ void __cpuinit ds_init_intel(struct cpuinfo_x86 *c)</div><div class='ctx'> 	switch (c-&gt;x86) {</div><div class='ctx'> 	case 0x6:</div><div class='ctx'> 		switch (c-&gt;x86_model) {</div><div class='del'>-#ifdef __i386__</div><div class='ctx'> 		case 0xD:</div><div class='ctx'> 		case 0xE: /* Pentium M */</div><div class='del'>-			ds_configure(&amp;ds_cfg_pentium_m);</div><div class='add'>+			ds_configure(&amp;ds_cfg_var);</div><div class='ctx'> 			break;</div><div class='del'>-#endif /* _i386_ */</div><div class='ctx'> 		case 0xF: /* Core2 */</div><div class='del'>-			ds_configure(&amp;ds_cfg_core2);</div><div class='add'>+		case 0x1C: /* Atom */</div><div class='add'>+			ds_configure(&amp;ds_cfg_64);</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			/* sorry, don't know about them */</div><div class='hunk'>@@ -445,13 +836,11 @@ void __cpuinit ds_init_intel(struct cpuinfo_x86 *c)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0xF:</div><div class='ctx'> 		switch (c-&gt;x86_model) {</div><div class='del'>-#ifdef __i386__</div><div class='ctx'> 		case 0x0:</div><div class='ctx'> 		case 0x1:</div><div class='ctx'> 		case 0x2: /* Netburst */</div><div class='del'>-			ds_configure(&amp;ds_cfg_netburst);</div><div class='add'>+			ds_configure(&amp;ds_cfg_var);</div><div class='ctx'> 			break;</div><div class='del'>-#endif /* _i386_ */</div><div class='ctx'> 		default:</div><div class='ctx'> 			/* sorry, don't know about them */</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -462,3 +851,14 @@ void __cpuinit ds_init_intel(struct cpuinfo_x86 *c)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+void ds_free(struct ds_context *context)</div><div class='add'>+{</div><div class='add'>+	/* This is called when the task owning the parameter context</div><div class='add'>+	 * is dying. There should not be any user of that context left</div><div class='add'>+	 * to disturb us, anymore. */</div><div class='add'>+	unsigned long leftovers = context-&gt;count;</div><div class='add'>+	while (leftovers--)</div><div class='add'>+		ds_put_context(context);</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_X86_DS */</div><div class='head'>diff --git a/arch/x86/kernel/dumpstack_32.c b/arch/x86/kernel/dumpstack_32.c<br/>new file mode 100644<br/>index 000000000000..1a78180f08d3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/dumpstack_32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/dumpstack_32.c</a></div><div class='hunk'>@@ -0,0 +1,449 @@</div><div class='add'>+/*</div><div class='add'>+ *  Copyright (C) 1991, 1992  Linus Torvalds</div><div class='add'>+ *  Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/kallsyms.h&gt;</div><div class='add'>+#include &lt;linux/kprobes.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/utsname.h&gt;</div><div class='add'>+#include &lt;linux/hardirq.h&gt;</div><div class='add'>+#include &lt;linux/kdebug.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/ptrace.h&gt;</div><div class='add'>+#include &lt;linux/kexec.h&gt;</div><div class='add'>+#include &lt;linux/bug.h&gt;</div><div class='add'>+#include &lt;linux/nmi.h&gt;</div><div class='add'>+#include &lt;linux/sysfs.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/stacktrace.h&gt;</div><div class='add'>+</div><div class='add'>+#define STACKSLOTS_PER_LINE 8</div><div class='add'>+#define get_bp(bp) asm("movl %%ebp, %0" : "=r" (bp) :)</div><div class='add'>+</div><div class='add'>+int panic_on_unrecovered_nmi;</div><div class='add'>+int kstack_depth_to_print = 3 * STACKSLOTS_PER_LINE;</div><div class='add'>+static unsigned int code_bytes = 64;</div><div class='add'>+static int die_counter;</div><div class='add'>+</div><div class='add'>+void printk_address(unsigned long address, int reliable)</div><div class='add'>+{</div><div class='add'>+	printk(" [&lt;%p&gt;] %s%pS\n", (void *) address,</div><div class='add'>+			reliable ? "" : "? ", (void *) address);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int valid_stack_ptr(struct thread_info *tinfo,</div><div class='add'>+			void *p, unsigned int size, void *end)</div><div class='add'>+{</div><div class='add'>+	void *t = tinfo;</div><div class='add'>+	if (end) {</div><div class='add'>+		if (p &lt; end &amp;&amp; p &gt;= (end-THREAD_SIZE))</div><div class='add'>+			return 1;</div><div class='add'>+		else</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='add'>+	return p &gt; t &amp;&amp; p &lt; t + THREAD_SIZE - size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* The form of the top of the frame on the stack */</div><div class='add'>+struct stack_frame {</div><div class='add'>+	struct stack_frame *next_frame;</div><div class='add'>+	unsigned long return_address;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline unsigned long</div><div class='add'>+print_context_stack(struct thread_info *tinfo,</div><div class='add'>+		unsigned long *stack, unsigned long bp,</div><div class='add'>+		const struct stacktrace_ops *ops, void *data,</div><div class='add'>+		unsigned long *end)</div><div class='add'>+{</div><div class='add'>+	struct stack_frame *frame = (struct stack_frame *)bp;</div><div class='add'>+</div><div class='add'>+	while (valid_stack_ptr(tinfo, stack, sizeof(*stack), end)) {</div><div class='add'>+		unsigned long addr;</div><div class='add'>+</div><div class='add'>+		addr = *stack;</div><div class='add'>+		if (__kernel_text_address(addr)) {</div><div class='add'>+			if ((unsigned long) stack == bp + sizeof(long)) {</div><div class='add'>+				ops-&gt;address(data, addr, 1);</div><div class='add'>+				frame = frame-&gt;next_frame;</div><div class='add'>+				bp = (unsigned long) frame;</div><div class='add'>+			} else {</div><div class='add'>+				ops-&gt;address(data, addr, bp == 0);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		stack++;</div><div class='add'>+	}</div><div class='add'>+	return bp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void dump_trace(struct task_struct *task, struct pt_regs *regs,</div><div class='add'>+		unsigned long *stack, unsigned long bp,</div><div class='add'>+		const struct stacktrace_ops *ops, void *data)</div><div class='add'>+{</div><div class='add'>+	if (!task)</div><div class='add'>+		task = current;</div><div class='add'>+</div><div class='add'>+	if (!stack) {</div><div class='add'>+		unsigned long dummy;</div><div class='add'>+		stack = &amp;dummy;</div><div class='add'>+		if (task &amp;&amp; task != current)</div><div class='add'>+			stack = (unsigned long *)task-&gt;thread.sp;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_FRAME_POINTER</div><div class='add'>+	if (!bp) {</div><div class='add'>+		if (task == current) {</div><div class='add'>+			/* Grab bp right from our regs */</div><div class='add'>+			get_bp(bp);</div><div class='add'>+		} else {</div><div class='add'>+			/* bp is the last reg pushed by switch_to */</div><div class='add'>+			bp = *(unsigned long *) task-&gt;thread.sp;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	for (;;) {</div><div class='add'>+		struct thread_info *context;</div><div class='add'>+</div><div class='add'>+		context = (struct thread_info *)</div><div class='add'>+			((unsigned long)stack &amp; (~(THREAD_SIZE - 1)));</div><div class='add'>+		bp = print_context_stack(context, stack, bp, ops, data, NULL);</div><div class='add'>+</div><div class='add'>+		stack = (unsigned long *)context-&gt;previous_esp;</div><div class='add'>+		if (!stack)</div><div class='add'>+			break;</div><div class='add'>+		if (ops-&gt;stack(data, "IRQ") &lt; 0)</div><div class='add'>+			break;</div><div class='add'>+		touch_nmi_watchdog();</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dump_trace);</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+print_trace_warning_symbol(void *data, char *msg, unsigned long symbol)</div><div class='add'>+{</div><div class='add'>+	printk(data);</div><div class='add'>+	print_symbol(msg, symbol);</div><div class='add'>+	printk("\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void print_trace_warning(void *data, char *msg)</div><div class='add'>+{</div><div class='add'>+	printk("%s%s\n", (char *)data, msg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int print_trace_stack(void *data, char *name)</div><div class='add'>+{</div><div class='add'>+	printk("%s &lt;%s&gt; ", (char *)data, name);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Print one address/symbol entries per line.</div><div class='add'>+ */</div><div class='add'>+static void print_trace_address(void *data, unsigned long addr, int reliable)</div><div class='add'>+{</div><div class='add'>+	touch_nmi_watchdog();</div><div class='add'>+	printk(data);</div><div class='add'>+	printk_address(addr, reliable);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct stacktrace_ops print_trace_ops = {</div><div class='add'>+	.warning = print_trace_warning,</div><div class='add'>+	.warning_symbol = print_trace_warning_symbol,</div><div class='add'>+	.stack = print_trace_stack,</div><div class='add'>+	.address = print_trace_address,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+show_trace_log_lvl(struct task_struct *task, struct pt_regs *regs,</div><div class='add'>+		unsigned long *stack, unsigned long bp, char *log_lvl)</div><div class='add'>+{</div><div class='add'>+	printk("%sCall Trace:\n", log_lvl);</div><div class='add'>+	dump_trace(task, regs, stack, bp, &amp;print_trace_ops, log_lvl);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void show_trace(struct task_struct *task, struct pt_regs *regs,</div><div class='add'>+		unsigned long *stack, unsigned long bp)</div><div class='add'>+{</div><div class='add'>+	show_trace_log_lvl(task, regs, stack, bp, "");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs,</div><div class='add'>+		unsigned long *sp, unsigned long bp, char *log_lvl)</div><div class='add'>+{</div><div class='add'>+	unsigned long *stack;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (sp == NULL) {</div><div class='add'>+		if (task)</div><div class='add'>+			sp = (unsigned long *)task-&gt;thread.sp;</div><div class='add'>+		else</div><div class='add'>+			sp = (unsigned long *)&amp;sp;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	stack = sp;</div><div class='add'>+	for (i = 0; i &lt; kstack_depth_to_print; i++) {</div><div class='add'>+		if (kstack_end(stack))</div><div class='add'>+			break;</div><div class='add'>+		if (i &amp;&amp; ((i % STACKSLOTS_PER_LINE) == 0))</div><div class='add'>+			printk("\n%s", log_lvl);</div><div class='add'>+		printk(" %08lx", *stack++);</div><div class='add'>+		touch_nmi_watchdog();</div><div class='add'>+	}</div><div class='add'>+	printk("\n");</div><div class='add'>+	show_trace_log_lvl(task, regs, sp, bp, log_lvl);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void show_stack(struct task_struct *task, unsigned long *sp)</div><div class='add'>+{</div><div class='add'>+	show_stack_log_lvl(task, NULL, sp, 0, "");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The architecture-independent dump_stack generator</div><div class='add'>+ */</div><div class='add'>+void dump_stack(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long bp = 0;</div><div class='add'>+	unsigned long stack;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_FRAME_POINTER</div><div class='add'>+	if (!bp)</div><div class='add'>+		get_bp(bp);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	printk("Pid: %d, comm: %.20s %s %s %.*s\n",</div><div class='add'>+		current-&gt;pid, current-&gt;comm, print_tainted(),</div><div class='add'>+		init_utsname()-&gt;release,</div><div class='add'>+		(int)strcspn(init_utsname()-&gt;version, " "),</div><div class='add'>+		init_utsname()-&gt;version);</div><div class='add'>+	show_trace(NULL, NULL, &amp;stack, bp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL(dump_stack);</div><div class='add'>+</div><div class='add'>+void show_registers(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	print_modules();</div><div class='add'>+	__show_regs(regs, 0);</div><div class='add'>+</div><div class='add'>+	printk(KERN_EMERG "Process %.*s (pid: %d, ti=%p task=%p task.ti=%p)\n",</div><div class='add'>+		TASK_COMM_LEN, current-&gt;comm, task_pid_nr(current),</div><div class='add'>+		current_thread_info(), current, task_thread_info(current));</div><div class='add'>+	/*</div><div class='add'>+	 * When in-kernel, we also print out the stack and code at the</div><div class='add'>+	 * time of the fault..</div><div class='add'>+	 */</div><div class='add'>+	if (!user_mode_vm(regs)) {</div><div class='add'>+		unsigned int code_prologue = code_bytes * 43 / 64;</div><div class='add'>+		unsigned int code_len = code_bytes;</div><div class='add'>+		unsigned char c;</div><div class='add'>+		u8 *ip;</div><div class='add'>+</div><div class='add'>+		printk(KERN_EMERG "Stack:\n");</div><div class='add'>+		show_stack_log_lvl(NULL, regs, &amp;regs-&gt;sp,</div><div class='add'>+				0, KERN_EMERG);</div><div class='add'>+</div><div class='add'>+		printk(KERN_EMERG "Code: ");</div><div class='add'>+</div><div class='add'>+		ip = (u8 *)regs-&gt;ip - code_prologue;</div><div class='add'>+		if (ip &lt; (u8 *)PAGE_OFFSET || probe_kernel_address(ip, c)) {</div><div class='add'>+			/* try starting at IP */</div><div class='add'>+			ip = (u8 *)regs-&gt;ip;</div><div class='add'>+			code_len = code_len - code_prologue + 1;</div><div class='add'>+		}</div><div class='add'>+		for (i = 0; i &lt; code_len; i++, ip++) {</div><div class='add'>+			if (ip &lt; (u8 *)PAGE_OFFSET ||</div><div class='add'>+					probe_kernel_address(ip, c)) {</div><div class='add'>+				printk(" Bad EIP value.");</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			if (ip == (u8 *)regs-&gt;ip)</div><div class='add'>+				printk("&lt;%02x&gt; ", c);</div><div class='add'>+			else</div><div class='add'>+				printk("%02x ", c);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	printk("\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int is_valid_bugaddr(unsigned long ip)</div><div class='add'>+{</div><div class='add'>+	unsigned short ud2;</div><div class='add'>+</div><div class='add'>+	if (ip &lt; PAGE_OFFSET)</div><div class='add'>+		return 0;</div><div class='add'>+	if (probe_kernel_address((unsigned short *)ip, ud2))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return ud2 == 0x0b0f;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static raw_spinlock_t die_lock = __RAW_SPIN_LOCK_UNLOCKED;</div><div class='add'>+static int die_owner = -1;</div><div class='add'>+static unsigned int die_nest_count;</div><div class='add'>+</div><div class='add'>+unsigned __kprobes long oops_begin(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	oops_enter();</div><div class='add'>+</div><div class='add'>+	if (die_owner != raw_smp_processor_id()) {</div><div class='add'>+		console_verbose();</div><div class='add'>+		raw_local_irq_save(flags);</div><div class='add'>+		__raw_spin_lock(&amp;die_lock);</div><div class='add'>+		die_owner = smp_processor_id();</div><div class='add'>+		die_nest_count = 0;</div><div class='add'>+		bust_spinlocks(1);</div><div class='add'>+	} else {</div><div class='add'>+		raw_local_irq_save(flags);</div><div class='add'>+	}</div><div class='add'>+	die_nest_count++;</div><div class='add'>+	return flags;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, int signr)</div><div class='add'>+{</div><div class='add'>+	bust_spinlocks(0);</div><div class='add'>+	die_owner = -1;</div><div class='add'>+	add_taint(TAINT_DIE);</div><div class='add'>+	__raw_spin_unlock(&amp;die_lock);</div><div class='add'>+	raw_local_irq_restore(flags);</div><div class='add'>+</div><div class='add'>+	if (!regs)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (kexec_should_crash(current))</div><div class='add'>+		crash_kexec(regs);</div><div class='add'>+	if (in_interrupt())</div><div class='add'>+		panic("Fatal exception in interrupt");</div><div class='add'>+	if (panic_on_oops)</div><div class='add'>+		panic("Fatal exception");</div><div class='add'>+	oops_exit();</div><div class='add'>+	do_exit(signr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int __kprobes __die(const char *str, struct pt_regs *regs, long err)</div><div class='add'>+{</div><div class='add'>+	unsigned short ss;</div><div class='add'>+	unsigned long sp;</div><div class='add'>+</div><div class='add'>+	printk(KERN_EMERG "%s: %04lx [#%d] ", str, err &amp; 0xffff, ++die_counter);</div><div class='add'>+#ifdef CONFIG_PREEMPT</div><div class='add'>+	printk("PREEMPT ");</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_SMP</div><div class='add'>+	printk("SMP ");</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_DEBUG_PAGEALLOC</div><div class='add'>+	printk("DEBUG_PAGEALLOC");</div><div class='add'>+#endif</div><div class='add'>+	printk("\n");</div><div class='add'>+	sysfs_printk_last_file();</div><div class='add'>+	if (notify_die(DIE_OOPS, str, regs, err,</div><div class='add'>+			current-&gt;thread.trap_no, SIGSEGV) == NOTIFY_STOP)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	show_registers(regs);</div><div class='add'>+	/* Executive summary in case the oops scrolled away */</div><div class='add'>+	sp = (unsigned long) (&amp;regs-&gt;sp);</div><div class='add'>+	savesegment(ss, ss);</div><div class='add'>+	if (user_mode(regs)) {</div><div class='add'>+		sp = regs-&gt;sp;</div><div class='add'>+		ss = regs-&gt;ss &amp; 0xffff;</div><div class='add'>+	}</div><div class='add'>+	printk(KERN_EMERG "EIP: [&lt;%08lx&gt;] ", regs-&gt;ip);</div><div class='add'>+	print_symbol("%s", regs-&gt;ip);</div><div class='add'>+	printk(" SS:ESP %04x:%08lx\n", ss, sp);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This is gone through when something in the kernel has done something bad</div><div class='add'>+ * and is about to be terminated:</div><div class='add'>+ */</div><div class='add'>+void die(const char *str, struct pt_regs *regs, long err)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags = oops_begin();</div><div class='add'>+</div><div class='add'>+	if (die_nest_count &lt; 3) {</div><div class='add'>+		report_bug(regs-&gt;ip, regs);</div><div class='add'>+</div><div class='add'>+		if (__die(str, regs, err))</div><div class='add'>+			regs = NULL;</div><div class='add'>+	} else {</div><div class='add'>+		printk(KERN_EMERG "Recursive die() failure, output suppressed\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	oops_end(flags, regs, SIGSEGV);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static DEFINE_SPINLOCK(nmi_print_lock);</div><div class='add'>+</div><div class='add'>+void notrace __kprobes</div><div class='add'>+die_nmi(char *str, struct pt_regs *regs, int do_panic)</div><div class='add'>+{</div><div class='add'>+	if (notify_die(DIE_NMIWATCHDOG, str, regs, 0, 2, SIGINT) == NOTIFY_STOP)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;nmi_print_lock);</div><div class='add'>+	/*</div><div class='add'>+	* We are in trouble anyway, lets at least try</div><div class='add'>+	* to get a message out:</div><div class='add'>+	*/</div><div class='add'>+	bust_spinlocks(1);</div><div class='add'>+	printk(KERN_EMERG "%s", str);</div><div class='add'>+	printk(" on CPU%d, ip %08lx, registers:\n",</div><div class='add'>+		smp_processor_id(), regs-&gt;ip);</div><div class='add'>+	show_registers(regs);</div><div class='add'>+	if (do_panic)</div><div class='add'>+		panic("Non maskable interrupt");</div><div class='add'>+	console_silent();</div><div class='add'>+	spin_unlock(&amp;nmi_print_lock);</div><div class='add'>+	bust_spinlocks(0);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If we are in kernel we are probably nested up pretty bad</div><div class='add'>+	 * and might aswell get out now while we still can:</div><div class='add'>+	 */</div><div class='add'>+	if (!user_mode_vm(regs)) {</div><div class='add'>+		current-&gt;thread.trap_no = 2;</div><div class='add'>+		crash_kexec(regs);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	do_exit(SIGSEGV);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init oops_setup(char *s)</div><div class='add'>+{</div><div class='add'>+	if (!s)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (!strcmp(s, "panic"))</div><div class='add'>+		panic_on_oops = 1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+early_param("oops", oops_setup);</div><div class='add'>+</div><div class='add'>+static int __init kstack_setup(char *s)</div><div class='add'>+{</div><div class='add'>+	if (!s)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	kstack_depth_to_print = simple_strtoul(s, NULL, 0);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+early_param("kstack", kstack_setup);</div><div class='add'>+</div><div class='add'>+static int __init code_bytes_setup(char *s)</div><div class='add'>+{</div><div class='add'>+	code_bytes = simple_strtoul(s, NULL, 0);</div><div class='add'>+	if (code_bytes &gt; 8192)</div><div class='add'>+		code_bytes = 8192;</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+__setup("code_bytes=", code_bytes_setup);</div><div class='head'>diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c<br/>new file mode 100644<br/>index 000000000000..96a5db7da8a7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/dumpstack_64.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/dumpstack_64.c</a></div><div class='hunk'>@@ -0,0 +1,575 @@</div><div class='add'>+/*</div><div class='add'>+ *  Copyright (C) 1991, 1992  Linus Torvalds</div><div class='add'>+ *  Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/kallsyms.h&gt;</div><div class='add'>+#include &lt;linux/kprobes.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/utsname.h&gt;</div><div class='add'>+#include &lt;linux/hardirq.h&gt;</div><div class='add'>+#include &lt;linux/kdebug.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/ptrace.h&gt;</div><div class='add'>+#include &lt;linux/kexec.h&gt;</div><div class='add'>+#include &lt;linux/bug.h&gt;</div><div class='add'>+#include &lt;linux/nmi.h&gt;</div><div class='add'>+#include &lt;linux/sysfs.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/stacktrace.h&gt;</div><div class='add'>+</div><div class='add'>+#define STACKSLOTS_PER_LINE 4</div><div class='add'>+#define get_bp(bp) asm("movq %%rbp, %0" : "=r" (bp) :)</div><div class='add'>+</div><div class='add'>+int panic_on_unrecovered_nmi;</div><div class='add'>+int kstack_depth_to_print = 3 * STACKSLOTS_PER_LINE;</div><div class='add'>+static unsigned int code_bytes = 64;</div><div class='add'>+static int die_counter;</div><div class='add'>+</div><div class='add'>+void printk_address(unsigned long address, int reliable)</div><div class='add'>+{</div><div class='add'>+	printk(" [&lt;%p&gt;] %s%pS\n", (void *) address,</div><div class='add'>+			reliable ? "" : "? ", (void *) address);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned long *in_exception_stack(unsigned cpu, unsigned long stack,</div><div class='add'>+					unsigned *usedp, char **idp)</div><div class='add'>+{</div><div class='add'>+	static char ids[][8] = {</div><div class='add'>+		[DEBUG_STACK - 1] = "#DB",</div><div class='add'>+		[NMI_STACK - 1] = "NMI",</div><div class='add'>+		[DOUBLEFAULT_STACK - 1] = "#DF",</div><div class='add'>+		[STACKFAULT_STACK - 1] = "#SS",</div><div class='add'>+		[MCE_STACK - 1] = "#MC",</div><div class='add'>+#if DEBUG_STKSZ &gt; EXCEPTION_STKSZ</div><div class='add'>+		[N_EXCEPTION_STACKS ...</div><div class='add'>+			N_EXCEPTION_STACKS + DEBUG_STKSZ / EXCEPTION_STKSZ - 2] = "#DB[?]"</div><div class='add'>+#endif</div><div class='add'>+	};</div><div class='add'>+	unsigned k;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Iterate over all exception stacks, and figure out whether</div><div class='add'>+	 * 'stack' is in one of them:</div><div class='add'>+	 */</div><div class='add'>+	for (k = 0; k &lt; N_EXCEPTION_STACKS; k++) {</div><div class='add'>+		unsigned long end = per_cpu(orig_ist, cpu).ist[k];</div><div class='add'>+		/*</div><div class='add'>+		 * Is 'stack' above this exception frame's end?</div><div class='add'>+		 * If yes then skip to the next frame.</div><div class='add'>+		 */</div><div class='add'>+		if (stack &gt;= end)</div><div class='add'>+			continue;</div><div class='add'>+		/*</div><div class='add'>+		 * Is 'stack' above this exception frame's start address?</div><div class='add'>+		 * If yes then we found the right frame.</div><div class='add'>+		 */</div><div class='add'>+		if (stack &gt;= end - EXCEPTION_STKSZ) {</div><div class='add'>+			/*</div><div class='add'>+			 * Make sure we only iterate through an exception</div><div class='add'>+			 * stack once. If it comes up for the second time</div><div class='add'>+			 * then there's something wrong going on - just</div><div class='add'>+			 * break out and return NULL:</div><div class='add'>+			 */</div><div class='add'>+			if (*usedp &amp; (1U &lt;&lt; k))</div><div class='add'>+				break;</div><div class='add'>+			*usedp |= 1U &lt;&lt; k;</div><div class='add'>+			*idp = ids[k];</div><div class='add'>+			return (unsigned long *)end;</div><div class='add'>+		}</div><div class='add'>+		/*</div><div class='add'>+		 * If this is a debug stack, and if it has a larger size than</div><div class='add'>+		 * the usual exception stacks, then 'stack' might still</div><div class='add'>+		 * be within the lower portion of the debug stack:</div><div class='add'>+		 */</div><div class='add'>+#if DEBUG_STKSZ &gt; EXCEPTION_STKSZ</div><div class='add'>+		if (k == DEBUG_STACK - 1 &amp;&amp; stack &gt;= end - DEBUG_STKSZ) {</div><div class='add'>+			unsigned j = N_EXCEPTION_STACKS - 1;</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * Black magic. A large debug stack is composed of</div><div class='add'>+			 * multiple exception stack entries, which we</div><div class='add'>+			 * iterate through now. Dont look:</div><div class='add'>+			 */</div><div class='add'>+			do {</div><div class='add'>+				++j;</div><div class='add'>+				end -= EXCEPTION_STKSZ;</div><div class='add'>+				ids[j][4] = '1' + (j - N_EXCEPTION_STACKS);</div><div class='add'>+			} while (stack &lt; end - EXCEPTION_STKSZ);</div><div class='add'>+			if (*usedp &amp; (1U &lt;&lt; j))</div><div class='add'>+				break;</div><div class='add'>+			*usedp |= 1U &lt;&lt; j;</div><div class='add'>+			*idp = ids[j];</div><div class='add'>+			return (unsigned long *)end;</div><div class='add'>+		}</div><div class='add'>+#endif</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * x86-64 can have up to three kernel stacks:</div><div class='add'>+ * process stack</div><div class='add'>+ * interrupt stack</div><div class='add'>+ * severe exception (double fault, nmi, stack fault, debug, mce) hardware stack</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static inline int valid_stack_ptr(struct thread_info *tinfo,</div><div class='add'>+			void *p, unsigned int size, void *end)</div><div class='add'>+{</div><div class='add'>+	void *t = tinfo;</div><div class='add'>+	if (end) {</div><div class='add'>+		if (p &lt; end &amp;&amp; p &gt;= (end-THREAD_SIZE))</div><div class='add'>+			return 1;</div><div class='add'>+		else</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='add'>+	return p &gt; t &amp;&amp; p &lt; t + THREAD_SIZE - size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* The form of the top of the frame on the stack */</div><div class='add'>+struct stack_frame {</div><div class='add'>+	struct stack_frame *next_frame;</div><div class='add'>+	unsigned long return_address;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline unsigned long</div><div class='add'>+print_context_stack(struct thread_info *tinfo,</div><div class='add'>+		unsigned long *stack, unsigned long bp,</div><div class='add'>+		const struct stacktrace_ops *ops, void *data,</div><div class='add'>+		unsigned long *end)</div><div class='add'>+{</div><div class='add'>+	struct stack_frame *frame = (struct stack_frame *)bp;</div><div class='add'>+</div><div class='add'>+	while (valid_stack_ptr(tinfo, stack, sizeof(*stack), end)) {</div><div class='add'>+		unsigned long addr;</div><div class='add'>+</div><div class='add'>+		addr = *stack;</div><div class='add'>+		if (__kernel_text_address(addr)) {</div><div class='add'>+			if ((unsigned long) stack == bp + sizeof(long)) {</div><div class='add'>+				ops-&gt;address(data, addr, 1);</div><div class='add'>+				frame = frame-&gt;next_frame;</div><div class='add'>+				bp = (unsigned long) frame;</div><div class='add'>+			} else {</div><div class='add'>+				ops-&gt;address(data, addr, bp == 0);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		stack++;</div><div class='add'>+	}</div><div class='add'>+	return bp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void dump_trace(struct task_struct *task, struct pt_regs *regs,</div><div class='add'>+		unsigned long *stack, unsigned long bp,</div><div class='add'>+		const struct stacktrace_ops *ops, void *data)</div><div class='add'>+{</div><div class='add'>+	const unsigned cpu = get_cpu();</div><div class='add'>+	unsigned long *irqstack_end = (unsigned long *)cpu_pda(cpu)-&gt;irqstackptr;</div><div class='add'>+	unsigned used = 0;</div><div class='add'>+	struct thread_info *tinfo;</div><div class='add'>+</div><div class='add'>+	if (!task)</div><div class='add'>+		task = current;</div><div class='add'>+</div><div class='add'>+	if (!stack) {</div><div class='add'>+		unsigned long dummy;</div><div class='add'>+		stack = &amp;dummy;</div><div class='add'>+		if (task &amp;&amp; task != current)</div><div class='add'>+			stack = (unsigned long *)task-&gt;thread.sp;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_FRAME_POINTER</div><div class='add'>+	if (!bp) {</div><div class='add'>+		if (task == current) {</div><div class='add'>+			/* Grab bp right from our regs */</div><div class='add'>+			get_bp(bp);</div><div class='add'>+		} else {</div><div class='add'>+			/* bp is the last reg pushed by switch_to */</div><div class='add'>+			bp = *(unsigned long *) task-&gt;thread.sp;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Print function call entries in all stacks, starting at the</div><div class='add'>+	 * current stack address. If the stacks consist of nested</div><div class='add'>+	 * exceptions</div><div class='add'>+	 */</div><div class='add'>+	tinfo = task_thread_info(task);</div><div class='add'>+	for (;;) {</div><div class='add'>+		char *id;</div><div class='add'>+		unsigned long *estack_end;</div><div class='add'>+		estack_end = in_exception_stack(cpu, (unsigned long)stack,</div><div class='add'>+						&amp;used, &amp;id);</div><div class='add'>+</div><div class='add'>+		if (estack_end) {</div><div class='add'>+			if (ops-&gt;stack(data, id) &lt; 0)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			bp = print_context_stack(tinfo, stack, bp, ops,</div><div class='add'>+							data, estack_end);</div><div class='add'>+			ops-&gt;stack(data, "&lt;EOE&gt;");</div><div class='add'>+			/*</div><div class='add'>+			 * We link to the next stack via the</div><div class='add'>+			 * second-to-last pointer (index -2 to end) in the</div><div class='add'>+			 * exception stack:</div><div class='add'>+			 */</div><div class='add'>+			stack = (unsigned long *) estack_end[-2];</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		if (irqstack_end) {</div><div class='add'>+			unsigned long *irqstack;</div><div class='add'>+			irqstack = irqstack_end -</div><div class='add'>+				(IRQSTACKSIZE - 64) / sizeof(*irqstack);</div><div class='add'>+</div><div class='add'>+			if (stack &gt;= irqstack &amp;&amp; stack &lt; irqstack_end) {</div><div class='add'>+				if (ops-&gt;stack(data, "IRQ") &lt; 0)</div><div class='add'>+					break;</div><div class='add'>+				bp = print_context_stack(tinfo, stack, bp,</div><div class='add'>+						ops, data, irqstack_end);</div><div class='add'>+				/*</div><div class='add'>+				 * We link to the next stack (which would be</div><div class='add'>+				 * the process stack normally) the last</div><div class='add'>+				 * pointer (index -1 to end) in the IRQ stack:</div><div class='add'>+				 */</div><div class='add'>+				stack = (unsigned long *) (irqstack_end[-1]);</div><div class='add'>+				irqstack_end = NULL;</div><div class='add'>+				ops-&gt;stack(data, "EOI");</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * This handles the process stack:</div><div class='add'>+	 */</div><div class='add'>+	bp = print_context_stack(tinfo, stack, bp, ops, data, NULL);</div><div class='add'>+	put_cpu();</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dump_trace);</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+print_trace_warning_symbol(void *data, char *msg, unsigned long symbol)</div><div class='add'>+{</div><div class='add'>+	printk(data);</div><div class='add'>+	print_symbol(msg, symbol);</div><div class='add'>+	printk("\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void print_trace_warning(void *data, char *msg)</div><div class='add'>+{</div><div class='add'>+	printk("%s%s\n", (char *)data, msg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int print_trace_stack(void *data, char *name)</div><div class='add'>+{</div><div class='add'>+	printk("%s &lt;%s&gt; ", (char *)data, name);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Print one address/symbol entries per line.</div><div class='add'>+ */</div><div class='add'>+static void print_trace_address(void *data, unsigned long addr, int reliable)</div><div class='add'>+{</div><div class='add'>+	touch_nmi_watchdog();</div><div class='add'>+	printk(data);</div><div class='add'>+	printk_address(addr, reliable);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct stacktrace_ops print_trace_ops = {</div><div class='add'>+	.warning = print_trace_warning,</div><div class='add'>+	.warning_symbol = print_trace_warning_symbol,</div><div class='add'>+	.stack = print_trace_stack,</div><div class='add'>+	.address = print_trace_address,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+show_trace_log_lvl(struct task_struct *task, struct pt_regs *regs,</div><div class='add'>+		unsigned long *stack, unsigned long bp, char *log_lvl)</div><div class='add'>+{</div><div class='add'>+	printk("%sCall Trace:\n", log_lvl);</div><div class='add'>+	dump_trace(task, regs, stack, bp, &amp;print_trace_ops, log_lvl);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void show_trace(struct task_struct *task, struct pt_regs *regs,</div><div class='add'>+		unsigned long *stack, unsigned long bp)</div><div class='add'>+{</div><div class='add'>+	show_trace_log_lvl(task, regs, stack, bp, "");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs,</div><div class='add'>+		unsigned long *sp, unsigned long bp, char *log_lvl)</div><div class='add'>+{</div><div class='add'>+	unsigned long *stack;</div><div class='add'>+	int i;</div><div class='add'>+	const int cpu = smp_processor_id();</div><div class='add'>+	unsigned long *irqstack_end =</div><div class='add'>+		(unsigned long *) (cpu_pda(cpu)-&gt;irqstackptr);</div><div class='add'>+	unsigned long *irqstack =</div><div class='add'>+		(unsigned long *) (cpu_pda(cpu)-&gt;irqstackptr - IRQSTACKSIZE);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * debugging aid: "show_stack(NULL, NULL);" prints the</div><div class='add'>+	 * back trace for this cpu.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	if (sp == NULL) {</div><div class='add'>+		if (task)</div><div class='add'>+			sp = (unsigned long *)task-&gt;thread.sp;</div><div class='add'>+		else</div><div class='add'>+			sp = (unsigned long *)&amp;sp;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	stack = sp;</div><div class='add'>+	for (i = 0; i &lt; kstack_depth_to_print; i++) {</div><div class='add'>+		if (stack &gt;= irqstack &amp;&amp; stack &lt;= irqstack_end) {</div><div class='add'>+			if (stack == irqstack_end) {</div><div class='add'>+				stack = (unsigned long *) (irqstack_end[-1]);</div><div class='add'>+				printk(" &lt;EOI&gt; ");</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+		if (((long) stack &amp; (THREAD_SIZE-1)) == 0)</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		if (i &amp;&amp; ((i % STACKSLOTS_PER_LINE) == 0))</div><div class='add'>+			printk("\n%s", log_lvl);</div><div class='add'>+		printk(" %016lx", *stack++);</div><div class='add'>+		touch_nmi_watchdog();</div><div class='add'>+	}</div><div class='add'>+	printk("\n");</div><div class='add'>+	show_trace_log_lvl(task, regs, sp, bp, log_lvl);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void show_stack(struct task_struct *task, unsigned long *sp)</div><div class='add'>+{</div><div class='add'>+	show_stack_log_lvl(task, NULL, sp, 0, "");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The architecture-independent dump_stack generator</div><div class='add'>+ */</div><div class='add'>+void dump_stack(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long bp = 0;</div><div class='add'>+	unsigned long stack;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_FRAME_POINTER</div><div class='add'>+	if (!bp)</div><div class='add'>+		get_bp(bp);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	printk("Pid: %d, comm: %.20s %s %s %.*s\n",</div><div class='add'>+		current-&gt;pid, current-&gt;comm, print_tainted(),</div><div class='add'>+		init_utsname()-&gt;release,</div><div class='add'>+		(int)strcspn(init_utsname()-&gt;version, " "),</div><div class='add'>+		init_utsname()-&gt;version);</div><div class='add'>+	show_trace(NULL, NULL, &amp;stack, bp);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dump_stack);</div><div class='add'>+</div><div class='add'>+void show_registers(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	unsigned long sp;</div><div class='add'>+	const int cpu = smp_processor_id();</div><div class='add'>+	struct task_struct *cur = cpu_pda(cpu)-&gt;pcurrent;</div><div class='add'>+</div><div class='add'>+	sp = regs-&gt;sp;</div><div class='add'>+	printk("CPU %d ", cpu);</div><div class='add'>+	__show_regs(regs, 1);</div><div class='add'>+	printk("Process %s (pid: %d, threadinfo %p, task %p)\n",</div><div class='add'>+		cur-&gt;comm, cur-&gt;pid, task_thread_info(cur), cur);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * When in-kernel, we also print out the stack and code at the</div><div class='add'>+	 * time of the fault..</div><div class='add'>+	 */</div><div class='add'>+	if (!user_mode(regs)) {</div><div class='add'>+		unsigned int code_prologue = code_bytes * 43 / 64;</div><div class='add'>+		unsigned int code_len = code_bytes;</div><div class='add'>+		unsigned char c;</div><div class='add'>+		u8 *ip;</div><div class='add'>+</div><div class='add'>+		printk(KERN_EMERG "Stack:\n");</div><div class='add'>+		show_stack_log_lvl(NULL, regs, (unsigned long *)sp,</div><div class='add'>+				regs-&gt;bp, KERN_EMERG);</div><div class='add'>+</div><div class='add'>+		printk(KERN_EMERG "Code: ");</div><div class='add'>+</div><div class='add'>+		ip = (u8 *)regs-&gt;ip - code_prologue;</div><div class='add'>+		if (ip &lt; (u8 *)PAGE_OFFSET || probe_kernel_address(ip, c)) {</div><div class='add'>+			/* try starting at IP */</div><div class='add'>+			ip = (u8 *)regs-&gt;ip;</div><div class='add'>+			code_len = code_len - code_prologue + 1;</div><div class='add'>+		}</div><div class='add'>+		for (i = 0; i &lt; code_len; i++, ip++) {</div><div class='add'>+			if (ip &lt; (u8 *)PAGE_OFFSET ||</div><div class='add'>+					probe_kernel_address(ip, c)) {</div><div class='add'>+				printk(" Bad RIP value.");</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			if (ip == (u8 *)regs-&gt;ip)</div><div class='add'>+				printk("&lt;%02x&gt; ", c);</div><div class='add'>+			else</div><div class='add'>+				printk("%02x ", c);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	printk("\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int is_valid_bugaddr(unsigned long ip)</div><div class='add'>+{</div><div class='add'>+	unsigned short ud2;</div><div class='add'>+</div><div class='add'>+	if (__copy_from_user(&amp;ud2, (const void __user *) ip, sizeof(ud2)))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return ud2 == 0x0b0f;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static raw_spinlock_t die_lock = __RAW_SPIN_LOCK_UNLOCKED;</div><div class='add'>+static int die_owner = -1;</div><div class='add'>+static unsigned int die_nest_count;</div><div class='add'>+</div><div class='add'>+unsigned __kprobes long oops_begin(void)</div><div class='add'>+{</div><div class='add'>+	int cpu;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	oops_enter();</div><div class='add'>+</div><div class='add'>+	/* racy, but better than risking deadlock. */</div><div class='add'>+	raw_local_irq_save(flags);</div><div class='add'>+	cpu = smp_processor_id();</div><div class='add'>+	if (!__raw_spin_trylock(&amp;die_lock)) {</div><div class='add'>+		if (cpu == die_owner)</div><div class='add'>+			/* nested oops. should stop eventually */;</div><div class='add'>+		else</div><div class='add'>+			__raw_spin_lock(&amp;die_lock);</div><div class='add'>+	}</div><div class='add'>+	die_nest_count++;</div><div class='add'>+	die_owner = cpu;</div><div class='add'>+	console_verbose();</div><div class='add'>+	bust_spinlocks(1);</div><div class='add'>+	return flags;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, int signr)</div><div class='add'>+{</div><div class='add'>+	die_owner = -1;</div><div class='add'>+	bust_spinlocks(0);</div><div class='add'>+	die_nest_count--;</div><div class='add'>+	if (!die_nest_count)</div><div class='add'>+		/* Nest count reaches zero, release the lock. */</div><div class='add'>+		__raw_spin_unlock(&amp;die_lock);</div><div class='add'>+	raw_local_irq_restore(flags);</div><div class='add'>+	if (!regs) {</div><div class='add'>+		oops_exit();</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	if (in_interrupt())</div><div class='add'>+		panic("Fatal exception in interrupt");</div><div class='add'>+	if (panic_on_oops)</div><div class='add'>+		panic("Fatal exception");</div><div class='add'>+	oops_exit();</div><div class='add'>+	do_exit(signr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int __kprobes __die(const char *str, struct pt_regs *regs, long err)</div><div class='add'>+{</div><div class='add'>+	printk(KERN_EMERG "%s: %04lx [#%d] ", str, err &amp; 0xffff, ++die_counter);</div><div class='add'>+#ifdef CONFIG_PREEMPT</div><div class='add'>+	printk("PREEMPT ");</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_SMP</div><div class='add'>+	printk("SMP ");</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_DEBUG_PAGEALLOC</div><div class='add'>+	printk("DEBUG_PAGEALLOC");</div><div class='add'>+#endif</div><div class='add'>+	printk("\n");</div><div class='add'>+	sysfs_printk_last_file();</div><div class='add'>+	if (notify_die(DIE_OOPS, str, regs, err,</div><div class='add'>+			current-&gt;thread.trap_no, SIGSEGV) == NOTIFY_STOP)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	show_registers(regs);</div><div class='add'>+	add_taint(TAINT_DIE);</div><div class='add'>+	/* Executive summary in case the oops scrolled away */</div><div class='add'>+	printk(KERN_ALERT "RIP ");</div><div class='add'>+	printk_address(regs-&gt;ip, 1);</div><div class='add'>+	printk(" RSP &lt;%016lx&gt;\n", regs-&gt;sp);</div><div class='add'>+	if (kexec_should_crash(current))</div><div class='add'>+		crash_kexec(regs);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void die(const char *str, struct pt_regs *regs, long err)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags = oops_begin();</div><div class='add'>+</div><div class='add'>+	if (!user_mode(regs))</div><div class='add'>+		report_bug(regs-&gt;ip, regs);</div><div class='add'>+</div><div class='add'>+	if (__die(str, regs, err))</div><div class='add'>+		regs = NULL;</div><div class='add'>+	oops_end(flags, regs, SIGSEGV);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+notrace __kprobes void</div><div class='add'>+die_nmi(char *str, struct pt_regs *regs, int do_panic)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	if (notify_die(DIE_NMIWATCHDOG, str, regs, 0, 2, SIGINT) == NOTIFY_STOP)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	flags = oops_begin();</div><div class='add'>+	/*</div><div class='add'>+	 * We are in trouble anyway, lets at least try</div><div class='add'>+	 * to get a message out.</div><div class='add'>+	 */</div><div class='add'>+	printk(KERN_EMERG "%s", str);</div><div class='add'>+	printk(" on CPU%d, ip %08lx, registers:\n",</div><div class='add'>+		smp_processor_id(), regs-&gt;ip);</div><div class='add'>+	show_registers(regs);</div><div class='add'>+	if (kexec_should_crash(current))</div><div class='add'>+		crash_kexec(regs);</div><div class='add'>+	if (do_panic || panic_on_oops)</div><div class='add'>+		panic("Non maskable interrupt");</div><div class='add'>+	oops_end(flags, NULL, SIGBUS);</div><div class='add'>+	nmi_exit();</div><div class='add'>+	local_irq_enable();</div><div class='add'>+	do_exit(SIGBUS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init oops_setup(char *s)</div><div class='add'>+{</div><div class='add'>+	if (!s)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (!strcmp(s, "panic"))</div><div class='add'>+		panic_on_oops = 1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+early_param("oops", oops_setup);</div><div class='add'>+</div><div class='add'>+static int __init kstack_setup(char *s)</div><div class='add'>+{</div><div class='add'>+	if (!s)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	kstack_depth_to_print = simple_strtoul(s, NULL, 0);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+early_param("kstack", kstack_setup);</div><div class='add'>+</div><div class='add'>+static int __init code_bytes_setup(char *s)</div><div class='add'>+{</div><div class='add'>+	code_bytes = simple_strtoul(s, NULL, 0);</div><div class='add'>+	if (code_bytes &gt; 8192)</div><div class='add'>+		code_bytes = 8192;</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+__setup("code_bytes=", code_bytes_setup);</div><div class='head'>diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c<br/>index 66e48aa2dd1b..ce97bf3bed12 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/e820.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/e820.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/e820.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/e820.c</a></div><div class='hunk'>@@ -148,6 +148,9 @@ void __init e820_print_map(char *who)</div><div class='ctx'> 		case E820_NVS:</div><div class='ctx'> 			printk(KERN_CONT "(ACPI NVS)\n");</div><div class='ctx'> 			break;</div><div class='add'>+		case E820_UNUSABLE:</div><div class='add'>+			printk("(unusable)\n");</div><div class='add'>+			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			printk(KERN_CONT "type %u\n", e820.map[i].type);</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -1260,6 +1263,7 @@ static inline const char *e820_type_to_string(int e820_type)</div><div class='ctx'> 	case E820_RAM:	return "System RAM";</div><div class='ctx'> 	case E820_ACPI:	return "ACPI Tables";</div><div class='ctx'> 	case E820_NVS:	return "ACPI Non-volatile Storage";</div><div class='add'>+	case E820_UNUSABLE:	return "Unusable memory";</div><div class='ctx'> 	default:	return "reserved";</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -1267,6 +1271,7 @@ static inline const char *e820_type_to_string(int e820_type)</div><div class='ctx'> /*</div><div class='ctx'>  * Mark e820 reserved areas as busy for the resource manager.</div><div class='ctx'>  */</div><div class='add'>+static struct resource __initdata *e820_res;</div><div class='ctx'> void __init e820_reserve_resources(void)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -1274,20 +1279,26 @@ void __init e820_reserve_resources(void)</div><div class='ctx'> 	u64 end;</div><div class='ctx'> </div><div class='ctx'> 	res = alloc_bootmem_low(sizeof(struct resource) * e820.nr_map);</div><div class='add'>+	e820_res = res;</div><div class='ctx'> 	for (i = 0; i &lt; e820.nr_map; i++) {</div><div class='ctx'> 		end = e820.map[i].addr + e820.map[i].size - 1;</div><div class='del'>-#ifndef CONFIG_RESOURCES_64BIT</div><div class='del'>-		if (end &gt; 0x100000000ULL) {</div><div class='add'>+		if (end != (resource_size_t)end) {</div><div class='ctx'> 			res++;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='del'>-#endif</div><div class='ctx'> 		res-&gt;name = e820_type_to_string(e820.map[i].type);</div><div class='ctx'> 		res-&gt;start = e820.map[i].addr;</div><div class='ctx'> 		res-&gt;end = end;</div><div class='ctx'> </div><div class='ctx'> 		res-&gt;flags = IORESOURCE_MEM | IORESOURCE_BUSY;</div><div class='del'>-		insert_resource(&amp;iomem_resource, res);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * don't register the region that could be conflicted with</div><div class='add'>+		 * pci device BAR resource and insert them later in</div><div class='add'>+		 * pcibios_resource_survey()</div><div class='add'>+		 */</div><div class='add'>+		if (e820.map[i].type != E820_RESERVED || res-&gt;start &lt; (1ULL&lt;&lt;20))</div><div class='add'>+			insert_resource(&amp;iomem_resource, res);</div><div class='ctx'> 		res++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1299,6 +1310,19 @@ void __init e820_reserve_resources(void)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void __init e820_reserve_resources_late(void)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	struct resource *res;</div><div class='add'>+</div><div class='add'>+	res = e820_res;</div><div class='add'>+	for (i = 0; i &lt; e820.nr_map; i++) {</div><div class='add'>+		if (!res-&gt;parent &amp;&amp; res-&gt;end)</div><div class='add'>+			reserve_region_with_split(&amp;iomem_resource, res-&gt;start, res-&gt;end, res-&gt;name);</div><div class='add'>+		res++;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> char *__init default_machine_specific_memory_setup(void)</div><div class='ctx'> {</div><div class='ctx'> 	char *who = "BIOS-e820";</div><div class='head'>diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c<br/>index 4353cf5e6fac..733c4f8d42ea 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/early-quirks.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/early-quirks.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/early-quirks.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/early-quirks.c</a></div><div class='hunk'>@@ -95,6 +95,66 @@ static void __init nvidia_bugs(int num, int slot, int func)</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static u32 ati_ixp4x0_rev(int num, int slot, int func)</div><div class='add'>+{</div><div class='add'>+	u32 d;</div><div class='add'>+	u8  b;</div><div class='add'>+</div><div class='add'>+	b = read_pci_config_byte(num, slot, func, 0xac);</div><div class='add'>+	b &amp;= ~(1&lt;&lt;5);</div><div class='add'>+	write_pci_config_byte(num, slot, func, 0xac, b);</div><div class='add'>+</div><div class='add'>+	d = read_pci_config(num, slot, func, 0x70);</div><div class='add'>+	d |= 1&lt;&lt;8;</div><div class='add'>+	write_pci_config(num, slot, func, 0x70, d);</div><div class='add'>+</div><div class='add'>+	d = read_pci_config(num, slot, func, 0x8);</div><div class='add'>+	d &amp;= 0xff;</div><div class='add'>+	return d;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init ati_bugs(int num, int slot, int func)</div><div class='add'>+{</div><div class='add'>+#if defined(CONFIG_ACPI) &amp;&amp; defined (CONFIG_X86_IO_APIC)</div><div class='add'>+	u32 d;</div><div class='add'>+	u8  b;</div><div class='add'>+</div><div class='add'>+	if (acpi_use_timer_override)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	d = ati_ixp4x0_rev(num, slot, func);</div><div class='add'>+	if (d  &lt; 0x82)</div><div class='add'>+		acpi_skip_timer_override = 1;</div><div class='add'>+	else {</div><div class='add'>+		/* check for IRQ0 interrupt swap */</div><div class='add'>+		outb(0x72, 0xcd6); b = inb(0xcd7);</div><div class='add'>+		if (!(b &amp; 0x2))</div><div class='add'>+			acpi_skip_timer_override = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (acpi_skip_timer_override) {</div><div class='add'>+		printk(KERN_INFO "SB4X0 revision 0x%x\n", d);</div><div class='add'>+		printk(KERN_INFO "Ignoring ACPI timer override.\n");</div><div class='add'>+		printk(KERN_INFO "If you got timer trouble "</div><div class='add'>+		       "try acpi_use_timer_override\n");</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_DMAR</div><div class='add'>+static void __init intel_g33_dmar(int num, int slot, int func)</div><div class='add'>+{</div><div class='add'>+	struct acpi_table_header *dmar_tbl;</div><div class='add'>+	acpi_status status;</div><div class='add'>+</div><div class='add'>+	status = acpi_get_table(ACPI_SIG_DMAR, 0, &amp;dmar_tbl);</div><div class='add'>+	if (ACPI_SUCCESS(status)) {</div><div class='add'>+		printk(KERN_INFO "BIOS BUG: DMAR advertised on Intel G31/G33 chipset -- ignoring\n");</div><div class='add'>+		dmar_disabled = 1;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #define QFLAG_APPLY_ONCE 	0x1</div><div class='ctx'> #define QFLAG_APPLIED		0x2</div><div class='ctx'> #define QFLAG_DONE		(QFLAG_APPLY_ONCE|QFLAG_APPLIED)</div><div class='hunk'>@@ -114,6 +174,12 @@ static struct chipset early_qrk[] __initdata = {</div><div class='ctx'> 	  PCI_CLASS_BRIDGE_PCI, PCI_ANY_ID, QFLAG_APPLY_ONCE, via_bugs },</div><div class='ctx'> 	{ PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_K8_NB,</div><div class='ctx'> 	  PCI_CLASS_BRIDGE_HOST, PCI_ANY_ID, 0, fix_hypertransport_config },</div><div class='add'>+	{ PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP400_SMBUS,</div><div class='add'>+	  PCI_CLASS_SERIAL_SMBUS, PCI_ANY_ID, 0, ati_bugs },</div><div class='add'>+#ifdef CONFIG_DMAR</div><div class='add'>+	{ PCI_VENDOR_ID_INTEL, 0x29c0,</div><div class='add'>+	  PCI_CLASS_BRIDGE_HOST, PCI_ANY_ID, 0, intel_g33_dmar },</div><div class='add'>+#endif</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kernel/early_printk.c b/arch/x86/kernel/early_printk.c<br/>index ff9e7350da54..34ad997d3834 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/early_printk.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/early_printk.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/early_printk.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/early_printk.c</a></div><div class='hunk'>@@ -3,11 +3,19 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/screen_info.h&gt;</div><div class='add'>+#include &lt;linux/usb/ch9.h&gt;</div><div class='add'>+#include &lt;linux/pci_regs.h&gt;</div><div class='add'>+#include &lt;linux/pci_ids.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/fcntl.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;xen/hvc-console.h&gt;</div><div class='add'>+#include &lt;asm/pci-direct.h&gt;</div><div class='add'>+#include &lt;asm/pgtable.h&gt;</div><div class='add'>+#include &lt;asm/fixmap.h&gt;</div><div class='add'>+#include &lt;linux/usb/ehci_def.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Simple VGA output */</div><div class='ctx'> #define VGABASE		(__ISA_IO_base + 0xb8000)</div><div class='hunk'>@@ -78,6 +86,7 @@ static int early_serial_base = 0x3f8;  /* ttyS0 */</div><div class='ctx'> static int early_serial_putc(unsigned char ch)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned timeout = 0xffff;</div><div class='add'>+</div><div class='ctx'> 	while ((inb(early_serial_base + LSR) &amp; XMTRDY) == 0 &amp;&amp; --timeout)</div><div class='ctx'> 		cpu_relax();</div><div class='ctx'> 	outb(ch, early_serial_base + TXR);</div><div class='hunk'>@@ -111,7 +120,7 @@ static __init void early_serial_init(char *s)</div><div class='ctx'> 		if (!strncmp(s, "0x", 2)) {</div><div class='ctx'> 			early_serial_base = simple_strtoul(s, &amp;e, 16);</div><div class='ctx'> 		} else {</div><div class='del'>-			static int bases[] = { 0x3f8, 0x2f8 };</div><div class='add'>+			static const int __initconst bases[] = { 0x3f8, 0x2f8 };</div><div class='ctx'> </div><div class='ctx'> 			if (!strncmp(s, "ttyS", 4))</div><div class='ctx'> 				s += 4;</div><div class='hunk'>@@ -151,6 +160,721 @@ static struct console early_serial_console = {</div><div class='ctx'> 	.index =	-1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_EARLY_PRINTK_DBGP</div><div class='add'>+</div><div class='add'>+static struct ehci_caps __iomem *ehci_caps;</div><div class='add'>+static struct ehci_regs __iomem *ehci_regs;</div><div class='add'>+static struct ehci_dbg_port __iomem *ehci_debug;</div><div class='add'>+static unsigned int dbgp_endpoint_out;</div><div class='add'>+</div><div class='add'>+struct ehci_dev {</div><div class='add'>+	u32 bus;</div><div class='add'>+	u32 slot;</div><div class='add'>+	u32 func;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct ehci_dev ehci_dev;</div><div class='add'>+</div><div class='add'>+#define USB_DEBUG_DEVNUM 127</div><div class='add'>+</div><div class='add'>+#define DBGP_DATA_TOGGLE	0x8800</div><div class='add'>+</div><div class='add'>+static inline u32 dbgp_pid_update(u32 x, u32 tok)</div><div class='add'>+{</div><div class='add'>+	return ((x ^ DBGP_DATA_TOGGLE) &amp; 0xffff00) | (tok &amp; 0xff);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32 dbgp_len_update(u32 x, u32 len)</div><div class='add'>+{</div><div class='add'>+	return (x &amp; ~0x0f) | (len &amp; 0x0f);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * USB Packet IDs (PIDs)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* token */</div><div class='add'>+#define USB_PID_OUT		0xe1</div><div class='add'>+#define USB_PID_IN		0x69</div><div class='add'>+#define USB_PID_SOF		0xa5</div><div class='add'>+#define USB_PID_SETUP		0x2d</div><div class='add'>+/* handshake */</div><div class='add'>+#define USB_PID_ACK		0xd2</div><div class='add'>+#define USB_PID_NAK		0x5a</div><div class='add'>+#define USB_PID_STALL		0x1e</div><div class='add'>+#define USB_PID_NYET		0x96</div><div class='add'>+/* data */</div><div class='add'>+#define USB_PID_DATA0		0xc3</div><div class='add'>+#define USB_PID_DATA1		0x4b</div><div class='add'>+#define USB_PID_DATA2		0x87</div><div class='add'>+#define USB_PID_MDATA		0x0f</div><div class='add'>+/* Special */</div><div class='add'>+#define USB_PID_PREAMBLE	0x3c</div><div class='add'>+#define USB_PID_ERR		0x3c</div><div class='add'>+#define USB_PID_SPLIT		0x78</div><div class='add'>+#define USB_PID_PING		0xb4</div><div class='add'>+#define USB_PID_UNDEF_0		0xf0</div><div class='add'>+</div><div class='add'>+#define USB_PID_DATA_TOGGLE	0x88</div><div class='add'>+#define DBGP_CLAIM (DBGP_OWNER | DBGP_ENABLED | DBGP_INUSE)</div><div class='add'>+</div><div class='add'>+#define PCI_CAP_ID_EHCI_DEBUG	0xa</div><div class='add'>+</div><div class='add'>+#define HUB_ROOT_RESET_TIME	50	/* times are in msec */</div><div class='add'>+#define HUB_SHORT_RESET_TIME	10</div><div class='add'>+#define HUB_LONG_RESET_TIME	200</div><div class='add'>+#define HUB_RESET_TIMEOUT	500</div><div class='add'>+</div><div class='add'>+#define DBGP_MAX_PACKET		8</div><div class='add'>+</div><div class='add'>+static int dbgp_wait_until_complete(void)</div><div class='add'>+{</div><div class='add'>+	u32 ctrl;</div><div class='add'>+	int loop = 0x100000;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		ctrl = readl(&amp;ehci_debug-&gt;control);</div><div class='add'>+		/* Stop when the transaction is finished */</div><div class='add'>+		if (ctrl &amp; DBGP_DONE)</div><div class='add'>+			break;</div><div class='add'>+	} while (--loop &gt; 0);</div><div class='add'>+</div><div class='add'>+	if (!loop)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Now that we have observed the completed transaction,</div><div class='add'>+	 * clear the done bit.</div><div class='add'>+	 */</div><div class='add'>+	writel(ctrl | DBGP_DONE, &amp;ehci_debug-&gt;control);</div><div class='add'>+	return (ctrl &amp; DBGP_ERROR) ? -DBGP_ERRCODE(ctrl) : DBGP_LEN(ctrl);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dbgp_mdelay(int ms)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	while (ms--) {</div><div class='add'>+		for (i = 0; i &lt; 1000; i++)</div><div class='add'>+			outb(0x1, 0x80);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dbgp_breath(void)</div><div class='add'>+{</div><div class='add'>+	/* Sleep to give the debug port a chance to breathe */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dbgp_wait_until_done(unsigned ctrl)</div><div class='add'>+{</div><div class='add'>+	u32 pids, lpid;</div><div class='add'>+	int ret;</div><div class='add'>+	int loop = 3;</div><div class='add'>+</div><div class='add'>+retry:</div><div class='add'>+	writel(ctrl | DBGP_GO, &amp;ehci_debug-&gt;control);</div><div class='add'>+	ret = dbgp_wait_until_complete();</div><div class='add'>+	pids = readl(&amp;ehci_debug-&gt;pids);</div><div class='add'>+	lpid = DBGP_PID_GET(pids);</div><div class='add'>+</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If the port is getting full or it has dropped data</div><div class='add'>+	 * start pacing ourselves, not necessary but it's friendly.</div><div class='add'>+	 */</div><div class='add'>+	if ((lpid == USB_PID_NAK) || (lpid == USB_PID_NYET))</div><div class='add'>+		dbgp_breath();</div><div class='add'>+</div><div class='add'>+	/* If I get a NACK reissue the transmission */</div><div class='add'>+	if (lpid == USB_PID_NAK) {</div><div class='add'>+		if (--loop &gt; 0)</div><div class='add'>+			goto retry;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dbgp_set_data(const void *buf, int size)</div><div class='add'>+{</div><div class='add'>+	const unsigned char *bytes = buf;</div><div class='add'>+	u32 lo, hi;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	lo = hi = 0;</div><div class='add'>+	for (i = 0; i &lt; 4 &amp;&amp; i &lt; size; i++)</div><div class='add'>+		lo |= bytes[i] &lt;&lt; (8*i);</div><div class='add'>+	for (; i &lt; 8 &amp;&amp; i &lt; size; i++)</div><div class='add'>+		hi |= bytes[i] &lt;&lt; (8*(i - 4));</div><div class='add'>+	writel(lo, &amp;ehci_debug-&gt;data03);</div><div class='add'>+	writel(hi, &amp;ehci_debug-&gt;data47);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dbgp_get_data(void *buf, int size)</div><div class='add'>+{</div><div class='add'>+	unsigned char *bytes = buf;</div><div class='add'>+	u32 lo, hi;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	lo = readl(&amp;ehci_debug-&gt;data03);</div><div class='add'>+	hi = readl(&amp;ehci_debug-&gt;data47);</div><div class='add'>+	for (i = 0; i &lt; 4 &amp;&amp; i &lt; size; i++)</div><div class='add'>+		bytes[i] = (lo &gt;&gt; (8*i)) &amp; 0xff;</div><div class='add'>+	for (; i &lt; 8 &amp;&amp; i &lt; size; i++)</div><div class='add'>+		bytes[i] = (hi &gt;&gt; (8*(i - 4))) &amp; 0xff;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dbgp_bulk_write(unsigned devnum, unsigned endpoint,</div><div class='add'>+			 const char *bytes, int size)</div><div class='add'>+{</div><div class='add'>+	u32 pids, addr, ctrl;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (size &gt; DBGP_MAX_PACKET)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	addr = DBGP_EPADDR(devnum, endpoint);</div><div class='add'>+</div><div class='add'>+	pids = readl(&amp;ehci_debug-&gt;pids);</div><div class='add'>+	pids = dbgp_pid_update(pids, USB_PID_OUT);</div><div class='add'>+</div><div class='add'>+	ctrl = readl(&amp;ehci_debug-&gt;control);</div><div class='add'>+	ctrl = dbgp_len_update(ctrl, size);</div><div class='add'>+	ctrl |= DBGP_OUT;</div><div class='add'>+	ctrl |= DBGP_GO;</div><div class='add'>+</div><div class='add'>+	dbgp_set_data(bytes, size);</div><div class='add'>+	writel(addr, &amp;ehci_debug-&gt;address);</div><div class='add'>+	writel(pids, &amp;ehci_debug-&gt;pids);</div><div class='add'>+</div><div class='add'>+	ret = dbgp_wait_until_done(ctrl);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dbgp_bulk_read(unsigned devnum, unsigned endpoint, void *data,</div><div class='add'>+				 int size)</div><div class='add'>+{</div><div class='add'>+	u32 pids, addr, ctrl;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (size &gt; DBGP_MAX_PACKET)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	addr = DBGP_EPADDR(devnum, endpoint);</div><div class='add'>+</div><div class='add'>+	pids = readl(&amp;ehci_debug-&gt;pids);</div><div class='add'>+	pids = dbgp_pid_update(pids, USB_PID_IN);</div><div class='add'>+</div><div class='add'>+	ctrl = readl(&amp;ehci_debug-&gt;control);</div><div class='add'>+	ctrl = dbgp_len_update(ctrl, size);</div><div class='add'>+	ctrl &amp;= ~DBGP_OUT;</div><div class='add'>+	ctrl |= DBGP_GO;</div><div class='add'>+</div><div class='add'>+	writel(addr, &amp;ehci_debug-&gt;address);</div><div class='add'>+	writel(pids, &amp;ehci_debug-&gt;pids);</div><div class='add'>+	ret = dbgp_wait_until_done(ctrl);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (size &gt; ret)</div><div class='add'>+		size = ret;</div><div class='add'>+	dbgp_get_data(data, size);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dbgp_control_msg(unsigned devnum, int requesttype, int request,</div><div class='add'>+	int value, int index, void *data, int size)</div><div class='add'>+{</div><div class='add'>+	u32 pids, addr, ctrl;</div><div class='add'>+	struct usb_ctrlrequest req;</div><div class='add'>+	int read;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	read = (requesttype &amp; USB_DIR_IN) != 0;</div><div class='add'>+	if (size &gt; (read ? DBGP_MAX_PACKET:0))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	/* Compute the control message */</div><div class='add'>+	req.bRequestType = requesttype;</div><div class='add'>+	req.bRequest = request;</div><div class='add'>+	req.wValue = cpu_to_le16(value);</div><div class='add'>+	req.wIndex = cpu_to_le16(index);</div><div class='add'>+	req.wLength = cpu_to_le16(size);</div><div class='add'>+</div><div class='add'>+	pids = DBGP_PID_SET(USB_PID_DATA0, USB_PID_SETUP);</div><div class='add'>+	addr = DBGP_EPADDR(devnum, 0);</div><div class='add'>+</div><div class='add'>+	ctrl = readl(&amp;ehci_debug-&gt;control);</div><div class='add'>+	ctrl = dbgp_len_update(ctrl, sizeof(req));</div><div class='add'>+	ctrl |= DBGP_OUT;</div><div class='add'>+	ctrl |= DBGP_GO;</div><div class='add'>+</div><div class='add'>+	/* Send the setup message */</div><div class='add'>+	dbgp_set_data(&amp;req, sizeof(req));</div><div class='add'>+	writel(addr, &amp;ehci_debug-&gt;address);</div><div class='add'>+	writel(pids, &amp;ehci_debug-&gt;pids);</div><div class='add'>+	ret = dbgp_wait_until_done(ctrl);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Read the result */</div><div class='add'>+	return dbgp_bulk_read(devnum, 0, data, size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Find a PCI capability */</div><div class='add'>+static u32 __init find_cap(u32 num, u32 slot, u32 func, int cap)</div><div class='add'>+{</div><div class='add'>+	u8 pos;</div><div class='add'>+	int bytes;</div><div class='add'>+</div><div class='add'>+	if (!(read_pci_config_16(num, slot, func, PCI_STATUS) &amp;</div><div class='add'>+		PCI_STATUS_CAP_LIST))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	pos = read_pci_config_byte(num, slot, func, PCI_CAPABILITY_LIST);</div><div class='add'>+	for (bytes = 0; bytes &lt; 48 &amp;&amp; pos &gt;= 0x40; bytes++) {</div><div class='add'>+		u8 id;</div><div class='add'>+</div><div class='add'>+		pos &amp;= ~3;</div><div class='add'>+		id = read_pci_config_byte(num, slot, func, pos+PCI_CAP_LIST_ID);</div><div class='add'>+		if (id == 0xff)</div><div class='add'>+			break;</div><div class='add'>+		if (id == cap)</div><div class='add'>+			return pos;</div><div class='add'>+</div><div class='add'>+		pos = read_pci_config_byte(num, slot, func,</div><div class='add'>+						 pos+PCI_CAP_LIST_NEXT);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 __init __find_dbgp(u32 bus, u32 slot, u32 func)</div><div class='add'>+{</div><div class='add'>+	u32 class;</div><div class='add'>+</div><div class='add'>+	class = read_pci_config(bus, slot, func, PCI_CLASS_REVISION);</div><div class='add'>+	if ((class &gt;&gt; 8) != PCI_CLASS_SERIAL_USB_EHCI)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return find_cap(bus, slot, func, PCI_CAP_ID_EHCI_DEBUG);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 __init find_dbgp(int ehci_num, u32 *rbus, u32 *rslot, u32 *rfunc)</div><div class='add'>+{</div><div class='add'>+	u32 bus, slot, func;</div><div class='add'>+</div><div class='add'>+	for (bus = 0; bus &lt; 256; bus++) {</div><div class='add'>+		for (slot = 0; slot &lt; 32; slot++) {</div><div class='add'>+			for (func = 0; func &lt; 8; func++) {</div><div class='add'>+				unsigned cap;</div><div class='add'>+</div><div class='add'>+				cap = __find_dbgp(bus, slot, func);</div><div class='add'>+</div><div class='add'>+				if (!cap)</div><div class='add'>+					continue;</div><div class='add'>+				if (ehci_num-- != 0)</div><div class='add'>+					continue;</div><div class='add'>+				*rbus = bus;</div><div class='add'>+				*rslot = slot;</div><div class='add'>+				*rfunc = func;</div><div class='add'>+				return cap;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ehci_reset_port(int port)</div><div class='add'>+{</div><div class='add'>+	u32 portsc;</div><div class='add'>+	u32 delay_time, delay;</div><div class='add'>+	int loop;</div><div class='add'>+</div><div class='add'>+	/* Reset the usb debug port */</div><div class='add'>+	portsc = readl(&amp;ehci_regs-&gt;port_status[port - 1]);</div><div class='add'>+	portsc &amp;= ~PORT_PE;</div><div class='add'>+	portsc |= PORT_RESET;</div><div class='add'>+	writel(portsc, &amp;ehci_regs-&gt;port_status[port - 1]);</div><div class='add'>+</div><div class='add'>+	delay = HUB_ROOT_RESET_TIME;</div><div class='add'>+	for (delay_time = 0; delay_time &lt; HUB_RESET_TIMEOUT;</div><div class='add'>+	     delay_time += delay) {</div><div class='add'>+		dbgp_mdelay(delay);</div><div class='add'>+</div><div class='add'>+		portsc = readl(&amp;ehci_regs-&gt;port_status[port - 1]);</div><div class='add'>+		if (portsc &amp; PORT_RESET) {</div><div class='add'>+			/* force reset to complete */</div><div class='add'>+			loop = 2;</div><div class='add'>+			writel(portsc &amp; ~(PORT_RWC_BITS | PORT_RESET),</div><div class='add'>+				&amp;ehci_regs-&gt;port_status[port - 1]);</div><div class='add'>+			do {</div><div class='add'>+				portsc = readl(&amp;ehci_regs-&gt;port_status[port-1]);</div><div class='add'>+			} while ((portsc &amp; PORT_RESET) &amp;&amp; (--loop &gt; 0));</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Device went away? */</div><div class='add'>+		if (!(portsc &amp; PORT_CONNECT))</div><div class='add'>+			return -ENOTCONN;</div><div class='add'>+</div><div class='add'>+		/* bomb out completely if something weird happend */</div><div class='add'>+		if ((portsc &amp; PORT_CSC))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		/* If we've finished resetting, then break out of the loop */</div><div class='add'>+		if (!(portsc &amp; PORT_RESET) &amp;&amp; (portsc &amp; PORT_PE))</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='add'>+	return -EBUSY;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ehci_wait_for_port(int port)</div><div class='add'>+{</div><div class='add'>+	u32 status;</div><div class='add'>+	int ret, reps;</div><div class='add'>+</div><div class='add'>+	for (reps = 0; reps &lt; 3; reps++) {</div><div class='add'>+		dbgp_mdelay(100);</div><div class='add'>+		status = readl(&amp;ehci_regs-&gt;status);</div><div class='add'>+		if (status &amp; STS_PCD) {</div><div class='add'>+			ret = ehci_reset_port(port);</div><div class='add'>+			if (ret == 0)</div><div class='add'>+				return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return -ENOTCONN;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef DBGP_DEBUG</div><div class='add'>+# define dbgp_printk early_printk</div><div class='add'>+#else</div><div class='add'>+static inline void dbgp_printk(const char *fmt, ...) { }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+typedef void (*set_debug_port_t)(int port);</div><div class='add'>+</div><div class='add'>+static void default_set_debug_port(int port)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static set_debug_port_t set_debug_port = default_set_debug_port;</div><div class='add'>+</div><div class='add'>+static void nvidia_set_debug_port(int port)</div><div class='add'>+{</div><div class='add'>+	u32 dword;</div><div class='add'>+	dword = read_pci_config(ehci_dev.bus, ehci_dev.slot, ehci_dev.func,</div><div class='add'>+				 0x74);</div><div class='add'>+	dword &amp;= ~(0x0f&lt;&lt;12);</div><div class='add'>+	dword |= ((port &amp; 0x0f)&lt;&lt;12);</div><div class='add'>+	write_pci_config(ehci_dev.bus, ehci_dev.slot, ehci_dev.func, 0x74,</div><div class='add'>+				 dword);</div><div class='add'>+	dbgp_printk("set debug port to %d\n", port);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init detect_set_debug_port(void)</div><div class='add'>+{</div><div class='add'>+	u32 vendorid;</div><div class='add'>+</div><div class='add'>+	vendorid = read_pci_config(ehci_dev.bus, ehci_dev.slot, ehci_dev.func,</div><div class='add'>+		 0x00);</div><div class='add'>+</div><div class='add'>+	if ((vendorid &amp; 0xffff) == 0x10de) {</div><div class='add'>+		dbgp_printk("using nvidia set_debug_port\n");</div><div class='add'>+		set_debug_port = nvidia_set_debug_port;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init ehci_setup(void)</div><div class='add'>+{</div><div class='add'>+	struct usb_debug_descriptor dbgp_desc;</div><div class='add'>+	u32 cmd, ctrl, status, portsc, hcs_params;</div><div class='add'>+	u32 debug_port, new_debug_port = 0, n_ports;</div><div class='add'>+	u32  devnum;</div><div class='add'>+	int ret, i;</div><div class='add'>+	int loop;</div><div class='add'>+	int port_map_tried;</div><div class='add'>+	int playtimes = 3;</div><div class='add'>+</div><div class='add'>+try_next_time:</div><div class='add'>+	port_map_tried = 0;</div><div class='add'>+</div><div class='add'>+try_next_port:</div><div class='add'>+</div><div class='add'>+	hcs_params = readl(&amp;ehci_caps-&gt;hcs_params);</div><div class='add'>+	debug_port = HCS_DEBUG_PORT(hcs_params);</div><div class='add'>+	n_ports    = HCS_N_PORTS(hcs_params);</div><div class='add'>+</div><div class='add'>+	dbgp_printk("debug_port: %d\n", debug_port);</div><div class='add'>+	dbgp_printk("n_ports:    %d\n", n_ports);</div><div class='add'>+</div><div class='add'>+	for (i = 1; i &lt;= n_ports; i++) {</div><div class='add'>+		portsc = readl(&amp;ehci_regs-&gt;port_status[i-1]);</div><div class='add'>+		dbgp_printk("portstatus%d: %08x\n", i, portsc);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (port_map_tried &amp;&amp; (new_debug_port != debug_port)) {</div><div class='add'>+		if (--playtimes) {</div><div class='add'>+			set_debug_port(new_debug_port);</div><div class='add'>+			goto try_next_time;</div><div class='add'>+		}</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	loop = 10;</div><div class='add'>+	/* Reset the EHCI controller */</div><div class='add'>+	cmd = readl(&amp;ehci_regs-&gt;command);</div><div class='add'>+	cmd |= CMD_RESET;</div><div class='add'>+	writel(cmd, &amp;ehci_regs-&gt;command);</div><div class='add'>+	do {</div><div class='add'>+		cmd = readl(&amp;ehci_regs-&gt;command);</div><div class='add'>+	} while ((cmd &amp; CMD_RESET) &amp;&amp; (--loop &gt; 0));</div><div class='add'>+</div><div class='add'>+	if (!loop) {</div><div class='add'>+		dbgp_printk("can not reset ehci\n");</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+	dbgp_printk("ehci reset done\n");</div><div class='add'>+</div><div class='add'>+	/* Claim ownership, but do not enable yet */</div><div class='add'>+	ctrl = readl(&amp;ehci_debug-&gt;control);</div><div class='add'>+	ctrl |= DBGP_OWNER;</div><div class='add'>+	ctrl &amp;= ~(DBGP_ENABLED | DBGP_INUSE);</div><div class='add'>+	writel(ctrl, &amp;ehci_debug-&gt;control);</div><div class='add'>+</div><div class='add'>+	/* Start the ehci running */</div><div class='add'>+	cmd = readl(&amp;ehci_regs-&gt;command);</div><div class='add'>+	cmd &amp;= ~(CMD_LRESET | CMD_IAAD | CMD_PSE | CMD_ASE | CMD_RESET);</div><div class='add'>+	cmd |= CMD_RUN;</div><div class='add'>+	writel(cmd, &amp;ehci_regs-&gt;command);</div><div class='add'>+</div><div class='add'>+	/* Ensure everything is routed to the EHCI */</div><div class='add'>+	writel(FLAG_CF, &amp;ehci_regs-&gt;configured_flag);</div><div class='add'>+</div><div class='add'>+	/* Wait until the controller is no longer halted */</div><div class='add'>+	loop = 10;</div><div class='add'>+	do {</div><div class='add'>+		status = readl(&amp;ehci_regs-&gt;status);</div><div class='add'>+	} while ((status &amp; STS_HALT) &amp;&amp; (--loop &gt; 0));</div><div class='add'>+</div><div class='add'>+	if (!loop) {</div><div class='add'>+		dbgp_printk("ehci can be started\n");</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+	dbgp_printk("ehci started\n");</div><div class='add'>+</div><div class='add'>+	/* Wait for a device to show up in the debug port */</div><div class='add'>+	ret = ehci_wait_for_port(debug_port);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dbgp_printk("No device found in debug port\n");</div><div class='add'>+		goto next_debug_port;</div><div class='add'>+	}</div><div class='add'>+	dbgp_printk("ehci wait for port done\n");</div><div class='add'>+</div><div class='add'>+	/* Enable the debug port */</div><div class='add'>+	ctrl = readl(&amp;ehci_debug-&gt;control);</div><div class='add'>+	ctrl |= DBGP_CLAIM;</div><div class='add'>+	writel(ctrl, &amp;ehci_debug-&gt;control);</div><div class='add'>+	ctrl = readl(&amp;ehci_debug-&gt;control);</div><div class='add'>+	if ((ctrl &amp; DBGP_CLAIM) != DBGP_CLAIM) {</div><div class='add'>+		dbgp_printk("No device in debug port\n");</div><div class='add'>+		writel(ctrl &amp; ~DBGP_CLAIM, &amp;ehci_debug-&gt;control);</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+	dbgp_printk("debug ported enabled\n");</div><div class='add'>+</div><div class='add'>+	/* Completely transfer the debug device to the debug controller */</div><div class='add'>+	portsc = readl(&amp;ehci_regs-&gt;port_status[debug_port - 1]);</div><div class='add'>+	portsc &amp;= ~PORT_PE;</div><div class='add'>+	writel(portsc, &amp;ehci_regs-&gt;port_status[debug_port - 1]);</div><div class='add'>+</div><div class='add'>+	dbgp_mdelay(100);</div><div class='add'>+</div><div class='add'>+	/* Find the debug device and make it device number 127 */</div><div class='add'>+	for (devnum = 0; devnum &lt;= 127; devnum++) {</div><div class='add'>+		ret = dbgp_control_msg(devnum,</div><div class='add'>+			USB_DIR_IN | USB_TYPE_STANDARD | USB_RECIP_DEVICE,</div><div class='add'>+			USB_REQ_GET_DESCRIPTOR, (USB_DT_DEBUG &lt;&lt; 8), 0,</div><div class='add'>+			&amp;dbgp_desc, sizeof(dbgp_desc));</div><div class='add'>+		if (ret &gt; 0)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	if (devnum &gt; 127) {</div><div class='add'>+		dbgp_printk("Could not find attached debug device\n");</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dbgp_printk("Attached device is not a debug device\n");</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+	dbgp_endpoint_out = dbgp_desc.bDebugOutEndpoint;</div><div class='add'>+</div><div class='add'>+	/* Move the device to 127 if it isn't already there */</div><div class='add'>+	if (devnum != USB_DEBUG_DEVNUM) {</div><div class='add'>+		ret = dbgp_control_msg(devnum,</div><div class='add'>+			USB_DIR_OUT | USB_TYPE_STANDARD | USB_RECIP_DEVICE,</div><div class='add'>+			USB_REQ_SET_ADDRESS, USB_DEBUG_DEVNUM, 0, NULL, 0);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			dbgp_printk("Could not move attached device to %d\n",</div><div class='add'>+				USB_DEBUG_DEVNUM);</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='add'>+		devnum = USB_DEBUG_DEVNUM;</div><div class='add'>+		dbgp_printk("debug device renamed to 127\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Enable the debug interface */</div><div class='add'>+	ret = dbgp_control_msg(USB_DEBUG_DEVNUM,</div><div class='add'>+		USB_DIR_OUT | USB_TYPE_STANDARD | USB_RECIP_DEVICE,</div><div class='add'>+		USB_REQ_SET_FEATURE, USB_DEVICE_DEBUG_MODE, 0, NULL, 0);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dbgp_printk(" Could not enable the debug device\n");</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+	dbgp_printk("debug interface enabled\n");</div><div class='add'>+</div><div class='add'>+	/* Perform a small write to get the even/odd data state in sync</div><div class='add'>+	 */</div><div class='add'>+	ret = dbgp_bulk_write(USB_DEBUG_DEVNUM, dbgp_endpoint_out, " ", 1);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dbgp_printk("dbgp_bulk_write failed: %d\n", ret);</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+	dbgp_printk("small write doned\n");</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+err:</div><div class='add'>+	/* Things didn't work so remove my claim */</div><div class='add'>+	ctrl = readl(&amp;ehci_debug-&gt;control);</div><div class='add'>+	ctrl &amp;= ~(DBGP_CLAIM | DBGP_OUT);</div><div class='add'>+	writel(ctrl, &amp;ehci_debug-&gt;control);</div><div class='add'>+	return -1;</div><div class='add'>+</div><div class='add'>+next_debug_port:</div><div class='add'>+	port_map_tried |= (1&lt;&lt;(debug_port - 1));</div><div class='add'>+	new_debug_port = ((debug_port-1+1)%n_ports) + 1;</div><div class='add'>+	if (port_map_tried != ((1&lt;&lt;n_ports) - 1)) {</div><div class='add'>+		set_debug_port(new_debug_port);</div><div class='add'>+		goto try_next_port;</div><div class='add'>+	}</div><div class='add'>+	if (--playtimes) {</div><div class='add'>+		set_debug_port(new_debug_port);</div><div class='add'>+		goto try_next_time;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init early_dbgp_init(char *s)</div><div class='add'>+{</div><div class='add'>+	u32 debug_port, bar, offset;</div><div class='add'>+	u32 bus, slot, func, cap;</div><div class='add'>+	void __iomem *ehci_bar;</div><div class='add'>+	u32 dbgp_num;</div><div class='add'>+	u32 bar_val;</div><div class='add'>+	char *e;</div><div class='add'>+	int ret;</div><div class='add'>+	u8 byte;</div><div class='add'>+</div><div class='add'>+	if (!early_pci_allowed())</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	dbgp_num = 0;</div><div class='add'>+	if (*s)</div><div class='add'>+		dbgp_num = simple_strtoul(s, &amp;e, 10);</div><div class='add'>+	dbgp_printk("dbgp_num: %d\n", dbgp_num);</div><div class='add'>+</div><div class='add'>+	cap = find_dbgp(dbgp_num, &amp;bus, &amp;slot, &amp;func);</div><div class='add'>+	if (!cap)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	dbgp_printk("Found EHCI debug port on %02x:%02x.%1x\n", bus, slot,</div><div class='add'>+			 func);</div><div class='add'>+</div><div class='add'>+	debug_port = read_pci_config(bus, slot, func, cap);</div><div class='add'>+	bar = (debug_port &gt;&gt; 29) &amp; 0x7;</div><div class='add'>+	bar = (bar * 4) + 0xc;</div><div class='add'>+	offset = (debug_port &gt;&gt; 16) &amp; 0xfff;</div><div class='add'>+	dbgp_printk("bar: %02x offset: %03x\n", bar, offset);</div><div class='add'>+	if (bar != PCI_BASE_ADDRESS_0) {</div><div class='add'>+		dbgp_printk("only debug ports on bar 1 handled.\n");</div><div class='add'>+</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bar_val = read_pci_config(bus, slot, func, PCI_BASE_ADDRESS_0);</div><div class='add'>+	dbgp_printk("bar_val: %02x offset: %03x\n", bar_val, offset);</div><div class='add'>+	if (bar_val &amp; ~PCI_BASE_ADDRESS_MEM_MASK) {</div><div class='add'>+		dbgp_printk("only simple 32bit mmio bars supported\n");</div><div class='add'>+</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* double check if the mem space is enabled */</div><div class='add'>+	byte = read_pci_config_byte(bus, slot, func, 0x04);</div><div class='add'>+	if (!(byte &amp; 0x2)) {</div><div class='add'>+		byte  |= 0x02;</div><div class='add'>+		write_pci_config_byte(bus, slot, func, 0x04, byte);</div><div class='add'>+		dbgp_printk("mmio for ehci enabled\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * FIXME I don't have the bar size so just guess PAGE_SIZE is more</div><div class='add'>+	 * than enough.  1K is the biggest I have seen.</div><div class='add'>+	 */</div><div class='add'>+	set_fixmap_nocache(FIX_DBGP_BASE, bar_val &amp; PAGE_MASK);</div><div class='add'>+	ehci_bar = (void __iomem *)__fix_to_virt(FIX_DBGP_BASE);</div><div class='add'>+	ehci_bar += bar_val &amp; ~PAGE_MASK;</div><div class='add'>+	dbgp_printk("ehci_bar: %p\n", ehci_bar);</div><div class='add'>+</div><div class='add'>+	ehci_caps  = ehci_bar;</div><div class='add'>+	ehci_regs  = ehci_bar + HC_LENGTH(readl(&amp;ehci_caps-&gt;hc_capbase));</div><div class='add'>+	ehci_debug = ehci_bar + offset;</div><div class='add'>+	ehci_dev.bus = bus;</div><div class='add'>+	ehci_dev.slot = slot;</div><div class='add'>+	ehci_dev.func = func;</div><div class='add'>+</div><div class='add'>+	detect_set_debug_port();</div><div class='add'>+</div><div class='add'>+	ret = ehci_setup();</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dbgp_printk("ehci_setup failed\n");</div><div class='add'>+		ehci_debug = NULL;</div><div class='add'>+</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void early_dbgp_write(struct console *con, const char *str, u32 n)</div><div class='add'>+{</div><div class='add'>+	int chunk, ret;</div><div class='add'>+</div><div class='add'>+	if (!ehci_debug)</div><div class='add'>+		return;</div><div class='add'>+	while (n &gt; 0) {</div><div class='add'>+		chunk = n;</div><div class='add'>+		if (chunk &gt; DBGP_MAX_PACKET)</div><div class='add'>+			chunk = DBGP_MAX_PACKET;</div><div class='add'>+		ret = dbgp_bulk_write(USB_DEBUG_DEVNUM,</div><div class='add'>+			dbgp_endpoint_out, str, chunk);</div><div class='add'>+		str += chunk;</div><div class='add'>+		n -= chunk;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct console early_dbgp_console = {</div><div class='add'>+	.name =		"earlydbg",</div><div class='add'>+	.write =	early_dbgp_write,</div><div class='add'>+	.flags =	CON_PRINTBUFFER,</div><div class='add'>+	.index =	-1,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /* Console interface to a host file on AMD's SimNow! */</div><div class='ctx'> </div><div class='ctx'> static int simnow_fd;</div><div class='hunk'>@@ -165,6 +889,7 @@ enum {</div><div class='ctx'> static noinline long simnow(long cmd, long a, long b, long c)</div><div class='ctx'> {</div><div class='ctx'> 	long ret;</div><div class='add'>+</div><div class='ctx'> 	asm volatile("cpuid" :</div><div class='ctx'> 		     "=a" (ret) :</div><div class='ctx'> 		     "b" (a), "c" (b), "d" (c), "0" (MAGIC1), "D" (cmd + MAGIC2));</div><div class='hunk'>@@ -174,6 +899,7 @@ static noinline long simnow(long cmd, long a, long b, long c)</div><div class='ctx'> static void __init simnow_init(char *str)</div><div class='ctx'> {</div><div class='ctx'> 	char *fn = "klog";</div><div class='add'>+</div><div class='ctx'> 	if (*str == '=')</div><div class='ctx'> 		fn = ++str;</div><div class='ctx'> 	/* error ignored */</div><div class='hunk'>@@ -194,7 +920,7 @@ static struct console simnow_console = {</div><div class='ctx'> </div><div class='ctx'> /* Direct interface for emergencies */</div><div class='ctx'> static struct console *early_console = &amp;early_vga_console;</div><div class='del'>-static int early_console_initialized;</div><div class='add'>+static int __initdata early_console_initialized;</div><div class='ctx'> </div><div class='ctx'> asmlinkage void early_printk(const char *fmt, ...)</div><div class='ctx'> {</div><div class='hunk'>@@ -208,10 +934,11 @@ asmlinkage void early_printk(const char *fmt, ...)</div><div class='ctx'> 	va_end(ap);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __initdata keep_early;</div><div class='ctx'> </div><div class='ctx'> static int __init setup_early_printk(char *buf)</div><div class='ctx'> {</div><div class='add'>+	int keep_early;</div><div class='add'>+</div><div class='ctx'> 	if (!buf)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -219,8 +946,7 @@ static int __init setup_early_printk(char *buf)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	early_console_initialized = 1;</div><div class='ctx'> </div><div class='del'>-	if (strstr(buf, "keep"))</div><div class='del'>-		keep_early = 1;</div><div class='add'>+	keep_early = (strstr(buf, "keep") != NULL);</div><div class='ctx'> </div><div class='ctx'> 	if (!strncmp(buf, "serial", 6)) {</div><div class='ctx'> 		early_serial_init(buf + 6);</div><div class='hunk'>@@ -238,6 +964,17 @@ static int __init setup_early_printk(char *buf)</div><div class='ctx'> 		simnow_init(buf + 6);</div><div class='ctx'> 		early_console = &amp;simnow_console;</div><div class='ctx'> 		keep_early = 1;</div><div class='add'>+#ifdef CONFIG_EARLY_PRINTK_DBGP</div><div class='add'>+	} else if (!strncmp(buf, "dbgp", 4)) {</div><div class='add'>+		if (early_dbgp_init(buf+4) &lt; 0)</div><div class='add'>+			return 0;</div><div class='add'>+		early_console = &amp;early_dbgp_console;</div><div class='add'>+		/*</div><div class='add'>+		 * usb subsys will reset ehci controller, so don't keep</div><div class='add'>+		 * that early console</div><div class='add'>+		 */</div><div class='add'>+		keep_early = 0;</div><div class='add'>+#endif</div><div class='ctx'> #ifdef CONFIG_HVC_XEN</div><div class='ctx'> 	} else if (!strncmp(buf, "xen", 3)) {</div><div class='ctx'> 		early_console = &amp;xenboot_console;</div><div class='hunk'>@@ -251,4 +988,5 @@ static int __init setup_early_printk(char *buf)</div><div class='ctx'> 	register_console(early_console);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+</div><div class='ctx'> early_param("earlyprintk", setup_early_printk);</div><div class='head'>diff --git a/arch/x86/kernel/efi.c b/arch/x86/kernel/efi.c<br/>index 06cc8d4254b1..945a31cdd81f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/efi.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/efi.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/efi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/efi.c</a></div><div class='hunk'>@@ -414,9 +414,11 @@ void __init efi_init(void)</div><div class='ctx'> 	if (memmap.map == NULL)</div><div class='ctx'> 		printk(KERN_ERR "Could not map the EFI memory map!\n");</div><div class='ctx'> 	memmap.map_end = memmap.map + (memmap.nr_map * memmap.desc_size);</div><div class='add'>+</div><div class='ctx'> 	if (memmap.desc_size != sizeof(efi_memory_desc_t))</div><div class='del'>-		printk(KERN_WARNING "Kernel-defined memdesc"</div><div class='del'>-		       "doesn't match the one from EFI!\n");</div><div class='add'>+		printk(KERN_WARNING</div><div class='add'>+		  "Kernel-defined memdesc doesn't match the one from EFI!\n");</div><div class='add'>+</div><div class='ctx'> 	if (add_efi_memmap)</div><div class='ctx'> 		do_add_efi_memmap();</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S<br/>index 109792bc7cfa..b21fbfaffe39 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/entry_32.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/entry_32.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/entry_32.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/entry_32.S</a></div><div class='hunk'>@@ -730,6 +730,7 @@ error_code:</div><div class='ctx'> 	movl $(__USER_DS), %ecx</div><div class='ctx'> 	movl %ecx, %ds</div><div class='ctx'> 	movl %ecx, %es</div><div class='add'>+	TRACE_IRQS_OFF</div><div class='ctx'> 	movl %esp,%eax			# pt_regs pointer</div><div class='ctx'> 	call *%edi</div><div class='ctx'> 	jmp ret_from_exception</div><div class='hunk'>@@ -760,20 +761,9 @@ ENTRY(device_not_available)</div><div class='ctx'> 	RING0_INT_FRAME</div><div class='ctx'> 	pushl $-1			# mark this as an int</div><div class='ctx'> 	CFI_ADJUST_CFA_OFFSET 4</div><div class='del'>-	SAVE_ALL</div><div class='del'>-	GET_CR0_INTO_EAX</div><div class='del'>-	testl $0x4, %eax		# EM (math emulation bit)</div><div class='del'>-	jne device_not_available_emulate</div><div class='del'>-	preempt_stop(CLBR_ANY)</div><div class='del'>-	call math_state_restore</div><div class='del'>-	jmp ret_from_exception</div><div class='del'>-device_not_available_emulate:</div><div class='del'>-	pushl $0			# temporary storage for ORIG_EIP</div><div class='add'>+	pushl $do_device_not_available</div><div class='ctx'> 	CFI_ADJUST_CFA_OFFSET 4</div><div class='del'>-	call math_emulate</div><div class='del'>-	addl $4, %esp</div><div class='del'>-	CFI_ADJUST_CFA_OFFSET -4</div><div class='del'>-	jmp ret_from_exception</div><div class='add'>+	jmp error_code</div><div class='ctx'> 	CFI_ENDPROC</div><div class='ctx'> END(device_not_available)</div><div class='ctx'> </div><div class='hunk'>@@ -814,6 +804,7 @@ debug_stack_correct:</div><div class='ctx'> 	pushl $-1			# mark this as an int</div><div class='ctx'> 	CFI_ADJUST_CFA_OFFSET 4</div><div class='ctx'> 	SAVE_ALL</div><div class='add'>+	TRACE_IRQS_OFF</div><div class='ctx'> 	xorl %edx,%edx			# error code 0</div><div class='ctx'> 	movl %esp,%eax			# pt_regs pointer</div><div class='ctx'> 	call do_debug</div><div class='hunk'>@@ -858,6 +849,7 @@ nmi_stack_correct:</div><div class='ctx'> 	pushl %eax</div><div class='ctx'> 	CFI_ADJUST_CFA_OFFSET 4</div><div class='ctx'> 	SAVE_ALL</div><div class='add'>+	TRACE_IRQS_OFF</div><div class='ctx'> 	xorl %edx,%edx		# zero error code</div><div class='ctx'> 	movl %esp,%eax		# pt_regs pointer</div><div class='ctx'> 	call do_nmi</div><div class='hunk'>@@ -898,6 +890,7 @@ nmi_espfix_stack:</div><div class='ctx'> 	pushl %eax</div><div class='ctx'> 	CFI_ADJUST_CFA_OFFSET 4</div><div class='ctx'> 	SAVE_ALL</div><div class='add'>+	TRACE_IRQS_OFF</div><div class='ctx'> 	FIXUP_ESPFIX_STACK		# %eax == %esp</div><div class='ctx'> 	xorl %edx,%edx			# zero error code</div><div class='ctx'> 	call do_nmi</div><div class='hunk'>@@ -928,6 +921,7 @@ KPROBE_ENTRY(int3)</div><div class='ctx'> 	pushl $-1			# mark this as an int</div><div class='ctx'> 	CFI_ADJUST_CFA_OFFSET 4</div><div class='ctx'> 	SAVE_ALL</div><div class='add'>+	TRACE_IRQS_OFF</div><div class='ctx'> 	xorl %edx,%edx		# zero error code</div><div class='ctx'> 	movl %esp,%eax		# pt_regs pointer</div><div class='ctx'> 	call do_int3</div><div class='hunk'>@@ -1030,7 +1024,7 @@ ENTRY(machine_check)</div><div class='ctx'> 	RING0_INT_FRAME</div><div class='ctx'> 	pushl $0</div><div class='ctx'> 	CFI_ADJUST_CFA_OFFSET 4</div><div class='del'>-	pushl machine_check_vector</div><div class='add'>+	pushl $do_machine_check</div><div class='ctx'> 	CFI_ADJUST_CFA_OFFSET 4</div><div class='ctx'> 	jmp error_code</div><div class='ctx'> 	CFI_ENDPROC</div><div class='head'>diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S<br/>index 89434d439605..1db6ce4314e1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/entry_64.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/entry_64.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/entry_64.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/entry_64.S</a></div><div class='hunk'>@@ -275,9 +275,9 @@ ENTRY(native_usergs_sysret64)</div><div class='ctx'> ENTRY(ret_from_fork)</div><div class='ctx'> 	CFI_DEFAULT_STACK</div><div class='ctx'> 	push kernel_eflags(%rip)</div><div class='del'>-	CFI_ADJUST_CFA_OFFSET 4</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET 8</div><div class='ctx'> 	popf				# reset kernel eflags</div><div class='del'>-	CFI_ADJUST_CFA_OFFSET -4</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET -8</div><div class='ctx'> 	call schedule_tail</div><div class='ctx'> 	GET_THREAD_INFO(%rcx)</div><div class='ctx'> 	testl $(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT),TI_flags(%rcx)</div><div class='hunk'>@@ -667,6 +667,13 @@ END(stub_rt_sigreturn)</div><div class='ctx'> 	SAVE_ARGS</div><div class='ctx'> 	leaq -ARGOFFSET(%rsp),%rdi	# arg1 for handler</div><div class='ctx'> 	pushq %rbp</div><div class='add'>+	/*</div><div class='add'>+	 * Save rbp twice: One is for marking the stack frame, as usual, and the</div><div class='add'>+	 * other, to fill pt_regs properly. This is because bx comes right</div><div class='add'>+	 * before the last saved register in that structure, and not bp. If the</div><div class='add'>+	 * base pointer were in the place bx is today, this would not be needed.</div><div class='add'>+	 */</div><div class='add'>+	movq %rbp, -8(%rsp)</div><div class='ctx'> 	CFI_ADJUST_CFA_OFFSET	8</div><div class='ctx'> 	CFI_REL_OFFSET		rbp, 0</div><div class='ctx'> 	movq %rsp,%rbp</div><div class='hunk'>@@ -932,6 +939,9 @@ END(spurious_interrupt)</div><div class='ctx'> 	.if \ist</div><div class='ctx'> 	movq	%gs:pda_data_offset, %rbp</div><div class='ctx'> 	.endif</div><div class='add'>+	.if \irqtrace</div><div class='add'>+	TRACE_IRQS_OFF</div><div class='add'>+	.endif</div><div class='ctx'> 	movq %rsp,%rdi</div><div class='ctx'> 	movq ORIG_RAX(%rsp),%rsi</div><div class='ctx'> 	movq $-1,ORIG_RAX(%rsp)</div><div class='hunk'>@@ -1058,7 +1068,8 @@ KPROBE_ENTRY(error_entry)</div><div class='ctx'> 	je  error_kernelspace</div><div class='ctx'> error_swapgs:	</div><div class='ctx'> 	SWAPGS</div><div class='del'>-error_sti:	</div><div class='add'>+error_sti:</div><div class='add'>+	TRACE_IRQS_OFF</div><div class='ctx'> 	movq %rdi,RDI(%rsp) 	</div><div class='ctx'> 	CFI_REL_OFFSET	rdi,RDI</div><div class='ctx'> 	movq %rsp,%rdi</div><div class='hunk'>@@ -1232,7 +1243,7 @@ ENTRY(simd_coprocessor_error)</div><div class='ctx'> END(simd_coprocessor_error)</div><div class='ctx'> </div><div class='ctx'> ENTRY(device_not_available)</div><div class='del'>-	zeroentry math_state_restore</div><div class='add'>+	zeroentry do_device_not_available</div><div class='ctx'> END(device_not_available)</div><div class='ctx'> </div><div class='ctx'> 	/* runs on exception stack */</div><div class='head'>diff --git a/arch/x86/mach-es7000/es7000plat.c b/arch/x86/kernel/es7000_32.c<br/>index 50189af14b85..f454c78fcef6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/mach-es7000/es7000plat.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/mach-es7000/es7000plat.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/es7000_32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/es7000_32.c</a></div><div class='hunk'>@@ -39,10 +39,94 @@</div><div class='ctx'> #include &lt;asm/nmi.h&gt;</div><div class='ctx'> #include &lt;asm/smp.h&gt;</div><div class='ctx'> #include &lt;asm/apicdef.h&gt;</div><div class='del'>-#include "es7000.h"</div><div class='ctx'> #include &lt;mach_mpparse.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * ES7000 chipsets</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define NON_UNISYS		0</div><div class='add'>+#define ES7000_CLASSIC		1</div><div class='add'>+#define ES7000_ZORRO		2</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define	MIP_REG			1</div><div class='add'>+#define	MIP_PSAI_REG		4</div><div class='add'>+</div><div class='add'>+#define	MIP_BUSY		1</div><div class='add'>+#define	MIP_SPIN		0xf0000</div><div class='add'>+#define	MIP_VALID		0x0100000000000000ULL</div><div class='add'>+#define	MIP_PORT(VALUE)	((VALUE &gt;&gt; 32) &amp; 0xffff)</div><div class='add'>+</div><div class='add'>+#define	MIP_RD_LO(VALUE)	(VALUE &amp; 0xffffffff)</div><div class='add'>+</div><div class='add'>+struct mip_reg_info {</div><div class='add'>+	unsigned long long mip_info;</div><div class='add'>+	unsigned long long delivery_info;</div><div class='add'>+	unsigned long long host_reg;</div><div class='add'>+	unsigned long long mip_reg;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct part_info {</div><div class='add'>+	unsigned char type;</div><div class='add'>+	unsigned char length;</div><div class='add'>+	unsigned char part_id;</div><div class='add'>+	unsigned char apic_mode;</div><div class='add'>+	unsigned long snum;</div><div class='add'>+	char ptype[16];</div><div class='add'>+	char sname[64];</div><div class='add'>+	char pname[64];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct psai {</div><div class='add'>+	unsigned long long entry_type;</div><div class='add'>+	unsigned long long addr;</div><div class='add'>+	unsigned long long bep_addr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct es7000_mem_info {</div><div class='add'>+	unsigned char type;</div><div class='add'>+	unsigned char length;</div><div class='add'>+	unsigned char resv[6];</div><div class='add'>+	unsigned long long  start;</div><div class='add'>+	unsigned long long  size;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct es7000_oem_table {</div><div class='add'>+	unsigned long long hdr;</div><div class='add'>+	struct mip_reg_info mip;</div><div class='add'>+	struct part_info pif;</div><div class='add'>+	struct es7000_mem_info shm;</div><div class='add'>+	struct psai psai;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ACPI</div><div class='add'>+</div><div class='add'>+struct oem_table {</div><div class='add'>+	struct acpi_table_header Header;</div><div class='add'>+	u32 OEMTableAddr;</div><div class='add'>+	u32 OEMTableSize;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern int find_unisys_acpi_oem_table(unsigned long *oem_addr);</div><div class='add'>+extern void unmap_unisys_acpi_oem_table(unsigned long oem_addr);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+struct mip_reg {</div><div class='add'>+	unsigned long long off_0;</div><div class='add'>+	unsigned long long off_8;</div><div class='add'>+	unsigned long long off_10;</div><div class='add'>+	unsigned long long off_18;</div><div class='add'>+	unsigned long long off_20;</div><div class='add'>+	unsigned long long off_28;</div><div class='add'>+	unsigned long long off_30;</div><div class='add'>+	unsigned long long off_38;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define	MIP_SW_APIC		0x1020b</div><div class='add'>+#define	MIP_FUNC(VALUE)		(VALUE &amp; 0xff)</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * ES7000 Globals</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -72,7 +156,7 @@ es7000_rename_gsi(int ioapic, int gsi)</div><div class='ctx'> 			base += nr_ioapic_registers[i];</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!ioapic &amp;&amp; (gsi &lt; 16)) </div><div class='add'>+	if (!ioapic &amp;&amp; (gsi &lt; 16))</div><div class='ctx'> 		gsi += base;</div><div class='ctx'> 	return gsi;</div><div class='ctx'> }</div><div class='hunk'>@@ -160,21 +244,38 @@ parse_unisys_oem (char *oemptr)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ACPI</div><div class='del'>-int __init</div><div class='del'>-find_unisys_acpi_oem_table(unsigned long *oem_addr)</div><div class='add'>+static unsigned long oem_addrX;</div><div class='add'>+static unsigned long oem_size;</div><div class='add'>+int __init find_unisys_acpi_oem_table(unsigned long *oem_addr)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_table_header *header = NULL;</div><div class='ctx'> 	int i = 0;</div><div class='del'>-	while (ACPI_SUCCESS(acpi_get_table("OEM1", i++, &amp;header))) {</div><div class='add'>+	acpi_size tbl_size;</div><div class='add'>+</div><div class='add'>+	while (ACPI_SUCCESS(acpi_get_table_with_size("OEM1", i++, &amp;header, &amp;tbl_size))) {</div><div class='ctx'> 		if (!memcmp((char *) &amp;header-&gt;oem_id, "UNISYS", 6)) {</div><div class='ctx'> 			struct oem_table *t = (struct oem_table *)header;</div><div class='del'>-			*oem_addr = (unsigned long)__acpi_map_table(t-&gt;OEMTableAddr,</div><div class='del'>-								    t-&gt;OEMTableSize);</div><div class='add'>+</div><div class='add'>+			oem_addrX = t-&gt;OEMTableAddr;</div><div class='add'>+			oem_size = t-&gt;OEMTableSize;</div><div class='add'>+			early_acpi_os_unmap_memory(header, tbl_size);</div><div class='add'>+</div><div class='add'>+			*oem_addr = (unsigned long)__acpi_map_table(oem_addrX,</div><div class='add'>+								    oem_size);</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='add'>+		early_acpi_os_unmap_memory(header, tbl_size);</div><div class='ctx'> 	}</div><div class='ctx'> 	return -1;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+void __init unmap_unisys_acpi_oem_table(unsigned long oem_addr)</div><div class='add'>+{</div><div class='add'>+	if (!oem_addr)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	__acpi_unmap_table((char *)oem_addr, oem_size);</div><div class='add'>+}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='head'>diff --git a/arch/x86/kernel/genapic_64.c b/arch/x86/kernel/genapic_64.c<br/>index eaff0bbb1444..6c9bfc9e1e95 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/genapic_64.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/genapic_64.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/genapic_64.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/genapic_64.c</a></div><div class='hunk'>@@ -16,87 +16,63 @@</div><div class='ctx'> #include &lt;linux/ctype.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/hardirq.h&gt;</div><div class='add'>+#include &lt;linux/dmar.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/smp.h&gt;</div><div class='ctx'> #include &lt;asm/ipi.h&gt;</div><div class='ctx'> #include &lt;asm/genapic.h&gt;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_ACPI</div><div class='del'>-#include &lt;acpi/acpi_bus.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-DEFINE_PER_CPU(int, x2apic_extra_bits);</div><div class='add'>+extern struct genapic apic_flat;</div><div class='add'>+extern struct genapic apic_physflat;</div><div class='add'>+extern struct genapic apic_x2xpic_uv_x;</div><div class='add'>+extern struct genapic apic_x2apic_phys;</div><div class='add'>+extern struct genapic apic_x2apic_cluster;</div><div class='ctx'> </div><div class='ctx'> struct genapic __read_mostly *genapic = &amp;apic_flat;</div><div class='ctx'> </div><div class='del'>-static enum uv_system_type uv_system_type;</div><div class='add'>+static struct genapic *apic_probe[] __initdata = {</div><div class='add'>+	&amp;apic_x2apic_uv_x,</div><div class='add'>+	&amp;apic_x2apic_phys,</div><div class='add'>+	&amp;apic_x2apic_cluster,</div><div class='add'>+	&amp;apic_physflat,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Check the APIC IDs in bios_cpu_apicid and choose the APIC mode.</div><div class='ctx'>  */</div><div class='ctx'> void __init setup_apic_routing(void)</div><div class='ctx'> {</div><div class='del'>-	if (uv_system_type == UV_NON_UNIQUE_APIC)</div><div class='del'>-		genapic = &amp;apic_x2apic_uv_x;</div><div class='del'>-	else</div><div class='del'>-#ifdef CONFIG_ACPI</div><div class='del'>-	/*</div><div class='del'>-	 * Quirk: some x86_64 machines can only use physical APIC mode</div><div class='del'>-	 * regardless of how many processors are present (x86_64 ES7000</div><div class='del'>-	 * is an example).</div><div class='del'>-	 */</div><div class='del'>-	if (acpi_gbl_FADT.header.revision &gt; FADT2_REVISION_ID &amp;&amp;</div><div class='del'>-			(acpi_gbl_FADT.flags &amp; ACPI_FADT_APIC_PHYSICAL))</div><div class='del'>-		genapic = &amp;apic_physflat;</div><div class='del'>-	else</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (max_physical_apicid &lt; 8)</div><div class='del'>-		genapic = &amp;apic_flat;</div><div class='del'>-	else</div><div class='del'>-		genapic = &amp;apic_physflat;</div><div class='add'>+	if (genapic == &amp;apic_x2apic_phys || genapic == &amp;apic_x2apic_cluster) {</div><div class='add'>+		if (!intr_remapping_enabled)</div><div class='add'>+			genapic = &amp;apic_flat;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "Setting APIC routing to %s\n", genapic-&gt;name);</div><div class='add'>+	if (genapic == &amp;apic_flat) {</div><div class='add'>+		if (max_physical_apicid &gt;= 8)</div><div class='add'>+			genapic = &amp;apic_physflat;</div><div class='add'>+		printk(KERN_INFO "Setting APIC routing to %s\n", genapic-&gt;name);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Same for both flat and physical. */</div><div class='ctx'> </div><div class='del'>-void send_IPI_self(int vector)</div><div class='add'>+void apic_send_IPI_self(int vector)</div><div class='ctx'> {</div><div class='ctx'> 	__send_IPI_shortcut(APIC_DEST_SELF, vector, APIC_DEST_PHYSICAL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int __init acpi_madt_oem_check(char *oem_id, char *oem_table_id)</div><div class='ctx'> {</div><div class='del'>-	if (!strcmp(oem_id, "SGI")) {</div><div class='del'>-		if (!strcmp(oem_table_id, "UVL"))</div><div class='del'>-			uv_system_type = UV_LEGACY_APIC;</div><div class='del'>-		else if (!strcmp(oem_table_id, "UVX"))</div><div class='del'>-			uv_system_type = UV_X2APIC;</div><div class='del'>-		else if (!strcmp(oem_table_id, "UVH"))</div><div class='del'>-			uv_system_type = UV_NON_UNIQUE_APIC;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; apic_probe[i]; ++i) {</div><div class='add'>+		if (apic_probe[i]-&gt;acpi_madt_oem_check(oem_id, oem_table_id)) {</div><div class='add'>+			genapic = apic_probe[i];</div><div class='add'>+			printk(KERN_INFO "Setting APIC routing to %s.\n",</div><div class='add'>+				genapic-&gt;name);</div><div class='add'>+			return 1;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-unsigned int read_apic_id(void)</div><div class='del'>-{</div><div class='del'>-	unsigned int id;</div><div class='del'>-</div><div class='del'>-	WARN_ON(preemptible() &amp;&amp; num_online_cpus() &gt; 1);</div><div class='del'>-	id = apic_read(APIC_ID);</div><div class='del'>-	if (uv_system_type &gt;= UV_X2APIC)</div><div class='del'>-		id  |= __get_cpu_var(x2apic_extra_bits);</div><div class='del'>-	return id;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum uv_system_type get_uv_system_type(void)</div><div class='del'>-{</div><div class='del'>-	return uv_system_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int is_uv_system(void)</div><div class='del'>-{</div><div class='del'>-	return uv_system_type != UV_NONE;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(is_uv_system);</div><div class='head'>diff --git a/arch/x86/kernel/genapic_flat_64.c b/arch/x86/kernel/genapic_flat_64.c<br/>index 786548a62d38..9eca5ba7a6b1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/genapic_flat_64.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/genapic_flat_64.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/genapic_flat_64.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/genapic_flat_64.c</a></div><div class='hunk'>@@ -15,9 +15,20 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/ctype.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/hardirq.h&gt;</div><div class='ctx'> #include &lt;asm/smp.h&gt;</div><div class='ctx'> #include &lt;asm/ipi.h&gt;</div><div class='ctx'> #include &lt;asm/genapic.h&gt;</div><div class='add'>+#include &lt;mach_apicdef.h&gt;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ACPI</div><div class='add'>+#include &lt;acpi/acpi_bus.h&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static int __init flat_acpi_madt_oem_check(char *oem_id, char *oem_table_id)</div><div class='add'>+{</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static cpumask_t flat_target_cpus(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -95,9 +106,33 @@ static void flat_send_IPI_all(int vector)</div><div class='ctx'> 		__send_IPI_shortcut(APIC_DEST_ALLINC, vector, APIC_DEST_LOGICAL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static unsigned int get_apic_id(unsigned long x)</div><div class='add'>+{</div><div class='add'>+	unsigned int id;</div><div class='add'>+</div><div class='add'>+	id = (((x)&gt;&gt;24) &amp; 0xFFu);</div><div class='add'>+	return id;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned long set_apic_id(unsigned int id)</div><div class='add'>+{</div><div class='add'>+	unsigned long x;</div><div class='add'>+</div><div class='add'>+	x = ((id &amp; 0xFFu)&lt;&lt;24);</div><div class='add'>+	return x;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int read_xapic_id(void)</div><div class='add'>+{</div><div class='add'>+	unsigned int id;</div><div class='add'>+</div><div class='add'>+	id = get_apic_id(apic_read(APIC_ID));</div><div class='add'>+	return id;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int flat_apic_id_registered(void)</div><div class='ctx'> {</div><div class='del'>-	return physid_isset(GET_APIC_ID(read_apic_id()), phys_cpu_present_map);</div><div class='add'>+	return physid_isset(read_xapic_id(), phys_cpu_present_map);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static unsigned int flat_cpu_mask_to_apicid(cpumask_t cpumask)</div><div class='hunk'>@@ -112,6 +147,7 @@ static unsigned int phys_pkg_id(int index_msb)</div><div class='ctx'> </div><div class='ctx'> struct genapic apic_flat =  {</div><div class='ctx'> 	.name = "flat",</div><div class='add'>+	.acpi_madt_oem_check = flat_acpi_madt_oem_check,</div><div class='ctx'> 	.int_delivery_mode = dest_LowestPrio,</div><div class='ctx'> 	.int_dest_mode = (APIC_DEST_LOGICAL != 0),</div><div class='ctx'> 	.target_cpus = flat_target_cpus,</div><div class='hunk'>@@ -121,8 +157,12 @@ struct genapic apic_flat =  {</div><div class='ctx'> 	.send_IPI_all = flat_send_IPI_all,</div><div class='ctx'> 	.send_IPI_allbutself = flat_send_IPI_allbutself,</div><div class='ctx'> 	.send_IPI_mask = flat_send_IPI_mask,</div><div class='add'>+	.send_IPI_self = apic_send_IPI_self,</div><div class='ctx'> 	.cpu_mask_to_apicid = flat_cpu_mask_to_apicid,</div><div class='ctx'> 	.phys_pkg_id = phys_pkg_id,</div><div class='add'>+	.get_apic_id = get_apic_id,</div><div class='add'>+	.set_apic_id = set_apic_id,</div><div class='add'>+	.apic_id_mask = (0xFFu&lt;&lt;24),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -130,6 +170,21 @@ struct genapic apic_flat =  {</div><div class='ctx'>  * We cannot use logical delivery in this case because the mask</div><div class='ctx'>  * overflows, so use physical mode.</div><div class='ctx'>  */</div><div class='add'>+static int __init physflat_acpi_madt_oem_check(char *oem_id, char *oem_table_id)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_ACPI</div><div class='add'>+	/*</div><div class='add'>+	 * Quirk: some x86_64 machines can only use physical APIC mode</div><div class='add'>+	 * regardless of how many processors are present (x86_64 ES7000</div><div class='add'>+	 * is an example).</div><div class='add'>+	 */</div><div class='add'>+	if (acpi_gbl_FADT.header.revision &gt; FADT2_REVISION_ID &amp;&amp;</div><div class='add'>+		(acpi_gbl_FADT.flags &amp; ACPI_FADT_APIC_PHYSICAL))</div><div class='add'>+		return 1;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static cpumask_t physflat_target_cpus(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -176,6 +231,7 @@ static unsigned int physflat_cpu_mask_to_apicid(cpumask_t cpumask)</div><div class='ctx'> </div><div class='ctx'> struct genapic apic_physflat =  {</div><div class='ctx'> 	.name = "physical flat",</div><div class='add'>+	.acpi_madt_oem_check = physflat_acpi_madt_oem_check,</div><div class='ctx'> 	.int_delivery_mode = dest_Fixed,</div><div class='ctx'> 	.int_dest_mode = (APIC_DEST_PHYSICAL != 0),</div><div class='ctx'> 	.target_cpus = physflat_target_cpus,</div><div class='hunk'>@@ -185,6 +241,10 @@ struct genapic apic_physflat =  {</div><div class='ctx'> 	.send_IPI_all = physflat_send_IPI_all,</div><div class='ctx'> 	.send_IPI_allbutself = physflat_send_IPI_allbutself,</div><div class='ctx'> 	.send_IPI_mask = physflat_send_IPI_mask,</div><div class='add'>+	.send_IPI_self = apic_send_IPI_self,</div><div class='ctx'> 	.cpu_mask_to_apicid = physflat_cpu_mask_to_apicid,</div><div class='ctx'> 	.phys_pkg_id = phys_pkg_id,</div><div class='add'>+	.get_apic_id = get_apic_id,</div><div class='add'>+	.set_apic_id = set_apic_id,</div><div class='add'>+	.apic_id_mask = (0xFFu&lt;&lt;24),</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/x86/kernel/genx2apic_cluster.c b/arch/x86/kernel/genx2apic_cluster.c<br/>new file mode 100644<br/>index 000000000000..e4bf2cc0d743<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/genx2apic_cluster.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/genx2apic_cluster.c</a></div><div class='hunk'>@@ -0,0 +1,159 @@</div><div class='add'>+#include &lt;linux/threads.h&gt;</div><div class='add'>+#include &lt;linux/cpumask.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/ctype.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/dmar.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/smp.h&gt;</div><div class='add'>+#include &lt;asm/ipi.h&gt;</div><div class='add'>+#include &lt;asm/genapic.h&gt;</div><div class='add'>+</div><div class='add'>+DEFINE_PER_CPU(u32, x86_cpu_to_logical_apicid);</div><div class='add'>+</div><div class='add'>+static int __init x2apic_acpi_madt_oem_check(char *oem_id, char *oem_table_id)</div><div class='add'>+{</div><div class='add'>+	if (cpu_has_x2apic)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Start with all IRQs pointing to boot CPU.  IRQ balancing will shift them. */</div><div class='add'>+</div><div class='add'>+static cpumask_t x2apic_target_cpus(void)</div><div class='add'>+{</div><div class='add'>+	return cpumask_of_cpu(0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * for now each logical cpu is in its own vector allocation domain.</div><div class='add'>+ */</div><div class='add'>+static cpumask_t x2apic_vector_allocation_domain(int cpu)</div><div class='add'>+{</div><div class='add'>+	cpumask_t domain = CPU_MASK_NONE;</div><div class='add'>+	cpu_set(cpu, domain);</div><div class='add'>+	return domain;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __x2apic_send_IPI_dest(unsigned int apicid, int vector,</div><div class='add'>+				   unsigned int dest)</div><div class='add'>+{</div><div class='add'>+	unsigned long cfg;</div><div class='add'>+</div><div class='add'>+	cfg = __prepare_ICR(0, vector, dest);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * send the IPI.</div><div class='add'>+	 */</div><div class='add'>+	x2apic_icr_write(cfg, apicid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * for now, we send the IPI's one by one in the cpumask.</div><div class='add'>+ * TBD: Based on the cpu mask, we can send the IPI's to the cluster group</div><div class='add'>+ * at once. We have 16 cpu's in a cluster. This will minimize IPI register</div><div class='add'>+ * writes.</div><div class='add'>+ */</div><div class='add'>+static void x2apic_send_IPI_mask(cpumask_t mask, int vector)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	unsigned long query_cpu;</div><div class='add'>+</div><div class='add'>+	local_irq_save(flags);</div><div class='add'>+	for_each_cpu_mask(query_cpu, mask) {</div><div class='add'>+		__x2apic_send_IPI_dest(per_cpu(x86_cpu_to_logical_apicid, query_cpu),</div><div class='add'>+				       vector, APIC_DEST_LOGICAL);</div><div class='add'>+	}</div><div class='add'>+	local_irq_restore(flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void x2apic_send_IPI_allbutself(int vector)</div><div class='add'>+{</div><div class='add'>+	cpumask_t mask = cpu_online_map;</div><div class='add'>+</div><div class='add'>+	cpu_clear(smp_processor_id(), mask);</div><div class='add'>+</div><div class='add'>+	if (!cpus_empty(mask))</div><div class='add'>+		x2apic_send_IPI_mask(mask, vector);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void x2apic_send_IPI_all(int vector)</div><div class='add'>+{</div><div class='add'>+	x2apic_send_IPI_mask(cpu_online_map, vector);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int x2apic_apic_id_registered(void)</div><div class='add'>+{</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int x2apic_cpu_mask_to_apicid(cpumask_t cpumask)</div><div class='add'>+{</div><div class='add'>+	int cpu;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We're using fixed IRQ delivery, can only return one phys APIC ID.</div><div class='add'>+	 * May as well be the first.</div><div class='add'>+	 */</div><div class='add'>+	cpu = first_cpu(cpumask);</div><div class='add'>+	if ((unsigned)cpu &lt; NR_CPUS)</div><div class='add'>+		return per_cpu(x86_cpu_to_logical_apicid, cpu);</div><div class='add'>+	else</div><div class='add'>+		return BAD_APICID;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int get_apic_id(unsigned long x)</div><div class='add'>+{</div><div class='add'>+	unsigned int id;</div><div class='add'>+</div><div class='add'>+	id = x;</div><div class='add'>+	return id;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned long set_apic_id(unsigned int id)</div><div class='add'>+{</div><div class='add'>+	unsigned long x;</div><div class='add'>+</div><div class='add'>+	x = id;</div><div class='add'>+	return x;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int phys_pkg_id(int index_msb)</div><div class='add'>+{</div><div class='add'>+	return current_cpu_data.initial_apicid &gt;&gt; index_msb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void x2apic_send_IPI_self(int vector)</div><div class='add'>+{</div><div class='add'>+	apic_write(APIC_SELF_IPI, vector);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void init_x2apic_ldr(void)</div><div class='add'>+{</div><div class='add'>+	int cpu = smp_processor_id();</div><div class='add'>+</div><div class='add'>+	per_cpu(x86_cpu_to_logical_apicid, cpu) = apic_read(APIC_LDR);</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct genapic apic_x2apic_cluster = {</div><div class='add'>+	.name = "cluster x2apic",</div><div class='add'>+	.acpi_madt_oem_check = x2apic_acpi_madt_oem_check,</div><div class='add'>+	.int_delivery_mode = dest_LowestPrio,</div><div class='add'>+	.int_dest_mode = (APIC_DEST_LOGICAL != 0),</div><div class='add'>+	.target_cpus = x2apic_target_cpus,</div><div class='add'>+	.vector_allocation_domain = x2apic_vector_allocation_domain,</div><div class='add'>+	.apic_id_registered = x2apic_apic_id_registered,</div><div class='add'>+	.init_apic_ldr = init_x2apic_ldr,</div><div class='add'>+	.send_IPI_all = x2apic_send_IPI_all,</div><div class='add'>+	.send_IPI_allbutself = x2apic_send_IPI_allbutself,</div><div class='add'>+	.send_IPI_mask = x2apic_send_IPI_mask,</div><div class='add'>+	.send_IPI_self = x2apic_send_IPI_self,</div><div class='add'>+	.cpu_mask_to_apicid = x2apic_cpu_mask_to_apicid,</div><div class='add'>+	.phys_pkg_id = phys_pkg_id,</div><div class='add'>+	.get_apic_id = get_apic_id,</div><div class='add'>+	.set_apic_id = set_apic_id,</div><div class='add'>+	.apic_id_mask = (0xFFFFFFFFu),</div><div class='add'>+};</div><div class='head'>diff --git a/arch/x86/kernel/genx2apic_phys.c b/arch/x86/kernel/genx2apic_phys.c<br/>new file mode 100644<br/>index 000000000000..8f1343df2627<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/genx2apic_phys.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/genx2apic_phys.c</a></div><div class='hunk'>@@ -0,0 +1,154 @@</div><div class='add'>+#include &lt;linux/threads.h&gt;</div><div class='add'>+#include &lt;linux/cpumask.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/ctype.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/dmar.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/smp.h&gt;</div><div class='add'>+#include &lt;asm/ipi.h&gt;</div><div class='add'>+#include &lt;asm/genapic.h&gt;</div><div class='add'>+</div><div class='add'>+static int x2apic_phys;</div><div class='add'>+</div><div class='add'>+static int set_x2apic_phys_mode(char *arg)</div><div class='add'>+{</div><div class='add'>+	x2apic_phys = 1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+early_param("x2apic_phys", set_x2apic_phys_mode);</div><div class='add'>+</div><div class='add'>+static int __init x2apic_acpi_madt_oem_check(char *oem_id, char *oem_table_id)</div><div class='add'>+{</div><div class='add'>+	if (cpu_has_x2apic &amp;&amp; x2apic_phys)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Start with all IRQs pointing to boot CPU.  IRQ balancing will shift them. */</div><div class='add'>+</div><div class='add'>+static cpumask_t x2apic_target_cpus(void)</div><div class='add'>+{</div><div class='add'>+	return cpumask_of_cpu(0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static cpumask_t x2apic_vector_allocation_domain(int cpu)</div><div class='add'>+{</div><div class='add'>+	cpumask_t domain = CPU_MASK_NONE;</div><div class='add'>+	cpu_set(cpu, domain);</div><div class='add'>+	return domain;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __x2apic_send_IPI_dest(unsigned int apicid, int vector,</div><div class='add'>+				   unsigned int dest)</div><div class='add'>+{</div><div class='add'>+	unsigned long cfg;</div><div class='add'>+</div><div class='add'>+	cfg = __prepare_ICR(0, vector, dest);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * send the IPI.</div><div class='add'>+	 */</div><div class='add'>+	x2apic_icr_write(cfg, apicid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void x2apic_send_IPI_mask(cpumask_t mask, int vector)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	unsigned long query_cpu;</div><div class='add'>+</div><div class='add'>+	local_irq_save(flags);</div><div class='add'>+	for_each_cpu_mask(query_cpu, mask) {</div><div class='add'>+		__x2apic_send_IPI_dest(per_cpu(x86_cpu_to_apicid, query_cpu),</div><div class='add'>+				       vector, APIC_DEST_PHYSICAL);</div><div class='add'>+	}</div><div class='add'>+	local_irq_restore(flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void x2apic_send_IPI_allbutself(int vector)</div><div class='add'>+{</div><div class='add'>+	cpumask_t mask = cpu_online_map;</div><div class='add'>+</div><div class='add'>+	cpu_clear(smp_processor_id(), mask);</div><div class='add'>+</div><div class='add'>+	if (!cpus_empty(mask))</div><div class='add'>+		x2apic_send_IPI_mask(mask, vector);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void x2apic_send_IPI_all(int vector)</div><div class='add'>+{</div><div class='add'>+	x2apic_send_IPI_mask(cpu_online_map, vector);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int x2apic_apic_id_registered(void)</div><div class='add'>+{</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int x2apic_cpu_mask_to_apicid(cpumask_t cpumask)</div><div class='add'>+{</div><div class='add'>+	int cpu;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We're using fixed IRQ delivery, can only return one phys APIC ID.</div><div class='add'>+	 * May as well be the first.</div><div class='add'>+	 */</div><div class='add'>+	cpu = first_cpu(cpumask);</div><div class='add'>+	if ((unsigned)cpu &lt; NR_CPUS)</div><div class='add'>+		return per_cpu(x86_cpu_to_apicid, cpu);</div><div class='add'>+	else</div><div class='add'>+		return BAD_APICID;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int get_apic_id(unsigned long x)</div><div class='add'>+{</div><div class='add'>+	unsigned int id;</div><div class='add'>+</div><div class='add'>+	id = x;</div><div class='add'>+	return id;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned long set_apic_id(unsigned int id)</div><div class='add'>+{</div><div class='add'>+	unsigned long x;</div><div class='add'>+</div><div class='add'>+	x = id;</div><div class='add'>+	return x;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int phys_pkg_id(int index_msb)</div><div class='add'>+{</div><div class='add'>+	return current_cpu_data.initial_apicid &gt;&gt; index_msb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void x2apic_send_IPI_self(int vector)</div><div class='add'>+{</div><div class='add'>+	apic_write(APIC_SELF_IPI, vector);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void init_x2apic_ldr(void)</div><div class='add'>+{</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct genapic apic_x2apic_phys = {</div><div class='add'>+	.name = "physical x2apic",</div><div class='add'>+	.acpi_madt_oem_check = x2apic_acpi_madt_oem_check,</div><div class='add'>+	.int_delivery_mode = dest_Fixed,</div><div class='add'>+	.int_dest_mode = (APIC_DEST_PHYSICAL != 0),</div><div class='add'>+	.target_cpus = x2apic_target_cpus,</div><div class='add'>+	.vector_allocation_domain = x2apic_vector_allocation_domain,</div><div class='add'>+	.apic_id_registered = x2apic_apic_id_registered,</div><div class='add'>+	.init_apic_ldr = init_x2apic_ldr,</div><div class='add'>+	.send_IPI_all = x2apic_send_IPI_all,</div><div class='add'>+	.send_IPI_allbutself = x2apic_send_IPI_allbutself,</div><div class='add'>+	.send_IPI_mask = x2apic_send_IPI_mask,</div><div class='add'>+	.send_IPI_self = x2apic_send_IPI_self,</div><div class='add'>+	.cpu_mask_to_apicid = x2apic_cpu_mask_to_apicid,</div><div class='add'>+	.phys_pkg_id = phys_pkg_id,</div><div class='add'>+	.get_apic_id = get_apic_id,</div><div class='add'>+	.set_apic_id = set_apic_id,</div><div class='add'>+	.apic_id_mask = (0xFFFFFFFFu),</div><div class='add'>+};</div><div class='head'>diff --git a/arch/x86/kernel/genx2apic_uv_x.c b/arch/x86/kernel/genx2apic_uv_x.c<br/>index bfa837cb16be..33581d94a90e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/genx2apic_uv_x.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/genx2apic_uv_x.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/genx2apic_uv_x.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/genx2apic_uv_x.c</a></div><div class='hunk'>@@ -12,12 +12,12 @@</div><div class='ctx'> #include &lt;linux/threads.h&gt;</div><div class='ctx'> #include &lt;linux/cpumask.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/ctype.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/hardirq.h&gt;</div><div class='ctx'> #include &lt;asm/smp.h&gt;</div><div class='ctx'> #include &lt;asm/ipi.h&gt;</div><div class='ctx'> #include &lt;asm/genapic.h&gt;</div><div class='hunk'>@@ -26,6 +26,36 @@</div><div class='ctx'> #include &lt;asm/uv/uv_hub.h&gt;</div><div class='ctx'> #include &lt;asm/uv/bios.h&gt;</div><div class='ctx'> </div><div class='add'>+DEFINE_PER_CPU(int, x2apic_extra_bits);</div><div class='add'>+</div><div class='add'>+static enum uv_system_type uv_system_type;</div><div class='add'>+</div><div class='add'>+static int __init uv_acpi_madt_oem_check(char *oem_id, char *oem_table_id)</div><div class='add'>+{</div><div class='add'>+	if (!strcmp(oem_id, "SGI")) {</div><div class='add'>+		if (!strcmp(oem_table_id, "UVL"))</div><div class='add'>+			uv_system_type = UV_LEGACY_APIC;</div><div class='add'>+		else if (!strcmp(oem_table_id, "UVX"))</div><div class='add'>+			uv_system_type = UV_X2APIC;</div><div class='add'>+		else if (!strcmp(oem_table_id, "UVH")) {</div><div class='add'>+			uv_system_type = UV_NON_UNIQUE_APIC;</div><div class='add'>+			return 1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+enum uv_system_type get_uv_system_type(void)</div><div class='add'>+{</div><div class='add'>+	return uv_system_type;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int is_uv_system(void)</div><div class='add'>+{</div><div class='add'>+	return uv_system_type != UV_NONE;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(is_uv_system);</div><div class='add'>+</div><div class='ctx'> DEFINE_PER_CPU(struct uv_hub_info_s, __uv_hub_info);</div><div class='ctx'> EXPORT_PER_CPU_SYMBOL_GPL(__uv_hub_info);</div><div class='ctx'> </div><div class='hunk'>@@ -84,7 +114,7 @@ static void uv_send_IPI_one(int cpu, int vector)</div><div class='ctx'> 	unsigned long val, apicid, lapicid;</div><div class='ctx'> 	int pnode;</div><div class='ctx'> </div><div class='del'>-	apicid = per_cpu(x86_cpu_to_apicid, cpu); /* ZZZ - cache node-local ? */</div><div class='add'>+	apicid = per_cpu(x86_cpu_to_apicid, cpu);</div><div class='ctx'> 	lapicid = apicid &amp; 0x3f;		/* ZZZ macro needed */</div><div class='ctx'> 	pnode = uv_apicid_to_pnode(apicid);</div><div class='ctx'> 	val =</div><div class='hunk'>@@ -123,6 +153,10 @@ static int uv_apic_id_registered(void)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void uv_init_apic_ldr(void)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static unsigned int uv_cpu_mask_to_apicid(cpumask_t cpumask)</div><div class='ctx'> {</div><div class='ctx'> 	int cpu;</div><div class='hunk'>@@ -138,31 +172,59 @@ static unsigned int uv_cpu_mask_to_apicid(cpumask_t cpumask)</div><div class='ctx'> 		return BAD_APICID;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static unsigned int get_apic_id(unsigned long x)</div><div class='add'>+{</div><div class='add'>+	unsigned int id;</div><div class='add'>+</div><div class='add'>+	WARN_ON(preemptible() &amp;&amp; num_online_cpus() &gt; 1);</div><div class='add'>+	id = x | __get_cpu_var(x2apic_extra_bits);</div><div class='add'>+</div><div class='add'>+	return id;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned long set_apic_id(unsigned int id)</div><div class='add'>+{</div><div class='add'>+	unsigned long x;</div><div class='add'>+</div><div class='add'>+	/* maskout x2apic_extra_bits ? */</div><div class='add'>+	x = id;</div><div class='add'>+	return x;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int uv_read_apic_id(void)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	return get_apic_id(apic_read(APIC_ID));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static unsigned int phys_pkg_id(int index_msb)</div><div class='ctx'> {</div><div class='del'>-	return GET_APIC_ID(read_apic_id()) &gt;&gt; index_msb;</div><div class='add'>+	return uv_read_apic_id() &gt;&gt; index_msb;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef ZZZ		/* Needs x2apic patch */</div><div class='ctx'> static void uv_send_IPI_self(int vector)</div><div class='ctx'> {</div><div class='ctx'> 	apic_write(APIC_SELF_IPI, vector);</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> struct genapic apic_x2apic_uv_x = {</div><div class='ctx'> 	.name = "UV large system",</div><div class='add'>+	.acpi_madt_oem_check = uv_acpi_madt_oem_check,</div><div class='ctx'> 	.int_delivery_mode = dest_Fixed,</div><div class='ctx'> 	.int_dest_mode = (APIC_DEST_PHYSICAL != 0),</div><div class='ctx'> 	.target_cpus = uv_target_cpus,</div><div class='del'>-	.vector_allocation_domain = uv_vector_allocation_domain,/* Fixme ZZZ */</div><div class='add'>+	.vector_allocation_domain = uv_vector_allocation_domain,</div><div class='ctx'> 	.apic_id_registered = uv_apic_id_registered,</div><div class='add'>+	.init_apic_ldr = uv_init_apic_ldr,</div><div class='ctx'> 	.send_IPI_all = uv_send_IPI_all,</div><div class='ctx'> 	.send_IPI_allbutself = uv_send_IPI_allbutself,</div><div class='ctx'> 	.send_IPI_mask = uv_send_IPI_mask,</div><div class='del'>-	/* ZZZ.send_IPI_self = uv_send_IPI_self, */</div><div class='add'>+	.send_IPI_self = uv_send_IPI_self,</div><div class='ctx'> 	.cpu_mask_to_apicid = uv_cpu_mask_to_apicid,</div><div class='del'>-	.phys_pkg_id = phys_pkg_id,	/* Fixme ZZZ */</div><div class='add'>+	.phys_pkg_id = phys_pkg_id,</div><div class='add'>+	.get_apic_id = get_apic_id,</div><div class='add'>+	.set_apic_id = set_apic_id,</div><div class='add'>+	.apic_id_mask = (0xFFFFFFFFu),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static __cpuinit void set_x2apic_extra_bits(int pnode)</div><div class='hunk'>@@ -222,12 +284,13 @@ static __init void map_low_mmrs(void)</div><div class='ctx'> </div><div class='ctx'> enum map_type {map_wb, map_uc};</div><div class='ctx'> </div><div class='del'>-static __init void map_high(char *id, unsigned long base, int shift, enum map_type map_type)</div><div class='add'>+static __init void map_high(char *id, unsigned long base, int shift,</div><div class='add'>+			    int max_pnode, enum map_type map_type)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long bytes, paddr;</div><div class='ctx'> </div><div class='ctx'> 	paddr = base &lt;&lt; shift;</div><div class='del'>-	bytes = (1UL &lt;&lt; shift);</div><div class='add'>+	bytes = (1UL &lt;&lt; shift) * (max_pnode + 1);</div><div class='ctx'> 	printk(KERN_INFO "UV: Map %s_HI 0x%lx - 0x%lx\n", id, paddr,</div><div class='ctx'> 	       					paddr + bytes);</div><div class='ctx'> 	if (map_type == map_uc)</div><div class='hunk'>@@ -243,7 +306,7 @@ static __init void map_gru_high(int max_pnode)</div><div class='ctx'> </div><div class='ctx'> 	gru.v = uv_read_local_mmr(UVH_RH_GAM_GRU_OVERLAY_CONFIG_MMR);</div><div class='ctx'> 	if (gru.s.enable)</div><div class='del'>-		map_high("GRU", gru.s.base, shift, map_wb);</div><div class='add'>+		map_high("GRU", gru.s.base, shift, max_pnode, map_wb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static __init void map_config_high(int max_pnode)</div><div class='hunk'>@@ -253,7 +316,7 @@ static __init void map_config_high(int max_pnode)</div><div class='ctx'> </div><div class='ctx'> 	cfg.v = uv_read_local_mmr(UVH_RH_GAM_CFG_OVERLAY_CONFIG_MMR);</div><div class='ctx'> 	if (cfg.s.enable)</div><div class='del'>-		map_high("CONFIG", cfg.s.base, shift, map_uc);</div><div class='add'>+		map_high("CONFIG", cfg.s.base, shift, max_pnode, map_uc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static __init void map_mmr_high(int max_pnode)</div><div class='hunk'>@@ -263,7 +326,7 @@ static __init void map_mmr_high(int max_pnode)</div><div class='ctx'> </div><div class='ctx'> 	mmr.v = uv_read_local_mmr(UVH_RH_GAM_MMR_OVERLAY_CONFIG_MMR);</div><div class='ctx'> 	if (mmr.s.enable)</div><div class='del'>-		map_high("MMR", mmr.s.base, shift, map_uc);</div><div class='add'>+		map_high("MMR", mmr.s.base, shift, max_pnode, map_uc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static __init void map_mmioh_high(int max_pnode)</div><div class='hunk'>@@ -273,7 +336,7 @@ static __init void map_mmioh_high(int max_pnode)</div><div class='ctx'> </div><div class='ctx'> 	mmioh.v = uv_read_local_mmr(UVH_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR);</div><div class='ctx'> 	if (mmioh.s.enable)</div><div class='del'>-		map_high("MMIOH", mmioh.s.base, shift, map_uc);</div><div class='add'>+		map_high("MMIOH", mmioh.s.base, shift, max_pnode, map_uc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static __init void uv_rtc_init(void)</div><div class='hunk'>@@ -401,3 +464,5 @@ void __cpuinit uv_cpu_init(void)</div><div class='ctx'> 	if (get_uv_system_type() == UV_NON_UNIQUE_APIC)</div><div class='ctx'> 		set_x2apic_extra_bits(uv_hub_info-&gt;pnode);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+</div><div class='head'>diff --git a/arch/x86/kernel/head.c b/arch/x86/kernel/head.c<br/>index 3e66bd364a9d..1dcb0f13897e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/head.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/head.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/head.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/head.c</a></div><div class='hunk'>@@ -35,6 +35,7 @@ void __init reserve_ebda_region(void)</div><div class='ctx'> </div><div class='ctx'> 	/* start of EBDA area */</div><div class='ctx'> 	ebda_addr = get_bios_ebda();</div><div class='add'>+	printk(KERN_INFO "BIOS EBDA/lowmem at: %08x/%08x\n", ebda_addr, lowmem);</div><div class='ctx'> </div><div class='ctx'> 	/* Fixup: bios puts an EBDA in the top 64K segment */</div><div class='ctx'> 	/* of conventional memory, but does not adjust lowmem. */</div><div class='head'>diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c<br/>index 9bfc4d72fb2e..d16084f90649 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/head64.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/head64.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/head64.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/head64.c</a></div><div class='hunk'>@@ -108,12 +108,11 @@ void __init x86_64_start_kernel(char * real_mode_data)</div><div class='ctx'> 	}</div><div class='ctx'> 	load_idt((const struct desc_ptr *)&amp;idt_descr);</div><div class='ctx'> </div><div class='del'>-	early_printk("Kernel alive\n");</div><div class='add'>+	if (console_loglevel == 10)</div><div class='add'>+		early_printk("Kernel alive\n");</div><div class='ctx'> </div><div class='ctx'> 	x86_64_init_pda();</div><div class='ctx'> </div><div class='del'>-	early_printk("Kernel really alive\n");</div><div class='del'>-</div><div class='ctx'> 	x86_64_start_reservations(real_mode_data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S<br/>index a7010c3a377a..e835b4eea70b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/head_32.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/head_32.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/head_32.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/head_32.S</a></div><div class='hunk'>@@ -172,10 +172,6 @@ num_subarch_entries = (. - subarch_entries) / 4</div><div class='ctx'>  *</div><div class='ctx'>  * Note that the stack is not yet set up!</div><div class='ctx'>  */</div><div class='del'>-#define PTE_ATTR	0x007		/* PRESENT+RW+USER */</div><div class='del'>-#define PDE_ATTR	0x067		/* PRESENT+RW+USER+DIRTY+ACCESSED */</div><div class='del'>-#define PGD_ATTR	0x001		/* PRESENT (no other attributes) */</div><div class='del'>-</div><div class='ctx'> default_entry:</div><div class='ctx'> #ifdef CONFIG_X86_PAE</div><div class='ctx'> </div><div class='hunk'>@@ -196,9 +192,9 @@ default_entry:</div><div class='ctx'> 	movl $pa(pg0), %edi</div><div class='ctx'> 	movl %edi, pa(init_pg_tables_start)</div><div class='ctx'> 	movl $pa(swapper_pg_pmd), %edx</div><div class='del'>-	movl $PTE_ATTR, %eax</div><div class='add'>+	movl $PTE_IDENT_ATTR, %eax</div><div class='ctx'> 10:</div><div class='del'>-	leal PDE_ATTR(%edi),%ecx		/* Create PMD entry */</div><div class='add'>+	leal PDE_IDENT_ATTR(%edi),%ecx		/* Create PMD entry */</div><div class='ctx'> 	movl %ecx,(%edx)			/* Store PMD entry */</div><div class='ctx'> 						/* Upper half already zero */</div><div class='ctx'> 	addl $8,%edx</div><div class='hunk'>@@ -215,7 +211,7 @@ default_entry:</div><div class='ctx'> 	 * End condition: we must map up to and including INIT_MAP_BEYOND_END</div><div class='ctx'> 	 * bytes beyond the end of our own page tables.</div><div class='ctx'> 	 */</div><div class='del'>-	leal (INIT_MAP_BEYOND_END+PTE_ATTR)(%edi),%ebp</div><div class='add'>+	leal (INIT_MAP_BEYOND_END+PTE_IDENT_ATTR)(%edi),%ebp</div><div class='ctx'> 	cmpl %ebp,%eax</div><div class='ctx'> 	jb 10b</div><div class='ctx'> 1:</div><div class='hunk'>@@ -224,7 +220,7 @@ default_entry:</div><div class='ctx'> 	movl %eax, pa(max_pfn_mapped)</div><div class='ctx'> </div><div class='ctx'> 	/* Do early initialization of the fixmap area */</div><div class='del'>-	movl $pa(swapper_pg_fixmap)+PDE_ATTR,%eax</div><div class='add'>+	movl $pa(swapper_pg_fixmap)+PDE_IDENT_ATTR,%eax</div><div class='ctx'> 	movl %eax,pa(swapper_pg_pmd+0x1000*KPMDS-8)</div><div class='ctx'> #else	/* Not PAE */</div><div class='ctx'> </div><div class='hunk'>@@ -233,9 +229,9 @@ page_pde_offset = (__PAGE_OFFSET &gt;&gt; 20);</div><div class='ctx'> 	movl $pa(pg0), %edi</div><div class='ctx'> 	movl %edi, pa(init_pg_tables_start)</div><div class='ctx'> 	movl $pa(swapper_pg_dir), %edx</div><div class='del'>-	movl $PTE_ATTR, %eax</div><div class='add'>+	movl $PTE_IDENT_ATTR, %eax</div><div class='ctx'> 10:</div><div class='del'>-	leal PDE_ATTR(%edi),%ecx		/* Create PDE entry */</div><div class='add'>+	leal PDE_IDENT_ATTR(%edi),%ecx		/* Create PDE entry */</div><div class='ctx'> 	movl %ecx,(%edx)			/* Store identity PDE entry */</div><div class='ctx'> 	movl %ecx,page_pde_offset(%edx)		/* Store kernel PDE entry */</div><div class='ctx'> 	addl $4,%edx</div><div class='hunk'>@@ -249,7 +245,7 @@ page_pde_offset = (__PAGE_OFFSET &gt;&gt; 20);</div><div class='ctx'> 	 * bytes beyond the end of our own page tables; the +0x007 is</div><div class='ctx'> 	 * the attribute bits</div><div class='ctx'> 	 */</div><div class='del'>-	leal (INIT_MAP_BEYOND_END+PTE_ATTR)(%edi),%ebp</div><div class='add'>+	leal (INIT_MAP_BEYOND_END+PTE_IDENT_ATTR)(%edi),%ebp</div><div class='ctx'> 	cmpl %ebp,%eax</div><div class='ctx'> 	jb 10b</div><div class='ctx'> 	movl %edi,pa(init_pg_tables_end)</div><div class='hunk'>@@ -257,7 +253,7 @@ page_pde_offset = (__PAGE_OFFSET &gt;&gt; 20);</div><div class='ctx'> 	movl %eax, pa(max_pfn_mapped)</div><div class='ctx'> </div><div class='ctx'> 	/* Do early initialization of the fixmap area */</div><div class='del'>-	movl $pa(swapper_pg_fixmap)+PDE_ATTR,%eax</div><div class='add'>+	movl $pa(swapper_pg_fixmap)+PDE_IDENT_ATTR,%eax</div><div class='ctx'> 	movl %eax,pa(swapper_pg_dir+0xffc)</div><div class='ctx'> #endif</div><div class='ctx'> 	jmp 3f</div><div class='hunk'>@@ -634,19 +630,19 @@ ENTRY(empty_zero_page)</div><div class='ctx'> 	/* Page-aligned for the benefit of paravirt? */</div><div class='ctx'> 	.align PAGE_SIZE_asm</div><div class='ctx'> ENTRY(swapper_pg_dir)</div><div class='del'>-	.long	pa(swapper_pg_pmd+PGD_ATTR),0		/* low identity map */</div><div class='add'>+	.long	pa(swapper_pg_pmd+PGD_IDENT_ATTR),0	/* low identity map */</div><div class='ctx'> # if KPMDS == 3</div><div class='del'>-	.long	pa(swapper_pg_pmd+PGD_ATTR),0</div><div class='del'>-	.long	pa(swapper_pg_pmd+PGD_ATTR+0x1000),0</div><div class='del'>-	.long	pa(swapper_pg_pmd+PGD_ATTR+0x2000),0</div><div class='add'>+	.long	pa(swapper_pg_pmd+PGD_IDENT_ATTR),0</div><div class='add'>+	.long	pa(swapper_pg_pmd+PGD_IDENT_ATTR+0x1000),0</div><div class='add'>+	.long	pa(swapper_pg_pmd+PGD_IDENT_ATTR+0x2000),0</div><div class='ctx'> # elif KPMDS == 2</div><div class='ctx'> 	.long	0,0</div><div class='del'>-	.long	pa(swapper_pg_pmd+PGD_ATTR),0</div><div class='del'>-	.long	pa(swapper_pg_pmd+PGD_ATTR+0x1000),0</div><div class='add'>+	.long	pa(swapper_pg_pmd+PGD_IDENT_ATTR),0</div><div class='add'>+	.long	pa(swapper_pg_pmd+PGD_IDENT_ATTR+0x1000),0</div><div class='ctx'> # elif KPMDS == 1</div><div class='ctx'> 	.long	0,0</div><div class='ctx'> 	.long	0,0</div><div class='del'>-	.long	pa(swapper_pg_pmd+PGD_ATTR),0</div><div class='add'>+	.long	pa(swapper_pg_pmd+PGD_IDENT_ATTR),0</div><div class='ctx'> # else</div><div class='ctx'> #  error "Kernel PMDs should be 1, 2 or 3"</div><div class='ctx'> # endif</div><div class='head'>diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S<br/>index db3280afe886..26cfdc1d7c7f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/head_64.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/head_64.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/head_64.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/head_64.S</a></div><div class='hunk'>@@ -110,7 +110,7 @@ startup_64:</div><div class='ctx'> 	movq	%rdi, %rax</div><div class='ctx'> 	shrq	$PMD_SHIFT, %rax</div><div class='ctx'> 	andq	$(PTRS_PER_PMD - 1), %rax</div><div class='del'>-	leaq	__PAGE_KERNEL_LARGE_EXEC(%rdi), %rdx</div><div class='add'>+	leaq	__PAGE_KERNEL_IDENT_LARGE_EXEC(%rdi), %rdx</div><div class='ctx'> 	leaq	level2_spare_pgt(%rip), %rbx</div><div class='ctx'> 	movq	%rdx, 0(%rbx, %rax, 8)</div><div class='ctx'> ident_complete:</div><div class='hunk'>@@ -374,7 +374,7 @@ NEXT_PAGE(level2_ident_pgt)</div><div class='ctx'> 	/* Since I easily can, map the first 1G.</div><div class='ctx'> 	 * Don't set NX because code runs from these pages.</div><div class='ctx'> 	 */</div><div class='del'>-	PMDS(0, __PAGE_KERNEL_LARGE_EXEC, PTRS_PER_PMD)</div><div class='add'>+	PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, PTRS_PER_PMD)</div><div class='ctx'> </div><div class='ctx'> NEXT_PAGE(level2_kernel_pgt)</div><div class='ctx'> 	/*</div><div class='head'>diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c<br/>index 73deaffadd03..acf62fc233da 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/hpet.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/hpet.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/hpet.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/hpet.c</a></div><div class='hunk'>@@ -115,13 +115,17 @@ static void hpet_reserve_platform_timers(unsigned long id)</div><div class='ctx'> 	hd.hd_phys_address = hpet_address;</div><div class='ctx'> 	hd.hd_address = hpet;</div><div class='ctx'> 	hd.hd_nirqs = nrtimers;</div><div class='del'>-	hd.hd_flags = HPET_DATA_PLATFORM;</div><div class='ctx'> 	hpet_reserve_timer(&amp;hd, 0);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_HPET_EMULATE_RTC</div><div class='ctx'> 	hpet_reserve_timer(&amp;hd, 1);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * NOTE that hd_irq[] reflects IOAPIC input pins (LEGACY_8254</div><div class='add'>+	 * is wrong for i8259!) not the output IRQ.  Many BIOS writers</div><div class='add'>+	 * don't bother configuring *any* comparator interrupts.</div><div class='add'>+	 */</div><div class='ctx'> 	hd.hd_irq[0] = HPET_LEGACY_8254;</div><div class='ctx'> 	hd.hd_irq[1] = HPET_LEGACY_RTC;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kernel/i387.c b/arch/x86/kernel/i387.c<br/>index eb9ddd8efb82..1f20608d4ca8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/i387.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/i387.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/i387.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/i387.c</a></div><div class='hunk'>@@ -21,9 +21,12 @@</div><div class='ctx'> # include &lt;asm/sigcontext32.h&gt;</div><div class='ctx'> # include &lt;asm/user32.h&gt;</div><div class='ctx'> #else</div><div class='del'>-# define save_i387_ia32		save_i387</div><div class='del'>-# define restore_i387_ia32	restore_i387</div><div class='add'>+# define save_i387_xstate_ia32		save_i387_xstate</div><div class='add'>+# define restore_i387_xstate_ia32	restore_i387_xstate</div><div class='ctx'> # define _fpstate_ia32		_fpstate</div><div class='add'>+# define _xstate_ia32		_xstate</div><div class='add'>+# define sig_xstate_ia32_size   sig_xstate_size</div><div class='add'>+# define fx_sw_reserved_ia32	fx_sw_reserved</div><div class='ctx'> # define user_i387_ia32_struct	user_i387_struct</div><div class='ctx'> # define user32_fxsr_struct	user_fxsr_struct</div><div class='ctx'> #endif</div><div class='hunk'>@@ -36,6 +39,7 @@</div><div class='ctx'> </div><div class='ctx'> static unsigned int		mxcsr_feature_mask __read_mostly = 0xffffffffu;</div><div class='ctx'> unsigned int xstate_size;</div><div class='add'>+unsigned int sig_xstate_ia32_size = sizeof(struct _fpstate_ia32);</div><div class='ctx'> static struct i387_fxsave_struct fx_scratch __cpuinitdata;</div><div class='ctx'> </div><div class='ctx'> void __cpuinit mxcsr_feature_mask_init(void)</div><div class='hunk'>@@ -61,6 +65,11 @@ void __init init_thread_xstate(void)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (cpu_has_xsave) {</div><div class='add'>+		xsave_cntxt_init();</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (cpu_has_fxsr)</div><div class='ctx'> 		xstate_size = sizeof(struct i387_fxsave_struct);</div><div class='ctx'> #ifdef CONFIG_X86_32</div><div class='hunk'>@@ -83,9 +92,19 @@ void __cpuinit fpu_init(void)</div><div class='ctx'> </div><div class='ctx'> 	write_cr0(oldcr0 &amp; ~(X86_CR0_TS|X86_CR0_EM)); /* clear TS and EM */</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Boot processor to setup the FP and extended state context info.</div><div class='add'>+	 */</div><div class='add'>+	if (!smp_processor_id())</div><div class='add'>+		init_thread_xstate();</div><div class='add'>+	xsave_init();</div><div class='add'>+</div><div class='ctx'> 	mxcsr_feature_mask_init();</div><div class='ctx'> 	/* clean state in init */</div><div class='del'>-	current_thread_info()-&gt;status = 0;</div><div class='add'>+	if (cpu_has_xsave)</div><div class='add'>+		current_thread_info()-&gt;status = TS_XSAVE;</div><div class='add'>+	else</div><div class='add'>+		current_thread_info()-&gt;status = 0;</div><div class='ctx'> 	clear_used_math();</div><div class='ctx'> }</div><div class='ctx'> #endif	/* CONFIG_X86_64 */</div><div class='hunk'>@@ -195,6 +214,13 @@ int xfpregs_set(struct task_struct *target, const struct user_regset *regset,</div><div class='ctx'> 	 */</div><div class='ctx'> 	target-&gt;thread.xstate-&gt;fxsave.mxcsr &amp;= mxcsr_feature_mask;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * update the header bits in the xsave header, indicating the</div><div class='add'>+	 * presence of FP and SSE state.</div><div class='add'>+	 */</div><div class='add'>+	if (cpu_has_xsave)</div><div class='add'>+		target-&gt;thread.xstate-&gt;xsave.xsave_hdr.xstate_bv |= XSTATE_FPSSE;</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -395,6 +421,12 @@ int fpregs_set(struct task_struct *target, const struct user_regset *regset,</div><div class='ctx'> 	if (!ret)</div><div class='ctx'> 		convert_to_fxsr(target, &amp;env);</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * update the header bit in the xsave header, indicating the</div><div class='add'>+	 * presence of FP.</div><div class='add'>+	 */</div><div class='add'>+	if (cpu_has_xsave)</div><div class='add'>+		target-&gt;thread.xstate-&gt;xsave.xsave_hdr.xstate_bv |= XSTATE_FP;</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -407,7 +439,6 @@ static inline int save_i387_fsave(struct _fpstate_ia32 __user *buf)</div><div class='ctx'> 	struct task_struct *tsk = current;</div><div class='ctx'> 	struct i387_fsave_struct *fp = &amp;tsk-&gt;thread.xstate-&gt;fsave;</div><div class='ctx'> </div><div class='del'>-	unlazy_fpu(tsk);</div><div class='ctx'> 	fp-&gt;status = fp-&gt;swd;</div><div class='ctx'> 	if (__copy_to_user(buf, fp, sizeof(struct i387_fsave_struct)))</div><div class='ctx'> 		return -1;</div><div class='hunk'>@@ -421,8 +452,6 @@ static int save_i387_fxsave(struct _fpstate_ia32 __user *buf)</div><div class='ctx'> 	struct user_i387_ia32_struct env;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='del'>-	unlazy_fpu(tsk);</div><div class='del'>-</div><div class='ctx'> 	convert_from_fxsr(&amp;env, tsk);</div><div class='ctx'> 	if (__copy_to_user(buf, &amp;env, sizeof(env)))</div><div class='ctx'> 		return -1;</div><div class='hunk'>@@ -432,16 +461,54 @@ static int save_i387_fxsave(struct _fpstate_ia32 __user *buf)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='del'>-	if (__copy_to_user(&amp;buf-&gt;_fxsr_env[0], fx,</div><div class='del'>-			   sizeof(struct i387_fxsave_struct)))</div><div class='add'>+	if (__copy_to_user(&amp;buf-&gt;_fxsr_env[0], fx, xstate_size))</div><div class='add'>+		return -1;</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int save_i387_xsave(void __user *buf)</div><div class='add'>+{</div><div class='add'>+	struct task_struct *tsk = current;</div><div class='add'>+	struct _fpstate_ia32 __user *fx = buf;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * For legacy compatible, we always set FP/SSE bits in the bit</div><div class='add'>+	 * vector while saving the state to the user context.</div><div class='add'>+	 * This will enable us capturing any changes(during sigreturn) to</div><div class='add'>+	 * the FP/SSE bits by the legacy applications which don't touch</div><div class='add'>+	 * xstate_bv in the xsave header.</div><div class='add'>+	 *</div><div class='add'>+	 * xsave aware applications can change the xstate_bv in the xsave</div><div class='add'>+	 * header as well as change any contents in the memory layout.</div><div class='add'>+	 * xrestore as part of sigreturn will capture all the changes.</div><div class='add'>+	 */</div><div class='add'>+	tsk-&gt;thread.xstate-&gt;xsave.xsave_hdr.xstate_bv |= XSTATE_FPSSE;</div><div class='add'>+</div><div class='add'>+	if (save_i387_fxsave(fx) &lt; 0)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	err = __copy_to_user(&amp;fx-&gt;sw_reserved, &amp;fx_sw_reserved_ia32,</div><div class='add'>+			     sizeof(struct _fpx_sw_bytes));</div><div class='add'>+	err |= __put_user(FP_XSTATE_MAGIC2,</div><div class='add'>+			  (__u32 __user *) (buf + sig_xstate_ia32_size</div><div class='add'>+					    - FP_XSTATE_MAGIC2_SIZE));</div><div class='add'>+	if (err)</div><div class='ctx'> 		return -1;</div><div class='add'>+</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int save_i387_ia32(struct _fpstate_ia32 __user *buf)</div><div class='add'>+int save_i387_xstate_ia32(void __user *buf)</div><div class='ctx'> {</div><div class='add'>+	struct _fpstate_ia32 __user *fp = (struct _fpstate_ia32 __user *) buf;</div><div class='add'>+	struct task_struct *tsk = current;</div><div class='add'>+</div><div class='ctx'> 	if (!used_math())</div><div class='ctx'> 		return 0;</div><div class='add'>+</div><div class='add'>+	if (!access_ok(VERIFY_WRITE, buf, sig_xstate_ia32_size))</div><div class='add'>+		return -EACCES;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * This will cause a "finit" to be triggered by the next</div><div class='ctx'> 	 * attempted FPU operation by the 'current' process.</div><div class='hunk'>@@ -451,13 +518,17 @@ int save_i387_ia32(struct _fpstate_ia32 __user *buf)</div><div class='ctx'> 	if (!HAVE_HWFP) {</div><div class='ctx'> 		return fpregs_soft_get(current, NULL,</div><div class='ctx'> 				       0, sizeof(struct user_i387_ia32_struct),</div><div class='del'>-				       NULL, buf) ? -1 : 1;</div><div class='add'>+				       NULL, fp) ? -1 : 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	unlazy_fpu(tsk);</div><div class='add'>+</div><div class='add'>+	if (cpu_has_xsave)</div><div class='add'>+		return save_i387_xsave(fp);</div><div class='ctx'> 	if (cpu_has_fxsr)</div><div class='del'>-		return save_i387_fxsave(buf);</div><div class='add'>+		return save_i387_fxsave(fp);</div><div class='ctx'> 	else</div><div class='del'>-		return save_i387_fsave(buf);</div><div class='add'>+		return save_i387_fsave(fp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int restore_i387_fsave(struct _fpstate_ia32 __user *buf)</div><div class='hunk'>@@ -468,14 +539,15 @@ static inline int restore_i387_fsave(struct _fpstate_ia32 __user *buf)</div><div class='ctx'> 				sizeof(struct i387_fsave_struct));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int restore_i387_fxsave(struct _fpstate_ia32 __user *buf)</div><div class='add'>+static int restore_i387_fxsave(struct _fpstate_ia32 __user *buf,</div><div class='add'>+			       unsigned int size)</div><div class='ctx'> {</div><div class='ctx'> 	struct task_struct *tsk = current;</div><div class='ctx'> 	struct user_i387_ia32_struct env;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	err = __copy_from_user(&amp;tsk-&gt;thread.xstate-&gt;fxsave, &amp;buf-&gt;_fxsr_env[0],</div><div class='del'>-			       sizeof(struct i387_fxsave_struct));</div><div class='add'>+			       size);</div><div class='ctx'> 	/* mxcsr reserved bits must be masked to zero for security reasons */</div><div class='ctx'> 	tsk-&gt;thread.xstate-&gt;fxsave.mxcsr &amp;= mxcsr_feature_mask;</div><div class='ctx'> 	if (err || __copy_from_user(&amp;env, buf, sizeof(env)))</div><div class='hunk'>@@ -485,14 +557,69 @@ static int restore_i387_fxsave(struct _fpstate_ia32 __user *buf)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int restore_i387_ia32(struct _fpstate_ia32 __user *buf)</div><div class='add'>+static int restore_i387_xsave(void __user *buf)</div><div class='add'>+{</div><div class='add'>+	struct _fpx_sw_bytes fx_sw_user;</div><div class='add'>+	struct _fpstate_ia32 __user *fx_user =</div><div class='add'>+			((struct _fpstate_ia32 __user *) buf);</div><div class='add'>+	struct i387_fxsave_struct __user *fx =</div><div class='add'>+		(struct i387_fxsave_struct __user *) &amp;fx_user-&gt;_fxsr_env[0];</div><div class='add'>+	struct xsave_hdr_struct *xsave_hdr =</div><div class='add'>+				&amp;current-&gt;thread.xstate-&gt;xsave.xsave_hdr;</div><div class='add'>+	u64 mask;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (check_for_xstate(fx, buf, &amp;fx_sw_user))</div><div class='add'>+		goto fx_only;</div><div class='add'>+</div><div class='add'>+	mask = fx_sw_user.xstate_bv;</div><div class='add'>+</div><div class='add'>+	err = restore_i387_fxsave(buf, fx_sw_user.xstate_size);</div><div class='add'>+</div><div class='add'>+	xsave_hdr-&gt;xstate_bv &amp;= pcntxt_mask;</div><div class='add'>+	/*</div><div class='add'>+	 * These bits must be zero.</div><div class='add'>+	 */</div><div class='add'>+	xsave_hdr-&gt;reserved1[0] = xsave_hdr-&gt;reserved1[1] = 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Init the state that is not present in the memory layout</div><div class='add'>+	 * and enabled by the OS.</div><div class='add'>+	 */</div><div class='add'>+	mask = ~(pcntxt_mask &amp; ~mask);</div><div class='add'>+	xsave_hdr-&gt;xstate_bv &amp;= mask;</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+fx_only:</div><div class='add'>+	/*</div><div class='add'>+	 * Couldn't find the extended state information in the memory</div><div class='add'>+	 * layout. Restore the FP/SSE and init the other extended state</div><div class='add'>+	 * enabled by the OS.</div><div class='add'>+	 */</div><div class='add'>+	xsave_hdr-&gt;xstate_bv = XSTATE_FPSSE;</div><div class='add'>+	return restore_i387_fxsave(buf, sizeof(struct i387_fxsave_struct));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int restore_i387_xstate_ia32(void __user *buf)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct task_struct *tsk = current;</div><div class='add'>+	struct _fpstate_ia32 __user *fp = (struct _fpstate_ia32 __user *) buf;</div><div class='ctx'> </div><div class='ctx'> 	if (HAVE_HWFP)</div><div class='ctx'> 		clear_fpu(tsk);</div><div class='ctx'> </div><div class='add'>+	if (!buf) {</div><div class='add'>+		if (used_math()) {</div><div class='add'>+			clear_fpu(tsk);</div><div class='add'>+			clear_used_math();</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	} else</div><div class='add'>+		if (!access_ok(VERIFY_READ, buf, sig_xstate_ia32_size))</div><div class='add'>+			return -EACCES;</div><div class='add'>+</div><div class='ctx'> 	if (!used_math()) {</div><div class='ctx'> 		err = init_fpu(tsk);</div><div class='ctx'> 		if (err)</div><div class='hunk'>@@ -500,14 +627,17 @@ int restore_i387_ia32(struct _fpstate_ia32 __user *buf)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (HAVE_HWFP) {</div><div class='del'>-		if (cpu_has_fxsr)</div><div class='del'>-			err = restore_i387_fxsave(buf);</div><div class='add'>+		if (cpu_has_xsave)</div><div class='add'>+			err = restore_i387_xsave(buf);</div><div class='add'>+		else if (cpu_has_fxsr)</div><div class='add'>+			err = restore_i387_fxsave(fp, sizeof(struct</div><div class='add'>+							   i387_fxsave_struct));</div><div class='ctx'> 		else</div><div class='del'>-			err = restore_i387_fsave(buf);</div><div class='add'>+			err = restore_i387_fsave(fp);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		err = fpregs_soft_set(current, NULL,</div><div class='ctx'> 				      0, sizeof(struct user_i387_ia32_struct),</div><div class='del'>-				      NULL, buf) != 0;</div><div class='add'>+				      NULL, fp) != 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	set_used_math();</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kernel/i8259.c b/arch/x86/kernel/i8259.c<br/>index dc92b49d9204..4b8a53d841f7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/i8259.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/i8259.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/i8259.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/i8259.c</a></div><div class='hunk'>@@ -282,6 +282,30 @@ static int __init i8259A_init_sysfs(void)</div><div class='ctx'> </div><div class='ctx'> device_initcall(i8259A_init_sysfs);</div><div class='ctx'> </div><div class='add'>+void mask_8259A(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;i8259A_lock, flags);</div><div class='add'>+</div><div class='add'>+	outb(0xff, PIC_MASTER_IMR);	/* mask all of 8259A-1 */</div><div class='add'>+	outb(0xff, PIC_SLAVE_IMR);	/* mask all of 8259A-2 */</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;i8259A_lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void unmask_8259A(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;i8259A_lock, flags);</div><div class='add'>+</div><div class='add'>+	outb(cached_master_mask, PIC_MASTER_IMR); /* restore master IRQ mask */</div><div class='add'>+	outb(cached_slave_mask, PIC_SLAVE_IMR);	  /* restore slave IRQ mask */</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;i8259A_lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void init_8259A(int auto_eoi)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='head'>diff --git a/arch/x86/kernel/io_apic_32.c b/arch/x86/kernel/io_apic_32.c<br/>index 09cddb57bec4..e710289f673e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/io_apic_32.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/io_apic_32.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/io_apic_32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/io_apic_32.c</a></div><div class='hunk'>@@ -46,10 +46,13 @@</div><div class='ctx'> #include &lt;asm/nmi.h&gt;</div><div class='ctx'> #include &lt;asm/msidef.h&gt;</div><div class='ctx'> #include &lt;asm/hypertransport.h&gt;</div><div class='add'>+#include &lt;asm/setup.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach_apic.h&gt;</div><div class='ctx'> #include &lt;mach_apicdef.h&gt;</div><div class='ctx'> </div><div class='add'>+#define __apicdebuginit(type) static type __init</div><div class='add'>+</div><div class='ctx'> int (*ioapic_renumber_irq)(int ioapic, int irq);</div><div class='ctx'> atomic_t irq_mis_count;</div><div class='ctx'> </div><div class='hunk'>@@ -1341,7 +1344,8 @@ static void __init setup_timer_IRQ0_pin(unsigned int apic, unsigned int pin,</div><div class='ctx'> 	ioapic_write_entry(apic, pin, entry);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init print_IO_APIC(void)</div><div class='add'>+</div><div class='add'>+__apicdebuginit(void) print_IO_APIC(void)</div><div class='ctx'> {</div><div class='ctx'> 	int apic, i;</div><div class='ctx'> 	union IO_APIC_reg_00 reg_00;</div><div class='hunk'>@@ -1456,9 +1460,7 @@ void __init print_IO_APIC(void)</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#if 0</div><div class='del'>-</div><div class='del'>-static void print_APIC_bitfield(int base)</div><div class='add'>+__apicdebuginit(void) print_APIC_bitfield(int base)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int v;</div><div class='ctx'> 	int i, j;</div><div class='hunk'>@@ -1479,9 +1481,10 @@ static void print_APIC_bitfield(int base)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void /*__init*/ print_local_APIC(void *dummy)</div><div class='add'>+__apicdebuginit(void) print_local_APIC(void *dummy)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int v, ver, maxlvt;</div><div class='add'>+	u64 icr;</div><div class='ctx'> </div><div class='ctx'> 	if (apic_verbosity == APIC_QUIET)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -1490,7 +1493,7 @@ void /*__init*/ print_local_APIC(void *dummy)</div><div class='ctx'> 		smp_processor_id(), hard_smp_processor_id());</div><div class='ctx'> 	v = apic_read(APIC_ID);</div><div class='ctx'> 	printk(KERN_INFO "... APIC ID:      %08x (%01x)\n", v,</div><div class='del'>-			GET_APIC_ID(read_apic_id()));</div><div class='add'>+			GET_APIC_ID(v));</div><div class='ctx'> 	v = apic_read(APIC_LVR);</div><div class='ctx'> 	printk(KERN_INFO "... APIC VERSION: %08x\n", v);</div><div class='ctx'> 	ver = GET_APIC_VERSION(v);</div><div class='hunk'>@@ -1532,10 +1535,9 @@ void /*__init*/ print_local_APIC(void *dummy)</div><div class='ctx'> 		printk(KERN_DEBUG "... APIC ESR: %08x\n", v);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	v = apic_read(APIC_ICR);</div><div class='del'>-	printk(KERN_DEBUG "... APIC ICR: %08x\n", v);</div><div class='del'>-	v = apic_read(APIC_ICR2);</div><div class='del'>-	printk(KERN_DEBUG "... APIC ICR2: %08x\n", v);</div><div class='add'>+	icr = apic_icr_read();</div><div class='add'>+	printk(KERN_DEBUG "... APIC ICR: %08x\n", icr);</div><div class='add'>+	printk(KERN_DEBUG "... APIC ICR2: %08x\n", icr &gt;&gt; 32);</div><div class='ctx'> </div><div class='ctx'> 	v = apic_read(APIC_LVTT);</div><div class='ctx'> 	printk(KERN_DEBUG "... APIC LVTT: %08x\n", v);</div><div class='hunk'>@@ -1563,12 +1565,12 @@ void /*__init*/ print_local_APIC(void *dummy)</div><div class='ctx'> 	printk("\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void print_all_local_APICs(void)</div><div class='add'>+__apicdebuginit(void) print_all_local_APICs(void)</div><div class='ctx'> {</div><div class='ctx'> 	on_each_cpu(print_local_APIC, NULL, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void /*__init*/ print_PIC(void)</div><div class='add'>+__apicdebuginit(void) print_PIC(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int v;</div><div class='ctx'> 	unsigned long flags;</div><div class='hunk'>@@ -1600,7 +1602,17 @@ void /*__init*/ print_PIC(void)</div><div class='ctx'> 	printk(KERN_DEBUG "... PIC ELCR: %04x\n", v);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#endif  /*  0  */</div><div class='add'>+__apicdebuginit(int) print_all_ICs(void)</div><div class='add'>+{</div><div class='add'>+	print_PIC();</div><div class='add'>+	print_all_local_APICs();</div><div class='add'>+	print_IO_APIC();</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+fs_initcall(print_all_ICs);</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> static void __init enable_IO_APIC(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -1698,8 +1710,7 @@ void disable_IO_APIC(void)</div><div class='ctx'> 		entry.dest_mode       = 0; /* Physical */</div><div class='ctx'> 		entry.delivery_mode   = dest_ExtINT; /* ExtInt */</div><div class='ctx'> 		entry.vector          = 0;</div><div class='del'>-		entry.dest.physical.physical_dest =</div><div class='del'>-					GET_APIC_ID(read_apic_id());</div><div class='add'>+		entry.dest.physical.physical_dest = read_apic_id();</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Add it to the IO-APIC irq-routing table:</div><div class='hunk'>@@ -1725,10 +1736,8 @@ static void __init setup_ioapic_ids_from_mpc(void)</div><div class='ctx'> 	unsigned char old_id;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_X86_NUMAQ</div><div class='del'>-	if (found_numaq)</div><div class='add'>+	if (x86_quirks-&gt;setup_ioapic_ids &amp;&amp; x86_quirks-&gt;setup_ioapic_ids())</div><div class='ctx'> 		return;</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Don't check I/O APIC IDs for xAPIC systems.  They have</div><div class='hunk'>@@ -2329,8 +2338,6 @@ void __init setup_IO_APIC(void)</div><div class='ctx'> 	setup_IO_APIC_irqs();</div><div class='ctx'> 	init_IO_APIC_traps();</div><div class='ctx'> 	check_timer();</div><div class='del'>-	if (!acpi_ioapic)</div><div class='del'>-		print_IO_APIC();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/x86/kernel/io_apic_64.c b/arch/x86/kernel/io_apic_64.c<br/>index 61a83b70c18f..02063ae042f7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/io_apic_64.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/io_apic_64.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/io_apic_64.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/io_apic_64.c</a></div><div class='hunk'>@@ -37,6 +37,7 @@</div><div class='ctx'> #include &lt;acpi/acpi_bus.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='add'>+#include &lt;linux/dmar.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/idle.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='hunk'>@@ -49,10 +50,13 @@</div><div class='ctx'> #include &lt;asm/nmi.h&gt;</div><div class='ctx'> #include &lt;asm/msidef.h&gt;</div><div class='ctx'> #include &lt;asm/hypertransport.h&gt;</div><div class='add'>+#include &lt;asm/irq_remapping.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach_ipi.h&gt;</div><div class='ctx'> #include &lt;mach_apic.h&gt;</div><div class='ctx'> </div><div class='add'>+#define __apicdebuginit(type) static type __init</div><div class='add'>+</div><div class='ctx'> struct irq_cfg {</div><div class='ctx'> 	cpumask_t domain;</div><div class='ctx'> 	cpumask_t old_domain;</div><div class='hunk'>@@ -87,8 +91,6 @@ int first_system_vector = 0xfe;</div><div class='ctx'> </div><div class='ctx'> char system_vectors[NR_VECTORS] = { [0 ... NR_VECTORS-1] = SYS_VECTOR_FREE};</div><div class='ctx'> </div><div class='del'>-#define __apicdebuginit  __init</div><div class='del'>-</div><div class='ctx'> int sis_apic_bug; /* not actually supported, dummy for compile */</div><div class='ctx'> </div><div class='ctx'> static int no_timer_check;</div><div class='hunk'>@@ -108,6 +110,9 @@ static DEFINE_SPINLOCK(vector_lock);</div><div class='ctx'>  */</div><div class='ctx'> int nr_ioapic_registers[MAX_IO_APICS];</div><div class='ctx'> </div><div class='add'>+/* I/O APIC RTE contents at the OS boot up */</div><div class='add'>+struct IO_APIC_route_entry *early_ioapic_entries[MAX_IO_APICS];</div><div class='add'>+</div><div class='ctx'> /* I/O APIC entries */</div><div class='ctx'> struct mp_config_ioapic mp_ioapics[MAX_IO_APICS];</div><div class='ctx'> int nr_ioapics;</div><div class='hunk'>@@ -303,7 +308,12 @@ static void __target_IO_APIC_irq(unsigned int irq, unsigned int dest, u8 vector)</div><div class='ctx'> 		pin = entry-&gt;pin;</div><div class='ctx'> 		if (pin == -1)</div><div class='ctx'> 			break;</div><div class='del'>-		io_apic_write(apic, 0x11 + pin*2, dest);</div><div class='add'>+		/*</div><div class='add'>+		 * With interrupt-remapping, destination information comes</div><div class='add'>+		 * from interrupt-remapping table entry.</div><div class='add'>+		 */</div><div class='add'>+		if (!irq_remapped(irq))</div><div class='add'>+			io_apic_write(apic, 0x11 + pin*2, dest);</div><div class='ctx'> 		reg = io_apic_read(apic, 0x10 + pin*2);</div><div class='ctx'> 		reg &amp;= ~IO_APIC_REDIR_VECTOR_MASK;</div><div class='ctx'> 		reg |= vector;</div><div class='hunk'>@@ -440,6 +450,69 @@ static void clear_IO_APIC (void)</div><div class='ctx'> 			clear_IO_APIC_pin(apic, pin);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Saves and masks all the unmasked IO-APIC RTE's</div><div class='add'>+ */</div><div class='add'>+int save_mask_IO_APIC_setup(void)</div><div class='add'>+{</div><div class='add'>+	union IO_APIC_reg_01 reg_01;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int apic, pin;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The number of IO-APIC IRQ registers (== #pins):</div><div class='add'>+	 */</div><div class='add'>+	for (apic = 0; apic &lt; nr_ioapics; apic++) {</div><div class='add'>+		spin_lock_irqsave(&amp;ioapic_lock, flags);</div><div class='add'>+		reg_01.raw = io_apic_read(apic, 1);</div><div class='add'>+		spin_unlock_irqrestore(&amp;ioapic_lock, flags);</div><div class='add'>+		nr_ioapic_registers[apic] = reg_01.bits.entries+1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (apic = 0; apic &lt; nr_ioapics; apic++) {</div><div class='add'>+		early_ioapic_entries[apic] =</div><div class='add'>+			kzalloc(sizeof(struct IO_APIC_route_entry) *</div><div class='add'>+				nr_ioapic_registers[apic], GFP_KERNEL);</div><div class='add'>+		if (!early_ioapic_entries[apic])</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (apic = 0; apic &lt; nr_ioapics; apic++)</div><div class='add'>+		for (pin = 0; pin &lt; nr_ioapic_registers[apic]; pin++) {</div><div class='add'>+			struct IO_APIC_route_entry entry;</div><div class='add'>+</div><div class='add'>+			entry = early_ioapic_entries[apic][pin] =</div><div class='add'>+				ioapic_read_entry(apic, pin);</div><div class='add'>+			if (!entry.mask) {</div><div class='add'>+				entry.mask = 1;</div><div class='add'>+				ioapic_write_entry(apic, pin, entry);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void restore_IO_APIC_setup(void)</div><div class='add'>+{</div><div class='add'>+	int apic, pin;</div><div class='add'>+</div><div class='add'>+	for (apic = 0; apic &lt; nr_ioapics; apic++)</div><div class='add'>+		for (pin = 0; pin &lt; nr_ioapic_registers[apic]; pin++)</div><div class='add'>+			ioapic_write_entry(apic, pin,</div><div class='add'>+					   early_ioapic_entries[apic][pin]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void reinit_intr_remapped_IO_APIC(int intr_remapping)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * for now plain restore of previous settings.</div><div class='add'>+	 * TBD: In the case of OS enabling interrupt-remapping,</div><div class='add'>+	 * IO-APIC RTE's need to be setup to point to interrupt-remapping</div><div class='add'>+	 * table entries. for now, do a plain restore, and wait for</div><div class='add'>+	 * the setup_IO_APIC_irqs() to do proper initialization.</div><div class='add'>+	 */</div><div class='add'>+	restore_IO_APIC_setup();</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int skip_ioapic_setup;</div><div class='ctx'> int ioapic_force;</div><div class='ctx'> </div><div class='hunk'>@@ -839,18 +912,98 @@ void __setup_vector_irq(int cpu)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct irq_chip ioapic_chip;</div><div class='add'>+#ifdef CONFIG_INTR_REMAP</div><div class='add'>+static struct irq_chip ir_ioapic_chip;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> static void ioapic_register_intr(int irq, unsigned long trigger)</div><div class='ctx'> {</div><div class='del'>-	if (trigger) {</div><div class='add'>+	if (trigger)</div><div class='ctx'> 		irq_desc[irq].status |= IRQ_LEVEL;</div><div class='del'>-		set_irq_chip_and_handler_name(irq, &amp;ioapic_chip,</div><div class='del'>-					      handle_fasteoi_irq, "fasteoi");</div><div class='del'>-	} else {</div><div class='add'>+	else</div><div class='ctx'> 		irq_desc[irq].status &amp;= ~IRQ_LEVEL;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_INTR_REMAP</div><div class='add'>+	if (irq_remapped(irq)) {</div><div class='add'>+		irq_desc[irq].status |= IRQ_MOVE_PCNTXT;</div><div class='add'>+		if (trigger)</div><div class='add'>+			set_irq_chip_and_handler_name(irq, &amp;ir_ioapic_chip,</div><div class='add'>+						      handle_fasteoi_irq,</div><div class='add'>+						     "fasteoi");</div><div class='add'>+		else</div><div class='add'>+			set_irq_chip_and_handler_name(irq, &amp;ir_ioapic_chip,</div><div class='add'>+						      handle_edge_irq, "edge");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	if (trigger)</div><div class='add'>+		set_irq_chip_and_handler_name(irq, &amp;ioapic_chip,</div><div class='add'>+					      handle_fasteoi_irq,</div><div class='add'>+					      "fasteoi");</div><div class='add'>+	else</div><div class='ctx'> 		set_irq_chip_and_handler_name(irq, &amp;ioapic_chip,</div><div class='ctx'> 					      handle_edge_irq, "edge");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int setup_ioapic_entry(int apic, int irq,</div><div class='add'>+			      struct IO_APIC_route_entry *entry,</div><div class='add'>+			      unsigned int destination, int trigger,</div><div class='add'>+			      int polarity, int vector)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * add it to the IO-APIC irq-routing table:</div><div class='add'>+	 */</div><div class='add'>+	memset(entry,0,sizeof(*entry));</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_INTR_REMAP</div><div class='add'>+	if (intr_remapping_enabled) {</div><div class='add'>+		struct intel_iommu *iommu = map_ioapic_to_ir(apic);</div><div class='add'>+		struct irte irte;</div><div class='add'>+		struct IR_IO_APIC_route_entry *ir_entry =</div><div class='add'>+			(struct IR_IO_APIC_route_entry *) entry;</div><div class='add'>+		int index;</div><div class='add'>+</div><div class='add'>+		if (!iommu)</div><div class='add'>+			panic("No mapping iommu for ioapic %d\n", apic);</div><div class='add'>+</div><div class='add'>+		index = alloc_irte(iommu, irq, 1);</div><div class='add'>+		if (index &lt; 0)</div><div class='add'>+			panic("Failed to allocate IRTE for ioapic %d\n", apic);</div><div class='add'>+</div><div class='add'>+		memset(&amp;irte, 0, sizeof(irte));</div><div class='add'>+</div><div class='add'>+		irte.present = 1;</div><div class='add'>+		irte.dst_mode = INT_DEST_MODE;</div><div class='add'>+		irte.trigger_mode = trigger;</div><div class='add'>+		irte.dlvry_mode = INT_DELIVERY_MODE;</div><div class='add'>+		irte.vector = vector;</div><div class='add'>+		irte.dest_id = IRTE_DEST(destination);</div><div class='add'>+</div><div class='add'>+		modify_irte(irq, &amp;irte);</div><div class='add'>+</div><div class='add'>+		ir_entry-&gt;index2 = (index &gt;&gt; 15) &amp; 0x1;</div><div class='add'>+		ir_entry-&gt;zero = 0;</div><div class='add'>+		ir_entry-&gt;format = 1;</div><div class='add'>+		ir_entry-&gt;index = (index &amp; 0x7fff);</div><div class='add'>+	} else</div><div class='add'>+#endif</div><div class='add'>+	{</div><div class='add'>+		entry-&gt;delivery_mode = INT_DELIVERY_MODE;</div><div class='add'>+		entry-&gt;dest_mode = INT_DEST_MODE;</div><div class='add'>+		entry-&gt;dest = destination;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	entry-&gt;mask = 0;				/* enable IRQ */</div><div class='add'>+	entry-&gt;trigger = trigger;</div><div class='add'>+	entry-&gt;polarity = polarity;</div><div class='add'>+	entry-&gt;vector = vector;</div><div class='add'>+</div><div class='add'>+	/* Mask level triggered irqs.</div><div class='add'>+	 * Use IRQ_DELAYED_DISABLE for edge triggered irqs.</div><div class='add'>+	 */</div><div class='add'>+	if (trigger)</div><div class='add'>+		entry-&gt;mask = 1;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void setup_IO_APIC_irq(int apic, int pin, unsigned int irq,</div><div class='hunk'>@@ -875,24 +1028,15 @@ static void setup_IO_APIC_irq(int apic, int pin, unsigned int irq,</div><div class='ctx'> 		    apic, mp_ioapics[apic].mp_apicid, pin, cfg-&gt;vector,</div><div class='ctx'> 		    irq, trigger, polarity);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * add it to the IO-APIC irq-routing table:</div><div class='del'>-	 */</div><div class='del'>-	memset(&amp;entry,0,sizeof(entry));</div><div class='del'>-</div><div class='del'>-	entry.delivery_mode = INT_DELIVERY_MODE;</div><div class='del'>-	entry.dest_mode = INT_DEST_MODE;</div><div class='del'>-	entry.dest = cpu_mask_to_apicid(mask);</div><div class='del'>-	entry.mask = 0;				/* enable IRQ */</div><div class='del'>-	entry.trigger = trigger;</div><div class='del'>-	entry.polarity = polarity;</div><div class='del'>-	entry.vector = cfg-&gt;vector;</div><div class='ctx'> </div><div class='del'>-	/* Mask level triggered irqs.</div><div class='del'>-	 * Use IRQ_DELAYED_DISABLE for edge triggered irqs.</div><div class='del'>-	 */</div><div class='del'>-	if (trigger)</div><div class='del'>-		entry.mask = 1;</div><div class='add'>+	if (setup_ioapic_entry(mp_ioapics[apic].mp_apicid, irq, &amp;entry,</div><div class='add'>+			       cpu_mask_to_apicid(mask), trigger, polarity,</div><div class='add'>+			       cfg-&gt;vector)) {</div><div class='add'>+		printk("Failed to setup ioapic entry for ioapic  %d, pin %d\n",</div><div class='add'>+		       mp_ioapics[apic].mp_apicid, pin);</div><div class='add'>+		__clear_irq_vector(irq);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ioapic_register_intr(irq, trigger);</div><div class='ctx'> 	if (irq &lt; 16)</div><div class='hunk'>@@ -944,6 +1088,9 @@ static void __init setup_timer_IRQ0_pin(unsigned int apic, unsigned int pin,</div><div class='ctx'> {</div><div class='ctx'> 	struct IO_APIC_route_entry entry;</div><div class='ctx'> </div><div class='add'>+	if (intr_remapping_enabled)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	memset(&amp;entry, 0, sizeof(entry));</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -970,7 +1117,8 @@ static void __init setup_timer_IRQ0_pin(unsigned int apic, unsigned int pin,</div><div class='ctx'> 	ioapic_write_entry(apic, pin, entry);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __apicdebuginit print_IO_APIC(void)</div><div class='add'>+</div><div class='add'>+__apicdebuginit(void) print_IO_APIC(void)</div><div class='ctx'> {</div><div class='ctx'> 	int apic, i;</div><div class='ctx'> 	union IO_APIC_reg_00 reg_00;</div><div class='hunk'>@@ -1064,9 +1212,7 @@ void __apicdebuginit print_IO_APIC(void)</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#if 0</div><div class='del'>-</div><div class='del'>-static __apicdebuginit void print_APIC_bitfield (int base)</div><div class='add'>+__apicdebuginit(void) print_APIC_bitfield(int base)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int v;</div><div class='ctx'> 	int i, j;</div><div class='hunk'>@@ -1087,9 +1233,10 @@ static __apicdebuginit void print_APIC_bitfield (int base)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __apicdebuginit print_local_APIC(void * dummy)</div><div class='add'>+__apicdebuginit(void) print_local_APIC(void *dummy)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int v, ver, maxlvt;</div><div class='add'>+	unsigned long icr;</div><div class='ctx'> </div><div class='ctx'> 	if (apic_verbosity == APIC_QUIET)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -1097,7 +1244,7 @@ void __apicdebuginit print_local_APIC(void * dummy)</div><div class='ctx'> 	printk("\n" KERN_DEBUG "printing local APIC contents on CPU#%d/%d:\n",</div><div class='ctx'> 		smp_processor_id(), hard_smp_processor_id());</div><div class='ctx'> 	v = apic_read(APIC_ID);</div><div class='del'>-	printk(KERN_INFO "... APIC ID:      %08x (%01x)\n", v, GET_APIC_ID(read_apic_id()));</div><div class='add'>+	printk(KERN_INFO "... APIC ID:      %08x (%01x)\n", v, read_apic_id());</div><div class='ctx'> 	v = apic_read(APIC_LVR);</div><div class='ctx'> 	printk(KERN_INFO "... APIC VERSION: %08x\n", v);</div><div class='ctx'> 	ver = GET_APIC_VERSION(v);</div><div class='hunk'>@@ -1133,10 +1280,9 @@ void __apicdebuginit print_local_APIC(void * dummy)</div><div class='ctx'> 	v = apic_read(APIC_ESR);</div><div class='ctx'> 	printk(KERN_DEBUG "... APIC ESR: %08x\n", v);</div><div class='ctx'> </div><div class='del'>-	v = apic_read(APIC_ICR);</div><div class='del'>-	printk(KERN_DEBUG "... APIC ICR: %08x\n", v);</div><div class='del'>-	v = apic_read(APIC_ICR2);</div><div class='del'>-	printk(KERN_DEBUG "... APIC ICR2: %08x\n", v);</div><div class='add'>+	icr = apic_icr_read();</div><div class='add'>+	printk(KERN_DEBUG "... APIC ICR: %08x\n", (u32)icr);</div><div class='add'>+	printk(KERN_DEBUG "... APIC ICR2: %08x\n", (u32)(icr &gt;&gt; 32));</div><div class='ctx'> </div><div class='ctx'> 	v = apic_read(APIC_LVTT);</div><div class='ctx'> 	printk(KERN_DEBUG "... APIC LVTT: %08x\n", v);</div><div class='hunk'>@@ -1164,12 +1310,12 @@ void __apicdebuginit print_local_APIC(void * dummy)</div><div class='ctx'> 	printk("\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void print_all_local_APICs (void)</div><div class='add'>+__apicdebuginit(void) print_all_local_APICs(void)</div><div class='ctx'> {</div><div class='ctx'> 	on_each_cpu(print_local_APIC, NULL, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __apicdebuginit print_PIC(void)</div><div class='add'>+__apicdebuginit(void) print_PIC(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int v;</div><div class='ctx'> 	unsigned long flags;</div><div class='hunk'>@@ -1201,7 +1347,17 @@ void __apicdebuginit print_PIC(void)</div><div class='ctx'> 	printk(KERN_DEBUG "... PIC ELCR: %04x\n", v);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#endif  /*  0  */</div><div class='add'>+__apicdebuginit(int) print_all_ICs(void)</div><div class='add'>+{</div><div class='add'>+	print_PIC();</div><div class='add'>+	print_all_local_APICs();</div><div class='add'>+	print_IO_APIC();</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+fs_initcall(print_all_ICs);</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void __init enable_IO_APIC(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -1291,7 +1447,7 @@ void disable_IO_APIC(void)</div><div class='ctx'> 		entry.dest_mode       = 0; /* Physical */</div><div class='ctx'> 		entry.delivery_mode   = dest_ExtINT; /* ExtInt */</div><div class='ctx'> 		entry.vector          = 0;</div><div class='del'>-		entry.dest          = GET_APIC_ID(read_apic_id());</div><div class='add'>+		entry.dest            = read_apic_id();</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Add it to the IO-APIC irq-routing table:</div><div class='hunk'>@@ -1397,6 +1553,147 @@ static int ioapic_retrigger_irq(unsigned int irq)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_INTR_REMAP</div><div class='add'>+static void ir_irq_migration(struct work_struct *work);</div><div class='add'>+</div><div class='add'>+static DECLARE_DELAYED_WORK(ir_migration_work, ir_irq_migration);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Migrate the IO-APIC irq in the presence of intr-remapping.</div><div class='add'>+ *</div><div class='add'>+ * For edge triggered, irq migration is a simple atomic update(of vector</div><div class='add'>+ * and cpu destination) of IRTE and flush the hardware cache.</div><div class='add'>+ *</div><div class='add'>+ * For level triggered, we need to modify the io-apic RTE aswell with the update</div><div class='add'>+ * vector information, along with modifying IRTE with vector and destination.</div><div class='add'>+ * So irq migration for level triggered is little  bit more complex compared to</div><div class='add'>+ * edge triggered migration. But the good news is, we use the same algorithm</div><div class='add'>+ * for level triggered migration as we have today, only difference being,</div><div class='add'>+ * we now initiate the irq migration from process context instead of the</div><div class='add'>+ * interrupt context.</div><div class='add'>+ *</div><div class='add'>+ * In future, when we do a directed EOI (combined with cpu EOI broadcast</div><div class='add'>+ * suppression) to the IO-APIC, level triggered irq migration will also be</div><div class='add'>+ * as simple as edge triggered migration and we can do the irq migration</div><div class='add'>+ * with a simple atomic update to IO-APIC RTE.</div><div class='add'>+ */</div><div class='add'>+static void migrate_ioapic_irq(int irq, cpumask_t mask)</div><div class='add'>+{</div><div class='add'>+	struct irq_cfg *cfg = irq_cfg + irq;</div><div class='add'>+	struct irq_desc *desc = irq_desc + irq;</div><div class='add'>+	cpumask_t tmp, cleanup_mask;</div><div class='add'>+	struct irte irte;</div><div class='add'>+	int modify_ioapic_rte = desc-&gt;status &amp; IRQ_LEVEL;</div><div class='add'>+	unsigned int dest;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	cpus_and(tmp, mask, cpu_online_map);</div><div class='add'>+	if (cpus_empty(tmp))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (get_irte(irq, &amp;irte))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (assign_irq_vector(irq, mask))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	cpus_and(tmp, cfg-&gt;domain, mask);</div><div class='add'>+	dest = cpu_mask_to_apicid(tmp);</div><div class='add'>+</div><div class='add'>+	if (modify_ioapic_rte) {</div><div class='add'>+		spin_lock_irqsave(&amp;ioapic_lock, flags);</div><div class='add'>+		__target_IO_APIC_irq(irq, dest, cfg-&gt;vector);</div><div class='add'>+		spin_unlock_irqrestore(&amp;ioapic_lock, flags);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	irte.vector = cfg-&gt;vector;</div><div class='add'>+	irte.dest_id = IRTE_DEST(dest);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Modified the IRTE and flushes the Interrupt entry cache.</div><div class='add'>+	 */</div><div class='add'>+	modify_irte(irq, &amp;irte);</div><div class='add'>+</div><div class='add'>+	if (cfg-&gt;move_in_progress) {</div><div class='add'>+		cpus_and(cleanup_mask, cfg-&gt;old_domain, cpu_online_map);</div><div class='add'>+		cfg-&gt;move_cleanup_count = cpus_weight(cleanup_mask);</div><div class='add'>+		send_IPI_mask(cleanup_mask, IRQ_MOVE_CLEANUP_VECTOR);</div><div class='add'>+		cfg-&gt;move_in_progress = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	irq_desc[irq].affinity = mask;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int migrate_irq_remapped_level(int irq)</div><div class='add'>+{</div><div class='add'>+	int ret = -1;</div><div class='add'>+</div><div class='add'>+	mask_IO_APIC_irq(irq);</div><div class='add'>+</div><div class='add'>+	if (io_apic_level_ack_pending(irq)) {</div><div class='add'>+		/*</div><div class='add'>+	 	 * Interrupt in progress. Migrating irq now will change the</div><div class='add'>+		 * vector information in the IO-APIC RTE and that will confuse</div><div class='add'>+		 * the EOI broadcast performed by cpu.</div><div class='add'>+		 * So, delay the irq migration to the next instance.</div><div class='add'>+		 */</div><div class='add'>+		schedule_delayed_work(&amp;ir_migration_work, 1);</div><div class='add'>+		goto unmask;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* everthing is clear. we have right of way */</div><div class='add'>+	migrate_ioapic_irq(irq, irq_desc[irq].pending_mask);</div><div class='add'>+</div><div class='add'>+	ret = 0;</div><div class='add'>+	irq_desc[irq].status &amp;= ~IRQ_MOVE_PENDING;</div><div class='add'>+	cpus_clear(irq_desc[irq].pending_mask);</div><div class='add'>+</div><div class='add'>+unmask:</div><div class='add'>+	unmask_IO_APIC_irq(irq);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ir_irq_migration(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	int irq;</div><div class='add'>+</div><div class='add'>+	for (irq = 0; irq &lt; NR_IRQS; irq++) {</div><div class='add'>+		struct irq_desc *desc = irq_desc + irq;</div><div class='add'>+		if (desc-&gt;status &amp; IRQ_MOVE_PENDING) {</div><div class='add'>+			unsigned long flags;</div><div class='add'>+</div><div class='add'>+			spin_lock_irqsave(&amp;desc-&gt;lock, flags);</div><div class='add'>+			if (!desc-&gt;chip-&gt;set_affinity ||</div><div class='add'>+			    !(desc-&gt;status &amp; IRQ_MOVE_PENDING)) {</div><div class='add'>+				desc-&gt;status &amp;= ~IRQ_MOVE_PENDING;</div><div class='add'>+				spin_unlock_irqrestore(&amp;desc-&gt;lock, flags);</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			desc-&gt;chip-&gt;set_affinity(irq,</div><div class='add'>+					         irq_desc[irq].pending_mask);</div><div class='add'>+			spin_unlock_irqrestore(&amp;desc-&gt;lock, flags);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Migrates the IRQ destination in the process context.</div><div class='add'>+ */</div><div class='add'>+static void set_ir_ioapic_affinity_irq(unsigned int irq, cpumask_t mask)</div><div class='add'>+{</div><div class='add'>+	if (irq_desc[irq].status &amp; IRQ_LEVEL) {</div><div class='add'>+		irq_desc[irq].status |= IRQ_MOVE_PENDING;</div><div class='add'>+		irq_desc[irq].pending_mask = mask;</div><div class='add'>+		migrate_irq_remapped_level(irq);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	migrate_ioapic_irq(irq, mask);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> asmlinkage void smp_irq_move_cleanup_interrupt(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned vector, me;</div><div class='hunk'>@@ -1453,6 +1750,17 @@ static void irq_complete_move(unsigned int irq)</div><div class='ctx'> #else</div><div class='ctx'> static inline void irq_complete_move(unsigned int irq) {}</div><div class='ctx'> #endif</div><div class='add'>+#ifdef CONFIG_INTR_REMAP</div><div class='add'>+static void ack_x2apic_level(unsigned int irq)</div><div class='add'>+{</div><div class='add'>+	ack_x2APIC_irq();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ack_x2apic_edge(unsigned int irq)</div><div class='add'>+{</div><div class='add'>+	ack_x2APIC_irq();</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> static void ack_apic_edge(unsigned int irq)</div><div class='ctx'> {</div><div class='hunk'>@@ -1527,6 +1835,21 @@ static struct irq_chip ioapic_chip __read_mostly = {</div><div class='ctx'> 	.retrigger	= ioapic_retrigger_irq,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_INTR_REMAP</div><div class='add'>+static struct irq_chip ir_ioapic_chip __read_mostly = {</div><div class='add'>+	.name 		= "IR-IO-APIC",</div><div class='add'>+	.startup 	= startup_ioapic_irq,</div><div class='add'>+	.mask	 	= mask_IO_APIC_irq,</div><div class='add'>+	.unmask	 	= unmask_IO_APIC_irq,</div><div class='add'>+	.ack 		= ack_x2apic_edge,</div><div class='add'>+	.eoi 		= ack_x2apic_level,</div><div class='add'>+#ifdef CONFIG_SMP</div><div class='add'>+	.set_affinity 	= set_ir_ioapic_affinity_irq,</div><div class='add'>+#endif</div><div class='add'>+	.retrigger	= ioapic_retrigger_irq,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static inline void init_IO_APIC_traps(void)</div><div class='ctx'> {</div><div class='ctx'> 	int irq;</div><div class='hunk'>@@ -1712,6 +2035,8 @@ static inline void __init check_timer(void)</div><div class='ctx'> 	 * 8259A.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (pin1 == -1) {</div><div class='add'>+		if (intr_remapping_enabled)</div><div class='add'>+			panic("BIOS bug: timer not connected to IO-APIC");</div><div class='ctx'> 		pin1 = pin2;</div><div class='ctx'> 		apic1 = apic2;</div><div class='ctx'> 		no_pin1 = 1;</div><div class='hunk'>@@ -1738,6 +2063,8 @@ static inline void __init check_timer(void)</div><div class='ctx'> 				clear_IO_APIC_pin(0, pin1);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='add'>+		if (intr_remapping_enabled)</div><div class='add'>+			panic("timer doesn't work through Interrupt-remapped IO-APIC");</div><div class='ctx'> 		clear_IO_APIC_pin(apic1, pin1);</div><div class='ctx'> 		if (!no_pin1)</div><div class='ctx'> 			apic_printk(APIC_QUIET, KERN_ERR "..MP-BIOS bug: "</div><div class='hunk'>@@ -1854,8 +2181,6 @@ void __init setup_IO_APIC(void)</div><div class='ctx'> 	setup_IO_APIC_irqs();</div><div class='ctx'> 	init_IO_APIC_traps();</div><div class='ctx'> 	check_timer();</div><div class='del'>-	if (!acpi_ioapic)</div><div class='del'>-		print_IO_APIC();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct sysfs_ioapic_data {</div><div class='hunk'>@@ -1977,6 +2302,9 @@ void destroy_irq(unsigned int irq)</div><div class='ctx'> </div><div class='ctx'> 	dynamic_irq_cleanup(irq);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_INTR_REMAP</div><div class='add'>+	free_irte(irq);</div><div class='add'>+#endif</div><div class='ctx'> 	spin_lock_irqsave(&amp;vector_lock, flags);</div><div class='ctx'> 	__clear_irq_vector(irq);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;vector_lock, flags);</div><div class='hunk'>@@ -1995,11 +2323,42 @@ static int msi_compose_msg(struct pci_dev *pdev, unsigned int irq, struct msi_ms</div><div class='ctx'> </div><div class='ctx'> 	tmp = TARGET_CPUS;</div><div class='ctx'> 	err = assign_irq_vector(irq, tmp);</div><div class='del'>-	if (!err) {</div><div class='del'>-		cpus_and(tmp, cfg-&gt;domain, tmp);</div><div class='del'>-		dest = cpu_mask_to_apicid(tmp);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	cpus_and(tmp, cfg-&gt;domain, tmp);</div><div class='add'>+	dest = cpu_mask_to_apicid(tmp);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_INTR_REMAP</div><div class='add'>+	if (irq_remapped(irq)) {</div><div class='add'>+		struct irte irte;</div><div class='add'>+		int ir_index;</div><div class='add'>+		u16 sub_handle;</div><div class='add'>+</div><div class='add'>+		ir_index = map_irq_to_irte_handle(irq, &amp;sub_handle);</div><div class='add'>+		BUG_ON(ir_index == -1);</div><div class='add'>+</div><div class='add'>+		memset (&amp;irte, 0, sizeof(irte));</div><div class='add'>+</div><div class='add'>+		irte.present = 1;</div><div class='add'>+		irte.dst_mode = INT_DEST_MODE;</div><div class='add'>+		irte.trigger_mode = 0; /* edge */</div><div class='add'>+		irte.dlvry_mode = INT_DELIVERY_MODE;</div><div class='add'>+		irte.vector = cfg-&gt;vector;</div><div class='add'>+		irte.dest_id = IRTE_DEST(dest);</div><div class='add'>+</div><div class='add'>+		modify_irte(irq, &amp;irte);</div><div class='ctx'> </div><div class='ctx'> 		msg-&gt;address_hi = MSI_ADDR_BASE_HI;</div><div class='add'>+		msg-&gt;data = sub_handle;</div><div class='add'>+		msg-&gt;address_lo = MSI_ADDR_BASE_LO | MSI_ADDR_IR_EXT_INT |</div><div class='add'>+				  MSI_ADDR_IR_SHV |</div><div class='add'>+				  MSI_ADDR_IR_INDEX1(ir_index) |</div><div class='add'>+				  MSI_ADDR_IR_INDEX2(ir_index);</div><div class='add'>+	} else</div><div class='add'>+#endif</div><div class='add'>+	{</div><div class='add'>+		msg-&gt;address_hi = MSI_ADDR_BASE_HI;</div><div class='ctx'> 		msg-&gt;address_lo =</div><div class='ctx'> 			MSI_ADDR_BASE_LO |</div><div class='ctx'> 			((INT_DEST_MODE == 0) ?</div><div class='hunk'>@@ -2049,6 +2408,55 @@ static void set_msi_irq_affinity(unsigned int irq, cpumask_t mask)</div><div class='ctx'> 	write_msi_msg(irq, &amp;msg);</div><div class='ctx'> 	irq_desc[irq].affinity = mask;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_INTR_REMAP</div><div class='add'>+/*</div><div class='add'>+ * Migrate the MSI irq to another cpumask. This migration is</div><div class='add'>+ * done in the process context using interrupt-remapping hardware.</div><div class='add'>+ */</div><div class='add'>+static void ir_set_msi_irq_affinity(unsigned int irq, cpumask_t mask)</div><div class='add'>+{</div><div class='add'>+	struct irq_cfg *cfg = irq_cfg + irq;</div><div class='add'>+	unsigned int dest;</div><div class='add'>+	cpumask_t tmp, cleanup_mask;</div><div class='add'>+	struct irte irte;</div><div class='add'>+</div><div class='add'>+	cpus_and(tmp, mask, cpu_online_map);</div><div class='add'>+	if (cpus_empty(tmp))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (get_irte(irq, &amp;irte))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (assign_irq_vector(irq, mask))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	cpus_and(tmp, cfg-&gt;domain, mask);</div><div class='add'>+	dest = cpu_mask_to_apicid(tmp);</div><div class='add'>+</div><div class='add'>+	irte.vector = cfg-&gt;vector;</div><div class='add'>+	irte.dest_id = IRTE_DEST(dest);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * atomically update the IRTE with the new destination and vector.</div><div class='add'>+	 */</div><div class='add'>+	modify_irte(irq, &amp;irte);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * After this point, all the interrupts will start arriving</div><div class='add'>+	 * at the new destination. So, time to cleanup the previous</div><div class='add'>+	 * vector allocation.</div><div class='add'>+	 */</div><div class='add'>+	if (cfg-&gt;move_in_progress) {</div><div class='add'>+		cpus_and(cleanup_mask, cfg-&gt;old_domain, cpu_online_map);</div><div class='add'>+		cfg-&gt;move_cleanup_count = cpus_weight(cleanup_mask);</div><div class='add'>+		send_IPI_mask(cleanup_mask, IRQ_MOVE_CLEANUP_VECTOR);</div><div class='add'>+		cfg-&gt;move_in_progress = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	irq_desc[irq].affinity = mask;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='ctx'> #endif /* CONFIG_SMP */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -2066,26 +2474,157 @@ static struct irq_chip msi_chip = {</div><div class='ctx'> 	.retrigger	= ioapic_retrigger_irq,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc)</div><div class='add'>+#ifdef CONFIG_INTR_REMAP</div><div class='add'>+static struct irq_chip msi_ir_chip = {</div><div class='add'>+	.name		= "IR-PCI-MSI",</div><div class='add'>+	.unmask		= unmask_msi_irq,</div><div class='add'>+	.mask		= mask_msi_irq,</div><div class='add'>+	.ack		= ack_x2apic_edge,</div><div class='add'>+#ifdef CONFIG_SMP</div><div class='add'>+	.set_affinity	= ir_set_msi_irq_affinity,</div><div class='add'>+#endif</div><div class='add'>+	.retrigger	= ioapic_retrigger_irq,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Map the PCI dev to the corresponding remapping hardware unit</div><div class='add'>+ * and allocate 'nvec' consecutive interrupt-remapping table entries</div><div class='add'>+ * in it.</div><div class='add'>+ */</div><div class='add'>+static int msi_alloc_irte(struct pci_dev *dev, int irq, int nvec)</div><div class='ctx'> {</div><div class='add'>+	struct intel_iommu *iommu;</div><div class='add'>+	int index;</div><div class='add'>+</div><div class='add'>+	iommu = map_dev_to_ir(dev);</div><div class='add'>+	if (!iommu) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "Unable to map PCI %s to iommu\n", pci_name(dev));</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	index = alloc_irte(iommu, irq, nvec);</div><div class='add'>+	if (index &lt; 0) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "Unable to allocate %d IRTE for PCI %s\n", nvec,</div><div class='add'>+		        pci_name(dev));</div><div class='add'>+		return -ENOSPC;</div><div class='add'>+	}</div><div class='add'>+	return index;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static int setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc, int irq)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='ctx'> 	struct msi_msg msg;</div><div class='add'>+</div><div class='add'>+	ret = msi_compose_msg(dev, irq, &amp;msg);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	set_irq_msi(irq, desc);</div><div class='add'>+	write_msi_msg(irq, &amp;msg);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_INTR_REMAP</div><div class='add'>+	if (irq_remapped(irq)) {</div><div class='add'>+		struct irq_desc *desc = irq_desc + irq;</div><div class='add'>+		/*</div><div class='add'>+		 * irq migration in process context</div><div class='add'>+		 */</div><div class='add'>+		desc-&gt;status |= IRQ_MOVE_PCNTXT;</div><div class='add'>+		set_irq_chip_and_handler_name(irq, &amp;msi_ir_chip, handle_edge_irq, "edge");</div><div class='add'>+	} else</div><div class='add'>+#endif</div><div class='add'>+		set_irq_chip_and_handler_name(irq, &amp;msi_chip, handle_edge_irq, "edge");</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc)</div><div class='add'>+{</div><div class='ctx'> 	int irq, ret;</div><div class='add'>+</div><div class='ctx'> 	irq = create_irq();</div><div class='ctx'> 	if (irq &lt; 0)</div><div class='ctx'> 		return irq;</div><div class='ctx'> </div><div class='del'>-	ret = msi_compose_msg(dev, irq, &amp;msg);</div><div class='add'>+#ifdef CONFIG_INTR_REMAP</div><div class='add'>+	if (!intr_remapping_enabled)</div><div class='add'>+		goto no_ir;</div><div class='add'>+</div><div class='add'>+	ret = msi_alloc_irte(dev, irq, 1);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+no_ir:</div><div class='add'>+#endif</div><div class='add'>+	ret = setup_msi_irq(dev, desc, irq);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		destroy_irq(irq);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='add'>+	return 0;</div><div class='ctx'> </div><div class='del'>-	set_irq_msi(irq, desc);</div><div class='del'>-	write_msi_msg(irq, &amp;msg);</div><div class='add'>+#ifdef CONFIG_INTR_REMAP</div><div class='add'>+error:</div><div class='add'>+	destroy_irq(irq);</div><div class='add'>+	return ret;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	set_irq_chip_and_handler_name(irq, &amp;msi_chip, handle_edge_irq, "edge");</div><div class='add'>+int arch_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)</div><div class='add'>+{</div><div class='add'>+	int irq, ret, sub_handle;</div><div class='add'>+	struct msi_desc *desc;</div><div class='add'>+#ifdef CONFIG_INTR_REMAP</div><div class='add'>+	struct intel_iommu *iommu = 0;</div><div class='add'>+	int index = 0;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	sub_handle = 0;</div><div class='add'>+	list_for_each_entry(desc, &amp;dev-&gt;msi_list, list) {</div><div class='add'>+		irq = create_irq();</div><div class='add'>+		if (irq &lt; 0)</div><div class='add'>+			return irq;</div><div class='add'>+#ifdef CONFIG_INTR_REMAP</div><div class='add'>+		if (!intr_remapping_enabled)</div><div class='add'>+			goto no_ir;</div><div class='ctx'> </div><div class='add'>+		if (!sub_handle) {</div><div class='add'>+			/*</div><div class='add'>+			 * allocate the consecutive block of IRTE's</div><div class='add'>+			 * for 'nvec'</div><div class='add'>+			 */</div><div class='add'>+			index = msi_alloc_irte(dev, irq, nvec);</div><div class='add'>+			if (index &lt; 0) {</div><div class='add'>+				ret = index;</div><div class='add'>+				goto error;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			iommu = map_dev_to_ir(dev);</div><div class='add'>+			if (!iommu) {</div><div class='add'>+				ret = -ENOENT;</div><div class='add'>+				goto error;</div><div class='add'>+			}</div><div class='add'>+			/*</div><div class='add'>+			 * setup the mapping between the irq and the IRTE</div><div class='add'>+			 * base index, the sub_handle pointing to the</div><div class='add'>+			 * appropriate interrupt remap table entry.</div><div class='add'>+			 */</div><div class='add'>+			set_irte_irq(irq, iommu, index, sub_handle);</div><div class='add'>+		}</div><div class='add'>+no_ir:</div><div class='add'>+#endif</div><div class='add'>+		ret = setup_msi_irq(dev, desc, irq);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto error;</div><div class='add'>+		sub_handle++;</div><div class='add'>+	}</div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	destroy_irq(irq);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void arch_teardown_msi_irq(unsigned int irq)</div><div class='hunk'>@@ -2333,6 +2872,10 @@ void __init setup_ioapic_dest(void)</div><div class='ctx'> 				setup_IO_APIC_irq(ioapic, pin, irq,</div><div class='ctx'> 						  irq_trigger(irq_entry),</div><div class='ctx'> 						  irq_polarity(irq_entry));</div><div class='add'>+#ifdef CONFIG_INTR_REMAP</div><div class='add'>+			else if (intr_remapping_enabled)</div><div class='add'>+				set_ir_ioapic_affinity_irq(irq, TARGET_CPUS);</div><div class='add'>+#endif</div><div class='ctx'> 			else</div><div class='ctx'> 				set_ioapic_affinity_irq(irq, TARGET_CPUS);</div><div class='ctx'> 		}</div><div class='head'>diff --git a/arch/x86/kernel/ioport.c b/arch/x86/kernel/ioport.c<br/>index 50e5e4a31c85..191914302744 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/ioport.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/ioport.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/ioport.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/ioport.c</a></div><div class='hunk'>@@ -14,6 +14,7 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/thread_info.h&gt;</div><div class='ctx'> #include &lt;linux/syscalls.h&gt;</div><div class='add'>+#include &lt;asm/syscalls.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Set EXTENT bits starting at BASE in BITMAP to value TURN_ON. */</div><div class='ctx'> static void set_bitmap(unsigned long *bitmap, unsigned int base,</div><div class='head'>diff --git a/arch/x86/kernel/ipi.c b/arch/x86/kernel/ipi.c<br/>index 3f7537b669d3..f1c688e46f35 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/ipi.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/ipi.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/ipi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/ipi.c</a></div><div class='hunk'>@@ -20,6 +20,8 @@</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_X86_32</div><div class='ctx'> #include &lt;mach_apic.h&gt;</div><div class='add'>+#include &lt;mach_ipi.h&gt;</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * the following functions deal with sending IPIs between CPUs.</div><div class='ctx'>  *</div><div class='hunk'>@@ -147,7 +149,6 @@ void send_IPI_mask_sequence(cpumask_t mask, int vector)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* must come after the send_IPI functions above for inlining */</div><div class='del'>-#include &lt;mach_ipi.h&gt;</div><div class='ctx'> static int convert_apicid_to_cpu(int apic_id)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='head'>diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c<br/>index 1cf8c1fcc088..b71e02d42f4f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/irq_32.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/irq_32.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/irq_32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/irq_32.c</a></div><div class='hunk'>@@ -325,7 +325,7 @@ skip:</div><div class='ctx'> 		for_each_online_cpu(j)</div><div class='ctx'> 			seq_printf(p, "%10u ",</div><div class='ctx'> 				per_cpu(irq_stat,j).irq_call_count);</div><div class='del'>-		seq_printf(p, "  function call interrupts\n");</div><div class='add'>+		seq_printf(p, "  Function call interrupts\n");</div><div class='ctx'> 		seq_printf(p, "TLB: ");</div><div class='ctx'> 		for_each_online_cpu(j)</div><div class='ctx'> 			seq_printf(p, "%10u ",</div><div class='head'>diff --git a/arch/x86/kernel/irq_64.c b/arch/x86/kernel/irq_64.c<br/>index 1f78b238d8d2..f065fe9071b9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/irq_64.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/irq_64.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/irq_64.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/irq_64.c</a></div><div class='hunk'>@@ -129,7 +129,7 @@ skip:</div><div class='ctx'> 		seq_printf(p, "CAL: ");</div><div class='ctx'> 		for_each_online_cpu(j)</div><div class='ctx'> 			seq_printf(p, "%10u ", cpu_pda(j)-&gt;irq_call_count);</div><div class='del'>-		seq_printf(p, "  function call interrupts\n");</div><div class='add'>+		seq_printf(p, "  Function call interrupts\n");</div><div class='ctx'> 		seq_printf(p, "TLB: ");</div><div class='ctx'> 		for_each_online_cpu(j)</div><div class='ctx'> 			seq_printf(p, "%10u ", cpu_pda(j)-&gt;irq_tlb_count);</div><div class='head'>diff --git a/arch/x86/kernel/irqinit_32.c b/arch/x86/kernel/irqinit_32.c<br/>index d66914287ee1..9200a1e2752d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/irqinit_32.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/irqinit_32.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/irqinit_32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/irqinit_32.c</a></div><div class='hunk'>@@ -74,6 +74,15 @@ void __init init_ISA_irqs (void)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * IRQ2 is cascade interrupt to second interrupt controller</div><div class='add'>+ */</div><div class='add'>+static struct irqaction irq2 = {</div><div class='add'>+	.handler = no_action,</div><div class='add'>+	.mask = CPU_MASK_NONE,</div><div class='add'>+	.name = "cascade",</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* Overridden in paravirt.c */</div><div class='ctx'> void init_IRQ(void) __attribute__((weak, alias("native_init_IRQ")));</div><div class='ctx'> </div><div class='hunk'>@@ -98,6 +107,46 @@ void __init native_init_IRQ(void)</div><div class='ctx'> 			set_intr_gate(vector, interrupt[i]);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_X86_LOCAL_APIC) &amp;&amp; defined(CONFIG_SMP)</div><div class='add'>+	/*</div><div class='add'>+	 * IRQ0 must be given a fixed assignment and initialized,</div><div class='add'>+	 * because it's used before the IO-APIC is set up.</div><div class='add'>+	 */</div><div class='add'>+	set_intr_gate(FIRST_DEVICE_VECTOR, interrupt[0]);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The reschedule interrupt is a CPU-to-CPU reschedule-helper</div><div class='add'>+	 * IPI, driven by wakeup.</div><div class='add'>+	 */</div><div class='add'>+	alloc_intr_gate(RESCHEDULE_VECTOR, reschedule_interrupt);</div><div class='add'>+</div><div class='add'>+	/* IPI for invalidation */</div><div class='add'>+	alloc_intr_gate(INVALIDATE_TLB_VECTOR, invalidate_interrupt);</div><div class='add'>+</div><div class='add'>+	/* IPI for generic function call */</div><div class='add'>+	alloc_intr_gate(CALL_FUNCTION_VECTOR, call_function_interrupt);</div><div class='add'>+</div><div class='add'>+	/* IPI for single call function */</div><div class='add'>+	set_intr_gate(CALL_FUNCTION_SINGLE_VECTOR, call_function_single_interrupt);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_X86_LOCAL_APIC</div><div class='add'>+	/* self generated IPI for local APIC timer */</div><div class='add'>+	alloc_intr_gate(LOCAL_TIMER_VECTOR, apic_timer_interrupt);</div><div class='add'>+</div><div class='add'>+	/* IPI vectors for APIC spurious and error interrupts */</div><div class='add'>+	alloc_intr_gate(SPURIOUS_APIC_VECTOR, spurious_interrupt);</div><div class='add'>+	alloc_intr_gate(ERROR_APIC_VECTOR, error_interrupt);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_X86_LOCAL_APIC) &amp;&amp; defined(CONFIG_X86_MCE_P4THERMAL)</div><div class='add'>+	/* thermal monitor LVT interrupt */</div><div class='add'>+	alloc_intr_gate(THERMAL_APIC_VECTOR, thermal_interrupt);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	if (!acpi_ioapic)</div><div class='add'>+		setup_irq(2, &amp;irq2);</div><div class='add'>+</div><div class='ctx'> 	/* setup after call gates are initialised (usually add in</div><div class='ctx'> 	 * the architecture specific gates)</div><div class='ctx'> 	 */</div><div class='head'>diff --git a/arch/x86/kernel/irqinit_64.c b/arch/x86/kernel/irqinit_64.c<br/>index 1f26fd9ec4f4..5b5be9d43c2a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/irqinit_64.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/irqinit_64.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/irqinit_64.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/irqinit_64.c</a></div><div class='hunk'>@@ -135,7 +135,7 @@ DEFINE_PER_CPU(vector_irq_t, vector_irq) = {</div><div class='ctx'> 	[IRQ15_VECTOR + 1 ... NR_VECTORS - 1] = -1</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void __init init_ISA_irqs (void)</div><div class='add'>+void __init init_ISA_irqs(void)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -164,22 +164,8 @@ static void __init init_ISA_irqs (void)</div><div class='ctx'> </div><div class='ctx'> void init_IRQ(void) __attribute__((weak, alias("native_init_IRQ")));</div><div class='ctx'> </div><div class='del'>-void __init native_init_IRQ(void)</div><div class='add'>+static void __init smp_intr_init(void)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	init_ISA_irqs();</div><div class='del'>-	/*</div><div class='del'>-	 * Cover the whole vector space, no vector can escape</div><div class='del'>-	 * us. (some of these will be overridden and become</div><div class='del'>-	 * 'special' SMP interrupts)</div><div class='del'>-	 */</div><div class='del'>-	for (i = 0; i &lt; (NR_VECTORS - FIRST_EXTERNAL_VECTOR); i++) {</div><div class='del'>-		int vector = FIRST_EXTERNAL_VECTOR + i;</div><div class='del'>-		if (vector != IA32_SYSCALL_VECTOR)</div><div class='del'>-			set_intr_gate(vector, interrupt[i]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The reschedule interrupt is a CPU-to-CPU reschedule-helper</div><div class='hunk'>@@ -207,6 +193,12 @@ void __init native_init_IRQ(void)</div><div class='ctx'> 	/* Low priority IPI to cleanup after moving an irq */</div><div class='ctx'> 	set_intr_gate(IRQ_MOVE_CLEANUP_VECTOR, irq_move_cleanup_interrupt);</div><div class='ctx'> #endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init apic_intr_init(void)</div><div class='add'>+{</div><div class='add'>+	smp_intr_init();</div><div class='add'>+</div><div class='ctx'> 	alloc_intr_gate(THERMAL_APIC_VECTOR, thermal_interrupt);</div><div class='ctx'> 	alloc_intr_gate(THRESHOLD_APIC_VECTOR, threshold_interrupt);</div><div class='ctx'> </div><div class='hunk'>@@ -216,6 +208,25 @@ void __init native_init_IRQ(void)</div><div class='ctx'> 	/* IPI vectors for APIC spurious and error interrupts */</div><div class='ctx'> 	alloc_intr_gate(SPURIOUS_APIC_VECTOR, spurious_interrupt);</div><div class='ctx'> 	alloc_intr_gate(ERROR_APIC_VECTOR, error_interrupt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init native_init_IRQ(void)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	init_ISA_irqs();</div><div class='add'>+	/*</div><div class='add'>+	 * Cover the whole vector space, no vector can escape</div><div class='add'>+	 * us. (some of these will be overridden and become</div><div class='add'>+	 * 'special' SMP interrupts)</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; (NR_VECTORS - FIRST_EXTERNAL_VECTOR); i++) {</div><div class='add'>+		int vector = FIRST_EXTERNAL_VECTOR + i;</div><div class='add'>+		if (vector != IA32_SYSCALL_VECTOR)</div><div class='add'>+			set_intr_gate(vector, interrupt[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	apic_intr_init();</div><div class='ctx'> </div><div class='ctx'> 	if (!acpi_ioapic)</div><div class='ctx'> 		setup_irq(2, &amp;irq2);</div><div class='head'>diff --git a/arch/x86/kernel/k8.c b/arch/x86/kernel/k8.c<br/>index 7377ccb21335..304d8bad6559 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/k8.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/k8.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/k8.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/k8.c</a></div><div class='hunk'>@@ -16,8 +16,9 @@ EXPORT_SYMBOL(num_k8_northbridges);</div><div class='ctx'> static u32 *flush_words;</div><div class='ctx'> </div><div class='ctx'> struct pci_device_id k8_nb_ids[] = {</div><div class='del'>-	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, 0x1103) },</div><div class='del'>-	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, 0x1203) },</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_K8_NB_MISC) },</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_10H_NB_MISC) },</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_11H_NB_MISC) },</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> EXPORT_SYMBOL(k8_nb_ids);</div><div class='head'>diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c<br/>index 8b7a3cf37d2b..478bca986eca 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/kvm.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/kvm.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/kvm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/kvm.c</a></div><div class='hunk'>@@ -178,7 +178,7 @@ static void kvm_flush_tlb(void)</div><div class='ctx'> 	kvm_deferred_mmu_op(&amp;ftlb, sizeof ftlb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void kvm_release_pt(u32 pfn)</div><div class='add'>+static void kvm_release_pt(unsigned long pfn)</div><div class='ctx'> {</div><div class='ctx'> 	struct kvm_mmu_op_release_pt rpt = {</div><div class='ctx'> 		.header.op = KVM_MMU_OP_RELEASE_PT,</div><div class='head'>diff --git a/arch/x86/kernel/kvmclock.c b/arch/x86/kernel/kvmclock.c<br/>index d02def06ca91..774ac4991568 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/kvmclock.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/kvmclock.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/kvmclock.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/kvmclock.c</a></div><div class='hunk'>@@ -78,6 +78,34 @@ static cycle_t kvm_clock_read(void)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * If we don't do that, there is the possibility that the guest</div><div class='add'>+ * will calibrate under heavy load - thus, getting a lower lpj -</div><div class='add'>+ * and execute the delays themselves without load. This is wrong,</div><div class='add'>+ * because no delay loop can finish beforehand.</div><div class='add'>+ * Any heuristics is subject to fail, because ultimately, a large</div><div class='add'>+ * poll of guests can be running and trouble each other. So we preset</div><div class='add'>+ * lpj here</div><div class='add'>+ */</div><div class='add'>+static unsigned long kvm_get_tsc_khz(void)</div><div class='add'>+{</div><div class='add'>+	return preset_lpj;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void kvm_get_preset_lpj(void)</div><div class='add'>+{</div><div class='add'>+	struct pvclock_vcpu_time_info *src;</div><div class='add'>+	unsigned long khz;</div><div class='add'>+	u64 lpj;</div><div class='add'>+</div><div class='add'>+	src = &amp;per_cpu(hv_clock, 0);</div><div class='add'>+	khz = pvclock_tsc_khz(src);</div><div class='add'>+</div><div class='add'>+	lpj = ((u64)khz * 1000);</div><div class='add'>+	do_div(lpj, HZ);</div><div class='add'>+	preset_lpj = lpj;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct clocksource kvm_clock = {</div><div class='ctx'> 	.name = "kvm-clock",</div><div class='ctx'> 	.read = kvm_clock_read,</div><div class='hunk'>@@ -153,6 +181,7 @@ void __init kvmclock_init(void)</div><div class='ctx'> 		pv_time_ops.get_wallclock = kvm_get_wallclock;</div><div class='ctx'> 		pv_time_ops.set_wallclock = kvm_set_wallclock;</div><div class='ctx'> 		pv_time_ops.sched_clock = kvm_clock_read;</div><div class='add'>+		pv_time_ops.get_tsc_khz = kvm_get_tsc_khz;</div><div class='ctx'> #ifdef CONFIG_X86_LOCAL_APIC</div><div class='ctx'> 		pv_apic_ops.setup_secondary_clock = kvm_setup_secondary_clock;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -163,6 +192,7 @@ void __init kvmclock_init(void)</div><div class='ctx'> #ifdef CONFIG_KEXEC</div><div class='ctx'> 		machine_ops.crash_shutdown  = kvm_crash_shutdown;</div><div class='ctx'> #endif</div><div class='add'>+		kvm_get_preset_lpj();</div><div class='ctx'> 		clocksource_register(&amp;kvm_clock);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/x86/kernel/ldt.c b/arch/x86/kernel/ldt.c<br/>index b68e21f06f4f..eee32b43fee3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/ldt.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/ldt.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/ldt.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/ldt.c</a></div><div class='hunk'>@@ -18,6 +18,7 @@</div><div class='ctx'> #include &lt;asm/ldt.h&gt;</div><div class='ctx'> #include &lt;asm/desc.h&gt;</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='add'>+#include &lt;asm/syscalls.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> static void flush_ldt(void *current_mm)</div><div class='hunk'>@@ -51,6 +52,8 @@ static int alloc_ldt(mm_context_t *pc, int mincount, int reload)</div><div class='ctx'> 	memset(newldt + oldsize * LDT_ENTRY_SIZE, 0,</div><div class='ctx'> 	       (mincount - oldsize) * LDT_ENTRY_SIZE);</div><div class='ctx'> </div><div class='add'>+	paravirt_alloc_ldt(newldt, mincount);</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_X86_64</div><div class='ctx'> 	/* CHECKME: Do we really need this ? */</div><div class='ctx'> 	wmb();</div><div class='hunk'>@@ -73,6 +76,7 @@ static int alloc_ldt(mm_context_t *pc, int mincount, int reload)</div><div class='ctx'> #endif</div><div class='ctx'> 	}</div><div class='ctx'> 	if (oldsize) {</div><div class='add'>+		paravirt_free_ldt(oldldt, oldsize);</div><div class='ctx'> 		if (oldsize * LDT_ENTRY_SIZE &gt; PAGE_SIZE)</div><div class='ctx'> 			vfree(oldldt);</div><div class='ctx'> 		else</div><div class='hunk'>@@ -84,10 +88,13 @@ static int alloc_ldt(mm_context_t *pc, int mincount, int reload)</div><div class='ctx'> static inline int copy_ldt(mm_context_t *new, mm_context_t *old)</div><div class='ctx'> {</div><div class='ctx'> 	int err = alloc_ldt(new, old-&gt;size, 0);</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	memcpy(new-&gt;ldt, old-&gt;ldt, old-&gt;size * LDT_ENTRY_SIZE);</div><div class='add'>+</div><div class='add'>+	for(i = 0; i &lt; old-&gt;size; i++)</div><div class='add'>+		write_ldt_entry(new-&gt;ldt, i, old-&gt;ldt + i * LDT_ENTRY_SIZE);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -124,6 +131,7 @@ void destroy_context(struct mm_struct *mm)</div><div class='ctx'> 		if (mm == current-&gt;active_mm)</div><div class='ctx'> 			clear_LDT();</div><div class='ctx'> #endif</div><div class='add'>+		paravirt_free_ldt(mm-&gt;context.ldt, mm-&gt;context.size);</div><div class='ctx'> 		if (mm-&gt;context.size * LDT_ENTRY_SIZE &gt; PAGE_SIZE)</div><div class='ctx'> 			vfree(mm-&gt;context.ldt);</div><div class='ctx'> 		else</div><div class='head'>diff --git a/arch/x86/kernel/microcode.c b/arch/x86/kernel/microcode.c<br/>deleted file mode 100644<br/>index 652fa5c38ebe..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/microcode.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/microcode.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,853 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *	Intel CPU Microcode Update Driver for Linux</div><div class='del'>- *</div><div class='del'>- *	Copyright (C) 2000-2006 Tigran Aivazian &lt;tigran@aivazian.fsnet.co.uk&gt;</div><div class='del'>- *		      2006	Shaohua Li &lt;shaohua.li@intel.com&gt;</div><div class='del'>- *</div><div class='del'>- *	This driver allows to upgrade microcode on Intel processors</div><div class='del'>- *	belonging to IA-32 family - PentiumPro, Pentium II,</div><div class='del'>- *	Pentium III, Xeon, Pentium 4, etc.</div><div class='del'>- *</div><div class='del'>- *	Reference: Section 8.11 of Volume 3a, IA-32 Intel? Architecture</div><div class='del'>- *	Software Developer's Manual</div><div class='del'>- *	Order Number 253668 or free download from:</div><div class='del'>- *</div><div class='del'>- *	http://developer.intel.com/design/pentium4/manuals/253668.htm</div><div class='del'>- *</div><div class='del'>- *	For more information, go to http://www.urbanmyth.org/microcode</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License</div><div class='del'>- *	as published by the Free Software Foundation; either version</div><div class='del'>- *	2 of the License, or (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *	1.0	16 Feb 2000, Tigran Aivazian &lt;tigran@sco.com&gt;</div><div class='del'>- *		Initial release.</div><div class='del'>- *	1.01	18 Feb 2000, Tigran Aivazian &lt;tigran@sco.com&gt;</div><div class='del'>- *		Added read() support + cleanups.</div><div class='del'>- *	1.02	21 Feb 2000, Tigran Aivazian &lt;tigran@sco.com&gt;</div><div class='del'>- *		Added 'device trimming' support. open(O_WRONLY) zeroes</div><div class='del'>- *		and frees the saved copy of applied microcode.</div><div class='del'>- *	1.03	29 Feb 2000, Tigran Aivazian &lt;tigran@sco.com&gt;</div><div class='del'>- *		Made to use devfs (/dev/cpu/microcode) + cleanups.</div><div class='del'>- *	1.04	06 Jun 2000, Simon Trimmer &lt;simon@veritas.com&gt;</div><div class='del'>- *		Added misc device support (now uses both devfs and misc).</div><div class='del'>- *		Added MICROCODE_IOCFREE ioctl to clear memory.</div><div class='del'>- *	1.05	09 Jun 2000, Simon Trimmer &lt;simon@veritas.com&gt;</div><div class='del'>- *		Messages for error cases (non Intel &amp; no suitable microcode).</div><div class='del'>- *	1.06	03 Aug 2000, Tigran Aivazian &lt;tigran@veritas.com&gt;</div><div class='del'>- *		Removed -&gt;release(). Removed exclusive open and status bitmap.</div><div class='del'>- *		Added microcode_rwsem to serialize read()/write()/ioctl().</div><div class='del'>- *		Removed global kernel lock usage.</div><div class='del'>- *	1.07	07 Sep 2000, Tigran Aivazian &lt;tigran@veritas.com&gt;</div><div class='del'>- *		Write 0 to 0x8B msr and then cpuid before reading revision,</div><div class='del'>- *		so that it works even if there were no update done by the</div><div class='del'>- *		BIOS. Otherwise, reading from 0x8B gives junk (which happened</div><div class='del'>- *		to be 0 on my machine which is why it worked even when I</div><div class='del'>- *		disabled update by the BIOS)</div><div class='del'>- *		Thanks to Eric W. Biederman &lt;ebiederman@lnxi.com&gt; for the fix.</div><div class='del'>- *	1.08	11 Dec 2000, Richard Schaal &lt;richard.schaal@intel.com&gt; and</div><div class='del'>- *			     Tigran Aivazian &lt;tigran@veritas.com&gt;</div><div class='del'>- *		Intel Pentium 4 processor support and bugfixes.</div><div class='del'>- *	1.09	30 Oct 2001, Tigran Aivazian &lt;tigran@veritas.com&gt;</div><div class='del'>- *		Bugfix for HT (Hyper-Threading) enabled processors</div><div class='del'>- *		whereby processor resources are shared by all logical processors</div><div class='del'>- *		in a single CPU package.</div><div class='del'>- *	1.10	28 Feb 2002 Asit K Mallick &lt;asit.k.mallick@intel.com&gt; and</div><div class='del'>- *		Tigran Aivazian &lt;tigran@veritas.com&gt;,</div><div class='del'>- *		Serialize updates as required on HT processors due to speculative</div><div class='del'>- *		nature of implementation.</div><div class='del'>- *	1.11	22 Mar 2002 Tigran Aivazian &lt;tigran@veritas.com&gt;</div><div class='del'>- *		Fix the panic when writing zero-length microcode chunk.</div><div class='del'>- *	1.12	29 Sep 2003 Nitin Kamble &lt;nitin.a.kamble@intel.com&gt;,</div><div class='del'>- *		Jun Nakajima &lt;jun.nakajima@intel.com&gt;</div><div class='del'>- *		Support for the microcode updates in the new format.</div><div class='del'>- *	1.13	10 Oct 2003 Tigran Aivazian &lt;tigran@veritas.com&gt;</div><div class='del'>- *		Removed -&gt;read() method and obsoleted MICROCODE_IOCFREE ioctl</div><div class='del'>- *		because we no longer hold a copy of applied microcode</div><div class='del'>- *		in kernel memory.</div><div class='del'>- *	1.14	25 Jun 2004 Tigran Aivazian &lt;tigran@veritas.com&gt;</div><div class='del'>- *		Fix sigmatch() macro to handle old CPUs with pf == 0.</div><div class='del'>- *		Thanks to Stuart Swales for pointing out this bug.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-//#define DEBUG /* pr_debug */</div><div class='del'>-#include &lt;linux/capability.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/smp_lock.h&gt;</div><div class='del'>-#include &lt;linux/cpumask.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/vmalloc.h&gt;</div><div class='del'>-#include &lt;linux/miscdevice.h&gt;</div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/fs.h&gt;</div><div class='del'>-#include &lt;linux/mutex.h&gt;</div><div class='del'>-#include &lt;linux/cpu.h&gt;</div><div class='del'>-#include &lt;linux/firmware.h&gt;</div><div class='del'>-#include &lt;linux/platform_device.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/msr.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='del'>-#include &lt;asm/processor.h&gt;</div><div class='del'>-</div><div class='del'>-MODULE_DESCRIPTION("Intel CPU (IA-32) Microcode Update Driver");</div><div class='del'>-MODULE_AUTHOR("Tigran Aivazian &lt;tigran@aivazian.fsnet.co.uk&gt;");</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-</div><div class='del'>-#define MICROCODE_VERSION 	"1.14a"</div><div class='del'>-</div><div class='del'>-#define DEFAULT_UCODE_DATASIZE 	(2000) 	  /* 2000 bytes */</div><div class='del'>-#define MC_HEADER_SIZE		(sizeof (microcode_header_t))  	  /* 48 bytes */</div><div class='del'>-#define DEFAULT_UCODE_TOTALSIZE (DEFAULT_UCODE_DATASIZE + MC_HEADER_SIZE) /* 2048 bytes */</div><div class='del'>-#define EXT_HEADER_SIZE		(sizeof (struct extended_sigtable)) /* 20 bytes */</div><div class='del'>-#define EXT_SIGNATURE_SIZE	(sizeof (struct extended_signature)) /* 12 bytes */</div><div class='del'>-#define DWSIZE			(sizeof (u32))</div><div class='del'>-#define get_totalsize(mc) \</div><div class='del'>-	(((microcode_t *)mc)-&gt;hdr.totalsize ? \</div><div class='del'>-	 ((microcode_t *)mc)-&gt;hdr.totalsize : DEFAULT_UCODE_TOTALSIZE)</div><div class='del'>-#define get_datasize(mc) \</div><div class='del'>-	(((microcode_t *)mc)-&gt;hdr.datasize ? \</div><div class='del'>-	 ((microcode_t *)mc)-&gt;hdr.datasize : DEFAULT_UCODE_DATASIZE)</div><div class='del'>-</div><div class='del'>-#define sigmatch(s1, s2, p1, p2) \</div><div class='del'>-	(((s1) == (s2)) &amp;&amp; (((p1) &amp; (p2)) || (((p1) == 0) &amp;&amp; ((p2) == 0))))</div><div class='del'>-</div><div class='del'>-#define exttable_size(et) ((et)-&gt;count * EXT_SIGNATURE_SIZE + EXT_HEADER_SIZE)</div><div class='del'>-</div><div class='del'>-/* serialize access to the physical write to MSR 0x79 */</div><div class='del'>-static DEFINE_SPINLOCK(microcode_update_lock);</div><div class='del'>-</div><div class='del'>-/* no concurrent -&gt;write()s are allowed on /dev/cpu/microcode */</div><div class='del'>-static DEFINE_MUTEX(microcode_mutex);</div><div class='del'>-</div><div class='del'>-static struct ucode_cpu_info {</div><div class='del'>-	int valid;</div><div class='del'>-	unsigned int sig;</div><div class='del'>-	unsigned int pf;</div><div class='del'>-	unsigned int rev;</div><div class='del'>-	microcode_t *mc;</div><div class='del'>-} ucode_cpu_info[NR_CPUS];</div><div class='del'>-</div><div class='del'>-static void collect_cpu_info(int cpu_num)</div><div class='del'>-{</div><div class='del'>-	struct cpuinfo_x86 *c = &amp;cpu_data(cpu_num);</div><div class='del'>-	struct ucode_cpu_info *uci = ucode_cpu_info + cpu_num;</div><div class='del'>-	unsigned int val[2];</div><div class='del'>-</div><div class='del'>-	/* We should bind the task to the CPU */</div><div class='del'>-	BUG_ON(raw_smp_processor_id() != cpu_num);</div><div class='del'>-	uci-&gt;pf = uci-&gt;rev = 0;</div><div class='del'>-	uci-&gt;mc = NULL;</div><div class='del'>-	uci-&gt;valid = 1;</div><div class='del'>-</div><div class='del'>-	if (c-&gt;x86_vendor != X86_VENDOR_INTEL || c-&gt;x86 &lt; 6 ||</div><div class='del'>-	    	cpu_has(c, X86_FEATURE_IA64)) {</div><div class='del'>-		printk(KERN_ERR "microcode: CPU%d not a capable Intel "</div><div class='del'>-			"processor\n", cpu_num);</div><div class='del'>-		uci-&gt;valid = 0;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	uci-&gt;sig = cpuid_eax(0x00000001);</div><div class='del'>-</div><div class='del'>-	if ((c-&gt;x86_model &gt;= 5) || (c-&gt;x86 &gt; 6)) {</div><div class='del'>-		/* get processor flags from MSR 0x17 */</div><div class='del'>-		rdmsr(MSR_IA32_PLATFORM_ID, val[0], val[1]);</div><div class='del'>-		uci-&gt;pf = 1 &lt;&lt; ((val[1] &gt;&gt; 18) &amp; 7);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	wrmsr(MSR_IA32_UCODE_REV, 0, 0);</div><div class='del'>-	/* see notes above for revision 1.07.  Apparent chip bug */</div><div class='del'>-	sync_core();</div><div class='del'>-	/* get the current revision from MSR 0x8B */</div><div class='del'>-	rdmsr(MSR_IA32_UCODE_REV, val[0], uci-&gt;rev);</div><div class='del'>-	pr_debug("microcode: collect_cpu_info : sig=0x%x, pf=0x%x, rev=0x%x\n",</div><div class='del'>-			uci-&gt;sig, uci-&gt;pf, uci-&gt;rev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int microcode_update_match(int cpu_num,</div><div class='del'>-	microcode_header_t *mc_header, int sig, int pf)</div><div class='del'>-{</div><div class='del'>-	struct ucode_cpu_info *uci = ucode_cpu_info + cpu_num;</div><div class='del'>-</div><div class='del'>-	if (!sigmatch(sig, uci-&gt;sig, pf, uci-&gt;pf)</div><div class='del'>-		|| mc_header-&gt;rev &lt;= uci-&gt;rev)</div><div class='del'>-		return 0;</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int microcode_sanity_check(void *mc)</div><div class='del'>-{</div><div class='del'>-	microcode_header_t *mc_header = mc;</div><div class='del'>-	struct extended_sigtable *ext_header = NULL;</div><div class='del'>-	struct extended_signature *ext_sig;</div><div class='del'>-	unsigned long total_size, data_size, ext_table_size;</div><div class='del'>-	int sum, orig_sum, ext_sigcount = 0, i;</div><div class='del'>-</div><div class='del'>-	total_size = get_totalsize(mc_header);</div><div class='del'>-	data_size = get_datasize(mc_header);</div><div class='del'>-	if (data_size + MC_HEADER_SIZE &gt; total_size) {</div><div class='del'>-		printk(KERN_ERR "microcode: error! "</div><div class='del'>-			"Bad data size in microcode data file\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (mc_header-&gt;ldrver != 1 || mc_header-&gt;hdrver != 1) {</div><div class='del'>-		printk(KERN_ERR "microcode: error! "</div><div class='del'>-			"Unknown microcode update format\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	ext_table_size = total_size - (MC_HEADER_SIZE + data_size);</div><div class='del'>-	if (ext_table_size) {</div><div class='del'>-		if ((ext_table_size &lt; EXT_HEADER_SIZE)</div><div class='del'>-		 || ((ext_table_size - EXT_HEADER_SIZE) % EXT_SIGNATURE_SIZE)) {</div><div class='del'>-			printk(KERN_ERR "microcode: error! "</div><div class='del'>-				"Small exttable size in microcode data file\n");</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-		ext_header = mc + MC_HEADER_SIZE + data_size;</div><div class='del'>-		if (ext_table_size != exttable_size(ext_header)) {</div><div class='del'>-			printk(KERN_ERR "microcode: error! "</div><div class='del'>-				"Bad exttable size in microcode data file\n");</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		}</div><div class='del'>-		ext_sigcount = ext_header-&gt;count;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* check extended table checksum */</div><div class='del'>-	if (ext_table_size) {</div><div class='del'>-		int ext_table_sum = 0;</div><div class='del'>-		int *ext_tablep = (int *)ext_header;</div><div class='del'>-</div><div class='del'>-		i = ext_table_size / DWSIZE;</div><div class='del'>-		while (i--)</div><div class='del'>-			ext_table_sum += ext_tablep[i];</div><div class='del'>-		if (ext_table_sum) {</div><div class='del'>-			printk(KERN_WARNING "microcode: aborting, "</div><div class='del'>-				"bad extended signature table checksum\n");</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* calculate the checksum */</div><div class='del'>-	orig_sum = 0;</div><div class='del'>-	i = (MC_HEADER_SIZE + data_size) / DWSIZE;</div><div class='del'>-	while (i--)</div><div class='del'>-		orig_sum += ((int *)mc)[i];</div><div class='del'>-	if (orig_sum) {</div><div class='del'>-		printk(KERN_ERR "microcode: aborting, bad checksum\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	if (!ext_table_size)</div><div class='del'>-		return 0;</div><div class='del'>-	/* check extended signature checksum */</div><div class='del'>-	for (i = 0; i &lt; ext_sigcount; i++) {</div><div class='del'>-		ext_sig = (void *)ext_header + EXT_HEADER_SIZE +</div><div class='del'>-			  EXT_SIGNATURE_SIZE * i;</div><div class='del'>-		sum = orig_sum</div><div class='del'>-			- (mc_header-&gt;sig + mc_header-&gt;pf + mc_header-&gt;cksum)</div><div class='del'>-			+ (ext_sig-&gt;sig + ext_sig-&gt;pf + ext_sig-&gt;cksum);</div><div class='del'>-		if (sum) {</div><div class='del'>-			printk(KERN_ERR "microcode: aborting, bad checksum\n");</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * return 0 - no update found</div><div class='del'>- * return 1 - found update</div><div class='del'>- * return &lt; 0 - error</div><div class='del'>- */</div><div class='del'>-static int get_maching_microcode(void *mc, int cpu)</div><div class='del'>-{</div><div class='del'>-	struct ucode_cpu_info *uci = ucode_cpu_info + cpu;</div><div class='del'>-	microcode_header_t *mc_header = mc;</div><div class='del'>-	struct extended_sigtable *ext_header;</div><div class='del'>-	unsigned long total_size = get_totalsize(mc_header);</div><div class='del'>-	int ext_sigcount, i;</div><div class='del'>-	struct extended_signature *ext_sig;</div><div class='del'>-	void *new_mc;</div><div class='del'>-</div><div class='del'>-	if (microcode_update_match(cpu, mc_header,</div><div class='del'>-			mc_header-&gt;sig, mc_header-&gt;pf))</div><div class='del'>-		goto find;</div><div class='del'>-</div><div class='del'>-	if (total_size &lt;= get_datasize(mc_header) + MC_HEADER_SIZE)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	ext_header = mc + get_datasize(mc_header) + MC_HEADER_SIZE;</div><div class='del'>-	ext_sigcount = ext_header-&gt;count;</div><div class='del'>-	ext_sig = (void *)ext_header + EXT_HEADER_SIZE;</div><div class='del'>-	for (i = 0; i &lt; ext_sigcount; i++) {</div><div class='del'>-		if (microcode_update_match(cpu, mc_header,</div><div class='del'>-				ext_sig-&gt;sig, ext_sig-&gt;pf))</div><div class='del'>-			goto find;</div><div class='del'>-		ext_sig++;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-find:</div><div class='del'>-	pr_debug("microcode: CPU%d found a matching microcode update with"</div><div class='del'>-		" version 0x%x (current=0x%x)\n", cpu, mc_header-&gt;rev,uci-&gt;rev);</div><div class='del'>-	new_mc = vmalloc(total_size);</div><div class='del'>-	if (!new_mc) {</div><div class='del'>-		printk(KERN_ERR "microcode: error! Can not allocate memory\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* free previous update file */</div><div class='del'>-	vfree(uci-&gt;mc);</div><div class='del'>-</div><div class='del'>-	memcpy(new_mc, mc, total_size);</div><div class='del'>-	uci-&gt;mc = new_mc;</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void apply_microcode(int cpu)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	unsigned int val[2];</div><div class='del'>-	int cpu_num = raw_smp_processor_id();</div><div class='del'>-	struct ucode_cpu_info *uci = ucode_cpu_info + cpu_num;</div><div class='del'>-</div><div class='del'>-	/* We should bind the task to the CPU */</div><div class='del'>-	BUG_ON(cpu_num != cpu);</div><div class='del'>-</div><div class='del'>-	if (uci-&gt;mc == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* serialize access to the physical write to MSR 0x79 */</div><div class='del'>-	spin_lock_irqsave(&amp;microcode_update_lock, flags);</div><div class='del'>-</div><div class='del'>-	/* write microcode via MSR 0x79 */</div><div class='del'>-	wrmsr(MSR_IA32_UCODE_WRITE,</div><div class='del'>-		(unsigned long) uci-&gt;mc-&gt;bits,</div><div class='del'>-		(unsigned long) uci-&gt;mc-&gt;bits &gt;&gt; 16 &gt;&gt; 16);</div><div class='del'>-	wrmsr(MSR_IA32_UCODE_REV, 0, 0);</div><div class='del'>-</div><div class='del'>-	/* see notes above for revision 1.07.  Apparent chip bug */</div><div class='del'>-	sync_core();</div><div class='del'>-</div><div class='del'>-	/* get the current revision from MSR 0x8B */</div><div class='del'>-	rdmsr(MSR_IA32_UCODE_REV, val[0], val[1]);</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;microcode_update_lock, flags);</div><div class='del'>-	if (val[1] != uci-&gt;mc-&gt;hdr.rev) {</div><div class='del'>-		printk(KERN_ERR "microcode: CPU%d update from revision "</div><div class='del'>-			"0x%x to 0x%x failed\n", cpu_num, uci-&gt;rev, val[1]);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	printk(KERN_INFO "microcode: CPU%d updated from revision "</div><div class='del'>-	       "0x%x to 0x%x, date = %08x \n",</div><div class='del'>-	       cpu_num, uci-&gt;rev, val[1], uci-&gt;mc-&gt;hdr.date);</div><div class='del'>-	uci-&gt;rev = val[1];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_MICROCODE_OLD_INTERFACE</div><div class='del'>-static void __user *user_buffer;	/* user area microcode data buffer */</div><div class='del'>-static unsigned int user_buffer_size;	/* it's size */</div><div class='del'>-</div><div class='del'>-static long get_next_ucode(void **mc, long offset)</div><div class='del'>-{</div><div class='del'>-	microcode_header_t mc_header;</div><div class='del'>-	unsigned long total_size;</div><div class='del'>-</div><div class='del'>-	/* No more data */</div><div class='del'>-	if (offset &gt;= user_buffer_size)</div><div class='del'>-		return 0;</div><div class='del'>-	if (copy_from_user(&amp;mc_header, user_buffer + offset, MC_HEADER_SIZE)) {</div><div class='del'>-		printk(KERN_ERR "microcode: error! Can not read user data\n");</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	}</div><div class='del'>-	total_size = get_totalsize(&amp;mc_header);</div><div class='del'>-	if (offset + total_size &gt; user_buffer_size) {</div><div class='del'>-		printk(KERN_ERR "microcode: error! Bad total size in microcode "</div><div class='del'>-				"data file\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	*mc = vmalloc(total_size);</div><div class='del'>-	if (!*mc)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	if (copy_from_user(*mc, user_buffer + offset, total_size)) {</div><div class='del'>-		printk(KERN_ERR "microcode: error! Can not read user data\n");</div><div class='del'>-		vfree(*mc);</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	}</div><div class='del'>-	return offset + total_size;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int do_microcode_update (void)</div><div class='del'>-{</div><div class='del'>-	long cursor = 0;</div><div class='del'>-	int error = 0;</div><div class='del'>-	void *new_mc = NULL;</div><div class='del'>-	int cpu;</div><div class='del'>-	cpumask_t old;</div><div class='del'>-</div><div class='del'>-	old = current-&gt;cpus_allowed;</div><div class='del'>-</div><div class='del'>-	while ((cursor = get_next_ucode(&amp;new_mc, cursor)) &gt; 0) {</div><div class='del'>-		error = microcode_sanity_check(new_mc);</div><div class='del'>-		if (error)</div><div class='del'>-			goto out;</div><div class='del'>-		/*</div><div class='del'>-		 * It's possible the data file has multiple matching ucode,</div><div class='del'>-		 * lets keep searching till the latest version</div><div class='del'>-		 */</div><div class='del'>-		for_each_online_cpu(cpu) {</div><div class='del'>-			struct ucode_cpu_info *uci = ucode_cpu_info + cpu;</div><div class='del'>-</div><div class='del'>-			if (!uci-&gt;valid)</div><div class='del'>-				continue;</div><div class='del'>-			set_cpus_allowed_ptr(current, &amp;cpumask_of_cpu(cpu));</div><div class='del'>-			error = get_maching_microcode(new_mc, cpu);</div><div class='del'>-			if (error &lt; 0)</div><div class='del'>-				goto out;</div><div class='del'>-			if (error == 1)</div><div class='del'>-				apply_microcode(cpu);</div><div class='del'>-		}</div><div class='del'>-		vfree(new_mc);</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	if (cursor &gt; 0)</div><div class='del'>-		vfree(new_mc);</div><div class='del'>-	if (cursor &lt; 0)</div><div class='del'>-		error = cursor;</div><div class='del'>-	set_cpus_allowed_ptr(current, &amp;old);</div><div class='del'>-	return error;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int microcode_open (struct inode *unused1, struct file *unused2)</div><div class='del'>-{</div><div class='del'>-	cycle_kernel_lock();</div><div class='del'>-	return capable(CAP_SYS_RAWIO) ? 0 : -EPERM;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t microcode_write (struct file *file, const char __user *buf, size_t len, loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	ssize_t ret;</div><div class='del'>-</div><div class='del'>-	if ((len &gt;&gt; PAGE_SHIFT) &gt; num_physpages) {</div><div class='del'>-		printk(KERN_ERR "microcode: too much data (max %ld pages)\n", num_physpages);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	get_online_cpus();</div><div class='del'>-	mutex_lock(&amp;microcode_mutex);</div><div class='del'>-</div><div class='del'>-	user_buffer = (void __user *) buf;</div><div class='del'>-	user_buffer_size = (int) len;</div><div class='del'>-</div><div class='del'>-	ret = do_microcode_update();</div><div class='del'>-	if (!ret)</div><div class='del'>-		ret = (ssize_t)len;</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;microcode_mutex);</div><div class='del'>-	put_online_cpus();</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct file_operations microcode_fops = {</div><div class='del'>-	.owner		= THIS_MODULE,</div><div class='del'>-	.write		= microcode_write,</div><div class='del'>-	.open		= microcode_open,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct miscdevice microcode_dev = {</div><div class='del'>-	.minor		= MICROCODE_MINOR,</div><div class='del'>-	.name		= "microcode",</div><div class='del'>-	.fops		= &amp;microcode_fops,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init microcode_dev_init (void)</div><div class='del'>-{</div><div class='del'>-	int error;</div><div class='del'>-</div><div class='del'>-	error = misc_register(&amp;microcode_dev);</div><div class='del'>-	if (error) {</div><div class='del'>-		printk(KERN_ERR</div><div class='del'>-			"microcode: can't misc_register on minor=%d\n",</div><div class='del'>-			MICROCODE_MINOR);</div><div class='del'>-		return error;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void microcode_dev_exit (void)</div><div class='del'>-{</div><div class='del'>-	misc_deregister(&amp;microcode_dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-MODULE_ALIAS_MISCDEV(MICROCODE_MINOR);</div><div class='del'>-#else</div><div class='del'>-#define microcode_dev_init() 0</div><div class='del'>-#define microcode_dev_exit() do { } while(0)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static long get_next_ucode_from_buffer(void **mc, const u8 *buf,</div><div class='del'>-	unsigned long size, long offset)</div><div class='del'>-{</div><div class='del'>-	microcode_header_t *mc_header;</div><div class='del'>-	unsigned long total_size;</div><div class='del'>-</div><div class='del'>-	/* No more data */</div><div class='del'>-	if (offset &gt;= size)</div><div class='del'>-		return 0;</div><div class='del'>-	mc_header = (microcode_header_t *)(buf + offset);</div><div class='del'>-	total_size = get_totalsize(mc_header);</div><div class='del'>-</div><div class='del'>-	if (offset + total_size &gt; size) {</div><div class='del'>-		printk(KERN_ERR "microcode: error! Bad data in microcode data file\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*mc = vmalloc(total_size);</div><div class='del'>-	if (!*mc) {</div><div class='del'>-		printk(KERN_ERR "microcode: error! Can not allocate memory\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-	memcpy(*mc, buf + offset, total_size);</div><div class='del'>-	return offset + total_size;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* fake device for request_firmware */</div><div class='del'>-static struct platform_device *microcode_pdev;</div><div class='del'>-</div><div class='del'>-static int cpu_request_microcode(int cpu)</div><div class='del'>-{</div><div class='del'>-	char name[30];</div><div class='del'>-	struct cpuinfo_x86 *c = &amp;cpu_data(cpu);</div><div class='del'>-	const struct firmware *firmware;</div><div class='del'>-	const u8 *buf;</div><div class='del'>-	unsigned long size;</div><div class='del'>-	long offset = 0;</div><div class='del'>-	int error;</div><div class='del'>-	void *mc;</div><div class='del'>-</div><div class='del'>-	/* We should bind the task to the CPU */</div><div class='del'>-	BUG_ON(cpu != raw_smp_processor_id());</div><div class='del'>-	sprintf(name,"intel-ucode/%02x-%02x-%02x",</div><div class='del'>-		c-&gt;x86, c-&gt;x86_model, c-&gt;x86_mask);</div><div class='del'>-	error = request_firmware(&amp;firmware, name, &amp;microcode_pdev-&gt;dev);</div><div class='del'>-	if (error) {</div><div class='del'>-		pr_debug("microcode: data file %s load failed\n", name);</div><div class='del'>-		return error;</div><div class='del'>-	}</div><div class='del'>-	buf = firmware-&gt;data;</div><div class='del'>-	size = firmware-&gt;size;</div><div class='del'>-	while ((offset = get_next_ucode_from_buffer(&amp;mc, buf, size, offset))</div><div class='del'>-			&gt; 0) {</div><div class='del'>-		error = microcode_sanity_check(mc);</div><div class='del'>-		if (error)</div><div class='del'>-			break;</div><div class='del'>-		error = get_maching_microcode(mc, cpu);</div><div class='del'>-		if (error &lt; 0)</div><div class='del'>-			break;</div><div class='del'>-		/*</div><div class='del'>-		 * It's possible the data file has multiple matching ucode,</div><div class='del'>-		 * lets keep searching till the latest version</div><div class='del'>-		 */</div><div class='del'>-		if (error == 1) {</div><div class='del'>-			apply_microcode(cpu);</div><div class='del'>-			error = 0;</div><div class='del'>-		}</div><div class='del'>-		vfree(mc);</div><div class='del'>-	}</div><div class='del'>-	if (offset &gt; 0)</div><div class='del'>-		vfree(mc);</div><div class='del'>-	if (offset &lt; 0)</div><div class='del'>-		error = offset;</div><div class='del'>-	release_firmware(firmware);</div><div class='del'>-</div><div class='del'>-	return error;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int apply_microcode_check_cpu(int cpu)</div><div class='del'>-{</div><div class='del'>-	struct cpuinfo_x86 *c = &amp;cpu_data(cpu);</div><div class='del'>-	struct ucode_cpu_info *uci = ucode_cpu_info + cpu;</div><div class='del'>-	cpumask_t old;</div><div class='del'>-	unsigned int val[2];</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	/* Check if the microcode is available */</div><div class='del'>-	if (!uci-&gt;mc)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	old = current-&gt;cpus_allowed;</div><div class='del'>-	set_cpus_allowed_ptr(current, &amp;cpumask_of_cpu(cpu));</div><div class='del'>-</div><div class='del'>-	/* Check if the microcode we have in memory matches the CPU */</div><div class='del'>-	if (c-&gt;x86_vendor != X86_VENDOR_INTEL || c-&gt;x86 &lt; 6 ||</div><div class='del'>-	    cpu_has(c, X86_FEATURE_IA64) || uci-&gt;sig != cpuid_eax(0x00000001))</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (!err &amp;&amp; ((c-&gt;x86_model &gt;= 5) || (c-&gt;x86 &gt; 6))) {</div><div class='del'>-		/* get processor flags from MSR 0x17 */</div><div class='del'>-		rdmsr(MSR_IA32_PLATFORM_ID, val[0], val[1]);</div><div class='del'>-		if (uci-&gt;pf != (1 &lt;&lt; ((val[1] &gt;&gt; 18) &amp; 7)))</div><div class='del'>-			err = -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!err) {</div><div class='del'>-		wrmsr(MSR_IA32_UCODE_REV, 0, 0);</div><div class='del'>-		/* see notes above for revision 1.07.  Apparent chip bug */</div><div class='del'>-		sync_core();</div><div class='del'>-		/* get the current revision from MSR 0x8B */</div><div class='del'>-		rdmsr(MSR_IA32_UCODE_REV, val[0], val[1]);</div><div class='del'>-		if (uci-&gt;rev != val[1])</div><div class='del'>-			err = -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!err)</div><div class='del'>-		apply_microcode(cpu);</div><div class='del'>-	else</div><div class='del'>-		printk(KERN_ERR "microcode: Could not apply microcode to CPU%d:"</div><div class='del'>-			" sig=0x%x, pf=0x%x, rev=0x%x\n",</div><div class='del'>-			cpu, uci-&gt;sig, uci-&gt;pf, uci-&gt;rev);</div><div class='del'>-</div><div class='del'>-	set_cpus_allowed_ptr(current, &amp;old);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void microcode_init_cpu(int cpu, int resume)</div><div class='del'>-{</div><div class='del'>-	cpumask_t old;</div><div class='del'>-	struct ucode_cpu_info *uci = ucode_cpu_info + cpu;</div><div class='del'>-</div><div class='del'>-	old = current-&gt;cpus_allowed;</div><div class='del'>-</div><div class='del'>-	set_cpus_allowed_ptr(current, &amp;cpumask_of_cpu(cpu));</div><div class='del'>-	mutex_lock(&amp;microcode_mutex);</div><div class='del'>-	collect_cpu_info(cpu);</div><div class='del'>-	if (uci-&gt;valid &amp;&amp; system_state == SYSTEM_RUNNING &amp;&amp; !resume)</div><div class='del'>-		cpu_request_microcode(cpu);</div><div class='del'>-	mutex_unlock(&amp;microcode_mutex);</div><div class='del'>-	set_cpus_allowed_ptr(current, &amp;old);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void microcode_fini_cpu(int cpu)</div><div class='del'>-{</div><div class='del'>-	struct ucode_cpu_info *uci = ucode_cpu_info + cpu;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;microcode_mutex);</div><div class='del'>-	uci-&gt;valid = 0;</div><div class='del'>-	vfree(uci-&gt;mc);</div><div class='del'>-	uci-&gt;mc = NULL;</div><div class='del'>-	mutex_unlock(&amp;microcode_mutex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t reload_store(struct sys_device *dev,</div><div class='del'>-			    struct sysdev_attribute *attr,</div><div class='del'>-			    const char *buf, size_t sz)</div><div class='del'>-{</div><div class='del'>-	struct ucode_cpu_info *uci = ucode_cpu_info + dev-&gt;id;</div><div class='del'>-	char *end;</div><div class='del'>-	unsigned long val = simple_strtoul(buf, &amp;end, 0);</div><div class='del'>-	int err = 0;</div><div class='del'>-	int cpu = dev-&gt;id;</div><div class='del'>-</div><div class='del'>-	if (end == buf)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	if (val == 1) {</div><div class='del'>-		cpumask_t old = current-&gt;cpus_allowed;</div><div class='del'>-</div><div class='del'>-		get_online_cpus();</div><div class='del'>-		set_cpus_allowed_ptr(current, &amp;cpumask_of_cpu(cpu));</div><div class='del'>-</div><div class='del'>-		mutex_lock(&amp;microcode_mutex);</div><div class='del'>-		if (uci-&gt;valid)</div><div class='del'>-			err = cpu_request_microcode(cpu);</div><div class='del'>-		mutex_unlock(&amp;microcode_mutex);</div><div class='del'>-		put_online_cpus();</div><div class='del'>-		set_cpus_allowed_ptr(current, &amp;old);</div><div class='del'>-	}</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-	return sz;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t version_show(struct sys_device *dev,</div><div class='del'>-			struct sysdev_attribute *attr, char *buf)</div><div class='del'>-{</div><div class='del'>-	struct ucode_cpu_info *uci = ucode_cpu_info + dev-&gt;id;</div><div class='del'>-</div><div class='del'>-	return sprintf(buf, "0x%x\n", uci-&gt;rev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t pf_show(struct sys_device *dev,</div><div class='del'>-			struct sysdev_attribute *attr, char *buf)</div><div class='del'>-{</div><div class='del'>-	struct ucode_cpu_info *uci = ucode_cpu_info + dev-&gt;id;</div><div class='del'>-</div><div class='del'>-	return sprintf(buf, "0x%x\n", uci-&gt;pf);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static SYSDEV_ATTR(reload, 0200, NULL, reload_store);</div><div class='del'>-static SYSDEV_ATTR(version, 0400, version_show, NULL);</div><div class='del'>-static SYSDEV_ATTR(processor_flags, 0400, pf_show, NULL);</div><div class='del'>-</div><div class='del'>-static struct attribute *mc_default_attrs[] = {</div><div class='del'>-	&amp;attr_reload.attr,</div><div class='del'>-	&amp;attr_version.attr,</div><div class='del'>-	&amp;attr_processor_flags.attr,</div><div class='del'>-	NULL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct attribute_group mc_attr_group = {</div><div class='del'>-	.attrs = mc_default_attrs,</div><div class='del'>-	.name = "microcode",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __mc_sysdev_add(struct sys_device *sys_dev, int resume)</div><div class='del'>-{</div><div class='del'>-	int err, cpu = sys_dev-&gt;id;</div><div class='del'>-	struct ucode_cpu_info *uci = ucode_cpu_info + cpu;</div><div class='del'>-</div><div class='del'>-	if (!cpu_online(cpu))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	pr_debug("microcode: CPU%d added\n", cpu);</div><div class='del'>-	memset(uci, 0, sizeof(*uci));</div><div class='del'>-</div><div class='del'>-	err = sysfs_create_group(&amp;sys_dev-&gt;kobj, &amp;mc_attr_group);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	microcode_init_cpu(cpu, resume);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mc_sysdev_add(struct sys_device *sys_dev)</div><div class='del'>-{</div><div class='del'>-	return __mc_sysdev_add(sys_dev, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mc_sysdev_remove(struct sys_device *sys_dev)</div><div class='del'>-{</div><div class='del'>-	int cpu = sys_dev-&gt;id;</div><div class='del'>-</div><div class='del'>-	if (!cpu_online(cpu))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	pr_debug("microcode: CPU%d removed\n", cpu);</div><div class='del'>-	microcode_fini_cpu(cpu);</div><div class='del'>-	sysfs_remove_group(&amp;sys_dev-&gt;kobj, &amp;mc_attr_group);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mc_sysdev_resume(struct sys_device *dev)</div><div class='del'>-{</div><div class='del'>-	int cpu = dev-&gt;id;</div><div class='del'>-</div><div class='del'>-	if (!cpu_online(cpu))</div><div class='del'>-		return 0;</div><div class='del'>-	pr_debug("microcode: CPU%d resumed\n", cpu);</div><div class='del'>-	/* only CPU 0 will apply ucode here */</div><div class='del'>-	apply_microcode(0);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct sysdev_driver mc_sysdev_driver = {</div><div class='del'>-	.add = mc_sysdev_add,</div><div class='del'>-	.remove = mc_sysdev_remove,</div><div class='del'>-	.resume = mc_sysdev_resume,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static __cpuinit int</div><div class='del'>-mc_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu)</div><div class='del'>-{</div><div class='del'>-	unsigned int cpu = (unsigned long)hcpu;</div><div class='del'>-	struct sys_device *sys_dev;</div><div class='del'>-</div><div class='del'>-	sys_dev = get_cpu_sysdev(cpu);</div><div class='del'>-	switch (action) {</div><div class='del'>-	case CPU_UP_CANCELED_FROZEN:</div><div class='del'>-		/* The CPU refused to come up during a system resume */</div><div class='del'>-		microcode_fini_cpu(cpu);</div><div class='del'>-		break;</div><div class='del'>-	case CPU_ONLINE:</div><div class='del'>-	case CPU_DOWN_FAILED:</div><div class='del'>-		mc_sysdev_add(sys_dev);</div><div class='del'>-		break;</div><div class='del'>-	case CPU_ONLINE_FROZEN:</div><div class='del'>-		/* System-wide resume is in progress, try to apply microcode */</div><div class='del'>-		if (apply_microcode_check_cpu(cpu)) {</div><div class='del'>-			/* The application of microcode failed */</div><div class='del'>-			microcode_fini_cpu(cpu);</div><div class='del'>-			__mc_sysdev_add(sys_dev, 1);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	case CPU_DOWN_FAILED_FROZEN:</div><div class='del'>-		if (sysfs_create_group(&amp;sys_dev-&gt;kobj, &amp;mc_attr_group))</div><div class='del'>-			printk(KERN_ERR "microcode: Failed to create the sysfs "</div><div class='del'>-				"group for CPU%d\n", cpu);</div><div class='del'>-		break;</div><div class='del'>-	case CPU_DOWN_PREPARE:</div><div class='del'>-		mc_sysdev_remove(sys_dev);</div><div class='del'>-		break;</div><div class='del'>-	case CPU_DOWN_PREPARE_FROZEN:</div><div class='del'>-		/* Suspend is in progress, only remove the interface */</div><div class='del'>-		sysfs_remove_group(&amp;sys_dev-&gt;kobj, &amp;mc_attr_group);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	return NOTIFY_OK;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct notifier_block __refdata mc_cpu_notifier = {</div><div class='del'>-	.notifier_call = mc_cpu_callback,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init microcode_init (void)</div><div class='del'>-{</div><div class='del'>-	int error;</div><div class='del'>-</div><div class='del'>-	printk(KERN_INFO</div><div class='del'>-		"IA-32 Microcode Update Driver: v" MICROCODE_VERSION " &lt;tigran@aivazian.fsnet.co.uk&gt;\n");</div><div class='del'>-</div><div class='del'>-	error = microcode_dev_init();</div><div class='del'>-	if (error)</div><div class='del'>-		return error;</div><div class='del'>-	microcode_pdev = platform_device_register_simple("microcode", -1,</div><div class='del'>-							 NULL, 0);</div><div class='del'>-	if (IS_ERR(microcode_pdev)) {</div><div class='del'>-		microcode_dev_exit();</div><div class='del'>-		return PTR_ERR(microcode_pdev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	get_online_cpus();</div><div class='del'>-	error = sysdev_driver_register(&amp;cpu_sysdev_class, &amp;mc_sysdev_driver);</div><div class='del'>-	put_online_cpus();</div><div class='del'>-	if (error) {</div><div class='del'>-		microcode_dev_exit();</div><div class='del'>-		platform_device_unregister(microcode_pdev);</div><div class='del'>-		return error;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	register_hotcpu_notifier(&amp;mc_cpu_notifier);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit microcode_exit (void)</div><div class='del'>-{</div><div class='del'>-	microcode_dev_exit();</div><div class='del'>-</div><div class='del'>-	unregister_hotcpu_notifier(&amp;mc_cpu_notifier);</div><div class='del'>-</div><div class='del'>-	get_online_cpus();</div><div class='del'>-	sysdev_driver_unregister(&amp;cpu_sysdev_class, &amp;mc_sysdev_driver);</div><div class='del'>-	put_online_cpus();</div><div class='del'>-</div><div class='del'>-	platform_device_unregister(microcode_pdev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(microcode_init)</div><div class='del'>-module_exit(microcode_exit)</div><div class='head'>diff --git a/arch/x86/kernel/microcode_amd.c b/arch/x86/kernel/microcode_amd.c<br/>new file mode 100644<br/>index 000000000000..7a1f8eeac2c7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/microcode_amd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/microcode_amd.c</a></div><div class='hunk'>@@ -0,0 +1,435 @@</div><div class='add'>+/*</div><div class='add'>+ *  AMD CPU Microcode Update Driver for Linux</div><div class='add'>+ *  Copyright (C) 2008 Advanced Micro Devices Inc.</div><div class='add'>+ *</div><div class='add'>+ *  Author: Peter Oruba &lt;peter.oruba@amd.com&gt;</div><div class='add'>+ *</div><div class='add'>+ *  Based on work by:</div><div class='add'>+ *  Tigran Aivazian &lt;tigran@aivazian.fsnet.co.uk&gt;</div><div class='add'>+ *</div><div class='add'>+ *  This driver allows to upgrade microcode on AMD</div><div class='add'>+ *  family 0x10 and 0x11 processors.</div><div class='add'>+ *</div><div class='add'>+ *  Licensed unter the terms of the GNU General Public</div><div class='add'>+ *  License version 2. See file COPYING for details.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#include &lt;linux/capability.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/cpumask.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/vmalloc.h&gt;</div><div class='add'>+#include &lt;linux/miscdevice.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/cpu.h&gt;</div><div class='add'>+#include &lt;linux/firmware.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/pci_ids.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/msr.h&gt;</div><div class='add'>+#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;asm/processor.h&gt;</div><div class='add'>+#include &lt;asm/microcode.h&gt;</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("AMD Microcode Update Driver");</div><div class='add'>+MODULE_AUTHOR("Peter Oruba &lt;peter.oruba@amd.com&gt;");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='add'>+</div><div class='add'>+#define UCODE_MAGIC                0x00414d44</div><div class='add'>+#define UCODE_EQUIV_CPU_TABLE_TYPE 0x00000000</div><div class='add'>+#define UCODE_UCODE_TYPE           0x00000001</div><div class='add'>+</div><div class='add'>+struct equiv_cpu_entry {</div><div class='add'>+	unsigned int installed_cpu;</div><div class='add'>+	unsigned int fixed_errata_mask;</div><div class='add'>+	unsigned int fixed_errata_compare;</div><div class='add'>+	unsigned int equiv_cpu;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct microcode_header_amd {</div><div class='add'>+	unsigned int  data_code;</div><div class='add'>+	unsigned int  patch_id;</div><div class='add'>+	unsigned char mc_patch_data_id[2];</div><div class='add'>+	unsigned char mc_patch_data_len;</div><div class='add'>+	unsigned char init_flag;</div><div class='add'>+	unsigned int  mc_patch_data_checksum;</div><div class='add'>+	unsigned int  nb_dev_id;</div><div class='add'>+	unsigned int  sb_dev_id;</div><div class='add'>+	unsigned char processor_rev_id[2];</div><div class='add'>+	unsigned char nb_rev_id;</div><div class='add'>+	unsigned char sb_rev_id;</div><div class='add'>+	unsigned char bios_api_rev;</div><div class='add'>+	unsigned char reserved1[3];</div><div class='add'>+	unsigned int  match_reg[8];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct microcode_amd {</div><div class='add'>+	struct microcode_header_amd hdr;</div><div class='add'>+	unsigned int mpb[0];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define UCODE_MAX_SIZE          (2048)</div><div class='add'>+#define DEFAULT_UCODE_DATASIZE	(896)</div><div class='add'>+#define MC_HEADER_SIZE		(sizeof(struct microcode_header_amd))</div><div class='add'>+#define DEFAULT_UCODE_TOTALSIZE (DEFAULT_UCODE_DATASIZE + MC_HEADER_SIZE)</div><div class='add'>+#define DWSIZE			(sizeof(u32))</div><div class='add'>+/* For now we support a fixed ucode total size only */</div><div class='add'>+#define get_totalsize(mc) \</div><div class='add'>+	((((struct microcode_amd *)mc)-&gt;hdr.mc_patch_data_len * 28) \</div><div class='add'>+	 + MC_HEADER_SIZE)</div><div class='add'>+</div><div class='add'>+/* serialize access to the physical write */</div><div class='add'>+static DEFINE_SPINLOCK(microcode_update_lock);</div><div class='add'>+</div><div class='add'>+static struct equiv_cpu_entry *equiv_cpu_table;</div><div class='add'>+</div><div class='add'>+static int collect_cpu_info_amd(int cpu, struct cpu_signature *csig)</div><div class='add'>+{</div><div class='add'>+	struct cpuinfo_x86 *c = &amp;cpu_data(cpu);</div><div class='add'>+</div><div class='add'>+	memset(csig, 0, sizeof(*csig));</div><div class='add'>+</div><div class='add'>+	if (c-&gt;x86_vendor != X86_VENDOR_AMD || c-&gt;x86 &lt; 0x10) {</div><div class='add'>+		printk(KERN_ERR "microcode: CPU%d not a capable AMD processor\n",</div><div class='add'>+		       cpu);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	asm volatile("movl %1, %%ecx; rdmsr"</div><div class='add'>+		     : "=a" (csig-&gt;rev)</div><div class='add'>+		     : "i" (0x0000008B) : "ecx");</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "microcode: collect_cpu_info_amd : patch_id=0x%x\n",</div><div class='add'>+		csig-&gt;rev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int get_matching_microcode(int cpu, void *mc, int rev)</div><div class='add'>+{</div><div class='add'>+	struct microcode_header_amd *mc_header = mc;</div><div class='add'>+	struct pci_dev *nb_pci_dev, *sb_pci_dev;</div><div class='add'>+	unsigned int current_cpu_id;</div><div class='add'>+	unsigned int equiv_cpu_id = 0x00;</div><div class='add'>+	unsigned int i = 0;</div><div class='add'>+</div><div class='add'>+	BUG_ON(equiv_cpu_table == NULL);</div><div class='add'>+	current_cpu_id = cpuid_eax(0x00000001);</div><div class='add'>+</div><div class='add'>+	while (equiv_cpu_table[i].installed_cpu != 0) {</div><div class='add'>+		if (current_cpu_id == equiv_cpu_table[i].installed_cpu) {</div><div class='add'>+			equiv_cpu_id = equiv_cpu_table[i].equiv_cpu;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		i++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!equiv_cpu_id) {</div><div class='add'>+		printk(KERN_ERR "microcode: CPU%d cpu_id "</div><div class='add'>+		       "not found in equivalent cpu table \n", cpu);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((mc_header-&gt;processor_rev_id[0]) != (equiv_cpu_id &amp; 0xff)) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+			"microcode: CPU%d patch does not match "</div><div class='add'>+			"(patch is %x, cpu extended is %x) \n",</div><div class='add'>+			cpu, mc_header-&gt;processor_rev_id[0],</div><div class='add'>+			(equiv_cpu_id &amp; 0xff));</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((mc_header-&gt;processor_rev_id[1]) != ((equiv_cpu_id &gt;&gt; 16) &amp; 0xff)) {</div><div class='add'>+		printk(KERN_ERR "microcode: CPU%d patch does not match "</div><div class='add'>+			"(patch is %x, cpu base id is %x) \n",</div><div class='add'>+			cpu, mc_header-&gt;processor_rev_id[1],</div><div class='add'>+			((equiv_cpu_id &gt;&gt; 16) &amp; 0xff));</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* ucode may be northbridge specific */</div><div class='add'>+	if (mc_header-&gt;nb_dev_id) {</div><div class='add'>+		nb_pci_dev = pci_get_device(PCI_VENDOR_ID_AMD,</div><div class='add'>+					    (mc_header-&gt;nb_dev_id &amp; 0xff),</div><div class='add'>+					    NULL);</div><div class='add'>+		if ((!nb_pci_dev) ||</div><div class='add'>+		    (mc_header-&gt;nb_rev_id != nb_pci_dev-&gt;revision)) {</div><div class='add'>+			printk(KERN_ERR "microcode: CPU%d NB mismatch \n", cpu);</div><div class='add'>+			pci_dev_put(nb_pci_dev);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+		pci_dev_put(nb_pci_dev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* ucode may be southbridge specific */</div><div class='add'>+	if (mc_header-&gt;sb_dev_id) {</div><div class='add'>+		sb_pci_dev = pci_get_device(PCI_VENDOR_ID_AMD,</div><div class='add'>+					    (mc_header-&gt;sb_dev_id &amp; 0xff),</div><div class='add'>+					    NULL);</div><div class='add'>+		if ((!sb_pci_dev) ||</div><div class='add'>+		    (mc_header-&gt;sb_rev_id != sb_pci_dev-&gt;revision)) {</div><div class='add'>+			printk(KERN_ERR "microcode: CPU%d SB mismatch \n", cpu);</div><div class='add'>+			pci_dev_put(sb_pci_dev);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+		pci_dev_put(sb_pci_dev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (mc_header-&gt;patch_id &lt;= rev)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void apply_microcode_amd(int cpu)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	unsigned int eax, edx;</div><div class='add'>+	unsigned int rev;</div><div class='add'>+	int cpu_num = raw_smp_processor_id();</div><div class='add'>+	struct ucode_cpu_info *uci = ucode_cpu_info + cpu_num;</div><div class='add'>+	struct microcode_amd *mc_amd = uci-&gt;mc;</div><div class='add'>+	unsigned long addr;</div><div class='add'>+</div><div class='add'>+	/* We should bind the task to the CPU */</div><div class='add'>+	BUG_ON(cpu_num != cpu);</div><div class='add'>+</div><div class='add'>+	if (mc_amd == NULL)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;microcode_update_lock, flags);</div><div class='add'>+</div><div class='add'>+	addr = (unsigned long)&amp;mc_amd-&gt;hdr.data_code;</div><div class='add'>+	edx = (unsigned int)(((unsigned long)upper_32_bits(addr)));</div><div class='add'>+	eax = (unsigned int)(((unsigned long)lower_32_bits(addr)));</div><div class='add'>+</div><div class='add'>+	asm volatile("movl %0, %%ecx; wrmsr" :</div><div class='add'>+		     : "i" (0xc0010020), "a" (eax), "d" (edx) : "ecx");</div><div class='add'>+</div><div class='add'>+	/* get patch id after patching */</div><div class='add'>+	asm volatile("movl %1, %%ecx; rdmsr"</div><div class='add'>+		     : "=a" (rev)</div><div class='add'>+		     : "i" (0x0000008B) : "ecx");</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;microcode_update_lock, flags);</div><div class='add'>+</div><div class='add'>+	/* check current patch id and patch's id for match */</div><div class='add'>+	if (rev != mc_amd-&gt;hdr.patch_id) {</div><div class='add'>+		printk(KERN_ERR "microcode: CPU%d update from revision "</div><div class='add'>+		       "0x%x to 0x%x failed\n", cpu_num,</div><div class='add'>+		       mc_amd-&gt;hdr.patch_id, rev);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "microcode: CPU%d updated from revision "</div><div class='add'>+	       "0x%x to 0x%x \n",</div><div class='add'>+	       cpu_num, uci-&gt;cpu_sig.rev, mc_amd-&gt;hdr.patch_id);</div><div class='add'>+</div><div class='add'>+	uci-&gt;cpu_sig.rev = rev;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void * get_next_ucode(u8 *buf, unsigned int size,</div><div class='add'>+			int (*get_ucode_data)(void *, const void *, size_t),</div><div class='add'>+			unsigned int *mc_size)</div><div class='add'>+{</div><div class='add'>+	unsigned int total_size;</div><div class='add'>+#define UCODE_CONTAINER_SECTION_HDR	8</div><div class='add'>+	u8 section_hdr[UCODE_CONTAINER_SECTION_HDR];</div><div class='add'>+	void *mc;</div><div class='add'>+</div><div class='add'>+	if (get_ucode_data(section_hdr, buf, UCODE_CONTAINER_SECTION_HDR))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	if (section_hdr[0] != UCODE_UCODE_TYPE) {</div><div class='add'>+		printk(KERN_ERR "microcode: error! "</div><div class='add'>+		       "Wrong microcode payload type field\n");</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	total_size = (unsigned long) (section_hdr[4] + (section_hdr[5] &lt;&lt; 8));</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "microcode: size %u, total_size %u\n",</div><div class='add'>+		size, total_size);</div><div class='add'>+</div><div class='add'>+	if (total_size &gt; size || total_size &gt; UCODE_MAX_SIZE) {</div><div class='add'>+		printk(KERN_ERR "microcode: error! Bad data in microcode data file\n");</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mc = vmalloc(UCODE_MAX_SIZE);</div><div class='add'>+	if (mc) {</div><div class='add'>+		memset(mc, 0, UCODE_MAX_SIZE);</div><div class='add'>+		if (get_ucode_data(mc, buf + UCODE_CONTAINER_SECTION_HDR, total_size)) {</div><div class='add'>+			vfree(mc);</div><div class='add'>+			mc = NULL;</div><div class='add'>+		} else</div><div class='add'>+			*mc_size = total_size + UCODE_CONTAINER_SECTION_HDR;</div><div class='add'>+	}</div><div class='add'>+#undef UCODE_CONTAINER_SECTION_HDR</div><div class='add'>+	return mc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int install_equiv_cpu_table(u8 *buf,</div><div class='add'>+		int (*get_ucode_data)(void *, const void *, size_t))</div><div class='add'>+{</div><div class='add'>+#define UCODE_CONTAINER_HEADER_SIZE	12</div><div class='add'>+	u8 *container_hdr[UCODE_CONTAINER_HEADER_SIZE];</div><div class='add'>+	unsigned int *buf_pos = (unsigned int *)container_hdr;</div><div class='add'>+	unsigned long size;</div><div class='add'>+</div><div class='add'>+	if (get_ucode_data(&amp;container_hdr, buf, UCODE_CONTAINER_HEADER_SIZE))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	size = buf_pos[2];</div><div class='add'>+</div><div class='add'>+	if (buf_pos[1] != UCODE_EQUIV_CPU_TABLE_TYPE || !size) {</div><div class='add'>+		printk(KERN_ERR "microcode: error! "</div><div class='add'>+		       "Wrong microcode equivalnet cpu table\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	equiv_cpu_table = (struct equiv_cpu_entry *) vmalloc(size);</div><div class='add'>+	if (!equiv_cpu_table) {</div><div class='add'>+		printk(KERN_ERR "microcode: error, can't allocate memory for equiv CPU table\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	buf += UCODE_CONTAINER_HEADER_SIZE;</div><div class='add'>+	if (get_ucode_data(equiv_cpu_table, buf, size)) {</div><div class='add'>+		vfree(equiv_cpu_table);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return size + UCODE_CONTAINER_HEADER_SIZE; /* add header length */</div><div class='add'>+#undef UCODE_CONTAINER_HEADER_SIZE</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void free_equiv_cpu_table(void)</div><div class='add'>+{</div><div class='add'>+	if (equiv_cpu_table) {</div><div class='add'>+		vfree(equiv_cpu_table);</div><div class='add'>+		equiv_cpu_table = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int generic_load_microcode(int cpu, void *data, size_t size,</div><div class='add'>+		int (*get_ucode_data)(void *, const void *, size_t))</div><div class='add'>+{</div><div class='add'>+	struct ucode_cpu_info *uci = ucode_cpu_info + cpu;</div><div class='add'>+	u8 *ucode_ptr = data, *new_mc = NULL, *mc;</div><div class='add'>+	int new_rev = uci-&gt;cpu_sig.rev;</div><div class='add'>+	unsigned int leftover;</div><div class='add'>+	unsigned long offset;</div><div class='add'>+</div><div class='add'>+	offset = install_equiv_cpu_table(ucode_ptr, get_ucode_data);</div><div class='add'>+	if (!offset) {</div><div class='add'>+		printk(KERN_ERR "microcode: installing equivalent cpu table failed\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ucode_ptr += offset;</div><div class='add'>+	leftover = size - offset;</div><div class='add'>+</div><div class='add'>+	while (leftover) {</div><div class='add'>+		unsigned int uninitialized_var(mc_size);</div><div class='add'>+		struct microcode_header_amd *mc_header;</div><div class='add'>+</div><div class='add'>+		mc = get_next_ucode(ucode_ptr, leftover, get_ucode_data, &amp;mc_size);</div><div class='add'>+		if (!mc)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		mc_header = (struct microcode_header_amd *)mc;</div><div class='add'>+		if (get_matching_microcode(cpu, mc, new_rev)) {</div><div class='add'>+			if (new_mc)</div><div class='add'>+				vfree(new_mc);</div><div class='add'>+			new_rev = mc_header-&gt;patch_id;</div><div class='add'>+			new_mc  = mc;</div><div class='add'>+		} else </div><div class='add'>+			vfree(mc);</div><div class='add'>+</div><div class='add'>+		ucode_ptr += mc_size;</div><div class='add'>+		leftover  -= mc_size;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (new_mc) {</div><div class='add'>+		if (!leftover) {</div><div class='add'>+			if (uci-&gt;mc)</div><div class='add'>+				vfree(uci-&gt;mc);</div><div class='add'>+			uci-&gt;mc = new_mc;</div><div class='add'>+			pr_debug("microcode: CPU%d found a matching microcode update with"</div><div class='add'>+				" version 0x%x (current=0x%x)\n",</div><div class='add'>+				cpu, new_rev, uci-&gt;cpu_sig.rev);</div><div class='add'>+		} else</div><div class='add'>+			vfree(new_mc);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	free_equiv_cpu_table();</div><div class='add'>+</div><div class='add'>+	return (int)leftover;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int get_ucode_fw(void *to, const void *from, size_t n)</div><div class='add'>+{</div><div class='add'>+	memcpy(to, from, n);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int request_microcode_fw(int cpu, struct device *device)</div><div class='add'>+{</div><div class='add'>+	const char *fw_name = "amd-ucode/microcode_amd.bin";</div><div class='add'>+	const struct firmware *firmware;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* We should bind the task to the CPU */</div><div class='add'>+	BUG_ON(cpu != raw_smp_processor_id());</div><div class='add'>+</div><div class='add'>+	ret = request_firmware(&amp;firmware, fw_name, device);</div><div class='add'>+	if (ret) {</div><div class='add'>+		printk(KERN_ERR "microcode: ucode data file %s load failed\n", fw_name);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = generic_load_microcode(cpu, (void*)firmware-&gt;data, firmware-&gt;size,</div><div class='add'>+			&amp;get_ucode_fw);</div><div class='add'>+</div><div class='add'>+	release_firmware(firmware);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int request_microcode_user(int cpu, const void __user *buf, size_t size)</div><div class='add'>+{</div><div class='add'>+	printk(KERN_WARNING "microcode: AMD microcode update via /dev/cpu/microcode"</div><div class='add'>+			"is not supported\n");</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void microcode_fini_cpu_amd(int cpu)</div><div class='add'>+{</div><div class='add'>+	struct ucode_cpu_info *uci = ucode_cpu_info + cpu;</div><div class='add'>+</div><div class='add'>+	vfree(uci-&gt;mc);</div><div class='add'>+	uci-&gt;mc = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct microcode_ops microcode_amd_ops = {</div><div class='add'>+	.request_microcode_user           = request_microcode_user,</div><div class='add'>+	.request_microcode_fw             = request_microcode_fw,</div><div class='add'>+	.collect_cpu_info                 = collect_cpu_info_amd,</div><div class='add'>+	.apply_microcode                  = apply_microcode_amd,</div><div class='add'>+	.microcode_fini_cpu               = microcode_fini_cpu_amd,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct microcode_ops * __init init_amd_microcode(void)</div><div class='add'>+{</div><div class='add'>+	return &amp;microcode_amd_ops;</div><div class='add'>+}</div><div class='head'>diff --git a/arch/x86/kernel/microcode_core.c b/arch/x86/kernel/microcode_core.c<br/>new file mode 100644<br/>index 000000000000..936d8d55f230<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/microcode_core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/microcode_core.c</a></div><div class='hunk'>@@ -0,0 +1,508 @@</div><div class='add'>+/*</div><div class='add'>+ *	Intel CPU Microcode Update Driver for Linux</div><div class='add'>+ *</div><div class='add'>+ *	Copyright (C) 2000-2006 Tigran Aivazian &lt;tigran@aivazian.fsnet.co.uk&gt;</div><div class='add'>+ *		      2006	Shaohua Li &lt;shaohua.li@intel.com&gt;</div><div class='add'>+ *</div><div class='add'>+ *	This driver allows to upgrade microcode on Intel processors</div><div class='add'>+ *	belonging to IA-32 family - PentiumPro, Pentium II,</div><div class='add'>+ *	Pentium III, Xeon, Pentium 4, etc.</div><div class='add'>+ *</div><div class='add'>+ *	Reference: Section 8.11 of Volume 3a, IA-32 Intel? Architecture</div><div class='add'>+ *	Software Developer's Manual</div><div class='add'>+ *	Order Number 253668 or free download from:</div><div class='add'>+ *</div><div class='add'>+ *	http://developer.intel.com/design/pentium4/manuals/253668.htm</div><div class='add'>+ *</div><div class='add'>+ *	For more information, go to http://www.urbanmyth.org/microcode</div><div class='add'>+ *</div><div class='add'>+ *	This program is free software; you can redistribute it and/or</div><div class='add'>+ *	modify it under the terms of the GNU General Public License</div><div class='add'>+ *	as published by the Free Software Foundation; either version</div><div class='add'>+ *	2 of the License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *	1.0	16 Feb 2000, Tigran Aivazian &lt;tigran@sco.com&gt;</div><div class='add'>+ *		Initial release.</div><div class='add'>+ *	1.01	18 Feb 2000, Tigran Aivazian &lt;tigran@sco.com&gt;</div><div class='add'>+ *		Added read() support + cleanups.</div><div class='add'>+ *	1.02	21 Feb 2000, Tigran Aivazian &lt;tigran@sco.com&gt;</div><div class='add'>+ *		Added 'device trimming' support. open(O_WRONLY) zeroes</div><div class='add'>+ *		and frees the saved copy of applied microcode.</div><div class='add'>+ *	1.03	29 Feb 2000, Tigran Aivazian &lt;tigran@sco.com&gt;</div><div class='add'>+ *		Made to use devfs (/dev/cpu/microcode) + cleanups.</div><div class='add'>+ *	1.04	06 Jun 2000, Simon Trimmer &lt;simon@veritas.com&gt;</div><div class='add'>+ *		Added misc device support (now uses both devfs and misc).</div><div class='add'>+ *		Added MICROCODE_IOCFREE ioctl to clear memory.</div><div class='add'>+ *	1.05	09 Jun 2000, Simon Trimmer &lt;simon@veritas.com&gt;</div><div class='add'>+ *		Messages for error cases (non Intel &amp; no suitable microcode).</div><div class='add'>+ *	1.06	03 Aug 2000, Tigran Aivazian &lt;tigran@veritas.com&gt;</div><div class='add'>+ *		Removed -&gt;release(). Removed exclusive open and status bitmap.</div><div class='add'>+ *		Added microcode_rwsem to serialize read()/write()/ioctl().</div><div class='add'>+ *		Removed global kernel lock usage.</div><div class='add'>+ *	1.07	07 Sep 2000, Tigran Aivazian &lt;tigran@veritas.com&gt;</div><div class='add'>+ *		Write 0 to 0x8B msr and then cpuid before reading revision,</div><div class='add'>+ *		so that it works even if there were no update done by the</div><div class='add'>+ *		BIOS. Otherwise, reading from 0x8B gives junk (which happened</div><div class='add'>+ *		to be 0 on my machine which is why it worked even when I</div><div class='add'>+ *		disabled update by the BIOS)</div><div class='add'>+ *		Thanks to Eric W. Biederman &lt;ebiederman@lnxi.com&gt; for the fix.</div><div class='add'>+ *	1.08	11 Dec 2000, Richard Schaal &lt;richard.schaal@intel.com&gt; and</div><div class='add'>+ *			     Tigran Aivazian &lt;tigran@veritas.com&gt;</div><div class='add'>+ *		Intel Pentium 4 processor support and bugfixes.</div><div class='add'>+ *	1.09	30 Oct 2001, Tigran Aivazian &lt;tigran@veritas.com&gt;</div><div class='add'>+ *		Bugfix for HT (Hyper-Threading) enabled processors</div><div class='add'>+ *		whereby processor resources are shared by all logical processors</div><div class='add'>+ *		in a single CPU package.</div><div class='add'>+ *	1.10	28 Feb 2002 Asit K Mallick &lt;asit.k.mallick@intel.com&gt; and</div><div class='add'>+ *		Tigran Aivazian &lt;tigran@veritas.com&gt;,</div><div class='add'>+ *		Serialize updates as required on HT processors due to</div><div class='add'>+ *		speculative nature of implementation.</div><div class='add'>+ *	1.11	22 Mar 2002 Tigran Aivazian &lt;tigran@veritas.com&gt;</div><div class='add'>+ *		Fix the panic when writing zero-length microcode chunk.</div><div class='add'>+ *	1.12	29 Sep 2003 Nitin Kamble &lt;nitin.a.kamble@intel.com&gt;,</div><div class='add'>+ *		Jun Nakajima &lt;jun.nakajima@intel.com&gt;</div><div class='add'>+ *		Support for the microcode updates in the new format.</div><div class='add'>+ *	1.13	10 Oct 2003 Tigran Aivazian &lt;tigran@veritas.com&gt;</div><div class='add'>+ *		Removed -&gt;read() method and obsoleted MICROCODE_IOCFREE ioctl</div><div class='add'>+ *		because we no longer hold a copy of applied microcode</div><div class='add'>+ *		in kernel memory.</div><div class='add'>+ *	1.14	25 Jun 2004 Tigran Aivazian &lt;tigran@veritas.com&gt;</div><div class='add'>+ *		Fix sigmatch() macro to handle old CPUs with pf == 0.</div><div class='add'>+ *		Thanks to Stuart Swales for pointing out this bug.</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/capability.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/smp_lock.h&gt;</div><div class='add'>+#include &lt;linux/cpumask.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/vmalloc.h&gt;</div><div class='add'>+#include &lt;linux/miscdevice.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/cpu.h&gt;</div><div class='add'>+#include &lt;linux/firmware.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/msr.h&gt;</div><div class='add'>+#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;asm/processor.h&gt;</div><div class='add'>+#include &lt;asm/microcode.h&gt;</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("Microcode Update Driver");</div><div class='add'>+MODULE_AUTHOR("Tigran Aivazian &lt;tigran@aivazian.fsnet.co.uk&gt;");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='add'>+#define MICROCODE_VERSION 	"2.00"</div><div class='add'>+</div><div class='add'>+struct microcode_ops *microcode_ops;</div><div class='add'>+</div><div class='add'>+/* no concurrent -&gt;write()s are allowed on /dev/cpu/microcode */</div><div class='add'>+static DEFINE_MUTEX(microcode_mutex);</div><div class='add'>+</div><div class='add'>+struct ucode_cpu_info ucode_cpu_info[NR_CPUS];</div><div class='add'>+EXPORT_SYMBOL_GPL(ucode_cpu_info);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_MICROCODE_OLD_INTERFACE</div><div class='add'>+static int do_microcode_update(const void __user *buf, size_t size)</div><div class='add'>+{</div><div class='add'>+	cpumask_t old;</div><div class='add'>+	int error = 0;</div><div class='add'>+	int cpu;</div><div class='add'>+</div><div class='add'>+	old = current-&gt;cpus_allowed;</div><div class='add'>+</div><div class='add'>+	for_each_online_cpu(cpu) {</div><div class='add'>+		struct ucode_cpu_info *uci = ucode_cpu_info + cpu;</div><div class='add'>+</div><div class='add'>+		if (!uci-&gt;valid)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		set_cpus_allowed_ptr(current, &amp;cpumask_of_cpu(cpu));</div><div class='add'>+		error = microcode_ops-&gt;request_microcode_user(cpu, buf, size);</div><div class='add'>+		if (error &lt; 0)</div><div class='add'>+			goto out;</div><div class='add'>+		if (!error)</div><div class='add'>+			microcode_ops-&gt;apply_microcode(cpu);</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	set_cpus_allowed_ptr(current, &amp;old);</div><div class='add'>+	return error;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int microcode_open(struct inode *unused1, struct file *unused2)</div><div class='add'>+{</div><div class='add'>+	cycle_kernel_lock();</div><div class='add'>+	return capable(CAP_SYS_RAWIO) ? 0 : -EPERM;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t microcode_write(struct file *file, const char __user *buf,</div><div class='add'>+			       size_t len, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	ssize_t ret;</div><div class='add'>+</div><div class='add'>+	if ((len &gt;&gt; PAGE_SHIFT) &gt; num_physpages) {</div><div class='add'>+		printk(KERN_ERR "microcode: too much data (max %ld pages)\n",</div><div class='add'>+		       num_physpages);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	get_online_cpus();</div><div class='add'>+	mutex_lock(&amp;microcode_mutex);</div><div class='add'>+</div><div class='add'>+	ret = do_microcode_update(buf, len);</div><div class='add'>+	if (!ret)</div><div class='add'>+		ret = (ssize_t)len;</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;microcode_mutex);</div><div class='add'>+	put_online_cpus();</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations microcode_fops = {</div><div class='add'>+	.owner		= THIS_MODULE,</div><div class='add'>+	.write		= microcode_write,</div><div class='add'>+	.open		= microcode_open,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct miscdevice microcode_dev = {</div><div class='add'>+	.minor		= MICROCODE_MINOR,</div><div class='add'>+	.name		= "microcode",</div><div class='add'>+	.fops		= &amp;microcode_fops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init microcode_dev_init(void)</div><div class='add'>+{</div><div class='add'>+	int error;</div><div class='add'>+</div><div class='add'>+	error = misc_register(&amp;microcode_dev);</div><div class='add'>+	if (error) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+			"microcode: can't misc_register on minor=%d\n",</div><div class='add'>+			MICROCODE_MINOR);</div><div class='add'>+		return error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void microcode_dev_exit(void)</div><div class='add'>+{</div><div class='add'>+	misc_deregister(&amp;microcode_dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+MODULE_ALIAS_MISCDEV(MICROCODE_MINOR);</div><div class='add'>+#else</div><div class='add'>+#define microcode_dev_init() 0</div><div class='add'>+#define microcode_dev_exit() do { } while (0)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* fake device for request_firmware */</div><div class='add'>+struct platform_device *microcode_pdev;</div><div class='add'>+</div><div class='add'>+static ssize_t reload_store(struct sys_device *dev,</div><div class='add'>+			    struct sysdev_attribute *attr,</div><div class='add'>+			    const char *buf, size_t sz)</div><div class='add'>+{</div><div class='add'>+	struct ucode_cpu_info *uci = ucode_cpu_info + dev-&gt;id;</div><div class='add'>+	char *end;</div><div class='add'>+	unsigned long val = simple_strtoul(buf, &amp;end, 0);</div><div class='add'>+	int err = 0;</div><div class='add'>+	int cpu = dev-&gt;id;</div><div class='add'>+</div><div class='add'>+	if (end == buf)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (val == 1) {</div><div class='add'>+		cpumask_t old = current-&gt;cpus_allowed;</div><div class='add'>+</div><div class='add'>+		get_online_cpus();</div><div class='add'>+		if (cpu_online(cpu)) {</div><div class='add'>+			set_cpus_allowed_ptr(current, &amp;cpumask_of_cpu(cpu));</div><div class='add'>+			mutex_lock(&amp;microcode_mutex);</div><div class='add'>+			if (uci-&gt;valid) {</div><div class='add'>+				err = microcode_ops-&gt;request_microcode_fw(cpu,</div><div class='add'>+						&amp;microcode_pdev-&gt;dev);</div><div class='add'>+				if (!err)</div><div class='add'>+					microcode_ops-&gt;apply_microcode(cpu);</div><div class='add'>+			}</div><div class='add'>+			mutex_unlock(&amp;microcode_mutex);</div><div class='add'>+			set_cpus_allowed_ptr(current, &amp;old);</div><div class='add'>+		}</div><div class='add'>+		put_online_cpus();</div><div class='add'>+	}</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+	return sz;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t version_show(struct sys_device *dev,</div><div class='add'>+			struct sysdev_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct ucode_cpu_info *uci = ucode_cpu_info + dev-&gt;id;</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "0x%x\n", uci-&gt;cpu_sig.rev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t pf_show(struct sys_device *dev,</div><div class='add'>+			struct sysdev_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct ucode_cpu_info *uci = ucode_cpu_info + dev-&gt;id;</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "0x%x\n", uci-&gt;cpu_sig.pf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static SYSDEV_ATTR(reload, 0200, NULL, reload_store);</div><div class='add'>+static SYSDEV_ATTR(version, 0400, version_show, NULL);</div><div class='add'>+static SYSDEV_ATTR(processor_flags, 0400, pf_show, NULL);</div><div class='add'>+</div><div class='add'>+static struct attribute *mc_default_attrs[] = {</div><div class='add'>+	&amp;attr_reload.attr,</div><div class='add'>+	&amp;attr_version.attr,</div><div class='add'>+	&amp;attr_processor_flags.attr,</div><div class='add'>+	NULL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct attribute_group mc_attr_group = {</div><div class='add'>+	.attrs = mc_default_attrs,</div><div class='add'>+	.name = "microcode",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void microcode_fini_cpu(int cpu)</div><div class='add'>+{</div><div class='add'>+	struct ucode_cpu_info *uci = ucode_cpu_info + cpu;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;microcode_mutex);</div><div class='add'>+	microcode_ops-&gt;microcode_fini_cpu(cpu);</div><div class='add'>+	uci-&gt;valid = 0;</div><div class='add'>+	mutex_unlock(&amp;microcode_mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void collect_cpu_info(int cpu)</div><div class='add'>+{</div><div class='add'>+	struct ucode_cpu_info *uci = ucode_cpu_info + cpu;</div><div class='add'>+</div><div class='add'>+	memset(uci, 0, sizeof(*uci));</div><div class='add'>+	if (!microcode_ops-&gt;collect_cpu_info(cpu, &amp;uci-&gt;cpu_sig))</div><div class='add'>+		uci-&gt;valid = 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int microcode_resume_cpu(int cpu)</div><div class='add'>+{</div><div class='add'>+	struct ucode_cpu_info *uci = ucode_cpu_info + cpu;</div><div class='add'>+	struct cpu_signature nsig;</div><div class='add'>+</div><div class='add'>+	pr_debug("microcode: CPU%d resumed\n", cpu);</div><div class='add'>+</div><div class='add'>+	if (!uci-&gt;mc)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Let's verify that the 'cached' ucode does belong</div><div class='add'>+	 * to this cpu (a bit of paranoia):</div><div class='add'>+	 */</div><div class='add'>+	if (microcode_ops-&gt;collect_cpu_info(cpu, &amp;nsig)) {</div><div class='add'>+		microcode_fini_cpu(cpu);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (memcmp(&amp;nsig, &amp;uci-&gt;cpu_sig, sizeof(nsig))) {</div><div class='add'>+		microcode_fini_cpu(cpu);</div><div class='add'>+		/* Should we look for a new ucode here? */</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void microcode_update_cpu(int cpu)</div><div class='add'>+{</div><div class='add'>+	struct ucode_cpu_info *uci = ucode_cpu_info + cpu;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Check if the system resume is in progress (uci-&gt;valid != NULL),</div><div class='add'>+	 * otherwise just request a firmware:</div><div class='add'>+	 */</div><div class='add'>+	if (uci-&gt;valid) {</div><div class='add'>+		err = microcode_resume_cpu(cpu);</div><div class='add'>+	} else {	</div><div class='add'>+		collect_cpu_info(cpu);</div><div class='add'>+		if (uci-&gt;valid &amp;&amp; system_state == SYSTEM_RUNNING)</div><div class='add'>+			err = microcode_ops-&gt;request_microcode_fw(cpu,</div><div class='add'>+					&amp;microcode_pdev-&gt;dev);</div><div class='add'>+	}</div><div class='add'>+	if (!err)</div><div class='add'>+		microcode_ops-&gt;apply_microcode(cpu);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void microcode_init_cpu(int cpu)</div><div class='add'>+{</div><div class='add'>+	cpumask_t old = current-&gt;cpus_allowed;</div><div class='add'>+</div><div class='add'>+	set_cpus_allowed_ptr(current, &amp;cpumask_of_cpu(cpu));</div><div class='add'>+	/* We should bind the task to the CPU */</div><div class='add'>+	BUG_ON(raw_smp_processor_id() != cpu);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;microcode_mutex);</div><div class='add'>+	microcode_update_cpu(cpu);</div><div class='add'>+	mutex_unlock(&amp;microcode_mutex);</div><div class='add'>+</div><div class='add'>+	set_cpus_allowed_ptr(current, &amp;old);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mc_sysdev_add(struct sys_device *sys_dev)</div><div class='add'>+{</div><div class='add'>+	int err, cpu = sys_dev-&gt;id;</div><div class='add'>+	struct ucode_cpu_info *uci = ucode_cpu_info + cpu;</div><div class='add'>+</div><div class='add'>+	if (!cpu_online(cpu))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	pr_debug("microcode: CPU%d added\n", cpu);</div><div class='add'>+	memset(uci, 0, sizeof(*uci));</div><div class='add'>+</div><div class='add'>+	err = sysfs_create_group(&amp;sys_dev-&gt;kobj, &amp;mc_attr_group);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	microcode_init_cpu(cpu);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mc_sysdev_remove(struct sys_device *sys_dev)</div><div class='add'>+{</div><div class='add'>+	int cpu = sys_dev-&gt;id;</div><div class='add'>+</div><div class='add'>+	if (!cpu_online(cpu))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	pr_debug("microcode: CPU%d removed\n", cpu);</div><div class='add'>+	microcode_fini_cpu(cpu);</div><div class='add'>+	sysfs_remove_group(&amp;sys_dev-&gt;kobj, &amp;mc_attr_group);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mc_sysdev_resume(struct sys_device *dev)</div><div class='add'>+{</div><div class='add'>+	int cpu = dev-&gt;id;</div><div class='add'>+</div><div class='add'>+	if (!cpu_online(cpu))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* only CPU 0 will apply ucode here */</div><div class='add'>+	microcode_update_cpu(0);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sysdev_driver mc_sysdev_driver = {</div><div class='add'>+	.add = mc_sysdev_add,</div><div class='add'>+	.remove = mc_sysdev_remove,</div><div class='add'>+	.resume = mc_sysdev_resume,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static __cpuinit int</div><div class='add'>+mc_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu)</div><div class='add'>+{</div><div class='add'>+	unsigned int cpu = (unsigned long)hcpu;</div><div class='add'>+	struct sys_device *sys_dev;</div><div class='add'>+</div><div class='add'>+	sys_dev = get_cpu_sysdev(cpu);</div><div class='add'>+	switch (action) {</div><div class='add'>+	case CPU_ONLINE:</div><div class='add'>+	case CPU_ONLINE_FROZEN:</div><div class='add'>+		microcode_init_cpu(cpu);</div><div class='add'>+	case CPU_DOWN_FAILED:</div><div class='add'>+	case CPU_DOWN_FAILED_FROZEN:</div><div class='add'>+		pr_debug("microcode: CPU%d added\n", cpu);</div><div class='add'>+		if (sysfs_create_group(&amp;sys_dev-&gt;kobj, &amp;mc_attr_group))</div><div class='add'>+			printk(KERN_ERR "microcode: Failed to create the sysfs "</div><div class='add'>+				"group for CPU%d\n", cpu);</div><div class='add'>+		break;</div><div class='add'>+	case CPU_DOWN_PREPARE:</div><div class='add'>+	case CPU_DOWN_PREPARE_FROZEN:</div><div class='add'>+		/* Suspend is in progress, only remove the interface */</div><div class='add'>+		sysfs_remove_group(&amp;sys_dev-&gt;kobj, &amp;mc_attr_group);</div><div class='add'>+		pr_debug("microcode: CPU%d removed\n", cpu);</div><div class='add'>+		break;</div><div class='add'>+	case CPU_DEAD:</div><div class='add'>+	case CPU_UP_CANCELED_FROZEN:</div><div class='add'>+		/* The CPU refused to come up during a system resume */</div><div class='add'>+		microcode_fini_cpu(cpu);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return NOTIFY_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct notifier_block __refdata mc_cpu_notifier = {</div><div class='add'>+	.notifier_call = mc_cpu_callback,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init microcode_init(void)</div><div class='add'>+{</div><div class='add'>+	struct cpuinfo_x86 *c = &amp;cpu_data(0);</div><div class='add'>+	int error;</div><div class='add'>+</div><div class='add'>+	if (c-&gt;x86_vendor == X86_VENDOR_INTEL)</div><div class='add'>+		microcode_ops = init_intel_microcode();</div><div class='add'>+	else if (c-&gt;x86_vendor == X86_VENDOR_AMD)</div><div class='add'>+		microcode_ops = init_amd_microcode();</div><div class='add'>+</div><div class='add'>+	if (!microcode_ops) {</div><div class='add'>+		printk(KERN_ERR "microcode: no support for this CPU vendor\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	error = microcode_dev_init();</div><div class='add'>+	if (error)</div><div class='add'>+		return error;</div><div class='add'>+	microcode_pdev = platform_device_register_simple("microcode", -1,</div><div class='add'>+							 NULL, 0);</div><div class='add'>+	if (IS_ERR(microcode_pdev)) {</div><div class='add'>+		microcode_dev_exit();</div><div class='add'>+		return PTR_ERR(microcode_pdev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	get_online_cpus();</div><div class='add'>+	error = sysdev_driver_register(&amp;cpu_sysdev_class, &amp;mc_sysdev_driver);</div><div class='add'>+	put_online_cpus();</div><div class='add'>+	if (error) {</div><div class='add'>+		microcode_dev_exit();</div><div class='add'>+		platform_device_unregister(microcode_pdev);</div><div class='add'>+		return error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	register_hotcpu_notifier(&amp;mc_cpu_notifier);</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO</div><div class='add'>+	       "Microcode Update Driver: v" MICROCODE_VERSION</div><div class='add'>+	       " &lt;tigran@aivazian.fsnet.co.uk&gt;"</div><div class='add'>+	       " &lt;peter.oruba@amd.com&gt;\n");</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit microcode_exit(void)</div><div class='add'>+{</div><div class='add'>+	microcode_dev_exit();</div><div class='add'>+</div><div class='add'>+	unregister_hotcpu_notifier(&amp;mc_cpu_notifier);</div><div class='add'>+</div><div class='add'>+	get_online_cpus();</div><div class='add'>+	sysdev_driver_unregister(&amp;cpu_sysdev_class, &amp;mc_sysdev_driver);</div><div class='add'>+	put_online_cpus();</div><div class='add'>+</div><div class='add'>+	platform_device_unregister(microcode_pdev);</div><div class='add'>+</div><div class='add'>+	microcode_ops = NULL;</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO</div><div class='add'>+	       "Microcode Update Driver: v" MICROCODE_VERSION " removed.\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(microcode_init);</div><div class='add'>+module_exit(microcode_exit);</div><div class='head'>diff --git a/arch/x86/kernel/microcode_intel.c b/arch/x86/kernel/microcode_intel.c<br/>new file mode 100644<br/>index 000000000000..622dc4a21784<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/microcode_intel.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/microcode_intel.c</a></div><div class='hunk'>@@ -0,0 +1,480 @@</div><div class='add'>+/*</div><div class='add'>+ *	Intel CPU Microcode Update Driver for Linux</div><div class='add'>+ *</div><div class='add'>+ *	Copyright (C) 2000-2006 Tigran Aivazian &lt;tigran@aivazian.fsnet.co.uk&gt;</div><div class='add'>+ *		      2006	Shaohua Li &lt;shaohua.li@intel.com&gt;</div><div class='add'>+ *</div><div class='add'>+ *	This driver allows to upgrade microcode on Intel processors</div><div class='add'>+ *	belonging to IA-32 family - PentiumPro, Pentium II,</div><div class='add'>+ *	Pentium III, Xeon, Pentium 4, etc.</div><div class='add'>+ *</div><div class='add'>+ *	Reference: Section 8.11 of Volume 3a, IA-32 Intel? Architecture</div><div class='add'>+ *	Software Developer's Manual</div><div class='add'>+ *	Order Number 253668 or free download from:</div><div class='add'>+ *</div><div class='add'>+ *	http://developer.intel.com/design/pentium4/manuals/253668.htm</div><div class='add'>+ *</div><div class='add'>+ *	For more information, go to http://www.urbanmyth.org/microcode</div><div class='add'>+ *</div><div class='add'>+ *	This program is free software; you can redistribute it and/or</div><div class='add'>+ *	modify it under the terms of the GNU General Public License</div><div class='add'>+ *	as published by the Free Software Foundation; either version</div><div class='add'>+ *	2 of the License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *	1.0	16 Feb 2000, Tigran Aivazian &lt;tigran@sco.com&gt;</div><div class='add'>+ *		Initial release.</div><div class='add'>+ *	1.01	18 Feb 2000, Tigran Aivazian &lt;tigran@sco.com&gt;</div><div class='add'>+ *		Added read() support + cleanups.</div><div class='add'>+ *	1.02	21 Feb 2000, Tigran Aivazian &lt;tigran@sco.com&gt;</div><div class='add'>+ *		Added 'device trimming' support. open(O_WRONLY) zeroes</div><div class='add'>+ *		and frees the saved copy of applied microcode.</div><div class='add'>+ *	1.03	29 Feb 2000, Tigran Aivazian &lt;tigran@sco.com&gt;</div><div class='add'>+ *		Made to use devfs (/dev/cpu/microcode) + cleanups.</div><div class='add'>+ *	1.04	06 Jun 2000, Simon Trimmer &lt;simon@veritas.com&gt;</div><div class='add'>+ *		Added misc device support (now uses both devfs and misc).</div><div class='add'>+ *		Added MICROCODE_IOCFREE ioctl to clear memory.</div><div class='add'>+ *	1.05	09 Jun 2000, Simon Trimmer &lt;simon@veritas.com&gt;</div><div class='add'>+ *		Messages for error cases (non Intel &amp; no suitable microcode).</div><div class='add'>+ *	1.06	03 Aug 2000, Tigran Aivazian &lt;tigran@veritas.com&gt;</div><div class='add'>+ *		Removed -&gt;release(). Removed exclusive open and status bitmap.</div><div class='add'>+ *		Added microcode_rwsem to serialize read()/write()/ioctl().</div><div class='add'>+ *		Removed global kernel lock usage.</div><div class='add'>+ *	1.07	07 Sep 2000, Tigran Aivazian &lt;tigran@veritas.com&gt;</div><div class='add'>+ *		Write 0 to 0x8B msr and then cpuid before reading revision,</div><div class='add'>+ *		so that it works even if there were no update done by the</div><div class='add'>+ *		BIOS. Otherwise, reading from 0x8B gives junk (which happened</div><div class='add'>+ *		to be 0 on my machine which is why it worked even when I</div><div class='add'>+ *		disabled update by the BIOS)</div><div class='add'>+ *		Thanks to Eric W. Biederman &lt;ebiederman@lnxi.com&gt; for the fix.</div><div class='add'>+ *	1.08	11 Dec 2000, Richard Schaal &lt;richard.schaal@intel.com&gt; and</div><div class='add'>+ *			     Tigran Aivazian &lt;tigran@veritas.com&gt;</div><div class='add'>+ *		Intel Pentium 4 processor support and bugfixes.</div><div class='add'>+ *	1.09	30 Oct 2001, Tigran Aivazian &lt;tigran@veritas.com&gt;</div><div class='add'>+ *		Bugfix for HT (Hyper-Threading) enabled processors</div><div class='add'>+ *		whereby processor resources are shared by all logical processors</div><div class='add'>+ *		in a single CPU package.</div><div class='add'>+ *	1.10	28 Feb 2002 Asit K Mallick &lt;asit.k.mallick@intel.com&gt; and</div><div class='add'>+ *		Tigran Aivazian &lt;tigran@veritas.com&gt;,</div><div class='add'>+ *		Serialize updates as required on HT processors due to</div><div class='add'>+ *		speculative nature of implementation.</div><div class='add'>+ *	1.11	22 Mar 2002 Tigran Aivazian &lt;tigran@veritas.com&gt;</div><div class='add'>+ *		Fix the panic when writing zero-length microcode chunk.</div><div class='add'>+ *	1.12	29 Sep 2003 Nitin Kamble &lt;nitin.a.kamble@intel.com&gt;,</div><div class='add'>+ *		Jun Nakajima &lt;jun.nakajima@intel.com&gt;</div><div class='add'>+ *		Support for the microcode updates in the new format.</div><div class='add'>+ *	1.13	10 Oct 2003 Tigran Aivazian &lt;tigran@veritas.com&gt;</div><div class='add'>+ *		Removed -&gt;read() method and obsoleted MICROCODE_IOCFREE ioctl</div><div class='add'>+ *		because we no longer hold a copy of applied microcode</div><div class='add'>+ *		in kernel memory.</div><div class='add'>+ *	1.14	25 Jun 2004 Tigran Aivazian &lt;tigran@veritas.com&gt;</div><div class='add'>+ *		Fix sigmatch() macro to handle old CPUs with pf == 0.</div><div class='add'>+ *		Thanks to Stuart Swales for pointing out this bug.</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/capability.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/smp_lock.h&gt;</div><div class='add'>+#include &lt;linux/cpumask.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/vmalloc.h&gt;</div><div class='add'>+#include &lt;linux/miscdevice.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/cpu.h&gt;</div><div class='add'>+#include &lt;linux/firmware.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/msr.h&gt;</div><div class='add'>+#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;asm/processor.h&gt;</div><div class='add'>+#include &lt;asm/microcode.h&gt;</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("Microcode Update Driver");</div><div class='add'>+MODULE_AUTHOR("Tigran Aivazian &lt;tigran@aivazian.fsnet.co.uk&gt;");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='add'>+struct microcode_header_intel {</div><div class='add'>+	unsigned int            hdrver;</div><div class='add'>+	unsigned int            rev;</div><div class='add'>+	unsigned int            date;</div><div class='add'>+	unsigned int            sig;</div><div class='add'>+	unsigned int            cksum;</div><div class='add'>+	unsigned int            ldrver;</div><div class='add'>+	unsigned int            pf;</div><div class='add'>+	unsigned int            datasize;</div><div class='add'>+	unsigned int            totalsize;</div><div class='add'>+	unsigned int            reserved[3];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct microcode_intel {</div><div class='add'>+	struct microcode_header_intel hdr;</div><div class='add'>+	unsigned int            bits[0];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* microcode format is extended from prescott processors */</div><div class='add'>+struct extended_signature {</div><div class='add'>+	unsigned int            sig;</div><div class='add'>+	unsigned int            pf;</div><div class='add'>+	unsigned int            cksum;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct extended_sigtable {</div><div class='add'>+	unsigned int            count;</div><div class='add'>+	unsigned int            cksum;</div><div class='add'>+	unsigned int            reserved[3];</div><div class='add'>+	struct extended_signature sigs[0];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define DEFAULT_UCODE_DATASIZE 	(2000)</div><div class='add'>+#define MC_HEADER_SIZE		(sizeof(struct microcode_header_intel))</div><div class='add'>+#define DEFAULT_UCODE_TOTALSIZE (DEFAULT_UCODE_DATASIZE + MC_HEADER_SIZE)</div><div class='add'>+#define EXT_HEADER_SIZE		(sizeof(struct extended_sigtable))</div><div class='add'>+#define EXT_SIGNATURE_SIZE	(sizeof(struct extended_signature))</div><div class='add'>+#define DWSIZE			(sizeof(u32))</div><div class='add'>+#define get_totalsize(mc) \</div><div class='add'>+	(((struct microcode_intel *)mc)-&gt;hdr.totalsize ? \</div><div class='add'>+	 ((struct microcode_intel *)mc)-&gt;hdr.totalsize : \</div><div class='add'>+	 DEFAULT_UCODE_TOTALSIZE)</div><div class='add'>+</div><div class='add'>+#define get_datasize(mc) \</div><div class='add'>+	(((struct microcode_intel *)mc)-&gt;hdr.datasize ? \</div><div class='add'>+	 ((struct microcode_intel *)mc)-&gt;hdr.datasize : DEFAULT_UCODE_DATASIZE)</div><div class='add'>+</div><div class='add'>+#define sigmatch(s1, s2, p1, p2) \</div><div class='add'>+	(((s1) == (s2)) &amp;&amp; (((p1) &amp; (p2)) || (((p1) == 0) &amp;&amp; ((p2) == 0))))</div><div class='add'>+</div><div class='add'>+#define exttable_size(et) ((et)-&gt;count * EXT_SIGNATURE_SIZE + EXT_HEADER_SIZE)</div><div class='add'>+</div><div class='add'>+/* serialize access to the physical write to MSR 0x79 */</div><div class='add'>+static DEFINE_SPINLOCK(microcode_update_lock);</div><div class='add'>+</div><div class='add'>+static int collect_cpu_info(int cpu_num, struct cpu_signature *csig)</div><div class='add'>+{</div><div class='add'>+	struct cpuinfo_x86 *c = &amp;cpu_data(cpu_num);</div><div class='add'>+	unsigned int val[2];</div><div class='add'>+</div><div class='add'>+	memset(csig, 0, sizeof(*csig));</div><div class='add'>+</div><div class='add'>+	if (c-&gt;x86_vendor != X86_VENDOR_INTEL || c-&gt;x86 &lt; 6 ||</div><div class='add'>+	    cpu_has(c, X86_FEATURE_IA64)) {</div><div class='add'>+		printk(KERN_ERR "microcode: CPU%d not a capable Intel "</div><div class='add'>+			"processor\n", cpu_num);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	csig-&gt;sig = cpuid_eax(0x00000001);</div><div class='add'>+</div><div class='add'>+	if ((c-&gt;x86_model &gt;= 5) || (c-&gt;x86 &gt; 6)) {</div><div class='add'>+		/* get processor flags from MSR 0x17 */</div><div class='add'>+		rdmsr(MSR_IA32_PLATFORM_ID, val[0], val[1]);</div><div class='add'>+		csig-&gt;pf = 1 &lt;&lt; ((val[1] &gt;&gt; 18) &amp; 7);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	wrmsr(MSR_IA32_UCODE_REV, 0, 0);</div><div class='add'>+	/* see notes above for revision 1.07.  Apparent chip bug */</div><div class='add'>+	sync_core();</div><div class='add'>+	/* get the current revision from MSR 0x8B */</div><div class='add'>+	rdmsr(MSR_IA32_UCODE_REV, val[0], csig-&gt;rev);</div><div class='add'>+	pr_debug("microcode: collect_cpu_info : sig=0x%x, pf=0x%x, rev=0x%x\n",</div><div class='add'>+			csig-&gt;sig, csig-&gt;pf, csig-&gt;rev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int update_match_cpu(struct cpu_signature *csig, int sig, int pf)</div><div class='add'>+{</div><div class='add'>+	return (!sigmatch(sig, csig-&gt;sig, pf, csig-&gt;pf)) ? 0 : 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int </div><div class='add'>+update_match_revision(struct microcode_header_intel *mc_header,	int rev)</div><div class='add'>+{</div><div class='add'>+	return (mc_header-&gt;rev &lt;= rev) ? 0 : 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int microcode_sanity_check(void *mc)</div><div class='add'>+{</div><div class='add'>+	struct microcode_header_intel *mc_header = mc;</div><div class='add'>+	struct extended_sigtable *ext_header = NULL;</div><div class='add'>+	struct extended_signature *ext_sig;</div><div class='add'>+	unsigned long total_size, data_size, ext_table_size;</div><div class='add'>+	int sum, orig_sum, ext_sigcount = 0, i;</div><div class='add'>+</div><div class='add'>+	total_size = get_totalsize(mc_header);</div><div class='add'>+	data_size = get_datasize(mc_header);</div><div class='add'>+	if (data_size + MC_HEADER_SIZE &gt; total_size) {</div><div class='add'>+		printk(KERN_ERR "microcode: error! "</div><div class='add'>+			"Bad data size in microcode data file\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (mc_header-&gt;ldrver != 1 || mc_header-&gt;hdrver != 1) {</div><div class='add'>+		printk(KERN_ERR "microcode: error! "</div><div class='add'>+			"Unknown microcode update format\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	ext_table_size = total_size - (MC_HEADER_SIZE + data_size);</div><div class='add'>+	if (ext_table_size) {</div><div class='add'>+		if ((ext_table_size &lt; EXT_HEADER_SIZE)</div><div class='add'>+		 || ((ext_table_size - EXT_HEADER_SIZE) % EXT_SIGNATURE_SIZE)) {</div><div class='add'>+			printk(KERN_ERR "microcode: error! "</div><div class='add'>+				"Small exttable size in microcode data file\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		ext_header = mc + MC_HEADER_SIZE + data_size;</div><div class='add'>+		if (ext_table_size != exttable_size(ext_header)) {</div><div class='add'>+			printk(KERN_ERR "microcode: error! "</div><div class='add'>+				"Bad exttable size in microcode data file\n");</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		}</div><div class='add'>+		ext_sigcount = ext_header-&gt;count;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* check extended table checksum */</div><div class='add'>+	if (ext_table_size) {</div><div class='add'>+		int ext_table_sum = 0;</div><div class='add'>+		int *ext_tablep = (int *)ext_header;</div><div class='add'>+</div><div class='add'>+		i = ext_table_size / DWSIZE;</div><div class='add'>+		while (i--)</div><div class='add'>+			ext_table_sum += ext_tablep[i];</div><div class='add'>+		if (ext_table_sum) {</div><div class='add'>+			printk(KERN_WARNING "microcode: aborting, "</div><div class='add'>+				"bad extended signature table checksum\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* calculate the checksum */</div><div class='add'>+	orig_sum = 0;</div><div class='add'>+	i = (MC_HEADER_SIZE + data_size) / DWSIZE;</div><div class='add'>+	while (i--)</div><div class='add'>+		orig_sum += ((int *)mc)[i];</div><div class='add'>+	if (orig_sum) {</div><div class='add'>+		printk(KERN_ERR "microcode: aborting, bad checksum\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (!ext_table_size)</div><div class='add'>+		return 0;</div><div class='add'>+	/* check extended signature checksum */</div><div class='add'>+	for (i = 0; i &lt; ext_sigcount; i++) {</div><div class='add'>+		ext_sig = (void *)ext_header + EXT_HEADER_SIZE +</div><div class='add'>+			  EXT_SIGNATURE_SIZE * i;</div><div class='add'>+		sum = orig_sum</div><div class='add'>+			- (mc_header-&gt;sig + mc_header-&gt;pf + mc_header-&gt;cksum)</div><div class='add'>+			+ (ext_sig-&gt;sig + ext_sig-&gt;pf + ext_sig-&gt;cksum);</div><div class='add'>+		if (sum) {</div><div class='add'>+			printk(KERN_ERR "microcode: aborting, bad checksum\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * return 0 - no update found</div><div class='add'>+ * return 1 - found update</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+get_matching_microcode(struct cpu_signature *cpu_sig, void *mc, int rev)</div><div class='add'>+{</div><div class='add'>+	struct microcode_header_intel *mc_header = mc;</div><div class='add'>+	struct extended_sigtable *ext_header;</div><div class='add'>+	unsigned long total_size = get_totalsize(mc_header);</div><div class='add'>+	int ext_sigcount, i;</div><div class='add'>+	struct extended_signature *ext_sig;</div><div class='add'>+</div><div class='add'>+	if (!update_match_revision(mc_header, rev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (update_match_cpu(cpu_sig, mc_header-&gt;sig, mc_header-&gt;pf))</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	/* Look for ext. headers: */</div><div class='add'>+	if (total_size &lt;= get_datasize(mc_header) + MC_HEADER_SIZE)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ext_header = mc + get_datasize(mc_header) + MC_HEADER_SIZE;</div><div class='add'>+	ext_sigcount = ext_header-&gt;count;</div><div class='add'>+	ext_sig = (void *)ext_header + EXT_HEADER_SIZE;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ext_sigcount; i++) {</div><div class='add'>+		if (update_match_cpu(cpu_sig, ext_sig-&gt;sig, ext_sig-&gt;pf))</div><div class='add'>+			return 1;</div><div class='add'>+		ext_sig++;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void apply_microcode(int cpu)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	unsigned int val[2];</div><div class='add'>+	int cpu_num = raw_smp_processor_id();</div><div class='add'>+	struct ucode_cpu_info *uci = ucode_cpu_info + cpu;</div><div class='add'>+	struct microcode_intel *mc_intel = uci-&gt;mc;</div><div class='add'>+</div><div class='add'>+	/* We should bind the task to the CPU */</div><div class='add'>+	BUG_ON(cpu_num != cpu);</div><div class='add'>+</div><div class='add'>+	if (mc_intel == NULL)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* serialize access to the physical write to MSR 0x79 */</div><div class='add'>+	spin_lock_irqsave(&amp;microcode_update_lock, flags);</div><div class='add'>+</div><div class='add'>+	/* write microcode via MSR 0x79 */</div><div class='add'>+	wrmsr(MSR_IA32_UCODE_WRITE,</div><div class='add'>+	      (unsigned long) mc_intel-&gt;bits,</div><div class='add'>+	      (unsigned long) mc_intel-&gt;bits &gt;&gt; 16 &gt;&gt; 16);</div><div class='add'>+	wrmsr(MSR_IA32_UCODE_REV, 0, 0);</div><div class='add'>+</div><div class='add'>+	/* see notes above for revision 1.07.  Apparent chip bug */</div><div class='add'>+	sync_core();</div><div class='add'>+</div><div class='add'>+	/* get the current revision from MSR 0x8B */</div><div class='add'>+	rdmsr(MSR_IA32_UCODE_REV, val[0], val[1]);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;microcode_update_lock, flags);</div><div class='add'>+	if (val[1] != mc_intel-&gt;hdr.rev) {</div><div class='add'>+		printk(KERN_ERR "microcode: CPU%d update from revision "</div><div class='add'>+			"0x%x to 0x%x failed\n", cpu_num, uci-&gt;cpu_sig.rev, val[1]);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	printk(KERN_INFO "microcode: CPU%d updated from revision "</div><div class='add'>+	       "0x%x to 0x%x, date = %04x-%02x-%02x \n",</div><div class='add'>+		cpu_num, uci-&gt;cpu_sig.rev, val[1],</div><div class='add'>+		mc_intel-&gt;hdr.date &amp; 0xffff,</div><div class='add'>+		mc_intel-&gt;hdr.date &gt;&gt; 24,</div><div class='add'>+		(mc_intel-&gt;hdr.date &gt;&gt; 16) &amp; 0xff);</div><div class='add'>+	uci-&gt;cpu_sig.rev = val[1];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int generic_load_microcode(int cpu, void *data, size_t size,</div><div class='add'>+		int (*get_ucode_data)(void *, const void *, size_t))</div><div class='add'>+{</div><div class='add'>+	struct ucode_cpu_info *uci = ucode_cpu_info + cpu;</div><div class='add'>+	u8 *ucode_ptr = data, *new_mc = NULL, *mc;</div><div class='add'>+	int new_rev = uci-&gt;cpu_sig.rev;</div><div class='add'>+	unsigned int leftover = size;</div><div class='add'>+</div><div class='add'>+	while (leftover) {</div><div class='add'>+		struct microcode_header_intel mc_header;</div><div class='add'>+		unsigned int mc_size;</div><div class='add'>+</div><div class='add'>+		if (get_ucode_data(&amp;mc_header, ucode_ptr, sizeof(mc_header)))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		mc_size = get_totalsize(&amp;mc_header);</div><div class='add'>+		if (!mc_size || mc_size &gt; leftover) {</div><div class='add'>+			printk(KERN_ERR "microcode: error!"</div><div class='add'>+					"Bad data in microcode data file\n");</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		mc = vmalloc(mc_size);</div><div class='add'>+		if (!mc)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (get_ucode_data(mc, ucode_ptr, mc_size) ||</div><div class='add'>+		    microcode_sanity_check(mc) &lt; 0) {</div><div class='add'>+			vfree(mc);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (get_matching_microcode(&amp;uci-&gt;cpu_sig, mc, new_rev)) {</div><div class='add'>+			if (new_mc)</div><div class='add'>+				vfree(new_mc);</div><div class='add'>+			new_rev = mc_header.rev;</div><div class='add'>+			new_mc  = mc;</div><div class='add'>+		} else</div><div class='add'>+			vfree(mc);</div><div class='add'>+</div><div class='add'>+		ucode_ptr += mc_size;</div><div class='add'>+		leftover  -= mc_size;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (new_mc) {</div><div class='add'>+		if (!leftover) {</div><div class='add'>+			if (uci-&gt;mc)</div><div class='add'>+				vfree(uci-&gt;mc);</div><div class='add'>+			uci-&gt;mc = (struct microcode_intel *)new_mc;</div><div class='add'>+			pr_debug("microcode: CPU%d found a matching microcode update with"</div><div class='add'>+				 " version 0x%x (current=0x%x)\n",</div><div class='add'>+				cpu, new_rev, uci-&gt;cpu_sig.rev);</div><div class='add'>+		} else</div><div class='add'>+			vfree(new_mc);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return (int)leftover;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int get_ucode_fw(void *to, const void *from, size_t n)</div><div class='add'>+{</div><div class='add'>+	memcpy(to, from, n);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int request_microcode_fw(int cpu, struct device *device)</div><div class='add'>+{</div><div class='add'>+	char name[30];</div><div class='add'>+	struct cpuinfo_x86 *c = &amp;cpu_data(cpu);</div><div class='add'>+	const struct firmware *firmware;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* We should bind the task to the CPU */</div><div class='add'>+	BUG_ON(cpu != raw_smp_processor_id());</div><div class='add'>+	sprintf(name, "intel-ucode/%02x-%02x-%02x",</div><div class='add'>+		c-&gt;x86, c-&gt;x86_model, c-&gt;x86_mask);</div><div class='add'>+	ret = request_firmware(&amp;firmware, name, device);</div><div class='add'>+	if (ret) {</div><div class='add'>+		pr_debug("microcode: data file %s load failed\n", name);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = generic_load_microcode(cpu, (void*)firmware-&gt;data, firmware-&gt;size,</div><div class='add'>+			&amp;get_ucode_fw);</div><div class='add'>+</div><div class='add'>+	release_firmware(firmware);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int get_ucode_user(void *to, const void *from, size_t n)</div><div class='add'>+{</div><div class='add'>+	return copy_from_user(to, from, n);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int request_microcode_user(int cpu, const void __user *buf, size_t size)</div><div class='add'>+{</div><div class='add'>+	/* We should bind the task to the CPU */</div><div class='add'>+	BUG_ON(cpu != raw_smp_processor_id());</div><div class='add'>+</div><div class='add'>+	return generic_load_microcode(cpu, (void*)buf, size, &amp;get_ucode_user);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void microcode_fini_cpu(int cpu)</div><div class='add'>+{</div><div class='add'>+	struct ucode_cpu_info *uci = ucode_cpu_info + cpu;</div><div class='add'>+</div><div class='add'>+	vfree(uci-&gt;mc);</div><div class='add'>+	uci-&gt;mc = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct microcode_ops microcode_intel_ops = {</div><div class='add'>+	.request_microcode_user		  = request_microcode_user,</div><div class='add'>+	.request_microcode_fw             = request_microcode_fw,</div><div class='add'>+	.collect_cpu_info                 = collect_cpu_info,</div><div class='add'>+	.apply_microcode                  = apply_microcode,</div><div class='add'>+	.microcode_fini_cpu               = microcode_fini_cpu,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct microcode_ops * __init init_intel_microcode(void)</div><div class='add'>+{</div><div class='add'>+	return &amp;microcode_intel_ops;</div><div class='add'>+}</div><div class='add'>+</div><div class='head'>diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c<br/>index b3fb430725cb..f98f4e1dba09 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/mpparse.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/mpparse.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/mpparse.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/mpparse.c</a></div><div class='hunk'>@@ -397,7 +397,9 @@ static int __init smp_read_mpc(struct mp_config_table *mpc, unsigned early)</div><div class='ctx'>        generic_bigsmp_probe();</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_X86_32</div><div class='ctx'> 	setup_apic_routing();</div><div class='add'>+#endif</div><div class='ctx'> 	if (!num_processors)</div><div class='ctx'> 		printk(KERN_ERR "MPTABLE: no processors registered!\n");</div><div class='ctx'> 	return num_processors;</div><div class='head'>diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c<br/>index 2e2af5d18191..82a7c7ed6d45 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/msr.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/msr.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/msr.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/msr.c</a></div><div class='hunk'>@@ -163,8 +163,8 @@ static int __cpuinit msr_device_create(int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev;</div><div class='ctx'> </div><div class='del'>-	dev = device_create_drvdata(msr_class, NULL, MKDEV(MSR_MAJOR, cpu),</div><div class='del'>-				    NULL, "msr%d", cpu);</div><div class='add'>+	dev = device_create(msr_class, NULL, MKDEV(MSR_MAJOR, cpu), NULL,</div><div class='add'>+			    "msr%d", cpu);</div><div class='ctx'> 	return IS_ERR(dev) ? PTR_ERR(dev) : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c<br/>index abb78a2cc4ad..2c97f07f1c2c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/nmi.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/nmi.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/nmi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/nmi.c</a></div><div class='hunk'>@@ -299,6 +299,15 @@ void acpi_nmi_disable(void)</div><div class='ctx'> 		on_each_cpu(__acpi_nmi_disable, NULL, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * This function is called as soon the LAPIC NMI watchdog driver has everything</div><div class='add'>+ * in place and it's ready to check if the NMIs belong to the NMI watchdog</div><div class='add'>+ */</div><div class='add'>+void cpu_nmi_set_wd_enabled(void)</div><div class='add'>+{</div><div class='add'>+	__get_cpu_var(wd_enabled) = 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void setup_apic_nmi_watchdog(void *unused)</div><div class='ctx'> {</div><div class='ctx'> 	if (__get_cpu_var(wd_enabled))</div><div class='hunk'>@@ -311,8 +320,6 @@ void setup_apic_nmi_watchdog(void *unused)</div><div class='ctx'> </div><div class='ctx'> 	switch (nmi_watchdog) {</div><div class='ctx'> 	case NMI_LOCAL_APIC:</div><div class='del'>-		 /* enable it before to avoid race with handler */</div><div class='del'>-		__get_cpu_var(wd_enabled) = 1;</div><div class='ctx'> 		if (lapic_watchdog_init(nmi_hz) &lt; 0) {</div><div class='ctx'> 			__get_cpu_var(wd_enabled) = 0;</div><div class='ctx'> 			return;</div><div class='head'>diff --git a/arch/x86/kernel/numaq_32.c b/arch/x86/kernel/numaq_32.c<br/>index eecc8c18f010..4caff39078e0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/numaq_32.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/numaq_32.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/numaq_32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/numaq_32.c</a></div><div class='hunk'>@@ -229,6 +229,12 @@ static void __init smp_read_mpc_oem(struct mp_config_oemtable *oemtable,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int __init numaq_setup_ioapic_ids(void)</div><div class='add'>+{</div><div class='add'>+	/* so can skip it */</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct x86_quirks numaq_x86_quirks __initdata = {</div><div class='ctx'> 	.arch_pre_time_init	= numaq_pre_time_init,</div><div class='ctx'> 	.arch_time_init		= NULL,</div><div class='hunk'>@@ -243,6 +249,7 @@ static struct x86_quirks numaq_x86_quirks __initdata = {</div><div class='ctx'> 	.mpc_oem_bus_info	= mpc_oem_bus_info,</div><div class='ctx'> 	.mpc_oem_pci_bus	= mpc_oem_pci_bus,</div><div class='ctx'> 	.smp_read_mpc_oem	= smp_read_mpc_oem,</div><div class='add'>+	.setup_ioapic_ids	= numaq_setup_ioapic_ids,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void numaq_mps_oem_check(struct mp_config_table *mpc, char *oem,</div><div class='head'>diff --git a/arch/x86/kernel/olpc.c b/arch/x86/kernel/olpc.c<br/>index 3e6672274807..7a13fac63a1f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/olpc.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/olpc.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/olpc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/olpc.c</a></div><div class='hunk'>@@ -190,12 +190,12 @@ EXPORT_SYMBOL_GPL(olpc_ec_cmd);</div><div class='ctx'> static void __init platform_detect(void)</div><div class='ctx'> {</div><div class='ctx'> 	size_t propsize;</div><div class='del'>-	u32 rev;</div><div class='add'>+	__be32 rev;</div><div class='ctx'> </div><div class='ctx'> 	if (ofw("getprop", 4, 1, NULL, "board-revision-int", &amp;rev, 4,</div><div class='ctx'> 			&amp;propsize) || propsize != 4) {</div><div class='ctx'> 		printk(KERN_ERR "ofw: getprop call failed!\n");</div><div class='del'>-		rev = 0;</div><div class='add'>+		rev = cpu_to_be32(0);</div><div class='ctx'> 	}</div><div class='ctx'> 	olpc_platform_info.boardrev = be32_to_cpu(rev);</div><div class='ctx'> }</div><div class='hunk'>@@ -203,7 +203,7 @@ static void __init platform_detect(void)</div><div class='ctx'> static void __init platform_detect(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* stopgap until OFW support is added to the kernel */</div><div class='del'>-	olpc_platform_info.boardrev = be32_to_cpu(0xc2);</div><div class='add'>+	olpc_platform_info.boardrev = 0xc2;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kernel/paravirt-spinlocks.c b/arch/x86/kernel/paravirt-spinlocks.c<br/>new file mode 100644<br/>index 000000000000..0e9f1982b1dd<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/paravirt-spinlocks.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/paravirt-spinlocks.c</a></div><div class='hunk'>@@ -0,0 +1,37 @@</div><div class='add'>+/*</div><div class='add'>+ * Split spinlock implementation out into its own file, so it can be</div><div class='add'>+ * compiled in a FTRACE-compatible way.</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/paravirt.h&gt;</div><div class='add'>+</div><div class='add'>+static void default_spin_lock_flags(struct raw_spinlock *lock, unsigned long flags)</div><div class='add'>+{</div><div class='add'>+	__raw_spin_lock(lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct pv_lock_ops pv_lock_ops = {</div><div class='add'>+#ifdef CONFIG_SMP</div><div class='add'>+	.spin_is_locked = __ticket_spin_is_locked,</div><div class='add'>+	.spin_is_contended = __ticket_spin_is_contended,</div><div class='add'>+</div><div class='add'>+	.spin_lock = __ticket_spin_lock,</div><div class='add'>+	.spin_lock_flags = default_spin_lock_flags,</div><div class='add'>+	.spin_trylock = __ticket_spin_trylock,</div><div class='add'>+	.spin_unlock = __ticket_spin_unlock,</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+EXPORT_SYMBOL(pv_lock_ops);</div><div class='add'>+</div><div class='add'>+void __init paravirt_use_bytelocks(void)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_SMP</div><div class='add'>+	pv_lock_ops.spin_is_locked = __byte_spin_is_locked;</div><div class='add'>+	pv_lock_ops.spin_is_contended = __byte_spin_is_contended;</div><div class='add'>+	pv_lock_ops.spin_lock = __byte_spin_lock;</div><div class='add'>+	pv_lock_ops.spin_trylock = __byte_spin_trylock;</div><div class='add'>+	pv_lock_ops.spin_unlock = __byte_spin_unlock;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='head'>diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c<br/>index 300da17e61cb..e4c8fb608873 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/paravirt.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/paravirt.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/paravirt.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/paravirt.c</a></div><div class='hunk'>@@ -268,17 +268,6 @@ enum paravirt_lazy_mode paravirt_get_lazy_mode(void)</div><div class='ctx'> 	return __get_cpu_var(paravirt_lazy_mode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init paravirt_use_bytelocks(void)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_SMP</div><div class='del'>-	pv_lock_ops.spin_is_locked = __byte_spin_is_locked;</div><div class='del'>-	pv_lock_ops.spin_is_contended = __byte_spin_is_contended;</div><div class='del'>-	pv_lock_ops.spin_lock = __byte_spin_lock;</div><div class='del'>-	pv_lock_ops.spin_trylock = __byte_spin_trylock;</div><div class='del'>-	pv_lock_ops.spin_unlock = __byte_spin_unlock;</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> struct pv_info pv_info = {</div><div class='ctx'> 	.name = "bare hardware",</div><div class='ctx'> 	.paravirt_enabled = 0,</div><div class='hunk'>@@ -330,6 +319,7 @@ struct pv_cpu_ops pv_cpu_ops = {</div><div class='ctx'> #endif</div><div class='ctx'> 	.wbinvd = native_wbinvd,</div><div class='ctx'> 	.read_msr = native_read_msr_safe,</div><div class='add'>+	.read_msr_amd = native_read_msr_amd_safe,</div><div class='ctx'> 	.write_msr = native_write_msr_safe,</div><div class='ctx'> 	.read_tsc = native_read_tsc,</div><div class='ctx'> 	.read_pmc = native_read_pmc,</div><div class='hunk'>@@ -348,6 +338,10 @@ struct pv_cpu_ops pv_cpu_ops = {</div><div class='ctx'> 	.write_ldt_entry = native_write_ldt_entry,</div><div class='ctx'> 	.write_gdt_entry = native_write_gdt_entry,</div><div class='ctx'> 	.write_idt_entry = native_write_idt_entry,</div><div class='add'>+</div><div class='add'>+	.alloc_ldt = paravirt_nop,</div><div class='add'>+	.free_ldt = paravirt_nop,</div><div class='add'>+</div><div class='ctx'> 	.load_sp0 = native_load_sp0,</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_X86_32) || defined(CONFIG_IA32_EMULATION)</div><div class='hunk'>@@ -373,8 +367,6 @@ struct pv_cpu_ops pv_cpu_ops = {</div><div class='ctx'> </div><div class='ctx'> struct pv_apic_ops pv_apic_ops = {</div><div class='ctx'> #ifdef CONFIG_X86_LOCAL_APIC</div><div class='del'>-	.apic_write = native_apic_write,</div><div class='del'>-	.apic_read = native_apic_read,</div><div class='ctx'> 	.setup_boot_clock = setup_boot_APIC_clock,</div><div class='ctx'> 	.setup_secondary_clock = setup_secondary_APIC_clock,</div><div class='ctx'> 	.startup_ipi_hook = paravirt_nop,</div><div class='hunk'>@@ -461,18 +453,6 @@ struct pv_mmu_ops pv_mmu_ops = {</div><div class='ctx'> 	.set_fixmap = native_set_fixmap,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct pv_lock_ops pv_lock_ops = {</div><div class='del'>-#ifdef CONFIG_SMP</div><div class='del'>-	.spin_is_locked = __ticket_spin_is_locked,</div><div class='del'>-	.spin_is_contended = __ticket_spin_is_contended,</div><div class='del'>-</div><div class='del'>-	.spin_lock = __ticket_spin_lock,</div><div class='del'>-	.spin_trylock = __ticket_spin_trylock,</div><div class='del'>-	.spin_unlock = __ticket_spin_unlock,</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-EXPORT_SYMBOL(pv_lock_ops);</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL_GPL(pv_time_ops);</div><div class='ctx'> EXPORT_SYMBOL    (pv_cpu_ops);</div><div class='ctx'> EXPORT_SYMBOL    (pv_mmu_ops);</div><div class='head'>diff --git a/arch/x86/kernel/paravirt_patch_32.c b/arch/x86/kernel/paravirt_patch_32.c<br/>index 58262218781b..9fe644f4861d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/paravirt_patch_32.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/paravirt_patch_32.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/paravirt_patch_32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/paravirt_patch_32.c</a></div><div class='hunk'>@@ -23,7 +23,7 @@ unsigned native_patch(u8 type, u16 clobbers, void *ibuf,</div><div class='ctx'> 			start = start_##ops##_##x;		\</div><div class='ctx'> 			end = end_##ops##_##x;			\</div><div class='ctx'> 			goto patch_site</div><div class='del'>-	switch(type) {</div><div class='add'>+	switch (type) {</div><div class='ctx'> 		PATCH_SITE(pv_irq_ops, irq_disable);</div><div class='ctx'> 		PATCH_SITE(pv_irq_ops, irq_enable);</div><div class='ctx'> 		PATCH_SITE(pv_irq_ops, restore_fl);</div><div class='head'>diff --git a/arch/x86/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c<br/>index dcdac6c826e9..e1e731d78f38 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/pci-calgary_64.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/pci-calgary_64.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/pci-calgary_64.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/pci-calgary_64.c</a></div><div class='hunk'>@@ -217,16 +217,6 @@ static inline unsigned long verify_bit_range(unsigned long* bitmap,</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_IOMMU_DEBUG */</div><div class='ctx'> </div><div class='del'>-static inline unsigned int num_dma_pages(unsigned long dma, unsigned int dmalen)</div><div class='del'>-{</div><div class='del'>-	unsigned int npages;</div><div class='del'>-</div><div class='del'>-	npages = PAGE_ALIGN(dma + dmalen) - (dma &amp; PAGE_MASK);</div><div class='del'>-	npages &gt;&gt;= PAGE_SHIFT;</div><div class='del'>-</div><div class='del'>-	return npages;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline int translation_enabled(struct iommu_table *tbl)</div><div class='ctx'> {</div><div class='ctx'> 	/* only PHBs with translation enabled have an IOMMU table */</div><div class='hunk'>@@ -261,7 +251,7 @@ static void iommu_range_reserve(struct iommu_table *tbl,</div><div class='ctx'> 			       badbit, tbl, start_addr, npages);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	set_bit_string(tbl-&gt;it_map, index, npages);</div><div class='add'>+	iommu_area_reserve(tbl-&gt;it_map, index, npages);</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;tbl-&gt;it_lock, flags);</div><div class='ctx'> }</div><div class='hunk'>@@ -408,7 +398,7 @@ static void calgary_unmap_sg(struct device *dev,</div><div class='ctx'> 		if (dmalen == 0)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		npages = num_dma_pages(dma, dmalen);</div><div class='add'>+		npages = iommu_num_pages(dma, dmalen, PAGE_SIZE);</div><div class='ctx'> 		iommu_free(tbl, dma, npages);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -427,7 +417,7 @@ static int calgary_map_sg(struct device *dev, struct scatterlist *sg,</div><div class='ctx'> 		BUG_ON(!sg_page(s));</div><div class='ctx'> </div><div class='ctx'> 		vaddr = (unsigned long) sg_virt(s);</div><div class='del'>-		npages = num_dma_pages(vaddr, s-&gt;length);</div><div class='add'>+		npages = iommu_num_pages(vaddr, s-&gt;length, PAGE_SIZE);</div><div class='ctx'> </div><div class='ctx'> 		entry = iommu_range_alloc(dev, tbl, npages);</div><div class='ctx'> 		if (entry == bad_dma_address) {</div><div class='hunk'>@@ -464,7 +454,7 @@ static dma_addr_t calgary_map_single(struct device *dev, phys_addr_t paddr,</div><div class='ctx'> 	struct iommu_table *tbl = find_iommu_table(dev);</div><div class='ctx'> </div><div class='ctx'> 	uaddr = (unsigned long)vaddr;</div><div class='del'>-	npages = num_dma_pages(uaddr, size);</div><div class='add'>+	npages = iommu_num_pages(uaddr, size, PAGE_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	return iommu_alloc(dev, tbl, vaddr, npages, direction);</div><div class='ctx'> }</div><div class='hunk'>@@ -475,7 +465,7 @@ static void calgary_unmap_single(struct device *dev, dma_addr_t dma_handle,</div><div class='ctx'> 	struct iommu_table *tbl = find_iommu_table(dev);</div><div class='ctx'> 	unsigned int npages;</div><div class='ctx'> </div><div class='del'>-	npages = num_dma_pages(dma_handle, size);</div><div class='add'>+	npages = iommu_num_pages(dma_handle, size, PAGE_SIZE);</div><div class='ctx'> 	iommu_free(tbl, dma_handle, npages);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -491,6 +481,8 @@ static void* calgary_alloc_coherent(struct device *dev, size_t size,</div><div class='ctx'> 	npages = size &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> 	order = get_order(size);</div><div class='ctx'> </div><div class='add'>+	flag &amp;= ~(__GFP_DMA | __GFP_HIGHMEM | __GFP_DMA32);</div><div class='add'>+</div><div class='ctx'> 	/* alloc enough pages (and possibly more) */</div><div class='ctx'> 	ret = (void *)__get_free_pages(flag, order);</div><div class='ctx'> 	if (!ret)</div><div class='hunk'>@@ -510,8 +502,22 @@ error:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void calgary_free_coherent(struct device *dev, size_t size,</div><div class='add'>+				  void *vaddr, dma_addr_t dma_handle)</div><div class='add'>+{</div><div class='add'>+	unsigned int npages;</div><div class='add'>+	struct iommu_table *tbl = find_iommu_table(dev);</div><div class='add'>+</div><div class='add'>+	size = PAGE_ALIGN(size);</div><div class='add'>+	npages = size &gt;&gt; PAGE_SHIFT;</div><div class='add'>+</div><div class='add'>+	iommu_free(tbl, dma_handle, npages);</div><div class='add'>+	free_pages((unsigned long)vaddr, get_order(size));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct dma_mapping_ops calgary_dma_ops = {</div><div class='ctx'> 	.alloc_coherent = calgary_alloc_coherent,</div><div class='add'>+	.free_coherent = calgary_free_coherent,</div><div class='ctx'> 	.map_single = calgary_map_single,</div><div class='ctx'> 	.unmap_single = calgary_unmap_single,</div><div class='ctx'> 	.map_sg = calgary_map_sg,</div><div class='head'>diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c<br/>index 87d4d6964ec2..192624820217 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/pci-dma.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/pci-dma.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/pci-dma.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/pci-dma.c</a></div><div class='hunk'>@@ -41,11 +41,12 @@ EXPORT_SYMBOL(bad_dma_address);</div><div class='ctx'> /* Dummy device used for NULL arguments (normally ISA). Better would</div><div class='ctx'>    be probably a smaller DMA mask, but this is bug-to-bug compatible</div><div class='ctx'>    to older i386. */</div><div class='del'>-struct device fallback_dev = {</div><div class='add'>+struct device x86_dma_fallback_dev = {</div><div class='ctx'> 	.bus_id = "fallback device",</div><div class='ctx'> 	.coherent_dma_mask = DMA_32BIT_MASK,</div><div class='del'>-	.dma_mask = &amp;fallback_dev.coherent_dma_mask,</div><div class='add'>+	.dma_mask = &amp;x86_dma_fallback_dev.coherent_dma_mask,</div><div class='ctx'> };</div><div class='add'>+EXPORT_SYMBOL(x86_dma_fallback_dev);</div><div class='ctx'> </div><div class='ctx'> int dma_set_mask(struct device *dev, u64 mask)</div><div class='ctx'> {</div><div class='hunk'>@@ -82,7 +83,7 @@ void __init dma32_reserve_bootmem(void)</div><div class='ctx'> 	 * using 512M as goal</div><div class='ctx'> 	 */</div><div class='ctx'> 	align = 64ULL&lt;&lt;20;</div><div class='del'>-	size = round_up(dma32_bootmem_size, align);</div><div class='add'>+	size = roundup(dma32_bootmem_size, align);</div><div class='ctx'> 	dma32_bootmem_ptr = __alloc_bootmem_nopanic(size, align,</div><div class='ctx'> 				 512ULL&lt;&lt;20);</div><div class='ctx'> 	if (dma32_bootmem_ptr)</div><div class='hunk'>@@ -124,15 +125,46 @@ void __init pci_iommu_alloc(void)</div><div class='ctx'> 	pci_swiotlb_init();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-unsigned long iommu_num_pages(unsigned long addr, unsigned long len)</div><div class='add'>+unsigned long iommu_nr_pages(unsigned long addr, unsigned long len)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long size = roundup((addr &amp; ~PAGE_MASK) + len, PAGE_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	return size &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(iommu_num_pages);</div><div class='add'>+EXPORT_SYMBOL(iommu_nr_pages);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+void *dma_generic_alloc_coherent(struct device *dev, size_t size,</div><div class='add'>+				 dma_addr_t *dma_addr, gfp_t flag)</div><div class='add'>+{</div><div class='add'>+	unsigned long dma_mask;</div><div class='add'>+	struct page *page;</div><div class='add'>+	dma_addr_t addr;</div><div class='add'>+</div><div class='add'>+	dma_mask = dma_alloc_coherent_mask(dev, flag);</div><div class='add'>+</div><div class='add'>+	flag |= __GFP_ZERO;</div><div class='add'>+again:</div><div class='add'>+	page = alloc_pages_node(dev_to_node(dev), flag, get_order(size));</div><div class='add'>+	if (!page)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	addr = page_to_phys(page);</div><div class='add'>+	if (!is_buffer_dma_capable(dma_mask, addr, size)) {</div><div class='add'>+		__free_pages(page, get_order(size));</div><div class='add'>+</div><div class='add'>+		if (dma_mask &lt; DMA_32BIT_MASK &amp;&amp; !(flag &amp; GFP_DMA)) {</div><div class='add'>+			flag = (flag &amp; ~GFP_DMA32) | GFP_DMA;</div><div class='add'>+			goto again;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*dma_addr = addr;</div><div class='add'>+	return page_address(page);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * See &lt;Documentation/x86_64/boot-options.txt&gt; for the iommu kernel parameter</div><div class='ctx'>  * documentation.</div><div class='hunk'>@@ -241,147 +273,6 @@ int dma_supported(struct device *dev, u64 mask)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(dma_supported);</div><div class='ctx'> </div><div class='del'>-/* Allocate DMA memory on node near device */</div><div class='del'>-static noinline struct page *</div><div class='del'>-dma_alloc_pages(struct device *dev, gfp_t gfp, unsigned order)</div><div class='del'>-{</div><div class='del'>-	int node;</div><div class='del'>-</div><div class='del'>-	node = dev_to_node(dev);</div><div class='del'>-</div><div class='del'>-	return alloc_pages_node(node, gfp, order);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Allocate memory for a coherent mapping.</div><div class='del'>- */</div><div class='del'>-void *</div><div class='del'>-dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,</div><div class='del'>-		   gfp_t gfp)</div><div class='del'>-{</div><div class='del'>-	struct dma_mapping_ops *ops = get_dma_ops(dev);</div><div class='del'>-	void *memory = NULL;</div><div class='del'>-	struct page *page;</div><div class='del'>-	unsigned long dma_mask = 0;</div><div class='del'>-	dma_addr_t bus;</div><div class='del'>-	int noretry = 0;</div><div class='del'>-</div><div class='del'>-	/* ignore region specifiers */</div><div class='del'>-	gfp &amp;= ~(__GFP_DMA | __GFP_HIGHMEM | __GFP_DMA32);</div><div class='del'>-</div><div class='del'>-	if (dma_alloc_from_coherent(dev, size, dma_handle, &amp;memory))</div><div class='del'>-		return memory;</div><div class='del'>-</div><div class='del'>-	if (!dev) {</div><div class='del'>-		dev = &amp;fallback_dev;</div><div class='del'>-		gfp |= GFP_DMA;</div><div class='del'>-	}</div><div class='del'>-	dma_mask = dev-&gt;coherent_dma_mask;</div><div class='del'>-	if (dma_mask == 0)</div><div class='del'>-		dma_mask = (gfp &amp; GFP_DMA) ? DMA_24BIT_MASK : DMA_32BIT_MASK;</div><div class='del'>-</div><div class='del'>-	/* Device not DMA able */</div><div class='del'>-	if (dev-&gt;dma_mask == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	/* Don't invoke OOM killer or retry in lower 16MB DMA zone */</div><div class='del'>-	if (gfp &amp; __GFP_DMA)</div><div class='del'>-		noretry = 1;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_X86_64</div><div class='del'>-	/* Why &lt;=? Even when the mask is smaller than 4GB it is often</div><div class='del'>-	   larger than 16MB and in this case we have a chance of</div><div class='del'>-	   finding fitting memory in the next higher zone first. If</div><div class='del'>-	   not retry with true GFP_DMA. -AK */</div><div class='del'>-	if (dma_mask &lt;= DMA_32BIT_MASK &amp;&amp; !(gfp &amp; GFP_DMA)) {</div><div class='del'>-		gfp |= GFP_DMA32;</div><div class='del'>-		if (dma_mask &lt; DMA_32BIT_MASK)</div><div class='del'>-			noretry = 1;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>- again:</div><div class='del'>-	page = dma_alloc_pages(dev,</div><div class='del'>-		noretry ? gfp | __GFP_NORETRY : gfp, get_order(size));</div><div class='del'>-	if (page == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	{</div><div class='del'>-		int high, mmu;</div><div class='del'>-		bus = page_to_phys(page);</div><div class='del'>-		memory = page_address(page);</div><div class='del'>-		high = (bus + size) &gt;= dma_mask;</div><div class='del'>-		mmu = high;</div><div class='del'>-		if (force_iommu &amp;&amp; !(gfp &amp; GFP_DMA))</div><div class='del'>-			mmu = 1;</div><div class='del'>-		else if (high) {</div><div class='del'>-			free_pages((unsigned long)memory,</div><div class='del'>-				   get_order(size));</div><div class='del'>-</div><div class='del'>-			/* Don't use the 16MB ZONE_DMA unless absolutely</div><div class='del'>-			   needed. It's better to use remapping first. */</div><div class='del'>-			if (dma_mask &lt; DMA_32BIT_MASK &amp;&amp; !(gfp &amp; GFP_DMA)) {</div><div class='del'>-				gfp = (gfp &amp; ~GFP_DMA32) | GFP_DMA;</div><div class='del'>-				goto again;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* Let low level make its own zone decisions */</div><div class='del'>-			gfp &amp;= ~(GFP_DMA32|GFP_DMA);</div><div class='del'>-</div><div class='del'>-			if (ops-&gt;alloc_coherent)</div><div class='del'>-				return ops-&gt;alloc_coherent(dev, size,</div><div class='del'>-							   dma_handle, gfp);</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		memset(memory, 0, size);</div><div class='del'>-		if (!mmu) {</div><div class='del'>-			*dma_handle = bus;</div><div class='del'>-			return memory;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ops-&gt;alloc_coherent) {</div><div class='del'>-		free_pages((unsigned long)memory, get_order(size));</div><div class='del'>-		gfp &amp;= ~(GFP_DMA|GFP_DMA32);</div><div class='del'>-		return ops-&gt;alloc_coherent(dev, size, dma_handle, gfp);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ops-&gt;map_simple) {</div><div class='del'>-		*dma_handle = ops-&gt;map_simple(dev, virt_to_phys(memory),</div><div class='del'>-					      size,</div><div class='del'>-					      PCI_DMA_BIDIRECTIONAL);</div><div class='del'>-		if (*dma_handle != bad_dma_address)</div><div class='del'>-			return memory;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (panic_on_overflow)</div><div class='del'>-		panic("dma_alloc_coherent: IOMMU overflow by %lu bytes\n",</div><div class='del'>-		      (unsigned long)size);</div><div class='del'>-	free_pages((unsigned long)memory, get_order(size));</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(dma_alloc_coherent);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Unmap coherent memory.</div><div class='del'>- * The caller must ensure that the device has finished accessing the mapping.</div><div class='del'>- */</div><div class='del'>-void dma_free_coherent(struct device *dev, size_t size,</div><div class='del'>-			 void *vaddr, dma_addr_t bus)</div><div class='del'>-{</div><div class='del'>-	struct dma_mapping_ops *ops = get_dma_ops(dev);</div><div class='del'>-</div><div class='del'>-	int order = get_order(size);</div><div class='del'>-	WARN_ON(irqs_disabled());	/* for portability */</div><div class='del'>-	if (dma_release_from_coherent(dev, order, vaddr))</div><div class='del'>-		return;</div><div class='del'>-	if (ops-&gt;unmap_single)</div><div class='del'>-		ops-&gt;unmap_single(dev, bus, size, 0);</div><div class='del'>-	free_pages((unsigned long)vaddr, order);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(dma_free_coherent);</div><div class='del'>-</div><div class='ctx'> static int __init pci_iommu_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	calgary_iommu_init();</div><div class='head'>diff --git a/arch/x86/kernel/pci-gart_64.c b/arch/x86/kernel/pci-gart_64.c<br/>index be33a5442d82..e3f75bbcedea 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/pci-gart_64.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/pci-gart_64.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/pci-gart_64.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/pci-gart_64.c</a></div><div class='hunk'>@@ -27,8 +27,8 @@</div><div class='ctx'> #include &lt;linux/scatterlist.h&gt;</div><div class='ctx'> #include &lt;linux/iommu-helper.h&gt;</div><div class='ctx'> #include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;asm/atomic.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/mtrr.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/proto.h&gt;</div><div class='hunk'>@@ -80,9 +80,10 @@ AGPEXTERN int agp_memory_reserved;</div><div class='ctx'> AGPEXTERN __u32 *agp_gatt_table;</div><div class='ctx'> </div><div class='ctx'> static unsigned long next_bit;  /* protected by iommu_bitmap_lock */</div><div class='del'>-static int need_flush;		/* global flush state. set for each gart wrap */</div><div class='add'>+static bool need_flush;		/* global flush state. set for each gart wrap */</div><div class='ctx'> </div><div class='del'>-static unsigned long alloc_iommu(struct device *dev, int size)</div><div class='add'>+static unsigned long alloc_iommu(struct device *dev, int size,</div><div class='add'>+				 unsigned long align_mask)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long offset, flags;</div><div class='ctx'> 	unsigned long boundary_size;</div><div class='hunk'>@@ -90,26 +91,27 @@ static unsigned long alloc_iommu(struct device *dev, int size)</div><div class='ctx'> </div><div class='ctx'> 	base_index = ALIGN(iommu_bus_base &amp; dma_get_seg_boundary(dev),</div><div class='ctx'> 			   PAGE_SIZE) &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	boundary_size = ALIGN(dma_get_seg_boundary(dev) + 1,</div><div class='add'>+	boundary_size = ALIGN((unsigned long long)dma_get_seg_boundary(dev) + 1,</div><div class='ctx'> 			      PAGE_SIZE) &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;iommu_bitmap_lock, flags);</div><div class='ctx'> 	offset = iommu_area_alloc(iommu_gart_bitmap, iommu_pages, next_bit,</div><div class='del'>-				  size, base_index, boundary_size, 0);</div><div class='add'>+				  size, base_index, boundary_size, align_mask);</div><div class='ctx'> 	if (offset == -1) {</div><div class='del'>-		need_flush = 1;</div><div class='add'>+		need_flush = true;</div><div class='ctx'> 		offset = iommu_area_alloc(iommu_gart_bitmap, iommu_pages, 0,</div><div class='del'>-					  size, base_index, boundary_size, 0);</div><div class='add'>+					  size, base_index, boundary_size,</div><div class='add'>+					  align_mask);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (offset != -1) {</div><div class='ctx'> 		next_bit = offset+size;</div><div class='ctx'> 		if (next_bit &gt;= iommu_pages) {</div><div class='ctx'> 			next_bit = 0;</div><div class='del'>-			need_flush = 1;</div><div class='add'>+			need_flush = true;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	if (iommu_fullflush)</div><div class='del'>-		need_flush = 1;</div><div class='add'>+		need_flush = true;</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;iommu_bitmap_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	return offset;</div><div class='hunk'>@@ -134,7 +136,7 @@ static void flush_gart(void)</div><div class='ctx'> 	spin_lock_irqsave(&amp;iommu_bitmap_lock, flags);</div><div class='ctx'> 	if (need_flush) {</div><div class='ctx'> 		k8_flush_garts();</div><div class='del'>-		need_flush = 0;</div><div class='add'>+		need_flush = false;</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;iommu_bitmap_lock, flags);</div><div class='ctx'> }</div><div class='hunk'>@@ -173,7 +175,8 @@ static void dump_leak(void)</div><div class='ctx'> 	       iommu_leak_pages);</div><div class='ctx'> 	for (i = 0; i &lt; iommu_leak_pages; i += 2) {</div><div class='ctx'> 		printk(KERN_DEBUG "%lu: ", iommu_pages-i);</div><div class='del'>-		printk_address((unsigned long) iommu_leak_tab[iommu_pages-i], 0);</div><div class='add'>+		printk_address((unsigned long) iommu_leak_tab[iommu_pages-i],</div><div class='add'>+				0);</div><div class='ctx'> 		printk(KERN_CONT "%c", (i+1)%2 == 0 ? '\n' : ' ');</div><div class='ctx'> 	}</div><div class='ctx'> 	printk(KERN_DEBUG "\n");</div><div class='hunk'>@@ -212,34 +215,24 @@ static void iommu_full(struct device *dev, size_t size, int dir)</div><div class='ctx'> static inline int</div><div class='ctx'> need_iommu(struct device *dev, unsigned long addr, size_t size)</div><div class='ctx'> {</div><div class='del'>-	u64 mask = *dev-&gt;dma_mask;</div><div class='del'>-	int high = addr + size &gt; mask;</div><div class='del'>-	int mmu = high;</div><div class='del'>-</div><div class='del'>-	if (force_iommu)</div><div class='del'>-		mmu = 1;</div><div class='del'>-</div><div class='del'>-	return mmu;</div><div class='add'>+	return force_iommu ||</div><div class='add'>+		!is_buffer_dma_capable(*dev-&gt;dma_mask, addr, size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int</div><div class='ctx'> nonforced_iommu(struct device *dev, unsigned long addr, size_t size)</div><div class='ctx'> {</div><div class='del'>-	u64 mask = *dev-&gt;dma_mask;</div><div class='del'>-	int high = addr + size &gt; mask;</div><div class='del'>-	int mmu = high;</div><div class='del'>-</div><div class='del'>-	return mmu;</div><div class='add'>+	return !is_buffer_dma_capable(*dev-&gt;dma_mask, addr, size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Map a single continuous physical area into the IOMMU.</div><div class='ctx'>  * Caller needs to check if the iommu is needed and flush.</div><div class='ctx'>  */</div><div class='ctx'> static dma_addr_t dma_map_area(struct device *dev, dma_addr_t phys_mem,</div><div class='del'>-				size_t size, int dir)</div><div class='add'>+				size_t size, int dir, unsigned long align_mask)</div><div class='ctx'> {</div><div class='del'>-	unsigned long npages = iommu_num_pages(phys_mem, size);</div><div class='del'>-	unsigned long iommu_page = alloc_iommu(dev, npages);</div><div class='add'>+	unsigned long npages = iommu_num_pages(phys_mem, size, PAGE_SIZE);</div><div class='add'>+	unsigned long iommu_page = alloc_iommu(dev, npages, align_mask);</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (iommu_page == -1) {</div><div class='hunk'>@@ -259,16 +252,6 @@ static dma_addr_t dma_map_area(struct device *dev, dma_addr_t phys_mem,</div><div class='ctx'> 	return iommu_bus_base + iommu_page*PAGE_SIZE + (phys_mem &amp; ~PAGE_MASK);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static dma_addr_t</div><div class='del'>-gart_map_simple(struct device *dev, phys_addr_t paddr, size_t size, int dir)</div><div class='del'>-{</div><div class='del'>-	dma_addr_t map = dma_map_area(dev, paddr, size, dir);</div><div class='del'>-</div><div class='del'>-	flush_gart();</div><div class='del'>-</div><div class='del'>-	return map;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* Map a single area into the IOMMU */</div><div class='ctx'> static dma_addr_t</div><div class='ctx'> gart_map_single(struct device *dev, phys_addr_t paddr, size_t size, int dir)</div><div class='hunk'>@@ -276,12 +259,13 @@ gart_map_single(struct device *dev, phys_addr_t paddr, size_t size, int dir)</div><div class='ctx'> 	unsigned long bus;</div><div class='ctx'> </div><div class='ctx'> 	if (!dev)</div><div class='del'>-		dev = &amp;fallback_dev;</div><div class='add'>+		dev = &amp;x86_dma_fallback_dev;</div><div class='ctx'> </div><div class='ctx'> 	if (!need_iommu(dev, paddr, size))</div><div class='ctx'> 		return paddr;</div><div class='ctx'> </div><div class='del'>-	bus = gart_map_simple(dev, paddr, size, dir);</div><div class='add'>+	bus = dma_map_area(dev, paddr, size, dir, 0);</div><div class='add'>+	flush_gart();</div><div class='ctx'> </div><div class='ctx'> 	return bus;</div><div class='ctx'> }</div><div class='hunk'>@@ -301,7 +285,7 @@ static void gart_unmap_single(struct device *dev, dma_addr_t dma_addr,</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	iommu_page = (dma_addr - iommu_bus_base)&gt;&gt;PAGE_SHIFT;</div><div class='del'>-	npages = iommu_num_pages(dma_addr, size);</div><div class='add'>+	npages = iommu_num_pages(dma_addr, size, PAGE_SIZE);</div><div class='ctx'> 	for (i = 0; i &lt; npages; i++) {</div><div class='ctx'> 		iommu_gatt_base[iommu_page + i] = gart_unmapped_entry;</div><div class='ctx'> 		CLEAR_LEAK(iommu_page + i);</div><div class='hunk'>@@ -340,7 +324,7 @@ static int dma_map_sg_nonforce(struct device *dev, struct scatterlist *sg,</div><div class='ctx'> 		unsigned long addr = sg_phys(s);</div><div class='ctx'> </div><div class='ctx'> 		if (nonforced_iommu(dev, addr, s-&gt;length)) {</div><div class='del'>-			addr = dma_map_area(dev, addr, s-&gt;length, dir);</div><div class='add'>+			addr = dma_map_area(dev, addr, s-&gt;length, dir, 0);</div><div class='ctx'> 			if (addr == bad_dma_address) {</div><div class='ctx'> 				if (i &gt; 0)</div><div class='ctx'> 					gart_unmap_sg(dev, sg, i, dir);</div><div class='hunk'>@@ -362,7 +346,7 @@ static int __dma_map_cont(struct device *dev, struct scatterlist *start,</div><div class='ctx'> 			  int nelems, struct scatterlist *sout,</div><div class='ctx'> 			  unsigned long pages)</div><div class='ctx'> {</div><div class='del'>-	unsigned long iommu_start = alloc_iommu(dev, pages);</div><div class='add'>+	unsigned long iommu_start = alloc_iommu(dev, pages, 0);</div><div class='ctx'> 	unsigned long iommu_page = iommu_start;</div><div class='ctx'> 	struct scatterlist *s;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -384,7 +368,7 @@ static int __dma_map_cont(struct device *dev, struct scatterlist *start,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		addr = phys_addr;</div><div class='del'>-		pages = iommu_num_pages(s-&gt;offset, s-&gt;length);</div><div class='add'>+		pages = iommu_num_pages(s-&gt;offset, s-&gt;length, PAGE_SIZE);</div><div class='ctx'> 		while (pages--) {</div><div class='ctx'> 			iommu_gatt_base[iommu_page] = GPTE_ENCODE(addr);</div><div class='ctx'> 			SET_LEAK(iommu_page);</div><div class='hunk'>@@ -427,7 +411,7 @@ gart_map_sg(struct device *dev, struct scatterlist *sg, int nents, int dir)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!dev)</div><div class='del'>-		dev = &amp;fallback_dev;</div><div class='add'>+		dev = &amp;x86_dma_fallback_dev;</div><div class='ctx'> </div><div class='ctx'> 	out = 0;</div><div class='ctx'> 	start = 0;</div><div class='hunk'>@@ -467,7 +451,7 @@ gart_map_sg(struct device *dev, struct scatterlist *sg, int nents, int dir)</div><div class='ctx'> </div><div class='ctx'> 		seg_size += s-&gt;length;</div><div class='ctx'> 		need = nextneed;</div><div class='del'>-		pages += iommu_num_pages(s-&gt;offset, s-&gt;length);</div><div class='add'>+		pages += iommu_num_pages(s-&gt;offset, s-&gt;length, PAGE_SIZE);</div><div class='ctx'> 		ps = s;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (dma_map_cont(dev, start_sg, i - start, sgmap, pages, need) &lt; 0)</div><div class='hunk'>@@ -499,6 +483,46 @@ error:</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* allocate and map a coherent mapping */</div><div class='add'>+static void *</div><div class='add'>+gart_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_addr,</div><div class='add'>+		    gfp_t flag)</div><div class='add'>+{</div><div class='add'>+	dma_addr_t paddr;</div><div class='add'>+	unsigned long align_mask;</div><div class='add'>+	struct page *page;</div><div class='add'>+</div><div class='add'>+	if (force_iommu &amp;&amp; !(flag &amp; GFP_DMA)) {</div><div class='add'>+		flag &amp;= ~(__GFP_DMA | __GFP_HIGHMEM | __GFP_DMA32);</div><div class='add'>+		page = alloc_pages(flag | __GFP_ZERO, get_order(size));</div><div class='add'>+		if (!page)</div><div class='add'>+			return NULL;</div><div class='add'>+</div><div class='add'>+		align_mask = (1UL &lt;&lt; get_order(size)) - 1;</div><div class='add'>+		paddr = dma_map_area(dev, page_to_phys(page), size,</div><div class='add'>+				     DMA_BIDIRECTIONAL, align_mask);</div><div class='add'>+</div><div class='add'>+		flush_gart();</div><div class='add'>+		if (paddr != bad_dma_address) {</div><div class='add'>+			*dma_addr = paddr;</div><div class='add'>+			return page_address(page);</div><div class='add'>+		}</div><div class='add'>+		__free_pages(page, get_order(size));</div><div class='add'>+	} else</div><div class='add'>+		return dma_generic_alloc_coherent(dev, size, dma_addr, flag);</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* free a coherent mapping */</div><div class='add'>+static void</div><div class='add'>+gart_free_coherent(struct device *dev, size_t size, void *vaddr,</div><div class='add'>+		   dma_addr_t dma_addr)</div><div class='add'>+{</div><div class='add'>+	gart_unmap_single(dev, dma_addr, size, DMA_BIDIRECTIONAL);</div><div class='add'>+	free_pages((unsigned long)vaddr, get_order(size));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int no_agp;</div><div class='ctx'> </div><div class='ctx'> static __init unsigned long check_iommu_size(unsigned long aper, u64 aper_size)</div><div class='hunk'>@@ -649,13 +673,13 @@ static __init int init_k8_gatt(struct agp_kern_info *info)</div><div class='ctx'> 	info-&gt;aper_size = aper_size &gt;&gt; 20;</div><div class='ctx'> </div><div class='ctx'> 	gatt_size = (aper_size &gt;&gt; PAGE_SHIFT) * sizeof(u32);</div><div class='del'>-	gatt = (void *)__get_free_pages(GFP_KERNEL, get_order(gatt_size));</div><div class='add'>+	gatt = (void *)__get_free_pages(GFP_KERNEL | __GFP_ZERO,</div><div class='add'>+					get_order(gatt_size));</div><div class='ctx'> 	if (!gatt)</div><div class='ctx'> 		panic("Cannot allocate GATT table");</div><div class='ctx'> 	if (set_memory_uc((unsigned long)gatt, gatt_size &gt;&gt; PAGE_SHIFT))</div><div class='ctx'> 		panic("Could not set GART PTEs to uncacheable pages");</div><div class='ctx'> </div><div class='del'>-	memset(gatt, 0, gatt_size);</div><div class='ctx'> 	agp_gatt_table = gatt;</div><div class='ctx'> </div><div class='ctx'> 	enable_gart_translations();</div><div class='hunk'>@@ -664,7 +688,8 @@ static __init int init_k8_gatt(struct agp_kern_info *info)</div><div class='ctx'> 	if (!error)</div><div class='ctx'> 		error = sysdev_register(&amp;device_gart);</div><div class='ctx'> 	if (error)</div><div class='del'>-		panic("Could not register gart_sysdev -- would corrupt data on next suspend");</div><div class='add'>+		panic("Could not register gart_sysdev -- "</div><div class='add'>+		      "would corrupt data on next suspend");</div><div class='ctx'> </div><div class='ctx'> 	flush_gart();</div><div class='ctx'> </div><div class='hunk'>@@ -680,20 +705,13 @@ static __init int init_k8_gatt(struct agp_kern_info *info)</div><div class='ctx'> 	return -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-extern int agp_amd64_init(void);</div><div class='del'>-</div><div class='ctx'> static struct dma_mapping_ops gart_dma_ops = {</div><div class='ctx'> 	.map_single			= gart_map_single,</div><div class='del'>-	.map_simple			= gart_map_simple,</div><div class='ctx'> 	.unmap_single			= gart_unmap_single,</div><div class='del'>-	.sync_single_for_cpu		= NULL,</div><div class='del'>-	.sync_single_for_device		= NULL,</div><div class='del'>-	.sync_single_range_for_cpu	= NULL,</div><div class='del'>-	.sync_single_range_for_device	= NULL,</div><div class='del'>-	.sync_sg_for_cpu		= NULL,</div><div class='del'>-	.sync_sg_for_device		= NULL,</div><div class='ctx'> 	.map_sg				= gart_map_sg,</div><div class='ctx'> 	.unmap_sg			= gart_unmap_sg,</div><div class='add'>+	.alloc_coherent			= gart_alloc_coherent,</div><div class='add'>+	.free_coherent			= gart_free_coherent,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void gart_iommu_shutdown(void)</div><div class='hunk'>@@ -753,8 +771,8 @@ void __init gart_iommu_init(void)</div><div class='ctx'> 	    (no_agp &amp;&amp; init_k8_gatt(&amp;info) &lt; 0)) {</div><div class='ctx'> 		if (max_pfn &gt; MAX_DMA32_PFN) {</div><div class='ctx'> 			printk(KERN_WARNING "More than 4GB of memory "</div><div class='del'>-			       	          "but GART IOMMU not available.\n"</div><div class='del'>-			       KERN_WARNING "falling back to iommu=soft.\n");</div><div class='add'>+			       "but GART IOMMU not available.\n");</div><div class='add'>+			printk(KERN_WARNING "falling back to iommu=soft.\n");</div><div class='ctx'> 		}</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -772,19 +790,16 @@ void __init gart_iommu_init(void)</div><div class='ctx'> 	iommu_size = check_iommu_size(info.aper_base, aper_size);</div><div class='ctx'> 	iommu_pages = iommu_size &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> </div><div class='del'>-	iommu_gart_bitmap = (void *) __get_free_pages(GFP_KERNEL,</div><div class='add'>+	iommu_gart_bitmap = (void *) __get_free_pages(GFP_KERNEL | __GFP_ZERO,</div><div class='ctx'> 						      get_order(iommu_pages/8));</div><div class='ctx'> 	if (!iommu_gart_bitmap)</div><div class='ctx'> 		panic("Cannot allocate iommu bitmap\n");</div><div class='del'>-	memset(iommu_gart_bitmap, 0, iommu_pages/8);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_IOMMU_LEAK</div><div class='ctx'> 	if (leak_trace) {</div><div class='del'>-		iommu_leak_tab = (void *)__get_free_pages(GFP_KERNEL,</div><div class='add'>+		iommu_leak_tab = (void *)__get_free_pages(GFP_KERNEL|__GFP_ZERO,</div><div class='ctx'> 				  get_order(iommu_pages*sizeof(void *)));</div><div class='del'>-		if (iommu_leak_tab)</div><div class='del'>-			memset(iommu_leak_tab, 0, iommu_pages * 8);</div><div class='del'>-		else</div><div class='add'>+		if (!iommu_leak_tab)</div><div class='ctx'> 			printk(KERN_DEBUG</div><div class='ctx'> 			       "PCI-DMA: Cannot allocate leak trace area\n");</div><div class='ctx'> 	}</div><div class='hunk'>@@ -794,7 +809,7 @@ void __init gart_iommu_init(void)</div><div class='ctx'> 	 * Out of IOMMU space handling.</div><div class='ctx'> 	 * Reserve some invalid pages at the beginning of the GART.</div><div class='ctx'> 	 */</div><div class='del'>-	set_bit_string(iommu_gart_bitmap, 0, EMERGENCY_PAGES);</div><div class='add'>+	iommu_area_reserve(iommu_gart_bitmap, 0, EMERGENCY_PAGES);</div><div class='ctx'> </div><div class='ctx'> 	agp_memory_reserved = iommu_size;</div><div class='ctx'> 	printk(KERN_INFO</div><div class='hunk'>@@ -852,7 +867,8 @@ void __init gart_parse_options(char *p)</div><div class='ctx'> 	if (!strncmp(p, "leak", 4)) {</div><div class='ctx'> 		leak_trace = 1;</div><div class='ctx'> 		p += 4;</div><div class='del'>-		if (*p == '=') ++p;</div><div class='add'>+		if (*p == '=')</div><div class='add'>+			++p;</div><div class='ctx'> 		if (isdigit(*p) &amp;&amp; get_option(&amp;p, &amp;arg))</div><div class='ctx'> 			iommu_leak_pages = arg;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/x86/kernel/pci-nommu.c b/arch/x86/kernel/pci-nommu.c<br/>index 3f91f71cdc3e..c70ab5a5d4c8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/pci-nommu.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/pci-nommu.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/pci-nommu.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/pci-nommu.c</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'> static int</div><div class='ctx'> check_addr(char *name, struct device *hwdev, dma_addr_t bus, size_t size)</div><div class='ctx'> {</div><div class='del'>-	if (hwdev &amp;&amp; bus + size &gt; *hwdev-&gt;dma_mask) {</div><div class='add'>+	if (hwdev &amp;&amp; !is_buffer_dma_capable(*hwdev-&gt;dma_mask, bus, size)) {</div><div class='ctx'> 		if (*hwdev-&gt;dma_mask &gt;= DMA_32BIT_MASK)</div><div class='ctx'> 			printk(KERN_ERR</div><div class='ctx'> 			    "nommu_%s: overflow %Lx+%zu of device mask %Lx\n",</div><div class='hunk'>@@ -72,7 +72,15 @@ static int nommu_map_sg(struct device *hwdev, struct scatterlist *sg,</div><div class='ctx'> 	return nents;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void nommu_free_coherent(struct device *dev, size_t size, void *vaddr,</div><div class='add'>+				dma_addr_t dma_addr)</div><div class='add'>+{</div><div class='add'>+	free_pages((unsigned long)vaddr, get_order(size));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> struct dma_mapping_ops nommu_dma_ops = {</div><div class='add'>+	.alloc_coherent = dma_generic_alloc_coherent,</div><div class='add'>+	.free_coherent = nommu_free_coherent,</div><div class='ctx'> 	.map_single = nommu_map_single,</div><div class='ctx'> 	.map_sg = nommu_map_sg,</div><div class='ctx'> 	.is_phys = 1,</div><div class='head'>diff --git a/arch/x86/kernel/pcspeaker.c b/arch/x86/kernel/pcspeaker.c<br/>index bc1f2d3ea277..a311ffcaad16 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/pcspeaker.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/pcspeaker.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/pcspeaker.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/pcspeaker.c</a></div><div class='hunk'>@@ -1,20 +1,13 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='ctx'> static __init int add_pcspkr(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct platform_device *pd;</div><div class='del'>-	int ret;</div><div class='ctx'> </div><div class='del'>-	pd = platform_device_alloc("pcspkr", -1);</div><div class='del'>-	if (!pd)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	pd = platform_device_register_simple("pcspkr", -1, NULL, 0);</div><div class='ctx'> </div><div class='del'>-	ret = platform_device_add(pd);</div><div class='del'>-	if (ret)</div><div class='del'>-		platform_device_put(pd);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='add'>+	return IS_ERR(pd) ? PTR_ERR(pd) : 0;</div><div class='ctx'> }</div><div class='ctx'> device_initcall(add_pcspkr);</div><div class='head'>diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c<br/>index 876e91890777..c622772744d8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/process.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/process.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/process.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/process.c</a></div><div class='hunk'>@@ -15,7 +15,6 @@ unsigned long idle_nomwait;</div><div class='ctx'> EXPORT_SYMBOL(idle_nomwait);</div><div class='ctx'> </div><div class='ctx'> struct kmem_cache *task_xstate_cachep;</div><div class='del'>-static int force_mwait __cpuinitdata;</div><div class='ctx'> </div><div class='ctx'> int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src)</div><div class='ctx'> {</div><div class='hunk'>@@ -185,7 +184,8 @@ static void mwait_idle(void)</div><div class='ctx'> static void poll_idle(void)</div><div class='ctx'> {</div><div class='ctx'> 	local_irq_enable();</div><div class='del'>-	cpu_relax();</div><div class='add'>+	while (!need_resched())</div><div class='add'>+		cpu_relax();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c<br/>index 31f40b24bf5d..0a1302fe6d45 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/process_32.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/process_32.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/process_32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/process_32.c</a></div><div class='hunk'>@@ -37,6 +37,7 @@</div><div class='ctx'> #include &lt;linux/tick.h&gt;</div><div class='ctx'> #include &lt;linux/percpu.h&gt;</div><div class='ctx'> #include &lt;linux/prctl.h&gt;</div><div class='add'>+#include &lt;linux/dmi.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='hunk'>@@ -56,6 +57,8 @@</div><div class='ctx'> #include &lt;asm/cpu.h&gt;</div><div class='ctx'> #include &lt;asm/kdebug.h&gt;</div><div class='ctx'> #include &lt;asm/idle.h&gt;</div><div class='add'>+#include &lt;asm/syscalls.h&gt;</div><div class='add'>+#include &lt;asm/smp.h&gt;</div><div class='ctx'> </div><div class='ctx'> asmlinkage void ret_from_fork(void) __asm__("ret_from_fork");</div><div class='ctx'> </div><div class='hunk'>@@ -73,47 +76,12 @@ unsigned long thread_saved_pc(struct task_struct *tsk)</div><div class='ctx'> 	return ((unsigned long *)tsk-&gt;thread.sp)[3];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_HOTPLUG_CPU</div><div class='del'>-#include &lt;asm/nmi.h&gt;</div><div class='del'>-</div><div class='del'>-static void cpu_exit_clear(void)</div><div class='del'>-{</div><div class='del'>-	int cpu = raw_smp_processor_id();</div><div class='del'>-</div><div class='del'>-	idle_task_exit();</div><div class='del'>-</div><div class='del'>-	cpu_uninit();</div><div class='del'>-	irq_ctx_exit(cpu);</div><div class='del'>-</div><div class='del'>-	cpu_clear(cpu, cpu_callout_map);</div><div class='del'>-	cpu_clear(cpu, cpu_callin_map);</div><div class='del'>-</div><div class='del'>-	numa_remove_cpu(cpu);</div><div class='del'>-	c1e_remove_cpu(cpu);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* We don't actually take CPU down, just spin without interrupts. */</div><div class='del'>-static inline void play_dead(void)</div><div class='del'>-{</div><div class='del'>-	/* This must be done before dead CPU ack */</div><div class='del'>-	cpu_exit_clear();</div><div class='del'>-	mb();</div><div class='del'>-	/* Ack it */</div><div class='del'>-	__get_cpu_var(cpu_state) = CPU_DEAD;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * With physical CPU hotplug, we should halt the cpu</div><div class='del'>-	 */</div><div class='del'>-	local_irq_disable();</div><div class='del'>-	/* mask all interrupts, flush any and all caches, and halt */</div><div class='del'>-	wbinvd_halt();</div><div class='del'>-}</div><div class='del'>-#else</div><div class='add'>+#ifndef CONFIG_SMP</div><div class='ctx'> static inline void play_dead(void)</div><div class='ctx'> {</div><div class='ctx'> 	BUG();</div><div class='ctx'> }</div><div class='del'>-#endif /* CONFIG_HOTPLUG_CPU */</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * The idle thread. There's no useful work to be</div><div class='hunk'>@@ -155,12 +123,13 @@ void cpu_idle(void)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __show_registers(struct pt_regs *regs, int all)</div><div class='add'>+void __show_regs(struct pt_regs *regs, int all)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long cr0 = 0L, cr2 = 0L, cr3 = 0L, cr4 = 0L;</div><div class='ctx'> 	unsigned long d0, d1, d2, d3, d6, d7;</div><div class='ctx'> 	unsigned long sp;</div><div class='ctx'> 	unsigned short ss, gs;</div><div class='add'>+	const char *board;</div><div class='ctx'> </div><div class='ctx'> 	if (user_mode_vm(regs)) {</div><div class='ctx'> 		sp = regs-&gt;sp;</div><div class='hunk'>@@ -173,11 +142,15 @@ void __show_registers(struct pt_regs *regs, int all)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	printk("\n");</div><div class='del'>-	printk("Pid: %d, comm: %s %s (%s %.*s)\n",</div><div class='add'>+</div><div class='add'>+	board = dmi_get_system_info(DMI_PRODUCT_NAME);</div><div class='add'>+	if (!board)</div><div class='add'>+		board = "";</div><div class='add'>+	printk("Pid: %d, comm: %s %s (%s %.*s) %s\n",</div><div class='ctx'> 			task_pid_nr(current), current-&gt;comm,</div><div class='ctx'> 			print_tainted(), init_utsname()-&gt;release,</div><div class='ctx'> 			(int)strcspn(init_utsname()-&gt;version, " "),</div><div class='del'>-			init_utsname()-&gt;version);</div><div class='add'>+			init_utsname()-&gt;version, board);</div><div class='ctx'> </div><div class='ctx'> 	printk("EIP: %04x:[&lt;%08lx&gt;] EFLAGS: %08lx CPU: %d\n",</div><div class='ctx'> 			(u16)regs-&gt;cs, regs-&gt;ip, regs-&gt;flags,</div><div class='hunk'>@@ -216,7 +189,7 @@ void __show_registers(struct pt_regs *regs, int all)</div><div class='ctx'> </div><div class='ctx'> void show_regs(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='del'>-	__show_registers(regs, 1);</div><div class='add'>+	__show_regs(regs, 1);</div><div class='ctx'> 	show_trace(NULL, regs, &amp;regs-&gt;sp, regs-&gt;bp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -277,6 +250,14 @@ void exit_thread(void)</div><div class='ctx'> 		tss-&gt;x86_tss.io_bitmap_base = INVALID_IO_BITMAP_OFFSET;</div><div class='ctx'> 		put_cpu();</div><div class='ctx'> 	}</div><div class='add'>+#ifdef CONFIG_X86_DS</div><div class='add'>+	/* Free any DS contexts that have not been properly released. */</div><div class='add'>+	if (unlikely(current-&gt;thread.ds_ctx)) {</div><div class='add'>+		/* we clear debugctl to make sure DS is not used. */</div><div class='add'>+		update_debugctlmsr(0);</div><div class='add'>+		ds_free(current-&gt;thread.ds_ctx);</div><div class='add'>+	}</div><div class='add'>+#endif /* CONFIG_X86_DS */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void flush_thread(void)</div><div class='hunk'>@@ -438,6 +419,35 @@ int set_tsc_mode(unsigned int val)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_X86_DS</div><div class='add'>+static int update_debugctl(struct thread_struct *prev,</div><div class='add'>+			struct thread_struct *next, unsigned long debugctl)</div><div class='add'>+{</div><div class='add'>+	unsigned long ds_prev = 0;</div><div class='add'>+	unsigned long ds_next = 0;</div><div class='add'>+</div><div class='add'>+	if (prev-&gt;ds_ctx)</div><div class='add'>+		ds_prev = (unsigned long)prev-&gt;ds_ctx-&gt;ds;</div><div class='add'>+	if (next-&gt;ds_ctx)</div><div class='add'>+		ds_next = (unsigned long)next-&gt;ds_ctx-&gt;ds;</div><div class='add'>+</div><div class='add'>+	if (ds_next != ds_prev) {</div><div class='add'>+		/* we clear debugctl to make sure DS</div><div class='add'>+		 * is not in use when we change it */</div><div class='add'>+		debugctl = 0;</div><div class='add'>+		update_debugctlmsr(0);</div><div class='add'>+		wrmsr(MSR_IA32_DS_AREA, ds_next, 0);</div><div class='add'>+	}</div><div class='add'>+	return debugctl;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static int update_debugctl(struct thread_struct *prev,</div><div class='add'>+			struct thread_struct *next, unsigned long debugctl)</div><div class='add'>+{</div><div class='add'>+	return debugctl;</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_X86_DS */</div><div class='add'>+</div><div class='ctx'> static noinline void</div><div class='ctx'> __switch_to_xtra(struct task_struct *prev_p, struct task_struct *next_p,</div><div class='ctx'> 		 struct tss_struct *tss)</div><div class='hunk'>@@ -448,14 +458,7 @@ __switch_to_xtra(struct task_struct *prev_p, struct task_struct *next_p,</div><div class='ctx'> 	prev = &amp;prev_p-&gt;thread;</div><div class='ctx'> 	next = &amp;next_p-&gt;thread;</div><div class='ctx'> </div><div class='del'>-	debugctl = prev-&gt;debugctlmsr;</div><div class='del'>-	if (next-&gt;ds_area_msr != prev-&gt;ds_area_msr) {</div><div class='del'>-		/* we clear debugctl to make sure DS</div><div class='del'>-		 * is not in use when we change it */</div><div class='del'>-		debugctl = 0;</div><div class='del'>-		update_debugctlmsr(0);</div><div class='del'>-		wrmsr(MSR_IA32_DS_AREA, next-&gt;ds_area_msr, 0);</div><div class='del'>-	}</div><div class='add'>+	debugctl = update_debugctl(prev, next, prev-&gt;debugctlmsr);</div><div class='ctx'> </div><div class='ctx'> 	if (next-&gt;debugctlmsr != debugctl)</div><div class='ctx'> 		update_debugctlmsr(next-&gt;debugctlmsr);</div><div class='hunk'>@@ -479,13 +482,13 @@ __switch_to_xtra(struct task_struct *prev_p, struct task_struct *next_p,</div><div class='ctx'> 			hard_enable_TSC();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-#ifdef X86_BTS</div><div class='add'>+#ifdef CONFIG_X86_PTRACE_BTS</div><div class='ctx'> 	if (test_tsk_thread_flag(prev_p, TIF_BTS_TRACE_TS))</div><div class='ctx'> 		ptrace_bts_take_timestamp(prev_p, BTS_TASK_DEPARTS);</div><div class='ctx'> </div><div class='ctx'> 	if (test_tsk_thread_flag(next_p, TIF_BTS_TRACE_TS))</div><div class='ctx'> 		ptrace_bts_take_timestamp(next_p, BTS_TASK_ARRIVES);</div><div class='del'>-#endif</div><div class='add'>+#endif /* CONFIG_X86_PTRACE_BTS */</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 	if (!test_tsk_thread_flag(next_p, TIF_IO_BITMAP)) {</div><div class='head'>diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c<br/>index e12e0e4dd256..cd8c0ed02b7e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/process_64.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/process_64.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/process_64.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/process_64.c</a></div><div class='hunk'>@@ -37,11 +37,11 @@</div><div class='ctx'> #include &lt;linux/kdebug.h&gt;</div><div class='ctx'> #include &lt;linux/tick.h&gt;</div><div class='ctx'> #include &lt;linux/prctl.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/i387.h&gt;</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='hunk'>@@ -51,6 +51,7 @@</div><div class='ctx'> #include &lt;asm/proto.h&gt;</div><div class='ctx'> #include &lt;asm/ia32.h&gt;</div><div class='ctx'> #include &lt;asm/idle.h&gt;</div><div class='add'>+#include &lt;asm/syscalls.h&gt;</div><div class='ctx'> </div><div class='ctx'> asmlinkage extern void ret_from_fork(void);</div><div class='ctx'> </div><div class='hunk'>@@ -85,30 +86,12 @@ void exit_idle(void)</div><div class='ctx'> 	__exit_idle();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_HOTPLUG_CPU</div><div class='del'>-DECLARE_PER_CPU(int, cpu_state);</div><div class='del'>-</div><div class='del'>-#include &lt;asm/nmi.h&gt;</div><div class='del'>-/* We halt the CPU with physical CPU hotplug */</div><div class='del'>-static inline void play_dead(void)</div><div class='del'>-{</div><div class='del'>-	idle_task_exit();</div><div class='del'>-	c1e_remove_cpu(raw_smp_processor_id());</div><div class='del'>-</div><div class='del'>-	mb();</div><div class='del'>-	/* Ack it */</div><div class='del'>-	__get_cpu_var(cpu_state) = CPU_DEAD;</div><div class='del'>-</div><div class='del'>-	local_irq_disable();</div><div class='del'>-	/* mask all interrupts, flush any and all caches, and halt */</div><div class='del'>-	wbinvd_halt();</div><div class='del'>-}</div><div class='del'>-#else</div><div class='add'>+#ifndef CONFIG_SMP</div><div class='ctx'> static inline void play_dead(void)</div><div class='ctx'> {</div><div class='ctx'> 	BUG();</div><div class='ctx'> }</div><div class='del'>-#endif /* CONFIG_HOTPLUG_CPU */</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * The idle thread. There's no useful work to be</div><div class='hunk'>@@ -153,7 +136,7 @@ void cpu_idle(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Prints also some state that isn't saved in the pt_regs */</div><div class='del'>-void __show_regs(struct pt_regs * regs)</div><div class='add'>+void __show_regs(struct pt_regs *regs, int all)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long cr0 = 0L, cr2 = 0L, cr3 = 0L, cr4 = 0L, fs, gs, shadowgs;</div><div class='ctx'> 	unsigned long d0, d1, d2, d3, d6, d7;</div><div class='hunk'>@@ -162,60 +145,65 @@ void __show_regs(struct pt_regs * regs)</div><div class='ctx'> </div><div class='ctx'> 	printk("\n");</div><div class='ctx'> 	print_modules();</div><div class='del'>-	printk("Pid: %d, comm: %.20s %s %s %.*s\n",</div><div class='add'>+	printk(KERN_INFO "Pid: %d, comm: %.20s %s %s %.*s\n",</div><div class='ctx'> 		current-&gt;pid, current-&gt;comm, print_tainted(),</div><div class='ctx'> 		init_utsname()-&gt;release,</div><div class='ctx'> 		(int)strcspn(init_utsname()-&gt;version, " "),</div><div class='ctx'> 		init_utsname()-&gt;version);</div><div class='del'>-	printk("RIP: %04lx:[&lt;%016lx&gt;] ", regs-&gt;cs &amp; 0xffff, regs-&gt;ip);</div><div class='add'>+	printk(KERN_INFO "RIP: %04lx:[&lt;%016lx&gt;] ", regs-&gt;cs &amp; 0xffff, regs-&gt;ip);</div><div class='ctx'> 	printk_address(regs-&gt;ip, 1);</div><div class='del'>-	printk("RSP: %04lx:%016lx  EFLAGS: %08lx\n", regs-&gt;ss, regs-&gt;sp,</div><div class='del'>-		regs-&gt;flags);</div><div class='del'>-	printk("RAX: %016lx RBX: %016lx RCX: %016lx\n",</div><div class='add'>+	printk(KERN_INFO "RSP: %04lx:%016lx  EFLAGS: %08lx\n", regs-&gt;ss,</div><div class='add'>+			regs-&gt;sp, regs-&gt;flags);</div><div class='add'>+	printk(KERN_INFO "RAX: %016lx RBX: %016lx RCX: %016lx\n",</div><div class='ctx'> 	       regs-&gt;ax, regs-&gt;bx, regs-&gt;cx);</div><div class='del'>-	printk("RDX: %016lx RSI: %016lx RDI: %016lx\n",</div><div class='add'>+	printk(KERN_INFO "RDX: %016lx RSI: %016lx RDI: %016lx\n",</div><div class='ctx'> 	       regs-&gt;dx, regs-&gt;si, regs-&gt;di);</div><div class='del'>-	printk("RBP: %016lx R08: %016lx R09: %016lx\n",</div><div class='add'>+	printk(KERN_INFO "RBP: %016lx R08: %016lx R09: %016lx\n",</div><div class='ctx'> 	       regs-&gt;bp, regs-&gt;r8, regs-&gt;r9);</div><div class='del'>-	printk("R10: %016lx R11: %016lx R12: %016lx\n",</div><div class='del'>-	       regs-&gt;r10, regs-&gt;r11, regs-&gt;r12); </div><div class='del'>-	printk("R13: %016lx R14: %016lx R15: %016lx\n",</div><div class='del'>-	       regs-&gt;r13, regs-&gt;r14, regs-&gt;r15); </div><div class='del'>-</div><div class='del'>-	asm("movl %%ds,%0" : "=r" (ds)); </div><div class='del'>-	asm("movl %%cs,%0" : "=r" (cs)); </div><div class='del'>-	asm("movl %%es,%0" : "=r" (es)); </div><div class='add'>+	printk(KERN_INFO "R10: %016lx R11: %016lx R12: %016lx\n",</div><div class='add'>+	       regs-&gt;r10, regs-&gt;r11, regs-&gt;r12);</div><div class='add'>+	printk(KERN_INFO "R13: %016lx R14: %016lx R15: %016lx\n",</div><div class='add'>+	       regs-&gt;r13, regs-&gt;r14, regs-&gt;r15);</div><div class='add'>+</div><div class='add'>+	asm("movl %%ds,%0" : "=r" (ds));</div><div class='add'>+	asm("movl %%cs,%0" : "=r" (cs));</div><div class='add'>+	asm("movl %%es,%0" : "=r" (es));</div><div class='ctx'> 	asm("movl %%fs,%0" : "=r" (fsindex));</div><div class='ctx'> 	asm("movl %%gs,%0" : "=r" (gsindex));</div><div class='ctx'> </div><div class='ctx'> 	rdmsrl(MSR_FS_BASE, fs);</div><div class='del'>-	rdmsrl(MSR_GS_BASE, gs); </div><div class='del'>-	rdmsrl(MSR_KERNEL_GS_BASE, shadowgs); </div><div class='add'>+	rdmsrl(MSR_GS_BASE, gs);</div><div class='add'>+	rdmsrl(MSR_KERNEL_GS_BASE, shadowgs);</div><div class='add'>+</div><div class='add'>+	if (!all)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	cr0 = read_cr0();</div><div class='ctx'> 	cr2 = read_cr2();</div><div class='ctx'> 	cr3 = read_cr3();</div><div class='ctx'> 	cr4 = read_cr4();</div><div class='ctx'> </div><div class='del'>-	printk("FS:  %016lx(%04x) GS:%016lx(%04x) knlGS:%016lx\n", </div><div class='del'>-	       fs,fsindex,gs,gsindex,shadowgs); </div><div class='del'>-	printk("CS:  %04x DS: %04x ES: %04x CR0: %016lx\n", cs, ds, es, cr0); </div><div class='del'>-	printk("CR2: %016lx CR3: %016lx CR4: %016lx\n", cr2, cr3, cr4);</div><div class='add'>+	printk(KERN_INFO "FS:  %016lx(%04x) GS:%016lx(%04x) knlGS:%016lx\n",</div><div class='add'>+	       fs, fsindex, gs, gsindex, shadowgs);</div><div class='add'>+	printk(KERN_INFO "CS:  %04x DS: %04x ES: %04x CR0: %016lx\n", cs, ds,</div><div class='add'>+			es, cr0);</div><div class='add'>+	printk(KERN_INFO "CR2: %016lx CR3: %016lx CR4: %016lx\n", cr2, cr3,</div><div class='add'>+			cr4);</div><div class='ctx'> </div><div class='ctx'> 	get_debugreg(d0, 0);</div><div class='ctx'> 	get_debugreg(d1, 1);</div><div class='ctx'> 	get_debugreg(d2, 2);</div><div class='del'>-	printk("DR0: %016lx DR1: %016lx DR2: %016lx\n", d0, d1, d2);</div><div class='add'>+	printk(KERN_INFO "DR0: %016lx DR1: %016lx DR2: %016lx\n", d0, d1, d2);</div><div class='ctx'> 	get_debugreg(d3, 3);</div><div class='ctx'> 	get_debugreg(d6, 6);</div><div class='ctx'> 	get_debugreg(d7, 7);</div><div class='del'>-	printk("DR3: %016lx DR6: %016lx DR7: %016lx\n", d3, d6, d7);</div><div class='add'>+	printk(KERN_INFO "DR3: %016lx DR6: %016lx DR7: %016lx\n", d3, d6, d7);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void show_regs(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='del'>-	printk("CPU %d:", smp_processor_id());</div><div class='del'>-	__show_regs(regs);</div><div class='add'>+	printk(KERN_INFO "CPU %d:", smp_processor_id());</div><div class='add'>+	__show_regs(regs, 1);</div><div class='ctx'> 	show_trace(NULL, regs, (void *)(regs + 1), regs-&gt;bp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -240,6 +228,14 @@ void exit_thread(void)</div><div class='ctx'> 		t-&gt;io_bitmap_max = 0;</div><div class='ctx'> 		put_cpu();</div><div class='ctx'> 	}</div><div class='add'>+#ifdef CONFIG_X86_DS</div><div class='add'>+	/* Free any DS contexts that have not been properly released. */</div><div class='add'>+	if (unlikely(t-&gt;ds_ctx)) {</div><div class='add'>+		/* we clear debugctl to make sure DS is not used. */</div><div class='add'>+		update_debugctlmsr(0);</div><div class='add'>+		ds_free(t-&gt;ds_ctx);</div><div class='add'>+	}</div><div class='add'>+#endif /* CONFIG_X86_DS */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void flush_thread(void)</div><div class='hunk'>@@ -315,10 +311,10 @@ void prepare_to_copy(struct task_struct *tsk)</div><div class='ctx'> </div><div class='ctx'> int copy_thread(int nr, unsigned long clone_flags, unsigned long sp,</div><div class='ctx'> 		unsigned long unused,</div><div class='del'>-	struct task_struct * p, struct pt_regs * regs)</div><div class='add'>+	struct task_struct *p, struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='del'>-	struct pt_regs * childregs;</div><div class='add'>+	struct pt_regs *childregs;</div><div class='ctx'> 	struct task_struct *me = current;</div><div class='ctx'> </div><div class='ctx'> 	childregs = ((struct pt_regs *)</div><div class='hunk'>@@ -363,10 +359,10 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long sp,</div><div class='ctx'> 		if (test_thread_flag(TIF_IA32))</div><div class='ctx'> 			err = do_set_thread_area(p, -1,</div><div class='ctx'> 				(struct user_desc __user *)childregs-&gt;si, 0);</div><div class='del'>-		else 			</div><div class='del'>-#endif	 </div><div class='del'>-			err = do_arch_prctl(p, ARCH_SET_FS, childregs-&gt;r8); </div><div class='del'>-		if (err) </div><div class='add'>+		else</div><div class='add'>+#endif</div><div class='add'>+			err = do_arch_prctl(p, ARCH_SET_FS, childregs-&gt;r8);</div><div class='add'>+		if (err)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	err = 0;</div><div class='hunk'>@@ -473,13 +469,27 @@ static inline void __switch_to_xtra(struct task_struct *prev_p,</div><div class='ctx'> 	next = &amp;next_p-&gt;thread;</div><div class='ctx'> </div><div class='ctx'> 	debugctl = prev-&gt;debugctlmsr;</div><div class='del'>-	if (next-&gt;ds_area_msr != prev-&gt;ds_area_msr) {</div><div class='del'>-		/* we clear debugctl to make sure DS</div><div class='del'>-		 * is not in use when we change it */</div><div class='del'>-		debugctl = 0;</div><div class='del'>-		update_debugctlmsr(0);</div><div class='del'>-		wrmsrl(MSR_IA32_DS_AREA, next-&gt;ds_area_msr);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_X86_DS</div><div class='add'>+	{</div><div class='add'>+		unsigned long ds_prev = 0, ds_next = 0;</div><div class='add'>+</div><div class='add'>+		if (prev-&gt;ds_ctx)</div><div class='add'>+			ds_prev = (unsigned long)prev-&gt;ds_ctx-&gt;ds;</div><div class='add'>+		if (next-&gt;ds_ctx)</div><div class='add'>+			ds_next = (unsigned long)next-&gt;ds_ctx-&gt;ds;</div><div class='add'>+</div><div class='add'>+		if (ds_next != ds_prev) {</div><div class='add'>+			/*</div><div class='add'>+			 * We clear debugctl to make sure DS</div><div class='add'>+			 * is not in use when we change it:</div><div class='add'>+			 */</div><div class='add'>+			debugctl = 0;</div><div class='add'>+			update_debugctlmsr(0);</div><div class='add'>+			wrmsrl(MSR_IA32_DS_AREA, ds_next);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='add'>+#endif /* CONFIG_X86_DS */</div><div class='ctx'> </div><div class='ctx'> 	if (next-&gt;debugctlmsr != debugctl)</div><div class='ctx'> 		update_debugctlmsr(next-&gt;debugctlmsr);</div><div class='hunk'>@@ -517,13 +527,13 @@ static inline void __switch_to_xtra(struct task_struct *prev_p,</div><div class='ctx'> 		memset(tss-&gt;io_bitmap, 0xff, prev-&gt;io_bitmap_max);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-#ifdef X86_BTS</div><div class='add'>+#ifdef CONFIG_X86_PTRACE_BTS</div><div class='ctx'> 	if (test_tsk_thread_flag(prev_p, TIF_BTS_TRACE_TS))</div><div class='ctx'> 		ptrace_bts_take_timestamp(prev_p, BTS_TASK_DEPARTS);</div><div class='ctx'> </div><div class='ctx'> 	if (test_tsk_thread_flag(next_p, TIF_BTS_TRACE_TS))</div><div class='ctx'> 		ptrace_bts_take_timestamp(next_p, BTS_TASK_ARRIVES);</div><div class='del'>-#endif</div><div class='add'>+#endif /* CONFIG_X86_PTRACE_BTS */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -545,7 +555,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)</div><div class='ctx'> 	unsigned fsindex, gsindex;</div><div class='ctx'> </div><div class='ctx'> 	/* we're going to use this soon, after a few expensive things */</div><div class='del'>-	if (next_p-&gt;fpu_counter&gt;5)</div><div class='add'>+	if (next_p-&gt;fpu_counter &gt; 5)</div><div class='ctx'> 		prefetch(next-&gt;xstate);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -553,13 +563,13 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)</div><div class='ctx'> 	 */</div><div class='ctx'> 	load_sp0(tss, next);</div><div class='ctx'> </div><div class='del'>-	/* </div><div class='add'>+	/*</div><div class='ctx'> 	 * Switch DS and ES.</div><div class='ctx'> 	 * This won't pick up thread selector changes, but I guess that is ok.</div><div class='ctx'> 	 */</div><div class='ctx'> 	savesegment(es, prev-&gt;es);</div><div class='ctx'> 	if (unlikely(next-&gt;es | prev-&gt;es))</div><div class='del'>-		loadsegment(es, next-&gt;es); </div><div class='add'>+		loadsegment(es, next-&gt;es);</div><div class='ctx'> </div><div class='ctx'> 	savesegment(ds, prev-&gt;ds);</div><div class='ctx'> 	if (unlikely(next-&gt;ds | prev-&gt;ds))</div><div class='hunk'>@@ -585,7 +595,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)</div><div class='ctx'> 	 */</div><div class='ctx'> 	arch_leave_lazy_cpu_mode();</div><div class='ctx'> </div><div class='del'>-	/* </div><div class='add'>+	/*</div><div class='ctx'> 	 * Switch FS and GS.</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * Segment register != 0 always requires a reload.  Also</div><div class='hunk'>@@ -594,13 +604,13 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (unlikely(fsindex | next-&gt;fsindex | prev-&gt;fs)) {</div><div class='ctx'> 		loadsegment(fs, next-&gt;fsindex);</div><div class='del'>-		/* </div><div class='add'>+		/*</div><div class='ctx'> 		 * Check if the user used a selector != 0; if yes</div><div class='ctx'> 		 *  clear 64bit base, since overloaded base is always</div><div class='ctx'> 		 *  mapped to the Null selector</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (fsindex)</div><div class='del'>-			prev-&gt;fs = 0;				</div><div class='add'>+			prev-&gt;fs = 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* when next process has a 64bit base use it */</div><div class='ctx'> 	if (next-&gt;fs)</div><div class='hunk'>@@ -610,7 +620,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)</div><div class='ctx'> 	if (unlikely(gsindex | next-&gt;gsindex | prev-&gt;gs)) {</div><div class='ctx'> 		load_gs_index(next-&gt;gsindex);</div><div class='ctx'> 		if (gsindex)</div><div class='del'>-			prev-&gt;gs = 0;				</div><div class='add'>+			prev-&gt;gs = 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (next-&gt;gs)</div><div class='ctx'> 		wrmsrl(MSR_KERNEL_GS_BASE, next-&gt;gs);</div><div class='hunk'>@@ -619,12 +629,12 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)</div><div class='ctx'> 	/* Must be after DS reload */</div><div class='ctx'> 	unlazy_fpu(prev_p);</div><div class='ctx'> </div><div class='del'>-	/* </div><div class='add'>+	/*</div><div class='ctx'> 	 * Switch the PDA and FPU contexts.</div><div class='ctx'> 	 */</div><div class='ctx'> 	prev-&gt;usersp = read_pda(oldrsp);</div><div class='ctx'> 	write_pda(oldrsp, next-&gt;usersp);</div><div class='del'>-	write_pda(pcurrent, next_p); </div><div class='add'>+	write_pda(pcurrent, next_p);</div><div class='ctx'> </div><div class='ctx'> 	write_pda(kernelstack,</div><div class='ctx'> 		  (unsigned long)task_stack_page(next_p) +</div><div class='hunk'>@@ -665,7 +675,7 @@ long sys_execve(char __user *name, char __user * __user *argv,</div><div class='ctx'> 		char __user * __user *envp, struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	long error;</div><div class='del'>-	char * filename;</div><div class='add'>+	char *filename;</div><div class='ctx'> </div><div class='ctx'> 	filename = getname(name);</div><div class='ctx'> 	error = PTR_ERR(filename);</div><div class='hunk'>@@ -723,55 +733,55 @@ asmlinkage long sys_vfork(struct pt_regs *regs)</div><div class='ctx'> unsigned long get_wchan(struct task_struct *p)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long stack;</div><div class='del'>-	u64 fp,ip;</div><div class='add'>+	u64 fp, ip;</div><div class='ctx'> 	int count = 0;</div><div class='ctx'> </div><div class='del'>-	if (!p || p == current || p-&gt;state==TASK_RUNNING)</div><div class='del'>-		return 0; </div><div class='add'>+	if (!p || p == current || p-&gt;state == TASK_RUNNING)</div><div class='add'>+		return 0;</div><div class='ctx'> 	stack = (unsigned long)task_stack_page(p);</div><div class='del'>-	if (p-&gt;thread.sp &lt; stack || p-&gt;thread.sp &gt; stack+THREAD_SIZE)</div><div class='add'>+	if (p-&gt;thread.sp &lt; stack || p-&gt;thread.sp &gt;= stack+THREAD_SIZE)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	fp = *(u64 *)(p-&gt;thread.sp);</div><div class='del'>-	do { </div><div class='add'>+	do {</div><div class='ctx'> 		if (fp &lt; (unsigned long)stack ||</div><div class='del'>-		    fp &gt; (unsigned long)stack+THREAD_SIZE)</div><div class='del'>-			return 0; </div><div class='add'>+		    fp &gt;= (unsigned long)stack+THREAD_SIZE)</div><div class='add'>+			return 0;</div><div class='ctx'> 		ip = *(u64 *)(fp+8);</div><div class='ctx'> 		if (!in_sched_functions(ip))</div><div class='ctx'> 			return ip;</div><div class='del'>-		fp = *(u64 *)fp; </div><div class='del'>-	} while (count++ &lt; 16); </div><div class='add'>+		fp = *(u64 *)fp;</div><div class='add'>+	} while (count++ &lt; 16);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> long do_arch_prctl(struct task_struct *task, int code, unsigned long addr)</div><div class='del'>-{ </div><div class='del'>-	int ret = 0; </div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='ctx'> 	int doit = task == current;</div><div class='ctx'> 	int cpu;</div><div class='ctx'> </div><div class='del'>-	switch (code) { </div><div class='add'>+	switch (code) {</div><div class='ctx'> 	case ARCH_SET_GS:</div><div class='ctx'> 		if (addr &gt;= TASK_SIZE_OF(task))</div><div class='del'>-			return -EPERM; </div><div class='add'>+			return -EPERM;</div><div class='ctx'> 		cpu = get_cpu();</div><div class='del'>-		/* handle small bases via the GDT because that's faster to </div><div class='add'>+		/* handle small bases via the GDT because that's faster to</div><div class='ctx'> 		   switch. */</div><div class='del'>-		if (addr &lt;= 0xffffffff) {  </div><div class='del'>-			set_32bit_tls(task, GS_TLS, addr); </div><div class='del'>-			if (doit) { </div><div class='add'>+		if (addr &lt;= 0xffffffff) {</div><div class='add'>+			set_32bit_tls(task, GS_TLS, addr);</div><div class='add'>+			if (doit) {</div><div class='ctx'> 				load_TLS(&amp;task-&gt;thread, cpu);</div><div class='del'>-				load_gs_index(GS_TLS_SEL); </div><div class='add'>+				load_gs_index(GS_TLS_SEL);</div><div class='ctx'> 			}</div><div class='del'>-			task-&gt;thread.gsindex = GS_TLS_SEL; </div><div class='add'>+			task-&gt;thread.gsindex = GS_TLS_SEL;</div><div class='ctx'> 			task-&gt;thread.gs = 0;</div><div class='del'>-		} else { </div><div class='add'>+		} else {</div><div class='ctx'> 			task-&gt;thread.gsindex = 0;</div><div class='ctx'> 			task-&gt;thread.gs = addr;</div><div class='ctx'> 			if (doit) {</div><div class='ctx'> 				load_gs_index(0);</div><div class='ctx'> 				ret = checking_wrmsrl(MSR_KERNEL_GS_BASE, addr);</div><div class='del'>-			} </div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 		put_cpu();</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -825,8 +835,7 @@ long do_arch_prctl(struct task_struct *task, int code, unsigned long addr)</div><div class='ctx'> 				rdmsrl(MSR_KERNEL_GS_BASE, base);</div><div class='ctx'> 			else</div><div class='ctx'> 				base = task-&gt;thread.gs;</div><div class='del'>-		}</div><div class='del'>-		else</div><div class='add'>+		} else</div><div class='ctx'> 			base = task-&gt;thread.gs;</div><div class='ctx'> 		ret = put_user(base, (unsigned long __user *)addr);</div><div class='ctx'> 		break;</div><div class='head'>diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c<br/>index e37dccce85db..0a6d8c12e10d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/ptrace.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/ptrace.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/ptrace.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/ptrace.c</a></div><div class='hunk'>@@ -14,6 +14,7 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='ctx'> #include &lt;linux/regset.h&gt;</div><div class='add'>+#include &lt;linux/tracehook.h&gt;</div><div class='ctx'> #include &lt;linux/user.h&gt;</div><div class='ctx'> #include &lt;linux/elf.h&gt;</div><div class='ctx'> #include &lt;linux/security.h&gt;</div><div class='hunk'>@@ -39,7 +40,9 @@ enum x86_regset {</div><div class='ctx'> 	REGSET_GENERAL,</div><div class='ctx'> 	REGSET_FP,</div><div class='ctx'> 	REGSET_XFP,</div><div class='add'>+	REGSET_IOPERM64 = REGSET_XFP,</div><div class='ctx'> 	REGSET_TLS,</div><div class='add'>+	REGSET_IOPERM32,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -69,7 +72,7 @@ static inline bool invalid_selector(u16 value)</div><div class='ctx'> </div><div class='ctx'> #define FLAG_MASK		FLAG_MASK_32</div><div class='ctx'> </div><div class='del'>-static long *pt_regs_access(struct pt_regs *regs, unsigned long regno)</div><div class='add'>+static unsigned long *pt_regs_access(struct pt_regs *regs, unsigned long regno)</div><div class='ctx'> {</div><div class='ctx'> 	BUILD_BUG_ON(offsetof(struct pt_regs, bx) != 0);</div><div class='ctx'> 	regno &gt;&gt;= 2;</div><div class='hunk'>@@ -554,45 +557,138 @@ static int ptrace_set_debugreg(struct task_struct *child,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef X86_BTS</div><div class='add'>+/*</div><div class='add'>+ * These access the current or another (stopped) task's io permission</div><div class='add'>+ * bitmap for debugging or core dump.</div><div class='add'>+ */</div><div class='add'>+static int ioperm_active(struct task_struct *target,</div><div class='add'>+			 const struct user_regset *regset)</div><div class='add'>+{</div><div class='add'>+	return target-&gt;thread.io_bitmap_max / regset-&gt;size;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-static int ptrace_bts_get_size(struct task_struct *child)</div><div class='add'>+static int ioperm_get(struct task_struct *target,</div><div class='add'>+		      const struct user_regset *regset,</div><div class='add'>+		      unsigned int pos, unsigned int count,</div><div class='add'>+		      void *kbuf, void __user *ubuf)</div><div class='ctx'> {</div><div class='del'>-	if (!child-&gt;thread.ds_area_msr)</div><div class='add'>+	if (!target-&gt;thread.io_bitmap_ptr)</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> </div><div class='del'>-	return ds_get_bts_index((void *)child-&gt;thread.ds_area_msr);</div><div class='add'>+	return user_regset_copyout(&amp;pos, &amp;count, &amp;kbuf, &amp;ubuf,</div><div class='add'>+				   target-&gt;thread.io_bitmap_ptr,</div><div class='add'>+				   0, IO_BITMAP_BYTES);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_X86_PTRACE_BTS</div><div class='add'>+/*</div><div class='add'>+ * The configuration for a particular BTS hardware implementation.</div><div class='add'>+ */</div><div class='add'>+struct bts_configuration {</div><div class='add'>+	/* the size of a BTS record in bytes; at most BTS_MAX_RECORD_SIZE */</div><div class='add'>+	unsigned char  sizeof_bts;</div><div class='add'>+	/* the size of a field in the BTS record in bytes */</div><div class='add'>+	unsigned char  sizeof_field;</div><div class='add'>+	/* a bitmask to enable/disable BTS in DEBUGCTL MSR */</div><div class='add'>+	unsigned long debugctl_mask;</div><div class='add'>+};</div><div class='add'>+static struct bts_configuration bts_cfg;</div><div class='add'>+</div><div class='add'>+#define BTS_MAX_RECORD_SIZE (8 * 3)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Branch Trace Store (BTS) uses the following format. Different</div><div class='add'>+ * architectures vary in the size of those fields.</div><div class='add'>+ * - source linear address</div><div class='add'>+ * - destination linear address</div><div class='add'>+ * - flags</div><div class='add'>+ *</div><div class='add'>+ * Later architectures use 64bit pointers throughout, whereas earlier</div><div class='add'>+ * architectures use 32bit pointers in 32bit mode.</div><div class='add'>+ *</div><div class='add'>+ * We compute the base address for the first 8 fields based on:</div><div class='add'>+ * - the field size stored in the DS configuration</div><div class='add'>+ * - the relative field position</div><div class='add'>+ *</div><div class='add'>+ * In order to store additional information in the BTS buffer, we use</div><div class='add'>+ * a special source address to indicate that the record requires</div><div class='add'>+ * special interpretation.</div><div class='add'>+ *</div><div class='add'>+ * Netburst indicated via a bit in the flags field whether the branch</div><div class='add'>+ * was predicted; this is ignored.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+enum bts_field {</div><div class='add'>+	bts_from = 0,</div><div class='add'>+	bts_to,</div><div class='add'>+	bts_flags,</div><div class='add'>+</div><div class='add'>+	bts_escape = (unsigned long)-1,</div><div class='add'>+	bts_qual = bts_to,</div><div class='add'>+	bts_jiffies = bts_flags</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline unsigned long bts_get(const char *base, enum bts_field field)</div><div class='add'>+{</div><div class='add'>+	base += (bts_cfg.sizeof_field * field);</div><div class='add'>+	return *(unsigned long *)base;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void bts_set(char *base, enum bts_field field, unsigned long val)</div><div class='add'>+{</div><div class='add'>+	base += (bts_cfg.sizeof_field * field);;</div><div class='add'>+	(*(unsigned long *)base) = val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Translate a BTS record from the raw format into the bts_struct format</div><div class='add'>+ *</div><div class='add'>+ * out (out): bts_struct interpretation</div><div class='add'>+ * raw: raw BTS record</div><div class='add'>+ */</div><div class='add'>+static void ptrace_bts_translate_record(struct bts_struct *out, const void *raw)</div><div class='add'>+{</div><div class='add'>+	memset(out, 0, sizeof(*out));</div><div class='add'>+	if (bts_get(raw, bts_from) == bts_escape) {</div><div class='add'>+		out-&gt;qualifier       = bts_get(raw, bts_qual);</div><div class='add'>+		out-&gt;variant.jiffies = bts_get(raw, bts_jiffies);</div><div class='add'>+	} else {</div><div class='add'>+		out-&gt;qualifier = BTS_BRANCH;</div><div class='add'>+		out-&gt;variant.lbr.from_ip = bts_get(raw, bts_from);</div><div class='add'>+		out-&gt;variant.lbr.to_ip   = bts_get(raw, bts_to);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ptrace_bts_read_record(struct task_struct *child,</div><div class='del'>-				  long index,</div><div class='add'>+static int ptrace_bts_read_record(struct task_struct *child, size_t index,</div><div class='ctx'> 				  struct bts_struct __user *out)</div><div class='ctx'> {</div><div class='ctx'> 	struct bts_struct ret;</div><div class='del'>-	int retval;</div><div class='del'>-	int bts_end;</div><div class='del'>-	int bts_index;</div><div class='del'>-</div><div class='del'>-	if (!child-&gt;thread.ds_area_msr)</div><div class='del'>-		return -ENXIO;</div><div class='add'>+	const void *bts_record;</div><div class='add'>+	size_t bts_index, bts_end;</div><div class='add'>+	int error;</div><div class='ctx'> </div><div class='del'>-	if (index &lt; 0)</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	error = ds_get_bts_end(child, &amp;bts_end);</div><div class='add'>+	if (error &lt; 0)</div><div class='add'>+		return error;</div><div class='ctx'> </div><div class='del'>-	bts_end = ds_get_bts_end((void *)child-&gt;thread.ds_area_msr);</div><div class='ctx'> 	if (bts_end &lt;= index)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	error = ds_get_bts_index(child, &amp;bts_index);</div><div class='add'>+	if (error &lt; 0)</div><div class='add'>+		return error;</div><div class='add'>+</div><div class='ctx'> 	/* translate the ptrace bts index into the ds bts index */</div><div class='del'>-	bts_index = ds_get_bts_index((void *)child-&gt;thread.ds_area_msr);</div><div class='del'>-	bts_index -= (index + 1);</div><div class='del'>-	if (bts_index &lt; 0)</div><div class='del'>-		bts_index += bts_end;</div><div class='add'>+	bts_index += bts_end - (index + 1);</div><div class='add'>+	if (bts_end &lt;= bts_index)</div><div class='add'>+		bts_index -= bts_end;</div><div class='add'>+</div><div class='add'>+	error = ds_access_bts(child, bts_index, &amp;bts_record);</div><div class='add'>+	if (error &lt; 0)</div><div class='add'>+		return error;</div><div class='ctx'> </div><div class='del'>-	retval = ds_read_bts((void *)child-&gt;thread.ds_area_msr,</div><div class='del'>-			     bts_index, &amp;ret);</div><div class='del'>-	if (retval &lt; 0)</div><div class='del'>-		return retval;</div><div class='add'>+	ptrace_bts_translate_record(&amp;ret, bts_record);</div><div class='ctx'> </div><div class='ctx'> 	if (copy_to_user(out, &amp;ret, sizeof(ret)))</div><div class='ctx'> 		return -EFAULT;</div><div class='hunk'>@@ -600,101 +696,106 @@ static int ptrace_bts_read_record(struct task_struct *child,</div><div class='ctx'> 	return sizeof(ret);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ptrace_bts_clear(struct task_struct *child)</div><div class='del'>-{</div><div class='del'>-	if (!child-&gt;thread.ds_area_msr)</div><div class='del'>-		return -ENXIO;</div><div class='del'>-</div><div class='del'>-	return ds_clear((void *)child-&gt;thread.ds_area_msr);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int ptrace_bts_drain(struct task_struct *child,</div><div class='ctx'> 			    long size,</div><div class='ctx'> 			    struct bts_struct __user *out)</div><div class='ctx'> {</div><div class='del'>-	int end, i;</div><div class='del'>-	void *ds = (void *)child-&gt;thread.ds_area_msr;</div><div class='del'>-</div><div class='del'>-	if (!ds)</div><div class='del'>-		return -ENXIO;</div><div class='add'>+	struct bts_struct ret;</div><div class='add'>+	const unsigned char *raw;</div><div class='add'>+	size_t end, i;</div><div class='add'>+	int error;</div><div class='ctx'> </div><div class='del'>-	end = ds_get_bts_index(ds);</div><div class='del'>-	if (end &lt;= 0)</div><div class='del'>-		return end;</div><div class='add'>+	error = ds_get_bts_index(child, &amp;end);</div><div class='add'>+	if (error &lt; 0)</div><div class='add'>+		return error;</div><div class='ctx'> </div><div class='ctx'> 	if (size &lt; (end * sizeof(struct bts_struct)))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; end; i++, out++) {</div><div class='del'>-		struct bts_struct ret;</div><div class='del'>-		int retval;</div><div class='add'>+	error = ds_access_bts(child, 0, (const void **)&amp;raw);</div><div class='add'>+	if (error &lt; 0)</div><div class='add'>+		return error;</div><div class='ctx'> </div><div class='del'>-		retval = ds_read_bts(ds, i, &amp;ret);</div><div class='del'>-		if (retval &lt; 0)</div><div class='del'>-			return retval;</div><div class='add'>+	for (i = 0; i &lt; end; i++, out++, raw += bts_cfg.sizeof_bts) {</div><div class='add'>+		ptrace_bts_translate_record(&amp;ret, raw);</div><div class='ctx'> </div><div class='ctx'> 		if (copy_to_user(out, &amp;ret, sizeof(ret)))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ds_clear(ds);</div><div class='add'>+	error = ds_clear_bts(child);</div><div class='add'>+	if (error &lt; 0)</div><div class='add'>+		return error;</div><div class='ctx'> </div><div class='ctx'> 	return end;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void ptrace_bts_ovfl(struct task_struct *child)</div><div class='add'>+{</div><div class='add'>+	send_sig(child-&gt;thread.bts_ovfl_signal, child, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ptrace_bts_config(struct task_struct *child,</div><div class='ctx'> 			     long cfg_size,</div><div class='ctx'> 			     const struct ptrace_bts_config __user *ucfg)</div><div class='ctx'> {</div><div class='ctx'> 	struct ptrace_bts_config cfg;</div><div class='del'>-	int bts_size, ret = 0;</div><div class='del'>-	void *ds;</div><div class='add'>+	int error = 0;</div><div class='ctx'> </div><div class='add'>+	error = -EOPNOTSUPP;</div><div class='add'>+	if (!bts_cfg.sizeof_bts)</div><div class='add'>+		goto errout;</div><div class='add'>+</div><div class='add'>+	error = -EIO;</div><div class='ctx'> 	if (cfg_size &lt; sizeof(cfg))</div><div class='del'>-		return -EIO;</div><div class='add'>+		goto errout;</div><div class='ctx'> </div><div class='add'>+	error = -EFAULT;</div><div class='ctx'> 	if (copy_from_user(&amp;cfg, ucfg, sizeof(cfg)))</div><div class='del'>-		return -EFAULT;</div><div class='add'>+		goto errout;</div><div class='ctx'> </div><div class='del'>-	if ((int)cfg.size &lt; 0)</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	error = -EINVAL;</div><div class='add'>+	if ((cfg.flags &amp; PTRACE_BTS_O_SIGNAL) &amp;&amp;</div><div class='add'>+	    !(cfg.flags &amp; PTRACE_BTS_O_ALLOC))</div><div class='add'>+		goto errout;</div><div class='ctx'> </div><div class='del'>-	bts_size = 0;</div><div class='del'>-	ds = (void *)child-&gt;thread.ds_area_msr;</div><div class='del'>-	if (ds) {</div><div class='del'>-		bts_size = ds_get_bts_size(ds);</div><div class='del'>-		if (bts_size &lt; 0)</div><div class='del'>-			return bts_size;</div><div class='del'>-	}</div><div class='del'>-	cfg.size = PAGE_ALIGN(cfg.size);</div><div class='add'>+	if (cfg.flags &amp; PTRACE_BTS_O_ALLOC) {</div><div class='add'>+		ds_ovfl_callback_t ovfl = NULL;</div><div class='add'>+		unsigned int sig = 0;</div><div class='add'>+</div><div class='add'>+		/* we ignore the error in case we were not tracing child */</div><div class='add'>+		(void)ds_release_bts(child);</div><div class='add'>+</div><div class='add'>+		if (cfg.flags &amp; PTRACE_BTS_O_SIGNAL) {</div><div class='add'>+			if (!cfg.signal)</div><div class='add'>+				goto errout;</div><div class='add'>+</div><div class='add'>+			sig  = cfg.signal;</div><div class='add'>+			ovfl = ptrace_bts_ovfl;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	if (bts_size != cfg.size) {</div><div class='del'>-		ret = ptrace_bts_realloc(child, cfg.size,</div><div class='del'>-					 cfg.flags &amp; PTRACE_BTS_O_CUT_SIZE);</div><div class='del'>-		if (ret &lt; 0)</div><div class='add'>+		error = ds_request_bts(child, /* base = */ NULL, cfg.size, ovfl);</div><div class='add'>+		if (error &lt; 0)</div><div class='ctx'> 			goto errout;</div><div class='ctx'> </div><div class='del'>-		ds = (void *)child-&gt;thread.ds_area_msr;</div><div class='add'>+		child-&gt;thread.bts_ovfl_signal = sig;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (cfg.flags &amp; PTRACE_BTS_O_SIGNAL)</div><div class='del'>-		ret = ds_set_overflow(ds, DS_O_SIGNAL);</div><div class='del'>-	else</div><div class='del'>-		ret = ds_set_overflow(ds, DS_O_WRAP);</div><div class='del'>-	if (ret &lt; 0)</div><div class='add'>+	error = -EINVAL;</div><div class='add'>+	if (!child-&gt;thread.ds_ctx &amp;&amp; cfg.flags)</div><div class='ctx'> 		goto errout;</div><div class='ctx'> </div><div class='ctx'> 	if (cfg.flags &amp; PTRACE_BTS_O_TRACE)</div><div class='del'>-		child-&gt;thread.debugctlmsr |= ds_debugctl_mask();</div><div class='add'>+		child-&gt;thread.debugctlmsr |= bts_cfg.debugctl_mask;</div><div class='ctx'> 	else</div><div class='del'>-		child-&gt;thread.debugctlmsr &amp;= ~ds_debugctl_mask();</div><div class='add'>+		child-&gt;thread.debugctlmsr &amp;= ~bts_cfg.debugctl_mask;</div><div class='ctx'> </div><div class='ctx'> 	if (cfg.flags &amp; PTRACE_BTS_O_SCHED)</div><div class='ctx'> 		set_tsk_thread_flag(child, TIF_BTS_TRACE_TS);</div><div class='ctx'> 	else</div><div class='ctx'> 		clear_tsk_thread_flag(child, TIF_BTS_TRACE_TS);</div><div class='ctx'> </div><div class='del'>-	ret = sizeof(cfg);</div><div class='add'>+	error = sizeof(cfg);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	if (child-&gt;thread.debugctlmsr)</div><div class='hunk'>@@ -702,10 +803,10 @@ out:</div><div class='ctx'> 	else</div><div class='ctx'> 		clear_tsk_thread_flag(child, TIF_DEBUGCTLMSR);</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	return error;</div><div class='ctx'> </div><div class='ctx'> errout:</div><div class='del'>-	child-&gt;thread.debugctlmsr &amp;= ~ds_debugctl_mask();</div><div class='add'>+	child-&gt;thread.debugctlmsr &amp;= ~bts_cfg.debugctl_mask;</div><div class='ctx'> 	clear_tsk_thread_flag(child, TIF_BTS_TRACE_TS);</div><div class='ctx'> 	goto out;</div><div class='ctx'> }</div><div class='hunk'>@@ -714,29 +815,40 @@ static int ptrace_bts_status(struct task_struct *child,</div><div class='ctx'> 			     long cfg_size,</div><div class='ctx'> 			     struct ptrace_bts_config __user *ucfg)</div><div class='ctx'> {</div><div class='del'>-	void *ds = (void *)child-&gt;thread.ds_area_msr;</div><div class='ctx'> 	struct ptrace_bts_config cfg;</div><div class='add'>+	size_t end;</div><div class='add'>+	const void *base, *max;</div><div class='add'>+	int error;</div><div class='ctx'> </div><div class='ctx'> 	if (cfg_size &lt; sizeof(cfg))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='del'>-	memset(&amp;cfg, 0, sizeof(cfg));</div><div class='add'>+	error = ds_get_bts_end(child, &amp;end);</div><div class='add'>+	if (error &lt; 0)</div><div class='add'>+		return error;</div><div class='ctx'> </div><div class='del'>-	if (ds) {</div><div class='del'>-		cfg.size = ds_get_bts_size(ds);</div><div class='add'>+	error = ds_access_bts(child, /* index = */ 0, &amp;base);</div><div class='add'>+	if (error &lt; 0)</div><div class='add'>+		return error;</div><div class='ctx'> </div><div class='del'>-		if (ds_get_overflow(ds) == DS_O_SIGNAL)</div><div class='del'>-			cfg.flags |= PTRACE_BTS_O_SIGNAL;</div><div class='add'>+	error = ds_access_bts(child, /* index = */ end, &amp;max);</div><div class='add'>+	if (error &lt; 0)</div><div class='add'>+		return error;</div><div class='ctx'> </div><div class='del'>-		if (test_tsk_thread_flag(child, TIF_DEBUGCTLMSR) &amp;&amp;</div><div class='del'>-		    child-&gt;thread.debugctlmsr &amp; ds_debugctl_mask())</div><div class='del'>-			cfg.flags |= PTRACE_BTS_O_TRACE;</div><div class='add'>+	memset(&amp;cfg, 0, sizeof(cfg));</div><div class='add'>+	cfg.size = (max - base);</div><div class='add'>+	cfg.signal = child-&gt;thread.bts_ovfl_signal;</div><div class='add'>+	cfg.bts_size = sizeof(struct bts_struct);</div><div class='ctx'> </div><div class='del'>-		if (test_tsk_thread_flag(child, TIF_BTS_TRACE_TS))</div><div class='del'>-			cfg.flags |= PTRACE_BTS_O_SCHED;</div><div class='del'>-	}</div><div class='add'>+	if (cfg.signal)</div><div class='add'>+		cfg.flags |= PTRACE_BTS_O_SIGNAL;</div><div class='ctx'> </div><div class='del'>-	cfg.bts_size = sizeof(struct bts_struct);</div><div class='add'>+	if (test_tsk_thread_flag(child, TIF_DEBUGCTLMSR) &amp;&amp;</div><div class='add'>+	    child-&gt;thread.debugctlmsr &amp; bts_cfg.debugctl_mask)</div><div class='add'>+		cfg.flags |= PTRACE_BTS_O_TRACE;</div><div class='add'>+</div><div class='add'>+	if (test_tsk_thread_flag(child, TIF_BTS_TRACE_TS))</div><div class='add'>+		cfg.flags |= PTRACE_BTS_O_SCHED;</div><div class='ctx'> </div><div class='ctx'> 	if (copy_to_user(ucfg, &amp;cfg, sizeof(cfg)))</div><div class='ctx'> 		return -EFAULT;</div><div class='hunk'>@@ -744,89 +856,38 @@ static int ptrace_bts_status(struct task_struct *child,</div><div class='ctx'> 	return sizeof(cfg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> static int ptrace_bts_write_record(struct task_struct *child,</div><div class='ctx'> 				   const struct bts_struct *in)</div><div class='ctx'> {</div><div class='del'>-	int retval;</div><div class='add'>+	unsigned char bts_record[BTS_MAX_RECORD_SIZE];</div><div class='ctx'> </div><div class='del'>-	if (!child-&gt;thread.ds_area_msr)</div><div class='del'>-		return -ENXIO;</div><div class='add'>+	BUG_ON(BTS_MAX_RECORD_SIZE &lt; bts_cfg.sizeof_bts);</div><div class='ctx'> </div><div class='del'>-	retval = ds_write_bts((void *)child-&gt;thread.ds_area_msr, in);</div><div class='del'>-	if (retval)</div><div class='del'>-		return retval;</div><div class='add'>+	memset(bts_record, 0, bts_cfg.sizeof_bts);</div><div class='add'>+	switch (in-&gt;qualifier) {</div><div class='add'>+	case BTS_INVALID:</div><div class='add'>+		break;</div><div class='ctx'> </div><div class='del'>-	return sizeof(*in);</div><div class='del'>-}</div><div class='add'>+	case BTS_BRANCH:</div><div class='add'>+		bts_set(bts_record, bts_from, in-&gt;variant.lbr.from_ip);</div><div class='add'>+		bts_set(bts_record, bts_to,   in-&gt;variant.lbr.to_ip);</div><div class='add'>+		break;</div><div class='ctx'> </div><div class='del'>-static int ptrace_bts_realloc(struct task_struct *child,</div><div class='del'>-			      int size, int reduce_size)</div><div class='del'>-{</div><div class='del'>-	unsigned long rlim, vm;</div><div class='del'>-	int ret, old_size;</div><div class='add'>+	case BTS_TASK_ARRIVES:</div><div class='add'>+	case BTS_TASK_DEPARTS:</div><div class='add'>+		bts_set(bts_record, bts_from,    bts_escape);</div><div class='add'>+		bts_set(bts_record, bts_qual,    in-&gt;qualifier);</div><div class='add'>+		bts_set(bts_record, bts_jiffies, in-&gt;variant.jiffies);</div><div class='add'>+		break;</div><div class='ctx'> </div><div class='del'>-	if (size &lt; 0)</div><div class='add'>+	default:</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	old_size = ds_get_bts_size((void *)child-&gt;thread.ds_area_msr);</div><div class='del'>-	if (old_size &lt; 0)</div><div class='del'>-		return old_size;</div><div class='del'>-</div><div class='del'>-	ret = ds_free((void **)&amp;child-&gt;thread.ds_area_msr);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	size &gt;&gt;= PAGE_SHIFT;</div><div class='del'>-	old_size &gt;&gt;= PAGE_SHIFT;</div><div class='del'>-</div><div class='del'>-	current-&gt;mm-&gt;total_vm  -= old_size;</div><div class='del'>-	current-&gt;mm-&gt;locked_vm -= old_size;</div><div class='del'>-</div><div class='del'>-	if (size == 0)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	rlim = current-&gt;signal-&gt;rlim[RLIMIT_AS].rlim_cur &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	vm = current-&gt;mm-&gt;total_vm  + size;</div><div class='del'>-	if (rlim &lt; vm) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-</div><div class='del'>-		if (!reduce_size)</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='del'>-		size = rlim - current-&gt;mm-&gt;total_vm;</div><div class='del'>-		if (size &lt;= 0)</div><div class='del'>-			goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rlim = current-&gt;signal-&gt;rlim[RLIMIT_MEMLOCK].rlim_cur &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	vm = current-&gt;mm-&gt;locked_vm  + size;</div><div class='del'>-	if (rlim &lt; vm) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-</div><div class='del'>-		if (!reduce_size)</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='del'>-		size = rlim - current-&gt;mm-&gt;locked_vm;</div><div class='del'>-		if (size &lt;= 0)</div><div class='del'>-			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = ds_allocate((void **)&amp;child-&gt;thread.ds_area_msr,</div><div class='del'>-			  size &lt;&lt; PAGE_SHIFT);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	current-&gt;mm-&gt;total_vm  += size;</div><div class='del'>-	current-&gt;mm-&gt;locked_vm += size;</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	if (child-&gt;thread.ds_area_msr)</div><div class='del'>-		set_tsk_thread_flag(child, TIF_DS_AREA_MSR);</div><div class='del'>-	else</div><div class='del'>-		clear_tsk_thread_flag(child, TIF_DS_AREA_MSR);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='add'>+	/* The writing task will be the switched-to task on a context</div><div class='add'>+	 * switch. It needs to write into the switched-from task's BTS</div><div class='add'>+	 * buffer. */</div><div class='add'>+	return ds_unchecked_write_bts(child, bts_record, bts_cfg.sizeof_bts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void ptrace_bts_take_timestamp(struct task_struct *tsk,</div><div class='hunk'>@@ -839,7 +900,66 @@ void ptrace_bts_take_timestamp(struct task_struct *tsk,</div><div class='ctx'> </div><div class='ctx'> 	ptrace_bts_write_record(tsk, &amp;rec);</div><div class='ctx'> }</div><div class='del'>-#endif /* X86_BTS */</div><div class='add'>+</div><div class='add'>+static const struct bts_configuration bts_cfg_netburst = {</div><div class='add'>+	.sizeof_bts    = sizeof(long) * 3,</div><div class='add'>+	.sizeof_field  = sizeof(long),</div><div class='add'>+	.debugctl_mask = (1&lt;&lt;2)|(1&lt;&lt;3)|(1&lt;&lt;5)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct bts_configuration bts_cfg_pentium_m = {</div><div class='add'>+	.sizeof_bts    = sizeof(long) * 3,</div><div class='add'>+	.sizeof_field  = sizeof(long),</div><div class='add'>+	.debugctl_mask = (1&lt;&lt;6)|(1&lt;&lt;7)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct bts_configuration bts_cfg_core2 = {</div><div class='add'>+	.sizeof_bts    = 8 * 3,</div><div class='add'>+	.sizeof_field  = 8,</div><div class='add'>+	.debugctl_mask = (1&lt;&lt;6)|(1&lt;&lt;7)|(1&lt;&lt;9)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline void bts_configure(const struct bts_configuration *cfg)</div><div class='add'>+{</div><div class='add'>+	bts_cfg = *cfg;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __cpuinit ptrace_bts_init_intel(struct cpuinfo_x86 *c)</div><div class='add'>+{</div><div class='add'>+	switch (c-&gt;x86) {</div><div class='add'>+	case 0x6:</div><div class='add'>+		switch (c-&gt;x86_model) {</div><div class='add'>+		case 0xD:</div><div class='add'>+		case 0xE: /* Pentium M */</div><div class='add'>+			bts_configure(&amp;bts_cfg_pentium_m);</div><div class='add'>+			break;</div><div class='add'>+		case 0xF: /* Core2 */</div><div class='add'>+        case 0x1C: /* Atom */</div><div class='add'>+			bts_configure(&amp;bts_cfg_core2);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			/* sorry, don't know about them */</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case 0xF:</div><div class='add'>+		switch (c-&gt;x86_model) {</div><div class='add'>+		case 0x0:</div><div class='add'>+		case 0x1:</div><div class='add'>+		case 0x2: /* Netburst */</div><div class='add'>+			bts_configure(&amp;bts_cfg_netburst);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			/* sorry, don't know about them */</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		/* sorry, don't know about them */</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_X86_PTRACE_BTS */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Called by kernel/ptrace.c when detaching..</div><div class='hunk'>@@ -852,15 +972,15 @@ void ptrace_disable(struct task_struct *child)</div><div class='ctx'> #ifdef TIF_SYSCALL_EMU</div><div class='ctx'> 	clear_tsk_thread_flag(child, TIF_SYSCALL_EMU);</div><div class='ctx'> #endif</div><div class='del'>-	if (child-&gt;thread.ds_area_msr) {</div><div class='del'>-#ifdef X86_BTS</div><div class='del'>-		ptrace_bts_realloc(child, 0, 0);</div><div class='del'>-#endif</div><div class='del'>-		child-&gt;thread.debugctlmsr &amp;= ~ds_debugctl_mask();</div><div class='del'>-		if (!child-&gt;thread.debugctlmsr)</div><div class='del'>-			clear_tsk_thread_flag(child, TIF_DEBUGCTLMSR);</div><div class='del'>-		clear_tsk_thread_flag(child, TIF_BTS_TRACE_TS);</div><div class='del'>-	}</div><div class='add'>+#ifdef CONFIG_X86_PTRACE_BTS</div><div class='add'>+	(void)ds_release_bts(child);</div><div class='add'>+</div><div class='add'>+	child-&gt;thread.debugctlmsr &amp;= ~bts_cfg.debugctl_mask;</div><div class='add'>+	if (!child-&gt;thread.debugctlmsr)</div><div class='add'>+		clear_tsk_thread_flag(child, TIF_DEBUGCTLMSR);</div><div class='add'>+</div><div class='add'>+	clear_tsk_thread_flag(child, TIF_BTS_TRACE_TS);</div><div class='add'>+#endif /* CONFIG_X86_PTRACE_BTS */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #if defined CONFIG_X86_32 || defined CONFIG_IA32_EMULATION</div><div class='hunk'>@@ -980,7 +1100,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * These bits need more cooking - not enabled yet:</div><div class='ctx'> 	 */</div><div class='del'>-#ifdef X86_BTS</div><div class='add'>+#ifdef CONFIG_X86_PTRACE_BTS</div><div class='ctx'> 	case PTRACE_BTS_CONFIG:</div><div class='ctx'> 		ret = ptrace_bts_config</div><div class='ctx'> 			(child, data, (struct ptrace_bts_config __user *)addr);</div><div class='hunk'>@@ -992,7 +1112,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case PTRACE_BTS_SIZE:</div><div class='del'>-		ret = ptrace_bts_get_size(child);</div><div class='add'>+		ret = ds_get_bts_index(child, /* pos = */ NULL);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case PTRACE_BTS_GET:</div><div class='hunk'>@@ -1001,14 +1121,14 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case PTRACE_BTS_CLEAR:</div><div class='del'>-		ret = ptrace_bts_clear(child);</div><div class='add'>+		ret = ds_clear_bts(child);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case PTRACE_BTS_DRAIN:</div><div class='ctx'> 		ret = ptrace_bts_drain</div><div class='ctx'> 			(child, data, (struct bts_struct __user *) addr);</div><div class='ctx'> 		break;</div><div class='del'>-#endif</div><div class='add'>+#endif /* CONFIG_X86_PTRACE_BTS */</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='ctx'> 		ret = ptrace_request(child, request, addr, data);</div><div class='hunk'>@@ -1290,6 +1410,12 @@ static const struct user_regset x86_64_regsets[] = {</div><div class='ctx'> 		.size = sizeof(long), .align = sizeof(long),</div><div class='ctx'> 		.active = xfpregs_active, .get = xfpregs_get, .set = xfpregs_set</div><div class='ctx'> 	},</div><div class='add'>+	[REGSET_IOPERM64] = {</div><div class='add'>+		.core_note_type = NT_386_IOPERM,</div><div class='add'>+		.n = IO_BITMAP_LONGS,</div><div class='add'>+		.size = sizeof(long), .align = sizeof(long),</div><div class='add'>+		.active = ioperm_active, .get = ioperm_get</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct user_regset_view user_x86_64_view = {</div><div class='hunk'>@@ -1336,6 +1462,12 @@ static const struct user_regset x86_32_regsets[] = {</div><div class='ctx'> 		.active = regset_tls_active,</div><div class='ctx'> 		.get = regset_tls_get, .set = regset_tls_set</div><div class='ctx'> 	},</div><div class='add'>+	[REGSET_IOPERM32] = {</div><div class='add'>+		.core_note_type = NT_386_IOPERM,</div><div class='add'>+		.n = IO_BITMAP_BYTES / sizeof(u32),</div><div class='add'>+		.size = sizeof(u32), .align = sizeof(u32),</div><div class='add'>+		.active = ioperm_active, .get = ioperm_get</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct user_regset_view user_x86_32_view = {</div><div class='hunk'>@@ -1357,7 +1489,8 @@ const struct user_regset_view *task_user_regset_view(struct task_struct *task)</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs, int error_code)</div><div class='add'>+void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs,</div><div class='add'>+					 int error_code, int si_code)</div><div class='ctx'> {</div><div class='ctx'> 	struct siginfo info;</div><div class='ctx'> </div><div class='hunk'>@@ -1366,7 +1499,7 @@ void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs, int error_code)</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;info, 0, sizeof(info));</div><div class='ctx'> 	info.si_signo = SIGTRAP;</div><div class='del'>-	info.si_code = TRAP_BRKPT;</div><div class='add'>+	info.si_code = si_code;</div><div class='ctx'> </div><div class='ctx'> 	/* User-mode ip? */</div><div class='ctx'> 	info.si_addr = user_mode_vm(regs) ? (void __user *) regs-&gt;ip : NULL;</div><div class='hunk'>@@ -1375,30 +1508,6 @@ void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs, int error_code)</div><div class='ctx'> 	force_sig_info(SIGTRAP, &amp;info, tsk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void syscall_trace(struct pt_regs *regs)</div><div class='del'>-{</div><div class='del'>-	if (!(current-&gt;ptrace &amp; PT_PTRACED))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	printk("trace %s ip %lx sp %lx ax %d origrax %d caller %lx tiflags %x ptrace %x\n",</div><div class='del'>-	       current-&gt;comm,</div><div class='del'>-	       regs-&gt;ip, regs-&gt;sp, regs-&gt;ax, regs-&gt;orig_ax, __builtin_return_address(0),</div><div class='del'>-	       current_thread_info()-&gt;flags, current-&gt;ptrace);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	ptrace_notify(SIGTRAP | ((current-&gt;ptrace &amp; PT_TRACESYSGOOD)</div><div class='del'>-				? 0x80 : 0));</div><div class='del'>-	/*</div><div class='del'>-	 * this isn't the same as continuing with a signal, but it will do</div><div class='del'>-	 * for normal use.  strace only continues with a signal if the</div><div class='del'>-	 * stopping signal is not SIGTRAP.  -brl</div><div class='del'>-	 */</div><div class='del'>-	if (current-&gt;exit_code) {</div><div class='del'>-		send_sig(current-&gt;exit_code, current, 1);</div><div class='del'>-		current-&gt;exit_code = 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_X86_32</div><div class='ctx'> # define IS_IA32	1</div><div class='hunk'>@@ -1432,8 +1541,9 @@ asmregparm long syscall_trace_enter(struct pt_regs *regs)</div><div class='ctx'> 	if (unlikely(test_thread_flag(TIF_SYSCALL_EMU)))</div><div class='ctx'> 		ret = -1L;</div><div class='ctx'> </div><div class='del'>-	if (ret || test_thread_flag(TIF_SYSCALL_TRACE))</div><div class='del'>-		syscall_trace(regs);</div><div class='add'>+	if ((ret || test_thread_flag(TIF_SYSCALL_TRACE)) &amp;&amp;</div><div class='add'>+	    tracehook_report_syscall_entry(regs))</div><div class='add'>+		ret = -1L;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(current-&gt;audit_context)) {</div><div class='ctx'> 		if (IS_IA32)</div><div class='hunk'>@@ -1459,7 +1569,7 @@ asmregparm void syscall_trace_leave(struct pt_regs *regs)</div><div class='ctx'> 		audit_syscall_exit(AUDITSC_RESULT(regs-&gt;ax), regs-&gt;ax);</div><div class='ctx'> </div><div class='ctx'> 	if (test_thread_flag(TIF_SYSCALL_TRACE))</div><div class='del'>-		syscall_trace(regs);</div><div class='add'>+		tracehook_report_syscall_exit(regs, 0);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If TIF_SYSCALL_EMU is set, we only get here because of</div><div class='hunk'>@@ -1475,6 +1585,6 @@ asmregparm void syscall_trace_leave(struct pt_regs *regs)</div><div class='ctx'> 	 * system call instruction.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (test_thread_flag(TIF_SINGLESTEP) &amp;&amp;</div><div class='del'>-	    (current-&gt;ptrace &amp; PT_PTRACED))</div><div class='del'>-		send_sigtrap(current, regs, 0);</div><div class='add'>+	    tracehook_consider_fatal_signal(current, SIGTRAP, SIG_DFL))</div><div class='add'>+		send_sigtrap(current, regs, 0, TRAP_BRKPT);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/x86/kernel/pvclock.c b/arch/x86/kernel/pvclock.c<br/>index 05fbe9a0325a..4f9c55f3a7c0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/pvclock.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/pvclock.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/pvclock.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/pvclock.c</a></div><div class='hunk'>@@ -97,6 +97,18 @@ static unsigned pvclock_get_time_values(struct pvclock_shadow_time *dst,</div><div class='ctx'> 	return dst-&gt;version;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+unsigned long pvclock_tsc_khz(struct pvclock_vcpu_time_info *src)</div><div class='add'>+{</div><div class='add'>+	u64 pv_tsc_khz = 1000000ULL &lt;&lt; 32;</div><div class='add'>+</div><div class='add'>+	do_div(pv_tsc_khz, src-&gt;tsc_to_system_mul);</div><div class='add'>+	if (src-&gt;tsc_shift &lt; 0)</div><div class='add'>+		pv_tsc_khz &lt;&lt;= -src-&gt;tsc_shift;</div><div class='add'>+	else</div><div class='add'>+		pv_tsc_khz &gt;&gt;= src-&gt;tsc_shift;</div><div class='add'>+	return pv_tsc_khz;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src)</div><div class='ctx'> {</div><div class='ctx'> 	struct pvclock_shadow_time shadow;</div><div class='head'>diff --git a/arch/x86/kernel/quirks.c b/arch/x86/kernel/quirks.c<br/>index d13858818100..f6a11b9b1f98 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/quirks.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/quirks.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/quirks.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/quirks.c</a></div><div class='hunk'>@@ -354,9 +354,27 @@ static void ati_force_hpet_resume(void)</div><div class='ctx'> 	printk(KERN_DEBUG "Force enabled HPET at resume\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static u32 ati_ixp4x0_rev(struct pci_dev *dev)</div><div class='add'>+{</div><div class='add'>+	u32 d;</div><div class='add'>+	u8  b;</div><div class='add'>+</div><div class='add'>+	pci_read_config_byte(dev, 0xac, &amp;b);</div><div class='add'>+	b &amp;= ~(1&lt;&lt;5);</div><div class='add'>+	pci_write_config_byte(dev, 0xac, b);</div><div class='add'>+	pci_read_config_dword(dev, 0x70, &amp;d);</div><div class='add'>+	d |= 1&lt;&lt;8;</div><div class='add'>+	pci_write_config_dword(dev, 0x70, d);</div><div class='add'>+	pci_read_config_dword(dev, 0x8, &amp;d);</div><div class='add'>+	d &amp;= 0xff;</div><div class='add'>+	dev_printk(KERN_DEBUG, &amp;dev-&gt;dev, "SB4X0 revision 0x%x\n", d);</div><div class='add'>+	return d;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void ati_force_enable_hpet(struct pci_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	u32 uninitialized_var(val);</div><div class='add'>+	u32 d, val;</div><div class='add'>+	u8  b;</div><div class='ctx'> </div><div class='ctx'> 	if (hpet_address || force_hpet_address)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -366,14 +384,33 @@ static void ati_force_enable_hpet(struct pci_dev *dev)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	d = ati_ixp4x0_rev(dev);</div><div class='add'>+	if (d  &lt; 0x82)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* base address */</div><div class='ctx'> 	pci_write_config_dword(dev, 0x14, 0xfed00000);</div><div class='ctx'> 	pci_read_config_dword(dev, 0x14, &amp;val);</div><div class='add'>+</div><div class='add'>+	/* enable interrupt */</div><div class='add'>+	outb(0x72, 0xcd6); b = inb(0xcd7);</div><div class='add'>+	b |= 0x1;</div><div class='add'>+	outb(0x72, 0xcd6); outb(b, 0xcd7);</div><div class='add'>+	outb(0x72, 0xcd6); b = inb(0xcd7);</div><div class='add'>+	if (!(b &amp; 0x1))</div><div class='add'>+		return;</div><div class='add'>+	pci_read_config_dword(dev, 0x64, &amp;d);</div><div class='add'>+	d |= (1&lt;&lt;10);</div><div class='add'>+	pci_write_config_dword(dev, 0x64, d);</div><div class='add'>+	pci_read_config_dword(dev, 0x64, &amp;d);</div><div class='add'>+	if (!(d &amp; (1&lt;&lt;10)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	force_hpet_address = val;</div><div class='ctx'> 	force_hpet_resume_type = ATI_FORCE_HPET_RESUME;</div><div class='ctx'> 	dev_printk(KERN_DEBUG, &amp;dev-&gt;dev, "Force enabled HPET at 0x%lx\n",</div><div class='ctx'> 		   force_hpet_address);</div><div class='ctx'> 	cached_dev = dev;</div><div class='del'>-	return;</div><div class='ctx'> }</div><div class='ctx'> DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP400_SMBUS,</div><div class='ctx'> 			 ati_force_enable_hpet);</div><div class='head'>diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c<br/>index 724adfc63cb9..f4c93f1cfc19 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/reboot.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/reboot.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/reboot.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/reboot.c</a></div><div class='hunk'>@@ -29,7 +29,11 @@ EXPORT_SYMBOL(pm_power_off);</div><div class='ctx'> </div><div class='ctx'> static const struct desc_ptr no_idt = {};</div><div class='ctx'> static int reboot_mode;</div><div class='del'>-enum reboot_type reboot_type = BOOT_KBD;</div><div class='add'>+/*</div><div class='add'>+ * Keyboard reset and triple fault may result in INIT, not RESET, which</div><div class='add'>+ * doesn't work when we're in vmx root mode.  Try ACPI first.</div><div class='add'>+ */</div><div class='add'>+enum reboot_type reboot_type = BOOT_ACPI;</div><div class='ctx'> int reboot_force;</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_X86_32) &amp;&amp; defined(CONFIG_SMP)</div><div class='head'>diff --git a/arch/x86/kernel/rtc.c b/arch/x86/kernel/rtc.c<br/>index 05191bbc68b8..0a23b5795b25 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/rtc.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/rtc.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/rtc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/rtc.c</a></div><div class='hunk'>@@ -223,11 +223,25 @@ static struct platform_device rtc_device = {</div><div class='ctx'> static __init int add_rtc_cmos(void)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_PNP</div><div class='del'>-	if (!pnp_platform_devices)</div><div class='del'>-		platform_device_register(&amp;rtc_device);</div><div class='del'>-#else</div><div class='add'>+	static const char *ids[] __initconst =</div><div class='add'>+	    { "PNP0b00", "PNP0b01", "PNP0b02", };</div><div class='add'>+	struct pnp_dev *dev;</div><div class='add'>+	struct pnp_id *id;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	pnp_for_each_dev(dev) {</div><div class='add'>+		for (id = dev-&gt;id; id; id = id-&gt;next) {</div><div class='add'>+			for (i = 0; i &lt; ARRAY_SIZE(ids); i++) {</div><div class='add'>+				if (compare_pnp_id(id, ids[i]) != 0)</div><div class='add'>+					return 0;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	platform_device_register(&amp;rtc_device);</div><div class='del'>-#endif /* CONFIG_PNP */</div><div class='add'>+	dev_info(&amp;rtc_device.dev,</div><div class='add'>+		 "registered platform RTC device (no PNP device found)\n");</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> device_initcall(add_rtc_cmos);</div><div class='head'>diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c<br/>index 9838f2539dfc..2255782e8d4b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/setup.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/setup.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/setup.c</a></div><div class='hunk'>@@ -223,6 +223,9 @@ unsigned long saved_video_mode;</div><div class='ctx'> #define RAMDISK_LOAD_FLAG		0x4000</div><div class='ctx'> </div><div class='ctx'> static char __initdata command_line[COMMAND_LINE_SIZE];</div><div class='add'>+#ifdef CONFIG_CMDLINE_BOOL</div><div class='add'>+static char __initdata builtin_cmdline[COMMAND_LINE_SIZE] = CONFIG_CMDLINE;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_EDD) || defined(CONFIG_EDD_MODULE)</div><div class='ctx'> struct edd edd;</div><div class='hunk'>@@ -299,7 +302,7 @@ static void __init relocate_initrd(void)</div><div class='ctx'> 		if (clen &gt; MAX_MAP_CHUNK-slop)</div><div class='ctx'> 			clen = MAX_MAP_CHUNK-slop;</div><div class='ctx'> 		mapaddr = ramdisk_image &amp; PAGE_MASK;</div><div class='del'>-		p = early_ioremap(mapaddr, clen+slop);</div><div class='add'>+		p = early_memremap(mapaddr, clen+slop);</div><div class='ctx'> 		memcpy(q, p+slop, clen);</div><div class='ctx'> 		early_iounmap(p, clen+slop);</div><div class='ctx'> 		q += clen;</div><div class='hunk'>@@ -376,7 +379,7 @@ static void __init parse_setup_data(void)</div><div class='ctx'> 		return;</div><div class='ctx'> 	pa_data = boot_params.hdr.setup_data;</div><div class='ctx'> 	while (pa_data) {</div><div class='del'>-		data = early_ioremap(pa_data, PAGE_SIZE);</div><div class='add'>+		data = early_memremap(pa_data, PAGE_SIZE);</div><div class='ctx'> 		switch (data-&gt;type) {</div><div class='ctx'> 		case SETUP_E820_EXT:</div><div class='ctx'> 			parse_e820_ext(data, pa_data);</div><div class='hunk'>@@ -399,7 +402,7 @@ static void __init e820_reserve_setup_data(void)</div><div class='ctx'> 		return;</div><div class='ctx'> 	pa_data = boot_params.hdr.setup_data;</div><div class='ctx'> 	while (pa_data) {</div><div class='del'>-		data = early_ioremap(pa_data, sizeof(*data));</div><div class='add'>+		data = early_memremap(pa_data, sizeof(*data));</div><div class='ctx'> 		e820_update_range(pa_data, sizeof(*data)+data-&gt;len,</div><div class='ctx'> 			 E820_RAM, E820_RESERVED_KERN);</div><div class='ctx'> 		found = 1;</div><div class='hunk'>@@ -425,7 +428,7 @@ static void __init reserve_early_setup_data(void)</div><div class='ctx'> 		return;</div><div class='ctx'> 	pa_data = boot_params.hdr.setup_data;</div><div class='ctx'> 	while (pa_data) {</div><div class='del'>-		data = early_ioremap(pa_data, sizeof(*data));</div><div class='add'>+		data = early_memremap(pa_data, sizeof(*data));</div><div class='ctx'> 		sprintf(buf, "setup data %x", data-&gt;type);</div><div class='ctx'> 		reserve_early(pa_data, pa_data+sizeof(*data)+data-&gt;len, buf);</div><div class='ctx'> 		pa_data = data-&gt;next;</div><div class='hunk'>@@ -579,6 +582,190 @@ static struct x86_quirks default_x86_quirks __initdata;</div><div class='ctx'> struct x86_quirks *x86_quirks __initdata = &amp;default_x86_quirks;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Some BIOSes seem to corrupt the low 64k of memory during events</div><div class='add'>+ * like suspend/resume and unplugging an HDMI cable.  Reserve all</div><div class='add'>+ * remaining free memory in that area and fill it with a distinct</div><div class='add'>+ * pattern.</div><div class='add'>+ */</div><div class='add'>+#ifdef CONFIG_X86_CHECK_BIOS_CORRUPTION</div><div class='add'>+#define MAX_SCAN_AREAS	8</div><div class='add'>+</div><div class='add'>+static int __read_mostly memory_corruption_check = -1;</div><div class='add'>+</div><div class='add'>+static unsigned __read_mostly corruption_check_size = 64*1024;</div><div class='add'>+static unsigned __read_mostly corruption_check_period = 60; /* seconds */</div><div class='add'>+</div><div class='add'>+static struct e820entry scan_areas[MAX_SCAN_AREAS];</div><div class='add'>+static int num_scan_areas;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int set_corruption_check(char *arg)</div><div class='add'>+{</div><div class='add'>+	char *end;</div><div class='add'>+</div><div class='add'>+	memory_corruption_check = simple_strtol(arg, &amp;end, 10);</div><div class='add'>+</div><div class='add'>+	return (*end == 0) ? 0 : -EINVAL;</div><div class='add'>+}</div><div class='add'>+early_param("memory_corruption_check", set_corruption_check);</div><div class='add'>+</div><div class='add'>+static int set_corruption_check_period(char *arg)</div><div class='add'>+{</div><div class='add'>+	char *end;</div><div class='add'>+</div><div class='add'>+	corruption_check_period = simple_strtoul(arg, &amp;end, 10);</div><div class='add'>+</div><div class='add'>+	return (*end == 0) ? 0 : -EINVAL;</div><div class='add'>+}</div><div class='add'>+early_param("memory_corruption_check_period", set_corruption_check_period);</div><div class='add'>+</div><div class='add'>+static int set_corruption_check_size(char *arg)</div><div class='add'>+{</div><div class='add'>+	char *end;</div><div class='add'>+	unsigned size;</div><div class='add'>+</div><div class='add'>+	size = memparse(arg, &amp;end);</div><div class='add'>+</div><div class='add'>+	if (*end == '\0')</div><div class='add'>+		corruption_check_size = size;</div><div class='add'>+</div><div class='add'>+	return (size == corruption_check_size) ? 0 : -EINVAL;</div><div class='add'>+}</div><div class='add'>+early_param("memory_corruption_check_size", set_corruption_check_size);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void __init setup_bios_corruption_check(void)</div><div class='add'>+{</div><div class='add'>+	u64 addr = PAGE_SIZE;	/* assume first page is reserved anyway */</div><div class='add'>+</div><div class='add'>+	if (memory_corruption_check == -1) {</div><div class='add'>+		memory_corruption_check =</div><div class='add'>+#ifdef CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK</div><div class='add'>+			1</div><div class='add'>+#else</div><div class='add'>+			0</div><div class='add'>+#endif</div><div class='add'>+			;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (corruption_check_size == 0)</div><div class='add'>+		memory_corruption_check = 0;</div><div class='add'>+</div><div class='add'>+	if (!memory_corruption_check)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	corruption_check_size = round_up(corruption_check_size, PAGE_SIZE);</div><div class='add'>+</div><div class='add'>+	while(addr &lt; corruption_check_size &amp;&amp; num_scan_areas &lt; MAX_SCAN_AREAS) {</div><div class='add'>+		u64 size;</div><div class='add'>+		addr = find_e820_area_size(addr, &amp;size, PAGE_SIZE);</div><div class='add'>+</div><div class='add'>+		if (addr == 0)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if ((addr + size) &gt; corruption_check_size)</div><div class='add'>+			size = corruption_check_size - addr;</div><div class='add'>+</div><div class='add'>+		if (size == 0)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		e820_update_range(addr, size, E820_RAM, E820_RESERVED);</div><div class='add'>+		scan_areas[num_scan_areas].addr = addr;</div><div class='add'>+		scan_areas[num_scan_areas].size = size;</div><div class='add'>+		num_scan_areas++;</div><div class='add'>+</div><div class='add'>+		/* Assume we've already mapped this early memory */</div><div class='add'>+		memset(__va(addr), 0, size);</div><div class='add'>+</div><div class='add'>+		addr += size;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "Scanning %d areas for low memory corruption\n",</div><div class='add'>+	       num_scan_areas);</div><div class='add'>+	update_e820();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct timer_list periodic_check_timer;</div><div class='add'>+</div><div class='add'>+void check_for_bios_corruption(void)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	int corruption = 0;</div><div class='add'>+</div><div class='add'>+	if (!memory_corruption_check)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for(i = 0; i &lt; num_scan_areas; i++) {</div><div class='add'>+		unsigned long *addr = __va(scan_areas[i].addr);</div><div class='add'>+		unsigned long size = scan_areas[i].size;</div><div class='add'>+</div><div class='add'>+		for(; size; addr++, size -= sizeof(unsigned long)) {</div><div class='add'>+			if (!*addr)</div><div class='add'>+				continue;</div><div class='add'>+			printk(KERN_ERR "Corrupted low memory at %p (%lx phys) = %08lx\n",</div><div class='add'>+			       addr, __pa(addr), *addr);</div><div class='add'>+			corruption = 1;</div><div class='add'>+			*addr = 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	WARN(corruption, KERN_ERR "Memory corruption detected in low memory\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void periodic_check_for_corruption(unsigned long data)</div><div class='add'>+{</div><div class='add'>+	check_for_bios_corruption();</div><div class='add'>+	mod_timer(&amp;periodic_check_timer, round_jiffies(jiffies + corruption_check_period*HZ));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void start_periodic_check_for_corruption(void)</div><div class='add'>+{</div><div class='add'>+	if (!memory_corruption_check || corruption_check_period == 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "Scanning for low memory corruption every %d seconds\n",</div><div class='add'>+	       corruption_check_period);</div><div class='add'>+</div><div class='add'>+	init_timer(&amp;periodic_check_timer);</div><div class='add'>+	periodic_check_timer.function = &amp;periodic_check_for_corruption;</div><div class='add'>+	periodic_check_for_corruption(0);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static int __init dmi_low_memory_corruption(const struct dmi_system_id *d)</div><div class='add'>+{</div><div class='add'>+	printk(KERN_NOTICE</div><div class='add'>+		"%s detected: BIOS may corrupt low RAM, working it around.\n",</div><div class='add'>+		d-&gt;ident);</div><div class='add'>+</div><div class='add'>+	e820_update_range(0, 0x10000, E820_RAM, E820_RESERVED);</div><div class='add'>+	sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &amp;e820.nr_map);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* List of systems that have known low memory corruption BIOS problems */</div><div class='add'>+static struct dmi_system_id __initdata bad_bios_dmi_table[] = {</div><div class='add'>+#ifdef CONFIG_X86_RESERVE_LOW_64K</div><div class='add'>+	{</div><div class='add'>+		.callback = dmi_low_memory_corruption,</div><div class='add'>+		.ident = "AMI BIOS",</div><div class='add'>+		.matches = {</div><div class='add'>+			DMI_MATCH(DMI_BIOS_VENDOR, "American Megatrends Inc."),</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.callback = dmi_low_memory_corruption,</div><div class='add'>+		.ident = "Phoenix BIOS",</div><div class='add'>+		.matches = {</div><div class='add'>+			DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies, LTD"),</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+#endif</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Determine if we were loaded by an EFI loader.  If so, then we have also been</div><div class='ctx'>  * passed the efi memmap, systab, etc., so we should use these data structures</div><div class='ctx'>  * for initialization.  Note, the efi init code path is determined by the</div><div class='hunk'>@@ -665,6 +852,19 @@ void __init setup_arch(char **cmdline_p)</div><div class='ctx'> 	bss_resource.start = virt_to_phys(&amp;__bss_start);</div><div class='ctx'> 	bss_resource.end = virt_to_phys(&amp;__bss_stop)-1;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_CMDLINE_BOOL</div><div class='add'>+#ifdef CONFIG_CMDLINE_OVERRIDE</div><div class='add'>+	strlcpy(boot_command_line, builtin_cmdline, COMMAND_LINE_SIZE);</div><div class='add'>+#else</div><div class='add'>+	if (builtin_cmdline[0]) {</div><div class='add'>+		/* append boot loader cmdline to builtin */</div><div class='add'>+		strlcat(builtin_cmdline, " ", COMMAND_LINE_SIZE);</div><div class='add'>+		strlcat(builtin_cmdline, boot_command_line, COMMAND_LINE_SIZE);</div><div class='add'>+		strlcpy(boot_command_line, builtin_cmdline, COMMAND_LINE_SIZE);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	strlcpy(command_line, boot_command_line, COMMAND_LINE_SIZE);</div><div class='ctx'> 	*cmdline_p = command_line;</div><div class='ctx'> </div><div class='hunk'>@@ -699,6 +899,10 @@ void __init setup_arch(char **cmdline_p)</div><div class='ctx'> </div><div class='ctx'> 	finish_e820_parsing();</div><div class='ctx'> </div><div class='add'>+	dmi_scan_machine();</div><div class='add'>+</div><div class='add'>+	dmi_check_system(bad_bios_dmi_table);</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_X86_32</div><div class='ctx'> 	probe_roms();</div><div class='ctx'> #endif</div><div class='hunk'>@@ -742,6 +946,8 @@ void __init setup_arch(char **cmdline_p)</div><div class='ctx'> #else</div><div class='ctx'> 	num_physpages = max_pfn;</div><div class='ctx'> </div><div class='add'>+ 	if (cpu_has_x2apic)</div><div class='add'>+ 		check_x2apic();</div><div class='ctx'> </div><div class='ctx'> 	/* How many end-of-memory variables you have, grandma! */</div><div class='ctx'> 	/* need this before calling reserve_initrd */</div><div class='hunk'>@@ -753,6 +959,10 @@ void __init setup_arch(char **cmdline_p)</div><div class='ctx'> 	high_memory = (void *)__va(max_pfn * PAGE_SIZE - 1) + 1;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_X86_CHECK_BIOS_CORRUPTION</div><div class='add'>+	setup_bios_corruption_check();</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	/* max_pfn_mapped is updated here */</div><div class='ctx'> 	max_low_pfn_mapped = init_memory_mapping(0, max_low_pfn&lt;&lt;PAGE_SHIFT);</div><div class='ctx'> 	max_pfn_mapped = max_low_pfn_mapped;</div><div class='hunk'>@@ -781,8 +991,6 @@ void __init setup_arch(char **cmdline_p)</div><div class='ctx'> 	vsmp_init();</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	dmi_scan_machine();</div><div class='del'>-</div><div class='ctx'> 	io_delay_init();</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -790,6 +998,8 @@ void __init setup_arch(char **cmdline_p)</div><div class='ctx'> 	 */</div><div class='ctx'> 	acpi_boot_table_init();</div><div class='ctx'> </div><div class='add'>+	early_acpi_boot_init();</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_ACPI_NUMA</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Parse SRAT to discover nodes.</div><div class='hunk'>@@ -885,3 +1095,5 @@ void __init setup_arch(char **cmdline_p)</div><div class='ctx'> #endif</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+</div><div class='head'>diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c<br/>index 76e305e064f9..0e67f72d9316 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/setup_percpu.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/setup_percpu.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/setup_percpu.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/setup_percpu.c</a></div><div class='hunk'>@@ -162,9 +162,16 @@ void __init setup_per_cpu_areas(void)</div><div class='ctx'> 			printk(KERN_INFO</div><div class='ctx'> 			       "cpu %d has no node %d or node-local memory\n",</div><div class='ctx'> 				cpu, node);</div><div class='add'>+			if (ptr)</div><div class='add'>+				printk(KERN_DEBUG "per cpu data for cpu%d at %016lx\n",</div><div class='add'>+					 cpu, __pa(ptr));</div><div class='ctx'> 		}</div><div class='del'>-		else</div><div class='add'>+		else {</div><div class='ctx'> 			ptr = alloc_bootmem_pages_node(NODE_DATA(node), size);</div><div class='add'>+			if (ptr)</div><div class='add'>+				printk(KERN_DEBUG "per cpu data for cpu%d on node%d at %016lx\n",</div><div class='add'>+					 cpu, node, __pa(ptr));</div><div class='add'>+		}</div><div class='ctx'> #endif</div><div class='ctx'> 		per_cpu_offset(cpu) = ptr - __per_cpu_start;</div><div class='ctx'> 		memcpy(ptr, __per_cpu_start, __per_cpu_end - __per_cpu_start);</div><div class='head'>diff --git a/arch/x86/kernel/sigframe.h b/arch/x86/kernel/sigframe.h<br/>index 72bbb519d2dc..cc673aa55ce4 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/sigframe.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/sigframe.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/sigframe.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/sigframe.h</a></div><div class='hunk'>@@ -3,9 +3,18 @@ struct sigframe {</div><div class='ctx'> 	char __user *pretcode;</div><div class='ctx'> 	int sig;</div><div class='ctx'> 	struct sigcontext sc;</div><div class='del'>-	struct _fpstate fpstate;</div><div class='add'>+	/*</div><div class='add'>+	 * fpstate is unused. fpstate is moved/allocated after</div><div class='add'>+	 * retcode[] below. This movement allows to have the FP state and the</div><div class='add'>+	 * future state extensions (xsave) stay together.</div><div class='add'>+	 * And at the same time retaining the unused fpstate, prevents changing</div><div class='add'>+	 * the offset of extramask[] in the sigframe and thus prevent any</div><div class='add'>+	 * legacy application accessing/modifying it.</div><div class='add'>+	 */</div><div class='add'>+	struct _fpstate fpstate_unused;</div><div class='ctx'> 	unsigned long extramask[_NSIG_WORDS-1];</div><div class='ctx'> 	char retcode[8];</div><div class='add'>+	/* fp state follows here */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct rt_sigframe {</div><div class='hunk'>@@ -15,13 +24,19 @@ struct rt_sigframe {</div><div class='ctx'> 	void __user *puc;</div><div class='ctx'> 	struct siginfo info;</div><div class='ctx'> 	struct ucontext uc;</div><div class='del'>-	struct _fpstate fpstate;</div><div class='ctx'> 	char retcode[8];</div><div class='add'>+	/* fp state follows here */</div><div class='ctx'> };</div><div class='ctx'> #else</div><div class='ctx'> struct rt_sigframe {</div><div class='ctx'> 	char __user *pretcode;</div><div class='ctx'> 	struct ucontext uc;</div><div class='ctx'> 	struct siginfo info;</div><div class='add'>+	/* fp state follows here */</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,</div><div class='add'>+		sigset_t *set, struct pt_regs *regs);</div><div class='add'>+int ia32_setup_frame(int sig, struct k_sigaction *ka,</div><div class='add'>+		sigset_t *set, struct pt_regs *regs);</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/x86/kernel/signal_32.c b/arch/x86/kernel/signal_32.c<br/>index 6fb5bcdd8933..d6dd057d0f22 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/signal_32.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/signal_32.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/signal_32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/signal_32.c</a></div><div class='hunk'>@@ -17,6 +17,7 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='add'>+#include &lt;linux/tracehook.h&gt;</div><div class='ctx'> #include &lt;linux/elf.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='hunk'>@@ -26,6 +27,8 @@</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/i387.h&gt;</div><div class='ctx'> #include &lt;asm/vdso.h&gt;</div><div class='add'>+#include &lt;asm/syscall.h&gt;</div><div class='add'>+#include &lt;asm/syscalls.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "sigframe.h"</div><div class='ctx'> </div><div class='hunk'>@@ -110,6 +113,27 @@ asmlinkage int sys_sigaltstack(unsigned long bx)</div><div class='ctx'> 	return do_sigaltstack(uss, uoss, regs-&gt;sp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define COPY(x)			{		\</div><div class='add'>+	err |= __get_user(regs-&gt;x, &amp;sc-&gt;x);	\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define COPY_SEG(seg)		{			\</div><div class='add'>+		unsigned short tmp;			\</div><div class='add'>+		err |= __get_user(tmp, &amp;sc-&gt;seg);	\</div><div class='add'>+		regs-&gt;seg = tmp;			\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define COPY_SEG_STRICT(seg)	{			\</div><div class='add'>+		unsigned short tmp;			\</div><div class='add'>+		err |= __get_user(tmp, &amp;sc-&gt;seg);	\</div><div class='add'>+		regs-&gt;seg = tmp | 3;			\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define GET_SEG(seg)		{			\</div><div class='add'>+		unsigned short tmp;			\</div><div class='add'>+		err |= __get_user(tmp, &amp;sc-&gt;seg);	\</div><div class='add'>+		loadsegment(seg, tmp);			\</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Do a signal return; undo the signal stack.</div><div class='hunk'>@@ -118,28 +142,13 @@ static int</div><div class='ctx'> restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc,</div><div class='ctx'> 		   unsigned long *pax)</div><div class='ctx'> {</div><div class='add'>+	void __user *buf;</div><div class='add'>+	unsigned int tmpflags;</div><div class='ctx'> 	unsigned int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Always make any pending restarted system calls return -EINTR */</div><div class='ctx'> 	current_thread_info()-&gt;restart_block.fn = do_no_restart_syscall;</div><div class='ctx'> </div><div class='del'>-#define COPY(x)		err |= __get_user(regs-&gt;x, &amp;sc-&gt;x)</div><div class='del'>-</div><div class='del'>-#define COPY_SEG(seg)							\</div><div class='del'>-	{ unsigned short tmp;						\</div><div class='del'>-	  err |= __get_user(tmp, &amp;sc-&gt;seg);				\</div><div class='del'>-	  regs-&gt;seg = tmp; }</div><div class='del'>-</div><div class='del'>-#define COPY_SEG_STRICT(seg)						\</div><div class='del'>-	{ unsigned short tmp;						\</div><div class='del'>-	  err |= __get_user(tmp, &amp;sc-&gt;seg);				\</div><div class='del'>-	  regs-&gt;seg = tmp|3; }</div><div class='del'>-</div><div class='del'>-#define GET_SEG(seg)							\</div><div class='del'>-	{ unsigned short tmp;						\</div><div class='del'>-	  err |= __get_user(tmp, &amp;sc-&gt;seg);				\</div><div class='del'>-	  loadsegment(seg, tmp); }</div><div class='del'>-</div><div class='ctx'> 	GET_SEG(gs);</div><div class='ctx'> 	COPY_SEG(fs);</div><div class='ctx'> 	COPY_SEG(es);</div><div class='hunk'>@@ -149,38 +158,15 @@ restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc,</div><div class='ctx'> 	COPY_SEG_STRICT(cs);</div><div class='ctx'> 	COPY_SEG_STRICT(ss);</div><div class='ctx'> </div><div class='del'>-	{</div><div class='del'>-		unsigned int tmpflags;</div><div class='del'>-</div><div class='del'>-		err |= __get_user(tmpflags, &amp;sc-&gt;flags);</div><div class='del'>-		regs-&gt;flags = (regs-&gt;flags &amp; ~FIX_EFLAGS) |</div><div class='del'>-						(tmpflags &amp; FIX_EFLAGS);</div><div class='del'>-		regs-&gt;orig_ax = -1;		/* disable syscall checks */</div><div class='del'>-	}</div><div class='add'>+	err |= __get_user(tmpflags, &amp;sc-&gt;flags);</div><div class='add'>+	regs-&gt;flags = (regs-&gt;flags &amp; ~FIX_EFLAGS) | (tmpflags &amp; FIX_EFLAGS);</div><div class='add'>+	regs-&gt;orig_ax = -1;		/* disable syscall checks */</div><div class='ctx'> </div><div class='del'>-	{</div><div class='del'>-		struct _fpstate __user *buf;</div><div class='del'>-</div><div class='del'>-		err |= __get_user(buf, &amp;sc-&gt;fpstate);</div><div class='del'>-		if (buf) {</div><div class='del'>-			if (!access_ok(VERIFY_READ, buf, sizeof(*buf)))</div><div class='del'>-				goto badframe;</div><div class='del'>-			err |= restore_i387(buf);</div><div class='del'>-		} else {</div><div class='del'>-			struct task_struct *me = current;</div><div class='del'>-</div><div class='del'>-			if (used_math()) {</div><div class='del'>-				clear_fpu(me);</div><div class='del'>-				clear_used_math();</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	err |= __get_user(buf, &amp;sc-&gt;fpstate);</div><div class='add'>+	err |= restore_i387_xstate(buf);</div><div class='ctx'> </div><div class='ctx'> 	err |= __get_user(*pax, &amp;sc-&gt;ax);</div><div class='ctx'> 	return err;</div><div class='del'>-</div><div class='del'>-badframe:</div><div class='del'>-	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> asmlinkage unsigned long sys_sigreturn(unsigned long __unused)</div><div class='hunk'>@@ -226,9 +212,8 @@ badframe:</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-asmlinkage int sys_rt_sigreturn(unsigned long __unused)</div><div class='add'>+static long do_rt_sigreturn(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='del'>-	struct pt_regs *regs = (struct pt_regs *)&amp;__unused;</div><div class='ctx'> 	struct rt_sigframe __user *frame;</div><div class='ctx'> 	unsigned long ax;</div><div class='ctx'> 	sigset_t set;</div><div class='hunk'>@@ -254,15 +239,22 @@ asmlinkage int sys_rt_sigreturn(unsigned long __unused)</div><div class='ctx'> 	return ax;</div><div class='ctx'> </div><div class='ctx'> badframe:</div><div class='del'>-	force_sig(SIGSEGV, current);</div><div class='add'>+	signal_fault(regs, frame, "rt_sigreturn");</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+asmlinkage int sys_rt_sigreturn(unsigned long __unused)</div><div class='add'>+{</div><div class='add'>+	struct pt_regs *regs = (struct pt_regs *)&amp;__unused;</div><div class='add'>+</div><div class='add'>+	return do_rt_sigreturn(regs);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Set up a signal frame.</div><div class='ctx'>  */</div><div class='ctx'> static int</div><div class='del'>-setup_sigcontext(struct sigcontext __user *sc, struct _fpstate __user *fpstate,</div><div class='add'>+setup_sigcontext(struct sigcontext __user *sc, void __user *fpstate,</div><div class='ctx'> 		 struct pt_regs *regs, unsigned long mask)</div><div class='ctx'> {</div><div class='ctx'> 	int tmp, err = 0;</div><div class='hunk'>@@ -289,7 +281,7 @@ setup_sigcontext(struct sigcontext __user *sc, struct _fpstate __user *fpstate,</div><div class='ctx'> 	err |= __put_user(regs-&gt;sp, &amp;sc-&gt;sp_at_signal);</div><div class='ctx'> 	err |= __put_user(regs-&gt;ss, (unsigned int __user *)&amp;sc-&gt;ss);</div><div class='ctx'> </div><div class='del'>-	tmp = save_i387(fpstate);</div><div class='add'>+	tmp = save_i387_xstate(fpstate);</div><div class='ctx'> 	if (tmp &lt; 0)</div><div class='ctx'> 		err = 1;</div><div class='ctx'> 	else</div><div class='hunk'>@@ -306,7 +298,8 @@ setup_sigcontext(struct sigcontext __user *sc, struct _fpstate __user *fpstate,</div><div class='ctx'>  * Determine which stack to use..</div><div class='ctx'>  */</div><div class='ctx'> static inline void __user *</div><div class='del'>-get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size)</div><div class='add'>+get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size,</div><div class='add'>+	     void **fpstate)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long sp;</div><div class='ctx'> </div><div class='hunk'>@@ -332,6 +325,11 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size)</div><div class='ctx'> 			sp = (unsigned long) ka-&gt;sa.sa_restorer;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (used_math()) {</div><div class='add'>+		sp = sp - sig_xstate_size;</div><div class='add'>+		*fpstate = (struct _fpstate *) sp;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	sp -= frame_size;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Align the stack pointer according to the i386 ABI,</div><div class='hunk'>@@ -343,38 +341,29 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-setup_frame(int sig, struct k_sigaction *ka, sigset_t *set,</div><div class='del'>-	    struct pt_regs *regs)</div><div class='add'>+__setup_frame(int sig, struct k_sigaction *ka, sigset_t *set,</div><div class='add'>+	      struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	struct sigframe __user *frame;</div><div class='ctx'> 	void __user *restorer;</div><div class='ctx'> 	int err = 0;</div><div class='del'>-	int usig;</div><div class='add'>+	void __user *fpstate = NULL;</div><div class='ctx'> </div><div class='del'>-	frame = get_sigframe(ka, regs, sizeof(*frame));</div><div class='add'>+	frame = get_sigframe(ka, regs, sizeof(*frame), &amp;fpstate);</div><div class='ctx'> </div><div class='ctx'> 	if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))</div><div class='del'>-		goto give_sigsegv;</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-	usig = current_thread_info()-&gt;exec_domain</div><div class='del'>-		&amp;&amp; current_thread_info()-&gt;exec_domain-&gt;signal_invmap</div><div class='del'>-		&amp;&amp; sig &lt; 32</div><div class='del'>-		? current_thread_info()-&gt;exec_domain-&gt;signal_invmap[sig]</div><div class='del'>-		: sig;</div><div class='add'>+	if (__put_user(sig, &amp;frame-&gt;sig))</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-	err = __put_user(usig, &amp;frame-&gt;sig);</div><div class='del'>-	if (err)</div><div class='del'>-		goto give_sigsegv;</div><div class='del'>-</div><div class='del'>-	err = setup_sigcontext(&amp;frame-&gt;sc, &amp;frame-&gt;fpstate, regs, set-&gt;sig[0]);</div><div class='del'>-	if (err)</div><div class='del'>-		goto give_sigsegv;</div><div class='add'>+	if (setup_sigcontext(&amp;frame-&gt;sc, fpstate, regs, set-&gt;sig[0]))</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	if (_NSIG_WORDS &gt; 1) {</div><div class='del'>-		err = __copy_to_user(&amp;frame-&gt;extramask, &amp;set-&gt;sig[1],</div><div class='del'>-				      sizeof(frame-&gt;extramask));</div><div class='del'>-		if (err)</div><div class='del'>-			goto give_sigsegv;</div><div class='add'>+		if (__copy_to_user(&amp;frame-&gt;extramask, &amp;set-&gt;sig[1],</div><div class='add'>+				   sizeof(frame-&gt;extramask)))</div><div class='add'>+			return -EFAULT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (current-&gt;mm-&gt;context.vdso)</div><div class='hunk'>@@ -399,7 +388,7 @@ setup_frame(int sig, struct k_sigaction *ka, sigset_t *set,</div><div class='ctx'> 	err |= __put_user(0x80cd, (short __user *)(frame-&gt;retcode+6));</div><div class='ctx'> </div><div class='ctx'> 	if (err)</div><div class='del'>-		goto give_sigsegv;</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	/* Set up registers for signal handler */</div><div class='ctx'> 	regs-&gt;sp = (unsigned long)frame;</div><div class='hunk'>@@ -414,50 +403,43 @@ setup_frame(int sig, struct k_sigaction *ka, sigset_t *set,</div><div class='ctx'> 	regs-&gt;cs = __USER_CS;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='del'>-give_sigsegv:</div><div class='del'>-	force_sigsegv(sig, current);</div><div class='del'>-	return -EFAULT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,</div><div class='del'>-			  sigset_t *set, struct pt_regs *regs)</div><div class='add'>+static int __setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,</div><div class='add'>+			    sigset_t *set, struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	struct rt_sigframe __user *frame;</div><div class='ctx'> 	void __user *restorer;</div><div class='ctx'> 	int err = 0;</div><div class='del'>-	int usig;</div><div class='add'>+	void __user *fpstate = NULL;</div><div class='ctx'> </div><div class='del'>-	frame = get_sigframe(ka, regs, sizeof(*frame));</div><div class='add'>+	frame = get_sigframe(ka, regs, sizeof(*frame), &amp;fpstate);</div><div class='ctx'> </div><div class='ctx'> 	if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))</div><div class='del'>-		goto give_sigsegv;</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-	usig = current_thread_info()-&gt;exec_domain</div><div class='del'>-		&amp;&amp; current_thread_info()-&gt;exec_domain-&gt;signal_invmap</div><div class='del'>-		&amp;&amp; sig &lt; 32</div><div class='del'>-		? current_thread_info()-&gt;exec_domain-&gt;signal_invmap[sig]</div><div class='del'>-		: sig;</div><div class='del'>-</div><div class='del'>-	err |= __put_user(usig, &amp;frame-&gt;sig);</div><div class='add'>+	err |= __put_user(sig, &amp;frame-&gt;sig);</div><div class='ctx'> 	err |= __put_user(&amp;frame-&gt;info, &amp;frame-&gt;pinfo);</div><div class='ctx'> 	err |= __put_user(&amp;frame-&gt;uc, &amp;frame-&gt;puc);</div><div class='ctx'> 	err |= copy_siginfo_to_user(&amp;frame-&gt;info, info);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto give_sigsegv;</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	/* Create the ucontext.  */</div><div class='del'>-	err |= __put_user(0, &amp;frame-&gt;uc.uc_flags);</div><div class='add'>+	if (cpu_has_xsave)</div><div class='add'>+		err |= __put_user(UC_FP_XSTATE, &amp;frame-&gt;uc.uc_flags);</div><div class='add'>+	else</div><div class='add'>+		err |= __put_user(0, &amp;frame-&gt;uc.uc_flags);</div><div class='ctx'> 	err |= __put_user(0, &amp;frame-&gt;uc.uc_link);</div><div class='ctx'> 	err |= __put_user(current-&gt;sas_ss_sp, &amp;frame-&gt;uc.uc_stack.ss_sp);</div><div class='ctx'> 	err |= __put_user(sas_ss_flags(regs-&gt;sp),</div><div class='ctx'> 			  &amp;frame-&gt;uc.uc_stack.ss_flags);</div><div class='ctx'> 	err |= __put_user(current-&gt;sas_ss_size, &amp;frame-&gt;uc.uc_stack.ss_size);</div><div class='del'>-	err |= setup_sigcontext(&amp;frame-&gt;uc.uc_mcontext, &amp;frame-&gt;fpstate,</div><div class='add'>+	err |= setup_sigcontext(&amp;frame-&gt;uc.uc_mcontext, fpstate,</div><div class='ctx'> 				regs, set-&gt;sig[0]);</div><div class='ctx'> 	err |= __copy_to_user(&amp;frame-&gt;uc.uc_sigmask, set, sizeof(*set));</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto give_sigsegv;</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	/* Set up to return from userspace.  */</div><div class='ctx'> 	restorer = VDSO32_SYMBOL(current-&gt;mm-&gt;context.vdso, rt_sigreturn);</div><div class='hunk'>@@ -477,12 +459,12 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,</div><div class='ctx'> 	err |= __put_user(0x80cd, (short __user *)(frame-&gt;retcode+5));</div><div class='ctx'> </div><div class='ctx'> 	if (err)</div><div class='del'>-		goto give_sigsegv;</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	/* Set up registers for signal handler */</div><div class='ctx'> 	regs-&gt;sp = (unsigned long)frame;</div><div class='ctx'> 	regs-&gt;ip = (unsigned long)ka-&gt;sa.sa_handler;</div><div class='del'>-	regs-&gt;ax = (unsigned long)usig;</div><div class='add'>+	regs-&gt;ax = (unsigned long)sig;</div><div class='ctx'> 	regs-&gt;dx = (unsigned long)&amp;frame-&gt;info;</div><div class='ctx'> 	regs-&gt;cx = (unsigned long)&amp;frame-&gt;uc;</div><div class='ctx'> </div><div class='hunk'>@@ -492,15 +474,48 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,</div><div class='ctx'> 	regs-&gt;cs = __USER_CS;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='del'>-give_sigsegv:</div><div class='del'>-	force_sigsegv(sig, current);</div><div class='del'>-	return -EFAULT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * OK, we're invoking a handler:</div><div class='ctx'>  */</div><div class='add'>+static int signr_convert(int sig)</div><div class='add'>+{</div><div class='add'>+	struct thread_info *info = current_thread_info();</div><div class='add'>+</div><div class='add'>+	if (info-&gt;exec_domain &amp;&amp; info-&gt;exec_domain-&gt;signal_invmap &amp;&amp; sig &lt; 32)</div><div class='add'>+		return info-&gt;exec_domain-&gt;signal_invmap[sig];</div><div class='add'>+	return sig;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define is_ia32	1</div><div class='add'>+#define ia32_setup_frame	__setup_frame</div><div class='add'>+#define ia32_setup_rt_frame	__setup_rt_frame</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,</div><div class='add'>+	       sigset_t *set, struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	int usig = signr_convert(sig);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Set up the stack frame */</div><div class='add'>+	if (is_ia32) {</div><div class='add'>+		if (ka-&gt;sa.sa_flags &amp; SA_SIGINFO)</div><div class='add'>+			ret = ia32_setup_rt_frame(usig, ka, info, set, regs);</div><div class='add'>+		else</div><div class='add'>+			ret = ia32_setup_frame(usig, ka, set, regs);</div><div class='add'>+	} else</div><div class='add'>+		ret = __setup_rt_frame(sig, ka, info, set, regs);</div><div class='add'>+</div><div class='add'>+	if (ret) {</div><div class='add'>+		force_sigsegv(sig, current);</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int</div><div class='ctx'> handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka,</div><div class='ctx'> 	      sigset_t *oldset, struct pt_regs *regs)</div><div class='hunk'>@@ -508,9 +523,9 @@ handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka,</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/* Are we from a system call? */</div><div class='del'>-	if ((long)regs-&gt;orig_ax &gt;= 0) {</div><div class='add'>+	if (syscall_get_nr(current, regs) &gt;= 0) {</div><div class='ctx'> 		/* If so, check system call restarting.. */</div><div class='del'>-		switch (regs-&gt;ax) {</div><div class='add'>+		switch (syscall_get_error(current, regs)) {</div><div class='ctx'> 		case -ERESTART_RESTARTBLOCK:</div><div class='ctx'> 		case -ERESTARTNOHAND:</div><div class='ctx'> 			regs-&gt;ax = -EINTR;</div><div class='hunk'>@@ -537,15 +552,20 @@ handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka,</div><div class='ctx'> 	    likely(test_and_clear_thread_flag(TIF_FORCED_TF)))</div><div class='ctx'> 		regs-&gt;flags &amp;= ~X86_EFLAGS_TF;</div><div class='ctx'> </div><div class='del'>-	/* Set up the stack frame */</div><div class='del'>-	if (ka-&gt;sa.sa_flags &amp; SA_SIGINFO)</div><div class='del'>-		ret = setup_rt_frame(sig, ka, info, oldset, regs);</div><div class='del'>-	else</div><div class='del'>-		ret = setup_frame(sig, ka, oldset, regs);</div><div class='add'>+	ret = setup_rt_frame(sig, ka, info, oldset, regs);</div><div class='ctx'> </div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='add'>+	/*</div><div class='add'>+	 * This has nothing to do with segment registers,</div><div class='add'>+	 * despite the name.  This magic affects uaccess.h</div><div class='add'>+	 * macros' behavior.  Reset it to the normal setting.</div><div class='add'>+	 */</div><div class='add'>+	set_fs(USER_DS);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Clear the direction flag as per the ABI for function entry.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -558,8 +578,6 @@ handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka,</div><div class='ctx'> 	 * handler too.</div><div class='ctx'> 	 */</div><div class='ctx'> 	regs-&gt;flags &amp;= ~X86_EFLAGS_TF;</div><div class='del'>-	if (test_thread_flag(TIF_SINGLESTEP))</div><div class='del'>-		ptrace_notify(SIGTRAP);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irq(&amp;current-&gt;sighand-&gt;siglock);</div><div class='ctx'> 	sigorsets(&amp;current-&gt;blocked, &amp;current-&gt;blocked, &amp;ka-&gt;sa.sa_mask);</div><div class='hunk'>@@ -568,9 +586,13 @@ handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka,</div><div class='ctx'> 	recalc_sigpending();</div><div class='ctx'> 	spin_unlock_irq(&amp;current-&gt;sighand-&gt;siglock);</div><div class='ctx'> </div><div class='add'>+	tracehook_signal_handler(sig, info, ka, regs,</div><div class='add'>+				 test_thread_flag(TIF_SINGLESTEP));</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define NR_restart_syscall	__NR_restart_syscall</div><div class='ctx'> /*</div><div class='ctx'>  * Note that 'init' is a special process: it doesn't get signals it doesn't</div><div class='ctx'>  * want to handle. Thus you cannot kill init even with a SIGKILL even by</div><div class='hunk'>@@ -623,9 +645,9 @@ static void do_signal(struct pt_regs *regs)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Did we come from a system call? */</div><div class='del'>-	if ((long)regs-&gt;orig_ax &gt;= 0) {</div><div class='add'>+	if (syscall_get_nr(current, regs) &gt;= 0) {</div><div class='ctx'> 		/* Restart the system call - no handlers present */</div><div class='del'>-		switch (regs-&gt;ax) {</div><div class='add'>+		switch (syscall_get_error(current, regs)) {</div><div class='ctx'> 		case -ERESTARTNOHAND:</div><div class='ctx'> 		case -ERESTARTSYS:</div><div class='ctx'> 		case -ERESTARTNOINTR:</div><div class='hunk'>@@ -634,7 +656,7 @@ static void do_signal(struct pt_regs *regs)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case -ERESTART_RESTARTBLOCK:</div><div class='del'>-			regs-&gt;ax = __NR_restart_syscall;</div><div class='add'>+			regs-&gt;ax = NR_restart_syscall;</div><div class='ctx'> 			regs-&gt;ip -= 2;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -657,9 +679,38 @@ static void do_signal(struct pt_regs *regs)</div><div class='ctx'> void</div><div class='ctx'> do_notify_resume(struct pt_regs *regs, void *unused, __u32 thread_info_flags)</div><div class='ctx'> {</div><div class='add'>+#if defined(CONFIG_X86_64) &amp;&amp; defined(CONFIG_X86_MCE)</div><div class='add'>+	/* notify userspace of pending MCEs */</div><div class='add'>+	if (thread_info_flags &amp; _TIF_MCE_NOTIFY)</div><div class='add'>+		mce_notify_user();</div><div class='add'>+#endif /* CONFIG_X86_64 &amp;&amp; CONFIG_X86_MCE */</div><div class='add'>+</div><div class='ctx'> 	/* deal with pending signal delivery */</div><div class='ctx'> 	if (thread_info_flags &amp; _TIF_SIGPENDING)</div><div class='ctx'> 		do_signal(regs);</div><div class='ctx'> </div><div class='add'>+	if (thread_info_flags &amp; _TIF_NOTIFY_RESUME) {</div><div class='add'>+		clear_thread_flag(TIF_NOTIFY_RESUME);</div><div class='add'>+		tracehook_notify_resume(regs);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_X86_32</div><div class='ctx'> 	clear_thread_flag(TIF_IRET);</div><div class='add'>+#endif /* CONFIG_X86_32 */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void signal_fault(struct pt_regs *regs, void __user *frame, char *where)</div><div class='add'>+{</div><div class='add'>+	struct task_struct *me = current;</div><div class='add'>+</div><div class='add'>+	if (show_unhandled_signals &amp;&amp; printk_ratelimit()) {</div><div class='add'>+		printk(KERN_INFO</div><div class='add'>+		       "%s[%d] bad frame in %s frame:%p ip:%lx sp:%lx orax:%lx",</div><div class='add'>+		       me-&gt;comm, me-&gt;pid, where, frame,</div><div class='add'>+		       regs-&gt;ip, regs-&gt;sp, regs-&gt;orig_ax);</div><div class='add'>+		print_vma_addr(" in ", regs-&gt;ip);</div><div class='add'>+		printk(KERN_CONT "\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	force_sig(SIGSEGV, me);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/x86/kernel/signal_64.c b/arch/x86/kernel/signal_64.c<br/>index ca316b5b742c..a5c9627f4db9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/signal_64.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/signal_64.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/signal_64.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/signal_64.c</a></div><div class='hunk'>@@ -15,17 +15,21 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='add'>+#include &lt;linux/tracehook.h&gt;</div><div class='ctx'> #include &lt;linux/unistd.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/personality.h&gt;</div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/ucontext.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/i387.h&gt;</div><div class='ctx'> #include &lt;asm/proto.h&gt;</div><div class='ctx'> #include &lt;asm/ia32_unistd.h&gt;</div><div class='ctx'> #include &lt;asm/mce.h&gt;</div><div class='add'>+#include &lt;asm/syscall.h&gt;</div><div class='add'>+#include &lt;asm/syscalls.h&gt;</div><div class='ctx'> #include "sigframe.h"</div><div class='ctx'> </div><div class='ctx'> #define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP)))</div><div class='hunk'>@@ -41,11 +45,6 @@</div><div class='ctx'> # define FIX_EFLAGS	__FIX_EFLAGS</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,</div><div class='del'>-               sigset_t *set, struct pt_regs * regs); </div><div class='del'>-int ia32_setup_frame(int sig, struct k_sigaction *ka,</div><div class='del'>-            sigset_t *set, struct pt_regs * regs); </div><div class='del'>-</div><div class='ctx'> asmlinkage long</div><div class='ctx'> sys_sigaltstack(const stack_t __user *uss, stack_t __user *uoss,</div><div class='ctx'> 		struct pt_regs *regs)</div><div class='hunk'>@@ -53,67 +52,14 @@ sys_sigaltstack(const stack_t __user *uss, stack_t __user *uoss,</div><div class='ctx'> 	return do_sigaltstack(uss, uoss, regs-&gt;sp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Signal frame handlers.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static inline int save_i387(struct _fpstate __user *buf)</div><div class='del'>-{</div><div class='del'>-	struct task_struct *tsk = current;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	BUILD_BUG_ON(sizeof(struct user_i387_struct) !=</div><div class='del'>-			sizeof(tsk-&gt;thread.xstate-&gt;fxsave));</div><div class='del'>-</div><div class='del'>-	if ((unsigned long)buf % 16)</div><div class='del'>-		printk("save_i387: bad fpstate %p\n", buf);</div><div class='del'>-</div><div class='del'>-	if (!used_math())</div><div class='del'>-		return 0;</div><div class='del'>-	clear_used_math(); /* trigger finit */</div><div class='del'>-	if (task_thread_info(tsk)-&gt;status &amp; TS_USEDFPU) {</div><div class='del'>-		err = save_i387_checking((struct i387_fxsave_struct __user *)</div><div class='del'>-					 buf);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='del'>-		task_thread_info(tsk)-&gt;status &amp;= ~TS_USEDFPU;</div><div class='del'>-		stts();</div><div class='del'>-	} else {</div><div class='del'>-		if (__copy_to_user(buf, &amp;tsk-&gt;thread.xstate-&gt;fxsave,</div><div class='del'>-				   sizeof(struct i387_fxsave_struct)))</div><div class='del'>-			return -1;</div><div class='del'>-	}</div><div class='del'>-	return 1;</div><div class='add'>+#define COPY(x)			{		\</div><div class='add'>+	err |= __get_user(regs-&gt;x, &amp;sc-&gt;x);	\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * This restores directly out of user space. Exceptions are handled.</div><div class='del'>- */</div><div class='del'>-static inline int restore_i387(struct _fpstate __user *buf)</div><div class='del'>-{</div><div class='del'>-	struct task_struct *tsk = current;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (!used_math()) {</div><div class='del'>-		err = init_fpu(tsk);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!(task_thread_info(current)-&gt;status &amp; TS_USEDFPU)) {</div><div class='del'>-		clts();</div><div class='del'>-		task_thread_info(current)-&gt;status |= TS_USEDFPU;</div><div class='del'>-	}</div><div class='del'>-	err = restore_fpu_checking((__force struct i387_fxsave_struct *)buf);</div><div class='del'>-	if (unlikely(err)) {</div><div class='del'>-		/*</div><div class='del'>-		 * Encountered an error while doing the restore from the</div><div class='del'>-		 * user buffer, clear the fpu state.</div><div class='del'>-		 */</div><div class='del'>-		clear_fpu(tsk);</div><div class='del'>-		clear_used_math();</div><div class='del'>-	}</div><div class='del'>-	return err;</div><div class='add'>+#define COPY_SEG_STRICT(seg)	{			\</div><div class='add'>+		unsigned short tmp;			\</div><div class='add'>+		err |= __get_user(tmp, &amp;sc-&gt;seg);	\</div><div class='add'>+		regs-&gt;seg = tmp | 3;			\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -123,13 +69,13 @@ static int</div><div class='ctx'> restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc,</div><div class='ctx'> 		   unsigned long *pax)</div><div class='ctx'> {</div><div class='add'>+	void __user *buf;</div><div class='add'>+	unsigned int tmpflags;</div><div class='ctx'> 	unsigned int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Always make any pending restarted system calls return -EINTR */</div><div class='ctx'> 	current_thread_info()-&gt;restart_block.fn = do_no_restart_syscall;</div><div class='ctx'> </div><div class='del'>-#define COPY(x)		err |= __get_user(regs-&gt;x, &amp;sc-&gt;x)</div><div class='del'>-</div><div class='ctx'> 	COPY(di); COPY(si); COPY(bp); COPY(sp); COPY(bx);</div><div class='ctx'> 	COPY(dx); COPY(cx); COPY(ip);</div><div class='ctx'> 	COPY(r8);</div><div class='hunk'>@@ -144,48 +90,24 @@ restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc,</div><div class='ctx'> 	/* Kernel saves and restores only the CS segment register on signals,</div><div class='ctx'> 	 * which is the bare minimum needed to allow mixed 32/64-bit code.</div><div class='ctx'> 	 * App's signal handler can save/restore other segments if needed. */</div><div class='del'>-	{</div><div class='del'>-		unsigned cs;</div><div class='del'>-		err |= __get_user(cs, &amp;sc-&gt;cs);</div><div class='del'>-		regs-&gt;cs = cs | 3;	/* Force into user mode */</div><div class='del'>-	}</div><div class='add'>+	COPY_SEG_STRICT(cs);</div><div class='ctx'> </div><div class='del'>-	{</div><div class='del'>-		unsigned int tmpflags;</div><div class='del'>-		err |= __get_user(tmpflags, &amp;sc-&gt;flags);</div><div class='del'>-		regs-&gt;flags = (regs-&gt;flags &amp; ~FIX_EFLAGS) | (tmpflags &amp; FIX_EFLAGS);</div><div class='del'>-		regs-&gt;orig_ax = -1;		/* disable syscall checks */</div><div class='del'>-	}</div><div class='add'>+	err |= __get_user(tmpflags, &amp;sc-&gt;flags);</div><div class='add'>+	regs-&gt;flags = (regs-&gt;flags &amp; ~FIX_EFLAGS) | (tmpflags &amp; FIX_EFLAGS);</div><div class='add'>+	regs-&gt;orig_ax = -1;		/* disable syscall checks */</div><div class='ctx'> </div><div class='del'>-	{</div><div class='del'>-		struct _fpstate __user * buf;</div><div class='del'>-		err |= __get_user(buf, &amp;sc-&gt;fpstate);</div><div class='del'>-</div><div class='del'>-		if (buf) {</div><div class='del'>-			if (!access_ok(VERIFY_READ, buf, sizeof(*buf)))</div><div class='del'>-				goto badframe;</div><div class='del'>-			err |= restore_i387(buf);</div><div class='del'>-		} else {</div><div class='del'>-			struct task_struct *me = current;</div><div class='del'>-			if (used_math()) {</div><div class='del'>-				clear_fpu(me);</div><div class='del'>-				clear_used_math();</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	err |= __get_user(buf, &amp;sc-&gt;fpstate);</div><div class='add'>+	err |= restore_i387_xstate(buf);</div><div class='ctx'> </div><div class='ctx'> 	err |= __get_user(*pax, &amp;sc-&gt;ax);</div><div class='ctx'> 	return err;</div><div class='del'>-</div><div class='del'>-badframe:</div><div class='del'>-	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-asmlinkage long sys_rt_sigreturn(struct pt_regs *regs)</div><div class='add'>+static long do_rt_sigreturn(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	struct rt_sigframe __user *frame;</div><div class='del'>-	sigset_t set;</div><div class='ctx'> 	unsigned long ax;</div><div class='add'>+	sigset_t set;</div><div class='ctx'> </div><div class='ctx'> 	frame = (struct rt_sigframe __user *)(regs-&gt;sp - sizeof(long));</div><div class='ctx'> 	if (!access_ok(VERIFY_READ, frame, sizeof(*frame)))</div><div class='hunk'>@@ -198,7 +120,7 @@ asmlinkage long sys_rt_sigreturn(struct pt_regs *regs)</div><div class='ctx'> 	current-&gt;blocked = set;</div><div class='ctx'> 	recalc_sigpending();</div><div class='ctx'> 	spin_unlock_irq(&amp;current-&gt;sighand-&gt;siglock);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	if (restore_sigcontext(regs, &amp;frame-&gt;uc.uc_mcontext, &amp;ax))</div><div class='ctx'> 		goto badframe;</div><div class='ctx'> </div><div class='hunk'>@@ -208,16 +130,22 @@ asmlinkage long sys_rt_sigreturn(struct pt_regs *regs)</div><div class='ctx'> 	return ax;</div><div class='ctx'> </div><div class='ctx'> badframe:</div><div class='del'>-	signal_fault(regs,frame,"sigreturn");</div><div class='add'>+	signal_fault(regs, frame, "rt_sigreturn");</div><div class='ctx'> 	return 0;</div><div class='del'>-}	</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+asmlinkage long sys_rt_sigreturn(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	return do_rt_sigreturn(regs);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Set up a signal frame.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static inline int</div><div class='del'>-setup_sigcontext(struct sigcontext __user *sc, struct pt_regs *regs, unsigned long mask, struct task_struct *me)</div><div class='add'>+setup_sigcontext(struct sigcontext __user *sc, struct pt_regs *regs,</div><div class='add'>+		unsigned long mask, struct task_struct *me)</div><div class='ctx'> {</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -269,41 +197,40 @@ get_stack(struct k_sigaction *ka, struct pt_regs *regs, unsigned long size)</div><div class='ctx'> 			sp = current-&gt;sas_ss_sp + current-&gt;sas_ss_size;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return (void __user *)round_down(sp - size, 16);</div><div class='add'>+	return (void __user *)round_down(sp - size, 64);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,</div><div class='del'>-			   sigset_t *set, struct pt_regs * regs)</div><div class='add'>+static int __setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,</div><div class='add'>+			    sigset_t *set, struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	struct rt_sigframe __user *frame;</div><div class='del'>-	struct _fpstate __user *fp = NULL; </div><div class='add'>+	void __user *fp = NULL;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	struct task_struct *me = current;</div><div class='ctx'> </div><div class='ctx'> 	if (used_math()) {</div><div class='del'>-		fp = get_stack(ka, regs, sizeof(struct _fpstate)); </div><div class='add'>+		fp = get_stack(ka, regs, sig_xstate_size);</div><div class='ctx'> 		frame = (void __user *)round_down(</div><div class='ctx'> 			(unsigned long)fp - sizeof(struct rt_sigframe), 16) - 8;</div><div class='ctx'> </div><div class='del'>-		if (!access_ok(VERIFY_WRITE, fp, sizeof(struct _fpstate)))</div><div class='del'>-			goto give_sigsegv;</div><div class='del'>-</div><div class='del'>-		if (save_i387(fp) &lt; 0) </div><div class='del'>-			err |= -1; </div><div class='add'>+		if (save_i387_xstate(fp) &lt; 0)</div><div class='add'>+			return -EFAULT;</div><div class='ctx'> 	} else</div><div class='ctx'> 		frame = get_stack(ka, regs, sizeof(struct rt_sigframe)) - 8;</div><div class='ctx'> </div><div class='ctx'> 	if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))</div><div class='del'>-		goto give_sigsegv;</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-	if (ka-&gt;sa.sa_flags &amp; SA_SIGINFO) { </div><div class='del'>-		err |= copy_siginfo_to_user(&amp;frame-&gt;info, info);</div><div class='del'>-		if (err)</div><div class='del'>-			goto give_sigsegv;</div><div class='add'>+	if (ka-&gt;sa.sa_flags &amp; SA_SIGINFO) {</div><div class='add'>+		if (copy_siginfo_to_user(&amp;frame-&gt;info, info))</div><div class='add'>+			return -EFAULT;</div><div class='ctx'> 	}</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 	/* Create the ucontext.  */</div><div class='del'>-	err |= __put_user(0, &amp;frame-&gt;uc.uc_flags);</div><div class='add'>+	if (cpu_has_xsave)</div><div class='add'>+		err |= __put_user(UC_FP_XSTATE, &amp;frame-&gt;uc.uc_flags);</div><div class='add'>+	else</div><div class='add'>+		err |= __put_user(0, &amp;frame-&gt;uc.uc_flags);</div><div class='ctx'> 	err |= __put_user(0, &amp;frame-&gt;uc.uc_link);</div><div class='ctx'> 	err |= __put_user(me-&gt;sas_ss_sp, &amp;frame-&gt;uc.uc_stack.ss_sp);</div><div class='ctx'> 	err |= __put_user(sas_ss_flags(regs-&gt;sp),</div><div class='hunk'>@@ -311,9 +238,9 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,</div><div class='ctx'> 	err |= __put_user(me-&gt;sas_ss_size, &amp;frame-&gt;uc.uc_stack.ss_size);</div><div class='ctx'> 	err |= setup_sigcontext(&amp;frame-&gt;uc.uc_mcontext, regs, set-&gt;sig[0], me);</div><div class='ctx'> 	err |= __put_user(fp, &amp;frame-&gt;uc.uc_mcontext.fpstate);</div><div class='del'>-	if (sizeof(*set) == 16) { </div><div class='add'>+	if (sizeof(*set) == 16) {</div><div class='ctx'> 		__put_user(set-&gt;sig[0], &amp;frame-&gt;uc.uc_sigmask.sig[0]);</div><div class='del'>-		__put_user(set-&gt;sig[1], &amp;frame-&gt;uc.uc_sigmask.sig[1]); </div><div class='add'>+		__put_user(set-&gt;sig[1], &amp;frame-&gt;uc.uc_sigmask.sig[1]);</div><div class='ctx'> 	} else</div><div class='ctx'> 		err |= __copy_to_user(&amp;frame-&gt;uc.uc_sigmask, set, sizeof(*set));</div><div class='ctx'> </div><div class='hunk'>@@ -324,15 +251,15 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,</div><div class='ctx'> 		err |= __put_user(ka-&gt;sa.sa_restorer, &amp;frame-&gt;pretcode);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* could use a vstub here */</div><div class='del'>-		goto give_sigsegv; </div><div class='add'>+		return -EFAULT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (err)</div><div class='del'>-		goto give_sigsegv;</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	/* Set up registers for signal handler */</div><div class='ctx'> 	regs-&gt;di = sig;</div><div class='del'>-	/* In case the signal handler was declared without prototypes */ </div><div class='add'>+	/* In case the signal handler was declared without prototypes */</div><div class='ctx'> 	regs-&gt;ax = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* This also works for non SA_SIGINFO handlers because they expect the</div><div class='hunk'>@@ -348,44 +275,45 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,</div><div class='ctx'> 	regs-&gt;cs = __USER_CS;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='del'>-give_sigsegv:</div><div class='del'>-	force_sigsegv(sig, current);</div><div class='del'>-	return -EFAULT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Return -1L or the syscall number that @regs is executing.</div><div class='add'>+ * OK, we're invoking a handler</div><div class='ctx'>  */</div><div class='del'>-static long current_syscall(struct pt_regs *regs)</div><div class='add'>+static int signr_convert(int sig)</div><div class='ctx'> {</div><div class='del'>-	/*</div><div class='del'>-	 * We always sign-extend a -1 value being set here,</div><div class='del'>-	 * so this is always either -1L or a syscall number.</div><div class='del'>-	 */</div><div class='del'>-	return regs-&gt;orig_ax;</div><div class='add'>+	return sig;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Return a value that is -EFOO if the system call in @regs-&gt;orig_ax</div><div class='del'>- * returned an error.  This only works for @regs from @current.</div><div class='del'>- */</div><div class='del'>-static long current_syscall_ret(struct pt_regs *regs)</div><div class='del'>-{</div><div class='ctx'> #ifdef CONFIG_IA32_EMULATION</div><div class='del'>-	if (test_thread_flag(TIF_IA32))</div><div class='del'>-		/*</div><div class='del'>-		 * Sign-extend the value so (int)-EFOO becomes (long)-EFOO</div><div class='del'>-		 * and will match correctly in comparisons.</div><div class='del'>-		 */</div><div class='del'>-		return (int) regs-&gt;ax;</div><div class='add'>+#define is_ia32	test_thread_flag(TIF_IA32)</div><div class='add'>+#else</div><div class='add'>+#define is_ia32	0</div><div class='ctx'> #endif</div><div class='del'>-	return regs-&gt;ax;</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * OK, we're invoking a handler</div><div class='del'>- */	</div><div class='add'>+static int</div><div class='add'>+setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,</div><div class='add'>+	       sigset_t *set, struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	int usig = signr_convert(sig);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Set up the stack frame */</div><div class='add'>+	if (is_ia32) {</div><div class='add'>+		if (ka-&gt;sa.sa_flags &amp; SA_SIGINFO)</div><div class='add'>+			ret = ia32_setup_rt_frame(usig, ka, info, set, regs);</div><div class='add'>+		else</div><div class='add'>+			ret = ia32_setup_frame(usig, ka, set, regs);</div><div class='add'>+	} else</div><div class='add'>+		ret = __setup_rt_frame(sig, ka, info, set, regs);</div><div class='add'>+</div><div class='add'>+	if (ret) {</div><div class='add'>+		force_sigsegv(sig, current);</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='ctx'> handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka,</div><div class='hunk'>@@ -394,9 +322,9 @@ handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka,</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/* Are we from a system call? */</div><div class='del'>-	if (current_syscall(regs) &gt;= 0) {</div><div class='add'>+	if (syscall_get_nr(current, regs) &gt;= 0) {</div><div class='ctx'> 		/* If so, check system call restarting.. */</div><div class='del'>-		switch (current_syscall_ret(regs)) {</div><div class='add'>+		switch (syscall_get_error(current, regs)) {</div><div class='ctx'> 		case -ERESTART_RESTARTBLOCK:</div><div class='ctx'> 		case -ERESTARTNOHAND:</div><div class='ctx'> 			regs-&gt;ax = -EINTR;</div><div class='hunk'>@@ -423,50 +351,48 @@ handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka,</div><div class='ctx'> 	    likely(test_and_clear_thread_flag(TIF_FORCED_TF)))</div><div class='ctx'> 		regs-&gt;flags &amp;= ~X86_EFLAGS_TF;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_IA32_EMULATION</div><div class='del'>-	if (test_thread_flag(TIF_IA32)) {</div><div class='del'>-		if (ka-&gt;sa.sa_flags &amp; SA_SIGINFO)</div><div class='del'>-			ret = ia32_setup_rt_frame(sig, ka, info, oldset, regs);</div><div class='del'>-		else</div><div class='del'>-			ret = ia32_setup_frame(sig, ka, oldset, regs);</div><div class='del'>-	} else </div><div class='del'>-#endif</div><div class='ctx'> 	ret = setup_rt_frame(sig, ka, info, oldset, regs);</div><div class='ctx'> </div><div class='del'>-	if (ret == 0) {</div><div class='del'>-		/*</div><div class='del'>-		 * This has nothing to do with segment registers,</div><div class='del'>-		 * despite the name.  This magic affects uaccess.h</div><div class='del'>-		 * macros' behavior.  Reset it to the normal setting.</div><div class='del'>-		 */</div><div class='del'>-		set_fs(USER_DS);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * Clear the direction flag as per the ABI for function entry.</div><div class='del'>-		 */</div><div class='del'>-		regs-&gt;flags &amp;= ~X86_EFLAGS_DF;</div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='add'>+	/*</div><div class='add'>+	 * This has nothing to do with segment registers,</div><div class='add'>+	 * despite the name.  This magic affects uaccess.h</div><div class='add'>+	 * macros' behavior.  Reset it to the normal setting.</div><div class='add'>+	 */</div><div class='add'>+	set_fs(USER_DS);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * Clear TF when entering the signal handler, but</div><div class='del'>-		 * notify any tracer that was single-stepping it.</div><div class='del'>-		 * The tracer may want to single-step inside the</div><div class='del'>-		 * handler too.</div><div class='del'>-		 */</div><div class='del'>-		regs-&gt;flags &amp;= ~X86_EFLAGS_TF;</div><div class='del'>-		if (test_thread_flag(TIF_SINGLESTEP))</div><div class='del'>-			ptrace_notify(SIGTRAP);</div><div class='del'>-</div><div class='del'>-		spin_lock_irq(&amp;current-&gt;sighand-&gt;siglock);</div><div class='del'>-		sigorsets(&amp;current-&gt;blocked,&amp;current-&gt;blocked,&amp;ka-&gt;sa.sa_mask);</div><div class='del'>-		if (!(ka-&gt;sa.sa_flags &amp; SA_NODEFER))</div><div class='del'>-			sigaddset(&amp;current-&gt;blocked,sig);</div><div class='del'>-		recalc_sigpending();</div><div class='del'>-		spin_unlock_irq(&amp;current-&gt;sighand-&gt;siglock);</div><div class='del'>-	}</div><div class='add'>+	/*</div><div class='add'>+	 * Clear the direction flag as per the ABI for function entry.</div><div class='add'>+	 */</div><div class='add'>+	regs-&gt;flags &amp;= ~X86_EFLAGS_DF;</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	/*</div><div class='add'>+	 * Clear TF when entering the signal handler, but</div><div class='add'>+	 * notify any tracer that was single-stepping it.</div><div class='add'>+	 * The tracer may want to single-step inside the</div><div class='add'>+	 * handler too.</div><div class='add'>+	 */</div><div class='add'>+	regs-&gt;flags &amp;= ~X86_EFLAGS_TF;</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(&amp;current-&gt;sighand-&gt;siglock);</div><div class='add'>+	sigorsets(&amp;current-&gt;blocked, &amp;current-&gt;blocked, &amp;ka-&gt;sa.sa_mask);</div><div class='add'>+	if (!(ka-&gt;sa.sa_flags &amp; SA_NODEFER))</div><div class='add'>+		sigaddset(&amp;current-&gt;blocked, sig);</div><div class='add'>+	recalc_sigpending();</div><div class='add'>+	spin_unlock_irq(&amp;current-&gt;sighand-&gt;siglock);</div><div class='add'>+</div><div class='add'>+	tracehook_signal_handler(sig, info, ka, regs,</div><div class='add'>+				 test_thread_flag(TIF_SINGLESTEP));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define NR_restart_syscall	\</div><div class='add'>+	test_thread_flag(TIF_IA32) ? __NR_ia32_restart_syscall : __NR_restart_syscall</div><div class='ctx'> /*</div><div class='ctx'>  * Note that 'init' is a special process: it doesn't get signals it doesn't</div><div class='ctx'>  * want to handle. Thus you cannot kill init even with a SIGKILL even by</div><div class='hunk'>@@ -496,7 +422,8 @@ static void do_signal(struct pt_regs *regs)</div><div class='ctx'> </div><div class='ctx'> 	signr = get_signal_to_deliver(&amp;info, &amp;ka, regs, NULL);</div><div class='ctx'> 	if (signr &gt; 0) {</div><div class='del'>-		/* Re-enable any watchpoints before delivering the</div><div class='add'>+		/*</div><div class='add'>+		 * Re-enable any watchpoints before delivering the</div><div class='ctx'> 		 * signal to user space. The processor register will</div><div class='ctx'> 		 * have been cleared if the watchpoint triggered</div><div class='ctx'> 		 * inside the kernel.</div><div class='hunk'>@@ -504,7 +431,7 @@ static void do_signal(struct pt_regs *regs)</div><div class='ctx'> 		if (current-&gt;thread.debugreg7)</div><div class='ctx'> 			set_debugreg(current-&gt;thread.debugreg7, 7);</div><div class='ctx'> </div><div class='del'>-		/* Whee!  Actually deliver the signal.  */</div><div class='add'>+		/* Whee! Actually deliver the signal.  */</div><div class='ctx'> 		if (handle_signal(signr, &amp;info, &amp;ka, oldset, regs) == 0) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * A signal was successfully delivered; the saved</div><div class='hunk'>@@ -518,19 +445,18 @@ static void do_signal(struct pt_regs *regs)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Did we come from a system call? */</div><div class='del'>-	if (current_syscall(regs) &gt;= 0) {</div><div class='add'>+	if (syscall_get_nr(current, regs) &gt;= 0) {</div><div class='ctx'> 		/* Restart the system call - no handlers present */</div><div class='del'>-		switch (current_syscall_ret(regs)) {</div><div class='add'>+		switch (syscall_get_error(current, regs)) {</div><div class='ctx'> 		case -ERESTARTNOHAND:</div><div class='ctx'> 		case -ERESTARTSYS:</div><div class='ctx'> 		case -ERESTARTNOINTR:</div><div class='ctx'> 			regs-&gt;ax = regs-&gt;orig_ax;</div><div class='ctx'> 			regs-&gt;ip -= 2;</div><div class='ctx'> 			break;</div><div class='add'>+</div><div class='ctx'> 		case -ERESTART_RESTARTBLOCK:</div><div class='del'>-			regs-&gt;ax = test_thread_flag(TIF_IA32) ?</div><div class='del'>-					__NR_ia32_restart_syscall :</div><div class='del'>-					__NR_restart_syscall;</div><div class='add'>+			regs-&gt;ax = NR_restart_syscall;</div><div class='ctx'> 			regs-&gt;ip -= 2;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -546,29 +472,45 @@ static void do_signal(struct pt_regs *regs)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void do_notify_resume(struct pt_regs *regs, void *unused,</div><div class='del'>-		      __u32 thread_info_flags)</div><div class='add'>+/*</div><div class='add'>+ * notification of userspace execution resumption</div><div class='add'>+ * - triggered by the TIF_WORK_MASK flags</div><div class='add'>+ */</div><div class='add'>+void</div><div class='add'>+do_notify_resume(struct pt_regs *regs, void *unused, __u32 thread_info_flags)</div><div class='ctx'> {</div><div class='del'>-#ifdef CONFIG_X86_MCE</div><div class='add'>+#if defined(CONFIG_X86_64) &amp;&amp; defined(CONFIG_X86_MCE)</div><div class='ctx'> 	/* notify userspace of pending MCEs */</div><div class='ctx'> 	if (thread_info_flags &amp; _TIF_MCE_NOTIFY)</div><div class='ctx'> 		mce_notify_user();</div><div class='del'>-#endif /* CONFIG_X86_MCE */</div><div class='add'>+#endif /* CONFIG_X86_64 &amp;&amp; CONFIG_X86_MCE */</div><div class='ctx'> </div><div class='ctx'> 	/* deal with pending signal delivery */</div><div class='ctx'> 	if (thread_info_flags &amp; _TIF_SIGPENDING)</div><div class='ctx'> 		do_signal(regs);</div><div class='add'>+</div><div class='add'>+	if (thread_info_flags &amp; _TIF_NOTIFY_RESUME) {</div><div class='add'>+		clear_thread_flag(TIF_NOTIFY_RESUME);</div><div class='add'>+		tracehook_notify_resume(regs);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_X86_32</div><div class='add'>+	clear_thread_flag(TIF_IRET);</div><div class='add'>+#endif /* CONFIG_X86_32 */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void signal_fault(struct pt_regs *regs, void __user *frame, char *where)</div><div class='del'>-{ </div><div class='del'>-	struct task_struct *me = current; </div><div class='add'>+{</div><div class='add'>+	struct task_struct *me = current;</div><div class='add'>+</div><div class='ctx'> 	if (show_unhandled_signals &amp;&amp; printk_ratelimit()) {</div><div class='del'>-		printk("%s[%d] bad frame in %s frame:%p ip:%lx sp:%lx orax:%lx",</div><div class='del'>-	       me-&gt;comm,me-&gt;pid,where,frame,regs-&gt;ip,regs-&gt;sp,regs-&gt;orig_ax);</div><div class='add'>+		printk(KERN_INFO</div><div class='add'>+		       "%s[%d] bad frame in %s frame:%p ip:%lx sp:%lx orax:%lx",</div><div class='add'>+		       me-&gt;comm, me-&gt;pid, where, frame,</div><div class='add'>+		       regs-&gt;ip, regs-&gt;sp, regs-&gt;orig_ax);</div><div class='ctx'> 		print_vma_addr(" in ", regs-&gt;ip);</div><div class='del'>-		printk("\n");</div><div class='add'>+		printk(KERN_CONT "\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	force_sig(SIGSEGV, me); </div><div class='del'>-} </div><div class='add'>+	force_sig(SIGSEGV, me);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/x86/kernel/smp.c b/arch/x86/kernel/smp.c<br/>index 361b7a4c640c..18f9b19f5f8f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/smp.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/smp.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/smp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/smp.c</a></div><div class='hunk'>@@ -214,12 +214,16 @@ void smp_call_function_single_interrupt(struct pt_regs *regs)</div><div class='ctx'> struct smp_ops smp_ops = {</div><div class='ctx'> 	.smp_prepare_boot_cpu = native_smp_prepare_boot_cpu,</div><div class='ctx'> 	.smp_prepare_cpus = native_smp_prepare_cpus,</div><div class='del'>-	.cpu_up = native_cpu_up,</div><div class='ctx'> 	.smp_cpus_done = native_smp_cpus_done,</div><div class='ctx'> </div><div class='ctx'> 	.smp_send_stop = native_smp_send_stop,</div><div class='ctx'> 	.smp_send_reschedule = native_smp_send_reschedule,</div><div class='ctx'> </div><div class='add'>+	.cpu_up = native_cpu_up,</div><div class='add'>+	.cpu_die = native_cpu_die,</div><div class='add'>+	.cpu_disable = native_cpu_disable,</div><div class='add'>+	.play_dead = native_play_dead,</div><div class='add'>+</div><div class='ctx'> 	.send_call_func_ipi = native_send_call_func_ipi,</div><div class='ctx'> 	.send_call_func_single_ipi = native_send_call_func_single_ipi,</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c<br/>index 7985c5b3f916..7ed9e070a6e9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/smpboot.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/smpboot.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/smpboot.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/smpboot.c</a></div><div class='hunk'>@@ -52,6 +52,7 @@</div><div class='ctx'> #include &lt;asm/desc.h&gt;</div><div class='ctx'> #include &lt;asm/nmi.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='add'>+#include &lt;asm/idle.h&gt;</div><div class='ctx'> #include &lt;asm/smp.h&gt;</div><div class='ctx'> #include &lt;asm/trampoline.h&gt;</div><div class='ctx'> #include &lt;asm/cpu.h&gt;</div><div class='hunk'>@@ -88,7 +89,7 @@ static DEFINE_PER_CPU(struct task_struct *, idle_thread_array);</div><div class='ctx'> #define get_idle_for_cpu(x)      (per_cpu(idle_thread_array, x))</div><div class='ctx'> #define set_idle_for_cpu(x, p)   (per_cpu(idle_thread_array, x) = (p))</div><div class='ctx'> #else</div><div class='del'>-struct task_struct *idle_thread_array[NR_CPUS] __cpuinitdata ;</div><div class='add'>+static struct task_struct *idle_thread_array[NR_CPUS] __cpuinitdata ;</div><div class='ctx'> #define get_idle_for_cpu(x)      (idle_thread_array[(x)])</div><div class='ctx'> #define set_idle_for_cpu(x, p)   (idle_thread_array[(x)] = (p))</div><div class='ctx'> #endif</div><div class='hunk'>@@ -123,13 +124,12 @@ EXPORT_PER_CPU_SYMBOL(cpu_info);</div><div class='ctx'> </div><div class='ctx'> static atomic_t init_deasserted;</div><div class='ctx'> </div><div class='del'>-static int boot_cpu_logical_apicid;</div><div class='ctx'> </div><div class='ctx'> /* representing cpus for which sibling maps can be computed */</div><div class='ctx'> static cpumask_t cpu_sibling_setup_map;</div><div class='ctx'> </div><div class='ctx'> /* Set if we find a B stepping CPU */</div><div class='del'>-int __cpuinitdata smp_b_stepping;</div><div class='add'>+static int __cpuinitdata smp_b_stepping;</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_NUMA) &amp;&amp; defined(CONFIG_X86_32)</div><div class='ctx'> </div><div class='hunk'>@@ -165,6 +165,8 @@ static void unmap_cpu_to_node(int cpu)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_X86_32</div><div class='add'>+static int boot_cpu_logical_apicid;</div><div class='add'>+</div><div class='ctx'> u8 cpu_2_logical_apicid[NR_CPUS] __read_mostly =</div><div class='ctx'> 					{ [0 ... NR_CPUS-1] = BAD_APICID };</div><div class='ctx'> </div><div class='hunk'>@@ -210,7 +212,7 @@ static void __cpuinit smp_callin(void)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * (This works even if the APIC is not enabled.)</div><div class='ctx'> 	 */</div><div class='del'>-	phys_id = GET_APIC_ID(read_apic_id());</div><div class='add'>+	phys_id = read_apic_id();</div><div class='ctx'> 	cpuid = smp_processor_id();</div><div class='ctx'> 	if (cpu_isset(cpuid, cpu_callin_map)) {</div><div class='ctx'> 		panic("%s: phys CPU#%d, CPU#%d already present??\n", __func__,</div><div class='hunk'>@@ -257,6 +259,7 @@ static void __cpuinit smp_callin(void)</div><div class='ctx'> 	end_local_APIC_setup();</div><div class='ctx'> 	map_cpu_to_logical_apicid();</div><div class='ctx'> </div><div class='add'>+	notify_cpu_starting(cpuid);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Get our bogomips.</div><div class='ctx'> 	 *</div><div class='hunk'>@@ -279,6 +282,8 @@ static void __cpuinit smp_callin(void)</div><div class='ctx'> 	cpu_set(cpuid, cpu_callin_map);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int __cpuinitdata unsafe_smp;</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Activate a secondary processor.</div><div class='ctx'>  */</div><div class='hunk'>@@ -331,14 +336,17 @@ static void __cpuinit start_secondary(void *unused)</div><div class='ctx'> 	 * does not change while we are assigning vectors to cpus.  Holding</div><div class='ctx'> 	 * this lock ensures we don't half assign or remove an irq from a cpu.</div><div class='ctx'> 	 */</div><div class='del'>-	ipi_call_lock_irq();</div><div class='add'>+	ipi_call_lock();</div><div class='ctx'> 	lock_vector_lock();</div><div class='ctx'> 	__setup_vector_irq(smp_processor_id());</div><div class='ctx'> 	cpu_set(smp_processor_id(), cpu_online_map);</div><div class='ctx'> 	unlock_vector_lock();</div><div class='del'>-	ipi_call_unlock_irq();</div><div class='add'>+	ipi_call_unlock();</div><div class='ctx'> 	per_cpu(cpu_state, smp_processor_id()) = CPU_ONLINE;</div><div class='ctx'> </div><div class='add'>+	/* enable local interrupts */</div><div class='add'>+	local_irq_enable();</div><div class='add'>+</div><div class='ctx'> 	setup_secondary_clock();</div><div class='ctx'> </div><div class='ctx'> 	wmb();</div><div class='hunk'>@@ -391,7 +399,7 @@ static void __cpuinit smp_apply_quirks(struct cpuinfo_x86 *c)</div><div class='ctx'> 				goto valid_k7;</div><div class='ctx'> </div><div class='ctx'> 		/* If we get here, not a certified SMP capable AMD system. */</div><div class='del'>-		add_taint(TAINT_UNSAFE_SMP);</div><div class='add'>+		unsafe_smp = 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> valid_k7:</div><div class='hunk'>@@ -408,12 +416,10 @@ static void __cpuinit smp_checks(void)</div><div class='ctx'> 	 * Don't taint if we are running SMP kernel on a single non-MP</div><div class='ctx'> 	 * approved Athlon</div><div class='ctx'> 	 */</div><div class='del'>-	if (tainted &amp; TAINT_UNSAFE_SMP) {</div><div class='del'>-		if (num_online_cpus())</div><div class='del'>-			printk(KERN_INFO "WARNING: This combination of AMD"</div><div class='del'>-				"processors is not suitable for SMP.\n");</div><div class='del'>-		else</div><div class='del'>-			tainted &amp;= ~TAINT_UNSAFE_SMP;</div><div class='add'>+	if (unsafe_smp &amp;&amp; num_online_cpus() &gt; 1) {</div><div class='add'>+		printk(KERN_INFO "WARNING: This combination of AMD"</div><div class='add'>+			"processors is not suitable for SMP.\n");</div><div class='add'>+		add_taint(TAINT_UNSAFE_SMP);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -550,8 +556,7 @@ static inline void __inquire_remote_apic(int apicid)</div><div class='ctx'> 			printk(KERN_CONT</div><div class='ctx'> 			       "a previous APIC delivery may have failed\n");</div><div class='ctx'> </div><div class='del'>-		apic_write(APIC_ICR2, SET_APIC_DEST_FIELD(apicid));</div><div class='del'>-		apic_write(APIC_ICR, APIC_DM_REMRD | regs[i]);</div><div class='add'>+		apic_icr_write(APIC_DM_REMRD | regs[i], apicid);</div><div class='ctx'> </div><div class='ctx'> 		timeout = 0;</div><div class='ctx'> 		do {</div><div class='hunk'>@@ -583,11 +588,9 @@ wakeup_secondary_cpu(int logical_apicid, unsigned long start_eip)</div><div class='ctx'> 	int maxlvt;</div><div class='ctx'> </div><div class='ctx'> 	/* Target chip */</div><div class='del'>-	apic_write(APIC_ICR2, SET_APIC_DEST_FIELD(logical_apicid));</div><div class='del'>-</div><div class='ctx'> 	/* Boot on the stack */</div><div class='ctx'> 	/* Kick the second */</div><div class='del'>-	apic_write(APIC_ICR, APIC_DM_NMI | APIC_DEST_LOGICAL);</div><div class='add'>+	apic_icr_write(APIC_DM_NMI | APIC_DEST_LOGICAL, logical_apicid);</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("Waiting for send to finish...\n");</div><div class='ctx'> 	send_status = safe_apic_wait_icr_idle();</div><div class='hunk'>@@ -596,10 +599,12 @@ wakeup_secondary_cpu(int logical_apicid, unsigned long start_eip)</div><div class='ctx'> 	 * Give the other CPU some time to accept the IPI.</div><div class='ctx'> 	 */</div><div class='ctx'> 	udelay(200);</div><div class='del'>-	maxlvt = lapic_get_maxlvt();</div><div class='del'>-	if (maxlvt &gt; 3)			/* Due to the Pentium erratum 3AP.  */</div><div class='del'>-		apic_write(APIC_ESR, 0);</div><div class='del'>-	accept_status = (apic_read(APIC_ESR) &amp; 0xEF);</div><div class='add'>+	if (APIC_INTEGRATED(apic_version[phys_apicid])) {</div><div class='add'>+		maxlvt = lapic_get_maxlvt();</div><div class='add'>+		if (maxlvt &gt; 3)			/* Due to the Pentium erratum 3AP.  */</div><div class='add'>+			apic_write(APIC_ESR, 0);</div><div class='add'>+		accept_status = (apic_read(APIC_ESR) &amp; 0xEF);</div><div class='add'>+	}</div><div class='ctx'> 	pr_debug("NMI sent.\n");</div><div class='ctx'> </div><div class='ctx'> 	if (send_status)</div><div class='hunk'>@@ -640,13 +645,11 @@ wakeup_secondary_cpu(int phys_apicid, unsigned long start_eip)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Turn INIT on target chip</div><div class='ctx'> 	 */</div><div class='del'>-	apic_write(APIC_ICR2, SET_APIC_DEST_FIELD(phys_apicid));</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Send IPI</div><div class='ctx'> 	 */</div><div class='del'>-	apic_write(APIC_ICR,</div><div class='del'>-		   APIC_INT_LEVELTRIG | APIC_INT_ASSERT | APIC_DM_INIT);</div><div class='add'>+	apic_icr_write(APIC_INT_LEVELTRIG | APIC_INT_ASSERT | APIC_DM_INIT,</div><div class='add'>+		       phys_apicid);</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("Waiting for send to finish...\n");</div><div class='ctx'> 	send_status = safe_apic_wait_icr_idle();</div><div class='hunk'>@@ -656,10 +659,8 @@ wakeup_secondary_cpu(int phys_apicid, unsigned long start_eip)</div><div class='ctx'> 	pr_debug("Deasserting INIT.\n");</div><div class='ctx'> </div><div class='ctx'> 	/* Target chip */</div><div class='del'>-	apic_write(APIC_ICR2, SET_APIC_DEST_FIELD(phys_apicid));</div><div class='del'>-</div><div class='ctx'> 	/* Send IPI */</div><div class='del'>-	apic_write(APIC_ICR, APIC_INT_LEVELTRIG | APIC_DM_INIT);</div><div class='add'>+	apic_icr_write(APIC_INT_LEVELTRIG | APIC_DM_INIT, phys_apicid);</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("Waiting for send to finish...\n");</div><div class='ctx'> 	send_status = safe_apic_wait_icr_idle();</div><div class='hunk'>@@ -702,11 +703,10 @@ wakeup_secondary_cpu(int phys_apicid, unsigned long start_eip)</div><div class='ctx'> 		 */</div><div class='ctx'> </div><div class='ctx'> 		/* Target chip */</div><div class='del'>-		apic_write(APIC_ICR2, SET_APIC_DEST_FIELD(phys_apicid));</div><div class='del'>-</div><div class='ctx'> 		/* Boot on the stack */</div><div class='ctx'> 		/* Kick the second */</div><div class='del'>-		apic_write(APIC_ICR, APIC_DM_STARTUP | (start_eip &gt;&gt; 12));</div><div class='add'>+		apic_icr_write(APIC_DM_STARTUP | (start_eip &gt;&gt; 12),</div><div class='add'>+			       phys_apicid);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Give the other CPU some time to accept the IPI.</div><div class='hunk'>@@ -1175,10 +1175,17 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus)</div><div class='ctx'> 	 * Setup boot CPU information</div><div class='ctx'> 	 */</div><div class='ctx'> 	smp_store_cpu_info(0); /* Final full version of the data */</div><div class='add'>+#ifdef CONFIG_X86_32</div><div class='ctx'> 	boot_cpu_logical_apicid = logical_smp_processor_id();</div><div class='add'>+#endif</div><div class='ctx'> 	current_thread_info()-&gt;cpu = 0;  /* needed? */</div><div class='ctx'> 	set_cpu_sibling_map(0);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='add'>+	enable_IR_x2apic();</div><div class='add'>+	setup_apic_routing();</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	if (smp_sanity_check(max_cpus) &lt; 0) {</div><div class='ctx'> 		printk(KERN_INFO "SMP disabled\n");</div><div class='ctx'> 		disable_smp();</div><div class='hunk'>@@ -1186,9 +1193,9 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	preempt_disable();</div><div class='del'>-	if (GET_APIC_ID(read_apic_id()) != boot_cpu_physical_apicid) {</div><div class='add'>+	if (read_apic_id() != boot_cpu_physical_apicid) {</div><div class='ctx'> 		panic("Boot APIC ID in local APIC unexpected (%d vs %d)",</div><div class='del'>-		     GET_APIC_ID(read_apic_id()), boot_cpu_physical_apicid);</div><div class='add'>+		     read_apic_id(), boot_cpu_physical_apicid);</div><div class='ctx'> 		/* Or can we switch back to PIC here? */</div><div class='ctx'> 	}</div><div class='ctx'> 	preempt_enable();</div><div class='hunk'>@@ -1254,39 +1261,6 @@ void __init native_smp_cpus_done(unsigned int max_cpus)</div><div class='ctx'> 	check_nmi_watchdog();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_HOTPLUG_CPU</div><div class='del'>-</div><div class='del'>-static void remove_siblinginfo(int cpu)</div><div class='del'>-{</div><div class='del'>-	int sibling;</div><div class='del'>-	struct cpuinfo_x86 *c = &amp;cpu_data(cpu);</div><div class='del'>-</div><div class='del'>-	for_each_cpu_mask_nr(sibling, per_cpu(cpu_core_map, cpu)) {</div><div class='del'>-		cpu_clear(cpu, per_cpu(cpu_core_map, sibling));</div><div class='del'>-		/*/</div><div class='del'>-		 * last thread sibling in this cpu core going down</div><div class='del'>-		 */</div><div class='del'>-		if (cpus_weight(per_cpu(cpu_sibling_map, cpu)) == 1)</div><div class='del'>-			cpu_data(sibling).booted_cores--;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for_each_cpu_mask_nr(sibling, per_cpu(cpu_sibling_map, cpu))</div><div class='del'>-		cpu_clear(cpu, per_cpu(cpu_sibling_map, sibling));</div><div class='del'>-	cpus_clear(per_cpu(cpu_sibling_map, cpu));</div><div class='del'>-	cpus_clear(per_cpu(cpu_core_map, cpu));</div><div class='del'>-	c-&gt;phys_proc_id = 0;</div><div class='del'>-	c-&gt;cpu_core_id = 0;</div><div class='del'>-	cpu_clear(cpu, cpu_sibling_setup_map);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int additional_cpus __initdata = -1;</div><div class='del'>-</div><div class='del'>-static __init int setup_additional_cpus(char *s)</div><div class='del'>-{</div><div class='del'>-	return s &amp;&amp; get_option(&amp;s, &amp;additional_cpus) ? 0 : -EINVAL;</div><div class='del'>-}</div><div class='del'>-early_param("additional_cpus", setup_additional_cpus);</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * cpu_possible_map should be static, it cannot change as cpu's</div><div class='ctx'>  * are onlined, or offlined. The reason is per-cpu data-structures</div><div class='hunk'>@@ -1306,24 +1280,13 @@ early_param("additional_cpus", setup_additional_cpus);</div><div class='ctx'>  */</div><div class='ctx'> __init void prefill_possible_map(void)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='del'>-	int possible;</div><div class='add'>+	int i, possible;</div><div class='ctx'> </div><div class='ctx'> 	/* no processor from mptable or madt */</div><div class='ctx'> 	if (!num_processors)</div><div class='ctx'> 		num_processors = 1;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_HOTPLUG_CPU</div><div class='del'>-	if (additional_cpus == -1) {</div><div class='del'>-		if (disabled_cpus &gt; 0)</div><div class='del'>-			additional_cpus = disabled_cpus;</div><div class='del'>-		else</div><div class='del'>-			additional_cpus = 0;</div><div class='del'>-	}</div><div class='del'>-#else</div><div class='del'>-	additional_cpus = 0;</div><div class='del'>-#endif</div><div class='del'>-	possible = num_processors + additional_cpus;</div><div class='add'>+	possible = num_processors + disabled_cpus;</div><div class='ctx'> 	if (possible &gt; NR_CPUS)</div><div class='ctx'> 		possible = NR_CPUS;</div><div class='ctx'> </div><div class='hunk'>@@ -1336,6 +1299,31 @@ __init void prefill_possible_map(void)</div><div class='ctx'> 	nr_cpu_ids = possible;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_HOTPLUG_CPU</div><div class='add'>+</div><div class='add'>+static void remove_siblinginfo(int cpu)</div><div class='add'>+{</div><div class='add'>+	int sibling;</div><div class='add'>+	struct cpuinfo_x86 *c = &amp;cpu_data(cpu);</div><div class='add'>+</div><div class='add'>+	for_each_cpu_mask_nr(sibling, per_cpu(cpu_core_map, cpu)) {</div><div class='add'>+		cpu_clear(cpu, per_cpu(cpu_core_map, sibling));</div><div class='add'>+		/*/</div><div class='add'>+		 * last thread sibling in this cpu core going down</div><div class='add'>+		 */</div><div class='add'>+		if (cpus_weight(per_cpu(cpu_sibling_map, cpu)) == 1)</div><div class='add'>+			cpu_data(sibling).booted_cores--;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for_each_cpu_mask_nr(sibling, per_cpu(cpu_sibling_map, cpu))</div><div class='add'>+		cpu_clear(cpu, per_cpu(cpu_sibling_map, sibling));</div><div class='add'>+	cpus_clear(per_cpu(cpu_sibling_map, cpu));</div><div class='add'>+	cpus_clear(per_cpu(cpu_core_map, cpu));</div><div class='add'>+	c-&gt;phys_proc_id = 0;</div><div class='add'>+	c-&gt;cpu_core_id = 0;</div><div class='add'>+	cpu_clear(cpu, cpu_sibling_setup_map);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void __ref remove_cpu_from_maps(int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	cpu_clear(cpu, cpu_online_map);</div><div class='hunk'>@@ -1346,25 +1334,9 @@ static void __ref remove_cpu_from_maps(int cpu)</div><div class='ctx'> 	numa_remove_cpu(cpu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __cpu_disable(void)</div><div class='add'>+void cpu_disable_common(void)</div><div class='ctx'> {</div><div class='ctx'> 	int cpu = smp_processor_id();</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Perhaps use cpufreq to drop frequency, but that could go</div><div class='del'>-	 * into generic code.</div><div class='del'>-	 *</div><div class='del'>-	 * We won't take down the boot processor on i386 due to some</div><div class='del'>-	 * interrupts only being able to be serviced by the BSP.</div><div class='del'>-	 * Especially so if we're not using an IOAPIC	-zwane</div><div class='del'>-	 */</div><div class='del'>-	if (cpu == 0)</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='del'>-	if (nmi_watchdog == NMI_LOCAL_APIC)</div><div class='del'>-		stop_apic_nmi_watchdog(NULL);</div><div class='del'>-	clear_local_APIC();</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * HACK:</div><div class='ctx'> 	 * Allow any queued timer interrupts to get serviced</div><div class='hunk'>@@ -1382,10 +1354,32 @@ int __cpu_disable(void)</div><div class='ctx'> 	remove_cpu_from_maps(cpu);</div><div class='ctx'> 	unlock_vector_lock();</div><div class='ctx'> 	fixup_irqs(cpu_online_map);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int native_cpu_disable(void)</div><div class='add'>+{</div><div class='add'>+	int cpu = smp_processor_id();</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Perhaps use cpufreq to drop frequency, but that could go</div><div class='add'>+	 * into generic code.</div><div class='add'>+	 *</div><div class='add'>+	 * We won't take down the boot processor on i386 due to some</div><div class='add'>+	 * interrupts only being able to be serviced by the BSP.</div><div class='add'>+	 * Especially so if we're not using an IOAPIC	-zwane</div><div class='add'>+	 */</div><div class='add'>+	if (cpu == 0)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	if (nmi_watchdog == NMI_LOCAL_APIC)</div><div class='add'>+		stop_apic_nmi_watchdog(NULL);</div><div class='add'>+	clear_local_APIC();</div><div class='add'>+</div><div class='add'>+	cpu_disable_common();</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __cpu_die(unsigned int cpu)</div><div class='add'>+void native_cpu_die(unsigned int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	/* We don't do anything here: idle task is faking death itself. */</div><div class='ctx'> 	unsigned int i;</div><div class='hunk'>@@ -1402,15 +1396,45 @@ void __cpu_die(unsigned int cpu)</div><div class='ctx'> 	}</div><div class='ctx'> 	printk(KERN_ERR "CPU %u didn't die...\n", cpu);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+void play_dead_common(void)</div><div class='add'>+{</div><div class='add'>+	idle_task_exit();</div><div class='add'>+	reset_lazy_tlbstate();</div><div class='add'>+	irq_ctx_exit(raw_smp_processor_id());</div><div class='add'>+	c1e_remove_cpu(raw_smp_processor_id());</div><div class='add'>+</div><div class='add'>+	mb();</div><div class='add'>+	/* Ack it */</div><div class='add'>+	__get_cpu_var(cpu_state) = CPU_DEAD;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * With physical CPU hotplug, we should halt the cpu</div><div class='add'>+	 */</div><div class='add'>+	local_irq_disable();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void native_play_dead(void)</div><div class='add'>+{</div><div class='add'>+	play_dead_common();</div><div class='add'>+	wbinvd_halt();</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #else /* ... !CONFIG_HOTPLUG_CPU */</div><div class='del'>-int __cpu_disable(void)</div><div class='add'>+int native_cpu_disable(void)</div><div class='ctx'> {</div><div class='ctx'> 	return -ENOSYS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __cpu_die(unsigned int cpu)</div><div class='add'>+void native_cpu_die(unsigned int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	/* We said "no" in __cpu_disable */</div><div class='ctx'> 	BUG();</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+void native_play_dead(void)</div><div class='add'>+{</div><div class='add'>+	BUG();</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/x86/kernel/summit_32.c b/arch/x86/kernel/summit_32.c<br/>index d67ce5f044ba..7b987852e876 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/summit_32.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/summit_32.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/summit_32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/summit_32.c</a></div><div class='hunk'>@@ -30,7 +30,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/bios_ebda.h&gt;</div><div class='del'>-#include &lt;asm/mach-summit/mach_mpparse.h&gt;</div><div class='add'>+#include &lt;asm/summit/mpparse.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct rio_table_hdr *rio_table_hdr __initdata;</div><div class='ctx'> static struct scal_detail   *scal_devs[MAX_NUMNODES] __initdata;</div><div class='head'>diff --git a/arch/x86/kernel/sys_i386_32.c b/arch/x86/kernel/sys_i386_32.c<br/>index 7066cb855a60..1884a8d12bfa 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/sys_i386_32.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/sys_i386_32.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/sys_i386_32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/sys_i386_32.c</a></div><div class='hunk'>@@ -22,6 +22,8 @@</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/unistd.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/syscalls.h&gt;</div><div class='add'>+</div><div class='ctx'> asmlinkage long sys_mmap2(unsigned long addr, unsigned long len,</div><div class='ctx'> 			  unsigned long prot, unsigned long flags,</div><div class='ctx'> 			  unsigned long fd, unsigned long pgoff)</div><div class='head'>diff --git a/arch/x86/kernel/sys_x86_64.c b/arch/x86/kernel/sys_x86_64.c<br/>index 3b360ef33817..6bc211accf08 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/sys_x86_64.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/sys_x86_64.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/sys_x86_64.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/sys_x86_64.c</a></div><div class='hunk'>@@ -13,15 +13,17 @@</div><div class='ctx'> #include &lt;linux/utsname.h&gt;</div><div class='ctx'> #include &lt;linux/personality.h&gt;</div><div class='ctx'> #include &lt;linux/random.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/ia32.h&gt;</div><div class='add'>+#include &lt;asm/syscalls.h&gt;</div><div class='ctx'> </div><div class='del'>-asmlinkage long sys_mmap(unsigned long addr, unsigned long len, unsigned long prot, unsigned long flags,</div><div class='del'>-	unsigned long fd, unsigned long off)</div><div class='add'>+asmlinkage long sys_mmap(unsigned long addr, unsigned long len,</div><div class='add'>+		unsigned long prot, unsigned long flags,</div><div class='add'>+		unsigned long fd, unsigned long off)</div><div class='ctx'> {</div><div class='ctx'> 	long error;</div><div class='del'>-	struct file * file;</div><div class='add'>+	struct file *file;</div><div class='ctx'> </div><div class='ctx'> 	error = -EINVAL;</div><div class='ctx'> 	if (off &amp; ~PAGE_MASK)</div><div class='hunk'>@@ -56,9 +58,9 @@ static void find_start_end(unsigned long flags, unsigned long *begin,</div><div class='ctx'> 		   unmapped base down for this case. This can give</div><div class='ctx'> 		   conflicts with the heap, but we assume that glibc</div><div class='ctx'> 		   malloc knows how to fall back to mmap. Give it 1GB</div><div class='del'>-		   of playground for now. -AK */ </div><div class='del'>-		*begin = 0x40000000; </div><div class='del'>-		*end = 0x80000000;		</div><div class='add'>+		   of playground for now. -AK */</div><div class='add'>+		*begin = 0x40000000;</div><div class='add'>+		*end = 0x80000000;</div><div class='ctx'> 		if (current-&gt;flags &amp; PF_RANDOMIZE) {</div><div class='ctx'> 			new_begin = randomize_range(*begin, *begin + 0x02000000, 0);</div><div class='ctx'> 			if (new_begin)</div><div class='hunk'>@@ -66,9 +68,9 @@ static void find_start_end(unsigned long flags, unsigned long *begin,</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		*begin = TASK_UNMAPPED_BASE;</div><div class='del'>-		*end = TASK_SIZE; </div><div class='add'>+		*end = TASK_SIZE;</div><div class='ctx'> 	}</div><div class='del'>-} </div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> unsigned long</div><div class='ctx'> arch_get_unmapped_area(struct file *filp, unsigned long addr,</div><div class='hunk'>@@ -78,11 +80,11 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,</div><div class='ctx'> 	struct vm_area_struct *vma;</div><div class='ctx'> 	unsigned long start_addr;</div><div class='ctx'> 	unsigned long begin, end;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	if (flags &amp; MAP_FIXED)</div><div class='ctx'> 		return addr;</div><div class='ctx'> </div><div class='del'>-	find_start_end(flags, &amp;begin, &amp;end); </div><div class='add'>+	find_start_end(flags, &amp;begin, &amp;end);</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt; end)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -96,12 +98,12 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,</div><div class='ctx'> 	}</div><div class='ctx'> 	if (((flags &amp; MAP_32BIT) || test_thread_flag(TIF_IA32))</div><div class='ctx'> 	    &amp;&amp; len &lt;= mm-&gt;cached_hole_size) {</div><div class='del'>-	        mm-&gt;cached_hole_size = 0;</div><div class='add'>+		mm-&gt;cached_hole_size = 0;</div><div class='ctx'> 		mm-&gt;free_area_cache = begin;</div><div class='ctx'> 	}</div><div class='ctx'> 	addr = mm-&gt;free_area_cache;</div><div class='del'>-	if (addr &lt; begin) </div><div class='del'>-		addr = begin; </div><div class='add'>+	if (addr &lt; begin)</div><div class='add'>+		addr = begin;</div><div class='ctx'> 	start_addr = addr;</div><div class='ctx'> </div><div class='ctx'> full_search:</div><div class='hunk'>@@ -127,7 +129,7 @@ full_search:</div><div class='ctx'> 			return addr;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (addr + mm-&gt;cached_hole_size &lt; vma-&gt;vm_start)</div><div class='del'>-		        mm-&gt;cached_hole_size = vma-&gt;vm_start - addr;</div><div class='add'>+			mm-&gt;cached_hole_size = vma-&gt;vm_start - addr;</div><div class='ctx'> </div><div class='ctx'> 		addr = vma-&gt;vm_end;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -177,7 +179,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,</div><div class='ctx'> 		vma = find_vma(mm, addr-len);</div><div class='ctx'> 		if (!vma || addr &lt;= vma-&gt;vm_start)</div><div class='ctx'> 			/* remember the address as a hint for next time */</div><div class='del'>-			return (mm-&gt;free_area_cache = addr-len);</div><div class='add'>+			return mm-&gt;free_area_cache = addr-len;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (mm-&gt;mmap_base &lt; len)</div><div class='hunk'>@@ -194,7 +196,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,</div><div class='ctx'> 		vma = find_vma(mm, addr);</div><div class='ctx'> 		if (!vma || addr+len &lt;= vma-&gt;vm_start)</div><div class='ctx'> 			/* remember the address as a hint for next time */</div><div class='del'>-			return (mm-&gt;free_area_cache = addr);</div><div class='add'>+			return mm-&gt;free_area_cache = addr;</div><div class='ctx'> </div><div class='ctx'> 		/* remember the largest hole we saw so far */</div><div class='ctx'> 		if (addr + mm-&gt;cached_hole_size &lt; vma-&gt;vm_start)</div><div class='hunk'>@@ -224,13 +226,13 @@ bottomup:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-asmlinkage long sys_uname(struct new_utsname __user * name)</div><div class='add'>+asmlinkage long sys_uname(struct new_utsname __user *name)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	down_read(&amp;uts_sem);</div><div class='del'>-	err = copy_to_user(name, utsname(), sizeof (*name));</div><div class='add'>+	err = copy_to_user(name, utsname(), sizeof(*name));</div><div class='ctx'> 	up_read(&amp;uts_sem);</div><div class='del'>-	if (personality(current-&gt;personality) == PER_LINUX32) </div><div class='del'>-		err |= copy_to_user(&amp;name-&gt;machine, "i686", 5); 		</div><div class='add'>+	if (personality(current-&gt;personality) == PER_LINUX32)</div><div class='add'>+		err |= copy_to_user(&amp;name-&gt;machine, "i686", 5);</div><div class='ctx'> 	return err ? -EFAULT : 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/x86/kernel/syscall_64.c b/arch/x86/kernel/syscall_64.c<br/>index 170d43c17487..3d1be4f0fac5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/syscall_64.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/syscall_64.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/syscall_64.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/syscall_64.c</a></div><div class='hunk'>@@ -8,12 +8,12 @@</div><div class='ctx'> #define __NO_STUBS</div><div class='ctx'> </div><div class='ctx'> #define __SYSCALL(nr, sym) extern asmlinkage void sym(void) ;</div><div class='del'>-#undef _ASM_X86_64_UNISTD_H_</div><div class='add'>+#undef ASM_X86__UNISTD_64_H</div><div class='ctx'> #include &lt;asm/unistd_64.h&gt;</div><div class='ctx'> </div><div class='ctx'> #undef __SYSCALL</div><div class='ctx'> #define __SYSCALL(nr, sym) [nr] = sym,</div><div class='del'>-#undef _ASM_X86_64_UNISTD_H_</div><div class='add'>+#undef ASM_X86__UNISTD_64_H</div><div class='ctx'> </div><div class='ctx'> typedef void (*sys_call_ptr_t)(void);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kernel/time_32.c b/arch/x86/kernel/time_32.c<br/>index ffe3c664afc0..77b400f06ea2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/time_32.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/time_32.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/time_32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/time_32.c</a></div><div class='hunk'>@@ -36,6 +36,7 @@</div><div class='ctx'> #include &lt;asm/arch_hooks.h&gt;</div><div class='ctx'> #include &lt;asm/hpet.h&gt;</div><div class='ctx'> #include &lt;asm/time.h&gt;</div><div class='add'>+#include &lt;asm/timer.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "do_timer.h"</div><div class='ctx'> </div><div class='hunk'>@@ -46,10 +47,9 @@ unsigned long profile_pc(struct pt_regs *regs)</div><div class='ctx'> 	unsigned long pc = instruction_pointer(regs);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='del'>-	if (!v8086_mode(regs) &amp;&amp; SEGMENT_IS_KERNEL_CODE(regs-&gt;cs) &amp;&amp;</div><div class='del'>-	    in_lock_functions(pc)) {</div><div class='add'>+	if (!user_mode_vm(regs) &amp;&amp; in_lock_functions(pc)) {</div><div class='ctx'> #ifdef CONFIG_FRAME_POINTER</div><div class='del'>-		return *(unsigned long *)(regs-&gt;bp + 4);</div><div class='add'>+		return *(unsigned long *)(regs-&gt;bp + sizeof(long));</div><div class='ctx'> #else</div><div class='ctx'> 		unsigned long *sp = (unsigned long *)&amp;regs-&gt;sp;</div><div class='ctx'> </div><div class='hunk'>@@ -94,6 +94,7 @@ irqreturn_t timer_interrupt(int irq, void *dev_id)</div><div class='ctx'> </div><div class='ctx'> 	do_timer_interrupt_hook();</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_MCA</div><div class='ctx'> 	if (MCA_bus) {</div><div class='ctx'> 		/* The PS/2 uses level-triggered interrupts.  You can't</div><div class='ctx'> 		turn them off, nor would you want to (any attempt to</div><div class='hunk'>@@ -107,6 +108,7 @@ irqreturn_t timer_interrupt(int irq, void *dev_id)</div><div class='ctx'> 		u8 irq_v = inb_p( 0x61 );	/* read the current state */</div><div class='ctx'> 		outb_p( irq_v|0x80, 0x61 );	/* reset the IRQ */</div><div class='ctx'> 	}</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/x86/kernel/time_64.c b/arch/x86/kernel/time_64.c<br/>index e3d49c553af2..cb19d650c216 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/time_64.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/time_64.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/time_64.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/time_64.c</a></div><div class='hunk'>@@ -16,6 +16,7 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='add'>+#include &lt;linux/mca.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/i8253.h&gt;</div><div class='ctx'> #include &lt;asm/hpet.h&gt;</div><div class='hunk'>@@ -33,23 +34,34 @@ unsigned long profile_pc(struct pt_regs *regs)</div><div class='ctx'> 	/* Assume the lock function has either no stack frame or a copy</div><div class='ctx'> 	   of flags from PUSHF</div><div class='ctx'> 	   Eflags always has bits 22 and up cleared unlike kernel addresses. */</div><div class='del'>-	if (!user_mode(regs) &amp;&amp; in_lock_functions(pc)) {</div><div class='add'>+	if (!user_mode_vm(regs) &amp;&amp; in_lock_functions(pc)) {</div><div class='add'>+#ifdef CONFIG_FRAME_POINTER</div><div class='add'>+		return *(unsigned long *)(regs-&gt;bp + sizeof(long));</div><div class='add'>+#else</div><div class='ctx'> 		unsigned long *sp = (unsigned long *)regs-&gt;sp;</div><div class='ctx'> 		if (sp[0] &gt;&gt; 22)</div><div class='ctx'> 			return sp[0];</div><div class='ctx'> 		if (sp[1] &gt;&gt; 22)</div><div class='ctx'> 			return sp[1];</div><div class='add'>+#endif</div><div class='ctx'> 	}</div><div class='ctx'> 	return pc;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(profile_pc);</div><div class='ctx'> </div><div class='del'>-static irqreturn_t timer_event_interrupt(int irq, void *dev_id)</div><div class='add'>+irqreturn_t timer_interrupt(int irq, void *dev_id)</div><div class='ctx'> {</div><div class='ctx'> 	add_pda(irq0_irqs, 1);</div><div class='ctx'> </div><div class='ctx'> 	global_clock_event-&gt;event_handler(global_clock_event);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_MCA</div><div class='add'>+	if (MCA_bus) {</div><div class='add'>+		u8 irq_v = inb_p(0x61);       /* read the current state */</div><div class='add'>+		outb_p(irq_v|0x80, 0x61);     /* reset the IRQ */</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -100,7 +112,7 @@ unsigned long __init calibrate_cpu(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct irqaction irq0 = {</div><div class='del'>-	.handler	= timer_event_interrupt,</div><div class='add'>+	.handler	= timer_interrupt,</div><div class='ctx'> 	.flags		= IRQF_DISABLED | IRQF_IRQPOLL | IRQF_NOBALANCING,</div><div class='ctx'> 	.mask		= CPU_MASK_NONE,</div><div class='ctx'> 	.name		= "timer"</div><div class='hunk'>@@ -111,16 +123,13 @@ void __init hpet_time_init(void)</div><div class='ctx'> 	if (!hpet_enable())</div><div class='ctx'> 		setup_pit_timer();</div><div class='ctx'> </div><div class='add'>+	irq0.mask = cpumask_of_cpu(0);</div><div class='ctx'> 	setup_irq(0, &amp;irq0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __init time_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	tsc_init();</div><div class='del'>-	if (cpu_has(&amp;boot_cpu_data, X86_FEATURE_RDTSCP))</div><div class='del'>-		vgetcpu_mode = VGETCPU_RDTSCP;</div><div class='del'>-	else</div><div class='del'>-		vgetcpu_mode = VGETCPU_LSL;</div><div class='ctx'> </div><div class='ctx'> 	late_time_init = choose_time_init();</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/x86/kernel/tlb_32.c b/arch/x86/kernel/tlb_32.c<br/>index fec1ecedc9b7..e00534b33534 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/tlb_32.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/tlb_32.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/tlb_32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/tlb_32.c</a></div><div class='hunk'>@@ -241,3 +241,11 @@ void flush_tlb_all(void)</div><div class='ctx'> 	on_each_cpu(do_flush_tlb_all, NULL, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void reset_lazy_tlbstate(void)</div><div class='add'>+{</div><div class='add'>+	int cpu = raw_smp_processor_id();</div><div class='add'>+</div><div class='add'>+	per_cpu(cpu_tlbstate, cpu).state = 0;</div><div class='add'>+	per_cpu(cpu_tlbstate, cpu).active_mm = &amp;init_mm;</div><div class='add'>+}</div><div class='add'>+</div><div class='head'>diff --git a/arch/x86/kernel/tls.c b/arch/x86/kernel/tls.c<br/>index ab6bf375a307..6bb7b8579e70 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/tls.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/tls.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/tls.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/tls.c</a></div><div class='hunk'>@@ -10,6 +10,7 @@</div><div class='ctx'> #include &lt;asm/ldt.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/proto.h&gt;</div><div class='add'>+#include &lt;asm/syscalls.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "tls.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kernel/traps_32.c b/arch/x86/kernel/traps.c<br/>index 03df8e45e5a1..e062974cce34 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/traps_32.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/traps_32.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/traps.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/traps.c</a></div><div class='hunk'>@@ -7,13 +7,11 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * 'Traps.c' handles hardware traps and faults after we have saved some</div><div class='del'>- * state in 'asm.s'.</div><div class='add'>+ * Handle hardware traps and faults.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/kallsyms.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;linux/highmem.h&gt;</div><div class='ctx'> #include &lt;linux/kprobes.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/utsname.h&gt;</div><div class='hunk'>@@ -32,6 +30,8 @@</div><div class='ctx'> #include &lt;linux/bug.h&gt;</div><div class='ctx'> #include &lt;linux/nmi.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/smp.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_EISA</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='hunk'>@@ -46,21 +46,31 @@</div><div class='ctx'> #include &lt;linux/edac.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch_hooks.h&gt;</div><div class='ctx'> #include &lt;asm/stacktrace.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/debugreg.h&gt;</div><div class='ctx'> #include &lt;asm/atomic.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/unwind.h&gt;</div><div class='add'>+#include &lt;asm/traps.h&gt;</div><div class='ctx'> #include &lt;asm/desc.h&gt;</div><div class='ctx'> #include &lt;asm/i387.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;mach_traps.h&gt;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='add'>+#include &lt;asm/pgalloc.h&gt;</div><div class='add'>+#include &lt;asm/proto.h&gt;</div><div class='add'>+#include &lt;asm/pda.h&gt;</div><div class='add'>+#else</div><div class='add'>+#include &lt;asm/processor-flags.h&gt;</div><div class='add'>+#include &lt;asm/arch_hooks.h&gt;</div><div class='ctx'> #include &lt;asm/nmi.h&gt;</div><div class='ctx'> #include &lt;asm/smp.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/traps.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "mach_traps.h"</div><div class='add'>+#include "cpu/mcheck/mce.h"</div><div class='ctx'> </div><div class='ctx'> DECLARE_BITMAP(used_vectors, NR_VECTORS);</div><div class='ctx'> EXPORT_SYMBOL_GPL(used_vectors);</div><div class='hunk'>@@ -77,418 +87,104 @@ char ignore_fpu_irq;</div><div class='ctx'>  */</div><div class='ctx'> gate_desc idt_table[256]</div><div class='ctx'> 	__attribute__((__section__(".data.idt"))) = { { { { 0, 0 } } }, };</div><div class='del'>-</div><div class='del'>-int panic_on_unrecovered_nmi;</div><div class='del'>-int kstack_depth_to_print = 24;</div><div class='del'>-static unsigned int code_bytes = 64;</div><div class='del'>-static int ignore_nmis;</div><div class='del'>-static int die_counter;</div><div class='del'>-</div><div class='del'>-void printk_address(unsigned long address, int reliable)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_KALLSYMS</div><div class='del'>-	unsigned long offset = 0;</div><div class='del'>-	unsigned long symsize;</div><div class='del'>-	const char *symname;</div><div class='del'>-	char *modname;</div><div class='del'>-	char *delim = ":";</div><div class='del'>-	char namebuf[KSYM_NAME_LEN];</div><div class='del'>-	char reliab[4] = "";</div><div class='del'>-</div><div class='del'>-	symname = kallsyms_lookup(address, &amp;symsize, &amp;offset,</div><div class='del'>-					&amp;modname, namebuf);</div><div class='del'>-	if (!symname) {</div><div class='del'>-		printk(" [&lt;%08lx&gt;]\n", address);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	if (!reliable)</div><div class='del'>-		strcpy(reliab, "? ");</div><div class='del'>-</div><div class='del'>-	if (!modname)</div><div class='del'>-		modname = delim = "";</div><div class='del'>-	printk(" [&lt;%08lx&gt;] %s%s%s%s%s+0x%lx/0x%lx\n",</div><div class='del'>-		address, reliab, delim, modname, delim, symname, offset, symsize);</div><div class='del'>-#else</div><div class='del'>-	printk(" [&lt;%08lx&gt;]\n", address);</div><div class='ctx'> #endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int valid_stack_ptr(struct thread_info *tinfo,</div><div class='del'>-			void *p, unsigned int size)</div><div class='del'>-{</div><div class='del'>-	void *t = tinfo;</div><div class='del'>-	return	p &gt; t &amp;&amp; p &lt;= t + THREAD_SIZE - size;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* The form of the top of the frame on the stack */</div><div class='del'>-struct stack_frame {</div><div class='del'>-	struct stack_frame *next_frame;</div><div class='del'>-	unsigned long return_address;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline unsigned long</div><div class='del'>-print_context_stack(struct thread_info *tinfo,</div><div class='del'>-		unsigned long *stack, unsigned long bp,</div><div class='del'>-		const struct stacktrace_ops *ops, void *data)</div><div class='del'>-{</div><div class='del'>-	struct stack_frame *frame = (struct stack_frame *)bp;</div><div class='del'>-</div><div class='del'>-	while (valid_stack_ptr(tinfo, stack, sizeof(*stack))) {</div><div class='del'>-		unsigned long addr;</div><div class='del'>-</div><div class='del'>-		addr = *stack;</div><div class='del'>-		if (__kernel_text_address(addr)) {</div><div class='del'>-			if ((unsigned long) stack == bp + 4) {</div><div class='del'>-				ops-&gt;address(data, addr, 1);</div><div class='del'>-				frame = frame-&gt;next_frame;</div><div class='del'>-				bp = (unsigned long) frame;</div><div class='del'>-			} else {</div><div class='del'>-				ops-&gt;address(data, addr, bp == 0);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		stack++;</div><div class='del'>-	}</div><div class='del'>-	return bp;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void dump_trace(struct task_struct *task, struct pt_regs *regs,</div><div class='del'>-		unsigned long *stack, unsigned long bp,</div><div class='del'>-		const struct stacktrace_ops *ops, void *data)</div><div class='del'>-{</div><div class='del'>-	if (!task)</div><div class='del'>-		task = current;</div><div class='del'>-</div><div class='del'>-	if (!stack) {</div><div class='del'>-		unsigned long dummy;</div><div class='del'>-		stack = &amp;dummy;</div><div class='del'>-		if (task != current)</div><div class='del'>-			stack = (unsigned long *)task-&gt;thread.sp;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_FRAME_POINTER</div><div class='del'>-	if (!bp) {</div><div class='del'>-		if (task == current) {</div><div class='del'>-			/* Grab bp right from our regs */</div><div class='del'>-			asm("movl %%ebp, %0" : "=r" (bp) :);</div><div class='del'>-		} else {</div><div class='del'>-			/* bp is the last reg pushed by switch_to */</div><div class='del'>-			bp = *(unsigned long *) task-&gt;thread.sp;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	for (;;) {</div><div class='del'>-		struct thread_info *context;</div><div class='del'>-</div><div class='del'>-		context = (struct thread_info *)</div><div class='del'>-			((unsigned long)stack &amp; (~(THREAD_SIZE - 1)));</div><div class='del'>-		bp = print_context_stack(context, stack, bp, ops, data);</div><div class='del'>-		/*</div><div class='del'>-		 * Should be after the line below, but somewhere</div><div class='del'>-		 * in early boot context comes out corrupted and we</div><div class='del'>-		 * can't reference it:</div><div class='del'>-		 */</div><div class='del'>-		if (ops-&gt;stack(data, "IRQ") &lt; 0)</div><div class='del'>-			break;</div><div class='del'>-		stack = (unsigned long *)context-&gt;previous_esp;</div><div class='del'>-		if (!stack)</div><div class='del'>-			break;</div><div class='del'>-		touch_nmi_watchdog();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(dump_trace);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-print_trace_warning_symbol(void *data, char *msg, unsigned long symbol)</div><div class='del'>-{</div><div class='del'>-	printk(data);</div><div class='del'>-	print_symbol(msg, symbol);</div><div class='del'>-	printk("\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void print_trace_warning(void *data, char *msg)</div><div class='del'>-{</div><div class='del'>-	printk("%s%s\n", (char *)data, msg);</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-static int print_trace_stack(void *data, char *name)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Print one address/symbol entries per line.</div><div class='del'>- */</div><div class='del'>-static void print_trace_address(void *data, unsigned long addr, int reliable)</div><div class='del'>-{</div><div class='del'>-	printk("%s [&lt;%08lx&gt;] ", (char *)data, addr);</div><div class='del'>-	if (!reliable)</div><div class='del'>-		printk("? ");</div><div class='del'>-	print_symbol("%s\n", addr);</div><div class='del'>-	touch_nmi_watchdog();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct stacktrace_ops print_trace_ops = {</div><div class='del'>-	.warning = print_trace_warning,</div><div class='del'>-	.warning_symbol = print_trace_warning_symbol,</div><div class='del'>-	.stack = print_trace_stack,</div><div class='del'>-	.address = print_trace_address,</div><div class='del'>-};</div><div class='add'>+static int ignore_nmis;</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-show_trace_log_lvl(struct task_struct *task, struct pt_regs *regs,</div><div class='del'>-		unsigned long *stack, unsigned long bp, char *log_lvl)</div><div class='add'>+static inline void conditional_sti(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='del'>-	dump_trace(task, regs, stack, bp, &amp;print_trace_ops, log_lvl);</div><div class='del'>-	printk("%s =======================\n", log_lvl);</div><div class='add'>+	if (regs-&gt;flags &amp; X86_EFLAGS_IF)</div><div class='add'>+		local_irq_enable();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void show_trace(struct task_struct *task, struct pt_regs *regs,</div><div class='del'>-		unsigned long *stack, unsigned long bp)</div><div class='add'>+static inline void preempt_conditional_sti(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='del'>-	show_trace_log_lvl(task, regs, stack, bp, "");</div><div class='add'>+	inc_preempt_count();</div><div class='add'>+	if (regs-&gt;flags &amp; X86_EFLAGS_IF)</div><div class='add'>+		local_irq_enable();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs,</div><div class='del'>-		   unsigned long *sp, unsigned long bp, char *log_lvl)</div><div class='add'>+static inline void preempt_conditional_cli(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='del'>-	unsigned long *stack;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (sp == NULL) {</div><div class='del'>-		if (task)</div><div class='del'>-			sp = (unsigned long *)task-&gt;thread.sp;</div><div class='del'>-		else</div><div class='del'>-			sp = (unsigned long *)&amp;sp;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	stack = sp;</div><div class='del'>-	for (i = 0; i &lt; kstack_depth_to_print; i++) {</div><div class='del'>-		if (kstack_end(stack))</div><div class='del'>-			break;</div><div class='del'>-		if (i &amp;&amp; ((i % 8) == 0))</div><div class='del'>-			printk("\n%s       ", log_lvl);</div><div class='del'>-		printk("%08lx ", *stack++);</div><div class='del'>-	}</div><div class='del'>-	printk("\n%sCall Trace:\n", log_lvl);</div><div class='del'>-</div><div class='del'>-	show_trace_log_lvl(task, regs, sp, bp, log_lvl);</div><div class='add'>+	if (regs-&gt;flags &amp; X86_EFLAGS_IF)</div><div class='add'>+		local_irq_disable();</div><div class='add'>+	dec_preempt_count();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void show_stack(struct task_struct *task, unsigned long *sp)</div><div class='add'>+#ifdef CONFIG_X86_32</div><div class='add'>+static inline void</div><div class='add'>+die_if_kernel(const char *str, struct pt_regs *regs, long err)</div><div class='ctx'> {</div><div class='del'>-	printk("       ");</div><div class='del'>-	show_stack_log_lvl(task, NULL, sp, 0, "");</div><div class='add'>+	if (!user_mode_vm(regs))</div><div class='add'>+		die(str, regs, err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * The architecture-independent dump_stack generator</div><div class='add'>+ * Perform the lazy TSS's I/O bitmap copy. If the TSS has an</div><div class='add'>+ * invalid offset set (the LAZY one) and the faulting thread has</div><div class='add'>+ * a valid I/O bitmap pointer, we copy the I/O bitmap in the TSS,</div><div class='add'>+ * we set the offset field correctly and return 1.</div><div class='ctx'>  */</div><div class='del'>-void dump_stack(void)</div><div class='add'>+static int lazy_iobitmap_copy(void)</div><div class='ctx'> {</div><div class='del'>-	unsigned long bp = 0;</div><div class='del'>-	unsigned long stack;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_FRAME_POINTER</div><div class='del'>-	if (!bp)</div><div class='del'>-		asm("movl %%ebp, %0" : "=r" (bp):);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	printk("Pid: %d, comm: %.20s %s %s %.*s\n",</div><div class='del'>-		current-&gt;pid, current-&gt;comm, print_tainted(),</div><div class='del'>-		init_utsname()-&gt;release,</div><div class='del'>-		(int)strcspn(init_utsname()-&gt;version, " "),</div><div class='del'>-		init_utsname()-&gt;version);</div><div class='del'>-</div><div class='del'>-	show_trace(current, NULL, &amp;stack, bp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(dump_stack);</div><div class='del'>-</div><div class='del'>-void show_registers(struct pt_regs *regs)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='add'>+	struct thread_struct *thread;</div><div class='add'>+	struct tss_struct *tss;</div><div class='add'>+	int cpu;</div><div class='ctx'> </div><div class='del'>-	print_modules();</div><div class='del'>-	__show_registers(regs, 0);</div><div class='add'>+	cpu = get_cpu();</div><div class='add'>+	tss = &amp;per_cpu(init_tss, cpu);</div><div class='add'>+	thread = &amp;current-&gt;thread;</div><div class='ctx'> </div><div class='del'>-	printk(KERN_EMERG "Process %.*s (pid: %d, ti=%p task=%p task.ti=%p)",</div><div class='del'>-		TASK_COMM_LEN, current-&gt;comm, task_pid_nr(current),</div><div class='del'>-		current_thread_info(), current, task_thread_info(current));</div><div class='del'>-	/*</div><div class='del'>-	 * When in-kernel, we also print out the stack and code at the</div><div class='del'>-	 * time of the fault..</div><div class='del'>-	 */</div><div class='del'>-	if (!user_mode_vm(regs)) {</div><div class='del'>-		unsigned int code_prologue = code_bytes * 43 / 64;</div><div class='del'>-		unsigned int code_len = code_bytes;</div><div class='del'>-		unsigned char c;</div><div class='del'>-		u8 *ip;</div><div class='del'>-</div><div class='del'>-		printk("\n" KERN_EMERG "Stack: ");</div><div class='del'>-		show_stack_log_lvl(NULL, regs, &amp;regs-&gt;sp, 0, KERN_EMERG);</div><div class='del'>-</div><div class='del'>-		printk(KERN_EMERG "Code: ");</div><div class='del'>-</div><div class='del'>-		ip = (u8 *)regs-&gt;ip - code_prologue;</div><div class='del'>-		if (ip &lt; (u8 *)PAGE_OFFSET || probe_kernel_address(ip, c)) {</div><div class='del'>-			/* try starting at EIP */</div><div class='del'>-			ip = (u8 *)regs-&gt;ip;</div><div class='del'>-			code_len = code_len - code_prologue + 1;</div><div class='del'>-		}</div><div class='del'>-		for (i = 0; i &lt; code_len; i++, ip++) {</div><div class='del'>-			if (ip &lt; (u8 *)PAGE_OFFSET ||</div><div class='del'>-					probe_kernel_address(ip, c)) {</div><div class='del'>-				printk(" Bad EIP value.");</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			if (ip == (u8 *)regs-&gt;ip)</div><div class='del'>-				printk("&lt;%02x&gt; ", c);</div><div class='del'>-			else</div><div class='del'>-				printk("%02x ", c);</div><div class='add'>+	if (tss-&gt;x86_tss.io_bitmap_base == INVALID_IO_BITMAP_OFFSET_LAZY &amp;&amp;</div><div class='add'>+	    thread-&gt;io_bitmap_ptr) {</div><div class='add'>+		memcpy(tss-&gt;io_bitmap, thread-&gt;io_bitmap_ptr,</div><div class='add'>+		       thread-&gt;io_bitmap_max);</div><div class='add'>+		/*</div><div class='add'>+		 * If the previously set map was extending to higher ports</div><div class='add'>+		 * than the current one, pad extra space with 0xff (no access).</div><div class='add'>+		 */</div><div class='add'>+		if (thread-&gt;io_bitmap_max &lt; tss-&gt;io_bitmap_max) {</div><div class='add'>+			memset((char *) tss-&gt;io_bitmap +</div><div class='add'>+				thread-&gt;io_bitmap_max, 0xff,</div><div class='add'>+				tss-&gt;io_bitmap_max - thread-&gt;io_bitmap_max);</div><div class='ctx'> 		}</div><div class='del'>-	}</div><div class='del'>-	printk("\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int is_valid_bugaddr(unsigned long ip)</div><div class='del'>-{</div><div class='del'>-	unsigned short ud2;</div><div class='del'>-</div><div class='del'>-	if (ip &lt; PAGE_OFFSET)</div><div class='del'>-		return 0;</div><div class='del'>-	if (probe_kernel_address((unsigned short *)ip, ud2))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return ud2 == 0x0b0f;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static raw_spinlock_t die_lock = __RAW_SPIN_LOCK_UNLOCKED;</div><div class='del'>-static int die_owner = -1;</div><div class='del'>-static unsigned int die_nest_count;</div><div class='del'>-</div><div class='del'>-unsigned __kprobes long oops_begin(void)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	oops_enter();</div><div class='del'>-</div><div class='del'>-	if (die_owner != raw_smp_processor_id()) {</div><div class='del'>-		console_verbose();</div><div class='del'>-		raw_local_irq_save(flags);</div><div class='del'>-		__raw_spin_lock(&amp;die_lock);</div><div class='del'>-		die_owner = smp_processor_id();</div><div class='del'>-		die_nest_count = 0;</div><div class='del'>-		bust_spinlocks(1);</div><div class='del'>-	} else {</div><div class='del'>-		raw_local_irq_save(flags);</div><div class='del'>-	}</div><div class='del'>-	die_nest_count++;</div><div class='del'>-	return flags;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, int signr)</div><div class='del'>-{</div><div class='del'>-	bust_spinlocks(0);</div><div class='del'>-	die_owner = -1;</div><div class='del'>-	add_taint(TAINT_DIE);</div><div class='del'>-	__raw_spin_unlock(&amp;die_lock);</div><div class='del'>-	raw_local_irq_restore(flags);</div><div class='del'>-</div><div class='del'>-	if (!regs)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (kexec_should_crash(current))</div><div class='del'>-		crash_kexec(regs);</div><div class='del'>-</div><div class='del'>-	if (in_interrupt())</div><div class='del'>-		panic("Fatal exception in interrupt");</div><div class='del'>-</div><div class='del'>-	if (panic_on_oops)</div><div class='del'>-		panic("Fatal exception");</div><div class='del'>-</div><div class='del'>-	oops_exit();</div><div class='del'>-	do_exit(signr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int __kprobes __die(const char *str, struct pt_regs *regs, long err)</div><div class='del'>-{</div><div class='del'>-	unsigned short ss;</div><div class='del'>-	unsigned long sp;</div><div class='add'>+		tss-&gt;io_bitmap_max = thread-&gt;io_bitmap_max;</div><div class='add'>+		tss-&gt;x86_tss.io_bitmap_base = IO_BITMAP_OFFSET;</div><div class='add'>+		tss-&gt;io_bitmap_owner = thread;</div><div class='add'>+		put_cpu();</div><div class='ctx'> </div><div class='del'>-	printk(KERN_EMERG "%s: %04lx [#%d] ", str, err &amp; 0xffff, ++die_counter);</div><div class='del'>-#ifdef CONFIG_PREEMPT</div><div class='del'>-	printk("PREEMPT ");</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_SMP</div><div class='del'>-	printk("SMP ");</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_DEBUG_PAGEALLOC</div><div class='del'>-	printk("DEBUG_PAGEALLOC");</div><div class='del'>-#endif</div><div class='del'>-	printk("\n");</div><div class='del'>-	if (notify_die(DIE_OOPS, str, regs, err,</div><div class='del'>-			current-&gt;thread.trap_no, SIGSEGV) == NOTIFY_STOP)</div><div class='ctx'> 		return 1;</div><div class='del'>-</div><div class='del'>-	show_registers(regs);</div><div class='del'>-	/* Executive summary in case the oops scrolled away */</div><div class='del'>-	sp = (unsigned long) (&amp;regs-&gt;sp);</div><div class='del'>-	savesegment(ss, ss);</div><div class='del'>-	if (user_mode(regs)) {</div><div class='del'>-		sp = regs-&gt;sp;</div><div class='del'>-		ss = regs-&gt;ss &amp; 0xffff;</div><div class='ctx'> 	}</div><div class='del'>-	printk(KERN_EMERG "EIP: [&lt;%08lx&gt;] ", regs-&gt;ip);</div><div class='del'>-	print_symbol("%s", regs-&gt;ip);</div><div class='del'>-	printk(" SS:ESP %04x:%08lx\n", ss, sp);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This is gone through when something in the kernel has done something bad</div><div class='del'>- * and is about to be terminated:</div><div class='del'>- */</div><div class='del'>-void die(const char *str, struct pt_regs *regs, long err)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags = oops_begin();</div><div class='del'>-</div><div class='del'>-	if (die_nest_count &lt; 3) {</div><div class='del'>-		report_bug(regs-&gt;ip, regs);</div><div class='del'>-</div><div class='del'>-		if (__die(str, regs, err))</div><div class='del'>-			regs = NULL;</div><div class='del'>-	} else {</div><div class='del'>-		printk(KERN_EMERG "Recursive die() failure, output suppressed\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	oops_end(flags, regs, SIGSEGV);</div><div class='del'>-}</div><div class='add'>+	put_cpu();</div><div class='ctx'> </div><div class='del'>-static inline void</div><div class='del'>-die_if_kernel(const char *str, struct pt_regs *regs, long err)</div><div class='del'>-{</div><div class='del'>-	if (!user_mode_vm(regs))</div><div class='del'>-		die(str, regs, err);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> static void __kprobes</div><div class='del'>-do_trap(int trapnr, int signr, char *str, int vm86, struct pt_regs *regs,</div><div class='add'>+do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,</div><div class='ctx'> 	long error_code, siginfo_t *info)</div><div class='ctx'> {</div><div class='ctx'> 	struct task_struct *tsk = current;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_X86_32</div><div class='ctx'> 	if (regs-&gt;flags &amp; X86_VM_MASK) {</div><div class='del'>-		if (vm86)</div><div class='add'>+		/*</div><div class='add'>+		 * traps 0, 1, 3, 4, and 5 should be forwarded to vm86.</div><div class='add'>+		 * On nmi (interrupt 2), do_trap should not be called.</div><div class='add'>+		 */</div><div class='add'>+		if (trapnr &lt; 6)</div><div class='ctx'> 			goto vm86_trap;</div><div class='ctx'> 		goto trap_signal;</div><div class='ctx'> 	}</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	if (!user_mode(regs))</div><div class='ctx'> 		goto kernel_trap;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_X86_32</div><div class='ctx'> trap_signal:</div><div class='add'>+#endif</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We want error_code and trap_no set for userspace faults and</div><div class='ctx'> 	 * kernelspace faults which result in die(), but not</div><div class='hunk'>@@ -501,6 +197,18 @@ trap_signal:</div><div class='ctx'> 	tsk-&gt;thread.error_code = error_code;</div><div class='ctx'> 	tsk-&gt;thread.trap_no = trapnr;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='add'>+	if (show_unhandled_signals &amp;&amp; unhandled_signal(tsk, signr) &amp;&amp;</div><div class='add'>+	    printk_ratelimit()) {</div><div class='add'>+		printk(KERN_INFO</div><div class='add'>+		       "%s[%d] trap %s ip:%lx sp:%lx error:%lx",</div><div class='add'>+		       tsk-&gt;comm, tsk-&gt;pid, str,</div><div class='add'>+		       regs-&gt;ip, regs-&gt;sp, error_code);</div><div class='add'>+		print_vma_addr(" in ", regs-&gt;ip);</div><div class='add'>+		printk("\n");</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	if (info)</div><div class='ctx'> 		force_sig_info(signr, info, tsk);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -515,29 +223,29 @@ kernel_trap:</div><div class='ctx'> 	}</div><div class='ctx'> 	return;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_X86_32</div><div class='ctx'> vm86_trap:</div><div class='ctx'> 	if (handle_vm86_trap((struct kernel_vm86_regs *) regs,</div><div class='ctx'> 						error_code, trapnr))</div><div class='ctx'> 		goto trap_signal;</div><div class='ctx'> 	return;</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define DO_ERROR(trapnr, signr, str, name)				\</div><div class='del'>-void do_##name(struct pt_regs *regs, long error_code)			\</div><div class='add'>+dotraplinkage void do_##name(struct pt_regs *regs, long error_code)	\</div><div class='ctx'> {									\</div><div class='del'>-	trace_hardirqs_fixup();						\</div><div class='ctx'> 	if (notify_die(DIE_TRAP, str, regs, error_code, trapnr, signr)	\</div><div class='ctx'> 							== NOTIFY_STOP)	\</div><div class='ctx'> 		return;							\</div><div class='del'>-	do_trap(trapnr, signr, str, 0, regs, error_code, NULL);		\</div><div class='add'>+	conditional_sti(regs);						\</div><div class='add'>+	do_trap(trapnr, signr, str, regs, error_code, NULL);		\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define DO_ERROR_INFO(trapnr, signr, str, name, sicode, siaddr, irq)	\</div><div class='del'>-void do_##name(struct pt_regs *regs, long error_code)			\</div><div class='add'>+#define DO_ERROR_INFO(trapnr, signr, str, name, sicode, siaddr)		\</div><div class='add'>+dotraplinkage void do_##name(struct pt_regs *regs, long error_code)	\</div><div class='ctx'> {									\</div><div class='ctx'> 	siginfo_t info;							\</div><div class='del'>-	if (irq)							\</div><div class='del'>-		local_irq_enable();					\</div><div class='ctx'> 	info.si_signo = signr;						\</div><div class='ctx'> 	info.si_errno = 0;						\</div><div class='ctx'> 	info.si_code = sicode;						\</div><div class='hunk'>@@ -545,90 +253,68 @@ void do_##name(struct pt_regs *regs, long error_code)			\</div><div class='ctx'> 	if (notify_die(DIE_TRAP, str, regs, error_code, trapnr, signr)	\</div><div class='ctx'> 							== NOTIFY_STOP)	\</div><div class='ctx'> 		return;							\</div><div class='del'>-	do_trap(trapnr, signr, str, 0, regs, error_code, &amp;info);	\</div><div class='add'>+	conditional_sti(regs);						\</div><div class='add'>+	do_trap(trapnr, signr, str, regs, error_code, &amp;info);		\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define DO_VM86_ERROR(trapnr, signr, str, name)				\</div><div class='del'>-void do_##name(struct pt_regs *regs, long error_code)			\</div><div class='del'>-{									\</div><div class='del'>-	if (notify_die(DIE_TRAP, str, regs, error_code, trapnr, signr)	\</div><div class='del'>-							== NOTIFY_STOP)	\</div><div class='del'>-		return;							\</div><div class='del'>-	do_trap(trapnr, signr, str, 1, regs, error_code, NULL);		\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define DO_VM86_ERROR_INFO(trapnr, signr, str, name, sicode, siaddr)	\</div><div class='del'>-void do_##name(struct pt_regs *regs, long error_code)			\</div><div class='del'>-{									\</div><div class='del'>-	siginfo_t info;							\</div><div class='del'>-	info.si_signo = signr;						\</div><div class='del'>-	info.si_errno = 0;						\</div><div class='del'>-	info.si_code = sicode;						\</div><div class='del'>-	info.si_addr = (void __user *)siaddr;				\</div><div class='del'>-	trace_hardirqs_fixup();						\</div><div class='del'>-	if (notify_die(DIE_TRAP, str, regs, error_code, trapnr, signr)	\</div><div class='del'>-							== NOTIFY_STOP)	\</div><div class='del'>-		return;							\</div><div class='del'>-	do_trap(trapnr, signr, str, 1, regs, error_code, &amp;info);	\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-DO_VM86_ERROR_INFO(0, SIGFPE, "divide error", divide_error, FPE_INTDIV, regs-&gt;ip)</div><div class='del'>-#ifndef CONFIG_KPROBES</div><div class='del'>-DO_VM86_ERROR(3, SIGTRAP, "int3", int3)</div><div class='del'>-#endif</div><div class='del'>-DO_VM86_ERROR(4, SIGSEGV, "overflow", overflow)</div><div class='del'>-DO_VM86_ERROR(5, SIGSEGV, "bounds", bounds)</div><div class='del'>-DO_ERROR_INFO(6, SIGILL, "invalid opcode", invalid_op, ILL_ILLOPN, regs-&gt;ip, 0)</div><div class='add'>+DO_ERROR_INFO(0, SIGFPE, "divide error", divide_error, FPE_INTDIV, regs-&gt;ip)</div><div class='add'>+DO_ERROR(4, SIGSEGV, "overflow", overflow)</div><div class='add'>+DO_ERROR(5, SIGSEGV, "bounds", bounds)</div><div class='add'>+DO_ERROR_INFO(6, SIGILL, "invalid opcode", invalid_op, ILL_ILLOPN, regs-&gt;ip)</div><div class='ctx'> DO_ERROR(9, SIGFPE, "coprocessor segment overrun", coprocessor_segment_overrun)</div><div class='ctx'> DO_ERROR(10, SIGSEGV, "invalid TSS", invalid_TSS)</div><div class='ctx'> DO_ERROR(11, SIGBUS, "segment not present", segment_not_present)</div><div class='add'>+#ifdef CONFIG_X86_32</div><div class='ctx'> DO_ERROR(12, SIGBUS, "stack segment", stack_segment)</div><div class='del'>-DO_ERROR_INFO(17, SIGBUS, "alignment check", alignment_check, BUS_ADRALN, 0, 0)</div><div class='del'>-DO_ERROR_INFO(32, SIGILL, "iret exception", iret_error, ILL_BADSTK, 0, 1)</div><div class='add'>+#endif</div><div class='add'>+DO_ERROR_INFO(17, SIGBUS, "alignment check", alignment_check, BUS_ADRALN, 0)</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='add'>+/* Runs on IST stack */</div><div class='add'>+dotraplinkage void do_stack_segment(struct pt_regs *regs, long error_code)</div><div class='add'>+{</div><div class='add'>+	if (notify_die(DIE_TRAP, "stack segment", regs, error_code,</div><div class='add'>+			12, SIGBUS) == NOTIFY_STOP)</div><div class='add'>+		return;</div><div class='add'>+	preempt_conditional_sti(regs);</div><div class='add'>+	do_trap(12, SIGBUS, "stack segment", regs, error_code, NULL);</div><div class='add'>+	preempt_conditional_cli(regs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+dotraplinkage void do_double_fault(struct pt_regs *regs, long error_code)</div><div class='add'>+{</div><div class='add'>+	static const char str[] = "double fault";</div><div class='add'>+	struct task_struct *tsk = current;</div><div class='add'>+</div><div class='add'>+	/* Return not checked because double check cannot be ignored */</div><div class='add'>+	notify_die(DIE_TRAP, str, regs, error_code, 8, SIGSEGV);</div><div class='ctx'> </div><div class='del'>-void __kprobes</div><div class='add'>+	tsk-&gt;thread.error_code = error_code;</div><div class='add'>+	tsk-&gt;thread.trap_no = 8;</div><div class='add'>+</div><div class='add'>+	/* This is always a kernel trap and never fixable (and thus must</div><div class='add'>+	   never return). */</div><div class='add'>+	for (;;)</div><div class='add'>+		die(str, regs, error_code);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+dotraplinkage void __kprobes</div><div class='ctx'> do_general_protection(struct pt_regs *regs, long error_code)</div><div class='ctx'> {</div><div class='ctx'> 	struct task_struct *tsk;</div><div class='del'>-	struct thread_struct *thread;</div><div class='del'>-	struct tss_struct *tss;</div><div class='del'>-	int cpu;</div><div class='ctx'> </div><div class='del'>-	cpu = get_cpu();</div><div class='del'>-	tss = &amp;per_cpu(init_tss, cpu);</div><div class='del'>-	thread = &amp;current-&gt;thread;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Perform the lazy TSS's I/O bitmap copy. If the TSS has an</div><div class='del'>-	 * invalid offset set (the LAZY one) and the faulting thread has</div><div class='del'>-	 * a valid I/O bitmap pointer, we copy the I/O bitmap in the TSS</div><div class='del'>-	 * and we set the offset field correctly. Then we let the CPU to</div><div class='del'>-	 * restart the faulting instruction.</div><div class='del'>-	 */</div><div class='del'>-	if (tss-&gt;x86_tss.io_bitmap_base == INVALID_IO_BITMAP_OFFSET_LAZY &amp;&amp;</div><div class='del'>-	    thread-&gt;io_bitmap_ptr) {</div><div class='del'>-		memcpy(tss-&gt;io_bitmap, thread-&gt;io_bitmap_ptr,</div><div class='del'>-		       thread-&gt;io_bitmap_max);</div><div class='del'>-		/*</div><div class='del'>-		 * If the previously set map was extending to higher ports</div><div class='del'>-		 * than the current one, pad extra space with 0xff (no access).</div><div class='del'>-		 */</div><div class='del'>-		if (thread-&gt;io_bitmap_max &lt; tss-&gt;io_bitmap_max) {</div><div class='del'>-			memset((char *) tss-&gt;io_bitmap +</div><div class='del'>-				thread-&gt;io_bitmap_max, 0xff,</div><div class='del'>-				tss-&gt;io_bitmap_max - thread-&gt;io_bitmap_max);</div><div class='del'>-		}</div><div class='del'>-		tss-&gt;io_bitmap_max = thread-&gt;io_bitmap_max;</div><div class='del'>-		tss-&gt;x86_tss.io_bitmap_base = IO_BITMAP_OFFSET;</div><div class='del'>-		tss-&gt;io_bitmap_owner = thread;</div><div class='del'>-		put_cpu();</div><div class='add'>+	conditional_sti(regs);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_X86_32</div><div class='add'>+	if (lazy_iobitmap_copy()) {</div><div class='add'>+		/* restart the faulting instruction */</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='del'>-	put_cpu();</div><div class='ctx'> </div><div class='ctx'> 	if (regs-&gt;flags &amp; X86_VM_MASK)</div><div class='ctx'> 		goto gp_in_vm86;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	tsk = current;</div><div class='ctx'> 	if (!user_mode(regs))</div><div class='hunk'>@@ -650,10 +336,12 @@ do_general_protection(struct pt_regs *regs, long error_code)</div><div class='ctx'> 	force_sig(SIGSEGV, tsk);</div><div class='ctx'> 	return;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_X86_32</div><div class='ctx'> gp_in_vm86:</div><div class='ctx'> 	local_irq_enable();</div><div class='ctx'> 	handle_vm86_fault((struct kernel_vm86_regs *) regs, error_code);</div><div class='ctx'> 	return;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> gp_in_kernel:</div><div class='ctx'> 	if (fixup_exception(regs))</div><div class='hunk'>@@ -690,7 +378,8 @@ mem_parity_error(unsigned char reason, struct pt_regs *regs)</div><div class='ctx'> 	printk(KERN_EMERG "Dazed and confused, but trying to continue\n");</div><div class='ctx'> </div><div class='ctx'> 	/* Clear and disable the memory parity error line. */</div><div class='del'>-	clear_mem_error(reason);</div><div class='add'>+	reason = (reason &amp; 0xf) | 4;</div><div class='add'>+	outb(reason, 0x61);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static notrace __kprobes void</div><div class='hunk'>@@ -716,7 +405,8 @@ io_check_error(unsigned char reason, struct pt_regs *regs)</div><div class='ctx'> static notrace __kprobes void</div><div class='ctx'> unknown_nmi_error(unsigned char reason, struct pt_regs *regs)</div><div class='ctx'> {</div><div class='del'>-	if (notify_die(DIE_NMIUNKNOWN, "nmi", regs, reason, 2, SIGINT) == NOTIFY_STOP)</div><div class='add'>+	if (notify_die(DIE_NMIUNKNOWN, "nmi", regs, reason, 2, SIGINT) ==</div><div class='add'>+			NOTIFY_STOP)</div><div class='ctx'> 		return;</div><div class='ctx'> #ifdef CONFIG_MCA</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -739,41 +429,6 @@ unknown_nmi_error(unsigned char reason, struct pt_regs *regs)</div><div class='ctx'> 	printk(KERN_EMERG "Dazed and confused, but trying to continue\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static DEFINE_SPINLOCK(nmi_print_lock);</div><div class='del'>-</div><div class='del'>-void notrace __kprobes die_nmi(char *str, struct pt_regs *regs, int do_panic)</div><div class='del'>-{</div><div class='del'>-	if (notify_die(DIE_NMIWATCHDOG, str, regs, 0, 2, SIGINT) == NOTIFY_STOP)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;nmi_print_lock);</div><div class='del'>-	/*</div><div class='del'>-	* We are in trouble anyway, lets at least try</div><div class='del'>-	* to get a message out:</div><div class='del'>-	*/</div><div class='del'>-	bust_spinlocks(1);</div><div class='del'>-	printk(KERN_EMERG "%s", str);</div><div class='del'>-	printk(" on CPU%d, ip %08lx, registers:\n",</div><div class='del'>-		smp_processor_id(), regs-&gt;ip);</div><div class='del'>-	show_registers(regs);</div><div class='del'>-	if (do_panic)</div><div class='del'>-		panic("Non maskable interrupt");</div><div class='del'>-	console_silent();</div><div class='del'>-	spin_unlock(&amp;nmi_print_lock);</div><div class='del'>-	bust_spinlocks(0);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If we are in kernel we are probably nested up pretty bad</div><div class='del'>-	 * and might aswell get out now while we still can:</div><div class='del'>-	 */</div><div class='del'>-	if (!user_mode_vm(regs)) {</div><div class='del'>-		current-&gt;thread.trap_no = 2;</div><div class='del'>-		crash_kexec(regs);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	do_exit(SIGSEGV);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static notrace __kprobes void default_do_nmi(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char reason = 0;</div><div class='hunk'>@@ -812,22 +467,25 @@ static notrace __kprobes void default_do_nmi(struct pt_regs *regs)</div><div class='ctx'> 		mem_parity_error(reason, regs);</div><div class='ctx'> 	if (reason &amp; 0x40)</div><div class='ctx'> 		io_check_error(reason, regs);</div><div class='add'>+#ifdef CONFIG_X86_32</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Reassert NMI in case it became active meanwhile</div><div class='ctx'> 	 * as it's edge-triggered:</div><div class='ctx'> 	 */</div><div class='ctx'> 	reassert_nmi();</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-notrace __kprobes void do_nmi(struct pt_regs *regs, long error_code)</div><div class='add'>+dotraplinkage notrace __kprobes void</div><div class='add'>+do_nmi(struct pt_regs *regs, long error_code)</div><div class='ctx'> {</div><div class='del'>-	int cpu;</div><div class='del'>-</div><div class='ctx'> 	nmi_enter();</div><div class='ctx'> </div><div class='del'>-	cpu = smp_processor_id();</div><div class='del'>-</div><div class='del'>-	++nmi_count(cpu);</div><div class='add'>+#ifdef CONFIG_X86_32</div><div class='add'>+	{ int cpu; cpu = smp_processor_id(); ++nmi_count(cpu); }</div><div class='add'>+#else</div><div class='add'>+	add_pda(__nmi_count, 1);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	if (!ignore_nmis)</div><div class='ctx'> 		default_do_nmi(regs);</div><div class='hunk'>@@ -847,21 +505,44 @@ void restart_nmi(void)</div><div class='ctx'> 	acpi_nmi_enable();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_KPROBES</div><div class='del'>-void __kprobes do_int3(struct pt_regs *regs, long error_code)</div><div class='add'>+/* May run on IST stack. */</div><div class='add'>+dotraplinkage void __kprobes do_int3(struct pt_regs *regs, long error_code)</div><div class='ctx'> {</div><div class='del'>-	trace_hardirqs_fixup();</div><div class='del'>-</div><div class='add'>+#ifdef CONFIG_KPROBES</div><div class='ctx'> 	if (notify_die(DIE_INT3, "int3", regs, error_code, 3, SIGTRAP)</div><div class='ctx'> 			== NOTIFY_STOP)</div><div class='ctx'> 		return;</div><div class='del'>-	/*</div><div class='del'>-	 * This is an interrupt gate, because kprobes wants interrupts</div><div class='del'>-	 * disabled. Normal trap handlers don't.</div><div class='del'>-	 */</div><div class='del'>-	restore_interrupts(regs);</div><div class='add'>+#else</div><div class='add'>+	if (notify_die(DIE_TRAP, "int3", regs, error_code, 3, SIGTRAP)</div><div class='add'>+			== NOTIFY_STOP)</div><div class='add'>+		return;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	preempt_conditional_sti(regs);</div><div class='add'>+	do_trap(3, SIGTRAP, "int3", regs, error_code, NULL);</div><div class='add'>+	preempt_conditional_cli(regs);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	do_trap(3, SIGTRAP, "int3", 1, regs, error_code, NULL);</div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='add'>+/* Help handler running on IST stack to switch back to user stack</div><div class='add'>+   for scheduling or signal handling. The actual stack switch is done in</div><div class='add'>+   entry.S */</div><div class='add'>+asmlinkage __kprobes struct pt_regs *sync_regs(struct pt_regs *eregs)</div><div class='add'>+{</div><div class='add'>+	struct pt_regs *regs = eregs;</div><div class='add'>+	/* Did already sync */</div><div class='add'>+	if (eregs == (struct pt_regs *)eregs-&gt;sp)</div><div class='add'>+		;</div><div class='add'>+	/* Exception from user space */</div><div class='add'>+	else if (user_mode(eregs))</div><div class='add'>+		regs = task_pt_regs(current);</div><div class='add'>+	/* Exception from kernel and interrupts are enabled. Move to</div><div class='add'>+	   kernel process stack. */</div><div class='add'>+	else if (eregs-&gt;flags &amp; X86_EFLAGS_IF)</div><div class='add'>+		regs = (struct pt_regs *)(eregs-&gt;sp -= sizeof(struct pt_regs));</div><div class='add'>+	if (eregs != regs)</div><div class='add'>+		*regs = *eregs;</div><div class='add'>+	return regs;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -886,13 +567,14 @@ void __kprobes do_int3(struct pt_regs *regs, long error_code)</div><div class='ctx'>  * about restoring all the debug state, and ptrace doesn't have to</div><div class='ctx'>  * find every occurrence of the TF bit that could be saved away even</div><div class='ctx'>  * by user code)</div><div class='add'>+ *</div><div class='add'>+ * May run on IST stack.</div><div class='ctx'>  */</div><div class='del'>-void __kprobes do_debug(struct pt_regs *regs, long error_code)</div><div class='add'>+dotraplinkage void __kprobes do_debug(struct pt_regs *regs, long error_code)</div><div class='ctx'> {</div><div class='ctx'> 	struct task_struct *tsk = current;</div><div class='del'>-	unsigned int condition;</div><div class='del'>-</div><div class='del'>-	trace_hardirqs_fixup();</div><div class='add'>+	unsigned long condition;</div><div class='add'>+	int si_code;</div><div class='ctx'> </div><div class='ctx'> 	get_debugreg(condition, 6);</div><div class='ctx'> </div><div class='hunk'>@@ -905,9 +587,9 @@ void __kprobes do_debug(struct pt_regs *regs, long error_code)</div><div class='ctx'> 	if (notify_die(DIE_DEBUG, "debug", regs, condition, error_code,</div><div class='ctx'> 						SIGTRAP) == NOTIFY_STOP)</div><div class='ctx'> 		return;</div><div class='add'>+</div><div class='ctx'> 	/* It's safe to allow irq's after DR6 has been saved */</div><div class='del'>-	if (regs-&gt;flags &amp; X86_EFLAGS_IF)</div><div class='del'>-		local_irq_enable();</div><div class='add'>+	preempt_conditional_sti(regs);</div><div class='ctx'> </div><div class='ctx'> 	/* Mask out spurious debug traps due to lazy DR7 setting */</div><div class='ctx'> 	if (condition &amp; (DR_TRAP0|DR_TRAP1|DR_TRAP2|DR_TRAP3)) {</div><div class='hunk'>@@ -915,8 +597,10 @@ void __kprobes do_debug(struct pt_regs *regs, long error_code)</div><div class='ctx'> 			goto clear_dr7;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_X86_32</div><div class='ctx'> 	if (regs-&gt;flags &amp; X86_VM_MASK)</div><div class='ctx'> 		goto debug_vm86;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	/* Save debug status register where ptrace can see it */</div><div class='ctx'> 	tsk-&gt;thread.debugreg6 = condition;</div><div class='hunk'>@@ -926,17 +610,13 @@ void __kprobes do_debug(struct pt_regs *regs, long error_code)</div><div class='ctx'> 	 * kernel space (but re-enable TF when returning to user mode).</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (condition &amp; DR_STEP) {</div><div class='del'>-		/*</div><div class='del'>-		 * We already checked v86 mode above, so we can</div><div class='del'>-		 * check for kernel mode by just checking the CPL</div><div class='del'>-		 * of CS.</div><div class='del'>-		 */</div><div class='ctx'> 		if (!user_mode(regs))</div><div class='ctx'> 			goto clear_TF_reenable;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	si_code = get_si_code(condition);</div><div class='ctx'> 	/* Ok, finally something we can handle */</div><div class='del'>-	send_sigtrap(tsk, regs, error_code);</div><div class='add'>+	send_sigtrap(tsk, regs, error_code, si_code);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Disable additional traps. They'll be re-enabled when</div><div class='hunk'>@@ -944,18 +624,37 @@ void __kprobes do_debug(struct pt_regs *regs, long error_code)</div><div class='ctx'> 	 */</div><div class='ctx'> clear_dr7:</div><div class='ctx'> 	set_debugreg(0, 7);</div><div class='add'>+	preempt_conditional_cli(regs);</div><div class='ctx'> 	return;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_X86_32</div><div class='ctx'> debug_vm86:</div><div class='ctx'> 	handle_vm86_trap((struct kernel_vm86_regs *) regs, error_code, 1);</div><div class='add'>+	preempt_conditional_cli(regs);</div><div class='ctx'> 	return;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> clear_TF_reenable:</div><div class='ctx'> 	set_tsk_thread_flag(tsk, TIF_SINGLESTEP);</div><div class='ctx'> 	regs-&gt;flags &amp;= ~X86_EFLAGS_TF;</div><div class='add'>+	preempt_conditional_cli(regs);</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='add'>+static int kernel_math_error(struct pt_regs *regs, const char *str, int trapnr)</div><div class='add'>+{</div><div class='add'>+	if (fixup_exception(regs))</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	notify_die(DIE_GPF, str, regs, 0, trapnr, SIGFPE);</div><div class='add'>+	/* Illegal floating point operation in the kernel */</div><div class='add'>+	current-&gt;thread.trap_no = trapnr;</div><div class='add'>+	die(str, regs, 0);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Note that we play around with the 'TS' bit in an attempt to get</div><div class='ctx'>  * the correct behaviour even in the presence of the asynchronous</div><div class='hunk'>@@ -992,7 +691,9 @@ void math_error(void __user *ip)</div><div class='ctx'> 	swd = get_fpu_swd(task);</div><div class='ctx'> 	switch (swd &amp; ~cwd &amp; 0x3f) {</div><div class='ctx'> 	case 0x000: /* No unmasked exception */</div><div class='add'>+#ifdef CONFIG_X86_32</div><div class='ctx'> 		return;</div><div class='add'>+#endif</div><div class='ctx'> 	default: /* Multiple exceptions */</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x001: /* Invalid Op */</div><div class='hunk'>@@ -1020,9 +721,18 @@ void math_error(void __user *ip)</div><div class='ctx'> 	force_sig_info(SIGFPE, &amp;info, task);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void do_coprocessor_error(struct pt_regs *regs, long error_code)</div><div class='add'>+dotraplinkage void do_coprocessor_error(struct pt_regs *regs, long error_code)</div><div class='ctx'> {</div><div class='add'>+	conditional_sti(regs);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_X86_32</div><div class='ctx'> 	ignore_fpu_irq = 1;</div><div class='add'>+#else</div><div class='add'>+	if (!user_mode(regs) &amp;&amp;</div><div class='add'>+	    kernel_math_error(regs, "kernel x87 math error", 16))</div><div class='add'>+		return;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	math_error((void __user *)regs-&gt;ip);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1074,8 +784,12 @@ static void simd_math_error(void __user *ip)</div><div class='ctx'> 	force_sig_info(SIGFPE, &amp;info, task);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void do_simd_coprocessor_error(struct pt_regs *regs, long error_code)</div><div class='add'>+dotraplinkage void</div><div class='add'>+do_simd_coprocessor_error(struct pt_regs *regs, long error_code)</div><div class='ctx'> {</div><div class='add'>+	conditional_sti(regs);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_X86_32</div><div class='ctx'> 	if (cpu_has_xmm) {</div><div class='ctx'> 		/* Handle SIMD FPU exceptions on PIII+ processors. */</div><div class='ctx'> 		ignore_fpu_irq = 1;</div><div class='hunk'>@@ -1094,16 +808,25 @@ void do_simd_coprocessor_error(struct pt_regs *regs, long error_code)</div><div class='ctx'> 	current-&gt;thread.error_code = error_code;</div><div class='ctx'> 	die_if_kernel("cache flush denied", regs, error_code);</div><div class='ctx'> 	force_sig(SIGSEGV, current);</div><div class='add'>+#else</div><div class='add'>+	if (!user_mode(regs) &amp;&amp;</div><div class='add'>+			kernel_math_error(regs, "kernel simd math error", 19))</div><div class='add'>+		return;</div><div class='add'>+	simd_math_error((void __user *)regs-&gt;ip);</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void do_spurious_interrupt_bug(struct pt_regs *regs, long error_code)</div><div class='add'>+dotraplinkage void</div><div class='add'>+do_spurious_interrupt_bug(struct pt_regs *regs, long error_code)</div><div class='ctx'> {</div><div class='add'>+	conditional_sti(regs);</div><div class='ctx'> #if 0</div><div class='ctx'> 	/* No need to warn about this any longer. */</div><div class='ctx'> 	printk(KERN_INFO "Ignoring P6 Local APIC Spurious Interrupt Bug...\n");</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_X86_32</div><div class='ctx'> unsigned long patch_espfix_desc(unsigned long uesp, unsigned long kesp)</div><div class='ctx'> {</div><div class='ctx'> 	struct desc_struct *gdt = get_cpu_gdt_table(smp_processor_id());</div><div class='hunk'>@@ -1122,6 +845,15 @@ unsigned long patch_espfix_desc(unsigned long uesp, unsigned long kesp)</div><div class='ctx'> </div><div class='ctx'> 	return new_kesp;</div><div class='ctx'> }</div><div class='add'>+#else</div><div class='add'>+asmlinkage void __attribute__((weak)) smp_thermal_interrupt(void)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+asmlinkage void __attribute__((weak)) mce_threshold_interrupt(void)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * 'math_state_restore()' saves the current math information in the</div><div class='hunk'>@@ -1154,14 +886,24 @@ asmlinkage void math_state_restore(void)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	clts();				/* Allow maths ops (or we recurse) */</div><div class='add'>+#ifdef CONFIG_X86_32</div><div class='ctx'> 	restore_fpu(tsk);</div><div class='add'>+#else</div><div class='add'>+	/*</div><div class='add'>+	 * Paranoid restore. send a SIGSEGV if we fail to restore the state.</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(restore_fpu_checking(tsk))) {</div><div class='add'>+		stts();</div><div class='add'>+		force_sig(SIGSEGV, tsk);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='ctx'> 	thread-&gt;status |= TS_USEDFPU;	/* So we fnsave on switch_to() */</div><div class='ctx'> 	tsk-&gt;fpu_counter++;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(math_state_restore);</div><div class='ctx'> </div><div class='ctx'> #ifndef CONFIG_MATH_EMULATION</div><div class='del'>-</div><div class='ctx'> asmlinkage void math_emulate(long arg)</div><div class='ctx'> {</div><div class='ctx'> 	printk(KERN_EMERG</div><div class='hunk'>@@ -1170,12 +912,54 @@ asmlinkage void math_emulate(long arg)</div><div class='ctx'> 	force_sig(SIGFPE, current);</div><div class='ctx'> 	schedule();</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> #endif /* CONFIG_MATH_EMULATION */</div><div class='ctx'> </div><div class='add'>+dotraplinkage void __kprobes</div><div class='add'>+do_device_not_available(struct pt_regs *regs, long error)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_X86_32</div><div class='add'>+	if (read_cr0() &amp; X86_CR0_EM) {</div><div class='add'>+		conditional_sti(regs);</div><div class='add'>+		math_emulate(0);</div><div class='add'>+	} else {</div><div class='add'>+		math_state_restore(); /* interrupts still off */</div><div class='add'>+		conditional_sti(regs);</div><div class='add'>+	}</div><div class='add'>+#else</div><div class='add'>+	math_state_restore();</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_X86_32</div><div class='add'>+#ifdef CONFIG_X86_MCE</div><div class='add'>+dotraplinkage void __kprobes do_machine_check(struct pt_regs *regs, long error)</div><div class='add'>+{</div><div class='add'>+	conditional_sti(regs);</div><div class='add'>+	machine_check_vector(regs, error);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+dotraplinkage void do_iret_error(struct pt_regs *regs, long error_code)</div><div class='add'>+{</div><div class='add'>+	siginfo_t info;</div><div class='add'>+	local_irq_enable();</div><div class='add'>+</div><div class='add'>+	info.si_signo = SIGILL;</div><div class='add'>+	info.si_errno = 0;</div><div class='add'>+	info.si_code = ILL_BADSTK;</div><div class='add'>+	info.si_addr = 0;</div><div class='add'>+	if (notify_die(DIE_TRAP, "iret exception",</div><div class='add'>+			regs, error_code, 32, SIGILL) == NOTIFY_STOP)</div><div class='add'>+		return;</div><div class='add'>+	do_trap(32, SIGILL, "iret exception", regs, error_code, &amp;info);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> void __init trap_init(void)</div><div class='ctx'> {</div><div class='add'>+#ifdef CONFIG_X86_32</div><div class='ctx'> 	int i;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_EISA</div><div class='ctx'> 	void __iomem *p = early_ioremap(0x0FFFD9, 4);</div><div class='hunk'>@@ -1185,29 +969,40 @@ void __init trap_init(void)</div><div class='ctx'> 	early_iounmap(p, 4);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	set_trap_gate(0, &amp;divide_error);</div><div class='del'>-	set_intr_gate(1, &amp;debug);</div><div class='del'>-	set_intr_gate(2, &amp;nmi);</div><div class='del'>-	set_system_intr_gate(3, &amp;int3); /* int3 can be called from all */</div><div class='del'>-	set_system_gate(4, &amp;overflow); /* int4 can be called from all */</div><div class='del'>-	set_trap_gate(5, &amp;bounds);</div><div class='del'>-	set_trap_gate(6, &amp;invalid_op);</div><div class='del'>-	set_trap_gate(7, &amp;device_not_available);</div><div class='add'>+	set_intr_gate(0, &amp;divide_error);</div><div class='add'>+	set_intr_gate_ist(1, &amp;debug, DEBUG_STACK);</div><div class='add'>+	set_intr_gate_ist(2, &amp;nmi, NMI_STACK);</div><div class='add'>+	/* int3 can be called from all */</div><div class='add'>+	set_system_intr_gate_ist(3, &amp;int3, DEBUG_STACK);</div><div class='add'>+	/* int4 can be called from all */</div><div class='add'>+	set_system_intr_gate(4, &amp;overflow);</div><div class='add'>+	set_intr_gate(5, &amp;bounds);</div><div class='add'>+	set_intr_gate(6, &amp;invalid_op);</div><div class='add'>+	set_intr_gate(7, &amp;device_not_available);</div><div class='add'>+#ifdef CONFIG_X86_32</div><div class='ctx'> 	set_task_gate(8, GDT_ENTRY_DOUBLEFAULT_TSS);</div><div class='del'>-	set_trap_gate(9, &amp;coprocessor_segment_overrun);</div><div class='del'>-	set_trap_gate(10, &amp;invalid_TSS);</div><div class='del'>-	set_trap_gate(11, &amp;segment_not_present);</div><div class='del'>-	set_trap_gate(12, &amp;stack_segment);</div><div class='del'>-	set_trap_gate(13, &amp;general_protection);</div><div class='add'>+#else</div><div class='add'>+	set_intr_gate_ist(8, &amp;double_fault, DOUBLEFAULT_STACK);</div><div class='add'>+#endif</div><div class='add'>+	set_intr_gate(9, &amp;coprocessor_segment_overrun);</div><div class='add'>+	set_intr_gate(10, &amp;invalid_TSS);</div><div class='add'>+	set_intr_gate(11, &amp;segment_not_present);</div><div class='add'>+	set_intr_gate_ist(12, &amp;stack_segment, STACKFAULT_STACK);</div><div class='add'>+	set_intr_gate(13, &amp;general_protection);</div><div class='ctx'> 	set_intr_gate(14, &amp;page_fault);</div><div class='del'>-	set_trap_gate(15, &amp;spurious_interrupt_bug);</div><div class='del'>-	set_trap_gate(16, &amp;coprocessor_error);</div><div class='del'>-	set_trap_gate(17, &amp;alignment_check);</div><div class='add'>+	set_intr_gate(15, &amp;spurious_interrupt_bug);</div><div class='add'>+	set_intr_gate(16, &amp;coprocessor_error);</div><div class='add'>+	set_intr_gate(17, &amp;alignment_check);</div><div class='ctx'> #ifdef CONFIG_X86_MCE</div><div class='del'>-	set_trap_gate(18, &amp;machine_check);</div><div class='add'>+	set_intr_gate_ist(18, &amp;machine_check, MCE_STACK);</div><div class='ctx'> #endif</div><div class='del'>-	set_trap_gate(19, &amp;simd_coprocessor_error);</div><div class='add'>+	set_intr_gate(19, &amp;simd_coprocessor_error);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_IA32_EMULATION</div><div class='add'>+	set_system_intr_gate(IA32_SYSCALL_VECTOR, ia32_syscall);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_X86_32</div><div class='ctx'> 	if (cpu_has_fxsr) {</div><div class='ctx'> 		printk(KERN_INFO "Enabling fast FPU save and restore... ");</div><div class='ctx'> 		set_in_cr4(X86_CR4_OSFXSR);</div><div class='hunk'>@@ -1220,37 +1015,20 @@ void __init trap_init(void)</div><div class='ctx'> 		printk("done.\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	set_system_gate(SYSCALL_VECTOR, &amp;system_call);</div><div class='add'>+	set_system_trap_gate(SYSCALL_VECTOR, &amp;system_call);</div><div class='ctx'> </div><div class='ctx'> 	/* Reserve all the builtin and the syscall vector: */</div><div class='ctx'> 	for (i = 0; i &lt; FIRST_EXTERNAL_VECTOR; i++)</div><div class='ctx'> 		set_bit(i, used_vectors);</div><div class='ctx'> </div><div class='ctx'> 	set_bit(SYSCALL_VECTOR, used_vectors);</div><div class='del'>-</div><div class='del'>-	init_thread_xstate();</div><div class='add'>+#endif</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Should be a barrier for any external CPU state:</div><div class='ctx'> 	 */</div><div class='ctx'> 	cpu_init();</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_X86_32</div><div class='ctx'> 	trap_init_hook();</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-static int __init kstack_setup(char *s)</div><div class='del'>-{</div><div class='del'>-	kstack_depth_to_print = simple_strtoul(s, NULL, 0);</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-__setup("kstack=", kstack_setup);</div><div class='del'>-</div><div class='del'>-static int __init code_bytes_setup(char *s)</div><div class='del'>-{</div><div class='del'>-	code_bytes = simple_strtoul(s, NULL, 0);</div><div class='del'>-	if (code_bytes &gt; 8192)</div><div class='del'>-		code_bytes = 8192;</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-__setup("code_bytes=", code_bytes_setup);</div><div class='head'>diff --git a/arch/x86/kernel/traps_64.c b/arch/x86/kernel/traps_64.c<br/>deleted file mode 100644<br/>index 513caaca7115..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/traps_64.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/traps_64.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1212 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 1991, 1992  Linus Torvalds</div><div class='del'>- *  Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs</div><div class='del'>- *</div><div class='del'>- *  Pentium III FXSR, SSE support</div><div class='del'>- *	Gareth Hughes &lt;gareth@valinux.com&gt;, May 2000</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 'Traps.c' handles hardware traps and faults after we have saved some</div><div class='del'>- * state in 'entry.S'.</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/kallsyms.h&gt;</div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;linux/kprobes.h&gt;</div><div class='del'>-#include &lt;linux/uaccess.h&gt;</div><div class='del'>-#include &lt;linux/utsname.h&gt;</div><div class='del'>-#include &lt;linux/kdebug.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/ptrace.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/unwind.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/kexec.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/timer.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/bug.h&gt;</div><div class='del'>-#include &lt;linux/nmi.h&gt;</div><div class='del'>-#include &lt;linux/mm.h&gt;</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_EDAC)</div><div class='del'>-#include &lt;linux/edac.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;asm/stacktrace.h&gt;</div><div class='del'>-#include &lt;asm/processor.h&gt;</div><div class='del'>-#include &lt;asm/debugreg.h&gt;</div><div class='del'>-#include &lt;asm/atomic.h&gt;</div><div class='del'>-#include &lt;asm/system.h&gt;</div><div class='del'>-#include &lt;asm/unwind.h&gt;</div><div class='del'>-#include &lt;asm/desc.h&gt;</div><div class='del'>-#include &lt;asm/i387.h&gt;</div><div class='del'>-#include &lt;asm/nmi.h&gt;</div><div class='del'>-#include &lt;asm/smp.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/pgalloc.h&gt;</div><div class='del'>-#include &lt;asm/proto.h&gt;</div><div class='del'>-#include &lt;asm/pda.h&gt;</div><div class='del'>-#include &lt;asm/traps.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;mach_traps.h&gt;</div><div class='del'>-</div><div class='del'>-int panic_on_unrecovered_nmi;</div><div class='del'>-int kstack_depth_to_print = 12;</div><div class='del'>-static unsigned int code_bytes = 64;</div><div class='del'>-static int ignore_nmis;</div><div class='del'>-static int die_counter;</div><div class='del'>-</div><div class='del'>-static inline void conditional_sti(struct pt_regs *regs)</div><div class='del'>-{</div><div class='del'>-	if (regs-&gt;flags &amp; X86_EFLAGS_IF)</div><div class='del'>-		local_irq_enable();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void preempt_conditional_sti(struct pt_regs *regs)</div><div class='del'>-{</div><div class='del'>-	inc_preempt_count();</div><div class='del'>-	if (regs-&gt;flags &amp; X86_EFLAGS_IF)</div><div class='del'>-		local_irq_enable();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void preempt_conditional_cli(struct pt_regs *regs)</div><div class='del'>-{</div><div class='del'>-	if (regs-&gt;flags &amp; X86_EFLAGS_IF)</div><div class='del'>-		local_irq_disable();</div><div class='del'>-	/* Make sure to not schedule here because we could be running</div><div class='del'>-	   on an exception stack. */</div><div class='del'>-	dec_preempt_count();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void printk_address(unsigned long address, int reliable)</div><div class='del'>-{</div><div class='del'>-	printk(" [&lt;%016lx&gt;] %s%pS\n", address, reliable ? "": "? ", (void *) address);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned long *in_exception_stack(unsigned cpu, unsigned long stack,</div><div class='del'>-					unsigned *usedp, char **idp)</div><div class='del'>-{</div><div class='del'>-	static char ids[][8] = {</div><div class='del'>-		[DEBUG_STACK - 1] = "#DB",</div><div class='del'>-		[NMI_STACK - 1] = "NMI",</div><div class='del'>-		[DOUBLEFAULT_STACK - 1] = "#DF",</div><div class='del'>-		[STACKFAULT_STACK - 1] = "#SS",</div><div class='del'>-		[MCE_STACK - 1] = "#MC",</div><div class='del'>-#if DEBUG_STKSZ &gt; EXCEPTION_STKSZ</div><div class='del'>-		[N_EXCEPTION_STACKS ... N_EXCEPTION_STACKS + DEBUG_STKSZ / EXCEPTION_STKSZ - 2] = "#DB[?]"</div><div class='del'>-#endif</div><div class='del'>-	};</div><div class='del'>-	unsigned k;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Iterate over all exception stacks, and figure out whether</div><div class='del'>-	 * 'stack' is in one of them:</div><div class='del'>-	 */</div><div class='del'>-	for (k = 0; k &lt; N_EXCEPTION_STACKS; k++) {</div><div class='del'>-		unsigned long end = per_cpu(orig_ist, cpu).ist[k];</div><div class='del'>-		/*</div><div class='del'>-		 * Is 'stack' above this exception frame's end?</div><div class='del'>-		 * If yes then skip to the next frame.</div><div class='del'>-		 */</div><div class='del'>-		if (stack &gt;= end)</div><div class='del'>-			continue;</div><div class='del'>-		/*</div><div class='del'>-		 * Is 'stack' above this exception frame's start address?</div><div class='del'>-		 * If yes then we found the right frame.</div><div class='del'>-		 */</div><div class='del'>-		if (stack &gt;= end - EXCEPTION_STKSZ) {</div><div class='del'>-			/*</div><div class='del'>-			 * Make sure we only iterate through an exception</div><div class='del'>-			 * stack once. If it comes up for the second time</div><div class='del'>-			 * then there's something wrong going on - just</div><div class='del'>-			 * break out and return NULL:</div><div class='del'>-			 */</div><div class='del'>-			if (*usedp &amp; (1U &lt;&lt; k))</div><div class='del'>-				break;</div><div class='del'>-			*usedp |= 1U &lt;&lt; k;</div><div class='del'>-			*idp = ids[k];</div><div class='del'>-			return (unsigned long *)end;</div><div class='del'>-		}</div><div class='del'>-		/*</div><div class='del'>-		 * If this is a debug stack, and if it has a larger size than</div><div class='del'>-		 * the usual exception stacks, then 'stack' might still</div><div class='del'>-		 * be within the lower portion of the debug stack:</div><div class='del'>-		 */</div><div class='del'>-#if DEBUG_STKSZ &gt; EXCEPTION_STKSZ</div><div class='del'>-		if (k == DEBUG_STACK - 1 &amp;&amp; stack &gt;= end - DEBUG_STKSZ) {</div><div class='del'>-			unsigned j = N_EXCEPTION_STACKS - 1;</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * Black magic. A large debug stack is composed of</div><div class='del'>-			 * multiple exception stack entries, which we</div><div class='del'>-			 * iterate through now. Dont look:</div><div class='del'>-			 */</div><div class='del'>-			do {</div><div class='del'>-				++j;</div><div class='del'>-				end -= EXCEPTION_STKSZ;</div><div class='del'>-				ids[j][4] = '1' + (j - N_EXCEPTION_STACKS);</div><div class='del'>-			} while (stack &lt; end - EXCEPTION_STKSZ);</div><div class='del'>-			if (*usedp &amp; (1U &lt;&lt; j))</div><div class='del'>-				break;</div><div class='del'>-			*usedp |= 1U &lt;&lt; j;</div><div class='del'>-			*idp = ids[j];</div><div class='del'>-			return (unsigned long *)end;</div><div class='del'>-		}</div><div class='del'>-#endif</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * x86-64 can have up to three kernel stacks: </div><div class='del'>- * process stack</div><div class='del'>- * interrupt stack</div><div class='del'>- * severe exception (double fault, nmi, stack fault, debug, mce) hardware stack</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static inline int valid_stack_ptr(struct thread_info *tinfo,</div><div class='del'>-			void *p, unsigned int size, void *end)</div><div class='del'>-{</div><div class='del'>-	void *t = tinfo;</div><div class='del'>-	if (end) {</div><div class='del'>-		if (p &lt; end &amp;&amp; p &gt;= (end-THREAD_SIZE))</div><div class='del'>-			return 1;</div><div class='del'>-		else</div><div class='del'>-			return 0;</div><div class='del'>-	}</div><div class='del'>-	return p &gt; t &amp;&amp; p &lt; t + THREAD_SIZE - size;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* The form of the top of the frame on the stack */</div><div class='del'>-struct stack_frame {</div><div class='del'>-	struct stack_frame *next_frame;</div><div class='del'>-	unsigned long return_address;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline unsigned long</div><div class='del'>-print_context_stack(struct thread_info *tinfo,</div><div class='del'>-		unsigned long *stack, unsigned long bp,</div><div class='del'>-		const struct stacktrace_ops *ops, void *data,</div><div class='del'>-		unsigned long *end)</div><div class='del'>-{</div><div class='del'>-	struct stack_frame *frame = (struct stack_frame *)bp;</div><div class='del'>-</div><div class='del'>-	while (valid_stack_ptr(tinfo, stack, sizeof(*stack), end)) {</div><div class='del'>-		unsigned long addr;</div><div class='del'>-</div><div class='del'>-		addr = *stack;</div><div class='del'>-		if (__kernel_text_address(addr)) {</div><div class='del'>-			if ((unsigned long) stack == bp + 8) {</div><div class='del'>-				ops-&gt;address(data, addr, 1);</div><div class='del'>-				frame = frame-&gt;next_frame;</div><div class='del'>-				bp = (unsigned long) frame;</div><div class='del'>-			} else {</div><div class='del'>-				ops-&gt;address(data, addr, bp == 0);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		stack++;</div><div class='del'>-	}</div><div class='del'>-	return bp;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void dump_trace(struct task_struct *task, struct pt_regs *regs,</div><div class='del'>-		unsigned long *stack, unsigned long bp,</div><div class='del'>-		const struct stacktrace_ops *ops, void *data)</div><div class='del'>-{</div><div class='del'>-	const unsigned cpu = get_cpu();</div><div class='del'>-	unsigned long *irqstack_end = (unsigned long*)cpu_pda(cpu)-&gt;irqstackptr;</div><div class='del'>-	unsigned used = 0;</div><div class='del'>-	struct thread_info *tinfo;</div><div class='del'>-</div><div class='del'>-	if (!task)</div><div class='del'>-		task = current;</div><div class='del'>-</div><div class='del'>-	if (!stack) {</div><div class='del'>-		unsigned long dummy;</div><div class='del'>-		stack = &amp;dummy;</div><div class='del'>-		if (task &amp;&amp; task != current)</div><div class='del'>-			stack = (unsigned long *)task-&gt;thread.sp;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_FRAME_POINTER</div><div class='del'>-	if (!bp) {</div><div class='del'>-		if (task == current) {</div><div class='del'>-			/* Grab bp right from our regs */</div><div class='del'>-			asm("movq %%rbp, %0" : "=r" (bp) :);</div><div class='del'>-		} else {</div><div class='del'>-			/* bp is the last reg pushed by switch_to */</div><div class='del'>-			bp = *(unsigned long *) task-&gt;thread.sp;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Print function call entries in all stacks, starting at the</div><div class='del'>-	 * current stack address. If the stacks consist of nested</div><div class='del'>-	 * exceptions</div><div class='del'>-	 */</div><div class='del'>-	tinfo = task_thread_info(task);</div><div class='del'>-	for (;;) {</div><div class='del'>-		char *id;</div><div class='del'>-		unsigned long *estack_end;</div><div class='del'>-		estack_end = in_exception_stack(cpu, (unsigned long)stack,</div><div class='del'>-						&amp;used, &amp;id);</div><div class='del'>-</div><div class='del'>-		if (estack_end) {</div><div class='del'>-			if (ops-&gt;stack(data, id) &lt; 0)</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			bp = print_context_stack(tinfo, stack, bp, ops,</div><div class='del'>-							data, estack_end);</div><div class='del'>-			ops-&gt;stack(data, "&lt;EOE&gt;");</div><div class='del'>-			/*</div><div class='del'>-			 * We link to the next stack via the</div><div class='del'>-			 * second-to-last pointer (index -2 to end) in the</div><div class='del'>-			 * exception stack:</div><div class='del'>-			 */</div><div class='del'>-			stack = (unsigned long *) estack_end[-2];</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		if (irqstack_end) {</div><div class='del'>-			unsigned long *irqstack;</div><div class='del'>-			irqstack = irqstack_end -</div><div class='del'>-				(IRQSTACKSIZE - 64) / sizeof(*irqstack);</div><div class='del'>-</div><div class='del'>-			if (stack &gt;= irqstack &amp;&amp; stack &lt; irqstack_end) {</div><div class='del'>-				if (ops-&gt;stack(data, "IRQ") &lt; 0)</div><div class='del'>-					break;</div><div class='del'>-				bp = print_context_stack(tinfo, stack, bp,</div><div class='del'>-						ops, data, irqstack_end);</div><div class='del'>-				/*</div><div class='del'>-				 * We link to the next stack (which would be</div><div class='del'>-				 * the process stack normally) the last</div><div class='del'>-				 * pointer (index -1 to end) in the IRQ stack:</div><div class='del'>-				 */</div><div class='del'>-				stack = (unsigned long *) (irqstack_end[-1]);</div><div class='del'>-				irqstack_end = NULL;</div><div class='del'>-				ops-&gt;stack(data, "EOI");</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * This handles the process stack:</div><div class='del'>-	 */</div><div class='del'>-	bp = print_context_stack(tinfo, stack, bp, ops, data, NULL);</div><div class='del'>-	put_cpu();</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(dump_trace);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-print_trace_warning_symbol(void *data, char *msg, unsigned long symbol)</div><div class='del'>-{</div><div class='del'>-	print_symbol(msg, symbol);</div><div class='del'>-	printk("\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void print_trace_warning(void *data, char *msg)</div><div class='del'>-{</div><div class='del'>-	printk("%s\n", msg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int print_trace_stack(void *data, char *name)</div><div class='del'>-{</div><div class='del'>-	printk(" &lt;%s&gt; ", name);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void print_trace_address(void *data, unsigned long addr, int reliable)</div><div class='del'>-{</div><div class='del'>-	touch_nmi_watchdog();</div><div class='del'>-	printk_address(addr, reliable);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct stacktrace_ops print_trace_ops = {</div><div class='del'>-	.warning = print_trace_warning,</div><div class='del'>-	.warning_symbol = print_trace_warning_symbol,</div><div class='del'>-	.stack = print_trace_stack,</div><div class='del'>-	.address = print_trace_address,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-show_trace_log_lvl(struct task_struct *task, struct pt_regs *regs,</div><div class='del'>-		unsigned long *stack, unsigned long bp, char *log_lvl)</div><div class='del'>-{</div><div class='del'>-	printk("\nCall Trace:\n");</div><div class='del'>-	dump_trace(task, regs, stack, bp, &amp;print_trace_ops, log_lvl);</div><div class='del'>-	printk("\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void show_trace(struct task_struct *task, struct pt_regs *regs,</div><div class='del'>-		unsigned long *stack, unsigned long bp)</div><div class='del'>-{</div><div class='del'>-	show_trace_log_lvl(task, regs, stack, bp, "");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs,</div><div class='del'>-		unsigned long *sp, unsigned long bp, char *log_lvl)</div><div class='del'>-{</div><div class='del'>-	unsigned long *stack;</div><div class='del'>-	int i;</div><div class='del'>-	const int cpu = smp_processor_id();</div><div class='del'>-	unsigned long *irqstack_end = (unsigned long *) (cpu_pda(cpu)-&gt;irqstackptr);</div><div class='del'>-	unsigned long *irqstack = (unsigned long *) (cpu_pda(cpu)-&gt;irqstackptr - IRQSTACKSIZE);</div><div class='del'>-</div><div class='del'>-	// debugging aid: "show_stack(NULL, NULL);" prints the</div><div class='del'>-	// back trace for this cpu.</div><div class='del'>-</div><div class='del'>-	if (sp == NULL) {</div><div class='del'>-		if (task)</div><div class='del'>-			sp = (unsigned long *)task-&gt;thread.sp;</div><div class='del'>-		else</div><div class='del'>-			sp = (unsigned long *)&amp;sp;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	stack = sp;</div><div class='del'>-	for (i = 0; i &lt; kstack_depth_to_print; i++) {</div><div class='del'>-		if (stack &gt;= irqstack &amp;&amp; stack &lt;= irqstack_end) {</div><div class='del'>-			if (stack == irqstack_end) {</div><div class='del'>-				stack = (unsigned long *) (irqstack_end[-1]);</div><div class='del'>-				printk(" &lt;EOI&gt; ");</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-		if (((long) stack &amp; (THREAD_SIZE-1)) == 0)</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		if (i &amp;&amp; ((i % 4) == 0))</div><div class='del'>-			printk("\n");</div><div class='del'>-		printk(" %016lx", *stack++);</div><div class='del'>-		touch_nmi_watchdog();</div><div class='del'>-	}</div><div class='del'>-	show_trace_log_lvl(task, regs, sp, bp, log_lvl);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void show_stack(struct task_struct *task, unsigned long *sp)</div><div class='del'>-{</div><div class='del'>-	show_stack_log_lvl(task, NULL, sp, 0, "");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The architecture-independent dump_stack generator</div><div class='del'>- */</div><div class='del'>-void dump_stack(void)</div><div class='del'>-{</div><div class='del'>-	unsigned long bp = 0;</div><div class='del'>-	unsigned long stack;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_FRAME_POINTER</div><div class='del'>-	if (!bp)</div><div class='del'>-		asm("movq %%rbp, %0" : "=r" (bp):);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	printk("Pid: %d, comm: %.20s %s %s %.*s\n",</div><div class='del'>-		current-&gt;pid, current-&gt;comm, print_tainted(),</div><div class='del'>-		init_utsname()-&gt;release,</div><div class='del'>-		(int)strcspn(init_utsname()-&gt;version, " "),</div><div class='del'>-		init_utsname()-&gt;version);</div><div class='del'>-	show_trace(NULL, NULL, &amp;stack, bp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(dump_stack);</div><div class='del'>-</div><div class='del'>-void show_registers(struct pt_regs *regs)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	unsigned long sp;</div><div class='del'>-	const int cpu = smp_processor_id();</div><div class='del'>-	struct task_struct *cur = cpu_pda(cpu)-&gt;pcurrent;</div><div class='del'>-</div><div class='del'>-	sp = regs-&gt;sp;</div><div class='del'>-	printk("CPU %d ", cpu);</div><div class='del'>-	__show_regs(regs);</div><div class='del'>-	printk("Process %s (pid: %d, threadinfo %p, task %p)\n",</div><div class='del'>-		cur-&gt;comm, cur-&gt;pid, task_thread_info(cur), cur);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * When in-kernel, we also print out the stack and code at the</div><div class='del'>-	 * time of the fault..</div><div class='del'>-	 */</div><div class='del'>-	if (!user_mode(regs)) {</div><div class='del'>-		unsigned int code_prologue = code_bytes * 43 / 64;</div><div class='del'>-		unsigned int code_len = code_bytes;</div><div class='del'>-		unsigned char c;</div><div class='del'>-		u8 *ip;</div><div class='del'>-</div><div class='del'>-		printk("Stack: ");</div><div class='del'>-		show_stack_log_lvl(NULL, regs, (unsigned long *)sp,</div><div class='del'>-				regs-&gt;bp, "");</div><div class='del'>-		printk("\n");</div><div class='del'>-</div><div class='del'>-		printk(KERN_EMERG "Code: ");</div><div class='del'>-</div><div class='del'>-		ip = (u8 *)regs-&gt;ip - code_prologue;</div><div class='del'>-		if (ip &lt; (u8 *)PAGE_OFFSET || probe_kernel_address(ip, c)) {</div><div class='del'>-			/* try starting at RIP */</div><div class='del'>-			ip = (u8 *)regs-&gt;ip;</div><div class='del'>-			code_len = code_len - code_prologue + 1;</div><div class='del'>-		}</div><div class='del'>-		for (i = 0; i &lt; code_len; i++, ip++) {</div><div class='del'>-			if (ip &lt; (u8 *)PAGE_OFFSET ||</div><div class='del'>-					probe_kernel_address(ip, c)) {</div><div class='del'>-				printk(" Bad RIP value.");</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			if (ip == (u8 *)regs-&gt;ip)</div><div class='del'>-				printk("&lt;%02x&gt; ", c);</div><div class='del'>-			else</div><div class='del'>-				printk("%02x ", c);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	printk("\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int is_valid_bugaddr(unsigned long ip)</div><div class='del'>-{</div><div class='del'>-	unsigned short ud2;</div><div class='del'>-</div><div class='del'>-	if (__copy_from_user(&amp;ud2, (const void __user *) ip, sizeof(ud2)))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return ud2 == 0x0b0f;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static raw_spinlock_t die_lock = __RAW_SPIN_LOCK_UNLOCKED;</div><div class='del'>-static int die_owner = -1;</div><div class='del'>-static unsigned int die_nest_count;</div><div class='del'>-</div><div class='del'>-unsigned __kprobes long oops_begin(void)</div><div class='del'>-{</div><div class='del'>-	int cpu;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	oops_enter();</div><div class='del'>-</div><div class='del'>-	/* racy, but better than risking deadlock. */</div><div class='del'>-	raw_local_irq_save(flags);</div><div class='del'>-	cpu = smp_processor_id();</div><div class='del'>-	if (!__raw_spin_trylock(&amp;die_lock)) {</div><div class='del'>-		if (cpu == die_owner) </div><div class='del'>-			/* nested oops. should stop eventually */;</div><div class='del'>-		else</div><div class='del'>-			__raw_spin_lock(&amp;die_lock);</div><div class='del'>-	}</div><div class='del'>-	die_nest_count++;</div><div class='del'>-	die_owner = cpu;</div><div class='del'>-	console_verbose();</div><div class='del'>-	bust_spinlocks(1);</div><div class='del'>-	return flags;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, int signr)</div><div class='del'>-{</div><div class='del'>-	die_owner = -1;</div><div class='del'>-	bust_spinlocks(0);</div><div class='del'>-	die_nest_count--;</div><div class='del'>-	if (!die_nest_count)</div><div class='del'>-		/* Nest count reaches zero, release the lock. */</div><div class='del'>-		__raw_spin_unlock(&amp;die_lock);</div><div class='del'>-	raw_local_irq_restore(flags);</div><div class='del'>-	if (!regs) {</div><div class='del'>-		oops_exit();</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	if (panic_on_oops)</div><div class='del'>-		panic("Fatal exception");</div><div class='del'>-	oops_exit();</div><div class='del'>-	do_exit(signr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int __kprobes __die(const char *str, struct pt_regs *regs, long err)</div><div class='del'>-{</div><div class='del'>-	printk(KERN_EMERG "%s: %04lx [%u] ", str, err &amp; 0xffff, ++die_counter);</div><div class='del'>-#ifdef CONFIG_PREEMPT</div><div class='del'>-	printk("PREEMPT ");</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_SMP</div><div class='del'>-	printk("SMP ");</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_DEBUG_PAGEALLOC</div><div class='del'>-	printk("DEBUG_PAGEALLOC");</div><div class='del'>-#endif</div><div class='del'>-	printk("\n");</div><div class='del'>-	if (notify_die(DIE_OOPS, str, regs, err,</div><div class='del'>-			current-&gt;thread.trap_no, SIGSEGV) == NOTIFY_STOP)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	show_registers(regs);</div><div class='del'>-	add_taint(TAINT_DIE);</div><div class='del'>-	/* Executive summary in case the oops scrolled away */</div><div class='del'>-	printk(KERN_ALERT "RIP ");</div><div class='del'>-	printk_address(regs-&gt;ip, 1);</div><div class='del'>-	printk(" RSP &lt;%016lx&gt;\n", regs-&gt;sp);</div><div class='del'>-	if (kexec_should_crash(current))</div><div class='del'>-		crash_kexec(regs);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void die(const char *str, struct pt_regs *regs, long err)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags = oops_begin();</div><div class='del'>-</div><div class='del'>-	if (!user_mode(regs))</div><div class='del'>-		report_bug(regs-&gt;ip, regs);</div><div class='del'>-</div><div class='del'>-	if (__die(str, regs, err))</div><div class='del'>-		regs = NULL;</div><div class='del'>-	oops_end(flags, regs, SIGSEGV);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-notrace __kprobes void</div><div class='del'>-die_nmi(char *str, struct pt_regs *regs, int do_panic)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	if (notify_die(DIE_NMIWATCHDOG, str, regs, 0, 2, SIGINT) == NOTIFY_STOP)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	flags = oops_begin();</div><div class='del'>-	/*</div><div class='del'>-	 * We are in trouble anyway, lets at least try</div><div class='del'>-	 * to get a message out.</div><div class='del'>-	 */</div><div class='del'>-	printk(KERN_EMERG "%s", str);</div><div class='del'>-	printk(" on CPU%d, ip %08lx, registers:\n",</div><div class='del'>-		smp_processor_id(), regs-&gt;ip);</div><div class='del'>-	show_registers(regs);</div><div class='del'>-	if (kexec_should_crash(current))</div><div class='del'>-		crash_kexec(regs);</div><div class='del'>-	if (do_panic || panic_on_oops)</div><div class='del'>-		panic("Non maskable interrupt");</div><div class='del'>-	oops_end(flags, NULL, SIGBUS);</div><div class='del'>-	nmi_exit();</div><div class='del'>-	local_irq_enable();</div><div class='del'>-	do_exit(SIGBUS);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __kprobes</div><div class='del'>-do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,</div><div class='del'>-	long error_code, siginfo_t *info)</div><div class='del'>-{</div><div class='del'>-	struct task_struct *tsk = current;</div><div class='del'>-</div><div class='del'>-	if (!user_mode(regs))</div><div class='del'>-		goto kernel_trap;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We want error_code and trap_no set for userspace faults and</div><div class='del'>-	 * kernelspace faults which result in die(), but not</div><div class='del'>-	 * kernelspace faults which are fixed up.  die() gives the</div><div class='del'>-	 * process no chance to handle the signal and notice the</div><div class='del'>-	 * kernel fault information, so that won't result in polluting</div><div class='del'>-	 * the information about previously queued, but not yet</div><div class='del'>-	 * delivered, faults.  See also do_general_protection below.</div><div class='del'>-	 */</div><div class='del'>-	tsk-&gt;thread.error_code = error_code;</div><div class='del'>-	tsk-&gt;thread.trap_no = trapnr;</div><div class='del'>-</div><div class='del'>-	if (show_unhandled_signals &amp;&amp; unhandled_signal(tsk, signr) &amp;&amp;</div><div class='del'>-	    printk_ratelimit()) {</div><div class='del'>-		printk(KERN_INFO</div><div class='del'>-		       "%s[%d] trap %s ip:%lx sp:%lx error:%lx",</div><div class='del'>-		       tsk-&gt;comm, tsk-&gt;pid, str,</div><div class='del'>-		       regs-&gt;ip, regs-&gt;sp, error_code);</div><div class='del'>-		print_vma_addr(" in ", regs-&gt;ip);</div><div class='del'>-		printk("\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (info)</div><div class='del'>-		force_sig_info(signr, info, tsk);</div><div class='del'>-	else</div><div class='del'>-		force_sig(signr, tsk);</div><div class='del'>-	return;</div><div class='del'>-</div><div class='del'>-kernel_trap:</div><div class='del'>-	if (!fixup_exception(regs)) {</div><div class='del'>-		tsk-&gt;thread.error_code = error_code;</div><div class='del'>-		tsk-&gt;thread.trap_no = trapnr;</div><div class='del'>-		die(str, regs, error_code);</div><div class='del'>-	}</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define DO_ERROR(trapnr, signr, str, name) \</div><div class='del'>-asmlinkage void do_##name(struct pt_regs * regs, long error_code)	\</div><div class='del'>-{									\</div><div class='del'>-	if (notify_die(DIE_TRAP, str, regs, error_code, trapnr, signr)	\</div><div class='del'>-							== NOTIFY_STOP)	\</div><div class='del'>-		return;							\</div><div class='del'>-	conditional_sti(regs);						\</div><div class='del'>-	do_trap(trapnr, signr, str, regs, error_code, NULL);		\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define DO_ERROR_INFO(trapnr, signr, str, name, sicode, siaddr)		\</div><div class='del'>-asmlinkage void do_##name(struct pt_regs * regs, long error_code)	\</div><div class='del'>-{									\</div><div class='del'>-	siginfo_t info;							\</div><div class='del'>-	info.si_signo = signr;						\</div><div class='del'>-	info.si_errno = 0;						\</div><div class='del'>-	info.si_code = sicode;						\</div><div class='del'>-	info.si_addr = (void __user *)siaddr;				\</div><div class='del'>-	trace_hardirqs_fixup();						\</div><div class='del'>-	if (notify_die(DIE_TRAP, str, regs, error_code, trapnr, signr)	\</div><div class='del'>-							== NOTIFY_STOP)	\</div><div class='del'>-		return;							\</div><div class='del'>-	conditional_sti(regs);						\</div><div class='del'>-	do_trap(trapnr, signr, str, regs, error_code, &amp;info);		\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-DO_ERROR_INFO(0, SIGFPE, "divide error", divide_error, FPE_INTDIV, regs-&gt;ip)</div><div class='del'>-DO_ERROR(4, SIGSEGV, "overflow", overflow)</div><div class='del'>-DO_ERROR(5, SIGSEGV, "bounds", bounds)</div><div class='del'>-DO_ERROR_INFO(6, SIGILL, "invalid opcode", invalid_op, ILL_ILLOPN, regs-&gt;ip)</div><div class='del'>-DO_ERROR(9, SIGFPE, "coprocessor segment overrun", coprocessor_segment_overrun)</div><div class='del'>-DO_ERROR(10, SIGSEGV, "invalid TSS", invalid_TSS)</div><div class='del'>-DO_ERROR(11, SIGBUS, "segment not present", segment_not_present)</div><div class='del'>-DO_ERROR_INFO(17, SIGBUS, "alignment check", alignment_check, BUS_ADRALN, 0)</div><div class='del'>-</div><div class='del'>-/* Runs on IST stack */</div><div class='del'>-asmlinkage void do_stack_segment(struct pt_regs *regs, long error_code)</div><div class='del'>-{</div><div class='del'>-	if (notify_die(DIE_TRAP, "stack segment", regs, error_code,</div><div class='del'>-			12, SIGBUS) == NOTIFY_STOP)</div><div class='del'>-		return;</div><div class='del'>-	preempt_conditional_sti(regs);</div><div class='del'>-	do_trap(12, SIGBUS, "stack segment", regs, error_code, NULL);</div><div class='del'>-	preempt_conditional_cli(regs);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-asmlinkage void do_double_fault(struct pt_regs * regs, long error_code)</div><div class='del'>-{</div><div class='del'>-	static const char str[] = "double fault";</div><div class='del'>-	struct task_struct *tsk = current;</div><div class='del'>-</div><div class='del'>-	/* Return not checked because double check cannot be ignored */</div><div class='del'>-	notify_die(DIE_TRAP, str, regs, error_code, 8, SIGSEGV);</div><div class='del'>-</div><div class='del'>-	tsk-&gt;thread.error_code = error_code;</div><div class='del'>-	tsk-&gt;thread.trap_no = 8;</div><div class='del'>-</div><div class='del'>-	/* This is always a kernel trap and never fixable (and thus must</div><div class='del'>-	   never return). */</div><div class='del'>-	for (;;)</div><div class='del'>-		die(str, regs, error_code);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-asmlinkage void __kprobes</div><div class='del'>-do_general_protection(struct pt_regs *regs, long error_code)</div><div class='del'>-{</div><div class='del'>-	struct task_struct *tsk;</div><div class='del'>-</div><div class='del'>-	conditional_sti(regs);</div><div class='del'>-</div><div class='del'>-	tsk = current;</div><div class='del'>-	if (!user_mode(regs))</div><div class='del'>-		goto gp_in_kernel;</div><div class='del'>-</div><div class='del'>-	tsk-&gt;thread.error_code = error_code;</div><div class='del'>-	tsk-&gt;thread.trap_no = 13;</div><div class='del'>-</div><div class='del'>-	if (show_unhandled_signals &amp;&amp; unhandled_signal(tsk, SIGSEGV) &amp;&amp;</div><div class='del'>-			printk_ratelimit()) {</div><div class='del'>-		printk(KERN_INFO</div><div class='del'>-			"%s[%d] general protection ip:%lx sp:%lx error:%lx",</div><div class='del'>-			tsk-&gt;comm, tsk-&gt;pid,</div><div class='del'>-			regs-&gt;ip, regs-&gt;sp, error_code);</div><div class='del'>-		print_vma_addr(" in ", regs-&gt;ip);</div><div class='del'>-		printk("\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	force_sig(SIGSEGV, tsk);</div><div class='del'>-	return;</div><div class='del'>-</div><div class='del'>-gp_in_kernel:</div><div class='del'>-	if (fixup_exception(regs))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	tsk-&gt;thread.error_code = error_code;</div><div class='del'>-	tsk-&gt;thread.trap_no = 13;</div><div class='del'>-	if (notify_die(DIE_GPF, "general protection fault", regs,</div><div class='del'>-				error_code, 13, SIGSEGV) == NOTIFY_STOP)</div><div class='del'>-		return;</div><div class='del'>-	die("general protection fault", regs, error_code);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static notrace __kprobes void</div><div class='del'>-mem_parity_error(unsigned char reason, struct pt_regs *regs)</div><div class='del'>-{</div><div class='del'>-	printk(KERN_EMERG "Uhhuh. NMI received for unknown reason %02x.\n",</div><div class='del'>-		reason);</div><div class='del'>-	printk(KERN_EMERG "You have some hardware problem, likely on the PCI bus.\n");</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_EDAC)</div><div class='del'>-	if (edac_handler_set()) {</div><div class='del'>-		edac_atomic_assert_error();</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (panic_on_unrecovered_nmi)</div><div class='del'>-		panic("NMI: Not continuing");</div><div class='del'>-</div><div class='del'>-	printk(KERN_EMERG "Dazed and confused, but trying to continue\n");</div><div class='del'>-</div><div class='del'>-	/* Clear and disable the memory parity error line. */</div><div class='del'>-	reason = (reason &amp; 0xf) | 4;</div><div class='del'>-	outb(reason, 0x61);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static notrace __kprobes void</div><div class='del'>-io_check_error(unsigned char reason, struct pt_regs *regs)</div><div class='del'>-{</div><div class='del'>-	printk("NMI: IOCK error (debug interrupt?)\n");</div><div class='del'>-	show_registers(regs);</div><div class='del'>-</div><div class='del'>-	/* Re-enable the IOCK line, wait for a few seconds */</div><div class='del'>-	reason = (reason &amp; 0xf) | 8;</div><div class='del'>-	outb(reason, 0x61);</div><div class='del'>-	mdelay(2000);</div><div class='del'>-	reason &amp;= ~8;</div><div class='del'>-	outb(reason, 0x61);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static notrace __kprobes void</div><div class='del'>-unknown_nmi_error(unsigned char reason, struct pt_regs * regs)</div><div class='del'>-{</div><div class='del'>-	if (notify_die(DIE_NMIUNKNOWN, "nmi", regs, reason, 2, SIGINT) == NOTIFY_STOP)</div><div class='del'>-		return;</div><div class='del'>-	printk(KERN_EMERG "Uhhuh. NMI received for unknown reason %02x.\n",</div><div class='del'>-		reason);</div><div class='del'>-	printk(KERN_EMERG "Do you have a strange power saving mode enabled?\n");</div><div class='del'>-</div><div class='del'>-	if (panic_on_unrecovered_nmi)</div><div class='del'>-		panic("NMI: Not continuing");</div><div class='del'>-</div><div class='del'>-	printk(KERN_EMERG "Dazed and confused, but trying to continue\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Runs on IST stack. This code must keep interrupts off all the time.</div><div class='del'>-   Nested NMIs are prevented by the CPU. */</div><div class='del'>-asmlinkage notrace __kprobes void default_do_nmi(struct pt_regs *regs)</div><div class='del'>-{</div><div class='del'>-	unsigned char reason = 0;</div><div class='del'>-	int cpu;</div><div class='del'>-</div><div class='del'>-	cpu = smp_processor_id();</div><div class='del'>-</div><div class='del'>-	/* Only the BSP gets external NMIs from the system. */</div><div class='del'>-	if (!cpu)</div><div class='del'>-		reason = get_nmi_reason();</div><div class='del'>-</div><div class='del'>-	if (!(reason &amp; 0xc0)) {</div><div class='del'>-		if (notify_die(DIE_NMI_IPI, "nmi_ipi", regs, reason, 2, SIGINT)</div><div class='del'>-								== NOTIFY_STOP)</div><div class='del'>-			return;</div><div class='del'>-		/*</div><div class='del'>-		 * Ok, so this is none of the documented NMI sources,</div><div class='del'>-		 * so it must be the NMI watchdog.</div><div class='del'>-		 */</div><div class='del'>-		if (nmi_watchdog_tick(regs, reason))</div><div class='del'>-			return;</div><div class='del'>-		if (!do_nmi_callback(regs, cpu))</div><div class='del'>-			unknown_nmi_error(reason, regs);</div><div class='del'>-</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	if (notify_die(DIE_NMI, "nmi", regs, reason, 2, SIGINT) == NOTIFY_STOP)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* AK: following checks seem to be broken on modern chipsets. FIXME */</div><div class='del'>-	if (reason &amp; 0x80)</div><div class='del'>-		mem_parity_error(reason, regs);</div><div class='del'>-	if (reason &amp; 0x40)</div><div class='del'>-		io_check_error(reason, regs);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-asmlinkage notrace __kprobes void</div><div class='del'>-do_nmi(struct pt_regs *regs, long error_code)</div><div class='del'>-{</div><div class='del'>-	nmi_enter();</div><div class='del'>-</div><div class='del'>-	add_pda(__nmi_count, 1);</div><div class='del'>-</div><div class='del'>-	if (!ignore_nmis)</div><div class='del'>-		default_do_nmi(regs);</div><div class='del'>-</div><div class='del'>-	nmi_exit();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void stop_nmi(void)</div><div class='del'>-{</div><div class='del'>-	acpi_nmi_disable();</div><div class='del'>-	ignore_nmis++;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void restart_nmi(void)</div><div class='del'>-{</div><div class='del'>-	ignore_nmis--;</div><div class='del'>-	acpi_nmi_enable();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* runs on IST stack. */</div><div class='del'>-asmlinkage void __kprobes do_int3(struct pt_regs *regs, long error_code)</div><div class='del'>-{</div><div class='del'>-	trace_hardirqs_fixup();</div><div class='del'>-</div><div class='del'>-	if (notify_die(DIE_INT3, "int3", regs, error_code, 3, SIGTRAP)</div><div class='del'>-			== NOTIFY_STOP)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	preempt_conditional_sti(regs);</div><div class='del'>-	do_trap(3, SIGTRAP, "int3", regs, error_code, NULL);</div><div class='del'>-	preempt_conditional_cli(regs);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Help handler running on IST stack to switch back to user stack</div><div class='del'>-   for scheduling or signal handling. The actual stack switch is done in</div><div class='del'>-   entry.S */</div><div class='del'>-asmlinkage __kprobes struct pt_regs *sync_regs(struct pt_regs *eregs)</div><div class='del'>-{</div><div class='del'>-	struct pt_regs *regs = eregs;</div><div class='del'>-	/* Did already sync */</div><div class='del'>-	if (eregs == (struct pt_regs *)eregs-&gt;sp)</div><div class='del'>-		;</div><div class='del'>-	/* Exception from user space */</div><div class='del'>-	else if (user_mode(eregs))</div><div class='del'>-		regs = task_pt_regs(current);</div><div class='del'>-	/* Exception from kernel and interrupts are enabled. Move to</div><div class='del'>- 	   kernel process stack. */</div><div class='del'>-	else if (eregs-&gt;flags &amp; X86_EFLAGS_IF)</div><div class='del'>-		regs = (struct pt_regs *)(eregs-&gt;sp -= sizeof(struct pt_regs));</div><div class='del'>-	if (eregs != regs)</div><div class='del'>-		*regs = *eregs;</div><div class='del'>-	return regs;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* runs on IST stack. */</div><div class='del'>-asmlinkage void __kprobes do_debug(struct pt_regs * regs,</div><div class='del'>-				   unsigned long error_code)</div><div class='del'>-{</div><div class='del'>-	struct task_struct *tsk = current;</div><div class='del'>-	unsigned long condition;</div><div class='del'>-	siginfo_t info;</div><div class='del'>-</div><div class='del'>-	trace_hardirqs_fixup();</div><div class='del'>-</div><div class='del'>-	get_debugreg(condition, 6);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * The processor cleared BTF, so don't mark that we need it set.</div><div class='del'>-	 */</div><div class='del'>-	clear_tsk_thread_flag(tsk, TIF_DEBUGCTLMSR);</div><div class='del'>-	tsk-&gt;thread.debugctlmsr = 0;</div><div class='del'>-</div><div class='del'>-	if (notify_die(DIE_DEBUG, "debug", regs, condition, error_code,</div><div class='del'>-						SIGTRAP) == NOTIFY_STOP)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	preempt_conditional_sti(regs);</div><div class='del'>-</div><div class='del'>-	/* Mask out spurious debug traps due to lazy DR7 setting */</div><div class='del'>-	if (condition &amp; (DR_TRAP0|DR_TRAP1|DR_TRAP2|DR_TRAP3)) {</div><div class='del'>-		if (!tsk-&gt;thread.debugreg7)</div><div class='del'>-			goto clear_dr7;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	tsk-&gt;thread.debugreg6 = condition;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Single-stepping through TF: make sure we ignore any events in</div><div class='del'>-	 * kernel space (but re-enable TF when returning to user mode).</div><div class='del'>-	 */</div><div class='del'>-	if (condition &amp; DR_STEP) {</div><div class='del'>-		if (!user_mode(regs))</div><div class='del'>-			goto clear_TF_reenable;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Ok, finally something we can handle */</div><div class='del'>-	tsk-&gt;thread.trap_no = 1;</div><div class='del'>-	tsk-&gt;thread.error_code = error_code;</div><div class='del'>-	info.si_signo = SIGTRAP;</div><div class='del'>-	info.si_errno = 0;</div><div class='del'>-	info.si_code = TRAP_BRKPT;</div><div class='del'>-	info.si_addr = user_mode(regs) ? (void __user *)regs-&gt;ip : NULL;</div><div class='del'>-	force_sig_info(SIGTRAP, &amp;info, tsk);</div><div class='del'>-</div><div class='del'>-clear_dr7:</div><div class='del'>-	set_debugreg(0, 7);</div><div class='del'>-	preempt_conditional_cli(regs);</div><div class='del'>-	return;</div><div class='del'>-</div><div class='del'>-clear_TF_reenable:</div><div class='del'>-	set_tsk_thread_flag(tsk, TIF_SINGLESTEP);</div><div class='del'>-	regs-&gt;flags &amp;= ~X86_EFLAGS_TF;</div><div class='del'>-	preempt_conditional_cli(regs);</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int kernel_math_error(struct pt_regs *regs, const char *str, int trapnr)</div><div class='del'>-{</div><div class='del'>-	if (fixup_exception(regs))</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	notify_die(DIE_GPF, str, regs, 0, trapnr, SIGFPE);</div><div class='del'>-	/* Illegal floating point operation in the kernel */</div><div class='del'>-	current-&gt;thread.trap_no = trapnr;</div><div class='del'>-	die(str, regs, 0);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Note that we play around with the 'TS' bit in an attempt to get</div><div class='del'>- * the correct behaviour even in the presence of the asynchronous</div><div class='del'>- * IRQ13 behaviour</div><div class='del'>- */</div><div class='del'>-asmlinkage void do_coprocessor_error(struct pt_regs *regs)</div><div class='del'>-{</div><div class='del'>-	void __user *ip = (void __user *)(regs-&gt;ip);</div><div class='del'>-	struct task_struct *task;</div><div class='del'>-	siginfo_t info;</div><div class='del'>-	unsigned short cwd, swd;</div><div class='del'>-</div><div class='del'>-	conditional_sti(regs);</div><div class='del'>-	if (!user_mode(regs) &amp;&amp;</div><div class='del'>-	    kernel_math_error(regs, "kernel x87 math error", 16))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Save the info for the exception handler and clear the error.</div><div class='del'>-	 */</div><div class='del'>-	task = current;</div><div class='del'>-	save_init_fpu(task);</div><div class='del'>-	task-&gt;thread.trap_no = 16;</div><div class='del'>-	task-&gt;thread.error_code = 0;</div><div class='del'>-	info.si_signo = SIGFPE;</div><div class='del'>-	info.si_errno = 0;</div><div class='del'>-	info.si_code = __SI_FAULT;</div><div class='del'>-	info.si_addr = ip;</div><div class='del'>-	/*</div><div class='del'>-	 * (~cwd &amp; swd) will mask out exceptions that are not set to unmasked</div><div class='del'>-	 * status.  0x3f is the exception bits in these regs, 0x200 is the</div><div class='del'>-	 * C1 reg you need in case of a stack fault, 0x040 is the stack</div><div class='del'>-	 * fault bit.  We should only be taking one exception at a time,</div><div class='del'>-	 * so if this combination doesn't produce any single exception,</div><div class='del'>-	 * then we have a bad program that isn't synchronizing its FPU usage</div><div class='del'>-	 * and it will suffer the consequences since we won't be able to</div><div class='del'>-	 * fully reproduce the context of the exception</div><div class='del'>-	 */</div><div class='del'>-	cwd = get_fpu_cwd(task);</div><div class='del'>-	swd = get_fpu_swd(task);</div><div class='del'>-	switch (swd &amp; ~cwd &amp; 0x3f) {</div><div class='del'>-	case 0x000: /* No unmasked exception */</div><div class='del'>-	default: /* Multiple exceptions */</div><div class='del'>-		break;</div><div class='del'>-	case 0x001: /* Invalid Op */</div><div class='del'>-		/*</div><div class='del'>-		 * swd &amp; 0x240 == 0x040: Stack Underflow</div><div class='del'>-		 * swd &amp; 0x240 == 0x240: Stack Overflow</div><div class='del'>-		 * User must clear the SF bit (0x40) if set</div><div class='del'>-		 */</div><div class='del'>-		info.si_code = FPE_FLTINV;</div><div class='del'>-		break;</div><div class='del'>-	case 0x002: /* Denormalize */</div><div class='del'>-	case 0x010: /* Underflow */</div><div class='del'>-		info.si_code = FPE_FLTUND;</div><div class='del'>-		break;</div><div class='del'>-	case 0x004: /* Zero Divide */</div><div class='del'>-		info.si_code = FPE_FLTDIV;</div><div class='del'>-		break;</div><div class='del'>-	case 0x008: /* Overflow */</div><div class='del'>-		info.si_code = FPE_FLTOVF;</div><div class='del'>-		break;</div><div class='del'>-	case 0x020: /* Precision */</div><div class='del'>-		info.si_code = FPE_FLTRES;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	force_sig_info(SIGFPE, &amp;info, task);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-asmlinkage void bad_intr(void)</div><div class='del'>-{</div><div class='del'>-	printk("bad interrupt"); </div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-asmlinkage void do_simd_coprocessor_error(struct pt_regs *regs)</div><div class='del'>-{</div><div class='del'>-	void __user *ip = (void __user *)(regs-&gt;ip);</div><div class='del'>-	struct task_struct *task;</div><div class='del'>-	siginfo_t info;</div><div class='del'>-	unsigned short mxcsr;</div><div class='del'>-</div><div class='del'>-	conditional_sti(regs);</div><div class='del'>-	if (!user_mode(regs) &amp;&amp;</div><div class='del'>-        	kernel_math_error(regs, "kernel simd math error", 19))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Save the info for the exception handler and clear the error.</div><div class='del'>-	 */</div><div class='del'>-	task = current;</div><div class='del'>-	save_init_fpu(task);</div><div class='del'>-	task-&gt;thread.trap_no = 19;</div><div class='del'>-	task-&gt;thread.error_code = 0;</div><div class='del'>-	info.si_signo = SIGFPE;</div><div class='del'>-	info.si_errno = 0;</div><div class='del'>-	info.si_code = __SI_FAULT;</div><div class='del'>-	info.si_addr = ip;</div><div class='del'>-	/*</div><div class='del'>-	 * The SIMD FPU exceptions are handled a little differently, as there</div><div class='del'>-	 * is only a single status/control register.  Thus, to determine which</div><div class='del'>-	 * unmasked exception was caught we must mask the exception mask bits</div><div class='del'>-	 * at 0x1f80, and then use these to mask the exception bits at 0x3f.</div><div class='del'>-	 */</div><div class='del'>-	mxcsr = get_fpu_mxcsr(task);</div><div class='del'>-	switch (~((mxcsr &amp; 0x1f80) &gt;&gt; 7) &amp; (mxcsr &amp; 0x3f)) {</div><div class='del'>-	case 0x000:</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	case 0x001: /* Invalid Op */</div><div class='del'>-		info.si_code = FPE_FLTINV;</div><div class='del'>-		break;</div><div class='del'>-	case 0x002: /* Denormalize */</div><div class='del'>-	case 0x010: /* Underflow */</div><div class='del'>-		info.si_code = FPE_FLTUND;</div><div class='del'>-		break;</div><div class='del'>-	case 0x004: /* Zero Divide */</div><div class='del'>-		info.si_code = FPE_FLTDIV;</div><div class='del'>-		break;</div><div class='del'>-	case 0x008: /* Overflow */</div><div class='del'>-		info.si_code = FPE_FLTOVF;</div><div class='del'>-		break;</div><div class='del'>-	case 0x020: /* Precision */</div><div class='del'>-		info.si_code = FPE_FLTRES;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	force_sig_info(SIGFPE, &amp;info, task);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-asmlinkage void do_spurious_interrupt_bug(struct pt_regs * regs)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-asmlinkage void __attribute__((weak)) smp_thermal_interrupt(void)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-asmlinkage void __attribute__((weak)) mce_threshold_interrupt(void)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 'math_state_restore()' saves the current math information in the</div><div class='del'>- * old math state array, and gets the new ones from the current task</div><div class='del'>- *</div><div class='del'>- * Careful.. There are problems with IBM-designed IRQ13 behaviour.</div><div class='del'>- * Don't touch unless you *really* know how it works.</div><div class='del'>- */</div><div class='del'>-asmlinkage void math_state_restore(void)</div><div class='del'>-{</div><div class='del'>-	struct task_struct *me = current;</div><div class='del'>-</div><div class='del'>-	if (!used_math()) {</div><div class='del'>-		local_irq_enable();</div><div class='del'>-		/*</div><div class='del'>-		 * does a slab alloc which can sleep</div><div class='del'>-		 */</div><div class='del'>-		if (init_fpu(me)) {</div><div class='del'>-			/*</div><div class='del'>-			 * ran out of memory!</div><div class='del'>-			 */</div><div class='del'>-			do_group_exit(SIGKILL);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		local_irq_disable();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	clts();				/* Allow maths ops (or we recurse) */</div><div class='del'>-	/*</div><div class='del'>-	 * Paranoid restore. send a SIGSEGV if we fail to restore the state.</div><div class='del'>-	 */</div><div class='del'>-	if (unlikely(restore_fpu_checking(&amp;me-&gt;thread.xstate-&gt;fxsave))) {</div><div class='del'>-		stts();</div><div class='del'>-		force_sig(SIGSEGV, me);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	task_thread_info(me)-&gt;status |= TS_USEDFPU;</div><div class='del'>-	me-&gt;fpu_counter++;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(math_state_restore);</div><div class='del'>-</div><div class='del'>-void __init trap_init(void)</div><div class='del'>-{</div><div class='del'>-	set_intr_gate(0, &amp;divide_error);</div><div class='del'>-	set_intr_gate_ist(1, &amp;debug, DEBUG_STACK);</div><div class='del'>-	set_intr_gate_ist(2, &amp;nmi, NMI_STACK);</div><div class='del'>- 	set_system_gate_ist(3, &amp;int3, DEBUG_STACK); /* int3 can be called from all */</div><div class='del'>-	set_system_gate(4, &amp;overflow); /* int4 can be called from all */</div><div class='del'>-	set_intr_gate(5, &amp;bounds);</div><div class='del'>-	set_intr_gate(6, &amp;invalid_op);</div><div class='del'>-	set_intr_gate(7, &amp;device_not_available);</div><div class='del'>-	set_intr_gate_ist(8, &amp;double_fault, DOUBLEFAULT_STACK);</div><div class='del'>-	set_intr_gate(9, &amp;coprocessor_segment_overrun);</div><div class='del'>-	set_intr_gate(10, &amp;invalid_TSS);</div><div class='del'>-	set_intr_gate(11, &amp;segment_not_present);</div><div class='del'>-	set_intr_gate_ist(12, &amp;stack_segment, STACKFAULT_STACK);</div><div class='del'>-	set_intr_gate(13, &amp;general_protection);</div><div class='del'>-	set_intr_gate(14, &amp;page_fault);</div><div class='del'>-	set_intr_gate(15, &amp;spurious_interrupt_bug);</div><div class='del'>-	set_intr_gate(16, &amp;coprocessor_error);</div><div class='del'>-	set_intr_gate(17, &amp;alignment_check);</div><div class='del'>-#ifdef CONFIG_X86_MCE</div><div class='del'>-	set_intr_gate_ist(18, &amp;machine_check, MCE_STACK);</div><div class='del'>-#endif</div><div class='del'>-	set_intr_gate(19, &amp;simd_coprocessor_error);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_IA32_EMULATION</div><div class='del'>-	set_system_gate(IA32_SYSCALL_VECTOR, ia32_syscall);</div><div class='del'>-#endif</div><div class='del'>-	/*</div><div class='del'>-	 * initialize the per thread extended state:</div><div class='del'>-	 */</div><div class='del'>-	init_thread_xstate();</div><div class='del'>-	/*</div><div class='del'>-	 * Should be a barrier for any external CPU state:</div><div class='del'>-	 */</div><div class='del'>-	cpu_init();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init oops_setup(char *s)</div><div class='del'>-{</div><div class='del'>-	if (!s)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	if (!strcmp(s, "panic"))</div><div class='del'>-		panic_on_oops = 1;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-early_param("oops", oops_setup);</div><div class='del'>-</div><div class='del'>-static int __init kstack_setup(char *s)</div><div class='del'>-{</div><div class='del'>-	if (!s)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	kstack_depth_to_print = simple_strtoul(s, NULL, 0);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-early_param("kstack", kstack_setup);</div><div class='del'>-</div><div class='del'>-static int __init code_bytes_setup(char *s)</div><div class='del'>-{</div><div class='del'>-	code_bytes = simple_strtoul(s, NULL, 0);</div><div class='del'>-	if (code_bytes &gt; 8192)</div><div class='del'>-		code_bytes = 8192;</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-__setup("code_bytes=", code_bytes_setup);</div><div class='head'>diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c<br/>index 8f98e9de1b82..161bb850fc47 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/tsc.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/tsc.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/tsc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/tsc.c</a></div><div class='hunk'>@@ -104,7 +104,7 @@ __setup("notsc", notsc_setup);</div><div class='ctx'> /*</div><div class='ctx'>  * Read TSC and the reference counters. Take care of SMI disturbance</div><div class='ctx'>  */</div><div class='del'>-static u64 tsc_read_refs(u64 *pm, u64 *hpet)</div><div class='add'>+static u64 tsc_read_refs(u64 *p, int hpet)</div><div class='ctx'> {</div><div class='ctx'> 	u64 t1, t2;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -112,9 +112,9 @@ static u64 tsc_read_refs(u64 *pm, u64 *hpet)</div><div class='ctx'> 	for (i = 0; i &lt; MAX_RETRIES; i++) {</div><div class='ctx'> 		t1 = get_cycles();</div><div class='ctx'> 		if (hpet)</div><div class='del'>-			*hpet = hpet_readl(HPET_COUNTER) &amp; 0xFFFFFFFF;</div><div class='add'>+			*p = hpet_readl(HPET_COUNTER) &amp; 0xFFFFFFFF;</div><div class='ctx'> 		else</div><div class='del'>-			*pm = acpi_pm_read_early();</div><div class='add'>+			*p = acpi_pm_read_early();</div><div class='ctx'> 		t2 = get_cycles();</div><div class='ctx'> 		if ((t2 - t1) &lt; SMI_TRESHOLD)</div><div class='ctx'> 			return t2;</div><div class='hunk'>@@ -123,13 +123,59 @@ static u64 tsc_read_refs(u64 *pm, u64 *hpet)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Calculate the TSC frequency from HPET reference</div><div class='add'>+ */</div><div class='add'>+static unsigned long calc_hpet_ref(u64 deltatsc, u64 hpet1, u64 hpet2)</div><div class='add'>+{</div><div class='add'>+	u64 tmp;</div><div class='add'>+</div><div class='add'>+	if (hpet2 &lt; hpet1)</div><div class='add'>+		hpet2 += 0x100000000ULL;</div><div class='add'>+	hpet2 -= hpet1;</div><div class='add'>+	tmp = ((u64)hpet2 * hpet_readl(HPET_PERIOD));</div><div class='add'>+	do_div(tmp, 1000000);</div><div class='add'>+	do_div(deltatsc, tmp);</div><div class='add'>+</div><div class='add'>+	return (unsigned long) deltatsc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Calculate the TSC frequency from PMTimer reference</div><div class='add'>+ */</div><div class='add'>+static unsigned long calc_pmtimer_ref(u64 deltatsc, u64 pm1, u64 pm2)</div><div class='add'>+{</div><div class='add'>+	u64 tmp;</div><div class='add'>+</div><div class='add'>+	if (!pm1 &amp;&amp; !pm2)</div><div class='add'>+		return ULONG_MAX;</div><div class='add'>+</div><div class='add'>+	if (pm2 &lt; pm1)</div><div class='add'>+		pm2 += (u64)ACPI_PM_OVRRUN;</div><div class='add'>+	pm2 -= pm1;</div><div class='add'>+	tmp = pm2 * 1000000000LL;</div><div class='add'>+	do_div(tmp, PMTMR_TICKS_PER_SEC);</div><div class='add'>+	do_div(deltatsc, tmp);</div><div class='add'>+</div><div class='add'>+	return (unsigned long) deltatsc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define CAL_MS		10</div><div class='add'>+#define CAL_LATCH	(CLOCK_TICK_RATE / (1000 / CAL_MS))</div><div class='add'>+#define CAL_PIT_LOOPS	1000</div><div class='add'>+</div><div class='add'>+#define CAL2_MS		50</div><div class='add'>+#define CAL2_LATCH	(CLOCK_TICK_RATE / (1000 / CAL2_MS))</div><div class='add'>+#define CAL2_PIT_LOOPS	5000</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Try to calibrate the TSC against the Programmable</div><div class='ctx'>  * Interrupt Timer and return the frequency of the TSC</div><div class='ctx'>  * in kHz.</div><div class='ctx'>  *</div><div class='ctx'>  * Return ULONG_MAX on failure to calibrate.</div><div class='ctx'>  */</div><div class='del'>-static unsigned long pit_calibrate_tsc(void)</div><div class='add'>+static unsigned long pit_calibrate_tsc(u32 latch, unsigned long ms, int loopmin)</div><div class='ctx'> {</div><div class='ctx'> 	u64 tsc, t1, t2, delta;</div><div class='ctx'> 	unsigned long tscmin, tscmax;</div><div class='hunk'>@@ -144,8 +190,8 @@ static unsigned long pit_calibrate_tsc(void)</div><div class='ctx'> 	 * (LSB then MSB) to begin countdown.</div><div class='ctx'> 	 */</div><div class='ctx'> 	outb(0xb0, 0x43);</div><div class='del'>-	outb((CLOCK_TICK_RATE / (1000 / 50)) &amp; 0xff, 0x42);</div><div class='del'>-	outb((CLOCK_TICK_RATE / (1000 / 50)) &gt;&gt; 8, 0x42);</div><div class='add'>+	outb(latch &amp; 0xff, 0x42);</div><div class='add'>+	outb(latch &gt;&gt; 8, 0x42);</div><div class='ctx'> </div><div class='ctx'> 	tsc = t1 = t2 = get_cycles();</div><div class='ctx'> </div><div class='hunk'>@@ -166,31 +212,154 @@ static unsigned long pit_calibrate_tsc(void)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Sanity checks:</div><div class='ctx'> 	 *</div><div class='del'>-	 * If we were not able to read the PIT more than 5000</div><div class='add'>+	 * If we were not able to read the PIT more than loopmin</div><div class='ctx'> 	 * times, then we have been hit by a massive SMI</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * If the maximum is 10 times larger than the minimum,</div><div class='ctx'> 	 * then we got hit by an SMI as well.</div><div class='ctx'> 	 */</div><div class='del'>-	if (pitcnt &lt; 5000 || tscmax &gt; 10 * tscmin)</div><div class='add'>+	if (pitcnt &lt; loopmin || tscmax &gt; 10 * tscmin)</div><div class='ctx'> 		return ULONG_MAX;</div><div class='ctx'> </div><div class='ctx'> 	/* Calculate the PIT value */</div><div class='ctx'> 	delta = t2 - t1;</div><div class='del'>-	do_div(delta, 50);</div><div class='add'>+	do_div(delta, ms);</div><div class='ctx'> 	return delta;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * This reads the current MSB of the PIT counter, and</div><div class='add'>+ * checks if we are running on sufficiently fast and</div><div class='add'>+ * non-virtualized hardware.</div><div class='add'>+ *</div><div class='add'>+ * Our expectations are:</div><div class='add'>+ *</div><div class='add'>+ *  - the PIT is running at roughly 1.19MHz</div><div class='add'>+ *</div><div class='add'>+ *  - each IO is going to take about 1us on real hardware,</div><div class='add'>+ *    but we allow it to be much faster (by a factor of 10) or</div><div class='add'>+ *    _slightly_ slower (ie we allow up to a 2us read+counter</div><div class='add'>+ *    update - anything else implies a unacceptably slow CPU</div><div class='add'>+ *    or PIT for the fast calibration to work.</div><div class='add'>+ *</div><div class='add'>+ *  - with 256 PIT ticks to read the value, we have 214us to</div><div class='add'>+ *    see the same MSB (and overhead like doing a single TSC</div><div class='add'>+ *    read per MSB value etc).</div><div class='add'>+ *</div><div class='add'>+ *  - We're doing 2 reads per loop (LSB, MSB), and we expect</div><div class='add'>+ *    them each to take about a microsecond on real hardware.</div><div class='add'>+ *    So we expect a count value of around 100. But we'll be</div><div class='add'>+ *    generous, and accept anything over 50.</div><div class='add'>+ *</div><div class='add'>+ *  - if the PIT is stuck, and we see *many* more reads, we</div><div class='add'>+ *    return early (and the next caller of pit_expect_msb()</div><div class='add'>+ *    then consider it a failure when they don't see the</div><div class='add'>+ *    next expected value).</div><div class='add'>+ *</div><div class='add'>+ * These expectations mean that we know that we have seen the</div><div class='add'>+ * transition from one expected value to another with a fairly</div><div class='add'>+ * high accuracy, and we didn't miss any events. We can thus</div><div class='add'>+ * use the TSC value at the transitions to calculate a pretty</div><div class='add'>+ * good value for the TSC frequencty.</div><div class='add'>+ */</div><div class='add'>+static inline int pit_expect_msb(unsigned char val)</div><div class='add'>+{</div><div class='add'>+	int count = 0;</div><div class='add'>+</div><div class='add'>+	for (count = 0; count &lt; 50000; count++) {</div><div class='add'>+		/* Ignore LSB */</div><div class='add'>+		inb(0x42);</div><div class='add'>+		if (inb(0x42) != val)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	return count &gt; 50;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * How many MSB values do we want to see? We aim for a</div><div class='add'>+ * 15ms calibration, which assuming a 2us counter read</div><div class='add'>+ * error should give us roughly 150 ppm precision for</div><div class='add'>+ * the calibration.</div><div class='add'>+ */</div><div class='add'>+#define QUICK_PIT_MS 15</div><div class='add'>+#define QUICK_PIT_ITERATIONS (QUICK_PIT_MS * PIT_TICK_RATE / 1000 / 256)</div><div class='add'>+</div><div class='add'>+static unsigned long quick_pit_calibrate(void)</div><div class='add'>+{</div><div class='add'>+	/* Set the Gate high, disable speaker */</div><div class='add'>+	outb((inb(0x61) &amp; ~0x02) | 0x01, 0x61);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Counter 2, mode 0 (one-shot), binary count</div><div class='add'>+	 *</div><div class='add'>+	 * NOTE! Mode 2 decrements by two (and then the</div><div class='add'>+	 * output is flipped each time, giving the same</div><div class='add'>+	 * final output frequency as a decrement-by-one),</div><div class='add'>+	 * so mode 0 is much better when looking at the</div><div class='add'>+	 * individual counts.</div><div class='add'>+	 */</div><div class='add'>+	outb(0xb0, 0x43);</div><div class='add'>+</div><div class='add'>+	/* Start at 0xffff */</div><div class='add'>+	outb(0xff, 0x42);</div><div class='add'>+	outb(0xff, 0x42);</div><div class='add'>+</div><div class='add'>+	if (pit_expect_msb(0xff)) {</div><div class='add'>+		int i;</div><div class='add'>+		u64 t1, t2, delta;</div><div class='add'>+		unsigned char expect = 0xfe;</div><div class='add'>+</div><div class='add'>+		t1 = get_cycles();</div><div class='add'>+		for (i = 0; i &lt; QUICK_PIT_ITERATIONS; i++, expect--) {</div><div class='add'>+			if (!pit_expect_msb(expect))</div><div class='add'>+				goto failed;</div><div class='add'>+		}</div><div class='add'>+		t2 = get_cycles();</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Make sure we can rely on the second TSC timestamp:</div><div class='add'>+		 */</div><div class='add'>+		if (!pit_expect_msb(expect))</div><div class='add'>+			goto failed;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Ok, if we get here, then we've seen the</div><div class='add'>+		 * MSB of the PIT decrement QUICK_PIT_ITERATIONS</div><div class='add'>+		 * times, and each MSB had many hits, so we never</div><div class='add'>+		 * had any sudden jumps.</div><div class='add'>+		 *</div><div class='add'>+		 * As a result, we can depend on there not being</div><div class='add'>+		 * any odd delays anywhere, and the TSC reads are</div><div class='add'>+		 * reliable.</div><div class='add'>+		 *</div><div class='add'>+		 * kHz = ticks / time-in-seconds / 1000;</div><div class='add'>+		 * kHz = (t2 - t1) / (QPI * 256 / PIT_TICK_RATE) / 1000</div><div class='add'>+		 * kHz = ((t2 - t1) * PIT_TICK_RATE) / (QPI * 256 * 1000)</div><div class='add'>+		 */</div><div class='add'>+		delta = (t2 - t1)*PIT_TICK_RATE;</div><div class='add'>+		do_div(delta, QUICK_PIT_ITERATIONS*256*1000);</div><div class='add'>+		printk("Fast TSC calibration using PIT\n");</div><div class='add'>+		return delta;</div><div class='add'>+	}</div><div class='add'>+failed:</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * native_calibrate_tsc - calibrate the tsc on boot</div><div class='ctx'>  */</div><div class='ctx'> unsigned long native_calibrate_tsc(void)</div><div class='ctx'> {</div><div class='del'>-	u64 tsc1, tsc2, delta, pm1, pm2, hpet1, hpet2;</div><div class='add'>+	u64 tsc1, tsc2, delta, ref1, ref2;</div><div class='ctx'> 	unsigned long tsc_pit_min = ULONG_MAX, tsc_ref_min = ULONG_MAX;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int hpet = is_hpet_enabled(), i;</div><div class='add'>+	unsigned long flags, latch, ms, fast_calibrate;</div><div class='add'>+	int hpet = is_hpet_enabled(), i, loopmin;</div><div class='add'>+</div><div class='add'>+	local_irq_save(flags);</div><div class='add'>+	fast_calibrate = quick_pit_calibrate();</div><div class='add'>+	local_irq_restore(flags);</div><div class='add'>+	if (fast_calibrate)</div><div class='add'>+		return fast_calibrate;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Run 5 calibration loops to get the lowest frequency value</div><div class='hunk'>@@ -216,7 +385,13 @@ unsigned long native_calibrate_tsc(void)</div><div class='ctx'> 	 * calibration delay loop as we have to wait for a certain</div><div class='ctx'> 	 * amount of time anyway.</div><div class='ctx'> 	 */</div><div class='del'>-	for (i = 0; i &lt; 5; i++) {</div><div class='add'>+</div><div class='add'>+	/* Preset PIT loop values */</div><div class='add'>+	latch = CAL_LATCH;</div><div class='add'>+	ms = CAL_MS;</div><div class='add'>+	loopmin = CAL_PIT_LOOPS;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 3; i++) {</div><div class='ctx'> 		unsigned long tsc_pit_khz;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='hunk'>@@ -226,16 +401,16 @@ unsigned long native_calibrate_tsc(void)</div><div class='ctx'> 		 * read the end value.</div><div class='ctx'> 		 */</div><div class='ctx'> 		local_irq_save(flags);</div><div class='del'>-		tsc1 = tsc_read_refs(&amp;pm1, hpet ? &amp;hpet1 : NULL);</div><div class='del'>-		tsc_pit_khz = pit_calibrate_tsc();</div><div class='del'>-		tsc2 = tsc_read_refs(&amp;pm2, hpet ? &amp;hpet2 : NULL);</div><div class='add'>+		tsc1 = tsc_read_refs(&amp;ref1, hpet);</div><div class='add'>+		tsc_pit_khz = pit_calibrate_tsc(latch, ms, loopmin);</div><div class='add'>+		tsc2 = tsc_read_refs(&amp;ref2, hpet);</div><div class='ctx'> 		local_irq_restore(flags);</div><div class='ctx'> </div><div class='ctx'> 		/* Pick the lowest PIT TSC calibration so far */</div><div class='ctx'> 		tsc_pit_min = min(tsc_pit_min, tsc_pit_khz);</div><div class='ctx'> </div><div class='ctx'> 		/* hpet or pmtimer available ? */</div><div class='del'>-		if (!hpet &amp;&amp; !pm1 &amp;&amp; !pm2)</div><div class='add'>+		if (!hpet &amp;&amp; !ref1 &amp;&amp; !ref2)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		/* Check, whether the sampling was disturbed by an SMI */</div><div class='hunk'>@@ -243,23 +418,41 @@ unsigned long native_calibrate_tsc(void)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		tsc2 = (tsc2 - tsc1) * 1000000LL;</div><div class='add'>+		if (hpet)</div><div class='add'>+			tsc2 = calc_hpet_ref(tsc2, ref1, ref2);</div><div class='add'>+		else</div><div class='add'>+			tsc2 = calc_pmtimer_ref(tsc2, ref1, ref2);</div><div class='ctx'> </div><div class='del'>-		if (hpet) {</div><div class='del'>-			if (hpet2 &lt; hpet1)</div><div class='del'>-				hpet2 += 0x100000000ULL;</div><div class='del'>-			hpet2 -= hpet1;</div><div class='del'>-			tsc1 = ((u64)hpet2 * hpet_readl(HPET_PERIOD));</div><div class='del'>-			do_div(tsc1, 1000000);</div><div class='del'>-		} else {</div><div class='del'>-			if (pm2 &lt; pm1)</div><div class='del'>-				pm2 += (u64)ACPI_PM_OVRRUN;</div><div class='del'>-			pm2 -= pm1;</div><div class='del'>-			tsc1 = pm2 * 1000000000LL;</div><div class='del'>-			do_div(tsc1, PMTMR_TICKS_PER_SEC);</div><div class='add'>+		tsc_ref_min = min(tsc_ref_min, (unsigned long) tsc2);</div><div class='add'>+</div><div class='add'>+		/* Check the reference deviation */</div><div class='add'>+		delta = ((u64) tsc_pit_min) * 100;</div><div class='add'>+		do_div(delta, tsc_ref_min);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * If both calibration results are inside a 10% window</div><div class='add'>+		 * then we can be sure, that the calibration</div><div class='add'>+		 * succeeded. We break out of the loop right away. We</div><div class='add'>+		 * use the reference value, as it is more precise.</div><div class='add'>+		 */</div><div class='add'>+		if (delta &gt;= 90 &amp;&amp; delta &lt;= 110) {</div><div class='add'>+			printk(KERN_INFO</div><div class='add'>+			       "TSC: PIT calibration matches %s. %d loops\n",</div><div class='add'>+			       hpet ? "HPET" : "PMTIMER", i + 1);</div><div class='add'>+			return tsc_ref_min;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		do_div(tsc2, tsc1);</div><div class='del'>-		tsc_ref_min = min(tsc_ref_min, (unsigned long) tsc2);</div><div class='add'>+		/*</div><div class='add'>+		 * Check whether PIT failed more than once. This</div><div class='add'>+		 * happens in virtualized environments. We need to</div><div class='add'>+		 * give the virtual PC a slightly longer timeframe for</div><div class='add'>+		 * the HPET/PMTIMER to make the result precise.</div><div class='add'>+		 */</div><div class='add'>+		if (i == 1 &amp;&amp; tsc_pit_min == ULONG_MAX) {</div><div class='add'>+			latch = CAL2_LATCH;</div><div class='add'>+			ms = CAL2_MS;</div><div class='add'>+			loopmin = CAL2_PIT_LOOPS;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -270,7 +463,7 @@ unsigned long native_calibrate_tsc(void)</div><div class='ctx'> 		printk(KERN_WARNING "TSC: Unable to calibrate against PIT\n");</div><div class='ctx'> </div><div class='ctx'> 		/* We don't have an alternative source, disable TSC */</div><div class='del'>-		if (!hpet &amp;&amp; !pm1 &amp;&amp; !pm2) {</div><div class='add'>+		if (!hpet &amp;&amp; !ref1 &amp;&amp; !ref2) {</div><div class='ctx'> 			printk("TSC: No reference (HPET/PMTIMER) available\n");</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -278,7 +471,7 @@ unsigned long native_calibrate_tsc(void)</div><div class='ctx'> 		/* The alternative source failed as well, disable TSC */</div><div class='ctx'> 		if (tsc_ref_min == ULONG_MAX) {</div><div class='ctx'> 			printk(KERN_WARNING "TSC: HPET/PMTIMER calibration "</div><div class='del'>-			       "failed due to SMI disturbance.\n");</div><div class='add'>+			       "failed.\n");</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -290,44 +483,25 @@ unsigned long native_calibrate_tsc(void)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* We don't have an alternative source, use the PIT calibration value */</div><div class='del'>-	if (!hpet &amp;&amp; !pm1 &amp;&amp; !pm2) {</div><div class='add'>+	if (!hpet &amp;&amp; !ref1 &amp;&amp; !ref2) {</div><div class='ctx'> 		printk(KERN_INFO "TSC: Using PIT calibration value\n");</div><div class='ctx'> 		return tsc_pit_min;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* The alternative source failed, use the PIT calibration value */</div><div class='ctx'> 	if (tsc_ref_min == ULONG_MAX) {</div><div class='del'>-		printk(KERN_WARNING "TSC: HPET/PMTIMER calibration failed due "</div><div class='del'>-		       "to SMI disturbance. Using PIT calibration\n");</div><div class='add'>+		printk(KERN_WARNING "TSC: HPET/PMTIMER calibration failed. "</div><div class='add'>+		       "Using PIT calibration\n");</div><div class='ctx'> 		return tsc_pit_min;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Check the reference deviation */</div><div class='del'>-	delta = ((u64) tsc_pit_min) * 100;</div><div class='del'>-	do_div(delta, tsc_ref_min);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If both calibration results are inside a 5% window, the we</div><div class='del'>-	 * use the lower frequency of those as it is probably the</div><div class='del'>-	 * closest estimate.</div><div class='del'>-	 */</div><div class='del'>-	if (delta &gt;= 95 &amp;&amp; delta &lt;= 105) {</div><div class='del'>-		printk(KERN_INFO "TSC: PIT calibration confirmed by %s.\n",</div><div class='del'>-		       hpet ? "HPET" : "PMTIMER");</div><div class='del'>-		printk(KERN_INFO "TSC: using %s calibration value\n",</div><div class='del'>-		       tsc_pit_min &lt;= tsc_ref_min ? "PIT" :</div><div class='del'>-		       hpet ? "HPET" : "PMTIMER");</div><div class='del'>-		return tsc_pit_min &lt;= tsc_ref_min ? tsc_pit_min : tsc_ref_min;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printk(KERN_WARNING "TSC: PIT calibration deviates from %s: %lu %lu.\n",</div><div class='del'>-	       hpet ? "HPET" : "PMTIMER", tsc_pit_min, tsc_ref_min);</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The calibration values differ too much. In doubt, we use</div><div class='ctx'> 	 * the PIT value as we know that there are PMTIMERs around</div><div class='del'>-	 * running at double speed.</div><div class='add'>+	 * running at double speed. At least we let the user know:</div><div class='ctx'> 	 */</div><div class='add'>+	printk(KERN_WARNING "TSC: PIT calibration deviates from %s: %lu %lu.\n",</div><div class='add'>+	       hpet ? "HPET" : "PMTIMER", tsc_pit_min, tsc_ref_min);</div><div class='ctx'> 	printk(KERN_INFO "TSC: Using PIT calibration value\n");</div><div class='ctx'> 	return tsc_pit_min;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/x86/kernel/visws_quirks.c b/arch/x86/kernel/visws_quirks.c<br/>index 594ef47f0a63..61a97e616f70 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/visws_quirks.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/visws_quirks.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/visws_quirks.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/visws_quirks.c</a></div><div class='hunk'>@@ -25,45 +25,31 @@</div><div class='ctx'> #include &lt;asm/visws/cobalt.h&gt;</div><div class='ctx'> #include &lt;asm/visws/piix4.h&gt;</div><div class='ctx'> #include &lt;asm/arch_hooks.h&gt;</div><div class='add'>+#include &lt;asm/io_apic.h&gt;</div><div class='ctx'> #include &lt;asm/fixmap.h&gt;</div><div class='ctx'> #include &lt;asm/reboot.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/e820.h&gt;</div><div class='del'>-#include &lt;asm/smp.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach_ipi.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "mach_apic.h"</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/smp.h&gt;</div><div class='del'>-</div><div class='ctx'> #include &lt;linux/kernel_stat.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/apic.h&gt;</div><div class='ctx'> #include &lt;asm/i8259.h&gt;</div><div class='ctx'> #include &lt;asm/irq_vectors.h&gt;</div><div class='del'>-#include &lt;asm/visws/cobalt.h&gt;</div><div class='ctx'> #include &lt;asm/visws/lithium.h&gt;</div><div class='del'>-#include &lt;asm/visws/piix4.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/pci_ids.h&gt;</div><div class='ctx'> </div><div class='ctx'> extern int no_broadcast;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/apic.h&gt;</div><div class='del'>-#include &lt;asm/arch_hooks.h&gt;</div><div class='del'>-#include &lt;asm/visws/cobalt.h&gt;</div><div class='del'>-#include &lt;asm/visws/lithium.h&gt;</div><div class='ctx'> </div><div class='ctx'> char visws_board_type	= -1;</div><div class='ctx'> char visws_board_rev	= -1;</div><div class='head'>diff --git a/arch/x86/kernel/vm86_32.c b/arch/x86/kernel/vm86_32.c<br/>index 38f566fa27d2..4eeb5cf9720d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/vm86_32.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/vm86_32.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/vm86_32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/vm86_32.c</a></div><div class='hunk'>@@ -46,6 +46,7 @@</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/tlbflush.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='add'>+#include &lt;asm/syscalls.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Known problems:</div><div class='head'>diff --git a/arch/x86/kernel/vmi_32.c b/arch/x86/kernel/vmi_32.c<br/>index edfb09f30479..8b6c393ab9fd 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/vmi_32.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/vmi_32.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/vmi_32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/vmi_32.c</a></div><div class='hunk'>@@ -393,13 +393,13 @@ static void *vmi_kmap_atomic_pte(struct page *page, enum km_type type)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static void vmi_allocate_pte(struct mm_struct *mm, u32 pfn)</div><div class='add'>+static void vmi_allocate_pte(struct mm_struct *mm, unsigned long pfn)</div><div class='ctx'> {</div><div class='ctx'> 	vmi_set_page_type(pfn, VMI_PAGE_L1);</div><div class='ctx'> 	vmi_ops.allocate_page(pfn, VMI_PAGE_L1, 0, 0, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void vmi_allocate_pmd(struct mm_struct *mm, u32 pfn)</div><div class='add'>+static void vmi_allocate_pmd(struct mm_struct *mm, unsigned long pfn)</div><div class='ctx'> {</div><div class='ctx'>  	/*</div><div class='ctx'> 	 * This call comes in very early, before mem_map is setup.</div><div class='hunk'>@@ -410,20 +410,20 @@ static void vmi_allocate_pmd(struct mm_struct *mm, u32 pfn)</div><div class='ctx'> 	vmi_ops.allocate_page(pfn, VMI_PAGE_L2, 0, 0, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void vmi_allocate_pmd_clone(u32 pfn, u32 clonepfn, u32 start, u32 count)</div><div class='add'>+static void vmi_allocate_pmd_clone(unsigned long pfn, unsigned long clonepfn, unsigned long start, unsigned long count)</div><div class='ctx'> {</div><div class='ctx'>  	vmi_set_page_type(pfn, VMI_PAGE_L2 | VMI_PAGE_CLONE);</div><div class='ctx'> 	vmi_check_page_type(clonepfn, VMI_PAGE_L2);</div><div class='ctx'> 	vmi_ops.allocate_page(pfn, VMI_PAGE_L2 | VMI_PAGE_CLONE, clonepfn, start, count);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void vmi_release_pte(u32 pfn)</div><div class='add'>+static void vmi_release_pte(unsigned long pfn)</div><div class='ctx'> {</div><div class='ctx'> 	vmi_ops.release_page(pfn, VMI_PAGE_L1);</div><div class='ctx'> 	vmi_set_page_type(pfn, VMI_PAGE_NORMAL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void vmi_release_pmd(u32 pfn)</div><div class='add'>+static void vmi_release_pmd(unsigned long pfn)</div><div class='ctx'> {</div><div class='ctx'> 	vmi_ops.release_page(pfn, VMI_PAGE_L2);</div><div class='ctx'> 	vmi_set_page_type(pfn, VMI_PAGE_NORMAL);</div><div class='hunk'>@@ -905,8 +905,8 @@ static inline int __init activate_vmi(void)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_X86_LOCAL_APIC</div><div class='del'>-	para_fill(pv_apic_ops.apic_read, APICRead);</div><div class='del'>-	para_fill(pv_apic_ops.apic_write, APICWrite);</div><div class='add'>+       para_fill(apic_ops-&gt;read, APICRead);</div><div class='add'>+       para_fill(apic_ops-&gt;write, APICWrite);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='head'>diff --git a/arch/x86/kernel/vmlinux_32.lds.S b/arch/x86/kernel/vmlinux_32.lds.S<br/>index af5bdad84604..a9b8560adbc2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/vmlinux_32.lds.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/vmlinux_32.lds.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/vmlinux_32.lds.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/vmlinux_32.lds.S</a></div><div class='hunk'>@@ -140,10 +140,10 @@ SECTIONS</div><div class='ctx'> 	*(.con_initcall.init)</div><div class='ctx'>   	__con_initcall_end = .;</div><div class='ctx'>   }</div><div class='del'>-  .x86cpuvendor.init : AT(ADDR(.x86cpuvendor.init) - LOAD_OFFSET) {</div><div class='del'>-	__x86cpuvendor_start = .;</div><div class='del'>-	*(.x86cpuvendor.init)</div><div class='del'>-	__x86cpuvendor_end = .;</div><div class='add'>+  .x86_cpu_dev.init : AT(ADDR(.x86_cpu_dev.init) - LOAD_OFFSET) {</div><div class='add'>+	__x86_cpu_dev_start = .;</div><div class='add'>+	*(.x86_cpu_dev.init)</div><div class='add'>+	__x86_cpu_dev_end = .;</div><div class='ctx'>   }</div><div class='ctx'>   SECURITY_INIT</div><div class='ctx'>   . = ALIGN(4);</div><div class='hunk'>@@ -180,6 +180,7 @@ SECTIONS</div><div class='ctx'>   . = ALIGN(PAGE_SIZE);</div><div class='ctx'>   .data.percpu  : AT(ADDR(.data.percpu) - LOAD_OFFSET) {</div><div class='ctx'> 	__per_cpu_start = .;</div><div class='add'>+	*(.data.percpu.page_aligned)</div><div class='ctx'> 	*(.data.percpu)</div><div class='ctx'> 	*(.data.percpu.shared_aligned)</div><div class='ctx'> 	__per_cpu_end = .;</div><div class='head'>diff --git a/arch/x86/kernel/vmlinux_64.lds.S b/arch/x86/kernel/vmlinux_64.lds.S<br/>index 63e5c1a22e88..46e05447405b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/vmlinux_64.lds.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kernel/vmlinux_64.lds.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/vmlinux_64.lds.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/vmlinux_64.lds.S</a></div><div class='hunk'>@@ -168,12 +168,11 @@ SECTIONS</div><div class='ctx'> 	*(.con_initcall.init)</div><div class='ctx'>   }</div><div class='ctx'>   __con_initcall_end = .;</div><div class='del'>-  . = ALIGN(16);</div><div class='del'>-  __x86cpuvendor_start = .;</div><div class='del'>-  .x86cpuvendor.init : AT(ADDR(.x86cpuvendor.init) - LOAD_OFFSET) {</div><div class='del'>-	*(.x86cpuvendor.init)</div><div class='add'>+  __x86_cpu_dev_start = .;</div><div class='add'>+  .x86_cpu_dev.init : AT(ADDR(.x86_cpu_dev.init) - LOAD_OFFSET) {</div><div class='add'>+	*(.x86_cpu_dev.init)</div><div class='ctx'>   }</div><div class='del'>-  __x86cpuvendor_end = .;</div><div class='add'>+  __x86_cpu_dev_end = .;</div><div class='ctx'>   SECURITY_INIT</div><div class='ctx'> </div><div class='ctx'>   . = ALIGN(8);</div><div class='head'>diff --git a/arch/x86/kernel/xsave.c b/arch/x86/kernel/xsave.c<br/>new file mode 100644<br/>index 000000000000..9abac8a9d823<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kernel/xsave.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kernel/xsave.c</a></div><div class='hunk'>@@ -0,0 +1,345 @@</div><div class='add'>+/*</div><div class='add'>+ * xsave/xrstor support.</div><div class='add'>+ *</div><div class='add'>+ * Author: Suresh Siddha &lt;suresh.b.siddha@intel.com&gt;</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/bootmem.h&gt;</div><div class='add'>+#include &lt;linux/compat.h&gt;</div><div class='add'>+#include &lt;asm/i387.h&gt;</div><div class='add'>+#ifdef CONFIG_IA32_EMULATION</div><div class='add'>+#include &lt;asm/sigcontext32.h&gt;</div><div class='add'>+#endif</div><div class='add'>+#include &lt;asm/xcr.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Supported feature mask by the CPU and the kernel.</div><div class='add'>+ */</div><div class='add'>+u64 pcntxt_mask;</div><div class='add'>+</div><div class='add'>+struct _fpx_sw_bytes fx_sw_reserved;</div><div class='add'>+#ifdef CONFIG_IA32_EMULATION</div><div class='add'>+struct _fpx_sw_bytes fx_sw_reserved_ia32;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Check for the presence of extended state information in the</div><div class='add'>+ * user fpstate pointer in the sigcontext.</div><div class='add'>+ */</div><div class='add'>+int check_for_xstate(struct i387_fxsave_struct __user *buf,</div><div class='add'>+		     void __user *fpstate,</div><div class='add'>+		     struct _fpx_sw_bytes *fx_sw_user)</div><div class='add'>+{</div><div class='add'>+	int min_xstate_size = sizeof(struct i387_fxsave_struct) +</div><div class='add'>+			      sizeof(struct xsave_hdr_struct);</div><div class='add'>+	unsigned int magic2;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = __copy_from_user(fx_sw_user, &amp;buf-&gt;sw_reserved[0],</div><div class='add'>+			       sizeof(struct _fpx_sw_bytes));</div><div class='add'>+</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * First Magic check failed.</div><div class='add'>+	 */</div><div class='add'>+	if (fx_sw_user-&gt;magic1 != FP_XSTATE_MAGIC1)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Check for error scenarios.</div><div class='add'>+	 */</div><div class='add'>+	if (fx_sw_user-&gt;xstate_size &lt; min_xstate_size ||</div><div class='add'>+	    fx_sw_user-&gt;xstate_size &gt; xstate_size ||</div><div class='add'>+	    fx_sw_user-&gt;xstate_size &gt; fx_sw_user-&gt;extended_size)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	err = __get_user(magic2, (__u32 *) (((void *)fpstate) +</div><div class='add'>+					    fx_sw_user-&gt;extended_size -</div><div class='add'>+					    FP_XSTATE_MAGIC2_SIZE));</div><div class='add'>+	/*</div><div class='add'>+	 * Check for the presence of second magic word at the end of memory</div><div class='add'>+	 * layout. This detects the case where the user just copied the legacy</div><div class='add'>+	 * fpstate layout with out copying the extended state information</div><div class='add'>+	 * in the memory layout.</div><div class='add'>+	 */</div><div class='add'>+	if (err || magic2 != FP_XSTATE_MAGIC2)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='add'>+/*</div><div class='add'>+ * Signal frame handlers.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+int save_i387_xstate(void __user *buf)</div><div class='add'>+{</div><div class='add'>+	struct task_struct *tsk = current;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (!access_ok(VERIFY_WRITE, buf, sig_xstate_size))</div><div class='add'>+		return -EACCES;</div><div class='add'>+</div><div class='add'>+	BUG_ON(sig_xstate_size &lt; xstate_size);</div><div class='add'>+</div><div class='add'>+	if ((unsigned long)buf % 64)</div><div class='add'>+		printk("save_i387_xstate: bad fpstate %p\n", buf);</div><div class='add'>+</div><div class='add'>+	if (!used_math())</div><div class='add'>+		return 0;</div><div class='add'>+	clear_used_math(); /* trigger finit */</div><div class='add'>+	if (task_thread_info(tsk)-&gt;status &amp; TS_USEDFPU) {</div><div class='add'>+		/*</div><div class='add'>+	 	 * Start with clearing the user buffer. This will present a</div><div class='add'>+	 	 * clean context for the bytes not touched by the fxsave/xsave.</div><div class='add'>+		 */</div><div class='add'>+		err = __clear_user(buf, sig_xstate_size);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		if (task_thread_info(tsk)-&gt;status &amp; TS_XSAVE)</div><div class='add'>+			err = xsave_user(buf);</div><div class='add'>+		else</div><div class='add'>+			err = fxsave_user(buf);</div><div class='add'>+</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+		task_thread_info(tsk)-&gt;status &amp;= ~TS_USEDFPU;</div><div class='add'>+		stts();</div><div class='add'>+	} else {</div><div class='add'>+		if (__copy_to_user(buf, &amp;tsk-&gt;thread.xstate-&gt;fxsave,</div><div class='add'>+				   xstate_size))</div><div class='add'>+			return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (task_thread_info(tsk)-&gt;status &amp; TS_XSAVE) {</div><div class='add'>+		struct _fpstate __user *fx = buf;</div><div class='add'>+		struct _xstate __user *x = buf;</div><div class='add'>+		u64 xstate_bv;</div><div class='add'>+</div><div class='add'>+		err = __copy_to_user(&amp;fx-&gt;sw_reserved, &amp;fx_sw_reserved,</div><div class='add'>+				     sizeof(struct _fpx_sw_bytes));</div><div class='add'>+</div><div class='add'>+		err |= __put_user(FP_XSTATE_MAGIC2,</div><div class='add'>+				  (__u32 __user *) (buf + sig_xstate_size</div><div class='add'>+						    - FP_XSTATE_MAGIC2_SIZE));</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Read the xstate_bv which we copied (directly from the cpu or</div><div class='add'>+		 * from the state in task struct) to the user buffers and</div><div class='add'>+		 * set the FP/SSE bits.</div><div class='add'>+		 */</div><div class='add'>+		err |= __get_user(xstate_bv, &amp;x-&gt;xstate_hdr.xstate_bv);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * For legacy compatible, we always set FP/SSE bits in the bit</div><div class='add'>+		 * vector while saving the state to the user context. This will</div><div class='add'>+		 * enable us capturing any changes(during sigreturn) to</div><div class='add'>+		 * the FP/SSE bits by the legacy applications which don't touch</div><div class='add'>+		 * xstate_bv in the xsave header.</div><div class='add'>+		 *</div><div class='add'>+		 * xsave aware apps can change the xstate_bv in the xsave</div><div class='add'>+		 * header as well as change any contents in the memory layout.</div><div class='add'>+		 * xrestore as part of sigreturn will capture all the changes.</div><div class='add'>+		 */</div><div class='add'>+		xstate_bv |= XSTATE_FPSSE;</div><div class='add'>+</div><div class='add'>+		err |= __put_user(xstate_bv, &amp;x-&gt;xstate_hdr.xstate_bv);</div><div class='add'>+</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Restore the extended state if present. Otherwise, restore the FP/SSE</div><div class='add'>+ * state.</div><div class='add'>+ */</div><div class='add'>+int restore_user_xstate(void __user *buf)</div><div class='add'>+{</div><div class='add'>+	struct _fpx_sw_bytes fx_sw_user;</div><div class='add'>+	u64 mask;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (((unsigned long)buf % 64) ||</div><div class='add'>+	     check_for_xstate(buf, buf, &amp;fx_sw_user))</div><div class='add'>+		goto fx_only;</div><div class='add'>+</div><div class='add'>+	mask = fx_sw_user.xstate_bv;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * restore the state passed by the user.</div><div class='add'>+	 */</div><div class='add'>+	err = xrestore_user(buf, mask);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * init the state skipped by the user.</div><div class='add'>+	 */</div><div class='add'>+	mask = pcntxt_mask &amp; ~mask;</div><div class='add'>+</div><div class='add'>+	xrstor_state(init_xstate_buf, mask);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+fx_only:</div><div class='add'>+	/*</div><div class='add'>+	 * couldn't find the extended state information in the</div><div class='add'>+	 * memory layout. Restore just the FP/SSE and init all</div><div class='add'>+	 * the other extended state.</div><div class='add'>+	 */</div><div class='add'>+	xrstor_state(init_xstate_buf, pcntxt_mask &amp; ~XSTATE_FPSSE);</div><div class='add'>+	return fxrstor_checking((__force struct i387_fxsave_struct *)buf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This restores directly out of user space. Exceptions are handled.</div><div class='add'>+ */</div><div class='add'>+int restore_i387_xstate(void __user *buf)</div><div class='add'>+{</div><div class='add'>+	struct task_struct *tsk = current;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (!buf) {</div><div class='add'>+		if (used_math())</div><div class='add'>+			goto clear;</div><div class='add'>+		return 0;</div><div class='add'>+	} else</div><div class='add'>+		if (!access_ok(VERIFY_READ, buf, sig_xstate_size))</div><div class='add'>+			return -EACCES;</div><div class='add'>+</div><div class='add'>+	if (!used_math()) {</div><div class='add'>+		err = init_fpu(tsk);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!(task_thread_info(current)-&gt;status &amp; TS_USEDFPU)) {</div><div class='add'>+		clts();</div><div class='add'>+		task_thread_info(current)-&gt;status |= TS_USEDFPU;</div><div class='add'>+	}</div><div class='add'>+	if (task_thread_info(tsk)-&gt;status &amp; TS_XSAVE)</div><div class='add'>+		err = restore_user_xstate(buf);</div><div class='add'>+	else</div><div class='add'>+		err = fxrstor_checking((__force struct i387_fxsave_struct *)</div><div class='add'>+				       buf);</div><div class='add'>+	if (unlikely(err)) {</div><div class='add'>+		/*</div><div class='add'>+		 * Encountered an error while doing the restore from the</div><div class='add'>+		 * user buffer, clear the fpu state.</div><div class='add'>+		 */</div><div class='add'>+clear:</div><div class='add'>+		clear_fpu(tsk);</div><div class='add'>+		clear_used_math();</div><div class='add'>+	}</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Prepare the SW reserved portion of the fxsave memory layout, indicating</div><div class='add'>+ * the presence of the extended state information in the memory layout</div><div class='add'>+ * pointed by the fpstate pointer in the sigcontext.</div><div class='add'>+ * This will be saved when ever the FP and extended state context is</div><div class='add'>+ * saved on the user stack during the signal handler delivery to the user.</div><div class='add'>+ */</div><div class='add'>+void prepare_fx_sw_frame(void)</div><div class='add'>+{</div><div class='add'>+	int size_extended = (xstate_size - sizeof(struct i387_fxsave_struct)) +</div><div class='add'>+			     FP_XSTATE_MAGIC2_SIZE;</div><div class='add'>+</div><div class='add'>+	sig_xstate_size = sizeof(struct _fpstate) + size_extended;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_IA32_EMULATION</div><div class='add'>+	sig_xstate_ia32_size = sizeof(struct _fpstate_ia32) + size_extended;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	memset(&amp;fx_sw_reserved, 0, sizeof(fx_sw_reserved));</div><div class='add'>+</div><div class='add'>+	fx_sw_reserved.magic1 = FP_XSTATE_MAGIC1;</div><div class='add'>+	fx_sw_reserved.extended_size = sig_xstate_size;</div><div class='add'>+	fx_sw_reserved.xstate_bv = pcntxt_mask;</div><div class='add'>+	fx_sw_reserved.xstate_size = xstate_size;</div><div class='add'>+#ifdef CONFIG_IA32_EMULATION</div><div class='add'>+	memcpy(&amp;fx_sw_reserved_ia32, &amp;fx_sw_reserved,</div><div class='add'>+	       sizeof(struct _fpx_sw_bytes));</div><div class='add'>+	fx_sw_reserved_ia32.extended_size = sig_xstate_ia32_size;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Represents init state for the supported extended state.</div><div class='add'>+ */</div><div class='add'>+struct xsave_struct *init_xstate_buf;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='add'>+unsigned int sig_xstate_size = sizeof(struct _fpstate);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Enable the extended processor state save/restore feature</div><div class='add'>+ */</div><div class='add'>+void __cpuinit xsave_init(void)</div><div class='add'>+{</div><div class='add'>+	if (!cpu_has_xsave)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	set_in_cr4(X86_CR4_OSXSAVE);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Enable all the features that the HW is capable of</div><div class='add'>+	 * and the Linux kernel is aware of.</div><div class='add'>+	 */</div><div class='add'>+	xsetbv(XCR_XFEATURE_ENABLED_MASK, pcntxt_mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * setup the xstate image representing the init state</div><div class='add'>+ */</div><div class='add'>+static void __init setup_xstate_init(void)</div><div class='add'>+{</div><div class='add'>+	init_xstate_buf = alloc_bootmem(xstate_size);</div><div class='add'>+	init_xstate_buf-&gt;i387.mxcsr = MXCSR_DEFAULT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Enable and initialize the xsave feature.</div><div class='add'>+ */</div><div class='add'>+void __init xsave_cntxt_init(void)</div><div class='add'>+{</div><div class='add'>+	unsigned int eax, ebx, ecx, edx;</div><div class='add'>+</div><div class='add'>+	cpuid_count(0xd, 0, &amp;eax, &amp;ebx, &amp;ecx, &amp;edx);</div><div class='add'>+	pcntxt_mask = eax + ((u64)edx &lt;&lt; 32);</div><div class='add'>+</div><div class='add'>+	if ((pcntxt_mask &amp; XSTATE_FPSSE) != XSTATE_FPSSE) {</div><div class='add'>+		printk(KERN_ERR "FP/SSE not shown under xsave features 0x%llx\n",</div><div class='add'>+		       pcntxt_mask);</div><div class='add'>+		BUG();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * for now OS knows only about FP/SSE</div><div class='add'>+	 */</div><div class='add'>+	pcntxt_mask = pcntxt_mask &amp; XCNTXT_MASK;</div><div class='add'>+	xsave_init();</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Recompute the context size for enabled features</div><div class='add'>+	 */</div><div class='add'>+	cpuid_count(0xd, 0, &amp;eax, &amp;ebx, &amp;ecx, &amp;edx);</div><div class='add'>+	xstate_size = ebx;</div><div class='add'>+</div><div class='add'>+	prepare_fx_sw_frame();</div><div class='add'>+</div><div class='add'>+	setup_xstate_init();</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "xsave/xrstor: enabled xstate_bv 0x%llx, "</div><div class='add'>+	       "cntxt size 0x%x\n",</div><div class='add'>+	       pcntxt_mask, xstate_size);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/x86/kvm/Makefile b/arch/x86/kvm/Makefile<br/>index d0e940bb6f40..c02343594b4d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kvm/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kvm/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kvm/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kvm/Makefile</a></div><div class='hunk'>@@ -3,10 +3,13 @@</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> common-objs = $(addprefix ../../../virt/kvm/, kvm_main.o ioapic.o \</div><div class='del'>-                coalesced_mmio.o)</div><div class='add'>+                coalesced_mmio.o irq_comm.o)</div><div class='ctx'> ifeq ($(CONFIG_KVM_TRACE),y)</div><div class='ctx'> common-objs += $(addprefix ../../../virt/kvm/, kvm_trace.o)</div><div class='ctx'> endif</div><div class='add'>+ifeq ($(CONFIG_DMAR),y)</div><div class='add'>+common-objs += $(addprefix ../../../virt/kvm/, vtd.o)</div><div class='add'>+endif</div><div class='ctx'> </div><div class='ctx'> EXTRA_CFLAGS += -Ivirt/kvm -Iarch/x86/kvm</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kvm/i8254.c b/arch/x86/kvm/i8254.c<br/>index c0f7872a9124..634132a9a512 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kvm/i8254.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kvm/i8254.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kvm/i8254.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kvm/i8254.c</a></div><div class='hunk'>@@ -200,13 +200,14 @@ static int __pit_timer_fn(struct kvm_kpit_state *ps)</div><div class='ctx'> </div><div class='ctx'> 	if (!atomic_inc_and_test(&amp;pt-&gt;pending))</div><div class='ctx'> 		set_bit(KVM_REQ_PENDING_TIMER, &amp;vcpu0-&gt;requests);</div><div class='del'>-	if (vcpu0 &amp;&amp; waitqueue_active(&amp;vcpu0-&gt;wq)) {</div><div class='del'>-		vcpu0-&gt;arch.mp_state = KVM_MP_STATE_RUNNABLE;</div><div class='add'>+</div><div class='add'>+	if (vcpu0 &amp;&amp; waitqueue_active(&amp;vcpu0-&gt;wq))</div><div class='ctx'> 		wake_up_interruptible(&amp;vcpu0-&gt;wq);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	pt-&gt;timer.expires = ktime_add_ns(pt-&gt;timer.expires, pt-&gt;period);</div><div class='ctx'> 	pt-&gt;scheduled = ktime_to_ns(pt-&gt;timer.expires);</div><div class='add'>+	if (pt-&gt;period)</div><div class='add'>+		ps-&gt;channels[0].count_load_time = pt-&gt;timer.expires;</div><div class='ctx'> </div><div class='ctx'> 	return (pt-&gt;period == 0 ? 0 : 1);</div><div class='ctx'> }</div><div class='hunk'>@@ -215,12 +216,22 @@ int pit_has_pending_timer(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='ctx'> 	struct kvm_pit *pit = vcpu-&gt;kvm-&gt;arch.vpit;</div><div class='ctx'> </div><div class='del'>-	if (pit &amp;&amp; vcpu-&gt;vcpu_id == 0 &amp;&amp; pit-&gt;pit_state.inject_pending)</div><div class='add'>+	if (pit &amp;&amp; vcpu-&gt;vcpu_id == 0 &amp;&amp; pit-&gt;pit_state.irq_ack)</div><div class='ctx'> 		return atomic_read(&amp;pit-&gt;pit_state.pit_timer.pending);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void kvm_pit_ack_irq(struct kvm_irq_ack_notifier *kian)</div><div class='add'>+{</div><div class='add'>+	struct kvm_kpit_state *ps = container_of(kian, struct kvm_kpit_state,</div><div class='add'>+						 irq_ack_notifier);</div><div class='add'>+	spin_lock(&amp;ps-&gt;inject_lock);</div><div class='add'>+	if (atomic_dec_return(&amp;ps-&gt;pit_timer.pending) &lt; 0)</div><div class='add'>+		atomic_inc(&amp;ps-&gt;pit_timer.pending);</div><div class='add'>+	ps-&gt;irq_ack = 1;</div><div class='add'>+	spin_unlock(&amp;ps-&gt;inject_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static enum hrtimer_restart pit_timer_fn(struct hrtimer *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct kvm_kpit_state *ps;</div><div class='hunk'>@@ -255,8 +266,9 @@ static void destroy_pit_timer(struct kvm_kpit_timer *pt)</div><div class='ctx'> 	hrtimer_cancel(&amp;pt-&gt;timer);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void create_pit_timer(struct kvm_kpit_timer *pt, u32 val, int is_period)</div><div class='add'>+static void create_pit_timer(struct kvm_kpit_state *ps, u32 val, int is_period)</div><div class='ctx'> {</div><div class='add'>+	struct kvm_kpit_timer *pt = &amp;ps-&gt;pit_timer;</div><div class='ctx'> 	s64 interval;</div><div class='ctx'> </div><div class='ctx'> 	interval = muldiv64(val, NSEC_PER_SEC, KVM_PIT_FREQ);</div><div class='hunk'>@@ -268,6 +280,7 @@ static void create_pit_timer(struct kvm_kpit_timer *pt, u32 val, int is_period)</div><div class='ctx'> 	pt-&gt;period = (is_period == 0) ? 0 : interval;</div><div class='ctx'> 	pt-&gt;timer.function = pit_timer_fn;</div><div class='ctx'> 	atomic_set(&amp;pt-&gt;pending, 0);</div><div class='add'>+	ps-&gt;irq_ack = 1;</div><div class='ctx'> </div><div class='ctx'> 	hrtimer_start(&amp;pt-&gt;timer, ktime_add_ns(ktime_get(), interval),</div><div class='ctx'> 		      HRTIMER_MODE_ABS);</div><div class='hunk'>@@ -302,11 +315,11 @@ static void pit_load_count(struct kvm *kvm, int channel, u32 val)</div><div class='ctx'> 	case 1:</div><div class='ctx'>         /* FIXME: enhance mode 4 precision */</div><div class='ctx'> 	case 4:</div><div class='del'>-		create_pit_timer(&amp;ps-&gt;pit_timer, val, 0);</div><div class='add'>+		create_pit_timer(ps, val, 0);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 2:</div><div class='ctx'> 	case 3:</div><div class='del'>-		create_pit_timer(&amp;ps-&gt;pit_timer, val, 1);</div><div class='add'>+		create_pit_timer(ps, val, 1);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		destroy_pit_timer(&amp;ps-&gt;pit_timer);</div><div class='hunk'>@@ -520,7 +533,7 @@ void kvm_pit_reset(struct kvm_pit *pit)</div><div class='ctx'> 	mutex_unlock(&amp;pit-&gt;pit_state.lock);</div><div class='ctx'> </div><div class='ctx'> 	atomic_set(&amp;pit-&gt;pit_state.pit_timer.pending, 0);</div><div class='del'>-	pit-&gt;pit_state.inject_pending = 1;</div><div class='add'>+	pit-&gt;pit_state.irq_ack = 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct kvm_pit *kvm_create_pit(struct kvm *kvm)</div><div class='hunk'>@@ -534,6 +547,7 @@ struct kvm_pit *kvm_create_pit(struct kvm *kvm)</div><div class='ctx'> </div><div class='ctx'> 	mutex_init(&amp;pit-&gt;pit_state.lock);</div><div class='ctx'> 	mutex_lock(&amp;pit-&gt;pit_state.lock);</div><div class='add'>+	spin_lock_init(&amp;pit-&gt;pit_state.inject_lock);</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize PIO device */</div><div class='ctx'> 	pit-&gt;dev.read = pit_ioport_read;</div><div class='hunk'>@@ -555,6 +569,9 @@ struct kvm_pit *kvm_create_pit(struct kvm *kvm)</div><div class='ctx'> 	pit_state-&gt;pit = pit;</div><div class='ctx'> 	hrtimer_init(&amp;pit_state-&gt;pit_timer.timer,</div><div class='ctx'> 		     CLOCK_MONOTONIC, HRTIMER_MODE_ABS);</div><div class='add'>+	pit_state-&gt;irq_ack_notifier.gsi = 0;</div><div class='add'>+	pit_state-&gt;irq_ack_notifier.irq_acked = kvm_pit_ack_irq;</div><div class='add'>+	kvm_register_irq_ack_notifier(kvm, &amp;pit_state-&gt;irq_ack_notifier);</div><div class='ctx'> 	mutex_unlock(&amp;pit-&gt;pit_state.lock);</div><div class='ctx'> </div><div class='ctx'> 	kvm_pit_reset(pit);</div><div class='hunk'>@@ -578,10 +595,8 @@ void kvm_free_pit(struct kvm *kvm)</div><div class='ctx'> static void __inject_pit_timer_intr(struct kvm *kvm)</div><div class='ctx'> {</div><div class='ctx'> 	mutex_lock(&amp;kvm-&gt;lock);</div><div class='del'>-	kvm_ioapic_set_irq(kvm-&gt;arch.vioapic, 0, 1);</div><div class='del'>-	kvm_ioapic_set_irq(kvm-&gt;arch.vioapic, 0, 0);</div><div class='del'>-	kvm_pic_set_irq(pic_irqchip(kvm), 0, 1);</div><div class='del'>-	kvm_pic_set_irq(pic_irqchip(kvm), 0, 0);</div><div class='add'>+	kvm_set_irq(kvm, 0, 1);</div><div class='add'>+	kvm_set_irq(kvm, 0, 0);</div><div class='ctx'> 	mutex_unlock(&amp;kvm-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -592,37 +607,19 @@ void kvm_inject_pit_timer_irqs(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	struct kvm_kpit_state *ps;</div><div class='ctx'> </div><div class='ctx'> 	if (vcpu &amp;&amp; pit) {</div><div class='add'>+		int inject = 0;</div><div class='ctx'> 		ps = &amp;pit-&gt;pit_state;</div><div class='ctx'> </div><div class='del'>-		/* Try to inject pending interrupts when:</div><div class='del'>-		 * 1. Pending exists</div><div class='del'>-		 * 2. Last interrupt was accepted or waited for too long time*/</div><div class='del'>-		if (atomic_read(&amp;ps-&gt;pit_timer.pending) &amp;&amp;</div><div class='del'>-		    (ps-&gt;inject_pending ||</div><div class='del'>-		    (jiffies - ps-&gt;last_injected_time</div><div class='del'>-				&gt;= KVM_MAX_PIT_INTR_INTERVAL))) {</div><div class='del'>-			ps-&gt;inject_pending = 0;</div><div class='del'>-			__inject_pit_timer_intr(kvm);</div><div class='del'>-			ps-&gt;last_injected_time = jiffies;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void kvm_pit_timer_intr_post(struct kvm_vcpu *vcpu, int vec)</div><div class='del'>-{</div><div class='del'>-	struct kvm_arch *arch = &amp;vcpu-&gt;kvm-&gt;arch;</div><div class='del'>-	struct kvm_kpit_state *ps;</div><div class='del'>-</div><div class='del'>-	if (vcpu &amp;&amp; arch-&gt;vpit) {</div><div class='del'>-		ps = &amp;arch-&gt;vpit-&gt;pit_state;</div><div class='del'>-		if (atomic_read(&amp;ps-&gt;pit_timer.pending) &amp;&amp;</div><div class='del'>-		(((arch-&gt;vpic-&gt;pics[0].imr &amp; 1) == 0 &amp;&amp;</div><div class='del'>-		  arch-&gt;vpic-&gt;pics[0].irq_base == vec) ||</div><div class='del'>-		  (arch-&gt;vioapic-&gt;redirtbl[0].fields.vector == vec &amp;&amp;</div><div class='del'>-		  arch-&gt;vioapic-&gt;redirtbl[0].fields.mask != 1))) {</div><div class='del'>-			ps-&gt;inject_pending = 1;</div><div class='del'>-			atomic_dec(&amp;ps-&gt;pit_timer.pending);</div><div class='del'>-			ps-&gt;channels[0].count_load_time = ktime_get();</div><div class='add'>+		/* Try to inject pending interrupts when</div><div class='add'>+		 * last one has been acked.</div><div class='add'>+		 */</div><div class='add'>+		spin_lock(&amp;ps-&gt;inject_lock);</div><div class='add'>+		if (atomic_read(&amp;ps-&gt;pit_timer.pending) &amp;&amp; ps-&gt;irq_ack) {</div><div class='add'>+			ps-&gt;irq_ack = 0;</div><div class='add'>+			inject = 1;</div><div class='ctx'> 		}</div><div class='add'>+		spin_unlock(&amp;ps-&gt;inject_lock);</div><div class='add'>+		if (inject)</div><div class='add'>+			__inject_pit_timer_intr(kvm);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/x86/kvm/i8254.h b/arch/x86/kvm/i8254.h<br/>index db25c2a6c8c4..e436d4983aa1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kvm/i8254.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kvm/i8254.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kvm/i8254.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kvm/i8254.h</a></div><div class='hunk'>@@ -8,7 +8,6 @@ struct kvm_kpit_timer {</div><div class='ctx'> 	int irq;</div><div class='ctx'> 	s64 period; /* unit: ns */</div><div class='ctx'> 	s64 scheduled;</div><div class='del'>-	ktime_t last_update;</div><div class='ctx'> 	atomic_t pending;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -34,8 +33,9 @@ struct kvm_kpit_state {</div><div class='ctx'> 	u32    speaker_data_on;</div><div class='ctx'> 	struct mutex lock;</div><div class='ctx'> 	struct kvm_pit *pit;</div><div class='del'>-	bool inject_pending; /* if inject pending interrupts */</div><div class='del'>-	unsigned long last_injected_time;</div><div class='add'>+	spinlock_t inject_lock;</div><div class='add'>+	unsigned long irq_ack;</div><div class='add'>+	struct kvm_irq_ack_notifier irq_ack_notifier;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct kvm_pit {</div><div class='hunk'>@@ -54,7 +54,6 @@ struct kvm_pit {</div><div class='ctx'> #define KVM_PIT_CHANNEL_MASK	    0x3</div><div class='ctx'> </div><div class='ctx'> void kvm_inject_pit_timer_irqs(struct kvm_vcpu *vcpu);</div><div class='del'>-void kvm_pit_timer_intr_post(struct kvm_vcpu *vcpu, int vec);</div><div class='ctx'> void kvm_pit_load_count(struct kvm *kvm, int channel, u32 val);</div><div class='ctx'> struct kvm_pit *kvm_create_pit(struct kvm *kvm);</div><div class='ctx'> void kvm_free_pit(struct kvm *kvm);</div><div class='head'>diff --git a/arch/x86/kvm/i8259.c b/arch/x86/kvm/i8259.c<br/>index c31164e8aa46..17e41e165f1a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kvm/i8259.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kvm/i8259.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kvm/i8259.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kvm/i8259.c</a></div><div class='hunk'>@@ -30,6 +30,19 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kvm_host.h&gt;</div><div class='ctx'> </div><div class='add'>+static void pic_clear_isr(struct kvm_kpic_state *s, int irq)</div><div class='add'>+{</div><div class='add'>+	s-&gt;isr &amp;= ~(1 &lt;&lt; irq);</div><div class='add'>+	s-&gt;isr_ack |= (1 &lt;&lt; irq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void kvm_pic_clear_isr_ack(struct kvm *kvm)</div><div class='add'>+{</div><div class='add'>+	struct kvm_pic *s = pic_irqchip(kvm);</div><div class='add'>+	s-&gt;pics[0].isr_ack = 0xff;</div><div class='add'>+	s-&gt;pics[1].isr_ack = 0xff;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * set irq level. If an edge is detected, then the IRR is set to 1</div><div class='ctx'>  */</div><div class='hunk'>@@ -141,11 +154,12 @@ void kvm_pic_set_irq(void *opaque, int irq, int level)</div><div class='ctx'>  */</div><div class='ctx'> static inline void pic_intack(struct kvm_kpic_state *s, int irq)</div><div class='ctx'> {</div><div class='add'>+	s-&gt;isr |= 1 &lt;&lt; irq;</div><div class='ctx'> 	if (s-&gt;auto_eoi) {</div><div class='ctx'> 		if (s-&gt;rotate_on_auto_eoi)</div><div class='ctx'> 			s-&gt;priority_add = (irq + 1) &amp; 7;</div><div class='del'>-	} else</div><div class='del'>-		s-&gt;isr |= (1 &lt;&lt; irq);</div><div class='add'>+		pic_clear_isr(s, irq);</div><div class='add'>+	}</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We don't clear a level sensitive interrupt here</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -153,9 +167,10 @@ static inline void pic_intack(struct kvm_kpic_state *s, int irq)</div><div class='ctx'> 		s-&gt;irr &amp;= ~(1 &lt;&lt; irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int kvm_pic_read_irq(struct kvm_pic *s)</div><div class='add'>+int kvm_pic_read_irq(struct kvm *kvm)</div><div class='ctx'> {</div><div class='ctx'> 	int irq, irq2, intno;</div><div class='add'>+	struct kvm_pic *s = pic_irqchip(kvm);</div><div class='ctx'> </div><div class='ctx'> 	irq = pic_get_irq(&amp;s-&gt;pics[0]);</div><div class='ctx'> 	if (irq &gt;= 0) {</div><div class='hunk'>@@ -181,16 +196,32 @@ int kvm_pic_read_irq(struct kvm_pic *s)</div><div class='ctx'> 		intno = s-&gt;pics[0].irq_base + irq;</div><div class='ctx'> 	}</div><div class='ctx'> 	pic_update_irq(s);</div><div class='add'>+	kvm_notify_acked_irq(kvm, irq);</div><div class='ctx'> </div><div class='ctx'> 	return intno;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void kvm_pic_reset(struct kvm_kpic_state *s)</div><div class='ctx'> {</div><div class='add'>+	int irq, irqbase;</div><div class='add'>+	struct kvm *kvm = s-&gt;pics_state-&gt;irq_request_opaque;</div><div class='add'>+	struct kvm_vcpu *vcpu0 = kvm-&gt;vcpus[0];</div><div class='add'>+</div><div class='add'>+	if (s == &amp;s-&gt;pics_state-&gt;pics[0])</div><div class='add'>+		irqbase = 0;</div><div class='add'>+	else</div><div class='add'>+		irqbase = 8;</div><div class='add'>+</div><div class='add'>+	for (irq = 0; irq &lt; PIC_NUM_PINS/2; irq++) {</div><div class='add'>+		if (vcpu0 &amp;&amp; kvm_apic_accept_pic_intr(vcpu0))</div><div class='add'>+			if (s-&gt;irr &amp; (1 &lt;&lt; irq) || s-&gt;isr &amp; (1 &lt;&lt; irq))</div><div class='add'>+				kvm_notify_acked_irq(kvm, irq+irqbase);</div><div class='add'>+	}</div><div class='ctx'> 	s-&gt;last_irr = 0;</div><div class='ctx'> 	s-&gt;irr = 0;</div><div class='ctx'> 	s-&gt;imr = 0;</div><div class='ctx'> 	s-&gt;isr = 0;</div><div class='add'>+	s-&gt;isr_ack = 0xff;</div><div class='ctx'> 	s-&gt;priority_add = 0;</div><div class='ctx'> 	s-&gt;irq_base = 0;</div><div class='ctx'> 	s-&gt;read_reg_select = 0;</div><div class='hunk'>@@ -243,7 +274,7 @@ static void pic_ioport_write(void *opaque, u32 addr, u32 val)</div><div class='ctx'> 				priority = get_priority(s, s-&gt;isr);</div><div class='ctx'> 				if (priority != 8) {</div><div class='ctx'> 					irq = (priority + s-&gt;priority_add) &amp; 7;</div><div class='del'>-					s-&gt;isr &amp;= ~(1 &lt;&lt; irq);</div><div class='add'>+					pic_clear_isr(s, irq);</div><div class='ctx'> 					if (cmd == 5)</div><div class='ctx'> 						s-&gt;priority_add = (irq + 1) &amp; 7;</div><div class='ctx'> 					pic_update_irq(s-&gt;pics_state);</div><div class='hunk'>@@ -251,7 +282,7 @@ static void pic_ioport_write(void *opaque, u32 addr, u32 val)</div><div class='ctx'> 				break;</div><div class='ctx'> 			case 3:</div><div class='ctx'> 				irq = val &amp; 7;</div><div class='del'>-				s-&gt;isr &amp;= ~(1 &lt;&lt; irq);</div><div class='add'>+				pic_clear_isr(s, irq);</div><div class='ctx'> 				pic_update_irq(s-&gt;pics_state);</div><div class='ctx'> 				break;</div><div class='ctx'> 			case 6:</div><div class='hunk'>@@ -260,8 +291,8 @@ static void pic_ioport_write(void *opaque, u32 addr, u32 val)</div><div class='ctx'> 				break;</div><div class='ctx'> 			case 7:</div><div class='ctx'> 				irq = val &amp; 7;</div><div class='del'>-				s-&gt;isr &amp;= ~(1 &lt;&lt; irq);</div><div class='ctx'> 				s-&gt;priority_add = (irq + 1) &amp; 7;</div><div class='add'>+				pic_clear_isr(s, irq);</div><div class='ctx'> 				pic_update_irq(s-&gt;pics_state);</div><div class='ctx'> 				break;</div><div class='ctx'> 			default:</div><div class='hunk'>@@ -303,7 +334,7 @@ static u32 pic_poll_read(struct kvm_kpic_state *s, u32 addr1)</div><div class='ctx'> 			s-&gt;pics_state-&gt;pics[0].irr &amp;= ~(1 &lt;&lt; 2);</div><div class='ctx'> 		}</div><div class='ctx'> 		s-&gt;irr &amp;= ~(1 &lt;&lt; ret);</div><div class='del'>-		s-&gt;isr &amp;= ~(1 &lt;&lt; ret);</div><div class='add'>+		pic_clear_isr(s, ret);</div><div class='ctx'> 		if (addr1 &gt;&gt; 7 || ret != 2)</div><div class='ctx'> 			pic_update_irq(s-&gt;pics_state);</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -422,10 +453,14 @@ static void pic_irq_request(void *opaque, int level)</div><div class='ctx'> {</div><div class='ctx'> 	struct kvm *kvm = opaque;</div><div class='ctx'> 	struct kvm_vcpu *vcpu = kvm-&gt;vcpus[0];</div><div class='add'>+	struct kvm_pic *s = pic_irqchip(kvm);</div><div class='add'>+	int irq = pic_get_irq(&amp;s-&gt;pics[0]);</div><div class='ctx'> </div><div class='del'>-	pic_irqchip(kvm)-&gt;output = level;</div><div class='del'>-	if (vcpu)</div><div class='add'>+	s-&gt;output = level;</div><div class='add'>+	if (vcpu &amp;&amp; level &amp;&amp; (s-&gt;pics[0].isr_ack &amp; (1 &lt;&lt; irq))) {</div><div class='add'>+		s-&gt;pics[0].isr_ack &amp;= ~(1 &lt;&lt; irq);</div><div class='ctx'> 		kvm_vcpu_kick(vcpu);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct kvm_pic *kvm_create_pic(struct kvm *kvm)</div><div class='head'>diff --git a/arch/x86/kvm/irq.c b/arch/x86/kvm/irq.c<br/>index 76d736b5f664..c019b8edcdb7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kvm/irq.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kvm/irq.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kvm/irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kvm/irq.c</a></div><div class='hunk'>@@ -72,7 +72,7 @@ int kvm_cpu_get_interrupt(struct kvm_vcpu *v)</div><div class='ctx'> 		if (kvm_apic_accept_pic_intr(v)) {</div><div class='ctx'> 			s = pic_irqchip(v-&gt;kvm);</div><div class='ctx'> 			s-&gt;output = 0;		/* PIC */</div><div class='del'>-			vector = kvm_pic_read_irq(s);</div><div class='add'>+			vector = kvm_pic_read_irq(v-&gt;kvm);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return vector;</div><div class='hunk'>@@ -90,7 +90,6 @@ EXPORT_SYMBOL_GPL(kvm_inject_pending_timer_irqs);</div><div class='ctx'> void kvm_timer_intr_post(struct kvm_vcpu *vcpu, int vec)</div><div class='ctx'> {</div><div class='ctx'> 	kvm_apic_timer_intr_post(vcpu, vec);</div><div class='del'>-	kvm_pit_timer_intr_post(vcpu, vec);</div><div class='ctx'> 	/* TODO: PIT, RTC etc. */</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(kvm_timer_intr_post);</div><div class='head'>diff --git a/arch/x86/kvm/irq.h b/arch/x86/kvm/irq.h<br/>index 7ca47cbb48bb..f17c8f5bbf31 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kvm/irq.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kvm/irq.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kvm/irq.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kvm/irq.h</a></div><div class='hunk'>@@ -42,6 +42,7 @@ struct kvm_kpic_state {</div><div class='ctx'> 	u8 irr;		/* interrupt request register */</div><div class='ctx'> 	u8 imr;		/* interrupt mask register */</div><div class='ctx'> 	u8 isr;		/* interrupt service register */</div><div class='add'>+	u8 isr_ack;	/* interrupt ack detection */</div><div class='ctx'> 	u8 priority_add;	/* highest irq priority */</div><div class='ctx'> 	u8 irq_base;</div><div class='ctx'> 	u8 read_reg_select;</div><div class='hunk'>@@ -63,12 +64,13 @@ struct kvm_pic {</div><div class='ctx'> 	void *irq_request_opaque;</div><div class='ctx'> 	int output;		/* intr from master PIC */</div><div class='ctx'> 	struct kvm_io_device dev;</div><div class='add'>+	void (*ack_notifier)(void *opaque, int irq);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct kvm_pic *kvm_create_pic(struct kvm *kvm);</div><div class='del'>-void kvm_pic_set_irq(void *opaque, int irq, int level);</div><div class='del'>-int kvm_pic_read_irq(struct kvm_pic *s);</div><div class='add'>+int kvm_pic_read_irq(struct kvm *kvm);</div><div class='ctx'> void kvm_pic_update_irq(struct kvm_pic *s);</div><div class='add'>+void kvm_pic_clear_isr_ack(struct kvm *kvm);</div><div class='ctx'> </div><div class='ctx'> static inline struct kvm_pic *pic_irqchip(struct kvm *kvm)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/x86/kvm/kvm_cache_regs.h b/arch/x86/kvm/kvm_cache_regs.h<br/>new file mode 100644<br/>index 000000000000..1ff819dce7d3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kvm/kvm_cache_regs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kvm/kvm_cache_regs.h</a></div><div class='hunk'>@@ -0,0 +1,32 @@</div><div class='add'>+#ifndef ASM_KVM_CACHE_REGS_H</div><div class='add'>+#define ASM_KVM_CACHE_REGS_H</div><div class='add'>+</div><div class='add'>+static inline unsigned long kvm_register_read(struct kvm_vcpu *vcpu,</div><div class='add'>+					      enum kvm_reg reg)</div><div class='add'>+{</div><div class='add'>+	if (!test_bit(reg, (unsigned long *)&amp;vcpu-&gt;arch.regs_avail))</div><div class='add'>+		kvm_x86_ops-&gt;cache_reg(vcpu, reg);</div><div class='add'>+</div><div class='add'>+	return vcpu-&gt;arch.regs[reg];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void kvm_register_write(struct kvm_vcpu *vcpu,</div><div class='add'>+				      enum kvm_reg reg,</div><div class='add'>+				      unsigned long val)</div><div class='add'>+{</div><div class='add'>+	vcpu-&gt;arch.regs[reg] = val;</div><div class='add'>+	__set_bit(reg, (unsigned long *)&amp;vcpu-&gt;arch.regs_dirty);</div><div class='add'>+	__set_bit(reg, (unsigned long *)&amp;vcpu-&gt;arch.regs_avail);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned long kvm_rip_read(struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	return kvm_register_read(vcpu, VCPU_REGS_RIP);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void kvm_rip_write(struct kvm_vcpu *vcpu, unsigned long val)</div><div class='add'>+{</div><div class='add'>+	kvm_register_write(vcpu, VCPU_REGS_RIP, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c<br/>index 73f43de69f67..6571926bfd33 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kvm/lapic.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kvm/lapic.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kvm/lapic.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kvm/lapic.c</a></div><div class='hunk'>@@ -32,6 +32,7 @@</div><div class='ctx'> #include &lt;asm/current.h&gt;</div><div class='ctx'> #include &lt;asm/apicdef.h&gt;</div><div class='ctx'> #include &lt;asm/atomic.h&gt;</div><div class='add'>+#include "kvm_cache_regs.h"</div><div class='ctx'> #include "irq.h"</div><div class='ctx'> </div><div class='ctx'> #define PRId64 "d"</div><div class='hunk'>@@ -338,13 +339,7 @@ static int __apic_accept_irq(struct kvm_lapic *apic, int delivery_mode,</div><div class='ctx'> 		} else</div><div class='ctx'> 			apic_clear_vector(vector, apic-&gt;regs + APIC_TMR);</div><div class='ctx'> </div><div class='del'>-		if (vcpu-&gt;arch.mp_state == KVM_MP_STATE_RUNNABLE)</div><div class='del'>-			kvm_vcpu_kick(vcpu);</div><div class='del'>-		else if (vcpu-&gt;arch.mp_state == KVM_MP_STATE_HALTED) {</div><div class='del'>-			vcpu-&gt;arch.mp_state = KVM_MP_STATE_RUNNABLE;</div><div class='del'>-			if (waitqueue_active(&amp;vcpu-&gt;wq))</div><div class='del'>-				wake_up_interruptible(&amp;vcpu-&gt;wq);</div><div class='del'>-		}</div><div class='add'>+		kvm_vcpu_kick(vcpu);</div><div class='ctx'> </div><div class='ctx'> 		result = (orig_irr == 0);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -370,21 +365,18 @@ static int __apic_accept_irq(struct kvm_lapic *apic, int delivery_mode,</div><div class='ctx'> 			vcpu-&gt;arch.mp_state = KVM_MP_STATE_INIT_RECEIVED;</div><div class='ctx'> 			kvm_vcpu_kick(vcpu);</div><div class='ctx'> 		} else {</div><div class='del'>-			printk(KERN_DEBUG</div><div class='del'>-			       "Ignoring de-assert INIT to vcpu %d\n",</div><div class='del'>-			       vcpu-&gt;vcpu_id);</div><div class='add'>+			apic_debug("Ignoring de-assert INIT to vcpu %d\n",</div><div class='add'>+				   vcpu-&gt;vcpu_id);</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case APIC_DM_STARTUP:</div><div class='del'>-		printk(KERN_DEBUG "SIPI to vcpu %d vector 0x%02x\n",</div><div class='del'>-		       vcpu-&gt;vcpu_id, vector);</div><div class='add'>+		apic_debug("SIPI to vcpu %d vector 0x%02x\n",</div><div class='add'>+			   vcpu-&gt;vcpu_id, vector);</div><div class='ctx'> 		if (vcpu-&gt;arch.mp_state == KVM_MP_STATE_INIT_RECEIVED) {</div><div class='ctx'> 			vcpu-&gt;arch.sipi_vector = vector;</div><div class='ctx'> 			vcpu-&gt;arch.mp_state = KVM_MP_STATE_SIPI_RECEIVED;</div><div class='del'>-			if (waitqueue_active(&amp;vcpu-&gt;wq))</div><div class='del'>-				wake_up_interruptible(&amp;vcpu-&gt;wq);</div><div class='add'>+			kvm_vcpu_kick(vcpu);</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='hunk'>@@ -438,7 +430,7 @@ struct kvm_vcpu *kvm_get_lowest_prio_vcpu(struct kvm *kvm, u8 vector,</div><div class='ctx'> static void apic_set_eoi(struct kvm_lapic *apic)</div><div class='ctx'> {</div><div class='ctx'> 	int vector = apic_find_highest_isr(apic);</div><div class='del'>-</div><div class='add'>+	int trigger_mode;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Not every write EOI will has corresponding ISR,</div><div class='ctx'> 	 * one example is when Kernel check timer on setup_IO_APIC</div><div class='hunk'>@@ -450,7 +442,10 @@ static void apic_set_eoi(struct kvm_lapic *apic)</div><div class='ctx'> 	apic_update_ppr(apic);</div><div class='ctx'> </div><div class='ctx'> 	if (apic_test_and_clear_vector(vector, apic-&gt;regs + APIC_TMR))</div><div class='del'>-		kvm_ioapic_update_eoi(apic-&gt;vcpu-&gt;kvm, vector);</div><div class='add'>+		trigger_mode = IOAPIC_LEVEL_TRIG;</div><div class='add'>+	else</div><div class='add'>+		trigger_mode = IOAPIC_EDGE_TRIG;</div><div class='add'>+	kvm_ioapic_update_eoi(apic-&gt;vcpu-&gt;kvm, vector, trigger_mode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void apic_send_ipi(struct kvm_lapic *apic)</div><div class='hunk'>@@ -558,8 +553,7 @@ static void __report_tpr_access(struct kvm_lapic *apic, bool write)</div><div class='ctx'> 	struct kvm_run *run = vcpu-&gt;run;</div><div class='ctx'> </div><div class='ctx'> 	set_bit(KVM_REQ_REPORT_TPR_ACCESS, &amp;vcpu-&gt;requests);</div><div class='del'>-	kvm_x86_ops-&gt;cache_regs(vcpu);</div><div class='del'>-	run-&gt;tpr_access.rip = vcpu-&gt;arch.rip;</div><div class='add'>+	run-&gt;tpr_access.rip = kvm_rip_read(vcpu);</div><div class='ctx'> 	run-&gt;tpr_access.is_write = write;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -683,9 +677,9 @@ static void apic_mmio_write(struct kvm_io_device *this,</div><div class='ctx'> 	 * Refer SDM 8.4.1</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (len != 4 || alignment) {</div><div class='del'>-		if (printk_ratelimit())</div><div class='del'>-			printk(KERN_ERR "apic write: bad size=%d %lx\n",</div><div class='del'>-			       len, (long)address);</div><div class='add'>+		/* Don't shout loud, $infamous_os would cause only noise. */</div><div class='add'>+		apic_debug("apic write: bad size=%d %lx\n",</div><div class='add'>+			   len, (long)address);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -947,10 +941,9 @@ static int __apic_timer_fn(struct kvm_lapic *apic)</div><div class='ctx'> </div><div class='ctx'> 	if(!atomic_inc_and_test(&amp;apic-&gt;timer.pending))</div><div class='ctx'> 		set_bit(KVM_REQ_PENDING_TIMER, &amp;apic-&gt;vcpu-&gt;requests);</div><div class='del'>-	if (waitqueue_active(q)) {</div><div class='del'>-		apic-&gt;vcpu-&gt;arch.mp_state = KVM_MP_STATE_RUNNABLE;</div><div class='add'>+	if (waitqueue_active(q))</div><div class='ctx'> 		wake_up_interruptible(q);</div><div class='del'>-	}</div><div class='add'>+</div><div class='ctx'> 	if (apic_lvtt_period(apic)) {</div><div class='ctx'> 		result = 1;</div><div class='ctx'> 		apic-&gt;timer.dev.expires = ktime_add_ns(</div><div class='head'>diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c<br/>index 3da2508eb22a..99c239c5c0ac 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kvm/mmu.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kvm/mmu.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kvm/mmu.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kvm/mmu.c</a></div><div class='hunk'>@@ -70,6 +70,9 @@ static int dbg = 0;</div><div class='ctx'> module_param(dbg, bool, 0644);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+static int oos_shadow = 1;</div><div class='add'>+module_param(oos_shadow, bool, 0644);</div><div class='add'>+</div><div class='ctx'> #ifndef MMU_DEBUG</div><div class='ctx'> #define ASSERT(x) do { } while (0)</div><div class='ctx'> #else</div><div class='hunk'>@@ -135,18 +138,24 @@ module_param(dbg, bool, 0644);</div><div class='ctx'> #define ACC_USER_MASK    PT_USER_MASK</div><div class='ctx'> #define ACC_ALL          (ACC_EXEC_MASK | ACC_WRITE_MASK | ACC_USER_MASK)</div><div class='ctx'> </div><div class='del'>-struct kvm_pv_mmu_op_buffer {</div><div class='del'>-	void *ptr;</div><div class='del'>-	unsigned len;</div><div class='del'>-	unsigned processed;</div><div class='del'>-	char buf[512] __aligned(sizeof(long));</div><div class='del'>-};</div><div class='add'>+#define SHADOW_PT_INDEX(addr, level) PT64_INDEX(addr, level)</div><div class='ctx'> </div><div class='ctx'> struct kvm_rmap_desc {</div><div class='ctx'> 	u64 *shadow_ptes[RMAP_EXT];</div><div class='ctx'> 	struct kvm_rmap_desc *more;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct kvm_shadow_walk {</div><div class='add'>+	int (*entry)(struct kvm_shadow_walk *walk, struct kvm_vcpu *vcpu,</div><div class='add'>+		     u64 addr, u64 *spte, int level);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct kvm_unsync_walk {</div><div class='add'>+	int (*entry) (struct kvm_mmu_page *sp, struct kvm_unsync_walk *walk);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+typedef int (*mmu_parent_walk_fn) (struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp);</div><div class='add'>+</div><div class='ctx'> static struct kmem_cache *pte_chain_cache;</div><div class='ctx'> static struct kmem_cache *rmap_desc_cache;</div><div class='ctx'> static struct kmem_cache *mmu_page_header_cache;</div><div class='hunk'>@@ -405,16 +414,19 @@ static int host_largepage_backed(struct kvm *kvm, gfn_t gfn)</div><div class='ctx'> {</div><div class='ctx'> 	struct vm_area_struct *vma;</div><div class='ctx'> 	unsigned long addr;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	addr = gfn_to_hva(kvm, gfn);</div><div class='ctx'> 	if (kvm_is_error_hva(addr))</div><div class='del'>-		return 0;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='add'>+	down_read(&amp;current-&gt;mm-&gt;mmap_sem);</div><div class='ctx'> 	vma = find_vma(current-&gt;mm, addr);</div><div class='ctx'> 	if (vma &amp;&amp; is_vm_hugetlb_page(vma))</div><div class='del'>-		return 1;</div><div class='add'>+		ret = 1;</div><div class='add'>+	up_read(&amp;current-&gt;mm-&gt;mmap_sem);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int is_largepage_backed(struct kvm_vcpu *vcpu, gfn_t large_gfn)</div><div class='hunk'>@@ -649,8 +661,6 @@ static void rmap_write_protect(struct kvm *kvm, u64 gfn)</div><div class='ctx'> </div><div class='ctx'> 	if (write_protected)</div><div class='ctx'> 		kvm_flush_remote_tlbs(kvm);</div><div class='del'>-</div><div class='del'>-	account_shadowed(kvm, gfn);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int kvm_unmap_rmapp(struct kvm *kvm, unsigned long *rmapp)</div><div class='hunk'>@@ -859,6 +869,77 @@ static void mmu_page_remove_parent_pte(struct kvm_mmu_page *sp,</div><div class='ctx'> 	BUG();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+static void mmu_parent_walk(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp,</div><div class='add'>+			    mmu_parent_walk_fn fn)</div><div class='add'>+{</div><div class='add'>+	struct kvm_pte_chain *pte_chain;</div><div class='add'>+	struct hlist_node *node;</div><div class='add'>+	struct kvm_mmu_page *parent_sp;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!sp-&gt;multimapped &amp;&amp; sp-&gt;parent_pte) {</div><div class='add'>+		parent_sp = page_header(__pa(sp-&gt;parent_pte));</div><div class='add'>+		fn(vcpu, parent_sp);</div><div class='add'>+		mmu_parent_walk(vcpu, parent_sp, fn);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	hlist_for_each_entry(pte_chain, node, &amp;sp-&gt;parent_ptes, link)</div><div class='add'>+		for (i = 0; i &lt; NR_PTE_CHAIN_ENTRIES; ++i) {</div><div class='add'>+			if (!pte_chain-&gt;parent_ptes[i])</div><div class='add'>+				break;</div><div class='add'>+			parent_sp = page_header(__pa(pte_chain-&gt;parent_ptes[i]));</div><div class='add'>+			fn(vcpu, parent_sp);</div><div class='add'>+			mmu_parent_walk(vcpu, parent_sp, fn);</div><div class='add'>+		}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void kvm_mmu_update_unsync_bitmap(u64 *spte)</div><div class='add'>+{</div><div class='add'>+	unsigned int index;</div><div class='add'>+	struct kvm_mmu_page *sp = page_header(__pa(spte));</div><div class='add'>+</div><div class='add'>+	index = spte - sp-&gt;spt;</div><div class='add'>+	__set_bit(index, sp-&gt;unsync_child_bitmap);</div><div class='add'>+	sp-&gt;unsync_children = 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void kvm_mmu_update_parents_unsync(struct kvm_mmu_page *sp)</div><div class='add'>+{</div><div class='add'>+	struct kvm_pte_chain *pte_chain;</div><div class='add'>+	struct hlist_node *node;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!sp-&gt;parent_pte)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!sp-&gt;multimapped) {</div><div class='add'>+		kvm_mmu_update_unsync_bitmap(sp-&gt;parent_pte);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry(pte_chain, node, &amp;sp-&gt;parent_ptes, link)</div><div class='add'>+		for (i = 0; i &lt; NR_PTE_CHAIN_ENTRIES; ++i) {</div><div class='add'>+			if (!pte_chain-&gt;parent_ptes[i])</div><div class='add'>+				break;</div><div class='add'>+			kvm_mmu_update_unsync_bitmap(pte_chain-&gt;parent_ptes[i]);</div><div class='add'>+		}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int unsync_walk_fn(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp)</div><div class='add'>+{</div><div class='add'>+	sp-&gt;unsync_children = 1;</div><div class='add'>+	kvm_mmu_update_parents_unsync(sp);</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void kvm_mmu_mark_parents_unsync(struct kvm_vcpu *vcpu,</div><div class='add'>+					struct kvm_mmu_page *sp)</div><div class='add'>+{</div><div class='add'>+	mmu_parent_walk(vcpu, sp, unsync_walk_fn);</div><div class='add'>+	kvm_mmu_update_parents_unsync(sp);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void nonpaging_prefetch_page(struct kvm_vcpu *vcpu,</div><div class='ctx'> 				    struct kvm_mmu_page *sp)</div><div class='ctx'> {</div><div class='hunk'>@@ -868,6 +949,58 @@ static void nonpaging_prefetch_page(struct kvm_vcpu *vcpu,</div><div class='ctx'> 		sp-&gt;spt[i] = shadow_trap_nonpresent_pte;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int nonpaging_sync_page(struct kvm_vcpu *vcpu,</div><div class='add'>+			       struct kvm_mmu_page *sp)</div><div class='add'>+{</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nonpaging_invlpg(struct kvm_vcpu *vcpu, gva_t gva)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define for_each_unsync_children(bitmap, idx)		\</div><div class='add'>+	for (idx = find_first_bit(bitmap, 512);		\</div><div class='add'>+	     idx &lt; 512;					\</div><div class='add'>+	     idx = find_next_bit(bitmap, 512, idx+1))</div><div class='add'>+</div><div class='add'>+static int mmu_unsync_walk(struct kvm_mmu_page *sp,</div><div class='add'>+			   struct kvm_unsync_walk *walker)</div><div class='add'>+{</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	if (!sp-&gt;unsync_children)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	for_each_unsync_children(sp-&gt;unsync_child_bitmap, i) {</div><div class='add'>+		u64 ent = sp-&gt;spt[i];</div><div class='add'>+</div><div class='add'>+		if (is_shadow_present_pte(ent)) {</div><div class='add'>+			struct kvm_mmu_page *child;</div><div class='add'>+			child = page_header(ent &amp; PT64_BASE_ADDR_MASK);</div><div class='add'>+</div><div class='add'>+			if (child-&gt;unsync_children) {</div><div class='add'>+				ret = mmu_unsync_walk(child, walker);</div><div class='add'>+				if (ret)</div><div class='add'>+					return ret;</div><div class='add'>+				__clear_bit(i, sp-&gt;unsync_child_bitmap);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (child-&gt;unsync) {</div><div class='add'>+				ret = walker-&gt;entry(child, walker);</div><div class='add'>+				__clear_bit(i, sp-&gt;unsync_child_bitmap);</div><div class='add'>+				if (ret)</div><div class='add'>+					return ret;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (find_first_bit(sp-&gt;unsync_child_bitmap, 512) == 512)</div><div class='add'>+		sp-&gt;unsync_children = 0;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct kvm_mmu_page *kvm_mmu_lookup_page(struct kvm *kvm, gfn_t gfn)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned index;</div><div class='hunk'>@@ -888,6 +1021,59 @@ static struct kvm_mmu_page *kvm_mmu_lookup_page(struct kvm *kvm, gfn_t gfn)</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void kvm_unlink_unsync_page(struct kvm *kvm, struct kvm_mmu_page *sp)</div><div class='add'>+{</div><div class='add'>+	WARN_ON(!sp-&gt;unsync);</div><div class='add'>+	sp-&gt;unsync = 0;</div><div class='add'>+	--kvm-&gt;stat.mmu_unsync;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int kvm_mmu_zap_page(struct kvm *kvm, struct kvm_mmu_page *sp);</div><div class='add'>+</div><div class='add'>+static int kvm_sync_page(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp)</div><div class='add'>+{</div><div class='add'>+	if (sp-&gt;role.glevels != vcpu-&gt;arch.mmu.root_level) {</div><div class='add'>+		kvm_mmu_zap_page(vcpu-&gt;kvm, sp);</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rmap_write_protect(vcpu-&gt;kvm, sp-&gt;gfn);</div><div class='add'>+	if (vcpu-&gt;arch.mmu.sync_page(vcpu, sp)) {</div><div class='add'>+		kvm_mmu_zap_page(vcpu-&gt;kvm, sp);</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kvm_mmu_flush_tlb(vcpu);</div><div class='add'>+	kvm_unlink_unsync_page(vcpu-&gt;kvm, sp);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct sync_walker {</div><div class='add'>+	struct kvm_vcpu *vcpu;</div><div class='add'>+	struct kvm_unsync_walk walker;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int mmu_sync_fn(struct kvm_mmu_page *sp, struct kvm_unsync_walk *walk)</div><div class='add'>+{</div><div class='add'>+	struct sync_walker *sync_walk = container_of(walk, struct sync_walker,</div><div class='add'>+						     walker);</div><div class='add'>+	struct kvm_vcpu *vcpu = sync_walk-&gt;vcpu;</div><div class='add'>+</div><div class='add'>+	kvm_sync_page(vcpu, sp);</div><div class='add'>+	return (need_resched() || spin_needbreak(&amp;vcpu-&gt;kvm-&gt;mmu_lock));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mmu_sync_children(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp)</div><div class='add'>+{</div><div class='add'>+	struct sync_walker walker = {</div><div class='add'>+		.walker = { .entry = mmu_sync_fn, },</div><div class='add'>+		.vcpu = vcpu,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	while (mmu_unsync_walk(sp, &amp;walker.walker))</div><div class='add'>+		cond_resched_lock(&amp;vcpu-&gt;kvm-&gt;mmu_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct kvm_mmu_page *kvm_mmu_get_page(struct kvm_vcpu *vcpu,</div><div class='ctx'> 					     gfn_t gfn,</div><div class='ctx'> 					     gva_t gaddr,</div><div class='hunk'>@@ -901,7 +1087,7 @@ static struct kvm_mmu_page *kvm_mmu_get_page(struct kvm_vcpu *vcpu,</div><div class='ctx'> 	unsigned quadrant;</div><div class='ctx'> 	struct hlist_head *bucket;</div><div class='ctx'> 	struct kvm_mmu_page *sp;</div><div class='del'>-	struct hlist_node *node;</div><div class='add'>+	struct hlist_node *node, *tmp;</div><div class='ctx'> </div><div class='ctx'> 	role.word = 0;</div><div class='ctx'> 	role.glevels = vcpu-&gt;arch.mmu.root_level;</div><div class='hunk'>@@ -917,9 +1103,20 @@ static struct kvm_mmu_page *kvm_mmu_get_page(struct kvm_vcpu *vcpu,</div><div class='ctx'> 		 gfn, role.word);</div><div class='ctx'> 	index = kvm_page_table_hashfn(gfn);</div><div class='ctx'> 	bucket = &amp;vcpu-&gt;kvm-&gt;arch.mmu_page_hash[index];</div><div class='del'>-	hlist_for_each_entry(sp, node, bucket, hash_link)</div><div class='del'>-		if (sp-&gt;gfn == gfn &amp;&amp; sp-&gt;role.word == role.word) {</div><div class='add'>+	hlist_for_each_entry_safe(sp, node, tmp, bucket, hash_link)</div><div class='add'>+		if (sp-&gt;gfn == gfn) {</div><div class='add'>+			if (sp-&gt;unsync)</div><div class='add'>+				if (kvm_sync_page(vcpu, sp))</div><div class='add'>+					continue;</div><div class='add'>+</div><div class='add'>+			if (sp-&gt;role.word != role.word)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='ctx'> 			mmu_page_add_parent_pte(vcpu, sp, parent_pte);</div><div class='add'>+			if (sp-&gt;unsync_children) {</div><div class='add'>+				set_bit(KVM_REQ_MMU_SYNC, &amp;vcpu-&gt;requests);</div><div class='add'>+				kvm_mmu_mark_parents_unsync(vcpu, sp);</div><div class='add'>+			}</div><div class='ctx'> 			pgprintk("%s: found\n", __func__);</div><div class='ctx'> 			return sp;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -931,8 +1128,10 @@ static struct kvm_mmu_page *kvm_mmu_get_page(struct kvm_vcpu *vcpu,</div><div class='ctx'> 	sp-&gt;gfn = gfn;</div><div class='ctx'> 	sp-&gt;role = role;</div><div class='ctx'> 	hlist_add_head(&amp;sp-&gt;hash_link, bucket);</div><div class='del'>-	if (!metaphysical)</div><div class='add'>+	if (!metaphysical) {</div><div class='ctx'> 		rmap_write_protect(vcpu-&gt;kvm, gfn);</div><div class='add'>+		account_shadowed(vcpu-&gt;kvm, gfn);</div><div class='add'>+	}</div><div class='ctx'> 	if (shadow_trap_nonpresent_pte != shadow_notrap_nonpresent_pte)</div><div class='ctx'> 		vcpu-&gt;arch.mmu.prefetch_page(vcpu, sp);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -940,6 +1139,35 @@ static struct kvm_mmu_page *kvm_mmu_get_page(struct kvm_vcpu *vcpu,</div><div class='ctx'> 	return sp;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int walk_shadow(struct kvm_shadow_walk *walker,</div><div class='add'>+		       struct kvm_vcpu *vcpu, u64 addr)</div><div class='add'>+{</div><div class='add'>+	hpa_t shadow_addr;</div><div class='add'>+	int level;</div><div class='add'>+	int r;</div><div class='add'>+	u64 *sptep;</div><div class='add'>+	unsigned index;</div><div class='add'>+</div><div class='add'>+	shadow_addr = vcpu-&gt;arch.mmu.root_hpa;</div><div class='add'>+	level = vcpu-&gt;arch.mmu.shadow_root_level;</div><div class='add'>+	if (level == PT32E_ROOT_LEVEL) {</div><div class='add'>+		shadow_addr = vcpu-&gt;arch.mmu.pae_root[(addr &gt;&gt; 30) &amp; 3];</div><div class='add'>+		shadow_addr &amp;= PT64_BASE_ADDR_MASK;</div><div class='add'>+		--level;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	while (level &gt;= PT_PAGE_TABLE_LEVEL) {</div><div class='add'>+		index = SHADOW_PT_INDEX(addr, level);</div><div class='add'>+		sptep = ((u64 *)__va(shadow_addr)) + index;</div><div class='add'>+		r = walker-&gt;entry(walker, vcpu, addr, sptep, level);</div><div class='add'>+		if (r)</div><div class='add'>+			return r;</div><div class='add'>+		shadow_addr = *sptep &amp; PT64_BASE_ADDR_MASK;</div><div class='add'>+		--level;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void kvm_mmu_page_unlink_children(struct kvm *kvm,</div><div class='ctx'> 					 struct kvm_mmu_page *sp)</div><div class='ctx'> {</div><div class='hunk'>@@ -955,7 +1183,6 @@ static void kvm_mmu_page_unlink_children(struct kvm *kvm,</div><div class='ctx'> 				rmap_remove(kvm, &amp;pt[i]);</div><div class='ctx'> 			pt[i] = shadow_trap_nonpresent_pte;</div><div class='ctx'> 		}</div><div class='del'>-		kvm_flush_remote_tlbs(kvm);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -974,7 +1201,6 @@ static void kvm_mmu_page_unlink_children(struct kvm *kvm,</div><div class='ctx'> 		}</div><div class='ctx'> 		pt[i] = shadow_trap_nonpresent_pte;</div><div class='ctx'> 	}</div><div class='del'>-	kvm_flush_remote_tlbs(kvm);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void kvm_mmu_put_page(struct kvm_mmu_page *sp, u64 *parent_pte)</div><div class='hunk'>@@ -991,11 +1217,10 @@ static void kvm_mmu_reset_last_pte_updated(struct kvm *kvm)</div><div class='ctx'> 			kvm-&gt;vcpus[i]-&gt;arch.last_pte_updated = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void kvm_mmu_zap_page(struct kvm *kvm, struct kvm_mmu_page *sp)</div><div class='add'>+static void kvm_mmu_unlink_parents(struct kvm *kvm, struct kvm_mmu_page *sp)</div><div class='ctx'> {</div><div class='ctx'> 	u64 *parent_pte;</div><div class='ctx'> </div><div class='del'>-	++kvm-&gt;stat.mmu_shadow_zapped;</div><div class='ctx'> 	while (sp-&gt;multimapped || sp-&gt;parent_pte) {</div><div class='ctx'> 		if (!sp-&gt;multimapped)</div><div class='ctx'> 			parent_pte = sp-&gt;parent_pte;</div><div class='hunk'>@@ -1010,21 +1235,59 @@ static void kvm_mmu_zap_page(struct kvm *kvm, struct kvm_mmu_page *sp)</div><div class='ctx'> 		kvm_mmu_put_page(sp, parent_pte);</div><div class='ctx'> 		set_shadow_pte(parent_pte, shadow_trap_nonpresent_pte);</div><div class='ctx'> 	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct zap_walker {</div><div class='add'>+	struct kvm_unsync_walk walker;</div><div class='add'>+	struct kvm *kvm;</div><div class='add'>+	int zapped;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int mmu_zap_fn(struct kvm_mmu_page *sp, struct kvm_unsync_walk *walk)</div><div class='add'>+{</div><div class='add'>+	struct zap_walker *zap_walk = container_of(walk, struct zap_walker,</div><div class='add'>+						     walker);</div><div class='add'>+	kvm_mmu_zap_page(zap_walk-&gt;kvm, sp);</div><div class='add'>+	zap_walk-&gt;zapped = 1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mmu_zap_unsync_children(struct kvm *kvm, struct kvm_mmu_page *sp)</div><div class='add'>+{</div><div class='add'>+	struct zap_walker walker = {</div><div class='add'>+		.walker = { .entry = mmu_zap_fn, },</div><div class='add'>+		.kvm = kvm,</div><div class='add'>+		.zapped = 0,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (sp-&gt;role.level == PT_PAGE_TABLE_LEVEL)</div><div class='add'>+		return 0;</div><div class='add'>+	mmu_unsync_walk(sp, &amp;walker.walker);</div><div class='add'>+	return walker.zapped;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int kvm_mmu_zap_page(struct kvm *kvm, struct kvm_mmu_page *sp)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	++kvm-&gt;stat.mmu_shadow_zapped;</div><div class='add'>+	ret = mmu_zap_unsync_children(kvm, sp);</div><div class='ctx'> 	kvm_mmu_page_unlink_children(kvm, sp);</div><div class='add'>+	kvm_mmu_unlink_parents(kvm, sp);</div><div class='add'>+	kvm_flush_remote_tlbs(kvm);</div><div class='add'>+	if (!sp-&gt;role.invalid &amp;&amp; !sp-&gt;role.metaphysical)</div><div class='add'>+		unaccount_shadowed(kvm, sp-&gt;gfn);</div><div class='add'>+	if (sp-&gt;unsync)</div><div class='add'>+		kvm_unlink_unsync_page(kvm, sp);</div><div class='ctx'> 	if (!sp-&gt;root_count) {</div><div class='del'>-		if (!sp-&gt;role.metaphysical &amp;&amp; !sp-&gt;role.invalid)</div><div class='del'>-			unaccount_shadowed(kvm, sp-&gt;gfn);</div><div class='ctx'> 		hlist_del(&amp;sp-&gt;hash_link);</div><div class='ctx'> 		kvm_mmu_free_page(kvm, sp);</div><div class='ctx'> 	} else {</div><div class='del'>-		int invalid = sp-&gt;role.invalid;</div><div class='del'>-		list_move(&amp;sp-&gt;link, &amp;kvm-&gt;arch.active_mmu_pages);</div><div class='ctx'> 		sp-&gt;role.invalid = 1;</div><div class='add'>+		list_move(&amp;sp-&gt;link, &amp;kvm-&gt;arch.active_mmu_pages);</div><div class='ctx'> 		kvm_reload_remote_mmus(kvm);</div><div class='del'>-		if (!sp-&gt;role.metaphysical &amp;&amp; !invalid)</div><div class='del'>-			unaccount_shadowed(kvm, sp-&gt;gfn);</div><div class='ctx'> 	}</div><div class='ctx'> 	kvm_mmu_reset_last_pte_updated(kvm);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1077,8 +1340,9 @@ static int kvm_mmu_unprotect_page(struct kvm *kvm, gfn_t gfn)</div><div class='ctx'> 		if (sp-&gt;gfn == gfn &amp;&amp; !sp-&gt;role.metaphysical) {</div><div class='ctx'> 			pgprintk("%s: gfn %lx role %x\n", __func__, gfn,</div><div class='ctx'> 				 sp-&gt;role.word);</div><div class='del'>-			kvm_mmu_zap_page(kvm, sp);</div><div class='ctx'> 			r = 1;</div><div class='add'>+			if (kvm_mmu_zap_page(kvm, sp))</div><div class='add'>+				n = bucket-&gt;first;</div><div class='ctx'> 		}</div><div class='ctx'> 	return r;</div><div class='ctx'> }</div><div class='hunk'>@@ -1101,6 +1365,20 @@ static void page_header_update_slot(struct kvm *kvm, void *pte, gfn_t gfn)</div><div class='ctx'> 	__set_bit(slot, &amp;sp-&gt;slot_bitmap);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void mmu_convert_notrap(struct kvm_mmu_page *sp)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	u64 *pt = sp-&gt;spt;</div><div class='add'>+</div><div class='add'>+	if (shadow_trap_nonpresent_pte == shadow_notrap_nonpresent_pte)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; PT64_ENT_PER_PAGE; ++i) {</div><div class='add'>+		if (pt[i] == shadow_notrap_nonpresent_pte)</div><div class='add'>+			set_shadow_pte(&amp;pt[i], shadow_trap_nonpresent_pte);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> struct page *gva_to_page(struct kvm_vcpu *vcpu, gva_t gva)</div><div class='ctx'> {</div><div class='ctx'> 	struct page *page;</div><div class='hunk'>@@ -1110,51 +1388,60 @@ struct page *gva_to_page(struct kvm_vcpu *vcpu, gva_t gva)</div><div class='ctx'> 	if (gpa == UNMAPPED_GVA)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	down_read(&amp;current-&gt;mm-&gt;mmap_sem);</div><div class='ctx'> 	page = gfn_to_page(vcpu-&gt;kvm, gpa &gt;&gt; PAGE_SHIFT);</div><div class='del'>-	up_read(&amp;current-&gt;mm-&gt;mmap_sem);</div><div class='ctx'> </div><div class='ctx'> 	return page;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mmu_set_spte(struct kvm_vcpu *vcpu, u64 *shadow_pte,</div><div class='del'>-			 unsigned pt_access, unsigned pte_access,</div><div class='del'>-			 int user_fault, int write_fault, int dirty,</div><div class='del'>-			 int *ptwrite, int largepage, gfn_t gfn,</div><div class='del'>-			 pfn_t pfn, bool speculative)</div><div class='add'>+static int kvm_unsync_page(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp)</div><div class='ctx'> {</div><div class='del'>-	u64 spte;</div><div class='del'>-	int was_rmapped = 0;</div><div class='del'>-	int was_writeble = is_writeble_pte(*shadow_pte);</div><div class='add'>+	unsigned index;</div><div class='add'>+	struct hlist_head *bucket;</div><div class='add'>+	struct kvm_mmu_page *s;</div><div class='add'>+	struct hlist_node *node, *n;</div><div class='ctx'> </div><div class='del'>-	pgprintk("%s: spte %llx access %x write_fault %d"</div><div class='del'>-		 " user_fault %d gfn %lx\n",</div><div class='del'>-		 __func__, *shadow_pte, pt_access,</div><div class='del'>-		 write_fault, user_fault, gfn);</div><div class='add'>+	index = kvm_page_table_hashfn(sp-&gt;gfn);</div><div class='add'>+	bucket = &amp;vcpu-&gt;kvm-&gt;arch.mmu_page_hash[index];</div><div class='add'>+	/* don't unsync if pagetable is shadowed with multiple roles */</div><div class='add'>+	hlist_for_each_entry_safe(s, node, n, bucket, hash_link) {</div><div class='add'>+		if (s-&gt;gfn != sp-&gt;gfn || s-&gt;role.metaphysical)</div><div class='add'>+			continue;</div><div class='add'>+		if (s-&gt;role.word != sp-&gt;role.word)</div><div class='add'>+			return 1;</div><div class='add'>+	}</div><div class='add'>+	kvm_mmu_mark_parents_unsync(vcpu, sp);</div><div class='add'>+	++vcpu-&gt;kvm-&gt;stat.mmu_unsync;</div><div class='add'>+	sp-&gt;unsync = 1;</div><div class='add'>+	mmu_convert_notrap(sp);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (is_rmap_pte(*shadow_pte)) {</div><div class='del'>-		/*</div><div class='del'>-		 * If we overwrite a PTE page pointer with a 2MB PMD, unlink</div><div class='del'>-		 * the parent of the now unreachable PTE.</div><div class='del'>-		 */</div><div class='del'>-		if (largepage &amp;&amp; !is_large_pte(*shadow_pte)) {</div><div class='del'>-			struct kvm_mmu_page *child;</div><div class='del'>-			u64 pte = *shadow_pte;</div><div class='add'>+static int mmu_need_write_protect(struct kvm_vcpu *vcpu, gfn_t gfn,</div><div class='add'>+				  bool can_unsync)</div><div class='add'>+{</div><div class='add'>+	struct kvm_mmu_page *shadow;</div><div class='ctx'> </div><div class='del'>-			child = page_header(pte &amp; PT64_BASE_ADDR_MASK);</div><div class='del'>-			mmu_page_remove_parent_pte(child, shadow_pte);</div><div class='del'>-		} else if (pfn != spte_to_pfn(*shadow_pte)) {</div><div class='del'>-			pgprintk("hfn old %lx new %lx\n",</div><div class='del'>-				 spte_to_pfn(*shadow_pte), pfn);</div><div class='del'>-			rmap_remove(vcpu-&gt;kvm, shadow_pte);</div><div class='del'>-		} else {</div><div class='del'>-			if (largepage)</div><div class='del'>-				was_rmapped = is_large_pte(*shadow_pte);</div><div class='del'>-			else</div><div class='del'>-				was_rmapped = 1;</div><div class='del'>-		}</div><div class='add'>+	shadow = kvm_mmu_lookup_page(vcpu-&gt;kvm, gfn);</div><div class='add'>+	if (shadow) {</div><div class='add'>+		if (shadow-&gt;role.level != PT_PAGE_TABLE_LEVEL)</div><div class='add'>+			return 1;</div><div class='add'>+		if (shadow-&gt;unsync)</div><div class='add'>+			return 0;</div><div class='add'>+		if (can_unsync &amp;&amp; oos_shadow)</div><div class='add'>+			return kvm_unsync_page(vcpu, shadow);</div><div class='add'>+		return 1;</div><div class='ctx'> 	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='add'>+static int set_spte(struct kvm_vcpu *vcpu, u64 *shadow_pte,</div><div class='add'>+		    unsigned pte_access, int user_fault,</div><div class='add'>+		    int write_fault, int dirty, int largepage,</div><div class='add'>+		    gfn_t gfn, pfn_t pfn, bool speculative,</div><div class='add'>+		    bool can_unsync)</div><div class='add'>+{</div><div class='add'>+	u64 spte;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We don't set the accessed bit, since we sometimes want to see</div><div class='ctx'> 	 * whether the guest actually used the pte (in order to detect</div><div class='hunk'>@@ -1162,7 +1449,7 @@ static void mmu_set_spte(struct kvm_vcpu *vcpu, u64 *shadow_pte,</div><div class='ctx'> 	 */</div><div class='ctx'> 	spte = shadow_base_present_pte | shadow_dirty_mask;</div><div class='ctx'> 	if (!speculative)</div><div class='del'>-		pte_access |= PT_ACCESSED_MASK;</div><div class='add'>+		spte |= shadow_accessed_mask;</div><div class='ctx'> 	if (!dirty)</div><div class='ctx'> 		pte_access &amp;= ~ACC_WRITE_MASK;</div><div class='ctx'> 	if (pte_access &amp; ACC_EXEC_MASK)</div><div class='hunk'>@@ -1178,35 +1465,82 @@ static void mmu_set_spte(struct kvm_vcpu *vcpu, u64 *shadow_pte,</div><div class='ctx'> </div><div class='ctx'> 	if ((pte_access &amp; ACC_WRITE_MASK)</div><div class='ctx'> 	    || (write_fault &amp;&amp; !is_write_protection(vcpu) &amp;&amp; !user_fault)) {</div><div class='del'>-		struct kvm_mmu_page *shadow;</div><div class='add'>+</div><div class='add'>+		if (largepage &amp;&amp; has_wrprotected_page(vcpu-&gt;kvm, gfn)) {</div><div class='add'>+			ret = 1;</div><div class='add'>+			spte = shadow_trap_nonpresent_pte;</div><div class='add'>+			goto set_pte;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		spte |= PT_WRITABLE_MASK;</div><div class='ctx'> </div><div class='del'>-		shadow = kvm_mmu_lookup_page(vcpu-&gt;kvm, gfn);</div><div class='del'>-		if (shadow ||</div><div class='del'>-		   (largepage &amp;&amp; has_wrprotected_page(vcpu-&gt;kvm, gfn))) {</div><div class='add'>+		if (mmu_need_write_protect(vcpu, gfn, can_unsync)) {</div><div class='ctx'> 			pgprintk("%s: found shadow page for %lx, marking ro\n",</div><div class='ctx'> 				 __func__, gfn);</div><div class='add'>+			ret = 1;</div><div class='ctx'> 			pte_access &amp;= ~ACC_WRITE_MASK;</div><div class='del'>-			if (is_writeble_pte(spte)) {</div><div class='add'>+			if (is_writeble_pte(spte))</div><div class='ctx'> 				spte &amp;= ~PT_WRITABLE_MASK;</div><div class='del'>-				kvm_x86_ops-&gt;tlb_flush(vcpu);</div><div class='del'>-			}</div><div class='del'>-			if (write_fault)</div><div class='del'>-				*ptwrite = 1;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (pte_access &amp; ACC_WRITE_MASK)</div><div class='ctx'> 		mark_page_dirty(vcpu-&gt;kvm, gfn);</div><div class='ctx'> </div><div class='del'>-	pgprintk("%s: setting spte %llx\n", __func__, spte);</div><div class='del'>-	pgprintk("instantiating %s PTE (%s) at %ld (%llx) addr %p\n",</div><div class='del'>-		 (spte&amp;PT_PAGE_SIZE_MASK)? "2MB" : "4kB",</div><div class='del'>-		 (spte&amp;PT_WRITABLE_MASK)?"RW":"R", gfn, spte, shadow_pte);</div><div class='add'>+set_pte:</div><div class='ctx'> 	set_shadow_pte(shadow_pte, spte);</div><div class='del'>-	if (!was_rmapped &amp;&amp; (spte &amp; PT_PAGE_SIZE_MASK)</div><div class='del'>-	    &amp;&amp; (spte &amp; PT_PRESENT_MASK))</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mmu_set_spte(struct kvm_vcpu *vcpu, u64 *shadow_pte,</div><div class='add'>+			 unsigned pt_access, unsigned pte_access,</div><div class='add'>+			 int user_fault, int write_fault, int dirty,</div><div class='add'>+			 int *ptwrite, int largepage, gfn_t gfn,</div><div class='add'>+			 pfn_t pfn, bool speculative)</div><div class='add'>+{</div><div class='add'>+	int was_rmapped = 0;</div><div class='add'>+	int was_writeble = is_writeble_pte(*shadow_pte);</div><div class='add'>+</div><div class='add'>+	pgprintk("%s: spte %llx access %x write_fault %d"</div><div class='add'>+		 " user_fault %d gfn %lx\n",</div><div class='add'>+		 __func__, *shadow_pte, pt_access,</div><div class='add'>+		 write_fault, user_fault, gfn);</div><div class='add'>+</div><div class='add'>+	if (is_rmap_pte(*shadow_pte)) {</div><div class='add'>+		/*</div><div class='add'>+		 * If we overwrite a PTE page pointer with a 2MB PMD, unlink</div><div class='add'>+		 * the parent of the now unreachable PTE.</div><div class='add'>+		 */</div><div class='add'>+		if (largepage &amp;&amp; !is_large_pte(*shadow_pte)) {</div><div class='add'>+			struct kvm_mmu_page *child;</div><div class='add'>+			u64 pte = *shadow_pte;</div><div class='add'>+</div><div class='add'>+			child = page_header(pte &amp; PT64_BASE_ADDR_MASK);</div><div class='add'>+			mmu_page_remove_parent_pte(child, shadow_pte);</div><div class='add'>+		} else if (pfn != spte_to_pfn(*shadow_pte)) {</div><div class='add'>+			pgprintk("hfn old %lx new %lx\n",</div><div class='add'>+				 spte_to_pfn(*shadow_pte), pfn);</div><div class='add'>+			rmap_remove(vcpu-&gt;kvm, shadow_pte);</div><div class='add'>+		} else {</div><div class='add'>+			if (largepage)</div><div class='add'>+				was_rmapped = is_large_pte(*shadow_pte);</div><div class='add'>+			else</div><div class='add'>+				was_rmapped = 1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (set_spte(vcpu, shadow_pte, pte_access, user_fault, write_fault,</div><div class='add'>+		      dirty, largepage, gfn, pfn, speculative, true)) {</div><div class='add'>+		if (write_fault)</div><div class='add'>+			*ptwrite = 1;</div><div class='add'>+		kvm_x86_ops-&gt;tlb_flush(vcpu);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pgprintk("%s: setting spte %llx\n", __func__, *shadow_pte);</div><div class='add'>+	pgprintk("instantiating %s PTE (%s) at %ld (%llx) addr %p\n",</div><div class='add'>+		 is_large_pte(*shadow_pte)? "2MB" : "4kB",</div><div class='add'>+		 is_present_pte(*shadow_pte)?"RW":"R", gfn,</div><div class='add'>+		 *shadow_pte, shadow_pte);</div><div class='add'>+	if (!was_rmapped &amp;&amp; is_large_pte(*shadow_pte))</div><div class='ctx'> 		++vcpu-&gt;kvm-&gt;stat.lpages;</div><div class='ctx'> </div><div class='ctx'> 	page_header_update_slot(vcpu-&gt;kvm, shadow_pte, gfn);</div><div class='hunk'>@@ -1230,54 +1564,67 @@ static void nonpaging_new_cr3(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __direct_map(struct kvm_vcpu *vcpu, gpa_t v, int write,</div><div class='del'>-			   int largepage, gfn_t gfn, pfn_t pfn,</div><div class='del'>-			   int level)</div><div class='del'>-{</div><div class='del'>-	hpa_t table_addr = vcpu-&gt;arch.mmu.root_hpa;</div><div class='del'>-	int pt_write = 0;</div><div class='del'>-</div><div class='del'>-	for (; ; level--) {</div><div class='del'>-		u32 index = PT64_INDEX(v, level);</div><div class='del'>-		u64 *table;</div><div class='del'>-</div><div class='del'>-		ASSERT(VALID_PAGE(table_addr));</div><div class='del'>-		table = __va(table_addr);</div><div class='add'>+struct direct_shadow_walk {</div><div class='add'>+	struct kvm_shadow_walk walker;</div><div class='add'>+	pfn_t pfn;</div><div class='add'>+	int write;</div><div class='add'>+	int largepage;</div><div class='add'>+	int pt_write;</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-		if (level == 1) {</div><div class='del'>-			mmu_set_spte(vcpu, &amp;table[index], ACC_ALL, ACC_ALL,</div><div class='del'>-				     0, write, 1, &amp;pt_write, 0, gfn, pfn, false);</div><div class='del'>-			return pt_write;</div><div class='del'>-		}</div><div class='add'>+static int direct_map_entry(struct kvm_shadow_walk *_walk,</div><div class='add'>+			    struct kvm_vcpu *vcpu,</div><div class='add'>+			    u64 addr, u64 *sptep, int level)</div><div class='add'>+{</div><div class='add'>+	struct direct_shadow_walk *walk =</div><div class='add'>+		container_of(_walk, struct direct_shadow_walk, walker);</div><div class='add'>+	struct kvm_mmu_page *sp;</div><div class='add'>+	gfn_t pseudo_gfn;</div><div class='add'>+	gfn_t gfn = addr &gt;&gt; PAGE_SHIFT;</div><div class='add'>+</div><div class='add'>+	if (level == PT_PAGE_TABLE_LEVEL</div><div class='add'>+	    || (walk-&gt;largepage &amp;&amp; level == PT_DIRECTORY_LEVEL)) {</div><div class='add'>+		mmu_set_spte(vcpu, sptep, ACC_ALL, ACC_ALL,</div><div class='add'>+			     0, walk-&gt;write, 1, &amp;walk-&gt;pt_write,</div><div class='add'>+			     walk-&gt;largepage, gfn, walk-&gt;pfn, false);</div><div class='add'>+		++vcpu-&gt;stat.pf_fixed;</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		if (largepage &amp;&amp; level == 2) {</div><div class='del'>-			mmu_set_spte(vcpu, &amp;table[index], ACC_ALL, ACC_ALL,</div><div class='del'>-				     0, write, 1, &amp;pt_write, 1, gfn, pfn, false);</div><div class='del'>-			return pt_write;</div><div class='add'>+	if (*sptep == shadow_trap_nonpresent_pte) {</div><div class='add'>+		pseudo_gfn = (addr &amp; PT64_DIR_BASE_ADDR_MASK) &gt;&gt; PAGE_SHIFT;</div><div class='add'>+		sp = kvm_mmu_get_page(vcpu, pseudo_gfn, (gva_t)addr, level - 1,</div><div class='add'>+				      1, ACC_ALL, sptep);</div><div class='add'>+		if (!sp) {</div><div class='add'>+			pgprintk("nonpaging_map: ENOMEM\n");</div><div class='add'>+			kvm_release_pfn_clean(walk-&gt;pfn);</div><div class='add'>+			return -ENOMEM;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (table[index] == shadow_trap_nonpresent_pte) {</div><div class='del'>-			struct kvm_mmu_page *new_table;</div><div class='del'>-			gfn_t pseudo_gfn;</div><div class='del'>-</div><div class='del'>-			pseudo_gfn = (v &amp; PT64_DIR_BASE_ADDR_MASK)</div><div class='del'>-				&gt;&gt; PAGE_SHIFT;</div><div class='del'>-			new_table = kvm_mmu_get_page(vcpu, pseudo_gfn,</div><div class='del'>-						     v, level - 1,</div><div class='del'>-						     1, ACC_ALL, &amp;table[index]);</div><div class='del'>-			if (!new_table) {</div><div class='del'>-				pgprintk("nonpaging_map: ENOMEM\n");</div><div class='del'>-				kvm_release_pfn_clean(pfn);</div><div class='del'>-				return -ENOMEM;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			set_shadow_pte(&amp;table[index],</div><div class='del'>-				       __pa(new_table-&gt;spt)</div><div class='del'>-				       | PT_PRESENT_MASK | PT_WRITABLE_MASK</div><div class='del'>-				       | shadow_user_mask | shadow_x_mask);</div><div class='del'>-		}</div><div class='del'>-		table_addr = table[index] &amp; PT64_BASE_ADDR_MASK;</div><div class='add'>+		set_shadow_pte(sptep,</div><div class='add'>+			       __pa(sp-&gt;spt)</div><div class='add'>+			       | PT_PRESENT_MASK | PT_WRITABLE_MASK</div><div class='add'>+			       | shadow_user_mask | shadow_x_mask);</div><div class='ctx'> 	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __direct_map(struct kvm_vcpu *vcpu, gpa_t v, int write,</div><div class='add'>+			int largepage, gfn_t gfn, pfn_t pfn)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+	struct direct_shadow_walk walker = {</div><div class='add'>+		.walker = { .entry = direct_map_entry, },</div><div class='add'>+		.pfn = pfn,</div><div class='add'>+		.largepage = largepage,</div><div class='add'>+		.write = write,</div><div class='add'>+		.pt_write = 0,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	r = walk_shadow(&amp;walker.walker, vcpu, gfn &lt;&lt; PAGE_SHIFT);</div><div class='add'>+	if (r &lt; 0)</div><div class='add'>+		return r;</div><div class='add'>+	return walker.pt_write;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int nonpaging_map(struct kvm_vcpu *vcpu, gva_t v, int write, gfn_t gfn)</div><div class='hunk'>@@ -1287,16 +1634,14 @@ static int nonpaging_map(struct kvm_vcpu *vcpu, gva_t v, int write, gfn_t gfn)</div><div class='ctx'> 	pfn_t pfn;</div><div class='ctx'> 	unsigned long mmu_seq;</div><div class='ctx'> </div><div class='del'>-	down_read(&amp;current-&gt;mm-&gt;mmap_sem);</div><div class='ctx'> 	if (is_largepage_backed(vcpu, gfn &amp; ~(KVM_PAGES_PER_HPAGE-1))) {</div><div class='ctx'> 		gfn &amp;= ~(KVM_PAGES_PER_HPAGE-1);</div><div class='ctx'> 		largepage = 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mmu_seq = vcpu-&gt;kvm-&gt;mmu_notifier_seq;</div><div class='del'>-	/* implicit mb(), we'll read before PT lock is unlocked */</div><div class='add'>+	smp_rmb();</div><div class='ctx'> 	pfn = gfn_to_pfn(vcpu-&gt;kvm, gfn);</div><div class='del'>-	up_read(&amp;current-&gt;mm-&gt;mmap_sem);</div><div class='ctx'> </div><div class='ctx'> 	/* mmio */</div><div class='ctx'> 	if (is_error_pfn(pfn)) {</div><div class='hunk'>@@ -1308,8 +1653,7 @@ static int nonpaging_map(struct kvm_vcpu *vcpu, gva_t v, int write, gfn_t gfn)</div><div class='ctx'> 	if (mmu_notifier_retry(vcpu, mmu_seq))</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> 	kvm_mmu_free_some_pages(vcpu);</div><div class='del'>-	r = __direct_map(vcpu, v, write, largepage, gfn, pfn,</div><div class='del'>-			 PT32E_ROOT_LEVEL);</div><div class='add'>+	r = __direct_map(vcpu, v, write, largepage, gfn, pfn);</div><div class='ctx'> 	spin_unlock(&amp;vcpu-&gt;kvm-&gt;mmu_lock);</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -1405,6 +1749,37 @@ static void mmu_alloc_roots(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	vcpu-&gt;arch.mmu.root_hpa = __pa(vcpu-&gt;arch.mmu.pae_root);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void mmu_sync_roots(struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	struct kvm_mmu_page *sp;</div><div class='add'>+</div><div class='add'>+	if (!VALID_PAGE(vcpu-&gt;arch.mmu.root_hpa))</div><div class='add'>+		return;</div><div class='add'>+	if (vcpu-&gt;arch.mmu.shadow_root_level == PT64_ROOT_LEVEL) {</div><div class='add'>+		hpa_t root = vcpu-&gt;arch.mmu.root_hpa;</div><div class='add'>+		sp = page_header(root);</div><div class='add'>+		mmu_sync_children(vcpu, sp);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	for (i = 0; i &lt; 4; ++i) {</div><div class='add'>+		hpa_t root = vcpu-&gt;arch.mmu.pae_root[i];</div><div class='add'>+</div><div class='add'>+		if (root) {</div><div class='add'>+			root &amp;= PT64_BASE_ADDR_MASK;</div><div class='add'>+			sp = page_header(root);</div><div class='add'>+			mmu_sync_children(vcpu, sp);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void kvm_mmu_sync_roots(struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	spin_lock(&amp;vcpu-&gt;kvm-&gt;mmu_lock);</div><div class='add'>+	mmu_sync_roots(vcpu);</div><div class='add'>+	spin_unlock(&amp;vcpu-&gt;kvm-&gt;mmu_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static gpa_t nonpaging_gva_to_gpa(struct kvm_vcpu *vcpu, gva_t vaddr)</div><div class='ctx'> {</div><div class='ctx'> 	return vaddr;</div><div class='hunk'>@@ -1446,15 +1821,13 @@ static int tdp_page_fault(struct kvm_vcpu *vcpu, gva_t gpa,</div><div class='ctx'> 	if (r)</div><div class='ctx'> 		return r;</div><div class='ctx'> </div><div class='del'>-	down_read(&amp;current-&gt;mm-&gt;mmap_sem);</div><div class='ctx'> 	if (is_largepage_backed(vcpu, gfn &amp; ~(KVM_PAGES_PER_HPAGE-1))) {</div><div class='ctx'> 		gfn &amp;= ~(KVM_PAGES_PER_HPAGE-1);</div><div class='ctx'> 		largepage = 1;</div><div class='ctx'> 	}</div><div class='ctx'> 	mmu_seq = vcpu-&gt;kvm-&gt;mmu_notifier_seq;</div><div class='del'>-	/* implicit mb(), we'll read before PT lock is unlocked */</div><div class='add'>+	smp_rmb();</div><div class='ctx'> 	pfn = gfn_to_pfn(vcpu-&gt;kvm, gfn);</div><div class='del'>-	up_read(&amp;current-&gt;mm-&gt;mmap_sem);</div><div class='ctx'> 	if (is_error_pfn(pfn)) {</div><div class='ctx'> 		kvm_release_pfn_clean(pfn);</div><div class='ctx'> 		return 1;</div><div class='hunk'>@@ -1464,7 +1837,7 @@ static int tdp_page_fault(struct kvm_vcpu *vcpu, gva_t gpa,</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> 	kvm_mmu_free_some_pages(vcpu);</div><div class='ctx'> 	r = __direct_map(vcpu, gpa, error_code &amp; PFERR_WRITE_MASK,</div><div class='del'>-			 largepage, gfn, pfn, kvm_x86_ops-&gt;get_tdp_level());</div><div class='add'>+			 largepage, gfn, pfn);</div><div class='ctx'> 	spin_unlock(&amp;vcpu-&gt;kvm-&gt;mmu_lock);</div><div class='ctx'> </div><div class='ctx'> 	return r;</div><div class='hunk'>@@ -1489,6 +1862,8 @@ static int nonpaging_init_context(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	context-&gt;gva_to_gpa = nonpaging_gva_to_gpa;</div><div class='ctx'> 	context-&gt;free = nonpaging_free;</div><div class='ctx'> 	context-&gt;prefetch_page = nonpaging_prefetch_page;</div><div class='add'>+	context-&gt;sync_page = nonpaging_sync_page;</div><div class='add'>+	context-&gt;invlpg = nonpaging_invlpg;</div><div class='ctx'> 	context-&gt;root_level = 0;</div><div class='ctx'> 	context-&gt;shadow_root_level = PT32E_ROOT_LEVEL;</div><div class='ctx'> 	context-&gt;root_hpa = INVALID_PAGE;</div><div class='hunk'>@@ -1536,6 +1911,8 @@ static int paging64_init_context_common(struct kvm_vcpu *vcpu, int level)</div><div class='ctx'> 	context-&gt;page_fault = paging64_page_fault;</div><div class='ctx'> 	context-&gt;gva_to_gpa = paging64_gva_to_gpa;</div><div class='ctx'> 	context-&gt;prefetch_page = paging64_prefetch_page;</div><div class='add'>+	context-&gt;sync_page = paging64_sync_page;</div><div class='add'>+	context-&gt;invlpg = paging64_invlpg;</div><div class='ctx'> 	context-&gt;free = paging_free;</div><div class='ctx'> 	context-&gt;root_level = level;</div><div class='ctx'> 	context-&gt;shadow_root_level = level;</div><div class='hunk'>@@ -1557,6 +1934,8 @@ static int paging32_init_context(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	context-&gt;gva_to_gpa = paging32_gva_to_gpa;</div><div class='ctx'> 	context-&gt;free = paging_free;</div><div class='ctx'> 	context-&gt;prefetch_page = paging32_prefetch_page;</div><div class='add'>+	context-&gt;sync_page = paging32_sync_page;</div><div class='add'>+	context-&gt;invlpg = paging32_invlpg;</div><div class='ctx'> 	context-&gt;root_level = PT32_ROOT_LEVEL;</div><div class='ctx'> 	context-&gt;shadow_root_level = PT32E_ROOT_LEVEL;</div><div class='ctx'> 	context-&gt;root_hpa = INVALID_PAGE;</div><div class='hunk'>@@ -1576,6 +1955,8 @@ static int init_kvm_tdp_mmu(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	context-&gt;page_fault = tdp_page_fault;</div><div class='ctx'> 	context-&gt;free = nonpaging_free;</div><div class='ctx'> 	context-&gt;prefetch_page = nonpaging_prefetch_page;</div><div class='add'>+	context-&gt;sync_page = nonpaging_sync_page;</div><div class='add'>+	context-&gt;invlpg = nonpaging_invlpg;</div><div class='ctx'> 	context-&gt;shadow_root_level = kvm_x86_ops-&gt;get_tdp_level();</div><div class='ctx'> 	context-&gt;root_hpa = INVALID_PAGE;</div><div class='ctx'> </div><div class='hunk'>@@ -1647,6 +2028,7 @@ int kvm_mmu_load(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	spin_lock(&amp;vcpu-&gt;kvm-&gt;mmu_lock);</div><div class='ctx'> 	kvm_mmu_free_some_pages(vcpu);</div><div class='ctx'> 	mmu_alloc_roots(vcpu);</div><div class='add'>+	mmu_sync_roots(vcpu);</div><div class='ctx'> 	spin_unlock(&amp;vcpu-&gt;kvm-&gt;mmu_lock);</div><div class='ctx'> 	kvm_x86_ops-&gt;set_cr3(vcpu, vcpu-&gt;arch.mmu.root_hpa);</div><div class='ctx'> 	kvm_mmu_flush_tlb(vcpu);</div><div class='hunk'>@@ -1767,15 +2149,13 @@ static void mmu_guess_page_from_pte_write(struct kvm_vcpu *vcpu, gpa_t gpa,</div><div class='ctx'> 		return;</div><div class='ctx'> 	gfn = (gpte &amp; PT64_BASE_ADDR_MASK) &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> </div><div class='del'>-	down_read(&amp;current-&gt;mm-&gt;mmap_sem);</div><div class='ctx'> 	if (is_large_pte(gpte) &amp;&amp; is_largepage_backed(vcpu, gfn)) {</div><div class='ctx'> 		gfn &amp;= ~(KVM_PAGES_PER_HPAGE-1);</div><div class='ctx'> 		vcpu-&gt;arch.update_pte.largepage = 1;</div><div class='ctx'> 	}</div><div class='ctx'> 	vcpu-&gt;arch.update_pte.mmu_seq = vcpu-&gt;kvm-&gt;mmu_notifier_seq;</div><div class='del'>-	/* implicit mb(), we'll read before PT lock is unlocked */</div><div class='add'>+	smp_rmb();</div><div class='ctx'> 	pfn = gfn_to_pfn(vcpu-&gt;kvm, gfn);</div><div class='del'>-	up_read(&amp;current-&gt;mm-&gt;mmap_sem);</div><div class='ctx'> </div><div class='ctx'> 	if (is_error_pfn(pfn)) {</div><div class='ctx'> 		kvm_release_pfn_clean(pfn);</div><div class='hunk'>@@ -1837,7 +2217,7 @@ void kvm_mmu_pte_write(struct kvm_vcpu *vcpu, gpa_t gpa,</div><div class='ctx'> 	index = kvm_page_table_hashfn(gfn);</div><div class='ctx'> 	bucket = &amp;vcpu-&gt;kvm-&gt;arch.mmu_page_hash[index];</div><div class='ctx'> 	hlist_for_each_entry_safe(sp, node, n, bucket, hash_link) {</div><div class='del'>-		if (sp-&gt;gfn != gfn || sp-&gt;role.metaphysical)</div><div class='add'>+		if (sp-&gt;gfn != gfn || sp-&gt;role.metaphysical || sp-&gt;role.invalid)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		pte_size = sp-&gt;role.glevels == PT32_ROOT_LEVEL ? 4 : 8;</div><div class='ctx'> 		misaligned = (offset ^ (offset + bytes - 1)) &amp; ~(pte_size - 1);</div><div class='hunk'>@@ -1855,7 +2235,8 @@ void kvm_mmu_pte_write(struct kvm_vcpu *vcpu, gpa_t gpa,</div><div class='ctx'> 			 */</div><div class='ctx'> 			pgprintk("misaligned: gpa %llx bytes %d role %x\n",</div><div class='ctx'> 				 gpa, bytes, sp-&gt;role.word);</div><div class='del'>-			kvm_mmu_zap_page(vcpu-&gt;kvm, sp);</div><div class='add'>+			if (kvm_mmu_zap_page(vcpu-&gt;kvm, sp))</div><div class='add'>+				n = bucket-&gt;first;</div><div class='ctx'> 			++vcpu-&gt;kvm-&gt;stat.mmu_flooded;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1969,6 +2350,16 @@ out:</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(kvm_mmu_page_fault);</div><div class='ctx'> </div><div class='add'>+void kvm_mmu_invlpg(struct kvm_vcpu *vcpu, gva_t gva)</div><div class='add'>+{</div><div class='add'>+	spin_lock(&amp;vcpu-&gt;kvm-&gt;mmu_lock);</div><div class='add'>+	vcpu-&gt;arch.mmu.invlpg(vcpu, gva);</div><div class='add'>+	spin_unlock(&amp;vcpu-&gt;kvm-&gt;mmu_lock);</div><div class='add'>+	kvm_mmu_flush_tlb(vcpu);</div><div class='add'>+	++vcpu-&gt;stat.invlpg;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(kvm_mmu_invlpg);</div><div class='add'>+</div><div class='ctx'> void kvm_enable_tdp(void)</div><div class='ctx'> {</div><div class='ctx'> 	tdp_enabled = true;</div><div class='hunk'>@@ -2055,6 +2446,7 @@ void kvm_mmu_slot_remove_write_access(struct kvm *kvm, int slot)</div><div class='ctx'> {</div><div class='ctx'> 	struct kvm_mmu_page *sp;</div><div class='ctx'> </div><div class='add'>+	spin_lock(&amp;kvm-&gt;mmu_lock);</div><div class='ctx'> 	list_for_each_entry(sp, &amp;kvm-&gt;arch.active_mmu_pages, link) {</div><div class='ctx'> 		int i;</div><div class='ctx'> 		u64 *pt;</div><div class='hunk'>@@ -2068,6 +2460,8 @@ void kvm_mmu_slot_remove_write_access(struct kvm *kvm, int slot)</div><div class='ctx'> 			if (pt[i] &amp; PT_WRITABLE_MASK)</div><div class='ctx'> 				pt[i] &amp;= ~PT_WRITABLE_MASK;</div><div class='ctx'> 	}</div><div class='add'>+	kvm_flush_remote_tlbs(kvm);</div><div class='add'>+	spin_unlock(&amp;kvm-&gt;mmu_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void kvm_mmu_zap_all(struct kvm *kvm)</div><div class='hunk'>@@ -2076,7 +2470,9 @@ void kvm_mmu_zap_all(struct kvm *kvm)</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;kvm-&gt;mmu_lock);</div><div class='ctx'> 	list_for_each_entry_safe(sp, node, &amp;kvm-&gt;arch.active_mmu_pages, link)</div><div class='del'>-		kvm_mmu_zap_page(kvm, sp);</div><div class='add'>+		if (kvm_mmu_zap_page(kvm, sp))</div><div class='add'>+			node = container_of(kvm-&gt;arch.active_mmu_pages.next,</div><div class='add'>+					    struct kvm_mmu_page, link);</div><div class='ctx'> 	spin_unlock(&amp;kvm-&gt;mmu_lock);</div><div class='ctx'> </div><div class='ctx'> 	kvm_flush_remote_tlbs(kvm);</div><div class='hunk'>@@ -2291,18 +2687,18 @@ int kvm_pv_mmu_op(struct kvm_vcpu *vcpu, unsigned long bytes,</div><div class='ctx'> 		  gpa_t addr, unsigned long *ret)</div><div class='ctx'> {</div><div class='ctx'> 	int r;</div><div class='del'>-	struct kvm_pv_mmu_op_buffer buffer;</div><div class='add'>+	struct kvm_pv_mmu_op_buffer *buffer = &amp;vcpu-&gt;arch.mmu_op_buffer;</div><div class='ctx'> </div><div class='del'>-	buffer.ptr = buffer.buf;</div><div class='del'>-	buffer.len = min_t(unsigned long, bytes, sizeof buffer.buf);</div><div class='del'>-	buffer.processed = 0;</div><div class='add'>+	buffer-&gt;ptr = buffer-&gt;buf;</div><div class='add'>+	buffer-&gt;len = min_t(unsigned long, bytes, sizeof buffer-&gt;buf);</div><div class='add'>+	buffer-&gt;processed = 0;</div><div class='ctx'> </div><div class='del'>-	r = kvm_read_guest(vcpu-&gt;kvm, addr, buffer.buf, buffer.len);</div><div class='add'>+	r = kvm_read_guest(vcpu-&gt;kvm, addr, buffer-&gt;buf, buffer-&gt;len);</div><div class='ctx'> 	if (r)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	while (buffer.len) {</div><div class='del'>-		r = kvm_pv_mmu_op_one(vcpu, &amp;buffer);</div><div class='add'>+	while (buffer-&gt;len) {</div><div class='add'>+		r = kvm_pv_mmu_op_one(vcpu, buffer);</div><div class='ctx'> 		if (r &lt; 0)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		if (r == 0)</div><div class='hunk'>@@ -2311,7 +2707,7 @@ int kvm_pv_mmu_op(struct kvm_vcpu *vcpu, unsigned long bytes,</div><div class='ctx'> </div><div class='ctx'> 	r = 1;</div><div class='ctx'> out:</div><div class='del'>-	*ret = buffer.processed;</div><div class='add'>+	*ret = buffer-&gt;processed;</div><div class='ctx'> 	return r;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h<br/>index 4a814bff21f2..613ec9aa674a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kvm/paging_tmpl.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kvm/paging_tmpl.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kvm/paging_tmpl.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kvm/paging_tmpl.h</a></div><div class='hunk'>@@ -25,11 +25,11 @@</div><div class='ctx'> #if PTTYPE == 64</div><div class='ctx'> 	#define pt_element_t u64</div><div class='ctx'> 	#define guest_walker guest_walker64</div><div class='add'>+	#define shadow_walker shadow_walker64</div><div class='ctx'> 	#define FNAME(name) paging##64_##name</div><div class='ctx'> 	#define PT_BASE_ADDR_MASK PT64_BASE_ADDR_MASK</div><div class='ctx'> 	#define PT_DIR_BASE_ADDR_MASK PT64_DIR_BASE_ADDR_MASK</div><div class='ctx'> 	#define PT_INDEX(addr, level) PT64_INDEX(addr, level)</div><div class='del'>-	#define SHADOW_PT_INDEX(addr, level) PT64_INDEX(addr, level)</div><div class='ctx'> 	#define PT_LEVEL_MASK(level) PT64_LEVEL_MASK(level)</div><div class='ctx'> 	#define PT_LEVEL_BITS PT64_LEVEL_BITS</div><div class='ctx'> 	#ifdef CONFIG_X86_64</div><div class='hunk'>@@ -42,11 +42,11 @@</div><div class='ctx'> #elif PTTYPE == 32</div><div class='ctx'> 	#define pt_element_t u32</div><div class='ctx'> 	#define guest_walker guest_walker32</div><div class='add'>+	#define shadow_walker shadow_walker32</div><div class='ctx'> 	#define FNAME(name) paging##32_##name</div><div class='ctx'> 	#define PT_BASE_ADDR_MASK PT32_BASE_ADDR_MASK</div><div class='ctx'> 	#define PT_DIR_BASE_ADDR_MASK PT32_DIR_BASE_ADDR_MASK</div><div class='ctx'> 	#define PT_INDEX(addr, level) PT32_INDEX(addr, level)</div><div class='del'>-	#define SHADOW_PT_INDEX(addr, level) PT64_INDEX(addr, level)</div><div class='ctx'> 	#define PT_LEVEL_MASK(level) PT32_LEVEL_MASK(level)</div><div class='ctx'> 	#define PT_LEVEL_BITS PT32_LEVEL_BITS</div><div class='ctx'> 	#define PT_MAX_FULL_LEVELS 2</div><div class='hunk'>@@ -73,6 +73,17 @@ struct guest_walker {</div><div class='ctx'> 	u32 error_code;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct shadow_walker {</div><div class='add'>+	struct kvm_shadow_walk walker;</div><div class='add'>+	struct guest_walker *guest_walker;</div><div class='add'>+	int user_fault;</div><div class='add'>+	int write_fault;</div><div class='add'>+	int largepage;</div><div class='add'>+	int *ptwrite;</div><div class='add'>+	pfn_t pfn;</div><div class='add'>+	u64 *sptep;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static gfn_t gpte_to_gfn(pt_element_t gpte)</div><div class='ctx'> {</div><div class='ctx'> 	return (gpte &amp; PT_BASE_ADDR_MASK) &gt;&gt; PAGE_SHIFT;</div><div class='hunk'>@@ -91,14 +102,10 @@ static bool FNAME(cmpxchg_gpte)(struct kvm *kvm,</div><div class='ctx'> 	pt_element_t *table;</div><div class='ctx'> 	struct page *page;</div><div class='ctx'> </div><div class='del'>-	down_read(&amp;current-&gt;mm-&gt;mmap_sem);</div><div class='ctx'> 	page = gfn_to_page(kvm, table_gfn);</div><div class='del'>-	up_read(&amp;current-&gt;mm-&gt;mmap_sem);</div><div class='ctx'> </div><div class='ctx'> 	table = kmap_atomic(page, KM_USER0);</div><div class='del'>-</div><div class='ctx'> 	ret = CMPXCHG(&amp;table[index], orig_pte, new_pte);</div><div class='del'>-</div><div class='ctx'> 	kunmap_atomic(table, KM_USER0);</div><div class='ctx'> </div><div class='ctx'> 	kvm_release_page_dirty(page);</div><div class='hunk'>@@ -274,86 +281,89 @@ static void FNAME(update_pte)(struct kvm_vcpu *vcpu, struct kvm_mmu_page *page,</div><div class='ctx'> /*</div><div class='ctx'>  * Fetch a shadow pte for a specific level in the paging hierarchy.</div><div class='ctx'>  */</div><div class='del'>-static u64 *FNAME(fetch)(struct kvm_vcpu *vcpu, gva_t addr,</div><div class='del'>-			 struct guest_walker *walker,</div><div class='del'>-			 int user_fault, int write_fault, int largepage,</div><div class='del'>-			 int *ptwrite, pfn_t pfn)</div><div class='add'>+static int FNAME(shadow_walk_entry)(struct kvm_shadow_walk *_sw,</div><div class='add'>+				    struct kvm_vcpu *vcpu, u64 addr,</div><div class='add'>+				    u64 *sptep, int level)</div><div class='ctx'> {</div><div class='del'>-	hpa_t shadow_addr;</div><div class='del'>-	int level;</div><div class='del'>-	u64 *shadow_ent;</div><div class='del'>-	unsigned access = walker-&gt;pt_access;</div><div class='del'>-</div><div class='del'>-	if (!is_present_pte(walker-&gt;ptes[walker-&gt;level - 1]))</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	shadow_addr = vcpu-&gt;arch.mmu.root_hpa;</div><div class='del'>-	level = vcpu-&gt;arch.mmu.shadow_root_level;</div><div class='del'>-	if (level == PT32E_ROOT_LEVEL) {</div><div class='del'>-		shadow_addr = vcpu-&gt;arch.mmu.pae_root[(addr &gt;&gt; 30) &amp; 3];</div><div class='del'>-		shadow_addr &amp;= PT64_BASE_ADDR_MASK;</div><div class='del'>-		--level;</div><div class='add'>+	struct shadow_walker *sw =</div><div class='add'>+		container_of(_sw, struct shadow_walker, walker);</div><div class='add'>+	struct guest_walker *gw = sw-&gt;guest_walker;</div><div class='add'>+	unsigned access = gw-&gt;pt_access;</div><div class='add'>+	struct kvm_mmu_page *shadow_page;</div><div class='add'>+	u64 spte;</div><div class='add'>+	int metaphysical;</div><div class='add'>+	gfn_t table_gfn;</div><div class='add'>+	int r;</div><div class='add'>+	pt_element_t curr_pte;</div><div class='add'>+</div><div class='add'>+	if (level == PT_PAGE_TABLE_LEVEL</div><div class='add'>+	    || (sw-&gt;largepage &amp;&amp; level == PT_DIRECTORY_LEVEL)) {</div><div class='add'>+		mmu_set_spte(vcpu, sptep, access, gw-&gt;pte_access &amp; access,</div><div class='add'>+			     sw-&gt;user_fault, sw-&gt;write_fault,</div><div class='add'>+			     gw-&gt;ptes[gw-&gt;level-1] &amp; PT_DIRTY_MASK,</div><div class='add'>+			     sw-&gt;ptwrite, sw-&gt;largepage, gw-&gt;gfn, sw-&gt;pfn,</div><div class='add'>+			     false);</div><div class='add'>+		sw-&gt;sptep = sptep;</div><div class='add'>+		return 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (; ; level--) {</div><div class='del'>-		u32 index = SHADOW_PT_INDEX(addr, level);</div><div class='del'>-		struct kvm_mmu_page *shadow_page;</div><div class='del'>-		u64 shadow_pte;</div><div class='del'>-		int metaphysical;</div><div class='del'>-		gfn_t table_gfn;</div><div class='del'>-</div><div class='del'>-		shadow_ent = ((u64 *)__va(shadow_addr)) + index;</div><div class='del'>-		if (level == PT_PAGE_TABLE_LEVEL)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		if (largepage &amp;&amp; level == PT_DIRECTORY_LEVEL)</div><div class='del'>-			break;</div><div class='add'>+	if (is_shadow_present_pte(*sptep) &amp;&amp; !is_large_pte(*sptep))</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-		if (is_shadow_present_pte(*shadow_ent)</div><div class='del'>-		    &amp;&amp; !is_large_pte(*shadow_ent)) {</div><div class='del'>-			shadow_addr = *shadow_ent &amp; PT64_BASE_ADDR_MASK;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='add'>+	if (is_large_pte(*sptep)) {</div><div class='add'>+		set_shadow_pte(sptep, shadow_trap_nonpresent_pte);</div><div class='add'>+		kvm_flush_remote_tlbs(vcpu-&gt;kvm);</div><div class='add'>+		rmap_remove(vcpu-&gt;kvm, sptep);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		if (is_large_pte(*shadow_ent))</div><div class='del'>-			rmap_remove(vcpu-&gt;kvm, shadow_ent);</div><div class='del'>-</div><div class='del'>-		if (level - 1 == PT_PAGE_TABLE_LEVEL</div><div class='del'>-		    &amp;&amp; walker-&gt;level == PT_DIRECTORY_LEVEL) {</div><div class='del'>-			metaphysical = 1;</div><div class='del'>-			if (!is_dirty_pte(walker-&gt;ptes[level - 1]))</div><div class='del'>-				access &amp;= ~ACC_WRITE_MASK;</div><div class='del'>-			table_gfn = gpte_to_gfn(walker-&gt;ptes[level - 1]);</div><div class='del'>-		} else {</div><div class='del'>-			metaphysical = 0;</div><div class='del'>-			table_gfn = walker-&gt;table_gfn[level - 2];</div><div class='del'>-		}</div><div class='del'>-		shadow_page = kvm_mmu_get_page(vcpu, table_gfn, addr, level-1,</div><div class='del'>-					       metaphysical, access,</div><div class='del'>-					       shadow_ent);</div><div class='del'>-		if (!metaphysical) {</div><div class='del'>-			int r;</div><div class='del'>-			pt_element_t curr_pte;</div><div class='del'>-			r = kvm_read_guest_atomic(vcpu-&gt;kvm,</div><div class='del'>-						  walker-&gt;pte_gpa[level - 2],</div><div class='del'>-						  &amp;curr_pte, sizeof(curr_pte));</div><div class='del'>-			if (r || curr_pte != walker-&gt;ptes[level - 2]) {</div><div class='del'>-				kvm_release_pfn_clean(pfn);</div><div class='del'>-				return NULL;</div><div class='del'>-			}</div><div class='add'>+	if (level == PT_DIRECTORY_LEVEL &amp;&amp; gw-&gt;level == PT_DIRECTORY_LEVEL) {</div><div class='add'>+		metaphysical = 1;</div><div class='add'>+		if (!is_dirty_pte(gw-&gt;ptes[level - 1]))</div><div class='add'>+			access &amp;= ~ACC_WRITE_MASK;</div><div class='add'>+		table_gfn = gpte_to_gfn(gw-&gt;ptes[level - 1]);</div><div class='add'>+	} else {</div><div class='add'>+		metaphysical = 0;</div><div class='add'>+		table_gfn = gw-&gt;table_gfn[level - 2];</div><div class='add'>+	}</div><div class='add'>+	shadow_page = kvm_mmu_get_page(vcpu, table_gfn, (gva_t)addr, level-1,</div><div class='add'>+				       metaphysical, access, sptep);</div><div class='add'>+	if (!metaphysical) {</div><div class='add'>+		r = kvm_read_guest_atomic(vcpu-&gt;kvm, gw-&gt;pte_gpa[level - 2],</div><div class='add'>+					  &amp;curr_pte, sizeof(curr_pte));</div><div class='add'>+		if (r || curr_pte != gw-&gt;ptes[level - 2]) {</div><div class='add'>+			kvm_release_pfn_clean(sw-&gt;pfn);</div><div class='add'>+			sw-&gt;sptep = NULL;</div><div class='add'>+			return 1;</div><div class='ctx'> 		}</div><div class='del'>-		shadow_addr = __pa(shadow_page-&gt;spt);</div><div class='del'>-		shadow_pte = shadow_addr | PT_PRESENT_MASK | PT_ACCESSED_MASK</div><div class='del'>-			| PT_WRITABLE_MASK | PT_USER_MASK;</div><div class='del'>-		set_shadow_pte(shadow_ent, shadow_pte);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mmu_set_spte(vcpu, shadow_ent, access, walker-&gt;pte_access &amp; access,</div><div class='del'>-		     user_fault, write_fault,</div><div class='del'>-		     walker-&gt;ptes[walker-&gt;level-1] &amp; PT_DIRTY_MASK,</div><div class='del'>-		     ptwrite, largepage, walker-&gt;gfn, pfn, false);</div><div class='add'>+	spte = __pa(shadow_page-&gt;spt) | PT_PRESENT_MASK | PT_ACCESSED_MASK</div><div class='add'>+		| PT_WRITABLE_MASK | PT_USER_MASK;</div><div class='add'>+	*sptep = spte;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u64 *FNAME(fetch)(struct kvm_vcpu *vcpu, gva_t addr,</div><div class='add'>+			 struct guest_walker *guest_walker,</div><div class='add'>+			 int user_fault, int write_fault, int largepage,</div><div class='add'>+			 int *ptwrite, pfn_t pfn)</div><div class='add'>+{</div><div class='add'>+	struct shadow_walker walker = {</div><div class='add'>+		.walker = { .entry = FNAME(shadow_walk_entry), },</div><div class='add'>+		.guest_walker = guest_walker,</div><div class='add'>+		.user_fault = user_fault,</div><div class='add'>+		.write_fault = write_fault,</div><div class='add'>+		.largepage = largepage,</div><div class='add'>+		.ptwrite = ptwrite,</div><div class='add'>+		.pfn = pfn,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (!is_present_pte(guest_walker-&gt;ptes[guest_walker-&gt;level - 1]))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	walk_shadow(&amp;walker.walker, vcpu, addr);</div><div class='ctx'> </div><div class='del'>-	return shadow_ent;</div><div class='add'>+	return walker.sptep;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -407,7 +417,6 @@ static int FNAME(page_fault)(struct kvm_vcpu *vcpu, gva_t addr,</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	down_read(&amp;current-&gt;mm-&gt;mmap_sem);</div><div class='ctx'> 	if (walker.level == PT_DIRECTORY_LEVEL) {</div><div class='ctx'> 		gfn_t large_gfn;</div><div class='ctx'> 		large_gfn = walker.gfn &amp; ~(KVM_PAGES_PER_HPAGE-1);</div><div class='hunk'>@@ -417,9 +426,8 @@ static int FNAME(page_fault)(struct kvm_vcpu *vcpu, gva_t addr,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	mmu_seq = vcpu-&gt;kvm-&gt;mmu_notifier_seq;</div><div class='del'>-	/* implicit mb(), we'll read before PT lock is unlocked */</div><div class='add'>+	smp_rmb();</div><div class='ctx'> 	pfn = gfn_to_pfn(vcpu-&gt;kvm, walker.gfn);</div><div class='del'>-	up_read(&amp;current-&gt;mm-&gt;mmap_sem);</div><div class='ctx'> </div><div class='ctx'> 	/* mmio */</div><div class='ctx'> 	if (is_error_pfn(pfn)) {</div><div class='hunk'>@@ -453,6 +461,31 @@ out_unlock:</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int FNAME(shadow_invlpg_entry)(struct kvm_shadow_walk *_sw,</div><div class='add'>+				      struct kvm_vcpu *vcpu, u64 addr,</div><div class='add'>+				      u64 *sptep, int level)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	if (level == PT_PAGE_TABLE_LEVEL) {</div><div class='add'>+		if (is_shadow_present_pte(*sptep))</div><div class='add'>+			rmap_remove(vcpu-&gt;kvm, sptep);</div><div class='add'>+		set_shadow_pte(sptep, shadow_trap_nonpresent_pte);</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+	if (!is_shadow_present_pte(*sptep))</div><div class='add'>+		return 1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void FNAME(invlpg)(struct kvm_vcpu *vcpu, gva_t gva)</div><div class='add'>+{</div><div class='add'>+	struct shadow_walker walker = {</div><div class='add'>+		.walker = { .entry = FNAME(shadow_invlpg_entry), },</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	walk_shadow(&amp;walker.walker, vcpu, gva);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static gpa_t FNAME(gva_to_gpa)(struct kvm_vcpu *vcpu, gva_t vaddr)</div><div class='ctx'> {</div><div class='ctx'> 	struct guest_walker walker;</div><div class='hunk'>@@ -499,12 +532,66 @@ static void FNAME(prefetch_page)(struct kvm_vcpu *vcpu,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Using the cached information from sp-&gt;gfns is safe because:</div><div class='add'>+ * - The spte has a reference to the struct page, so the pfn for a given gfn</div><div class='add'>+ *   can't change unless all sptes pointing to it are nuked first.</div><div class='add'>+ * - Alias changes zap the entire shadow cache.</div><div class='add'>+ */</div><div class='add'>+static int FNAME(sync_page)(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp)</div><div class='add'>+{</div><div class='add'>+	int i, offset, nr_present;</div><div class='add'>+</div><div class='add'>+	offset = nr_present = 0;</div><div class='add'>+</div><div class='add'>+	if (PTTYPE == 32)</div><div class='add'>+		offset = sp-&gt;role.quadrant &lt;&lt; PT64_LEVEL_BITS;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; PT64_ENT_PER_PAGE; i++) {</div><div class='add'>+		unsigned pte_access;</div><div class='add'>+		pt_element_t gpte;</div><div class='add'>+		gpa_t pte_gpa;</div><div class='add'>+		gfn_t gfn = sp-&gt;gfns[i];</div><div class='add'>+</div><div class='add'>+		if (!is_shadow_present_pte(sp-&gt;spt[i]))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		pte_gpa = gfn_to_gpa(sp-&gt;gfn);</div><div class='add'>+		pte_gpa += (i+offset) * sizeof(pt_element_t);</div><div class='add'>+</div><div class='add'>+		if (kvm_read_guest_atomic(vcpu-&gt;kvm, pte_gpa, &amp;gpte,</div><div class='add'>+					  sizeof(pt_element_t)))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		if (gpte_to_gfn(gpte) != gfn || !is_present_pte(gpte) ||</div><div class='add'>+		    !(gpte &amp; PT_ACCESSED_MASK)) {</div><div class='add'>+			u64 nonpresent;</div><div class='add'>+</div><div class='add'>+			rmap_remove(vcpu-&gt;kvm, &amp;sp-&gt;spt[i]);</div><div class='add'>+			if (is_present_pte(gpte))</div><div class='add'>+				nonpresent = shadow_trap_nonpresent_pte;</div><div class='add'>+			else</div><div class='add'>+				nonpresent = shadow_notrap_nonpresent_pte;</div><div class='add'>+			set_shadow_pte(&amp;sp-&gt;spt[i], nonpresent);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		nr_present++;</div><div class='add'>+		pte_access = sp-&gt;role.access &amp; FNAME(gpte_access)(vcpu, gpte);</div><div class='add'>+		set_spte(vcpu, &amp;sp-&gt;spt[i], pte_access, 0, 0,</div><div class='add'>+			 is_dirty_pte(gpte), 0, gfn,</div><div class='add'>+			 spte_to_pfn(sp-&gt;spt[i]), true, false);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return !nr_present;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #undef pt_element_t</div><div class='ctx'> #undef guest_walker</div><div class='add'>+#undef shadow_walker</div><div class='ctx'> #undef FNAME</div><div class='ctx'> #undef PT_BASE_ADDR_MASK</div><div class='ctx'> #undef PT_INDEX</div><div class='del'>-#undef SHADOW_PT_INDEX</div><div class='ctx'> #undef PT_LEVEL_MASK</div><div class='ctx'> #undef PT_DIR_BASE_ADDR_MASK</div><div class='ctx'> #undef PT_LEVEL_BITS</div><div class='head'>diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c<br/>index 8233b86c778c..9c4ce657d963 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kvm/svm.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kvm/svm.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kvm/svm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kvm/svm.c</a></div><div class='hunk'>@@ -18,6 +18,7 @@</div><div class='ctx'> #include "kvm_svm.h"</div><div class='ctx'> #include "irq.h"</div><div class='ctx'> #include "mmu.h"</div><div class='add'>+#include "kvm_cache_regs.h"</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -35,10 +36,6 @@ MODULE_LICENSE("GPL");</div><div class='ctx'> #define IOPM_ALLOC_ORDER 2</div><div class='ctx'> #define MSRPM_ALLOC_ORDER 1</div><div class='ctx'> </div><div class='del'>-#define DB_VECTOR 1</div><div class='del'>-#define UD_VECTOR 6</div><div class='del'>-#define GP_VECTOR 13</div><div class='del'>-</div><div class='ctx'> #define DR7_GD_MASK (1 &lt;&lt; 13)</div><div class='ctx'> #define DR6_BD_MASK (1 &lt;&lt; 13)</div><div class='ctx'> </div><div class='hunk'>@@ -47,7 +44,7 @@ MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='ctx'> #define SVM_FEATURE_NPT  (1 &lt;&lt; 0)</div><div class='ctx'> #define SVM_FEATURE_LBRV (1 &lt;&lt; 1)</div><div class='del'>-#define SVM_DEATURE_SVML (1 &lt;&lt; 2)</div><div class='add'>+#define SVM_FEATURE_SVML (1 &lt;&lt; 2)</div><div class='ctx'> </div><div class='ctx'> #define DEBUGCTL_RESERVED_BITS (~(0x3fULL))</div><div class='ctx'> </div><div class='hunk'>@@ -236,13 +233,11 @@ static void skip_emulated_instruction(struct kvm_vcpu *vcpu)</div><div class='ctx'> 		printk(KERN_DEBUG "%s: NOP\n", __func__);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='del'>-	if (svm-&gt;next_rip - svm-&gt;vmcb-&gt;save.rip &gt; MAX_INST_SIZE)</div><div class='del'>-		printk(KERN_ERR "%s: ip 0x%llx next 0x%llx\n",</div><div class='del'>-		       __func__,</div><div class='del'>-		       svm-&gt;vmcb-&gt;save.rip,</div><div class='del'>-		       svm-&gt;next_rip);</div><div class='add'>+	if (svm-&gt;next_rip - kvm_rip_read(vcpu) &gt; MAX_INST_SIZE)</div><div class='add'>+		printk(KERN_ERR "%s: ip 0x%lx next 0x%llx\n",</div><div class='add'>+		       __func__, kvm_rip_read(vcpu), svm-&gt;next_rip);</div><div class='ctx'> </div><div class='del'>-	vcpu-&gt;arch.rip = svm-&gt;vmcb-&gt;save.rip = svm-&gt;next_rip;</div><div class='add'>+	kvm_rip_write(vcpu, svm-&gt;next_rip);</div><div class='ctx'> 	svm-&gt;vmcb-&gt;control.int_state &amp;= ~SVM_INTERRUPT_SHADOW_MASK;</div><div class='ctx'> </div><div class='ctx'> 	vcpu-&gt;arch.interrupt_window_open = 1;</div><div class='hunk'>@@ -530,6 +525,7 @@ static void init_vmcb(struct vcpu_svm *svm)</div><div class='ctx'> 				(1ULL &lt;&lt; INTERCEPT_CPUID) |</div><div class='ctx'> 				(1ULL &lt;&lt; INTERCEPT_INVD) |</div><div class='ctx'> 				(1ULL &lt;&lt; INTERCEPT_HLT) |</div><div class='add'>+				(1ULL &lt;&lt; INTERCEPT_INVLPG) |</div><div class='ctx'> 				(1ULL &lt;&lt; INTERCEPT_INVLPGA) |</div><div class='ctx'> 				(1ULL &lt;&lt; INTERCEPT_IOIO_PROT) |</div><div class='ctx'> 				(1ULL &lt;&lt; INTERCEPT_MSR_PROT) |</div><div class='hunk'>@@ -581,6 +577,7 @@ static void init_vmcb(struct vcpu_svm *svm)</div><div class='ctx'> 	save-&gt;dr7 = 0x400;</div><div class='ctx'> 	save-&gt;rflags = 2;</div><div class='ctx'> 	save-&gt;rip = 0x0000fff0;</div><div class='add'>+	svm-&gt;vcpu.arch.regs[VCPU_REGS_RIP] = save-&gt;rip;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * cr0 val on cpu init should be 0x60000010, we enable cpu</div><div class='hunk'>@@ -593,7 +590,8 @@ static void init_vmcb(struct vcpu_svm *svm)</div><div class='ctx'> 	if (npt_enabled) {</div><div class='ctx'> 		/* Setup VMCB for Nested Paging */</div><div class='ctx'> 		control-&gt;nested_ctl = 1;</div><div class='del'>-		control-&gt;intercept &amp;= ~(1ULL &lt;&lt; INTERCEPT_TASK_SWITCH);</div><div class='add'>+		control-&gt;intercept &amp;= ~((1ULL &lt;&lt; INTERCEPT_TASK_SWITCH) |</div><div class='add'>+					(1ULL &lt;&lt; INTERCEPT_INVLPG));</div><div class='ctx'> 		control-&gt;intercept_exceptions &amp;= ~(1 &lt;&lt; PF_VECTOR);</div><div class='ctx'> 		control-&gt;intercept_cr_read &amp;= ~(INTERCEPT_CR0_MASK|</div><div class='ctx'> 						INTERCEPT_CR3_MASK);</div><div class='hunk'>@@ -615,10 +613,12 @@ static int svm_vcpu_reset(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	init_vmcb(svm);</div><div class='ctx'> </div><div class='ctx'> 	if (vcpu-&gt;vcpu_id != 0) {</div><div class='del'>-		svm-&gt;vmcb-&gt;save.rip = 0;</div><div class='add'>+		kvm_rip_write(vcpu, 0);</div><div class='ctx'> 		svm-&gt;vmcb-&gt;save.cs.base = svm-&gt;vcpu.arch.sipi_vector &lt;&lt; 12;</div><div class='ctx'> 		svm-&gt;vmcb-&gt;save.cs.selector = svm-&gt;vcpu.arch.sipi_vector &lt;&lt; 8;</div><div class='ctx'> 	}</div><div class='add'>+	vcpu-&gt;arch.regs_avail = ~0;</div><div class='add'>+	vcpu-&gt;arch.regs_dirty = ~0;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -721,23 +721,6 @@ static void svm_vcpu_put(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	rdtscll(vcpu-&gt;arch.host_tsc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void svm_cache_regs(struct kvm_vcpu *vcpu)</div><div class='del'>-{</div><div class='del'>-	struct vcpu_svm *svm = to_svm(vcpu);</div><div class='del'>-</div><div class='del'>-	vcpu-&gt;arch.regs[VCPU_REGS_RAX] = svm-&gt;vmcb-&gt;save.rax;</div><div class='del'>-	vcpu-&gt;arch.regs[VCPU_REGS_RSP] = svm-&gt;vmcb-&gt;save.rsp;</div><div class='del'>-	vcpu-&gt;arch.rip = svm-&gt;vmcb-&gt;save.rip;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void svm_decache_regs(struct kvm_vcpu *vcpu)</div><div class='del'>-{</div><div class='del'>-	struct vcpu_svm *svm = to_svm(vcpu);</div><div class='del'>-	svm-&gt;vmcb-&gt;save.rax = vcpu-&gt;arch.regs[VCPU_REGS_RAX];</div><div class='del'>-	svm-&gt;vmcb-&gt;save.rsp = vcpu-&gt;arch.regs[VCPU_REGS_RSP];</div><div class='del'>-	svm-&gt;vmcb-&gt;save.rip = vcpu-&gt;arch.rip;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static unsigned long svm_get_rflags(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='ctx'> 	return to_svm(vcpu)-&gt;vmcb-&gt;save.rflags;</div><div class='hunk'>@@ -1040,7 +1023,7 @@ static int pf_interception(struct vcpu_svm *svm, struct kvm_run *kvm_run)</div><div class='ctx'> 	if (npt_enabled)</div><div class='ctx'> 		svm_flush_tlb(&amp;svm-&gt;vcpu);</div><div class='ctx'> </div><div class='del'>-	if (event_injection)</div><div class='add'>+	if (!npt_enabled &amp;&amp; event_injection)</div><div class='ctx'> 		kvm_mmu_unprotect_page_virt(&amp;svm-&gt;vcpu, fault_address);</div><div class='ctx'> 	return kvm_mmu_page_fault(&amp;svm-&gt;vcpu, fault_address, error_code);</div><div class='ctx'> }</div><div class='hunk'>@@ -1139,14 +1122,14 @@ static int nop_on_interception(struct vcpu_svm *svm, struct kvm_run *kvm_run)</div><div class='ctx'> </div><div class='ctx'> static int halt_interception(struct vcpu_svm *svm, struct kvm_run *kvm_run)</div><div class='ctx'> {</div><div class='del'>-	svm-&gt;next_rip = svm-&gt;vmcb-&gt;save.rip + 1;</div><div class='add'>+	svm-&gt;next_rip = kvm_rip_read(&amp;svm-&gt;vcpu) + 1;</div><div class='ctx'> 	skip_emulated_instruction(&amp;svm-&gt;vcpu);</div><div class='ctx'> 	return kvm_emulate_halt(&amp;svm-&gt;vcpu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int vmmcall_interception(struct vcpu_svm *svm, struct kvm_run *kvm_run)</div><div class='ctx'> {</div><div class='del'>-	svm-&gt;next_rip = svm-&gt;vmcb-&gt;save.rip + 3;</div><div class='add'>+	svm-&gt;next_rip = kvm_rip_read(&amp;svm-&gt;vcpu) + 3;</div><div class='ctx'> 	skip_emulated_instruction(&amp;svm-&gt;vcpu);</div><div class='ctx'> 	kvm_emulate_hypercall(&amp;svm-&gt;vcpu);</div><div class='ctx'> 	return 1;</div><div class='hunk'>@@ -1178,11 +1161,18 @@ static int task_switch_interception(struct vcpu_svm *svm,</div><div class='ctx'> </div><div class='ctx'> static int cpuid_interception(struct vcpu_svm *svm, struct kvm_run *kvm_run)</div><div class='ctx'> {</div><div class='del'>-	svm-&gt;next_rip = svm-&gt;vmcb-&gt;save.rip + 2;</div><div class='add'>+	svm-&gt;next_rip = kvm_rip_read(&amp;svm-&gt;vcpu) + 2;</div><div class='ctx'> 	kvm_emulate_cpuid(&amp;svm-&gt;vcpu);</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int invlpg_interception(struct vcpu_svm *svm, struct kvm_run *kvm_run)</div><div class='add'>+{</div><div class='add'>+	if (emulate_instruction(&amp;svm-&gt;vcpu, kvm_run, 0, 0, 0) != EMULATE_DONE)</div><div class='add'>+		pr_unimpl(&amp;svm-&gt;vcpu, "%s: failed\n", __func__);</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int emulate_on_interception(struct vcpu_svm *svm,</div><div class='ctx'> 				   struct kvm_run *kvm_run)</div><div class='ctx'> {</div><div class='hunk'>@@ -1273,9 +1263,9 @@ static int rdmsr_interception(struct vcpu_svm *svm, struct kvm_run *kvm_run)</div><div class='ctx'> 		KVMTRACE_3D(MSR_READ, &amp;svm-&gt;vcpu, ecx, (u32)data,</div><div class='ctx'> 			    (u32)(data &gt;&gt; 32), handler);</div><div class='ctx'> </div><div class='del'>-		svm-&gt;vmcb-&gt;save.rax = data &amp; 0xffffffff;</div><div class='add'>+		svm-&gt;vcpu.arch.regs[VCPU_REGS_RAX] = data &amp; 0xffffffff;</div><div class='ctx'> 		svm-&gt;vcpu.arch.regs[VCPU_REGS_RDX] = data &gt;&gt; 32;</div><div class='del'>-		svm-&gt;next_rip = svm-&gt;vmcb-&gt;save.rip + 2;</div><div class='add'>+		svm-&gt;next_rip = kvm_rip_read(&amp;svm-&gt;vcpu) + 2;</div><div class='ctx'> 		skip_emulated_instruction(&amp;svm-&gt;vcpu);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 1;</div><div class='hunk'>@@ -1359,13 +1349,13 @@ static int svm_set_msr(struct kvm_vcpu *vcpu, unsigned ecx, u64 data)</div><div class='ctx'> static int wrmsr_interception(struct vcpu_svm *svm, struct kvm_run *kvm_run)</div><div class='ctx'> {</div><div class='ctx'> 	u32 ecx = svm-&gt;vcpu.arch.regs[VCPU_REGS_RCX];</div><div class='del'>-	u64 data = (svm-&gt;vmcb-&gt;save.rax &amp; -1u)</div><div class='add'>+	u64 data = (svm-&gt;vcpu.arch.regs[VCPU_REGS_RAX] &amp; -1u)</div><div class='ctx'> 		| ((u64)(svm-&gt;vcpu.arch.regs[VCPU_REGS_RDX] &amp; -1u) &lt;&lt; 32);</div><div class='ctx'> </div><div class='ctx'> 	KVMTRACE_3D(MSR_WRITE, &amp;svm-&gt;vcpu, ecx, (u32)data, (u32)(data &gt;&gt; 32),</div><div class='ctx'> 		    handler);</div><div class='ctx'> </div><div class='del'>-	svm-&gt;next_rip = svm-&gt;vmcb-&gt;save.rip + 2;</div><div class='add'>+	svm-&gt;next_rip = kvm_rip_read(&amp;svm-&gt;vcpu) + 2;</div><div class='ctx'> 	if (svm_set_msr(&amp;svm-&gt;vcpu, ecx, data))</div><div class='ctx'> 		kvm_inject_gp(&amp;svm-&gt;vcpu, 0);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -1436,7 +1426,7 @@ static int (*svm_exit_handlers[])(struct vcpu_svm *svm,</div><div class='ctx'> 	[SVM_EXIT_CPUID]			= cpuid_interception,</div><div class='ctx'> 	[SVM_EXIT_INVD]                         = emulate_on_interception,</div><div class='ctx'> 	[SVM_EXIT_HLT]				= halt_interception,</div><div class='del'>-	[SVM_EXIT_INVLPG]			= emulate_on_interception,</div><div class='add'>+	[SVM_EXIT_INVLPG]			= invlpg_interception,</div><div class='ctx'> 	[SVM_EXIT_INVLPGA]			= invalid_op_interception,</div><div class='ctx'> 	[SVM_EXIT_IOIO] 		  	= io_interception,</div><div class='ctx'> 	[SVM_EXIT_MSR]				= msr_interception,</div><div class='hunk'>@@ -1538,6 +1528,7 @@ static inline void svm_inject_irq(struct vcpu_svm *svm, int irq)</div><div class='ctx'> </div><div class='ctx'> 	KVMTRACE_1D(INJ_VIRQ, &amp;svm-&gt;vcpu, (u32)irq, handler);</div><div class='ctx'> </div><div class='add'>+	++svm-&gt;vcpu.stat.irq_injections;</div><div class='ctx'> 	control = &amp;svm-&gt;vmcb-&gt;control;</div><div class='ctx'> 	control-&gt;int_vector = irq;</div><div class='ctx'> 	control-&gt;int_ctl &amp;= ~V_INTR_PRIO_MASK;</div><div class='hunk'>@@ -1716,6 +1707,12 @@ static inline void sync_lapic_to_cr8(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	svm-&gt;vmcb-&gt;control.int_ctl |= cr8 &amp; V_TPR_MASK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='add'>+#define R "r"</div><div class='add'>+#else</div><div class='add'>+#define R "e"</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static void svm_vcpu_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)</div><div class='ctx'> {</div><div class='ctx'> 	struct vcpu_svm *svm = to_svm(vcpu);</div><div class='hunk'>@@ -1723,6 +1720,10 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)</div><div class='ctx'> 	u16 gs_selector;</div><div class='ctx'> 	u16 ldt_selector;</div><div class='ctx'> </div><div class='add'>+	svm-&gt;vmcb-&gt;save.rax = vcpu-&gt;arch.regs[VCPU_REGS_RAX];</div><div class='add'>+	svm-&gt;vmcb-&gt;save.rsp = vcpu-&gt;arch.regs[VCPU_REGS_RSP];</div><div class='add'>+	svm-&gt;vmcb-&gt;save.rip = vcpu-&gt;arch.regs[VCPU_REGS_RIP];</div><div class='add'>+</div><div class='ctx'> 	pre_svm_run(svm);</div><div class='ctx'> </div><div class='ctx'> 	sync_lapic_to_cr8(vcpu);</div><div class='hunk'>@@ -1750,19 +1751,14 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)</div><div class='ctx'> 	local_irq_enable();</div><div class='ctx'> </div><div class='ctx'> 	asm volatile (</div><div class='add'>+		"push %%"R"bp; \n\t"</div><div class='add'>+		"mov %c[rbx](%[svm]), %%"R"bx \n\t"</div><div class='add'>+		"mov %c[rcx](%[svm]), %%"R"cx \n\t"</div><div class='add'>+		"mov %c[rdx](%[svm]), %%"R"dx \n\t"</div><div class='add'>+		"mov %c[rsi](%[svm]), %%"R"si \n\t"</div><div class='add'>+		"mov %c[rdi](%[svm]), %%"R"di \n\t"</div><div class='add'>+		"mov %c[rbp](%[svm]), %%"R"bp \n\t"</div><div class='ctx'> #ifdef CONFIG_X86_64</div><div class='del'>-		"push %%rbp; \n\t"</div><div class='del'>-#else</div><div class='del'>-		"push %%ebp; \n\t"</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_X86_64</div><div class='del'>-		"mov %c[rbx](%[svm]), %%rbx \n\t"</div><div class='del'>-		"mov %c[rcx](%[svm]), %%rcx \n\t"</div><div class='del'>-		"mov %c[rdx](%[svm]), %%rdx \n\t"</div><div class='del'>-		"mov %c[rsi](%[svm]), %%rsi \n\t"</div><div class='del'>-		"mov %c[rdi](%[svm]), %%rdi \n\t"</div><div class='del'>-		"mov %c[rbp](%[svm]), %%rbp \n\t"</div><div class='ctx'> 		"mov %c[r8](%[svm]),  %%r8  \n\t"</div><div class='ctx'> 		"mov %c[r9](%[svm]),  %%r9  \n\t"</div><div class='ctx'> 		"mov %c[r10](%[svm]), %%r10 \n\t"</div><div class='hunk'>@@ -1771,41 +1767,24 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)</div><div class='ctx'> 		"mov %c[r13](%[svm]), %%r13 \n\t"</div><div class='ctx'> 		"mov %c[r14](%[svm]), %%r14 \n\t"</div><div class='ctx'> 		"mov %c[r15](%[svm]), %%r15 \n\t"</div><div class='del'>-#else</div><div class='del'>-		"mov %c[rbx](%[svm]), %%ebx \n\t"</div><div class='del'>-		"mov %c[rcx](%[svm]), %%ecx \n\t"</div><div class='del'>-		"mov %c[rdx](%[svm]), %%edx \n\t"</div><div class='del'>-		"mov %c[rsi](%[svm]), %%esi \n\t"</div><div class='del'>-		"mov %c[rdi](%[svm]), %%edi \n\t"</div><div class='del'>-		"mov %c[rbp](%[svm]), %%ebp \n\t"</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_X86_64</div><div class='del'>-		/* Enter guest mode */</div><div class='del'>-		"push %%rax \n\t"</div><div class='del'>-		"mov %c[vmcb](%[svm]), %%rax \n\t"</div><div class='del'>-		__ex(SVM_VMLOAD) "\n\t"</div><div class='del'>-		__ex(SVM_VMRUN) "\n\t"</div><div class='del'>-		__ex(SVM_VMSAVE) "\n\t"</div><div class='del'>-		"pop %%rax \n\t"</div><div class='del'>-#else</div><div class='ctx'> 		/* Enter guest mode */</div><div class='del'>-		"push %%eax \n\t"</div><div class='del'>-		"mov %c[vmcb](%[svm]), %%eax \n\t"</div><div class='add'>+		"push %%"R"ax \n\t"</div><div class='add'>+		"mov %c[vmcb](%[svm]), %%"R"ax \n\t"</div><div class='ctx'> 		__ex(SVM_VMLOAD) "\n\t"</div><div class='ctx'> 		__ex(SVM_VMRUN) "\n\t"</div><div class='ctx'> 		__ex(SVM_VMSAVE) "\n\t"</div><div class='del'>-		"pop %%eax \n\t"</div><div class='del'>-#endif</div><div class='add'>+		"pop %%"R"ax \n\t"</div><div class='ctx'> </div><div class='ctx'> 		/* Save guest registers, load host registers */</div><div class='add'>+		"mov %%"R"bx, %c[rbx](%[svm]) \n\t"</div><div class='add'>+		"mov %%"R"cx, %c[rcx](%[svm]) \n\t"</div><div class='add'>+		"mov %%"R"dx, %c[rdx](%[svm]) \n\t"</div><div class='add'>+		"mov %%"R"si, %c[rsi](%[svm]) \n\t"</div><div class='add'>+		"mov %%"R"di, %c[rdi](%[svm]) \n\t"</div><div class='add'>+		"mov %%"R"bp, %c[rbp](%[svm]) \n\t"</div><div class='ctx'> #ifdef CONFIG_X86_64</div><div class='del'>-		"mov %%rbx, %c[rbx](%[svm]) \n\t"</div><div class='del'>-		"mov %%rcx, %c[rcx](%[svm]) \n\t"</div><div class='del'>-		"mov %%rdx, %c[rdx](%[svm]) \n\t"</div><div class='del'>-		"mov %%rsi, %c[rsi](%[svm]) \n\t"</div><div class='del'>-		"mov %%rdi, %c[rdi](%[svm]) \n\t"</div><div class='del'>-		"mov %%rbp, %c[rbp](%[svm]) \n\t"</div><div class='ctx'> 		"mov %%r8,  %c[r8](%[svm]) \n\t"</div><div class='ctx'> 		"mov %%r9,  %c[r9](%[svm]) \n\t"</div><div class='ctx'> 		"mov %%r10, %c[r10](%[svm]) \n\t"</div><div class='hunk'>@@ -1814,18 +1793,8 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)</div><div class='ctx'> 		"mov %%r13, %c[r13](%[svm]) \n\t"</div><div class='ctx'> 		"mov %%r14, %c[r14](%[svm]) \n\t"</div><div class='ctx'> 		"mov %%r15, %c[r15](%[svm]) \n\t"</div><div class='del'>-</div><div class='del'>-		"pop  %%rbp; \n\t"</div><div class='del'>-#else</div><div class='del'>-		"mov %%ebx, %c[rbx](%[svm]) \n\t"</div><div class='del'>-		"mov %%ecx, %c[rcx](%[svm]) \n\t"</div><div class='del'>-		"mov %%edx, %c[rdx](%[svm]) \n\t"</div><div class='del'>-		"mov %%esi, %c[rsi](%[svm]) \n\t"</div><div class='del'>-		"mov %%edi, %c[rdi](%[svm]) \n\t"</div><div class='del'>-		"mov %%ebp, %c[rbp](%[svm]) \n\t"</div><div class='del'>-</div><div class='del'>-		"pop  %%ebp; \n\t"</div><div class='ctx'> #endif</div><div class='add'>+		"pop %%"R"bp"</div><div class='ctx'> 		:</div><div class='ctx'> 		: [svm]"a"(svm),</div><div class='ctx'> 		  [vmcb]"i"(offsetof(struct vcpu_svm, vmcb_pa)),</div><div class='hunk'>@@ -1846,11 +1815,9 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)</div><div class='ctx'> 		  [r15]"i"(offsetof(struct vcpu_svm, vcpu.arch.regs[VCPU_REGS_R15]))</div><div class='ctx'> #endif</div><div class='ctx'> 		: "cc", "memory"</div><div class='add'>+		, R"bx", R"cx", R"dx", R"si", R"di"</div><div class='ctx'> #ifdef CONFIG_X86_64</div><div class='del'>-		, "rbx", "rcx", "rdx", "rsi", "rdi"</div><div class='ctx'> 		, "r8", "r9", "r10", "r11" , "r12", "r13", "r14", "r15"</div><div class='del'>-#else</div><div class='del'>-		, "ebx", "ecx", "edx" , "esi", "edi"</div><div class='ctx'> #endif</div><div class='ctx'> 		);</div><div class='ctx'> </div><div class='hunk'>@@ -1858,6 +1825,9 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)</div><div class='ctx'> 		load_db_regs(svm-&gt;host_db_regs);</div><div class='ctx'> </div><div class='ctx'> 	vcpu-&gt;arch.cr2 = svm-&gt;vmcb-&gt;save.cr2;</div><div class='add'>+	vcpu-&gt;arch.regs[VCPU_REGS_RAX] = svm-&gt;vmcb-&gt;save.rax;</div><div class='add'>+	vcpu-&gt;arch.regs[VCPU_REGS_RSP] = svm-&gt;vmcb-&gt;save.rsp;</div><div class='add'>+	vcpu-&gt;arch.regs[VCPU_REGS_RIP] = svm-&gt;vmcb-&gt;save.rip;</div><div class='ctx'> </div><div class='ctx'> 	write_dr6(svm-&gt;host_dr6);</div><div class='ctx'> 	write_dr7(svm-&gt;host_dr7);</div><div class='hunk'>@@ -1879,6 +1849,8 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)</div><div class='ctx'> 	svm-&gt;next_rip = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#undef R</div><div class='add'>+</div><div class='ctx'> static void svm_set_cr3(struct kvm_vcpu *vcpu, unsigned long root)</div><div class='ctx'> {</div><div class='ctx'> 	struct vcpu_svm *svm = to_svm(vcpu);</div><div class='hunk'>@@ -1977,8 +1949,6 @@ static struct kvm_x86_ops svm_x86_ops = {</div><div class='ctx'> 	.set_gdt = svm_set_gdt,</div><div class='ctx'> 	.get_dr = svm_get_dr,</div><div class='ctx'> 	.set_dr = svm_set_dr,</div><div class='del'>-	.cache_regs = svm_cache_regs,</div><div class='del'>-	.decache_regs = svm_decache_regs,</div><div class='ctx'> 	.get_rflags = svm_get_rflags,</div><div class='ctx'> 	.set_rflags = svm_set_rflags,</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c<br/>index 7041cc52b562..2643b430d83a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kvm/vmx.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kvm/vmx.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kvm/vmx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kvm/vmx.c</a></div><div class='hunk'>@@ -26,6 +26,8 @@</div><div class='ctx'> #include &lt;linux/highmem.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include "kvm_cache_regs.h"</div><div class='add'>+#include "x86.h"</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/desc.h&gt;</div><div class='hunk'>@@ -47,6 +49,9 @@ module_param(flexpriority_enabled, bool, 0);</div><div class='ctx'> static int enable_ept = 1;</div><div class='ctx'> module_param(enable_ept, bool, 0);</div><div class='ctx'> </div><div class='add'>+static int emulate_invalid_guest_state = 0;</div><div class='add'>+module_param(emulate_invalid_guest_state, bool, 0);</div><div class='add'>+</div><div class='ctx'> struct vmcs {</div><div class='ctx'> 	u32 revision_id;</div><div class='ctx'> 	u32 abort;</div><div class='hunk'>@@ -56,6 +61,7 @@ struct vmcs {</div><div class='ctx'> struct vcpu_vmx {</div><div class='ctx'> 	struct kvm_vcpu       vcpu;</div><div class='ctx'> 	struct list_head      local_vcpus_link;</div><div class='add'>+	unsigned long         host_rsp;</div><div class='ctx'> 	int                   launched;</div><div class='ctx'> 	u8                    fail;</div><div class='ctx'> 	u32                   idt_vectoring_info;</div><div class='hunk'>@@ -83,6 +89,7 @@ struct vcpu_vmx {</div><div class='ctx'> 		} irq;</div><div class='ctx'> 	} rmode;</div><div class='ctx'> 	int vpid;</div><div class='add'>+	bool emulation_required;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline struct vcpu_vmx *to_vmx(struct kvm_vcpu *vcpu)</div><div class='hunk'>@@ -468,7 +475,7 @@ static void update_exception_bitmap(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	if (!vcpu-&gt;fpu_active)</div><div class='ctx'> 		eb |= 1u &lt;&lt; NM_VECTOR;</div><div class='ctx'> 	if (vcpu-&gt;guest_debug.enabled)</div><div class='del'>-		eb |= 1u &lt;&lt; 1;</div><div class='add'>+		eb |= 1u &lt;&lt; DB_VECTOR;</div><div class='ctx'> 	if (vcpu-&gt;arch.rmode.active)</div><div class='ctx'> 		eb = ~0;</div><div class='ctx'> 	if (vm_need_ept())</div><div class='hunk'>@@ -715,9 +722,9 @@ static void skip_emulated_instruction(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	unsigned long rip;</div><div class='ctx'> 	u32 interruptibility;</div><div class='ctx'> </div><div class='del'>-	rip = vmcs_readl(GUEST_RIP);</div><div class='add'>+	rip = kvm_rip_read(vcpu);</div><div class='ctx'> 	rip += vmcs_read32(VM_EXIT_INSTRUCTION_LEN);</div><div class='del'>-	vmcs_writel(GUEST_RIP, rip);</div><div class='add'>+	kvm_rip_write(vcpu, rip);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We emulated an instruction, so temporary interrupt blocking</div><div class='hunk'>@@ -733,19 +740,35 @@ static void skip_emulated_instruction(struct kvm_vcpu *vcpu)</div><div class='ctx'> static void vmx_queue_exception(struct kvm_vcpu *vcpu, unsigned nr,</div><div class='ctx'> 				bool has_error_code, u32 error_code)</div><div class='ctx'> {</div><div class='add'>+	struct vcpu_vmx *vmx = to_vmx(vcpu);</div><div class='add'>+</div><div class='add'>+	if (has_error_code)</div><div class='add'>+		vmcs_write32(VM_ENTRY_EXCEPTION_ERROR_CODE, error_code);</div><div class='add'>+</div><div class='add'>+	if (vcpu-&gt;arch.rmode.active) {</div><div class='add'>+		vmx-&gt;rmode.irq.pending = true;</div><div class='add'>+		vmx-&gt;rmode.irq.vector = nr;</div><div class='add'>+		vmx-&gt;rmode.irq.rip = kvm_rip_read(vcpu);</div><div class='add'>+		if (nr == BP_VECTOR)</div><div class='add'>+			vmx-&gt;rmode.irq.rip++;</div><div class='add'>+		vmcs_write32(VM_ENTRY_INTR_INFO_FIELD,</div><div class='add'>+			     nr | INTR_TYPE_SOFT_INTR</div><div class='add'>+			     | (has_error_code ? INTR_INFO_DELIVER_CODE_MASK : 0)</div><div class='add'>+			     | INTR_INFO_VALID_MASK);</div><div class='add'>+		vmcs_write32(VM_ENTRY_INSTRUCTION_LEN, 1);</div><div class='add'>+		kvm_rip_write(vcpu, vmx-&gt;rmode.irq.rip - 1);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	vmcs_write32(VM_ENTRY_INTR_INFO_FIELD,</div><div class='ctx'> 		     nr | INTR_TYPE_EXCEPTION</div><div class='ctx'> 		     | (has_error_code ? INTR_INFO_DELIVER_CODE_MASK : 0)</div><div class='ctx'> 		     | INTR_INFO_VALID_MASK);</div><div class='del'>-	if (has_error_code)</div><div class='del'>-		vmcs_write32(VM_ENTRY_EXCEPTION_ERROR_CODE, error_code);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool vmx_exception_injected(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='del'>-	struct vcpu_vmx *vmx = to_vmx(vcpu);</div><div class='del'>-</div><div class='del'>-	return !(vmx-&gt;idt_vectoring_info &amp; VECTORING_INFO_VALID_MASK);</div><div class='add'>+	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -947,24 +970,19 @@ static int vmx_set_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 data)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Sync the rsp and rip registers into the vcpu structure.  This allows</div><div class='del'>- * registers to be accessed by indexing vcpu-&gt;arch.regs.</div><div class='del'>- */</div><div class='del'>-static void vcpu_load_rsp_rip(struct kvm_vcpu *vcpu)</div><div class='del'>-{</div><div class='del'>-	vcpu-&gt;arch.regs[VCPU_REGS_RSP] = vmcs_readl(GUEST_RSP);</div><div class='del'>-	vcpu-&gt;arch.rip = vmcs_readl(GUEST_RIP);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Syncs rsp and rip back into the vmcs.  Should be called after possible</div><div class='del'>- * modification.</div><div class='del'>- */</div><div class='del'>-static void vcpu_put_rsp_rip(struct kvm_vcpu *vcpu)</div><div class='add'>+static void vmx_cache_reg(struct kvm_vcpu *vcpu, enum kvm_reg reg)</div><div class='ctx'> {</div><div class='del'>-	vmcs_writel(GUEST_RSP, vcpu-&gt;arch.regs[VCPU_REGS_RSP]);</div><div class='del'>-	vmcs_writel(GUEST_RIP, vcpu-&gt;arch.rip);</div><div class='add'>+	__set_bit(reg, (unsigned long *)&amp;vcpu-&gt;arch.regs_avail);</div><div class='add'>+	switch (reg) {</div><div class='add'>+	case VCPU_REGS_RSP:</div><div class='add'>+		vcpu-&gt;arch.regs[VCPU_REGS_RSP] = vmcs_readl(GUEST_RSP);</div><div class='add'>+		break;</div><div class='add'>+	case VCPU_REGS_RIP:</div><div class='add'>+		vcpu-&gt;arch.regs[VCPU_REGS_RIP] = vmcs_readl(GUEST_RIP);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int set_guest_debug(struct kvm_vcpu *vcpu, struct kvm_debug_guest *dbg)</div><div class='hunk'>@@ -1007,17 +1025,9 @@ static int set_guest_debug(struct kvm_vcpu *vcpu, struct kvm_debug_guest *dbg)</div><div class='ctx'> </div><div class='ctx'> static int vmx_get_irq(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='del'>-	struct vcpu_vmx *vmx = to_vmx(vcpu);</div><div class='del'>-	u32 idtv_info_field;</div><div class='del'>-</div><div class='del'>-	idtv_info_field = vmx-&gt;idt_vectoring_info;</div><div class='del'>-	if (idtv_info_field &amp; INTR_INFO_VALID_MASK) {</div><div class='del'>-		if (is_external_interrupt(idtv_info_field))</div><div class='del'>-			return idtv_info_field &amp; VECTORING_INFO_VECTOR_MASK;</div><div class='del'>-		else</div><div class='del'>-			printk(KERN_DEBUG "pending exception: not handled yet\n");</div><div class='del'>-	}</div><div class='del'>-	return -1;</div><div class='add'>+	if (!vcpu-&gt;arch.interrupt.pending)</div><div class='add'>+		return -1;</div><div class='add'>+	return vcpu-&gt;arch.interrupt.nr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static __init int cpu_has_kvm_support(void)</div><div class='hunk'>@@ -1031,9 +1041,9 @@ static __init int vmx_disabled_by_bios(void)</div><div class='ctx'> 	u64 msr;</div><div class='ctx'> </div><div class='ctx'> 	rdmsrl(MSR_IA32_FEATURE_CONTROL, msr);</div><div class='del'>-	return (msr &amp; (MSR_IA32_FEATURE_CONTROL_LOCKED |</div><div class='del'>-		       MSR_IA32_FEATURE_CONTROL_VMXON_ENABLED))</div><div class='del'>-	    == MSR_IA32_FEATURE_CONTROL_LOCKED;</div><div class='add'>+	return (msr &amp; (FEATURE_CONTROL_LOCKED |</div><div class='add'>+		       FEATURE_CONTROL_VMXON_ENABLED))</div><div class='add'>+	    == FEATURE_CONTROL_LOCKED;</div><div class='ctx'> 	/* locked but not enabled */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1045,14 +1055,14 @@ static void hardware_enable(void *garbage)</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;per_cpu(vcpus_on_cpu, cpu));</div><div class='ctx'> 	rdmsrl(MSR_IA32_FEATURE_CONTROL, old);</div><div class='del'>-	if ((old &amp; (MSR_IA32_FEATURE_CONTROL_LOCKED |</div><div class='del'>-		    MSR_IA32_FEATURE_CONTROL_VMXON_ENABLED))</div><div class='del'>-	    != (MSR_IA32_FEATURE_CONTROL_LOCKED |</div><div class='del'>-		MSR_IA32_FEATURE_CONTROL_VMXON_ENABLED))</div><div class='add'>+	if ((old &amp; (FEATURE_CONTROL_LOCKED |</div><div class='add'>+		    FEATURE_CONTROL_VMXON_ENABLED))</div><div class='add'>+	    != (FEATURE_CONTROL_LOCKED |</div><div class='add'>+		FEATURE_CONTROL_VMXON_ENABLED))</div><div class='ctx'> 		/* enable and lock */</div><div class='ctx'> 		wrmsrl(MSR_IA32_FEATURE_CONTROL, old |</div><div class='del'>-		       MSR_IA32_FEATURE_CONTROL_LOCKED |</div><div class='del'>-		       MSR_IA32_FEATURE_CONTROL_VMXON_ENABLED);</div><div class='add'>+		       FEATURE_CONTROL_LOCKED |</div><div class='add'>+		       FEATURE_CONTROL_VMXON_ENABLED);</div><div class='ctx'> 	write_cr4(read_cr4() | X86_CR4_VMXE); /* FIXME: not cpu hotplug safe */</div><div class='ctx'> 	asm volatile (ASM_VMX_VMXON_RAX</div><div class='ctx'> 		      : : "a"(&amp;phys_addr), "m"(phys_addr)</div><div class='hunk'>@@ -1120,7 +1130,8 @@ static __init int setup_vmcs_config(struct vmcs_config *vmcs_conf)</div><div class='ctx'> 	      CPU_BASED_CR3_STORE_EXITING |</div><div class='ctx'> 	      CPU_BASED_USE_IO_BITMAPS |</div><div class='ctx'> 	      CPU_BASED_MOV_DR_EXITING |</div><div class='del'>-	      CPU_BASED_USE_TSC_OFFSETING;</div><div class='add'>+	      CPU_BASED_USE_TSC_OFFSETING |</div><div class='add'>+	      CPU_BASED_INVLPG_EXITING;</div><div class='ctx'> 	opt = CPU_BASED_TPR_SHADOW |</div><div class='ctx'> 	      CPU_BASED_USE_MSR_BITMAPS |</div><div class='ctx'> 	      CPU_BASED_ACTIVATE_SECONDARY_CONTROLS;</div><div class='hunk'>@@ -1149,9 +1160,11 @@ static __init int setup_vmcs_config(struct vmcs_config *vmcs_conf)</div><div class='ctx'> 		_cpu_based_exec_control &amp;= ~CPU_BASED_TPR_SHADOW;</div><div class='ctx'> #endif</div><div class='ctx'> 	if (_cpu_based_2nd_exec_control &amp; SECONDARY_EXEC_ENABLE_EPT) {</div><div class='del'>-		/* CR3 accesses don't need to cause VM Exits when EPT enabled */</div><div class='add'>+		/* CR3 accesses and invlpg don't need to cause VM Exits when EPT</div><div class='add'>+		   enabled */</div><div class='ctx'> 		min &amp;= ~(CPU_BASED_CR3_LOAD_EXITING |</div><div class='del'>-			 CPU_BASED_CR3_STORE_EXITING);</div><div class='add'>+			 CPU_BASED_CR3_STORE_EXITING |</div><div class='add'>+			 CPU_BASED_INVLPG_EXITING);</div><div class='ctx'> 		if (adjust_vmx_controls(min, opt, MSR_IA32_VMX_PROCBASED_CTLS,</div><div class='ctx'> 					&amp;_cpu_based_exec_control) &lt; 0)</div><div class='ctx'> 			return -EIO;</div><div class='hunk'>@@ -1288,7 +1301,9 @@ static void fix_pmode_dataseg(int seg, struct kvm_save_segment *save)</div><div class='ctx'> static void enter_pmode(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='add'>+	struct vcpu_vmx *vmx = to_vmx(vcpu);</div><div class='ctx'> </div><div class='add'>+	vmx-&gt;emulation_required = 1;</div><div class='ctx'> 	vcpu-&gt;arch.rmode.active = 0;</div><div class='ctx'> </div><div class='ctx'> 	vmcs_writel(GUEST_TR_BASE, vcpu-&gt;arch.rmode.tr.base);</div><div class='hunk'>@@ -1305,6 +1320,9 @@ static void enter_pmode(struct kvm_vcpu *vcpu)</div><div class='ctx'> </div><div class='ctx'> 	update_exception_bitmap(vcpu);</div><div class='ctx'> </div><div class='add'>+	if (emulate_invalid_guest_state)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	fix_pmode_dataseg(VCPU_SREG_ES, &amp;vcpu-&gt;arch.rmode.es);</div><div class='ctx'> 	fix_pmode_dataseg(VCPU_SREG_DS, &amp;vcpu-&gt;arch.rmode.ds);</div><div class='ctx'> 	fix_pmode_dataseg(VCPU_SREG_GS, &amp;vcpu-&gt;arch.rmode.gs);</div><div class='hunk'>@@ -1345,7 +1363,9 @@ static void fix_rmode_seg(int seg, struct kvm_save_segment *save)</div><div class='ctx'> static void enter_rmode(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='add'>+	struct vcpu_vmx *vmx = to_vmx(vcpu);</div><div class='ctx'> </div><div class='add'>+	vmx-&gt;emulation_required = 1;</div><div class='ctx'> 	vcpu-&gt;arch.rmode.active = 1;</div><div class='ctx'> </div><div class='ctx'> 	vcpu-&gt;arch.rmode.tr.base = vmcs_readl(GUEST_TR_BASE);</div><div class='hunk'>@@ -1367,6 +1387,9 @@ static void enter_rmode(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	vmcs_writel(GUEST_CR4, vmcs_readl(GUEST_CR4) | X86_CR4_VME);</div><div class='ctx'> 	update_exception_bitmap(vcpu);</div><div class='ctx'> </div><div class='add'>+	if (emulate_invalid_guest_state)</div><div class='add'>+		goto continue_rmode;</div><div class='add'>+</div><div class='ctx'> 	vmcs_write16(GUEST_SS_SELECTOR, vmcs_readl(GUEST_SS_BASE) &gt;&gt; 4);</div><div class='ctx'> 	vmcs_write32(GUEST_SS_LIMIT, 0xffff);</div><div class='ctx'> 	vmcs_write32(GUEST_SS_AR_BYTES, 0xf3);</div><div class='hunk'>@@ -1382,6 +1405,7 @@ static void enter_rmode(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	fix_rmode_seg(VCPU_SREG_GS, &amp;vcpu-&gt;arch.rmode.gs);</div><div class='ctx'> 	fix_rmode_seg(VCPU_SREG_FS, &amp;vcpu-&gt;arch.rmode.fs);</div><div class='ctx'> </div><div class='add'>+continue_rmode:</div><div class='ctx'> 	kvm_mmu_reset_context(vcpu);</div><div class='ctx'> 	init_rmode(vcpu-&gt;kvm);</div><div class='ctx'> }</div><div class='hunk'>@@ -1715,6 +1739,186 @@ static void vmx_set_gdt(struct kvm_vcpu *vcpu, struct descriptor_table *dt)</div><div class='ctx'> 	vmcs_writel(GUEST_GDTR_BASE, dt-&gt;base);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool rmode_segment_valid(struct kvm_vcpu *vcpu, int seg)</div><div class='add'>+{</div><div class='add'>+	struct kvm_segment var;</div><div class='add'>+	u32 ar;</div><div class='add'>+</div><div class='add'>+	vmx_get_segment(vcpu, &amp;var, seg);</div><div class='add'>+	ar = vmx_segment_access_rights(&amp;var);</div><div class='add'>+</div><div class='add'>+	if (var.base != (var.selector &lt;&lt; 4))</div><div class='add'>+		return false;</div><div class='add'>+	if (var.limit != 0xffff)</div><div class='add'>+		return false;</div><div class='add'>+	if (ar != 0xf3)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool code_segment_valid(struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	struct kvm_segment cs;</div><div class='add'>+	unsigned int cs_rpl;</div><div class='add'>+</div><div class='add'>+	vmx_get_segment(vcpu, &amp;cs, VCPU_SREG_CS);</div><div class='add'>+	cs_rpl = cs.selector &amp; SELECTOR_RPL_MASK;</div><div class='add'>+</div><div class='add'>+	if (~cs.type &amp; (AR_TYPE_CODE_MASK|AR_TYPE_ACCESSES_MASK))</div><div class='add'>+		return false;</div><div class='add'>+	if (!cs.s)</div><div class='add'>+		return false;</div><div class='add'>+	if (!(~cs.type &amp; (AR_TYPE_CODE_MASK|AR_TYPE_WRITEABLE_MASK))) {</div><div class='add'>+		if (cs.dpl &gt; cs_rpl)</div><div class='add'>+			return false;</div><div class='add'>+	} else if (cs.type &amp; AR_TYPE_CODE_MASK) {</div><div class='add'>+		if (cs.dpl != cs_rpl)</div><div class='add'>+			return false;</div><div class='add'>+	}</div><div class='add'>+	if (!cs.present)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* TODO: Add Reserved field check, this'll require a new member in the kvm_segment_field structure */</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool stack_segment_valid(struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	struct kvm_segment ss;</div><div class='add'>+	unsigned int ss_rpl;</div><div class='add'>+</div><div class='add'>+	vmx_get_segment(vcpu, &amp;ss, VCPU_SREG_SS);</div><div class='add'>+	ss_rpl = ss.selector &amp; SELECTOR_RPL_MASK;</div><div class='add'>+</div><div class='add'>+	if ((ss.type != 3) || (ss.type != 7))</div><div class='add'>+		return false;</div><div class='add'>+	if (!ss.s)</div><div class='add'>+		return false;</div><div class='add'>+	if (ss.dpl != ss_rpl) /* DPL != RPL */</div><div class='add'>+		return false;</div><div class='add'>+	if (!ss.present)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool data_segment_valid(struct kvm_vcpu *vcpu, int seg)</div><div class='add'>+{</div><div class='add'>+	struct kvm_segment var;</div><div class='add'>+	unsigned int rpl;</div><div class='add'>+</div><div class='add'>+	vmx_get_segment(vcpu, &amp;var, seg);</div><div class='add'>+	rpl = var.selector &amp; SELECTOR_RPL_MASK;</div><div class='add'>+</div><div class='add'>+	if (!var.s)</div><div class='add'>+		return false;</div><div class='add'>+	if (!var.present)</div><div class='add'>+		return false;</div><div class='add'>+	if (~var.type &amp; (AR_TYPE_CODE_MASK|AR_TYPE_WRITEABLE_MASK)) {</div><div class='add'>+		if (var.dpl &lt; rpl) /* DPL &lt; RPL */</div><div class='add'>+			return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* TODO: Add other members to kvm_segment_field to allow checking for other access</div><div class='add'>+	 * rights flags</div><div class='add'>+	 */</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool tr_valid(struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	struct kvm_segment tr;</div><div class='add'>+</div><div class='add'>+	vmx_get_segment(vcpu, &amp;tr, VCPU_SREG_TR);</div><div class='add'>+</div><div class='add'>+	if (tr.selector &amp; SELECTOR_TI_MASK)	/* TI = 1 */</div><div class='add'>+		return false;</div><div class='add'>+	if ((tr.type != 3) || (tr.type != 11)) /* TODO: Check if guest is in IA32e mode */</div><div class='add'>+		return false;</div><div class='add'>+	if (!tr.present)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ldtr_valid(struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	struct kvm_segment ldtr;</div><div class='add'>+</div><div class='add'>+	vmx_get_segment(vcpu, &amp;ldtr, VCPU_SREG_LDTR);</div><div class='add'>+</div><div class='add'>+	if (ldtr.selector &amp; SELECTOR_TI_MASK)	/* TI = 1 */</div><div class='add'>+		return false;</div><div class='add'>+	if (ldtr.type != 2)</div><div class='add'>+		return false;</div><div class='add'>+	if (!ldtr.present)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool cs_ss_rpl_check(struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	struct kvm_segment cs, ss;</div><div class='add'>+</div><div class='add'>+	vmx_get_segment(vcpu, &amp;cs, VCPU_SREG_CS);</div><div class='add'>+	vmx_get_segment(vcpu, &amp;ss, VCPU_SREG_SS);</div><div class='add'>+</div><div class='add'>+	return ((cs.selector &amp; SELECTOR_RPL_MASK) ==</div><div class='add'>+		 (ss.selector &amp; SELECTOR_RPL_MASK));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Check if guest state is valid. Returns true if valid, false if</div><div class='add'>+ * not.</div><div class='add'>+ * We assume that registers are always usable</div><div class='add'>+ */</div><div class='add'>+static bool guest_state_valid(struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	/* real mode guest state checks */</div><div class='add'>+	if (!(vcpu-&gt;arch.cr0 &amp; X86_CR0_PE)) {</div><div class='add'>+		if (!rmode_segment_valid(vcpu, VCPU_SREG_CS))</div><div class='add'>+			return false;</div><div class='add'>+		if (!rmode_segment_valid(vcpu, VCPU_SREG_SS))</div><div class='add'>+			return false;</div><div class='add'>+		if (!rmode_segment_valid(vcpu, VCPU_SREG_DS))</div><div class='add'>+			return false;</div><div class='add'>+		if (!rmode_segment_valid(vcpu, VCPU_SREG_ES))</div><div class='add'>+			return false;</div><div class='add'>+		if (!rmode_segment_valid(vcpu, VCPU_SREG_FS))</div><div class='add'>+			return false;</div><div class='add'>+		if (!rmode_segment_valid(vcpu, VCPU_SREG_GS))</div><div class='add'>+			return false;</div><div class='add'>+	} else {</div><div class='add'>+	/* protected mode guest state checks */</div><div class='add'>+		if (!cs_ss_rpl_check(vcpu))</div><div class='add'>+			return false;</div><div class='add'>+		if (!code_segment_valid(vcpu))</div><div class='add'>+			return false;</div><div class='add'>+		if (!stack_segment_valid(vcpu))</div><div class='add'>+			return false;</div><div class='add'>+		if (!data_segment_valid(vcpu, VCPU_SREG_DS))</div><div class='add'>+			return false;</div><div class='add'>+		if (!data_segment_valid(vcpu, VCPU_SREG_ES))</div><div class='add'>+			return false;</div><div class='add'>+		if (!data_segment_valid(vcpu, VCPU_SREG_FS))</div><div class='add'>+			return false;</div><div class='add'>+		if (!data_segment_valid(vcpu, VCPU_SREG_GS))</div><div class='add'>+			return false;</div><div class='add'>+		if (!tr_valid(vcpu))</div><div class='add'>+			return false;</div><div class='add'>+		if (!ldtr_valid(vcpu))</div><div class='add'>+			return false;</div><div class='add'>+	}</div><div class='add'>+	/* TODO:</div><div class='add'>+	 * - Add checks on RIP</div><div class='add'>+	 * - Add checks on RFLAGS</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int init_rmode_tss(struct kvm *kvm)</div><div class='ctx'> {</div><div class='ctx'> 	gfn_t fn = rmode_tss_base(kvm) &gt;&gt; PAGE_SHIFT;</div><div class='hunk'>@@ -1726,7 +1930,8 @@ static int init_rmode_tss(struct kvm *kvm)</div><div class='ctx'> 	if (r &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	data = TSS_BASE_SIZE + TSS_REDIRECTION_SIZE;</div><div class='del'>-	r = kvm_write_guest_page(kvm, fn++, &amp;data, 0x66, sizeof(u16));</div><div class='add'>+	r = kvm_write_guest_page(kvm, fn++, &amp;data,</div><div class='add'>+			TSS_IOPB_BASE_OFFSET, sizeof(u16));</div><div class='ctx'> 	if (r &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	r = kvm_clear_guest_page(kvm, fn++, 0, PAGE_SIZE);</div><div class='hunk'>@@ -1789,7 +1994,7 @@ static void seg_setup(int seg)</div><div class='ctx'> 	vmcs_write16(sf-&gt;selector, 0);</div><div class='ctx'> 	vmcs_writel(sf-&gt;base, 0);</div><div class='ctx'> 	vmcs_write32(sf-&gt;limit, 0xffff);</div><div class='del'>-	vmcs_write32(sf-&gt;ar_bytes, 0x93);</div><div class='add'>+	vmcs_write32(sf-&gt;ar_bytes, 0xf3);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int alloc_apic_access_page(struct kvm *kvm)</div><div class='hunk'>@@ -1808,9 +2013,7 @@ static int alloc_apic_access_page(struct kvm *kvm)</div><div class='ctx'> 	if (r)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	down_read(&amp;current-&gt;mm-&gt;mmap_sem);</div><div class='ctx'> 	kvm-&gt;arch.apic_access_page = gfn_to_page(kvm, 0xfee00);</div><div class='del'>-	up_read(&amp;current-&gt;mm-&gt;mmap_sem);</div><div class='ctx'> out:</div><div class='ctx'> 	up_write(&amp;kvm-&gt;slots_lock);</div><div class='ctx'> 	return r;</div><div class='hunk'>@@ -1832,10 +2035,8 @@ static int alloc_identity_pagetable(struct kvm *kvm)</div><div class='ctx'> 	if (r)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	down_read(&amp;current-&gt;mm-&gt;mmap_sem);</div><div class='ctx'> 	kvm-&gt;arch.ept_identity_pagetable = gfn_to_page(kvm,</div><div class='ctx'> 			VMX_EPT_IDENTITY_PAGETABLE_ADDR &gt;&gt; PAGE_SHIFT);</div><div class='del'>-	up_read(&amp;current-&gt;mm-&gt;mmap_sem);</div><div class='ctx'> out:</div><div class='ctx'> 	up_write(&amp;kvm-&gt;slots_lock);</div><div class='ctx'> 	return r;</div><div class='hunk'>@@ -1917,7 +2118,8 @@ static int vmx_vcpu_setup(struct vcpu_vmx *vmx)</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!vm_need_ept())</div><div class='ctx'> 		exec_control |= CPU_BASED_CR3_STORE_EXITING |</div><div class='del'>-				CPU_BASED_CR3_LOAD_EXITING;</div><div class='add'>+				CPU_BASED_CR3_LOAD_EXITING  |</div><div class='add'>+				CPU_BASED_INVLPG_EXITING;</div><div class='ctx'> 	vmcs_write32(CPU_BASED_VM_EXEC_CONTROL, exec_control);</div><div class='ctx'> </div><div class='ctx'> 	if (cpu_has_secondary_exec_ctrls()) {</div><div class='hunk'>@@ -2019,6 +2221,7 @@ static int vmx_vcpu_reset(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	u64 msr;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	vcpu-&gt;arch.regs_avail = ~((1 &lt;&lt; VCPU_REGS_RIP) | (1 &lt;&lt; VCPU_REGS_RSP));</div><div class='ctx'> 	down_read(&amp;vcpu-&gt;kvm-&gt;slots_lock);</div><div class='ctx'> 	if (!init_rmode(vmx-&gt;vcpu.kvm)) {</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='hunk'>@@ -2036,6 +2239,7 @@ static int vmx_vcpu_reset(struct kvm_vcpu *vcpu)</div><div class='ctx'> </div><div class='ctx'> 	fx_init(&amp;vmx-&gt;vcpu);</div><div class='ctx'> </div><div class='add'>+	seg_setup(VCPU_SREG_CS);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * GUEST_CS_BASE should really be 0xffff0000, but VT vm86 mode</div><div class='ctx'> 	 * insists on having GUEST_CS_BASE == GUEST_CS_SELECTOR &lt;&lt; 4.  Sigh.</div><div class='hunk'>@@ -2047,8 +2251,6 @@ static int vmx_vcpu_reset(struct kvm_vcpu *vcpu)</div><div class='ctx'> 		vmcs_write16(GUEST_CS_SELECTOR, vmx-&gt;vcpu.arch.sipi_vector &lt;&lt; 8);</div><div class='ctx'> 		vmcs_writel(GUEST_CS_BASE, vmx-&gt;vcpu.arch.sipi_vector &lt;&lt; 12);</div><div class='ctx'> 	}</div><div class='del'>-	vmcs_write32(GUEST_CS_LIMIT, 0xffff);</div><div class='del'>-	vmcs_write32(GUEST_CS_AR_BYTES, 0x9b);</div><div class='ctx'> </div><div class='ctx'> 	seg_setup(VCPU_SREG_DS);</div><div class='ctx'> 	seg_setup(VCPU_SREG_ES);</div><div class='hunk'>@@ -2072,10 +2274,10 @@ static int vmx_vcpu_reset(struct kvm_vcpu *vcpu)</div><div class='ctx'> </div><div class='ctx'> 	vmcs_writel(GUEST_RFLAGS, 0x02);</div><div class='ctx'> 	if (vmx-&gt;vcpu.vcpu_id == 0)</div><div class='del'>-		vmcs_writel(GUEST_RIP, 0xfff0);</div><div class='add'>+		kvm_rip_write(vcpu, 0xfff0);</div><div class='ctx'> 	else</div><div class='del'>-		vmcs_writel(GUEST_RIP, 0);</div><div class='del'>-	vmcs_writel(GUEST_RSP, 0);</div><div class='add'>+		kvm_rip_write(vcpu, 0);</div><div class='add'>+	kvm_register_write(vcpu, VCPU_REGS_RSP, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* todo: dr0 = dr1 = dr2 = dr3 = 0; dr6 = 0xffff0ff0 */</div><div class='ctx'> 	vmcs_writel(GUEST_DR7, 0x400);</div><div class='hunk'>@@ -2125,6 +2327,9 @@ static int vmx_vcpu_reset(struct kvm_vcpu *vcpu)</div><div class='ctx'> </div><div class='ctx'> 	ret = 0;</div><div class='ctx'> </div><div class='add'>+	/* HACK: Don't enable emulation on guest boot/reset */</div><div class='add'>+	vmx-&gt;emulation_required = 0;</div><div class='add'>+</div><div class='ctx'> out:</div><div class='ctx'> 	up_read(&amp;vcpu-&gt;kvm-&gt;slots_lock);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -2136,14 +2341,15 @@ static void vmx_inject_irq(struct kvm_vcpu *vcpu, int irq)</div><div class='ctx'> </div><div class='ctx'> 	KVMTRACE_1D(INJ_VIRQ, vcpu, (u32)irq, handler);</div><div class='ctx'> </div><div class='add'>+	++vcpu-&gt;stat.irq_injections;</div><div class='ctx'> 	if (vcpu-&gt;arch.rmode.active) {</div><div class='ctx'> 		vmx-&gt;rmode.irq.pending = true;</div><div class='ctx'> 		vmx-&gt;rmode.irq.vector = irq;</div><div class='del'>-		vmx-&gt;rmode.irq.rip = vmcs_readl(GUEST_RIP);</div><div class='add'>+		vmx-&gt;rmode.irq.rip = kvm_rip_read(vcpu);</div><div class='ctx'> 		vmcs_write32(VM_ENTRY_INTR_INFO_FIELD,</div><div class='ctx'> 			     irq | INTR_TYPE_SOFT_INTR | INTR_INFO_VALID_MASK);</div><div class='ctx'> 		vmcs_write32(VM_ENTRY_INSTRUCTION_LEN, 1);</div><div class='del'>-		vmcs_writel(GUEST_RIP, vmx-&gt;rmode.irq.rip - 1);</div><div class='add'>+		kvm_rip_write(vcpu, vmx-&gt;rmode.irq.rip - 1);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	vmcs_write32(VM_ENTRY_INTR_INFO_FIELD,</div><div class='hunk'>@@ -2154,7 +2360,6 @@ static void vmx_inject_nmi(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='ctx'> 	vmcs_write32(VM_ENTRY_INTR_INFO_FIELD,</div><div class='ctx'> 			INTR_TYPE_NMI_INTR | INTR_INFO_VALID_MASK | NMI_VECTOR);</div><div class='del'>-	vcpu-&gt;arch.nmi_pending = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void kvm_do_inject_irq(struct kvm_vcpu *vcpu)</div><div class='hunk'>@@ -2166,7 +2371,7 @@ static void kvm_do_inject_irq(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	clear_bit(bit_index, &amp;vcpu-&gt;arch.irq_pending[word_index]);</div><div class='ctx'> 	if (!vcpu-&gt;arch.irq_pending[word_index])</div><div class='ctx'> 		clear_bit(word_index, &amp;vcpu-&gt;arch.irq_summary);</div><div class='del'>-	vmx_inject_irq(vcpu, irq);</div><div class='add'>+	kvm_queue_interrupt(vcpu, irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -2180,13 +2385,12 @@ static void do_interrupt_requests(struct kvm_vcpu *vcpu,</div><div class='ctx'> 		 (vmcs_read32(GUEST_INTERRUPTIBILITY_INFO) &amp; 3) == 0);</div><div class='ctx'> </div><div class='ctx'> 	if (vcpu-&gt;arch.interrupt_window_open &amp;&amp;</div><div class='del'>-	    vcpu-&gt;arch.irq_summary &amp;&amp;</div><div class='del'>-	    !(vmcs_read32(VM_ENTRY_INTR_INFO_FIELD) &amp; INTR_INFO_VALID_MASK))</div><div class='del'>-		/*</div><div class='del'>-		 * If interrupts enabled, and not blocked by sti or mov ss. Good.</div><div class='del'>-		 */</div><div class='add'>+	    vcpu-&gt;arch.irq_summary &amp;&amp; !vcpu-&gt;arch.interrupt.pending)</div><div class='ctx'> 		kvm_do_inject_irq(vcpu);</div><div class='ctx'> </div><div class='add'>+	if (vcpu-&gt;arch.interrupt_window_open &amp;&amp; vcpu-&gt;arch.interrupt.pending)</div><div class='add'>+		vmx_inject_irq(vcpu, vcpu-&gt;arch.interrupt.nr);</div><div class='add'>+</div><div class='ctx'> 	cpu_based_vm_exec_control = vmcs_read32(CPU_BASED_VM_EXEC_CONTROL);</div><div class='ctx'> 	if (!vcpu-&gt;arch.interrupt_window_open &amp;&amp;</div><div class='ctx'> 	    (vcpu-&gt;arch.irq_summary || kvm_run-&gt;request_interrupt_window))</div><div class='hunk'>@@ -2237,9 +2441,6 @@ static void kvm_guest_debug_pre(struct kvm_vcpu *vcpu)</div><div class='ctx'> static int handle_rmode_exception(struct kvm_vcpu *vcpu,</div><div class='ctx'> 				  int vec, u32 err_code)</div><div class='ctx'> {</div><div class='del'>-	if (!vcpu-&gt;arch.rmode.active)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Instruction with address size override prefix opcode 0x67</div><div class='ctx'> 	 * Cause the #SS fault with 0 error code in VM86 mode.</div><div class='hunk'>@@ -2247,6 +2448,25 @@ static int handle_rmode_exception(struct kvm_vcpu *vcpu,</div><div class='ctx'> 	if (((vec == GP_VECTOR) || (vec == SS_VECTOR)) &amp;&amp; err_code == 0)</div><div class='ctx'> 		if (emulate_instruction(vcpu, NULL, 0, 0, 0) == EMULATE_DONE)</div><div class='ctx'> 			return 1;</div><div class='add'>+	/*</div><div class='add'>+	 * Forward all other exceptions that are valid in real mode.</div><div class='add'>+	 * FIXME: Breaks guest debugging in real mode, needs to be fixed with</div><div class='add'>+	 *        the required debugging infrastructure rework.</div><div class='add'>+	 */</div><div class='add'>+	switch (vec) {</div><div class='add'>+	case DE_VECTOR:</div><div class='add'>+	case DB_VECTOR:</div><div class='add'>+	case BP_VECTOR:</div><div class='add'>+	case OF_VECTOR:</div><div class='add'>+	case BR_VECTOR:</div><div class='add'>+	case UD_VECTOR:</div><div class='add'>+	case DF_VECTOR:</div><div class='add'>+	case SS_VECTOR:</div><div class='add'>+	case GP_VECTOR:</div><div class='add'>+	case MF_VECTOR:</div><div class='add'>+		kvm_queue_exception(vcpu, vec);</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2288,7 +2508,7 @@ static int handle_exception(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	error_code = 0;</div><div class='del'>-	rip = vmcs_readl(GUEST_RIP);</div><div class='add'>+	rip = kvm_rip_read(vcpu);</div><div class='ctx'> 	if (intr_info &amp; INTR_INFO_DELIVER_CODE_MASK)</div><div class='ctx'> 		error_code = vmcs_read32(VM_EXIT_INTR_ERROR_CODE);</div><div class='ctx'> 	if (is_page_fault(intr_info)) {</div><div class='hunk'>@@ -2298,7 +2518,7 @@ static int handle_exception(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)</div><div class='ctx'> 		cr2 = vmcs_readl(EXIT_QUALIFICATION);</div><div class='ctx'> 		KVMTRACE_3D(PAGE_FAULT, vcpu, error_code, (u32)cr2,</div><div class='ctx'> 			    (u32)((u64)cr2 &gt;&gt; 32), handler);</div><div class='del'>-		if (vect_info &amp; VECTORING_INFO_VALID_MASK)</div><div class='add'>+		if (vcpu-&gt;arch.interrupt.pending || vcpu-&gt;arch.exception.pending)</div><div class='ctx'> 			kvm_mmu_unprotect_page_virt(vcpu, cr2);</div><div class='ctx'> 		return kvm_mmu_page_fault(vcpu, cr2, error_code);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2386,27 +2606,25 @@ static int handle_cr(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)</div><div class='ctx'> 	reg = (exit_qualification &gt;&gt; 8) &amp; 15;</div><div class='ctx'> 	switch ((exit_qualification &gt;&gt; 4) &amp; 3) {</div><div class='ctx'> 	case 0: /* mov to cr */</div><div class='del'>-		KVMTRACE_3D(CR_WRITE, vcpu, (u32)cr, (u32)vcpu-&gt;arch.regs[reg],</div><div class='del'>-			    (u32)((u64)vcpu-&gt;arch.regs[reg] &gt;&gt; 32), handler);</div><div class='add'>+		KVMTRACE_3D(CR_WRITE, vcpu, (u32)cr,</div><div class='add'>+			    (u32)kvm_register_read(vcpu, reg),</div><div class='add'>+			    (u32)((u64)kvm_register_read(vcpu, reg) &gt;&gt; 32),</div><div class='add'>+			    handler);</div><div class='ctx'> 		switch (cr) {</div><div class='ctx'> 		case 0:</div><div class='del'>-			vcpu_load_rsp_rip(vcpu);</div><div class='del'>-			kvm_set_cr0(vcpu, vcpu-&gt;arch.regs[reg]);</div><div class='add'>+			kvm_set_cr0(vcpu, kvm_register_read(vcpu, reg));</div><div class='ctx'> 			skip_emulated_instruction(vcpu);</div><div class='ctx'> 			return 1;</div><div class='ctx'> 		case 3:</div><div class='del'>-			vcpu_load_rsp_rip(vcpu);</div><div class='del'>-			kvm_set_cr3(vcpu, vcpu-&gt;arch.regs[reg]);</div><div class='add'>+			kvm_set_cr3(vcpu, kvm_register_read(vcpu, reg));</div><div class='ctx'> 			skip_emulated_instruction(vcpu);</div><div class='ctx'> 			return 1;</div><div class='ctx'> 		case 4:</div><div class='del'>-			vcpu_load_rsp_rip(vcpu);</div><div class='del'>-			kvm_set_cr4(vcpu, vcpu-&gt;arch.regs[reg]);</div><div class='add'>+			kvm_set_cr4(vcpu, kvm_register_read(vcpu, reg));</div><div class='ctx'> 			skip_emulated_instruction(vcpu);</div><div class='ctx'> 			return 1;</div><div class='ctx'> 		case 8:</div><div class='del'>-			vcpu_load_rsp_rip(vcpu);</div><div class='del'>-			kvm_set_cr8(vcpu, vcpu-&gt;arch.regs[reg]);</div><div class='add'>+			kvm_set_cr8(vcpu, kvm_register_read(vcpu, reg));</div><div class='ctx'> 			skip_emulated_instruction(vcpu);</div><div class='ctx'> 			if (irqchip_in_kernel(vcpu-&gt;kvm))</div><div class='ctx'> 				return 1;</div><div class='hunk'>@@ -2415,7 +2633,6 @@ static int handle_cr(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)</div><div class='ctx'> 		};</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 2: /* clts */</div><div class='del'>-		vcpu_load_rsp_rip(vcpu);</div><div class='ctx'> 		vmx_fpu_deactivate(vcpu);</div><div class='ctx'> 		vcpu-&gt;arch.cr0 &amp;= ~X86_CR0_TS;</div><div class='ctx'> 		vmcs_writel(CR0_READ_SHADOW, vcpu-&gt;arch.cr0);</div><div class='hunk'>@@ -2426,21 +2643,17 @@ static int handle_cr(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)</div><div class='ctx'> 	case 1: /*mov from cr*/</div><div class='ctx'> 		switch (cr) {</div><div class='ctx'> 		case 3:</div><div class='del'>-			vcpu_load_rsp_rip(vcpu);</div><div class='del'>-			vcpu-&gt;arch.regs[reg] = vcpu-&gt;arch.cr3;</div><div class='del'>-			vcpu_put_rsp_rip(vcpu);</div><div class='add'>+			kvm_register_write(vcpu, reg, vcpu-&gt;arch.cr3);</div><div class='ctx'> 			KVMTRACE_3D(CR_READ, vcpu, (u32)cr,</div><div class='del'>-				    (u32)vcpu-&gt;arch.regs[reg],</div><div class='del'>-				    (u32)((u64)vcpu-&gt;arch.regs[reg] &gt;&gt; 32),</div><div class='add'>+				    (u32)kvm_register_read(vcpu, reg),</div><div class='add'>+				    (u32)((u64)kvm_register_read(vcpu, reg) &gt;&gt; 32),</div><div class='ctx'> 				    handler);</div><div class='ctx'> 			skip_emulated_instruction(vcpu);</div><div class='ctx'> 			return 1;</div><div class='ctx'> 		case 8:</div><div class='del'>-			vcpu_load_rsp_rip(vcpu);</div><div class='del'>-			vcpu-&gt;arch.regs[reg] = kvm_get_cr8(vcpu);</div><div class='del'>-			vcpu_put_rsp_rip(vcpu);</div><div class='add'>+			kvm_register_write(vcpu, reg, kvm_get_cr8(vcpu));</div><div class='ctx'> 			KVMTRACE_2D(CR_READ, vcpu, (u32)cr,</div><div class='del'>-				    (u32)vcpu-&gt;arch.regs[reg], handler);</div><div class='add'>+				    (u32)kvm_register_read(vcpu, reg), handler);</div><div class='ctx'> 			skip_emulated_instruction(vcpu);</div><div class='ctx'> 			return 1;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2472,7 +2685,6 @@ static int handle_dr(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)</div><div class='ctx'> 	exit_qualification = vmcs_readl(EXIT_QUALIFICATION);</div><div class='ctx'> 	dr = exit_qualification &amp; 7;</div><div class='ctx'> 	reg = (exit_qualification &gt;&gt; 8) &amp; 15;</div><div class='del'>-	vcpu_load_rsp_rip(vcpu);</div><div class='ctx'> 	if (exit_qualification &amp; 16) {</div><div class='ctx'> 		/* mov from dr */</div><div class='ctx'> 		switch (dr) {</div><div class='hunk'>@@ -2485,12 +2697,11 @@ static int handle_dr(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)</div><div class='ctx'> 		default:</div><div class='ctx'> 			val = 0;</div><div class='ctx'> 		}</div><div class='del'>-		vcpu-&gt;arch.regs[reg] = val;</div><div class='add'>+		kvm_register_write(vcpu, reg, val);</div><div class='ctx'> 		KVMTRACE_2D(DR_READ, vcpu, (u32)dr, (u32)val, handler);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* mov to dr */</div><div class='ctx'> 	}</div><div class='del'>-	vcpu_put_rsp_rip(vcpu);</div><div class='ctx'> 	skip_emulated_instruction(vcpu);</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='hunk'>@@ -2583,6 +2794,15 @@ static int handle_vmcall(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int handle_invlpg(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)</div><div class='add'>+{</div><div class='add'>+	u64 exit_qualification = vmcs_read64(EXIT_QUALIFICATION);</div><div class='add'>+</div><div class='add'>+	kvm_mmu_invlpg(vcpu, exit_qualification);</div><div class='add'>+	skip_emulated_instruction(vcpu);</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int handle_wbinvd(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)</div><div class='ctx'> {</div><div class='ctx'> 	skip_emulated_instruction(vcpu);</div><div class='hunk'>@@ -2695,6 +2915,43 @@ static int handle_nmi_window(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void handle_invalid_guest_state(struct kvm_vcpu *vcpu,</div><div class='add'>+				struct kvm_run *kvm_run)</div><div class='add'>+{</div><div class='add'>+	struct vcpu_vmx *vmx = to_vmx(vcpu);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	preempt_enable();</div><div class='add'>+	local_irq_enable();</div><div class='add'>+</div><div class='add'>+	while (!guest_state_valid(vcpu)) {</div><div class='add'>+		err = emulate_instruction(vcpu, kvm_run, 0, 0, 0);</div><div class='add'>+</div><div class='add'>+		switch (err) {</div><div class='add'>+			case EMULATE_DONE:</div><div class='add'>+				break;</div><div class='add'>+			case EMULATE_DO_MMIO:</div><div class='add'>+				kvm_report_emulation_failure(vcpu, "mmio");</div><div class='add'>+				/* TODO: Handle MMIO */</div><div class='add'>+				return;</div><div class='add'>+			default:</div><div class='add'>+				kvm_report_emulation_failure(vcpu, "emulation failure");</div><div class='add'>+				return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (signal_pending(current))</div><div class='add'>+			break;</div><div class='add'>+		if (need_resched())</div><div class='add'>+			schedule();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	local_irq_disable();</div><div class='add'>+	preempt_disable();</div><div class='add'>+</div><div class='add'>+	/* Guest state should be valid now, no more emulation should be needed */</div><div class='add'>+	vmx-&gt;emulation_required = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * The exit handlers return 1 if the exit was handled fully and guest execution</div><div class='ctx'>  * may resume.  Otherwise they set the kvm_run parameter to indicate what needs</div><div class='hunk'>@@ -2714,6 +2971,7 @@ static int (*kvm_vmx_exit_handlers[])(struct kvm_vcpu *vcpu,</div><div class='ctx'> 	[EXIT_REASON_MSR_WRITE]               = handle_wrmsr,</div><div class='ctx'> 	[EXIT_REASON_PENDING_INTERRUPT]       = handle_interrupt_window,</div><div class='ctx'> 	[EXIT_REASON_HLT]                     = handle_halt,</div><div class='add'>+	[EXIT_REASON_INVLPG]		      = handle_invlpg,</div><div class='ctx'> 	[EXIT_REASON_VMCALL]                  = handle_vmcall,</div><div class='ctx'> 	[EXIT_REASON_TPR_BELOW_THRESHOLD]     = handle_tpr_below_threshold,</div><div class='ctx'> 	[EXIT_REASON_APIC_ACCESS]             = handle_apic_access,</div><div class='hunk'>@@ -2735,8 +2993,8 @@ static int kvm_handle_exit(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu)</div><div class='ctx'> 	struct vcpu_vmx *vmx = to_vmx(vcpu);</div><div class='ctx'> 	u32 vectoring_info = vmx-&gt;idt_vectoring_info;</div><div class='ctx'> </div><div class='del'>-	KVMTRACE_3D(VMEXIT, vcpu, exit_reason, (u32)vmcs_readl(GUEST_RIP),</div><div class='del'>-		    (u32)((u64)vmcs_readl(GUEST_RIP) &gt;&gt; 32), entryexit);</div><div class='add'>+	KVMTRACE_3D(VMEXIT, vcpu, exit_reason, (u32)kvm_rip_read(vcpu),</div><div class='add'>+		    (u32)((u64)kvm_rip_read(vcpu) &gt;&gt; 32), entryexit);</div><div class='ctx'> </div><div class='ctx'> 	/* Access CR3 don't cause VMExit in paging mode, so we need</div><div class='ctx'> 	 * to sync with guest real CR3. */</div><div class='hunk'>@@ -2829,88 +3087,92 @@ static void enable_intr_window(struct kvm_vcpu *vcpu)</div><div class='ctx'> 		enable_irq_window(vcpu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void vmx_intr_assist(struct kvm_vcpu *vcpu)</div><div class='add'>+static void vmx_complete_interrupts(struct vcpu_vmx *vmx)</div><div class='ctx'> {</div><div class='del'>-	struct vcpu_vmx *vmx = to_vmx(vcpu);</div><div class='del'>-	u32 idtv_info_field, intr_info_field, exit_intr_info_field;</div><div class='del'>-	int vector;</div><div class='add'>+	u32 exit_intr_info;</div><div class='add'>+	u32 idt_vectoring_info;</div><div class='add'>+	bool unblock_nmi;</div><div class='add'>+	u8 vector;</div><div class='add'>+	int type;</div><div class='add'>+	bool idtv_info_valid;</div><div class='add'>+	u32 error;</div><div class='ctx'> </div><div class='del'>-	update_tpr_threshold(vcpu);</div><div class='del'>-</div><div class='del'>-	intr_info_field = vmcs_read32(VM_ENTRY_INTR_INFO_FIELD);</div><div class='del'>-	exit_intr_info_field = vmcs_read32(VM_EXIT_INTR_INFO);</div><div class='del'>-	idtv_info_field = vmx-&gt;idt_vectoring_info;</div><div class='del'>-	if (intr_info_field &amp; INTR_INFO_VALID_MASK) {</div><div class='del'>-		if (idtv_info_field &amp; INTR_INFO_VALID_MASK) {</div><div class='del'>-			/* TODO: fault when IDT_Vectoring */</div><div class='del'>-			if (printk_ratelimit())</div><div class='del'>-				printk(KERN_ERR "Fault when IDT_Vectoring\n");</div><div class='del'>-		}</div><div class='del'>-		enable_intr_window(vcpu);</div><div class='del'>-		return;</div><div class='add'>+	exit_intr_info = vmcs_read32(VM_EXIT_INTR_INFO);</div><div class='add'>+	if (cpu_has_virtual_nmis()) {</div><div class='add'>+		unblock_nmi = (exit_intr_info &amp; INTR_INFO_UNBLOCK_NMI) != 0;</div><div class='add'>+		vector = exit_intr_info &amp; INTR_INFO_VECTOR_MASK;</div><div class='add'>+		/*</div><div class='add'>+		 * SDM 3: 25.7.1.2</div><div class='add'>+		 * Re-set bit "block by NMI" before VM entry if vmexit caused by</div><div class='add'>+		 * a guest IRET fault.</div><div class='add'>+		 */</div><div class='add'>+		if (unblock_nmi &amp;&amp; vector != DF_VECTOR)</div><div class='add'>+			vmcs_set_bits(GUEST_INTERRUPTIBILITY_INFO,</div><div class='add'>+				      GUEST_INTR_STATE_NMI);</div><div class='ctx'> 	}</div><div class='del'>-	if (unlikely(idtv_info_field &amp; INTR_INFO_VALID_MASK)) {</div><div class='del'>-		if ((idtv_info_field &amp; VECTORING_INFO_TYPE_MASK)</div><div class='del'>-		    == INTR_TYPE_EXT_INTR</div><div class='del'>-		    &amp;&amp; vcpu-&gt;arch.rmode.active) {</div><div class='del'>-			u8 vect = idtv_info_field &amp; VECTORING_INFO_VECTOR_MASK;</div><div class='del'>-</div><div class='del'>-			vmx_inject_irq(vcpu, vect);</div><div class='del'>-			enable_intr_window(vcpu);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		KVMTRACE_1D(REDELIVER_EVT, vcpu, idtv_info_field, handler);</div><div class='ctx'> </div><div class='add'>+	idt_vectoring_info = vmx-&gt;idt_vectoring_info;</div><div class='add'>+	idtv_info_valid = idt_vectoring_info &amp; VECTORING_INFO_VALID_MASK;</div><div class='add'>+	vector = idt_vectoring_info &amp; VECTORING_INFO_VECTOR_MASK;</div><div class='add'>+	type = idt_vectoring_info &amp; VECTORING_INFO_TYPE_MASK;</div><div class='add'>+	if (vmx-&gt;vcpu.arch.nmi_injected) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * SDM 3: 25.7.1.2</div><div class='ctx'> 		 * Clear bit "block by NMI" before VM entry if a NMI delivery</div><div class='ctx'> 		 * faulted.</div><div class='ctx'> 		 */</div><div class='del'>-		if ((idtv_info_field &amp; VECTORING_INFO_TYPE_MASK)</div><div class='del'>-		    == INTR_TYPE_NMI_INTR &amp;&amp; cpu_has_virtual_nmis())</div><div class='del'>-			vmcs_write32(GUEST_INTERRUPTIBILITY_INFO,</div><div class='del'>-				vmcs_read32(GUEST_INTERRUPTIBILITY_INFO) &amp;</div><div class='del'>-				~GUEST_INTR_STATE_NMI);</div><div class='del'>-</div><div class='del'>-		vmcs_write32(VM_ENTRY_INTR_INFO_FIELD, idtv_info_field</div><div class='del'>-				&amp; ~INTR_INFO_RESVD_BITS_MASK);</div><div class='del'>-		vmcs_write32(VM_ENTRY_INSTRUCTION_LEN,</div><div class='del'>-				vmcs_read32(VM_EXIT_INSTRUCTION_LEN));</div><div class='del'>-</div><div class='del'>-		if (unlikely(idtv_info_field &amp; INTR_INFO_DELIVER_CODE_MASK))</div><div class='del'>-			vmcs_write32(VM_ENTRY_EXCEPTION_ERROR_CODE,</div><div class='del'>-				vmcs_read32(IDT_VECTORING_ERROR_CODE));</div><div class='del'>-		enable_intr_window(vcpu);</div><div class='del'>-		return;</div><div class='add'>+		if (idtv_info_valid &amp;&amp; type == INTR_TYPE_NMI_INTR)</div><div class='add'>+			vmcs_clear_bits(GUEST_INTERRUPTIBILITY_INFO,</div><div class='add'>+					GUEST_INTR_STATE_NMI);</div><div class='add'>+		else</div><div class='add'>+			vmx-&gt;vcpu.arch.nmi_injected = false;</div><div class='add'>+	}</div><div class='add'>+	kvm_clear_exception_queue(&amp;vmx-&gt;vcpu);</div><div class='add'>+	if (idtv_info_valid &amp;&amp; type == INTR_TYPE_EXCEPTION) {</div><div class='add'>+		if (idt_vectoring_info &amp; VECTORING_INFO_DELIVER_CODE_MASK) {</div><div class='add'>+			error = vmcs_read32(IDT_VECTORING_ERROR_CODE);</div><div class='add'>+			kvm_queue_exception_e(&amp;vmx-&gt;vcpu, vector, error);</div><div class='add'>+		} else</div><div class='add'>+			kvm_queue_exception(&amp;vmx-&gt;vcpu, vector);</div><div class='add'>+		vmx-&gt;idt_vectoring_info = 0;</div><div class='ctx'> 	}</div><div class='add'>+	kvm_clear_interrupt_queue(&amp;vmx-&gt;vcpu);</div><div class='add'>+	if (idtv_info_valid &amp;&amp; type == INTR_TYPE_EXT_INTR) {</div><div class='add'>+		kvm_queue_interrupt(&amp;vmx-&gt;vcpu, vector);</div><div class='add'>+		vmx-&gt;idt_vectoring_info = 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void vmx_intr_assist(struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	update_tpr_threshold(vcpu);</div><div class='add'>+</div><div class='ctx'> 	if (cpu_has_virtual_nmis()) {</div><div class='del'>-		/*</div><div class='del'>-		 * SDM 3: 25.7.1.2</div><div class='del'>-		 * Re-set bit "block by NMI" before VM entry if vmexit caused by</div><div class='del'>-		 * a guest IRET fault.</div><div class='del'>-		 */</div><div class='del'>-		if ((exit_intr_info_field &amp; INTR_INFO_UNBLOCK_NMI) &amp;&amp;</div><div class='del'>-		    (exit_intr_info_field &amp; INTR_INFO_VECTOR_MASK) != 8)</div><div class='del'>-			vmcs_write32(GUEST_INTERRUPTIBILITY_INFO,</div><div class='del'>-				vmcs_read32(GUEST_INTERRUPTIBILITY_INFO) |</div><div class='del'>-				GUEST_INTR_STATE_NMI);</div><div class='del'>-		else if (vcpu-&gt;arch.nmi_pending) {</div><div class='del'>-			if (vmx_nmi_enabled(vcpu))</div><div class='del'>-				vmx_inject_nmi(vcpu);</div><div class='add'>+		if (vcpu-&gt;arch.nmi_pending &amp;&amp; !vcpu-&gt;arch.nmi_injected) {</div><div class='add'>+			if (vmx_nmi_enabled(vcpu)) {</div><div class='add'>+				vcpu-&gt;arch.nmi_pending = false;</div><div class='add'>+				vcpu-&gt;arch.nmi_injected = true;</div><div class='add'>+			} else {</div><div class='add'>+				enable_intr_window(vcpu);</div><div class='add'>+				return;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if (vcpu-&gt;arch.nmi_injected) {</div><div class='add'>+			vmx_inject_nmi(vcpu);</div><div class='ctx'> 			enable_intr_window(vcpu);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='ctx'> 	}</div><div class='del'>-	if (!kvm_cpu_has_interrupt(vcpu))</div><div class='del'>-		return;</div><div class='del'>-	if (vmx_irq_enabled(vcpu)) {</div><div class='del'>-		vector = kvm_cpu_get_interrupt(vcpu);</div><div class='del'>-		vmx_inject_irq(vcpu, vector);</div><div class='del'>-		kvm_timer_intr_post(vcpu, vector);</div><div class='del'>-	} else</div><div class='del'>-		enable_irq_window(vcpu);</div><div class='add'>+	if (!vcpu-&gt;arch.interrupt.pending &amp;&amp; kvm_cpu_has_interrupt(vcpu)) {</div><div class='add'>+		if (vmx_irq_enabled(vcpu))</div><div class='add'>+			kvm_queue_interrupt(vcpu, kvm_cpu_get_interrupt(vcpu));</div><div class='add'>+		else</div><div class='add'>+			enable_irq_window(vcpu);</div><div class='add'>+	}</div><div class='add'>+	if (vcpu-&gt;arch.interrupt.pending) {</div><div class='add'>+		vmx_inject_irq(vcpu, vcpu-&gt;arch.interrupt.nr);</div><div class='add'>+		kvm_timer_intr_post(vcpu, vcpu-&gt;arch.interrupt.nr);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -2922,9 +3184,9 @@ static void vmx_intr_assist(struct kvm_vcpu *vcpu)</div><div class='ctx'> static void fixup_rmode_irq(struct vcpu_vmx *vmx)</div><div class='ctx'> {</div><div class='ctx'> 	vmx-&gt;rmode.irq.pending = 0;</div><div class='del'>-	if (vmcs_readl(GUEST_RIP) + 1 != vmx-&gt;rmode.irq.rip)</div><div class='add'>+	if (kvm_rip_read(&amp;vmx-&gt;vcpu) + 1 != vmx-&gt;rmode.irq.rip)</div><div class='ctx'> 		return;</div><div class='del'>-	vmcs_writel(GUEST_RIP, vmx-&gt;rmode.irq.rip);</div><div class='add'>+	kvm_rip_write(&amp;vmx-&gt;vcpu, vmx-&gt;rmode.irq.rip);</div><div class='ctx'> 	if (vmx-&gt;idt_vectoring_info &amp; VECTORING_INFO_VALID_MASK) {</div><div class='ctx'> 		vmx-&gt;idt_vectoring_info &amp;= ~VECTORING_INFO_TYPE_MASK;</div><div class='ctx'> 		vmx-&gt;idt_vectoring_info |= INTR_TYPE_EXT_INTR;</div><div class='hunk'>@@ -2936,11 +3198,30 @@ static void fixup_rmode_irq(struct vcpu_vmx *vmx)</div><div class='ctx'> 		| vmx-&gt;rmode.irq.vector;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='add'>+#define R "r"</div><div class='add'>+#define Q "q"</div><div class='add'>+#else</div><div class='add'>+#define R "e"</div><div class='add'>+#define Q "l"</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static void vmx_vcpu_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)</div><div class='ctx'> {</div><div class='ctx'> 	struct vcpu_vmx *vmx = to_vmx(vcpu);</div><div class='ctx'> 	u32 intr_info;</div><div class='ctx'> </div><div class='add'>+	/* Handle invalid guest state instead of entering VMX */</div><div class='add'>+	if (vmx-&gt;emulation_required &amp;&amp; emulate_invalid_guest_state) {</div><div class='add'>+		handle_invalid_guest_state(vcpu, kvm_run);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (test_bit(VCPU_REGS_RSP, (unsigned long *)&amp;vcpu-&gt;arch.regs_dirty))</div><div class='add'>+		vmcs_writel(GUEST_RSP, vcpu-&gt;arch.regs[VCPU_REGS_RSP]);</div><div class='add'>+	if (test_bit(VCPU_REGS_RIP, (unsigned long *)&amp;vcpu-&gt;arch.regs_dirty))</div><div class='add'>+		vmcs_writel(GUEST_RIP, vcpu-&gt;arch.regs[VCPU_REGS_RIP]);</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Loading guest fpu may have cleared host cr0.ts</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -2948,26 +3229,25 @@ static void vmx_vcpu_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)</div><div class='ctx'> </div><div class='ctx'> 	asm(</div><div class='ctx'> 		/* Store host registers */</div><div class='del'>-#ifdef CONFIG_X86_64</div><div class='del'>-		"push %%rdx; push %%rbp;"</div><div class='del'>-		"push %%rcx \n\t"</div><div class='del'>-#else</div><div class='del'>-		"push %%edx; push %%ebp;"</div><div class='del'>-		"push %%ecx \n\t"</div><div class='del'>-#endif</div><div class='add'>+		"push %%"R"dx; push %%"R"bp;"</div><div class='add'>+		"push %%"R"cx \n\t"</div><div class='add'>+		"cmp %%"R"sp, %c[host_rsp](%0) \n\t"</div><div class='add'>+		"je 1f \n\t"</div><div class='add'>+		"mov %%"R"sp, %c[host_rsp](%0) \n\t"</div><div class='ctx'> 		__ex(ASM_VMX_VMWRITE_RSP_RDX) "\n\t"</div><div class='add'>+		"1: \n\t"</div><div class='ctx'> 		/* Check if vmlaunch of vmresume is needed */</div><div class='ctx'> 		"cmpl $0, %c[launched](%0) \n\t"</div><div class='ctx'> 		/* Load guest registers.  Don't clobber flags. */</div><div class='add'>+		"mov %c[cr2](%0), %%"R"ax \n\t"</div><div class='add'>+		"mov %%"R"ax, %%cr2 \n\t"</div><div class='add'>+		"mov %c[rax](%0), %%"R"ax \n\t"</div><div class='add'>+		"mov %c[rbx](%0), %%"R"bx \n\t"</div><div class='add'>+		"mov %c[rdx](%0), %%"R"dx \n\t"</div><div class='add'>+		"mov %c[rsi](%0), %%"R"si \n\t"</div><div class='add'>+		"mov %c[rdi](%0), %%"R"di \n\t"</div><div class='add'>+		"mov %c[rbp](%0), %%"R"bp \n\t"</div><div class='ctx'> #ifdef CONFIG_X86_64</div><div class='del'>-		"mov %c[cr2](%0), %%rax \n\t"</div><div class='del'>-		"mov %%rax, %%cr2 \n\t"</div><div class='del'>-		"mov %c[rax](%0), %%rax \n\t"</div><div class='del'>-		"mov %c[rbx](%0), %%rbx \n\t"</div><div class='del'>-		"mov %c[rdx](%0), %%rdx \n\t"</div><div class='del'>-		"mov %c[rsi](%0), %%rsi \n\t"</div><div class='del'>-		"mov %c[rdi](%0), %%rdi \n\t"</div><div class='del'>-		"mov %c[rbp](%0), %%rbp \n\t"</div><div class='ctx'> 		"mov %c[r8](%0),  %%r8  \n\t"</div><div class='ctx'> 		"mov %c[r9](%0),  %%r9  \n\t"</div><div class='ctx'> 		"mov %c[r10](%0), %%r10 \n\t"</div><div class='hunk'>@@ -2976,18 +3256,9 @@ static void vmx_vcpu_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)</div><div class='ctx'> 		"mov %c[r13](%0), %%r13 \n\t"</div><div class='ctx'> 		"mov %c[r14](%0), %%r14 \n\t"</div><div class='ctx'> 		"mov %c[r15](%0), %%r15 \n\t"</div><div class='del'>-		"mov %c[rcx](%0), %%rcx \n\t" /* kills %0 (rcx) */</div><div class='del'>-#else</div><div class='del'>-		"mov %c[cr2](%0), %%eax \n\t"</div><div class='del'>-		"mov %%eax,   %%cr2 \n\t"</div><div class='del'>-		"mov %c[rax](%0), %%eax \n\t"</div><div class='del'>-		"mov %c[rbx](%0), %%ebx \n\t"</div><div class='del'>-		"mov %c[rdx](%0), %%edx \n\t"</div><div class='del'>-		"mov %c[rsi](%0), %%esi \n\t"</div><div class='del'>-		"mov %c[rdi](%0), %%edi \n\t"</div><div class='del'>-		"mov %c[rbp](%0), %%ebp \n\t"</div><div class='del'>-		"mov %c[rcx](%0), %%ecx \n\t" /* kills %0 (ecx) */</div><div class='ctx'> #endif</div><div class='add'>+		"mov %c[rcx](%0), %%"R"cx \n\t" /* kills %0 (ecx) */</div><div class='add'>+</div><div class='ctx'> 		/* Enter guest mode */</div><div class='ctx'> 		"jne .Llaunched \n\t"</div><div class='ctx'> 		__ex(ASM_VMX_VMLAUNCH) "\n\t"</div><div class='hunk'>@@ -2995,15 +3266,15 @@ static void vmx_vcpu_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)</div><div class='ctx'> 		".Llaunched: " __ex(ASM_VMX_VMRESUME) "\n\t"</div><div class='ctx'> 		".Lkvm_vmx_return: "</div><div class='ctx'> 		/* Save guest registers, load host registers, keep flags */</div><div class='add'>+		"xchg %0,     (%%"R"sp) \n\t"</div><div class='add'>+		"mov %%"R"ax, %c[rax](%0) \n\t"</div><div class='add'>+		"mov %%"R"bx, %c[rbx](%0) \n\t"</div><div class='add'>+		"push"Q" (%%"R"sp); pop"Q" %c[rcx](%0) \n\t"</div><div class='add'>+		"mov %%"R"dx, %c[rdx](%0) \n\t"</div><div class='add'>+		"mov %%"R"si, %c[rsi](%0) \n\t"</div><div class='add'>+		"mov %%"R"di, %c[rdi](%0) \n\t"</div><div class='add'>+		"mov %%"R"bp, %c[rbp](%0) \n\t"</div><div class='ctx'> #ifdef CONFIG_X86_64</div><div class='del'>-		"xchg %0,     (%%rsp) \n\t"</div><div class='del'>-		"mov %%rax, %c[rax](%0) \n\t"</div><div class='del'>-		"mov %%rbx, %c[rbx](%0) \n\t"</div><div class='del'>-		"pushq (%%rsp); popq %c[rcx](%0) \n\t"</div><div class='del'>-		"mov %%rdx, %c[rdx](%0) \n\t"</div><div class='del'>-		"mov %%rsi, %c[rsi](%0) \n\t"</div><div class='del'>-		"mov %%rdi, %c[rdi](%0) \n\t"</div><div class='del'>-		"mov %%rbp, %c[rbp](%0) \n\t"</div><div class='ctx'> 		"mov %%r8,  %c[r8](%0) \n\t"</div><div class='ctx'> 		"mov %%r9,  %c[r9](%0) \n\t"</div><div class='ctx'> 		"mov %%r10, %c[r10](%0) \n\t"</div><div class='hunk'>@@ -3012,28 +3283,16 @@ static void vmx_vcpu_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)</div><div class='ctx'> 		"mov %%r13, %c[r13](%0) \n\t"</div><div class='ctx'> 		"mov %%r14, %c[r14](%0) \n\t"</div><div class='ctx'> 		"mov %%r15, %c[r15](%0) \n\t"</div><div class='del'>-		"mov %%cr2, %%rax   \n\t"</div><div class='del'>-		"mov %%rax, %c[cr2](%0) \n\t"</div><div class='del'>-</div><div class='del'>-		"pop  %%rbp; pop  %%rbp; pop  %%rdx \n\t"</div><div class='del'>-#else</div><div class='del'>-		"xchg %0, (%%esp) \n\t"</div><div class='del'>-		"mov %%eax, %c[rax](%0) \n\t"</div><div class='del'>-		"mov %%ebx, %c[rbx](%0) \n\t"</div><div class='del'>-		"pushl (%%esp); popl %c[rcx](%0) \n\t"</div><div class='del'>-		"mov %%edx, %c[rdx](%0) \n\t"</div><div class='del'>-		"mov %%esi, %c[rsi](%0) \n\t"</div><div class='del'>-		"mov %%edi, %c[rdi](%0) \n\t"</div><div class='del'>-		"mov %%ebp, %c[rbp](%0) \n\t"</div><div class='del'>-		"mov %%cr2, %%eax  \n\t"</div><div class='del'>-		"mov %%eax, %c[cr2](%0) \n\t"</div><div class='del'>-</div><div class='del'>-		"pop %%ebp; pop %%ebp; pop %%edx \n\t"</div><div class='ctx'> #endif</div><div class='add'>+		"mov %%cr2, %%"R"ax   \n\t"</div><div class='add'>+		"mov %%"R"ax, %c[cr2](%0) \n\t"</div><div class='add'>+</div><div class='add'>+		"pop  %%"R"bp; pop  %%"R"bp; pop  %%"R"dx \n\t"</div><div class='ctx'> 		"setbe %c[fail](%0) \n\t"</div><div class='ctx'> 	      : : "c"(vmx), "d"((unsigned long)HOST_RSP),</div><div class='ctx'> 		[launched]"i"(offsetof(struct vcpu_vmx, launched)),</div><div class='ctx'> 		[fail]"i"(offsetof(struct vcpu_vmx, fail)),</div><div class='add'>+		[host_rsp]"i"(offsetof(struct vcpu_vmx, host_rsp)),</div><div class='ctx'> 		[rax]"i"(offsetof(struct vcpu_vmx, vcpu.arch.regs[VCPU_REGS_RAX])),</div><div class='ctx'> 		[rbx]"i"(offsetof(struct vcpu_vmx, vcpu.arch.regs[VCPU_REGS_RBX])),</div><div class='ctx'> 		[rcx]"i"(offsetof(struct vcpu_vmx, vcpu.arch.regs[VCPU_REGS_RCX])),</div><div class='hunk'>@@ -3053,14 +3312,15 @@ static void vmx_vcpu_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)</div><div class='ctx'> #endif</div><div class='ctx'> 		[cr2]"i"(offsetof(struct vcpu_vmx, vcpu.arch.cr2))</div><div class='ctx'> 	      : "cc", "memory"</div><div class='add'>+		, R"bx", R"di", R"si"</div><div class='ctx'> #ifdef CONFIG_X86_64</div><div class='del'>-		, "rbx", "rdi", "rsi"</div><div class='ctx'> 		, "r8", "r9", "r10", "r11", "r12", "r13", "r14", "r15"</div><div class='del'>-#else</div><div class='del'>-		, "ebx", "edi", "rsi"</div><div class='ctx'> #endif</div><div class='ctx'> 	      );</div><div class='ctx'> </div><div class='add'>+	vcpu-&gt;arch.regs_avail = ~((1 &lt;&lt; VCPU_REGS_RIP) | (1 &lt;&lt; VCPU_REGS_RSP));</div><div class='add'>+	vcpu-&gt;arch.regs_dirty = 0;</div><div class='add'>+</div><div class='ctx'> 	vmx-&gt;idt_vectoring_info = vmcs_read32(IDT_VECTORING_INFO_FIELD);</div><div class='ctx'> 	if (vmx-&gt;rmode.irq.pending)</div><div class='ctx'> 		fixup_rmode_irq(vmx);</div><div class='hunk'>@@ -3080,8 +3340,13 @@ static void vmx_vcpu_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)</div><div class='ctx'> 		KVMTRACE_0D(NMI, vcpu, handler);</div><div class='ctx'> 		asm("int $2");</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	vmx_complete_interrupts(vmx);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#undef R</div><div class='add'>+#undef Q</div><div class='add'>+</div><div class='ctx'> static void vmx_free_vmcs(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='ctx'> 	struct vcpu_vmx *vmx = to_vmx(vcpu);</div><div class='hunk'>@@ -3224,8 +3489,7 @@ static struct kvm_x86_ops vmx_x86_ops = {</div><div class='ctx'> 	.set_idt = vmx_set_idt,</div><div class='ctx'> 	.get_gdt = vmx_get_gdt,</div><div class='ctx'> 	.set_gdt = vmx_set_gdt,</div><div class='del'>-	.cache_regs = vcpu_load_rsp_rip,</div><div class='del'>-	.decache_regs = vcpu_put_rsp_rip,</div><div class='add'>+	.cache_reg = vmx_cache_reg,</div><div class='ctx'> 	.get_rflags = vmx_get_rflags,</div><div class='ctx'> 	.set_rflags = vmx_set_rflags,</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kvm/vmx.h b/arch/x86/kvm/vmx.h<br/>index 23e8373507ad..3e010d21fdd7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kvm/vmx.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kvm/vmx.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kvm/vmx.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kvm/vmx.h</a></div><div class='hunk'>@@ -331,24 +331,6 @@ enum vmcs_field {</div><div class='ctx'> </div><div class='ctx'> #define AR_RESERVD_MASK 0xfffe0f00</div><div class='ctx'> </div><div class='del'>-#define MSR_IA32_VMX_BASIC                      0x480</div><div class='del'>-#define MSR_IA32_VMX_PINBASED_CTLS              0x481</div><div class='del'>-#define MSR_IA32_VMX_PROCBASED_CTLS             0x482</div><div class='del'>-#define MSR_IA32_VMX_EXIT_CTLS                  0x483</div><div class='del'>-#define MSR_IA32_VMX_ENTRY_CTLS                 0x484</div><div class='del'>-#define MSR_IA32_VMX_MISC                       0x485</div><div class='del'>-#define MSR_IA32_VMX_CR0_FIXED0                 0x486</div><div class='del'>-#define MSR_IA32_VMX_CR0_FIXED1                 0x487</div><div class='del'>-#define MSR_IA32_VMX_CR4_FIXED0                 0x488</div><div class='del'>-#define MSR_IA32_VMX_CR4_FIXED1                 0x489</div><div class='del'>-#define MSR_IA32_VMX_VMCS_ENUM                  0x48a</div><div class='del'>-#define MSR_IA32_VMX_PROCBASED_CTLS2            0x48b</div><div class='del'>-#define MSR_IA32_VMX_EPT_VPID_CAP               0x48c</div><div class='del'>-</div><div class='del'>-#define MSR_IA32_FEATURE_CONTROL                0x3a</div><div class='del'>-#define MSR_IA32_FEATURE_CONTROL_LOCKED         0x1</div><div class='del'>-#define MSR_IA32_FEATURE_CONTROL_VMXON_ENABLED  0x4</div><div class='del'>-</div><div class='ctx'> #define APIC_ACCESS_PAGE_PRIVATE_MEMSLOT	9</div><div class='ctx'> #define IDENTITY_PAGETABLE_PRIVATE_MEMSLOT	10</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c<br/>index 0d682fc6aeb3..4f0677d1eae8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kvm/x86.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kvm/x86.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kvm/x86.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kvm/x86.c</a></div><div class='hunk'>@@ -4,10 +4,14 @@</div><div class='ctx'>  * derived from drivers/kvm/kvm_main.c</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2006 Qumranet, Inc.</div><div class='add'>+ * Copyright (C) 2008 Qumranet, Inc.</div><div class='add'>+ * Copyright IBM Corporation, 2008</div><div class='ctx'>  *</div><div class='ctx'>  * Authors:</div><div class='ctx'>  *   Avi Kivity   &lt;avi@qumranet.com&gt;</div><div class='ctx'>  *   Yaniv Kamay  &lt;yaniv@qumranet.com&gt;</div><div class='add'>+ *   Amit Shah    &lt;amit.shah@qumranet.com&gt;</div><div class='add'>+ *   Ben-Ami Yassour &lt;benami@il.ibm.com&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * This work is licensed under the terms of the GNU GPL, version 2.  See</div><div class='ctx'>  * the COPYING file in the top-level directory.</div><div class='hunk'>@@ -19,14 +23,18 @@</div><div class='ctx'> #include "mmu.h"</div><div class='ctx'> #include "i8254.h"</div><div class='ctx'> #include "tss.h"</div><div class='add'>+#include "kvm_cache_regs.h"</div><div class='add'>+#include "x86.h"</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/clocksource.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/kvm.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/mman.h&gt;</div><div class='ctx'> #include &lt;linux/highmem.h&gt;</div><div class='add'>+#include &lt;linux/intel-iommu.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/msr.h&gt;</div><div class='hunk'>@@ -61,6 +69,7 @@ static int kvm_dev_ioctl_get_supported_cpuid(struct kvm_cpuid2 *cpuid,</div><div class='ctx'> 				    struct kvm_cpuid_entry2 __user *entries);</div><div class='ctx'> </div><div class='ctx'> struct kvm_x86_ops *kvm_x86_ops;</div><div class='add'>+EXPORT_SYMBOL_GPL(kvm_x86_ops);</div><div class='ctx'> </div><div class='ctx'> struct kvm_stats_debugfs_item debugfs_entries[] = {</div><div class='ctx'> 	{ "pf_fixed", VCPU_STAT(pf_fixed) },</div><div class='hunk'>@@ -83,6 +92,7 @@ struct kvm_stats_debugfs_item debugfs_entries[] = {</div><div class='ctx'> 	{ "fpu_reload", VCPU_STAT(fpu_reload) },</div><div class='ctx'> 	{ "insn_emulation", VCPU_STAT(insn_emulation) },</div><div class='ctx'> 	{ "insn_emulation_fail", VCPU_STAT(insn_emulation_fail) },</div><div class='add'>+	{ "irq_injections", VCPU_STAT(irq_injections) },</div><div class='ctx'> 	{ "mmu_shadow_zapped", VM_STAT(mmu_shadow_zapped) },</div><div class='ctx'> 	{ "mmu_pte_write", VM_STAT(mmu_pte_write) },</div><div class='ctx'> 	{ "mmu_pte_updated", VM_STAT(mmu_pte_updated) },</div><div class='hunk'>@@ -90,12 +100,12 @@ struct kvm_stats_debugfs_item debugfs_entries[] = {</div><div class='ctx'> 	{ "mmu_flooded", VM_STAT(mmu_flooded) },</div><div class='ctx'> 	{ "mmu_recycled", VM_STAT(mmu_recycled) },</div><div class='ctx'> 	{ "mmu_cache_miss", VM_STAT(mmu_cache_miss) },</div><div class='add'>+	{ "mmu_unsync", VM_STAT(mmu_unsync) },</div><div class='ctx'> 	{ "remote_tlb_flush", VM_STAT(remote_tlb_flush) },</div><div class='ctx'> 	{ "largepages", VM_STAT(lpages) },</div><div class='ctx'> 	{ NULL }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> unsigned long segment_base(u16 selector)</div><div class='ctx'> {</div><div class='ctx'> 	struct descriptor_table gdt;</div><div class='hunk'>@@ -352,6 +362,7 @@ EXPORT_SYMBOL_GPL(kvm_set_cr4);</div><div class='ctx'> void kvm_set_cr3(struct kvm_vcpu *vcpu, unsigned long cr3)</div><div class='ctx'> {</div><div class='ctx'> 	if (cr3 == vcpu-&gt;arch.cr3 &amp;&amp; !pdptrs_changed(vcpu)) {</div><div class='add'>+		kvm_mmu_sync_roots(vcpu);</div><div class='ctx'> 		kvm_mmu_flush_tlb(vcpu);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -564,7 +575,7 @@ static void kvm_set_time_scale(uint32_t tsc_khz, struct pvclock_vcpu_time_info *</div><div class='ctx'> 	hv_clock-&gt;tsc_to_system_mul = div_frac(nsecs, tps32);</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("%s: tsc_khz %u, tsc_shift %d, tsc_mul %u\n",</div><div class='del'>-		 __FUNCTION__, tsc_khz, hv_clock-&gt;tsc_shift,</div><div class='add'>+		 __func__, tsc_khz, hv_clock-&gt;tsc_shift,</div><div class='ctx'> 		 hv_clock-&gt;tsc_to_system_mul);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -662,6 +673,18 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, u32 msr, u64 data)</div><div class='ctx'> 		pr_unimpl(vcpu, "%s: MSR_IA32_MCG_CTL 0x%llx, nop\n",</div><div class='ctx'> 			__func__, data);</div><div class='ctx'> 		break;</div><div class='add'>+	case MSR_IA32_DEBUGCTLMSR:</div><div class='add'>+		if (!data) {</div><div class='add'>+			/* We support the non-activated case already */</div><div class='add'>+			break;</div><div class='add'>+		} else if (data &amp; ~(DEBUGCTLMSR_LBR | DEBUGCTLMSR_BTF)) {</div><div class='add'>+			/* Values other than LBR and BTF are vendor-specific,</div><div class='add'>+			   thus reserved and should throw a #GP */</div><div class='add'>+			return 1;</div><div class='add'>+		}</div><div class='add'>+		pr_unimpl(vcpu, "%s: MSR_IA32_DEBUGCTLMSR 0x%llx, nop\n",</div><div class='add'>+			__func__, data);</div><div class='add'>+		break;</div><div class='ctx'> 	case MSR_IA32_UCODE_REV:</div><div class='ctx'> 	case MSR_IA32_UCODE_WRITE:</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -692,10 +715,8 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, u32 msr, u64 data)</div><div class='ctx'> 		/* ...but clean it before doing the actual write */</div><div class='ctx'> 		vcpu-&gt;arch.time_offset = data &amp; ~(PAGE_MASK | 1);</div><div class='ctx'> </div><div class='del'>-		down_read(&amp;current-&gt;mm-&gt;mmap_sem);</div><div class='ctx'> 		vcpu-&gt;arch.time_page =</div><div class='ctx'> 				gfn_to_page(vcpu-&gt;kvm, data &gt;&gt; PAGE_SHIFT);</div><div class='del'>-		up_read(&amp;current-&gt;mm-&gt;mmap_sem);</div><div class='ctx'> </div><div class='ctx'> 		if (is_error_page(vcpu-&gt;arch.time_page)) {</div><div class='ctx'> 			kvm_release_page_clean(vcpu-&gt;arch.time_page);</div><div class='hunk'>@@ -752,8 +773,14 @@ int kvm_get_msr_common(struct kvm_vcpu *vcpu, u32 msr, u64 *pdata)</div><div class='ctx'> 	case MSR_IA32_MC0_MISC+8:</div><div class='ctx'> 	case MSR_IA32_MC0_MISC+12:</div><div class='ctx'> 	case MSR_IA32_MC0_MISC+16:</div><div class='add'>+	case MSR_IA32_MC0_MISC+20:</div><div class='ctx'> 	case MSR_IA32_UCODE_REV:</div><div class='ctx'> 	case MSR_IA32_EBL_CR_POWERON:</div><div class='add'>+	case MSR_IA32_DEBUGCTLMSR:</div><div class='add'>+	case MSR_IA32_LASTBRANCHFROMIP:</div><div class='add'>+	case MSR_IA32_LASTBRANCHTOIP:</div><div class='add'>+	case MSR_IA32_LASTINTFROMIP:</div><div class='add'>+	case MSR_IA32_LASTINTTOIP:</div><div class='ctx'> 		data = 0;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case MSR_MTRRcap:</div><div class='hunk'>@@ -901,6 +928,9 @@ int kvm_dev_ioctl_check_extension(long ext)</div><div class='ctx'> 	case KVM_CAP_PV_MMU:</div><div class='ctx'> 		r = !tdp_enabled;</div><div class='ctx'> 		break;</div><div class='add'>+	case KVM_CAP_IOMMU:</div><div class='add'>+		r = intel_iommu_found();</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		r = 0;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1303,28 +1333,33 @@ long kvm_arch_vcpu_ioctl(struct file *filp,</div><div class='ctx'> 	struct kvm_vcpu *vcpu = filp-&gt;private_data;</div><div class='ctx'> 	void __user *argp = (void __user *)arg;</div><div class='ctx'> 	int r;</div><div class='add'>+	struct kvm_lapic_state *lapic = NULL;</div><div class='ctx'> </div><div class='ctx'> 	switch (ioctl) {</div><div class='ctx'> 	case KVM_GET_LAPIC: {</div><div class='del'>-		struct kvm_lapic_state lapic;</div><div class='add'>+		lapic = kzalloc(sizeof(struct kvm_lapic_state), GFP_KERNEL);</div><div class='ctx'> </div><div class='del'>-		memset(&amp;lapic, 0, sizeof lapic);</div><div class='del'>-		r = kvm_vcpu_ioctl_get_lapic(vcpu, &amp;lapic);</div><div class='add'>+		r = -ENOMEM;</div><div class='add'>+		if (!lapic)</div><div class='add'>+			goto out;</div><div class='add'>+		r = kvm_vcpu_ioctl_get_lapic(vcpu, lapic);</div><div class='ctx'> 		if (r)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		r = -EFAULT;</div><div class='del'>-		if (copy_to_user(argp, &amp;lapic, sizeof lapic))</div><div class='add'>+		if (copy_to_user(argp, lapic, sizeof(struct kvm_lapic_state)))</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		r = 0;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	case KVM_SET_LAPIC: {</div><div class='del'>-		struct kvm_lapic_state lapic;</div><div class='del'>-</div><div class='add'>+		lapic = kmalloc(sizeof(struct kvm_lapic_state), GFP_KERNEL);</div><div class='add'>+		r = -ENOMEM;</div><div class='add'>+		if (!lapic)</div><div class='add'>+			goto out;</div><div class='ctx'> 		r = -EFAULT;</div><div class='del'>-		if (copy_from_user(&amp;lapic, argp, sizeof lapic))</div><div class='add'>+		if (copy_from_user(lapic, argp, sizeof(struct kvm_lapic_state)))</div><div class='ctx'> 			goto out;</div><div class='del'>-		r = kvm_vcpu_ioctl_set_lapic(vcpu, &amp;lapic);;</div><div class='add'>+		r = kvm_vcpu_ioctl_set_lapic(vcpu, lapic);</div><div class='ctx'> 		if (r)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		r = 0;</div><div class='hunk'>@@ -1422,6 +1457,8 @@ long kvm_arch_vcpu_ioctl(struct file *filp,</div><div class='ctx'> 		r = -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='add'>+	if (lapic)</div><div class='add'>+		kfree(lapic);</div><div class='ctx'> 	return r;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1630,6 +1667,15 @@ long kvm_arch_vm_ioctl(struct file *filp,</div><div class='ctx'> 	struct kvm *kvm = filp-&gt;private_data;</div><div class='ctx'> 	void __user *argp = (void __user *)arg;</div><div class='ctx'> 	int r = -EINVAL;</div><div class='add'>+	/*</div><div class='add'>+	 * This union makes it completely explicit to gcc-3.x</div><div class='add'>+	 * that these two variables' stack usage should be</div><div class='add'>+	 * combined, not added together.</div><div class='add'>+	 */</div><div class='add'>+	union {</div><div class='add'>+		struct kvm_pit_state ps;</div><div class='add'>+		struct kvm_memory_alias alias;</div><div class='add'>+	} u;</div><div class='ctx'> </div><div class='ctx'> 	switch (ioctl) {</div><div class='ctx'> 	case KVM_SET_TSS_ADDR:</div><div class='hunk'>@@ -1661,17 +1707,14 @@ long kvm_arch_vm_ioctl(struct file *filp,</div><div class='ctx'> 	case KVM_GET_NR_MMU_PAGES:</div><div class='ctx'> 		r = kvm_vm_ioctl_get_nr_mmu_pages(kvm);</div><div class='ctx'> 		break;</div><div class='del'>-	case KVM_SET_MEMORY_ALIAS: {</div><div class='del'>-		struct kvm_memory_alias alias;</div><div class='del'>-</div><div class='add'>+	case KVM_SET_MEMORY_ALIAS:</div><div class='ctx'> 		r = -EFAULT;</div><div class='del'>-		if (copy_from_user(&amp;alias, argp, sizeof alias))</div><div class='add'>+		if (copy_from_user(&amp;u.alias, argp, sizeof(struct kvm_memory_alias)))</div><div class='ctx'> 			goto out;</div><div class='del'>-		r = kvm_vm_ioctl_set_memory_alias(kvm, &amp;alias);</div><div class='add'>+		r = kvm_vm_ioctl_set_memory_alias(kvm, &amp;u.alias);</div><div class='ctx'> 		if (r)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		break;</div><div class='del'>-	}</div><div class='ctx'> 	case KVM_CREATE_IRQCHIP:</div><div class='ctx'> 		r = -ENOMEM;</div><div class='ctx'> 		kvm-&gt;arch.vpic = kvm_create_pic(kvm);</div><div class='hunk'>@@ -1699,13 +1742,7 @@ long kvm_arch_vm_ioctl(struct file *filp,</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		if (irqchip_in_kernel(kvm)) {</div><div class='ctx'> 			mutex_lock(&amp;kvm-&gt;lock);</div><div class='del'>-			if (irq_event.irq &lt; 16)</div><div class='del'>-				kvm_pic_set_irq(pic_irqchip(kvm),</div><div class='del'>-					irq_event.irq,</div><div class='del'>-					irq_event.level);</div><div class='del'>-			kvm_ioapic_set_irq(kvm-&gt;arch.vioapic,</div><div class='del'>-					irq_event.irq,</div><div class='del'>-					irq_event.level);</div><div class='add'>+			kvm_set_irq(kvm, irq_event.irq, irq_event.level);</div><div class='ctx'> 			mutex_unlock(&amp;kvm-&gt;lock);</div><div class='ctx'> 			r = 0;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1713,65 +1750,77 @@ long kvm_arch_vm_ioctl(struct file *filp,</div><div class='ctx'> 	}</div><div class='ctx'> 	case KVM_GET_IRQCHIP: {</div><div class='ctx'> 		/* 0: PIC master, 1: PIC slave, 2: IOAPIC */</div><div class='del'>-		struct kvm_irqchip chip;</div><div class='add'>+		struct kvm_irqchip *chip = kmalloc(sizeof(*chip), GFP_KERNEL);</div><div class='ctx'> </div><div class='del'>-		r = -EFAULT;</div><div class='del'>-		if (copy_from_user(&amp;chip, argp, sizeof chip))</div><div class='add'>+		r = -ENOMEM;</div><div class='add'>+		if (!chip)</div><div class='ctx'> 			goto out;</div><div class='add'>+		r = -EFAULT;</div><div class='add'>+		if (copy_from_user(chip, argp, sizeof *chip))</div><div class='add'>+			goto get_irqchip_out;</div><div class='ctx'> 		r = -ENXIO;</div><div class='ctx'> 		if (!irqchip_in_kernel(kvm))</div><div class='del'>-			goto out;</div><div class='del'>-		r = kvm_vm_ioctl_get_irqchip(kvm, &amp;chip);</div><div class='add'>+			goto get_irqchip_out;</div><div class='add'>+		r = kvm_vm_ioctl_get_irqchip(kvm, chip);</div><div class='ctx'> 		if (r)</div><div class='del'>-			goto out;</div><div class='add'>+			goto get_irqchip_out;</div><div class='ctx'> 		r = -EFAULT;</div><div class='del'>-		if (copy_to_user(argp, &amp;chip, sizeof chip))</div><div class='del'>-			goto out;</div><div class='add'>+		if (copy_to_user(argp, chip, sizeof *chip))</div><div class='add'>+			goto get_irqchip_out;</div><div class='ctx'> 		r = 0;</div><div class='add'>+	get_irqchip_out:</div><div class='add'>+		kfree(chip);</div><div class='add'>+		if (r)</div><div class='add'>+			goto out;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	case KVM_SET_IRQCHIP: {</div><div class='ctx'> 		/* 0: PIC master, 1: PIC slave, 2: IOAPIC */</div><div class='del'>-		struct kvm_irqchip chip;</div><div class='add'>+		struct kvm_irqchip *chip = kmalloc(sizeof(*chip), GFP_KERNEL);</div><div class='ctx'> </div><div class='del'>-		r = -EFAULT;</div><div class='del'>-		if (copy_from_user(&amp;chip, argp, sizeof chip))</div><div class='add'>+		r = -ENOMEM;</div><div class='add'>+		if (!chip)</div><div class='ctx'> 			goto out;</div><div class='add'>+		r = -EFAULT;</div><div class='add'>+		if (copy_from_user(chip, argp, sizeof *chip))</div><div class='add'>+			goto set_irqchip_out;</div><div class='ctx'> 		r = -ENXIO;</div><div class='ctx'> 		if (!irqchip_in_kernel(kvm))</div><div class='del'>-			goto out;</div><div class='del'>-		r = kvm_vm_ioctl_set_irqchip(kvm, &amp;chip);</div><div class='add'>+			goto set_irqchip_out;</div><div class='add'>+		r = kvm_vm_ioctl_set_irqchip(kvm, chip);</div><div class='ctx'> 		if (r)</div><div class='del'>-			goto out;</div><div class='add'>+			goto set_irqchip_out;</div><div class='ctx'> 		r = 0;</div><div class='add'>+	set_irqchip_out:</div><div class='add'>+		kfree(chip);</div><div class='add'>+		if (r)</div><div class='add'>+			goto out;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	case KVM_GET_PIT: {</div><div class='del'>-		struct kvm_pit_state ps;</div><div class='ctx'> 		r = -EFAULT;</div><div class='del'>-		if (copy_from_user(&amp;ps, argp, sizeof ps))</div><div class='add'>+		if (copy_from_user(&amp;u.ps, argp, sizeof(struct kvm_pit_state)))</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		r = -ENXIO;</div><div class='ctx'> 		if (!kvm-&gt;arch.vpit)</div><div class='ctx'> 			goto out;</div><div class='del'>-		r = kvm_vm_ioctl_get_pit(kvm, &amp;ps);</div><div class='add'>+		r = kvm_vm_ioctl_get_pit(kvm, &amp;u.ps);</div><div class='ctx'> 		if (r)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		r = -EFAULT;</div><div class='del'>-		if (copy_to_user(argp, &amp;ps, sizeof ps))</div><div class='add'>+		if (copy_to_user(argp, &amp;u.ps, sizeof(struct kvm_pit_state)))</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		r = 0;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	case KVM_SET_PIT: {</div><div class='del'>-		struct kvm_pit_state ps;</div><div class='ctx'> 		r = -EFAULT;</div><div class='del'>-		if (copy_from_user(&amp;ps, argp, sizeof ps))</div><div class='add'>+		if (copy_from_user(&amp;u.ps, argp, sizeof u.ps))</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		r = -ENXIO;</div><div class='ctx'> 		if (!kvm-&gt;arch.vpit)</div><div class='ctx'> 			goto out;</div><div class='del'>-		r = kvm_vm_ioctl_set_pit(kvm, &amp;ps);</div><div class='add'>+		r = kvm_vm_ioctl_set_pit(kvm, &amp;u.ps);</div><div class='ctx'> 		if (r)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		r = 0;</div><div class='hunk'>@@ -2018,9 +2067,7 @@ static int emulator_cmpxchg_emulated(unsigned long addr,</div><div class='ctx'> </div><div class='ctx'> 		val = *(u64 *)new;</div><div class='ctx'> </div><div class='del'>-		down_read(&amp;current-&gt;mm-&gt;mmap_sem);</div><div class='ctx'> 		page = gfn_to_page(vcpu-&gt;kvm, gpa &gt;&gt; PAGE_SHIFT);</div><div class='del'>-		up_read(&amp;current-&gt;mm-&gt;mmap_sem);</div><div class='ctx'> </div><div class='ctx'> 		kaddr = kmap_atomic(page, KM_USER0);</div><div class='ctx'> 		set_64bit((u64 *)(kaddr + offset_in_page(gpa)), val);</div><div class='hunk'>@@ -2040,6 +2087,7 @@ static unsigned long get_segment_base(struct kvm_vcpu *vcpu, int seg)</div><div class='ctx'> </div><div class='ctx'> int emulate_invlpg(struct kvm_vcpu *vcpu, gva_t address)</div><div class='ctx'> {</div><div class='add'>+	kvm_mmu_invlpg(vcpu, address);</div><div class='ctx'> 	return X86EMUL_CONTINUE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2080,7 +2128,7 @@ int emulator_set_dr(struct x86_emulate_ctxt *ctxt, int dr, unsigned long value)</div><div class='ctx'> void kvm_report_emulation_failure(struct kvm_vcpu *vcpu, const char *context)</div><div class='ctx'> {</div><div class='ctx'> 	u8 opcodes[4];</div><div class='del'>-	unsigned long rip = vcpu-&gt;arch.rip;</div><div class='add'>+	unsigned long rip = kvm_rip_read(vcpu);</div><div class='ctx'> 	unsigned long rip_linear;</div><div class='ctx'> </div><div class='ctx'> 	if (!printk_ratelimit())</div><div class='hunk'>@@ -2102,6 +2150,14 @@ static struct x86_emulate_ops emulate_ops = {</div><div class='ctx'> 	.cmpxchg_emulated    = emulator_cmpxchg_emulated,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static void cache_all_regs(struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	kvm_register_read(vcpu, VCPU_REGS_RAX);</div><div class='add'>+	kvm_register_read(vcpu, VCPU_REGS_RSP);</div><div class='add'>+	kvm_register_read(vcpu, VCPU_REGS_RIP);</div><div class='add'>+	vcpu-&gt;arch.regs_dirty = ~0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int emulate_instruction(struct kvm_vcpu *vcpu,</div><div class='ctx'> 			struct kvm_run *run,</div><div class='ctx'> 			unsigned long cr2,</div><div class='hunk'>@@ -2111,8 +2167,15 @@ int emulate_instruction(struct kvm_vcpu *vcpu,</div><div class='ctx'> 	int r;</div><div class='ctx'> 	struct decode_cache *c;</div><div class='ctx'> </div><div class='add'>+	kvm_clear_exception_queue(vcpu);</div><div class='ctx'> 	vcpu-&gt;arch.mmio_fault_cr2 = cr2;</div><div class='del'>-	kvm_x86_ops-&gt;cache_regs(vcpu);</div><div class='add'>+	/*</div><div class='add'>+	 * TODO: fix x86_emulate.c to use guest_read/write_register</div><div class='add'>+	 * instead of direct -&gt;regs accesses, can save hundred cycles</div><div class='add'>+	 * on Intel for instructions that don't read/change RSP, for</div><div class='add'>+	 * for example.</div><div class='add'>+	 */</div><div class='add'>+	cache_all_regs(vcpu);</div><div class='ctx'> </div><div class='ctx'> 	vcpu-&gt;mmio_is_write = 0;</div><div class='ctx'> 	vcpu-&gt;arch.pio.string = 0;</div><div class='hunk'>@@ -2172,7 +2235,6 @@ int emulate_instruction(struct kvm_vcpu *vcpu,</div><div class='ctx'> 		return EMULATE_DO_MMIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	kvm_x86_ops-&gt;decache_regs(vcpu);</div><div class='ctx'> 	kvm_x86_ops-&gt;set_rflags(vcpu, vcpu-&gt;arch.emulate_ctxt.eflags);</div><div class='ctx'> </div><div class='ctx'> 	if (vcpu-&gt;mmio_is_write) {</div><div class='hunk'>@@ -2225,20 +2287,19 @@ int complete_pio(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	struct kvm_pio_request *io = &amp;vcpu-&gt;arch.pio;</div><div class='ctx'> 	long delta;</div><div class='ctx'> 	int r;</div><div class='del'>-</div><div class='del'>-	kvm_x86_ops-&gt;cache_regs(vcpu);</div><div class='add'>+	unsigned long val;</div><div class='ctx'> </div><div class='ctx'> 	if (!io-&gt;string) {</div><div class='del'>-		if (io-&gt;in)</div><div class='del'>-			memcpy(&amp;vcpu-&gt;arch.regs[VCPU_REGS_RAX], vcpu-&gt;arch.pio_data,</div><div class='del'>-			       io-&gt;size);</div><div class='add'>+		if (io-&gt;in) {</div><div class='add'>+			val = kvm_register_read(vcpu, VCPU_REGS_RAX);</div><div class='add'>+			memcpy(&amp;val, vcpu-&gt;arch.pio_data, io-&gt;size);</div><div class='add'>+			kvm_register_write(vcpu, VCPU_REGS_RAX, val);</div><div class='add'>+		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (io-&gt;in) {</div><div class='ctx'> 			r = pio_copy_data(vcpu);</div><div class='del'>-			if (r) {</div><div class='del'>-				kvm_x86_ops-&gt;cache_regs(vcpu);</div><div class='add'>+			if (r)</div><div class='ctx'> 				return r;</div><div class='del'>-			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		delta = 1;</div><div class='hunk'>@@ -2248,19 +2309,24 @@ int complete_pio(struct kvm_vcpu *vcpu)</div><div class='ctx'> 			 * The size of the register should really depend on</div><div class='ctx'> 			 * current address size.</div><div class='ctx'> 			 */</div><div class='del'>-			vcpu-&gt;arch.regs[VCPU_REGS_RCX] -= delta;</div><div class='add'>+			val = kvm_register_read(vcpu, VCPU_REGS_RCX);</div><div class='add'>+			val -= delta;</div><div class='add'>+			kvm_register_write(vcpu, VCPU_REGS_RCX, val);</div><div class='ctx'> 		}</div><div class='ctx'> 		if (io-&gt;down)</div><div class='ctx'> 			delta = -delta;</div><div class='ctx'> 		delta *= io-&gt;size;</div><div class='del'>-		if (io-&gt;in)</div><div class='del'>-			vcpu-&gt;arch.regs[VCPU_REGS_RDI] += delta;</div><div class='del'>-		else</div><div class='del'>-			vcpu-&gt;arch.regs[VCPU_REGS_RSI] += delta;</div><div class='add'>+		if (io-&gt;in) {</div><div class='add'>+			val = kvm_register_read(vcpu, VCPU_REGS_RDI);</div><div class='add'>+			val += delta;</div><div class='add'>+			kvm_register_write(vcpu, VCPU_REGS_RDI, val);</div><div class='add'>+		} else {</div><div class='add'>+			val = kvm_register_read(vcpu, VCPU_REGS_RSI);</div><div class='add'>+			val += delta;</div><div class='add'>+			kvm_register_write(vcpu, VCPU_REGS_RSI, val);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	kvm_x86_ops-&gt;decache_regs(vcpu);</div><div class='del'>-</div><div class='ctx'> 	io-&gt;count -= io-&gt;cur_count;</div><div class='ctx'> 	io-&gt;cur_count = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -2313,6 +2379,7 @@ int kvm_emulate_pio(struct kvm_vcpu *vcpu, struct kvm_run *run, int in,</div><div class='ctx'> 		  int size, unsigned port)</div><div class='ctx'> {</div><div class='ctx'> 	struct kvm_io_device *pio_dev;</div><div class='add'>+	unsigned long val;</div><div class='ctx'> </div><div class='ctx'> 	vcpu-&gt;run-&gt;exit_reason = KVM_EXIT_IO;</div><div class='ctx'> 	vcpu-&gt;run-&gt;io.direction = in ? KVM_EXIT_IO_IN : KVM_EXIT_IO_OUT;</div><div class='hunk'>@@ -2333,8 +2400,8 @@ int kvm_emulate_pio(struct kvm_vcpu *vcpu, struct kvm_run *run, int in,</div><div class='ctx'> 		KVMTRACE_2D(IO_WRITE, vcpu, vcpu-&gt;run-&gt;io.port, (u32)size,</div><div class='ctx'> 			    handler);</div><div class='ctx'> </div><div class='del'>-	kvm_x86_ops-&gt;cache_regs(vcpu);</div><div class='del'>-	memcpy(vcpu-&gt;arch.pio_data, &amp;vcpu-&gt;arch.regs[VCPU_REGS_RAX], 4);</div><div class='add'>+	val = kvm_register_read(vcpu, VCPU_REGS_RAX);</div><div class='add'>+	memcpy(vcpu-&gt;arch.pio_data, &amp;val, 4);</div><div class='ctx'> </div><div class='ctx'> 	kvm_x86_ops-&gt;skip_emulated_instruction(vcpu);</div><div class='ctx'> </div><div class='hunk'>@@ -2492,11 +2559,6 @@ int kvm_emulate_halt(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	KVMTRACE_0D(HLT, vcpu, handler);</div><div class='ctx'> 	if (irqchip_in_kernel(vcpu-&gt;kvm)) {</div><div class='ctx'> 		vcpu-&gt;arch.mp_state = KVM_MP_STATE_HALTED;</div><div class='del'>-		up_read(&amp;vcpu-&gt;kvm-&gt;slots_lock);</div><div class='del'>-		kvm_vcpu_block(vcpu);</div><div class='del'>-		down_read(&amp;vcpu-&gt;kvm-&gt;slots_lock);</div><div class='del'>-		if (vcpu-&gt;arch.mp_state != KVM_MP_STATE_RUNNABLE)</div><div class='del'>-			return -EINTR;</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		vcpu-&gt;run-&gt;exit_reason = KVM_EXIT_HLT;</div><div class='hunk'>@@ -2519,13 +2581,11 @@ int kvm_emulate_hypercall(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	unsigned long nr, a0, a1, a2, a3, ret;</div><div class='ctx'> 	int r = 1;</div><div class='ctx'> </div><div class='del'>-	kvm_x86_ops-&gt;cache_regs(vcpu);</div><div class='del'>-</div><div class='del'>-	nr = vcpu-&gt;arch.regs[VCPU_REGS_RAX];</div><div class='del'>-	a0 = vcpu-&gt;arch.regs[VCPU_REGS_RBX];</div><div class='del'>-	a1 = vcpu-&gt;arch.regs[VCPU_REGS_RCX];</div><div class='del'>-	a2 = vcpu-&gt;arch.regs[VCPU_REGS_RDX];</div><div class='del'>-	a3 = vcpu-&gt;arch.regs[VCPU_REGS_RSI];</div><div class='add'>+	nr = kvm_register_read(vcpu, VCPU_REGS_RAX);</div><div class='add'>+	a0 = kvm_register_read(vcpu, VCPU_REGS_RBX);</div><div class='add'>+	a1 = kvm_register_read(vcpu, VCPU_REGS_RCX);</div><div class='add'>+	a2 = kvm_register_read(vcpu, VCPU_REGS_RDX);</div><div class='add'>+	a3 = kvm_register_read(vcpu, VCPU_REGS_RSI);</div><div class='ctx'> </div><div class='ctx'> 	KVMTRACE_1D(VMMCALL, vcpu, (u32)nr, handler);</div><div class='ctx'> </div><div class='hunk'>@@ -2548,8 +2608,7 @@ int kvm_emulate_hypercall(struct kvm_vcpu *vcpu)</div><div class='ctx'> 		ret = -KVM_ENOSYS;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	vcpu-&gt;arch.regs[VCPU_REGS_RAX] = ret;</div><div class='del'>-	kvm_x86_ops-&gt;decache_regs(vcpu);</div><div class='add'>+	kvm_register_write(vcpu, VCPU_REGS_RAX, ret);</div><div class='ctx'> 	++vcpu-&gt;stat.hypercalls;</div><div class='ctx'> 	return r;</div><div class='ctx'> }</div><div class='hunk'>@@ -2559,6 +2618,7 @@ int kvm_fix_hypercall(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='ctx'> 	char instruction[3];</div><div class='ctx'> 	int ret = 0;</div><div class='add'>+	unsigned long rip = kvm_rip_read(vcpu);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -2568,9 +2628,8 @@ int kvm_fix_hypercall(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	 */</div><div class='ctx'> 	kvm_mmu_zap_all(vcpu-&gt;kvm);</div><div class='ctx'> </div><div class='del'>-	kvm_x86_ops-&gt;cache_regs(vcpu);</div><div class='ctx'> 	kvm_x86_ops-&gt;patch_hypercall(vcpu, instruction);</div><div class='del'>-	if (emulator_write_emulated(vcpu-&gt;arch.rip, instruction, 3, vcpu)</div><div class='add'>+	if (emulator_write_emulated(rip, instruction, 3, vcpu)</div><div class='ctx'> 	    != X86EMUL_CONTINUE)</div><div class='ctx'> 		ret = -EFAULT;</div><div class='ctx'> </div><div class='hunk'>@@ -2700,13 +2759,12 @@ void kvm_emulate_cpuid(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	u32 function, index;</div><div class='ctx'> 	struct kvm_cpuid_entry2 *e, *best;</div><div class='ctx'> </div><div class='del'>-	kvm_x86_ops-&gt;cache_regs(vcpu);</div><div class='del'>-	function = vcpu-&gt;arch.regs[VCPU_REGS_RAX];</div><div class='del'>-	index = vcpu-&gt;arch.regs[VCPU_REGS_RCX];</div><div class='del'>-	vcpu-&gt;arch.regs[VCPU_REGS_RAX] = 0;</div><div class='del'>-	vcpu-&gt;arch.regs[VCPU_REGS_RBX] = 0;</div><div class='del'>-	vcpu-&gt;arch.regs[VCPU_REGS_RCX] = 0;</div><div class='del'>-	vcpu-&gt;arch.regs[VCPU_REGS_RDX] = 0;</div><div class='add'>+	function = kvm_register_read(vcpu, VCPU_REGS_RAX);</div><div class='add'>+	index = kvm_register_read(vcpu, VCPU_REGS_RCX);</div><div class='add'>+	kvm_register_write(vcpu, VCPU_REGS_RAX, 0);</div><div class='add'>+	kvm_register_write(vcpu, VCPU_REGS_RBX, 0);</div><div class='add'>+	kvm_register_write(vcpu, VCPU_REGS_RCX, 0);</div><div class='add'>+	kvm_register_write(vcpu, VCPU_REGS_RDX, 0);</div><div class='ctx'> 	best = NULL;</div><div class='ctx'> 	for (i = 0; i &lt; vcpu-&gt;arch.cpuid_nent; ++i) {</div><div class='ctx'> 		e = &amp;vcpu-&gt;arch.cpuid_entries[i];</div><div class='hunk'>@@ -2724,18 +2782,17 @@ void kvm_emulate_cpuid(struct kvm_vcpu *vcpu)</div><div class='ctx'> 				best = e;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (best) {</div><div class='del'>-		vcpu-&gt;arch.regs[VCPU_REGS_RAX] = best-&gt;eax;</div><div class='del'>-		vcpu-&gt;arch.regs[VCPU_REGS_RBX] = best-&gt;ebx;</div><div class='del'>-		vcpu-&gt;arch.regs[VCPU_REGS_RCX] = best-&gt;ecx;</div><div class='del'>-		vcpu-&gt;arch.regs[VCPU_REGS_RDX] = best-&gt;edx;</div><div class='add'>+		kvm_register_write(vcpu, VCPU_REGS_RAX, best-&gt;eax);</div><div class='add'>+		kvm_register_write(vcpu, VCPU_REGS_RBX, best-&gt;ebx);</div><div class='add'>+		kvm_register_write(vcpu, VCPU_REGS_RCX, best-&gt;ecx);</div><div class='add'>+		kvm_register_write(vcpu, VCPU_REGS_RDX, best-&gt;edx);</div><div class='ctx'> 	}</div><div class='del'>-	kvm_x86_ops-&gt;decache_regs(vcpu);</div><div class='ctx'> 	kvm_x86_ops-&gt;skip_emulated_instruction(vcpu);</div><div class='ctx'> 	KVMTRACE_5D(CPUID, vcpu, function,</div><div class='del'>-		    (u32)vcpu-&gt;arch.regs[VCPU_REGS_RAX],</div><div class='del'>-		    (u32)vcpu-&gt;arch.regs[VCPU_REGS_RBX],</div><div class='del'>-		    (u32)vcpu-&gt;arch.regs[VCPU_REGS_RCX],</div><div class='del'>-		    (u32)vcpu-&gt;arch.regs[VCPU_REGS_RDX], handler);</div><div class='add'>+		    (u32)kvm_register_read(vcpu, VCPU_REGS_RAX),</div><div class='add'>+		    (u32)kvm_register_read(vcpu, VCPU_REGS_RBX),</div><div class='add'>+		    (u32)kvm_register_read(vcpu, VCPU_REGS_RCX),</div><div class='add'>+		    (u32)kvm_register_read(vcpu, VCPU_REGS_RDX), handler);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(kvm_emulate_cpuid);</div><div class='ctx'> </div><div class='hunk'>@@ -2776,9 +2833,7 @@ static void vapic_enter(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	if (!apic || !apic-&gt;vapic_addr)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	down_read(&amp;current-&gt;mm-&gt;mmap_sem);</div><div class='ctx'> 	page = gfn_to_page(vcpu-&gt;kvm, apic-&gt;vapic_addr &gt;&gt; PAGE_SHIFT);</div><div class='del'>-	up_read(&amp;current-&gt;mm-&gt;mmap_sem);</div><div class='ctx'> </div><div class='ctx'> 	vcpu-&gt;arch.apic-&gt;vapic_page = page;</div><div class='ctx'> }</div><div class='hunk'>@@ -2796,28 +2851,10 @@ static void vapic_exit(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	up_read(&amp;vcpu-&gt;kvm-&gt;slots_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __vcpu_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)</div><div class='add'>+static int vcpu_enter_guest(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)</div><div class='ctx'> {</div><div class='ctx'> 	int r;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(vcpu-&gt;arch.mp_state == KVM_MP_STATE_SIPI_RECEIVED)) {</div><div class='del'>-		pr_debug("vcpu %d received sipi with vector # %x\n",</div><div class='del'>-		       vcpu-&gt;vcpu_id, vcpu-&gt;arch.sipi_vector);</div><div class='del'>-		kvm_lapic_reset(vcpu);</div><div class='del'>-		r = kvm_x86_ops-&gt;vcpu_reset(vcpu);</div><div class='del'>-		if (r)</div><div class='del'>-			return r;</div><div class='del'>-		vcpu-&gt;arch.mp_state = KVM_MP_STATE_RUNNABLE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	down_read(&amp;vcpu-&gt;kvm-&gt;slots_lock);</div><div class='del'>-	vapic_enter(vcpu);</div><div class='del'>-</div><div class='del'>-preempted:</div><div class='del'>-	if (vcpu-&gt;guest_debug.enabled)</div><div class='del'>-		kvm_x86_ops-&gt;guest_debug_pre(vcpu);</div><div class='del'>-</div><div class='del'>-again:</div><div class='ctx'> 	if (vcpu-&gt;requests)</div><div class='ctx'> 		if (test_and_clear_bit(KVM_REQ_MMU_RELOAD, &amp;vcpu-&gt;requests))</div><div class='ctx'> 			kvm_mmu_unload(vcpu);</div><div class='hunk'>@@ -2829,6 +2866,8 @@ again:</div><div class='ctx'> 	if (vcpu-&gt;requests) {</div><div class='ctx'> 		if (test_and_clear_bit(KVM_REQ_MIGRATE_TIMER, &amp;vcpu-&gt;requests))</div><div class='ctx'> 			__kvm_migrate_timers(vcpu);</div><div class='add'>+		if (test_and_clear_bit(KVM_REQ_MMU_SYNC, &amp;vcpu-&gt;requests))</div><div class='add'>+			kvm_mmu_sync_roots(vcpu);</div><div class='ctx'> 		if (test_and_clear_bit(KVM_REQ_TLB_FLUSH, &amp;vcpu-&gt;requests))</div><div class='ctx'> 			kvm_x86_ops-&gt;tlb_flush(vcpu);</div><div class='ctx'> 		if (test_and_clear_bit(KVM_REQ_REPORT_TPR_ACCESS,</div><div class='hunk'>@@ -2854,21 +2893,15 @@ again:</div><div class='ctx'> </div><div class='ctx'> 	local_irq_disable();</div><div class='ctx'> </div><div class='del'>-	if (vcpu-&gt;requests || need_resched()) {</div><div class='add'>+	if (vcpu-&gt;requests || need_resched() || signal_pending(current)) {</div><div class='ctx'> 		local_irq_enable();</div><div class='ctx'> 		preempt_enable();</div><div class='ctx'> 		r = 1;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (signal_pending(current)) {</div><div class='del'>-		local_irq_enable();</div><div class='del'>-		preempt_enable();</div><div class='del'>-		r = -EINTR;</div><div class='del'>-		kvm_run-&gt;exit_reason = KVM_EXIT_INTR;</div><div class='del'>-		++vcpu-&gt;stat.signal_exits;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	if (vcpu-&gt;guest_debug.enabled)</div><div class='add'>+		kvm_x86_ops-&gt;guest_debug_pre(vcpu);</div><div class='ctx'> </div><div class='ctx'> 	vcpu-&gt;guest_mode = 1;</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -2917,8 +2950,8 @@ again:</div><div class='ctx'> 	 * Profile KVM exit RIPs:</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (unlikely(prof_on == KVM_PROFILING)) {</div><div class='del'>-		kvm_x86_ops-&gt;cache_regs(vcpu);</div><div class='del'>-		profile_hit(KVM_PROFILING, (void *)vcpu-&gt;arch.rip);</div><div class='add'>+		unsigned long rip = kvm_rip_read(vcpu);</div><div class='add'>+		profile_hit(KVM_PROFILING, (void *)rip);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (vcpu-&gt;arch.exception.pending &amp;&amp; kvm_x86_ops-&gt;exception_injected(vcpu))</div><div class='hunk'>@@ -2927,26 +2960,63 @@ again:</div><div class='ctx'> 	kvm_lapic_sync_from_vapic(vcpu);</div><div class='ctx'> </div><div class='ctx'> 	r = kvm_x86_ops-&gt;handle_exit(kvm_run, vcpu);</div><div class='add'>+out:</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (r &gt; 0) {</div><div class='del'>-		if (dm_request_for_irq_injection(vcpu, kvm_run)) {</div><div class='del'>-			r = -EINTR;</div><div class='del'>-			kvm_run-&gt;exit_reason = KVM_EXIT_INTR;</div><div class='del'>-			++vcpu-&gt;stat.request_irq_exits;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-		if (!need_resched())</div><div class='del'>-			goto again;</div><div class='add'>+static int __vcpu_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	if (unlikely(vcpu-&gt;arch.mp_state == KVM_MP_STATE_SIPI_RECEIVED)) {</div><div class='add'>+		pr_debug("vcpu %d received sipi with vector # %x\n",</div><div class='add'>+			 vcpu-&gt;vcpu_id, vcpu-&gt;arch.sipi_vector);</div><div class='add'>+		kvm_lapic_reset(vcpu);</div><div class='add'>+		r = kvm_x86_ops-&gt;vcpu_reset(vcpu);</div><div class='add'>+		if (r)</div><div class='add'>+			return r;</div><div class='add'>+		vcpu-&gt;arch.mp_state = KVM_MP_STATE_RUNNABLE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	up_read(&amp;vcpu-&gt;kvm-&gt;slots_lock);</div><div class='del'>-	if (r &gt; 0) {</div><div class='del'>-		kvm_resched(vcpu);</div><div class='del'>-		down_read(&amp;vcpu-&gt;kvm-&gt;slots_lock);</div><div class='del'>-		goto preempted;</div><div class='add'>+	down_read(&amp;vcpu-&gt;kvm-&gt;slots_lock);</div><div class='add'>+	vapic_enter(vcpu);</div><div class='add'>+</div><div class='add'>+	r = 1;</div><div class='add'>+	while (r &gt; 0) {</div><div class='add'>+		if (vcpu-&gt;arch.mp_state == KVM_MP_STATE_RUNNABLE)</div><div class='add'>+			r = vcpu_enter_guest(vcpu, kvm_run);</div><div class='add'>+		else {</div><div class='add'>+			up_read(&amp;vcpu-&gt;kvm-&gt;slots_lock);</div><div class='add'>+			kvm_vcpu_block(vcpu);</div><div class='add'>+			down_read(&amp;vcpu-&gt;kvm-&gt;slots_lock);</div><div class='add'>+			if (test_and_clear_bit(KVM_REQ_UNHALT, &amp;vcpu-&gt;requests))</div><div class='add'>+				if (vcpu-&gt;arch.mp_state == KVM_MP_STATE_HALTED)</div><div class='add'>+					vcpu-&gt;arch.mp_state =</div><div class='add'>+							KVM_MP_STATE_RUNNABLE;</div><div class='add'>+			if (vcpu-&gt;arch.mp_state != KVM_MP_STATE_RUNNABLE)</div><div class='add'>+				r = -EINTR;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (r &gt; 0) {</div><div class='add'>+			if (dm_request_for_irq_injection(vcpu, kvm_run)) {</div><div class='add'>+				r = -EINTR;</div><div class='add'>+				kvm_run-&gt;exit_reason = KVM_EXIT_INTR;</div><div class='add'>+				++vcpu-&gt;stat.request_irq_exits;</div><div class='add'>+			}</div><div class='add'>+			if (signal_pending(current)) {</div><div class='add'>+				r = -EINTR;</div><div class='add'>+				kvm_run-&gt;exit_reason = KVM_EXIT_INTR;</div><div class='add'>+				++vcpu-&gt;stat.signal_exits;</div><div class='add'>+			}</div><div class='add'>+			if (need_resched()) {</div><div class='add'>+				up_read(&amp;vcpu-&gt;kvm-&gt;slots_lock);</div><div class='add'>+				kvm_resched(vcpu);</div><div class='add'>+				down_read(&amp;vcpu-&gt;kvm-&gt;slots_lock);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	up_read(&amp;vcpu-&gt;kvm-&gt;slots_lock);</div><div class='ctx'> 	post_kvm_run_save(vcpu, kvm_run);</div><div class='ctx'> </div><div class='ctx'> 	vapic_exit(vcpu);</div><div class='hunk'>@@ -2966,6 +3036,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(vcpu-&gt;arch.mp_state == KVM_MP_STATE_UNINITIALIZED)) {</div><div class='ctx'> 		kvm_vcpu_block(vcpu);</div><div class='add'>+		clear_bit(KVM_REQ_UNHALT, &amp;vcpu-&gt;requests);</div><div class='ctx'> 		r = -EAGAIN;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2999,11 +3070,9 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='del'>-	if (kvm_run-&gt;exit_reason == KVM_EXIT_HYPERCALL) {</div><div class='del'>-		kvm_x86_ops-&gt;cache_regs(vcpu);</div><div class='del'>-		vcpu-&gt;arch.regs[VCPU_REGS_RAX] = kvm_run-&gt;hypercall.ret;</div><div class='del'>-		kvm_x86_ops-&gt;decache_regs(vcpu);</div><div class='del'>-	}</div><div class='add'>+	if (kvm_run-&gt;exit_reason == KVM_EXIT_HYPERCALL)</div><div class='add'>+		kvm_register_write(vcpu, VCPU_REGS_RAX,</div><div class='add'>+				     kvm_run-&gt;hypercall.ret);</div><div class='ctx'> </div><div class='ctx'> 	r = __vcpu_run(vcpu, kvm_run);</div><div class='ctx'> </div><div class='hunk'>@@ -3019,28 +3088,26 @@ int kvm_arch_vcpu_ioctl_get_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	vcpu_load(vcpu);</div><div class='ctx'> </div><div class='del'>-	kvm_x86_ops-&gt;cache_regs(vcpu);</div><div class='del'>-</div><div class='del'>-	regs-&gt;rax = vcpu-&gt;arch.regs[VCPU_REGS_RAX];</div><div class='del'>-	regs-&gt;rbx = vcpu-&gt;arch.regs[VCPU_REGS_RBX];</div><div class='del'>-	regs-&gt;rcx = vcpu-&gt;arch.regs[VCPU_REGS_RCX];</div><div class='del'>-	regs-&gt;rdx = vcpu-&gt;arch.regs[VCPU_REGS_RDX];</div><div class='del'>-	regs-&gt;rsi = vcpu-&gt;arch.regs[VCPU_REGS_RSI];</div><div class='del'>-	regs-&gt;rdi = vcpu-&gt;arch.regs[VCPU_REGS_RDI];</div><div class='del'>-	regs-&gt;rsp = vcpu-&gt;arch.regs[VCPU_REGS_RSP];</div><div class='del'>-	regs-&gt;rbp = vcpu-&gt;arch.regs[VCPU_REGS_RBP];</div><div class='add'>+	regs-&gt;rax = kvm_register_read(vcpu, VCPU_REGS_RAX);</div><div class='add'>+	regs-&gt;rbx = kvm_register_read(vcpu, VCPU_REGS_RBX);</div><div class='add'>+	regs-&gt;rcx = kvm_register_read(vcpu, VCPU_REGS_RCX);</div><div class='add'>+	regs-&gt;rdx = kvm_register_read(vcpu, VCPU_REGS_RDX);</div><div class='add'>+	regs-&gt;rsi = kvm_register_read(vcpu, VCPU_REGS_RSI);</div><div class='add'>+	regs-&gt;rdi = kvm_register_read(vcpu, VCPU_REGS_RDI);</div><div class='add'>+	regs-&gt;rsp = kvm_register_read(vcpu, VCPU_REGS_RSP);</div><div class='add'>+	regs-&gt;rbp = kvm_register_read(vcpu, VCPU_REGS_RBP);</div><div class='ctx'> #ifdef CONFIG_X86_64</div><div class='del'>-	regs-&gt;r8 = vcpu-&gt;arch.regs[VCPU_REGS_R8];</div><div class='del'>-	regs-&gt;r9 = vcpu-&gt;arch.regs[VCPU_REGS_R9];</div><div class='del'>-	regs-&gt;r10 = vcpu-&gt;arch.regs[VCPU_REGS_R10];</div><div class='del'>-	regs-&gt;r11 = vcpu-&gt;arch.regs[VCPU_REGS_R11];</div><div class='del'>-	regs-&gt;r12 = vcpu-&gt;arch.regs[VCPU_REGS_R12];</div><div class='del'>-	regs-&gt;r13 = vcpu-&gt;arch.regs[VCPU_REGS_R13];</div><div class='del'>-	regs-&gt;r14 = vcpu-&gt;arch.regs[VCPU_REGS_R14];</div><div class='del'>-	regs-&gt;r15 = vcpu-&gt;arch.regs[VCPU_REGS_R15];</div><div class='add'>+	regs-&gt;r8 = kvm_register_read(vcpu, VCPU_REGS_R8);</div><div class='add'>+	regs-&gt;r9 = kvm_register_read(vcpu, VCPU_REGS_R9);</div><div class='add'>+	regs-&gt;r10 = kvm_register_read(vcpu, VCPU_REGS_R10);</div><div class='add'>+	regs-&gt;r11 = kvm_register_read(vcpu, VCPU_REGS_R11);</div><div class='add'>+	regs-&gt;r12 = kvm_register_read(vcpu, VCPU_REGS_R12);</div><div class='add'>+	regs-&gt;r13 = kvm_register_read(vcpu, VCPU_REGS_R13);</div><div class='add'>+	regs-&gt;r14 = kvm_register_read(vcpu, VCPU_REGS_R14);</div><div class='add'>+	regs-&gt;r15 = kvm_register_read(vcpu, VCPU_REGS_R15);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	regs-&gt;rip = vcpu-&gt;arch.rip;</div><div class='add'>+	regs-&gt;rip = kvm_rip_read(vcpu);</div><div class='ctx'> 	regs-&gt;rflags = kvm_x86_ops-&gt;get_rflags(vcpu);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -3058,29 +3125,29 @@ int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	vcpu_load(vcpu);</div><div class='ctx'> </div><div class='del'>-	vcpu-&gt;arch.regs[VCPU_REGS_RAX] = regs-&gt;rax;</div><div class='del'>-	vcpu-&gt;arch.regs[VCPU_REGS_RBX] = regs-&gt;rbx;</div><div class='del'>-	vcpu-&gt;arch.regs[VCPU_REGS_RCX] = regs-&gt;rcx;</div><div class='del'>-	vcpu-&gt;arch.regs[VCPU_REGS_RDX] = regs-&gt;rdx;</div><div class='del'>-	vcpu-&gt;arch.regs[VCPU_REGS_RSI] = regs-&gt;rsi;</div><div class='del'>-	vcpu-&gt;arch.regs[VCPU_REGS_RDI] = regs-&gt;rdi;</div><div class='del'>-	vcpu-&gt;arch.regs[VCPU_REGS_RSP] = regs-&gt;rsp;</div><div class='del'>-	vcpu-&gt;arch.regs[VCPU_REGS_RBP] = regs-&gt;rbp;</div><div class='add'>+	kvm_register_write(vcpu, VCPU_REGS_RAX, regs-&gt;rax);</div><div class='add'>+	kvm_register_write(vcpu, VCPU_REGS_RBX, regs-&gt;rbx);</div><div class='add'>+	kvm_register_write(vcpu, VCPU_REGS_RCX, regs-&gt;rcx);</div><div class='add'>+	kvm_register_write(vcpu, VCPU_REGS_RDX, regs-&gt;rdx);</div><div class='add'>+	kvm_register_write(vcpu, VCPU_REGS_RSI, regs-&gt;rsi);</div><div class='add'>+	kvm_register_write(vcpu, VCPU_REGS_RDI, regs-&gt;rdi);</div><div class='add'>+	kvm_register_write(vcpu, VCPU_REGS_RSP, regs-&gt;rsp);</div><div class='add'>+	kvm_register_write(vcpu, VCPU_REGS_RBP, regs-&gt;rbp);</div><div class='ctx'> #ifdef CONFIG_X86_64</div><div class='del'>-	vcpu-&gt;arch.regs[VCPU_REGS_R8] = regs-&gt;r8;</div><div class='del'>-	vcpu-&gt;arch.regs[VCPU_REGS_R9] = regs-&gt;r9;</div><div class='del'>-	vcpu-&gt;arch.regs[VCPU_REGS_R10] = regs-&gt;r10;</div><div class='del'>-	vcpu-&gt;arch.regs[VCPU_REGS_R11] = regs-&gt;r11;</div><div class='del'>-	vcpu-&gt;arch.regs[VCPU_REGS_R12] = regs-&gt;r12;</div><div class='del'>-	vcpu-&gt;arch.regs[VCPU_REGS_R13] = regs-&gt;r13;</div><div class='del'>-	vcpu-&gt;arch.regs[VCPU_REGS_R14] = regs-&gt;r14;</div><div class='del'>-	vcpu-&gt;arch.regs[VCPU_REGS_R15] = regs-&gt;r15;</div><div class='add'>+	kvm_register_write(vcpu, VCPU_REGS_R8, regs-&gt;r8);</div><div class='add'>+	kvm_register_write(vcpu, VCPU_REGS_R9, regs-&gt;r9);</div><div class='add'>+	kvm_register_write(vcpu, VCPU_REGS_R10, regs-&gt;r10);</div><div class='add'>+	kvm_register_write(vcpu, VCPU_REGS_R11, regs-&gt;r11);</div><div class='add'>+	kvm_register_write(vcpu, VCPU_REGS_R12, regs-&gt;r12);</div><div class='add'>+	kvm_register_write(vcpu, VCPU_REGS_R13, regs-&gt;r13);</div><div class='add'>+	kvm_register_write(vcpu, VCPU_REGS_R14, regs-&gt;r14);</div><div class='add'>+	kvm_register_write(vcpu, VCPU_REGS_R15, regs-&gt;r15);</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	vcpu-&gt;arch.rip = regs-&gt;rip;</div><div class='add'>+	kvm_rip_write(vcpu, regs-&gt;rip);</div><div class='ctx'> 	kvm_x86_ops-&gt;set_rflags(vcpu, regs-&gt;rflags);</div><div class='ctx'> </div><div class='del'>-	kvm_x86_ops-&gt;decache_regs(vcpu);</div><div class='ctx'> </div><div class='ctx'> 	vcpu-&gt;arch.exception.pending = false;</div><div class='ctx'> </div><div class='hunk'>@@ -3294,11 +3361,33 @@ static int load_segment_descriptor_to_kvm_desct(struct kvm_vcpu *vcpu,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int kvm_load_realmode_segment(struct kvm_vcpu *vcpu, u16 selector, int seg)</div><div class='add'>+{</div><div class='add'>+	struct kvm_segment segvar = {</div><div class='add'>+		.base = selector &lt;&lt; 4,</div><div class='add'>+		.limit = 0xffff,</div><div class='add'>+		.selector = selector,</div><div class='add'>+		.type = 3,</div><div class='add'>+		.present = 1,</div><div class='add'>+		.dpl = 3,</div><div class='add'>+		.db = 0,</div><div class='add'>+		.s = 1,</div><div class='add'>+		.l = 0,</div><div class='add'>+		.g = 0,</div><div class='add'>+		.avl = 0,</div><div class='add'>+		.unusable = 0,</div><div class='add'>+	};</div><div class='add'>+	kvm_x86_ops-&gt;set_segment(vcpu, &amp;segvar, seg);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int kvm_load_segment_descriptor(struct kvm_vcpu *vcpu, u16 selector,</div><div class='ctx'> 				int type_bits, int seg)</div><div class='ctx'> {</div><div class='ctx'> 	struct kvm_segment kvm_seg;</div><div class='ctx'> </div><div class='add'>+	if (!(vcpu-&gt;arch.cr0 &amp; X86_CR0_PE))</div><div class='add'>+		return kvm_load_realmode_segment(vcpu, selector, seg);</div><div class='ctx'> 	if (load_segment_descriptor_to_kvm_desct(vcpu, selector, &amp;kvm_seg))</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	kvm_seg.type |= type_bits;</div><div class='hunk'>@@ -3316,17 +3405,16 @@ static void save_state_to_tss32(struct kvm_vcpu *vcpu,</div><div class='ctx'> 				struct tss_segment_32 *tss)</div><div class='ctx'> {</div><div class='ctx'> 	tss-&gt;cr3 = vcpu-&gt;arch.cr3;</div><div class='del'>-	tss-&gt;eip = vcpu-&gt;arch.rip;</div><div class='add'>+	tss-&gt;eip = kvm_rip_read(vcpu);</div><div class='ctx'> 	tss-&gt;eflags = kvm_x86_ops-&gt;get_rflags(vcpu);</div><div class='del'>-	tss-&gt;eax = vcpu-&gt;arch.regs[VCPU_REGS_RAX];</div><div class='del'>-	tss-&gt;ecx = vcpu-&gt;arch.regs[VCPU_REGS_RCX];</div><div class='del'>-	tss-&gt;edx = vcpu-&gt;arch.regs[VCPU_REGS_RDX];</div><div class='del'>-	tss-&gt;ebx = vcpu-&gt;arch.regs[VCPU_REGS_RBX];</div><div class='del'>-	tss-&gt;esp = vcpu-&gt;arch.regs[VCPU_REGS_RSP];</div><div class='del'>-	tss-&gt;ebp = vcpu-&gt;arch.regs[VCPU_REGS_RBP];</div><div class='del'>-	tss-&gt;esi = vcpu-&gt;arch.regs[VCPU_REGS_RSI];</div><div class='del'>-	tss-&gt;edi = vcpu-&gt;arch.regs[VCPU_REGS_RDI];</div><div class='del'>-</div><div class='add'>+	tss-&gt;eax = kvm_register_read(vcpu, VCPU_REGS_RAX);</div><div class='add'>+	tss-&gt;ecx = kvm_register_read(vcpu, VCPU_REGS_RCX);</div><div class='add'>+	tss-&gt;edx = kvm_register_read(vcpu, VCPU_REGS_RDX);</div><div class='add'>+	tss-&gt;ebx = kvm_register_read(vcpu, VCPU_REGS_RBX);</div><div class='add'>+	tss-&gt;esp = kvm_register_read(vcpu, VCPU_REGS_RSP);</div><div class='add'>+	tss-&gt;ebp = kvm_register_read(vcpu, VCPU_REGS_RBP);</div><div class='add'>+	tss-&gt;esi = kvm_register_read(vcpu, VCPU_REGS_RSI);</div><div class='add'>+	tss-&gt;edi = kvm_register_read(vcpu, VCPU_REGS_RDI);</div><div class='ctx'> 	tss-&gt;es = get_segment_selector(vcpu, VCPU_SREG_ES);</div><div class='ctx'> 	tss-&gt;cs = get_segment_selector(vcpu, VCPU_SREG_CS);</div><div class='ctx'> 	tss-&gt;ss = get_segment_selector(vcpu, VCPU_SREG_SS);</div><div class='hunk'>@@ -3342,17 +3430,17 @@ static int load_state_from_tss32(struct kvm_vcpu *vcpu,</div><div class='ctx'> {</div><div class='ctx'> 	kvm_set_cr3(vcpu, tss-&gt;cr3);</div><div class='ctx'> </div><div class='del'>-	vcpu-&gt;arch.rip = tss-&gt;eip;</div><div class='add'>+	kvm_rip_write(vcpu, tss-&gt;eip);</div><div class='ctx'> 	kvm_x86_ops-&gt;set_rflags(vcpu, tss-&gt;eflags | 2);</div><div class='ctx'> </div><div class='del'>-	vcpu-&gt;arch.regs[VCPU_REGS_RAX] = tss-&gt;eax;</div><div class='del'>-	vcpu-&gt;arch.regs[VCPU_REGS_RCX] = tss-&gt;ecx;</div><div class='del'>-	vcpu-&gt;arch.regs[VCPU_REGS_RDX] = tss-&gt;edx;</div><div class='del'>-	vcpu-&gt;arch.regs[VCPU_REGS_RBX] = tss-&gt;ebx;</div><div class='del'>-	vcpu-&gt;arch.regs[VCPU_REGS_RSP] = tss-&gt;esp;</div><div class='del'>-	vcpu-&gt;arch.regs[VCPU_REGS_RBP] = tss-&gt;ebp;</div><div class='del'>-	vcpu-&gt;arch.regs[VCPU_REGS_RSI] = tss-&gt;esi;</div><div class='del'>-	vcpu-&gt;arch.regs[VCPU_REGS_RDI] = tss-&gt;edi;</div><div class='add'>+	kvm_register_write(vcpu, VCPU_REGS_RAX, tss-&gt;eax);</div><div class='add'>+	kvm_register_write(vcpu, VCPU_REGS_RCX, tss-&gt;ecx);</div><div class='add'>+	kvm_register_write(vcpu, VCPU_REGS_RDX, tss-&gt;edx);</div><div class='add'>+	kvm_register_write(vcpu, VCPU_REGS_RBX, tss-&gt;ebx);</div><div class='add'>+	kvm_register_write(vcpu, VCPU_REGS_RSP, tss-&gt;esp);</div><div class='add'>+	kvm_register_write(vcpu, VCPU_REGS_RBP, tss-&gt;ebp);</div><div class='add'>+	kvm_register_write(vcpu, VCPU_REGS_RSI, tss-&gt;esi);</div><div class='add'>+	kvm_register_write(vcpu, VCPU_REGS_RDI, tss-&gt;edi);</div><div class='ctx'> </div><div class='ctx'> 	if (kvm_load_segment_descriptor(vcpu, tss-&gt;ldt_selector, 0, VCPU_SREG_LDTR))</div><div class='ctx'> 		return 1;</div><div class='hunk'>@@ -3380,16 +3468,16 @@ static int load_state_from_tss32(struct kvm_vcpu *vcpu,</div><div class='ctx'> static void save_state_to_tss16(struct kvm_vcpu *vcpu,</div><div class='ctx'> 				struct tss_segment_16 *tss)</div><div class='ctx'> {</div><div class='del'>-	tss-&gt;ip = vcpu-&gt;arch.rip;</div><div class='add'>+	tss-&gt;ip = kvm_rip_read(vcpu);</div><div class='ctx'> 	tss-&gt;flag = kvm_x86_ops-&gt;get_rflags(vcpu);</div><div class='del'>-	tss-&gt;ax = vcpu-&gt;arch.regs[VCPU_REGS_RAX];</div><div class='del'>-	tss-&gt;cx = vcpu-&gt;arch.regs[VCPU_REGS_RCX];</div><div class='del'>-	tss-&gt;dx = vcpu-&gt;arch.regs[VCPU_REGS_RDX];</div><div class='del'>-	tss-&gt;bx = vcpu-&gt;arch.regs[VCPU_REGS_RBX];</div><div class='del'>-	tss-&gt;sp = vcpu-&gt;arch.regs[VCPU_REGS_RSP];</div><div class='del'>-	tss-&gt;bp = vcpu-&gt;arch.regs[VCPU_REGS_RBP];</div><div class='del'>-	tss-&gt;si = vcpu-&gt;arch.regs[VCPU_REGS_RSI];</div><div class='del'>-	tss-&gt;di = vcpu-&gt;arch.regs[VCPU_REGS_RDI];</div><div class='add'>+	tss-&gt;ax = kvm_register_read(vcpu, VCPU_REGS_RAX);</div><div class='add'>+	tss-&gt;cx = kvm_register_read(vcpu, VCPU_REGS_RCX);</div><div class='add'>+	tss-&gt;dx = kvm_register_read(vcpu, VCPU_REGS_RDX);</div><div class='add'>+	tss-&gt;bx = kvm_register_read(vcpu, VCPU_REGS_RBX);</div><div class='add'>+	tss-&gt;sp = kvm_register_read(vcpu, VCPU_REGS_RSP);</div><div class='add'>+	tss-&gt;bp = kvm_register_read(vcpu, VCPU_REGS_RBP);</div><div class='add'>+	tss-&gt;si = kvm_register_read(vcpu, VCPU_REGS_RSI);</div><div class='add'>+	tss-&gt;di = kvm_register_read(vcpu, VCPU_REGS_RDI);</div><div class='ctx'> </div><div class='ctx'> 	tss-&gt;es = get_segment_selector(vcpu, VCPU_SREG_ES);</div><div class='ctx'> 	tss-&gt;cs = get_segment_selector(vcpu, VCPU_SREG_CS);</div><div class='hunk'>@@ -3402,16 +3490,16 @@ static void save_state_to_tss16(struct kvm_vcpu *vcpu,</div><div class='ctx'> static int load_state_from_tss16(struct kvm_vcpu *vcpu,</div><div class='ctx'> 				 struct tss_segment_16 *tss)</div><div class='ctx'> {</div><div class='del'>-	vcpu-&gt;arch.rip = tss-&gt;ip;</div><div class='add'>+	kvm_rip_write(vcpu, tss-&gt;ip);</div><div class='ctx'> 	kvm_x86_ops-&gt;set_rflags(vcpu, tss-&gt;flag | 2);</div><div class='del'>-	vcpu-&gt;arch.regs[VCPU_REGS_RAX] = tss-&gt;ax;</div><div class='del'>-	vcpu-&gt;arch.regs[VCPU_REGS_RCX] = tss-&gt;cx;</div><div class='del'>-	vcpu-&gt;arch.regs[VCPU_REGS_RDX] = tss-&gt;dx;</div><div class='del'>-	vcpu-&gt;arch.regs[VCPU_REGS_RBX] = tss-&gt;bx;</div><div class='del'>-	vcpu-&gt;arch.regs[VCPU_REGS_RSP] = tss-&gt;sp;</div><div class='del'>-	vcpu-&gt;arch.regs[VCPU_REGS_RBP] = tss-&gt;bp;</div><div class='del'>-	vcpu-&gt;arch.regs[VCPU_REGS_RSI] = tss-&gt;si;</div><div class='del'>-	vcpu-&gt;arch.regs[VCPU_REGS_RDI] = tss-&gt;di;</div><div class='add'>+	kvm_register_write(vcpu, VCPU_REGS_RAX, tss-&gt;ax);</div><div class='add'>+	kvm_register_write(vcpu, VCPU_REGS_RCX, tss-&gt;cx);</div><div class='add'>+	kvm_register_write(vcpu, VCPU_REGS_RDX, tss-&gt;dx);</div><div class='add'>+	kvm_register_write(vcpu, VCPU_REGS_RBX, tss-&gt;bx);</div><div class='add'>+	kvm_register_write(vcpu, VCPU_REGS_RSP, tss-&gt;sp);</div><div class='add'>+	kvm_register_write(vcpu, VCPU_REGS_RBP, tss-&gt;bp);</div><div class='add'>+	kvm_register_write(vcpu, VCPU_REGS_RSI, tss-&gt;si);</div><div class='add'>+	kvm_register_write(vcpu, VCPU_REGS_RDI, tss-&gt;di);</div><div class='ctx'> </div><div class='ctx'> 	if (kvm_load_segment_descriptor(vcpu, tss-&gt;ldt, 0, VCPU_SREG_LDTR))</div><div class='ctx'> 		return 1;</div><div class='hunk'>@@ -3534,7 +3622,6 @@ int kvm_task_switch(struct kvm_vcpu *vcpu, u16 tss_selector, int reason)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	kvm_x86_ops-&gt;skip_emulated_instruction(vcpu);</div><div class='del'>-	kvm_x86_ops-&gt;cache_regs(vcpu);</div><div class='ctx'> </div><div class='ctx'> 	if (nseg_desc.type &amp; 8)</div><div class='ctx'> 		ret = kvm_task_switch_32(vcpu, tss_selector, old_tss_base,</div><div class='hunk'>@@ -3559,7 +3646,6 @@ int kvm_task_switch(struct kvm_vcpu *vcpu, u16 tss_selector, int reason)</div><div class='ctx'> 	tr_seg.type = 11;</div><div class='ctx'> 	kvm_set_segment(vcpu, &amp;tr_seg, VCPU_SREG_TR);</div><div class='ctx'> out:</div><div class='del'>-	kvm_x86_ops-&gt;decache_regs(vcpu);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(kvm_task_switch);</div><div class='hunk'>@@ -3622,6 +3708,7 @@ int kvm_arch_vcpu_ioctl_set_sregs(struct kvm_vcpu *vcpu,</div><div class='ctx'> 			pr_debug("Set back pending irq %d\n",</div><div class='ctx'> 				 pending_vec);</div><div class='ctx'> 		}</div><div class='add'>+		kvm_pic_clear_isr_ack(vcpu-&gt;kvm);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	kvm_set_segment(vcpu, &amp;sregs-&gt;cs, VCPU_SREG_CS);</div><div class='hunk'>@@ -3634,6 +3721,12 @@ int kvm_arch_vcpu_ioctl_set_sregs(struct kvm_vcpu *vcpu,</div><div class='ctx'> 	kvm_set_segment(vcpu, &amp;sregs-&gt;tr, VCPU_SREG_TR);</div><div class='ctx'> 	kvm_set_segment(vcpu, &amp;sregs-&gt;ldt, VCPU_SREG_LDTR);</div><div class='ctx'> </div><div class='add'>+	/* Older userspace won't unhalt the vcpu on reset. */</div><div class='add'>+	if (vcpu-&gt;vcpu_id == 0 &amp;&amp; kvm_rip_read(vcpu) == 0xfff0 &amp;&amp;</div><div class='add'>+	    sregs-&gt;cs.selector == 0xf000 &amp;&amp; sregs-&gt;cs.base == 0xffff0000 &amp;&amp;</div><div class='add'>+	    !(vcpu-&gt;arch.cr0 &amp; X86_CR0_PE))</div><div class='add'>+		vcpu-&gt;arch.mp_state = KVM_MP_STATE_RUNNABLE;</div><div class='add'>+</div><div class='ctx'> 	vcpu_put(vcpu);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -3918,6 +4011,7 @@ struct  kvm *kvm_arch_create_vm(void)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;kvm-&gt;arch.active_mmu_pages);</div><div class='add'>+	INIT_LIST_HEAD(&amp;kvm-&gt;arch.assigned_dev_head);</div><div class='ctx'> </div><div class='ctx'> 	return kvm;</div><div class='ctx'> }</div><div class='hunk'>@@ -3950,6 +4044,8 @@ static void kvm_free_vcpus(struct kvm *kvm)</div><div class='ctx'> </div><div class='ctx'> void kvm_arch_destroy_vm(struct kvm *kvm)</div><div class='ctx'> {</div><div class='add'>+	kvm_iommu_unmap_guest(kvm);</div><div class='add'>+	kvm_free_all_assigned_devices(kvm);</div><div class='ctx'> 	kvm_free_pit(kvm);</div><div class='ctx'> 	kfree(kvm-&gt;arch.vpic);</div><div class='ctx'> 	kfree(kvm-&gt;arch.vioapic);</div><div class='hunk'>@@ -3981,7 +4077,7 @@ int kvm_arch_set_memory_region(struct kvm *kvm,</div><div class='ctx'> 			userspace_addr = do_mmap(NULL, 0,</div><div class='ctx'> 						 npages * PAGE_SIZE,</div><div class='ctx'> 						 PROT_READ | PROT_WRITE,</div><div class='del'>-						 MAP_SHARED | MAP_ANONYMOUS,</div><div class='add'>+						 MAP_PRIVATE | MAP_ANONYMOUS,</div><div class='ctx'> 						 0);</div><div class='ctx'> 			up_write(&amp;current-&gt;mm-&gt;mmap_sem);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kvm/x86.h b/arch/x86/kvm/x86.h<br/>new file mode 100644<br/>index 000000000000..6a4be78a7384<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kvm/x86.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kvm/x86.h</a></div><div class='hunk'>@@ -0,0 +1,22 @@</div><div class='add'>+#ifndef ARCH_X86_KVM_X86_H</div><div class='add'>+#define ARCH_X86_KVM_X86_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kvm_host.h&gt;</div><div class='add'>+</div><div class='add'>+static inline void kvm_clear_exception_queue(struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	vcpu-&gt;arch.exception.pending = false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void kvm_queue_interrupt(struct kvm_vcpu *vcpu, u8 vector)</div><div class='add'>+{</div><div class='add'>+	vcpu-&gt;arch.interrupt.pending = true;</div><div class='add'>+	vcpu-&gt;arch.interrupt.nr = vector;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void kvm_clear_interrupt_queue(struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	vcpu-&gt;arch.interrupt.pending = false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/x86/kvm/x86_emulate.c b/arch/x86/kvm/x86_emulate.c<br/>index f2f90468f8b1..ea051173b0da 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kvm/x86_emulate.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/kvm/x86_emulate.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/kvm/x86_emulate.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/kvm/x86_emulate.c</a></div><div class='hunk'>@@ -26,6 +26,7 @@</div><div class='ctx'> #define DPRINTF(_f, _a ...) printf(_f , ## _a)</div><div class='ctx'> #else</div><div class='ctx'> #include &lt;linux/kvm_host.h&gt;</div><div class='add'>+#include "kvm_cache_regs.h"</div><div class='ctx'> #define DPRINTF(x...) do {} while (0)</div><div class='ctx'> #endif</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -46,25 +47,26 @@</div><div class='ctx'> #define ImplicitOps (1&lt;&lt;1)	/* Implicit in opcode. No generic decode. */</div><div class='ctx'> #define DstReg      (2&lt;&lt;1)	/* Register operand. */</div><div class='ctx'> #define DstMem      (3&lt;&lt;1)	/* Memory operand. */</div><div class='del'>-#define DstMask     (3&lt;&lt;1)</div><div class='add'>+#define DstAcc      (4&lt;&lt;1)      /* Destination Accumulator */</div><div class='add'>+#define DstMask     (7&lt;&lt;1)</div><div class='ctx'> /* Source operand type. */</div><div class='del'>-#define SrcNone     (0&lt;&lt;3)	/* No source operand. */</div><div class='del'>-#define SrcImplicit (0&lt;&lt;3)	/* Source operand is implicit in the opcode. */</div><div class='del'>-#define SrcReg      (1&lt;&lt;3)	/* Register operand. */</div><div class='del'>-#define SrcMem      (2&lt;&lt;3)	/* Memory operand. */</div><div class='del'>-#define SrcMem16    (3&lt;&lt;3)	/* Memory operand (16-bit). */</div><div class='del'>-#define SrcMem32    (4&lt;&lt;3)	/* Memory operand (32-bit). */</div><div class='del'>-#define SrcImm      (5&lt;&lt;3)	/* Immediate operand. */</div><div class='del'>-#define SrcImmByte  (6&lt;&lt;3)	/* 8-bit sign-extended immediate operand. */</div><div class='del'>-#define SrcMask     (7&lt;&lt;3)</div><div class='add'>+#define SrcNone     (0&lt;&lt;4)	/* No source operand. */</div><div class='add'>+#define SrcImplicit (0&lt;&lt;4)	/* Source operand is implicit in the opcode. */</div><div class='add'>+#define SrcReg      (1&lt;&lt;4)	/* Register operand. */</div><div class='add'>+#define SrcMem      (2&lt;&lt;4)	/* Memory operand. */</div><div class='add'>+#define SrcMem16    (3&lt;&lt;4)	/* Memory operand (16-bit). */</div><div class='add'>+#define SrcMem32    (4&lt;&lt;4)	/* Memory operand (32-bit). */</div><div class='add'>+#define SrcImm      (5&lt;&lt;4)	/* Immediate operand. */</div><div class='add'>+#define SrcImmByte  (6&lt;&lt;4)	/* 8-bit sign-extended immediate operand. */</div><div class='add'>+#define SrcMask     (7&lt;&lt;4)</div><div class='ctx'> /* Generic ModRM decode. */</div><div class='del'>-#define ModRM       (1&lt;&lt;6)</div><div class='add'>+#define ModRM       (1&lt;&lt;7)</div><div class='ctx'> /* Destination is only written; never read. */</div><div class='del'>-#define Mov         (1&lt;&lt;7)</div><div class='del'>-#define BitOp       (1&lt;&lt;8)</div><div class='del'>-#define MemAbs      (1&lt;&lt;9)      /* Memory operand is absolute displacement */</div><div class='del'>-#define String      (1&lt;&lt;10)     /* String instruction (rep capable) */</div><div class='del'>-#define Stack       (1&lt;&lt;11)     /* Stack instruction (push/pop) */</div><div class='add'>+#define Mov         (1&lt;&lt;8)</div><div class='add'>+#define BitOp       (1&lt;&lt;9)</div><div class='add'>+#define MemAbs      (1&lt;&lt;10)      /* Memory operand is absolute displacement */</div><div class='add'>+#define String      (1&lt;&lt;12)     /* String instruction (rep capable) */</div><div class='add'>+#define Stack       (1&lt;&lt;13)     /* Stack instruction (push/pop) */</div><div class='ctx'> #define Group       (1&lt;&lt;14)     /* Bits 3:5 of modrm byte extend opcode */</div><div class='ctx'> #define GroupDual   (1&lt;&lt;15)     /* Alternate decoding of mod == 3 */</div><div class='ctx'> #define GroupMask   0xff        /* Group number stored in bits 0:7 */</div><div class='hunk'>@@ -94,7 +96,7 @@ static u16 opcode_table[256] = {</div><div class='ctx'> 	/* 0x20 - 0x27 */</div><div class='ctx'> 	ByteOp | DstMem | SrcReg | ModRM, DstMem | SrcReg | ModRM,</div><div class='ctx'> 	ByteOp | DstReg | SrcMem | ModRM, DstReg | SrcMem | ModRM,</div><div class='del'>-	SrcImmByte, SrcImm, 0, 0,</div><div class='add'>+	DstAcc | SrcImmByte, DstAcc | SrcImm, 0, 0,</div><div class='ctx'> 	/* 0x28 - 0x2F */</div><div class='ctx'> 	ByteOp | DstMem | SrcReg | ModRM, DstMem | SrcReg | ModRM,</div><div class='ctx'> 	ByteOp | DstReg | SrcMem | ModRM, DstReg | SrcMem | ModRM,</div><div class='hunk'>@@ -106,7 +108,8 @@ static u16 opcode_table[256] = {</div><div class='ctx'> 	/* 0x38 - 0x3F */</div><div class='ctx'> 	ByteOp | DstMem | SrcReg | ModRM, DstMem | SrcReg | ModRM,</div><div class='ctx'> 	ByteOp | DstReg | SrcMem | ModRM, DstReg | SrcMem | ModRM,</div><div class='del'>-	0, 0, 0, 0,</div><div class='add'>+	ByteOp | DstAcc | SrcImm, DstAcc | SrcImm,</div><div class='add'>+	0, 0,</div><div class='ctx'> 	/* 0x40 - 0x47 */</div><div class='ctx'> 	DstReg, DstReg, DstReg, DstReg, DstReg, DstReg, DstReg, DstReg,</div><div class='ctx'> 	/* 0x48 - 0x4F */</div><div class='hunk'>@@ -153,9 +156,16 @@ static u16 opcode_table[256] = {</div><div class='ctx'> 	0, 0, ByteOp | ImplicitOps | Mov | String, ImplicitOps | Mov | String,</div><div class='ctx'> 	ByteOp | ImplicitOps | Mov | String, ImplicitOps | Mov | String,</div><div class='ctx'> 	ByteOp | ImplicitOps | String, ImplicitOps | String,</div><div class='del'>-	/* 0xB0 - 0xBF */</div><div class='del'>-	0, 0, 0, 0, 0, 0, 0, 0,</div><div class='del'>-	DstReg | SrcImm | Mov, 0, 0, 0, 0, 0, 0, 0,</div><div class='add'>+	/* 0xB0 - 0xB7 */</div><div class='add'>+	ByteOp | DstReg | SrcImm | Mov, ByteOp | DstReg | SrcImm | Mov,</div><div class='add'>+	ByteOp | DstReg | SrcImm | Mov, ByteOp | DstReg | SrcImm | Mov,</div><div class='add'>+	ByteOp | DstReg | SrcImm | Mov, ByteOp | DstReg | SrcImm | Mov,</div><div class='add'>+	ByteOp | DstReg | SrcImm | Mov, ByteOp | DstReg | SrcImm | Mov,</div><div class='add'>+	/* 0xB8 - 0xBF */</div><div class='add'>+	DstReg | SrcImm | Mov, DstReg | SrcImm | Mov,</div><div class='add'>+	DstReg | SrcImm | Mov, DstReg | SrcImm | Mov,</div><div class='add'>+	DstReg | SrcImm | Mov, DstReg | SrcImm | Mov,</div><div class='add'>+	DstReg | SrcImm | Mov, DstReg | SrcImm | Mov,</div><div class='ctx'> 	/* 0xC0 - 0xC7 */</div><div class='ctx'> 	ByteOp | DstMem | SrcImm | ModRM, DstMem | SrcImmByte | ModRM,</div><div class='ctx'> 	0, ImplicitOps | Stack, 0, 0,</div><div class='hunk'>@@ -169,17 +179,20 @@ static u16 opcode_table[256] = {</div><div class='ctx'> 	/* 0xD8 - 0xDF */</div><div class='ctx'> 	0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 	/* 0xE0 - 0xE7 */</div><div class='del'>-	0, 0, 0, 0, 0, 0, 0, 0,</div><div class='add'>+	0, 0, 0, 0,</div><div class='add'>+	SrcNone | ByteOp | ImplicitOps, SrcNone | ImplicitOps,</div><div class='add'>+	SrcNone | ByteOp | ImplicitOps, SrcNone | ImplicitOps,</div><div class='ctx'> 	/* 0xE8 - 0xEF */</div><div class='ctx'> 	ImplicitOps | Stack, SrcImm | ImplicitOps,</div><div class='ctx'> 	ImplicitOps, SrcImmByte | ImplicitOps,</div><div class='del'>-	0, 0, 0, 0,</div><div class='add'>+	SrcNone | ByteOp | ImplicitOps, SrcNone | ImplicitOps,</div><div class='add'>+	SrcNone | ByteOp | ImplicitOps, SrcNone | ImplicitOps,</div><div class='ctx'> 	/* 0xF0 - 0xF7 */</div><div class='ctx'> 	0, 0, 0, 0,</div><div class='ctx'> 	ImplicitOps, ImplicitOps, Group | Group3_Byte, Group | Group3,</div><div class='ctx'> 	/* 0xF8 - 0xFF */</div><div class='ctx'> 	ImplicitOps, 0, ImplicitOps, ImplicitOps,</div><div class='del'>-	0, 0, Group | Group4, Group | Group5,</div><div class='add'>+	ImplicitOps, ImplicitOps, Group | Group4, Group | Group5,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static u16 twobyte_table[256] = {</div><div class='hunk'>@@ -268,15 +281,16 @@ static u16 group_table[] = {</div><div class='ctx'> 	ByteOp | DstMem | SrcNone | ModRM, ByteOp | DstMem | SrcNone | ModRM,</div><div class='ctx'> 	0, 0, 0, 0,</div><div class='ctx'> 	[Group3*8] =</div><div class='del'>-	DstMem | SrcImm | ModRM | SrcImm, 0,</div><div class='del'>-	DstMem | SrcNone | ModRM, ByteOp | DstMem | SrcNone | ModRM,</div><div class='add'>+	DstMem | SrcImm | ModRM, 0,</div><div class='add'>+	DstMem | SrcNone | ModRM, DstMem | SrcNone | ModRM,</div><div class='ctx'> 	0, 0, 0, 0,</div><div class='ctx'> 	[Group4*8] =</div><div class='ctx'> 	ByteOp | DstMem | SrcNone | ModRM, ByteOp | DstMem | SrcNone | ModRM,</div><div class='ctx'> 	0, 0, 0, 0, 0, 0,</div><div class='ctx'> 	[Group5*8] =</div><div class='del'>-	DstMem | SrcNone | ModRM, DstMem | SrcNone | ModRM, 0, 0,</div><div class='del'>-	SrcMem | ModRM, 0, SrcMem | ModRM | Stack, 0,</div><div class='add'>+	DstMem | SrcNone | ModRM, DstMem | SrcNone | ModRM,</div><div class='add'>+	SrcMem | ModRM | Stack, 0,</div><div class='add'>+	SrcMem | ModRM | Stack, 0, SrcMem | ModRM | Stack, 0,</div><div class='ctx'> 	[Group7*8] =</div><div class='ctx'> 	0, 0, ModRM | SrcMem, ModRM | SrcMem,</div><div class='ctx'> 	SrcNone | ModRM | DstMem | Mov, 0,</div><div class='hunk'>@@ -839,7 +853,7 @@ x86_decode_insn(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops)</div><div class='ctx'> 	/* Shadow copy of register state. Committed on successful emulation. */</div><div class='ctx'> </div><div class='ctx'> 	memset(c, 0, sizeof(struct decode_cache));</div><div class='del'>-	c-&gt;eip = ctxt-&gt;vcpu-&gt;arch.rip;</div><div class='add'>+	c-&gt;eip = kvm_rip_read(ctxt-&gt;vcpu);</div><div class='ctx'> 	ctxt-&gt;cs_base = seg_base(ctxt, VCPU_SREG_CS);</div><div class='ctx'> 	memcpy(c-&gt;regs, ctxt-&gt;vcpu-&gt;arch.regs, sizeof c-&gt;regs);</div><div class='ctx'> </div><div class='hunk'>@@ -1048,6 +1062,23 @@ done_prefixes:</div><div class='ctx'> 		}</div><div class='ctx'> 		c-&gt;dst.type = OP_MEM;</div><div class='ctx'> 		break;</div><div class='add'>+	case DstAcc:</div><div class='add'>+		c-&gt;dst.type = OP_REG;</div><div class='add'>+		c-&gt;dst.bytes = c-&gt;op_bytes;</div><div class='add'>+		c-&gt;dst.ptr = &amp;c-&gt;regs[VCPU_REGS_RAX];</div><div class='add'>+		switch (c-&gt;op_bytes) {</div><div class='add'>+			case 1:</div><div class='add'>+				c-&gt;dst.val = *(u8 *)c-&gt;dst.ptr;</div><div class='add'>+				break;</div><div class='add'>+			case 2:</div><div class='add'>+				c-&gt;dst.val = *(u16 *)c-&gt;dst.ptr;</div><div class='add'>+				break;</div><div class='add'>+			case 4:</div><div class='add'>+				c-&gt;dst.val = *(u32 *)c-&gt;dst.ptr;</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+		c-&gt;dst.orig_val = c-&gt;dst.val;</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (c-&gt;rip_relative)</div><div class='hunk'>@@ -1151,6 +1182,14 @@ static inline int emulate_grp45(struct x86_emulate_ctxt *ctxt,</div><div class='ctx'> 	case 1:	/* dec */</div><div class='ctx'> 		emulate_1op("dec", c-&gt;dst, ctxt-&gt;eflags);</div><div class='ctx'> 		break;</div><div class='add'>+	case 2: /* call near abs */ {</div><div class='add'>+		long int old_eip;</div><div class='add'>+		old_eip = c-&gt;eip;</div><div class='add'>+		c-&gt;eip = c-&gt;src.val;</div><div class='add'>+		c-&gt;src.val = old_eip;</div><div class='add'>+		emulate_push(ctxt);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> 	case 4: /* jmp abs */</div><div class='ctx'> 		c-&gt;eip = c-&gt;src.val;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1251,6 +1290,8 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops)</div><div class='ctx'> 	u64 msr_data;</div><div class='ctx'> 	unsigned long saved_eip = 0;</div><div class='ctx'> 	struct decode_cache *c = &amp;ctxt-&gt;decode;</div><div class='add'>+	unsigned int port;</div><div class='add'>+	int io_dir_in;</div><div class='ctx'> 	int rc = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Shadow copy of register state. Committed on successful emulation.</div><div class='hunk'>@@ -1267,7 +1308,7 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops)</div><div class='ctx'> 	if (c-&gt;rep_prefix &amp;&amp; (c-&gt;d &amp; String)) {</div><div class='ctx'> 		/* All REP prefixes have the same first termination condition */</div><div class='ctx'> 		if (c-&gt;regs[VCPU_REGS_RCX] == 0) {</div><div class='del'>-			ctxt-&gt;vcpu-&gt;arch.rip = c-&gt;eip;</div><div class='add'>+			kvm_rip_write(ctxt-&gt;vcpu, c-&gt;eip);</div><div class='ctx'> 			goto done;</div><div class='ctx'> 		}</div><div class='ctx'> 		/* The second termination condition only applies for REPE</div><div class='hunk'>@@ -1281,17 +1322,17 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops)</div><div class='ctx'> 				(c-&gt;b == 0xae) || (c-&gt;b == 0xaf)) {</div><div class='ctx'> 			if ((c-&gt;rep_prefix == REPE_PREFIX) &amp;&amp;</div><div class='ctx'> 				((ctxt-&gt;eflags &amp; EFLG_ZF) == 0)) {</div><div class='del'>-					ctxt-&gt;vcpu-&gt;arch.rip = c-&gt;eip;</div><div class='add'>+					kvm_rip_write(ctxt-&gt;vcpu, c-&gt;eip);</div><div class='ctx'> 					goto done;</div><div class='ctx'> 			}</div><div class='ctx'> 			if ((c-&gt;rep_prefix == REPNE_PREFIX) &amp;&amp;</div><div class='ctx'> 				((ctxt-&gt;eflags &amp; EFLG_ZF) == EFLG_ZF)) {</div><div class='del'>-				ctxt-&gt;vcpu-&gt;arch.rip = c-&gt;eip;</div><div class='add'>+				kvm_rip_write(ctxt-&gt;vcpu, c-&gt;eip);</div><div class='ctx'> 				goto done;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		c-&gt;regs[VCPU_REGS_RCX]--;</div><div class='del'>-		c-&gt;eip = ctxt-&gt;vcpu-&gt;arch.rip;</div><div class='add'>+		c-&gt;eip = kvm_rip_read(ctxt-&gt;vcpu);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (c-&gt;src.type == OP_MEM) {</div><div class='hunk'>@@ -1351,27 +1392,10 @@ special_insn:</div><div class='ctx'> 	      sbb:		/* sbb */</div><div class='ctx'> 		emulate_2op_SrcV("sbb", c-&gt;src, c-&gt;dst, ctxt-&gt;eflags);</div><div class='ctx'> 		break;</div><div class='del'>-	case 0x20 ... 0x23:</div><div class='add'>+	case 0x20 ... 0x25:</div><div class='ctx'> 	      and:		/* and */</div><div class='ctx'> 		emulate_2op_SrcV("and", c-&gt;src, c-&gt;dst, ctxt-&gt;eflags);</div><div class='ctx'> 		break;</div><div class='del'>-	case 0x24:              /* and al imm8 */</div><div class='del'>-		c-&gt;dst.type = OP_REG;</div><div class='del'>-		c-&gt;dst.ptr = &amp;c-&gt;regs[VCPU_REGS_RAX];</div><div class='del'>-		c-&gt;dst.val = *(u8 *)c-&gt;dst.ptr;</div><div class='del'>-		c-&gt;dst.bytes = 1;</div><div class='del'>-		c-&gt;dst.orig_val = c-&gt;dst.val;</div><div class='del'>-		goto and;</div><div class='del'>-	case 0x25:              /* and ax imm16, or eax imm32 */</div><div class='del'>-		c-&gt;dst.type = OP_REG;</div><div class='del'>-		c-&gt;dst.bytes = c-&gt;op_bytes;</div><div class='del'>-		c-&gt;dst.ptr = &amp;c-&gt;regs[VCPU_REGS_RAX];</div><div class='del'>-		if (c-&gt;op_bytes == 2)</div><div class='del'>-			c-&gt;dst.val = *(u16 *)c-&gt;dst.ptr;</div><div class='del'>-		else</div><div class='del'>-			c-&gt;dst.val = *(u32 *)c-&gt;dst.ptr;</div><div class='del'>-		c-&gt;dst.orig_val = c-&gt;dst.val;</div><div class='del'>-		goto and;</div><div class='ctx'> 	case 0x28 ... 0x2d:</div><div class='ctx'> 	      sub:		/* sub */</div><div class='ctx'> 		emulate_2op_SrcV("sub", c-&gt;src, c-&gt;dst, ctxt-&gt;eflags);</div><div class='hunk'>@@ -1659,7 +1683,7 @@ special_insn:</div><div class='ctx'> 	case 0xae ... 0xaf:	/* scas */</div><div class='ctx'> 		DPRINTF("Urk! I don't handle SCAS.\n");</div><div class='ctx'> 		goto cannot_emulate;</div><div class='del'>-	case 0xb8: /* mov r, imm */</div><div class='add'>+	case 0xb0 ... 0xbf: /* mov r, imm */</div><div class='ctx'> 		goto mov;</div><div class='ctx'> 	case 0xc0 ... 0xc1:</div><div class='ctx'> 		emulate_grp2(ctxt);</div><div class='hunk'>@@ -1679,6 +1703,16 @@ special_insn:</div><div class='ctx'> 		c-&gt;src.val = c-&gt;regs[VCPU_REGS_RCX];</div><div class='ctx'> 		emulate_grp2(ctxt);</div><div class='ctx'> 		break;</div><div class='add'>+	case 0xe4: 	/* inb */</div><div class='add'>+	case 0xe5: 	/* in */</div><div class='add'>+		port = insn_fetch(u8, 1, c-&gt;eip);</div><div class='add'>+		io_dir_in = 1;</div><div class='add'>+		goto do_io;</div><div class='add'>+	case 0xe6: /* outb */</div><div class='add'>+	case 0xe7: /* out */</div><div class='add'>+		port = insn_fetch(u8, 1, c-&gt;eip);</div><div class='add'>+		io_dir_in = 0;</div><div class='add'>+		goto do_io;</div><div class='ctx'> 	case 0xe8: /* call (near) */ {</div><div class='ctx'> 		long int rel;</div><div class='ctx'> 		switch (c-&gt;op_bytes) {</div><div class='hunk'>@@ -1729,6 +1763,22 @@ special_insn:</div><div class='ctx'> 		jmp_rel(c, c-&gt;src.val);</div><div class='ctx'> 		c-&gt;dst.type = OP_NONE; /* Disable writeback. */</div><div class='ctx'> 		break;</div><div class='add'>+	case 0xec: /* in al,dx */</div><div class='add'>+	case 0xed: /* in (e/r)ax,dx */</div><div class='add'>+		port = c-&gt;regs[VCPU_REGS_RDX];</div><div class='add'>+		io_dir_in = 1;</div><div class='add'>+		goto do_io;</div><div class='add'>+	case 0xee: /* out al,dx */</div><div class='add'>+	case 0xef: /* out (e/r)ax,dx */</div><div class='add'>+		port = c-&gt;regs[VCPU_REGS_RDX];</div><div class='add'>+		io_dir_in = 0;</div><div class='add'>+	do_io:	if (kvm_emulate_pio(ctxt-&gt;vcpu, NULL, io_dir_in,</div><div class='add'>+				   (c-&gt;d &amp; ByteOp) ? 1 : c-&gt;op_bytes,</div><div class='add'>+				   port) != 0) {</div><div class='add'>+			c-&gt;eip = saved_eip;</div><div class='add'>+			goto cannot_emulate;</div><div class='add'>+		}</div><div class='add'>+		return 0;</div><div class='ctx'> 	case 0xf4:              /* hlt */</div><div class='ctx'> 		ctxt-&gt;vcpu-&gt;arch.halt_request = 1;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1754,6 +1804,14 @@ special_insn:</div><div class='ctx'> 		ctxt-&gt;eflags |= X86_EFLAGS_IF;</div><div class='ctx'> 		c-&gt;dst.type = OP_NONE;	/* Disable writeback. */</div><div class='ctx'> 		break;</div><div class='add'>+	case 0xfc: /* cld */</div><div class='add'>+		ctxt-&gt;eflags &amp;= ~EFLG_DF;</div><div class='add'>+		c-&gt;dst.type = OP_NONE;	/* Disable writeback. */</div><div class='add'>+		break;</div><div class='add'>+	case 0xfd: /* std */</div><div class='add'>+		ctxt-&gt;eflags |= EFLG_DF;</div><div class='add'>+		c-&gt;dst.type = OP_NONE;	/* Disable writeback. */</div><div class='add'>+		break;</div><div class='ctx'> 	case 0xfe ... 0xff:	/* Grp4/Grp5 */</div><div class='ctx'> 		rc = emulate_grp45(ctxt, ops);</div><div class='ctx'> 		if (rc != 0)</div><div class='hunk'>@@ -1768,7 +1826,7 @@ writeback:</div><div class='ctx'> </div><div class='ctx'> 	/* Commit shadow register state. */</div><div class='ctx'> 	memcpy(ctxt-&gt;vcpu-&gt;arch.regs, c-&gt;regs, sizeof c-&gt;regs);</div><div class='del'>-	ctxt-&gt;vcpu-&gt;arch.rip = c-&gt;eip;</div><div class='add'>+	kvm_rip_write(ctxt-&gt;vcpu, c-&gt;eip);</div><div class='ctx'> </div><div class='ctx'> done:</div><div class='ctx'> 	if (rc == X86EMUL_UNHANDLEABLE) {</div><div class='hunk'>@@ -1793,7 +1851,7 @@ twobyte_insn:</div><div class='ctx'> 				goto done;</div><div class='ctx'> </div><div class='ctx'> 			/* Let the processor re-execute the fixed hypercall */</div><div class='del'>-			c-&gt;eip = ctxt-&gt;vcpu-&gt;arch.rip;</div><div class='add'>+			c-&gt;eip = kvm_rip_read(ctxt-&gt;vcpu);</div><div class='ctx'> 			/* Disable writeback. */</div><div class='ctx'> 			c-&gt;dst.type = OP_NONE;</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -1889,7 +1947,7 @@ twobyte_insn:</div><div class='ctx'> 		rc = kvm_set_msr(ctxt-&gt;vcpu, c-&gt;regs[VCPU_REGS_RCX], msr_data);</div><div class='ctx'> 		if (rc) {</div><div class='ctx'> 			kvm_inject_gp(ctxt-&gt;vcpu, 0);</div><div class='del'>-			c-&gt;eip = ctxt-&gt;vcpu-&gt;arch.rip;</div><div class='add'>+			c-&gt;eip = kvm_rip_read(ctxt-&gt;vcpu);</div><div class='ctx'> 		}</div><div class='ctx'> 		rc = X86EMUL_CONTINUE;</div><div class='ctx'> 		c-&gt;dst.type = OP_NONE;</div><div class='hunk'>@@ -1899,7 +1957,7 @@ twobyte_insn:</div><div class='ctx'> 		rc = kvm_get_msr(ctxt-&gt;vcpu, c-&gt;regs[VCPU_REGS_RCX], &amp;msr_data);</div><div class='ctx'> 		if (rc) {</div><div class='ctx'> 			kvm_inject_gp(ctxt-&gt;vcpu, 0);</div><div class='del'>-			c-&gt;eip = ctxt-&gt;vcpu-&gt;arch.rip;</div><div class='add'>+			c-&gt;eip = kvm_rip_read(ctxt-&gt;vcpu);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			c-&gt;regs[VCPU_REGS_RAX] = (u32)msr_data;</div><div class='ctx'> 			c-&gt;regs[VCPU_REGS_RDX] = msr_data &gt;&gt; 32;</div><div class='head'>diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c<br/>index d9249a882aa5..65f0b8a47bed 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/lguest/boot.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/lguest/boot.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/lguest/boot.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/lguest/boot.c</a></div><div class='hunk'>@@ -55,6 +55,7 @@</div><div class='ctx'> #include &lt;linux/lguest_launcher.h&gt;</div><div class='ctx'> #include &lt;linux/virtio_console.h&gt;</div><div class='ctx'> #include &lt;linux/pm.h&gt;</div><div class='add'>+#include &lt;asm/apic.h&gt;</div><div class='ctx'> #include &lt;asm/lguest.h&gt;</div><div class='ctx'> #include &lt;asm/paravirt.h&gt;</div><div class='ctx'> #include &lt;asm/param.h&gt;</div><div class='hunk'>@@ -783,14 +784,44 @@ static void lguest_wbinvd(void)</div><div class='ctx'>  * code qualifies for Advanced.  It will also never interrupt anything.  It</div><div class='ctx'>  * does, however, allow us to get through the Linux boot code. */</div><div class='ctx'> #ifdef CONFIG_X86_LOCAL_APIC</div><div class='del'>-static void lguest_apic_write(unsigned long reg, u32 v)</div><div class='add'>+static void lguest_apic_write(u32 reg, u32 v)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 lguest_apic_read(unsigned long reg)</div><div class='add'>+static u32 lguest_apic_read(u32 reg)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static u64 lguest_apic_icr_read(void)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void lguest_apic_icr_write(u32 low, u32 id)</div><div class='add'>+{</div><div class='add'>+	/* Warn to see if there's any stray references */</div><div class='add'>+	WARN_ON(1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void lguest_apic_wait_icr_idle(void)</div><div class='add'>+{</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 lguest_apic_safe_wait_icr_idle(void)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct apic_ops lguest_basic_apic_ops = {</div><div class='add'>+	.read = lguest_apic_read,</div><div class='add'>+	.write = lguest_apic_write,</div><div class='add'>+	.icr_read = lguest_apic_icr_read,</div><div class='add'>+	.icr_write = lguest_apic_icr_write,</div><div class='add'>+	.wait_icr_idle = lguest_apic_wait_icr_idle,</div><div class='add'>+	.safe_wait_icr_idle = lguest_apic_safe_wait_icr_idle,</div><div class='add'>+};</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* STOP!  Until an interrupt comes in. */</div><div class='hunk'>@@ -990,8 +1021,7 @@ __init void lguest_init(void)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_X86_LOCAL_APIC</div><div class='ctx'> 	/* apic read/write intercepts */</div><div class='del'>-	pv_apic_ops.apic_write = lguest_apic_write;</div><div class='del'>-	pv_apic_ops.apic_read = lguest_apic_read;</div><div class='add'>+	apic_ops = &amp;lguest_basic_apic_ops;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	/* time operations */</div><div class='head'>diff --git a/arch/x86/lib/Makefile b/arch/x86/lib/Makefile<br/>index aa3fa4119424..55e11aa6d66c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/lib/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/lib/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/lib/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/lib/Makefile</a></div><div class='hunk'>@@ -17,9 +17,6 @@ ifeq ($(CONFIG_X86_32),y)</div><div class='ctx'>         lib-$(CONFIG_X86_USE_3DNOW) += mmx_32.o</div><div class='ctx'> else</div><div class='ctx'>         obj-y += io_64.o iomap_copy_64.o</div><div class='del'>-</div><div class='del'>-        CFLAGS_csum-partial_64.o := -funroll-loops</div><div class='del'>-</div><div class='ctx'>         lib-y += csum-partial_64.o csum-copy_64.o csum-wrappers_64.o</div><div class='ctx'>         lib-y += thunk_64.o clear_page_64.o copy_page_64.o</div><div class='ctx'>         lib-y += memmove_64.o memset_64.o</div><div class='head'>diff --git a/arch/x86/lib/msr-on-cpu.c b/arch/x86/lib/msr-on-cpu.c<br/>index 01b868ba82f8..321cf720dbb6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/lib/msr-on-cpu.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/lib/msr-on-cpu.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/lib/msr-on-cpu.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/lib/msr-on-cpu.c</a></div><div class='hunk'>@@ -16,37 +16,46 @@ static void __rdmsr_on_cpu(void *info)</div><div class='ctx'> 	rdmsr(rv-&gt;msr_no, rv-&gt;l, rv-&gt;h);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __rdmsr_safe_on_cpu(void *info)</div><div class='add'>+static void __wrmsr_on_cpu(void *info)</div><div class='ctx'> {</div><div class='ctx'> 	struct msr_info *rv = info;</div><div class='ctx'> </div><div class='del'>-	rv-&gt;err = rdmsr_safe(rv-&gt;msr_no, &amp;rv-&gt;l, &amp;rv-&gt;h);</div><div class='add'>+	wrmsr(rv-&gt;msr_no, rv-&gt;l, rv-&gt;h);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int _rdmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 *l, u32 *h, int safe)</div><div class='add'>+int rdmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 *l, u32 *h)</div><div class='ctx'> {</div><div class='del'>-	int err = 0;</div><div class='add'>+	int err;</div><div class='ctx'> 	struct msr_info rv;</div><div class='ctx'> </div><div class='ctx'> 	rv.msr_no = msr_no;</div><div class='del'>-	if (safe) {</div><div class='del'>-		err = smp_call_function_single(cpu, __rdmsr_safe_on_cpu,</div><div class='del'>-					       &amp;rv, 1);</div><div class='del'>-		err = err ? err : rv.err;</div><div class='del'>-	} else {</div><div class='del'>-		err = smp_call_function_single(cpu, __rdmsr_on_cpu, &amp;rv, 1);</div><div class='del'>-	}</div><div class='add'>+	err = smp_call_function_single(cpu, __rdmsr_on_cpu, &amp;rv, 1);</div><div class='ctx'> 	*l = rv.l;</div><div class='ctx'> 	*h = rv.h;</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __wrmsr_on_cpu(void *info)</div><div class='add'>+int wrmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	struct msr_info rv;</div><div class='add'>+</div><div class='add'>+	rv.msr_no = msr_no;</div><div class='add'>+	rv.l = l;</div><div class='add'>+	rv.h = h;</div><div class='add'>+	err = smp_call_function_single(cpu, __wrmsr_on_cpu, &amp;rv, 1);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* These "safe" variants are slower and should be used when the target MSR</div><div class='add'>+   may not actually exist. */</div><div class='add'>+static void __rdmsr_safe_on_cpu(void *info)</div><div class='ctx'> {</div><div class='ctx'> 	struct msr_info *rv = info;</div><div class='ctx'> </div><div class='del'>-	wrmsr(rv-&gt;msr_no, rv-&gt;l, rv-&gt;h);</div><div class='add'>+	rv-&gt;err = rdmsr_safe(rv-&gt;msr_no, &amp;rv-&gt;l, &amp;rv-&gt;h);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __wrmsr_safe_on_cpu(void *info)</div><div class='hunk'>@@ -56,45 +65,30 @@ static void __wrmsr_safe_on_cpu(void *info)</div><div class='ctx'> 	rv-&gt;err = wrmsr_safe(rv-&gt;msr_no, rv-&gt;l, rv-&gt;h);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int _wrmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h, int safe)</div><div class='add'>+int rdmsr_safe_on_cpu(unsigned int cpu, u32 msr_no, u32 *l, u32 *h)</div><div class='ctx'> {</div><div class='del'>-	int err = 0;</div><div class='add'>+	int err;</div><div class='ctx'> 	struct msr_info rv;</div><div class='ctx'> </div><div class='ctx'> 	rv.msr_no = msr_no;</div><div class='del'>-	rv.l = l;</div><div class='del'>-	rv.h = h;</div><div class='del'>-	if (safe) {</div><div class='del'>-		err = smp_call_function_single(cpu, __wrmsr_safe_on_cpu,</div><div class='del'>-					       &amp;rv, 1);</div><div class='del'>-		err = err ? err : rv.err;</div><div class='del'>-	} else {</div><div class='del'>-		err = smp_call_function_single(cpu, __wrmsr_on_cpu, &amp;rv, 1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='add'>+	err = smp_call_function_single(cpu, __rdmsr_safe_on_cpu, &amp;rv, 1);</div><div class='add'>+	*l = rv.l;</div><div class='add'>+	*h = rv.h;</div><div class='ctx'> </div><div class='del'>-int wrmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h)</div><div class='del'>-{</div><div class='del'>-	return _wrmsr_on_cpu(cpu, msr_no, l, h, 0);</div><div class='add'>+	return err ? err : rv.err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int rdmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 *l, u32 *h)</div><div class='del'>-{</div><div class='del'>-	return _rdmsr_on_cpu(cpu, msr_no, l, h, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* These "safe" variants are slower and should be used when the target MSR</div><div class='del'>-   may not actually exist. */</div><div class='ctx'> int wrmsr_safe_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h)</div><div class='ctx'> {</div><div class='del'>-	return _wrmsr_on_cpu(cpu, msr_no, l, h, 1);</div><div class='del'>-}</div><div class='add'>+	int err;</div><div class='add'>+	struct msr_info rv;</div><div class='ctx'> </div><div class='del'>-int rdmsr_safe_on_cpu(unsigned int cpu, u32 msr_no, u32 *l, u32 *h)</div><div class='del'>-{</div><div class='del'>-	return _rdmsr_on_cpu(cpu, msr_no, l, h, 1);</div><div class='add'>+	rv.msr_no = msr_no;</div><div class='add'>+	rv.l = l;</div><div class='add'>+	rv.h = h;</div><div class='add'>+	err = smp_call_function_single(cpu, __wrmsr_safe_on_cpu, &amp;rv, 1);</div><div class='add'>+</div><div class='add'>+	return err ? err : rv.err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(rdmsr_on_cpu);</div><div class='head'>diff --git a/arch/x86/lib/string_32.c b/arch/x86/lib/string_32.c<br/>index 94972e7c094d..82004d2bf05e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/lib/string_32.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/lib/string_32.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/lib/string_32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/lib/string_32.c</a></div><div class='hunk'>@@ -22,7 +22,7 @@ char *strcpy(char *dest, const char *src)</div><div class='ctx'> 		"testb %%al,%%al\n\t"</div><div class='ctx'> 		"jne 1b"</div><div class='ctx'> 		: "=&amp;S" (d0), "=&amp;D" (d1), "=&amp;a" (d2)</div><div class='del'>-		:"0" (src), "1" (dest) : "memory");</div><div class='add'>+		: "0" (src), "1" (dest) : "memory");</div><div class='ctx'> 	return dest;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(strcpy);</div><div class='hunk'>@@ -42,7 +42,7 @@ char *strncpy(char *dest, const char *src, size_t count)</div><div class='ctx'> 		"stosb\n"</div><div class='ctx'> 		"2:"</div><div class='ctx'> 		: "=&amp;S" (d0), "=&amp;D" (d1), "=&amp;c" (d2), "=&amp;a" (d3)</div><div class='del'>-		:"0" (src), "1" (dest), "2" (count) : "memory");</div><div class='add'>+		: "0" (src), "1" (dest), "2" (count) : "memory");</div><div class='ctx'> 	return dest;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(strncpy);</div><div class='hunk'>@@ -60,7 +60,7 @@ char *strcat(char *dest, const char *src)</div><div class='ctx'> 		"testb %%al,%%al\n\t"</div><div class='ctx'> 		"jne 1b"</div><div class='ctx'> 		: "=&amp;S" (d0), "=&amp;D" (d1), "=&amp;a" (d2), "=&amp;c" (d3)</div><div class='del'>-		: "0" (src), "1" (dest), "2" (0), "3" (0xffffffffu): "memory");</div><div class='add'>+		: "0" (src), "1" (dest), "2" (0), "3" (0xffffffffu) : "memory");</div><div class='ctx'> 	return dest;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(strcat);</div><div class='hunk'>@@ -105,9 +105,9 @@ int strcmp(const char *cs, const char *ct)</div><div class='ctx'> 		"2:\tsbbl %%eax,%%eax\n\t"</div><div class='ctx'> 		"orb $1,%%al\n"</div><div class='ctx'> 		"3:"</div><div class='del'>-		:"=a" (res), "=&amp;S" (d0), "=&amp;D" (d1)</div><div class='del'>-		:"1" (cs), "2" (ct)</div><div class='del'>-		:"memory");</div><div class='add'>+		: "=a" (res), "=&amp;S" (d0), "=&amp;D" (d1)</div><div class='add'>+		: "1" (cs), "2" (ct)</div><div class='add'>+		: "memory");</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(strcmp);</div><div class='hunk'>@@ -130,9 +130,9 @@ int strncmp(const char *cs, const char *ct, size_t count)</div><div class='ctx'> 		"3:\tsbbl %%eax,%%eax\n\t"</div><div class='ctx'> 		"orb $1,%%al\n"</div><div class='ctx'> 		"4:"</div><div class='del'>-		:"=a" (res), "=&amp;S" (d0), "=&amp;D" (d1), "=&amp;c" (d2)</div><div class='del'>-		:"1" (cs), "2" (ct), "3" (count)</div><div class='del'>-		:"memory");</div><div class='add'>+		: "=a" (res), "=&amp;S" (d0), "=&amp;D" (d1), "=&amp;c" (d2)</div><div class='add'>+		: "1" (cs), "2" (ct), "3" (count)</div><div class='add'>+		: "memory");</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(strncmp);</div><div class='hunk'>@@ -152,9 +152,9 @@ char *strchr(const char *s, int c)</div><div class='ctx'> 		"movl $1,%1\n"</div><div class='ctx'> 		"2:\tmovl %1,%0\n\t"</div><div class='ctx'> 		"decl %0"</div><div class='del'>-		:"=a" (res), "=&amp;S" (d0)</div><div class='del'>-		:"1" (s), "0" (c)</div><div class='del'>-		:"memory");</div><div class='add'>+		: "=a" (res), "=&amp;S" (d0)</div><div class='add'>+		: "1" (s), "0" (c)</div><div class='add'>+		: "memory");</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(strchr);</div><div class='hunk'>@@ -169,9 +169,9 @@ size_t strlen(const char *s)</div><div class='ctx'> 		"scasb\n\t"</div><div class='ctx'> 		"notl %0\n\t"</div><div class='ctx'> 		"decl %0"</div><div class='del'>-		:"=c" (res), "=&amp;D" (d0)</div><div class='del'>-		:"1" (s), "a" (0), "0" (0xffffffffu)</div><div class='del'>-		:"memory");</div><div class='add'>+		: "=c" (res), "=&amp;D" (d0)</div><div class='add'>+		: "1" (s), "a" (0), "0" (0xffffffffu)</div><div class='add'>+		: "memory");</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(strlen);</div><div class='hunk'>@@ -189,9 +189,9 @@ void *memchr(const void *cs, int c, size_t count)</div><div class='ctx'> 		"je 1f\n\t"</div><div class='ctx'> 		"movl $1,%0\n"</div><div class='ctx'> 		"1:\tdecl %0"</div><div class='del'>-		:"=D" (res), "=&amp;c" (d0)</div><div class='del'>-		:"a" (c), "0" (cs), "1" (count)</div><div class='del'>-		:"memory");</div><div class='add'>+		: "=D" (res), "=&amp;c" (d0)</div><div class='add'>+		: "a" (c), "0" (cs), "1" (count)</div><div class='add'>+		: "memory");</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(memchr);</div><div class='hunk'>@@ -228,9 +228,9 @@ size_t strnlen(const char *s, size_t count)</div><div class='ctx'> 		"cmpl $-1,%1\n\t"</div><div class='ctx'> 		"jne 1b\n"</div><div class='ctx'> 		"3:\tsubl %2,%0"</div><div class='del'>-		:"=a" (res), "=&amp;d" (d0)</div><div class='del'>-		:"c" (s), "1" (count)</div><div class='del'>-		:"memory");</div><div class='add'>+		: "=a" (res), "=&amp;d" (d0)</div><div class='add'>+		: "c" (s), "1" (count)</div><div class='add'>+		: "memory");</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(strnlen);</div><div class='head'>diff --git a/arch/x86/lib/strstr_32.c b/arch/x86/lib/strstr_32.c<br/>index 42e8a50303f3..8e2d55f754bf 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/lib/strstr_32.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/lib/strstr_32.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/lib/strstr_32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/lib/strstr_32.c</a></div><div class='hunk'>@@ -23,9 +23,9 @@ __asm__ __volatile__(</div><div class='ctx'> 	"jne 1b\n\t"</div><div class='ctx'> 	"xorl %%eax,%%eax\n\t"</div><div class='ctx'> 	"2:"</div><div class='del'>-	:"=a" (__res), "=&amp;c" (d0), "=&amp;S" (d1)</div><div class='del'>-	:"0" (0), "1" (0xffffffff), "2" (cs), "g" (ct)</div><div class='del'>-	:"dx", "di");</div><div class='add'>+	: "=a" (__res), "=&amp;c" (d0), "=&amp;S" (d1)</div><div class='add'>+	: "0" (0), "1" (0xffffffff), "2" (cs), "g" (ct)</div><div class='add'>+	: "dx", "di");</div><div class='ctx'> return __res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/lib/usercopy_32.c b/arch/x86/lib/usercopy_32.c<br/>index 24e60944971a..9e68075544f6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/lib/usercopy_32.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/lib/usercopy_32.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/lib/usercopy_32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/lib/usercopy_32.c</a></div><div class='hunk'>@@ -14,6 +14,13 @@</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/mmx.h&gt;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_X86_INTEL_USERCOPY</div><div class='add'>+/*</div><div class='add'>+ * Alignment at which movsl is preferred for bulk memory copies.</div><div class='add'>+ */</div><div class='add'>+struct movsl_mask movsl_mask __read_mostly;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static inline int __movsl_is_ok(unsigned long a1, unsigned long a2, unsigned long n)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_X86_INTEL_USERCOPY</div><div class='head'>diff --git a/arch/x86/mach-default/setup.c b/arch/x86/mach-default/setup.c<br/>index 3d317836be9e..37b9ae4d44c5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/mach-default/setup.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/mach-default/setup.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/mach-default/setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/mach-default/setup.c</a></div><div class='hunk'>@@ -10,13 +10,15 @@</div><div class='ctx'> #include &lt;asm/e820.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;mach_ipi.h&gt;</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_HOTPLUG_CPU</div><div class='ctx'> #define DEFAULT_SEND_IPI	(1)</div><div class='ctx'> #else</div><div class='ctx'> #define DEFAULT_SEND_IPI	(0)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-int no_broadcast=DEFAULT_SEND_IPI;</div><div class='add'>+int no_broadcast = DEFAULT_SEND_IPI;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * pre_intr_init_hook - initialisation prior to setting up interrupt vectors</div><div class='hunk'>@@ -36,15 +38,6 @@ void __init pre_intr_init_hook(void)</div><div class='ctx'> 	init_ISA_irqs();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * IRQ2 is cascade interrupt to second interrupt controller</div><div class='del'>- */</div><div class='del'>-static struct irqaction irq2 = {</div><div class='del'>-	.handler = no_action,</div><div class='del'>-	.mask = CPU_MASK_NONE,</div><div class='del'>-	.name = "cascade",</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * intr_init_hook - post gate setup interrupt initialisation</div><div class='ctx'>  *</div><div class='hunk'>@@ -60,12 +53,6 @@ void __init intr_init_hook(void)</div><div class='ctx'> 		if (x86_quirks-&gt;arch_intr_init())</div><div class='ctx'> 			return;</div><div class='ctx'> 	}</div><div class='del'>-#ifdef CONFIG_X86_LOCAL_APIC</div><div class='del'>-	apic_intr_init();</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (!acpi_ioapic)</div><div class='del'>-		setup_irq(2, &amp;irq2);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/arch/x86/mach-es7000/Makefile b/arch/x86/mach-es7000/Makefile<br/>deleted file mode 100644<br/>index 3ef8b43b62fc..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/mach-es7000/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/mach-es7000/Makefile</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,5 +0,0 @@</div><div class='del'>-#</div><div class='del'>-# Makefile for the linux kernel.</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-obj-$(CONFIG_X86_ES7000)	:= es7000plat.o</div><div class='head'>diff --git a/arch/x86/mach-es7000/es7000.h b/arch/x86/mach-es7000/es7000.h<br/>deleted file mode 100644<br/>index c8d5aa132fa0..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/mach-es7000/es7000.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/mach-es7000/es7000.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,114 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Written by: Garry Forsgren, Unisys Corporation</div><div class='del'>- *             Natalie Protasevich, Unisys Corporation</div><div class='del'>- * This file contains the code to configure and interface </div><div class='del'>- * with Unisys ES7000 series hardware system manager.</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2003 Unisys Corporation.  All Rights Reserved.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify it</div><div class='del'>- * under the terms of version 2 of the GNU General Public License as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it would be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License along</div><div class='del'>- * with this program; if not, write the Free Software Foundation, Inc., 59</div><div class='del'>- * Temple Place - Suite 330, Boston MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- * Contact information: Unisys Corporation, Township Line &amp; Union Meeting </div><div class='del'>- * Roads-A, Unisys Way, Blue Bell, Pennsylvania, 19424, or:</div><div class='del'>- *</div><div class='del'>- * http://www.unisys.com</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ES7000 chipsets</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define NON_UNISYS		0</div><div class='del'>-#define ES7000_CLASSIC		1</div><div class='del'>-#define ES7000_ZORRO		2</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define	MIP_REG			1</div><div class='del'>-#define	MIP_PSAI_REG		4</div><div class='del'>-</div><div class='del'>-#define	MIP_BUSY		1</div><div class='del'>-#define	MIP_SPIN		0xf0000</div><div class='del'>-#define	MIP_VALID		0x0100000000000000ULL</div><div class='del'>-#define	MIP_PORT(VALUE)	((VALUE &gt;&gt; 32) &amp; 0xffff)</div><div class='del'>-</div><div class='del'>-#define	MIP_RD_LO(VALUE)	(VALUE &amp; 0xffffffff)   </div><div class='del'>-</div><div class='del'>-struct mip_reg_info {</div><div class='del'>-	unsigned long long mip_info;</div><div class='del'>-	unsigned long long delivery_info;</div><div class='del'>-	unsigned long long host_reg;</div><div class='del'>-	unsigned long long mip_reg;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct part_info {</div><div class='del'>-	unsigned char type;   </div><div class='del'>-	unsigned char length;</div><div class='del'>-	unsigned char part_id;</div><div class='del'>-	unsigned char apic_mode;</div><div class='del'>-	unsigned long snum;    </div><div class='del'>-	char ptype[16];</div><div class='del'>-	char sname[64];</div><div class='del'>-	char pname[64];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct psai {</div><div class='del'>-	unsigned long long entry_type;</div><div class='del'>-	unsigned long long addr;</div><div class='del'>-	unsigned long long bep_addr;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct es7000_mem_info {</div><div class='del'>-	unsigned char type;   </div><div class='del'>-	unsigned char length;</div><div class='del'>-	unsigned char resv[6];</div><div class='del'>-	unsigned long long  start; </div><div class='del'>-	unsigned long long  size; </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct es7000_oem_table {</div><div class='del'>-	unsigned long long hdr;</div><div class='del'>-	struct mip_reg_info mip;</div><div class='del'>-	struct part_info pif;</div><div class='del'>-	struct es7000_mem_info shm;</div><div class='del'>-	struct psai psai;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_ACPI</div><div class='del'>-</div><div class='del'>-struct oem_table {</div><div class='del'>-	struct acpi_table_header Header;</div><div class='del'>-	u32 OEMTableAddr;</div><div class='del'>-	u32 OEMTableSize;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-extern int find_unisys_acpi_oem_table(unsigned long *oem_addr);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-struct mip_reg {</div><div class='del'>-	unsigned long long off_0;</div><div class='del'>-	unsigned long long off_8;</div><div class='del'>-	unsigned long long off_10;</div><div class='del'>-	unsigned long long off_18;</div><div class='del'>-	unsigned long long off_20;</div><div class='del'>-	unsigned long long off_28;</div><div class='del'>-	unsigned long long off_30;</div><div class='del'>-	unsigned long long off_38;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define	MIP_SW_APIC		0x1020b</div><div class='del'>-#define	MIP_FUNC(VALUE) 	(VALUE &amp; 0xff)</div><div class='del'>-</div><div class='del'>-extern int parse_unisys_oem (char *oemptr);</div><div class='del'>-extern void setup_unisys(void);</div><div class='del'>-extern int es7000_start_cpu(int cpu, unsigned long eip);</div><div class='del'>-extern void es7000_sw_apic(void);</div><div class='head'>diff --git a/arch/x86/mach-generic/Makefile b/arch/x86/mach-generic/Makefile<br/>index 0dbd7803a1d5..6730f4e7c744 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/mach-generic/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/mach-generic/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/mach-generic/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/mach-generic/Makefile</a></div><div class='hunk'>@@ -9,4 +9,3 @@ obj-$(CONFIG_X86_NUMAQ)		+= numaq.o</div><div class='ctx'> obj-$(CONFIG_X86_SUMMIT)	+= summit.o</div><div class='ctx'> obj-$(CONFIG_X86_BIGSMP)	+= bigsmp.o</div><div class='ctx'> obj-$(CONFIG_X86_ES7000)	+= es7000.o</div><div class='del'>-obj-$(CONFIG_X86_ES7000)	+= ../../x86/mach-es7000/</div><div class='head'>diff --git a/arch/x86/mach-generic/bigsmp.c b/arch/x86/mach-generic/bigsmp.c<br/>index 59d771714559..df37fc9d6a26 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/mach-generic/bigsmp.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/mach-generic/bigsmp.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/mach-generic/bigsmp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/mach-generic/bigsmp.c</a></div><div class='hunk'>@@ -5,18 +5,17 @@</div><div class='ctx'> #define APIC_DEFINITION 1</div><div class='ctx'> #include &lt;linux/threads.h&gt;</div><div class='ctx'> #include &lt;linux/cpumask.h&gt;</div><div class='del'>-#include &lt;asm/smp.h&gt;</div><div class='ctx'> #include &lt;asm/mpspec.h&gt;</div><div class='ctx'> #include &lt;asm/genapic.h&gt;</div><div class='ctx'> #include &lt;asm/fixmap.h&gt;</div><div class='ctx'> #include &lt;asm/apicdef.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/dmi.h&gt;</div><div class='del'>-#include &lt;asm/mach-bigsmp/mach_apic.h&gt;</div><div class='del'>-#include &lt;asm/mach-bigsmp/mach_apicdef.h&gt;</div><div class='del'>-#include &lt;asm/mach-bigsmp/mach_ipi.h&gt;</div><div class='add'>+#include &lt;asm/bigsmp/apicdef.h&gt;</div><div class='add'>+#include &lt;linux/smp.h&gt;</div><div class='add'>+#include &lt;asm/bigsmp/apic.h&gt;</div><div class='add'>+#include &lt;asm/bigsmp/ipi.h&gt;</div><div class='ctx'> #include &lt;asm/mach-default/mach_mpparse.h&gt;</div><div class='ctx'> </div><div class='ctx'> static int dmi_bigsmp; /* can be set by dmi scanners */</div><div class='head'>diff --git a/arch/x86/mach-generic/es7000.c b/arch/x86/mach-generic/es7000.c<br/>index 4742626f08c4..6513d41ea21e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/mach-generic/es7000.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/mach-generic/es7000.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/mach-generic/es7000.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/mach-generic/es7000.c</a></div><div class='hunk'>@@ -4,20 +4,19 @@</div><div class='ctx'> #define APIC_DEFINITION 1</div><div class='ctx'> #include &lt;linux/threads.h&gt;</div><div class='ctx'> #include &lt;linux/cpumask.h&gt;</div><div class='del'>-#include &lt;asm/smp.h&gt;</div><div class='ctx'> #include &lt;asm/mpspec.h&gt;</div><div class='ctx'> #include &lt;asm/genapic.h&gt;</div><div class='ctx'> #include &lt;asm/fixmap.h&gt;</div><div class='ctx'> #include &lt;asm/apicdef.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;asm/mach-es7000/mach_apicdef.h&gt;</div><div class='del'>-#include &lt;asm/mach-es7000/mach_apic.h&gt;</div><div class='del'>-#include &lt;asm/mach-es7000/mach_ipi.h&gt;</div><div class='del'>-#include &lt;asm/mach-es7000/mach_mpparse.h&gt;</div><div class='del'>-#include &lt;asm/mach-es7000/mach_wakecpu.h&gt;</div><div class='add'>+#include &lt;asm/es7000/apicdef.h&gt;</div><div class='add'>+#include &lt;linux/smp.h&gt;</div><div class='add'>+#include &lt;asm/es7000/apic.h&gt;</div><div class='add'>+#include &lt;asm/es7000/ipi.h&gt;</div><div class='add'>+#include &lt;asm/es7000/mpparse.h&gt;</div><div class='add'>+#include &lt;asm/es7000/wakecpu.h&gt;</div><div class='ctx'> </div><div class='ctx'> static int probe_es7000(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -48,16 +47,26 @@ static __init int mps_oem_check(struct mp_config_table *mpc, char *oem,</div><div class='ctx'> /* Hook from generic ACPI tables.c */</div><div class='ctx'> static int __init acpi_madt_oem_check(char *oem_id, char *oem_table_id)</div><div class='ctx'> {</div><div class='del'>-	unsigned long oem_addr;</div><div class='add'>+	unsigned long oem_addr = 0;</div><div class='add'>+	int check_dsdt;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	/* check dsdt at first to avoid clear fix_map for oem_addr */</div><div class='add'>+	check_dsdt = es7000_check_dsdt();</div><div class='add'>+</div><div class='ctx'> 	if (!find_unisys_acpi_oem_table(&amp;oem_addr)) {</div><div class='del'>-		if (es7000_check_dsdt())</div><div class='del'>-			return parse_unisys_oem((char *)oem_addr);</div><div class='add'>+		if (check_dsdt)</div><div class='add'>+			ret = parse_unisys_oem((char *)oem_addr);</div><div class='ctx'> 		else {</div><div class='ctx'> 			setup_unisys();</div><div class='del'>-			return 1;</div><div class='add'>+			ret = 1;</div><div class='ctx'> 		}</div><div class='add'>+		/*</div><div class='add'>+		 * we need to unmap it</div><div class='add'>+		 */</div><div class='add'>+		unmap_unisys_acpi_oem_table(oem_addr);</div><div class='ctx'> 	}</div><div class='del'>-	return 0;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='ctx'> static int __init acpi_madt_oem_check(char *oem_id, char *oem_table_id)</div><div class='head'>diff --git a/arch/x86/mach-generic/numaq.c b/arch/x86/mach-generic/numaq.c<br/>index 8091e68764c4..8cf58394975e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/mach-generic/numaq.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/mach-generic/numaq.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/mach-generic/numaq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/mach-generic/numaq.c</a></div><div class='hunk'>@@ -4,7 +4,6 @@</div><div class='ctx'> #define APIC_DEFINITION 1</div><div class='ctx'> #include &lt;linux/threads.h&gt;</div><div class='ctx'> #include &lt;linux/cpumask.h&gt;</div><div class='del'>-#include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;asm/mpspec.h&gt;</div><div class='ctx'> #include &lt;asm/genapic.h&gt;</div><div class='ctx'> #include &lt;asm/fixmap.h&gt;</div><div class='hunk'>@@ -12,11 +11,12 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;asm/mach-numaq/mach_apic.h&gt;</div><div class='del'>-#include &lt;asm/mach-numaq/mach_apicdef.h&gt;</div><div class='del'>-#include &lt;asm/mach-numaq/mach_ipi.h&gt;</div><div class='del'>-#include &lt;asm/mach-numaq/mach_mpparse.h&gt;</div><div class='del'>-#include &lt;asm/mach-numaq/mach_wakecpu.h&gt;</div><div class='add'>+#include &lt;asm/numaq/apicdef.h&gt;</div><div class='add'>+#include &lt;linux/smp.h&gt;</div><div class='add'>+#include &lt;asm/numaq/apic.h&gt;</div><div class='add'>+#include &lt;asm/numaq/ipi.h&gt;</div><div class='add'>+#include &lt;asm/numaq/mpparse.h&gt;</div><div class='add'>+#include &lt;asm/numaq/wakecpu.h&gt;</div><div class='ctx'> #include &lt;asm/numaq.h&gt;</div><div class='ctx'> </div><div class='ctx'> static int mps_oem_check(struct mp_config_table *mpc, char *oem,</div><div class='head'>diff --git a/arch/x86/mach-generic/summit.c b/arch/x86/mach-generic/summit.c<br/>index a97ea0f35b1e..6ad6b67a723d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/mach-generic/summit.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/mach-generic/summit.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/mach-generic/summit.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/mach-generic/summit.c</a></div><div class='hunk'>@@ -4,19 +4,18 @@</div><div class='ctx'> #define APIC_DEFINITION 1</div><div class='ctx'> #include &lt;linux/threads.h&gt;</div><div class='ctx'> #include &lt;linux/cpumask.h&gt;</div><div class='del'>-#include &lt;asm/smp.h&gt;</div><div class='ctx'> #include &lt;asm/mpspec.h&gt;</div><div class='ctx'> #include &lt;asm/genapic.h&gt;</div><div class='ctx'> #include &lt;asm/fixmap.h&gt;</div><div class='ctx'> #include &lt;asm/apicdef.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;asm/mach-summit/mach_apic.h&gt;</div><div class='del'>-#include &lt;asm/mach-summit/mach_apicdef.h&gt;</div><div class='del'>-#include &lt;asm/mach-summit/mach_ipi.h&gt;</div><div class='del'>-#include &lt;asm/mach-summit/mach_mpparse.h&gt;</div><div class='add'>+#include &lt;asm/summit/apicdef.h&gt;</div><div class='add'>+#include &lt;linux/smp.h&gt;</div><div class='add'>+#include &lt;asm/summit/apic.h&gt;</div><div class='add'>+#include &lt;asm/summit/ipi.h&gt;</div><div class='add'>+#include &lt;asm/summit/mpparse.h&gt;</div><div class='ctx'> </div><div class='ctx'> static int probe_summit(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/x86/mach-voyager/voyager_smp.c b/arch/x86/mach-voyager/voyager_smp.c<br/>index ee0fba092157..199a5f4a873c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/mach-voyager/voyager_smp.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/mach-voyager/voyager_smp.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/mach-voyager/voyager_smp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/mach-voyager/voyager_smp.c</a></div><div class='hunk'>@@ -448,6 +448,8 @@ static void __init start_secondary(void *unused)</div><div class='ctx'> </div><div class='ctx'> 	VDEBUG(("VOYAGER SMP: CPU%d, stack at about %p\n", cpuid, &amp;cpuid));</div><div class='ctx'> </div><div class='add'>+	notify_cpu_starting(cpuid);</div><div class='add'>+</div><div class='ctx'> 	/* enable interrupts */</div><div class='ctx'> 	local_irq_enable();</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/mm/Makefile b/arch/x86/mm/Makefile<br/>index dfb932dcf136..59f89b434b45 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/mm/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/mm/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/mm/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/mm/Makefile</a></div><div class='hunk'>@@ -13,12 +13,8 @@ obj-$(CONFIG_MMIOTRACE)		+= mmiotrace.o</div><div class='ctx'> mmiotrace-y			:= pf_in.o mmio-mod.o</div><div class='ctx'> obj-$(CONFIG_MMIOTRACE_TEST)	+= testmmiotrace.o</div><div class='ctx'> </div><div class='del'>-ifeq ($(CONFIG_X86_32),y)</div><div class='del'>-obj-$(CONFIG_NUMA)		+= discontig_32.o</div><div class='del'>-else</div><div class='del'>-obj-$(CONFIG_NUMA)		+= numa_64.o</div><div class='add'>+obj-$(CONFIG_NUMA)		+= numa_$(BITS).o</div><div class='ctx'> obj-$(CONFIG_K8_NUMA)		+= k8topology_64.o</div><div class='del'>-endif</div><div class='ctx'> obj-$(CONFIG_ACPI_NUMA)		+= srat_$(BITS).o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_MEMTEST)		+= memtest.o</div><div class='head'>diff --git a/arch/x86/mm/dump_pagetables.c b/arch/x86/mm/dump_pagetables.c<br/>index a20d1fa64b4e..e7277cbcfb40 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/mm/dump_pagetables.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/mm/dump_pagetables.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/mm/dump_pagetables.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/mm/dump_pagetables.c</a></div><div class='hunk'>@@ -148,8 +148,8 @@ static void note_page(struct seq_file *m, struct pg_state *st,</div><div class='ctx'> 	 * we have now. "break" is either changing perms, levels or</div><div class='ctx'> 	 * address space marker.</div><div class='ctx'> 	 */</div><div class='del'>-	prot = pgprot_val(new_prot) &amp; ~(PTE_PFN_MASK);</div><div class='del'>-	cur = pgprot_val(st-&gt;current_prot) &amp; ~(PTE_PFN_MASK);</div><div class='add'>+	prot = pgprot_val(new_prot) &amp; PTE_FLAGS_MASK;</div><div class='add'>+	cur = pgprot_val(st-&gt;current_prot) &amp; PTE_FLAGS_MASK;</div><div class='ctx'> </div><div class='ctx'> 	if (!st-&gt;level) {</div><div class='ctx'> 		/* First entry */</div><div class='head'>diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c<br/>index 455f3fe67b42..31e8730fa246 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/mm/fault.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/mm/fault.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/mm/fault.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/mm/fault.c</a></div><div class='hunk'>@@ -35,6 +35,7 @@</div><div class='ctx'> #include &lt;asm/tlbflush.h&gt;</div><div class='ctx'> #include &lt;asm/proto.h&gt;</div><div class='ctx'> #include &lt;asm-generic/sections.h&gt;</div><div class='add'>+#include &lt;asm/traps.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Page fault error code bits</div><div class='hunk'>@@ -357,8 +358,6 @@ static int is_errata100(struct pt_regs *regs, unsigned long address)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void do_invalid_op(struct pt_regs *, unsigned long);</div><div class='del'>-</div><div class='ctx'> static int is_f00f_bug(struct pt_regs *regs, unsigned long address)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_X86_F00F_BUG</div><div class='hunk'>@@ -593,11 +592,6 @@ void __kprobes do_page_fault(struct pt_regs *regs, unsigned long error_code)</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * We can fault from pretty much anywhere, with unknown IRQ state.</div><div class='del'>-	 */</div><div class='del'>-	trace_hardirqs_fixup();</div><div class='del'>-</div><div class='ctx'> 	tsk = current;</div><div class='ctx'> 	mm = tsk-&gt;mm;</div><div class='ctx'> 	prefetchw(&amp;mm-&gt;mmap_sem);</div><div class='hunk'>@@ -646,24 +640,23 @@ void __kprobes do_page_fault(struct pt_regs *regs, unsigned long error_code)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_X86_32</div><div class='del'>-	/* It's safe to allow irq's after cr2 has been saved and the vmalloc</div><div class='del'>-	   fault has been handled. */</div><div class='del'>-	if (regs-&gt;flags &amp; (X86_EFLAGS_IF | X86_VM_MASK))</div><div class='del'>-		local_irq_enable();</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='del'>-	 * If we're in an interrupt, have no user context or are running in an</div><div class='del'>-	 * atomic region then we must not take the fault.</div><div class='add'>+	 * It's safe to allow irq's after cr2 has been saved and the</div><div class='add'>+	 * vmalloc fault has been handled.</div><div class='add'>+	 *</div><div class='add'>+	 * User-mode registers count as a user access even for any</div><div class='add'>+	 * potential system fault or CPU buglet.</div><div class='ctx'> 	 */</div><div class='del'>-	if (in_atomic() || !mm)</div><div class='del'>-		goto bad_area_nosemaphore;</div><div class='del'>-#else /* CONFIG_X86_64 */</div><div class='del'>-	if (likely(regs-&gt;flags &amp; X86_EFLAGS_IF))</div><div class='add'>+	if (user_mode_vm(regs)) {</div><div class='add'>+		local_irq_enable();</div><div class='add'>+		error_code |= PF_USER;</div><div class='add'>+	} else if (regs-&gt;flags &amp; X86_EFLAGS_IF)</div><div class='ctx'> 		local_irq_enable();</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='ctx'> 	if (unlikely(error_code &amp; PF_RSVD))</div><div class='ctx'> 		pgtable_bad(address, regs, error_code);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If we're in an interrupt, have no user context or are running in an</div><div class='hunk'>@@ -672,15 +665,9 @@ void __kprobes do_page_fault(struct pt_regs *regs, unsigned long error_code)</div><div class='ctx'> 	if (unlikely(in_atomic() || !mm))</div><div class='ctx'> 		goto bad_area_nosemaphore;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * User-mode registers count as a user access even for any</div><div class='del'>-	 * potential system fault or CPU buglet.</div><div class='del'>-	 */</div><div class='del'>-	if (user_mode_vm(regs))</div><div class='del'>-		error_code |= PF_USER;</div><div class='ctx'> again:</div><div class='del'>-#endif</div><div class='del'>-	/* When running in the kernel we expect faults to occur only to</div><div class='add'>+	/*</div><div class='add'>+	 * When running in the kernel we expect faults to occur only to</div><div class='ctx'> 	 * addresses in user space.  All other faults represent errors in the</div><div class='ctx'> 	 * kernel and should generate an OOPS.  Unfortunately, in the case of an</div><div class='ctx'> 	 * erroneous fault occurring in a code path which already holds mmap_sem</div><div class='hunk'>@@ -743,9 +730,6 @@ good_area:</div><div class='ctx'> 			goto bad_area;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_X86_32</div><div class='del'>-survive:</div><div class='del'>-#endif</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If for any reason at all we couldn't handle the fault,</div><div class='ctx'> 	 * make sure we exit gracefully rather than endlessly redo</div><div class='hunk'>@@ -880,12 +864,11 @@ out_of_memory:</div><div class='ctx'> 	up_read(&amp;mm-&gt;mmap_sem);</div><div class='ctx'> 	if (is_global_init(tsk)) {</div><div class='ctx'> 		yield();</div><div class='del'>-#ifdef CONFIG_X86_32</div><div class='del'>-		down_read(&amp;mm-&gt;mmap_sem);</div><div class='del'>-		goto survive;</div><div class='del'>-#else</div><div class='add'>+		/*</div><div class='add'>+		 * Re-lookup the vma - in theory the vma tree might</div><div class='add'>+		 * have changed:</div><div class='add'>+		 */</div><div class='ctx'> 		goto again;</div><div class='del'>-#endif</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	printk("VM: killing process %s\n", tsk-&gt;comm);</div><div class='hunk'>@@ -915,15 +898,15 @@ LIST_HEAD(pgd_list);</div><div class='ctx'> </div><div class='ctx'> void vmalloc_sync_all(void)</div><div class='ctx'> {</div><div class='del'>-#ifdef CONFIG_X86_32</div><div class='del'>-	unsigned long start = VMALLOC_START &amp; PGDIR_MASK;</div><div class='ctx'> 	unsigned long address;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_X86_32</div><div class='ctx'> 	if (SHARED_KERNEL_PMD)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	BUILD_BUG_ON(TASK_SIZE &amp; ~PGDIR_MASK);</div><div class='del'>-	for (address = start; address &gt;= TASK_SIZE; address += PGDIR_SIZE) {</div><div class='add'>+	for (address = VMALLOC_START &amp; PMD_MASK;</div><div class='add'>+	     address &gt;= TASK_SIZE &amp;&amp; address &lt; FIXADDR_TOP;</div><div class='add'>+	     address += PMD_SIZE) {</div><div class='ctx'> 		unsigned long flags;</div><div class='ctx'> 		struct page *page;</div><div class='ctx'> </div><div class='hunk'>@@ -936,10 +919,8 @@ void vmalloc_sync_all(void)</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;pgd_lock, flags);</div><div class='ctx'> 	}</div><div class='ctx'> #else /* CONFIG_X86_64 */</div><div class='del'>-	unsigned long start = VMALLOC_START &amp; PGDIR_MASK;</div><div class='del'>-	unsigned long address;</div><div class='del'>-</div><div class='del'>-	for (address = start; address &lt;= VMALLOC_END; address += PGDIR_SIZE) {</div><div class='add'>+	for (address = VMALLOC_START &amp; PGDIR_MASK; address &lt;= VMALLOC_END;</div><div class='add'>+	     address += PGDIR_SIZE) {</div><div class='ctx'> 		const pgd_t *pgd_ref = pgd_offset_k(address);</div><div class='ctx'> 		unsigned long flags;</div><div class='ctx'> 		struct page *page;</div><div class='head'>diff --git a/arch/x86/mm/gup.c b/arch/x86/mm/gup.c<br/>index 007bb06c7504..4ba373c5b8c8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/mm/gup.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/mm/gup.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/mm/gup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/mm/gup.c</a></div><div class='hunk'>@@ -82,7 +82,7 @@ static noinline int gup_pte_range(pmd_t pmd, unsigned long addr,</div><div class='ctx'> 		pte_t pte = gup_get_pte(ptep);</div><div class='ctx'> 		struct page *page;</div><div class='ctx'> </div><div class='del'>-		if ((pte_val(pte) &amp; (mask | _PAGE_SPECIAL)) != mask) {</div><div class='add'>+		if ((pte_flags(pte) &amp; (mask | _PAGE_SPECIAL)) != mask) {</div><div class='ctx'> 			pte_unmap(ptep);</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -116,10 +116,10 @@ static noinline int gup_huge_pmd(pmd_t pmd, unsigned long addr,</div><div class='ctx'> 	mask = _PAGE_PRESENT|_PAGE_USER;</div><div class='ctx'> 	if (write)</div><div class='ctx'> 		mask |= _PAGE_RW;</div><div class='del'>-	if ((pte_val(pte) &amp; mask) != mask)</div><div class='add'>+	if ((pte_flags(pte) &amp; mask) != mask)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	/* hugepages are never "special" */</div><div class='del'>-	VM_BUG_ON(pte_val(pte) &amp; _PAGE_SPECIAL);</div><div class='add'>+	VM_BUG_ON(pte_flags(pte) &amp; _PAGE_SPECIAL);</div><div class='ctx'> 	VM_BUG_ON(!pfn_valid(pte_pfn(pte)));</div><div class='ctx'> </div><div class='ctx'> 	refs = 0;</div><div class='hunk'>@@ -173,10 +173,10 @@ static noinline int gup_huge_pud(pud_t pud, unsigned long addr,</div><div class='ctx'> 	mask = _PAGE_PRESENT|_PAGE_USER;</div><div class='ctx'> 	if (write)</div><div class='ctx'> 		mask |= _PAGE_RW;</div><div class='del'>-	if ((pte_val(pte) &amp; mask) != mask)</div><div class='add'>+	if ((pte_flags(pte) &amp; mask) != mask)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	/* hugepages are never "special" */</div><div class='del'>-	VM_BUG_ON(pte_val(pte) &amp; _PAGE_SPECIAL);</div><div class='add'>+	VM_BUG_ON(pte_flags(pte) &amp; _PAGE_SPECIAL);</div><div class='ctx'> 	VM_BUG_ON(!pfn_valid(pte_pfn(pte)));</div><div class='ctx'> </div><div class='ctx'> 	refs = 0;</div><div class='head'>diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c<br/>index 165c871ba9af..bcc079c282dd 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/mm/highmem_32.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/mm/highmem_32.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/mm/highmem_32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/mm/highmem_32.c</a></div><div class='hunk'>@@ -137,6 +137,7 @@ void *kmap_atomic_pfn(unsigned long pfn, enum km_type type)</div><div class='ctx'> </div><div class='ctx'> 	return (void*) vaddr;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(kmap_atomic_pfn); /* temporarily in use by i915 GEM until vmap */</div><div class='ctx'> </div><div class='ctx'> struct page *kmap_atomic_to_page(void *ptr)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c<br/>index 60ec1d08ff24..8396868e82c5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/mm/init_32.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/mm/init_32.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/mm/init_32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/mm/init_32.c</a></div><div class='hunk'>@@ -31,6 +31,7 @@</div><div class='ctx'> #include &lt;linux/cpumask.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/asm.h&gt;</div><div class='add'>+#include &lt;asm/bios_ebda.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='hunk'>@@ -47,6 +48,7 @@</div><div class='ctx'> #include &lt;asm/paravirt.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='add'>+#include &lt;asm/smp.h&gt;</div><div class='ctx'> </div><div class='ctx'> unsigned int __VMALLOC_RESERVE = 128 &lt;&lt; 20;</div><div class='ctx'> </div><div class='hunk'>@@ -194,11 +196,30 @@ static void __init kernel_physical_mapping_init(pgd_t *pgd_base,</div><div class='ctx'> 	pgd_t *pgd;</div><div class='ctx'> 	pmd_t *pmd;</div><div class='ctx'> 	pte_t *pte;</div><div class='del'>-	unsigned pages_2m = 0, pages_4k = 0;</div><div class='add'>+	unsigned pages_2m, pages_4k;</div><div class='add'>+	int mapping_iter;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * First iteration will setup identity mapping using large/small pages</div><div class='add'>+	 * based on use_pse, with other attributes same as set by</div><div class='add'>+	 * the early code in head_32.S</div><div class='add'>+	 *</div><div class='add'>+	 * Second iteration will setup the appropriate attributes (NX, GLOBAL..)</div><div class='add'>+	 * as desired for the kernel identity mapping.</div><div class='add'>+	 *</div><div class='add'>+	 * This two pass mechanism conforms to the TLB app note which says:</div><div class='add'>+	 *</div><div class='add'>+	 *     "Software should not write to a paging-structure entry in a way</div><div class='add'>+	 *      that would change, for any linear address, both the page size</div><div class='add'>+	 *      and either the page frame or attributes."</div><div class='add'>+	 */</div><div class='add'>+	mapping_iter = 1;</div><div class='ctx'> </div><div class='ctx'> 	if (!cpu_has_pse)</div><div class='ctx'> 		use_pse = 0;</div><div class='ctx'> </div><div class='add'>+repeat:</div><div class='add'>+	pages_2m = pages_4k = 0;</div><div class='ctx'> 	pfn = start_pfn;</div><div class='ctx'> 	pgd_idx = pgd_index((pfn&lt;&lt;PAGE_SHIFT) + PAGE_OFFSET);</div><div class='ctx'> 	pgd = pgd_base + pgd_idx;</div><div class='hunk'>@@ -224,6 +245,13 @@ static void __init kernel_physical_mapping_init(pgd_t *pgd_base,</div><div class='ctx'> 			if (use_pse) {</div><div class='ctx'> 				unsigned int addr2;</div><div class='ctx'> 				pgprot_t prot = PAGE_KERNEL_LARGE;</div><div class='add'>+				/*</div><div class='add'>+				 * first pass will use the same initial</div><div class='add'>+				 * identity mapping attribute + _PAGE_PSE.</div><div class='add'>+				 */</div><div class='add'>+				pgprot_t init_prot =</div><div class='add'>+					__pgprot(PTE_IDENT_ATTR |</div><div class='add'>+						 _PAGE_PSE);</div><div class='ctx'> </div><div class='ctx'> 				addr2 = (pfn + PTRS_PER_PTE-1) * PAGE_SIZE +</div><div class='ctx'> 					PAGE_OFFSET + PAGE_SIZE-1;</div><div class='hunk'>@@ -233,7 +261,10 @@ static void __init kernel_physical_mapping_init(pgd_t *pgd_base,</div><div class='ctx'> 					prot = PAGE_KERNEL_LARGE_EXEC;</div><div class='ctx'> </div><div class='ctx'> 				pages_2m++;</div><div class='del'>-				set_pmd(pmd, pfn_pmd(pfn, prot));</div><div class='add'>+				if (mapping_iter == 1)</div><div class='add'>+					set_pmd(pmd, pfn_pmd(pfn, init_prot));</div><div class='add'>+				else</div><div class='add'>+					set_pmd(pmd, pfn_pmd(pfn, prot));</div><div class='ctx'> </div><div class='ctx'> 				pfn += PTRS_PER_PTE;</div><div class='ctx'> 				continue;</div><div class='hunk'>@@ -245,17 +276,43 @@ static void __init kernel_physical_mapping_init(pgd_t *pgd_base,</div><div class='ctx'> 			for (; pte_ofs &lt; PTRS_PER_PTE &amp;&amp; pfn &lt; end_pfn;</div><div class='ctx'> 			     pte++, pfn++, pte_ofs++, addr += PAGE_SIZE) {</div><div class='ctx'> 				pgprot_t prot = PAGE_KERNEL;</div><div class='add'>+				/*</div><div class='add'>+				 * first pass will use the same initial</div><div class='add'>+				 * identity mapping attribute.</div><div class='add'>+				 */</div><div class='add'>+				pgprot_t init_prot = __pgprot(PTE_IDENT_ATTR);</div><div class='ctx'> </div><div class='ctx'> 				if (is_kernel_text(addr))</div><div class='ctx'> 					prot = PAGE_KERNEL_EXEC;</div><div class='ctx'> </div><div class='ctx'> 				pages_4k++;</div><div class='del'>-				set_pte(pte, pfn_pte(pfn, prot));</div><div class='add'>+				if (mapping_iter == 1)</div><div class='add'>+					set_pte(pte, pfn_pte(pfn, init_prot));</div><div class='add'>+				else</div><div class='add'>+					set_pte(pte, pfn_pte(pfn, prot));</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	update_page_count(PG_LEVEL_2M, pages_2m);</div><div class='del'>-	update_page_count(PG_LEVEL_4K, pages_4k);</div><div class='add'>+	if (mapping_iter == 1) {</div><div class='add'>+		/*</div><div class='add'>+		 * update direct mapping page count only in the first</div><div class='add'>+		 * iteration.</div><div class='add'>+		 */</div><div class='add'>+		update_page_count(PG_LEVEL_2M, pages_2m);</div><div class='add'>+		update_page_count(PG_LEVEL_4K, pages_4k);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * local global flush tlb, which will flush the previous</div><div class='add'>+		 * mappings present in both small and large page TLB's.</div><div class='add'>+		 */</div><div class='add'>+		__flush_tlb_all();</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Second iteration will set the actual desired PTE attributes.</div><div class='add'>+		 */</div><div class='add'>+		mapping_iter = 2;</div><div class='add'>+		goto repeat;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -501,7 +558,7 @@ void zap_low_mappings(void)</div><div class='ctx'> </div><div class='ctx'> int nx_enabled;</div><div class='ctx'> </div><div class='del'>-pteval_t __supported_pte_mask __read_mostly = ~(_PAGE_NX | _PAGE_GLOBAL);</div><div class='add'>+pteval_t __supported_pte_mask __read_mostly = ~(_PAGE_NX | _PAGE_GLOBAL | _PAGE_IOMAP);</div><div class='ctx'> EXPORT_SYMBOL_GPL(__supported_pte_mask);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_X86_PAE</div><div class='hunk'>@@ -718,7 +775,7 @@ void __init setup_bootmem_allocator(void)</div><div class='ctx'> 	after_init_bootmem = 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __init find_early_table_space(unsigned long end)</div><div class='add'>+static void __init find_early_table_space(unsigned long end, int use_pse)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long puds, pmds, ptes, tables, start;</div><div class='ctx'> </div><div class='hunk'>@@ -728,7 +785,7 @@ static void __init find_early_table_space(unsigned long end)</div><div class='ctx'> 	pmds = (end + PMD_SIZE - 1) &gt;&gt; PMD_SHIFT;</div><div class='ctx'> 	tables += PAGE_ALIGN(pmds * sizeof(pmd_t));</div><div class='ctx'> </div><div class='del'>-	if (cpu_has_pse) {</div><div class='add'>+	if (use_pse) {</div><div class='ctx'> 		unsigned long extra;</div><div class='ctx'> </div><div class='ctx'> 		extra = end - ((end&gt;&gt;PMD_SHIFT) &lt;&lt; PMD_SHIFT);</div><div class='hunk'>@@ -768,12 +825,22 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,</div><div class='ctx'> 	pgd_t *pgd_base = swapper_pg_dir;</div><div class='ctx'> 	unsigned long start_pfn, end_pfn;</div><div class='ctx'> 	unsigned long big_page_start;</div><div class='add'>+#ifdef CONFIG_DEBUG_PAGEALLOC</div><div class='add'>+	/*</div><div class='add'>+	 * For CONFIG_DEBUG_PAGEALLOC, identity mapping will use small pages.</div><div class='add'>+	 * This will simplify cpa(), which otherwise needs to support splitting</div><div class='add'>+	 * large pages into small in interrupt context, etc.</div><div class='add'>+	 */</div><div class='add'>+	int use_pse = 0;</div><div class='add'>+#else</div><div class='add'>+	int use_pse = cpu_has_pse;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Find space for the kernel direct mapping tables.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!after_init_bootmem)</div><div class='del'>-		find_early_table_space(end);</div><div class='add'>+		find_early_table_space(end, use_pse);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_X86_PAE</div><div class='ctx'> 	set_nx();</div><div class='hunk'>@@ -819,7 +886,7 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,</div><div class='ctx'> 	end_pfn = (end&gt;&gt;PMD_SHIFT) &lt;&lt; (PMD_SHIFT - PAGE_SHIFT);</div><div class='ctx'> 	if (start_pfn &lt; end_pfn)</div><div class='ctx'> 		kernel_physical_mapping_init(pgd_base, start_pfn, end_pfn,</div><div class='del'>-						cpu_has_pse);</div><div class='add'>+					     use_pse);</div><div class='ctx'> </div><div class='ctx'> 	/* tail is not big page alignment ? */</div><div class='ctx'> 	start_pfn = end_pfn;</div><div class='hunk'>@@ -903,6 +970,8 @@ void __init mem_init(void)</div><div class='ctx'> 	int codesize, reservedpages, datasize, initsize;</div><div class='ctx'> 	int tmp;</div><div class='ctx'> </div><div class='add'>+	start_periodic_check_for_corruption();</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_FLATMEM</div><div class='ctx'> 	BUG_ON(!mem_map);</div><div class='ctx'> #endif</div><div class='hunk'>@@ -982,7 +1051,6 @@ void __init mem_init(void)</div><div class='ctx'> 	if (boot_cpu_data.wp_works_ok &lt; 0)</div><div class='ctx'> 		test_wp_bit();</div><div class='ctx'> </div><div class='del'>-	cpa_init();</div><div class='ctx'> 	save_pg_dir();</div><div class='ctx'> 	zap_low_mappings();</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c<br/>index d3746efb060d..b8e461d49412 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/mm/init_64.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/mm/init_64.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/mm/init_64.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/mm/init_64.c</a></div><div class='hunk'>@@ -31,6 +31,7 @@</div><div class='ctx'> #include &lt;linux/nmi.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='add'>+#include &lt;asm/bios_ebda.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='hunk'>@@ -88,6 +89,62 @@ early_param("gbpages", parse_direct_gbpages_on);</div><div class='ctx'> </div><div class='ctx'> int after_bootmem;</div><div class='ctx'> </div><div class='add'>+pteval_t __supported_pte_mask __read_mostly = ~_PAGE_IOMAP;</div><div class='add'>+EXPORT_SYMBOL_GPL(__supported_pte_mask);</div><div class='add'>+</div><div class='add'>+static int do_not_nx __cpuinitdata;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * noexec=on|off</div><div class='add'>+ * Control non-executable mappings for 64-bit processes.</div><div class='add'>+ *</div><div class='add'>+ * on	Enable (default)</div><div class='add'>+ * off	Disable</div><div class='add'>+ */</div><div class='add'>+static int __init nonx_setup(char *str)</div><div class='add'>+{</div><div class='add'>+	if (!str)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (!strncmp(str, "on", 2)) {</div><div class='add'>+		__supported_pte_mask |= _PAGE_NX;</div><div class='add'>+		do_not_nx = 0;</div><div class='add'>+	} else if (!strncmp(str, "off", 3)) {</div><div class='add'>+		do_not_nx = 1;</div><div class='add'>+		__supported_pte_mask &amp;= ~_PAGE_NX;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+early_param("noexec", nonx_setup);</div><div class='add'>+</div><div class='add'>+void __cpuinit check_efer(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long efer;</div><div class='add'>+</div><div class='add'>+	rdmsrl(MSR_EFER, efer);</div><div class='add'>+	if (!(efer &amp; EFER_NX) || do_not_nx)</div><div class='add'>+		__supported_pte_mask &amp;= ~_PAGE_NX;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int force_personality32;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * noexec32=on|off</div><div class='add'>+ * Control non executable heap for 32bit processes.</div><div class='add'>+ * To control the stack too use noexec=off</div><div class='add'>+ *</div><div class='add'>+ * on	PROT_READ does not imply PROT_EXEC for 32-bit processes (default)</div><div class='add'>+ * off	PROT_READ implies PROT_EXEC</div><div class='add'>+ */</div><div class='add'>+static int __init nonx32_setup(char *str)</div><div class='add'>+{</div><div class='add'>+	if (!strcmp(str, "on"))</div><div class='add'>+		force_personality32 &amp;= ~READ_IMPLIES_EXEC;</div><div class='add'>+	else if (!strcmp(str, "off"))</div><div class='add'>+		force_personality32 |= READ_IMPLIES_EXEC;</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+__setup("noexec32=", nonx32_setup);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * NOTE: This function is marked __ref because it calls __init function</div><div class='ctx'>  * (alloc_bootmem_pages). It's safe to do it ONLY when after_bootmem == 0.</div><div class='hunk'>@@ -139,9 +196,6 @@ set_pte_vaddr_pud(pud_t *pud_page, unsigned long vaddr, pte_t new_pte)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	pte = pte_offset_kernel(pmd, vaddr);</div><div class='del'>-	if (!pte_none(*pte) &amp;&amp; pte_val(new_pte) &amp;&amp;</div><div class='del'>-	    pte_val(*pte) != (pte_val(new_pte) &amp; __supported_pte_mask))</div><div class='del'>-		pte_ERROR(*pte);</div><div class='ctx'> 	set_pte(pte, new_pte);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -225,7 +279,7 @@ void __init init_extra_mapping_uc(unsigned long phys, unsigned long size)</div><div class='ctx'> void __init cleanup_highmap(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long vaddr = __START_KERNEL_map;</div><div class='del'>-	unsigned long end = round_up((unsigned long)_end, PMD_SIZE) - 1;</div><div class='add'>+	unsigned long end = roundup((unsigned long)_end, PMD_SIZE) - 1;</div><div class='ctx'> 	pmd_t *pmd = level2_kernel_pgt;</div><div class='ctx'> 	pmd_t *last_pmd = pmd + PTRS_PER_PMD;</div><div class='ctx'> </div><div class='hunk'>@@ -256,7 +310,7 @@ static __ref void *alloc_low_page(unsigned long *phys)</div><div class='ctx'> 	if (pfn &gt;= table_top)</div><div class='ctx'> 		panic("alloc_low_page: ran out of memory");</div><div class='ctx'> </div><div class='del'>-	adr = early_ioremap(pfn * PAGE_SIZE, PAGE_SIZE);</div><div class='add'>+	adr = early_memremap(pfn * PAGE_SIZE, PAGE_SIZE);</div><div class='ctx'> 	memset(adr, 0, PAGE_SIZE);</div><div class='ctx'> 	*phys  = pfn * PAGE_SIZE;</div><div class='ctx'> 	return adr;</div><div class='hunk'>@@ -271,7 +325,8 @@ static __ref void unmap_low_page(void *adr)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static unsigned long __meminit</div><div class='del'>-phys_pte_init(pte_t *pte_page, unsigned long addr, unsigned long end)</div><div class='add'>+phys_pte_init(pte_t *pte_page, unsigned long addr, unsigned long end,</div><div class='add'>+	      pgprot_t prot)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned pages = 0;</div><div class='ctx'> 	unsigned long last_map_addr = end;</div><div class='hunk'>@@ -289,36 +344,43 @@ phys_pte_init(pte_t *pte_page, unsigned long addr, unsigned long end)</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		/*</div><div class='add'>+		 * We will re-use the existing mapping.</div><div class='add'>+		 * Xen for example has some special requirements, like mapping</div><div class='add'>+		 * pagetable pages as RO. So assume someone who pre-setup</div><div class='add'>+		 * these mappings are more intelligent.</div><div class='add'>+		 */</div><div class='ctx'> 		if (pte_val(*pte))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		if (0)</div><div class='ctx'> 			printk("   pte=%p addr=%lx pte=%016lx\n",</div><div class='ctx'> 			       pte, addr, pfn_pte(addr &gt;&gt; PAGE_SHIFT, PAGE_KERNEL).pte);</div><div class='del'>-		set_pte(pte, pfn_pte(addr &gt;&gt; PAGE_SHIFT, PAGE_KERNEL));</div><div class='del'>-		last_map_addr = (addr &amp; PAGE_MASK) + PAGE_SIZE;</div><div class='ctx'> 		pages++;</div><div class='add'>+		set_pte(pte, pfn_pte(addr &gt;&gt; PAGE_SHIFT, prot));</div><div class='add'>+		last_map_addr = (addr &amp; PAGE_MASK) + PAGE_SIZE;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	update_page_count(PG_LEVEL_4K, pages);</div><div class='ctx'> </div><div class='ctx'> 	return last_map_addr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static unsigned long __meminit</div><div class='del'>-phys_pte_update(pmd_t *pmd, unsigned long address, unsigned long end)</div><div class='add'>+phys_pte_update(pmd_t *pmd, unsigned long address, unsigned long end,</div><div class='add'>+		pgprot_t prot)</div><div class='ctx'> {</div><div class='ctx'> 	pte_t *pte = (pte_t *)pmd_page_vaddr(*pmd);</div><div class='ctx'> </div><div class='del'>-	return phys_pte_init(pte, address, end);</div><div class='add'>+	return phys_pte_init(pte, address, end, prot);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static unsigned long __meminit</div><div class='ctx'> phys_pmd_init(pmd_t *pmd_page, unsigned long address, unsigned long end,</div><div class='del'>-			 unsigned long page_size_mask)</div><div class='add'>+	      unsigned long page_size_mask, pgprot_t prot)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long pages = 0;</div><div class='ctx'> 	unsigned long last_map_addr = end;</div><div class='del'>-	unsigned long start = address;</div><div class='ctx'> </div><div class='ctx'> 	int i = pmd_index(address);</div><div class='ctx'> </div><div class='hunk'>@@ -326,6 +388,7 @@ phys_pmd_init(pmd_t *pmd_page, unsigned long address, unsigned long end,</div><div class='ctx'> 		unsigned long pte_phys;</div><div class='ctx'> 		pmd_t *pmd = pmd_page + pmd_index(address);</div><div class='ctx'> 		pte_t *pte;</div><div class='add'>+		pgprot_t new_prot = prot;</div><div class='ctx'> </div><div class='ctx'> 		if (address &gt;= end) {</div><div class='ctx'> 			if (!after_bootmem) {</div><div class='hunk'>@@ -339,27 +402,40 @@ phys_pmd_init(pmd_t *pmd_page, unsigned long address, unsigned long end,</div><div class='ctx'> 			if (!pmd_large(*pmd)) {</div><div class='ctx'> 				spin_lock(&amp;init_mm.page_table_lock);</div><div class='ctx'> 				last_map_addr = phys_pte_update(pmd, address,</div><div class='del'>-								end);</div><div class='add'>+								end, prot);</div><div class='ctx'> 				spin_unlock(&amp;init_mm.page_table_lock);</div><div class='add'>+				continue;</div><div class='ctx'> 			}</div><div class='del'>-			/* Count entries we're using from level2_ident_pgt */</div><div class='del'>-			if (start == 0)</div><div class='del'>-				pages++;</div><div class='del'>-			continue;</div><div class='add'>+			/*</div><div class='add'>+			 * If we are ok with PG_LEVEL_2M mapping, then we will</div><div class='add'>+			 * use the existing mapping,</div><div class='add'>+			 *</div><div class='add'>+			 * Otherwise, we will split the large page mapping but</div><div class='add'>+			 * use the same existing protection bits except for</div><div class='add'>+			 * large page, so that we don't violate Intel's TLB</div><div class='add'>+			 * Application note (317080) which says, while changing</div><div class='add'>+			 * the page sizes, new and old translations should</div><div class='add'>+			 * not differ with respect to page frame and</div><div class='add'>+			 * attributes.</div><div class='add'>+			 */</div><div class='add'>+			if (page_size_mask &amp; (1 &lt;&lt; PG_LEVEL_2M))</div><div class='add'>+				continue;</div><div class='add'>+			new_prot = pte_pgprot(pte_clrhuge(*(pte_t *)pmd));</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (page_size_mask &amp; (1&lt;&lt;PG_LEVEL_2M)) {</div><div class='ctx'> 			pages++;</div><div class='ctx'> 			spin_lock(&amp;init_mm.page_table_lock);</div><div class='ctx'> 			set_pte((pte_t *)pmd,</div><div class='del'>-				pfn_pte(address &gt;&gt; PAGE_SHIFT, PAGE_KERNEL_LARGE));</div><div class='add'>+				pfn_pte(address &gt;&gt; PAGE_SHIFT,</div><div class='add'>+					__pgprot(pgprot_val(prot) | _PAGE_PSE)));</div><div class='ctx'> 			spin_unlock(&amp;init_mm.page_table_lock);</div><div class='ctx'> 			last_map_addr = (address &amp; PMD_MASK) + PMD_SIZE;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		pte = alloc_low_page(&amp;pte_phys);</div><div class='del'>-		last_map_addr = phys_pte_init(pte, address, end);</div><div class='add'>+		last_map_addr = phys_pte_init(pte, address, end, new_prot);</div><div class='ctx'> 		unmap_low_page(pte);</div><div class='ctx'> </div><div class='ctx'> 		spin_lock(&amp;init_mm.page_table_lock);</div><div class='hunk'>@@ -372,12 +448,12 @@ phys_pmd_init(pmd_t *pmd_page, unsigned long address, unsigned long end,</div><div class='ctx'> </div><div class='ctx'> static unsigned long __meminit</div><div class='ctx'> phys_pmd_update(pud_t *pud, unsigned long address, unsigned long end,</div><div class='del'>-			 unsigned long page_size_mask)</div><div class='add'>+		unsigned long page_size_mask, pgprot_t prot)</div><div class='ctx'> {</div><div class='ctx'> 	pmd_t *pmd = pmd_offset(pud, 0);</div><div class='ctx'> 	unsigned long last_map_addr;</div><div class='ctx'> </div><div class='del'>-	last_map_addr = phys_pmd_init(pmd, address, end, page_size_mask);</div><div class='add'>+	last_map_addr = phys_pmd_init(pmd, address, end, page_size_mask, prot);</div><div class='ctx'> 	__flush_tlb_all();</div><div class='ctx'> 	return last_map_addr;</div><div class='ctx'> }</div><div class='hunk'>@@ -394,6 +470,7 @@ phys_pud_init(pud_t *pud_page, unsigned long addr, unsigned long end,</div><div class='ctx'> 		unsigned long pmd_phys;</div><div class='ctx'> 		pud_t *pud = pud_page + pud_index(addr);</div><div class='ctx'> 		pmd_t *pmd;</div><div class='add'>+		pgprot_t prot = PAGE_KERNEL;</div><div class='ctx'> </div><div class='ctx'> 		if (addr &gt;= end)</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -405,10 +482,26 @@ phys_pud_init(pud_t *pud_page, unsigned long addr, unsigned long end,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (pud_val(*pud)) {</div><div class='del'>-			if (!pud_large(*pud))</div><div class='add'>+			if (!pud_large(*pud)) {</div><div class='ctx'> 				last_map_addr = phys_pmd_update(pud, addr, end,</div><div class='del'>-							 page_size_mask);</div><div class='del'>-			continue;</div><div class='add'>+							 page_size_mask, prot);</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+			/*</div><div class='add'>+			 * If we are ok with PG_LEVEL_1G mapping, then we will</div><div class='add'>+			 * use the existing mapping.</div><div class='add'>+			 *</div><div class='add'>+			 * Otherwise, we will split the gbpage mapping but use</div><div class='add'>+			 * the same existing protection  bits except for large</div><div class='add'>+			 * page, so that we don't violate Intel's TLB</div><div class='add'>+			 * Application note (317080) which says, while changing</div><div class='add'>+			 * the page sizes, new and old translations should</div><div class='add'>+			 * not differ with respect to page frame and</div><div class='add'>+			 * attributes.</div><div class='add'>+			 */</div><div class='add'>+			if (page_size_mask &amp; (1 &lt;&lt; PG_LEVEL_1G))</div><div class='add'>+				continue;</div><div class='add'>+			prot = pte_pgprot(pte_clrhuge(*(pte_t *)pud));</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (page_size_mask &amp; (1&lt;&lt;PG_LEVEL_1G)) {</div><div class='hunk'>@@ -422,7 +515,8 @@ phys_pud_init(pud_t *pud_page, unsigned long addr, unsigned long end,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		pmd = alloc_low_page(&amp;pmd_phys);</div><div class='del'>-		last_map_addr = phys_pmd_init(pmd, addr, end, page_size_mask);</div><div class='add'>+		last_map_addr = phys_pmd_init(pmd, addr, end, page_size_mask,</div><div class='add'>+					      prot);</div><div class='ctx'> 		unmap_low_page(pmd);</div><div class='ctx'> </div><div class='ctx'> 		spin_lock(&amp;init_mm.page_table_lock);</div><div class='hunk'>@@ -430,6 +524,7 @@ phys_pud_init(pud_t *pud_page, unsigned long addr, unsigned long end,</div><div class='ctx'> 		spin_unlock(&amp;init_mm.page_table_lock);</div><div class='ctx'> 	}</div><div class='ctx'> 	__flush_tlb_all();</div><div class='add'>+</div><div class='ctx'> 	update_page_count(PG_LEVEL_1G, pages);</div><div class='ctx'> </div><div class='ctx'> 	return last_map_addr;</div><div class='hunk'>@@ -446,27 +541,28 @@ phys_pud_update(pgd_t *pgd, unsigned long addr, unsigned long end,</div><div class='ctx'> 	return phys_pud_init(pud, addr, end, page_size_mask);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __init find_early_table_space(unsigned long end)</div><div class='add'>+static void __init find_early_table_space(unsigned long end, int use_pse,</div><div class='add'>+					  int use_gbpages)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long puds, pmds, ptes, tables, start;</div><div class='ctx'> </div><div class='ctx'> 	puds = (end + PUD_SIZE - 1) &gt;&gt; PUD_SHIFT;</div><div class='del'>-	tables = round_up(puds * sizeof(pud_t), PAGE_SIZE);</div><div class='del'>-	if (direct_gbpages) {</div><div class='add'>+	tables = roundup(puds * sizeof(pud_t), PAGE_SIZE);</div><div class='add'>+	if (use_gbpages) {</div><div class='ctx'> 		unsigned long extra;</div><div class='ctx'> 		extra = end - ((end&gt;&gt;PUD_SHIFT) &lt;&lt; PUD_SHIFT);</div><div class='ctx'> 		pmds = (extra + PMD_SIZE - 1) &gt;&gt; PMD_SHIFT;</div><div class='ctx'> 	} else</div><div class='ctx'> 		pmds = (end + PMD_SIZE - 1) &gt;&gt; PMD_SHIFT;</div><div class='del'>-	tables += round_up(pmds * sizeof(pmd_t), PAGE_SIZE);</div><div class='add'>+	tables += roundup(pmds * sizeof(pmd_t), PAGE_SIZE);</div><div class='ctx'> </div><div class='del'>-	if (cpu_has_pse) {</div><div class='add'>+	if (use_pse) {</div><div class='ctx'> 		unsigned long extra;</div><div class='ctx'> 		extra = end - ((end&gt;&gt;PMD_SHIFT) &lt;&lt; PMD_SHIFT);</div><div class='ctx'> 		ptes = (extra + PAGE_SIZE - 1) &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> 	} else</div><div class='ctx'> 		ptes = (end + PAGE_SIZE - 1) &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	tables += round_up(ptes * sizeof(pte_t), PAGE_SIZE);</div><div class='add'>+	tables += roundup(ptes * sizeof(pte_t), PAGE_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * RED-PEN putting page tables only on node 0 could</div><div class='hunk'>@@ -528,6 +624,7 @@ static unsigned long __init kernel_physical_mapping_init(unsigned long start,</div><div class='ctx'> 		pgd_populate(&amp;init_mm, pgd, __va(pud_phys));</div><div class='ctx'> 		spin_unlock(&amp;init_mm.page_table_lock);</div><div class='ctx'> 	}</div><div class='add'>+	__flush_tlb_all();</div><div class='ctx'> </div><div class='ctx'> 	return last_map_addr;</div><div class='ctx'> }</div><div class='hunk'>@@ -571,6 +668,7 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,</div><div class='ctx'> </div><div class='ctx'> 	struct map_range mr[NR_RANGE_MR];</div><div class='ctx'> 	int nr_range, i;</div><div class='add'>+	int use_pse, use_gbpages;</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_INFO "init_memory_mapping\n");</div><div class='ctx'> </div><div class='hunk'>@@ -584,9 +682,21 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,</div><div class='ctx'> 	if (!after_bootmem)</div><div class='ctx'> 		init_gbpages();</div><div class='ctx'> </div><div class='del'>-	if (direct_gbpages)</div><div class='add'>+#ifdef CONFIG_DEBUG_PAGEALLOC</div><div class='add'>+	/*</div><div class='add'>+	 * For CONFIG_DEBUG_PAGEALLOC, identity mapping will use small pages.</div><div class='add'>+	 * This will simplify cpa(), which otherwise needs to support splitting</div><div class='add'>+	 * large pages into small in interrupt context, etc.</div><div class='add'>+	 */</div><div class='add'>+	use_pse = use_gbpages = 0;</div><div class='add'>+#else</div><div class='add'>+	use_pse = cpu_has_pse;</div><div class='add'>+	use_gbpages = direct_gbpages;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	if (use_gbpages)</div><div class='ctx'> 		page_size_mask |= 1 &lt;&lt; PG_LEVEL_1G;</div><div class='del'>-	if (cpu_has_pse)</div><div class='add'>+	if (use_pse)</div><div class='ctx'> 		page_size_mask |= 1 &lt;&lt; PG_LEVEL_2M;</div><div class='ctx'> </div><div class='ctx'> 	memset(mr, 0, sizeof(mr));</div><div class='hunk'>@@ -636,7 +746,7 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,</div><div class='ctx'> 		old_start = mr[i].start;</div><div class='ctx'> 		memmove(&amp;mr[i], &amp;mr[i+1],</div><div class='ctx'> 			 (nr_range - 1 - i) * sizeof (struct map_range));</div><div class='del'>-		mr[i].start = old_start;</div><div class='add'>+		mr[i--].start = old_start;</div><div class='ctx'> 		nr_range--;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -647,7 +757,7 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,</div><div class='ctx'> 			 (mr[i].page_size_mask &amp; (1&lt;&lt;PG_LEVEL_2M))?"2M":"4k"));</div><div class='ctx'> </div><div class='ctx'> 	if (!after_bootmem)</div><div class='del'>-		find_early_table_space(end);</div><div class='add'>+		find_early_table_space(end, use_pse, use_gbpages);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; nr_range; i++)</div><div class='ctx'> 		last_map_addr = kernel_physical_mapping_init(</div><div class='hunk'>@@ -769,6 +879,8 @@ void __init mem_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	long codesize, reservedpages, datasize, initsize;</div><div class='ctx'> </div><div class='add'>+	start_periodic_check_for_corruption();</div><div class='add'>+</div><div class='ctx'> 	pci_iommu_alloc();</div><div class='ctx'> </div><div class='ctx'> 	/* clear_bss() already clear the empty_zero_page */</div><div class='hunk'>@@ -806,8 +918,6 @@ void __init mem_init(void)</div><div class='ctx'> 		reservedpages &lt;&lt; (PAGE_SHIFT-10),</div><div class='ctx'> 		datasize &gt;&gt; 10,</div><div class='ctx'> 		initsize &gt;&gt; 10);</div><div class='del'>-</div><div class='del'>-	cpa_init();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void free_init_pages(char *what, unsigned long begin, unsigned long end)</div><div class='head'>diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c<br/>index d4b6e6a29ae3..ae71e11eb3e5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/mm/ioremap.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/mm/ioremap.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/mm/ioremap.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/mm/ioremap.c</a></div><div class='hunk'>@@ -24,18 +24,47 @@</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_X86_64</div><div class='ctx'> </div><div class='add'>+static inline int phys_addr_valid(unsigned long addr)</div><div class='add'>+{</div><div class='add'>+	return addr &lt; (1UL &lt;&lt; boot_cpu_data.x86_phys_bits);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> unsigned long __phys_addr(unsigned long x)</div><div class='ctx'> {</div><div class='del'>-	if (x &gt;= __START_KERNEL_map)</div><div class='del'>-		return x - __START_KERNEL_map + phys_base;</div><div class='del'>-	return x - PAGE_OFFSET;</div><div class='add'>+	if (x &gt;= __START_KERNEL_map) {</div><div class='add'>+		x -= __START_KERNEL_map;</div><div class='add'>+		VIRTUAL_BUG_ON(x &gt;= KERNEL_IMAGE_SIZE);</div><div class='add'>+		x += phys_base;</div><div class='add'>+	} else {</div><div class='add'>+		VIRTUAL_BUG_ON(x &lt; PAGE_OFFSET);</div><div class='add'>+		x -= PAGE_OFFSET;</div><div class='add'>+		VIRTUAL_BUG_ON(system_state == SYSTEM_BOOTING ? x &gt; MAXMEM :</div><div class='add'>+					!phys_addr_valid(x));</div><div class='add'>+	}</div><div class='add'>+	return x;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(__phys_addr);</div><div class='ctx'> </div><div class='del'>-static inline int phys_addr_valid(unsigned long addr)</div><div class='add'>+bool __virt_addr_valid(unsigned long x)</div><div class='ctx'> {</div><div class='del'>-	return addr &lt; (1UL &lt;&lt; boot_cpu_data.x86_phys_bits);</div><div class='add'>+	if (x &gt;= __START_KERNEL_map) {</div><div class='add'>+		x -= __START_KERNEL_map;</div><div class='add'>+		if (x &gt;= KERNEL_IMAGE_SIZE)</div><div class='add'>+			return false;</div><div class='add'>+		x += phys_base;</div><div class='add'>+	} else {</div><div class='add'>+		if (x &lt; PAGE_OFFSET)</div><div class='add'>+			return false;</div><div class='add'>+		x -= PAGE_OFFSET;</div><div class='add'>+		if (system_state == SYSTEM_BOOTING ?</div><div class='add'>+				x &gt; MAXMEM : !phys_addr_valid(x)) {</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return pfn_valid(x &gt;&gt; PAGE_SHIFT);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(__virt_addr_valid);</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='ctx'> </div><div class='hunk'>@@ -44,6 +73,28 @@ static inline int phys_addr_valid(unsigned long addr)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_DEBUG_VIRTUAL</div><div class='add'>+unsigned long __phys_addr(unsigned long x)</div><div class='add'>+{</div><div class='add'>+	/* VMALLOC_* aren't constants; not available at the boot time */</div><div class='add'>+	VIRTUAL_BUG_ON(x &lt; PAGE_OFFSET);</div><div class='add'>+	VIRTUAL_BUG_ON(system_state != SYSTEM_BOOTING &amp;&amp;</div><div class='add'>+		is_vmalloc_addr((void *) x));</div><div class='add'>+	return x - PAGE_OFFSET;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(__phys_addr);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+bool __virt_addr_valid(unsigned long x)</div><div class='add'>+{</div><div class='add'>+	if (x &lt; PAGE_OFFSET)</div><div class='add'>+		return false;</div><div class='add'>+	if (system_state != SYSTEM_BOOTING &amp;&amp; is_vmalloc_addr((void *) x))</div><div class='add'>+		return false;</div><div class='add'>+	return pfn_valid((x - PAGE_OFFSET) &gt;&gt; PAGE_SHIFT);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(__virt_addr_valid);</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> int page_is_ram(unsigned long pagenr)</div><div class='hunk'>@@ -83,6 +134,25 @@ int page_is_ram(unsigned long pagenr)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int pagerange_is_ram(unsigned long start, unsigned long end)</div><div class='add'>+{</div><div class='add'>+	int ram_page = 0, not_rampage = 0;</div><div class='add'>+	unsigned long page_nr;</div><div class='add'>+</div><div class='add'>+	for (page_nr = (start &gt;&gt; PAGE_SHIFT); page_nr &lt; (end &gt;&gt; PAGE_SHIFT);</div><div class='add'>+	     ++page_nr) {</div><div class='add'>+		if (page_is_ram(page_nr))</div><div class='add'>+			ram_page = 1;</div><div class='add'>+		else</div><div class='add'>+			not_rampage = 1;</div><div class='add'>+</div><div class='add'>+		if (ram_page == not_rampage)</div><div class='add'>+			return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ram_page;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Fix up the linear direct mapping of the kernel to avoid cache attribute</div><div class='ctx'>  * conflicts.</div><div class='hunk'>@@ -150,6 +220,12 @@ static void __iomem *__ioremap_caller(resource_size_t phys_addr,</div><div class='ctx'> 		return (__force void __iomem *)phys_to_virt(phys_addr);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='add'>+	 * Check if the request spans more than any BAR in the iomem resource</div><div class='add'>+	 * tree.</div><div class='add'>+	 */</div><div class='add'>+	WARN_ON(iomem_map_sanity_check(phys_addr, size));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='ctx'> 	 * Don't allow anybody to remap normal RAM that we're using..</div><div class='ctx'> 	 */</div><div class='ctx'> 	for (pfn = phys_addr &gt;&gt; PAGE_SHIFT;</div><div class='hunk'>@@ -204,16 +280,16 @@ static void __iomem *__ioremap_caller(resource_size_t phys_addr,</div><div class='ctx'> 	switch (prot_val) {</div><div class='ctx'> 	case _PAGE_CACHE_UC:</div><div class='ctx'> 	default:</div><div class='del'>-		prot = PAGE_KERNEL_NOCACHE;</div><div class='add'>+		prot = PAGE_KERNEL_IO_NOCACHE;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case _PAGE_CACHE_UC_MINUS:</div><div class='del'>-		prot = PAGE_KERNEL_UC_MINUS;</div><div class='add'>+		prot = PAGE_KERNEL_IO_UC_MINUS;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case _PAGE_CACHE_WC:</div><div class='del'>-		prot = PAGE_KERNEL_WC;</div><div class='add'>+		prot = PAGE_KERNEL_IO_WC;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case _PAGE_CACHE_WB:</div><div class='del'>-		prot = PAGE_KERNEL;</div><div class='add'>+		prot = PAGE_KERNEL_IO;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -421,7 +497,7 @@ void unxlate_dev_mem_ptr(unsigned long phys, void *addr)</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __initdata early_ioremap_debug;</div><div class='add'>+static int __initdata early_ioremap_debug;</div><div class='ctx'> </div><div class='ctx'> static int __init early_ioremap_debug_setup(char *str)</div><div class='ctx'> {</div><div class='hunk'>@@ -530,12 +606,12 @@ static void __init __early_set_fixmap(enum fixed_addresses idx,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void __init early_set_fixmap(enum fixed_addresses idx,</div><div class='del'>-					unsigned long phys)</div><div class='add'>+					   unsigned long phys, pgprot_t prot)</div><div class='ctx'> {</div><div class='ctx'> 	if (after_paging_init)</div><div class='del'>-		set_fixmap(idx, phys);</div><div class='add'>+		__set_fixmap(idx, phys, prot);</div><div class='ctx'> 	else</div><div class='del'>-		__early_set_fixmap(idx, phys, PAGE_KERNEL);</div><div class='add'>+		__early_set_fixmap(idx, phys, prot);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void __init early_clear_fixmap(enum fixed_addresses idx)</div><div class='hunk'>@@ -546,16 +622,22 @@ static inline void __init early_clear_fixmap(enum fixed_addresses idx)</div><div class='ctx'> 		__early_set_fixmap(idx, 0, __pgprot(0));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-int __initdata early_ioremap_nested;</div><div class='del'>-</div><div class='add'>+static void *prev_map[FIX_BTMAPS_SLOTS] __initdata;</div><div class='add'>+static unsigned long prev_size[FIX_BTMAPS_SLOTS] __initdata;</div><div class='ctx'> static int __init check_early_ioremap_leak(void)</div><div class='ctx'> {</div><div class='del'>-	if (!early_ioremap_nested)</div><div class='add'>+	int count = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; FIX_BTMAPS_SLOTS; i++)</div><div class='add'>+		if (prev_map[i])</div><div class='add'>+			count++;</div><div class='add'>+</div><div class='add'>+	if (!count)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	WARN(1, KERN_WARNING</div><div class='ctx'> 	       "Debug warning: early ioremap leak of %d areas detected.\n",</div><div class='del'>-		early_ioremap_nested);</div><div class='add'>+		count);</div><div class='ctx'> 	printk(KERN_WARNING</div><div class='ctx'> 		"please boot with early_ioremap_debug and report the dmesg.\n");</div><div class='ctx'> </div><div class='hunk'>@@ -563,18 +645,33 @@ static int __init check_early_ioremap_leak(void)</div><div class='ctx'> }</div><div class='ctx'> late_initcall(check_early_ioremap_leak);</div><div class='ctx'> </div><div class='del'>-void __init *early_ioremap(unsigned long phys_addr, unsigned long size)</div><div class='add'>+static void __init *__early_ioremap(unsigned long phys_addr, unsigned long size, pgprot_t prot)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long offset, last_addr;</div><div class='del'>-	unsigned int nrpages, nesting;</div><div class='add'>+	unsigned int nrpages;</div><div class='ctx'> 	enum fixed_addresses idx0, idx;</div><div class='add'>+	int i, slot;</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON(system_state != SYSTEM_BOOTING);</div><div class='ctx'> </div><div class='del'>-	nesting = early_ioremap_nested;</div><div class='add'>+	slot = -1;</div><div class='add'>+	for (i = 0; i &lt; FIX_BTMAPS_SLOTS; i++) {</div><div class='add'>+		if (!prev_map[i]) {</div><div class='add'>+			slot = i;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (slot &lt; 0) {</div><div class='add'>+		printk(KERN_INFO "early_iomap(%08lx, %08lx) not found slot\n",</div><div class='add'>+			 phys_addr, size);</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (early_ioremap_debug) {</div><div class='ctx'> 		printk(KERN_INFO "early_ioremap(%08lx, %08lx) [%d] =&gt; ",</div><div class='del'>-		       phys_addr, size, nesting);</div><div class='add'>+		       phys_addr, size, slot);</div><div class='ctx'> 		dump_stack();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -585,17 +682,13 @@ void __init *early_ioremap(unsigned long phys_addr, unsigned long size)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (nesting &gt;= FIX_BTMAPS_NESTING) {</div><div class='del'>-		WARN_ON(1);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	early_ioremap_nested++;</div><div class='add'>+	prev_size[slot] = size;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Mappings have to be page-aligned</div><div class='ctx'> 	 */</div><div class='ctx'> 	offset = phys_addr &amp; ~PAGE_MASK;</div><div class='ctx'> 	phys_addr &amp;= PAGE_MASK;</div><div class='del'>-	size = PAGE_ALIGN(last_addr) - phys_addr;</div><div class='add'>+	size = PAGE_ALIGN(last_addr + 1) - phys_addr;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Mappings have to fit in the FIX_BTMAP area.</div><div class='hunk'>@@ -609,10 +702,10 @@ void __init *early_ioremap(unsigned long phys_addr, unsigned long size)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Ok, go for it..</div><div class='ctx'> 	 */</div><div class='del'>-	idx0 = FIX_BTMAP_BEGIN - NR_FIX_BTMAPS*nesting;</div><div class='add'>+	idx0 = FIX_BTMAP_BEGIN - NR_FIX_BTMAPS*slot;</div><div class='ctx'> 	idx = idx0;</div><div class='ctx'> 	while (nrpages &gt; 0) {</div><div class='del'>-		early_set_fixmap(idx, phys_addr);</div><div class='add'>+		early_set_fixmap(idx, phys_addr, prot);</div><div class='ctx'> 		phys_addr += PAGE_SIZE;</div><div class='ctx'> 		--idx;</div><div class='ctx'> 		--nrpages;</div><div class='hunk'>@@ -620,7 +713,20 @@ void __init *early_ioremap(unsigned long phys_addr, unsigned long size)</div><div class='ctx'> 	if (early_ioremap_debug)</div><div class='ctx'> 		printk(KERN_CONT "%08lx + %08lx\n", offset, fix_to_virt(idx0));</div><div class='ctx'> </div><div class='del'>-	return (void *) (offset + fix_to_virt(idx0));</div><div class='add'>+	prev_map[slot] = (void *) (offset + fix_to_virt(idx0));</div><div class='add'>+	return prev_map[slot];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Remap an IO device */</div><div class='add'>+void __init *early_ioremap(unsigned long phys_addr, unsigned long size)</div><div class='add'>+{</div><div class='add'>+	return __early_ioremap(phys_addr, size, PAGE_KERNEL_IO);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Remap memory */</div><div class='add'>+void __init *early_memremap(unsigned long phys_addr, unsigned long size)</div><div class='add'>+{</div><div class='add'>+	return __early_ioremap(phys_addr, size, PAGE_KERNEL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __init early_iounmap(void *addr, unsigned long size)</div><div class='hunk'>@@ -629,15 +735,33 @@ void __init early_iounmap(void *addr, unsigned long size)</div><div class='ctx'> 	unsigned long offset;</div><div class='ctx'> 	unsigned int nrpages;</div><div class='ctx'> 	enum fixed_addresses idx;</div><div class='del'>-	int nesting;</div><div class='add'>+	int i, slot;</div><div class='add'>+</div><div class='add'>+	slot = -1;</div><div class='add'>+	for (i = 0; i &lt; FIX_BTMAPS_SLOTS; i++) {</div><div class='add'>+		if (prev_map[i] == addr) {</div><div class='add'>+			slot = i;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (slot &lt; 0) {</div><div class='add'>+		printk(KERN_INFO "early_iounmap(%p, %08lx) not found slot\n",</div><div class='add'>+			 addr, size);</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	nesting = --early_ioremap_nested;</div><div class='del'>-	if (WARN_ON(nesting &lt; 0))</div><div class='add'>+	if (prev_size[slot] != size) {</div><div class='add'>+		printk(KERN_INFO "early_iounmap(%p, %08lx) [%d] size not consistent %08lx\n",</div><div class='add'>+			 addr, size, slot, prev_size[slot]);</div><div class='add'>+		WARN_ON(1);</div><div class='ctx'> 		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (early_ioremap_debug) {</div><div class='ctx'> 		printk(KERN_INFO "early_iounmap(%p, %08lx) [%d]\n", addr,</div><div class='del'>-		       size, nesting);</div><div class='add'>+		       size, slot);</div><div class='ctx'> 		dump_stack();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -649,12 +773,13 @@ void __init early_iounmap(void *addr, unsigned long size)</div><div class='ctx'> 	offset = virt_addr &amp; ~PAGE_MASK;</div><div class='ctx'> 	nrpages = PAGE_ALIGN(offset + size - 1) &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> </div><div class='del'>-	idx = FIX_BTMAP_BEGIN - NR_FIX_BTMAPS*nesting;</div><div class='add'>+	idx = FIX_BTMAP_BEGIN - NR_FIX_BTMAPS*slot;</div><div class='ctx'> 	while (nrpages &gt; 0) {</div><div class='ctx'> 		early_clear_fixmap(idx);</div><div class='ctx'> 		--idx;</div><div class='ctx'> 		--nrpages;</div><div class='ctx'> 	}</div><div class='add'>+	prev_map[slot] = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __this_fixmap_does_not_exist(void)</div><div class='head'>diff --git a/arch/x86/mm/discontig_32.c b/arch/x86/mm/numa_32.c<br/>index 62fa440678d8..847c164725f4 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/mm/discontig_32.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/mm/discontig_32.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/mm/numa_32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/mm/numa_32.c</a></div><div class='hunk'>@@ -328,7 +328,7 @@ void __init initmem_init(unsigned long start_pfn,</div><div class='ctx'> </div><div class='ctx'> 	get_memcfg_numa();</div><div class='ctx'> </div><div class='del'>-	kva_pages = round_up(calculate_numa_remap_pages(), PTRS_PER_PTE);</div><div class='add'>+	kva_pages = roundup(calculate_numa_remap_pages(), PTRS_PER_PTE);</div><div class='ctx'> </div><div class='ctx'> 	kva_target_pfn = round_down(max_low_pfn - kva_pages, PTRS_PER_PTE);</div><div class='ctx'> 	do {</div><div class='head'>diff --git a/arch/x86/mm/numa_64.c b/arch/x86/mm/numa_64.c<br/>index a4dd793d6003..cebcbf152d46 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/mm/numa_64.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/mm/numa_64.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/mm/numa_64.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/mm/numa_64.c</a></div><div class='hunk'>@@ -79,7 +79,7 @@ static int __init allocate_cachealigned_memnodemap(void)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	addr = 0x8000;</div><div class='del'>-	nodemap_size = round_up(sizeof(s16) * memnodemapsize, L1_CACHE_BYTES);</div><div class='add'>+	nodemap_size = roundup(sizeof(s16) * memnodemapsize, L1_CACHE_BYTES);</div><div class='ctx'> 	nodemap_addr = find_e820_area(addr, max_pfn&lt;&lt;PAGE_SHIFT,</div><div class='ctx'> 				      nodemap_size, L1_CACHE_BYTES);</div><div class='ctx'> 	if (nodemap_addr == -1UL) {</div><div class='hunk'>@@ -176,10 +176,10 @@ void __init setup_node_bootmem(int nodeid, unsigned long start,</div><div class='ctx'> 	unsigned long start_pfn, last_pfn, bootmap_pages, bootmap_size;</div><div class='ctx'> 	unsigned long bootmap_start, nodedata_phys;</div><div class='ctx'> 	void *bootmap;</div><div class='del'>-	const int pgdat_size = round_up(sizeof(pg_data_t), PAGE_SIZE);</div><div class='add'>+	const int pgdat_size = roundup(sizeof(pg_data_t), PAGE_SIZE);</div><div class='ctx'> 	int nid;</div><div class='ctx'> </div><div class='del'>-	start = round_up(start, ZONE_ALIGN);</div><div class='add'>+	start = roundup(start, ZONE_ALIGN);</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_INFO "Bootmem setup node %d %016lx-%016lx\n", nodeid,</div><div class='ctx'> 	       start, end);</div><div class='hunk'>@@ -210,9 +210,9 @@ void __init setup_node_bootmem(int nodeid, unsigned long start,</div><div class='ctx'> 	bootmap_pages = bootmem_bootmap_pages(last_pfn - start_pfn);</div><div class='ctx'> 	nid = phys_to_nid(nodedata_phys);</div><div class='ctx'> 	if (nid == nodeid)</div><div class='del'>-		bootmap_start = round_up(nodedata_phys + pgdat_size, PAGE_SIZE);</div><div class='add'>+		bootmap_start = roundup(nodedata_phys + pgdat_size, PAGE_SIZE);</div><div class='ctx'> 	else</div><div class='del'>-		bootmap_start = round_up(start, PAGE_SIZE);</div><div class='add'>+		bootmap_start = roundup(start, PAGE_SIZE);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * SMP_CACHE_BYTES could be enough, but init_bootmem_node like</div><div class='ctx'> 	 * to use that to align to PAGE_SIZE</div><div class='head'>diff --git a/arch/x86/mm/pageattr-test.c b/arch/x86/mm/pageattr-test.c<br/>index d4aa503caaa2..e1d106909218 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/mm/pageattr-test.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/mm/pageattr-test.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/mm/pageattr-test.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/mm/pageattr-test.c</a></div><div class='hunk'>@@ -32,7 +32,7 @@ enum {</div><div class='ctx'> 	GPS			= (1&lt;&lt;30)</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define PAGE_TESTBIT	__pgprot(_PAGE_UNUSED1)</div><div class='add'>+#define PAGE_CPA_TEST	__pgprot(_PAGE_CPA_TEST)</div><div class='ctx'> </div><div class='ctx'> static int pte_testbit(pte_t pte)</div><div class='ctx'> {</div><div class='hunk'>@@ -118,6 +118,7 @@ static int pageattr_test(void)</div><div class='ctx'> 	unsigned int level;</div><div class='ctx'> 	int i, k;</div><div class='ctx'> 	int err;</div><div class='add'>+	unsigned long test_addr;</div><div class='ctx'> </div><div class='ctx'> 	if (print)</div><div class='ctx'> 		printk(KERN_INFO "CPA self-test:\n");</div><div class='hunk'>@@ -172,7 +173,8 @@ static int pageattr_test(void)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		err = change_page_attr_set(addr[i], len[i], PAGE_TESTBIT);</div><div class='add'>+		test_addr = addr[i];</div><div class='add'>+		err = change_page_attr_set(&amp;test_addr, len[i], PAGE_CPA_TEST, 0);</div><div class='ctx'> 		if (err &lt; 0) {</div><div class='ctx'> 			printk(KERN_ERR "CPA %d failed %d\n", i, err);</div><div class='ctx'> 			failed++;</div><div class='hunk'>@@ -204,7 +206,8 @@ static int pageattr_test(void)</div><div class='ctx'> 			failed++;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='del'>-		err = change_page_attr_clear(addr[i], len[i], PAGE_TESTBIT);</div><div class='add'>+		test_addr = addr[i];</div><div class='add'>+		err = change_page_attr_clear(&amp;test_addr, len[i], PAGE_CPA_TEST, 0);</div><div class='ctx'> 		if (err &lt; 0) {</div><div class='ctx'> 			printk(KERN_ERR "CPA reverting failed: %d\n", err);</div><div class='ctx'> 			failed++;</div><div class='head'>diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c<br/>index 43e2f8483e4f..a9ec89c3fbca 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/mm/pageattr.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/mm/pageattr.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/mm/pageattr.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/mm/pageattr.c</a></div><div class='hunk'>@@ -25,15 +25,27 @@</div><div class='ctx'>  * The current flushing context - we pass it instead of 5 arguments:</div><div class='ctx'>  */</div><div class='ctx'> struct cpa_data {</div><div class='del'>-	unsigned long	vaddr;</div><div class='add'>+	unsigned long	*vaddr;</div><div class='ctx'> 	pgprot_t	mask_set;</div><div class='ctx'> 	pgprot_t	mask_clr;</div><div class='ctx'> 	int		numpages;</div><div class='del'>-	int		flushtlb;</div><div class='add'>+	int		flags;</div><div class='ctx'> 	unsigned long	pfn;</div><div class='ctx'> 	unsigned	force_split : 1;</div><div class='add'>+	int		curpage;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Serialize cpa() (for !DEBUG_PAGEALLOC which uses large identity mappings)</div><div class='add'>+ * using cpa_lock. So that we don't allow any other cpu, with stale large tlb</div><div class='add'>+ * entries change the page attribute in parallel to some other cpu</div><div class='add'>+ * splitting a large page entry along with changing the attribute.</div><div class='add'>+ */</div><div class='add'>+static DEFINE_SPINLOCK(cpa_lock);</div><div class='add'>+</div><div class='add'>+#define CPA_FLUSHTLB 1</div><div class='add'>+#define CPA_ARRAY 2</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_PROC_FS</div><div class='ctx'> static unsigned long direct_pages_count[PG_LEVEL_NUM];</div><div class='ctx'> </div><div class='hunk'>@@ -84,7 +96,7 @@ static inline unsigned long highmap_start_pfn(void)</div><div class='ctx'> </div><div class='ctx'> static inline unsigned long highmap_end_pfn(void)</div><div class='ctx'> {</div><div class='del'>-	return __pa(round_up((unsigned long)_end, PMD_SIZE)) &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	return __pa(roundup((unsigned long)_end, PMD_SIZE)) &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='hunk'>@@ -190,6 +202,41 @@ static void cpa_flush_range(unsigned long start, int numpages, int cache)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void cpa_flush_array(unsigned long *start, int numpages, int cache)</div><div class='add'>+{</div><div class='add'>+	unsigned int i, level;</div><div class='add'>+	unsigned long *addr;</div><div class='add'>+</div><div class='add'>+	BUG_ON(irqs_disabled());</div><div class='add'>+</div><div class='add'>+	on_each_cpu(__cpa_flush_range, NULL, 1);</div><div class='add'>+</div><div class='add'>+	if (!cache)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* 4M threshold */</div><div class='add'>+	if (numpages &gt;= 1024) {</div><div class='add'>+		if (boot_cpu_data.x86_model &gt;= 4)</div><div class='add'>+			wbinvd();</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	/*</div><div class='add'>+	 * We only need to flush on one CPU,</div><div class='add'>+	 * clflush is a MESI-coherent instruction that</div><div class='add'>+	 * will cause all other CPUs to flush the same</div><div class='add'>+	 * cachelines:</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0, addr = start; i &lt; numpages; i++, addr++) {</div><div class='add'>+		pte_t *pte = lookup_address(*addr, &amp;level);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Only flush present addresses:</div><div class='add'>+		 */</div><div class='add'>+		if (pte &amp;&amp; (pte_val(*pte) &amp; _PAGE_PRESENT))</div><div class='add'>+			clflush_cache_range((void *) *addr, PAGE_SIZE);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Certain areas of memory on x86 require very specific protection flags,</div><div class='ctx'>  * for example the BIOS area or kernel text. Callers don't always get this</div><div class='hunk'>@@ -398,7 +445,7 @@ try_preserve_large_page(pte_t *kpte, unsigned long address,</div><div class='ctx'> 		 */</div><div class='ctx'> 		new_pte = pfn_pte(pte_pfn(old_pte), canon_pgprot(new_prot));</div><div class='ctx'> 		__set_pmd_pte(kpte, address, new_pte);</div><div class='del'>-		cpa-&gt;flushtlb = 1;</div><div class='add'>+		cpa-&gt;flags |= CPA_FLUSHTLB;</div><div class='ctx'> 		do_split = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -408,84 +455,6 @@ out_unlock:</div><div class='ctx'> 	return do_split;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static LIST_HEAD(page_pool);</div><div class='del'>-static unsigned long pool_size, pool_pages, pool_low;</div><div class='del'>-static unsigned long pool_used, pool_failed;</div><div class='del'>-</div><div class='del'>-static void cpa_fill_pool(struct page **ret)</div><div class='del'>-{</div><div class='del'>-	gfp_t gfp = GFP_KERNEL;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	struct page *p;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Avoid recursion (on debug-pagealloc) and also signal</div><div class='del'>-	 * our priority to get to these pagetables:</div><div class='del'>-	 */</div><div class='del'>-	if (current-&gt;flags &amp; PF_MEMALLOC)</div><div class='del'>-		return;</div><div class='del'>-	current-&gt;flags |= PF_MEMALLOC;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Allocate atomically from atomic contexts:</div><div class='del'>-	 */</div><div class='del'>-	if (in_atomic() || irqs_disabled() || debug_pagealloc)</div><div class='del'>-		gfp =  GFP_ATOMIC | __GFP_NORETRY | __GFP_NOWARN;</div><div class='del'>-</div><div class='del'>-	while (pool_pages &lt; pool_size || (ret &amp;&amp; !*ret)) {</div><div class='del'>-		p = alloc_pages(gfp, 0);</div><div class='del'>-		if (!p) {</div><div class='del'>-			pool_failed++;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		/*</div><div class='del'>-		 * If the call site needs a page right now, provide it:</div><div class='del'>-		 */</div><div class='del'>-		if (ret &amp;&amp; !*ret) {</div><div class='del'>-			*ret = p;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		spin_lock_irqsave(&amp;pgd_lock, flags);</div><div class='del'>-		list_add(&amp;p-&gt;lru, &amp;page_pool);</div><div class='del'>-		pool_pages++;</div><div class='del'>-		spin_unlock_irqrestore(&amp;pgd_lock, flags);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	current-&gt;flags &amp;= ~PF_MEMALLOC;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define SHIFT_MB		(20 - PAGE_SHIFT)</div><div class='del'>-#define ROUND_MB_GB		((1 &lt;&lt; 10) - 1)</div><div class='del'>-#define SHIFT_MB_GB		10</div><div class='del'>-#define POOL_PAGES_PER_GB	16</div><div class='del'>-</div><div class='del'>-void __init cpa_init(void)</div><div class='del'>-{</div><div class='del'>-	struct sysinfo si;</div><div class='del'>-	unsigned long gb;</div><div class='del'>-</div><div class='del'>-	si_meminfo(&amp;si);</div><div class='del'>-	/*</div><div class='del'>-	 * Calculate the number of pool pages:</div><div class='del'>-	 *</div><div class='del'>-	 * Convert totalram (nr of pages) to MiB and round to the next</div><div class='del'>-	 * GiB. Shift MiB to Gib and multiply the result by</div><div class='del'>-	 * POOL_PAGES_PER_GB:</div><div class='del'>-	 */</div><div class='del'>-	if (debug_pagealloc) {</div><div class='del'>-		gb = ((si.totalram &gt;&gt; SHIFT_MB) + ROUND_MB_GB) &gt;&gt; SHIFT_MB_GB;</div><div class='del'>-		pool_size = POOL_PAGES_PER_GB * gb;</div><div class='del'>-	} else {</div><div class='del'>-		pool_size = 1;</div><div class='del'>-	}</div><div class='del'>-	pool_low = pool_size;</div><div class='del'>-</div><div class='del'>-	cpa_fill_pool(NULL);</div><div class='del'>-	printk(KERN_DEBUG</div><div class='del'>-	       "CPA: page pool initialized %lu of %lu pages preallocated\n",</div><div class='del'>-	       pool_pages, pool_size);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int split_large_page(pte_t *kpte, unsigned long address)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags, pfn, pfninc = 1;</div><div class='hunk'>@@ -494,28 +463,15 @@ static int split_large_page(pte_t *kpte, unsigned long address)</div><div class='ctx'> 	pgprot_t ref_prot;</div><div class='ctx'> 	struct page *base;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Get a page from the pool. The pool list is protected by the</div><div class='del'>-	 * pgd_lock, which we have to take anyway for the split</div><div class='del'>-	 * operation:</div><div class='del'>-	 */</div><div class='del'>-	spin_lock_irqsave(&amp;pgd_lock, flags);</div><div class='del'>-	if (list_empty(&amp;page_pool)) {</div><div class='del'>-		spin_unlock_irqrestore(&amp;pgd_lock, flags);</div><div class='del'>-		base = NULL;</div><div class='del'>-		cpa_fill_pool(&amp;base);</div><div class='del'>-		if (!base)</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		spin_lock_irqsave(&amp;pgd_lock, flags);</div><div class='del'>-	} else {</div><div class='del'>-		base = list_first_entry(&amp;page_pool, struct page, lru);</div><div class='del'>-		list_del(&amp;base-&gt;lru);</div><div class='del'>-		pool_pages--;</div><div class='del'>-</div><div class='del'>-		if (pool_pages &lt; pool_low)</div><div class='del'>-			pool_low = pool_pages;</div><div class='del'>-	}</div><div class='add'>+	if (!debug_pagealloc)</div><div class='add'>+		spin_unlock(&amp;cpa_lock);</div><div class='add'>+	base = alloc_pages(GFP_KERNEL, 0);</div><div class='add'>+	if (!debug_pagealloc)</div><div class='add'>+		spin_lock(&amp;cpa_lock);</div><div class='add'>+	if (!base)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='add'>+	spin_lock_irqsave(&amp;pgd_lock, flags);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Check for races, another CPU might have split this page</div><div class='ctx'> 	 * up for us already:</div><div class='hunk'>@@ -572,11 +528,8 @@ out_unlock:</div><div class='ctx'> 	 * If we dropped out via the lookup_address check under</div><div class='ctx'> 	 * pgd_lock then stick the page back into the pool:</div><div class='ctx'> 	 */</div><div class='del'>-	if (base) {</div><div class='del'>-		list_add(&amp;base-&gt;lru, &amp;page_pool);</div><div class='del'>-		pool_pages++;</div><div class='del'>-	} else</div><div class='del'>-		pool_used++;</div><div class='add'>+	if (base)</div><div class='add'>+		__free_page(base);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;pgd_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -584,11 +537,16 @@ out_unlock:</div><div class='ctx'> </div><div class='ctx'> static int __change_page_attr(struct cpa_data *cpa, int primary)</div><div class='ctx'> {</div><div class='del'>-	unsigned long address = cpa-&gt;vaddr;</div><div class='add'>+	unsigned long address;</div><div class='ctx'> 	int do_split, err;</div><div class='ctx'> 	unsigned int level;</div><div class='ctx'> 	pte_t *kpte, old_pte;</div><div class='ctx'> </div><div class='add'>+	if (cpa-&gt;flags &amp; CPA_ARRAY)</div><div class='add'>+		address = cpa-&gt;vaddr[cpa-&gt;curpage];</div><div class='add'>+	else</div><div class='add'>+		address = *cpa-&gt;vaddr;</div><div class='add'>+</div><div class='ctx'> repeat:</div><div class='ctx'> 	kpte = lookup_address(address, &amp;level);</div><div class='ctx'> 	if (!kpte)</div><div class='hunk'>@@ -600,7 +558,7 @@ repeat:</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		WARN(1, KERN_WARNING "CPA: called for zero pte. "</div><div class='ctx'> 		       "vaddr = %lx cpa-&gt;vaddr = %lx\n", address,</div><div class='del'>-		       cpa-&gt;vaddr);</div><div class='add'>+		       *cpa-&gt;vaddr);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -626,7 +584,7 @@ repeat:</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (pte_val(old_pte) != pte_val(new_pte)) {</div><div class='ctx'> 			set_pte_atomic(kpte, new_pte);</div><div class='del'>-			cpa-&gt;flushtlb = 1;</div><div class='add'>+			cpa-&gt;flags |= CPA_FLUSHTLB;</div><div class='ctx'> 		}</div><div class='ctx'> 		cpa-&gt;numpages = 1;</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -650,7 +608,25 @@ repeat:</div><div class='ctx'> 	 */</div><div class='ctx'> 	err = split_large_page(kpte, address);</div><div class='ctx'> 	if (!err) {</div><div class='del'>-		cpa-&gt;flushtlb = 1;</div><div class='add'>+		/*</div><div class='add'>+	 	 * Do a global flush tlb after splitting the large page</div><div class='add'>+	 	 * and before we do the actual change page attribute in the PTE.</div><div class='add'>+	 	 *</div><div class='add'>+	 	 * With out this, we violate the TLB application note, that says</div><div class='add'>+	 	 * "The TLBs may contain both ordinary and large-page</div><div class='add'>+		 *  translations for a 4-KByte range of linear addresses. This</div><div class='add'>+		 *  may occur if software modifies the paging structures so that</div><div class='add'>+		 *  the page size used for the address range changes. If the two</div><div class='add'>+		 *  translations differ with respect to page frame or attributes</div><div class='add'>+		 *  (e.g., permissions), processor behavior is undefined and may</div><div class='add'>+		 *  be implementation-specific."</div><div class='add'>+	 	 *</div><div class='add'>+	 	 * We do this global tlb flush inside the cpa_lock, so that we</div><div class='add'>+		 * don't allow any other cpu, with stale tlb entries change the</div><div class='add'>+		 * page attribute in parallel, that also falls into the</div><div class='add'>+		 * just split large page entry.</div><div class='add'>+	 	 */</div><div class='add'>+		flush_tlb_all();</div><div class='ctx'> 		goto repeat;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -663,6 +639,7 @@ static int cpa_process_alias(struct cpa_data *cpa)</div><div class='ctx'> {</div><div class='ctx'> 	struct cpa_data alias_cpa;</div><div class='ctx'> 	int ret = 0;</div><div class='add'>+	unsigned long temp_cpa_vaddr, vaddr;</div><div class='ctx'> </div><div class='ctx'> 	if (cpa-&gt;pfn &gt;= max_pfn_mapped)</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -675,16 +652,24 @@ static int cpa_process_alias(struct cpa_data *cpa)</div><div class='ctx'> 	 * No need to redo, when the primary call touched the direct</div><div class='ctx'> 	 * mapping already:</div><div class='ctx'> 	 */</div><div class='del'>-	if (!(within(cpa-&gt;vaddr, PAGE_OFFSET,</div><div class='add'>+	if (cpa-&gt;flags &amp; CPA_ARRAY)</div><div class='add'>+		vaddr = cpa-&gt;vaddr[cpa-&gt;curpage];</div><div class='add'>+	else</div><div class='add'>+		vaddr = *cpa-&gt;vaddr;</div><div class='add'>+</div><div class='add'>+	if (!(within(vaddr, PAGE_OFFSET,</div><div class='ctx'> 		    PAGE_OFFSET + (max_low_pfn_mapped &lt;&lt; PAGE_SHIFT))</div><div class='ctx'> #ifdef CONFIG_X86_64</div><div class='del'>-		|| within(cpa-&gt;vaddr, PAGE_OFFSET + (1UL&lt;&lt;32),</div><div class='add'>+		|| within(vaddr, PAGE_OFFSET + (1UL&lt;&lt;32),</div><div class='ctx'> 		    PAGE_OFFSET + (max_pfn_mapped &lt;&lt; PAGE_SHIFT))</div><div class='ctx'> #endif</div><div class='ctx'> 	)) {</div><div class='ctx'> </div><div class='ctx'> 		alias_cpa = *cpa;</div><div class='del'>-		alias_cpa.vaddr = (unsigned long) __va(cpa-&gt;pfn &lt;&lt; PAGE_SHIFT);</div><div class='add'>+		temp_cpa_vaddr = (unsigned long) __va(cpa-&gt;pfn &lt;&lt; PAGE_SHIFT);</div><div class='add'>+		alias_cpa.vaddr = &amp;temp_cpa_vaddr;</div><div class='add'>+		alias_cpa.flags &amp;= ~CPA_ARRAY;</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> 		ret = __change_page_attr_set_clr(&amp;alias_cpa, 0);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -696,7 +681,7 @@ static int cpa_process_alias(struct cpa_data *cpa)</div><div class='ctx'> 	 * No need to redo, when the primary call touched the high</div><div class='ctx'> 	 * mapping already:</div><div class='ctx'> 	 */</div><div class='del'>-	if (within(cpa-&gt;vaddr, (unsigned long) _text, (unsigned long) _end))</div><div class='add'>+	if (within(vaddr, (unsigned long) _text, (unsigned long) _end))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -707,8 +692,9 @@ static int cpa_process_alias(struct cpa_data *cpa)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	alias_cpa = *cpa;</div><div class='del'>-	alias_cpa.vaddr =</div><div class='del'>-		(cpa-&gt;pfn &lt;&lt; PAGE_SHIFT) + __START_KERNEL_map - phys_base;</div><div class='add'>+	temp_cpa_vaddr = (cpa-&gt;pfn &lt;&lt; PAGE_SHIFT) + __START_KERNEL_map - phys_base;</div><div class='add'>+	alias_cpa.vaddr = &amp;temp_cpa_vaddr;</div><div class='add'>+	alias_cpa.flags &amp;= ~CPA_ARRAY;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The high mapping range is imprecise, so ignore the return value.</div><div class='hunk'>@@ -728,8 +714,15 @@ static int __change_page_attr_set_clr(struct cpa_data *cpa, int checkalias)</div><div class='ctx'> 		 * preservation check.</div><div class='ctx'> 		 */</div><div class='ctx'> 		cpa-&gt;numpages = numpages;</div><div class='add'>+		/* for array changes, we can't use large page */</div><div class='add'>+		if (cpa-&gt;flags &amp; CPA_ARRAY)</div><div class='add'>+			cpa-&gt;numpages = 1;</div><div class='ctx'> </div><div class='add'>+		if (!debug_pagealloc)</div><div class='add'>+			spin_lock(&amp;cpa_lock);</div><div class='ctx'> 		ret = __change_page_attr(cpa, checkalias);</div><div class='add'>+		if (!debug_pagealloc)</div><div class='add'>+			spin_unlock(&amp;cpa_lock);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -746,7 +739,11 @@ static int __change_page_attr_set_clr(struct cpa_data *cpa, int checkalias)</div><div class='ctx'> 		 */</div><div class='ctx'> 		BUG_ON(cpa-&gt;numpages &gt; numpages);</div><div class='ctx'> 		numpages -= cpa-&gt;numpages;</div><div class='del'>-		cpa-&gt;vaddr += cpa-&gt;numpages * PAGE_SIZE;</div><div class='add'>+		if (cpa-&gt;flags &amp; CPA_ARRAY)</div><div class='add'>+			cpa-&gt;curpage++;</div><div class='add'>+		else</div><div class='add'>+			*cpa-&gt;vaddr += cpa-&gt;numpages * PAGE_SIZE;</div><div class='add'>+</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -757,9 +754,9 @@ static inline int cache_attr(pgprot_t attr)</div><div class='ctx'> 		(_PAGE_PAT | _PAGE_PAT_LARGE | _PAGE_PWT | _PAGE_PCD);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int change_page_attr_set_clr(unsigned long addr, int numpages,</div><div class='add'>+static int change_page_attr_set_clr(unsigned long *addr, int numpages,</div><div class='ctx'> 				    pgprot_t mask_set, pgprot_t mask_clr,</div><div class='del'>-				    int force_split)</div><div class='add'>+				    int force_split, int array)</div><div class='ctx'> {</div><div class='ctx'> 	struct cpa_data cpa;</div><div class='ctx'> 	int ret, cache, checkalias;</div><div class='hunk'>@@ -774,21 +771,38 @@ static int change_page_attr_set_clr(unsigned long addr, int numpages,</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Ensure we are PAGE_SIZE aligned */</div><div class='del'>-	if (addr &amp; ~PAGE_MASK) {</div><div class='del'>-		addr &amp;= PAGE_MASK;</div><div class='del'>-		/*</div><div class='del'>-		 * People should not be passing in unaligned addresses:</div><div class='del'>-		 */</div><div class='del'>-		WARN_ON_ONCE(1);</div><div class='add'>+	if (!array) {</div><div class='add'>+		if (*addr &amp; ~PAGE_MASK) {</div><div class='add'>+			*addr &amp;= PAGE_MASK;</div><div class='add'>+			/*</div><div class='add'>+			 * People should not be passing in unaligned addresses:</div><div class='add'>+			 */</div><div class='add'>+			WARN_ON_ONCE(1);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		int i;</div><div class='add'>+		for (i = 0; i &lt; numpages; i++) {</div><div class='add'>+			if (addr[i] &amp; ~PAGE_MASK) {</div><div class='add'>+				addr[i] &amp;= PAGE_MASK;</div><div class='add'>+				WARN_ON_ONCE(1);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Must avoid aliasing mappings in the highmem code */</div><div class='add'>+	kmap_flush_unused();</div><div class='add'>+</div><div class='ctx'> 	cpa.vaddr = addr;</div><div class='ctx'> 	cpa.numpages = numpages;</div><div class='ctx'> 	cpa.mask_set = mask_set;</div><div class='ctx'> 	cpa.mask_clr = mask_clr;</div><div class='del'>-	cpa.flushtlb = 0;</div><div class='add'>+	cpa.flags = 0;</div><div class='add'>+	cpa.curpage = 0;</div><div class='ctx'> 	cpa.force_split = force_split;</div><div class='ctx'> </div><div class='add'>+	if (array)</div><div class='add'>+		cpa.flags |= CPA_ARRAY;</div><div class='add'>+</div><div class='ctx'> 	/* No alias checking for _NX bit modifications */</div><div class='ctx'> 	checkalias = (pgprot_val(mask_set) | pgprot_val(mask_clr)) != _PAGE_NX;</div><div class='ctx'> </div><div class='hunk'>@@ -797,7 +811,7 @@ static int change_page_attr_set_clr(unsigned long addr, int numpages,</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Check whether we really changed something:</div><div class='ctx'> 	 */</div><div class='del'>-	if (!cpa.flushtlb)</div><div class='add'>+	if (!(cpa.flags &amp; CPA_FLUSHTLB))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -812,27 +826,30 @@ static int change_page_attr_set_clr(unsigned long addr, int numpages,</div><div class='ctx'> 	 * error case we fall back to cpa_flush_all (which uses</div><div class='ctx'> 	 * wbindv):</div><div class='ctx'> 	 */</div><div class='del'>-	if (!ret &amp;&amp; cpu_has_clflush)</div><div class='del'>-		cpa_flush_range(addr, numpages, cache);</div><div class='del'>-	else</div><div class='add'>+	if (!ret &amp;&amp; cpu_has_clflush) {</div><div class='add'>+		if (cpa.flags &amp; CPA_ARRAY)</div><div class='add'>+			cpa_flush_array(addr, numpages, cache);</div><div class='add'>+		else</div><div class='add'>+			cpa_flush_range(*addr, numpages, cache);</div><div class='add'>+	} else</div><div class='ctx'> 		cpa_flush_all(cache);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	cpa_fill_pool(NULL);</div><div class='del'>-</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int change_page_attr_set(unsigned long addr, int numpages,</div><div class='del'>-				       pgprot_t mask)</div><div class='add'>+static inline int change_page_attr_set(unsigned long *addr, int numpages,</div><div class='add'>+				       pgprot_t mask, int array)</div><div class='ctx'> {</div><div class='del'>-	return change_page_attr_set_clr(addr, numpages, mask, __pgprot(0), 0);</div><div class='add'>+	return change_page_attr_set_clr(addr, numpages, mask, __pgprot(0), 0,</div><div class='add'>+		array);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int change_page_attr_clear(unsigned long addr, int numpages,</div><div class='del'>-					 pgprot_t mask)</div><div class='add'>+static inline int change_page_attr_clear(unsigned long *addr, int numpages,</div><div class='add'>+					 pgprot_t mask, int array)</div><div class='ctx'> {</div><div class='del'>-	return change_page_attr_set_clr(addr, numpages, __pgprot(0), mask, 0);</div><div class='add'>+	return change_page_attr_set_clr(addr, numpages, __pgprot(0), mask, 0,</div><div class='add'>+		array);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int _set_memory_uc(unsigned long addr, int numpages)</div><div class='hunk'>@@ -840,8 +857,8 @@ int _set_memory_uc(unsigned long addr, int numpages)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * for now UC MINUS. see comments in ioremap_nocache()</div><div class='ctx'> 	 */</div><div class='del'>-	return change_page_attr_set(addr, numpages,</div><div class='del'>-				    __pgprot(_PAGE_CACHE_UC_MINUS));</div><div class='add'>+	return change_page_attr_set(&amp;addr, numpages,</div><div class='add'>+				    __pgprot(_PAGE_CACHE_UC_MINUS), 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int set_memory_uc(unsigned long addr, int numpages)</div><div class='hunk'>@@ -857,10 +874,48 @@ int set_memory_uc(unsigned long addr, int numpages)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(set_memory_uc);</div><div class='ctx'> </div><div class='add'>+int set_memory_array_uc(unsigned long *addr, int addrinarray)</div><div class='add'>+{</div><div class='add'>+	unsigned long start;</div><div class='add'>+	unsigned long end;</div><div class='add'>+	int i;</div><div class='add'>+	/*</div><div class='add'>+	 * for now UC MINUS. see comments in ioremap_nocache()</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; addrinarray; i++) {</div><div class='add'>+		start = __pa(addr[i]);</div><div class='add'>+		for (end = start + PAGE_SIZE; i &lt; addrinarray - 1; end += PAGE_SIZE) {</div><div class='add'>+			if (end != __pa(addr[i + 1]))</div><div class='add'>+				break;</div><div class='add'>+			i++;</div><div class='add'>+		}</div><div class='add'>+		if (reserve_memtype(start, end, _PAGE_CACHE_UC_MINUS, NULL))</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return change_page_attr_set(addr, addrinarray,</div><div class='add'>+				    __pgprot(_PAGE_CACHE_UC_MINUS), 1);</div><div class='add'>+out:</div><div class='add'>+	for (i = 0; i &lt; addrinarray; i++) {</div><div class='add'>+		unsigned long tmp = __pa(addr[i]);</div><div class='add'>+</div><div class='add'>+		if (tmp == start)</div><div class='add'>+			break;</div><div class='add'>+		for (end = tmp + PAGE_SIZE; i &lt; addrinarray - 1; end += PAGE_SIZE) {</div><div class='add'>+			if (end != __pa(addr[i + 1]))</div><div class='add'>+				break;</div><div class='add'>+			i++;</div><div class='add'>+		}</div><div class='add'>+		free_memtype(tmp, end);</div><div class='add'>+	}</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(set_memory_array_uc);</div><div class='add'>+</div><div class='ctx'> int _set_memory_wc(unsigned long addr, int numpages)</div><div class='ctx'> {</div><div class='del'>-	return change_page_attr_set(addr, numpages,</div><div class='del'>-				    __pgprot(_PAGE_CACHE_WC));</div><div class='add'>+	return change_page_attr_set(&amp;addr, numpages,</div><div class='add'>+				    __pgprot(_PAGE_CACHE_WC), 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int set_memory_wc(unsigned long addr, int numpages)</div><div class='hunk'>@@ -878,8 +933,8 @@ EXPORT_SYMBOL(set_memory_wc);</div><div class='ctx'> </div><div class='ctx'> int _set_memory_wb(unsigned long addr, int numpages)</div><div class='ctx'> {</div><div class='del'>-	return change_page_attr_clear(addr, numpages,</div><div class='del'>-				      __pgprot(_PAGE_CACHE_MASK));</div><div class='add'>+	return change_page_attr_clear(&amp;addr, numpages,</div><div class='add'>+				      __pgprot(_PAGE_CACHE_MASK), 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int set_memory_wb(unsigned long addr, int numpages)</div><div class='hunk'>@@ -890,37 +945,59 @@ int set_memory_wb(unsigned long addr, int numpages)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(set_memory_wb);</div><div class='ctx'> </div><div class='add'>+int set_memory_array_wb(unsigned long *addr, int addrinarray)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; addrinarray; i++) {</div><div class='add'>+		unsigned long start = __pa(addr[i]);</div><div class='add'>+		unsigned long end;</div><div class='add'>+</div><div class='add'>+		for (end = start + PAGE_SIZE; i &lt; addrinarray - 1; end += PAGE_SIZE) {</div><div class='add'>+			if (end != __pa(addr[i + 1]))</div><div class='add'>+				break;</div><div class='add'>+			i++;</div><div class='add'>+		}</div><div class='add'>+		free_memtype(start, end);</div><div class='add'>+	}</div><div class='add'>+	return change_page_attr_clear(addr, addrinarray,</div><div class='add'>+				      __pgprot(_PAGE_CACHE_MASK), 1);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(set_memory_array_wb);</div><div class='add'>+</div><div class='ctx'> int set_memory_x(unsigned long addr, int numpages)</div><div class='ctx'> {</div><div class='del'>-	return change_page_attr_clear(addr, numpages, __pgprot(_PAGE_NX));</div><div class='add'>+	return change_page_attr_clear(&amp;addr, numpages, __pgprot(_PAGE_NX), 0);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(set_memory_x);</div><div class='ctx'> </div><div class='ctx'> int set_memory_nx(unsigned long addr, int numpages)</div><div class='ctx'> {</div><div class='del'>-	return change_page_attr_set(addr, numpages, __pgprot(_PAGE_NX));</div><div class='add'>+	return change_page_attr_set(&amp;addr, numpages, __pgprot(_PAGE_NX), 0);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(set_memory_nx);</div><div class='ctx'> </div><div class='ctx'> int set_memory_ro(unsigned long addr, int numpages)</div><div class='ctx'> {</div><div class='del'>-	return change_page_attr_clear(addr, numpages, __pgprot(_PAGE_RW));</div><div class='add'>+	return change_page_attr_clear(&amp;addr, numpages, __pgprot(_PAGE_RW), 0);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(set_memory_ro);</div><div class='ctx'> </div><div class='ctx'> int set_memory_rw(unsigned long addr, int numpages)</div><div class='ctx'> {</div><div class='del'>-	return change_page_attr_set(addr, numpages, __pgprot(_PAGE_RW));</div><div class='add'>+	return change_page_attr_set(&amp;addr, numpages, __pgprot(_PAGE_RW), 0);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(set_memory_rw);</div><div class='ctx'> </div><div class='ctx'> int set_memory_np(unsigned long addr, int numpages)</div><div class='ctx'> {</div><div class='del'>-	return change_page_attr_clear(addr, numpages, __pgprot(_PAGE_PRESENT));</div><div class='add'>+	return change_page_attr_clear(&amp;addr, numpages, __pgprot(_PAGE_PRESENT), 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int set_memory_4k(unsigned long addr, int numpages)</div><div class='ctx'> {</div><div class='del'>-	return change_page_attr_set_clr(addr, numpages, __pgprot(0),</div><div class='del'>-					__pgprot(0), 1);</div><div class='add'>+	return change_page_attr_set_clr(&amp;addr, numpages, __pgprot(0),</div><div class='add'>+					__pgprot(0), 1, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int set_pages_uc(struct page *page, int numpages)</div><div class='hunk'>@@ -973,22 +1050,38 @@ int set_pages_rw(struct page *page, int numpages)</div><div class='ctx'> </div><div class='ctx'> static int __set_pages_p(struct page *page, int numpages)</div><div class='ctx'> {</div><div class='del'>-	struct cpa_data cpa = { .vaddr = (unsigned long) page_address(page),</div><div class='add'>+	unsigned long tempaddr = (unsigned long) page_address(page);</div><div class='add'>+	struct cpa_data cpa = { .vaddr = &amp;tempaddr,</div><div class='ctx'> 				.numpages = numpages,</div><div class='ctx'> 				.mask_set = __pgprot(_PAGE_PRESENT | _PAGE_RW),</div><div class='del'>-				.mask_clr = __pgprot(0)};</div><div class='add'>+				.mask_clr = __pgprot(0),</div><div class='add'>+				.flags = 0};</div><div class='ctx'> </div><div class='del'>-	return __change_page_attr_set_clr(&amp;cpa, 1);</div><div class='add'>+	/*</div><div class='add'>+	 * No alias checking needed for setting present flag. otherwise,</div><div class='add'>+	 * we may need to break large pages for 64-bit kernel text</div><div class='add'>+	 * mappings (this adds to complexity if we want to do this from</div><div class='add'>+	 * atomic context especially). Let's keep it simple!</div><div class='add'>+	 */</div><div class='add'>+	return __change_page_attr_set_clr(&amp;cpa, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __set_pages_np(struct page *page, int numpages)</div><div class='ctx'> {</div><div class='del'>-	struct cpa_data cpa = { .vaddr = (unsigned long) page_address(page),</div><div class='add'>+	unsigned long tempaddr = (unsigned long) page_address(page);</div><div class='add'>+	struct cpa_data cpa = { .vaddr = &amp;tempaddr,</div><div class='ctx'> 				.numpages = numpages,</div><div class='ctx'> 				.mask_set = __pgprot(0),</div><div class='del'>-				.mask_clr = __pgprot(_PAGE_PRESENT | _PAGE_RW)};</div><div class='add'>+				.mask_clr = __pgprot(_PAGE_PRESENT | _PAGE_RW),</div><div class='add'>+				.flags = 0};</div><div class='ctx'> </div><div class='del'>-	return __change_page_attr_set_clr(&amp;cpa, 1);</div><div class='add'>+	/*</div><div class='add'>+	 * No alias checking needed for setting not present flag. otherwise,</div><div class='add'>+	 * we may need to break large pages for 64-bit kernel text</div><div class='add'>+	 * mappings (this adds to complexity if we want to do this from</div><div class='add'>+	 * atomic context especially). Let's keep it simple!</div><div class='add'>+	 */</div><div class='add'>+	return __change_page_attr_set_clr(&amp;cpa, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void kernel_map_pages(struct page *page, int numpages, int enable)</div><div class='hunk'>@@ -1008,11 +1101,8 @@ void kernel_map_pages(struct page *page, int numpages, int enable)</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The return value is ignored as the calls cannot fail.</div><div class='del'>-	 * Large pages are kept enabled at boot time, and are</div><div class='del'>-	 * split up quickly with DEBUG_PAGEALLOC. If a splitup</div><div class='del'>-	 * fails here (due to temporary memory shortage) no damage</div><div class='del'>-	 * is done because we just keep the largepage intact up</div><div class='del'>-	 * to the next attempt when it will likely be split up:</div><div class='add'>+	 * Large pages for identity mappings are not used at boot time</div><div class='add'>+	 * and hence no memory allocations during large page split.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (enable)</div><div class='ctx'> 		__set_pages_p(page, numpages);</div><div class='hunk'>@@ -1024,53 +1114,8 @@ void kernel_map_pages(struct page *page, int numpages, int enable)</div><div class='ctx'> 	 * but that can deadlock-&gt;flush only current cpu:</div><div class='ctx'> 	 */</div><div class='ctx'> 	__flush_tlb_all();</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Try to refill the page pool here. We can do this only after</div><div class='del'>-	 * the tlb flush.</div><div class='del'>-	 */</div><div class='del'>-	cpa_fill_pool(NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_DEBUG_FS</div><div class='del'>-static int dpa_show(struct seq_file *m, void *v)</div><div class='del'>-{</div><div class='del'>-	seq_puts(m, "DEBUG_PAGEALLOC\n");</div><div class='del'>-	seq_printf(m, "pool_size     : %lu\n", pool_size);</div><div class='del'>-	seq_printf(m, "pool_pages    : %lu\n", pool_pages);</div><div class='del'>-	seq_printf(m, "pool_low      : %lu\n", pool_low);</div><div class='del'>-	seq_printf(m, "pool_used     : %lu\n", pool_used);</div><div class='del'>-	seq_printf(m, "pool_failed   : %lu\n", pool_failed);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dpa_open(struct inode *inode, struct file *filp)</div><div class='del'>-{</div><div class='del'>-	return single_open(filp, dpa_show, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct file_operations dpa_fops = {</div><div class='del'>-	.open		= dpa_open,</div><div class='del'>-	.read		= seq_read,</div><div class='del'>-	.llseek		= seq_lseek,</div><div class='del'>-	.release	= single_release,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init debug_pagealloc_proc_init(void)</div><div class='del'>-{</div><div class='del'>-	struct dentry *de;</div><div class='del'>-</div><div class='del'>-	de = debugfs_create_file("debug_pagealloc", 0600, NULL, NULL,</div><div class='del'>-				 &amp;dpa_fops);</div><div class='del'>-	if (!de)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-__initcall(debug_pagealloc_proc_init);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_HIBERNATION</div><div class='ctx'> </div><div class='ctx'> bool kernel_page_present(struct page *page)</div><div class='head'>diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c<br/>index 2a50e0fa64a5..738fd0f24958 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/mm/pat.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/mm/pat.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/mm/pat.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/mm/pat.c</a></div><div class='hunk'>@@ -7,24 +7,24 @@</div><div class='ctx'>  * Loosely based on earlier PAT patchset from Eric Biederman and Andi Kleen.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/seq_file.h&gt;</div><div class='add'>+#include &lt;linux/bootmem.h&gt;</div><div class='add'>+#include &lt;linux/debugfs.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/gfp.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='del'>-#include &lt;linux/bootmem.h&gt;</div><div class='del'>-#include &lt;linux/debugfs.h&gt;</div><div class='del'>-#include &lt;linux/seq_file.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/msr.h&gt;</div><div class='del'>-#include &lt;asm/tlbflush.h&gt;</div><div class='add'>+#include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='del'>-#include &lt;asm/page.h&gt;</div><div class='add'>+#include &lt;asm/tlbflush.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='del'>-#include &lt;asm/pat.h&gt;</div><div class='del'>-#include &lt;asm/e820.h&gt;</div><div class='del'>-#include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #include &lt;asm/fcntl.h&gt;</div><div class='add'>+#include &lt;asm/e820.h&gt;</div><div class='ctx'> #include &lt;asm/mtrr.h&gt;</div><div class='add'>+#include &lt;asm/page.h&gt;</div><div class='add'>+#include &lt;asm/msr.h&gt;</div><div class='add'>+#include &lt;asm/pat.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_X86_PAT</div><div class='hunk'>@@ -46,6 +46,7 @@ early_param("nopat", nopat);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static int debug_enable;</div><div class='add'>+</div><div class='ctx'> static int __init pat_debug_setup(char *str)</div><div class='ctx'> {</div><div class='ctx'> 	debug_enable = 1;</div><div class='hunk'>@@ -145,14 +146,14 @@ static char *cattr_name(unsigned long flags)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> struct memtype {</div><div class='del'>-	u64 start;</div><div class='del'>-	u64 end;</div><div class='del'>-	unsigned long type;</div><div class='del'>-	struct list_head nd;</div><div class='add'>+	u64			start;</div><div class='add'>+	u64			end;</div><div class='add'>+	unsigned long		type;</div><div class='add'>+	struct list_head	nd;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static LIST_HEAD(memtype_list);</div><div class='del'>-static DEFINE_SPINLOCK(memtype_lock); 	/* protects memtype list */</div><div class='add'>+static DEFINE_SPINLOCK(memtype_lock);	/* protects memtype list */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Does intersection of PAT memory type and MTRR memory type and returns</div><div class='hunk'>@@ -180,8 +181,8 @@ static unsigned long pat_x_mtrr_type(u64 start, u64 end, unsigned long req_type)</div><div class='ctx'> 	return req_type;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int chk_conflict(struct memtype *new, struct memtype *entry,</div><div class='del'>-			unsigned long *type)</div><div class='add'>+static int</div><div class='add'>+chk_conflict(struct memtype *new, struct memtype *entry, unsigned long *type)</div><div class='ctx'> {</div><div class='ctx'> 	if (new-&gt;type != entry-&gt;type) {</div><div class='ctx'> 		if (type) {</div><div class='hunk'>@@ -211,6 +212,66 @@ static struct memtype *cached_entry;</div><div class='ctx'> static u64 cached_start;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * For RAM pages, mark the pages as non WB memory type using</div><div class='add'>+ * PageNonWB (PG_arch_1). We allow only one set_memory_uc() or</div><div class='add'>+ * set_memory_wc() on a RAM page at a time before marking it as WB again.</div><div class='add'>+ * This is ok, because only one driver will be owning the page and</div><div class='add'>+ * doing set_memory_*() calls.</div><div class='add'>+ *</div><div class='add'>+ * For now, we use PageNonWB to track that the RAM page is being mapped</div><div class='add'>+ * as non WB. In future, we will have to use one more flag</div><div class='add'>+ * (or some other mechanism in page_struct) to distinguish between</div><div class='add'>+ * UC and WC mapping.</div><div class='add'>+ */</div><div class='add'>+static int reserve_ram_pages_type(u64 start, u64 end, unsigned long req_type,</div><div class='add'>+				  unsigned long *new_type)</div><div class='add'>+{</div><div class='add'>+	struct page *page;</div><div class='add'>+	u64 pfn, end_pfn;</div><div class='add'>+</div><div class='add'>+	for (pfn = (start &gt;&gt; PAGE_SHIFT); pfn &lt; (end &gt;&gt; PAGE_SHIFT); ++pfn) {</div><div class='add'>+		page = pfn_to_page(pfn);</div><div class='add'>+		if (page_mapped(page) || PageNonWB(page))</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		SetPageNonWB(page);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	end_pfn = pfn;</div><div class='add'>+	for (pfn = (start &gt;&gt; PAGE_SHIFT); pfn &lt; end_pfn; ++pfn) {</div><div class='add'>+		page = pfn_to_page(pfn);</div><div class='add'>+		ClearPageNonWB(page);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int free_ram_pages_type(u64 start, u64 end)</div><div class='add'>+{</div><div class='add'>+	struct page *page;</div><div class='add'>+	u64 pfn, end_pfn;</div><div class='add'>+</div><div class='add'>+	for (pfn = (start &gt;&gt; PAGE_SHIFT); pfn &lt; (end &gt;&gt; PAGE_SHIFT); ++pfn) {</div><div class='add'>+		page = pfn_to_page(pfn);</div><div class='add'>+		if (page_mapped(page) || !PageNonWB(page))</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		ClearPageNonWB(page);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	end_pfn = pfn;</div><div class='add'>+	for (pfn = (start &gt;&gt; PAGE_SHIFT); pfn &lt; end_pfn; ++pfn) {</div><div class='add'>+		page = pfn_to_page(pfn);</div><div class='add'>+		SetPageNonWB(page);</div><div class='add'>+	}</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * req_type typically has one of the:</div><div class='ctx'>  * - _PAGE_CACHE_WB</div><div class='ctx'>  * - _PAGE_CACHE_WC</div><div class='hunk'>@@ -226,14 +287,15 @@ static u64 cached_start;</div><div class='ctx'>  * it will return a negative return value.</div><div class='ctx'>  */</div><div class='ctx'> int reserve_memtype(u64 start, u64 end, unsigned long req_type,</div><div class='del'>-			unsigned long *new_type)</div><div class='add'>+		    unsigned long *new_type)</div><div class='ctx'> {</div><div class='ctx'> 	struct memtype *new, *entry;</div><div class='ctx'> 	unsigned long actual_type;</div><div class='ctx'> 	struct list_head *where;</div><div class='add'>+	int is_range_ram;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='del'>- 	BUG_ON(start &gt;= end); /* end is exclusive */</div><div class='add'>+	BUG_ON(start &gt;= end); /* end is exclusive */</div><div class='ctx'> </div><div class='ctx'> 	if (!pat_enabled) {</div><div class='ctx'> 		/* This is identical to page table setting without PAT */</div><div class='hunk'>@@ -266,17 +328,24 @@ int reserve_memtype(u64 start, u64 end, unsigned long req_type,</div><div class='ctx'> 			actual_type = _PAGE_CACHE_WB;</div><div class='ctx'> 		else</div><div class='ctx'> 			actual_type = _PAGE_CACHE_UC_MINUS;</div><div class='del'>-	} else</div><div class='add'>+	} else {</div><div class='ctx'> 		actual_type = pat_x_mtrr_type(start, end,</div><div class='ctx'> 					      req_type &amp; _PAGE_CACHE_MASK);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	is_range_ram = pagerange_is_ram(start, end);</div><div class='add'>+	if (is_range_ram == 1)</div><div class='add'>+		return reserve_ram_pages_type(start, end, req_type, new_type);</div><div class='add'>+	else if (is_range_ram &lt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	new  = kmalloc(sizeof(struct memtype), GFP_KERNEL);</div><div class='ctx'> 	if (!new)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	new-&gt;start = start;</div><div class='del'>-	new-&gt;end = end;</div><div class='del'>-	new-&gt;type = actual_type;</div><div class='add'>+	new-&gt;start	= start;</div><div class='add'>+	new-&gt;end	= end;</div><div class='add'>+	new-&gt;type	= actual_type;</div><div class='ctx'> </div><div class='ctx'> 	if (new_type)</div><div class='ctx'> 		*new_type = actual_type;</div><div class='hunk'>@@ -335,6 +404,7 @@ int reserve_memtype(u64 start, u64 end, unsigned long req_type,</div><div class='ctx'> 		       start, end, cattr_name(new-&gt;type), cattr_name(req_type));</div><div class='ctx'> 		kfree(new);</div><div class='ctx'> 		spin_unlock(&amp;memtype_lock);</div><div class='add'>+</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -358,6 +428,7 @@ int free_memtype(u64 start, u64 end)</div><div class='ctx'> {</div><div class='ctx'> 	struct memtype *entry;</div><div class='ctx'> 	int err = -EINVAL;</div><div class='add'>+	int is_range_ram;</div><div class='ctx'> </div><div class='ctx'> 	if (!pat_enabled)</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -366,6 +437,12 @@ int free_memtype(u64 start, u64 end)</div><div class='ctx'> 	if (is_ISA_range(start, end - 1))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	is_range_ram = pagerange_is_ram(start, end);</div><div class='add'>+	if (is_range_ram == 1)</div><div class='add'>+		return free_ram_pages_type(start, end);</div><div class='add'>+	else if (is_range_ram &lt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	spin_lock(&amp;memtype_lock);</div><div class='ctx'> 	list_for_each_entry(entry, &amp;memtype_list, nd) {</div><div class='ctx'> 		if (entry-&gt;start == start &amp;&amp; entry-&gt;end == end) {</div><div class='hunk'>@@ -386,6 +463,7 @@ int free_memtype(u64 start, u64 end)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dprintk("free_memtype request 0x%Lx-0x%Lx\n", start, end);</div><div class='add'>+</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -492,9 +570,9 @@ int phys_mem_access_prot_allowed(struct file *file, unsigned long pfn,</div><div class='ctx'> </div><div class='ctx'> void map_devmem(unsigned long pfn, unsigned long size, pgprot_t vma_prot)</div><div class='ctx'> {</div><div class='add'>+	unsigned long want_flags = (pgprot_val(vma_prot) &amp; _PAGE_CACHE_MASK);</div><div class='ctx'> 	u64 addr = (u64)pfn &lt;&lt; PAGE_SHIFT;</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	unsigned long want_flags = (pgprot_val(vma_prot) &amp; _PAGE_CACHE_MASK);</div><div class='ctx'> </div><div class='ctx'> 	reserve_memtype(addr, addr + size, want_flags, &amp;flags);</div><div class='ctx'> 	if (flags != want_flags) {</div><div class='hunk'>@@ -514,7 +592,7 @@ void unmap_devmem(unsigned long pfn, unsigned long size, pgprot_t vma_prot)</div><div class='ctx'> 	free_memtype(addr, addr + size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_DEBUG_FS)</div><div class='add'>+#if defined(CONFIG_DEBUG_FS) &amp;&amp; defined(CONFIG_X86_PAT)</div><div class='ctx'> </div><div class='ctx'> /* get Nth element of the linked list */</div><div class='ctx'> static struct memtype *memtype_get_idx(loff_t pos)</div><div class='hunk'>@@ -537,6 +615,7 @@ static struct memtype *memtype_get_idx(loff_t pos)</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock(&amp;memtype_lock);</div><div class='ctx'> 	kfree(print_entry);</div><div class='add'>+</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -567,6 +646,7 @@ static int memtype_seq_show(struct seq_file *seq, void *v)</div><div class='ctx'> 	seq_printf(seq, "%s @ 0x%Lx-0x%Lx\n", cattr_name(print_entry-&gt;type),</div><div class='ctx'> 			print_entry-&gt;start, print_entry-&gt;end);</div><div class='ctx'> 	kfree(print_entry);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -598,4 +678,4 @@ static int __init pat_memtype_list_init(void)</div><div class='ctx'> </div><div class='ctx'> late_initcall(pat_memtype_list_init);</div><div class='ctx'> </div><div class='del'>-#endif /* CONFIG_DEBUG_FS */</div><div class='add'>+#endif /* CONFIG_DEBUG_FS &amp;&amp; CONFIG_X86_PAT */</div><div class='head'>diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c<br/>index d50302774fe2..86f2ffc43c3d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/mm/pgtable.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/mm/pgtable.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/mm/pgtable.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/mm/pgtable.c</a></div><div class='hunk'>@@ -63,10 +63,8 @@ static inline void pgd_list_del(pgd_t *pgd)</div><div class='ctx'> #define UNSHARED_PTRS_PER_PGD				\</div><div class='ctx'> 	(SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)</div><div class='ctx'> </div><div class='del'>-static void pgd_ctor(void *p)</div><div class='add'>+static void pgd_ctor(pgd_t *pgd)</div><div class='ctx'> {</div><div class='del'>-	pgd_t *pgd = p;</div><div class='del'>-</div><div class='ctx'> 	/* If the pgd points to a shared pagetable level (either the</div><div class='ctx'> 	   ptes in non-PAE, or shared PMD in PAE), then just copy the</div><div class='ctx'> 	   references from swapper_pg_dir. */</div><div class='hunk'>@@ -87,7 +85,7 @@ static void pgd_ctor(void *p)</div><div class='ctx'> 		pgd_list_add(pgd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void pgd_dtor(void *pgd)</div><div class='add'>+static void pgd_dtor(pgd_t *pgd)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags; /* can be called from interrupt context */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/mm/pgtable_32.c b/arch/x86/mm/pgtable_32.c<br/>index cab0abbd1ebe..0951db9ee519 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/mm/pgtable_32.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/mm/pgtable_32.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/mm/pgtable_32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/mm/pgtable_32.c</a></div><div class='hunk'>@@ -123,7 +123,8 @@ static int __init parse_vmalloc(char *arg)</div><div class='ctx'> 	if (!arg)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	__VMALLOC_RESERVE = memparse(arg, &amp;arg);</div><div class='add'>+	/* Add VMALLOC_OFFSET to the parsed value due to vm area guard hole*/</div><div class='add'>+	__VMALLOC_RESERVE = memparse(arg, &amp;arg) + VMALLOC_OFFSET;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> early_param("vmalloc", parse_vmalloc);</div><div class='head'>diff --git a/arch/x86/mm/srat_64.c b/arch/x86/mm/srat_64.c<br/>index 1b4763e26ea9..51c0a2fc14fe 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/mm/srat_64.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/mm/srat_64.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/mm/srat_64.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/mm/srat_64.c</a></div><div class='hunk'>@@ -138,7 +138,7 @@ acpi_numa_processor_affinity_init(struct acpi_srat_cpu_affinity *pa)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (is_uv_system())</div><div class='add'>+	if (get_uv_system_type() &gt;= UV_X2APIC)</div><div class='ctx'> 		apic_id = (pa-&gt;apic_id &lt;&lt; 8) | pa-&gt;local_sapic_eid;</div><div class='ctx'> 	else</div><div class='ctx'> 		apic_id = pa-&gt;apic_id;</div><div class='head'>diff --git a/arch/x86/oprofile/Makefile b/arch/x86/oprofile/Makefile<br/>index 30f3eb366667..446902b2a6b6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/oprofile/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/oprofile/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/oprofile/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/oprofile/Makefile</a></div><div class='hunk'>@@ -7,6 +7,6 @@ DRIVER_OBJS = $(addprefix ../../../drivers/oprofile/, \</div><div class='ctx'> 		timer_int.o )</div><div class='ctx'> </div><div class='ctx'> oprofile-y				:= $(DRIVER_OBJS) init.o backtrace.o</div><div class='del'>-oprofile-$(CONFIG_X86_LOCAL_APIC) 	+= nmi_int.o op_model_athlon.o \</div><div class='add'>+oprofile-$(CONFIG_X86_LOCAL_APIC) 	+= nmi_int.o op_model_amd.o \</div><div class='ctx'> 					   op_model_ppro.o op_model_p4.o</div><div class='ctx'> oprofile-$(CONFIG_X86_IO_APIC)		+= nmi_timer_int.o</div><div class='head'>diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c<br/>index 8a5f1614a3d5..57f6c9088081 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/oprofile/nmi_int.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/oprofile/nmi_int.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/oprofile/nmi_int.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/oprofile/nmi_int.c</a></div><div class='hunk'>@@ -1,10 +1,11 @@</div><div class='ctx'> /**</div><div class='ctx'>  * @file nmi_int.c</div><div class='ctx'>  *</div><div class='del'>- * @remark Copyright 2002 OProfile authors</div><div class='add'>+ * @remark Copyright 2002-2008 OProfile authors</div><div class='ctx'>  * @remark Read the file COPYING</div><div class='ctx'>  *</div><div class='ctx'>  * @author John Levon &lt;levon@movementarian.org&gt;</div><div class='add'>+ * @author Robert Richter &lt;robert.richter@amd.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -439,6 +440,7 @@ int __init op_nmi_init(struct oprofile_operations *ops)</div><div class='ctx'> 	__u8 vendor = boot_cpu_data.x86_vendor;</div><div class='ctx'> 	__u8 family = boot_cpu_data.x86;</div><div class='ctx'> 	char *cpu_type;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!cpu_has_apic)</div><div class='ctx'> 		return -ENODEV;</div><div class='hunk'>@@ -451,19 +453,23 @@ int __init op_nmi_init(struct oprofile_operations *ops)</div><div class='ctx'> 		default:</div><div class='ctx'> 			return -ENODEV;</div><div class='ctx'> 		case 6:</div><div class='del'>-			model = &amp;op_athlon_spec;</div><div class='add'>+			model = &amp;op_amd_spec;</div><div class='ctx'> 			cpu_type = "i386/athlon";</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 0xf:</div><div class='del'>-			model = &amp;op_athlon_spec;</div><div class='add'>+			model = &amp;op_amd_spec;</div><div class='ctx'> 			/* Actually it could be i386/hammer too, but give</div><div class='ctx'> 			 user space an consistent name. */</div><div class='ctx'> 			cpu_type = "x86-64/hammer";</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 0x10:</div><div class='del'>-			model = &amp;op_athlon_spec;</div><div class='add'>+			model = &amp;op_amd_spec;</div><div class='ctx'> 			cpu_type = "x86-64/family10";</div><div class='ctx'> 			break;</div><div class='add'>+		case 0x11:</div><div class='add'>+			model = &amp;op_amd_spec;</div><div class='add'>+			cpu_type = "x86-64/family11h";</div><div class='add'>+			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='hunk'>@@ -490,17 +496,24 @@ int __init op_nmi_init(struct oprofile_operations *ops)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	init_sysfs();</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> 	register_cpu_notifier(&amp;oprofile_cpu_nb);</div><div class='ctx'> #endif</div><div class='del'>-	using_nmi = 1;</div><div class='add'>+	/* default values, can be overwritten by model */</div><div class='ctx'> 	ops-&gt;create_files = nmi_create_files;</div><div class='ctx'> 	ops-&gt;setup = nmi_setup;</div><div class='ctx'> 	ops-&gt;shutdown = nmi_shutdown;</div><div class='ctx'> 	ops-&gt;start = nmi_start;</div><div class='ctx'> 	ops-&gt;stop = nmi_stop;</div><div class='ctx'> 	ops-&gt;cpu_type = cpu_type;</div><div class='add'>+</div><div class='add'>+	if (model-&gt;init)</div><div class='add'>+		ret = model-&gt;init(ops);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	init_sysfs();</div><div class='add'>+	using_nmi = 1;</div><div class='ctx'> 	printk(KERN_INFO "oprofile: using NMI interrupt.\n");</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -513,4 +526,6 @@ void op_nmi_exit(void)</div><div class='ctx'> 		unregister_cpu_notifier(&amp;oprofile_cpu_nb);</div><div class='ctx'> #endif</div><div class='ctx'> 	}</div><div class='add'>+	if (model-&gt;exit)</div><div class='add'>+		model-&gt;exit();</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/x86/oprofile/op_model_amd.c b/arch/x86/oprofile/op_model_amd.c<br/>new file mode 100644<br/>index 000000000000..d9faf607b3a6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/oprofile/op_model_amd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/oprofile/op_model_amd.c</a></div><div class='hunk'>@@ -0,0 +1,543 @@</div><div class='add'>+/*</div><div class='add'>+ * @file op_model_amd.c</div><div class='add'>+ * athlon / K7 / K8 / Family 10h model-specific MSR operations</div><div class='add'>+ *</div><div class='add'>+ * @remark Copyright 2002-2008 OProfile authors</div><div class='add'>+ * @remark Read the file COPYING</div><div class='add'>+ *</div><div class='add'>+ * @author John Levon</div><div class='add'>+ * @author Philippe Elie</div><div class='add'>+ * @author Graydon Hoare</div><div class='add'>+ * @author Robert Richter &lt;robert.richter@amd.com&gt;</div><div class='add'>+ * @author Barry Kasindorf</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#include &lt;linux/oprofile.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/ptrace.h&gt;</div><div class='add'>+#include &lt;asm/msr.h&gt;</div><div class='add'>+#include &lt;asm/nmi.h&gt;</div><div class='add'>+</div><div class='add'>+#include "op_x86_model.h"</div><div class='add'>+#include "op_counter.h"</div><div class='add'>+</div><div class='add'>+#define NUM_COUNTERS 4</div><div class='add'>+#define NUM_CONTROLS 4</div><div class='add'>+</div><div class='add'>+#define CTR_IS_RESERVED(msrs, c) (msrs-&gt;counters[(c)].addr ? 1 : 0)</div><div class='add'>+#define CTR_READ(l, h, msrs, c) do {rdmsr(msrs-&gt;counters[(c)].addr, (l), (h)); } while (0)</div><div class='add'>+#define CTR_WRITE(l, msrs, c) do {wrmsr(msrs-&gt;counters[(c)].addr, -(unsigned int)(l), -1); } while (0)</div><div class='add'>+#define CTR_OVERFLOWED(n) (!((n) &amp; (1U&lt;&lt;31)))</div><div class='add'>+</div><div class='add'>+#define CTRL_IS_RESERVED(msrs, c) (msrs-&gt;controls[(c)].addr ? 1 : 0)</div><div class='add'>+#define CTRL_READ(l, h, msrs, c) do {rdmsr(msrs-&gt;controls[(c)].addr, (l), (h)); } while (0)</div><div class='add'>+#define CTRL_WRITE(l, h, msrs, c) do {wrmsr(msrs-&gt;controls[(c)].addr, (l), (h)); } while (0)</div><div class='add'>+#define CTRL_SET_ACTIVE(n) (n |= (1&lt;&lt;22))</div><div class='add'>+#define CTRL_SET_INACTIVE(n) (n &amp;= ~(1&lt;&lt;22))</div><div class='add'>+#define CTRL_CLEAR_LO(x) (x &amp;= (1&lt;&lt;21))</div><div class='add'>+#define CTRL_CLEAR_HI(x) (x &amp;= 0xfffffcf0)</div><div class='add'>+#define CTRL_SET_ENABLE(val) (val |= 1&lt;&lt;20)</div><div class='add'>+#define CTRL_SET_USR(val, u) (val |= ((u &amp; 1) &lt;&lt; 16))</div><div class='add'>+#define CTRL_SET_KERN(val, k) (val |= ((k &amp; 1) &lt;&lt; 17))</div><div class='add'>+#define CTRL_SET_UM(val, m) (val |= (m &lt;&lt; 8))</div><div class='add'>+#define CTRL_SET_EVENT_LOW(val, e) (val |= (e &amp; 0xff))</div><div class='add'>+#define CTRL_SET_EVENT_HIGH(val, e) (val |= ((e &gt;&gt; 8) &amp; 0xf))</div><div class='add'>+#define CTRL_SET_HOST_ONLY(val, h) (val |= ((h &amp; 1) &lt;&lt; 9))</div><div class='add'>+#define CTRL_SET_GUEST_ONLY(val, h) (val |= ((h &amp; 1) &lt;&lt; 8))</div><div class='add'>+</div><div class='add'>+static unsigned long reset_value[NUM_COUNTERS];</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_OPROFILE_IBS</div><div class='add'>+</div><div class='add'>+/* IbsFetchCtl bits/masks */</div><div class='add'>+#define IBS_FETCH_HIGH_VALID_BIT	(1UL &lt;&lt; 17)	/* bit 49 */</div><div class='add'>+#define IBS_FETCH_HIGH_ENABLE		(1UL &lt;&lt; 16)	/* bit 48 */</div><div class='add'>+#define IBS_FETCH_LOW_MAX_CNT_MASK	0x0000FFFFUL	/* MaxCnt mask */</div><div class='add'>+</div><div class='add'>+/*IbsOpCtl bits */</div><div class='add'>+#define IBS_OP_LOW_VALID_BIT		(1ULL&lt;&lt;18)	/* bit 18 */</div><div class='add'>+#define IBS_OP_LOW_ENABLE		(1ULL&lt;&lt;17)	/* bit 17 */</div><div class='add'>+</div><div class='add'>+/* Codes used in cpu_buffer.c */</div><div class='add'>+/* This produces duplicate code, need to be fixed */</div><div class='add'>+#define IBS_FETCH_BEGIN 3</div><div class='add'>+#define IBS_OP_BEGIN    4</div><div class='add'>+</div><div class='add'>+/* The function interface needs to be fixed, something like add</div><div class='add'>+   data. Should then be added to linux/oprofile.h. */</div><div class='add'>+extern void oprofile_add_ibs_sample(struct pt_regs *const regs,</div><div class='add'>+				    unsigned int * const ibs_sample, u8 code);</div><div class='add'>+</div><div class='add'>+struct ibs_fetch_sample {</div><div class='add'>+	/* MSRC001_1031 IBS Fetch Linear Address Register */</div><div class='add'>+	unsigned int ibs_fetch_lin_addr_low;</div><div class='add'>+	unsigned int ibs_fetch_lin_addr_high;</div><div class='add'>+	/* MSRC001_1030 IBS Fetch Control Register */</div><div class='add'>+	unsigned int ibs_fetch_ctl_low;</div><div class='add'>+	unsigned int ibs_fetch_ctl_high;</div><div class='add'>+	/* MSRC001_1032 IBS Fetch Physical Address Register */</div><div class='add'>+	unsigned int ibs_fetch_phys_addr_low;</div><div class='add'>+	unsigned int ibs_fetch_phys_addr_high;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ibs_op_sample {</div><div class='add'>+	/* MSRC001_1034 IBS Op Logical Address Register (IbsRIP) */</div><div class='add'>+	unsigned int ibs_op_rip_low;</div><div class='add'>+	unsigned int ibs_op_rip_high;</div><div class='add'>+	/* MSRC001_1035 IBS Op Data Register */</div><div class='add'>+	unsigned int ibs_op_data1_low;</div><div class='add'>+	unsigned int ibs_op_data1_high;</div><div class='add'>+	/* MSRC001_1036 IBS Op Data 2 Register */</div><div class='add'>+	unsigned int ibs_op_data2_low;</div><div class='add'>+	unsigned int ibs_op_data2_high;</div><div class='add'>+	/* MSRC001_1037 IBS Op Data 3 Register */</div><div class='add'>+	unsigned int ibs_op_data3_low;</div><div class='add'>+	unsigned int ibs_op_data3_high;</div><div class='add'>+	/* MSRC001_1038 IBS DC Linear Address Register (IbsDcLinAd) */</div><div class='add'>+	unsigned int ibs_dc_linear_low;</div><div class='add'>+	unsigned int ibs_dc_linear_high;</div><div class='add'>+	/* MSRC001_1039 IBS DC Physical Address Register (IbsDcPhysAd) */</div><div class='add'>+	unsigned int ibs_dc_phys_low;</div><div class='add'>+	unsigned int ibs_dc_phys_high;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * unitialize the APIC for the IBS interrupts if needed on AMD Family10h+</div><div class='add'>+*/</div><div class='add'>+static void clear_ibs_nmi(void);</div><div class='add'>+</div><div class='add'>+static int ibs_allowed;	/* AMD Family10h and later */</div><div class='add'>+</div><div class='add'>+struct op_ibs_config {</div><div class='add'>+	unsigned long op_enabled;</div><div class='add'>+	unsigned long fetch_enabled;</div><div class='add'>+	unsigned long max_cnt_fetch;</div><div class='add'>+	unsigned long max_cnt_op;</div><div class='add'>+	unsigned long rand_en;</div><div class='add'>+	unsigned long dispatched_ops;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct op_ibs_config ibs_config;</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* functions for op_amd_spec */</div><div class='add'>+</div><div class='add'>+static void op_amd_fill_in_addresses(struct op_msrs * const msrs)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; NUM_COUNTERS; i++) {</div><div class='add'>+		if (reserve_perfctr_nmi(MSR_K7_PERFCTR0 + i))</div><div class='add'>+			msrs-&gt;counters[i].addr = MSR_K7_PERFCTR0 + i;</div><div class='add'>+		else</div><div class='add'>+			msrs-&gt;counters[i].addr = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; NUM_CONTROLS; i++) {</div><div class='add'>+		if (reserve_evntsel_nmi(MSR_K7_EVNTSEL0 + i))</div><div class='add'>+			msrs-&gt;controls[i].addr = MSR_K7_EVNTSEL0 + i;</div><div class='add'>+		else</div><div class='add'>+			msrs-&gt;controls[i].addr = 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void op_amd_setup_ctrs(struct op_msrs const * const msrs)</div><div class='add'>+{</div><div class='add'>+	unsigned int low, high;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* clear all counters */</div><div class='add'>+	for (i = 0 ; i &lt; NUM_CONTROLS; ++i) {</div><div class='add'>+		if (unlikely(!CTRL_IS_RESERVED(msrs, i)))</div><div class='add'>+			continue;</div><div class='add'>+		CTRL_READ(low, high, msrs, i);</div><div class='add'>+		CTRL_CLEAR_LO(low);</div><div class='add'>+		CTRL_CLEAR_HI(high);</div><div class='add'>+		CTRL_WRITE(low, high, msrs, i);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* avoid a false detection of ctr overflows in NMI handler */</div><div class='add'>+	for (i = 0; i &lt; NUM_COUNTERS; ++i) {</div><div class='add'>+		if (unlikely(!CTR_IS_RESERVED(msrs, i)))</div><div class='add'>+			continue;</div><div class='add'>+		CTR_WRITE(1, msrs, i);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* enable active counters */</div><div class='add'>+	for (i = 0; i &lt; NUM_COUNTERS; ++i) {</div><div class='add'>+		if ((counter_config[i].enabled) &amp;&amp; (CTR_IS_RESERVED(msrs, i))) {</div><div class='add'>+			reset_value[i] = counter_config[i].count;</div><div class='add'>+</div><div class='add'>+			CTR_WRITE(counter_config[i].count, msrs, i);</div><div class='add'>+</div><div class='add'>+			CTRL_READ(low, high, msrs, i);</div><div class='add'>+			CTRL_CLEAR_LO(low);</div><div class='add'>+			CTRL_CLEAR_HI(high);</div><div class='add'>+			CTRL_SET_ENABLE(low);</div><div class='add'>+			CTRL_SET_USR(low, counter_config[i].user);</div><div class='add'>+			CTRL_SET_KERN(low, counter_config[i].kernel);</div><div class='add'>+			CTRL_SET_UM(low, counter_config[i].unit_mask);</div><div class='add'>+			CTRL_SET_EVENT_LOW(low, counter_config[i].event);</div><div class='add'>+			CTRL_SET_EVENT_HIGH(high, counter_config[i].event);</div><div class='add'>+			CTRL_SET_HOST_ONLY(high, 0);</div><div class='add'>+			CTRL_SET_GUEST_ONLY(high, 0);</div><div class='add'>+</div><div class='add'>+			CTRL_WRITE(low, high, msrs, i);</div><div class='add'>+		} else {</div><div class='add'>+			reset_value[i] = 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_OPROFILE_IBS</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+op_amd_handle_ibs(struct pt_regs * const regs,</div><div class='add'>+		  struct op_msrs const * const msrs)</div><div class='add'>+{</div><div class='add'>+	unsigned int low, high;</div><div class='add'>+	struct ibs_fetch_sample ibs_fetch;</div><div class='add'>+	struct ibs_op_sample ibs_op;</div><div class='add'>+</div><div class='add'>+	if (!ibs_allowed)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	if (ibs_config.fetch_enabled) {</div><div class='add'>+		rdmsr(MSR_AMD64_IBSFETCHCTL, low, high);</div><div class='add'>+		if (high &amp; IBS_FETCH_HIGH_VALID_BIT) {</div><div class='add'>+			ibs_fetch.ibs_fetch_ctl_high = high;</div><div class='add'>+			ibs_fetch.ibs_fetch_ctl_low = low;</div><div class='add'>+			rdmsr(MSR_AMD64_IBSFETCHLINAD, low, high);</div><div class='add'>+			ibs_fetch.ibs_fetch_lin_addr_high = high;</div><div class='add'>+			ibs_fetch.ibs_fetch_lin_addr_low = low;</div><div class='add'>+			rdmsr(MSR_AMD64_IBSFETCHPHYSAD, low, high);</div><div class='add'>+			ibs_fetch.ibs_fetch_phys_addr_high = high;</div><div class='add'>+			ibs_fetch.ibs_fetch_phys_addr_low = low;</div><div class='add'>+</div><div class='add'>+			oprofile_add_ibs_sample(regs,</div><div class='add'>+						(unsigned int *)&amp;ibs_fetch,</div><div class='add'>+						IBS_FETCH_BEGIN);</div><div class='add'>+</div><div class='add'>+			/*reenable the IRQ */</div><div class='add'>+			rdmsr(MSR_AMD64_IBSFETCHCTL, low, high);</div><div class='add'>+			high &amp;= ~IBS_FETCH_HIGH_VALID_BIT;</div><div class='add'>+			high |= IBS_FETCH_HIGH_ENABLE;</div><div class='add'>+			low &amp;= IBS_FETCH_LOW_MAX_CNT_MASK;</div><div class='add'>+			wrmsr(MSR_AMD64_IBSFETCHCTL, low, high);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ibs_config.op_enabled) {</div><div class='add'>+		rdmsr(MSR_AMD64_IBSOPCTL, low, high);</div><div class='add'>+		if (low &amp; IBS_OP_LOW_VALID_BIT) {</div><div class='add'>+			rdmsr(MSR_AMD64_IBSOPRIP, low, high);</div><div class='add'>+			ibs_op.ibs_op_rip_low = low;</div><div class='add'>+			ibs_op.ibs_op_rip_high = high;</div><div class='add'>+			rdmsr(MSR_AMD64_IBSOPDATA, low, high);</div><div class='add'>+			ibs_op.ibs_op_data1_low = low;</div><div class='add'>+			ibs_op.ibs_op_data1_high = high;</div><div class='add'>+			rdmsr(MSR_AMD64_IBSOPDATA2, low, high);</div><div class='add'>+			ibs_op.ibs_op_data2_low = low;</div><div class='add'>+			ibs_op.ibs_op_data2_high = high;</div><div class='add'>+			rdmsr(MSR_AMD64_IBSOPDATA3, low, high);</div><div class='add'>+			ibs_op.ibs_op_data3_low = low;</div><div class='add'>+			ibs_op.ibs_op_data3_high = high;</div><div class='add'>+			rdmsr(MSR_AMD64_IBSDCLINAD, low, high);</div><div class='add'>+			ibs_op.ibs_dc_linear_low = low;</div><div class='add'>+			ibs_op.ibs_dc_linear_high = high;</div><div class='add'>+			rdmsr(MSR_AMD64_IBSDCPHYSAD, low, high);</div><div class='add'>+			ibs_op.ibs_dc_phys_low = low;</div><div class='add'>+			ibs_op.ibs_dc_phys_high = high;</div><div class='add'>+</div><div class='add'>+			/* reenable the IRQ */</div><div class='add'>+			oprofile_add_ibs_sample(regs,</div><div class='add'>+						(unsigned int *)&amp;ibs_op,</div><div class='add'>+						IBS_OP_BEGIN);</div><div class='add'>+			rdmsr(MSR_AMD64_IBSOPCTL, low, high);</div><div class='add'>+			high = 0;</div><div class='add'>+			low &amp;= ~IBS_OP_LOW_VALID_BIT;</div><div class='add'>+			low |= IBS_OP_LOW_ENABLE;</div><div class='add'>+			wrmsr(MSR_AMD64_IBSOPCTL, low, high);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static int op_amd_check_ctrs(struct pt_regs * const regs,</div><div class='add'>+			     struct op_msrs const * const msrs)</div><div class='add'>+{</div><div class='add'>+	unsigned int low, high;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0 ; i &lt; NUM_COUNTERS; ++i) {</div><div class='add'>+		if (!reset_value[i])</div><div class='add'>+			continue;</div><div class='add'>+		CTR_READ(low, high, msrs, i);</div><div class='add'>+		if (CTR_OVERFLOWED(low)) {</div><div class='add'>+			oprofile_add_sample(regs, i);</div><div class='add'>+			CTR_WRITE(reset_value[i], msrs, i);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_OPROFILE_IBS</div><div class='add'>+	op_amd_handle_ibs(regs, msrs);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* See op_model_ppro.c */</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void op_amd_start(struct op_msrs const * const msrs)</div><div class='add'>+{</div><div class='add'>+	unsigned int low, high;</div><div class='add'>+	int i;</div><div class='add'>+	for (i = 0 ; i &lt; NUM_COUNTERS ; ++i) {</div><div class='add'>+		if (reset_value[i]) {</div><div class='add'>+			CTRL_READ(low, high, msrs, i);</div><div class='add'>+			CTRL_SET_ACTIVE(low);</div><div class='add'>+			CTRL_WRITE(low, high, msrs, i);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_OPROFILE_IBS</div><div class='add'>+	if (ibs_allowed &amp;&amp; ibs_config.fetch_enabled) {</div><div class='add'>+		low = (ibs_config.max_cnt_fetch &gt;&gt; 4) &amp; 0xFFFF;</div><div class='add'>+		high = IBS_FETCH_HIGH_ENABLE;</div><div class='add'>+		wrmsr(MSR_AMD64_IBSFETCHCTL, low, high);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ibs_allowed &amp;&amp; ibs_config.op_enabled) {</div><div class='add'>+		low = ((ibs_config.max_cnt_op &gt;&gt; 4) &amp; 0xFFFF) + IBS_OP_LOW_ENABLE;</div><div class='add'>+		high = 0;</div><div class='add'>+		wrmsr(MSR_AMD64_IBSOPCTL, low, high);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void op_amd_stop(struct op_msrs const * const msrs)</div><div class='add'>+{</div><div class='add'>+	unsigned int low, high;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* Subtle: stop on all counters to avoid race with</div><div class='add'>+	 * setting our pm callback */</div><div class='add'>+	for (i = 0 ; i &lt; NUM_COUNTERS ; ++i) {</div><div class='add'>+		if (!reset_value[i])</div><div class='add'>+			continue;</div><div class='add'>+		CTRL_READ(low, high, msrs, i);</div><div class='add'>+		CTRL_SET_INACTIVE(low);</div><div class='add'>+		CTRL_WRITE(low, high, msrs, i);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_OPROFILE_IBS</div><div class='add'>+	if (ibs_allowed &amp;&amp; ibs_config.fetch_enabled) {</div><div class='add'>+		low = 0;		/* clear max count and enable */</div><div class='add'>+		high = 0;</div><div class='add'>+		wrmsr(MSR_AMD64_IBSFETCHCTL, low, high);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ibs_allowed &amp;&amp; ibs_config.op_enabled) {</div><div class='add'>+		low = 0;		/* clear max count and enable */</div><div class='add'>+		high = 0;</div><div class='add'>+		wrmsr(MSR_AMD64_IBSOPCTL, low, high);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void op_amd_shutdown(struct op_msrs const * const msrs)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0 ; i &lt; NUM_COUNTERS ; ++i) {</div><div class='add'>+		if (CTR_IS_RESERVED(msrs, i))</div><div class='add'>+			release_perfctr_nmi(MSR_K7_PERFCTR0 + i);</div><div class='add'>+	}</div><div class='add'>+	for (i = 0 ; i &lt; NUM_CONTROLS ; ++i) {</div><div class='add'>+		if (CTRL_IS_RESERVED(msrs, i))</div><div class='add'>+			release_evntsel_nmi(MSR_K7_EVNTSEL0 + i);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifndef CONFIG_OPROFILE_IBS</div><div class='add'>+</div><div class='add'>+/* no IBS support */</div><div class='add'>+</div><div class='add'>+static int op_amd_init(struct oprofile_operations *ops)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void op_amd_exit(void) {}</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+static u8 ibs_eilvt_off;</div><div class='add'>+</div><div class='add'>+static inline void apic_init_ibs_nmi_per_cpu(void *arg)</div><div class='add'>+{</div><div class='add'>+	ibs_eilvt_off = setup_APIC_eilvt_ibs(0, APIC_EILVT_MSG_NMI, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void apic_clear_ibs_nmi_per_cpu(void *arg)</div><div class='add'>+{</div><div class='add'>+	setup_APIC_eilvt_ibs(0, APIC_EILVT_MSG_FIX, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pfm_amd64_setup_eilvt(void)</div><div class='add'>+{</div><div class='add'>+#define IBSCTL_LVTOFFSETVAL		(1 &lt;&lt; 8)</div><div class='add'>+#define IBSCTL				0x1cc</div><div class='add'>+	struct pci_dev *cpu_cfg;</div><div class='add'>+	int nodes;</div><div class='add'>+	u32 value = 0;</div><div class='add'>+</div><div class='add'>+	/* per CPU setup */</div><div class='add'>+	on_each_cpu(apic_init_ibs_nmi_per_cpu, NULL, 1);</div><div class='add'>+</div><div class='add'>+	nodes = 0;</div><div class='add'>+	cpu_cfg = NULL;</div><div class='add'>+	do {</div><div class='add'>+		cpu_cfg = pci_get_device(PCI_VENDOR_ID_AMD,</div><div class='add'>+					 PCI_DEVICE_ID_AMD_10H_NB_MISC,</div><div class='add'>+					 cpu_cfg);</div><div class='add'>+		if (!cpu_cfg)</div><div class='add'>+			break;</div><div class='add'>+		++nodes;</div><div class='add'>+		pci_write_config_dword(cpu_cfg, IBSCTL, ibs_eilvt_off</div><div class='add'>+				       | IBSCTL_LVTOFFSETVAL);</div><div class='add'>+		pci_read_config_dword(cpu_cfg, IBSCTL, &amp;value);</div><div class='add'>+		if (value != (ibs_eilvt_off | IBSCTL_LVTOFFSETVAL)) {</div><div class='add'>+			printk(KERN_DEBUG "Failed to setup IBS LVT offset, "</div><div class='add'>+				"IBSCTL = 0x%08x", value);</div><div class='add'>+			return 1;</div><div class='add'>+		}</div><div class='add'>+	} while (1);</div><div class='add'>+</div><div class='add'>+	if (!nodes) {</div><div class='add'>+		printk(KERN_DEBUG "No CPU node configured for IBS");</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_NUMA</div><div class='add'>+	/* Sanity check */</div><div class='add'>+	/* Works only for 64bit with proper numa implementation. */</div><div class='add'>+	if (nodes != num_possible_nodes()) {</div><div class='add'>+		printk(KERN_DEBUG "Failed to setup CPU node(s) for IBS, "</div><div class='add'>+			"found: %d, expected %d",</div><div class='add'>+			nodes, num_possible_nodes());</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * initialize the APIC for the IBS interrupts</div><div class='add'>+ * if available (AMD Family10h rev B0 and later)</div><div class='add'>+ */</div><div class='add'>+static void setup_ibs(void)</div><div class='add'>+{</div><div class='add'>+	ibs_allowed = boot_cpu_has(X86_FEATURE_IBS);</div><div class='add'>+</div><div class='add'>+	if (!ibs_allowed)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (pfm_amd64_setup_eilvt()) {</div><div class='add'>+		ibs_allowed = 0;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "oprofile: AMD IBS detected\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * unitialize the APIC for the IBS interrupts if needed on AMD Family10h</div><div class='add'>+ * rev B0 and later */</div><div class='add'>+static void clear_ibs_nmi(void)</div><div class='add'>+{</div><div class='add'>+	if (ibs_allowed)</div><div class='add'>+		on_each_cpu(apic_clear_ibs_nmi_per_cpu, NULL, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int (*create_arch_files)(struct super_block * sb, struct dentry * root);</div><div class='add'>+</div><div class='add'>+static int setup_ibs_files(struct super_block * sb, struct dentry * root)</div><div class='add'>+{</div><div class='add'>+	char buf[12];</div><div class='add'>+	struct dentry *dir;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	/* architecture specific files */</div><div class='add'>+	if (create_arch_files)</div><div class='add'>+		ret = create_arch_files(sb, root);</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (!ibs_allowed)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* model specific files */</div><div class='add'>+</div><div class='add'>+	/* setup some reasonable defaults */</div><div class='add'>+	ibs_config.max_cnt_fetch = 250000;</div><div class='add'>+	ibs_config.fetch_enabled = 0;</div><div class='add'>+	ibs_config.max_cnt_op = 250000;</div><div class='add'>+	ibs_config.op_enabled = 0;</div><div class='add'>+	ibs_config.dispatched_ops = 1;</div><div class='add'>+	snprintf(buf,  sizeof(buf), "ibs_fetch");</div><div class='add'>+	dir = oprofilefs_mkdir(sb, root, buf);</div><div class='add'>+	oprofilefs_create_ulong(sb, dir, "rand_enable",</div><div class='add'>+				&amp;ibs_config.rand_en);</div><div class='add'>+	oprofilefs_create_ulong(sb, dir, "enable",</div><div class='add'>+		&amp;ibs_config.fetch_enabled);</div><div class='add'>+	oprofilefs_create_ulong(sb, dir, "max_count",</div><div class='add'>+		&amp;ibs_config.max_cnt_fetch);</div><div class='add'>+	snprintf(buf,  sizeof(buf), "ibs_uops");</div><div class='add'>+	dir = oprofilefs_mkdir(sb, root, buf);</div><div class='add'>+	oprofilefs_create_ulong(sb, dir, "enable",</div><div class='add'>+		&amp;ibs_config.op_enabled);</div><div class='add'>+	oprofilefs_create_ulong(sb, dir, "max_count",</div><div class='add'>+		&amp;ibs_config.max_cnt_op);</div><div class='add'>+	oprofilefs_create_ulong(sb, dir, "dispatched_ops",</div><div class='add'>+		&amp;ibs_config.dispatched_ops);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int op_amd_init(struct oprofile_operations *ops)</div><div class='add'>+{</div><div class='add'>+	setup_ibs();</div><div class='add'>+	create_arch_files = ops-&gt;create_files;</div><div class='add'>+	ops-&gt;create_files = setup_ibs_files;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void op_amd_exit(void)</div><div class='add'>+{</div><div class='add'>+	clear_ibs_nmi();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+struct op_x86_model_spec const op_amd_spec = {</div><div class='add'>+	.init = op_amd_init,</div><div class='add'>+	.exit = op_amd_exit,</div><div class='add'>+	.num_counters = NUM_COUNTERS,</div><div class='add'>+	.num_controls = NUM_CONTROLS,</div><div class='add'>+	.fill_in_addresses = &amp;op_amd_fill_in_addresses,</div><div class='add'>+	.setup_ctrs = &amp;op_amd_setup_ctrs,</div><div class='add'>+	.check_ctrs = &amp;op_amd_check_ctrs,</div><div class='add'>+	.start = &amp;op_amd_start,</div><div class='add'>+	.stop = &amp;op_amd_stop,</div><div class='add'>+	.shutdown = &amp;op_amd_shutdown</div><div class='add'>+};</div><div class='head'>diff --git a/arch/x86/oprofile/op_model_athlon.c b/arch/x86/oprofile/op_model_athlon.c<br/>deleted file mode 100644<br/>index 3d534879a9dc..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/oprofile/op_model_athlon.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/oprofile/op_model_athlon.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,190 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * @file op_model_athlon.h</div><div class='del'>- * athlon / K7 / K8 / Family 10h model-specific MSR operations</div><div class='del'>- *</div><div class='del'>- * @remark Copyright 2002 OProfile authors</div><div class='del'>- * @remark Read the file COPYING</div><div class='del'>- *</div><div class='del'>- * @author John Levon</div><div class='del'>- * @author Philippe Elie</div><div class='del'>- * @author Graydon Hoare</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/oprofile.h&gt;</div><div class='del'>-#include &lt;asm/ptrace.h&gt;</div><div class='del'>-#include &lt;asm/msr.h&gt;</div><div class='del'>-#include &lt;asm/nmi.h&gt;</div><div class='del'>-</div><div class='del'>-#include "op_x86_model.h"</div><div class='del'>-#include "op_counter.h"</div><div class='del'>-</div><div class='del'>-#define NUM_COUNTERS 4</div><div class='del'>-#define NUM_CONTROLS 4</div><div class='del'>-</div><div class='del'>-#define CTR_IS_RESERVED(msrs, c) (msrs-&gt;counters[(c)].addr ? 1 : 0)</div><div class='del'>-#define CTR_READ(l, h, msrs, c) do {rdmsr(msrs-&gt;counters[(c)].addr, (l), (h)); } while (0)</div><div class='del'>-#define CTR_WRITE(l, msrs, c) do {wrmsr(msrs-&gt;counters[(c)].addr, -(unsigned int)(l), -1); } while (0)</div><div class='del'>-#define CTR_OVERFLOWED(n) (!((n) &amp; (1U&lt;&lt;31)))</div><div class='del'>-</div><div class='del'>-#define CTRL_IS_RESERVED(msrs, c) (msrs-&gt;controls[(c)].addr ? 1 : 0)</div><div class='del'>-#define CTRL_READ(l, h, msrs, c) do {rdmsr(msrs-&gt;controls[(c)].addr, (l), (h)); } while (0)</div><div class='del'>-#define CTRL_WRITE(l, h, msrs, c) do {wrmsr(msrs-&gt;controls[(c)].addr, (l), (h)); } while (0)</div><div class='del'>-#define CTRL_SET_ACTIVE(n) (n |= (1&lt;&lt;22))</div><div class='del'>-#define CTRL_SET_INACTIVE(n) (n &amp;= ~(1&lt;&lt;22))</div><div class='del'>-#define CTRL_CLEAR_LO(x) (x &amp;= (1&lt;&lt;21))</div><div class='del'>-#define CTRL_CLEAR_HI(x) (x &amp;= 0xfffffcf0)</div><div class='del'>-#define CTRL_SET_ENABLE(val) (val |= 1&lt;&lt;20)</div><div class='del'>-#define CTRL_SET_USR(val, u) (val |= ((u &amp; 1) &lt;&lt; 16))</div><div class='del'>-#define CTRL_SET_KERN(val, k) (val |= ((k &amp; 1) &lt;&lt; 17))</div><div class='del'>-#define CTRL_SET_UM(val, m) (val |= (m &lt;&lt; 8))</div><div class='del'>-#define CTRL_SET_EVENT_LOW(val, e) (val |= (e &amp; 0xff))</div><div class='del'>-#define CTRL_SET_EVENT_HIGH(val, e) (val |= ((e &gt;&gt; 8) &amp; 0xf))</div><div class='del'>-#define CTRL_SET_HOST_ONLY(val, h) (val |= ((h &amp; 1) &lt;&lt; 9))</div><div class='del'>-#define CTRL_SET_GUEST_ONLY(val, h) (val |= ((h &amp; 1) &lt;&lt; 8))</div><div class='del'>-</div><div class='del'>-static unsigned long reset_value[NUM_COUNTERS];</div><div class='del'>-</div><div class='del'>-static void athlon_fill_in_addresses(struct op_msrs * const msrs)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; NUM_COUNTERS; i++) {</div><div class='del'>-		if (reserve_perfctr_nmi(MSR_K7_PERFCTR0 + i))</div><div class='del'>-			msrs-&gt;counters[i].addr = MSR_K7_PERFCTR0 + i;</div><div class='del'>-		else</div><div class='del'>-			msrs-&gt;counters[i].addr = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; NUM_CONTROLS; i++) {</div><div class='del'>-		if (reserve_evntsel_nmi(MSR_K7_EVNTSEL0 + i))</div><div class='del'>-			msrs-&gt;controls[i].addr = MSR_K7_EVNTSEL0 + i;</div><div class='del'>-		else</div><div class='del'>-			msrs-&gt;controls[i].addr = 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void athlon_setup_ctrs(struct op_msrs const * const msrs)</div><div class='del'>-{</div><div class='del'>-	unsigned int low, high;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* clear all counters */</div><div class='del'>-	for (i = 0 ; i &lt; NUM_CONTROLS; ++i) {</div><div class='del'>-		if (unlikely(!CTRL_IS_RESERVED(msrs, i)))</div><div class='del'>-			continue;</div><div class='del'>-		CTRL_READ(low, high, msrs, i);</div><div class='del'>-		CTRL_CLEAR_LO(low);</div><div class='del'>-		CTRL_CLEAR_HI(high);</div><div class='del'>-		CTRL_WRITE(low, high, msrs, i);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* avoid a false detection of ctr overflows in NMI handler */</div><div class='del'>-	for (i = 0; i &lt; NUM_COUNTERS; ++i) {</div><div class='del'>-		if (unlikely(!CTR_IS_RESERVED(msrs, i)))</div><div class='del'>-			continue;</div><div class='del'>-		CTR_WRITE(1, msrs, i);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* enable active counters */</div><div class='del'>-	for (i = 0; i &lt; NUM_COUNTERS; ++i) {</div><div class='del'>-		if ((counter_config[i].enabled) &amp;&amp; (CTR_IS_RESERVED(msrs, i))) {</div><div class='del'>-			reset_value[i] = counter_config[i].count;</div><div class='del'>-</div><div class='del'>-			CTR_WRITE(counter_config[i].count, msrs, i);</div><div class='del'>-</div><div class='del'>-			CTRL_READ(low, high, msrs, i);</div><div class='del'>-			CTRL_CLEAR_LO(low);</div><div class='del'>-			CTRL_CLEAR_HI(high);</div><div class='del'>-			CTRL_SET_ENABLE(low);</div><div class='del'>-			CTRL_SET_USR(low, counter_config[i].user);</div><div class='del'>-			CTRL_SET_KERN(low, counter_config[i].kernel);</div><div class='del'>-			CTRL_SET_UM(low, counter_config[i].unit_mask);</div><div class='del'>-			CTRL_SET_EVENT_LOW(low, counter_config[i].event);</div><div class='del'>-			CTRL_SET_EVENT_HIGH(high, counter_config[i].event);</div><div class='del'>-			CTRL_SET_HOST_ONLY(high, 0);</div><div class='del'>-			CTRL_SET_GUEST_ONLY(high, 0);</div><div class='del'>-</div><div class='del'>-			CTRL_WRITE(low, high, msrs, i);</div><div class='del'>-		} else {</div><div class='del'>-			reset_value[i] = 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int athlon_check_ctrs(struct pt_regs * const regs,</div><div class='del'>-			     struct op_msrs const * const msrs)</div><div class='del'>-{</div><div class='del'>-	unsigned int low, high;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0 ; i &lt; NUM_COUNTERS; ++i) {</div><div class='del'>-		if (!reset_value[i])</div><div class='del'>-			continue;</div><div class='del'>-		CTR_READ(low, high, msrs, i);</div><div class='del'>-		if (CTR_OVERFLOWED(low)) {</div><div class='del'>-			oprofile_add_sample(regs, i);</div><div class='del'>-			CTR_WRITE(reset_value[i], msrs, i);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* See op_model_ppro.c */</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void athlon_start(struct op_msrs const * const msrs)</div><div class='del'>-{</div><div class='del'>-	unsigned int low, high;</div><div class='del'>-	int i;</div><div class='del'>-	for (i = 0 ; i &lt; NUM_COUNTERS ; ++i) {</div><div class='del'>-		if (reset_value[i]) {</div><div class='del'>-			CTRL_READ(low, high, msrs, i);</div><div class='del'>-			CTRL_SET_ACTIVE(low);</div><div class='del'>-			CTRL_WRITE(low, high, msrs, i);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void athlon_stop(struct op_msrs const * const msrs)</div><div class='del'>-{</div><div class='del'>-	unsigned int low, high;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* Subtle: stop on all counters to avoid race with</div><div class='del'>-	 * setting our pm callback */</div><div class='del'>-	for (i = 0 ; i &lt; NUM_COUNTERS ; ++i) {</div><div class='del'>-		if (!reset_value[i])</div><div class='del'>-			continue;</div><div class='del'>-		CTRL_READ(low, high, msrs, i);</div><div class='del'>-		CTRL_SET_INACTIVE(low);</div><div class='del'>-		CTRL_WRITE(low, high, msrs, i);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void athlon_shutdown(struct op_msrs const * const msrs)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0 ; i &lt; NUM_COUNTERS ; ++i) {</div><div class='del'>-		if (CTR_IS_RESERVED(msrs, i))</div><div class='del'>-			release_perfctr_nmi(MSR_K7_PERFCTR0 + i);</div><div class='del'>-	}</div><div class='del'>-	for (i = 0 ; i &lt; NUM_CONTROLS ; ++i) {</div><div class='del'>-		if (CTRL_IS_RESERVED(msrs, i))</div><div class='del'>-			release_evntsel_nmi(MSR_K7_EVNTSEL0 + i);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct op_x86_model_spec const op_athlon_spec = {</div><div class='del'>-	.num_counters = NUM_COUNTERS,</div><div class='del'>-	.num_controls = NUM_CONTROLS,</div><div class='del'>-	.fill_in_addresses = &amp;athlon_fill_in_addresses,</div><div class='del'>-	.setup_ctrs = &amp;athlon_setup_ctrs,</div><div class='del'>-	.check_ctrs = &amp;athlon_check_ctrs,</div><div class='del'>-	.start = &amp;athlon_start,</div><div class='del'>-	.stop = &amp;athlon_stop,</div><div class='del'>-	.shutdown = &amp;athlon_shutdown</div><div class='del'>-};</div><div class='head'>diff --git a/arch/x86/oprofile/op_model_p4.c b/arch/x86/oprofile/op_model_p4.c<br/>index 56b4757a1f47..43ac5af338d8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/oprofile/op_model_p4.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/oprofile/op_model_p4.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/oprofile/op_model_p4.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/oprofile/op_model_p4.c</a></div><div class='hunk'>@@ -10,11 +10,12 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/oprofile.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='add'>+#include &lt;linux/ptrace.h&gt;</div><div class='add'>+#include &lt;linux/nmi.h&gt;</div><div class='ctx'> #include &lt;asm/msr.h&gt;</div><div class='del'>-#include &lt;asm/ptrace.h&gt;</div><div class='ctx'> #include &lt;asm/fixmap.h&gt;</div><div class='ctx'> #include &lt;asm/apic.h&gt;</div><div class='del'>-#include &lt;asm/nmi.h&gt;</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> #include "op_x86_model.h"</div><div class='ctx'> #include "op_counter.h"</div><div class='hunk'>@@ -40,7 +41,7 @@ static unsigned int num_controls = NUM_CONTROLS_NON_HT;</div><div class='ctx'> static inline void setup_num_counters(void)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='del'>-	if (smp_num_siblings == 2){</div><div class='add'>+	if (smp_num_siblings == 2) {</div><div class='ctx'> 		num_counters = NUM_COUNTERS_HT2;</div><div class='ctx'> 		num_controls = NUM_CONTROLS_HT2;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -86,7 +87,7 @@ struct p4_event_binding {</div><div class='ctx'> #define CTR_FLAME_2    (1 &lt;&lt; 6)</div><div class='ctx'> #define CTR_IQ_5       (1 &lt;&lt; 7)</div><div class='ctx'> </div><div class='del'>-static struct p4_counter_binding p4_counters [NUM_COUNTERS_NON_HT] = {</div><div class='add'>+static struct p4_counter_binding p4_counters[NUM_COUNTERS_NON_HT] = {</div><div class='ctx'> 	{ CTR_BPU_0,   MSR_P4_BPU_PERFCTR0,   MSR_P4_BPU_CCCR0 },</div><div class='ctx'> 	{ CTR_MS_0,    MSR_P4_MS_PERFCTR0,    MSR_P4_MS_CCCR0 },</div><div class='ctx'> 	{ CTR_FLAME_0, MSR_P4_FLAME_PERFCTR0, MSR_P4_FLAME_CCCR0 },</div><div class='hunk'>@@ -97,32 +98,32 @@ static struct p4_counter_binding p4_counters [NUM_COUNTERS_NON_HT] = {</div><div class='ctx'> 	{ CTR_IQ_5,    MSR_P4_IQ_PERFCTR5,    MSR_P4_IQ_CCCR5 }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define NUM_UNUSED_CCCRS	NUM_CCCRS_NON_HT - NUM_COUNTERS_NON_HT</div><div class='add'>+#define NUM_UNUSED_CCCRS (NUM_CCCRS_NON_HT - NUM_COUNTERS_NON_HT)</div><div class='ctx'> </div><div class='ctx'> /* p4 event codes in libop/op_event.h are indices into this table. */</div><div class='ctx'> </div><div class='ctx'> static struct p4_event_binding p4_events[NUM_EVENTS] = {</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	{ /* BRANCH_RETIRED */</div><div class='del'>-		0x05, 0x06, </div><div class='add'>+		0x05, 0x06,</div><div class='ctx'> 		{ {CTR_IQ_4, MSR_P4_CRU_ESCR2},</div><div class='ctx'> 		  {CTR_IQ_5, MSR_P4_CRU_ESCR3} }</div><div class='ctx'> 	},</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	{ /* MISPRED_BRANCH_RETIRED */</div><div class='del'>-		0x04, 0x03, </div><div class='add'>+		0x04, 0x03,</div><div class='ctx'> 		{ { CTR_IQ_4, MSR_P4_CRU_ESCR0},</div><div class='ctx'> 		  { CTR_IQ_5, MSR_P4_CRU_ESCR1} }</div><div class='ctx'> 	},</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	{ /* TC_DELIVER_MODE */</div><div class='ctx'> 		0x01, 0x01,</div><div class='del'>-		{ { CTR_MS_0, MSR_P4_TC_ESCR0},  </div><div class='add'>+		{ { CTR_MS_0, MSR_P4_TC_ESCR0},</div><div class='ctx'> 		  { CTR_MS_2, MSR_P4_TC_ESCR1} }</div><div class='ctx'> 	},</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	{ /* BPU_FETCH_REQUEST */</div><div class='del'>-		0x00, 0x03, </div><div class='add'>+		0x00, 0x03,</div><div class='ctx'> 		{ { CTR_BPU_0, MSR_P4_BPU_ESCR0},</div><div class='ctx'> 		  { CTR_BPU_2, MSR_P4_BPU_ESCR1} }</div><div class='ctx'> 	},</div><div class='hunk'>@@ -146,7 +147,7 @@ static struct p4_event_binding p4_events[NUM_EVENTS] = {</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='ctx'> 	{ /* LOAD_PORT_REPLAY */</div><div class='del'>-		0x02, 0x04, </div><div class='add'>+		0x02, 0x04,</div><div class='ctx'> 		{ { CTR_FLAME_0, MSR_P4_SAAT_ESCR0},</div><div class='ctx'> 		  { CTR_FLAME_2, MSR_P4_SAAT_ESCR1} }</div><div class='ctx'> 	},</div><div class='hunk'>@@ -170,43 +171,43 @@ static struct p4_event_binding p4_events[NUM_EVENTS] = {</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='ctx'> 	{ /* BSQ_CACHE_REFERENCE */</div><div class='del'>-		0x07, 0x0c, </div><div class='add'>+		0x07, 0x0c,</div><div class='ctx'> 		{ { CTR_BPU_0, MSR_P4_BSU_ESCR0},</div><div class='ctx'> 		  { CTR_BPU_2, MSR_P4_BSU_ESCR1} }</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='ctx'> 	{ /* IOQ_ALLOCATION */</div><div class='del'>-		0x06, 0x03, </div><div class='add'>+		0x06, 0x03,</div><div class='ctx'> 		{ { CTR_BPU_0, MSR_P4_FSB_ESCR0},</div><div class='ctx'> 		  { 0, 0 } }</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='ctx'> 	{ /* IOQ_ACTIVE_ENTRIES */</div><div class='del'>-		0x06, 0x1a, </div><div class='add'>+		0x06, 0x1a,</div><div class='ctx'> 		{ { CTR_BPU_2, MSR_P4_FSB_ESCR1},</div><div class='ctx'> 		  { 0, 0 } }</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='ctx'> 	{ /* FSB_DATA_ACTIVITY */</div><div class='del'>-		0x06, 0x17, </div><div class='add'>+		0x06, 0x17,</div><div class='ctx'> 		{ { CTR_BPU_0, MSR_P4_FSB_ESCR0},</div><div class='ctx'> 		  { CTR_BPU_2, MSR_P4_FSB_ESCR1} }</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='ctx'> 	{ /* BSQ_ALLOCATION */</div><div class='del'>-		0x07, 0x05, </div><div class='add'>+		0x07, 0x05,</div><div class='ctx'> 		{ { CTR_BPU_0, MSR_P4_BSU_ESCR0},</div><div class='ctx'> 		  { 0, 0 } }</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='ctx'> 	{ /* BSQ_ACTIVE_ENTRIES */</div><div class='ctx'> 		0x07, 0x06,</div><div class='del'>-		{ { CTR_BPU_2, MSR_P4_BSU_ESCR1 /* guess */},  </div><div class='add'>+		{ { CTR_BPU_2, MSR_P4_BSU_ESCR1 /* guess */},</div><div class='ctx'> 		  { 0, 0 } }</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='ctx'> 	{ /* X87_ASSIST */</div><div class='del'>-		0x05, 0x03, </div><div class='add'>+		0x05, 0x03,</div><div class='ctx'> 		{ { CTR_IQ_4, MSR_P4_CRU_ESCR2},</div><div class='ctx'> 		  { CTR_IQ_5, MSR_P4_CRU_ESCR3} }</div><div class='ctx'> 	},</div><div class='hunk'>@@ -216,21 +217,21 @@ static struct p4_event_binding p4_events[NUM_EVENTS] = {</div><div class='ctx'> 		{ { CTR_FLAME_0, MSR_P4_FIRM_ESCR0},</div><div class='ctx'> 		  { CTR_FLAME_2, MSR_P4_FIRM_ESCR1} }</div><div class='ctx'> 	},</div><div class='del'>-  </div><div class='add'>+</div><div class='ctx'> 	{ /* PACKED_SP_UOP */</div><div class='del'>-		0x01, 0x08, </div><div class='add'>+		0x01, 0x08,</div><div class='ctx'> 		{ { CTR_FLAME_0, MSR_P4_FIRM_ESCR0},</div><div class='ctx'> 		  { CTR_FLAME_2, MSR_P4_FIRM_ESCR1} }</div><div class='ctx'> 	},</div><div class='del'>-  </div><div class='add'>+</div><div class='ctx'> 	{ /* PACKED_DP_UOP */</div><div class='del'>-		0x01, 0x0c, </div><div class='add'>+		0x01, 0x0c,</div><div class='ctx'> 		{ { CTR_FLAME_0, MSR_P4_FIRM_ESCR0},</div><div class='ctx'> 		  { CTR_FLAME_2, MSR_P4_FIRM_ESCR1} }</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='ctx'> 	{ /* SCALAR_SP_UOP */</div><div class='del'>-		0x01, 0x0a, </div><div class='add'>+		0x01, 0x0a,</div><div class='ctx'> 		{ { CTR_FLAME_0, MSR_P4_FIRM_ESCR0},</div><div class='ctx'> 		  { CTR_FLAME_2, MSR_P4_FIRM_ESCR1} }</div><div class='ctx'> 	},</div><div class='hunk'>@@ -242,31 +243,31 @@ static struct p4_event_binding p4_events[NUM_EVENTS] = {</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='ctx'> 	{ /* 64BIT_MMX_UOP */</div><div class='del'>-		0x01, 0x02, </div><div class='add'>+		0x01, 0x02,</div><div class='ctx'> 		{ { CTR_FLAME_0, MSR_P4_FIRM_ESCR0},</div><div class='ctx'> 		  { CTR_FLAME_2, MSR_P4_FIRM_ESCR1} }</div><div class='ctx'> 	},</div><div class='del'>-  </div><div class='add'>+</div><div class='ctx'> 	{ /* 128BIT_MMX_UOP */</div><div class='del'>-		0x01, 0x1a, </div><div class='add'>+		0x01, 0x1a,</div><div class='ctx'> 		{ { CTR_FLAME_0, MSR_P4_FIRM_ESCR0},</div><div class='ctx'> 		  { CTR_FLAME_2, MSR_P4_FIRM_ESCR1} }</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='ctx'> 	{ /* X87_FP_UOP */</div><div class='del'>-		0x01, 0x04, </div><div class='add'>+		0x01, 0x04,</div><div class='ctx'> 		{ { CTR_FLAME_0, MSR_P4_FIRM_ESCR0},</div><div class='ctx'> 		  { CTR_FLAME_2, MSR_P4_FIRM_ESCR1} }</div><div class='ctx'> 	},</div><div class='del'>-  </div><div class='add'>+</div><div class='ctx'> 	{ /* X87_SIMD_MOVES_UOP */</div><div class='del'>-		0x01, 0x2e, </div><div class='add'>+		0x01, 0x2e,</div><div class='ctx'> 		{ { CTR_FLAME_0, MSR_P4_FIRM_ESCR0},</div><div class='ctx'> 		  { CTR_FLAME_2, MSR_P4_FIRM_ESCR1} }</div><div class='ctx'> 	},</div><div class='del'>-  </div><div class='add'>+</div><div class='ctx'> 	{ /* MACHINE_CLEAR */</div><div class='del'>-		0x05, 0x02, </div><div class='add'>+		0x05, 0x02,</div><div class='ctx'> 		{ { CTR_IQ_4, MSR_P4_CRU_ESCR2},</div><div class='ctx'> 		  { CTR_IQ_5, MSR_P4_CRU_ESCR3} }</div><div class='ctx'> 	},</div><div class='hunk'>@@ -276,9 +277,9 @@ static struct p4_event_binding p4_events[NUM_EVENTS] = {</div><div class='ctx'> 		{ { CTR_BPU_0, MSR_P4_FSB_ESCR0},</div><div class='ctx'> 		  { CTR_BPU_2, MSR_P4_FSB_ESCR1} }</div><div class='ctx'> 	},</div><div class='del'>-  </div><div class='add'>+</div><div class='ctx'> 	{ /* TC_MS_XFER */</div><div class='del'>-		0x00, 0x05, </div><div class='add'>+		0x00, 0x05,</div><div class='ctx'> 		{ { CTR_MS_0, MSR_P4_MS_ESCR0},</div><div class='ctx'> 		  { CTR_MS_2, MSR_P4_MS_ESCR1} }</div><div class='ctx'> 	},</div><div class='hunk'>@@ -308,7 +309,7 @@ static struct p4_event_binding p4_events[NUM_EVENTS] = {</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='ctx'> 	{ /* INSTR_RETIRED */</div><div class='del'>-		0x04, 0x02, </div><div class='add'>+		0x04, 0x02,</div><div class='ctx'> 		{ { CTR_IQ_4, MSR_P4_CRU_ESCR0},</div><div class='ctx'> 		  { CTR_IQ_5, MSR_P4_CRU_ESCR1} }</div><div class='ctx'> 	},</div><div class='hunk'>@@ -319,14 +320,14 @@ static struct p4_event_binding p4_events[NUM_EVENTS] = {</div><div class='ctx'> 		  { CTR_IQ_5, MSR_P4_CRU_ESCR1} }</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='del'>-	{ /* UOP_TYPE */    </div><div class='del'>-		0x02, 0x02, </div><div class='add'>+	{ /* UOP_TYPE */</div><div class='add'>+		0x02, 0x02,</div><div class='ctx'> 		{ { CTR_IQ_4, MSR_P4_RAT_ESCR0},</div><div class='ctx'> 		  { CTR_IQ_5, MSR_P4_RAT_ESCR1} }</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='ctx'> 	{ /* RETIRED_MISPRED_BRANCH_TYPE */</div><div class='del'>-		0x02, 0x05, </div><div class='add'>+		0x02, 0x05,</div><div class='ctx'> 		{ { CTR_MS_0, MSR_P4_TBPU_ESCR0},</div><div class='ctx'> 		  { CTR_MS_2, MSR_P4_TBPU_ESCR1} }</div><div class='ctx'> 	},</div><div class='hunk'>@@ -349,8 +350,8 @@ static struct p4_event_binding p4_events[NUM_EVENTS] = {</div><div class='ctx'> #define ESCR_SET_OS_1(escr, os) ((escr) |= (((os) &amp; 1) &lt;&lt; 1))</div><div class='ctx'> #define ESCR_SET_EVENT_SELECT(escr, sel) ((escr) |= (((sel) &amp; 0x3f) &lt;&lt; 25))</div><div class='ctx'> #define ESCR_SET_EVENT_MASK(escr, mask) ((escr) |= (((mask) &amp; 0xffff) &lt;&lt; 9))</div><div class='del'>-#define ESCR_READ(escr,high,ev,i) do {rdmsr(ev-&gt;bindings[(i)].escr_address, (escr), (high));} while (0)</div><div class='del'>-#define ESCR_WRITE(escr,high,ev,i) do {wrmsr(ev-&gt;bindings[(i)].escr_address, (escr), (high));} while (0)</div><div class='add'>+#define ESCR_READ(escr, high, ev, i) do {rdmsr(ev-&gt;bindings[(i)].escr_address, (escr), (high)); } while (0)</div><div class='add'>+#define ESCR_WRITE(escr, high, ev, i) do {wrmsr(ev-&gt;bindings[(i)].escr_address, (escr), (high)); } while (0)</div><div class='ctx'> </div><div class='ctx'> #define CCCR_RESERVED_BITS 0x38030FFF</div><div class='ctx'> #define CCCR_CLEAR(cccr) ((cccr) &amp;= CCCR_RESERVED_BITS)</div><div class='hunk'>@@ -360,15 +361,15 @@ static struct p4_event_binding p4_events[NUM_EVENTS] = {</div><div class='ctx'> #define CCCR_SET_PMI_OVF_1(cccr) ((cccr) |= (1&lt;&lt;27))</div><div class='ctx'> #define CCCR_SET_ENABLE(cccr) ((cccr) |= (1&lt;&lt;12))</div><div class='ctx'> #define CCCR_SET_DISABLE(cccr) ((cccr) &amp;= ~(1&lt;&lt;12))</div><div class='del'>-#define CCCR_READ(low, high, i) do {rdmsr(p4_counters[(i)].cccr_address, (low), (high));} while (0)</div><div class='del'>-#define CCCR_WRITE(low, high, i) do {wrmsr(p4_counters[(i)].cccr_address, (low), (high));} while (0)</div><div class='add'>+#define CCCR_READ(low, high, i) do {rdmsr(p4_counters[(i)].cccr_address, (low), (high)); } while (0)</div><div class='add'>+#define CCCR_WRITE(low, high, i) do {wrmsr(p4_counters[(i)].cccr_address, (low), (high)); } while (0)</div><div class='ctx'> #define CCCR_OVF_P(cccr) ((cccr) &amp; (1U&lt;&lt;31))</div><div class='ctx'> #define CCCR_CLEAR_OVF(cccr) ((cccr) &amp;= (~(1U&lt;&lt;31)))</div><div class='ctx'> </div><div class='del'>-#define CTRL_IS_RESERVED(msrs,c) (msrs-&gt;controls[(c)].addr ? 1 : 0)</div><div class='del'>-#define CTR_IS_RESERVED(msrs,c) (msrs-&gt;counters[(c)].addr ? 1 : 0)</div><div class='del'>-#define CTR_READ(l,h,i) do {rdmsr(p4_counters[(i)].counter_address, (l), (h));} while (0)</div><div class='del'>-#define CTR_WRITE(l,i) do {wrmsr(p4_counters[(i)].counter_address, -(u32)(l), -1);} while (0)</div><div class='add'>+#define CTRL_IS_RESERVED(msrs, c) (msrs-&gt;controls[(c)].addr ? 1 : 0)</div><div class='add'>+#define CTR_IS_RESERVED(msrs, c) (msrs-&gt;counters[(c)].addr ? 1 : 0)</div><div class='add'>+#define CTR_READ(l, h, i) do {rdmsr(p4_counters[(i)].counter_address, (l), (h)); } while (0)</div><div class='add'>+#define CTR_WRITE(l, i) do {wrmsr(p4_counters[(i)].counter_address, -(u32)(l), -1); } while (0)</div><div class='ctx'> #define CTR_OVERFLOW_P(ctr) (!((ctr) &amp; 0x80000000))</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -380,7 +381,7 @@ static unsigned int get_stagger(void)</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> 	int cpu = smp_processor_id();</div><div class='ctx'> 	return (cpu != first_cpu(per_cpu(cpu_sibling_map, cpu)));</div><div class='del'>-#endif	</div><div class='add'>+#endif</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -395,25 +396,23 @@ static unsigned long reset_value[NUM_COUNTERS_NON_HT];</div><div class='ctx'> </div><div class='ctx'> static void p4_fill_in_addresses(struct op_msrs * const msrs)</div><div class='ctx'> {</div><div class='del'>-	unsigned int i; </div><div class='add'>+	unsigned int i;</div><div class='ctx'> 	unsigned int addr, cccraddr, stag;</div><div class='ctx'> </div><div class='ctx'> 	setup_num_counters();</div><div class='ctx'> 	stag = get_stagger();</div><div class='ctx'> </div><div class='ctx'> 	/* initialize some registers */</div><div class='del'>-	for (i = 0; i &lt; num_counters; ++i) {</div><div class='add'>+	for (i = 0; i &lt; num_counters; ++i)</div><div class='ctx'> 		msrs-&gt;counters[i].addr = 0;</div><div class='del'>-	}</div><div class='del'>-	for (i = 0; i &lt; num_controls; ++i) {</div><div class='add'>+	for (i = 0; i &lt; num_controls; ++i)</div><div class='ctx'> 		msrs-&gt;controls[i].addr = 0;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	/* the counter &amp; cccr registers we pay attention to */</div><div class='ctx'> 	for (i = 0; i &lt; num_counters; ++i) {</div><div class='ctx'> 		addr = p4_counters[VIRT_CTR(stag, i)].counter_address;</div><div class='ctx'> 		cccraddr = p4_counters[VIRT_CTR(stag, i)].cccr_address;</div><div class='del'>-		if (reserve_perfctr_nmi(addr)){</div><div class='add'>+		if (reserve_perfctr_nmi(addr)) {</div><div class='ctx'> 			msrs-&gt;counters[i].addr = addr;</div><div class='ctx'> 			msrs-&gt;controls[i].addr = cccraddr;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -447,22 +446,22 @@ static void p4_fill_in_addresses(struct op_msrs * const msrs)</div><div class='ctx'> 		if (reserve_evntsel_nmi(addr))</div><div class='ctx'> 			msrs-&gt;controls[i].addr = addr;</div><div class='ctx'> 	}</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	for (addr = MSR_P4_MS_ESCR0 + stag;</div><div class='del'>-	     addr &lt;= MSR_P4_TC_ESCR1; ++i, addr += addr_increment()) { </div><div class='add'>+	     addr &lt;= MSR_P4_TC_ESCR1; ++i, addr += addr_increment()) {</div><div class='ctx'> 		if (reserve_evntsel_nmi(addr))</div><div class='ctx'> 			msrs-&gt;controls[i].addr = addr;</div><div class='ctx'> 	}</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	for (addr = MSR_P4_IX_ESCR0 + stag;</div><div class='del'>-	     addr &lt;= MSR_P4_CRU_ESCR3; ++i, addr += addr_increment()) { </div><div class='add'>+	     addr &lt;= MSR_P4_CRU_ESCR3; ++i, addr += addr_increment()) {</div><div class='ctx'> 		if (reserve_evntsel_nmi(addr))</div><div class='ctx'> 			msrs-&gt;controls[i].addr = addr;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* there are 2 remaining non-contiguously located ESCRs */</div><div class='ctx'> </div><div class='del'>-	if (num_counters == NUM_COUNTERS_NON_HT) {		</div><div class='add'>+	if (num_counters == NUM_COUNTERS_NON_HT) {</div><div class='ctx'> 		/* standard non-HT CPUs handle both remaining ESCRs*/</div><div class='ctx'> 		if (reserve_evntsel_nmi(MSR_P4_CRU_ESCR5))</div><div class='ctx'> 			msrs-&gt;controls[i++].addr = MSR_P4_CRU_ESCR5;</div><div class='hunk'>@@ -498,20 +497,20 @@ static void pmc_setup_one_p4_counter(unsigned int ctr)</div><div class='ctx'> 	unsigned int stag;</div><div class='ctx'> </div><div class='ctx'> 	stag = get_stagger();</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	/* convert from counter *number* to counter *bit* */</div><div class='ctx'> 	counter_bit = 1 &lt;&lt; VIRT_CTR(stag, ctr);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	/* find our event binding structure. */</div><div class='ctx'> 	if (counter_config[ctr].event &lt;= 0 || counter_config[ctr].event &gt; NUM_EVENTS) {</div><div class='del'>-		printk(KERN_ERR </div><div class='del'>-		       "oprofile: P4 event code 0x%lx out of range\n", </div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "oprofile: P4 event code 0x%lx out of range\n",</div><div class='ctx'> 		       counter_config[ctr].event);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	ev = &amp;(p4_events[counter_config[ctr].event - 1]);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; maxbind; i++) {</div><div class='ctx'> 		if (ev-&gt;bindings[i].virt_counter &amp; counter_bit) {</div><div class='ctx'> </div><div class='hunk'>@@ -526,25 +525,24 @@ static void pmc_setup_one_p4_counter(unsigned int ctr)</div><div class='ctx'> 				ESCR_SET_OS_1(escr, counter_config[ctr].kernel);</div><div class='ctx'> 			}</div><div class='ctx'> 			ESCR_SET_EVENT_SELECT(escr, ev-&gt;event_select);</div><div class='del'>-			ESCR_SET_EVENT_MASK(escr, counter_config[ctr].unit_mask);			</div><div class='add'>+			ESCR_SET_EVENT_MASK(escr, counter_config[ctr].unit_mask);</div><div class='ctx'> 			ESCR_WRITE(escr, high, ev, i);</div><div class='del'>-		       </div><div class='add'>+</div><div class='ctx'> 			/* modify CCCR */</div><div class='ctx'> 			CCCR_READ(cccr, high, VIRT_CTR(stag, ctr));</div><div class='ctx'> 			CCCR_CLEAR(cccr);</div><div class='ctx'> 			CCCR_SET_REQUIRED_BITS(cccr);</div><div class='ctx'> 			CCCR_SET_ESCR_SELECT(cccr, ev-&gt;escr_select);</div><div class='del'>-			if (stag == 0) {</div><div class='add'>+			if (stag == 0)</div><div class='ctx'> 				CCCR_SET_PMI_OVF_0(cccr);</div><div class='del'>-			} else {</div><div class='add'>+			else</div><div class='ctx'> 				CCCR_SET_PMI_OVF_1(cccr);</div><div class='del'>-			}</div><div class='ctx'> 			CCCR_WRITE(cccr, high, VIRT_CTR(stag, ctr));</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	printk(KERN_ERR </div><div class='add'>+	printk(KERN_ERR</div><div class='ctx'> 	       "oprofile: P4 event code 0x%lx no binding, stag %d ctr %d\n",</div><div class='ctx'> 	       counter_config[ctr].event, stag, ctr);</div><div class='ctx'> }</div><div class='hunk'>@@ -559,14 +557,14 @@ static void p4_setup_ctrs(struct op_msrs const * const msrs)</div><div class='ctx'> 	stag = get_stagger();</div><div class='ctx'> </div><div class='ctx'> 	rdmsr(MSR_IA32_MISC_ENABLE, low, high);</div><div class='del'>-	if (! MISC_PMC_ENABLED_P(low)) {</div><div class='add'>+	if (!MISC_PMC_ENABLED_P(low)) {</div><div class='ctx'> 		printk(KERN_ERR "oprofile: P4 PMC not available\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* clear the cccrs we will use */</div><div class='ctx'> 	for (i = 0 ; i &lt; num_counters ; i++) {</div><div class='del'>-		if (unlikely(!CTRL_IS_RESERVED(msrs,i)))</div><div class='add'>+		if (unlikely(!CTRL_IS_RESERVED(msrs, i)))</div><div class='ctx'> 			continue;</div><div class='ctx'> 		rdmsr(p4_counters[VIRT_CTR(stag, i)].cccr_address, low, high);</div><div class='ctx'> 		CCCR_CLEAR(low);</div><div class='hunk'>@@ -576,14 +574,14 @@ static void p4_setup_ctrs(struct op_msrs const * const msrs)</div><div class='ctx'> </div><div class='ctx'> 	/* clear all escrs (including those outside our concern) */</div><div class='ctx'> 	for (i = num_counters; i &lt; num_controls; i++) {</div><div class='del'>-		if (unlikely(!CTRL_IS_RESERVED(msrs,i)))</div><div class='add'>+		if (unlikely(!CTRL_IS_RESERVED(msrs, i)))</div><div class='ctx'> 			continue;</div><div class='ctx'> 		wrmsr(msrs-&gt;controls[i].addr, 0, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* setup all counters */</div><div class='ctx'> 	for (i = 0 ; i &lt; num_counters ; ++i) {</div><div class='del'>-		if ((counter_config[i].enabled) &amp;&amp; (CTRL_IS_RESERVED(msrs,i))) {</div><div class='add'>+		if ((counter_config[i].enabled) &amp;&amp; (CTRL_IS_RESERVED(msrs, i))) {</div><div class='ctx'> 			reset_value[i] = counter_config[i].count;</div><div class='ctx'> 			pmc_setup_one_p4_counter(i);</div><div class='ctx'> 			CTR_WRITE(counter_config[i].count, VIRT_CTR(stag, i));</div><div class='hunk'>@@ -603,11 +601,11 @@ static int p4_check_ctrs(struct pt_regs * const regs,</div><div class='ctx'> 	stag = get_stagger();</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; num_counters; ++i) {</div><div class='del'>-		</div><div class='del'>-		if (!reset_value[i]) </div><div class='add'>+</div><div class='add'>+		if (!reset_value[i])</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		/* </div><div class='add'>+		/*</div><div class='ctx'> 		 * there is some eccentricity in the hardware which</div><div class='ctx'> 		 * requires that we perform 2 extra corrections:</div><div class='ctx'> 		 *</div><div class='hunk'>@@ -616,24 +614,24 @@ static int p4_check_ctrs(struct pt_regs * const regs,</div><div class='ctx'> 		 *</div><div class='ctx'> 		 * - write the counter back twice to ensure it gets</div><div class='ctx'> 		 *   updated properly.</div><div class='del'>-		 * </div><div class='add'>+		 *</div><div class='ctx'> 		 * the former seems to be related to extra NMIs happening</div><div class='ctx'> 		 * during the current NMI; the latter is reported as errata</div><div class='ctx'> 		 * N15 in intel doc 249199-029, pentium 4 specification</div><div class='ctx'> 		 * update, though their suggested work-around does not</div><div class='ctx'> 		 * appear to solve the problem.</div><div class='ctx'> 		 */</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 		real = VIRT_CTR(stag, i);</div><div class='ctx'> </div><div class='ctx'> 		CCCR_READ(low, high, real);</div><div class='del'>- 		CTR_READ(ctr, high, real);</div><div class='add'>+		CTR_READ(ctr, high, real);</div><div class='ctx'> 		if (CCCR_OVF_P(low) || CTR_OVERFLOW_P(ctr)) {</div><div class='ctx'> 			oprofile_add_sample(regs, i);</div><div class='del'>- 			CTR_WRITE(reset_value[i], real);</div><div class='add'>+			CTR_WRITE(reset_value[i], real);</div><div class='ctx'> 			CCCR_CLEAR_OVF(low);</div><div class='ctx'> 			CCCR_WRITE(low, high, real);</div><div class='del'>- 			CTR_WRITE(reset_value[i], real);</div><div class='add'>+			CTR_WRITE(reset_value[i], real);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -683,15 +681,16 @@ static void p4_shutdown(struct op_msrs const * const msrs)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0 ; i &lt; num_counters ; ++i) {</div><div class='del'>-		if (CTR_IS_RESERVED(msrs,i))</div><div class='add'>+		if (CTR_IS_RESERVED(msrs, i))</div><div class='ctx'> 			release_perfctr_nmi(msrs-&gt;counters[i].addr);</div><div class='ctx'> 	}</div><div class='del'>-	/* some of the control registers are specially reserved in</div><div class='add'>+	/*</div><div class='add'>+	 * some of the control registers are specially reserved in</div><div class='ctx'> 	 * conjunction with the counter registers (hence the starting offset).</div><div class='ctx'> 	 * This saves a few bits.</div><div class='ctx'> 	 */</div><div class='ctx'> 	for (i = num_counters ; i &lt; num_controls ; ++i) {</div><div class='del'>-		if (CTRL_IS_RESERVED(msrs,i))</div><div class='add'>+		if (CTRL_IS_RESERVED(msrs, i))</div><div class='ctx'> 			release_evntsel_nmi(msrs-&gt;controls[i].addr);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/x86/oprofile/op_x86_model.h b/arch/x86/oprofile/op_x86_model.h<br/>index 45b605fa71d0..05a0261ba0c3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/oprofile/op_x86_model.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/oprofile/op_x86_model.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/oprofile/op_x86_model.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/oprofile/op_x86_model.h</a></div><div class='hunk'>@@ -32,6 +32,8 @@ struct pt_regs;</div><div class='ctx'>  * various x86 CPU models' perfctr support.</div><div class='ctx'>  */</div><div class='ctx'> struct op_x86_model_spec {</div><div class='add'>+	int (*init)(struct oprofile_operations *ops);</div><div class='add'>+	void (*exit)(void);</div><div class='ctx'> 	unsigned int const num_counters;</div><div class='ctx'> 	unsigned int const num_controls;</div><div class='ctx'> 	void (*fill_in_addresses)(struct op_msrs * const msrs);</div><div class='hunk'>@@ -46,6 +48,6 @@ struct op_x86_model_spec {</div><div class='ctx'> extern struct op_x86_model_spec const op_ppro_spec;</div><div class='ctx'> extern struct op_x86_model_spec const op_p4_spec;</div><div class='ctx'> extern struct op_x86_model_spec const op_p4_ht2_spec;</div><div class='del'>-extern struct op_x86_model_spec const op_athlon_spec;</div><div class='add'>+extern struct op_x86_model_spec const op_amd_spec;</div><div class='ctx'> </div><div class='ctx'> #endif /* OP_X86_MODEL_H */</div><div class='head'>diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c<br/>index 19af06927fbc..1d88d2b39771 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/pci/acpi.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/pci/acpi.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/pci/acpi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/pci/acpi.c</a></div><div class='hunk'>@@ -250,10 +250,5 @@ int __init pci_acpi_init(void)</div><div class='ctx'> 			acpi_pci_irq_enable(dev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_X86_IO_APIC</div><div class='del'>-	if (acpi_ioapic)</div><div class='del'>-		print_IO_APIC();</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/x86/pci/amd_bus.c b/arch/x86/pci/amd_bus.c<br/>index 6a0fca78c362..22e057665e55 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/pci/amd_bus.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/pci/amd_bus.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/pci/amd_bus.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/pci/amd_bus.c</a></div><div class='hunk'>@@ -580,7 +580,7 @@ static int __cpuinit amd_cpu_notify(struct notifier_block *self,</div><div class='ctx'> 				    unsigned long action, void *hcpu)</div><div class='ctx'> {</div><div class='ctx'> 	int cpu = (long)hcpu;</div><div class='del'>-	switch(action) {</div><div class='add'>+	switch (action) {</div><div class='ctx'> 	case CPU_ONLINE:</div><div class='ctx'> 	case CPU_ONLINE_FROZEN:</div><div class='ctx'> 		smp_call_function_single(cpu, enable_pci_io_ecs, NULL, 0);</div><div class='head'>diff --git a/arch/x86/pci/fixup.c b/arch/x86/pci/fixup.c<br/>index 4bdaa590375d..3c27a809393b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/pci/fixup.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/pci/fixup.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/pci/fixup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/pci/fixup.c</a></div><div class='hunk'>@@ -511,3 +511,31 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, 0x1201, fam10h_pci_cfg_space_size);</div><div class='ctx'> DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, 0x1202, fam10h_pci_cfg_space_size);</div><div class='ctx'> DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, 0x1203, fam10h_pci_cfg_space_size);</div><div class='ctx'> DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, 0x1204, fam10h_pci_cfg_space_size);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * SB600: Disable BAR1 on device 14.0 to avoid HPET resources from</div><div class='add'>+ * confusing the PCI engine:</div><div class='add'>+ */</div><div class='add'>+static void sb600_disable_hpet_bar(struct pci_dev *dev)</div><div class='add'>+{</div><div class='add'>+	u8 val;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The SB600 and SB700 both share the same device</div><div class='add'>+	 * ID, but the PM register 0x55 does something different</div><div class='add'>+	 * for the SB700, so make sure we are dealing with the</div><div class='add'>+	 * SB600 before touching the bit:</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	pci_read_config_byte(dev, 0x08, &amp;val);</div><div class='add'>+</div><div class='add'>+	if (val &lt; 0x2F) {</div><div class='add'>+		outb(0x55, 0xCD6);</div><div class='add'>+		val = inb(0xCD7);</div><div class='add'>+</div><div class='add'>+		/* Set bit 7 in PM register 0x55 */</div><div class='add'>+		outb(0x55, 0xCD6);</div><div class='add'>+		outb(val | 0x80, 0xCD7);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_ATI, 0x4385, sb600_disable_hpet_bar);</div><div class='head'>diff --git a/arch/x86/pci/i386.c b/arch/x86/pci/i386.c<br/>index 8791fc55e715..844df0cbbd3e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/pci/i386.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/pci/i386.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/pci/i386.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/pci/i386.c</a></div><div class='hunk'>@@ -33,6 +33,7 @@</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/pat.h&gt;</div><div class='add'>+#include &lt;asm/e820.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "pci.h"</div><div class='ctx'> </div><div class='hunk'>@@ -227,6 +228,8 @@ void __init pcibios_resource_survey(void)</div><div class='ctx'> 	pcibios_allocate_bus_resources(&amp;pci_root_buses);</div><div class='ctx'> 	pcibios_allocate_resources(0);</div><div class='ctx'> 	pcibios_allocate_resources(1);</div><div class='add'>+</div><div class='add'>+	e820_reserve_resources_late();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c<br/>index 8e077185e185..006599db0dc7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/pci/irq.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/pci/irq.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/pci/irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/pci/irq.c</a></div><div class='hunk'>@@ -1043,35 +1043,44 @@ static void __init pcibios_fixup_irqs(void)</div><div class='ctx'> 		if (io_apic_assign_pci_irqs) {</div><div class='ctx'> 			int irq;</div><div class='ctx'> </div><div class='del'>-			if (pin) {</div><div class='del'>-				/*</div><div class='del'>-				 * interrupt pins are numbered starting</div><div class='del'>-				 * from 1</div><div class='del'>-				 */</div><div class='del'>-				pin--;</div><div class='del'>-				irq = IO_APIC_get_PCI_irq_vector(dev-&gt;bus-&gt;number,</div><div class='del'>-					PCI_SLOT(dev-&gt;devfn), pin);</div><div class='del'>-	/*</div><div class='del'>-	 * Busses behind bridges are typically not listed in the MP-table.</div><div class='del'>-	 * In this case we have to look up the IRQ based on the parent bus,</div><div class='del'>-	 * parent slot, and pin number. The SMP code detects such bridged</div><div class='del'>-	 * busses itself so we should get into this branch reliably.</div><div class='del'>-	 */</div><div class='del'>-				if (irq &lt; 0 &amp;&amp; dev-&gt;bus-&gt;parent) { /* go back to the bridge */</div><div class='del'>-					struct pci_dev *bridge = dev-&gt;bus-&gt;self;</div><div class='del'>-</div><div class='del'>-					pin = (pin + PCI_SLOT(dev-&gt;devfn)) % 4;</div><div class='del'>-					irq = IO_APIC_get_PCI_irq_vector(bridge-&gt;bus-&gt;number,</div><div class='del'>-							PCI_SLOT(bridge-&gt;devfn), pin);</div><div class='del'>-					if (irq &gt;= 0)</div><div class='del'>-						dev_warn(&amp;dev-&gt;dev, "using bridge %s INT %c to get IRQ %d\n",</div><div class='del'>-							 pci_name(bridge),</div><div class='del'>-							 'A' + pin, irq);</div><div class='del'>-				}</div><div class='del'>-				if (irq &gt;= 0) {</div><div class='del'>-					dev_info(&amp;dev-&gt;dev, "PCI-&gt;APIC IRQ transform: INT %c -&gt; IRQ %d\n", 'A' + pin, irq);</div><div class='del'>-					dev-&gt;irq = irq;</div><div class='del'>-				}</div><div class='add'>+			if (!pin)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * interrupt pins are numbered starting from 1</div><div class='add'>+			 */</div><div class='add'>+			pin--;</div><div class='add'>+			irq = IO_APIC_get_PCI_irq_vector(dev-&gt;bus-&gt;number,</div><div class='add'>+				PCI_SLOT(dev-&gt;devfn), pin);</div><div class='add'>+			/*</div><div class='add'>+			 * Busses behind bridges are typically not listed in the</div><div class='add'>+			 * MP-table.  In this case we have to look up the IRQ</div><div class='add'>+			 * based on the parent bus, parent slot, and pin number.</div><div class='add'>+			 * The SMP code detects such bridged busses itself so we</div><div class='add'>+			 * should get into this branch reliably.</div><div class='add'>+			 */</div><div class='add'>+			if (irq &lt; 0 &amp;&amp; dev-&gt;bus-&gt;parent) {</div><div class='add'>+				/* go back to the bridge */</div><div class='add'>+				struct pci_dev *bridge = dev-&gt;bus-&gt;self;</div><div class='add'>+				int bus;</div><div class='add'>+</div><div class='add'>+				pin = (pin + PCI_SLOT(dev-&gt;devfn)) % 4;</div><div class='add'>+				bus = bridge-&gt;bus-&gt;number;</div><div class='add'>+				irq = IO_APIC_get_PCI_irq_vector(bus,</div><div class='add'>+						PCI_SLOT(bridge-&gt;devfn), pin);</div><div class='add'>+				if (irq &gt;= 0)</div><div class='add'>+					dev_warn(&amp;dev-&gt;dev,</div><div class='add'>+						"using bridge %s INT %c to "</div><div class='add'>+							"get IRQ %d\n",</div><div class='add'>+						 pci_name(bridge),</div><div class='add'>+						 'A' + pin, irq);</div><div class='add'>+			}</div><div class='add'>+			if (irq &gt;= 0) {</div><div class='add'>+				dev_info(&amp;dev-&gt;dev,</div><div class='add'>+					"PCI-&gt;APIC IRQ transform: INT %c "</div><div class='add'>+						"-&gt; IRQ %d\n",</div><div class='add'>+					'A' + pin, irq);</div><div class='add'>+				dev-&gt;irq = irq;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/x86/pci/mmconfig-shared.c b/arch/x86/pci/mmconfig-shared.c<br/>index d9635764ce3d..654a2234f8f3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/pci/mmconfig-shared.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/pci/mmconfig-shared.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/pci/mmconfig-shared.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/pci/mmconfig-shared.c</a></div><div class='hunk'>@@ -209,7 +209,7 @@ static int __init pci_mmcfg_check_hostbridge(void)</div><div class='ctx'> 	return name != NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __init pci_mmcfg_insert_resources(unsigned long resource_flags)</div><div class='add'>+static void __init pci_mmcfg_insert_resources(void)</div><div class='ctx'> {</div><div class='ctx'> #define PCI_MMCFG_RESOURCE_NAME_LEN 19</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -233,7 +233,7 @@ static void __init pci_mmcfg_insert_resources(unsigned long resource_flags)</div><div class='ctx'> 			 cfg-&gt;pci_segment);</div><div class='ctx'> 		res-&gt;start = cfg-&gt;address;</div><div class='ctx'> 		res-&gt;end = res-&gt;start + (num_buses &lt;&lt; 20) - 1;</div><div class='del'>-		res-&gt;flags = IORESOURCE_MEM | resource_flags;</div><div class='add'>+		res-&gt;flags = IORESOURCE_MEM | IORESOURCE_BUSY;</div><div class='ctx'> 		insert_resource(&amp;iomem_resource, res);</div><div class='ctx'> 		names += PCI_MMCFG_RESOURCE_NAME_LEN;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -434,11 +434,9 @@ static void __init __pci_mmcfg_init(int early)</div><div class='ctx'> 	    (pci_mmcfg_config[0].address == 0))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (pci_mmcfg_arch_init()) {</div><div class='del'>-		if (known_bridge)</div><div class='del'>-			pci_mmcfg_insert_resources(IORESOURCE_BUSY);</div><div class='add'>+	if (pci_mmcfg_arch_init())</div><div class='ctx'> 		pci_probe = (pci_probe &amp; ~PCI_PROBE_MASK) | PCI_PROBE_MMCONF;</div><div class='del'>-	} else {</div><div class='add'>+	else {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Signal not to attempt to insert mmcfg resources because</div><div class='ctx'> 		 * the architecture mmcfg setup could not initialize.</div><div class='hunk'>@@ -475,7 +473,7 @@ static int __init pci_mmcfg_late_insert_resources(void)</div><div class='ctx'> 	 * marked so it won't cause request errors when __request_region is</div><div class='ctx'> 	 * called.</div><div class='ctx'> 	 */</div><div class='del'>-	pci_mmcfg_insert_resources(0);</div><div class='add'>+	pci_mmcfg_insert_resources();</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/x86/power/cpu_32.c b/arch/x86/power/cpu_32.c<br/>index d3e083dea720..274d06082f48 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/power/cpu_32.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/power/cpu_32.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/power/cpu_32.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/power/cpu_32.c</a></div><div class='hunk'>@@ -11,6 +11,7 @@</div><div class='ctx'> #include &lt;linux/suspend.h&gt;</div><div class='ctx'> #include &lt;asm/mtrr.h&gt;</div><div class='ctx'> #include &lt;asm/mce.h&gt;</div><div class='add'>+#include &lt;asm/xcr.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct saved_context saved_context;</div><div class='ctx'> </div><div class='hunk'>@@ -126,6 +127,12 @@ static void __restore_processor_state(struct saved_context *ctxt)</div><div class='ctx'> 	if (boot_cpu_has(X86_FEATURE_SEP))</div><div class='ctx'> 		enable_sep_cpu();</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * restore XCR0 for xsave capable cpu's.</div><div class='add'>+	 */</div><div class='add'>+	if (cpu_has_xsave)</div><div class='add'>+		xsetbv(XCR_XFEATURE_ENABLED_MASK, pcntxt_mask);</div><div class='add'>+</div><div class='ctx'> 	fix_processor_context();</div><div class='ctx'> 	do_fpu_end();</div><div class='ctx'> 	mtrr_ap_init();</div><div class='head'>diff --git a/arch/x86/power/cpu_64.c b/arch/x86/power/cpu_64.c<br/>index 66bdfb591fd8..e3b6cf70d62c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/power/cpu_64.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/power/cpu_64.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/power/cpu_64.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/power/cpu_64.c</a></div><div class='hunk'>@@ -14,6 +14,7 @@</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/mtrr.h&gt;</div><div class='add'>+#include &lt;asm/xcr.h&gt;</div><div class='ctx'> </div><div class='ctx'> static void fix_processor_context(void);</div><div class='ctx'> </div><div class='hunk'>@@ -122,6 +123,12 @@ static void __restore_processor_state(struct saved_context *ctxt)</div><div class='ctx'> 	wrmsrl(MSR_GS_BASE, ctxt-&gt;gs_base);</div><div class='ctx'> 	wrmsrl(MSR_KERNEL_GS_BASE, ctxt-&gt;gs_kernel_base);</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * restore XCR0 for xsave capable cpu's.</div><div class='add'>+	 */</div><div class='add'>+	if (cpu_has_xsave)</div><div class='add'>+		xsetbv(XCR_XFEATURE_ENABLED_MASK, pcntxt_mask);</div><div class='add'>+</div><div class='ctx'> 	fix_processor_context();</div><div class='ctx'> </div><div class='ctx'> 	do_fpu_end();</div><div class='head'>diff --git a/arch/x86/power/hibernate_asm_32.S b/arch/x86/power/hibernate_asm_32.S<br/>index 4fc7e872c85e..d1e9b53f9d33 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/power/hibernate_asm_32.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/power/hibernate_asm_32.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/power/hibernate_asm_32.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/power/hibernate_asm_32.S</a></div><div class='hunk'>@@ -1,5 +1,3 @@</div><div class='del'>-.text</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * This may not use any stack, nor any variable that is not "NoSave":</div><div class='ctx'>  *</div><div class='hunk'>@@ -12,17 +10,18 @@</div><div class='ctx'> #include &lt;asm/segment.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/asm-offsets.h&gt;</div><div class='add'>+#include &lt;asm/processor-flags.h&gt;</div><div class='ctx'> </div><div class='del'>-	.text</div><div class='add'>+.text</div><div class='ctx'> </div><div class='ctx'> ENTRY(swsusp_arch_suspend)</div><div class='del'>-</div><div class='ctx'> 	movl %esp, saved_context_esp</div><div class='ctx'> 	movl %ebx, saved_context_ebx</div><div class='ctx'> 	movl %ebp, saved_context_ebp</div><div class='ctx'> 	movl %esi, saved_context_esi</div><div class='ctx'> 	movl %edi, saved_context_edi</div><div class='del'>-	pushfl ; popl saved_context_eflags</div><div class='add'>+	pushfl</div><div class='add'>+	popl saved_context_eflags</div><div class='ctx'> </div><div class='ctx'> 	call swsusp_save</div><div class='ctx'> 	ret</div><div class='hunk'>@@ -59,7 +58,7 @@ done:</div><div class='ctx'> 	movl	mmu_cr4_features, %ecx</div><div class='ctx'> 	jecxz	1f	# cr4 Pentium and higher, skip if zero</div><div class='ctx'> 	movl	%ecx, %edx</div><div class='del'>-	andl	$~(1&lt;&lt;7), %edx;  # PGE</div><div class='add'>+	andl	$~(X86_CR4_PGE), %edx</div><div class='ctx'> 	movl	%edx, %cr4;  # turn off PGE</div><div class='ctx'> 1:</div><div class='ctx'> 	movl	%cr3, %eax;  # flush TLB</div><div class='hunk'>@@ -74,7 +73,8 @@ done:</div><div class='ctx'> 	movl saved_context_esi, %esi</div><div class='ctx'> 	movl saved_context_edi, %edi</div><div class='ctx'> </div><div class='del'>-	pushl saved_context_eflags ; popfl</div><div class='add'>+	pushl saved_context_eflags</div><div class='add'>+	popfl</div><div class='ctx'> </div><div class='ctx'> 	xorl	%eax, %eax</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig<br/>index 3815e425f470..87b9ab166423 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/xen/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/xen/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/xen/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/xen/Kconfig</a></div><div class='hunk'>@@ -26,5 +26,13 @@ config XEN_MAX_DOMAIN_MEMORY</div><div class='ctx'> </div><div class='ctx'> config XEN_SAVE_RESTORE</div><div class='ctx'>        bool</div><div class='del'>-       depends on PM</div><div class='del'>-       default y
\ No newline at end of file</div><div class='add'>+       depends on XEN &amp;&amp; PM</div><div class='add'>+       default y</div><div class='add'>+</div><div class='add'>+config XEN_DEBUG_FS</div><div class='add'>+	bool "Enable Xen debug and tuning parameters in debugfs"</div><div class='add'>+	depends on XEN &amp;&amp; DEBUG_FS</div><div class='add'>+	default n</div><div class='add'>+	help</div><div class='add'>+	  Enable statistics output and various tuning options in debugfs.</div><div class='add'>+	  Enabling this option may incur a significant performance overhead.</div><div class='head'>diff --git a/arch/x86/xen/Makefile b/arch/x86/xen/Makefile<br/>index 59c1e539aed2..313947940a1a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/xen/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/xen/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/xen/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/xen/Makefile</a></div><div class='hunk'>@@ -1,4 +1,12 @@</div><div class='del'>-obj-y		:= enlighten.o setup.o multicalls.o mmu.o \</div><div class='add'>+ifdef CONFIG_FTRACE</div><div class='add'>+# Do not profile debug and lowlevel utilities</div><div class='add'>+CFLAGS_REMOVE_spinlock.o = -pg</div><div class='add'>+CFLAGS_REMOVE_time.o = -pg</div><div class='add'>+CFLAGS_REMOVE_irq.o = -pg</div><div class='add'>+endif</div><div class='add'>+</div><div class='add'>+obj-y		:= enlighten.o setup.o multicalls.o mmu.o irq.o \</div><div class='ctx'> 			time.o xen-asm_$(BITS).o grant-table.o suspend.o</div><div class='ctx'> </div><div class='del'>-obj-$(CONFIG_SMP)	+= smp.o</div><div class='add'>+obj-$(CONFIG_SMP)		+= smp.o spinlock.o</div><div class='add'>+obj-$(CONFIG_XEN_DEBUG_FS)	+= debugfs.o
\ No newline at end of file</div><div class='head'>diff --git a/arch/x86/xen/debugfs.c b/arch/x86/xen/debugfs.c<br/>new file mode 100644<br/>index 000000000000..b53225d2cac3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/xen/debugfs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/xen/debugfs.c</a></div><div class='hunk'>@@ -0,0 +1,123 @@</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/debugfs.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+</div><div class='add'>+#include "debugfs.h"</div><div class='add'>+</div><div class='add'>+static struct dentry *d_xen_debug;</div><div class='add'>+</div><div class='add'>+struct dentry * __init xen_init_debugfs(void)</div><div class='add'>+{</div><div class='add'>+	if (!d_xen_debug) {</div><div class='add'>+		d_xen_debug = debugfs_create_dir("xen", NULL);</div><div class='add'>+</div><div class='add'>+		if (!d_xen_debug)</div><div class='add'>+			pr_warning("Could not create 'xen' debugfs directory\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return d_xen_debug;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct array_data</div><div class='add'>+{</div><div class='add'>+	void *array;</div><div class='add'>+	unsigned elements;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int u32_array_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	file-&gt;private_data = NULL;</div><div class='add'>+	return nonseekable_open(inode, file);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static size_t format_array(char *buf, size_t bufsize, const char *fmt,</div><div class='add'>+			   u32 *array, unsigned array_size)</div><div class='add'>+{</div><div class='add'>+	size_t ret = 0;</div><div class='add'>+	unsigned i;</div><div class='add'>+</div><div class='add'>+	for(i = 0; i &lt; array_size; i++) {</div><div class='add'>+		size_t len;</div><div class='add'>+</div><div class='add'>+		len = snprintf(buf, bufsize, fmt, array[i]);</div><div class='add'>+		len++;	/* ' ' or '\n' */</div><div class='add'>+		ret += len;</div><div class='add'>+</div><div class='add'>+		if (buf) {</div><div class='add'>+			buf += len;</div><div class='add'>+			bufsize -= len;</div><div class='add'>+			buf[-1] = (i == array_size-1) ? '\n' : ' ';</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret++;		/* \0 */</div><div class='add'>+	if (buf)</div><div class='add'>+		*buf = '\0';</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static char *format_array_alloc(const char *fmt, u32 *array, unsigned array_size)</div><div class='add'>+{</div><div class='add'>+	size_t len = format_array(NULL, 0, fmt, array, array_size);</div><div class='add'>+	char *ret;</div><div class='add'>+</div><div class='add'>+	ret = kmalloc(len, GFP_KERNEL);</div><div class='add'>+	if (ret == NULL)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	format_array(ret, len, fmt, array, array_size);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t u32_array_read(struct file *file, char __user *buf, size_t len,</div><div class='add'>+			      loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct inode *inode = file-&gt;f_path.dentry-&gt;d_inode;</div><div class='add'>+	struct array_data *data = inode-&gt;i_private;</div><div class='add'>+	size_t size;</div><div class='add'>+</div><div class='add'>+	if (*ppos == 0) {</div><div class='add'>+		if (file-&gt;private_data) {</div><div class='add'>+			kfree(file-&gt;private_data);</div><div class='add'>+			file-&gt;private_data = NULL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		file-&gt;private_data = format_array_alloc("%u", data-&gt;array, data-&gt;elements);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	size = 0;</div><div class='add'>+	if (file-&gt;private_data)</div><div class='add'>+		size = strlen(file-&gt;private_data);</div><div class='add'>+</div><div class='add'>+	return simple_read_from_buffer(buf, len, ppos, file-&gt;private_data, size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int xen_array_release(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	kfree(file-&gt;private_data);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct file_operations u32_array_fops = {</div><div class='add'>+	.owner	= THIS_MODULE,</div><div class='add'>+	.open	= u32_array_open,</div><div class='add'>+	.release= xen_array_release,</div><div class='add'>+	.read	= u32_array_read,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dentry *xen_debugfs_create_u32_array(const char *name, mode_t mode,</div><div class='add'>+					    struct dentry *parent,</div><div class='add'>+					    u32 *array, unsigned elements)</div><div class='add'>+{</div><div class='add'>+	struct array_data *data = kmalloc(sizeof(*data), GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (data == NULL)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	data-&gt;array = array;</div><div class='add'>+	data-&gt;elements = elements;</div><div class='add'>+</div><div class='add'>+	return debugfs_create_file(name, mode, parent, data, &amp;u32_array_fops);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/x86/xen/debugfs.h b/arch/x86/xen/debugfs.h<br/>new file mode 100644<br/>index 000000000000..e28132084832<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/xen/debugfs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/xen/debugfs.h</a></div><div class='hunk'>@@ -0,0 +1,10 @@</div><div class='add'>+#ifndef _XEN_DEBUGFS_H</div><div class='add'>+#define _XEN_DEBUGFS_H</div><div class='add'>+</div><div class='add'>+struct dentry * __init xen_init_debugfs(void);</div><div class='add'>+</div><div class='add'>+struct dentry *xen_debugfs_create_u32_array(const char *name, mode_t mode,</div><div class='add'>+					    struct dentry *parent,</div><div class='add'>+					    u32 *array, unsigned elements);</div><div class='add'>+</div><div class='add'>+#endif /* _XEN_DEBUGFS_H */</div><div class='head'>diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c<br/>index a4e201b47f64..0013a729b41d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/xen/enlighten.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/xen/enlighten.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/xen/enlighten.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/xen/enlighten.c</a></div><div class='hunk'>@@ -30,12 +30,12 @@</div><div class='ctx'> #include &lt;xen/interface/xen.h&gt;</div><div class='ctx'> #include &lt;xen/interface/physdev.h&gt;</div><div class='ctx'> #include &lt;xen/interface/vcpu.h&gt;</div><div class='del'>-#include &lt;xen/interface/sched.h&gt;</div><div class='ctx'> #include &lt;xen/features.h&gt;</div><div class='ctx'> #include &lt;xen/page.h&gt;</div><div class='ctx'> #include &lt;xen/hvc-console.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/paravirt.h&gt;</div><div class='add'>+#include &lt;asm/apic.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/xen/hypercall.h&gt;</div><div class='ctx'> #include &lt;asm/xen/hypervisor.h&gt;</div><div class='hunk'>@@ -57,6 +57,9 @@ EXPORT_SYMBOL_GPL(hypercall_page);</div><div class='ctx'> DEFINE_PER_CPU(struct vcpu_info *, xen_vcpu);</div><div class='ctx'> DEFINE_PER_CPU(struct vcpu_info, xen_vcpu_info);</div><div class='ctx'> </div><div class='add'>+enum xen_domain_type xen_domain_type = XEN_NATIVE;</div><div class='add'>+EXPORT_SYMBOL_GPL(xen_domain_type);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Identity map, in addition to plain kernel map.  This needs to be</div><div class='ctx'>  * large enough to allocate page table pages to allocate the rest.</div><div class='hunk'>@@ -110,7 +113,14 @@ struct shared_info *HYPERVISOR_shared_info = (void *)&amp;xen_dummy_shared_info;</div><div class='ctx'>  *</div><div class='ctx'>  * 0: not available, 1: available</div><div class='ctx'>  */</div><div class='del'>-static int have_vcpu_info_placement = 1;</div><div class='add'>+static int have_vcpu_info_placement =</div><div class='add'>+#ifdef CONFIG_X86_32</div><div class='add'>+	1</div><div class='add'>+#else</div><div class='add'>+	0</div><div class='add'>+#endif</div><div class='add'>+	;</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> static void xen_vcpu_setup(int cpu)</div><div class='ctx'> {</div><div class='hunk'>@@ -226,103 +236,68 @@ static unsigned long xen_get_debugreg(int reg)</div><div class='ctx'> 	return HYPERVISOR_get_debugreg(reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned long xen_save_fl(void)</div><div class='add'>+static void xen_leave_lazy(void)</div><div class='ctx'> {</div><div class='del'>-	struct vcpu_info *vcpu;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	vcpu = x86_read_percpu(xen_vcpu);</div><div class='del'>-</div><div class='del'>-	/* flag has opposite sense of mask */</div><div class='del'>-	flags = !vcpu-&gt;evtchn_upcall_mask;</div><div class='del'>-</div><div class='del'>-	/* convert to IF type flag</div><div class='del'>-	   -0 -&gt; 0x00000000</div><div class='del'>-	   -1 -&gt; 0xffffffff</div><div class='del'>-	*/</div><div class='del'>-	return (-flags) &amp; X86_EFLAGS_IF;</div><div class='add'>+	paravirt_leave_lazy(paravirt_get_lazy_mode());</div><div class='add'>+	xen_mc_flush();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void xen_restore_fl(unsigned long flags)</div><div class='add'>+static unsigned long xen_store_tr(void)</div><div class='ctx'> {</div><div class='del'>-	struct vcpu_info *vcpu;</div><div class='del'>-</div><div class='del'>-	/* convert from IF type flag */</div><div class='del'>-	flags = !(flags &amp; X86_EFLAGS_IF);</div><div class='del'>-</div><div class='del'>-	/* There's a one instruction preempt window here.  We need to</div><div class='del'>-	   make sure we're don't switch CPUs between getting the vcpu</div><div class='del'>-	   pointer and updating the mask. */</div><div class='del'>-	preempt_disable();</div><div class='del'>-	vcpu = x86_read_percpu(xen_vcpu);</div><div class='del'>-	vcpu-&gt;evtchn_upcall_mask = flags;</div><div class='del'>-	preempt_enable_no_resched();</div><div class='del'>-</div><div class='del'>-	/* Doesn't matter if we get preempted here, because any</div><div class='del'>-	   pending event will get dealt with anyway. */</div><div class='del'>-</div><div class='del'>-	if (flags == 0) {</div><div class='del'>-		preempt_check_resched();</div><div class='del'>-		barrier(); /* unmask then check (avoid races) */</div><div class='del'>-		if (unlikely(vcpu-&gt;evtchn_upcall_pending))</div><div class='del'>-			force_evtchn_callback();</div><div class='del'>-	}</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void xen_irq_disable(void)</div><div class='add'>+/*</div><div class='add'>+ * Set the page permissions for a particular virtual address.  If the</div><div class='add'>+ * address is a vmalloc mapping (or other non-linear mapping), then</div><div class='add'>+ * find the linear mapping of the page and also set its protections to</div><div class='add'>+ * match.</div><div class='add'>+ */</div><div class='add'>+static void set_aliased_prot(void *v, pgprot_t prot)</div><div class='ctx'> {</div><div class='del'>-	/* There's a one instruction preempt window here.  We need to</div><div class='del'>-	   make sure we're don't switch CPUs between getting the vcpu</div><div class='del'>-	   pointer and updating the mask. */</div><div class='del'>-	preempt_disable();</div><div class='del'>-	x86_read_percpu(xen_vcpu)-&gt;evtchn_upcall_mask = 1;</div><div class='del'>-	preempt_enable_no_resched();</div><div class='del'>-}</div><div class='add'>+	int level;</div><div class='add'>+	pte_t *ptep;</div><div class='add'>+	pte_t pte;</div><div class='add'>+	unsigned long pfn;</div><div class='add'>+	struct page *page;</div><div class='ctx'> </div><div class='del'>-static void xen_irq_enable(void)</div><div class='del'>-{</div><div class='del'>-	struct vcpu_info *vcpu;</div><div class='add'>+	ptep = lookup_address((unsigned long)v, &amp;level);</div><div class='add'>+	BUG_ON(ptep == NULL);</div><div class='ctx'> </div><div class='del'>-	/* We don't need to worry about being preempted here, since</div><div class='del'>-	   either a) interrupts are disabled, so no preemption, or b)</div><div class='del'>-	   the caller is confused and is trying to re-enable interrupts</div><div class='del'>-	   on an indeterminate processor. */</div><div class='add'>+	pfn = pte_pfn(*ptep);</div><div class='add'>+	page = pfn_to_page(pfn);</div><div class='ctx'> </div><div class='del'>-	vcpu = x86_read_percpu(xen_vcpu);</div><div class='del'>-	vcpu-&gt;evtchn_upcall_mask = 0;</div><div class='add'>+	pte = pfn_pte(pfn, prot);</div><div class='ctx'> </div><div class='del'>-	/* Doesn't matter if we get preempted here, because any</div><div class='del'>-	   pending event will get dealt with anyway. */</div><div class='add'>+	if (HYPERVISOR_update_va_mapping((unsigned long)v, pte, 0))</div><div class='add'>+		BUG();</div><div class='ctx'> </div><div class='del'>-	barrier(); /* unmask then check (avoid races) */</div><div class='del'>-	if (unlikely(vcpu-&gt;evtchn_upcall_pending))</div><div class='del'>-		force_evtchn_callback();</div><div class='del'>-}</div><div class='add'>+	if (!PageHighMem(page)) {</div><div class='add'>+		void *av = __va(PFN_PHYS(pfn));</div><div class='ctx'> </div><div class='del'>-static void xen_safe_halt(void)</div><div class='del'>-{</div><div class='del'>-	/* Blocking includes an implicit local_irq_enable(). */</div><div class='del'>-	if (HYPERVISOR_sched_op(SCHEDOP_block, NULL) != 0)</div><div class='del'>-		BUG();</div><div class='add'>+		if (av != v)</div><div class='add'>+			if (HYPERVISOR_update_va_mapping((unsigned long)av, pte, 0))</div><div class='add'>+				BUG();</div><div class='add'>+	} else</div><div class='add'>+		kmap_flush_unused();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void xen_halt(void)</div><div class='add'>+static void xen_alloc_ldt(struct desc_struct *ldt, unsigned entries)</div><div class='ctx'> {</div><div class='del'>-	if (irqs_disabled())</div><div class='del'>-		HYPERVISOR_vcpu_op(VCPUOP_down, smp_processor_id(), NULL);</div><div class='del'>-	else</div><div class='del'>-		xen_safe_halt();</div><div class='del'>-}</div><div class='add'>+	const unsigned entries_per_page = PAGE_SIZE / LDT_ENTRY_SIZE;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-static void xen_leave_lazy(void)</div><div class='del'>-{</div><div class='del'>-	paravirt_leave_lazy(paravirt_get_lazy_mode());</div><div class='del'>-	xen_mc_flush();</div><div class='add'>+	for(i = 0; i &lt; entries; i += entries_per_page)</div><div class='add'>+		set_aliased_prot(ldt + i, PAGE_KERNEL_RO);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned long xen_store_tr(void)</div><div class='add'>+static void xen_free_ldt(struct desc_struct *ldt, unsigned entries)</div><div class='ctx'> {</div><div class='del'>-	return 0;</div><div class='add'>+	const unsigned entries_per_page = PAGE_SIZE / LDT_ENTRY_SIZE;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for(i = 0; i &lt; entries; i += entries_per_page)</div><div class='add'>+		set_aliased_prot(ldt + i, PAGE_KERNEL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void xen_set_ldt(const void *addr, unsigned entries)</div><div class='hunk'>@@ -425,8 +400,7 @@ static void xen_load_gs_index(unsigned int idx)</div><div class='ctx'> static void xen_write_ldt_entry(struct desc_struct *dt, int entrynum,</div><div class='ctx'> 				const void *ptr)</div><div class='ctx'> {</div><div class='del'>-	unsigned long lp = (unsigned long)&amp;dt[entrynum];</div><div class='del'>-	xmaddr_t mach_lp = virt_to_machine(lp);</div><div class='add'>+	xmaddr_t mach_lp = arbitrary_virt_to_machine(&amp;dt[entrynum]);</div><div class='ctx'> 	u64 entry = *(u64 *)ptr;</div><div class='ctx'> </div><div class='ctx'> 	preempt_disable();</div><div class='hunk'>@@ -559,7 +533,7 @@ static void xen_write_gdt_entry(struct desc_struct *dt, int entry,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void xen_load_sp0(struct tss_struct *tss,</div><div class='del'>-			  struct thread_struct *thread)</div><div class='add'>+			 struct thread_struct *thread)</div><div class='ctx'> {</div><div class='ctx'> 	struct multicall_space mcs = xen_mc_entry(0);</div><div class='ctx'> 	MULTI_stack_switch(mcs.mc, __KERNEL_DS, thread-&gt;sp0);</div><div class='hunk'>@@ -580,16 +554,47 @@ static void xen_io_delay(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_X86_LOCAL_APIC</div><div class='del'>-static u32 xen_apic_read(unsigned long reg)</div><div class='add'>+static u32 xen_apic_read(u32 reg)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void xen_apic_write(unsigned long reg, u32 val)</div><div class='add'>+static void xen_apic_write(u32 reg, u32 val)</div><div class='ctx'> {</div><div class='ctx'> 	/* Warn to see if there's any stray references */</div><div class='ctx'> 	WARN_ON(1);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static u64 xen_apic_icr_read(void)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void xen_apic_icr_write(u32 low, u32 id)</div><div class='add'>+{</div><div class='add'>+	/* Warn to see if there's any stray references */</div><div class='add'>+	WARN_ON(1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void xen_apic_wait_icr_idle(void)</div><div class='add'>+{</div><div class='add'>+        return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 xen_safe_apic_wait_icr_idle(void)</div><div class='add'>+{</div><div class='add'>+        return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct apic_ops xen_basic_apic_ops = {</div><div class='add'>+	.read = xen_apic_read,</div><div class='add'>+	.write = xen_apic_write,</div><div class='add'>+	.icr_read = xen_apic_icr_read,</div><div class='add'>+	.icr_write = xen_apic_icr_write,</div><div class='add'>+	.wait_icr_idle = xen_apic_wait_icr_idle,</div><div class='add'>+	.safe_wait_icr_idle = xen_safe_apic_wait_icr_idle,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static void xen_flush_tlb(void)</div><div class='hunk'>@@ -803,6 +808,19 @@ static int xen_write_msr_safe(unsigned int msr, unsigned low, unsigned high)</div><div class='ctx'> 			ret = -EFAULT;</div><div class='ctx'> 		break;</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='add'>+	case MSR_STAR:</div><div class='add'>+	case MSR_CSTAR:</div><div class='add'>+	case MSR_LSTAR:</div><div class='add'>+	case MSR_SYSCALL_MASK:</div><div class='add'>+	case MSR_IA32_SYSENTER_CS:</div><div class='add'>+	case MSR_IA32_SYSENTER_ESP:</div><div class='add'>+	case MSR_IA32_SYSENTER_EIP:</div><div class='add'>+		/* Fast syscall setup is all done in hypercalls, so</div><div class='add'>+		   these are all ignored.  Stub them out here to stop</div><div class='add'>+		   Xen console noise. */</div><div class='add'>+		break;</div><div class='add'>+</div><div class='ctx'> 	default:</div><div class='ctx'> 		ret = native_write_msr_safe(msr, low, high);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -812,7 +830,7 @@ static int xen_write_msr_safe(unsigned int msr, unsigned low, unsigned high)</div><div class='ctx'> </div><div class='ctx'> /* Early in boot, while setting up the initial pagetable, assume</div><div class='ctx'>    everything is pinned. */</div><div class='del'>-static __init void xen_alloc_pte_init(struct mm_struct *mm, u32 pfn)</div><div class='add'>+static __init void xen_alloc_pte_init(struct mm_struct *mm, unsigned long pfn)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_FLATMEM</div><div class='ctx'> 	BUG_ON(mem_map);	/* should only be used early */</div><div class='hunk'>@@ -822,7 +840,7 @@ static __init void xen_alloc_pte_init(struct mm_struct *mm, u32 pfn)</div><div class='ctx'> </div><div class='ctx'> /* Early release_pte assumes that all pts are pinned, since there's</div><div class='ctx'>    only init_mm and anything attached to that is pinned. */</div><div class='del'>-static void xen_release_pte_init(u32 pfn)</div><div class='add'>+static void xen_release_pte_init(unsigned long pfn)</div><div class='ctx'> {</div><div class='ctx'> 	make_lowmem_page_readwrite(__va(PFN_PHYS(pfn)));</div><div class='ctx'> }</div><div class='hunk'>@@ -838,7 +856,7 @@ static void pin_pagetable_pfn(unsigned cmd, unsigned long pfn)</div><div class='ctx'> </div><div class='ctx'> /* This needs to make sure the new pte page is pinned iff its being</div><div class='ctx'>    attached to a pinned pagetable. */</div><div class='del'>-static void xen_alloc_ptpage(struct mm_struct *mm, u32 pfn, unsigned level)</div><div class='add'>+static void xen_alloc_ptpage(struct mm_struct *mm, unsigned long pfn, unsigned level)</div><div class='ctx'> {</div><div class='ctx'> 	struct page *page = pfn_to_page(pfn);</div><div class='ctx'> </div><div class='hunk'>@@ -846,8 +864,8 @@ static void xen_alloc_ptpage(struct mm_struct *mm, u32 pfn, unsigned level)</div><div class='ctx'> 		SetPagePinned(page);</div><div class='ctx'> </div><div class='ctx'> 		if (!PageHighMem(page)) {</div><div class='del'>-			make_lowmem_page_readonly(__va(PFN_PHYS(pfn)));</div><div class='del'>-			if (level == PT_PTE)</div><div class='add'>+			make_lowmem_page_readonly(__va(PFN_PHYS((unsigned long)pfn)));</div><div class='add'>+			if (level == PT_PTE &amp;&amp; USE_SPLIT_PTLOCKS)</div><div class='ctx'> 				pin_pagetable_pfn(MMUEXT_PIN_L1_TABLE, pfn);</div><div class='ctx'> 		} else</div><div class='ctx'> 			/* make sure there are no stray mappings of</div><div class='hunk'>@@ -856,12 +874,12 @@ static void xen_alloc_ptpage(struct mm_struct *mm, u32 pfn, unsigned level)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void xen_alloc_pte(struct mm_struct *mm, u32 pfn)</div><div class='add'>+static void xen_alloc_pte(struct mm_struct *mm, unsigned long pfn)</div><div class='ctx'> {</div><div class='ctx'> 	xen_alloc_ptpage(mm, pfn, PT_PTE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void xen_alloc_pmd(struct mm_struct *mm, u32 pfn)</div><div class='add'>+static void xen_alloc_pmd(struct mm_struct *mm, unsigned long pfn)</div><div class='ctx'> {</div><div class='ctx'> 	xen_alloc_ptpage(mm, pfn, PT_PMD);</div><div class='ctx'> }</div><div class='hunk'>@@ -909,13 +927,13 @@ static void xen_pgd_free(struct mm_struct *mm, pgd_t *pgd)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* This should never happen until we're OK to use struct page */</div><div class='del'>-static void xen_release_ptpage(u32 pfn, unsigned level)</div><div class='add'>+static void xen_release_ptpage(unsigned long pfn, unsigned level)</div><div class='ctx'> {</div><div class='ctx'> 	struct page *page = pfn_to_page(pfn);</div><div class='ctx'> </div><div class='ctx'> 	if (PagePinned(page)) {</div><div class='ctx'> 		if (!PageHighMem(page)) {</div><div class='del'>-			if (level == PT_PTE)</div><div class='add'>+			if (level == PT_PTE &amp;&amp; USE_SPLIT_PTLOCKS)</div><div class='ctx'> 				pin_pagetable_pfn(MMUEXT_UNPIN_TABLE, pfn);</div><div class='ctx'> 			make_lowmem_page_readwrite(__va(PFN_PHYS(pfn)));</div><div class='ctx'> 		}</div><div class='hunk'>@@ -923,23 +941,23 @@ static void xen_release_ptpage(u32 pfn, unsigned level)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void xen_release_pte(u32 pfn)</div><div class='add'>+static void xen_release_pte(unsigned long pfn)</div><div class='ctx'> {</div><div class='ctx'> 	xen_release_ptpage(pfn, PT_PTE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void xen_release_pmd(u32 pfn)</div><div class='add'>+static void xen_release_pmd(unsigned long pfn)</div><div class='ctx'> {</div><div class='ctx'> 	xen_release_ptpage(pfn, PT_PMD);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #if PAGETABLE_LEVELS == 4</div><div class='del'>-static void xen_alloc_pud(struct mm_struct *mm, u32 pfn)</div><div class='add'>+static void xen_alloc_pud(struct mm_struct *mm, unsigned long pfn)</div><div class='ctx'> {</div><div class='ctx'> 	xen_alloc_ptpage(mm, pfn, PT_PUD);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void xen_release_pud(u32 pfn)</div><div class='add'>+static void xen_release_pud(unsigned long pfn)</div><div class='ctx'> {</div><div class='ctx'> 	xen_release_ptpage(pfn, PT_PUD);</div><div class='ctx'> }</div><div class='hunk'>@@ -962,6 +980,7 @@ static void *xen_kmap_atomic_pte(struct page *page, enum km_type type)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_X86_32</div><div class='ctx'> static __init pte_t mask_rw_pte(pte_t *ptep, pte_t pte)</div><div class='ctx'> {</div><div class='ctx'> 	/* If there's an existing pte, then don't allow _PAGE_RW to be set */</div><div class='hunk'>@@ -980,6 +999,7 @@ static __init void xen_set_pte_init(pte_t *ptep, pte_t pte)</div><div class='ctx'> </div><div class='ctx'> 	xen_set_pte(ptep, pte);</div><div class='ctx'> }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> static __init void xen_pagetable_setup_start(pgd_t *base)</div><div class='ctx'> {</div><div class='hunk'>@@ -1046,7 +1066,6 @@ void xen_setup_vcpu_info_placement(void)</div><div class='ctx'> </div><div class='ctx'> 	/* xen_vcpu_setup managed to place the vcpu_info within the</div><div class='ctx'> 	   percpu area for all cpus, so make use of it */</div><div class='del'>-#ifdef CONFIG_X86_32</div><div class='ctx'> 	if (have_vcpu_info_placement) {</div><div class='ctx'> 		printk(KERN_INFO "Xen: using vcpu_info placement\n");</div><div class='ctx'> </div><div class='hunk'>@@ -1056,7 +1075,6 @@ void xen_setup_vcpu_info_placement(void)</div><div class='ctx'> 		pv_irq_ops.irq_enable = xen_irq_enable_direct;</div><div class='ctx'> 		pv_mmu_ops.read_cr2 = xen_read_cr2_direct;</div><div class='ctx'> 	}</div><div class='del'>-#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static unsigned xen_patch(u8 type, u16 clobbers, void *insnbuf,</div><div class='hunk'>@@ -1077,12 +1095,10 @@ static unsigned xen_patch(u8 type, u16 clobbers, void *insnbuf,</div><div class='ctx'> 	goto patch_site</div><div class='ctx'> </div><div class='ctx'> 	switch (type) {</div><div class='del'>-#ifdef CONFIG_X86_32</div><div class='ctx'> 		SITE(pv_irq_ops, irq_enable);</div><div class='ctx'> 		SITE(pv_irq_ops, irq_disable);</div><div class='ctx'> 		SITE(pv_irq_ops, save_fl);</div><div class='ctx'> 		SITE(pv_irq_ops, restore_fl);</div><div class='del'>-#endif /* CONFIG_X86_32 */</div><div class='ctx'> #undef SITE</div><div class='ctx'> </div><div class='ctx'> 	patch_site:</div><div class='hunk'>@@ -1220,6 +1236,9 @@ static const struct pv_cpu_ops xen_cpu_ops __initdata = {</div><div class='ctx'> 	.load_gs_index = xen_load_gs_index,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+	.alloc_ldt = xen_alloc_ldt,</div><div class='add'>+	.free_ldt = xen_free_ldt,</div><div class='add'>+</div><div class='ctx'> 	.store_gdt = native_store_gdt,</div><div class='ctx'> 	.store_idt = native_store_idt,</div><div class='ctx'> 	.store_tr = xen_store_tr,</div><div class='hunk'>@@ -1241,40 +1260,8 @@ static const struct pv_cpu_ops xen_cpu_ops __initdata = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void __init __xen_init_IRQ(void)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_X86_64</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* Create identity vector-&gt;irq map */</div><div class='del'>-	for(i = 0; i &lt; NR_VECTORS; i++) {</div><div class='del'>-		int cpu;</div><div class='del'>-</div><div class='del'>-		for_each_possible_cpu(cpu)</div><div class='del'>-			per_cpu(vector_irq, cpu)[i] = i;</div><div class='del'>-	}</div><div class='del'>-#endif	/* CONFIG_X86_64 */</div><div class='del'>-</div><div class='del'>-	xen_init_IRQ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct pv_irq_ops xen_irq_ops __initdata = {</div><div class='del'>-	.init_IRQ = __xen_init_IRQ,</div><div class='del'>-	.save_fl = xen_save_fl,</div><div class='del'>-	.restore_fl = xen_restore_fl,</div><div class='del'>-	.irq_disable = xen_irq_disable,</div><div class='del'>-	.irq_enable = xen_irq_enable,</div><div class='del'>-	.safe_halt = xen_safe_halt,</div><div class='del'>-	.halt = xen_halt,</div><div class='del'>-#ifdef CONFIG_X86_64</div><div class='del'>-	.adjust_exception_frame = xen_adjust_exception_frame,</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static const struct pv_apic_ops xen_apic_ops __initdata = {</div><div class='ctx'> #ifdef CONFIG_X86_LOCAL_APIC</div><div class='del'>-	.apic_write = xen_apic_write,</div><div class='del'>-	.apic_read = xen_apic_read,</div><div class='ctx'> 	.setup_boot_clock = paravirt_nop,</div><div class='ctx'> 	.setup_secondary_clock = paravirt_nop,</div><div class='ctx'> 	.startup_ipi_hook = paravirt_nop,</div><div class='hunk'>@@ -1413,7 +1400,7 @@ static void __init xen_reserve_top(void)</div><div class='ctx'> 	if (HYPERVISOR_xen_version(XENVER_platform_parameters, &amp;pp) == 0)</div><div class='ctx'> 		top = pp.virt_start;</div><div class='ctx'> </div><div class='del'>-	reserve_top_address(-top + 2 * PAGE_SIZE);</div><div class='add'>+	reserve_top_address(-top);</div><div class='ctx'> #endif	/* CONFIG_X86_32 */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1447,48 +1434,11 @@ static void *m2v(phys_addr_t maddr)</div><div class='ctx'> 	return __ka(m2p(maddr));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_X86_64</div><div class='del'>-static void walk(pgd_t *pgd, unsigned long addr)</div><div class='del'>-{</div><div class='del'>-	unsigned l4idx = pgd_index(addr);</div><div class='del'>-	unsigned l3idx = pud_index(addr);</div><div class='del'>-	unsigned l2idx = pmd_index(addr);</div><div class='del'>-	unsigned l1idx = pte_index(addr);</div><div class='del'>-	pgd_t l4;</div><div class='del'>-	pud_t l3;</div><div class='del'>-	pmd_t l2;</div><div class='del'>-	pte_t l1;</div><div class='del'>-</div><div class='del'>-	xen_raw_printk("walk %p, %lx -&gt; %d %d %d %d\n",</div><div class='del'>-		       pgd, addr, l4idx, l3idx, l2idx, l1idx);</div><div class='del'>-</div><div class='del'>-	l4 = pgd[l4idx];</div><div class='del'>-	xen_raw_printk("  l4: %016lx\n", l4.pgd);</div><div class='del'>-	xen_raw_printk("      %016lx\n", pgd_val(l4));</div><div class='del'>-</div><div class='del'>-	l3 = ((pud_t *)(m2v(l4.pgd)))[l3idx];</div><div class='del'>-	xen_raw_printk("  l3: %016lx\n", l3.pud);</div><div class='del'>-	xen_raw_printk("      %016lx\n", pud_val(l3));</div><div class='del'>-</div><div class='del'>-	l2 = ((pmd_t *)(m2v(l3.pud)))[l2idx];</div><div class='del'>-	xen_raw_printk("  l2: %016lx\n", l2.pmd);</div><div class='del'>-	xen_raw_printk("      %016lx\n", pmd_val(l2));</div><div class='del'>-</div><div class='del'>-	l1 = ((pte_t *)(m2v(l2.pmd)))[l1idx];</div><div class='del'>-	xen_raw_printk("  l1: %016lx\n", l1.pte);</div><div class='del'>-	xen_raw_printk("      %016lx\n", pte_val(l1));</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> static void set_page_prot(void *addr, pgprot_t prot)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long pfn = __pa(addr) &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> 	pte_t pte = pfn_pte(pfn, prot);</div><div class='ctx'> </div><div class='del'>-	xen_raw_printk("addr=%p pfn=%lx mfn=%lx prot=%016llx pte=%016llx\n",</div><div class='del'>-		       addr, pfn, get_phys_to_machine(pfn),</div><div class='del'>-		       pgprot_val(prot), pte.pte);</div><div class='del'>-</div><div class='ctx'> 	if (HYPERVISOR_update_va_mapping((unsigned long)addr, pte, 0))</div><div class='ctx'> 		BUG();</div><div class='ctx'> }</div><div class='hunk'>@@ -1664,6 +1614,8 @@ asmlinkage void __init xen_start_kernel(void)</div><div class='ctx'> 	if (!xen_start_info)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	xen_domain_type = XEN_PV_DOMAIN;</div><div class='add'>+</div><div class='ctx'> 	BUG_ON(memcmp(xen_start_info-&gt;magic, "xen-3", 5) != 0);</div><div class='ctx'> </div><div class='ctx'> 	xen_setup_features();</div><div class='hunk'>@@ -1673,10 +1625,18 @@ asmlinkage void __init xen_start_kernel(void)</div><div class='ctx'> 	pv_init_ops = xen_init_ops;</div><div class='ctx'> 	pv_time_ops = xen_time_ops;</div><div class='ctx'> 	pv_cpu_ops = xen_cpu_ops;</div><div class='del'>-	pv_irq_ops = xen_irq_ops;</div><div class='ctx'> 	pv_apic_ops = xen_apic_ops;</div><div class='ctx'> 	pv_mmu_ops = xen_mmu_ops;</div><div class='ctx'> </div><div class='add'>+	xen_init_irq_ops();</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_X86_LOCAL_APIC</div><div class='add'>+	/*</div><div class='add'>+	 * set up the basic apic ops.</div><div class='add'>+	 */</div><div class='add'>+	apic_ops = &amp;xen_basic_apic_ops;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	if (xen_feature(XENFEAT_mmu_pt_update_preserve_ad)) {</div><div class='ctx'> 		pv_mmu_ops.ptep_modify_prot_start = xen_ptep_modify_prot_start;</div><div class='ctx'> 		pv_mmu_ops.ptep_modify_prot_commit = xen_ptep_modify_prot_commit;</div><div class='hunk'>@@ -1700,7 +1660,7 @@ asmlinkage void __init xen_start_kernel(void)</div><div class='ctx'> </div><div class='ctx'> 	/* Prevent unwanted bits from being set in PTEs. */</div><div class='ctx'> 	__supported_pte_mask &amp;= ~_PAGE_GLOBAL;</div><div class='del'>-	if (!is_initial_xendomain())</div><div class='add'>+	if (!xen_initial_domain())</div><div class='ctx'> 		__supported_pte_mask &amp;= ~(_PAGE_PWT | _PAGE_PCD);</div><div class='ctx'> </div><div class='ctx'> 	/* Don't do the full vcpu_info placement stuff until we have a</div><div class='hunk'>@@ -1735,7 +1695,7 @@ asmlinkage void __init xen_start_kernel(void)</div><div class='ctx'> 	boot_params.hdr.ramdisk_size = xen_start_info-&gt;mod_len;</div><div class='ctx'> 	boot_params.hdr.cmd_line_ptr = __pa(xen_start_info-&gt;cmd_line);</div><div class='ctx'> </div><div class='del'>-	if (!is_initial_xendomain()) {</div><div class='add'>+	if (!xen_initial_domain()) {</div><div class='ctx'> 		add_preferred_console("xenboot", 0, NULL);</div><div class='ctx'> 		add_preferred_console("tty", 0, NULL);</div><div class='ctx'> 		add_preferred_console("hvc", 0, NULL);</div><div class='hunk'>@@ -1743,15 +1703,6 @@ asmlinkage void __init xen_start_kernel(void)</div><div class='ctx'> </div><div class='ctx'> 	xen_raw_console_write("about to get started...\n");</div><div class='ctx'> </div><div class='del'>-#if 0</div><div class='del'>-	xen_raw_printk("&amp;boot_params=%p __pa(&amp;boot_params)=%lx __va(__pa(&amp;boot_params))=%lx\n",</div><div class='del'>-		       &amp;boot_params, __pa_symbol(&amp;boot_params),</div><div class='del'>-		       __va(__pa_symbol(&amp;boot_params)));</div><div class='del'>-</div><div class='del'>-	walk(pgd, &amp;boot_params);</div><div class='del'>-	walk(pgd, __va(__pa(&amp;boot_params)));</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	/* Start the world */</div><div class='ctx'> #ifdef CONFIG_X86_32</div><div class='ctx'> 	i386_start_kernel();</div><div class='head'>diff --git a/arch/x86/xen/irq.c b/arch/x86/xen/irq.c<br/>new file mode 100644<br/>index 000000000000..28b85ab8422e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/xen/irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/xen/irq.c</a></div><div class='hunk'>@@ -0,0 +1,143 @@</div><div class='add'>+#include &lt;linux/hardirq.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;xen/interface/xen.h&gt;</div><div class='add'>+#include &lt;xen/interface/sched.h&gt;</div><div class='add'>+#include &lt;xen/interface/vcpu.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/xen/hypercall.h&gt;</div><div class='add'>+#include &lt;asm/xen/hypervisor.h&gt;</div><div class='add'>+</div><div class='add'>+#include "xen-ops.h"</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Force a proper event-channel callback from Xen after clearing the</div><div class='add'>+ * callback mask. We do this in a very simple manner, by making a call</div><div class='add'>+ * down into Xen. The pending flag will be checked by Xen on return.</div><div class='add'>+ */</div><div class='add'>+void xen_force_evtchn_callback(void)</div><div class='add'>+{</div><div class='add'>+	(void)HYPERVISOR_xen_version(0, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init __xen_init_IRQ(void)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* Create identity vector-&gt;irq map */</div><div class='add'>+	for(i = 0; i &lt; NR_VECTORS; i++) {</div><div class='add'>+		int cpu;</div><div class='add'>+</div><div class='add'>+		for_each_possible_cpu(cpu)</div><div class='add'>+			per_cpu(vector_irq, cpu)[i] = i;</div><div class='add'>+	}</div><div class='add'>+#endif	/* CONFIG_X86_64 */</div><div class='add'>+</div><div class='add'>+	xen_init_IRQ();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned long xen_save_fl(void)</div><div class='add'>+{</div><div class='add'>+	struct vcpu_info *vcpu;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	vcpu = x86_read_percpu(xen_vcpu);</div><div class='add'>+</div><div class='add'>+	/* flag has opposite sense of mask */</div><div class='add'>+	flags = !vcpu-&gt;evtchn_upcall_mask;</div><div class='add'>+</div><div class='add'>+	/* convert to IF type flag</div><div class='add'>+	   -0 -&gt; 0x00000000</div><div class='add'>+	   -1 -&gt; 0xffffffff</div><div class='add'>+	*/</div><div class='add'>+	return (-flags) &amp; X86_EFLAGS_IF;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void xen_restore_fl(unsigned long flags)</div><div class='add'>+{</div><div class='add'>+	struct vcpu_info *vcpu;</div><div class='add'>+</div><div class='add'>+	/* convert from IF type flag */</div><div class='add'>+	flags = !(flags &amp; X86_EFLAGS_IF);</div><div class='add'>+</div><div class='add'>+	/* There's a one instruction preempt window here.  We need to</div><div class='add'>+	   make sure we're don't switch CPUs between getting the vcpu</div><div class='add'>+	   pointer and updating the mask. */</div><div class='add'>+	preempt_disable();</div><div class='add'>+	vcpu = x86_read_percpu(xen_vcpu);</div><div class='add'>+	vcpu-&gt;evtchn_upcall_mask = flags;</div><div class='add'>+	preempt_enable_no_resched();</div><div class='add'>+</div><div class='add'>+	/* Doesn't matter if we get preempted here, because any</div><div class='add'>+	   pending event will get dealt with anyway. */</div><div class='add'>+</div><div class='add'>+	if (flags == 0) {</div><div class='add'>+		preempt_check_resched();</div><div class='add'>+		barrier(); /* unmask then check (avoid races) */</div><div class='add'>+		if (unlikely(vcpu-&gt;evtchn_upcall_pending))</div><div class='add'>+			xen_force_evtchn_callback();</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void xen_irq_disable(void)</div><div class='add'>+{</div><div class='add'>+	/* There's a one instruction preempt window here.  We need to</div><div class='add'>+	   make sure we're don't switch CPUs between getting the vcpu</div><div class='add'>+	   pointer and updating the mask. */</div><div class='add'>+	preempt_disable();</div><div class='add'>+	x86_read_percpu(xen_vcpu)-&gt;evtchn_upcall_mask = 1;</div><div class='add'>+	preempt_enable_no_resched();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void xen_irq_enable(void)</div><div class='add'>+{</div><div class='add'>+	struct vcpu_info *vcpu;</div><div class='add'>+</div><div class='add'>+	/* We don't need to worry about being preempted here, since</div><div class='add'>+	   either a) interrupts are disabled, so no preemption, or b)</div><div class='add'>+	   the caller is confused and is trying to re-enable interrupts</div><div class='add'>+	   on an indeterminate processor. */</div><div class='add'>+</div><div class='add'>+	vcpu = x86_read_percpu(xen_vcpu);</div><div class='add'>+	vcpu-&gt;evtchn_upcall_mask = 0;</div><div class='add'>+</div><div class='add'>+	/* Doesn't matter if we get preempted here, because any</div><div class='add'>+	   pending event will get dealt with anyway. */</div><div class='add'>+</div><div class='add'>+	barrier(); /* unmask then check (avoid races) */</div><div class='add'>+	if (unlikely(vcpu-&gt;evtchn_upcall_pending))</div><div class='add'>+		xen_force_evtchn_callback();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void xen_safe_halt(void)</div><div class='add'>+{</div><div class='add'>+	/* Blocking includes an implicit local_irq_enable(). */</div><div class='add'>+	if (HYPERVISOR_sched_op(SCHEDOP_block, NULL) != 0)</div><div class='add'>+		BUG();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void xen_halt(void)</div><div class='add'>+{</div><div class='add'>+	if (irqs_disabled())</div><div class='add'>+		HYPERVISOR_vcpu_op(VCPUOP_down, smp_processor_id(), NULL);</div><div class='add'>+	else</div><div class='add'>+		xen_safe_halt();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct pv_irq_ops xen_irq_ops __initdata = {</div><div class='add'>+	.init_IRQ = __xen_init_IRQ,</div><div class='add'>+	.save_fl = xen_save_fl,</div><div class='add'>+	.restore_fl = xen_restore_fl,</div><div class='add'>+	.irq_disable = xen_irq_disable,</div><div class='add'>+	.irq_enable = xen_irq_enable,</div><div class='add'>+	.safe_halt = xen_safe_halt,</div><div class='add'>+	.halt = xen_halt,</div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='add'>+	.adjust_exception_frame = xen_adjust_exception_frame,</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void __init xen_init_irq_ops()</div><div class='add'>+{</div><div class='add'>+	pv_irq_ops = xen_irq_ops;</div><div class='add'>+}</div><div class='head'>diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c<br/>index aa37469da696..ae173f6edd8b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/xen/mmu.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/xen/mmu.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/xen/mmu.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/xen/mmu.c</a></div><div class='hunk'>@@ -40,6 +40,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/highmem.h&gt;</div><div class='add'>+#include &lt;linux/debugfs.h&gt;</div><div class='ctx'> #include &lt;linux/bug.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='hunk'>@@ -57,6 +58,61 @@</div><div class='ctx'> </div><div class='ctx'> #include "multicalls.h"</div><div class='ctx'> #include "mmu.h"</div><div class='add'>+#include "debugfs.h"</div><div class='add'>+</div><div class='add'>+#define MMU_UPDATE_HISTO	30</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_XEN_DEBUG_FS</div><div class='add'>+</div><div class='add'>+static struct {</div><div class='add'>+	u32 pgd_update;</div><div class='add'>+	u32 pgd_update_pinned;</div><div class='add'>+	u32 pgd_update_batched;</div><div class='add'>+</div><div class='add'>+	u32 pud_update;</div><div class='add'>+	u32 pud_update_pinned;</div><div class='add'>+	u32 pud_update_batched;</div><div class='add'>+</div><div class='add'>+	u32 pmd_update;</div><div class='add'>+	u32 pmd_update_pinned;</div><div class='add'>+	u32 pmd_update_batched;</div><div class='add'>+</div><div class='add'>+	u32 pte_update;</div><div class='add'>+	u32 pte_update_pinned;</div><div class='add'>+	u32 pte_update_batched;</div><div class='add'>+</div><div class='add'>+	u32 mmu_update;</div><div class='add'>+	u32 mmu_update_extended;</div><div class='add'>+	u32 mmu_update_histo[MMU_UPDATE_HISTO];</div><div class='add'>+</div><div class='add'>+	u32 prot_commit;</div><div class='add'>+	u32 prot_commit_batched;</div><div class='add'>+</div><div class='add'>+	u32 set_pte_at;</div><div class='add'>+	u32 set_pte_at_batched;</div><div class='add'>+	u32 set_pte_at_pinned;</div><div class='add'>+	u32 set_pte_at_current;</div><div class='add'>+	u32 set_pte_at_kernel;</div><div class='add'>+} mmu_stats;</div><div class='add'>+</div><div class='add'>+static u8 zero_stats;</div><div class='add'>+</div><div class='add'>+static inline void check_zero(void)</div><div class='add'>+{</div><div class='add'>+	if (unlikely(zero_stats)) {</div><div class='add'>+		memset(&amp;mmu_stats, 0, sizeof(mmu_stats));</div><div class='add'>+		zero_stats = 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define ADD_STATS(elem, val)			\</div><div class='add'>+	do { check_zero(); mmu_stats.elem += (val); } while(0)</div><div class='add'>+</div><div class='add'>+#else  /* !CONFIG_XEN_DEBUG_FS */</div><div class='add'>+</div><div class='add'>+#define ADD_STATS(elem, val)	do { (void)(val); } while(0)</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_XEN_DEBUG_FS */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Just beyond the highest usermode address.  STACK_TOP_MAX has a</div><div class='hunk'>@@ -229,25 +285,35 @@ void make_lowmem_page_readwrite(void *vaddr)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static bool page_pinned(void *ptr)</div><div class='add'>+static bool xen_page_pinned(void *ptr)</div><div class='ctx'> {</div><div class='ctx'> 	struct page *page = virt_to_page(ptr);</div><div class='ctx'> </div><div class='ctx'> 	return PagePinned(page);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void extend_mmu_update(const struct mmu_update *update)</div><div class='add'>+static void xen_extend_mmu_update(const struct mmu_update *update)</div><div class='ctx'> {</div><div class='ctx'> 	struct multicall_space mcs;</div><div class='ctx'> 	struct mmu_update *u;</div><div class='ctx'> </div><div class='ctx'> 	mcs = xen_mc_extend_args(__HYPERVISOR_mmu_update, sizeof(*u));</div><div class='ctx'> </div><div class='del'>-	if (mcs.mc != NULL)</div><div class='add'>+	if (mcs.mc != NULL) {</div><div class='add'>+		ADD_STATS(mmu_update_extended, 1);</div><div class='add'>+		ADD_STATS(mmu_update_histo[mcs.mc-&gt;args[1]], -1);</div><div class='add'>+</div><div class='ctx'> 		mcs.mc-&gt;args[1]++;</div><div class='del'>-	else {</div><div class='add'>+</div><div class='add'>+		if (mcs.mc-&gt;args[1] &lt; MMU_UPDATE_HISTO)</div><div class='add'>+			ADD_STATS(mmu_update_histo[mcs.mc-&gt;args[1]], 1);</div><div class='add'>+		else</div><div class='add'>+			ADD_STATS(mmu_update_histo[0], 1);</div><div class='add'>+	} else {</div><div class='add'>+		ADD_STATS(mmu_update, 1);</div><div class='ctx'> 		mcs = __xen_mc_entry(sizeof(*u));</div><div class='ctx'> 		MULTI_mmu_update(mcs.mc, mcs.args, 1, NULL, DOMID_SELF);</div><div class='add'>+		ADD_STATS(mmu_update_histo[1], 1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	u = mcs.args;</div><div class='hunk'>@@ -265,7 +331,9 @@ void xen_set_pmd_hyper(pmd_t *ptr, pmd_t val)</div><div class='ctx'> 	/* ptr may be ioremapped for 64-bit pagetable setup */</div><div class='ctx'> 	u.ptr = arbitrary_virt_to_machine(ptr).maddr;</div><div class='ctx'> 	u.val = pmd_val_ma(val);</div><div class='del'>-	extend_mmu_update(&amp;u);</div><div class='add'>+	xen_extend_mmu_update(&amp;u);</div><div class='add'>+</div><div class='add'>+	ADD_STATS(pmd_update_batched, paravirt_get_lazy_mode() == PARAVIRT_LAZY_MMU);</div><div class='ctx'> </div><div class='ctx'> 	xen_mc_issue(PARAVIRT_LAZY_MMU);</div><div class='ctx'> </div><div class='hunk'>@@ -274,13 +342,17 @@ void xen_set_pmd_hyper(pmd_t *ptr, pmd_t val)</div><div class='ctx'> </div><div class='ctx'> void xen_set_pmd(pmd_t *ptr, pmd_t val)</div><div class='ctx'> {</div><div class='add'>+	ADD_STATS(pmd_update, 1);</div><div class='add'>+</div><div class='ctx'> 	/* If page is not pinned, we can just update the entry</div><div class='ctx'> 	   directly */</div><div class='del'>-	if (!page_pinned(ptr)) {</div><div class='add'>+	if (!xen_page_pinned(ptr)) {</div><div class='ctx'> 		*ptr = val;</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ADD_STATS(pmd_update_pinned, 1);</div><div class='add'>+</div><div class='ctx'> 	xen_set_pmd_hyper(ptr, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -300,12 +372,18 @@ void xen_set_pte_at(struct mm_struct *mm, unsigned long addr,</div><div class='ctx'> 	if (mm == &amp;init_mm)</div><div class='ctx'> 		preempt_disable();</div><div class='ctx'> </div><div class='add'>+	ADD_STATS(set_pte_at, 1);</div><div class='add'>+//	ADD_STATS(set_pte_at_pinned, xen_page_pinned(ptep));</div><div class='add'>+	ADD_STATS(set_pte_at_current, mm == current-&gt;mm);</div><div class='add'>+	ADD_STATS(set_pte_at_kernel, mm == &amp;init_mm);</div><div class='add'>+</div><div class='ctx'> 	if (mm == current-&gt;mm || mm == &amp;init_mm) {</div><div class='ctx'> 		if (paravirt_get_lazy_mode() == PARAVIRT_LAZY_MMU) {</div><div class='ctx'> 			struct multicall_space mcs;</div><div class='ctx'> 			mcs = xen_mc_entry(0);</div><div class='ctx'> </div><div class='ctx'> 			MULTI_update_va_mapping(mcs.mc, addr, pteval, 0);</div><div class='add'>+			ADD_STATS(set_pte_at_batched, 1);</div><div class='ctx'> 			xen_mc_issue(PARAVIRT_LAZY_MMU);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		} else</div><div class='hunk'>@@ -334,7 +412,10 @@ void xen_ptep_modify_prot_commit(struct mm_struct *mm, unsigned long addr,</div><div class='ctx'> </div><div class='ctx'> 	u.ptr = virt_to_machine(ptep).maddr | MMU_PT_UPDATE_PRESERVE_AD;</div><div class='ctx'> 	u.val = pte_val_ma(pte);</div><div class='del'>-	extend_mmu_update(&amp;u);</div><div class='add'>+	xen_extend_mmu_update(&amp;u);</div><div class='add'>+</div><div class='add'>+	ADD_STATS(prot_commit, 1);</div><div class='add'>+	ADD_STATS(prot_commit_batched, paravirt_get_lazy_mode() == PARAVIRT_LAZY_MMU);</div><div class='ctx'> </div><div class='ctx'> 	xen_mc_issue(PARAVIRT_LAZY_MMU);</div><div class='ctx'> }</div><div class='hunk'>@@ -400,7 +481,9 @@ void xen_set_pud_hyper(pud_t *ptr, pud_t val)</div><div class='ctx'> 	/* ptr may be ioremapped for 64-bit pagetable setup */</div><div class='ctx'> 	u.ptr = arbitrary_virt_to_machine(ptr).maddr;</div><div class='ctx'> 	u.val = pud_val_ma(val);</div><div class='del'>-	extend_mmu_update(&amp;u);</div><div class='add'>+	xen_extend_mmu_update(&amp;u);</div><div class='add'>+</div><div class='add'>+	ADD_STATS(pud_update_batched, paravirt_get_lazy_mode() == PARAVIRT_LAZY_MMU);</div><div class='ctx'> </div><div class='ctx'> 	xen_mc_issue(PARAVIRT_LAZY_MMU);</div><div class='ctx'> </div><div class='hunk'>@@ -409,18 +492,26 @@ void xen_set_pud_hyper(pud_t *ptr, pud_t val)</div><div class='ctx'> </div><div class='ctx'> void xen_set_pud(pud_t *ptr, pud_t val)</div><div class='ctx'> {</div><div class='add'>+	ADD_STATS(pud_update, 1);</div><div class='add'>+</div><div class='ctx'> 	/* If page is not pinned, we can just update the entry</div><div class='ctx'> 	   directly */</div><div class='del'>-	if (!page_pinned(ptr)) {</div><div class='add'>+	if (!xen_page_pinned(ptr)) {</div><div class='ctx'> 		*ptr = val;</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ADD_STATS(pud_update_pinned, 1);</div><div class='add'>+</div><div class='ctx'> 	xen_set_pud_hyper(ptr, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void xen_set_pte(pte_t *ptep, pte_t pte)</div><div class='ctx'> {</div><div class='add'>+	ADD_STATS(pte_update, 1);</div><div class='add'>+//	ADD_STATS(pte_update_pinned, xen_page_pinned(ptep));</div><div class='add'>+	ADD_STATS(pte_update_batched, paravirt_get_lazy_mode() == PARAVIRT_LAZY_MMU);</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_X86_PAE</div><div class='ctx'> 	ptep-&gt;pte_high = pte.pte_high;</div><div class='ctx'> 	smp_wmb();</div><div class='hunk'>@@ -490,7 +581,7 @@ static void __xen_set_pgd_hyper(pgd_t *ptr, pgd_t val)</div><div class='ctx'> </div><div class='ctx'> 	u.ptr = virt_to_machine(ptr).maddr;</div><div class='ctx'> 	u.val = pgd_val_ma(val);</div><div class='del'>-	extend_mmu_update(&amp;u);</div><div class='add'>+	xen_extend_mmu_update(&amp;u);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -517,17 +608,22 @@ void xen_set_pgd(pgd_t *ptr, pgd_t val)</div><div class='ctx'> {</div><div class='ctx'> 	pgd_t *user_ptr = xen_get_user_pgd(ptr);</div><div class='ctx'> </div><div class='add'>+	ADD_STATS(pgd_update, 1);</div><div class='add'>+</div><div class='ctx'> 	/* If page is not pinned, we can just update the entry</div><div class='ctx'> 	   directly */</div><div class='del'>-	if (!page_pinned(ptr)) {</div><div class='add'>+	if (!xen_page_pinned(ptr)) {</div><div class='ctx'> 		*ptr = val;</div><div class='ctx'> 		if (user_ptr) {</div><div class='del'>-			WARN_ON(page_pinned(user_ptr));</div><div class='add'>+			WARN_ON(xen_page_pinned(user_ptr));</div><div class='ctx'> 			*user_ptr = val;</div><div class='ctx'> 		}</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ADD_STATS(pgd_update_pinned, 1);</div><div class='add'>+	ADD_STATS(pgd_update_batched, paravirt_get_lazy_mode() == PARAVIRT_LAZY_MMU);</div><div class='add'>+</div><div class='ctx'> 	/* If it's pinned, then we can at least batch the kernel and</div><div class='ctx'> 	   user updates together. */</div><div class='ctx'> 	xen_mc_batch();</div><div class='hunk'>@@ -555,9 +651,12 @@ void xen_set_pgd(pgd_t *ptr, pgd_t val)</div><div class='ctx'>  * For 64-bit, we must skip the Xen hole in the middle of the address</div><div class='ctx'>  * space, just after the big x86-64 virtual hole.</div><div class='ctx'>  */</div><div class='del'>-static int pgd_walk(pgd_t *pgd, int (*func)(struct page *, enum pt_level),</div><div class='del'>-		    unsigned long limit)</div><div class='add'>+static int xen_pgd_walk(struct mm_struct *mm,</div><div class='add'>+			int (*func)(struct mm_struct *mm, struct page *,</div><div class='add'>+				    enum pt_level),</div><div class='add'>+			unsigned long limit)</div><div class='ctx'> {</div><div class='add'>+	pgd_t *pgd = mm-&gt;pgd;</div><div class='ctx'> 	int flush = 0;</div><div class='ctx'> 	unsigned hole_low, hole_high;</div><div class='ctx'> 	unsigned pgdidx_limit, pudidx_limit, pmdidx_limit;</div><div class='hunk'>@@ -590,8 +689,6 @@ static int pgd_walk(pgd_t *pgd, int (*func)(struct page *, enum pt_level),</div><div class='ctx'> 	pmdidx_limit = 0;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	flush |= (*func)(virt_to_page(pgd), PT_PGD);</div><div class='del'>-</div><div class='ctx'> 	for (pgdidx = 0; pgdidx &lt;= pgdidx_limit; pgdidx++) {</div><div class='ctx'> 		pud_t *pud;</div><div class='ctx'> </div><div class='hunk'>@@ -604,7 +701,7 @@ static int pgd_walk(pgd_t *pgd, int (*func)(struct page *, enum pt_level),</div><div class='ctx'> 		pud = pud_offset(&amp;pgd[pgdidx], 0);</div><div class='ctx'> </div><div class='ctx'> 		if (PTRS_PER_PUD &gt; 1) /* not folded */</div><div class='del'>-			flush |= (*func)(virt_to_page(pud), PT_PUD);</div><div class='add'>+			flush |= (*func)(mm, virt_to_page(pud), PT_PUD);</div><div class='ctx'> </div><div class='ctx'> 		for (pudidx = 0; pudidx &lt; PTRS_PER_PUD; pudidx++) {</div><div class='ctx'> 			pmd_t *pmd;</div><div class='hunk'>@@ -619,7 +716,7 @@ static int pgd_walk(pgd_t *pgd, int (*func)(struct page *, enum pt_level),</div><div class='ctx'> 			pmd = pmd_offset(&amp;pud[pudidx], 0);</div><div class='ctx'> </div><div class='ctx'> 			if (PTRS_PER_PMD &gt; 1) /* not folded */</div><div class='del'>-				flush |= (*func)(virt_to_page(pmd), PT_PMD);</div><div class='add'>+				flush |= (*func)(mm, virt_to_page(pmd), PT_PMD);</div><div class='ctx'> </div><div class='ctx'> 			for (pmdidx = 0; pmdidx &lt; PTRS_PER_PMD; pmdidx++) {</div><div class='ctx'> 				struct page *pte;</div><div class='hunk'>@@ -633,28 +730,34 @@ static int pgd_walk(pgd_t *pgd, int (*func)(struct page *, enum pt_level),</div><div class='ctx'> 					continue;</div><div class='ctx'> </div><div class='ctx'> 				pte = pmd_page(pmd[pmdidx]);</div><div class='del'>-				flush |= (*func)(pte, PT_PTE);</div><div class='add'>+				flush |= (*func)(mm, pte, PT_PTE);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> out:</div><div class='add'>+	/* Do the top level last, so that the callbacks can use it as</div><div class='add'>+	   a cue to do final things like tlb flushes. */</div><div class='add'>+	flush |= (*func)(mm, virt_to_page(pgd), PT_PGD);</div><div class='ctx'> </div><div class='ctx'> 	return flush;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static spinlock_t *lock_pte(struct page *page)</div><div class='add'>+/* If we're using split pte locks, then take the page's lock and</div><div class='add'>+   return a pointer to it.  Otherwise return NULL. */</div><div class='add'>+static spinlock_t *xen_pte_lock(struct page *page, struct mm_struct *mm)</div><div class='ctx'> {</div><div class='ctx'> 	spinlock_t *ptl = NULL;</div><div class='ctx'> </div><div class='del'>-#if NR_CPUS &gt;= CONFIG_SPLIT_PTLOCK_CPUS</div><div class='add'>+#if USE_SPLIT_PTLOCKS</div><div class='ctx'> 	ptl = __pte_lockptr(page);</div><div class='del'>-	spin_lock(ptl);</div><div class='add'>+	spin_lock_nest_lock(ptl, &amp;mm-&gt;page_table_lock);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	return ptl;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void do_unlock(void *v)</div><div class='add'>+static void xen_pte_unlock(void *v)</div><div class='ctx'> {</div><div class='ctx'> 	spinlock_t *ptl = v;</div><div class='ctx'> 	spin_unlock(ptl);</div><div class='hunk'>@@ -672,7 +775,8 @@ static void xen_do_pin(unsigned level, unsigned long pfn)</div><div class='ctx'> 	MULTI_mmuext_op(mcs.mc, op, 1, NULL, DOMID_SELF);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int pin_page(struct page *page, enum pt_level level)</div><div class='add'>+static int xen_pin_page(struct mm_struct *mm, struct page *page,</div><div class='add'>+			enum pt_level level)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned pgfl = TestSetPagePinned(page);</div><div class='ctx'> 	int flush;</div><div class='hunk'>@@ -691,21 +795,40 @@ static int pin_page(struct page *page, enum pt_level level)</div><div class='ctx'> </div><div class='ctx'> 		flush = 0;</div><div class='ctx'> </div><div class='add'>+		/*</div><div class='add'>+		 * We need to hold the pagetable lock between the time</div><div class='add'>+		 * we make the pagetable RO and when we actually pin</div><div class='add'>+		 * it.  If we don't, then other users may come in and</div><div class='add'>+		 * attempt to update the pagetable by writing it,</div><div class='add'>+		 * which will fail because the memory is RO but not</div><div class='add'>+		 * pinned, so Xen won't do the trap'n'emulate.</div><div class='add'>+		 *</div><div class='add'>+		 * If we're using split pte locks, we can't hold the</div><div class='add'>+		 * entire pagetable's worth of locks during the</div><div class='add'>+		 * traverse, because we may wrap the preempt count (8</div><div class='add'>+		 * bits).  The solution is to mark RO and pin each PTE</div><div class='add'>+		 * page while holding the lock.  This means the number</div><div class='add'>+		 * of locks we end up holding is never more than a</div><div class='add'>+		 * batch size (~32 entries, at present).</div><div class='add'>+		 *</div><div class='add'>+		 * If we're not using split pte locks, we needn't pin</div><div class='add'>+		 * the PTE pages independently, because we're</div><div class='add'>+		 * protected by the overall pagetable lock.</div><div class='add'>+		 */</div><div class='ctx'> 		ptl = NULL;</div><div class='ctx'> 		if (level == PT_PTE)</div><div class='del'>-			ptl = lock_pte(page);</div><div class='add'>+			ptl = xen_pte_lock(page, mm);</div><div class='ctx'> </div><div class='ctx'> 		MULTI_update_va_mapping(mcs.mc, (unsigned long)pt,</div><div class='ctx'> 					pfn_pte(pfn, PAGE_KERNEL_RO),</div><div class='ctx'> 					level == PT_PGD ? UVMF_TLB_FLUSH : 0);</div><div class='ctx'> </div><div class='del'>-		if (level == PT_PTE)</div><div class='add'>+		if (ptl) {</div><div class='ctx'> 			xen_do_pin(MMUEXT_PIN_L1_TABLE, pfn);</div><div class='ctx'> </div><div class='del'>-		if (ptl) {</div><div class='ctx'> 			/* Queue a deferred unlock for when this batch</div><div class='ctx'> 			   is completed. */</div><div class='del'>-			xen_mc_callback(do_unlock, ptl);</div><div class='add'>+			xen_mc_callback(xen_pte_unlock, ptl);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -715,11 +838,11 @@ static int pin_page(struct page *page, enum pt_level level)</div><div class='ctx'> /* This is called just after a mm has been created, but it has not</div><div class='ctx'>    been used yet.  We need to make sure that its pagetable is all</div><div class='ctx'>    read-only, and can be pinned. */</div><div class='del'>-void xen_pgd_pin(pgd_t *pgd)</div><div class='add'>+static void __xen_pgd_pin(struct mm_struct *mm, pgd_t *pgd)</div><div class='ctx'> {</div><div class='ctx'> 	xen_mc_batch();</div><div class='ctx'> </div><div class='del'>-	if (pgd_walk(pgd, pin_page, USER_LIMIT)) {</div><div class='add'>+	if (xen_pgd_walk(mm, xen_pin_page, USER_LIMIT)) {</div><div class='ctx'> 		/* re-enable interrupts for kmap_flush_unused */</div><div class='ctx'> 		xen_mc_issue(0);</div><div class='ctx'> 		kmap_flush_unused();</div><div class='hunk'>@@ -733,25 +856,35 @@ void xen_pgd_pin(pgd_t *pgd)</div><div class='ctx'> 		xen_do_pin(MMUEXT_PIN_L4_TABLE, PFN_DOWN(__pa(pgd)));</div><div class='ctx'> </div><div class='ctx'> 		if (user_pgd) {</div><div class='del'>-			pin_page(virt_to_page(user_pgd), PT_PGD);</div><div class='add'>+			xen_pin_page(mm, virt_to_page(user_pgd), PT_PGD);</div><div class='ctx'> 			xen_do_pin(MMUEXT_PIN_L4_TABLE, PFN_DOWN(__pa(user_pgd)));</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> #else /* CONFIG_X86_32 */</div><div class='ctx'> #ifdef CONFIG_X86_PAE</div><div class='ctx'> 	/* Need to make sure unshared kernel PMD is pinnable */</div><div class='del'>-	pin_page(virt_to_page(pgd_page(pgd[pgd_index(TASK_SIZE)])), PT_PMD);</div><div class='add'>+	xen_pin_page(mm, virt_to_page(pgd_page(pgd[pgd_index(TASK_SIZE)])),</div><div class='add'>+		     PT_PMD);</div><div class='ctx'> #endif</div><div class='ctx'> 	xen_do_pin(MMUEXT_PIN_L3_TABLE, PFN_DOWN(__pa(pgd)));</div><div class='ctx'> #endif /* CONFIG_X86_64 */</div><div class='ctx'> 	xen_mc_issue(0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void xen_pgd_pin(struct mm_struct *mm)</div><div class='add'>+{</div><div class='add'>+	__xen_pgd_pin(mm, mm-&gt;pgd);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * On save, we need to pin all pagetables to make sure they get their</div><div class='ctx'>  * mfns turned into pfns.  Search the list for any unpinned pgds and pin</div><div class='ctx'>  * them (unpinned pgds are not currently in use, probably because the</div><div class='ctx'>  * process is under construction or destruction).</div><div class='add'>+ *</div><div class='add'>+ * Expected to be called in stop_machine() ("equivalent to taking</div><div class='add'>+ * every spinlock in the system"), so the locking doesn't really</div><div class='add'>+ * matter all that much.</div><div class='ctx'>  */</div><div class='ctx'> void xen_mm_pin_all(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -762,7 +895,7 @@ void xen_mm_pin_all(void)</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(page, &amp;pgd_list, lru) {</div><div class='ctx'> 		if (!PagePinned(page)) {</div><div class='del'>-			xen_pgd_pin((pgd_t *)page_address(page));</div><div class='add'>+			__xen_pgd_pin(&amp;init_mm, (pgd_t *)page_address(page));</div><div class='ctx'> 			SetPageSavePinned(page);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -775,7 +908,8 @@ void xen_mm_pin_all(void)</div><div class='ctx'>  * that's before we have page structures to store the bits.  So do all</div><div class='ctx'>  * the book-keeping now.</div><div class='ctx'>  */</div><div class='del'>-static __init int mark_pinned(struct page *page, enum pt_level level)</div><div class='add'>+static __init int xen_mark_pinned(struct mm_struct *mm, struct page *page,</div><div class='add'>+				  enum pt_level level)</div><div class='ctx'> {</div><div class='ctx'> 	SetPagePinned(page);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -783,10 +917,11 @@ static __init int mark_pinned(struct page *page, enum pt_level level)</div><div class='ctx'> </div><div class='ctx'> void __init xen_mark_init_mm_pinned(void)</div><div class='ctx'> {</div><div class='del'>-	pgd_walk(init_mm.pgd, mark_pinned, FIXADDR_TOP);</div><div class='add'>+	xen_pgd_walk(&amp;init_mm, xen_mark_pinned, FIXADDR_TOP);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int unpin_page(struct page *page, enum pt_level level)</div><div class='add'>+static int xen_unpin_page(struct mm_struct *mm, struct page *page,</div><div class='add'>+			  enum pt_level level)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned pgfl = TestClearPagePinned(page);</div><div class='ctx'> </div><div class='hunk'>@@ -796,10 +931,18 @@ static int unpin_page(struct page *page, enum pt_level level)</div><div class='ctx'> 		spinlock_t *ptl = NULL;</div><div class='ctx'> 		struct multicall_space mcs;</div><div class='ctx'> </div><div class='add'>+		/*</div><div class='add'>+		 * Do the converse to pin_page.  If we're using split</div><div class='add'>+		 * pte locks, we must be holding the lock for while</div><div class='add'>+		 * the pte page is unpinned but still RO to prevent</div><div class='add'>+		 * concurrent updates from seeing it in this</div><div class='add'>+		 * partially-pinned state.</div><div class='add'>+		 */</div><div class='ctx'> 		if (level == PT_PTE) {</div><div class='del'>-			ptl = lock_pte(page);</div><div class='add'>+			ptl = xen_pte_lock(page, mm);</div><div class='ctx'> </div><div class='del'>-			xen_do_pin(MMUEXT_UNPIN_TABLE, pfn);</div><div class='add'>+			if (ptl)</div><div class='add'>+				xen_do_pin(MMUEXT_UNPIN_TABLE, pfn);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		mcs = __xen_mc_entry(0);</div><div class='hunk'>@@ -810,7 +953,7 @@ static int unpin_page(struct page *page, enum pt_level level)</div><div class='ctx'> </div><div class='ctx'> 		if (ptl) {</div><div class='ctx'> 			/* unlock when batch completed */</div><div class='del'>-			xen_mc_callback(do_unlock, ptl);</div><div class='add'>+			xen_mc_callback(xen_pte_unlock, ptl);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -818,7 +961,7 @@ static int unpin_page(struct page *page, enum pt_level level)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Release a pagetables pages back as normal RW */</div><div class='del'>-static void xen_pgd_unpin(pgd_t *pgd)</div><div class='add'>+static void __xen_pgd_unpin(struct mm_struct *mm, pgd_t *pgd)</div><div class='ctx'> {</div><div class='ctx'> 	xen_mc_batch();</div><div class='ctx'> </div><div class='hunk'>@@ -830,21 +973,27 @@ static void xen_pgd_unpin(pgd_t *pgd)</div><div class='ctx'> </div><div class='ctx'> 		if (user_pgd) {</div><div class='ctx'> 			xen_do_pin(MMUEXT_UNPIN_TABLE, PFN_DOWN(__pa(user_pgd)));</div><div class='del'>-			unpin_page(virt_to_page(user_pgd), PT_PGD);</div><div class='add'>+			xen_unpin_page(mm, virt_to_page(user_pgd), PT_PGD);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_X86_PAE</div><div class='ctx'> 	/* Need to make sure unshared kernel PMD is unpinned */</div><div class='del'>-	pin_page(virt_to_page(pgd_page(pgd[pgd_index(TASK_SIZE)])), PT_PMD);</div><div class='add'>+	xen_unpin_page(mm, virt_to_page(pgd_page(pgd[pgd_index(TASK_SIZE)])),</div><div class='add'>+		       PT_PMD);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	pgd_walk(pgd, unpin_page, USER_LIMIT);</div><div class='add'>+	xen_pgd_walk(mm, xen_unpin_page, USER_LIMIT);</div><div class='ctx'> </div><div class='ctx'> 	xen_mc_issue(0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void xen_pgd_unpin(struct mm_struct *mm)</div><div class='add'>+{</div><div class='add'>+	__xen_pgd_unpin(mm, mm-&gt;pgd);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * On resume, undo any pinning done at save, so that the rest of the</div><div class='ctx'>  * kernel doesn't see any unexpected pinned pagetables.</div><div class='hunk'>@@ -859,7 +1008,7 @@ void xen_mm_unpin_all(void)</div><div class='ctx'> 	list_for_each_entry(page, &amp;pgd_list, lru) {</div><div class='ctx'> 		if (PageSavePinned(page)) {</div><div class='ctx'> 			BUG_ON(!PagePinned(page));</div><div class='del'>-			xen_pgd_unpin((pgd_t *)page_address(page));</div><div class='add'>+			__xen_pgd_unpin(&amp;init_mm, (pgd_t *)page_address(page));</div><div class='ctx'> 			ClearPageSavePinned(page);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -870,14 +1019,14 @@ void xen_mm_unpin_all(void)</div><div class='ctx'> void xen_activate_mm(struct mm_struct *prev, struct mm_struct *next)</div><div class='ctx'> {</div><div class='ctx'> 	spin_lock(&amp;next-&gt;page_table_lock);</div><div class='del'>-	xen_pgd_pin(next-&gt;pgd);</div><div class='add'>+	xen_pgd_pin(next);</div><div class='ctx'> 	spin_unlock(&amp;next-&gt;page_table_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void xen_dup_mmap(struct mm_struct *oldmm, struct mm_struct *mm)</div><div class='ctx'> {</div><div class='ctx'> 	spin_lock(&amp;mm-&gt;page_table_lock);</div><div class='del'>-	xen_pgd_pin(mm-&gt;pgd);</div><div class='add'>+	xen_pgd_pin(mm);</div><div class='ctx'> 	spin_unlock(&amp;mm-&gt;page_table_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -907,7 +1056,7 @@ static void drop_other_mm_ref(void *info)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void drop_mm_ref(struct mm_struct *mm)</div><div class='add'>+static void xen_drop_mm_ref(struct mm_struct *mm)</div><div class='ctx'> {</div><div class='ctx'> 	cpumask_t mask;</div><div class='ctx'> 	unsigned cpu;</div><div class='hunk'>@@ -937,7 +1086,7 @@ static void drop_mm_ref(struct mm_struct *mm)</div><div class='ctx'> 		smp_call_function_mask(mask, drop_other_mm_ref, mm, 1);</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='del'>-static void drop_mm_ref(struct mm_struct *mm)</div><div class='add'>+static void xen_drop_mm_ref(struct mm_struct *mm)</div><div class='ctx'> {</div><div class='ctx'> 	if (current-&gt;active_mm == mm)</div><div class='ctx'> 		load_cr3(swapper_pg_dir);</div><div class='hunk'>@@ -961,14 +1110,77 @@ static void drop_mm_ref(struct mm_struct *mm)</div><div class='ctx'> void xen_exit_mmap(struct mm_struct *mm)</div><div class='ctx'> {</div><div class='ctx'> 	get_cpu();		/* make sure we don't move around */</div><div class='del'>-	drop_mm_ref(mm);</div><div class='add'>+	xen_drop_mm_ref(mm);</div><div class='ctx'> 	put_cpu();</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;mm-&gt;page_table_lock);</div><div class='ctx'> </div><div class='ctx'> 	/* pgd may not be pinned in the error exit path of execve */</div><div class='del'>-	if (page_pinned(mm-&gt;pgd))</div><div class='del'>-		xen_pgd_unpin(mm-&gt;pgd);</div><div class='add'>+	if (xen_page_pinned(mm-&gt;pgd))</div><div class='add'>+		xen_pgd_unpin(mm);</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock(&amp;mm-&gt;page_table_lock);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_XEN_DEBUG_FS</div><div class='add'>+</div><div class='add'>+static struct dentry *d_mmu_debug;</div><div class='add'>+</div><div class='add'>+static int __init xen_mmu_debugfs(void)</div><div class='add'>+{</div><div class='add'>+	struct dentry *d_xen = xen_init_debugfs();</div><div class='add'>+</div><div class='add'>+	if (d_xen == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	d_mmu_debug = debugfs_create_dir("mmu", d_xen);</div><div class='add'>+</div><div class='add'>+	debugfs_create_u8("zero_stats", 0644, d_mmu_debug, &amp;zero_stats);</div><div class='add'>+</div><div class='add'>+	debugfs_create_u32("pgd_update", 0444, d_mmu_debug, &amp;mmu_stats.pgd_update);</div><div class='add'>+	debugfs_create_u32("pgd_update_pinned", 0444, d_mmu_debug,</div><div class='add'>+			   &amp;mmu_stats.pgd_update_pinned);</div><div class='add'>+	debugfs_create_u32("pgd_update_batched", 0444, d_mmu_debug,</div><div class='add'>+			   &amp;mmu_stats.pgd_update_pinned);</div><div class='add'>+</div><div class='add'>+	debugfs_create_u32("pud_update", 0444, d_mmu_debug, &amp;mmu_stats.pud_update);</div><div class='add'>+	debugfs_create_u32("pud_update_pinned", 0444, d_mmu_debug,</div><div class='add'>+			   &amp;mmu_stats.pud_update_pinned);</div><div class='add'>+	debugfs_create_u32("pud_update_batched", 0444, d_mmu_debug,</div><div class='add'>+			   &amp;mmu_stats.pud_update_pinned);</div><div class='add'>+</div><div class='add'>+	debugfs_create_u32("pmd_update", 0444, d_mmu_debug, &amp;mmu_stats.pmd_update);</div><div class='add'>+	debugfs_create_u32("pmd_update_pinned", 0444, d_mmu_debug,</div><div class='add'>+			   &amp;mmu_stats.pmd_update_pinned);</div><div class='add'>+	debugfs_create_u32("pmd_update_batched", 0444, d_mmu_debug,</div><div class='add'>+			   &amp;mmu_stats.pmd_update_pinned);</div><div class='add'>+</div><div class='add'>+	debugfs_create_u32("pte_update", 0444, d_mmu_debug, &amp;mmu_stats.pte_update);</div><div class='add'>+//	debugfs_create_u32("pte_update_pinned", 0444, d_mmu_debug,</div><div class='add'>+//			   &amp;mmu_stats.pte_update_pinned);</div><div class='add'>+	debugfs_create_u32("pte_update_batched", 0444, d_mmu_debug,</div><div class='add'>+			   &amp;mmu_stats.pte_update_pinned);</div><div class='add'>+</div><div class='add'>+	debugfs_create_u32("mmu_update", 0444, d_mmu_debug, &amp;mmu_stats.mmu_update);</div><div class='add'>+	debugfs_create_u32("mmu_update_extended", 0444, d_mmu_debug,</div><div class='add'>+			   &amp;mmu_stats.mmu_update_extended);</div><div class='add'>+	xen_debugfs_create_u32_array("mmu_update_histo", 0444, d_mmu_debug,</div><div class='add'>+				     mmu_stats.mmu_update_histo, 20);</div><div class='add'>+</div><div class='add'>+	debugfs_create_u32("set_pte_at", 0444, d_mmu_debug, &amp;mmu_stats.set_pte_at);</div><div class='add'>+	debugfs_create_u32("set_pte_at_batched", 0444, d_mmu_debug,</div><div class='add'>+			   &amp;mmu_stats.set_pte_at_batched);</div><div class='add'>+	debugfs_create_u32("set_pte_at_current", 0444, d_mmu_debug,</div><div class='add'>+			   &amp;mmu_stats.set_pte_at_current);</div><div class='add'>+	debugfs_create_u32("set_pte_at_kernel", 0444, d_mmu_debug,</div><div class='add'>+			   &amp;mmu_stats.set_pte_at_kernel);</div><div class='add'>+</div><div class='add'>+	debugfs_create_u32("prot_commit", 0444, d_mmu_debug, &amp;mmu_stats.prot_commit);</div><div class='add'>+	debugfs_create_u32("prot_commit_batched", 0444, d_mmu_debug,</div><div class='add'>+			   &amp;mmu_stats.prot_commit_batched);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+fs_initcall(xen_mmu_debugfs);</div><div class='add'>+</div><div class='add'>+#endif	/* CONFIG_XEN_DEBUG_FS */</div><div class='head'>diff --git a/arch/x86/xen/mmu.h b/arch/x86/xen/mmu.h<br/>index 0f59bd03f9e3..98d71659da5a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/xen/mmu.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/xen/mmu.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/xen/mmu.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/xen/mmu.h</a></div><div class='hunk'>@@ -18,9 +18,6 @@ void xen_activate_mm(struct mm_struct *prev, struct mm_struct *next);</div><div class='ctx'> void xen_dup_mmap(struct mm_struct *oldmm, struct mm_struct *mm);</div><div class='ctx'> void xen_exit_mmap(struct mm_struct *mm);</div><div class='ctx'> </div><div class='del'>-void xen_pgd_pin(pgd_t *pgd);</div><div class='del'>-//void xen_pgd_unpin(pgd_t *pgd);</div><div class='del'>-</div><div class='ctx'> pteval_t xen_pte_val(pte_t);</div><div class='ctx'> pmdval_t xen_pmd_val(pmd_t);</div><div class='ctx'> pgdval_t xen_pgd_val(pgd_t);</div><div class='head'>diff --git a/arch/x86/xen/multicalls.c b/arch/x86/xen/multicalls.c<br/>index 9efd1c6c9776..8ea8a0d0b0de 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/xen/multicalls.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/xen/multicalls.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/xen/multicalls.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/xen/multicalls.c</a></div><div class='hunk'>@@ -21,16 +21,20 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/percpu.h&gt;</div><div class='ctx'> #include &lt;linux/hardirq.h&gt;</div><div class='add'>+#include &lt;linux/debugfs.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/xen/hypercall.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "multicalls.h"</div><div class='add'>+#include "debugfs.h"</div><div class='add'>+</div><div class='add'>+#define MC_BATCH	32</div><div class='ctx'> </div><div class='ctx'> #define MC_DEBUG	1</div><div class='ctx'> </div><div class='del'>-#define MC_BATCH	32</div><div class='ctx'> #define MC_ARGS		(MC_BATCH * 16)</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> struct mc_buffer {</div><div class='ctx'> 	struct multicall_entry entries[MC_BATCH];</div><div class='ctx'> #if MC_DEBUG</div><div class='hunk'>@@ -47,6 +51,76 @@ struct mc_buffer {</div><div class='ctx'> static DEFINE_PER_CPU(struct mc_buffer, mc_buffer);</div><div class='ctx'> DEFINE_PER_CPU(unsigned long, xen_mc_irq_flags);</div><div class='ctx'> </div><div class='add'>+/* flush reasons 0- slots, 1- args, 2- callbacks */</div><div class='add'>+enum flush_reasons</div><div class='add'>+{</div><div class='add'>+	FL_SLOTS,</div><div class='add'>+	FL_ARGS,</div><div class='add'>+	FL_CALLBACKS,</div><div class='add'>+</div><div class='add'>+	FL_N_REASONS</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_XEN_DEBUG_FS</div><div class='add'>+#define NHYPERCALLS	40		/* not really */</div><div class='add'>+</div><div class='add'>+static struct {</div><div class='add'>+	unsigned histo[MC_BATCH+1];</div><div class='add'>+</div><div class='add'>+	unsigned issued;</div><div class='add'>+	unsigned arg_total;</div><div class='add'>+	unsigned hypercalls;</div><div class='add'>+	unsigned histo_hypercalls[NHYPERCALLS];</div><div class='add'>+</div><div class='add'>+	unsigned flush[FL_N_REASONS];</div><div class='add'>+} mc_stats;</div><div class='add'>+</div><div class='add'>+static u8 zero_stats;</div><div class='add'>+</div><div class='add'>+static inline void check_zero(void)</div><div class='add'>+{</div><div class='add'>+	if (unlikely(zero_stats)) {</div><div class='add'>+		memset(&amp;mc_stats, 0, sizeof(mc_stats));</div><div class='add'>+		zero_stats = 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mc_add_stats(const struct mc_buffer *mc)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	check_zero();</div><div class='add'>+</div><div class='add'>+	mc_stats.issued++;</div><div class='add'>+	mc_stats.hypercalls += mc-&gt;mcidx;</div><div class='add'>+	mc_stats.arg_total += mc-&gt;argidx;</div><div class='add'>+</div><div class='add'>+	mc_stats.histo[mc-&gt;mcidx]++;</div><div class='add'>+	for(i = 0; i &lt; mc-&gt;mcidx; i++) {</div><div class='add'>+		unsigned op = mc-&gt;entries[i].op;</div><div class='add'>+		if (op &lt; NHYPERCALLS)</div><div class='add'>+			mc_stats.histo_hypercalls[op]++;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mc_stats_flush(enum flush_reasons idx)</div><div class='add'>+{</div><div class='add'>+	check_zero();</div><div class='add'>+</div><div class='add'>+	mc_stats.flush[idx]++;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else  /* !CONFIG_XEN_DEBUG_FS */</div><div class='add'>+</div><div class='add'>+static inline void mc_add_stats(const struct mc_buffer *mc)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void mc_stats_flush(enum flush_reasons idx)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif	/* CONFIG_XEN_DEBUG_FS */</div><div class='add'>+</div><div class='ctx'> void xen_mc_flush(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct mc_buffer *b = &amp;__get_cpu_var(mc_buffer);</div><div class='hunk'>@@ -60,6 +134,8 @@ void xen_mc_flush(void)</div><div class='ctx'> 	   something in the middle */</div><div class='ctx'> 	local_irq_save(flags);</div><div class='ctx'> </div><div class='add'>+	mc_add_stats(b);</div><div class='add'>+</div><div class='ctx'> 	if (b-&gt;mcidx) {</div><div class='ctx'> #if MC_DEBUG</div><div class='ctx'> 		memcpy(b-&gt;debug, b-&gt;entries,</div><div class='hunk'>@@ -115,6 +191,7 @@ struct multicall_space __xen_mc_entry(size_t args)</div><div class='ctx'> </div><div class='ctx'> 	if (b-&gt;mcidx == MC_BATCH ||</div><div class='ctx'> 	    (argidx + args) &gt; MC_ARGS) {</div><div class='add'>+		mc_stats_flush(b-&gt;mcidx == MC_BATCH ? FL_SLOTS : FL_ARGS);</div><div class='ctx'> 		xen_mc_flush();</div><div class='ctx'> 		argidx = roundup(b-&gt;argidx, sizeof(u64));</div><div class='ctx'> 	}</div><div class='hunk'>@@ -158,10 +235,44 @@ void xen_mc_callback(void (*fn)(void *), void *data)</div><div class='ctx'> 	struct mc_buffer *b = &amp;__get_cpu_var(mc_buffer);</div><div class='ctx'> 	struct callback *cb;</div><div class='ctx'> </div><div class='del'>-	if (b-&gt;cbidx == MC_BATCH)</div><div class='add'>+	if (b-&gt;cbidx == MC_BATCH) {</div><div class='add'>+		mc_stats_flush(FL_CALLBACKS);</div><div class='ctx'> 		xen_mc_flush();</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	cb = &amp;b-&gt;callbacks[b-&gt;cbidx++];</div><div class='ctx'> 	cb-&gt;fn = fn;</div><div class='ctx'> 	cb-&gt;data = data;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_XEN_DEBUG_FS</div><div class='add'>+</div><div class='add'>+static struct dentry *d_mc_debug;</div><div class='add'>+</div><div class='add'>+static int __init xen_mc_debugfs(void)</div><div class='add'>+{</div><div class='add'>+	struct dentry *d_xen = xen_init_debugfs();</div><div class='add'>+</div><div class='add'>+	if (d_xen == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	d_mc_debug = debugfs_create_dir("multicalls", d_xen);</div><div class='add'>+</div><div class='add'>+	debugfs_create_u8("zero_stats", 0644, d_mc_debug, &amp;zero_stats);</div><div class='add'>+</div><div class='add'>+	debugfs_create_u32("batches", 0444, d_mc_debug, &amp;mc_stats.issued);</div><div class='add'>+	debugfs_create_u32("hypercalls", 0444, d_mc_debug, &amp;mc_stats.hypercalls);</div><div class='add'>+	debugfs_create_u32("arg_total", 0444, d_mc_debug, &amp;mc_stats.arg_total);</div><div class='add'>+</div><div class='add'>+	xen_debugfs_create_u32_array("batch_histo", 0444, d_mc_debug,</div><div class='add'>+				     mc_stats.histo, MC_BATCH);</div><div class='add'>+	xen_debugfs_create_u32_array("hypercall_histo", 0444, d_mc_debug,</div><div class='add'>+				     mc_stats.histo_hypercalls, NHYPERCALLS);</div><div class='add'>+	xen_debugfs_create_u32_array("flush_reasons", 0444, d_mc_debug,</div><div class='add'>+				     mc_stats.flush, FL_N_REASONS);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+fs_initcall(xen_mc_debugfs);</div><div class='add'>+</div><div class='add'>+#endif	/* CONFIG_XEN_DEBUG_FS */</div><div class='head'>diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c<br/>index d8faf79a0a1d..d77da613b1d2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/xen/smp.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/xen/smp.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/xen/smp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/xen/smp.c</a></div><div class='hunk'>@@ -11,11 +11,8 @@</div><div class='ctx'>  * useful topology information for the kernel to make use of.  As a</div><div class='ctx'>  * result, all CPUs are treated as if they're single-core and</div><div class='ctx'>  * single-threaded.</div><div class='del'>- *</div><div class='del'>- * This does not handle HOTPLUG_CPU yet.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/kernel_stat.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -36,8 +33,6 @@</div><div class='ctx'> #include "xen-ops.h"</div><div class='ctx'> #include "mmu.h"</div><div class='ctx'> </div><div class='del'>-static void __cpuinit xen_init_lock_cpu(int cpu);</div><div class='del'>-</div><div class='ctx'> cpumask_t xen_cpu_initialized_map;</div><div class='ctx'> </div><div class='ctx'> static DEFINE_PER_CPU(int, resched_irq);</div><div class='hunk'>@@ -64,11 +59,12 @@ static irqreturn_t xen_reschedule_interrupt(int irq, void *dev_id)</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static __cpuinit void cpu_bringup_and_idle(void)</div><div class='add'>+static __cpuinit void cpu_bringup(void)</div><div class='ctx'> {</div><div class='ctx'> 	int cpu = smp_processor_id();</div><div class='ctx'> </div><div class='ctx'> 	cpu_init();</div><div class='add'>+	touch_softlockup_watchdog();</div><div class='ctx'> 	preempt_disable();</div><div class='ctx'> </div><div class='ctx'> 	xen_enable_sysenter();</div><div class='hunk'>@@ -89,6 +85,11 @@ static __cpuinit void cpu_bringup_and_idle(void)</div><div class='ctx'> 	local_irq_enable();</div><div class='ctx'> </div><div class='ctx'> 	wmb();			/* make sure everything is out */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __cpuinit void cpu_bringup_and_idle(void)</div><div class='add'>+{</div><div class='add'>+	cpu_bringup();</div><div class='ctx'> 	cpu_idle();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -212,8 +213,6 @@ static void __init xen_smp_prepare_cpus(unsigned int max_cpus)</div><div class='ctx'> </div><div class='ctx'> 		cpu_set(cpu, cpu_present_map);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	//init_xenbus_allowed_cpumask();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static __cpuinit int</div><div class='hunk'>@@ -281,12 +280,6 @@ static int __cpuinit xen_cpu_up(unsigned int cpu)</div><div class='ctx'> 	struct task_struct *idle = idle_task(cpu);</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-#if 0</div><div class='del'>-	rc = cpu_up_check(cpu);</div><div class='del'>-	if (rc)</div><div class='del'>-		return rc;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_X86_64</div><div class='ctx'> 	/* Allocate node local memory for AP pdas */</div><div class='ctx'> 	WARN_ON(cpu == 0);</div><div class='hunk'>@@ -339,6 +332,60 @@ static void xen_smp_cpus_done(unsigned int max_cpus)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_HOTPLUG_CPU</div><div class='add'>+static int xen_cpu_disable(void)</div><div class='add'>+{</div><div class='add'>+	unsigned int cpu = smp_processor_id();</div><div class='add'>+	if (cpu == 0)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	cpu_disable_common();</div><div class='add'>+</div><div class='add'>+	load_cr3(swapper_pg_dir);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void xen_cpu_die(unsigned int cpu)</div><div class='add'>+{</div><div class='add'>+	while (HYPERVISOR_vcpu_op(VCPUOP_is_up, cpu, NULL)) {</div><div class='add'>+		current-&gt;state = TASK_UNINTERRUPTIBLE;</div><div class='add'>+		schedule_timeout(HZ/10);</div><div class='add'>+	}</div><div class='add'>+	unbind_from_irqhandler(per_cpu(resched_irq, cpu), NULL);</div><div class='add'>+	unbind_from_irqhandler(per_cpu(callfunc_irq, cpu), NULL);</div><div class='add'>+	unbind_from_irqhandler(per_cpu(debug_irq, cpu), NULL);</div><div class='add'>+	unbind_from_irqhandler(per_cpu(callfuncsingle_irq, cpu), NULL);</div><div class='add'>+	xen_uninit_lock_cpu(cpu);</div><div class='add'>+	xen_teardown_timer(cpu);</div><div class='add'>+</div><div class='add'>+	if (num_online_cpus() == 1)</div><div class='add'>+		alternatives_smp_switch(0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void xen_play_dead(void)</div><div class='add'>+{</div><div class='add'>+	play_dead_common();</div><div class='add'>+	HYPERVISOR_vcpu_op(VCPUOP_down, smp_processor_id(), NULL);</div><div class='add'>+	cpu_bringup();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else /* !CONFIG_HOTPLUG_CPU */</div><div class='add'>+static int xen_cpu_disable(void)</div><div class='add'>+{</div><div class='add'>+	return -ENOSYS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void xen_cpu_die(unsigned int cpu)</div><div class='add'>+{</div><div class='add'>+	BUG();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void xen_play_dead(void)</div><div class='add'>+{</div><div class='add'>+	BUG();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='ctx'> static void stop_self(void *v)</div><div class='ctx'> {</div><div class='ctx'> 	int cpu = smp_processor_id();</div><div class='hunk'>@@ -419,176 +466,16 @@ static irqreturn_t xen_call_function_single_interrupt(int irq, void *dev_id)</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct xen_spinlock {</div><div class='del'>-	unsigned char lock;		/* 0 -&gt; free; 1 -&gt; locked */</div><div class='del'>-	unsigned short spinners;	/* count of waiting cpus */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int xen_spin_is_locked(struct raw_spinlock *lock)</div><div class='del'>-{</div><div class='del'>-	struct xen_spinlock *xl = (struct xen_spinlock *)lock;</div><div class='del'>-</div><div class='del'>-	return xl-&gt;lock != 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int xen_spin_is_contended(struct raw_spinlock *lock)</div><div class='del'>-{</div><div class='del'>-	struct xen_spinlock *xl = (struct xen_spinlock *)lock;</div><div class='del'>-</div><div class='del'>-	/* Not strictly true; this is only the count of contended</div><div class='del'>-	   lock-takers entering the slow path. */</div><div class='del'>-	return xl-&gt;spinners != 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int xen_spin_trylock(struct raw_spinlock *lock)</div><div class='del'>-{</div><div class='del'>-	struct xen_spinlock *xl = (struct xen_spinlock *)lock;</div><div class='del'>-	u8 old = 1;</div><div class='del'>-</div><div class='del'>-	asm("xchgb %b0,%1"</div><div class='del'>-	    : "+q" (old), "+m" (xl-&gt;lock) : : "memory");</div><div class='del'>-</div><div class='del'>-	return old == 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static DEFINE_PER_CPU(int, lock_kicker_irq) = -1;</div><div class='del'>-static DEFINE_PER_CPU(struct xen_spinlock *, lock_spinners);</div><div class='del'>-</div><div class='del'>-static inline void spinning_lock(struct xen_spinlock *xl)</div><div class='del'>-{</div><div class='del'>-	__get_cpu_var(lock_spinners) = xl;</div><div class='del'>-	wmb();			/* set lock of interest before count */</div><div class='del'>-	asm(LOCK_PREFIX " incw %0"</div><div class='del'>-	    : "+m" (xl-&gt;spinners) : : "memory");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void unspinning_lock(struct xen_spinlock *xl)</div><div class='del'>-{</div><div class='del'>-	asm(LOCK_PREFIX " decw %0"</div><div class='del'>-	    : "+m" (xl-&gt;spinners) : : "memory");</div><div class='del'>-	wmb();			/* decrement count before clearing lock */</div><div class='del'>-	__get_cpu_var(lock_spinners) = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static noinline int xen_spin_lock_slow(struct raw_spinlock *lock)</div><div class='del'>-{</div><div class='del'>-	struct xen_spinlock *xl = (struct xen_spinlock *)lock;</div><div class='del'>-	int irq = __get_cpu_var(lock_kicker_irq);</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	/* If kicker interrupts not initialized yet, just spin */</div><div class='del'>-	if (irq == -1)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* announce we're spinning */</div><div class='del'>-	spinning_lock(xl);</div><div class='del'>-</div><div class='del'>-	/* clear pending */</div><div class='del'>-	xen_clear_irq_pending(irq);</div><div class='del'>-</div><div class='del'>-	/* check again make sure it didn't become free while</div><div class='del'>-	   we weren't looking  */</div><div class='del'>-	ret = xen_spin_trylock(lock);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	/* block until irq becomes pending */</div><div class='del'>-	xen_poll_irq(irq);</div><div class='del'>-	kstat_this_cpu.irqs[irq]++;</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	unspinning_lock(xl);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void xen_spin_lock(struct raw_spinlock *lock)</div><div class='del'>-{</div><div class='del'>-	struct xen_spinlock *xl = (struct xen_spinlock *)lock;</div><div class='del'>-	int timeout;</div><div class='del'>-	u8 oldval;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		timeout = 1 &lt;&lt; 10;</div><div class='del'>-</div><div class='del'>-		asm("1: xchgb %1,%0\n"</div><div class='del'>-		    "   testb %1,%1\n"</div><div class='del'>-		    "   jz 3f\n"</div><div class='del'>-		    "2: rep;nop\n"</div><div class='del'>-		    "   cmpb $0,%0\n"</div><div class='del'>-		    "   je 1b\n"</div><div class='del'>-		    "   dec %2\n"</div><div class='del'>-		    "   jnz 2b\n"</div><div class='del'>-		    "3:\n"</div><div class='del'>-		    : "+m" (xl-&gt;lock), "=q" (oldval), "+r" (timeout)</div><div class='del'>-		    : "1" (1)</div><div class='del'>-		    : "memory");</div><div class='del'>-</div><div class='del'>-	} while (unlikely(oldval != 0 &amp;&amp; !xen_spin_lock_slow(lock)));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static noinline void xen_spin_unlock_slow(struct xen_spinlock *xl)</div><div class='del'>-{</div><div class='del'>-	int cpu;</div><div class='del'>-</div><div class='del'>-	for_each_online_cpu(cpu) {</div><div class='del'>-		/* XXX should mix up next cpu selection */</div><div class='del'>-		if (per_cpu(lock_spinners, cpu) == xl) {</div><div class='del'>-			xen_send_IPI_one(cpu, XEN_SPIN_UNLOCK_VECTOR);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void xen_spin_unlock(struct raw_spinlock *lock)</div><div class='del'>-{</div><div class='del'>-	struct xen_spinlock *xl = (struct xen_spinlock *)lock;</div><div class='del'>-</div><div class='del'>-	smp_wmb();		/* make sure no writes get moved after unlock */</div><div class='del'>-	xl-&gt;lock = 0;		/* release lock */</div><div class='del'>-</div><div class='del'>-	/* make sure unlock happens before kick */</div><div class='del'>-	barrier();</div><div class='del'>-</div><div class='del'>-	if (unlikely(xl-&gt;spinners))</div><div class='del'>-		xen_spin_unlock_slow(xl);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static __cpuinit void xen_init_lock_cpu(int cpu)</div><div class='del'>-{</div><div class='del'>-	int irq;</div><div class='del'>-	const char *name;</div><div class='del'>-</div><div class='del'>-	name = kasprintf(GFP_KERNEL, "spinlock%d", cpu);</div><div class='del'>-	irq = bind_ipi_to_irqhandler(XEN_SPIN_UNLOCK_VECTOR,</div><div class='del'>-				     cpu,</div><div class='del'>-				     xen_reschedule_interrupt,</div><div class='del'>-				     IRQF_DISABLED|IRQF_PERCPU|IRQF_NOBALANCING,</div><div class='del'>-				     name,</div><div class='del'>-				     NULL);</div><div class='del'>-</div><div class='del'>-	if (irq &gt;= 0) {</div><div class='del'>-		disable_irq(irq); /* make sure it's never delivered */</div><div class='del'>-		per_cpu(lock_kicker_irq, cpu) = irq;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printk("cpu %d spinlock event irq %d\n", cpu, irq);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __init xen_init_spinlocks(void)</div><div class='del'>-{</div><div class='del'>-	pv_lock_ops.spin_is_locked = xen_spin_is_locked;</div><div class='del'>-	pv_lock_ops.spin_is_contended = xen_spin_is_contended;</div><div class='del'>-	pv_lock_ops.spin_lock = xen_spin_lock;</div><div class='del'>-	pv_lock_ops.spin_trylock = xen_spin_trylock;</div><div class='del'>-	pv_lock_ops.spin_unlock = xen_spin_unlock;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static const struct smp_ops xen_smp_ops __initdata = {</div><div class='ctx'> 	.smp_prepare_boot_cpu = xen_smp_prepare_boot_cpu,</div><div class='ctx'> 	.smp_prepare_cpus = xen_smp_prepare_cpus,</div><div class='del'>-	.cpu_up = xen_cpu_up,</div><div class='ctx'> 	.smp_cpus_done = xen_smp_cpus_done,</div><div class='ctx'> </div><div class='add'>+	.cpu_up = xen_cpu_up,</div><div class='add'>+	.cpu_die = xen_cpu_die,</div><div class='add'>+	.cpu_disable = xen_cpu_disable,</div><div class='add'>+	.play_dead = xen_play_dead,</div><div class='add'>+</div><div class='ctx'> 	.smp_send_stop = xen_smp_send_stop,</div><div class='ctx'> 	.smp_send_reschedule = xen_smp_send_reschedule,</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/xen/spinlock.c b/arch/x86/xen/spinlock.c<br/>new file mode 100644<br/>index 000000000000..dd71e3a021cd<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/xen/spinlock.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/xen/spinlock.c</a></div><div class='hunk'>@@ -0,0 +1,428 @@</div><div class='add'>+/*</div><div class='add'>+ * Split spinlock implementation out into its own file, so it can be</div><div class='add'>+ * compiled in a FTRACE-compatible way.</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/kernel_stat.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/debugfs.h&gt;</div><div class='add'>+#include &lt;linux/log2.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/paravirt.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;xen/interface/xen.h&gt;</div><div class='add'>+#include &lt;xen/events.h&gt;</div><div class='add'>+</div><div class='add'>+#include "xen-ops.h"</div><div class='add'>+#include "debugfs.h"</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_XEN_DEBUG_FS</div><div class='add'>+static struct xen_spinlock_stats</div><div class='add'>+{</div><div class='add'>+	u64 taken;</div><div class='add'>+	u32 taken_slow;</div><div class='add'>+	u32 taken_slow_nested;</div><div class='add'>+	u32 taken_slow_pickup;</div><div class='add'>+	u32 taken_slow_spurious;</div><div class='add'>+	u32 taken_slow_irqenable;</div><div class='add'>+</div><div class='add'>+	u64 released;</div><div class='add'>+	u32 released_slow;</div><div class='add'>+	u32 released_slow_kicked;</div><div class='add'>+</div><div class='add'>+#define HISTO_BUCKETS	30</div><div class='add'>+	u32 histo_spin_total[HISTO_BUCKETS+1];</div><div class='add'>+	u32 histo_spin_spinning[HISTO_BUCKETS+1];</div><div class='add'>+	u32 histo_spin_blocked[HISTO_BUCKETS+1];</div><div class='add'>+</div><div class='add'>+	u64 time_total;</div><div class='add'>+	u64 time_spinning;</div><div class='add'>+	u64 time_blocked;</div><div class='add'>+} spinlock_stats;</div><div class='add'>+</div><div class='add'>+static u8 zero_stats;</div><div class='add'>+</div><div class='add'>+static unsigned lock_timeout = 1 &lt;&lt; 10;</div><div class='add'>+#define TIMEOUT lock_timeout</div><div class='add'>+</div><div class='add'>+static inline void check_zero(void)</div><div class='add'>+{</div><div class='add'>+	if (unlikely(zero_stats)) {</div><div class='add'>+		memset(&amp;spinlock_stats, 0, sizeof(spinlock_stats));</div><div class='add'>+		zero_stats = 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define ADD_STATS(elem, val)			\</div><div class='add'>+	do { check_zero(); spinlock_stats.elem += (val); } while(0)</div><div class='add'>+</div><div class='add'>+static inline u64 spin_time_start(void)</div><div class='add'>+{</div><div class='add'>+	return xen_clocksource_read();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __spin_time_accum(u64 delta, u32 *array)</div><div class='add'>+{</div><div class='add'>+	unsigned index = ilog2(delta);</div><div class='add'>+</div><div class='add'>+	check_zero();</div><div class='add'>+</div><div class='add'>+	if (index &lt; HISTO_BUCKETS)</div><div class='add'>+		array[index]++;</div><div class='add'>+	else</div><div class='add'>+		array[HISTO_BUCKETS]++;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void spin_time_accum_spinning(u64 start)</div><div class='add'>+{</div><div class='add'>+	u32 delta = xen_clocksource_read() - start;</div><div class='add'>+</div><div class='add'>+	__spin_time_accum(delta, spinlock_stats.histo_spin_spinning);</div><div class='add'>+	spinlock_stats.time_spinning += delta;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void spin_time_accum_total(u64 start)</div><div class='add'>+{</div><div class='add'>+	u32 delta = xen_clocksource_read() - start;</div><div class='add'>+</div><div class='add'>+	__spin_time_accum(delta, spinlock_stats.histo_spin_total);</div><div class='add'>+	spinlock_stats.time_total += delta;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void spin_time_accum_blocked(u64 start)</div><div class='add'>+{</div><div class='add'>+	u32 delta = xen_clocksource_read() - start;</div><div class='add'>+</div><div class='add'>+	__spin_time_accum(delta, spinlock_stats.histo_spin_blocked);</div><div class='add'>+	spinlock_stats.time_blocked += delta;</div><div class='add'>+}</div><div class='add'>+#else  /* !CONFIG_XEN_DEBUG_FS */</div><div class='add'>+#define TIMEOUT			(1 &lt;&lt; 10)</div><div class='add'>+#define ADD_STATS(elem, val)	do { (void)(val); } while(0)</div><div class='add'>+</div><div class='add'>+static inline u64 spin_time_start(void)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void spin_time_accum_total(u64 start)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+static inline void spin_time_accum_spinning(u64 start)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+static inline void spin_time_accum_blocked(u64 start)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif  /* CONFIG_XEN_DEBUG_FS */</div><div class='add'>+</div><div class='add'>+struct xen_spinlock {</div><div class='add'>+	unsigned char lock;		/* 0 -&gt; free; 1 -&gt; locked */</div><div class='add'>+	unsigned short spinners;	/* count of waiting cpus */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int xen_spin_is_locked(struct raw_spinlock *lock)</div><div class='add'>+{</div><div class='add'>+	struct xen_spinlock *xl = (struct xen_spinlock *)lock;</div><div class='add'>+</div><div class='add'>+	return xl-&gt;lock != 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int xen_spin_is_contended(struct raw_spinlock *lock)</div><div class='add'>+{</div><div class='add'>+	struct xen_spinlock *xl = (struct xen_spinlock *)lock;</div><div class='add'>+</div><div class='add'>+	/* Not strictly true; this is only the count of contended</div><div class='add'>+	   lock-takers entering the slow path. */</div><div class='add'>+	return xl-&gt;spinners != 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int xen_spin_trylock(struct raw_spinlock *lock)</div><div class='add'>+{</div><div class='add'>+	struct xen_spinlock *xl = (struct xen_spinlock *)lock;</div><div class='add'>+	u8 old = 1;</div><div class='add'>+</div><div class='add'>+	asm("xchgb %b0,%1"</div><div class='add'>+	    : "+q" (old), "+m" (xl-&gt;lock) : : "memory");</div><div class='add'>+</div><div class='add'>+	return old == 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static DEFINE_PER_CPU(int, lock_kicker_irq) = -1;</div><div class='add'>+static DEFINE_PER_CPU(struct xen_spinlock *, lock_spinners);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Mark a cpu as interested in a lock.  Returns the CPU's previous</div><div class='add'>+ * lock of interest, in case we got preempted by an interrupt.</div><div class='add'>+ */</div><div class='add'>+static inline struct xen_spinlock *spinning_lock(struct xen_spinlock *xl)</div><div class='add'>+{</div><div class='add'>+	struct xen_spinlock *prev;</div><div class='add'>+</div><div class='add'>+	prev = __get_cpu_var(lock_spinners);</div><div class='add'>+	__get_cpu_var(lock_spinners) = xl;</div><div class='add'>+</div><div class='add'>+	wmb();			/* set lock of interest before count */</div><div class='add'>+</div><div class='add'>+	asm(LOCK_PREFIX " incw %0"</div><div class='add'>+	    : "+m" (xl-&gt;spinners) : : "memory");</div><div class='add'>+</div><div class='add'>+	return prev;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Mark a cpu as no longer interested in a lock.  Restores previous</div><div class='add'>+ * lock of interest (NULL for none).</div><div class='add'>+ */</div><div class='add'>+static inline void unspinning_lock(struct xen_spinlock *xl, struct xen_spinlock *prev)</div><div class='add'>+{</div><div class='add'>+	asm(LOCK_PREFIX " decw %0"</div><div class='add'>+	    : "+m" (xl-&gt;spinners) : : "memory");</div><div class='add'>+	wmb();			/* decrement count before restoring lock */</div><div class='add'>+	__get_cpu_var(lock_spinners) = prev;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static noinline int xen_spin_lock_slow(struct raw_spinlock *lock, bool irq_enable)</div><div class='add'>+{</div><div class='add'>+	struct xen_spinlock *xl = (struct xen_spinlock *)lock;</div><div class='add'>+	struct xen_spinlock *prev;</div><div class='add'>+	int irq = __get_cpu_var(lock_kicker_irq);</div><div class='add'>+	int ret;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u64 start;</div><div class='add'>+</div><div class='add'>+	/* If kicker interrupts not initialized yet, just spin */</div><div class='add'>+	if (irq == -1)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	start = spin_time_start();</div><div class='add'>+</div><div class='add'>+	/* announce we're spinning */</div><div class='add'>+	prev = spinning_lock(xl);</div><div class='add'>+</div><div class='add'>+	flags = __raw_local_save_flags();</div><div class='add'>+	if (irq_enable) {</div><div class='add'>+		ADD_STATS(taken_slow_irqenable, 1);</div><div class='add'>+		raw_local_irq_enable();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ADD_STATS(taken_slow, 1);</div><div class='add'>+	ADD_STATS(taken_slow_nested, prev != NULL);</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		/* clear pending */</div><div class='add'>+		xen_clear_irq_pending(irq);</div><div class='add'>+</div><div class='add'>+		/* check again make sure it didn't become free while</div><div class='add'>+		   we weren't looking  */</div><div class='add'>+		ret = xen_spin_trylock(lock);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ADD_STATS(taken_slow_pickup, 1);</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * If we interrupted another spinlock while it</div><div class='add'>+			 * was blocking, make sure it doesn't block</div><div class='add'>+			 * without rechecking the lock.</div><div class='add'>+			 */</div><div class='add'>+			if (prev != NULL)</div><div class='add'>+				xen_set_irq_pending(irq);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Block until irq becomes pending.  If we're</div><div class='add'>+		 * interrupted at this point (after the trylock but</div><div class='add'>+		 * before entering the block), then the nested lock</div><div class='add'>+		 * handler guarantees that the irq will be left</div><div class='add'>+		 * pending if there's any chance the lock became free;</div><div class='add'>+		 * xen_poll_irq() returns immediately if the irq is</div><div class='add'>+		 * pending.</div><div class='add'>+		 */</div><div class='add'>+		xen_poll_irq(irq);</div><div class='add'>+		ADD_STATS(taken_slow_spurious, !xen_test_irq_pending(irq));</div><div class='add'>+	} while (!xen_test_irq_pending(irq)); /* check for spurious wakeups */</div><div class='add'>+</div><div class='add'>+	kstat_this_cpu.irqs[irq]++;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	raw_local_irq_restore(flags);</div><div class='add'>+	unspinning_lock(xl, prev);</div><div class='add'>+	spin_time_accum_blocked(start);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void __xen_spin_lock(struct raw_spinlock *lock, bool irq_enable)</div><div class='add'>+{</div><div class='add'>+	struct xen_spinlock *xl = (struct xen_spinlock *)lock;</div><div class='add'>+	unsigned timeout;</div><div class='add'>+	u8 oldval;</div><div class='add'>+	u64 start_spin;</div><div class='add'>+</div><div class='add'>+	ADD_STATS(taken, 1);</div><div class='add'>+</div><div class='add'>+	start_spin = spin_time_start();</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		u64 start_spin_fast = spin_time_start();</div><div class='add'>+</div><div class='add'>+		timeout = TIMEOUT;</div><div class='add'>+</div><div class='add'>+		asm("1: xchgb %1,%0\n"</div><div class='add'>+		    "   testb %1,%1\n"</div><div class='add'>+		    "   jz 3f\n"</div><div class='add'>+		    "2: rep;nop\n"</div><div class='add'>+		    "   cmpb $0,%0\n"</div><div class='add'>+		    "   je 1b\n"</div><div class='add'>+		    "   dec %2\n"</div><div class='add'>+		    "   jnz 2b\n"</div><div class='add'>+		    "3:\n"</div><div class='add'>+		    : "+m" (xl-&gt;lock), "=q" (oldval), "+r" (timeout)</div><div class='add'>+		    : "1" (1)</div><div class='add'>+		    : "memory");</div><div class='add'>+</div><div class='add'>+		spin_time_accum_spinning(start_spin_fast);</div><div class='add'>+</div><div class='add'>+	} while (unlikely(oldval != 0 &amp;&amp;</div><div class='add'>+			  (TIMEOUT == ~0 || !xen_spin_lock_slow(lock, irq_enable))));</div><div class='add'>+</div><div class='add'>+	spin_time_accum_total(start_spin);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void xen_spin_lock(struct raw_spinlock *lock)</div><div class='add'>+{</div><div class='add'>+	__xen_spin_lock(lock, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void xen_spin_lock_flags(struct raw_spinlock *lock, unsigned long flags)</div><div class='add'>+{</div><div class='add'>+	__xen_spin_lock(lock, !raw_irqs_disabled_flags(flags));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static noinline void xen_spin_unlock_slow(struct xen_spinlock *xl)</div><div class='add'>+{</div><div class='add'>+	int cpu;</div><div class='add'>+</div><div class='add'>+	ADD_STATS(released_slow, 1);</div><div class='add'>+</div><div class='add'>+	for_each_online_cpu(cpu) {</div><div class='add'>+		/* XXX should mix up next cpu selection */</div><div class='add'>+		if (per_cpu(lock_spinners, cpu) == xl) {</div><div class='add'>+			ADD_STATS(released_slow_kicked, 1);</div><div class='add'>+			xen_send_IPI_one(cpu, XEN_SPIN_UNLOCK_VECTOR);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void xen_spin_unlock(struct raw_spinlock *lock)</div><div class='add'>+{</div><div class='add'>+	struct xen_spinlock *xl = (struct xen_spinlock *)lock;</div><div class='add'>+</div><div class='add'>+	ADD_STATS(released, 1);</div><div class='add'>+</div><div class='add'>+	smp_wmb();		/* make sure no writes get moved after unlock */</div><div class='add'>+	xl-&gt;lock = 0;		/* release lock */</div><div class='add'>+</div><div class='add'>+	/* make sure unlock happens before kick */</div><div class='add'>+	barrier();</div><div class='add'>+</div><div class='add'>+	if (unlikely(xl-&gt;spinners))</div><div class='add'>+		xen_spin_unlock_slow(xl);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t dummy_handler(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	BUG();</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __cpuinit xen_init_lock_cpu(int cpu)</div><div class='add'>+{</div><div class='add'>+	int irq;</div><div class='add'>+	const char *name;</div><div class='add'>+</div><div class='add'>+	name = kasprintf(GFP_KERNEL, "spinlock%d", cpu);</div><div class='add'>+	irq = bind_ipi_to_irqhandler(XEN_SPIN_UNLOCK_VECTOR,</div><div class='add'>+				     cpu,</div><div class='add'>+				     dummy_handler,</div><div class='add'>+				     IRQF_DISABLED|IRQF_PERCPU|IRQF_NOBALANCING,</div><div class='add'>+				     name,</div><div class='add'>+				     NULL);</div><div class='add'>+</div><div class='add'>+	if (irq &gt;= 0) {</div><div class='add'>+		disable_irq(irq); /* make sure it's never delivered */</div><div class='add'>+		per_cpu(lock_kicker_irq, cpu) = irq;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	printk("cpu %d spinlock event irq %d\n", cpu, irq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void xen_uninit_lock_cpu(int cpu)</div><div class='add'>+{</div><div class='add'>+	unbind_from_irqhandler(per_cpu(lock_kicker_irq, cpu), NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init xen_init_spinlocks(void)</div><div class='add'>+{</div><div class='add'>+	pv_lock_ops.spin_is_locked = xen_spin_is_locked;</div><div class='add'>+	pv_lock_ops.spin_is_contended = xen_spin_is_contended;</div><div class='add'>+	pv_lock_ops.spin_lock = xen_spin_lock;</div><div class='add'>+	pv_lock_ops.spin_lock_flags = xen_spin_lock_flags;</div><div class='add'>+	pv_lock_ops.spin_trylock = xen_spin_trylock;</div><div class='add'>+	pv_lock_ops.spin_unlock = xen_spin_unlock;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_XEN_DEBUG_FS</div><div class='add'>+</div><div class='add'>+static struct dentry *d_spin_debug;</div><div class='add'>+</div><div class='add'>+static int __init xen_spinlock_debugfs(void)</div><div class='add'>+{</div><div class='add'>+	struct dentry *d_xen = xen_init_debugfs();</div><div class='add'>+</div><div class='add'>+	if (d_xen == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	d_spin_debug = debugfs_create_dir("spinlocks", d_xen);</div><div class='add'>+</div><div class='add'>+	debugfs_create_u8("zero_stats", 0644, d_spin_debug, &amp;zero_stats);</div><div class='add'>+</div><div class='add'>+	debugfs_create_u32("timeout", 0644, d_spin_debug, &amp;lock_timeout);</div><div class='add'>+</div><div class='add'>+	debugfs_create_u64("taken", 0444, d_spin_debug, &amp;spinlock_stats.taken);</div><div class='add'>+	debugfs_create_u32("taken_slow", 0444, d_spin_debug,</div><div class='add'>+			   &amp;spinlock_stats.taken_slow);</div><div class='add'>+	debugfs_create_u32("taken_slow_nested", 0444, d_spin_debug,</div><div class='add'>+			   &amp;spinlock_stats.taken_slow_nested);</div><div class='add'>+	debugfs_create_u32("taken_slow_pickup", 0444, d_spin_debug,</div><div class='add'>+			   &amp;spinlock_stats.taken_slow_pickup);</div><div class='add'>+	debugfs_create_u32("taken_slow_spurious", 0444, d_spin_debug,</div><div class='add'>+			   &amp;spinlock_stats.taken_slow_spurious);</div><div class='add'>+	debugfs_create_u32("taken_slow_irqenable", 0444, d_spin_debug,</div><div class='add'>+			   &amp;spinlock_stats.taken_slow_irqenable);</div><div class='add'>+</div><div class='add'>+	debugfs_create_u64("released", 0444, d_spin_debug, &amp;spinlock_stats.released);</div><div class='add'>+	debugfs_create_u32("released_slow", 0444, d_spin_debug,</div><div class='add'>+			   &amp;spinlock_stats.released_slow);</div><div class='add'>+	debugfs_create_u32("released_slow_kicked", 0444, d_spin_debug,</div><div class='add'>+			   &amp;spinlock_stats.released_slow_kicked);</div><div class='add'>+</div><div class='add'>+	debugfs_create_u64("time_spinning", 0444, d_spin_debug,</div><div class='add'>+			   &amp;spinlock_stats.time_spinning);</div><div class='add'>+	debugfs_create_u64("time_blocked", 0444, d_spin_debug,</div><div class='add'>+			   &amp;spinlock_stats.time_blocked);</div><div class='add'>+	debugfs_create_u64("time_total", 0444, d_spin_debug,</div><div class='add'>+			   &amp;spinlock_stats.time_total);</div><div class='add'>+</div><div class='add'>+	xen_debugfs_create_u32_array("histo_total", 0444, d_spin_debug,</div><div class='add'>+				     spinlock_stats.histo_spin_total, HISTO_BUCKETS + 1);</div><div class='add'>+	xen_debugfs_create_u32_array("histo_spinning", 0444, d_spin_debug,</div><div class='add'>+				     spinlock_stats.histo_spin_spinning, HISTO_BUCKETS + 1);</div><div class='add'>+	xen_debugfs_create_u32_array("histo_blocked", 0444, d_spin_debug,</div><div class='add'>+				     spinlock_stats.histo_spin_blocked, HISTO_BUCKETS + 1);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+fs_initcall(xen_spinlock_debugfs);</div><div class='add'>+</div><div class='add'>+#endif	/* CONFIG_XEN_DEBUG_FS */</div><div class='head'>diff --git a/arch/x86/xen/time.c b/arch/x86/xen/time.c<br/>index 685b77470fc3..c9f7cda48ed7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/xen/time.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/xen/time.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/xen/time.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/xen/time.c</a></div><div class='hunk'>@@ -30,8 +30,6 @@</div><div class='ctx'> #define TIMER_SLOP	100000</div><div class='ctx'> #define NS_PER_TICK	(1000000000LL / HZ)</div><div class='ctx'> </div><div class='del'>-static cycle_t xen_clocksource_read(void);</div><div class='del'>-</div><div class='ctx'> /* runstate info updated by Xen */</div><div class='ctx'> static DEFINE_PER_CPU(struct vcpu_runstate_info, runstate);</div><div class='ctx'> </div><div class='hunk'>@@ -200,20 +198,13 @@ unsigned long long xen_sched_clock(void)</div><div class='ctx'> /* Get the TSC speed from Xen */</div><div class='ctx'> unsigned long xen_tsc_khz(void)</div><div class='ctx'> {</div><div class='del'>-	u64 xen_khz = 1000000ULL &lt;&lt; 32;</div><div class='del'>-	const struct pvclock_vcpu_time_info *info =</div><div class='add'>+	struct pvclock_vcpu_time_info *info =</div><div class='ctx'> 		&amp;HYPERVISOR_shared_info-&gt;vcpu_info[0].time;</div><div class='ctx'> </div><div class='del'>-	do_div(xen_khz, info-&gt;tsc_to_system_mul);</div><div class='del'>-	if (info-&gt;tsc_shift &lt; 0)</div><div class='del'>-		xen_khz &lt;&lt;= -info-&gt;tsc_shift;</div><div class='del'>-	else</div><div class='del'>-		xen_khz &gt;&gt;= info-&gt;tsc_shift;</div><div class='del'>-</div><div class='del'>-	return xen_khz;</div><div class='add'>+	return pvclock_tsc_khz(info);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static cycle_t xen_clocksource_read(void)</div><div class='add'>+cycle_t xen_clocksource_read(void)</div><div class='ctx'> {</div><div class='ctx'>         struct pvclock_vcpu_time_info *src;</div><div class='ctx'> 	cycle_t ret;</div><div class='hunk'>@@ -452,6 +443,14 @@ void xen_setup_timer(int cpu)</div><div class='ctx'> 	setup_runstate_info(cpu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void xen_teardown_timer(int cpu)</div><div class='add'>+{</div><div class='add'>+	struct clock_event_device *evt;</div><div class='add'>+	BUG_ON(cpu == 0);</div><div class='add'>+	evt = &amp;per_cpu(xen_clock_events, cpu);</div><div class='add'>+	unbind_from_irqhandler(evt-&gt;irq, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void xen_setup_cpu_clockevents(void)</div><div class='ctx'> {</div><div class='ctx'> 	BUG_ON(preemptible());</div><div class='head'>diff --git a/arch/x86/xen/xen-asm_32.S b/arch/x86/xen/xen-asm_32.S<br/>index 2497a30f41de..42786f59d9c0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/xen/xen-asm_32.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/xen/xen-asm_32.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/xen/xen-asm_32.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/xen/xen-asm_32.S</a></div><div class='hunk'>@@ -298,7 +298,7 @@ check_events:</div><div class='ctx'> 	push %eax</div><div class='ctx'> 	push %ecx</div><div class='ctx'> 	push %edx</div><div class='del'>-	call force_evtchn_callback</div><div class='add'>+	call xen_force_evtchn_callback</div><div class='ctx'> 	pop %edx</div><div class='ctx'> 	pop %ecx</div><div class='ctx'> 	pop %eax</div><div class='head'>diff --git a/arch/x86/xen/xen-asm_64.S b/arch/x86/xen/xen-asm_64.S<br/>index 7f58304fafb3..05794c566e87 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/xen/xen-asm_64.S?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/xen/xen-asm_64.S</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/xen/xen-asm_64.S?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/xen/xen-asm_64.S</a></div><div class='hunk'>@@ -26,8 +26,15 @@</div><div class='ctx'> /* Pseudo-flag used for virtual NMI, which we don't implement yet */</div><div class='ctx'> #define XEN_EFLAGS_NMI	0x80000000</div><div class='ctx'> </div><div class='del'>-#if 0</div><div class='del'>-#include &lt;asm/percpu.h&gt;</div><div class='add'>+#if 1</div><div class='add'>+/*</div><div class='add'>+	x86-64 does not yet support direct access to percpu variables</div><div class='add'>+	via a segment override, so we just need to make sure this code</div><div class='add'>+	never gets used</div><div class='add'>+ */</div><div class='add'>+#define BUG			ud2a</div><div class='add'>+#define PER_CPU_VAR(var, off)	0xdeadbeef</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'> 	Enable events.  This clears the event mask and tests the pending</div><div class='hunk'>@@ -35,6 +42,8 @@</div><div class='ctx'> 	events, then enter the hypervisor to get them handled.</div><div class='ctx'>  */</div><div class='ctx'> ENTRY(xen_irq_enable_direct)</div><div class='add'>+	BUG</div><div class='add'>+</div><div class='ctx'> 	/* Unmask events */</div><div class='ctx'> 	movb $0, PER_CPU_VAR(xen_vcpu_info, XEN_vcpu_info_mask)</div><div class='ctx'> </div><div class='hunk'>@@ -58,6 +67,8 @@ ENDPATCH(xen_irq_enable_direct)</div><div class='ctx'> 	non-zero.</div><div class='ctx'>  */</div><div class='ctx'> ENTRY(xen_irq_disable_direct)</div><div class='add'>+	BUG</div><div class='add'>+</div><div class='ctx'> 	movb $1, PER_CPU_VAR(xen_vcpu_info, XEN_vcpu_info_mask)</div><div class='ctx'> ENDPATCH(xen_irq_disable_direct)</div><div class='ctx'> 	ret</div><div class='hunk'>@@ -74,6 +85,8 @@ ENDPATCH(xen_irq_disable_direct)</div><div class='ctx'> 	Xen and x86 use opposite senses (mask vs enable).</div><div class='ctx'>  */</div><div class='ctx'> ENTRY(xen_save_fl_direct)</div><div class='add'>+	BUG</div><div class='add'>+</div><div class='ctx'> 	testb $0xff, PER_CPU_VAR(xen_vcpu_info, XEN_vcpu_info_mask)</div><div class='ctx'> 	setz %ah</div><div class='ctx'> 	addb %ah,%ah</div><div class='hunk'>@@ -91,6 +104,8 @@ ENDPATCH(xen_save_fl_direct)</div><div class='ctx'> 	if so.</div><div class='ctx'>  */</div><div class='ctx'> ENTRY(xen_restore_fl_direct)</div><div class='add'>+	BUG</div><div class='add'>+</div><div class='ctx'> 	testb $X86_EFLAGS_IF&gt;&gt;8, %ah</div><div class='ctx'> 	setz PER_CPU_VAR(xen_vcpu_info, XEN_vcpu_info_mask)</div><div class='ctx'> 	/* Preempt here doesn't matter because that will deal with</div><div class='hunk'>@@ -122,7 +137,7 @@ check_events:</div><div class='ctx'> 	push %r9</div><div class='ctx'> 	push %r10</div><div class='ctx'> 	push %r11</div><div class='del'>-	call force_evtchn_callback</div><div class='add'>+	call xen_force_evtchn_callback</div><div class='ctx'> 	pop %r11</div><div class='ctx'> 	pop %r10</div><div class='ctx'> 	pop %r9</div><div class='hunk'>@@ -133,7 +148,6 @@ check_events:</div><div class='ctx'> 	pop %rcx</div><div class='ctx'> 	pop %rax</div><div class='ctx'> 	ret</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> ENTRY(xen_adjust_exception_frame)</div><div class='ctx'> 	mov 8+0(%rsp),%rcx</div><div class='head'>diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h<br/>index dd3c23152a2e..d7422dc2a55c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/xen/xen-ops.h?id=c15895ef30c2c03e99802951787183039a349d32'>arch/x86/xen/xen-ops.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/x86/xen/xen-ops.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/x86/xen/xen-ops.h</a></div><div class='hunk'>@@ -2,6 +2,7 @@</div><div class='ctx'> #define XEN_OPS_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/clocksource.h&gt;</div><div class='ctx'> #include &lt;linux/irqreturn.h&gt;</div><div class='ctx'> #include &lt;xen/xen-ops.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -31,7 +32,10 @@ void xen_vcpu_restore(void);</div><div class='ctx'> </div><div class='ctx'> void __init xen_build_dynamic_phys_to_machine(void);</div><div class='ctx'> </div><div class='add'>+void xen_init_irq_ops(void);</div><div class='ctx'> void xen_setup_timer(int cpu);</div><div class='add'>+void xen_teardown_timer(int cpu);</div><div class='add'>+cycle_t xen_clocksource_read(void);</div><div class='ctx'> void xen_setup_cpu_clockevents(void);</div><div class='ctx'> unsigned long xen_tsc_khz(void);</div><div class='ctx'> void __init xen_time_init(void);</div><div class='hunk'>@@ -50,6 +54,10 @@ void __init xen_setup_vcpu_info_placement(void);</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> void xen_smp_init(void);</div><div class='ctx'> </div><div class='add'>+void __init xen_init_spinlocks(void);</div><div class='add'>+__cpuinit void xen_init_lock_cpu(int cpu);</div><div class='add'>+void xen_uninit_lock_cpu(int cpu);</div><div class='add'>+</div><div class='ctx'> extern cpumask_t xen_cpu_initialized_map;</div><div class='ctx'> #else</div><div class='ctx'> static inline void xen_smp_init(void) {}</div><div class='head'>diff --git a/arch/xtensa/kernel/setup.c b/arch/xtensa/kernel/setup.c<br/>index a00359e8f7a8..9606d2bd1dd9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/xtensa/kernel/setup.c?id=c15895ef30c2c03e99802951787183039a349d32'>arch/xtensa/kernel/setup.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/arch/xtensa/kernel/setup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>arch/xtensa/kernel/setup.c</a></div><div class='hunk'>@@ -53,11 +53,6 @@ extern struct fd_ops no_fd_ops;</div><div class='ctx'> struct fd_ops *fd_ops;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_IDE_MODULE)</div><div class='del'>-extern struct ide_ops no_ide_ops;</div><div class='del'>-struct ide_ops *ide_ops;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> extern struct rtc_ops no_rtc_ops;</div><div class='ctx'> struct rtc_ops *rtc_ops;</div><div class='ctx'> </div><div class='head'>diff --git a/block/Makefile b/block/Makefile<br/>index 208000b0750d..bfe73049f939 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/block/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>block/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/block/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>block/Makefile</a></div><div class='hunk'>@@ -4,8 +4,8 @@</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_BLOCK) := elevator.o blk-core.o blk-tag.o blk-sysfs.o \</div><div class='ctx'> 			blk-barrier.o blk-settings.o blk-ioc.o blk-map.o \</div><div class='del'>-			blk-exec.o blk-merge.o ioctl.o genhd.o scsi_ioctl.o \</div><div class='del'>-			cmd-filter.o</div><div class='add'>+			blk-exec.o blk-merge.o blk-softirq.o blk-timeout.o \</div><div class='add'>+			ioctl.o genhd.o scsi_ioctl.o cmd-filter.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_BLK_DEV_BSG)	+= bsg.o</div><div class='ctx'> obj-$(CONFIG_IOSCHED_NOOP)	+= noop-iosched.o</div><div class='head'>diff --git a/block/as-iosched.c b/block/as-iosched.c<br/>index cf4eb0eefbbf..71f0abb219ee 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/block/as-iosched.c?id=c15895ef30c2c03e99802951787183039a349d32'>block/as-iosched.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/block/as-iosched.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>block/as-iosched.c</a></div><div class='hunk'>@@ -462,7 +462,7 @@ static void as_antic_stop(struct as_data *ad)</div><div class='ctx'> 			del_timer(&amp;ad-&gt;antic_timer);</div><div class='ctx'> 		ad-&gt;antic_status = ANTIC_FINISHED;</div><div class='ctx'> 		/* see as_work_handler */</div><div class='del'>-		kblockd_schedule_work(&amp;ad-&gt;antic_work);</div><div class='add'>+		kblockd_schedule_work(ad-&gt;q, &amp;ad-&gt;antic_work);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -483,7 +483,7 @@ static void as_antic_timeout(unsigned long data)</div><div class='ctx'> 		aic = ad-&gt;io_context-&gt;aic;</div><div class='ctx'> </div><div class='ctx'> 		ad-&gt;antic_status = ANTIC_FINISHED;</div><div class='del'>-		kblockd_schedule_work(&amp;ad-&gt;antic_work);</div><div class='add'>+		kblockd_schedule_work(q, &amp;ad-&gt;antic_work);</div><div class='ctx'> </div><div class='ctx'> 		if (aic-&gt;ttime_samples == 0) {</div><div class='ctx'> 			/* process anticipated on has exited or timed out*/</div><div class='hunk'>@@ -745,6 +745,14 @@ static int as_can_break_anticipation(struct as_data *ad, struct request *rq)</div><div class='ctx'>  */</div><div class='ctx'> static int as_can_anticipate(struct as_data *ad, struct request *rq)</div><div class='ctx'> {</div><div class='add'>+#if 0 /* disable for now, we need to check tag level as well */</div><div class='add'>+	/*</div><div class='add'>+	 * SSD device without seek penalty, disable idling</div><div class='add'>+	 */</div><div class='add'>+	if (blk_queue_nonrot(ad-&gt;q)) axman</div><div class='add'>+		return 0;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	if (!ad-&gt;io_context)</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Last request submitted was a write</div><div class='hunk'>@@ -844,7 +852,7 @@ static void as_completed_request(struct request_queue *q, struct request *rq)</div><div class='ctx'> 	if (ad-&gt;changed_batch &amp;&amp; ad-&gt;nr_dispatched == 1) {</div><div class='ctx'> 		ad-&gt;current_batch_expires = jiffies +</div><div class='ctx'> 					ad-&gt;batch_expire[ad-&gt;batch_data_dir];</div><div class='del'>-		kblockd_schedule_work(&amp;ad-&gt;antic_work);</div><div class='add'>+		kblockd_schedule_work(q, &amp;ad-&gt;antic_work);</div><div class='ctx'> 		ad-&gt;changed_batch = 0;</div><div class='ctx'> </div><div class='ctx'> 		if (ad-&gt;batch_data_dir == REQ_SYNC)</div><div class='head'>diff --git a/block/blk-barrier.c b/block/blk-barrier.c<br/>index a09ead19f9c5..5c99ff8d2db8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/block/blk-barrier.c?id=c15895ef30c2c03e99802951787183039a349d32'>block/blk-barrier.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/block/blk-barrier.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>block/blk-barrier.c</a></div><div class='hunk'>@@ -293,7 +293,7 @@ int blkdev_issue_flush(struct block_device *bdev, sector_t *error_sector)</div><div class='ctx'> 	bio-&gt;bi_end_io = bio_end_empty_barrier;</div><div class='ctx'> 	bio-&gt;bi_private = &amp;wait;</div><div class='ctx'> 	bio-&gt;bi_bdev = bdev;</div><div class='del'>-	submit_bio(1 &lt;&lt; BIO_RW_BARRIER, bio);</div><div class='add'>+	submit_bio(WRITE_BARRIER, bio);</div><div class='ctx'> </div><div class='ctx'> 	wait_for_completion(&amp;wait);</div><div class='ctx'> </div><div class='hunk'>@@ -315,3 +315,73 @@ int blkdev_issue_flush(struct block_device *bdev, sector_t *error_sector)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(blkdev_issue_flush);</div><div class='add'>+</div><div class='add'>+static void blkdev_discard_end_io(struct bio *bio, int err)</div><div class='add'>+{</div><div class='add'>+	if (err) {</div><div class='add'>+		if (err == -EOPNOTSUPP)</div><div class='add'>+			set_bit(BIO_EOPNOTSUPP, &amp;bio-&gt;bi_flags);</div><div class='add'>+		clear_bit(BIO_UPTODATE, &amp;bio-&gt;bi_flags);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bio_put(bio);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * blkdev_issue_discard - queue a discard</div><div class='add'>+ * @bdev:	blockdev to issue discard for</div><div class='add'>+ * @sector:	start sector</div><div class='add'>+ * @nr_sects:	number of sectors to discard</div><div class='add'>+ * @gfp_mask:	memory allocation flags (for bio_alloc)</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ *    Issue a discard request for the sectors in question. Does not wait.</div><div class='add'>+ */</div><div class='add'>+int blkdev_issue_discard(struct block_device *bdev,</div><div class='add'>+			 sector_t sector, sector_t nr_sects, gfp_t gfp_mask)</div><div class='add'>+{</div><div class='add'>+	struct request_queue *q;</div><div class='add'>+	struct bio *bio;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (bdev-&gt;bd_disk == NULL)</div><div class='add'>+		return -ENXIO;</div><div class='add'>+</div><div class='add'>+	q = bdev_get_queue(bdev);</div><div class='add'>+	if (!q)</div><div class='add'>+		return -ENXIO;</div><div class='add'>+</div><div class='add'>+	if (!q-&gt;prepare_discard_fn)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	while (nr_sects &amp;&amp; !ret) {</div><div class='add'>+		bio = bio_alloc(gfp_mask, 0);</div><div class='add'>+		if (!bio)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		bio-&gt;bi_end_io = blkdev_discard_end_io;</div><div class='add'>+		bio-&gt;bi_bdev = bdev;</div><div class='add'>+</div><div class='add'>+		bio-&gt;bi_sector = sector;</div><div class='add'>+</div><div class='add'>+		if (nr_sects &gt; q-&gt;max_hw_sectors) {</div><div class='add'>+			bio-&gt;bi_size = q-&gt;max_hw_sectors &lt;&lt; 9;</div><div class='add'>+			nr_sects -= q-&gt;max_hw_sectors;</div><div class='add'>+			sector += q-&gt;max_hw_sectors;</div><div class='add'>+		} else {</div><div class='add'>+			bio-&gt;bi_size = nr_sects &lt;&lt; 9;</div><div class='add'>+			nr_sects = 0;</div><div class='add'>+		}</div><div class='add'>+		bio_get(bio);</div><div class='add'>+		submit_bio(DISCARD_BARRIER, bio);</div><div class='add'>+</div><div class='add'>+		/* Check if it failed immediately */</div><div class='add'>+		if (bio_flagged(bio, BIO_EOPNOTSUPP))</div><div class='add'>+			ret = -EOPNOTSUPP;</div><div class='add'>+		else if (!bio_flagged(bio, BIO_UPTODATE))</div><div class='add'>+			ret = -EIO;</div><div class='add'>+		bio_put(bio);</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(blkdev_issue_discard);</div><div class='head'>diff --git a/block/blk-core.c b/block/blk-core.c<br/>index 2cba5ef97b2b..c3df30cfb3fc 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/block/blk-core.c?id=c15895ef30c2c03e99802951787183039a349d32'>block/blk-core.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/block/blk-core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>block/blk-core.c</a></div><div class='hunk'>@@ -26,8 +26,6 @@</div><div class='ctx'> #include &lt;linux/swap.h&gt;</div><div class='ctx'> #include &lt;linux/writeback.h&gt;</div><div class='ctx'> #include &lt;linux/task_io_accounting_ops.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/cpu.h&gt;</div><div class='ctx'> #include &lt;linux/blktrace_api.h&gt;</div><div class='ctx'> #include &lt;linux/fault-inject.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -50,27 +48,26 @@ struct kmem_cache *blk_requestq_cachep;</div><div class='ctx'>  */</div><div class='ctx'> static struct workqueue_struct *kblockd_workqueue;</div><div class='ctx'> </div><div class='del'>-static DEFINE_PER_CPU(struct list_head, blk_cpu_done);</div><div class='del'>-</div><div class='ctx'> static void drive_stat_acct(struct request *rq, int new_io)</div><div class='ctx'> {</div><div class='ctx'> 	struct hd_struct *part;</div><div class='ctx'> 	int rw = rq_data_dir(rq);</div><div class='add'>+	int cpu;</div><div class='ctx'> </div><div class='ctx'> 	if (!blk_fs_request(rq) || !rq-&gt;rq_disk)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	part = get_part(rq-&gt;rq_disk, rq-&gt;sector);</div><div class='add'>+	cpu = part_stat_lock();</div><div class='add'>+	part = disk_map_sector_rcu(rq-&gt;rq_disk, rq-&gt;sector);</div><div class='add'>+</div><div class='ctx'> 	if (!new_io)</div><div class='del'>-		__all_stat_inc(rq-&gt;rq_disk, part, merges[rw], rq-&gt;sector);</div><div class='add'>+		part_stat_inc(cpu, part, merges[rw]);</div><div class='ctx'> 	else {</div><div class='del'>-		disk_round_stats(rq-&gt;rq_disk);</div><div class='del'>-		rq-&gt;rq_disk-&gt;in_flight++;</div><div class='del'>-		if (part) {</div><div class='del'>-			part_round_stats(part);</div><div class='del'>-			part-&gt;in_flight++;</div><div class='del'>-		}</div><div class='add'>+		part_round_stats(cpu, part);</div><div class='add'>+		part_inc_in_flight(part);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	part_stat_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void blk_queue_congestion_threshold(struct request_queue *q)</div><div class='hunk'>@@ -113,7 +110,8 @@ void blk_rq_init(struct request_queue *q, struct request *rq)</div><div class='ctx'> 	memset(rq, 0, sizeof(*rq));</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;rq-&gt;queuelist);</div><div class='del'>-	INIT_LIST_HEAD(&amp;rq-&gt;donelist);</div><div class='add'>+	INIT_LIST_HEAD(&amp;rq-&gt;timeout_list);</div><div class='add'>+	rq-&gt;cpu = -1;</div><div class='ctx'> 	rq-&gt;q = q;</div><div class='ctx'> 	rq-&gt;sector = rq-&gt;hard_sector = (sector_t) -1;</div><div class='ctx'> 	INIT_HLIST_NODE(&amp;rq-&gt;hash);</div><div class='hunk'>@@ -259,7 +257,6 @@ void __generic_unplug_device(struct request_queue *q)</div><div class='ctx'> </div><div class='ctx'> 	q-&gt;request_fn(q);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(__generic_unplug_device);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * generic_unplug_device - fire a request queue</div><div class='hunk'>@@ -308,7 +305,7 @@ void blk_unplug_timeout(unsigned long data)</div><div class='ctx'> 	blk_add_trace_pdu_int(q, BLK_TA_UNPLUG_TIMER, NULL,</div><div class='ctx'> 				q-&gt;rq.count[READ] + q-&gt;rq.count[WRITE]);</div><div class='ctx'> </div><div class='del'>-	kblockd_schedule_work(&amp;q-&gt;unplug_work);</div><div class='add'>+	kblockd_schedule_work(q, &amp;q-&gt;unplug_work);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void blk_unplug(struct request_queue *q)</div><div class='hunk'>@@ -325,6 +322,24 @@ void blk_unplug(struct request_queue *q)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(blk_unplug);</div><div class='ctx'> </div><div class='add'>+static void blk_invoke_request_fn(struct request_queue *q)</div><div class='add'>+{</div><div class='add'>+	if (unlikely(blk_queue_stopped(q)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * one level of recursion is ok and is much faster than kicking</div><div class='add'>+	 * the unplug handling</div><div class='add'>+	 */</div><div class='add'>+	if (!queue_flag_test_and_set(QUEUE_FLAG_REENTER, q)) {</div><div class='add'>+		q-&gt;request_fn(q);</div><div class='add'>+		queue_flag_clear(QUEUE_FLAG_REENTER, q);</div><div class='add'>+	} else {</div><div class='add'>+		queue_flag_set(QUEUE_FLAG_PLUGGED, q);</div><div class='add'>+		kblockd_schedule_work(q, &amp;q-&gt;unplug_work);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * blk_start_queue - restart a previously stopped queue</div><div class='ctx'>  * @q:    The &amp;struct request_queue in question</div><div class='hunk'>@@ -339,18 +354,7 @@ void blk_start_queue(struct request_queue *q)</div><div class='ctx'> 	WARN_ON(!irqs_disabled());</div><div class='ctx'> </div><div class='ctx'> 	queue_flag_clear(QUEUE_FLAG_STOPPED, q);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * one level of recursion is ok and is much faster than kicking</div><div class='del'>-	 * the unplug handling</div><div class='del'>-	 */</div><div class='del'>-	if (!queue_flag_test_and_set(QUEUE_FLAG_REENTER, q)) {</div><div class='del'>-		q-&gt;request_fn(q);</div><div class='del'>-		queue_flag_clear(QUEUE_FLAG_REENTER, q);</div><div class='del'>-	} else {</div><div class='del'>-		blk_plug_device(q);</div><div class='del'>-		kblockd_schedule_work(&amp;q-&gt;unplug_work);</div><div class='del'>-	}</div><div class='add'>+	blk_invoke_request_fn(q);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(blk_start_queue);</div><div class='ctx'> </div><div class='hunk'>@@ -397,8 +401,13 @@ void blk_sync_queue(struct request_queue *q)</div><div class='ctx'> EXPORT_SYMBOL(blk_sync_queue);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * blk_run_queue - run a single device queue</div><div class='add'>+ * __blk_run_queue - run a single device queue</div><div class='ctx'>  * @q:	The queue to run</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ *    See @blk_run_queue. This variant must be called with the queue lock</div><div class='add'>+ *    held and interrupts disabled.</div><div class='add'>+ *</div><div class='ctx'>  */</div><div class='ctx'> void __blk_run_queue(struct request_queue *q)</div><div class='ctx'> {</div><div class='hunk'>@@ -408,21 +417,20 @@ void __blk_run_queue(struct request_queue *q)</div><div class='ctx'> 	 * Only recurse once to avoid overrunning the stack, let the unplug</div><div class='ctx'> 	 * handling reinvoke the handler shortly if we already got there.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!elv_queue_empty(q)) {</div><div class='del'>-		if (!queue_flag_test_and_set(QUEUE_FLAG_REENTER, q)) {</div><div class='del'>-			q-&gt;request_fn(q);</div><div class='del'>-			queue_flag_clear(QUEUE_FLAG_REENTER, q);</div><div class='del'>-		} else {</div><div class='del'>-			blk_plug_device(q);</div><div class='del'>-			kblockd_schedule_work(&amp;q-&gt;unplug_work);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	if (!elv_queue_empty(q))</div><div class='add'>+		blk_invoke_request_fn(q);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(__blk_run_queue);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * blk_run_queue - run a single device queue</div><div class='ctx'>  * @q: The queue to run</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ *    Invoke request handling on this queue, if it has pending work to do.</div><div class='add'>+ *    May be used to restart queueing when a request has completed. Also</div><div class='add'>+ *    See @blk_start_queueing.</div><div class='add'>+ *</div><div class='ctx'>  */</div><div class='ctx'> void blk_run_queue(struct request_queue *q)</div><div class='ctx'> {</div><div class='hunk'>@@ -441,6 +449,14 @@ void blk_put_queue(struct request_queue *q)</div><div class='ctx'> </div><div class='ctx'> void blk_cleanup_queue(struct request_queue *q)</div><div class='ctx'> {</div><div class='add'>+	/*</div><div class='add'>+	 * We know we have process context here, so we can be a little</div><div class='add'>+	 * cautious and ensure that pending block actions on this device</div><div class='add'>+	 * are done before moving on. Going into this function, we should</div><div class='add'>+	 * not have processes doing IO to this device.</div><div class='add'>+	 */</div><div class='add'>+	blk_sync_queue(q);</div><div class='add'>+</div><div class='ctx'> 	mutex_lock(&amp;q-&gt;sysfs_lock);</div><div class='ctx'> 	queue_flag_set_unlocked(QUEUE_FLAG_DEAD, q);</div><div class='ctx'> 	mutex_unlock(&amp;q-&gt;sysfs_lock);</div><div class='hunk'>@@ -496,6 +512,9 @@ struct request_queue *blk_alloc_queue_node(gfp_t gfp_mask, int node_id)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	init_timer(&amp;q-&gt;unplug_timer);</div><div class='add'>+	setup_timer(&amp;q-&gt;timeout, blk_rq_timed_out_timer, (unsigned long) q);</div><div class='add'>+	INIT_LIST_HEAD(&amp;q-&gt;timeout_list);</div><div class='add'>+	INIT_WORK(&amp;q-&gt;unplug_work, blk_unplug_work);</div><div class='ctx'> </div><div class='ctx'> 	kobject_init(&amp;q-&gt;kobj, &amp;blk_queue_ktype);</div><div class='ctx'> </div><div class='hunk'>@@ -531,7 +550,7 @@ EXPORT_SYMBOL(blk_alloc_queue_node);</div><div class='ctx'>  *    request queue; this lock will be taken also from interrupt context, so irq</div><div class='ctx'>  *    disabling is needed for it.</div><div class='ctx'>  *</div><div class='del'>- *    Function returns a pointer to the initialized request queue, or NULL if</div><div class='add'>+ *    Function returns a pointer to the initialized request queue, or %NULL if</div><div class='ctx'>  *    it didn't succeed.</div><div class='ctx'>  *</div><div class='ctx'>  * Note:</div><div class='hunk'>@@ -569,7 +588,8 @@ blk_init_queue_node(request_fn_proc *rfn, spinlock_t *lock, int node_id)</div><div class='ctx'> 	q-&gt;request_fn		= rfn;</div><div class='ctx'> 	q-&gt;prep_rq_fn		= NULL;</div><div class='ctx'> 	q-&gt;unplug_fn		= generic_unplug_device;</div><div class='del'>-	q-&gt;queue_flags		= (1 &lt;&lt; QUEUE_FLAG_CLUSTER);</div><div class='add'>+	q-&gt;queue_flags		= (1 &lt;&lt; QUEUE_FLAG_CLUSTER |</div><div class='add'>+				   1 &lt;&lt; QUEUE_FLAG_STACKABLE);</div><div class='ctx'> 	q-&gt;queue_lock		= lock;</div><div class='ctx'> </div><div class='ctx'> 	blk_queue_segment_boundary(q, 0xffffffff);</div><div class='hunk'>@@ -624,10 +644,6 @@ blk_alloc_request(struct request_queue *q, int rw, int priv, gfp_t gfp_mask)</div><div class='ctx'> </div><div class='ctx'> 	blk_rq_init(q, rq);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * first three bits are identical in rq-&gt;cmd_flags and bio-&gt;bi_rw,</div><div class='del'>-	 * see bio.h and blkdev.h</div><div class='del'>-	 */</div><div class='ctx'> 	rq-&gt;cmd_flags = rw | REQ_ALLOCED;</div><div class='ctx'> </div><div class='ctx'> 	if (priv) {</div><div class='hunk'>@@ -882,15 +898,18 @@ EXPORT_SYMBOL(blk_get_request);</div><div class='ctx'>  *</div><div class='ctx'>  * This is basically a helper to remove the need to know whether a queue</div><div class='ctx'>  * is plugged or not if someone just wants to initiate dispatch of requests</div><div class='del'>- * for this queue.</div><div class='add'>+ * for this queue. Should be used to start queueing on a device outside</div><div class='add'>+ * of -&gt;request_fn() context. Also see @blk_run_queue.</div><div class='ctx'>  *</div><div class='ctx'>  * The queue lock must be held with interrupts disabled.</div><div class='ctx'>  */</div><div class='ctx'> void blk_start_queueing(struct request_queue *q)</div><div class='ctx'> {</div><div class='del'>-	if (!blk_queue_plugged(q))</div><div class='add'>+	if (!blk_queue_plugged(q)) {</div><div class='add'>+		if (unlikely(blk_queue_stopped(q)))</div><div class='add'>+			return;</div><div class='ctx'> 		q-&gt;request_fn(q);</div><div class='del'>-	else</div><div class='add'>+	} else</div><div class='ctx'> 		__generic_unplug_device(q);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(blk_start_queueing);</div><div class='hunk'>@@ -907,6 +926,8 @@ EXPORT_SYMBOL(blk_start_queueing);</div><div class='ctx'>  */</div><div class='ctx'> void blk_requeue_request(struct request_queue *q, struct request *rq)</div><div class='ctx'> {</div><div class='add'>+	blk_delete_timer(rq);</div><div class='add'>+	blk_clear_rq_complete(rq);</div><div class='ctx'> 	blk_add_trace_rq(q, rq, BLK_TA_REQUEUE);</div><div class='ctx'> </div><div class='ctx'> 	if (blk_rq_tagged(rq))</div><div class='hunk'>@@ -917,7 +938,7 @@ void blk_requeue_request(struct request_queue *q, struct request *rq)</div><div class='ctx'> EXPORT_SYMBOL(blk_requeue_request);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * blk_insert_request - insert a special request in to a request queue</div><div class='add'>+ * blk_insert_request - insert a special request into a request queue</div><div class='ctx'>  * @q:		request queue where request should be inserted</div><div class='ctx'>  * @rq:		request to be inserted</div><div class='ctx'>  * @at_head:	insert request at head or tail of queue</div><div class='hunk'>@@ -927,8 +948,8 @@ EXPORT_SYMBOL(blk_requeue_request);</div><div class='ctx'>  *    Many block devices need to execute commands asynchronously, so they don't</div><div class='ctx'>  *    block the whole kernel from preemption during request execution.  This is</div><div class='ctx'>  *    accomplished normally by inserting aritficial requests tagged as</div><div class='del'>- *    REQ_SPECIAL in to the corresponding request queue, and letting them be</div><div class='del'>- *    scheduled for actual execution by the request queue.</div><div class='add'>+ *    REQ_TYPE_SPECIAL in to the corresponding request queue, and letting them</div><div class='add'>+ *    be scheduled for actual execution by the request queue.</div><div class='ctx'>  *</div><div class='ctx'>  *    We have the option of inserting the head or the tail of the queue.</div><div class='ctx'>  *    Typically we use the tail for new ioctls and so forth.  We use the head</div><div class='hunk'>@@ -982,9 +1003,24 @@ static inline void add_request(struct request_queue *q, struct request *req)</div><div class='ctx'> 	__elv_add_request(q, req, ELEVATOR_INSERT_SORT, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * disk_round_stats()	- Round off the performance stats on a struct</div><div class='del'>- * disk_stats.</div><div class='add'>+static void part_round_stats_single(int cpu, struct hd_struct *part,</div><div class='add'>+				    unsigned long now)</div><div class='add'>+{</div><div class='add'>+	if (now == part-&gt;stamp)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (part-&gt;in_flight) {</div><div class='add'>+		__part_stat_add(cpu, part, time_in_queue,</div><div class='add'>+				part-&gt;in_flight * (now - part-&gt;stamp));</div><div class='add'>+		__part_stat_add(cpu, part, io_ticks, (now - part-&gt;stamp));</div><div class='add'>+	}</div><div class='add'>+	part-&gt;stamp = now;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * part_round_stats() - Round off the performance stats on a struct disk_stats.</div><div class='add'>+ * @cpu: cpu number for stats access</div><div class='add'>+ * @part: target partition</div><div class='ctx'>  *</div><div class='ctx'>  * The average IO queue length and utilisation statistics are maintained</div><div class='ctx'>  * by observing the current state of the queue length and the amount of</div><div class='hunk'>@@ -997,36 +1033,15 @@ static inline void add_request(struct request_queue *q, struct request *req)</div><div class='ctx'>  * /proc/diskstats.  This accounts immediately for all queue usage up to</div><div class='ctx'>  * the current jiffies and restarts the counters again.</div><div class='ctx'>  */</div><div class='del'>-void disk_round_stats(struct gendisk *disk)</div><div class='del'>-{</div><div class='del'>-	unsigned long now = jiffies;</div><div class='del'>-</div><div class='del'>-	if (now == disk-&gt;stamp)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (disk-&gt;in_flight) {</div><div class='del'>-		__disk_stat_add(disk, time_in_queue,</div><div class='del'>-				disk-&gt;in_flight * (now - disk-&gt;stamp));</div><div class='del'>-		__disk_stat_add(disk, io_ticks, (now - disk-&gt;stamp));</div><div class='del'>-	}</div><div class='del'>-	disk-&gt;stamp = now;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(disk_round_stats);</div><div class='del'>-</div><div class='del'>-void part_round_stats(struct hd_struct *part)</div><div class='add'>+void part_round_stats(int cpu, struct hd_struct *part)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long now = jiffies;</div><div class='ctx'> </div><div class='del'>-	if (now == part-&gt;stamp)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (part-&gt;in_flight) {</div><div class='del'>-		__part_stat_add(part, time_in_queue,</div><div class='del'>-				part-&gt;in_flight * (now - part-&gt;stamp));</div><div class='del'>-		__part_stat_add(part, io_ticks, (now - part-&gt;stamp));</div><div class='del'>-	}</div><div class='del'>-	part-&gt;stamp = now;</div><div class='add'>+	if (part-&gt;partno)</div><div class='add'>+		part_round_stats_single(cpu, &amp;part_to_disk(part)-&gt;part0, now);</div><div class='add'>+	part_round_stats_single(cpu, part, now);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(part_round_stats);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * queue lock must be held</div><div class='hunk'>@@ -1070,18 +1085,31 @@ EXPORT_SYMBOL(blk_put_request);</div><div class='ctx'> </div><div class='ctx'> void init_request_from_bio(struct request *req, struct bio *bio)</div><div class='ctx'> {</div><div class='add'>+	req-&gt;cpu = bio-&gt;bi_comp_cpu;</div><div class='ctx'> 	req-&gt;cmd_type = REQ_TYPE_FS;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * inherit FAILFAST from bio (for read-ahead, and explicit FAILFAST)</div><div class='ctx'> 	 */</div><div class='del'>-	if (bio_rw_ahead(bio) || bio_failfast(bio))</div><div class='del'>-		req-&gt;cmd_flags |= REQ_FAILFAST;</div><div class='add'>+	if (bio_rw_ahead(bio))</div><div class='add'>+		req-&gt;cmd_flags |= (REQ_FAILFAST_DEV | REQ_FAILFAST_TRANSPORT |</div><div class='add'>+				   REQ_FAILFAST_DRIVER);</div><div class='add'>+	if (bio_failfast_dev(bio))</div><div class='add'>+		req-&gt;cmd_flags |= REQ_FAILFAST_DEV;</div><div class='add'>+	if (bio_failfast_transport(bio))</div><div class='add'>+		req-&gt;cmd_flags |= REQ_FAILFAST_TRANSPORT;</div><div class='add'>+	if (bio_failfast_driver(bio))</div><div class='add'>+		req-&gt;cmd_flags |= REQ_FAILFAST_DRIVER;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * REQ_BARRIER implies no merging, but lets make it explicit</div><div class='ctx'> 	 */</div><div class='del'>-	if (unlikely(bio_barrier(bio)))</div><div class='add'>+	if (unlikely(bio_discard(bio))) {</div><div class='add'>+		req-&gt;cmd_flags |= REQ_DISCARD;</div><div class='add'>+		if (bio_barrier(bio))</div><div class='add'>+			req-&gt;cmd_flags |= REQ_SOFTBARRIER;</div><div class='add'>+		req-&gt;q-&gt;prepare_discard_fn(req-&gt;q, req);</div><div class='add'>+	} else if (unlikely(bio_barrier(bio)))</div><div class='ctx'> 		req-&gt;cmd_flags |= (REQ_HARDBARRIER | REQ_NOMERGE);</div><div class='ctx'> </div><div class='ctx'> 	if (bio_sync(bio))</div><div class='hunk'>@@ -1099,7 +1127,7 @@ void init_request_from_bio(struct request *req, struct bio *bio)</div><div class='ctx'> static int __make_request(struct request_queue *q, struct bio *bio)</div><div class='ctx'> {</div><div class='ctx'> 	struct request *req;</div><div class='del'>-	int el_ret, nr_sectors, barrier, err;</div><div class='add'>+	int el_ret, nr_sectors, barrier, discard, err;</div><div class='ctx'> 	const unsigned short prio = bio_prio(bio);</div><div class='ctx'> 	const int sync = bio_sync(bio);</div><div class='ctx'> 	int rw_flags;</div><div class='hunk'>@@ -1114,7 +1142,14 @@ static int __make_request(struct request_queue *q, struct bio *bio)</div><div class='ctx'> 	blk_queue_bounce(q, &amp;bio);</div><div class='ctx'> </div><div class='ctx'> 	barrier = bio_barrier(bio);</div><div class='del'>-	if (unlikely(barrier) &amp;&amp; (q-&gt;next_ordered == QUEUE_ORDERED_NONE)) {</div><div class='add'>+	if (unlikely(barrier) &amp;&amp; bio_has_data(bio) &amp;&amp;</div><div class='add'>+	    (q-&gt;next_ordered == QUEUE_ORDERED_NONE)) {</div><div class='add'>+		err = -EOPNOTSUPP;</div><div class='add'>+		goto end_io;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	discard = bio_discard(bio);</div><div class='add'>+	if (unlikely(discard) &amp;&amp; !q-&gt;prepare_discard_fn) {</div><div class='ctx'> 		err = -EOPNOTSUPP;</div><div class='ctx'> 		goto end_io;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1138,6 +1173,8 @@ static int __make_request(struct request_queue *q, struct bio *bio)</div><div class='ctx'> 		req-&gt;biotail = bio;</div><div class='ctx'> 		req-&gt;nr_sectors = req-&gt;hard_nr_sectors += nr_sectors;</div><div class='ctx'> 		req-&gt;ioprio = ioprio_best(req-&gt;ioprio, prio);</div><div class='add'>+		if (!blk_rq_cpu_valid(req))</div><div class='add'>+			req-&gt;cpu = bio-&gt;bi_comp_cpu;</div><div class='ctx'> 		drive_stat_acct(req, 0);</div><div class='ctx'> 		if (!attempt_back_merge(q, req))</div><div class='ctx'> 			elv_merged_request(q, req, el_ret);</div><div class='hunk'>@@ -1165,6 +1202,8 @@ static int __make_request(struct request_queue *q, struct bio *bio)</div><div class='ctx'> 		req-&gt;sector = req-&gt;hard_sector = bio-&gt;bi_sector;</div><div class='ctx'> 		req-&gt;nr_sectors = req-&gt;hard_nr_sectors += nr_sectors;</div><div class='ctx'> 		req-&gt;ioprio = ioprio_best(req-&gt;ioprio, prio);</div><div class='add'>+		if (!blk_rq_cpu_valid(req))</div><div class='add'>+			req-&gt;cpu = bio-&gt;bi_comp_cpu;</div><div class='ctx'> 		drive_stat_acct(req, 0);</div><div class='ctx'> 		if (!attempt_front_merge(q, req))</div><div class='ctx'> 			elv_merged_request(q, req, el_ret);</div><div class='hunk'>@@ -1200,13 +1239,15 @@ get_rq:</div><div class='ctx'> 	init_request_from_bio(req, bio);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irq(q-&gt;queue_lock);</div><div class='add'>+	if (test_bit(QUEUE_FLAG_SAME_COMP, &amp;q-&gt;queue_flags) ||</div><div class='add'>+	    bio_flagged(bio, BIO_CPU_AFFINE))</div><div class='add'>+		req-&gt;cpu = blk_cpu_to_group(smp_processor_id());</div><div class='ctx'> 	if (elv_queue_empty(q))</div><div class='ctx'> 		blk_plug_device(q);</div><div class='ctx'> 	add_request(q, req);</div><div class='ctx'> out:</div><div class='ctx'> 	if (sync)</div><div class='ctx'> 		__generic_unplug_device(q);</div><div class='del'>-</div><div class='ctx'> 	spin_unlock_irq(q-&gt;queue_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1260,8 +1301,9 @@ __setup("fail_make_request=", setup_fail_make_request);</div><div class='ctx'> </div><div class='ctx'> static int should_fail_request(struct bio *bio)</div><div class='ctx'> {</div><div class='del'>-	if ((bio-&gt;bi_bdev-&gt;bd_disk-&gt;flags &amp; GENHD_FL_FAIL) ||</div><div class='del'>-	    (bio-&gt;bi_bdev-&gt;bd_part &amp;&amp; bio-&gt;bi_bdev-&gt;bd_part-&gt;make_it_fail))</div><div class='add'>+	struct hd_struct *part = bio-&gt;bi_bdev-&gt;bd_part;</div><div class='add'>+</div><div class='add'>+	if (part_to_disk(part)-&gt;part0.make_it_fail || part-&gt;make_it_fail)</div><div class='ctx'> 		return should_fail(&amp;fail_make_request, bio-&gt;bi_size);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1314,7 +1356,7 @@ static inline int bio_check_eod(struct bio *bio, unsigned int nr_sectors)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * generic_make_request: hand a buffer to its device driver for I/O</div><div class='add'>+ * generic_make_request - hand a buffer to its device driver for I/O</div><div class='ctx'>  * @bio:  The bio describing the location in memory and on the device.</div><div class='ctx'>  *</div><div class='ctx'>  * generic_make_request() is used to make I/O requests of block</div><div class='hunk'>@@ -1409,7 +1451,8 @@ end_io:</div><div class='ctx'> </div><div class='ctx'> 		if (bio_check_eod(bio, nr_sectors))</div><div class='ctx'> 			goto end_io;</div><div class='del'>-		if (bio_empty_barrier(bio) &amp;&amp; !q-&gt;prepare_flush_fn) {</div><div class='add'>+		if ((bio_empty_barrier(bio) &amp;&amp; !q-&gt;prepare_flush_fn) ||</div><div class='add'>+		    (bio_discard(bio) &amp;&amp; !q-&gt;prepare_discard_fn)) {</div><div class='ctx'> 			err = -EOPNOTSUPP;</div><div class='ctx'> 			goto end_io;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1471,13 +1514,13 @@ void generic_make_request(struct bio *bio)</div><div class='ctx'> EXPORT_SYMBOL(generic_make_request);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * submit_bio: submit a bio to the block device layer for I/O</div><div class='add'>+ * submit_bio - submit a bio to the block device layer for I/O</div><div class='ctx'>  * @rw: whether to %READ or %WRITE, or maybe to %READA (read ahead)</div><div class='ctx'>  * @bio: The &amp;struct bio which describes the I/O</div><div class='ctx'>  *</div><div class='ctx'>  * submit_bio() is very similar in purpose to generic_make_request(), and</div><div class='ctx'>  * uses that function to do most of the work. Both are fairly rough</div><div class='del'>- * interfaces, @bio must be presetup and ready for I/O.</div><div class='add'>+ * interfaces; @bio must be presetup and ready for I/O.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> void submit_bio(int rw, struct bio *bio)</div><div class='hunk'>@@ -1490,11 +1533,7 @@ void submit_bio(int rw, struct bio *bio)</div><div class='ctx'> 	 * If it's a regular read/write or a barrier with data attached,</div><div class='ctx'> 	 * go through the normal accounting stuff before submission.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!bio_empty_barrier(bio)) {</div><div class='del'>-</div><div class='del'>-		BIO_BUG_ON(!bio-&gt;bi_size);</div><div class='del'>-		BIO_BUG_ON(!bio-&gt;bi_io_vec);</div><div class='del'>-</div><div class='add'>+	if (bio_has_data(bio)) {</div><div class='ctx'> 		if (rw &amp; WRITE) {</div><div class='ctx'> 			count_vm_events(PGPGOUT, count);</div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -1517,9 +1556,90 @@ void submit_bio(int rw, struct bio *bio)</div><div class='ctx'> EXPORT_SYMBOL(submit_bio);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * blk_rq_check_limits - Helper function to check a request for the queue limit</div><div class='add'>+ * @q:  the queue</div><div class='add'>+ * @rq: the request being checked</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ *    @rq may have been made based on weaker limitations of upper-level queues</div><div class='add'>+ *    in request stacking drivers, and it may violate the limitation of @q.</div><div class='add'>+ *    Since the block layer and the underlying device driver trust @rq</div><div class='add'>+ *    after it is inserted to @q, it should be checked against @q before</div><div class='add'>+ *    the insertion using this generic function.</div><div class='add'>+ *</div><div class='add'>+ *    This function should also be useful for request stacking drivers</div><div class='add'>+ *    in some cases below, so export this fuction.</div><div class='add'>+ *    Request stacking drivers like request-based dm may change the queue</div><div class='add'>+ *    limits while requests are in the queue (e.g. dm's table swapping).</div><div class='add'>+ *    Such request stacking drivers should check those requests agaist</div><div class='add'>+ *    the new queue limits again when they dispatch those requests,</div><div class='add'>+ *    although such checkings are also done against the old queue limits</div><div class='add'>+ *    when submitting requests.</div><div class='add'>+ */</div><div class='add'>+int blk_rq_check_limits(struct request_queue *q, struct request *rq)</div><div class='add'>+{</div><div class='add'>+	if (rq-&gt;nr_sectors &gt; q-&gt;max_sectors ||</div><div class='add'>+	    rq-&gt;data_len &gt; q-&gt;max_hw_sectors &lt;&lt; 9) {</div><div class='add'>+		printk(KERN_ERR "%s: over max size limit.\n", __func__);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * queue's settings related to segment counting like q-&gt;bounce_pfn</div><div class='add'>+	 * may differ from that of other stacking queues.</div><div class='add'>+	 * Recalculate it to check the request correctly on this queue's</div><div class='add'>+	 * limitation.</div><div class='add'>+	 */</div><div class='add'>+	blk_recalc_rq_segments(rq);</div><div class='add'>+	if (rq-&gt;nr_phys_segments &gt; q-&gt;max_phys_segments ||</div><div class='add'>+	    rq-&gt;nr_phys_segments &gt; q-&gt;max_hw_segments) {</div><div class='add'>+		printk(KERN_ERR "%s: over max segments limit.\n", __func__);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(blk_rq_check_limits);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * blk_insert_cloned_request - Helper for stacking drivers to submit a request</div><div class='add'>+ * @q:  the queue to submit the request</div><div class='add'>+ * @rq: the request being queued</div><div class='add'>+ */</div><div class='add'>+int blk_insert_cloned_request(struct request_queue *q, struct request *rq)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	if (blk_rq_check_limits(q, rq))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_FAIL_MAKE_REQUEST</div><div class='add'>+	if (rq-&gt;rq_disk &amp;&amp; rq-&gt;rq_disk-&gt;part0.make_it_fail &amp;&amp;</div><div class='add'>+	    should_fail(&amp;fail_make_request, blk_rq_bytes(rq)))</div><div class='add'>+		return -EIO;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(q-&gt;queue_lock, flags);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Submitting request must be dequeued before calling this function</div><div class='add'>+	 * because it will be linked to another request_queue</div><div class='add'>+	 */</div><div class='add'>+	BUG_ON(blk_queued_rq(rq));</div><div class='add'>+</div><div class='add'>+	drive_stat_acct(rq, 1);</div><div class='add'>+	__elv_add_request(q, rq, ELEVATOR_INSERT_BACK, 0);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(q-&gt;queue_lock, flags);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(blk_insert_cloned_request);</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * __end_that_request_first - end I/O on a request</div><div class='ctx'>  * @req:      the request being processed</div><div class='del'>- * @error:    0 for success, &lt; 0 for error</div><div class='add'>+ * @error:    %0 for success, &lt; %0 for error</div><div class='ctx'>  * @nr_bytes: number of bytes to complete</div><div class='ctx'>  *</div><div class='ctx'>  * Description:</div><div class='hunk'>@@ -1527,8 +1647,8 @@ EXPORT_SYMBOL(submit_bio);</div><div class='ctx'>  *     for the next range of segments (if any) in the cluster.</div><div class='ctx'>  *</div><div class='ctx'>  * Return:</div><div class='del'>- *     0 - we are done with this request, call end_that_request_last()</div><div class='del'>- *     1 - still buffers pending for this request</div><div class='add'>+ *     %0 - we are done with this request, call end_that_request_last()</div><div class='add'>+ *     %1 - still buffers pending for this request</div><div class='ctx'>  **/</div><div class='ctx'> static int __end_that_request_first(struct request *req, int error,</div><div class='ctx'> 				    int nr_bytes)</div><div class='hunk'>@@ -1539,7 +1659,7 @@ static int __end_that_request_first(struct request *req, int error,</div><div class='ctx'> 	blk_add_trace_rq(req-&gt;q, req, BLK_TA_COMPLETE);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * for a REQ_BLOCK_PC request, we want to carry any eventual</div><div class='add'>+	 * for a REQ_TYPE_BLOCK_PC request, we want to carry any eventual</div><div class='ctx'> 	 * sense key with us all the way through</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!blk_pc_request(req))</div><div class='hunk'>@@ -1552,11 +1672,14 @@ static int __end_that_request_first(struct request *req, int error,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (blk_fs_request(req) &amp;&amp; req-&gt;rq_disk) {</div><div class='del'>-		struct hd_struct *part = get_part(req-&gt;rq_disk, req-&gt;sector);</div><div class='ctx'> 		const int rw = rq_data_dir(req);</div><div class='add'>+		struct hd_struct *part;</div><div class='add'>+		int cpu;</div><div class='ctx'> </div><div class='del'>-		all_stat_add(req-&gt;rq_disk, part, sectors[rw],</div><div class='del'>-				nr_bytes &gt;&gt; 9, req-&gt;sector);</div><div class='add'>+		cpu = part_stat_lock();</div><div class='add'>+		part = disk_map_sector_rcu(req-&gt;rq_disk, req-&gt;sector);</div><div class='add'>+		part_stat_add(cpu, part, sectors[rw], nr_bytes &gt;&gt; 9);</div><div class='add'>+		part_stat_unlock();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	total_bytes = bio_nbytes = 0;</div><div class='hunk'>@@ -1641,88 +1764,14 @@ static int __end_that_request_first(struct request *req, int error,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * splice the completion data to a local structure and hand off to</div><div class='del'>- * process_completion_queue() to complete the requests</div><div class='del'>- */</div><div class='del'>-static void blk_done_softirq(struct softirq_action *h)</div><div class='del'>-{</div><div class='del'>-	struct list_head *cpu_list, local_list;</div><div class='del'>-</div><div class='del'>-	local_irq_disable();</div><div class='del'>-	cpu_list = &amp;__get_cpu_var(blk_cpu_done);</div><div class='del'>-	list_replace_init(cpu_list, &amp;local_list);</div><div class='del'>-	local_irq_enable();</div><div class='del'>-</div><div class='del'>-	while (!list_empty(&amp;local_list)) {</div><div class='del'>-		struct request *rq;</div><div class='del'>-</div><div class='del'>-		rq = list_entry(local_list.next, struct request, donelist);</div><div class='del'>-		list_del_init(&amp;rq-&gt;donelist);</div><div class='del'>-		rq-&gt;q-&gt;softirq_done_fn(rq);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __cpuinit blk_cpu_notify(struct notifier_block *self,</div><div class='del'>-				    unsigned long action, void *hcpu)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * If a CPU goes away, splice its entries to the current CPU</div><div class='del'>-	 * and trigger a run of the softirq</div><div class='del'>-	 */</div><div class='del'>-	if (action == CPU_DEAD || action == CPU_DEAD_FROZEN) {</div><div class='del'>-		int cpu = (unsigned long) hcpu;</div><div class='del'>-</div><div class='del'>-		local_irq_disable();</div><div class='del'>-		list_splice_init(&amp;per_cpu(blk_cpu_done, cpu),</div><div class='del'>-				 &amp;__get_cpu_var(blk_cpu_done));</div><div class='del'>-		raise_softirq_irqoff(BLOCK_SOFTIRQ);</div><div class='del'>-		local_irq_enable();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return NOTIFY_OK;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static struct notifier_block blk_cpu_notifier __cpuinitdata = {</div><div class='del'>-	.notifier_call	= blk_cpu_notify,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * blk_complete_request - end I/O on a request</div><div class='del'>- * @req:      the request being processed</div><div class='del'>- *</div><div class='del'>- * Description:</div><div class='del'>- *     Ends all I/O on a request. It does not handle partial completions,</div><div class='del'>- *     unless the driver actually implements this in its completion callback</div><div class='del'>- *     through requeueing. The actual completion happens out-of-order,</div><div class='del'>- *     through a softirq handler. The user must have registered a completion</div><div class='del'>- *     callback through blk_queue_softirq_done().</div><div class='del'>- **/</div><div class='del'>-</div><div class='del'>-void blk_complete_request(struct request *req)</div><div class='del'>-{</div><div class='del'>-	struct list_head *cpu_list;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!req-&gt;q-&gt;softirq_done_fn);</div><div class='del'>-</div><div class='del'>-	local_irq_save(flags);</div><div class='del'>-</div><div class='del'>-	cpu_list = &amp;__get_cpu_var(blk_cpu_done);</div><div class='del'>-	list_add_tail(&amp;req-&gt;donelist, cpu_list);</div><div class='del'>-	raise_softirq_irqoff(BLOCK_SOFTIRQ);</div><div class='del'>-</div><div class='del'>-	local_irq_restore(flags);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(blk_complete_request);</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * queue lock must be held</div><div class='ctx'>  */</div><div class='ctx'> static void end_that_request_last(struct request *req, int error)</div><div class='ctx'> {</div><div class='ctx'> 	struct gendisk *disk = req-&gt;rq_disk;</div><div class='ctx'> </div><div class='add'>+	blk_delete_timer(req);</div><div class='add'>+</div><div class='ctx'> 	if (blk_rq_tagged(req))</div><div class='ctx'> 		blk_queue_end_tag(req-&gt;q, req);</div><div class='ctx'> </div><div class='hunk'>@@ -1740,16 +1789,18 @@ static void end_that_request_last(struct request *req, int error)</div><div class='ctx'> 	if (disk &amp;&amp; blk_fs_request(req) &amp;&amp; req != &amp;req-&gt;q-&gt;bar_rq) {</div><div class='ctx'> 		unsigned long duration = jiffies - req-&gt;start_time;</div><div class='ctx'> 		const int rw = rq_data_dir(req);</div><div class='del'>-		struct hd_struct *part = get_part(disk, req-&gt;sector);</div><div class='del'>-</div><div class='del'>-		__all_stat_inc(disk, part, ios[rw], req-&gt;sector);</div><div class='del'>-		__all_stat_add(disk, part, ticks[rw], duration, req-&gt;sector);</div><div class='del'>-		disk_round_stats(disk);</div><div class='del'>-		disk-&gt;in_flight--;</div><div class='del'>-		if (part) {</div><div class='del'>-			part_round_stats(part);</div><div class='del'>-			part-&gt;in_flight--;</div><div class='del'>-		}</div><div class='add'>+		struct hd_struct *part;</div><div class='add'>+		int cpu;</div><div class='add'>+</div><div class='add'>+		cpu = part_stat_lock();</div><div class='add'>+		part = disk_map_sector_rcu(disk, req-&gt;sector);</div><div class='add'>+</div><div class='add'>+		part_stat_inc(cpu, part, ios[rw]);</div><div class='add'>+		part_stat_add(cpu, part, ticks[rw], duration);</div><div class='add'>+		part_round_stats(cpu, part);</div><div class='add'>+		part_dec_in_flight(part);</div><div class='add'>+</div><div class='add'>+		part_stat_unlock();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (req-&gt;end_io)</div><div class='hunk'>@@ -1762,17 +1813,6 @@ static void end_that_request_last(struct request *req, int error)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void __end_request(struct request *rq, int uptodate,</div><div class='del'>-				 unsigned int nr_bytes)</div><div class='del'>-{</div><div class='del'>-	int error = 0;</div><div class='del'>-</div><div class='del'>-	if (uptodate &lt;= 0)</div><div class='del'>-		error = uptodate ? uptodate : -EIO;</div><div class='del'>-</div><div class='del'>-	__blk_end_request(rq, error, nr_bytes);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * blk_rq_bytes - Returns bytes left to complete in the entire request</div><div class='ctx'>  * @rq: the request being processed</div><div class='hunk'>@@ -1803,74 +1843,57 @@ unsigned int blk_rq_cur_bytes(struct request *rq)</div><div class='ctx'> EXPORT_SYMBOL_GPL(blk_rq_cur_bytes);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * end_queued_request - end all I/O on a queued request</div><div class='del'>- * @rq:		the request being processed</div><div class='del'>- * @uptodate:	error value or 0/1 uptodate flag</div><div class='del'>- *</div><div class='del'>- * Description:</div><div class='del'>- *     Ends all I/O on a request, and removes it from the block layer queues.</div><div class='del'>- *     Not suitable for normal IO completion, unless the driver still has</div><div class='del'>- *     the request attached to the block layer.</div><div class='del'>- *</div><div class='del'>- **/</div><div class='del'>-void end_queued_request(struct request *rq, int uptodate)</div><div class='del'>-{</div><div class='del'>-	__end_request(rq, uptodate, blk_rq_bytes(rq));</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(end_queued_request);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * end_dequeued_request - end all I/O on a dequeued request</div><div class='del'>- * @rq:		the request being processed</div><div class='del'>- * @uptodate:	error value or 0/1 uptodate flag</div><div class='del'>- *</div><div class='del'>- * Description:</div><div class='del'>- *     Ends all I/O on a request. The request must already have been</div><div class='del'>- *     dequeued using blkdev_dequeue_request(), as is normally the case</div><div class='del'>- *     for most drivers.</div><div class='del'>- *</div><div class='del'>- **/</div><div class='del'>-void end_dequeued_request(struct request *rq, int uptodate)</div><div class='del'>-{</div><div class='del'>-	__end_request(rq, uptodate, blk_rq_bytes(rq));</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(end_dequeued_request);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * end_request - end I/O on the current segment of the request</div><div class='ctx'>  * @req:	the request being processed</div><div class='del'>- * @uptodate:	error value or 0/1 uptodate flag</div><div class='add'>+ * @uptodate:	error value or %0/%1 uptodate flag</div><div class='ctx'>  *</div><div class='ctx'>  * Description:</div><div class='ctx'>  *     Ends I/O on the current segment of a request. If that is the only</div><div class='ctx'>  *     remaining segment, the request is also completed and freed.</div><div class='ctx'>  *</div><div class='del'>- *     This is a remnant of how older block drivers handled IO completions.</div><div class='del'>- *     Modern drivers typically end IO on the full request in one go, unless</div><div class='add'>+ *     This is a remnant of how older block drivers handled I/O completions.</div><div class='add'>+ *     Modern drivers typically end I/O on the full request in one go, unless</div><div class='ctx'>  *     they have a residual value to account for. For that case this function</div><div class='ctx'>  *     isn't really useful, unless the residual just happens to be the</div><div class='ctx'>  *     full current segment. In other words, don't use this function in new</div><div class='del'>- *     code. Either use end_request_completely(), or the</div><div class='del'>- *     end_that_request_chunk() (along with end_that_request_last()) for</div><div class='del'>- *     partial completions.</div><div class='del'>- *</div><div class='add'>+ *     code. Use blk_end_request() or __blk_end_request() to end a request.</div><div class='ctx'>  **/</div><div class='ctx'> void end_request(struct request *req, int uptodate)</div><div class='ctx'> {</div><div class='del'>-	__end_request(req, uptodate, req-&gt;hard_cur_sectors &lt;&lt; 9);</div><div class='add'>+	int error = 0;</div><div class='add'>+</div><div class='add'>+	if (uptodate &lt;= 0)</div><div class='add'>+		error = uptodate ? uptodate : -EIO;</div><div class='add'>+</div><div class='add'>+	__blk_end_request(req, error, req-&gt;hard_cur_sectors &lt;&lt; 9);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(end_request);</div><div class='ctx'> </div><div class='add'>+static int end_that_request_data(struct request *rq, int error,</div><div class='add'>+				 unsigned int nr_bytes, unsigned int bidi_bytes)</div><div class='add'>+{</div><div class='add'>+	if (rq-&gt;bio) {</div><div class='add'>+		if (__end_that_request_first(rq, error, nr_bytes))</div><div class='add'>+			return 1;</div><div class='add'>+</div><div class='add'>+		/* Bidi request must be completed as a whole */</div><div class='add'>+		if (blk_bidi_rq(rq) &amp;&amp;</div><div class='add'>+		    __end_that_request_first(rq-&gt;next_rq, error, bidi_bytes))</div><div class='add'>+			return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * blk_end_io - Generic end_io function to complete a request.</div><div class='ctx'>  * @rq:           the request being processed</div><div class='del'>- * @error:        0 for success, &lt; 0 for error</div><div class='add'>+ * @error:        %0 for success, &lt; %0 for error</div><div class='ctx'>  * @nr_bytes:     number of bytes to complete @rq</div><div class='ctx'>  * @bidi_bytes:   number of bytes to complete @rq-&gt;next_rq</div><div class='ctx'>  * @drv_callback: function called between completion of bios in the request</div><div class='ctx'>  *                and completion of the request.</div><div class='del'>- *                If the callback returns non 0, this helper returns without</div><div class='add'>+ *                If the callback returns non %0, this helper returns without</div><div class='ctx'>  *                completion of the request.</div><div class='ctx'>  *</div><div class='ctx'>  * Description:</div><div class='hunk'>@@ -1878,8 +1901,8 @@ EXPORT_SYMBOL(end_request);</div><div class='ctx'>  *     If @rq has leftover, sets it up for the next range of segments.</div><div class='ctx'>  *</div><div class='ctx'>  * Return:</div><div class='del'>- *     0 - we are done with this request</div><div class='del'>- *     1 - this request is not freed yet, it still has pending buffers.</div><div class='add'>+ *     %0 - we are done with this request</div><div class='add'>+ *     %1 - this request is not freed yet, it still has pending buffers.</div><div class='ctx'>  **/</div><div class='ctx'> static int blk_end_io(struct request *rq, int error, unsigned int nr_bytes,</div><div class='ctx'> 		      unsigned int bidi_bytes,</div><div class='hunk'>@@ -1888,15 +1911,8 @@ static int blk_end_io(struct request *rq, int error, unsigned int nr_bytes,</div><div class='ctx'> 	struct request_queue *q = rq-&gt;q;</div><div class='ctx'> 	unsigned long flags = 0UL;</div><div class='ctx'> </div><div class='del'>-	if (blk_fs_request(rq) || blk_pc_request(rq)) {</div><div class='del'>-		if (__end_that_request_first(rq, error, nr_bytes))</div><div class='del'>-			return 1;</div><div class='del'>-</div><div class='del'>-		/* Bidi request must be completed as a whole */</div><div class='del'>-		if (blk_bidi_rq(rq) &amp;&amp;</div><div class='del'>-		    __end_that_request_first(rq-&gt;next_rq, error, bidi_bytes))</div><div class='del'>-			return 1;</div><div class='del'>-	}</div><div class='add'>+	if (end_that_request_data(rq, error, nr_bytes, bidi_bytes))</div><div class='add'>+		return 1;</div><div class='ctx'> </div><div class='ctx'> 	/* Special feature for tricky drivers */</div><div class='ctx'> 	if (drv_callback &amp;&amp; drv_callback(rq))</div><div class='hunk'>@@ -1914,7 +1930,7 @@ static int blk_end_io(struct request *rq, int error, unsigned int nr_bytes,</div><div class='ctx'> /**</div><div class='ctx'>  * blk_end_request - Helper function for drivers to complete the request.</div><div class='ctx'>  * @rq:       the request being processed</div><div class='del'>- * @error:    0 for success, &lt; 0 for error</div><div class='add'>+ * @error:    %0 for success, &lt; %0 for error</div><div class='ctx'>  * @nr_bytes: number of bytes to complete</div><div class='ctx'>  *</div><div class='ctx'>  * Description:</div><div class='hunk'>@@ -1922,8 +1938,8 @@ static int blk_end_io(struct request *rq, int error, unsigned int nr_bytes,</div><div class='ctx'>  *     If @rq has leftover, sets it up for the next range of segments.</div><div class='ctx'>  *</div><div class='ctx'>  * Return:</div><div class='del'>- *     0 - we are done with this request</div><div class='del'>- *     1 - still buffers pending for this request</div><div class='add'>+ *     %0 - we are done with this request</div><div class='add'>+ *     %1 - still buffers pending for this request</div><div class='ctx'>  **/</div><div class='ctx'> int blk_end_request(struct request *rq, int error, unsigned int nr_bytes)</div><div class='ctx'> {</div><div class='hunk'>@@ -1934,22 +1950,20 @@ EXPORT_SYMBOL_GPL(blk_end_request);</div><div class='ctx'> /**</div><div class='ctx'>  * __blk_end_request - Helper function for drivers to complete the request.</div><div class='ctx'>  * @rq:       the request being processed</div><div class='del'>- * @error:    0 for success, &lt; 0 for error</div><div class='add'>+ * @error:    %0 for success, &lt; %0 for error</div><div class='ctx'>  * @nr_bytes: number of bytes to complete</div><div class='ctx'>  *</div><div class='ctx'>  * Description:</div><div class='ctx'>  *     Must be called with queue lock held unlike blk_end_request().</div><div class='ctx'>  *</div><div class='ctx'>  * Return:</div><div class='del'>- *     0 - we are done with this request</div><div class='del'>- *     1 - still buffers pending for this request</div><div class='add'>+ *     %0 - we are done with this request</div><div class='add'>+ *     %1 - still buffers pending for this request</div><div class='ctx'>  **/</div><div class='ctx'> int __blk_end_request(struct request *rq, int error, unsigned int nr_bytes)</div><div class='ctx'> {</div><div class='del'>-	if (blk_fs_request(rq) || blk_pc_request(rq)) {</div><div class='del'>-		if (__end_that_request_first(rq, error, nr_bytes))</div><div class='del'>-			return 1;</div><div class='del'>-	}</div><div class='add'>+	if (rq-&gt;bio &amp;&amp; __end_that_request_first(rq, error, nr_bytes))</div><div class='add'>+		return 1;</div><div class='ctx'> </div><div class='ctx'> 	add_disk_randomness(rq-&gt;rq_disk);</div><div class='ctx'> </div><div class='hunk'>@@ -1962,7 +1976,7 @@ EXPORT_SYMBOL_GPL(__blk_end_request);</div><div class='ctx'> /**</div><div class='ctx'>  * blk_end_bidi_request - Helper function for drivers to complete bidi request.</div><div class='ctx'>  * @rq:         the bidi request being processed</div><div class='del'>- * @error:      0 for success, &lt; 0 for error</div><div class='add'>+ * @error:      %0 for success, &lt; %0 for error</div><div class='ctx'>  * @nr_bytes:   number of bytes to complete @rq</div><div class='ctx'>  * @bidi_bytes: number of bytes to complete @rq-&gt;next_rq</div><div class='ctx'>  *</div><div class='hunk'>@@ -1970,8 +1984,8 @@ EXPORT_SYMBOL_GPL(__blk_end_request);</div><div class='ctx'>  *     Ends I/O on a number of bytes attached to @rq and @rq-&gt;next_rq.</div><div class='ctx'>  *</div><div class='ctx'>  * Return:</div><div class='del'>- *     0 - we are done with this request</div><div class='del'>- *     1 - still buffers pending for this request</div><div class='add'>+ *     %0 - we are done with this request</div><div class='add'>+ *     %1 - still buffers pending for this request</div><div class='ctx'>  **/</div><div class='ctx'> int blk_end_bidi_request(struct request *rq, int error, unsigned int nr_bytes,</div><div class='ctx'> 			 unsigned int bidi_bytes)</div><div class='hunk'>@@ -1981,13 +1995,43 @@ int blk_end_bidi_request(struct request *rq, int error, unsigned int nr_bytes,</div><div class='ctx'> EXPORT_SYMBOL_GPL(blk_end_bidi_request);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * blk_update_request - Special helper function for request stacking drivers</div><div class='add'>+ * @rq:           the request being processed</div><div class='add'>+ * @error:        %0 for success, &lt; %0 for error</div><div class='add'>+ * @nr_bytes:     number of bytes to complete @rq</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ *     Ends I/O on a number of bytes attached to @rq, but doesn't complete</div><div class='add'>+ *     the request structure even if @rq doesn't have leftover.</div><div class='add'>+ *     If @rq has leftover, sets it up for the next range of segments.</div><div class='add'>+ *</div><div class='add'>+ *     This special helper function is only for request stacking drivers</div><div class='add'>+ *     (e.g. request-based dm) so that they can handle partial completion.</div><div class='add'>+ *     Actual device drivers should use blk_end_request instead.</div><div class='add'>+ */</div><div class='add'>+void blk_update_request(struct request *rq, int error, unsigned int nr_bytes)</div><div class='add'>+{</div><div class='add'>+	if (!end_that_request_data(rq, error, nr_bytes, 0)) {</div><div class='add'>+		/*</div><div class='add'>+		 * These members are not updated in end_that_request_data()</div><div class='add'>+		 * when all bios are completed.</div><div class='add'>+		 * Update them so that the request stacking driver can find</div><div class='add'>+		 * how many bytes remain in the request later.</div><div class='add'>+		 */</div><div class='add'>+		rq-&gt;nr_sectors = rq-&gt;hard_nr_sectors = 0;</div><div class='add'>+		rq-&gt;current_nr_sectors = rq-&gt;hard_cur_sectors = 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(blk_update_request);</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * blk_end_request_callback - Special helper function for tricky drivers</div><div class='ctx'>  * @rq:           the request being processed</div><div class='del'>- * @error:        0 for success, &lt; 0 for error</div><div class='add'>+ * @error:        %0 for success, &lt; %0 for error</div><div class='ctx'>  * @nr_bytes:     number of bytes to complete</div><div class='ctx'>  * @drv_callback: function called between completion of bios in the request</div><div class='ctx'>  *                and completion of the request.</div><div class='del'>- *                If the callback returns non 0, this helper returns without</div><div class='add'>+ *                If the callback returns non %0, this helper returns without</div><div class='ctx'>  *                completion of the request.</div><div class='ctx'>  *</div><div class='ctx'>  * Description:</div><div class='hunk'>@@ -2000,10 +2044,10 @@ EXPORT_SYMBOL_GPL(blk_end_bidi_request);</div><div class='ctx'>  *     Don't use this interface in other places anymore.</div><div class='ctx'>  *</div><div class='ctx'>  * Return:</div><div class='del'>- *     0 - we are done with this request</div><div class='del'>- *     1 - this request is not freed yet.</div><div class='del'>- *         this request still has pending buffers or</div><div class='del'>- *         the driver doesn't want to finish this request yet.</div><div class='add'>+ *     %0 - we are done with this request</div><div class='add'>+ *     %1 - this request is not freed yet.</div><div class='add'>+ *          this request still has pending buffers or</div><div class='add'>+ *          the driver doesn't want to finish this request yet.</div><div class='ctx'>  **/</div><div class='ctx'> int blk_end_request_callback(struct request *rq, int error,</div><div class='ctx'> 			     unsigned int nr_bytes,</div><div class='hunk'>@@ -2016,15 +2060,17 @@ EXPORT_SYMBOL_GPL(blk_end_request_callback);</div><div class='ctx'> void blk_rq_bio_prep(struct request_queue *q, struct request *rq,</div><div class='ctx'> 		     struct bio *bio)</div><div class='ctx'> {</div><div class='del'>-	/* first two bits are identical in rq-&gt;cmd_flags and bio-&gt;bi_rw */</div><div class='add'>+	/* Bit 0 (R/W) is identical in rq-&gt;cmd_flags and bio-&gt;bi_rw, and</div><div class='add'>+	   we want BIO_RW_AHEAD (bit 1) to imply REQ_FAILFAST (bit 1). */</div><div class='ctx'> 	rq-&gt;cmd_flags |= (bio-&gt;bi_rw &amp; 3);</div><div class='ctx'> </div><div class='del'>-	rq-&gt;nr_phys_segments = bio_phys_segments(q, bio);</div><div class='del'>-	rq-&gt;nr_hw_segments = bio_hw_segments(q, bio);</div><div class='add'>+	if (bio_has_data(bio)) {</div><div class='add'>+		rq-&gt;nr_phys_segments = bio_phys_segments(q, bio);</div><div class='add'>+		rq-&gt;buffer = bio_data(bio);</div><div class='add'>+	}</div><div class='ctx'> 	rq-&gt;current_nr_sectors = bio_cur_sectors(bio);</div><div class='ctx'> 	rq-&gt;hard_cur_sectors = rq-&gt;current_nr_sectors;</div><div class='ctx'> 	rq-&gt;hard_nr_sectors = rq-&gt;nr_sectors = bio_sectors(bio);</div><div class='del'>-	rq-&gt;buffer = bio_data(bio);</div><div class='ctx'> 	rq-&gt;data_len = bio-&gt;bi_size;</div><div class='ctx'> </div><div class='ctx'> 	rq-&gt;bio = rq-&gt;biotail = bio;</div><div class='hunk'>@@ -2033,7 +2079,35 @@ void blk_rq_bio_prep(struct request_queue *q, struct request *rq,</div><div class='ctx'> 		rq-&gt;rq_disk = bio-&gt;bi_bdev-&gt;bd_disk;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int kblockd_schedule_work(struct work_struct *work)</div><div class='add'>+/**</div><div class='add'>+ * blk_lld_busy - Check if underlying low-level drivers of a device are busy</div><div class='add'>+ * @q : the queue of the device being checked</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ *    Check if underlying low-level drivers of a device are busy.</div><div class='add'>+ *    If the drivers want to export their busy state, they must set own</div><div class='add'>+ *    exporting function using blk_queue_lld_busy() first.</div><div class='add'>+ *</div><div class='add'>+ *    Basically, this function is used only by request stacking drivers</div><div class='add'>+ *    to stop dispatching requests to underlying devices when underlying</div><div class='add'>+ *    devices are busy.  This behavior helps more I/O merging on the queue</div><div class='add'>+ *    of the request stacking driver and prevents I/O throughput regression</div><div class='add'>+ *    on burst I/O load.</div><div class='add'>+ *</div><div class='add'>+ * Return:</div><div class='add'>+ *    0 - Not busy (The request stacking driver should dispatch request)</div><div class='add'>+ *    1 - Busy (The request stacking driver should stop dispatching request)</div><div class='add'>+ */</div><div class='add'>+int blk_lld_busy(struct request_queue *q)</div><div class='add'>+{</div><div class='add'>+	if (q-&gt;lld_busy_fn)</div><div class='add'>+		return q-&gt;lld_busy_fn(q);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(blk_lld_busy);</div><div class='add'>+</div><div class='add'>+int kblockd_schedule_work(struct request_queue *q, struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	return queue_work(kblockd_workqueue, work);</div><div class='ctx'> }</div><div class='hunk'>@@ -2047,8 +2121,6 @@ EXPORT_SYMBOL(kblockd_flush_work);</div><div class='ctx'> </div><div class='ctx'> int __init blk_dev_init(void)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='ctx'> 	kblockd_workqueue = create_workqueue("kblockd");</div><div class='ctx'> 	if (!kblockd_workqueue)</div><div class='ctx'> 		panic("Failed to create kblockd\n");</div><div class='hunk'>@@ -2059,12 +2131,6 @@ int __init blk_dev_init(void)</div><div class='ctx'> 	blk_requestq_cachep = kmem_cache_create("blkdev_queue",</div><div class='ctx'> 			sizeof(struct request_queue), 0, SLAB_PANIC, NULL);</div><div class='ctx'> </div><div class='del'>-	for_each_possible_cpu(i)</div><div class='del'>-		INIT_LIST_HEAD(&amp;per_cpu(blk_cpu_done, i));</div><div class='del'>-</div><div class='del'>-	open_softirq(BLOCK_SOFTIRQ, blk_done_softirq);</div><div class='del'>-	register_hotcpu_notifier(&amp;blk_cpu_notifier);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/block/blk-exec.c b/block/blk-exec.c<br/>index 9bceff7674f2..6af716d1e54e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/block/blk-exec.c?id=c15895ef30c2c03e99802951787183039a349d32'>block/blk-exec.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/block/blk-exec.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>block/blk-exec.c</a></div><div class='hunk'>@@ -16,7 +16,7 @@</div><div class='ctx'> /**</div><div class='ctx'>  * blk_end_sync_rq - executes a completion event on a request</div><div class='ctx'>  * @rq: request to complete</div><div class='del'>- * @error: end io status of the request</div><div class='add'>+ * @error: end I/O status of the request</div><div class='ctx'>  */</div><div class='ctx'> static void blk_end_sync_rq(struct request *rq, int error)</div><div class='ctx'> {</div><div class='hunk'>@@ -41,7 +41,7 @@ static void blk_end_sync_rq(struct request *rq, int error)</div><div class='ctx'>  * @done:	I/O completion handler</div><div class='ctx'>  *</div><div class='ctx'>  * Description:</div><div class='del'>- *    Insert a fully prepared request at the back of the io scheduler queue</div><div class='add'>+ *    Insert a fully prepared request at the back of the I/O scheduler queue</div><div class='ctx'>  *    for execution.  Don't wait for completion.</div><div class='ctx'>  */</div><div class='ctx'> void blk_execute_rq_nowait(struct request_queue *q, struct gendisk *bd_disk,</div><div class='hunk'>@@ -72,7 +72,7 @@ EXPORT_SYMBOL_GPL(blk_execute_rq_nowait);</div><div class='ctx'>  * @at_head:    insert request at head or tail of queue</div><div class='ctx'>  *</div><div class='ctx'>  * Description:</div><div class='del'>- *    Insert a fully prepared request at the back of the io scheduler queue</div><div class='add'>+ *    Insert a fully prepared request at the back of the I/O scheduler queue</div><div class='ctx'>  *    for execution and wait for completion.</div><div class='ctx'>  */</div><div class='ctx'> int blk_execute_rq(struct request_queue *q, struct gendisk *bd_disk,</div><div class='head'>diff --git a/block/blk-integrity.c b/block/blk-integrity.c<br/>index 3f1a8478cc38..61a8e2f8fdd0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/block/blk-integrity.c?id=c15895ef30c2c03e99802951787183039a349d32'>block/blk-integrity.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/block/blk-integrity.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>block/blk-integrity.c</a></div><div class='hunk'>@@ -108,51 +108,51 @@ new_segment:</div><div class='ctx'> EXPORT_SYMBOL(blk_rq_map_integrity_sg);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * blk_integrity_compare - Compare integrity profile of two block devices</div><div class='del'>- * @b1:		Device to compare</div><div class='del'>- * @b2:		Device to compare</div><div class='add'>+ * blk_integrity_compare - Compare integrity profile of two disks</div><div class='add'>+ * @gd1:	Disk to compare</div><div class='add'>+ * @gd2:	Disk to compare</div><div class='ctx'>  *</div><div class='ctx'>  * Description: Meta-devices like DM and MD need to verify that all</div><div class='ctx'>  * sub-devices use the same integrity format before advertising to</div><div class='ctx'>  * upper layers that they can send/receive integrity metadata.  This</div><div class='del'>- * function can be used to check whether two block devices have</div><div class='add'>+ * function can be used to check whether two gendisk devices have</div><div class='ctx'>  * compatible integrity formats.</div><div class='ctx'>  */</div><div class='del'>-int blk_integrity_compare(struct block_device *bd1, struct block_device *bd2)</div><div class='add'>+int blk_integrity_compare(struct gendisk *gd1, struct gendisk *gd2)</div><div class='ctx'> {</div><div class='del'>-	struct blk_integrity *b1 = bd1-&gt;bd_disk-&gt;integrity;</div><div class='del'>-	struct blk_integrity *b2 = bd2-&gt;bd_disk-&gt;integrity;</div><div class='add'>+	struct blk_integrity *b1 = gd1-&gt;integrity;</div><div class='add'>+	struct blk_integrity *b2 = gd2-&gt;integrity;</div><div class='ctx'> </div><div class='del'>-	BUG_ON(bd1-&gt;bd_disk == NULL);</div><div class='del'>-	BUG_ON(bd2-&gt;bd_disk == NULL);</div><div class='add'>+	if (!b1 &amp;&amp; !b2)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!b1 || !b2)</div><div class='del'>-		return 0;</div><div class='add'>+		return -1;</div><div class='ctx'> </div><div class='ctx'> 	if (b1-&gt;sector_size != b2-&gt;sector_size) {</div><div class='ctx'> 		printk(KERN_ERR "%s: %s/%s sector sz %u != %u\n", __func__,</div><div class='del'>-		       bd1-&gt;bd_disk-&gt;disk_name, bd2-&gt;bd_disk-&gt;disk_name,</div><div class='add'>+		       gd1-&gt;disk_name, gd2-&gt;disk_name,</div><div class='ctx'> 		       b1-&gt;sector_size, b2-&gt;sector_size);</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (b1-&gt;tuple_size != b2-&gt;tuple_size) {</div><div class='ctx'> 		printk(KERN_ERR "%s: %s/%s tuple sz %u != %u\n", __func__,</div><div class='del'>-		       bd1-&gt;bd_disk-&gt;disk_name, bd2-&gt;bd_disk-&gt;disk_name,</div><div class='add'>+		       gd1-&gt;disk_name, gd2-&gt;disk_name,</div><div class='ctx'> 		       b1-&gt;tuple_size, b2-&gt;tuple_size);</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (b1-&gt;tag_size &amp;&amp; b2-&gt;tag_size &amp;&amp; (b1-&gt;tag_size != b2-&gt;tag_size)) {</div><div class='ctx'> 		printk(KERN_ERR "%s: %s/%s tag sz %u != %u\n", __func__,</div><div class='del'>-		       bd1-&gt;bd_disk-&gt;disk_name, bd2-&gt;bd_disk-&gt;disk_name,</div><div class='add'>+		       gd1-&gt;disk_name, gd2-&gt;disk_name,</div><div class='ctx'> 		       b1-&gt;tag_size, b2-&gt;tag_size);</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (strcmp(b1-&gt;name, b2-&gt;name)) {</div><div class='ctx'> 		printk(KERN_ERR "%s: %s/%s type %s != %s\n", __func__,</div><div class='del'>-		       bd1-&gt;bd_disk-&gt;disk_name, bd2-&gt;bd_disk-&gt;disk_name,</div><div class='add'>+		       gd1-&gt;disk_name, gd2-&gt;disk_name,</div><div class='ctx'> 		       b1-&gt;name, b2-&gt;name);</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -331,7 +331,8 @@ int blk_integrity_register(struct gendisk *disk, struct blk_integrity *template)</div><div class='ctx'> 			return -1;</div><div class='ctx'> </div><div class='ctx'> 		if (kobject_init_and_add(&amp;bi-&gt;kobj, &amp;integrity_ktype,</div><div class='del'>-					 &amp;disk-&gt;dev.kobj, "%s", "integrity")) {</div><div class='add'>+					 &amp;disk_to_dev(disk)-&gt;kobj,</div><div class='add'>+					 "%s", "integrity")) {</div><div class='ctx'> 			kmem_cache_free(integrity_cachep, bi);</div><div class='ctx'> 			return -1;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -375,7 +376,7 @@ void blk_integrity_unregister(struct gendisk *disk)</div><div class='ctx'> </div><div class='ctx'> 	kobject_uevent(&amp;bi-&gt;kobj, KOBJ_REMOVE);</div><div class='ctx'> 	kobject_del(&amp;bi-&gt;kobj);</div><div class='del'>-	kobject_put(&amp;disk-&gt;dev.kobj);</div><div class='ctx'> 	kmem_cache_free(integrity_cachep, bi);</div><div class='add'>+	disk-&gt;integrity = NULL;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(blk_integrity_unregister);</div><div class='head'>diff --git a/block/blk-map.c b/block/blk-map.c<br/>index af37e4ae62f5..4849fa36161e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/block/blk-map.c?id=c15895ef30c2c03e99802951787183039a349d32'>block/blk-map.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/block/blk-map.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>block/blk-map.c</a></div><div class='hunk'>@@ -41,10 +41,10 @@ static int __blk_rq_unmap_user(struct bio *bio)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __blk_rq_map_user(struct request_queue *q, struct request *rq,</div><div class='del'>-			     void __user *ubuf, unsigned int len)</div><div class='add'>+			     struct rq_map_data *map_data, void __user *ubuf,</div><div class='add'>+			     unsigned int len, int null_mapped, gfp_t gfp_mask)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long uaddr;</div><div class='del'>-	unsigned int alignment;</div><div class='ctx'> 	struct bio *bio, *orig_bio;</div><div class='ctx'> 	int reading, ret;</div><div class='ctx'> </div><div class='hunk'>@@ -55,15 +55,17 @@ static int __blk_rq_map_user(struct request_queue *q, struct request *rq,</div><div class='ctx'> 	 * direct dma. else, set up kernel bounce buffers</div><div class='ctx'> 	 */</div><div class='ctx'> 	uaddr = (unsigned long) ubuf;</div><div class='del'>-	alignment = queue_dma_alignment(q) | q-&gt;dma_pad_mask;</div><div class='del'>-	if (!(uaddr &amp; alignment) &amp;&amp; !(len &amp; alignment))</div><div class='del'>-		bio = bio_map_user(q, NULL, uaddr, len, reading);</div><div class='add'>+	if (blk_rq_aligned(q, ubuf, len) &amp;&amp; !map_data)</div><div class='add'>+		bio = bio_map_user(q, NULL, uaddr, len, reading, gfp_mask);</div><div class='ctx'> 	else</div><div class='del'>-		bio = bio_copy_user(q, uaddr, len, reading);</div><div class='add'>+		bio = bio_copy_user(q, map_data, uaddr, len, reading, gfp_mask);</div><div class='ctx'> </div><div class='ctx'> 	if (IS_ERR(bio))</div><div class='ctx'> 		return PTR_ERR(bio);</div><div class='ctx'> </div><div class='add'>+	if (null_mapped)</div><div class='add'>+		bio-&gt;bi_flags |= (1 &lt;&lt; BIO_NULL_MAPPED);</div><div class='add'>+</div><div class='ctx'> 	orig_bio = bio;</div><div class='ctx'> 	blk_queue_bounce(q, &amp;bio);</div><div class='ctx'> </div><div class='hunk'>@@ -85,17 +87,19 @@ static int __blk_rq_map_user(struct request_queue *q, struct request *rq,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * blk_rq_map_user - map user data to a request, for REQ_BLOCK_PC usage</div><div class='add'>+ * blk_rq_map_user - map user data to a request, for REQ_TYPE_BLOCK_PC usage</div><div class='ctx'>  * @q:		request queue where request should be inserted</div><div class='ctx'>  * @rq:		request structure to fill</div><div class='add'>+ * @map_data:   pointer to the rq_map_data holding pages (if necessary)</div><div class='ctx'>  * @ubuf:	the user buffer</div><div class='ctx'>  * @len:	length of user data</div><div class='add'>+ * @gfp_mask:	memory allocation flags</div><div class='ctx'>  *</div><div class='ctx'>  * Description:</div><div class='del'>- *    Data will be mapped directly for zero copy io, if possible. Otherwise</div><div class='add'>+ *    Data will be mapped directly for zero copy I/O, if possible. Otherwise</div><div class='ctx'>  *    a kernel bounce buffer is used.</div><div class='ctx'>  *</div><div class='del'>- *    A matching blk_rq_unmap_user() must be issued at the end of io, while</div><div class='add'>+ *    A matching blk_rq_unmap_user() must be issued at the end of I/O, while</div><div class='ctx'>  *    still in process context.</div><div class='ctx'>  *</div><div class='ctx'>  *    Note: The mapped bio may need to be bounced through blk_queue_bounce()</div><div class='hunk'>@@ -105,16 +109,22 @@ static int __blk_rq_map_user(struct request_queue *q, struct request *rq,</div><div class='ctx'>  *    unmapping.</div><div class='ctx'>  */</div><div class='ctx'> int blk_rq_map_user(struct request_queue *q, struct request *rq,</div><div class='del'>-		    void __user *ubuf, unsigned long len)</div><div class='add'>+		    struct rq_map_data *map_data, void __user *ubuf,</div><div class='add'>+		    unsigned long len, gfp_t gfp_mask)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long bytes_read = 0;</div><div class='ctx'> 	struct bio *bio = NULL;</div><div class='del'>-	int ret;</div><div class='add'>+	int ret, null_mapped = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt; (q-&gt;max_hw_sectors &lt;&lt; 9))</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	if (!len || !ubuf)</div><div class='add'>+	if (!len)</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	if (!ubuf) {</div><div class='add'>+		if (!map_data || rq_data_dir(rq) != READ)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		null_mapped = 1;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	while (bytes_read != len) {</div><div class='ctx'> 		unsigned long map_len, end, start;</div><div class='hunk'>@@ -132,7 +142,8 @@ int blk_rq_map_user(struct request_queue *q, struct request *rq,</div><div class='ctx'> 		if (end - start &gt; BIO_MAX_PAGES)</div><div class='ctx'> 			map_len -= PAGE_SIZE;</div><div class='ctx'> </div><div class='del'>-		ret = __blk_rq_map_user(q, rq, ubuf, map_len);</div><div class='add'>+		ret = __blk_rq_map_user(q, rq, map_data, ubuf, map_len,</div><div class='add'>+					null_mapped, gfp_mask);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			goto unmap_rq;</div><div class='ctx'> 		if (!bio)</div><div class='hunk'>@@ -154,18 +165,20 @@ unmap_rq:</div><div class='ctx'> EXPORT_SYMBOL(blk_rq_map_user);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * blk_rq_map_user_iov - map user data to a request, for REQ_BLOCK_PC usage</div><div class='add'>+ * blk_rq_map_user_iov - map user data to a request, for REQ_TYPE_BLOCK_PC usage</div><div class='ctx'>  * @q:		request queue where request should be inserted</div><div class='ctx'>  * @rq:		request to map data to</div><div class='add'>+ * @map_data:   pointer to the rq_map_data holding pages (if necessary)</div><div class='ctx'>  * @iov:	pointer to the iovec</div><div class='ctx'>  * @iov_count:	number of elements in the iovec</div><div class='ctx'>  * @len:	I/O byte count</div><div class='add'>+ * @gfp_mask:	memory allocation flags</div><div class='ctx'>  *</div><div class='ctx'>  * Description:</div><div class='del'>- *    Data will be mapped directly for zero copy io, if possible. Otherwise</div><div class='add'>+ *    Data will be mapped directly for zero copy I/O, if possible. Otherwise</div><div class='ctx'>  *    a kernel bounce buffer is used.</div><div class='ctx'>  *</div><div class='del'>- *    A matching blk_rq_unmap_user() must be issued at the end of io, while</div><div class='add'>+ *    A matching blk_rq_unmap_user() must be issued at the end of I/O, while</div><div class='ctx'>  *    still in process context.</div><div class='ctx'>  *</div><div class='ctx'>  *    Note: The mapped bio may need to be bounced through blk_queue_bounce()</div><div class='hunk'>@@ -175,7 +188,8 @@ EXPORT_SYMBOL(blk_rq_map_user);</div><div class='ctx'>  *    unmapping.</div><div class='ctx'>  */</div><div class='ctx'> int blk_rq_map_user_iov(struct request_queue *q, struct request *rq,</div><div class='del'>-			struct sg_iovec *iov, int iov_count, unsigned int len)</div><div class='add'>+			struct rq_map_data *map_data, struct sg_iovec *iov,</div><div class='add'>+			int iov_count, unsigned int len, gfp_t gfp_mask)</div><div class='ctx'> {</div><div class='ctx'> 	struct bio *bio;</div><div class='ctx'> 	int i, read = rq_data_dir(rq) == READ;</div><div class='hunk'>@@ -193,10 +207,11 @@ int blk_rq_map_user_iov(struct request_queue *q, struct request *rq,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (unaligned || (q-&gt;dma_pad_mask &amp; len))</div><div class='del'>-		bio = bio_copy_user_iov(q, iov, iov_count, read);</div><div class='add'>+	if (unaligned || (q-&gt;dma_pad_mask &amp; len) || map_data)</div><div class='add'>+		bio = bio_copy_user_iov(q, map_data, iov, iov_count, read,</div><div class='add'>+					gfp_mask);</div><div class='ctx'> 	else</div><div class='del'>-		bio = bio_map_user_iov(q, NULL, iov, iov_count, read);</div><div class='add'>+		bio = bio_map_user_iov(q, NULL, iov, iov_count, read, gfp_mask);</div><div class='ctx'> </div><div class='ctx'> 	if (IS_ERR(bio))</div><div class='ctx'> 		return PTR_ERR(bio);</div><div class='hunk'>@@ -216,6 +231,7 @@ int blk_rq_map_user_iov(struct request_queue *q, struct request *rq,</div><div class='ctx'> 	rq-&gt;buffer = rq-&gt;data = NULL;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(blk_rq_map_user_iov);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * blk_rq_unmap_user - unmap a request with user data</div><div class='hunk'>@@ -224,7 +240,7 @@ int blk_rq_map_user_iov(struct request_queue *q, struct request *rq,</div><div class='ctx'>  * Description:</div><div class='ctx'>  *    Unmap a rq previously mapped by blk_rq_map_user(). The caller must</div><div class='ctx'>  *    supply the original rq-&gt;bio from the blk_rq_map_user() return, since</div><div class='del'>- *    the io completion may have changed rq-&gt;bio.</div><div class='add'>+ *    the I/O completion may have changed rq-&gt;bio.</div><div class='ctx'>  */</div><div class='ctx'> int blk_rq_unmap_user(struct bio *bio)</div><div class='ctx'> {</div><div class='hunk'>@@ -250,7 +266,7 @@ int blk_rq_unmap_user(struct bio *bio)</div><div class='ctx'> EXPORT_SYMBOL(blk_rq_unmap_user);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * blk_rq_map_kern - map kernel data to a request, for REQ_BLOCK_PC usage</div><div class='add'>+ * blk_rq_map_kern - map kernel data to a request, for REQ_TYPE_BLOCK_PC usage</div><div class='ctx'>  * @q:		request queue where request should be inserted</div><div class='ctx'>  * @rq:		request to fill</div><div class='ctx'>  * @kbuf:	the kernel buffer</div><div class='hunk'>@@ -264,8 +280,6 @@ EXPORT_SYMBOL(blk_rq_unmap_user);</div><div class='ctx'> int blk_rq_map_kern(struct request_queue *q, struct request *rq, void *kbuf,</div><div class='ctx'> 		    unsigned int len, gfp_t gfp_mask)</div><div class='ctx'> {</div><div class='del'>-	unsigned long kaddr;</div><div class='del'>-	unsigned int alignment;</div><div class='ctx'> 	int reading = rq_data_dir(rq) == READ;</div><div class='ctx'> 	int do_copy = 0;</div><div class='ctx'> 	struct bio *bio;</div><div class='hunk'>@@ -275,11 +289,7 @@ int blk_rq_map_kern(struct request_queue *q, struct request *rq, void *kbuf,</div><div class='ctx'> 	if (!len || !kbuf)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	kaddr = (unsigned long)kbuf;</div><div class='del'>-	alignment = queue_dma_alignment(q) | q-&gt;dma_pad_mask;</div><div class='del'>-	do_copy = ((kaddr &amp; alignment) || (len &amp; alignment) ||</div><div class='del'>-		   object_is_on_stack(kbuf));</div><div class='del'>-</div><div class='add'>+	do_copy = !blk_rq_aligned(q, kbuf, len) || object_is_on_stack(kbuf);</div><div class='ctx'> 	if (do_copy)</div><div class='ctx'> 		bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);</div><div class='ctx'> 	else</div><div class='head'>diff --git a/block/blk-merge.c b/block/blk-merge.c<br/>index 5efc9e7a68b7..8681cd6f9911 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/block/blk-merge.c?id=c15895ef30c2c03e99802951787183039a349d32'>block/blk-merge.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/block/blk-merge.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>block/blk-merge.c</a></div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> </div><div class='ctx'> void blk_recalc_rq_sectors(struct request *rq, int nsect)</div><div class='ctx'> {</div><div class='del'>-	if (blk_fs_request(rq)) {</div><div class='add'>+	if (blk_fs_request(rq) || blk_discard_rq(rq)) {</div><div class='ctx'> 		rq-&gt;hard_sector += nsect;</div><div class='ctx'> 		rq-&gt;hard_nr_sectors -= nsect;</div><div class='ctx'> </div><div class='hunk'>@@ -41,12 +41,9 @@ void blk_recalc_rq_sectors(struct request *rq, int nsect)</div><div class='ctx'> void blk_recalc_rq_segments(struct request *rq)</div><div class='ctx'> {</div><div class='ctx'> 	int nr_phys_segs;</div><div class='del'>-	int nr_hw_segs;</div><div class='ctx'> 	unsigned int phys_size;</div><div class='del'>-	unsigned int hw_size;</div><div class='ctx'> 	struct bio_vec *bv, *bvprv = NULL;</div><div class='ctx'> 	int seg_size;</div><div class='del'>-	int hw_seg_size;</div><div class='ctx'> 	int cluster;</div><div class='ctx'> 	struct req_iterator iter;</div><div class='ctx'> 	int high, highprv = 1;</div><div class='hunk'>@@ -56,8 +53,8 @@ void blk_recalc_rq_segments(struct request *rq)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	cluster = test_bit(QUEUE_FLAG_CLUSTER, &amp;q-&gt;queue_flags);</div><div class='del'>-	hw_seg_size = seg_size = 0;</div><div class='del'>-	phys_size = hw_size = nr_phys_segs = nr_hw_segs = 0;</div><div class='add'>+	seg_size = 0;</div><div class='add'>+	phys_size = nr_phys_segs = 0;</div><div class='ctx'> 	rq_for_each_segment(bv, rq, iter) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * the trick here is making sure that a high page is never</div><div class='hunk'>@@ -66,7 +63,7 @@ void blk_recalc_rq_segments(struct request *rq)</div><div class='ctx'> 		 */</div><div class='ctx'> 		high = page_to_pfn(bv-&gt;bv_page) &gt; q-&gt;bounce_pfn;</div><div class='ctx'> 		if (high || highprv)</div><div class='del'>-			goto new_hw_segment;</div><div class='add'>+			goto new_segment;</div><div class='ctx'> 		if (cluster) {</div><div class='ctx'> 			if (seg_size + bv-&gt;bv_len &gt; q-&gt;max_segment_size)</div><div class='ctx'> 				goto new_segment;</div><div class='hunk'>@@ -74,26 +71,14 @@ void blk_recalc_rq_segments(struct request *rq)</div><div class='ctx'> 				goto new_segment;</div><div class='ctx'> 			if (!BIOVEC_SEG_BOUNDARY(q, bvprv, bv))</div><div class='ctx'> 				goto new_segment;</div><div class='del'>-			if (BIOVEC_VIRT_OVERSIZE(hw_seg_size + bv-&gt;bv_len))</div><div class='del'>-				goto new_hw_segment;</div><div class='ctx'> </div><div class='ctx'> 			seg_size += bv-&gt;bv_len;</div><div class='del'>-			hw_seg_size += bv-&gt;bv_len;</div><div class='ctx'> 			bvprv = bv;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> new_segment:</div><div class='del'>-		if (BIOVEC_VIRT_MERGEABLE(bvprv, bv) &amp;&amp;</div><div class='del'>-		    !BIOVEC_VIRT_OVERSIZE(hw_seg_size + bv-&gt;bv_len))</div><div class='del'>-			hw_seg_size += bv-&gt;bv_len;</div><div class='del'>-		else {</div><div class='del'>-new_hw_segment:</div><div class='del'>-			if (nr_hw_segs == 1 &amp;&amp;</div><div class='del'>-			    hw_seg_size &gt; rq-&gt;bio-&gt;bi_hw_front_size)</div><div class='del'>-				rq-&gt;bio-&gt;bi_hw_front_size = hw_seg_size;</div><div class='del'>-			hw_seg_size = BIOVEC_VIRT_START_SIZE(bv) + bv-&gt;bv_len;</div><div class='del'>-			nr_hw_segs++;</div><div class='del'>-		}</div><div class='add'>+		if (nr_phys_segs == 1 &amp;&amp; seg_size &gt; rq-&gt;bio-&gt;bi_seg_front_size)</div><div class='add'>+			rq-&gt;bio-&gt;bi_seg_front_size = seg_size;</div><div class='ctx'> </div><div class='ctx'> 		nr_phys_segs++;</div><div class='ctx'> 		bvprv = bv;</div><div class='hunk'>@@ -101,13 +86,12 @@ new_hw_segment:</div><div class='ctx'> 		highprv = high;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (nr_hw_segs == 1 &amp;&amp;</div><div class='del'>-	    hw_seg_size &gt; rq-&gt;bio-&gt;bi_hw_front_size)</div><div class='del'>-		rq-&gt;bio-&gt;bi_hw_front_size = hw_seg_size;</div><div class='del'>-	if (hw_seg_size &gt; rq-&gt;biotail-&gt;bi_hw_back_size)</div><div class='del'>-		rq-&gt;biotail-&gt;bi_hw_back_size = hw_seg_size;</div><div class='add'>+	if (nr_phys_segs == 1 &amp;&amp; seg_size &gt; rq-&gt;bio-&gt;bi_seg_front_size)</div><div class='add'>+		rq-&gt;bio-&gt;bi_seg_front_size = seg_size;</div><div class='add'>+	if (seg_size &gt; rq-&gt;biotail-&gt;bi_seg_back_size)</div><div class='add'>+		rq-&gt;biotail-&gt;bi_seg_back_size = seg_size;</div><div class='add'>+</div><div class='ctx'> 	rq-&gt;nr_phys_segments = nr_phys_segs;</div><div class='del'>-	rq-&gt;nr_hw_segments = nr_hw_segs;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void blk_recount_segments(struct request_queue *q, struct bio *bio)</div><div class='hunk'>@@ -120,7 +104,6 @@ void blk_recount_segments(struct request_queue *q, struct bio *bio)</div><div class='ctx'> 	blk_recalc_rq_segments(&amp;rq);</div><div class='ctx'> 	bio-&gt;bi_next = nxt;</div><div class='ctx'> 	bio-&gt;bi_phys_segments = rq.nr_phys_segments;</div><div class='del'>-	bio-&gt;bi_hw_segments = rq.nr_hw_segments;</div><div class='ctx'> 	bio-&gt;bi_flags |= (1 &lt;&lt; BIO_SEG_VALID);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(blk_recount_segments);</div><div class='hunk'>@@ -131,13 +114,18 @@ static int blk_phys_contig_segment(struct request_queue *q, struct bio *bio,</div><div class='ctx'> 	if (!test_bit(QUEUE_FLAG_CLUSTER, &amp;q-&gt;queue_flags))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (!BIOVEC_PHYS_MERGEABLE(__BVEC_END(bio), __BVEC_START(nxt)))</div><div class='add'>+	if (bio-&gt;bi_seg_back_size + nxt-&gt;bi_seg_front_size &gt;</div><div class='add'>+	    q-&gt;max_segment_size)</div><div class='ctx'> 		return 0;</div><div class='del'>-	if (bio-&gt;bi_size + nxt-&gt;bi_size &gt; q-&gt;max_segment_size)</div><div class='add'>+</div><div class='add'>+	if (!bio_has_data(bio))</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	if (!BIOVEC_PHYS_MERGEABLE(__BVEC_END(bio), __BVEC_START(nxt)))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * bio and nxt are contigous in memory, check if the queue allows</div><div class='add'>+	 * bio and nxt are contiguous in memory; check if the queue allows</div><div class='ctx'> 	 * these two to be merged into one</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (BIO_SEG_BOUNDARY(q, bio, nxt))</div><div class='hunk'>@@ -146,22 +134,6 @@ static int blk_phys_contig_segment(struct request_queue *q, struct bio *bio,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int blk_hw_contig_segment(struct request_queue *q, struct bio *bio,</div><div class='del'>-				 struct bio *nxt)</div><div class='del'>-{</div><div class='del'>-	if (!bio_flagged(bio, BIO_SEG_VALID))</div><div class='del'>-		blk_recount_segments(q, bio);</div><div class='del'>-	if (!bio_flagged(nxt, BIO_SEG_VALID))</div><div class='del'>-		blk_recount_segments(q, nxt);</div><div class='del'>-	if (!BIOVEC_VIRT_MERGEABLE(__BVEC_END(bio), __BVEC_START(nxt)) ||</div><div class='del'>-	    BIOVEC_VIRT_OVERSIZE(bio-&gt;bi_hw_back_size + nxt-&gt;bi_hw_front_size))</div><div class='del'>-		return 0;</div><div class='del'>-	if (bio-&gt;bi_hw_back_size + nxt-&gt;bi_hw_front_size &gt; q-&gt;max_segment_size)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * map a request to scatterlist, return number of sg entries setup. Caller</div><div class='ctx'>  * must make sure sg can hold rq-&gt;nr_phys_segments entries</div><div class='hunk'>@@ -275,10 +247,9 @@ static inline int ll_new_hw_segment(struct request_queue *q,</div><div class='ctx'> 				    struct request *req,</div><div class='ctx'> 				    struct bio *bio)</div><div class='ctx'> {</div><div class='del'>-	int nr_hw_segs = bio_hw_segments(q, bio);</div><div class='ctx'> 	int nr_phys_segs = bio_phys_segments(q, bio);</div><div class='ctx'> </div><div class='del'>-	if (req-&gt;nr_hw_segments + nr_hw_segs &gt; q-&gt;max_hw_segments</div><div class='add'>+	if (req-&gt;nr_phys_segments + nr_phys_segs &gt; q-&gt;max_hw_segments</div><div class='ctx'> 	    || req-&gt;nr_phys_segments + nr_phys_segs &gt; q-&gt;max_phys_segments) {</div><div class='ctx'> 		req-&gt;cmd_flags |= REQ_NOMERGE;</div><div class='ctx'> 		if (req == q-&gt;last_merge)</div><div class='hunk'>@@ -290,7 +261,6 @@ static inline int ll_new_hw_segment(struct request_queue *q,</div><div class='ctx'> 	 * This will form the start of a new hw segment.  Bump both</div><div class='ctx'> 	 * counters.</div><div class='ctx'> 	 */</div><div class='del'>-	req-&gt;nr_hw_segments += nr_hw_segs;</div><div class='ctx'> 	req-&gt;nr_phys_segments += nr_phys_segs;</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='hunk'>@@ -299,7 +269,6 @@ int ll_back_merge_fn(struct request_queue *q, struct request *req,</div><div class='ctx'> 		     struct bio *bio)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned short max_sectors;</div><div class='del'>-	int len;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(blk_pc_request(req)))</div><div class='ctx'> 		max_sectors = q-&gt;max_hw_sectors;</div><div class='hunk'>@@ -316,19 +285,6 @@ int ll_back_merge_fn(struct request_queue *q, struct request *req,</div><div class='ctx'> 		blk_recount_segments(q, req-&gt;biotail);</div><div class='ctx'> 	if (!bio_flagged(bio, BIO_SEG_VALID))</div><div class='ctx'> 		blk_recount_segments(q, bio);</div><div class='del'>-	len = req-&gt;biotail-&gt;bi_hw_back_size + bio-&gt;bi_hw_front_size;</div><div class='del'>-	if (BIOVEC_VIRT_MERGEABLE(__BVEC_END(req-&gt;biotail), __BVEC_START(bio))</div><div class='del'>-	    &amp;&amp; !BIOVEC_VIRT_OVERSIZE(len)) {</div><div class='del'>-		int mergeable =  ll_new_mergeable(q, req, bio);</div><div class='del'>-</div><div class='del'>-		if (mergeable) {</div><div class='del'>-			if (req-&gt;nr_hw_segments == 1)</div><div class='del'>-				req-&gt;bio-&gt;bi_hw_front_size = len;</div><div class='del'>-			if (bio-&gt;bi_hw_segments == 1)</div><div class='del'>-				bio-&gt;bi_hw_back_size = len;</div><div class='del'>-		}</div><div class='del'>-		return mergeable;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	return ll_new_hw_segment(q, req, bio);</div><div class='ctx'> }</div><div class='hunk'>@@ -337,7 +293,6 @@ int ll_front_merge_fn(struct request_queue *q, struct request *req,</div><div class='ctx'> 		      struct bio *bio)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned short max_sectors;</div><div class='del'>-	int len;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(blk_pc_request(req)))</div><div class='ctx'> 		max_sectors = q-&gt;max_hw_sectors;</div><div class='hunk'>@@ -351,23 +306,10 @@ int ll_front_merge_fn(struct request_queue *q, struct request *req,</div><div class='ctx'> 			q-&gt;last_merge = NULL;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='del'>-	len = bio-&gt;bi_hw_back_size + req-&gt;bio-&gt;bi_hw_front_size;</div><div class='ctx'> 	if (!bio_flagged(bio, BIO_SEG_VALID))</div><div class='ctx'> 		blk_recount_segments(q, bio);</div><div class='ctx'> 	if (!bio_flagged(req-&gt;bio, BIO_SEG_VALID))</div><div class='ctx'> 		blk_recount_segments(q, req-&gt;bio);</div><div class='del'>-	if (BIOVEC_VIRT_MERGEABLE(__BVEC_END(bio), __BVEC_START(req-&gt;bio)) &amp;&amp;</div><div class='del'>-	    !BIOVEC_VIRT_OVERSIZE(len)) {</div><div class='del'>-		int mergeable =  ll_new_mergeable(q, req, bio);</div><div class='del'>-</div><div class='del'>-		if (mergeable) {</div><div class='del'>-			if (bio-&gt;bi_hw_segments == 1)</div><div class='del'>-				bio-&gt;bi_hw_front_size = len;</div><div class='del'>-			if (req-&gt;nr_hw_segments == 1)</div><div class='del'>-				req-&gt;biotail-&gt;bi_hw_back_size = len;</div><div class='del'>-		}</div><div class='del'>-		return mergeable;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	return ll_new_hw_segment(q, req, bio);</div><div class='ctx'> }</div><div class='hunk'>@@ -376,7 +318,8 @@ static int ll_merge_requests_fn(struct request_queue *q, struct request *req,</div><div class='ctx'> 				struct request *next)</div><div class='ctx'> {</div><div class='ctx'> 	int total_phys_segments;</div><div class='del'>-	int total_hw_segments;</div><div class='add'>+	unsigned int seg_size =</div><div class='add'>+		req-&gt;biotail-&gt;bi_seg_back_size + next-&gt;bio-&gt;bi_seg_front_size;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * First check if the either of the requests are re-queued</div><div class='hunk'>@@ -392,32 +335,22 @@ static int ll_merge_requests_fn(struct request_queue *q, struct request *req,</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	total_phys_segments = req-&gt;nr_phys_segments + next-&gt;nr_phys_segments;</div><div class='del'>-	if (blk_phys_contig_segment(q, req-&gt;biotail, next-&gt;bio))</div><div class='add'>+	if (blk_phys_contig_segment(q, req-&gt;biotail, next-&gt;bio)) {</div><div class='add'>+		if (req-&gt;nr_phys_segments == 1)</div><div class='add'>+			req-&gt;bio-&gt;bi_seg_front_size = seg_size;</div><div class='add'>+		if (next-&gt;nr_phys_segments == 1)</div><div class='add'>+			next-&gt;biotail-&gt;bi_seg_back_size = seg_size;</div><div class='ctx'> 		total_phys_segments--;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (total_phys_segments &gt; q-&gt;max_phys_segments)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	total_hw_segments = req-&gt;nr_hw_segments + next-&gt;nr_hw_segments;</div><div class='del'>-	if (blk_hw_contig_segment(q, req-&gt;biotail, next-&gt;bio)) {</div><div class='del'>-		int len = req-&gt;biotail-&gt;bi_hw_back_size +</div><div class='del'>-				next-&gt;bio-&gt;bi_hw_front_size;</div><div class='del'>-		/*</div><div class='del'>-		 * propagate the combined length to the end of the requests</div><div class='del'>-		 */</div><div class='del'>-		if (req-&gt;nr_hw_segments == 1)</div><div class='del'>-			req-&gt;bio-&gt;bi_hw_front_size = len;</div><div class='del'>-		if (next-&gt;nr_hw_segments == 1)</div><div class='del'>-			next-&gt;biotail-&gt;bi_hw_back_size = len;</div><div class='del'>-		total_hw_segments--;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (total_hw_segments &gt; q-&gt;max_hw_segments)</div><div class='add'>+	if (total_phys_segments &gt; q-&gt;max_hw_segments)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Merge is OK... */</div><div class='ctx'> 	req-&gt;nr_phys_segments = total_phys_segments;</div><div class='del'>-	req-&gt;nr_hw_segments = total_hw_segments;</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -470,17 +403,21 @@ static int attempt_merge(struct request_queue *q, struct request *req,</div><div class='ctx'> 	elv_merge_requests(q, req, next);</div><div class='ctx'> </div><div class='ctx'> 	if (req-&gt;rq_disk) {</div><div class='del'>-		struct hd_struct *part</div><div class='del'>-			= get_part(req-&gt;rq_disk, req-&gt;sector);</div><div class='del'>-		disk_round_stats(req-&gt;rq_disk);</div><div class='del'>-		req-&gt;rq_disk-&gt;in_flight--;</div><div class='del'>-		if (part) {</div><div class='del'>-			part_round_stats(part);</div><div class='del'>-			part-&gt;in_flight--;</div><div class='del'>-		}</div><div class='add'>+		struct hd_struct *part;</div><div class='add'>+		int cpu;</div><div class='add'>+</div><div class='add'>+		cpu = part_stat_lock();</div><div class='add'>+		part = disk_map_sector_rcu(req-&gt;rq_disk, req-&gt;sector);</div><div class='add'>+</div><div class='add'>+		part_round_stats(cpu, part);</div><div class='add'>+		part_dec_in_flight(part);</div><div class='add'>+</div><div class='add'>+		part_stat_unlock();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	req-&gt;ioprio = ioprio_best(req-&gt;ioprio, next-&gt;ioprio);</div><div class='add'>+	if (blk_rq_cpu_valid(next))</div><div class='add'>+		req-&gt;cpu = next-&gt;cpu;</div><div class='ctx'> </div><div class='ctx'> 	__blk_put_request(q, next);</div><div class='ctx'> 	return 1;</div><div class='head'>diff --git a/block/blk-settings.c b/block/blk-settings.c<br/>index dfc77012843f..41392fbe19ff 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/block/blk-settings.c?id=c15895ef30c2c03e99802951787183039a349d32'>block/blk-settings.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/block/blk-settings.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>block/blk-settings.c</a></div><div class='hunk'>@@ -33,6 +33,23 @@ void blk_queue_prep_rq(struct request_queue *q, prep_rq_fn *pfn)</div><div class='ctx'> EXPORT_SYMBOL(blk_queue_prep_rq);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * blk_queue_set_discard - set a discard_sectors function for queue</div><div class='add'>+ * @q:		queue</div><div class='add'>+ * @dfn:	prepare_discard function</div><div class='add'>+ *</div><div class='add'>+ * It's possible for a queue to register a discard callback which is used</div><div class='add'>+ * to transform a discard request into the appropriate type for the</div><div class='add'>+ * hardware. If none is registered, then discard requests are failed</div><div class='add'>+ * with %EOPNOTSUPP.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+void blk_queue_set_discard(struct request_queue *q, prepare_discard_fn *dfn)</div><div class='add'>+{</div><div class='add'>+	q-&gt;prepare_discard_fn = dfn;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(blk_queue_set_discard);</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * blk_queue_merge_bvec - set a merge_bvec function for queue</div><div class='ctx'>  * @q:		queue</div><div class='ctx'>  * @mbfn:	merge_bvec_fn</div><div class='hunk'>@@ -60,6 +77,24 @@ void blk_queue_softirq_done(struct request_queue *q, softirq_done_fn *fn)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(blk_queue_softirq_done);</div><div class='ctx'> </div><div class='add'>+void blk_queue_rq_timeout(struct request_queue *q, unsigned int timeout)</div><div class='add'>+{</div><div class='add'>+	q-&gt;rq_timeout = timeout;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(blk_queue_rq_timeout);</div><div class='add'>+</div><div class='add'>+void blk_queue_rq_timed_out(struct request_queue *q, rq_timed_out_fn *fn)</div><div class='add'>+{</div><div class='add'>+	q-&gt;rq_timed_out_fn = fn;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(blk_queue_rq_timed_out);</div><div class='add'>+</div><div class='add'>+void blk_queue_lld_busy(struct request_queue *q, lld_busy_fn *fn)</div><div class='add'>+{</div><div class='add'>+	q-&gt;lld_busy_fn = fn;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(blk_queue_lld_busy);</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * blk_queue_make_request - define an alternate make_request function for a device</div><div class='ctx'>  * @q:  the request queue for the device to be affected</div><div class='hunk'>@@ -106,8 +141,6 @@ void blk_queue_make_request(struct request_queue *q, make_request_fn *mfn)</div><div class='ctx'> 	if (q-&gt;unplug_delay == 0)</div><div class='ctx'> 		q-&gt;unplug_delay = 1;</div><div class='ctx'> </div><div class='del'>-	INIT_WORK(&amp;q-&gt;unplug_work, blk_unplug_work);</div><div class='del'>-</div><div class='ctx'> 	q-&gt;unplug_timer.function = blk_unplug_timeout;</div><div class='ctx'> 	q-&gt;unplug_timer.data = (unsigned long)q;</div><div class='ctx'> </div><div class='hunk'>@@ -127,7 +160,7 @@ EXPORT_SYMBOL(blk_queue_make_request);</div><div class='ctx'>  *    Different hardware can have different requirements as to what pages</div><div class='ctx'>  *    it can do I/O directly to. A low level driver can call</div><div class='ctx'>  *    blk_queue_bounce_limit to have lower memory pages allocated as bounce</div><div class='del'>- *    buffers for doing I/O to pages residing above @page.</div><div class='add'>+ *    buffers for doing I/O to pages residing above @dma_addr.</div><div class='ctx'>  **/</div><div class='ctx'> void blk_queue_bounce_limit(struct request_queue *q, u64 dma_addr)</div><div class='ctx'> {</div><div class='hunk'>@@ -212,7 +245,7 @@ EXPORT_SYMBOL(blk_queue_max_phys_segments);</div><div class='ctx'>  * Description:</div><div class='ctx'>  *    Enables a low level driver to set an upper limit on the number of</div><div class='ctx'>  *    hw data segments in a request.  This would be the largest number of</div><div class='del'>- *    address/length pairs the host adapter can actually give as once</div><div class='add'>+ *    address/length pairs the host adapter can actually give at once</div><div class='ctx'>  *    to the device.</div><div class='ctx'>  **/</div><div class='ctx'> void blk_queue_max_hw_segments(struct request_queue *q,</div><div class='hunk'>@@ -393,7 +426,7 @@ EXPORT_SYMBOL(blk_queue_segment_boundary);</div><div class='ctx'>  * @mask:  alignment mask</div><div class='ctx'>  *</div><div class='ctx'>  * description:</div><div class='del'>- *    set required memory and length aligment for direct dma transactions.</div><div class='add'>+ *    set required memory and length alignment for direct dma transactions.</div><div class='ctx'>  *    this is used when buiding direct io requests for the queue.</div><div class='ctx'>  *</div><div class='ctx'>  **/</div><div class='hunk'>@@ -409,7 +442,7 @@ EXPORT_SYMBOL(blk_queue_dma_alignment);</div><div class='ctx'>  * @mask:  alignment mask</div><div class='ctx'>  *</div><div class='ctx'>  * description:</div><div class='del'>- *    update required memory and length aligment for direct dma transactions.</div><div class='add'>+ *    update required memory and length alignment for direct dma transactions.</div><div class='ctx'>  *    If the requested alignment is larger than the current alignment, then</div><div class='ctx'>  *    the current queue alignment is updated to the new value, otherwise it</div><div class='ctx'>  *    is left alone.  The design of this is to allow multiple objects</div><div class='head'>diff --git a/block/blk-softirq.c b/block/blk-softirq.c<br/>new file mode 100644<br/>index 000000000000..e660d26ca656<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/block/blk-softirq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>block/blk-softirq.c</a></div><div class='hunk'>@@ -0,0 +1,175 @@</div><div class='add'>+/*</div><div class='add'>+ * Functions related to softirq rq completions</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/bio.h&gt;</div><div class='add'>+#include &lt;linux/blkdev.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/cpu.h&gt;</div><div class='add'>+</div><div class='add'>+#include "blk.h"</div><div class='add'>+</div><div class='add'>+static DEFINE_PER_CPU(struct list_head, blk_cpu_done);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Softirq action handler - move entries to local list and loop over them</div><div class='add'>+ * while passing them to the queue registered handler.</div><div class='add'>+ */</div><div class='add'>+static void blk_done_softirq(struct softirq_action *h)</div><div class='add'>+{</div><div class='add'>+	struct list_head *cpu_list, local_list;</div><div class='add'>+</div><div class='add'>+	local_irq_disable();</div><div class='add'>+	cpu_list = &amp;__get_cpu_var(blk_cpu_done);</div><div class='add'>+	list_replace_init(cpu_list, &amp;local_list);</div><div class='add'>+	local_irq_enable();</div><div class='add'>+</div><div class='add'>+	while (!list_empty(&amp;local_list)) {</div><div class='add'>+		struct request *rq;</div><div class='add'>+</div><div class='add'>+		rq = list_entry(local_list.next, struct request, csd.list);</div><div class='add'>+		list_del_init(&amp;rq-&gt;csd.list);</div><div class='add'>+		rq-&gt;q-&gt;softirq_done_fn(rq);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_SMP) &amp;&amp; defined(CONFIG_USE_GENERIC_SMP_HELPERS)</div><div class='add'>+static void trigger_softirq(void *data)</div><div class='add'>+{</div><div class='add'>+	struct request *rq = data;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	struct list_head *list;</div><div class='add'>+</div><div class='add'>+	local_irq_save(flags);</div><div class='add'>+	list = &amp;__get_cpu_var(blk_cpu_done);</div><div class='add'>+	list_add_tail(&amp;rq-&gt;csd.list, list);</div><div class='add'>+</div><div class='add'>+	if (list-&gt;next == &amp;rq-&gt;csd.list)</div><div class='add'>+		raise_softirq_irqoff(BLOCK_SOFTIRQ);</div><div class='add'>+</div><div class='add'>+	local_irq_restore(flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Setup and invoke a run of 'trigger_softirq' on the given cpu.</div><div class='add'>+ */</div><div class='add'>+static int raise_blk_irq(int cpu, struct request *rq)</div><div class='add'>+{</div><div class='add'>+	if (cpu_online(cpu)) {</div><div class='add'>+		struct call_single_data *data = &amp;rq-&gt;csd;</div><div class='add'>+</div><div class='add'>+		data-&gt;func = trigger_softirq;</div><div class='add'>+		data-&gt;info = rq;</div><div class='add'>+		data-&gt;flags = 0;</div><div class='add'>+</div><div class='add'>+		__smp_call_function_single(cpu, data);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+#else /* CONFIG_SMP &amp;&amp; CONFIG_USE_GENERIC_SMP_HELPERS */</div><div class='add'>+static int raise_blk_irq(int cpu, struct request *rq)</div><div class='add'>+{</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static int __cpuinit blk_cpu_notify(struct notifier_block *self,</div><div class='add'>+				    unsigned long action, void *hcpu)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * If a CPU goes away, splice its entries to the current CPU</div><div class='add'>+	 * and trigger a run of the softirq</div><div class='add'>+	 */</div><div class='add'>+	if (action == CPU_DEAD || action == CPU_DEAD_FROZEN) {</div><div class='add'>+		int cpu = (unsigned long) hcpu;</div><div class='add'>+</div><div class='add'>+		local_irq_disable();</div><div class='add'>+		list_splice_init(&amp;per_cpu(blk_cpu_done, cpu),</div><div class='add'>+				 &amp;__get_cpu_var(blk_cpu_done));</div><div class='add'>+		raise_softirq_irqoff(BLOCK_SOFTIRQ);</div><div class='add'>+		local_irq_enable();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NOTIFY_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct notifier_block __cpuinitdata blk_cpu_notifier = {</div><div class='add'>+	.notifier_call	= blk_cpu_notify,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void __blk_complete_request(struct request *req)</div><div class='add'>+{</div><div class='add'>+	struct request_queue *q = req-&gt;q;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int ccpu, cpu, group_cpu;</div><div class='add'>+</div><div class='add'>+	BUG_ON(!q-&gt;softirq_done_fn);</div><div class='add'>+</div><div class='add'>+	local_irq_save(flags);</div><div class='add'>+	cpu = smp_processor_id();</div><div class='add'>+	group_cpu = blk_cpu_to_group(cpu);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Select completion CPU</div><div class='add'>+	 */</div><div class='add'>+	if (test_bit(QUEUE_FLAG_SAME_COMP, &amp;q-&gt;queue_flags) &amp;&amp; req-&gt;cpu != -1)</div><div class='add'>+		ccpu = req-&gt;cpu;</div><div class='add'>+	else</div><div class='add'>+		ccpu = cpu;</div><div class='add'>+</div><div class='add'>+	if (ccpu == cpu || ccpu == group_cpu) {</div><div class='add'>+		struct list_head *list;</div><div class='add'>+do_local:</div><div class='add'>+		list = &amp;__get_cpu_var(blk_cpu_done);</div><div class='add'>+		list_add_tail(&amp;req-&gt;csd.list, list);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * if the list only contains our just added request,</div><div class='add'>+		 * signal a raise of the softirq. If there are already</div><div class='add'>+		 * entries there, someone already raised the irq but it</div><div class='add'>+		 * hasn't run yet.</div><div class='add'>+		 */</div><div class='add'>+		if (list-&gt;next == &amp;req-&gt;csd.list)</div><div class='add'>+			raise_softirq_irqoff(BLOCK_SOFTIRQ);</div><div class='add'>+	} else if (raise_blk_irq(ccpu, req))</div><div class='add'>+		goto do_local;</div><div class='add'>+</div><div class='add'>+	local_irq_restore(flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * blk_complete_request - end I/O on a request</div><div class='add'>+ * @req:      the request being processed</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ *     Ends all I/O on a request. It does not handle partial completions,</div><div class='add'>+ *     unless the driver actually implements this in its completion callback</div><div class='add'>+ *     through requeueing. The actual completion happens out-of-order,</div><div class='add'>+ *     through a softirq handler. The user must have registered a completion</div><div class='add'>+ *     callback through blk_queue_softirq_done().</div><div class='add'>+ **/</div><div class='add'>+void blk_complete_request(struct request *req)</div><div class='add'>+{</div><div class='add'>+	if (unlikely(blk_should_fake_timeout(req-&gt;q)))</div><div class='add'>+		return;</div><div class='add'>+	if (!blk_mark_rq_complete(req))</div><div class='add'>+		__blk_complete_request(req);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(blk_complete_request);</div><div class='add'>+</div><div class='add'>+__init int blk_softirq_init(void)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for_each_possible_cpu(i)</div><div class='add'>+		INIT_LIST_HEAD(&amp;per_cpu(blk_cpu_done, i));</div><div class='add'>+</div><div class='add'>+	open_softirq(BLOCK_SOFTIRQ, blk_done_softirq);</div><div class='add'>+	register_hotcpu_notifier(&amp;blk_cpu_notifier);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+subsys_initcall(blk_softirq_init);</div><div class='head'>diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c<br/>index 304ec73ab821..21e275d7eed9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/block/blk-sysfs.c?id=c15895ef30c2c03e99802951787183039a349d32'>block/blk-sysfs.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/block/blk-sysfs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>block/blk-sysfs.c</a></div><div class='hunk'>@@ -156,6 +156,30 @@ static ssize_t queue_nomerges_store(struct request_queue *q, const char *page,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static ssize_t queue_rq_affinity_show(struct request_queue *q, char *page)</div><div class='add'>+{</div><div class='add'>+	unsigned int set = test_bit(QUEUE_FLAG_SAME_COMP, &amp;q-&gt;queue_flags);</div><div class='add'>+</div><div class='add'>+	return queue_var_show(set != 0, page);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+queue_rq_affinity_store(struct request_queue *q, const char *page, size_t count)</div><div class='add'>+{</div><div class='add'>+	ssize_t ret = -EINVAL;</div><div class='add'>+#if defined(CONFIG_USE_GENERIC_SMP_HELPERS)</div><div class='add'>+	unsigned long val;</div><div class='add'>+</div><div class='add'>+	ret = queue_var_store(&amp;val, page, count);</div><div class='add'>+	spin_lock_irq(q-&gt;queue_lock);</div><div class='add'>+	if (val)</div><div class='add'>+		queue_flag_set(QUEUE_FLAG_SAME_COMP, q);</div><div class='add'>+	else</div><div class='add'>+		queue_flag_clear(QUEUE_FLAG_SAME_COMP,  q);</div><div class='add'>+	spin_unlock_irq(q-&gt;queue_lock);</div><div class='add'>+#endif</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static struct queue_sysfs_entry queue_requests_entry = {</div><div class='ctx'> 	.attr = {.name = "nr_requests", .mode = S_IRUGO | S_IWUSR },</div><div class='hunk'>@@ -197,6 +221,12 @@ static struct queue_sysfs_entry queue_nomerges_entry = {</div><div class='ctx'> 	.store = queue_nomerges_store,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct queue_sysfs_entry queue_rq_affinity_entry = {</div><div class='add'>+	.attr = {.name = "rq_affinity", .mode = S_IRUGO | S_IWUSR },</div><div class='add'>+	.show = queue_rq_affinity_show,</div><div class='add'>+	.store = queue_rq_affinity_store,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct attribute *default_attrs[] = {</div><div class='ctx'> 	&amp;queue_requests_entry.attr,</div><div class='ctx'> 	&amp;queue_ra_entry.attr,</div><div class='hunk'>@@ -205,6 +235,7 @@ static struct attribute *default_attrs[] = {</div><div class='ctx'> 	&amp;queue_iosched_entry.attr,</div><div class='ctx'> 	&amp;queue_hw_sector_size_entry.attr,</div><div class='ctx'> 	&amp;queue_nomerges_entry.attr,</div><div class='add'>+	&amp;queue_rq_affinity_entry.attr,</div><div class='ctx'> 	NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -310,7 +341,7 @@ int blk_register_queue(struct gendisk *disk)</div><div class='ctx'> 	if (!q-&gt;request_fn)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	ret = kobject_add(&amp;q-&gt;kobj, kobject_get(&amp;disk-&gt;dev.kobj),</div><div class='add'>+	ret = kobject_add(&amp;q-&gt;kobj, kobject_get(&amp;disk_to_dev(disk)-&gt;kobj),</div><div class='ctx'> 			  "%s", "queue");</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -339,6 +370,6 @@ void blk_unregister_queue(struct gendisk *disk)</div><div class='ctx'> </div><div class='ctx'> 		kobject_uevent(&amp;q-&gt;kobj, KOBJ_REMOVE);</div><div class='ctx'> 		kobject_del(&amp;q-&gt;kobj);</div><div class='del'>-		kobject_put(&amp;disk-&gt;dev.kobj);</div><div class='add'>+		kobject_put(&amp;disk_to_dev(disk)-&gt;kobj);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='head'>diff --git a/block/blk-tag.c b/block/blk-tag.c<br/>index ed5166fbc599..c0d419e84ce7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/block/blk-tag.c?id=c15895ef30c2c03e99802951787183039a349d32'>block/blk-tag.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/block/blk-tag.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>block/blk-tag.c</a></div><div class='hunk'>@@ -29,7 +29,7 @@ EXPORT_SYMBOL(blk_queue_find_tag);</div><div class='ctx'>  * __blk_free_tags - release a given set of tag maintenance info</div><div class='ctx'>  * @bqt:	the tag map to free</div><div class='ctx'>  *</div><div class='del'>- * Tries to free the specified @bqt@.  Returns true if it was</div><div class='add'>+ * Tries to free the specified @bqt.  Returns true if it was</div><div class='ctx'>  * actually freed and false if there are still references using it</div><div class='ctx'>  */</div><div class='ctx'> static int __blk_free_tags(struct blk_queue_tag *bqt)</div><div class='hunk'>@@ -78,7 +78,7 @@ void __blk_queue_free_tags(struct request_queue *q)</div><div class='ctx'>  * blk_free_tags - release a given set of tag maintenance info</div><div class='ctx'>  * @bqt:	the tag map to free</div><div class='ctx'>  *</div><div class='del'>- * For externally managed @bqt@ frees the map.  Callers of this</div><div class='add'>+ * For externally managed @bqt frees the map.  Callers of this</div><div class='ctx'>  * function must guarantee to have released all the queues that</div><div class='ctx'>  * might have been using this tag map.</div><div class='ctx'>  */</div><div class='hunk'>@@ -94,7 +94,7 @@ EXPORT_SYMBOL(blk_free_tags);</div><div class='ctx'>  * @q:  the request queue for the device</div><div class='ctx'>  *</div><div class='ctx'>  *  Notes:</div><div class='del'>- *	This is used to disabled tagged queuing to a device, yet leave</div><div class='add'>+ *	This is used to disable tagged queuing to a device, yet leave</div><div class='ctx'>  *	queue in function.</div><div class='ctx'>  **/</div><div class='ctx'> void blk_queue_free_tags(struct request_queue *q)</div><div class='hunk'>@@ -271,7 +271,7 @@ EXPORT_SYMBOL(blk_queue_resize_tags);</div><div class='ctx'>  * @rq: the request that has completed</div><div class='ctx'>  *</div><div class='ctx'>  *  Description:</div><div class='del'>- *    Typically called when end_that_request_first() returns 0, meaning</div><div class='add'>+ *    Typically called when end_that_request_first() returns %0, meaning</div><div class='ctx'>  *    all transfers have been done for a request. It's important to call</div><div class='ctx'>  *    this function before end_that_request_last(), as that will put the</div><div class='ctx'>  *    request back on the free list thus corrupting the internal tag list.</div><div class='hunk'>@@ -337,6 +337,7 @@ EXPORT_SYMBOL(blk_queue_end_tag);</div><div class='ctx'> int blk_queue_start_tag(struct request_queue *q, struct request *rq)</div><div class='ctx'> {</div><div class='ctx'> 	struct blk_queue_tag *bqt = q-&gt;queue_tags;</div><div class='add'>+	unsigned max_depth, offset;</div><div class='ctx'> 	int tag;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely((rq-&gt;cmd_flags &amp; REQ_QUEUED))) {</div><div class='hunk'>@@ -350,10 +351,19 @@ int blk_queue_start_tag(struct request_queue *q, struct request *rq)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Protect against shared tag maps, as we may not have exclusive</div><div class='ctx'> 	 * access to the tag map.</div><div class='add'>+	 *</div><div class='add'>+	 * We reserve a few tags just for sync IO, since we don't want</div><div class='add'>+	 * to starve sync IO on behalf of flooding async IO.</div><div class='ctx'> 	 */</div><div class='add'>+	max_depth = bqt-&gt;max_depth;</div><div class='add'>+	if (rq_is_sync(rq))</div><div class='add'>+		offset = 0;</div><div class='add'>+	else</div><div class='add'>+		offset = max_depth &gt;&gt; 2;</div><div class='add'>+</div><div class='ctx'> 	do {</div><div class='del'>-		tag = find_first_zero_bit(bqt-&gt;tag_map, bqt-&gt;max_depth);</div><div class='del'>-		if (tag &gt;= bqt-&gt;max_depth)</div><div class='add'>+		tag = find_next_zero_bit(bqt-&gt;tag_map, max_depth, offset);</div><div class='add'>+		if (tag &gt;= max_depth)</div><div class='ctx'> 			return 1;</div><div class='ctx'> </div><div class='ctx'> 	} while (test_and_set_bit_lock(tag, bqt-&gt;tag_map));</div><div class='head'>diff --git a/block/blk-timeout.c b/block/blk-timeout.c<br/>new file mode 100644<br/>index 000000000000..972a63f848fb<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/block/blk-timeout.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>block/blk-timeout.c</a></div><div class='hunk'>@@ -0,0 +1,238 @@</div><div class='add'>+/*</div><div class='add'>+ * Functions related to generic timeout handling of requests.</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/blkdev.h&gt;</div><div class='add'>+#include &lt;linux/fault-inject.h&gt;</div><div class='add'>+</div><div class='add'>+#include "blk.h"</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_FAIL_IO_TIMEOUT</div><div class='add'>+</div><div class='add'>+static DECLARE_FAULT_ATTR(fail_io_timeout);</div><div class='add'>+</div><div class='add'>+static int __init setup_fail_io_timeout(char *str)</div><div class='add'>+{</div><div class='add'>+	return setup_fault_attr(&amp;fail_io_timeout, str);</div><div class='add'>+}</div><div class='add'>+__setup("fail_io_timeout=", setup_fail_io_timeout);</div><div class='add'>+</div><div class='add'>+int blk_should_fake_timeout(struct request_queue *q)</div><div class='add'>+{</div><div class='add'>+	if (!test_bit(QUEUE_FLAG_FAIL_IO, &amp;q-&gt;queue_flags))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return should_fail(&amp;fail_io_timeout, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init fail_io_timeout_debugfs(void)</div><div class='add'>+{</div><div class='add'>+	return init_fault_attr_dentries(&amp;fail_io_timeout, "fail_io_timeout");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+late_initcall(fail_io_timeout_debugfs);</div><div class='add'>+</div><div class='add'>+ssize_t part_timeout_show(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			  char *buf)</div><div class='add'>+{</div><div class='add'>+	struct gendisk *disk = dev_to_disk(dev);</div><div class='add'>+	int set = test_bit(QUEUE_FLAG_FAIL_IO, &amp;disk-&gt;queue-&gt;queue_flags);</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "%d\n", set != 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+ssize_t part_timeout_store(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			   const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct gendisk *disk = dev_to_disk(dev);</div><div class='add'>+	int val;</div><div class='add'>+</div><div class='add'>+	if (count) {</div><div class='add'>+		struct request_queue *q = disk-&gt;queue;</div><div class='add'>+		char *p = (char *) buf;</div><div class='add'>+</div><div class='add'>+		val = simple_strtoul(p, &amp;p, 10);</div><div class='add'>+		spin_lock_irq(q-&gt;queue_lock);</div><div class='add'>+		if (val)</div><div class='add'>+			queue_flag_set(QUEUE_FLAG_FAIL_IO, q);</div><div class='add'>+		else</div><div class='add'>+			queue_flag_clear(QUEUE_FLAG_FAIL_IO, q);</div><div class='add'>+		spin_unlock_irq(q-&gt;queue_lock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_FAIL_IO_TIMEOUT */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * blk_delete_timer - Delete/cancel timer for a given function.</div><div class='add'>+ * @req:	request that we are canceling timer for</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+void blk_delete_timer(struct request *req)</div><div class='add'>+{</div><div class='add'>+	struct request_queue *q = req-&gt;q;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Nothing to detach</div><div class='add'>+	 */</div><div class='add'>+	if (!q-&gt;rq_timed_out_fn || !req-&gt;deadline)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	list_del_init(&amp;req-&gt;timeout_list);</div><div class='add'>+</div><div class='add'>+	if (list_empty(&amp;q-&gt;timeout_list))</div><div class='add'>+		del_timer(&amp;q-&gt;timeout);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void blk_rq_timed_out(struct request *req)</div><div class='add'>+{</div><div class='add'>+	struct request_queue *q = req-&gt;q;</div><div class='add'>+	enum blk_eh_timer_return ret;</div><div class='add'>+</div><div class='add'>+	ret = q-&gt;rq_timed_out_fn(req);</div><div class='add'>+	switch (ret) {</div><div class='add'>+	case BLK_EH_HANDLED:</div><div class='add'>+		__blk_complete_request(req);</div><div class='add'>+		break;</div><div class='add'>+	case BLK_EH_RESET_TIMER:</div><div class='add'>+		blk_clear_rq_complete(req);</div><div class='add'>+		blk_add_timer(req);</div><div class='add'>+		break;</div><div class='add'>+	case BLK_EH_NOT_HANDLED:</div><div class='add'>+		/*</div><div class='add'>+		 * LLD handles this for now but in the future</div><div class='add'>+		 * we can send a request msg to abort the command</div><div class='add'>+		 * and we can move more of the generic scsi eh code to</div><div class='add'>+		 * the blk layer.</div><div class='add'>+		 */</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		printk(KERN_ERR "block: bad eh return: %d\n", ret);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void blk_rq_timed_out_timer(unsigned long data)</div><div class='add'>+{</div><div class='add'>+	struct request_queue *q = (struct request_queue *) data;</div><div class='add'>+	unsigned long flags, uninitialized_var(next), next_set = 0;</div><div class='add'>+	struct request *rq, *tmp;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(q-&gt;queue_lock, flags);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(rq, tmp, &amp;q-&gt;timeout_list, timeout_list) {</div><div class='add'>+		if (time_after_eq(jiffies, rq-&gt;deadline)) {</div><div class='add'>+			list_del_init(&amp;rq-&gt;timeout_list);</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * Check if we raced with end io completion</div><div class='add'>+			 */</div><div class='add'>+			if (blk_mark_rq_complete(rq))</div><div class='add'>+				continue;</div><div class='add'>+			blk_rq_timed_out(rq);</div><div class='add'>+		}</div><div class='add'>+		if (!next_set) {</div><div class='add'>+			next = rq-&gt;deadline;</div><div class='add'>+			next_set = 1;</div><div class='add'>+		} else if (time_after(next, rq-&gt;deadline))</div><div class='add'>+			next = rq-&gt;deadline;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (next_set &amp;&amp; !list_empty(&amp;q-&gt;timeout_list))</div><div class='add'>+		mod_timer(&amp;q-&gt;timeout, round_jiffies(next));</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(q-&gt;queue_lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * blk_abort_request -- Request request recovery for the specified command</div><div class='add'>+ * @req:	pointer to the request of interest</div><div class='add'>+ *</div><div class='add'>+ * This function requests that the block layer start recovery for the</div><div class='add'>+ * request by deleting the timer and calling the q's timeout function.</div><div class='add'>+ * LLDDs who implement their own error recovery MAY ignore the timeout</div><div class='add'>+ * event if they generated blk_abort_req. Must hold queue lock.</div><div class='add'>+ */</div><div class='add'>+void blk_abort_request(struct request *req)</div><div class='add'>+{</div><div class='add'>+	if (blk_mark_rq_complete(req))</div><div class='add'>+		return;</div><div class='add'>+	blk_delete_timer(req);</div><div class='add'>+	blk_rq_timed_out(req);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(blk_abort_request);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * blk_add_timer - Start timeout timer for a single request</div><div class='add'>+ * @req:	request that is about to start running.</div><div class='add'>+ *</div><div class='add'>+ * Notes:</div><div class='add'>+ *    Each request has its own timer, and as it is added to the queue, we</div><div class='add'>+ *    set up the timer. When the request completes, we cancel the timer.</div><div class='add'>+ */</div><div class='add'>+void blk_add_timer(struct request *req)</div><div class='add'>+{</div><div class='add'>+	struct request_queue *q = req-&gt;q;</div><div class='add'>+	unsigned long expiry;</div><div class='add'>+</div><div class='add'>+	if (!q-&gt;rq_timed_out_fn)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	BUG_ON(!list_empty(&amp;req-&gt;timeout_list));</div><div class='add'>+	BUG_ON(test_bit(REQ_ATOM_COMPLETE, &amp;req-&gt;atomic_flags));</div><div class='add'>+</div><div class='add'>+	if (req-&gt;timeout)</div><div class='add'>+		req-&gt;deadline = jiffies + req-&gt;timeout;</div><div class='add'>+	else {</div><div class='add'>+		req-&gt;deadline = jiffies + q-&gt;rq_timeout;</div><div class='add'>+		/*</div><div class='add'>+		 * Some LLDs, like scsi, peek at the timeout to prevent</div><div class='add'>+		 * a command from being retried forever.</div><div class='add'>+		 */</div><div class='add'>+		req-&gt;timeout = q-&gt;rq_timeout;</div><div class='add'>+	}</div><div class='add'>+	list_add_tail(&amp;req-&gt;timeout_list, &amp;q-&gt;timeout_list);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If the timer isn't already pending or this timeout is earlier</div><div class='add'>+	 * than an existing one, modify the timer. Round to next nearest</div><div class='add'>+	 * second.</div><div class='add'>+	 */</div><div class='add'>+	expiry = round_jiffies(req-&gt;deadline);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We use -&gt;deadline == 0 to detect whether a timer was added or</div><div class='add'>+	 * not, so just increase to next jiffy for that specific case</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(!req-&gt;deadline))</div><div class='add'>+		req-&gt;deadline = 1;</div><div class='add'>+</div><div class='add'>+	if (!timer_pending(&amp;q-&gt;timeout) ||</div><div class='add'>+	    time_before(expiry, q-&gt;timeout.expires))</div><div class='add'>+		mod_timer(&amp;q-&gt;timeout, expiry);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * blk_abort_queue -- Abort all request on given queue</div><div class='add'>+ * @queue:	pointer to queue</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+void blk_abort_queue(struct request_queue *q)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	struct request *rq, *tmp;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(q-&gt;queue_lock, flags);</div><div class='add'>+</div><div class='add'>+	elv_abort_queue(q);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(rq, tmp, &amp;q-&gt;timeout_list, timeout_list)</div><div class='add'>+		blk_abort_request(rq);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(q-&gt;queue_lock, flags);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(blk_abort_queue);</div><div class='head'>diff --git a/block/blk.h b/block/blk.h<br/>index c79f30e1df52..d2e49af90db5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/block/blk.h?id=c15895ef30c2c03e99802951787183039a349d32'>block/blk.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/block/blk.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>block/blk.h</a></div><div class='hunk'>@@ -17,6 +17,43 @@ void __blk_queue_free_tags(struct request_queue *q);</div><div class='ctx'> </div><div class='ctx'> void blk_unplug_work(struct work_struct *work);</div><div class='ctx'> void blk_unplug_timeout(unsigned long data);</div><div class='add'>+void blk_rq_timed_out_timer(unsigned long data);</div><div class='add'>+void blk_delete_timer(struct request *);</div><div class='add'>+void blk_add_timer(struct request *);</div><div class='add'>+void __generic_unplug_device(struct request_queue *);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Internal atomic flags for request handling</div><div class='add'>+ */</div><div class='add'>+enum rq_atomic_flags {</div><div class='add'>+	REQ_ATOM_COMPLETE = 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * EH timer and IO completion will both attempt to 'grab' the request, make</div><div class='add'>+ * sure that only one of them suceeds</div><div class='add'>+ */</div><div class='add'>+static inline int blk_mark_rq_complete(struct request *rq)</div><div class='add'>+{</div><div class='add'>+	return test_and_set_bit(REQ_ATOM_COMPLETE, &amp;rq-&gt;atomic_flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void blk_clear_rq_complete(struct request *rq)</div><div class='add'>+{</div><div class='add'>+	clear_bit(REQ_ATOM_COMPLETE, &amp;rq-&gt;atomic_flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_FAIL_IO_TIMEOUT</div><div class='add'>+int blk_should_fake_timeout(struct request_queue *);</div><div class='add'>+ssize_t part_timeout_show(struct device *, struct device_attribute *, char *);</div><div class='add'>+ssize_t part_timeout_store(struct device *, struct device_attribute *,</div><div class='add'>+				const char *, size_t);</div><div class='add'>+#else</div><div class='add'>+static inline int blk_should_fake_timeout(struct request_queue *q)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> struct io_context *current_io_context(gfp_t gfp_flags, int node);</div><div class='ctx'> </div><div class='hunk'>@@ -59,4 +96,16 @@ static inline int queue_congestion_off_threshold(struct request_queue *q)</div><div class='ctx'> </div><div class='ctx'> #endif /* BLK_DEV_INTEGRITY */</div><div class='ctx'> </div><div class='add'>+static inline int blk_cpu_to_group(int cpu)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_SCHED_MC</div><div class='add'>+	cpumask_t mask = cpu_coregroup_map(cpu);</div><div class='add'>+	return first_cpu(mask);</div><div class='add'>+#elif defined(CONFIG_SCHED_SMT)</div><div class='add'>+	return first_cpu(per_cpu(cpu_sibling_map, cpu));</div><div class='add'>+#else</div><div class='add'>+	return cpu;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/block/blktrace.c b/block/blktrace.c<br/>index eb9651ccb241..85049a7e7a17 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/block/blktrace.c?id=c15895ef30c2c03e99802951787183039a349d32'>block/blktrace.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/block/blktrace.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>block/blktrace.c</a></div><div class='hunk'>@@ -111,23 +111,9 @@ static int act_log_check(struct blk_trace *bt, u32 what, sector_t sector,</div><div class='ctx'>  */</div><div class='ctx'> static u32 ddir_act[2] __read_mostly = { BLK_TC_ACT(BLK_TC_READ), BLK_TC_ACT(BLK_TC_WRITE) };</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Bio action bits of interest</div><div class='del'>- */</div><div class='del'>-static u32 bio_act[9] __read_mostly = { 0, BLK_TC_ACT(BLK_TC_BARRIER), BLK_TC_ACT(BLK_TC_SYNC), 0, BLK_TC_ACT(BLK_TC_AHEAD), 0, 0, 0, BLK_TC_ACT(BLK_TC_META) };</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * More could be added as needed, taking care to increment the decrementer</div><div class='del'>- * to get correct indexing</div><div class='del'>- */</div><div class='del'>-#define trace_barrier_bit(rw)	\</div><div class='del'>-	(((rw) &amp; (1 &lt;&lt; BIO_RW_BARRIER)) &gt;&gt; (BIO_RW_BARRIER - 0))</div><div class='del'>-#define trace_sync_bit(rw)	\</div><div class='del'>-	(((rw) &amp; (1 &lt;&lt; BIO_RW_SYNC)) &gt;&gt; (BIO_RW_SYNC - 1))</div><div class='del'>-#define trace_ahead_bit(rw)	\</div><div class='del'>-	(((rw) &amp; (1 &lt;&lt; BIO_RW_AHEAD)) &lt;&lt; (2 - BIO_RW_AHEAD))</div><div class='del'>-#define trace_meta_bit(rw)	\</div><div class='del'>-	(((rw) &amp; (1 &lt;&lt; BIO_RW_META)) &gt;&gt; (BIO_RW_META - 3))</div><div class='add'>+/* The ilog2() calls fall out because they're constant */</div><div class='add'>+#define MASK_TC_BIT(rw, __name) ( (rw &amp; (1 &lt;&lt; BIO_RW_ ## __name)) &lt;&lt; \</div><div class='add'>+	  (ilog2(BLK_TC_ ## __name) + BLK_TC_SHIFT - BIO_RW_ ## __name) )</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * The worker for the various blk_add_trace*() types. Fills out a</div><div class='hunk'>@@ -147,10 +133,11 @@ void __blk_add_trace(struct blk_trace *bt, sector_t sector, int bytes,</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	what |= ddir_act[rw &amp; WRITE];</div><div class='del'>-	what |= bio_act[trace_barrier_bit(rw)];</div><div class='del'>-	what |= bio_act[trace_sync_bit(rw)];</div><div class='del'>-	what |= bio_act[trace_ahead_bit(rw)];</div><div class='del'>-	what |= bio_act[trace_meta_bit(rw)];</div><div class='add'>+	what |= MASK_TC_BIT(rw, BARRIER);</div><div class='add'>+	what |= MASK_TC_BIT(rw, SYNC);</div><div class='add'>+	what |= MASK_TC_BIT(rw, AHEAD);</div><div class='add'>+	what |= MASK_TC_BIT(rw, META);</div><div class='add'>+	what |= MASK_TC_BIT(rw, DISCARD);</div><div class='ctx'> </div><div class='ctx'> 	pid = tsk-&gt;pid;</div><div class='ctx'> 	if (unlikely(act_log_check(bt, what, sector, pid)))</div><div class='hunk'>@@ -382,7 +369,8 @@ int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev,</div><div class='ctx'> 	if (!buts-&gt;buf_size || !buts-&gt;buf_nr)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	strcpy(buts-&gt;name, name);</div><div class='add'>+	strncpy(buts-&gt;name, name, BLKTRACE_BDEV_SIZE);</div><div class='add'>+	buts-&gt;name[BLKTRACE_BDEV_SIZE - 1] = '\0';</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * some device names have larger paths - convert the slashes</div><div class='head'>diff --git a/block/bsg.c b/block/bsg.c<br/>index 0aae8d7ba99c..034112bfe1f3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/block/bsg.c?id=c15895ef30c2c03e99802951787183039a349d32'>block/bsg.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/block/bsg.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>block/bsg.c</a></div><div class='hunk'>@@ -283,7 +283,8 @@ bsg_map_hdr(struct bsg_device *bd, struct sg_io_v4 *hdr, int has_write_perm)</div><div class='ctx'> 		next_rq-&gt;cmd_type = rq-&gt;cmd_type;</div><div class='ctx'> </div><div class='ctx'> 		dxferp = (void*)(unsigned long)hdr-&gt;din_xferp;</div><div class='del'>-		ret =  blk_rq_map_user(q, next_rq, dxferp, hdr-&gt;din_xfer_len);</div><div class='add'>+		ret =  blk_rq_map_user(q, next_rq, NULL, dxferp,</div><div class='add'>+				       hdr-&gt;din_xfer_len, GFP_KERNEL);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -298,7 +299,8 @@ bsg_map_hdr(struct bsg_device *bd, struct sg_io_v4 *hdr, int has_write_perm)</div><div class='ctx'> 		dxfer_len = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (dxfer_len) {</div><div class='del'>-		ret = blk_rq_map_user(q, rq, dxferp, dxfer_len);</div><div class='add'>+		ret = blk_rq_map_user(q, rq, NULL, dxferp, dxfer_len,</div><div class='add'>+				      GFP_KERNEL);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1022,8 +1024,7 @@ int bsg_register_queue(struct request_queue *q, struct device *parent,</div><div class='ctx'> 	bcd-&gt;release = release;</div><div class='ctx'> 	kref_init(&amp;bcd-&gt;ref);</div><div class='ctx'> 	dev = MKDEV(bsg_major, bcd-&gt;minor);</div><div class='del'>-	class_dev = device_create_drvdata(bsg_class, parent, dev, NULL,</div><div class='del'>-					  "%s", devname);</div><div class='add'>+	class_dev = device_create(bsg_class, parent, dev, NULL, "%s", devname);</div><div class='ctx'> 	if (IS_ERR(class_dev)) {</div><div class='ctx'> 		ret = PTR_ERR(class_dev);</div><div class='ctx'> 		goto put_dev;</div><div class='head'>diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c<br/>index 1e2aff812ee2..6a062eebbd15 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/block/cfq-iosched.c?id=c15895ef30c2c03e99802951787183039a349d32'>block/cfq-iosched.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/block/cfq-iosched.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>block/cfq-iosched.c</a></div><div class='hunk'>@@ -39,6 +39,7 @@ static int cfq_slice_idle = HZ / 125;</div><div class='ctx'> #define CFQ_MIN_TT		(2)</div><div class='ctx'> </div><div class='ctx'> #define CFQ_SLICE_SCALE		(5)</div><div class='add'>+#define CFQ_HW_QUEUE_MIN	(5)</div><div class='ctx'> </div><div class='ctx'> #define RQ_CIC(rq)		\</div><div class='ctx'> 	((struct cfq_io_context *) (rq)-&gt;elevator_private)</div><div class='hunk'>@@ -86,7 +87,14 @@ struct cfq_data {</div><div class='ctx'> </div><div class='ctx'> 	int rq_in_driver;</div><div class='ctx'> 	int sync_flight;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * queue-depth detection</div><div class='add'>+	 */</div><div class='add'>+	int rq_queued;</div><div class='ctx'> 	int hw_tag;</div><div class='add'>+	int hw_tag_samples;</div><div class='add'>+	int rq_in_driver_peak;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * idle window management</div><div class='hunk'>@@ -244,7 +252,7 @@ static inline void cfq_schedule_dispatch(struct cfq_data *cfqd)</div><div class='ctx'> {</div><div class='ctx'> 	if (cfqd-&gt;busy_queues) {</div><div class='ctx'> 		cfq_log(cfqd, "schedule dispatch");</div><div class='del'>-		kblockd_schedule_work(&amp;cfqd-&gt;unplug_work);</div><div class='add'>+		kblockd_schedule_work(cfqd-&gt;queue, &amp;cfqd-&gt;unplug_work);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -654,15 +662,6 @@ static void cfq_activate_request(struct request_queue *q, struct request *rq)</div><div class='ctx'> 	cfq_log_cfqq(cfqd, RQ_CFQQ(rq), "activate rq, drv=%d",</div><div class='ctx'> 						cfqd-&gt;rq_in_driver);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * If the depth is larger 1, it really could be queueing. But lets</div><div class='del'>-	 * make the mark a little higher - idling could still be good for</div><div class='del'>-	 * low queueing, and a low queueing number could also just indicate</div><div class='del'>-	 * a SCSI mid layer like behaviour where limit+1 is often seen.</div><div class='del'>-	 */</div><div class='del'>-	if (!cfqd-&gt;hw_tag &amp;&amp; cfqd-&gt;rq_in_driver &gt; 4)</div><div class='del'>-		cfqd-&gt;hw_tag = 1;</div><div class='del'>-</div><div class='ctx'> 	cfqd-&gt;last_position = rq-&gt;hard_sector + rq-&gt;hard_nr_sectors;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -686,6 +685,7 @@ static void cfq_remove_request(struct request *rq)</div><div class='ctx'> 	list_del_init(&amp;rq-&gt;queuelist);</div><div class='ctx'> 	cfq_del_rq_rb(rq);</div><div class='ctx'> </div><div class='add'>+	cfqq-&gt;cfqd-&gt;rq_queued--;</div><div class='ctx'> 	if (rq_is_meta(rq)) {</div><div class='ctx'> 		WARN_ON(!cfqq-&gt;meta_pending);</div><div class='ctx'> 		cfqq-&gt;meta_pending--;</div><div class='hunk'>@@ -878,6 +878,14 @@ static void cfq_arm_slice_timer(struct cfq_data *cfqd)</div><div class='ctx'> 	struct cfq_io_context *cic;</div><div class='ctx'> 	unsigned long sl;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * SSD device without seek penalty, disable idling. But only do so</div><div class='add'>+	 * for devices that support queuing, otherwise we still have a problem</div><div class='add'>+	 * with sync vs async workloads.</div><div class='add'>+	 */</div><div class='add'>+	if (blk_queue_nonrot(cfqd-&gt;queue) &amp;&amp; cfqd-&gt;hw_tag)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	WARN_ON(!RB_EMPTY_ROOT(&amp;cfqq-&gt;sort_list));</div><div class='ctx'> 	WARN_ON(cfq_cfqq_slice_new(cfqq));</div><div class='ctx'> </div><div class='hunk'>@@ -1833,6 +1841,7 @@ cfq_rq_enqueued(struct cfq_data *cfqd, struct cfq_queue *cfqq,</div><div class='ctx'> {</div><div class='ctx'> 	struct cfq_io_context *cic = RQ_CIC(rq);</div><div class='ctx'> </div><div class='add'>+	cfqd-&gt;rq_queued++;</div><div class='ctx'> 	if (rq_is_meta(rq))</div><div class='ctx'> 		cfqq-&gt;meta_pending++;</div><div class='ctx'> </div><div class='hunk'>@@ -1880,6 +1889,31 @@ static void cfq_insert_request(struct request_queue *q, struct request *rq)</div><div class='ctx'> 	cfq_rq_enqueued(cfqd, cfqq, rq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Update hw_tag based on peak queue depth over 50 samples under</div><div class='add'>+ * sufficient load.</div><div class='add'>+ */</div><div class='add'>+static void cfq_update_hw_tag(struct cfq_data *cfqd)</div><div class='add'>+{</div><div class='add'>+	if (cfqd-&gt;rq_in_driver &gt; cfqd-&gt;rq_in_driver_peak)</div><div class='add'>+		cfqd-&gt;rq_in_driver_peak = cfqd-&gt;rq_in_driver;</div><div class='add'>+</div><div class='add'>+	if (cfqd-&gt;rq_queued &lt;= CFQ_HW_QUEUE_MIN &amp;&amp;</div><div class='add'>+	    cfqd-&gt;rq_in_driver &lt;= CFQ_HW_QUEUE_MIN)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (cfqd-&gt;hw_tag_samples++ &lt; 50)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (cfqd-&gt;rq_in_driver_peak &gt;= CFQ_HW_QUEUE_MIN)</div><div class='add'>+		cfqd-&gt;hw_tag = 1;</div><div class='add'>+	else</div><div class='add'>+		cfqd-&gt;hw_tag = 0;</div><div class='add'>+</div><div class='add'>+	cfqd-&gt;hw_tag_samples = 0;</div><div class='add'>+	cfqd-&gt;rq_in_driver_peak = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void cfq_completed_request(struct request_queue *q, struct request *rq)</div><div class='ctx'> {</div><div class='ctx'> 	struct cfq_queue *cfqq = RQ_CFQQ(rq);</div><div class='hunk'>@@ -1890,6 +1924,8 @@ static void cfq_completed_request(struct request_queue *q, struct request *rq)</div><div class='ctx'> 	now = jiffies;</div><div class='ctx'> 	cfq_log_cfqq(cfqd, cfqq, "complete");</div><div class='ctx'> </div><div class='add'>+	cfq_update_hw_tag(cfqd);</div><div class='add'>+</div><div class='ctx'> 	WARN_ON(!cfqd-&gt;rq_in_driver);</div><div class='ctx'> 	WARN_ON(!cfqq-&gt;dispatched);</div><div class='ctx'> 	cfqd-&gt;rq_in_driver--;</div><div class='hunk'>@@ -2200,6 +2236,7 @@ static void *cfq_init_queue(struct request_queue *q)</div><div class='ctx'> 	cfqd-&gt;cfq_slice[1] = cfq_slice_sync;</div><div class='ctx'> 	cfqd-&gt;cfq_slice_async_rq = cfq_slice_async_rq;</div><div class='ctx'> 	cfqd-&gt;cfq_slice_idle = cfq_slice_idle;</div><div class='add'>+	cfqd-&gt;hw_tag = 1;</div><div class='ctx'> </div><div class='ctx'> 	return cfqd;</div><div class='ctx'> }</div><div class='head'>diff --git a/block/cmd-filter.c b/block/cmd-filter.c<br/>index 79c14996ac11..e669aed4c6bc 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/block/cmd-filter.c?id=c15895ef30c2c03e99802951787183039a349d32'>block/cmd-filter.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/block/cmd-filter.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>block/cmd-filter.c</a></div><div class='hunk'>@@ -211,14 +211,10 @@ int blk_register_filter(struct gendisk *disk)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct blk_cmd_filter *filter = &amp;disk-&gt;queue-&gt;cmd_filter;</div><div class='del'>-	struct kobject *parent = kobject_get(disk-&gt;holder_dir-&gt;parent);</div><div class='ctx'> </div><div class='del'>-	if (!parent)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	ret = kobject_init_and_add(&amp;filter-&gt;kobj, &amp;rcf_ktype, parent,</div><div class='add'>+	ret = kobject_init_and_add(&amp;filter-&gt;kobj, &amp;rcf_ktype,</div><div class='add'>+				   &amp;disk_to_dev(disk)-&gt;kobj,</div><div class='ctx'> 				   "%s", "cmd_filter");</div><div class='del'>-</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -231,7 +227,6 @@ void blk_unregister_filter(struct gendisk *disk)</div><div class='ctx'> 	struct blk_cmd_filter *filter = &amp;disk-&gt;queue-&gt;cmd_filter;</div><div class='ctx'> </div><div class='ctx'> 	kobject_put(&amp;filter-&gt;kobj);</div><div class='del'>-	kobject_put(disk-&gt;holder_dir-&gt;parent);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(blk_unregister_filter);</div><div class='ctx'> #endif</div><div class='head'>diff --git a/block/compat_ioctl.c b/block/compat_ioctl.c<br/>index c23177e4623f..1e559fba7bdf 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/block/compat_ioctl.c?id=c15895ef30c2c03e99802951787183039a349d32'>block/compat_ioctl.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/block/compat_ioctl.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>block/compat_ioctl.c</a></div><div class='hunk'>@@ -788,6 +788,7 @@ long compat_blkdev_ioctl(struct file *file, unsigned cmd, unsigned long arg)</div><div class='ctx'> 		return compat_hdio_getgeo(disk, bdev, compat_ptr(arg));</div><div class='ctx'> 	case BLKFLSBUF:</div><div class='ctx'> 	case BLKROSET:</div><div class='add'>+	case BLKDISCARD:</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * the ones below are implemented in blkdev_locked_ioctl,</div><div class='ctx'> 	 * but we call blkdev_ioctl, which gets the lock for us</div><div class='head'>diff --git a/block/deadline-iosched.c b/block/deadline-iosched.c<br/>index 342448c3d2dd..fd311179f44c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/block/deadline-iosched.c?id=c15895ef30c2c03e99802951787183039a349d32'>block/deadline-iosched.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/block/deadline-iosched.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>block/deadline-iosched.c</a></div><div class='hunk'>@@ -33,7 +33,7 @@ struct deadline_data {</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct rb_root sort_list[2];	</div><div class='ctx'> 	struct list_head fifo_list[2];</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * next in sort order. read, write or both are NULL</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -53,7 +53,11 @@ struct deadline_data {</div><div class='ctx'> </div><div class='ctx'> static void deadline_move_request(struct deadline_data *, struct request *);</div><div class='ctx'> </div><div class='del'>-#define RQ_RB_ROOT(dd, rq)	(&amp;(dd)-&gt;sort_list[rq_data_dir((rq))])</div><div class='add'>+static inline struct rb_root *</div><div class='add'>+deadline_rb_root(struct deadline_data *dd, struct request *rq)</div><div class='add'>+{</div><div class='add'>+	return &amp;dd-&gt;sort_list[rq_data_dir(rq)];</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * get the request after `rq' in sector-sorted order</div><div class='hunk'>@@ -72,15 +76,11 @@ deadline_latter_request(struct request *rq)</div><div class='ctx'> static void</div><div class='ctx'> deadline_add_rq_rb(struct deadline_data *dd, struct request *rq)</div><div class='ctx'> {</div><div class='del'>-	struct rb_root *root = RQ_RB_ROOT(dd, rq);</div><div class='add'>+	struct rb_root *root = deadline_rb_root(dd, rq);</div><div class='ctx'> 	struct request *__alias;</div><div class='ctx'> </div><div class='del'>-retry:</div><div class='del'>-	__alias = elv_rb_add(root, rq);</div><div class='del'>-	if (unlikely(__alias)) {</div><div class='add'>+	while (unlikely(__alias = elv_rb_add(root, rq)))</div><div class='ctx'> 		deadline_move_request(dd, __alias);</div><div class='del'>-		goto retry;</div><div class='del'>-	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void</div><div class='hunk'>@@ -91,7 +91,7 @@ deadline_del_rq_rb(struct deadline_data *dd, struct request *rq)</div><div class='ctx'> 	if (dd-&gt;next_rq[data_dir] == rq)</div><div class='ctx'> 		dd-&gt;next_rq[data_dir] = deadline_latter_request(rq);</div><div class='ctx'> </div><div class='del'>-	elv_rb_del(RQ_RB_ROOT(dd, rq), rq);</div><div class='add'>+	elv_rb_del(deadline_rb_root(dd, rq), rq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -106,7 +106,7 @@ deadline_add_request(struct request_queue *q, struct request *rq)</div><div class='ctx'> 	deadline_add_rq_rb(dd, rq);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * set expire time (only used for reads) and add to fifo list</div><div class='add'>+	 * set expire time and add to fifo list</div><div class='ctx'> 	 */</div><div class='ctx'> 	rq_set_fifo_time(rq, jiffies + dd-&gt;fifo_expire[data_dir]);</div><div class='ctx'> 	list_add_tail(&amp;rq-&gt;queuelist, &amp;dd-&gt;fifo_list[data_dir]);</div><div class='hunk'>@@ -162,7 +162,7 @@ static void deadline_merged_request(struct request_queue *q,</div><div class='ctx'> 	 * if the merge was a front merge, we need to reposition request</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (type == ELEVATOR_FRONT_MERGE) {</div><div class='del'>-		elv_rb_del(RQ_RB_ROOT(dd, req), req);</div><div class='add'>+		elv_rb_del(deadline_rb_root(dd, req), req);</div><div class='ctx'> 		deadline_add_rq_rb(dd, req);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -212,7 +212,7 @@ deadline_move_request(struct deadline_data *dd, struct request *rq)</div><div class='ctx'> 	dd-&gt;next_rq[WRITE] = NULL;</div><div class='ctx'> 	dd-&gt;next_rq[data_dir] = deadline_latter_request(rq);</div><div class='ctx'> </div><div class='del'>-	dd-&gt;last_sector = rq-&gt;sector + rq-&gt;nr_sectors;</div><div class='add'>+	dd-&gt;last_sector = rq_end_sector(rq);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * take it off the sort and fifo list, move</div><div class='hunk'>@@ -222,7 +222,7 @@ deadline_move_request(struct deadline_data *dd, struct request *rq)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * deadline_check_fifo returns 0 if there are no expired reads on the fifo,</div><div class='add'>+ * deadline_check_fifo returns 0 if there are no expired requests on the fifo,</div><div class='ctx'>  * 1 otherwise. Requires !list_empty(&amp;dd-&gt;fifo_list[data_dir])</div><div class='ctx'>  */</div><div class='ctx'> static inline int deadline_check_fifo(struct deadline_data *dd, int ddir)</div><div class='hunk'>@@ -258,17 +258,9 @@ static int deadline_dispatch_requests(struct request_queue *q, int force)</div><div class='ctx'> 	else</div><div class='ctx'> 		rq = dd-&gt;next_rq[READ];</div><div class='ctx'> </div><div class='del'>-	if (rq) {</div><div class='del'>-		/* we have a "next request" */</div><div class='del'>-		</div><div class='del'>-		if (dd-&gt;last_sector != rq-&gt;sector)</div><div class='del'>-			/* end the batch on a non sequential request */</div><div class='del'>-			dd-&gt;batching += dd-&gt;fifo_batch;</div><div class='del'>-		</div><div class='del'>-		if (dd-&gt;batching &lt; dd-&gt;fifo_batch)</div><div class='del'>-			/* we are still entitled to batch */</div><div class='del'>-			goto dispatch_request;</div><div class='del'>-	}</div><div class='add'>+	if (rq &amp;&amp; dd-&gt;batching &lt; dd-&gt;fifo_batch)</div><div class='add'>+		/* we have a next request are still entitled to batch */</div><div class='add'>+		goto dispatch_request;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * at this point we are not running a batch. select the appropriate</div><div class='head'>diff --git a/block/elevator.c b/block/elevator.c<br/>index ed6f8f32d27e..59173a69ebdf 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/block/elevator.c?id=c15895ef30c2c03e99802951787183039a349d32'>block/elevator.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/block/elevator.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>block/elevator.c</a></div><div class='hunk'>@@ -34,8 +34,9 @@</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/blktrace_api.h&gt;</div><div class='ctx'> #include &lt;linux/hash.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include "blk.h"</div><div class='ctx'> </div><div class='ctx'> static DEFINE_SPINLOCK(elv_list_lock);</div><div class='ctx'> static LIST_HEAD(elv_list);</div><div class='hunk'>@@ -75,6 +76,12 @@ int elv_rq_merge_ok(struct request *rq, struct bio *bio)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='add'>+	 * Don't merge file system requests and discard requests</div><div class='add'>+	 */</div><div class='add'>+	if (bio_discard(bio) != bio_discard(rq-&gt;bio))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='ctx'> 	 * different data direction or already started, don't merge</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (bio_data_dir(bio) != rq_data_dir(rq))</div><div class='hunk'>@@ -438,6 +445,8 @@ void elv_dispatch_sort(struct request_queue *q, struct request *rq)</div><div class='ctx'> 	list_for_each_prev(entry, &amp;q-&gt;queue_head) {</div><div class='ctx'> 		struct request *pos = list_entry_rq(entry);</div><div class='ctx'> </div><div class='add'>+		if (blk_discard_rq(rq) != blk_discard_rq(pos))</div><div class='add'>+			break;</div><div class='ctx'> 		if (rq_data_dir(rq) != rq_data_dir(pos))</div><div class='ctx'> 			break;</div><div class='ctx'> 		if (pos-&gt;cmd_flags &amp; stop_flags)</div><div class='hunk'>@@ -603,11 +612,11 @@ void elv_insert(struct request_queue *q, struct request *rq, int where)</div><div class='ctx'> 		 *   processing.</div><div class='ctx'> 		 */</div><div class='ctx'> 		blk_remove_plug(q);</div><div class='del'>-		q-&gt;request_fn(q);</div><div class='add'>+		blk_start_queueing(q);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case ELEVATOR_INSERT_SORT:</div><div class='del'>-		BUG_ON(!blk_fs_request(rq));</div><div class='add'>+		BUG_ON(!blk_fs_request(rq) &amp;&amp; !blk_discard_rq(rq));</div><div class='ctx'> 		rq-&gt;cmd_flags |= REQ_SORTED;</div><div class='ctx'> 		q-&gt;nr_sorted++;</div><div class='ctx'> 		if (rq_mergeable(rq)) {</div><div class='hunk'>@@ -692,7 +701,7 @@ void __elv_add_request(struct request_queue *q, struct request *rq, int where,</div><div class='ctx'> 		 * this request is scheduling boundary, update</div><div class='ctx'> 		 * end_sector</div><div class='ctx'> 		 */</div><div class='del'>-		if (blk_fs_request(rq)) {</div><div class='add'>+		if (blk_fs_request(rq) || blk_discard_rq(rq)) {</div><div class='ctx'> 			q-&gt;end_sector = rq_end_sector(rq);</div><div class='ctx'> 			q-&gt;boundary_rq = rq;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -745,7 +754,7 @@ struct request *elv_next_request(struct request_queue *q)</div><div class='ctx'> 		 * not ever see it.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (blk_empty_barrier(rq)) {</div><div class='del'>-			end_queued_request(rq, 1);</div><div class='add'>+			__blk_end_request(rq, 0, blk_rq_bytes(rq));</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (!(rq-&gt;cmd_flags &amp; REQ_STARTED)) {</div><div class='hunk'>@@ -764,6 +773,12 @@ struct request *elv_next_request(struct request_queue *q)</div><div class='ctx'> 			 */</div><div class='ctx'> 			rq-&gt;cmd_flags |= REQ_STARTED;</div><div class='ctx'> 			blk_add_trace_rq(q, rq, BLK_TA_ISSUE);</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * We are now handing the request to the hardware,</div><div class='add'>+			 * add the timeout handler</div><div class='add'>+			 */</div><div class='add'>+			blk_add_timer(rq);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (!q-&gt;boundary_rq || q-&gt;boundary_rq == rq) {</div><div class='hunk'>@@ -782,7 +797,6 @@ struct request *elv_next_request(struct request_queue *q)</div><div class='ctx'> 			 * device can handle</div><div class='ctx'> 			 */</div><div class='ctx'> 			rq-&gt;nr_phys_segments++;</div><div class='del'>-			rq-&gt;nr_hw_segments++;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (!q-&gt;prep_rq_fn)</div><div class='hunk'>@@ -805,14 +819,13 @@ struct request *elv_next_request(struct request_queue *q)</div><div class='ctx'> 				 * so that we don't add it again</div><div class='ctx'> 				 */</div><div class='ctx'> 				--rq-&gt;nr_phys_segments;</div><div class='del'>-				--rq-&gt;nr_hw_segments;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			rq = NULL;</div><div class='ctx'> 			break;</div><div class='ctx'> 		} else if (ret == BLKPREP_KILL) {</div><div class='ctx'> 			rq-&gt;cmd_flags |= REQ_QUIET;</div><div class='del'>-			end_queued_request(rq, 0);</div><div class='add'>+			__blk_end_request(rq, -EIO, blk_rq_bytes(rq));</div><div class='ctx'> 		} else {</div><div class='ctx'> 			printk(KERN_ERR "%s: bad return=%d\n", __func__, ret);</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -901,6 +914,19 @@ int elv_may_queue(struct request_queue *q, int rw)</div><div class='ctx'> 	return ELV_MQUEUE_MAY;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void elv_abort_queue(struct request_queue *q)</div><div class='add'>+{</div><div class='add'>+	struct request *rq;</div><div class='add'>+</div><div class='add'>+	while (!list_empty(&amp;q-&gt;queue_head)) {</div><div class='add'>+		rq = list_entry_rq(q-&gt;queue_head.next);</div><div class='add'>+		rq-&gt;cmd_flags |= REQ_QUIET;</div><div class='add'>+		blk_add_trace_rq(q, rq, BLK_TA_ABORT);</div><div class='add'>+		__blk_end_request(rq, -EIO, blk_rq_bytes(rq));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(elv_abort_queue);</div><div class='add'>+</div><div class='ctx'> void elv_completed_request(struct request_queue *q, struct request *rq)</div><div class='ctx'> {</div><div class='ctx'> 	elevator_t *e = q-&gt;elevator;</div><div class='hunk'>@@ -924,7 +950,7 @@ void elv_completed_request(struct request_queue *q, struct request *rq)</div><div class='ctx'> 		    blk_ordered_cur_seq(q) == QUEUE_ORDSEQ_DRAIN &amp;&amp;</div><div class='ctx'> 		    blk_ordered_req_seq(first_rq) &gt; QUEUE_ORDSEQ_DRAIN) {</div><div class='ctx'> 			blk_ordered_complete_seq(q, QUEUE_ORDSEQ_DRAIN, 0);</div><div class='del'>-			q-&gt;request_fn(q);</div><div class='add'>+			blk_start_queueing(q);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -1083,8 +1109,7 @@ static int elevator_switch(struct request_queue *q, struct elevator_type *new_e)</div><div class='ctx'> 	elv_drain_elevator(q);</div><div class='ctx'> </div><div class='ctx'> 	while (q-&gt;rq.elvpriv) {</div><div class='del'>-		blk_remove_plug(q);</div><div class='del'>-		q-&gt;request_fn(q);</div><div class='add'>+		blk_start_queueing(q);</div><div class='ctx'> 		spin_unlock_irq(q-&gt;queue_lock);</div><div class='ctx'> 		msleep(10);</div><div class='ctx'> 		spin_lock_irq(q-&gt;queue_lock);</div><div class='hunk'>@@ -1140,15 +1165,10 @@ ssize_t elv_iosched_store(struct request_queue *q, const char *name,</div><div class='ctx'> 			  size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	char elevator_name[ELV_NAME_MAX];</div><div class='del'>-	size_t len;</div><div class='ctx'> 	struct elevator_type *e;</div><div class='ctx'> </div><div class='del'>-	elevator_name[sizeof(elevator_name) - 1] = '\0';</div><div class='del'>-	strncpy(elevator_name, name, sizeof(elevator_name) - 1);</div><div class='del'>-	len = strlen(elevator_name);</div><div class='del'>-</div><div class='del'>-	if (len &amp;&amp; elevator_name[len - 1] == '\n')</div><div class='del'>-		elevator_name[len - 1] = '\0';</div><div class='add'>+	strlcpy(elevator_name, name, sizeof(elevator_name));</div><div class='add'>+	strstrip(elevator_name);</div><div class='ctx'> </div><div class='ctx'> 	e = elevator_get(elevator_name);</div><div class='ctx'> 	if (!e) {</div><div class='head'>diff --git a/block/genhd.c b/block/genhd.c<br/>index e0ce23ac2ece..646e1d2507c7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/block/genhd.c?id=c15895ef30c2c03e99802951787183039a349d32'>block/genhd.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/block/genhd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>block/genhd.c</a></div><div class='hunk'>@@ -16,6 +16,7 @@</div><div class='ctx'> #include &lt;linux/kobj_map.h&gt;</div><div class='ctx'> #include &lt;linux/buffer_head.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/idr.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "blk.h"</div><div class='ctx'> </div><div class='hunk'>@@ -24,8 +25,194 @@ static DEFINE_MUTEX(block_class_lock);</div><div class='ctx'> struct kobject *block_depr;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+/* for extended dynamic devt allocation, currently only one major is used */</div><div class='add'>+#define MAX_EXT_DEVT		(1 &lt;&lt; MINORBITS)</div><div class='add'>+</div><div class='add'>+/* For extended devt allocation.  ext_devt_mutex prevents look up</div><div class='add'>+ * results from going away underneath its user.</div><div class='add'>+ */</div><div class='add'>+static DEFINE_MUTEX(ext_devt_mutex);</div><div class='add'>+static DEFINE_IDR(ext_devt_idr);</div><div class='add'>+</div><div class='ctx'> static struct device_type disk_type;</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * disk_get_part - get partition</div><div class='add'>+ * @disk: disk to look partition from</div><div class='add'>+ * @partno: partition number</div><div class='add'>+ *</div><div class='add'>+ * Look for partition @partno from @disk.  If found, increment</div><div class='add'>+ * reference count and return it.</div><div class='add'>+ *</div><div class='add'>+ * CONTEXT:</div><div class='add'>+ * Don't care.</div><div class='add'>+ *</div><div class='add'>+ * RETURNS:</div><div class='add'>+ * Pointer to the found partition on success, NULL if not found.</div><div class='add'>+ */</div><div class='add'>+struct hd_struct *disk_get_part(struct gendisk *disk, int partno)</div><div class='add'>+{</div><div class='add'>+	struct hd_struct *part = NULL;</div><div class='add'>+	struct disk_part_tbl *ptbl;</div><div class='add'>+</div><div class='add'>+	if (unlikely(partno &lt; 0))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	ptbl = rcu_dereference(disk-&gt;part_tbl);</div><div class='add'>+	if (likely(partno &lt; ptbl-&gt;len)) {</div><div class='add'>+		part = rcu_dereference(ptbl-&gt;part[partno]);</div><div class='add'>+		if (part)</div><div class='add'>+			get_device(part_to_dev(part));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	return part;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(disk_get_part);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * disk_part_iter_init - initialize partition iterator</div><div class='add'>+ * @piter: iterator to initialize</div><div class='add'>+ * @disk: disk to iterate over</div><div class='add'>+ * @flags: DISK_PITER_* flags</div><div class='add'>+ *</div><div class='add'>+ * Initialize @piter so that it iterates over partitions of @disk.</div><div class='add'>+ *</div><div class='add'>+ * CONTEXT:</div><div class='add'>+ * Don't care.</div><div class='add'>+ */</div><div class='add'>+void disk_part_iter_init(struct disk_part_iter *piter, struct gendisk *disk,</div><div class='add'>+			  unsigned int flags)</div><div class='add'>+{</div><div class='add'>+	struct disk_part_tbl *ptbl;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	ptbl = rcu_dereference(disk-&gt;part_tbl);</div><div class='add'>+</div><div class='add'>+	piter-&gt;disk = disk;</div><div class='add'>+	piter-&gt;part = NULL;</div><div class='add'>+</div><div class='add'>+	if (flags &amp; DISK_PITER_REVERSE)</div><div class='add'>+		piter-&gt;idx = ptbl-&gt;len - 1;</div><div class='add'>+	else if (flags &amp; DISK_PITER_INCL_PART0)</div><div class='add'>+		piter-&gt;idx = 0;</div><div class='add'>+	else</div><div class='add'>+		piter-&gt;idx = 1;</div><div class='add'>+</div><div class='add'>+	piter-&gt;flags = flags;</div><div class='add'>+</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(disk_part_iter_init);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * disk_part_iter_next - proceed iterator to the next partition and return it</div><div class='add'>+ * @piter: iterator of interest</div><div class='add'>+ *</div><div class='add'>+ * Proceed @piter to the next partition and return it.</div><div class='add'>+ *</div><div class='add'>+ * CONTEXT:</div><div class='add'>+ * Don't care.</div><div class='add'>+ */</div><div class='add'>+struct hd_struct *disk_part_iter_next(struct disk_part_iter *piter)</div><div class='add'>+{</div><div class='add'>+	struct disk_part_tbl *ptbl;</div><div class='add'>+	int inc, end;</div><div class='add'>+</div><div class='add'>+	/* put the last partition */</div><div class='add'>+	disk_put_part(piter-&gt;part);</div><div class='add'>+	piter-&gt;part = NULL;</div><div class='add'>+</div><div class='add'>+	/* get part_tbl */</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	ptbl = rcu_dereference(piter-&gt;disk-&gt;part_tbl);</div><div class='add'>+</div><div class='add'>+	/* determine iteration parameters */</div><div class='add'>+	if (piter-&gt;flags &amp; DISK_PITER_REVERSE) {</div><div class='add'>+		inc = -1;</div><div class='add'>+		if (piter-&gt;flags &amp; DISK_PITER_INCL_PART0)</div><div class='add'>+			end = -1;</div><div class='add'>+		else</div><div class='add'>+			end = 0;</div><div class='add'>+	} else {</div><div class='add'>+		inc = 1;</div><div class='add'>+		end = ptbl-&gt;len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* iterate to the next partition */</div><div class='add'>+	for (; piter-&gt;idx != end; piter-&gt;idx += inc) {</div><div class='add'>+		struct hd_struct *part;</div><div class='add'>+</div><div class='add'>+		part = rcu_dereference(ptbl-&gt;part[piter-&gt;idx]);</div><div class='add'>+		if (!part)</div><div class='add'>+			continue;</div><div class='add'>+		if (!(piter-&gt;flags &amp; DISK_PITER_INCL_EMPTY) &amp;&amp; !part-&gt;nr_sects)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		get_device(part_to_dev(part));</div><div class='add'>+		piter-&gt;part = part;</div><div class='add'>+		piter-&gt;idx += inc;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	return piter-&gt;part;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(disk_part_iter_next);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * disk_part_iter_exit - finish up partition iteration</div><div class='add'>+ * @piter: iter of interest</div><div class='add'>+ *</div><div class='add'>+ * Called when iteration is over.  Cleans up @piter.</div><div class='add'>+ *</div><div class='add'>+ * CONTEXT:</div><div class='add'>+ * Don't care.</div><div class='add'>+ */</div><div class='add'>+void disk_part_iter_exit(struct disk_part_iter *piter)</div><div class='add'>+{</div><div class='add'>+	disk_put_part(piter-&gt;part);</div><div class='add'>+	piter-&gt;part = NULL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(disk_part_iter_exit);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * disk_map_sector_rcu - map sector to partition</div><div class='add'>+ * @disk: gendisk of interest</div><div class='add'>+ * @sector: sector to map</div><div class='add'>+ *</div><div class='add'>+ * Find out which partition @sector maps to on @disk.  This is</div><div class='add'>+ * primarily used for stats accounting.</div><div class='add'>+ *</div><div class='add'>+ * CONTEXT:</div><div class='add'>+ * RCU read locked.  The returned partition pointer is valid only</div><div class='add'>+ * while preemption is disabled.</div><div class='add'>+ *</div><div class='add'>+ * RETURNS:</div><div class='add'>+ * Found partition on success, part0 is returned if no partition matches</div><div class='add'>+ */</div><div class='add'>+struct hd_struct *disk_map_sector_rcu(struct gendisk *disk, sector_t sector)</div><div class='add'>+{</div><div class='add'>+	struct disk_part_tbl *ptbl;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	ptbl = rcu_dereference(disk-&gt;part_tbl);</div><div class='add'>+</div><div class='add'>+	for (i = 1; i &lt; ptbl-&gt;len; i++) {</div><div class='add'>+		struct hd_struct *part = rcu_dereference(ptbl-&gt;part[i]);</div><div class='add'>+</div><div class='add'>+		if (part &amp;&amp; part-&gt;start_sect &lt;= sector &amp;&amp;</div><div class='add'>+		    sector &lt; part-&gt;start_sect + part-&gt;nr_sects)</div><div class='add'>+			return part;</div><div class='add'>+	}</div><div class='add'>+	return &amp;disk-&gt;part0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(disk_map_sector_rcu);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Can be deleted altogether. Later.</div><div class='ctx'>  *</div><div class='hunk'>@@ -43,14 +230,14 @@ static inline int major_to_index(int major)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PROC_FS</div><div class='del'>-void blkdev_show(struct seq_file *f, off_t offset)</div><div class='add'>+void blkdev_show(struct seq_file *seqf, off_t offset)</div><div class='ctx'> {</div><div class='ctx'> 	struct blk_major_name *dp;</div><div class='ctx'> </div><div class='ctx'> 	if (offset &lt; BLKDEV_MAJOR_HASH_SIZE) {</div><div class='ctx'> 		mutex_lock(&amp;block_class_lock);</div><div class='ctx'> 		for (dp = major_names[offset]; dp; dp = dp-&gt;next)</div><div class='del'>-			seq_printf(f, "%3d %s\n", dp-&gt;major, dp-&gt;name);</div><div class='add'>+			seq_printf(seqf, "%3d %s\n", dp-&gt;major, dp-&gt;name);</div><div class='ctx'> 		mutex_unlock(&amp;block_class_lock);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -136,6 +323,117 @@ EXPORT_SYMBOL(unregister_blkdev);</div><div class='ctx'> </div><div class='ctx'> static struct kobj_map *bdev_map;</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * blk_mangle_minor - scatter minor numbers apart</div><div class='add'>+ * @minor: minor number to mangle</div><div class='add'>+ *</div><div class='add'>+ * Scatter consecutively allocated @minor number apart if MANGLE_DEVT</div><div class='add'>+ * is enabled.  Mangling twice gives the original value.</div><div class='add'>+ *</div><div class='add'>+ * RETURNS:</div><div class='add'>+ * Mangled value.</div><div class='add'>+ *</div><div class='add'>+ * CONTEXT:</div><div class='add'>+ * Don't care.</div><div class='add'>+ */</div><div class='add'>+static int blk_mangle_minor(int minor)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_DEBUG_BLOCK_EXT_DEVT</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MINORBITS / 2; i++) {</div><div class='add'>+		int low = minor &amp; (1 &lt;&lt; i);</div><div class='add'>+		int high = minor &amp; (1 &lt;&lt; (MINORBITS - 1 - i));</div><div class='add'>+		int distance = MINORBITS - 1 - 2 * i;</div><div class='add'>+</div><div class='add'>+		minor ^= low | high;	/* clear both bits */</div><div class='add'>+		low &lt;&lt;= distance;	/* swap the positions */</div><div class='add'>+		high &gt;&gt;= distance;</div><div class='add'>+		minor |= low | high;	/* and set */</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	return minor;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * blk_alloc_devt - allocate a dev_t for a partition</div><div class='add'>+ * @part: partition to allocate dev_t for</div><div class='add'>+ * @devt: out parameter for resulting dev_t</div><div class='add'>+ *</div><div class='add'>+ * Allocate a dev_t for block device.</div><div class='add'>+ *</div><div class='add'>+ * RETURNS:</div><div class='add'>+ * 0 on success, allocated dev_t is returned in *@devt.  -errno on</div><div class='add'>+ * failure.</div><div class='add'>+ *</div><div class='add'>+ * CONTEXT:</div><div class='add'>+ * Might sleep.</div><div class='add'>+ */</div><div class='add'>+int blk_alloc_devt(struct hd_struct *part, dev_t *devt)</div><div class='add'>+{</div><div class='add'>+	struct gendisk *disk = part_to_disk(part);</div><div class='add'>+	int idx, rc;</div><div class='add'>+</div><div class='add'>+	/* in consecutive minor range? */</div><div class='add'>+	if (part-&gt;partno &lt; disk-&gt;minors) {</div><div class='add'>+		*devt = MKDEV(disk-&gt;major, disk-&gt;first_minor + part-&gt;partno);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* allocate ext devt */</div><div class='add'>+	do {</div><div class='add'>+		if (!idr_pre_get(&amp;ext_devt_idr, GFP_KERNEL))</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		rc = idr_get_new(&amp;ext_devt_idr, part, &amp;idx);</div><div class='add'>+	} while (rc == -EAGAIN);</div><div class='add'>+</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	if (idx &gt; MAX_EXT_DEVT) {</div><div class='add'>+		idr_remove(&amp;ext_devt_idr, idx);</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*devt = MKDEV(BLOCK_EXT_MAJOR, blk_mangle_minor(idx));</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * blk_free_devt - free a dev_t</div><div class='add'>+ * @devt: dev_t to free</div><div class='add'>+ *</div><div class='add'>+ * Free @devt which was allocated using blk_alloc_devt().</div><div class='add'>+ *</div><div class='add'>+ * CONTEXT:</div><div class='add'>+ * Might sleep.</div><div class='add'>+ */</div><div class='add'>+void blk_free_devt(dev_t devt)</div><div class='add'>+{</div><div class='add'>+	might_sleep();</div><div class='add'>+</div><div class='add'>+	if (devt == MKDEV(0, 0))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (MAJOR(devt) == BLOCK_EXT_MAJOR) {</div><div class='add'>+		mutex_lock(&amp;ext_devt_mutex);</div><div class='add'>+		idr_remove(&amp;ext_devt_idr, blk_mangle_minor(MINOR(devt)));</div><div class='add'>+		mutex_unlock(&amp;ext_devt_mutex);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static char *bdevt_str(dev_t devt, char *buf)</div><div class='add'>+{</div><div class='add'>+	if (MAJOR(devt) &lt;= 0xff &amp;&amp; MINOR(devt) &lt;= 0xff) {</div><div class='add'>+		char tbuf[BDEVT_SIZE];</div><div class='add'>+		snprintf(tbuf, BDEVT_SIZE, "%02x%02x", MAJOR(devt), MINOR(devt));</div><div class='add'>+		snprintf(buf, BDEVT_SIZE, "%-9s", tbuf);</div><div class='add'>+	} else</div><div class='add'>+		snprintf(buf, BDEVT_SIZE, "%03x:%05x", MAJOR(devt), MINOR(devt));</div><div class='add'>+</div><div class='add'>+	return buf;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Register device numbers dev..(dev+range-1)</div><div class='ctx'>  * range must be nonzero</div><div class='hunk'>@@ -157,11 +455,11 @@ void blk_unregister_region(dev_t devt, unsigned long range)</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(blk_unregister_region);</div><div class='ctx'> </div><div class='del'>-static struct kobject *exact_match(dev_t devt, int *part, void *data)</div><div class='add'>+static struct kobject *exact_match(dev_t devt, int *partno, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct gendisk *p = data;</div><div class='ctx'> </div><div class='del'>-	return &amp;p-&gt;dev.kobj;</div><div class='add'>+	return &amp;disk_to_dev(p)-&gt;kobj;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int exact_lock(dev_t devt, void *data)</div><div class='hunk'>@@ -179,21 +477,46 @@ static int exact_lock(dev_t devt, void *data)</div><div class='ctx'>  *</div><div class='ctx'>  * This function registers the partitioning information in @disk</div><div class='ctx'>  * with the kernel.</div><div class='add'>+ *</div><div class='add'>+ * FIXME: error handling</div><div class='ctx'>  */</div><div class='ctx'> void add_disk(struct gendisk *disk)</div><div class='ctx'> {</div><div class='ctx'> 	struct backing_dev_info *bdi;</div><div class='add'>+	dev_t devt;</div><div class='ctx'> 	int retval;</div><div class='ctx'> </div><div class='add'>+	/* minors == 0 indicates to use ext devt from part0 and should</div><div class='add'>+	 * be accompanied with EXT_DEVT flag.  Make sure all</div><div class='add'>+	 * parameters make sense.</div><div class='add'>+	 */</div><div class='add'>+	WARN_ON(disk-&gt;minors &amp;&amp; !(disk-&gt;major || disk-&gt;first_minor));</div><div class='add'>+	WARN_ON(!disk-&gt;minors &amp;&amp; !(disk-&gt;flags &amp; GENHD_FL_EXT_DEVT));</div><div class='add'>+</div><div class='ctx'> 	disk-&gt;flags |= GENHD_FL_UP;</div><div class='del'>-	blk_register_region(MKDEV(disk-&gt;major, disk-&gt;first_minor),</div><div class='del'>-			    disk-&gt;minors, NULL, exact_match, exact_lock, disk);</div><div class='add'>+</div><div class='add'>+	retval = blk_alloc_devt(&amp;disk-&gt;part0, &amp;devt);</div><div class='add'>+	if (retval) {</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	disk_to_dev(disk)-&gt;devt = devt;</div><div class='add'>+</div><div class='add'>+	/* -&gt;major and -&gt;first_minor aren't supposed to be</div><div class='add'>+	 * dereferenced from here on, but set them just in case.</div><div class='add'>+	 */</div><div class='add'>+	disk-&gt;major = MAJOR(devt);</div><div class='add'>+	disk-&gt;first_minor = MINOR(devt);</div><div class='add'>+</div><div class='add'>+	blk_register_region(disk_devt(disk), disk-&gt;minors, NULL,</div><div class='add'>+			    exact_match, exact_lock, disk);</div><div class='ctx'> 	register_disk(disk);</div><div class='ctx'> 	blk_register_queue(disk);</div><div class='ctx'> </div><div class='ctx'> 	bdi = &amp;disk-&gt;queue-&gt;backing_dev_info;</div><div class='del'>-	bdi_register_dev(bdi, MKDEV(disk-&gt;major, disk-&gt;first_minor));</div><div class='del'>-	retval = sysfs_create_link(&amp;disk-&gt;dev.kobj, &amp;bdi-&gt;dev-&gt;kobj, "bdi");</div><div class='add'>+	bdi_register_dev(bdi, disk_devt(disk));</div><div class='add'>+	retval = sysfs_create_link(&amp;disk_to_dev(disk)-&gt;kobj, &amp;bdi-&gt;dev-&gt;kobj,</div><div class='add'>+				   "bdi");</div><div class='ctx'> 	WARN_ON(retval);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -202,78 +525,71 @@ EXPORT_SYMBOL(del_gendisk);	/* in partitions/check.c */</div><div class='ctx'> </div><div class='ctx'> void unlink_gendisk(struct gendisk *disk)</div><div class='ctx'> {</div><div class='del'>-	sysfs_remove_link(&amp;disk-&gt;dev.kobj, "bdi");</div><div class='add'>+	sysfs_remove_link(&amp;disk_to_dev(disk)-&gt;kobj, "bdi");</div><div class='ctx'> 	bdi_unregister(&amp;disk-&gt;queue-&gt;backing_dev_info);</div><div class='ctx'> 	blk_unregister_queue(disk);</div><div class='del'>-	blk_unregister_region(MKDEV(disk-&gt;major, disk-&gt;first_minor),</div><div class='del'>-			      disk-&gt;minors);</div><div class='add'>+	blk_unregister_region(disk_devt(disk), disk-&gt;minors);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * get_gendisk - get partitioning information for a given device</div><div class='del'>- * @dev: device to get partitioning information for</div><div class='add'>+ * @devt: device to get partitioning information for</div><div class='add'>+ * @partno: returned partition index</div><div class='ctx'>  *</div><div class='ctx'>  * This function gets the structure containing partitioning</div><div class='del'>- * information for the given device @dev.</div><div class='add'>+ * information for the given device @devt.</div><div class='ctx'>  */</div><div class='del'>-struct gendisk *get_gendisk(dev_t devt, int *part)</div><div class='add'>+struct gendisk *get_gendisk(dev_t devt, int *partno)</div><div class='ctx'> {</div><div class='del'>-	struct kobject *kobj = kobj_lookup(bdev_map, devt, part);</div><div class='del'>-	struct device *dev = kobj_to_dev(kobj);</div><div class='add'>+	struct gendisk *disk = NULL;</div><div class='add'>+</div><div class='add'>+	if (MAJOR(devt) != BLOCK_EXT_MAJOR) {</div><div class='add'>+		struct kobject *kobj;</div><div class='add'>+</div><div class='add'>+		kobj = kobj_lookup(bdev_map, devt, partno);</div><div class='add'>+		if (kobj)</div><div class='add'>+			disk = dev_to_disk(kobj_to_dev(kobj));</div><div class='add'>+	} else {</div><div class='add'>+		struct hd_struct *part;</div><div class='ctx'> </div><div class='del'>-	return  kobj ? dev_to_disk(dev) : NULL;</div><div class='add'>+		mutex_lock(&amp;ext_devt_mutex);</div><div class='add'>+		part = idr_find(&amp;ext_devt_idr, blk_mangle_minor(MINOR(devt)));</div><div class='add'>+		if (part &amp;&amp; get_disk(part_to_disk(part))) {</div><div class='add'>+			*partno = part-&gt;partno;</div><div class='add'>+			disk = part_to_disk(part);</div><div class='add'>+		}</div><div class='add'>+		mutex_unlock(&amp;ext_devt_mutex);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return disk;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * print a partitions - intended for places where the root filesystem can't be</div><div class='del'>- * mounted and thus to give the victim some idea of what went wrong</div><div class='add'>+/**</div><div class='add'>+ * bdget_disk - do bdget() by gendisk and partition number</div><div class='add'>+ * @disk: gendisk of interest</div><div class='add'>+ * @partno: partition number</div><div class='add'>+ *</div><div class='add'>+ * Find partition @partno from @disk, do bdget() on it.</div><div class='add'>+ *</div><div class='add'>+ * CONTEXT:</div><div class='add'>+ * Don't care.</div><div class='add'>+ *</div><div class='add'>+ * RETURNS:</div><div class='add'>+ * Resulting block_device on success, NULL on failure.</div><div class='ctx'>  */</div><div class='del'>-static int printk_partition(struct device *dev, void *data)</div><div class='add'>+struct block_device *bdget_disk(struct gendisk *disk, int partno)</div><div class='ctx'> {</div><div class='del'>-	struct gendisk *sgp;</div><div class='del'>-	char buf[BDEVNAME_SIZE];</div><div class='del'>-	int n;</div><div class='del'>-</div><div class='del'>-	if (dev-&gt;type != &amp;disk_type)</div><div class='del'>-		goto exit;</div><div class='add'>+	struct hd_struct *part;</div><div class='add'>+	struct block_device *bdev = NULL;</div><div class='ctx'> </div><div class='del'>-	sgp = dev_to_disk(dev);</div><div class='del'>-	/*</div><div class='del'>-	 * Don't show empty devices or things that have been surpressed</div><div class='del'>-	 */</div><div class='del'>-	if (get_capacity(sgp) == 0 ||</div><div class='del'>-	    (sgp-&gt;flags &amp; GENHD_FL_SUPPRESS_PARTITION_INFO))</div><div class='del'>-		goto exit;</div><div class='add'>+	part = disk_get_part(disk, partno);</div><div class='add'>+	if (part)</div><div class='add'>+		bdev = bdget(part_devt(part));</div><div class='add'>+	disk_put_part(part);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Note, unlike /proc/partitions, I am showing the numbers in</div><div class='del'>-	 * hex - the same format as the root= option takes.</div><div class='del'>-	 */</div><div class='del'>-	printk("%02x%02x %10llu %s",</div><div class='del'>-		sgp-&gt;major, sgp-&gt;first_minor,</div><div class='del'>-		(unsigned long long)get_capacity(sgp) &gt;&gt; 1,</div><div class='del'>-		disk_name(sgp, 0, buf));</div><div class='del'>-	if (sgp-&gt;driverfs_dev != NULL &amp;&amp;</div><div class='del'>-	    sgp-&gt;driverfs_dev-&gt;driver != NULL)</div><div class='del'>-		printk(" driver: %s\n",</div><div class='del'>-			sgp-&gt;driverfs_dev-&gt;driver-&gt;name);</div><div class='del'>-	else</div><div class='del'>-		printk(" (driver?)\n");</div><div class='del'>-</div><div class='del'>-	/* now show the partitions */</div><div class='del'>-	for (n = 0; n &lt; sgp-&gt;minors - 1; ++n) {</div><div class='del'>-		if (sgp-&gt;part[n] == NULL)</div><div class='del'>-			goto exit;</div><div class='del'>-		if (sgp-&gt;part[n]-&gt;nr_sects == 0)</div><div class='del'>-			goto exit;</div><div class='del'>-		printk("  %02x%02x %10llu %s\n",</div><div class='del'>-			sgp-&gt;major, n + 1 + sgp-&gt;first_minor,</div><div class='del'>-			(unsigned long long)sgp-&gt;part[n]-&gt;nr_sects &gt;&gt; 1,</div><div class='del'>-			disk_name(sgp, n + 1, buf));</div><div class='del'>-	}</div><div class='del'>-exit:</div><div class='del'>-	return 0;</div><div class='add'>+	return bdev;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(bdget_disk);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * print a full list of all partitions - intended for places where the root</div><div class='hunk'>@@ -282,120 +598,145 @@ exit:</div><div class='ctx'>  */</div><div class='ctx'> void __init printk_all_partitions(void)</div><div class='ctx'> {</div><div class='del'>-	mutex_lock(&amp;block_class_lock);</div><div class='del'>-	class_for_each_device(&amp;block_class, NULL, NULL, printk_partition);</div><div class='del'>-	mutex_unlock(&amp;block_class_lock);</div><div class='add'>+	struct class_dev_iter iter;</div><div class='add'>+	struct device *dev;</div><div class='add'>+</div><div class='add'>+	class_dev_iter_init(&amp;iter, &amp;block_class, NULL, &amp;disk_type);</div><div class='add'>+	while ((dev = class_dev_iter_next(&amp;iter))) {</div><div class='add'>+		struct gendisk *disk = dev_to_disk(dev);</div><div class='add'>+		struct disk_part_iter piter;</div><div class='add'>+		struct hd_struct *part;</div><div class='add'>+		char name_buf[BDEVNAME_SIZE];</div><div class='add'>+		char devt_buf[BDEVT_SIZE];</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Don't show empty devices or things that have been</div><div class='add'>+		 * surpressed</div><div class='add'>+		 */</div><div class='add'>+		if (get_capacity(disk) == 0 ||</div><div class='add'>+		    (disk-&gt;flags &amp; GENHD_FL_SUPPRESS_PARTITION_INFO))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Note, unlike /proc/partitions, I am showing the</div><div class='add'>+		 * numbers in hex - the same format as the root=</div><div class='add'>+		 * option takes.</div><div class='add'>+		 */</div><div class='add'>+		disk_part_iter_init(&amp;piter, disk, DISK_PITER_INCL_PART0);</div><div class='add'>+		while ((part = disk_part_iter_next(&amp;piter))) {</div><div class='add'>+			bool is_part0 = part == &amp;disk-&gt;part0;</div><div class='add'>+</div><div class='add'>+			printk("%s%s %10llu %s", is_part0 ? "" : "  ",</div><div class='add'>+			       bdevt_str(part_devt(part), devt_buf),</div><div class='add'>+			       (unsigned long long)part-&gt;nr_sects &gt;&gt; 1,</div><div class='add'>+			       disk_name(disk, part-&gt;partno, name_buf));</div><div class='add'>+			if (is_part0) {</div><div class='add'>+				if (disk-&gt;driverfs_dev != NULL &amp;&amp;</div><div class='add'>+				    disk-&gt;driverfs_dev-&gt;driver != NULL)</div><div class='add'>+					printk(" driver: %s\n",</div><div class='add'>+					      disk-&gt;driverfs_dev-&gt;driver-&gt;name);</div><div class='add'>+				else</div><div class='add'>+					printk(" (driver?)\n");</div><div class='add'>+			} else</div><div class='add'>+				printk("\n");</div><div class='add'>+		}</div><div class='add'>+		disk_part_iter_exit(&amp;piter);</div><div class='add'>+	}</div><div class='add'>+	class_dev_iter_exit(&amp;iter);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PROC_FS</div><div class='ctx'> /* iterator */</div><div class='del'>-static int find_start(struct device *dev, void *data)</div><div class='add'>+static void *disk_seqf_start(struct seq_file *seqf, loff_t *pos)</div><div class='ctx'> {</div><div class='del'>-	loff_t *k = data;</div><div class='add'>+	loff_t skip = *pos;</div><div class='add'>+	struct class_dev_iter *iter;</div><div class='add'>+	struct device *dev;</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;type != &amp;disk_type)</div><div class='del'>-		return 0;</div><div class='del'>-	if (!*k)</div><div class='del'>-		return 1;</div><div class='del'>-	(*k)--;</div><div class='del'>-	return 0;</div><div class='add'>+	iter = kmalloc(sizeof(*iter), GFP_KERNEL);</div><div class='add'>+	if (!iter)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	seqf-&gt;private = iter;</div><div class='add'>+	class_dev_iter_init(iter, &amp;block_class, NULL, &amp;disk_type);</div><div class='add'>+	do {</div><div class='add'>+		dev = class_dev_iter_next(iter);</div><div class='add'>+		if (!dev)</div><div class='add'>+			return NULL;</div><div class='add'>+	} while (skip--);</div><div class='add'>+</div><div class='add'>+	return dev_to_disk(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void *part_start(struct seq_file *part, loff_t *pos)</div><div class='add'>+static void *disk_seqf_next(struct seq_file *seqf, void *v, loff_t *pos)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev;</div><div class='del'>-	loff_t k = *pos;</div><div class='del'>-</div><div class='del'>-	if (!k)</div><div class='del'>-		part-&gt;private = (void *)1LU;	/* tell show to print header */</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;block_class_lock);</div><div class='del'>-	dev = class_find_device(&amp;block_class, NULL, &amp;k, find_start);</div><div class='del'>-	if (dev) {</div><div class='del'>-		put_device(dev);</div><div class='add'>+	(*pos)++;</div><div class='add'>+	dev = class_dev_iter_next(seqf-&gt;private);</div><div class='add'>+	if (dev)</div><div class='ctx'> 		return dev_to_disk(dev);</div><div class='del'>-	}</div><div class='add'>+</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int find_next(struct device *dev, void *data)</div><div class='add'>+static void disk_seqf_stop(struct seq_file *seqf, void *v)</div><div class='ctx'> {</div><div class='del'>-	if (dev-&gt;type == &amp;disk_type)</div><div class='del'>-		return 1;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='add'>+	struct class_dev_iter *iter = seqf-&gt;private;</div><div class='ctx'> </div><div class='del'>-static void *part_next(struct seq_file *part, void *v, loff_t *pos)</div><div class='del'>-{</div><div class='del'>-	struct gendisk *gp = v;</div><div class='del'>-	struct device *dev;</div><div class='del'>-	++*pos;</div><div class='del'>-	dev = class_find_device(&amp;block_class, &amp;gp-&gt;dev, NULL, find_next);</div><div class='del'>-	if (dev) {</div><div class='del'>-		put_device(dev);</div><div class='del'>-		return dev_to_disk(dev);</div><div class='add'>+	/* stop is called even after start failed :-( */</div><div class='add'>+	if (iter) {</div><div class='add'>+		class_dev_iter_exit(iter);</div><div class='add'>+		kfree(iter);</div><div class='ctx'> 	}</div><div class='del'>-	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void part_stop(struct seq_file *part, void *v)</div><div class='add'>+static void *show_partition_start(struct seq_file *seqf, loff_t *pos)</div><div class='ctx'> {</div><div class='del'>-	mutex_unlock(&amp;block_class_lock);</div><div class='add'>+	static void *p;</div><div class='add'>+</div><div class='add'>+	p = disk_seqf_start(seqf, pos);</div><div class='add'>+	if (!IS_ERR(p) &amp;&amp; p &amp;&amp; !*pos)</div><div class='add'>+		seq_puts(seqf, "major minor  #blocks  name\n\n");</div><div class='add'>+	return p;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int show_partition(struct seq_file *part, void *v)</div><div class='add'>+static int show_partition(struct seq_file *seqf, void *v)</div><div class='ctx'> {</div><div class='ctx'> 	struct gendisk *sgp = v;</div><div class='del'>-	int n;</div><div class='add'>+	struct disk_part_iter piter;</div><div class='add'>+	struct hd_struct *part;</div><div class='ctx'> 	char buf[BDEVNAME_SIZE];</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Print header if start told us to do.  This is to preserve</div><div class='del'>-	 * the original behavior of not printing header if no</div><div class='del'>-	 * partition exists.  This hackery will be removed later with</div><div class='del'>-	 * class iteration clean up.</div><div class='del'>-	 */</div><div class='del'>-	if (part-&gt;private) {</div><div class='del'>-		seq_puts(part, "major minor  #blocks  name\n\n");</div><div class='del'>-		part-&gt;private = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* Don't show non-partitionable removeable devices or empty devices */</div><div class='del'>-	if (!get_capacity(sgp) ||</div><div class='del'>-			(sgp-&gt;minors == 1 &amp;&amp; (sgp-&gt;flags &amp; GENHD_FL_REMOVABLE)))</div><div class='add'>+	if (!get_capacity(sgp) || (!disk_partitionable(sgp) &amp;&amp;</div><div class='add'>+				   (sgp-&gt;flags &amp; GENHD_FL_REMOVABLE)))</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	if (sgp-&gt;flags &amp; GENHD_FL_SUPPRESS_PARTITION_INFO)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* show the full disk and all non-0 size partitions of it */</div><div class='del'>-	seq_printf(part, "%4d  %4d %10llu %s\n",</div><div class='del'>-		sgp-&gt;major, sgp-&gt;first_minor,</div><div class='del'>-		(unsigned long long)get_capacity(sgp) &gt;&gt; 1,</div><div class='del'>-		disk_name(sgp, 0, buf));</div><div class='del'>-	for (n = 0; n &lt; sgp-&gt;minors - 1; n++) {</div><div class='del'>-		if (!sgp-&gt;part[n])</div><div class='del'>-			continue;</div><div class='del'>-		if (sgp-&gt;part[n]-&gt;nr_sects == 0)</div><div class='del'>-			continue;</div><div class='del'>-		seq_printf(part, "%4d  %4d %10llu %s\n",</div><div class='del'>-			sgp-&gt;major, n + 1 + sgp-&gt;first_minor,</div><div class='del'>-			(unsigned long long)sgp-&gt;part[n]-&gt;nr_sects &gt;&gt; 1 ,</div><div class='del'>-			disk_name(sgp, n + 1, buf));</div><div class='del'>-	}</div><div class='add'>+	disk_part_iter_init(&amp;piter, sgp, DISK_PITER_INCL_PART0);</div><div class='add'>+	while ((part = disk_part_iter_next(&amp;piter)))</div><div class='add'>+		seq_printf(seqf, "%4d  %7d %10llu %s\n",</div><div class='add'>+			   MAJOR(part_devt(part)), MINOR(part_devt(part)),</div><div class='add'>+			   (unsigned long long)part-&gt;nr_sects &gt;&gt; 1,</div><div class='add'>+			   disk_name(sgp, part-&gt;partno, buf));</div><div class='add'>+	disk_part_iter_exit(&amp;piter);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> const struct seq_operations partitions_op = {</div><div class='del'>-	.start	= part_start,</div><div class='del'>-	.next	= part_next,</div><div class='del'>-	.stop	= part_stop,</div><div class='add'>+	.start	= show_partition_start,</div><div class='add'>+	.next	= disk_seqf_next,</div><div class='add'>+	.stop	= disk_seqf_stop,</div><div class='ctx'> 	.show	= show_partition</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static struct kobject *base_probe(dev_t devt, int *part, void *data)</div><div class='add'>+static struct kobject *base_probe(dev_t devt, int *partno, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	if (request_module("block-major-%d-%d", MAJOR(devt), MINOR(devt)) &gt; 0)</div><div class='ctx'> 		/* Make old-style 2.4 aliases work */</div><div class='hunk'>@@ -431,29 +772,29 @@ static ssize_t disk_range_show(struct device *dev,</div><div class='ctx'> 	return sprintf(buf, "%d\n", disk-&gt;minors);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t disk_removable_show(struct device *dev,</div><div class='add'>+static ssize_t disk_ext_range_show(struct device *dev,</div><div class='ctx'> 				   struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct gendisk *disk = dev_to_disk(dev);</div><div class='ctx'> </div><div class='del'>-	return sprintf(buf, "%d\n",</div><div class='del'>-		       (disk-&gt;flags &amp; GENHD_FL_REMOVABLE ? 1 : 0));</div><div class='add'>+	return sprintf(buf, "%d\n", disk_max_parts(disk));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t disk_ro_show(struct device *dev,</div><div class='add'>+static ssize_t disk_removable_show(struct device *dev,</div><div class='ctx'> 				   struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct gendisk *disk = dev_to_disk(dev);</div><div class='ctx'> </div><div class='del'>-	return sprintf(buf, "%d\n", disk-&gt;policy ? 1 : 0);</div><div class='add'>+	return sprintf(buf, "%d\n",</div><div class='add'>+		       (disk-&gt;flags &amp; GENHD_FL_REMOVABLE ? 1 : 0));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t disk_size_show(struct device *dev,</div><div class='del'>-			      struct device_attribute *attr, char *buf)</div><div class='add'>+static ssize_t disk_ro_show(struct device *dev,</div><div class='add'>+				   struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct gendisk *disk = dev_to_disk(dev);</div><div class='ctx'> </div><div class='del'>-	return sprintf(buf, "%llu\n", (unsigned long long)get_capacity(disk));</div><div class='add'>+	return sprintf(buf, "%d\n", get_disk_ro(disk) ? 1 : 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t disk_capability_show(struct device *dev,</div><div class='hunk'>@@ -464,73 +805,26 @@ static ssize_t disk_capability_show(struct device *dev,</div><div class='ctx'> 	return sprintf(buf, "%x\n", disk-&gt;flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t disk_stat_show(struct device *dev,</div><div class='del'>-			      struct device_attribute *attr, char *buf)</div><div class='del'>-{</div><div class='del'>-	struct gendisk *disk = dev_to_disk(dev);</div><div class='del'>-</div><div class='del'>-	preempt_disable();</div><div class='del'>-	disk_round_stats(disk);</div><div class='del'>-	preempt_enable();</div><div class='del'>-	return sprintf(buf,</div><div class='del'>-		"%8lu %8lu %8llu %8u "</div><div class='del'>-		"%8lu %8lu %8llu %8u "</div><div class='del'>-		"%8u %8u %8u"</div><div class='del'>-		"\n",</div><div class='del'>-		disk_stat_read(disk, ios[READ]),</div><div class='del'>-		disk_stat_read(disk, merges[READ]),</div><div class='del'>-		(unsigned long long)disk_stat_read(disk, sectors[READ]),</div><div class='del'>-		jiffies_to_msecs(disk_stat_read(disk, ticks[READ])),</div><div class='del'>-		disk_stat_read(disk, ios[WRITE]),</div><div class='del'>-		disk_stat_read(disk, merges[WRITE]),</div><div class='del'>-		(unsigned long long)disk_stat_read(disk, sectors[WRITE]),</div><div class='del'>-		jiffies_to_msecs(disk_stat_read(disk, ticks[WRITE])),</div><div class='del'>-		disk-&gt;in_flight,</div><div class='del'>-		jiffies_to_msecs(disk_stat_read(disk, io_ticks)),</div><div class='del'>-		jiffies_to_msecs(disk_stat_read(disk, time_in_queue)));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_FAIL_MAKE_REQUEST</div><div class='del'>-static ssize_t disk_fail_show(struct device *dev,</div><div class='del'>-			      struct device_attribute *attr, char *buf)</div><div class='del'>-{</div><div class='del'>-	struct gendisk *disk = dev_to_disk(dev);</div><div class='del'>-</div><div class='del'>-	return sprintf(buf, "%d\n", disk-&gt;flags &amp; GENHD_FL_FAIL ? 1 : 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t disk_fail_store(struct device *dev,</div><div class='del'>-			       struct device_attribute *attr,</div><div class='del'>-			       const char *buf, size_t count)</div><div class='del'>-{</div><div class='del'>-	struct gendisk *disk = dev_to_disk(dev);</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (count &gt; 0 &amp;&amp; sscanf(buf, "%d", &amp;i) &gt; 0) {</div><div class='del'>-		if (i == 0)</div><div class='del'>-			disk-&gt;flags &amp;= ~GENHD_FL_FAIL;</div><div class='del'>-		else</div><div class='del'>-			disk-&gt;flags |= GENHD_FL_FAIL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> static DEVICE_ATTR(range, S_IRUGO, disk_range_show, NULL);</div><div class='add'>+static DEVICE_ATTR(ext_range, S_IRUGO, disk_ext_range_show, NULL);</div><div class='ctx'> static DEVICE_ATTR(removable, S_IRUGO, disk_removable_show, NULL);</div><div class='ctx'> static DEVICE_ATTR(ro, S_IRUGO, disk_ro_show, NULL);</div><div class='del'>-static DEVICE_ATTR(size, S_IRUGO, disk_size_show, NULL);</div><div class='add'>+static DEVICE_ATTR(size, S_IRUGO, part_size_show, NULL);</div><div class='ctx'> static DEVICE_ATTR(capability, S_IRUGO, disk_capability_show, NULL);</div><div class='del'>-static DEVICE_ATTR(stat, S_IRUGO, disk_stat_show, NULL);</div><div class='add'>+static DEVICE_ATTR(stat, S_IRUGO, part_stat_show, NULL);</div><div class='ctx'> #ifdef CONFIG_FAIL_MAKE_REQUEST</div><div class='ctx'> static struct device_attribute dev_attr_fail =</div><div class='del'>-	__ATTR(make-it-fail, S_IRUGO|S_IWUSR, disk_fail_show, disk_fail_store);</div><div class='add'>+	__ATTR(make-it-fail, S_IRUGO|S_IWUSR, part_fail_show, part_fail_store);</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_FAIL_IO_TIMEOUT</div><div class='add'>+static struct device_attribute dev_attr_fail_timeout =</div><div class='add'>+	__ATTR(io-timeout-fail,  S_IRUGO|S_IWUSR, part_timeout_show,</div><div class='add'>+		part_timeout_store);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static struct attribute *disk_attrs[] = {</div><div class='ctx'> 	&amp;dev_attr_range.attr,</div><div class='add'>+	&amp;dev_attr_ext_range.attr,</div><div class='ctx'> 	&amp;dev_attr_removable.attr,</div><div class='ctx'> 	&amp;dev_attr_ro.attr,</div><div class='ctx'> 	&amp;dev_attr_size.attr,</div><div class='hunk'>@@ -539,6 +833,9 @@ static struct attribute *disk_attrs[] = {</div><div class='ctx'> #ifdef CONFIG_FAIL_MAKE_REQUEST</div><div class='ctx'> 	&amp;dev_attr_fail.attr,</div><div class='ctx'> #endif</div><div class='add'>+#ifdef CONFIG_FAIL_IO_TIMEOUT</div><div class='add'>+	&amp;dev_attr_fail_timeout.attr,</div><div class='add'>+#endif</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -551,13 +848,87 @@ static struct attribute_group *disk_attr_groups[] = {</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static void disk_free_ptbl_rcu_cb(struct rcu_head *head)</div><div class='add'>+{</div><div class='add'>+	struct disk_part_tbl *ptbl =</div><div class='add'>+		container_of(head, struct disk_part_tbl, rcu_head);</div><div class='add'>+</div><div class='add'>+	kfree(ptbl);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * disk_replace_part_tbl - replace disk-&gt;part_tbl in RCU-safe way</div><div class='add'>+ * @disk: disk to replace part_tbl for</div><div class='add'>+ * @new_ptbl: new part_tbl to install</div><div class='add'>+ *</div><div class='add'>+ * Replace disk-&gt;part_tbl with @new_ptbl in RCU-safe way.  The</div><div class='add'>+ * original ptbl is freed using RCU callback.</div><div class='add'>+ *</div><div class='add'>+ * LOCKING:</div><div class='add'>+ * Matching bd_mutx locked.</div><div class='add'>+ */</div><div class='add'>+static void disk_replace_part_tbl(struct gendisk *disk,</div><div class='add'>+				  struct disk_part_tbl *new_ptbl)</div><div class='add'>+{</div><div class='add'>+	struct disk_part_tbl *old_ptbl = disk-&gt;part_tbl;</div><div class='add'>+</div><div class='add'>+	rcu_assign_pointer(disk-&gt;part_tbl, new_ptbl);</div><div class='add'>+	if (old_ptbl)</div><div class='add'>+		call_rcu(&amp;old_ptbl-&gt;rcu_head, disk_free_ptbl_rcu_cb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * disk_expand_part_tbl - expand disk-&gt;part_tbl</div><div class='add'>+ * @disk: disk to expand part_tbl for</div><div class='add'>+ * @partno: expand such that this partno can fit in</div><div class='add'>+ *</div><div class='add'>+ * Expand disk-&gt;part_tbl such that @partno can fit in.  disk-&gt;part_tbl</div><div class='add'>+ * uses RCU to allow unlocked dereferencing for stats and other stuff.</div><div class='add'>+ *</div><div class='add'>+ * LOCKING:</div><div class='add'>+ * Matching bd_mutex locked, might sleep.</div><div class='add'>+ *</div><div class='add'>+ * RETURNS:</div><div class='add'>+ * 0 on success, -errno on failure.</div><div class='add'>+ */</div><div class='add'>+int disk_expand_part_tbl(struct gendisk *disk, int partno)</div><div class='add'>+{</div><div class='add'>+	struct disk_part_tbl *old_ptbl = disk-&gt;part_tbl;</div><div class='add'>+	struct disk_part_tbl *new_ptbl;</div><div class='add'>+	int len = old_ptbl ? old_ptbl-&gt;len : 0;</div><div class='add'>+	int target = partno + 1;</div><div class='add'>+	size_t size;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* disk_max_parts() is zero during initialization, ignore if so */</div><div class='add'>+	if (disk_max_parts(disk) &amp;&amp; target &gt; disk_max_parts(disk))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (target &lt;= len)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	size = sizeof(*new_ptbl) + target * sizeof(new_ptbl-&gt;part[0]);</div><div class='add'>+	new_ptbl = kzalloc_node(size, GFP_KERNEL, disk-&gt;node_id);</div><div class='add'>+	if (!new_ptbl)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	INIT_RCU_HEAD(&amp;new_ptbl-&gt;rcu_head);</div><div class='add'>+	new_ptbl-&gt;len = target;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; len; i++)</div><div class='add'>+		rcu_assign_pointer(new_ptbl-&gt;part[i], old_ptbl-&gt;part[i]);</div><div class='add'>+</div><div class='add'>+	disk_replace_part_tbl(disk, new_ptbl);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void disk_release(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct gendisk *disk = dev_to_disk(dev);</div><div class='ctx'> </div><div class='ctx'> 	kfree(disk-&gt;random);</div><div class='del'>-	kfree(disk-&gt;part);</div><div class='del'>-	free_disk_stats(disk);</div><div class='add'>+	disk_replace_part_tbl(disk, NULL);</div><div class='add'>+	free_part_stats(&amp;disk-&gt;part0);</div><div class='ctx'> 	kfree(disk);</div><div class='ctx'> }</div><div class='ctx'> struct class block_class = {</div><div class='hunk'>@@ -578,83 +949,31 @@ static struct device_type disk_type = {</div><div class='ctx'>  * The output looks suspiciously like /proc/partitions with a bunch of</div><div class='ctx'>  * extra fields.</div><div class='ctx'>  */</div><div class='del'>-</div><div class='del'>-static void *diskstats_start(struct seq_file *part, loff_t *pos)</div><div class='del'>-{</div><div class='del'>-	struct device *dev;</div><div class='del'>-	loff_t k = *pos;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;block_class_lock);</div><div class='del'>-	dev = class_find_device(&amp;block_class, NULL, &amp;k, find_start);</div><div class='del'>-	if (dev) {</div><div class='del'>-		put_device(dev);</div><div class='del'>-		return dev_to_disk(dev);</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void *diskstats_next(struct seq_file *part, void *v, loff_t *pos)</div><div class='del'>-{</div><div class='del'>-	struct gendisk *gp = v;</div><div class='del'>-	struct device *dev;</div><div class='del'>-</div><div class='del'>-	++*pos;</div><div class='del'>-	dev = class_find_device(&amp;block_class, &amp;gp-&gt;dev, NULL, find_next);</div><div class='del'>-	if (dev) {</div><div class='del'>-		put_device(dev);</div><div class='del'>-		return dev_to_disk(dev);</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void diskstats_stop(struct seq_file *part, void *v)</div><div class='del'>-{</div><div class='del'>-	mutex_unlock(&amp;block_class_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int diskstats_show(struct seq_file *s, void *v)</div><div class='add'>+static int diskstats_show(struct seq_file *seqf, void *v)</div><div class='ctx'> {</div><div class='ctx'> 	struct gendisk *gp = v;</div><div class='add'>+	struct disk_part_iter piter;</div><div class='add'>+	struct hd_struct *hd;</div><div class='ctx'> 	char buf[BDEVNAME_SIZE];</div><div class='del'>-	int n = 0;</div><div class='add'>+	int cpu;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	if (&amp;gp-&gt;dev.kobj.entry == block_class.devices.next)</div><div class='del'>-		seq_puts(s,	"major minor name"</div><div class='add'>+	if (&amp;disk_to_dev(gp)-&gt;kobj.entry == block_class.devices.next)</div><div class='add'>+		seq_puts(seqf,	"major minor name"</div><div class='ctx'> 				"     rio rmerge rsect ruse wio wmerge "</div><div class='ctx'> 				"wsect wuse running use aveq"</div><div class='ctx'> 				"\n\n");</div><div class='ctx'> 	*/</div><div class='ctx'>  </div><div class='del'>-	preempt_disable();</div><div class='del'>-	disk_round_stats(gp);</div><div class='del'>-	preempt_enable();</div><div class='del'>-	seq_printf(s, "%4d %4d %s %lu %lu %llu %u %lu %lu %llu %u %u %u %u\n",</div><div class='del'>-		gp-&gt;major, n + gp-&gt;first_minor, disk_name(gp, n, buf),</div><div class='del'>-		disk_stat_read(gp, ios[0]), disk_stat_read(gp, merges[0]),</div><div class='del'>-		(unsigned long long)disk_stat_read(gp, sectors[0]),</div><div class='del'>-		jiffies_to_msecs(disk_stat_read(gp, ticks[0])),</div><div class='del'>-		disk_stat_read(gp, ios[1]), disk_stat_read(gp, merges[1]),</div><div class='del'>-		(unsigned long long)disk_stat_read(gp, sectors[1]),</div><div class='del'>-		jiffies_to_msecs(disk_stat_read(gp, ticks[1])),</div><div class='del'>-		gp-&gt;in_flight,</div><div class='del'>-		jiffies_to_msecs(disk_stat_read(gp, io_ticks)),</div><div class='del'>-		jiffies_to_msecs(disk_stat_read(gp, time_in_queue)));</div><div class='del'>-</div><div class='del'>-	/* now show all non-0 size partitions of it */</div><div class='del'>-	for (n = 0; n &lt; gp-&gt;minors - 1; n++) {</div><div class='del'>-		struct hd_struct *hd = gp-&gt;part[n];</div><div class='del'>-</div><div class='del'>-		if (!hd || !hd-&gt;nr_sects)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		preempt_disable();</div><div class='del'>-		part_round_stats(hd);</div><div class='del'>-		preempt_enable();</div><div class='del'>-		seq_printf(s, "%4d %4d %s %lu %lu %llu "</div><div class='add'>+	disk_part_iter_init(&amp;piter, gp, DISK_PITER_INCL_PART0);</div><div class='add'>+	while ((hd = disk_part_iter_next(&amp;piter))) {</div><div class='add'>+		cpu = part_stat_lock();</div><div class='add'>+		part_round_stats(cpu, hd);</div><div class='add'>+		part_stat_unlock();</div><div class='add'>+		seq_printf(seqf, "%4d %7d %s %lu %lu %llu "</div><div class='ctx'> 			   "%u %lu %lu %llu %u %u %u %u\n",</div><div class='del'>-			   gp-&gt;major, n + gp-&gt;first_minor + 1,</div><div class='del'>-			   disk_name(gp, n + 1, buf),</div><div class='add'>+			   MAJOR(part_devt(hd)), MINOR(part_devt(hd)),</div><div class='add'>+			   disk_name(gp, hd-&gt;partno, buf),</div><div class='ctx'> 			   part_stat_read(hd, ios[0]),</div><div class='ctx'> 			   part_stat_read(hd, merges[0]),</div><div class='ctx'> 			   (unsigned long long)part_stat_read(hd, sectors[0]),</div><div class='hunk'>@@ -668,14 +987,15 @@ static int diskstats_show(struct seq_file *s, void *v)</div><div class='ctx'> 			   jiffies_to_msecs(part_stat_read(hd, time_in_queue))</div><div class='ctx'> 			);</div><div class='ctx'> 	}</div><div class='add'>+	disk_part_iter_exit(&amp;piter);</div><div class='ctx'>  </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> const struct seq_operations diskstats_op = {</div><div class='del'>-	.start	= diskstats_start,</div><div class='del'>-	.next	= diskstats_next,</div><div class='del'>-	.stop	= diskstats_stop,</div><div class='add'>+	.start	= disk_seqf_start,</div><div class='add'>+	.next	= disk_seqf_next,</div><div class='add'>+	.stop	= disk_seqf_stop,</div><div class='ctx'> 	.show	= diskstats_show</div><div class='ctx'> };</div><div class='ctx'> #endif /* CONFIG_PROC_FS */</div><div class='hunk'>@@ -690,7 +1010,7 @@ static void media_change_notify_thread(struct work_struct *work)</div><div class='ctx'> 	 * set enviroment vars to indicate which event this is for</div><div class='ctx'> 	 * so that user space will know to go check the media status.</div><div class='ctx'> 	 */</div><div class='del'>-	kobject_uevent_env(&amp;gd-&gt;dev.kobj, KOBJ_CHANGE, envp);</div><div class='add'>+	kobject_uevent_env(&amp;disk_to_dev(gd)-&gt;kobj, KOBJ_CHANGE, envp);</div><div class='ctx'> 	put_device(gd-&gt;driverfs_dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -703,42 +1023,29 @@ void genhd_media_change_notify(struct gendisk *disk)</div><div class='ctx'> EXPORT_SYMBOL_GPL(genhd_media_change_notify);</div><div class='ctx'> #endif  /*  0  */</div><div class='ctx'> </div><div class='del'>-struct find_block {</div><div class='del'>-	const char *name;</div><div class='del'>-	int part;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int match_id(struct device *dev, void *data)</div><div class='add'>+dev_t blk_lookup_devt(const char *name, int partno)</div><div class='ctx'> {</div><div class='del'>-	struct find_block *find = data;</div><div class='add'>+	dev_t devt = MKDEV(0, 0);</div><div class='add'>+	struct class_dev_iter iter;</div><div class='add'>+	struct device *dev;</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;type != &amp;disk_type)</div><div class='del'>-		return 0;</div><div class='del'>-	if (strcmp(dev-&gt;bus_id, find-&gt;name) == 0) {</div><div class='add'>+	class_dev_iter_init(&amp;iter, &amp;block_class, NULL, &amp;disk_type);</div><div class='add'>+	while ((dev = class_dev_iter_next(&amp;iter))) {</div><div class='ctx'> 		struct gendisk *disk = dev_to_disk(dev);</div><div class='del'>-		if (find-&gt;part &lt; disk-&gt;minors)</div><div class='del'>-			return 1;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='add'>+		struct hd_struct *part;</div><div class='ctx'> </div><div class='del'>-dev_t blk_lookup_devt(const char *name, int part)</div><div class='del'>-{</div><div class='del'>-	struct device *dev;</div><div class='del'>-	dev_t devt = MKDEV(0, 0);</div><div class='del'>-	struct find_block find;</div><div class='add'>+		if (strcmp(dev-&gt;bus_id, name))</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;block_class_lock);</div><div class='del'>-	find.name = name;</div><div class='del'>-	find.part = part;</div><div class='del'>-	dev = class_find_device(&amp;block_class, NULL, &amp;find, match_id);</div><div class='del'>-	if (dev) {</div><div class='del'>-		put_device(dev);</div><div class='del'>-		devt = MKDEV(MAJOR(dev-&gt;devt),</div><div class='del'>-			     MINOR(dev-&gt;devt) + part);</div><div class='add'>+		part = disk_get_part(disk, partno);</div><div class='add'>+		if (part) {</div><div class='add'>+			devt = part_devt(part);</div><div class='add'>+			disk_put_part(part);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		disk_put_part(part);</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;block_class_lock);</div><div class='del'>-</div><div class='add'>+	class_dev_iter_exit(&amp;iter);</div><div class='ctx'> 	return devt;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(blk_lookup_devt);</div><div class='hunk'>@@ -747,6 +1054,7 @@ struct gendisk *alloc_disk(int minors)</div><div class='ctx'> {</div><div class='ctx'> 	return alloc_disk_node(minors, -1);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(alloc_disk);</div><div class='ctx'> </div><div class='ctx'> struct gendisk *alloc_disk_node(int minors, int node_id)</div><div class='ctx'> {</div><div class='hunk'>@@ -755,32 +1063,28 @@ struct gendisk *alloc_disk_node(int minors, int node_id)</div><div class='ctx'> 	disk = kmalloc_node(sizeof(struct gendisk),</div><div class='ctx'> 				GFP_KERNEL | __GFP_ZERO, node_id);</div><div class='ctx'> 	if (disk) {</div><div class='del'>-		if (!init_disk_stats(disk)) {</div><div class='add'>+		if (!init_part_stats(&amp;disk-&gt;part0)) {</div><div class='ctx'> 			kfree(disk);</div><div class='ctx'> 			return NULL;</div><div class='ctx'> 		}</div><div class='del'>-		if (minors &gt; 1) {</div><div class='del'>-			int size = (minors - 1) * sizeof(struct hd_struct *);</div><div class='del'>-			disk-&gt;part = kmalloc_node(size,</div><div class='del'>-				GFP_KERNEL | __GFP_ZERO, node_id);</div><div class='del'>-			if (!disk-&gt;part) {</div><div class='del'>-				free_disk_stats(disk);</div><div class='del'>-				kfree(disk);</div><div class='del'>-				return NULL;</div><div class='del'>-			}</div><div class='add'>+		if (disk_expand_part_tbl(disk, 0)) {</div><div class='add'>+			free_part_stats(&amp;disk-&gt;part0);</div><div class='add'>+			kfree(disk);</div><div class='add'>+			return NULL;</div><div class='ctx'> 		}</div><div class='add'>+		disk-&gt;part_tbl-&gt;part[0] = &amp;disk-&gt;part0;</div><div class='add'>+</div><div class='ctx'> 		disk-&gt;minors = minors;</div><div class='ctx'> 		rand_initialize_disk(disk);</div><div class='del'>-		disk-&gt;dev.class = &amp;block_class;</div><div class='del'>-		disk-&gt;dev.type = &amp;disk_type;</div><div class='del'>-		device_initialize(&amp;disk-&gt;dev);</div><div class='add'>+		disk_to_dev(disk)-&gt;class = &amp;block_class;</div><div class='add'>+		disk_to_dev(disk)-&gt;type = &amp;disk_type;</div><div class='add'>+		device_initialize(disk_to_dev(disk));</div><div class='ctx'> 		INIT_WORK(&amp;disk-&gt;async_notify,</div><div class='ctx'> 			media_change_notify_thread);</div><div class='add'>+		disk-&gt;node_id = node_id;</div><div class='ctx'> 	}</div><div class='ctx'> 	return disk;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(alloc_disk);</div><div class='ctx'> EXPORT_SYMBOL(alloc_disk_node);</div><div class='ctx'> </div><div class='ctx'> struct kobject *get_disk(struct gendisk *disk)</div><div class='hunk'>@@ -793,7 +1097,7 @@ struct kobject *get_disk(struct gendisk *disk)</div><div class='ctx'> 	owner = disk-&gt;fops-&gt;owner;</div><div class='ctx'> 	if (owner &amp;&amp; !try_module_get(owner))</div><div class='ctx'> 		return NULL;</div><div class='del'>-	kobj = kobject_get(&amp;disk-&gt;dev.kobj);</div><div class='add'>+	kobj = kobject_get(&amp;disk_to_dev(disk)-&gt;kobj);</div><div class='ctx'> 	if (kobj == NULL) {</div><div class='ctx'> 		module_put(owner);</div><div class='ctx'> 		return NULL;</div><div class='hunk'>@@ -807,27 +1111,28 @@ EXPORT_SYMBOL(get_disk);</div><div class='ctx'> void put_disk(struct gendisk *disk)</div><div class='ctx'> {</div><div class='ctx'> 	if (disk)</div><div class='del'>-		kobject_put(&amp;disk-&gt;dev.kobj);</div><div class='add'>+		kobject_put(&amp;disk_to_dev(disk)-&gt;kobj);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(put_disk);</div><div class='ctx'> </div><div class='ctx'> void set_device_ro(struct block_device *bdev, int flag)</div><div class='ctx'> {</div><div class='del'>-	if (bdev-&gt;bd_contains != bdev)</div><div class='del'>-		bdev-&gt;bd_part-&gt;policy = flag;</div><div class='del'>-	else</div><div class='del'>-		bdev-&gt;bd_disk-&gt;policy = flag;</div><div class='add'>+	bdev-&gt;bd_part-&gt;policy = flag;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(set_device_ro);</div><div class='ctx'> </div><div class='ctx'> void set_disk_ro(struct gendisk *disk, int flag)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='del'>-	disk-&gt;policy = flag;</div><div class='del'>-	for (i = 0; i &lt; disk-&gt;minors - 1; i++)</div><div class='del'>-		if (disk-&gt;part[i]) disk-&gt;part[i]-&gt;policy = flag;</div><div class='add'>+	struct disk_part_iter piter;</div><div class='add'>+	struct hd_struct *part;</div><div class='add'>+</div><div class='add'>+	disk_part_iter_init(&amp;piter, disk,</div><div class='add'>+			    DISK_PITER_INCL_EMPTY | DISK_PITER_INCL_PART0);</div><div class='add'>+	while ((part = disk_part_iter_next(&amp;piter)))</div><div class='add'>+		part-&gt;policy = flag;</div><div class='add'>+	disk_part_iter_exit(&amp;piter);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(set_disk_ro);</div><div class='hunk'>@@ -836,18 +1141,15 @@ int bdev_read_only(struct block_device *bdev)</div><div class='ctx'> {</div><div class='ctx'> 	if (!bdev)</div><div class='ctx'> 		return 0;</div><div class='del'>-	else if (bdev-&gt;bd_contains != bdev)</div><div class='del'>-		return bdev-&gt;bd_part-&gt;policy;</div><div class='del'>-	else</div><div class='del'>-		return bdev-&gt;bd_disk-&gt;policy;</div><div class='add'>+	return bdev-&gt;bd_part-&gt;policy;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(bdev_read_only);</div><div class='ctx'> </div><div class='del'>-int invalidate_partition(struct gendisk *disk, int index)</div><div class='add'>+int invalidate_partition(struct gendisk *disk, int partno)</div><div class='ctx'> {</div><div class='ctx'> 	int res = 0;</div><div class='del'>-	struct block_device *bdev = bdget_disk(disk, index);</div><div class='add'>+	struct block_device *bdev = bdget_disk(disk, partno);</div><div class='ctx'> 	if (bdev) {</div><div class='ctx'> 		fsync_bdev(bdev);</div><div class='ctx'> 		res = __invalidate_device(bdev);</div><div class='head'>diff --git a/block/ioctl.c b/block/ioctl.c<br/>index 77185e5c026a..38bee321e1fa 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/block/ioctl.c?id=c15895ef30c2c03e99802951787183039a349d32'>block/ioctl.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/block/ioctl.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>block/ioctl.c</a></div><div class='hunk'>@@ -12,11 +12,12 @@ static int blkpg_ioctl(struct block_device *bdev, struct blkpg_ioctl_arg __user</div><div class='ctx'> {</div><div class='ctx'> 	struct block_device *bdevp;</div><div class='ctx'> 	struct gendisk *disk;</div><div class='add'>+	struct hd_struct *part;</div><div class='ctx'> 	struct blkpg_ioctl_arg a;</div><div class='ctx'> 	struct blkpg_partition p;</div><div class='add'>+	struct disk_part_iter piter;</div><div class='ctx'> 	long long start, length;</div><div class='del'>-	int part;</div><div class='del'>-	int i;</div><div class='add'>+	int partno;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (!capable(CAP_SYS_ADMIN))</div><div class='hunk'>@@ -28,8 +29,8 @@ static int blkpg_ioctl(struct block_device *bdev, struct blkpg_ioctl_arg __user</div><div class='ctx'> 	disk = bdev-&gt;bd_disk;</div><div class='ctx'> 	if (bdev != bdev-&gt;bd_contains)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	part = p.pno;</div><div class='del'>-	if (part &lt;= 0 || part &gt;= disk-&gt;minors)</div><div class='add'>+	partno = p.pno;</div><div class='add'>+	if (partno &lt;= 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	switch (a.op) {</div><div class='ctx'> 		case BLKPG_ADD_PARTITION:</div><div class='hunk'>@@ -43,36 +44,37 @@ static int blkpg_ioctl(struct block_device *bdev, struct blkpg_ioctl_arg __user</div><div class='ctx'> 				    || pstart &lt; 0 || plength &lt; 0)</div><div class='ctx'> 					return -EINVAL;</div><div class='ctx'> 			}</div><div class='del'>-			/* partition number in use? */</div><div class='add'>+</div><div class='ctx'> 			mutex_lock(&amp;bdev-&gt;bd_mutex);</div><div class='del'>-			if (disk-&gt;part[part - 1]) {</div><div class='del'>-				mutex_unlock(&amp;bdev-&gt;bd_mutex);</div><div class='del'>-				return -EBUSY;</div><div class='del'>-			}</div><div class='del'>-			/* overlap? */</div><div class='del'>-			for (i = 0; i &lt; disk-&gt;minors - 1; i++) {</div><div class='del'>-				struct hd_struct *s = disk-&gt;part[i];</div><div class='ctx'> </div><div class='del'>-				if (!s)</div><div class='del'>-					continue;</div><div class='del'>-				if (!(start+length &lt;= s-&gt;start_sect ||</div><div class='del'>-				      start &gt;= s-&gt;start_sect + s-&gt;nr_sects)) {</div><div class='add'>+			/* overlap? */</div><div class='add'>+			disk_part_iter_init(&amp;piter, disk,</div><div class='add'>+					    DISK_PITER_INCL_EMPTY);</div><div class='add'>+			while ((part = disk_part_iter_next(&amp;piter))) {</div><div class='add'>+				if (!(start + length &lt;= part-&gt;start_sect ||</div><div class='add'>+				      start &gt;= part-&gt;start_sect + part-&gt;nr_sects)) {</div><div class='add'>+					disk_part_iter_exit(&amp;piter);</div><div class='ctx'> 					mutex_unlock(&amp;bdev-&gt;bd_mutex);</div><div class='ctx'> 					return -EBUSY;</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='add'>+			disk_part_iter_exit(&amp;piter);</div><div class='add'>+</div><div class='ctx'> 			/* all seems OK */</div><div class='del'>-			err = add_partition(disk, part, start, length, ADDPART_FLAG_NONE);</div><div class='add'>+			err = add_partition(disk, partno, start, length,</div><div class='add'>+					    ADDPART_FLAG_NONE);</div><div class='ctx'> 			mutex_unlock(&amp;bdev-&gt;bd_mutex);</div><div class='ctx'> 			return err;</div><div class='ctx'> 		case BLKPG_DEL_PARTITION:</div><div class='del'>-			if (!disk-&gt;part[part-1])</div><div class='del'>-				return -ENXIO;</div><div class='del'>-			if (disk-&gt;part[part - 1]-&gt;nr_sects == 0)</div><div class='add'>+			part = disk_get_part(disk, partno);</div><div class='add'>+			if (!part)</div><div class='ctx'> 				return -ENXIO;</div><div class='del'>-			bdevp = bdget_disk(disk, part);</div><div class='add'>+</div><div class='add'>+			bdevp = bdget(part_devt(part));</div><div class='add'>+			disk_put_part(part);</div><div class='ctx'> 			if (!bdevp)</div><div class='ctx'> 				return -ENOMEM;</div><div class='add'>+</div><div class='ctx'> 			mutex_lock(&amp;bdevp-&gt;bd_mutex);</div><div class='ctx'> 			if (bdevp-&gt;bd_openers) {</div><div class='ctx'> 				mutex_unlock(&amp;bdevp-&gt;bd_mutex);</div><div class='hunk'>@@ -84,7 +86,7 @@ static int blkpg_ioctl(struct block_device *bdev, struct blkpg_ioctl_arg __user</div><div class='ctx'> 			invalidate_bdev(bdevp);</div><div class='ctx'> </div><div class='ctx'> 			mutex_lock_nested(&amp;bdev-&gt;bd_mutex, 1);</div><div class='del'>-			delete_partition(disk, part);</div><div class='add'>+			delete_partition(disk, partno);</div><div class='ctx'> 			mutex_unlock(&amp;bdev-&gt;bd_mutex);</div><div class='ctx'> 			mutex_unlock(&amp;bdevp-&gt;bd_mutex);</div><div class='ctx'> 			bdput(bdevp);</div><div class='hunk'>@@ -100,7 +102,7 @@ static int blkdev_reread_part(struct block_device *bdev)</div><div class='ctx'> 	struct gendisk *disk = bdev-&gt;bd_disk;</div><div class='ctx'> 	int res;</div><div class='ctx'> </div><div class='del'>-	if (disk-&gt;minors == 1 || bdev != bdev-&gt;bd_contains)</div><div class='add'>+	if (!disk_partitionable(disk) || bdev != bdev-&gt;bd_contains)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	if (!capable(CAP_SYS_ADMIN))</div><div class='ctx'> 		return -EACCES;</div><div class='hunk'>@@ -111,6 +113,69 @@ static int blkdev_reread_part(struct block_device *bdev)</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void blk_ioc_discard_endio(struct bio *bio, int err)</div><div class='add'>+{</div><div class='add'>+	if (err) {</div><div class='add'>+		if (err == -EOPNOTSUPP)</div><div class='add'>+			set_bit(BIO_EOPNOTSUPP, &amp;bio-&gt;bi_flags);</div><div class='add'>+		clear_bit(BIO_UPTODATE, &amp;bio-&gt;bi_flags);</div><div class='add'>+	}</div><div class='add'>+	complete(bio-&gt;bi_private);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int blk_ioctl_discard(struct block_device *bdev, uint64_t start,</div><div class='add'>+			     uint64_t len)</div><div class='add'>+{</div><div class='add'>+	struct request_queue *q = bdev_get_queue(bdev);</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (start &amp; 511)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (len &amp; 511)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	start &gt;&gt;= 9;</div><div class='add'>+	len &gt;&gt;= 9;</div><div class='add'>+</div><div class='add'>+	if (start + len &gt; (bdev-&gt;bd_inode-&gt;i_size &gt;&gt; 9))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!q-&gt;prepare_discard_fn)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	while (len &amp;&amp; !ret) {</div><div class='add'>+		DECLARE_COMPLETION_ONSTACK(wait);</div><div class='add'>+		struct bio *bio;</div><div class='add'>+</div><div class='add'>+		bio = bio_alloc(GFP_KERNEL, 0);</div><div class='add'>+		if (!bio)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		bio-&gt;bi_end_io = blk_ioc_discard_endio;</div><div class='add'>+		bio-&gt;bi_bdev = bdev;</div><div class='add'>+		bio-&gt;bi_private = &amp;wait;</div><div class='add'>+		bio-&gt;bi_sector = start;</div><div class='add'>+</div><div class='add'>+		if (len &gt; q-&gt;max_hw_sectors) {</div><div class='add'>+			bio-&gt;bi_size = q-&gt;max_hw_sectors &lt;&lt; 9;</div><div class='add'>+			len -= q-&gt;max_hw_sectors;</div><div class='add'>+			start += q-&gt;max_hw_sectors;</div><div class='add'>+		} else {</div><div class='add'>+			bio-&gt;bi_size = len &lt;&lt; 9;</div><div class='add'>+			len = 0;</div><div class='add'>+		}</div><div class='add'>+		submit_bio(DISCARD_NOBARRIER, bio);</div><div class='add'>+</div><div class='add'>+		wait_for_completion(&amp;wait);</div><div class='add'>+</div><div class='add'>+		if (bio_flagged(bio, BIO_EOPNOTSUPP))</div><div class='add'>+			ret = -EOPNOTSUPP;</div><div class='add'>+		else if (!bio_flagged(bio, BIO_UPTODATE))</div><div class='add'>+			ret = -EIO;</div><div class='add'>+		bio_put(bio);</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int put_ushort(unsigned long arg, unsigned short val)</div><div class='ctx'> {</div><div class='ctx'> 	return put_user(val, (unsigned short __user *)arg);</div><div class='hunk'>@@ -258,6 +323,19 @@ int blkdev_ioctl(struct inode *inode, struct file *file, unsigned cmd,</div><div class='ctx'> 		set_device_ro(bdev, n);</div><div class='ctx'> 		unlock_kernel();</div><div class='ctx'> 		return 0;</div><div class='add'>+</div><div class='add'>+	case BLKDISCARD: {</div><div class='add'>+		uint64_t range[2];</div><div class='add'>+</div><div class='add'>+		if (!(file-&gt;f_mode &amp; FMODE_WRITE))</div><div class='add'>+			return -EBADF;</div><div class='add'>+</div><div class='add'>+		if (copy_from_user(range, (void __user *)arg, sizeof(range)))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+</div><div class='add'>+		return blk_ioctl_discard(bdev, range[0], range[1]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	case HDIO_GETGEO: {</div><div class='ctx'> 		struct hd_geometry geo;</div><div class='ctx'> </div><div class='head'>diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c<br/>index ec4b7f234626..c34272a348fe 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/block/scsi_ioctl.c?id=c15895ef30c2c03e99802951787183039a349d32'>block/scsi_ioctl.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/block/scsi_ioctl.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>block/scsi_ioctl.c</a></div><div class='hunk'>@@ -185,6 +185,7 @@ void blk_set_cmd_filter_defaults(struct blk_cmd_filter *filter)</div><div class='ctx'> 	__set_bit(GPCMD_PREVENT_ALLOW_MEDIUM_REMOVAL, filter-&gt;write_ok);</div><div class='ctx'> 	__set_bit(GPCMD_LOAD_UNLOAD, filter-&gt;write_ok);</div><div class='ctx'> 	__set_bit(GPCMD_SET_STREAMING, filter-&gt;write_ok);</div><div class='add'>+	__set_bit(GPCMD_SET_READ_AHEAD, filter-&gt;write_ok);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(blk_set_cmd_filter_defaults);</div><div class='ctx'> </div><div class='hunk'>@@ -313,11 +314,12 @@ static int sg_io(struct file *file, struct request_queue *q,</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		ret = blk_rq_map_user_iov(q, rq, iov, hdr-&gt;iovec_count,</div><div class='del'>-					  hdr-&gt;dxfer_len);</div><div class='add'>+		ret = blk_rq_map_user_iov(q, rq, NULL, iov, hdr-&gt;iovec_count,</div><div class='add'>+					  hdr-&gt;dxfer_len, GFP_KERNEL);</div><div class='ctx'> 		kfree(iov);</div><div class='ctx'> 	} else if (hdr-&gt;dxfer_len)</div><div class='del'>-		ret = blk_rq_map_user(q, rq, hdr-&gt;dxferp, hdr-&gt;dxfer_len);</div><div class='add'>+		ret = blk_rq_map_user(q, rq, NULL, hdr-&gt;dxferp, hdr-&gt;dxfer_len,</div><div class='add'>+				      GFP_KERNEL);</div><div class='ctx'> </div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='head'>diff --git a/crypto/Kconfig b/crypto/Kconfig<br/>index d83185915eee..39dbd8e4dde1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/crypto/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>crypto/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/crypto/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>crypto/Kconfig</a></div><div class='hunk'>@@ -21,6 +21,14 @@ if CRYPTO</div><div class='ctx'> </div><div class='ctx'> comment "Crypto core or helper"</div><div class='ctx'> </div><div class='add'>+config CRYPTO_FIPS</div><div class='add'>+	bool "FIPS 200 compliance"</div><div class='add'>+	help</div><div class='add'>+	  This options enables the fips boot option which is</div><div class='add'>+	  required if you want to system to operate in a FIPS 200</div><div class='add'>+	  certification.  You should say no unless you know what</div><div class='add'>+	  this is.</div><div class='add'>+</div><div class='ctx'> config CRYPTO_ALGAPI</div><div class='ctx'> 	tristate</div><div class='ctx'> 	help</div><div class='hunk'>@@ -33,14 +41,21 @@ config CRYPTO_AEAD</div><div class='ctx'> config CRYPTO_BLKCIPHER</div><div class='ctx'> 	tristate</div><div class='ctx'> 	select CRYPTO_ALGAPI</div><div class='add'>+	select CRYPTO_RNG</div><div class='ctx'> </div><div class='ctx'> config CRYPTO_HASH</div><div class='ctx'> 	tristate</div><div class='ctx'> 	select CRYPTO_ALGAPI</div><div class='ctx'> </div><div class='add'>+config CRYPTO_RNG</div><div class='add'>+	tristate</div><div class='add'>+	select CRYPTO_ALGAPI</div><div class='add'>+</div><div class='ctx'> config CRYPTO_MANAGER</div><div class='ctx'> 	tristate "Cryptographic algorithm manager"</div><div class='del'>-	select CRYPTO_ALGAPI</div><div class='add'>+	select CRYPTO_AEAD</div><div class='add'>+	select CRYPTO_HASH</div><div class='add'>+	select CRYPTO_BLKCIPHER</div><div class='ctx'> 	help</div><div class='ctx'> 	  Create default cryptographic template instantiations such as</div><div class='ctx'> 	  cbc(aes).</div><div class='hunk'>@@ -85,9 +100,7 @@ config CRYPTO_AUTHENC</div><div class='ctx'> config CRYPTO_TEST</div><div class='ctx'> 	tristate "Testing module"</div><div class='ctx'> 	depends on m</div><div class='del'>-	select CRYPTO_ALGAPI</div><div class='del'>-	select CRYPTO_AEAD</div><div class='del'>-	select CRYPTO_BLKCIPHER</div><div class='add'>+	select CRYPTO_MANAGER</div><div class='ctx'> 	help</div><div class='ctx'> 	  Quick &amp; dirty crypto test module.</div><div class='ctx'> </div><div class='hunk'>@@ -113,6 +126,7 @@ config CRYPTO_SEQIV</div><div class='ctx'> 	tristate "Sequence Number IV Generator"</div><div class='ctx'> 	select CRYPTO_AEAD</div><div class='ctx'> 	select CRYPTO_BLKCIPHER</div><div class='add'>+	select CRYPTO_RNG</div><div class='ctx'> 	help</div><div class='ctx'> 	  This IV generator generates an IV based on a sequence number by</div><div class='ctx'> 	  xoring it with a salt.  This algorithm is mainly useful for CTR</div><div class='hunk'>@@ -219,7 +233,19 @@ config CRYPTO_CRC32C</div><div class='ctx'> 	  Castagnoli, et al Cyclic Redundancy-Check Algorithm.  Used</div><div class='ctx'> 	  by iSCSI for header and data digests and by others.</div><div class='ctx'> 	  See Castagnoli93.  This implementation uses lib/libcrc32c.</div><div class='del'>-          Module will be crc32c.</div><div class='add'>+	  Module will be crc32c.</div><div class='add'>+</div><div class='add'>+config CRYPTO_CRC32C_INTEL</div><div class='add'>+	tristate "CRC32c INTEL hardware acceleration"</div><div class='add'>+	depends on X86</div><div class='add'>+	select CRYPTO_HASH</div><div class='add'>+	help</div><div class='add'>+	  In Intel processor with SSE4.2 supported, the processor will</div><div class='add'>+	  support CRC32C implementation using hardware accelerated CRC32</div><div class='add'>+	  instruction. This option will create 'crc32c-intel' module,</div><div class='add'>+	  which will enable any routine to use the CRC32 instruction to</div><div class='add'>+	  gain performance compared with software implementation.</div><div class='add'>+	  Module will be crc32c-intel.</div><div class='ctx'> </div><div class='ctx'> config CRYPTO_MD4</div><div class='ctx'> 	tristate "MD4 digest algorithm"</div><div class='hunk'>@@ -243,55 +269,58 @@ config CRYPTO_MICHAEL_MIC</div><div class='ctx'> 	  of the algorithm.</div><div class='ctx'> </div><div class='ctx'> config CRYPTO_RMD128</div><div class='del'>-  tristate "RIPEMD-128 digest algorithm"</div><div class='del'>-  select CRYPTO_ALGAPI</div><div class='del'>-  help</div><div class='del'>-    RIPEMD-128 (ISO/IEC 10118-3:2004).</div><div class='add'>+	tristate "RIPEMD-128 digest algorithm"</div><div class='add'>+	select CRYPTO_ALGAPI</div><div class='add'>+	help</div><div class='add'>+	  RIPEMD-128 (ISO/IEC 10118-3:2004).</div><div class='ctx'> </div><div class='del'>-    RIPEMD-128 is a 128-bit cryptographic hash function. It should only</div><div class='del'>-    to be used as a secure replacement for RIPEMD. For other use cases</div><div class='del'>-    RIPEMD-160 should be used.</div><div class='add'>+	  RIPEMD-128 is a 128-bit cryptographic hash function. It should only</div><div class='add'>+	  to be used as a secure replacement for RIPEMD. For other use cases</div><div class='add'>+	  RIPEMD-160 should be used.</div><div class='ctx'> </div><div class='del'>-    Developed by Hans Dobbertin, Antoon Bosselaers and Bart Preneel.</div><div class='del'>-    See &lt;http://home.esat.kuleuven.be/~bosselae/ripemd160.html&gt;</div><div class='add'>+	  Developed by Hans Dobbertin, Antoon Bosselaers and Bart Preneel.</div><div class='add'>+	  See &lt;http://home.esat.kuleuven.be/~bosselae/ripemd160.html&gt;</div><div class='ctx'> </div><div class='ctx'> config CRYPTO_RMD160</div><div class='del'>-  tristate "RIPEMD-160 digest algorithm"</div><div class='del'>-  select CRYPTO_ALGAPI</div><div class='del'>-  help</div><div class='del'>-    RIPEMD-160 (ISO/IEC 10118-3:2004).</div><div class='add'>+	tristate "RIPEMD-160 digest algorithm"</div><div class='add'>+	select CRYPTO_ALGAPI</div><div class='add'>+	help</div><div class='add'>+	  RIPEMD-160 (ISO/IEC 10118-3:2004).</div><div class='ctx'> </div><div class='del'>-    RIPEMD-160 is a 160-bit cryptographic hash function. It is intended</div><div class='del'>-    to be used as a secure replacement for the 128-bit hash functions</div><div class='del'>-    MD4, MD5 and it's predecessor RIPEMD (not to be confused with RIPEMD-128).</div><div class='add'>+	  RIPEMD-160 is a 160-bit cryptographic hash function. It is intended</div><div class='add'>+	  to be used as a secure replacement for the 128-bit hash functions</div><div class='add'>+	  MD4, MD5 and it's predecessor RIPEMD</div><div class='add'>+	  (not to be confused with RIPEMD-128).</div><div class='ctx'> </div><div class='del'>-    It's speed is comparable to SHA1 and there are no known attacks against</div><div class='del'>-    RIPEMD-160.</div><div class='add'>+	  It's speed is comparable to SHA1 and there are no known attacks</div><div class='add'>+	  against RIPEMD-160.</div><div class='ctx'> </div><div class='del'>-    Developed by Hans Dobbertin, Antoon Bosselaers and Bart Preneel.</div><div class='del'>-    See &lt;http://home.esat.kuleuven.be/~bosselae/ripemd160.html&gt;</div><div class='add'>+	  Developed by Hans Dobbertin, Antoon Bosselaers and Bart Preneel.</div><div class='add'>+	  See &lt;http://home.esat.kuleuven.be/~bosselae/ripemd160.html&gt;</div><div class='ctx'> </div><div class='ctx'> config CRYPTO_RMD256</div><div class='del'>-  tristate "RIPEMD-256 digest algorithm"</div><div class='del'>-  select CRYPTO_ALGAPI</div><div class='del'>-  help</div><div class='del'>-    RIPEMD-256 is an optional extension of RIPEMD-128 with a 256 bit hash.</div><div class='del'>-    It is intended for applications that require longer hash-results, without</div><div class='del'>-    needing a larger security level (than RIPEMD-128).</div><div class='add'>+	tristate "RIPEMD-256 digest algorithm"</div><div class='add'>+	select CRYPTO_ALGAPI</div><div class='add'>+	help</div><div class='add'>+	  RIPEMD-256 is an optional extension of RIPEMD-128 with a</div><div class='add'>+	  256 bit hash. It is intended for applications that require</div><div class='add'>+	  longer hash-results, without needing a larger security level</div><div class='add'>+	  (than RIPEMD-128).</div><div class='ctx'> </div><div class='del'>-    Developed by Hans Dobbertin, Antoon Bosselaers and Bart Preneel.</div><div class='del'>-    See &lt;http://home.esat.kuleuven.be/~bosselae/ripemd160.html&gt;</div><div class='add'>+	  Developed by Hans Dobbertin, Antoon Bosselaers and Bart Preneel.</div><div class='add'>+	  See &lt;http://home.esat.kuleuven.be/~bosselae/ripemd160.html&gt;</div><div class='ctx'> </div><div class='ctx'> config CRYPTO_RMD320</div><div class='del'>-  tristate "RIPEMD-320 digest algorithm"</div><div class='del'>-  select CRYPTO_ALGAPI</div><div class='del'>-  help</div><div class='del'>-    RIPEMD-320 is an optional extension of RIPEMD-160 with a 320 bit hash.</div><div class='del'>-    It is intended for applications that require longer hash-results, without</div><div class='del'>-    needing a larger security level (than RIPEMD-160).</div><div class='add'>+	tristate "RIPEMD-320 digest algorithm"</div><div class='add'>+	select CRYPTO_ALGAPI</div><div class='add'>+	help</div><div class='add'>+	  RIPEMD-320 is an optional extension of RIPEMD-160 with a</div><div class='add'>+	  320 bit hash. It is intended for applications that require</div><div class='add'>+	  longer hash-results, without needing a larger security level</div><div class='add'>+	  (than RIPEMD-160).</div><div class='ctx'> </div><div class='del'>-    Developed by Hans Dobbertin, Antoon Bosselaers and Bart Preneel.</div><div class='del'>-    See &lt;http://home.esat.kuleuven.be/~bosselae/ripemd160.html&gt;</div><div class='add'>+	  Developed by Hans Dobbertin, Antoon Bosselaers and Bart Preneel.</div><div class='add'>+	  See &lt;http://home.esat.kuleuven.be/~bosselae/ripemd160.html&gt;</div><div class='ctx'> </div><div class='ctx'> config CRYPTO_SHA1</div><div class='ctx'> 	tristate "SHA1 digest algorithm"</div><div class='hunk'>@@ -308,8 +337,8 @@ config CRYPTO_SHA256</div><div class='ctx'> 	  This version of SHA implements a 256 bit hash with 128 bits of</div><div class='ctx'> 	  security against collision attacks.</div><div class='ctx'> </div><div class='del'>-          This code also includes SHA-224, a 224 bit hash with 112 bits</div><div class='del'>-          of security against collision attacks.</div><div class='add'>+	  This code also includes SHA-224, a 224 bit hash with 112 bits</div><div class='add'>+	  of security against collision attacks.</div><div class='ctx'> </div><div class='ctx'> config CRYPTO_SHA512</div><div class='ctx'> 	tristate "SHA384 and SHA512 digest algorithms"</div><div class='hunk'>@@ -666,6 +695,18 @@ config CRYPTO_LZO</div><div class='ctx'> 	help</div><div class='ctx'> 	  This is the LZO algorithm.</div><div class='ctx'> </div><div class='add'>+comment "Random Number Generation"</div><div class='add'>+</div><div class='add'>+config CRYPTO_ANSI_CPRNG</div><div class='add'>+	tristate "Pseudo Random Number Generation for Cryptographic modules"</div><div class='add'>+	select CRYPTO_AES</div><div class='add'>+	select CRYPTO_RNG</div><div class='add'>+	select CRYPTO_FIPS</div><div class='add'>+	help</div><div class='add'>+	  This option enables the generic pseudo random number generator</div><div class='add'>+	  for cryptographic modules.  Uses the Algorithm specified in</div><div class='add'>+	  ANSI X9.31 A.2.4</div><div class='add'>+</div><div class='ctx'> source "drivers/crypto/Kconfig"</div><div class='ctx'> </div><div class='ctx'> endif	# if CRYPTO</div><div class='head'>diff --git a/crypto/Makefile b/crypto/Makefile<br/>index d4f3ed857df0..5862b807334e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/crypto/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>crypto/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/crypto/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>crypto/Makefile</a></div><div class='hunk'>@@ -5,6 +5,8 @@</div><div class='ctx'> obj-$(CONFIG_CRYPTO) += crypto.o</div><div class='ctx'> crypto-objs := api.o cipher.o digest.o compress.o</div><div class='ctx'> </div><div class='add'>+obj-$(CONFIG_CRYPTO_FIPS) += fips.o</div><div class='add'>+</div><div class='ctx'> crypto_algapi-$(CONFIG_PROC_FS) += proc.o</div><div class='ctx'> crypto_algapi-objs := algapi.o scatterwalk.o $(crypto_algapi-y)</div><div class='ctx'> obj-$(CONFIG_CRYPTO_ALGAPI) += crypto_algapi.o</div><div class='hunk'>@@ -13,15 +15,17 @@ obj-$(CONFIG_CRYPTO_AEAD) += aead.o</div><div class='ctx'> </div><div class='ctx'> crypto_blkcipher-objs := ablkcipher.o</div><div class='ctx'> crypto_blkcipher-objs += blkcipher.o</div><div class='del'>-crypto_blkcipher-objs += chainiv.o</div><div class='del'>-crypto_blkcipher-objs += eseqiv.o</div><div class='ctx'> obj-$(CONFIG_CRYPTO_BLKCIPHER) += crypto_blkcipher.o</div><div class='add'>+obj-$(CONFIG_CRYPTO_BLKCIPHER) += chainiv.o</div><div class='add'>+obj-$(CONFIG_CRYPTO_BLKCIPHER) += eseqiv.o</div><div class='ctx'> obj-$(CONFIG_CRYPTO_SEQIV) += seqiv.o</div><div class='ctx'> </div><div class='ctx'> crypto_hash-objs := hash.o</div><div class='ctx'> crypto_hash-objs += ahash.o</div><div class='ctx'> obj-$(CONFIG_CRYPTO_HASH) += crypto_hash.o</div><div class='ctx'> </div><div class='add'>+cryptomgr-objs := algboss.o testmgr.o</div><div class='add'>+</div><div class='ctx'> obj-$(CONFIG_CRYPTO_MANAGER) += cryptomgr.o</div><div class='ctx'> obj-$(CONFIG_CRYPTO_HMAC) += hmac.o</div><div class='ctx'> obj-$(CONFIG_CRYPTO_XCBC) += xcbc.o</div><div class='hunk'>@@ -69,7 +73,9 @@ obj-$(CONFIG_CRYPTO_MICHAEL_MIC) += michael_mic.o</div><div class='ctx'> obj-$(CONFIG_CRYPTO_CRC32C) += crc32c.o</div><div class='ctx'> obj-$(CONFIG_CRYPTO_AUTHENC) += authenc.o</div><div class='ctx'> obj-$(CONFIG_CRYPTO_LZO) += lzo.o</div><div class='del'>-</div><div class='add'>+obj-$(CONFIG_CRYPTO_RNG) += rng.o</div><div class='add'>+obj-$(CONFIG_CRYPTO_RNG) += krng.o</div><div class='add'>+obj-$(CONFIG_CRYPTO_ANSI_CPRNG) += ansi_cprng.o</div><div class='ctx'> obj-$(CONFIG_CRYPTO_TEST) += tcrypt.o</div><div class='ctx'> </div><div class='ctx'> #</div><div class='head'>diff --git a/crypto/algapi.c b/crypto/algapi.c<br/>index e65cb50cf4af..7c41e7405c41 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/crypto/algapi.c?id=c15895ef30c2c03e99802951787183039a349d32'>crypto/algapi.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/crypto/algapi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>crypto/algapi.c</a></div><div class='hunk'>@@ -21,15 +21,15 @@</div><div class='ctx'> </div><div class='ctx'> #include "internal.h"</div><div class='ctx'> </div><div class='add'>+static void crypto_remove_final(struct list_head *list);</div><div class='add'>+</div><div class='ctx'> static LIST_HEAD(crypto_template_list);</div><div class='ctx'> </div><div class='ctx'> void crypto_larval_error(const char *name, u32 type, u32 mask)</div><div class='ctx'> {</div><div class='ctx'> 	struct crypto_alg *alg;</div><div class='ctx'> </div><div class='del'>-	down_read(&amp;crypto_alg_sem);</div><div class='del'>-	alg = __crypto_alg_lookup(name, type, mask);</div><div class='del'>-	up_read(&amp;crypto_alg_sem);</div><div class='add'>+	alg = crypto_alg_lookup(name, type, mask);</div><div class='ctx'> </div><div class='ctx'> 	if (alg) {</div><div class='ctx'> 		if (crypto_is_larval(alg)) {</div><div class='hunk'>@@ -128,23 +128,97 @@ static void crypto_remove_spawns(struct list_head *spawns,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __crypto_register_alg(struct crypto_alg *alg,</div><div class='del'>-				 struct list_head *list)</div><div class='add'>+static struct crypto_larval *__crypto_register_alg(struct crypto_alg *alg)</div><div class='ctx'> {</div><div class='ctx'> 	struct crypto_alg *q;</div><div class='add'>+	struct crypto_larval *larval;</div><div class='ctx'> 	int ret = -EAGAIN;</div><div class='ctx'> </div><div class='ctx'> 	if (crypto_is_dead(alg))</div><div class='del'>-		goto out;</div><div class='add'>+		goto err;</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;alg-&gt;cra_users);</div><div class='ctx'> </div><div class='add'>+	/* No cheating! */</div><div class='add'>+	alg-&gt;cra_flags &amp;= ~CRYPTO_ALG_TESTED;</div><div class='add'>+</div><div class='ctx'> 	ret = -EEXIST;</div><div class='ctx'> </div><div class='ctx'> 	atomic_set(&amp;alg-&gt;cra_refcnt, 1);</div><div class='ctx'> 	list_for_each_entry(q, &amp;crypto_alg_list, cra_list) {</div><div class='ctx'> 		if (q == alg)</div><div class='del'>-			goto out;</div><div class='add'>+			goto err;</div><div class='add'>+</div><div class='add'>+		if (crypto_is_larval(q)) {</div><div class='add'>+			if (!strcmp(alg-&gt;cra_driver_name, q-&gt;cra_driver_name))</div><div class='add'>+				goto err;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!strcmp(q-&gt;cra_driver_name, alg-&gt;cra_name) ||</div><div class='add'>+		    !strcmp(q-&gt;cra_name, alg-&gt;cra_driver_name))</div><div class='add'>+			goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	larval = crypto_larval_alloc(alg-&gt;cra_name,</div><div class='add'>+				     alg-&gt;cra_flags | CRYPTO_ALG_TESTED, 0);</div><div class='add'>+	if (IS_ERR(larval))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = -ENOENT;</div><div class='add'>+	larval-&gt;adult = crypto_mod_get(alg);</div><div class='add'>+	if (!larval-&gt;adult)</div><div class='add'>+		goto free_larval;</div><div class='add'>+</div><div class='add'>+	atomic_set(&amp;larval-&gt;alg.cra_refcnt, 1);</div><div class='add'>+	memcpy(larval-&gt;alg.cra_driver_name, alg-&gt;cra_driver_name,</div><div class='add'>+	       CRYPTO_MAX_ALG_NAME);</div><div class='add'>+	larval-&gt;alg.cra_priority = alg-&gt;cra_priority;</div><div class='add'>+</div><div class='add'>+	list_add(&amp;alg-&gt;cra_list, &amp;crypto_alg_list);</div><div class='add'>+	list_add(&amp;larval-&gt;alg.cra_list, &amp;crypto_alg_list);</div><div class='add'>+</div><div class='add'>+out:	</div><div class='add'>+	return larval;</div><div class='add'>+</div><div class='add'>+free_larval:</div><div class='add'>+	kfree(larval);</div><div class='add'>+err:</div><div class='add'>+	larval = ERR_PTR(ret);</div><div class='add'>+	goto out;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void crypto_alg_tested(const char *name, int err)</div><div class='add'>+{</div><div class='add'>+	struct crypto_larval *test;</div><div class='add'>+	struct crypto_alg *alg;</div><div class='add'>+	struct crypto_alg *q;</div><div class='add'>+	LIST_HEAD(list);</div><div class='add'>+</div><div class='add'>+	down_write(&amp;crypto_alg_sem);</div><div class='add'>+	list_for_each_entry(q, &amp;crypto_alg_list, cra_list) {</div><div class='add'>+		if (!crypto_is_larval(q))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		test = (struct crypto_larval *)q;</div><div class='add'>+</div><div class='add'>+		if (!strcmp(q-&gt;cra_driver_name, name))</div><div class='add'>+			goto found;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	printk(KERN_ERR "alg: Unexpected test result for %s: %d\n", name, err);</div><div class='add'>+	goto unlock;</div><div class='add'>+</div><div class='add'>+found:</div><div class='add'>+	alg = test-&gt;adult;</div><div class='add'>+	if (err || list_empty(&amp;alg-&gt;cra_list))</div><div class='add'>+		goto complete;</div><div class='add'>+</div><div class='add'>+	alg-&gt;cra_flags |= CRYPTO_ALG_TESTED;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(q, &amp;crypto_alg_list, cra_list) {</div><div class='add'>+		if (q == alg)</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='ctx'> 		if (crypto_is_moribund(q))</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -180,17 +254,18 @@ static int __crypto_register_alg(struct crypto_alg *alg,</div><div class='ctx'> 		    q-&gt;cra_priority &gt; alg-&gt;cra_priority)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		crypto_remove_spawns(&amp;q-&gt;cra_users, list, alg-&gt;cra_flags);</div><div class='add'>+		crypto_remove_spawns(&amp;q-&gt;cra_users, &amp;list, alg-&gt;cra_flags);</div><div class='ctx'> 	}</div><div class='del'>-	</div><div class='del'>-	list_add(&amp;alg-&gt;cra_list, &amp;crypto_alg_list);</div><div class='ctx'> </div><div class='del'>-	crypto_notify(CRYPTO_MSG_ALG_REGISTER, alg);</div><div class='del'>-	ret = 0;</div><div class='add'>+complete:</div><div class='add'>+	complete_all(&amp;test-&gt;completion);</div><div class='ctx'> </div><div class='del'>-out:	</div><div class='del'>-	return ret;</div><div class='add'>+unlock:</div><div class='add'>+	up_write(&amp;crypto_alg_sem);</div><div class='add'>+</div><div class='add'>+	crypto_remove_final(&amp;list);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(crypto_alg_tested);</div><div class='ctx'> </div><div class='ctx'> static void crypto_remove_final(struct list_head *list)</div><div class='ctx'> {</div><div class='hunk'>@@ -203,9 +278,27 @@ static void crypto_remove_final(struct list_head *list)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void crypto_wait_for_test(struct crypto_larval *larval)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = crypto_probing_notify(CRYPTO_MSG_ALG_REGISTER, larval-&gt;adult);</div><div class='add'>+	if (err != NOTIFY_STOP) {</div><div class='add'>+		if (WARN_ON(err != NOTIFY_DONE))</div><div class='add'>+			goto out;</div><div class='add'>+		crypto_alg_tested(larval-&gt;alg.cra_driver_name, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = wait_for_completion_interruptible(&amp;larval-&gt;completion);</div><div class='add'>+	WARN_ON(err);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	crypto_larval_kill(&amp;larval-&gt;alg);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int crypto_register_alg(struct crypto_alg *alg)</div><div class='ctx'> {</div><div class='del'>-	LIST_HEAD(list);</div><div class='add'>+	struct crypto_larval *larval;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	err = crypto_check_alg(alg);</div><div class='hunk'>@@ -213,11 +306,14 @@ int crypto_register_alg(struct crypto_alg *alg)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	down_write(&amp;crypto_alg_sem);</div><div class='del'>-	err = __crypto_register_alg(alg, &amp;list);</div><div class='add'>+	larval = __crypto_register_alg(alg);</div><div class='ctx'> 	up_write(&amp;crypto_alg_sem);</div><div class='ctx'> </div><div class='del'>-	crypto_remove_final(&amp;list);</div><div class='del'>-	return err;</div><div class='add'>+	if (IS_ERR(larval))</div><div class='add'>+		return PTR_ERR(larval);</div><div class='add'>+</div><div class='add'>+	crypto_wait_for_test(larval);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(crypto_register_alg);</div><div class='ctx'> </div><div class='hunk'>@@ -335,8 +431,8 @@ EXPORT_SYMBOL_GPL(crypto_lookup_template);</div><div class='ctx'> int crypto_register_instance(struct crypto_template *tmpl,</div><div class='ctx'> 			     struct crypto_instance *inst)</div><div class='ctx'> {</div><div class='del'>-	LIST_HEAD(list);</div><div class='del'>-	int err = -EINVAL;</div><div class='add'>+	struct crypto_larval *larval;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	err = crypto_check_alg(&amp;inst-&gt;alg);</div><div class='ctx'> 	if (err)</div><div class='hunk'>@@ -346,8 +442,8 @@ int crypto_register_instance(struct crypto_template *tmpl,</div><div class='ctx'> </div><div class='ctx'> 	down_write(&amp;crypto_alg_sem);</div><div class='ctx'> </div><div class='del'>-	err = __crypto_register_alg(&amp;inst-&gt;alg, &amp;list);</div><div class='del'>-	if (err)</div><div class='add'>+	larval = __crypto_register_alg(&amp;inst-&gt;alg);</div><div class='add'>+	if (IS_ERR(larval))</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> </div><div class='ctx'> 	hlist_add_head(&amp;inst-&gt;list, &amp;tmpl-&gt;instances);</div><div class='hunk'>@@ -356,7 +452,12 @@ int crypto_register_instance(struct crypto_template *tmpl,</div><div class='ctx'> unlock:</div><div class='ctx'> 	up_write(&amp;crypto_alg_sem);</div><div class='ctx'> </div><div class='del'>-	crypto_remove_final(&amp;list);</div><div class='add'>+	err = PTR_ERR(larval);</div><div class='add'>+	if (IS_ERR(larval))</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	crypto_wait_for_test(larval);</div><div class='add'>+	err = 0;</div><div class='ctx'> </div><div class='ctx'> err:</div><div class='ctx'> 	return err;</div><div class='head'>diff --git a/crypto/cryptomgr.c b/crypto/algboss.c<br/>index e5e3cf848d42..4601e4267c88 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/crypto/cryptomgr.c?id=c15895ef30c2c03e99802951787183039a349d32'>crypto/cryptomgr.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/crypto/algboss.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>crypto/algboss.c</a></div><div class='hunk'>@@ -45,6 +45,15 @@ struct cryptomgr_param {</div><div class='ctx'> </div><div class='ctx'> 	char larval[CRYPTO_MAX_ALG_NAME];</div><div class='ctx'> 	char template[CRYPTO_MAX_ALG_NAME];</div><div class='add'>+</div><div class='add'>+	u32 otype;</div><div class='add'>+	u32 omask;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct crypto_test_param {</div><div class='add'>+	char driver[CRYPTO_MAX_ALG_NAME];</div><div class='add'>+	char alg[CRYPTO_MAX_ALG_NAME];</div><div class='add'>+	u32 type;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int cryptomgr_probe(void *data)</div><div class='hunk'>@@ -76,8 +85,7 @@ out:</div><div class='ctx'> 	module_put_and_exit(0);</div><div class='ctx'> </div><div class='ctx'> err:</div><div class='del'>-	crypto_larval_error(param-&gt;larval, param-&gt;type.data.type,</div><div class='del'>-			    param-&gt;type.data.mask);</div><div class='add'>+	crypto_larval_error(param-&gt;larval, param-&gt;otype, param-&gt;omask);</div><div class='ctx'> 	goto out;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -169,13 +177,65 @@ static int cryptomgr_schedule_probe(struct crypto_larval *larval)</div><div class='ctx'> </div><div class='ctx'> 	param-&gt;type.attr.rta_len = sizeof(param-&gt;type);</div><div class='ctx'> 	param-&gt;type.attr.rta_type = CRYPTOA_TYPE;</div><div class='del'>-	param-&gt;type.data.type = larval-&gt;alg.cra_flags;</div><div class='del'>-	param-&gt;type.data.mask = larval-&gt;mask;</div><div class='add'>+	param-&gt;type.data.type = larval-&gt;alg.cra_flags &amp; ~CRYPTO_ALG_TESTED;</div><div class='add'>+	param-&gt;type.data.mask = larval-&gt;mask &amp; ~CRYPTO_ALG_TESTED;</div><div class='ctx'> 	param-&gt;tb[0] = &amp;param-&gt;type.attr;</div><div class='ctx'> </div><div class='add'>+	param-&gt;otype = larval-&gt;alg.cra_flags;</div><div class='add'>+	param-&gt;omask = larval-&gt;mask;</div><div class='add'>+</div><div class='ctx'> 	memcpy(param-&gt;larval, larval-&gt;alg.cra_name, CRYPTO_MAX_ALG_NAME);</div><div class='ctx'> </div><div class='del'>-	thread = kthread_run(cryptomgr_probe, param, "cryptomgr");</div><div class='add'>+	thread = kthread_run(cryptomgr_probe, param, "cryptomgr_probe");</div><div class='add'>+	if (IS_ERR(thread))</div><div class='add'>+		goto err_free_param;</div><div class='add'>+</div><div class='add'>+	return NOTIFY_STOP;</div><div class='add'>+</div><div class='add'>+err_free_param:</div><div class='add'>+	kfree(param);</div><div class='add'>+err_put_module:</div><div class='add'>+	module_put(THIS_MODULE);</div><div class='add'>+err:</div><div class='add'>+	return NOTIFY_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cryptomgr_test(void *data)</div><div class='add'>+{</div><div class='add'>+	struct crypto_test_param *param = data;</div><div class='add'>+	u32 type = param-&gt;type;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (!((type ^ CRYPTO_ALG_TYPE_BLKCIPHER) &amp;</div><div class='add'>+	      CRYPTO_ALG_TYPE_BLKCIPHER_MASK) &amp;&amp; !(type &amp; CRYPTO_ALG_GENIV))</div><div class='add'>+		goto skiptest;</div><div class='add'>+</div><div class='add'>+	err = alg_test(param-&gt;driver, param-&gt;alg, type, CRYPTO_ALG_TESTED);</div><div class='add'>+</div><div class='add'>+skiptest:</div><div class='add'>+	crypto_alg_tested(param-&gt;driver, err);</div><div class='add'>+</div><div class='add'>+	kfree(param);</div><div class='add'>+	module_put_and_exit(0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cryptomgr_schedule_test(struct crypto_alg *alg)</div><div class='add'>+{</div><div class='add'>+	struct task_struct *thread;</div><div class='add'>+	struct crypto_test_param *param;</div><div class='add'>+</div><div class='add'>+	if (!try_module_get(THIS_MODULE))</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	param = kzalloc(sizeof(*param), GFP_KERNEL);</div><div class='add'>+	if (!param)</div><div class='add'>+		goto err_put_module;</div><div class='add'>+</div><div class='add'>+	memcpy(param-&gt;driver, alg-&gt;cra_driver_name, sizeof(param-&gt;driver));</div><div class='add'>+	memcpy(param-&gt;alg, alg-&gt;cra_name, sizeof(param-&gt;alg));</div><div class='add'>+	param-&gt;type = alg-&gt;cra_flags;</div><div class='add'>+</div><div class='add'>+	thread = kthread_run(cryptomgr_test, param, "cryptomgr_test");</div><div class='ctx'> 	if (IS_ERR(thread))</div><div class='ctx'> 		goto err_free_param;</div><div class='ctx'> </div><div class='hunk'>@@ -195,6 +255,8 @@ static int cryptomgr_notify(struct notifier_block *this, unsigned long msg,</div><div class='ctx'> 	switch (msg) {</div><div class='ctx'> 	case CRYPTO_MSG_ALG_REQUEST:</div><div class='ctx'> 		return cryptomgr_schedule_probe(data);</div><div class='add'>+	case CRYPTO_MSG_ALG_REGISTER:</div><div class='add'>+		return cryptomgr_schedule_test(data);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return NOTIFY_DONE;</div><div class='hunk'>@@ -206,16 +268,32 @@ static struct notifier_block cryptomgr_notifier = {</div><div class='ctx'> </div><div class='ctx'> static int __init cryptomgr_init(void)</div><div class='ctx'> {</div><div class='del'>-	return crypto_register_notifier(&amp;cryptomgr_notifier);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = testmgr_init();</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = crypto_register_notifier(&amp;cryptomgr_notifier);</div><div class='add'>+	if (err)</div><div class='add'>+		goto free_testmgr;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+free_testmgr:</div><div class='add'>+	testmgr_exit();</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit cryptomgr_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	int err = crypto_unregister_notifier(&amp;cryptomgr_notifier);</div><div class='ctx'> 	BUG_ON(err);</div><div class='add'>+</div><div class='add'>+	testmgr_exit();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(cryptomgr_init);</div><div class='add'>+subsys_initcall(cryptomgr_init);</div><div class='ctx'> module_exit(cryptomgr_exit);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/crypto/ansi_cprng.c b/crypto/ansi_cprng.c<br/>new file mode 100644<br/>index 000000000000..72db0fd763cc<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/crypto/ansi_cprng.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>crypto/ansi_cprng.c</a></div><div class='hunk'>@@ -0,0 +1,417 @@</div><div class='add'>+/*</div><div class='add'>+ * PRNG: Pseudo Random Number Generator</div><div class='add'>+ *       Based on NIST Recommended PRNG From ANSI X9.31 Appendix A.2.4 using</div><div class='add'>+ *       AES 128 cipher</div><div class='add'>+ *</div><div class='add'>+ *  (C) Neil Horman &lt;nhorman@tuxdriver.com&gt;</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ *  under the terms of the GNU General Public License as published by the</div><div class='add'>+ *  Free Software Foundation; either version 2 of the License, or (at your</div><div class='add'>+ *  any later version.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;crypto/internal/rng.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+</div><div class='add'>+#include "internal.h"</div><div class='add'>+</div><div class='add'>+#define DEFAULT_PRNG_KEY "0123456789abcdef"</div><div class='add'>+#define DEFAULT_PRNG_KSZ 16</div><div class='add'>+#define DEFAULT_BLK_SZ 16</div><div class='add'>+#define DEFAULT_V_SEED "zaybxcwdveuftgsh"</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Flags for the prng_context flags field</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define PRNG_FIXED_SIZE 0x1</div><div class='add'>+#define PRNG_NEED_RESET 0x2</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Note: DT is our counter value</div><div class='add'>+ *	 I is our intermediate value</div><div class='add'>+ *	 V is our seed vector</div><div class='add'>+ * See http://csrc.nist.gov/groups/STM/cavp/documents/rng/931rngext.pdf</div><div class='add'>+ * for implementation details</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+struct prng_context {</div><div class='add'>+	spinlock_t prng_lock;</div><div class='add'>+	unsigned char rand_data[DEFAULT_BLK_SZ];</div><div class='add'>+	unsigned char last_rand_data[DEFAULT_BLK_SZ];</div><div class='add'>+	unsigned char DT[DEFAULT_BLK_SZ];</div><div class='add'>+	unsigned char I[DEFAULT_BLK_SZ];</div><div class='add'>+	unsigned char V[DEFAULT_BLK_SZ];</div><div class='add'>+	u32 rand_data_valid;</div><div class='add'>+	struct crypto_cipher *tfm;</div><div class='add'>+	u32 flags;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int dbg;</div><div class='add'>+</div><div class='add'>+static void hexdump(char *note, unsigned char *buf, unsigned int len)</div><div class='add'>+{</div><div class='add'>+	if (dbg) {</div><div class='add'>+		printk(KERN_CRIT "%s", note);</div><div class='add'>+		print_hex_dump(KERN_CONT, "", DUMP_PREFIX_OFFSET,</div><div class='add'>+				16, 1,</div><div class='add'>+				buf, len, false);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define dbgprint(format, args...) do {\</div><div class='add'>+if (dbg)\</div><div class='add'>+	printk(format, ##args);\</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+static void xor_vectors(unsigned char *in1, unsigned char *in2,</div><div class='add'>+			unsigned char *out, unsigned int size)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; size; i++)</div><div class='add'>+		out[i] = in1[i] ^ in2[i];</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+/*</div><div class='add'>+ * Returns DEFAULT_BLK_SZ bytes of random data per call</div><div class='add'>+ * returns 0 if generation succeded, &lt;0 if something went wrong</div><div class='add'>+ */</div><div class='add'>+static int _get_more_prng_bytes(struct prng_context *ctx)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	unsigned char tmp[DEFAULT_BLK_SZ];</div><div class='add'>+	unsigned char *output = NULL;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	dbgprint(KERN_CRIT "Calling _get_more_prng_bytes for context %p\n",</div><div class='add'>+		ctx);</div><div class='add'>+</div><div class='add'>+	hexdump("Input DT: ", ctx-&gt;DT, DEFAULT_BLK_SZ);</div><div class='add'>+	hexdump("Input I: ", ctx-&gt;I, DEFAULT_BLK_SZ);</div><div class='add'>+	hexdump("Input V: ", ctx-&gt;V, DEFAULT_BLK_SZ);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * This algorithm is a 3 stage state machine</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; 3; i++) {</div><div class='add'>+</div><div class='add'>+		switch (i) {</div><div class='add'>+		case 0:</div><div class='add'>+			/*</div><div class='add'>+			 * Start by encrypting the counter value</div><div class='add'>+			 * This gives us an intermediate value I</div><div class='add'>+			 */</div><div class='add'>+			memcpy(tmp, ctx-&gt;DT, DEFAULT_BLK_SZ);</div><div class='add'>+			output = ctx-&gt;I;</div><div class='add'>+			hexdump("tmp stage 0: ", tmp, DEFAULT_BLK_SZ);</div><div class='add'>+			break;</div><div class='add'>+		case 1:</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * Next xor I with our secret vector V</div><div class='add'>+			 * encrypt that result to obtain our</div><div class='add'>+			 * pseudo random data which we output</div><div class='add'>+			 */</div><div class='add'>+			xor_vectors(ctx-&gt;I, ctx-&gt;V, tmp, DEFAULT_BLK_SZ);</div><div class='add'>+			hexdump("tmp stage 1: ", tmp, DEFAULT_BLK_SZ);</div><div class='add'>+			output = ctx-&gt;rand_data;</div><div class='add'>+			break;</div><div class='add'>+		case 2:</div><div class='add'>+			/*</div><div class='add'>+			 * First check that we didn't produce the same</div><div class='add'>+			 * random data that we did last time around through this</div><div class='add'>+			 */</div><div class='add'>+			if (!memcmp(ctx-&gt;rand_data, ctx-&gt;last_rand_data,</div><div class='add'>+					DEFAULT_BLK_SZ)) {</div><div class='add'>+				printk(KERN_ERR</div><div class='add'>+					"ctx %p Failed repetition check!\n",</div><div class='add'>+					ctx);</div><div class='add'>+				ctx-&gt;flags |= PRNG_NEED_RESET;</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			}</div><div class='add'>+			memcpy(ctx-&gt;last_rand_data, ctx-&gt;rand_data,</div><div class='add'>+				DEFAULT_BLK_SZ);</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * Lastly xor the random data with I</div><div class='add'>+			 * and encrypt that to obtain a new secret vector V</div><div class='add'>+			 */</div><div class='add'>+			xor_vectors(ctx-&gt;rand_data, ctx-&gt;I, tmp,</div><div class='add'>+				DEFAULT_BLK_SZ);</div><div class='add'>+			output = ctx-&gt;V;</div><div class='add'>+			hexdump("tmp stage 2: ", tmp, DEFAULT_BLK_SZ);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+		/* do the encryption */</div><div class='add'>+		crypto_cipher_encrypt_one(ctx-&gt;tfm, output, tmp);</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Now update our DT value</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; DEFAULT_BLK_SZ; i++) {</div><div class='add'>+		ctx-&gt;DT[i] += 1;</div><div class='add'>+		if (ctx-&gt;DT[i] != 0)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dbgprint("Returning new block for context %p\n", ctx);</div><div class='add'>+	ctx-&gt;rand_data_valid = 0;</div><div class='add'>+</div><div class='add'>+	hexdump("Output DT: ", ctx-&gt;DT, DEFAULT_BLK_SZ);</div><div class='add'>+	hexdump("Output I: ", ctx-&gt;I, DEFAULT_BLK_SZ);</div><div class='add'>+	hexdump("Output V: ", ctx-&gt;V, DEFAULT_BLK_SZ);</div><div class='add'>+	hexdump("New Random Data: ", ctx-&gt;rand_data, DEFAULT_BLK_SZ);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Our exported functions */</div><div class='add'>+static int get_prng_bytes(char *buf, size_t nbytes, struct prng_context *ctx)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	unsigned char *ptr = buf;</div><div class='add'>+	unsigned int byte_count = (unsigned int)nbytes;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	if (nbytes &lt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;ctx-&gt;prng_lock, flags);</div><div class='add'>+</div><div class='add'>+	err = -EINVAL;</div><div class='add'>+	if (ctx-&gt;flags &amp; PRNG_NEED_RESET)</div><div class='add'>+		goto done;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If the FIXED_SIZE flag is on, only return whole blocks of</div><div class='add'>+	 * pseudo random data</div><div class='add'>+	 */</div><div class='add'>+	err = -EINVAL;</div><div class='add'>+	if (ctx-&gt;flags &amp; PRNG_FIXED_SIZE) {</div><div class='add'>+		if (nbytes &lt; DEFAULT_BLK_SZ)</div><div class='add'>+			goto done;</div><div class='add'>+		byte_count = DEFAULT_BLK_SZ;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = byte_count;</div><div class='add'>+</div><div class='add'>+	dbgprint(KERN_CRIT "getting %d random bytes for context %p\n",</div><div class='add'>+		byte_count, ctx);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+remainder:</div><div class='add'>+	if (ctx-&gt;rand_data_valid == DEFAULT_BLK_SZ) {</div><div class='add'>+		if (_get_more_prng_bytes(ctx) &lt; 0) {</div><div class='add'>+			memset(buf, 0, nbytes);</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			goto done;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Copy up to the next whole block size</div><div class='add'>+	 */</div><div class='add'>+	if (byte_count &lt; DEFAULT_BLK_SZ) {</div><div class='add'>+		for (; ctx-&gt;rand_data_valid &lt; DEFAULT_BLK_SZ;</div><div class='add'>+			ctx-&gt;rand_data_valid++) {</div><div class='add'>+			*ptr = ctx-&gt;rand_data[ctx-&gt;rand_data_valid];</div><div class='add'>+			ptr++;</div><div class='add'>+			byte_count--;</div><div class='add'>+			if (byte_count == 0)</div><div class='add'>+				goto done;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Now copy whole blocks</div><div class='add'>+	 */</div><div class='add'>+	for (; byte_count &gt;= DEFAULT_BLK_SZ; byte_count -= DEFAULT_BLK_SZ) {</div><div class='add'>+		if (_get_more_prng_bytes(ctx) &lt; 0) {</div><div class='add'>+			memset(buf, 0, nbytes);</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			goto done;</div><div class='add'>+		}</div><div class='add'>+		memcpy(ptr, ctx-&gt;rand_data, DEFAULT_BLK_SZ);</div><div class='add'>+		ctx-&gt;rand_data_valid += DEFAULT_BLK_SZ;</div><div class='add'>+		ptr += DEFAULT_BLK_SZ;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Now copy any extra partial data</div><div class='add'>+	 */</div><div class='add'>+	if (byte_count)</div><div class='add'>+		goto remainder;</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	spin_unlock_irqrestore(&amp;ctx-&gt;prng_lock, flags);</div><div class='add'>+	dbgprint(KERN_CRIT "returning %d from get_prng_bytes in context %p\n",</div><div class='add'>+		err, ctx);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void free_prng_context(struct prng_context *ctx)</div><div class='add'>+{</div><div class='add'>+	crypto_free_cipher(ctx-&gt;tfm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int reset_prng_context(struct prng_context *ctx,</div><div class='add'>+			      unsigned char *key, size_t klen,</div><div class='add'>+			      unsigned char *V, unsigned char *DT)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	int rc = -EINVAL;</div><div class='add'>+	unsigned char *prng_key;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;ctx-&gt;prng_lock);</div><div class='add'>+	ctx-&gt;flags |= PRNG_NEED_RESET;</div><div class='add'>+</div><div class='add'>+	prng_key = (key != NULL) ? key : (unsigned char *)DEFAULT_PRNG_KEY;</div><div class='add'>+</div><div class='add'>+	if (!key)</div><div class='add'>+		klen = DEFAULT_PRNG_KSZ;</div><div class='add'>+</div><div class='add'>+	if (V)</div><div class='add'>+		memcpy(ctx-&gt;V, V, DEFAULT_BLK_SZ);</div><div class='add'>+	else</div><div class='add'>+		memcpy(ctx-&gt;V, DEFAULT_V_SEED, DEFAULT_BLK_SZ);</div><div class='add'>+</div><div class='add'>+	if (DT)</div><div class='add'>+		memcpy(ctx-&gt;DT, DT, DEFAULT_BLK_SZ);</div><div class='add'>+	else</div><div class='add'>+		memset(ctx-&gt;DT, 0, DEFAULT_BLK_SZ);</div><div class='add'>+</div><div class='add'>+	memset(ctx-&gt;rand_data, 0, DEFAULT_BLK_SZ);</div><div class='add'>+	memset(ctx-&gt;last_rand_data, 0, DEFAULT_BLK_SZ);</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;tfm)</div><div class='add'>+		crypto_free_cipher(ctx-&gt;tfm);</div><div class='add'>+</div><div class='add'>+	ctx-&gt;tfm = crypto_alloc_cipher("aes", 0, 0);</div><div class='add'>+	if (IS_ERR(ctx-&gt;tfm)) {</div><div class='add'>+		dbgprint(KERN_CRIT "Failed to alloc tfm for context %p\n",</div><div class='add'>+			ctx);</div><div class='add'>+		ctx-&gt;tfm = NULL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ctx-&gt;rand_data_valid = DEFAULT_BLK_SZ;</div><div class='add'>+</div><div class='add'>+	ret = crypto_cipher_setkey(ctx-&gt;tfm, prng_key, klen);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dbgprint(KERN_CRIT "PRNG: setkey() failed flags=%x\n",</div><div class='add'>+			crypto_cipher_get_flags(ctx-&gt;tfm));</div><div class='add'>+		crypto_free_cipher(ctx-&gt;tfm);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = 0;</div><div class='add'>+	ctx-&gt;flags &amp;= ~PRNG_NEED_RESET;</div><div class='add'>+out:</div><div class='add'>+	spin_unlock(&amp;ctx-&gt;prng_lock);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cprng_init(struct crypto_tfm *tfm)</div><div class='add'>+{</div><div class='add'>+	struct prng_context *ctx = crypto_tfm_ctx(tfm);</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;ctx-&gt;prng_lock);</div><div class='add'>+</div><div class='add'>+	return reset_prng_context(ctx, NULL, DEFAULT_PRNG_KSZ, NULL, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cprng_exit(struct crypto_tfm *tfm)</div><div class='add'>+{</div><div class='add'>+	free_prng_context(crypto_tfm_ctx(tfm));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cprng_get_random(struct crypto_rng *tfm, u8 *rdata,</div><div class='add'>+			    unsigned int dlen)</div><div class='add'>+{</div><div class='add'>+	struct prng_context *prng = crypto_rng_ctx(tfm);</div><div class='add'>+</div><div class='add'>+	return get_prng_bytes(rdata, dlen, prng);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cprng_reset(struct crypto_rng *tfm, u8 *seed, unsigned int slen)</div><div class='add'>+{</div><div class='add'>+	struct prng_context *prng = crypto_rng_ctx(tfm);</div><div class='add'>+	u8 *key = seed + DEFAULT_PRNG_KSZ;</div><div class='add'>+</div><div class='add'>+	if (slen &lt; DEFAULT_PRNG_KSZ + DEFAULT_BLK_SZ)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	reset_prng_context(prng, key, DEFAULT_PRNG_KSZ, seed, NULL);</div><div class='add'>+</div><div class='add'>+	if (prng-&gt;flags &amp; PRNG_NEED_RESET)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct crypto_alg rng_alg = {</div><div class='add'>+	.cra_name		= "stdrng",</div><div class='add'>+	.cra_driver_name	= "ansi_cprng",</div><div class='add'>+	.cra_priority		= 100,</div><div class='add'>+	.cra_flags		= CRYPTO_ALG_TYPE_RNG,</div><div class='add'>+	.cra_ctxsize		= sizeof(struct prng_context),</div><div class='add'>+	.cra_type		= &amp;crypto_rng_type,</div><div class='add'>+	.cra_module		= THIS_MODULE,</div><div class='add'>+	.cra_list		= LIST_HEAD_INIT(rng_alg.cra_list),</div><div class='add'>+	.cra_init		= cprng_init,</div><div class='add'>+	.cra_exit		= cprng_exit,</div><div class='add'>+	.cra_u			= {</div><div class='add'>+		.rng = {</div><div class='add'>+			.rng_make_random	= cprng_get_random,</div><div class='add'>+			.rng_reset		= cprng_reset,</div><div class='add'>+			.seedsize = DEFAULT_PRNG_KSZ + DEFAULT_BLK_SZ,</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Module initalization */</div><div class='add'>+static int __init prng_mod_init(void)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (fips_enabled)</div><div class='add'>+		rng_alg.cra_priority += 200;</div><div class='add'>+</div><div class='add'>+	ret = crypto_register_alg(&amp;rng_alg);</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+out:</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit prng_mod_fini(void)</div><div class='add'>+{</div><div class='add'>+	crypto_unregister_alg(&amp;rng_alg);</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("Software Pseudo Random Number Generator");</div><div class='add'>+MODULE_AUTHOR("Neil Horman &lt;nhorman@tuxdriver.com&gt;");</div><div class='add'>+module_param(dbg, int, 0);</div><div class='add'>+MODULE_PARM_DESC(dbg, "Boolean to enable debugging (0/1 == off/on)");</div><div class='add'>+module_init(prng_mod_init);</div><div class='add'>+module_exit(prng_mod_fini);</div><div class='add'>+MODULE_ALIAS("stdrng");</div><div class='head'>diff --git a/crypto/api.c b/crypto/api.c<br/>index d06e33270abe..0444d242e985 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/crypto/api.c?id=c15895ef30c2c03e99802951787183039a349d32'>crypto/api.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/crypto/api.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>crypto/api.c</a></div><div class='hunk'>@@ -55,7 +55,13 @@ void crypto_mod_put(struct crypto_alg *alg)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(crypto_mod_put);</div><div class='ctx'> </div><div class='del'>-struct crypto_alg *__crypto_alg_lookup(const char *name, u32 type, u32 mask)</div><div class='add'>+static inline int crypto_is_test_larval(struct crypto_larval *larval)</div><div class='add'>+{</div><div class='add'>+	return larval-&gt;alg.cra_driver_name[0];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct crypto_alg *__crypto_alg_lookup(const char *name, u32 type,</div><div class='add'>+					      u32 mask)</div><div class='ctx'> {</div><div class='ctx'> 	struct crypto_alg *q, *alg = NULL;</div><div class='ctx'> 	int best = -2;</div><div class='hunk'>@@ -70,6 +76,7 @@ struct crypto_alg *__crypto_alg_lookup(const char *name, u32 type, u32 mask)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		if (crypto_is_larval(q) &amp;&amp;</div><div class='add'>+		    !crypto_is_test_larval((struct crypto_larval *)q) &amp;&amp;</div><div class='ctx'> 		    ((struct crypto_larval *)q)-&gt;mask != mask)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='hunk'>@@ -92,7 +99,6 @@ struct crypto_alg *__crypto_alg_lookup(const char *name, u32 type, u32 mask)</div><div class='ctx'> </div><div class='ctx'> 	return alg;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(__crypto_alg_lookup);</div><div class='ctx'> </div><div class='ctx'> static void crypto_larval_destroy(struct crypto_alg *alg)</div><div class='ctx'> {</div><div class='hunk'>@@ -104,10 +110,8 @@ static void crypto_larval_destroy(struct crypto_alg *alg)</div><div class='ctx'> 	kfree(larval);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct crypto_alg *crypto_larval_alloc(const char *name, u32 type,</div><div class='del'>-					      u32 mask)</div><div class='add'>+struct crypto_larval *crypto_larval_alloc(const char *name, u32 type, u32 mask)</div><div class='ctx'> {</div><div class='del'>-	struct crypto_alg *alg;</div><div class='ctx'> 	struct crypto_larval *larval;</div><div class='ctx'> </div><div class='ctx'> 	larval = kzalloc(sizeof(*larval), GFP_KERNEL);</div><div class='hunk'>@@ -119,10 +123,25 @@ static struct crypto_alg *crypto_larval_alloc(const char *name, u32 type,</div><div class='ctx'> 	larval-&gt;alg.cra_priority = -1;</div><div class='ctx'> 	larval-&gt;alg.cra_destroy = crypto_larval_destroy;</div><div class='ctx'> </div><div class='del'>-	atomic_set(&amp;larval-&gt;alg.cra_refcnt, 2);</div><div class='ctx'> 	strlcpy(larval-&gt;alg.cra_name, name, CRYPTO_MAX_ALG_NAME);</div><div class='ctx'> 	init_completion(&amp;larval-&gt;completion);</div><div class='ctx'> </div><div class='add'>+	return larval;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(crypto_larval_alloc);</div><div class='add'>+</div><div class='add'>+static struct crypto_alg *crypto_larval_add(const char *name, u32 type,</div><div class='add'>+					    u32 mask)</div><div class='add'>+{</div><div class='add'>+	struct crypto_alg *alg;</div><div class='add'>+	struct crypto_larval *larval;</div><div class='add'>+</div><div class='add'>+	larval = crypto_larval_alloc(name, type, mask);</div><div class='add'>+	if (IS_ERR(larval))</div><div class='add'>+		return ERR_CAST(larval);</div><div class='add'>+</div><div class='add'>+	atomic_set(&amp;larval-&gt;alg.cra_refcnt, 2);</div><div class='add'>+</div><div class='ctx'> 	down_write(&amp;crypto_alg_sem);</div><div class='ctx'> 	alg = __crypto_alg_lookup(name, type, mask);</div><div class='ctx'> 	if (!alg) {</div><div class='hunk'>@@ -152,21 +171,29 @@ EXPORT_SYMBOL_GPL(crypto_larval_kill);</div><div class='ctx'> static struct crypto_alg *crypto_larval_wait(struct crypto_alg *alg)</div><div class='ctx'> {</div><div class='ctx'> 	struct crypto_larval *larval = (void *)alg;</div><div class='add'>+	long timeout;</div><div class='add'>+</div><div class='add'>+	timeout = wait_for_completion_interruptible_timeout(</div><div class='add'>+		&amp;larval-&gt;completion, 60 * HZ);</div><div class='ctx'> </div><div class='del'>-	wait_for_completion_interruptible_timeout(&amp;larval-&gt;completion, 60 * HZ);</div><div class='ctx'> 	alg = larval-&gt;adult;</div><div class='del'>-	if (alg) {</div><div class='del'>-		if (!crypto_mod_get(alg))</div><div class='del'>-			alg = ERR_PTR(-EAGAIN);</div><div class='del'>-	} else</div><div class='add'>+	if (timeout &lt; 0)</div><div class='add'>+		alg = ERR_PTR(-EINTR);</div><div class='add'>+	else if (!timeout)</div><div class='add'>+		alg = ERR_PTR(-ETIMEDOUT);</div><div class='add'>+	else if (!alg)</div><div class='ctx'> 		alg = ERR_PTR(-ENOENT);</div><div class='add'>+	else if (crypto_is_test_larval(larval) &amp;&amp;</div><div class='add'>+		 !(alg-&gt;cra_flags &amp; CRYPTO_ALG_TESTED))</div><div class='add'>+		alg = ERR_PTR(-EAGAIN);</div><div class='add'>+	else if (!crypto_mod_get(alg))</div><div class='add'>+		alg = ERR_PTR(-EAGAIN);</div><div class='ctx'> 	crypto_mod_put(&amp;larval-&gt;alg);</div><div class='ctx'> </div><div class='ctx'> 	return alg;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct crypto_alg *crypto_alg_lookup(const char *name, u32 type,</div><div class='del'>-					    u32 mask)</div><div class='add'>+struct crypto_alg *crypto_alg_lookup(const char *name, u32 type, u32 mask)</div><div class='ctx'> {</div><div class='ctx'> 	struct crypto_alg *alg;</div><div class='ctx'> </div><div class='hunk'>@@ -176,6 +203,7 @@ static struct crypto_alg *crypto_alg_lookup(const char *name, u32 type,</div><div class='ctx'> </div><div class='ctx'> 	return alg;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(crypto_alg_lookup);</div><div class='ctx'> </div><div class='ctx'> struct crypto_alg *crypto_larval_lookup(const char *name, u32 type, u32 mask)</div><div class='ctx'> {</div><div class='hunk'>@@ -192,25 +220,40 @@ struct crypto_alg *crypto_larval_lookup(const char *name, u32 type, u32 mask)</div><div class='ctx'> 	if (alg)</div><div class='ctx'> 		return crypto_is_larval(alg) ? crypto_larval_wait(alg) : alg;</div><div class='ctx'> </div><div class='del'>-	return crypto_larval_alloc(name, type, mask);</div><div class='add'>+	return crypto_larval_add(name, type, mask);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(crypto_larval_lookup);</div><div class='ctx'> </div><div class='add'>+int crypto_probing_notify(unsigned long val, void *v)</div><div class='add'>+{</div><div class='add'>+	int ok;</div><div class='add'>+</div><div class='add'>+	ok = blocking_notifier_call_chain(&amp;crypto_chain, val, v);</div><div class='add'>+	if (ok == NOTIFY_DONE) {</div><div class='add'>+		request_module("cryptomgr");</div><div class='add'>+		ok = blocking_notifier_call_chain(&amp;crypto_chain, val, v);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ok;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(crypto_probing_notify);</div><div class='add'>+</div><div class='ctx'> struct crypto_alg *crypto_alg_mod_lookup(const char *name, u32 type, u32 mask)</div><div class='ctx'> {</div><div class='ctx'> 	struct crypto_alg *alg;</div><div class='ctx'> 	struct crypto_alg *larval;</div><div class='ctx'> 	int ok;</div><div class='ctx'> </div><div class='add'>+	if (!(mask &amp; CRYPTO_ALG_TESTED)) {</div><div class='add'>+		type |= CRYPTO_ALG_TESTED;</div><div class='add'>+		mask |= CRYPTO_ALG_TESTED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	larval = crypto_larval_lookup(name, type, mask);</div><div class='ctx'> 	if (IS_ERR(larval) || !crypto_is_larval(larval))</div><div class='ctx'> 		return larval;</div><div class='ctx'> </div><div class='del'>-	ok = crypto_notify(CRYPTO_MSG_ALG_REQUEST, larval);</div><div class='del'>-	if (ok == NOTIFY_DONE) {</div><div class='del'>-		request_module("cryptomgr");</div><div class='del'>-		ok = crypto_notify(CRYPTO_MSG_ALG_REQUEST, larval);</div><div class='del'>-	}</div><div class='add'>+	ok = crypto_probing_notify(CRYPTO_MSG_ALG_REQUEST, larval);</div><div class='ctx'> </div><div class='ctx'> 	if (ok == NOTIFY_STOP)</div><div class='ctx'> 		alg = crypto_larval_wait(larval);</div><div class='head'>diff --git a/crypto/blkcipher.c b/crypto/blkcipher.c<br/>index 185f955fb0d7..4a7e65c4df4d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/crypto/blkcipher.c?id=c15895ef30c2c03e99802951787183039a349d32'>crypto/blkcipher.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/crypto/blkcipher.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>crypto/blkcipher.c</a></div><div class='hunk'>@@ -696,34 +696,5 @@ void skcipher_geniv_exit(struct crypto_tfm *tfm)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(skcipher_geniv_exit);</div><div class='ctx'> </div><div class='del'>-static int __init blkcipher_module_init(void)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = chainiv_module_init();</div><div class='del'>-	if (err)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	err = eseqiv_module_init();</div><div class='del'>-	if (err)</div><div class='del'>-		goto eseqiv_err;</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	return err;</div><div class='del'>-</div><div class='del'>-eseqiv_err:</div><div class='del'>-	chainiv_module_exit();</div><div class='del'>-	goto out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit blkcipher_module_exit(void)</div><div class='del'>-{</div><div class='del'>-	eseqiv_module_exit();</div><div class='del'>-	chainiv_module_exit();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(blkcipher_module_init);</div><div class='del'>-module_exit(blkcipher_module_exit);</div><div class='del'>-</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_DESCRIPTION("Generic block chaining cipher type");</div><div class='head'>diff --git a/crypto/chainiv.c b/crypto/chainiv.c<br/>index 9affadee3287..7c37a497b860 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/crypto/chainiv.c?id=c15895ef30c2c03e99802951787183039a349d32'>crypto/chainiv.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/crypto/chainiv.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>crypto/chainiv.c</a></div><div class='hunk'>@@ -14,11 +14,11 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;crypto/internal/skcipher.h&gt;</div><div class='add'>+#include &lt;crypto/rng.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/random.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='hunk'>@@ -83,6 +83,7 @@ static int chainiv_givencrypt_first(struct skcipher_givcrypt_request *req)</div><div class='ctx'> {</div><div class='ctx'> 	struct crypto_ablkcipher *geniv = skcipher_givcrypt_reqtfm(req);</div><div class='ctx'> 	struct chainiv_ctx *ctx = crypto_ablkcipher_ctx(geniv);</div><div class='add'>+	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;ctx-&gt;lock);</div><div class='ctx'> 	if (crypto_ablkcipher_crt(geniv)-&gt;givencrypt !=</div><div class='hunk'>@@ -90,11 +91,15 @@ static int chainiv_givencrypt_first(struct skcipher_givcrypt_request *req)</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> </div><div class='ctx'> 	crypto_ablkcipher_crt(geniv)-&gt;givencrypt = chainiv_givencrypt;</div><div class='del'>-	get_random_bytes(ctx-&gt;iv, crypto_ablkcipher_ivsize(geniv));</div><div class='add'>+	err = crypto_rng_get_bytes(crypto_default_rng, ctx-&gt;iv,</div><div class='add'>+				   crypto_ablkcipher_ivsize(geniv));</div><div class='ctx'> </div><div class='ctx'> unlock:</div><div class='ctx'> 	spin_unlock_bh(&amp;ctx-&gt;lock);</div><div class='ctx'> </div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='ctx'> 	return chainiv_givencrypt(req);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -203,6 +208,7 @@ static int async_chainiv_givencrypt_first(struct skcipher_givcrypt_request *req)</div><div class='ctx'> {</div><div class='ctx'> 	struct crypto_ablkcipher *geniv = skcipher_givcrypt_reqtfm(req);</div><div class='ctx'> 	struct async_chainiv_ctx *ctx = crypto_ablkcipher_ctx(geniv);</div><div class='add'>+	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (test_and_set_bit(CHAINIV_STATE_INUSE, &amp;ctx-&gt;state))</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -212,11 +218,15 @@ static int async_chainiv_givencrypt_first(struct skcipher_givcrypt_request *req)</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> </div><div class='ctx'> 	crypto_ablkcipher_crt(geniv)-&gt;givencrypt = async_chainiv_givencrypt;</div><div class='del'>-	get_random_bytes(ctx-&gt;iv, crypto_ablkcipher_ivsize(geniv));</div><div class='add'>+	err = crypto_rng_get_bytes(crypto_default_rng, ctx-&gt;iv,</div><div class='add'>+				   crypto_ablkcipher_ivsize(geniv));</div><div class='ctx'> </div><div class='ctx'> unlock:</div><div class='ctx'> 	clear_bit(CHAINIV_STATE_INUSE, &amp;ctx-&gt;state);</div><div class='ctx'> </div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='ctx'> out:</div><div class='ctx'> 	return async_chainiv_givencrypt(req);</div><div class='ctx'> }</div><div class='hunk'>@@ -284,9 +294,13 @@ static struct crypto_instance *chainiv_alloc(struct rtattr **tb)</div><div class='ctx'> 	if (IS_ERR(algt))</div><div class='ctx'> 		return ERR_PTR(err);</div><div class='ctx'> </div><div class='add'>+	err = crypto_get_default_rng();</div><div class='add'>+	if (err)</div><div class='add'>+		return ERR_PTR(err);</div><div class='add'>+</div><div class='ctx'> 	inst = skcipher_geniv_alloc(&amp;chainiv_tmpl, tb, 0, 0);</div><div class='ctx'> 	if (IS_ERR(inst))</div><div class='del'>-		goto out;</div><div class='add'>+		goto put_rng;</div><div class='ctx'> </div><div class='ctx'> 	inst-&gt;alg.cra_ablkcipher.givencrypt = chainiv_givencrypt_first;</div><div class='ctx'> </div><div class='hunk'>@@ -311,21 +325,37 @@ static struct crypto_instance *chainiv_alloc(struct rtattr **tb)</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	return inst;</div><div class='add'>+</div><div class='add'>+put_rng:</div><div class='add'>+	crypto_put_default_rng();</div><div class='add'>+	goto out;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void chainiv_free(struct crypto_instance *inst)</div><div class='add'>+{</div><div class='add'>+	skcipher_geniv_free(inst);</div><div class='add'>+	crypto_put_default_rng();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct crypto_template chainiv_tmpl = {</div><div class='ctx'> 	.name = "chainiv",</div><div class='ctx'> 	.alloc = chainiv_alloc,</div><div class='del'>-	.free = skcipher_geniv_free,</div><div class='add'>+	.free = chainiv_free,</div><div class='ctx'> 	.module = THIS_MODULE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int __init chainiv_module_init(void)</div><div class='add'>+static int __init chainiv_module_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	return crypto_register_template(&amp;chainiv_tmpl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void chainiv_module_exit(void)</div><div class='add'>+static void chainiv_module_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	crypto_unregister_template(&amp;chainiv_tmpl);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+module_init(chainiv_module_init);</div><div class='add'>+module_exit(chainiv_module_exit);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("Chain IV Generator");</div><div class='head'>diff --git a/crypto/eseqiv.c b/crypto/eseqiv.c<br/>index 881d30910434..2a342c8e52b3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/crypto/eseqiv.c?id=c15895ef30c2c03e99802951787183039a349d32'>crypto/eseqiv.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/crypto/eseqiv.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>crypto/eseqiv.c</a></div><div class='hunk'>@@ -16,13 +16,13 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;crypto/internal/skcipher.h&gt;</div><div class='add'>+#include &lt;crypto/rng.h&gt;</div><div class='ctx'> #include &lt;crypto/scatterwalk.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/random.h&gt;</div><div class='ctx'> #include &lt;linux/scatterlist.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='hunk'>@@ -163,17 +163,22 @@ static int eseqiv_givencrypt_first(struct skcipher_givcrypt_request *req)</div><div class='ctx'> {</div><div class='ctx'> 	struct crypto_ablkcipher *geniv = skcipher_givcrypt_reqtfm(req);</div><div class='ctx'> 	struct eseqiv_ctx *ctx = crypto_ablkcipher_ctx(geniv);</div><div class='add'>+	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;ctx-&gt;lock);</div><div class='ctx'> 	if (crypto_ablkcipher_crt(geniv)-&gt;givencrypt != eseqiv_givencrypt_first)</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> </div><div class='ctx'> 	crypto_ablkcipher_crt(geniv)-&gt;givencrypt = eseqiv_givencrypt;</div><div class='del'>-	get_random_bytes(ctx-&gt;salt, crypto_ablkcipher_ivsize(geniv));</div><div class='add'>+	err = crypto_rng_get_bytes(crypto_default_rng, ctx-&gt;salt,</div><div class='add'>+				   crypto_ablkcipher_ivsize(geniv));</div><div class='ctx'> </div><div class='ctx'> unlock:</div><div class='ctx'> 	spin_unlock_bh(&amp;ctx-&gt;lock);</div><div class='ctx'> </div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='ctx'> 	return eseqiv_givencrypt(req);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -216,9 +221,13 @@ static struct crypto_instance *eseqiv_alloc(struct rtattr **tb)</div><div class='ctx'> 	struct crypto_instance *inst;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='add'>+	err = crypto_get_default_rng();</div><div class='add'>+	if (err)</div><div class='add'>+		return ERR_PTR(err);</div><div class='add'>+</div><div class='ctx'> 	inst = skcipher_geniv_alloc(&amp;eseqiv_tmpl, tb, 0, 0);</div><div class='ctx'> 	if (IS_ERR(inst))</div><div class='del'>-		goto out;</div><div class='add'>+		goto put_rng;</div><div class='ctx'> </div><div class='ctx'> 	err = -EINVAL;</div><div class='ctx'> 	if (inst-&gt;alg.cra_ablkcipher.ivsize != inst-&gt;alg.cra_blocksize)</div><div class='hunk'>@@ -238,22 +247,36 @@ out:</div><div class='ctx'> free_inst:</div><div class='ctx'> 	skcipher_geniv_free(inst);</div><div class='ctx'> 	inst = ERR_PTR(err);</div><div class='add'>+put_rng:</div><div class='add'>+	crypto_put_default_rng();</div><div class='ctx'> 	goto out;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void eseqiv_free(struct crypto_instance *inst)</div><div class='add'>+{</div><div class='add'>+	skcipher_geniv_free(inst);</div><div class='add'>+	crypto_put_default_rng();</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct crypto_template eseqiv_tmpl = {</div><div class='ctx'> 	.name = "eseqiv",</div><div class='ctx'> 	.alloc = eseqiv_alloc,</div><div class='del'>-	.free = skcipher_geniv_free,</div><div class='add'>+	.free = eseqiv_free,</div><div class='ctx'> 	.module = THIS_MODULE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int __init eseqiv_module_init(void)</div><div class='add'>+static int __init eseqiv_module_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	return crypto_register_template(&amp;eseqiv_tmpl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __exit eseqiv_module_exit(void)</div><div class='add'>+static void __exit eseqiv_module_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	crypto_unregister_template(&amp;eseqiv_tmpl);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+module_init(eseqiv_module_init);</div><div class='add'>+module_exit(eseqiv_module_exit);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("Encrypted Sequence Number IV Generator");</div><div class='head'>diff --git a/crypto/fips.c b/crypto/fips.c<br/>new file mode 100644<br/>index 000000000000..553970081c62<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/crypto/fips.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>crypto/fips.c</a></div><div class='hunk'>@@ -0,0 +1,27 @@</div><div class='add'>+/*</div><div class='add'>+ * FIPS 200 support.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2008 Neil Horman &lt;nhorman@tuxdriver.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms of the GNU General Public License as published by the Free</div><div class='add'>+ * Software Foundation; either version 2 of the License, or (at your option)</div><div class='add'>+ * any later version.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "internal.h"</div><div class='add'>+</div><div class='add'>+int fips_enabled;</div><div class='add'>+EXPORT_SYMBOL_GPL(fips_enabled);</div><div class='add'>+</div><div class='add'>+/* Process kernel command-line parameter at boot time. fips=0 or fips=1 */</div><div class='add'>+static int fips_enable(char *str)</div><div class='add'>+{</div><div class='add'>+	fips_enabled = !!simple_strtol(str, NULL, 0);</div><div class='add'>+	printk(KERN_INFO "fips mode: %s\n",</div><div class='add'>+		fips_enabled ? "enabled" : "disabled");</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__setup("fips=", fips_enable);</div><div class='head'>diff --git a/crypto/internal.h b/crypto/internal.h<br/>index 683fcb2d91f4..8ef72d76092e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/crypto/internal.h?id=c15895ef30c2c03e99802951787183039a349d32'>crypto/internal.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/crypto/internal.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>crypto/internal.h</a></div><div class='hunk'>@@ -26,6 +26,12 @@</div><div class='ctx'> #include &lt;linux/rwsem.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_CRYPTO_FIPS</div><div class='add'>+extern int fips_enabled;</div><div class='add'>+#else</div><div class='add'>+#define fips_enabled 0</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /* Crypto notification events. */</div><div class='ctx'> enum {</div><div class='ctx'> 	CRYPTO_MSG_ALG_REQUEST,</div><div class='hunk'>@@ -82,7 +88,7 @@ static inline unsigned int crypto_compress_ctxsize(struct crypto_alg *alg)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct crypto_alg *crypto_mod_get(struct crypto_alg *alg);</div><div class='del'>-struct crypto_alg *__crypto_alg_lookup(const char *name, u32 type, u32 mask);</div><div class='add'>+struct crypto_alg *crypto_alg_lookup(const char *name, u32 type, u32 mask);</div><div class='ctx'> struct crypto_alg *crypto_alg_mod_lookup(const char *name, u32 type, u32 mask);</div><div class='ctx'> </div><div class='ctx'> int crypto_init_digest_ops(struct crypto_tfm *tfm);</div><div class='hunk'>@@ -94,9 +100,11 @@ void crypto_exit_digest_ops(struct crypto_tfm *tfm);</div><div class='ctx'> void crypto_exit_cipher_ops(struct crypto_tfm *tfm);</div><div class='ctx'> void crypto_exit_compress_ops(struct crypto_tfm *tfm);</div><div class='ctx'> </div><div class='add'>+struct crypto_larval *crypto_larval_alloc(const char *name, u32 type, u32 mask);</div><div class='ctx'> void crypto_larval_kill(struct crypto_alg *alg);</div><div class='ctx'> struct crypto_alg *crypto_larval_lookup(const char *name, u32 type, u32 mask);</div><div class='ctx'> void crypto_larval_error(const char *name, u32 type, u32 mask);</div><div class='add'>+void crypto_alg_tested(const char *name, int err);</div><div class='ctx'> </div><div class='ctx'> void crypto_shoot_alg(struct crypto_alg *alg);</div><div class='ctx'> struct crypto_tfm *__crypto_alloc_tfm(struct crypto_alg *alg, u32 type,</div><div class='hunk'>@@ -107,6 +115,10 @@ int crypto_register_instance(struct crypto_template *tmpl,</div><div class='ctx'> </div><div class='ctx'> int crypto_register_notifier(struct notifier_block *nb);</div><div class='ctx'> int crypto_unregister_notifier(struct notifier_block *nb);</div><div class='add'>+int crypto_probing_notify(unsigned long val, void *v);</div><div class='add'>+</div><div class='add'>+int __init testmgr_init(void);</div><div class='add'>+void testmgr_exit(void);</div><div class='ctx'> </div><div class='ctx'> static inline void crypto_alg_put(struct crypto_alg *alg)</div><div class='ctx'> {</div><div class='hunk'>@@ -139,9 +151,9 @@ static inline int crypto_is_moribund(struct crypto_alg *alg)</div><div class='ctx'> 	return alg-&gt;cra_flags &amp; (CRYPTO_ALG_DEAD | CRYPTO_ALG_DYING);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int crypto_notify(unsigned long val, void *v)</div><div class='add'>+static inline void crypto_notify(unsigned long val, void *v)</div><div class='ctx'> {</div><div class='del'>-	return blocking_notifier_call_chain(&amp;crypto_chain, val, v);</div><div class='add'>+	blocking_notifier_call_chain(&amp;crypto_chain, val, v);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #endif	/* _CRYPTO_INTERNAL_H */</div><div class='head'>diff --git a/crypto/krng.c b/crypto/krng.c<br/>new file mode 100644<br/>index 000000000000..4328bb3430ed<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/crypto/krng.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>crypto/krng.c</a></div><div class='hunk'>@@ -0,0 +1,66 @@</div><div class='add'>+/*</div><div class='add'>+ * RNG implementation using standard kernel RNG.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2008 Herbert Xu &lt;herbert@gondor.apana.org.au&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms of the GNU General Public License as published by the</div><div class='add'>+ * Free Software Foundation; either version 2 of the License, or (at your</div><div class='add'>+ * any later version.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;crypto/internal/rng.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/random.h&gt;</div><div class='add'>+</div><div class='add'>+static int krng_get_random(struct crypto_rng *tfm, u8 *rdata, unsigned int dlen)</div><div class='add'>+{</div><div class='add'>+	get_random_bytes(rdata, dlen);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int krng_reset(struct crypto_rng *tfm, u8 *seed, unsigned int slen)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct crypto_alg krng_alg = {</div><div class='add'>+	.cra_name		= "stdrng",</div><div class='add'>+	.cra_driver_name	= "krng",</div><div class='add'>+	.cra_priority		= 200,</div><div class='add'>+	.cra_flags		= CRYPTO_ALG_TYPE_RNG,</div><div class='add'>+	.cra_ctxsize		= 0,</div><div class='add'>+	.cra_type		= &amp;crypto_rng_type,</div><div class='add'>+	.cra_module		= THIS_MODULE,</div><div class='add'>+	.cra_list		= LIST_HEAD_INIT(krng_alg.cra_list),</div><div class='add'>+	.cra_u			= {</div><div class='add'>+		.rng = {</div><div class='add'>+			.rng_make_random	= krng_get_random,</div><div class='add'>+			.rng_reset		= krng_reset,</div><div class='add'>+			.seedsize		= 0,</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Module initalization */</div><div class='add'>+static int __init krng_mod_init(void)</div><div class='add'>+{</div><div class='add'>+	return crypto_register_alg(&amp;krng_alg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit krng_mod_fini(void)</div><div class='add'>+{</div><div class='add'>+	crypto_unregister_alg(&amp;krng_alg);</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(krng_mod_init);</div><div class='add'>+module_exit(krng_mod_fini);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("Kernel Random Number Generator");</div><div class='add'>+MODULE_ALIAS("stdrng");</div><div class='head'>diff --git a/crypto/proc.c b/crypto/proc.c<br/>index 02ff5670c158..37a13d05636d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/crypto/proc.c?id=c15895ef30c2c03e99802951787183039a349d32'>crypto/proc.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/crypto/proc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>crypto/proc.c</a></div><div class='hunk'>@@ -19,8 +19,53 @@</div><div class='ctx'> #include &lt;linux/rwsem.h&gt;</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='add'>+#include &lt;linux/sysctl.h&gt;</div><div class='ctx'> #include "internal.h"</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_CRYPTO_FIPS</div><div class='add'>+static struct ctl_table crypto_sysctl_table[] = {</div><div class='add'>+	{</div><div class='add'>+		.ctl_name       = CTL_UNNUMBERED,</div><div class='add'>+		.procname       = "fips_enabled",</div><div class='add'>+		.data           = &amp;fips_enabled,</div><div class='add'>+		.maxlen         = sizeof(int),</div><div class='add'>+		.mode           = 0444,</div><div class='add'>+		.proc_handler   = &amp;proc_dointvec</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.ctl_name = 0,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct ctl_table crypto_dir_table[] = {</div><div class='add'>+	{</div><div class='add'>+		.ctl_name       = CTL_UNNUMBERED,</div><div class='add'>+		.procname       = "crypto",</div><div class='add'>+		.mode           = 0555,</div><div class='add'>+		.child          = crypto_sysctl_table</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.ctl_name = 0,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct ctl_table_header *crypto_sysctls;</div><div class='add'>+</div><div class='add'>+static void crypto_proc_fips_init(void)</div><div class='add'>+{</div><div class='add'>+	crypto_sysctls = register_sysctl_table(crypto_dir_table);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void crypto_proc_fips_exit(void)</div><div class='add'>+{</div><div class='add'>+	if (crypto_sysctls)</div><div class='add'>+		unregister_sysctl_table(crypto_sysctls);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+#define crypto_proc_fips_init()</div><div class='add'>+#define crypto_proc_fips_exit()</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static void *c_start(struct seq_file *m, loff_t *pos)</div><div class='ctx'> {</div><div class='ctx'> 	down_read(&amp;crypto_alg_sem);</div><div class='hunk'>@@ -46,8 +91,11 @@ static int c_show(struct seq_file *m, void *p)</div><div class='ctx'> 	seq_printf(m, "module       : %s\n", module_name(alg-&gt;cra_module));</div><div class='ctx'> 	seq_printf(m, "priority     : %d\n", alg-&gt;cra_priority);</div><div class='ctx'> 	seq_printf(m, "refcnt       : %d\n", atomic_read(&amp;alg-&gt;cra_refcnt));</div><div class='add'>+	seq_printf(m, "selftest     : %s\n",</div><div class='add'>+		   (alg-&gt;cra_flags &amp; CRYPTO_ALG_TESTED) ?</div><div class='add'>+		   "passed" : "unknown");</div><div class='ctx'> 	</div><div class='del'>-	switch (alg-&gt;cra_flags &amp; CRYPTO_ALG_TYPE_MASK) {</div><div class='add'>+	switch (alg-&gt;cra_flags &amp; (CRYPTO_ALG_TYPE_MASK | CRYPTO_ALG_LARVAL)) {</div><div class='ctx'> 	case CRYPTO_ALG_TYPE_CIPHER:</div><div class='ctx'> 		seq_printf(m, "type         : cipher\n");</div><div class='ctx'> 		seq_printf(m, "blocksize    : %u\n", alg-&gt;cra_blocksize);</div><div class='hunk'>@@ -67,7 +115,10 @@ static int c_show(struct seq_file *m, void *p)</div><div class='ctx'> 		seq_printf(m, "type         : compression\n");</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		if (alg-&gt;cra_type &amp;&amp; alg-&gt;cra_type-&gt;show)</div><div class='add'>+		if (alg-&gt;cra_flags &amp; CRYPTO_ALG_LARVAL) {</div><div class='add'>+			seq_printf(m, "type         : larval\n");</div><div class='add'>+			seq_printf(m, "flags        : 0x%x\n", alg-&gt;cra_flags);</div><div class='add'>+		} else if (alg-&gt;cra_type &amp;&amp; alg-&gt;cra_type-&gt;show)</div><div class='ctx'> 			alg-&gt;cra_type-&gt;show(m, alg);</div><div class='ctx'> 		else</div><div class='ctx'> 			seq_printf(m, "type         : unknown\n");</div><div class='hunk'>@@ -100,9 +151,11 @@ static const struct file_operations proc_crypto_ops = {</div><div class='ctx'> void __init crypto_init_proc(void)</div><div class='ctx'> {</div><div class='ctx'> 	proc_create("crypto", 0, NULL, &amp;proc_crypto_ops);</div><div class='add'>+	crypto_proc_fips_init();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __exit crypto_exit_proc(void)</div><div class='ctx'> {</div><div class='add'>+	crypto_proc_fips_exit();</div><div class='ctx'> 	remove_proc_entry("crypto", NULL);</div><div class='ctx'> }</div><div class='head'>diff --git a/crypto/rng.c b/crypto/rng.c<br/>new file mode 100644<br/>index 000000000000..6e94bc735578<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/crypto/rng.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>crypto/rng.c</a></div><div class='hunk'>@@ -0,0 +1,126 @@</div><div class='add'>+/*</div><div class='add'>+ * Cryptographic API.</div><div class='add'>+ *</div><div class='add'>+ * RNG operations.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2008 Neil Horman &lt;nhorman@tuxdriver.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms of the GNU General Public License as published by the Free</div><div class='add'>+ * Software Foundation; either version 2 of the License, or (at your option)</div><div class='add'>+ * any later version.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;asm/atomic.h&gt;</div><div class='add'>+#include &lt;crypto/internal/rng.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/random.h&gt;</div><div class='add'>+#include &lt;linux/seq_file.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+</div><div class='add'>+static DEFINE_MUTEX(crypto_default_rng_lock);</div><div class='add'>+struct crypto_rng *crypto_default_rng;</div><div class='add'>+EXPORT_SYMBOL_GPL(crypto_default_rng);</div><div class='add'>+static int crypto_default_rng_refcnt;</div><div class='add'>+</div><div class='add'>+static int rngapi_reset(struct crypto_rng *tfm, u8 *seed, unsigned int slen)</div><div class='add'>+{</div><div class='add'>+	u8 *buf = NULL;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!seed &amp;&amp; slen) {</div><div class='add'>+		buf = kmalloc(slen, GFP_KERNEL);</div><div class='add'>+		if (!buf)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		get_random_bytes(buf, slen);</div><div class='add'>+		seed = buf;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = crypto_rng_alg(tfm)-&gt;rng_reset(tfm, seed, slen);</div><div class='add'>+</div><div class='add'>+	kfree(buf);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int crypto_init_rng_ops(struct crypto_tfm *tfm, u32 type, u32 mask)</div><div class='add'>+{</div><div class='add'>+	struct rng_alg *alg = &amp;tfm-&gt;__crt_alg-&gt;cra_rng;</div><div class='add'>+	struct rng_tfm *ops = &amp;tfm-&gt;crt_rng;</div><div class='add'>+</div><div class='add'>+	ops-&gt;rng_gen_random = alg-&gt;rng_make_random;</div><div class='add'>+	ops-&gt;rng_reset = rngapi_reset;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void crypto_rng_show(struct seq_file *m, struct crypto_alg *alg)</div><div class='add'>+	__attribute__ ((unused));</div><div class='add'>+static void crypto_rng_show(struct seq_file *m, struct crypto_alg *alg)</div><div class='add'>+{</div><div class='add'>+	seq_printf(m, "type         : rng\n");</div><div class='add'>+	seq_printf(m, "seedsize     : %u\n", alg-&gt;cra_rng.seedsize);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int crypto_rng_ctxsize(struct crypto_alg *alg, u32 type,</div><div class='add'>+				       u32 mask)</div><div class='add'>+{</div><div class='add'>+	return alg-&gt;cra_ctxsize;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct crypto_type crypto_rng_type = {</div><div class='add'>+	.ctxsize = crypto_rng_ctxsize,</div><div class='add'>+	.init = crypto_init_rng_ops,</div><div class='add'>+#ifdef CONFIG_PROC_FS</div><div class='add'>+	.show = crypto_rng_show,</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+EXPORT_SYMBOL_GPL(crypto_rng_type);</div><div class='add'>+</div><div class='add'>+int crypto_get_default_rng(void)</div><div class='add'>+{</div><div class='add'>+	struct crypto_rng *rng;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;crypto_default_rng_lock);</div><div class='add'>+	if (!crypto_default_rng) {</div><div class='add'>+		rng = crypto_alloc_rng("stdrng", 0, 0);</div><div class='add'>+		err = PTR_ERR(rng);</div><div class='add'>+		if (IS_ERR(rng))</div><div class='add'>+			goto unlock;</div><div class='add'>+</div><div class='add'>+		err = crypto_rng_reset(rng, NULL, crypto_rng_seedsize(rng));</div><div class='add'>+		if (err) {</div><div class='add'>+			crypto_free_rng(rng);</div><div class='add'>+			goto unlock;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		crypto_default_rng = rng;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	crypto_default_rng_refcnt++;</div><div class='add'>+	err = 0;</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	mutex_unlock(&amp;crypto_default_rng_lock);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(crypto_get_default_rng);</div><div class='add'>+</div><div class='add'>+void crypto_put_default_rng(void)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;crypto_default_rng_lock);</div><div class='add'>+	if (!--crypto_default_rng_refcnt) {</div><div class='add'>+		crypto_free_rng(crypto_default_rng);</div><div class='add'>+		crypto_default_rng = NULL;</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;crypto_default_rng_lock);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(crypto_put_default_rng);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("Random Number Genertor");</div><div class='head'>diff --git a/crypto/seqiv.c b/crypto/seqiv.c<br/>index b903aab31577..5a013a8bf87a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/crypto/seqiv.c?id=c15895ef30c2c03e99802951787183039a349d32'>crypto/seqiv.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/crypto/seqiv.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>crypto/seqiv.c</a></div><div class='hunk'>@@ -15,11 +15,11 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;crypto/internal/aead.h&gt;</div><div class='ctx'> #include &lt;crypto/internal/skcipher.h&gt;</div><div class='add'>+#include &lt;crypto/rng.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/random.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -189,17 +189,22 @@ static int seqiv_givencrypt_first(struct skcipher_givcrypt_request *req)</div><div class='ctx'> {</div><div class='ctx'> 	struct crypto_ablkcipher *geniv = skcipher_givcrypt_reqtfm(req);</div><div class='ctx'> 	struct seqiv_ctx *ctx = crypto_ablkcipher_ctx(geniv);</div><div class='add'>+	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;ctx-&gt;lock);</div><div class='ctx'> 	if (crypto_ablkcipher_crt(geniv)-&gt;givencrypt != seqiv_givencrypt_first)</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> </div><div class='ctx'> 	crypto_ablkcipher_crt(geniv)-&gt;givencrypt = seqiv_givencrypt;</div><div class='del'>-	get_random_bytes(ctx-&gt;salt, crypto_ablkcipher_ivsize(geniv));</div><div class='add'>+	err = crypto_rng_get_bytes(crypto_default_rng, ctx-&gt;salt,</div><div class='add'>+				   crypto_ablkcipher_ivsize(geniv));</div><div class='ctx'> </div><div class='ctx'> unlock:</div><div class='ctx'> 	spin_unlock_bh(&amp;ctx-&gt;lock);</div><div class='ctx'> </div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='ctx'> 	return seqiv_givencrypt(req);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -207,17 +212,22 @@ static int seqiv_aead_givencrypt_first(struct aead_givcrypt_request *req)</div><div class='ctx'> {</div><div class='ctx'> 	struct crypto_aead *geniv = aead_givcrypt_reqtfm(req);</div><div class='ctx'> 	struct seqiv_ctx *ctx = crypto_aead_ctx(geniv);</div><div class='add'>+	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;ctx-&gt;lock);</div><div class='ctx'> 	if (crypto_aead_crt(geniv)-&gt;givencrypt != seqiv_aead_givencrypt_first)</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> </div><div class='ctx'> 	crypto_aead_crt(geniv)-&gt;givencrypt = seqiv_aead_givencrypt;</div><div class='del'>-	get_random_bytes(ctx-&gt;salt, crypto_aead_ivsize(geniv));</div><div class='add'>+	err = crypto_rng_get_bytes(crypto_default_rng, ctx-&gt;salt,</div><div class='add'>+				   crypto_aead_ivsize(geniv));</div><div class='ctx'> </div><div class='ctx'> unlock:</div><div class='ctx'> 	spin_unlock_bh(&amp;ctx-&gt;lock);</div><div class='ctx'> </div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='ctx'> 	return seqiv_aead_givencrypt(req);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -298,19 +308,27 @@ static struct crypto_instance *seqiv_alloc(struct rtattr **tb)</div><div class='ctx'> 	if (IS_ERR(algt))</div><div class='ctx'> 		return ERR_PTR(err);</div><div class='ctx'> </div><div class='add'>+	err = crypto_get_default_rng();</div><div class='add'>+	if (err)</div><div class='add'>+		return ERR_PTR(err);</div><div class='add'>+</div><div class='ctx'> 	if ((algt-&gt;type ^ CRYPTO_ALG_TYPE_AEAD) &amp; CRYPTO_ALG_TYPE_MASK)</div><div class='ctx'> 		inst = seqiv_ablkcipher_alloc(tb);</div><div class='ctx'> 	else</div><div class='ctx'> 		inst = seqiv_aead_alloc(tb);</div><div class='ctx'> </div><div class='ctx'> 	if (IS_ERR(inst))</div><div class='del'>-		goto out;</div><div class='add'>+		goto put_rng;</div><div class='ctx'> </div><div class='ctx'> 	inst-&gt;alg.cra_alignmask |= __alignof__(u32) - 1;</div><div class='ctx'> 	inst-&gt;alg.cra_ctxsize += sizeof(struct seqiv_ctx);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	return inst;</div><div class='add'>+</div><div class='add'>+put_rng:</div><div class='add'>+	crypto_put_default_rng();</div><div class='add'>+	goto out;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void seqiv_free(struct crypto_instance *inst)</div><div class='hunk'>@@ -319,6 +337,7 @@ static void seqiv_free(struct crypto_instance *inst)</div><div class='ctx'> 		skcipher_geniv_free(inst);</div><div class='ctx'> 	else</div><div class='ctx'> 		aead_geniv_free(inst);</div><div class='add'>+	crypto_put_default_rng();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct crypto_template seqiv_tmpl = {</div><div class='head'>diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c<br/>index 66368022e0bf..28a45a1e6f42 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/crypto/tcrypt.c?id=c15895ef30c2c03e99802951787183039a349d32'>crypto/tcrypt.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/crypto/tcrypt.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>crypto/tcrypt.c</a></div><div class='hunk'>@@ -19,11 +19,9 @@</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/scatterlist.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/crypto.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/jiffies.h&gt;</div><div class='ctx'> #include &lt;linux/timex.h&gt;</div><div class='hunk'>@@ -31,45 +29,23 @@</div><div class='ctx'> #include "tcrypt.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Need to kmalloc() memory for testing.</div><div class='add'>+ * Need slab memory for testing (size in number of pages).</div><div class='ctx'>  */</div><div class='del'>-#define TVMEMSIZE	16384</div><div class='del'>-#define XBUFSIZE	32768</div><div class='add'>+#define TVMEMSIZE	4</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Indexes into the xbuf to simulate cross-page access.</div><div class='del'>- */</div><div class='del'>-#define IDX1		32</div><div class='del'>-#define IDX2		32400</div><div class='del'>-#define IDX3		1</div><div class='del'>-#define IDX4		8193</div><div class='del'>-#define IDX5		22222</div><div class='del'>-#define IDX6		17101</div><div class='del'>-#define IDX7		27333</div><div class='del'>-#define IDX8		3000</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-* Used by test_cipher()</div><div class='add'>+* Used by test_cipher_speed()</div><div class='ctx'> */</div><div class='ctx'> #define ENCRYPT 1</div><div class='ctx'> #define DECRYPT 0</div><div class='ctx'> </div><div class='del'>-struct tcrypt_result {</div><div class='del'>-	struct completion completion;</div><div class='del'>-	int err;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned int IDX[8] = { IDX1, IDX2, IDX3, IDX4, IDX5, IDX6, IDX7, IDX8 };</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Used by test_cipher_speed()</div><div class='ctx'>  */</div><div class='ctx'> static unsigned int sec;</div><div class='ctx'> </div><div class='ctx'> static int mode;</div><div class='del'>-static char *xbuf;</div><div class='del'>-static char *axbuf;</div><div class='del'>-static char *tvmem;</div><div class='add'>+static char *tvmem[TVMEMSIZE];</div><div class='ctx'> </div><div class='ctx'> static char *check[] = {</div><div class='ctx'> 	"des", "md5", "des3_ede", "rot13", "sha1", "sha224", "sha256",</div><div class='hunk'>@@ -80,655 +56,13 @@ static char *check[] = {</div><div class='ctx'> 	"lzo", "cts", NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void hexdump(unsigned char *buf, unsigned int len)</div><div class='del'>-{</div><div class='del'>-	print_hex_dump(KERN_CONT, "", DUMP_PREFIX_OFFSET,</div><div class='del'>-			16, 1,</div><div class='del'>-			buf, len, false);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void tcrypt_complete(struct crypto_async_request *req, int err)</div><div class='del'>-{</div><div class='del'>-	struct tcrypt_result *res = req-&gt;data;</div><div class='del'>-</div><div class='del'>-	if (err == -EINPROGRESS)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	res-&gt;err = err;</div><div class='del'>-	complete(&amp;res-&gt;completion);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void test_hash(char *algo, struct hash_testvec *template,</div><div class='del'>-		      unsigned int tcount)</div><div class='del'>-{</div><div class='del'>-	unsigned int i, j, k, temp;</div><div class='del'>-	struct scatterlist sg[8];</div><div class='del'>-	char result[64];</div><div class='del'>-	struct crypto_ahash *tfm;</div><div class='del'>-	struct ahash_request *req;</div><div class='del'>-	struct tcrypt_result tresult;</div><div class='del'>-	int ret;</div><div class='del'>-	void *hash_buff;</div><div class='del'>-</div><div class='del'>-	printk("\ntesting %s\n", algo);</div><div class='del'>-</div><div class='del'>-	init_completion(&amp;tresult.completion);</div><div class='del'>-</div><div class='del'>-	tfm = crypto_alloc_ahash(algo, 0, 0);</div><div class='del'>-	if (IS_ERR(tfm)) {</div><div class='del'>-		printk("failed to load transform for %s: %ld\n", algo,</div><div class='del'>-		       PTR_ERR(tfm));</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	req = ahash_request_alloc(tfm, GFP_KERNEL);</div><div class='del'>-	if (!req) {</div><div class='del'>-		printk(KERN_ERR "failed to allocate request for %s\n", algo);</div><div class='del'>-		goto out_noreq;</div><div class='del'>-	}</div><div class='del'>-	ahash_request_set_callback(req, CRYPTO_TFM_REQ_MAY_BACKLOG,</div><div class='del'>-				   tcrypt_complete, &amp;tresult);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; tcount; i++) {</div><div class='del'>-		printk("test %u:\n", i + 1);</div><div class='del'>-		memset(result, 0, 64);</div><div class='del'>-</div><div class='del'>-		hash_buff = kzalloc(template[i].psize, GFP_KERNEL);</div><div class='del'>-		if (!hash_buff)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		memcpy(hash_buff, template[i].plaintext, template[i].psize);</div><div class='del'>-		sg_init_one(&amp;sg[0], hash_buff, template[i].psize);</div><div class='del'>-</div><div class='del'>-		if (template[i].ksize) {</div><div class='del'>-			crypto_ahash_clear_flags(tfm, ~0);</div><div class='del'>-			ret = crypto_ahash_setkey(tfm, template[i].key,</div><div class='del'>-						  template[i].ksize);</div><div class='del'>-			if (ret) {</div><div class='del'>-				printk("setkey() failed ret=%d\n", ret);</div><div class='del'>-				kfree(hash_buff);</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ahash_request_set_crypt(req, sg, result, template[i].psize);</div><div class='del'>-		ret = crypto_ahash_digest(req);</div><div class='del'>-		switch (ret) {</div><div class='del'>-		case 0:</div><div class='del'>-			break;</div><div class='del'>-		case -EINPROGRESS:</div><div class='del'>-		case -EBUSY:</div><div class='del'>-			ret = wait_for_completion_interruptible(</div><div class='del'>-				&amp;tresult.completion);</div><div class='del'>-			if (!ret &amp;&amp; !(ret = tresult.err)) {</div><div class='del'>-				INIT_COMPLETION(tresult.completion);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			/* fall through */</div><div class='del'>-		default:</div><div class='del'>-			printk("digest () failed ret=%d\n", ret);</div><div class='del'>-			kfree(hash_buff);</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		hexdump(result, crypto_ahash_digestsize(tfm));</div><div class='del'>-		printk("%s\n",</div><div class='del'>-		       memcmp(result, template[i].digest,</div><div class='del'>-			      crypto_ahash_digestsize(tfm)) ?</div><div class='del'>-		       "fail" : "pass");</div><div class='del'>-		kfree(hash_buff);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printk("testing %s across pages\n", algo);</div><div class='del'>-</div><div class='del'>-	/* setup the dummy buffer first */</div><div class='del'>-	memset(xbuf, 0, XBUFSIZE);</div><div class='del'>-</div><div class='del'>-	j = 0;</div><div class='del'>-	for (i = 0; i &lt; tcount; i++) {</div><div class='del'>-		if (template[i].np) {</div><div class='del'>-			j++;</div><div class='del'>-			printk("test %u:\n", j);</div><div class='del'>-			memset(result, 0, 64);</div><div class='del'>-</div><div class='del'>-			temp = 0;</div><div class='del'>-			sg_init_table(sg, template[i].np);</div><div class='del'>-			for (k = 0; k &lt; template[i].np; k++) {</div><div class='del'>-				memcpy(&amp;xbuf[IDX[k]],</div><div class='del'>-				       template[i].plaintext + temp,</div><div class='del'>-				       template[i].tap[k]);</div><div class='del'>-				temp += template[i].tap[k];</div><div class='del'>-				sg_set_buf(&amp;sg[k], &amp;xbuf[IDX[k]],</div><div class='del'>-					    template[i].tap[k]);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (template[i].ksize) {</div><div class='del'>-				crypto_ahash_clear_flags(tfm, ~0);</div><div class='del'>-				ret = crypto_ahash_setkey(tfm, template[i].key,</div><div class='del'>-							  template[i].ksize);</div><div class='del'>-</div><div class='del'>-				if (ret) {</div><div class='del'>-					printk("setkey() failed ret=%d\n", ret);</div><div class='del'>-					goto out;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			ahash_request_set_crypt(req, sg, result,</div><div class='del'>-						template[i].psize);</div><div class='del'>-			ret = crypto_ahash_digest(req);</div><div class='del'>-			switch (ret) {</div><div class='del'>-			case 0:</div><div class='del'>-				break;</div><div class='del'>-			case -EINPROGRESS:</div><div class='del'>-			case -EBUSY:</div><div class='del'>-				ret = wait_for_completion_interruptible(</div><div class='del'>-					&amp;tresult.completion);</div><div class='del'>-				if (!ret &amp;&amp; !(ret = tresult.err)) {</div><div class='del'>-					INIT_COMPLETION(tresult.completion);</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-				/* fall through */</div><div class='del'>-			default:</div><div class='del'>-				printk("digest () failed ret=%d\n", ret);</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			hexdump(result, crypto_ahash_digestsize(tfm));</div><div class='del'>-			printk("%s\n",</div><div class='del'>-			       memcmp(result, template[i].digest,</div><div class='del'>-				      crypto_ahash_digestsize(tfm)) ?</div><div class='del'>-			       "fail" : "pass");</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	ahash_request_free(req);</div><div class='del'>-out_noreq:</div><div class='del'>-	crypto_free_ahash(tfm);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void test_aead(char *algo, int enc, struct aead_testvec *template,</div><div class='del'>-		      unsigned int tcount)</div><div class='del'>-{</div><div class='del'>-	unsigned int ret, i, j, k, n, temp;</div><div class='del'>-	char *q;</div><div class='del'>-	struct crypto_aead *tfm;</div><div class='del'>-	char *key;</div><div class='del'>-	struct aead_request *req;</div><div class='del'>-	struct scatterlist sg[8];</div><div class='del'>-	struct scatterlist asg[8];</div><div class='del'>-	const char *e;</div><div class='del'>-	struct tcrypt_result result;</div><div class='del'>-	unsigned int authsize;</div><div class='del'>-	void *input;</div><div class='del'>-	void *assoc;</div><div class='del'>-	char iv[MAX_IVLEN];</div><div class='del'>-</div><div class='del'>-	if (enc == ENCRYPT)</div><div class='del'>-		e = "encryption";</div><div class='del'>-	else</div><div class='del'>-		e = "decryption";</div><div class='del'>-</div><div class='del'>-	printk(KERN_INFO "\ntesting %s %s\n", algo, e);</div><div class='del'>-</div><div class='del'>-	init_completion(&amp;result.completion);</div><div class='del'>-</div><div class='del'>-	tfm = crypto_alloc_aead(algo, 0, 0);</div><div class='del'>-</div><div class='del'>-	if (IS_ERR(tfm)) {</div><div class='del'>-		printk(KERN_INFO "failed to load transform for %s: %ld\n",</div><div class='del'>-		       algo, PTR_ERR(tfm));</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	req = aead_request_alloc(tfm, GFP_KERNEL);</div><div class='del'>-	if (!req) {</div><div class='del'>-		printk(KERN_INFO "failed to allocate request for %s\n", algo);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	aead_request_set_callback(req, CRYPTO_TFM_REQ_MAY_BACKLOG,</div><div class='del'>-				  tcrypt_complete, &amp;result);</div><div class='del'>-</div><div class='del'>-	for (i = 0, j = 0; i &lt; tcount; i++) {</div><div class='del'>-		if (!template[i].np) {</div><div class='del'>-			printk(KERN_INFO "test %u (%d bit key):\n",</div><div class='del'>-			       ++j, template[i].klen * 8);</div><div class='del'>-</div><div class='del'>-			/* some tepmplates have no input data but they will</div><div class='del'>-			 * touch input</div><div class='del'>-			 */</div><div class='del'>-			input = kzalloc(template[i].ilen + template[i].rlen, GFP_KERNEL);</div><div class='del'>-			if (!input)</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			assoc = kzalloc(template[i].alen, GFP_KERNEL);</div><div class='del'>-			if (!assoc) {</div><div class='del'>-				kfree(input);</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			memcpy(input, template[i].input, template[i].ilen);</div><div class='del'>-			memcpy(assoc, template[i].assoc, template[i].alen);</div><div class='del'>-			if (template[i].iv)</div><div class='del'>-				memcpy(iv, template[i].iv, MAX_IVLEN);</div><div class='del'>-			else</div><div class='del'>-				memset(iv, 0, MAX_IVLEN);</div><div class='del'>-</div><div class='del'>-			crypto_aead_clear_flags(tfm, ~0);</div><div class='del'>-			if (template[i].wk)</div><div class='del'>-				crypto_aead_set_flags(</div><div class='del'>-					tfm, CRYPTO_TFM_REQ_WEAK_KEY);</div><div class='del'>-</div><div class='del'>-			if (template[i].key)</div><div class='del'>-				key = template[i].key;</div><div class='del'>-			else</div><div class='del'>-				key = kzalloc(template[i].klen, GFP_KERNEL);</div><div class='del'>-</div><div class='del'>-			ret = crypto_aead_setkey(tfm, key,</div><div class='del'>-						 template[i].klen);</div><div class='del'>-			if (ret) {</div><div class='del'>-				printk(KERN_INFO "setkey() failed flags=%x\n",</div><div class='del'>-				       crypto_aead_get_flags(tfm));</div><div class='del'>-</div><div class='del'>-				if (!template[i].fail)</div><div class='del'>-					goto next_one;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			authsize = abs(template[i].rlen - template[i].ilen);</div><div class='del'>-			ret = crypto_aead_setauthsize(tfm, authsize);</div><div class='del'>-			if (ret) {</div><div class='del'>-				printk(KERN_INFO</div><div class='del'>-				       "failed to set authsize = %u\n",</div><div class='del'>-				       authsize);</div><div class='del'>-				goto next_one;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			sg_init_one(&amp;sg[0], input,</div><div class='del'>-				    template[i].ilen + (enc ? authsize : 0));</div><div class='del'>-</div><div class='del'>-			sg_init_one(&amp;asg[0], assoc, template[i].alen);</div><div class='del'>-</div><div class='del'>-			aead_request_set_crypt(req, sg, sg,</div><div class='del'>-					       template[i].ilen, iv);</div><div class='del'>-</div><div class='del'>-			aead_request_set_assoc(req, asg, template[i].alen);</div><div class='del'>-</div><div class='del'>-			ret = enc ?</div><div class='del'>-				crypto_aead_encrypt(req) :</div><div class='del'>-				crypto_aead_decrypt(req);</div><div class='del'>-</div><div class='del'>-			switch (ret) {</div><div class='del'>-			case 0:</div><div class='del'>-				break;</div><div class='del'>-			case -EINPROGRESS:</div><div class='del'>-			case -EBUSY:</div><div class='del'>-				ret = wait_for_completion_interruptible(</div><div class='del'>-					&amp;result.completion);</div><div class='del'>-				if (!ret &amp;&amp; !(ret = result.err)) {</div><div class='del'>-					INIT_COMPLETION(result.completion);</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-				/* fall through */</div><div class='del'>-			default:</div><div class='del'>-				printk(KERN_INFO "%s () failed err=%d\n",</div><div class='del'>-				       e, -ret);</div><div class='del'>-				goto next_one;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			q = input;</div><div class='del'>-			hexdump(q, template[i].rlen);</div><div class='del'>-</div><div class='del'>-			printk(KERN_INFO "enc/dec: %s\n",</div><div class='del'>-			       memcmp(q, template[i].result,</div><div class='del'>-				      template[i].rlen) ? "fail" : "pass");</div><div class='del'>-next_one:</div><div class='del'>-			if (!template[i].key)</div><div class='del'>-				kfree(key);</div><div class='del'>-			kfree(assoc);</div><div class='del'>-			kfree(input);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printk(KERN_INFO "\ntesting %s %s across pages (chunking)\n", algo, e);</div><div class='del'>-	memset(axbuf, 0, XBUFSIZE);</div><div class='del'>-</div><div class='del'>-	for (i = 0, j = 0; i &lt; tcount; i++) {</div><div class='del'>-		if (template[i].np) {</div><div class='del'>-			printk(KERN_INFO "test %u (%d bit key):\n",</div><div class='del'>-			       ++j, template[i].klen * 8);</div><div class='del'>-</div><div class='del'>-			if (template[i].iv)</div><div class='del'>-				memcpy(iv, template[i].iv, MAX_IVLEN);</div><div class='del'>-			else</div><div class='del'>-				memset(iv, 0, MAX_IVLEN);</div><div class='del'>-</div><div class='del'>-			crypto_aead_clear_flags(tfm, ~0);</div><div class='del'>-			if (template[i].wk)</div><div class='del'>-				crypto_aead_set_flags(</div><div class='del'>-					tfm, CRYPTO_TFM_REQ_WEAK_KEY);</div><div class='del'>-			key = template[i].key;</div><div class='del'>-</div><div class='del'>-			ret = crypto_aead_setkey(tfm, key, template[i].klen);</div><div class='del'>-			if (ret) {</div><div class='del'>-				printk(KERN_INFO "setkey() failed flags=%x\n",</div><div class='del'>-				       crypto_aead_get_flags(tfm));</div><div class='del'>-</div><div class='del'>-				if (!template[i].fail)</div><div class='del'>-					goto out;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			memset(xbuf, 0, XBUFSIZE);</div><div class='del'>-			sg_init_table(sg, template[i].np);</div><div class='del'>-			for (k = 0, temp = 0; k &lt; template[i].np; k++) {</div><div class='del'>-				memcpy(&amp;xbuf[IDX[k]],</div><div class='del'>-				       template[i].input + temp,</div><div class='del'>-				       template[i].tap[k]);</div><div class='del'>-				temp += template[i].tap[k];</div><div class='del'>-				sg_set_buf(&amp;sg[k], &amp;xbuf[IDX[k]],</div><div class='del'>-					   template[i].tap[k]);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			authsize = abs(template[i].rlen - template[i].ilen);</div><div class='del'>-			ret = crypto_aead_setauthsize(tfm, authsize);</div><div class='del'>-			if (ret) {</div><div class='del'>-				printk(KERN_INFO</div><div class='del'>-				       "failed to set authsize = %u\n",</div><div class='del'>-				       authsize);</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (enc)</div><div class='del'>-				sg[k - 1].length += authsize;</div><div class='del'>-</div><div class='del'>-			sg_init_table(asg, template[i].anp);</div><div class='del'>-			for (k = 0, temp = 0; k &lt; template[i].anp; k++) {</div><div class='del'>-				memcpy(&amp;axbuf[IDX[k]],</div><div class='del'>-				       template[i].assoc + temp,</div><div class='del'>-				       template[i].atap[k]);</div><div class='del'>-				temp += template[i].atap[k];</div><div class='del'>-				sg_set_buf(&amp;asg[k], &amp;axbuf[IDX[k]],</div><div class='del'>-					   template[i].atap[k]);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			aead_request_set_crypt(req, sg, sg,</div><div class='del'>-					       template[i].ilen,</div><div class='del'>-					       iv);</div><div class='del'>-</div><div class='del'>-			aead_request_set_assoc(req, asg, template[i].alen);</div><div class='del'>-</div><div class='del'>-			ret = enc ?</div><div class='del'>-				crypto_aead_encrypt(req) :</div><div class='del'>-				crypto_aead_decrypt(req);</div><div class='del'>-</div><div class='del'>-			switch (ret) {</div><div class='del'>-			case 0:</div><div class='del'>-				break;</div><div class='del'>-			case -EINPROGRESS:</div><div class='del'>-			case -EBUSY:</div><div class='del'>-				ret = wait_for_completion_interruptible(</div><div class='del'>-					&amp;result.completion);</div><div class='del'>-				if (!ret &amp;&amp; !(ret = result.err)) {</div><div class='del'>-					INIT_COMPLETION(result.completion);</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-				/* fall through */</div><div class='del'>-			default:</div><div class='del'>-				printk(KERN_INFO "%s () failed err=%d\n",</div><div class='del'>-				       e, -ret);</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			for (k = 0, temp = 0; k &lt; template[i].np; k++) {</div><div class='del'>-				printk(KERN_INFO "page %u\n", k);</div><div class='del'>-				q = &amp;xbuf[IDX[k]];</div><div class='del'>-</div><div class='del'>-				n = template[i].tap[k];</div><div class='del'>-				if (k == template[i].np - 1)</div><div class='del'>-					n += enc ? authsize : -authsize;</div><div class='del'>-				hexdump(q, n);</div><div class='del'>-				printk(KERN_INFO "%s\n",</div><div class='del'>-				       memcmp(q, template[i].result + temp, n) ?</div><div class='del'>-				       "fail" : "pass");</div><div class='del'>-</div><div class='del'>-				q += n;</div><div class='del'>-				if (k == template[i].np - 1 &amp;&amp; !enc) {</div><div class='del'>-					if (memcmp(q, template[i].input +</div><div class='del'>-						      temp + n, authsize))</div><div class='del'>-						n = authsize;</div><div class='del'>-					else</div><div class='del'>-						n = 0;</div><div class='del'>-				} else {</div><div class='del'>-					for (n = 0; q[n]; n++)</div><div class='del'>-						;</div><div class='del'>-				}</div><div class='del'>-				if (n) {</div><div class='del'>-					printk("Result buffer corruption %u "</div><div class='del'>-					       "bytes:\n", n);</div><div class='del'>-					hexdump(q, n);</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-				temp += template[i].tap[k];</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	crypto_free_aead(tfm);</div><div class='del'>-	aead_request_free(req);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void test_cipher(char *algo, int enc,</div><div class='del'>-			struct cipher_testvec *template, unsigned int tcount)</div><div class='add'>+static int test_cipher_jiffies(struct blkcipher_desc *desc, int enc,</div><div class='add'>+			       struct scatterlist *sg, int blen, int sec)</div><div class='ctx'> {</div><div class='del'>-	unsigned int ret, i, j, k, n, temp;</div><div class='del'>-	char *q;</div><div class='del'>-	struct crypto_ablkcipher *tfm;</div><div class='del'>-	struct ablkcipher_request *req;</div><div class='del'>-	struct scatterlist sg[8];</div><div class='del'>-	const char *e;</div><div class='del'>-	struct tcrypt_result result;</div><div class='del'>-	void *data;</div><div class='del'>-	char iv[MAX_IVLEN];</div><div class='del'>-</div><div class='del'>-	if (enc == ENCRYPT)</div><div class='del'>-	        e = "encryption";</div><div class='del'>-	else</div><div class='del'>-		e = "decryption";</div><div class='del'>-</div><div class='del'>-	printk("\ntesting %s %s\n", algo, e);</div><div class='del'>-</div><div class='del'>-	init_completion(&amp;result.completion);</div><div class='del'>-	tfm = crypto_alloc_ablkcipher(algo, 0, 0);</div><div class='del'>-</div><div class='del'>-	if (IS_ERR(tfm)) {</div><div class='del'>-		printk("failed to load transform for %s: %ld\n", algo,</div><div class='del'>-		       PTR_ERR(tfm));</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	req = ablkcipher_request_alloc(tfm, GFP_KERNEL);</div><div class='del'>-	if (!req) {</div><div class='del'>-		printk("failed to allocate request for %s\n", algo);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ablkcipher_request_set_callback(req, CRYPTO_TFM_REQ_MAY_BACKLOG,</div><div class='del'>-					tcrypt_complete, &amp;result);</div><div class='del'>-</div><div class='del'>-	j = 0;</div><div class='del'>-	for (i = 0; i &lt; tcount; i++) {</div><div class='del'>-</div><div class='del'>-		data = kzalloc(template[i].ilen, GFP_KERNEL);</div><div class='del'>-		if (!data)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		memcpy(data, template[i].input, template[i].ilen);</div><div class='del'>-		if (template[i].iv)</div><div class='del'>-			memcpy(iv, template[i].iv, MAX_IVLEN);</div><div class='del'>-		else</div><div class='del'>-			memset(iv, 0, MAX_IVLEN);</div><div class='del'>-</div><div class='del'>-		if (!(template[i].np)) {</div><div class='del'>-			j++;</div><div class='del'>-			printk("test %u (%d bit key):\n",</div><div class='del'>-			j, template[i].klen * 8);</div><div class='del'>-</div><div class='del'>-			crypto_ablkcipher_clear_flags(tfm, ~0);</div><div class='del'>-			if (template[i].wk)</div><div class='del'>-				crypto_ablkcipher_set_flags(</div><div class='del'>-					tfm, CRYPTO_TFM_REQ_WEAK_KEY);</div><div class='del'>-</div><div class='del'>-			ret = crypto_ablkcipher_setkey(tfm, template[i].key,</div><div class='del'>-						       template[i].klen);</div><div class='del'>-			if (ret) {</div><div class='del'>-				printk("setkey() failed flags=%x\n",</div><div class='del'>-				       crypto_ablkcipher_get_flags(tfm));</div><div class='del'>-</div><div class='del'>-				if (!template[i].fail) {</div><div class='del'>-					kfree(data);</div><div class='del'>-					goto out;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			sg_init_one(&amp;sg[0], data, template[i].ilen);</div><div class='del'>-</div><div class='del'>-			ablkcipher_request_set_crypt(req, sg, sg,</div><div class='del'>-						     template[i].ilen, iv);</div><div class='del'>-			ret = enc ?</div><div class='del'>-				crypto_ablkcipher_encrypt(req) :</div><div class='del'>-				crypto_ablkcipher_decrypt(req);</div><div class='del'>-</div><div class='del'>-			switch (ret) {</div><div class='del'>-			case 0:</div><div class='del'>-				break;</div><div class='del'>-			case -EINPROGRESS:</div><div class='del'>-			case -EBUSY:</div><div class='del'>-				ret = wait_for_completion_interruptible(</div><div class='del'>-					&amp;result.completion);</div><div class='del'>-				if (!ret &amp;&amp; !((ret = result.err))) {</div><div class='del'>-					INIT_COMPLETION(result.completion);</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-				/* fall through */</div><div class='del'>-			default:</div><div class='del'>-				printk("%s () failed err=%d\n", e, -ret);</div><div class='del'>-				kfree(data);</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			q = data;</div><div class='del'>-			hexdump(q, template[i].rlen);</div><div class='del'>-</div><div class='del'>-			printk("%s\n",</div><div class='del'>-			       memcmp(q, template[i].result,</div><div class='del'>-				      template[i].rlen) ? "fail" : "pass");</div><div class='del'>-		}</div><div class='del'>-		kfree(data);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printk("\ntesting %s %s across pages (chunking)\n", algo, e);</div><div class='del'>-</div><div class='del'>-	j = 0;</div><div class='del'>-	for (i = 0; i &lt; tcount; i++) {</div><div class='del'>-</div><div class='del'>-		if (template[i].iv)</div><div class='del'>-			memcpy(iv, template[i].iv, MAX_IVLEN);</div><div class='del'>-		else</div><div class='del'>-			memset(iv, 0, MAX_IVLEN);</div><div class='del'>-</div><div class='del'>-		if (template[i].np) {</div><div class='del'>-			j++;</div><div class='del'>-			printk("test %u (%d bit key):\n",</div><div class='del'>-			j, template[i].klen * 8);</div><div class='del'>-</div><div class='del'>-			memset(xbuf, 0, XBUFSIZE);</div><div class='del'>-			crypto_ablkcipher_clear_flags(tfm, ~0);</div><div class='del'>-			if (template[i].wk)</div><div class='del'>-				crypto_ablkcipher_set_flags(</div><div class='del'>-					tfm, CRYPTO_TFM_REQ_WEAK_KEY);</div><div class='del'>-</div><div class='del'>-			ret = crypto_ablkcipher_setkey(tfm, template[i].key,</div><div class='del'>-						       template[i].klen);</div><div class='del'>-			if (ret) {</div><div class='del'>-				printk("setkey() failed flags=%x\n",</div><div class='del'>-						crypto_ablkcipher_get_flags(tfm));</div><div class='del'>-</div><div class='del'>-				if (!template[i].fail)</div><div class='del'>-					goto out;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			temp = 0;</div><div class='del'>-			sg_init_table(sg, template[i].np);</div><div class='del'>-			for (k = 0; k &lt; template[i].np; k++) {</div><div class='del'>-				memcpy(&amp;xbuf[IDX[k]],</div><div class='del'>-						template[i].input + temp,</div><div class='del'>-						template[i].tap[k]);</div><div class='del'>-				temp += template[i].tap[k];</div><div class='del'>-				sg_set_buf(&amp;sg[k], &amp;xbuf[IDX[k]],</div><div class='del'>-						template[i].tap[k]);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			ablkcipher_request_set_crypt(req, sg, sg,</div><div class='del'>-					template[i].ilen, iv);</div><div class='del'>-</div><div class='del'>-			ret = enc ?</div><div class='del'>-				crypto_ablkcipher_encrypt(req) :</div><div class='del'>-				crypto_ablkcipher_decrypt(req);</div><div class='del'>-</div><div class='del'>-			switch (ret) {</div><div class='del'>-			case 0:</div><div class='del'>-				break;</div><div class='del'>-			case -EINPROGRESS:</div><div class='del'>-			case -EBUSY:</div><div class='del'>-				ret = wait_for_completion_interruptible(</div><div class='del'>-					&amp;result.completion);</div><div class='del'>-				if (!ret &amp;&amp; !((ret = result.err))) {</div><div class='del'>-					INIT_COMPLETION(result.completion);</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-				/* fall through */</div><div class='del'>-			default:</div><div class='del'>-				printk("%s () failed err=%d\n", e, -ret);</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			temp = 0;</div><div class='del'>-			for (k = 0; k &lt; template[i].np; k++) {</div><div class='del'>-				printk("page %u\n", k);</div><div class='del'>-				q = &amp;xbuf[IDX[k]];</div><div class='del'>-				hexdump(q, template[i].tap[k]);</div><div class='del'>-				printk("%s\n",</div><div class='del'>-					memcmp(q, template[i].result + temp,</div><div class='del'>-						template[i].tap[k]) ? "fail" :</div><div class='del'>-					"pass");</div><div class='del'>-</div><div class='del'>-				for (n = 0; q[template[i].tap[k] + n]; n++)</div><div class='del'>-					;</div><div class='del'>-				if (n) {</div><div class='del'>-					printk("Result buffer corruption %u "</div><div class='del'>-					       "bytes:\n", n);</div><div class='del'>-					hexdump(&amp;q[template[i].tap[k]], n);</div><div class='del'>-				}</div><div class='del'>-				temp += template[i].tap[k];</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	crypto_free_ablkcipher(tfm);</div><div class='del'>-	ablkcipher_request_free(req);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int test_cipher_jiffies(struct blkcipher_desc *desc, int enc, char *p,</div><div class='del'>-			       int blen, int sec)</div><div class='del'>-{</div><div class='del'>-	struct scatterlist sg[1];</div><div class='ctx'> 	unsigned long start, end;</div><div class='ctx'> 	int bcount;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	sg_init_one(sg, p, blen);</div><div class='del'>-</div><div class='ctx'> 	for (start = jiffies, end = start + sec * HZ, bcount = 0;</div><div class='ctx'> 	     time_before(jiffies, end); bcount++) {</div><div class='ctx'> 		if (enc)</div><div class='hunk'>@@ -745,16 +79,13 @@ static int test_cipher_jiffies(struct blkcipher_desc *desc, int enc, char *p,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int test_cipher_cycles(struct blkcipher_desc *desc, int enc, char *p,</div><div class='del'>-			      int blen)</div><div class='add'>+static int test_cipher_cycles(struct blkcipher_desc *desc, int enc,</div><div class='add'>+			      struct scatterlist *sg, int blen)</div><div class='ctx'> {</div><div class='del'>-	struct scatterlist sg[1];</div><div class='ctx'> 	unsigned long cycles = 0;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	sg_init_one(sg, p, blen);</div><div class='del'>-</div><div class='ctx'> 	local_bh_disable();</div><div class='ctx'> 	local_irq_disable();</div><div class='ctx'> </div><div class='hunk'>@@ -799,12 +130,12 @@ out:</div><div class='ctx'> </div><div class='ctx'> static u32 block_sizes[] = { 16, 64, 256, 1024, 8192, 0 };</div><div class='ctx'> </div><div class='del'>-static void test_cipher_speed(char *algo, int enc, unsigned int sec,</div><div class='del'>-			      struct cipher_testvec *template,</div><div class='add'>+static void test_cipher_speed(const char *algo, int enc, unsigned int sec,</div><div class='add'>+			      struct cipher_speed_template *template,</div><div class='ctx'> 			      unsigned int tcount, u8 *keysize)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int ret, i, j, iv_len;</div><div class='del'>-	unsigned char *key, *p, iv[128];</div><div class='add'>+	const char *key, iv[128];</div><div class='ctx'> 	struct crypto_blkcipher *tfm;</div><div class='ctx'> 	struct blkcipher_desc desc;</div><div class='ctx'> 	const char *e;</div><div class='hunk'>@@ -832,27 +163,28 @@ static void test_cipher_speed(char *algo, int enc, unsigned int sec,</div><div class='ctx'> </div><div class='ctx'> 		b_size = block_sizes;</div><div class='ctx'> 		do {</div><div class='add'>+			struct scatterlist sg[TVMEMSIZE];</div><div class='ctx'> </div><div class='del'>-			if ((*keysize + *b_size) &gt; TVMEMSIZE) {</div><div class='del'>-				printk("template (%u) too big for tvmem (%u)\n",</div><div class='del'>-						*keysize + *b_size, TVMEMSIZE);</div><div class='add'>+			if ((*keysize + *b_size) &gt; TVMEMSIZE * PAGE_SIZE) {</div><div class='add'>+				printk("template (%u) too big for "</div><div class='add'>+				       "tvmem (%lu)\n", *keysize + *b_size,</div><div class='add'>+				       TVMEMSIZE * PAGE_SIZE);</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			printk("test %u (%d bit key, %d byte blocks): ", i,</div><div class='ctx'> 					*keysize * 8, *b_size);</div><div class='ctx'> </div><div class='del'>-			memset(tvmem, 0xff, *keysize + *b_size);</div><div class='add'>+			memset(tvmem[0], 0xff, PAGE_SIZE);</div><div class='ctx'> </div><div class='ctx'> 			/* set key, plain text and IV */</div><div class='del'>-			key = (unsigned char *)tvmem;</div><div class='add'>+			key = tvmem[0];</div><div class='ctx'> 			for (j = 0; j &lt; tcount; j++) {</div><div class='ctx'> 				if (template[j].klen == *keysize) {</div><div class='ctx'> 					key = template[j].key;</div><div class='ctx'> 					break;</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='del'>-			p = (unsigned char *)tvmem + *keysize;</div><div class='ctx'> </div><div class='ctx'> 			ret = crypto_blkcipher_setkey(tfm, key, *keysize);</div><div class='ctx'> 			if (ret) {</div><div class='hunk'>@@ -861,6 +193,14 @@ static void test_cipher_speed(char *algo, int enc, unsigned int sec,</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='add'>+			sg_init_table(sg, TVMEMSIZE);</div><div class='add'>+			sg_set_buf(sg, tvmem[0] + *keysize,</div><div class='add'>+				   PAGE_SIZE - *keysize);</div><div class='add'>+			for (j = 1; j &lt; TVMEMSIZE; j++) {</div><div class='add'>+				sg_set_buf(sg + j, tvmem[j], PAGE_SIZE);</div><div class='add'>+				memset (tvmem[j], 0xff, PAGE_SIZE);</div><div class='add'>+			}</div><div class='add'>+</div><div class='ctx'> 			iv_len = crypto_blkcipher_ivsize(tfm);</div><div class='ctx'> 			if (iv_len) {</div><div class='ctx'> 				memset(&amp;iv, 0xff, iv_len);</div><div class='hunk'>@@ -868,9 +208,11 @@ static void test_cipher_speed(char *algo, int enc, unsigned int sec,</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			if (sec)</div><div class='del'>-				ret = test_cipher_jiffies(&amp;desc, enc, p, *b_size, sec);</div><div class='add'>+				ret = test_cipher_jiffies(&amp;desc, enc, sg,</div><div class='add'>+							  *b_size, sec);</div><div class='ctx'> 			else</div><div class='del'>-				ret = test_cipher_cycles(&amp;desc, enc, p, *b_size);</div><div class='add'>+				ret = test_cipher_cycles(&amp;desc, enc, sg,</div><div class='add'>+							 *b_size);</div><div class='ctx'> </div><div class='ctx'> 			if (ret) {</div><div class='ctx'> 				printk("%s() failed flags=%x\n", e, desc.flags);</div><div class='hunk'>@@ -886,19 +228,16 @@ out:</div><div class='ctx'> 	crypto_free_blkcipher(tfm);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int test_hash_jiffies_digest(struct hash_desc *desc, char *p, int blen,</div><div class='add'>+static int test_hash_jiffies_digest(struct hash_desc *desc,</div><div class='add'>+				    struct scatterlist *sg, int blen,</div><div class='ctx'> 				    char *out, int sec)</div><div class='ctx'> {</div><div class='del'>-	struct scatterlist sg[1];</div><div class='ctx'> 	unsigned long start, end;</div><div class='ctx'> 	int bcount;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	sg_init_table(sg, 1);</div><div class='del'>-</div><div class='ctx'> 	for (start = jiffies, end = start + sec * HZ, bcount = 0;</div><div class='ctx'> 	     time_before(jiffies, end); bcount++) {</div><div class='del'>-		sg_set_buf(sg, p, blen);</div><div class='ctx'> 		ret = crypto_hash_digest(desc, sg, blen, out);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='hunk'>@@ -910,18 +249,15 @@ static int test_hash_jiffies_digest(struct hash_desc *desc, char *p, int blen,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int test_hash_jiffies(struct hash_desc *desc, char *p, int blen,</div><div class='del'>-			     int plen, char *out, int sec)</div><div class='add'>+static int test_hash_jiffies(struct hash_desc *desc, struct scatterlist *sg,</div><div class='add'>+			     int blen, int plen, char *out, int sec)</div><div class='ctx'> {</div><div class='del'>-	struct scatterlist sg[1];</div><div class='ctx'> 	unsigned long start, end;</div><div class='ctx'> 	int bcount, pcount;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (plen == blen)</div><div class='del'>-		return test_hash_jiffies_digest(desc, p, blen, out, sec);</div><div class='del'>-</div><div class='del'>-	sg_init_table(sg, 1);</div><div class='add'>+		return test_hash_jiffies_digest(desc, sg, blen, out, sec);</div><div class='ctx'> </div><div class='ctx'> 	for (start = jiffies, end = start + sec * HZ, bcount = 0;</div><div class='ctx'> 	     time_before(jiffies, end); bcount++) {</div><div class='hunk'>@@ -929,7 +265,6 @@ static int test_hash_jiffies(struct hash_desc *desc, char *p, int blen,</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		for (pcount = 0; pcount &lt; blen; pcount += plen) {</div><div class='del'>-			sg_set_buf(sg, p + pcount, plen);</div><div class='ctx'> 			ret = crypto_hash_update(desc, sg, plen);</div><div class='ctx'> 			if (ret)</div><div class='ctx'> 				return ret;</div><div class='hunk'>@@ -946,22 +281,18 @@ static int test_hash_jiffies(struct hash_desc *desc, char *p, int blen,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int test_hash_cycles_digest(struct hash_desc *desc, char *p, int blen,</div><div class='del'>-				   char *out)</div><div class='add'>+static int test_hash_cycles_digest(struct hash_desc *desc,</div><div class='add'>+				   struct scatterlist *sg, int blen, char *out)</div><div class='ctx'> {</div><div class='del'>-	struct scatterlist sg[1];</div><div class='ctx'> 	unsigned long cycles = 0;</div><div class='ctx'> 	int i;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	sg_init_table(sg, 1);</div><div class='del'>-</div><div class='ctx'> 	local_bh_disable();</div><div class='ctx'> 	local_irq_disable();</div><div class='ctx'> </div><div class='ctx'> 	/* Warm-up run. */</div><div class='ctx'> 	for (i = 0; i &lt; 4; i++) {</div><div class='del'>-		sg_set_buf(sg, p, blen);</div><div class='ctx'> 		ret = crypto_hash_digest(desc, sg, blen, out);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto out;</div><div class='hunk'>@@ -973,7 +304,6 @@ static int test_hash_cycles_digest(struct hash_desc *desc, char *p, int blen,</div><div class='ctx'> </div><div class='ctx'> 		start = get_cycles();</div><div class='ctx'> </div><div class='del'>-		sg_set_buf(sg, p, blen);</div><div class='ctx'> 		ret = crypto_hash_digest(desc, sg, blen, out);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto out;</div><div class='hunk'>@@ -996,18 +326,15 @@ out:</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int test_hash_cycles(struct hash_desc *desc, char *p, int blen,</div><div class='del'>-			    int plen, char *out)</div><div class='add'>+static int test_hash_cycles(struct hash_desc *desc, struct scatterlist *sg,</div><div class='add'>+			    int blen, int plen, char *out)</div><div class='ctx'> {</div><div class='del'>-	struct scatterlist sg[1];</div><div class='ctx'> 	unsigned long cycles = 0;</div><div class='ctx'> 	int i, pcount;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (plen == blen)</div><div class='del'>-		return test_hash_cycles_digest(desc, p, blen, out);</div><div class='del'>-</div><div class='del'>-	sg_init_table(sg, 1);</div><div class='add'>+		return test_hash_cycles_digest(desc, sg, blen, out);</div><div class='ctx'> </div><div class='ctx'> 	local_bh_disable();</div><div class='ctx'> 	local_irq_disable();</div><div class='hunk'>@@ -1018,7 +345,6 @@ static int test_hash_cycles(struct hash_desc *desc, char *p, int blen,</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		for (pcount = 0; pcount &lt; blen; pcount += plen) {</div><div class='del'>-			sg_set_buf(sg, p + pcount, plen);</div><div class='ctx'> 			ret = crypto_hash_update(desc, sg, plen);</div><div class='ctx'> 			if (ret)</div><div class='ctx'> 				goto out;</div><div class='hunk'>@@ -1038,7 +364,6 @@ static int test_hash_cycles(struct hash_desc *desc, char *p, int blen,</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		for (pcount = 0; pcount &lt; blen; pcount += plen) {</div><div class='del'>-			sg_set_buf(sg, p + pcount, plen);</div><div class='ctx'> 			ret = crypto_hash_update(desc, sg, plen);</div><div class='ctx'> 			if (ret)</div><div class='ctx'> 				goto out;</div><div class='hunk'>@@ -1065,9 +390,10 @@ out:</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void test_hash_speed(char *algo, unsigned int sec,</div><div class='del'>-			      struct hash_speed *speed)</div><div class='add'>+static void test_hash_speed(const char *algo, unsigned int sec,</div><div class='add'>+			    struct hash_speed *speed)</div><div class='ctx'> {</div><div class='add'>+	struct scatterlist sg[TVMEMSIZE];</div><div class='ctx'> 	struct crypto_hash *tfm;</div><div class='ctx'> 	struct hash_desc desc;</div><div class='ctx'> 	char output[1024];</div><div class='hunk'>@@ -1093,23 +419,27 @@ static void test_hash_speed(char *algo, unsigned int sec,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	sg_init_table(sg, TVMEMSIZE);</div><div class='add'>+	for (i = 0; i &lt; TVMEMSIZE; i++) {</div><div class='add'>+		sg_set_buf(sg + i, tvmem[i], PAGE_SIZE);</div><div class='add'>+		memset(tvmem[i], 0xff, PAGE_SIZE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; speed[i].blen != 0; i++) {</div><div class='del'>-		if (speed[i].blen &gt; TVMEMSIZE) {</div><div class='del'>-			printk("template (%u) too big for tvmem (%u)\n",</div><div class='del'>-			       speed[i].blen, TVMEMSIZE);</div><div class='add'>+		if (speed[i].blen &gt; TVMEMSIZE * PAGE_SIZE) {</div><div class='add'>+			printk("template (%u) too big for tvmem (%lu)\n",</div><div class='add'>+			       speed[i].blen, TVMEMSIZE * PAGE_SIZE);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		printk("test%3u (%5u byte blocks,%5u bytes per update,%4u updates): ",</div><div class='ctx'> 		       i, speed[i].blen, speed[i].plen, speed[i].blen / speed[i].plen);</div><div class='ctx'> </div><div class='del'>-		memset(tvmem, 0xff, speed[i].blen);</div><div class='del'>-</div><div class='ctx'> 		if (sec)</div><div class='del'>-			ret = test_hash_jiffies(&amp;desc, tvmem, speed[i].blen,</div><div class='add'>+			ret = test_hash_jiffies(&amp;desc, sg, speed[i].blen,</div><div class='ctx'> 						speed[i].plen, output, sec);</div><div class='ctx'> 		else</div><div class='del'>-			ret = test_hash_cycles(&amp;desc, tvmem, speed[i].blen,</div><div class='add'>+			ret = test_hash_cycles(&amp;desc, sg, speed[i].blen,</div><div class='ctx'> 					       speed[i].plen, output);</div><div class='ctx'> </div><div class='ctx'> 		if (ret) {</div><div class='hunk'>@@ -1122,73 +452,6 @@ out:</div><div class='ctx'> 	crypto_free_hash(tfm);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void test_comp(char *algo, struct comp_testvec *ctemplate,</div><div class='del'>-		       struct comp_testvec *dtemplate, int ctcount, int dtcount)</div><div class='del'>-{</div><div class='del'>-	unsigned int i;</div><div class='del'>-	char result[COMP_BUF_SIZE];</div><div class='del'>-	struct crypto_comp *tfm;</div><div class='del'>-	unsigned int tsize;</div><div class='del'>-</div><div class='del'>-	printk("\ntesting %s compression\n", algo);</div><div class='del'>-</div><div class='del'>-	tfm = crypto_alloc_comp(algo, 0, CRYPTO_ALG_ASYNC);</div><div class='del'>-	if (IS_ERR(tfm)) {</div><div class='del'>-		printk("failed to load transform for %s\n", algo);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ctcount; i++) {</div><div class='del'>-		int ilen, ret, dlen = COMP_BUF_SIZE;</div><div class='del'>-</div><div class='del'>-		printk("test %u:\n", i + 1);</div><div class='del'>-		memset(result, 0, sizeof (result));</div><div class='del'>-</div><div class='del'>-		ilen = ctemplate[i].inlen;</div><div class='del'>-		ret = crypto_comp_compress(tfm, ctemplate[i].input,</div><div class='del'>-		                           ilen, result, &amp;dlen);</div><div class='del'>-		if (ret) {</div><div class='del'>-			printk("fail: ret=%d\n", ret);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		hexdump(result, dlen);</div><div class='del'>-		printk("%s (ratio %d:%d)\n",</div><div class='del'>-		       memcmp(result, ctemplate[i].output, dlen) ? "fail" : "pass",</div><div class='del'>-		       ilen, dlen);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printk("\ntesting %s decompression\n", algo);</div><div class='del'>-</div><div class='del'>-	tsize = sizeof(struct comp_testvec);</div><div class='del'>-	tsize *= dtcount;</div><div class='del'>-	if (tsize &gt; TVMEMSIZE) {</div><div class='del'>-		printk("template (%u) too big for tvmem (%u)\n", tsize,</div><div class='del'>-		       TVMEMSIZE);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; dtcount; i++) {</div><div class='del'>-		int ilen, ret, dlen = COMP_BUF_SIZE;</div><div class='del'>-</div><div class='del'>-		printk("test %u:\n", i + 1);</div><div class='del'>-		memset(result, 0, sizeof (result));</div><div class='del'>-</div><div class='del'>-		ilen = dtemplate[i].inlen;</div><div class='del'>-		ret = crypto_comp_decompress(tfm, dtemplate[i].input,</div><div class='del'>-		                             ilen, result, &amp;dlen);</div><div class='del'>-		if (ret) {</div><div class='del'>-			printk("fail: ret=%d\n", ret);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		hexdump(result, dlen);</div><div class='del'>-		printk("%s (ratio %d:%d)\n",</div><div class='del'>-		       memcmp(result, dtemplate[i].output, dlen) ? "fail" : "pass",</div><div class='del'>-		       ilen, dlen);</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	crypto_free_comp(tfm);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void test_available(void)</div><div class='ctx'> {</div><div class='ctx'> 	char **name = check;</div><div class='hunk'>@@ -1201,549 +464,237 @@ static void test_available(void)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void do_test(void)</div><div class='add'>+static inline int tcrypt_test(const char *alg)</div><div class='ctx'> {</div><div class='del'>-	switch (mode) {</div><div class='add'>+	return alg_test(alg, alg, 0, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void do_test(int m)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='add'>+	switch (m) {</div><div class='ctx'> 	case 0:</div><div class='del'>-		test_hash("md5", md5_tv_template, MD5_TEST_VECTORS);</div><div class='del'>-</div><div class='del'>-		test_hash("sha1", sha1_tv_template, SHA1_TEST_VECTORS);</div><div class='del'>-</div><div class='del'>-		//DES</div><div class='del'>-		test_cipher("ecb(des)", ENCRYPT, des_enc_tv_template,</div><div class='del'>-			    DES_ENC_TEST_VECTORS);</div><div class='del'>-		test_cipher("ecb(des)", DECRYPT, des_dec_tv_template,</div><div class='del'>-			    DES_DEC_TEST_VECTORS);</div><div class='del'>-		test_cipher("cbc(des)", ENCRYPT, des_cbc_enc_tv_template,</div><div class='del'>-			    DES_CBC_ENC_TEST_VECTORS);</div><div class='del'>-		test_cipher("cbc(des)", DECRYPT, des_cbc_dec_tv_template,</div><div class='del'>-			    DES_CBC_DEC_TEST_VECTORS);</div><div class='del'>-</div><div class='del'>-		//DES3_EDE</div><div class='del'>-		test_cipher("ecb(des3_ede)", ENCRYPT, des3_ede_enc_tv_template,</div><div class='del'>-			    DES3_EDE_ENC_TEST_VECTORS);</div><div class='del'>-		test_cipher("ecb(des3_ede)", DECRYPT, des3_ede_dec_tv_template,</div><div class='del'>-			    DES3_EDE_DEC_TEST_VECTORS);</div><div class='del'>-</div><div class='del'>-		test_cipher("cbc(des3_ede)", ENCRYPT,</div><div class='del'>-			    des3_ede_cbc_enc_tv_template,</div><div class='del'>-			    DES3_EDE_CBC_ENC_TEST_VECTORS);</div><div class='del'>-</div><div class='del'>-		test_cipher("cbc(des3_ede)", DECRYPT,</div><div class='del'>-			    des3_ede_cbc_dec_tv_template,</div><div class='del'>-			    DES3_EDE_CBC_DEC_TEST_VECTORS);</div><div class='del'>-</div><div class='del'>-		test_hash("md4", md4_tv_template, MD4_TEST_VECTORS);</div><div class='del'>-</div><div class='del'>-		test_hash("sha224", sha224_tv_template, SHA224_TEST_VECTORS);</div><div class='del'>-</div><div class='del'>-		test_hash("sha256", sha256_tv_template, SHA256_TEST_VECTORS);</div><div class='del'>-</div><div class='del'>-		//BLOWFISH</div><div class='del'>-		test_cipher("ecb(blowfish)", ENCRYPT, bf_enc_tv_template,</div><div class='del'>-			    BF_ENC_TEST_VECTORS);</div><div class='del'>-		test_cipher("ecb(blowfish)", DECRYPT, bf_dec_tv_template,</div><div class='del'>-			    BF_DEC_TEST_VECTORS);</div><div class='del'>-		test_cipher("cbc(blowfish)", ENCRYPT, bf_cbc_enc_tv_template,</div><div class='del'>-			    BF_CBC_ENC_TEST_VECTORS);</div><div class='del'>-		test_cipher("cbc(blowfish)", DECRYPT, bf_cbc_dec_tv_template,</div><div class='del'>-			    BF_CBC_DEC_TEST_VECTORS);</div><div class='del'>-</div><div class='del'>-		//TWOFISH</div><div class='del'>-		test_cipher("ecb(twofish)", ENCRYPT, tf_enc_tv_template,</div><div class='del'>-			    TF_ENC_TEST_VECTORS);</div><div class='del'>-		test_cipher("ecb(twofish)", DECRYPT, tf_dec_tv_template,</div><div class='del'>-			    TF_DEC_TEST_VECTORS);</div><div class='del'>-		test_cipher("cbc(twofish)", ENCRYPT, tf_cbc_enc_tv_template,</div><div class='del'>-			    TF_CBC_ENC_TEST_VECTORS);</div><div class='del'>-		test_cipher("cbc(twofish)", DECRYPT, tf_cbc_dec_tv_template,</div><div class='del'>-			    TF_CBC_DEC_TEST_VECTORS);</div><div class='del'>-</div><div class='del'>-		//SERPENT</div><div class='del'>-		test_cipher("ecb(serpent)", ENCRYPT, serpent_enc_tv_template,</div><div class='del'>-			    SERPENT_ENC_TEST_VECTORS);</div><div class='del'>-		test_cipher("ecb(serpent)", DECRYPT, serpent_dec_tv_template,</div><div class='del'>-			    SERPENT_DEC_TEST_VECTORS);</div><div class='del'>-</div><div class='del'>-		//TNEPRES</div><div class='del'>-		test_cipher("ecb(tnepres)", ENCRYPT, tnepres_enc_tv_template,</div><div class='del'>-			    TNEPRES_ENC_TEST_VECTORS);</div><div class='del'>-		test_cipher("ecb(tnepres)", DECRYPT, tnepres_dec_tv_template,</div><div class='del'>-			    TNEPRES_DEC_TEST_VECTORS);</div><div class='del'>-</div><div class='del'>-		//AES</div><div class='del'>-		test_cipher("ecb(aes)", ENCRYPT, aes_enc_tv_template,</div><div class='del'>-			    AES_ENC_TEST_VECTORS);</div><div class='del'>-		test_cipher("ecb(aes)", DECRYPT, aes_dec_tv_template,</div><div class='del'>-			    AES_DEC_TEST_VECTORS);</div><div class='del'>-		test_cipher("cbc(aes)", ENCRYPT, aes_cbc_enc_tv_template,</div><div class='del'>-			    AES_CBC_ENC_TEST_VECTORS);</div><div class='del'>-		test_cipher("cbc(aes)", DECRYPT, aes_cbc_dec_tv_template,</div><div class='del'>-			    AES_CBC_DEC_TEST_VECTORS);</div><div class='del'>-		test_cipher("lrw(aes)", ENCRYPT, aes_lrw_enc_tv_template,</div><div class='del'>-			    AES_LRW_ENC_TEST_VECTORS);</div><div class='del'>-		test_cipher("lrw(aes)", DECRYPT, aes_lrw_dec_tv_template,</div><div class='del'>-			    AES_LRW_DEC_TEST_VECTORS);</div><div class='del'>-		test_cipher("xts(aes)", ENCRYPT, aes_xts_enc_tv_template,</div><div class='del'>-			    AES_XTS_ENC_TEST_VECTORS);</div><div class='del'>-		test_cipher("xts(aes)", DECRYPT, aes_xts_dec_tv_template,</div><div class='del'>-			    AES_XTS_DEC_TEST_VECTORS);</div><div class='del'>-		test_cipher("rfc3686(ctr(aes))", ENCRYPT, aes_ctr_enc_tv_template,</div><div class='del'>-			    AES_CTR_ENC_TEST_VECTORS);</div><div class='del'>-		test_cipher("rfc3686(ctr(aes))", DECRYPT, aes_ctr_dec_tv_template,</div><div class='del'>-			    AES_CTR_DEC_TEST_VECTORS);</div><div class='del'>-		test_aead("gcm(aes)", ENCRYPT, aes_gcm_enc_tv_template,</div><div class='del'>-			  AES_GCM_ENC_TEST_VECTORS);</div><div class='del'>-		test_aead("gcm(aes)", DECRYPT, aes_gcm_dec_tv_template,</div><div class='del'>-			  AES_GCM_DEC_TEST_VECTORS);</div><div class='del'>-		test_aead("ccm(aes)", ENCRYPT, aes_ccm_enc_tv_template,</div><div class='del'>-			  AES_CCM_ENC_TEST_VECTORS);</div><div class='del'>-		test_aead("ccm(aes)", DECRYPT, aes_ccm_dec_tv_template,</div><div class='del'>-			  AES_CCM_DEC_TEST_VECTORS);</div><div class='del'>-</div><div class='del'>-		//CAST5</div><div class='del'>-		test_cipher("ecb(cast5)", ENCRYPT, cast5_enc_tv_template,</div><div class='del'>-			    CAST5_ENC_TEST_VECTORS);</div><div class='del'>-		test_cipher("ecb(cast5)", DECRYPT, cast5_dec_tv_template,</div><div class='del'>-			    CAST5_DEC_TEST_VECTORS);</div><div class='del'>-</div><div class='del'>-		//CAST6</div><div class='del'>-		test_cipher("ecb(cast6)", ENCRYPT, cast6_enc_tv_template,</div><div class='del'>-			    CAST6_ENC_TEST_VECTORS);</div><div class='del'>-		test_cipher("ecb(cast6)", DECRYPT, cast6_dec_tv_template,</div><div class='del'>-			    CAST6_DEC_TEST_VECTORS);</div><div class='del'>-</div><div class='del'>-		//ARC4</div><div class='del'>-		test_cipher("ecb(arc4)", ENCRYPT, arc4_enc_tv_template,</div><div class='del'>-			    ARC4_ENC_TEST_VECTORS);</div><div class='del'>-		test_cipher("ecb(arc4)", DECRYPT, arc4_dec_tv_template,</div><div class='del'>-			    ARC4_DEC_TEST_VECTORS);</div><div class='del'>-</div><div class='del'>-		//TEA</div><div class='del'>-		test_cipher("ecb(tea)", ENCRYPT, tea_enc_tv_template,</div><div class='del'>-			    TEA_ENC_TEST_VECTORS);</div><div class='del'>-		test_cipher("ecb(tea)", DECRYPT, tea_dec_tv_template,</div><div class='del'>-			    TEA_DEC_TEST_VECTORS);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-		//XTEA</div><div class='del'>-		test_cipher("ecb(xtea)", ENCRYPT, xtea_enc_tv_template,</div><div class='del'>-			    XTEA_ENC_TEST_VECTORS);</div><div class='del'>-		test_cipher("ecb(xtea)", DECRYPT, xtea_dec_tv_template,</div><div class='del'>-			    XTEA_DEC_TEST_VECTORS);</div><div class='del'>-</div><div class='del'>-		//KHAZAD</div><div class='del'>-		test_cipher("ecb(khazad)", ENCRYPT, khazad_enc_tv_template,</div><div class='del'>-			    KHAZAD_ENC_TEST_VECTORS);</div><div class='del'>-		test_cipher("ecb(khazad)", DECRYPT, khazad_dec_tv_template,</div><div class='del'>-			    KHAZAD_DEC_TEST_VECTORS);</div><div class='del'>-</div><div class='del'>-		//ANUBIS</div><div class='del'>-		test_cipher("ecb(anubis)", ENCRYPT, anubis_enc_tv_template,</div><div class='del'>-			    ANUBIS_ENC_TEST_VECTORS);</div><div class='del'>-		test_cipher("ecb(anubis)", DECRYPT, anubis_dec_tv_template,</div><div class='del'>-			    ANUBIS_DEC_TEST_VECTORS);</div><div class='del'>-		test_cipher("cbc(anubis)", ENCRYPT, anubis_cbc_enc_tv_template,</div><div class='del'>-			    ANUBIS_CBC_ENC_TEST_VECTORS);</div><div class='del'>-		test_cipher("cbc(anubis)", DECRYPT, anubis_cbc_dec_tv_template,</div><div class='del'>-			    ANUBIS_CBC_ENC_TEST_VECTORS);</div><div class='del'>-</div><div class='del'>-		//XETA</div><div class='del'>-		test_cipher("ecb(xeta)", ENCRYPT, xeta_enc_tv_template,</div><div class='del'>-			    XETA_ENC_TEST_VECTORS);</div><div class='del'>-		test_cipher("ecb(xeta)", DECRYPT, xeta_dec_tv_template,</div><div class='del'>-			    XETA_DEC_TEST_VECTORS);</div><div class='del'>-</div><div class='del'>-		//FCrypt</div><div class='del'>-		test_cipher("pcbc(fcrypt)", ENCRYPT, fcrypt_pcbc_enc_tv_template,</div><div class='del'>-			    FCRYPT_ENC_TEST_VECTORS);</div><div class='del'>-		test_cipher("pcbc(fcrypt)", DECRYPT, fcrypt_pcbc_dec_tv_template,</div><div class='del'>-			    FCRYPT_DEC_TEST_VECTORS);</div><div class='del'>-</div><div class='del'>-		//CAMELLIA</div><div class='del'>-		test_cipher("ecb(camellia)", ENCRYPT,</div><div class='del'>-			    camellia_enc_tv_template,</div><div class='del'>-			    CAMELLIA_ENC_TEST_VECTORS);</div><div class='del'>-		test_cipher("ecb(camellia)", DECRYPT,</div><div class='del'>-			    camellia_dec_tv_template,</div><div class='del'>-			    CAMELLIA_DEC_TEST_VECTORS);</div><div class='del'>-		test_cipher("cbc(camellia)", ENCRYPT,</div><div class='del'>-			    camellia_cbc_enc_tv_template,</div><div class='del'>-			    CAMELLIA_CBC_ENC_TEST_VECTORS);</div><div class='del'>-		test_cipher("cbc(camellia)", DECRYPT,</div><div class='del'>-			    camellia_cbc_dec_tv_template,</div><div class='del'>-			    CAMELLIA_CBC_DEC_TEST_VECTORS);</div><div class='del'>-</div><div class='del'>-		//SEED</div><div class='del'>-		test_cipher("ecb(seed)", ENCRYPT, seed_enc_tv_template,</div><div class='del'>-			    SEED_ENC_TEST_VECTORS);</div><div class='del'>-		test_cipher("ecb(seed)", DECRYPT, seed_dec_tv_template,</div><div class='del'>-			    SEED_DEC_TEST_VECTORS);</div><div class='del'>-</div><div class='del'>-		//CTS</div><div class='del'>-		test_cipher("cts(cbc(aes))", ENCRYPT, cts_mode_enc_tv_template,</div><div class='del'>-			    CTS_MODE_ENC_TEST_VECTORS);</div><div class='del'>-		test_cipher("cts(cbc(aes))", DECRYPT, cts_mode_dec_tv_template,</div><div class='del'>-			    CTS_MODE_DEC_TEST_VECTORS);</div><div class='del'>-</div><div class='del'>-		test_hash("sha384", sha384_tv_template, SHA384_TEST_VECTORS);</div><div class='del'>-		test_hash("sha512", sha512_tv_template, SHA512_TEST_VECTORS);</div><div class='del'>-		test_hash("wp512", wp512_tv_template, WP512_TEST_VECTORS);</div><div class='del'>-		test_hash("wp384", wp384_tv_template, WP384_TEST_VECTORS);</div><div class='del'>-		test_hash("wp256", wp256_tv_template, WP256_TEST_VECTORS);</div><div class='del'>-		test_hash("tgr192", tgr192_tv_template, TGR192_TEST_VECTORS);</div><div class='del'>-		test_hash("tgr160", tgr160_tv_template, TGR160_TEST_VECTORS);</div><div class='del'>-		test_hash("tgr128", tgr128_tv_template, TGR128_TEST_VECTORS);</div><div class='del'>-		test_comp("deflate", deflate_comp_tv_template,</div><div class='del'>-			  deflate_decomp_tv_template, DEFLATE_COMP_TEST_VECTORS,</div><div class='del'>-			  DEFLATE_DECOMP_TEST_VECTORS);</div><div class='del'>-		test_comp("lzo", lzo_comp_tv_template, lzo_decomp_tv_template,</div><div class='del'>-			  LZO_COMP_TEST_VECTORS, LZO_DECOMP_TEST_VECTORS);</div><div class='del'>-		test_hash("crc32c", crc32c_tv_template, CRC32C_TEST_VECTORS);</div><div class='del'>-		test_hash("hmac(md5)", hmac_md5_tv_template,</div><div class='del'>-			  HMAC_MD5_TEST_VECTORS);</div><div class='del'>-		test_hash("hmac(sha1)", hmac_sha1_tv_template,</div><div class='del'>-			  HMAC_SHA1_TEST_VECTORS);</div><div class='del'>-		test_hash("hmac(sha224)", hmac_sha224_tv_template,</div><div class='del'>-			  HMAC_SHA224_TEST_VECTORS);</div><div class='del'>-		test_hash("hmac(sha256)", hmac_sha256_tv_template,</div><div class='del'>-			  HMAC_SHA256_TEST_VECTORS);</div><div class='del'>-		test_hash("hmac(sha384)", hmac_sha384_tv_template,</div><div class='del'>-			  HMAC_SHA384_TEST_VECTORS);</div><div class='del'>-		test_hash("hmac(sha512)", hmac_sha512_tv_template,</div><div class='del'>-			  HMAC_SHA512_TEST_VECTORS);</div><div class='del'>-</div><div class='del'>-		test_hash("xcbc(aes)", aes_xcbc128_tv_template,</div><div class='del'>-			  XCBC_AES_TEST_VECTORS);</div><div class='del'>-</div><div class='del'>-		test_hash("michael_mic", michael_mic_tv_template, MICHAEL_MIC_TEST_VECTORS);</div><div class='add'>+		for (i = 1; i &lt; 200; i++)</div><div class='add'>+			do_test(i);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case 1:</div><div class='del'>-		test_hash("md5", md5_tv_template, MD5_TEST_VECTORS);</div><div class='add'>+		tcrypt_test("md5");</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case 2:</div><div class='del'>-		test_hash("sha1", sha1_tv_template, SHA1_TEST_VECTORS);</div><div class='add'>+		tcrypt_test("sha1");</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case 3:</div><div class='del'>-		test_cipher("ecb(des)", ENCRYPT, des_enc_tv_template,</div><div class='del'>-			    DES_ENC_TEST_VECTORS);</div><div class='del'>-		test_cipher("ecb(des)", DECRYPT, des_dec_tv_template,</div><div class='del'>-			    DES_DEC_TEST_VECTORS);</div><div class='del'>-		test_cipher("cbc(des)", ENCRYPT, des_cbc_enc_tv_template,</div><div class='del'>-			    DES_CBC_ENC_TEST_VECTORS);</div><div class='del'>-		test_cipher("cbc(des)", DECRYPT, des_cbc_dec_tv_template,</div><div class='del'>-			    DES_CBC_DEC_TEST_VECTORS);</div><div class='add'>+		tcrypt_test("ecb(des)");</div><div class='add'>+		tcrypt_test("cbc(des)");</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case 4:</div><div class='del'>-		test_cipher("ecb(des3_ede)", ENCRYPT, des3_ede_enc_tv_template,</div><div class='del'>-			    DES3_EDE_ENC_TEST_VECTORS);</div><div class='del'>-		test_cipher("ecb(des3_ede)", DECRYPT, des3_ede_dec_tv_template,</div><div class='del'>-			    DES3_EDE_DEC_TEST_VECTORS);</div><div class='del'>-</div><div class='del'>-		test_cipher("cbc(des3_ede)", ENCRYPT,</div><div class='del'>-			    des3_ede_cbc_enc_tv_template,</div><div class='del'>-			    DES3_EDE_CBC_ENC_TEST_VECTORS);</div><div class='del'>-</div><div class='del'>-		test_cipher("cbc(des3_ede)", DECRYPT,</div><div class='del'>-			    des3_ede_cbc_dec_tv_template,</div><div class='del'>-			    DES3_EDE_CBC_DEC_TEST_VECTORS);</div><div class='add'>+		tcrypt_test("ecb(des3_ede)");</div><div class='add'>+		tcrypt_test("cbc(des3_ede)");</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case 5:</div><div class='del'>-		test_hash("md4", md4_tv_template, MD4_TEST_VECTORS);</div><div class='add'>+		tcrypt_test("md4");</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case 6:</div><div class='del'>-		test_hash("sha256", sha256_tv_template, SHA256_TEST_VECTORS);</div><div class='add'>+		tcrypt_test("sha256");</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case 7:</div><div class='del'>-		test_cipher("ecb(blowfish)", ENCRYPT, bf_enc_tv_template,</div><div class='del'>-			    BF_ENC_TEST_VECTORS);</div><div class='del'>-		test_cipher("ecb(blowfish)", DECRYPT, bf_dec_tv_template,</div><div class='del'>-			    BF_DEC_TEST_VECTORS);</div><div class='del'>-		test_cipher("cbc(blowfish)", ENCRYPT, bf_cbc_enc_tv_template,</div><div class='del'>-			    BF_CBC_ENC_TEST_VECTORS);</div><div class='del'>-		test_cipher("cbc(blowfish)", DECRYPT, bf_cbc_dec_tv_template,</div><div class='del'>-			    BF_CBC_DEC_TEST_VECTORS);</div><div class='add'>+		tcrypt_test("ecb(blowfish)");</div><div class='add'>+		tcrypt_test("cbc(blowfish)");</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case 8:</div><div class='del'>-		test_cipher("ecb(twofish)", ENCRYPT, tf_enc_tv_template,</div><div class='del'>-			    TF_ENC_TEST_VECTORS);</div><div class='del'>-		test_cipher("ecb(twofish)", DECRYPT, tf_dec_tv_template,</div><div class='del'>-			    TF_DEC_TEST_VECTORS);</div><div class='del'>-		test_cipher("cbc(twofish)", ENCRYPT, tf_cbc_enc_tv_template,</div><div class='del'>-			    TF_CBC_ENC_TEST_VECTORS);</div><div class='del'>-		test_cipher("cbc(twofish)", DECRYPT, tf_cbc_dec_tv_template,</div><div class='del'>-			    TF_CBC_DEC_TEST_VECTORS);</div><div class='add'>+		tcrypt_test("ecb(twofish)");</div><div class='add'>+		tcrypt_test("cbc(twofish)");</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case 9:</div><div class='del'>-		test_cipher("ecb(serpent)", ENCRYPT, serpent_enc_tv_template,</div><div class='del'>-			    SERPENT_ENC_TEST_VECTORS);</div><div class='del'>-		test_cipher("ecb(serpent)", DECRYPT, serpent_dec_tv_template,</div><div class='del'>-			    SERPENT_DEC_TEST_VECTORS);</div><div class='add'>+		tcrypt_test("ecb(serpent)");</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case 10:</div><div class='del'>-		test_cipher("ecb(aes)", ENCRYPT, aes_enc_tv_template,</div><div class='del'>-			    AES_ENC_TEST_VECTORS);</div><div class='del'>-		test_cipher("ecb(aes)", DECRYPT, aes_dec_tv_template,</div><div class='del'>-			    AES_DEC_TEST_VECTORS);</div><div class='del'>-		test_cipher("cbc(aes)", ENCRYPT, aes_cbc_enc_tv_template,</div><div class='del'>-			    AES_CBC_ENC_TEST_VECTORS);</div><div class='del'>-		test_cipher("cbc(aes)", DECRYPT, aes_cbc_dec_tv_template,</div><div class='del'>-			    AES_CBC_DEC_TEST_VECTORS);</div><div class='del'>-		test_cipher("lrw(aes)", ENCRYPT, aes_lrw_enc_tv_template,</div><div class='del'>-			    AES_LRW_ENC_TEST_VECTORS);</div><div class='del'>-		test_cipher("lrw(aes)", DECRYPT, aes_lrw_dec_tv_template,</div><div class='del'>-			    AES_LRW_DEC_TEST_VECTORS);</div><div class='del'>-		test_cipher("xts(aes)", ENCRYPT, aes_xts_enc_tv_template,</div><div class='del'>-			    AES_XTS_ENC_TEST_VECTORS);</div><div class='del'>-		test_cipher("xts(aes)", DECRYPT, aes_xts_dec_tv_template,</div><div class='del'>-			    AES_XTS_DEC_TEST_VECTORS);</div><div class='del'>-		test_cipher("rfc3686(ctr(aes))", ENCRYPT, aes_ctr_enc_tv_template,</div><div class='del'>-			    AES_CTR_ENC_TEST_VECTORS);</div><div class='del'>-		test_cipher("rfc3686(ctr(aes))", DECRYPT, aes_ctr_dec_tv_template,</div><div class='del'>-			    AES_CTR_DEC_TEST_VECTORS);</div><div class='add'>+		tcrypt_test("ecb(aes)");</div><div class='add'>+		tcrypt_test("cbc(aes)");</div><div class='add'>+		tcrypt_test("lrw(aes)");</div><div class='add'>+		tcrypt_test("xts(aes)");</div><div class='add'>+		tcrypt_test("rfc3686(ctr(aes))");</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case 11:</div><div class='del'>-		test_hash("sha384", sha384_tv_template, SHA384_TEST_VECTORS);</div><div class='add'>+		tcrypt_test("sha384");</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case 12:</div><div class='del'>-		test_hash("sha512", sha512_tv_template, SHA512_TEST_VECTORS);</div><div class='add'>+		tcrypt_test("sha512");</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case 13:</div><div class='del'>-		test_comp("deflate", deflate_comp_tv_template,</div><div class='del'>-			  deflate_decomp_tv_template, DEFLATE_COMP_TEST_VECTORS,</div><div class='del'>-			  DEFLATE_DECOMP_TEST_VECTORS);</div><div class='add'>+		tcrypt_test("deflate");</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case 14:</div><div class='del'>-		test_cipher("ecb(cast5)", ENCRYPT, cast5_enc_tv_template,</div><div class='del'>-			    CAST5_ENC_TEST_VECTORS);</div><div class='del'>-		test_cipher("ecb(cast5)", DECRYPT, cast5_dec_tv_template,</div><div class='del'>-			    CAST5_DEC_TEST_VECTORS);</div><div class='add'>+		tcrypt_test("ecb(cast5)");</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case 15:</div><div class='del'>-		test_cipher("ecb(cast6)", ENCRYPT, cast6_enc_tv_template,</div><div class='del'>-			    CAST6_ENC_TEST_VECTORS);</div><div class='del'>-		test_cipher("ecb(cast6)", DECRYPT, cast6_dec_tv_template,</div><div class='del'>-			    CAST6_DEC_TEST_VECTORS);</div><div class='add'>+		tcrypt_test("ecb(cast6)");</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case 16:</div><div class='del'>-		test_cipher("ecb(arc4)", ENCRYPT, arc4_enc_tv_template,</div><div class='del'>-			    ARC4_ENC_TEST_VECTORS);</div><div class='del'>-		test_cipher("ecb(arc4)", DECRYPT, arc4_dec_tv_template,</div><div class='del'>-			    ARC4_DEC_TEST_VECTORS);</div><div class='add'>+		tcrypt_test("ecb(arc4)");</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case 17:</div><div class='del'>-		test_hash("michael_mic", michael_mic_tv_template, MICHAEL_MIC_TEST_VECTORS);</div><div class='add'>+		tcrypt_test("michael_mic");</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case 18:</div><div class='del'>-		test_hash("crc32c", crc32c_tv_template, CRC32C_TEST_VECTORS);</div><div class='add'>+		tcrypt_test("crc32c");</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case 19:</div><div class='del'>-		test_cipher("ecb(tea)", ENCRYPT, tea_enc_tv_template,</div><div class='del'>-			    TEA_ENC_TEST_VECTORS);</div><div class='del'>-		test_cipher("ecb(tea)", DECRYPT, tea_dec_tv_template,</div><div class='del'>-			    TEA_DEC_TEST_VECTORS);</div><div class='add'>+		tcrypt_test("ecb(tea)");</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case 20:</div><div class='del'>-		test_cipher("ecb(xtea)", ENCRYPT, xtea_enc_tv_template,</div><div class='del'>-			    XTEA_ENC_TEST_VECTORS);</div><div class='del'>-		test_cipher("ecb(xtea)", DECRYPT, xtea_dec_tv_template,</div><div class='del'>-			    XTEA_DEC_TEST_VECTORS);</div><div class='add'>+		tcrypt_test("ecb(xtea)");</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case 21:</div><div class='del'>-		test_cipher("ecb(khazad)", ENCRYPT, khazad_enc_tv_template,</div><div class='del'>-			    KHAZAD_ENC_TEST_VECTORS);</div><div class='del'>-		test_cipher("ecb(khazad)", DECRYPT, khazad_dec_tv_template,</div><div class='del'>-			    KHAZAD_DEC_TEST_VECTORS);</div><div class='add'>+		tcrypt_test("ecb(khazad)");</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case 22:</div><div class='del'>-		test_hash("wp512", wp512_tv_template, WP512_TEST_VECTORS);</div><div class='add'>+		tcrypt_test("wp512");</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case 23:</div><div class='del'>-		test_hash("wp384", wp384_tv_template, WP384_TEST_VECTORS);</div><div class='add'>+		tcrypt_test("wp384");</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case 24:</div><div class='del'>-		test_hash("wp256", wp256_tv_template, WP256_TEST_VECTORS);</div><div class='add'>+		tcrypt_test("wp256");</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case 25:</div><div class='del'>-		test_cipher("ecb(tnepres)", ENCRYPT, tnepres_enc_tv_template,</div><div class='del'>-			    TNEPRES_ENC_TEST_VECTORS);</div><div class='del'>-		test_cipher("ecb(tnepres)", DECRYPT, tnepres_dec_tv_template,</div><div class='del'>-			    TNEPRES_DEC_TEST_VECTORS);</div><div class='add'>+		tcrypt_test("ecb(tnepres)");</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case 26:</div><div class='del'>-		test_cipher("ecb(anubis)", ENCRYPT, anubis_enc_tv_template,</div><div class='del'>-			    ANUBIS_ENC_TEST_VECTORS);</div><div class='del'>-		test_cipher("ecb(anubis)", DECRYPT, anubis_dec_tv_template,</div><div class='del'>-			    ANUBIS_DEC_TEST_VECTORS);</div><div class='del'>-		test_cipher("cbc(anubis)", ENCRYPT, anubis_cbc_enc_tv_template,</div><div class='del'>-			    ANUBIS_CBC_ENC_TEST_VECTORS);</div><div class='del'>-		test_cipher("cbc(anubis)", DECRYPT, anubis_cbc_dec_tv_template,</div><div class='del'>-			    ANUBIS_CBC_ENC_TEST_VECTORS);</div><div class='add'>+		tcrypt_test("ecb(anubis)");</div><div class='add'>+		tcrypt_test("cbc(anubis)");</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case 27:</div><div class='del'>-		test_hash("tgr192", tgr192_tv_template, TGR192_TEST_VECTORS);</div><div class='add'>+		tcrypt_test("tgr192");</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case 28:</div><div class='ctx'> </div><div class='del'>-		test_hash("tgr160", tgr160_tv_template, TGR160_TEST_VECTORS);</div><div class='add'>+		tcrypt_test("tgr160");</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case 29:</div><div class='del'>-		test_hash("tgr128", tgr128_tv_template, TGR128_TEST_VECTORS);</div><div class='add'>+		tcrypt_test("tgr128");</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case 30:</div><div class='del'>-		test_cipher("ecb(xeta)", ENCRYPT, xeta_enc_tv_template,</div><div class='del'>-			    XETA_ENC_TEST_VECTORS);</div><div class='del'>-		test_cipher("ecb(xeta)", DECRYPT, xeta_dec_tv_template,</div><div class='del'>-			    XETA_DEC_TEST_VECTORS);</div><div class='add'>+		tcrypt_test("ecb(xeta)");</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case 31:</div><div class='del'>-		test_cipher("pcbc(fcrypt)", ENCRYPT, fcrypt_pcbc_enc_tv_template,</div><div class='del'>-			    FCRYPT_ENC_TEST_VECTORS);</div><div class='del'>-		test_cipher("pcbc(fcrypt)", DECRYPT, fcrypt_pcbc_dec_tv_template,</div><div class='del'>-			    FCRYPT_DEC_TEST_VECTORS);</div><div class='add'>+		tcrypt_test("pcbc(fcrypt)");</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case 32:</div><div class='del'>-		test_cipher("ecb(camellia)", ENCRYPT,</div><div class='del'>-			    camellia_enc_tv_template,</div><div class='del'>-			    CAMELLIA_ENC_TEST_VECTORS);</div><div class='del'>-		test_cipher("ecb(camellia)", DECRYPT,</div><div class='del'>-			    camellia_dec_tv_template,</div><div class='del'>-			    CAMELLIA_DEC_TEST_VECTORS);</div><div class='del'>-		test_cipher("cbc(camellia)", ENCRYPT,</div><div class='del'>-			    camellia_cbc_enc_tv_template,</div><div class='del'>-			    CAMELLIA_CBC_ENC_TEST_VECTORS);</div><div class='del'>-		test_cipher("cbc(camellia)", DECRYPT,</div><div class='del'>-			    camellia_cbc_dec_tv_template,</div><div class='del'>-			    CAMELLIA_CBC_DEC_TEST_VECTORS);</div><div class='add'>+		tcrypt_test("ecb(camellia)");</div><div class='add'>+		tcrypt_test("cbc(camellia)");</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 33:</div><div class='del'>-		test_hash("sha224", sha224_tv_template, SHA224_TEST_VECTORS);</div><div class='add'>+		tcrypt_test("sha224");</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case 34:</div><div class='del'>-		test_cipher("salsa20", ENCRYPT,</div><div class='del'>-			    salsa20_stream_enc_tv_template,</div><div class='del'>-			    SALSA20_STREAM_ENC_TEST_VECTORS);</div><div class='add'>+		tcrypt_test("salsa20");</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case 35:</div><div class='del'>-		test_aead("gcm(aes)", ENCRYPT, aes_gcm_enc_tv_template,</div><div class='del'>-			  AES_GCM_ENC_TEST_VECTORS);</div><div class='del'>-		test_aead("gcm(aes)", DECRYPT, aes_gcm_dec_tv_template,</div><div class='del'>-			  AES_GCM_DEC_TEST_VECTORS);</div><div class='add'>+		tcrypt_test("gcm(aes)");</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case 36:</div><div class='del'>-		test_comp("lzo", lzo_comp_tv_template, lzo_decomp_tv_template,</div><div class='del'>-			  LZO_COMP_TEST_VECTORS, LZO_DECOMP_TEST_VECTORS);</div><div class='add'>+		tcrypt_test("lzo");</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case 37:</div><div class='del'>-		test_aead("ccm(aes)", ENCRYPT, aes_ccm_enc_tv_template,</div><div class='del'>-			  AES_CCM_ENC_TEST_VECTORS);</div><div class='del'>-		test_aead("ccm(aes)", DECRYPT, aes_ccm_dec_tv_template,</div><div class='del'>-			  AES_CCM_DEC_TEST_VECTORS);</div><div class='add'>+		tcrypt_test("ccm(aes)");</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case 38:</div><div class='del'>-		test_cipher("cts(cbc(aes))", ENCRYPT, cts_mode_enc_tv_template,</div><div class='del'>-			    CTS_MODE_ENC_TEST_VECTORS);</div><div class='del'>-		test_cipher("cts(cbc(aes))", DECRYPT, cts_mode_dec_tv_template,</div><div class='del'>-			    CTS_MODE_DEC_TEST_VECTORS);</div><div class='add'>+		tcrypt_test("cts(cbc(aes))");</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'>         case 39:</div><div class='del'>-		test_hash("rmd128", rmd128_tv_template, RMD128_TEST_VECTORS);</div><div class='add'>+		tcrypt_test("rmd128");</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'>         case 40:</div><div class='del'>-		test_hash("rmd160", rmd160_tv_template, RMD160_TEST_VECTORS);</div><div class='add'>+		tcrypt_test("rmd160");</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case 41:</div><div class='del'>-		test_hash("rmd256", rmd256_tv_template, RMD256_TEST_VECTORS);</div><div class='add'>+		tcrypt_test("rmd256");</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case 42:</div><div class='del'>-		test_hash("rmd320", rmd320_tv_template, RMD320_TEST_VECTORS);</div><div class='add'>+		tcrypt_test("rmd320");</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 43:</div><div class='add'>+		tcrypt_test("ecb(seed)");</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case 100:</div><div class='del'>-		test_hash("hmac(md5)", hmac_md5_tv_template,</div><div class='del'>-			  HMAC_MD5_TEST_VECTORS);</div><div class='add'>+		tcrypt_test("hmac(md5)");</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case 101:</div><div class='del'>-		test_hash("hmac(sha1)", hmac_sha1_tv_template,</div><div class='del'>-			  HMAC_SHA1_TEST_VECTORS);</div><div class='add'>+		tcrypt_test("hmac(sha1)");</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case 102:</div><div class='del'>-		test_hash("hmac(sha256)", hmac_sha256_tv_template,</div><div class='del'>-			  HMAC_SHA256_TEST_VECTORS);</div><div class='add'>+		tcrypt_test("hmac(sha256)");</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case 103:</div><div class='del'>-		test_hash("hmac(sha384)", hmac_sha384_tv_template,</div><div class='del'>-			  HMAC_SHA384_TEST_VECTORS);</div><div class='add'>+		tcrypt_test("hmac(sha384)");</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case 104:</div><div class='del'>-		test_hash("hmac(sha512)", hmac_sha512_tv_template,</div><div class='del'>-			  HMAC_SHA512_TEST_VECTORS);</div><div class='add'>+		tcrypt_test("hmac(sha512)");</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case 105:</div><div class='del'>-		test_hash("hmac(sha224)", hmac_sha224_tv_template,</div><div class='del'>-			  HMAC_SHA224_TEST_VECTORS);</div><div class='add'>+		tcrypt_test("hmac(sha224)");</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case 106:</div><div class='del'>-		test_hash("xcbc(aes)", aes_xcbc128_tv_template,</div><div class='del'>-			  XCBC_AES_TEST_VECTORS);</div><div class='add'>+		tcrypt_test("xcbc(aes)");</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case 107:</div><div class='del'>-		test_hash("hmac(rmd128)", hmac_rmd128_tv_template,</div><div class='del'>-			  HMAC_RMD128_TEST_VECTORS);</div><div class='add'>+		tcrypt_test("hmac(rmd128)");</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case 108:</div><div class='del'>-		test_hash("hmac(rmd160)", hmac_rmd160_tv_template,</div><div class='del'>-			  HMAC_RMD160_TEST_VECTORS);</div><div class='add'>+		tcrypt_test("hmac(rmd160)");</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case 200:</div><div class='hunk'>@@ -1767,16 +718,16 @@ static void do_test(void)</div><div class='ctx'> </div><div class='ctx'> 	case 201:</div><div class='ctx'> 		test_cipher_speed("ecb(des3_ede)", ENCRYPT, sec,</div><div class='del'>-				des3_ede_enc_tv_template, DES3_EDE_ENC_TEST_VECTORS,</div><div class='add'>+				des3_speed_template, DES3_SPEED_VECTORS,</div><div class='ctx'> 				speed_template_24);</div><div class='ctx'> 		test_cipher_speed("ecb(des3_ede)", DECRYPT, sec,</div><div class='del'>-				des3_ede_enc_tv_template, DES3_EDE_ENC_TEST_VECTORS,</div><div class='add'>+				des3_speed_template, DES3_SPEED_VECTORS,</div><div class='ctx'> 				speed_template_24);</div><div class='ctx'> 		test_cipher_speed("cbc(des3_ede)", ENCRYPT, sec,</div><div class='del'>-				des3_ede_enc_tv_template, DES3_EDE_ENC_TEST_VECTORS,</div><div class='add'>+				des3_speed_template, DES3_SPEED_VECTORS,</div><div class='ctx'> 				speed_template_24);</div><div class='ctx'> 		test_cipher_speed("cbc(des3_ede)", DECRYPT, sec,</div><div class='del'>-				des3_ede_enc_tv_template, DES3_EDE_ENC_TEST_VECTORS,</div><div class='add'>+				des3_speed_template, DES3_SPEED_VECTORS,</div><div class='ctx'> 				speed_template_24);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='hunk'>@@ -1906,31 +857,21 @@ static void do_test(void)</div><div class='ctx'> 	case 1000:</div><div class='ctx'> 		test_available();</div><div class='ctx'> 		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		/* useful for debugging */</div><div class='del'>-		printk("not testing anything\n");</div><div class='del'>-		break;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init tcrypt_mod_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int err = -ENOMEM;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-	tvmem = kmalloc(TVMEMSIZE, GFP_KERNEL);</div><div class='del'>-	if (tvmem == NULL)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	xbuf = kmalloc(XBUFSIZE, GFP_KERNEL);</div><div class='del'>-	if (xbuf == NULL)</div><div class='del'>-		goto err_free_tv;</div><div class='del'>-</div><div class='del'>-	axbuf = kmalloc(XBUFSIZE, GFP_KERNEL);</div><div class='del'>-	if (axbuf == NULL)</div><div class='del'>-		goto err_free_xbuf;</div><div class='add'>+	for (i = 0; i &lt; TVMEMSIZE; i++) {</div><div class='add'>+		tvmem[i] = (void *)__get_free_page(GFP_KERNEL);</div><div class='add'>+		if (!tvmem[i])</div><div class='add'>+			goto err_free_tv;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	do_test();</div><div class='add'>+	do_test(mode);</div><div class='ctx'> </div><div class='ctx'> 	/* We intentionaly return -EAGAIN to prevent keeping</div><div class='ctx'> 	 * the module. It does all its work from init()</div><div class='hunk'>@@ -1940,11 +881,9 @@ static int __init tcrypt_mod_init(void)</div><div class='ctx'> 	 */</div><div class='ctx'> 	err = -EAGAIN;</div><div class='ctx'> </div><div class='del'>-	kfree(axbuf);</div><div class='del'>- err_free_xbuf:</div><div class='del'>-	kfree(xbuf);</div><div class='del'>- err_free_tv:</div><div class='del'>-	kfree(tvmem);</div><div class='add'>+err_free_tv:</div><div class='add'>+	for (i = 0; i &lt; TVMEMSIZE &amp;&amp; tvmem[i]; i++)</div><div class='add'>+		free_page((unsigned long)tvmem[i]);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='head'>diff --git a/crypto/tcrypt.h b/crypto/tcrypt.h<br/>index 801e0c288862..966bbfaf95b1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/crypto/tcrypt.h?id=c15895ef30c2c03e99802951787183039a349d32'>crypto/tcrypt.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/crypto/tcrypt.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>crypto/tcrypt.h</a></div><div class='hunk'>@@ -17,53 +17,9 @@</div><div class='ctx'> #ifndef _CRYPTO_TCRYPT_H</div><div class='ctx'> #define _CRYPTO_TCRYPT_H</div><div class='ctx'> </div><div class='del'>-#define MAX_DIGEST_SIZE		64</div><div class='del'>-#define MAX_TAP			8</div><div class='del'>-</div><div class='del'>-#define MAX_KEYLEN		56</div><div class='del'>-#define MAX_IVLEN		32</div><div class='del'>-</div><div class='del'>-struct hash_testvec {</div><div class='del'>-	/* only used with keyed hash algorithms */</div><div class='del'>-	char *key;</div><div class='del'>-	char *plaintext;</div><div class='del'>-	char *digest;</div><div class='del'>-	unsigned char tap[MAX_TAP];</div><div class='del'>-	unsigned char psize;</div><div class='del'>-	unsigned char np;</div><div class='del'>-	unsigned char ksize;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct cipher_testvec {</div><div class='del'>-	char *key;</div><div class='del'>-	char *iv;</div><div class='del'>-	char *input;</div><div class='del'>-	char *result;</div><div class='del'>-	unsigned char tap[MAX_TAP];</div><div class='del'>-	int np;</div><div class='del'>-	unsigned char fail;</div><div class='del'>-	unsigned char wk; /* weak key flag */</div><div class='del'>-	unsigned char klen;</div><div class='del'>-	unsigned short ilen;</div><div class='del'>-	unsigned short rlen;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct aead_testvec {</div><div class='del'>-	char *key;</div><div class='del'>-	char *iv;</div><div class='del'>-	char *input;</div><div class='del'>-	char *assoc;</div><div class='del'>-	char *result;</div><div class='del'>-	unsigned char tap[MAX_TAP];</div><div class='del'>-	unsigned char atap[MAX_TAP];</div><div class='del'>-	int np;</div><div class='del'>-	int anp;</div><div class='del'>-	unsigned char fail;</div><div class='del'>-	unsigned char wk; /* weak key flag */</div><div class='del'>-	unsigned char klen;</div><div class='del'>-	unsigned short ilen;</div><div class='del'>-	unsigned short alen;</div><div class='del'>-	unsigned short rlen;</div><div class='add'>+struct cipher_speed_template {</div><div class='add'>+	const char *key;</div><div class='add'>+	unsigned int klen;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct hash_speed {</div><div class='hunk'>@@ -71,8673 +27,20 @@ struct hash_speed {</div><div class='ctx'> 	unsigned int plen;	/* per-update length */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static char zeroed_string[48];</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * MD4 test vectors from RFC1320</div><div class='del'>- */</div><div class='del'>-#define MD4_TEST_VECTORS	7</div><div class='del'>-</div><div class='del'>-static struct hash_testvec md4_tv_template [] = {</div><div class='del'>-	{</div><div class='del'>-		.plaintext = "",</div><div class='del'>-		.digest	= "\x31\xd6\xcf\xe0\xd1\x6a\xe9\x31"</div><div class='del'>-			  "\xb7\x3c\x59\xd7\xe0\xc0\x89\xc0",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "a",</div><div class='del'>-		.psize	= 1,</div><div class='del'>-		.digest	= "\xbd\xe5\x2c\xb3\x1d\xe3\x3e\x46"</div><div class='del'>-			  "\x24\x5e\x05\xfb\xdb\xd6\xfb\x24",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "abc",</div><div class='del'>-		.psize	= 3,</div><div class='del'>-		.digest	= "\xa4\x48\x01\x7a\xaf\x21\xd8\x52"</div><div class='del'>-			  "\x5f\xc1\x0a\xe8\x7a\xa6\x72\x9d",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "message digest",</div><div class='del'>-		.psize	= 14,</div><div class='del'>-		.digest	= "\xd9\x13\x0a\x81\x64\x54\x9f\xe8"</div><div class='del'>-			"\x18\x87\x48\x06\xe1\xc7\x01\x4b",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "abcdefghijklmnopqrstuvwxyz",</div><div class='del'>-		.psize	= 26,</div><div class='del'>-		.digest	= "\xd7\x9e\x1c\x30\x8a\xa5\xbb\xcd"</div><div class='del'>-			  "\xee\xa8\xed\x63\xdf\x41\x2d\xa9",</div><div class='del'>-		.np	= 2,</div><div class='del'>-		.tap	= { 13, 13 },</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789",</div><div class='del'>-		.psize	= 62,</div><div class='del'>-		.digest	= "\x04\x3f\x85\x82\xf2\x41\xdb\x35"</div><div class='del'>-			  "\x1c\xe6\x27\xe1\x53\xe7\xf0\xe4",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "123456789012345678901234567890123456789012345678901234567890123"</div><div class='del'>-			   "45678901234567890",</div><div class='del'>-		.psize	= 80,</div><div class='del'>-		.digest	= "\xe3\x3b\x4d\xdc\x9c\x38\xf2\x19"</div><div class='del'>-			  "\x9c\x3e\x7b\x16\x4f\xcc\x05\x36",</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * MD5 test vectors from RFC1321</div><div class='del'>- */</div><div class='del'>-#define MD5_TEST_VECTORS	7</div><div class='del'>-</div><div class='del'>-static struct hash_testvec md5_tv_template[] = {</div><div class='del'>-	{</div><div class='del'>-		.digest	= "\xd4\x1d\x8c\xd9\x8f\x00\xb2\x04"</div><div class='del'>-			  "\xe9\x80\x09\x98\xec\xf8\x42\x7e",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "a",</div><div class='del'>-		.psize	= 1,</div><div class='del'>-		.digest	= "\x0c\xc1\x75\xb9\xc0\xf1\xb6\xa8"</div><div class='del'>-			  "\x31\xc3\x99\xe2\x69\x77\x26\x61",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "abc",</div><div class='del'>-		.psize	= 3,</div><div class='del'>-		.digest	= "\x90\x01\x50\x98\x3c\xd2\x4f\xb0"</div><div class='del'>-			  "\xd6\x96\x3f\x7d\x28\xe1\x7f\x72",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "message digest",</div><div class='del'>-		.psize	= 14,</div><div class='del'>-		.digest	= "\xf9\x6b\x69\x7d\x7c\xb7\x93\x8d"</div><div class='del'>-			  "\x52\x5a\x2f\x31\xaa\xf1\x61\xd0",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "abcdefghijklmnopqrstuvwxyz",</div><div class='del'>-		.psize	= 26,</div><div class='del'>-		.digest	= "\xc3\xfc\xd3\xd7\x61\x92\xe4\x00"</div><div class='del'>-			  "\x7d\xfb\x49\x6c\xca\x67\xe1\x3b",</div><div class='del'>-		.np	= 2,</div><div class='del'>-		.tap	= {13, 13}</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789",</div><div class='del'>-		.psize	= 62,</div><div class='del'>-		.digest	= "\xd1\x74\xab\x98\xd2\x77\xd9\xf5"</div><div class='del'>-			  "\xa5\x61\x1c\x2c\x9f\x41\x9d\x9f",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "12345678901234567890123456789012345678901234567890123456789012"</div><div class='del'>-			   "345678901234567890",</div><div class='del'>-		.psize	= 80,</div><div class='del'>-		.digest	= "\x57\xed\xf4\xa2\x2b\xe3\xc9\x55"</div><div class='del'>-			  "\xac\x49\xda\x2e\x21\x07\xb6\x7a",</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * RIPEMD-128 test vectors from ISO/IEC 10118-3:2004(E)</div><div class='del'>- */</div><div class='del'>-#define RMD128_TEST_VECTORS     10</div><div class='del'>-</div><div class='del'>-static struct hash_testvec rmd128_tv_template[] = {</div><div class='del'>-	{</div><div class='del'>-		.digest	= "\xcd\xf2\x62\x13\xa1\x50\xdc\x3e"</div><div class='del'>-			  "\xcb\x61\x0f\x18\xf6\xb3\x8b\x46",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "a",</div><div class='del'>-		.psize	= 1,</div><div class='del'>-		.digest	= "\x86\xbe\x7a\xfa\x33\x9d\x0f\xc7"</div><div class='del'>-			  "\xcf\xc7\x85\xe7\x2f\x57\x8d\x33",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "abc",</div><div class='del'>-		.psize	= 3,</div><div class='del'>-		.digest	= "\xc1\x4a\x12\x19\x9c\x66\xe4\xba"</div><div class='del'>-			  "\x84\x63\x6b\x0f\x69\x14\x4c\x77",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "message digest",</div><div class='del'>-		.psize	= 14,</div><div class='del'>-		.digest	= "\x9e\x32\x7b\x3d\x6e\x52\x30\x62"</div><div class='del'>-			  "\xaf\xc1\x13\x2d\x7d\xf9\xd1\xb8",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "abcdefghijklmnopqrstuvwxyz",</div><div class='del'>-		.psize	= 26,</div><div class='del'>-		.digest	= "\xfd\x2a\xa6\x07\xf7\x1d\xc8\xf5"</div><div class='del'>-			  "\x10\x71\x49\x22\xb3\x71\x83\x4e",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcde"</div><div class='del'>-			     "fghijklmnopqrstuvwxyz0123456789",</div><div class='del'>-		.psize	= 62,</div><div class='del'>-		.digest	= "\xd1\xe9\x59\xeb\x17\x9c\x91\x1f"</div><div class='del'>-			  "\xae\xa4\x62\x4c\x60\xc5\xc7\x02",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "1234567890123456789012345678901234567890"</div><div class='del'>-			     "1234567890123456789012345678901234567890",</div><div class='del'>-		.psize	= 80,</div><div class='del'>-		.digest	= "\x3f\x45\xef\x19\x47\x32\xc2\xdb"</div><div class='del'>-			  "\xb2\xc4\xa2\xc7\x69\x79\x5f\xa3",</div><div class='del'>-        }, {</div><div class='del'>-		.plaintext = "abcdbcdecdefdefgefghfghighij"</div><div class='del'>-			     "hijkijkljklmklmnlmnomnopnopq",</div><div class='del'>-		.psize	= 56,</div><div class='del'>-		.digest	= "\xa1\xaa\x06\x89\xd0\xfa\xfa\x2d"</div><div class='del'>-			  "\xdc\x22\xe8\x8b\x49\x13\x3a\x06",</div><div class='del'>-		.np	= 2,</div><div class='del'>-		.tap	= { 28, 28 },</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "abcdefghbcdefghicdefghijdefghijkefghijklfghi"</div><div class='del'>-			     "jklmghijklmnhijklmnoijklmnopjklmnopqklmnopqr"</div><div class='del'>-			     "lmnopqrsmnopqrstnopqrstu",</div><div class='del'>-		.psize	= 112,</div><div class='del'>-		.digest	= "\xd4\xec\xc9\x13\xe1\xdf\x77\x6b"</div><div class='del'>-			  "\xf4\x8d\xe9\xd5\x5b\x1f\x25\x46",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "abcdbcdecdefdefgefghfghighijhijk",</div><div class='del'>-		.psize	= 32,</div><div class='del'>-		.digest	= "\x13\xfc\x13\xe8\xef\xff\x34\x7d"</div><div class='del'>-			  "\xe1\x93\xff\x46\xdb\xac\xcf\xd4",</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * RIPEMD-160 test vectors from ISO/IEC 10118-3:2004(E)</div><div class='del'>- */</div><div class='del'>-#define RMD160_TEST_VECTORS     10</div><div class='del'>-</div><div class='del'>-static struct hash_testvec rmd160_tv_template[] = {</div><div class='del'>-	{</div><div class='del'>-		.digest	= "\x9c\x11\x85\xa5\xc5\xe9\xfc\x54\x61\x28"</div><div class='del'>-			  "\x08\x97\x7e\xe8\xf5\x48\xb2\x25\x8d\x31",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "a",</div><div class='del'>-		.psize	= 1,</div><div class='del'>-		.digest	= "\x0b\xdc\x9d\x2d\x25\x6b\x3e\xe9\xda\xae"</div><div class='del'>-			  "\x34\x7b\xe6\xf4\xdc\x83\x5a\x46\x7f\xfe",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "abc",</div><div class='del'>-		.psize	= 3,</div><div class='del'>-		.digest	= "\x8e\xb2\x08\xf7\xe0\x5d\x98\x7a\x9b\x04"</div><div class='del'>-			  "\x4a\x8e\x98\xc6\xb0\x87\xf1\x5a\x0b\xfc",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "message digest",</div><div class='del'>-		.psize	= 14,</div><div class='del'>-		.digest	= "\x5d\x06\x89\xef\x49\xd2\xfa\xe5\x72\xb8"</div><div class='del'>-			  "\x81\xb1\x23\xa8\x5f\xfa\x21\x59\x5f\x36",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "abcdefghijklmnopqrstuvwxyz",</div><div class='del'>-		.psize	= 26,</div><div class='del'>-		.digest	= "\xf7\x1c\x27\x10\x9c\x69\x2c\x1b\x56\xbb"</div><div class='del'>-			  "\xdc\xeb\x5b\x9d\x28\x65\xb3\x70\x8d\xbc",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcde"</div><div class='del'>-			     "fghijklmnopqrstuvwxyz0123456789",</div><div class='del'>-		.psize	= 62,</div><div class='del'>-		.digest	= "\xb0\xe2\x0b\x6e\x31\x16\x64\x02\x86\xed"</div><div class='del'>-			  "\x3a\x87\xa5\x71\x30\x79\xb2\x1f\x51\x89",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "1234567890123456789012345678901234567890"</div><div class='del'>-			     "1234567890123456789012345678901234567890",</div><div class='del'>-		.psize	= 80,</div><div class='del'>-		.digest	= "\x9b\x75\x2e\x45\x57\x3d\x4b\x39\xf4\xdb"</div><div class='del'>-			  "\xd3\x32\x3c\xab\x82\xbf\x63\x32\x6b\xfb",</div><div class='del'>-        }, {</div><div class='del'>-		.plaintext = "abcdbcdecdefdefgefghfghighij"</div><div class='del'>-			     "hijkijkljklmklmnlmnomnopnopq",</div><div class='del'>-		.psize	= 56,</div><div class='del'>-		.digest	= "\x12\xa0\x53\x38\x4a\x9c\x0c\x88\xe4\x05"</div><div class='del'>-			  "\xa0\x6c\x27\xdc\xf4\x9a\xda\x62\xeb\x2b",</div><div class='del'>-		.np	= 2,</div><div class='del'>-		.tap	= { 28, 28 },</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "abcdefghbcdefghicdefghijdefghijkefghijklfghi"</div><div class='del'>-			     "jklmghijklmnhijklmnoijklmnopjklmnopqklmnopqr"</div><div class='del'>-			     "lmnopqrsmnopqrstnopqrstu",</div><div class='del'>-		.psize	= 112,</div><div class='del'>-		.digest	= "\x6f\x3f\xa3\x9b\x6b\x50\x3c\x38\x4f\x91"</div><div class='del'>-			  "\x9a\x49\xa7\xaa\x5c\x2c\x08\xbd\xfb\x45",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "abcdbcdecdefdefgefghfghighijhijk",</div><div class='del'>-		.psize	= 32,</div><div class='del'>-		.digest	= "\x94\xc2\x64\x11\x54\x04\xe6\x33\x79\x0d"</div><div class='del'>-			  "\xfc\xc8\x7b\x58\x7d\x36\x77\x06\x7d\x9f",</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * RIPEMD-256 test vectors</div><div class='del'>- */</div><div class='del'>-#define RMD256_TEST_VECTORS     8</div><div class='del'>-</div><div class='del'>-static struct hash_testvec rmd256_tv_template[] = {</div><div class='del'>-	{</div><div class='del'>-		.digest	= "\x02\xba\x4c\x4e\x5f\x8e\xcd\x18"</div><div class='del'>-			  "\x77\xfc\x52\xd6\x4d\x30\xe3\x7a"</div><div class='del'>-			  "\x2d\x97\x74\xfb\x1e\x5d\x02\x63"</div><div class='del'>-			  "\x80\xae\x01\x68\xe3\xc5\x52\x2d",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "a",</div><div class='del'>-		.psize	= 1,</div><div class='del'>-		.digest	= "\xf9\x33\x3e\x45\xd8\x57\xf5\xd9"</div><div class='del'>-			  "\x0a\x91\xba\xb7\x0a\x1e\xba\x0c"</div><div class='del'>-			  "\xfb\x1b\xe4\xb0\x78\x3c\x9a\xcf"</div><div class='del'>-			  "\xcd\x88\x3a\x91\x34\x69\x29\x25",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "abc",</div><div class='del'>-		.psize	= 3,</div><div class='del'>-		.digest	= "\xaf\xbd\x6e\x22\x8b\x9d\x8c\xbb"</div><div class='del'>-			  "\xce\xf5\xca\x2d\x03\xe6\xdb\xa1"</div><div class='del'>-			  "\x0a\xc0\xbc\x7d\xcb\xe4\x68\x0e"</div><div class='del'>-			  "\x1e\x42\xd2\xe9\x75\x45\x9b\x65",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "message digest",</div><div class='del'>-		.psize	= 14,</div><div class='del'>-		.digest	= "\x87\xe9\x71\x75\x9a\x1c\xe4\x7a"</div><div class='del'>-			  "\x51\x4d\x5c\x91\x4c\x39\x2c\x90"</div><div class='del'>-			  "\x18\xc7\xc4\x6b\xc1\x44\x65\x55"</div><div class='del'>-			  "\x4a\xfc\xdf\x54\xa5\x07\x0c\x0e",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "abcdefghijklmnopqrstuvwxyz",</div><div class='del'>-		.psize	= 26,</div><div class='del'>-		.digest	= "\x64\x9d\x30\x34\x75\x1e\xa2\x16"</div><div class='del'>-			  "\x77\x6b\xf9\xa1\x8a\xcc\x81\xbc"</div><div class='del'>-			  "\x78\x96\x11\x8a\x51\x97\x96\x87"</div><div class='del'>-			  "\x82\xdd\x1f\xd9\x7d\x8d\x51\x33",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcde"</div><div class='del'>-			     "fghijklmnopqrstuvwxyz0123456789",</div><div class='del'>-		.psize	= 62,</div><div class='del'>-		.digest	= "\x57\x40\xa4\x08\xac\x16\xb7\x20"</div><div class='del'>-			  "\xb8\x44\x24\xae\x93\x1c\xbb\x1f"</div><div class='del'>-			  "\xe3\x63\xd1\xd0\xbf\x40\x17\xf1"</div><div class='del'>-			  "\xa8\x9f\x7e\xa6\xde\x77\xa0\xb8",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "1234567890123456789012345678901234567890"</div><div class='del'>-			     "1234567890123456789012345678901234567890",</div><div class='del'>-		.psize	= 80,</div><div class='del'>-		.digest	= "\x06\xfd\xcc\x7a\x40\x95\x48\xaa"</div><div class='del'>-			  "\xf9\x13\x68\xc0\x6a\x62\x75\xb5"</div><div class='del'>-			  "\x53\xe3\xf0\x99\xbf\x0e\xa4\xed"</div><div class='del'>-			  "\xfd\x67\x78\xdf\x89\xa8\x90\xdd",</div><div class='del'>-        }, {</div><div class='del'>-		.plaintext = "abcdbcdecdefdefgefghfghighij"</div><div class='del'>-			     "hijkijkljklmklmnlmnomnopnopq",</div><div class='del'>-		.psize	= 56,</div><div class='del'>-		.digest	= "\x38\x43\x04\x55\x83\xaa\xc6\xc8"</div><div class='del'>-			  "\xc8\xd9\x12\x85\x73\xe7\xa9\x80"</div><div class='del'>-			  "\x9a\xfb\x2a\x0f\x34\xcc\xc3\x6e"</div><div class='del'>-			  "\xa9\xe7\x2f\x16\xf6\x36\x8e\x3f",</div><div class='del'>-		.np	= 2,</div><div class='del'>-		.tap	= { 28, 28 },</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * RIPEMD-320 test vectors</div><div class='del'>- */</div><div class='del'>-#define RMD320_TEST_VECTORS     8</div><div class='del'>-</div><div class='del'>-static struct hash_testvec rmd320_tv_template[] = {</div><div class='del'>-	{</div><div class='del'>-		.digest	= "\x22\xd6\x5d\x56\x61\x53\x6c\xdc\x75\xc1"</div><div class='del'>-			  "\xfd\xf5\xc6\xde\x7b\x41\xb9\xf2\x73\x25"</div><div class='del'>-			  "\xeb\xc6\x1e\x85\x57\x17\x7d\x70\x5a\x0e"</div><div class='del'>-			  "\xc8\x80\x15\x1c\x3a\x32\xa0\x08\x99\xb8",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "a",</div><div class='del'>-		.psize	= 1,</div><div class='del'>-		.digest	= "\xce\x78\x85\x06\x38\xf9\x26\x58\xa5\xa5"</div><div class='del'>-			  "\x85\x09\x75\x79\x92\x6d\xda\x66\x7a\x57"</div><div class='del'>-			  "\x16\x56\x2c\xfc\xf6\xfb\xe7\x7f\x63\x54"</div><div class='del'>-			  "\x2f\x99\xb0\x47\x05\xd6\x97\x0d\xff\x5d",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "abc",</div><div class='del'>-		.psize	= 3,</div><div class='del'>-		.digest	= "\xde\x4c\x01\xb3\x05\x4f\x89\x30\xa7\x9d"</div><div class='del'>-			  "\x09\xae\x73\x8e\x92\x30\x1e\x5a\x17\x08"</div><div class='del'>-			  "\x5b\xef\xfd\xc1\xb8\xd1\x16\x71\x3e\x74"</div><div class='del'>-			  "\xf8\x2f\xa9\x42\xd6\x4c\xdb\xc4\x68\x2d",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "message digest",</div><div class='del'>-		.psize	= 14,</div><div class='del'>-		.digest	= "\x3a\x8e\x28\x50\x2e\xd4\x5d\x42\x2f\x68"</div><div class='del'>-			  "\x84\x4f\x9d\xd3\x16\xe7\xb9\x85\x33\xfa"</div><div class='del'>-			  "\x3f\x2a\x91\xd2\x9f\x84\xd4\x25\xc8\x8d"</div><div class='del'>-			  "\x6b\x4e\xff\x72\x7d\xf6\x6a\x7c\x01\x97",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "abcdefghijklmnopqrstuvwxyz",</div><div class='del'>-		.psize	= 26,</div><div class='del'>-		.digest	= "\xca\xbd\xb1\x81\x0b\x92\x47\x0a\x20\x93"</div><div class='del'>-			  "\xaa\x6b\xce\x05\x95\x2c\x28\x34\x8c\xf4"</div><div class='del'>-			  "\x3f\xf6\x08\x41\x97\x51\x66\xbb\x40\xed"</div><div class='del'>-			  "\x23\x40\x04\xb8\x82\x44\x63\xe6\xb0\x09",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcde"</div><div class='del'>-			     "fghijklmnopqrstuvwxyz0123456789",</div><div class='del'>-		.psize	= 62,</div><div class='del'>-		.digest	= "\xed\x54\x49\x40\xc8\x6d\x67\xf2\x50\xd2"</div><div class='del'>-			  "\x32\xc3\x0b\x7b\x3e\x57\x70\xe0\xc6\x0c"</div><div class='del'>-			  "\x8c\xb9\xa4\xca\xfe\x3b\x11\x38\x8a\xf9"</div><div class='del'>-			  "\x92\x0e\x1b\x99\x23\x0b\x84\x3c\x86\xa4",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "1234567890123456789012345678901234567890"</div><div class='del'>-			     "1234567890123456789012345678901234567890",</div><div class='del'>-		.psize	= 80,</div><div class='del'>-		.digest	= "\x55\x78\x88\xaf\x5f\x6d\x8e\xd6\x2a\xb6"</div><div class='del'>-			  "\x69\x45\xc6\xd2\xa0\xa4\x7e\xcd\x53\x41"</div><div class='del'>-			  "\xe9\x15\xeb\x8f\xea\x1d\x05\x24\x95\x5f"</div><div class='del'>-			  "\x82\x5d\xc7\x17\xe4\xa0\x08\xab\x2d\x42",</div><div class='del'>-        }, {</div><div class='del'>-		.plaintext = "abcdbcdecdefdefgefghfghighij"</div><div class='del'>-			     "hijkijkljklmklmnlmnomnopnopq",</div><div class='del'>-		.psize	= 56,</div><div class='del'>-		.digest	= "\xd0\x34\xa7\x95\x0c\xf7\x22\x02\x1b\xa4"</div><div class='del'>-			  "\xb8\x4d\xf7\x69\xa5\xde\x20\x60\xe2\x59"</div><div class='del'>-			  "\xdf\x4c\x9b\xb4\xa4\x26\x8c\x0e\x93\x5b"</div><div class='del'>-			  "\xbc\x74\x70\xa9\x69\xc9\xd0\x72\xa1\xac",</div><div class='del'>-		.np	= 2,</div><div class='del'>-		.tap	= { 28, 28 },</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * SHA1 test vectors  from from FIPS PUB 180-1</div><div class='del'>- */</div><div class='del'>-#define SHA1_TEST_VECTORS	2</div><div class='del'>-</div><div class='del'>-static struct hash_testvec sha1_tv_template[] = {</div><div class='del'>-	{</div><div class='del'>-		.plaintext = "abc",</div><div class='del'>-		.psize	= 3,</div><div class='del'>-		.digest	= "\xa9\x99\x3e\x36\x47\x06\x81\x6a\xba\x3e"</div><div class='del'>-			  "\x25\x71\x78\x50\xc2\x6c\x9c\xd0\xd8\x9d",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",</div><div class='del'>-		.psize	= 56,</div><div class='del'>-		.digest	= "\x84\x98\x3e\x44\x1c\x3b\xd2\x6e\xba\xae"</div><div class='del'>-			  "\x4a\xa1\xf9\x51\x29\xe5\xe5\x46\x70\xf1",</div><div class='del'>-		.np	= 2,</div><div class='del'>-		.tap	= { 28, 28 }</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * SHA224 test vectors from from FIPS PUB 180-2</div><div class='del'>- */</div><div class='del'>-#define SHA224_TEST_VECTORS     2</div><div class='del'>-</div><div class='del'>-static struct hash_testvec sha224_tv_template[] = {</div><div class='del'>-	{</div><div class='del'>-		.plaintext = "abc",</div><div class='del'>-		.psize  = 3,</div><div class='del'>-		.digest = "\x23\x09\x7D\x22\x34\x05\xD8\x22"</div><div class='del'>-			  "\x86\x42\xA4\x77\xBD\xA2\x55\xB3"</div><div class='del'>-			  "\x2A\xAD\xBC\xE4\xBD\xA0\xB3\xF7"</div><div class='del'>-			  "\xE3\x6C\x9D\xA7",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext =</div><div class='del'>-		"abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",</div><div class='del'>-		.psize  = 56,</div><div class='del'>-		.digest = "\x75\x38\x8B\x16\x51\x27\x76\xCC"</div><div class='del'>-			  "\x5D\xBA\x5D\xA1\xFD\x89\x01\x50"</div><div class='del'>-			  "\xB0\xC6\x45\x5C\xB4\xF5\x8B\x19"</div><div class='del'>-			  "\x52\x52\x25\x25",</div><div class='del'>-		.np     = 2,</div><div class='del'>-		.tap    = { 28, 28 }</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * SHA256 test vectors from from NIST</div><div class='del'>- */</div><div class='del'>-#define SHA256_TEST_VECTORS	2</div><div class='del'>-</div><div class='del'>-static struct hash_testvec sha256_tv_template[] = {</div><div class='del'>-	{</div><div class='del'>-		.plaintext = "abc",</div><div class='del'>-		.psize	= 3,</div><div class='del'>-		.digest	= "\xba\x78\x16\xbf\x8f\x01\xcf\xea"</div><div class='del'>-			  "\x41\x41\x40\xde\x5d\xae\x22\x23"</div><div class='del'>-			  "\xb0\x03\x61\xa3\x96\x17\x7a\x9c"</div><div class='del'>-			  "\xb4\x10\xff\x61\xf2\x00\x15\xad",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",</div><div class='del'>-		.psize	= 56,</div><div class='del'>-		.digest	= "\x24\x8d\x6a\x61\xd2\x06\x38\xb8"</div><div class='del'>-			  "\xe5\xc0\x26\x93\x0c\x3e\x60\x39"</div><div class='del'>-			  "\xa3\x3c\xe4\x59\x64\xff\x21\x67"</div><div class='del'>-			  "\xf6\xec\xed\xd4\x19\xdb\x06\xc1",</div><div class='del'>-		.np	= 2,</div><div class='del'>-		.tap	= { 28, 28 }</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * SHA384 test vectors from from NIST and kerneli</div><div class='del'>- */</div><div class='del'>-#define SHA384_TEST_VECTORS	4</div><div class='del'>-</div><div class='del'>-static struct hash_testvec sha384_tv_template[] = {</div><div class='del'>-	{</div><div class='del'>-		.plaintext= "abc",</div><div class='del'>-		.psize	= 3,</div><div class='del'>-		.digest	= "\xcb\x00\x75\x3f\x45\xa3\x5e\x8b"</div><div class='del'>-			  "\xb5\xa0\x3d\x69\x9a\xc6\x50\x07"</div><div class='del'>-			  "\x27\x2c\x32\xab\x0e\xde\xd1\x63"</div><div class='del'>-			  "\x1a\x8b\x60\x5a\x43\xff\x5b\xed"</div><div class='del'>-			  "\x80\x86\x07\x2b\xa1\xe7\xcc\x23"</div><div class='del'>-			  "\x58\xba\xec\xa1\x34\xc8\x25\xa7",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",</div><div class='del'>-		.psize	= 56,</div><div class='del'>-		.digest	= "\x33\x91\xfd\xdd\xfc\x8d\xc7\x39"</div><div class='del'>-			  "\x37\x07\xa6\x5b\x1b\x47\x09\x39"</div><div class='del'>-			  "\x7c\xf8\xb1\xd1\x62\xaf\x05\xab"</div><div class='del'>-			  "\xfe\x8f\x45\x0d\xe5\xf3\x6b\xc6"</div><div class='del'>-			  "\xb0\x45\x5a\x85\x20\xbc\x4e\x6f"</div><div class='del'>-			  "\x5f\xe9\x5b\x1f\xe3\xc8\x45\x2b",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmn"</div><div class='del'>-			   "hijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu",</div><div class='del'>-		.psize	= 112,</div><div class='del'>-		.digest	= "\x09\x33\x0c\x33\xf7\x11\x47\xe8"</div><div class='del'>-			  "\x3d\x19\x2f\xc7\x82\xcd\x1b\x47"</div><div class='del'>-			  "\x53\x11\x1b\x17\x3b\x3b\x05\xd2"</div><div class='del'>-			  "\x2f\xa0\x80\x86\xe3\xb0\xf7\x12"</div><div class='del'>-			  "\xfc\xc7\xc7\x1a\x55\x7e\x2d\xb9"</div><div class='del'>-			  "\x66\xc3\xe9\xfa\x91\x74\x60\x39",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcd"</div><div class='del'>-			   "efghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz",</div><div class='del'>-		.psize	= 104,</div><div class='del'>-		.digest	= "\x3d\x20\x89\x73\xab\x35\x08\xdb"</div><div class='del'>-			  "\xbd\x7e\x2c\x28\x62\xba\x29\x0a"</div><div class='del'>-			  "\xd3\x01\x0e\x49\x78\xc1\x98\xdc"</div><div class='del'>-			  "\x4d\x8f\xd0\x14\xe5\x82\x82\x3a"</div><div class='del'>-			  "\x89\xe1\x6f\x9b\x2a\x7b\xbc\x1a"</div><div class='del'>-			  "\xc9\x38\xe2\xd1\x99\xe8\xbe\xa4",</div><div class='del'>-		.np	= 4,</div><div class='del'>-		.tap	= { 26, 26, 26, 26 }</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * SHA512 test vectors from from NIST and kerneli</div><div class='del'>- */</div><div class='del'>-#define SHA512_TEST_VECTORS	4</div><div class='del'>-</div><div class='del'>-static struct hash_testvec sha512_tv_template[] = {</div><div class='del'>-	{</div><div class='del'>-		.plaintext = "abc",</div><div class='del'>-		.psize	= 3,</div><div class='del'>-		.digest	= "\xdd\xaf\x35\xa1\x93\x61\x7a\xba"</div><div class='del'>-			  "\xcc\x41\x73\x49\xae\x20\x41\x31"</div><div class='del'>-			  "\x12\xe6\xfa\x4e\x89\xa9\x7e\xa2"</div><div class='del'>-			  "\x0a\x9e\xee\xe6\x4b\x55\xd3\x9a"</div><div class='del'>-			  "\x21\x92\x99\x2a\x27\x4f\xc1\xa8"</div><div class='del'>-			  "\x36\xba\x3c\x23\xa3\xfe\xeb\xbd"</div><div class='del'>-			  "\x45\x4d\x44\x23\x64\x3c\xe8\x0e"</div><div class='del'>-			  "\x2a\x9a\xc9\x4f\xa5\x4c\xa4\x9f",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",</div><div class='del'>-		.psize	= 56,</div><div class='del'>-		.digest	= "\x20\x4a\x8f\xc6\xdd\xa8\x2f\x0a"</div><div class='del'>-			  "\x0c\xed\x7b\xeb\x8e\x08\xa4\x16"</div><div class='del'>-			  "\x57\xc1\x6e\xf4\x68\xb2\x28\xa8"</div><div class='del'>-			  "\x27\x9b\xe3\x31\xa7\x03\xc3\x35"</div><div class='del'>-			  "\x96\xfd\x15\xc1\x3b\x1b\x07\xf9"</div><div class='del'>-			  "\xaa\x1d\x3b\xea\x57\x78\x9c\xa0"</div><div class='del'>-			  "\x31\xad\x85\xc7\xa7\x1d\xd7\x03"</div><div class='del'>-			  "\x54\xec\x63\x12\x38\xca\x34\x45",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmn"</div><div class='del'>-			   "hijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu",</div><div class='del'>-		.psize	= 112,</div><div class='del'>-		.digest	= "\x8e\x95\x9b\x75\xda\xe3\x13\xda"</div><div class='del'>-			  "\x8c\xf4\xf7\x28\x14\xfc\x14\x3f"</div><div class='del'>-			  "\x8f\x77\x79\xc6\xeb\x9f\x7f\xa1"</div><div class='del'>-			  "\x72\x99\xae\xad\xb6\x88\x90\x18"</div><div class='del'>-			  "\x50\x1d\x28\x9e\x49\x00\xf7\xe4"</div><div class='del'>-			  "\x33\x1b\x99\xde\xc4\xb5\x43\x3a"</div><div class='del'>-			  "\xc7\xd3\x29\xee\xb6\xdd\x26\x54"</div><div class='del'>-			  "\x5e\x96\xe5\x5b\x87\x4b\xe9\x09",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcd"</div><div class='del'>-			   "efghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz",</div><div class='del'>-		.psize	= 104,</div><div class='del'>-		.digest	= "\x93\x0d\x0c\xef\xcb\x30\xff\x11"</div><div class='del'>-			  "\x33\xb6\x89\x81\x21\xf1\xcf\x3d"</div><div class='del'>-			  "\x27\x57\x8a\xfc\xaf\xe8\x67\x7c"</div><div class='del'>-			  "\x52\x57\xcf\x06\x99\x11\xf7\x5d"</div><div class='del'>-			  "\x8f\x58\x31\xb5\x6e\xbf\xda\x67"</div><div class='del'>-			  "\xb2\x78\xe6\x6d\xff\x8b\x84\xfe"</div><div class='del'>-			  "\x2b\x28\x70\xf7\x42\xa5\x80\xd8"</div><div class='del'>-			  "\xed\xb4\x19\x87\x23\x28\x50\xc9",</div><div class='del'>-		.np	= 4,</div><div class='del'>-		.tap	= { 26, 26, 26, 26 }</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * WHIRLPOOL test vectors from Whirlpool package</div><div class='del'>- * by Vincent Rijmen and Paulo S. L. M. Barreto as part of the NESSIE</div><div class='del'>- * submission</div><div class='del'>- */</div><div class='del'>-#define WP512_TEST_VECTORS	8</div><div class='del'>-</div><div class='del'>-static struct hash_testvec wp512_tv_template[] = {</div><div class='del'>-	{</div><div class='del'>-		.plaintext = "",</div><div class='del'>-		.psize	= 0,</div><div class='del'>-		.digest	= "\x19\xFA\x61\xD7\x55\x22\xA4\x66"</div><div class='del'>-			  "\x9B\x44\xE3\x9C\x1D\x2E\x17\x26"</div><div class='del'>-			  "\xC5\x30\x23\x21\x30\xD4\x07\xF8"</div><div class='del'>-			  "\x9A\xFE\xE0\x96\x49\x97\xF7\xA7"</div><div class='del'>-			  "\x3E\x83\xBE\x69\x8B\x28\x8F\xEB"</div><div class='del'>-			  "\xCF\x88\xE3\xE0\x3C\x4F\x07\x57"</div><div class='del'>-			  "\xEA\x89\x64\xE5\x9B\x63\xD9\x37"</div><div class='del'>-			  "\x08\xB1\x38\xCC\x42\xA6\x6E\xB3",</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "a",</div><div class='del'>-		.psize	= 1,</div><div class='del'>-		.digest	= "\x8A\xCA\x26\x02\x79\x2A\xEC\x6F"</div><div class='del'>-			  "\x11\xA6\x72\x06\x53\x1F\xB7\xD7"</div><div class='del'>-			  "\xF0\xDF\xF5\x94\x13\x14\x5E\x69"</div><div class='del'>-			  "\x73\xC4\x50\x01\xD0\x08\x7B\x42"</div><div class='del'>-			  "\xD1\x1B\xC6\x45\x41\x3A\xEF\xF6"</div><div class='del'>-			  "\x3A\x42\x39\x1A\x39\x14\x5A\x59"</div><div class='del'>-			  "\x1A\x92\x20\x0D\x56\x01\x95\xE5"</div><div class='del'>-			  "\x3B\x47\x85\x84\xFD\xAE\x23\x1A",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "abc",</div><div class='del'>-		.psize	= 3,</div><div class='del'>-		.digest	= "\x4E\x24\x48\xA4\xC6\xF4\x86\xBB"</div><div class='del'>-			  "\x16\xB6\x56\x2C\x73\xB4\x02\x0B"</div><div class='del'>-			  "\xF3\x04\x3E\x3A\x73\x1B\xCE\x72"</div><div class='del'>-			  "\x1A\xE1\xB3\x03\xD9\x7E\x6D\x4C"</div><div class='del'>-			  "\x71\x81\xEE\xBD\xB6\xC5\x7E\x27"</div><div class='del'>-			  "\x7D\x0E\x34\x95\x71\x14\xCB\xD6"</div><div class='del'>-			  "\xC7\x97\xFC\x9D\x95\xD8\xB5\x82"</div><div class='del'>-			  "\xD2\x25\x29\x20\x76\xD4\xEE\xF5",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "message digest",</div><div class='del'>-		.psize	= 14,</div><div class='del'>-		.digest	= "\x37\x8C\x84\xA4\x12\x6E\x2D\xC6"</div><div class='del'>-			  "\xE5\x6D\xCC\x74\x58\x37\x7A\xAC"</div><div class='del'>-			  "\x83\x8D\x00\x03\x22\x30\xF5\x3C"</div><div class='del'>-			  "\xE1\xF5\x70\x0C\x0F\xFB\x4D\x3B"</div><div class='del'>-			  "\x84\x21\x55\x76\x59\xEF\x55\xC1"</div><div class='del'>-			  "\x06\xB4\xB5\x2A\xC5\xA4\xAA\xA6"</div><div class='del'>-			  "\x92\xED\x92\x00\x52\x83\x8F\x33"</div><div class='del'>-			  "\x62\xE8\x6D\xBD\x37\xA8\x90\x3E",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "abcdefghijklmnopqrstuvwxyz",</div><div class='del'>-		.psize	= 26,</div><div class='del'>-		.digest	= "\xF1\xD7\x54\x66\x26\x36\xFF\xE9"</div><div class='del'>-			  "\x2C\x82\xEB\xB9\x21\x2A\x48\x4A"</div><div class='del'>-			  "\x8D\x38\x63\x1E\xAD\x42\x38\xF5"</div><div class='del'>-			  "\x44\x2E\xE1\x3B\x80\x54\xE4\x1B"</div><div class='del'>-			  "\x08\xBF\x2A\x92\x51\xC3\x0B\x6A"</div><div class='del'>-			  "\x0B\x8A\xAE\x86\x17\x7A\xB4\xA6"</div><div class='del'>-			  "\xF6\x8F\x67\x3E\x72\x07\x86\x5D"</div><div class='del'>-			  "\x5D\x98\x19\xA3\xDB\xA4\xEB\x3B",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"</div><div class='del'>-			   "abcdefghijklmnopqrstuvwxyz0123456789",</div><div class='del'>-		.psize	= 62,</div><div class='del'>-		.digest	= "\xDC\x37\xE0\x08\xCF\x9E\xE6\x9B"</div><div class='del'>-			  "\xF1\x1F\x00\xED\x9A\xBA\x26\x90"</div><div class='del'>-			  "\x1D\xD7\xC2\x8C\xDE\xC0\x66\xCC"</div><div class='del'>-			  "\x6A\xF4\x2E\x40\xF8\x2F\x3A\x1E"</div><div class='del'>-			  "\x08\xEB\xA2\x66\x29\x12\x9D\x8F"</div><div class='del'>-			  "\xB7\xCB\x57\x21\x1B\x92\x81\xA6"</div><div class='del'>-			  "\x55\x17\xCC\x87\x9D\x7B\x96\x21"</div><div class='del'>-			  "\x42\xC6\x5F\x5A\x7A\xF0\x14\x67",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "1234567890123456789012345678901234567890"</div><div class='del'>-			   "1234567890123456789012345678901234567890",</div><div class='del'>-		.psize	= 80,</div><div class='del'>-		.digest	= "\x46\x6E\xF1\x8B\xAB\xB0\x15\x4D"</div><div class='del'>-			  "\x25\xB9\xD3\x8A\x64\x14\xF5\xC0"</div><div class='del'>-			  "\x87\x84\x37\x2B\xCC\xB2\x04\xD6"</div><div class='del'>-			  "\x54\x9C\x4A\xFA\xDB\x60\x14\x29"</div><div class='del'>-			  "\x4D\x5B\xD8\xDF\x2A\x6C\x44\xE5"</div><div class='del'>-			  "\x38\xCD\x04\x7B\x26\x81\xA5\x1A"</div><div class='del'>-			  "\x2C\x60\x48\x1E\x88\xC5\xA2\x0B"</div><div class='del'>-			  "\x2C\x2A\x80\xCF\x3A\x9A\x08\x3B",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "abcdbcdecdefdefgefghfghighijhijk",</div><div class='del'>-		.psize	= 32,</div><div class='del'>-		.digest	= "\x2A\x98\x7E\xA4\x0F\x91\x70\x61"</div><div class='del'>-			  "\xF5\xD6\xF0\xA0\xE4\x64\x4F\x48"</div><div class='del'>-			  "\x8A\x7A\x5A\x52\xDE\xEE\x65\x62"</div><div class='del'>-			  "\x07\xC5\x62\xF9\x88\xE9\x5C\x69"</div><div class='del'>-			  "\x16\xBD\xC8\x03\x1B\xC5\xBE\x1B"</div><div class='del'>-			  "\x7B\x94\x76\x39\xFE\x05\x0B\x56"</div><div class='del'>-			  "\x93\x9B\xAA\xA0\xAD\xFF\x9A\xE6"</div><div class='del'>-			  "\x74\x5B\x7B\x18\x1C\x3B\xE3\xFD",</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define WP384_TEST_VECTORS	8</div><div class='del'>-</div><div class='del'>-static struct hash_testvec wp384_tv_template[] = {</div><div class='del'>-	{</div><div class='del'>-		.plaintext = "",</div><div class='del'>-		.psize	= 0,</div><div class='del'>-		.digest	= "\x19\xFA\x61\xD7\x55\x22\xA4\x66"</div><div class='del'>-			  "\x9B\x44\xE3\x9C\x1D\x2E\x17\x26"</div><div class='del'>-			  "\xC5\x30\x23\x21\x30\xD4\x07\xF8"</div><div class='del'>-			  "\x9A\xFE\xE0\x96\x49\x97\xF7\xA7"</div><div class='del'>-			  "\x3E\x83\xBE\x69\x8B\x28\x8F\xEB"</div><div class='del'>-			  "\xCF\x88\xE3\xE0\x3C\x4F\x07\x57",</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "a",</div><div class='del'>-		.psize	= 1,</div><div class='del'>-		.digest	= "\x8A\xCA\x26\x02\x79\x2A\xEC\x6F"</div><div class='del'>-			  "\x11\xA6\x72\x06\x53\x1F\xB7\xD7"</div><div class='del'>-			  "\xF0\xDF\xF5\x94\x13\x14\x5E\x69"</div><div class='del'>-			  "\x73\xC4\x50\x01\xD0\x08\x7B\x42"</div><div class='del'>-			  "\xD1\x1B\xC6\x45\x41\x3A\xEF\xF6"</div><div class='del'>-			  "\x3A\x42\x39\x1A\x39\x14\x5A\x59",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "abc",</div><div class='del'>-		.psize	= 3,</div><div class='del'>-		.digest	= "\x4E\x24\x48\xA4\xC6\xF4\x86\xBB"</div><div class='del'>-			  "\x16\xB6\x56\x2C\x73\xB4\x02\x0B"</div><div class='del'>-			  "\xF3\x04\x3E\x3A\x73\x1B\xCE\x72"</div><div class='del'>-			  "\x1A\xE1\xB3\x03\xD9\x7E\x6D\x4C"</div><div class='del'>-			  "\x71\x81\xEE\xBD\xB6\xC5\x7E\x27"</div><div class='del'>-			  "\x7D\x0E\x34\x95\x71\x14\xCB\xD6",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "message digest",</div><div class='del'>-		.psize	= 14,</div><div class='del'>-		.digest	= "\x37\x8C\x84\xA4\x12\x6E\x2D\xC6"</div><div class='del'>-			  "\xE5\x6D\xCC\x74\x58\x37\x7A\xAC"</div><div class='del'>-			  "\x83\x8D\x00\x03\x22\x30\xF5\x3C"</div><div class='del'>-			  "\xE1\xF5\x70\x0C\x0F\xFB\x4D\x3B"</div><div class='del'>-			  "\x84\x21\x55\x76\x59\xEF\x55\xC1"</div><div class='del'>-			  "\x06\xB4\xB5\x2A\xC5\xA4\xAA\xA6",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "abcdefghijklmnopqrstuvwxyz",</div><div class='del'>-		.psize	= 26,</div><div class='del'>-		.digest	= "\xF1\xD7\x54\x66\x26\x36\xFF\xE9"</div><div class='del'>-			  "\x2C\x82\xEB\xB9\x21\x2A\x48\x4A"</div><div class='del'>-			  "\x8D\x38\x63\x1E\xAD\x42\x38\xF5"</div><div class='del'>-			  "\x44\x2E\xE1\x3B\x80\x54\xE4\x1B"</div><div class='del'>-			  "\x08\xBF\x2A\x92\x51\xC3\x0B\x6A"</div><div class='del'>-			  "\x0B\x8A\xAE\x86\x17\x7A\xB4\xA6",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"</div><div class='del'>-			   "abcdefghijklmnopqrstuvwxyz0123456789",</div><div class='del'>-		.psize	= 62,</div><div class='del'>-		.digest	= "\xDC\x37\xE0\x08\xCF\x9E\xE6\x9B"</div><div class='del'>-			  "\xF1\x1F\x00\xED\x9A\xBA\x26\x90"</div><div class='del'>-			  "\x1D\xD7\xC2\x8C\xDE\xC0\x66\xCC"</div><div class='del'>-			  "\x6A\xF4\x2E\x40\xF8\x2F\x3A\x1E"</div><div class='del'>-			  "\x08\xEB\xA2\x66\x29\x12\x9D\x8F"</div><div class='del'>-			  "\xB7\xCB\x57\x21\x1B\x92\x81\xA6",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "1234567890123456789012345678901234567890"</div><div class='del'>-			   "1234567890123456789012345678901234567890",</div><div class='del'>-		.psize	= 80,</div><div class='del'>-		.digest	= "\x46\x6E\xF1\x8B\xAB\xB0\x15\x4D"</div><div class='del'>-			  "\x25\xB9\xD3\x8A\x64\x14\xF5\xC0"</div><div class='del'>-			  "\x87\x84\x37\x2B\xCC\xB2\x04\xD6"</div><div class='del'>-			  "\x54\x9C\x4A\xFA\xDB\x60\x14\x29"</div><div class='del'>-			  "\x4D\x5B\xD8\xDF\x2A\x6C\x44\xE5"</div><div class='del'>-			  "\x38\xCD\x04\x7B\x26\x81\xA5\x1A",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "abcdbcdecdefdefgefghfghighijhijk",</div><div class='del'>-		.psize	= 32,</div><div class='del'>-		.digest	= "\x2A\x98\x7E\xA4\x0F\x91\x70\x61"</div><div class='del'>-			  "\xF5\xD6\xF0\xA0\xE4\x64\x4F\x48"</div><div class='del'>-			  "\x8A\x7A\x5A\x52\xDE\xEE\x65\x62"</div><div class='del'>-			  "\x07\xC5\x62\xF9\x88\xE9\x5C\x69"</div><div class='del'>-			  "\x16\xBD\xC8\x03\x1B\xC5\xBE\x1B"</div><div class='del'>-			  "\x7B\x94\x76\x39\xFE\x05\x0B\x56",</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define WP256_TEST_VECTORS	8</div><div class='del'>-</div><div class='del'>-static struct hash_testvec wp256_tv_template[] = {</div><div class='del'>-	{</div><div class='del'>-		.plaintext = "",</div><div class='del'>-		.psize	= 0,</div><div class='del'>-		.digest	= "\x19\xFA\x61\xD7\x55\x22\xA4\x66"</div><div class='del'>-			  "\x9B\x44\xE3\x9C\x1D\x2E\x17\x26"</div><div class='del'>-			  "\xC5\x30\x23\x21\x30\xD4\x07\xF8"</div><div class='del'>-			  "\x9A\xFE\xE0\x96\x49\x97\xF7\xA7",</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "a",</div><div class='del'>-		.psize	= 1,</div><div class='del'>-		.digest	= "\x8A\xCA\x26\x02\x79\x2A\xEC\x6F"</div><div class='del'>-			  "\x11\xA6\x72\x06\x53\x1F\xB7\xD7"</div><div class='del'>-			  "\xF0\xDF\xF5\x94\x13\x14\x5E\x69"</div><div class='del'>-			  "\x73\xC4\x50\x01\xD0\x08\x7B\x42",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "abc",</div><div class='del'>-		.psize	= 3,</div><div class='del'>-		.digest	= "\x4E\x24\x48\xA4\xC6\xF4\x86\xBB"</div><div class='del'>-			  "\x16\xB6\x56\x2C\x73\xB4\x02\x0B"</div><div class='del'>-			  "\xF3\x04\x3E\x3A\x73\x1B\xCE\x72"</div><div class='del'>-			  "\x1A\xE1\xB3\x03\xD9\x7E\x6D\x4C",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "message digest",</div><div class='del'>-		.psize	= 14,</div><div class='del'>-		.digest	= "\x37\x8C\x84\xA4\x12\x6E\x2D\xC6"</div><div class='del'>-			  "\xE5\x6D\xCC\x74\x58\x37\x7A\xAC"</div><div class='del'>-			  "\x83\x8D\x00\x03\x22\x30\xF5\x3C"</div><div class='del'>-			  "\xE1\xF5\x70\x0C\x0F\xFB\x4D\x3B",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "abcdefghijklmnopqrstuvwxyz",</div><div class='del'>-		.psize	= 26,</div><div class='del'>-		.digest	= "\xF1\xD7\x54\x66\x26\x36\xFF\xE9"</div><div class='del'>-			  "\x2C\x82\xEB\xB9\x21\x2A\x48\x4A"</div><div class='del'>-			  "\x8D\x38\x63\x1E\xAD\x42\x38\xF5"</div><div class='del'>-			  "\x44\x2E\xE1\x3B\x80\x54\xE4\x1B",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"</div><div class='del'>-			   "abcdefghijklmnopqrstuvwxyz0123456789",</div><div class='del'>-		.psize	= 62,</div><div class='del'>-		.digest	= "\xDC\x37\xE0\x08\xCF\x9E\xE6\x9B"</div><div class='del'>-			  "\xF1\x1F\x00\xED\x9A\xBA\x26\x90"</div><div class='del'>-			  "\x1D\xD7\xC2\x8C\xDE\xC0\x66\xCC"</div><div class='del'>-			  "\x6A\xF4\x2E\x40\xF8\x2F\x3A\x1E",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "1234567890123456789012345678901234567890"</div><div class='del'>-			   "1234567890123456789012345678901234567890",</div><div class='del'>-		.psize	= 80,</div><div class='del'>-		.digest	= "\x46\x6E\xF1\x8B\xAB\xB0\x15\x4D"</div><div class='del'>-			  "\x25\xB9\xD3\x8A\x64\x14\xF5\xC0"</div><div class='del'>-			  "\x87\x84\x37\x2B\xCC\xB2\x04\xD6"</div><div class='del'>-			  "\x54\x9C\x4A\xFA\xDB\x60\x14\x29",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "abcdbcdecdefdefgefghfghighijhijk",</div><div class='del'>-		.psize	= 32,</div><div class='del'>-		.digest	= "\x2A\x98\x7E\xA4\x0F\x91\x70\x61"</div><div class='del'>-			  "\xF5\xD6\xF0\xA0\xE4\x64\x4F\x48"</div><div class='del'>-			  "\x8A\x7A\x5A\x52\xDE\xEE\x65\x62"</div><div class='del'>-			  "\x07\xC5\x62\xF9\x88\xE9\x5C\x69",</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * TIGER test vectors from Tiger website</div><div class='del'>- */</div><div class='del'>-#define TGR192_TEST_VECTORS	6</div><div class='del'>-</div><div class='del'>-static struct hash_testvec tgr192_tv_template[] = {</div><div class='del'>-	{</div><div class='del'>-		.plaintext = "",</div><div class='del'>-		.psize	= 0,</div><div class='del'>-		.digest = "\x24\xf0\x13\x0c\x63\xac\x93\x32"</div><div class='del'>-			  "\x16\x16\x6e\x76\xb1\xbb\x92\x5f"</div><div class='del'>-			  "\xf3\x73\xde\x2d\x49\x58\x4e\x7a",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "abc",</div><div class='del'>-		.psize	= 3,</div><div class='del'>-		.digest = "\xf2\x58\xc1\xe8\x84\x14\xab\x2a"</div><div class='del'>-			  "\x52\x7a\xb5\x41\xff\xc5\xb8\xbf"</div><div class='del'>-			  "\x93\x5f\x7b\x95\x1c\x13\x29\x51",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "Tiger",</div><div class='del'>-		.psize	= 5,</div><div class='del'>-		.digest = "\x9f\x00\xf5\x99\x07\x23\x00\xdd"</div><div class='del'>-			  "\x27\x6a\xbb\x38\xc8\xeb\x6d\xec"</div><div class='del'>-			  "\x37\x79\x0c\x11\x6f\x9d\x2b\xdf",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+-",</div><div class='del'>-		.psize	= 64,</div><div class='del'>-		.digest = "\x87\xfb\x2a\x90\x83\x85\x1c\xf7"</div><div class='del'>-			  "\x47\x0d\x2c\xf8\x10\xe6\xdf\x9e"</div><div class='del'>-			  "\xb5\x86\x44\x50\x34\xa5\xa3\x86",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "ABCDEFGHIJKLMNOPQRSTUVWXYZ=abcdefghijklmnopqrstuvwxyz+0123456789",</div><div class='del'>-		.psize	= 64,</div><div class='del'>-		.digest = "\x46\x7d\xb8\x08\x63\xeb\xce\x48"</div><div class='del'>-			  "\x8d\xf1\xcd\x12\x61\x65\x5d\xe9"</div><div class='del'>-			  "\x57\x89\x65\x65\x97\x5f\x91\x97",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "Tiger - A Fast New Hash Function, "</div><div class='del'>-			   "by Ross Anderson and Eli Biham, "</div><div class='del'>-			   "proceedings of Fast Software Encryption 3, "</div><div class='del'>-			   "Cambridge, 1996.",</div><div class='del'>-		.psize  = 125,</div><div class='del'>-		.digest = "\x3d\x9a\xeb\x03\xd1\xbd\x1a\x63"</div><div class='del'>-			  "\x57\xb2\x77\x4d\xfd\x6d\x5b\x24"</div><div class='del'>-			  "\xdd\x68\x15\x1d\x50\x39\x74\xfc",</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define TGR160_TEST_VECTORS	6</div><div class='del'>-</div><div class='del'>-static struct hash_testvec tgr160_tv_template[] = {</div><div class='del'>-	{</div><div class='del'>-		.plaintext = "",</div><div class='del'>-		.psize	= 0,</div><div class='del'>-		.digest = "\x24\xf0\x13\x0c\x63\xac\x93\x32"</div><div class='del'>-			  "\x16\x16\x6e\x76\xb1\xbb\x92\x5f"</div><div class='del'>-			  "\xf3\x73\xde\x2d",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "abc",</div><div class='del'>-		.psize	= 3,</div><div class='del'>-		.digest = "\xf2\x58\xc1\xe8\x84\x14\xab\x2a"</div><div class='del'>-			  "\x52\x7a\xb5\x41\xff\xc5\xb8\xbf"</div><div class='del'>-			  "\x93\x5f\x7b\x95",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "Tiger",</div><div class='del'>-		.psize	= 5,</div><div class='del'>-		.digest = "\x9f\x00\xf5\x99\x07\x23\x00\xdd"</div><div class='del'>-			  "\x27\x6a\xbb\x38\xc8\xeb\x6d\xec"</div><div class='del'>-			  "\x37\x79\x0c\x11",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+-",</div><div class='del'>-		.psize	= 64,</div><div class='del'>-		.digest = "\x87\xfb\x2a\x90\x83\x85\x1c\xf7"</div><div class='del'>-			  "\x47\x0d\x2c\xf8\x10\xe6\xdf\x9e"</div><div class='del'>-			  "\xb5\x86\x44\x50",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "ABCDEFGHIJKLMNOPQRSTUVWXYZ=abcdefghijklmnopqrstuvwxyz+0123456789",</div><div class='del'>-		.psize	= 64,</div><div class='del'>-		.digest = "\x46\x7d\xb8\x08\x63\xeb\xce\x48"</div><div class='del'>-			  "\x8d\xf1\xcd\x12\x61\x65\x5d\xe9"</div><div class='del'>-			  "\x57\x89\x65\x65",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "Tiger - A Fast New Hash Function, "</div><div class='del'>-			   "by Ross Anderson and Eli Biham, "</div><div class='del'>-			   "proceedings of Fast Software Encryption 3, "</div><div class='del'>-			   "Cambridge, 1996.",</div><div class='del'>-		.psize  = 125,</div><div class='del'>-		.digest = "\x3d\x9a\xeb\x03\xd1\xbd\x1a\x63"</div><div class='del'>-			  "\x57\xb2\x77\x4d\xfd\x6d\x5b\x24"</div><div class='del'>-			  "\xdd\x68\x15\x1d",</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define TGR128_TEST_VECTORS	6</div><div class='del'>-</div><div class='del'>-static struct hash_testvec tgr128_tv_template[] = {</div><div class='del'>-	{</div><div class='del'>-		.plaintext = "",</div><div class='del'>-		.psize	= 0,</div><div class='del'>-		.digest = "\x24\xf0\x13\x0c\x63\xac\x93\x32"</div><div class='del'>-			  "\x16\x16\x6e\x76\xb1\xbb\x92\x5f",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "abc",</div><div class='del'>-		.psize	= 3,</div><div class='del'>-		.digest = "\xf2\x58\xc1\xe8\x84\x14\xab\x2a"</div><div class='del'>-			  "\x52\x7a\xb5\x41\xff\xc5\xb8\xbf",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "Tiger",</div><div class='del'>-		.psize	= 5,</div><div class='del'>-		.digest = "\x9f\x00\xf5\x99\x07\x23\x00\xdd"</div><div class='del'>-			  "\x27\x6a\xbb\x38\xc8\xeb\x6d\xec",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+-",</div><div class='del'>-		.psize	= 64,</div><div class='del'>-		.digest = "\x87\xfb\x2a\x90\x83\x85\x1c\xf7"</div><div class='del'>-			  "\x47\x0d\x2c\xf8\x10\xe6\xdf\x9e",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "ABCDEFGHIJKLMNOPQRSTUVWXYZ=abcdefghijklmnopqrstuvwxyz+0123456789",</div><div class='del'>-		.psize	= 64,</div><div class='del'>-		.digest = "\x46\x7d\xb8\x08\x63\xeb\xce\x48"</div><div class='del'>-			  "\x8d\xf1\xcd\x12\x61\x65\x5d\xe9",</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "Tiger - A Fast New Hash Function, "</div><div class='del'>-			   "by Ross Anderson and Eli Biham, "</div><div class='del'>-			   "proceedings of Fast Software Encryption 3, "</div><div class='del'>-			   "Cambridge, 1996.",</div><div class='del'>-		.psize  = 125,</div><div class='del'>-		.digest = "\x3d\x9a\xeb\x03\xd1\xbd\x1a\x63"</div><div class='del'>-			  "\x57\xb2\x77\x4d\xfd\x6d\x5b\x24",</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * HMAC-MD5 test vectors from RFC2202</div><div class='del'>- * (These need to be fixed to not use strlen).</div><div class='del'>- */</div><div class='del'>-#define HMAC_MD5_TEST_VECTORS	7</div><div class='del'>-</div><div class='del'>-static struct hash_testvec hmac_md5_tv_template[] =</div><div class='del'>-{</div><div class='del'>-	{</div><div class='del'>-		.key	= "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b",</div><div class='del'>-		.ksize	= 16,</div><div class='del'>-		.plaintext = "Hi There",</div><div class='del'>-		.psize	= 8,</div><div class='del'>-		.digest	= "\x92\x94\x72\x7a\x36\x38\xbb\x1c"</div><div class='del'>-			  "\x13\xf4\x8e\xf8\x15\x8b\xfc\x9d",</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "Jefe",</div><div class='del'>-		.ksize	= 4,</div><div class='del'>-		.plaintext = "what do ya want for nothing?",</div><div class='del'>-		.psize	= 28,</div><div class='del'>-		.digest	= "\x75\x0c\x78\x3e\x6a\xb0\xb5\x03"</div><div class='del'>-			  "\xea\xa8\x6e\x31\x0a\x5d\xb7\x38",</div><div class='del'>-		.np	= 2,</div><div class='del'>-		.tap	= {14, 14}</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa",</div><div class='del'>-		.ksize	= 16,</div><div class='del'>-		.plaintext = "\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd"</div><div class='del'>-			"\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd"</div><div class='del'>-			"\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd"</div><div class='del'>-			"\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd",</div><div class='del'>-		.psize	= 50,</div><div class='del'>-		.digest	= "\x56\xbe\x34\x52\x1d\x14\x4c\x88"</div><div class='del'>-			  "\xdb\xb8\xc7\x33\xf0\xe8\xb3\xf6",</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x01\x02\x03\x04\x05\x06\x07\x08"</div><div class='del'>-			  "\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10"</div><div class='del'>-			  "\x11\x12\x13\x14\x15\x16\x17\x18\x19",</div><div class='del'>-		.ksize	= 25,</div><div class='del'>-		.plaintext = "\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd"</div><div class='del'>-			"\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd"</div><div class='del'>-			"\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd"</div><div class='del'>-			"\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd",</div><div class='del'>-		.psize	= 50,</div><div class='del'>-		.digest	= "\x69\x7e\xaf\x0a\xca\x3a\x3a\xea"</div><div class='del'>-			  "\x3a\x75\x16\x47\x46\xff\xaa\x79",</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c",</div><div class='del'>-		.ksize	= 16,</div><div class='del'>-		.plaintext = "Test With Truncation",</div><div class='del'>-		.psize	= 20,</div><div class='del'>-		.digest	= "\x56\x46\x1e\xf2\x34\x2e\xdc\x00"</div><div class='del'>-			  "\xf9\xba\xb9\x95\x69\x0e\xfd\x4c",</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa",</div><div class='del'>-		.ksize	= 80,</div><div class='del'>-		.plaintext = "Test Using Larger Than Block-Size Key - Hash Key First",</div><div class='del'>-		.psize	= 54,</div><div class='del'>-		.digest	= "\x6b\x1a\xb7\xfe\x4b\xd7\xbf\x8f"</div><div class='del'>-			  "\x0b\x62\xe6\xce\x61\xb9\xd0\xcd",</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa",</div><div class='del'>-		.ksize	= 80,</div><div class='del'>-		.plaintext = "Test Using Larger Than Block-Size Key and Larger Than One "</div><div class='del'>-			   "Block-Size Data",</div><div class='del'>-		.psize	= 73,</div><div class='del'>-		.digest	= "\x6f\x63\x0f\xad\x67\xcd\xa0\xee"</div><div class='del'>-			  "\x1f\xb1\xf5\x62\xdb\x3a\xa5\x3e",</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * HMAC-RIPEMD128 test vectors from RFC2286</div><div class='del'>- */</div><div class='del'>-#define HMAC_RMD128_TEST_VECTORS	7</div><div class='del'>-</div><div class='del'>-static struct hash_testvec hmac_rmd128_tv_template[] = {</div><div class='del'>-	{</div><div class='del'>-		.key	= "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b",</div><div class='del'>-		.ksize	= 16,</div><div class='del'>-		.plaintext = "Hi There",</div><div class='del'>-		.psize	= 8,</div><div class='del'>-		.digest	= "\xfb\xf6\x1f\x94\x92\xaa\x4b\xbf"</div><div class='del'>-			  "\x81\xc1\x72\xe8\x4e\x07\x34\xdb",</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "Jefe",</div><div class='del'>-		.ksize	= 4,</div><div class='del'>-		.plaintext = "what do ya want for nothing?",</div><div class='del'>-		.psize	= 28,</div><div class='del'>-		.digest	= "\x87\x5f\x82\x88\x62\xb6\xb3\x34"</div><div class='del'>-			  "\xb4\x27\xc5\x5f\x9f\x7f\xf0\x9b",</div><div class='del'>-		.np	= 2,</div><div class='del'>-		.tap	= { 14, 14 },</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa",</div><div class='del'>-		.ksize	= 16,</div><div class='del'>-		.plaintext = "\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd"</div><div class='del'>-			"\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd"</div><div class='del'>-			"\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd"</div><div class='del'>-			"\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd",</div><div class='del'>-		.psize	= 50,</div><div class='del'>-		.digest	= "\x09\xf0\xb2\x84\x6d\x2f\x54\x3d"</div><div class='del'>-			  "\xa3\x63\xcb\xec\x8d\x62\xa3\x8d",</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x01\x02\x03\x04\x05\x06\x07\x08"</div><div class='del'>-			  "\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10"</div><div class='del'>-			  "\x11\x12\x13\x14\x15\x16\x17\x18\x19",</div><div class='del'>-		.ksize	= 25,</div><div class='del'>-		.plaintext = "\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd"</div><div class='del'>-			"\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd"</div><div class='del'>-			"\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd"</div><div class='del'>-			"\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd",</div><div class='del'>-		.psize	= 50,</div><div class='del'>-		.digest	= "\xbd\xbb\xd7\xcf\x03\xe4\x4b\x5a"</div><div class='del'>-			  "\xa6\x0a\xf8\x15\xbe\x4d\x22\x94",</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c",</div><div class='del'>-		.ksize	= 16,</div><div class='del'>-		.plaintext = "Test With Truncation",</div><div class='del'>-		.psize	= 20,</div><div class='del'>-		.digest	= "\xe7\x98\x08\xf2\x4b\x25\xfd\x03"</div><div class='del'>-			  "\x1c\x15\x5f\x0d\x55\x1d\x9a\x3a",</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa",</div><div class='del'>-		.ksize	= 80,</div><div class='del'>-		.plaintext = "Test Using Larger Than Block-Size Key - Hash Key First",</div><div class='del'>-		.psize	= 54,</div><div class='del'>-		.digest	= "\xdc\x73\x29\x28\xde\x98\x10\x4a"</div><div class='del'>-			  "\x1f\x59\xd3\x73\xc1\x50\xac\xbb",</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa",</div><div class='del'>-		.ksize	= 80,</div><div class='del'>-		.plaintext = "Test Using Larger Than Block-Size Key and Larger Than One "</div><div class='del'>-			   "Block-Size Data",</div><div class='del'>-		.psize	= 73,</div><div class='del'>-		.digest	= "\x5c\x6b\xec\x96\x79\x3e\x16\xd4"</div><div class='del'>-			  "\x06\x90\xc2\x37\x63\x5f\x30\xc5",</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * HMAC-RIPEMD160 test vectors from RFC2286</div><div class='del'>- */</div><div class='del'>-#define HMAC_RMD160_TEST_VECTORS	7</div><div class='del'>-</div><div class='del'>-static struct hash_testvec hmac_rmd160_tv_template[] = {</div><div class='del'>-	{</div><div class='del'>-		.key	= "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b",</div><div class='del'>-		.ksize	= 20,</div><div class='del'>-		.plaintext = "Hi There",</div><div class='del'>-		.psize	= 8,</div><div class='del'>-		.digest	= "\x24\xcb\x4b\xd6\x7d\x20\xfc\x1a\x5d\x2e"</div><div class='del'>-			  "\xd7\x73\x2d\xcc\x39\x37\x7f\x0a\x56\x68",</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "Jefe",</div><div class='del'>-		.ksize	= 4,</div><div class='del'>-		.plaintext = "what do ya want for nothing?",</div><div class='del'>-		.psize	= 28,</div><div class='del'>-		.digest	= "\xdd\xa6\xc0\x21\x3a\x48\x5a\x9e\x24\xf4"</div><div class='del'>-			  "\x74\x20\x64\xa7\xf0\x33\xb4\x3c\x40\x69",</div><div class='del'>-		.np	= 2,</div><div class='del'>-		.tap	= { 14, 14 },</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa",</div><div class='del'>-		.ksize	= 20,</div><div class='del'>-		.plaintext = "\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd"</div><div class='del'>-			"\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd"</div><div class='del'>-			"\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd"</div><div class='del'>-			"\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd",</div><div class='del'>-		.psize	= 50,</div><div class='del'>-		.digest	= "\xb0\xb1\x05\x36\x0d\xe7\x59\x96\x0a\xb4"</div><div class='del'>-			  "\xf3\x52\x98\xe1\x16\xe2\x95\xd8\xe7\xc1",</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x01\x02\x03\x04\x05\x06\x07\x08"</div><div class='del'>-			  "\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10"</div><div class='del'>-			  "\x11\x12\x13\x14\x15\x16\x17\x18\x19",</div><div class='del'>-		.ksize	= 25,</div><div class='del'>-		.plaintext = "\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd"</div><div class='del'>-			"\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd"</div><div class='del'>-			"\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd"</div><div class='del'>-			"\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd",</div><div class='del'>-		.psize	= 50,</div><div class='del'>-		.digest	= "\xd5\xca\x86\x2f\x4d\x21\xd5\xe6\x10\xe1"</div><div class='del'>-			  "\x8b\x4c\xf1\xbe\xb9\x7a\x43\x65\xec\xf4",</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c",</div><div class='del'>-		.ksize	= 20,</div><div class='del'>-		.plaintext = "Test With Truncation",</div><div class='del'>-		.psize	= 20,</div><div class='del'>-		.digest	= "\x76\x19\x69\x39\x78\xf9\x1d\x90\x53\x9a"</div><div class='del'>-			  "\xe7\x86\x50\x0f\xf3\xd8\xe0\x51\x8e\x39",</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa",</div><div class='del'>-		.ksize	= 80,</div><div class='del'>-		.plaintext = "Test Using Larger Than Block-Size Key - Hash Key First",</div><div class='del'>-		.psize	= 54,</div><div class='del'>-		.digest	= "\x64\x66\xca\x07\xac\x5e\xac\x29\xe1\xbd"</div><div class='del'>-			  "\x52\x3e\x5a\xda\x76\x05\xb7\x91\xfd\x8b",</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa",</div><div class='del'>-		.ksize	= 80,</div><div class='del'>-		.plaintext = "Test Using Larger Than Block-Size Key and Larger Than One "</div><div class='del'>-			   "Block-Size Data",</div><div class='del'>-		.psize	= 73,</div><div class='del'>-		.digest	= "\x69\xea\x60\x79\x8d\x71\x61\x6c\xce\x5f"</div><div class='del'>-			  "\xd0\x87\x1e\x23\x75\x4c\xd7\x5d\x5a\x0a",</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * HMAC-SHA1 test vectors from RFC2202</div><div class='del'>- */</div><div class='del'>-#define HMAC_SHA1_TEST_VECTORS	7</div><div class='del'>-</div><div class='del'>-static struct hash_testvec hmac_sha1_tv_template[] = {</div><div class='del'>-	{</div><div class='del'>-		.key	= "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b",</div><div class='del'>-		.ksize	= 20,</div><div class='del'>-		.plaintext = "Hi There",</div><div class='del'>-		.psize	= 8,</div><div class='del'>-		.digest	= "\xb6\x17\x31\x86\x55\x05\x72\x64"</div><div class='del'>-			  "\xe2\x8b\xc0\xb6\xfb\x37\x8c\x8e\xf1"</div><div class='del'>-			  "\x46\xbe",</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "Jefe",</div><div class='del'>-		.ksize	= 4,</div><div class='del'>-		.plaintext = "what do ya want for nothing?",</div><div class='del'>-		.psize	= 28,</div><div class='del'>-		.digest	= "\xef\xfc\xdf\x6a\xe5\xeb\x2f\xa2\xd2\x74"</div><div class='del'>-			  "\x16\xd5\xf1\x84\xdf\x9c\x25\x9a\x7c\x79",</div><div class='del'>-		.np	= 2,</div><div class='del'>-		.tap	= { 14, 14 }</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa",</div><div class='del'>-		.ksize	= 20,</div><div class='del'>-		.plaintext = "\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd"</div><div class='del'>-			"\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd"</div><div class='del'>-			"\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd"</div><div class='del'>-			"\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd",</div><div class='del'>-		.psize	= 50,</div><div class='del'>-		.digest	= "\x12\x5d\x73\x42\xb9\xac\x11\xcd\x91\xa3"</div><div class='del'>-			  "\x9a\xf4\x8a\xa1\x7b\x4f\x63\xf1\x75\xd3",</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x01\x02\x03\x04\x05\x06\x07\x08"</div><div class='del'>-			  "\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10"</div><div class='del'>-			  "\x11\x12\x13\x14\x15\x16\x17\x18\x19",</div><div class='del'>-		.ksize	= 25,</div><div class='del'>-		.plaintext = "\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd"</div><div class='del'>-			"\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd"</div><div class='del'>-			"\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd"</div><div class='del'>-			"\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd",</div><div class='del'>-		.psize	= 50,</div><div class='del'>-		.digest	= "\x4c\x90\x07\xf4\x02\x62\x50\xc6\xbc\x84"</div><div class='del'>-			  "\x14\xf9\xbf\x50\xc8\x6c\x2d\x72\x35\xda",</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c",</div><div class='del'>-		.ksize	= 20,</div><div class='del'>-		.plaintext = "Test With Truncation",</div><div class='del'>-		.psize	= 20,</div><div class='del'>-		.digest	= "\x4c\x1a\x03\x42\x4b\x55\xe0\x7f\xe7\xf2"</div><div class='del'>-			  "\x7b\xe1\xd5\x8b\xb9\x32\x4a\x9a\x5a\x04",</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa",</div><div class='del'>-		.ksize	= 80,</div><div class='del'>-		.plaintext = "Test Using Larger Than Block-Size Key - Hash Key First",</div><div class='del'>-		.psize	= 54,</div><div class='del'>-		.digest	= "\xaa\x4a\xe5\xe1\x52\x72\xd0\x0e\x95\x70"</div><div class='del'>-			  "\x56\x37\xce\x8a\x3b\x55\xed\x40\x21\x12",</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa",</div><div class='del'>-		.ksize	= 80,</div><div class='del'>-		.plaintext = "Test Using Larger Than Block-Size Key and Larger Than One "</div><div class='del'>-			   "Block-Size Data",</div><div class='del'>-		.psize	= 73,</div><div class='del'>-		.digest	= "\xe8\xe9\x9d\x0f\x45\x23\x7d\x78\x6d\x6b"</div><div class='del'>-			  "\xba\xa7\x96\x5c\x78\x08\xbb\xff\x1a\x91",</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * SHA224 HMAC test vectors from RFC4231</div><div class='del'>- */</div><div class='del'>-#define HMAC_SHA224_TEST_VECTORS    4</div><div class='del'>-</div><div class='del'>-static struct hash_testvec hmac_sha224_tv_template[] = {</div><div class='del'>-	{</div><div class='del'>-		.key    = "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b"</div><div class='del'>-			"\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b"</div><div class='del'>-			"\x0b\x0b\x0b\x0b",</div><div class='del'>-		.ksize  = 20,</div><div class='del'>-		/*  ("Hi There") */</div><div class='del'>-		.plaintext = "\x48\x69\x20\x54\x68\x65\x72\x65",</div><div class='del'>-		.psize  = 8,</div><div class='del'>-		.digest = "\x89\x6f\xb1\x12\x8a\xbb\xdf\x19"</div><div class='del'>-			"\x68\x32\x10\x7c\xd4\x9d\xf3\x3f"</div><div class='del'>-			"\x47\xb4\xb1\x16\x99\x12\xba\x4f"</div><div class='del'>-			"\x53\x68\x4b\x22",</div><div class='del'>-	}, {</div><div class='del'>-		.key    = "Jefe",</div><div class='del'>-		.ksize  = 4,</div><div class='del'>-		/* ("what do ya want for nothing?") */</div><div class='del'>-		.plaintext = "\x77\x68\x61\x74\x20\x64\x6f\x20"</div><div class='del'>-			"\x79\x61\x20\x77\x61\x6e\x74\x20"</div><div class='del'>-			"\x66\x6f\x72\x20\x6e\x6f\x74\x68"</div><div class='del'>-			"\x69\x6e\x67\x3f",</div><div class='del'>-		.psize  = 28,</div><div class='del'>-		.digest = "\xa3\x0e\x01\x09\x8b\xc6\xdb\xbf"</div><div class='del'>-			"\x45\x69\x0f\x3a\x7e\x9e\x6d\x0f"</div><div class='del'>-			"\x8b\xbe\xa2\xa3\x9e\x61\x48\x00"</div><div class='del'>-			"\x8f\xd0\x5e\x44",</div><div class='del'>-		.np = 4,</div><div class='del'>-		.tap    = { 7, 7, 7, 7 }</div><div class='del'>-	}, {</div><div class='del'>-		.key    = "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa",</div><div class='del'>-		.ksize  = 131,</div><div class='del'>-		/* ("Test Using Larger Than Block-Size Key - Hash Key First") */</div><div class='del'>-		.plaintext = "\x54\x65\x73\x74\x20\x55\x73\x69"</div><div class='del'>-			"\x6e\x67\x20\x4c\x61\x72\x67\x65"</div><div class='del'>-			"\x72\x20\x54\x68\x61\x6e\x20\x42"</div><div class='del'>-			"\x6c\x6f\x63\x6b\x2d\x53\x69\x7a"</div><div class='del'>-			"\x65\x20\x4b\x65\x79\x20\x2d\x20"</div><div class='del'>-			"\x48\x61\x73\x68\x20\x4b\x65\x79"</div><div class='del'>-			"\x20\x46\x69\x72\x73\x74",</div><div class='del'>-		.psize  = 54,</div><div class='del'>-		.digest = "\x95\xe9\xa0\xdb\x96\x20\x95\xad"</div><div class='del'>-			"\xae\xbe\x9b\x2d\x6f\x0d\xbc\xe2"</div><div class='del'>-			"\xd4\x99\xf1\x12\xf2\xd2\xb7\x27"</div><div class='del'>-			"\x3f\xa6\x87\x0e",</div><div class='del'>-	}, {</div><div class='del'>-		.key    = "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa",</div><div class='del'>-		.ksize  = 131,</div><div class='del'>-		/* ("This is a test using a larger than block-size key and a")</div><div class='del'>-		(" larger than block-size data. The key needs to be")</div><div class='del'>-			(" hashed before being used by the HMAC algorithm.") */</div><div class='del'>-		.plaintext = "\x54\x68\x69\x73\x20\x69\x73\x20"</div><div class='del'>-			"\x61\x20\x74\x65\x73\x74\x20\x75"</div><div class='del'>-			"\x73\x69\x6e\x67\x20\x61\x20\x6c"</div><div class='del'>-			"\x61\x72\x67\x65\x72\x20\x74\x68"</div><div class='del'>-			"\x61\x6e\x20\x62\x6c\x6f\x63\x6b"</div><div class='del'>-			"\x2d\x73\x69\x7a\x65\x20\x6b\x65"</div><div class='del'>-			"\x79\x20\x61\x6e\x64\x20\x61\x20"</div><div class='del'>-			"\x6c\x61\x72\x67\x65\x72\x20\x74"</div><div class='del'>-			"\x68\x61\x6e\x20\x62\x6c\x6f\x63"</div><div class='del'>-			"\x6b\x2d\x73\x69\x7a\x65\x20\x64"</div><div class='del'>-			"\x61\x74\x61\x2e\x20\x54\x68\x65"</div><div class='del'>-			"\x20\x6b\x65\x79\x20\x6e\x65\x65"</div><div class='del'>-			"\x64\x73\x20\x74\x6f\x20\x62\x65"</div><div class='del'>-			"\x20\x68\x61\x73\x68\x65\x64\x20"</div><div class='del'>-			"\x62\x65\x66\x6f\x72\x65\x20\x62"</div><div class='del'>-			"\x65\x69\x6e\x67\x20\x75\x73\x65"</div><div class='del'>-			"\x64\x20\x62\x79\x20\x74\x68\x65"</div><div class='del'>-			"\x20\x48\x4d\x41\x43\x20\x61\x6c"</div><div class='del'>-			"\x67\x6f\x72\x69\x74\x68\x6d\x2e",</div><div class='del'>-		.psize  = 152,</div><div class='del'>-		.digest = "\x3a\x85\x41\x66\xac\x5d\x9f\x02"</div><div class='del'>-			"\x3f\x54\xd5\x17\xd0\xb3\x9d\xbd"</div><div class='del'>-			"\x94\x67\x70\xdb\x9c\x2b\x95\xc9"</div><div class='del'>-			"\xf6\xf5\x65\xd1",</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * HMAC-SHA256 test vectors from</div><div class='del'>- * draft-ietf-ipsec-ciph-sha-256-01.txt</div><div class='del'>- */</div><div class='del'>-#define HMAC_SHA256_TEST_VECTORS	10</div><div class='del'>-</div><div class='del'>-static struct hash_testvec hmac_sha256_tv_template[] = {</div><div class='del'>-	{</div><div class='del'>-		.key	= "\x01\x02\x03\x04\x05\x06\x07\x08"</div><div class='del'>-			  "\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10"</div><div class='del'>-			  "\x11\x12\x13\x14\x15\x16\x17\x18"</div><div class='del'>-			  "\x19\x1a\x1b\x1c\x1d\x1e\x1f\x20",</div><div class='del'>-		.ksize	= 32,</div><div class='del'>-		.plaintext = "abc",</div><div class='del'>-		.psize	= 3,</div><div class='del'>-		.digest	= "\xa2\x1b\x1f\x5d\x4c\xf4\xf7\x3a"</div><div class='del'>-			  "\x4d\xd9\x39\x75\x0f\x7a\x06\x6a"</div><div class='del'>-			  "\x7f\x98\xcc\x13\x1c\xb1\x6a\x66"</div><div class='del'>-			  "\x92\x75\x90\x21\xcf\xab\x81\x81",</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x01\x02\x03\x04\x05\x06\x07\x08"</div><div class='del'>-			  "\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10"</div><div class='del'>-			  "\x11\x12\x13\x14\x15\x16\x17\x18"</div><div class='del'>-			  "\x19\x1a\x1b\x1c\x1d\x1e\x1f\x20",</div><div class='del'>-		.ksize	= 32,</div><div class='del'>-		.plaintext = "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",</div><div class='del'>-		.psize	= 56,</div><div class='del'>-		.digest	= "\x10\x4f\xdc\x12\x57\x32\x8f\x08"</div><div class='del'>-			  "\x18\x4b\xa7\x31\x31\xc5\x3c\xae"</div><div class='del'>-			  "\xe6\x98\xe3\x61\x19\x42\x11\x49"</div><div class='del'>-			  "\xea\x8c\x71\x24\x56\x69\x7d\x30",</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x01\x02\x03\x04\x05\x06\x07\x08"</div><div class='del'>-			  "\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10"</div><div class='del'>-			  "\x11\x12\x13\x14\x15\x16\x17\x18"</div><div class='del'>-			  "\x19\x1a\x1b\x1c\x1d\x1e\x1f\x20",</div><div class='del'>-		.ksize	= 32,</div><div class='del'>-		.plaintext = "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"</div><div class='del'>-			   "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",</div><div class='del'>-		.psize	= 112,</div><div class='del'>-		.digest	= "\x47\x03\x05\xfc\x7e\x40\xfe\x34"</div><div class='del'>-			  "\xd3\xee\xb3\xe7\x73\xd9\x5a\xab"</div><div class='del'>-			  "\x73\xac\xf0\xfd\x06\x04\x47\xa5"</div><div class='del'>-			  "\xeb\x45\x95\xbf\x33\xa9\xd1\xa3",</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b"</div><div class='del'>-			"\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b"</div><div class='del'>-			"\x0b\x0b\x0b\x0b\x0b\x0b",</div><div class='del'>-		.ksize	= 32,</div><div class='del'>-		.plaintext = "Hi There",</div><div class='del'>-		.psize	= 8,</div><div class='del'>-		.digest	= "\x19\x8a\x60\x7e\xb4\x4b\xfb\xc6"</div><div class='del'>-			  "\x99\x03\xa0\xf1\xcf\x2b\xbd\xc5"</div><div class='del'>-			  "\xba\x0a\xa3\xf3\xd9\xae\x3c\x1c"</div><div class='del'>-			  "\x7a\x3b\x16\x96\xa0\xb6\x8c\xf7",</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "Jefe",</div><div class='del'>-		.ksize	= 4,</div><div class='del'>-		.plaintext = "what do ya want for nothing?",</div><div class='del'>-		.psize	= 28,</div><div class='del'>-		.digest	= "\x5b\xdc\xc1\x46\xbf\x60\x75\x4e"</div><div class='del'>-			  "\x6a\x04\x24\x26\x08\x95\x75\xc7"</div><div class='del'>-			  "\x5a\x00\x3f\x08\x9d\x27\x39\x83"</div><div class='del'>-			  "\x9d\xec\x58\xb9\x64\xec\x38\x43",</div><div class='del'>-		.np	= 2,</div><div class='del'>-		.tap	= { 14, 14 }</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa",</div><div class='del'>-		.ksize	= 32,</div><div class='del'>-		.plaintext = "\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd"</div><div class='del'>-			"\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd"</div><div class='del'>-			"\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd"</div><div class='del'>-			"\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd",</div><div class='del'>-		.psize	= 50,</div><div class='del'>-		.digest	= "\xcd\xcb\x12\x20\xd1\xec\xcc\xea"</div><div class='del'>-			  "\x91\xe5\x3a\xba\x30\x92\xf9\x62"</div><div class='del'>-			  "\xe5\x49\xfe\x6c\xe9\xed\x7f\xdc"</div><div class='del'>-			  "\x43\x19\x1f\xbd\xe4\x5c\x30\xb0",</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x01\x02\x03\x04\x05\x06\x07\x08"</div><div class='del'>-			  "\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10"</div><div class='del'>-			  "\x11\x12\x13\x14\x15\x16\x17\x18"</div><div class='del'>-			  "\x19\x1a\x1b\x1c\x1d\x1e\x1f\x20"</div><div class='del'>-			  "\x21\x22\x23\x24\x25",</div><div class='del'>-		.ksize	= 37,</div><div class='del'>-		.plaintext = "\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd"</div><div class='del'>-			"\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd"</div><div class='del'>-			"\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd"</div><div class='del'>-			"\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd",</div><div class='del'>-		.psize	= 50,</div><div class='del'>-		.digest	= "\xd4\x63\x3c\x17\xf6\xfb\x8d\x74"</div><div class='del'>-			  "\x4c\x66\xde\xe0\xf8\xf0\x74\x55"</div><div class='del'>-			  "\x6e\xc4\xaf\x55\xef\x07\x99\x85"</div><div class='del'>-			  "\x41\x46\x8e\xb4\x9b\xd2\xe9\x17",</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c"</div><div class='del'>-			"\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c"</div><div class='del'>-			"\x0c\x0c\x0c\x0c\x0c\x0c",</div><div class='del'>-		.ksize	= 32,</div><div class='del'>-		.plaintext = "Test With Truncation",</div><div class='del'>-		.psize	= 20,</div><div class='del'>-		.digest	= "\x75\x46\xaf\x01\x84\x1f\xc0\x9b"</div><div class='del'>-			  "\x1a\xb9\xc3\x74\x9a\x5f\x1c\x17"</div><div class='del'>-			  "\xd4\xf5\x89\x66\x8a\x58\x7b\x27"</div><div class='del'>-			  "\x00\xa9\xc9\x7c\x11\x93\xcf\x42",</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa",</div><div class='del'>-		.ksize	= 80,</div><div class='del'>-		.plaintext = "Test Using Larger Than Block-Size Key - Hash Key First",</div><div class='del'>-		.psize	= 54,</div><div class='del'>-		.digest	= "\x69\x53\x02\x5e\xd9\x6f\x0c\x09"</div><div class='del'>-			  "\xf8\x0a\x96\xf7\x8e\x65\x38\xdb"</div><div class='del'>-			  "\xe2\xe7\xb8\x20\xe3\xdd\x97\x0e"</div><div class='del'>-			  "\x7d\xdd\x39\x09\x1b\x32\x35\x2f",</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa",</div><div class='del'>-		.ksize	= 80,</div><div class='del'>-		.plaintext = "Test Using Larger Than Block-Size Key and Larger Than "</div><div class='del'>-			   "One Block-Size Data",</div><div class='del'>-		.psize	= 73,</div><div class='del'>-		.digest	= "\x63\x55\xac\x22\xe8\x90\xd0\xa3"</div><div class='del'>-			  "\xc8\x48\x1a\x5c\xa4\x82\x5b\xc8"</div><div class='del'>-			  "\x84\xd3\xe7\xa1\xff\x98\xa2\xfc"</div><div class='del'>-			  "\x2a\xc7\xd8\xe0\x64\xc3\xb2\xe6",</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define XCBC_AES_TEST_VECTORS 6</div><div class='del'>-</div><div class='del'>-static struct hash_testvec aes_xcbc128_tv_template[] = {</div><div class='del'>-	{</div><div class='del'>-		.key	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='del'>-			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",</div><div class='del'>-		.plaintext = zeroed_string,</div><div class='del'>-		.digest = "\x75\xf0\x25\x1d\x52\x8a\xc0\x1c"</div><div class='del'>-			  "\x45\x73\xdf\xd5\x84\xd7\x9f\x29",</div><div class='del'>-		.psize	= 0,</div><div class='del'>-		.ksize	= 16,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='del'>-			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",</div><div class='del'>-		.plaintext = "\x00\x01\x02",</div><div class='del'>-		.digest	= "\x5b\x37\x65\x80\xae\x2f\x19\xaf"</div><div class='del'>-			  "\xe7\x21\x9c\xee\xf1\x72\x75\x6f",</div><div class='del'>-		.psize	= 3,</div><div class='del'>-		.ksize	= 16,</div><div class='del'>-	} , {</div><div class='del'>-		.key	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='del'>-			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",</div><div class='del'>-		.plaintext = "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='del'>-			     "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",</div><div class='del'>-		.digest = "\xd2\xa2\x46\xfa\x34\x9b\x68\xa7"</div><div class='del'>-			  "\x99\x98\xa4\x39\x4f\xf7\xa2\x63",</div><div class='del'>-		.psize	= 16,</div><div class='del'>-		.ksize	= 16,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='del'>-			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",</div><div class='del'>-		.plaintext = "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='del'>-			     "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='del'>-			     "\x10\x11\x12\x13",</div><div class='del'>-		.digest = "\x47\xf5\x1b\x45\x64\x96\x62\x15"</div><div class='del'>-			  "\xb8\x98\x5c\x63\x05\x5e\xd3\x08",</div><div class='del'>-		.tap	= { 10, 10 },</div><div class='del'>-		.psize	= 20,</div><div class='del'>-		.np	= 2,</div><div class='del'>-		.ksize	= 16,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='del'>-			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",</div><div class='del'>-		.plaintext = "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='del'>-			     "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='del'>-			     "\x10\x11\x12\x13\x14\x15\x16\x17"</div><div class='del'>-			     "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f",</div><div class='del'>-		.digest = "\xf5\x4f\x0e\xc8\xd2\xb9\xf3\xd3"</div><div class='del'>-			  "\x68\x07\x73\x4b\xd5\x28\x3f\xd4",</div><div class='del'>-		.psize	= 32,</div><div class='del'>-		.ksize	= 16,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='del'>-			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",</div><div class='del'>-		.plaintext = "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='del'>-			     "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='del'>-			     "\x10\x11\x12\x13\x14\x15\x16\x17"</div><div class='del'>-			     "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f"</div><div class='del'>-			     "\x20\x21",</div><div class='del'>-		.digest = "\xbe\xcb\xb3\xbc\xcd\xb5\x18\xa3"</div><div class='del'>-			  "\x06\x77\xd5\x48\x1f\xb6\xb4\xd8",</div><div class='del'>-		.tap	= { 17, 17 },</div><div class='del'>-		.psize	= 34,</div><div class='del'>-		.np	= 2,</div><div class='del'>-		.ksize	= 16,</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * SHA384 HMAC test vectors from RFC4231</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define HMAC_SHA384_TEST_VECTORS	4</div><div class='del'>-</div><div class='del'>-static struct hash_testvec hmac_sha384_tv_template[] = {</div><div class='del'>-	{</div><div class='del'>-		.key	= "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b"</div><div class='del'>-			  "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b"</div><div class='del'>-			  "\x0b\x0b\x0b\x0b",</div><div class='del'>-		.ksize	= 20,</div><div class='del'>-		.plaintext = "Hi There",</div><div class='del'>-		.psize	= 8,</div><div class='del'>-		.digest	= "\xaf\xd0\x39\x44\xd8\x48\x95\x62"</div><div class='del'>-			  "\x6b\x08\x25\xf4\xab\x46\x90\x7f"</div><div class='del'>-			  "\x15\xf9\xda\xdb\xe4\x10\x1e\xc6"</div><div class='del'>-			  "\x82\xaa\x03\x4c\x7c\xeb\xc5\x9c"</div><div class='del'>-			  "\xfa\xea\x9e\xa9\x07\x6e\xde\x7f"</div><div class='del'>-			  "\x4a\xf1\x52\xe8\xb2\xfa\x9c\xb6",</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "Jefe",</div><div class='del'>-		.ksize	= 4,</div><div class='del'>-		.plaintext = "what do ya want for nothing?",</div><div class='del'>-		.psize	= 28,</div><div class='del'>-		.digest	= "\xaf\x45\xd2\xe3\x76\x48\x40\x31"</div><div class='del'>-			  "\x61\x7f\x78\xd2\xb5\x8a\x6b\x1b"</div><div class='del'>-			  "\x9c\x7e\xf4\x64\xf5\xa0\x1b\x47"</div><div class='del'>-			  "\xe4\x2e\xc3\x73\x63\x22\x44\x5e"</div><div class='del'>-			  "\x8e\x22\x40\xca\x5e\x69\xe2\xc7"</div><div class='del'>-			  "\x8b\x32\x39\xec\xfa\xb2\x16\x49",</div><div class='del'>-		.np	= 4,</div><div class='del'>-		.tap	= { 7, 7, 7, 7 }</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			  "\xaa\xaa\xaa",</div><div class='del'>-		.ksize	= 131,</div><div class='del'>-		.plaintext = "Test Using Larger Than Block-Siz"</div><div class='del'>-			   "e Key - Hash Key First",</div><div class='del'>-		.psize	= 54,</div><div class='del'>-		.digest	= "\x4e\xce\x08\x44\x85\x81\x3e\x90"</div><div class='del'>-			  "\x88\xd2\xc6\x3a\x04\x1b\xc5\xb4"</div><div class='del'>-			  "\x4f\x9e\xf1\x01\x2a\x2b\x58\x8f"</div><div class='del'>-			  "\x3c\xd1\x1f\x05\x03\x3a\xc4\xc6"</div><div class='del'>-			  "\x0c\x2e\xf6\xab\x40\x30\xfe\x82"</div><div class='del'>-			  "\x96\x24\x8d\xf1\x63\xf4\x49\x52",</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			  "\xaa\xaa\xaa",</div><div class='del'>-		.ksize	= 131,</div><div class='del'>-		.plaintext = "This is a test u"</div><div class='del'>-			   "sing a larger th"</div><div class='del'>-			   "an block-size ke"</div><div class='del'>-			   "y and a larger t"</div><div class='del'>-			   "han block-size d"</div><div class='del'>-			   "ata. The key nee"</div><div class='del'>-			   "ds to be hashed "</div><div class='del'>-			   "before being use"</div><div class='del'>-			   "d by the HMAC al"</div><div class='del'>-			   "gorithm.",</div><div class='del'>-		.psize	= 152,</div><div class='del'>-		.digest	= "\x66\x17\x17\x8e\x94\x1f\x02\x0d"</div><div class='del'>-			  "\x35\x1e\x2f\x25\x4e\x8f\xd3\x2c"</div><div class='del'>-			  "\x60\x24\x20\xfe\xb0\xb8\xfb\x9a"</div><div class='del'>-			  "\xdc\xce\xbb\x82\x46\x1e\x99\xc5"</div><div class='del'>-			  "\xa6\x78\xcc\x31\xe7\x99\x17\x6d"</div><div class='del'>-			  "\x38\x60\xe6\x11\x0c\x46\x52\x3e",</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * SHA512 HMAC test vectors from RFC4231</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define HMAC_SHA512_TEST_VECTORS	4</div><div class='del'>-</div><div class='del'>-static struct hash_testvec hmac_sha512_tv_template[] = {</div><div class='del'>-	{</div><div class='del'>-		.key	= "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b"</div><div class='del'>-			  "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b"</div><div class='del'>-			  "\x0b\x0b\x0b\x0b",</div><div class='del'>-		.ksize	= 20,</div><div class='del'>-		.plaintext = "Hi There",</div><div class='del'>-		.psize	= 8,</div><div class='del'>-		.digest	= "\x87\xaa\x7c\xde\xa5\xef\x61\x9d"</div><div class='del'>-			  "\x4f\xf0\xb4\x24\x1a\x1d\x6c\xb0"</div><div class='del'>-			  "\x23\x79\xf4\xe2\xce\x4e\xc2\x78"</div><div class='del'>-			  "\x7a\xd0\xb3\x05\x45\xe1\x7c\xde"</div><div class='del'>-			  "\xda\xa8\x33\xb7\xd6\xb8\xa7\x02"</div><div class='del'>-			  "\x03\x8b\x27\x4e\xae\xa3\xf4\xe4"</div><div class='del'>-			  "\xbe\x9d\x91\x4e\xeb\x61\xf1\x70"</div><div class='del'>-			  "\x2e\x69\x6c\x20\x3a\x12\x68\x54",</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "Jefe",</div><div class='del'>-		.ksize	= 4,</div><div class='del'>-		.plaintext = "what do ya want for nothing?",</div><div class='del'>-		.psize	= 28,</div><div class='del'>-		.digest	= "\x16\x4b\x7a\x7b\xfc\xf8\x19\xe2"</div><div class='del'>-			  "\xe3\x95\xfb\xe7\x3b\x56\xe0\xa3"</div><div class='del'>-			  "\x87\xbd\x64\x22\x2e\x83\x1f\xd6"</div><div class='del'>-			  "\x10\x27\x0c\xd7\xea\x25\x05\x54"</div><div class='del'>-			  "\x97\x58\xbf\x75\xc0\x5a\x99\x4a"</div><div class='del'>-			  "\x6d\x03\x4f\x65\xf8\xf0\xe6\xfd"</div><div class='del'>-			  "\xca\xea\xb1\xa3\x4d\x4a\x6b\x4b"</div><div class='del'>-			  "\x63\x6e\x07\x0a\x38\xbc\xe7\x37",</div><div class='del'>-		.np	= 4,</div><div class='del'>-		.tap	= { 7, 7, 7, 7 }</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			  "\xaa\xaa\xaa",</div><div class='del'>-		.ksize	= 131,</div><div class='del'>-		.plaintext = "Test Using Large"</div><div class='del'>-			   "r Than Block-Siz"</div><div class='del'>-			   "e Key - Hash Key"</div><div class='del'>-			   " First",</div><div class='del'>-		.psize	= 54,</div><div class='del'>-		.digest	= "\x80\xb2\x42\x63\xc7\xc1\xa3\xeb"</div><div class='del'>-			"\xb7\x14\x93\xc1\xdd\x7b\xe8\xb4"</div><div class='del'>-			"\x9b\x46\xd1\xf4\x1b\x4a\xee\xc1"</div><div class='del'>-			"\x12\x1b\x01\x37\x83\xf8\xf3\x52"</div><div class='del'>-			"\x6b\x56\xd0\x37\xe0\x5f\x25\x98"</div><div class='del'>-			"\xbd\x0f\xd2\x21\x5d\x6a\x1e\x52"</div><div class='del'>-			"\x95\xe6\x4f\x73\xf6\x3f\x0a\xec"</div><div class='del'>-			"\x8b\x91\x5a\x98\x5d\x78\x65\x98",</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='del'>-			"\xaa\xaa\xaa",</div><div class='del'>-		.ksize	= 131,</div><div class='del'>-		.plaintext =</div><div class='del'>-			  "This is a test u"</div><div class='del'>-			  "sing a larger th"</div><div class='del'>-			  "an block-size ke"</div><div class='del'>-			  "y and a larger t"</div><div class='del'>-			  "han block-size d"</div><div class='del'>-			  "ata. The key nee"</div><div class='del'>-			  "ds to be hashed "</div><div class='del'>-			  "before being use"</div><div class='del'>-			  "d by the HMAC al"</div><div class='del'>-			  "gorithm.",</div><div class='del'>-		.psize	= 152,</div><div class='del'>-		.digest	= "\xe3\x7b\x6a\x77\x5d\xc8\x7d\xba"</div><div class='del'>-			"\xa4\xdf\xa9\xf9\x6e\x5e\x3f\xfd"</div><div class='del'>-			"\xde\xbd\x71\xf8\x86\x72\x89\x86"</div><div class='del'>-			"\x5d\xf5\xa3\x2d\x20\xcd\xc9\x44"</div><div class='del'>-			"\xb6\x02\x2c\xac\x3c\x49\x82\xb1"</div><div class='del'>-			"\x0d\x5e\xeb\x55\xc3\xe4\xde\x15"</div><div class='del'>-			"\x13\x46\x76\xfb\x6d\xe0\x44\x60"</div><div class='del'>-			"\x65\xc9\x74\x40\xfa\x8c\x6a\x58",</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * DES test vectors.</div><div class='ctx'>  */</div><div class='del'>-#define DES_ENC_TEST_VECTORS		10</div><div class='del'>-#define DES_DEC_TEST_VECTORS		4</div><div class='del'>-#define DES_CBC_ENC_TEST_VECTORS	5</div><div class='del'>-#define DES_CBC_DEC_TEST_VECTORS	4</div><div class='del'>-#define DES3_EDE_ENC_TEST_VECTORS	3</div><div class='del'>-#define DES3_EDE_DEC_TEST_VECTORS	3</div><div class='del'>-#define DES3_EDE_CBC_ENC_TEST_VECTORS	1</div><div class='del'>-#define DES3_EDE_CBC_DEC_TEST_VECTORS	1</div><div class='del'>-</div><div class='del'>-static struct cipher_testvec des_enc_tv_template[] = {</div><div class='del'>-	{ /* From Applied Cryptography */</div><div class='del'>-		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef",</div><div class='del'>-		.klen	= 8,</div><div class='del'>-		.input	= "\x01\x23\x45\x67\x89\xab\xcd\xe7",</div><div class='del'>-		.ilen	= 8,</div><div class='del'>-		.result	= "\xc9\x57\x44\x25\x6a\x5e\xd3\x1d",</div><div class='del'>-		.rlen	= 8,</div><div class='del'>-	}, { /* Same key, different plaintext block */</div><div class='del'>-		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef",</div><div class='del'>-		.klen	= 8,</div><div class='del'>-		.input	= "\x22\x33\x44\x55\x66\x77\x88\x99",</div><div class='del'>-		.ilen	= 8,</div><div class='del'>-		.result	= "\xf7\x9c\x89\x2a\x33\x8f\x4a\x8b",</div><div class='del'>-		.rlen	= 8,</div><div class='del'>-	}, { /* Sbox test from NBS */</div><div class='del'>-		.key	= "\x7c\xa1\x10\x45\x4a\x1a\x6e\x57",</div><div class='del'>-		.klen	= 8,</div><div class='del'>-		.input	= "\x01\xa1\xd6\xd0\x39\x77\x67\x42",</div><div class='del'>-		.ilen	= 8,</div><div class='del'>-		.result	= "\x69\x0f\x5b\x0d\x9a\x26\x93\x9b",</div><div class='del'>-		.rlen	= 8,</div><div class='del'>-	}, { /* Three blocks */</div><div class='del'>-		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef",</div><div class='del'>-		.klen	= 8,</div><div class='del'>-		.input	= "\x01\x23\x45\x67\x89\xab\xcd\xe7"</div><div class='del'>-			  "\x22\x33\x44\x55\x66\x77\x88\x99"</div><div class='del'>-			  "\xca\xfe\xba\xbe\xfe\xed\xbe\xef",</div><div class='del'>-		.ilen	= 24,</div><div class='del'>-		.result	= "\xc9\x57\x44\x25\x6a\x5e\xd3\x1d"</div><div class='del'>-			  "\xf7\x9c\x89\x2a\x33\x8f\x4a\x8b"</div><div class='del'>-			  "\xb4\x99\x26\xf7\x1f\xe1\xd4\x90",</div><div class='del'>-		.rlen	= 24,</div><div class='del'>-	}, { /* Weak key */</div><div class='del'>-		.fail	= 1,</div><div class='del'>-		.wk	= 1,</div><div class='del'>-		.key	= "\x01\x01\x01\x01\x01\x01\x01\x01",</div><div class='del'>-		.klen	= 8,</div><div class='del'>-		.input	= "\x01\x23\x45\x67\x89\xab\xcd\xe7",</div><div class='del'>-		.ilen	= 8,</div><div class='del'>-		.result	= "\xc9\x57\x44\x25\x6a\x5e\xd3\x1d",</div><div class='del'>-		.rlen	= 8,</div><div class='del'>-	}, { /* Two blocks -- for testing encryption across pages */</div><div class='del'>-		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef",</div><div class='del'>-		.klen	= 8,</div><div class='del'>-		.input	= "\x01\x23\x45\x67\x89\xab\xcd\xe7"</div><div class='del'>-			  "\x22\x33\x44\x55\x66\x77\x88\x99",</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result	= "\xc9\x57\x44\x25\x6a\x5e\xd3\x1d"</div><div class='del'>-			  "\xf7\x9c\x89\x2a\x33\x8f\x4a\x8b",</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-		.np	= 2,</div><div class='del'>-		.tap	= { 8, 8 }</div><div class='del'>-	}, { /* Four blocks -- for testing encryption with chunking */</div><div class='del'>-		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef",</div><div class='del'>-		.klen	= 8,</div><div class='del'>-		.input	= "\x01\x23\x45\x67\x89\xab\xcd\xe7"</div><div class='del'>-			  "\x22\x33\x44\x55\x66\x77\x88\x99"</div><div class='del'>-			  "\xca\xfe\xba\xbe\xfe\xed\xbe\xef"</div><div class='del'>-			  "\x22\x33\x44\x55\x66\x77\x88\x99",</div><div class='del'>-		.ilen	= 32,</div><div class='del'>-		.result	= "\xc9\x57\x44\x25\x6a\x5e\xd3\x1d"</div><div class='del'>-			  "\xf7\x9c\x89\x2a\x33\x8f\x4a\x8b"</div><div class='del'>-			  "\xb4\x99\x26\xf7\x1f\xe1\xd4\x90"</div><div class='del'>-			  "\xf7\x9c\x89\x2a\x33\x8f\x4a\x8b",</div><div class='del'>-		.rlen	= 32,</div><div class='del'>-		.np	= 3,</div><div class='del'>-		.tap	= { 14, 10, 8 }</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef",</div><div class='del'>-		.klen	= 8,</div><div class='del'>-		.input	= "\x01\x23\x45\x67\x89\xab\xcd\xe7"</div><div class='del'>-			  "\x22\x33\x44\x55\x66\x77\x88\x99"</div><div class='del'>-			  "\xca\xfe\xba\xbe\xfe\xed\xbe\xef",</div><div class='del'>-		.ilen	= 24,</div><div class='del'>-		.result	= "\xc9\x57\x44\x25\x6a\x5e\xd3\x1d"</div><div class='del'>-			  "\xf7\x9c\x89\x2a\x33\x8f\x4a\x8b"</div><div class='del'>-			  "\xb4\x99\x26\xf7\x1f\xe1\xd4\x90",</div><div class='del'>-		.rlen	= 24,</div><div class='del'>-		.np	= 4,</div><div class='del'>-		.tap	= { 2, 1, 3, 18 }</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef",</div><div class='del'>-		.klen	= 8,</div><div class='del'>-		.input	= "\x01\x23\x45\x67\x89\xab\xcd\xe7"</div><div class='del'>-			  "\x22\x33\x44\x55\x66\x77\x88\x99",</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result	= "\xc9\x57\x44\x25\x6a\x5e\xd3\x1d"</div><div class='del'>-			  "\xf7\x9c\x89\x2a\x33\x8f\x4a\x8b",</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-		.np	= 5,</div><div class='del'>-		.tap	= { 2, 2, 2, 2, 8 }</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef",</div><div class='del'>-		.klen	= 8,</div><div class='del'>-		.input	= "\x01\x23\x45\x67\x89\xab\xcd\xe7",</div><div class='del'>-		.ilen	= 8,</div><div class='del'>-		.result	= "\xc9\x57\x44\x25\x6a\x5e\xd3\x1d",</div><div class='del'>-		.rlen	= 8,</div><div class='del'>-		.np	= 8,</div><div class='del'>-		.tap	= { 1, 1, 1, 1, 1, 1, 1, 1 }</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct cipher_testvec des_dec_tv_template[] = {</div><div class='del'>-	{ /* From Applied Cryptography */</div><div class='del'>-		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef",</div><div class='del'>-		.klen	= 8,</div><div class='del'>-		.input	= "\xc9\x57\x44\x25\x6a\x5e\xd3\x1d",</div><div class='del'>-		.ilen	= 8,</div><div class='del'>-		.result	= "\x01\x23\x45\x67\x89\xab\xcd\xe7",</div><div class='del'>-		.rlen	= 8,</div><div class='del'>-	}, { /* Sbox test from NBS */</div><div class='del'>-		.key	= "\x7c\xa1\x10\x45\x4a\x1a\x6e\x57",</div><div class='del'>-		.klen	= 8,</div><div class='del'>-		.input	= "\x69\x0f\x5b\x0d\x9a\x26\x93\x9b",</div><div class='del'>-		.ilen	= 8,</div><div class='del'>-		.result	= "\x01\xa1\xd6\xd0\x39\x77\x67\x42",</div><div class='del'>-		.rlen	= 8,</div><div class='del'>-	}, { /* Two blocks, for chunking test */</div><div class='del'>-		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef",</div><div class='del'>-		.klen	= 8,</div><div class='del'>-		.input	= "\xc9\x57\x44\x25\x6a\x5e\xd3\x1d"</div><div class='del'>-			  "\x69\x0f\x5b\x0d\x9a\x26\x93\x9b",</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result	= "\x01\x23\x45\x67\x89\xab\xcd\xe7"</div><div class='del'>-			  "\xa3\x99\x7b\xca\xaf\x69\xa0\xf5",</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-		.np	= 2,</div><div class='del'>-		.tap	= { 8, 8 }</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef",</div><div class='del'>-		.klen	= 8,</div><div class='del'>-		.input	= "\xc9\x57\x44\x25\x6a\x5e\xd3\x1d"</div><div class='del'>-			  "\x69\x0f\x5b\x0d\x9a\x26\x93\x9b",</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result	= "\x01\x23\x45\x67\x89\xab\xcd\xe7"</div><div class='del'>-			  "\xa3\x99\x7b\xca\xaf\x69\xa0\xf5",</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-		.np	= 3,</div><div class='del'>-		.tap	= { 3, 12, 1 }</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct cipher_testvec des_cbc_enc_tv_template[] = {</div><div class='del'>-	{ /* From OpenSSL */</div><div class='del'>-		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef",</div><div class='del'>-		.klen	= 8,</div><div class='del'>-		.iv	= "\xfe\xdc\xba\x98\x76\x54\x32\x10",</div><div class='del'>-		.input	= "\x37\x36\x35\x34\x33\x32\x31\x20"</div><div class='del'>-			  "\x4e\x6f\x77\x20\x69\x73\x20\x74"</div><div class='del'>-			  "\x68\x65\x20\x74\x69\x6d\x65\x20",</div><div class='del'>-		.ilen	= 24,</div><div class='del'>-		.result	= "\xcc\xd1\x73\xff\xab\x20\x39\xf4"</div><div class='del'>-			  "\xac\xd8\xae\xfd\xdf\xd8\xa1\xeb"</div><div class='del'>-			  "\x46\x8e\x91\x15\x78\x88\xba\x68",</div><div class='del'>-		.rlen	= 24,</div><div class='del'>-	}, { /* FIPS Pub 81 */</div><div class='del'>-		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef",</div><div class='del'>-		.klen	= 8,</div><div class='del'>-		.iv	= "\x12\x34\x56\x78\x90\xab\xcd\xef",</div><div class='del'>-		.input	= "\x4e\x6f\x77\x20\x69\x73\x20\x74",</div><div class='del'>-		.ilen	= 8,</div><div class='del'>-		.result	= "\xe5\xc7\xcd\xde\x87\x2b\xf2\x7c",</div><div class='del'>-		.rlen	= 8,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef",</div><div class='del'>-		.klen	= 8,</div><div class='del'>-		.iv	= "\xe5\xc7\xcd\xde\x87\x2b\xf2\x7c",</div><div class='del'>-		.input	= "\x68\x65\x20\x74\x69\x6d\x65\x20",</div><div class='del'>-		.ilen	= 8,</div><div class='del'>-		.result	= "\x43\xe9\x34\x00\x8c\x38\x9c\x0f",</div><div class='del'>-		.rlen	= 8,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef",</div><div class='del'>-		.klen	= 8,</div><div class='del'>-		.iv	= "\x43\xe9\x34\x00\x8c\x38\x9c\x0f",</div><div class='del'>-		.input	= "\x66\x6f\x72\x20\x61\x6c\x6c\x20",</div><div class='del'>-		.ilen	= 8,</div><div class='del'>-		.result	= "\x68\x37\x88\x49\x9a\x7c\x05\xf6",</div><div class='del'>-		.rlen	= 8,</div><div class='del'>-	}, { /* Copy of openssl vector for chunk testing */</div><div class='del'>-	     /* From OpenSSL */</div><div class='del'>-		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef",</div><div class='del'>-		.klen	= 8,</div><div class='del'>-		.iv	= "\xfe\xdc\xba\x98\x76\x54\x32\x10",</div><div class='del'>-		.input	= "\x37\x36\x35\x34\x33\x32\x31\x20"</div><div class='del'>-			  "\x4e\x6f\x77\x20\x69\x73\x20\x74"</div><div class='del'>-			  "\x68\x65\x20\x74\x69\x6d\x65\x20",</div><div class='del'>-		.ilen	= 24,</div><div class='del'>-		.result	= "\xcc\xd1\x73\xff\xab\x20\x39\xf4"</div><div class='del'>-			  "\xac\xd8\xae\xfd\xdf\xd8\xa1\xeb"</div><div class='del'>-			  "\x46\x8e\x91\x15\x78\x88\xba\x68",</div><div class='del'>-		.rlen	= 24,</div><div class='del'>-		.np	= 2,</div><div class='del'>-		.tap	= { 13, 11 }</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct cipher_testvec des_cbc_dec_tv_template[] = {</div><div class='del'>-	{ /* FIPS Pub 81 */</div><div class='del'>-		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef",</div><div class='del'>-		.klen	= 8,</div><div class='del'>-		.iv	= "\x12\x34\x56\x78\x90\xab\xcd\xef",</div><div class='del'>-		.input	= "\xe5\xc7\xcd\xde\x87\x2b\xf2\x7c",</div><div class='del'>-		.ilen	= 8,</div><div class='del'>-		.result	= "\x4e\x6f\x77\x20\x69\x73\x20\x74",</div><div class='del'>-		.rlen	= 8,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef",</div><div class='del'>-		.klen	= 8,</div><div class='del'>-		.iv	= "\xe5\xc7\xcd\xde\x87\x2b\xf2\x7c",</div><div class='del'>-		.input	= "\x43\xe9\x34\x00\x8c\x38\x9c\x0f",</div><div class='del'>-		.ilen	= 8,</div><div class='del'>-		.result	= "\x68\x65\x20\x74\x69\x6d\x65\x20",</div><div class='del'>-		.rlen	= 8,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef",</div><div class='del'>-		.klen	= 8,</div><div class='del'>-		.iv	= "\x43\xe9\x34\x00\x8c\x38\x9c\x0f",</div><div class='del'>-		.input	= "\x68\x37\x88\x49\x9a\x7c\x05\xf6",</div><div class='del'>-		.ilen	= 8,</div><div class='del'>-		.result	= "\x66\x6f\x72\x20\x61\x6c\x6c\x20",</div><div class='del'>-		.rlen	= 8,</div><div class='del'>-	}, { /* Copy of above, for chunk testing */</div><div class='del'>-		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef",</div><div class='del'>-		.klen	= 8,</div><div class='del'>-		.iv	= "\x43\xe9\x34\x00\x8c\x38\x9c\x0f",</div><div class='del'>-		.input	= "\x68\x37\x88\x49\x9a\x7c\x05\xf6",</div><div class='del'>-		.ilen	= 8,</div><div class='del'>-		.result	= "\x66\x6f\x72\x20\x61\x6c\x6c\x20",</div><div class='del'>-		.rlen	= 8,</div><div class='del'>-		.np	= 2,</div><div class='del'>-		.tap	= { 4, 4 }</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct cipher_testvec des3_ede_enc_tv_template[] = {</div><div class='del'>-	{ /* These are from openssl */</div><div class='del'>-		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef"</div><div class='del'>-			  "\x55\x55\x55\x55\x55\x55\x55\x55"</div><div class='del'>-			  "\xfe\xdc\xba\x98\x76\x54\x32\x10",</div><div class='del'>-		.klen	= 24,</div><div class='del'>-		.input	= "\x73\x6f\x6d\x65\x64\x61\x74\x61",</div><div class='del'>-		.ilen	= 8,</div><div class='del'>-		.result	= "\x18\xd7\x48\xe5\x63\x62\x05\x72",</div><div class='del'>-		.rlen	= 8,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x03\x52\x02\x07\x67\x20\x82\x17"</div><div class='del'>-			  "\x86\x02\x87\x66\x59\x08\x21\x98"</div><div class='del'>-			  "\x64\x05\x6a\xbd\xfe\xa9\x34\x57",</div><div class='del'>-		.klen	= 24,</div><div class='del'>-		.input	= "\x73\x71\x75\x69\x67\x67\x6c\x65",</div><div class='del'>-		.ilen	= 8,</div><div class='del'>-		.result	= "\xc0\x7d\x2a\x0f\xa5\x66\xfa\x30",</div><div class='del'>-		.rlen	= 8,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x10\x46\x10\x34\x89\x98\x80\x20"</div><div class='del'>-			  "\x91\x07\xd0\x15\x89\x19\x01\x01"</div><div class='del'>-			  "\x19\x07\x92\x10\x98\x1a\x01\x01",</div><div class='del'>-		.klen	= 24,</div><div class='del'>-		.input	= "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='del'>-		.ilen	= 8,</div><div class='del'>-		.result	= "\xe1\xef\x62\xc3\x32\xfe\x82\x5b",</div><div class='del'>-		.rlen	= 8,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct cipher_testvec des3_ede_dec_tv_template[] = {</div><div class='del'>-	{ /* These are from openssl */</div><div class='del'>-		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef"</div><div class='del'>-			  "\x55\x55\x55\x55\x55\x55\x55\x55"</div><div class='del'>-			  "\xfe\xdc\xba\x98\x76\x54\x32\x10",</div><div class='del'>-		.klen	= 24,</div><div class='del'>-		.input	= "\x18\xd7\x48\xe5\x63\x62\x05\x72",</div><div class='del'>-		.ilen	= 8,</div><div class='del'>-		.result	= "\x73\x6f\x6d\x65\x64\x61\x74\x61",</div><div class='del'>-		.rlen	= 8,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x03\x52\x02\x07\x67\x20\x82\x17"</div><div class='del'>-			  "\x86\x02\x87\x66\x59\x08\x21\x98"</div><div class='del'>-			  "\x64\x05\x6a\xbd\xfe\xa9\x34\x57",</div><div class='del'>-		.klen	= 24,</div><div class='del'>-		.input	= "\xc0\x7d\x2a\x0f\xa5\x66\xfa\x30",</div><div class='del'>-		.ilen	= 8,</div><div class='del'>-		.result	= "\x73\x71\x75\x69\x67\x67\x6c\x65",</div><div class='del'>-		.rlen	= 8,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x10\x46\x10\x34\x89\x98\x80\x20"</div><div class='del'>-			  "\x91\x07\xd0\x15\x89\x19\x01\x01"</div><div class='del'>-			  "\x19\x07\x92\x10\x98\x1a\x01\x01",</div><div class='del'>-		.klen	= 24,</div><div class='del'>-		.input	= "\xe1\xef\x62\xc3\x32\xfe\x82\x5b",</div><div class='del'>-		.ilen	= 8,</div><div class='del'>-		.result	= "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='del'>-		.rlen	= 8,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct cipher_testvec des3_ede_cbc_enc_tv_template[] = {</div><div class='del'>-	{ /* Generated from openssl */</div><div class='del'>-		.key	= "\xE9\xC0\xFF\x2E\x76\x0B\x64\x24"</div><div class='del'>-			  "\x44\x4D\x99\x5A\x12\xD6\x40\xC0"</div><div class='del'>-			  "\xEA\xC2\x84\xE8\x14\x95\xDB\xE8",</div><div class='del'>-		.klen	= 24,</div><div class='del'>-		.iv	= "\x7D\x33\x88\x93\x0F\x93\xB2\x42",</div><div class='del'>-		.input	= "\x6f\x54\x20\x6f\x61\x4d\x79\x6e"</div><div class='del'>-			  "\x53\x20\x63\x65\x65\x72\x73\x74"</div><div class='del'>-			  "\x54\x20\x6f\x6f\x4d\x20\x6e\x61"</div><div class='del'>-			  "\x20\x79\x65\x53\x72\x63\x74\x65"</div><div class='del'>-			  "\x20\x73\x6f\x54\x20\x6f\x61\x4d"</div><div class='del'>-			  "\x79\x6e\x53\x20\x63\x65\x65\x72"</div><div class='del'>-			  "\x73\x74\x54\x20\x6f\x6f\x4d\x20"</div><div class='del'>-			  "\x6e\x61\x20\x79\x65\x53\x72\x63"</div><div class='del'>-			  "\x74\x65\x20\x73\x6f\x54\x20\x6f"</div><div class='del'>-			  "\x61\x4d\x79\x6e\x53\x20\x63\x65"</div><div class='del'>-			  "\x65\x72\x73\x74\x54\x20\x6f\x6f"</div><div class='del'>-			  "\x4d\x20\x6e\x61\x20\x79\x65\x53"</div><div class='del'>-			  "\x72\x63\x74\x65\x20\x73\x6f\x54"</div><div class='del'>-			  "\x20\x6f\x61\x4d\x79\x6e\x53\x20"</div><div class='del'>-			  "\x63\x65\x65\x72\x73\x74\x54\x20"</div><div class='del'>-			  "\x6f\x6f\x4d\x20\x6e\x61\x0a\x79",</div><div class='del'>-		.ilen	= 128,</div><div class='del'>-		.result	= "\x0e\x2d\xb6\x97\x3c\x56\x33\xf4"</div><div class='del'>-			  "\x67\x17\x21\xc7\x6e\x8a\xd5\x49"</div><div class='del'>-			  "\x74\xb3\x49\x05\xc5\x1c\xd0\xed"</div><div class='del'>-			  "\x12\x56\x5c\x53\x96\xb6\x00\x7d"</div><div class='del'>-			  "\x90\x48\xfc\xf5\x8d\x29\x39\xcc"</div><div class='del'>-			  "\x8a\xd5\x35\x18\x36\x23\x4e\xd7"</div><div class='del'>-			  "\x76\xd1\xda\x0c\x94\x67\xbb\x04"</div><div class='del'>-			  "\x8b\xf2\x03\x6c\xa8\xcf\xb6\xea"</div><div class='del'>-			  "\x22\x64\x47\xaa\x8f\x75\x13\xbf"</div><div class='del'>-			  "\x9f\xc2\xc3\xf0\xc9\x56\xc5\x7a"</div><div class='del'>-			  "\x71\x63\x2e\x89\x7b\x1e\x12\xca"</div><div class='del'>-			  "\xe2\x5f\xaf\xd8\xa4\xf8\xc9\x7a"</div><div class='del'>-			  "\xd6\xf9\x21\x31\x62\x44\x45\xa6"</div><div class='del'>-			  "\xd6\xbc\x5a\xd3\x2d\x54\x43\xcc"</div><div class='del'>-			  "\x9d\xde\xa5\x70\xe9\x42\x45\x8a"</div><div class='del'>-			  "\x6b\xfa\xb1\x91\x13\xb0\xd9\x19",</div><div class='del'>-		.rlen	= 128,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct cipher_testvec des3_ede_cbc_dec_tv_template[] = {</div><div class='del'>-	{ /* Generated from openssl */</div><div class='del'>-		.key	= "\xE9\xC0\xFF\x2E\x76\x0B\x64\x24"</div><div class='del'>-			  "\x44\x4D\x99\x5A\x12\xD6\x40\xC0"</div><div class='del'>-			  "\xEA\xC2\x84\xE8\x14\x95\xDB\xE8",</div><div class='del'>-		.klen	= 24,</div><div class='del'>-		.iv	= "\x7D\x33\x88\x93\x0F\x93\xB2\x42",</div><div class='del'>-		.input	= "\x0e\x2d\xb6\x97\x3c\x56\x33\xf4"</div><div class='del'>-			  "\x67\x17\x21\xc7\x6e\x8a\xd5\x49"</div><div class='del'>-			  "\x74\xb3\x49\x05\xc5\x1c\xd0\xed"</div><div class='del'>-			  "\x12\x56\x5c\x53\x96\xb6\x00\x7d"</div><div class='del'>-			  "\x90\x48\xfc\xf5\x8d\x29\x39\xcc"</div><div class='del'>-			  "\x8a\xd5\x35\x18\x36\x23\x4e\xd7"</div><div class='del'>-			  "\x76\xd1\xda\x0c\x94\x67\xbb\x04"</div><div class='del'>-			  "\x8b\xf2\x03\x6c\xa8\xcf\xb6\xea"</div><div class='del'>-			  "\x22\x64\x47\xaa\x8f\x75\x13\xbf"</div><div class='del'>-			  "\x9f\xc2\xc3\xf0\xc9\x56\xc5\x7a"</div><div class='del'>-			  "\x71\x63\x2e\x89\x7b\x1e\x12\xca"</div><div class='del'>-			  "\xe2\x5f\xaf\xd8\xa4\xf8\xc9\x7a"</div><div class='del'>-			  "\xd6\xf9\x21\x31\x62\x44\x45\xa6"</div><div class='del'>-			  "\xd6\xbc\x5a\xd3\x2d\x54\x43\xcc"</div><div class='del'>-			  "\x9d\xde\xa5\x70\xe9\x42\x45\x8a"</div><div class='del'>-			  "\x6b\xfa\xb1\x91\x13\xb0\xd9\x19",</div><div class='del'>-		.ilen	= 128,</div><div class='del'>-		.result	= "\x6f\x54\x20\x6f\x61\x4d\x79\x6e"</div><div class='del'>-			  "\x53\x20\x63\x65\x65\x72\x73\x74"</div><div class='del'>-			  "\x54\x20\x6f\x6f\x4d\x20\x6e\x61"</div><div class='del'>-			  "\x20\x79\x65\x53\x72\x63\x74\x65"</div><div class='del'>-			  "\x20\x73\x6f\x54\x20\x6f\x61\x4d"</div><div class='del'>-			  "\x79\x6e\x53\x20\x63\x65\x65\x72"</div><div class='del'>-			  "\x73\x74\x54\x20\x6f\x6f\x4d\x20"</div><div class='del'>-			  "\x6e\x61\x20\x79\x65\x53\x72\x63"</div><div class='del'>-			  "\x74\x65\x20\x73\x6f\x54\x20\x6f"</div><div class='del'>-			  "\x61\x4d\x79\x6e\x53\x20\x63\x65"</div><div class='del'>-			  "\x65\x72\x73\x74\x54\x20\x6f\x6f"</div><div class='del'>-			  "\x4d\x20\x6e\x61\x20\x79\x65\x53"</div><div class='del'>-			  "\x72\x63\x74\x65\x20\x73\x6f\x54"</div><div class='del'>-			  "\x20\x6f\x61\x4d\x79\x6e\x53\x20"</div><div class='del'>-			  "\x63\x65\x65\x72\x73\x74\x54\x20"</div><div class='del'>-			  "\x6f\x6f\x4d\x20\x6e\x61\x0a\x79",</div><div class='del'>-		.rlen	= 128,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Blowfish test vectors.</div><div class='del'>- */</div><div class='del'>-#define BF_ENC_TEST_VECTORS	6</div><div class='del'>-#define BF_DEC_TEST_VECTORS	6</div><div class='del'>-#define BF_CBC_ENC_TEST_VECTORS	1</div><div class='del'>-#define BF_CBC_DEC_TEST_VECTORS	1</div><div class='del'>-</div><div class='del'>-static struct cipher_testvec bf_enc_tv_template[] = {</div><div class='del'>-	{ /* DES test vectors from OpenSSL */</div><div class='del'>-		.key	= "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='del'>-		.klen	= 8,</div><div class='del'>-		.input	= "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='del'>-		.ilen	= 8,</div><div class='del'>-		.result	= "\x4e\xf9\x97\x45\x61\x98\xdd\x78",</div><div class='del'>-		.rlen	= 8,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x1f\x1f\x1f\x1f\x0e\x0e\x0e\x0e",</div><div class='del'>-		.klen	= 8,</div><div class='del'>-		.input	= "\x01\x23\x45\x67\x89\xab\xcd\xef",</div><div class='del'>-		.ilen	= 8,</div><div class='del'>-		.result	= "\xa7\x90\x79\x51\x08\xea\x3c\xae",</div><div class='del'>-		.rlen	= 8,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\xf0\xe1\xd2\xc3\xb4\xa5\x96\x87",</div><div class='del'>-		.klen	= 8,</div><div class='del'>-		.input	= "\xfe\xdc\xba\x98\x76\x54\x32\x10",</div><div class='del'>-		.ilen	= 8,</div><div class='del'>-		.result	= "\xe8\x7a\x24\x4e\x2c\xc8\x5e\x82",</div><div class='del'>-		.rlen	= 8,</div><div class='del'>-	}, { /* Vary the keylength... */</div><div class='del'>-		.key	= "\xf0\xe1\xd2\xc3\xb4\xa5\x96\x87"</div><div class='del'>-			  "\x78\x69\x5a\x4b\x3c\x2d\x1e\x0f",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.input	= "\xfe\xdc\xba\x98\x76\x54\x32\x10",</div><div class='del'>-		.ilen	= 8,</div><div class='del'>-		.result	= "\x93\x14\x28\x87\xee\x3b\xe1\x5c",</div><div class='del'>-		.rlen	= 8,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\xf0\xe1\xd2\xc3\xb4\xa5\x96\x87"</div><div class='del'>-			  "\x78\x69\x5a\x4b\x3c\x2d\x1e\x0f"</div><div class='del'>-			  "\x00\x11\x22\x33\x44",</div><div class='del'>-		.klen	= 21,</div><div class='del'>-		.input	= "\xfe\xdc\xba\x98\x76\x54\x32\x10",</div><div class='del'>-		.ilen	= 8,</div><div class='del'>-		.result	= "\xe6\xf5\x1e\xd7\x9b\x9d\xb2\x1f",</div><div class='del'>-		.rlen	= 8,</div><div class='del'>-	}, { /* Generated with bf488 */</div><div class='del'>-		.key	= "\xf0\xe1\xd2\xc3\xb4\xa5\x96\x87"</div><div class='del'>-			  "\x78\x69\x5a\x4b\x3c\x2d\x1e\x0f"</div><div class='del'>-			  "\x00\x11\x22\x33\x44\x55\x66\x77"</div><div class='del'>-			  "\x04\x68\x91\x04\xc2\xfd\x3b\x2f"</div><div class='del'>-			  "\x58\x40\x23\x64\x1a\xba\x61\x76"</div><div class='del'>-			  "\x1f\x1f\x1f\x1f\x0e\x0e\x0e\x0e"</div><div class='del'>-			  "\xff\xff\xff\xff\xff\xff\xff\xff",</div><div class='del'>-		.klen	= 56,</div><div class='del'>-		.input	= "\xfe\xdc\xba\x98\x76\x54\x32\x10",</div><div class='del'>-		.ilen	= 8,</div><div class='del'>-		.result	= "\xc0\x45\x04\x01\x2e\x4e\x1f\x53",</div><div class='del'>-		.rlen	= 8,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct cipher_testvec bf_dec_tv_template[] = {</div><div class='del'>-	{ /* DES test vectors from OpenSSL */</div><div class='del'>-		.key	= "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='del'>-		.klen	= 8,</div><div class='del'>-		.input	= "\x4e\xf9\x97\x45\x61\x98\xdd\x78",</div><div class='del'>-		.ilen	= 8,</div><div class='del'>-		.result	= "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='del'>-		.rlen	= 8,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x1f\x1f\x1f\x1f\x0e\x0e\x0e\x0e",</div><div class='del'>-		.klen	= 8,</div><div class='del'>-		.input	= "\xa7\x90\x79\x51\x08\xea\x3c\xae",</div><div class='del'>-		.ilen	= 8,</div><div class='del'>-		.result	= "\x01\x23\x45\x67\x89\xab\xcd\xef",</div><div class='del'>-		.rlen	= 8,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\xf0\xe1\xd2\xc3\xb4\xa5\x96\x87",</div><div class='del'>-		.klen	= 8,</div><div class='del'>-		.input	= "\xe8\x7a\x24\x4e\x2c\xc8\x5e\x82",</div><div class='del'>-		.ilen	= 8,</div><div class='del'>-		.result	= "\xfe\xdc\xba\x98\x76\x54\x32\x10",</div><div class='del'>-		.rlen	= 8,</div><div class='del'>-	}, { /* Vary the keylength... */</div><div class='del'>-		.key	= "\xf0\xe1\xd2\xc3\xb4\xa5\x96\x87"</div><div class='del'>-			  "\x78\x69\x5a\x4b\x3c\x2d\x1e\x0f",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.input	= "\x93\x14\x28\x87\xee\x3b\xe1\x5c",</div><div class='del'>-		.ilen	= 8,</div><div class='del'>-		.result	= "\xfe\xdc\xba\x98\x76\x54\x32\x10",</div><div class='del'>-		.rlen	= 8,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\xf0\xe1\xd2\xc3\xb4\xa5\x96\x87"</div><div class='del'>-			  "\x78\x69\x5a\x4b\x3c\x2d\x1e\x0f"</div><div class='del'>-			  "\x00\x11\x22\x33\x44",</div><div class='del'>-		.klen	= 21,</div><div class='del'>-		.input	= "\xe6\xf5\x1e\xd7\x9b\x9d\xb2\x1f",</div><div class='del'>-		.ilen	= 8,</div><div class='del'>-		.result	= "\xfe\xdc\xba\x98\x76\x54\x32\x10",</div><div class='del'>-		.rlen	= 8,</div><div class='del'>-	}, { /* Generated with bf488, using OpenSSL, Libgcrypt and Nettle */</div><div class='del'>-		.key	= "\xf0\xe1\xd2\xc3\xb4\xa5\x96\x87"</div><div class='del'>-			  "\x78\x69\x5a\x4b\x3c\x2d\x1e\x0f"</div><div class='del'>-			  "\x00\x11\x22\x33\x44\x55\x66\x77"</div><div class='del'>-			  "\x04\x68\x91\x04\xc2\xfd\x3b\x2f"</div><div class='del'>-			  "\x58\x40\x23\x64\x1a\xba\x61\x76"</div><div class='del'>-			  "\x1f\x1f\x1f\x1f\x0e\x0e\x0e\x0e"</div><div class='del'>-			  "\xff\xff\xff\xff\xff\xff\xff\xff",</div><div class='del'>-		.klen	= 56,</div><div class='del'>-		.input	= "\xc0\x45\x04\x01\x2e\x4e\x1f\x53",</div><div class='del'>-		.ilen	= 8,</div><div class='del'>-		.result	= "\xfe\xdc\xba\x98\x76\x54\x32\x10",</div><div class='del'>-		.rlen	= 8,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct cipher_testvec bf_cbc_enc_tv_template[] = {</div><div class='del'>-	{ /* From OpenSSL */</div><div class='del'>-		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef"</div><div class='del'>-			  "\xf0\xe1\xd2\xc3\xb4\xa5\x96\x87",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.iv	= "\xfe\xdc\xba\x98\x76\x54\x32\x10",</div><div class='del'>-		.input	= "\x37\x36\x35\x34\x33\x32\x31\x20"</div><div class='del'>-			  "\x4e\x6f\x77\x20\x69\x73\x20\x74"</div><div class='del'>-			  "\x68\x65\x20\x74\x69\x6d\x65\x20"</div><div class='del'>-			  "\x66\x6f\x72\x20\x00\x00\x00\x00",</div><div class='del'>-		.ilen	= 32,</div><div class='del'>-		.result	= "\x6b\x77\xb4\xd6\x30\x06\xde\xe6"</div><div class='del'>-			  "\x05\xb1\x56\xe2\x74\x03\x97\x93"</div><div class='del'>-			  "\x58\xde\xb9\xe7\x15\x46\x16\xd9"</div><div class='del'>-			  "\x59\xf1\x65\x2b\xd5\xff\x92\xcc",</div><div class='del'>-		.rlen	= 32,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct cipher_testvec bf_cbc_dec_tv_template[] = {</div><div class='del'>-	{ /* From OpenSSL */</div><div class='del'>-		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef"</div><div class='del'>-			  "\xf0\xe1\xd2\xc3\xb4\xa5\x96\x87",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.iv	= "\xfe\xdc\xba\x98\x76\x54\x32\x10",</div><div class='del'>-		.input	= "\x6b\x77\xb4\xd6\x30\x06\xde\xe6"</div><div class='del'>-			  "\x05\xb1\x56\xe2\x74\x03\x97\x93"</div><div class='del'>-			  "\x58\xde\xb9\xe7\x15\x46\x16\xd9"</div><div class='del'>-			  "\x59\xf1\x65\x2b\xd5\xff\x92\xcc",</div><div class='del'>-		.ilen	= 32,</div><div class='del'>-		.result	= "\x37\x36\x35\x34\x33\x32\x31\x20"</div><div class='del'>-			  "\x4e\x6f\x77\x20\x69\x73\x20\x74"</div><div class='del'>-			  "\x68\x65\x20\x74\x69\x6d\x65\x20"</div><div class='del'>-			  "\x66\x6f\x72\x20\x00\x00\x00\x00",</div><div class='del'>-		.rlen	= 32,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Twofish test vectors.</div><div class='del'>- */</div><div class='del'>-#define TF_ENC_TEST_VECTORS		3</div><div class='del'>-#define TF_DEC_TEST_VECTORS		3</div><div class='del'>-#define TF_CBC_ENC_TEST_VECTORS		4</div><div class='del'>-#define TF_CBC_DEC_TEST_VECTORS		4</div><div class='del'>-</div><div class='del'>-static struct cipher_testvec tf_enc_tv_template[] = {</div><div class='del'>-	{</div><div class='del'>-		.key	= zeroed_string,</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.input	= zeroed_string,</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result	= "\x9f\x58\x9f\x5c\xf6\x12\x2c\x32"</div><div class='del'>-			  "\xb6\xbf\xec\x2f\x2a\xe8\xc3\x5a",</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef"</div><div class='del'>-			  "\xfe\xdc\xba\x98\x76\x54\x32\x10"</div><div class='del'>-			  "\x00\x11\x22\x33\x44\x55\x66\x77",</div><div class='del'>-		.klen	= 24,</div><div class='del'>-		.input	= zeroed_string,</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result	= "\xcf\xd1\xd2\xe5\xa9\xbe\x9c\xdf"</div><div class='del'>-			  "\x50\x1f\x13\xb8\x92\xbd\x22\x48",</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef"</div><div class='del'>-			  "\xfe\xdc\xba\x98\x76\x54\x32\x10"</div><div class='del'>-			  "\x00\x11\x22\x33\x44\x55\x66\x77"</div><div class='del'>-			  "\x88\x99\xaa\xbb\xcc\xdd\xee\xff",</div><div class='del'>-		.klen	= 32,</div><div class='del'>-		.input	= zeroed_string,</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result	= "\x37\x52\x7b\xe0\x05\x23\x34\xb8"</div><div class='del'>-			  "\x9f\x0c\xfc\xca\xe8\x7c\xfa\x20",</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='add'>+#define DES3_SPEED_VECTORS	1</div><div class='ctx'> </div><div class='del'>-static struct cipher_testvec tf_dec_tv_template[] = {</div><div class='add'>+static struct cipher_speed_template des3_speed_template[] = {</div><div class='ctx'> 	{</div><div class='del'>-		.key	= zeroed_string,</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.input	= "\x9f\x58\x9f\x5c\xf6\x12\x2c\x32"</div><div class='del'>-			  "\xb6\xbf\xec\x2f\x2a\xe8\xc3\x5a",</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result	= zeroed_string,</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	}, {</div><div class='ctx'> 		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef"</div><div class='del'>-			  "\xfe\xdc\xba\x98\x76\x54\x32\x10"</div><div class='del'>-			  "\x00\x11\x22\x33\x44\x55\x66\x77",</div><div class='del'>-		.klen	= 24,</div><div class='del'>-		.input	= "\xcf\xd1\xd2\xe5\xa9\xbe\x9c\xdf"</div><div class='del'>-			  "\x50\x1f\x13\xb8\x92\xbd\x22\x48",</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result	= zeroed_string,</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef"</div><div class='del'>-			  "\xfe\xdc\xba\x98\x76\x54\x32\x10"</div><div class='del'>-			  "\x00\x11\x22\x33\x44\x55\x66\x77"</div><div class='del'>-			  "\x88\x99\xaa\xbb\xcc\xdd\xee\xff",</div><div class='del'>-		.klen	= 32,</div><div class='del'>-		.input	= "\x37\x52\x7b\xe0\x05\x23\x34\xb8"</div><div class='del'>-			  "\x9f\x0c\xfc\xca\xe8\x7c\xfa\x20",</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result	= zeroed_string,</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct cipher_testvec tf_cbc_enc_tv_template[] = {</div><div class='del'>-	{ /* Generated with Nettle */</div><div class='del'>-		.key	= zeroed_string,</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.iv	= zeroed_string,</div><div class='del'>-		.input	= zeroed_string,</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result	= "\x9f\x58\x9f\x5c\xf6\x12\x2c\x32"</div><div class='del'>-			  "\xb6\xbf\xec\x2f\x2a\xe8\xc3\x5a",</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= zeroed_string,</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.iv	= "\x9f\x58\x9f\x5c\xf6\x12\x2c\x32"</div><div class='del'>-			  "\xb6\xbf\xec\x2f\x2a\xe8\xc3\x5a",</div><div class='del'>-		.input	= zeroed_string,</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result	= "\xd4\x91\xdb\x16\xe7\xb1\xc3\x9e"</div><div class='del'>-			  "\x86\xcb\x08\x6b\x78\x9f\x54\x19",</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= zeroed_string,</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.iv	= "\xd4\x91\xdb\x16\xe7\xb1\xc3\x9e"</div><div class='del'>-			  "\x86\xcb\x08\x6b\x78\x9f\x54\x19",</div><div class='del'>-		.input	= zeroed_string,</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result	= "\x05\xef\x8c\x61\xa8\x11\x58\x26"</div><div class='del'>-			  "\x34\xba\x5c\xb7\x10\x6a\xa6\x41",</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= zeroed_string,</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.iv	= zeroed_string,</div><div class='del'>-		.input	= zeroed_string,</div><div class='del'>-		.ilen	= 48,</div><div class='del'>-		.result	= "\x9f\x58\x9f\x5c\xf6\x12\x2c\x32"</div><div class='del'>-			  "\xb6\xbf\xec\x2f\x2a\xe8\xc3\x5a"</div><div class='del'>-			  "\xd4\x91\xdb\x16\xe7\xb1\xc3\x9e"</div><div class='del'>-			  "\x86\xcb\x08\x6b\x78\x9f\x54\x19"</div><div class='del'>-			  "\x05\xef\x8c\x61\xa8\x11\x58\x26"</div><div class='del'>-			  "\x34\xba\x5c\xb7\x10\x6a\xa6\x41",</div><div class='del'>-		.rlen	= 48,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct cipher_testvec tf_cbc_dec_tv_template[] = {</div><div class='del'>-	{ /* Reverse of the first four above */</div><div class='del'>-		.key	= zeroed_string,</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.iv	= zeroed_string,</div><div class='del'>-		.input	= "\x9f\x58\x9f\x5c\xf6\x12\x2c\x32"</div><div class='del'>-			  "\xb6\xbf\xec\x2f\x2a\xe8\xc3\x5a",</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result	= zeroed_string,</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= zeroed_string,</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.iv	= "\x9f\x58\x9f\x5c\xf6\x12\x2c\x32"</div><div class='del'>-			  "\xb6\xbf\xec\x2f\x2a\xe8\xc3\x5a",</div><div class='del'>-		.input	= "\xd4\x91\xdb\x16\xe7\xb1\xc3\x9e"</div><div class='del'>-			  "\x86\xcb\x08\x6b\x78\x9f\x54\x19",</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result	= zeroed_string,</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= zeroed_string,</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.iv	= "\xd4\x91\xdb\x16\xe7\xb1\xc3\x9e"</div><div class='del'>-			  "\x86\xcb\x08\x6b\x78\x9f\x54\x19",</div><div class='del'>-		.input	= "\x05\xef\x8c\x61\xa8\x11\x58\x26"</div><div class='del'>-			  "\x34\xba\x5c\xb7\x10\x6a\xa6\x41",</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result	= zeroed_string,</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= zeroed_string,</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.iv	= zeroed_string,</div><div class='del'>-		.input	= "\x9f\x58\x9f\x5c\xf6\x12\x2c\x32"</div><div class='del'>-			  "\xb6\xbf\xec\x2f\x2a\xe8\xc3\x5a"</div><div class='del'>-			  "\xd4\x91\xdb\x16\xe7\xb1\xc3\x9e"</div><div class='del'>-			  "\x86\xcb\x08\x6b\x78\x9f\x54\x19"</div><div class='del'>-			  "\x05\xef\x8c\x61\xa8\x11\x58\x26"</div><div class='del'>-			  "\x34\xba\x5c\xb7\x10\x6a\xa6\x41",</div><div class='del'>-		.ilen	= 48,</div><div class='del'>-		.result	= zeroed_string,</div><div class='del'>-		.rlen	= 48,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Serpent test vectors.  These are backwards because Serpent writes</div><div class='del'>- * octet sequences in right-to-left mode.</div><div class='del'>- */</div><div class='del'>-#define SERPENT_ENC_TEST_VECTORS	4</div><div class='del'>-#define SERPENT_DEC_TEST_VECTORS	4</div><div class='del'>-</div><div class='del'>-#define TNEPRES_ENC_TEST_VECTORS	4</div><div class='del'>-#define TNEPRES_DEC_TEST_VECTORS	4</div><div class='del'>-</div><div class='del'>-static struct cipher_testvec serpent_enc_tv_template[] = {</div><div class='del'>-	{</div><div class='del'>-		.input	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='del'>-			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result	= "\x12\x07\xfc\xce\x9b\xd0\xd6\x47"</div><div class='del'>-			  "\x6a\xe9\x8f\xbe\xd1\x43\xa0\xe2",</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='del'>-			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.input	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='del'>-			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result	= "\x4c\x7d\x8a\x32\x80\x72\xa2\x2c"</div><div class='del'>-			  "\x82\x3e\x4a\x1f\x3a\xcd\xa1\x6d",</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='del'>-			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='del'>-			  "\x10\x11\x12\x13\x14\x15\x16\x17"</div><div class='del'>-			  "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f",</div><div class='del'>-		.klen	= 32,</div><div class='del'>-		.input	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='del'>-			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result	= "\xde\x26\x9f\xf8\x33\xe4\x32\xb8"</div><div class='del'>-			  "\x5b\x2e\x88\xd2\x70\x1c\xe7\x5c",</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x80",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.input	= zeroed_string,</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result	= "\xdd\xd2\x6b\x98\xa5\xff\xd8\x2c"</div><div class='del'>-			  "\x05\x34\x5a\x9d\xad\xbf\xaf\x49",</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct cipher_testvec tnepres_enc_tv_template[] = {</div><div class='del'>-	{ /* KeySize=128, PT=0, I=1 */</div><div class='del'>-		.input	= "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			  "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='del'>-		.key    = "\x80\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			  "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='del'>-		.klen   = 16,</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result	= "\x49\xaf\xbf\xad\x9d\x5a\x34\x05"</div><div class='del'>-			  "\x2c\xd8\xff\xa5\x98\x6b\xd2\xdd",</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	}, { /* KeySize=192, PT=0, I=1 */</div><div class='del'>-		.key	= "\x80\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			  "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			  "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='del'>-		.klen	= 24,</div><div class='del'>-		.input	= "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			  "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result	= "\xe7\x8e\x54\x02\xc7\x19\x55\x68"</div><div class='del'>-			  "\xac\x36\x78\xf7\xa3\xf6\x0c\x66",</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	}, { /* KeySize=256, PT=0, I=1 */</div><div class='del'>-		.key	= "\x80\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			  "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			  "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			  "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='del'>-		.klen	= 32,</div><div class='del'>-		.input	= "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			  "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result	= "\xab\xed\x96\xe7\x66\xbf\x28\xcb"</div><div class='del'>-			  "\xc0\xeb\xd2\x1a\x82\xef\x08\x19",</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	}, { /* KeySize=256, I=257 */</div><div class='del'>-		.key	= "\x1f\x1e\x1d\x1c\x1b\x1a\x19\x18"</div><div class='del'>-			  "\x17\x16\x15\x14\x13\x12\x11\x10"</div><div class='del'>-			  "\x0f\x0e\x0d\x0c\x0b\x0a\x09\x08"</div><div class='del'>-			  "\x07\x06\x05\x04\x03\x02\x01\x00",</div><div class='del'>-		.klen	= 32,</div><div class='del'>-		.input	= "\x0f\x0e\x0d\x0c\x0b\x0a\x09\x08"</div><div class='del'>-			  "\x07\x06\x05\x04\x03\x02\x01\x00",</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result	= "\x5c\xe7\x1c\x70\xd2\x88\x2e\x5b"</div><div class='del'>-			  "\xb8\x32\xe4\x33\xf8\x9f\x26\xde",</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static struct cipher_testvec serpent_dec_tv_template[] = {</div><div class='del'>-	{</div><div class='del'>-		.input	= "\x12\x07\xfc\xce\x9b\xd0\xd6\x47"</div><div class='del'>-			  "\x6a\xe9\x8f\xbe\xd1\x43\xa0\xe2",</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='del'>-			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='del'>-			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.input	= "\x4c\x7d\x8a\x32\x80\x72\xa2\x2c"</div><div class='del'>-			  "\x82\x3e\x4a\x1f\x3a\xcd\xa1\x6d",</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='del'>-			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='del'>-			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='del'>-			  "\x10\x11\x12\x13\x14\x15\x16\x17"</div><div class='del'>-			  "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f",</div><div class='del'>-		.klen	= 32,</div><div class='del'>-		.input	= "\xde\x26\x9f\xf8\x33\xe4\x32\xb8"</div><div class='del'>-			  "\x5b\x2e\x88\xd2\x70\x1c\xe7\x5c",</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='del'>-			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x80",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.input	= "\xdd\xd2\x6b\x98\xa5\xff\xd8\x2c"</div><div class='del'>-			  "\x05\x34\x5a\x9d\xad\xbf\xaf\x49",</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result	= zeroed_string,</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct cipher_testvec tnepres_dec_tv_template[] = {</div><div class='del'>-	{</div><div class='del'>-		.input	= "\x41\xcc\x6b\x31\x59\x31\x45\x97"</div><div class='del'>-			  "\x6d\x6f\xbb\x38\x4b\x37\x21\x28",</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='del'>-			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='del'>-			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.input	= "\xea\xf4\xd7\xfc\xd8\x01\x34\x47"</div><div class='del'>-			  "\x81\x45\x0b\xfa\x0c\xd6\xad\x6e",</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='del'>-			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='del'>-			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='del'>-			  "\x10\x11\x12\x13\x14\x15\x16\x17"</div><div class='del'>-			  "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f",</div><div class='del'>-		.klen	= 32,</div><div class='del'>-		.input	= "\x64\xa9\x1a\x37\xed\x9f\xe7\x49"</div><div class='del'>-			  "\xa8\x4e\x76\xd6\xf5\x0d\x78\xee",</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='del'>-			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	}, { /* KeySize=128, I=121 */</div><div class='del'>-		.key	= "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x80",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.input	= "\x3d\xda\xbf\xc0\x06\xda\xab\x06"</div><div class='del'>-			  "\x46\x2a\xf4\xef\x81\x54\x4e\x26",</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result	= zeroed_string,</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Cast6 test vectors from RFC 2612 */</div><div class='del'>-#define CAST6_ENC_TEST_VECTORS	3</div><div class='del'>-#define CAST6_DEC_TEST_VECTORS  3</div><div class='del'>-</div><div class='del'>-static struct cipher_testvec cast6_enc_tv_template[] = {</div><div class='del'>-	{</div><div class='del'>-		.key	= "\x23\x42\xbb\x9e\xfa\x38\x54\x2c"</div><div class='del'>-			  "\x0a\xf7\x56\x47\xf2\x9f\x61\x5d",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.input	= zeroed_string,</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result	= "\xc8\x42\xa0\x89\x72\xb4\x3d\x20"</div><div class='del'>-			  "\x83\x6c\x91\xd1\xb7\x53\x0f\x6b",</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x23\x42\xbb\x9e\xfa\x38\x54\x2c"</div><div class='del'>-			  "\xbe\xd0\xac\x83\x94\x0a\xc2\x98"</div><div class='del'>-			  "\xba\xc7\x7a\x77\x17\x94\x28\x63",</div><div class='del'>-		.klen	= 24,</div><div class='del'>-		.input	= zeroed_string,</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result	= "\x1b\x38\x6c\x02\x10\xdc\xad\xcb"</div><div class='del'>-			  "\xdd\x0e\x41\xaa\x08\xa7\xa7\xe8",</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x23\x42\xbb\x9e\xfa\x38\x54\x2c"</div><div class='del'>-			  "\xbe\xd0\xac\x83\x94\x0a\xc2\x98"</div><div class='del'>-			  "\x8d\x7c\x47\xce\x26\x49\x08\x46"</div><div class='del'>-			  "\x1c\xc1\xb5\x13\x7a\xe6\xb6\x04",</div><div class='del'>-		.klen	= 32,</div><div class='del'>-		.input	= zeroed_string,</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result	= "\x4f\x6a\x20\x38\x28\x68\x97\xb9"</div><div class='del'>-			  "\xc9\x87\x01\x36\x55\x33\x17\xfa",</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct cipher_testvec cast6_dec_tv_template[] = {</div><div class='del'>-	{</div><div class='del'>-		.key	= "\x23\x42\xbb\x9e\xfa\x38\x54\x2c"</div><div class='del'>-			  "\x0a\xf7\x56\x47\xf2\x9f\x61\x5d",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.input	= "\xc8\x42\xa0\x89\x72\xb4\x3d\x20"</div><div class='del'>-			  "\x83\x6c\x91\xd1\xb7\x53\x0f\x6b",</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result	= zeroed_string,</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x23\x42\xbb\x9e\xfa\x38\x54\x2c"</div><div class='del'>-			  "\xbe\xd0\xac\x83\x94\x0a\xc2\x98"</div><div class='del'>-			  "\xba\xc7\x7a\x77\x17\x94\x28\x63",</div><div class='del'>-		.klen	= 24,</div><div class='del'>-		.input	= "\x1b\x38\x6c\x02\x10\xdc\xad\xcb"</div><div class='del'>-			  "\xdd\x0e\x41\xaa\x08\xa7\xa7\xe8",</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result	= zeroed_string,</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x23\x42\xbb\x9e\xfa\x38\x54\x2c"</div><div class='del'>-			  "\xbe\xd0\xac\x83\x94\x0a\xc2\x98"</div><div class='del'>-			  "\x8d\x7c\x47\xce\x26\x49\x08\x46"</div><div class='del'>-			  "\x1c\xc1\xb5\x13\x7a\xe6\xb6\x04",</div><div class='del'>-		.klen	= 32,</div><div class='del'>-		.input	= "\x4f\x6a\x20\x38\x28\x68\x97\xb9"</div><div class='del'>-			  "\xc9\x87\x01\x36\x55\x33\x17\xfa",</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result	= zeroed_string,</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * AES test vectors.</div><div class='del'>- */</div><div class='del'>-#define AES_ENC_TEST_VECTORS 3</div><div class='del'>-#define AES_DEC_TEST_VECTORS 3</div><div class='del'>-#define AES_CBC_ENC_TEST_VECTORS 4</div><div class='del'>-#define AES_CBC_DEC_TEST_VECTORS 4</div><div class='del'>-#define AES_LRW_ENC_TEST_VECTORS 8</div><div class='del'>-#define AES_LRW_DEC_TEST_VECTORS 8</div><div class='del'>-#define AES_XTS_ENC_TEST_VECTORS 4</div><div class='del'>-#define AES_XTS_DEC_TEST_VECTORS 4</div><div class='del'>-#define AES_CTR_ENC_TEST_VECTORS 7</div><div class='del'>-#define AES_CTR_DEC_TEST_VECTORS 6</div><div class='del'>-#define AES_GCM_ENC_TEST_VECTORS 9</div><div class='del'>-#define AES_GCM_DEC_TEST_VECTORS 8</div><div class='del'>-#define AES_CCM_ENC_TEST_VECTORS 7</div><div class='del'>-#define AES_CCM_DEC_TEST_VECTORS 7</div><div class='del'>-</div><div class='del'>-static struct cipher_testvec aes_enc_tv_template[] = {</div><div class='del'>-	{ /* From FIPS-197 */</div><div class='del'>-		.key	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='del'>-			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.input	= "\x00\x11\x22\x33\x44\x55\x66\x77"</div><div class='del'>-			  "\x88\x99\xaa\xbb\xcc\xdd\xee\xff",</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result	= "\x69\xc4\xe0\xd8\x6a\x7b\x04\x30"</div><div class='del'>-			  "\xd8\xcd\xb7\x80\x70\xb4\xc5\x5a",</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='del'>-			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='del'>-			  "\x10\x11\x12\x13\x14\x15\x16\x17",</div><div class='del'>-		.klen	= 24,</div><div class='del'>-		.input	= "\x00\x11\x22\x33\x44\x55\x66\x77"</div><div class='del'>-			  "\x88\x99\xaa\xbb\xcc\xdd\xee\xff",</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result	= "\xdd\xa9\x7c\xa4\x86\x4c\xdf\xe0"</div><div class='del'>-			  "\x6e\xaf\x70\xa0\xec\x0d\x71\x91",</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='del'>-			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='del'>-			  "\x10\x11\x12\x13\x14\x15\x16\x17"</div><div class='del'>-			  "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f",</div><div class='del'>-		.klen	= 32,</div><div class='del'>-		.input	= "\x00\x11\x22\x33\x44\x55\x66\x77"</div><div class='del'>-			  "\x88\x99\xaa\xbb\xcc\xdd\xee\xff",</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result	= "\x8e\xa2\xb7\xca\x51\x67\x45\xbf"</div><div class='del'>-			  "\xea\xfc\x49\x90\x4b\x49\x60\x89",</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct cipher_testvec aes_dec_tv_template[] = {</div><div class='del'>-	{ /* From FIPS-197 */</div><div class='del'>-		.key	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='del'>-			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.input	= "\x69\xc4\xe0\xd8\x6a\x7b\x04\x30"</div><div class='del'>-			  "\xd8\xcd\xb7\x80\x70\xb4\xc5\x5a",</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result	= "\x00\x11\x22\x33\x44\x55\x66\x77"</div><div class='del'>-			  "\x88\x99\xaa\xbb\xcc\xdd\xee\xff",</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='del'>-			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='del'>-			  "\x10\x11\x12\x13\x14\x15\x16\x17",</div><div class='del'>-		.klen	= 24,</div><div class='del'>-		.input	= "\xdd\xa9\x7c\xa4\x86\x4c\xdf\xe0"</div><div class='del'>-			  "\x6e\xaf\x70\xa0\xec\x0d\x71\x91",</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result	= "\x00\x11\x22\x33\x44\x55\x66\x77"</div><div class='del'>-			  "\x88\x99\xaa\xbb\xcc\xdd\xee\xff",</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='del'>-			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='del'>-			  "\x10\x11\x12\x13\x14\x15\x16\x17"</div><div class='del'>-			  "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f",</div><div class='del'>-		.klen	= 32,</div><div class='del'>-		.input	= "\x8e\xa2\xb7\xca\x51\x67\x45\xbf"</div><div class='del'>-			  "\xea\xfc\x49\x90\x4b\x49\x60\x89",</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result	= "\x00\x11\x22\x33\x44\x55\x66\x77"</div><div class='del'>-			  "\x88\x99\xaa\xbb\xcc\xdd\xee\xff",</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct cipher_testvec aes_cbc_enc_tv_template[] = {</div><div class='del'>-	{ /* From RFC 3602 */</div><div class='del'>-		.key    = "\x06\xa9\x21\x40\x36\xb8\xa1\x5b"</div><div class='del'>-			  "\x51\x2e\x03\xd5\x34\x12\x00\x06",</div><div class='del'>-		.klen   = 16,</div><div class='del'>-		.iv	= "\x3d\xaf\xba\x42\x9d\x9e\xb4\x30"</div><div class='del'>-			  "\xb4\x22\xda\x80\x2c\x9f\xac\x41",</div><div class='del'>-		.input	= "Single block msg",</div><div class='del'>-		.ilen   = 16,</div><div class='del'>-		.result = "\xe3\x53\x77\x9c\x10\x79\xae\xb8"</div><div class='del'>-			  "\x27\x08\x94\x2d\xbe\x77\x18\x1a",</div><div class='del'>-		.rlen   = 16,</div><div class='del'>-	}, {</div><div class='del'>-		.key    = "\xc2\x86\x69\x6d\x88\x7c\x9a\xa0"</div><div class='del'>-			  "\x61\x1b\xbb\x3e\x20\x25\xa4\x5a",</div><div class='del'>-		.klen   = 16,</div><div class='del'>-		.iv     = "\x56\x2e\x17\x99\x6d\x09\x3d\x28"</div><div class='del'>-			  "\xdd\xb3\xba\x69\x5a\x2e\x6f\x58",</div><div class='del'>-		.input  = "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='del'>-			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='del'>-			  "\x10\x11\x12\x13\x14\x15\x16\x17"</div><div class='del'>-			  "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f",</div><div class='del'>-		.ilen   = 32,</div><div class='del'>-		.result = "\xd2\x96\xcd\x94\xc2\xcc\xcf\x8a"</div><div class='del'>-			  "\x3a\x86\x30\x28\xb5\xe1\xdc\x0a"</div><div class='del'>-			  "\x75\x86\x60\x2d\x25\x3c\xff\xf9"</div><div class='del'>-			  "\x1b\x82\x66\xbe\xa6\xd6\x1a\xb1",</div><div class='del'>-		.rlen   = 32,</div><div class='del'>-	}, { /* From NIST SP800-38A */</div><div class='del'>-		.key	= "\x8e\x73\xb0\xf7\xda\x0e\x64\x52"</div><div class='del'>-			  "\xc8\x10\xf3\x2b\x80\x90\x79\xe5"</div><div class='del'>-			  "\x62\xf8\xea\xd2\x52\x2c\x6b\x7b",</div><div class='del'>-		.klen	= 24,</div><div class='del'>-		.iv	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='del'>-			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",</div><div class='del'>-		.input	= "\x6b\xc1\xbe\xe2\x2e\x40\x9f\x96"</div><div class='del'>-			  "\xe9\x3d\x7e\x11\x73\x93\x17\x2a"</div><div class='del'>-			  "\xae\x2d\x8a\x57\x1e\x03\xac\x9c"</div><div class='del'>-			  "\x9e\xb7\x6f\xac\x45\xaf\x8e\x51"</div><div class='del'>-			  "\x30\xc8\x1c\x46\xa3\x5c\xe4\x11"</div><div class='del'>-			  "\xe5\xfb\xc1\x19\x1a\x0a\x52\xef"</div><div class='del'>-			  "\xf6\x9f\x24\x45\xdf\x4f\x9b\x17"</div><div class='del'>-			  "\xad\x2b\x41\x7b\xe6\x6c\x37\x10",</div><div class='del'>-		.ilen	= 64,</div><div class='del'>-		.result	= "\x4f\x02\x1d\xb2\x43\xbc\x63\x3d"</div><div class='del'>-			  "\x71\x78\x18\x3a\x9f\xa0\x71\xe8"</div><div class='del'>-			  "\xb4\xd9\xad\xa9\xad\x7d\xed\xf4"</div><div class='del'>-			  "\xe5\xe7\x38\x76\x3f\x69\x14\x5a"</div><div class='del'>-			  "\x57\x1b\x24\x20\x12\xfb\x7a\xe0"</div><div class='del'>-			  "\x7f\xa9\xba\xac\x3d\xf1\x02\xe0"</div><div class='del'>-			  "\x08\xb0\xe2\x79\x88\x59\x88\x81"</div><div class='del'>-			  "\xd9\x20\xa9\xe6\x4f\x56\x15\xcd",</div><div class='del'>-		.rlen	= 64,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x60\x3d\xeb\x10\x15\xca\x71\xbe"</div><div class='del'>-			  "\x2b\x73\xae\xf0\x85\x7d\x77\x81"</div><div class='del'>-			  "\x1f\x35\x2c\x07\x3b\x61\x08\xd7"</div><div class='del'>-			  "\x2d\x98\x10\xa3\x09\x14\xdf\xf4",</div><div class='del'>-		.klen	= 32,</div><div class='del'>-		.iv	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='del'>-			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",</div><div class='del'>-		.input	= "\x6b\xc1\xbe\xe2\x2e\x40\x9f\x96"</div><div class='del'>-			  "\xe9\x3d\x7e\x11\x73\x93\x17\x2a"</div><div class='del'>-			  "\xae\x2d\x8a\x57\x1e\x03\xac\x9c"</div><div class='del'>-			  "\x9e\xb7\x6f\xac\x45\xaf\x8e\x51"</div><div class='del'>-			  "\x30\xc8\x1c\x46\xa3\x5c\xe4\x11"</div><div class='del'>-			  "\xe5\xfb\xc1\x19\x1a\x0a\x52\xef"</div><div class='del'>-			  "\xf6\x9f\x24\x45\xdf\x4f\x9b\x17"</div><div class='del'>-			  "\xad\x2b\x41\x7b\xe6\x6c\x37\x10",</div><div class='del'>-		.ilen	= 64,</div><div class='del'>-		.result	= "\xf5\x8c\x4c\x04\xd6\xe5\xf1\xba"</div><div class='del'>-			  "\x77\x9e\xab\xfb\x5f\x7b\xfb\xd6"</div><div class='del'>-			  "\x9c\xfc\x4e\x96\x7e\xdb\x80\x8d"</div><div class='del'>-			  "\x67\x9f\x77\x7b\xc6\x70\x2c\x7d"</div><div class='del'>-			  "\x39\xf2\x33\x69\xa9\xd9\xba\xcf"</div><div class='del'>-			  "\xa5\x30\xe2\x63\x04\x23\x14\x61"</div><div class='del'>-			  "\xb2\xeb\x05\xe2\xc3\x9b\xe9\xfc"</div><div class='del'>-			  "\xda\x6c\x19\x07\x8c\x6a\x9d\x1b",</div><div class='del'>-		.rlen	= 64,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct cipher_testvec aes_cbc_dec_tv_template[] = {</div><div class='del'>-	{ /* From RFC 3602 */</div><div class='del'>-		.key    = "\x06\xa9\x21\x40\x36\xb8\xa1\x5b"</div><div class='del'>-			  "\x51\x2e\x03\xd5\x34\x12\x00\x06",</div><div class='del'>-		.klen   = 16,</div><div class='del'>-		.iv     = "\x3d\xaf\xba\x42\x9d\x9e\xb4\x30"</div><div class='del'>-			  "\xb4\x22\xda\x80\x2c\x9f\xac\x41",</div><div class='del'>-		.input  = "\xe3\x53\x77\x9c\x10\x79\xae\xb8"</div><div class='del'>-			  "\x27\x08\x94\x2d\xbe\x77\x18\x1a",</div><div class='del'>-		.ilen   = 16,</div><div class='del'>-		.result = "Single block msg",</div><div class='del'>-		.rlen   = 16,</div><div class='del'>-	}, {</div><div class='del'>-		.key    = "\xc2\x86\x69\x6d\x88\x7c\x9a\xa0"</div><div class='del'>-			  "\x61\x1b\xbb\x3e\x20\x25\xa4\x5a",</div><div class='del'>-		.klen   = 16,</div><div class='del'>-		.iv     = "\x56\x2e\x17\x99\x6d\x09\x3d\x28"</div><div class='del'>-			  "\xdd\xb3\xba\x69\x5a\x2e\x6f\x58",</div><div class='del'>-		.input  = "\xd2\x96\xcd\x94\xc2\xcc\xcf\x8a"</div><div class='del'>-			  "\x3a\x86\x30\x28\xb5\xe1\xdc\x0a"</div><div class='del'>-			  "\x75\x86\x60\x2d\x25\x3c\xff\xf9"</div><div class='del'>-			  "\x1b\x82\x66\xbe\xa6\xd6\x1a\xb1",</div><div class='del'>-		.ilen   = 32,</div><div class='del'>-		.result = "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='del'>-			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='del'>-			  "\x10\x11\x12\x13\x14\x15\x16\x17"</div><div class='del'>-			  "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f",</div><div class='del'>-		.rlen   = 32,</div><div class='del'>-	}, { /* From NIST SP800-38A */</div><div class='del'>-		.key	= "\x8e\x73\xb0\xf7\xda\x0e\x64\x52"</div><div class='del'>-			  "\xc8\x10\xf3\x2b\x80\x90\x79\xe5"</div><div class='del'>-			  "\x62\xf8\xea\xd2\x52\x2c\x6b\x7b",</div><div class='del'>-		.klen	= 24,</div><div class='del'>-		.iv	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='del'>-			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",</div><div class='del'>-		.input	= "\x4f\x02\x1d\xb2\x43\xbc\x63\x3d"</div><div class='del'>-			  "\x71\x78\x18\x3a\x9f\xa0\x71\xe8"</div><div class='del'>-			  "\xb4\xd9\xad\xa9\xad\x7d\xed\xf4"</div><div class='del'>-			  "\xe5\xe7\x38\x76\x3f\x69\x14\x5a"</div><div class='del'>-			  "\x57\x1b\x24\x20\x12\xfb\x7a\xe0"</div><div class='del'>-			  "\x7f\xa9\xba\xac\x3d\xf1\x02\xe0"</div><div class='del'>-			  "\x08\xb0\xe2\x79\x88\x59\x88\x81"</div><div class='del'>-			  "\xd9\x20\xa9\xe6\x4f\x56\x15\xcd",</div><div class='del'>-		.ilen	= 64,</div><div class='del'>-		.result	= "\x6b\xc1\xbe\xe2\x2e\x40\x9f\x96"</div><div class='del'>-			  "\xe9\x3d\x7e\x11\x73\x93\x17\x2a"</div><div class='del'>-			  "\xae\x2d\x8a\x57\x1e\x03\xac\x9c"</div><div class='del'>-			  "\x9e\xb7\x6f\xac\x45\xaf\x8e\x51"</div><div class='del'>-			  "\x30\xc8\x1c\x46\xa3\x5c\xe4\x11"</div><div class='del'>-			  "\xe5\xfb\xc1\x19\x1a\x0a\x52\xef"</div><div class='del'>-			  "\xf6\x9f\x24\x45\xdf\x4f\x9b\x17"</div><div class='del'>-			  "\xad\x2b\x41\x7b\xe6\x6c\x37\x10",</div><div class='del'>-		.rlen	= 64,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x60\x3d\xeb\x10\x15\xca\x71\xbe"</div><div class='del'>-			  "\x2b\x73\xae\xf0\x85\x7d\x77\x81"</div><div class='del'>-			  "\x1f\x35\x2c\x07\x3b\x61\x08\xd7"</div><div class='del'>-			  "\x2d\x98\x10\xa3\x09\x14\xdf\xf4",</div><div class='del'>-		.klen	= 32,</div><div class='del'>-		.iv	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='del'>-			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",</div><div class='del'>-		.input	= "\xf5\x8c\x4c\x04\xd6\xe5\xf1\xba"</div><div class='del'>-			  "\x77\x9e\xab\xfb\x5f\x7b\xfb\xd6"</div><div class='del'>-			  "\x9c\xfc\x4e\x96\x7e\xdb\x80\x8d"</div><div class='del'>-			  "\x67\x9f\x77\x7b\xc6\x70\x2c\x7d"</div><div class='del'>-			  "\x39\xf2\x33\x69\xa9\xd9\xba\xcf"</div><div class='del'>-			  "\xa5\x30\xe2\x63\x04\x23\x14\x61"</div><div class='del'>-			  "\xb2\xeb\x05\xe2\xc3\x9b\xe9\xfc"</div><div class='del'>-			  "\xda\x6c\x19\x07\x8c\x6a\x9d\x1b",</div><div class='del'>-		.ilen	= 64,</div><div class='del'>-		.result	= "\x6b\xc1\xbe\xe2\x2e\x40\x9f\x96"</div><div class='del'>-			  "\xe9\x3d\x7e\x11\x73\x93\x17\x2a"</div><div class='del'>-			  "\xae\x2d\x8a\x57\x1e\x03\xac\x9c"</div><div class='del'>-			  "\x9e\xb7\x6f\xac\x45\xaf\x8e\x51"</div><div class='del'>-			  "\x30\xc8\x1c\x46\xa3\x5c\xe4\x11"</div><div class='del'>-			  "\xe5\xfb\xc1\x19\x1a\x0a\x52\xef"</div><div class='del'>-			  "\xf6\x9f\x24\x45\xdf\x4f\x9b\x17"</div><div class='del'>-			  "\xad\x2b\x41\x7b\xe6\x6c\x37\x10",</div><div class='del'>-		.rlen	= 64,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct cipher_testvec aes_lrw_enc_tv_template[] = {</div><div class='del'>-	/* from http://grouper.ieee.org/groups/1619/email/pdf00017.pdf */</div><div class='del'>-	{ /* LRW-32-AES 1 */</div><div class='del'>-		.key    = "\x45\x62\xac\x25\xf8\x28\x17\x6d"</div><div class='del'>-			  "\x4c\x26\x84\x14\xb5\x68\x01\x85"</div><div class='del'>-			  "\x25\x8e\x2a\x05\xe7\x3e\x9d\x03"</div><div class='del'>-			  "\xee\x5a\x83\x0c\xcc\x09\x4c\x87",</div><div class='del'>-		.klen   = 32,</div><div class='del'>-		.iv     = "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			  "\x00\x00\x00\x00\x00\x00\x00\x01",</div><div class='del'>-		.input  = "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='del'>-			  "\x38\x39\x41\x42\x43\x44\x45\x46",</div><div class='del'>-		.ilen   = 16,</div><div class='del'>-		.result = "\xf1\xb2\x73\xcd\x65\xa3\xdf\x5f"</div><div class='del'>-			  "\xe9\x5d\x48\x92\x54\x63\x4e\xb8",</div><div class='del'>-		.rlen   = 16,</div><div class='del'>-	}, { /* LRW-32-AES 2 */</div><div class='del'>-		.key    = "\x59\x70\x47\x14\xf5\x57\x47\x8c"</div><div class='del'>-			  "\xd7\x79\xe8\x0f\x54\x88\x79\x44"</div><div class='del'>-			  "\x0d\x48\xf0\xb7\xb1\x5a\x53\xea"</div><div class='del'>-			  "\x1c\xaa\x6b\x29\xc2\xca\xfb\xaf",</div><div class='del'>-		.klen   = 32,</div><div class='del'>-		.iv     = "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			  "\x00\x00\x00\x00\x00\x00\x00\x02",</div><div class='del'>-		.input  = "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='del'>-			  "\x38\x39\x41\x42\x43\x44\x45\x46",</div><div class='del'>-		.ilen   = 16,</div><div class='del'>-		.result = "\x00\xc8\x2b\xae\x95\xbb\xcd\xe5"</div><div class='del'>-			  "\x27\x4f\x07\x69\xb2\x60\xe1\x36",</div><div class='del'>-		.rlen   = 16,</div><div class='del'>-	}, { /* LRW-32-AES 3 */</div><div class='del'>-		.key    = "\xd8\x2a\x91\x34\xb2\x6a\x56\x50"</div><div class='del'>-			  "\x30\xfe\x69\xe2\x37\x7f\x98\x47"</div><div class='del'>-			  "\xcd\xf9\x0b\x16\x0c\x64\x8f\xb6"</div><div class='del'>-			  "\xb0\x0d\x0d\x1b\xae\x85\x87\x1f",</div><div class='del'>-		.klen   = 32,</div><div class='del'>-		.iv     = "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			  "\x00\x00\x00\x02\x00\x00\x00\x00",</div><div class='del'>-		.input  = "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='del'>-			  "\x38\x39\x41\x42\x43\x44\x45\x46",</div><div class='del'>-		.ilen   = 16,</div><div class='del'>-		.result = "\x76\x32\x21\x83\xed\x8f\xf1\x82"</div><div class='del'>-			  "\xf9\x59\x62\x03\x69\x0e\x5e\x01",</div><div class='del'>-		.rlen   = 16,</div><div class='del'>-	}, { /* LRW-32-AES 4 */</div><div class='del'>-		.key    = "\x0f\x6a\xef\xf8\xd3\xd2\xbb\x15"</div><div class='del'>-			  "\x25\x83\xf7\x3c\x1f\x01\x28\x74"</div><div class='del'>-			  "\xca\xc6\xbc\x35\x4d\x4a\x65\x54"</div><div class='del'>-			  "\x90\xae\x61\xcf\x7b\xae\xbd\xcc"</div><div class='del'>-			  "\xad\xe4\x94\xc5\x4a\x29\xae\x70",</div><div class='del'>-		.klen   = 40,</div><div class='del'>-		.iv     = "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			  "\x00\x00\x00\x00\x00\x00\x00\x01",</div><div class='del'>-		.input  = "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='del'>-			  "\x38\x39\x41\x42\x43\x44\x45\x46",</div><div class='del'>-		.ilen   = 16,</div><div class='del'>-		.result = "\x9c\x0f\x15\x2f\x55\xa2\xd8\xf0"</div><div class='del'>-			  "\xd6\x7b\x8f\x9e\x28\x22\xbc\x41",</div><div class='del'>-		.rlen   = 16,</div><div class='del'>-	}, { /* LRW-32-AES 5 */</div><div class='del'>-		.key    = "\x8a\xd4\xee\x10\x2f\xbd\x81\xff"</div><div class='del'>-			  "\xf8\x86\xce\xac\x93\xc5\xad\xc6"</div><div class='del'>-			  "\xa0\x19\x07\xc0\x9d\xf7\xbb\xdd"</div><div class='del'>-			  "\x52\x13\xb2\xb7\xf0\xff\x11\xd8"</div><div class='del'>-			  "\xd6\x08\xd0\xcd\x2e\xb1\x17\x6f",</div><div class='del'>-		.klen   = 40,</div><div class='del'>-		.iv     = "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			  "\x00\x00\x00\x02\x00\x00\x00\x00",</div><div class='del'>-		.input  = "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='del'>-			  "\x38\x39\x41\x42\x43\x44\x45\x46",</div><div class='del'>-		.ilen   = 16,</div><div class='del'>-		.result = "\xd4\x27\x6a\x7f\x14\x91\x3d\x65"</div><div class='del'>-			  "\xc8\x60\x48\x02\x87\xe3\x34\x06",</div><div class='del'>-		.rlen   = 16,</div><div class='del'>-	}, { /* LRW-32-AES 6 */</div><div class='del'>-		.key    = "\xf8\xd4\x76\xff\xd6\x46\xee\x6c"</div><div class='del'>-			  "\x23\x84\xcb\x1c\x77\xd6\x19\x5d"</div><div class='del'>-			  "\xfe\xf1\xa9\xf3\x7b\xbc\x8d\x21"</div><div class='del'>-			  "\xa7\x9c\x21\xf8\xcb\x90\x02\x89"</div><div class='del'>-			  "\xa8\x45\x34\x8e\xc8\xc5\xb5\xf1"</div><div class='del'>-			  "\x26\xf5\x0e\x76\xfe\xfd\x1b\x1e",</div><div class='del'>-		.klen   = 48,</div><div class='del'>-		.iv     = "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			  "\x00\x00\x00\x00\x00\x00\x00\x01",</div><div class='del'>-		.input  = "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='del'>-			  "\x38\x39\x41\x42\x43\x44\x45\x46",</div><div class='del'>-		.ilen   = 16,</div><div class='del'>-		.result = "\xbd\x06\xb8\xe1\xdb\x98\x89\x9e"</div><div class='del'>-			  "\xc4\x98\xe4\x91\xcf\x1c\x70\x2b",</div><div class='del'>-		.rlen   = 16,</div><div class='del'>-	}, { /* LRW-32-AES 7 */</div><div class='del'>-		.key    = "\xfb\x76\x15\xb2\x3d\x80\x89\x1d"</div><div class='del'>-			  "\xd4\x70\x98\x0b\xc7\x95\x84\xc8"</div><div class='del'>-			  "\xb2\xfb\x64\xce\x60\x97\x87\x8d"</div><div class='del'>-			  "\x17\xfc\xe4\x5a\x49\xe8\x30\xb7"</div><div class='del'>-			  "\x6e\x78\x17\xe7\x2d\x5e\x12\xd4"</div><div class='del'>-			  "\x60\x64\x04\x7a\xf1\x2f\x9e\x0c",</div><div class='del'>-		.klen   = 48,</div><div class='del'>-		.iv     = "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			  "\x00\x00\x00\x02\x00\x00\x00\x00",</div><div class='del'>-		.input  = "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='del'>-			  "\x38\x39\x41\x42\x43\x44\x45\x46",</div><div class='del'>-		.ilen   = 16,</div><div class='del'>-		.result = "\x5b\x90\x8e\xc1\xab\xdd\x67\x5f"</div><div class='del'>-			  "\x3d\x69\x8a\x95\x53\xc8\x9c\xe5",</div><div class='del'>-		.rlen   = 16,</div><div class='del'>-	}, {</div><div class='del'>-/* http://www.mail-archive.com/stds-p1619@listserv.ieee.org/msg00173.html */</div><div class='del'>-		.key    = "\xf8\xd4\x76\xff\xd6\x46\xee\x6c"</div><div class='del'>-			  "\x23\x84\xcb\x1c\x77\xd6\x19\x5d"</div><div class='del'>-			  "\xfe\xf1\xa9\xf3\x7b\xbc\x8d\x21"</div><div class='del'>-			  "\xa7\x9c\x21\xf8\xcb\x90\x02\x89"</div><div class='del'>-			  "\xa8\x45\x34\x8e\xc8\xc5\xb5\xf1"</div><div class='del'>-			  "\x26\xf5\x0e\x76\xfe\xfd\x1b\x1e",</div><div class='del'>-		.klen   = 48,</div><div class='del'>-		.iv     = "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			  "\x00\x00\x00\x00\x00\x00\x00\x01",</div><div class='del'>-		.input  = "\x05\x11\xb7\x18\xab\xc6\x2d\xac"</div><div class='del'>-			  "\x70\x5d\xf6\x22\x94\xcd\xe5\x6c"</div><div class='del'>-			  "\x17\x6b\xf6\x1c\xf0\xf3\x6e\xf8"</div><div class='del'>-			  "\x50\x38\x1f\x71\x49\xb6\x57\xd6"</div><div class='del'>-			  "\x8f\xcb\x8d\x6b\xe3\xa6\x29\x90"</div><div class='del'>-			  "\xfe\x2a\x62\x82\xae\x6d\x8b\xf6"</div><div class='del'>-			  "\xad\x1e\x9e\x20\x5f\x38\xbe\x04"</div><div class='del'>-			  "\xda\x10\x8e\xed\xa2\xa4\x87\xab"</div><div class='del'>-			  "\xda\x6b\xb4\x0c\x75\xba\xd3\x7c"</div><div class='del'>-			  "\xc9\xac\x42\x31\x95\x7c\xc9\x04"</div><div class='del'>-			  "\xeb\xd5\x6e\x32\x69\x8a\xdb\xa6"</div><div class='del'>-			  "\x15\xd7\x3f\x4f\x2f\x66\x69\x03"</div><div class='del'>-			  "\x9c\x1f\x54\x0f\xde\x1f\xf3\x65"</div><div class='del'>-			  "\x4c\x96\x12\xed\x7c\x92\x03\x01"</div><div class='del'>-			  "\x6f\xbc\x35\x93\xac\xf1\x27\xf1"</div><div class='del'>-			  "\xb4\x96\x82\x5a\x5f\xb0\xa0\x50"</div><div class='del'>-			  "\x89\xa4\x8e\x66\x44\x85\xcc\xfd"</div><div class='del'>-			  "\x33\x14\x70\xe3\x96\xb2\xc3\xd3"</div><div class='del'>-			  "\xbb\x54\x5a\x1a\xf9\x74\xa2\xc5"</div><div class='del'>-			  "\x2d\x64\x75\xdd\xb4\x54\xe6\x74"</div><div class='del'>-			  "\x8c\xd3\x9d\x9e\x86\xab\x51\x53"</div><div class='del'>-			  "\xb7\x93\x3e\x6f\xd0\x4e\x2c\x40"</div><div class='del'>-			  "\xf6\xa8\x2e\x3e\x9d\xf4\x66\xa5"</div><div class='del'>-			  "\x76\x12\x73\x44\x1a\x56\xd7\x72"</div><div class='del'>-			  "\x88\xcd\x21\x8c\x4c\x0f\xfe\xda"</div><div class='del'>-			  "\x95\xe0\x3a\xa6\xa5\x84\x46\xcd"</div><div class='del'>-			  "\xd5\x3e\x9d\x3a\xe2\x67\xe6\x60"</div><div class='del'>-			  "\x1a\xe2\x70\x85\x58\xc2\x1b\x09"</div><div class='del'>-			  "\xe1\xd7\x2c\xca\xad\xa8\x8f\xf9"</div><div class='del'>-			  "\xac\xb3\x0e\xdb\xca\x2e\xe2\xb8"</div><div class='del'>-			  "\x51\x71\xd9\x3c\x6c\xf1\x56\xf8"</div><div class='del'>-			  "\xea\x9c\xf1\xfb\x0c\xe6\xb7\x10"</div><div class='del'>-			  "\x1c\xf8\xa9\x7c\xe8\x53\x35\xc1"</div><div class='del'>-			  "\x90\x3e\x76\x4a\x74\xa4\x21\x2c"</div><div class='del'>-			  "\xf6\x2c\x4e\x0f\x94\x3a\x88\x2e"</div><div class='del'>-			  "\x41\x09\x6a\x33\x7d\xf6\xdd\x3f"</div><div class='del'>-			  "\x8d\x23\x31\x74\x84\xeb\x88\x6e"</div><div class='del'>-			  "\xcc\xb9\xbc\x22\x83\x19\x07\x22"</div><div class='del'>-			  "\xa5\x2d\xdf\xa5\xf3\x80\x85\x78"</div><div class='del'>-			  "\x84\x39\x6a\x6d\x6a\x99\x4f\xa5"</div><div class='del'>-			  "\x15\xfe\x46\xb0\xe4\x6c\xa5\x41"</div><div class='del'>-			  "\x3c\xce\x8f\x42\x60\x71\xa7\x75"</div><div class='del'>-			  "\x08\x40\x65\x8a\x82\xbf\xf5\x43"</div><div class='del'>-			  "\x71\x96\xa9\x4d\x44\x8a\x20\xbe"</div><div class='del'>-			  "\xfa\x4d\xbb\xc0\x7d\x31\x96\x65"</div><div class='del'>-			  "\xe7\x75\xe5\x3e\xfd\x92\x3b\xc9"</div><div class='del'>-			  "\x55\xbb\x16\x7e\xf7\xc2\x8c\xa4"</div><div class='del'>-			  "\x40\x1d\xe5\xef\x0e\xdf\xe4\x9a"</div><div class='del'>-			  "\x62\x73\x65\xfd\x46\x63\x25\x3d"</div><div class='del'>-			  "\x2b\xaf\xe5\x64\xfe\xa5\x5c\xcf"</div><div class='del'>-			  "\x24\xf3\xb4\xac\x64\xba\xdf\x4b"</div><div class='del'>-			  "\xc6\x96\x7d\x81\x2d\x8d\x97\xf7"</div><div class='del'>-			  "\xc5\x68\x77\x84\x32\x2b\xcc\x85"</div><div class='del'>-			  "\x74\x96\xf0\x12\x77\x61\xb9\xeb"</div><div class='del'>-			  "\x71\xaa\x82\xcb\x1c\xdb\x89\xc8"</div><div class='del'>-			  "\xc6\xb5\xe3\x5c\x7d\x39\x07\x24"</div><div class='del'>-			  "\xda\x39\x87\x45\xc0\x2b\xbb\x01"</div><div class='del'>-			  "\xac\xbc\x2a\x5c\x7f\xfc\xe8\xce"</div><div class='del'>-			  "\x6d\x9c\x6f\xed\xd3\xc1\xa1\xd6"</div><div class='del'>-			  "\xc5\x55\xa9\x66\x2f\xe1\xc8\x32"</div><div class='del'>-			  "\xa6\x5d\xa4\x3a\x98\x73\xe8\x45"</div><div class='del'>-			  "\xa4\xc7\xa8\xb4\xf6\x13\x03\xf6"</div><div class='del'>-			  "\xe9\x2e\xc4\x29\x0f\x84\xdb\xc4"</div><div class='del'>-			  "\x21\xc4\xc2\x75\x67\x89\x37\x0a",</div><div class='del'>-		.ilen   = 512,</div><div class='del'>-		.result = "\x1a\x1d\xa9\x30\xad\xf9\x2f\x9b"</div><div class='del'>-			  "\xb6\x1d\xae\xef\xf0\x2f\xf8\x5a"</div><div class='del'>-			  "\x39\x3c\xbf\x2a\xb2\x45\xb2\x23"</div><div class='del'>-			  "\x1b\x63\x3c\xcf\xaa\xbe\xcf\x4e"</div><div class='del'>-			  "\xfa\xe8\x29\xc2\x20\x68\x2b\x3c"</div><div class='del'>-			  "\x2e\x8b\xf7\x6e\x25\xbd\xe3\x3d"</div><div class='del'>-			  "\x66\x27\xd6\xaf\xd6\x64\x3e\xe3"</div><div class='del'>-			  "\xe8\x58\x46\x97\x39\x51\x07\xde"</div><div class='del'>-			  "\xcb\x37\xbc\xa9\xc0\x5f\x75\xc3"</div><div class='del'>-			  "\x0e\x84\x23\x1d\x16\xd4\x1c\x59"</div><div class='del'>-			  "\x9c\x1a\x02\x55\xab\x3a\x97\x1d"</div><div class='del'>-			  "\xdf\xdd\xc7\x06\x51\xd7\x70\xae"</div><div class='del'>-			  "\x23\xc6\x8c\xf5\x1e\xa0\xe5\x82"</div><div class='del'>-			  "\xb8\xb2\xbf\x04\xa0\x32\x8e\x68"</div><div class='del'>-			  "\xeb\xaf\x6e\x2d\x94\x22\x2f\xce"</div><div class='del'>-			  "\x4c\xb5\x59\xe2\xa2\x2f\xa0\x98"</div><div class='del'>-			  "\x1a\x97\xc6\xd4\xb5\x00\x59\xf2"</div><div class='del'>-			  "\x84\x14\x72\xb1\x9a\x6e\xa3\x7f"</div><div class='del'>-			  "\xea\x20\xe7\xcb\x65\x77\x3a\xdf"</div><div class='del'>-			  "\xc8\x97\x67\x15\xc2\x2a\x27\xcc"</div><div class='del'>-			  "\x18\x55\xa1\x24\x0b\x24\x24\xaf"</div><div class='del'>-			  "\x5b\xec\x68\xb8\xc8\xf5\xba\x63"</div><div class='del'>-			  "\xff\xed\x89\xce\xd5\x3d\x88\xf3"</div><div class='del'>-			  "\x25\xef\x05\x7c\x3a\xef\xeb\xd8"</div><div class='del'>-			  "\x7a\x32\x0d\xd1\x1e\x58\x59\x99"</div><div class='del'>-			  "\x90\x25\xb5\x26\xb0\xe3\x2b\x6c"</div><div class='del'>-			  "\x4c\xa9\x8b\x84\x4f\x5e\x01\x50"</div><div class='del'>-			  "\x41\x30\x58\xc5\x62\x74\x52\x1d"</div><div class='del'>-			  "\x45\x24\x6a\x42\x64\x4f\x97\x1c"</div><div class='del'>-			  "\xa8\x66\xb5\x6d\x79\xd4\x0d\x48"</div><div class='del'>-			  "\xc5\x5f\xf3\x90\x32\xdd\xdd\xe1"</div><div class='del'>-			  "\xe4\xa9\x9f\xfc\xc3\x52\x5a\x46"</div><div class='del'>-			  "\xe4\x81\x84\x95\x36\x59\x7a\x6b"</div><div class='del'>-			  "\xaa\xb3\x60\xad\xce\x9f\x9f\x28"</div><div class='del'>-			  "\xe0\x01\x75\x22\xc4\x4e\xa9\x62"</div><div class='del'>-			  "\x5c\x62\x0d\x00\xcb\x13\xe8\x43"</div><div class='del'>-			  "\x72\xd4\x2d\x53\x46\xb5\xd1\x16"</div><div class='del'>-			  "\x22\x18\xdf\x34\x33\xf5\xd6\x1c"</div><div class='del'>-			  "\xb8\x79\x78\x97\x94\xff\x72\x13"</div><div class='del'>-			  "\x4c\x27\xfc\xcb\xbf\x01\x53\xa6"</div><div class='del'>-			  "\xb4\x50\x6e\xde\xdf\xb5\x43\xa4"</div><div class='del'>-			  "\x59\xdf\x52\xf9\x7c\xe0\x11\x6f"</div><div class='del'>-			  "\x2d\x14\x8e\x24\x61\x2c\xe1\x17"</div><div class='del'>-			  "\xcc\xce\x51\x0c\x19\x8a\x82\x30"</div><div class='del'>-			  "\x94\xd5\x3d\x6a\x53\x06\x5e\xbd"</div><div class='del'>-			  "\xb7\xeb\xfa\xfd\x27\x51\xde\x85"</div><div class='del'>-			  "\x1e\x86\x53\x11\x53\x94\x00\xee"</div><div class='del'>-			  "\x2b\x8c\x08\x2a\xbf\xdd\xae\x11"</div><div class='del'>-			  "\xcb\x1e\xa2\x07\x9a\x80\xcf\x62"</div><div class='del'>-			  "\x9b\x09\xdc\x95\x3c\x96\x8e\xb1"</div><div class='del'>-			  "\x09\xbd\xe4\xeb\xdb\xca\x70\x7a"</div><div class='del'>-			  "\x9e\xfa\x31\x18\x45\x3c\x21\x33"</div><div class='del'>-			  "\xb0\xb3\x2b\xea\xf3\x71\x2d\xe1"</div><div class='del'>-			  "\x03\xad\x1b\x48\xd4\x67\x27\xf0"</div><div class='del'>-			  "\x62\xe4\x3d\xfb\x9b\x08\x76\xe7"</div><div class='del'>-			  "\xdd\x2b\x01\x39\x04\x5a\x58\x7a"</div><div class='del'>-			  "\xf7\x11\x90\xec\xbd\x51\x5c\x32"</div><div class='del'>-			  "\x6b\xd7\x35\x39\x02\x6b\xf2\xa6"</div><div class='del'>-			  "\xd0\x0d\x07\xe1\x06\xc4\x5b\x7d"</div><div class='del'>-			  "\xe4\x6a\xd7\xee\x15\x1f\x83\xb4"</div><div class='del'>-			  "\xa3\xa7\x5e\xc3\x90\xb7\xef\xd3"</div><div class='del'>-			  "\xb7\x4f\xf8\x92\x4c\xb7\x3c\x29"</div><div class='del'>-			  "\xcd\x7e\x2b\x5d\x43\xea\x42\xe7"</div><div class='del'>-			  "\x74\x3f\x7d\x58\x88\x75\xde\x3e",</div><div class='del'>-		.rlen   = 512,</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct cipher_testvec aes_lrw_dec_tv_template[] = {</div><div class='del'>-	/* from http://grouper.ieee.org/groups/1619/email/pdf00017.pdf */</div><div class='del'>-	/* same as enc vectors with input and result reversed */</div><div class='del'>-	{ /* LRW-32-AES 1 */</div><div class='del'>-		.key    = "\x45\x62\xac\x25\xf8\x28\x17\x6d"</div><div class='del'>-			  "\x4c\x26\x84\x14\xb5\x68\x01\x85"</div><div class='del'>-			  "\x25\x8e\x2a\x05\xe7\x3e\x9d\x03"</div><div class='del'>-			  "\xee\x5a\x83\x0c\xcc\x09\x4c\x87",</div><div class='del'>-		.klen   = 32,</div><div class='del'>-		.iv     = "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			  "\x00\x00\x00\x00\x00\x00\x00\x01",</div><div class='del'>-		.input  = "\xf1\xb2\x73\xcd\x65\xa3\xdf\x5f"</div><div class='del'>-			  "\xe9\x5d\x48\x92\x54\x63\x4e\xb8",</div><div class='del'>-		.ilen   = 16,</div><div class='del'>-		.result = "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='del'>-			  "\x38\x39\x41\x42\x43\x44\x45\x46",</div><div class='del'>-		.rlen   = 16,</div><div class='del'>-	}, { /* LRW-32-AES 2 */</div><div class='del'>-		.key    = "\x59\x70\x47\x14\xf5\x57\x47\x8c"</div><div class='del'>-			  "\xd7\x79\xe8\x0f\x54\x88\x79\x44"</div><div class='del'>-			  "\x0d\x48\xf0\xb7\xb1\x5a\x53\xea"</div><div class='del'>-			  "\x1c\xaa\x6b\x29\xc2\xca\xfb\xaf",</div><div class='del'>-		.klen   = 32,</div><div class='del'>-		.iv     = "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			  "\x00\x00\x00\x00\x00\x00\x00\x02",</div><div class='del'>-		.input  = "\x00\xc8\x2b\xae\x95\xbb\xcd\xe5"</div><div class='del'>-			  "\x27\x4f\x07\x69\xb2\x60\xe1\x36",</div><div class='del'>-		.ilen   = 16,</div><div class='del'>-		.result  = "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='del'>-			   "\x38\x39\x41\x42\x43\x44\x45\x46",</div><div class='del'>-		.rlen   = 16,</div><div class='del'>-	}, { /* LRW-32-AES 3 */</div><div class='del'>-		.key    = "\xd8\x2a\x91\x34\xb2\x6a\x56\x50"</div><div class='del'>-			  "\x30\xfe\x69\xe2\x37\x7f\x98\x47"</div><div class='del'>-			  "\xcd\xf9\x0b\x16\x0c\x64\x8f\xb6"</div><div class='del'>-			  "\xb0\x0d\x0d\x1b\xae\x85\x87\x1f",</div><div class='del'>-		.klen   = 32,</div><div class='del'>-		.iv     = "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			  "\x00\x00\x00\x02\x00\x00\x00\x00",</div><div class='del'>-		.input  = "\x76\x32\x21\x83\xed\x8f\xf1\x82"</div><div class='del'>-			  "\xf9\x59\x62\x03\x69\x0e\x5e\x01",</div><div class='del'>-		.ilen   = 16,</div><div class='del'>-		.result = "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='del'>-			  "\x38\x39\x41\x42\x43\x44\x45\x46",</div><div class='del'>-		.rlen   = 16,</div><div class='del'>-	}, { /* LRW-32-AES 4 */</div><div class='del'>-		.key    = "\x0f\x6a\xef\xf8\xd3\xd2\xbb\x15"</div><div class='del'>-			  "\x25\x83\xf7\x3c\x1f\x01\x28\x74"</div><div class='del'>-			  "\xca\xc6\xbc\x35\x4d\x4a\x65\x54"</div><div class='del'>-			  "\x90\xae\x61\xcf\x7b\xae\xbd\xcc"</div><div class='del'>-			  "\xad\xe4\x94\xc5\x4a\x29\xae\x70",</div><div class='del'>-		.klen   = 40,</div><div class='del'>-		.iv     = "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			  "\x00\x00\x00\x00\x00\x00\x00\x01",</div><div class='del'>-		.input  = "\x9c\x0f\x15\x2f\x55\xa2\xd8\xf0"</div><div class='del'>-			  "\xd6\x7b\x8f\x9e\x28\x22\xbc\x41",</div><div class='del'>-		.ilen   = 16,</div><div class='del'>-		.result = "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='del'>-			  "\x38\x39\x41\x42\x43\x44\x45\x46",</div><div class='del'>-		.rlen   = 16,</div><div class='del'>-	}, { /* LRW-32-AES 5 */</div><div class='del'>-		.key    = "\x8a\xd4\xee\x10\x2f\xbd\x81\xff"</div><div class='del'>-			  "\xf8\x86\xce\xac\x93\xc5\xad\xc6"</div><div class='del'>-			  "\xa0\x19\x07\xc0\x9d\xf7\xbb\xdd"</div><div class='del'>-			  "\x52\x13\xb2\xb7\xf0\xff\x11\xd8"</div><div class='del'>-			  "\xd6\x08\xd0\xcd\x2e\xb1\x17\x6f",</div><div class='del'>-		.klen   = 40,</div><div class='del'>-		.iv     = "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			  "\x00\x00\x00\x02\x00\x00\x00\x00",</div><div class='del'>-		.input  = "\xd4\x27\x6a\x7f\x14\x91\x3d\x65"</div><div class='del'>-			  "\xc8\x60\x48\x02\x87\xe3\x34\x06",</div><div class='del'>-		.ilen   = 16,</div><div class='del'>-		.result = "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='del'>-			  "\x38\x39\x41\x42\x43\x44\x45\x46",</div><div class='del'>-		.rlen   = 16,</div><div class='del'>-	}, { /* LRW-32-AES 6 */</div><div class='del'>-		.key    = "\xf8\xd4\x76\xff\xd6\x46\xee\x6c"</div><div class='del'>-			  "\x23\x84\xcb\x1c\x77\xd6\x19\x5d"</div><div class='del'>-			  "\xfe\xf1\xa9\xf3\x7b\xbc\x8d\x21"</div><div class='del'>-			  "\xa7\x9c\x21\xf8\xcb\x90\x02\x89"</div><div class='del'>-			  "\xa8\x45\x34\x8e\xc8\xc5\xb5\xf1"</div><div class='del'>-			  "\x26\xf5\x0e\x76\xfe\xfd\x1b\x1e",</div><div class='del'>-		.klen   = 48,</div><div class='del'>-		.iv     = "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			  "\x00\x00\x00\x00\x00\x00\x00\x01",</div><div class='del'>-		.input  = "\xbd\x06\xb8\xe1\xdb\x98\x89\x9e"</div><div class='del'>-			  "\xc4\x98\xe4\x91\xcf\x1c\x70\x2b",</div><div class='del'>-		.ilen   = 16,</div><div class='del'>-		.result = "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='del'>-			  "\x38\x39\x41\x42\x43\x44\x45\x46",</div><div class='del'>-		.rlen   = 16,</div><div class='del'>-	}, { /* LRW-32-AES 7 */</div><div class='del'>-		.key    = "\xfb\x76\x15\xb2\x3d\x80\x89\x1d"</div><div class='del'>-			  "\xd4\x70\x98\x0b\xc7\x95\x84\xc8"</div><div class='del'>-			  "\xb2\xfb\x64\xce\x60\x97\x87\x8d"</div><div class='del'>-			  "\x17\xfc\xe4\x5a\x49\xe8\x30\xb7"</div><div class='del'>-			  "\x6e\x78\x17\xe7\x2d\x5e\x12\xd4"</div><div class='del'>-			  "\x60\x64\x04\x7a\xf1\x2f\x9e\x0c",</div><div class='del'>-		.klen   = 48,</div><div class='del'>-		.iv     = "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			  "\x00\x00\x00\x02\x00\x00\x00\x00",</div><div class='del'>-		.input  = "\x5b\x90\x8e\xc1\xab\xdd\x67\x5f"</div><div class='del'>-			  "\x3d\x69\x8a\x95\x53\xc8\x9c\xe5",</div><div class='del'>-		.ilen   = 16,</div><div class='del'>-		.result = "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='del'>-			  "\x38\x39\x41\x42\x43\x44\x45\x46",</div><div class='del'>-		.rlen   = 16,</div><div class='del'>-	}, {</div><div class='del'>-/* http://www.mail-archive.com/stds-p1619@listserv.ieee.org/msg00173.html */</div><div class='del'>-		.key    = "\xf8\xd4\x76\xff\xd6\x46\xee\x6c"</div><div class='del'>-			  "\x23\x84\xcb\x1c\x77\xd6\x19\x5d"</div><div class='del'>-			  "\xfe\xf1\xa9\xf3\x7b\xbc\x8d\x21"</div><div class='del'>-			  "\xa7\x9c\x21\xf8\xcb\x90\x02\x89"</div><div class='del'>-			  "\xa8\x45\x34\x8e\xc8\xc5\xb5\xf1"</div><div class='del'>-			  "\x26\xf5\x0e\x76\xfe\xfd\x1b\x1e",</div><div class='del'>-		.klen   = 48,</div><div class='del'>-		.iv     = "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			  "\x00\x00\x00\x00\x00\x00\x00\x01",</div><div class='del'>-		.input	= "\x1a\x1d\xa9\x30\xad\xf9\x2f\x9b"</div><div class='del'>-			  "\xb6\x1d\xae\xef\xf0\x2f\xf8\x5a"</div><div class='del'>-			  "\x39\x3c\xbf\x2a\xb2\x45\xb2\x23"</div><div class='del'>-			  "\x1b\x63\x3c\xcf\xaa\xbe\xcf\x4e"</div><div class='del'>-			  "\xfa\xe8\x29\xc2\x20\x68\x2b\x3c"</div><div class='del'>-			  "\x2e\x8b\xf7\x6e\x25\xbd\xe3\x3d"</div><div class='del'>-			  "\x66\x27\xd6\xaf\xd6\x64\x3e\xe3"</div><div class='del'>-			  "\xe8\x58\x46\x97\x39\x51\x07\xde"</div><div class='del'>-			  "\xcb\x37\xbc\xa9\xc0\x5f\x75\xc3"</div><div class='del'>-			  "\x0e\x84\x23\x1d\x16\xd4\x1c\x59"</div><div class='del'>-			  "\x9c\x1a\x02\x55\xab\x3a\x97\x1d"</div><div class='del'>-			  "\xdf\xdd\xc7\x06\x51\xd7\x70\xae"</div><div class='del'>-			  "\x23\xc6\x8c\xf5\x1e\xa0\xe5\x82"</div><div class='del'>-			  "\xb8\xb2\xbf\x04\xa0\x32\x8e\x68"</div><div class='del'>-			  "\xeb\xaf\x6e\x2d\x94\x22\x2f\xce"</div><div class='del'>-			  "\x4c\xb5\x59\xe2\xa2\x2f\xa0\x98"</div><div class='del'>-			  "\x1a\x97\xc6\xd4\xb5\x00\x59\xf2"</div><div class='del'>-			  "\x84\x14\x72\xb1\x9a\x6e\xa3\x7f"</div><div class='del'>-			  "\xea\x20\xe7\xcb\x65\x77\x3a\xdf"</div><div class='del'>-			  "\xc8\x97\x67\x15\xc2\x2a\x27\xcc"</div><div class='del'>-			  "\x18\x55\xa1\x24\x0b\x24\x24\xaf"</div><div class='del'>-			  "\x5b\xec\x68\xb8\xc8\xf5\xba\x63"</div><div class='del'>-			  "\xff\xed\x89\xce\xd5\x3d\x88\xf3"</div><div class='del'>-			  "\x25\xef\x05\x7c\x3a\xef\xeb\xd8"</div><div class='del'>-			  "\x7a\x32\x0d\xd1\x1e\x58\x59\x99"</div><div class='del'>-			  "\x90\x25\xb5\x26\xb0\xe3\x2b\x6c"</div><div class='del'>-			  "\x4c\xa9\x8b\x84\x4f\x5e\x01\x50"</div><div class='del'>-			  "\x41\x30\x58\xc5\x62\x74\x52\x1d"</div><div class='del'>-			  "\x45\x24\x6a\x42\x64\x4f\x97\x1c"</div><div class='del'>-			  "\xa8\x66\xb5\x6d\x79\xd4\x0d\x48"</div><div class='del'>-			  "\xc5\x5f\xf3\x90\x32\xdd\xdd\xe1"</div><div class='del'>-			  "\xe4\xa9\x9f\xfc\xc3\x52\x5a\x46"</div><div class='del'>-			  "\xe4\x81\x84\x95\x36\x59\x7a\x6b"</div><div class='del'>-			  "\xaa\xb3\x60\xad\xce\x9f\x9f\x28"</div><div class='del'>-			  "\xe0\x01\x75\x22\xc4\x4e\xa9\x62"</div><div class='del'>-			  "\x5c\x62\x0d\x00\xcb\x13\xe8\x43"</div><div class='del'>-			  "\x72\xd4\x2d\x53\x46\xb5\xd1\x16"</div><div class='del'>-			  "\x22\x18\xdf\x34\x33\xf5\xd6\x1c"</div><div class='del'>-			  "\xb8\x79\x78\x97\x94\xff\x72\x13"</div><div class='del'>-			  "\x4c\x27\xfc\xcb\xbf\x01\x53\xa6"</div><div class='del'>-			  "\xb4\x50\x6e\xde\xdf\xb5\x43\xa4"</div><div class='del'>-			  "\x59\xdf\x52\xf9\x7c\xe0\x11\x6f"</div><div class='del'>-			  "\x2d\x14\x8e\x24\x61\x2c\xe1\x17"</div><div class='del'>-			  "\xcc\xce\x51\x0c\x19\x8a\x82\x30"</div><div class='del'>-			  "\x94\xd5\x3d\x6a\x53\x06\x5e\xbd"</div><div class='del'>-			  "\xb7\xeb\xfa\xfd\x27\x51\xde\x85"</div><div class='del'>-			  "\x1e\x86\x53\x11\x53\x94\x00\xee"</div><div class='del'>-			  "\x2b\x8c\x08\x2a\xbf\xdd\xae\x11"</div><div class='del'>-			  "\xcb\x1e\xa2\x07\x9a\x80\xcf\x62"</div><div class='del'>-			  "\x9b\x09\xdc\x95\x3c\x96\x8e\xb1"</div><div class='del'>-			  "\x09\xbd\xe4\xeb\xdb\xca\x70\x7a"</div><div class='del'>-			  "\x9e\xfa\x31\x18\x45\x3c\x21\x33"</div><div class='del'>-			  "\xb0\xb3\x2b\xea\xf3\x71\x2d\xe1"</div><div class='del'>-			  "\x03\xad\x1b\x48\xd4\x67\x27\xf0"</div><div class='del'>-			  "\x62\xe4\x3d\xfb\x9b\x08\x76\xe7"</div><div class='del'>-			  "\xdd\x2b\x01\x39\x04\x5a\x58\x7a"</div><div class='del'>-			  "\xf7\x11\x90\xec\xbd\x51\x5c\x32"</div><div class='del'>-			  "\x6b\xd7\x35\x39\x02\x6b\xf2\xa6"</div><div class='del'>-			  "\xd0\x0d\x07\xe1\x06\xc4\x5b\x7d"</div><div class='del'>-			  "\xe4\x6a\xd7\xee\x15\x1f\x83\xb4"</div><div class='del'>-			  "\xa3\xa7\x5e\xc3\x90\xb7\xef\xd3"</div><div class='del'>-			  "\xb7\x4f\xf8\x92\x4c\xb7\x3c\x29"</div><div class='del'>-			  "\xcd\x7e\x2b\x5d\x43\xea\x42\xe7"</div><div class='del'>-			  "\x74\x3f\x7d\x58\x88\x75\xde\x3e",</div><div class='del'>-		.ilen   = 512,</div><div class='del'>-		.result	= "\x05\x11\xb7\x18\xab\xc6\x2d\xac"</div><div class='del'>-			  "\x70\x5d\xf6\x22\x94\xcd\xe5\x6c"</div><div class='del'>-			  "\x17\x6b\xf6\x1c\xf0\xf3\x6e\xf8"</div><div class='del'>-			  "\x50\x38\x1f\x71\x49\xb6\x57\xd6"</div><div class='del'>-			  "\x8f\xcb\x8d\x6b\xe3\xa6\x29\x90"</div><div class='del'>-			  "\xfe\x2a\x62\x82\xae\x6d\x8b\xf6"</div><div class='del'>-			  "\xad\x1e\x9e\x20\x5f\x38\xbe\x04"</div><div class='del'>-			  "\xda\x10\x8e\xed\xa2\xa4\x87\xab"</div><div class='del'>-			  "\xda\x6b\xb4\x0c\x75\xba\xd3\x7c"</div><div class='del'>-			  "\xc9\xac\x42\x31\x95\x7c\xc9\x04"</div><div class='del'>-			  "\xeb\xd5\x6e\x32\x69\x8a\xdb\xa6"</div><div class='del'>-			  "\x15\xd7\x3f\x4f\x2f\x66\x69\x03"</div><div class='del'>-			  "\x9c\x1f\x54\x0f\xde\x1f\xf3\x65"</div><div class='del'>-			  "\x4c\x96\x12\xed\x7c\x92\x03\x01"</div><div class='del'>-			  "\x6f\xbc\x35\x93\xac\xf1\x27\xf1"</div><div class='del'>-			  "\xb4\x96\x82\x5a\x5f\xb0\xa0\x50"</div><div class='del'>-			  "\x89\xa4\x8e\x66\x44\x85\xcc\xfd"</div><div class='del'>-			  "\x33\x14\x70\xe3\x96\xb2\xc3\xd3"</div><div class='del'>-			  "\xbb\x54\x5a\x1a\xf9\x74\xa2\xc5"</div><div class='del'>-			  "\x2d\x64\x75\xdd\xb4\x54\xe6\x74"</div><div class='del'>-			  "\x8c\xd3\x9d\x9e\x86\xab\x51\x53"</div><div class='del'>-			  "\xb7\x93\x3e\x6f\xd0\x4e\x2c\x40"</div><div class='del'>-			  "\xf6\xa8\x2e\x3e\x9d\xf4\x66\xa5"</div><div class='del'>-			  "\x76\x12\x73\x44\x1a\x56\xd7\x72"</div><div class='del'>-			  "\x88\xcd\x21\x8c\x4c\x0f\xfe\xda"</div><div class='del'>-			  "\x95\xe0\x3a\xa6\xa5\x84\x46\xcd"</div><div class='del'>-			  "\xd5\x3e\x9d\x3a\xe2\x67\xe6\x60"</div><div class='del'>-			  "\x1a\xe2\x70\x85\x58\xc2\x1b\x09"</div><div class='del'>-			  "\xe1\xd7\x2c\xca\xad\xa8\x8f\xf9"</div><div class='del'>-			  "\xac\xb3\x0e\xdb\xca\x2e\xe2\xb8"</div><div class='del'>-			  "\x51\x71\xd9\x3c\x6c\xf1\x56\xf8"</div><div class='del'>-			  "\xea\x9c\xf1\xfb\x0c\xe6\xb7\x10"</div><div class='del'>-			  "\x1c\xf8\xa9\x7c\xe8\x53\x35\xc1"</div><div class='del'>-			  "\x90\x3e\x76\x4a\x74\xa4\x21\x2c"</div><div class='del'>-			  "\xf6\x2c\x4e\x0f\x94\x3a\x88\x2e"</div><div class='del'>-			  "\x41\x09\x6a\x33\x7d\xf6\xdd\x3f"</div><div class='del'>-			  "\x8d\x23\x31\x74\x84\xeb\x88\x6e"</div><div class='del'>-			  "\xcc\xb9\xbc\x22\x83\x19\x07\x22"</div><div class='del'>-			  "\xa5\x2d\xdf\xa5\xf3\x80\x85\x78"</div><div class='del'>-			  "\x84\x39\x6a\x6d\x6a\x99\x4f\xa5"</div><div class='del'>-			  "\x15\xfe\x46\xb0\xe4\x6c\xa5\x41"</div><div class='del'>-			  "\x3c\xce\x8f\x42\x60\x71\xa7\x75"</div><div class='del'>-			  "\x08\x40\x65\x8a\x82\xbf\xf5\x43"</div><div class='del'>-			  "\x71\x96\xa9\x4d\x44\x8a\x20\xbe"</div><div class='del'>-			  "\xfa\x4d\xbb\xc0\x7d\x31\x96\x65"</div><div class='del'>-			  "\xe7\x75\xe5\x3e\xfd\x92\x3b\xc9"</div><div class='del'>-			  "\x55\xbb\x16\x7e\xf7\xc2\x8c\xa4"</div><div class='del'>-			  "\x40\x1d\xe5\xef\x0e\xdf\xe4\x9a"</div><div class='del'>-			  "\x62\x73\x65\xfd\x46\x63\x25\x3d"</div><div class='del'>-			  "\x2b\xaf\xe5\x64\xfe\xa5\x5c\xcf"</div><div class='del'>-			  "\x24\xf3\xb4\xac\x64\xba\xdf\x4b"</div><div class='del'>-			  "\xc6\x96\x7d\x81\x2d\x8d\x97\xf7"</div><div class='del'>-			  "\xc5\x68\x77\x84\x32\x2b\xcc\x85"</div><div class='del'>-			  "\x74\x96\xf0\x12\x77\x61\xb9\xeb"</div><div class='del'>-			  "\x71\xaa\x82\xcb\x1c\xdb\x89\xc8"</div><div class='del'>-			  "\xc6\xb5\xe3\x5c\x7d\x39\x07\x24"</div><div class='del'>-			  "\xda\x39\x87\x45\xc0\x2b\xbb\x01"</div><div class='del'>-			  "\xac\xbc\x2a\x5c\x7f\xfc\xe8\xce"</div><div class='del'>-			  "\x6d\x9c\x6f\xed\xd3\xc1\xa1\xd6"</div><div class='del'>-			  "\xc5\x55\xa9\x66\x2f\xe1\xc8\x32"</div><div class='del'>-			  "\xa6\x5d\xa4\x3a\x98\x73\xe8\x45"</div><div class='del'>-			  "\xa4\xc7\xa8\xb4\xf6\x13\x03\xf6"</div><div class='del'>-			  "\xe9\x2e\xc4\x29\x0f\x84\xdb\xc4"</div><div class='del'>-			  "\x21\xc4\xc2\x75\x67\x89\x37\x0a",</div><div class='del'>-		.rlen   = 512,</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct cipher_testvec aes_xts_enc_tv_template[] = {</div><div class='del'>-	/* http://grouper.ieee.org/groups/1619/email/pdf00086.pdf */</div><div class='del'>-	{ /* XTS-AES 1 */</div><div class='del'>-		.key    = "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			  "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			  "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			  "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='del'>-		.klen   = 32,</div><div class='del'>-		.iv     = "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			  "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='del'>-		.input  = "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			  "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			  "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			  "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='del'>-		.ilen   = 32,</div><div class='del'>-		.result = "\x91\x7c\xf6\x9e\xbd\x68\xb2\xec"</div><div class='del'>-			  "\x9b\x9f\xe9\xa3\xea\xdd\xa6\x92"</div><div class='del'>-			  "\xcd\x43\xd2\xf5\x95\x98\xed\x85"</div><div class='del'>-			  "\x8c\x02\xc2\x65\x2f\xbf\x92\x2e",</div><div class='del'>-		.rlen   = 32,</div><div class='del'>-	}, { /* XTS-AES 2 */</div><div class='del'>-		.key    = "\x11\x11\x11\x11\x11\x11\x11\x11"</div><div class='del'>-			  "\x11\x11\x11\x11\x11\x11\x11\x11"</div><div class='del'>-			  "\x22\x22\x22\x22\x22\x22\x22\x22"</div><div class='del'>-			  "\x22\x22\x22\x22\x22\x22\x22\x22",</div><div class='del'>-		.klen   = 32,</div><div class='del'>-		.iv     = "\x33\x33\x33\x33\x33\x00\x00\x00"</div><div class='del'>-			  "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='del'>-		.input  = "\x44\x44\x44\x44\x44\x44\x44\x44"</div><div class='del'>-			  "\x44\x44\x44\x44\x44\x44\x44\x44"</div><div class='del'>-			  "\x44\x44\x44\x44\x44\x44\x44\x44"</div><div class='del'>-			  "\x44\x44\x44\x44\x44\x44\x44\x44",</div><div class='del'>-		.ilen   = 32,</div><div class='del'>-		.result = "\xc4\x54\x18\x5e\x6a\x16\x93\x6e"</div><div class='del'>-			  "\x39\x33\x40\x38\xac\xef\x83\x8b"</div><div class='del'>-			  "\xfb\x18\x6f\xff\x74\x80\xad\xc4"</div><div class='del'>-			  "\x28\x93\x82\xec\xd6\xd3\x94\xf0",</div><div class='del'>-		.rlen   = 32,</div><div class='del'>-	}, { /* XTS-AES 3 */</div><div class='del'>-		.key    = "\xff\xfe\xfd\xfc\xfb\xfa\xf9\xf8"</div><div class='del'>-			  "\xf7\xf6\xf5\xf4\xf3\xf2\xf1\xf0"</div><div class='del'>-			  "\x22\x22\x22\x22\x22\x22\x22\x22"</div><div class='del'>-			  "\x22\x22\x22\x22\x22\x22\x22\x22",</div><div class='del'>-		.klen   = 32,</div><div class='del'>-		.iv     = "\x33\x33\x33\x33\x33\x00\x00\x00"</div><div class='del'>-			  "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='del'>-		.input  = "\x44\x44\x44\x44\x44\x44\x44\x44"</div><div class='del'>-			  "\x44\x44\x44\x44\x44\x44\x44\x44"</div><div class='del'>-			  "\x44\x44\x44\x44\x44\x44\x44\x44"</div><div class='del'>-			  "\x44\x44\x44\x44\x44\x44\x44\x44",</div><div class='del'>-		.ilen   = 32,</div><div class='del'>-		.result = "\xaf\x85\x33\x6b\x59\x7a\xfc\x1a"</div><div class='del'>-			  "\x90\x0b\x2e\xb2\x1e\xc9\x49\xd2"</div><div class='del'>-			  "\x92\xdf\x4c\x04\x7e\x0b\x21\x53"</div><div class='del'>-			  "\x21\x86\xa5\x97\x1a\x22\x7a\x89",</div><div class='del'>-		.rlen   = 32,</div><div class='del'>-	}, { /* XTS-AES 4 */</div><div class='del'>-		.key    = "\x27\x18\x28\x18\x28\x45\x90\x45"</div><div class='del'>-			  "\x23\x53\x60\x28\x74\x71\x35\x26"</div><div class='del'>-			  "\x31\x41\x59\x26\x53\x58\x97\x93"</div><div class='del'>-			  "\x23\x84\x62\x64\x33\x83\x27\x95",</div><div class='del'>-		.klen   = 32,</div><div class='del'>-		.iv     = "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			  "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='del'>-		.input  = "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='del'>-			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='del'>-			  "\x10\x11\x12\x13\x14\x15\x16\x17"</div><div class='del'>-			  "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f"</div><div class='del'>-			  "\x20\x21\x22\x23\x24\x25\x26\x27"</div><div class='del'>-			  "\x28\x29\x2a\x2b\x2c\x2d\x2e\x2f"</div><div class='del'>-			  "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='del'>-			  "\x38\x39\x3a\x3b\x3c\x3d\x3e\x3f"</div><div class='del'>-			  "\x40\x41\x42\x43\x44\x45\x46\x47"</div><div class='del'>-			  "\x48\x49\x4a\x4b\x4c\x4d\x4e\x4f"</div><div class='del'>-			  "\x50\x51\x52\x53\x54\x55\x56\x57"</div><div class='del'>-			  "\x58\x59\x5a\x5b\x5c\x5d\x5e\x5f"</div><div class='del'>-			  "\x60\x61\x62\x63\x64\x65\x66\x67"</div><div class='del'>-			  "\x68\x69\x6a\x6b\x6c\x6d\x6e\x6f"</div><div class='del'>-			  "\x70\x71\x72\x73\x74\x75\x76\x77"</div><div class='del'>-			  "\x78\x79\x7a\x7b\x7c\x7d\x7e\x7f"</div><div class='del'>-			  "\x80\x81\x82\x83\x84\x85\x86\x87"</div><div class='del'>-			  "\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f"</div><div class='del'>-			  "\x90\x91\x92\x93\x94\x95\x96\x97"</div><div class='del'>-			  "\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f"</div><div class='del'>-			  "\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7"</div><div class='del'>-			  "\xa8\xa9\xaa\xab\xac\xad\xae\xaf"</div><div class='del'>-			  "\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7"</div><div class='del'>-			  "\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf"</div><div class='del'>-			  "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7"</div><div class='del'>-			  "\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf"</div><div class='del'>-			  "\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7"</div><div class='del'>-			  "\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf"</div><div class='del'>-			  "\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7"</div><div class='del'>-			  "\xe8\xe9\xea\xeb\xec\xed\xee\xef"</div><div class='del'>-			  "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7"</div><div class='del'>-			  "\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff"</div><div class='del'>-			  "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='del'>-			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='del'>-			  "\x10\x11\x12\x13\x14\x15\x16\x17"</div><div class='del'>-			  "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f"</div><div class='del'>-			  "\x20\x21\x22\x23\x24\x25\x26\x27"</div><div class='del'>-			  "\x28\x29\x2a\x2b\x2c\x2d\x2e\x2f"</div><div class='del'>-			  "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='del'>-			  "\x38\x39\x3a\x3b\x3c\x3d\x3e\x3f"</div><div class='del'>-			  "\x40\x41\x42\x43\x44\x45\x46\x47"</div><div class='del'>-			  "\x48\x49\x4a\x4b\x4c\x4d\x4e\x4f"</div><div class='del'>-			  "\x50\x51\x52\x53\x54\x55\x56\x57"</div><div class='del'>-			  "\x58\x59\x5a\x5b\x5c\x5d\x5e\x5f"</div><div class='del'>-			  "\x60\x61\x62\x63\x64\x65\x66\x67"</div><div class='del'>-			  "\x68\x69\x6a\x6b\x6c\x6d\x6e\x6f"</div><div class='del'>-			  "\x70\x71\x72\x73\x74\x75\x76\x77"</div><div class='del'>-			  "\x78\x79\x7a\x7b\x7c\x7d\x7e\x7f"</div><div class='del'>-			  "\x80\x81\x82\x83\x84\x85\x86\x87"</div><div class='del'>-			  "\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f"</div><div class='del'>-			  "\x90\x91\x92\x93\x94\x95\x96\x97"</div><div class='del'>-			  "\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f"</div><div class='del'>-			  "\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7"</div><div class='del'>-			  "\xa8\xa9\xaa\xab\xac\xad\xae\xaf"</div><div class='del'>-			  "\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7"</div><div class='del'>-			  "\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf"</div><div class='del'>-			  "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7"</div><div class='del'>-			  "\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf"</div><div class='del'>-			  "\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7"</div><div class='del'>-			  "\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf"</div><div class='del'>-			  "\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7"</div><div class='del'>-			  "\xe8\xe9\xea\xeb\xec\xed\xee\xef"</div><div class='del'>-			  "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7"</div><div class='del'>-			  "\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff",</div><div class='del'>-		.ilen   = 512,</div><div class='del'>-		.result = "\x27\xa7\x47\x9b\xef\xa1\xd4\x76"</div><div class='del'>-			  "\x48\x9f\x30\x8c\xd4\xcf\xa6\xe2"</div><div class='del'>-			  "\xa9\x6e\x4b\xbe\x32\x08\xff\x25"</div><div class='del'>-			  "\x28\x7d\xd3\x81\x96\x16\xe8\x9c"</div><div class='del'>-			  "\xc7\x8c\xf7\xf5\xe5\x43\x44\x5f"</div><div class='del'>-			  "\x83\x33\xd8\xfa\x7f\x56\x00\x00"</div><div class='del'>-			  "\x05\x27\x9f\xa5\xd8\xb5\xe4\xad"</div><div class='del'>-			  "\x40\xe7\x36\xdd\xb4\xd3\x54\x12"</div><div class='del'>-			  "\x32\x80\x63\xfd\x2a\xab\x53\xe5"</div><div class='del'>-			  "\xea\x1e\x0a\x9f\x33\x25\x00\xa5"</div><div class='del'>-			  "\xdf\x94\x87\xd0\x7a\x5c\x92\xcc"</div><div class='del'>-			  "\x51\x2c\x88\x66\xc7\xe8\x60\xce"</div><div class='del'>-			  "\x93\xfd\xf1\x66\xa2\x49\x12\xb4"</div><div class='del'>-			  "\x22\x97\x61\x46\xae\x20\xce\x84"</div><div class='del'>-			  "\x6b\xb7\xdc\x9b\xa9\x4a\x76\x7a"</div><div class='del'>-			  "\xae\xf2\x0c\x0d\x61\xad\x02\x65"</div><div class='del'>-			  "\x5e\xa9\x2d\xc4\xc4\xe4\x1a\x89"</div><div class='del'>-			  "\x52\xc6\x51\xd3\x31\x74\xbe\x51"</div><div class='del'>-			  "\xa1\x0c\x42\x11\x10\xe6\xd8\x15"</div><div class='del'>-			  "\x88\xed\xe8\x21\x03\xa2\x52\xd8"</div><div class='del'>-			  "\xa7\x50\xe8\x76\x8d\xef\xff\xed"</div><div class='del'>-			  "\x91\x22\x81\x0a\xae\xb9\x9f\x91"</div><div class='del'>-			  "\x72\xaf\x82\xb6\x04\xdc\x4b\x8e"</div><div class='del'>-			  "\x51\xbc\xb0\x82\x35\xa6\xf4\x34"</div><div class='del'>-			  "\x13\x32\xe4\xca\x60\x48\x2a\x4b"</div><div class='del'>-			  "\xa1\xa0\x3b\x3e\x65\x00\x8f\xc5"</div><div class='del'>-			  "\xda\x76\xb7\x0b\xf1\x69\x0d\xb4"</div><div class='del'>-			  "\xea\xe2\x9c\x5f\x1b\xad\xd0\x3c"</div><div class='del'>-			  "\x5c\xcf\x2a\x55\xd7\x05\xdd\xcd"</div><div class='del'>-			  "\x86\xd4\x49\x51\x1c\xeb\x7e\xc3"</div><div class='del'>-			  "\x0b\xf1\x2b\x1f\xa3\x5b\x91\x3f"</div><div class='del'>-			  "\x9f\x74\x7a\x8a\xfd\x1b\x13\x0e"</div><div class='del'>-			  "\x94\xbf\xf9\x4e\xff\xd0\x1a\x91"</div><div class='del'>-			  "\x73\x5c\xa1\x72\x6a\xcd\x0b\x19"</div><div class='del'>-			  "\x7c\x4e\x5b\x03\x39\x36\x97\xe1"</div><div class='del'>-			  "\x26\x82\x6f\xb6\xbb\xde\x8e\xcc"</div><div class='del'>-			  "\x1e\x08\x29\x85\x16\xe2\xc9\xed"</div><div class='del'>-			  "\x03\xff\x3c\x1b\x78\x60\xf6\xde"</div><div class='del'>-			  "\x76\xd4\xce\xcd\x94\xc8\x11\x98"</div><div class='del'>-			  "\x55\xef\x52\x97\xca\x67\xe9\xf3"</div><div class='del'>-			  "\xe7\xff\x72\xb1\xe9\x97\x85\xca"</div><div class='del'>-			  "\x0a\x7e\x77\x20\xc5\xb3\x6d\xc6"</div><div class='del'>-			  "\xd7\x2c\xac\x95\x74\xc8\xcb\xbc"</div><div class='del'>-			  "\x2f\x80\x1e\x23\xe5\x6f\xd3\x44"</div><div class='del'>-			  "\xb0\x7f\x22\x15\x4b\xeb\xa0\xf0"</div><div class='del'>-			  "\x8c\xe8\x89\x1e\x64\x3e\xd9\x95"</div><div class='del'>-			  "\xc9\x4d\x9a\x69\xc9\xf1\xb5\xf4"</div><div class='del'>-			  "\x99\x02\x7a\x78\x57\x2a\xee\xbd"</div><div class='del'>-			  "\x74\xd2\x0c\xc3\x98\x81\xc2\x13"</div><div class='del'>-			  "\xee\x77\x0b\x10\x10\xe4\xbe\xa7"</div><div class='del'>-			  "\x18\x84\x69\x77\xae\x11\x9f\x7a"</div><div class='del'>-			  "\x02\x3a\xb5\x8c\xca\x0a\xd7\x52"</div><div class='del'>-			  "\xaf\xe6\x56\xbb\x3c\x17\x25\x6a"</div><div class='del'>-			  "\x9f\x6e\x9b\xf1\x9f\xdd\x5a\x38"</div><div class='del'>-			  "\xfc\x82\xbb\xe8\x72\xc5\x53\x9e"</div><div class='del'>-			  "\xdb\x60\x9e\xf4\xf7\x9c\x20\x3e"</div><div class='del'>-			  "\xbb\x14\x0f\x2e\x58\x3c\xb2\xad"</div><div class='del'>-			  "\x15\xb4\xaa\x5b\x65\x50\x16\xa8"</div><div class='del'>-			  "\x44\x92\x77\xdb\xd4\x77\xef\x2c"</div><div class='del'>-			  "\x8d\x6c\x01\x7d\xb7\x38\xb1\x8d"</div><div class='del'>-			  "\xeb\x4a\x42\x7d\x19\x23\xce\x3f"</div><div class='del'>-			  "\xf2\x62\x73\x57\x79\xa4\x18\xf2"</div><div class='del'>-			  "\x0a\x28\x2d\xf9\x20\x14\x7b\xea"</div><div class='del'>-			  "\xbe\x42\x1e\xe5\x31\x9d\x05\x68",</div><div class='del'>-		.rlen   = 512,</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct cipher_testvec aes_xts_dec_tv_template[] = {</div><div class='del'>-	/* http://grouper.ieee.org/groups/1619/email/pdf00086.pdf */</div><div class='del'>-	{ /* XTS-AES 1 */</div><div class='del'>-		.key    = "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			  "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			  "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			  "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='del'>-		.klen   = 32,</div><div class='del'>-		.iv     = "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			  "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='del'>-		.input = "\x91\x7c\xf6\x9e\xbd\x68\xb2\xec"</div><div class='del'>-			 "\x9b\x9f\xe9\xa3\xea\xdd\xa6\x92"</div><div class='del'>-			 "\xcd\x43\xd2\xf5\x95\x98\xed\x85"</div><div class='del'>-			 "\x8c\x02\xc2\x65\x2f\xbf\x92\x2e",</div><div class='del'>-		.ilen   = 32,</div><div class='del'>-		.result  = "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			   "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			   "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			   "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='del'>-		.rlen   = 32,</div><div class='del'>-	}, { /* XTS-AES 2 */</div><div class='del'>-		.key    = "\x11\x11\x11\x11\x11\x11\x11\x11"</div><div class='del'>-			  "\x11\x11\x11\x11\x11\x11\x11\x11"</div><div class='del'>-			  "\x22\x22\x22\x22\x22\x22\x22\x22"</div><div class='del'>-			  "\x22\x22\x22\x22\x22\x22\x22\x22",</div><div class='del'>-		.klen   = 32,</div><div class='del'>-		.iv     = "\x33\x33\x33\x33\x33\x00\x00\x00"</div><div class='del'>-			  "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='del'>-		.input  = "\xc4\x54\x18\x5e\x6a\x16\x93\x6e"</div><div class='del'>-			  "\x39\x33\x40\x38\xac\xef\x83\x8b"</div><div class='del'>-			  "\xfb\x18\x6f\xff\x74\x80\xad\xc4"</div><div class='del'>-			  "\x28\x93\x82\xec\xd6\xd3\x94\xf0",</div><div class='del'>-		.ilen   = 32,</div><div class='del'>-		.result = "\x44\x44\x44\x44\x44\x44\x44\x44"</div><div class='del'>-			  "\x44\x44\x44\x44\x44\x44\x44\x44"</div><div class='del'>-			  "\x44\x44\x44\x44\x44\x44\x44\x44"</div><div class='del'>-			  "\x44\x44\x44\x44\x44\x44\x44\x44",</div><div class='del'>-		.rlen   = 32,</div><div class='del'>-	}, { /* XTS-AES 3 */</div><div class='del'>-		.key    = "\xff\xfe\xfd\xfc\xfb\xfa\xf9\xf8"</div><div class='del'>-			  "\xf7\xf6\xf5\xf4\xf3\xf2\xf1\xf0"</div><div class='del'>-			  "\x22\x22\x22\x22\x22\x22\x22\x22"</div><div class='del'>-			  "\x22\x22\x22\x22\x22\x22\x22\x22",</div><div class='del'>-		.klen   = 32,</div><div class='del'>-		.iv     = "\x33\x33\x33\x33\x33\x00\x00\x00"</div><div class='del'>-			  "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='del'>-		.input = "\xaf\x85\x33\x6b\x59\x7a\xfc\x1a"</div><div class='del'>-			  "\x90\x0b\x2e\xb2\x1e\xc9\x49\xd2"</div><div class='del'>-			  "\x92\xdf\x4c\x04\x7e\x0b\x21\x53"</div><div class='del'>-			  "\x21\x86\xa5\x97\x1a\x22\x7a\x89",</div><div class='del'>-		.ilen   = 32,</div><div class='del'>-		.result  = "\x44\x44\x44\x44\x44\x44\x44\x44"</div><div class='del'>-			  "\x44\x44\x44\x44\x44\x44\x44\x44"</div><div class='del'>-			  "\x44\x44\x44\x44\x44\x44\x44\x44"</div><div class='del'>-			  "\x44\x44\x44\x44\x44\x44\x44\x44",</div><div class='del'>-		.rlen   = 32,</div><div class='del'>-	}, { /* XTS-AES 4 */</div><div class='del'>-		.key    = "\x27\x18\x28\x18\x28\x45\x90\x45"</div><div class='del'>-			  "\x23\x53\x60\x28\x74\x71\x35\x26"</div><div class='del'>-			  "\x31\x41\x59\x26\x53\x58\x97\x93"</div><div class='del'>-			  "\x23\x84\x62\x64\x33\x83\x27\x95",</div><div class='del'>-		.klen   = 32,</div><div class='del'>-		.iv     = "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			  "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='del'>-		.input  = "\x27\xa7\x47\x9b\xef\xa1\xd4\x76"</div><div class='del'>-			  "\x48\x9f\x30\x8c\xd4\xcf\xa6\xe2"</div><div class='del'>-			  "\xa9\x6e\x4b\xbe\x32\x08\xff\x25"</div><div class='del'>-			  "\x28\x7d\xd3\x81\x96\x16\xe8\x9c"</div><div class='del'>-			  "\xc7\x8c\xf7\xf5\xe5\x43\x44\x5f"</div><div class='del'>-			  "\x83\x33\xd8\xfa\x7f\x56\x00\x00"</div><div class='del'>-			  "\x05\x27\x9f\xa5\xd8\xb5\xe4\xad"</div><div class='del'>-			  "\x40\xe7\x36\xdd\xb4\xd3\x54\x12"</div><div class='del'>-			  "\x32\x80\x63\xfd\x2a\xab\x53\xe5"</div><div class='del'>-			  "\xea\x1e\x0a\x9f\x33\x25\x00\xa5"</div><div class='del'>-			  "\xdf\x94\x87\xd0\x7a\x5c\x92\xcc"</div><div class='del'>-			  "\x51\x2c\x88\x66\xc7\xe8\x60\xce"</div><div class='del'>-			  "\x93\xfd\xf1\x66\xa2\x49\x12\xb4"</div><div class='del'>-			  "\x22\x97\x61\x46\xae\x20\xce\x84"</div><div class='del'>-			  "\x6b\xb7\xdc\x9b\xa9\x4a\x76\x7a"</div><div class='del'>-			  "\xae\xf2\x0c\x0d\x61\xad\x02\x65"</div><div class='del'>-			  "\x5e\xa9\x2d\xc4\xc4\xe4\x1a\x89"</div><div class='del'>-			  "\x52\xc6\x51\xd3\x31\x74\xbe\x51"</div><div class='del'>-			  "\xa1\x0c\x42\x11\x10\xe6\xd8\x15"</div><div class='del'>-			  "\x88\xed\xe8\x21\x03\xa2\x52\xd8"</div><div class='del'>-			  "\xa7\x50\xe8\x76\x8d\xef\xff\xed"</div><div class='del'>-			  "\x91\x22\x81\x0a\xae\xb9\x9f\x91"</div><div class='del'>-			  "\x72\xaf\x82\xb6\x04\xdc\x4b\x8e"</div><div class='del'>-			  "\x51\xbc\xb0\x82\x35\xa6\xf4\x34"</div><div class='del'>-			  "\x13\x32\xe4\xca\x60\x48\x2a\x4b"</div><div class='del'>-			  "\xa1\xa0\x3b\x3e\x65\x00\x8f\xc5"</div><div class='del'>-			  "\xda\x76\xb7\x0b\xf1\x69\x0d\xb4"</div><div class='del'>-			  "\xea\xe2\x9c\x5f\x1b\xad\xd0\x3c"</div><div class='del'>-			  "\x5c\xcf\x2a\x55\xd7\x05\xdd\xcd"</div><div class='del'>-			  "\x86\xd4\x49\x51\x1c\xeb\x7e\xc3"</div><div class='del'>-			  "\x0b\xf1\x2b\x1f\xa3\x5b\x91\x3f"</div><div class='del'>-			  "\x9f\x74\x7a\x8a\xfd\x1b\x13\x0e"</div><div class='del'>-			  "\x94\xbf\xf9\x4e\xff\xd0\x1a\x91"</div><div class='del'>-			  "\x73\x5c\xa1\x72\x6a\xcd\x0b\x19"</div><div class='del'>-			  "\x7c\x4e\x5b\x03\x39\x36\x97\xe1"</div><div class='del'>-			  "\x26\x82\x6f\xb6\xbb\xde\x8e\xcc"</div><div class='del'>-			  "\x1e\x08\x29\x85\x16\xe2\xc9\xed"</div><div class='del'>-			  "\x03\xff\x3c\x1b\x78\x60\xf6\xde"</div><div class='del'>-			  "\x76\xd4\xce\xcd\x94\xc8\x11\x98"</div><div class='del'>-			  "\x55\xef\x52\x97\xca\x67\xe9\xf3"</div><div class='del'>-			  "\xe7\xff\x72\xb1\xe9\x97\x85\xca"</div><div class='del'>-			  "\x0a\x7e\x77\x20\xc5\xb3\x6d\xc6"</div><div class='del'>-			  "\xd7\x2c\xac\x95\x74\xc8\xcb\xbc"</div><div class='del'>-			  "\x2f\x80\x1e\x23\xe5\x6f\xd3\x44"</div><div class='del'>-			  "\xb0\x7f\x22\x15\x4b\xeb\xa0\xf0"</div><div class='del'>-			  "\x8c\xe8\x89\x1e\x64\x3e\xd9\x95"</div><div class='del'>-			  "\xc9\x4d\x9a\x69\xc9\xf1\xb5\xf4"</div><div class='del'>-			  "\x99\x02\x7a\x78\x57\x2a\xee\xbd"</div><div class='del'>-			  "\x74\xd2\x0c\xc3\x98\x81\xc2\x13"</div><div class='del'>-			  "\xee\x77\x0b\x10\x10\xe4\xbe\xa7"</div><div class='del'>-			  "\x18\x84\x69\x77\xae\x11\x9f\x7a"</div><div class='del'>-			  "\x02\x3a\xb5\x8c\xca\x0a\xd7\x52"</div><div class='del'>-			  "\xaf\xe6\x56\xbb\x3c\x17\x25\x6a"</div><div class='del'>-			  "\x9f\x6e\x9b\xf1\x9f\xdd\x5a\x38"</div><div class='del'>-			  "\xfc\x82\xbb\xe8\x72\xc5\x53\x9e"</div><div class='del'>-			  "\xdb\x60\x9e\xf4\xf7\x9c\x20\x3e"</div><div class='del'>-			  "\xbb\x14\x0f\x2e\x58\x3c\xb2\xad"</div><div class='del'>-			  "\x15\xb4\xaa\x5b\x65\x50\x16\xa8"</div><div class='del'>-			  "\x44\x92\x77\xdb\xd4\x77\xef\x2c"</div><div class='del'>-			  "\x8d\x6c\x01\x7d\xb7\x38\xb1\x8d"</div><div class='del'>-			  "\xeb\x4a\x42\x7d\x19\x23\xce\x3f"</div><div class='del'>-			  "\xf2\x62\x73\x57\x79\xa4\x18\xf2"</div><div class='del'>-			  "\x0a\x28\x2d\xf9\x20\x14\x7b\xea"</div><div class='del'>-			  "\xbe\x42\x1e\xe5\x31\x9d\x05\x68",</div><div class='del'>-		.ilen   = 512,</div><div class='del'>-		.result = "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='del'>-			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='del'>-			  "\x10\x11\x12\x13\x14\x15\x16\x17"</div><div class='del'>-			  "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f"</div><div class='del'>-			  "\x20\x21\x22\x23\x24\x25\x26\x27"</div><div class='del'>-			  "\x28\x29\x2a\x2b\x2c\x2d\x2e\x2f"</div><div class='del'>-			  "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='del'>-			  "\x38\x39\x3a\x3b\x3c\x3d\x3e\x3f"</div><div class='del'>-			  "\x40\x41\x42\x43\x44\x45\x46\x47"</div><div class='del'>-			  "\x48\x49\x4a\x4b\x4c\x4d\x4e\x4f"</div><div class='del'>-			  "\x50\x51\x52\x53\x54\x55\x56\x57"</div><div class='del'>-			  "\x58\x59\x5a\x5b\x5c\x5d\x5e\x5f"</div><div class='del'>-			  "\x60\x61\x62\x63\x64\x65\x66\x67"</div><div class='del'>-			  "\x68\x69\x6a\x6b\x6c\x6d\x6e\x6f"</div><div class='del'>-			  "\x70\x71\x72\x73\x74\x75\x76\x77"</div><div class='del'>-			  "\x78\x79\x7a\x7b\x7c\x7d\x7e\x7f"</div><div class='del'>-			  "\x80\x81\x82\x83\x84\x85\x86\x87"</div><div class='del'>-			  "\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f"</div><div class='del'>-			  "\x90\x91\x92\x93\x94\x95\x96\x97"</div><div class='del'>-			  "\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f"</div><div class='del'>-			  "\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7"</div><div class='del'>-			  "\xa8\xa9\xaa\xab\xac\xad\xae\xaf"</div><div class='del'>-			  "\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7"</div><div class='del'>-			  "\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf"</div><div class='del'>-			  "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7"</div><div class='del'>-			  "\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf"</div><div class='del'>-			  "\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7"</div><div class='del'>-			  "\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf"</div><div class='del'>-			  "\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7"</div><div class='del'>-			  "\xe8\xe9\xea\xeb\xec\xed\xee\xef"</div><div class='del'>-			  "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7"</div><div class='del'>-			  "\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff"</div><div class='del'>-			  "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='del'>-			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='del'>-			  "\x10\x11\x12\x13\x14\x15\x16\x17"</div><div class='del'>-			  "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f"</div><div class='del'>-			  "\x20\x21\x22\x23\x24\x25\x26\x27"</div><div class='del'>-			  "\x28\x29\x2a\x2b\x2c\x2d\x2e\x2f"</div><div class='del'>-			  "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='del'>-			  "\x38\x39\x3a\x3b\x3c\x3d\x3e\x3f"</div><div class='del'>-			  "\x40\x41\x42\x43\x44\x45\x46\x47"</div><div class='del'>-			  "\x48\x49\x4a\x4b\x4c\x4d\x4e\x4f"</div><div class='del'>-			  "\x50\x51\x52\x53\x54\x55\x56\x57"</div><div class='del'>-			  "\x58\x59\x5a\x5b\x5c\x5d\x5e\x5f"</div><div class='del'>-			  "\x60\x61\x62\x63\x64\x65\x66\x67"</div><div class='del'>-			  "\x68\x69\x6a\x6b\x6c\x6d\x6e\x6f"</div><div class='del'>-			  "\x70\x71\x72\x73\x74\x75\x76\x77"</div><div class='del'>-			  "\x78\x79\x7a\x7b\x7c\x7d\x7e\x7f"</div><div class='del'>-			  "\x80\x81\x82\x83\x84\x85\x86\x87"</div><div class='del'>-			  "\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f"</div><div class='del'>-			  "\x90\x91\x92\x93\x94\x95\x96\x97"</div><div class='del'>-			  "\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f"</div><div class='del'>-			  "\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7"</div><div class='del'>-			  "\xa8\xa9\xaa\xab\xac\xad\xae\xaf"</div><div class='del'>-			  "\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7"</div><div class='del'>-			  "\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf"</div><div class='del'>-			  "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7"</div><div class='del'>-			  "\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf"</div><div class='del'>-			  "\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7"</div><div class='del'>-			  "\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf"</div><div class='del'>-			  "\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7"</div><div class='del'>-			  "\xe8\xe9\xea\xeb\xec\xed\xee\xef"</div><div class='del'>-			  "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7"</div><div class='del'>-			  "\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff",</div><div class='del'>-		.rlen   = 512,</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static struct cipher_testvec aes_ctr_enc_tv_template[] = {</div><div class='del'>-	{ /* From RFC 3686 */</div><div class='del'>-		.key	= "\xae\x68\x52\xf8\x12\x10\x67\xcc"</div><div class='del'>-			  "\x4b\xf7\xa5\x76\x55\x77\xf3\x9e"</div><div class='del'>-			  "\x00\x00\x00\x30",</div><div class='del'>-		.klen	= 20,</div><div class='del'>-		.iv	= "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='del'>-		.input	= "Single block msg",</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result = "\xe4\x09\x5d\x4f\xb7\xa7\xb3\x79"</div><div class='del'>-			  "\x2d\x61\x75\xa3\x26\x13\x11\xb8",</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x7e\x24\x06\x78\x17\xfa\xe0\xd7"</div><div class='del'>-			  "\x43\xd6\xce\x1f\x32\x53\x91\x63"</div><div class='del'>-			  "\x00\x6c\xb6\xdb",</div><div class='del'>-		.klen	= 20,</div><div class='del'>-		.iv	= "\xc0\x54\x3b\x59\xda\x48\xd9\x0b",</div><div class='del'>-		.input	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='del'>-			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='del'>-			  "\x10\x11\x12\x13\x14\x15\x16\x17"</div><div class='del'>-			  "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f",</div><div class='del'>-		.ilen	= 32,</div><div class='del'>-		.result = "\x51\x04\xa1\x06\x16\x8a\x72\xd9"</div><div class='del'>-			  "\x79\x0d\x41\xee\x8e\xda\xd3\x88"</div><div class='del'>-			  "\xeb\x2e\x1e\xfc\x46\xda\x57\xc8"</div><div class='del'>-			  "\xfc\xe6\x30\xdf\x91\x41\xbe\x28",</div><div class='del'>-		.rlen	= 32,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x16\xaf\x5b\x14\x5f\xc9\xf5\x79"</div><div class='del'>-			  "\xc1\x75\xf9\x3e\x3b\xfb\x0e\xed"</div><div class='del'>-			  "\x86\x3d\x06\xcc\xfd\xb7\x85\x15"</div><div class='del'>-			  "\x00\x00\x00\x48",</div><div class='del'>-		.klen	= 28,</div><div class='del'>-		.iv	= "\x36\x73\x3c\x14\x7d\x6d\x93\xcb",</div><div class='del'>-		.input	= "Single block msg",</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result	= "\x4b\x55\x38\x4f\xe2\x59\xc9\xc8"</div><div class='del'>-			  "\x4e\x79\x35\xa0\x03\xcb\xe9\x28",</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x7c\x5c\xb2\x40\x1b\x3d\xc3\x3c"</div><div class='del'>-			  "\x19\xe7\x34\x08\x19\xe0\xf6\x9c"</div><div class='del'>-			  "\x67\x8c\x3d\xb8\xe6\xf6\xa9\x1a"</div><div class='del'>-			  "\x00\x96\xb0\x3b",</div><div class='del'>-		.klen	= 28,</div><div class='del'>-		.iv	= "\x02\x0c\x6e\xad\xc2\xcb\x50\x0d",</div><div class='del'>-		.input	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='del'>-			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='del'>-			  "\x10\x11\x12\x13\x14\x15\x16\x17"</div><div class='del'>-			  "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f",</div><div class='del'>-		.ilen	= 32,</div><div class='del'>-		.result	= "\x45\x32\x43\xfc\x60\x9b\x23\x32"</div><div class='del'>-			  "\x7e\xdf\xaa\xfa\x71\x31\xcd\x9f"</div><div class='del'>-			  "\x84\x90\x70\x1c\x5a\xd4\xa7\x9c"</div><div class='del'>-			  "\xfc\x1f\xe0\xff\x42\xf4\xfb\x00",</div><div class='del'>-		.rlen	= 32,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x77\x6b\xef\xf2\x85\x1d\xb0\x6f"</div><div class='del'>-			  "\x4c\x8a\x05\x42\xc8\x69\x6f\x6c"</div><div class='del'>-			  "\x6a\x81\xaf\x1e\xec\x96\xb4\xd3"</div><div class='del'>-			  "\x7f\xc1\xd6\x89\xe6\xc1\xc1\x04"</div><div class='del'>-			  "\x00\x00\x00\x60",</div><div class='del'>-		.klen	= 36,</div><div class='del'>-		.iv	= "\xdb\x56\x72\xc9\x7a\xa8\xf0\xb2",</div><div class='del'>-		.input	= "Single block msg",</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result = "\x14\x5a\xd0\x1d\xbf\x82\x4e\xc7"</div><div class='del'>-			  "\x56\x08\x63\xdc\x71\xe3\xe0\xc0",</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\xf6\xd6\x6d\x6b\xd5\x2d\x59\xbb"</div><div class='del'>-			  "\x07\x96\x36\x58\x79\xef\xf8\x86"</div><div class='del'>-			  "\xc6\x6d\xd5\x1a\x5b\x6a\x99\x74"</div><div class='del'>-			  "\x4b\x50\x59\x0c\x87\xa2\x38\x84"</div><div class='del'>-			  "\x00\xfa\xac\x24",</div><div class='del'>-		.klen	= 36,</div><div class='del'>-		.iv	= "\xc1\x58\x5e\xf1\x5a\x43\xd8\x75",</div><div class='del'>-		.input	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='del'>-			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='del'>-			  "\x10\x11\x12\x13\x14\x15\x16\x17"</div><div class='del'>-			  "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f",</div><div class='del'>-		.ilen	= 32,</div><div class='del'>-		.result = "\xf0\x5e\x23\x1b\x38\x94\x61\x2c"</div><div class='del'>-			  "\x49\xee\x00\x0b\x80\x4e\xb2\xa9"</div><div class='del'>-			  "\xb8\x30\x6b\x50\x8f\x83\x9d\x6a"</div><div class='del'>-			  "\x55\x30\x83\x1d\x93\x44\xaf\x1c",</div><div class='del'>-		.rlen	= 32,</div><div class='del'>-	}, {</div><div class='del'>-	// generated using Crypto++</div><div class='del'>-		.key = "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='del'>-			"\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='del'>-			"\x10\x11\x12\x13\x14\x15\x16\x17"</div><div class='del'>-			"\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f"</div><div class='del'>-			"\x00\x00\x00\x00",</div><div class='del'>-		.klen = 32 + 4,</div><div class='del'>-		.iv = "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='del'>-		.input =</div><div class='del'>-			"\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='del'>-			"\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='del'>-			"\x10\x11\x12\x13\x14\x15\x16\x17"</div><div class='del'>-			"\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f"</div><div class='del'>-			"\x20\x21\x22\x23\x24\x25\x26\x27"</div><div class='del'>-			"\x28\x29\x2a\x2b\x2c\x2d\x2e\x2f"</div><div class='del'>-			"\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='del'>-			"\x38\x39\x3a\x3b\x3c\x3d\x3e\x3f"</div><div class='del'>-			"\x40\x41\x42\x43\x44\x45\x46\x47"</div><div class='del'>-			"\x48\x49\x4a\x4b\x4c\x4d\x4e\x4f"</div><div class='del'>-			"\x50\x51\x52\x53\x54\x55\x56\x57"</div><div class='del'>-			"\x58\x59\x5a\x5b\x5c\x5d\x5e\x5f"</div><div class='del'>-			"\x60\x61\x62\x63\x64\x65\x66\x67"</div><div class='del'>-			"\x68\x69\x6a\x6b\x6c\x6d\x6e\x6f"</div><div class='del'>-			"\x70\x71\x72\x73\x74\x75\x76\x77"</div><div class='del'>-			"\x78\x79\x7a\x7b\x7c\x7d\x7e\x7f"</div><div class='del'>-			"\x80\x81\x82\x83\x84\x85\x86\x87"</div><div class='del'>-			"\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f"</div><div class='del'>-			"\x90\x91\x92\x93\x94\x95\x96\x97"</div><div class='del'>-			"\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f"</div><div class='del'>-			"\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7"</div><div class='del'>-			"\xa8\xa9\xaa\xab\xac\xad\xae\xaf"</div><div class='del'>-			"\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7"</div><div class='del'>-			"\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf"</div><div class='del'>-			"\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7"</div><div class='del'>-			"\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf"</div><div class='del'>-			"\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7"</div><div class='del'>-			"\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf"</div><div class='del'>-			"\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7"</div><div class='del'>-			"\xe8\xe9\xea\xeb\xec\xed\xee\xef"</div><div class='del'>-			"\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7"</div><div class='del'>-			"\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff"</div><div class='del'>-			"\x00\x03\x06\x09\x0c\x0f\x12\x15"</div><div class='del'>-			"\x18\x1b\x1e\x21\x24\x27\x2a\x2d"</div><div class='del'>-			"\x30\x33\x36\x39\x3c\x3f\x42\x45"</div><div class='del'>-			"\x48\x4b\x4e\x51\x54\x57\x5a\x5d"</div><div class='del'>-			"\x60\x63\x66\x69\x6c\x6f\x72\x75"</div><div class='del'>-			"\x78\x7b\x7e\x81\x84\x87\x8a\x8d"</div><div class='del'>-			"\x90\x93\x96\x99\x9c\x9f\xa2\xa5"</div><div class='del'>-			"\xa8\xab\xae\xb1\xb4\xb7\xba\xbd"</div><div class='del'>-			"\xc0\xc3\xc6\xc9\xcc\xcf\xd2\xd5"</div><div class='del'>-			"\xd8\xdb\xde\xe1\xe4\xe7\xea\xed"</div><div class='del'>-			"\xf0\xf3\xf6\xf9\xfc\xff\x02\x05"</div><div class='del'>-			"\x08\x0b\x0e\x11\x14\x17\x1a\x1d"</div><div class='del'>-			"\x20\x23\x26\x29\x2c\x2f\x32\x35"</div><div class='del'>-			"\x38\x3b\x3e\x41\x44\x47\x4a\x4d"</div><div class='del'>-			"\x50\x53\x56\x59\x5c\x5f\x62\x65"</div><div class='del'>-			"\x68\x6b\x6e\x71\x74\x77\x7a\x7d"</div><div class='del'>-			"\x80\x83\x86\x89\x8c\x8f\x92\x95"</div><div class='del'>-			"\x98\x9b\x9e\xa1\xa4\xa7\xaa\xad"</div><div class='del'>-			"\xb0\xb3\xb6\xb9\xbc\xbf\xc2\xc5"</div><div class='del'>-			"\xc8\xcb\xce\xd1\xd4\xd7\xda\xdd"</div><div class='del'>-			"\xe0\xe3\xe6\xe9\xec\xef\xf2\xf5"</div><div class='del'>-			"\xf8\xfb\xfe\x01\x04\x07\x0a\x0d"</div><div class='del'>-			"\x10\x13\x16\x19\x1c\x1f\x22\x25"</div><div class='del'>-			"\x28\x2b\x2e\x31\x34\x37\x3a\x3d"</div><div class='del'>-			"\x40\x43\x46\x49\x4c\x4f\x52\x55"</div><div class='del'>-			"\x58\x5b\x5e\x61\x64\x67\x6a\x6d"</div><div class='del'>-			"\x70\x73\x76\x79\x7c\x7f\x82\x85"</div><div class='del'>-			"\x88\x8b\x8e\x91\x94\x97\x9a\x9d"</div><div class='del'>-			"\xa0\xa3\xa6\xa9\xac\xaf\xb2\xb5"</div><div class='del'>-			"\xb8\xbb\xbe\xc1\xc4\xc7\xca\xcd"</div><div class='del'>-			"\xd0\xd3\xd6\xd9\xdc\xdf\xe2\xe5"</div><div class='del'>-			"\xe8\xeb\xee\xf1\xf4\xf7\xfa\xfd"</div><div class='del'>-			"\x00\x05\x0a\x0f\x14\x19\x1e\x23"</div><div class='del'>-			"\x28\x2d\x32\x37\x3c\x41\x46\x4b"</div><div class='del'>-			"\x50\x55\x5a\x5f\x64\x69\x6e\x73"</div><div class='del'>-			"\x78\x7d\x82\x87\x8c\x91\x96\x9b"</div><div class='del'>-			"\xa0\xa5\xaa\xaf\xb4\xb9\xbe\xc3"</div><div class='del'>-			"\xc8\xcd\xd2\xd7\xdc\xe1\xe6\xeb"</div><div class='del'>-			"\xf0\xf5\xfa\xff\x04\x09\x0e\x13"</div><div class='del'>-			"\x18\x1d\x22\x27\x2c\x31\x36\x3b"</div><div class='del'>-			"\x40\x45\x4a\x4f\x54\x59\x5e\x63"</div><div class='del'>-			"\x68\x6d\x72\x77\x7c\x81\x86\x8b"</div><div class='del'>-			"\x90\x95\x9a\x9f\xa4\xa9\xae\xb3"</div><div class='del'>-			"\xb8\xbd\xc2\xc7\xcc\xd1\xd6\xdb"</div><div class='del'>-			"\xe0\xe5\xea\xef\xf4\xf9\xfe\x03"</div><div class='del'>-			"\x08\x0d\x12\x17\x1c\x21\x26\x2b"</div><div class='del'>-			"\x30\x35\x3a\x3f\x44\x49\x4e\x53"</div><div class='del'>-			"\x58\x5d\x62\x67\x6c\x71\x76\x7b"</div><div class='del'>-			"\x80\x85\x8a\x8f\x94\x99\x9e\xa3"</div><div class='del'>-			"\xa8\xad\xb2\xb7\xbc\xc1\xc6\xcb"</div><div class='del'>-			"\xd0\xd5\xda\xdf\xe4\xe9\xee\xf3"</div><div class='del'>-			"\xf8\xfd\x02\x07\x0c\x11\x16\x1b"</div><div class='del'>-			"\x20\x25\x2a\x2f\x34\x39\x3e\x43"</div><div class='del'>-			"\x48\x4d\x52\x57\x5c\x61\x66\x6b"</div><div class='del'>-			"\x70\x75\x7a\x7f\x84\x89\x8e\x93"</div><div class='del'>-			"\x98\x9d\xa2\xa7\xac\xb1\xb6\xbb"</div><div class='del'>-			"\xc0\xc5\xca\xcf\xd4\xd9\xde\xe3"</div><div class='del'>-			"\xe8\xed\xf2\xf7\xfc\x01\x06\x0b"</div><div class='del'>-			"\x10\x15\x1a\x1f\x24\x29\x2e\x33"</div><div class='del'>-			"\x38\x3d\x42\x47\x4c\x51\x56\x5b"</div><div class='del'>-			"\x60\x65\x6a\x6f\x74\x79\x7e\x83"</div><div class='del'>-			"\x88\x8d\x92\x97\x9c\xa1\xa6\xab"</div><div class='del'>-			"\xb0\xb5\xba\xbf\xc4\xc9\xce\xd3"</div><div class='del'>-			"\xd8\xdd\xe2\xe7\xec\xf1\xf6\xfb"</div><div class='del'>-			"\x00\x07\x0e\x15\x1c\x23\x2a\x31"</div><div class='del'>-			"\x38\x3f\x46\x4d\x54\x5b\x62\x69"</div><div class='del'>-			"\x70\x77\x7e\x85\x8c\x93\x9a\xa1"</div><div class='del'>-			"\xa8\xaf\xb6\xbd\xc4\xcb\xd2\xd9"</div><div class='del'>-			"\xe0\xe7\xee\xf5\xfc\x03\x0a\x11"</div><div class='del'>-			"\x18\x1f\x26\x2d\x34\x3b\x42\x49"</div><div class='del'>-			"\x50\x57\x5e\x65\x6c\x73\x7a\x81"</div><div class='del'>-			"\x88\x8f\x96\x9d\xa4\xab\xb2\xb9"</div><div class='del'>-			"\xc0\xc7\xce\xd5\xdc\xe3\xea\xf1"</div><div class='del'>-			"\xf8\xff\x06\x0d\x14\x1b\x22\x29"</div><div class='del'>-			"\x30\x37\x3e\x45\x4c\x53\x5a\x61"</div><div class='del'>-			"\x68\x6f\x76\x7d\x84\x8b\x92\x99"</div><div class='del'>-			"\xa0\xa7\xae\xb5\xbc\xc3\xca\xd1"</div><div class='del'>-			"\xd8\xdf\xe6\xed\xf4\xfb\x02\x09"</div><div class='del'>-			"\x10\x17\x1e\x25\x2c\x33\x3a\x41"</div><div class='del'>-			"\x48\x4f\x56\x5d\x64\x6b\x72\x79"</div><div class='del'>-			"\x80\x87\x8e\x95\x9c\xa3\xaa\xb1"</div><div class='del'>-			"\xb8\xbf\xc6\xcd\xd4\xdb\xe2\xe9"</div><div class='del'>-			"\xf0\xf7\xfe\x05\x0c\x13\x1a\x21"</div><div class='del'>-			"\x28\x2f\x36\x3d\x44\x4b\x52\x59"</div><div class='del'>-			"\x60\x67\x6e\x75\x7c\x83\x8a\x91"</div><div class='del'>-			"\x98\x9f\xa6\xad\xb4\xbb\xc2\xc9"</div><div class='del'>-			"\xd0\xd7\xde\xe5\xec\xf3\xfa\x01"</div><div class='del'>-			"\x08\x0f\x16\x1d\x24\x2b\x32\x39"</div><div class='del'>-			"\x40\x47\x4e\x55\x5c\x63\x6a\x71"</div><div class='del'>-			"\x78\x7f\x86\x8d\x94\x9b\xa2\xa9"</div><div class='del'>-			"\xb0\xb7\xbe\xc5\xcc\xd3\xda\xe1"</div><div class='del'>-			"\xe8\xef\xf6\xfd\x04\x0b\x12\x19"</div><div class='del'>-			"\x20\x27\x2e\x35\x3c\x43\x4a\x51"</div><div class='del'>-			"\x58\x5f\x66\x6d\x74\x7b\x82\x89"</div><div class='del'>-			"\x90\x97\x9e\xa5\xac\xb3\xba\xc1"</div><div class='del'>-			"\xc8\xcf\xd6\xdd\xe4\xeb\xf2\xf9"</div><div class='del'>-			"\x00\x09\x12\x1b\x24\x2d\x36\x3f"</div><div class='del'>-			"\x48\x51\x5a\x63\x6c\x75\x7e\x87"</div><div class='del'>-			"\x90\x99\xa2\xab\xb4\xbd\xc6\xcf"</div><div class='del'>-			"\xd8\xe1\xea\xf3\xfc\x05\x0e\x17"</div><div class='del'>-			"\x20\x29\x32\x3b\x44\x4d\x56\x5f"</div><div class='del'>-			"\x68\x71\x7a\x83\x8c\x95\x9e\xa7"</div><div class='del'>-			"\xb0\xb9\xc2\xcb\xd4\xdd\xe6\xef"</div><div class='del'>-			"\xf8\x01\x0a\x13\x1c\x25\x2e\x37"</div><div class='del'>-			"\x40\x49\x52\x5b\x64\x6d\x76\x7f"</div><div class='del'>-			"\x88\x91\x9a\xa3\xac\xb5\xbe\xc7"</div><div class='del'>-			"\xd0\xd9\xe2\xeb\xf4\xfd\x06\x0f"</div><div class='del'>-			"\x18\x21\x2a\x33\x3c\x45\x4e\x57"</div><div class='del'>-			"\x60\x69\x72\x7b\x84\x8d\x96\x9f"</div><div class='del'>-			"\xa8\xb1\xba\xc3\xcc\xd5\xde\xe7"</div><div class='del'>-			"\xf0\xf9\x02\x0b\x14\x1d\x26\x2f"</div><div class='del'>-			"\x38\x41\x4a\x53\x5c\x65\x6e\x77"</div><div class='del'>-			"\x80\x89\x92\x9b\xa4\xad\xb6\xbf"</div><div class='del'>-			"\xc8\xd1\xda\xe3\xec\xf5\xfe\x07"</div><div class='del'>-			"\x10\x19\x22\x2b\x34\x3d\x46\x4f"</div><div class='del'>-			"\x58\x61\x6a\x73\x7c\x85\x8e\x97"</div><div class='del'>-			"\xa0\xa9\xb2\xbb\xc4\xcd\xd6\xdf"</div><div class='del'>-			"\xe8\xf1\xfa\x03\x0c\x15\x1e\x27"</div><div class='del'>-			"\x30\x39\x42\x4b\x54\x5d\x66\x6f"</div><div class='del'>-			"\x78\x81\x8a\x93\x9c\xa5\xae\xb7"</div><div class='del'>-			"\xc0\xc9\xd2\xdb\xe4\xed\xf6\xff"</div><div class='del'>-			"\x08\x11\x1a\x23\x2c\x35\x3e\x47"</div><div class='del'>-			"\x50\x59\x62\x6b\x74\x7d\x86\x8f"</div><div class='del'>-			"\x98\xa1\xaa\xb3\xbc\xc5\xce\xd7"</div><div class='del'>-			"\xe0\xe9\xf2\xfb\x04\x0d\x16\x1f"</div><div class='del'>-			"\x28\x31\x3a\x43\x4c\x55\x5e\x67"</div><div class='del'>-			"\x70\x79\x82\x8b\x94\x9d\xa6\xaf"</div><div class='del'>-			"\xb8\xc1\xca\xd3\xdc\xe5\xee\xf7"</div><div class='del'>-			"\x00\x0b\x16\x21\x2c\x37\x42\x4d"</div><div class='del'>-			"\x58\x63\x6e\x79\x84\x8f\x9a\xa5"</div><div class='del'>-			"\xb0\xbb\xc6\xd1\xdc\xe7\xf2\xfd"</div><div class='del'>-			"\x08\x13\x1e\x29\x34\x3f\x4a\x55"</div><div class='del'>-			"\x60\x6b\x76\x81\x8c\x97\xa2\xad"</div><div class='del'>-			"\xb8\xc3\xce\xd9\xe4\xef\xfa\x05"</div><div class='del'>-			"\x10\x1b\x26\x31\x3c\x47\x52\x5d"</div><div class='del'>-			"\x68\x73\x7e\x89\x94\x9f\xaa\xb5"</div><div class='del'>-			"\xc0\xcb\xd6\xe1\xec\xf7\x02\x0d"</div><div class='del'>-			"\x18\x23\x2e\x39\x44\x4f\x5a\x65"</div><div class='del'>-			"\x70\x7b\x86\x91\x9c\xa7\xb2\xbd"</div><div class='del'>-			"\xc8\xd3\xde\xe9\xf4\xff\x0a\x15"</div><div class='del'>-			"\x20\x2b\x36\x41\x4c\x57\x62\x6d"</div><div class='del'>-			"\x78\x83\x8e\x99\xa4\xaf\xba\xc5"</div><div class='del'>-			"\xd0\xdb\xe6\xf1\xfc\x07\x12\x1d"</div><div class='del'>-			"\x28\x33\x3e\x49\x54\x5f\x6a\x75"</div><div class='del'>-			"\x80\x8b\x96\xa1\xac\xb7\xc2\xcd"</div><div class='del'>-			"\xd8\xe3\xee\xf9\x04\x0f\x1a\x25"</div><div class='del'>-			"\x30\x3b\x46\x51\x5c\x67\x72\x7d"</div><div class='del'>-			"\x88\x93\x9e\xa9\xb4\xbf\xca\xd5"</div><div class='del'>-			"\xe0\xeb\xf6\x01\x0c\x17\x22\x2d"</div><div class='del'>-			"\x38\x43\x4e\x59\x64\x6f\x7a\x85"</div><div class='del'>-			"\x90\x9b\xa6\xb1\xbc\xc7\xd2\xdd"</div><div class='del'>-			"\xe8\xf3\xfe\x09\x14\x1f\x2a\x35"</div><div class='del'>-			"\x40\x4b\x56\x61\x6c\x77\x82\x8d"</div><div class='del'>-			"\x98\xa3\xae\xb9\xc4\xcf\xda\xe5"</div><div class='del'>-			"\xf0\xfb\x06\x11\x1c\x27\x32\x3d"</div><div class='del'>-			"\x48\x53\x5e\x69\x74\x7f\x8a\x95"</div><div class='del'>-			"\xa0\xab\xb6\xc1\xcc\xd7\xe2\xed"</div><div class='del'>-			"\xf8\x03\x0e\x19\x24\x2f\x3a\x45"</div><div class='del'>-			"\x50\x5b\x66\x71\x7c\x87\x92\x9d"</div><div class='del'>-			"\xa8\xb3\xbe\xc9\xd4\xdf\xea\xf5"</div><div class='del'>-			"\x00\x0d\x1a\x27\x34\x41\x4e\x5b"</div><div class='del'>-			"\x68\x75\x82\x8f\x9c\xa9\xb6\xc3"</div><div class='del'>-			"\xd0\xdd\xea\xf7\x04\x11\x1e\x2b"</div><div class='del'>-			"\x38\x45\x52\x5f\x6c\x79\x86\x93"</div><div class='del'>-			"\xa0\xad\xba\xc7\xd4\xe1\xee\xfb"</div><div class='del'>-			"\x08\x15\x22\x2f\x3c\x49\x56\x63"</div><div class='del'>-			"\x70\x7d\x8a\x97\xa4\xb1\xbe\xcb"</div><div class='del'>-			"\xd8\xe5\xf2\xff\x0c\x19\x26\x33"</div><div class='del'>-			"\x40\x4d\x5a\x67\x74\x81\x8e\x9b"</div><div class='del'>-			"\xa8\xb5\xc2\xcf\xdc\xe9\xf6\x03"</div><div class='del'>-			"\x10\x1d\x2a\x37\x44\x51\x5e\x6b"</div><div class='del'>-			"\x78\x85\x92\x9f\xac\xb9\xc6\xd3"</div><div class='del'>-			"\xe0\xed\xfa\x07\x14\x21\x2e\x3b"</div><div class='del'>-			"\x48\x55\x62\x6f\x7c\x89\x96\xa3"</div><div class='del'>-			"\xb0\xbd\xca\xd7\xe4\xf1\xfe\x0b"</div><div class='del'>-			"\x18\x25\x32\x3f\x4c\x59\x66\x73"</div><div class='del'>-			"\x80\x8d\x9a\xa7\xb4\xc1\xce\xdb"</div><div class='del'>-			"\xe8\xf5\x02\x0f\x1c\x29\x36\x43"</div><div class='del'>-			"\x50\x5d\x6a\x77\x84\x91\x9e\xab"</div><div class='del'>-			"\xb8\xc5\xd2\xdf\xec\xf9\x06\x13"</div><div class='del'>-			"\x20\x2d\x3a\x47\x54\x61\x6e\x7b"</div><div class='del'>-			"\x88\x95\xa2\xaf\xbc\xc9\xd6\xe3"</div><div class='del'>-			"\xf0\xfd\x0a\x17\x24\x31\x3e\x4b"</div><div class='del'>-			"\x58\x65\x72\x7f\x8c\x99\xa6\xb3"</div><div class='del'>-			"\xc0\xcd\xda\xe7\xf4\x01\x0e\x1b"</div><div class='del'>-			"\x28\x35\x42\x4f\x5c\x69\x76\x83"</div><div class='del'>-			"\x90\x9d\xaa\xb7\xc4\xd1\xde\xeb"</div><div class='del'>-			"\xf8\x05\x12\x1f\x2c\x39\x46\x53"</div><div class='del'>-			"\x60\x6d\x7a\x87\x94\xa1\xae\xbb"</div><div class='del'>-			"\xc8\xd5\xe2\xef\xfc\x09\x16\x23"</div><div class='del'>-			"\x30\x3d\x4a\x57\x64\x71\x7e\x8b"</div><div class='del'>-			"\x98\xa5\xb2\xbf\xcc\xd9\xe6\xf3"</div><div class='del'>-			"\x00\x0f\x1e\x2d\x3c\x4b\x5a\x69"</div><div class='del'>-			"\x78\x87\x96\xa5\xb4\xc3\xd2\xe1"</div><div class='del'>-			"\xf0\xff\x0e\x1d\x2c\x3b\x4a\x59"</div><div class='del'>-			"\x68\x77\x86\x95\xa4\xb3\xc2\xd1"</div><div class='del'>-			"\xe0\xef\xfe\x0d\x1c\x2b\x3a\x49"</div><div class='del'>-			"\x58\x67\x76\x85\x94\xa3\xb2\xc1"</div><div class='del'>-			"\xd0\xdf\xee\xfd\x0c\x1b\x2a\x39"</div><div class='del'>-			"\x48\x57\x66\x75\x84\x93\xa2\xb1"</div><div class='del'>-			"\xc0\xcf\xde\xed\xfc\x0b\x1a\x29"</div><div class='del'>-			"\x38\x47\x56\x65\x74\x83\x92\xa1"</div><div class='del'>-			"\xb0\xbf\xce\xdd\xec\xfb\x0a\x19"</div><div class='del'>-			"\x28\x37\x46\x55\x64\x73\x82\x91"</div><div class='del'>-			"\xa0\xaf\xbe\xcd\xdc\xeb\xfa\x09"</div><div class='del'>-			"\x18\x27\x36\x45\x54\x63\x72\x81"</div><div class='del'>-			"\x90\x9f\xae\xbd\xcc\xdb\xea\xf9"</div><div class='del'>-			"\x08\x17\x26\x35\x44\x53\x62\x71"</div><div class='del'>-			"\x80\x8f\x9e\xad\xbc\xcb\xda\xe9"</div><div class='del'>-			"\xf8\x07\x16\x25\x34\x43\x52\x61"</div><div class='del'>-			"\x70\x7f\x8e\x9d\xac\xbb\xca\xd9"</div><div class='del'>-			"\xe8\xf7\x06\x15\x24\x33\x42\x51"</div><div class='del'>-			"\x60\x6f\x7e\x8d\x9c\xab\xba\xc9"</div><div class='del'>-			"\xd8\xe7\xf6\x05\x14\x23\x32\x41"</div><div class='del'>-			"\x50\x5f\x6e\x7d\x8c\x9b\xaa\xb9"</div><div class='del'>-			"\xc8\xd7\xe6\xf5\x04\x13\x22\x31"</div><div class='del'>-			"\x40\x4f\x5e\x6d\x7c\x8b\x9a\xa9"</div><div class='del'>-			"\xb8\xc7\xd6\xe5\xf4\x03\x12\x21"</div><div class='del'>-			"\x30\x3f\x4e\x5d\x6c\x7b\x8a\x99"</div><div class='del'>-			"\xa8\xb7\xc6\xd5\xe4\xf3\x02\x11"</div><div class='del'>-			"\x20\x2f\x3e\x4d\x5c\x6b\x7a\x89"</div><div class='del'>-			"\x98\xa7\xb6\xc5\xd4\xe3\xf2\x01"</div><div class='del'>-			"\x10\x1f\x2e\x3d\x4c\x5b\x6a\x79"</div><div class='del'>-			"\x88\x97\xa6\xb5\xc4\xd3\xe2\xf1"</div><div class='del'>-			"\x00\x11\x22\x33\x44\x55\x66\x77"</div><div class='del'>-			"\x88\x99\xaa\xbb\xcc\xdd\xee\xff"</div><div class='del'>-			"\x10\x21\x32\x43\x54\x65\x76\x87"</div><div class='del'>-			"\x98\xa9\xba\xcb\xdc\xed\xfe\x0f"</div><div class='del'>-			"\x20\x31\x42\x53\x64\x75\x86\x97"</div><div class='del'>-			"\xa8\xb9\xca\xdb\xec\xfd\x0e\x1f"</div><div class='del'>-			"\x30\x41\x52\x63\x74\x85\x96\xa7"</div><div class='del'>-			"\xb8\xc9\xda\xeb\xfc\x0d\x1e\x2f"</div><div class='del'>-			"\x40\x51\x62\x73\x84\x95\xa6\xb7"</div><div class='del'>-			"\xc8\xd9\xea\xfb\x0c\x1d\x2e\x3f"</div><div class='del'>-			"\x50\x61\x72\x83\x94\xa5\xb6\xc7"</div><div class='del'>-			"\xd8\xe9\xfa\x0b\x1c\x2d\x3e\x4f"</div><div class='del'>-			"\x60\x71\x82\x93\xa4\xb5\xc6\xd7"</div><div class='del'>-			"\xe8\xf9\x0a\x1b\x2c\x3d\x4e\x5f"</div><div class='del'>-			"\x70\x81\x92\xa3\xb4\xc5\xd6\xe7"</div><div class='del'>-			"\xf8\x09\x1a\x2b\x3c\x4d\x5e\x6f"</div><div class='del'>-			"\x80\x91\xa2\xb3\xc4\xd5\xe6\xf7"</div><div class='del'>-			"\x08\x19\x2a\x3b\x4c\x5d\x6e\x7f"</div><div class='del'>-			"\x90\xa1\xb2\xc3\xd4\xe5\xf6\x07"</div><div class='del'>-			"\x18\x29\x3a\x4b\x5c\x6d\x7e\x8f"</div><div class='del'>-			"\xa0\xb1\xc2\xd3\xe4\xf5\x06\x17"</div><div class='del'>-			"\x28\x39\x4a\x5b\x6c\x7d\x8e\x9f"</div><div class='del'>-			"\xb0\xc1\xd2\xe3\xf4\x05\x16\x27"</div><div class='del'>-			"\x38\x49\x5a\x6b\x7c\x8d\x9e\xaf"</div><div class='del'>-			"\xc0\xd1\xe2\xf3\x04\x15\x26\x37"</div><div class='del'>-			"\x48\x59\x6a\x7b\x8c\x9d\xae\xbf"</div><div class='del'>-			"\xd0\xe1\xf2\x03\x14\x25\x36\x47"</div><div class='del'>-			"\x58\x69\x7a\x8b\x9c\xad\xbe\xcf"</div><div class='del'>-			"\xe0\xf1\x02\x13\x24\x35\x46\x57"</div><div class='del'>-			"\x68\x79\x8a\x9b\xac\xbd\xce\xdf"</div><div class='del'>-			"\xf0\x01\x12\x23\x34\x45\x56\x67"</div><div class='del'>-			"\x78\x89\x9a\xab\xbc\xcd\xde\xef"</div><div class='del'>-			"\x00\x13\x26\x39\x4c\x5f\x72\x85"</div><div class='del'>-			"\x98\xab\xbe\xd1\xe4\xf7\x0a\x1d"</div><div class='del'>-			"\x30\x43\x56\x69\x7c\x8f\xa2\xb5"</div><div class='del'>-			"\xc8\xdb\xee\x01\x14\x27\x3a\x4d"</div><div class='del'>-			"\x60\x73\x86\x99\xac\xbf\xd2\xe5"</div><div class='del'>-			"\xf8\x0b\x1e\x31\x44\x57\x6a\x7d"</div><div class='del'>-			"\x90\xa3\xb6\xc9\xdc\xef\x02\x15"</div><div class='del'>-			"\x28\x3b\x4e\x61\x74\x87\x9a\xad"</div><div class='del'>-			"\xc0\xd3\xe6\xf9\x0c\x1f\x32\x45"</div><div class='del'>-			"\x58\x6b\x7e\x91\xa4\xb7\xca\xdd"</div><div class='del'>-			"\xf0\x03\x16\x29\x3c\x4f\x62\x75"</div><div class='del'>-			"\x88\x9b\xae\xc1\xd4\xe7\xfa\x0d"</div><div class='del'>-			"\x20\x33\x46\x59\x6c\x7f\x92\xa5"</div><div class='del'>-			"\xb8\xcb\xde\xf1\x04\x17\x2a\x3d"</div><div class='del'>-			"\x50\x63\x76\x89\x9c\xaf\xc2\xd5"</div><div class='del'>-			"\xe8\xfb\x0e\x21\x34\x47\x5a\x6d"</div><div class='del'>-			"\x80\x93\xa6\xb9\xcc\xdf\xf2\x05"</div><div class='del'>-			"\x18\x2b\x3e\x51\x64\x77\x8a\x9d"</div><div class='del'>-			"\xb0\xc3\xd6\xe9\xfc\x0f\x22\x35"</div><div class='del'>-			"\x48\x5b\x6e\x81\x94\xa7\xba\xcd"</div><div class='del'>-			"\xe0\xf3\x06\x19\x2c\x3f\x52\x65"</div><div class='del'>-			"\x78\x8b\x9e\xb1\xc4\xd7\xea\xfd"</div><div class='del'>-			"\x10\x23\x36\x49\x5c\x6f\x82\x95"</div><div class='del'>-			"\xa8\xbb\xce\xe1\xf4\x07\x1a\x2d"</div><div class='del'>-			"\x40\x53\x66\x79\x8c\x9f\xb2\xc5"</div><div class='del'>-			"\xd8\xeb\xfe\x11\x24\x37\x4a\x5d"</div><div class='del'>-			"\x70\x83\x96\xa9\xbc\xcf\xe2\xf5"</div><div class='del'>-			"\x08\x1b\x2e\x41\x54\x67\x7a\x8d"</div><div class='del'>-			"\xa0\xb3\xc6\xd9\xec\xff\x12\x25"</div><div class='del'>-			"\x38\x4b\x5e\x71\x84\x97\xaa\xbd"</div><div class='del'>-			"\xd0\xe3\xf6\x09\x1c\x2f\x42\x55"</div><div class='del'>-			"\x68\x7b\x8e\xa1\xb4\xc7\xda\xed"</div><div class='del'>-			"\x00\x15\x2a\x3f\x54\x69\x7e\x93"</div><div class='del'>-			"\xa8\xbd\xd2\xe7\xfc\x11\x26\x3b"</div><div class='del'>-			"\x50\x65\x7a\x8f\xa4\xb9\xce\xe3"</div><div class='del'>-			"\xf8\x0d\x22\x37\x4c\x61\x76\x8b"</div><div class='del'>-			"\xa0\xb5\xca\xdf\xf4\x09\x1e\x33"</div><div class='del'>-			"\x48\x5d\x72\x87\x9c\xb1\xc6\xdb"</div><div class='del'>-			"\xf0\x05\x1a\x2f\x44\x59\x6e\x83"</div><div class='del'>-			"\x98\xad\xc2\xd7\xec\x01\x16\x2b"</div><div class='del'>-			"\x40\x55\x6a\x7f\x94\xa9\xbe\xd3"</div><div class='del'>-			"\xe8\xfd\x12\x27\x3c\x51\x66\x7b"</div><div class='del'>-			"\x90\xa5\xba\xcf\xe4\xf9\x0e\x23"</div><div class='del'>-			"\x38\x4d\x62\x77\x8c\xa1\xb6\xcb"</div><div class='del'>-			"\xe0\xf5\x0a\x1f\x34\x49\x5e\x73"</div><div class='del'>-			"\x88\x9d\xb2\xc7\xdc\xf1\x06\x1b"</div><div class='del'>-			"\x30\x45\x5a\x6f\x84\x99\xae\xc3"</div><div class='del'>-			"\xd8\xed\x02\x17\x2c\x41\x56\x6b"</div><div class='del'>-			"\x80\x95\xaa\xbf\xd4\xe9\xfe\x13"</div><div class='del'>-			"\x28\x3d\x52\x67\x7c\x91\xa6\xbb"</div><div class='del'>-			"\xd0\xe5\xfa\x0f\x24\x39\x4e\x63"</div><div class='del'>-			"\x78\x8d\xa2\xb7\xcc\xe1\xf6\x0b"</div><div class='del'>-			"\x20\x35\x4a\x5f\x74\x89\x9e\xb3"</div><div class='del'>-			"\xc8\xdd\xf2\x07\x1c\x31\x46\x5b"</div><div class='del'>-			"\x70\x85\x9a\xaf\xc4\xd9\xee\x03"</div><div class='del'>-			"\x18\x2d\x42\x57\x6c\x81\x96\xab"</div><div class='del'>-			"\xc0\xd5\xea\xff\x14\x29\x3e\x53"</div><div class='del'>-			"\x68\x7d\x92\xa7\xbc\xd1\xe6\xfb"</div><div class='del'>-			"\x10\x25\x3a\x4f\x64\x79\x8e\xa3"</div><div class='del'>-			"\xb8\xcd\xe2\xf7\x0c\x21\x36\x4b"</div><div class='del'>-			"\x60\x75\x8a\x9f\xb4\xc9\xde\xf3"</div><div class='del'>-			"\x08\x1d\x32\x47\x5c\x71\x86\x9b"</div><div class='del'>-			"\xb0\xc5\xda\xef\x04\x19\x2e\x43"</div><div class='del'>-			"\x58\x6d\x82\x97\xac\xc1\xd6\xeb"</div><div class='del'>-			"\x00\x17\x2e\x45\x5c\x73\x8a\xa1"</div><div class='del'>-			"\xb8\xcf\xe6\xfd\x14\x2b\x42\x59"</div><div class='del'>-			"\x70\x87\x9e\xb5\xcc\xe3\xfa\x11"</div><div class='del'>-			"\x28\x3f\x56\x6d\x84\x9b\xb2\xc9"</div><div class='del'>-			"\xe0\xf7\x0e\x25\x3c\x53\x6a\x81"</div><div class='del'>-			"\x98\xaf\xc6\xdd\xf4\x0b\x22\x39"</div><div class='del'>-			"\x50\x67\x7e\x95\xac\xc3\xda\xf1"</div><div class='del'>-			"\x08\x1f\x36\x4d\x64\x7b\x92\xa9"</div><div class='del'>-			"\xc0\xd7\xee\x05\x1c\x33\x4a\x61"</div><div class='del'>-			"\x78\x8f\xa6\xbd\xd4\xeb\x02\x19"</div><div class='del'>-			"\x30\x47\x5e\x75\x8c\xa3\xba\xd1"</div><div class='del'>-			"\xe8\xff\x16\x2d\x44\x5b\x72\x89"</div><div class='del'>-			"\xa0\xb7\xce\xe5\xfc\x13\x2a\x41"</div><div class='del'>-			"\x58\x6f\x86\x9d\xb4\xcb\xe2\xf9"</div><div class='del'>-			"\x10\x27\x3e\x55\x6c\x83\x9a\xb1"</div><div class='del'>-			"\xc8\xdf\xf6\x0d\x24\x3b\x52\x69"</div><div class='del'>-			"\x80\x97\xae\xc5\xdc\xf3\x0a\x21"</div><div class='del'>-			"\x38\x4f\x66\x7d\x94\xab\xc2\xd9"</div><div class='del'>-			"\xf0\x07\x1e\x35\x4c\x63\x7a\x91"</div><div class='del'>-			"\xa8\xbf\xd6\xed\x04\x1b\x32\x49"</div><div class='del'>-			"\x60\x77\x8e\xa5\xbc\xd3\xea\x01"</div><div class='del'>-			"\x18\x2f\x46\x5d\x74\x8b\xa2\xb9"</div><div class='del'>-			"\xd0\xe7\xfe\x15\x2c\x43\x5a\x71"</div><div class='del'>-			"\x88\x9f\xb6\xcd\xe4\xfb\x12\x29"</div><div class='del'>-			"\x40\x57\x6e\x85\x9c\xb3\xca\xe1"</div><div class='del'>-			"\xf8\x0f\x26\x3d\x54\x6b\x82\x99"</div><div class='del'>-			"\xb0\xc7\xde\xf5\x0c\x23\x3a\x51"</div><div class='del'>-			"\x68\x7f\x96\xad\xc4\xdb\xf2\x09"</div><div class='del'>-			"\x20\x37\x4e\x65\x7c\x93\xaa\xc1"</div><div class='del'>-			"\xd8\xef\x06\x1d\x34\x4b\x62\x79"</div><div class='del'>-			"\x90\xa7\xbe\xd5\xec\x03\x1a\x31"</div><div class='del'>-			"\x48\x5f\x76\x8d\xa4\xbb\xd2\xe9"</div><div class='del'>-			"\x00\x19\x32\x4b\x64\x7d\x96\xaf"</div><div class='del'>-			"\xc8\xe1\xfa\x13\x2c\x45\x5e\x77"</div><div class='del'>-			"\x90\xa9\xc2\xdb\xf4\x0d\x26\x3f"</div><div class='del'>-			"\x58\x71\x8a\xa3\xbc\xd5\xee\x07"</div><div class='del'>-			"\x20\x39\x52\x6b\x84\x9d\xb6\xcf"</div><div class='del'>-			"\xe8\x01\x1a\x33\x4c\x65\x7e\x97"</div><div class='del'>-			"\xb0\xc9\xe2\xfb\x14\x2d\x46\x5f"</div><div class='del'>-			"\x78\x91\xaa\xc3\xdc\xf5\x0e\x27"</div><div class='del'>-			"\x40\x59\x72\x8b\xa4\xbd\xd6\xef"</div><div class='del'>-			"\x08\x21\x3a\x53\x6c\x85\x9e\xb7"</div><div class='del'>-			"\xd0\xe9\x02\x1b\x34\x4d\x66\x7f"</div><div class='del'>-			"\x98\xb1\xca\xe3\xfc\x15\x2e\x47"</div><div class='del'>-			"\x60\x79\x92\xab\xc4\xdd\xf6\x0f"</div><div class='del'>-			"\x28\x41\x5a\x73\x8c\xa5\xbe\xd7"</div><div class='del'>-			"\xf0\x09\x22\x3b\x54\x6d\x86\x9f"</div><div class='del'>-			"\xb8\xd1\xea\x03\x1c\x35\x4e\x67"</div><div class='del'>-			"\x80\x99\xb2\xcb\xe4\xfd\x16\x2f"</div><div class='del'>-			"\x48\x61\x7a\x93\xac\xc5\xde\xf7"</div><div class='del'>-			"\x10\x29\x42\x5b\x74\x8d\xa6\xbf"</div><div class='del'>-			"\xd8\xf1\x0a\x23\x3c\x55\x6e\x87"</div><div class='del'>-			"\xa0\xb9\xd2\xeb\x04\x1d\x36\x4f"</div><div class='del'>-			"\x68\x81\x9a\xb3\xcc\xe5\xfe\x17"</div><div class='del'>-			"\x30\x49\x62\x7b\x94\xad\xc6\xdf"</div><div class='del'>-			"\xf8\x11\x2a\x43\x5c\x75\x8e\xa7"</div><div class='del'>-			"\xc0\xd9\xf2\x0b\x24\x3d\x56\x6f"</div><div class='del'>-			"\x88\xa1\xba\xd3\xec\x05\x1e\x37"</div><div class='del'>-			"\x50\x69\x82\x9b\xb4\xcd\xe6\xff"</div><div class='del'>-			"\x18\x31\x4a\x63\x7c\x95\xae\xc7"</div><div class='del'>-			"\xe0\xf9\x12\x2b\x44\x5d\x76\x8f"</div><div class='del'>-			"\xa8\xc1\xda\xf3\x0c\x25\x3e\x57"</div><div class='del'>-			"\x70\x89\xa2\xbb\xd4\xed\x06\x1f"</div><div class='del'>-			"\x38\x51\x6a\x83\x9c\xb5\xce\xe7"</div><div class='del'>-			"\x00\x1b\x36\x51\x6c\x87\xa2\xbd"</div><div class='del'>-			"\xd8\xf3\x0e\x29\x44\x5f\x7a\x95"</div><div class='del'>-			"\xb0\xcb\xe6\x01\x1c\x37\x52\x6d"</div><div class='del'>-			"\x88\xa3\xbe\xd9\xf4\x0f\x2a\x45"</div><div class='del'>-			"\x60\x7b\x96\xb1\xcc\xe7\x02\x1d"</div><div class='del'>-			"\x38\x53\x6e\x89\xa4\xbf\xda\xf5"</div><div class='del'>-			"\x10\x2b\x46\x61\x7c\x97\xb2\xcd"</div><div class='del'>-			"\xe8\x03\x1e\x39\x54\x6f\x8a\xa5"</div><div class='del'>-			"\xc0\xdb\xf6\x11\x2c\x47\x62\x7d"</div><div class='del'>-			"\x98\xb3\xce\xe9\x04\x1f\x3a\x55"</div><div class='del'>-			"\x70\x8b\xa6\xc1\xdc\xf7\x12\x2d"</div><div class='del'>-			"\x48\x63\x7e\x99\xb4\xcf\xea\x05"</div><div class='del'>-			"\x20\x3b\x56\x71\x8c\xa7\xc2\xdd"</div><div class='del'>-			"\xf8\x13\x2e\x49\x64\x7f\x9a\xb5"</div><div class='del'>-			"\xd0\xeb\x06\x21\x3c\x57\x72\x8d"</div><div class='del'>-			"\xa8\xc3\xde\xf9\x14\x2f\x4a\x65"</div><div class='del'>-			"\x80\x9b\xb6\xd1\xec\x07\x22\x3d"</div><div class='del'>-			"\x58\x73\x8e\xa9\xc4\xdf\xfa\x15"</div><div class='del'>-			"\x30\x4b\x66\x81\x9c\xb7\xd2\xed"</div><div class='del'>-			"\x08\x23\x3e\x59\x74\x8f\xaa\xc5"</div><div class='del'>-			"\xe0\xfb\x16\x31\x4c\x67\x82\x9d"</div><div class='del'>-			"\xb8\xd3\xee\x09\x24\x3f\x5a\x75"</div><div class='del'>-			"\x90\xab\xc6\xe1\xfc\x17\x32\x4d"</div><div class='del'>-			"\x68\x83\x9e\xb9\xd4\xef\x0a\x25"</div><div class='del'>-			"\x40\x5b\x76\x91\xac\xc7\xe2\xfd"</div><div class='del'>-			"\x18\x33\x4e\x69\x84\x9f\xba\xd5"</div><div class='del'>-			"\xf0\x0b\x26\x41\x5c\x77\x92\xad"</div><div class='del'>-			"\xc8\xe3\xfe\x19\x34\x4f\x6a\x85"</div><div class='del'>-			"\xa0\xbb\xd6\xf1\x0c\x27\x42\x5d"</div><div class='del'>-			"\x78\x93\xae\xc9\xe4\xff\x1a\x35"</div><div class='del'>-			"\x50\x6b\x86\xa1\xbc\xd7\xf2\x0d"</div><div class='del'>-			"\x28\x43\x5e\x79\x94\xaf\xca\xe5"</div><div class='del'>-			"\x00\x1d\x3a\x57\x74\x91\xae\xcb"</div><div class='del'>-			"\xe8\x05\x22\x3f\x5c\x79\x96\xb3"</div><div class='del'>-			"\xd0\xed\x0a\x27\x44\x61\x7e\x9b"</div><div class='del'>-			"\xb8\xd5\xf2\x0f\x2c\x49\x66\x83"</div><div class='del'>-			"\xa0\xbd\xda\xf7\x14\x31\x4e\x6b"</div><div class='del'>-			"\x88\xa5\xc2\xdf\xfc\x19\x36\x53"</div><div class='del'>-			"\x70\x8d\xaa\xc7\xe4\x01\x1e\x3b"</div><div class='del'>-			"\x58\x75\x92\xaf\xcc\xe9\x06\x23"</div><div class='del'>-			"\x40\x5d\x7a\x97\xb4\xd1\xee\x0b"</div><div class='del'>-			"\x28\x45\x62\x7f\x9c\xb9\xd6\xf3"</div><div class='del'>-			"\x10\x2d\x4a\x67\x84\xa1\xbe\xdb"</div><div class='del'>-			"\xf8\x15\x32\x4f\x6c\x89\xa6\xc3"</div><div class='del'>-			"\xe0\xfd\x1a\x37\x54\x71\x8e\xab"</div><div class='del'>-			"\xc8\xe5\x02\x1f\x3c\x59\x76\x93"</div><div class='del'>-			"\xb0\xcd\xea\x07\x24\x41\x5e\x7b"</div><div class='del'>-			"\x98\xb5\xd2\xef\x0c\x29\x46\x63"</div><div class='del'>-			"\x80\x9d\xba\xd7\xf4\x11\x2e\x4b"</div><div class='del'>-			"\x68\x85\xa2\xbf\xdc\xf9\x16\x33"</div><div class='del'>-			"\x50\x6d\x8a\xa7\xc4\xe1\xfe\x1b"</div><div class='del'>-			"\x38\x55\x72\x8f\xac\xc9\xe6\x03"</div><div class='del'>-			"\x20\x3d\x5a\x77\x94\xb1\xce\xeb"</div><div class='del'>-			"\x08\x25\x42\x5f\x7c\x99\xb6\xd3"</div><div class='del'>-			"\xf0\x0d\x2a\x47\x64\x81\x9e\xbb"</div><div class='del'>-			"\xd8\xf5\x12\x2f\x4c\x69\x86\xa3"</div><div class='del'>-			"\xc0\xdd\xfa\x17\x34\x51\x6e\x8b"</div><div class='del'>-			"\xa8\xc5\xe2\xff\x1c\x39\x56\x73"</div><div class='del'>-			"\x90\xad\xca\xe7\x04\x21\x3e\x5b"</div><div class='del'>-			"\x78\x95\xb2\xcf\xec\x09\x26\x43"</div><div class='del'>-			"\x60\x7d\x9a\xb7\xd4\xf1\x0e\x2b"</div><div class='del'>-			"\x48\x65\x82\x9f\xbc\xd9\xf6\x13"</div><div class='del'>-			"\x30\x4d\x6a\x87\xa4\xc1\xde\xfb"</div><div class='del'>-			"\x18\x35\x52\x6f\x8c\xa9\xc6\xe3"</div><div class='del'>-			"\x00\x1f\x3e\x5d\x7c\x9b\xba\xd9"</div><div class='del'>-			"\xf8\x17\x36\x55\x74\x93\xb2\xd1"</div><div class='del'>-			"\xf0\x0f\x2e\x4d\x6c\x8b\xaa\xc9"</div><div class='del'>-			"\xe8\x07\x26\x45\x64\x83\xa2\xc1"</div><div class='del'>-			"\xe0\xff\x1e\x3d\x5c\x7b\x9a\xb9"</div><div class='del'>-			"\xd8\xf7\x16\x35\x54\x73\x92\xb1"</div><div class='del'>-			"\xd0\xef\x0e\x2d\x4c\x6b\x8a\xa9"</div><div class='del'>-			"\xc8\xe7\x06\x25\x44\x63\x82\xa1"</div><div class='del'>-			"\xc0\xdf\xfe\x1d\x3c\x5b\x7a\x99"</div><div class='del'>-			"\xb8\xd7\xf6\x15\x34\x53\x72\x91"</div><div class='del'>-			"\xb0\xcf\xee\x0d\x2c\x4b\x6a\x89"</div><div class='del'>-			"\xa8\xc7\xe6\x05\x24\x43\x62\x81"</div><div class='del'>-			"\xa0\xbf\xde\xfd\x1c\x3b\x5a\x79"</div><div class='del'>-			"\x98\xb7\xd6\xf5\x14\x33\x52\x71"</div><div class='del'>-			"\x90\xaf\xce\xed\x0c\x2b\x4a\x69"</div><div class='del'>-			"\x88\xa7\xc6\xe5\x04\x23\x42\x61"</div><div class='del'>-			"\x80\x9f\xbe\xdd\xfc\x1b\x3a\x59"</div><div class='del'>-			"\x78\x97\xb6\xd5\xf4\x13\x32\x51"</div><div class='del'>-			"\x70\x8f\xae\xcd\xec\x0b\x2a\x49"</div><div class='del'>-			"\x68\x87\xa6\xc5\xe4\x03\x22\x41"</div><div class='del'>-			"\x60\x7f\x9e\xbd\xdc\xfb\x1a\x39"</div><div class='del'>-			"\x58\x77\x96\xb5\xd4\xf3\x12\x31"</div><div class='del'>-			"\x50\x6f\x8e\xad\xcc\xeb\x0a\x29"</div><div class='del'>-			"\x48\x67\x86\xa5\xc4\xe3\x02\x21"</div><div class='del'>-			"\x40\x5f\x7e\x9d\xbc\xdb\xfa\x19"</div><div class='del'>-			"\x38\x57\x76\x95\xb4\xd3\xf2\x11"</div><div class='del'>-			"\x30\x4f\x6e\x8d\xac\xcb\xea\x09"</div><div class='del'>-			"\x28\x47\x66\x85\xa4\xc3\xe2\x01"</div><div class='del'>-			"\x20\x3f\x5e\x7d\x9c\xbb\xda\xf9"</div><div class='del'>-			"\x18\x37\x56\x75\x94\xb3\xd2\xf1"</div><div class='del'>-			"\x10\x2f\x4e\x6d\x8c\xab\xca\xe9"</div><div class='del'>-			"\x08\x27\x46\x65\x84\xa3\xc2\xe1"</div><div class='del'>-			"\x00\x21\x42\x63",</div><div class='del'>-		.ilen = 4100,</div><div class='del'>-		.result =</div><div class='del'>-			"\xf0\x5c\x74\xad\x4e\xbc\x99\xe2"</div><div class='del'>-			"\xae\xff\x91\x3a\x44\xcf\x38\x32"</div><div class='del'>-			"\x1e\xad\xa7\xcd\xa1\x39\x95\xaa"</div><div class='del'>-			"\x10\xb1\xb3\x2e\x04\x31\x8f\x86"</div><div class='del'>-			"\xf2\x62\x74\x70\x0c\xa4\x46\x08"</div><div class='del'>-			"\xa8\xb7\x99\xa8\xe9\xd2\x73\x79"</div><div class='del'>-			"\x7e\x6e\xd4\x8f\x1e\xc7\x8e\x31"</div><div class='del'>-			"\x0b\xfa\x4b\xce\xfd\xf3\x57\x71"</div><div class='del'>-			"\xe9\x46\x03\xa5\x3d\x34\x00\xe2"</div><div class='del'>-			"\x18\xff\x75\x6d\x06\x2d\x00\xab"</div><div class='del'>-			"\xb9\x3e\x6c\x59\xc5\x84\x06\xb5"</div><div class='del'>-			"\x8b\xd0\x89\x9c\x4a\x79\x16\xc6"</div><div class='del'>-			"\x3d\x74\x54\xfa\x44\xcd\x23\x26"</div><div class='del'>-			"\x5c\xcf\x7e\x28\x92\x32\xbf\xdf"</div><div class='del'>-			"\xa7\x20\x3c\x74\x58\x2a\x9a\xde"</div><div class='del'>-			"\x61\x00\x1c\x4f\xff\x59\xc4\x22"</div><div class='del'>-			"\xac\x3c\xd0\xe8\x6c\xf9\x97\x1b"</div><div class='del'>-			"\x58\x9b\xad\x71\xe8\xa9\xb5\x0d"</div><div class='del'>-			"\xee\x2f\x04\x1f\x7f\xbc\x99\xee"</div><div class='del'>-			"\x84\xff\x42\x60\xdc\x3a\x18\xa5"</div><div class='del'>-			"\x81\xf9\xef\xdc\x7a\x0f\x65\x41"</div><div class='del'>-			"\x2f\xa3\xd3\xf9\xc2\xcb\xc0\x4d"</div><div class='del'>-			"\x8f\xd3\x76\x96\xad\x49\x6d\x38"</div><div class='del'>-			"\x3d\x39\x0b\x6c\x80\xb7\x54\x69"</div><div class='del'>-			"\xf0\x2c\x90\x02\x29\x0d\x1c\x12"</div><div class='del'>-			"\xad\x55\xc3\x8b\x68\xd9\xcc\xb3"</div><div class='del'>-			"\xb2\x64\x33\x90\x5e\xca\x4b\xe2"</div><div class='del'>-			"\xfb\x75\xdc\x63\xf7\x9f\x82\x74"</div><div class='del'>-			"\xf0\xc9\xaa\x7f\xe9\x2a\x9b\x33"</div><div class='del'>-			"\xbc\x88\x00\x7f\xca\xb2\x1f\x14"</div><div class='del'>-			"\xdb\xc5\x8e\x7b\x11\x3c\x3e\x08"</div><div class='del'>-			"\xf3\x83\xe8\xe0\x94\x86\x2e\x92"</div><div class='del'>-			"\x78\x6b\x01\xc9\xc7\x83\xba\x21"</div><div class='del'>-			"\x6a\x25\x15\x33\x4e\x45\x08\xec"</div><div class='del'>-			"\x35\xdb\xe0\x6e\x31\x51\x79\xa9"</div><div class='del'>-			"\x42\x44\x65\xc1\xa0\xf1\xf9\x2a"</div><div class='del'>-			"\x70\xd5\xb6\xc6\xc1\x8c\x39\xfc"</div><div class='del'>-			"\x25\xa6\x55\xd9\xdd\x2d\x4c\xec"</div><div class='del'>-			"\x49\xc6\xeb\x0e\xa8\x25\x2a\x16"</div><div class='del'>-			"\x1b\x66\x84\xda\xe2\x92\xe5\xc0"</div><div class='del'>-			"\xc8\x53\x07\xaf\x80\x84\xec\xfd"</div><div class='del'>-			"\xcd\xd1\x6e\xcd\x6f\x6a\xf5\x36"</div><div class='del'>-			"\xc5\x15\xe5\x25\x7d\x77\xd1\x1a"</div><div class='del'>-			"\x93\x36\xa9\xcf\x7c\xa4\x54\x4a"</div><div class='del'>-			"\x06\x51\x48\x4e\xf6\x59\x87\xd2"</div><div class='del'>-			"\x04\x02\xef\xd3\x44\xde\x76\x31"</div><div class='del'>-			"\xb3\x34\x17\x1b\x9d\x66\x11\x9f"</div><div class='del'>-			"\x1e\xcc\x17\xe9\xc7\x3c\x1b\xe7"</div><div class='del'>-			"\xcb\x50\x08\xfc\xdc\x2b\x24\xdb"</div><div class='del'>-			"\x65\x83\xd0\x3b\xe3\x30\xea\x94"</div><div class='del'>-			"\x6c\xe7\xe8\x35\x32\xc7\xdb\x64"</div><div class='del'>-			"\xb4\x01\xab\x36\x2c\x77\x13\xaf"</div><div class='del'>-			"\xf8\x2b\x88\x3f\x54\x39\xc4\x44"</div><div class='del'>-			"\xfe\xef\x6f\x68\x34\xbe\x0f\x05"</div><div class='del'>-			"\x16\x6d\xf6\x0a\x30\xe7\xe3\xed"</div><div class='del'>-			"\xc4\xde\x3c\x1b\x13\xd8\xdb\xfe"</div><div class='del'>-			"\x41\x62\xe5\x28\xd4\x8d\xa3\xc7"</div><div class='del'>-			"\x93\x97\xc6\x48\x45\x1d\x9f\x83"</div><div class='del'>-			"\xdf\x4b\x40\x3e\x42\x25\x87\x80"</div><div class='del'>-			"\x4c\x7d\xa8\xd4\x98\x23\x95\x75"</div><div class='del'>-			"\x41\x8c\xda\x41\x9b\xd4\xa7\x06"</div><div class='del'>-			"\xb5\xf1\x71\x09\x53\xbe\xca\xbf"</div><div class='del'>-			"\x32\x03\xed\xf0\x50\x1c\x56\x39"</div><div class='del'>-			"\x5b\xa4\x75\x18\xf7\x9b\x58\xef"</div><div class='del'>-			"\x53\xfc\x2a\x38\x23\x15\x75\xcd"</div><div class='del'>-			"\x45\xe5\x5a\x82\x55\xba\x21\xfa"</div><div class='del'>-			"\xd4\xbd\xc6\x94\x7c\xc5\x80\x12"</div><div class='del'>-			"\xf7\x4b\x32\xc4\x9a\x82\xd8\x28"</div><div class='del'>-			"\x8f\xd9\xc2\x0f\x60\x03\xbe\x5e"</div><div class='del'>-			"\x21\xd6\x5f\x58\xbf\x5c\xb1\x32"</div><div class='del'>-			"\x82\x8d\xa9\xe5\xf2\x66\x1a\xc0"</div><div class='del'>-			"\xa0\xbc\x58\x2f\x71\xf5\x2f\xed"</div><div class='del'>-			"\xd1\x26\xb9\xd8\x49\x5a\x07\x19"</div><div class='del'>-			"\x01\x7c\x59\xb0\xf8\xa4\xb7\xd3"</div><div class='del'>-			"\x7b\x1a\x8c\x38\xf4\x50\xa4\x59"</div><div class='del'>-			"\xb0\xcc\x41\x0b\x88\x7f\xe5\x31"</div><div class='del'>-			"\xb3\x42\xba\xa2\x7e\xd4\x32\x71"</div><div class='del'>-			"\x45\x87\x48\xa9\xc2\xf2\x89\xb3"</div><div class='del'>-			"\xe4\xa7\x7e\x52\x15\x61\xfa\xfe"</div><div class='del'>-			"\xc9\xdd\x81\xeb\x13\xab\xab\xc3"</div><div class='del'>-			"\x98\x59\xd8\x16\x3d\x14\x7a\x1c"</div><div class='del'>-			"\x3c\x41\x9a\x16\x16\x9b\xd2\xd2"</div><div class='del'>-			"\x69\x3a\x29\x23\xac\x86\x32\xa5"</div><div class='del'>-			"\x48\x9c\x9e\xf3\x47\x77\x81\x70"</div><div class='del'>-			"\x24\xe8\x85\xd2\xf5\xb5\xfa\xff"</div><div class='del'>-			"\x59\x6a\xd3\x50\x59\x43\x59\xde"</div><div class='del'>-			"\xd9\xf1\x55\xa5\x0c\xc3\x1a\x1a"</div><div class='del'>-			"\x18\x34\x0d\x1a\x63\x33\xed\x10"</div><div class='del'>-			"\xe0\x1d\x2a\x18\xd2\xc0\x54\xa8"</div><div class='del'>-			"\xca\xb5\x9a\xd3\xdd\xca\x45\x84"</div><div class='del'>-			"\x50\xe7\x0f\xfe\xa4\x99\x5a\xbe"</div><div class='del'>-			"\x43\x2d\x9a\xcb\x92\x3f\x5a\x1d"</div><div class='del'>-			"\x85\xd8\xc9\xdf\x68\xc9\x12\x80"</div><div class='del'>-			"\x56\x0c\xdc\x00\xdc\x3a\x7d\x9d"</div><div class='del'>-			"\xa3\xa2\xe8\x4d\xbf\xf9\x70\xa0"</div><div class='del'>-			"\xa4\x13\x4f\x6b\xaf\x0a\x89\x7f"</div><div class='del'>-			"\xda\xf0\xbf\x9b\xc8\x1d\xe5\xf8"</div><div class='del'>-			"\x2e\x8b\x07\xb5\x73\x1b\xcc\xa2"</div><div class='del'>-			"\xa6\xad\x30\xbc\x78\x3c\x5b\x10"</div><div class='del'>-			"\xfa\x5e\x62\x2d\x9e\x64\xb3\x33"</div><div class='del'>-			"\xce\xf9\x1f\x86\xe7\x8b\xa2\xb8"</div><div class='del'>-			"\xe8\x99\x57\x8c\x11\xed\x66\xd9"</div><div class='del'>-			"\x3c\x72\xb9\xc3\xe6\x4e\x17\x3a"</div><div class='del'>-			"\x6a\xcb\x42\x24\x06\xed\x3e\x4e"</div><div class='del'>-			"\xa3\xe8\x6a\x94\xda\x0d\x4e\xd5"</div><div class='del'>-			"\x14\x19\xcf\xb6\x26\xd8\x2e\xcc"</div><div class='del'>-			"\x64\x76\x38\x49\x4d\xfe\x30\x6d"</div><div class='del'>-			"\xe4\xc8\x8c\x7b\xc4\xe0\x35\xba"</div><div class='del'>-			"\x22\x6e\x76\xe1\x1a\xf2\x53\xc3"</div><div class='del'>-			"\x28\xa2\x82\x1f\x61\x69\xad\xc1"</div><div class='del'>-			"\x7b\x28\x4b\x1e\x6c\x85\x95\x9b"</div><div class='del'>-			"\x51\xb5\x17\x7f\x12\x69\x8c\x24"</div><div class='del'>-			"\xd5\xc7\x5a\x5a\x11\x54\xff\x5a"</div><div class='del'>-			"\xf7\x16\xc3\x91\xa6\xf0\xdc\x0a"</div><div class='del'>-			"\xb6\xa7\x4a\x0d\x7a\x58\xfe\xa5"</div><div class='del'>-			"\xf5\xcb\x8f\x7b\x0e\xea\x57\xe7"</div><div class='del'>-			"\xbd\x79\xd6\x1c\x88\x23\x6c\xf2"</div><div class='del'>-			"\x4d\x29\x77\x53\x35\x6a\x00\x8d"</div><div class='del'>-			"\xcd\xa3\x58\xbe\x77\x99\x18\xf8"</div><div class='del'>-			"\xe6\xe1\x8f\xe9\x37\x8f\xe3\xe2"</div><div class='del'>-			"\x5a\x8a\x93\x25\xaf\xf3\x78\x80"</div><div class='del'>-			"\xbe\xa6\x1b\xc6\xac\x8b\x1c\x91"</div><div class='del'>-			"\x58\xe1\x9f\x89\x35\x9d\x1d\x21"</div><div class='del'>-			"\x29\x9f\xf4\x99\x02\x27\x0f\xa8"</div><div class='del'>-			"\x4f\x79\x94\x2b\x33\x2c\xda\xa2"</div><div class='del'>-			"\x26\x39\x83\x94\xef\x27\xd8\x53"</div><div class='del'>-			"\x8f\x66\x0d\xe4\x41\x7d\x34\xcd"</div><div class='del'>-			"\x43\x7c\x95\x0a\x53\xef\x66\xda"</div><div class='del'>-			"\x7e\x9b\xf3\x93\xaf\xd0\x73\x71"</div><div class='del'>-			"\xba\x40\x9b\x74\xf8\xd7\xd7\x41"</div><div class='del'>-			"\x6d\xaf\x72\x9c\x8d\x21\x87\x3c"</div><div class='del'>-			"\xfd\x0a\x90\xa9\x47\x96\x9e\xd3"</div><div class='del'>-			"\x88\xee\x73\xcf\x66\x2f\x52\x56"</div><div class='del'>-			"\x6d\xa9\x80\x4c\xe2\x6f\x62\x88"</div><div class='del'>-			"\x3f\x0e\x54\x17\x48\x80\x5d\xd3"</div><div class='del'>-			"\xc3\xda\x25\x3d\xa1\xc8\xcb\x9f"</div><div class='del'>-			"\x9b\x70\xb3\xa1\xeb\x04\x52\xa1"</div><div class='del'>-			"\xf2\x22\x0f\xfc\xc8\x18\xfa\xf9"</div><div class='del'>-			"\x85\x9c\xf1\xac\xeb\x0c\x02\x46"</div><div class='del'>-			"\x75\xd2\xf5\x2c\xe3\xd2\x59\x94"</div><div class='del'>-			"\x12\xf3\x3c\xfc\xd7\x92\xfa\x36"</div><div class='del'>-			"\xba\x61\x34\x38\x7c\xda\x48\x3e"</div><div class='del'>-			"\x08\xc9\x39\x23\x5e\x02\x2c\x1a"</div><div class='del'>-			"\x18\x7e\xb4\xd9\xfd\x9e\x40\x02"</div><div class='del'>-			"\xb1\x33\x37\x32\xe7\xde\xd6\xd0"</div><div class='del'>-			"\x7c\x58\x65\x4b\xf8\x34\x27\x9c"</div><div class='del'>-			"\x44\xb4\xbd\xe9\xe9\x4c\x78\x7d"</div><div class='del'>-			"\x4b\x9f\xce\xb1\xcd\x47\xa5\x37"</div><div class='del'>-			"\xe5\x6d\xbd\xb9\x43\x94\x0a\xd4"</div><div class='del'>-			"\xd6\xf9\x04\x5f\xb5\x66\x6c\x1a"</div><div class='del'>-			"\x35\x12\xe3\x36\x28\x27\x36\x58"</div><div class='del'>-			"\x01\x2b\x79\xe4\xba\x6d\x10\x7d"</div><div class='del'>-			"\x65\xdf\x84\x95\xf4\xd5\xb6\x8f"</div><div class='del'>-			"\x2b\x9f\x96\x00\x86\x60\xf0\x21"</div><div class='del'>-			"\x76\xa8\x6a\x8c\x28\x1c\xb3\x6b"</div><div class='del'>-			"\x97\xd7\xb6\x53\x2a\xcc\xab\x40"</div><div class='del'>-			"\x9d\x62\x79\x58\x52\xe6\x65\xb7"</div><div class='del'>-			"\xab\x55\x67\x9c\x89\x7c\x03\xb0"</div><div class='del'>-			"\x73\x59\xc5\x81\xf5\x18\x17\x5c"</div><div class='del'>-			"\x89\xf3\x78\x35\x44\x62\x78\x72"</div><div class='del'>-			"\xd0\x96\xeb\x31\xe7\x87\x77\x14"</div><div class='del'>-			"\x99\x51\xf2\x59\x26\x9e\xb5\xa6"</div><div class='del'>-			"\x45\xfe\x6e\xbd\x07\x4c\x94\x5a"</div><div class='del'>-			"\xa5\x7d\xfc\xf1\x2b\x77\xe2\xfe"</div><div class='del'>-			"\x17\xd4\x84\xa0\xac\xb5\xc7\xda"</div><div class='del'>-			"\xa9\x1a\xb6\xf3\x74\x11\xb4\x9d"</div><div class='del'>-			"\xfb\x79\x2e\x04\x2d\x50\x28\x83"</div><div class='del'>-			"\xbf\xc6\x52\xd3\x34\xd6\xe8\x7a"</div><div class='del'>-			"\xb6\xea\xe7\xa8\x6c\x15\x1e\x2c"</div><div class='del'>-			"\x57\xbc\x48\x4e\x5f\x5c\xb6\x92"</div><div class='del'>-			"\xd2\x49\x77\x81\x6d\x90\x70\xae"</div><div class='del'>-			"\x98\xa1\x03\x0d\x6b\xb9\x77\x14"</div><div class='del'>-			"\xf1\x4e\x23\xd3\xf8\x68\xbd\xc2"</div><div class='del'>-			"\xfe\x04\xb7\x5c\xc5\x17\x60\x8f"</div><div class='del'>-			"\x65\x54\xa4\x7a\x42\xdc\x18\x0d"</div><div class='del'>-			"\xb5\xcf\x0f\xd3\xc7\x91\x66\x1b"</div><div class='del'>-			"\x45\x42\x27\x75\x50\xe5\xee\xb8"</div><div class='del'>-			"\x7f\x33\x2c\xba\x4a\x92\x4d\x2c"</div><div class='del'>-			"\x3c\xe3\x0d\x80\x01\xba\x0d\x29"</div><div class='del'>-			"\xd8\x3c\xe9\x13\x16\x57\xe6\xea"</div><div class='del'>-			"\x94\x52\xe7\x00\x4d\x30\xb0\x0f"</div><div class='del'>-			"\x35\xb8\xb8\xa7\xb1\xb5\x3b\x44"</div><div class='del'>-			"\xe1\x2f\xfd\x88\xed\x43\xe7\x52"</div><div class='del'>-			"\x10\x93\xb3\x8a\x30\x6b\x0a\xf7"</div><div class='del'>-			"\x23\xc6\x50\x9d\x4a\xb0\xde\xc3"</div><div class='del'>-			"\xdc\x9b\x2f\x01\x56\x36\x09\xc5"</div><div class='del'>-			"\x2f\x6b\xfe\xf1\xd8\x27\x45\x03"</div><div class='del'>-			"\x30\x5e\x5c\x5b\xb4\x62\x0e\x1a"</div><div class='del'>-			"\xa9\x21\x2b\x92\x94\x87\x62\x57"</div><div class='del'>-			"\x4c\x10\x74\x1a\xf1\x0a\xc5\x84"</div><div class='del'>-			"\x3b\x9e\x72\x02\xd7\xcc\x09\x56"</div><div class='del'>-			"\xbd\x54\xc1\xf0\xc3\xe3\xb3\xf8"</div><div class='del'>-			"\xd2\x0d\x61\xcb\xef\xce\x0d\x05"</div><div class='del'>-			"\xb0\x98\xd9\x8e\x4f\xf9\xbc\x93"</div><div class='del'>-			"\xa6\xea\xc8\xcf\x10\x53\x4b\xf1"</div><div class='del'>-			"\xec\xfc\x89\xf9\x64\xb0\x22\xbf"</div><div class='del'>-			"\x9e\x55\x46\x9f\x7c\x50\x8e\x84"</div><div class='del'>-			"\x54\x20\x98\xd7\x6c\x40\x1e\xdb"</div><div class='del'>-			"\x69\x34\x78\x61\x24\x21\x9c\x8a"</div><div class='del'>-			"\xb3\x62\x31\x8b\x6e\xf5\x2a\x35"</div><div class='del'>-			"\x86\x13\xb1\x6c\x64\x2e\x41\xa5"</div><div class='del'>-			"\x05\xf2\x42\xba\xd2\x3a\x0d\x8e"</div><div class='del'>-			"\x8a\x59\x94\x3c\xcf\x36\x27\x82"</div><div class='del'>-			"\xc2\x45\xee\x58\xcd\x88\xb4\xec"</div><div class='del'>-			"\xde\xb2\x96\x0a\xaf\x38\x6f\x88"</div><div class='del'>-			"\xd7\xd8\xe1\xdf\xb9\x96\xa9\x0a"</div><div class='del'>-			"\xb1\x95\x28\x86\x20\xe9\x17\x49"</div><div class='del'>-			"\xa2\x29\x38\xaa\xa5\xe9\x6e\xf1"</div><div class='del'>-			"\x19\x27\xc0\xd5\x2a\x22\xc3\x0b"</div><div class='del'>-			"\xdb\x7c\x73\x10\xb9\xba\x89\x76"</div><div class='del'>-			"\x54\xae\x7d\x71\xb3\x93\xf6\x32"</div><div class='del'>-			"\xe6\x47\x43\x55\xac\xa0\x0d\xc2"</div><div class='del'>-			"\x93\x27\x4a\x8e\x0e\x74\x15\xc7"</div><div class='del'>-			"\x0b\x85\xd9\x0c\xa9\x30\x7a\x3e"</div><div class='del'>-			"\xea\x8f\x85\x6d\x3a\x12\x4f\x72"</div><div class='del'>-			"\x69\x58\x7a\x80\xbb\xb5\x97\xf3"</div><div class='del'>-			"\xcf\x70\xd2\x5d\xdd\x4d\x21\x79"</div><div class='del'>-			"\x54\x4d\xe4\x05\xe8\xbd\xc2\x62"</div><div class='del'>-			"\xb1\x3b\x77\x1c\xd6\x5c\xf3\xa0"</div><div class='del'>-			"\x79\x00\xa8\x6c\x29\xd9\x18\x24"</div><div class='del'>-			"\x36\xa2\x46\xc0\x96\x65\x7f\xbd"</div><div class='del'>-			"\x2a\xed\x36\x16\x0c\xaa\x9f\xf4"</div><div class='del'>-			"\xc5\xb4\xe2\x12\xed\x69\xed\x4f"</div><div class='del'>-			"\x26\x2c\x39\x52\x89\x98\xe7\x2c"</div><div class='del'>-			"\x99\xa4\x9e\xa3\x9b\x99\x46\x7a"</div><div class='del'>-			"\x3a\xdc\xa8\x59\xa3\xdb\xc3\x3b"</div><div class='del'>-			"\x95\x0d\x3b\x09\x6e\xee\x83\x5d"</div><div class='del'>-			"\x32\x4d\xed\xab\xfa\x98\x14\x4e"</div><div class='del'>-			"\xc3\x15\x45\x53\x61\xc4\x93\xbd"</div><div class='del'>-			"\x90\xf4\x99\x95\x4c\xe6\x76\x92"</div><div class='del'>-			"\x29\x90\x46\x30\x92\x69\x7d\x13"</div><div class='del'>-			"\xf2\xa5\xcd\x69\x49\x44\xb2\x0f"</div><div class='del'>-			"\x63\x40\x36\x5f\x09\xe2\x78\xf8"</div><div class='del'>-			"\x91\xe3\xe2\xfa\x10\xf7\xc8\x24"</div><div class='del'>-			"\xa8\x89\x32\x5c\x37\x25\x1d\xb2"</div><div class='del'>-			"\xea\x17\x8a\x0a\xa9\x64\xc3\x7c"</div><div class='del'>-			"\x3c\x7c\xbd\xc6\x79\x34\xe7\xe2"</div><div class='del'>-			"\x85\x8e\xbf\xf8\xde\x92\xa0\xae"</div><div class='del'>-			"\x20\xc4\xf6\xbb\x1f\x38\x19\x0e"</div><div class='del'>-			"\xe8\x79\x9c\xa1\x23\xe9\x54\x7e"</div><div class='del'>-			"\x37\x2f\xe2\x94\x32\xaf\xa0\x23"</div><div class='del'>-			"\x49\xe4\xc0\xb3\xac\x00\x8f\x36"</div><div class='del'>-			"\x05\xc4\xa6\x96\xec\x05\x98\x4f"</div><div class='del'>-			"\x96\x67\x57\x1f\x20\x86\x1b\x2d"</div><div class='del'>-			"\x69\xe4\x29\x93\x66\x5f\xaf\x6b"</div><div class='del'>-			"\x88\x26\x2c\x67\x02\x4b\x52\xd0"</div><div class='del'>-			"\x83\x7a\x43\x1f\xc0\x71\x15\x25"</div><div class='del'>-			"\x77\x65\x08\x60\x11\x76\x4c\x8d"</div><div class='del'>-			"\xed\xa9\x27\xc6\xb1\x2a\x2c\x6a"</div><div class='del'>-			"\x4a\x97\xf5\xc6\xb7\x70\x42\xd3"</div><div class='del'>-			"\x03\xd1\x24\x95\xec\x6d\xab\x38"</div><div class='del'>-			"\x72\xce\xe2\x8b\x33\xd7\x51\x09"</div><div class='del'>-			"\xdc\x45\xe0\x09\x96\x32\xf3\xc4"</div><div class='del'>-			"\x84\xdc\x73\x73\x2d\x1b\x11\x98"</div><div class='del'>-			"\xc5\x0e\x69\x28\x94\xc7\xb5\x4d"</div><div class='del'>-			"\xc8\x8a\xd0\xaa\x13\x2e\x18\x74"</div><div class='del'>-			"\xdd\xd1\x1e\xf3\x90\xe8\xfc\x9a"</div><div class='del'>-			"\x72\x4a\x0e\xd1\xe4\xfb\x0d\x96"</div><div class='del'>-			"\xd1\x0c\x79\x85\x1b\x1c\xfe\xe1"</div><div class='del'>-			"\x62\x8f\x7a\x73\x32\xab\xc8\x18"</div><div class='del'>-			"\x69\xe3\x34\x30\xdf\x13\xa6\xe5"</div><div class='del'>-			"\xe8\x0e\x67\x7f\x81\x11\xb4\x60"</div><div class='del'>-			"\xc7\xbd\x79\x65\x50\xdc\xc4\x5b"</div><div class='del'>-			"\xde\x39\xa4\x01\x72\x63\xf3\xd1"</div><div class='del'>-			"\x64\x4e\xdf\xfc\x27\x92\x37\x0d"</div><div class='del'>-			"\x57\xcd\x11\x4f\x11\x04\x8e\x1d"</div><div class='del'>-			"\x16\xf7\xcd\x92\x9a\x99\x30\x14"</div><div class='del'>-			"\xf1\x7c\x67\x1b\x1f\x41\x0b\xe8"</div><div class='del'>-			"\x32\xe8\xb8\xc1\x4f\x54\x86\x4f"</div><div class='del'>-			"\xe5\x79\x81\x73\xcd\x43\x59\x68"</div><div class='del'>-			"\x73\x02\x3b\x78\x21\x72\x43\x00"</div><div class='del'>-			"\x49\x17\xf7\x00\xaf\x68\x24\x53"</div><div class='del'>-			"\x05\x0a\xc3\x33\xe0\x33\x3f\x69"</div><div class='del'>-			"\xd2\x84\x2f\x0b\xed\xde\x04\xf4"</div><div class='del'>-			"\x11\x94\x13\x69\x51\x09\x28\xde"</div><div class='del'>-			"\x57\x5c\xef\xdc\x9a\x49\x1c\x17"</div><div class='del'>-			"\x97\xf3\x96\xc1\x7f\x5d\x2e\x7d"</div><div class='del'>-			"\x55\xb8\xb3\x02\x09\xb3\x1f\xe7"</div><div class='del'>-			"\xc9\x8d\xa3\x36\x34\x8a\x77\x13"</div><div class='del'>-			"\x30\x63\x4c\xa5\xcd\xc3\xe0\x7e"</div><div class='del'>-			"\x05\xa1\x7b\x0c\xcb\x74\x47\x31"</div><div class='del'>-			"\x62\x03\x43\xf1\x87\xb4\xb0\x85"</div><div class='del'>-			"\x87\x8e\x4b\x25\xc7\xcf\xae\x4b"</div><div class='del'>-			"\x36\x46\x3e\x62\xbc\x6f\xeb\x5f"</div><div class='del'>-			"\x73\xac\xe6\x07\xee\xc1\xa1\xd6"</div><div class='del'>-			"\xc4\xab\xc9\xd6\x89\x45\xe1\xf1"</div><div class='del'>-			"\x04\x4e\x1a\x6f\xbb\x4f\x3a\xa3"</div><div class='del'>-			"\xa0\xcb\xa3\x0a\xd8\x71\x35\x55"</div><div class='del'>-			"\xe4\xbc\x2e\x04\x06\xe6\xff\x5b"</div><div class='del'>-			"\x1c\xc0\x11\x7c\xc5\x17\xf3\x38"</div><div class='del'>-			"\xcf\xe9\xba\x0f\x0e\xef\x02\xc2"</div><div class='del'>-			"\x8d\xc6\xbc\x4b\x67\x20\x95\xd7"</div><div class='del'>-			"\x2c\x45\x5b\x86\x44\x8c\x6f\x2e"</div><div class='del'>-			"\x7e\x9f\x1c\x77\xba\x6b\x0e\xa3"</div><div class='del'>-			"\x69\xdc\xab\x24\x57\x60\x47\xc1"</div><div class='del'>-			"\xd1\xa5\x9d\x23\xe6\xb1\x37\xfe"</div><div class='del'>-			"\x93\xd2\x4c\x46\xf9\x0c\xc6\xfb"</div><div class='del'>-			"\xd6\x9d\x99\x69\xab\x7a\x07\x0c"</div><div class='del'>-			"\x65\xe7\xc4\x08\x96\xe2\xa5\x01"</div><div class='del'>-			"\x3f\x46\x07\x05\x7e\xe8\x9a\x90"</div><div class='del'>-			"\x50\xdc\xe9\x7a\xea\xa1\x39\x6e"</div><div class='del'>-			"\x66\xe4\x6f\xa5\x5f\xb2\xd9\x5b"</div><div class='del'>-			"\xf5\xdb\x2a\x32\xf0\x11\x6f\x7c"</div><div class='del'>-			"\x26\x10\x8f\x3d\x80\xe9\x58\xf7"</div><div class='del'>-			"\xe0\xa8\x57\xf8\xdb\x0e\xce\x99"</div><div class='del'>-			"\x63\x19\x3d\xd5\xec\x1b\x77\x69"</div><div class='del'>-			"\x98\xf6\xe4\x5f\x67\x17\x4b\x09"</div><div class='del'>-			"\x85\x62\x82\x70\x18\xe2\x9a\x78"</div><div class='del'>-			"\xe2\x62\xbd\xb4\xf1\x42\xc6\xfb"</div><div class='del'>-			"\x08\xd0\xbd\xeb\x4e\x09\xf2\xc8"</div><div class='del'>-			"\x1e\xdc\x3d\x32\x21\x56\x9c\x4f"</div><div class='del'>-			"\x35\xf3\x61\x06\x72\x84\xc4\x32"</div><div class='del'>-			"\xf2\xf1\xfa\x0b\x2f\xc3\xdb\x02"</div><div class='del'>-			"\x04\xc2\xde\x57\x64\x60\x8d\xcf"</div><div class='del'>-			"\xcb\x86\x5d\x97\x3e\xb1\x9c\x01"</div><div class='del'>-			"\xd6\x28\x8f\x99\xbc\x46\xeb\x05"</div><div class='del'>-			"\xaf\x7e\xb8\x21\x2a\x56\x85\x1c"</div><div class='del'>-			"\xb3\x71\xa0\xde\xca\x96\xf1\x78"</div><div class='del'>-			"\x49\xa2\x99\x81\x80\x5c\x01\xf5"</div><div class='del'>-			"\xa0\xa2\x56\x63\xe2\x70\x07\xa5"</div><div class='del'>-			"\x95\xd6\x85\xeb\x36\x9e\xa9\x51"</div><div class='del'>-			"\x66\x56\x5f\x1d\x02\x19\xe2\xf6"</div><div class='del'>-			"\x4f\x73\x38\x09\x75\x64\x48\xe0"</div><div class='del'>-			"\xf1\x7e\x0e\xe8\x9d\xf9\xed\x94"</div><div class='del'>-			"\xfe\x16\x26\x62\x49\x74\xf4\xb0"</div><div class='del'>-			"\xd4\xa9\x6c\xb0\xfd\x53\xe9\x81"</div><div class='del'>-			"\xe0\x7a\xbf\xcf\xb5\xc4\x01\x81"</div><div class='del'>-			"\x79\x99\x77\x01\x3b\xe9\xa2\xb6"</div><div class='del'>-			"\xe6\x6a\x8a\x9e\x56\x1c\x8d\x1e"</div><div class='del'>-			"\x8f\x06\x55\x2c\x6c\xdc\x92\x87"</div><div class='del'>-			"\x64\x3b\x4b\x19\xa1\x13\x64\x1d"</div><div class='del'>-			"\x4a\xe9\xc0\x00\xb8\x95\xef\x6b"</div><div class='del'>-			"\x1a\x86\x6d\x37\x52\x02\xc2\xe0"</div><div class='del'>-			"\xc8\xbb\x42\x0c\x02\x21\x4a\xc9"</div><div class='del'>-			"\xef\xa0\x54\xe4\x5e\x16\x53\x81"</div><div class='del'>-			"\x70\x62\x10\xaf\xde\xb8\xb5\xd3"</div><div class='del'>-			"\xe8\x5e\x6c\xc3\x8a\x3e\x18\x07"</div><div class='del'>-			"\xf2\x2f\x7d\xa7\xe1\x3d\x4e\xb4"</div><div class='del'>-			"\x26\xa7\xa3\x93\x86\xb2\x04\x1e"</div><div class='del'>-			"\x53\x5d\x86\xd6\xde\x65\xca\xe3"</div><div class='del'>-			"\x4e\xc1\xcf\xef\xc8\x70\x1b\x83"</div><div class='del'>-			"\x13\xdd\x18\x8b\x0d\x76\xd2\xf6"</div><div class='del'>-			"\x37\x7a\x93\x7a\x50\x11\x9f\x96"</div><div class='del'>-			"\x86\x25\xfd\xac\xdc\xbe\x18\x93"</div><div class='del'>-			"\x19\x6b\xec\x58\x4f\xb9\x75\xa7"</div><div class='del'>-			"\xdd\x3f\x2f\xec\xc8\x5a\x84\xab"</div><div class='del'>-			"\xd5\xe4\x8a\x07\xf6\x4d\x23\xd6"</div><div class='del'>-			"\x03\xfb\x03\x6a\xea\x66\xbf\xd4"</div><div class='del'>-			"\xb1\x34\xfb\x78\xe9\x55\xdc\x7c"</div><div class='del'>-			"\x3d\x9c\xe5\x9a\xac\xc3\x7a\x80"</div><div class='del'>-			"\x24\x6d\xa0\xef\x25\x7c\xb7\xea"</div><div class='del'>-			"\xce\x4d\x5f\x18\x60\xce\x87\x22"</div><div class='del'>-			"\x66\x2f\xd5\xdd\xdd\x02\x21\x75"</div><div class='del'>-			"\x82\xa0\x1f\x58\xc6\xd3\x62\xf7"</div><div class='del'>-			"\x32\xd8\xaf\x1e\x07\x77\x51\x96"</div><div class='del'>-			"\xd5\x6b\x1e\x7e\x80\x02\xe8\x67"</div><div class='del'>-			"\xea\x17\x0b\x10\xd2\x3f\x28\x25"</div><div class='del'>-			"\x4f\x05\x77\x02\x14\x69\xf0\x2c"</div><div class='del'>-			"\xbe\x0c\xf1\x74\x30\xd1\xb9\x9b"</div><div class='del'>-			"\xfc\x8c\xbb\x04\x16\xd9\xba\xc3"</div><div class='del'>-			"\xbc\x91\x8a\xc4\x30\xa4\xb0\x12"</div><div class='del'>-			"\x4c\x21\x87\xcb\xc9\x1d\x16\x96"</div><div class='del'>-			"\x07\x6f\x23\x54\xb9\x6f\x79\xe5"</div><div class='del'>-			"\x64\xc0\x64\xda\xb1\xae\xdd\x60"</div><div class='del'>-			"\x6c\x1a\x9d\xd3\x04\x8e\x45\xb0"</div><div class='del'>-			"\x92\x61\xd0\x48\x81\xed\x5e\x1d"</div><div class='del'>-			"\xa0\xc9\xa4\x33\xc7\x13\x51\x5d"</div><div class='del'>-			"\x7f\x83\x73\xb6\x70\x18\x65\x3e"</div><div class='del'>-			"\x2f\x0e\x7a\x12\x39\x98\xab\xd8"</div><div class='del'>-			"\x7e\x6f\xa3\xd1\xba\x56\xad\xbd"</div><div class='del'>-			"\xf0\x03\x01\x1c\x85\x35\x9f\xeb"</div><div class='del'>-			"\x19\x63\xa1\xaf\xfe\x2d\x35\x50"</div><div class='del'>-			"\x39\xa0\x65\x7c\x95\x7e\x6b\xfe"</div><div class='del'>-			"\xc1\xac\x07\x7c\x98\x4f\xbe\x57"</div><div class='del'>-			"\xa7\x22\xec\xe2\x7e\x29\x09\x53"</div><div class='del'>-			"\xe8\xbf\xb4\x7e\x3f\x8f\xfc\x14"</div><div class='del'>-			"\xce\x54\xf9\x18\x58\xb5\xff\x44"</div><div class='del'>-			"\x05\x9d\xce\x1b\xb6\x82\x23\xc8"</div><div class='del'>-			"\x2e\xbc\x69\xbb\x4a\x29\x0f\x65"</div><div class='del'>-			"\x94\xf0\x63\x06\x0e\xef\x8c\xbd"</div><div class='del'>-			"\xff\xfd\xb0\x21\x6e\x57\x05\x75"</div><div class='del'>-			"\xda\xd5\xc4\xeb\x8d\x32\xf7\x50"</div><div class='del'>-			"\xd3\x6f\x22\xed\x5f\x8e\xa2\x5b"</div><div class='del'>-			"\x80\x8c\xc8\x78\x40\x24\x4b\x89"</div><div class='del'>-			"\x30\xce\x7a\x97\x0e\xc4\xaf\xef"</div><div class='del'>-			"\x9b\xb4\xcd\x66\x74\x14\x04\x2b"</div><div class='del'>-			"\xf7\xce\x0b\x1c\x6e\xc2\x78\x8c"</div><div class='del'>-			"\xca\xc5\xd0\x1c\x95\x4a\x91\x2d"</div><div class='del'>-			"\xa7\x20\xeb\x86\x52\xb7\x67\xd8"</div><div class='del'>-			"\x0c\xd6\x04\x14\xde\x51\x74\x75"</div><div class='del'>-			"\xe7\x11\xb4\x87\xa3\x3d\x2d\xad"</div><div class='del'>-			"\x4f\xef\xa0\x0f\x70\x00\x6d\x13"</div><div class='del'>-			"\x19\x1d\x41\x50\xe9\xd8\xf0\x32"</div><div class='del'>-			"\x71\xbc\xd3\x11\xf2\xac\xbe\xaf"</div><div class='del'>-			"\x75\x46\x65\x4e\x07\x34\x37\xa3"</div><div class='del'>-			"\x89\xfe\x75\xd4\x70\x4c\xc6\x3f"</div><div class='del'>-			"\x69\x24\x0e\x38\x67\x43\x8c\xde"</div><div class='del'>-			"\x06\xb5\xb8\xe7\xc4\xf0\x41\x8f"</div><div class='del'>-			"\xf0\xbd\x2f\x0b\xb9\x18\xf8\xde"</div><div class='del'>-			"\x64\xb1\xdb\xee\x00\x50\x77\xe1"</div><div class='del'>-			"\xc7\xff\xa6\xfa\xdd\x70\xf4\xe3"</div><div class='del'>-			"\x93\xe9\x77\x35\x3d\x4b\x2f\x2b"</div><div class='del'>-			"\x6d\x55\xf0\xfc\x88\x54\x4e\x89"</div><div class='del'>-			"\xc1\x8a\x23\x31\x2d\x14\x2a\xb8"</div><div class='del'>-			"\x1b\x15\xdd\x9e\x6e\x7b\xda\x05"</div><div class='del'>-			"\x91\x7d\x62\x64\x96\x72\xde\xfc"</div><div class='del'>-			"\xc1\xec\xf0\x23\x51\x6f\xdb\x5b"</div><div class='del'>-			"\x1d\x08\x57\xce\x09\xb8\xf6\xcd"</div><div class='del'>-			"\x8d\x95\xf2\x20\xbf\x0f\x20\x57"</div><div class='del'>-			"\x98\x81\x84\x4f\x15\x5c\x76\xe7"</div><div class='del'>-			"\x3e\x0a\x3a\x6c\xc4\x8a\xbe\x78"</div><div class='del'>-			"\x74\x77\xc3\x09\x4b\x5d\x48\xe4"</div><div class='del'>-			"\xc8\xcb\x0b\xea\x17\x28\xcf\xcf"</div><div class='del'>-			"\x31\x32\x44\xa4\xe5\x0e\x1a\x98"</div><div class='del'>-			"\x94\xc4\xf0\xff\xae\x3e\x44\xe8"</div><div class='del'>-			"\xa5\xb3\xb5\x37\x2f\xe8\xaf\x6f"</div><div class='del'>-			"\x28\xc1\x37\x5f\x31\xd2\xb9\x33"</div><div class='del'>-			"\xb1\xb2\x52\x94\x75\x2c\x29\x59"</div><div class='del'>-			"\x06\xc2\x25\xe8\x71\x65\x4e\xed"</div><div class='del'>-			"\xc0\x9c\xb1\xbb\x25\xdc\x6c\xe7"</div><div class='del'>-			"\x4b\xa5\x7a\x54\x7a\x60\xff\x7a"</div><div class='del'>-			"\xe0\x50\x40\x96\x35\x63\xe4\x0b"</div><div class='del'>-			"\x76\xbd\xa4\x65\x00\x1b\x57\x88"</div><div class='del'>-			"\xae\xed\x39\x88\x42\x11\x3c\xed"</div><div class='del'>-			"\x85\x67\x7d\xb9\x68\x82\xe9\x43"</div><div class='del'>-			"\x3c\x47\x53\xfa\xe8\xf8\x9f\x1f"</div><div class='del'>-			"\x9f\xef\x0f\xf7\x30\xd9\x30\x0e"</div><div class='del'>-			"\xb9\x9f\x69\x18\x2f\x7e\xf8\xf8"</div><div class='del'>-			"\xf8\x8c\x0f\xd4\x02\x4d\xea\xcd"</div><div class='del'>-			"\x0a\x9c\x6f\x71\x6d\x5a\x4c\x60"</div><div class='del'>-			"\xce\x20\x56\x32\xc6\xc5\x99\x1f"</div><div class='del'>-			"\x09\xe6\x4e\x18\x1a\x15\x13\xa8"</div><div class='del'>-			"\x7d\xb1\x6b\xc0\xb2\x6d\xf8\x26"</div><div class='del'>-			"\x66\xf8\x3d\x18\x74\x70\x66\x7a"</div><div class='del'>-			"\x34\x17\xde\xba\x47\xf1\x06\x18"</div><div class='del'>-			"\xcb\xaf\xeb\x4a\x1e\x8f\xa7\x77"</div><div class='del'>-			"\xe0\x3b\x78\x62\x66\xc9\x10\xea"</div><div class='del'>-			"\x1f\xb7\x29\x0a\x45\xa1\x1d\x1e"</div><div class='del'>-			"\x1d\xe2\x65\x61\x50\x9c\xd7\x05"</div><div class='del'>-			"\xf2\x0b\x5b\x12\x61\x02\xc8\xe5"</div><div class='del'>-			"\x63\x4f\x20\x0c\x07\x17\x33\x5e"</div><div class='del'>-			"\x03\x9a\x53\x0f\x2e\x55\xfe\x50"</div><div class='del'>-			"\x43\x7d\xd0\xb6\x7e\x5a\xda\xae"</div><div class='del'>-			"\x58\xef\x15\xa9\x83\xd9\x46\xb1"</div><div class='del'>-			"\x42\xaa\xf5\x02\x6c\xce\x92\x06"</div><div class='del'>-			"\x1b\xdb\x66\x45\x91\x79\xc2\x2d"</div><div class='del'>-			"\xe6\x53\xd3\x14\xfd\xbb\x44\x63"</div><div class='del'>-			"\xc6\xd7\x3d\x7a\x0c\x75\x78\x9d"</div><div class='del'>-			"\x5c\xa6\x39\xb3\xe5\x63\xca\x8b"</div><div class='del'>-			"\xfe\xd3\xef\x60\x83\xf6\x8e\x70"</div><div class='del'>-			"\xb6\x67\xc7\x77\xed\x23\xef\x4c"</div><div class='del'>-			"\xf0\xed\x2d\x07\x59\x6f\xc1\x01"</div><div class='del'>-			"\x34\x37\x08\xab\xd9\x1f\x09\xb1"</div><div class='del'>-			"\xce\x5b\x17\xff\x74\xf8\x9c\xd5"</div><div class='del'>-			"\x2c\x56\x39\x79\x0f\x69\x44\x75"</div><div class='del'>-			"\x58\x27\x01\xc4\xbf\xa7\xa1\x1d"</div><div class='del'>-			"\x90\x17\x77\x86\x5a\x3f\xd9\xd1"</div><div class='del'>-			"\x0e\xa0\x10\xf8\xec\x1e\xa5\x7f"</div><div class='del'>-			"\x5e\x36\xd1\xe3\x04\x2c\x70\xf7"</div><div class='del'>-			"\x8e\xc0\x98\x2f\x6c\x94\x2b\x41"</div><div class='del'>-			"\xb7\x60\x00\xb7\x2e\xb8\x02\x8d"</div><div class='del'>-			"\xb8\xb0\xd3\x86\xba\x1d\xd7\x90"</div><div class='del'>-			"\xd6\xb6\xe1\xfc\xd7\xd8\x28\x06"</div><div class='del'>-			"\x63\x9b\xce\x61\x24\x79\xc0\x70"</div><div class='del'>-			"\x52\xd0\xb6\xd4\x28\x95\x24\x87"</div><div class='del'>-			"\x03\x1f\xb7\x9a\xda\xa3\xfb\x52"</div><div class='del'>-			"\x5b\x68\xe7\x4c\x8c\x24\xe1\x42"</div><div class='del'>-			"\xf7\xd5\xfd\xad\x06\x32\x9f\xba"</div><div class='del'>-			"\xc1\xfc\xdd\xc6\xfc\xfc\xb3\x38"</div><div class='del'>-			"\x74\x56\x58\x40\x02\x37\x52\x2c"</div><div class='del'>-			"\x55\xcc\xb3\x9e\x7a\xe9\xd4\x38"</div><div class='del'>-			"\x41\x5e\x0c\x35\xe2\x11\xd1\x13"</div><div class='del'>-			"\xf8\xb7\x8d\x72\x6b\x22\x2a\xb0"</div><div class='del'>-			"\xdb\x08\xba\x35\xb9\x3f\xc8\xd3"</div><div class='del'>-			"\x24\x90\xec\x58\xd2\x09\xc7\x2d"</div><div class='del'>-			"\xed\x38\x80\x36\x72\x43\x27\x49"</div><div class='del'>-			"\x4a\x80\x8a\xa2\xe8\xd3\xda\x30"</div><div class='del'>-			"\x7d\xb6\x82\x37\x86\x92\x86\x3e"</div><div class='del'>-			"\x08\xb2\x28\x5a\x55\x44\x24\x7d"</div><div class='del'>-			"\x40\x48\x8a\xb6\x89\x58\x08\xa0"</div><div class='del'>-			"\xd6\x6d\x3a\x17\xbf\xf6\x54\xa2"</div><div class='del'>-			"\xf5\xd3\x8c\x0f\x78\x12\x57\x8b"</div><div class='del'>-			"\xd5\xc2\xfd\x58\x5b\x7f\x38\xe3"</div><div class='del'>-			"\xcc\xb7\x7c\x48\xb3\x20\xe8\x81"</div><div class='del'>-			"\x14\x32\x45\x05\xe0\xdb\x9f\x75"</div><div class='del'>-			"\x85\xb4\x6a\xfc\x95\xe3\x54\x22"</div><div class='del'>-			"\x12\xee\x30\xfe\xd8\x30\xef\x34"</div><div class='del'>-			"\x50\xab\x46\x30\x98\x2f\xb7\xc0"</div><div class='del'>-			"\x15\xa2\x83\xb6\xf2\x06\x21\xa2"</div><div class='del'>-			"\xc3\x26\x37\x14\xd1\x4d\xb5\x10"</div><div class='del'>-			"\x52\x76\x4d\x6a\xee\xb5\x2b\x15"</div><div class='del'>-			"\xb7\xf9\x51\xe8\x2a\xaf\xc7\xfa"</div><div class='del'>-			"\x77\xaf\xb0\x05\x4d\xd1\x68\x8e"</div><div class='del'>-			"\x74\x05\x9f\x9d\x93\xa5\x3e\x7f"</div><div class='del'>-			"\x4e\x5f\x9d\xcb\x09\xc7\x83\xe3"</div><div class='del'>-			"\x02\x9d\x27\x1f\xef\x85\x05\x8d"</div><div class='del'>-			"\xec\x55\x88\x0f\x0d\x7c\x4c\xe8"</div><div class='del'>-			"\xa1\x75\xa0\xd8\x06\x47\x14\xef"</div><div class='del'>-			"\xaa\x61\xcf\x26\x15\xad\xd8\xa3"</div><div class='del'>-			"\xaa\x75\xf2\x78\x4a\x5a\x61\xdf"</div><div class='del'>-			"\x8b\xc7\x04\xbc\xb2\x32\xd2\x7e"</div><div class='del'>-			"\x42\xee\xb4\x2f\x51\xff\x7b\x2e"</div><div class='del'>-			"\xd3\x02\xe8\xdc\x5d\x0d\x50\xdc"</div><div class='del'>-			"\xae\xb7\x46\xf9\xa8\xe6\xd0\x16"</div><div class='del'>-			"\xcc\xe6\x2c\x81\xc7\xad\xe9\xf0"</div><div class='del'>-			"\x05\x72\x6d\x3d\x0a\x7a\xa9\x02"</div><div class='del'>-			"\xac\x82\x93\x6e\xb6\x1c\x28\xfc"</div><div class='del'>-			"\x44\x12\xfb\x73\x77\xd4\x13\x39"</div><div class='del'>-			"\x29\x88\x8a\xf3\x5c\xa6\x36\xa0"</div><div class='del'>-			"\x2a\xed\x7e\xb1\x1d\xd6\x4c\x6b"</div><div class='del'>-			"\x41\x01\x18\x5d\x5d\x07\x97\xa6"</div><div class='del'>-			"\x4b\xef\x31\x18\xea\xac\xb1\x84"</div><div class='del'>-			"\x21\xed\xda\x86",</div><div class='del'>-		.rlen = 4100,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct cipher_testvec aes_ctr_dec_tv_template[] = {</div><div class='del'>-	{ /* From RFC 3686 */</div><div class='del'>-		.key	= "\xae\x68\x52\xf8\x12\x10\x67\xcc"</div><div class='del'>-			  "\x4b\xf7\xa5\x76\x55\x77\xf3\x9e"</div><div class='del'>-			  "\x00\x00\x00\x30",</div><div class='del'>-		.klen	= 20,</div><div class='del'>-		.iv	= "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='del'>-		.input	= "\xe4\x09\x5d\x4f\xb7\xa7\xb3\x79"</div><div class='del'>-			  "\x2d\x61\x75\xa3\x26\x13\x11\xb8",</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result	= "Single block msg",</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x7e\x24\x06\x78\x17\xfa\xe0\xd7"</div><div class='del'>-			  "\x43\xd6\xce\x1f\x32\x53\x91\x63"</div><div class='del'>-			  "\x00\x6c\xb6\xdb",</div><div class='del'>-		.klen	= 20,</div><div class='del'>-		.iv	= "\xc0\x54\x3b\x59\xda\x48\xd9\x0b",</div><div class='del'>-		.input	= "\x51\x04\xa1\x06\x16\x8a\x72\xd9"</div><div class='del'>-			  "\x79\x0d\x41\xee\x8e\xda\xd3\x88"</div><div class='del'>-			  "\xeb\x2e\x1e\xfc\x46\xda\x57\xc8"</div><div class='del'>-			  "\xfc\xe6\x30\xdf\x91\x41\xbe\x28",</div><div class='del'>-		.ilen	= 32,</div><div class='del'>-		.result	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='del'>-			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='del'>-			  "\x10\x11\x12\x13\x14\x15\x16\x17"</div><div class='del'>-			  "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f",</div><div class='del'>-		.rlen	= 32,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x16\xaf\x5b\x14\x5f\xc9\xf5\x79"</div><div class='del'>-			  "\xc1\x75\xf9\x3e\x3b\xfb\x0e\xed"</div><div class='del'>-			  "\x86\x3d\x06\xcc\xfd\xb7\x85\x15"</div><div class='del'>-			  "\x00\x00\x00\x48",</div><div class='del'>-		.klen	= 28,</div><div class='del'>-		.iv	= "\x36\x73\x3c\x14\x7d\x6d\x93\xcb",</div><div class='del'>-		.input	= "\x4b\x55\x38\x4f\xe2\x59\xc9\xc8"</div><div class='del'>-			  "\x4e\x79\x35\xa0\x03\xcb\xe9\x28",</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result	= "Single block msg",</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x7c\x5c\xb2\x40\x1b\x3d\xc3\x3c"</div><div class='del'>-			  "\x19\xe7\x34\x08\x19\xe0\xf6\x9c"</div><div class='del'>-			  "\x67\x8c\x3d\xb8\xe6\xf6\xa9\x1a"</div><div class='del'>-			  "\x00\x96\xb0\x3b",</div><div class='del'>-		.klen	= 28,</div><div class='del'>-		.iv	= "\x02\x0c\x6e\xad\xc2\xcb\x50\x0d",</div><div class='del'>-		.input	= "\x45\x32\x43\xfc\x60\x9b\x23\x32"</div><div class='del'>-			  "\x7e\xdf\xaa\xfa\x71\x31\xcd\x9f"</div><div class='del'>-			  "\x84\x90\x70\x1c\x5a\xd4\xa7\x9c"</div><div class='del'>-			  "\xfc\x1f\xe0\xff\x42\xf4\xfb\x00",</div><div class='del'>-		.ilen	= 32,</div><div class='del'>-		.result	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='del'>-			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='del'>-			  "\x10\x11\x12\x13\x14\x15\x16\x17"</div><div class='del'>-			  "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f",</div><div class='del'>-		.rlen	= 32,</div><div class='del'>-	}, { </div><div class='del'>-		.key	= "\x77\x6b\xef\xf2\x85\x1d\xb0\x6f"</div><div class='del'>-			  "\x4c\x8a\x05\x42\xc8\x69\x6f\x6c"</div><div class='del'>-			  "\x6a\x81\xaf\x1e\xec\x96\xb4\xd3"</div><div class='del'>-			  "\x7f\xc1\xd6\x89\xe6\xc1\xc1\x04"</div><div class='del'>-			  "\x00\x00\x00\x60",</div><div class='del'>-		.klen	= 36,</div><div class='del'>-		.iv	= "\xdb\x56\x72\xc9\x7a\xa8\xf0\xb2",</div><div class='del'>-		.input	= "\x14\x5a\xd0\x1d\xbf\x82\x4e\xc7"</div><div class='del'>-			  "\x56\x08\x63\xdc\x71\xe3\xe0\xc0",</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result	= "Single block msg",</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\xf6\xd6\x6d\x6b\xd5\x2d\x59\xbb"</div><div class='del'>-			  "\x07\x96\x36\x58\x79\xef\xf8\x86"</div><div class='del'>-			  "\xc6\x6d\xd5\x1a\x5b\x6a\x99\x74"</div><div class='del'>-			  "\x4b\x50\x59\x0c\x87\xa2\x38\x84"</div><div class='del'>-			  "\x00\xfa\xac\x24",</div><div class='del'>-		.klen	= 36,</div><div class='del'>-		.iv	= "\xc1\x58\x5e\xf1\x5a\x43\xd8\x75",</div><div class='del'>-		.input	= "\xf0\x5e\x23\x1b\x38\x94\x61\x2c"</div><div class='del'>-			  "\x49\xee\x00\x0b\x80\x4e\xb2\xa9"</div><div class='del'>-			  "\xb8\x30\x6b\x50\x8f\x83\x9d\x6a"</div><div class='del'>-			  "\x55\x30\x83\x1d\x93\x44\xaf\x1c",</div><div class='del'>-		.ilen	= 32,</div><div class='del'>-		.result	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='del'>-			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='del'>-			  "\x10\x11\x12\x13\x14\x15\x16\x17"</div><div class='del'>-			  "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f",</div><div class='del'>-		.rlen	= 32,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct aead_testvec aes_gcm_enc_tv_template[] = {</div><div class='del'>-	{ /* From McGrew &amp; Viega - http://citeseer.ist.psu.edu/656989.html */</div><div class='del'>-		.key    = zeroed_string,</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.result	= "\x58\xe2\xfc\xce\xfa\x7e\x30\x61"</div><div class='del'>-			  "\x36\x7f\x1d\x57\xa4\xe7\x45\x5a",</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	}, {</div><div class='del'>-		.key    = zeroed_string,</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.input  = zeroed_string,</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result = "\x03\x88\xda\xce\x60\xb6\xa3\x92"</div><div class='del'>-			  "\xf3\x28\xc2\xb9\x71\xb2\xfe\x78"</div><div class='del'>-			  "\xab\x6e\x47\xd4\x2c\xec\x13\xbd"</div><div class='del'>-			  "\xf5\x3a\x67\xb2\x12\x57\xbd\xdf",</div><div class='del'>-		.rlen	= 32,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\xfe\xff\xe9\x92\x86\x65\x73\x1c"</div><div class='del'>-			  "\x6d\x6a\x8f\x94\x67\x30\x83\x08",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.iv	= "\xca\xfe\xba\xbe\xfa\xce\xdb\xad"</div><div class='del'>-			  "\xde\xca\xf8\x88",</div><div class='del'>-		.input	= "\xd9\x31\x32\x25\xf8\x84\x06\xe5"</div><div class='del'>-			  "\xa5\x59\x09\xc5\xaf\xf5\x26\x9a"</div><div class='del'>-			  "\x86\xa7\xa9\x53\x15\x34\xf7\xda"</div><div class='del'>-			  "\x2e\x4c\x30\x3d\x8a\x31\x8a\x72"</div><div class='del'>-			  "\x1c\x3c\x0c\x95\x95\x68\x09\x53"</div><div class='del'>-			  "\x2f\xcf\x0e\x24\x49\xa6\xb5\x25"</div><div class='del'>-			  "\xb1\x6a\xed\xf5\xaa\x0d\xe6\x57"</div><div class='del'>-			  "\xba\x63\x7b\x39\x1a\xaf\xd2\x55",</div><div class='del'>-		.ilen	= 64,</div><div class='del'>-		.result = "\x42\x83\x1e\xc2\x21\x77\x74\x24"</div><div class='del'>-			  "\x4b\x72\x21\xb7\x84\xd0\xd4\x9c"</div><div class='del'>-			  "\xe3\xaa\x21\x2f\x2c\x02\xa4\xe0"</div><div class='del'>-			  "\x35\xc1\x7e\x23\x29\xac\xa1\x2e"</div><div class='del'>-			  "\x21\xd5\x14\xb2\x54\x66\x93\x1c"</div><div class='del'>-			  "\x7d\x8f\x6a\x5a\xac\x84\xaa\x05"</div><div class='del'>-			  "\x1b\xa3\x0b\x39\x6a\x0a\xac\x97"</div><div class='del'>-			  "\x3d\x58\xe0\x91\x47\x3f\x59\x85"</div><div class='del'>-			  "\x4d\x5c\x2a\xf3\x27\xcd\x64\xa6"</div><div class='del'>-			  "\x2c\xf3\x5a\xbd\x2b\xa6\xfa\xb4",</div><div class='del'>-		.rlen	= 80,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\xfe\xff\xe9\x92\x86\x65\x73\x1c"</div><div class='del'>-			  "\x6d\x6a\x8f\x94\x67\x30\x83\x08",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.iv	= "\xca\xfe\xba\xbe\xfa\xce\xdb\xad"</div><div class='del'>-			  "\xde\xca\xf8\x88",</div><div class='del'>-		.input	= "\xd9\x31\x32\x25\xf8\x84\x06\xe5"</div><div class='del'>-			  "\xa5\x59\x09\xc5\xaf\xf5\x26\x9a"</div><div class='del'>-			  "\x86\xa7\xa9\x53\x15\x34\xf7\xda"</div><div class='del'>-			  "\x2e\x4c\x30\x3d\x8a\x31\x8a\x72"</div><div class='del'>-			  "\x1c\x3c\x0c\x95\x95\x68\x09\x53"</div><div class='del'>-			  "\x2f\xcf\x0e\x24\x49\xa6\xb5\x25"</div><div class='del'>-			  "\xb1\x6a\xed\xf5\xaa\x0d\xe6\x57"</div><div class='del'>-			  "\xba\x63\x7b\x39",</div><div class='del'>-		.ilen	= 60,</div><div class='del'>-		.assoc	= "\xfe\xed\xfa\xce\xde\xad\xbe\xef"</div><div class='del'>-			  "\xfe\xed\xfa\xce\xde\xad\xbe\xef"</div><div class='del'>-			  "\xab\xad\xda\xd2",</div><div class='del'>-		.alen	= 20,</div><div class='del'>-		.result = "\x42\x83\x1e\xc2\x21\x77\x74\x24"</div><div class='del'>-			  "\x4b\x72\x21\xb7\x84\xd0\xd4\x9c"</div><div class='del'>-			  "\xe3\xaa\x21\x2f\x2c\x02\xa4\xe0"</div><div class='del'>-			  "\x35\xc1\x7e\x23\x29\xac\xa1\x2e"</div><div class='del'>-			  "\x21\xd5\x14\xb2\x54\x66\x93\x1c"</div><div class='del'>-			  "\x7d\x8f\x6a\x5a\xac\x84\xaa\x05"</div><div class='del'>-			  "\x1b\xa3\x0b\x39\x6a\x0a\xac\x97"</div><div class='del'>-			  "\x3d\x58\xe0\x91"</div><div class='del'>-			  "\x5b\xc9\x4f\xbc\x32\x21\xa5\xdb"</div><div class='del'>-			  "\x94\xfa\xe9\x5a\xe7\x12\x1a\x47",</div><div class='del'>-		.rlen	= 76,</div><div class='del'>-	}, {</div><div class='del'>-		.key    = zeroed_string,</div><div class='del'>-		.klen	= 24,</div><div class='del'>-		.result	= "\xcd\x33\xb2\x8a\xc7\x73\xf7\x4b"</div><div class='del'>-			  "\xa0\x0e\xd1\xf3\x12\x57\x24\x35",</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	}, {</div><div class='del'>-		.key    = zeroed_string,</div><div class='del'>-		.klen	= 24,</div><div class='del'>-		.input  = zeroed_string,</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result = "\x98\xe7\x24\x7c\x07\xf0\xfe\x41"</div><div class='del'>-			  "\x1c\x26\x7e\x43\x84\xb0\xf6\x00"</div><div class='del'>-			  "\x2f\xf5\x8d\x80\x03\x39\x27\xab"</div><div class='del'>-			  "\x8e\xf4\xd4\x58\x75\x14\xf0\xfb",</div><div class='del'>-		.rlen	= 32,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\xfe\xff\xe9\x92\x86\x65\x73\x1c"</div><div class='del'>-			  "\x6d\x6a\x8f\x94\x67\x30\x83\x08"</div><div class='del'>-			  "\xfe\xff\xe9\x92\x86\x65\x73\x1c",</div><div class='del'>-		.klen	= 24,</div><div class='del'>-		.iv	= "\xca\xfe\xba\xbe\xfa\xce\xdb\xad"</div><div class='del'>-			  "\xde\xca\xf8\x88",</div><div class='del'>-		.input	= "\xd9\x31\x32\x25\xf8\x84\x06\xe5"</div><div class='del'>-			  "\xa5\x59\x09\xc5\xaf\xf5\x26\x9a"</div><div class='del'>-			  "\x86\xa7\xa9\x53\x15\x34\xf7\xda"</div><div class='del'>-			  "\x2e\x4c\x30\x3d\x8a\x31\x8a\x72"</div><div class='del'>-			  "\x1c\x3c\x0c\x95\x95\x68\x09\x53"</div><div class='del'>-			  "\x2f\xcf\x0e\x24\x49\xa6\xb5\x25"</div><div class='del'>-			  "\xb1\x6a\xed\xf5\xaa\x0d\xe6\x57"</div><div class='del'>-			  "\xba\x63\x7b\x39\x1a\xaf\xd2\x55",</div><div class='del'>-		.ilen	= 64,</div><div class='del'>-		.result = "\x39\x80\xca\x0b\x3c\x00\xe8\x41"</div><div class='del'>-			  "\xeb\x06\xfa\xc4\x87\x2a\x27\x57"</div><div class='del'>-			  "\x85\x9e\x1c\xea\xa6\xef\xd9\x84"</div><div class='del'>-			  "\x62\x85\x93\xb4\x0c\xa1\xe1\x9c"</div><div class='del'>-			  "\x7d\x77\x3d\x00\xc1\x44\xc5\x25"</div><div class='del'>-			  "\xac\x61\x9d\x18\xc8\x4a\x3f\x47"</div><div class='del'>-			  "\x18\xe2\x44\x8b\x2f\xe3\x24\xd9"</div><div class='del'>-			  "\xcc\xda\x27\x10\xac\xad\xe2\x56"</div><div class='del'>-			  "\x99\x24\xa7\xc8\x58\x73\x36\xbf"</div><div class='del'>-			  "\xb1\x18\x02\x4d\xb8\x67\x4a\x14",</div><div class='del'>-		.rlen	= 80,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\xfe\xff\xe9\x92\x86\x65\x73\x1c"</div><div class='del'>-			  "\x6d\x6a\x8f\x94\x67\x30\x83\x08"</div><div class='del'>-			  "\xfe\xff\xe9\x92\x86\x65\x73\x1c",</div><div class='del'>-		.klen	= 24,</div><div class='del'>-		.iv	= "\xca\xfe\xba\xbe\xfa\xce\xdb\xad"</div><div class='del'>-			  "\xde\xca\xf8\x88",</div><div class='del'>-		.input	= "\xd9\x31\x32\x25\xf8\x84\x06\xe5"</div><div class='del'>-			  "\xa5\x59\x09\xc5\xaf\xf5\x26\x9a"</div><div class='del'>-			  "\x86\xa7\xa9\x53\x15\x34\xf7\xda"</div><div class='del'>-			  "\x2e\x4c\x30\x3d\x8a\x31\x8a\x72"</div><div class='del'>-			  "\x1c\x3c\x0c\x95\x95\x68\x09\x53"</div><div class='del'>-			  "\x2f\xcf\x0e\x24\x49\xa6\xb5\x25"</div><div class='del'>-			  "\xb1\x6a\xed\xf5\xaa\x0d\xe6\x57"</div><div class='del'>-			  "\xba\x63\x7b\x39",</div><div class='del'>-		.ilen	= 60,</div><div class='del'>-		.assoc	= "\xfe\xed\xfa\xce\xde\xad\xbe\xef"</div><div class='del'>-			  "\xfe\xed\xfa\xce\xde\xad\xbe\xef"</div><div class='del'>-			  "\xab\xad\xda\xd2",</div><div class='del'>-		.alen	= 20,</div><div class='del'>-		.result = "\x39\x80\xca\x0b\x3c\x00\xe8\x41"</div><div class='del'>-			  "\xeb\x06\xfa\xc4\x87\x2a\x27\x57"</div><div class='del'>-			  "\x85\x9e\x1c\xea\xa6\xef\xd9\x84"</div><div class='del'>-			  "\x62\x85\x93\xb4\x0c\xa1\xe1\x9c"</div><div class='del'>-			  "\x7d\x77\x3d\x00\xc1\x44\xc5\x25"</div><div class='del'>-			  "\xac\x61\x9d\x18\xc8\x4a\x3f\x47"</div><div class='del'>-			  "\x18\xe2\x44\x8b\x2f\xe3\x24\xd9"</div><div class='del'>-			  "\xcc\xda\x27\x10"</div><div class='del'>-			  "\x25\x19\x49\x8e\x80\xf1\x47\x8f"</div><div class='del'>-			  "\x37\xba\x55\xbd\x6d\x27\x61\x8c",</div><div class='del'>-		.rlen	= 76,</div><div class='del'>-		.np	= 2,</div><div class='del'>-		.tap	= { 32, 28 },</div><div class='del'>-		.anp	= 2,</div><div class='del'>-		.atap	= { 8, 12 }</div><div class='del'>-	}, {</div><div class='del'>-		.key    = zeroed_string,</div><div class='del'>-		.klen	= 32,</div><div class='del'>-		.result	= "\x53\x0f\x8a\xfb\xc7\x45\x36\xb9"</div><div class='del'>-			  "\xa9\x63\xb4\xf1\xc4\xcb\x73\x8b",</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct aead_testvec aes_gcm_dec_tv_template[] = {</div><div class='del'>-	{ /* From McGrew &amp; Viega - http://citeseer.ist.psu.edu/656989.html */</div><div class='del'>-		.key    = zeroed_string,</div><div class='del'>-		.klen	= 32,</div><div class='del'>-		.input	= "\xce\xa7\x40\x3d\x4d\x60\x6b\x6e"</div><div class='del'>-			  "\x07\x4e\xc5\xd3\xba\xf3\x9d\x18"</div><div class='del'>-			  "\xd0\xd1\xc8\xa7\x99\x99\x6b\xf0"</div><div class='del'>-			  "\x26\x5b\x98\xb5\xd4\x8a\xb9\x19",</div><div class='del'>-		.ilen	= 32,</div><div class='del'>-		.result  = zeroed_string,</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\xfe\xff\xe9\x92\x86\x65\x73\x1c"</div><div class='del'>-			  "\x6d\x6a\x8f\x94\x67\x30\x83\x08"</div><div class='del'>-			  "\xfe\xff\xe9\x92\x86\x65\x73\x1c"</div><div class='del'>-			  "\x6d\x6a\x8f\x94\x67\x30\x83\x08",</div><div class='del'>-		.klen	= 32,</div><div class='del'>-		.iv	= "\xca\xfe\xba\xbe\xfa\xce\xdb\xad"</div><div class='del'>-			  "\xde\xca\xf8\x88",</div><div class='del'>-		.input	= "\x52\x2d\xc1\xf0\x99\x56\x7d\x07"</div><div class='del'>-			  "\xf4\x7f\x37\xa3\x2a\x84\x42\x7d"</div><div class='del'>-			  "\x64\x3a\x8c\xdc\xbf\xe5\xc0\xc9"</div><div class='del'>-			  "\x75\x98\xa2\xbd\x25\x55\xd1\xaa"</div><div class='del'>-			  "\x8c\xb0\x8e\x48\x59\x0d\xbb\x3d"</div><div class='del'>-			  "\xa7\xb0\x8b\x10\x56\x82\x88\x38"</div><div class='del'>-			  "\xc5\xf6\x1e\x63\x93\xba\x7a\x0a"</div><div class='del'>-			  "\xbc\xc9\xf6\x62\x89\x80\x15\xad"</div><div class='del'>-			  "\xb0\x94\xda\xc5\xd9\x34\x71\xbd"</div><div class='del'>-			  "\xec\x1a\x50\x22\x70\xe3\xcc\x6c",</div><div class='del'>-		.ilen	= 80,</div><div class='del'>-		.result = "\xd9\x31\x32\x25\xf8\x84\x06\xe5"</div><div class='del'>-			  "\xa5\x59\x09\xc5\xaf\xf5\x26\x9a"</div><div class='del'>-			  "\x86\xa7\xa9\x53\x15\x34\xf7\xda"</div><div class='del'>-			  "\x2e\x4c\x30\x3d\x8a\x31\x8a\x72"</div><div class='del'>-			  "\x1c\x3c\x0c\x95\x95\x68\x09\x53"</div><div class='del'>-			  "\x2f\xcf\x0e\x24\x49\xa6\xb5\x25"</div><div class='del'>-			  "\xb1\x6a\xed\xf5\xaa\x0d\xe6\x57"</div><div class='del'>-			  "\xba\x63\x7b\x39\x1a\xaf\xd2\x55",</div><div class='del'>-		.rlen	= 64,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\xfe\xff\xe9\x92\x86\x65\x73\x1c"</div><div class='del'>-			  "\x6d\x6a\x8f\x94\x67\x30\x83\x08"</div><div class='del'>-			  "\xfe\xff\xe9\x92\x86\x65\x73\x1c"</div><div class='del'>-			  "\x6d\x6a\x8f\x94\x67\x30\x83\x08",</div><div class='del'>-		.klen	= 32,</div><div class='del'>-		.iv	= "\xca\xfe\xba\xbe\xfa\xce\xdb\xad"</div><div class='del'>-			  "\xde\xca\xf8\x88",</div><div class='del'>-		.input	= "\x52\x2d\xc1\xf0\x99\x56\x7d\x07"</div><div class='del'>-			  "\xf4\x7f\x37\xa3\x2a\x84\x42\x7d"</div><div class='del'>-			  "\x64\x3a\x8c\xdc\xbf\xe5\xc0\xc9"</div><div class='del'>-			  "\x75\x98\xa2\xbd\x25\x55\xd1\xaa"</div><div class='del'>-			  "\x8c\xb0\x8e\x48\x59\x0d\xbb\x3d"</div><div class='del'>-			  "\xa7\xb0\x8b\x10\x56\x82\x88\x38"</div><div class='del'>-			  "\xc5\xf6\x1e\x63\x93\xba\x7a\x0a"</div><div class='del'>-			  "\xbc\xc9\xf6\x62"</div><div class='del'>-			  "\x76\xfc\x6e\xce\x0f\x4e\x17\x68"</div><div class='del'>-			  "\xcd\xdf\x88\x53\xbb\x2d\x55\x1b",</div><div class='del'>-		.ilen	= 76,</div><div class='del'>-		.assoc	= "\xfe\xed\xfa\xce\xde\xad\xbe\xef"</div><div class='del'>-			  "\xfe\xed\xfa\xce\xde\xad\xbe\xef"</div><div class='del'>-			  "\xab\xad\xda\xd2",</div><div class='del'>-		.alen	= 20,</div><div class='del'>-		.result = "\xd9\x31\x32\x25\xf8\x84\x06\xe5"</div><div class='del'>-			  "\xa5\x59\x09\xc5\xaf\xf5\x26\x9a"</div><div class='del'>-			  "\x86\xa7\xa9\x53\x15\x34\xf7\xda"</div><div class='del'>-			  "\x2e\x4c\x30\x3d\x8a\x31\x8a\x72"</div><div class='del'>-			  "\x1c\x3c\x0c\x95\x95\x68\x09\x53"</div><div class='del'>-			  "\x2f\xcf\x0e\x24\x49\xa6\xb5\x25"</div><div class='del'>-			  "\xb1\x6a\xed\xf5\xaa\x0d\xe6\x57"</div><div class='del'>-			  "\xba\x63\x7b\x39",</div><div class='del'>-		.rlen	= 60,</div><div class='del'>-		.np     = 2,</div><div class='del'>-		.tap    = { 48, 28 },</div><div class='del'>-		.anp	= 3,</div><div class='del'>-		.atap	= { 8, 8, 4 }</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\xfe\xff\xe9\x92\x86\x65\x73\x1c"</div><div class='del'>-			  "\x6d\x6a\x8f\x94\x67\x30\x83\x08",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.iv	= "\xca\xfe\xba\xbe\xfa\xce\xdb\xad"</div><div class='del'>-			  "\xde\xca\xf8\x88",</div><div class='del'>-		.input	= "\x42\x83\x1e\xc2\x21\x77\x74\x24"</div><div class='del'>-			  "\x4b\x72\x21\xb7\x84\xd0\xd4\x9c"</div><div class='del'>-			  "\xe3\xaa\x21\x2f\x2c\x02\xa4\xe0"</div><div class='del'>-			  "\x35\xc1\x7e\x23\x29\xac\xa1\x2e"</div><div class='del'>-			  "\x21\xd5\x14\xb2\x54\x66\x93\x1c"</div><div class='del'>-			  "\x7d\x8f\x6a\x5a\xac\x84\xaa\x05"</div><div class='del'>-			  "\x1b\xa3\x0b\x39\x6a\x0a\xac\x97"</div><div class='del'>-			  "\x3d\x58\xe0\x91\x47\x3f\x59\x85"</div><div class='del'>-			  "\x4d\x5c\x2a\xf3\x27\xcd\x64\xa6"</div><div class='del'>-			  "\x2c\xf3\x5a\xbd\x2b\xa6\xfa\xb4",</div><div class='del'>-		.ilen	= 80,</div><div class='del'>-		.result = "\xd9\x31\x32\x25\xf8\x84\x06\xe5"</div><div class='del'>-			  "\xa5\x59\x09\xc5\xaf\xf5\x26\x9a"</div><div class='del'>-			  "\x86\xa7\xa9\x53\x15\x34\xf7\xda"</div><div class='del'>-			  "\x2e\x4c\x30\x3d\x8a\x31\x8a\x72"</div><div class='del'>-			  "\x1c\x3c\x0c\x95\x95\x68\x09\x53"</div><div class='del'>-			  "\x2f\xcf\x0e\x24\x49\xa6\xb5\x25"</div><div class='del'>-			  "\xb1\x6a\xed\xf5\xaa\x0d\xe6\x57"</div><div class='del'>-			  "\xba\x63\x7b\x39\x1a\xaf\xd2\x55",</div><div class='del'>-		.rlen	= 64,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\xfe\xff\xe9\x92\x86\x65\x73\x1c"</div><div class='del'>-			  "\x6d\x6a\x8f\x94\x67\x30\x83\x08",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.iv	= "\xca\xfe\xba\xbe\xfa\xce\xdb\xad"</div><div class='del'>-			  "\xde\xca\xf8\x88",</div><div class='del'>-		.input	= "\x42\x83\x1e\xc2\x21\x77\x74\x24"</div><div class='del'>-			  "\x4b\x72\x21\xb7\x84\xd0\xd4\x9c"</div><div class='del'>-			  "\xe3\xaa\x21\x2f\x2c\x02\xa4\xe0"</div><div class='del'>-			  "\x35\xc1\x7e\x23\x29\xac\xa1\x2e"</div><div class='del'>-			  "\x21\xd5\x14\xb2\x54\x66\x93\x1c"</div><div class='del'>-			  "\x7d\x8f\x6a\x5a\xac\x84\xaa\x05"</div><div class='del'>-			  "\x1b\xa3\x0b\x39\x6a\x0a\xac\x97"</div><div class='del'>-			  "\x3d\x58\xe0\x91"</div><div class='del'>-			  "\x5b\xc9\x4f\xbc\x32\x21\xa5\xdb"</div><div class='del'>-			  "\x94\xfa\xe9\x5a\xe7\x12\x1a\x47",</div><div class='del'>-		.ilen	= 76,</div><div class='del'>-		.assoc	= "\xfe\xed\xfa\xce\xde\xad\xbe\xef"</div><div class='del'>-			  "\xfe\xed\xfa\xce\xde\xad\xbe\xef"</div><div class='del'>-			  "\xab\xad\xda\xd2",</div><div class='del'>-		.alen	= 20,</div><div class='del'>-		.result = "\xd9\x31\x32\x25\xf8\x84\x06\xe5"</div><div class='del'>-			  "\xa5\x59\x09\xc5\xaf\xf5\x26\x9a"</div><div class='del'>-			  "\x86\xa7\xa9\x53\x15\x34\xf7\xda"</div><div class='del'>-			  "\x2e\x4c\x30\x3d\x8a\x31\x8a\x72"</div><div class='del'>-			  "\x1c\x3c\x0c\x95\x95\x68\x09\x53"</div><div class='del'>-			  "\x2f\xcf\x0e\x24\x49\xa6\xb5\x25"</div><div class='del'>-			  "\xb1\x6a\xed\xf5\xaa\x0d\xe6\x57"</div><div class='del'>-			  "\xba\x63\x7b\x39",</div><div class='del'>-		.rlen	= 60,</div><div class='del'>-	}, {</div><div class='del'>-		.key    = zeroed_string,</div><div class='del'>-		.klen	= 24,</div><div class='del'>-		.input	= "\x98\xe7\x24\x7c\x07\xf0\xfe\x41"</div><div class='del'>-			  "\x1c\x26\x7e\x43\x84\xb0\xf6\x00"</div><div class='del'>-			  "\x2f\xf5\x8d\x80\x03\x39\x27\xab"</div><div class='del'>-			  "\x8e\xf4\xd4\x58\x75\x14\xf0\xfb",</div><div class='del'>-		.ilen	= 32,</div><div class='del'>-		.result  = zeroed_string,</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\xfe\xff\xe9\x92\x86\x65\x73\x1c"</div><div class='del'>-			  "\x6d\x6a\x8f\x94\x67\x30\x83\x08"</div><div class='del'>-			  "\xfe\xff\xe9\x92\x86\x65\x73\x1c",</div><div class='del'>-		.klen	= 24,</div><div class='del'>-		.iv	= "\xca\xfe\xba\xbe\xfa\xce\xdb\xad"</div><div class='del'>-			  "\xde\xca\xf8\x88",</div><div class='del'>-		.input	= "\x39\x80\xca\x0b\x3c\x00\xe8\x41"</div><div class='del'>-			  "\xeb\x06\xfa\xc4\x87\x2a\x27\x57"</div><div class='del'>-			  "\x85\x9e\x1c\xea\xa6\xef\xd9\x84"</div><div class='del'>-			  "\x62\x85\x93\xb4\x0c\xa1\xe1\x9c"</div><div class='del'>-			  "\x7d\x77\x3d\x00\xc1\x44\xc5\x25"</div><div class='del'>-			  "\xac\x61\x9d\x18\xc8\x4a\x3f\x47"</div><div class='del'>-			  "\x18\xe2\x44\x8b\x2f\xe3\x24\xd9"</div><div class='del'>-			  "\xcc\xda\x27\x10\xac\xad\xe2\x56"</div><div class='del'>-			  "\x99\x24\xa7\xc8\x58\x73\x36\xbf"</div><div class='del'>-			  "\xb1\x18\x02\x4d\xb8\x67\x4a\x14",</div><div class='del'>-		.ilen	= 80,</div><div class='del'>-		.result = "\xd9\x31\x32\x25\xf8\x84\x06\xe5"</div><div class='del'>-			  "\xa5\x59\x09\xc5\xaf\xf5\x26\x9a"</div><div class='del'>-			  "\x86\xa7\xa9\x53\x15\x34\xf7\xda"</div><div class='del'>-			  "\x2e\x4c\x30\x3d\x8a\x31\x8a\x72"</div><div class='del'>-			  "\x1c\x3c\x0c\x95\x95\x68\x09\x53"</div><div class='del'>-			  "\x2f\xcf\x0e\x24\x49\xa6\xb5\x25"</div><div class='del'>-			  "\xb1\x6a\xed\xf5\xaa\x0d\xe6\x57"</div><div class='del'>-			  "\xba\x63\x7b\x39\x1a\xaf\xd2\x55",</div><div class='del'>-		.rlen	= 64,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\xfe\xff\xe9\x92\x86\x65\x73\x1c"</div><div class='del'>-			  "\x6d\x6a\x8f\x94\x67\x30\x83\x08"</div><div class='del'>-			  "\xfe\xff\xe9\x92\x86\x65\x73\x1c",</div><div class='del'>-		.klen	= 24,</div><div class='del'>-		.iv	= "\xca\xfe\xba\xbe\xfa\xce\xdb\xad"</div><div class='del'>-			  "\xde\xca\xf8\x88",</div><div class='del'>-		.input	= "\x39\x80\xca\x0b\x3c\x00\xe8\x41"</div><div class='del'>-			  "\xeb\x06\xfa\xc4\x87\x2a\x27\x57"</div><div class='del'>-			  "\x85\x9e\x1c\xea\xa6\xef\xd9\x84"</div><div class='del'>-			  "\x62\x85\x93\xb4\x0c\xa1\xe1\x9c"</div><div class='del'>-			  "\x7d\x77\x3d\x00\xc1\x44\xc5\x25"</div><div class='del'>-			  "\xac\x61\x9d\x18\xc8\x4a\x3f\x47"</div><div class='del'>-			  "\x18\xe2\x44\x8b\x2f\xe3\x24\xd9"</div><div class='del'>-			  "\xcc\xda\x27\x10"</div><div class='del'>-			  "\x25\x19\x49\x8e\x80\xf1\x47\x8f"</div><div class='del'>-			  "\x37\xba\x55\xbd\x6d\x27\x61\x8c",</div><div class='del'>-		.ilen	= 76,</div><div class='del'>-		.assoc	= "\xfe\xed\xfa\xce\xde\xad\xbe\xef"</div><div class='del'>-			  "\xfe\xed\xfa\xce\xde\xad\xbe\xef"</div><div class='del'>-			  "\xab\xad\xda\xd2",</div><div class='del'>-		.alen	= 20,</div><div class='del'>-		.result = "\xd9\x31\x32\x25\xf8\x84\x06\xe5"</div><div class='del'>-			  "\xa5\x59\x09\xc5\xaf\xf5\x26\x9a"</div><div class='del'>-			  "\x86\xa7\xa9\x53\x15\x34\xf7\xda"</div><div class='del'>-			  "\x2e\x4c\x30\x3d\x8a\x31\x8a\x72"</div><div class='del'>-			  "\x1c\x3c\x0c\x95\x95\x68\x09\x53"</div><div class='del'>-			  "\x2f\xcf\x0e\x24\x49\xa6\xb5\x25"</div><div class='del'>-			  "\xb1\x6a\xed\xf5\xaa\x0d\xe6\x57"</div><div class='del'>-			  "\xba\x63\x7b\x39",</div><div class='del'>-		.rlen	= 60,</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct aead_testvec aes_ccm_enc_tv_template[] = {</div><div class='del'>-	{ /* From RFC 3610 */</div><div class='del'>-		.key	= "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7"</div><div class='del'>-			  "\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.iv	= "\x01\x00\x00\x00\x03\x02\x01\x00"</div><div class='del'>-			  "\xa0\xa1\xa2\xa3\xa4\xa5\x00\x00",</div><div class='del'>-		.assoc	= "\x00\x01\x02\x03\x04\x05\x06\x07",</div><div class='del'>-		.alen	= 8,</div><div class='del'>-		.input	= "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='del'>-			  "\x10\x11\x12\x13\x14\x15\x16\x17"</div><div class='del'>-			  "\x18\x19\x1a\x1b\x1c\x1d\x1e",</div><div class='del'>-		.ilen	= 23,</div><div class='del'>-		.result	= "\x58\x8c\x97\x9a\x61\xc6\x63\xd2"</div><div class='del'>-			  "\xf0\x66\xd0\xc2\xc0\xf9\x89\x80"</div><div class='del'>-			  "\x6d\x5f\x6b\x61\xda\xc3\x84\x17"</div><div class='del'>-			  "\xe8\xd1\x2c\xfd\xf9\x26\xe0",</div><div class='del'>-		.rlen	= 31,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7"</div><div class='del'>-			  "\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.iv	= "\x01\x00\x00\x00\x07\x06\x05\x04"</div><div class='del'>-			  "\xa0\xa1\xa2\xa3\xa4\xa5\x00\x00",</div><div class='del'>-		.assoc	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='del'>-			  "\x08\x09\x0a\x0b",</div><div class='del'>-		.alen	= 12,</div><div class='del'>-		.input	= "\x0c\x0d\x0e\x0f\x10\x11\x12\x13"</div><div class='del'>-			  "\x14\x15\x16\x17\x18\x19\x1a\x1b"</div><div class='del'>-			  "\x1c\x1d\x1e\x1f",</div><div class='del'>-		.ilen	= 20,</div><div class='del'>-		.result	= "\xdc\xf1\xfb\x7b\x5d\x9e\x23\xfb"</div><div class='del'>-			  "\x9d\x4e\x13\x12\x53\x65\x8a\xd8"</div><div class='del'>-			  "\x6e\xbd\xca\x3e\x51\xe8\x3f\x07"</div><div class='del'>-			  "\x7d\x9c\x2d\x93",</div><div class='del'>-		.rlen	= 28,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7"</div><div class='del'>-			  "\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.iv	= "\x01\x00\x00\x00\x0b\x0a\x09\x08"</div><div class='del'>-			  "\xa0\xa1\xa2\xa3\xa4\xa5\x00\x00",</div><div class='del'>-		.assoc	= "\x00\x01\x02\x03\x04\x05\x06\x07",</div><div class='del'>-		.alen	= 8,</div><div class='del'>-		.input	= "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='del'>-			  "\x10\x11\x12\x13\x14\x15\x16\x17"</div><div class='del'>-			  "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f"</div><div class='del'>-			  "\x20",</div><div class='del'>-		.ilen	= 25,</div><div class='del'>-		.result	= "\x82\x53\x1a\x60\xcc\x24\x94\x5a"</div><div class='del'>-			  "\x4b\x82\x79\x18\x1a\xb5\xc8\x4d"</div><div class='del'>-			  "\xf2\x1c\xe7\xf9\xb7\x3f\x42\xe1"</div><div class='del'>-			  "\x97\xea\x9c\x07\xe5\x6b\x5e\xb1"</div><div class='del'>-			  "\x7e\x5f\x4e",</div><div class='del'>-		.rlen	= 35,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7"</div><div class='del'>-			  "\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.iv	= "\x01\x00\x00\x00\x0c\x0b\x0a\x09"</div><div class='del'>-			  "\xa0\xa1\xa2\xa3\xa4\xa5\x00\x00",</div><div class='del'>-		.assoc	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='del'>-			  "\x08\x09\x0a\x0b",</div><div class='del'>-		.alen	= 12,</div><div class='del'>-		.input	= "\x0c\x0d\x0e\x0f\x10\x11\x12\x13"</div><div class='del'>-			  "\x14\x15\x16\x17\x18\x19\x1a\x1b"</div><div class='del'>-			  "\x1c\x1d\x1e",</div><div class='del'>-		.ilen	= 19,</div><div class='del'>-		.result	= "\x07\x34\x25\x94\x15\x77\x85\x15"</div><div class='del'>-			  "\x2b\x07\x40\x98\x33\x0a\xbb\x14"</div><div class='del'>-			  "\x1b\x94\x7b\x56\x6a\xa9\x40\x6b"</div><div class='del'>-			  "\x4d\x99\x99\x88\xdd",</div><div class='del'>-		.rlen	= 29,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\xd7\x82\x8d\x13\xb2\xb0\xbd\xc3"</div><div class='del'>-			  "\x25\xa7\x62\x36\xdf\x93\xcc\x6b",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.iv	= "\x01\x00\x33\x56\x8e\xf7\xb2\x63"</div><div class='del'>-			  "\x3c\x96\x96\x76\x6c\xfa\x00\x00",</div><div class='del'>-		.assoc	= "\x63\x01\x8f\x76\xdc\x8a\x1b\xcb",</div><div class='del'>-		.alen	= 8,</div><div class='del'>-		.input	= "\x90\x20\xea\x6f\x91\xbd\xd8\x5a"</div><div class='del'>-			  "\xfa\x00\x39\xba\x4b\xaf\xf9\xbf"</div><div class='del'>-			  "\xb7\x9c\x70\x28\x94\x9c\xd0\xec",</div><div class='del'>-		.ilen	= 24,</div><div class='del'>-		.result	= "\x4c\xcb\x1e\x7c\xa9\x81\xbe\xfa"</div><div class='del'>-			  "\xa0\x72\x6c\x55\xd3\x78\x06\x12"</div><div class='del'>-			  "\x98\xc8\x5c\x92\x81\x4a\xbc\x33"</div><div class='del'>-			  "\xc5\x2e\xe8\x1d\x7d\x77\xc0\x8a",</div><div class='del'>-		.rlen	= 32,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\xd7\x82\x8d\x13\xb2\xb0\xbd\xc3"</div><div class='del'>-			  "\x25\xa7\x62\x36\xdf\x93\xcc\x6b",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.iv	= "\x01\x00\xd5\x60\x91\x2d\x3f\x70"</div><div class='del'>-			  "\x3c\x96\x96\x76\x6c\xfa\x00\x00",</div><div class='del'>-		.assoc	= "\xcd\x90\x44\xd2\xb7\x1f\xdb\x81"</div><div class='del'>-			  "\x20\xea\x60\xc0",</div><div class='del'>-		.alen	= 12,</div><div class='del'>-		.input	= "\x64\x35\xac\xba\xfb\x11\xa8\x2e"</div><div class='del'>-			  "\x2f\x07\x1d\x7c\xa4\xa5\xeb\xd9"</div><div class='del'>-			  "\x3a\x80\x3b\xa8\x7f",</div><div class='del'>-		.ilen	= 21,</div><div class='del'>-		.result	= "\x00\x97\x69\xec\xab\xdf\x48\x62"</div><div class='del'>-			  "\x55\x94\xc5\x92\x51\xe6\x03\x57"</div><div class='del'>-			  "\x22\x67\x5e\x04\xc8\x47\x09\x9e"</div><div class='del'>-			  "\x5a\xe0\x70\x45\x51",</div><div class='del'>-		.rlen	= 29,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\xd7\x82\x8d\x13\xb2\xb0\xbd\xc3"</div><div class='del'>-			  "\x25\xa7\x62\x36\xdf\x93\xcc\x6b",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.iv	= "\x01\x00\x42\xff\xf8\xf1\x95\x1c"</div><div class='del'>-			  "\x3c\x96\x96\x76\x6c\xfa\x00\x00",</div><div class='del'>-		.assoc	= "\xd8\x5b\xc7\xe6\x9f\x94\x4f\xb8",</div><div class='del'>-		.alen	= 8,</div><div class='del'>-		.input	= "\x8a\x19\xb9\x50\xbc\xf7\x1a\x01"</div><div class='del'>-			  "\x8e\x5e\x67\x01\xc9\x17\x87\x65"</div><div class='del'>-			  "\x98\x09\xd6\x7d\xbe\xdd\x18",</div><div class='del'>-		.ilen	= 23,</div><div class='del'>-		.result	= "\xbc\x21\x8d\xaa\x94\x74\x27\xb6"</div><div class='del'>-			  "\xdb\x38\x6a\x99\xac\x1a\xef\x23"</div><div class='del'>-			  "\xad\xe0\xb5\x29\x39\xcb\x6a\x63"</div><div class='del'>-			  "\x7c\xf9\xbe\xc2\x40\x88\x97\xc6"</div><div class='del'>-			  "\xba",</div><div class='del'>-		.rlen	= 33,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct aead_testvec aes_ccm_dec_tv_template[] = {</div><div class='del'>-	{ /* From RFC 3610 */</div><div class='del'>-		.key	= "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7"</div><div class='del'>-			  "\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.iv	= "\x01\x00\x00\x00\x03\x02\x01\x00"</div><div class='del'>-			  "\xa0\xa1\xa2\xa3\xa4\xa5\x00\x00",</div><div class='del'>-		.assoc	= "\x00\x01\x02\x03\x04\x05\x06\x07",</div><div class='del'>-		.alen	= 8,</div><div class='del'>-		.input	= "\x58\x8c\x97\x9a\x61\xc6\x63\xd2"</div><div class='del'>-			  "\xf0\x66\xd0\xc2\xc0\xf9\x89\x80"</div><div class='del'>-			  "\x6d\x5f\x6b\x61\xda\xc3\x84\x17"</div><div class='del'>-			  "\xe8\xd1\x2c\xfd\xf9\x26\xe0",</div><div class='del'>-		.ilen	= 31,</div><div class='del'>-		.result	= "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='del'>-			  "\x10\x11\x12\x13\x14\x15\x16\x17"</div><div class='del'>-			  "\x18\x19\x1a\x1b\x1c\x1d\x1e",</div><div class='del'>-		.rlen	= 23,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7"</div><div class='del'>-			  "\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.iv	= "\x01\x00\x00\x00\x07\x06\x05\x04"</div><div class='del'>-			  "\xa0\xa1\xa2\xa3\xa4\xa5\x00\x00",</div><div class='del'>-		.assoc	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='del'>-			  "\x08\x09\x0a\x0b",</div><div class='del'>-		.alen	= 12,</div><div class='del'>-		.input	= "\xdc\xf1\xfb\x7b\x5d\x9e\x23\xfb"</div><div class='del'>-			  "\x9d\x4e\x13\x12\x53\x65\x8a\xd8"</div><div class='del'>-			  "\x6e\xbd\xca\x3e\x51\xe8\x3f\x07"</div><div class='del'>-			  "\x7d\x9c\x2d\x93",</div><div class='del'>-		.ilen	= 28,</div><div class='del'>-		.result	= "\x0c\x0d\x0e\x0f\x10\x11\x12\x13"</div><div class='del'>-			  "\x14\x15\x16\x17\x18\x19\x1a\x1b"</div><div class='del'>-			  "\x1c\x1d\x1e\x1f",</div><div class='del'>-		.rlen	= 20,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7"</div><div class='del'>-			  "\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.iv	= "\x01\x00\x00\x00\x0b\x0a\x09\x08"</div><div class='del'>-			  "\xa0\xa1\xa2\xa3\xa4\xa5\x00\x00",</div><div class='del'>-		.assoc	= "\x00\x01\x02\x03\x04\x05\x06\x07",</div><div class='del'>-		.alen	= 8,</div><div class='del'>-		.input	= "\x82\x53\x1a\x60\xcc\x24\x94\x5a"</div><div class='del'>-			  "\x4b\x82\x79\x18\x1a\xb5\xc8\x4d"</div><div class='del'>-			  "\xf2\x1c\xe7\xf9\xb7\x3f\x42\xe1"</div><div class='del'>-			  "\x97\xea\x9c\x07\xe5\x6b\x5e\xb1"</div><div class='del'>-			  "\x7e\x5f\x4e",</div><div class='del'>-		.ilen	= 35,</div><div class='del'>-		.result	= "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='del'>-			  "\x10\x11\x12\x13\x14\x15\x16\x17"</div><div class='del'>-			  "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f"</div><div class='del'>-			  "\x20",</div><div class='del'>-		.rlen	= 25,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7"</div><div class='del'>-			  "\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.iv	= "\x01\x00\x00\x00\x0c\x0b\x0a\x09"</div><div class='del'>-			  "\xa0\xa1\xa2\xa3\xa4\xa5\x00\x00",</div><div class='del'>-		.assoc	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='del'>-			  "\x08\x09\x0a\x0b",</div><div class='del'>-		.alen	= 12,</div><div class='del'>-		.input	= "\x07\x34\x25\x94\x15\x77\x85\x15"</div><div class='del'>-			  "\x2b\x07\x40\x98\x33\x0a\xbb\x14"</div><div class='del'>-			  "\x1b\x94\x7b\x56\x6a\xa9\x40\x6b"</div><div class='del'>-			  "\x4d\x99\x99\x88\xdd",</div><div class='del'>-		.ilen	= 29,</div><div class='del'>-		.result	= "\x0c\x0d\x0e\x0f\x10\x11\x12\x13"</div><div class='del'>-			  "\x14\x15\x16\x17\x18\x19\x1a\x1b"</div><div class='del'>-			  "\x1c\x1d\x1e",</div><div class='del'>-		.rlen	= 19,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\xd7\x82\x8d\x13\xb2\xb0\xbd\xc3"</div><div class='del'>-			  "\x25\xa7\x62\x36\xdf\x93\xcc\x6b",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.iv	= "\x01\x00\x33\x56\x8e\xf7\xb2\x63"</div><div class='del'>-			  "\x3c\x96\x96\x76\x6c\xfa\x00\x00",</div><div class='del'>-		.assoc	= "\x63\x01\x8f\x76\xdc\x8a\x1b\xcb",</div><div class='del'>-		.alen	= 8,</div><div class='del'>-		.input	= "\x4c\xcb\x1e\x7c\xa9\x81\xbe\xfa"</div><div class='del'>-			  "\xa0\x72\x6c\x55\xd3\x78\x06\x12"</div><div class='del'>-			  "\x98\xc8\x5c\x92\x81\x4a\xbc\x33"</div><div class='del'>-			  "\xc5\x2e\xe8\x1d\x7d\x77\xc0\x8a",</div><div class='del'>-		.ilen	= 32,</div><div class='del'>-		.result	= "\x90\x20\xea\x6f\x91\xbd\xd8\x5a"</div><div class='del'>-			  "\xfa\x00\x39\xba\x4b\xaf\xf9\xbf"</div><div class='del'>-			  "\xb7\x9c\x70\x28\x94\x9c\xd0\xec",</div><div class='del'>-		.rlen	= 24,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\xd7\x82\x8d\x13\xb2\xb0\xbd\xc3"</div><div class='del'>-			  "\x25\xa7\x62\x36\xdf\x93\xcc\x6b",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.iv	= "\x01\x00\xd5\x60\x91\x2d\x3f\x70"</div><div class='del'>-			  "\x3c\x96\x96\x76\x6c\xfa\x00\x00",</div><div class='del'>-		.assoc	= "\xcd\x90\x44\xd2\xb7\x1f\xdb\x81"</div><div class='del'>-			  "\x20\xea\x60\xc0",</div><div class='del'>-		.alen	= 12,</div><div class='del'>-		.input	= "\x00\x97\x69\xec\xab\xdf\x48\x62"</div><div class='del'>-			  "\x55\x94\xc5\x92\x51\xe6\x03\x57"</div><div class='del'>-			  "\x22\x67\x5e\x04\xc8\x47\x09\x9e"</div><div class='del'>-			  "\x5a\xe0\x70\x45\x51",</div><div class='del'>-		.ilen	= 29,</div><div class='del'>-		.result	= "\x64\x35\xac\xba\xfb\x11\xa8\x2e"</div><div class='del'>-			  "\x2f\x07\x1d\x7c\xa4\xa5\xeb\xd9"</div><div class='del'>-			  "\x3a\x80\x3b\xa8\x7f",</div><div class='del'>-		.rlen	= 21,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\xd7\x82\x8d\x13\xb2\xb0\xbd\xc3"</div><div class='del'>-			  "\x25\xa7\x62\x36\xdf\x93\xcc\x6b",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.iv	= "\x01\x00\x42\xff\xf8\xf1\x95\x1c"</div><div class='del'>-			  "\x3c\x96\x96\x76\x6c\xfa\x00\x00",</div><div class='del'>-		.assoc	= "\xd8\x5b\xc7\xe6\x9f\x94\x4f\xb8",</div><div class='del'>-		.alen	= 8,</div><div class='del'>-		.input	= "\xbc\x21\x8d\xaa\x94\x74\x27\xb6"</div><div class='del'>-			  "\xdb\x38\x6a\x99\xac\x1a\xef\x23"</div><div class='del'>-			  "\xad\xe0\xb5\x29\x39\xcb\x6a\x63"</div><div class='del'>-			  "\x7c\xf9\xbe\xc2\x40\x88\x97\xc6"</div><div class='del'>-			  "\xba",</div><div class='del'>-		.ilen	= 33,</div><div class='del'>-		.result	= "\x8a\x19\xb9\x50\xbc\xf7\x1a\x01"</div><div class='del'>-			  "\x8e\x5e\x67\x01\xc9\x17\x87\x65"</div><div class='del'>-			  "\x98\x09\xd6\x7d\xbe\xdd\x18",</div><div class='del'>-		.rlen	= 23,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Cast5 test vectors from RFC 2144 */</div><div class='del'>-#define CAST5_ENC_TEST_VECTORS	3</div><div class='del'>-#define CAST5_DEC_TEST_VECTORS	3</div><div class='del'>-</div><div class='del'>-static struct cipher_testvec cast5_enc_tv_template[] = {</div><div class='del'>-	{</div><div class='del'>-		.key	= "\x01\x23\x45\x67\x12\x34\x56\x78"</div><div class='del'>-			  "\x23\x45\x67\x89\x34\x56\x78\x9a",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.input	= "\x01\x23\x45\x67\x89\xab\xcd\xef",</div><div class='del'>-		.ilen	= 8,</div><div class='del'>-		.result	= "\x23\x8b\x4f\xe5\x84\x7e\x44\xb2",</div><div class='del'>-		.rlen	= 8,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x01\x23\x45\x67\x12\x34\x56\x78"</div><div class='del'>-			  "\x23\x45",</div><div class='del'>-		.klen	= 10,</div><div class='del'>-		.input	= "\x01\x23\x45\x67\x89\xab\xcd\xef",</div><div class='del'>-		.ilen	= 8,</div><div class='del'>-		.result	= "\xeb\x6a\x71\x1a\x2c\x02\x27\x1b",</div><div class='del'>-		.rlen	= 8,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x01\x23\x45\x67\x12",</div><div class='del'>-		.klen	= 5,</div><div class='del'>-		.input	= "\x01\x23\x45\x67\x89\xab\xcd\xef",</div><div class='del'>-		.ilen	= 8,</div><div class='del'>-		.result	= "\x7a\xc8\x16\xd1\x6e\x9b\x30\x2e",</div><div class='del'>-		.rlen	= 8,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct cipher_testvec cast5_dec_tv_template[] = {</div><div class='del'>-	{</div><div class='del'>-		.key	= "\x01\x23\x45\x67\x12\x34\x56\x78"</div><div class='del'>-			  "\x23\x45\x67\x89\x34\x56\x78\x9a",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.input	= "\x23\x8b\x4f\xe5\x84\x7e\x44\xb2",</div><div class='del'>-		.ilen	= 8,</div><div class='del'>-		.result	= "\x01\x23\x45\x67\x89\xab\xcd\xef",</div><div class='del'>-		.rlen	= 8,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x01\x23\x45\x67\x12\x34\x56\x78"</div><div class='del'>-			  "\x23\x45",</div><div class='del'>-		.klen	= 10,</div><div class='del'>-		.input	= "\xeb\x6a\x71\x1a\x2c\x02\x27\x1b",</div><div class='del'>-		.ilen	= 8,</div><div class='del'>-		.result	= "\x01\x23\x45\x67\x89\xab\xcd\xef",</div><div class='del'>-		.rlen	= 8,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x01\x23\x45\x67\x12",</div><div class='del'>-		.klen	= 5,</div><div class='del'>-		.input	= "\x7a\xc8\x16\xd1\x6e\x9b\x30\x2e",</div><div class='del'>-		.ilen	= 8,</div><div class='del'>-		.result	= "\x01\x23\x45\x67\x89\xab\xcd\xef",</div><div class='del'>-		.rlen	= 8,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ARC4 test vectors from OpenSSL</div><div class='del'>- */</div><div class='del'>-#define ARC4_ENC_TEST_VECTORS	7</div><div class='del'>-#define ARC4_DEC_TEST_VECTORS	7</div><div class='del'>-</div><div class='del'>-static struct cipher_testvec arc4_enc_tv_template[] = {</div><div class='del'>-	{</div><div class='del'>-		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef",</div><div class='del'>-		.klen	= 8,</div><div class='del'>-		.input	= "\x01\x23\x45\x67\x89\xab\xcd\xef",</div><div class='del'>-		.ilen	= 8,</div><div class='del'>-		.result	= "\x75\xb7\x87\x80\x99\xe0\xc5\x96",</div><div class='del'>-		.rlen	= 8,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef",</div><div class='del'>-		.klen	= 8,</div><div class='del'>-		.input	= "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='del'>-		.ilen	= 8,</div><div class='del'>-		.result	= "\x74\x94\xc2\xe7\x10\x4b\x08\x79",</div><div class='del'>-		.rlen	= 8,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='del'>-		.klen	= 8,</div><div class='del'>-		.input	= "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='del'>-		.ilen	= 8,</div><div class='del'>-		.result	= "\xde\x18\x89\x41\xa3\x37\x5d\x3a",</div><div class='del'>-		.rlen	= 8,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\xef\x01\x23\x45",</div><div class='del'>-		.klen	= 4,</div><div class='del'>-		.input	= "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			  "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			  "\x00\x00\x00\x00",</div><div class='del'>-		.ilen	= 20,</div><div class='del'>-		.result	= "\xd6\xa1\x41\xa7\xec\x3c\x38\xdf"</div><div class='del'>-			  "\xbd\x61\x5a\x11\x62\xe1\xc7\xba"</div><div class='del'>-			  "\x36\xb6\x78\x58",</div><div class='del'>-		.rlen	= 20,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef",</div><div class='del'>-		.klen	= 8,</div><div class='del'>-		.input	= "\x12\x34\x56\x78\x9A\xBC\xDE\xF0"</div><div class='del'>-			  "\x12\x34\x56\x78\x9A\xBC\xDE\xF0"</div><div class='del'>-			  "\x12\x34\x56\x78\x9A\xBC\xDE\xF0"</div><div class='del'>-			  "\x12\x34\x56\x78",</div><div class='del'>-		.ilen	= 28,</div><div class='del'>-		.result	= "\x66\xa0\x94\x9f\x8a\xf7\xd6\x89"</div><div class='del'>-			  "\x1f\x7f\x83\x2b\xa8\x33\xc0\x0c"</div><div class='del'>-			  "\x89\x2e\xbe\x30\x14\x3c\xe2\x87"</div><div class='del'>-			  "\x40\x01\x1e\xcf",</div><div class='del'>-		.rlen	= 28,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\xef\x01\x23\x45",</div><div class='del'>-		.klen	= 4,</div><div class='del'>-		.input	= "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			  "\x00\x00",</div><div class='del'>-		.ilen	= 10,</div><div class='del'>-		.result	= "\xd6\xa1\x41\xa7\xec\x3c\x38\xdf"</div><div class='del'>-			  "\xbd\x61",</div><div class='del'>-		.rlen	= 10,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x01\x23\x45\x67\x89\xAB\xCD\xEF"</div><div class='del'>-			"\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.input	= "\x01\x23\x45\x67\x89\xAB\xCD\xEF",</div><div class='del'>-		.ilen	= 8,</div><div class='del'>-		.result	= "\x69\x72\x36\x59\x1B\x52\x42\xB1",</div><div class='del'>-		.rlen	= 8,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct cipher_testvec arc4_dec_tv_template[] = {</div><div class='del'>-	{</div><div class='del'>-		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef",</div><div class='del'>-		.klen	= 8,</div><div class='del'>-		.input	= "\x75\xb7\x87\x80\x99\xe0\xc5\x96",</div><div class='del'>-		.ilen	= 8,</div><div class='del'>-		.result	= "\x01\x23\x45\x67\x89\xab\xcd\xef",</div><div class='del'>-		.rlen	= 8,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef",</div><div class='del'>-		.klen	= 8,</div><div class='del'>-		.input	= "\x74\x94\xc2\xe7\x10\x4b\x08\x79",</div><div class='del'>-		.ilen	= 8,</div><div class='del'>-		.result	= "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='del'>-		.rlen	= 8,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='del'>-		.klen	= 8,</div><div class='del'>-		.input	= "\xde\x18\x89\x41\xa3\x37\x5d\x3a",</div><div class='del'>-		.ilen	= 8,</div><div class='del'>-		.result	= "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='del'>-		.rlen	= 8,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\xef\x01\x23\x45",</div><div class='del'>-		.klen	= 4,</div><div class='del'>-		.input	= "\xd6\xa1\x41\xa7\xec\x3c\x38\xdf"</div><div class='del'>-			  "\xbd\x61\x5a\x11\x62\xe1\xc7\xba"</div><div class='del'>-			  "\x36\xb6\x78\x58",</div><div class='del'>-		.ilen	= 20,</div><div class='del'>-		.result	= "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			  "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			  "\x00\x00\x00\x00",</div><div class='del'>-		.rlen	= 20,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef",</div><div class='del'>-		.klen	= 8,</div><div class='del'>-		.input	= "\x66\xa0\x94\x9f\x8a\xf7\xd6\x89"</div><div class='del'>-			  "\x1f\x7f\x83\x2b\xa8\x33\xc0\x0c"</div><div class='del'>-			  "\x89\x2e\xbe\x30\x14\x3c\xe2\x87"</div><div class='del'>-			  "\x40\x01\x1e\xcf",</div><div class='del'>-		.ilen	= 28,</div><div class='del'>-		.result	= "\x12\x34\x56\x78\x9A\xBC\xDE\xF0"</div><div class='del'>-			  "\x12\x34\x56\x78\x9A\xBC\xDE\xF0"</div><div class='del'>-			  "\x12\x34\x56\x78\x9A\xBC\xDE\xF0"</div><div class='del'>-			  "\x12\x34\x56\x78",</div><div class='del'>-		.rlen	= 28,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\xef\x01\x23\x45",</div><div class='del'>-		.klen	= 4,</div><div class='del'>-		.input	= "\xd6\xa1\x41\xa7\xec\x3c\x38\xdf"</div><div class='del'>-			  "\xbd\x61",</div><div class='del'>-		.ilen	= 10,</div><div class='del'>-		.result	= "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			  "\x00\x00",</div><div class='del'>-		.rlen	= 10,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x01\x23\x45\x67\x89\xAB\xCD\xEF"</div><div class='del'>-			"\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.input	= "\x69\x72\x36\x59\x1B\x52\x42\xB1",</div><div class='del'>-		.ilen	= 8,</div><div class='del'>-		.result	= "\x01\x23\x45\x67\x89\xAB\xCD\xEF",</div><div class='del'>-		.rlen	= 8,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * TEA test vectors</div><div class='del'>- */</div><div class='del'>-#define TEA_ENC_TEST_VECTORS	4</div><div class='del'>-#define TEA_DEC_TEST_VECTORS	4</div><div class='del'>-</div><div class='del'>-static struct cipher_testvec tea_enc_tv_template[] = {</div><div class='del'>-	{</div><div class='del'>-		.key    = zeroed_string,</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.input  = zeroed_string,</div><div class='del'>-		.ilen	= 8,</div><div class='del'>-		.result	= "\x0a\x3a\xea\x41\x40\xa9\xba\x94",</div><div class='del'>-		.rlen	= 8,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x2b\x02\x05\x68\x06\x14\x49\x76"</div><div class='del'>-			  "\x77\x5d\x0e\x26\x6c\x28\x78\x43",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.input	= "\x74\x65\x73\x74\x20\x6d\x65\x2e",</div><div class='del'>-		.ilen	= 8,</div><div class='del'>-		.result	= "\x77\x5d\x2a\x6a\xf6\xce\x92\x09",</div><div class='del'>-		.rlen	= 8,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x09\x65\x43\x11\x66\x44\x39\x25"</div><div class='del'>-			  "\x51\x3a\x16\x10\x0a\x08\x12\x6e",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.input	= "\x6c\x6f\x6e\x67\x65\x72\x5f\x74"</div><div class='del'>-			  "\x65\x73\x74\x5f\x76\x65\x63\x74",</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result	= "\xbe\x7a\xbb\x81\x95\x2d\x1f\x1e"</div><div class='del'>-			  "\xdd\x89\xa1\x25\x04\x21\xdf\x95",</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x4d\x76\x32\x17\x05\x3f\x75\x2c"</div><div class='del'>-			  "\x5d\x04\x16\x36\x15\x72\x63\x2f",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.input	= "\x54\x65\x61\x20\x69\x73\x20\x67"</div><div class='del'>-			  "\x6f\x6f\x64\x20\x66\x6f\x72\x20"</div><div class='del'>-			  "\x79\x6f\x75\x21\x21\x21\x20\x72"</div><div class='del'>-			  "\x65\x61\x6c\x6c\x79\x21\x21\x21",</div><div class='del'>-		.ilen	= 32,</div><div class='del'>-		.result	= "\xe0\x4d\x5d\x3c\xb7\x8c\x36\x47"</div><div class='del'>-			  "\x94\x18\x95\x91\xa9\xfc\x49\xf8"</div><div class='del'>-			  "\x44\xd1\x2d\xc2\x99\xb8\x08\x2a"</div><div class='del'>-			  "\x07\x89\x73\xc2\x45\x92\xc6\x90",</div><div class='del'>-		.rlen	= 32,</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct cipher_testvec tea_dec_tv_template[] = {</div><div class='del'>-	{</div><div class='del'>-		.key    = zeroed_string,</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.input	= "\x0a\x3a\xea\x41\x40\xa9\xba\x94",</div><div class='del'>-		.ilen	= 8,</div><div class='del'>-		.result = zeroed_string,</div><div class='del'>-		.rlen	= 8,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x2b\x02\x05\x68\x06\x14\x49\x76"</div><div class='del'>-			  "\x77\x5d\x0e\x26\x6c\x28\x78\x43",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.input	= "\x77\x5d\x2a\x6a\xf6\xce\x92\x09",</div><div class='del'>-		.ilen	= 8,</div><div class='del'>-		.result	= "\x74\x65\x73\x74\x20\x6d\x65\x2e",</div><div class='del'>-		.rlen	= 8,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x09\x65\x43\x11\x66\x44\x39\x25"</div><div class='del'>-			  "\x51\x3a\x16\x10\x0a\x08\x12\x6e",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.input	= "\xbe\x7a\xbb\x81\x95\x2d\x1f\x1e"</div><div class='del'>-			  "\xdd\x89\xa1\x25\x04\x21\xdf\x95",</div><div class='del'>-		.ilen   = 16,</div><div class='del'>-		.result	= "\x6c\x6f\x6e\x67\x65\x72\x5f\x74"</div><div class='del'>-			  "\x65\x73\x74\x5f\x76\x65\x63\x74",</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x4d\x76\x32\x17\x05\x3f\x75\x2c"</div><div class='del'>-			  "\x5d\x04\x16\x36\x15\x72\x63\x2f",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.input	= "\xe0\x4d\x5d\x3c\xb7\x8c\x36\x47"</div><div class='del'>-			  "\x94\x18\x95\x91\xa9\xfc\x49\xf8"</div><div class='del'>-			  "\x44\xd1\x2d\xc2\x99\xb8\x08\x2a"</div><div class='del'>-			  "\x07\x89\x73\xc2\x45\x92\xc6\x90",</div><div class='del'>-		.ilen	= 32,</div><div class='del'>-		.result	= "\x54\x65\x61\x20\x69\x73\x20\x67"</div><div class='del'>-			  "\x6f\x6f\x64\x20\x66\x6f\x72\x20"</div><div class='del'>-			  "\x79\x6f\x75\x21\x21\x21\x20\x72"</div><div class='del'>-			  "\x65\x61\x6c\x6c\x79\x21\x21\x21",</div><div class='del'>-		.rlen	= 32,</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * XTEA test vectors</div><div class='del'>- */</div><div class='del'>-#define XTEA_ENC_TEST_VECTORS	4</div><div class='del'>-#define XTEA_DEC_TEST_VECTORS	4</div><div class='del'>-</div><div class='del'>-static struct cipher_testvec xtea_enc_tv_template[] = {</div><div class='del'>-	{</div><div class='del'>-		.key    = zeroed_string,</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.input  = zeroed_string,</div><div class='del'>-		.ilen	= 8,</div><div class='del'>-		.result	= "\xd8\xd4\xe9\xde\xd9\x1e\x13\xf7",</div><div class='del'>-		.rlen	= 8,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x2b\x02\x05\x68\x06\x14\x49\x76"</div><div class='del'>-			  "\x77\x5d\x0e\x26\x6c\x28\x78\x43",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.input	= "\x74\x65\x73\x74\x20\x6d\x65\x2e",</div><div class='del'>-		.ilen	= 8,</div><div class='del'>-		.result	= "\x94\xeb\xc8\x96\x84\x6a\x49\xa8",</div><div class='del'>-		.rlen	= 8,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x09\x65\x43\x11\x66\x44\x39\x25"</div><div class='del'>-			  "\x51\x3a\x16\x10\x0a\x08\x12\x6e",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.input	= "\x6c\x6f\x6e\x67\x65\x72\x5f\x74"</div><div class='del'>-			  "\x65\x73\x74\x5f\x76\x65\x63\x74",</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result	= "\x3e\xce\xae\x22\x60\x56\xa8\x9d"</div><div class='del'>-			  "\x77\x4d\xd4\xb4\x87\x24\xe3\x9a",</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x4d\x76\x32\x17\x05\x3f\x75\x2c"</div><div class='del'>-			  "\x5d\x04\x16\x36\x15\x72\x63\x2f",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.input	= "\x54\x65\x61\x20\x69\x73\x20\x67"</div><div class='del'>-			  "\x6f\x6f\x64\x20\x66\x6f\x72\x20"</div><div class='del'>-			  "\x79\x6f\x75\x21\x21\x21\x20\x72"</div><div class='del'>-			  "\x65\x61\x6c\x6c\x79\x21\x21\x21",</div><div class='del'>-		.ilen	= 32,</div><div class='del'>-		.result	= "\x99\x81\x9f\x5d\x6f\x4b\x31\x3a"</div><div class='del'>-			  "\x86\xff\x6f\xd0\xe3\x87\x70\x07"</div><div class='del'>-			  "\x4d\xb8\xcf\xf3\x99\x50\xb3\xd4"</div><div class='del'>-			  "\x73\xa2\xfa\xc9\x16\x59\x5d\x81",</div><div class='del'>-		.rlen	= 32,</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct cipher_testvec xtea_dec_tv_template[] = {</div><div class='del'>-	{</div><div class='del'>-		.key    = zeroed_string,</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.input	= "\xd8\xd4\xe9\xde\xd9\x1e\x13\xf7",</div><div class='del'>-		.ilen	= 8,</div><div class='del'>-		.result = zeroed_string,</div><div class='del'>-		.rlen	= 8,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x2b\x02\x05\x68\x06\x14\x49\x76"</div><div class='del'>-			  "\x77\x5d\x0e\x26\x6c\x28\x78\x43",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.input	= "\x94\xeb\xc8\x96\x84\x6a\x49\xa8",</div><div class='del'>-		.ilen	= 8,</div><div class='del'>-		.result	= "\x74\x65\x73\x74\x20\x6d\x65\x2e",</div><div class='del'>-		.rlen	= 8,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x09\x65\x43\x11\x66\x44\x39\x25"</div><div class='del'>-			  "\x51\x3a\x16\x10\x0a\x08\x12\x6e",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.input	= "\x3e\xce\xae\x22\x60\x56\xa8\x9d"</div><div class='del'>-			  "\x77\x4d\xd4\xb4\x87\x24\xe3\x9a",</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result	= "\x6c\x6f\x6e\x67\x65\x72\x5f\x74"</div><div class='del'>-			  "\x65\x73\x74\x5f\x76\x65\x63\x74",</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x4d\x76\x32\x17\x05\x3f\x75\x2c"</div><div class='del'>-			  "\x5d\x04\x16\x36\x15\x72\x63\x2f",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.input	= "\x99\x81\x9f\x5d\x6f\x4b\x31\x3a"</div><div class='del'>-			  "\x86\xff\x6f\xd0\xe3\x87\x70\x07"</div><div class='del'>-			  "\x4d\xb8\xcf\xf3\x99\x50\xb3\xd4"</div><div class='del'>-			  "\x73\xa2\xfa\xc9\x16\x59\x5d\x81",</div><div class='del'>-		.ilen	= 32,</div><div class='del'>-		.result	= "\x54\x65\x61\x20\x69\x73\x20\x67"</div><div class='del'>-			  "\x6f\x6f\x64\x20\x66\x6f\x72\x20"</div><div class='del'>-			  "\x79\x6f\x75\x21\x21\x21\x20\x72"</div><div class='del'>-			  "\x65\x61\x6c\x6c\x79\x21\x21\x21",</div><div class='del'>-		.rlen	= 32,</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * KHAZAD test vectors.</div><div class='del'>- */</div><div class='del'>-#define KHAZAD_ENC_TEST_VECTORS 5</div><div class='del'>-#define KHAZAD_DEC_TEST_VECTORS 5</div><div class='del'>-</div><div class='del'>-static struct cipher_testvec khazad_enc_tv_template[] = {</div><div class='del'>-	{</div><div class='del'>-		.key	= "\x80\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			  "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.input	= "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='del'>-		.ilen	= 8,</div><div class='del'>-		.result	= "\x49\xa4\xce\x32\xac\x19\x0e\x3f",</div><div class='del'>-		.rlen	= 8,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x38\x38\x38\x38\x38\x38\x38\x38"</div><div class='del'>-			  "\x38\x38\x38\x38\x38\x38\x38\x38",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.input	= "\x38\x38\x38\x38\x38\x38\x38\x38",</div><div class='del'>-		.ilen	= 8,</div><div class='del'>-		.result	= "\x7e\x82\x12\xa1\xd9\x5b\xe4\xf9",</div><div class='del'>-		.rlen	= 8,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\xa2\xa2\xa2\xa2\xa2\xa2\xa2\xa2"</div><div class='del'>-			"\xa2\xa2\xa2\xa2\xa2\xa2\xa2\xa2",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.input	= "\xa2\xa2\xa2\xa2\xa2\xa2\xa2\xa2",</div><div class='del'>-		.ilen	= 8,</div><div class='del'>-		.result	= "\xaa\xbe\xc1\x95\xc5\x94\x1a\x9c",</div><div class='del'>-		.rlen	= 8,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x2f\x2f\x2f\x2f\x2f\x2f\x2f\x2f"</div><div class='del'>-			"\x2f\x2f\x2f\x2f\x2f\x2f\x2f\x2f",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.input	= "\x2f\x2f\x2f\x2f\x2f\x2f\x2f\x2f",</div><div class='del'>-		.ilen	= 8,</div><div class='del'>-		.result = "\x04\x74\xf5\x70\x50\x16\xd3\xb8",</div><div class='del'>-		.rlen	= 8,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x2f\x2f\x2f\x2f\x2f\x2f\x2f\x2f"</div><div class='del'>-			"\x2f\x2f\x2f\x2f\x2f\x2f\x2f\x2f",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.input	= "\x2f\x2f\x2f\x2f\x2f\x2f\x2f\x2f"</div><div class='del'>-			"\x2f\x2f\x2f\x2f\x2f\x2f\x2f\x2f",</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result = "\x04\x74\xf5\x70\x50\x16\xd3\xb8"</div><div class='del'>-			"\x04\x74\xf5\x70\x50\x16\xd3\xb8",</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct cipher_testvec khazad_dec_tv_template[] = {</div><div class='del'>-	{</div><div class='del'>-		.key	= "\x80\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			  "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.input	= "\x49\xa4\xce\x32\xac\x19\x0e\x3f",</div><div class='del'>-		.ilen	= 8,</div><div class='del'>-		.result	= "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='del'>-		.rlen	= 8,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x38\x38\x38\x38\x38\x38\x38\x38"</div><div class='del'>-			  "\x38\x38\x38\x38\x38\x38\x38\x38",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.input	= "\x7e\x82\x12\xa1\xd9\x5b\xe4\xf9",</div><div class='del'>-		.ilen	= 8,</div><div class='del'>-		.result	= "\x38\x38\x38\x38\x38\x38\x38\x38",</div><div class='del'>-		.rlen	= 8,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\xa2\xa2\xa2\xa2\xa2\xa2\xa2\xa2"</div><div class='del'>-			"\xa2\xa2\xa2\xa2\xa2\xa2\xa2\xa2",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.input	= "\xaa\xbe\xc1\x95\xc5\x94\x1a\x9c",</div><div class='del'>-		.ilen	= 8,</div><div class='del'>-		.result	= "\xa2\xa2\xa2\xa2\xa2\xa2\xa2\xa2",</div><div class='del'>-		.rlen	= 8,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x2f\x2f\x2f\x2f\x2f\x2f\x2f\x2f"</div><div class='del'>-			"\x2f\x2f\x2f\x2f\x2f\x2f\x2f\x2f",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.input  = "\x04\x74\xf5\x70\x50\x16\xd3\xb8",</div><div class='del'>-		.ilen	= 8,</div><div class='del'>-		.result	= "\x2f\x2f\x2f\x2f\x2f\x2f\x2f\x2f",</div><div class='del'>-		.rlen	= 8,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x2f\x2f\x2f\x2f\x2f\x2f\x2f\x2f"</div><div class='del'>-			"\x2f\x2f\x2f\x2f\x2f\x2f\x2f\x2f",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.input  = "\x04\x74\xf5\x70\x50\x16\xd3\xb8"</div><div class='del'>-			"\x04\x74\xf5\x70\x50\x16\xd3\xb8",</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result	= "\x2f\x2f\x2f\x2f\x2f\x2f\x2f\x2f"</div><div class='del'>-			"\x2f\x2f\x2f\x2f\x2f\x2f\x2f\x2f",</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Anubis test vectors.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define ANUBIS_ENC_TEST_VECTORS			5</div><div class='del'>-#define ANUBIS_DEC_TEST_VECTORS			5</div><div class='del'>-#define ANUBIS_CBC_ENC_TEST_VECTORS		2</div><div class='del'>-#define ANUBIS_CBC_DEC_TEST_VECTORS		2</div><div class='del'>-</div><div class='del'>-static struct cipher_testvec anubis_enc_tv_template[] = {</div><div class='del'>-	{</div><div class='del'>-		.key	= "\xfe\xfe\xfe\xfe\xfe\xfe\xfe\xfe"</div><div class='del'>-			  "\xfe\xfe\xfe\xfe\xfe\xfe\xfe\xfe",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.input	= "\xfe\xfe\xfe\xfe\xfe\xfe\xfe\xfe"</div><div class='del'>-			  "\xfe\xfe\xfe\xfe\xfe\xfe\xfe\xfe",</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result	= "\x6d\xc5\xda\xa2\x26\x7d\x62\x6f"</div><div class='del'>-			  "\x08\xb7\x52\x8e\x6e\x6e\x86\x90",</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	}, {</div><div class='del'>-</div><div class='del'>-		.key	= "\x03\x03\x03\x03\x03\x03\x03\x03"</div><div class='del'>-			  "\x03\x03\x03\x03\x03\x03\x03\x03"</div><div class='del'>-			  "\x03\x03\x03\x03",</div><div class='del'>-		.klen	= 20,</div><div class='del'>-		.input	= "\x03\x03\x03\x03\x03\x03\x03\x03"</div><div class='del'>-			  "\x03\x03\x03\x03\x03\x03\x03\x03",</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result	= "\xdb\xf1\x42\xf4\xd1\x8a\xc7\x49"</div><div class='del'>-			  "\x87\x41\x6f\x82\x0a\x98\x64\xae",</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x24\x24\x24\x24\x24\x24\x24\x24"</div><div class='del'>-			  "\x24\x24\x24\x24\x24\x24\x24\x24"</div><div class='del'>-			  "\x24\x24\x24\x24\x24\x24\x24\x24"</div><div class='del'>-			  "\x24\x24\x24\x24",</div><div class='del'>-		.klen	= 28,</div><div class='del'>-		.input	= "\x24\x24\x24\x24\x24\x24\x24\x24"</div><div class='del'>-			  "\x24\x24\x24\x24\x24\x24\x24\x24",</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result	= "\xfd\x1b\x4a\xe3\xbf\xf0\xad\x3d"</div><div class='del'>-			  "\x06\xd3\x61\x27\xfd\x13\x9e\xde",</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x25\x25\x25\x25\x25\x25\x25\x25"</div><div class='del'>-			  "\x25\x25\x25\x25\x25\x25\x25\x25"</div><div class='del'>-			  "\x25\x25\x25\x25\x25\x25\x25\x25"</div><div class='del'>-			  "\x25\x25\x25\x25\x25\x25\x25\x25",</div><div class='del'>-		.klen	= 32,</div><div class='del'>-		.input	= "\x25\x25\x25\x25\x25\x25\x25\x25"</div><div class='del'>-			  "\x25\x25\x25\x25\x25\x25\x25\x25",</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result	= "\x1a\x91\xfb\x2b\xb7\x78\x6b\xc4"</div><div class='del'>-			"\x17\xd9\xff\x40\x3b\x0e\xe5\xfe",</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x35\x35\x35\x35\x35\x35\x35\x35"</div><div class='del'>-			  "\x35\x35\x35\x35\x35\x35\x35\x35"</div><div class='del'>-			  "\x35\x35\x35\x35\x35\x35\x35\x35"</div><div class='del'>-			  "\x35\x35\x35\x35\x35\x35\x35\x35"</div><div class='del'>-			  "\x35\x35\x35\x35\x35\x35\x35\x35",</div><div class='del'>-		.klen	= 40,</div><div class='del'>-		.input	= "\x35\x35\x35\x35\x35\x35\x35\x35"</div><div class='del'>-			  "\x35\x35\x35\x35\x35\x35\x35\x35",</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result = "\xa5\x2c\x85\x6f\x9c\xba\xa0\x97"</div><div class='del'>-			  "\x9e\xc6\x84\x0f\x17\x21\x07\xee",</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct cipher_testvec anubis_dec_tv_template[] = {</div><div class='del'>-	{</div><div class='del'>-		.key	= "\xfe\xfe\xfe\xfe\xfe\xfe\xfe\xfe"</div><div class='del'>-			  "\xfe\xfe\xfe\xfe\xfe\xfe\xfe\xfe",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.input	= "\x6d\xc5\xda\xa2\x26\x7d\x62\x6f"</div><div class='del'>-			  "\x08\xb7\x52\x8e\x6e\x6e\x86\x90",</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result	= "\xfe\xfe\xfe\xfe\xfe\xfe\xfe\xfe"</div><div class='del'>-			  "\xfe\xfe\xfe\xfe\xfe\xfe\xfe\xfe",</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	}, {</div><div class='del'>-</div><div class='del'>-		.key	= "\x03\x03\x03\x03\x03\x03\x03\x03"</div><div class='del'>-			  "\x03\x03\x03\x03\x03\x03\x03\x03"</div><div class='del'>-			  "\x03\x03\x03\x03",</div><div class='del'>-		.klen	= 20,</div><div class='del'>-		.input	= "\xdb\xf1\x42\xf4\xd1\x8a\xc7\x49"</div><div class='del'>-			  "\x87\x41\x6f\x82\x0a\x98\x64\xae",</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result	= "\x03\x03\x03\x03\x03\x03\x03\x03"</div><div class='del'>-			  "\x03\x03\x03\x03\x03\x03\x03\x03",</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x24\x24\x24\x24\x24\x24\x24\x24"</div><div class='del'>-			  "\x24\x24\x24\x24\x24\x24\x24\x24"</div><div class='del'>-			  "\x24\x24\x24\x24\x24\x24\x24\x24"</div><div class='del'>-			  "\x24\x24\x24\x24",</div><div class='del'>-		.klen	= 28,</div><div class='del'>-		.input	= "\xfd\x1b\x4a\xe3\xbf\xf0\xad\x3d"</div><div class='del'>-			  "\x06\xd3\x61\x27\xfd\x13\x9e\xde",</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result	= "\x24\x24\x24\x24\x24\x24\x24\x24"</div><div class='del'>-			  "\x24\x24\x24\x24\x24\x24\x24\x24",</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x25\x25\x25\x25\x25\x25\x25\x25"</div><div class='del'>-			  "\x25\x25\x25\x25\x25\x25\x25\x25"</div><div class='del'>-			  "\x25\x25\x25\x25\x25\x25\x25\x25"</div><div class='del'>-			  "\x25\x25\x25\x25\x25\x25\x25\x25",</div><div class='del'>-		.klen	= 32,</div><div class='del'>-		.input	= "\x1a\x91\xfb\x2b\xb7\x78\x6b\xc4"</div><div class='del'>-			"\x17\xd9\xff\x40\x3b\x0e\xe5\xfe",</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result	= "\x25\x25\x25\x25\x25\x25\x25\x25"</div><div class='del'>-			  "\x25\x25\x25\x25\x25\x25\x25\x25",</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x35\x35\x35\x35\x35\x35\x35\x35"</div><div class='del'>-			  "\x35\x35\x35\x35\x35\x35\x35\x35"</div><div class='del'>-			  "\x35\x35\x35\x35\x35\x35\x35\x35"</div><div class='del'>-			  "\x35\x35\x35\x35\x35\x35\x35\x35"</div><div class='del'>-			  "\x35\x35\x35\x35\x35\x35\x35\x35",</div><div class='del'>-		.input = "\xa5\x2c\x85\x6f\x9c\xba\xa0\x97"</div><div class='del'>-			 "\x9e\xc6\x84\x0f\x17\x21\x07\xee",</div><div class='del'>-		.klen	= 40,</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result	= "\x35\x35\x35\x35\x35\x35\x35\x35"</div><div class='del'>-			  "\x35\x35\x35\x35\x35\x35\x35\x35",</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct cipher_testvec anubis_cbc_enc_tv_template[] = {</div><div class='del'>-	{</div><div class='del'>-		.key	= "\xfe\xfe\xfe\xfe\xfe\xfe\xfe\xfe"</div><div class='del'>-			  "\xfe\xfe\xfe\xfe\xfe\xfe\xfe\xfe",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.input	= "\xfe\xfe\xfe\xfe\xfe\xfe\xfe\xfe"</div><div class='del'>-			  "\xfe\xfe\xfe\xfe\xfe\xfe\xfe\xfe"</div><div class='del'>-			  "\xfe\xfe\xfe\xfe\xfe\xfe\xfe\xfe"</div><div class='del'>-			  "\xfe\xfe\xfe\xfe\xfe\xfe\xfe\xfe",</div><div class='del'>-		.ilen	= 32,</div><div class='del'>-		.result	= "\x6d\xc5\xda\xa2\x26\x7d\x62\x6f"</div><div class='del'>-			  "\x08\xb7\x52\x8e\x6e\x6e\x86\x90"</div><div class='del'>-			  "\x86\xd8\xb5\x6f\x98\x5e\x8a\x66"</div><div class='del'>-			  "\x4f\x1f\x78\xa1\xbb\x37\xf1\xbe",</div><div class='del'>-		.rlen	= 32,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x35\x35\x35\x35\x35\x35\x35\x35"</div><div class='del'>-			  "\x35\x35\x35\x35\x35\x35\x35\x35"</div><div class='del'>-			  "\x35\x35\x35\x35\x35\x35\x35\x35"</div><div class='del'>-			  "\x35\x35\x35\x35\x35\x35\x35\x35"</div><div class='del'>-			  "\x35\x35\x35\x35\x35\x35\x35\x35",</div><div class='del'>-		.klen	= 40,</div><div class='del'>-		.input	= "\x35\x35\x35\x35\x35\x35\x35\x35"</div><div class='del'>-			  "\x35\x35\x35\x35\x35\x35\x35\x35"</div><div class='del'>-			  "\x35\x35\x35\x35\x35\x35\x35\x35"</div><div class='del'>-			  "\x35\x35\x35\x35\x35\x35\x35\x35",</div><div class='del'>-		.ilen	= 32,</div><div class='del'>-		.result = "\xa5\x2c\x85\x6f\x9c\xba\xa0\x97"</div><div class='del'>-			  "\x9e\xc6\x84\x0f\x17\x21\x07\xee"</div><div class='del'>-			  "\xa2\xbc\x06\x98\xc6\x4b\xda\x75"</div><div class='del'>-			  "\x2e\xaa\xbe\x58\xce\x01\x5b\xc7",</div><div class='del'>-		.rlen	= 32,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct cipher_testvec anubis_cbc_dec_tv_template[] = {</div><div class='del'>-	{</div><div class='del'>-		.key	= "\xfe\xfe\xfe\xfe\xfe\xfe\xfe\xfe"</div><div class='del'>-			  "\xfe\xfe\xfe\xfe\xfe\xfe\xfe\xfe",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.input	= "\x6d\xc5\xda\xa2\x26\x7d\x62\x6f"</div><div class='del'>-			  "\x08\xb7\x52\x8e\x6e\x6e\x86\x90"</div><div class='del'>-			  "\x86\xd8\xb5\x6f\x98\x5e\x8a\x66"</div><div class='del'>-			  "\x4f\x1f\x78\xa1\xbb\x37\xf1\xbe",</div><div class='del'>-		.ilen	= 32,</div><div class='del'>-		.result	= "\xfe\xfe\xfe\xfe\xfe\xfe\xfe\xfe"</div><div class='del'>-			  "\xfe\xfe\xfe\xfe\xfe\xfe\xfe\xfe"</div><div class='del'>-			  "\xfe\xfe\xfe\xfe\xfe\xfe\xfe\xfe"</div><div class='del'>-			  "\xfe\xfe\xfe\xfe\xfe\xfe\xfe\xfe",</div><div class='del'>-		.rlen	= 32,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x35\x35\x35\x35\x35\x35\x35\x35"</div><div class='del'>-			  "\x35\x35\x35\x35\x35\x35\x35\x35"</div><div class='del'>-			  "\x35\x35\x35\x35\x35\x35\x35\x35"</div><div class='del'>-			  "\x35\x35\x35\x35\x35\x35\x35\x35"</div><div class='del'>-			  "\x35\x35\x35\x35\x35\x35\x35\x35",</div><div class='del'>-		.klen	= 40,</div><div class='del'>-		.input = "\xa5\x2c\x85\x6f\x9c\xba\xa0\x97"</div><div class='del'>-			  "\x9e\xc6\x84\x0f\x17\x21\x07\xee"</div><div class='del'>-			  "\xa2\xbc\x06\x98\xc6\x4b\xda\x75"</div><div class='del'>-			  "\x2e\xaa\xbe\x58\xce\x01\x5b\xc7",</div><div class='del'>-		.ilen	= 32,</div><div class='del'>-		.result	= "\x35\x35\x35\x35\x35\x35\x35\x35"</div><div class='del'>-			  "\x35\x35\x35\x35\x35\x35\x35\x35"</div><div class='del'>-			  "\x35\x35\x35\x35\x35\x35\x35\x35"</div><div class='del'>-			  "\x35\x35\x35\x35\x35\x35\x35\x35",</div><div class='del'>-		.rlen	= 32,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * XETA test vectors </div><div class='del'>- */</div><div class='del'>-#define XETA_ENC_TEST_VECTORS	4</div><div class='del'>-#define XETA_DEC_TEST_VECTORS	4</div><div class='del'>-</div><div class='del'>-static struct cipher_testvec xeta_enc_tv_template[] = {</div><div class='del'>-	{</div><div class='del'>-		.key    = zeroed_string,</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.input  = zeroed_string,</div><div class='del'>-		.ilen	= 8,</div><div class='del'>-		.result	= "\xaa\x22\x96\xe5\x6c\x61\xf3\x45",</div><div class='del'>-		.rlen	= 8,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x2b\x02\x05\x68\x06\x14\x49\x76"</div><div class='del'>-			  "\x77\x5d\x0e\x26\x6c\x28\x78\x43",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.input	= "\x74\x65\x73\x74\x20\x6d\x65\x2e",</div><div class='del'>-		.ilen	= 8,</div><div class='del'>-		.result	= "\x82\x3e\xeb\x35\xdc\xdd\xd9\xc3",</div><div class='del'>-		.rlen	= 8,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x09\x65\x43\x11\x66\x44\x39\x25"</div><div class='del'>-			  "\x51\x3a\x16\x10\x0a\x08\x12\x6e",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.input	= "\x6c\x6f\x6e\x67\x65\x72\x5f\x74"</div><div class='del'>-			  "\x65\x73\x74\x5f\x76\x65\x63\x74",</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result	= "\xe2\x04\xdb\xf2\x89\x85\x9e\xea"</div><div class='del'>-			  "\x61\x35\xaa\xed\xb5\xcb\x71\x2c",</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x4d\x76\x32\x17\x05\x3f\x75\x2c"</div><div class='del'>-			  "\x5d\x04\x16\x36\x15\x72\x63\x2f",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.input	= "\x54\x65\x61\x20\x69\x73\x20\x67"</div><div class='del'>-			  "\x6f\x6f\x64\x20\x66\x6f\x72\x20"</div><div class='del'>-			  "\x79\x6f\x75\x21\x21\x21\x20\x72"</div><div class='del'>-			  "\x65\x61\x6c\x6c\x79\x21\x21\x21",</div><div class='del'>-		.ilen	= 32,</div><div class='del'>-		.result	= "\x0b\x03\xcd\x8a\xbe\x95\xfd\xb1"</div><div class='del'>-			  "\xc1\x44\x91\x0b\xa5\xc9\x1b\xb4"</div><div class='del'>-			  "\xa9\xda\x1e\x9e\xb1\x3e\x2a\x8f"</div><div class='del'>-			  "\xea\xa5\x6a\x85\xd1\xf4\xa8\xa5",</div><div class='del'>-		.rlen	= 32,</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct cipher_testvec xeta_dec_tv_template[] = {</div><div class='del'>-	{</div><div class='del'>-		.key    = zeroed_string,</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.input	= "\xaa\x22\x96\xe5\x6c\x61\xf3\x45",</div><div class='del'>-		.ilen	= 8,</div><div class='del'>-		.result = zeroed_string,</div><div class='del'>-		.rlen	= 8,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x2b\x02\x05\x68\x06\x14\x49\x76"</div><div class='del'>-			  "\x77\x5d\x0e\x26\x6c\x28\x78\x43",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.input	= "\x82\x3e\xeb\x35\xdc\xdd\xd9\xc3",</div><div class='del'>-		.ilen	= 8,</div><div class='del'>-		.result	= "\x74\x65\x73\x74\x20\x6d\x65\x2e",</div><div class='del'>-		.rlen	= 8,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x09\x65\x43\x11\x66\x44\x39\x25"</div><div class='del'>-			  "\x51\x3a\x16\x10\x0a\x08\x12\x6e",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.input	= "\xe2\x04\xdb\xf2\x89\x85\x9e\xea"</div><div class='del'>-			  "\x61\x35\xaa\xed\xb5\xcb\x71\x2c",</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result	= "\x6c\x6f\x6e\x67\x65\x72\x5f\x74"</div><div class='del'>-			  "\x65\x73\x74\x5f\x76\x65\x63\x74",</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x4d\x76\x32\x17\x05\x3f\x75\x2c"</div><div class='del'>-			  "\x5d\x04\x16\x36\x15\x72\x63\x2f",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.input	= "\x0b\x03\xcd\x8a\xbe\x95\xfd\xb1"</div><div class='del'>-			  "\xc1\x44\x91\x0b\xa5\xc9\x1b\xb4"</div><div class='del'>-			  "\xa9\xda\x1e\x9e\xb1\x3e\x2a\x8f"</div><div class='del'>-			  "\xea\xa5\x6a\x85\xd1\xf4\xa8\xa5",</div><div class='del'>-		.ilen	= 32,</div><div class='del'>-		.result	= "\x54\x65\x61\x20\x69\x73\x20\x67"</div><div class='del'>-			  "\x6f\x6f\x64\x20\x66\x6f\x72\x20"</div><div class='del'>-			  "\x79\x6f\x75\x21\x21\x21\x20\x72"</div><div class='del'>-			  "\x65\x61\x6c\x6c\x79\x21\x21\x21",</div><div class='del'>-		.rlen	= 32,</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * FCrypt test vectors </div><div class='del'>- */</div><div class='del'>-#define FCRYPT_ENC_TEST_VECTORS	ARRAY_SIZE(fcrypt_pcbc_enc_tv_template)</div><div class='del'>-#define FCRYPT_DEC_TEST_VECTORS	ARRAY_SIZE(fcrypt_pcbc_dec_tv_template)</div><div class='del'>-</div><div class='del'>-static struct cipher_testvec fcrypt_pcbc_enc_tv_template[] = {</div><div class='del'>-	{ /* http://www.openafs.org/pipermail/openafs-devel/2000-December/005320.html */</div><div class='del'>-		.key	= "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='del'>-		.klen	= 8,</div><div class='del'>-		.iv	= "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='del'>-		.input	= "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='del'>-		.ilen	= 8,</div><div class='del'>-		.result	= "\x0E\x09\x00\xC7\x3E\xF7\xED\x41",</div><div class='del'>-		.rlen	= 8,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x11\x44\x77\xAA\xDD\x00\x33\x66",</div><div class='del'>-		.klen	= 8,</div><div class='del'>-		.iv	= "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='del'>-		.input	= "\x12\x34\x56\x78\x9A\xBC\xDE\xF0",</div><div class='del'>-		.ilen	= 8,</div><div class='del'>-		.result	= "\xD8\xED\x78\x74\x77\xEC\x06\x80",</div><div class='del'>-		.rlen	= 8,</div><div class='del'>-	}, { /* From Arla */</div><div class='del'>-		.key	= "\xf0\xe1\xd2\xc3\xb4\xa5\x96\x87",</div><div class='del'>-		.klen	= 8,</div><div class='del'>-		.iv	= "\xfe\xdc\xba\x98\x76\x54\x32\x10",</div><div class='del'>-		.input	= "The quick brown fox jumps over the lazy dogs.\0\0",</div><div class='del'>-		.ilen	= 48,</div><div class='del'>-		.result	= "\x00\xf0\x0e\x11\x75\xe6\x23\x82"</div><div class='del'>-			  "\xee\xac\x98\x62\x44\x51\xe4\x84"</div><div class='del'>-			  "\xc3\x59\xd8\xaa\x64\x60\xae\xf7"</div><div class='del'>-			  "\xd2\xd9\x13\x79\x72\xa3\x45\x03"</div><div class='del'>-			  "\x23\xb5\x62\xd7\x0c\xf5\x27\xd1"</div><div class='del'>-			  "\xf8\x91\x3c\xac\x44\x22\x92\xef",</div><div class='del'>-		.rlen	= 48,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\xfe\xdc\xba\x98\x76\x54\x32\x10",</div><div class='del'>-		.klen	= 8,</div><div class='del'>-		.iv	= "\xf0\xe1\xd2\xc3\xb4\xa5\x96\x87",</div><div class='del'>-		.input	= "The quick brown fox jumps over the lazy dogs.\0\0",</div><div class='del'>-		.ilen	= 48,</div><div class='del'>-		.result	= "\xca\x90\xf5\x9d\xcb\xd4\xd2\x3c"</div><div class='del'>-			  "\x01\x88\x7f\x3e\x31\x6e\x62\x9d"</div><div class='del'>-			  "\xd8\xe0\x57\xa3\x06\x3a\x42\x58"</div><div class='del'>-			  "\x2a\x28\xfe\x72\x52\x2f\xdd\xe0"</div><div class='del'>-			  "\x19\x89\x09\x1c\x2a\x8e\x8c\x94"</div><div class='del'>-			  "\xfc\xc7\x68\xe4\x88\xaa\xde\x0f",</div><div class='del'>-		.rlen	= 48,</div><div class='del'>-	}, { /* split-page version */</div><div class='del'>-		.key	= "\xfe\xdc\xba\x98\x76\x54\x32\x10",</div><div class='del'>-		.klen	= 8,</div><div class='del'>-		.iv	= "\xf0\xe1\xd2\xc3\xb4\xa5\x96\x87",</div><div class='del'>-		.input	= "The quick brown fox jumps over the lazy dogs.\0\0",</div><div class='del'>-		.ilen	= 48,</div><div class='del'>-		.result	= "\xca\x90\xf5\x9d\xcb\xd4\xd2\x3c"</div><div class='del'>-			  "\x01\x88\x7f\x3e\x31\x6e\x62\x9d"</div><div class='del'>-			  "\xd8\xe0\x57\xa3\x06\x3a\x42\x58"</div><div class='del'>-			  "\x2a\x28\xfe\x72\x52\x2f\xdd\xe0"</div><div class='del'>-			  "\x19\x89\x09\x1c\x2a\x8e\x8c\x94"</div><div class='del'>-			  "\xfc\xc7\x68\xe4\x88\xaa\xde\x0f",</div><div class='del'>-		.rlen	= 48,</div><div class='del'>-		.np	= 2,</div><div class='del'>-		.tap	= { 20, 28 },</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct cipher_testvec fcrypt_pcbc_dec_tv_template[] = {</div><div class='del'>-	{ /* http://www.openafs.org/pipermail/openafs-devel/2000-December/005320.html */</div><div class='del'>-		.key	= "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='del'>-		.klen	= 8,</div><div class='del'>-		.iv	= "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='del'>-		.input	= "\x0E\x09\x00\xC7\x3E\xF7\xED\x41",</div><div class='del'>-		.ilen	= 8,</div><div class='del'>-		.result	= "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='del'>-		.rlen	= 8,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x11\x44\x77\xAA\xDD\x00\x33\x66",</div><div class='del'>-		.klen	= 8,</div><div class='del'>-		.iv	= "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='del'>-		.input	= "\xD8\xED\x78\x74\x77\xEC\x06\x80",</div><div class='del'>-		.ilen	= 8,</div><div class='del'>-		.result	= "\x12\x34\x56\x78\x9A\xBC\xDE\xF0",</div><div class='del'>-		.rlen	= 8,</div><div class='del'>-	}, { /* From Arla */</div><div class='del'>-		.key	= "\xf0\xe1\xd2\xc3\xb4\xa5\x96\x87",</div><div class='del'>-		.klen	= 8,</div><div class='del'>-		.iv	= "\xfe\xdc\xba\x98\x76\x54\x32\x10",</div><div class='del'>-		.input	= "\x00\xf0\x0e\x11\x75\xe6\x23\x82"</div><div class='del'>-			  "\xee\xac\x98\x62\x44\x51\xe4\x84"</div><div class='del'>-			  "\xc3\x59\xd8\xaa\x64\x60\xae\xf7"</div><div class='del'>-			  "\xd2\xd9\x13\x79\x72\xa3\x45\x03"</div><div class='del'>-			  "\x23\xb5\x62\xd7\x0c\xf5\x27\xd1"</div><div class='del'>-			  "\xf8\x91\x3c\xac\x44\x22\x92\xef",</div><div class='del'>-		.ilen	= 48,</div><div class='del'>-		.result	= "The quick brown fox jumps over the lazy dogs.\0\0",</div><div class='del'>-		.rlen	= 48,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\xfe\xdc\xba\x98\x76\x54\x32\x10",</div><div class='del'>-		.klen	= 8,</div><div class='del'>-		.iv	= "\xf0\xe1\xd2\xc3\xb4\xa5\x96\x87",</div><div class='del'>-		.input	= "\xca\x90\xf5\x9d\xcb\xd4\xd2\x3c"</div><div class='del'>-			  "\x01\x88\x7f\x3e\x31\x6e\x62\x9d"</div><div class='del'>-			  "\xd8\xe0\x57\xa3\x06\x3a\x42\x58"</div><div class='del'>-			  "\x2a\x28\xfe\x72\x52\x2f\xdd\xe0"</div><div class='del'>-			  "\x19\x89\x09\x1c\x2a\x8e\x8c\x94"</div><div class='del'>-			  "\xfc\xc7\x68\xe4\x88\xaa\xde\x0f",</div><div class='del'>-		.ilen	= 48,</div><div class='del'>-		.result	= "The quick brown fox jumps over the lazy dogs.\0\0",</div><div class='del'>-		.rlen	= 48,</div><div class='del'>-	}, { /* split-page version */</div><div class='del'>-		.key	= "\xfe\xdc\xba\x98\x76\x54\x32\x10",</div><div class='del'>-		.klen	= 8,</div><div class='del'>-		.iv	= "\xf0\xe1\xd2\xc3\xb4\xa5\x96\x87",</div><div class='del'>-		.input	= "\xca\x90\xf5\x9d\xcb\xd4\xd2\x3c"</div><div class='del'>-			  "\x01\x88\x7f\x3e\x31\x6e\x62\x9d"</div><div class='del'>-			  "\xd8\xe0\x57\xa3\x06\x3a\x42\x58"</div><div class='del'>-			  "\x2a\x28\xfe\x72\x52\x2f\xdd\xe0"</div><div class='del'>-			  "\x19\x89\x09\x1c\x2a\x8e\x8c\x94"</div><div class='del'>-			  "\xfc\xc7\x68\xe4\x88\xaa\xde\x0f",</div><div class='del'>-		.ilen	= 48,</div><div class='del'>-		.result	= "The quick brown fox jumps over the lazy dogs.\0\0",</div><div class='del'>-		.rlen	= 48,</div><div class='del'>-		.np	= 2,</div><div class='del'>-		.tap	= { 20, 28 },</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * CAMELLIA test vectors.</div><div class='del'>- */</div><div class='del'>-#define CAMELLIA_ENC_TEST_VECTORS 3</div><div class='del'>-#define CAMELLIA_DEC_TEST_VECTORS 3</div><div class='del'>-#define CAMELLIA_CBC_ENC_TEST_VECTORS 2</div><div class='del'>-#define CAMELLIA_CBC_DEC_TEST_VECTORS 2</div><div class='del'>-</div><div class='del'>-static struct cipher_testvec camellia_enc_tv_template[] = {</div><div class='del'>-	{</div><div class='del'>-		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef"</div><div class='del'>-			  "\xfe\xdc\xba\x98\x76\x54\x32\x10",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.input	= "\x01\x23\x45\x67\x89\xab\xcd\xef"</div><div class='del'>-			  "\xfe\xdc\xba\x98\x76\x54\x32\x10",</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result	= "\x67\x67\x31\x38\x54\x96\x69\x73"</div><div class='del'>-			  "\x08\x57\x06\x56\x48\xea\xbe\x43",</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef"</div><div class='del'>-			  "\xfe\xdc\xba\x98\x76\x54\x32\x10"</div><div class='del'>-			  "\x00\x11\x22\x33\x44\x55\x66\x77",</div><div class='del'>-		.klen	= 24,</div><div class='del'>-		.input	= "\x01\x23\x45\x67\x89\xab\xcd\xef"</div><div class='del'>-			  "\xfe\xdc\xba\x98\x76\x54\x32\x10",</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result	= "\xb4\x99\x34\x01\xb3\xe9\x96\xf8"</div><div class='del'>-			  "\x4e\xe5\xce\xe7\xd7\x9b\x09\xb9",</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef"</div><div class='del'>-			  "\xfe\xdc\xba\x98\x76\x54\x32\x10"</div><div class='del'>-			  "\x00\x11\x22\x33\x44\x55\x66\x77"</div><div class='del'>-			  "\x88\x99\xaa\xbb\xcc\xdd\xee\xff",</div><div class='del'>-		.klen	= 32,</div><div class='del'>-		.input	= "\x01\x23\x45\x67\x89\xab\xcd\xef"</div><div class='del'>-			  "\xfe\xdc\xba\x98\x76\x54\x32\x10",</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result	= "\x9a\xcc\x23\x7d\xff\x16\xd7\x6c"</div><div class='del'>-			  "\x20\xef\x7c\x91\x9e\x3a\x75\x09",</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct cipher_testvec camellia_dec_tv_template[] = {</div><div class='del'>-	{</div><div class='del'>-		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef"</div><div class='del'>-			  "\xfe\xdc\xba\x98\x76\x54\x32\x10",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.input	= "\x67\x67\x31\x38\x54\x96\x69\x73"</div><div class='del'>-			  "\x08\x57\x06\x56\x48\xea\xbe\x43",</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result	= "\x01\x23\x45\x67\x89\xab\xcd\xef"</div><div class='add'>+			  "\x55\x55\x55\x55\x55\x55\x55\x55"</div><div class='ctx'> 			  "\xfe\xdc\xba\x98\x76\x54\x32\x10",</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef"</div><div class='del'>-			  "\xfe\xdc\xba\x98\x76\x54\x32\x10"</div><div class='del'>-			  "\x00\x11\x22\x33\x44\x55\x66\x77",</div><div class='ctx'> 		.klen	= 24,</div><div class='del'>-		.input	= "\xb4\x99\x34\x01\xb3\xe9\x96\xf8"</div><div class='del'>-			  "\x4e\xe5\xce\xe7\xd7\x9b\x09\xb9",</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result	= "\x01\x23\x45\x67\x89\xab\xcd\xef"</div><div class='del'>-			  "\xfe\xdc\xba\x98\x76\x54\x32\x10",</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef"</div><div class='del'>-			  "\xfe\xdc\xba\x98\x76\x54\x32\x10"</div><div class='del'>-			  "\x00\x11\x22\x33\x44\x55\x66\x77"</div><div class='del'>-			  "\x88\x99\xaa\xbb\xcc\xdd\xee\xff",</div><div class='del'>-		.klen	= 32,</div><div class='del'>-		.input	= "\x9a\xcc\x23\x7d\xff\x16\xd7\x6c"</div><div class='del'>-			  "\x20\xef\x7c\x91\x9e\x3a\x75\x09",</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result	= "\x01\x23\x45\x67\x89\xab\xcd\xef"</div><div class='del'>-			  "\xfe\xdc\xba\x98\x76\x54\x32\x10",</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct cipher_testvec camellia_cbc_enc_tv_template[] = {</div><div class='del'>-	{</div><div class='del'>-		.key    = "\x06\xa9\x21\x40\x36\xb8\xa1\x5b"</div><div class='del'>-			  "\x51\x2e\x03\xd5\x34\x12\x00\x06",</div><div class='del'>-		.klen   = 16,</div><div class='del'>-		.iv	= "\x3d\xaf\xba\x42\x9d\x9e\xb4\x30"</div><div class='del'>-			  "\xb4\x22\xda\x80\x2c\x9f\xac\x41",</div><div class='del'>-		.input	= "Single block msg",</div><div class='del'>-		.ilen   = 16,</div><div class='del'>-		.result = "\xea\x32\x12\x76\x3b\x50\x10\xe7"</div><div class='del'>-			  "\x18\xf6\xfd\x5d\xf6\x8f\x13\x51",</div><div class='del'>-		.rlen   = 16,</div><div class='del'>-	}, {</div><div class='del'>-		.key    = "\xc2\x86\x69\x6d\x88\x7c\x9a\xa0"</div><div class='del'>-			  "\x61\x1b\xbb\x3e\x20\x25\xa4\x5a",</div><div class='del'>-		.klen   = 16,</div><div class='del'>-		.iv     = "\x56\x2e\x17\x99\x6d\x09\x3d\x28"</div><div class='del'>-			  "\xdd\xb3\xba\x69\x5a\x2e\x6f\x58",</div><div class='del'>-		.input  = "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='del'>-			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='del'>-			  "\x10\x11\x12\x13\x14\x15\x16\x17"</div><div class='del'>-			  "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f",</div><div class='del'>-		.ilen   = 32,</div><div class='del'>-		.result = "\xa5\xdf\x6e\x50\xda\x70\x6c\x01"</div><div class='del'>-			  "\x4a\xab\xf3\xf2\xd6\xfc\x6c\xfd"</div><div class='del'>-			  "\x19\xb4\x3e\x57\x1c\x02\x5e\xa0"</div><div class='del'>-			  "\x15\x78\xe0\x5e\xf2\xcb\x87\x16",</div><div class='del'>-		.rlen   = 32,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct cipher_testvec camellia_cbc_dec_tv_template[] = {</div><div class='del'>-	{</div><div class='del'>-		.key    = "\x06\xa9\x21\x40\x36\xb8\xa1\x5b"</div><div class='del'>-			  "\x51\x2e\x03\xd5\x34\x12\x00\x06",</div><div class='del'>-		.klen   = 16,</div><div class='del'>-		.iv	= "\x3d\xaf\xba\x42\x9d\x9e\xb4\x30"</div><div class='del'>-			  "\xb4\x22\xda\x80\x2c\x9f\xac\x41",</div><div class='del'>-		.input	= "\xea\x32\x12\x76\x3b\x50\x10\xe7"</div><div class='del'>-			  "\x18\xf6\xfd\x5d\xf6\x8f\x13\x51",</div><div class='del'>-		.ilen   = 16,</div><div class='del'>-		.result = "Single block msg",</div><div class='del'>-		.rlen   = 16,</div><div class='del'>-	}, {</div><div class='del'>-		.key    = "\xc2\x86\x69\x6d\x88\x7c\x9a\xa0"</div><div class='del'>-			  "\x61\x1b\xbb\x3e\x20\x25\xa4\x5a",</div><div class='del'>-		.klen   = 16,</div><div class='del'>-		.iv     = "\x56\x2e\x17\x99\x6d\x09\x3d\x28"</div><div class='del'>-			  "\xdd\xb3\xba\x69\x5a\x2e\x6f\x58",</div><div class='del'>-		.input = "\xa5\xdf\x6e\x50\xda\x70\x6c\x01"</div><div class='del'>-			  "\x4a\xab\xf3\xf2\xd6\xfc\x6c\xfd"</div><div class='del'>-			  "\x19\xb4\x3e\x57\x1c\x02\x5e\xa0"</div><div class='del'>-			  "\x15\x78\xe0\x5e\xf2\xcb\x87\x16",</div><div class='del'>-		.ilen   = 32,</div><div class='del'>-		.result = "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='del'>-			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='del'>-			  "\x10\x11\x12\x13\x14\x15\x16\x17"</div><div class='del'>-			  "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f",</div><div class='del'>-		.rlen   = 32,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * SEED test vectors</div><div class='del'>- */</div><div class='del'>-#define SEED_ENC_TEST_VECTORS	4</div><div class='del'>-#define SEED_DEC_TEST_VECTORS	4</div><div class='del'>-</div><div class='del'>-static struct cipher_testvec seed_enc_tv_template[] = {</div><div class='del'>-	{</div><div class='del'>-		.key    = zeroed_string,</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.input  = "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='del'>-			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result	= "\x5e\xba\xc6\xe0\x05\x4e\x16\x68"</div><div class='del'>-			  "\x19\xaf\xf1\xcc\x6d\x34\x6c\xdb",</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='del'>-			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.input	= zeroed_string,</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result	= "\xc1\x1f\x22\xf2\x01\x40\x50\x50"</div><div class='del'>-			  "\x84\x48\x35\x97\xe4\x37\x0f\x43",</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x47\x06\x48\x08\x51\xe6\x1b\xe8"</div><div class='del'>-			  "\x5d\x74\xbf\xb3\xfd\x95\x61\x85",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.input	= "\x83\xa2\xf8\xa2\x88\x64\x1f\xb9"</div><div class='del'>-			  "\xa4\xe9\xa5\xcc\x2f\x13\x1c\x7d",</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result	= "\xee\x54\xd1\x3e\xbc\xae\x70\x6d"</div><div class='del'>-			  "\x22\x6b\xc3\x14\x2c\xd4\x0d\x4a",</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x28\xdb\xc3\xbc\x49\xff\xd8\x7d"</div><div class='del'>-			  "\xcf\xa5\x09\xb1\x1d\x42\x2b\xe7",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.input	= "\xb4\x1e\x6b\xe2\xeb\xa8\x4a\x14"</div><div class='del'>-			  "\x8e\x2e\xed\x84\x59\x3c\x5e\xc7",</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result	= "\x9b\x9b\x7b\xfc\xd1\x81\x3c\xb9"</div><div class='del'>-			  "\x5d\x0b\x36\x18\xf4\x0f\x51\x22",</div><div class='del'>-		.rlen	= 16,</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct cipher_testvec seed_dec_tv_template[] = {</div><div class='del'>-	{</div><div class='del'>-		.key    = zeroed_string,</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.input	= "\x5e\xba\xc6\xe0\x05\x4e\x16\x68"</div><div class='del'>-			  "\x19\xaf\xf1\xcc\x6d\x34\x6c\xdb",</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='del'>-			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='del'>-			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.input	= "\xc1\x1f\x22\xf2\x01\x40\x50\x50"</div><div class='del'>-			  "\x84\x48\x35\x97\xe4\x37\x0f\x43",</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result	= zeroed_string,</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x47\x06\x48\x08\x51\xe6\x1b\xe8"</div><div class='del'>-			  "\x5d\x74\xbf\xb3\xfd\x95\x61\x85",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.input	= "\xee\x54\xd1\x3e\xbc\xae\x70\x6d"</div><div class='del'>-			  "\x22\x6b\xc3\x14\x2c\xd4\x0d\x4a",</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result	= "\x83\xa2\xf8\xa2\x88\x64\x1f\xb9"</div><div class='del'>-			  "\xa4\xe9\xa5\xcc\x2f\x13\x1c\x7d",</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	}, {</div><div class='del'>-		.key	= "\x28\xdb\xc3\xbc\x49\xff\xd8\x7d"</div><div class='del'>-			  "\xcf\xa5\x09\xb1\x1d\x42\x2b\xe7",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.input	= "\x9b\x9b\x7b\xfc\xd1\x81\x3c\xb9"</div><div class='del'>-			  "\x5d\x0b\x36\x18\xf4\x0f\x51\x22",</div><div class='del'>-		.ilen	= 16,</div><div class='del'>-		.result	= "\xb4\x1e\x6b\xe2\xeb\xa8\x4a\x14"</div><div class='del'>-			  "\x8e\x2e\xed\x84\x59\x3c\x5e\xc7",</div><div class='del'>-		.rlen	= 16,</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define SALSA20_STREAM_ENC_TEST_VECTORS 5</div><div class='del'>-static struct cipher_testvec salsa20_stream_enc_tv_template[] = {</div><div class='del'>-	/*</div><div class='del'>-	* Testvectors from verified.test-vectors submitted to ECRYPT.</div><div class='del'>-	* They are truncated to size 39, 64, 111, 129 to test a variety</div><div class='del'>-	* of input length.</div><div class='del'>-	*/</div><div class='del'>-	{ /* Set 3, vector 0 */</div><div class='del'>-		.key	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='del'>-			"\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.iv     = "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='del'>-		.input	= "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			"\x00\x00\x00\x00\x00\x00\x00",</div><div class='del'>-		.ilen	= 39,</div><div class='del'>-		.result	= "\x2D\xD5\xC3\xF7\xBA\x2B\x20\xF7"</div><div class='del'>-			 "\x68\x02\x41\x0C\x68\x86\x88\x89"</div><div class='del'>-			 "\x5A\xD8\xC1\xBD\x4E\xA6\xC9\xB1"</div><div class='del'>-			 "\x40\xFB\x9B\x90\xE2\x10\x49\xBF"</div><div class='del'>-			 "\x58\x3F\x52\x79\x70\xEB\xC1",</div><div class='del'>-		.rlen	= 39,</div><div class='del'>-	}, { /* Set 5, vector 0 */</div><div class='del'>-		.key	= "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			"\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.iv     = "\x80\x00\x00\x00\x00\x00\x00\x00",</div><div class='del'>-		.input	= "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			"\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='del'>-		.ilen	= 64,</div><div class='del'>-		.result	= "\xB6\x6C\x1E\x44\x46\xDD\x95\x57"</div><div class='del'>-			 "\xE5\x78\xE2\x23\xB0\xB7\x68\x01"</div><div class='del'>-			 "\x7B\x23\xB2\x67\xBB\x02\x34\xAE"</div><div class='del'>-			 "\x46\x26\xBF\x44\x3F\x21\x97\x76"</div><div class='del'>-			 "\x43\x6F\xB1\x9F\xD0\xE8\x86\x6F"</div><div class='del'>-			 "\xCD\x0D\xE9\xA9\x53\x8F\x4A\x09"</div><div class='del'>-			 "\xCA\x9A\xC0\x73\x2E\x30\xBC\xF9"</div><div class='del'>-			 "\x8E\x4F\x13\xE4\xB9\xE2\x01\xD9",</div><div class='del'>-		.rlen	= 64,</div><div class='del'>-	}, { /* Set 3, vector 27 */</div><div class='del'>-		.key	= "\x1B\x1C\x1D\x1E\x1F\x20\x21\x22"</div><div class='del'>-			"\x23\x24\x25\x26\x27\x28\x29\x2A"</div><div class='del'>-			"\x2B\x2C\x2D\x2E\x2F\x30\x31\x32"</div><div class='del'>-			"\x33\x34\x35\x36\x37\x38\x39\x3A",</div><div class='del'>-		.klen	= 32,</div><div class='del'>-		.iv     = "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='del'>-		.input	= "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			"\x00\x00\x00\x00\x00\x00\x00",</div><div class='del'>-		.ilen	= 111,</div><div class='del'>-		.result	= "\xAE\x39\x50\x8E\xAC\x9A\xEC\xE7"</div><div class='del'>-			 "\xBF\x97\xBB\x20\xB9\xDE\xE4\x1F"</div><div class='del'>-			 "\x87\xD9\x47\xF8\x28\x91\x35\x98"</div><div class='del'>-			 "\xDB\x72\xCC\x23\x29\x48\x56\x5E"</div><div class='del'>-			 "\x83\x7E\x0B\xF3\x7D\x5D\x38\x7B"</div><div class='del'>-			 "\x2D\x71\x02\xB4\x3B\xB5\xD8\x23"</div><div class='del'>-			 "\xB0\x4A\xDF\x3C\xEC\xB6\xD9\x3B"</div><div class='del'>-			 "\x9B\xA7\x52\xBE\xC5\xD4\x50\x59"</div><div class='del'>-			 "\x15\x14\xB4\x0E\x40\xE6\x53\xD1"</div><div class='del'>-			 "\x83\x9C\x5B\xA0\x92\x29\x6B\x5E"</div><div class='del'>-			 "\x96\x5B\x1E\x2F\xD3\xAC\xC1\x92"</div><div class='del'>-			 "\xB1\x41\x3F\x19\x2F\xC4\x3B\xC6"</div><div class='del'>-			 "\x95\x46\x45\x54\xE9\x75\x03\x08"</div><div class='del'>-			 "\x44\xAF\xE5\x8A\x81\x12\x09",</div><div class='del'>-		.rlen	= 111,</div><div class='del'>-	}, { /* Set 5, vector 27 */</div><div class='del'>-		.key	= "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			"\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='del'>-		.klen	= 32,</div><div class='del'>-		.iv     = "\x00\x00\x00\x10\x00\x00\x00\x00",</div><div class='del'>-		.input	= "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			"\x00",</div><div class='del'>-		.ilen	= 129,</div><div class='del'>-		.result	= "\xD2\xDB\x1A\x5C\xF1\xC1\xAC\xDB"</div><div class='del'>-			 "\xE8\x1A\x7A\x43\x40\xEF\x53\x43"</div><div class='del'>-			 "\x5E\x7F\x4B\x1A\x50\x52\x3F\x8D"</div><div class='del'>-			 "\x28\x3D\xCF\x85\x1D\x69\x6E\x60"</div><div class='del'>-			 "\xF2\xDE\x74\x56\x18\x1B\x84\x10"</div><div class='del'>-			 "\xD4\x62\xBA\x60\x50\xF0\x61\xF2"</div><div class='del'>-			 "\x1C\x78\x7F\xC1\x24\x34\xAF\x58"</div><div class='del'>-			 "\xBF\x2C\x59\xCA\x90\x77\xF3\xB0"</div><div class='del'>-			 "\x5B\x4A\xDF\x89\xCE\x2C\x2F\xFC"</div><div class='del'>-			 "\x67\xF0\xE3\x45\xE8\xB3\xB3\x75"</div><div class='del'>-			 "\xA0\x95\x71\xA1\x29\x39\x94\xCA"</div><div class='del'>-			 "\x45\x2F\xBD\xCB\x10\xB6\xBE\x9F"</div><div class='del'>-			 "\x8E\xF9\xB2\x01\x0A\x5A\x0A\xB7"</div><div class='del'>-			 "\x6B\x9D\x70\x8E\x4B\xD6\x2F\xCD"</div><div class='del'>-			 "\x2E\x40\x48\x75\xE9\xE2\x21\x45"</div><div class='del'>-			 "\x0B\xC9\xB6\xB5\x66\xBC\x9A\x59"</div><div class='del'>-			 "\x5A",</div><div class='del'>-		.rlen	= 129,</div><div class='del'>-	}, { /* large test vector generated using Crypto++ */</div><div class='del'>-		.key =  "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='del'>-			"\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='del'>-			"\x10\x11\x12\x13\x14\x15\x16\x17"</div><div class='del'>-			"\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f",</div><div class='del'>-		.klen = 32,</div><div class='del'>-		.iv =	"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-			"\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='del'>-		.input =</div><div class='del'>-			"\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='del'>-			"\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='del'>-			"\x10\x11\x12\x13\x14\x15\x16\x17"</div><div class='del'>-			"\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f"</div><div class='del'>-			"\x20\x21\x22\x23\x24\x25\x26\x27"</div><div class='del'>-			"\x28\x29\x2a\x2b\x2c\x2d\x2e\x2f"</div><div class='del'>-			"\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='del'>-			"\x38\x39\x3a\x3b\x3c\x3d\x3e\x3f"</div><div class='del'>-			"\x40\x41\x42\x43\x44\x45\x46\x47"</div><div class='del'>-			"\x48\x49\x4a\x4b\x4c\x4d\x4e\x4f"</div><div class='del'>-			"\x50\x51\x52\x53\x54\x55\x56\x57"</div><div class='del'>-			"\x58\x59\x5a\x5b\x5c\x5d\x5e\x5f"</div><div class='del'>-			"\x60\x61\x62\x63\x64\x65\x66\x67"</div><div class='del'>-			"\x68\x69\x6a\x6b\x6c\x6d\x6e\x6f"</div><div class='del'>-			"\x70\x71\x72\x73\x74\x75\x76\x77"</div><div class='del'>-			"\x78\x79\x7a\x7b\x7c\x7d\x7e\x7f"</div><div class='del'>-			"\x80\x81\x82\x83\x84\x85\x86\x87"</div><div class='del'>-			"\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f"</div><div class='del'>-			"\x90\x91\x92\x93\x94\x95\x96\x97"</div><div class='del'>-			"\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f"</div><div class='del'>-			"\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7"</div><div class='del'>-			"\xa8\xa9\xaa\xab\xac\xad\xae\xaf"</div><div class='del'>-			"\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7"</div><div class='del'>-			"\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf"</div><div class='del'>-			"\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7"</div><div class='del'>-			"\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf"</div><div class='del'>-			"\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7"</div><div class='del'>-			"\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf"</div><div class='del'>-			"\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7"</div><div class='del'>-			"\xe8\xe9\xea\xeb\xec\xed\xee\xef"</div><div class='del'>-			"\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7"</div><div class='del'>-			"\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff"</div><div class='del'>-			"\x00\x03\x06\x09\x0c\x0f\x12\x15"</div><div class='del'>-			"\x18\x1b\x1e\x21\x24\x27\x2a\x2d"</div><div class='del'>-			"\x30\x33\x36\x39\x3c\x3f\x42\x45"</div><div class='del'>-			"\x48\x4b\x4e\x51\x54\x57\x5a\x5d"</div><div class='del'>-			"\x60\x63\x66\x69\x6c\x6f\x72\x75"</div><div class='del'>-			"\x78\x7b\x7e\x81\x84\x87\x8a\x8d"</div><div class='del'>-			"\x90\x93\x96\x99\x9c\x9f\xa2\xa5"</div><div class='del'>-			"\xa8\xab\xae\xb1\xb4\xb7\xba\xbd"</div><div class='del'>-			"\xc0\xc3\xc6\xc9\xcc\xcf\xd2\xd5"</div><div class='del'>-			"\xd8\xdb\xde\xe1\xe4\xe7\xea\xed"</div><div class='del'>-			"\xf0\xf3\xf6\xf9\xfc\xff\x02\x05"</div><div class='del'>-			"\x08\x0b\x0e\x11\x14\x17\x1a\x1d"</div><div class='del'>-			"\x20\x23\x26\x29\x2c\x2f\x32\x35"</div><div class='del'>-			"\x38\x3b\x3e\x41\x44\x47\x4a\x4d"</div><div class='del'>-			"\x50\x53\x56\x59\x5c\x5f\x62\x65"</div><div class='del'>-			"\x68\x6b\x6e\x71\x74\x77\x7a\x7d"</div><div class='del'>-			"\x80\x83\x86\x89\x8c\x8f\x92\x95"</div><div class='del'>-			"\x98\x9b\x9e\xa1\xa4\xa7\xaa\xad"</div><div class='del'>-			"\xb0\xb3\xb6\xb9\xbc\xbf\xc2\xc5"</div><div class='del'>-			"\xc8\xcb\xce\xd1\xd4\xd7\xda\xdd"</div><div class='del'>-			"\xe0\xe3\xe6\xe9\xec\xef\xf2\xf5"</div><div class='del'>-			"\xf8\xfb\xfe\x01\x04\x07\x0a\x0d"</div><div class='del'>-			"\x10\x13\x16\x19\x1c\x1f\x22\x25"</div><div class='del'>-			"\x28\x2b\x2e\x31\x34\x37\x3a\x3d"</div><div class='del'>-			"\x40\x43\x46\x49\x4c\x4f\x52\x55"</div><div class='del'>-			"\x58\x5b\x5e\x61\x64\x67\x6a\x6d"</div><div class='del'>-			"\x70\x73\x76\x79\x7c\x7f\x82\x85"</div><div class='del'>-			"\x88\x8b\x8e\x91\x94\x97\x9a\x9d"</div><div class='del'>-			"\xa0\xa3\xa6\xa9\xac\xaf\xb2\xb5"</div><div class='del'>-			"\xb8\xbb\xbe\xc1\xc4\xc7\xca\xcd"</div><div class='del'>-			"\xd0\xd3\xd6\xd9\xdc\xdf\xe2\xe5"</div><div class='del'>-			"\xe8\xeb\xee\xf1\xf4\xf7\xfa\xfd"</div><div class='del'>-			"\x00\x05\x0a\x0f\x14\x19\x1e\x23"</div><div class='del'>-			"\x28\x2d\x32\x37\x3c\x41\x46\x4b"</div><div class='del'>-			"\x50\x55\x5a\x5f\x64\x69\x6e\x73"</div><div class='del'>-			"\x78\x7d\x82\x87\x8c\x91\x96\x9b"</div><div class='del'>-			"\xa0\xa5\xaa\xaf\xb4\xb9\xbe\xc3"</div><div class='del'>-			"\xc8\xcd\xd2\xd7\xdc\xe1\xe6\xeb"</div><div class='del'>-			"\xf0\xf5\xfa\xff\x04\x09\x0e\x13"</div><div class='del'>-			"\x18\x1d\x22\x27\x2c\x31\x36\x3b"</div><div class='del'>-			"\x40\x45\x4a\x4f\x54\x59\x5e\x63"</div><div class='del'>-			"\x68\x6d\x72\x77\x7c\x81\x86\x8b"</div><div class='del'>-			"\x90\x95\x9a\x9f\xa4\xa9\xae\xb3"</div><div class='del'>-			"\xb8\xbd\xc2\xc7\xcc\xd1\xd6\xdb"</div><div class='del'>-			"\xe0\xe5\xea\xef\xf4\xf9\xfe\x03"</div><div class='del'>-			"\x08\x0d\x12\x17\x1c\x21\x26\x2b"</div><div class='del'>-			"\x30\x35\x3a\x3f\x44\x49\x4e\x53"</div><div class='del'>-			"\x58\x5d\x62\x67\x6c\x71\x76\x7b"</div><div class='del'>-			"\x80\x85\x8a\x8f\x94\x99\x9e\xa3"</div><div class='del'>-			"\xa8\xad\xb2\xb7\xbc\xc1\xc6\xcb"</div><div class='del'>-			"\xd0\xd5\xda\xdf\xe4\xe9\xee\xf3"</div><div class='del'>-			"\xf8\xfd\x02\x07\x0c\x11\x16\x1b"</div><div class='del'>-			"\x20\x25\x2a\x2f\x34\x39\x3e\x43"</div><div class='del'>-			"\x48\x4d\x52\x57\x5c\x61\x66\x6b"</div><div class='del'>-			"\x70\x75\x7a\x7f\x84\x89\x8e\x93"</div><div class='del'>-			"\x98\x9d\xa2\xa7\xac\xb1\xb6\xbb"</div><div class='del'>-			"\xc0\xc5\xca\xcf\xd4\xd9\xde\xe3"</div><div class='del'>-			"\xe8\xed\xf2\xf7\xfc\x01\x06\x0b"</div><div class='del'>-			"\x10\x15\x1a\x1f\x24\x29\x2e\x33"</div><div class='del'>-			"\x38\x3d\x42\x47\x4c\x51\x56\x5b"</div><div class='del'>-			"\x60\x65\x6a\x6f\x74\x79\x7e\x83"</div><div class='del'>-			"\x88\x8d\x92\x97\x9c\xa1\xa6\xab"</div><div class='del'>-			"\xb0\xb5\xba\xbf\xc4\xc9\xce\xd3"</div><div class='del'>-			"\xd8\xdd\xe2\xe7\xec\xf1\xf6\xfb"</div><div class='del'>-			"\x00\x07\x0e\x15\x1c\x23\x2a\x31"</div><div class='del'>-			"\x38\x3f\x46\x4d\x54\x5b\x62\x69"</div><div class='del'>-			"\x70\x77\x7e\x85\x8c\x93\x9a\xa1"</div><div class='del'>-			"\xa8\xaf\xb6\xbd\xc4\xcb\xd2\xd9"</div><div class='del'>-			"\xe0\xe7\xee\xf5\xfc\x03\x0a\x11"</div><div class='del'>-			"\x18\x1f\x26\x2d\x34\x3b\x42\x49"</div><div class='del'>-			"\x50\x57\x5e\x65\x6c\x73\x7a\x81"</div><div class='del'>-			"\x88\x8f\x96\x9d\xa4\xab\xb2\xb9"</div><div class='del'>-			"\xc0\xc7\xce\xd5\xdc\xe3\xea\xf1"</div><div class='del'>-			"\xf8\xff\x06\x0d\x14\x1b\x22\x29"</div><div class='del'>-			"\x30\x37\x3e\x45\x4c\x53\x5a\x61"</div><div class='del'>-			"\x68\x6f\x76\x7d\x84\x8b\x92\x99"</div><div class='del'>-			"\xa0\xa7\xae\xb5\xbc\xc3\xca\xd1"</div><div class='del'>-			"\xd8\xdf\xe6\xed\xf4\xfb\x02\x09"</div><div class='del'>-			"\x10\x17\x1e\x25\x2c\x33\x3a\x41"</div><div class='del'>-			"\x48\x4f\x56\x5d\x64\x6b\x72\x79"</div><div class='del'>-			"\x80\x87\x8e\x95\x9c\xa3\xaa\xb1"</div><div class='del'>-			"\xb8\xbf\xc6\xcd\xd4\xdb\xe2\xe9"</div><div class='del'>-			"\xf0\xf7\xfe\x05\x0c\x13\x1a\x21"</div><div class='del'>-			"\x28\x2f\x36\x3d\x44\x4b\x52\x59"</div><div class='del'>-			"\x60\x67\x6e\x75\x7c\x83\x8a\x91"</div><div class='del'>-			"\x98\x9f\xa6\xad\xb4\xbb\xc2\xc9"</div><div class='del'>-			"\xd0\xd7\xde\xe5\xec\xf3\xfa\x01"</div><div class='del'>-			"\x08\x0f\x16\x1d\x24\x2b\x32\x39"</div><div class='del'>-			"\x40\x47\x4e\x55\x5c\x63\x6a\x71"</div><div class='del'>-			"\x78\x7f\x86\x8d\x94\x9b\xa2\xa9"</div><div class='del'>-			"\xb0\xb7\xbe\xc5\xcc\xd3\xda\xe1"</div><div class='del'>-			"\xe8\xef\xf6\xfd\x04\x0b\x12\x19"</div><div class='del'>-			"\x20\x27\x2e\x35\x3c\x43\x4a\x51"</div><div class='del'>-			"\x58\x5f\x66\x6d\x74\x7b\x82\x89"</div><div class='del'>-			"\x90\x97\x9e\xa5\xac\xb3\xba\xc1"</div><div class='del'>-			"\xc8\xcf\xd6\xdd\xe4\xeb\xf2\xf9"</div><div class='del'>-			"\x00\x09\x12\x1b\x24\x2d\x36\x3f"</div><div class='del'>-			"\x48\x51\x5a\x63\x6c\x75\x7e\x87"</div><div class='del'>-			"\x90\x99\xa2\xab\xb4\xbd\xc6\xcf"</div><div class='del'>-			"\xd8\xe1\xea\xf3\xfc\x05\x0e\x17"</div><div class='del'>-			"\x20\x29\x32\x3b\x44\x4d\x56\x5f"</div><div class='del'>-			"\x68\x71\x7a\x83\x8c\x95\x9e\xa7"</div><div class='del'>-			"\xb0\xb9\xc2\xcb\xd4\xdd\xe6\xef"</div><div class='del'>-			"\xf8\x01\x0a\x13\x1c\x25\x2e\x37"</div><div class='del'>-			"\x40\x49\x52\x5b\x64\x6d\x76\x7f"</div><div class='del'>-			"\x88\x91\x9a\xa3\xac\xb5\xbe\xc7"</div><div class='del'>-			"\xd0\xd9\xe2\xeb\xf4\xfd\x06\x0f"</div><div class='del'>-			"\x18\x21\x2a\x33\x3c\x45\x4e\x57"</div><div class='del'>-			"\x60\x69\x72\x7b\x84\x8d\x96\x9f"</div><div class='del'>-			"\xa8\xb1\xba\xc3\xcc\xd5\xde\xe7"</div><div class='del'>-			"\xf0\xf9\x02\x0b\x14\x1d\x26\x2f"</div><div class='del'>-			"\x38\x41\x4a\x53\x5c\x65\x6e\x77"</div><div class='del'>-			"\x80\x89\x92\x9b\xa4\xad\xb6\xbf"</div><div class='del'>-			"\xc8\xd1\xda\xe3\xec\xf5\xfe\x07"</div><div class='del'>-			"\x10\x19\x22\x2b\x34\x3d\x46\x4f"</div><div class='del'>-			"\x58\x61\x6a\x73\x7c\x85\x8e\x97"</div><div class='del'>-			"\xa0\xa9\xb2\xbb\xc4\xcd\xd6\xdf"</div><div class='del'>-			"\xe8\xf1\xfa\x03\x0c\x15\x1e\x27"</div><div class='del'>-			"\x30\x39\x42\x4b\x54\x5d\x66\x6f"</div><div class='del'>-			"\x78\x81\x8a\x93\x9c\xa5\xae\xb7"</div><div class='del'>-			"\xc0\xc9\xd2\xdb\xe4\xed\xf6\xff"</div><div class='del'>-			"\x08\x11\x1a\x23\x2c\x35\x3e\x47"</div><div class='del'>-			"\x50\x59\x62\x6b\x74\x7d\x86\x8f"</div><div class='del'>-			"\x98\xa1\xaa\xb3\xbc\xc5\xce\xd7"</div><div class='del'>-			"\xe0\xe9\xf2\xfb\x04\x0d\x16\x1f"</div><div class='del'>-			"\x28\x31\x3a\x43\x4c\x55\x5e\x67"</div><div class='del'>-			"\x70\x79\x82\x8b\x94\x9d\xa6\xaf"</div><div class='del'>-			"\xb8\xc1\xca\xd3\xdc\xe5\xee\xf7"</div><div class='del'>-			"\x00\x0b\x16\x21\x2c\x37\x42\x4d"</div><div class='del'>-			"\x58\x63\x6e\x79\x84\x8f\x9a\xa5"</div><div class='del'>-			"\xb0\xbb\xc6\xd1\xdc\xe7\xf2\xfd"</div><div class='del'>-			"\x08\x13\x1e\x29\x34\x3f\x4a\x55"</div><div class='del'>-			"\x60\x6b\x76\x81\x8c\x97\xa2\xad"</div><div class='del'>-			"\xb8\xc3\xce\xd9\xe4\xef\xfa\x05"</div><div class='del'>-			"\x10\x1b\x26\x31\x3c\x47\x52\x5d"</div><div class='del'>-			"\x68\x73\x7e\x89\x94\x9f\xaa\xb5"</div><div class='del'>-			"\xc0\xcb\xd6\xe1\xec\xf7\x02\x0d"</div><div class='del'>-			"\x18\x23\x2e\x39\x44\x4f\x5a\x65"</div><div class='del'>-			"\x70\x7b\x86\x91\x9c\xa7\xb2\xbd"</div><div class='del'>-			"\xc8\xd3\xde\xe9\xf4\xff\x0a\x15"</div><div class='del'>-			"\x20\x2b\x36\x41\x4c\x57\x62\x6d"</div><div class='del'>-			"\x78\x83\x8e\x99\xa4\xaf\xba\xc5"</div><div class='del'>-			"\xd0\xdb\xe6\xf1\xfc\x07\x12\x1d"</div><div class='del'>-			"\x28\x33\x3e\x49\x54\x5f\x6a\x75"</div><div class='del'>-			"\x80\x8b\x96\xa1\xac\xb7\xc2\xcd"</div><div class='del'>-			"\xd8\xe3\xee\xf9\x04\x0f\x1a\x25"</div><div class='del'>-			"\x30\x3b\x46\x51\x5c\x67\x72\x7d"</div><div class='del'>-			"\x88\x93\x9e\xa9\xb4\xbf\xca\xd5"</div><div class='del'>-			"\xe0\xeb\xf6\x01\x0c\x17\x22\x2d"</div><div class='del'>-			"\x38\x43\x4e\x59\x64\x6f\x7a\x85"</div><div class='del'>-			"\x90\x9b\xa6\xb1\xbc\xc7\xd2\xdd"</div><div class='del'>-			"\xe8\xf3\xfe\x09\x14\x1f\x2a\x35"</div><div class='del'>-			"\x40\x4b\x56\x61\x6c\x77\x82\x8d"</div><div class='del'>-			"\x98\xa3\xae\xb9\xc4\xcf\xda\xe5"</div><div class='del'>-			"\xf0\xfb\x06\x11\x1c\x27\x32\x3d"</div><div class='del'>-			"\x48\x53\x5e\x69\x74\x7f\x8a\x95"</div><div class='del'>-			"\xa0\xab\xb6\xc1\xcc\xd7\xe2\xed"</div><div class='del'>-			"\xf8\x03\x0e\x19\x24\x2f\x3a\x45"</div><div class='del'>-			"\x50\x5b\x66\x71\x7c\x87\x92\x9d"</div><div class='del'>-			"\xa8\xb3\xbe\xc9\xd4\xdf\xea\xf5"</div><div class='del'>-			"\x00\x0d\x1a\x27\x34\x41\x4e\x5b"</div><div class='del'>-			"\x68\x75\x82\x8f\x9c\xa9\xb6\xc3"</div><div class='del'>-			"\xd0\xdd\xea\xf7\x04\x11\x1e\x2b"</div><div class='del'>-			"\x38\x45\x52\x5f\x6c\x79\x86\x93"</div><div class='del'>-			"\xa0\xad\xba\xc7\xd4\xe1\xee\xfb"</div><div class='del'>-			"\x08\x15\x22\x2f\x3c\x49\x56\x63"</div><div class='del'>-			"\x70\x7d\x8a\x97\xa4\xb1\xbe\xcb"</div><div class='del'>-			"\xd8\xe5\xf2\xff\x0c\x19\x26\x33"</div><div class='del'>-			"\x40\x4d\x5a\x67\x74\x81\x8e\x9b"</div><div class='del'>-			"\xa8\xb5\xc2\xcf\xdc\xe9\xf6\x03"</div><div class='del'>-			"\x10\x1d\x2a\x37\x44\x51\x5e\x6b"</div><div class='del'>-			"\x78\x85\x92\x9f\xac\xb9\xc6\xd3"</div><div class='del'>-			"\xe0\xed\xfa\x07\x14\x21\x2e\x3b"</div><div class='del'>-			"\x48\x55\x62\x6f\x7c\x89\x96\xa3"</div><div class='del'>-			"\xb0\xbd\xca\xd7\xe4\xf1\xfe\x0b"</div><div class='del'>-			"\x18\x25\x32\x3f\x4c\x59\x66\x73"</div><div class='del'>-			"\x80\x8d\x9a\xa7\xb4\xc1\xce\xdb"</div><div class='del'>-			"\xe8\xf5\x02\x0f\x1c\x29\x36\x43"</div><div class='del'>-			"\x50\x5d\x6a\x77\x84\x91\x9e\xab"</div><div class='del'>-			"\xb8\xc5\xd2\xdf\xec\xf9\x06\x13"</div><div class='del'>-			"\x20\x2d\x3a\x47\x54\x61\x6e\x7b"</div><div class='del'>-			"\x88\x95\xa2\xaf\xbc\xc9\xd6\xe3"</div><div class='del'>-			"\xf0\xfd\x0a\x17\x24\x31\x3e\x4b"</div><div class='del'>-			"\x58\x65\x72\x7f\x8c\x99\xa6\xb3"</div><div class='del'>-			"\xc0\xcd\xda\xe7\xf4\x01\x0e\x1b"</div><div class='del'>-			"\x28\x35\x42\x4f\x5c\x69\x76\x83"</div><div class='del'>-			"\x90\x9d\xaa\xb7\xc4\xd1\xde\xeb"</div><div class='del'>-			"\xf8\x05\x12\x1f\x2c\x39\x46\x53"</div><div class='del'>-			"\x60\x6d\x7a\x87\x94\xa1\xae\xbb"</div><div class='del'>-			"\xc8\xd5\xe2\xef\xfc\x09\x16\x23"</div><div class='del'>-			"\x30\x3d\x4a\x57\x64\x71\x7e\x8b"</div><div class='del'>-			"\x98\xa5\xb2\xbf\xcc\xd9\xe6\xf3"</div><div class='del'>-			"\x00\x0f\x1e\x2d\x3c\x4b\x5a\x69"</div><div class='del'>-			"\x78\x87\x96\xa5\xb4\xc3\xd2\xe1"</div><div class='del'>-			"\xf0\xff\x0e\x1d\x2c\x3b\x4a\x59"</div><div class='del'>-			"\x68\x77\x86\x95\xa4\xb3\xc2\xd1"</div><div class='del'>-			"\xe0\xef\xfe\x0d\x1c\x2b\x3a\x49"</div><div class='del'>-			"\x58\x67\x76\x85\x94\xa3\xb2\xc1"</div><div class='del'>-			"\xd0\xdf\xee\xfd\x0c\x1b\x2a\x39"</div><div class='del'>-			"\x48\x57\x66\x75\x84\x93\xa2\xb1"</div><div class='del'>-			"\xc0\xcf\xde\xed\xfc\x0b\x1a\x29"</div><div class='del'>-			"\x38\x47\x56\x65\x74\x83\x92\xa1"</div><div class='del'>-			"\xb0\xbf\xce\xdd\xec\xfb\x0a\x19"</div><div class='del'>-			"\x28\x37\x46\x55\x64\x73\x82\x91"</div><div class='del'>-			"\xa0\xaf\xbe\xcd\xdc\xeb\xfa\x09"</div><div class='del'>-			"\x18\x27\x36\x45\x54\x63\x72\x81"</div><div class='del'>-			"\x90\x9f\xae\xbd\xcc\xdb\xea\xf9"</div><div class='del'>-			"\x08\x17\x26\x35\x44\x53\x62\x71"</div><div class='del'>-			"\x80\x8f\x9e\xad\xbc\xcb\xda\xe9"</div><div class='del'>-			"\xf8\x07\x16\x25\x34\x43\x52\x61"</div><div class='del'>-			"\x70\x7f\x8e\x9d\xac\xbb\xca\xd9"</div><div class='del'>-			"\xe8\xf7\x06\x15\x24\x33\x42\x51"</div><div class='del'>-			"\x60\x6f\x7e\x8d\x9c\xab\xba\xc9"</div><div class='del'>-			"\xd8\xe7\xf6\x05\x14\x23\x32\x41"</div><div class='del'>-			"\x50\x5f\x6e\x7d\x8c\x9b\xaa\xb9"</div><div class='del'>-			"\xc8\xd7\xe6\xf5\x04\x13\x22\x31"</div><div class='del'>-			"\x40\x4f\x5e\x6d\x7c\x8b\x9a\xa9"</div><div class='del'>-			"\xb8\xc7\xd6\xe5\xf4\x03\x12\x21"</div><div class='del'>-			"\x30\x3f\x4e\x5d\x6c\x7b\x8a\x99"</div><div class='del'>-			"\xa8\xb7\xc6\xd5\xe4\xf3\x02\x11"</div><div class='del'>-			"\x20\x2f\x3e\x4d\x5c\x6b\x7a\x89"</div><div class='del'>-			"\x98\xa7\xb6\xc5\xd4\xe3\xf2\x01"</div><div class='del'>-			"\x10\x1f\x2e\x3d\x4c\x5b\x6a\x79"</div><div class='del'>-			"\x88\x97\xa6\xb5\xc4\xd3\xe2\xf1"</div><div class='del'>-			"\x00\x11\x22\x33\x44\x55\x66\x77"</div><div class='del'>-			"\x88\x99\xaa\xbb\xcc\xdd\xee\xff"</div><div class='del'>-			"\x10\x21\x32\x43\x54\x65\x76\x87"</div><div class='del'>-			"\x98\xa9\xba\xcb\xdc\xed\xfe\x0f"</div><div class='del'>-			"\x20\x31\x42\x53\x64\x75\x86\x97"</div><div class='del'>-			"\xa8\xb9\xca\xdb\xec\xfd\x0e\x1f"</div><div class='del'>-			"\x30\x41\x52\x63\x74\x85\x96\xa7"</div><div class='del'>-			"\xb8\xc9\xda\xeb\xfc\x0d\x1e\x2f"</div><div class='del'>-			"\x40\x51\x62\x73\x84\x95\xa6\xb7"</div><div class='del'>-			"\xc8\xd9\xea\xfb\x0c\x1d\x2e\x3f"</div><div class='del'>-			"\x50\x61\x72\x83\x94\xa5\xb6\xc7"</div><div class='del'>-			"\xd8\xe9\xfa\x0b\x1c\x2d\x3e\x4f"</div><div class='del'>-			"\x60\x71\x82\x93\xa4\xb5\xc6\xd7"</div><div class='del'>-			"\xe8\xf9\x0a\x1b\x2c\x3d\x4e\x5f"</div><div class='del'>-			"\x70\x81\x92\xa3\xb4\xc5\xd6\xe7"</div><div class='del'>-			"\xf8\x09\x1a\x2b\x3c\x4d\x5e\x6f"</div><div class='del'>-			"\x80\x91\xa2\xb3\xc4\xd5\xe6\xf7"</div><div class='del'>-			"\x08\x19\x2a\x3b\x4c\x5d\x6e\x7f"</div><div class='del'>-			"\x90\xa1\xb2\xc3\xd4\xe5\xf6\x07"</div><div class='del'>-			"\x18\x29\x3a\x4b\x5c\x6d\x7e\x8f"</div><div class='del'>-			"\xa0\xb1\xc2\xd3\xe4\xf5\x06\x17"</div><div class='del'>-			"\x28\x39\x4a\x5b\x6c\x7d\x8e\x9f"</div><div class='del'>-			"\xb0\xc1\xd2\xe3\xf4\x05\x16\x27"</div><div class='del'>-			"\x38\x49\x5a\x6b\x7c\x8d\x9e\xaf"</div><div class='del'>-			"\xc0\xd1\xe2\xf3\x04\x15\x26\x37"</div><div class='del'>-			"\x48\x59\x6a\x7b\x8c\x9d\xae\xbf"</div><div class='del'>-			"\xd0\xe1\xf2\x03\x14\x25\x36\x47"</div><div class='del'>-			"\x58\x69\x7a\x8b\x9c\xad\xbe\xcf"</div><div class='del'>-			"\xe0\xf1\x02\x13\x24\x35\x46\x57"</div><div class='del'>-			"\x68\x79\x8a\x9b\xac\xbd\xce\xdf"</div><div class='del'>-			"\xf0\x01\x12\x23\x34\x45\x56\x67"</div><div class='del'>-			"\x78\x89\x9a\xab\xbc\xcd\xde\xef"</div><div class='del'>-			"\x00\x13\x26\x39\x4c\x5f\x72\x85"</div><div class='del'>-			"\x98\xab\xbe\xd1\xe4\xf7\x0a\x1d"</div><div class='del'>-			"\x30\x43\x56\x69\x7c\x8f\xa2\xb5"</div><div class='del'>-			"\xc8\xdb\xee\x01\x14\x27\x3a\x4d"</div><div class='del'>-			"\x60\x73\x86\x99\xac\xbf\xd2\xe5"</div><div class='del'>-			"\xf8\x0b\x1e\x31\x44\x57\x6a\x7d"</div><div class='del'>-			"\x90\xa3\xb6\xc9\xdc\xef\x02\x15"</div><div class='del'>-			"\x28\x3b\x4e\x61\x74\x87\x9a\xad"</div><div class='del'>-			"\xc0\xd3\xe6\xf9\x0c\x1f\x32\x45"</div><div class='del'>-			"\x58\x6b\x7e\x91\xa4\xb7\xca\xdd"</div><div class='del'>-			"\xf0\x03\x16\x29\x3c\x4f\x62\x75"</div><div class='del'>-			"\x88\x9b\xae\xc1\xd4\xe7\xfa\x0d"</div><div class='del'>-			"\x20\x33\x46\x59\x6c\x7f\x92\xa5"</div><div class='del'>-			"\xb8\xcb\xde\xf1\x04\x17\x2a\x3d"</div><div class='del'>-			"\x50\x63\x76\x89\x9c\xaf\xc2\xd5"</div><div class='del'>-			"\xe8\xfb\x0e\x21\x34\x47\x5a\x6d"</div><div class='del'>-			"\x80\x93\xa6\xb9\xcc\xdf\xf2\x05"</div><div class='del'>-			"\x18\x2b\x3e\x51\x64\x77\x8a\x9d"</div><div class='del'>-			"\xb0\xc3\xd6\xe9\xfc\x0f\x22\x35"</div><div class='del'>-			"\x48\x5b\x6e\x81\x94\xa7\xba\xcd"</div><div class='del'>-			"\xe0\xf3\x06\x19\x2c\x3f\x52\x65"</div><div class='del'>-			"\x78\x8b\x9e\xb1\xc4\xd7\xea\xfd"</div><div class='del'>-			"\x10\x23\x36\x49\x5c\x6f\x82\x95"</div><div class='del'>-			"\xa8\xbb\xce\xe1\xf4\x07\x1a\x2d"</div><div class='del'>-			"\x40\x53\x66\x79\x8c\x9f\xb2\xc5"</div><div class='del'>-			"\xd8\xeb\xfe\x11\x24\x37\x4a\x5d"</div><div class='del'>-			"\x70\x83\x96\xa9\xbc\xcf\xe2\xf5"</div><div class='del'>-			"\x08\x1b\x2e\x41\x54\x67\x7a\x8d"</div><div class='del'>-			"\xa0\xb3\xc6\xd9\xec\xff\x12\x25"</div><div class='del'>-			"\x38\x4b\x5e\x71\x84\x97\xaa\xbd"</div><div class='del'>-			"\xd0\xe3\xf6\x09\x1c\x2f\x42\x55"</div><div class='del'>-			"\x68\x7b\x8e\xa1\xb4\xc7\xda\xed"</div><div class='del'>-			"\x00\x15\x2a\x3f\x54\x69\x7e\x93"</div><div class='del'>-			"\xa8\xbd\xd2\xe7\xfc\x11\x26\x3b"</div><div class='del'>-			"\x50\x65\x7a\x8f\xa4\xb9\xce\xe3"</div><div class='del'>-			"\xf8\x0d\x22\x37\x4c\x61\x76\x8b"</div><div class='del'>-			"\xa0\xb5\xca\xdf\xf4\x09\x1e\x33"</div><div class='del'>-			"\x48\x5d\x72\x87\x9c\xb1\xc6\xdb"</div><div class='del'>-			"\xf0\x05\x1a\x2f\x44\x59\x6e\x83"</div><div class='del'>-			"\x98\xad\xc2\xd7\xec\x01\x16\x2b"</div><div class='del'>-			"\x40\x55\x6a\x7f\x94\xa9\xbe\xd3"</div><div class='del'>-			"\xe8\xfd\x12\x27\x3c\x51\x66\x7b"</div><div class='del'>-			"\x90\xa5\xba\xcf\xe4\xf9\x0e\x23"</div><div class='del'>-			"\x38\x4d\x62\x77\x8c\xa1\xb6\xcb"</div><div class='del'>-			"\xe0\xf5\x0a\x1f\x34\x49\x5e\x73"</div><div class='del'>-			"\x88\x9d\xb2\xc7\xdc\xf1\x06\x1b"</div><div class='del'>-			"\x30\x45\x5a\x6f\x84\x99\xae\xc3"</div><div class='del'>-			"\xd8\xed\x02\x17\x2c\x41\x56\x6b"</div><div class='del'>-			"\x80\x95\xaa\xbf\xd4\xe9\xfe\x13"</div><div class='del'>-			"\x28\x3d\x52\x67\x7c\x91\xa6\xbb"</div><div class='del'>-			"\xd0\xe5\xfa\x0f\x24\x39\x4e\x63"</div><div class='del'>-			"\x78\x8d\xa2\xb7\xcc\xe1\xf6\x0b"</div><div class='del'>-			"\x20\x35\x4a\x5f\x74\x89\x9e\xb3"</div><div class='del'>-			"\xc8\xdd\xf2\x07\x1c\x31\x46\x5b"</div><div class='del'>-			"\x70\x85\x9a\xaf\xc4\xd9\xee\x03"</div><div class='del'>-			"\x18\x2d\x42\x57\x6c\x81\x96\xab"</div><div class='del'>-			"\xc0\xd5\xea\xff\x14\x29\x3e\x53"</div><div class='del'>-			"\x68\x7d\x92\xa7\xbc\xd1\xe6\xfb"</div><div class='del'>-			"\x10\x25\x3a\x4f\x64\x79\x8e\xa3"</div><div class='del'>-			"\xb8\xcd\xe2\xf7\x0c\x21\x36\x4b"</div><div class='del'>-			"\x60\x75\x8a\x9f\xb4\xc9\xde\xf3"</div><div class='del'>-			"\x08\x1d\x32\x47\x5c\x71\x86\x9b"</div><div class='del'>-			"\xb0\xc5\xda\xef\x04\x19\x2e\x43"</div><div class='del'>-			"\x58\x6d\x82\x97\xac\xc1\xd6\xeb"</div><div class='del'>-			"\x00\x17\x2e\x45\x5c\x73\x8a\xa1"</div><div class='del'>-			"\xb8\xcf\xe6\xfd\x14\x2b\x42\x59"</div><div class='del'>-			"\x70\x87\x9e\xb5\xcc\xe3\xfa\x11"</div><div class='del'>-			"\x28\x3f\x56\x6d\x84\x9b\xb2\xc9"</div><div class='del'>-			"\xe0\xf7\x0e\x25\x3c\x53\x6a\x81"</div><div class='del'>-			"\x98\xaf\xc6\xdd\xf4\x0b\x22\x39"</div><div class='del'>-			"\x50\x67\x7e\x95\xac\xc3\xda\xf1"</div><div class='del'>-			"\x08\x1f\x36\x4d\x64\x7b\x92\xa9"</div><div class='del'>-			"\xc0\xd7\xee\x05\x1c\x33\x4a\x61"</div><div class='del'>-			"\x78\x8f\xa6\xbd\xd4\xeb\x02\x19"</div><div class='del'>-			"\x30\x47\x5e\x75\x8c\xa3\xba\xd1"</div><div class='del'>-			"\xe8\xff\x16\x2d\x44\x5b\x72\x89"</div><div class='del'>-			"\xa0\xb7\xce\xe5\xfc\x13\x2a\x41"</div><div class='del'>-			"\x58\x6f\x86\x9d\xb4\xcb\xe2\xf9"</div><div class='del'>-			"\x10\x27\x3e\x55\x6c\x83\x9a\xb1"</div><div class='del'>-			"\xc8\xdf\xf6\x0d\x24\x3b\x52\x69"</div><div class='del'>-			"\x80\x97\xae\xc5\xdc\xf3\x0a\x21"</div><div class='del'>-			"\x38\x4f\x66\x7d\x94\xab\xc2\xd9"</div><div class='del'>-			"\xf0\x07\x1e\x35\x4c\x63\x7a\x91"</div><div class='del'>-			"\xa8\xbf\xd6\xed\x04\x1b\x32\x49"</div><div class='del'>-			"\x60\x77\x8e\xa5\xbc\xd3\xea\x01"</div><div class='del'>-			"\x18\x2f\x46\x5d\x74\x8b\xa2\xb9"</div><div class='del'>-			"\xd0\xe7\xfe\x15\x2c\x43\x5a\x71"</div><div class='del'>-			"\x88\x9f\xb6\xcd\xe4\xfb\x12\x29"</div><div class='del'>-			"\x40\x57\x6e\x85\x9c\xb3\xca\xe1"</div><div class='del'>-			"\xf8\x0f\x26\x3d\x54\x6b\x82\x99"</div><div class='del'>-			"\xb0\xc7\xde\xf5\x0c\x23\x3a\x51"</div><div class='del'>-			"\x68\x7f\x96\xad\xc4\xdb\xf2\x09"</div><div class='del'>-			"\x20\x37\x4e\x65\x7c\x93\xaa\xc1"</div><div class='del'>-			"\xd8\xef\x06\x1d\x34\x4b\x62\x79"</div><div class='del'>-			"\x90\xa7\xbe\xd5\xec\x03\x1a\x31"</div><div class='del'>-			"\x48\x5f\x76\x8d\xa4\xbb\xd2\xe9"</div><div class='del'>-			"\x00\x19\x32\x4b\x64\x7d\x96\xaf"</div><div class='del'>-			"\xc8\xe1\xfa\x13\x2c\x45\x5e\x77"</div><div class='del'>-			"\x90\xa9\xc2\xdb\xf4\x0d\x26\x3f"</div><div class='del'>-			"\x58\x71\x8a\xa3\xbc\xd5\xee\x07"</div><div class='del'>-			"\x20\x39\x52\x6b\x84\x9d\xb6\xcf"</div><div class='del'>-			"\xe8\x01\x1a\x33\x4c\x65\x7e\x97"</div><div class='del'>-			"\xb0\xc9\xe2\xfb\x14\x2d\x46\x5f"</div><div class='del'>-			"\x78\x91\xaa\xc3\xdc\xf5\x0e\x27"</div><div class='del'>-			"\x40\x59\x72\x8b\xa4\xbd\xd6\xef"</div><div class='del'>-			"\x08\x21\x3a\x53\x6c\x85\x9e\xb7"</div><div class='del'>-			"\xd0\xe9\x02\x1b\x34\x4d\x66\x7f"</div><div class='del'>-			"\x98\xb1\xca\xe3\xfc\x15\x2e\x47"</div><div class='del'>-			"\x60\x79\x92\xab\xc4\xdd\xf6\x0f"</div><div class='del'>-			"\x28\x41\x5a\x73\x8c\xa5\xbe\xd7"</div><div class='del'>-			"\xf0\x09\x22\x3b\x54\x6d\x86\x9f"</div><div class='del'>-			"\xb8\xd1\xea\x03\x1c\x35\x4e\x67"</div><div class='del'>-			"\x80\x99\xb2\xcb\xe4\xfd\x16\x2f"</div><div class='del'>-			"\x48\x61\x7a\x93\xac\xc5\xde\xf7"</div><div class='del'>-			"\x10\x29\x42\x5b\x74\x8d\xa6\xbf"</div><div class='del'>-			"\xd8\xf1\x0a\x23\x3c\x55\x6e\x87"</div><div class='del'>-			"\xa0\xb9\xd2\xeb\x04\x1d\x36\x4f"</div><div class='del'>-			"\x68\x81\x9a\xb3\xcc\xe5\xfe\x17"</div><div class='del'>-			"\x30\x49\x62\x7b\x94\xad\xc6\xdf"</div><div class='del'>-			"\xf8\x11\x2a\x43\x5c\x75\x8e\xa7"</div><div class='del'>-			"\xc0\xd9\xf2\x0b\x24\x3d\x56\x6f"</div><div class='del'>-			"\x88\xa1\xba\xd3\xec\x05\x1e\x37"</div><div class='del'>-			"\x50\x69\x82\x9b\xb4\xcd\xe6\xff"</div><div class='del'>-			"\x18\x31\x4a\x63\x7c\x95\xae\xc7"</div><div class='del'>-			"\xe0\xf9\x12\x2b\x44\x5d\x76\x8f"</div><div class='del'>-			"\xa8\xc1\xda\xf3\x0c\x25\x3e\x57"</div><div class='del'>-			"\x70\x89\xa2\xbb\xd4\xed\x06\x1f"</div><div class='del'>-			"\x38\x51\x6a\x83\x9c\xb5\xce\xe7"</div><div class='del'>-			"\x00\x1b\x36\x51\x6c\x87\xa2\xbd"</div><div class='del'>-			"\xd8\xf3\x0e\x29\x44\x5f\x7a\x95"</div><div class='del'>-			"\xb0\xcb\xe6\x01\x1c\x37\x52\x6d"</div><div class='del'>-			"\x88\xa3\xbe\xd9\xf4\x0f\x2a\x45"</div><div class='del'>-			"\x60\x7b\x96\xb1\xcc\xe7\x02\x1d"</div><div class='del'>-			"\x38\x53\x6e\x89\xa4\xbf\xda\xf5"</div><div class='del'>-			"\x10\x2b\x46\x61\x7c\x97\xb2\xcd"</div><div class='del'>-			"\xe8\x03\x1e\x39\x54\x6f\x8a\xa5"</div><div class='del'>-			"\xc0\xdb\xf6\x11\x2c\x47\x62\x7d"</div><div class='del'>-			"\x98\xb3\xce\xe9\x04\x1f\x3a\x55"</div><div class='del'>-			"\x70\x8b\xa6\xc1\xdc\xf7\x12\x2d"</div><div class='del'>-			"\x48\x63\x7e\x99\xb4\xcf\xea\x05"</div><div class='del'>-			"\x20\x3b\x56\x71\x8c\xa7\xc2\xdd"</div><div class='del'>-			"\xf8\x13\x2e\x49\x64\x7f\x9a\xb5"</div><div class='del'>-			"\xd0\xeb\x06\x21\x3c\x57\x72\x8d"</div><div class='del'>-			"\xa8\xc3\xde\xf9\x14\x2f\x4a\x65"</div><div class='del'>-			"\x80\x9b\xb6\xd1\xec\x07\x22\x3d"</div><div class='del'>-			"\x58\x73\x8e\xa9\xc4\xdf\xfa\x15"</div><div class='del'>-			"\x30\x4b\x66\x81\x9c\xb7\xd2\xed"</div><div class='del'>-			"\x08\x23\x3e\x59\x74\x8f\xaa\xc5"</div><div class='del'>-			"\xe0\xfb\x16\x31\x4c\x67\x82\x9d"</div><div class='del'>-			"\xb8\xd3\xee\x09\x24\x3f\x5a\x75"</div><div class='del'>-			"\x90\xab\xc6\xe1\xfc\x17\x32\x4d"</div><div class='del'>-			"\x68\x83\x9e\xb9\xd4\xef\x0a\x25"</div><div class='del'>-			"\x40\x5b\x76\x91\xac\xc7\xe2\xfd"</div><div class='del'>-			"\x18\x33\x4e\x69\x84\x9f\xba\xd5"</div><div class='del'>-			"\xf0\x0b\x26\x41\x5c\x77\x92\xad"</div><div class='del'>-			"\xc8\xe3\xfe\x19\x34\x4f\x6a\x85"</div><div class='del'>-			"\xa0\xbb\xd6\xf1\x0c\x27\x42\x5d"</div><div class='del'>-			"\x78\x93\xae\xc9\xe4\xff\x1a\x35"</div><div class='del'>-			"\x50\x6b\x86\xa1\xbc\xd7\xf2\x0d"</div><div class='del'>-			"\x28\x43\x5e\x79\x94\xaf\xca\xe5"</div><div class='del'>-			"\x00\x1d\x3a\x57\x74\x91\xae\xcb"</div><div class='del'>-			"\xe8\x05\x22\x3f\x5c\x79\x96\xb3"</div><div class='del'>-			"\xd0\xed\x0a\x27\x44\x61\x7e\x9b"</div><div class='del'>-			"\xb8\xd5\xf2\x0f\x2c\x49\x66\x83"</div><div class='del'>-			"\xa0\xbd\xda\xf7\x14\x31\x4e\x6b"</div><div class='del'>-			"\x88\xa5\xc2\xdf\xfc\x19\x36\x53"</div><div class='del'>-			"\x70\x8d\xaa\xc7\xe4\x01\x1e\x3b"</div><div class='del'>-			"\x58\x75\x92\xaf\xcc\xe9\x06\x23"</div><div class='del'>-			"\x40\x5d\x7a\x97\xb4\xd1\xee\x0b"</div><div class='del'>-			"\x28\x45\x62\x7f\x9c\xb9\xd6\xf3"</div><div class='del'>-			"\x10\x2d\x4a\x67\x84\xa1\xbe\xdb"</div><div class='del'>-			"\xf8\x15\x32\x4f\x6c\x89\xa6\xc3"</div><div class='del'>-			"\xe0\xfd\x1a\x37\x54\x71\x8e\xab"</div><div class='del'>-			"\xc8\xe5\x02\x1f\x3c\x59\x76\x93"</div><div class='del'>-			"\xb0\xcd\xea\x07\x24\x41\x5e\x7b"</div><div class='del'>-			"\x98\xb5\xd2\xef\x0c\x29\x46\x63"</div><div class='del'>-			"\x80\x9d\xba\xd7\xf4\x11\x2e\x4b"</div><div class='del'>-			"\x68\x85\xa2\xbf\xdc\xf9\x16\x33"</div><div class='del'>-			"\x50\x6d\x8a\xa7\xc4\xe1\xfe\x1b"</div><div class='del'>-			"\x38\x55\x72\x8f\xac\xc9\xe6\x03"</div><div class='del'>-			"\x20\x3d\x5a\x77\x94\xb1\xce\xeb"</div><div class='del'>-			"\x08\x25\x42\x5f\x7c\x99\xb6\xd3"</div><div class='del'>-			"\xf0\x0d\x2a\x47\x64\x81\x9e\xbb"</div><div class='del'>-			"\xd8\xf5\x12\x2f\x4c\x69\x86\xa3"</div><div class='del'>-			"\xc0\xdd\xfa\x17\x34\x51\x6e\x8b"</div><div class='del'>-			"\xa8\xc5\xe2\xff\x1c\x39\x56\x73"</div><div class='del'>-			"\x90\xad\xca\xe7\x04\x21\x3e\x5b"</div><div class='del'>-			"\x78\x95\xb2\xcf\xec\x09\x26\x43"</div><div class='del'>-			"\x60\x7d\x9a\xb7\xd4\xf1\x0e\x2b"</div><div class='del'>-			"\x48\x65\x82\x9f\xbc\xd9\xf6\x13"</div><div class='del'>-			"\x30\x4d\x6a\x87\xa4\xc1\xde\xfb"</div><div class='del'>-			"\x18\x35\x52\x6f\x8c\xa9\xc6\xe3"</div><div class='del'>-			"\x00\x1f\x3e\x5d\x7c\x9b\xba\xd9"</div><div class='del'>-			"\xf8\x17\x36\x55\x74\x93\xb2\xd1"</div><div class='del'>-			"\xf0\x0f\x2e\x4d\x6c\x8b\xaa\xc9"</div><div class='del'>-			"\xe8\x07\x26\x45\x64\x83\xa2\xc1"</div><div class='del'>-			"\xe0\xff\x1e\x3d\x5c\x7b\x9a\xb9"</div><div class='del'>-			"\xd8\xf7\x16\x35\x54\x73\x92\xb1"</div><div class='del'>-			"\xd0\xef\x0e\x2d\x4c\x6b\x8a\xa9"</div><div class='del'>-			"\xc8\xe7\x06\x25\x44\x63\x82\xa1"</div><div class='del'>-			"\xc0\xdf\xfe\x1d\x3c\x5b\x7a\x99"</div><div class='del'>-			"\xb8\xd7\xf6\x15\x34\x53\x72\x91"</div><div class='del'>-			"\xb0\xcf\xee\x0d\x2c\x4b\x6a\x89"</div><div class='del'>-			"\xa8\xc7\xe6\x05\x24\x43\x62\x81"</div><div class='del'>-			"\xa0\xbf\xde\xfd\x1c\x3b\x5a\x79"</div><div class='del'>-			"\x98\xb7\xd6\xf5\x14\x33\x52\x71"</div><div class='del'>-			"\x90\xaf\xce\xed\x0c\x2b\x4a\x69"</div><div class='del'>-			"\x88\xa7\xc6\xe5\x04\x23\x42\x61"</div><div class='del'>-			"\x80\x9f\xbe\xdd\xfc\x1b\x3a\x59"</div><div class='del'>-			"\x78\x97\xb6\xd5\xf4\x13\x32\x51"</div><div class='del'>-			"\x70\x8f\xae\xcd\xec\x0b\x2a\x49"</div><div class='del'>-			"\x68\x87\xa6\xc5\xe4\x03\x22\x41"</div><div class='del'>-			"\x60\x7f\x9e\xbd\xdc\xfb\x1a\x39"</div><div class='del'>-			"\x58\x77\x96\xb5\xd4\xf3\x12\x31"</div><div class='del'>-			"\x50\x6f\x8e\xad\xcc\xeb\x0a\x29"</div><div class='del'>-			"\x48\x67\x86\xa5\xc4\xe3\x02\x21"</div><div class='del'>-			"\x40\x5f\x7e\x9d\xbc\xdb\xfa\x19"</div><div class='del'>-			"\x38\x57\x76\x95\xb4\xd3\xf2\x11"</div><div class='del'>-			"\x30\x4f\x6e\x8d\xac\xcb\xea\x09"</div><div class='del'>-			"\x28\x47\x66\x85\xa4\xc3\xe2\x01"</div><div class='del'>-			"\x20\x3f\x5e\x7d\x9c\xbb\xda\xf9"</div><div class='del'>-			"\x18\x37\x56\x75\x94\xb3\xd2\xf1"</div><div class='del'>-			"\x10\x2f\x4e\x6d\x8c\xab\xca\xe9"</div><div class='del'>-			"\x08\x27\x46\x65\x84\xa3\xc2\xe1"</div><div class='del'>-			"\x00\x21\x42\x63",</div><div class='del'>-		.ilen = 4100,</div><div class='del'>-		.result =</div><div class='del'>-			"\xb5\x81\xf5\x64\x18\x73\xe3\xf0"</div><div class='del'>-			"\x4c\x13\xf2\x77\x18\x60\x65\x5e"</div><div class='del'>-			"\x29\x01\xce\x98\x55\x53\xf9\x0c"</div><div class='del'>-			"\x2a\x08\xd5\x09\xb3\x57\x55\x56"</div><div class='del'>-			"\xc5\xe9\x56\x90\xcb\x6a\xa3\xc0"</div><div class='del'>-			"\xff\xc4\x79\xb4\xd2\x97\x5d\xc4"</div><div class='del'>-			"\x43\xd1\xfe\x94\x7b\x88\x06\x5a"</div><div class='del'>-			"\xb2\x9e\x2c\xfc\x44\x03\xb7\x90"</div><div class='del'>-			"\xa0\xc1\xba\x6a\x33\xb8\xc7\xb2"</div><div class='del'>-			"\x9d\xe1\x12\x4f\xc0\x64\xd4\x01"</div><div class='del'>-			"\xfe\x8c\x7a\x66\xf7\xe6\x5a\x91"</div><div class='del'>-			"\xbb\xde\x56\x86\xab\x65\x21\x30"</div><div class='del'>-			"\x00\x84\x65\x24\xa5\x7d\x85\xb4"</div><div class='del'>-			"\xe3\x17\xed\x3a\xb7\x6f\xb4\x0b"</div><div class='del'>-			"\x0b\xaf\x15\xae\x5a\x8f\xf2\x0c"</div><div class='del'>-			"\x2f\x27\xf4\x09\xd8\xd2\x96\xb7"</div><div class='del'>-			"\x71\xf2\xc5\x99\x4d\x7e\x7f\x75"</div><div class='del'>-			"\x77\x89\x30\x8b\x59\xdb\xa2\xb2"</div><div class='del'>-			"\xa0\xf3\x19\x39\x2b\xc5\x7e\x3f"</div><div class='del'>-			"\x4f\xd9\xd3\x56\x28\x97\x44\xdc"</div><div class='del'>-			"\xc0\x8b\x77\x24\xd9\x52\xe7\xc5"</div><div class='del'>-			"\xaf\xf6\x7d\x59\xb2\x44\x05\x1d"</div><div class='del'>-			"\xb1\xb0\x11\xa5\x0f\xec\x33\xe1"</div><div class='del'>-			"\x6d\x1b\x4e\x1f\xff\x57\x91\xb4"</div><div class='del'>-			"\x5b\x9a\x96\xc5\x53\xbc\xae\x20"</div><div class='del'>-			"\x3c\xbb\x14\xe2\xe8\x22\x33\xc1"</div><div class='del'>-			"\x5e\x76\x9e\x46\x99\xf6\x2a\x15"</div><div class='del'>-			"\xc6\x97\x02\xa0\x66\x43\xd1\xa6"</div><div class='del'>-			"\x31\xa6\x9f\xfb\xf4\xd3\x69\xe5"</div><div class='del'>-			"\xcd\x76\x95\xb8\x7a\x82\x7f\x21"</div><div class='del'>-			"\x45\xff\x3f\xce\x55\xf6\x95\x10"</div><div class='del'>-			"\x08\x77\x10\x43\xc6\xf3\x09\xe5"</div><div class='del'>-			"\x68\xe7\x3c\xad\x00\x52\x45\x0d"</div><div class='del'>-			"\xfe\x2d\xc6\xc2\x94\x8c\x12\x1d"</div><div class='del'>-			"\xe6\x25\xae\x98\x12\x8e\x19\x9c"</div><div class='del'>-			"\x81\x68\xb1\x11\xf6\x69\xda\xe3"</div><div class='del'>-			"\x62\x08\x18\x7a\x25\x49\x28\xac"</div><div class='del'>-			"\xba\x71\x12\x0b\xe4\xa2\xe5\xc7"</div><div class='del'>-			"\x5d\x8e\xec\x49\x40\x21\xbf\x5a"</div><div class='del'>-			"\x98\xf3\x02\x68\x55\x03\x7f\x8a"</div><div class='del'>-			"\xe5\x94\x0c\x32\x5c\x07\x82\x63"</div><div class='del'>-			"\xaf\x6f\x91\x40\x84\x8e\x52\x25"</div><div class='del'>-			"\xd0\xb0\x29\x53\x05\xe2\x50\x7a"</div><div class='del'>-			"\x34\xeb\xc9\x46\x20\xa8\x3d\xde"</div><div class='del'>-			"\x7f\x16\x5f\x36\xc5\x2e\xdc\xd1"</div><div class='del'>-			"\x15\x47\xc7\x50\x40\x6d\x91\xc5"</div><div class='del'>-			"\xe7\x93\x95\x1a\xd3\x57\xbc\x52"</div><div class='del'>-			"\x33\xee\x14\x19\x22\x52\x89\xa7"</div><div class='del'>-			"\x4a\x25\x56\x77\x4b\xca\xcf\x0a"</div><div class='del'>-			"\xe1\xf5\x35\x85\x30\x7e\x59\x4a"</div><div class='del'>-			"\xbd\x14\x5b\xdf\xe3\x46\xcb\xac"</div><div class='del'>-			"\x1f\x6c\x96\x0e\xf4\x81\xd1\x99"</div><div class='del'>-			"\xca\x88\x63\x3d\x02\x58\x6b\xa9"</div><div class='del'>-			"\xe5\x9f\xb3\x00\xb2\x54\xc6\x74"</div><div class='del'>-			"\x1c\xbf\x46\xab\x97\xcc\xf8\x54"</div><div class='del'>-			"\x04\x07\x08\x52\xe6\xc0\xda\x93"</div><div class='del'>-			"\x74\x7d\x93\x99\x5d\x78\x68\xa6"</div><div class='del'>-			"\x2e\x6b\xd3\x6a\x69\xcc\x12\x6b"</div><div class='del'>-			"\xd4\xc7\xa5\xc6\xe7\xf6\x03\x04"</div><div class='del'>-			"\x5d\xcd\x61\x5e\x17\x40\xdc\xd1"</div><div class='del'>-			"\x5c\xf5\x08\xdf\x5c\x90\x85\xa4"</div><div class='del'>-			"\xaf\xf6\x78\xbb\x0d\xf1\xf4\xa4"</div><div class='del'>-			"\x54\x26\x72\x9e\x61\xfa\x86\xcf"</div><div class='del'>-			"\xe8\x9e\xa1\xe0\xc7\x48\x23\xae"</div><div class='del'>-			"\x5a\x90\xae\x75\x0a\x74\x18\x89"</div><div class='del'>-			"\x05\xb1\x92\xb2\x7f\xd0\x1b\xa6"</div><div class='del'>-			"\x62\x07\x25\x01\xc7\xc2\x4f\xf9"</div><div class='del'>-			"\xe8\xfe\x63\x95\x80\x07\xb4\x26"</div><div class='del'>-			"\xcc\xd1\x26\xb6\xc4\x3f\x9e\xcb"</div><div class='del'>-			"\x8e\x3b\x2e\x44\x16\xd3\x10\x9a"</div><div class='del'>-			"\x95\x08\xeb\xc8\xcb\xeb\xbf\x6f"</div><div class='del'>-			"\x0b\xcd\x1f\xc8\xca\x86\xaa\xec"</div><div class='del'>-			"\x33\xe6\x69\xf4\x45\x25\x86\x3a"</div><div class='del'>-			"\x22\x94\x4f\x00\x23\x6a\x44\xc2"</div><div class='del'>-			"\x49\x97\x33\xab\x36\x14\x0a\x70"</div><div class='del'>-			"\x24\xc3\xbe\x04\x3b\x79\xa0\xf9"</div><div class='del'>-			"\xb8\xe7\x76\x29\x22\x83\xd7\xf2"</div><div class='del'>-			"\x94\xf4\x41\x49\xba\x5f\x7b\x07"</div><div class='del'>-			"\xb5\xfb\xdb\x03\x1a\x9f\xb6\x4c"</div><div class='del'>-			"\xc2\x2e\x37\x40\x49\xc3\x38\x16"</div><div class='del'>-			"\xe2\x4f\x77\x82\xb0\x68\x4c\x71"</div><div class='del'>-			"\x1d\x57\x61\x9c\xd9\x4e\x54\x99"</div><div class='del'>-			"\x47\x13\x28\x73\x3c\xbb\x00\x90"</div><div class='del'>-			"\xf3\x4d\xc9\x0e\xfd\xe7\xb1\x71"</div><div class='del'>-			"\xd3\x15\x79\xbf\xcc\x26\x2f\xbd"</div><div class='del'>-			"\xad\x6c\x50\x69\x6c\x3e\x6d\x80"</div><div class='del'>-			"\x9a\xea\x78\xaf\x19\xb2\x0d\x4d"</div><div class='del'>-			"\xad\x04\x07\xae\x22\x90\x4a\x93"</div><div class='del'>-			"\x32\x0e\x36\x9b\x1b\x46\xba\x3b"</div><div class='del'>-			"\xb4\xac\xc6\xd1\xa2\x31\x53\x3b"</div><div class='del'>-			"\x2a\x3d\x45\xfe\x03\x61\x10\x85"</div><div class='del'>-			"\x17\x69\xa6\x78\xcc\x6c\x87\x49"</div><div class='del'>-			"\x53\xf9\x80\x10\xde\x80\xa2\x41"</div><div class='del'>-			"\x6a\xc3\x32\x02\xad\x6d\x3c\x56"</div><div class='del'>-			"\x00\x71\x51\x06\xa7\xbd\xfb\xef"</div><div class='del'>-			"\x3c\xb5\x9f\xfc\x48\x7d\x53\x7c"</div><div class='del'>-			"\x66\xb0\x49\x23\xc4\x47\x10\x0e"</div><div class='del'>-			"\xe5\x6c\x74\x13\xe6\xc5\x3f\xaa"</div><div class='del'>-			"\xde\xff\x07\x44\xdd\x56\x1b\xad"</div><div class='del'>-			"\x09\x77\xfb\x5b\x12\xb8\x0d\x38"</div><div class='del'>-			"\x17\x37\x35\x7b\x9b\xbc\xfe\xd4"</div><div class='del'>-			"\x7e\x8b\xda\x7e\x5b\x04\xa7\x22"</div><div class='del'>-			"\xa7\x31\xa1\x20\x86\xc7\x1b\x99"</div><div class='del'>-			"\xdb\xd1\x89\xf4\x94\xa3\x53\x69"</div><div class='del'>-			"\x8d\xe7\xe8\x74\x11\x8d\x74\xd6"</div><div class='del'>-			"\x07\x37\x91\x9f\xfd\x67\x50\x3a"</div><div class='del'>-			"\xc9\xe1\xf4\x36\xd5\xa0\x47\xd1"</div><div class='del'>-			"\xf9\xe5\x39\xa3\x31\xac\x07\x36"</div><div class='del'>-			"\x23\xf8\x66\x18\x14\x28\x34\x0f"</div><div class='del'>-			"\xb8\xd0\xe7\x29\xb3\x04\x4b\x55"</div><div class='del'>-			"\x01\x41\xb2\x75\x8d\xcb\x96\x85"</div><div class='del'>-			"\x3a\xfb\xab\x2b\x9e\xfa\x58\x20"</div><div class='del'>-			"\x44\x1f\xc0\x14\x22\x75\x61\xe8"</div><div class='del'>-			"\xaa\x19\xcf\xf1\x82\x56\xf4\xd7"</div><div class='del'>-			"\x78\x7b\x3d\x5f\xb3\x9e\x0b\x8a"</div><div class='del'>-			"\x57\x50\xdb\x17\x41\x65\x4d\xa3"</div><div class='del'>-			"\x02\xc9\x9c\x9c\x53\xfb\x39\x39"</div><div class='del'>-			"\x9b\x1d\x72\x24\xda\xb7\x39\xbe"</div><div class='del'>-			"\x13\x3b\xfa\x29\xda\x9e\x54\x64"</div><div class='del'>-			"\x6e\xba\xd8\xa1\xcb\xb3\x36\xfa"</div><div class='del'>-			"\xcb\x47\x85\xe9\x61\x38\xbc\xbe"</div><div class='del'>-			"\xc5\x00\x38\x2a\x54\xf7\xc4\xb9"</div><div class='del'>-			"\xb3\xd3\x7b\xa0\xa0\xf8\x72\x7f"</div><div class='del'>-			"\x8c\x8e\x82\x0e\xc6\x1c\x75\x9d"</div><div class='del'>-			"\xca\x8e\x61\x87\xde\xad\x80\xd2"</div><div class='del'>-			"\xf5\xf9\x80\xef\x15\x75\xaf\xf5"</div><div class='del'>-			"\x80\xfb\xff\x6d\x1e\x25\xb7\x40"</div><div class='del'>-			"\x61\x6a\x39\x5a\x6a\xb5\x31\xab"</div><div class='del'>-			"\x97\x8a\x19\x89\x44\x40\xc0\xa6"</div><div class='del'>-			"\xb4\x4e\x30\x32\x7b\x13\xe7\x67"</div><div class='del'>-			"\xa9\x8b\x57\x04\xc2\x01\xa6\xf4"</div><div class='del'>-			"\x28\x99\xad\x2c\x76\xa3\x78\xc2"</div><div class='del'>-			"\x4a\xe6\xca\x5c\x50\x6a\xc1\xb0"</div><div class='del'>-			"\x62\x4b\x10\x8e\x7c\x17\x43\xb3"</div><div class='del'>-			"\x17\x66\x1c\x3e\x8d\x69\xf0\x5a"</div><div class='del'>-			"\x71\xf5\x97\xdc\xd1\x45\xdd\x28"</div><div class='del'>-			"\xf3\x5d\xdf\x53\x7b\x11\xe5\xbc"</div><div class='del'>-			"\x4c\xdb\x1b\x51\x6b\xe9\xfb\x3d"</div><div class='del'>-			"\xc1\xc3\x2c\xb9\x71\xf5\xb6\xb2"</div><div class='del'>-			"\x13\x36\x79\x80\x53\xe8\xd3\xa6"</div><div class='del'>-			"\x0a\xaf\xfd\x56\x97\xf7\x40\x8e"</div><div class='del'>-			"\x45\xce\xf8\xb0\x9e\x5c\x33\x82"</div><div class='del'>-			"\xb0\x44\x56\xfc\x05\x09\xe9\x2a"</div><div class='del'>-			"\xac\x26\x80\x14\x1d\xc8\x3a\x35"</div><div class='del'>-			"\x4c\x82\x97\xfd\x76\xb7\xa9\x0a"</div><div class='del'>-			"\x35\x58\x79\x8e\x0f\x66\xea\xaf"</div><div class='del'>-			"\x51\x6c\x09\xa9\x6e\x9b\xcb\x9a"</div><div class='del'>-			"\x31\x47\xa0\x2f\x7c\x71\xb4\x4a"</div><div class='del'>-			"\x11\xaa\x8c\x66\xc5\x64\xe6\x3a"</div><div class='del'>-			"\x54\xda\x24\x6a\xc4\x41\x65\x46"</div><div class='del'>-			"\x82\xa0\x0a\x0f\x5f\xfb\x25\xd0"</div><div class='del'>-			"\x2c\x91\xa7\xee\xc4\x81\x07\x86"</div><div class='del'>-			"\x75\x5e\x33\x69\x97\xe4\x2c\xa8"</div><div class='del'>-			"\x9d\x9f\x0b\x6a\xbe\xad\x98\xda"</div><div class='del'>-			"\x6d\x94\x41\xda\x2c\x1e\x89\xc4"</div><div class='del'>-			"\xc2\xaf\x1e\x00\x05\x0b\x83\x60"</div><div class='del'>-			"\xbd\x43\xea\x15\x23\x7f\xb9\xac"</div><div class='del'>-			"\xee\x4f\x2c\xaf\x2a\xf3\xdf\xd0"</div><div class='del'>-			"\xf3\x19\x31\xbb\x4a\x74\x84\x17"</div><div class='del'>-			"\x52\x32\x2c\x7d\x61\xe4\xcb\xeb"</div><div class='del'>-			"\x80\x38\x15\x52\xcb\x6f\xea\xe5"</div><div class='del'>-			"\x73\x9c\xd9\x24\x69\xc6\x95\x32"</div><div class='del'>-			"\x21\xc8\x11\xe4\xdc\x36\xd7\x93"</div><div class='del'>-			"\x38\x66\xfb\xb2\x7f\x3a\xb9\xaf"</div><div class='del'>-			"\x31\xdd\x93\x75\x78\x8a\x2c\x94"</div><div class='del'>-			"\x87\x1a\x58\xec\x9e\x7d\x4d\xba"</div><div class='del'>-			"\xe1\xe5\x4d\xfc\xbc\xa4\x2a\x14"</div><div class='del'>-			"\xef\xcc\xa7\xec\xab\x43\x09\x18"</div><div class='del'>-			"\xd3\xab\x68\xd1\x07\x99\x44\x47"</div><div class='del'>-			"\xd6\x83\x85\x3b\x30\xea\xa9\x6b"</div><div class='del'>-			"\x63\xea\xc4\x07\xfb\x43\x2f\xa4"</div><div class='del'>-			"\xaa\xb0\xab\x03\x89\xce\x3f\x8c"</div><div class='del'>-			"\x02\x7c\x86\x54\xbc\x88\xaf\x75"</div><div class='del'>-			"\xd2\xdc\x63\x17\xd3\x26\xf6\x96"</div><div class='del'>-			"\xa9\x3c\xf1\x61\x8c\x11\x18\xcc"</div><div class='del'>-			"\xd6\xea\x5b\xe2\xcd\xf0\xf1\xb2"</div><div class='del'>-			"\xe5\x35\x90\x1f\x85\x4c\x76\x5b"</div><div class='del'>-			"\x66\xce\x44\xa4\x32\x9f\xe6\x7b"</div><div class='del'>-			"\x71\x6e\x9f\x58\x15\x67\x72\x87"</div><div class='del'>-			"\x64\x8e\x3a\x44\x45\xd4\x76\xfa"</div><div class='del'>-			"\xc2\xf6\xef\x85\x05\x18\x7a\x9b"</div><div class='del'>-			"\xba\x41\x54\xac\xf0\xfc\x59\x12"</div><div class='del'>-			"\x3f\xdf\xa0\xe5\x8a\x65\xfd\x3a"</div><div class='del'>-			"\x62\x8d\x83\x2c\x03\xbe\x05\x76"</div><div class='del'>-			"\x2e\x53\x49\x97\x94\x33\xae\x40"</div><div class='del'>-			"\x81\x15\xdb\x6e\xad\xaa\xf5\x4b"</div><div class='del'>-			"\xe3\x98\x70\xdf\xe0\x7c\xcd\xdb"</div><div class='del'>-			"\x02\xd4\x7d\x2f\xc1\xe6\xb4\xf3"</div><div class='del'>-			"\xd7\x0d\x7a\xd9\x23\x9e\x87\x2d"</div><div class='del'>-			"\xce\x87\xad\xcc\x72\x05\x00\x29"</div><div class='del'>-			"\xdc\x73\x7f\x64\xc1\x15\x0e\xc2"</div><div class='del'>-			"\xdf\xa7\x5f\xeb\x41\xa1\xcd\xef"</div><div class='del'>-			"\x5c\x50\x79\x2a\x56\x56\x71\x8c"</div><div class='del'>-			"\xac\xc0\x79\x50\x69\xca\x59\x32"</div><div class='del'>-			"\x65\xf2\x54\xe4\x52\x38\x76\xd1"</div><div class='del'>-			"\x5e\xde\x26\x9e\xfb\x75\x2e\x11"</div><div class='del'>-			"\xb5\x10\xf4\x17\x73\xf5\x89\xc7"</div><div class='del'>-			"\x4f\x43\x5c\x8e\x7c\xb9\x05\x52"</div><div class='del'>-			"\x24\x40\x99\xfe\x9b\x85\x0b\x6c"</div><div class='del'>-			"\x22\x3e\x8b\xae\x86\xa1\xd2\x79"</div><div class='del'>-			"\x05\x68\x6b\xab\xe3\x41\x49\xed"</div><div class='del'>-			"\x15\xa1\x8d\x40\x2d\x61\xdf\x1a"</div><div class='del'>-			"\x59\xc9\x26\x8b\xef\x30\x4c\x88"</div><div class='del'>-			"\x4b\x10\xf8\x8d\xa6\x92\x9f\x4b"</div><div class='del'>-			"\xf3\xc4\x53\x0b\x89\x5d\x28\x92"</div><div class='del'>-			"\xcf\x78\xb2\xc0\x5d\xed\x7e\xfc"</div><div class='del'>-			"\xc0\x12\x23\x5f\x5a\x78\x86\x43"</div><div class='del'>-			"\x6e\x27\xf7\x5a\xa7\x6a\xed\x19"</div><div class='del'>-			"\x04\xf0\xb3\x12\xd1\xbd\x0e\x89"</div><div class='del'>-			"\x6e\xbc\x96\xa8\xd8\x49\x39\x9f"</div><div class='del'>-			"\x7e\x67\xf0\x2e\x3e\x01\xa9\xba"</div><div class='del'>-			"\xec\x8b\x62\x8e\xcb\x4a\x70\x43"</div><div class='del'>-			"\xc7\xc2\xc4\xca\x82\x03\x73\xe9"</div><div class='del'>-			"\x11\xdf\xcf\x54\xea\xc9\xb0\x95"</div><div class='del'>-			"\x51\xc0\x13\x3d\x92\x05\xfa\xf4"</div><div class='del'>-			"\xa9\x34\xc8\xce\x6c\x3d\x54\xcc"</div><div class='del'>-			"\xc4\xaf\xf1\xdc\x11\x44\x26\xa2"</div><div class='del'>-			"\xaf\xf1\x85\x75\x7d\x03\x61\x68"</div><div class='del'>-			"\x4e\x78\xc6\x92\x7d\x86\x7d\x77"</div><div class='del'>-			"\xdc\x71\x72\xdb\xc6\xae\xa1\xcb"</div><div class='del'>-			"\x70\x9a\x0b\x19\xbe\x4a\x6c\x2a"</div><div class='del'>-			"\xe2\xba\x6c\x64\x9a\x13\x28\xdf"</div><div class='del'>-			"\x85\x75\xe6\x43\xf6\x87\x08\x68"</div><div class='del'>-			"\x6e\xba\x6e\x79\x9f\x04\xbc\x23"</div><div class='del'>-			"\x50\xf6\x33\x5c\x1f\x24\x25\xbe"</div><div class='del'>-			"\x33\x47\x80\x45\x56\xa3\xa7\xd7"</div><div class='del'>-			"\x7a\xb1\x34\x0b\x90\x3c\x9c\xad"</div><div class='del'>-			"\x44\x5f\x9e\x0e\x9d\xd4\xbd\x93"</div><div class='del'>-			"\x5e\xfa\x3c\xe0\xb0\xd9\xed\xf3"</div><div class='del'>-			"\xd6\x2e\xff\x24\xd8\x71\x6c\xed"</div><div class='del'>-			"\xaf\x55\xeb\x22\xac\x93\x68\x32"</div><div class='del'>-			"\x05\x5b\x47\xdd\xc6\x4a\xcb\xc7"</div><div class='del'>-			"\x10\xe1\x3c\x92\x1a\xf3\x23\x78"</div><div class='del'>-			"\x2b\xa1\xd2\x80\xf4\x12\xb1\x20"</div><div class='del'>-			"\x8f\xff\x26\x35\xdd\xfb\xc7\x4e"</div><div class='del'>-			"\x78\xf1\x2d\x50\x12\x77\xa8\x60"</div><div class='del'>-			"\x7c\x0f\xf5\x16\x2f\x63\x70\x2a"</div><div class='del'>-			"\xc0\x96\x80\x4e\x0a\xb4\x93\x35"</div><div class='del'>-			"\x5d\x1d\x3f\x56\xf7\x2f\xbb\x90"</div><div class='del'>-			"\x11\x16\x8f\xa2\xec\x47\xbe\xac"</div><div class='del'>-			"\x56\x01\x26\x56\xb1\x8c\xb2\x10"</div><div class='del'>-			"\xf9\x1a\xca\xf5\xd1\xb7\x39\x20"</div><div class='del'>-			"\x63\xf1\x69\x20\x4f\x13\x12\x1f"</div><div class='del'>-			"\x5b\x65\xfc\x98\xf7\xc4\x7a\xbe"</div><div class='del'>-			"\xf7\x26\x4d\x2b\x84\x7b\x42\xad"</div><div class='del'>-			"\xd8\x7a\x0a\xb4\xd8\x74\xbf\xc1"</div><div class='del'>-			"\xf0\x6e\xb4\x29\xa3\xbb\xca\x46"</div><div class='del'>-			"\x67\x70\x6a\x2d\xce\x0e\xa2\x8a"</div><div class='del'>-			"\xa9\x87\xbf\x05\xc4\xc1\x04\xa3"</div><div class='del'>-			"\xab\xd4\x45\x43\x8c\xb6\x02\xb0"</div><div class='del'>-			"\x41\xc8\xfc\x44\x3d\x59\xaa\x2e"</div><div class='del'>-			"\x44\x21\x2a\x8d\x88\x9d\x57\xf4"</div><div class='del'>-			"\xa0\x02\x77\xb8\xa6\xa0\xe6\x75"</div><div class='del'>-			"\x5c\x82\x65\x3e\x03\x5c\x29\x8f"</div><div class='del'>-			"\x38\x55\xab\x33\x26\xef\x9f\x43"</div><div class='del'>-			"\x52\xfd\x68\xaf\x36\xb4\xbb\x9a"</div><div class='del'>-			"\x58\x09\x09\x1b\xc3\x65\x46\x46"</div><div class='del'>-			"\x1d\xa7\x94\x18\x23\x50\x2c\xca"</div><div class='del'>-			"\x2c\x55\x19\x97\x01\x9d\x93\x3b"</div><div class='del'>-			"\x63\x86\xf2\x03\x67\x45\xd2\x72"</div><div class='del'>-			"\x28\x52\x6c\xf4\xe3\x1c\xb5\x11"</div><div class='del'>-			"\x13\xf1\xeb\x21\xc7\xd9\x56\x82"</div><div class='del'>-			"\x2b\x82\x39\xbd\x69\x54\xed\x62"</div><div class='del'>-			"\xc3\xe2\xde\x73\xd4\x6a\x12\xae"</div><div class='del'>-			"\x13\x21\x7f\x4b\x5b\xfc\xbf\xe8"</div><div class='del'>-			"\x2b\xbe\x56\xba\x68\x8b\x9a\xb1"</div><div class='del'>-			"\x6e\xfa\xbf\x7e\x5a\x4b\xf1\xac"</div><div class='del'>-			"\x98\x65\x85\xd1\x93\x53\xd3\x7b"</div><div class='del'>-			"\x09\xdd\x4b\x10\x6d\x84\xb0\x13"</div><div class='del'>-			"\x65\xbd\xcf\x52\x09\xc4\x85\xe2"</div><div class='del'>-			"\x84\x74\x15\x65\xb7\xf7\x51\xaf"</div><div class='del'>-			"\x55\xad\xa4\xd1\x22\x54\x70\x94"</div><div class='del'>-			"\xa0\x1c\x90\x41\xfd\x99\xd7\x5a"</div><div class='del'>-			"\x31\xef\xaa\x25\xd0\x7f\x4f\xea"</div><div class='del'>-			"\x1d\x55\x42\xe5\x49\xb0\xd0\x46"</div><div class='del'>-			"\x62\x36\x43\xb2\x82\x15\x75\x50"</div><div class='del'>-			"\xa4\x72\xeb\x54\x27\x1f\x8a\xe4"</div><div class='del'>-			"\x7d\xe9\x66\xc5\xf1\x53\xa4\xd1"</div><div class='del'>-			"\x0c\xeb\xb8\xf8\xbc\xd4\xe2\xe7"</div><div class='del'>-			"\xe1\xf8\x4b\xcb\xa9\xa1\xaf\x15"</div><div class='del'>-			"\x83\xcb\x72\xd0\x33\x79\x00\x2d"</div><div class='del'>-			"\x9f\xd7\xf1\x2e\x1e\x10\xe4\x45"</div><div class='del'>-			"\xc0\x75\x3a\x39\xea\x68\xf7\x5d"</div><div class='del'>-			"\x1b\x73\x8f\xe9\x8e\x0f\x72\x47"</div><div class='del'>-			"\xae\x35\x0a\x31\x7a\x14\x4d\x4a"</div><div class='del'>-			"\x6f\x47\xf7\x7e\x91\x6e\x74\x8b"</div><div class='del'>-			"\x26\x47\xf9\xc3\xf9\xde\x70\xf5"</div><div class='del'>-			"\x61\xab\xa9\x27\x9f\x82\xe4\x9c"</div><div class='del'>-			"\x89\x91\x3f\x2e\x6a\xfd\xb5\x49"</div><div class='del'>-			"\xe9\xfd\x59\x14\x36\x49\x40\x6d"</div><div class='del'>-			"\x32\xd8\x85\x42\xf3\xa5\xdf\x0c"</div><div class='del'>-			"\xa8\x27\xd7\x54\xe2\x63\x2f\xf2"</div><div class='del'>-			"\x7e\x8b\x8b\xe7\xf1\x9a\x95\x35"</div><div class='del'>-			"\x43\xdc\x3a\xe4\xb6\xf4\xd0\xdf"</div><div class='del'>-			"\x9c\xcb\x94\xf3\x21\xa0\x77\x50"</div><div class='del'>-			"\xe2\xc6\xc4\xc6\x5f\x09\x64\x5b"</div><div class='del'>-			"\x92\x90\xd8\xe1\xd1\xed\x4b\x42"</div><div class='del'>-			"\xd7\x37\xaf\x65\x3d\x11\x39\xb6"</div><div class='del'>-			"\x24\x8a\x60\xae\xd6\x1e\xbf\x0e"</div><div class='del'>-			"\x0d\xd7\xdc\x96\x0e\x65\x75\x4e"</div><div class='del'>-			"\x29\x06\x9d\xa4\x51\x3a\x10\x63"</div><div class='del'>-			"\x8f\x17\x07\xd5\x8e\x3c\xf4\x28"</div><div class='del'>-			"\x00\x5a\x5b\x05\x19\xd8\xc0\x6c"</div><div class='del'>-			"\xe5\x15\xe4\x9c\x9d\x71\x9d\x5e"</div><div class='del'>-			"\x94\x29\x1a\xa7\x80\xfa\x0e\x33"</div><div class='del'>-			"\x03\xdd\xb7\x3e\x9a\xa9\x26\x18"</div><div class='del'>-			"\x37\xa9\x64\x08\x4d\x94\x5a\x88"</div><div class='del'>-			"\xca\x35\xce\x81\x02\xe3\x1f\x1b"</div><div class='del'>-			"\x89\x1a\x77\x85\xe3\x41\x6d\x32"</div><div class='del'>-			"\x42\x19\x23\x7d\xc8\x73\xee\x25"</div><div class='del'>-			"\x85\x0d\xf8\x31\x25\x79\x1b\x6f"</div><div class='del'>-			"\x79\x25\xd2\xd8\xd4\x23\xfd\xf7"</div><div class='del'>-			"\x82\x36\x6a\x0c\x46\x22\x15\xe9"</div><div class='del'>-			"\xff\x72\x41\x91\x91\x7d\x3a\xb7"</div><div class='del'>-			"\xdd\x65\x99\x70\xf6\x8d\x84\xf8"</div><div class='del'>-			"\x67\x15\x20\x11\xd6\xb2\x55\x7b"</div><div class='del'>-			"\xdb\x87\xee\xef\x55\x89\x2a\x59"</div><div class='del'>-			"\x2b\x07\x8f\x43\x8a\x59\x3c\x01"</div><div class='del'>-			"\x8b\x65\x54\xa1\x66\xd5\x38\xbd"</div><div class='del'>-			"\xc6\x30\xa9\xcc\x49\xb6\xa8\x1b"</div><div class='del'>-			"\xb8\xc0\x0e\xe3\x45\x28\xe2\xff"</div><div class='del'>-			"\x41\x9f\x7e\x7c\xd1\xae\x9e\x25"</div><div class='del'>-			"\x3f\x4c\x7c\x7c\xf4\xa8\x26\x4d"</div><div class='del'>-			"\x5c\xfd\x4b\x27\x18\xf9\x61\x76"</div><div class='del'>-			"\x48\xba\x0c\x6b\xa9\x4d\xfc\xf5"</div><div class='del'>-			"\x3b\x35\x7e\x2f\x4a\xa9\xc2\x9a"</div><div class='del'>-			"\xae\xab\x86\x09\x89\xc9\xc2\x40"</div><div class='del'>-			"\x39\x2c\x81\xb3\xb8\x17\x67\xc2"</div><div class='del'>-			"\x0d\x32\x4a\x3a\x67\x81\xd7\x1a"</div><div class='del'>-			"\x34\x52\xc5\xdb\x0a\xf5\x63\x39"</div><div class='del'>-			"\xea\x1f\xe1\x7c\xa1\x9e\xc1\x35"</div><div class='del'>-			"\xe3\xb1\x18\x45\x67\xf9\x22\x38"</div><div class='del'>-			"\x95\xd9\x34\x34\x86\xc6\x41\x94"</div><div class='del'>-			"\x15\xf9\x5b\x41\xa6\x87\x8b\xf8"</div><div class='del'>-			"\xd5\xe1\x1b\xe2\x5b\xf3\x86\x10"</div><div class='del'>-			"\xff\xe6\xae\x69\x76\xbc\x0d\xb4"</div><div class='del'>-			"\x09\x90\x0c\xa2\x65\x0c\xad\x74"</div><div class='del'>-			"\xf5\xd7\xff\xda\xc1\xce\x85\xbe"</div><div class='del'>-			"\x00\xa7\xff\x4d\x2f\x65\xd3\x8c"</div><div class='del'>-			"\x86\x2d\x05\xe8\xed\x3e\x6b\x8b"</div><div class='del'>-			"\x0f\x3d\x83\x8c\xf1\x1d\x5b\x96"</div><div class='del'>-			"\x2e\xb1\x9c\xc2\x98\xe1\x70\xb9"</div><div class='del'>-			"\xba\x5c\x8a\x43\xd6\x34\xa7\x2d"</div><div class='del'>-			"\xc9\x92\xae\xf2\xa5\x7b\x05\x49"</div><div class='del'>-			"\xa7\x33\x34\x86\xca\xe4\x96\x23"</div><div class='del'>-			"\x76\x5b\xf2\xc6\xf1\x51\x28\x42"</div><div class='del'>-			"\x7b\xcc\x76\x8f\xfa\xa2\xad\x31"</div><div class='del'>-			"\xd4\xd6\x7a\x6d\x25\x25\x54\xe4"</div><div class='del'>-			"\x3f\x50\x59\xe1\x5c\x05\xb7\x27"</div><div class='del'>-			"\x48\xbf\x07\xec\x1b\x13\xbe\x2b"</div><div class='del'>-			"\xa1\x57\x2b\xd5\xab\xd7\xd0\x4c"</div><div class='del'>-			"\x1e\xcb\x71\x9b\xc5\x90\x85\xd3"</div><div class='del'>-			"\xde\x59\xec\x71\xeb\x89\xbb\xd0"</div><div class='del'>-			"\x09\x50\xe1\x16\x3f\xfd\x1c\x34"</div><div class='del'>-			"\xc3\x1c\xa1\x10\x77\x53\x98\xef"</div><div class='del'>-			"\xf2\xfd\xa5\x01\x59\xc2\x9b\x26"</div><div class='del'>-			"\xc7\x42\xd9\x49\xda\x58\x2b\x6e"</div><div class='del'>-			"\x9f\x53\x19\x76\x7e\xd9\xc9\x0e"</div><div class='del'>-			"\x68\xc8\x7f\x51\x22\x42\xef\x49"</div><div class='del'>-			"\xa4\x55\xb6\x36\xac\x09\xc7\x31"</div><div class='del'>-			"\x88\x15\x4b\x2e\x8f\x3a\x08\xf7"</div><div class='del'>-			"\xd8\xf7\xa8\xc5\xa9\x33\xa6\x45"</div><div class='del'>-			"\xe4\xc4\x94\x76\xf3\x0d\x8f\x7e"</div><div class='del'>-			"\xc8\xf6\xbc\x23\x0a\xb6\x4c\xd3"</div><div class='del'>-			"\x6a\xcd\x36\xc2\x90\x5c\x5c\x3c"</div><div class='del'>-			"\x65\x7b\xc2\xd6\xcc\xe6\x0d\x87"</div><div class='del'>-			"\x73\x2e\x71\x79\x16\x06\x63\x28"</div><div class='del'>-			"\x09\x15\xd8\x89\x38\x38\x3d\xb5"</div><div class='del'>-			"\x42\x1c\x08\x24\xf7\x2a\xd2\x9d"</div><div class='del'>-			"\xc8\xca\xef\xf9\x27\xd8\x07\x86"</div><div class='del'>-			"\xf7\x43\x0b\x55\x15\x3f\x9f\x83"</div><div class='del'>-			"\xef\xdc\x49\x9d\x2a\xc1\x54\x62"</div><div class='del'>-			"\xbd\x9b\x66\x55\x9f\xb7\x12\xf3"</div><div class='del'>-			"\x1b\x4d\x9d\x2a\x5c\xed\x87\x75"</div><div class='del'>-			"\x87\x26\xec\x61\x2c\xb4\x0f\x89"</div><div class='del'>-			"\xb0\xfb\x2e\x68\x5d\x15\xc7\x8d"</div><div class='del'>-			"\x2e\xc0\xd9\xec\xaf\x4f\xd2\x25"</div><div class='del'>-			"\x29\xe8\xd2\x26\x2b\x67\xe9\xfc"</div><div class='del'>-			"\x2b\xa8\x67\x96\x12\x1f\x5b\x96"</div><div class='del'>-			"\xc6\x14\x53\xaf\x44\xea\xd6\xe2"</div><div class='del'>-			"\x94\x98\xe4\x12\x93\x4c\x92\xe0"</div><div class='del'>-			"\x18\xa5\x8d\x2d\xe4\x71\x3c\x47"</div><div class='del'>-			"\x4c\xf7\xe6\x47\x9e\xc0\x68\xdf"</div><div class='del'>-			"\xd4\xf5\x5a\x74\xb1\x2b\x29\x03"</div><div class='del'>-			"\x19\x07\xaf\x90\x62\x5c\x68\x98"</div><div class='del'>-			"\x48\x16\x11\x02\x9d\xee\xb4\x9b"</div><div class='del'>-			"\xe5\x42\x7f\x08\xfd\x16\x32\x0b"</div><div class='del'>-			"\xd0\xb3\xfa\x2b\xb7\x99\xf9\x29"</div><div class='del'>-			"\xcd\x20\x45\x9f\xb3\x1a\x5d\xa2"</div><div class='del'>-			"\xaf\x4d\xe0\xbd\x42\x0d\xbc\x74"</div><div class='del'>-			"\x99\x9c\x8e\x53\x1a\xb4\x3e\xbd"</div><div class='del'>-			"\xa2\x9a\x2d\xf7\xf8\x39\x0f\x67"</div><div class='del'>-			"\x63\xfc\x6b\xc0\xaf\xb3\x4b\x4f"</div><div class='del'>-			"\x55\xc4\xcf\xa7\xc8\x04\x11\x3e"</div><div class='del'>-			"\x14\x32\xbb\x1b\x38\x77\xd6\x7f"</div><div class='del'>-			"\x54\x4c\xdf\x75\xf3\x07\x2d\x33"</div><div class='del'>-			"\x9b\xa8\x20\xe1\x7b\x12\xb5\xf3"</div><div class='del'>-			"\xef\x2f\xce\x72\xe5\x24\x60\xc1"</div><div class='del'>-			"\x30\xe2\xab\xa1\x8e\x11\x09\xa8"</div><div class='del'>-			"\x21\x33\x44\xfe\x7f\x35\x32\x93"</div><div class='del'>-			"\x39\xa7\xad\x8b\x79\x06\xb2\xcb"</div><div class='del'>-			"\x4e\xa9\x5f\xc7\xba\x74\x29\xec"</div><div class='del'>-			"\x93\xa0\x4e\x54\x93\xc0\xbc\x55"</div><div class='del'>-			"\x64\xf0\x48\xe5\x57\x99\xee\x75"</div><div class='del'>-			"\xd6\x79\x0f\x66\xb7\xc6\x57\x76"</div><div class='del'>-			"\xf7\xb7\xf3\x9c\xc5\x60\xe8\x7f"</div><div class='del'>-			"\x83\x76\xd6\x0e\xaa\xe6\x90\x39"</div><div class='del'>-			"\x1d\xa6\x32\x6a\x34\xe3\x55\xf8"</div><div class='del'>-			"\x58\xa0\x58\x7d\x33\xe0\x22\x39"</div><div class='del'>-			"\x44\x64\x87\x86\x5a\x2f\xa7\x7e"</div><div class='del'>-			"\x0f\x38\xea\xb0\x30\xcc\x61\xa5"</div><div class='del'>-			"\x6a\x32\xae\x1e\xf7\xe9\xd0\xa9"</div><div class='del'>-			"\x0c\x32\x4b\xb5\x49\x28\xab\x85"</div><div class='del'>-			"\x2f\x8e\x01\x36\x38\x52\xd0\xba"</div><div class='del'>-			"\xd6\x02\x78\xf8\x0e\x3e\x9c\x8b"</div><div class='del'>-			"\x6b\x45\x99\x3f\x5c\xfe\x58\xf1"</div><div class='del'>-			"\x5c\x94\x04\xe1\xf5\x18\x6d\x51"</div><div class='del'>-			"\xb2\x5d\x18\x20\xb6\xc2\x9a\x42"</div><div class='del'>-			"\x1d\xb3\xab\x3c\xb6\x3a\x13\x03"</div><div class='del'>-			"\xb2\x46\x82\x4f\xfc\x64\xbc\x4f"</div><div class='del'>-			"\xca\xfa\x9c\xc0\xd5\xa7\xbd\x11"</div><div class='del'>-			"\xb7\xe4\x5a\xf6\x6f\x4d\x4d\x54"</div><div class='del'>-			"\xea\xa4\x98\x66\xd4\x22\x3b\xd3"</div><div class='del'>-			"\x8f\x34\x47\xd9\x7c\xf4\x72\x3b"</div><div class='del'>-			"\x4d\x02\x77\xf6\xd6\xdd\x08\x0a"</div><div class='del'>-			"\x81\xe1\x86\x89\x3e\x56\x10\x3c"</div><div class='del'>-			"\xba\xd7\x81\x8c\x08\xbc\x8b\xe2"</div><div class='del'>-			"\x53\xec\xa7\x89\xee\xc8\x56\xb5"</div><div class='del'>-			"\x36\x2c\xb2\x03\xba\x99\xdd\x7c"</div><div class='del'>-			"\x48\xa0\xb0\xbc\x91\x33\xe9\xa8"</div><div class='del'>-			"\xcb\xcd\xcf\x59\x5f\x1f\x15\xe2"</div><div class='del'>-			"\x56\xf5\x4e\x01\x35\x27\x45\x77"</div><div class='del'>-			"\x47\xc8\xbc\xcb\x7e\x39\xc1\x97"</div><div class='del'>-			"\x28\xd3\x84\xfc\x2c\x3e\xc8\xad"</div><div class='del'>-			"\x9c\xf8\x8a\x61\x9c\x28\xaa\xc5"</div><div class='del'>-			"\x99\x20\x43\x85\x9d\xa5\xe2\x8b"</div><div class='del'>-			"\xb8\xae\xeb\xd0\x32\x0d\x52\x78"</div><div class='del'>-			"\x09\x56\x3f\xc7\xd8\x7e\x26\xfc"</div><div class='del'>-			"\x37\xfb\x6f\x04\xfc\xfa\x92\x10"</div><div class='del'>-			"\xac\xf8\x3e\x21\xdc\x8c\x21\x16"</div><div class='del'>-			"\x7d\x67\x6e\xf6\xcd\xda\xb6\x98"</div><div class='del'>-			"\x23\xab\x23\x3c\xb2\x10\xa0\x53"</div><div class='del'>-			"\x5a\x56\x9f\xc5\xd0\xff\xbb\xe4"</div><div class='del'>-			"\x98\x3c\x69\x1e\xdb\x38\x8f\x7e"</div><div class='del'>-			"\x0f\xd2\x98\x88\x81\x8b\x45\x67"</div><div class='del'>-			"\xea\x33\xf1\xeb\xe9\x97\x55\x2e"</div><div class='del'>-			"\xd9\xaa\xeb\x5a\xec\xda\xe1\x68"</div><div class='del'>-			"\xa8\x9d\x3c\x84\x7c\x05\x3d\x62"</div><div class='del'>-			"\x87\x8f\x03\x21\x28\x95\x0c\x89"</div><div class='del'>-			"\x25\x22\x4a\xb0\x93\xa9\x50\xa2"</div><div class='del'>-			"\x2f\x57\x6e\x18\x42\x19\x54\x0c"</div><div class='del'>-			"\x55\x67\xc6\x11\x49\xf4\x5c\xd2"</div><div class='del'>-			"\xe9\x3d\xdd\x8b\x48\x71\x21\x00"</div><div class='del'>-			"\xc3\x9a\x6c\x85\x74\x28\x83\x4a"</div><div class='del'>-			"\x1b\x31\x05\xe1\x06\x92\xe7\xda"</div><div class='del'>-			"\x85\x73\x78\x45\x20\x7f\xae\x13"</div><div class='del'>-			"\x7c\x33\x06\x22\xf4\x83\xf9\x35"</div><div class='del'>-			"\x3f\x6c\x71\xa8\x4e\x48\xbe\x9b"</div><div class='del'>-			"\xce\x8a\xba\xda\xbe\x28\x08\xf7"</div><div class='del'>-			"\xe2\x14\x8c\x71\xea\x72\xf9\x33"</div><div class='del'>-			"\xf2\x88\x3f\xd7\xbb\x69\x6c\x29"</div><div class='del'>-			"\x19\xdc\x84\xce\x1f\x12\x4f\xc8"</div><div class='del'>-			"\xaf\xa5\x04\xba\x5a\xab\xb0\xd9"</div><div class='del'>-			"\x14\x1f\x6c\x68\x98\x39\x89\x7a"</div><div class='del'>-			"\xd9\xd8\x2f\xdf\xa8\x47\x4a\x25"</div><div class='del'>-			"\xe2\xfb\x33\xf4\x59\x78\xe1\x68"</div><div class='del'>-			"\x85\xcf\xfe\x59\x20\xd4\x05\x1d"</div><div class='del'>-			"\x80\x99\xae\xbc\xca\xae\x0f\x2f"</div><div class='del'>-			"\x65\x43\x34\x8e\x7e\xac\xd3\x93"</div><div class='del'>-			"\x2f\xac\x6d\x14\x3d\x02\x07\x70"</div><div class='del'>-			"\x9d\xa4\xf3\x1b\x5c\x36\xfc\x01"</div><div class='del'>-			"\x73\x34\x85\x0c\x6c\xd6\xf1\xbd"</div><div class='del'>-			"\x3f\xdf\xee\xf5\xd9\xba\x56\xef"</div><div class='del'>-			"\xf4\x9b\x6b\xee\x9f\x5a\x78\x6d"</div><div class='del'>-			"\x32\x19\xf4\xf7\xf8\x4c\x69\x0b"</div><div class='del'>-			"\x4b\xbc\xbb\xb7\xf2\x85\xaf\x70"</div><div class='del'>-			"\x75\x24\x6c\x54\xa7\x0e\x4d\x1d"</div><div class='del'>-			"\x01\xbf\x08\xac\xcf\x7f\x2c\xe3"</div><div class='del'>-			"\x14\x89\x5e\x70\x5a\x99\x92\xcd"</div><div class='del'>-			"\x01\x84\xc8\xd2\xab\xe5\x4f\x58"</div><div class='del'>-			"\xe7\x0f\x2f\x0e\xff\x68\xea\xfd"</div><div class='del'>-			"\x15\xb3\x17\xe6\xb0\xe7\x85\xd8"</div><div class='del'>-			"\x23\x2e\x05\xc7\xc9\xc4\x46\x1f"</div><div class='del'>-			"\xe1\x9e\x49\x20\x23\x24\x4d\x7e"</div><div class='del'>-			"\x29\x65\xff\xf4\xb6\xfd\x1a\x85"</div><div class='del'>-			"\xc4\x16\xec\xfc\xea\x7b\xd6\x2c"</div><div class='del'>-			"\x43\xf8\xb7\xbf\x79\xc0\x85\xcd"</div><div class='del'>-			"\xef\xe1\x98\xd3\xa5\xf7\x90\x8c"</div><div class='del'>-			"\xe9\x7f\x80\x6b\xd2\xac\x4c\x30"</div><div class='del'>-			"\xa7\xc6\x61\x6c\xd2\xf9\x2c\xff"</div><div class='del'>-			"\x30\xbc\x22\x81\x7d\x93\x12\xe4"</div><div class='del'>-			"\x0a\xcd\xaf\xdd\xe8\xab\x0a\x1e"</div><div class='del'>-			"\x13\xa4\x27\xc3\x5f\xf7\x4b\xbb"</div><div class='del'>-			"\x37\x09\x4b\x91\x6f\x92\x4f\xaf"</div><div class='del'>-			"\x52\xee\xdf\xef\x09\x6f\xf7\x5c"</div><div class='del'>-			"\x6e\x12\x17\x72\x63\x57\xc7\xba"</div><div class='del'>-			"\x3b\x6b\x38\x32\x73\x1b\x9c\x80"</div><div class='del'>-			"\xc1\x7a\xc6\xcf\xcd\x35\xc0\x6b"</div><div class='del'>-			"\x31\x1a\x6b\xe9\xd8\x2c\x29\x3f"</div><div class='del'>-			"\x96\xfb\xb6\xcd\x13\x91\x3b\xc2"</div><div class='del'>-			"\xd2\xa3\x31\x8d\xa4\xcd\x57\xcd"</div><div class='del'>-			"\x13\x3d\x64\xfd\x06\xce\xe6\xdc"</div><div class='del'>-			"\x0c\x24\x43\x31\x40\x57\xf1\x72"</div><div class='del'>-			"\x17\xe3\x3a\x63\x6d\x35\xcf\x5d"</div><div class='del'>-			"\x97\x40\x59\xdd\xf7\x3c\x02\xf7"</div><div class='del'>-			"\x1c\x7e\x05\xbb\xa9\x0d\x01\xb1"</div><div class='del'>-			"\x8e\xc0\x30\xa9\x53\x24\xc9\x89"</div><div class='del'>-			"\x84\x6d\xaa\xd0\xcd\x91\xc2\x4d"</div><div class='del'>-			"\x91\xb0\x89\xe2\xbf\x83\x44\xaa"</div><div class='del'>-			"\x28\x72\x23\xa0\xc2\xad\xad\x1c"</div><div class='del'>-			"\xfc\x3f\x09\x7a\x0b\xdc\xc5\x1b"</div><div class='del'>-			"\x87\x13\xc6\x5b\x59\x8d\xf2\xc8"</div><div class='del'>-			"\xaf\xdf\x11\x95",</div><div class='del'>-		.rlen = 4100,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * CTS (Cipher Text Stealing) mode tests</div><div class='del'>- */</div><div class='del'>-#define CTS_MODE_ENC_TEST_VECTORS 6</div><div class='del'>-#define CTS_MODE_DEC_TEST_VECTORS 6</div><div class='del'>-static struct cipher_testvec cts_mode_enc_tv_template[] = {</div><div class='del'>-	{ /* from rfc3962 */</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.key    = "\x63\x68\x69\x63\x6b\x65\x6e\x20"</div><div class='del'>-			  "\x74\x65\x72\x69\x79\x61\x6b\x69",</div><div class='del'>-		.ilen	= 17,</div><div class='del'>-		.input  = "\x49\x20\x77\x6f\x75\x6c\x64\x20"</div><div class='del'>-			  "\x6c\x69\x6b\x65\x20\x74\x68\x65"</div><div class='del'>-			  "\x20",</div><div class='del'>-		.rlen	= 17,</div><div class='del'>-		.result	= "\xc6\x35\x35\x68\xf2\xbf\x8c\xb4"</div><div class='del'>-			  "\xd8\xa5\x80\x36\x2d\xa7\xff\x7f"</div><div class='del'>-			  "\x97",</div><div class='del'>-	}, {</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.key    = "\x63\x68\x69\x63\x6b\x65\x6e\x20"</div><div class='del'>-			  "\x74\x65\x72\x69\x79\x61\x6b\x69",</div><div class='del'>-		.ilen   = 31,</div><div class='del'>-		.input  = "\x49\x20\x77\x6f\x75\x6c\x64\x20"</div><div class='del'>-			  "\x6c\x69\x6b\x65\x20\x74\x68\x65"</div><div class='del'>-			  "\x20\x47\x65\x6e\x65\x72\x61\x6c"</div><div class='del'>-			  "\x20\x47\x61\x75\x27\x73\x20",</div><div class='del'>-		.rlen   = 31,</div><div class='del'>-		.result = "\xfc\x00\x78\x3e\x0e\xfd\xb2\xc1"</div><div class='del'>-			  "\xd4\x45\xd4\xc8\xef\xf7\xed\x22"</div><div class='del'>-			  "\x97\x68\x72\x68\xd6\xec\xcc\xc0"</div><div class='del'>-			  "\xc0\x7b\x25\xe2\x5e\xcf\xe5",</div><div class='del'>-	}, {</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.key    = "\x63\x68\x69\x63\x6b\x65\x6e\x20"</div><div class='del'>-			  "\x74\x65\x72\x69\x79\x61\x6b\x69",</div><div class='del'>-		.ilen   = 32,</div><div class='del'>-		.input  = "\x49\x20\x77\x6f\x75\x6c\x64\x20"</div><div class='del'>-			  "\x6c\x69\x6b\x65\x20\x74\x68\x65"</div><div class='del'>-			  "\x20\x47\x65\x6e\x65\x72\x61\x6c"</div><div class='del'>-			  "\x20\x47\x61\x75\x27\x73\x20\x43",</div><div class='del'>-		.rlen   = 32,</div><div class='del'>-		.result = "\x39\x31\x25\x23\xa7\x86\x62\xd5"</div><div class='del'>-			  "\xbe\x7f\xcb\xcc\x98\xeb\xf5\xa8"</div><div class='del'>-			  "\x97\x68\x72\x68\xd6\xec\xcc\xc0"</div><div class='del'>-			  "\xc0\x7b\x25\xe2\x5e\xcf\xe5\x84",</div><div class='del'>-	}, {</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.key    = "\x63\x68\x69\x63\x6b\x65\x6e\x20"</div><div class='del'>-			  "\x74\x65\x72\x69\x79\x61\x6b\x69",</div><div class='del'>-		.ilen   = 47,</div><div class='del'>-		.input  = "\x49\x20\x77\x6f\x75\x6c\x64\x20"</div><div class='del'>-			  "\x6c\x69\x6b\x65\x20\x74\x68\x65"</div><div class='del'>-			  "\x20\x47\x65\x6e\x65\x72\x61\x6c"</div><div class='del'>-			  "\x20\x47\x61\x75\x27\x73\x20\x43"</div><div class='del'>-			  "\x68\x69\x63\x6b\x65\x6e\x2c\x20"</div><div class='del'>-			  "\x70\x6c\x65\x61\x73\x65\x2c",</div><div class='del'>-		.rlen   = 47,</div><div class='del'>-		.result = "\x97\x68\x72\x68\xd6\xec\xcc\xc0"</div><div class='del'>-			  "\xc0\x7b\x25\xe2\x5e\xcf\xe5\x84"</div><div class='del'>-			  "\xb3\xff\xfd\x94\x0c\x16\xa1\x8c"</div><div class='del'>-			  "\x1b\x55\x49\xd2\xf8\x38\x02\x9e"</div><div class='del'>-			  "\x39\x31\x25\x23\xa7\x86\x62\xd5"</div><div class='del'>-			  "\xbe\x7f\xcb\xcc\x98\xeb\xf5",</div><div class='del'>-	}, {</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.key    = "\x63\x68\x69\x63\x6b\x65\x6e\x20"</div><div class='del'>-			  "\x74\x65\x72\x69\x79\x61\x6b\x69",</div><div class='del'>-		.ilen   = 48,</div><div class='del'>-		.input  = "\x49\x20\x77\x6f\x75\x6c\x64\x20"</div><div class='del'>-			  "\x6c\x69\x6b\x65\x20\x74\x68\x65"</div><div class='del'>-			  "\x20\x47\x65\x6e\x65\x72\x61\x6c"</div><div class='del'>-			  "\x20\x47\x61\x75\x27\x73\x20\x43"</div><div class='del'>-			  "\x68\x69\x63\x6b\x65\x6e\x2c\x20"</div><div class='del'>-			  "\x70\x6c\x65\x61\x73\x65\x2c\x20",</div><div class='del'>-		.rlen   = 48,</div><div class='del'>-		.result = "\x97\x68\x72\x68\xd6\xec\xcc\xc0"</div><div class='del'>-			  "\xc0\x7b\x25\xe2\x5e\xcf\xe5\x84"</div><div class='del'>-			  "\x9d\xad\x8b\xbb\x96\xc4\xcd\xc0"</div><div class='del'>-			  "\x3b\xc1\x03\xe1\xa1\x94\xbb\xd8"</div><div class='del'>-			  "\x39\x31\x25\x23\xa7\x86\x62\xd5"</div><div class='del'>-			  "\xbe\x7f\xcb\xcc\x98\xeb\xf5\xa8",</div><div class='del'>-	}, {</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.key    = "\x63\x68\x69\x63\x6b\x65\x6e\x20"</div><div class='del'>-			  "\x74\x65\x72\x69\x79\x61\x6b\x69",</div><div class='del'>-		.ilen   = 64,</div><div class='del'>-		.input  = "\x49\x20\x77\x6f\x75\x6c\x64\x20"</div><div class='del'>-			  "\x6c\x69\x6b\x65\x20\x74\x68\x65"</div><div class='del'>-			  "\x20\x47\x65\x6e\x65\x72\x61\x6c"</div><div class='del'>-			  "\x20\x47\x61\x75\x27\x73\x20\x43"</div><div class='del'>-			  "\x68\x69\x63\x6b\x65\x6e\x2c\x20"</div><div class='del'>-			  "\x70\x6c\x65\x61\x73\x65\x2c\x20"</div><div class='del'>-			  "\x61\x6e\x64\x20\x77\x6f\x6e\x74"</div><div class='del'>-			  "\x6f\x6e\x20\x73\x6f\x75\x70\x2e",</div><div class='del'>-		.rlen   = 64,</div><div class='del'>-		.result = "\x97\x68\x72\x68\xd6\xec\xcc\xc0"</div><div class='del'>-			  "\xc0\x7b\x25\xe2\x5e\xcf\xe5\x84"</div><div class='del'>-			  "\x39\x31\x25\x23\xa7\x86\x62\xd5"</div><div class='del'>-			  "\xbe\x7f\xcb\xcc\x98\xeb\xf5\xa8"</div><div class='del'>-			  "\x48\x07\xef\xe8\x36\xee\x89\xa5"</div><div class='del'>-			  "\x26\x73\x0d\xbc\x2f\x7b\xc8\x40"</div><div class='del'>-			  "\x9d\xad\x8b\xbb\x96\xc4\xcd\xc0"</div><div class='del'>-			  "\x3b\xc1\x03\xe1\xa1\x94\xbb\xd8",</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct cipher_testvec cts_mode_dec_tv_template[] = {</div><div class='del'>-	{ /* from rfc3962 */</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.key    = "\x63\x68\x69\x63\x6b\x65\x6e\x20"</div><div class='del'>-			  "\x74\x65\x72\x69\x79\x61\x6b\x69",</div><div class='del'>-		.rlen	= 17,</div><div class='del'>-		.result = "\x49\x20\x77\x6f\x75\x6c\x64\x20"</div><div class='del'>-			  "\x6c\x69\x6b\x65\x20\x74\x68\x65"</div><div class='del'>-			  "\x20",</div><div class='del'>-		.ilen	= 17,</div><div class='del'>-		.input	= "\xc6\x35\x35\x68\xf2\xbf\x8c\xb4"</div><div class='del'>-			  "\xd8\xa5\x80\x36\x2d\xa7\xff\x7f"</div><div class='del'>-			  "\x97",</div><div class='del'>-	}, {</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.key    = "\x63\x68\x69\x63\x6b\x65\x6e\x20"</div><div class='del'>-			  "\x74\x65\x72\x69\x79\x61\x6b\x69",</div><div class='del'>-		.rlen   = 31,</div><div class='del'>-		.result = "\x49\x20\x77\x6f\x75\x6c\x64\x20"</div><div class='del'>-			  "\x6c\x69\x6b\x65\x20\x74\x68\x65"</div><div class='del'>-			  "\x20\x47\x65\x6e\x65\x72\x61\x6c"</div><div class='del'>-			  "\x20\x47\x61\x75\x27\x73\x20",</div><div class='del'>-		.ilen   = 31,</div><div class='del'>-		.input  = "\xfc\x00\x78\x3e\x0e\xfd\xb2\xc1"</div><div class='del'>-			  "\xd4\x45\xd4\xc8\xef\xf7\xed\x22"</div><div class='del'>-			  "\x97\x68\x72\x68\xd6\xec\xcc\xc0"</div><div class='del'>-			  "\xc0\x7b\x25\xe2\x5e\xcf\xe5",</div><div class='del'>-	}, {</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.key    = "\x63\x68\x69\x63\x6b\x65\x6e\x20"</div><div class='del'>-			  "\x74\x65\x72\x69\x79\x61\x6b\x69",</div><div class='del'>-		.rlen   = 32,</div><div class='del'>-		.result = "\x49\x20\x77\x6f\x75\x6c\x64\x20"</div><div class='del'>-			  "\x6c\x69\x6b\x65\x20\x74\x68\x65"</div><div class='del'>-			  "\x20\x47\x65\x6e\x65\x72\x61\x6c"</div><div class='del'>-			  "\x20\x47\x61\x75\x27\x73\x20\x43",</div><div class='del'>-		.ilen   = 32,</div><div class='del'>-		.input  = "\x39\x31\x25\x23\xa7\x86\x62\xd5"</div><div class='del'>-			  "\xbe\x7f\xcb\xcc\x98\xeb\xf5\xa8"</div><div class='del'>-			  "\x97\x68\x72\x68\xd6\xec\xcc\xc0"</div><div class='del'>-			  "\xc0\x7b\x25\xe2\x5e\xcf\xe5\x84",</div><div class='del'>-	}, {</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.key    = "\x63\x68\x69\x63\x6b\x65\x6e\x20"</div><div class='del'>-			  "\x74\x65\x72\x69\x79\x61\x6b\x69",</div><div class='del'>-		.rlen   = 47,</div><div class='del'>-		.result = "\x49\x20\x77\x6f\x75\x6c\x64\x20"</div><div class='del'>-			  "\x6c\x69\x6b\x65\x20\x74\x68\x65"</div><div class='del'>-			  "\x20\x47\x65\x6e\x65\x72\x61\x6c"</div><div class='del'>-			  "\x20\x47\x61\x75\x27\x73\x20\x43"</div><div class='del'>-			  "\x68\x69\x63\x6b\x65\x6e\x2c\x20"</div><div class='del'>-			  "\x70\x6c\x65\x61\x73\x65\x2c",</div><div class='del'>-		.ilen   = 47,</div><div class='del'>-		.input  = "\x97\x68\x72\x68\xd6\xec\xcc\xc0"</div><div class='del'>-			  "\xc0\x7b\x25\xe2\x5e\xcf\xe5\x84"</div><div class='del'>-			  "\xb3\xff\xfd\x94\x0c\x16\xa1\x8c"</div><div class='del'>-			  "\x1b\x55\x49\xd2\xf8\x38\x02\x9e"</div><div class='del'>-			  "\x39\x31\x25\x23\xa7\x86\x62\xd5"</div><div class='del'>-			  "\xbe\x7f\xcb\xcc\x98\xeb\xf5",</div><div class='del'>-	}, {</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.key    = "\x63\x68\x69\x63\x6b\x65\x6e\x20"</div><div class='del'>-			  "\x74\x65\x72\x69\x79\x61\x6b\x69",</div><div class='del'>-		.rlen   = 48,</div><div class='del'>-		.result = "\x49\x20\x77\x6f\x75\x6c\x64\x20"</div><div class='del'>-			  "\x6c\x69\x6b\x65\x20\x74\x68\x65"</div><div class='del'>-			  "\x20\x47\x65\x6e\x65\x72\x61\x6c"</div><div class='del'>-			  "\x20\x47\x61\x75\x27\x73\x20\x43"</div><div class='del'>-			  "\x68\x69\x63\x6b\x65\x6e\x2c\x20"</div><div class='del'>-			  "\x70\x6c\x65\x61\x73\x65\x2c\x20",</div><div class='del'>-		.ilen   = 48,</div><div class='del'>-		.input  = "\x97\x68\x72\x68\xd6\xec\xcc\xc0"</div><div class='del'>-			  "\xc0\x7b\x25\xe2\x5e\xcf\xe5\x84"</div><div class='del'>-			  "\x9d\xad\x8b\xbb\x96\xc4\xcd\xc0"</div><div class='del'>-			  "\x3b\xc1\x03\xe1\xa1\x94\xbb\xd8"</div><div class='del'>-			  "\x39\x31\x25\x23\xa7\x86\x62\xd5"</div><div class='del'>-			  "\xbe\x7f\xcb\xcc\x98\xeb\xf5\xa8",</div><div class='del'>-	}, {</div><div class='del'>-		.klen	= 16,</div><div class='del'>-		.key    = "\x63\x68\x69\x63\x6b\x65\x6e\x20"</div><div class='del'>-			  "\x74\x65\x72\x69\x79\x61\x6b\x69",</div><div class='del'>-		.rlen   = 64,</div><div class='del'>-		.result = "\x49\x20\x77\x6f\x75\x6c\x64\x20"</div><div class='del'>-			  "\x6c\x69\x6b\x65\x20\x74\x68\x65"</div><div class='del'>-			  "\x20\x47\x65\x6e\x65\x72\x61\x6c"</div><div class='del'>-			  "\x20\x47\x61\x75\x27\x73\x20\x43"</div><div class='del'>-			  "\x68\x69\x63\x6b\x65\x6e\x2c\x20"</div><div class='del'>-			  "\x70\x6c\x65\x61\x73\x65\x2c\x20"</div><div class='del'>-			  "\x61\x6e\x64\x20\x77\x6f\x6e\x74"</div><div class='del'>-			  "\x6f\x6e\x20\x73\x6f\x75\x70\x2e",</div><div class='del'>-		.ilen   = 64,</div><div class='del'>-		.input  = "\x97\x68\x72\x68\xd6\xec\xcc\xc0"</div><div class='del'>-			  "\xc0\x7b\x25\xe2\x5e\xcf\xe5\x84"</div><div class='del'>-			  "\x39\x31\x25\x23\xa7\x86\x62\xd5"</div><div class='del'>-			  "\xbe\x7f\xcb\xcc\x98\xeb\xf5\xa8"</div><div class='del'>-			  "\x48\x07\xef\xe8\x36\xee\x89\xa5"</div><div class='del'>-			  "\x26\x73\x0d\xbc\x2f\x7b\xc8\x40"</div><div class='del'>-			  "\x9d\xad\x8b\xbb\x96\xc4\xcd\xc0"</div><div class='del'>-			  "\x3b\xc1\x03\xe1\xa1\x94\xbb\xd8",</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Compression stuff.</div><div class='del'>- */</div><div class='del'>-#define COMP_BUF_SIZE           512</div><div class='del'>-</div><div class='del'>-struct comp_testvec {</div><div class='del'>-	int inlen, outlen;</div><div class='del'>-	char input[COMP_BUF_SIZE];</div><div class='del'>-	char output[COMP_BUF_SIZE];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Deflate test vectors (null-terminated strings).</div><div class='del'>- * Params: winbits=11, Z_DEFAULT_COMPRESSION, MAX_MEM_LEVEL.</div><div class='del'>- */</div><div class='del'>-#define DEFLATE_COMP_TEST_VECTORS 2</div><div class='del'>-#define DEFLATE_DECOMP_TEST_VECTORS 2</div><div class='del'>-</div><div class='del'>-static struct comp_testvec deflate_comp_tv_template[] = {</div><div class='del'>-	{</div><div class='del'>-		.inlen	= 70,</div><div class='del'>-		.outlen	= 38,</div><div class='del'>-		.input	= "Join us now and share the software "</div><div class='del'>-			"Join us now and share the software ",</div><div class='del'>-		.output	= "\xf3\xca\xcf\xcc\x53\x28\x2d\x56"</div><div class='del'>-			  "\xc8\xcb\x2f\x57\x48\xcc\x4b\x51"</div><div class='del'>-			  "\x28\xce\x48\x2c\x4a\x55\x28\xc9"</div><div class='del'>-			  "\x48\x55\x28\xce\x4f\x2b\x29\x07"</div><div class='del'>-			  "\x71\xbc\x08\x2b\x01\x00",</div><div class='del'>-	}, {</div><div class='del'>-		.inlen	= 191,</div><div class='del'>-		.outlen	= 122,</div><div class='del'>-		.input	= "This document describes a compression method based on the DEFLATE"</div><div class='del'>-			"compression algorithm.  This document defines the application of "</div><div class='del'>-			"the DEFLATE algorithm to the IP Payload Compression Protocol.",</div><div class='del'>-		.output	= "\x5d\x8d\x31\x0e\xc2\x30\x10\x04"</div><div class='del'>-			  "\xbf\xb2\x2f\xc8\x1f\x10\x04\x09"</div><div class='del'>-			  "\x89\xc2\x85\x3f\x70\xb1\x2f\xf8"</div><div class='del'>-			  "\x24\xdb\x67\xd9\x47\xc1\xef\x49"</div><div class='del'>-			  "\x68\x12\x51\xae\x76\x67\xd6\x27"</div><div class='del'>-			  "\x19\x88\x1a\xde\x85\xab\x21\xf2"</div><div class='del'>-			  "\x08\x5d\x16\x1e\x20\x04\x2d\xad"</div><div class='del'>-			  "\xf3\x18\xa2\x15\x85\x2d\x69\xc4"</div><div class='del'>-			  "\x42\x83\x23\xb6\x6c\x89\x71\x9b"</div><div class='del'>-			  "\xef\xcf\x8b\x9f\xcf\x33\xca\x2f"</div><div class='del'>-			  "\xed\x62\xa9\x4c\x80\xff\x13\xaf"</div><div class='del'>-			  "\x52\x37\xed\x0e\x52\x6b\x59\x02"</div><div class='del'>-			  "\xd9\x4e\xe8\x7a\x76\x1d\x02\x98"</div><div class='del'>-			  "\xfe\x8a\x87\x83\xa3\x4f\x56\x8a"</div><div class='del'>-			  "\xb8\x9e\x8e\x5c\x57\xd3\xa0\x79"</div><div class='del'>-			  "\xfa\x02",</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct comp_testvec deflate_decomp_tv_template[] = {</div><div class='del'>-	{</div><div class='del'>-		.inlen	= 122,</div><div class='del'>-		.outlen	= 191,</div><div class='del'>-		.input	= "\x5d\x8d\x31\x0e\xc2\x30\x10\x04"</div><div class='del'>-			  "\xbf\xb2\x2f\xc8\x1f\x10\x04\x09"</div><div class='del'>-			  "\x89\xc2\x85\x3f\x70\xb1\x2f\xf8"</div><div class='del'>-			  "\x24\xdb\x67\xd9\x47\xc1\xef\x49"</div><div class='del'>-			  "\x68\x12\x51\xae\x76\x67\xd6\x27"</div><div class='del'>-			  "\x19\x88\x1a\xde\x85\xab\x21\xf2"</div><div class='del'>-			  "\x08\x5d\x16\x1e\x20\x04\x2d\xad"</div><div class='del'>-			  "\xf3\x18\xa2\x15\x85\x2d\x69\xc4"</div><div class='del'>-			  "\x42\x83\x23\xb6\x6c\x89\x71\x9b"</div><div class='del'>-			  "\xef\xcf\x8b\x9f\xcf\x33\xca\x2f"</div><div class='del'>-			  "\xed\x62\xa9\x4c\x80\xff\x13\xaf"</div><div class='del'>-			  "\x52\x37\xed\x0e\x52\x6b\x59\x02"</div><div class='del'>-			  "\xd9\x4e\xe8\x7a\x76\x1d\x02\x98"</div><div class='del'>-			  "\xfe\x8a\x87\x83\xa3\x4f\x56\x8a"</div><div class='del'>-			  "\xb8\x9e\x8e\x5c\x57\xd3\xa0\x79"</div><div class='del'>-			  "\xfa\x02",</div><div class='del'>-		.output	= "This document describes a compression method based on the DEFLATE"</div><div class='del'>-			"compression algorithm.  This document defines the application of "</div><div class='del'>-			"the DEFLATE algorithm to the IP Payload Compression Protocol.",</div><div class='del'>-	}, {</div><div class='del'>-		.inlen	= 38,</div><div class='del'>-		.outlen	= 70,</div><div class='del'>-		.input	= "\xf3\xca\xcf\xcc\x53\x28\x2d\x56"</div><div class='del'>-			  "\xc8\xcb\x2f\x57\x48\xcc\x4b\x51"</div><div class='del'>-			  "\x28\xce\x48\x2c\x4a\x55\x28\xc9"</div><div class='del'>-			  "\x48\x55\x28\xce\x4f\x2b\x29\x07"</div><div class='del'>-			  "\x71\xbc\x08\x2b\x01\x00",</div><div class='del'>-		.output	= "Join us now and share the software "</div><div class='del'>-			"Join us now and share the software ",</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * LZO test vectors (null-terminated strings).</div><div class='del'>- */</div><div class='del'>-#define LZO_COMP_TEST_VECTORS 2</div><div class='del'>-#define LZO_DECOMP_TEST_VECTORS 2</div><div class='del'>-</div><div class='del'>-static struct comp_testvec lzo_comp_tv_template[] = {</div><div class='del'>-	{</div><div class='del'>-		.inlen	= 70,</div><div class='del'>-		.outlen	= 46,</div><div class='del'>-		.input	= "Join us now and share the software "</div><div class='del'>-			"Join us now and share the software ",</div><div class='del'>-		.output	= "\x00\x0d\x4a\x6f\x69\x6e\x20\x75"</div><div class='del'>-			"\x73\x20\x6e\x6f\x77\x20\x61\x6e"</div><div class='del'>-			"\x64\x20\x73\x68\x61\x72\x65\x20"</div><div class='del'>-			"\x74\x68\x65\x20\x73\x6f\x66\x74"</div><div class='del'>-			"\x77\x70\x01\x01\x4a\x6f\x69\x6e"</div><div class='del'>-			"\x3d\x88\x00\x11\x00\x00",</div><div class='del'>-	}, {</div><div class='del'>-		.inlen	= 159,</div><div class='del'>-		.outlen	= 133,</div><div class='del'>-		.input	= "This document describes a compression method based on the LZO "</div><div class='del'>-			"compression algorithm.  This document defines the application of "</div><div class='del'>-			"the LZO algorithm used in UBIFS.",</div><div class='del'>-		.output	= "\x00\x2b\x54\x68\x69\x73\x20\x64"</div><div class='del'>-			  "\x6f\x63\x75\x6d\x65\x6e\x74\x20"</div><div class='del'>-			  "\x64\x65\x73\x63\x72\x69\x62\x65"</div><div class='del'>-			  "\x73\x20\x61\x20\x63\x6f\x6d\x70"</div><div class='del'>-			  "\x72\x65\x73\x73\x69\x6f\x6e\x20"</div><div class='del'>-			  "\x6d\x65\x74\x68\x6f\x64\x20\x62"</div><div class='del'>-			  "\x61\x73\x65\x64\x20\x6f\x6e\x20"</div><div class='del'>-			  "\x74\x68\x65\x20\x4c\x5a\x4f\x2b"</div><div class='del'>-			  "\x8c\x00\x0d\x61\x6c\x67\x6f\x72"</div><div class='del'>-			  "\x69\x74\x68\x6d\x2e\x20\x20\x54"</div><div class='del'>-			  "\x68\x69\x73\x2a\x54\x01\x02\x66"</div><div class='del'>-			  "\x69\x6e\x65\x73\x94\x06\x05\x61"</div><div class='del'>-			  "\x70\x70\x6c\x69\x63\x61\x74\x76"</div><div class='del'>-			  "\x0a\x6f\x66\x88\x02\x60\x09\x27"</div><div class='del'>-			  "\xf0\x00\x0c\x20\x75\x73\x65\x64"</div><div class='del'>-			  "\x20\x69\x6e\x20\x55\x42\x49\x46"</div><div class='del'>-			  "\x53\x2e\x11\x00\x00",</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct comp_testvec lzo_decomp_tv_template[] = {</div><div class='del'>-	{</div><div class='del'>-		.inlen	= 133,</div><div class='del'>-		.outlen	= 159,</div><div class='del'>-		.input	= "\x00\x2b\x54\x68\x69\x73\x20\x64"</div><div class='del'>-			  "\x6f\x63\x75\x6d\x65\x6e\x74\x20"</div><div class='del'>-			  "\x64\x65\x73\x63\x72\x69\x62\x65"</div><div class='del'>-			  "\x73\x20\x61\x20\x63\x6f\x6d\x70"</div><div class='del'>-			  "\x72\x65\x73\x73\x69\x6f\x6e\x20"</div><div class='del'>-			  "\x6d\x65\x74\x68\x6f\x64\x20\x62"</div><div class='del'>-			  "\x61\x73\x65\x64\x20\x6f\x6e\x20"</div><div class='del'>-			  "\x74\x68\x65\x20\x4c\x5a\x4f\x2b"</div><div class='del'>-			  "\x8c\x00\x0d\x61\x6c\x67\x6f\x72"</div><div class='del'>-			  "\x69\x74\x68\x6d\x2e\x20\x20\x54"</div><div class='del'>-			  "\x68\x69\x73\x2a\x54\x01\x02\x66"</div><div class='del'>-			  "\x69\x6e\x65\x73\x94\x06\x05\x61"</div><div class='del'>-			  "\x70\x70\x6c\x69\x63\x61\x74\x76"</div><div class='del'>-			  "\x0a\x6f\x66\x88\x02\x60\x09\x27"</div><div class='del'>-			  "\xf0\x00\x0c\x20\x75\x73\x65\x64"</div><div class='del'>-			  "\x20\x69\x6e\x20\x55\x42\x49\x46"</div><div class='del'>-			  "\x53\x2e\x11\x00\x00",</div><div class='del'>-		.output	= "This document describes a compression method based on the LZO "</div><div class='del'>-			"compression algorithm.  This document defines the application of "</div><div class='del'>-			"the LZO algorithm used in UBIFS.",</div><div class='del'>-	}, {</div><div class='del'>-		.inlen	= 46,</div><div class='del'>-		.outlen	= 70,</div><div class='del'>-		.input	= "\x00\x0d\x4a\x6f\x69\x6e\x20\x75"</div><div class='del'>-			  "\x73\x20\x6e\x6f\x77\x20\x61\x6e"</div><div class='del'>-			  "\x64\x20\x73\x68\x61\x72\x65\x20"</div><div class='del'>-			  "\x74\x68\x65\x20\x73\x6f\x66\x74"</div><div class='del'>-			  "\x77\x70\x01\x01\x4a\x6f\x69\x6e"</div><div class='del'>-			  "\x3d\x88\x00\x11\x00\x00",</div><div class='del'>-		.output	= "Join us now and share the software "</div><div class='del'>-			"Join us now and share the software ",</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Michael MIC test vectors from IEEE 802.11i</div><div class='del'>- */</div><div class='del'>-#define MICHAEL_MIC_TEST_VECTORS 6</div><div class='del'>-</div><div class='del'>-static struct hash_testvec michael_mic_tv_template[] = {</div><div class='del'>-	{</div><div class='del'>-		.key = "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='del'>-		.ksize = 8,</div><div class='del'>-		.plaintext = zeroed_string,</div><div class='del'>-		.psize = 0,</div><div class='del'>-		.digest = "\x82\x92\x5c\x1c\xa1\xd1\x30\xb8",</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.key = "\x82\x92\x5c\x1c\xa1\xd1\x30\xb8",</div><div class='del'>-		.ksize = 8,</div><div class='del'>-		.plaintext = "M",</div><div class='del'>-		.psize = 1,</div><div class='del'>-		.digest = "\x43\x47\x21\xca\x40\x63\x9b\x3f",</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.key = "\x43\x47\x21\xca\x40\x63\x9b\x3f",</div><div class='del'>-		.ksize = 8,</div><div class='del'>-		.plaintext = "Mi",</div><div class='del'>-		.psize = 2,</div><div class='del'>-		.digest = "\xe8\xf9\xbe\xca\xe9\x7e\x5d\x29",</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.key = "\xe8\xf9\xbe\xca\xe9\x7e\x5d\x29",</div><div class='del'>-		.ksize = 8,</div><div class='del'>-		.plaintext = "Mic",</div><div class='del'>-		.psize = 3,</div><div class='del'>-		.digest = "\x90\x03\x8f\xc6\xcf\x13\xc1\xdb",</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.key = "\x90\x03\x8f\xc6\xcf\x13\xc1\xdb",</div><div class='del'>-		.ksize = 8,</div><div class='del'>-		.plaintext = "Mich",</div><div class='del'>-		.psize = 4,</div><div class='del'>-		.digest = "\xd5\x5e\x10\x05\x10\x12\x89\x86",</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.key = "\xd5\x5e\x10\x05\x10\x12\x89\x86",</div><div class='del'>-		.ksize = 8,</div><div class='del'>-		.plaintext = "Michael",</div><div class='del'>-		.psize = 7,</div><div class='del'>-		.digest = "\x0a\x94\x2b\x12\x4e\xca\xa5\x46",</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * CRC32C test vectors</div><div class='del'>- */</div><div class='del'>-#define CRC32C_TEST_VECTORS 14</div><div class='del'>-</div><div class='del'>-static struct hash_testvec crc32c_tv_template[] = {</div><div class='del'>-	{</div><div class='del'>-		.psize = 0,</div><div class='del'>-		.digest = "\x00\x00\x00\x00",</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.key = "\x87\xa9\xcb\xed",</div><div class='del'>-		.ksize = 4,</div><div class='del'>-		.psize = 0,</div><div class='del'>-		.digest = "\x78\x56\x34\x12",</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.key = "\xff\xff\xff\xff",</div><div class='del'>-		.ksize = 4,</div><div class='del'>-		.plaintext = "\x01\x02\x03\x04\x05\x06\x07\x08"</div><div class='del'>-			     "\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10"</div><div class='del'>-			     "\x11\x12\x13\x14\x15\x16\x17\x18"</div><div class='del'>-			     "\x19\x1a\x1b\x1c\x1d\x1e\x1f\x20"</div><div class='del'>-			     "\x21\x22\x23\x24\x25\x26\x27\x28",</div><div class='del'>-		.psize = 40,</div><div class='del'>-		.digest = "\x7f\x15\x2c\x0e",</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.key = "\xff\xff\xff\xff",</div><div class='del'>-		.ksize = 4,</div><div class='del'>-		.plaintext = "\x29\x2a\x2b\x2c\x2d\x2e\x2f\x30"</div><div class='del'>-			     "\x31\x32\x33\x34\x35\x36\x37\x38"</div><div class='del'>-			     "\x39\x3a\x3b\x3c\x3d\x3e\x3f\x40"</div><div class='del'>-			     "\x41\x42\x43\x44\x45\x46\x47\x48"</div><div class='del'>-			     "\x49\x4a\x4b\x4c\x4d\x4e\x4f\x50",</div><div class='del'>-		.psize = 40,</div><div class='del'>-		.digest = "\xf6\xeb\x80\xe9",</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.key = "\xff\xff\xff\xff",</div><div class='del'>-		.ksize = 4,</div><div class='del'>-		.plaintext = "\x51\x52\x53\x54\x55\x56\x57\x58"</div><div class='del'>-			     "\x59\x5a\x5b\x5c\x5d\x5e\x5f\x60"</div><div class='del'>-			     "\x61\x62\x63\x64\x65\x66\x67\x68"</div><div class='del'>-			     "\x69\x6a\x6b\x6c\x6d\x6e\x6f\x70"</div><div class='del'>-			     "\x71\x72\x73\x74\x75\x76\x77\x78",</div><div class='del'>-		.psize = 40,</div><div class='del'>-		.digest = "\xed\xbd\x74\xde",</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.key = "\xff\xff\xff\xff",</div><div class='del'>-		.ksize = 4,</div><div class='del'>-		.plaintext = "\x79\x7a\x7b\x7c\x7d\x7e\x7f\x80"</div><div class='del'>-			     "\x81\x82\x83\x84\x85\x86\x87\x88"</div><div class='del'>-			     "\x89\x8a\x8b\x8c\x8d\x8e\x8f\x90"</div><div class='del'>-			     "\x91\x92\x93\x94\x95\x96\x97\x98"</div><div class='del'>-			     "\x99\x9a\x9b\x9c\x9d\x9e\x9f\xa0",</div><div class='del'>-		.psize = 40,</div><div class='del'>-		.digest = "\x62\xc8\x79\xd5",</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.key = "\xff\xff\xff\xff",</div><div class='del'>-		.ksize = 4,</div><div class='del'>-		.plaintext = "\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8"</div><div class='del'>-			     "\xa9\xaa\xab\xac\xad\xae\xaf\xb0"</div><div class='del'>-			     "\xb1\xb2\xb3\xb4\xb5\xb6\xb7\xb8"</div><div class='del'>-			     "\xb9\xba\xbb\xbc\xbd\xbe\xbf\xc0"</div><div class='del'>-			     "\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8",</div><div class='del'>-		.psize = 40,</div><div class='del'>-		.digest = "\xd0\x9a\x97\xba",</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.key = "\xff\xff\xff\xff",</div><div class='del'>-		.ksize = 4,</div><div class='del'>-		.plaintext = "\xc9\xca\xcb\xcc\xcd\xce\xcf\xd0"</div><div class='del'>-			     "\xd1\xd2\xd3\xd4\xd5\xd6\xd7\xd8"</div><div class='del'>-			     "\xd9\xda\xdb\xdc\xdd\xde\xdf\xe0"</div><div class='del'>-			     "\xe1\xe2\xe3\xe4\xe5\xe6\xe7\xe8"</div><div class='del'>-			     "\xe9\xea\xeb\xec\xed\xee\xef\xf0",</div><div class='del'>-		.psize = 40,</div><div class='del'>-		.digest = "\x13\xd9\x29\x2b",</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.key = "\x80\xea\xd3\xf1",</div><div class='del'>-		.ksize = 4,</div><div class='del'>-		.plaintext = "\x29\x2a\x2b\x2c\x2d\x2e\x2f\x30"</div><div class='del'>-			     "\x31\x32\x33\x34\x35\x36\x37\x38"</div><div class='del'>-			     "\x39\x3a\x3b\x3c\x3d\x3e\x3f\x40"</div><div class='del'>-			     "\x41\x42\x43\x44\x45\x46\x47\x48"</div><div class='del'>-			     "\x49\x4a\x4b\x4c\x4d\x4e\x4f\x50",</div><div class='del'>-		.psize = 40,</div><div class='del'>-		.digest = "\x0c\xb5\xe2\xa2",</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.key = "\xf3\x4a\x1d\x5d",</div><div class='del'>-		.ksize = 4,</div><div class='del'>-		.plaintext = "\x51\x52\x53\x54\x55\x56\x57\x58"</div><div class='del'>-			     "\x59\x5a\x5b\x5c\x5d\x5e\x5f\x60"</div><div class='del'>-			     "\x61\x62\x63\x64\x65\x66\x67\x68"</div><div class='del'>-			     "\x69\x6a\x6b\x6c\x6d\x6e\x6f\x70"</div><div class='del'>-			     "\x71\x72\x73\x74\x75\x76\x77\x78",</div><div class='del'>-		.psize = 40,</div><div class='del'>-		.digest = "\xd1\x7f\xfb\xa6",</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.key = "\x2e\x80\x04\x59",</div><div class='del'>-		.ksize = 4,</div><div class='del'>-		.plaintext = "\x79\x7a\x7b\x7c\x7d\x7e\x7f\x80"</div><div class='del'>-			     "\x81\x82\x83\x84\x85\x86\x87\x88"</div><div class='del'>-			     "\x89\x8a\x8b\x8c\x8d\x8e\x8f\x90"</div><div class='del'>-			     "\x91\x92\x93\x94\x95\x96\x97\x98"</div><div class='del'>-			     "\x99\x9a\x9b\x9c\x9d\x9e\x9f\xa0",</div><div class='del'>-		.psize = 40,</div><div class='del'>-		.digest = "\x59\x33\xe6\x7a",</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.key = "\xa6\xcc\x19\x85",</div><div class='del'>-		.ksize = 4,</div><div class='del'>-		.plaintext = "\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8"</div><div class='del'>-			     "\xa9\xaa\xab\xac\xad\xae\xaf\xb0"</div><div class='del'>-			     "\xb1\xb2\xb3\xb4\xb5\xb6\xb7\xb8"</div><div class='del'>-			     "\xb9\xba\xbb\xbc\xbd\xbe\xbf\xc0"</div><div class='del'>-			     "\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8",</div><div class='del'>-		.psize = 40,</div><div class='del'>-		.digest = "\xbe\x03\x01\xd2",</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.key = "\x41\xfc\xfe\x2d",</div><div class='del'>-		.ksize = 4,</div><div class='del'>-		.plaintext = "\xc9\xca\xcb\xcc\xcd\xce\xcf\xd0"</div><div class='del'>-			     "\xd1\xd2\xd3\xd4\xd5\xd6\xd7\xd8"</div><div class='del'>-			     "\xd9\xda\xdb\xdc\xdd\xde\xdf\xe0"</div><div class='del'>-			     "\xe1\xe2\xe3\xe4\xe5\xe6\xe7\xe8"</div><div class='del'>-			     "\xe9\xea\xeb\xec\xed\xee\xef\xf0",</div><div class='del'>-		.psize = 40,</div><div class='del'>-		.digest = "\x75\xd3\xc5\x24",</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.key = "\xff\xff\xff\xff",</div><div class='del'>-		.ksize = 4,</div><div class='del'>-		.plaintext = "\x01\x02\x03\x04\x05\x06\x07\x08"</div><div class='del'>-			     "\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10"</div><div class='del'>-			     "\x11\x12\x13\x14\x15\x16\x17\x18"</div><div class='del'>-			     "\x19\x1a\x1b\x1c\x1d\x1e\x1f\x20"</div><div class='del'>-			     "\x21\x22\x23\x24\x25\x26\x27\x28"</div><div class='del'>-			     "\x29\x2a\x2b\x2c\x2d\x2e\x2f\x30"</div><div class='del'>-			     "\x31\x32\x33\x34\x35\x36\x37\x38"</div><div class='del'>-			     "\x39\x3a\x3b\x3c\x3d\x3e\x3f\x40"</div><div class='del'>-			     "\x41\x42\x43\x44\x45\x46\x47\x48"</div><div class='del'>-			     "\x49\x4a\x4b\x4c\x4d\x4e\x4f\x50"</div><div class='del'>-			     "\x51\x52\x53\x54\x55\x56\x57\x58"</div><div class='del'>-			     "\x59\x5a\x5b\x5c\x5d\x5e\x5f\x60"</div><div class='del'>-			     "\x61\x62\x63\x64\x65\x66\x67\x68"</div><div class='del'>-			     "\x69\x6a\x6b\x6c\x6d\x6e\x6f\x70"</div><div class='del'>-			     "\x71\x72\x73\x74\x75\x76\x77\x78"</div><div class='del'>-			     "\x79\x7a\x7b\x7c\x7d\x7e\x7f\x80"</div><div class='del'>-			     "\x81\x82\x83\x84\x85\x86\x87\x88"</div><div class='del'>-			     "\x89\x8a\x8b\x8c\x8d\x8e\x8f\x90"</div><div class='del'>-			     "\x91\x92\x93\x94\x95\x96\x97\x98"</div><div class='del'>-			     "\x99\x9a\x9b\x9c\x9d\x9e\x9f\xa0"</div><div class='del'>-			     "\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8"</div><div class='del'>-			     "\xa9\xaa\xab\xac\xad\xae\xaf\xb0"</div><div class='del'>-			     "\xb1\xb2\xb3\xb4\xb5\xb6\xb7\xb8"</div><div class='del'>-			     "\xb9\xba\xbb\xbc\xbd\xbe\xbf\xc0"</div><div class='del'>-			     "\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8"</div><div class='del'>-			     "\xc9\xca\xcb\xcc\xcd\xce\xcf\xd0"</div><div class='del'>-			     "\xd1\xd2\xd3\xd4\xd5\xd6\xd7\xd8"</div><div class='del'>-			     "\xd9\xda\xdb\xdc\xdd\xde\xdf\xe0"</div><div class='del'>-			     "\xe1\xe2\xe3\xe4\xe5\xe6\xe7\xe8"</div><div class='del'>-			     "\xe9\xea\xeb\xec\xed\xee\xef\xf0",</div><div class='del'>-		.psize = 240,</div><div class='del'>-		.digest = "\x75\xd3\xc5\x24",</div><div class='del'>-		.np = 2,</div><div class='del'>-		.tap = { 31, 209 }</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Cipher speed tests</div><div class='ctx'>  */</div><div class='head'>diff --git a/crypto/testmgr.c b/crypto/testmgr.c<br/>new file mode 100644<br/>index 000000000000..b828c6cf1b1d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/crypto/testmgr.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>crypto/testmgr.c</a></div><div class='hunk'>@@ -0,0 +1,1868 @@</div><div class='add'>+/*</div><div class='add'>+ * Algorithm testing framework and tests.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2002 James Morris &lt;jmorris@intercode.com.au&gt;</div><div class='add'>+ * Copyright (c) 2002 Jean-Francois Dive &lt;jef@linuxbe.org&gt;</div><div class='add'>+ * Copyright (c) 2007 Nokia Siemens Networks</div><div class='add'>+ * Copyright (c) 2008 Herbert Xu &lt;herbert@gondor.apana.org.au&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms of the GNU General Public License as published by the Free</div><div class='add'>+ * Software Foundation; either version 2 of the License, or (at your option)</div><div class='add'>+ * any later version.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;crypto/hash.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/scatterlist.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+</div><div class='add'>+#include "internal.h"</div><div class='add'>+#include "testmgr.h"</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Need slab memory for testing (size in number of pages).</div><div class='add'>+ */</div><div class='add'>+#define XBUFSIZE	8</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Indexes into the xbuf to simulate cross-page access.</div><div class='add'>+ */</div><div class='add'>+#define IDX1		32</div><div class='add'>+#define IDX2		32400</div><div class='add'>+#define IDX3		1</div><div class='add'>+#define IDX4		8193</div><div class='add'>+#define IDX5		22222</div><div class='add'>+#define IDX6		17101</div><div class='add'>+#define IDX7		27333</div><div class='add'>+#define IDX8		3000</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+* Used by test_cipher()</div><div class='add'>+*/</div><div class='add'>+#define ENCRYPT 1</div><div class='add'>+#define DECRYPT 0</div><div class='add'>+</div><div class='add'>+struct tcrypt_result {</div><div class='add'>+	struct completion completion;</div><div class='add'>+	int err;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct aead_test_suite {</div><div class='add'>+	struct {</div><div class='add'>+		struct aead_testvec *vecs;</div><div class='add'>+		unsigned int count;</div><div class='add'>+	} enc, dec;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct cipher_test_suite {</div><div class='add'>+	struct {</div><div class='add'>+		struct cipher_testvec *vecs;</div><div class='add'>+		unsigned int count;</div><div class='add'>+	} enc, dec;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct comp_test_suite {</div><div class='add'>+	struct {</div><div class='add'>+		struct comp_testvec *vecs;</div><div class='add'>+		unsigned int count;</div><div class='add'>+	} comp, decomp;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hash_test_suite {</div><div class='add'>+	struct hash_testvec *vecs;</div><div class='add'>+	unsigned int count;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct alg_test_desc {</div><div class='add'>+	const char *alg;</div><div class='add'>+	int (*test)(const struct alg_test_desc *desc, const char *driver,</div><div class='add'>+		    u32 type, u32 mask);</div><div class='add'>+</div><div class='add'>+	union {</div><div class='add'>+		struct aead_test_suite aead;</div><div class='add'>+		struct cipher_test_suite cipher;</div><div class='add'>+		struct comp_test_suite comp;</div><div class='add'>+		struct hash_test_suite hash;</div><div class='add'>+	} suite;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static unsigned int IDX[8] = { IDX1, IDX2, IDX3, IDX4, IDX5, IDX6, IDX7, IDX8 };</div><div class='add'>+</div><div class='add'>+static char *xbuf[XBUFSIZE];</div><div class='add'>+static char *axbuf[XBUFSIZE];</div><div class='add'>+</div><div class='add'>+static void hexdump(unsigned char *buf, unsigned int len)</div><div class='add'>+{</div><div class='add'>+	print_hex_dump(KERN_CONT, "", DUMP_PREFIX_OFFSET,</div><div class='add'>+			16, 1,</div><div class='add'>+			buf, len, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tcrypt_complete(struct crypto_async_request *req, int err)</div><div class='add'>+{</div><div class='add'>+	struct tcrypt_result *res = req-&gt;data;</div><div class='add'>+</div><div class='add'>+	if (err == -EINPROGRESS)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	res-&gt;err = err;</div><div class='add'>+	complete(&amp;res-&gt;completion);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int test_hash(struct crypto_ahash *tfm, struct hash_testvec *template,</div><div class='add'>+		     unsigned int tcount)</div><div class='add'>+{</div><div class='add'>+	const char *algo = crypto_tfm_alg_driver_name(crypto_ahash_tfm(tfm));</div><div class='add'>+	unsigned int i, j, k, temp;</div><div class='add'>+	struct scatterlist sg[8];</div><div class='add'>+	char result[64];</div><div class='add'>+	struct ahash_request *req;</div><div class='add'>+	struct tcrypt_result tresult;</div><div class='add'>+	int ret;</div><div class='add'>+	void *hash_buff;</div><div class='add'>+</div><div class='add'>+	init_completion(&amp;tresult.completion);</div><div class='add'>+</div><div class='add'>+	req = ahash_request_alloc(tfm, GFP_KERNEL);</div><div class='add'>+	if (!req) {</div><div class='add'>+		printk(KERN_ERR "alg: hash: Failed to allocate request for "</div><div class='add'>+		       "%s\n", algo);</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out_noreq;</div><div class='add'>+	}</div><div class='add'>+	ahash_request_set_callback(req, CRYPTO_TFM_REQ_MAY_BACKLOG,</div><div class='add'>+				   tcrypt_complete, &amp;tresult);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; tcount; i++) {</div><div class='add'>+		memset(result, 0, 64);</div><div class='add'>+</div><div class='add'>+		hash_buff = xbuf[0];</div><div class='add'>+</div><div class='add'>+		memcpy(hash_buff, template[i].plaintext, template[i].psize);</div><div class='add'>+		sg_init_one(&amp;sg[0], hash_buff, template[i].psize);</div><div class='add'>+</div><div class='add'>+		if (template[i].ksize) {</div><div class='add'>+			crypto_ahash_clear_flags(tfm, ~0);</div><div class='add'>+			ret = crypto_ahash_setkey(tfm, template[i].key,</div><div class='add'>+						  template[i].ksize);</div><div class='add'>+			if (ret) {</div><div class='add'>+				printk(KERN_ERR "alg: hash: setkey failed on "</div><div class='add'>+				       "test %d for %s: ret=%d\n", i + 1, algo,</div><div class='add'>+				       -ret);</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ahash_request_set_crypt(req, sg, result, template[i].psize);</div><div class='add'>+		ret = crypto_ahash_digest(req);</div><div class='add'>+		switch (ret) {</div><div class='add'>+		case 0:</div><div class='add'>+			break;</div><div class='add'>+		case -EINPROGRESS:</div><div class='add'>+		case -EBUSY:</div><div class='add'>+			ret = wait_for_completion_interruptible(</div><div class='add'>+				&amp;tresult.completion);</div><div class='add'>+			if (!ret &amp;&amp; !(ret = tresult.err)) {</div><div class='add'>+				INIT_COMPLETION(tresult.completion);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			/* fall through */</div><div class='add'>+		default:</div><div class='add'>+			printk(KERN_ERR "alg: hash: digest failed on test %d "</div><div class='add'>+			       "for %s: ret=%d\n", i + 1, algo, -ret);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (memcmp(result, template[i].digest,</div><div class='add'>+			   crypto_ahash_digestsize(tfm))) {</div><div class='add'>+			printk(KERN_ERR "alg: hash: Test %d failed for %s\n",</div><div class='add'>+			       i + 1, algo);</div><div class='add'>+			hexdump(result, crypto_ahash_digestsize(tfm));</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	j = 0;</div><div class='add'>+	for (i = 0; i &lt; tcount; i++) {</div><div class='add'>+		if (template[i].np) {</div><div class='add'>+			j++;</div><div class='add'>+			memset(result, 0, 64);</div><div class='add'>+</div><div class='add'>+			temp = 0;</div><div class='add'>+			sg_init_table(sg, template[i].np);</div><div class='add'>+			for (k = 0; k &lt; template[i].np; k++) {</div><div class='add'>+				sg_set_buf(&amp;sg[k],</div><div class='add'>+					   memcpy(xbuf[IDX[k] &gt;&gt; PAGE_SHIFT] +</div><div class='add'>+						  offset_in_page(IDX[k]),</div><div class='add'>+						  template[i].plaintext + temp,</div><div class='add'>+						  template[i].tap[k]),</div><div class='add'>+					   template[i].tap[k]);</div><div class='add'>+				temp += template[i].tap[k];</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (template[i].ksize) {</div><div class='add'>+				crypto_ahash_clear_flags(tfm, ~0);</div><div class='add'>+				ret = crypto_ahash_setkey(tfm, template[i].key,</div><div class='add'>+							  template[i].ksize);</div><div class='add'>+</div><div class='add'>+				if (ret) {</div><div class='add'>+					printk(KERN_ERR "alg: hash: setkey "</div><div class='add'>+					       "failed on chunking test %d "</div><div class='add'>+					       "for %s: ret=%d\n", j, algo,</div><div class='add'>+					       -ret);</div><div class='add'>+					goto out;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			ahash_request_set_crypt(req, sg, result,</div><div class='add'>+						template[i].psize);</div><div class='add'>+			ret = crypto_ahash_digest(req);</div><div class='add'>+			switch (ret) {</div><div class='add'>+			case 0:</div><div class='add'>+				break;</div><div class='add'>+			case -EINPROGRESS:</div><div class='add'>+			case -EBUSY:</div><div class='add'>+				ret = wait_for_completion_interruptible(</div><div class='add'>+					&amp;tresult.completion);</div><div class='add'>+				if (!ret &amp;&amp; !(ret = tresult.err)) {</div><div class='add'>+					INIT_COMPLETION(tresult.completion);</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+				/* fall through */</div><div class='add'>+			default:</div><div class='add'>+				printk(KERN_ERR "alg: hash: digest failed "</div><div class='add'>+				       "on chunking test %d for %s: "</div><div class='add'>+				       "ret=%d\n", j, algo, -ret);</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (memcmp(result, template[i].digest,</div><div class='add'>+				   crypto_ahash_digestsize(tfm))) {</div><div class='add'>+				printk(KERN_ERR "alg: hash: Chunking test %d "</div><div class='add'>+				       "failed for %s\n", j, algo);</div><div class='add'>+				hexdump(result, crypto_ahash_digestsize(tfm));</div><div class='add'>+				ret = -EINVAL;</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = 0;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	ahash_request_free(req);</div><div class='add'>+out_noreq:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int test_aead(struct crypto_aead *tfm, int enc,</div><div class='add'>+		     struct aead_testvec *template, unsigned int tcount)</div><div class='add'>+{</div><div class='add'>+	const char *algo = crypto_tfm_alg_driver_name(crypto_aead_tfm(tfm));</div><div class='add'>+	unsigned int i, j, k, n, temp;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	char *q;</div><div class='add'>+	char *key;</div><div class='add'>+	struct aead_request *req;</div><div class='add'>+	struct scatterlist sg[8];</div><div class='add'>+	struct scatterlist asg[8];</div><div class='add'>+	const char *e;</div><div class='add'>+	struct tcrypt_result result;</div><div class='add'>+	unsigned int authsize;</div><div class='add'>+	void *input;</div><div class='add'>+	void *assoc;</div><div class='add'>+	char iv[MAX_IVLEN];</div><div class='add'>+</div><div class='add'>+	if (enc == ENCRYPT)</div><div class='add'>+		e = "encryption";</div><div class='add'>+	else</div><div class='add'>+		e = "decryption";</div><div class='add'>+</div><div class='add'>+	init_completion(&amp;result.completion);</div><div class='add'>+</div><div class='add'>+	req = aead_request_alloc(tfm, GFP_KERNEL);</div><div class='add'>+	if (!req) {</div><div class='add'>+		printk(KERN_ERR "alg: aead: Failed to allocate request for "</div><div class='add'>+		       "%s\n", algo);</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	aead_request_set_callback(req, CRYPTO_TFM_REQ_MAY_BACKLOG,</div><div class='add'>+				  tcrypt_complete, &amp;result);</div><div class='add'>+</div><div class='add'>+	for (i = 0, j = 0; i &lt; tcount; i++) {</div><div class='add'>+		if (!template[i].np) {</div><div class='add'>+			j++;</div><div class='add'>+</div><div class='add'>+			/* some tepmplates have no input data but they will</div><div class='add'>+			 * touch input</div><div class='add'>+			 */</div><div class='add'>+			input = xbuf[0];</div><div class='add'>+			assoc = axbuf[0];</div><div class='add'>+</div><div class='add'>+			memcpy(input, template[i].input, template[i].ilen);</div><div class='add'>+			memcpy(assoc, template[i].assoc, template[i].alen);</div><div class='add'>+			if (template[i].iv)</div><div class='add'>+				memcpy(iv, template[i].iv, MAX_IVLEN);</div><div class='add'>+			else</div><div class='add'>+				memset(iv, 0, MAX_IVLEN);</div><div class='add'>+</div><div class='add'>+			crypto_aead_clear_flags(tfm, ~0);</div><div class='add'>+			if (template[i].wk)</div><div class='add'>+				crypto_aead_set_flags(</div><div class='add'>+					tfm, CRYPTO_TFM_REQ_WEAK_KEY);</div><div class='add'>+</div><div class='add'>+			key = template[i].key;</div><div class='add'>+</div><div class='add'>+			ret = crypto_aead_setkey(tfm, key,</div><div class='add'>+						 template[i].klen);</div><div class='add'>+			if (!ret == template[i].fail) {</div><div class='add'>+				printk(KERN_ERR "alg: aead: setkey failed on "</div><div class='add'>+				       "test %d for %s: flags=%x\n", j, algo,</div><div class='add'>+				       crypto_aead_get_flags(tfm));</div><div class='add'>+				goto out;</div><div class='add'>+			} else if (ret)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			authsize = abs(template[i].rlen - template[i].ilen);</div><div class='add'>+			ret = crypto_aead_setauthsize(tfm, authsize);</div><div class='add'>+			if (ret) {</div><div class='add'>+				printk(KERN_ERR "alg: aead: Failed to set "</div><div class='add'>+				       "authsize to %u on test %d for %s\n",</div><div class='add'>+				       authsize, j, algo);</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			sg_init_one(&amp;sg[0], input,</div><div class='add'>+				    template[i].ilen + (enc ? authsize : 0));</div><div class='add'>+</div><div class='add'>+			sg_init_one(&amp;asg[0], assoc, template[i].alen);</div><div class='add'>+</div><div class='add'>+			aead_request_set_crypt(req, sg, sg,</div><div class='add'>+					       template[i].ilen, iv);</div><div class='add'>+</div><div class='add'>+			aead_request_set_assoc(req, asg, template[i].alen);</div><div class='add'>+</div><div class='add'>+			ret = enc ?</div><div class='add'>+				crypto_aead_encrypt(req) :</div><div class='add'>+				crypto_aead_decrypt(req);</div><div class='add'>+</div><div class='add'>+			switch (ret) {</div><div class='add'>+			case 0:</div><div class='add'>+				break;</div><div class='add'>+			case -EINPROGRESS:</div><div class='add'>+			case -EBUSY:</div><div class='add'>+				ret = wait_for_completion_interruptible(</div><div class='add'>+					&amp;result.completion);</div><div class='add'>+				if (!ret &amp;&amp; !(ret = result.err)) {</div><div class='add'>+					INIT_COMPLETION(result.completion);</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+				/* fall through */</div><div class='add'>+			default:</div><div class='add'>+				printk(KERN_ERR "alg: aead: %s failed on test "</div><div class='add'>+				       "%d for %s: ret=%d\n", e, j, algo, -ret);</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			q = input;</div><div class='add'>+			if (memcmp(q, template[i].result, template[i].rlen)) {</div><div class='add'>+				printk(KERN_ERR "alg: aead: Test %d failed on "</div><div class='add'>+				       "%s for %s\n", j, e, algo);</div><div class='add'>+				hexdump(q, template[i].rlen);</div><div class='add'>+				ret = -EINVAL;</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0, j = 0; i &lt; tcount; i++) {</div><div class='add'>+		if (template[i].np) {</div><div class='add'>+			j++;</div><div class='add'>+</div><div class='add'>+			if (template[i].iv)</div><div class='add'>+				memcpy(iv, template[i].iv, MAX_IVLEN);</div><div class='add'>+			else</div><div class='add'>+				memset(iv, 0, MAX_IVLEN);</div><div class='add'>+</div><div class='add'>+			crypto_aead_clear_flags(tfm, ~0);</div><div class='add'>+			if (template[i].wk)</div><div class='add'>+				crypto_aead_set_flags(</div><div class='add'>+					tfm, CRYPTO_TFM_REQ_WEAK_KEY);</div><div class='add'>+			key = template[i].key;</div><div class='add'>+</div><div class='add'>+			ret = crypto_aead_setkey(tfm, key, template[i].klen);</div><div class='add'>+			if (!ret == template[i].fail) {</div><div class='add'>+				printk(KERN_ERR "alg: aead: setkey failed on "</div><div class='add'>+				       "chunk test %d for %s: flags=%x\n", j,</div><div class='add'>+				       algo, crypto_aead_get_flags(tfm));</div><div class='add'>+				goto out;</div><div class='add'>+			} else if (ret)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			authsize = abs(template[i].rlen - template[i].ilen);</div><div class='add'>+</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			sg_init_table(sg, template[i].np);</div><div class='add'>+			for (k = 0, temp = 0; k &lt; template[i].np; k++) {</div><div class='add'>+				if (WARN_ON(offset_in_page(IDX[k]) +</div><div class='add'>+					    template[i].tap[k] &gt; PAGE_SIZE))</div><div class='add'>+					goto out;</div><div class='add'>+</div><div class='add'>+				q = xbuf[IDX[k] &gt;&gt; PAGE_SHIFT] +</div><div class='add'>+				    offset_in_page(IDX[k]);</div><div class='add'>+</div><div class='add'>+				memcpy(q, template[i].input + temp,</div><div class='add'>+				       template[i].tap[k]);</div><div class='add'>+</div><div class='add'>+				n = template[i].tap[k];</div><div class='add'>+				if (k == template[i].np - 1 &amp;&amp; enc)</div><div class='add'>+					n += authsize;</div><div class='add'>+				if (offset_in_page(q) + n &lt; PAGE_SIZE)</div><div class='add'>+					q[n] = 0;</div><div class='add'>+</div><div class='add'>+				sg_set_buf(&amp;sg[k], q, template[i].tap[k]);</div><div class='add'>+				temp += template[i].tap[k];</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			ret = crypto_aead_setauthsize(tfm, authsize);</div><div class='add'>+			if (ret) {</div><div class='add'>+				printk(KERN_ERR "alg: aead: Failed to set "</div><div class='add'>+				       "authsize to %u on chunk test %d for "</div><div class='add'>+				       "%s\n", authsize, j, algo);</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (enc) {</div><div class='add'>+				if (WARN_ON(sg[k - 1].offset +</div><div class='add'>+					    sg[k - 1].length + authsize &gt;</div><div class='add'>+					    PAGE_SIZE)) {</div><div class='add'>+					ret = -EINVAL;</div><div class='add'>+					goto out;</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+				sg[k - 1].length += authsize;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			sg_init_table(asg, template[i].anp);</div><div class='add'>+			for (k = 0, temp = 0; k &lt; template[i].anp; k++) {</div><div class='add'>+				sg_set_buf(&amp;asg[k],</div><div class='add'>+					   memcpy(axbuf[IDX[k] &gt;&gt; PAGE_SHIFT] +</div><div class='add'>+						  offset_in_page(IDX[k]),</div><div class='add'>+						  template[i].assoc + temp,</div><div class='add'>+						  template[i].atap[k]),</div><div class='add'>+					   template[i].atap[k]);</div><div class='add'>+				temp += template[i].atap[k];</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			aead_request_set_crypt(req, sg, sg,</div><div class='add'>+					       template[i].ilen,</div><div class='add'>+					       iv);</div><div class='add'>+</div><div class='add'>+			aead_request_set_assoc(req, asg, template[i].alen);</div><div class='add'>+</div><div class='add'>+			ret = enc ?</div><div class='add'>+				crypto_aead_encrypt(req) :</div><div class='add'>+				crypto_aead_decrypt(req);</div><div class='add'>+</div><div class='add'>+			switch (ret) {</div><div class='add'>+			case 0:</div><div class='add'>+				break;</div><div class='add'>+			case -EINPROGRESS:</div><div class='add'>+			case -EBUSY:</div><div class='add'>+				ret = wait_for_completion_interruptible(</div><div class='add'>+					&amp;result.completion);</div><div class='add'>+				if (!ret &amp;&amp; !(ret = result.err)) {</div><div class='add'>+					INIT_COMPLETION(result.completion);</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+				/* fall through */</div><div class='add'>+			default:</div><div class='add'>+				printk(KERN_ERR "alg: aead: %s failed on "</div><div class='add'>+				       "chunk test %d for %s: ret=%d\n", e, j,</div><div class='add'>+				       algo, -ret);</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			for (k = 0, temp = 0; k &lt; template[i].np; k++) {</div><div class='add'>+				q = xbuf[IDX[k] &gt;&gt; PAGE_SHIFT] +</div><div class='add'>+				    offset_in_page(IDX[k]);</div><div class='add'>+</div><div class='add'>+				n = template[i].tap[k];</div><div class='add'>+				if (k == template[i].np - 1)</div><div class='add'>+					n += enc ? authsize : -authsize;</div><div class='add'>+</div><div class='add'>+				if (memcmp(q, template[i].result + temp, n)) {</div><div class='add'>+					printk(KERN_ERR "alg: aead: Chunk "</div><div class='add'>+					       "test %d failed on %s at page "</div><div class='add'>+					       "%u for %s\n", j, e, k, algo);</div><div class='add'>+					hexdump(q, n);</div><div class='add'>+					goto out;</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+				q += n;</div><div class='add'>+				if (k == template[i].np - 1 &amp;&amp; !enc) {</div><div class='add'>+					if (memcmp(q, template[i].input +</div><div class='add'>+						      temp + n, authsize))</div><div class='add'>+						n = authsize;</div><div class='add'>+					else</div><div class='add'>+						n = 0;</div><div class='add'>+				} else {</div><div class='add'>+					for (n = 0; offset_in_page(q + n) &amp;&amp;</div><div class='add'>+						    q[n]; n++)</div><div class='add'>+						;</div><div class='add'>+				}</div><div class='add'>+				if (n) {</div><div class='add'>+					printk(KERN_ERR "alg: aead: Result "</div><div class='add'>+					       "buffer corruption in chunk "</div><div class='add'>+					       "test %d on %s at page %u for "</div><div class='add'>+					       "%s: %u bytes:\n", j, e, k,</div><div class='add'>+					       algo, n);</div><div class='add'>+					hexdump(q, n);</div><div class='add'>+					goto out;</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+				temp += template[i].tap[k];</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = 0;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	aead_request_free(req);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int test_cipher(struct crypto_cipher *tfm, int enc,</div><div class='add'>+		       struct cipher_testvec *template, unsigned int tcount)</div><div class='add'>+{</div><div class='add'>+	const char *algo = crypto_tfm_alg_driver_name(crypto_cipher_tfm(tfm));</div><div class='add'>+	unsigned int i, j, k;</div><div class='add'>+	int ret;</div><div class='add'>+	char *q;</div><div class='add'>+	const char *e;</div><div class='add'>+	void *data;</div><div class='add'>+</div><div class='add'>+	if (enc == ENCRYPT)</div><div class='add'>+	        e = "encryption";</div><div class='add'>+	else</div><div class='add'>+		e = "decryption";</div><div class='add'>+</div><div class='add'>+	j = 0;</div><div class='add'>+	for (i = 0; i &lt; tcount; i++) {</div><div class='add'>+		if (template[i].np)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		j++;</div><div class='add'>+</div><div class='add'>+		data = xbuf[0];</div><div class='add'>+		memcpy(data, template[i].input, template[i].ilen);</div><div class='add'>+</div><div class='add'>+		crypto_cipher_clear_flags(tfm, ~0);</div><div class='add'>+		if (template[i].wk)</div><div class='add'>+			crypto_cipher_set_flags(tfm, CRYPTO_TFM_REQ_WEAK_KEY);</div><div class='add'>+</div><div class='add'>+		ret = crypto_cipher_setkey(tfm, template[i].key,</div><div class='add'>+					   template[i].klen);</div><div class='add'>+		if (!ret == template[i].fail) {</div><div class='add'>+			printk(KERN_ERR "alg: cipher: setkey failed "</div><div class='add'>+			       "on test %d for %s: flags=%x\n", j,</div><div class='add'>+			       algo, crypto_cipher_get_flags(tfm));</div><div class='add'>+			goto out;</div><div class='add'>+		} else if (ret)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		for (k = 0; k &lt; template[i].ilen;</div><div class='add'>+		     k += crypto_cipher_blocksize(tfm)) {</div><div class='add'>+			if (enc)</div><div class='add'>+				crypto_cipher_encrypt_one(tfm, data + k,</div><div class='add'>+							  data + k);</div><div class='add'>+			else</div><div class='add'>+				crypto_cipher_decrypt_one(tfm, data + k,</div><div class='add'>+							  data + k);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		q = data;</div><div class='add'>+		if (memcmp(q, template[i].result, template[i].rlen)) {</div><div class='add'>+			printk(KERN_ERR "alg: cipher: Test %d failed "</div><div class='add'>+			       "on %s for %s\n", j, e, algo);</div><div class='add'>+			hexdump(q, template[i].rlen);</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = 0;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int test_skcipher(struct crypto_ablkcipher *tfm, int enc,</div><div class='add'>+			 struct cipher_testvec *template, unsigned int tcount)</div><div class='add'>+{</div><div class='add'>+	const char *algo =</div><div class='add'>+		crypto_tfm_alg_driver_name(crypto_ablkcipher_tfm(tfm));</div><div class='add'>+	unsigned int i, j, k, n, temp;</div><div class='add'>+	int ret;</div><div class='add'>+	char *q;</div><div class='add'>+	struct ablkcipher_request *req;</div><div class='add'>+	struct scatterlist sg[8];</div><div class='add'>+	const char *e;</div><div class='add'>+	struct tcrypt_result result;</div><div class='add'>+	void *data;</div><div class='add'>+	char iv[MAX_IVLEN];</div><div class='add'>+</div><div class='add'>+	if (enc == ENCRYPT)</div><div class='add'>+	        e = "encryption";</div><div class='add'>+	else</div><div class='add'>+		e = "decryption";</div><div class='add'>+</div><div class='add'>+	init_completion(&amp;result.completion);</div><div class='add'>+</div><div class='add'>+	req = ablkcipher_request_alloc(tfm, GFP_KERNEL);</div><div class='add'>+	if (!req) {</div><div class='add'>+		printk(KERN_ERR "alg: skcipher: Failed to allocate request "</div><div class='add'>+		       "for %s\n", algo);</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ablkcipher_request_set_callback(req, CRYPTO_TFM_REQ_MAY_BACKLOG,</div><div class='add'>+					tcrypt_complete, &amp;result);</div><div class='add'>+</div><div class='add'>+	j = 0;</div><div class='add'>+	for (i = 0; i &lt; tcount; i++) {</div><div class='add'>+		if (template[i].iv)</div><div class='add'>+			memcpy(iv, template[i].iv, MAX_IVLEN);</div><div class='add'>+		else</div><div class='add'>+			memset(iv, 0, MAX_IVLEN);</div><div class='add'>+</div><div class='add'>+		if (!(template[i].np)) {</div><div class='add'>+			j++;</div><div class='add'>+</div><div class='add'>+			data = xbuf[0];</div><div class='add'>+			memcpy(data, template[i].input, template[i].ilen);</div><div class='add'>+</div><div class='add'>+			crypto_ablkcipher_clear_flags(tfm, ~0);</div><div class='add'>+			if (template[i].wk)</div><div class='add'>+				crypto_ablkcipher_set_flags(</div><div class='add'>+					tfm, CRYPTO_TFM_REQ_WEAK_KEY);</div><div class='add'>+</div><div class='add'>+			ret = crypto_ablkcipher_setkey(tfm, template[i].key,</div><div class='add'>+						       template[i].klen);</div><div class='add'>+			if (!ret == template[i].fail) {</div><div class='add'>+				printk(KERN_ERR "alg: skcipher: setkey failed "</div><div class='add'>+				       "on test %d for %s: flags=%x\n", j,</div><div class='add'>+				       algo, crypto_ablkcipher_get_flags(tfm));</div><div class='add'>+				goto out;</div><div class='add'>+			} else if (ret)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			sg_init_one(&amp;sg[0], data, template[i].ilen);</div><div class='add'>+</div><div class='add'>+			ablkcipher_request_set_crypt(req, sg, sg,</div><div class='add'>+						     template[i].ilen, iv);</div><div class='add'>+			ret = enc ?</div><div class='add'>+				crypto_ablkcipher_encrypt(req) :</div><div class='add'>+				crypto_ablkcipher_decrypt(req);</div><div class='add'>+</div><div class='add'>+			switch (ret) {</div><div class='add'>+			case 0:</div><div class='add'>+				break;</div><div class='add'>+			case -EINPROGRESS:</div><div class='add'>+			case -EBUSY:</div><div class='add'>+				ret = wait_for_completion_interruptible(</div><div class='add'>+					&amp;result.completion);</div><div class='add'>+				if (!ret &amp;&amp; !((ret = result.err))) {</div><div class='add'>+					INIT_COMPLETION(result.completion);</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+				/* fall through */</div><div class='add'>+			default:</div><div class='add'>+				printk(KERN_ERR "alg: skcipher: %s failed on "</div><div class='add'>+				       "test %d for %s: ret=%d\n", e, j, algo,</div><div class='add'>+				       -ret);</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			q = data;</div><div class='add'>+			if (memcmp(q, template[i].result, template[i].rlen)) {</div><div class='add'>+				printk(KERN_ERR "alg: skcipher: Test %d "</div><div class='add'>+				       "failed on %s for %s\n", j, e, algo);</div><div class='add'>+				hexdump(q, template[i].rlen);</div><div class='add'>+				ret = -EINVAL;</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	j = 0;</div><div class='add'>+	for (i = 0; i &lt; tcount; i++) {</div><div class='add'>+</div><div class='add'>+		if (template[i].iv)</div><div class='add'>+			memcpy(iv, template[i].iv, MAX_IVLEN);</div><div class='add'>+		else</div><div class='add'>+			memset(iv, 0, MAX_IVLEN);</div><div class='add'>+</div><div class='add'>+		if (template[i].np) {</div><div class='add'>+			j++;</div><div class='add'>+</div><div class='add'>+			crypto_ablkcipher_clear_flags(tfm, ~0);</div><div class='add'>+			if (template[i].wk)</div><div class='add'>+				crypto_ablkcipher_set_flags(</div><div class='add'>+					tfm, CRYPTO_TFM_REQ_WEAK_KEY);</div><div class='add'>+</div><div class='add'>+			ret = crypto_ablkcipher_setkey(tfm, template[i].key,</div><div class='add'>+						       template[i].klen);</div><div class='add'>+			if (!ret == template[i].fail) {</div><div class='add'>+				printk(KERN_ERR "alg: skcipher: setkey failed "</div><div class='add'>+				       "on chunk test %d for %s: flags=%x\n",</div><div class='add'>+				       j, algo,</div><div class='add'>+				       crypto_ablkcipher_get_flags(tfm));</div><div class='add'>+				goto out;</div><div class='add'>+			} else if (ret)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			temp = 0;</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			sg_init_table(sg, template[i].np);</div><div class='add'>+			for (k = 0; k &lt; template[i].np; k++) {</div><div class='add'>+				if (WARN_ON(offset_in_page(IDX[k]) +</div><div class='add'>+					    template[i].tap[k] &gt; PAGE_SIZE))</div><div class='add'>+					goto out;</div><div class='add'>+</div><div class='add'>+				q = xbuf[IDX[k] &gt;&gt; PAGE_SHIFT] +</div><div class='add'>+				    offset_in_page(IDX[k]);</div><div class='add'>+</div><div class='add'>+				memcpy(q, template[i].input + temp,</div><div class='add'>+				       template[i].tap[k]);</div><div class='add'>+</div><div class='add'>+				if (offset_in_page(q) + template[i].tap[k] &lt;</div><div class='add'>+				    PAGE_SIZE)</div><div class='add'>+					q[template[i].tap[k]] = 0;</div><div class='add'>+</div><div class='add'>+				sg_set_buf(&amp;sg[k], q, template[i].tap[k]);</div><div class='add'>+</div><div class='add'>+				temp += template[i].tap[k];</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			ablkcipher_request_set_crypt(req, sg, sg,</div><div class='add'>+					template[i].ilen, iv);</div><div class='add'>+</div><div class='add'>+			ret = enc ?</div><div class='add'>+				crypto_ablkcipher_encrypt(req) :</div><div class='add'>+				crypto_ablkcipher_decrypt(req);</div><div class='add'>+</div><div class='add'>+			switch (ret) {</div><div class='add'>+			case 0:</div><div class='add'>+				break;</div><div class='add'>+			case -EINPROGRESS:</div><div class='add'>+			case -EBUSY:</div><div class='add'>+				ret = wait_for_completion_interruptible(</div><div class='add'>+					&amp;result.completion);</div><div class='add'>+				if (!ret &amp;&amp; !((ret = result.err))) {</div><div class='add'>+					INIT_COMPLETION(result.completion);</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+				/* fall through */</div><div class='add'>+			default:</div><div class='add'>+				printk(KERN_ERR "alg: skcipher: %s failed on "</div><div class='add'>+				       "chunk test %d for %s: ret=%d\n", e, j,</div><div class='add'>+				       algo, -ret);</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			temp = 0;</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			for (k = 0; k &lt; template[i].np; k++) {</div><div class='add'>+				q = xbuf[IDX[k] &gt;&gt; PAGE_SHIFT] +</div><div class='add'>+				    offset_in_page(IDX[k]);</div><div class='add'>+</div><div class='add'>+				if (memcmp(q, template[i].result + temp,</div><div class='add'>+					   template[i].tap[k])) {</div><div class='add'>+					printk(KERN_ERR "alg: skcipher: Chunk "</div><div class='add'>+					       "test %d failed on %s at page "</div><div class='add'>+					       "%u for %s\n", j, e, k, algo);</div><div class='add'>+					hexdump(q, template[i].tap[k]);</div><div class='add'>+					goto out;</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+				q += template[i].tap[k];</div><div class='add'>+				for (n = 0; offset_in_page(q + n) &amp;&amp; q[n]; n++)</div><div class='add'>+					;</div><div class='add'>+				if (n) {</div><div class='add'>+					printk(KERN_ERR "alg: skcipher: "</div><div class='add'>+					       "Result buffer corruption in "</div><div class='add'>+					       "chunk test %d on %s at page "</div><div class='add'>+					       "%u for %s: %u bytes:\n", j, e,</div><div class='add'>+					       k, algo, n);</div><div class='add'>+					hexdump(q, n);</div><div class='add'>+					goto out;</div><div class='add'>+				}</div><div class='add'>+				temp += template[i].tap[k];</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = 0;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	ablkcipher_request_free(req);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int test_comp(struct crypto_comp *tfm, struct comp_testvec *ctemplate,</div><div class='add'>+		     struct comp_testvec *dtemplate, int ctcount, int dtcount)</div><div class='add'>+{</div><div class='add'>+	const char *algo = crypto_tfm_alg_driver_name(crypto_comp_tfm(tfm));</div><div class='add'>+	unsigned int i;</div><div class='add'>+	char result[COMP_BUF_SIZE];</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ctcount; i++) {</div><div class='add'>+		int ilen, dlen = COMP_BUF_SIZE;</div><div class='add'>+</div><div class='add'>+		memset(result, 0, sizeof (result));</div><div class='add'>+</div><div class='add'>+		ilen = ctemplate[i].inlen;</div><div class='add'>+		ret = crypto_comp_compress(tfm, ctemplate[i].input,</div><div class='add'>+		                           ilen, result, &amp;dlen);</div><div class='add'>+		if (ret) {</div><div class='add'>+			printk(KERN_ERR "alg: comp: compression failed "</div><div class='add'>+			       "on test %d for %s: ret=%d\n", i + 1, algo,</div><div class='add'>+			       -ret);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (memcmp(result, ctemplate[i].output, dlen)) {</div><div class='add'>+			printk(KERN_ERR "alg: comp: Compression test %d "</div><div class='add'>+			       "failed for %s\n", i + 1, algo);</div><div class='add'>+			hexdump(result, dlen);</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; dtcount; i++) {</div><div class='add'>+		int ilen, ret, dlen = COMP_BUF_SIZE;</div><div class='add'>+</div><div class='add'>+		memset(result, 0, sizeof (result));</div><div class='add'>+</div><div class='add'>+		ilen = dtemplate[i].inlen;</div><div class='add'>+		ret = crypto_comp_decompress(tfm, dtemplate[i].input,</div><div class='add'>+		                             ilen, result, &amp;dlen);</div><div class='add'>+		if (ret) {</div><div class='add'>+			printk(KERN_ERR "alg: comp: decompression failed "</div><div class='add'>+			       "on test %d for %s: ret=%d\n", i + 1, algo,</div><div class='add'>+			       -ret);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (memcmp(result, dtemplate[i].output, dlen)) {</div><div class='add'>+			printk(KERN_ERR "alg: comp: Decompression test %d "</div><div class='add'>+			       "failed for %s\n", i + 1, algo);</div><div class='add'>+			hexdump(result, dlen);</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = 0;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int alg_test_aead(const struct alg_test_desc *desc, const char *driver,</div><div class='add'>+			 u32 type, u32 mask)</div><div class='add'>+{</div><div class='add'>+	struct crypto_aead *tfm;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	tfm = crypto_alloc_aead(driver, type, mask);</div><div class='add'>+	if (IS_ERR(tfm)) {</div><div class='add'>+		printk(KERN_ERR "alg: aead: Failed to load transform for %s: "</div><div class='add'>+		       "%ld\n", driver, PTR_ERR(tfm));</div><div class='add'>+		return PTR_ERR(tfm);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (desc-&gt;suite.aead.enc.vecs) {</div><div class='add'>+		err = test_aead(tfm, ENCRYPT, desc-&gt;suite.aead.enc.vecs,</div><div class='add'>+				desc-&gt;suite.aead.enc.count);</div><div class='add'>+		if (err)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!err &amp;&amp; desc-&gt;suite.aead.dec.vecs)</div><div class='add'>+		err = test_aead(tfm, DECRYPT, desc-&gt;suite.aead.dec.vecs,</div><div class='add'>+				desc-&gt;suite.aead.dec.count);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	crypto_free_aead(tfm);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int alg_test_cipher(const struct alg_test_desc *desc,</div><div class='add'>+			   const char *driver, u32 type, u32 mask)</div><div class='add'>+{</div><div class='add'>+	struct crypto_cipher *tfm;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	tfm = crypto_alloc_cipher(driver, type, mask);</div><div class='add'>+	if (IS_ERR(tfm)) {</div><div class='add'>+		printk(KERN_ERR "alg: cipher: Failed to load transform for "</div><div class='add'>+		       "%s: %ld\n", driver, PTR_ERR(tfm));</div><div class='add'>+		return PTR_ERR(tfm);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (desc-&gt;suite.cipher.enc.vecs) {</div><div class='add'>+		err = test_cipher(tfm, ENCRYPT, desc-&gt;suite.cipher.enc.vecs,</div><div class='add'>+				  desc-&gt;suite.cipher.enc.count);</div><div class='add'>+		if (err)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (desc-&gt;suite.cipher.dec.vecs)</div><div class='add'>+		err = test_cipher(tfm, DECRYPT, desc-&gt;suite.cipher.dec.vecs,</div><div class='add'>+				  desc-&gt;suite.cipher.dec.count);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	crypto_free_cipher(tfm);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int alg_test_skcipher(const struct alg_test_desc *desc,</div><div class='add'>+			     const char *driver, u32 type, u32 mask)</div><div class='add'>+{</div><div class='add'>+	struct crypto_ablkcipher *tfm;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	tfm = crypto_alloc_ablkcipher(driver, type, mask);</div><div class='add'>+	if (IS_ERR(tfm)) {</div><div class='add'>+		printk(KERN_ERR "alg: skcipher: Failed to load transform for "</div><div class='add'>+		       "%s: %ld\n", driver, PTR_ERR(tfm));</div><div class='add'>+		return PTR_ERR(tfm);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (desc-&gt;suite.cipher.enc.vecs) {</div><div class='add'>+		err = test_skcipher(tfm, ENCRYPT, desc-&gt;suite.cipher.enc.vecs,</div><div class='add'>+				    desc-&gt;suite.cipher.enc.count);</div><div class='add'>+		if (err)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (desc-&gt;suite.cipher.dec.vecs)</div><div class='add'>+		err = test_skcipher(tfm, DECRYPT, desc-&gt;suite.cipher.dec.vecs,</div><div class='add'>+				    desc-&gt;suite.cipher.dec.count);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	crypto_free_ablkcipher(tfm);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int alg_test_comp(const struct alg_test_desc *desc, const char *driver,</div><div class='add'>+			 u32 type, u32 mask)</div><div class='add'>+{</div><div class='add'>+	struct crypto_comp *tfm;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	tfm = crypto_alloc_comp(driver, type, mask);</div><div class='add'>+	if (IS_ERR(tfm)) {</div><div class='add'>+		printk(KERN_ERR "alg: comp: Failed to load transform for %s: "</div><div class='add'>+		       "%ld\n", driver, PTR_ERR(tfm));</div><div class='add'>+		return PTR_ERR(tfm);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = test_comp(tfm, desc-&gt;suite.comp.comp.vecs,</div><div class='add'>+			desc-&gt;suite.comp.decomp.vecs,</div><div class='add'>+			desc-&gt;suite.comp.comp.count,</div><div class='add'>+			desc-&gt;suite.comp.decomp.count);</div><div class='add'>+</div><div class='add'>+	crypto_free_comp(tfm);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int alg_test_hash(const struct alg_test_desc *desc, const char *driver,</div><div class='add'>+			 u32 type, u32 mask)</div><div class='add'>+{</div><div class='add'>+	struct crypto_ahash *tfm;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	tfm = crypto_alloc_ahash(driver, type, mask);</div><div class='add'>+	if (IS_ERR(tfm)) {</div><div class='add'>+		printk(KERN_ERR "alg: hash: Failed to load transform for %s: "</div><div class='add'>+		       "%ld\n", driver, PTR_ERR(tfm));</div><div class='add'>+		return PTR_ERR(tfm);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = test_hash(tfm, desc-&gt;suite.hash.vecs, desc-&gt;suite.hash.count);</div><div class='add'>+</div><div class='add'>+	crypto_free_ahash(tfm);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Please keep this list sorted by algorithm name. */</div><div class='add'>+static const struct alg_test_desc alg_test_descs[] = {</div><div class='add'>+	{</div><div class='add'>+		.alg = "cbc(aes)",</div><div class='add'>+		.test = alg_test_skcipher,</div><div class='add'>+		.suite = {</div><div class='add'>+			.cipher = {</div><div class='add'>+				.enc = {</div><div class='add'>+					.vecs = aes_cbc_enc_tv_template,</div><div class='add'>+					.count = AES_CBC_ENC_TEST_VECTORS</div><div class='add'>+				},</div><div class='add'>+				.dec = {</div><div class='add'>+					.vecs = aes_cbc_dec_tv_template,</div><div class='add'>+					.count = AES_CBC_DEC_TEST_VECTORS</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}, {</div><div class='add'>+		.alg = "cbc(anubis)",</div><div class='add'>+		.test = alg_test_skcipher,</div><div class='add'>+		.suite = {</div><div class='add'>+			.cipher = {</div><div class='add'>+				.enc = {</div><div class='add'>+					.vecs = anubis_cbc_enc_tv_template,</div><div class='add'>+					.count = ANUBIS_CBC_ENC_TEST_VECTORS</div><div class='add'>+				},</div><div class='add'>+				.dec = {</div><div class='add'>+					.vecs = anubis_cbc_dec_tv_template,</div><div class='add'>+					.count = ANUBIS_CBC_DEC_TEST_VECTORS</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}, {</div><div class='add'>+		.alg = "cbc(blowfish)",</div><div class='add'>+		.test = alg_test_skcipher,</div><div class='add'>+		.suite = {</div><div class='add'>+			.cipher = {</div><div class='add'>+				.enc = {</div><div class='add'>+					.vecs = bf_cbc_enc_tv_template,</div><div class='add'>+					.count = BF_CBC_ENC_TEST_VECTORS</div><div class='add'>+				},</div><div class='add'>+				.dec = {</div><div class='add'>+					.vecs = bf_cbc_dec_tv_template,</div><div class='add'>+					.count = BF_CBC_DEC_TEST_VECTORS</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}, {</div><div class='add'>+		.alg = "cbc(camellia)",</div><div class='add'>+		.test = alg_test_skcipher,</div><div class='add'>+		.suite = {</div><div class='add'>+			.cipher = {</div><div class='add'>+				.enc = {</div><div class='add'>+					.vecs = camellia_cbc_enc_tv_template,</div><div class='add'>+					.count = CAMELLIA_CBC_ENC_TEST_VECTORS</div><div class='add'>+				},</div><div class='add'>+				.dec = {</div><div class='add'>+					.vecs = camellia_cbc_dec_tv_template,</div><div class='add'>+					.count = CAMELLIA_CBC_DEC_TEST_VECTORS</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}, {</div><div class='add'>+		.alg = "cbc(des)",</div><div class='add'>+		.test = alg_test_skcipher,</div><div class='add'>+		.suite = {</div><div class='add'>+			.cipher = {</div><div class='add'>+				.enc = {</div><div class='add'>+					.vecs = des_cbc_enc_tv_template,</div><div class='add'>+					.count = DES_CBC_ENC_TEST_VECTORS</div><div class='add'>+				},</div><div class='add'>+				.dec = {</div><div class='add'>+					.vecs = des_cbc_dec_tv_template,</div><div class='add'>+					.count = DES_CBC_DEC_TEST_VECTORS</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}, {</div><div class='add'>+		.alg = "cbc(des3_ede)",</div><div class='add'>+		.test = alg_test_skcipher,</div><div class='add'>+		.suite = {</div><div class='add'>+			.cipher = {</div><div class='add'>+				.enc = {</div><div class='add'>+					.vecs = des3_ede_cbc_enc_tv_template,</div><div class='add'>+					.count = DES3_EDE_CBC_ENC_TEST_VECTORS</div><div class='add'>+				},</div><div class='add'>+				.dec = {</div><div class='add'>+					.vecs = des3_ede_cbc_dec_tv_template,</div><div class='add'>+					.count = DES3_EDE_CBC_DEC_TEST_VECTORS</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}, {</div><div class='add'>+		.alg = "cbc(twofish)",</div><div class='add'>+		.test = alg_test_skcipher,</div><div class='add'>+		.suite = {</div><div class='add'>+			.cipher = {</div><div class='add'>+				.enc = {</div><div class='add'>+					.vecs = tf_cbc_enc_tv_template,</div><div class='add'>+					.count = TF_CBC_ENC_TEST_VECTORS</div><div class='add'>+				},</div><div class='add'>+				.dec = {</div><div class='add'>+					.vecs = tf_cbc_dec_tv_template,</div><div class='add'>+					.count = TF_CBC_DEC_TEST_VECTORS</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}, {</div><div class='add'>+		.alg = "ccm(aes)",</div><div class='add'>+		.test = alg_test_aead,</div><div class='add'>+		.suite = {</div><div class='add'>+			.aead = {</div><div class='add'>+				.enc = {</div><div class='add'>+					.vecs = aes_ccm_enc_tv_template,</div><div class='add'>+					.count = AES_CCM_ENC_TEST_VECTORS</div><div class='add'>+				},</div><div class='add'>+				.dec = {</div><div class='add'>+					.vecs = aes_ccm_dec_tv_template,</div><div class='add'>+					.count = AES_CCM_DEC_TEST_VECTORS</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}, {</div><div class='add'>+		.alg = "crc32c",</div><div class='add'>+		.test = alg_test_hash,</div><div class='add'>+		.suite = {</div><div class='add'>+			.hash = {</div><div class='add'>+				.vecs = crc32c_tv_template,</div><div class='add'>+				.count = CRC32C_TEST_VECTORS</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}, {</div><div class='add'>+		.alg = "cts(cbc(aes))",</div><div class='add'>+		.test = alg_test_skcipher,</div><div class='add'>+		.suite = {</div><div class='add'>+			.cipher = {</div><div class='add'>+				.enc = {</div><div class='add'>+					.vecs = cts_mode_enc_tv_template,</div><div class='add'>+					.count = CTS_MODE_ENC_TEST_VECTORS</div><div class='add'>+				},</div><div class='add'>+				.dec = {</div><div class='add'>+					.vecs = cts_mode_dec_tv_template,</div><div class='add'>+					.count = CTS_MODE_DEC_TEST_VECTORS</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}, {</div><div class='add'>+		.alg = "deflate",</div><div class='add'>+		.test = alg_test_comp,</div><div class='add'>+		.suite = {</div><div class='add'>+			.comp = {</div><div class='add'>+				.comp = {</div><div class='add'>+					.vecs = deflate_comp_tv_template,</div><div class='add'>+					.count = DEFLATE_COMP_TEST_VECTORS</div><div class='add'>+				},</div><div class='add'>+				.decomp = {</div><div class='add'>+					.vecs = deflate_decomp_tv_template,</div><div class='add'>+					.count = DEFLATE_DECOMP_TEST_VECTORS</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}, {</div><div class='add'>+		.alg = "ecb(aes)",</div><div class='add'>+		.test = alg_test_skcipher,</div><div class='add'>+		.suite = {</div><div class='add'>+			.cipher = {</div><div class='add'>+				.enc = {</div><div class='add'>+					.vecs = aes_enc_tv_template,</div><div class='add'>+					.count = AES_ENC_TEST_VECTORS</div><div class='add'>+				},</div><div class='add'>+				.dec = {</div><div class='add'>+					.vecs = aes_dec_tv_template,</div><div class='add'>+					.count = AES_DEC_TEST_VECTORS</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}, {</div><div class='add'>+		.alg = "ecb(anubis)",</div><div class='add'>+		.test = alg_test_skcipher,</div><div class='add'>+		.suite = {</div><div class='add'>+			.cipher = {</div><div class='add'>+				.enc = {</div><div class='add'>+					.vecs = anubis_enc_tv_template,</div><div class='add'>+					.count = ANUBIS_ENC_TEST_VECTORS</div><div class='add'>+				},</div><div class='add'>+				.dec = {</div><div class='add'>+					.vecs = anubis_dec_tv_template,</div><div class='add'>+					.count = ANUBIS_DEC_TEST_VECTORS</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}, {</div><div class='add'>+		.alg = "ecb(arc4)",</div><div class='add'>+		.test = alg_test_skcipher,</div><div class='add'>+		.suite = {</div><div class='add'>+			.cipher = {</div><div class='add'>+				.enc = {</div><div class='add'>+					.vecs = arc4_enc_tv_template,</div><div class='add'>+					.count = ARC4_ENC_TEST_VECTORS</div><div class='add'>+				},</div><div class='add'>+				.dec = {</div><div class='add'>+					.vecs = arc4_dec_tv_template,</div><div class='add'>+					.count = ARC4_DEC_TEST_VECTORS</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}, {</div><div class='add'>+		.alg = "ecb(blowfish)",</div><div class='add'>+		.test = alg_test_skcipher,</div><div class='add'>+		.suite = {</div><div class='add'>+			.cipher = {</div><div class='add'>+				.enc = {</div><div class='add'>+					.vecs = bf_enc_tv_template,</div><div class='add'>+					.count = BF_ENC_TEST_VECTORS</div><div class='add'>+				},</div><div class='add'>+				.dec = {</div><div class='add'>+					.vecs = bf_dec_tv_template,</div><div class='add'>+					.count = BF_DEC_TEST_VECTORS</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}, {</div><div class='add'>+		.alg = "ecb(camellia)",</div><div class='add'>+		.test = alg_test_skcipher,</div><div class='add'>+		.suite = {</div><div class='add'>+			.cipher = {</div><div class='add'>+				.enc = {</div><div class='add'>+					.vecs = camellia_enc_tv_template,</div><div class='add'>+					.count = CAMELLIA_ENC_TEST_VECTORS</div><div class='add'>+				},</div><div class='add'>+				.dec = {</div><div class='add'>+					.vecs = camellia_dec_tv_template,</div><div class='add'>+					.count = CAMELLIA_DEC_TEST_VECTORS</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}, {</div><div class='add'>+		.alg = "ecb(cast5)",</div><div class='add'>+		.test = alg_test_skcipher,</div><div class='add'>+		.suite = {</div><div class='add'>+			.cipher = {</div><div class='add'>+				.enc = {</div><div class='add'>+					.vecs = cast5_enc_tv_template,</div><div class='add'>+					.count = CAST5_ENC_TEST_VECTORS</div><div class='add'>+				},</div><div class='add'>+				.dec = {</div><div class='add'>+					.vecs = cast5_dec_tv_template,</div><div class='add'>+					.count = CAST5_DEC_TEST_VECTORS</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}, {</div><div class='add'>+		.alg = "ecb(cast6)",</div><div class='add'>+		.test = alg_test_skcipher,</div><div class='add'>+		.suite = {</div><div class='add'>+			.cipher = {</div><div class='add'>+				.enc = {</div><div class='add'>+					.vecs = cast6_enc_tv_template,</div><div class='add'>+					.count = CAST6_ENC_TEST_VECTORS</div><div class='add'>+				},</div><div class='add'>+				.dec = {</div><div class='add'>+					.vecs = cast6_dec_tv_template,</div><div class='add'>+					.count = CAST6_DEC_TEST_VECTORS</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}, {</div><div class='add'>+		.alg = "ecb(des)",</div><div class='add'>+		.test = alg_test_skcipher,</div><div class='add'>+		.suite = {</div><div class='add'>+			.cipher = {</div><div class='add'>+				.enc = {</div><div class='add'>+					.vecs = des_enc_tv_template,</div><div class='add'>+					.count = DES_ENC_TEST_VECTORS</div><div class='add'>+				},</div><div class='add'>+				.dec = {</div><div class='add'>+					.vecs = des_dec_tv_template,</div><div class='add'>+					.count = DES_DEC_TEST_VECTORS</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}, {</div><div class='add'>+		.alg = "ecb(des3_ede)",</div><div class='add'>+		.test = alg_test_skcipher,</div><div class='add'>+		.suite = {</div><div class='add'>+			.cipher = {</div><div class='add'>+				.enc = {</div><div class='add'>+					.vecs = des3_ede_enc_tv_template,</div><div class='add'>+					.count = DES3_EDE_ENC_TEST_VECTORS</div><div class='add'>+				},</div><div class='add'>+				.dec = {</div><div class='add'>+					.vecs = des3_ede_dec_tv_template,</div><div class='add'>+					.count = DES3_EDE_DEC_TEST_VECTORS</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}, {</div><div class='add'>+		.alg = "ecb(khazad)",</div><div class='add'>+		.test = alg_test_skcipher,</div><div class='add'>+		.suite = {</div><div class='add'>+			.cipher = {</div><div class='add'>+				.enc = {</div><div class='add'>+					.vecs = khazad_enc_tv_template,</div><div class='add'>+					.count = KHAZAD_ENC_TEST_VECTORS</div><div class='add'>+				},</div><div class='add'>+				.dec = {</div><div class='add'>+					.vecs = khazad_dec_tv_template,</div><div class='add'>+					.count = KHAZAD_DEC_TEST_VECTORS</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}, {</div><div class='add'>+		.alg = "ecb(seed)",</div><div class='add'>+		.test = alg_test_skcipher,</div><div class='add'>+		.suite = {</div><div class='add'>+			.cipher = {</div><div class='add'>+				.enc = {</div><div class='add'>+					.vecs = seed_enc_tv_template,</div><div class='add'>+					.count = SEED_ENC_TEST_VECTORS</div><div class='add'>+				},</div><div class='add'>+				.dec = {</div><div class='add'>+					.vecs = seed_dec_tv_template,</div><div class='add'>+					.count = SEED_DEC_TEST_VECTORS</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}, {</div><div class='add'>+		.alg = "ecb(serpent)",</div><div class='add'>+		.test = alg_test_skcipher,</div><div class='add'>+		.suite = {</div><div class='add'>+			.cipher = {</div><div class='add'>+				.enc = {</div><div class='add'>+					.vecs = serpent_enc_tv_template,</div><div class='add'>+					.count = SERPENT_ENC_TEST_VECTORS</div><div class='add'>+				},</div><div class='add'>+				.dec = {</div><div class='add'>+					.vecs = serpent_dec_tv_template,</div><div class='add'>+					.count = SERPENT_DEC_TEST_VECTORS</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}, {</div><div class='add'>+		.alg = "ecb(tea)",</div><div class='add'>+		.test = alg_test_skcipher,</div><div class='add'>+		.suite = {</div><div class='add'>+			.cipher = {</div><div class='add'>+				.enc = {</div><div class='add'>+					.vecs = tea_enc_tv_template,</div><div class='add'>+					.count = TEA_ENC_TEST_VECTORS</div><div class='add'>+				},</div><div class='add'>+				.dec = {</div><div class='add'>+					.vecs = tea_dec_tv_template,</div><div class='add'>+					.count = TEA_DEC_TEST_VECTORS</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}, {</div><div class='add'>+		.alg = "ecb(tnepres)",</div><div class='add'>+		.test = alg_test_skcipher,</div><div class='add'>+		.suite = {</div><div class='add'>+			.cipher = {</div><div class='add'>+				.enc = {</div><div class='add'>+					.vecs = tnepres_enc_tv_template,</div><div class='add'>+					.count = TNEPRES_ENC_TEST_VECTORS</div><div class='add'>+				},</div><div class='add'>+				.dec = {</div><div class='add'>+					.vecs = tnepres_dec_tv_template,</div><div class='add'>+					.count = TNEPRES_DEC_TEST_VECTORS</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}, {</div><div class='add'>+		.alg = "ecb(twofish)",</div><div class='add'>+		.test = alg_test_skcipher,</div><div class='add'>+		.suite = {</div><div class='add'>+			.cipher = {</div><div class='add'>+				.enc = {</div><div class='add'>+					.vecs = tf_enc_tv_template,</div><div class='add'>+					.count = TF_ENC_TEST_VECTORS</div><div class='add'>+				},</div><div class='add'>+				.dec = {</div><div class='add'>+					.vecs = tf_dec_tv_template,</div><div class='add'>+					.count = TF_DEC_TEST_VECTORS</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}, {</div><div class='add'>+		.alg = "ecb(xeta)",</div><div class='add'>+		.test = alg_test_skcipher,</div><div class='add'>+		.suite = {</div><div class='add'>+			.cipher = {</div><div class='add'>+				.enc = {</div><div class='add'>+					.vecs = xeta_enc_tv_template,</div><div class='add'>+					.count = XETA_ENC_TEST_VECTORS</div><div class='add'>+				},</div><div class='add'>+				.dec = {</div><div class='add'>+					.vecs = xeta_dec_tv_template,</div><div class='add'>+					.count = XETA_DEC_TEST_VECTORS</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}, {</div><div class='add'>+		.alg = "ecb(xtea)",</div><div class='add'>+		.test = alg_test_skcipher,</div><div class='add'>+		.suite = {</div><div class='add'>+			.cipher = {</div><div class='add'>+				.enc = {</div><div class='add'>+					.vecs = xtea_enc_tv_template,</div><div class='add'>+					.count = XTEA_ENC_TEST_VECTORS</div><div class='add'>+				},</div><div class='add'>+				.dec = {</div><div class='add'>+					.vecs = xtea_dec_tv_template,</div><div class='add'>+					.count = XTEA_DEC_TEST_VECTORS</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}, {</div><div class='add'>+		.alg = "gcm(aes)",</div><div class='add'>+		.test = alg_test_aead,</div><div class='add'>+		.suite = {</div><div class='add'>+			.aead = {</div><div class='add'>+				.enc = {</div><div class='add'>+					.vecs = aes_gcm_enc_tv_template,</div><div class='add'>+					.count = AES_GCM_ENC_TEST_VECTORS</div><div class='add'>+				},</div><div class='add'>+				.dec = {</div><div class='add'>+					.vecs = aes_gcm_dec_tv_template,</div><div class='add'>+					.count = AES_GCM_DEC_TEST_VECTORS</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}, {</div><div class='add'>+		.alg = "hmac(md5)",</div><div class='add'>+		.test = alg_test_hash,</div><div class='add'>+		.suite = {</div><div class='add'>+			.hash = {</div><div class='add'>+				.vecs = hmac_md5_tv_template,</div><div class='add'>+				.count = HMAC_MD5_TEST_VECTORS</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}, {</div><div class='add'>+		.alg = "hmac(rmd128)",</div><div class='add'>+		.test = alg_test_hash,</div><div class='add'>+		.suite = {</div><div class='add'>+			.hash = {</div><div class='add'>+				.vecs = hmac_rmd128_tv_template,</div><div class='add'>+				.count = HMAC_RMD128_TEST_VECTORS</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}, {</div><div class='add'>+		.alg = "hmac(rmd160)",</div><div class='add'>+		.test = alg_test_hash,</div><div class='add'>+		.suite = {</div><div class='add'>+			.hash = {</div><div class='add'>+				.vecs = hmac_rmd160_tv_template,</div><div class='add'>+				.count = HMAC_RMD160_TEST_VECTORS</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}, {</div><div class='add'>+		.alg = "hmac(sha1)",</div><div class='add'>+		.test = alg_test_hash,</div><div class='add'>+		.suite = {</div><div class='add'>+			.hash = {</div><div class='add'>+				.vecs = hmac_sha1_tv_template,</div><div class='add'>+				.count = HMAC_SHA1_TEST_VECTORS</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}, {</div><div class='add'>+		.alg = "hmac(sha224)",</div><div class='add'>+		.test = alg_test_hash,</div><div class='add'>+		.suite = {</div><div class='add'>+			.hash = {</div><div class='add'>+				.vecs = hmac_sha224_tv_template,</div><div class='add'>+				.count = HMAC_SHA224_TEST_VECTORS</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}, {</div><div class='add'>+		.alg = "hmac(sha256)",</div><div class='add'>+		.test = alg_test_hash,</div><div class='add'>+		.suite = {</div><div class='add'>+			.hash = {</div><div class='add'>+				.vecs = hmac_sha256_tv_template,</div><div class='add'>+				.count = HMAC_SHA256_TEST_VECTORS</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}, {</div><div class='add'>+		.alg = "hmac(sha384)",</div><div class='add'>+		.test = alg_test_hash,</div><div class='add'>+		.suite = {</div><div class='add'>+			.hash = {</div><div class='add'>+				.vecs = hmac_sha384_tv_template,</div><div class='add'>+				.count = HMAC_SHA384_TEST_VECTORS</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}, {</div><div class='add'>+		.alg = "hmac(sha512)",</div><div class='add'>+		.test = alg_test_hash,</div><div class='add'>+		.suite = {</div><div class='add'>+			.hash = {</div><div class='add'>+				.vecs = hmac_sha512_tv_template,</div><div class='add'>+				.count = HMAC_SHA512_TEST_VECTORS</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}, {</div><div class='add'>+		.alg = "lrw(aes)",</div><div class='add'>+		.test = alg_test_skcipher,</div><div class='add'>+		.suite = {</div><div class='add'>+			.cipher = {</div><div class='add'>+				.enc = {</div><div class='add'>+					.vecs = aes_lrw_enc_tv_template,</div><div class='add'>+					.count = AES_LRW_ENC_TEST_VECTORS</div><div class='add'>+				},</div><div class='add'>+				.dec = {</div><div class='add'>+					.vecs = aes_lrw_dec_tv_template,</div><div class='add'>+					.count = AES_LRW_DEC_TEST_VECTORS</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}, {</div><div class='add'>+		.alg = "lzo",</div><div class='add'>+		.test = alg_test_comp,</div><div class='add'>+		.suite = {</div><div class='add'>+			.comp = {</div><div class='add'>+				.comp = {</div><div class='add'>+					.vecs = lzo_comp_tv_template,</div><div class='add'>+					.count = LZO_COMP_TEST_VECTORS</div><div class='add'>+				},</div><div class='add'>+				.decomp = {</div><div class='add'>+					.vecs = lzo_decomp_tv_template,</div><div class='add'>+					.count = LZO_DECOMP_TEST_VECTORS</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}, {</div><div class='add'>+		.alg = "md4",</div><div class='add'>+		.test = alg_test_hash,</div><div class='add'>+		.suite = {</div><div class='add'>+			.hash = {</div><div class='add'>+				.vecs = md4_tv_template,</div><div class='add'>+				.count = MD4_TEST_VECTORS</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}, {</div><div class='add'>+		.alg = "md5",</div><div class='add'>+		.test = alg_test_hash,</div><div class='add'>+		.suite = {</div><div class='add'>+			.hash = {</div><div class='add'>+				.vecs = md5_tv_template,</div><div class='add'>+				.count = MD5_TEST_VECTORS</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}, {</div><div class='add'>+		.alg = "michael_mic",</div><div class='add'>+		.test = alg_test_hash,</div><div class='add'>+		.suite = {</div><div class='add'>+			.hash = {</div><div class='add'>+				.vecs = michael_mic_tv_template,</div><div class='add'>+				.count = MICHAEL_MIC_TEST_VECTORS</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}, {</div><div class='add'>+		.alg = "pcbc(fcrypt)",</div><div class='add'>+		.test = alg_test_skcipher,</div><div class='add'>+		.suite = {</div><div class='add'>+			.cipher = {</div><div class='add'>+				.enc = {</div><div class='add'>+					.vecs = fcrypt_pcbc_enc_tv_template,</div><div class='add'>+					.count = FCRYPT_ENC_TEST_VECTORS</div><div class='add'>+				},</div><div class='add'>+				.dec = {</div><div class='add'>+					.vecs = fcrypt_pcbc_dec_tv_template,</div><div class='add'>+					.count = FCRYPT_DEC_TEST_VECTORS</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}, {</div><div class='add'>+		.alg = "rfc3686(ctr(aes))",</div><div class='add'>+		.test = alg_test_skcipher,</div><div class='add'>+		.suite = {</div><div class='add'>+			.cipher = {</div><div class='add'>+				.enc = {</div><div class='add'>+					.vecs = aes_ctr_enc_tv_template,</div><div class='add'>+					.count = AES_CTR_ENC_TEST_VECTORS</div><div class='add'>+				},</div><div class='add'>+				.dec = {</div><div class='add'>+					.vecs = aes_ctr_dec_tv_template,</div><div class='add'>+					.count = AES_CTR_DEC_TEST_VECTORS</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}, {</div><div class='add'>+		.alg = "rmd128",</div><div class='add'>+		.test = alg_test_hash,</div><div class='add'>+		.suite = {</div><div class='add'>+			.hash = {</div><div class='add'>+				.vecs = rmd128_tv_template,</div><div class='add'>+				.count = RMD128_TEST_VECTORS</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}, {</div><div class='add'>+		.alg = "rmd160",</div><div class='add'>+		.test = alg_test_hash,</div><div class='add'>+		.suite = {</div><div class='add'>+			.hash = {</div><div class='add'>+				.vecs = rmd160_tv_template,</div><div class='add'>+				.count = RMD160_TEST_VECTORS</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}, {</div><div class='add'>+		.alg = "rmd256",</div><div class='add'>+		.test = alg_test_hash,</div><div class='add'>+		.suite = {</div><div class='add'>+			.hash = {</div><div class='add'>+				.vecs = rmd256_tv_template,</div><div class='add'>+				.count = RMD256_TEST_VECTORS</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}, {</div><div class='add'>+		.alg = "rmd320",</div><div class='add'>+		.test = alg_test_hash,</div><div class='add'>+		.suite = {</div><div class='add'>+			.hash = {</div><div class='add'>+				.vecs = rmd320_tv_template,</div><div class='add'>+				.count = RMD320_TEST_VECTORS</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}, {</div><div class='add'>+		.alg = "salsa20",</div><div class='add'>+		.test = alg_test_skcipher,</div><div class='add'>+		.suite = {</div><div class='add'>+			.cipher = {</div><div class='add'>+				.enc = {</div><div class='add'>+					.vecs = salsa20_stream_enc_tv_template,</div><div class='add'>+					.count = SALSA20_STREAM_ENC_TEST_VECTORS</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}, {</div><div class='add'>+		.alg = "sha1",</div><div class='add'>+		.test = alg_test_hash,</div><div class='add'>+		.suite = {</div><div class='add'>+			.hash = {</div><div class='add'>+				.vecs = sha1_tv_template,</div><div class='add'>+				.count = SHA1_TEST_VECTORS</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}, {</div><div class='add'>+		.alg = "sha224",</div><div class='add'>+		.test = alg_test_hash,</div><div class='add'>+		.suite = {</div><div class='add'>+			.hash = {</div><div class='add'>+				.vecs = sha224_tv_template,</div><div class='add'>+				.count = SHA224_TEST_VECTORS</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}, {</div><div class='add'>+		.alg = "sha256",</div><div class='add'>+		.test = alg_test_hash,</div><div class='add'>+		.suite = {</div><div class='add'>+			.hash = {</div><div class='add'>+				.vecs = sha256_tv_template,</div><div class='add'>+				.count = SHA256_TEST_VECTORS</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}, {</div><div class='add'>+		.alg = "sha384",</div><div class='add'>+		.test = alg_test_hash,</div><div class='add'>+		.suite = {</div><div class='add'>+			.hash = {</div><div class='add'>+				.vecs = sha384_tv_template,</div><div class='add'>+				.count = SHA384_TEST_VECTORS</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}, {</div><div class='add'>+		.alg = "sha512",</div><div class='add'>+		.test = alg_test_hash,</div><div class='add'>+		.suite = {</div><div class='add'>+			.hash = {</div><div class='add'>+				.vecs = sha512_tv_template,</div><div class='add'>+				.count = SHA512_TEST_VECTORS</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}, {</div><div class='add'>+		.alg = "tgr128",</div><div class='add'>+		.test = alg_test_hash,</div><div class='add'>+		.suite = {</div><div class='add'>+			.hash = {</div><div class='add'>+				.vecs = tgr128_tv_template,</div><div class='add'>+				.count = TGR128_TEST_VECTORS</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}, {</div><div class='add'>+		.alg = "tgr160",</div><div class='add'>+		.test = alg_test_hash,</div><div class='add'>+		.suite = {</div><div class='add'>+			.hash = {</div><div class='add'>+				.vecs = tgr160_tv_template,</div><div class='add'>+				.count = TGR160_TEST_VECTORS</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}, {</div><div class='add'>+		.alg = "tgr192",</div><div class='add'>+		.test = alg_test_hash,</div><div class='add'>+		.suite = {</div><div class='add'>+			.hash = {</div><div class='add'>+				.vecs = tgr192_tv_template,</div><div class='add'>+				.count = TGR192_TEST_VECTORS</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}, {</div><div class='add'>+		.alg = "wp256",</div><div class='add'>+		.test = alg_test_hash,</div><div class='add'>+		.suite = {</div><div class='add'>+			.hash = {</div><div class='add'>+				.vecs = wp256_tv_template,</div><div class='add'>+				.count = WP256_TEST_VECTORS</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}, {</div><div class='add'>+		.alg = "wp384",</div><div class='add'>+		.test = alg_test_hash,</div><div class='add'>+		.suite = {</div><div class='add'>+			.hash = {</div><div class='add'>+				.vecs = wp384_tv_template,</div><div class='add'>+				.count = WP384_TEST_VECTORS</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}, {</div><div class='add'>+		.alg = "wp512",</div><div class='add'>+		.test = alg_test_hash,</div><div class='add'>+		.suite = {</div><div class='add'>+			.hash = {</div><div class='add'>+				.vecs = wp512_tv_template,</div><div class='add'>+				.count = WP512_TEST_VECTORS</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}, {</div><div class='add'>+		.alg = "xcbc(aes)",</div><div class='add'>+		.test = alg_test_hash,</div><div class='add'>+		.suite = {</div><div class='add'>+			.hash = {</div><div class='add'>+				.vecs = aes_xcbc128_tv_template,</div><div class='add'>+				.count = XCBC_AES_TEST_VECTORS</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}, {</div><div class='add'>+		.alg = "xts(aes)",</div><div class='add'>+		.test = alg_test_skcipher,</div><div class='add'>+		.suite = {</div><div class='add'>+			.cipher = {</div><div class='add'>+				.enc = {</div><div class='add'>+					.vecs = aes_xts_enc_tv_template,</div><div class='add'>+					.count = AES_XTS_ENC_TEST_VECTORS</div><div class='add'>+				},</div><div class='add'>+				.dec = {</div><div class='add'>+					.vecs = aes_xts_dec_tv_template,</div><div class='add'>+					.count = AES_XTS_DEC_TEST_VECTORS</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int alg_find_test(const char *alg)</div><div class='add'>+{</div><div class='add'>+	int start = 0;</div><div class='add'>+	int end = ARRAY_SIZE(alg_test_descs);</div><div class='add'>+</div><div class='add'>+	while (start &lt; end) {</div><div class='add'>+		int i = (start + end) / 2;</div><div class='add'>+		int diff = strcmp(alg_test_descs[i].alg, alg);</div><div class='add'>+</div><div class='add'>+		if (diff &gt; 0) {</div><div class='add'>+			end = i;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (diff &lt; 0) {</div><div class='add'>+			start = i + 1;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		return i;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int alg_test(const char *driver, const char *alg, u32 type, u32 mask)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if ((type &amp; CRYPTO_ALG_TYPE_MASK) == CRYPTO_ALG_TYPE_CIPHER) {</div><div class='add'>+		char nalg[CRYPTO_MAX_ALG_NAME];</div><div class='add'>+</div><div class='add'>+		if (snprintf(nalg, sizeof(nalg), "ecb(%s)", alg) &gt;=</div><div class='add'>+		    sizeof(nalg))</div><div class='add'>+			return -ENAMETOOLONG;</div><div class='add'>+</div><div class='add'>+		i = alg_find_test(nalg);</div><div class='add'>+		if (i &lt; 0)</div><div class='add'>+			goto notest;</div><div class='add'>+</div><div class='add'>+		return alg_test_cipher(alg_test_descs + i, driver, type, mask);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	i = alg_find_test(alg);</div><div class='add'>+	if (i &lt; 0)</div><div class='add'>+		goto notest;</div><div class='add'>+</div><div class='add'>+	return alg_test_descs[i].test(alg_test_descs + i, driver,</div><div class='add'>+				      type, mask);</div><div class='add'>+</div><div class='add'>+notest:</div><div class='add'>+	printk(KERN_INFO "alg: No test for %s (%s)\n", alg, driver);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(alg_test);</div><div class='add'>+</div><div class='add'>+int __init testmgr_init(void)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; XBUFSIZE; i++) {</div><div class='add'>+		xbuf[i] = (void *)__get_free_page(GFP_KERNEL);</div><div class='add'>+		if (!xbuf[i])</div><div class='add'>+			goto err_free_xbuf;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; XBUFSIZE; i++) {</div><div class='add'>+		axbuf[i] = (void *)__get_free_page(GFP_KERNEL);</div><div class='add'>+		if (!axbuf[i])</div><div class='add'>+			goto err_free_axbuf;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_free_axbuf:</div><div class='add'>+	for (i = 0; i &lt; XBUFSIZE &amp;&amp; axbuf[i]; i++)</div><div class='add'>+		free_page((unsigned long)axbuf[i]);</div><div class='add'>+err_free_xbuf:</div><div class='add'>+	for (i = 0; i &lt; XBUFSIZE &amp;&amp; xbuf[i]; i++)</div><div class='add'>+		free_page((unsigned long)xbuf[i]);</div><div class='add'>+</div><div class='add'>+	return -ENOMEM;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void testmgr_exit(void)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; XBUFSIZE; i++)</div><div class='add'>+		free_page((unsigned long)axbuf[i]);</div><div class='add'>+	for (i = 0; i &lt; XBUFSIZE; i++)</div><div class='add'>+		free_page((unsigned long)xbuf[i]);</div><div class='add'>+}</div><div class='head'>diff --git a/crypto/testmgr.h b/crypto/testmgr.h<br/>new file mode 100644<br/>index 000000000000..dee94d9ecfba<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/crypto/testmgr.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>crypto/testmgr.h</a></div><div class='hunk'>@@ -0,0 +1,8738 @@</div><div class='add'>+/*</div><div class='add'>+ * Algorithm testing framework and tests.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2002 James Morris &lt;jmorris@intercode.com.au&gt;</div><div class='add'>+ * Copyright (c) 2002 Jean-Francois Dive &lt;jef@linuxbe.org&gt;</div><div class='add'>+ * Copyright (c) 2007 Nokia Siemens Networks</div><div class='add'>+ * Copyright (c) 2008 Herbert Xu &lt;herbert@gondor.apana.org.au&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms of the GNU General Public License as published by the Free</div><div class='add'>+ * Software Foundation; either version 2 of the License, or (at your option)</div><div class='add'>+ * any later version.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+#ifndef _CRYPTO_TESTMGR_H</div><div class='add'>+#define _CRYPTO_TESTMGR_H</div><div class='add'>+</div><div class='add'>+#define MAX_DIGEST_SIZE		64</div><div class='add'>+#define MAX_TAP			8</div><div class='add'>+</div><div class='add'>+#define MAX_KEYLEN		56</div><div class='add'>+#define MAX_IVLEN		32</div><div class='add'>+</div><div class='add'>+struct hash_testvec {</div><div class='add'>+	/* only used with keyed hash algorithms */</div><div class='add'>+	char *key;</div><div class='add'>+	char *plaintext;</div><div class='add'>+	char *digest;</div><div class='add'>+	unsigned char tap[MAX_TAP];</div><div class='add'>+	unsigned char psize;</div><div class='add'>+	unsigned char np;</div><div class='add'>+	unsigned char ksize;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct cipher_testvec {</div><div class='add'>+	char *key;</div><div class='add'>+	char *iv;</div><div class='add'>+	char *input;</div><div class='add'>+	char *result;</div><div class='add'>+	unsigned short tap[MAX_TAP];</div><div class='add'>+	int np;</div><div class='add'>+	unsigned char fail;</div><div class='add'>+	unsigned char wk; /* weak key flag */</div><div class='add'>+	unsigned char klen;</div><div class='add'>+	unsigned short ilen;</div><div class='add'>+	unsigned short rlen;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct aead_testvec {</div><div class='add'>+	char *key;</div><div class='add'>+	char *iv;</div><div class='add'>+	char *input;</div><div class='add'>+	char *assoc;</div><div class='add'>+	char *result;</div><div class='add'>+	unsigned char tap[MAX_TAP];</div><div class='add'>+	unsigned char atap[MAX_TAP];</div><div class='add'>+	int np;</div><div class='add'>+	int anp;</div><div class='add'>+	unsigned char fail;</div><div class='add'>+	unsigned char wk; /* weak key flag */</div><div class='add'>+	unsigned char klen;</div><div class='add'>+	unsigned short ilen;</div><div class='add'>+	unsigned short alen;</div><div class='add'>+	unsigned short rlen;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static char zeroed_string[48];</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * MD4 test vectors from RFC1320</div><div class='add'>+ */</div><div class='add'>+#define MD4_TEST_VECTORS	7</div><div class='add'>+</div><div class='add'>+static struct hash_testvec md4_tv_template [] = {</div><div class='add'>+	{</div><div class='add'>+		.plaintext = "",</div><div class='add'>+		.digest	= "\x31\xd6\xcf\xe0\xd1\x6a\xe9\x31"</div><div class='add'>+			  "\xb7\x3c\x59\xd7\xe0\xc0\x89\xc0",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "a",</div><div class='add'>+		.psize	= 1,</div><div class='add'>+		.digest	= "\xbd\xe5\x2c\xb3\x1d\xe3\x3e\x46"</div><div class='add'>+			  "\x24\x5e\x05\xfb\xdb\xd6\xfb\x24",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "abc",</div><div class='add'>+		.psize	= 3,</div><div class='add'>+		.digest	= "\xa4\x48\x01\x7a\xaf\x21\xd8\x52"</div><div class='add'>+			  "\x5f\xc1\x0a\xe8\x7a\xa6\x72\x9d",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "message digest",</div><div class='add'>+		.psize	= 14,</div><div class='add'>+		.digest	= "\xd9\x13\x0a\x81\x64\x54\x9f\xe8"</div><div class='add'>+			"\x18\x87\x48\x06\xe1\xc7\x01\x4b",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "abcdefghijklmnopqrstuvwxyz",</div><div class='add'>+		.psize	= 26,</div><div class='add'>+		.digest	= "\xd7\x9e\x1c\x30\x8a\xa5\xbb\xcd"</div><div class='add'>+			  "\xee\xa8\xed\x63\xdf\x41\x2d\xa9",</div><div class='add'>+		.np	= 2,</div><div class='add'>+		.tap	= { 13, 13 },</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789",</div><div class='add'>+		.psize	= 62,</div><div class='add'>+		.digest	= "\x04\x3f\x85\x82\xf2\x41\xdb\x35"</div><div class='add'>+			  "\x1c\xe6\x27\xe1\x53\xe7\xf0\xe4",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "123456789012345678901234567890123456789012345678901234567890123"</div><div class='add'>+			   "45678901234567890",</div><div class='add'>+		.psize	= 80,</div><div class='add'>+		.digest	= "\xe3\x3b\x4d\xdc\x9c\x38\xf2\x19"</div><div class='add'>+			  "\x9c\x3e\x7b\x16\x4f\xcc\x05\x36",</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * MD5 test vectors from RFC1321</div><div class='add'>+ */</div><div class='add'>+#define MD5_TEST_VECTORS	7</div><div class='add'>+</div><div class='add'>+static struct hash_testvec md5_tv_template[] = {</div><div class='add'>+	{</div><div class='add'>+		.digest	= "\xd4\x1d\x8c\xd9\x8f\x00\xb2\x04"</div><div class='add'>+			  "\xe9\x80\x09\x98\xec\xf8\x42\x7e",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "a",</div><div class='add'>+		.psize	= 1,</div><div class='add'>+		.digest	= "\x0c\xc1\x75\xb9\xc0\xf1\xb6\xa8"</div><div class='add'>+			  "\x31\xc3\x99\xe2\x69\x77\x26\x61",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "abc",</div><div class='add'>+		.psize	= 3,</div><div class='add'>+		.digest	= "\x90\x01\x50\x98\x3c\xd2\x4f\xb0"</div><div class='add'>+			  "\xd6\x96\x3f\x7d\x28\xe1\x7f\x72",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "message digest",</div><div class='add'>+		.psize	= 14,</div><div class='add'>+		.digest	= "\xf9\x6b\x69\x7d\x7c\xb7\x93\x8d"</div><div class='add'>+			  "\x52\x5a\x2f\x31\xaa\xf1\x61\xd0",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "abcdefghijklmnopqrstuvwxyz",</div><div class='add'>+		.psize	= 26,</div><div class='add'>+		.digest	= "\xc3\xfc\xd3\xd7\x61\x92\xe4\x00"</div><div class='add'>+			  "\x7d\xfb\x49\x6c\xca\x67\xe1\x3b",</div><div class='add'>+		.np	= 2,</div><div class='add'>+		.tap	= {13, 13}</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789",</div><div class='add'>+		.psize	= 62,</div><div class='add'>+		.digest	= "\xd1\x74\xab\x98\xd2\x77\xd9\xf5"</div><div class='add'>+			  "\xa5\x61\x1c\x2c\x9f\x41\x9d\x9f",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "12345678901234567890123456789012345678901234567890123456789012"</div><div class='add'>+			   "345678901234567890",</div><div class='add'>+		.psize	= 80,</div><div class='add'>+		.digest	= "\x57\xed\xf4\xa2\x2b\xe3\xc9\x55"</div><div class='add'>+			  "\xac\x49\xda\x2e\x21\x07\xb6\x7a",</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * RIPEMD-128 test vectors from ISO/IEC 10118-3:2004(E)</div><div class='add'>+ */</div><div class='add'>+#define RMD128_TEST_VECTORS     10</div><div class='add'>+</div><div class='add'>+static struct hash_testvec rmd128_tv_template[] = {</div><div class='add'>+	{</div><div class='add'>+		.digest	= "\xcd\xf2\x62\x13\xa1\x50\xdc\x3e"</div><div class='add'>+			  "\xcb\x61\x0f\x18\xf6\xb3\x8b\x46",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "a",</div><div class='add'>+		.psize	= 1,</div><div class='add'>+		.digest	= "\x86\xbe\x7a\xfa\x33\x9d\x0f\xc7"</div><div class='add'>+			  "\xcf\xc7\x85\xe7\x2f\x57\x8d\x33",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "abc",</div><div class='add'>+		.psize	= 3,</div><div class='add'>+		.digest	= "\xc1\x4a\x12\x19\x9c\x66\xe4\xba"</div><div class='add'>+			  "\x84\x63\x6b\x0f\x69\x14\x4c\x77",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "message digest",</div><div class='add'>+		.psize	= 14,</div><div class='add'>+		.digest	= "\x9e\x32\x7b\x3d\x6e\x52\x30\x62"</div><div class='add'>+			  "\xaf\xc1\x13\x2d\x7d\xf9\xd1\xb8",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "abcdefghijklmnopqrstuvwxyz",</div><div class='add'>+		.psize	= 26,</div><div class='add'>+		.digest	= "\xfd\x2a\xa6\x07\xf7\x1d\xc8\xf5"</div><div class='add'>+			  "\x10\x71\x49\x22\xb3\x71\x83\x4e",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcde"</div><div class='add'>+			     "fghijklmnopqrstuvwxyz0123456789",</div><div class='add'>+		.psize	= 62,</div><div class='add'>+		.digest	= "\xd1\xe9\x59\xeb\x17\x9c\x91\x1f"</div><div class='add'>+			  "\xae\xa4\x62\x4c\x60\xc5\xc7\x02",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "1234567890123456789012345678901234567890"</div><div class='add'>+			     "1234567890123456789012345678901234567890",</div><div class='add'>+		.psize	= 80,</div><div class='add'>+		.digest	= "\x3f\x45\xef\x19\x47\x32\xc2\xdb"</div><div class='add'>+			  "\xb2\xc4\xa2\xc7\x69\x79\x5f\xa3",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "abcdbcdecdefdefgefghfghighij"</div><div class='add'>+			     "hijkijkljklmklmnlmnomnopnopq",</div><div class='add'>+		.psize	= 56,</div><div class='add'>+		.digest	= "\xa1\xaa\x06\x89\xd0\xfa\xfa\x2d"</div><div class='add'>+			  "\xdc\x22\xe8\x8b\x49\x13\x3a\x06",</div><div class='add'>+		.np	= 2,</div><div class='add'>+		.tap	= { 28, 28 },</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "abcdefghbcdefghicdefghijdefghijkefghijklfghi"</div><div class='add'>+			     "jklmghijklmnhijklmnoijklmnopjklmnopqklmnopqr"</div><div class='add'>+			     "lmnopqrsmnopqrstnopqrstu",</div><div class='add'>+		.psize	= 112,</div><div class='add'>+		.digest	= "\xd4\xec\xc9\x13\xe1\xdf\x77\x6b"</div><div class='add'>+			  "\xf4\x8d\xe9\xd5\x5b\x1f\x25\x46",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "abcdbcdecdefdefgefghfghighijhijk",</div><div class='add'>+		.psize	= 32,</div><div class='add'>+		.digest	= "\x13\xfc\x13\xe8\xef\xff\x34\x7d"</div><div class='add'>+			  "\xe1\x93\xff\x46\xdb\xac\xcf\xd4",</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * RIPEMD-160 test vectors from ISO/IEC 10118-3:2004(E)</div><div class='add'>+ */</div><div class='add'>+#define RMD160_TEST_VECTORS     10</div><div class='add'>+</div><div class='add'>+static struct hash_testvec rmd160_tv_template[] = {</div><div class='add'>+	{</div><div class='add'>+		.digest	= "\x9c\x11\x85\xa5\xc5\xe9\xfc\x54\x61\x28"</div><div class='add'>+			  "\x08\x97\x7e\xe8\xf5\x48\xb2\x25\x8d\x31",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "a",</div><div class='add'>+		.psize	= 1,</div><div class='add'>+		.digest	= "\x0b\xdc\x9d\x2d\x25\x6b\x3e\xe9\xda\xae"</div><div class='add'>+			  "\x34\x7b\xe6\xf4\xdc\x83\x5a\x46\x7f\xfe",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "abc",</div><div class='add'>+		.psize	= 3,</div><div class='add'>+		.digest	= "\x8e\xb2\x08\xf7\xe0\x5d\x98\x7a\x9b\x04"</div><div class='add'>+			  "\x4a\x8e\x98\xc6\xb0\x87\xf1\x5a\x0b\xfc",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "message digest",</div><div class='add'>+		.psize	= 14,</div><div class='add'>+		.digest	= "\x5d\x06\x89\xef\x49\xd2\xfa\xe5\x72\xb8"</div><div class='add'>+			  "\x81\xb1\x23\xa8\x5f\xfa\x21\x59\x5f\x36",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "abcdefghijklmnopqrstuvwxyz",</div><div class='add'>+		.psize	= 26,</div><div class='add'>+		.digest	= "\xf7\x1c\x27\x10\x9c\x69\x2c\x1b\x56\xbb"</div><div class='add'>+			  "\xdc\xeb\x5b\x9d\x28\x65\xb3\x70\x8d\xbc",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcde"</div><div class='add'>+			     "fghijklmnopqrstuvwxyz0123456789",</div><div class='add'>+		.psize	= 62,</div><div class='add'>+		.digest	= "\xb0\xe2\x0b\x6e\x31\x16\x64\x02\x86\xed"</div><div class='add'>+			  "\x3a\x87\xa5\x71\x30\x79\xb2\x1f\x51\x89",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "1234567890123456789012345678901234567890"</div><div class='add'>+			     "1234567890123456789012345678901234567890",</div><div class='add'>+		.psize	= 80,</div><div class='add'>+		.digest	= "\x9b\x75\x2e\x45\x57\x3d\x4b\x39\xf4\xdb"</div><div class='add'>+			  "\xd3\x32\x3c\xab\x82\xbf\x63\x32\x6b\xfb",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "abcdbcdecdefdefgefghfghighij"</div><div class='add'>+			     "hijkijkljklmklmnlmnomnopnopq",</div><div class='add'>+		.psize	= 56,</div><div class='add'>+		.digest	= "\x12\xa0\x53\x38\x4a\x9c\x0c\x88\xe4\x05"</div><div class='add'>+			  "\xa0\x6c\x27\xdc\xf4\x9a\xda\x62\xeb\x2b",</div><div class='add'>+		.np	= 2,</div><div class='add'>+		.tap	= { 28, 28 },</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "abcdefghbcdefghicdefghijdefghijkefghijklfghi"</div><div class='add'>+			     "jklmghijklmnhijklmnoijklmnopjklmnopqklmnopqr"</div><div class='add'>+			     "lmnopqrsmnopqrstnopqrstu",</div><div class='add'>+		.psize	= 112,</div><div class='add'>+		.digest	= "\x6f\x3f\xa3\x9b\x6b\x50\x3c\x38\x4f\x91"</div><div class='add'>+			  "\x9a\x49\xa7\xaa\x5c\x2c\x08\xbd\xfb\x45",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "abcdbcdecdefdefgefghfghighijhijk",</div><div class='add'>+		.psize	= 32,</div><div class='add'>+		.digest	= "\x94\xc2\x64\x11\x54\x04\xe6\x33\x79\x0d"</div><div class='add'>+			  "\xfc\xc8\x7b\x58\x7d\x36\x77\x06\x7d\x9f",</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * RIPEMD-256 test vectors</div><div class='add'>+ */</div><div class='add'>+#define RMD256_TEST_VECTORS     8</div><div class='add'>+</div><div class='add'>+static struct hash_testvec rmd256_tv_template[] = {</div><div class='add'>+	{</div><div class='add'>+		.digest	= "\x02\xba\x4c\x4e\x5f\x8e\xcd\x18"</div><div class='add'>+			  "\x77\xfc\x52\xd6\x4d\x30\xe3\x7a"</div><div class='add'>+			  "\x2d\x97\x74\xfb\x1e\x5d\x02\x63"</div><div class='add'>+			  "\x80\xae\x01\x68\xe3\xc5\x52\x2d",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "a",</div><div class='add'>+		.psize	= 1,</div><div class='add'>+		.digest	= "\xf9\x33\x3e\x45\xd8\x57\xf5\xd9"</div><div class='add'>+			  "\x0a\x91\xba\xb7\x0a\x1e\xba\x0c"</div><div class='add'>+			  "\xfb\x1b\xe4\xb0\x78\x3c\x9a\xcf"</div><div class='add'>+			  "\xcd\x88\x3a\x91\x34\x69\x29\x25",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "abc",</div><div class='add'>+		.psize	= 3,</div><div class='add'>+		.digest	= "\xaf\xbd\x6e\x22\x8b\x9d\x8c\xbb"</div><div class='add'>+			  "\xce\xf5\xca\x2d\x03\xe6\xdb\xa1"</div><div class='add'>+			  "\x0a\xc0\xbc\x7d\xcb\xe4\x68\x0e"</div><div class='add'>+			  "\x1e\x42\xd2\xe9\x75\x45\x9b\x65",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "message digest",</div><div class='add'>+		.psize	= 14,</div><div class='add'>+		.digest	= "\x87\xe9\x71\x75\x9a\x1c\xe4\x7a"</div><div class='add'>+			  "\x51\x4d\x5c\x91\x4c\x39\x2c\x90"</div><div class='add'>+			  "\x18\xc7\xc4\x6b\xc1\x44\x65\x55"</div><div class='add'>+			  "\x4a\xfc\xdf\x54\xa5\x07\x0c\x0e",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "abcdefghijklmnopqrstuvwxyz",</div><div class='add'>+		.psize	= 26,</div><div class='add'>+		.digest	= "\x64\x9d\x30\x34\x75\x1e\xa2\x16"</div><div class='add'>+			  "\x77\x6b\xf9\xa1\x8a\xcc\x81\xbc"</div><div class='add'>+			  "\x78\x96\x11\x8a\x51\x97\x96\x87"</div><div class='add'>+			  "\x82\xdd\x1f\xd9\x7d\x8d\x51\x33",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcde"</div><div class='add'>+			     "fghijklmnopqrstuvwxyz0123456789",</div><div class='add'>+		.psize	= 62,</div><div class='add'>+		.digest	= "\x57\x40\xa4\x08\xac\x16\xb7\x20"</div><div class='add'>+			  "\xb8\x44\x24\xae\x93\x1c\xbb\x1f"</div><div class='add'>+			  "\xe3\x63\xd1\xd0\xbf\x40\x17\xf1"</div><div class='add'>+			  "\xa8\x9f\x7e\xa6\xde\x77\xa0\xb8",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "1234567890123456789012345678901234567890"</div><div class='add'>+			     "1234567890123456789012345678901234567890",</div><div class='add'>+		.psize	= 80,</div><div class='add'>+		.digest	= "\x06\xfd\xcc\x7a\x40\x95\x48\xaa"</div><div class='add'>+			  "\xf9\x13\x68\xc0\x6a\x62\x75\xb5"</div><div class='add'>+			  "\x53\xe3\xf0\x99\xbf\x0e\xa4\xed"</div><div class='add'>+			  "\xfd\x67\x78\xdf\x89\xa8\x90\xdd",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "abcdbcdecdefdefgefghfghighij"</div><div class='add'>+			     "hijkijkljklmklmnlmnomnopnopq",</div><div class='add'>+		.psize	= 56,</div><div class='add'>+		.digest	= "\x38\x43\x04\x55\x83\xaa\xc6\xc8"</div><div class='add'>+			  "\xc8\xd9\x12\x85\x73\xe7\xa9\x80"</div><div class='add'>+			  "\x9a\xfb\x2a\x0f\x34\xcc\xc3\x6e"</div><div class='add'>+			  "\xa9\xe7\x2f\x16\xf6\x36\x8e\x3f",</div><div class='add'>+		.np	= 2,</div><div class='add'>+		.tap	= { 28, 28 },</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * RIPEMD-320 test vectors</div><div class='add'>+ */</div><div class='add'>+#define RMD320_TEST_VECTORS     8</div><div class='add'>+</div><div class='add'>+static struct hash_testvec rmd320_tv_template[] = {</div><div class='add'>+	{</div><div class='add'>+		.digest	= "\x22\xd6\x5d\x56\x61\x53\x6c\xdc\x75\xc1"</div><div class='add'>+			  "\xfd\xf5\xc6\xde\x7b\x41\xb9\xf2\x73\x25"</div><div class='add'>+			  "\xeb\xc6\x1e\x85\x57\x17\x7d\x70\x5a\x0e"</div><div class='add'>+			  "\xc8\x80\x15\x1c\x3a\x32\xa0\x08\x99\xb8",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "a",</div><div class='add'>+		.psize	= 1,</div><div class='add'>+		.digest	= "\xce\x78\x85\x06\x38\xf9\x26\x58\xa5\xa5"</div><div class='add'>+			  "\x85\x09\x75\x79\x92\x6d\xda\x66\x7a\x57"</div><div class='add'>+			  "\x16\x56\x2c\xfc\xf6\xfb\xe7\x7f\x63\x54"</div><div class='add'>+			  "\x2f\x99\xb0\x47\x05\xd6\x97\x0d\xff\x5d",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "abc",</div><div class='add'>+		.psize	= 3,</div><div class='add'>+		.digest	= "\xde\x4c\x01\xb3\x05\x4f\x89\x30\xa7\x9d"</div><div class='add'>+			  "\x09\xae\x73\x8e\x92\x30\x1e\x5a\x17\x08"</div><div class='add'>+			  "\x5b\xef\xfd\xc1\xb8\xd1\x16\x71\x3e\x74"</div><div class='add'>+			  "\xf8\x2f\xa9\x42\xd6\x4c\xdb\xc4\x68\x2d",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "message digest",</div><div class='add'>+		.psize	= 14,</div><div class='add'>+		.digest	= "\x3a\x8e\x28\x50\x2e\xd4\x5d\x42\x2f\x68"</div><div class='add'>+			  "\x84\x4f\x9d\xd3\x16\xe7\xb9\x85\x33\xfa"</div><div class='add'>+			  "\x3f\x2a\x91\xd2\x9f\x84\xd4\x25\xc8\x8d"</div><div class='add'>+			  "\x6b\x4e\xff\x72\x7d\xf6\x6a\x7c\x01\x97",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "abcdefghijklmnopqrstuvwxyz",</div><div class='add'>+		.psize	= 26,</div><div class='add'>+		.digest	= "\xca\xbd\xb1\x81\x0b\x92\x47\x0a\x20\x93"</div><div class='add'>+			  "\xaa\x6b\xce\x05\x95\x2c\x28\x34\x8c\xf4"</div><div class='add'>+			  "\x3f\xf6\x08\x41\x97\x51\x66\xbb\x40\xed"</div><div class='add'>+			  "\x23\x40\x04\xb8\x82\x44\x63\xe6\xb0\x09",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcde"</div><div class='add'>+			     "fghijklmnopqrstuvwxyz0123456789",</div><div class='add'>+		.psize	= 62,</div><div class='add'>+		.digest	= "\xed\x54\x49\x40\xc8\x6d\x67\xf2\x50\xd2"</div><div class='add'>+			  "\x32\xc3\x0b\x7b\x3e\x57\x70\xe0\xc6\x0c"</div><div class='add'>+			  "\x8c\xb9\xa4\xca\xfe\x3b\x11\x38\x8a\xf9"</div><div class='add'>+			  "\x92\x0e\x1b\x99\x23\x0b\x84\x3c\x86\xa4",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "1234567890123456789012345678901234567890"</div><div class='add'>+			     "1234567890123456789012345678901234567890",</div><div class='add'>+		.psize	= 80,</div><div class='add'>+		.digest	= "\x55\x78\x88\xaf\x5f\x6d\x8e\xd6\x2a\xb6"</div><div class='add'>+			  "\x69\x45\xc6\xd2\xa0\xa4\x7e\xcd\x53\x41"</div><div class='add'>+			  "\xe9\x15\xeb\x8f\xea\x1d\x05\x24\x95\x5f"</div><div class='add'>+			  "\x82\x5d\xc7\x17\xe4\xa0\x08\xab\x2d\x42",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "abcdbcdecdefdefgefghfghighij"</div><div class='add'>+			     "hijkijkljklmklmnlmnomnopnopq",</div><div class='add'>+		.psize	= 56,</div><div class='add'>+		.digest	= "\xd0\x34\xa7\x95\x0c\xf7\x22\x02\x1b\xa4"</div><div class='add'>+			  "\xb8\x4d\xf7\x69\xa5\xde\x20\x60\xe2\x59"</div><div class='add'>+			  "\xdf\x4c\x9b\xb4\xa4\x26\x8c\x0e\x93\x5b"</div><div class='add'>+			  "\xbc\x74\x70\xa9\x69\xc9\xd0\x72\xa1\xac",</div><div class='add'>+		.np	= 2,</div><div class='add'>+		.tap	= { 28, 28 },</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * SHA1 test vectors  from from FIPS PUB 180-1</div><div class='add'>+ */</div><div class='add'>+#define SHA1_TEST_VECTORS	2</div><div class='add'>+</div><div class='add'>+static struct hash_testvec sha1_tv_template[] = {</div><div class='add'>+	{</div><div class='add'>+		.plaintext = "abc",</div><div class='add'>+		.psize	= 3,</div><div class='add'>+		.digest	= "\xa9\x99\x3e\x36\x47\x06\x81\x6a\xba\x3e"</div><div class='add'>+			  "\x25\x71\x78\x50\xc2\x6c\x9c\xd0\xd8\x9d",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",</div><div class='add'>+		.psize	= 56,</div><div class='add'>+		.digest	= "\x84\x98\x3e\x44\x1c\x3b\xd2\x6e\xba\xae"</div><div class='add'>+			  "\x4a\xa1\xf9\x51\x29\xe5\xe5\x46\x70\xf1",</div><div class='add'>+		.np	= 2,</div><div class='add'>+		.tap	= { 28, 28 }</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * SHA224 test vectors from from FIPS PUB 180-2</div><div class='add'>+ */</div><div class='add'>+#define SHA224_TEST_VECTORS     2</div><div class='add'>+</div><div class='add'>+static struct hash_testvec sha224_tv_template[] = {</div><div class='add'>+	{</div><div class='add'>+		.plaintext = "abc",</div><div class='add'>+		.psize  = 3,</div><div class='add'>+		.digest = "\x23\x09\x7D\x22\x34\x05\xD8\x22"</div><div class='add'>+			  "\x86\x42\xA4\x77\xBD\xA2\x55\xB3"</div><div class='add'>+			  "\x2A\xAD\xBC\xE4\xBD\xA0\xB3\xF7"</div><div class='add'>+			  "\xE3\x6C\x9D\xA7",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext =</div><div class='add'>+		"abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",</div><div class='add'>+		.psize  = 56,</div><div class='add'>+		.digest = "\x75\x38\x8B\x16\x51\x27\x76\xCC"</div><div class='add'>+			  "\x5D\xBA\x5D\xA1\xFD\x89\x01\x50"</div><div class='add'>+			  "\xB0\xC6\x45\x5C\xB4\xF5\x8B\x19"</div><div class='add'>+			  "\x52\x52\x25\x25",</div><div class='add'>+		.np     = 2,</div><div class='add'>+		.tap    = { 28, 28 }</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * SHA256 test vectors from from NIST</div><div class='add'>+ */</div><div class='add'>+#define SHA256_TEST_VECTORS	2</div><div class='add'>+</div><div class='add'>+static struct hash_testvec sha256_tv_template[] = {</div><div class='add'>+	{</div><div class='add'>+		.plaintext = "abc",</div><div class='add'>+		.psize	= 3,</div><div class='add'>+		.digest	= "\xba\x78\x16\xbf\x8f\x01\xcf\xea"</div><div class='add'>+			  "\x41\x41\x40\xde\x5d\xae\x22\x23"</div><div class='add'>+			  "\xb0\x03\x61\xa3\x96\x17\x7a\x9c"</div><div class='add'>+			  "\xb4\x10\xff\x61\xf2\x00\x15\xad",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",</div><div class='add'>+		.psize	= 56,</div><div class='add'>+		.digest	= "\x24\x8d\x6a\x61\xd2\x06\x38\xb8"</div><div class='add'>+			  "\xe5\xc0\x26\x93\x0c\x3e\x60\x39"</div><div class='add'>+			  "\xa3\x3c\xe4\x59\x64\xff\x21\x67"</div><div class='add'>+			  "\xf6\xec\xed\xd4\x19\xdb\x06\xc1",</div><div class='add'>+		.np	= 2,</div><div class='add'>+		.tap	= { 28, 28 }</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * SHA384 test vectors from from NIST and kerneli</div><div class='add'>+ */</div><div class='add'>+#define SHA384_TEST_VECTORS	4</div><div class='add'>+</div><div class='add'>+static struct hash_testvec sha384_tv_template[] = {</div><div class='add'>+	{</div><div class='add'>+		.plaintext= "abc",</div><div class='add'>+		.psize	= 3,</div><div class='add'>+		.digest	= "\xcb\x00\x75\x3f\x45\xa3\x5e\x8b"</div><div class='add'>+			  "\xb5\xa0\x3d\x69\x9a\xc6\x50\x07"</div><div class='add'>+			  "\x27\x2c\x32\xab\x0e\xde\xd1\x63"</div><div class='add'>+			  "\x1a\x8b\x60\x5a\x43\xff\x5b\xed"</div><div class='add'>+			  "\x80\x86\x07\x2b\xa1\xe7\xcc\x23"</div><div class='add'>+			  "\x58\xba\xec\xa1\x34\xc8\x25\xa7",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",</div><div class='add'>+		.psize	= 56,</div><div class='add'>+		.digest	= "\x33\x91\xfd\xdd\xfc\x8d\xc7\x39"</div><div class='add'>+			  "\x37\x07\xa6\x5b\x1b\x47\x09\x39"</div><div class='add'>+			  "\x7c\xf8\xb1\xd1\x62\xaf\x05\xab"</div><div class='add'>+			  "\xfe\x8f\x45\x0d\xe5\xf3\x6b\xc6"</div><div class='add'>+			  "\xb0\x45\x5a\x85\x20\xbc\x4e\x6f"</div><div class='add'>+			  "\x5f\xe9\x5b\x1f\xe3\xc8\x45\x2b",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmn"</div><div class='add'>+			   "hijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu",</div><div class='add'>+		.psize	= 112,</div><div class='add'>+		.digest	= "\x09\x33\x0c\x33\xf7\x11\x47\xe8"</div><div class='add'>+			  "\x3d\x19\x2f\xc7\x82\xcd\x1b\x47"</div><div class='add'>+			  "\x53\x11\x1b\x17\x3b\x3b\x05\xd2"</div><div class='add'>+			  "\x2f\xa0\x80\x86\xe3\xb0\xf7\x12"</div><div class='add'>+			  "\xfc\xc7\xc7\x1a\x55\x7e\x2d\xb9"</div><div class='add'>+			  "\x66\xc3\xe9\xfa\x91\x74\x60\x39",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcd"</div><div class='add'>+			   "efghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz",</div><div class='add'>+		.psize	= 104,</div><div class='add'>+		.digest	= "\x3d\x20\x89\x73\xab\x35\x08\xdb"</div><div class='add'>+			  "\xbd\x7e\x2c\x28\x62\xba\x29\x0a"</div><div class='add'>+			  "\xd3\x01\x0e\x49\x78\xc1\x98\xdc"</div><div class='add'>+			  "\x4d\x8f\xd0\x14\xe5\x82\x82\x3a"</div><div class='add'>+			  "\x89\xe1\x6f\x9b\x2a\x7b\xbc\x1a"</div><div class='add'>+			  "\xc9\x38\xe2\xd1\x99\xe8\xbe\xa4",</div><div class='add'>+		.np	= 4,</div><div class='add'>+		.tap	= { 26, 26, 26, 26 }</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * SHA512 test vectors from from NIST and kerneli</div><div class='add'>+ */</div><div class='add'>+#define SHA512_TEST_VECTORS	4</div><div class='add'>+</div><div class='add'>+static struct hash_testvec sha512_tv_template[] = {</div><div class='add'>+	{</div><div class='add'>+		.plaintext = "abc",</div><div class='add'>+		.psize	= 3,</div><div class='add'>+		.digest	= "\xdd\xaf\x35\xa1\x93\x61\x7a\xba"</div><div class='add'>+			  "\xcc\x41\x73\x49\xae\x20\x41\x31"</div><div class='add'>+			  "\x12\xe6\xfa\x4e\x89\xa9\x7e\xa2"</div><div class='add'>+			  "\x0a\x9e\xee\xe6\x4b\x55\xd3\x9a"</div><div class='add'>+			  "\x21\x92\x99\x2a\x27\x4f\xc1\xa8"</div><div class='add'>+			  "\x36\xba\x3c\x23\xa3\xfe\xeb\xbd"</div><div class='add'>+			  "\x45\x4d\x44\x23\x64\x3c\xe8\x0e"</div><div class='add'>+			  "\x2a\x9a\xc9\x4f\xa5\x4c\xa4\x9f",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",</div><div class='add'>+		.psize	= 56,</div><div class='add'>+		.digest	= "\x20\x4a\x8f\xc6\xdd\xa8\x2f\x0a"</div><div class='add'>+			  "\x0c\xed\x7b\xeb\x8e\x08\xa4\x16"</div><div class='add'>+			  "\x57\xc1\x6e\xf4\x68\xb2\x28\xa8"</div><div class='add'>+			  "\x27\x9b\xe3\x31\xa7\x03\xc3\x35"</div><div class='add'>+			  "\x96\xfd\x15\xc1\x3b\x1b\x07\xf9"</div><div class='add'>+			  "\xaa\x1d\x3b\xea\x57\x78\x9c\xa0"</div><div class='add'>+			  "\x31\xad\x85\xc7\xa7\x1d\xd7\x03"</div><div class='add'>+			  "\x54\xec\x63\x12\x38\xca\x34\x45",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmn"</div><div class='add'>+			   "hijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu",</div><div class='add'>+		.psize	= 112,</div><div class='add'>+		.digest	= "\x8e\x95\x9b\x75\xda\xe3\x13\xda"</div><div class='add'>+			  "\x8c\xf4\xf7\x28\x14\xfc\x14\x3f"</div><div class='add'>+			  "\x8f\x77\x79\xc6\xeb\x9f\x7f\xa1"</div><div class='add'>+			  "\x72\x99\xae\xad\xb6\x88\x90\x18"</div><div class='add'>+			  "\x50\x1d\x28\x9e\x49\x00\xf7\xe4"</div><div class='add'>+			  "\x33\x1b\x99\xde\xc4\xb5\x43\x3a"</div><div class='add'>+			  "\xc7\xd3\x29\xee\xb6\xdd\x26\x54"</div><div class='add'>+			  "\x5e\x96\xe5\x5b\x87\x4b\xe9\x09",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcd"</div><div class='add'>+			   "efghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz",</div><div class='add'>+		.psize	= 104,</div><div class='add'>+		.digest	= "\x93\x0d\x0c\xef\xcb\x30\xff\x11"</div><div class='add'>+			  "\x33\xb6\x89\x81\x21\xf1\xcf\x3d"</div><div class='add'>+			  "\x27\x57\x8a\xfc\xaf\xe8\x67\x7c"</div><div class='add'>+			  "\x52\x57\xcf\x06\x99\x11\xf7\x5d"</div><div class='add'>+			  "\x8f\x58\x31\xb5\x6e\xbf\xda\x67"</div><div class='add'>+			  "\xb2\x78\xe6\x6d\xff\x8b\x84\xfe"</div><div class='add'>+			  "\x2b\x28\x70\xf7\x42\xa5\x80\xd8"</div><div class='add'>+			  "\xed\xb4\x19\x87\x23\x28\x50\xc9",</div><div class='add'>+		.np	= 4,</div><div class='add'>+		.tap	= { 26, 26, 26, 26 }</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * WHIRLPOOL test vectors from Whirlpool package</div><div class='add'>+ * by Vincent Rijmen and Paulo S. L. M. Barreto as part of the NESSIE</div><div class='add'>+ * submission</div><div class='add'>+ */</div><div class='add'>+#define WP512_TEST_VECTORS	8</div><div class='add'>+</div><div class='add'>+static struct hash_testvec wp512_tv_template[] = {</div><div class='add'>+	{</div><div class='add'>+		.plaintext = "",</div><div class='add'>+		.psize	= 0,</div><div class='add'>+		.digest	= "\x19\xFA\x61\xD7\x55\x22\xA4\x66"</div><div class='add'>+			  "\x9B\x44\xE3\x9C\x1D\x2E\x17\x26"</div><div class='add'>+			  "\xC5\x30\x23\x21\x30\xD4\x07\xF8"</div><div class='add'>+			  "\x9A\xFE\xE0\x96\x49\x97\xF7\xA7"</div><div class='add'>+			  "\x3E\x83\xBE\x69\x8B\x28\x8F\xEB"</div><div class='add'>+			  "\xCF\x88\xE3\xE0\x3C\x4F\x07\x57"</div><div class='add'>+			  "\xEA\x89\x64\xE5\x9B\x63\xD9\x37"</div><div class='add'>+			  "\x08\xB1\x38\xCC\x42\xA6\x6E\xB3",</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "a",</div><div class='add'>+		.psize	= 1,</div><div class='add'>+		.digest	= "\x8A\xCA\x26\x02\x79\x2A\xEC\x6F"</div><div class='add'>+			  "\x11\xA6\x72\x06\x53\x1F\xB7\xD7"</div><div class='add'>+			  "\xF0\xDF\xF5\x94\x13\x14\x5E\x69"</div><div class='add'>+			  "\x73\xC4\x50\x01\xD0\x08\x7B\x42"</div><div class='add'>+			  "\xD1\x1B\xC6\x45\x41\x3A\xEF\xF6"</div><div class='add'>+			  "\x3A\x42\x39\x1A\x39\x14\x5A\x59"</div><div class='add'>+			  "\x1A\x92\x20\x0D\x56\x01\x95\xE5"</div><div class='add'>+			  "\x3B\x47\x85\x84\xFD\xAE\x23\x1A",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "abc",</div><div class='add'>+		.psize	= 3,</div><div class='add'>+		.digest	= "\x4E\x24\x48\xA4\xC6\xF4\x86\xBB"</div><div class='add'>+			  "\x16\xB6\x56\x2C\x73\xB4\x02\x0B"</div><div class='add'>+			  "\xF3\x04\x3E\x3A\x73\x1B\xCE\x72"</div><div class='add'>+			  "\x1A\xE1\xB3\x03\xD9\x7E\x6D\x4C"</div><div class='add'>+			  "\x71\x81\xEE\xBD\xB6\xC5\x7E\x27"</div><div class='add'>+			  "\x7D\x0E\x34\x95\x71\x14\xCB\xD6"</div><div class='add'>+			  "\xC7\x97\xFC\x9D\x95\xD8\xB5\x82"</div><div class='add'>+			  "\xD2\x25\x29\x20\x76\xD4\xEE\xF5",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "message digest",</div><div class='add'>+		.psize	= 14,</div><div class='add'>+		.digest	= "\x37\x8C\x84\xA4\x12\x6E\x2D\xC6"</div><div class='add'>+			  "\xE5\x6D\xCC\x74\x58\x37\x7A\xAC"</div><div class='add'>+			  "\x83\x8D\x00\x03\x22\x30\xF5\x3C"</div><div class='add'>+			  "\xE1\xF5\x70\x0C\x0F\xFB\x4D\x3B"</div><div class='add'>+			  "\x84\x21\x55\x76\x59\xEF\x55\xC1"</div><div class='add'>+			  "\x06\xB4\xB5\x2A\xC5\xA4\xAA\xA6"</div><div class='add'>+			  "\x92\xED\x92\x00\x52\x83\x8F\x33"</div><div class='add'>+			  "\x62\xE8\x6D\xBD\x37\xA8\x90\x3E",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "abcdefghijklmnopqrstuvwxyz",</div><div class='add'>+		.psize	= 26,</div><div class='add'>+		.digest	= "\xF1\xD7\x54\x66\x26\x36\xFF\xE9"</div><div class='add'>+			  "\x2C\x82\xEB\xB9\x21\x2A\x48\x4A"</div><div class='add'>+			  "\x8D\x38\x63\x1E\xAD\x42\x38\xF5"</div><div class='add'>+			  "\x44\x2E\xE1\x3B\x80\x54\xE4\x1B"</div><div class='add'>+			  "\x08\xBF\x2A\x92\x51\xC3\x0B\x6A"</div><div class='add'>+			  "\x0B\x8A\xAE\x86\x17\x7A\xB4\xA6"</div><div class='add'>+			  "\xF6\x8F\x67\x3E\x72\x07\x86\x5D"</div><div class='add'>+			  "\x5D\x98\x19\xA3\xDB\xA4\xEB\x3B",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"</div><div class='add'>+			   "abcdefghijklmnopqrstuvwxyz0123456789",</div><div class='add'>+		.psize	= 62,</div><div class='add'>+		.digest	= "\xDC\x37\xE0\x08\xCF\x9E\xE6\x9B"</div><div class='add'>+			  "\xF1\x1F\x00\xED\x9A\xBA\x26\x90"</div><div class='add'>+			  "\x1D\xD7\xC2\x8C\xDE\xC0\x66\xCC"</div><div class='add'>+			  "\x6A\xF4\x2E\x40\xF8\x2F\x3A\x1E"</div><div class='add'>+			  "\x08\xEB\xA2\x66\x29\x12\x9D\x8F"</div><div class='add'>+			  "\xB7\xCB\x57\x21\x1B\x92\x81\xA6"</div><div class='add'>+			  "\x55\x17\xCC\x87\x9D\x7B\x96\x21"</div><div class='add'>+			  "\x42\xC6\x5F\x5A\x7A\xF0\x14\x67",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "1234567890123456789012345678901234567890"</div><div class='add'>+			   "1234567890123456789012345678901234567890",</div><div class='add'>+		.psize	= 80,</div><div class='add'>+		.digest	= "\x46\x6E\xF1\x8B\xAB\xB0\x15\x4D"</div><div class='add'>+			  "\x25\xB9\xD3\x8A\x64\x14\xF5\xC0"</div><div class='add'>+			  "\x87\x84\x37\x2B\xCC\xB2\x04\xD6"</div><div class='add'>+			  "\x54\x9C\x4A\xFA\xDB\x60\x14\x29"</div><div class='add'>+			  "\x4D\x5B\xD8\xDF\x2A\x6C\x44\xE5"</div><div class='add'>+			  "\x38\xCD\x04\x7B\x26\x81\xA5\x1A"</div><div class='add'>+			  "\x2C\x60\x48\x1E\x88\xC5\xA2\x0B"</div><div class='add'>+			  "\x2C\x2A\x80\xCF\x3A\x9A\x08\x3B",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "abcdbcdecdefdefgefghfghighijhijk",</div><div class='add'>+		.psize	= 32,</div><div class='add'>+		.digest	= "\x2A\x98\x7E\xA4\x0F\x91\x70\x61"</div><div class='add'>+			  "\xF5\xD6\xF0\xA0\xE4\x64\x4F\x48"</div><div class='add'>+			  "\x8A\x7A\x5A\x52\xDE\xEE\x65\x62"</div><div class='add'>+			  "\x07\xC5\x62\xF9\x88\xE9\x5C\x69"</div><div class='add'>+			  "\x16\xBD\xC8\x03\x1B\xC5\xBE\x1B"</div><div class='add'>+			  "\x7B\x94\x76\x39\xFE\x05\x0B\x56"</div><div class='add'>+			  "\x93\x9B\xAA\xA0\xAD\xFF\x9A\xE6"</div><div class='add'>+			  "\x74\x5B\x7B\x18\x1C\x3B\xE3\xFD",</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define WP384_TEST_VECTORS	8</div><div class='add'>+</div><div class='add'>+static struct hash_testvec wp384_tv_template[] = {</div><div class='add'>+	{</div><div class='add'>+		.plaintext = "",</div><div class='add'>+		.psize	= 0,</div><div class='add'>+		.digest	= "\x19\xFA\x61\xD7\x55\x22\xA4\x66"</div><div class='add'>+			  "\x9B\x44\xE3\x9C\x1D\x2E\x17\x26"</div><div class='add'>+			  "\xC5\x30\x23\x21\x30\xD4\x07\xF8"</div><div class='add'>+			  "\x9A\xFE\xE0\x96\x49\x97\xF7\xA7"</div><div class='add'>+			  "\x3E\x83\xBE\x69\x8B\x28\x8F\xEB"</div><div class='add'>+			  "\xCF\x88\xE3\xE0\x3C\x4F\x07\x57",</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "a",</div><div class='add'>+		.psize	= 1,</div><div class='add'>+		.digest	= "\x8A\xCA\x26\x02\x79\x2A\xEC\x6F"</div><div class='add'>+			  "\x11\xA6\x72\x06\x53\x1F\xB7\xD7"</div><div class='add'>+			  "\xF0\xDF\xF5\x94\x13\x14\x5E\x69"</div><div class='add'>+			  "\x73\xC4\x50\x01\xD0\x08\x7B\x42"</div><div class='add'>+			  "\xD1\x1B\xC6\x45\x41\x3A\xEF\xF6"</div><div class='add'>+			  "\x3A\x42\x39\x1A\x39\x14\x5A\x59",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "abc",</div><div class='add'>+		.psize	= 3,</div><div class='add'>+		.digest	= "\x4E\x24\x48\xA4\xC6\xF4\x86\xBB"</div><div class='add'>+			  "\x16\xB6\x56\x2C\x73\xB4\x02\x0B"</div><div class='add'>+			  "\xF3\x04\x3E\x3A\x73\x1B\xCE\x72"</div><div class='add'>+			  "\x1A\xE1\xB3\x03\xD9\x7E\x6D\x4C"</div><div class='add'>+			  "\x71\x81\xEE\xBD\xB6\xC5\x7E\x27"</div><div class='add'>+			  "\x7D\x0E\x34\x95\x71\x14\xCB\xD6",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "message digest",</div><div class='add'>+		.psize	= 14,</div><div class='add'>+		.digest	= "\x37\x8C\x84\xA4\x12\x6E\x2D\xC6"</div><div class='add'>+			  "\xE5\x6D\xCC\x74\x58\x37\x7A\xAC"</div><div class='add'>+			  "\x83\x8D\x00\x03\x22\x30\xF5\x3C"</div><div class='add'>+			  "\xE1\xF5\x70\x0C\x0F\xFB\x4D\x3B"</div><div class='add'>+			  "\x84\x21\x55\x76\x59\xEF\x55\xC1"</div><div class='add'>+			  "\x06\xB4\xB5\x2A\xC5\xA4\xAA\xA6",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "abcdefghijklmnopqrstuvwxyz",</div><div class='add'>+		.psize	= 26,</div><div class='add'>+		.digest	= "\xF1\xD7\x54\x66\x26\x36\xFF\xE9"</div><div class='add'>+			  "\x2C\x82\xEB\xB9\x21\x2A\x48\x4A"</div><div class='add'>+			  "\x8D\x38\x63\x1E\xAD\x42\x38\xF5"</div><div class='add'>+			  "\x44\x2E\xE1\x3B\x80\x54\xE4\x1B"</div><div class='add'>+			  "\x08\xBF\x2A\x92\x51\xC3\x0B\x6A"</div><div class='add'>+			  "\x0B\x8A\xAE\x86\x17\x7A\xB4\xA6",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"</div><div class='add'>+			   "abcdefghijklmnopqrstuvwxyz0123456789",</div><div class='add'>+		.psize	= 62,</div><div class='add'>+		.digest	= "\xDC\x37\xE0\x08\xCF\x9E\xE6\x9B"</div><div class='add'>+			  "\xF1\x1F\x00\xED\x9A\xBA\x26\x90"</div><div class='add'>+			  "\x1D\xD7\xC2\x8C\xDE\xC0\x66\xCC"</div><div class='add'>+			  "\x6A\xF4\x2E\x40\xF8\x2F\x3A\x1E"</div><div class='add'>+			  "\x08\xEB\xA2\x66\x29\x12\x9D\x8F"</div><div class='add'>+			  "\xB7\xCB\x57\x21\x1B\x92\x81\xA6",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "1234567890123456789012345678901234567890"</div><div class='add'>+			   "1234567890123456789012345678901234567890",</div><div class='add'>+		.psize	= 80,</div><div class='add'>+		.digest	= "\x46\x6E\xF1\x8B\xAB\xB0\x15\x4D"</div><div class='add'>+			  "\x25\xB9\xD3\x8A\x64\x14\xF5\xC0"</div><div class='add'>+			  "\x87\x84\x37\x2B\xCC\xB2\x04\xD6"</div><div class='add'>+			  "\x54\x9C\x4A\xFA\xDB\x60\x14\x29"</div><div class='add'>+			  "\x4D\x5B\xD8\xDF\x2A\x6C\x44\xE5"</div><div class='add'>+			  "\x38\xCD\x04\x7B\x26\x81\xA5\x1A",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "abcdbcdecdefdefgefghfghighijhijk",</div><div class='add'>+		.psize	= 32,</div><div class='add'>+		.digest	= "\x2A\x98\x7E\xA4\x0F\x91\x70\x61"</div><div class='add'>+			  "\xF5\xD6\xF0\xA0\xE4\x64\x4F\x48"</div><div class='add'>+			  "\x8A\x7A\x5A\x52\xDE\xEE\x65\x62"</div><div class='add'>+			  "\x07\xC5\x62\xF9\x88\xE9\x5C\x69"</div><div class='add'>+			  "\x16\xBD\xC8\x03\x1B\xC5\xBE\x1B"</div><div class='add'>+			  "\x7B\x94\x76\x39\xFE\x05\x0B\x56",</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define WP256_TEST_VECTORS	8</div><div class='add'>+</div><div class='add'>+static struct hash_testvec wp256_tv_template[] = {</div><div class='add'>+	{</div><div class='add'>+		.plaintext = "",</div><div class='add'>+		.psize	= 0,</div><div class='add'>+		.digest	= "\x19\xFA\x61\xD7\x55\x22\xA4\x66"</div><div class='add'>+			  "\x9B\x44\xE3\x9C\x1D\x2E\x17\x26"</div><div class='add'>+			  "\xC5\x30\x23\x21\x30\xD4\x07\xF8"</div><div class='add'>+			  "\x9A\xFE\xE0\x96\x49\x97\xF7\xA7",</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "a",</div><div class='add'>+		.psize	= 1,</div><div class='add'>+		.digest	= "\x8A\xCA\x26\x02\x79\x2A\xEC\x6F"</div><div class='add'>+			  "\x11\xA6\x72\x06\x53\x1F\xB7\xD7"</div><div class='add'>+			  "\xF0\xDF\xF5\x94\x13\x14\x5E\x69"</div><div class='add'>+			  "\x73\xC4\x50\x01\xD0\x08\x7B\x42",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "abc",</div><div class='add'>+		.psize	= 3,</div><div class='add'>+		.digest	= "\x4E\x24\x48\xA4\xC6\xF4\x86\xBB"</div><div class='add'>+			  "\x16\xB6\x56\x2C\x73\xB4\x02\x0B"</div><div class='add'>+			  "\xF3\x04\x3E\x3A\x73\x1B\xCE\x72"</div><div class='add'>+			  "\x1A\xE1\xB3\x03\xD9\x7E\x6D\x4C",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "message digest",</div><div class='add'>+		.psize	= 14,</div><div class='add'>+		.digest	= "\x37\x8C\x84\xA4\x12\x6E\x2D\xC6"</div><div class='add'>+			  "\xE5\x6D\xCC\x74\x58\x37\x7A\xAC"</div><div class='add'>+			  "\x83\x8D\x00\x03\x22\x30\xF5\x3C"</div><div class='add'>+			  "\xE1\xF5\x70\x0C\x0F\xFB\x4D\x3B",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "abcdefghijklmnopqrstuvwxyz",</div><div class='add'>+		.psize	= 26,</div><div class='add'>+		.digest	= "\xF1\xD7\x54\x66\x26\x36\xFF\xE9"</div><div class='add'>+			  "\x2C\x82\xEB\xB9\x21\x2A\x48\x4A"</div><div class='add'>+			  "\x8D\x38\x63\x1E\xAD\x42\x38\xF5"</div><div class='add'>+			  "\x44\x2E\xE1\x3B\x80\x54\xE4\x1B",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"</div><div class='add'>+			   "abcdefghijklmnopqrstuvwxyz0123456789",</div><div class='add'>+		.psize	= 62,</div><div class='add'>+		.digest	= "\xDC\x37\xE0\x08\xCF\x9E\xE6\x9B"</div><div class='add'>+			  "\xF1\x1F\x00\xED\x9A\xBA\x26\x90"</div><div class='add'>+			  "\x1D\xD7\xC2\x8C\xDE\xC0\x66\xCC"</div><div class='add'>+			  "\x6A\xF4\x2E\x40\xF8\x2F\x3A\x1E",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "1234567890123456789012345678901234567890"</div><div class='add'>+			   "1234567890123456789012345678901234567890",</div><div class='add'>+		.psize	= 80,</div><div class='add'>+		.digest	= "\x46\x6E\xF1\x8B\xAB\xB0\x15\x4D"</div><div class='add'>+			  "\x25\xB9\xD3\x8A\x64\x14\xF5\xC0"</div><div class='add'>+			  "\x87\x84\x37\x2B\xCC\xB2\x04\xD6"</div><div class='add'>+			  "\x54\x9C\x4A\xFA\xDB\x60\x14\x29",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "abcdbcdecdefdefgefghfghighijhijk",</div><div class='add'>+		.psize	= 32,</div><div class='add'>+		.digest	= "\x2A\x98\x7E\xA4\x0F\x91\x70\x61"</div><div class='add'>+			  "\xF5\xD6\xF0\xA0\xE4\x64\x4F\x48"</div><div class='add'>+			  "\x8A\x7A\x5A\x52\xDE\xEE\x65\x62"</div><div class='add'>+			  "\x07\xC5\x62\xF9\x88\xE9\x5C\x69",</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * TIGER test vectors from Tiger website</div><div class='add'>+ */</div><div class='add'>+#define TGR192_TEST_VECTORS	6</div><div class='add'>+</div><div class='add'>+static struct hash_testvec tgr192_tv_template[] = {</div><div class='add'>+	{</div><div class='add'>+		.plaintext = "",</div><div class='add'>+		.psize	= 0,</div><div class='add'>+		.digest = "\x24\xf0\x13\x0c\x63\xac\x93\x32"</div><div class='add'>+			  "\x16\x16\x6e\x76\xb1\xbb\x92\x5f"</div><div class='add'>+			  "\xf3\x73\xde\x2d\x49\x58\x4e\x7a",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "abc",</div><div class='add'>+		.psize	= 3,</div><div class='add'>+		.digest = "\xf2\x58\xc1\xe8\x84\x14\xab\x2a"</div><div class='add'>+			  "\x52\x7a\xb5\x41\xff\xc5\xb8\xbf"</div><div class='add'>+			  "\x93\x5f\x7b\x95\x1c\x13\x29\x51",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "Tiger",</div><div class='add'>+		.psize	= 5,</div><div class='add'>+		.digest = "\x9f\x00\xf5\x99\x07\x23\x00\xdd"</div><div class='add'>+			  "\x27\x6a\xbb\x38\xc8\xeb\x6d\xec"</div><div class='add'>+			  "\x37\x79\x0c\x11\x6f\x9d\x2b\xdf",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+-",</div><div class='add'>+		.psize	= 64,</div><div class='add'>+		.digest = "\x87\xfb\x2a\x90\x83\x85\x1c\xf7"</div><div class='add'>+			  "\x47\x0d\x2c\xf8\x10\xe6\xdf\x9e"</div><div class='add'>+			  "\xb5\x86\x44\x50\x34\xa5\xa3\x86",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "ABCDEFGHIJKLMNOPQRSTUVWXYZ=abcdefghijklmnopqrstuvwxyz+0123456789",</div><div class='add'>+		.psize	= 64,</div><div class='add'>+		.digest = "\x46\x7d\xb8\x08\x63\xeb\xce\x48"</div><div class='add'>+			  "\x8d\xf1\xcd\x12\x61\x65\x5d\xe9"</div><div class='add'>+			  "\x57\x89\x65\x65\x97\x5f\x91\x97",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "Tiger - A Fast New Hash Function, "</div><div class='add'>+			   "by Ross Anderson and Eli Biham, "</div><div class='add'>+			   "proceedings of Fast Software Encryption 3, "</div><div class='add'>+			   "Cambridge, 1996.",</div><div class='add'>+		.psize  = 125,</div><div class='add'>+		.digest = "\x3d\x9a\xeb\x03\xd1\xbd\x1a\x63"</div><div class='add'>+			  "\x57\xb2\x77\x4d\xfd\x6d\x5b\x24"</div><div class='add'>+			  "\xdd\x68\x15\x1d\x50\x39\x74\xfc",</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define TGR160_TEST_VECTORS	6</div><div class='add'>+</div><div class='add'>+static struct hash_testvec tgr160_tv_template[] = {</div><div class='add'>+	{</div><div class='add'>+		.plaintext = "",</div><div class='add'>+		.psize	= 0,</div><div class='add'>+		.digest = "\x24\xf0\x13\x0c\x63\xac\x93\x32"</div><div class='add'>+			  "\x16\x16\x6e\x76\xb1\xbb\x92\x5f"</div><div class='add'>+			  "\xf3\x73\xde\x2d",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "abc",</div><div class='add'>+		.psize	= 3,</div><div class='add'>+		.digest = "\xf2\x58\xc1\xe8\x84\x14\xab\x2a"</div><div class='add'>+			  "\x52\x7a\xb5\x41\xff\xc5\xb8\xbf"</div><div class='add'>+			  "\x93\x5f\x7b\x95",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "Tiger",</div><div class='add'>+		.psize	= 5,</div><div class='add'>+		.digest = "\x9f\x00\xf5\x99\x07\x23\x00\xdd"</div><div class='add'>+			  "\x27\x6a\xbb\x38\xc8\xeb\x6d\xec"</div><div class='add'>+			  "\x37\x79\x0c\x11",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+-",</div><div class='add'>+		.psize	= 64,</div><div class='add'>+		.digest = "\x87\xfb\x2a\x90\x83\x85\x1c\xf7"</div><div class='add'>+			  "\x47\x0d\x2c\xf8\x10\xe6\xdf\x9e"</div><div class='add'>+			  "\xb5\x86\x44\x50",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "ABCDEFGHIJKLMNOPQRSTUVWXYZ=abcdefghijklmnopqrstuvwxyz+0123456789",</div><div class='add'>+		.psize	= 64,</div><div class='add'>+		.digest = "\x46\x7d\xb8\x08\x63\xeb\xce\x48"</div><div class='add'>+			  "\x8d\xf1\xcd\x12\x61\x65\x5d\xe9"</div><div class='add'>+			  "\x57\x89\x65\x65",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "Tiger - A Fast New Hash Function, "</div><div class='add'>+			   "by Ross Anderson and Eli Biham, "</div><div class='add'>+			   "proceedings of Fast Software Encryption 3, "</div><div class='add'>+			   "Cambridge, 1996.",</div><div class='add'>+		.psize  = 125,</div><div class='add'>+		.digest = "\x3d\x9a\xeb\x03\xd1\xbd\x1a\x63"</div><div class='add'>+			  "\x57\xb2\x77\x4d\xfd\x6d\x5b\x24"</div><div class='add'>+			  "\xdd\x68\x15\x1d",</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define TGR128_TEST_VECTORS	6</div><div class='add'>+</div><div class='add'>+static struct hash_testvec tgr128_tv_template[] = {</div><div class='add'>+	{</div><div class='add'>+		.plaintext = "",</div><div class='add'>+		.psize	= 0,</div><div class='add'>+		.digest = "\x24\xf0\x13\x0c\x63\xac\x93\x32"</div><div class='add'>+			  "\x16\x16\x6e\x76\xb1\xbb\x92\x5f",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "abc",</div><div class='add'>+		.psize	= 3,</div><div class='add'>+		.digest = "\xf2\x58\xc1\xe8\x84\x14\xab\x2a"</div><div class='add'>+			  "\x52\x7a\xb5\x41\xff\xc5\xb8\xbf",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "Tiger",</div><div class='add'>+		.psize	= 5,</div><div class='add'>+		.digest = "\x9f\x00\xf5\x99\x07\x23\x00\xdd"</div><div class='add'>+			  "\x27\x6a\xbb\x38\xc8\xeb\x6d\xec",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+-",</div><div class='add'>+		.psize	= 64,</div><div class='add'>+		.digest = "\x87\xfb\x2a\x90\x83\x85\x1c\xf7"</div><div class='add'>+			  "\x47\x0d\x2c\xf8\x10\xe6\xdf\x9e",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "ABCDEFGHIJKLMNOPQRSTUVWXYZ=abcdefghijklmnopqrstuvwxyz+0123456789",</div><div class='add'>+		.psize	= 64,</div><div class='add'>+		.digest = "\x46\x7d\xb8\x08\x63\xeb\xce\x48"</div><div class='add'>+			  "\x8d\xf1\xcd\x12\x61\x65\x5d\xe9",</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext = "Tiger - A Fast New Hash Function, "</div><div class='add'>+			   "by Ross Anderson and Eli Biham, "</div><div class='add'>+			   "proceedings of Fast Software Encryption 3, "</div><div class='add'>+			   "Cambridge, 1996.",</div><div class='add'>+		.psize  = 125,</div><div class='add'>+		.digest = "\x3d\x9a\xeb\x03\xd1\xbd\x1a\x63"</div><div class='add'>+			  "\x57\xb2\x77\x4d\xfd\x6d\x5b\x24",</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * HMAC-MD5 test vectors from RFC2202</div><div class='add'>+ * (These need to be fixed to not use strlen).</div><div class='add'>+ */</div><div class='add'>+#define HMAC_MD5_TEST_VECTORS	7</div><div class='add'>+</div><div class='add'>+static struct hash_testvec hmac_md5_tv_template[] =</div><div class='add'>+{</div><div class='add'>+	{</div><div class='add'>+		.key	= "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b",</div><div class='add'>+		.ksize	= 16,</div><div class='add'>+		.plaintext = "Hi There",</div><div class='add'>+		.psize	= 8,</div><div class='add'>+		.digest	= "\x92\x94\x72\x7a\x36\x38\xbb\x1c"</div><div class='add'>+			  "\x13\xf4\x8e\xf8\x15\x8b\xfc\x9d",</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "Jefe",</div><div class='add'>+		.ksize	= 4,</div><div class='add'>+		.plaintext = "what do ya want for nothing?",</div><div class='add'>+		.psize	= 28,</div><div class='add'>+		.digest	= "\x75\x0c\x78\x3e\x6a\xb0\xb5\x03"</div><div class='add'>+			  "\xea\xa8\x6e\x31\x0a\x5d\xb7\x38",</div><div class='add'>+		.np	= 2,</div><div class='add'>+		.tap	= {14, 14}</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa",</div><div class='add'>+		.ksize	= 16,</div><div class='add'>+		.plaintext = "\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd"</div><div class='add'>+			"\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd"</div><div class='add'>+			"\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd"</div><div class='add'>+			"\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd",</div><div class='add'>+		.psize	= 50,</div><div class='add'>+		.digest	= "\x56\xbe\x34\x52\x1d\x14\x4c\x88"</div><div class='add'>+			  "\xdb\xb8\xc7\x33\xf0\xe8\xb3\xf6",</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x01\x02\x03\x04\x05\x06\x07\x08"</div><div class='add'>+			  "\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10"</div><div class='add'>+			  "\x11\x12\x13\x14\x15\x16\x17\x18\x19",</div><div class='add'>+		.ksize	= 25,</div><div class='add'>+		.plaintext = "\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd"</div><div class='add'>+			"\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd"</div><div class='add'>+			"\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd"</div><div class='add'>+			"\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd",</div><div class='add'>+		.psize	= 50,</div><div class='add'>+		.digest	= "\x69\x7e\xaf\x0a\xca\x3a\x3a\xea"</div><div class='add'>+			  "\x3a\x75\x16\x47\x46\xff\xaa\x79",</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c",</div><div class='add'>+		.ksize	= 16,</div><div class='add'>+		.plaintext = "Test With Truncation",</div><div class='add'>+		.psize	= 20,</div><div class='add'>+		.digest	= "\x56\x46\x1e\xf2\x34\x2e\xdc\x00"</div><div class='add'>+			  "\xf9\xba\xb9\x95\x69\x0e\xfd\x4c",</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa",</div><div class='add'>+		.ksize	= 80,</div><div class='add'>+		.plaintext = "Test Using Larger Than Block-Size Key - Hash Key First",</div><div class='add'>+		.psize	= 54,</div><div class='add'>+		.digest	= "\x6b\x1a\xb7\xfe\x4b\xd7\xbf\x8f"</div><div class='add'>+			  "\x0b\x62\xe6\xce\x61\xb9\xd0\xcd",</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa",</div><div class='add'>+		.ksize	= 80,</div><div class='add'>+		.plaintext = "Test Using Larger Than Block-Size Key and Larger Than One "</div><div class='add'>+			   "Block-Size Data",</div><div class='add'>+		.psize	= 73,</div><div class='add'>+		.digest	= "\x6f\x63\x0f\xad\x67\xcd\xa0\xee"</div><div class='add'>+			  "\x1f\xb1\xf5\x62\xdb\x3a\xa5\x3e",</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * HMAC-RIPEMD128 test vectors from RFC2286</div><div class='add'>+ */</div><div class='add'>+#define HMAC_RMD128_TEST_VECTORS	7</div><div class='add'>+</div><div class='add'>+static struct hash_testvec hmac_rmd128_tv_template[] = {</div><div class='add'>+	{</div><div class='add'>+		.key	= "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b",</div><div class='add'>+		.ksize	= 16,</div><div class='add'>+		.plaintext = "Hi There",</div><div class='add'>+		.psize	= 8,</div><div class='add'>+		.digest	= "\xfb\xf6\x1f\x94\x92\xaa\x4b\xbf"</div><div class='add'>+			  "\x81\xc1\x72\xe8\x4e\x07\x34\xdb",</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "Jefe",</div><div class='add'>+		.ksize	= 4,</div><div class='add'>+		.plaintext = "what do ya want for nothing?",</div><div class='add'>+		.psize	= 28,</div><div class='add'>+		.digest	= "\x87\x5f\x82\x88\x62\xb6\xb3\x34"</div><div class='add'>+			  "\xb4\x27\xc5\x5f\x9f\x7f\xf0\x9b",</div><div class='add'>+		.np	= 2,</div><div class='add'>+		.tap	= { 14, 14 },</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa",</div><div class='add'>+		.ksize	= 16,</div><div class='add'>+		.plaintext = "\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd"</div><div class='add'>+			"\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd"</div><div class='add'>+			"\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd"</div><div class='add'>+			"\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd",</div><div class='add'>+		.psize	= 50,</div><div class='add'>+		.digest	= "\x09\xf0\xb2\x84\x6d\x2f\x54\x3d"</div><div class='add'>+			  "\xa3\x63\xcb\xec\x8d\x62\xa3\x8d",</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x01\x02\x03\x04\x05\x06\x07\x08"</div><div class='add'>+			  "\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10"</div><div class='add'>+			  "\x11\x12\x13\x14\x15\x16\x17\x18\x19",</div><div class='add'>+		.ksize	= 25,</div><div class='add'>+		.plaintext = "\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd"</div><div class='add'>+			"\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd"</div><div class='add'>+			"\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd"</div><div class='add'>+			"\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd",</div><div class='add'>+		.psize	= 50,</div><div class='add'>+		.digest	= "\xbd\xbb\xd7\xcf\x03\xe4\x4b\x5a"</div><div class='add'>+			  "\xa6\x0a\xf8\x15\xbe\x4d\x22\x94",</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c",</div><div class='add'>+		.ksize	= 16,</div><div class='add'>+		.plaintext = "Test With Truncation",</div><div class='add'>+		.psize	= 20,</div><div class='add'>+		.digest	= "\xe7\x98\x08\xf2\x4b\x25\xfd\x03"</div><div class='add'>+			  "\x1c\x15\x5f\x0d\x55\x1d\x9a\x3a",</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa",</div><div class='add'>+		.ksize	= 80,</div><div class='add'>+		.plaintext = "Test Using Larger Than Block-Size Key - Hash Key First",</div><div class='add'>+		.psize	= 54,</div><div class='add'>+		.digest	= "\xdc\x73\x29\x28\xde\x98\x10\x4a"</div><div class='add'>+			  "\x1f\x59\xd3\x73\xc1\x50\xac\xbb",</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa",</div><div class='add'>+		.ksize	= 80,</div><div class='add'>+		.plaintext = "Test Using Larger Than Block-Size Key and Larger Than One "</div><div class='add'>+			   "Block-Size Data",</div><div class='add'>+		.psize	= 73,</div><div class='add'>+		.digest	= "\x5c\x6b\xec\x96\x79\x3e\x16\xd4"</div><div class='add'>+			  "\x06\x90\xc2\x37\x63\x5f\x30\xc5",</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * HMAC-RIPEMD160 test vectors from RFC2286</div><div class='add'>+ */</div><div class='add'>+#define HMAC_RMD160_TEST_VECTORS	7</div><div class='add'>+</div><div class='add'>+static struct hash_testvec hmac_rmd160_tv_template[] = {</div><div class='add'>+	{</div><div class='add'>+		.key	= "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b",</div><div class='add'>+		.ksize	= 20,</div><div class='add'>+		.plaintext = "Hi There",</div><div class='add'>+		.psize	= 8,</div><div class='add'>+		.digest	= "\x24\xcb\x4b\xd6\x7d\x20\xfc\x1a\x5d\x2e"</div><div class='add'>+			  "\xd7\x73\x2d\xcc\x39\x37\x7f\x0a\x56\x68",</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "Jefe",</div><div class='add'>+		.ksize	= 4,</div><div class='add'>+		.plaintext = "what do ya want for nothing?",</div><div class='add'>+		.psize	= 28,</div><div class='add'>+		.digest	= "\xdd\xa6\xc0\x21\x3a\x48\x5a\x9e\x24\xf4"</div><div class='add'>+			  "\x74\x20\x64\xa7\xf0\x33\xb4\x3c\x40\x69",</div><div class='add'>+		.np	= 2,</div><div class='add'>+		.tap	= { 14, 14 },</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa",</div><div class='add'>+		.ksize	= 20,</div><div class='add'>+		.plaintext = "\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd"</div><div class='add'>+			"\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd"</div><div class='add'>+			"\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd"</div><div class='add'>+			"\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd",</div><div class='add'>+		.psize	= 50,</div><div class='add'>+		.digest	= "\xb0\xb1\x05\x36\x0d\xe7\x59\x96\x0a\xb4"</div><div class='add'>+			  "\xf3\x52\x98\xe1\x16\xe2\x95\xd8\xe7\xc1",</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x01\x02\x03\x04\x05\x06\x07\x08"</div><div class='add'>+			  "\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10"</div><div class='add'>+			  "\x11\x12\x13\x14\x15\x16\x17\x18\x19",</div><div class='add'>+		.ksize	= 25,</div><div class='add'>+		.plaintext = "\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd"</div><div class='add'>+			"\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd"</div><div class='add'>+			"\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd"</div><div class='add'>+			"\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd",</div><div class='add'>+		.psize	= 50,</div><div class='add'>+		.digest	= "\xd5\xca\x86\x2f\x4d\x21\xd5\xe6\x10\xe1"</div><div class='add'>+			  "\x8b\x4c\xf1\xbe\xb9\x7a\x43\x65\xec\xf4",</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c",</div><div class='add'>+		.ksize	= 20,</div><div class='add'>+		.plaintext = "Test With Truncation",</div><div class='add'>+		.psize	= 20,</div><div class='add'>+		.digest	= "\x76\x19\x69\x39\x78\xf9\x1d\x90\x53\x9a"</div><div class='add'>+			  "\xe7\x86\x50\x0f\xf3\xd8\xe0\x51\x8e\x39",</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa",</div><div class='add'>+		.ksize	= 80,</div><div class='add'>+		.plaintext = "Test Using Larger Than Block-Size Key - Hash Key First",</div><div class='add'>+		.psize	= 54,</div><div class='add'>+		.digest	= "\x64\x66\xca\x07\xac\x5e\xac\x29\xe1\xbd"</div><div class='add'>+			  "\x52\x3e\x5a\xda\x76\x05\xb7\x91\xfd\x8b",</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa",</div><div class='add'>+		.ksize	= 80,</div><div class='add'>+		.plaintext = "Test Using Larger Than Block-Size Key and Larger Than One "</div><div class='add'>+			   "Block-Size Data",</div><div class='add'>+		.psize	= 73,</div><div class='add'>+		.digest	= "\x69\xea\x60\x79\x8d\x71\x61\x6c\xce\x5f"</div><div class='add'>+			  "\xd0\x87\x1e\x23\x75\x4c\xd7\x5d\x5a\x0a",</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * HMAC-SHA1 test vectors from RFC2202</div><div class='add'>+ */</div><div class='add'>+#define HMAC_SHA1_TEST_VECTORS	7</div><div class='add'>+</div><div class='add'>+static struct hash_testvec hmac_sha1_tv_template[] = {</div><div class='add'>+	{</div><div class='add'>+		.key	= "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b",</div><div class='add'>+		.ksize	= 20,</div><div class='add'>+		.plaintext = "Hi There",</div><div class='add'>+		.psize	= 8,</div><div class='add'>+		.digest	= "\xb6\x17\x31\x86\x55\x05\x72\x64"</div><div class='add'>+			  "\xe2\x8b\xc0\xb6\xfb\x37\x8c\x8e\xf1"</div><div class='add'>+			  "\x46\xbe",</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "Jefe",</div><div class='add'>+		.ksize	= 4,</div><div class='add'>+		.plaintext = "what do ya want for nothing?",</div><div class='add'>+		.psize	= 28,</div><div class='add'>+		.digest	= "\xef\xfc\xdf\x6a\xe5\xeb\x2f\xa2\xd2\x74"</div><div class='add'>+			  "\x16\xd5\xf1\x84\xdf\x9c\x25\x9a\x7c\x79",</div><div class='add'>+		.np	= 2,</div><div class='add'>+		.tap	= { 14, 14 }</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa",</div><div class='add'>+		.ksize	= 20,</div><div class='add'>+		.plaintext = "\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd"</div><div class='add'>+			"\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd"</div><div class='add'>+			"\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd"</div><div class='add'>+			"\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd",</div><div class='add'>+		.psize	= 50,</div><div class='add'>+		.digest	= "\x12\x5d\x73\x42\xb9\xac\x11\xcd\x91\xa3"</div><div class='add'>+			  "\x9a\xf4\x8a\xa1\x7b\x4f\x63\xf1\x75\xd3",</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x01\x02\x03\x04\x05\x06\x07\x08"</div><div class='add'>+			  "\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10"</div><div class='add'>+			  "\x11\x12\x13\x14\x15\x16\x17\x18\x19",</div><div class='add'>+		.ksize	= 25,</div><div class='add'>+		.plaintext = "\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd"</div><div class='add'>+			"\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd"</div><div class='add'>+			"\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd"</div><div class='add'>+			"\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd",</div><div class='add'>+		.psize	= 50,</div><div class='add'>+		.digest	= "\x4c\x90\x07\xf4\x02\x62\x50\xc6\xbc\x84"</div><div class='add'>+			  "\x14\xf9\xbf\x50\xc8\x6c\x2d\x72\x35\xda",</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c",</div><div class='add'>+		.ksize	= 20,</div><div class='add'>+		.plaintext = "Test With Truncation",</div><div class='add'>+		.psize	= 20,</div><div class='add'>+		.digest	= "\x4c\x1a\x03\x42\x4b\x55\xe0\x7f\xe7\xf2"</div><div class='add'>+			  "\x7b\xe1\xd5\x8b\xb9\x32\x4a\x9a\x5a\x04",</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa",</div><div class='add'>+		.ksize	= 80,</div><div class='add'>+		.plaintext = "Test Using Larger Than Block-Size Key - Hash Key First",</div><div class='add'>+		.psize	= 54,</div><div class='add'>+		.digest	= "\xaa\x4a\xe5\xe1\x52\x72\xd0\x0e\x95\x70"</div><div class='add'>+			  "\x56\x37\xce\x8a\x3b\x55\xed\x40\x21\x12",</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa",</div><div class='add'>+		.ksize	= 80,</div><div class='add'>+		.plaintext = "Test Using Larger Than Block-Size Key and Larger Than One "</div><div class='add'>+			   "Block-Size Data",</div><div class='add'>+		.psize	= 73,</div><div class='add'>+		.digest	= "\xe8\xe9\x9d\x0f\x45\x23\x7d\x78\x6d\x6b"</div><div class='add'>+			  "\xba\xa7\x96\x5c\x78\x08\xbb\xff\x1a\x91",</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * SHA224 HMAC test vectors from RFC4231</div><div class='add'>+ */</div><div class='add'>+#define HMAC_SHA224_TEST_VECTORS    4</div><div class='add'>+</div><div class='add'>+static struct hash_testvec hmac_sha224_tv_template[] = {</div><div class='add'>+	{</div><div class='add'>+		.key    = "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b"</div><div class='add'>+			"\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b"</div><div class='add'>+			"\x0b\x0b\x0b\x0b",</div><div class='add'>+		.ksize  = 20,</div><div class='add'>+		/*  ("Hi There") */</div><div class='add'>+		.plaintext = "\x48\x69\x20\x54\x68\x65\x72\x65",</div><div class='add'>+		.psize  = 8,</div><div class='add'>+		.digest = "\x89\x6f\xb1\x12\x8a\xbb\xdf\x19"</div><div class='add'>+			"\x68\x32\x10\x7c\xd4\x9d\xf3\x3f"</div><div class='add'>+			"\x47\xb4\xb1\x16\x99\x12\xba\x4f"</div><div class='add'>+			"\x53\x68\x4b\x22",</div><div class='add'>+	}, {</div><div class='add'>+		.key    = "Jefe",</div><div class='add'>+		.ksize  = 4,</div><div class='add'>+		/* ("what do ya want for nothing?") */</div><div class='add'>+		.plaintext = "\x77\x68\x61\x74\x20\x64\x6f\x20"</div><div class='add'>+			"\x79\x61\x20\x77\x61\x6e\x74\x20"</div><div class='add'>+			"\x66\x6f\x72\x20\x6e\x6f\x74\x68"</div><div class='add'>+			"\x69\x6e\x67\x3f",</div><div class='add'>+		.psize  = 28,</div><div class='add'>+		.digest = "\xa3\x0e\x01\x09\x8b\xc6\xdb\xbf"</div><div class='add'>+			"\x45\x69\x0f\x3a\x7e\x9e\x6d\x0f"</div><div class='add'>+			"\x8b\xbe\xa2\xa3\x9e\x61\x48\x00"</div><div class='add'>+			"\x8f\xd0\x5e\x44",</div><div class='add'>+		.np = 4,</div><div class='add'>+		.tap    = { 7, 7, 7, 7 }</div><div class='add'>+	}, {</div><div class='add'>+		.key    = "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa",</div><div class='add'>+		.ksize  = 131,</div><div class='add'>+		/* ("Test Using Larger Than Block-Size Key - Hash Key First") */</div><div class='add'>+		.plaintext = "\x54\x65\x73\x74\x20\x55\x73\x69"</div><div class='add'>+			"\x6e\x67\x20\x4c\x61\x72\x67\x65"</div><div class='add'>+			"\x72\x20\x54\x68\x61\x6e\x20\x42"</div><div class='add'>+			"\x6c\x6f\x63\x6b\x2d\x53\x69\x7a"</div><div class='add'>+			"\x65\x20\x4b\x65\x79\x20\x2d\x20"</div><div class='add'>+			"\x48\x61\x73\x68\x20\x4b\x65\x79"</div><div class='add'>+			"\x20\x46\x69\x72\x73\x74",</div><div class='add'>+		.psize  = 54,</div><div class='add'>+		.digest = "\x95\xe9\xa0\xdb\x96\x20\x95\xad"</div><div class='add'>+			"\xae\xbe\x9b\x2d\x6f\x0d\xbc\xe2"</div><div class='add'>+			"\xd4\x99\xf1\x12\xf2\xd2\xb7\x27"</div><div class='add'>+			"\x3f\xa6\x87\x0e",</div><div class='add'>+	}, {</div><div class='add'>+		.key    = "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa",</div><div class='add'>+		.ksize  = 131,</div><div class='add'>+		/* ("This is a test using a larger than block-size key and a")</div><div class='add'>+		(" larger than block-size data. The key needs to be")</div><div class='add'>+			(" hashed before being used by the HMAC algorithm.") */</div><div class='add'>+		.plaintext = "\x54\x68\x69\x73\x20\x69\x73\x20"</div><div class='add'>+			"\x61\x20\x74\x65\x73\x74\x20\x75"</div><div class='add'>+			"\x73\x69\x6e\x67\x20\x61\x20\x6c"</div><div class='add'>+			"\x61\x72\x67\x65\x72\x20\x74\x68"</div><div class='add'>+			"\x61\x6e\x20\x62\x6c\x6f\x63\x6b"</div><div class='add'>+			"\x2d\x73\x69\x7a\x65\x20\x6b\x65"</div><div class='add'>+			"\x79\x20\x61\x6e\x64\x20\x61\x20"</div><div class='add'>+			"\x6c\x61\x72\x67\x65\x72\x20\x74"</div><div class='add'>+			"\x68\x61\x6e\x20\x62\x6c\x6f\x63"</div><div class='add'>+			"\x6b\x2d\x73\x69\x7a\x65\x20\x64"</div><div class='add'>+			"\x61\x74\x61\x2e\x20\x54\x68\x65"</div><div class='add'>+			"\x20\x6b\x65\x79\x20\x6e\x65\x65"</div><div class='add'>+			"\x64\x73\x20\x74\x6f\x20\x62\x65"</div><div class='add'>+			"\x20\x68\x61\x73\x68\x65\x64\x20"</div><div class='add'>+			"\x62\x65\x66\x6f\x72\x65\x20\x62"</div><div class='add'>+			"\x65\x69\x6e\x67\x20\x75\x73\x65"</div><div class='add'>+			"\x64\x20\x62\x79\x20\x74\x68\x65"</div><div class='add'>+			"\x20\x48\x4d\x41\x43\x20\x61\x6c"</div><div class='add'>+			"\x67\x6f\x72\x69\x74\x68\x6d\x2e",</div><div class='add'>+		.psize  = 152,</div><div class='add'>+		.digest = "\x3a\x85\x41\x66\xac\x5d\x9f\x02"</div><div class='add'>+			"\x3f\x54\xd5\x17\xd0\xb3\x9d\xbd"</div><div class='add'>+			"\x94\x67\x70\xdb\x9c\x2b\x95\xc9"</div><div class='add'>+			"\xf6\xf5\x65\xd1",</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * HMAC-SHA256 test vectors from</div><div class='add'>+ * draft-ietf-ipsec-ciph-sha-256-01.txt</div><div class='add'>+ */</div><div class='add'>+#define HMAC_SHA256_TEST_VECTORS	10</div><div class='add'>+</div><div class='add'>+static struct hash_testvec hmac_sha256_tv_template[] = {</div><div class='add'>+	{</div><div class='add'>+		.key	= "\x01\x02\x03\x04\x05\x06\x07\x08"</div><div class='add'>+			  "\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10"</div><div class='add'>+			  "\x11\x12\x13\x14\x15\x16\x17\x18"</div><div class='add'>+			  "\x19\x1a\x1b\x1c\x1d\x1e\x1f\x20",</div><div class='add'>+		.ksize	= 32,</div><div class='add'>+		.plaintext = "abc",</div><div class='add'>+		.psize	= 3,</div><div class='add'>+		.digest	= "\xa2\x1b\x1f\x5d\x4c\xf4\xf7\x3a"</div><div class='add'>+			  "\x4d\xd9\x39\x75\x0f\x7a\x06\x6a"</div><div class='add'>+			  "\x7f\x98\xcc\x13\x1c\xb1\x6a\x66"</div><div class='add'>+			  "\x92\x75\x90\x21\xcf\xab\x81\x81",</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x01\x02\x03\x04\x05\x06\x07\x08"</div><div class='add'>+			  "\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10"</div><div class='add'>+			  "\x11\x12\x13\x14\x15\x16\x17\x18"</div><div class='add'>+			  "\x19\x1a\x1b\x1c\x1d\x1e\x1f\x20",</div><div class='add'>+		.ksize	= 32,</div><div class='add'>+		.plaintext = "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",</div><div class='add'>+		.psize	= 56,</div><div class='add'>+		.digest	= "\x10\x4f\xdc\x12\x57\x32\x8f\x08"</div><div class='add'>+			  "\x18\x4b\xa7\x31\x31\xc5\x3c\xae"</div><div class='add'>+			  "\xe6\x98\xe3\x61\x19\x42\x11\x49"</div><div class='add'>+			  "\xea\x8c\x71\x24\x56\x69\x7d\x30",</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x01\x02\x03\x04\x05\x06\x07\x08"</div><div class='add'>+			  "\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10"</div><div class='add'>+			  "\x11\x12\x13\x14\x15\x16\x17\x18"</div><div class='add'>+			  "\x19\x1a\x1b\x1c\x1d\x1e\x1f\x20",</div><div class='add'>+		.ksize	= 32,</div><div class='add'>+		.plaintext = "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"</div><div class='add'>+			   "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",</div><div class='add'>+		.psize	= 112,</div><div class='add'>+		.digest	= "\x47\x03\x05\xfc\x7e\x40\xfe\x34"</div><div class='add'>+			  "\xd3\xee\xb3\xe7\x73\xd9\x5a\xab"</div><div class='add'>+			  "\x73\xac\xf0\xfd\x06\x04\x47\xa5"</div><div class='add'>+			  "\xeb\x45\x95\xbf\x33\xa9\xd1\xa3",</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b"</div><div class='add'>+			"\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b"</div><div class='add'>+			"\x0b\x0b\x0b\x0b\x0b\x0b",</div><div class='add'>+		.ksize	= 32,</div><div class='add'>+		.plaintext = "Hi There",</div><div class='add'>+		.psize	= 8,</div><div class='add'>+		.digest	= "\x19\x8a\x60\x7e\xb4\x4b\xfb\xc6"</div><div class='add'>+			  "\x99\x03\xa0\xf1\xcf\x2b\xbd\xc5"</div><div class='add'>+			  "\xba\x0a\xa3\xf3\xd9\xae\x3c\x1c"</div><div class='add'>+			  "\x7a\x3b\x16\x96\xa0\xb6\x8c\xf7",</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "Jefe",</div><div class='add'>+		.ksize	= 4,</div><div class='add'>+		.plaintext = "what do ya want for nothing?",</div><div class='add'>+		.psize	= 28,</div><div class='add'>+		.digest	= "\x5b\xdc\xc1\x46\xbf\x60\x75\x4e"</div><div class='add'>+			  "\x6a\x04\x24\x26\x08\x95\x75\xc7"</div><div class='add'>+			  "\x5a\x00\x3f\x08\x9d\x27\x39\x83"</div><div class='add'>+			  "\x9d\xec\x58\xb9\x64\xec\x38\x43",</div><div class='add'>+		.np	= 2,</div><div class='add'>+		.tap	= { 14, 14 }</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa",</div><div class='add'>+		.ksize	= 32,</div><div class='add'>+		.plaintext = "\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd"</div><div class='add'>+			"\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd"</div><div class='add'>+			"\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd"</div><div class='add'>+			"\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd",</div><div class='add'>+		.psize	= 50,</div><div class='add'>+		.digest	= "\xcd\xcb\x12\x20\xd1\xec\xcc\xea"</div><div class='add'>+			  "\x91\xe5\x3a\xba\x30\x92\xf9\x62"</div><div class='add'>+			  "\xe5\x49\xfe\x6c\xe9\xed\x7f\xdc"</div><div class='add'>+			  "\x43\x19\x1f\xbd\xe4\x5c\x30\xb0",</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x01\x02\x03\x04\x05\x06\x07\x08"</div><div class='add'>+			  "\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10"</div><div class='add'>+			  "\x11\x12\x13\x14\x15\x16\x17\x18"</div><div class='add'>+			  "\x19\x1a\x1b\x1c\x1d\x1e\x1f\x20"</div><div class='add'>+			  "\x21\x22\x23\x24\x25",</div><div class='add'>+		.ksize	= 37,</div><div class='add'>+		.plaintext = "\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd"</div><div class='add'>+			"\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd"</div><div class='add'>+			"\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd"</div><div class='add'>+			"\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd",</div><div class='add'>+		.psize	= 50,</div><div class='add'>+		.digest	= "\xd4\x63\x3c\x17\xf6\xfb\x8d\x74"</div><div class='add'>+			  "\x4c\x66\xde\xe0\xf8\xf0\x74\x55"</div><div class='add'>+			  "\x6e\xc4\xaf\x55\xef\x07\x99\x85"</div><div class='add'>+			  "\x41\x46\x8e\xb4\x9b\xd2\xe9\x17",</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c"</div><div class='add'>+			"\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c"</div><div class='add'>+			"\x0c\x0c\x0c\x0c\x0c\x0c",</div><div class='add'>+		.ksize	= 32,</div><div class='add'>+		.plaintext = "Test With Truncation",</div><div class='add'>+		.psize	= 20,</div><div class='add'>+		.digest	= "\x75\x46\xaf\x01\x84\x1f\xc0\x9b"</div><div class='add'>+			  "\x1a\xb9\xc3\x74\x9a\x5f\x1c\x17"</div><div class='add'>+			  "\xd4\xf5\x89\x66\x8a\x58\x7b\x27"</div><div class='add'>+			  "\x00\xa9\xc9\x7c\x11\x93\xcf\x42",</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa",</div><div class='add'>+		.ksize	= 80,</div><div class='add'>+		.plaintext = "Test Using Larger Than Block-Size Key - Hash Key First",</div><div class='add'>+		.psize	= 54,</div><div class='add'>+		.digest	= "\x69\x53\x02\x5e\xd9\x6f\x0c\x09"</div><div class='add'>+			  "\xf8\x0a\x96\xf7\x8e\x65\x38\xdb"</div><div class='add'>+			  "\xe2\xe7\xb8\x20\xe3\xdd\x97\x0e"</div><div class='add'>+			  "\x7d\xdd\x39\x09\x1b\x32\x35\x2f",</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa",</div><div class='add'>+		.ksize	= 80,</div><div class='add'>+		.plaintext = "Test Using Larger Than Block-Size Key and Larger Than "</div><div class='add'>+			   "One Block-Size Data",</div><div class='add'>+		.psize	= 73,</div><div class='add'>+		.digest	= "\x63\x55\xac\x22\xe8\x90\xd0\xa3"</div><div class='add'>+			  "\xc8\x48\x1a\x5c\xa4\x82\x5b\xc8"</div><div class='add'>+			  "\x84\xd3\xe7\xa1\xff\x98\xa2\xfc"</div><div class='add'>+			  "\x2a\xc7\xd8\xe0\x64\xc3\xb2\xe6",</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define XCBC_AES_TEST_VECTORS 6</div><div class='add'>+</div><div class='add'>+static struct hash_testvec aes_xcbc128_tv_template[] = {</div><div class='add'>+	{</div><div class='add'>+		.key	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",</div><div class='add'>+		.plaintext = zeroed_string,</div><div class='add'>+		.digest = "\x75\xf0\x25\x1d\x52\x8a\xc0\x1c"</div><div class='add'>+			  "\x45\x73\xdf\xd5\x84\xd7\x9f\x29",</div><div class='add'>+		.psize	= 0,</div><div class='add'>+		.ksize	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",</div><div class='add'>+		.plaintext = "\x00\x01\x02",</div><div class='add'>+		.digest	= "\x5b\x37\x65\x80\xae\x2f\x19\xaf"</div><div class='add'>+			  "\xe7\x21\x9c\xee\xf1\x72\x75\x6f",</div><div class='add'>+		.psize	= 3,</div><div class='add'>+		.ksize	= 16,</div><div class='add'>+	} , {</div><div class='add'>+		.key	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",</div><div class='add'>+		.plaintext = "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			     "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",</div><div class='add'>+		.digest = "\xd2\xa2\x46\xfa\x34\x9b\x68\xa7"</div><div class='add'>+			  "\x99\x98\xa4\x39\x4f\xf7\xa2\x63",</div><div class='add'>+		.psize	= 16,</div><div class='add'>+		.ksize	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",</div><div class='add'>+		.plaintext = "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			     "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='add'>+			     "\x10\x11\x12\x13",</div><div class='add'>+		.digest = "\x47\xf5\x1b\x45\x64\x96\x62\x15"</div><div class='add'>+			  "\xb8\x98\x5c\x63\x05\x5e\xd3\x08",</div><div class='add'>+		.tap	= { 10, 10 },</div><div class='add'>+		.psize	= 20,</div><div class='add'>+		.np	= 2,</div><div class='add'>+		.ksize	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",</div><div class='add'>+		.plaintext = "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			     "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='add'>+			     "\x10\x11\x12\x13\x14\x15\x16\x17"</div><div class='add'>+			     "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f",</div><div class='add'>+		.digest = "\xf5\x4f\x0e\xc8\xd2\xb9\xf3\xd3"</div><div class='add'>+			  "\x68\x07\x73\x4b\xd5\x28\x3f\xd4",</div><div class='add'>+		.psize	= 32,</div><div class='add'>+		.ksize	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",</div><div class='add'>+		.plaintext = "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			     "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='add'>+			     "\x10\x11\x12\x13\x14\x15\x16\x17"</div><div class='add'>+			     "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f"</div><div class='add'>+			     "\x20\x21",</div><div class='add'>+		.digest = "\xbe\xcb\xb3\xbc\xcd\xb5\x18\xa3"</div><div class='add'>+			  "\x06\x77\xd5\x48\x1f\xb6\xb4\xd8",</div><div class='add'>+		.tap	= { 17, 17 },</div><div class='add'>+		.psize	= 34,</div><div class='add'>+		.np	= 2,</div><div class='add'>+		.ksize	= 16,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * SHA384 HMAC test vectors from RFC4231</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define HMAC_SHA384_TEST_VECTORS	4</div><div class='add'>+</div><div class='add'>+static struct hash_testvec hmac_sha384_tv_template[] = {</div><div class='add'>+	{</div><div class='add'>+		.key	= "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b"</div><div class='add'>+			  "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b"</div><div class='add'>+			  "\x0b\x0b\x0b\x0b",</div><div class='add'>+		.ksize	= 20,</div><div class='add'>+		.plaintext = "Hi There",</div><div class='add'>+		.psize	= 8,</div><div class='add'>+		.digest	= "\xaf\xd0\x39\x44\xd8\x48\x95\x62"</div><div class='add'>+			  "\x6b\x08\x25\xf4\xab\x46\x90\x7f"</div><div class='add'>+			  "\x15\xf9\xda\xdb\xe4\x10\x1e\xc6"</div><div class='add'>+			  "\x82\xaa\x03\x4c\x7c\xeb\xc5\x9c"</div><div class='add'>+			  "\xfa\xea\x9e\xa9\x07\x6e\xde\x7f"</div><div class='add'>+			  "\x4a\xf1\x52\xe8\xb2\xfa\x9c\xb6",</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "Jefe",</div><div class='add'>+		.ksize	= 4,</div><div class='add'>+		.plaintext = "what do ya want for nothing?",</div><div class='add'>+		.psize	= 28,</div><div class='add'>+		.digest	= "\xaf\x45\xd2\xe3\x76\x48\x40\x31"</div><div class='add'>+			  "\x61\x7f\x78\xd2\xb5\x8a\x6b\x1b"</div><div class='add'>+			  "\x9c\x7e\xf4\x64\xf5\xa0\x1b\x47"</div><div class='add'>+			  "\xe4\x2e\xc3\x73\x63\x22\x44\x5e"</div><div class='add'>+			  "\x8e\x22\x40\xca\x5e\x69\xe2\xc7"</div><div class='add'>+			  "\x8b\x32\x39\xec\xfa\xb2\x16\x49",</div><div class='add'>+		.np	= 4,</div><div class='add'>+		.tap	= { 7, 7, 7, 7 }</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			  "\xaa\xaa\xaa",</div><div class='add'>+		.ksize	= 131,</div><div class='add'>+		.plaintext = "Test Using Larger Than Block-Siz"</div><div class='add'>+			   "e Key - Hash Key First",</div><div class='add'>+		.psize	= 54,</div><div class='add'>+		.digest	= "\x4e\xce\x08\x44\x85\x81\x3e\x90"</div><div class='add'>+			  "\x88\xd2\xc6\x3a\x04\x1b\xc5\xb4"</div><div class='add'>+			  "\x4f\x9e\xf1\x01\x2a\x2b\x58\x8f"</div><div class='add'>+			  "\x3c\xd1\x1f\x05\x03\x3a\xc4\xc6"</div><div class='add'>+			  "\x0c\x2e\xf6\xab\x40\x30\xfe\x82"</div><div class='add'>+			  "\x96\x24\x8d\xf1\x63\xf4\x49\x52",</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			  "\xaa\xaa\xaa",</div><div class='add'>+		.ksize	= 131,</div><div class='add'>+		.plaintext = "This is a test u"</div><div class='add'>+			   "sing a larger th"</div><div class='add'>+			   "an block-size ke"</div><div class='add'>+			   "y and a larger t"</div><div class='add'>+			   "han block-size d"</div><div class='add'>+			   "ata. The key nee"</div><div class='add'>+			   "ds to be hashed "</div><div class='add'>+			   "before being use"</div><div class='add'>+			   "d by the HMAC al"</div><div class='add'>+			   "gorithm.",</div><div class='add'>+		.psize	= 152,</div><div class='add'>+		.digest	= "\x66\x17\x17\x8e\x94\x1f\x02\x0d"</div><div class='add'>+			  "\x35\x1e\x2f\x25\x4e\x8f\xd3\x2c"</div><div class='add'>+			  "\x60\x24\x20\xfe\xb0\xb8\xfb\x9a"</div><div class='add'>+			  "\xdc\xce\xbb\x82\x46\x1e\x99\xc5"</div><div class='add'>+			  "\xa6\x78\xcc\x31\xe7\x99\x17\x6d"</div><div class='add'>+			  "\x38\x60\xe6\x11\x0c\x46\x52\x3e",</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * SHA512 HMAC test vectors from RFC4231</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define HMAC_SHA512_TEST_VECTORS	4</div><div class='add'>+</div><div class='add'>+static struct hash_testvec hmac_sha512_tv_template[] = {</div><div class='add'>+	{</div><div class='add'>+		.key	= "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b"</div><div class='add'>+			  "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b"</div><div class='add'>+			  "\x0b\x0b\x0b\x0b",</div><div class='add'>+		.ksize	= 20,</div><div class='add'>+		.plaintext = "Hi There",</div><div class='add'>+		.psize	= 8,</div><div class='add'>+		.digest	= "\x87\xaa\x7c\xde\xa5\xef\x61\x9d"</div><div class='add'>+			  "\x4f\xf0\xb4\x24\x1a\x1d\x6c\xb0"</div><div class='add'>+			  "\x23\x79\xf4\xe2\xce\x4e\xc2\x78"</div><div class='add'>+			  "\x7a\xd0\xb3\x05\x45\xe1\x7c\xde"</div><div class='add'>+			  "\xda\xa8\x33\xb7\xd6\xb8\xa7\x02"</div><div class='add'>+			  "\x03\x8b\x27\x4e\xae\xa3\xf4\xe4"</div><div class='add'>+			  "\xbe\x9d\x91\x4e\xeb\x61\xf1\x70"</div><div class='add'>+			  "\x2e\x69\x6c\x20\x3a\x12\x68\x54",</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "Jefe",</div><div class='add'>+		.ksize	= 4,</div><div class='add'>+		.plaintext = "what do ya want for nothing?",</div><div class='add'>+		.psize	= 28,</div><div class='add'>+		.digest	= "\x16\x4b\x7a\x7b\xfc\xf8\x19\xe2"</div><div class='add'>+			  "\xe3\x95\xfb\xe7\x3b\x56\xe0\xa3"</div><div class='add'>+			  "\x87\xbd\x64\x22\x2e\x83\x1f\xd6"</div><div class='add'>+			  "\x10\x27\x0c\xd7\xea\x25\x05\x54"</div><div class='add'>+			  "\x97\x58\xbf\x75\xc0\x5a\x99\x4a"</div><div class='add'>+			  "\x6d\x03\x4f\x65\xf8\xf0\xe6\xfd"</div><div class='add'>+			  "\xca\xea\xb1\xa3\x4d\x4a\x6b\x4b"</div><div class='add'>+			  "\x63\x6e\x07\x0a\x38\xbc\xe7\x37",</div><div class='add'>+		.np	= 4,</div><div class='add'>+		.tap	= { 7, 7, 7, 7 }</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			  "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			  "\xaa\xaa\xaa",</div><div class='add'>+		.ksize	= 131,</div><div class='add'>+		.plaintext = "Test Using Large"</div><div class='add'>+			   "r Than Block-Siz"</div><div class='add'>+			   "e Key - Hash Key"</div><div class='add'>+			   " First",</div><div class='add'>+		.psize	= 54,</div><div class='add'>+		.digest	= "\x80\xb2\x42\x63\xc7\xc1\xa3\xeb"</div><div class='add'>+			"\xb7\x14\x93\xc1\xdd\x7b\xe8\xb4"</div><div class='add'>+			"\x9b\x46\xd1\xf4\x1b\x4a\xee\xc1"</div><div class='add'>+			"\x12\x1b\x01\x37\x83\xf8\xf3\x52"</div><div class='add'>+			"\x6b\x56\xd0\x37\xe0\x5f\x25\x98"</div><div class='add'>+			"\xbd\x0f\xd2\x21\x5d\x6a\x1e\x52"</div><div class='add'>+			"\x95\xe6\x4f\x73\xf6\x3f\x0a\xec"</div><div class='add'>+			"\x8b\x91\x5a\x98\x5d\x78\x65\x98",</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"</div><div class='add'>+			"\xaa\xaa\xaa",</div><div class='add'>+		.ksize	= 131,</div><div class='add'>+		.plaintext =</div><div class='add'>+			  "This is a test u"</div><div class='add'>+			  "sing a larger th"</div><div class='add'>+			  "an block-size ke"</div><div class='add'>+			  "y and a larger t"</div><div class='add'>+			  "han block-size d"</div><div class='add'>+			  "ata. The key nee"</div><div class='add'>+			  "ds to be hashed "</div><div class='add'>+			  "before being use"</div><div class='add'>+			  "d by the HMAC al"</div><div class='add'>+			  "gorithm.",</div><div class='add'>+		.psize	= 152,</div><div class='add'>+		.digest	= "\xe3\x7b\x6a\x77\x5d\xc8\x7d\xba"</div><div class='add'>+			"\xa4\xdf\xa9\xf9\x6e\x5e\x3f\xfd"</div><div class='add'>+			"\xde\xbd\x71\xf8\x86\x72\x89\x86"</div><div class='add'>+			"\x5d\xf5\xa3\x2d\x20\xcd\xc9\x44"</div><div class='add'>+			"\xb6\x02\x2c\xac\x3c\x49\x82\xb1"</div><div class='add'>+			"\x0d\x5e\xeb\x55\xc3\xe4\xde\x15"</div><div class='add'>+			"\x13\x46\x76\xfb\x6d\xe0\x44\x60"</div><div class='add'>+			"\x65\xc9\x74\x40\xfa\x8c\x6a\x58",</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * DES test vectors.</div><div class='add'>+ */</div><div class='add'>+#define DES_ENC_TEST_VECTORS		10</div><div class='add'>+#define DES_DEC_TEST_VECTORS		4</div><div class='add'>+#define DES_CBC_ENC_TEST_VECTORS	5</div><div class='add'>+#define DES_CBC_DEC_TEST_VECTORS	4</div><div class='add'>+#define DES3_EDE_ENC_TEST_VECTORS	3</div><div class='add'>+#define DES3_EDE_DEC_TEST_VECTORS	3</div><div class='add'>+#define DES3_EDE_CBC_ENC_TEST_VECTORS	1</div><div class='add'>+#define DES3_EDE_CBC_DEC_TEST_VECTORS	1</div><div class='add'>+</div><div class='add'>+static struct cipher_testvec des_enc_tv_template[] = {</div><div class='add'>+	{ /* From Applied Cryptography */</div><div class='add'>+		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef",</div><div class='add'>+		.klen	= 8,</div><div class='add'>+		.input	= "\x01\x23\x45\x67\x89\xab\xcd\xe7",</div><div class='add'>+		.ilen	= 8,</div><div class='add'>+		.result	= "\xc9\x57\x44\x25\x6a\x5e\xd3\x1d",</div><div class='add'>+		.rlen	= 8,</div><div class='add'>+	}, { /* Same key, different plaintext block */</div><div class='add'>+		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef",</div><div class='add'>+		.klen	= 8,</div><div class='add'>+		.input	= "\x22\x33\x44\x55\x66\x77\x88\x99",</div><div class='add'>+		.ilen	= 8,</div><div class='add'>+		.result	= "\xf7\x9c\x89\x2a\x33\x8f\x4a\x8b",</div><div class='add'>+		.rlen	= 8,</div><div class='add'>+	}, { /* Sbox test from NBS */</div><div class='add'>+		.key	= "\x7c\xa1\x10\x45\x4a\x1a\x6e\x57",</div><div class='add'>+		.klen	= 8,</div><div class='add'>+		.input	= "\x01\xa1\xd6\xd0\x39\x77\x67\x42",</div><div class='add'>+		.ilen	= 8,</div><div class='add'>+		.result	= "\x69\x0f\x5b\x0d\x9a\x26\x93\x9b",</div><div class='add'>+		.rlen	= 8,</div><div class='add'>+	}, { /* Three blocks */</div><div class='add'>+		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef",</div><div class='add'>+		.klen	= 8,</div><div class='add'>+		.input	= "\x01\x23\x45\x67\x89\xab\xcd\xe7"</div><div class='add'>+			  "\x22\x33\x44\x55\x66\x77\x88\x99"</div><div class='add'>+			  "\xca\xfe\xba\xbe\xfe\xed\xbe\xef",</div><div class='add'>+		.ilen	= 24,</div><div class='add'>+		.result	= "\xc9\x57\x44\x25\x6a\x5e\xd3\x1d"</div><div class='add'>+			  "\xf7\x9c\x89\x2a\x33\x8f\x4a\x8b"</div><div class='add'>+			  "\xb4\x99\x26\xf7\x1f\xe1\xd4\x90",</div><div class='add'>+		.rlen	= 24,</div><div class='add'>+	}, { /* Weak key */</div><div class='add'>+		.fail	= 1,</div><div class='add'>+		.wk	= 1,</div><div class='add'>+		.key	= "\x01\x01\x01\x01\x01\x01\x01\x01",</div><div class='add'>+		.klen	= 8,</div><div class='add'>+		.input	= "\x01\x23\x45\x67\x89\xab\xcd\xe7",</div><div class='add'>+		.ilen	= 8,</div><div class='add'>+		.result	= "\xc9\x57\x44\x25\x6a\x5e\xd3\x1d",</div><div class='add'>+		.rlen	= 8,</div><div class='add'>+	}, { /* Two blocks -- for testing encryption across pages */</div><div class='add'>+		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef",</div><div class='add'>+		.klen	= 8,</div><div class='add'>+		.input	= "\x01\x23\x45\x67\x89\xab\xcd\xe7"</div><div class='add'>+			  "\x22\x33\x44\x55\x66\x77\x88\x99",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\xc9\x57\x44\x25\x6a\x5e\xd3\x1d"</div><div class='add'>+			  "\xf7\x9c\x89\x2a\x33\x8f\x4a\x8b",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+		.np	= 2,</div><div class='add'>+		.tap	= { 8, 8 }</div><div class='add'>+	}, { /* Four blocks -- for testing encryption with chunking */</div><div class='add'>+		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef",</div><div class='add'>+		.klen	= 8,</div><div class='add'>+		.input	= "\x01\x23\x45\x67\x89\xab\xcd\xe7"</div><div class='add'>+			  "\x22\x33\x44\x55\x66\x77\x88\x99"</div><div class='add'>+			  "\xca\xfe\xba\xbe\xfe\xed\xbe\xef"</div><div class='add'>+			  "\x22\x33\x44\x55\x66\x77\x88\x99",</div><div class='add'>+		.ilen	= 32,</div><div class='add'>+		.result	= "\xc9\x57\x44\x25\x6a\x5e\xd3\x1d"</div><div class='add'>+			  "\xf7\x9c\x89\x2a\x33\x8f\x4a\x8b"</div><div class='add'>+			  "\xb4\x99\x26\xf7\x1f\xe1\xd4\x90"</div><div class='add'>+			  "\xf7\x9c\x89\x2a\x33\x8f\x4a\x8b",</div><div class='add'>+		.rlen	= 32,</div><div class='add'>+		.np	= 3,</div><div class='add'>+		.tap	= { 14, 10, 8 }</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef",</div><div class='add'>+		.klen	= 8,</div><div class='add'>+		.input	= "\x01\x23\x45\x67\x89\xab\xcd\xe7"</div><div class='add'>+			  "\x22\x33\x44\x55\x66\x77\x88\x99"</div><div class='add'>+			  "\xca\xfe\xba\xbe\xfe\xed\xbe\xef",</div><div class='add'>+		.ilen	= 24,</div><div class='add'>+		.result	= "\xc9\x57\x44\x25\x6a\x5e\xd3\x1d"</div><div class='add'>+			  "\xf7\x9c\x89\x2a\x33\x8f\x4a\x8b"</div><div class='add'>+			  "\xb4\x99\x26\xf7\x1f\xe1\xd4\x90",</div><div class='add'>+		.rlen	= 24,</div><div class='add'>+		.np	= 4,</div><div class='add'>+		.tap	= { 2, 1, 3, 18 }</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef",</div><div class='add'>+		.klen	= 8,</div><div class='add'>+		.input	= "\x01\x23\x45\x67\x89\xab\xcd\xe7"</div><div class='add'>+			  "\x22\x33\x44\x55\x66\x77\x88\x99",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\xc9\x57\x44\x25\x6a\x5e\xd3\x1d"</div><div class='add'>+			  "\xf7\x9c\x89\x2a\x33\x8f\x4a\x8b",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+		.np	= 5,</div><div class='add'>+		.tap	= { 2, 2, 2, 2, 8 }</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef",</div><div class='add'>+		.klen	= 8,</div><div class='add'>+		.input	= "\x01\x23\x45\x67\x89\xab\xcd\xe7",</div><div class='add'>+		.ilen	= 8,</div><div class='add'>+		.result	= "\xc9\x57\x44\x25\x6a\x5e\xd3\x1d",</div><div class='add'>+		.rlen	= 8,</div><div class='add'>+		.np	= 8,</div><div class='add'>+		.tap	= { 1, 1, 1, 1, 1, 1, 1, 1 }</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct cipher_testvec des_dec_tv_template[] = {</div><div class='add'>+	{ /* From Applied Cryptography */</div><div class='add'>+		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef",</div><div class='add'>+		.klen	= 8,</div><div class='add'>+		.input	= "\xc9\x57\x44\x25\x6a\x5e\xd3\x1d",</div><div class='add'>+		.ilen	= 8,</div><div class='add'>+		.result	= "\x01\x23\x45\x67\x89\xab\xcd\xe7",</div><div class='add'>+		.rlen	= 8,</div><div class='add'>+	}, { /* Sbox test from NBS */</div><div class='add'>+		.key	= "\x7c\xa1\x10\x45\x4a\x1a\x6e\x57",</div><div class='add'>+		.klen	= 8,</div><div class='add'>+		.input	= "\x69\x0f\x5b\x0d\x9a\x26\x93\x9b",</div><div class='add'>+		.ilen	= 8,</div><div class='add'>+		.result	= "\x01\xa1\xd6\xd0\x39\x77\x67\x42",</div><div class='add'>+		.rlen	= 8,</div><div class='add'>+	}, { /* Two blocks, for chunking test */</div><div class='add'>+		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef",</div><div class='add'>+		.klen	= 8,</div><div class='add'>+		.input	= "\xc9\x57\x44\x25\x6a\x5e\xd3\x1d"</div><div class='add'>+			  "\x69\x0f\x5b\x0d\x9a\x26\x93\x9b",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\x01\x23\x45\x67\x89\xab\xcd\xe7"</div><div class='add'>+			  "\xa3\x99\x7b\xca\xaf\x69\xa0\xf5",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+		.np	= 2,</div><div class='add'>+		.tap	= { 8, 8 }</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef",</div><div class='add'>+		.klen	= 8,</div><div class='add'>+		.input	= "\xc9\x57\x44\x25\x6a\x5e\xd3\x1d"</div><div class='add'>+			  "\x69\x0f\x5b\x0d\x9a\x26\x93\x9b",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\x01\x23\x45\x67\x89\xab\xcd\xe7"</div><div class='add'>+			  "\xa3\x99\x7b\xca\xaf\x69\xa0\xf5",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+		.np	= 3,</div><div class='add'>+		.tap	= { 3, 12, 1 }</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct cipher_testvec des_cbc_enc_tv_template[] = {</div><div class='add'>+	{ /* From OpenSSL */</div><div class='add'>+		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef",</div><div class='add'>+		.klen	= 8,</div><div class='add'>+		.iv	= "\xfe\xdc\xba\x98\x76\x54\x32\x10",</div><div class='add'>+		.input	= "\x37\x36\x35\x34\x33\x32\x31\x20"</div><div class='add'>+			  "\x4e\x6f\x77\x20\x69\x73\x20\x74"</div><div class='add'>+			  "\x68\x65\x20\x74\x69\x6d\x65\x20",</div><div class='add'>+		.ilen	= 24,</div><div class='add'>+		.result	= "\xcc\xd1\x73\xff\xab\x20\x39\xf4"</div><div class='add'>+			  "\xac\xd8\xae\xfd\xdf\xd8\xa1\xeb"</div><div class='add'>+			  "\x46\x8e\x91\x15\x78\x88\xba\x68",</div><div class='add'>+		.rlen	= 24,</div><div class='add'>+	}, { /* FIPS Pub 81 */</div><div class='add'>+		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef",</div><div class='add'>+		.klen	= 8,</div><div class='add'>+		.iv	= "\x12\x34\x56\x78\x90\xab\xcd\xef",</div><div class='add'>+		.input	= "\x4e\x6f\x77\x20\x69\x73\x20\x74",</div><div class='add'>+		.ilen	= 8,</div><div class='add'>+		.result	= "\xe5\xc7\xcd\xde\x87\x2b\xf2\x7c",</div><div class='add'>+		.rlen	= 8,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef",</div><div class='add'>+		.klen	= 8,</div><div class='add'>+		.iv	= "\xe5\xc7\xcd\xde\x87\x2b\xf2\x7c",</div><div class='add'>+		.input	= "\x68\x65\x20\x74\x69\x6d\x65\x20",</div><div class='add'>+		.ilen	= 8,</div><div class='add'>+		.result	= "\x43\xe9\x34\x00\x8c\x38\x9c\x0f",</div><div class='add'>+		.rlen	= 8,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef",</div><div class='add'>+		.klen	= 8,</div><div class='add'>+		.iv	= "\x43\xe9\x34\x00\x8c\x38\x9c\x0f",</div><div class='add'>+		.input	= "\x66\x6f\x72\x20\x61\x6c\x6c\x20",</div><div class='add'>+		.ilen	= 8,</div><div class='add'>+		.result	= "\x68\x37\x88\x49\x9a\x7c\x05\xf6",</div><div class='add'>+		.rlen	= 8,</div><div class='add'>+	}, { /* Copy of openssl vector for chunk testing */</div><div class='add'>+	     /* From OpenSSL */</div><div class='add'>+		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef",</div><div class='add'>+		.klen	= 8,</div><div class='add'>+		.iv	= "\xfe\xdc\xba\x98\x76\x54\x32\x10",</div><div class='add'>+		.input	= "\x37\x36\x35\x34\x33\x32\x31\x20"</div><div class='add'>+			  "\x4e\x6f\x77\x20\x69\x73\x20\x74"</div><div class='add'>+			  "\x68\x65\x20\x74\x69\x6d\x65\x20",</div><div class='add'>+		.ilen	= 24,</div><div class='add'>+		.result	= "\xcc\xd1\x73\xff\xab\x20\x39\xf4"</div><div class='add'>+			  "\xac\xd8\xae\xfd\xdf\xd8\xa1\xeb"</div><div class='add'>+			  "\x46\x8e\x91\x15\x78\x88\xba\x68",</div><div class='add'>+		.rlen	= 24,</div><div class='add'>+		.np	= 2,</div><div class='add'>+		.tap	= { 13, 11 }</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct cipher_testvec des_cbc_dec_tv_template[] = {</div><div class='add'>+	{ /* FIPS Pub 81 */</div><div class='add'>+		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef",</div><div class='add'>+		.klen	= 8,</div><div class='add'>+		.iv	= "\x12\x34\x56\x78\x90\xab\xcd\xef",</div><div class='add'>+		.input	= "\xe5\xc7\xcd\xde\x87\x2b\xf2\x7c",</div><div class='add'>+		.ilen	= 8,</div><div class='add'>+		.result	= "\x4e\x6f\x77\x20\x69\x73\x20\x74",</div><div class='add'>+		.rlen	= 8,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef",</div><div class='add'>+		.klen	= 8,</div><div class='add'>+		.iv	= "\xe5\xc7\xcd\xde\x87\x2b\xf2\x7c",</div><div class='add'>+		.input	= "\x43\xe9\x34\x00\x8c\x38\x9c\x0f",</div><div class='add'>+		.ilen	= 8,</div><div class='add'>+		.result	= "\x68\x65\x20\x74\x69\x6d\x65\x20",</div><div class='add'>+		.rlen	= 8,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef",</div><div class='add'>+		.klen	= 8,</div><div class='add'>+		.iv	= "\x43\xe9\x34\x00\x8c\x38\x9c\x0f",</div><div class='add'>+		.input	= "\x68\x37\x88\x49\x9a\x7c\x05\xf6",</div><div class='add'>+		.ilen	= 8,</div><div class='add'>+		.result	= "\x66\x6f\x72\x20\x61\x6c\x6c\x20",</div><div class='add'>+		.rlen	= 8,</div><div class='add'>+	}, { /* Copy of above, for chunk testing */</div><div class='add'>+		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef",</div><div class='add'>+		.klen	= 8,</div><div class='add'>+		.iv	= "\x43\xe9\x34\x00\x8c\x38\x9c\x0f",</div><div class='add'>+		.input	= "\x68\x37\x88\x49\x9a\x7c\x05\xf6",</div><div class='add'>+		.ilen	= 8,</div><div class='add'>+		.result	= "\x66\x6f\x72\x20\x61\x6c\x6c\x20",</div><div class='add'>+		.rlen	= 8,</div><div class='add'>+		.np	= 2,</div><div class='add'>+		.tap	= { 4, 4 }</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct cipher_testvec des3_ede_enc_tv_template[] = {</div><div class='add'>+	{ /* These are from openssl */</div><div class='add'>+		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef"</div><div class='add'>+			  "\x55\x55\x55\x55\x55\x55\x55\x55"</div><div class='add'>+			  "\xfe\xdc\xba\x98\x76\x54\x32\x10",</div><div class='add'>+		.klen	= 24,</div><div class='add'>+		.input	= "\x73\x6f\x6d\x65\x64\x61\x74\x61",</div><div class='add'>+		.ilen	= 8,</div><div class='add'>+		.result	= "\x18\xd7\x48\xe5\x63\x62\x05\x72",</div><div class='add'>+		.rlen	= 8,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x03\x52\x02\x07\x67\x20\x82\x17"</div><div class='add'>+			  "\x86\x02\x87\x66\x59\x08\x21\x98"</div><div class='add'>+			  "\x64\x05\x6a\xbd\xfe\xa9\x34\x57",</div><div class='add'>+		.klen	= 24,</div><div class='add'>+		.input	= "\x73\x71\x75\x69\x67\x67\x6c\x65",</div><div class='add'>+		.ilen	= 8,</div><div class='add'>+		.result	= "\xc0\x7d\x2a\x0f\xa5\x66\xfa\x30",</div><div class='add'>+		.rlen	= 8,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x10\x46\x10\x34\x89\x98\x80\x20"</div><div class='add'>+			  "\x91\x07\xd0\x15\x89\x19\x01\x01"</div><div class='add'>+			  "\x19\x07\x92\x10\x98\x1a\x01\x01",</div><div class='add'>+		.klen	= 24,</div><div class='add'>+		.input	= "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.ilen	= 8,</div><div class='add'>+		.result	= "\xe1\xef\x62\xc3\x32\xfe\x82\x5b",</div><div class='add'>+		.rlen	= 8,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct cipher_testvec des3_ede_dec_tv_template[] = {</div><div class='add'>+	{ /* These are from openssl */</div><div class='add'>+		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef"</div><div class='add'>+			  "\x55\x55\x55\x55\x55\x55\x55\x55"</div><div class='add'>+			  "\xfe\xdc\xba\x98\x76\x54\x32\x10",</div><div class='add'>+		.klen	= 24,</div><div class='add'>+		.input	= "\x18\xd7\x48\xe5\x63\x62\x05\x72",</div><div class='add'>+		.ilen	= 8,</div><div class='add'>+		.result	= "\x73\x6f\x6d\x65\x64\x61\x74\x61",</div><div class='add'>+		.rlen	= 8,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x03\x52\x02\x07\x67\x20\x82\x17"</div><div class='add'>+			  "\x86\x02\x87\x66\x59\x08\x21\x98"</div><div class='add'>+			  "\x64\x05\x6a\xbd\xfe\xa9\x34\x57",</div><div class='add'>+		.klen	= 24,</div><div class='add'>+		.input	= "\xc0\x7d\x2a\x0f\xa5\x66\xfa\x30",</div><div class='add'>+		.ilen	= 8,</div><div class='add'>+		.result	= "\x73\x71\x75\x69\x67\x67\x6c\x65",</div><div class='add'>+		.rlen	= 8,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x10\x46\x10\x34\x89\x98\x80\x20"</div><div class='add'>+			  "\x91\x07\xd0\x15\x89\x19\x01\x01"</div><div class='add'>+			  "\x19\x07\x92\x10\x98\x1a\x01\x01",</div><div class='add'>+		.klen	= 24,</div><div class='add'>+		.input	= "\xe1\xef\x62\xc3\x32\xfe\x82\x5b",</div><div class='add'>+		.ilen	= 8,</div><div class='add'>+		.result	= "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.rlen	= 8,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct cipher_testvec des3_ede_cbc_enc_tv_template[] = {</div><div class='add'>+	{ /* Generated from openssl */</div><div class='add'>+		.key	= "\xE9\xC0\xFF\x2E\x76\x0B\x64\x24"</div><div class='add'>+			  "\x44\x4D\x99\x5A\x12\xD6\x40\xC0"</div><div class='add'>+			  "\xEA\xC2\x84\xE8\x14\x95\xDB\xE8",</div><div class='add'>+		.klen	= 24,</div><div class='add'>+		.iv	= "\x7D\x33\x88\x93\x0F\x93\xB2\x42",</div><div class='add'>+		.input	= "\x6f\x54\x20\x6f\x61\x4d\x79\x6e"</div><div class='add'>+			  "\x53\x20\x63\x65\x65\x72\x73\x74"</div><div class='add'>+			  "\x54\x20\x6f\x6f\x4d\x20\x6e\x61"</div><div class='add'>+			  "\x20\x79\x65\x53\x72\x63\x74\x65"</div><div class='add'>+			  "\x20\x73\x6f\x54\x20\x6f\x61\x4d"</div><div class='add'>+			  "\x79\x6e\x53\x20\x63\x65\x65\x72"</div><div class='add'>+			  "\x73\x74\x54\x20\x6f\x6f\x4d\x20"</div><div class='add'>+			  "\x6e\x61\x20\x79\x65\x53\x72\x63"</div><div class='add'>+			  "\x74\x65\x20\x73\x6f\x54\x20\x6f"</div><div class='add'>+			  "\x61\x4d\x79\x6e\x53\x20\x63\x65"</div><div class='add'>+			  "\x65\x72\x73\x74\x54\x20\x6f\x6f"</div><div class='add'>+			  "\x4d\x20\x6e\x61\x20\x79\x65\x53"</div><div class='add'>+			  "\x72\x63\x74\x65\x20\x73\x6f\x54"</div><div class='add'>+			  "\x20\x6f\x61\x4d\x79\x6e\x53\x20"</div><div class='add'>+			  "\x63\x65\x65\x72\x73\x74\x54\x20"</div><div class='add'>+			  "\x6f\x6f\x4d\x20\x6e\x61\x0a\x79",</div><div class='add'>+		.ilen	= 128,</div><div class='add'>+		.result	= "\x0e\x2d\xb6\x97\x3c\x56\x33\xf4"</div><div class='add'>+			  "\x67\x17\x21\xc7\x6e\x8a\xd5\x49"</div><div class='add'>+			  "\x74\xb3\x49\x05\xc5\x1c\xd0\xed"</div><div class='add'>+			  "\x12\x56\x5c\x53\x96\xb6\x00\x7d"</div><div class='add'>+			  "\x90\x48\xfc\xf5\x8d\x29\x39\xcc"</div><div class='add'>+			  "\x8a\xd5\x35\x18\x36\x23\x4e\xd7"</div><div class='add'>+			  "\x76\xd1\xda\x0c\x94\x67\xbb\x04"</div><div class='add'>+			  "\x8b\xf2\x03\x6c\xa8\xcf\xb6\xea"</div><div class='add'>+			  "\x22\x64\x47\xaa\x8f\x75\x13\xbf"</div><div class='add'>+			  "\x9f\xc2\xc3\xf0\xc9\x56\xc5\x7a"</div><div class='add'>+			  "\x71\x63\x2e\x89\x7b\x1e\x12\xca"</div><div class='add'>+			  "\xe2\x5f\xaf\xd8\xa4\xf8\xc9\x7a"</div><div class='add'>+			  "\xd6\xf9\x21\x31\x62\x44\x45\xa6"</div><div class='add'>+			  "\xd6\xbc\x5a\xd3\x2d\x54\x43\xcc"</div><div class='add'>+			  "\x9d\xde\xa5\x70\xe9\x42\x45\x8a"</div><div class='add'>+			  "\x6b\xfa\xb1\x91\x13\xb0\xd9\x19",</div><div class='add'>+		.rlen	= 128,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct cipher_testvec des3_ede_cbc_dec_tv_template[] = {</div><div class='add'>+	{ /* Generated from openssl */</div><div class='add'>+		.key	= "\xE9\xC0\xFF\x2E\x76\x0B\x64\x24"</div><div class='add'>+			  "\x44\x4D\x99\x5A\x12\xD6\x40\xC0"</div><div class='add'>+			  "\xEA\xC2\x84\xE8\x14\x95\xDB\xE8",</div><div class='add'>+		.klen	= 24,</div><div class='add'>+		.iv	= "\x7D\x33\x88\x93\x0F\x93\xB2\x42",</div><div class='add'>+		.input	= "\x0e\x2d\xb6\x97\x3c\x56\x33\xf4"</div><div class='add'>+			  "\x67\x17\x21\xc7\x6e\x8a\xd5\x49"</div><div class='add'>+			  "\x74\xb3\x49\x05\xc5\x1c\xd0\xed"</div><div class='add'>+			  "\x12\x56\x5c\x53\x96\xb6\x00\x7d"</div><div class='add'>+			  "\x90\x48\xfc\xf5\x8d\x29\x39\xcc"</div><div class='add'>+			  "\x8a\xd5\x35\x18\x36\x23\x4e\xd7"</div><div class='add'>+			  "\x76\xd1\xda\x0c\x94\x67\xbb\x04"</div><div class='add'>+			  "\x8b\xf2\x03\x6c\xa8\xcf\xb6\xea"</div><div class='add'>+			  "\x22\x64\x47\xaa\x8f\x75\x13\xbf"</div><div class='add'>+			  "\x9f\xc2\xc3\xf0\xc9\x56\xc5\x7a"</div><div class='add'>+			  "\x71\x63\x2e\x89\x7b\x1e\x12\xca"</div><div class='add'>+			  "\xe2\x5f\xaf\xd8\xa4\xf8\xc9\x7a"</div><div class='add'>+			  "\xd6\xf9\x21\x31\x62\x44\x45\xa6"</div><div class='add'>+			  "\xd6\xbc\x5a\xd3\x2d\x54\x43\xcc"</div><div class='add'>+			  "\x9d\xde\xa5\x70\xe9\x42\x45\x8a"</div><div class='add'>+			  "\x6b\xfa\xb1\x91\x13\xb0\xd9\x19",</div><div class='add'>+		.ilen	= 128,</div><div class='add'>+		.result	= "\x6f\x54\x20\x6f\x61\x4d\x79\x6e"</div><div class='add'>+			  "\x53\x20\x63\x65\x65\x72\x73\x74"</div><div class='add'>+			  "\x54\x20\x6f\x6f\x4d\x20\x6e\x61"</div><div class='add'>+			  "\x20\x79\x65\x53\x72\x63\x74\x65"</div><div class='add'>+			  "\x20\x73\x6f\x54\x20\x6f\x61\x4d"</div><div class='add'>+			  "\x79\x6e\x53\x20\x63\x65\x65\x72"</div><div class='add'>+			  "\x73\x74\x54\x20\x6f\x6f\x4d\x20"</div><div class='add'>+			  "\x6e\x61\x20\x79\x65\x53\x72\x63"</div><div class='add'>+			  "\x74\x65\x20\x73\x6f\x54\x20\x6f"</div><div class='add'>+			  "\x61\x4d\x79\x6e\x53\x20\x63\x65"</div><div class='add'>+			  "\x65\x72\x73\x74\x54\x20\x6f\x6f"</div><div class='add'>+			  "\x4d\x20\x6e\x61\x20\x79\x65\x53"</div><div class='add'>+			  "\x72\x63\x74\x65\x20\x73\x6f\x54"</div><div class='add'>+			  "\x20\x6f\x61\x4d\x79\x6e\x53\x20"</div><div class='add'>+			  "\x63\x65\x65\x72\x73\x74\x54\x20"</div><div class='add'>+			  "\x6f\x6f\x4d\x20\x6e\x61\x0a\x79",</div><div class='add'>+		.rlen	= 128,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Blowfish test vectors.</div><div class='add'>+ */</div><div class='add'>+#define BF_ENC_TEST_VECTORS	6</div><div class='add'>+#define BF_DEC_TEST_VECTORS	6</div><div class='add'>+#define BF_CBC_ENC_TEST_VECTORS	1</div><div class='add'>+#define BF_CBC_DEC_TEST_VECTORS	1</div><div class='add'>+</div><div class='add'>+static struct cipher_testvec bf_enc_tv_template[] = {</div><div class='add'>+	{ /* DES test vectors from OpenSSL */</div><div class='add'>+		.key	= "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.klen	= 8,</div><div class='add'>+		.input	= "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.ilen	= 8,</div><div class='add'>+		.result	= "\x4e\xf9\x97\x45\x61\x98\xdd\x78",</div><div class='add'>+		.rlen	= 8,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x1f\x1f\x1f\x1f\x0e\x0e\x0e\x0e",</div><div class='add'>+		.klen	= 8,</div><div class='add'>+		.input	= "\x01\x23\x45\x67\x89\xab\xcd\xef",</div><div class='add'>+		.ilen	= 8,</div><div class='add'>+		.result	= "\xa7\x90\x79\x51\x08\xea\x3c\xae",</div><div class='add'>+		.rlen	= 8,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\xf0\xe1\xd2\xc3\xb4\xa5\x96\x87",</div><div class='add'>+		.klen	= 8,</div><div class='add'>+		.input	= "\xfe\xdc\xba\x98\x76\x54\x32\x10",</div><div class='add'>+		.ilen	= 8,</div><div class='add'>+		.result	= "\xe8\x7a\x24\x4e\x2c\xc8\x5e\x82",</div><div class='add'>+		.rlen	= 8,</div><div class='add'>+	}, { /* Vary the keylength... */</div><div class='add'>+		.key	= "\xf0\xe1\xd2\xc3\xb4\xa5\x96\x87"</div><div class='add'>+			  "\x78\x69\x5a\x4b\x3c\x2d\x1e\x0f",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.input	= "\xfe\xdc\xba\x98\x76\x54\x32\x10",</div><div class='add'>+		.ilen	= 8,</div><div class='add'>+		.result	= "\x93\x14\x28\x87\xee\x3b\xe1\x5c",</div><div class='add'>+		.rlen	= 8,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\xf0\xe1\xd2\xc3\xb4\xa5\x96\x87"</div><div class='add'>+			  "\x78\x69\x5a\x4b\x3c\x2d\x1e\x0f"</div><div class='add'>+			  "\x00\x11\x22\x33\x44",</div><div class='add'>+		.klen	= 21,</div><div class='add'>+		.input	= "\xfe\xdc\xba\x98\x76\x54\x32\x10",</div><div class='add'>+		.ilen	= 8,</div><div class='add'>+		.result	= "\xe6\xf5\x1e\xd7\x9b\x9d\xb2\x1f",</div><div class='add'>+		.rlen	= 8,</div><div class='add'>+	}, { /* Generated with bf488 */</div><div class='add'>+		.key	= "\xf0\xe1\xd2\xc3\xb4\xa5\x96\x87"</div><div class='add'>+			  "\x78\x69\x5a\x4b\x3c\x2d\x1e\x0f"</div><div class='add'>+			  "\x00\x11\x22\x33\x44\x55\x66\x77"</div><div class='add'>+			  "\x04\x68\x91\x04\xc2\xfd\x3b\x2f"</div><div class='add'>+			  "\x58\x40\x23\x64\x1a\xba\x61\x76"</div><div class='add'>+			  "\x1f\x1f\x1f\x1f\x0e\x0e\x0e\x0e"</div><div class='add'>+			  "\xff\xff\xff\xff\xff\xff\xff\xff",</div><div class='add'>+		.klen	= 56,</div><div class='add'>+		.input	= "\xfe\xdc\xba\x98\x76\x54\x32\x10",</div><div class='add'>+		.ilen	= 8,</div><div class='add'>+		.result	= "\xc0\x45\x04\x01\x2e\x4e\x1f\x53",</div><div class='add'>+		.rlen	= 8,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct cipher_testvec bf_dec_tv_template[] = {</div><div class='add'>+	{ /* DES test vectors from OpenSSL */</div><div class='add'>+		.key	= "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.klen	= 8,</div><div class='add'>+		.input	= "\x4e\xf9\x97\x45\x61\x98\xdd\x78",</div><div class='add'>+		.ilen	= 8,</div><div class='add'>+		.result	= "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.rlen	= 8,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x1f\x1f\x1f\x1f\x0e\x0e\x0e\x0e",</div><div class='add'>+		.klen	= 8,</div><div class='add'>+		.input	= "\xa7\x90\x79\x51\x08\xea\x3c\xae",</div><div class='add'>+		.ilen	= 8,</div><div class='add'>+		.result	= "\x01\x23\x45\x67\x89\xab\xcd\xef",</div><div class='add'>+		.rlen	= 8,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\xf0\xe1\xd2\xc3\xb4\xa5\x96\x87",</div><div class='add'>+		.klen	= 8,</div><div class='add'>+		.input	= "\xe8\x7a\x24\x4e\x2c\xc8\x5e\x82",</div><div class='add'>+		.ilen	= 8,</div><div class='add'>+		.result	= "\xfe\xdc\xba\x98\x76\x54\x32\x10",</div><div class='add'>+		.rlen	= 8,</div><div class='add'>+	}, { /* Vary the keylength... */</div><div class='add'>+		.key	= "\xf0\xe1\xd2\xc3\xb4\xa5\x96\x87"</div><div class='add'>+			  "\x78\x69\x5a\x4b\x3c\x2d\x1e\x0f",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.input	= "\x93\x14\x28\x87\xee\x3b\xe1\x5c",</div><div class='add'>+		.ilen	= 8,</div><div class='add'>+		.result	= "\xfe\xdc\xba\x98\x76\x54\x32\x10",</div><div class='add'>+		.rlen	= 8,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\xf0\xe1\xd2\xc3\xb4\xa5\x96\x87"</div><div class='add'>+			  "\x78\x69\x5a\x4b\x3c\x2d\x1e\x0f"</div><div class='add'>+			  "\x00\x11\x22\x33\x44",</div><div class='add'>+		.klen	= 21,</div><div class='add'>+		.input	= "\xe6\xf5\x1e\xd7\x9b\x9d\xb2\x1f",</div><div class='add'>+		.ilen	= 8,</div><div class='add'>+		.result	= "\xfe\xdc\xba\x98\x76\x54\x32\x10",</div><div class='add'>+		.rlen	= 8,</div><div class='add'>+	}, { /* Generated with bf488, using OpenSSL, Libgcrypt and Nettle */</div><div class='add'>+		.key	= "\xf0\xe1\xd2\xc3\xb4\xa5\x96\x87"</div><div class='add'>+			  "\x78\x69\x5a\x4b\x3c\x2d\x1e\x0f"</div><div class='add'>+			  "\x00\x11\x22\x33\x44\x55\x66\x77"</div><div class='add'>+			  "\x04\x68\x91\x04\xc2\xfd\x3b\x2f"</div><div class='add'>+			  "\x58\x40\x23\x64\x1a\xba\x61\x76"</div><div class='add'>+			  "\x1f\x1f\x1f\x1f\x0e\x0e\x0e\x0e"</div><div class='add'>+			  "\xff\xff\xff\xff\xff\xff\xff\xff",</div><div class='add'>+		.klen	= 56,</div><div class='add'>+		.input	= "\xc0\x45\x04\x01\x2e\x4e\x1f\x53",</div><div class='add'>+		.ilen	= 8,</div><div class='add'>+		.result	= "\xfe\xdc\xba\x98\x76\x54\x32\x10",</div><div class='add'>+		.rlen	= 8,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct cipher_testvec bf_cbc_enc_tv_template[] = {</div><div class='add'>+	{ /* From OpenSSL */</div><div class='add'>+		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef"</div><div class='add'>+			  "\xf0\xe1\xd2\xc3\xb4\xa5\x96\x87",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.iv	= "\xfe\xdc\xba\x98\x76\x54\x32\x10",</div><div class='add'>+		.input	= "\x37\x36\x35\x34\x33\x32\x31\x20"</div><div class='add'>+			  "\x4e\x6f\x77\x20\x69\x73\x20\x74"</div><div class='add'>+			  "\x68\x65\x20\x74\x69\x6d\x65\x20"</div><div class='add'>+			  "\x66\x6f\x72\x20\x00\x00\x00\x00",</div><div class='add'>+		.ilen	= 32,</div><div class='add'>+		.result	= "\x6b\x77\xb4\xd6\x30\x06\xde\xe6"</div><div class='add'>+			  "\x05\xb1\x56\xe2\x74\x03\x97\x93"</div><div class='add'>+			  "\x58\xde\xb9\xe7\x15\x46\x16\xd9"</div><div class='add'>+			  "\x59\xf1\x65\x2b\xd5\xff\x92\xcc",</div><div class='add'>+		.rlen	= 32,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct cipher_testvec bf_cbc_dec_tv_template[] = {</div><div class='add'>+	{ /* From OpenSSL */</div><div class='add'>+		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef"</div><div class='add'>+			  "\xf0\xe1\xd2\xc3\xb4\xa5\x96\x87",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.iv	= "\xfe\xdc\xba\x98\x76\x54\x32\x10",</div><div class='add'>+		.input	= "\x6b\x77\xb4\xd6\x30\x06\xde\xe6"</div><div class='add'>+			  "\x05\xb1\x56\xe2\x74\x03\x97\x93"</div><div class='add'>+			  "\x58\xde\xb9\xe7\x15\x46\x16\xd9"</div><div class='add'>+			  "\x59\xf1\x65\x2b\xd5\xff\x92\xcc",</div><div class='add'>+		.ilen	= 32,</div><div class='add'>+		.result	= "\x37\x36\x35\x34\x33\x32\x31\x20"</div><div class='add'>+			  "\x4e\x6f\x77\x20\x69\x73\x20\x74"</div><div class='add'>+			  "\x68\x65\x20\x74\x69\x6d\x65\x20"</div><div class='add'>+			  "\x66\x6f\x72\x20\x00\x00\x00\x00",</div><div class='add'>+		.rlen	= 32,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Twofish test vectors.</div><div class='add'>+ */</div><div class='add'>+#define TF_ENC_TEST_VECTORS		3</div><div class='add'>+#define TF_DEC_TEST_VECTORS		3</div><div class='add'>+#define TF_CBC_ENC_TEST_VECTORS		4</div><div class='add'>+#define TF_CBC_DEC_TEST_VECTORS		4</div><div class='add'>+</div><div class='add'>+static struct cipher_testvec tf_enc_tv_template[] = {</div><div class='add'>+	{</div><div class='add'>+		.key	= zeroed_string,</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.input	= zeroed_string,</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\x9f\x58\x9f\x5c\xf6\x12\x2c\x32"</div><div class='add'>+			  "\xb6\xbf\xec\x2f\x2a\xe8\xc3\x5a",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef"</div><div class='add'>+			  "\xfe\xdc\xba\x98\x76\x54\x32\x10"</div><div class='add'>+			  "\x00\x11\x22\x33\x44\x55\x66\x77",</div><div class='add'>+		.klen	= 24,</div><div class='add'>+		.input	= zeroed_string,</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\xcf\xd1\xd2\xe5\xa9\xbe\x9c\xdf"</div><div class='add'>+			  "\x50\x1f\x13\xb8\x92\xbd\x22\x48",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef"</div><div class='add'>+			  "\xfe\xdc\xba\x98\x76\x54\x32\x10"</div><div class='add'>+			  "\x00\x11\x22\x33\x44\x55\x66\x77"</div><div class='add'>+			  "\x88\x99\xaa\xbb\xcc\xdd\xee\xff",</div><div class='add'>+		.klen	= 32,</div><div class='add'>+		.input	= zeroed_string,</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\x37\x52\x7b\xe0\x05\x23\x34\xb8"</div><div class='add'>+			  "\x9f\x0c\xfc\xca\xe8\x7c\xfa\x20",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct cipher_testvec tf_dec_tv_template[] = {</div><div class='add'>+	{</div><div class='add'>+		.key	= zeroed_string,</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.input	= "\x9f\x58\x9f\x5c\xf6\x12\x2c\x32"</div><div class='add'>+			  "\xb6\xbf\xec\x2f\x2a\xe8\xc3\x5a",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= zeroed_string,</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef"</div><div class='add'>+			  "\xfe\xdc\xba\x98\x76\x54\x32\x10"</div><div class='add'>+			  "\x00\x11\x22\x33\x44\x55\x66\x77",</div><div class='add'>+		.klen	= 24,</div><div class='add'>+		.input	= "\xcf\xd1\xd2\xe5\xa9\xbe\x9c\xdf"</div><div class='add'>+			  "\x50\x1f\x13\xb8\x92\xbd\x22\x48",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= zeroed_string,</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef"</div><div class='add'>+			  "\xfe\xdc\xba\x98\x76\x54\x32\x10"</div><div class='add'>+			  "\x00\x11\x22\x33\x44\x55\x66\x77"</div><div class='add'>+			  "\x88\x99\xaa\xbb\xcc\xdd\xee\xff",</div><div class='add'>+		.klen	= 32,</div><div class='add'>+		.input	= "\x37\x52\x7b\xe0\x05\x23\x34\xb8"</div><div class='add'>+			  "\x9f\x0c\xfc\xca\xe8\x7c\xfa\x20",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= zeroed_string,</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct cipher_testvec tf_cbc_enc_tv_template[] = {</div><div class='add'>+	{ /* Generated with Nettle */</div><div class='add'>+		.key	= zeroed_string,</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.iv	= zeroed_string,</div><div class='add'>+		.input	= zeroed_string,</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\x9f\x58\x9f\x5c\xf6\x12\x2c\x32"</div><div class='add'>+			  "\xb6\xbf\xec\x2f\x2a\xe8\xc3\x5a",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= zeroed_string,</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.iv	= "\x9f\x58\x9f\x5c\xf6\x12\x2c\x32"</div><div class='add'>+			  "\xb6\xbf\xec\x2f\x2a\xe8\xc3\x5a",</div><div class='add'>+		.input	= zeroed_string,</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\xd4\x91\xdb\x16\xe7\xb1\xc3\x9e"</div><div class='add'>+			  "\x86\xcb\x08\x6b\x78\x9f\x54\x19",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= zeroed_string,</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.iv	= "\xd4\x91\xdb\x16\xe7\xb1\xc3\x9e"</div><div class='add'>+			  "\x86\xcb\x08\x6b\x78\x9f\x54\x19",</div><div class='add'>+		.input	= zeroed_string,</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\x05\xef\x8c\x61\xa8\x11\x58\x26"</div><div class='add'>+			  "\x34\xba\x5c\xb7\x10\x6a\xa6\x41",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= zeroed_string,</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.iv	= zeroed_string,</div><div class='add'>+		.input	= zeroed_string,</div><div class='add'>+		.ilen	= 48,</div><div class='add'>+		.result	= "\x9f\x58\x9f\x5c\xf6\x12\x2c\x32"</div><div class='add'>+			  "\xb6\xbf\xec\x2f\x2a\xe8\xc3\x5a"</div><div class='add'>+			  "\xd4\x91\xdb\x16\xe7\xb1\xc3\x9e"</div><div class='add'>+			  "\x86\xcb\x08\x6b\x78\x9f\x54\x19"</div><div class='add'>+			  "\x05\xef\x8c\x61\xa8\x11\x58\x26"</div><div class='add'>+			  "\x34\xba\x5c\xb7\x10\x6a\xa6\x41",</div><div class='add'>+		.rlen	= 48,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct cipher_testvec tf_cbc_dec_tv_template[] = {</div><div class='add'>+	{ /* Reverse of the first four above */</div><div class='add'>+		.key	= zeroed_string,</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.iv	= zeroed_string,</div><div class='add'>+		.input	= "\x9f\x58\x9f\x5c\xf6\x12\x2c\x32"</div><div class='add'>+			  "\xb6\xbf\xec\x2f\x2a\xe8\xc3\x5a",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= zeroed_string,</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= zeroed_string,</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.iv	= "\x9f\x58\x9f\x5c\xf6\x12\x2c\x32"</div><div class='add'>+			  "\xb6\xbf\xec\x2f\x2a\xe8\xc3\x5a",</div><div class='add'>+		.input	= "\xd4\x91\xdb\x16\xe7\xb1\xc3\x9e"</div><div class='add'>+			  "\x86\xcb\x08\x6b\x78\x9f\x54\x19",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= zeroed_string,</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= zeroed_string,</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.iv	= "\xd4\x91\xdb\x16\xe7\xb1\xc3\x9e"</div><div class='add'>+			  "\x86\xcb\x08\x6b\x78\x9f\x54\x19",</div><div class='add'>+		.input	= "\x05\xef\x8c\x61\xa8\x11\x58\x26"</div><div class='add'>+			  "\x34\xba\x5c\xb7\x10\x6a\xa6\x41",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= zeroed_string,</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= zeroed_string,</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.iv	= zeroed_string,</div><div class='add'>+		.input	= "\x9f\x58\x9f\x5c\xf6\x12\x2c\x32"</div><div class='add'>+			  "\xb6\xbf\xec\x2f\x2a\xe8\xc3\x5a"</div><div class='add'>+			  "\xd4\x91\xdb\x16\xe7\xb1\xc3\x9e"</div><div class='add'>+			  "\x86\xcb\x08\x6b\x78\x9f\x54\x19"</div><div class='add'>+			  "\x05\xef\x8c\x61\xa8\x11\x58\x26"</div><div class='add'>+			  "\x34\xba\x5c\xb7\x10\x6a\xa6\x41",</div><div class='add'>+		.ilen	= 48,</div><div class='add'>+		.result	= zeroed_string,</div><div class='add'>+		.rlen	= 48,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Serpent test vectors.  These are backwards because Serpent writes</div><div class='add'>+ * octet sequences in right-to-left mode.</div><div class='add'>+ */</div><div class='add'>+#define SERPENT_ENC_TEST_VECTORS	4</div><div class='add'>+#define SERPENT_DEC_TEST_VECTORS	4</div><div class='add'>+</div><div class='add'>+#define TNEPRES_ENC_TEST_VECTORS	4</div><div class='add'>+#define TNEPRES_DEC_TEST_VECTORS	4</div><div class='add'>+</div><div class='add'>+static struct cipher_testvec serpent_enc_tv_template[] = {</div><div class='add'>+	{</div><div class='add'>+		.input	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\x12\x07\xfc\xce\x9b\xd0\xd6\x47"</div><div class='add'>+			  "\x6a\xe9\x8f\xbe\xd1\x43\xa0\xe2",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.input	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\x4c\x7d\x8a\x32\x80\x72\xa2\x2c"</div><div class='add'>+			  "\x82\x3e\x4a\x1f\x3a\xcd\xa1\x6d",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='add'>+			  "\x10\x11\x12\x13\x14\x15\x16\x17"</div><div class='add'>+			  "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f",</div><div class='add'>+		.klen	= 32,</div><div class='add'>+		.input	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\xde\x26\x9f\xf8\x33\xe4\x32\xb8"</div><div class='add'>+			  "\x5b\x2e\x88\xd2\x70\x1c\xe7\x5c",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x80",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.input	= zeroed_string,</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\xdd\xd2\x6b\x98\xa5\xff\xd8\x2c"</div><div class='add'>+			  "\x05\x34\x5a\x9d\xad\xbf\xaf\x49",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct cipher_testvec tnepres_enc_tv_template[] = {</div><div class='add'>+	{ /* KeySize=128, PT=0, I=1 */</div><div class='add'>+		.input	= "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.key    = "\x80\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.klen   = 16,</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\x49\xaf\xbf\xad\x9d\x5a\x34\x05"</div><div class='add'>+			  "\x2c\xd8\xff\xa5\x98\x6b\xd2\xdd",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, { /* KeySize=192, PT=0, I=1 */</div><div class='add'>+		.key	= "\x80\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.klen	= 24,</div><div class='add'>+		.input	= "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\xe7\x8e\x54\x02\xc7\x19\x55\x68"</div><div class='add'>+			  "\xac\x36\x78\xf7\xa3\xf6\x0c\x66",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, { /* KeySize=256, PT=0, I=1 */</div><div class='add'>+		.key	= "\x80\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.klen	= 32,</div><div class='add'>+		.input	= "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\xab\xed\x96\xe7\x66\xbf\x28\xcb"</div><div class='add'>+			  "\xc0\xeb\xd2\x1a\x82\xef\x08\x19",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, { /* KeySize=256, I=257 */</div><div class='add'>+		.key	= "\x1f\x1e\x1d\x1c\x1b\x1a\x19\x18"</div><div class='add'>+			  "\x17\x16\x15\x14\x13\x12\x11\x10"</div><div class='add'>+			  "\x0f\x0e\x0d\x0c\x0b\x0a\x09\x08"</div><div class='add'>+			  "\x07\x06\x05\x04\x03\x02\x01\x00",</div><div class='add'>+		.klen	= 32,</div><div class='add'>+		.input	= "\x0f\x0e\x0d\x0c\x0b\x0a\x09\x08"</div><div class='add'>+			  "\x07\x06\x05\x04\x03\x02\x01\x00",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\x5c\xe7\x1c\x70\xd2\x88\x2e\x5b"</div><div class='add'>+			  "\xb8\x32\xe4\x33\xf8\x9f\x26\xde",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static struct cipher_testvec serpent_dec_tv_template[] = {</div><div class='add'>+	{</div><div class='add'>+		.input	= "\x12\x07\xfc\xce\x9b\xd0\xd6\x47"</div><div class='add'>+			  "\x6a\xe9\x8f\xbe\xd1\x43\xa0\xe2",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.input	= "\x4c\x7d\x8a\x32\x80\x72\xa2\x2c"</div><div class='add'>+			  "\x82\x3e\x4a\x1f\x3a\xcd\xa1\x6d",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='add'>+			  "\x10\x11\x12\x13\x14\x15\x16\x17"</div><div class='add'>+			  "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f",</div><div class='add'>+		.klen	= 32,</div><div class='add'>+		.input	= "\xde\x26\x9f\xf8\x33\xe4\x32\xb8"</div><div class='add'>+			  "\x5b\x2e\x88\xd2\x70\x1c\xe7\x5c",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x80",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.input	= "\xdd\xd2\x6b\x98\xa5\xff\xd8\x2c"</div><div class='add'>+			  "\x05\x34\x5a\x9d\xad\xbf\xaf\x49",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= zeroed_string,</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct cipher_testvec tnepres_dec_tv_template[] = {</div><div class='add'>+	{</div><div class='add'>+		.input	= "\x41\xcc\x6b\x31\x59\x31\x45\x97"</div><div class='add'>+			  "\x6d\x6f\xbb\x38\x4b\x37\x21\x28",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.input	= "\xea\xf4\xd7\xfc\xd8\x01\x34\x47"</div><div class='add'>+			  "\x81\x45\x0b\xfa\x0c\xd6\xad\x6e",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='add'>+			  "\x10\x11\x12\x13\x14\x15\x16\x17"</div><div class='add'>+			  "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f",</div><div class='add'>+		.klen	= 32,</div><div class='add'>+		.input	= "\x64\xa9\x1a\x37\xed\x9f\xe7\x49"</div><div class='add'>+			  "\xa8\x4e\x76\xd6\xf5\x0d\x78\xee",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, { /* KeySize=128, I=121 */</div><div class='add'>+		.key	= "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x80",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.input	= "\x3d\xda\xbf\xc0\x06\xda\xab\x06"</div><div class='add'>+			  "\x46\x2a\xf4\xef\x81\x54\x4e\x26",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= zeroed_string,</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Cast6 test vectors from RFC 2612 */</div><div class='add'>+#define CAST6_ENC_TEST_VECTORS	3</div><div class='add'>+#define CAST6_DEC_TEST_VECTORS  3</div><div class='add'>+</div><div class='add'>+static struct cipher_testvec cast6_enc_tv_template[] = {</div><div class='add'>+	{</div><div class='add'>+		.key	= "\x23\x42\xbb\x9e\xfa\x38\x54\x2c"</div><div class='add'>+			  "\x0a\xf7\x56\x47\xf2\x9f\x61\x5d",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.input	= zeroed_string,</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\xc8\x42\xa0\x89\x72\xb4\x3d\x20"</div><div class='add'>+			  "\x83\x6c\x91\xd1\xb7\x53\x0f\x6b",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x23\x42\xbb\x9e\xfa\x38\x54\x2c"</div><div class='add'>+			  "\xbe\xd0\xac\x83\x94\x0a\xc2\x98"</div><div class='add'>+			  "\xba\xc7\x7a\x77\x17\x94\x28\x63",</div><div class='add'>+		.klen	= 24,</div><div class='add'>+		.input	= zeroed_string,</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\x1b\x38\x6c\x02\x10\xdc\xad\xcb"</div><div class='add'>+			  "\xdd\x0e\x41\xaa\x08\xa7\xa7\xe8",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x23\x42\xbb\x9e\xfa\x38\x54\x2c"</div><div class='add'>+			  "\xbe\xd0\xac\x83\x94\x0a\xc2\x98"</div><div class='add'>+			  "\x8d\x7c\x47\xce\x26\x49\x08\x46"</div><div class='add'>+			  "\x1c\xc1\xb5\x13\x7a\xe6\xb6\x04",</div><div class='add'>+		.klen	= 32,</div><div class='add'>+		.input	= zeroed_string,</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\x4f\x6a\x20\x38\x28\x68\x97\xb9"</div><div class='add'>+			  "\xc9\x87\x01\x36\x55\x33\x17\xfa",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct cipher_testvec cast6_dec_tv_template[] = {</div><div class='add'>+	{</div><div class='add'>+		.key	= "\x23\x42\xbb\x9e\xfa\x38\x54\x2c"</div><div class='add'>+			  "\x0a\xf7\x56\x47\xf2\x9f\x61\x5d",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.input	= "\xc8\x42\xa0\x89\x72\xb4\x3d\x20"</div><div class='add'>+			  "\x83\x6c\x91\xd1\xb7\x53\x0f\x6b",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= zeroed_string,</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x23\x42\xbb\x9e\xfa\x38\x54\x2c"</div><div class='add'>+			  "\xbe\xd0\xac\x83\x94\x0a\xc2\x98"</div><div class='add'>+			  "\xba\xc7\x7a\x77\x17\x94\x28\x63",</div><div class='add'>+		.klen	= 24,</div><div class='add'>+		.input	= "\x1b\x38\x6c\x02\x10\xdc\xad\xcb"</div><div class='add'>+			  "\xdd\x0e\x41\xaa\x08\xa7\xa7\xe8",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= zeroed_string,</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x23\x42\xbb\x9e\xfa\x38\x54\x2c"</div><div class='add'>+			  "\xbe\xd0\xac\x83\x94\x0a\xc2\x98"</div><div class='add'>+			  "\x8d\x7c\x47\xce\x26\x49\x08\x46"</div><div class='add'>+			  "\x1c\xc1\xb5\x13\x7a\xe6\xb6\x04",</div><div class='add'>+		.klen	= 32,</div><div class='add'>+		.input	= "\x4f\x6a\x20\x38\x28\x68\x97\xb9"</div><div class='add'>+			  "\xc9\x87\x01\x36\x55\x33\x17\xfa",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= zeroed_string,</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * AES test vectors.</div><div class='add'>+ */</div><div class='add'>+#define AES_ENC_TEST_VECTORS 3</div><div class='add'>+#define AES_DEC_TEST_VECTORS 3</div><div class='add'>+#define AES_CBC_ENC_TEST_VECTORS 4</div><div class='add'>+#define AES_CBC_DEC_TEST_VECTORS 4</div><div class='add'>+#define AES_LRW_ENC_TEST_VECTORS 8</div><div class='add'>+#define AES_LRW_DEC_TEST_VECTORS 8</div><div class='add'>+#define AES_XTS_ENC_TEST_VECTORS 4</div><div class='add'>+#define AES_XTS_DEC_TEST_VECTORS 4</div><div class='add'>+#define AES_CTR_ENC_TEST_VECTORS 7</div><div class='add'>+#define AES_CTR_DEC_TEST_VECTORS 6</div><div class='add'>+#define AES_GCM_ENC_TEST_VECTORS 9</div><div class='add'>+#define AES_GCM_DEC_TEST_VECTORS 8</div><div class='add'>+#define AES_CCM_ENC_TEST_VECTORS 7</div><div class='add'>+#define AES_CCM_DEC_TEST_VECTORS 7</div><div class='add'>+</div><div class='add'>+static struct cipher_testvec aes_enc_tv_template[] = {</div><div class='add'>+	{ /* From FIPS-197 */</div><div class='add'>+		.key	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.input	= "\x00\x11\x22\x33\x44\x55\x66\x77"</div><div class='add'>+			  "\x88\x99\xaa\xbb\xcc\xdd\xee\xff",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\x69\xc4\xe0\xd8\x6a\x7b\x04\x30"</div><div class='add'>+			  "\xd8\xcd\xb7\x80\x70\xb4\xc5\x5a",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='add'>+			  "\x10\x11\x12\x13\x14\x15\x16\x17",</div><div class='add'>+		.klen	= 24,</div><div class='add'>+		.input	= "\x00\x11\x22\x33\x44\x55\x66\x77"</div><div class='add'>+			  "\x88\x99\xaa\xbb\xcc\xdd\xee\xff",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\xdd\xa9\x7c\xa4\x86\x4c\xdf\xe0"</div><div class='add'>+			  "\x6e\xaf\x70\xa0\xec\x0d\x71\x91",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='add'>+			  "\x10\x11\x12\x13\x14\x15\x16\x17"</div><div class='add'>+			  "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f",</div><div class='add'>+		.klen	= 32,</div><div class='add'>+		.input	= "\x00\x11\x22\x33\x44\x55\x66\x77"</div><div class='add'>+			  "\x88\x99\xaa\xbb\xcc\xdd\xee\xff",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\x8e\xa2\xb7\xca\x51\x67\x45\xbf"</div><div class='add'>+			  "\xea\xfc\x49\x90\x4b\x49\x60\x89",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct cipher_testvec aes_dec_tv_template[] = {</div><div class='add'>+	{ /* From FIPS-197 */</div><div class='add'>+		.key	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.input	= "\x69\xc4\xe0\xd8\x6a\x7b\x04\x30"</div><div class='add'>+			  "\xd8\xcd\xb7\x80\x70\xb4\xc5\x5a",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\x00\x11\x22\x33\x44\x55\x66\x77"</div><div class='add'>+			  "\x88\x99\xaa\xbb\xcc\xdd\xee\xff",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='add'>+			  "\x10\x11\x12\x13\x14\x15\x16\x17",</div><div class='add'>+		.klen	= 24,</div><div class='add'>+		.input	= "\xdd\xa9\x7c\xa4\x86\x4c\xdf\xe0"</div><div class='add'>+			  "\x6e\xaf\x70\xa0\xec\x0d\x71\x91",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\x00\x11\x22\x33\x44\x55\x66\x77"</div><div class='add'>+			  "\x88\x99\xaa\xbb\xcc\xdd\xee\xff",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='add'>+			  "\x10\x11\x12\x13\x14\x15\x16\x17"</div><div class='add'>+			  "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f",</div><div class='add'>+		.klen	= 32,</div><div class='add'>+		.input	= "\x8e\xa2\xb7\xca\x51\x67\x45\xbf"</div><div class='add'>+			  "\xea\xfc\x49\x90\x4b\x49\x60\x89",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\x00\x11\x22\x33\x44\x55\x66\x77"</div><div class='add'>+			  "\x88\x99\xaa\xbb\xcc\xdd\xee\xff",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct cipher_testvec aes_cbc_enc_tv_template[] = {</div><div class='add'>+	{ /* From RFC 3602 */</div><div class='add'>+		.key    = "\x06\xa9\x21\x40\x36\xb8\xa1\x5b"</div><div class='add'>+			  "\x51\x2e\x03\xd5\x34\x12\x00\x06",</div><div class='add'>+		.klen   = 16,</div><div class='add'>+		.iv	= "\x3d\xaf\xba\x42\x9d\x9e\xb4\x30"</div><div class='add'>+			  "\xb4\x22\xda\x80\x2c\x9f\xac\x41",</div><div class='add'>+		.input	= "Single block msg",</div><div class='add'>+		.ilen   = 16,</div><div class='add'>+		.result = "\xe3\x53\x77\x9c\x10\x79\xae\xb8"</div><div class='add'>+			  "\x27\x08\x94\x2d\xbe\x77\x18\x1a",</div><div class='add'>+		.rlen   = 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key    = "\xc2\x86\x69\x6d\x88\x7c\x9a\xa0"</div><div class='add'>+			  "\x61\x1b\xbb\x3e\x20\x25\xa4\x5a",</div><div class='add'>+		.klen   = 16,</div><div class='add'>+		.iv     = "\x56\x2e\x17\x99\x6d\x09\x3d\x28"</div><div class='add'>+			  "\xdd\xb3\xba\x69\x5a\x2e\x6f\x58",</div><div class='add'>+		.input  = "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='add'>+			  "\x10\x11\x12\x13\x14\x15\x16\x17"</div><div class='add'>+			  "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f",</div><div class='add'>+		.ilen   = 32,</div><div class='add'>+		.result = "\xd2\x96\xcd\x94\xc2\xcc\xcf\x8a"</div><div class='add'>+			  "\x3a\x86\x30\x28\xb5\xe1\xdc\x0a"</div><div class='add'>+			  "\x75\x86\x60\x2d\x25\x3c\xff\xf9"</div><div class='add'>+			  "\x1b\x82\x66\xbe\xa6\xd6\x1a\xb1",</div><div class='add'>+		.rlen   = 32,</div><div class='add'>+	}, { /* From NIST SP800-38A */</div><div class='add'>+		.key	= "\x8e\x73\xb0\xf7\xda\x0e\x64\x52"</div><div class='add'>+			  "\xc8\x10\xf3\x2b\x80\x90\x79\xe5"</div><div class='add'>+			  "\x62\xf8\xea\xd2\x52\x2c\x6b\x7b",</div><div class='add'>+		.klen	= 24,</div><div class='add'>+		.iv	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",</div><div class='add'>+		.input	= "\x6b\xc1\xbe\xe2\x2e\x40\x9f\x96"</div><div class='add'>+			  "\xe9\x3d\x7e\x11\x73\x93\x17\x2a"</div><div class='add'>+			  "\xae\x2d\x8a\x57\x1e\x03\xac\x9c"</div><div class='add'>+			  "\x9e\xb7\x6f\xac\x45\xaf\x8e\x51"</div><div class='add'>+			  "\x30\xc8\x1c\x46\xa3\x5c\xe4\x11"</div><div class='add'>+			  "\xe5\xfb\xc1\x19\x1a\x0a\x52\xef"</div><div class='add'>+			  "\xf6\x9f\x24\x45\xdf\x4f\x9b\x17"</div><div class='add'>+			  "\xad\x2b\x41\x7b\xe6\x6c\x37\x10",</div><div class='add'>+		.ilen	= 64,</div><div class='add'>+		.result	= "\x4f\x02\x1d\xb2\x43\xbc\x63\x3d"</div><div class='add'>+			  "\x71\x78\x18\x3a\x9f\xa0\x71\xe8"</div><div class='add'>+			  "\xb4\xd9\xad\xa9\xad\x7d\xed\xf4"</div><div class='add'>+			  "\xe5\xe7\x38\x76\x3f\x69\x14\x5a"</div><div class='add'>+			  "\x57\x1b\x24\x20\x12\xfb\x7a\xe0"</div><div class='add'>+			  "\x7f\xa9\xba\xac\x3d\xf1\x02\xe0"</div><div class='add'>+			  "\x08\xb0\xe2\x79\x88\x59\x88\x81"</div><div class='add'>+			  "\xd9\x20\xa9\xe6\x4f\x56\x15\xcd",</div><div class='add'>+		.rlen	= 64,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x60\x3d\xeb\x10\x15\xca\x71\xbe"</div><div class='add'>+			  "\x2b\x73\xae\xf0\x85\x7d\x77\x81"</div><div class='add'>+			  "\x1f\x35\x2c\x07\x3b\x61\x08\xd7"</div><div class='add'>+			  "\x2d\x98\x10\xa3\x09\x14\xdf\xf4",</div><div class='add'>+		.klen	= 32,</div><div class='add'>+		.iv	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",</div><div class='add'>+		.input	= "\x6b\xc1\xbe\xe2\x2e\x40\x9f\x96"</div><div class='add'>+			  "\xe9\x3d\x7e\x11\x73\x93\x17\x2a"</div><div class='add'>+			  "\xae\x2d\x8a\x57\x1e\x03\xac\x9c"</div><div class='add'>+			  "\x9e\xb7\x6f\xac\x45\xaf\x8e\x51"</div><div class='add'>+			  "\x30\xc8\x1c\x46\xa3\x5c\xe4\x11"</div><div class='add'>+			  "\xe5\xfb\xc1\x19\x1a\x0a\x52\xef"</div><div class='add'>+			  "\xf6\x9f\x24\x45\xdf\x4f\x9b\x17"</div><div class='add'>+			  "\xad\x2b\x41\x7b\xe6\x6c\x37\x10",</div><div class='add'>+		.ilen	= 64,</div><div class='add'>+		.result	= "\xf5\x8c\x4c\x04\xd6\xe5\xf1\xba"</div><div class='add'>+			  "\x77\x9e\xab\xfb\x5f\x7b\xfb\xd6"</div><div class='add'>+			  "\x9c\xfc\x4e\x96\x7e\xdb\x80\x8d"</div><div class='add'>+			  "\x67\x9f\x77\x7b\xc6\x70\x2c\x7d"</div><div class='add'>+			  "\x39\xf2\x33\x69\xa9\xd9\xba\xcf"</div><div class='add'>+			  "\xa5\x30\xe2\x63\x04\x23\x14\x61"</div><div class='add'>+			  "\xb2\xeb\x05\xe2\xc3\x9b\xe9\xfc"</div><div class='add'>+			  "\xda\x6c\x19\x07\x8c\x6a\x9d\x1b",</div><div class='add'>+		.rlen	= 64,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct cipher_testvec aes_cbc_dec_tv_template[] = {</div><div class='add'>+	{ /* From RFC 3602 */</div><div class='add'>+		.key    = "\x06\xa9\x21\x40\x36\xb8\xa1\x5b"</div><div class='add'>+			  "\x51\x2e\x03\xd5\x34\x12\x00\x06",</div><div class='add'>+		.klen   = 16,</div><div class='add'>+		.iv     = "\x3d\xaf\xba\x42\x9d\x9e\xb4\x30"</div><div class='add'>+			  "\xb4\x22\xda\x80\x2c\x9f\xac\x41",</div><div class='add'>+		.input  = "\xe3\x53\x77\x9c\x10\x79\xae\xb8"</div><div class='add'>+			  "\x27\x08\x94\x2d\xbe\x77\x18\x1a",</div><div class='add'>+		.ilen   = 16,</div><div class='add'>+		.result = "Single block msg",</div><div class='add'>+		.rlen   = 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key    = "\xc2\x86\x69\x6d\x88\x7c\x9a\xa0"</div><div class='add'>+			  "\x61\x1b\xbb\x3e\x20\x25\xa4\x5a",</div><div class='add'>+		.klen   = 16,</div><div class='add'>+		.iv     = "\x56\x2e\x17\x99\x6d\x09\x3d\x28"</div><div class='add'>+			  "\xdd\xb3\xba\x69\x5a\x2e\x6f\x58",</div><div class='add'>+		.input  = "\xd2\x96\xcd\x94\xc2\xcc\xcf\x8a"</div><div class='add'>+			  "\x3a\x86\x30\x28\xb5\xe1\xdc\x0a"</div><div class='add'>+			  "\x75\x86\x60\x2d\x25\x3c\xff\xf9"</div><div class='add'>+			  "\x1b\x82\x66\xbe\xa6\xd6\x1a\xb1",</div><div class='add'>+		.ilen   = 32,</div><div class='add'>+		.result = "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='add'>+			  "\x10\x11\x12\x13\x14\x15\x16\x17"</div><div class='add'>+			  "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f",</div><div class='add'>+		.rlen   = 32,</div><div class='add'>+	}, { /* From NIST SP800-38A */</div><div class='add'>+		.key	= "\x8e\x73\xb0\xf7\xda\x0e\x64\x52"</div><div class='add'>+			  "\xc8\x10\xf3\x2b\x80\x90\x79\xe5"</div><div class='add'>+			  "\x62\xf8\xea\xd2\x52\x2c\x6b\x7b",</div><div class='add'>+		.klen	= 24,</div><div class='add'>+		.iv	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",</div><div class='add'>+		.input	= "\x4f\x02\x1d\xb2\x43\xbc\x63\x3d"</div><div class='add'>+			  "\x71\x78\x18\x3a\x9f\xa0\x71\xe8"</div><div class='add'>+			  "\xb4\xd9\xad\xa9\xad\x7d\xed\xf4"</div><div class='add'>+			  "\xe5\xe7\x38\x76\x3f\x69\x14\x5a"</div><div class='add'>+			  "\x57\x1b\x24\x20\x12\xfb\x7a\xe0"</div><div class='add'>+			  "\x7f\xa9\xba\xac\x3d\xf1\x02\xe0"</div><div class='add'>+			  "\x08\xb0\xe2\x79\x88\x59\x88\x81"</div><div class='add'>+			  "\xd9\x20\xa9\xe6\x4f\x56\x15\xcd",</div><div class='add'>+		.ilen	= 64,</div><div class='add'>+		.result	= "\x6b\xc1\xbe\xe2\x2e\x40\x9f\x96"</div><div class='add'>+			  "\xe9\x3d\x7e\x11\x73\x93\x17\x2a"</div><div class='add'>+			  "\xae\x2d\x8a\x57\x1e\x03\xac\x9c"</div><div class='add'>+			  "\x9e\xb7\x6f\xac\x45\xaf\x8e\x51"</div><div class='add'>+			  "\x30\xc8\x1c\x46\xa3\x5c\xe4\x11"</div><div class='add'>+			  "\xe5\xfb\xc1\x19\x1a\x0a\x52\xef"</div><div class='add'>+			  "\xf6\x9f\x24\x45\xdf\x4f\x9b\x17"</div><div class='add'>+			  "\xad\x2b\x41\x7b\xe6\x6c\x37\x10",</div><div class='add'>+		.rlen	= 64,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x60\x3d\xeb\x10\x15\xca\x71\xbe"</div><div class='add'>+			  "\x2b\x73\xae\xf0\x85\x7d\x77\x81"</div><div class='add'>+			  "\x1f\x35\x2c\x07\x3b\x61\x08\xd7"</div><div class='add'>+			  "\x2d\x98\x10\xa3\x09\x14\xdf\xf4",</div><div class='add'>+		.klen	= 32,</div><div class='add'>+		.iv	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",</div><div class='add'>+		.input	= "\xf5\x8c\x4c\x04\xd6\xe5\xf1\xba"</div><div class='add'>+			  "\x77\x9e\xab\xfb\x5f\x7b\xfb\xd6"</div><div class='add'>+			  "\x9c\xfc\x4e\x96\x7e\xdb\x80\x8d"</div><div class='add'>+			  "\x67\x9f\x77\x7b\xc6\x70\x2c\x7d"</div><div class='add'>+			  "\x39\xf2\x33\x69\xa9\xd9\xba\xcf"</div><div class='add'>+			  "\xa5\x30\xe2\x63\x04\x23\x14\x61"</div><div class='add'>+			  "\xb2\xeb\x05\xe2\xc3\x9b\xe9\xfc"</div><div class='add'>+			  "\xda\x6c\x19\x07\x8c\x6a\x9d\x1b",</div><div class='add'>+		.ilen	= 64,</div><div class='add'>+		.result	= "\x6b\xc1\xbe\xe2\x2e\x40\x9f\x96"</div><div class='add'>+			  "\xe9\x3d\x7e\x11\x73\x93\x17\x2a"</div><div class='add'>+			  "\xae\x2d\x8a\x57\x1e\x03\xac\x9c"</div><div class='add'>+			  "\x9e\xb7\x6f\xac\x45\xaf\x8e\x51"</div><div class='add'>+			  "\x30\xc8\x1c\x46\xa3\x5c\xe4\x11"</div><div class='add'>+			  "\xe5\xfb\xc1\x19\x1a\x0a\x52\xef"</div><div class='add'>+			  "\xf6\x9f\x24\x45\xdf\x4f\x9b\x17"</div><div class='add'>+			  "\xad\x2b\x41\x7b\xe6\x6c\x37\x10",</div><div class='add'>+		.rlen	= 64,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct cipher_testvec aes_lrw_enc_tv_template[] = {</div><div class='add'>+	/* from http://grouper.ieee.org/groups/1619/email/pdf00017.pdf */</div><div class='add'>+	{ /* LRW-32-AES 1 */</div><div class='add'>+		.key    = "\x45\x62\xac\x25\xf8\x28\x17\x6d"</div><div class='add'>+			  "\x4c\x26\x84\x14\xb5\x68\x01\x85"</div><div class='add'>+			  "\x25\x8e\x2a\x05\xe7\x3e\x9d\x03"</div><div class='add'>+			  "\xee\x5a\x83\x0c\xcc\x09\x4c\x87",</div><div class='add'>+		.klen   = 32,</div><div class='add'>+		.iv     = "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x01",</div><div class='add'>+		.input  = "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='add'>+			  "\x38\x39\x41\x42\x43\x44\x45\x46",</div><div class='add'>+		.ilen   = 16,</div><div class='add'>+		.result = "\xf1\xb2\x73\xcd\x65\xa3\xdf\x5f"</div><div class='add'>+			  "\xe9\x5d\x48\x92\x54\x63\x4e\xb8",</div><div class='add'>+		.rlen   = 16,</div><div class='add'>+	}, { /* LRW-32-AES 2 */</div><div class='add'>+		.key    = "\x59\x70\x47\x14\xf5\x57\x47\x8c"</div><div class='add'>+			  "\xd7\x79\xe8\x0f\x54\x88\x79\x44"</div><div class='add'>+			  "\x0d\x48\xf0\xb7\xb1\x5a\x53\xea"</div><div class='add'>+			  "\x1c\xaa\x6b\x29\xc2\xca\xfb\xaf",</div><div class='add'>+		.klen   = 32,</div><div class='add'>+		.iv     = "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x02",</div><div class='add'>+		.input  = "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='add'>+			  "\x38\x39\x41\x42\x43\x44\x45\x46",</div><div class='add'>+		.ilen   = 16,</div><div class='add'>+		.result = "\x00\xc8\x2b\xae\x95\xbb\xcd\xe5"</div><div class='add'>+			  "\x27\x4f\x07\x69\xb2\x60\xe1\x36",</div><div class='add'>+		.rlen   = 16,</div><div class='add'>+	}, { /* LRW-32-AES 3 */</div><div class='add'>+		.key    = "\xd8\x2a\x91\x34\xb2\x6a\x56\x50"</div><div class='add'>+			  "\x30\xfe\x69\xe2\x37\x7f\x98\x47"</div><div class='add'>+			  "\xcd\xf9\x0b\x16\x0c\x64\x8f\xb6"</div><div class='add'>+			  "\xb0\x0d\x0d\x1b\xae\x85\x87\x1f",</div><div class='add'>+		.klen   = 32,</div><div class='add'>+		.iv     = "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x02\x00\x00\x00\x00",</div><div class='add'>+		.input  = "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='add'>+			  "\x38\x39\x41\x42\x43\x44\x45\x46",</div><div class='add'>+		.ilen   = 16,</div><div class='add'>+		.result = "\x76\x32\x21\x83\xed\x8f\xf1\x82"</div><div class='add'>+			  "\xf9\x59\x62\x03\x69\x0e\x5e\x01",</div><div class='add'>+		.rlen   = 16,</div><div class='add'>+	}, { /* LRW-32-AES 4 */</div><div class='add'>+		.key    = "\x0f\x6a\xef\xf8\xd3\xd2\xbb\x15"</div><div class='add'>+			  "\x25\x83\xf7\x3c\x1f\x01\x28\x74"</div><div class='add'>+			  "\xca\xc6\xbc\x35\x4d\x4a\x65\x54"</div><div class='add'>+			  "\x90\xae\x61\xcf\x7b\xae\xbd\xcc"</div><div class='add'>+			  "\xad\xe4\x94\xc5\x4a\x29\xae\x70",</div><div class='add'>+		.klen   = 40,</div><div class='add'>+		.iv     = "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x01",</div><div class='add'>+		.input  = "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='add'>+			  "\x38\x39\x41\x42\x43\x44\x45\x46",</div><div class='add'>+		.ilen   = 16,</div><div class='add'>+		.result = "\x9c\x0f\x15\x2f\x55\xa2\xd8\xf0"</div><div class='add'>+			  "\xd6\x7b\x8f\x9e\x28\x22\xbc\x41",</div><div class='add'>+		.rlen   = 16,</div><div class='add'>+	}, { /* LRW-32-AES 5 */</div><div class='add'>+		.key    = "\x8a\xd4\xee\x10\x2f\xbd\x81\xff"</div><div class='add'>+			  "\xf8\x86\xce\xac\x93\xc5\xad\xc6"</div><div class='add'>+			  "\xa0\x19\x07\xc0\x9d\xf7\xbb\xdd"</div><div class='add'>+			  "\x52\x13\xb2\xb7\xf0\xff\x11\xd8"</div><div class='add'>+			  "\xd6\x08\xd0\xcd\x2e\xb1\x17\x6f",</div><div class='add'>+		.klen   = 40,</div><div class='add'>+		.iv     = "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x02\x00\x00\x00\x00",</div><div class='add'>+		.input  = "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='add'>+			  "\x38\x39\x41\x42\x43\x44\x45\x46",</div><div class='add'>+		.ilen   = 16,</div><div class='add'>+		.result = "\xd4\x27\x6a\x7f\x14\x91\x3d\x65"</div><div class='add'>+			  "\xc8\x60\x48\x02\x87\xe3\x34\x06",</div><div class='add'>+		.rlen   = 16,</div><div class='add'>+	}, { /* LRW-32-AES 6 */</div><div class='add'>+		.key    = "\xf8\xd4\x76\xff\xd6\x46\xee\x6c"</div><div class='add'>+			  "\x23\x84\xcb\x1c\x77\xd6\x19\x5d"</div><div class='add'>+			  "\xfe\xf1\xa9\xf3\x7b\xbc\x8d\x21"</div><div class='add'>+			  "\xa7\x9c\x21\xf8\xcb\x90\x02\x89"</div><div class='add'>+			  "\xa8\x45\x34\x8e\xc8\xc5\xb5\xf1"</div><div class='add'>+			  "\x26\xf5\x0e\x76\xfe\xfd\x1b\x1e",</div><div class='add'>+		.klen   = 48,</div><div class='add'>+		.iv     = "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x01",</div><div class='add'>+		.input  = "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='add'>+			  "\x38\x39\x41\x42\x43\x44\x45\x46",</div><div class='add'>+		.ilen   = 16,</div><div class='add'>+		.result = "\xbd\x06\xb8\xe1\xdb\x98\x89\x9e"</div><div class='add'>+			  "\xc4\x98\xe4\x91\xcf\x1c\x70\x2b",</div><div class='add'>+		.rlen   = 16,</div><div class='add'>+	}, { /* LRW-32-AES 7 */</div><div class='add'>+		.key    = "\xfb\x76\x15\xb2\x3d\x80\x89\x1d"</div><div class='add'>+			  "\xd4\x70\x98\x0b\xc7\x95\x84\xc8"</div><div class='add'>+			  "\xb2\xfb\x64\xce\x60\x97\x87\x8d"</div><div class='add'>+			  "\x17\xfc\xe4\x5a\x49\xe8\x30\xb7"</div><div class='add'>+			  "\x6e\x78\x17\xe7\x2d\x5e\x12\xd4"</div><div class='add'>+			  "\x60\x64\x04\x7a\xf1\x2f\x9e\x0c",</div><div class='add'>+		.klen   = 48,</div><div class='add'>+		.iv     = "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x02\x00\x00\x00\x00",</div><div class='add'>+		.input  = "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='add'>+			  "\x38\x39\x41\x42\x43\x44\x45\x46",</div><div class='add'>+		.ilen   = 16,</div><div class='add'>+		.result = "\x5b\x90\x8e\xc1\xab\xdd\x67\x5f"</div><div class='add'>+			  "\x3d\x69\x8a\x95\x53\xc8\x9c\xe5",</div><div class='add'>+		.rlen   = 16,</div><div class='add'>+	}, {</div><div class='add'>+/* http://www.mail-archive.com/stds-p1619@listserv.ieee.org/msg00173.html */</div><div class='add'>+		.key    = "\xf8\xd4\x76\xff\xd6\x46\xee\x6c"</div><div class='add'>+			  "\x23\x84\xcb\x1c\x77\xd6\x19\x5d"</div><div class='add'>+			  "\xfe\xf1\xa9\xf3\x7b\xbc\x8d\x21"</div><div class='add'>+			  "\xa7\x9c\x21\xf8\xcb\x90\x02\x89"</div><div class='add'>+			  "\xa8\x45\x34\x8e\xc8\xc5\xb5\xf1"</div><div class='add'>+			  "\x26\xf5\x0e\x76\xfe\xfd\x1b\x1e",</div><div class='add'>+		.klen   = 48,</div><div class='add'>+		.iv     = "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x01",</div><div class='add'>+		.input  = "\x05\x11\xb7\x18\xab\xc6\x2d\xac"</div><div class='add'>+			  "\x70\x5d\xf6\x22\x94\xcd\xe5\x6c"</div><div class='add'>+			  "\x17\x6b\xf6\x1c\xf0\xf3\x6e\xf8"</div><div class='add'>+			  "\x50\x38\x1f\x71\x49\xb6\x57\xd6"</div><div class='add'>+			  "\x8f\xcb\x8d\x6b\xe3\xa6\x29\x90"</div><div class='add'>+			  "\xfe\x2a\x62\x82\xae\x6d\x8b\xf6"</div><div class='add'>+			  "\xad\x1e\x9e\x20\x5f\x38\xbe\x04"</div><div class='add'>+			  "\xda\x10\x8e\xed\xa2\xa4\x87\xab"</div><div class='add'>+			  "\xda\x6b\xb4\x0c\x75\xba\xd3\x7c"</div><div class='add'>+			  "\xc9\xac\x42\x31\x95\x7c\xc9\x04"</div><div class='add'>+			  "\xeb\xd5\x6e\x32\x69\x8a\xdb\xa6"</div><div class='add'>+			  "\x15\xd7\x3f\x4f\x2f\x66\x69\x03"</div><div class='add'>+			  "\x9c\x1f\x54\x0f\xde\x1f\xf3\x65"</div><div class='add'>+			  "\x4c\x96\x12\xed\x7c\x92\x03\x01"</div><div class='add'>+			  "\x6f\xbc\x35\x93\xac\xf1\x27\xf1"</div><div class='add'>+			  "\xb4\x96\x82\x5a\x5f\xb0\xa0\x50"</div><div class='add'>+			  "\x89\xa4\x8e\x66\x44\x85\xcc\xfd"</div><div class='add'>+			  "\x33\x14\x70\xe3\x96\xb2\xc3\xd3"</div><div class='add'>+			  "\xbb\x54\x5a\x1a\xf9\x74\xa2\xc5"</div><div class='add'>+			  "\x2d\x64\x75\xdd\xb4\x54\xe6\x74"</div><div class='add'>+			  "\x8c\xd3\x9d\x9e\x86\xab\x51\x53"</div><div class='add'>+			  "\xb7\x93\x3e\x6f\xd0\x4e\x2c\x40"</div><div class='add'>+			  "\xf6\xa8\x2e\x3e\x9d\xf4\x66\xa5"</div><div class='add'>+			  "\x76\x12\x73\x44\x1a\x56\xd7\x72"</div><div class='add'>+			  "\x88\xcd\x21\x8c\x4c\x0f\xfe\xda"</div><div class='add'>+			  "\x95\xe0\x3a\xa6\xa5\x84\x46\xcd"</div><div class='add'>+			  "\xd5\x3e\x9d\x3a\xe2\x67\xe6\x60"</div><div class='add'>+			  "\x1a\xe2\x70\x85\x58\xc2\x1b\x09"</div><div class='add'>+			  "\xe1\xd7\x2c\xca\xad\xa8\x8f\xf9"</div><div class='add'>+			  "\xac\xb3\x0e\xdb\xca\x2e\xe2\xb8"</div><div class='add'>+			  "\x51\x71\xd9\x3c\x6c\xf1\x56\xf8"</div><div class='add'>+			  "\xea\x9c\xf1\xfb\x0c\xe6\xb7\x10"</div><div class='add'>+			  "\x1c\xf8\xa9\x7c\xe8\x53\x35\xc1"</div><div class='add'>+			  "\x90\x3e\x76\x4a\x74\xa4\x21\x2c"</div><div class='add'>+			  "\xf6\x2c\x4e\x0f\x94\x3a\x88\x2e"</div><div class='add'>+			  "\x41\x09\x6a\x33\x7d\xf6\xdd\x3f"</div><div class='add'>+			  "\x8d\x23\x31\x74\x84\xeb\x88\x6e"</div><div class='add'>+			  "\xcc\xb9\xbc\x22\x83\x19\x07\x22"</div><div class='add'>+			  "\xa5\x2d\xdf\xa5\xf3\x80\x85\x78"</div><div class='add'>+			  "\x84\x39\x6a\x6d\x6a\x99\x4f\xa5"</div><div class='add'>+			  "\x15\xfe\x46\xb0\xe4\x6c\xa5\x41"</div><div class='add'>+			  "\x3c\xce\x8f\x42\x60\x71\xa7\x75"</div><div class='add'>+			  "\x08\x40\x65\x8a\x82\xbf\xf5\x43"</div><div class='add'>+			  "\x71\x96\xa9\x4d\x44\x8a\x20\xbe"</div><div class='add'>+			  "\xfa\x4d\xbb\xc0\x7d\x31\x96\x65"</div><div class='add'>+			  "\xe7\x75\xe5\x3e\xfd\x92\x3b\xc9"</div><div class='add'>+			  "\x55\xbb\x16\x7e\xf7\xc2\x8c\xa4"</div><div class='add'>+			  "\x40\x1d\xe5\xef\x0e\xdf\xe4\x9a"</div><div class='add'>+			  "\x62\x73\x65\xfd\x46\x63\x25\x3d"</div><div class='add'>+			  "\x2b\xaf\xe5\x64\xfe\xa5\x5c\xcf"</div><div class='add'>+			  "\x24\xf3\xb4\xac\x64\xba\xdf\x4b"</div><div class='add'>+			  "\xc6\x96\x7d\x81\x2d\x8d\x97\xf7"</div><div class='add'>+			  "\xc5\x68\x77\x84\x32\x2b\xcc\x85"</div><div class='add'>+			  "\x74\x96\xf0\x12\x77\x61\xb9\xeb"</div><div class='add'>+			  "\x71\xaa\x82\xcb\x1c\xdb\x89\xc8"</div><div class='add'>+			  "\xc6\xb5\xe3\x5c\x7d\x39\x07\x24"</div><div class='add'>+			  "\xda\x39\x87\x45\xc0\x2b\xbb\x01"</div><div class='add'>+			  "\xac\xbc\x2a\x5c\x7f\xfc\xe8\xce"</div><div class='add'>+			  "\x6d\x9c\x6f\xed\xd3\xc1\xa1\xd6"</div><div class='add'>+			  "\xc5\x55\xa9\x66\x2f\xe1\xc8\x32"</div><div class='add'>+			  "\xa6\x5d\xa4\x3a\x98\x73\xe8\x45"</div><div class='add'>+			  "\xa4\xc7\xa8\xb4\xf6\x13\x03\xf6"</div><div class='add'>+			  "\xe9\x2e\xc4\x29\x0f\x84\xdb\xc4"</div><div class='add'>+			  "\x21\xc4\xc2\x75\x67\x89\x37\x0a",</div><div class='add'>+		.ilen   = 512,</div><div class='add'>+		.result = "\x1a\x1d\xa9\x30\xad\xf9\x2f\x9b"</div><div class='add'>+			  "\xb6\x1d\xae\xef\xf0\x2f\xf8\x5a"</div><div class='add'>+			  "\x39\x3c\xbf\x2a\xb2\x45\xb2\x23"</div><div class='add'>+			  "\x1b\x63\x3c\xcf\xaa\xbe\xcf\x4e"</div><div class='add'>+			  "\xfa\xe8\x29\xc2\x20\x68\x2b\x3c"</div><div class='add'>+			  "\x2e\x8b\xf7\x6e\x25\xbd\xe3\x3d"</div><div class='add'>+			  "\x66\x27\xd6\xaf\xd6\x64\x3e\xe3"</div><div class='add'>+			  "\xe8\x58\x46\x97\x39\x51\x07\xde"</div><div class='add'>+			  "\xcb\x37\xbc\xa9\xc0\x5f\x75\xc3"</div><div class='add'>+			  "\x0e\x84\x23\x1d\x16\xd4\x1c\x59"</div><div class='add'>+			  "\x9c\x1a\x02\x55\xab\x3a\x97\x1d"</div><div class='add'>+			  "\xdf\xdd\xc7\x06\x51\xd7\x70\xae"</div><div class='add'>+			  "\x23\xc6\x8c\xf5\x1e\xa0\xe5\x82"</div><div class='add'>+			  "\xb8\xb2\xbf\x04\xa0\x32\x8e\x68"</div><div class='add'>+			  "\xeb\xaf\x6e\x2d\x94\x22\x2f\xce"</div><div class='add'>+			  "\x4c\xb5\x59\xe2\xa2\x2f\xa0\x98"</div><div class='add'>+			  "\x1a\x97\xc6\xd4\xb5\x00\x59\xf2"</div><div class='add'>+			  "\x84\x14\x72\xb1\x9a\x6e\xa3\x7f"</div><div class='add'>+			  "\xea\x20\xe7\xcb\x65\x77\x3a\xdf"</div><div class='add'>+			  "\xc8\x97\x67\x15\xc2\x2a\x27\xcc"</div><div class='add'>+			  "\x18\x55\xa1\x24\x0b\x24\x24\xaf"</div><div class='add'>+			  "\x5b\xec\x68\xb8\xc8\xf5\xba\x63"</div><div class='add'>+			  "\xff\xed\x89\xce\xd5\x3d\x88\xf3"</div><div class='add'>+			  "\x25\xef\x05\x7c\x3a\xef\xeb\xd8"</div><div class='add'>+			  "\x7a\x32\x0d\xd1\x1e\x58\x59\x99"</div><div class='add'>+			  "\x90\x25\xb5\x26\xb0\xe3\x2b\x6c"</div><div class='add'>+			  "\x4c\xa9\x8b\x84\x4f\x5e\x01\x50"</div><div class='add'>+			  "\x41\x30\x58\xc5\x62\x74\x52\x1d"</div><div class='add'>+			  "\x45\x24\x6a\x42\x64\x4f\x97\x1c"</div><div class='add'>+			  "\xa8\x66\xb5\x6d\x79\xd4\x0d\x48"</div><div class='add'>+			  "\xc5\x5f\xf3\x90\x32\xdd\xdd\xe1"</div><div class='add'>+			  "\xe4\xa9\x9f\xfc\xc3\x52\x5a\x46"</div><div class='add'>+			  "\xe4\x81\x84\x95\x36\x59\x7a\x6b"</div><div class='add'>+			  "\xaa\xb3\x60\xad\xce\x9f\x9f\x28"</div><div class='add'>+			  "\xe0\x01\x75\x22\xc4\x4e\xa9\x62"</div><div class='add'>+			  "\x5c\x62\x0d\x00\xcb\x13\xe8\x43"</div><div class='add'>+			  "\x72\xd4\x2d\x53\x46\xb5\xd1\x16"</div><div class='add'>+			  "\x22\x18\xdf\x34\x33\xf5\xd6\x1c"</div><div class='add'>+			  "\xb8\x79\x78\x97\x94\xff\x72\x13"</div><div class='add'>+			  "\x4c\x27\xfc\xcb\xbf\x01\x53\xa6"</div><div class='add'>+			  "\xb4\x50\x6e\xde\xdf\xb5\x43\xa4"</div><div class='add'>+			  "\x59\xdf\x52\xf9\x7c\xe0\x11\x6f"</div><div class='add'>+			  "\x2d\x14\x8e\x24\x61\x2c\xe1\x17"</div><div class='add'>+			  "\xcc\xce\x51\x0c\x19\x8a\x82\x30"</div><div class='add'>+			  "\x94\xd5\x3d\x6a\x53\x06\x5e\xbd"</div><div class='add'>+			  "\xb7\xeb\xfa\xfd\x27\x51\xde\x85"</div><div class='add'>+			  "\x1e\x86\x53\x11\x53\x94\x00\xee"</div><div class='add'>+			  "\x2b\x8c\x08\x2a\xbf\xdd\xae\x11"</div><div class='add'>+			  "\xcb\x1e\xa2\x07\x9a\x80\xcf\x62"</div><div class='add'>+			  "\x9b\x09\xdc\x95\x3c\x96\x8e\xb1"</div><div class='add'>+			  "\x09\xbd\xe4\xeb\xdb\xca\x70\x7a"</div><div class='add'>+			  "\x9e\xfa\x31\x18\x45\x3c\x21\x33"</div><div class='add'>+			  "\xb0\xb3\x2b\xea\xf3\x71\x2d\xe1"</div><div class='add'>+			  "\x03\xad\x1b\x48\xd4\x67\x27\xf0"</div><div class='add'>+			  "\x62\xe4\x3d\xfb\x9b\x08\x76\xe7"</div><div class='add'>+			  "\xdd\x2b\x01\x39\x04\x5a\x58\x7a"</div><div class='add'>+			  "\xf7\x11\x90\xec\xbd\x51\x5c\x32"</div><div class='add'>+			  "\x6b\xd7\x35\x39\x02\x6b\xf2\xa6"</div><div class='add'>+			  "\xd0\x0d\x07\xe1\x06\xc4\x5b\x7d"</div><div class='add'>+			  "\xe4\x6a\xd7\xee\x15\x1f\x83\xb4"</div><div class='add'>+			  "\xa3\xa7\x5e\xc3\x90\xb7\xef\xd3"</div><div class='add'>+			  "\xb7\x4f\xf8\x92\x4c\xb7\x3c\x29"</div><div class='add'>+			  "\xcd\x7e\x2b\x5d\x43\xea\x42\xe7"</div><div class='add'>+			  "\x74\x3f\x7d\x58\x88\x75\xde\x3e",</div><div class='add'>+		.rlen   = 512,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct cipher_testvec aes_lrw_dec_tv_template[] = {</div><div class='add'>+	/* from http://grouper.ieee.org/groups/1619/email/pdf00017.pdf */</div><div class='add'>+	/* same as enc vectors with input and result reversed */</div><div class='add'>+	{ /* LRW-32-AES 1 */</div><div class='add'>+		.key    = "\x45\x62\xac\x25\xf8\x28\x17\x6d"</div><div class='add'>+			  "\x4c\x26\x84\x14\xb5\x68\x01\x85"</div><div class='add'>+			  "\x25\x8e\x2a\x05\xe7\x3e\x9d\x03"</div><div class='add'>+			  "\xee\x5a\x83\x0c\xcc\x09\x4c\x87",</div><div class='add'>+		.klen   = 32,</div><div class='add'>+		.iv     = "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x01",</div><div class='add'>+		.input  = "\xf1\xb2\x73\xcd\x65\xa3\xdf\x5f"</div><div class='add'>+			  "\xe9\x5d\x48\x92\x54\x63\x4e\xb8",</div><div class='add'>+		.ilen   = 16,</div><div class='add'>+		.result = "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='add'>+			  "\x38\x39\x41\x42\x43\x44\x45\x46",</div><div class='add'>+		.rlen   = 16,</div><div class='add'>+	}, { /* LRW-32-AES 2 */</div><div class='add'>+		.key    = "\x59\x70\x47\x14\xf5\x57\x47\x8c"</div><div class='add'>+			  "\xd7\x79\xe8\x0f\x54\x88\x79\x44"</div><div class='add'>+			  "\x0d\x48\xf0\xb7\xb1\x5a\x53\xea"</div><div class='add'>+			  "\x1c\xaa\x6b\x29\xc2\xca\xfb\xaf",</div><div class='add'>+		.klen   = 32,</div><div class='add'>+		.iv     = "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x02",</div><div class='add'>+		.input  = "\x00\xc8\x2b\xae\x95\xbb\xcd\xe5"</div><div class='add'>+			  "\x27\x4f\x07\x69\xb2\x60\xe1\x36",</div><div class='add'>+		.ilen   = 16,</div><div class='add'>+		.result  = "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='add'>+			   "\x38\x39\x41\x42\x43\x44\x45\x46",</div><div class='add'>+		.rlen   = 16,</div><div class='add'>+	}, { /* LRW-32-AES 3 */</div><div class='add'>+		.key    = "\xd8\x2a\x91\x34\xb2\x6a\x56\x50"</div><div class='add'>+			  "\x30\xfe\x69\xe2\x37\x7f\x98\x47"</div><div class='add'>+			  "\xcd\xf9\x0b\x16\x0c\x64\x8f\xb6"</div><div class='add'>+			  "\xb0\x0d\x0d\x1b\xae\x85\x87\x1f",</div><div class='add'>+		.klen   = 32,</div><div class='add'>+		.iv     = "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x02\x00\x00\x00\x00",</div><div class='add'>+		.input  = "\x76\x32\x21\x83\xed\x8f\xf1\x82"</div><div class='add'>+			  "\xf9\x59\x62\x03\x69\x0e\x5e\x01",</div><div class='add'>+		.ilen   = 16,</div><div class='add'>+		.result = "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='add'>+			  "\x38\x39\x41\x42\x43\x44\x45\x46",</div><div class='add'>+		.rlen   = 16,</div><div class='add'>+	}, { /* LRW-32-AES 4 */</div><div class='add'>+		.key    = "\x0f\x6a\xef\xf8\xd3\xd2\xbb\x15"</div><div class='add'>+			  "\x25\x83\xf7\x3c\x1f\x01\x28\x74"</div><div class='add'>+			  "\xca\xc6\xbc\x35\x4d\x4a\x65\x54"</div><div class='add'>+			  "\x90\xae\x61\xcf\x7b\xae\xbd\xcc"</div><div class='add'>+			  "\xad\xe4\x94\xc5\x4a\x29\xae\x70",</div><div class='add'>+		.klen   = 40,</div><div class='add'>+		.iv     = "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x01",</div><div class='add'>+		.input  = "\x9c\x0f\x15\x2f\x55\xa2\xd8\xf0"</div><div class='add'>+			  "\xd6\x7b\x8f\x9e\x28\x22\xbc\x41",</div><div class='add'>+		.ilen   = 16,</div><div class='add'>+		.result = "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='add'>+			  "\x38\x39\x41\x42\x43\x44\x45\x46",</div><div class='add'>+		.rlen   = 16,</div><div class='add'>+	}, { /* LRW-32-AES 5 */</div><div class='add'>+		.key    = "\x8a\xd4\xee\x10\x2f\xbd\x81\xff"</div><div class='add'>+			  "\xf8\x86\xce\xac\x93\xc5\xad\xc6"</div><div class='add'>+			  "\xa0\x19\x07\xc0\x9d\xf7\xbb\xdd"</div><div class='add'>+			  "\x52\x13\xb2\xb7\xf0\xff\x11\xd8"</div><div class='add'>+			  "\xd6\x08\xd0\xcd\x2e\xb1\x17\x6f",</div><div class='add'>+		.klen   = 40,</div><div class='add'>+		.iv     = "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x02\x00\x00\x00\x00",</div><div class='add'>+		.input  = "\xd4\x27\x6a\x7f\x14\x91\x3d\x65"</div><div class='add'>+			  "\xc8\x60\x48\x02\x87\xe3\x34\x06",</div><div class='add'>+		.ilen   = 16,</div><div class='add'>+		.result = "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='add'>+			  "\x38\x39\x41\x42\x43\x44\x45\x46",</div><div class='add'>+		.rlen   = 16,</div><div class='add'>+	}, { /* LRW-32-AES 6 */</div><div class='add'>+		.key    = "\xf8\xd4\x76\xff\xd6\x46\xee\x6c"</div><div class='add'>+			  "\x23\x84\xcb\x1c\x77\xd6\x19\x5d"</div><div class='add'>+			  "\xfe\xf1\xa9\xf3\x7b\xbc\x8d\x21"</div><div class='add'>+			  "\xa7\x9c\x21\xf8\xcb\x90\x02\x89"</div><div class='add'>+			  "\xa8\x45\x34\x8e\xc8\xc5\xb5\xf1"</div><div class='add'>+			  "\x26\xf5\x0e\x76\xfe\xfd\x1b\x1e",</div><div class='add'>+		.klen   = 48,</div><div class='add'>+		.iv     = "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x01",</div><div class='add'>+		.input  = "\xbd\x06\xb8\xe1\xdb\x98\x89\x9e"</div><div class='add'>+			  "\xc4\x98\xe4\x91\xcf\x1c\x70\x2b",</div><div class='add'>+		.ilen   = 16,</div><div class='add'>+		.result = "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='add'>+			  "\x38\x39\x41\x42\x43\x44\x45\x46",</div><div class='add'>+		.rlen   = 16,</div><div class='add'>+	}, { /* LRW-32-AES 7 */</div><div class='add'>+		.key    = "\xfb\x76\x15\xb2\x3d\x80\x89\x1d"</div><div class='add'>+			  "\xd4\x70\x98\x0b\xc7\x95\x84\xc8"</div><div class='add'>+			  "\xb2\xfb\x64\xce\x60\x97\x87\x8d"</div><div class='add'>+			  "\x17\xfc\xe4\x5a\x49\xe8\x30\xb7"</div><div class='add'>+			  "\x6e\x78\x17\xe7\x2d\x5e\x12\xd4"</div><div class='add'>+			  "\x60\x64\x04\x7a\xf1\x2f\x9e\x0c",</div><div class='add'>+		.klen   = 48,</div><div class='add'>+		.iv     = "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x02\x00\x00\x00\x00",</div><div class='add'>+		.input  = "\x5b\x90\x8e\xc1\xab\xdd\x67\x5f"</div><div class='add'>+			  "\x3d\x69\x8a\x95\x53\xc8\x9c\xe5",</div><div class='add'>+		.ilen   = 16,</div><div class='add'>+		.result = "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='add'>+			  "\x38\x39\x41\x42\x43\x44\x45\x46",</div><div class='add'>+		.rlen   = 16,</div><div class='add'>+	}, {</div><div class='add'>+/* http://www.mail-archive.com/stds-p1619@listserv.ieee.org/msg00173.html */</div><div class='add'>+		.key    = "\xf8\xd4\x76\xff\xd6\x46\xee\x6c"</div><div class='add'>+			  "\x23\x84\xcb\x1c\x77\xd6\x19\x5d"</div><div class='add'>+			  "\xfe\xf1\xa9\xf3\x7b\xbc\x8d\x21"</div><div class='add'>+			  "\xa7\x9c\x21\xf8\xcb\x90\x02\x89"</div><div class='add'>+			  "\xa8\x45\x34\x8e\xc8\xc5\xb5\xf1"</div><div class='add'>+			  "\x26\xf5\x0e\x76\xfe\xfd\x1b\x1e",</div><div class='add'>+		.klen   = 48,</div><div class='add'>+		.iv     = "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x01",</div><div class='add'>+		.input	= "\x1a\x1d\xa9\x30\xad\xf9\x2f\x9b"</div><div class='add'>+			  "\xb6\x1d\xae\xef\xf0\x2f\xf8\x5a"</div><div class='add'>+			  "\x39\x3c\xbf\x2a\xb2\x45\xb2\x23"</div><div class='add'>+			  "\x1b\x63\x3c\xcf\xaa\xbe\xcf\x4e"</div><div class='add'>+			  "\xfa\xe8\x29\xc2\x20\x68\x2b\x3c"</div><div class='add'>+			  "\x2e\x8b\xf7\x6e\x25\xbd\xe3\x3d"</div><div class='add'>+			  "\x66\x27\xd6\xaf\xd6\x64\x3e\xe3"</div><div class='add'>+			  "\xe8\x58\x46\x97\x39\x51\x07\xde"</div><div class='add'>+			  "\xcb\x37\xbc\xa9\xc0\x5f\x75\xc3"</div><div class='add'>+			  "\x0e\x84\x23\x1d\x16\xd4\x1c\x59"</div><div class='add'>+			  "\x9c\x1a\x02\x55\xab\x3a\x97\x1d"</div><div class='add'>+			  "\xdf\xdd\xc7\x06\x51\xd7\x70\xae"</div><div class='add'>+			  "\x23\xc6\x8c\xf5\x1e\xa0\xe5\x82"</div><div class='add'>+			  "\xb8\xb2\xbf\x04\xa0\x32\x8e\x68"</div><div class='add'>+			  "\xeb\xaf\x6e\x2d\x94\x22\x2f\xce"</div><div class='add'>+			  "\x4c\xb5\x59\xe2\xa2\x2f\xa0\x98"</div><div class='add'>+			  "\x1a\x97\xc6\xd4\xb5\x00\x59\xf2"</div><div class='add'>+			  "\x84\x14\x72\xb1\x9a\x6e\xa3\x7f"</div><div class='add'>+			  "\xea\x20\xe7\xcb\x65\x77\x3a\xdf"</div><div class='add'>+			  "\xc8\x97\x67\x15\xc2\x2a\x27\xcc"</div><div class='add'>+			  "\x18\x55\xa1\x24\x0b\x24\x24\xaf"</div><div class='add'>+			  "\x5b\xec\x68\xb8\xc8\xf5\xba\x63"</div><div class='add'>+			  "\xff\xed\x89\xce\xd5\x3d\x88\xf3"</div><div class='add'>+			  "\x25\xef\x05\x7c\x3a\xef\xeb\xd8"</div><div class='add'>+			  "\x7a\x32\x0d\xd1\x1e\x58\x59\x99"</div><div class='add'>+			  "\x90\x25\xb5\x26\xb0\xe3\x2b\x6c"</div><div class='add'>+			  "\x4c\xa9\x8b\x84\x4f\x5e\x01\x50"</div><div class='add'>+			  "\x41\x30\x58\xc5\x62\x74\x52\x1d"</div><div class='add'>+			  "\x45\x24\x6a\x42\x64\x4f\x97\x1c"</div><div class='add'>+			  "\xa8\x66\xb5\x6d\x79\xd4\x0d\x48"</div><div class='add'>+			  "\xc5\x5f\xf3\x90\x32\xdd\xdd\xe1"</div><div class='add'>+			  "\xe4\xa9\x9f\xfc\xc3\x52\x5a\x46"</div><div class='add'>+			  "\xe4\x81\x84\x95\x36\x59\x7a\x6b"</div><div class='add'>+			  "\xaa\xb3\x60\xad\xce\x9f\x9f\x28"</div><div class='add'>+			  "\xe0\x01\x75\x22\xc4\x4e\xa9\x62"</div><div class='add'>+			  "\x5c\x62\x0d\x00\xcb\x13\xe8\x43"</div><div class='add'>+			  "\x72\xd4\x2d\x53\x46\xb5\xd1\x16"</div><div class='add'>+			  "\x22\x18\xdf\x34\x33\xf5\xd6\x1c"</div><div class='add'>+			  "\xb8\x79\x78\x97\x94\xff\x72\x13"</div><div class='add'>+			  "\x4c\x27\xfc\xcb\xbf\x01\x53\xa6"</div><div class='add'>+			  "\xb4\x50\x6e\xde\xdf\xb5\x43\xa4"</div><div class='add'>+			  "\x59\xdf\x52\xf9\x7c\xe0\x11\x6f"</div><div class='add'>+			  "\x2d\x14\x8e\x24\x61\x2c\xe1\x17"</div><div class='add'>+			  "\xcc\xce\x51\x0c\x19\x8a\x82\x30"</div><div class='add'>+			  "\x94\xd5\x3d\x6a\x53\x06\x5e\xbd"</div><div class='add'>+			  "\xb7\xeb\xfa\xfd\x27\x51\xde\x85"</div><div class='add'>+			  "\x1e\x86\x53\x11\x53\x94\x00\xee"</div><div class='add'>+			  "\x2b\x8c\x08\x2a\xbf\xdd\xae\x11"</div><div class='add'>+			  "\xcb\x1e\xa2\x07\x9a\x80\xcf\x62"</div><div class='add'>+			  "\x9b\x09\xdc\x95\x3c\x96\x8e\xb1"</div><div class='add'>+			  "\x09\xbd\xe4\xeb\xdb\xca\x70\x7a"</div><div class='add'>+			  "\x9e\xfa\x31\x18\x45\x3c\x21\x33"</div><div class='add'>+			  "\xb0\xb3\x2b\xea\xf3\x71\x2d\xe1"</div><div class='add'>+			  "\x03\xad\x1b\x48\xd4\x67\x27\xf0"</div><div class='add'>+			  "\x62\xe4\x3d\xfb\x9b\x08\x76\xe7"</div><div class='add'>+			  "\xdd\x2b\x01\x39\x04\x5a\x58\x7a"</div><div class='add'>+			  "\xf7\x11\x90\xec\xbd\x51\x5c\x32"</div><div class='add'>+			  "\x6b\xd7\x35\x39\x02\x6b\xf2\xa6"</div><div class='add'>+			  "\xd0\x0d\x07\xe1\x06\xc4\x5b\x7d"</div><div class='add'>+			  "\xe4\x6a\xd7\xee\x15\x1f\x83\xb4"</div><div class='add'>+			  "\xa3\xa7\x5e\xc3\x90\xb7\xef\xd3"</div><div class='add'>+			  "\xb7\x4f\xf8\x92\x4c\xb7\x3c\x29"</div><div class='add'>+			  "\xcd\x7e\x2b\x5d\x43\xea\x42\xe7"</div><div class='add'>+			  "\x74\x3f\x7d\x58\x88\x75\xde\x3e",</div><div class='add'>+		.ilen   = 512,</div><div class='add'>+		.result	= "\x05\x11\xb7\x18\xab\xc6\x2d\xac"</div><div class='add'>+			  "\x70\x5d\xf6\x22\x94\xcd\xe5\x6c"</div><div class='add'>+			  "\x17\x6b\xf6\x1c\xf0\xf3\x6e\xf8"</div><div class='add'>+			  "\x50\x38\x1f\x71\x49\xb6\x57\xd6"</div><div class='add'>+			  "\x8f\xcb\x8d\x6b\xe3\xa6\x29\x90"</div><div class='add'>+			  "\xfe\x2a\x62\x82\xae\x6d\x8b\xf6"</div><div class='add'>+			  "\xad\x1e\x9e\x20\x5f\x38\xbe\x04"</div><div class='add'>+			  "\xda\x10\x8e\xed\xa2\xa4\x87\xab"</div><div class='add'>+			  "\xda\x6b\xb4\x0c\x75\xba\xd3\x7c"</div><div class='add'>+			  "\xc9\xac\x42\x31\x95\x7c\xc9\x04"</div><div class='add'>+			  "\xeb\xd5\x6e\x32\x69\x8a\xdb\xa6"</div><div class='add'>+			  "\x15\xd7\x3f\x4f\x2f\x66\x69\x03"</div><div class='add'>+			  "\x9c\x1f\x54\x0f\xde\x1f\xf3\x65"</div><div class='add'>+			  "\x4c\x96\x12\xed\x7c\x92\x03\x01"</div><div class='add'>+			  "\x6f\xbc\x35\x93\xac\xf1\x27\xf1"</div><div class='add'>+			  "\xb4\x96\x82\x5a\x5f\xb0\xa0\x50"</div><div class='add'>+			  "\x89\xa4\x8e\x66\x44\x85\xcc\xfd"</div><div class='add'>+			  "\x33\x14\x70\xe3\x96\xb2\xc3\xd3"</div><div class='add'>+			  "\xbb\x54\x5a\x1a\xf9\x74\xa2\xc5"</div><div class='add'>+			  "\x2d\x64\x75\xdd\xb4\x54\xe6\x74"</div><div class='add'>+			  "\x8c\xd3\x9d\x9e\x86\xab\x51\x53"</div><div class='add'>+			  "\xb7\x93\x3e\x6f\xd0\x4e\x2c\x40"</div><div class='add'>+			  "\xf6\xa8\x2e\x3e\x9d\xf4\x66\xa5"</div><div class='add'>+			  "\x76\x12\x73\x44\x1a\x56\xd7\x72"</div><div class='add'>+			  "\x88\xcd\x21\x8c\x4c\x0f\xfe\xda"</div><div class='add'>+			  "\x95\xe0\x3a\xa6\xa5\x84\x46\xcd"</div><div class='add'>+			  "\xd5\x3e\x9d\x3a\xe2\x67\xe6\x60"</div><div class='add'>+			  "\x1a\xe2\x70\x85\x58\xc2\x1b\x09"</div><div class='add'>+			  "\xe1\xd7\x2c\xca\xad\xa8\x8f\xf9"</div><div class='add'>+			  "\xac\xb3\x0e\xdb\xca\x2e\xe2\xb8"</div><div class='add'>+			  "\x51\x71\xd9\x3c\x6c\xf1\x56\xf8"</div><div class='add'>+			  "\xea\x9c\xf1\xfb\x0c\xe6\xb7\x10"</div><div class='add'>+			  "\x1c\xf8\xa9\x7c\xe8\x53\x35\xc1"</div><div class='add'>+			  "\x90\x3e\x76\x4a\x74\xa4\x21\x2c"</div><div class='add'>+			  "\xf6\x2c\x4e\x0f\x94\x3a\x88\x2e"</div><div class='add'>+			  "\x41\x09\x6a\x33\x7d\xf6\xdd\x3f"</div><div class='add'>+			  "\x8d\x23\x31\x74\x84\xeb\x88\x6e"</div><div class='add'>+			  "\xcc\xb9\xbc\x22\x83\x19\x07\x22"</div><div class='add'>+			  "\xa5\x2d\xdf\xa5\xf3\x80\x85\x78"</div><div class='add'>+			  "\x84\x39\x6a\x6d\x6a\x99\x4f\xa5"</div><div class='add'>+			  "\x15\xfe\x46\xb0\xe4\x6c\xa5\x41"</div><div class='add'>+			  "\x3c\xce\x8f\x42\x60\x71\xa7\x75"</div><div class='add'>+			  "\x08\x40\x65\x8a\x82\xbf\xf5\x43"</div><div class='add'>+			  "\x71\x96\xa9\x4d\x44\x8a\x20\xbe"</div><div class='add'>+			  "\xfa\x4d\xbb\xc0\x7d\x31\x96\x65"</div><div class='add'>+			  "\xe7\x75\xe5\x3e\xfd\x92\x3b\xc9"</div><div class='add'>+			  "\x55\xbb\x16\x7e\xf7\xc2\x8c\xa4"</div><div class='add'>+			  "\x40\x1d\xe5\xef\x0e\xdf\xe4\x9a"</div><div class='add'>+			  "\x62\x73\x65\xfd\x46\x63\x25\x3d"</div><div class='add'>+			  "\x2b\xaf\xe5\x64\xfe\xa5\x5c\xcf"</div><div class='add'>+			  "\x24\xf3\xb4\xac\x64\xba\xdf\x4b"</div><div class='add'>+			  "\xc6\x96\x7d\x81\x2d\x8d\x97\xf7"</div><div class='add'>+			  "\xc5\x68\x77\x84\x32\x2b\xcc\x85"</div><div class='add'>+			  "\x74\x96\xf0\x12\x77\x61\xb9\xeb"</div><div class='add'>+			  "\x71\xaa\x82\xcb\x1c\xdb\x89\xc8"</div><div class='add'>+			  "\xc6\xb5\xe3\x5c\x7d\x39\x07\x24"</div><div class='add'>+			  "\xda\x39\x87\x45\xc0\x2b\xbb\x01"</div><div class='add'>+			  "\xac\xbc\x2a\x5c\x7f\xfc\xe8\xce"</div><div class='add'>+			  "\x6d\x9c\x6f\xed\xd3\xc1\xa1\xd6"</div><div class='add'>+			  "\xc5\x55\xa9\x66\x2f\xe1\xc8\x32"</div><div class='add'>+			  "\xa6\x5d\xa4\x3a\x98\x73\xe8\x45"</div><div class='add'>+			  "\xa4\xc7\xa8\xb4\xf6\x13\x03\xf6"</div><div class='add'>+			  "\xe9\x2e\xc4\x29\x0f\x84\xdb\xc4"</div><div class='add'>+			  "\x21\xc4\xc2\x75\x67\x89\x37\x0a",</div><div class='add'>+		.rlen   = 512,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct cipher_testvec aes_xts_enc_tv_template[] = {</div><div class='add'>+	/* http://grouper.ieee.org/groups/1619/email/pdf00086.pdf */</div><div class='add'>+	{ /* XTS-AES 1 */</div><div class='add'>+		.key    = "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.klen   = 32,</div><div class='add'>+		.iv     = "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.input  = "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.ilen   = 32,</div><div class='add'>+		.result = "\x91\x7c\xf6\x9e\xbd\x68\xb2\xec"</div><div class='add'>+			  "\x9b\x9f\xe9\xa3\xea\xdd\xa6\x92"</div><div class='add'>+			  "\xcd\x43\xd2\xf5\x95\x98\xed\x85"</div><div class='add'>+			  "\x8c\x02\xc2\x65\x2f\xbf\x92\x2e",</div><div class='add'>+		.rlen   = 32,</div><div class='add'>+	}, { /* XTS-AES 2 */</div><div class='add'>+		.key    = "\x11\x11\x11\x11\x11\x11\x11\x11"</div><div class='add'>+			  "\x11\x11\x11\x11\x11\x11\x11\x11"</div><div class='add'>+			  "\x22\x22\x22\x22\x22\x22\x22\x22"</div><div class='add'>+			  "\x22\x22\x22\x22\x22\x22\x22\x22",</div><div class='add'>+		.klen   = 32,</div><div class='add'>+		.iv     = "\x33\x33\x33\x33\x33\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.input  = "\x44\x44\x44\x44\x44\x44\x44\x44"</div><div class='add'>+			  "\x44\x44\x44\x44\x44\x44\x44\x44"</div><div class='add'>+			  "\x44\x44\x44\x44\x44\x44\x44\x44"</div><div class='add'>+			  "\x44\x44\x44\x44\x44\x44\x44\x44",</div><div class='add'>+		.ilen   = 32,</div><div class='add'>+		.result = "\xc4\x54\x18\x5e\x6a\x16\x93\x6e"</div><div class='add'>+			  "\x39\x33\x40\x38\xac\xef\x83\x8b"</div><div class='add'>+			  "\xfb\x18\x6f\xff\x74\x80\xad\xc4"</div><div class='add'>+			  "\x28\x93\x82\xec\xd6\xd3\x94\xf0",</div><div class='add'>+		.rlen   = 32,</div><div class='add'>+	}, { /* XTS-AES 3 */</div><div class='add'>+		.key    = "\xff\xfe\xfd\xfc\xfb\xfa\xf9\xf8"</div><div class='add'>+			  "\xf7\xf6\xf5\xf4\xf3\xf2\xf1\xf0"</div><div class='add'>+			  "\x22\x22\x22\x22\x22\x22\x22\x22"</div><div class='add'>+			  "\x22\x22\x22\x22\x22\x22\x22\x22",</div><div class='add'>+		.klen   = 32,</div><div class='add'>+		.iv     = "\x33\x33\x33\x33\x33\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.input  = "\x44\x44\x44\x44\x44\x44\x44\x44"</div><div class='add'>+			  "\x44\x44\x44\x44\x44\x44\x44\x44"</div><div class='add'>+			  "\x44\x44\x44\x44\x44\x44\x44\x44"</div><div class='add'>+			  "\x44\x44\x44\x44\x44\x44\x44\x44",</div><div class='add'>+		.ilen   = 32,</div><div class='add'>+		.result = "\xaf\x85\x33\x6b\x59\x7a\xfc\x1a"</div><div class='add'>+			  "\x90\x0b\x2e\xb2\x1e\xc9\x49\xd2"</div><div class='add'>+			  "\x92\xdf\x4c\x04\x7e\x0b\x21\x53"</div><div class='add'>+			  "\x21\x86\xa5\x97\x1a\x22\x7a\x89",</div><div class='add'>+		.rlen   = 32,</div><div class='add'>+	}, { /* XTS-AES 4 */</div><div class='add'>+		.key    = "\x27\x18\x28\x18\x28\x45\x90\x45"</div><div class='add'>+			  "\x23\x53\x60\x28\x74\x71\x35\x26"</div><div class='add'>+			  "\x31\x41\x59\x26\x53\x58\x97\x93"</div><div class='add'>+			  "\x23\x84\x62\x64\x33\x83\x27\x95",</div><div class='add'>+		.klen   = 32,</div><div class='add'>+		.iv     = "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.input  = "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='add'>+			  "\x10\x11\x12\x13\x14\x15\x16\x17"</div><div class='add'>+			  "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f"</div><div class='add'>+			  "\x20\x21\x22\x23\x24\x25\x26\x27"</div><div class='add'>+			  "\x28\x29\x2a\x2b\x2c\x2d\x2e\x2f"</div><div class='add'>+			  "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='add'>+			  "\x38\x39\x3a\x3b\x3c\x3d\x3e\x3f"</div><div class='add'>+			  "\x40\x41\x42\x43\x44\x45\x46\x47"</div><div class='add'>+			  "\x48\x49\x4a\x4b\x4c\x4d\x4e\x4f"</div><div class='add'>+			  "\x50\x51\x52\x53\x54\x55\x56\x57"</div><div class='add'>+			  "\x58\x59\x5a\x5b\x5c\x5d\x5e\x5f"</div><div class='add'>+			  "\x60\x61\x62\x63\x64\x65\x66\x67"</div><div class='add'>+			  "\x68\x69\x6a\x6b\x6c\x6d\x6e\x6f"</div><div class='add'>+			  "\x70\x71\x72\x73\x74\x75\x76\x77"</div><div class='add'>+			  "\x78\x79\x7a\x7b\x7c\x7d\x7e\x7f"</div><div class='add'>+			  "\x80\x81\x82\x83\x84\x85\x86\x87"</div><div class='add'>+			  "\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f"</div><div class='add'>+			  "\x90\x91\x92\x93\x94\x95\x96\x97"</div><div class='add'>+			  "\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f"</div><div class='add'>+			  "\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7"</div><div class='add'>+			  "\xa8\xa9\xaa\xab\xac\xad\xae\xaf"</div><div class='add'>+			  "\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7"</div><div class='add'>+			  "\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf"</div><div class='add'>+			  "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7"</div><div class='add'>+			  "\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf"</div><div class='add'>+			  "\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7"</div><div class='add'>+			  "\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf"</div><div class='add'>+			  "\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7"</div><div class='add'>+			  "\xe8\xe9\xea\xeb\xec\xed\xee\xef"</div><div class='add'>+			  "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7"</div><div class='add'>+			  "\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff"</div><div class='add'>+			  "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='add'>+			  "\x10\x11\x12\x13\x14\x15\x16\x17"</div><div class='add'>+			  "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f"</div><div class='add'>+			  "\x20\x21\x22\x23\x24\x25\x26\x27"</div><div class='add'>+			  "\x28\x29\x2a\x2b\x2c\x2d\x2e\x2f"</div><div class='add'>+			  "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='add'>+			  "\x38\x39\x3a\x3b\x3c\x3d\x3e\x3f"</div><div class='add'>+			  "\x40\x41\x42\x43\x44\x45\x46\x47"</div><div class='add'>+			  "\x48\x49\x4a\x4b\x4c\x4d\x4e\x4f"</div><div class='add'>+			  "\x50\x51\x52\x53\x54\x55\x56\x57"</div><div class='add'>+			  "\x58\x59\x5a\x5b\x5c\x5d\x5e\x5f"</div><div class='add'>+			  "\x60\x61\x62\x63\x64\x65\x66\x67"</div><div class='add'>+			  "\x68\x69\x6a\x6b\x6c\x6d\x6e\x6f"</div><div class='add'>+			  "\x70\x71\x72\x73\x74\x75\x76\x77"</div><div class='add'>+			  "\x78\x79\x7a\x7b\x7c\x7d\x7e\x7f"</div><div class='add'>+			  "\x80\x81\x82\x83\x84\x85\x86\x87"</div><div class='add'>+			  "\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f"</div><div class='add'>+			  "\x90\x91\x92\x93\x94\x95\x96\x97"</div><div class='add'>+			  "\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f"</div><div class='add'>+			  "\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7"</div><div class='add'>+			  "\xa8\xa9\xaa\xab\xac\xad\xae\xaf"</div><div class='add'>+			  "\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7"</div><div class='add'>+			  "\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf"</div><div class='add'>+			  "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7"</div><div class='add'>+			  "\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf"</div><div class='add'>+			  "\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7"</div><div class='add'>+			  "\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf"</div><div class='add'>+			  "\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7"</div><div class='add'>+			  "\xe8\xe9\xea\xeb\xec\xed\xee\xef"</div><div class='add'>+			  "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7"</div><div class='add'>+			  "\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff",</div><div class='add'>+		.ilen   = 512,</div><div class='add'>+		.result = "\x27\xa7\x47\x9b\xef\xa1\xd4\x76"</div><div class='add'>+			  "\x48\x9f\x30\x8c\xd4\xcf\xa6\xe2"</div><div class='add'>+			  "\xa9\x6e\x4b\xbe\x32\x08\xff\x25"</div><div class='add'>+			  "\x28\x7d\xd3\x81\x96\x16\xe8\x9c"</div><div class='add'>+			  "\xc7\x8c\xf7\xf5\xe5\x43\x44\x5f"</div><div class='add'>+			  "\x83\x33\xd8\xfa\x7f\x56\x00\x00"</div><div class='add'>+			  "\x05\x27\x9f\xa5\xd8\xb5\xe4\xad"</div><div class='add'>+			  "\x40\xe7\x36\xdd\xb4\xd3\x54\x12"</div><div class='add'>+			  "\x32\x80\x63\xfd\x2a\xab\x53\xe5"</div><div class='add'>+			  "\xea\x1e\x0a\x9f\x33\x25\x00\xa5"</div><div class='add'>+			  "\xdf\x94\x87\xd0\x7a\x5c\x92\xcc"</div><div class='add'>+			  "\x51\x2c\x88\x66\xc7\xe8\x60\xce"</div><div class='add'>+			  "\x93\xfd\xf1\x66\xa2\x49\x12\xb4"</div><div class='add'>+			  "\x22\x97\x61\x46\xae\x20\xce\x84"</div><div class='add'>+			  "\x6b\xb7\xdc\x9b\xa9\x4a\x76\x7a"</div><div class='add'>+			  "\xae\xf2\x0c\x0d\x61\xad\x02\x65"</div><div class='add'>+			  "\x5e\xa9\x2d\xc4\xc4\xe4\x1a\x89"</div><div class='add'>+			  "\x52\xc6\x51\xd3\x31\x74\xbe\x51"</div><div class='add'>+			  "\xa1\x0c\x42\x11\x10\xe6\xd8\x15"</div><div class='add'>+			  "\x88\xed\xe8\x21\x03\xa2\x52\xd8"</div><div class='add'>+			  "\xa7\x50\xe8\x76\x8d\xef\xff\xed"</div><div class='add'>+			  "\x91\x22\x81\x0a\xae\xb9\x9f\x91"</div><div class='add'>+			  "\x72\xaf\x82\xb6\x04\xdc\x4b\x8e"</div><div class='add'>+			  "\x51\xbc\xb0\x82\x35\xa6\xf4\x34"</div><div class='add'>+			  "\x13\x32\xe4\xca\x60\x48\x2a\x4b"</div><div class='add'>+			  "\xa1\xa0\x3b\x3e\x65\x00\x8f\xc5"</div><div class='add'>+			  "\xda\x76\xb7\x0b\xf1\x69\x0d\xb4"</div><div class='add'>+			  "\xea\xe2\x9c\x5f\x1b\xad\xd0\x3c"</div><div class='add'>+			  "\x5c\xcf\x2a\x55\xd7\x05\xdd\xcd"</div><div class='add'>+			  "\x86\xd4\x49\x51\x1c\xeb\x7e\xc3"</div><div class='add'>+			  "\x0b\xf1\x2b\x1f\xa3\x5b\x91\x3f"</div><div class='add'>+			  "\x9f\x74\x7a\x8a\xfd\x1b\x13\x0e"</div><div class='add'>+			  "\x94\xbf\xf9\x4e\xff\xd0\x1a\x91"</div><div class='add'>+			  "\x73\x5c\xa1\x72\x6a\xcd\x0b\x19"</div><div class='add'>+			  "\x7c\x4e\x5b\x03\x39\x36\x97\xe1"</div><div class='add'>+			  "\x26\x82\x6f\xb6\xbb\xde\x8e\xcc"</div><div class='add'>+			  "\x1e\x08\x29\x85\x16\xe2\xc9\xed"</div><div class='add'>+			  "\x03\xff\x3c\x1b\x78\x60\xf6\xde"</div><div class='add'>+			  "\x76\xd4\xce\xcd\x94\xc8\x11\x98"</div><div class='add'>+			  "\x55\xef\x52\x97\xca\x67\xe9\xf3"</div><div class='add'>+			  "\xe7\xff\x72\xb1\xe9\x97\x85\xca"</div><div class='add'>+			  "\x0a\x7e\x77\x20\xc5\xb3\x6d\xc6"</div><div class='add'>+			  "\xd7\x2c\xac\x95\x74\xc8\xcb\xbc"</div><div class='add'>+			  "\x2f\x80\x1e\x23\xe5\x6f\xd3\x44"</div><div class='add'>+			  "\xb0\x7f\x22\x15\x4b\xeb\xa0\xf0"</div><div class='add'>+			  "\x8c\xe8\x89\x1e\x64\x3e\xd9\x95"</div><div class='add'>+			  "\xc9\x4d\x9a\x69\xc9\xf1\xb5\xf4"</div><div class='add'>+			  "\x99\x02\x7a\x78\x57\x2a\xee\xbd"</div><div class='add'>+			  "\x74\xd2\x0c\xc3\x98\x81\xc2\x13"</div><div class='add'>+			  "\xee\x77\x0b\x10\x10\xe4\xbe\xa7"</div><div class='add'>+			  "\x18\x84\x69\x77\xae\x11\x9f\x7a"</div><div class='add'>+			  "\x02\x3a\xb5\x8c\xca\x0a\xd7\x52"</div><div class='add'>+			  "\xaf\xe6\x56\xbb\x3c\x17\x25\x6a"</div><div class='add'>+			  "\x9f\x6e\x9b\xf1\x9f\xdd\x5a\x38"</div><div class='add'>+			  "\xfc\x82\xbb\xe8\x72\xc5\x53\x9e"</div><div class='add'>+			  "\xdb\x60\x9e\xf4\xf7\x9c\x20\x3e"</div><div class='add'>+			  "\xbb\x14\x0f\x2e\x58\x3c\xb2\xad"</div><div class='add'>+			  "\x15\xb4\xaa\x5b\x65\x50\x16\xa8"</div><div class='add'>+			  "\x44\x92\x77\xdb\xd4\x77\xef\x2c"</div><div class='add'>+			  "\x8d\x6c\x01\x7d\xb7\x38\xb1\x8d"</div><div class='add'>+			  "\xeb\x4a\x42\x7d\x19\x23\xce\x3f"</div><div class='add'>+			  "\xf2\x62\x73\x57\x79\xa4\x18\xf2"</div><div class='add'>+			  "\x0a\x28\x2d\xf9\x20\x14\x7b\xea"</div><div class='add'>+			  "\xbe\x42\x1e\xe5\x31\x9d\x05\x68",</div><div class='add'>+		.rlen   = 512,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct cipher_testvec aes_xts_dec_tv_template[] = {</div><div class='add'>+	/* http://grouper.ieee.org/groups/1619/email/pdf00086.pdf */</div><div class='add'>+	{ /* XTS-AES 1 */</div><div class='add'>+		.key    = "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.klen   = 32,</div><div class='add'>+		.iv     = "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.input = "\x91\x7c\xf6\x9e\xbd\x68\xb2\xec"</div><div class='add'>+			 "\x9b\x9f\xe9\xa3\xea\xdd\xa6\x92"</div><div class='add'>+			 "\xcd\x43\xd2\xf5\x95\x98\xed\x85"</div><div class='add'>+			 "\x8c\x02\xc2\x65\x2f\xbf\x92\x2e",</div><div class='add'>+		.ilen   = 32,</div><div class='add'>+		.result  = "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			   "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			   "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			   "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.rlen   = 32,</div><div class='add'>+	}, { /* XTS-AES 2 */</div><div class='add'>+		.key    = "\x11\x11\x11\x11\x11\x11\x11\x11"</div><div class='add'>+			  "\x11\x11\x11\x11\x11\x11\x11\x11"</div><div class='add'>+			  "\x22\x22\x22\x22\x22\x22\x22\x22"</div><div class='add'>+			  "\x22\x22\x22\x22\x22\x22\x22\x22",</div><div class='add'>+		.klen   = 32,</div><div class='add'>+		.iv     = "\x33\x33\x33\x33\x33\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.input  = "\xc4\x54\x18\x5e\x6a\x16\x93\x6e"</div><div class='add'>+			  "\x39\x33\x40\x38\xac\xef\x83\x8b"</div><div class='add'>+			  "\xfb\x18\x6f\xff\x74\x80\xad\xc4"</div><div class='add'>+			  "\x28\x93\x82\xec\xd6\xd3\x94\xf0",</div><div class='add'>+		.ilen   = 32,</div><div class='add'>+		.result = "\x44\x44\x44\x44\x44\x44\x44\x44"</div><div class='add'>+			  "\x44\x44\x44\x44\x44\x44\x44\x44"</div><div class='add'>+			  "\x44\x44\x44\x44\x44\x44\x44\x44"</div><div class='add'>+			  "\x44\x44\x44\x44\x44\x44\x44\x44",</div><div class='add'>+		.rlen   = 32,</div><div class='add'>+	}, { /* XTS-AES 3 */</div><div class='add'>+		.key    = "\xff\xfe\xfd\xfc\xfb\xfa\xf9\xf8"</div><div class='add'>+			  "\xf7\xf6\xf5\xf4\xf3\xf2\xf1\xf0"</div><div class='add'>+			  "\x22\x22\x22\x22\x22\x22\x22\x22"</div><div class='add'>+			  "\x22\x22\x22\x22\x22\x22\x22\x22",</div><div class='add'>+		.klen   = 32,</div><div class='add'>+		.iv     = "\x33\x33\x33\x33\x33\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.input = "\xaf\x85\x33\x6b\x59\x7a\xfc\x1a"</div><div class='add'>+			  "\x90\x0b\x2e\xb2\x1e\xc9\x49\xd2"</div><div class='add'>+			  "\x92\xdf\x4c\x04\x7e\x0b\x21\x53"</div><div class='add'>+			  "\x21\x86\xa5\x97\x1a\x22\x7a\x89",</div><div class='add'>+		.ilen   = 32,</div><div class='add'>+		.result  = "\x44\x44\x44\x44\x44\x44\x44\x44"</div><div class='add'>+			  "\x44\x44\x44\x44\x44\x44\x44\x44"</div><div class='add'>+			  "\x44\x44\x44\x44\x44\x44\x44\x44"</div><div class='add'>+			  "\x44\x44\x44\x44\x44\x44\x44\x44",</div><div class='add'>+		.rlen   = 32,</div><div class='add'>+	}, { /* XTS-AES 4 */</div><div class='add'>+		.key    = "\x27\x18\x28\x18\x28\x45\x90\x45"</div><div class='add'>+			  "\x23\x53\x60\x28\x74\x71\x35\x26"</div><div class='add'>+			  "\x31\x41\x59\x26\x53\x58\x97\x93"</div><div class='add'>+			  "\x23\x84\x62\x64\x33\x83\x27\x95",</div><div class='add'>+		.klen   = 32,</div><div class='add'>+		.iv     = "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.input  = "\x27\xa7\x47\x9b\xef\xa1\xd4\x76"</div><div class='add'>+			  "\x48\x9f\x30\x8c\xd4\xcf\xa6\xe2"</div><div class='add'>+			  "\xa9\x6e\x4b\xbe\x32\x08\xff\x25"</div><div class='add'>+			  "\x28\x7d\xd3\x81\x96\x16\xe8\x9c"</div><div class='add'>+			  "\xc7\x8c\xf7\xf5\xe5\x43\x44\x5f"</div><div class='add'>+			  "\x83\x33\xd8\xfa\x7f\x56\x00\x00"</div><div class='add'>+			  "\x05\x27\x9f\xa5\xd8\xb5\xe4\xad"</div><div class='add'>+			  "\x40\xe7\x36\xdd\xb4\xd3\x54\x12"</div><div class='add'>+			  "\x32\x80\x63\xfd\x2a\xab\x53\xe5"</div><div class='add'>+			  "\xea\x1e\x0a\x9f\x33\x25\x00\xa5"</div><div class='add'>+			  "\xdf\x94\x87\xd0\x7a\x5c\x92\xcc"</div><div class='add'>+			  "\x51\x2c\x88\x66\xc7\xe8\x60\xce"</div><div class='add'>+			  "\x93\xfd\xf1\x66\xa2\x49\x12\xb4"</div><div class='add'>+			  "\x22\x97\x61\x46\xae\x20\xce\x84"</div><div class='add'>+			  "\x6b\xb7\xdc\x9b\xa9\x4a\x76\x7a"</div><div class='add'>+			  "\xae\xf2\x0c\x0d\x61\xad\x02\x65"</div><div class='add'>+			  "\x5e\xa9\x2d\xc4\xc4\xe4\x1a\x89"</div><div class='add'>+			  "\x52\xc6\x51\xd3\x31\x74\xbe\x51"</div><div class='add'>+			  "\xa1\x0c\x42\x11\x10\xe6\xd8\x15"</div><div class='add'>+			  "\x88\xed\xe8\x21\x03\xa2\x52\xd8"</div><div class='add'>+			  "\xa7\x50\xe8\x76\x8d\xef\xff\xed"</div><div class='add'>+			  "\x91\x22\x81\x0a\xae\xb9\x9f\x91"</div><div class='add'>+			  "\x72\xaf\x82\xb6\x04\xdc\x4b\x8e"</div><div class='add'>+			  "\x51\xbc\xb0\x82\x35\xa6\xf4\x34"</div><div class='add'>+			  "\x13\x32\xe4\xca\x60\x48\x2a\x4b"</div><div class='add'>+			  "\xa1\xa0\x3b\x3e\x65\x00\x8f\xc5"</div><div class='add'>+			  "\xda\x76\xb7\x0b\xf1\x69\x0d\xb4"</div><div class='add'>+			  "\xea\xe2\x9c\x5f\x1b\xad\xd0\x3c"</div><div class='add'>+			  "\x5c\xcf\x2a\x55\xd7\x05\xdd\xcd"</div><div class='add'>+			  "\x86\xd4\x49\x51\x1c\xeb\x7e\xc3"</div><div class='add'>+			  "\x0b\xf1\x2b\x1f\xa3\x5b\x91\x3f"</div><div class='add'>+			  "\x9f\x74\x7a\x8a\xfd\x1b\x13\x0e"</div><div class='add'>+			  "\x94\xbf\xf9\x4e\xff\xd0\x1a\x91"</div><div class='add'>+			  "\x73\x5c\xa1\x72\x6a\xcd\x0b\x19"</div><div class='add'>+			  "\x7c\x4e\x5b\x03\x39\x36\x97\xe1"</div><div class='add'>+			  "\x26\x82\x6f\xb6\xbb\xde\x8e\xcc"</div><div class='add'>+			  "\x1e\x08\x29\x85\x16\xe2\xc9\xed"</div><div class='add'>+			  "\x03\xff\x3c\x1b\x78\x60\xf6\xde"</div><div class='add'>+			  "\x76\xd4\xce\xcd\x94\xc8\x11\x98"</div><div class='add'>+			  "\x55\xef\x52\x97\xca\x67\xe9\xf3"</div><div class='add'>+			  "\xe7\xff\x72\xb1\xe9\x97\x85\xca"</div><div class='add'>+			  "\x0a\x7e\x77\x20\xc5\xb3\x6d\xc6"</div><div class='add'>+			  "\xd7\x2c\xac\x95\x74\xc8\xcb\xbc"</div><div class='add'>+			  "\x2f\x80\x1e\x23\xe5\x6f\xd3\x44"</div><div class='add'>+			  "\xb0\x7f\x22\x15\x4b\xeb\xa0\xf0"</div><div class='add'>+			  "\x8c\xe8\x89\x1e\x64\x3e\xd9\x95"</div><div class='add'>+			  "\xc9\x4d\x9a\x69\xc9\xf1\xb5\xf4"</div><div class='add'>+			  "\x99\x02\x7a\x78\x57\x2a\xee\xbd"</div><div class='add'>+			  "\x74\xd2\x0c\xc3\x98\x81\xc2\x13"</div><div class='add'>+			  "\xee\x77\x0b\x10\x10\xe4\xbe\xa7"</div><div class='add'>+			  "\x18\x84\x69\x77\xae\x11\x9f\x7a"</div><div class='add'>+			  "\x02\x3a\xb5\x8c\xca\x0a\xd7\x52"</div><div class='add'>+			  "\xaf\xe6\x56\xbb\x3c\x17\x25\x6a"</div><div class='add'>+			  "\x9f\x6e\x9b\xf1\x9f\xdd\x5a\x38"</div><div class='add'>+			  "\xfc\x82\xbb\xe8\x72\xc5\x53\x9e"</div><div class='add'>+			  "\xdb\x60\x9e\xf4\xf7\x9c\x20\x3e"</div><div class='add'>+			  "\xbb\x14\x0f\x2e\x58\x3c\xb2\xad"</div><div class='add'>+			  "\x15\xb4\xaa\x5b\x65\x50\x16\xa8"</div><div class='add'>+			  "\x44\x92\x77\xdb\xd4\x77\xef\x2c"</div><div class='add'>+			  "\x8d\x6c\x01\x7d\xb7\x38\xb1\x8d"</div><div class='add'>+			  "\xeb\x4a\x42\x7d\x19\x23\xce\x3f"</div><div class='add'>+			  "\xf2\x62\x73\x57\x79\xa4\x18\xf2"</div><div class='add'>+			  "\x0a\x28\x2d\xf9\x20\x14\x7b\xea"</div><div class='add'>+			  "\xbe\x42\x1e\xe5\x31\x9d\x05\x68",</div><div class='add'>+		.ilen   = 512,</div><div class='add'>+		.result = "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='add'>+			  "\x10\x11\x12\x13\x14\x15\x16\x17"</div><div class='add'>+			  "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f"</div><div class='add'>+			  "\x20\x21\x22\x23\x24\x25\x26\x27"</div><div class='add'>+			  "\x28\x29\x2a\x2b\x2c\x2d\x2e\x2f"</div><div class='add'>+			  "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='add'>+			  "\x38\x39\x3a\x3b\x3c\x3d\x3e\x3f"</div><div class='add'>+			  "\x40\x41\x42\x43\x44\x45\x46\x47"</div><div class='add'>+			  "\x48\x49\x4a\x4b\x4c\x4d\x4e\x4f"</div><div class='add'>+			  "\x50\x51\x52\x53\x54\x55\x56\x57"</div><div class='add'>+			  "\x58\x59\x5a\x5b\x5c\x5d\x5e\x5f"</div><div class='add'>+			  "\x60\x61\x62\x63\x64\x65\x66\x67"</div><div class='add'>+			  "\x68\x69\x6a\x6b\x6c\x6d\x6e\x6f"</div><div class='add'>+			  "\x70\x71\x72\x73\x74\x75\x76\x77"</div><div class='add'>+			  "\x78\x79\x7a\x7b\x7c\x7d\x7e\x7f"</div><div class='add'>+			  "\x80\x81\x82\x83\x84\x85\x86\x87"</div><div class='add'>+			  "\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f"</div><div class='add'>+			  "\x90\x91\x92\x93\x94\x95\x96\x97"</div><div class='add'>+			  "\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f"</div><div class='add'>+			  "\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7"</div><div class='add'>+			  "\xa8\xa9\xaa\xab\xac\xad\xae\xaf"</div><div class='add'>+			  "\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7"</div><div class='add'>+			  "\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf"</div><div class='add'>+			  "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7"</div><div class='add'>+			  "\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf"</div><div class='add'>+			  "\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7"</div><div class='add'>+			  "\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf"</div><div class='add'>+			  "\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7"</div><div class='add'>+			  "\xe8\xe9\xea\xeb\xec\xed\xee\xef"</div><div class='add'>+			  "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7"</div><div class='add'>+			  "\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff"</div><div class='add'>+			  "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='add'>+			  "\x10\x11\x12\x13\x14\x15\x16\x17"</div><div class='add'>+			  "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f"</div><div class='add'>+			  "\x20\x21\x22\x23\x24\x25\x26\x27"</div><div class='add'>+			  "\x28\x29\x2a\x2b\x2c\x2d\x2e\x2f"</div><div class='add'>+			  "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='add'>+			  "\x38\x39\x3a\x3b\x3c\x3d\x3e\x3f"</div><div class='add'>+			  "\x40\x41\x42\x43\x44\x45\x46\x47"</div><div class='add'>+			  "\x48\x49\x4a\x4b\x4c\x4d\x4e\x4f"</div><div class='add'>+			  "\x50\x51\x52\x53\x54\x55\x56\x57"</div><div class='add'>+			  "\x58\x59\x5a\x5b\x5c\x5d\x5e\x5f"</div><div class='add'>+			  "\x60\x61\x62\x63\x64\x65\x66\x67"</div><div class='add'>+			  "\x68\x69\x6a\x6b\x6c\x6d\x6e\x6f"</div><div class='add'>+			  "\x70\x71\x72\x73\x74\x75\x76\x77"</div><div class='add'>+			  "\x78\x79\x7a\x7b\x7c\x7d\x7e\x7f"</div><div class='add'>+			  "\x80\x81\x82\x83\x84\x85\x86\x87"</div><div class='add'>+			  "\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f"</div><div class='add'>+			  "\x90\x91\x92\x93\x94\x95\x96\x97"</div><div class='add'>+			  "\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f"</div><div class='add'>+			  "\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7"</div><div class='add'>+			  "\xa8\xa9\xaa\xab\xac\xad\xae\xaf"</div><div class='add'>+			  "\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7"</div><div class='add'>+			  "\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf"</div><div class='add'>+			  "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7"</div><div class='add'>+			  "\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf"</div><div class='add'>+			  "\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7"</div><div class='add'>+			  "\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf"</div><div class='add'>+			  "\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7"</div><div class='add'>+			  "\xe8\xe9\xea\xeb\xec\xed\xee\xef"</div><div class='add'>+			  "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7"</div><div class='add'>+			  "\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff",</div><div class='add'>+		.rlen   = 512,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static struct cipher_testvec aes_ctr_enc_tv_template[] = {</div><div class='add'>+	{ /* From RFC 3686 */</div><div class='add'>+		.key	= "\xae\x68\x52\xf8\x12\x10\x67\xcc"</div><div class='add'>+			  "\x4b\xf7\xa5\x76\x55\x77\xf3\x9e"</div><div class='add'>+			  "\x00\x00\x00\x30",</div><div class='add'>+		.klen	= 20,</div><div class='add'>+		.iv	= "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.input	= "Single block msg",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result = "\xe4\x09\x5d\x4f\xb7\xa7\xb3\x79"</div><div class='add'>+			  "\x2d\x61\x75\xa3\x26\x13\x11\xb8",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x7e\x24\x06\x78\x17\xfa\xe0\xd7"</div><div class='add'>+			  "\x43\xd6\xce\x1f\x32\x53\x91\x63"</div><div class='add'>+			  "\x00\x6c\xb6\xdb",</div><div class='add'>+		.klen	= 20,</div><div class='add'>+		.iv	= "\xc0\x54\x3b\x59\xda\x48\xd9\x0b",</div><div class='add'>+		.input	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='add'>+			  "\x10\x11\x12\x13\x14\x15\x16\x17"</div><div class='add'>+			  "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f",</div><div class='add'>+		.ilen	= 32,</div><div class='add'>+		.result = "\x51\x04\xa1\x06\x16\x8a\x72\xd9"</div><div class='add'>+			  "\x79\x0d\x41\xee\x8e\xda\xd3\x88"</div><div class='add'>+			  "\xeb\x2e\x1e\xfc\x46\xda\x57\xc8"</div><div class='add'>+			  "\xfc\xe6\x30\xdf\x91\x41\xbe\x28",</div><div class='add'>+		.rlen	= 32,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x16\xaf\x5b\x14\x5f\xc9\xf5\x79"</div><div class='add'>+			  "\xc1\x75\xf9\x3e\x3b\xfb\x0e\xed"</div><div class='add'>+			  "\x86\x3d\x06\xcc\xfd\xb7\x85\x15"</div><div class='add'>+			  "\x00\x00\x00\x48",</div><div class='add'>+		.klen	= 28,</div><div class='add'>+		.iv	= "\x36\x73\x3c\x14\x7d\x6d\x93\xcb",</div><div class='add'>+		.input	= "Single block msg",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\x4b\x55\x38\x4f\xe2\x59\xc9\xc8"</div><div class='add'>+			  "\x4e\x79\x35\xa0\x03\xcb\xe9\x28",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x7c\x5c\xb2\x40\x1b\x3d\xc3\x3c"</div><div class='add'>+			  "\x19\xe7\x34\x08\x19\xe0\xf6\x9c"</div><div class='add'>+			  "\x67\x8c\x3d\xb8\xe6\xf6\xa9\x1a"</div><div class='add'>+			  "\x00\x96\xb0\x3b",</div><div class='add'>+		.klen	= 28,</div><div class='add'>+		.iv	= "\x02\x0c\x6e\xad\xc2\xcb\x50\x0d",</div><div class='add'>+		.input	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='add'>+			  "\x10\x11\x12\x13\x14\x15\x16\x17"</div><div class='add'>+			  "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f",</div><div class='add'>+		.ilen	= 32,</div><div class='add'>+		.result	= "\x45\x32\x43\xfc\x60\x9b\x23\x32"</div><div class='add'>+			  "\x7e\xdf\xaa\xfa\x71\x31\xcd\x9f"</div><div class='add'>+			  "\x84\x90\x70\x1c\x5a\xd4\xa7\x9c"</div><div class='add'>+			  "\xfc\x1f\xe0\xff\x42\xf4\xfb\x00",</div><div class='add'>+		.rlen	= 32,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x77\x6b\xef\xf2\x85\x1d\xb0\x6f"</div><div class='add'>+			  "\x4c\x8a\x05\x42\xc8\x69\x6f\x6c"</div><div class='add'>+			  "\x6a\x81\xaf\x1e\xec\x96\xb4\xd3"</div><div class='add'>+			  "\x7f\xc1\xd6\x89\xe6\xc1\xc1\x04"</div><div class='add'>+			  "\x00\x00\x00\x60",</div><div class='add'>+		.klen	= 36,</div><div class='add'>+		.iv	= "\xdb\x56\x72\xc9\x7a\xa8\xf0\xb2",</div><div class='add'>+		.input	= "Single block msg",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result = "\x14\x5a\xd0\x1d\xbf\x82\x4e\xc7"</div><div class='add'>+			  "\x56\x08\x63\xdc\x71\xe3\xe0\xc0",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\xf6\xd6\x6d\x6b\xd5\x2d\x59\xbb"</div><div class='add'>+			  "\x07\x96\x36\x58\x79\xef\xf8\x86"</div><div class='add'>+			  "\xc6\x6d\xd5\x1a\x5b\x6a\x99\x74"</div><div class='add'>+			  "\x4b\x50\x59\x0c\x87\xa2\x38\x84"</div><div class='add'>+			  "\x00\xfa\xac\x24",</div><div class='add'>+		.klen	= 36,</div><div class='add'>+		.iv	= "\xc1\x58\x5e\xf1\x5a\x43\xd8\x75",</div><div class='add'>+		.input	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='add'>+			  "\x10\x11\x12\x13\x14\x15\x16\x17"</div><div class='add'>+			  "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f",</div><div class='add'>+		.ilen	= 32,</div><div class='add'>+		.result = "\xf0\x5e\x23\x1b\x38\x94\x61\x2c"</div><div class='add'>+			  "\x49\xee\x00\x0b\x80\x4e\xb2\xa9"</div><div class='add'>+			  "\xb8\x30\x6b\x50\x8f\x83\x9d\x6a"</div><div class='add'>+			  "\x55\x30\x83\x1d\x93\x44\xaf\x1c",</div><div class='add'>+		.rlen	= 32,</div><div class='add'>+	}, {</div><div class='add'>+	// generated using Crypto++</div><div class='add'>+		.key = "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			"\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='add'>+			"\x10\x11\x12\x13\x14\x15\x16\x17"</div><div class='add'>+			"\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f"</div><div class='add'>+			"\x00\x00\x00\x00",</div><div class='add'>+		.klen = 32 + 4,</div><div class='add'>+		.iv = "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.input =</div><div class='add'>+			"\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			"\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='add'>+			"\x10\x11\x12\x13\x14\x15\x16\x17"</div><div class='add'>+			"\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f"</div><div class='add'>+			"\x20\x21\x22\x23\x24\x25\x26\x27"</div><div class='add'>+			"\x28\x29\x2a\x2b\x2c\x2d\x2e\x2f"</div><div class='add'>+			"\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='add'>+			"\x38\x39\x3a\x3b\x3c\x3d\x3e\x3f"</div><div class='add'>+			"\x40\x41\x42\x43\x44\x45\x46\x47"</div><div class='add'>+			"\x48\x49\x4a\x4b\x4c\x4d\x4e\x4f"</div><div class='add'>+			"\x50\x51\x52\x53\x54\x55\x56\x57"</div><div class='add'>+			"\x58\x59\x5a\x5b\x5c\x5d\x5e\x5f"</div><div class='add'>+			"\x60\x61\x62\x63\x64\x65\x66\x67"</div><div class='add'>+			"\x68\x69\x6a\x6b\x6c\x6d\x6e\x6f"</div><div class='add'>+			"\x70\x71\x72\x73\x74\x75\x76\x77"</div><div class='add'>+			"\x78\x79\x7a\x7b\x7c\x7d\x7e\x7f"</div><div class='add'>+			"\x80\x81\x82\x83\x84\x85\x86\x87"</div><div class='add'>+			"\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f"</div><div class='add'>+			"\x90\x91\x92\x93\x94\x95\x96\x97"</div><div class='add'>+			"\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f"</div><div class='add'>+			"\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7"</div><div class='add'>+			"\xa8\xa9\xaa\xab\xac\xad\xae\xaf"</div><div class='add'>+			"\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7"</div><div class='add'>+			"\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf"</div><div class='add'>+			"\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7"</div><div class='add'>+			"\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf"</div><div class='add'>+			"\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7"</div><div class='add'>+			"\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf"</div><div class='add'>+			"\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7"</div><div class='add'>+			"\xe8\xe9\xea\xeb\xec\xed\xee\xef"</div><div class='add'>+			"\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7"</div><div class='add'>+			"\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff"</div><div class='add'>+			"\x00\x03\x06\x09\x0c\x0f\x12\x15"</div><div class='add'>+			"\x18\x1b\x1e\x21\x24\x27\x2a\x2d"</div><div class='add'>+			"\x30\x33\x36\x39\x3c\x3f\x42\x45"</div><div class='add'>+			"\x48\x4b\x4e\x51\x54\x57\x5a\x5d"</div><div class='add'>+			"\x60\x63\x66\x69\x6c\x6f\x72\x75"</div><div class='add'>+			"\x78\x7b\x7e\x81\x84\x87\x8a\x8d"</div><div class='add'>+			"\x90\x93\x96\x99\x9c\x9f\xa2\xa5"</div><div class='add'>+			"\xa8\xab\xae\xb1\xb4\xb7\xba\xbd"</div><div class='add'>+			"\xc0\xc3\xc6\xc9\xcc\xcf\xd2\xd5"</div><div class='add'>+			"\xd8\xdb\xde\xe1\xe4\xe7\xea\xed"</div><div class='add'>+			"\xf0\xf3\xf6\xf9\xfc\xff\x02\x05"</div><div class='add'>+			"\x08\x0b\x0e\x11\x14\x17\x1a\x1d"</div><div class='add'>+			"\x20\x23\x26\x29\x2c\x2f\x32\x35"</div><div class='add'>+			"\x38\x3b\x3e\x41\x44\x47\x4a\x4d"</div><div class='add'>+			"\x50\x53\x56\x59\x5c\x5f\x62\x65"</div><div class='add'>+			"\x68\x6b\x6e\x71\x74\x77\x7a\x7d"</div><div class='add'>+			"\x80\x83\x86\x89\x8c\x8f\x92\x95"</div><div class='add'>+			"\x98\x9b\x9e\xa1\xa4\xa7\xaa\xad"</div><div class='add'>+			"\xb0\xb3\xb6\xb9\xbc\xbf\xc2\xc5"</div><div class='add'>+			"\xc8\xcb\xce\xd1\xd4\xd7\xda\xdd"</div><div class='add'>+			"\xe0\xe3\xe6\xe9\xec\xef\xf2\xf5"</div><div class='add'>+			"\xf8\xfb\xfe\x01\x04\x07\x0a\x0d"</div><div class='add'>+			"\x10\x13\x16\x19\x1c\x1f\x22\x25"</div><div class='add'>+			"\x28\x2b\x2e\x31\x34\x37\x3a\x3d"</div><div class='add'>+			"\x40\x43\x46\x49\x4c\x4f\x52\x55"</div><div class='add'>+			"\x58\x5b\x5e\x61\x64\x67\x6a\x6d"</div><div class='add'>+			"\x70\x73\x76\x79\x7c\x7f\x82\x85"</div><div class='add'>+			"\x88\x8b\x8e\x91\x94\x97\x9a\x9d"</div><div class='add'>+			"\xa0\xa3\xa6\xa9\xac\xaf\xb2\xb5"</div><div class='add'>+			"\xb8\xbb\xbe\xc1\xc4\xc7\xca\xcd"</div><div class='add'>+			"\xd0\xd3\xd6\xd9\xdc\xdf\xe2\xe5"</div><div class='add'>+			"\xe8\xeb\xee\xf1\xf4\xf7\xfa\xfd"</div><div class='add'>+			"\x00\x05\x0a\x0f\x14\x19\x1e\x23"</div><div class='add'>+			"\x28\x2d\x32\x37\x3c\x41\x46\x4b"</div><div class='add'>+			"\x50\x55\x5a\x5f\x64\x69\x6e\x73"</div><div class='add'>+			"\x78\x7d\x82\x87\x8c\x91\x96\x9b"</div><div class='add'>+			"\xa0\xa5\xaa\xaf\xb4\xb9\xbe\xc3"</div><div class='add'>+			"\xc8\xcd\xd2\xd7\xdc\xe1\xe6\xeb"</div><div class='add'>+			"\xf0\xf5\xfa\xff\x04\x09\x0e\x13"</div><div class='add'>+			"\x18\x1d\x22\x27\x2c\x31\x36\x3b"</div><div class='add'>+			"\x40\x45\x4a\x4f\x54\x59\x5e\x63"</div><div class='add'>+			"\x68\x6d\x72\x77\x7c\x81\x86\x8b"</div><div class='add'>+			"\x90\x95\x9a\x9f\xa4\xa9\xae\xb3"</div><div class='add'>+			"\xb8\xbd\xc2\xc7\xcc\xd1\xd6\xdb"</div><div class='add'>+			"\xe0\xe5\xea\xef\xf4\xf9\xfe\x03"</div><div class='add'>+			"\x08\x0d\x12\x17\x1c\x21\x26\x2b"</div><div class='add'>+			"\x30\x35\x3a\x3f\x44\x49\x4e\x53"</div><div class='add'>+			"\x58\x5d\x62\x67\x6c\x71\x76\x7b"</div><div class='add'>+			"\x80\x85\x8a\x8f\x94\x99\x9e\xa3"</div><div class='add'>+			"\xa8\xad\xb2\xb7\xbc\xc1\xc6\xcb"</div><div class='add'>+			"\xd0\xd5\xda\xdf\xe4\xe9\xee\xf3"</div><div class='add'>+			"\xf8\xfd\x02\x07\x0c\x11\x16\x1b"</div><div class='add'>+			"\x20\x25\x2a\x2f\x34\x39\x3e\x43"</div><div class='add'>+			"\x48\x4d\x52\x57\x5c\x61\x66\x6b"</div><div class='add'>+			"\x70\x75\x7a\x7f\x84\x89\x8e\x93"</div><div class='add'>+			"\x98\x9d\xa2\xa7\xac\xb1\xb6\xbb"</div><div class='add'>+			"\xc0\xc5\xca\xcf\xd4\xd9\xde\xe3"</div><div class='add'>+			"\xe8\xed\xf2\xf7\xfc\x01\x06\x0b"</div><div class='add'>+			"\x10\x15\x1a\x1f\x24\x29\x2e\x33"</div><div class='add'>+			"\x38\x3d\x42\x47\x4c\x51\x56\x5b"</div><div class='add'>+			"\x60\x65\x6a\x6f\x74\x79\x7e\x83"</div><div class='add'>+			"\x88\x8d\x92\x97\x9c\xa1\xa6\xab"</div><div class='add'>+			"\xb0\xb5\xba\xbf\xc4\xc9\xce\xd3"</div><div class='add'>+			"\xd8\xdd\xe2\xe7\xec\xf1\xf6\xfb"</div><div class='add'>+			"\x00\x07\x0e\x15\x1c\x23\x2a\x31"</div><div class='add'>+			"\x38\x3f\x46\x4d\x54\x5b\x62\x69"</div><div class='add'>+			"\x70\x77\x7e\x85\x8c\x93\x9a\xa1"</div><div class='add'>+			"\xa8\xaf\xb6\xbd\xc4\xcb\xd2\xd9"</div><div class='add'>+			"\xe0\xe7\xee\xf5\xfc\x03\x0a\x11"</div><div class='add'>+			"\x18\x1f\x26\x2d\x34\x3b\x42\x49"</div><div class='add'>+			"\x50\x57\x5e\x65\x6c\x73\x7a\x81"</div><div class='add'>+			"\x88\x8f\x96\x9d\xa4\xab\xb2\xb9"</div><div class='add'>+			"\xc0\xc7\xce\xd5\xdc\xe3\xea\xf1"</div><div class='add'>+			"\xf8\xff\x06\x0d\x14\x1b\x22\x29"</div><div class='add'>+			"\x30\x37\x3e\x45\x4c\x53\x5a\x61"</div><div class='add'>+			"\x68\x6f\x76\x7d\x84\x8b\x92\x99"</div><div class='add'>+			"\xa0\xa7\xae\xb5\xbc\xc3\xca\xd1"</div><div class='add'>+			"\xd8\xdf\xe6\xed\xf4\xfb\x02\x09"</div><div class='add'>+			"\x10\x17\x1e\x25\x2c\x33\x3a\x41"</div><div class='add'>+			"\x48\x4f\x56\x5d\x64\x6b\x72\x79"</div><div class='add'>+			"\x80\x87\x8e\x95\x9c\xa3\xaa\xb1"</div><div class='add'>+			"\xb8\xbf\xc6\xcd\xd4\xdb\xe2\xe9"</div><div class='add'>+			"\xf0\xf7\xfe\x05\x0c\x13\x1a\x21"</div><div class='add'>+			"\x28\x2f\x36\x3d\x44\x4b\x52\x59"</div><div class='add'>+			"\x60\x67\x6e\x75\x7c\x83\x8a\x91"</div><div class='add'>+			"\x98\x9f\xa6\xad\xb4\xbb\xc2\xc9"</div><div class='add'>+			"\xd0\xd7\xde\xe5\xec\xf3\xfa\x01"</div><div class='add'>+			"\x08\x0f\x16\x1d\x24\x2b\x32\x39"</div><div class='add'>+			"\x40\x47\x4e\x55\x5c\x63\x6a\x71"</div><div class='add'>+			"\x78\x7f\x86\x8d\x94\x9b\xa2\xa9"</div><div class='add'>+			"\xb0\xb7\xbe\xc5\xcc\xd3\xda\xe1"</div><div class='add'>+			"\xe8\xef\xf6\xfd\x04\x0b\x12\x19"</div><div class='add'>+			"\x20\x27\x2e\x35\x3c\x43\x4a\x51"</div><div class='add'>+			"\x58\x5f\x66\x6d\x74\x7b\x82\x89"</div><div class='add'>+			"\x90\x97\x9e\xa5\xac\xb3\xba\xc1"</div><div class='add'>+			"\xc8\xcf\xd6\xdd\xe4\xeb\xf2\xf9"</div><div class='add'>+			"\x00\x09\x12\x1b\x24\x2d\x36\x3f"</div><div class='add'>+			"\x48\x51\x5a\x63\x6c\x75\x7e\x87"</div><div class='add'>+			"\x90\x99\xa2\xab\xb4\xbd\xc6\xcf"</div><div class='add'>+			"\xd8\xe1\xea\xf3\xfc\x05\x0e\x17"</div><div class='add'>+			"\x20\x29\x32\x3b\x44\x4d\x56\x5f"</div><div class='add'>+			"\x68\x71\x7a\x83\x8c\x95\x9e\xa7"</div><div class='add'>+			"\xb0\xb9\xc2\xcb\xd4\xdd\xe6\xef"</div><div class='add'>+			"\xf8\x01\x0a\x13\x1c\x25\x2e\x37"</div><div class='add'>+			"\x40\x49\x52\x5b\x64\x6d\x76\x7f"</div><div class='add'>+			"\x88\x91\x9a\xa3\xac\xb5\xbe\xc7"</div><div class='add'>+			"\xd0\xd9\xe2\xeb\xf4\xfd\x06\x0f"</div><div class='add'>+			"\x18\x21\x2a\x33\x3c\x45\x4e\x57"</div><div class='add'>+			"\x60\x69\x72\x7b\x84\x8d\x96\x9f"</div><div class='add'>+			"\xa8\xb1\xba\xc3\xcc\xd5\xde\xe7"</div><div class='add'>+			"\xf0\xf9\x02\x0b\x14\x1d\x26\x2f"</div><div class='add'>+			"\x38\x41\x4a\x53\x5c\x65\x6e\x77"</div><div class='add'>+			"\x80\x89\x92\x9b\xa4\xad\xb6\xbf"</div><div class='add'>+			"\xc8\xd1\xda\xe3\xec\xf5\xfe\x07"</div><div class='add'>+			"\x10\x19\x22\x2b\x34\x3d\x46\x4f"</div><div class='add'>+			"\x58\x61\x6a\x73\x7c\x85\x8e\x97"</div><div class='add'>+			"\xa0\xa9\xb2\xbb\xc4\xcd\xd6\xdf"</div><div class='add'>+			"\xe8\xf1\xfa\x03\x0c\x15\x1e\x27"</div><div class='add'>+			"\x30\x39\x42\x4b\x54\x5d\x66\x6f"</div><div class='add'>+			"\x78\x81\x8a\x93\x9c\xa5\xae\xb7"</div><div class='add'>+			"\xc0\xc9\xd2\xdb\xe4\xed\xf6\xff"</div><div class='add'>+			"\x08\x11\x1a\x23\x2c\x35\x3e\x47"</div><div class='add'>+			"\x50\x59\x62\x6b\x74\x7d\x86\x8f"</div><div class='add'>+			"\x98\xa1\xaa\xb3\xbc\xc5\xce\xd7"</div><div class='add'>+			"\xe0\xe9\xf2\xfb\x04\x0d\x16\x1f"</div><div class='add'>+			"\x28\x31\x3a\x43\x4c\x55\x5e\x67"</div><div class='add'>+			"\x70\x79\x82\x8b\x94\x9d\xa6\xaf"</div><div class='add'>+			"\xb8\xc1\xca\xd3\xdc\xe5\xee\xf7"</div><div class='add'>+			"\x00\x0b\x16\x21\x2c\x37\x42\x4d"</div><div class='add'>+			"\x58\x63\x6e\x79\x84\x8f\x9a\xa5"</div><div class='add'>+			"\xb0\xbb\xc6\xd1\xdc\xe7\xf2\xfd"</div><div class='add'>+			"\x08\x13\x1e\x29\x34\x3f\x4a\x55"</div><div class='add'>+			"\x60\x6b\x76\x81\x8c\x97\xa2\xad"</div><div class='add'>+			"\xb8\xc3\xce\xd9\xe4\xef\xfa\x05"</div><div class='add'>+			"\x10\x1b\x26\x31\x3c\x47\x52\x5d"</div><div class='add'>+			"\x68\x73\x7e\x89\x94\x9f\xaa\xb5"</div><div class='add'>+			"\xc0\xcb\xd6\xe1\xec\xf7\x02\x0d"</div><div class='add'>+			"\x18\x23\x2e\x39\x44\x4f\x5a\x65"</div><div class='add'>+			"\x70\x7b\x86\x91\x9c\xa7\xb2\xbd"</div><div class='add'>+			"\xc8\xd3\xde\xe9\xf4\xff\x0a\x15"</div><div class='add'>+			"\x20\x2b\x36\x41\x4c\x57\x62\x6d"</div><div class='add'>+			"\x78\x83\x8e\x99\xa4\xaf\xba\xc5"</div><div class='add'>+			"\xd0\xdb\xe6\xf1\xfc\x07\x12\x1d"</div><div class='add'>+			"\x28\x33\x3e\x49\x54\x5f\x6a\x75"</div><div class='add'>+			"\x80\x8b\x96\xa1\xac\xb7\xc2\xcd"</div><div class='add'>+			"\xd8\xe3\xee\xf9\x04\x0f\x1a\x25"</div><div class='add'>+			"\x30\x3b\x46\x51\x5c\x67\x72\x7d"</div><div class='add'>+			"\x88\x93\x9e\xa9\xb4\xbf\xca\xd5"</div><div class='add'>+			"\xe0\xeb\xf6\x01\x0c\x17\x22\x2d"</div><div class='add'>+			"\x38\x43\x4e\x59\x64\x6f\x7a\x85"</div><div class='add'>+			"\x90\x9b\xa6\xb1\xbc\xc7\xd2\xdd"</div><div class='add'>+			"\xe8\xf3\xfe\x09\x14\x1f\x2a\x35"</div><div class='add'>+			"\x40\x4b\x56\x61\x6c\x77\x82\x8d"</div><div class='add'>+			"\x98\xa3\xae\xb9\xc4\xcf\xda\xe5"</div><div class='add'>+			"\xf0\xfb\x06\x11\x1c\x27\x32\x3d"</div><div class='add'>+			"\x48\x53\x5e\x69\x74\x7f\x8a\x95"</div><div class='add'>+			"\xa0\xab\xb6\xc1\xcc\xd7\xe2\xed"</div><div class='add'>+			"\xf8\x03\x0e\x19\x24\x2f\x3a\x45"</div><div class='add'>+			"\x50\x5b\x66\x71\x7c\x87\x92\x9d"</div><div class='add'>+			"\xa8\xb3\xbe\xc9\xd4\xdf\xea\xf5"</div><div class='add'>+			"\x00\x0d\x1a\x27\x34\x41\x4e\x5b"</div><div class='add'>+			"\x68\x75\x82\x8f\x9c\xa9\xb6\xc3"</div><div class='add'>+			"\xd0\xdd\xea\xf7\x04\x11\x1e\x2b"</div><div class='add'>+			"\x38\x45\x52\x5f\x6c\x79\x86\x93"</div><div class='add'>+			"\xa0\xad\xba\xc7\xd4\xe1\xee\xfb"</div><div class='add'>+			"\x08\x15\x22\x2f\x3c\x49\x56\x63"</div><div class='add'>+			"\x70\x7d\x8a\x97\xa4\xb1\xbe\xcb"</div><div class='add'>+			"\xd8\xe5\xf2\xff\x0c\x19\x26\x33"</div><div class='add'>+			"\x40\x4d\x5a\x67\x74\x81\x8e\x9b"</div><div class='add'>+			"\xa8\xb5\xc2\xcf\xdc\xe9\xf6\x03"</div><div class='add'>+			"\x10\x1d\x2a\x37\x44\x51\x5e\x6b"</div><div class='add'>+			"\x78\x85\x92\x9f\xac\xb9\xc6\xd3"</div><div class='add'>+			"\xe0\xed\xfa\x07\x14\x21\x2e\x3b"</div><div class='add'>+			"\x48\x55\x62\x6f\x7c\x89\x96\xa3"</div><div class='add'>+			"\xb0\xbd\xca\xd7\xe4\xf1\xfe\x0b"</div><div class='add'>+			"\x18\x25\x32\x3f\x4c\x59\x66\x73"</div><div class='add'>+			"\x80\x8d\x9a\xa7\xb4\xc1\xce\xdb"</div><div class='add'>+			"\xe8\xf5\x02\x0f\x1c\x29\x36\x43"</div><div class='add'>+			"\x50\x5d\x6a\x77\x84\x91\x9e\xab"</div><div class='add'>+			"\xb8\xc5\xd2\xdf\xec\xf9\x06\x13"</div><div class='add'>+			"\x20\x2d\x3a\x47\x54\x61\x6e\x7b"</div><div class='add'>+			"\x88\x95\xa2\xaf\xbc\xc9\xd6\xe3"</div><div class='add'>+			"\xf0\xfd\x0a\x17\x24\x31\x3e\x4b"</div><div class='add'>+			"\x58\x65\x72\x7f\x8c\x99\xa6\xb3"</div><div class='add'>+			"\xc0\xcd\xda\xe7\xf4\x01\x0e\x1b"</div><div class='add'>+			"\x28\x35\x42\x4f\x5c\x69\x76\x83"</div><div class='add'>+			"\x90\x9d\xaa\xb7\xc4\xd1\xde\xeb"</div><div class='add'>+			"\xf8\x05\x12\x1f\x2c\x39\x46\x53"</div><div class='add'>+			"\x60\x6d\x7a\x87\x94\xa1\xae\xbb"</div><div class='add'>+			"\xc8\xd5\xe2\xef\xfc\x09\x16\x23"</div><div class='add'>+			"\x30\x3d\x4a\x57\x64\x71\x7e\x8b"</div><div class='add'>+			"\x98\xa5\xb2\xbf\xcc\xd9\xe6\xf3"</div><div class='add'>+			"\x00\x0f\x1e\x2d\x3c\x4b\x5a\x69"</div><div class='add'>+			"\x78\x87\x96\xa5\xb4\xc3\xd2\xe1"</div><div class='add'>+			"\xf0\xff\x0e\x1d\x2c\x3b\x4a\x59"</div><div class='add'>+			"\x68\x77\x86\x95\xa4\xb3\xc2\xd1"</div><div class='add'>+			"\xe0\xef\xfe\x0d\x1c\x2b\x3a\x49"</div><div class='add'>+			"\x58\x67\x76\x85\x94\xa3\xb2\xc1"</div><div class='add'>+			"\xd0\xdf\xee\xfd\x0c\x1b\x2a\x39"</div><div class='add'>+			"\x48\x57\x66\x75\x84\x93\xa2\xb1"</div><div class='add'>+			"\xc0\xcf\xde\xed\xfc\x0b\x1a\x29"</div><div class='add'>+			"\x38\x47\x56\x65\x74\x83\x92\xa1"</div><div class='add'>+			"\xb0\xbf\xce\xdd\xec\xfb\x0a\x19"</div><div class='add'>+			"\x28\x37\x46\x55\x64\x73\x82\x91"</div><div class='add'>+			"\xa0\xaf\xbe\xcd\xdc\xeb\xfa\x09"</div><div class='add'>+			"\x18\x27\x36\x45\x54\x63\x72\x81"</div><div class='add'>+			"\x90\x9f\xae\xbd\xcc\xdb\xea\xf9"</div><div class='add'>+			"\x08\x17\x26\x35\x44\x53\x62\x71"</div><div class='add'>+			"\x80\x8f\x9e\xad\xbc\xcb\xda\xe9"</div><div class='add'>+			"\xf8\x07\x16\x25\x34\x43\x52\x61"</div><div class='add'>+			"\x70\x7f\x8e\x9d\xac\xbb\xca\xd9"</div><div class='add'>+			"\xe8\xf7\x06\x15\x24\x33\x42\x51"</div><div class='add'>+			"\x60\x6f\x7e\x8d\x9c\xab\xba\xc9"</div><div class='add'>+			"\xd8\xe7\xf6\x05\x14\x23\x32\x41"</div><div class='add'>+			"\x50\x5f\x6e\x7d\x8c\x9b\xaa\xb9"</div><div class='add'>+			"\xc8\xd7\xe6\xf5\x04\x13\x22\x31"</div><div class='add'>+			"\x40\x4f\x5e\x6d\x7c\x8b\x9a\xa9"</div><div class='add'>+			"\xb8\xc7\xd6\xe5\xf4\x03\x12\x21"</div><div class='add'>+			"\x30\x3f\x4e\x5d\x6c\x7b\x8a\x99"</div><div class='add'>+			"\xa8\xb7\xc6\xd5\xe4\xf3\x02\x11"</div><div class='add'>+			"\x20\x2f\x3e\x4d\x5c\x6b\x7a\x89"</div><div class='add'>+			"\x98\xa7\xb6\xc5\xd4\xe3\xf2\x01"</div><div class='add'>+			"\x10\x1f\x2e\x3d\x4c\x5b\x6a\x79"</div><div class='add'>+			"\x88\x97\xa6\xb5\xc4\xd3\xe2\xf1"</div><div class='add'>+			"\x00\x11\x22\x33\x44\x55\x66\x77"</div><div class='add'>+			"\x88\x99\xaa\xbb\xcc\xdd\xee\xff"</div><div class='add'>+			"\x10\x21\x32\x43\x54\x65\x76\x87"</div><div class='add'>+			"\x98\xa9\xba\xcb\xdc\xed\xfe\x0f"</div><div class='add'>+			"\x20\x31\x42\x53\x64\x75\x86\x97"</div><div class='add'>+			"\xa8\xb9\xca\xdb\xec\xfd\x0e\x1f"</div><div class='add'>+			"\x30\x41\x52\x63\x74\x85\x96\xa7"</div><div class='add'>+			"\xb8\xc9\xda\xeb\xfc\x0d\x1e\x2f"</div><div class='add'>+			"\x40\x51\x62\x73\x84\x95\xa6\xb7"</div><div class='add'>+			"\xc8\xd9\xea\xfb\x0c\x1d\x2e\x3f"</div><div class='add'>+			"\x50\x61\x72\x83\x94\xa5\xb6\xc7"</div><div class='add'>+			"\xd8\xe9\xfa\x0b\x1c\x2d\x3e\x4f"</div><div class='add'>+			"\x60\x71\x82\x93\xa4\xb5\xc6\xd7"</div><div class='add'>+			"\xe8\xf9\x0a\x1b\x2c\x3d\x4e\x5f"</div><div class='add'>+			"\x70\x81\x92\xa3\xb4\xc5\xd6\xe7"</div><div class='add'>+			"\xf8\x09\x1a\x2b\x3c\x4d\x5e\x6f"</div><div class='add'>+			"\x80\x91\xa2\xb3\xc4\xd5\xe6\xf7"</div><div class='add'>+			"\x08\x19\x2a\x3b\x4c\x5d\x6e\x7f"</div><div class='add'>+			"\x90\xa1\xb2\xc3\xd4\xe5\xf6\x07"</div><div class='add'>+			"\x18\x29\x3a\x4b\x5c\x6d\x7e\x8f"</div><div class='add'>+			"\xa0\xb1\xc2\xd3\xe4\xf5\x06\x17"</div><div class='add'>+			"\x28\x39\x4a\x5b\x6c\x7d\x8e\x9f"</div><div class='add'>+			"\xb0\xc1\xd2\xe3\xf4\x05\x16\x27"</div><div class='add'>+			"\x38\x49\x5a\x6b\x7c\x8d\x9e\xaf"</div><div class='add'>+			"\xc0\xd1\xe2\xf3\x04\x15\x26\x37"</div><div class='add'>+			"\x48\x59\x6a\x7b\x8c\x9d\xae\xbf"</div><div class='add'>+			"\xd0\xe1\xf2\x03\x14\x25\x36\x47"</div><div class='add'>+			"\x58\x69\x7a\x8b\x9c\xad\xbe\xcf"</div><div class='add'>+			"\xe0\xf1\x02\x13\x24\x35\x46\x57"</div><div class='add'>+			"\x68\x79\x8a\x9b\xac\xbd\xce\xdf"</div><div class='add'>+			"\xf0\x01\x12\x23\x34\x45\x56\x67"</div><div class='add'>+			"\x78\x89\x9a\xab\xbc\xcd\xde\xef"</div><div class='add'>+			"\x00\x13\x26\x39\x4c\x5f\x72\x85"</div><div class='add'>+			"\x98\xab\xbe\xd1\xe4\xf7\x0a\x1d"</div><div class='add'>+			"\x30\x43\x56\x69\x7c\x8f\xa2\xb5"</div><div class='add'>+			"\xc8\xdb\xee\x01\x14\x27\x3a\x4d"</div><div class='add'>+			"\x60\x73\x86\x99\xac\xbf\xd2\xe5"</div><div class='add'>+			"\xf8\x0b\x1e\x31\x44\x57\x6a\x7d"</div><div class='add'>+			"\x90\xa3\xb6\xc9\xdc\xef\x02\x15"</div><div class='add'>+			"\x28\x3b\x4e\x61\x74\x87\x9a\xad"</div><div class='add'>+			"\xc0\xd3\xe6\xf9\x0c\x1f\x32\x45"</div><div class='add'>+			"\x58\x6b\x7e\x91\xa4\xb7\xca\xdd"</div><div class='add'>+			"\xf0\x03\x16\x29\x3c\x4f\x62\x75"</div><div class='add'>+			"\x88\x9b\xae\xc1\xd4\xe7\xfa\x0d"</div><div class='add'>+			"\x20\x33\x46\x59\x6c\x7f\x92\xa5"</div><div class='add'>+			"\xb8\xcb\xde\xf1\x04\x17\x2a\x3d"</div><div class='add'>+			"\x50\x63\x76\x89\x9c\xaf\xc2\xd5"</div><div class='add'>+			"\xe8\xfb\x0e\x21\x34\x47\x5a\x6d"</div><div class='add'>+			"\x80\x93\xa6\xb9\xcc\xdf\xf2\x05"</div><div class='add'>+			"\x18\x2b\x3e\x51\x64\x77\x8a\x9d"</div><div class='add'>+			"\xb0\xc3\xd6\xe9\xfc\x0f\x22\x35"</div><div class='add'>+			"\x48\x5b\x6e\x81\x94\xa7\xba\xcd"</div><div class='add'>+			"\xe0\xf3\x06\x19\x2c\x3f\x52\x65"</div><div class='add'>+			"\x78\x8b\x9e\xb1\xc4\xd7\xea\xfd"</div><div class='add'>+			"\x10\x23\x36\x49\x5c\x6f\x82\x95"</div><div class='add'>+			"\xa8\xbb\xce\xe1\xf4\x07\x1a\x2d"</div><div class='add'>+			"\x40\x53\x66\x79\x8c\x9f\xb2\xc5"</div><div class='add'>+			"\xd8\xeb\xfe\x11\x24\x37\x4a\x5d"</div><div class='add'>+			"\x70\x83\x96\xa9\xbc\xcf\xe2\xf5"</div><div class='add'>+			"\x08\x1b\x2e\x41\x54\x67\x7a\x8d"</div><div class='add'>+			"\xa0\xb3\xc6\xd9\xec\xff\x12\x25"</div><div class='add'>+			"\x38\x4b\x5e\x71\x84\x97\xaa\xbd"</div><div class='add'>+			"\xd0\xe3\xf6\x09\x1c\x2f\x42\x55"</div><div class='add'>+			"\x68\x7b\x8e\xa1\xb4\xc7\xda\xed"</div><div class='add'>+			"\x00\x15\x2a\x3f\x54\x69\x7e\x93"</div><div class='add'>+			"\xa8\xbd\xd2\xe7\xfc\x11\x26\x3b"</div><div class='add'>+			"\x50\x65\x7a\x8f\xa4\xb9\xce\xe3"</div><div class='add'>+			"\xf8\x0d\x22\x37\x4c\x61\x76\x8b"</div><div class='add'>+			"\xa0\xb5\xca\xdf\xf4\x09\x1e\x33"</div><div class='add'>+			"\x48\x5d\x72\x87\x9c\xb1\xc6\xdb"</div><div class='add'>+			"\xf0\x05\x1a\x2f\x44\x59\x6e\x83"</div><div class='add'>+			"\x98\xad\xc2\xd7\xec\x01\x16\x2b"</div><div class='add'>+			"\x40\x55\x6a\x7f\x94\xa9\xbe\xd3"</div><div class='add'>+			"\xe8\xfd\x12\x27\x3c\x51\x66\x7b"</div><div class='add'>+			"\x90\xa5\xba\xcf\xe4\xf9\x0e\x23"</div><div class='add'>+			"\x38\x4d\x62\x77\x8c\xa1\xb6\xcb"</div><div class='add'>+			"\xe0\xf5\x0a\x1f\x34\x49\x5e\x73"</div><div class='add'>+			"\x88\x9d\xb2\xc7\xdc\xf1\x06\x1b"</div><div class='add'>+			"\x30\x45\x5a\x6f\x84\x99\xae\xc3"</div><div class='add'>+			"\xd8\xed\x02\x17\x2c\x41\x56\x6b"</div><div class='add'>+			"\x80\x95\xaa\xbf\xd4\xe9\xfe\x13"</div><div class='add'>+			"\x28\x3d\x52\x67\x7c\x91\xa6\xbb"</div><div class='add'>+			"\xd0\xe5\xfa\x0f\x24\x39\x4e\x63"</div><div class='add'>+			"\x78\x8d\xa2\xb7\xcc\xe1\xf6\x0b"</div><div class='add'>+			"\x20\x35\x4a\x5f\x74\x89\x9e\xb3"</div><div class='add'>+			"\xc8\xdd\xf2\x07\x1c\x31\x46\x5b"</div><div class='add'>+			"\x70\x85\x9a\xaf\xc4\xd9\xee\x03"</div><div class='add'>+			"\x18\x2d\x42\x57\x6c\x81\x96\xab"</div><div class='add'>+			"\xc0\xd5\xea\xff\x14\x29\x3e\x53"</div><div class='add'>+			"\x68\x7d\x92\xa7\xbc\xd1\xe6\xfb"</div><div class='add'>+			"\x10\x25\x3a\x4f\x64\x79\x8e\xa3"</div><div class='add'>+			"\xb8\xcd\xe2\xf7\x0c\x21\x36\x4b"</div><div class='add'>+			"\x60\x75\x8a\x9f\xb4\xc9\xde\xf3"</div><div class='add'>+			"\x08\x1d\x32\x47\x5c\x71\x86\x9b"</div><div class='add'>+			"\xb0\xc5\xda\xef\x04\x19\x2e\x43"</div><div class='add'>+			"\x58\x6d\x82\x97\xac\xc1\xd6\xeb"</div><div class='add'>+			"\x00\x17\x2e\x45\x5c\x73\x8a\xa1"</div><div class='add'>+			"\xb8\xcf\xe6\xfd\x14\x2b\x42\x59"</div><div class='add'>+			"\x70\x87\x9e\xb5\xcc\xe3\xfa\x11"</div><div class='add'>+			"\x28\x3f\x56\x6d\x84\x9b\xb2\xc9"</div><div class='add'>+			"\xe0\xf7\x0e\x25\x3c\x53\x6a\x81"</div><div class='add'>+			"\x98\xaf\xc6\xdd\xf4\x0b\x22\x39"</div><div class='add'>+			"\x50\x67\x7e\x95\xac\xc3\xda\xf1"</div><div class='add'>+			"\x08\x1f\x36\x4d\x64\x7b\x92\xa9"</div><div class='add'>+			"\xc0\xd7\xee\x05\x1c\x33\x4a\x61"</div><div class='add'>+			"\x78\x8f\xa6\xbd\xd4\xeb\x02\x19"</div><div class='add'>+			"\x30\x47\x5e\x75\x8c\xa3\xba\xd1"</div><div class='add'>+			"\xe8\xff\x16\x2d\x44\x5b\x72\x89"</div><div class='add'>+			"\xa0\xb7\xce\xe5\xfc\x13\x2a\x41"</div><div class='add'>+			"\x58\x6f\x86\x9d\xb4\xcb\xe2\xf9"</div><div class='add'>+			"\x10\x27\x3e\x55\x6c\x83\x9a\xb1"</div><div class='add'>+			"\xc8\xdf\xf6\x0d\x24\x3b\x52\x69"</div><div class='add'>+			"\x80\x97\xae\xc5\xdc\xf3\x0a\x21"</div><div class='add'>+			"\x38\x4f\x66\x7d\x94\xab\xc2\xd9"</div><div class='add'>+			"\xf0\x07\x1e\x35\x4c\x63\x7a\x91"</div><div class='add'>+			"\xa8\xbf\xd6\xed\x04\x1b\x32\x49"</div><div class='add'>+			"\x60\x77\x8e\xa5\xbc\xd3\xea\x01"</div><div class='add'>+			"\x18\x2f\x46\x5d\x74\x8b\xa2\xb9"</div><div class='add'>+			"\xd0\xe7\xfe\x15\x2c\x43\x5a\x71"</div><div class='add'>+			"\x88\x9f\xb6\xcd\xe4\xfb\x12\x29"</div><div class='add'>+			"\x40\x57\x6e\x85\x9c\xb3\xca\xe1"</div><div class='add'>+			"\xf8\x0f\x26\x3d\x54\x6b\x82\x99"</div><div class='add'>+			"\xb0\xc7\xde\xf5\x0c\x23\x3a\x51"</div><div class='add'>+			"\x68\x7f\x96\xad\xc4\xdb\xf2\x09"</div><div class='add'>+			"\x20\x37\x4e\x65\x7c\x93\xaa\xc1"</div><div class='add'>+			"\xd8\xef\x06\x1d\x34\x4b\x62\x79"</div><div class='add'>+			"\x90\xa7\xbe\xd5\xec\x03\x1a\x31"</div><div class='add'>+			"\x48\x5f\x76\x8d\xa4\xbb\xd2\xe9"</div><div class='add'>+			"\x00\x19\x32\x4b\x64\x7d\x96\xaf"</div><div class='add'>+			"\xc8\xe1\xfa\x13\x2c\x45\x5e\x77"</div><div class='add'>+			"\x90\xa9\xc2\xdb\xf4\x0d\x26\x3f"</div><div class='add'>+			"\x58\x71\x8a\xa3\xbc\xd5\xee\x07"</div><div class='add'>+			"\x20\x39\x52\x6b\x84\x9d\xb6\xcf"</div><div class='add'>+			"\xe8\x01\x1a\x33\x4c\x65\x7e\x97"</div><div class='add'>+			"\xb0\xc9\xe2\xfb\x14\x2d\x46\x5f"</div><div class='add'>+			"\x78\x91\xaa\xc3\xdc\xf5\x0e\x27"</div><div class='add'>+			"\x40\x59\x72\x8b\xa4\xbd\xd6\xef"</div><div class='add'>+			"\x08\x21\x3a\x53\x6c\x85\x9e\xb7"</div><div class='add'>+			"\xd0\xe9\x02\x1b\x34\x4d\x66\x7f"</div><div class='add'>+			"\x98\xb1\xca\xe3\xfc\x15\x2e\x47"</div><div class='add'>+			"\x60\x79\x92\xab\xc4\xdd\xf6\x0f"</div><div class='add'>+			"\x28\x41\x5a\x73\x8c\xa5\xbe\xd7"</div><div class='add'>+			"\xf0\x09\x22\x3b\x54\x6d\x86\x9f"</div><div class='add'>+			"\xb8\xd1\xea\x03\x1c\x35\x4e\x67"</div><div class='add'>+			"\x80\x99\xb2\xcb\xe4\xfd\x16\x2f"</div><div class='add'>+			"\x48\x61\x7a\x93\xac\xc5\xde\xf7"</div><div class='add'>+			"\x10\x29\x42\x5b\x74\x8d\xa6\xbf"</div><div class='add'>+			"\xd8\xf1\x0a\x23\x3c\x55\x6e\x87"</div><div class='add'>+			"\xa0\xb9\xd2\xeb\x04\x1d\x36\x4f"</div><div class='add'>+			"\x68\x81\x9a\xb3\xcc\xe5\xfe\x17"</div><div class='add'>+			"\x30\x49\x62\x7b\x94\xad\xc6\xdf"</div><div class='add'>+			"\xf8\x11\x2a\x43\x5c\x75\x8e\xa7"</div><div class='add'>+			"\xc0\xd9\xf2\x0b\x24\x3d\x56\x6f"</div><div class='add'>+			"\x88\xa1\xba\xd3\xec\x05\x1e\x37"</div><div class='add'>+			"\x50\x69\x82\x9b\xb4\xcd\xe6\xff"</div><div class='add'>+			"\x18\x31\x4a\x63\x7c\x95\xae\xc7"</div><div class='add'>+			"\xe0\xf9\x12\x2b\x44\x5d\x76\x8f"</div><div class='add'>+			"\xa8\xc1\xda\xf3\x0c\x25\x3e\x57"</div><div class='add'>+			"\x70\x89\xa2\xbb\xd4\xed\x06\x1f"</div><div class='add'>+			"\x38\x51\x6a\x83\x9c\xb5\xce\xe7"</div><div class='add'>+			"\x00\x1b\x36\x51\x6c\x87\xa2\xbd"</div><div class='add'>+			"\xd8\xf3\x0e\x29\x44\x5f\x7a\x95"</div><div class='add'>+			"\xb0\xcb\xe6\x01\x1c\x37\x52\x6d"</div><div class='add'>+			"\x88\xa3\xbe\xd9\xf4\x0f\x2a\x45"</div><div class='add'>+			"\x60\x7b\x96\xb1\xcc\xe7\x02\x1d"</div><div class='add'>+			"\x38\x53\x6e\x89\xa4\xbf\xda\xf5"</div><div class='add'>+			"\x10\x2b\x46\x61\x7c\x97\xb2\xcd"</div><div class='add'>+			"\xe8\x03\x1e\x39\x54\x6f\x8a\xa5"</div><div class='add'>+			"\xc0\xdb\xf6\x11\x2c\x47\x62\x7d"</div><div class='add'>+			"\x98\xb3\xce\xe9\x04\x1f\x3a\x55"</div><div class='add'>+			"\x70\x8b\xa6\xc1\xdc\xf7\x12\x2d"</div><div class='add'>+			"\x48\x63\x7e\x99\xb4\xcf\xea\x05"</div><div class='add'>+			"\x20\x3b\x56\x71\x8c\xa7\xc2\xdd"</div><div class='add'>+			"\xf8\x13\x2e\x49\x64\x7f\x9a\xb5"</div><div class='add'>+			"\xd0\xeb\x06\x21\x3c\x57\x72\x8d"</div><div class='add'>+			"\xa8\xc3\xde\xf9\x14\x2f\x4a\x65"</div><div class='add'>+			"\x80\x9b\xb6\xd1\xec\x07\x22\x3d"</div><div class='add'>+			"\x58\x73\x8e\xa9\xc4\xdf\xfa\x15"</div><div class='add'>+			"\x30\x4b\x66\x81\x9c\xb7\xd2\xed"</div><div class='add'>+			"\x08\x23\x3e\x59\x74\x8f\xaa\xc5"</div><div class='add'>+			"\xe0\xfb\x16\x31\x4c\x67\x82\x9d"</div><div class='add'>+			"\xb8\xd3\xee\x09\x24\x3f\x5a\x75"</div><div class='add'>+			"\x90\xab\xc6\xe1\xfc\x17\x32\x4d"</div><div class='add'>+			"\x68\x83\x9e\xb9\xd4\xef\x0a\x25"</div><div class='add'>+			"\x40\x5b\x76\x91\xac\xc7\xe2\xfd"</div><div class='add'>+			"\x18\x33\x4e\x69\x84\x9f\xba\xd5"</div><div class='add'>+			"\xf0\x0b\x26\x41\x5c\x77\x92\xad"</div><div class='add'>+			"\xc8\xe3\xfe\x19\x34\x4f\x6a\x85"</div><div class='add'>+			"\xa0\xbb\xd6\xf1\x0c\x27\x42\x5d"</div><div class='add'>+			"\x78\x93\xae\xc9\xe4\xff\x1a\x35"</div><div class='add'>+			"\x50\x6b\x86\xa1\xbc\xd7\xf2\x0d"</div><div class='add'>+			"\x28\x43\x5e\x79\x94\xaf\xca\xe5"</div><div class='add'>+			"\x00\x1d\x3a\x57\x74\x91\xae\xcb"</div><div class='add'>+			"\xe8\x05\x22\x3f\x5c\x79\x96\xb3"</div><div class='add'>+			"\xd0\xed\x0a\x27\x44\x61\x7e\x9b"</div><div class='add'>+			"\xb8\xd5\xf2\x0f\x2c\x49\x66\x83"</div><div class='add'>+			"\xa0\xbd\xda\xf7\x14\x31\x4e\x6b"</div><div class='add'>+			"\x88\xa5\xc2\xdf\xfc\x19\x36\x53"</div><div class='add'>+			"\x70\x8d\xaa\xc7\xe4\x01\x1e\x3b"</div><div class='add'>+			"\x58\x75\x92\xaf\xcc\xe9\x06\x23"</div><div class='add'>+			"\x40\x5d\x7a\x97\xb4\xd1\xee\x0b"</div><div class='add'>+			"\x28\x45\x62\x7f\x9c\xb9\xd6\xf3"</div><div class='add'>+			"\x10\x2d\x4a\x67\x84\xa1\xbe\xdb"</div><div class='add'>+			"\xf8\x15\x32\x4f\x6c\x89\xa6\xc3"</div><div class='add'>+			"\xe0\xfd\x1a\x37\x54\x71\x8e\xab"</div><div class='add'>+			"\xc8\xe5\x02\x1f\x3c\x59\x76\x93"</div><div class='add'>+			"\xb0\xcd\xea\x07\x24\x41\x5e\x7b"</div><div class='add'>+			"\x98\xb5\xd2\xef\x0c\x29\x46\x63"</div><div class='add'>+			"\x80\x9d\xba\xd7\xf4\x11\x2e\x4b"</div><div class='add'>+			"\x68\x85\xa2\xbf\xdc\xf9\x16\x33"</div><div class='add'>+			"\x50\x6d\x8a\xa7\xc4\xe1\xfe\x1b"</div><div class='add'>+			"\x38\x55\x72\x8f\xac\xc9\xe6\x03"</div><div class='add'>+			"\x20\x3d\x5a\x77\x94\xb1\xce\xeb"</div><div class='add'>+			"\x08\x25\x42\x5f\x7c\x99\xb6\xd3"</div><div class='add'>+			"\xf0\x0d\x2a\x47\x64\x81\x9e\xbb"</div><div class='add'>+			"\xd8\xf5\x12\x2f\x4c\x69\x86\xa3"</div><div class='add'>+			"\xc0\xdd\xfa\x17\x34\x51\x6e\x8b"</div><div class='add'>+			"\xa8\xc5\xe2\xff\x1c\x39\x56\x73"</div><div class='add'>+			"\x90\xad\xca\xe7\x04\x21\x3e\x5b"</div><div class='add'>+			"\x78\x95\xb2\xcf\xec\x09\x26\x43"</div><div class='add'>+			"\x60\x7d\x9a\xb7\xd4\xf1\x0e\x2b"</div><div class='add'>+			"\x48\x65\x82\x9f\xbc\xd9\xf6\x13"</div><div class='add'>+			"\x30\x4d\x6a\x87\xa4\xc1\xde\xfb"</div><div class='add'>+			"\x18\x35\x52\x6f\x8c\xa9\xc6\xe3"</div><div class='add'>+			"\x00\x1f\x3e\x5d\x7c\x9b\xba\xd9"</div><div class='add'>+			"\xf8\x17\x36\x55\x74\x93\xb2\xd1"</div><div class='add'>+			"\xf0\x0f\x2e\x4d\x6c\x8b\xaa\xc9"</div><div class='add'>+			"\xe8\x07\x26\x45\x64\x83\xa2\xc1"</div><div class='add'>+			"\xe0\xff\x1e\x3d\x5c\x7b\x9a\xb9"</div><div class='add'>+			"\xd8\xf7\x16\x35\x54\x73\x92\xb1"</div><div class='add'>+			"\xd0\xef\x0e\x2d\x4c\x6b\x8a\xa9"</div><div class='add'>+			"\xc8\xe7\x06\x25\x44\x63\x82\xa1"</div><div class='add'>+			"\xc0\xdf\xfe\x1d\x3c\x5b\x7a\x99"</div><div class='add'>+			"\xb8\xd7\xf6\x15\x34\x53\x72\x91"</div><div class='add'>+			"\xb0\xcf\xee\x0d\x2c\x4b\x6a\x89"</div><div class='add'>+			"\xa8\xc7\xe6\x05\x24\x43\x62\x81"</div><div class='add'>+			"\xa0\xbf\xde\xfd\x1c\x3b\x5a\x79"</div><div class='add'>+			"\x98\xb7\xd6\xf5\x14\x33\x52\x71"</div><div class='add'>+			"\x90\xaf\xce\xed\x0c\x2b\x4a\x69"</div><div class='add'>+			"\x88\xa7\xc6\xe5\x04\x23\x42\x61"</div><div class='add'>+			"\x80\x9f\xbe\xdd\xfc\x1b\x3a\x59"</div><div class='add'>+			"\x78\x97\xb6\xd5\xf4\x13\x32\x51"</div><div class='add'>+			"\x70\x8f\xae\xcd\xec\x0b\x2a\x49"</div><div class='add'>+			"\x68\x87\xa6\xc5\xe4\x03\x22\x41"</div><div class='add'>+			"\x60\x7f\x9e\xbd\xdc\xfb\x1a\x39"</div><div class='add'>+			"\x58\x77\x96\xb5\xd4\xf3\x12\x31"</div><div class='add'>+			"\x50\x6f\x8e\xad\xcc\xeb\x0a\x29"</div><div class='add'>+			"\x48\x67\x86\xa5\xc4\xe3\x02\x21"</div><div class='add'>+			"\x40\x5f\x7e\x9d\xbc\xdb\xfa\x19"</div><div class='add'>+			"\x38\x57\x76\x95\xb4\xd3\xf2\x11"</div><div class='add'>+			"\x30\x4f\x6e\x8d\xac\xcb\xea\x09"</div><div class='add'>+			"\x28\x47\x66\x85\xa4\xc3\xe2\x01"</div><div class='add'>+			"\x20\x3f\x5e\x7d\x9c\xbb\xda\xf9"</div><div class='add'>+			"\x18\x37\x56\x75\x94\xb3\xd2\xf1"</div><div class='add'>+			"\x10\x2f\x4e\x6d\x8c\xab\xca\xe9"</div><div class='add'>+			"\x08\x27\x46\x65\x84\xa3\xc2\xe1"</div><div class='add'>+			"\x00\x21\x42\x63",</div><div class='add'>+		.ilen = 4100,</div><div class='add'>+		.result =</div><div class='add'>+			"\xf0\x5c\x74\xad\x4e\xbc\x99\xe2"</div><div class='add'>+			"\xae\xff\x91\x3a\x44\xcf\x38\x32"</div><div class='add'>+			"\x1e\xad\xa7\xcd\xa1\x39\x95\xaa"</div><div class='add'>+			"\x10\xb1\xb3\x2e\x04\x31\x8f\x86"</div><div class='add'>+			"\xf2\x62\x74\x70\x0c\xa4\x46\x08"</div><div class='add'>+			"\xa8\xb7\x99\xa8\xe9\xd2\x73\x79"</div><div class='add'>+			"\x7e\x6e\xd4\x8f\x1e\xc7\x8e\x31"</div><div class='add'>+			"\x0b\xfa\x4b\xce\xfd\xf3\x57\x71"</div><div class='add'>+			"\xe9\x46\x03\xa5\x3d\x34\x00\xe2"</div><div class='add'>+			"\x18\xff\x75\x6d\x06\x2d\x00\xab"</div><div class='add'>+			"\xb9\x3e\x6c\x59\xc5\x84\x06\xb5"</div><div class='add'>+			"\x8b\xd0\x89\x9c\x4a\x79\x16\xc6"</div><div class='add'>+			"\x3d\x74\x54\xfa\x44\xcd\x23\x26"</div><div class='add'>+			"\x5c\xcf\x7e\x28\x92\x32\xbf\xdf"</div><div class='add'>+			"\xa7\x20\x3c\x74\x58\x2a\x9a\xde"</div><div class='add'>+			"\x61\x00\x1c\x4f\xff\x59\xc4\x22"</div><div class='add'>+			"\xac\x3c\xd0\xe8\x6c\xf9\x97\x1b"</div><div class='add'>+			"\x58\x9b\xad\x71\xe8\xa9\xb5\x0d"</div><div class='add'>+			"\xee\x2f\x04\x1f\x7f\xbc\x99\xee"</div><div class='add'>+			"\x84\xff\x42\x60\xdc\x3a\x18\xa5"</div><div class='add'>+			"\x81\xf9\xef\xdc\x7a\x0f\x65\x41"</div><div class='add'>+			"\x2f\xa3\xd3\xf9\xc2\xcb\xc0\x4d"</div><div class='add'>+			"\x8f\xd3\x76\x96\xad\x49\x6d\x38"</div><div class='add'>+			"\x3d\x39\x0b\x6c\x80\xb7\x54\x69"</div><div class='add'>+			"\xf0\x2c\x90\x02\x29\x0d\x1c\x12"</div><div class='add'>+			"\xad\x55\xc3\x8b\x68\xd9\xcc\xb3"</div><div class='add'>+			"\xb2\x64\x33\x90\x5e\xca\x4b\xe2"</div><div class='add'>+			"\xfb\x75\xdc\x63\xf7\x9f\x82\x74"</div><div class='add'>+			"\xf0\xc9\xaa\x7f\xe9\x2a\x9b\x33"</div><div class='add'>+			"\xbc\x88\x00\x7f\xca\xb2\x1f\x14"</div><div class='add'>+			"\xdb\xc5\x8e\x7b\x11\x3c\x3e\x08"</div><div class='add'>+			"\xf3\x83\xe8\xe0\x94\x86\x2e\x92"</div><div class='add'>+			"\x78\x6b\x01\xc9\xc7\x83\xba\x21"</div><div class='add'>+			"\x6a\x25\x15\x33\x4e\x45\x08\xec"</div><div class='add'>+			"\x35\xdb\xe0\x6e\x31\x51\x79\xa9"</div><div class='add'>+			"\x42\x44\x65\xc1\xa0\xf1\xf9\x2a"</div><div class='add'>+			"\x70\xd5\xb6\xc6\xc1\x8c\x39\xfc"</div><div class='add'>+			"\x25\xa6\x55\xd9\xdd\x2d\x4c\xec"</div><div class='add'>+			"\x49\xc6\xeb\x0e\xa8\x25\x2a\x16"</div><div class='add'>+			"\x1b\x66\x84\xda\xe2\x92\xe5\xc0"</div><div class='add'>+			"\xc8\x53\x07\xaf\x80\x84\xec\xfd"</div><div class='add'>+			"\xcd\xd1\x6e\xcd\x6f\x6a\xf5\x36"</div><div class='add'>+			"\xc5\x15\xe5\x25\x7d\x77\xd1\x1a"</div><div class='add'>+			"\x93\x36\xa9\xcf\x7c\xa4\x54\x4a"</div><div class='add'>+			"\x06\x51\x48\x4e\xf6\x59\x87\xd2"</div><div class='add'>+			"\x04\x02\xef\xd3\x44\xde\x76\x31"</div><div class='add'>+			"\xb3\x34\x17\x1b\x9d\x66\x11\x9f"</div><div class='add'>+			"\x1e\xcc\x17\xe9\xc7\x3c\x1b\xe7"</div><div class='add'>+			"\xcb\x50\x08\xfc\xdc\x2b\x24\xdb"</div><div class='add'>+			"\x65\x83\xd0\x3b\xe3\x30\xea\x94"</div><div class='add'>+			"\x6c\xe7\xe8\x35\x32\xc7\xdb\x64"</div><div class='add'>+			"\xb4\x01\xab\x36\x2c\x77\x13\xaf"</div><div class='add'>+			"\xf8\x2b\x88\x3f\x54\x39\xc4\x44"</div><div class='add'>+			"\xfe\xef\x6f\x68\x34\xbe\x0f\x05"</div><div class='add'>+			"\x16\x6d\xf6\x0a\x30\xe7\xe3\xed"</div><div class='add'>+			"\xc4\xde\x3c\x1b\x13\xd8\xdb\xfe"</div><div class='add'>+			"\x41\x62\xe5\x28\xd4\x8d\xa3\xc7"</div><div class='add'>+			"\x93\x97\xc6\x48\x45\x1d\x9f\x83"</div><div class='add'>+			"\xdf\x4b\x40\x3e\x42\x25\x87\x80"</div><div class='add'>+			"\x4c\x7d\xa8\xd4\x98\x23\x95\x75"</div><div class='add'>+			"\x41\x8c\xda\x41\x9b\xd4\xa7\x06"</div><div class='add'>+			"\xb5\xf1\x71\x09\x53\xbe\xca\xbf"</div><div class='add'>+			"\x32\x03\xed\xf0\x50\x1c\x56\x39"</div><div class='add'>+			"\x5b\xa4\x75\x18\xf7\x9b\x58\xef"</div><div class='add'>+			"\x53\xfc\x2a\x38\x23\x15\x75\xcd"</div><div class='add'>+			"\x45\xe5\x5a\x82\x55\xba\x21\xfa"</div><div class='add'>+			"\xd4\xbd\xc6\x94\x7c\xc5\x80\x12"</div><div class='add'>+			"\xf7\x4b\x32\xc4\x9a\x82\xd8\x28"</div><div class='add'>+			"\x8f\xd9\xc2\x0f\x60\x03\xbe\x5e"</div><div class='add'>+			"\x21\xd6\x5f\x58\xbf\x5c\xb1\x32"</div><div class='add'>+			"\x82\x8d\xa9\xe5\xf2\x66\x1a\xc0"</div><div class='add'>+			"\xa0\xbc\x58\x2f\x71\xf5\x2f\xed"</div><div class='add'>+			"\xd1\x26\xb9\xd8\x49\x5a\x07\x19"</div><div class='add'>+			"\x01\x7c\x59\xb0\xf8\xa4\xb7\xd3"</div><div class='add'>+			"\x7b\x1a\x8c\x38\xf4\x50\xa4\x59"</div><div class='add'>+			"\xb0\xcc\x41\x0b\x88\x7f\xe5\x31"</div><div class='add'>+			"\xb3\x42\xba\xa2\x7e\xd4\x32\x71"</div><div class='add'>+			"\x45\x87\x48\xa9\xc2\xf2\x89\xb3"</div><div class='add'>+			"\xe4\xa7\x7e\x52\x15\x61\xfa\xfe"</div><div class='add'>+			"\xc9\xdd\x81\xeb\x13\xab\xab\xc3"</div><div class='add'>+			"\x98\x59\xd8\x16\x3d\x14\x7a\x1c"</div><div class='add'>+			"\x3c\x41\x9a\x16\x16\x9b\xd2\xd2"</div><div class='add'>+			"\x69\x3a\x29\x23\xac\x86\x32\xa5"</div><div class='add'>+			"\x48\x9c\x9e\xf3\x47\x77\x81\x70"</div><div class='add'>+			"\x24\xe8\x85\xd2\xf5\xb5\xfa\xff"</div><div class='add'>+			"\x59\x6a\xd3\x50\x59\x43\x59\xde"</div><div class='add'>+			"\xd9\xf1\x55\xa5\x0c\xc3\x1a\x1a"</div><div class='add'>+			"\x18\x34\x0d\x1a\x63\x33\xed\x10"</div><div class='add'>+			"\xe0\x1d\x2a\x18\xd2\xc0\x54\xa8"</div><div class='add'>+			"\xca\xb5\x9a\xd3\xdd\xca\x45\x84"</div><div class='add'>+			"\x50\xe7\x0f\xfe\xa4\x99\x5a\xbe"</div><div class='add'>+			"\x43\x2d\x9a\xcb\x92\x3f\x5a\x1d"</div><div class='add'>+			"\x85\xd8\xc9\xdf\x68\xc9\x12\x80"</div><div class='add'>+			"\x56\x0c\xdc\x00\xdc\x3a\x7d\x9d"</div><div class='add'>+			"\xa3\xa2\xe8\x4d\xbf\xf9\x70\xa0"</div><div class='add'>+			"\xa4\x13\x4f\x6b\xaf\x0a\x89\x7f"</div><div class='add'>+			"\xda\xf0\xbf\x9b\xc8\x1d\xe5\xf8"</div><div class='add'>+			"\x2e\x8b\x07\xb5\x73\x1b\xcc\xa2"</div><div class='add'>+			"\xa6\xad\x30\xbc\x78\x3c\x5b\x10"</div><div class='add'>+			"\xfa\x5e\x62\x2d\x9e\x64\xb3\x33"</div><div class='add'>+			"\xce\xf9\x1f\x86\xe7\x8b\xa2\xb8"</div><div class='add'>+			"\xe8\x99\x57\x8c\x11\xed\x66\xd9"</div><div class='add'>+			"\x3c\x72\xb9\xc3\xe6\x4e\x17\x3a"</div><div class='add'>+			"\x6a\xcb\x42\x24\x06\xed\x3e\x4e"</div><div class='add'>+			"\xa3\xe8\x6a\x94\xda\x0d\x4e\xd5"</div><div class='add'>+			"\x14\x19\xcf\xb6\x26\xd8\x2e\xcc"</div><div class='add'>+			"\x64\x76\x38\x49\x4d\xfe\x30\x6d"</div><div class='add'>+			"\xe4\xc8\x8c\x7b\xc4\xe0\x35\xba"</div><div class='add'>+			"\x22\x6e\x76\xe1\x1a\xf2\x53\xc3"</div><div class='add'>+			"\x28\xa2\x82\x1f\x61\x69\xad\xc1"</div><div class='add'>+			"\x7b\x28\x4b\x1e\x6c\x85\x95\x9b"</div><div class='add'>+			"\x51\xb5\x17\x7f\x12\x69\x8c\x24"</div><div class='add'>+			"\xd5\xc7\x5a\x5a\x11\x54\xff\x5a"</div><div class='add'>+			"\xf7\x16\xc3\x91\xa6\xf0\xdc\x0a"</div><div class='add'>+			"\xb6\xa7\x4a\x0d\x7a\x58\xfe\xa5"</div><div class='add'>+			"\xf5\xcb\x8f\x7b\x0e\xea\x57\xe7"</div><div class='add'>+			"\xbd\x79\xd6\x1c\x88\x23\x6c\xf2"</div><div class='add'>+			"\x4d\x29\x77\x53\x35\x6a\x00\x8d"</div><div class='add'>+			"\xcd\xa3\x58\xbe\x77\x99\x18\xf8"</div><div class='add'>+			"\xe6\xe1\x8f\xe9\x37\x8f\xe3\xe2"</div><div class='add'>+			"\x5a\x8a\x93\x25\xaf\xf3\x78\x80"</div><div class='add'>+			"\xbe\xa6\x1b\xc6\xac\x8b\x1c\x91"</div><div class='add'>+			"\x58\xe1\x9f\x89\x35\x9d\x1d\x21"</div><div class='add'>+			"\x29\x9f\xf4\x99\x02\x27\x0f\xa8"</div><div class='add'>+			"\x4f\x79\x94\x2b\x33\x2c\xda\xa2"</div><div class='add'>+			"\x26\x39\x83\x94\xef\x27\xd8\x53"</div><div class='add'>+			"\x8f\x66\x0d\xe4\x41\x7d\x34\xcd"</div><div class='add'>+			"\x43\x7c\x95\x0a\x53\xef\x66\xda"</div><div class='add'>+			"\x7e\x9b\xf3\x93\xaf\xd0\x73\x71"</div><div class='add'>+			"\xba\x40\x9b\x74\xf8\xd7\xd7\x41"</div><div class='add'>+			"\x6d\xaf\x72\x9c\x8d\x21\x87\x3c"</div><div class='add'>+			"\xfd\x0a\x90\xa9\x47\x96\x9e\xd3"</div><div class='add'>+			"\x88\xee\x73\xcf\x66\x2f\x52\x56"</div><div class='add'>+			"\x6d\xa9\x80\x4c\xe2\x6f\x62\x88"</div><div class='add'>+			"\x3f\x0e\x54\x17\x48\x80\x5d\xd3"</div><div class='add'>+			"\xc3\xda\x25\x3d\xa1\xc8\xcb\x9f"</div><div class='add'>+			"\x9b\x70\xb3\xa1\xeb\x04\x52\xa1"</div><div class='add'>+			"\xf2\x22\x0f\xfc\xc8\x18\xfa\xf9"</div><div class='add'>+			"\x85\x9c\xf1\xac\xeb\x0c\x02\x46"</div><div class='add'>+			"\x75\xd2\xf5\x2c\xe3\xd2\x59\x94"</div><div class='add'>+			"\x12\xf3\x3c\xfc\xd7\x92\xfa\x36"</div><div class='add'>+			"\xba\x61\x34\x38\x7c\xda\x48\x3e"</div><div class='add'>+			"\x08\xc9\x39\x23\x5e\x02\x2c\x1a"</div><div class='add'>+			"\x18\x7e\xb4\xd9\xfd\x9e\x40\x02"</div><div class='add'>+			"\xb1\x33\x37\x32\xe7\xde\xd6\xd0"</div><div class='add'>+			"\x7c\x58\x65\x4b\xf8\x34\x27\x9c"</div><div class='add'>+			"\x44\xb4\xbd\xe9\xe9\x4c\x78\x7d"</div><div class='add'>+			"\x4b\x9f\xce\xb1\xcd\x47\xa5\x37"</div><div class='add'>+			"\xe5\x6d\xbd\xb9\x43\x94\x0a\xd4"</div><div class='add'>+			"\xd6\xf9\x04\x5f\xb5\x66\x6c\x1a"</div><div class='add'>+			"\x35\x12\xe3\x36\x28\x27\x36\x58"</div><div class='add'>+			"\x01\x2b\x79\xe4\xba\x6d\x10\x7d"</div><div class='add'>+			"\x65\xdf\x84\x95\xf4\xd5\xb6\x8f"</div><div class='add'>+			"\x2b\x9f\x96\x00\x86\x60\xf0\x21"</div><div class='add'>+			"\x76\xa8\x6a\x8c\x28\x1c\xb3\x6b"</div><div class='add'>+			"\x97\xd7\xb6\x53\x2a\xcc\xab\x40"</div><div class='add'>+			"\x9d\x62\x79\x58\x52\xe6\x65\xb7"</div><div class='add'>+			"\xab\x55\x67\x9c\x89\x7c\x03\xb0"</div><div class='add'>+			"\x73\x59\xc5\x81\xf5\x18\x17\x5c"</div><div class='add'>+			"\x89\xf3\x78\x35\x44\x62\x78\x72"</div><div class='add'>+			"\xd0\x96\xeb\x31\xe7\x87\x77\x14"</div><div class='add'>+			"\x99\x51\xf2\x59\x26\x9e\xb5\xa6"</div><div class='add'>+			"\x45\xfe\x6e\xbd\x07\x4c\x94\x5a"</div><div class='add'>+			"\xa5\x7d\xfc\xf1\x2b\x77\xe2\xfe"</div><div class='add'>+			"\x17\xd4\x84\xa0\xac\xb5\xc7\xda"</div><div class='add'>+			"\xa9\x1a\xb6\xf3\x74\x11\xb4\x9d"</div><div class='add'>+			"\xfb\x79\x2e\x04\x2d\x50\x28\x83"</div><div class='add'>+			"\xbf\xc6\x52\xd3\x34\xd6\xe8\x7a"</div><div class='add'>+			"\xb6\xea\xe7\xa8\x6c\x15\x1e\x2c"</div><div class='add'>+			"\x57\xbc\x48\x4e\x5f\x5c\xb6\x92"</div><div class='add'>+			"\xd2\x49\x77\x81\x6d\x90\x70\xae"</div><div class='add'>+			"\x98\xa1\x03\x0d\x6b\xb9\x77\x14"</div><div class='add'>+			"\xf1\x4e\x23\xd3\xf8\x68\xbd\xc2"</div><div class='add'>+			"\xfe\x04\xb7\x5c\xc5\x17\x60\x8f"</div><div class='add'>+			"\x65\x54\xa4\x7a\x42\xdc\x18\x0d"</div><div class='add'>+			"\xb5\xcf\x0f\xd3\xc7\x91\x66\x1b"</div><div class='add'>+			"\x45\x42\x27\x75\x50\xe5\xee\xb8"</div><div class='add'>+			"\x7f\x33\x2c\xba\x4a\x92\x4d\x2c"</div><div class='add'>+			"\x3c\xe3\x0d\x80\x01\xba\x0d\x29"</div><div class='add'>+			"\xd8\x3c\xe9\x13\x16\x57\xe6\xea"</div><div class='add'>+			"\x94\x52\xe7\x00\x4d\x30\xb0\x0f"</div><div class='add'>+			"\x35\xb8\xb8\xa7\xb1\xb5\x3b\x44"</div><div class='add'>+			"\xe1\x2f\xfd\x88\xed\x43\xe7\x52"</div><div class='add'>+			"\x10\x93\xb3\x8a\x30\x6b\x0a\xf7"</div><div class='add'>+			"\x23\xc6\x50\x9d\x4a\xb0\xde\xc3"</div><div class='add'>+			"\xdc\x9b\x2f\x01\x56\x36\x09\xc5"</div><div class='add'>+			"\x2f\x6b\xfe\xf1\xd8\x27\x45\x03"</div><div class='add'>+			"\x30\x5e\x5c\x5b\xb4\x62\x0e\x1a"</div><div class='add'>+			"\xa9\x21\x2b\x92\x94\x87\x62\x57"</div><div class='add'>+			"\x4c\x10\x74\x1a\xf1\x0a\xc5\x84"</div><div class='add'>+			"\x3b\x9e\x72\x02\xd7\xcc\x09\x56"</div><div class='add'>+			"\xbd\x54\xc1\xf0\xc3\xe3\xb3\xf8"</div><div class='add'>+			"\xd2\x0d\x61\xcb\xef\xce\x0d\x05"</div><div class='add'>+			"\xb0\x98\xd9\x8e\x4f\xf9\xbc\x93"</div><div class='add'>+			"\xa6\xea\xc8\xcf\x10\x53\x4b\xf1"</div><div class='add'>+			"\xec\xfc\x89\xf9\x64\xb0\x22\xbf"</div><div class='add'>+			"\x9e\x55\x46\x9f\x7c\x50\x8e\x84"</div><div class='add'>+			"\x54\x20\x98\xd7\x6c\x40\x1e\xdb"</div><div class='add'>+			"\x69\x34\x78\x61\x24\x21\x9c\x8a"</div><div class='add'>+			"\xb3\x62\x31\x8b\x6e\xf5\x2a\x35"</div><div class='add'>+			"\x86\x13\xb1\x6c\x64\x2e\x41\xa5"</div><div class='add'>+			"\x05\xf2\x42\xba\xd2\x3a\x0d\x8e"</div><div class='add'>+			"\x8a\x59\x94\x3c\xcf\x36\x27\x82"</div><div class='add'>+			"\xc2\x45\xee\x58\xcd\x88\xb4\xec"</div><div class='add'>+			"\xde\xb2\x96\x0a\xaf\x38\x6f\x88"</div><div class='add'>+			"\xd7\xd8\xe1\xdf\xb9\x96\xa9\x0a"</div><div class='add'>+			"\xb1\x95\x28\x86\x20\xe9\x17\x49"</div><div class='add'>+			"\xa2\x29\x38\xaa\xa5\xe9\x6e\xf1"</div><div class='add'>+			"\x19\x27\xc0\xd5\x2a\x22\xc3\x0b"</div><div class='add'>+			"\xdb\x7c\x73\x10\xb9\xba\x89\x76"</div><div class='add'>+			"\x54\xae\x7d\x71\xb3\x93\xf6\x32"</div><div class='add'>+			"\xe6\x47\x43\x55\xac\xa0\x0d\xc2"</div><div class='add'>+			"\x93\x27\x4a\x8e\x0e\x74\x15\xc7"</div><div class='add'>+			"\x0b\x85\xd9\x0c\xa9\x30\x7a\x3e"</div><div class='add'>+			"\xea\x8f\x85\x6d\x3a\x12\x4f\x72"</div><div class='add'>+			"\x69\x58\x7a\x80\xbb\xb5\x97\xf3"</div><div class='add'>+			"\xcf\x70\xd2\x5d\xdd\x4d\x21\x79"</div><div class='add'>+			"\x54\x4d\xe4\x05\xe8\xbd\xc2\x62"</div><div class='add'>+			"\xb1\x3b\x77\x1c\xd6\x5c\xf3\xa0"</div><div class='add'>+			"\x79\x00\xa8\x6c\x29\xd9\x18\x24"</div><div class='add'>+			"\x36\xa2\x46\xc0\x96\x65\x7f\xbd"</div><div class='add'>+			"\x2a\xed\x36\x16\x0c\xaa\x9f\xf4"</div><div class='add'>+			"\xc5\xb4\xe2\x12\xed\x69\xed\x4f"</div><div class='add'>+			"\x26\x2c\x39\x52\x89\x98\xe7\x2c"</div><div class='add'>+			"\x99\xa4\x9e\xa3\x9b\x99\x46\x7a"</div><div class='add'>+			"\x3a\xdc\xa8\x59\xa3\xdb\xc3\x3b"</div><div class='add'>+			"\x95\x0d\x3b\x09\x6e\xee\x83\x5d"</div><div class='add'>+			"\x32\x4d\xed\xab\xfa\x98\x14\x4e"</div><div class='add'>+			"\xc3\x15\x45\x53\x61\xc4\x93\xbd"</div><div class='add'>+			"\x90\xf4\x99\x95\x4c\xe6\x76\x92"</div><div class='add'>+			"\x29\x90\x46\x30\x92\x69\x7d\x13"</div><div class='add'>+			"\xf2\xa5\xcd\x69\x49\x44\xb2\x0f"</div><div class='add'>+			"\x63\x40\x36\x5f\x09\xe2\x78\xf8"</div><div class='add'>+			"\x91\xe3\xe2\xfa\x10\xf7\xc8\x24"</div><div class='add'>+			"\xa8\x89\x32\x5c\x37\x25\x1d\xb2"</div><div class='add'>+			"\xea\x17\x8a\x0a\xa9\x64\xc3\x7c"</div><div class='add'>+			"\x3c\x7c\xbd\xc6\x79\x34\xe7\xe2"</div><div class='add'>+			"\x85\x8e\xbf\xf8\xde\x92\xa0\xae"</div><div class='add'>+			"\x20\xc4\xf6\xbb\x1f\x38\x19\x0e"</div><div class='add'>+			"\xe8\x79\x9c\xa1\x23\xe9\x54\x7e"</div><div class='add'>+			"\x37\x2f\xe2\x94\x32\xaf\xa0\x23"</div><div class='add'>+			"\x49\xe4\xc0\xb3\xac\x00\x8f\x36"</div><div class='add'>+			"\x05\xc4\xa6\x96\xec\x05\x98\x4f"</div><div class='add'>+			"\x96\x67\x57\x1f\x20\x86\x1b\x2d"</div><div class='add'>+			"\x69\xe4\x29\x93\x66\x5f\xaf\x6b"</div><div class='add'>+			"\x88\x26\x2c\x67\x02\x4b\x52\xd0"</div><div class='add'>+			"\x83\x7a\x43\x1f\xc0\x71\x15\x25"</div><div class='add'>+			"\x77\x65\x08\x60\x11\x76\x4c\x8d"</div><div class='add'>+			"\xed\xa9\x27\xc6\xb1\x2a\x2c\x6a"</div><div class='add'>+			"\x4a\x97\xf5\xc6\xb7\x70\x42\xd3"</div><div class='add'>+			"\x03\xd1\x24\x95\xec\x6d\xab\x38"</div><div class='add'>+			"\x72\xce\xe2\x8b\x33\xd7\x51\x09"</div><div class='add'>+			"\xdc\x45\xe0\x09\x96\x32\xf3\xc4"</div><div class='add'>+			"\x84\xdc\x73\x73\x2d\x1b\x11\x98"</div><div class='add'>+			"\xc5\x0e\x69\x28\x94\xc7\xb5\x4d"</div><div class='add'>+			"\xc8\x8a\xd0\xaa\x13\x2e\x18\x74"</div><div class='add'>+			"\xdd\xd1\x1e\xf3\x90\xe8\xfc\x9a"</div><div class='add'>+			"\x72\x4a\x0e\xd1\xe4\xfb\x0d\x96"</div><div class='add'>+			"\xd1\x0c\x79\x85\x1b\x1c\xfe\xe1"</div><div class='add'>+			"\x62\x8f\x7a\x73\x32\xab\xc8\x18"</div><div class='add'>+			"\x69\xe3\x34\x30\xdf\x13\xa6\xe5"</div><div class='add'>+			"\xe8\x0e\x67\x7f\x81\x11\xb4\x60"</div><div class='add'>+			"\xc7\xbd\x79\x65\x50\xdc\xc4\x5b"</div><div class='add'>+			"\xde\x39\xa4\x01\x72\x63\xf3\xd1"</div><div class='add'>+			"\x64\x4e\xdf\xfc\x27\x92\x37\x0d"</div><div class='add'>+			"\x57\xcd\x11\x4f\x11\x04\x8e\x1d"</div><div class='add'>+			"\x16\xf7\xcd\x92\x9a\x99\x30\x14"</div><div class='add'>+			"\xf1\x7c\x67\x1b\x1f\x41\x0b\xe8"</div><div class='add'>+			"\x32\xe8\xb8\xc1\x4f\x54\x86\x4f"</div><div class='add'>+			"\xe5\x79\x81\x73\xcd\x43\x59\x68"</div><div class='add'>+			"\x73\x02\x3b\x78\x21\x72\x43\x00"</div><div class='add'>+			"\x49\x17\xf7\x00\xaf\x68\x24\x53"</div><div class='add'>+			"\x05\x0a\xc3\x33\xe0\x33\x3f\x69"</div><div class='add'>+			"\xd2\x84\x2f\x0b\xed\xde\x04\xf4"</div><div class='add'>+			"\x11\x94\x13\x69\x51\x09\x28\xde"</div><div class='add'>+			"\x57\x5c\xef\xdc\x9a\x49\x1c\x17"</div><div class='add'>+			"\x97\xf3\x96\xc1\x7f\x5d\x2e\x7d"</div><div class='add'>+			"\x55\xb8\xb3\x02\x09\xb3\x1f\xe7"</div><div class='add'>+			"\xc9\x8d\xa3\x36\x34\x8a\x77\x13"</div><div class='add'>+			"\x30\x63\x4c\xa5\xcd\xc3\xe0\x7e"</div><div class='add'>+			"\x05\xa1\x7b\x0c\xcb\x74\x47\x31"</div><div class='add'>+			"\x62\x03\x43\xf1\x87\xb4\xb0\x85"</div><div class='add'>+			"\x87\x8e\x4b\x25\xc7\xcf\xae\x4b"</div><div class='add'>+			"\x36\x46\x3e\x62\xbc\x6f\xeb\x5f"</div><div class='add'>+			"\x73\xac\xe6\x07\xee\xc1\xa1\xd6"</div><div class='add'>+			"\xc4\xab\xc9\xd6\x89\x45\xe1\xf1"</div><div class='add'>+			"\x04\x4e\x1a\x6f\xbb\x4f\x3a\xa3"</div><div class='add'>+			"\xa0\xcb\xa3\x0a\xd8\x71\x35\x55"</div><div class='add'>+			"\xe4\xbc\x2e\x04\x06\xe6\xff\x5b"</div><div class='add'>+			"\x1c\xc0\x11\x7c\xc5\x17\xf3\x38"</div><div class='add'>+			"\xcf\xe9\xba\x0f\x0e\xef\x02\xc2"</div><div class='add'>+			"\x8d\xc6\xbc\x4b\x67\x20\x95\xd7"</div><div class='add'>+			"\x2c\x45\x5b\x86\x44\x8c\x6f\x2e"</div><div class='add'>+			"\x7e\x9f\x1c\x77\xba\x6b\x0e\xa3"</div><div class='add'>+			"\x69\xdc\xab\x24\x57\x60\x47\xc1"</div><div class='add'>+			"\xd1\xa5\x9d\x23\xe6\xb1\x37\xfe"</div><div class='add'>+			"\x93\xd2\x4c\x46\xf9\x0c\xc6\xfb"</div><div class='add'>+			"\xd6\x9d\x99\x69\xab\x7a\x07\x0c"</div><div class='add'>+			"\x65\xe7\xc4\x08\x96\xe2\xa5\x01"</div><div class='add'>+			"\x3f\x46\x07\x05\x7e\xe8\x9a\x90"</div><div class='add'>+			"\x50\xdc\xe9\x7a\xea\xa1\x39\x6e"</div><div class='add'>+			"\x66\xe4\x6f\xa5\x5f\xb2\xd9\x5b"</div><div class='add'>+			"\xf5\xdb\x2a\x32\xf0\x11\x6f\x7c"</div><div class='add'>+			"\x26\x10\x8f\x3d\x80\xe9\x58\xf7"</div><div class='add'>+			"\xe0\xa8\x57\xf8\xdb\x0e\xce\x99"</div><div class='add'>+			"\x63\x19\x3d\xd5\xec\x1b\x77\x69"</div><div class='add'>+			"\x98\xf6\xe4\x5f\x67\x17\x4b\x09"</div><div class='add'>+			"\x85\x62\x82\x70\x18\xe2\x9a\x78"</div><div class='add'>+			"\xe2\x62\xbd\xb4\xf1\x42\xc6\xfb"</div><div class='add'>+			"\x08\xd0\xbd\xeb\x4e\x09\xf2\xc8"</div><div class='add'>+			"\x1e\xdc\x3d\x32\x21\x56\x9c\x4f"</div><div class='add'>+			"\x35\xf3\x61\x06\x72\x84\xc4\x32"</div><div class='add'>+			"\xf2\xf1\xfa\x0b\x2f\xc3\xdb\x02"</div><div class='add'>+			"\x04\xc2\xde\x57\x64\x60\x8d\xcf"</div><div class='add'>+			"\xcb\x86\x5d\x97\x3e\xb1\x9c\x01"</div><div class='add'>+			"\xd6\x28\x8f\x99\xbc\x46\xeb\x05"</div><div class='add'>+			"\xaf\x7e\xb8\x21\x2a\x56\x85\x1c"</div><div class='add'>+			"\xb3\x71\xa0\xde\xca\x96\xf1\x78"</div><div class='add'>+			"\x49\xa2\x99\x81\x80\x5c\x01\xf5"</div><div class='add'>+			"\xa0\xa2\x56\x63\xe2\x70\x07\xa5"</div><div class='add'>+			"\x95\xd6\x85\xeb\x36\x9e\xa9\x51"</div><div class='add'>+			"\x66\x56\x5f\x1d\x02\x19\xe2\xf6"</div><div class='add'>+			"\x4f\x73\x38\x09\x75\x64\x48\xe0"</div><div class='add'>+			"\xf1\x7e\x0e\xe8\x9d\xf9\xed\x94"</div><div class='add'>+			"\xfe\x16\x26\x62\x49\x74\xf4\xb0"</div><div class='add'>+			"\xd4\xa9\x6c\xb0\xfd\x53\xe9\x81"</div><div class='add'>+			"\xe0\x7a\xbf\xcf\xb5\xc4\x01\x81"</div><div class='add'>+			"\x79\x99\x77\x01\x3b\xe9\xa2\xb6"</div><div class='add'>+			"\xe6\x6a\x8a\x9e\x56\x1c\x8d\x1e"</div><div class='add'>+			"\x8f\x06\x55\x2c\x6c\xdc\x92\x87"</div><div class='add'>+			"\x64\x3b\x4b\x19\xa1\x13\x64\x1d"</div><div class='add'>+			"\x4a\xe9\xc0\x00\xb8\x95\xef\x6b"</div><div class='add'>+			"\x1a\x86\x6d\x37\x52\x02\xc2\xe0"</div><div class='add'>+			"\xc8\xbb\x42\x0c\x02\x21\x4a\xc9"</div><div class='add'>+			"\xef\xa0\x54\xe4\x5e\x16\x53\x81"</div><div class='add'>+			"\x70\x62\x10\xaf\xde\xb8\xb5\xd3"</div><div class='add'>+			"\xe8\x5e\x6c\xc3\x8a\x3e\x18\x07"</div><div class='add'>+			"\xf2\x2f\x7d\xa7\xe1\x3d\x4e\xb4"</div><div class='add'>+			"\x26\xa7\xa3\x93\x86\xb2\x04\x1e"</div><div class='add'>+			"\x53\x5d\x86\xd6\xde\x65\xca\xe3"</div><div class='add'>+			"\x4e\xc1\xcf\xef\xc8\x70\x1b\x83"</div><div class='add'>+			"\x13\xdd\x18\x8b\x0d\x76\xd2\xf6"</div><div class='add'>+			"\x37\x7a\x93\x7a\x50\x11\x9f\x96"</div><div class='add'>+			"\x86\x25\xfd\xac\xdc\xbe\x18\x93"</div><div class='add'>+			"\x19\x6b\xec\x58\x4f\xb9\x75\xa7"</div><div class='add'>+			"\xdd\x3f\x2f\xec\xc8\x5a\x84\xab"</div><div class='add'>+			"\xd5\xe4\x8a\x07\xf6\x4d\x23\xd6"</div><div class='add'>+			"\x03\xfb\x03\x6a\xea\x66\xbf\xd4"</div><div class='add'>+			"\xb1\x34\xfb\x78\xe9\x55\xdc\x7c"</div><div class='add'>+			"\x3d\x9c\xe5\x9a\xac\xc3\x7a\x80"</div><div class='add'>+			"\x24\x6d\xa0\xef\x25\x7c\xb7\xea"</div><div class='add'>+			"\xce\x4d\x5f\x18\x60\xce\x87\x22"</div><div class='add'>+			"\x66\x2f\xd5\xdd\xdd\x02\x21\x75"</div><div class='add'>+			"\x82\xa0\x1f\x58\xc6\xd3\x62\xf7"</div><div class='add'>+			"\x32\xd8\xaf\x1e\x07\x77\x51\x96"</div><div class='add'>+			"\xd5\x6b\x1e\x7e\x80\x02\xe8\x67"</div><div class='add'>+			"\xea\x17\x0b\x10\xd2\x3f\x28\x25"</div><div class='add'>+			"\x4f\x05\x77\x02\x14\x69\xf0\x2c"</div><div class='add'>+			"\xbe\x0c\xf1\x74\x30\xd1\xb9\x9b"</div><div class='add'>+			"\xfc\x8c\xbb\x04\x16\xd9\xba\xc3"</div><div class='add'>+			"\xbc\x91\x8a\xc4\x30\xa4\xb0\x12"</div><div class='add'>+			"\x4c\x21\x87\xcb\xc9\x1d\x16\x96"</div><div class='add'>+			"\x07\x6f\x23\x54\xb9\x6f\x79\xe5"</div><div class='add'>+			"\x64\xc0\x64\xda\xb1\xae\xdd\x60"</div><div class='add'>+			"\x6c\x1a\x9d\xd3\x04\x8e\x45\xb0"</div><div class='add'>+			"\x92\x61\xd0\x48\x81\xed\x5e\x1d"</div><div class='add'>+			"\xa0\xc9\xa4\x33\xc7\x13\x51\x5d"</div><div class='add'>+			"\x7f\x83\x73\xb6\x70\x18\x65\x3e"</div><div class='add'>+			"\x2f\x0e\x7a\x12\x39\x98\xab\xd8"</div><div class='add'>+			"\x7e\x6f\xa3\xd1\xba\x56\xad\xbd"</div><div class='add'>+			"\xf0\x03\x01\x1c\x85\x35\x9f\xeb"</div><div class='add'>+			"\x19\x63\xa1\xaf\xfe\x2d\x35\x50"</div><div class='add'>+			"\x39\xa0\x65\x7c\x95\x7e\x6b\xfe"</div><div class='add'>+			"\xc1\xac\x07\x7c\x98\x4f\xbe\x57"</div><div class='add'>+			"\xa7\x22\xec\xe2\x7e\x29\x09\x53"</div><div class='add'>+			"\xe8\xbf\xb4\x7e\x3f\x8f\xfc\x14"</div><div class='add'>+			"\xce\x54\xf9\x18\x58\xb5\xff\x44"</div><div class='add'>+			"\x05\x9d\xce\x1b\xb6\x82\x23\xc8"</div><div class='add'>+			"\x2e\xbc\x69\xbb\x4a\x29\x0f\x65"</div><div class='add'>+			"\x94\xf0\x63\x06\x0e\xef\x8c\xbd"</div><div class='add'>+			"\xff\xfd\xb0\x21\x6e\x57\x05\x75"</div><div class='add'>+			"\xda\xd5\xc4\xeb\x8d\x32\xf7\x50"</div><div class='add'>+			"\xd3\x6f\x22\xed\x5f\x8e\xa2\x5b"</div><div class='add'>+			"\x80\x8c\xc8\x78\x40\x24\x4b\x89"</div><div class='add'>+			"\x30\xce\x7a\x97\x0e\xc4\xaf\xef"</div><div class='add'>+			"\x9b\xb4\xcd\x66\x74\x14\x04\x2b"</div><div class='add'>+			"\xf7\xce\x0b\x1c\x6e\xc2\x78\x8c"</div><div class='add'>+			"\xca\xc5\xd0\x1c\x95\x4a\x91\x2d"</div><div class='add'>+			"\xa7\x20\xeb\x86\x52\xb7\x67\xd8"</div><div class='add'>+			"\x0c\xd6\x04\x14\xde\x51\x74\x75"</div><div class='add'>+			"\xe7\x11\xb4\x87\xa3\x3d\x2d\xad"</div><div class='add'>+			"\x4f\xef\xa0\x0f\x70\x00\x6d\x13"</div><div class='add'>+			"\x19\x1d\x41\x50\xe9\xd8\xf0\x32"</div><div class='add'>+			"\x71\xbc\xd3\x11\xf2\xac\xbe\xaf"</div><div class='add'>+			"\x75\x46\x65\x4e\x07\x34\x37\xa3"</div><div class='add'>+			"\x89\xfe\x75\xd4\x70\x4c\xc6\x3f"</div><div class='add'>+			"\x69\x24\x0e\x38\x67\x43\x8c\xde"</div><div class='add'>+			"\x06\xb5\xb8\xe7\xc4\xf0\x41\x8f"</div><div class='add'>+			"\xf0\xbd\x2f\x0b\xb9\x18\xf8\xde"</div><div class='add'>+			"\x64\xb1\xdb\xee\x00\x50\x77\xe1"</div><div class='add'>+			"\xc7\xff\xa6\xfa\xdd\x70\xf4\xe3"</div><div class='add'>+			"\x93\xe9\x77\x35\x3d\x4b\x2f\x2b"</div><div class='add'>+			"\x6d\x55\xf0\xfc\x88\x54\x4e\x89"</div><div class='add'>+			"\xc1\x8a\x23\x31\x2d\x14\x2a\xb8"</div><div class='add'>+			"\x1b\x15\xdd\x9e\x6e\x7b\xda\x05"</div><div class='add'>+			"\x91\x7d\x62\x64\x96\x72\xde\xfc"</div><div class='add'>+			"\xc1\xec\xf0\x23\x51\x6f\xdb\x5b"</div><div class='add'>+			"\x1d\x08\x57\xce\x09\xb8\xf6\xcd"</div><div class='add'>+			"\x8d\x95\xf2\x20\xbf\x0f\x20\x57"</div><div class='add'>+			"\x98\x81\x84\x4f\x15\x5c\x76\xe7"</div><div class='add'>+			"\x3e\x0a\x3a\x6c\xc4\x8a\xbe\x78"</div><div class='add'>+			"\x74\x77\xc3\x09\x4b\x5d\x48\xe4"</div><div class='add'>+			"\xc8\xcb\x0b\xea\x17\x28\xcf\xcf"</div><div class='add'>+			"\x31\x32\x44\xa4\xe5\x0e\x1a\x98"</div><div class='add'>+			"\x94\xc4\xf0\xff\xae\x3e\x44\xe8"</div><div class='add'>+			"\xa5\xb3\xb5\x37\x2f\xe8\xaf\x6f"</div><div class='add'>+			"\x28\xc1\x37\x5f\x31\xd2\xb9\x33"</div><div class='add'>+			"\xb1\xb2\x52\x94\x75\x2c\x29\x59"</div><div class='add'>+			"\x06\xc2\x25\xe8\x71\x65\x4e\xed"</div><div class='add'>+			"\xc0\x9c\xb1\xbb\x25\xdc\x6c\xe7"</div><div class='add'>+			"\x4b\xa5\x7a\x54\x7a\x60\xff\x7a"</div><div class='add'>+			"\xe0\x50\x40\x96\x35\x63\xe4\x0b"</div><div class='add'>+			"\x76\xbd\xa4\x65\x00\x1b\x57\x88"</div><div class='add'>+			"\xae\xed\x39\x88\x42\x11\x3c\xed"</div><div class='add'>+			"\x85\x67\x7d\xb9\x68\x82\xe9\x43"</div><div class='add'>+			"\x3c\x47\x53\xfa\xe8\xf8\x9f\x1f"</div><div class='add'>+			"\x9f\xef\x0f\xf7\x30\xd9\x30\x0e"</div><div class='add'>+			"\xb9\x9f\x69\x18\x2f\x7e\xf8\xf8"</div><div class='add'>+			"\xf8\x8c\x0f\xd4\x02\x4d\xea\xcd"</div><div class='add'>+			"\x0a\x9c\x6f\x71\x6d\x5a\x4c\x60"</div><div class='add'>+			"\xce\x20\x56\x32\xc6\xc5\x99\x1f"</div><div class='add'>+			"\x09\xe6\x4e\x18\x1a\x15\x13\xa8"</div><div class='add'>+			"\x7d\xb1\x6b\xc0\xb2\x6d\xf8\x26"</div><div class='add'>+			"\x66\xf8\x3d\x18\x74\x70\x66\x7a"</div><div class='add'>+			"\x34\x17\xde\xba\x47\xf1\x06\x18"</div><div class='add'>+			"\xcb\xaf\xeb\x4a\x1e\x8f\xa7\x77"</div><div class='add'>+			"\xe0\x3b\x78\x62\x66\xc9\x10\xea"</div><div class='add'>+			"\x1f\xb7\x29\x0a\x45\xa1\x1d\x1e"</div><div class='add'>+			"\x1d\xe2\x65\x61\x50\x9c\xd7\x05"</div><div class='add'>+			"\xf2\x0b\x5b\x12\x61\x02\xc8\xe5"</div><div class='add'>+			"\x63\x4f\x20\x0c\x07\x17\x33\x5e"</div><div class='add'>+			"\x03\x9a\x53\x0f\x2e\x55\xfe\x50"</div><div class='add'>+			"\x43\x7d\xd0\xb6\x7e\x5a\xda\xae"</div><div class='add'>+			"\x58\xef\x15\xa9\x83\xd9\x46\xb1"</div><div class='add'>+			"\x42\xaa\xf5\x02\x6c\xce\x92\x06"</div><div class='add'>+			"\x1b\xdb\x66\x45\x91\x79\xc2\x2d"</div><div class='add'>+			"\xe6\x53\xd3\x14\xfd\xbb\x44\x63"</div><div class='add'>+			"\xc6\xd7\x3d\x7a\x0c\x75\x78\x9d"</div><div class='add'>+			"\x5c\xa6\x39\xb3\xe5\x63\xca\x8b"</div><div class='add'>+			"\xfe\xd3\xef\x60\x83\xf6\x8e\x70"</div><div class='add'>+			"\xb6\x67\xc7\x77\xed\x23\xef\x4c"</div><div class='add'>+			"\xf0\xed\x2d\x07\x59\x6f\xc1\x01"</div><div class='add'>+			"\x34\x37\x08\xab\xd9\x1f\x09\xb1"</div><div class='add'>+			"\xce\x5b\x17\xff\x74\xf8\x9c\xd5"</div><div class='add'>+			"\x2c\x56\x39\x79\x0f\x69\x44\x75"</div><div class='add'>+			"\x58\x27\x01\xc4\xbf\xa7\xa1\x1d"</div><div class='add'>+			"\x90\x17\x77\x86\x5a\x3f\xd9\xd1"</div><div class='add'>+			"\x0e\xa0\x10\xf8\xec\x1e\xa5\x7f"</div><div class='add'>+			"\x5e\x36\xd1\xe3\x04\x2c\x70\xf7"</div><div class='add'>+			"\x8e\xc0\x98\x2f\x6c\x94\x2b\x41"</div><div class='add'>+			"\xb7\x60\x00\xb7\x2e\xb8\x02\x8d"</div><div class='add'>+			"\xb8\xb0\xd3\x86\xba\x1d\xd7\x90"</div><div class='add'>+			"\xd6\xb6\xe1\xfc\xd7\xd8\x28\x06"</div><div class='add'>+			"\x63\x9b\xce\x61\x24\x79\xc0\x70"</div><div class='add'>+			"\x52\xd0\xb6\xd4\x28\x95\x24\x87"</div><div class='add'>+			"\x03\x1f\xb7\x9a\xda\xa3\xfb\x52"</div><div class='add'>+			"\x5b\x68\xe7\x4c\x8c\x24\xe1\x42"</div><div class='add'>+			"\xf7\xd5\xfd\xad\x06\x32\x9f\xba"</div><div class='add'>+			"\xc1\xfc\xdd\xc6\xfc\xfc\xb3\x38"</div><div class='add'>+			"\x74\x56\x58\x40\x02\x37\x52\x2c"</div><div class='add'>+			"\x55\xcc\xb3\x9e\x7a\xe9\xd4\x38"</div><div class='add'>+			"\x41\x5e\x0c\x35\xe2\x11\xd1\x13"</div><div class='add'>+			"\xf8\xb7\x8d\x72\x6b\x22\x2a\xb0"</div><div class='add'>+			"\xdb\x08\xba\x35\xb9\x3f\xc8\xd3"</div><div class='add'>+			"\x24\x90\xec\x58\xd2\x09\xc7\x2d"</div><div class='add'>+			"\xed\x38\x80\x36\x72\x43\x27\x49"</div><div class='add'>+			"\x4a\x80\x8a\xa2\xe8\xd3\xda\x30"</div><div class='add'>+			"\x7d\xb6\x82\x37\x86\x92\x86\x3e"</div><div class='add'>+			"\x08\xb2\x28\x5a\x55\x44\x24\x7d"</div><div class='add'>+			"\x40\x48\x8a\xb6\x89\x58\x08\xa0"</div><div class='add'>+			"\xd6\x6d\x3a\x17\xbf\xf6\x54\xa2"</div><div class='add'>+			"\xf5\xd3\x8c\x0f\x78\x12\x57\x8b"</div><div class='add'>+			"\xd5\xc2\xfd\x58\x5b\x7f\x38\xe3"</div><div class='add'>+			"\xcc\xb7\x7c\x48\xb3\x20\xe8\x81"</div><div class='add'>+			"\x14\x32\x45\x05\xe0\xdb\x9f\x75"</div><div class='add'>+			"\x85\xb4\x6a\xfc\x95\xe3\x54\x22"</div><div class='add'>+			"\x12\xee\x30\xfe\xd8\x30\xef\x34"</div><div class='add'>+			"\x50\xab\x46\x30\x98\x2f\xb7\xc0"</div><div class='add'>+			"\x15\xa2\x83\xb6\xf2\x06\x21\xa2"</div><div class='add'>+			"\xc3\x26\x37\x14\xd1\x4d\xb5\x10"</div><div class='add'>+			"\x52\x76\x4d\x6a\xee\xb5\x2b\x15"</div><div class='add'>+			"\xb7\xf9\x51\xe8\x2a\xaf\xc7\xfa"</div><div class='add'>+			"\x77\xaf\xb0\x05\x4d\xd1\x68\x8e"</div><div class='add'>+			"\x74\x05\x9f\x9d\x93\xa5\x3e\x7f"</div><div class='add'>+			"\x4e\x5f\x9d\xcb\x09\xc7\x83\xe3"</div><div class='add'>+			"\x02\x9d\x27\x1f\xef\x85\x05\x8d"</div><div class='add'>+			"\xec\x55\x88\x0f\x0d\x7c\x4c\xe8"</div><div class='add'>+			"\xa1\x75\xa0\xd8\x06\x47\x14\xef"</div><div class='add'>+			"\xaa\x61\xcf\x26\x15\xad\xd8\xa3"</div><div class='add'>+			"\xaa\x75\xf2\x78\x4a\x5a\x61\xdf"</div><div class='add'>+			"\x8b\xc7\x04\xbc\xb2\x32\xd2\x7e"</div><div class='add'>+			"\x42\xee\xb4\x2f\x51\xff\x7b\x2e"</div><div class='add'>+			"\xd3\x02\xe8\xdc\x5d\x0d\x50\xdc"</div><div class='add'>+			"\xae\xb7\x46\xf9\xa8\xe6\xd0\x16"</div><div class='add'>+			"\xcc\xe6\x2c\x81\xc7\xad\xe9\xf0"</div><div class='add'>+			"\x05\x72\x6d\x3d\x0a\x7a\xa9\x02"</div><div class='add'>+			"\xac\x82\x93\x6e\xb6\x1c\x28\xfc"</div><div class='add'>+			"\x44\x12\xfb\x73\x77\xd4\x13\x39"</div><div class='add'>+			"\x29\x88\x8a\xf3\x5c\xa6\x36\xa0"</div><div class='add'>+			"\x2a\xed\x7e\xb1\x1d\xd6\x4c\x6b"</div><div class='add'>+			"\x41\x01\x18\x5d\x5d\x07\x97\xa6"</div><div class='add'>+			"\x4b\xef\x31\x18\xea\xac\xb1\x84"</div><div class='add'>+			"\x21\xed\xda\x86",</div><div class='add'>+		.rlen = 4100,</div><div class='add'>+		.np	= 2,</div><div class='add'>+		.tap	= { 4064, 36 },</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct cipher_testvec aes_ctr_dec_tv_template[] = {</div><div class='add'>+	{ /* From RFC 3686 */</div><div class='add'>+		.key	= "\xae\x68\x52\xf8\x12\x10\x67\xcc"</div><div class='add'>+			  "\x4b\xf7\xa5\x76\x55\x77\xf3\x9e"</div><div class='add'>+			  "\x00\x00\x00\x30",</div><div class='add'>+		.klen	= 20,</div><div class='add'>+		.iv	= "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.input	= "\xe4\x09\x5d\x4f\xb7\xa7\xb3\x79"</div><div class='add'>+			  "\x2d\x61\x75\xa3\x26\x13\x11\xb8",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "Single block msg",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x7e\x24\x06\x78\x17\xfa\xe0\xd7"</div><div class='add'>+			  "\x43\xd6\xce\x1f\x32\x53\x91\x63"</div><div class='add'>+			  "\x00\x6c\xb6\xdb",</div><div class='add'>+		.klen	= 20,</div><div class='add'>+		.iv	= "\xc0\x54\x3b\x59\xda\x48\xd9\x0b",</div><div class='add'>+		.input	= "\x51\x04\xa1\x06\x16\x8a\x72\xd9"</div><div class='add'>+			  "\x79\x0d\x41\xee\x8e\xda\xd3\x88"</div><div class='add'>+			  "\xeb\x2e\x1e\xfc\x46\xda\x57\xc8"</div><div class='add'>+			  "\xfc\xe6\x30\xdf\x91\x41\xbe\x28",</div><div class='add'>+		.ilen	= 32,</div><div class='add'>+		.result	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='add'>+			  "\x10\x11\x12\x13\x14\x15\x16\x17"</div><div class='add'>+			  "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f",</div><div class='add'>+		.rlen	= 32,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x16\xaf\x5b\x14\x5f\xc9\xf5\x79"</div><div class='add'>+			  "\xc1\x75\xf9\x3e\x3b\xfb\x0e\xed"</div><div class='add'>+			  "\x86\x3d\x06\xcc\xfd\xb7\x85\x15"</div><div class='add'>+			  "\x00\x00\x00\x48",</div><div class='add'>+		.klen	= 28,</div><div class='add'>+		.iv	= "\x36\x73\x3c\x14\x7d\x6d\x93\xcb",</div><div class='add'>+		.input	= "\x4b\x55\x38\x4f\xe2\x59\xc9\xc8"</div><div class='add'>+			  "\x4e\x79\x35\xa0\x03\xcb\xe9\x28",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "Single block msg",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x7c\x5c\xb2\x40\x1b\x3d\xc3\x3c"</div><div class='add'>+			  "\x19\xe7\x34\x08\x19\xe0\xf6\x9c"</div><div class='add'>+			  "\x67\x8c\x3d\xb8\xe6\xf6\xa9\x1a"</div><div class='add'>+			  "\x00\x96\xb0\x3b",</div><div class='add'>+		.klen	= 28,</div><div class='add'>+		.iv	= "\x02\x0c\x6e\xad\xc2\xcb\x50\x0d",</div><div class='add'>+		.input	= "\x45\x32\x43\xfc\x60\x9b\x23\x32"</div><div class='add'>+			  "\x7e\xdf\xaa\xfa\x71\x31\xcd\x9f"</div><div class='add'>+			  "\x84\x90\x70\x1c\x5a\xd4\xa7\x9c"</div><div class='add'>+			  "\xfc\x1f\xe0\xff\x42\xf4\xfb\x00",</div><div class='add'>+		.ilen	= 32,</div><div class='add'>+		.result	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='add'>+			  "\x10\x11\x12\x13\x14\x15\x16\x17"</div><div class='add'>+			  "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f",</div><div class='add'>+		.rlen	= 32,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x77\x6b\xef\xf2\x85\x1d\xb0\x6f"</div><div class='add'>+			  "\x4c\x8a\x05\x42\xc8\x69\x6f\x6c"</div><div class='add'>+			  "\x6a\x81\xaf\x1e\xec\x96\xb4\xd3"</div><div class='add'>+			  "\x7f\xc1\xd6\x89\xe6\xc1\xc1\x04"</div><div class='add'>+			  "\x00\x00\x00\x60",</div><div class='add'>+		.klen	= 36,</div><div class='add'>+		.iv	= "\xdb\x56\x72\xc9\x7a\xa8\xf0\xb2",</div><div class='add'>+		.input	= "\x14\x5a\xd0\x1d\xbf\x82\x4e\xc7"</div><div class='add'>+			  "\x56\x08\x63\xdc\x71\xe3\xe0\xc0",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "Single block msg",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\xf6\xd6\x6d\x6b\xd5\x2d\x59\xbb"</div><div class='add'>+			  "\x07\x96\x36\x58\x79\xef\xf8\x86"</div><div class='add'>+			  "\xc6\x6d\xd5\x1a\x5b\x6a\x99\x74"</div><div class='add'>+			  "\x4b\x50\x59\x0c\x87\xa2\x38\x84"</div><div class='add'>+			  "\x00\xfa\xac\x24",</div><div class='add'>+		.klen	= 36,</div><div class='add'>+		.iv	= "\xc1\x58\x5e\xf1\x5a\x43\xd8\x75",</div><div class='add'>+		.input	= "\xf0\x5e\x23\x1b\x38\x94\x61\x2c"</div><div class='add'>+			  "\x49\xee\x00\x0b\x80\x4e\xb2\xa9"</div><div class='add'>+			  "\xb8\x30\x6b\x50\x8f\x83\x9d\x6a"</div><div class='add'>+			  "\x55\x30\x83\x1d\x93\x44\xaf\x1c",</div><div class='add'>+		.ilen	= 32,</div><div class='add'>+		.result	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='add'>+			  "\x10\x11\x12\x13\x14\x15\x16\x17"</div><div class='add'>+			  "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f",</div><div class='add'>+		.rlen	= 32,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct aead_testvec aes_gcm_enc_tv_template[] = {</div><div class='add'>+	{ /* From McGrew &amp; Viega - http://citeseer.ist.psu.edu/656989.html */</div><div class='add'>+		.key    = zeroed_string,</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.result	= "\x58\xe2\xfc\xce\xfa\x7e\x30\x61"</div><div class='add'>+			  "\x36\x7f\x1d\x57\xa4\xe7\x45\x5a",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key    = zeroed_string,</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.input  = zeroed_string,</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result = "\x03\x88\xda\xce\x60\xb6\xa3\x92"</div><div class='add'>+			  "\xf3\x28\xc2\xb9\x71\xb2\xfe\x78"</div><div class='add'>+			  "\xab\x6e\x47\xd4\x2c\xec\x13\xbd"</div><div class='add'>+			  "\xf5\x3a\x67\xb2\x12\x57\xbd\xdf",</div><div class='add'>+		.rlen	= 32,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\xfe\xff\xe9\x92\x86\x65\x73\x1c"</div><div class='add'>+			  "\x6d\x6a\x8f\x94\x67\x30\x83\x08",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.iv	= "\xca\xfe\xba\xbe\xfa\xce\xdb\xad"</div><div class='add'>+			  "\xde\xca\xf8\x88",</div><div class='add'>+		.input	= "\xd9\x31\x32\x25\xf8\x84\x06\xe5"</div><div class='add'>+			  "\xa5\x59\x09\xc5\xaf\xf5\x26\x9a"</div><div class='add'>+			  "\x86\xa7\xa9\x53\x15\x34\xf7\xda"</div><div class='add'>+			  "\x2e\x4c\x30\x3d\x8a\x31\x8a\x72"</div><div class='add'>+			  "\x1c\x3c\x0c\x95\x95\x68\x09\x53"</div><div class='add'>+			  "\x2f\xcf\x0e\x24\x49\xa6\xb5\x25"</div><div class='add'>+			  "\xb1\x6a\xed\xf5\xaa\x0d\xe6\x57"</div><div class='add'>+			  "\xba\x63\x7b\x39\x1a\xaf\xd2\x55",</div><div class='add'>+		.ilen	= 64,</div><div class='add'>+		.result = "\x42\x83\x1e\xc2\x21\x77\x74\x24"</div><div class='add'>+			  "\x4b\x72\x21\xb7\x84\xd0\xd4\x9c"</div><div class='add'>+			  "\xe3\xaa\x21\x2f\x2c\x02\xa4\xe0"</div><div class='add'>+			  "\x35\xc1\x7e\x23\x29\xac\xa1\x2e"</div><div class='add'>+			  "\x21\xd5\x14\xb2\x54\x66\x93\x1c"</div><div class='add'>+			  "\x7d\x8f\x6a\x5a\xac\x84\xaa\x05"</div><div class='add'>+			  "\x1b\xa3\x0b\x39\x6a\x0a\xac\x97"</div><div class='add'>+			  "\x3d\x58\xe0\x91\x47\x3f\x59\x85"</div><div class='add'>+			  "\x4d\x5c\x2a\xf3\x27\xcd\x64\xa6"</div><div class='add'>+			  "\x2c\xf3\x5a\xbd\x2b\xa6\xfa\xb4",</div><div class='add'>+		.rlen	= 80,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\xfe\xff\xe9\x92\x86\x65\x73\x1c"</div><div class='add'>+			  "\x6d\x6a\x8f\x94\x67\x30\x83\x08",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.iv	= "\xca\xfe\xba\xbe\xfa\xce\xdb\xad"</div><div class='add'>+			  "\xde\xca\xf8\x88",</div><div class='add'>+		.input	= "\xd9\x31\x32\x25\xf8\x84\x06\xe5"</div><div class='add'>+			  "\xa5\x59\x09\xc5\xaf\xf5\x26\x9a"</div><div class='add'>+			  "\x86\xa7\xa9\x53\x15\x34\xf7\xda"</div><div class='add'>+			  "\x2e\x4c\x30\x3d\x8a\x31\x8a\x72"</div><div class='add'>+			  "\x1c\x3c\x0c\x95\x95\x68\x09\x53"</div><div class='add'>+			  "\x2f\xcf\x0e\x24\x49\xa6\xb5\x25"</div><div class='add'>+			  "\xb1\x6a\xed\xf5\xaa\x0d\xe6\x57"</div><div class='add'>+			  "\xba\x63\x7b\x39",</div><div class='add'>+		.ilen	= 60,</div><div class='add'>+		.assoc	= "\xfe\xed\xfa\xce\xde\xad\xbe\xef"</div><div class='add'>+			  "\xfe\xed\xfa\xce\xde\xad\xbe\xef"</div><div class='add'>+			  "\xab\xad\xda\xd2",</div><div class='add'>+		.alen	= 20,</div><div class='add'>+		.result = "\x42\x83\x1e\xc2\x21\x77\x74\x24"</div><div class='add'>+			  "\x4b\x72\x21\xb7\x84\xd0\xd4\x9c"</div><div class='add'>+			  "\xe3\xaa\x21\x2f\x2c\x02\xa4\xe0"</div><div class='add'>+			  "\x35\xc1\x7e\x23\x29\xac\xa1\x2e"</div><div class='add'>+			  "\x21\xd5\x14\xb2\x54\x66\x93\x1c"</div><div class='add'>+			  "\x7d\x8f\x6a\x5a\xac\x84\xaa\x05"</div><div class='add'>+			  "\x1b\xa3\x0b\x39\x6a\x0a\xac\x97"</div><div class='add'>+			  "\x3d\x58\xe0\x91"</div><div class='add'>+			  "\x5b\xc9\x4f\xbc\x32\x21\xa5\xdb"</div><div class='add'>+			  "\x94\xfa\xe9\x5a\xe7\x12\x1a\x47",</div><div class='add'>+		.rlen	= 76,</div><div class='add'>+	}, {</div><div class='add'>+		.key    = zeroed_string,</div><div class='add'>+		.klen	= 24,</div><div class='add'>+		.result	= "\xcd\x33\xb2\x8a\xc7\x73\xf7\x4b"</div><div class='add'>+			  "\xa0\x0e\xd1\xf3\x12\x57\x24\x35",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key    = zeroed_string,</div><div class='add'>+		.klen	= 24,</div><div class='add'>+		.input  = zeroed_string,</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result = "\x98\xe7\x24\x7c\x07\xf0\xfe\x41"</div><div class='add'>+			  "\x1c\x26\x7e\x43\x84\xb0\xf6\x00"</div><div class='add'>+			  "\x2f\xf5\x8d\x80\x03\x39\x27\xab"</div><div class='add'>+			  "\x8e\xf4\xd4\x58\x75\x14\xf0\xfb",</div><div class='add'>+		.rlen	= 32,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\xfe\xff\xe9\x92\x86\x65\x73\x1c"</div><div class='add'>+			  "\x6d\x6a\x8f\x94\x67\x30\x83\x08"</div><div class='add'>+			  "\xfe\xff\xe9\x92\x86\x65\x73\x1c",</div><div class='add'>+		.klen	= 24,</div><div class='add'>+		.iv	= "\xca\xfe\xba\xbe\xfa\xce\xdb\xad"</div><div class='add'>+			  "\xde\xca\xf8\x88",</div><div class='add'>+		.input	= "\xd9\x31\x32\x25\xf8\x84\x06\xe5"</div><div class='add'>+			  "\xa5\x59\x09\xc5\xaf\xf5\x26\x9a"</div><div class='add'>+			  "\x86\xa7\xa9\x53\x15\x34\xf7\xda"</div><div class='add'>+			  "\x2e\x4c\x30\x3d\x8a\x31\x8a\x72"</div><div class='add'>+			  "\x1c\x3c\x0c\x95\x95\x68\x09\x53"</div><div class='add'>+			  "\x2f\xcf\x0e\x24\x49\xa6\xb5\x25"</div><div class='add'>+			  "\xb1\x6a\xed\xf5\xaa\x0d\xe6\x57"</div><div class='add'>+			  "\xba\x63\x7b\x39\x1a\xaf\xd2\x55",</div><div class='add'>+		.ilen	= 64,</div><div class='add'>+		.result = "\x39\x80\xca\x0b\x3c\x00\xe8\x41"</div><div class='add'>+			  "\xeb\x06\xfa\xc4\x87\x2a\x27\x57"</div><div class='add'>+			  "\x85\x9e\x1c\xea\xa6\xef\xd9\x84"</div><div class='add'>+			  "\x62\x85\x93\xb4\x0c\xa1\xe1\x9c"</div><div class='add'>+			  "\x7d\x77\x3d\x00\xc1\x44\xc5\x25"</div><div class='add'>+			  "\xac\x61\x9d\x18\xc8\x4a\x3f\x47"</div><div class='add'>+			  "\x18\xe2\x44\x8b\x2f\xe3\x24\xd9"</div><div class='add'>+			  "\xcc\xda\x27\x10\xac\xad\xe2\x56"</div><div class='add'>+			  "\x99\x24\xa7\xc8\x58\x73\x36\xbf"</div><div class='add'>+			  "\xb1\x18\x02\x4d\xb8\x67\x4a\x14",</div><div class='add'>+		.rlen	= 80,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\xfe\xff\xe9\x92\x86\x65\x73\x1c"</div><div class='add'>+			  "\x6d\x6a\x8f\x94\x67\x30\x83\x08"</div><div class='add'>+			  "\xfe\xff\xe9\x92\x86\x65\x73\x1c",</div><div class='add'>+		.klen	= 24,</div><div class='add'>+		.iv	= "\xca\xfe\xba\xbe\xfa\xce\xdb\xad"</div><div class='add'>+			  "\xde\xca\xf8\x88",</div><div class='add'>+		.input	= "\xd9\x31\x32\x25\xf8\x84\x06\xe5"</div><div class='add'>+			  "\xa5\x59\x09\xc5\xaf\xf5\x26\x9a"</div><div class='add'>+			  "\x86\xa7\xa9\x53\x15\x34\xf7\xda"</div><div class='add'>+			  "\x2e\x4c\x30\x3d\x8a\x31\x8a\x72"</div><div class='add'>+			  "\x1c\x3c\x0c\x95\x95\x68\x09\x53"</div><div class='add'>+			  "\x2f\xcf\x0e\x24\x49\xa6\xb5\x25"</div><div class='add'>+			  "\xb1\x6a\xed\xf5\xaa\x0d\xe6\x57"</div><div class='add'>+			  "\xba\x63\x7b\x39",</div><div class='add'>+		.ilen	= 60,</div><div class='add'>+		.assoc	= "\xfe\xed\xfa\xce\xde\xad\xbe\xef"</div><div class='add'>+			  "\xfe\xed\xfa\xce\xde\xad\xbe\xef"</div><div class='add'>+			  "\xab\xad\xda\xd2",</div><div class='add'>+		.alen	= 20,</div><div class='add'>+		.result = "\x39\x80\xca\x0b\x3c\x00\xe8\x41"</div><div class='add'>+			  "\xeb\x06\xfa\xc4\x87\x2a\x27\x57"</div><div class='add'>+			  "\x85\x9e\x1c\xea\xa6\xef\xd9\x84"</div><div class='add'>+			  "\x62\x85\x93\xb4\x0c\xa1\xe1\x9c"</div><div class='add'>+			  "\x7d\x77\x3d\x00\xc1\x44\xc5\x25"</div><div class='add'>+			  "\xac\x61\x9d\x18\xc8\x4a\x3f\x47"</div><div class='add'>+			  "\x18\xe2\x44\x8b\x2f\xe3\x24\xd9"</div><div class='add'>+			  "\xcc\xda\x27\x10"</div><div class='add'>+			  "\x25\x19\x49\x8e\x80\xf1\x47\x8f"</div><div class='add'>+			  "\x37\xba\x55\xbd\x6d\x27\x61\x8c",</div><div class='add'>+		.rlen	= 76,</div><div class='add'>+		.np	= 2,</div><div class='add'>+		.tap	= { 32, 28 },</div><div class='add'>+		.anp	= 2,</div><div class='add'>+		.atap	= { 8, 12 }</div><div class='add'>+	}, {</div><div class='add'>+		.key    = zeroed_string,</div><div class='add'>+		.klen	= 32,</div><div class='add'>+		.result	= "\x53\x0f\x8a\xfb\xc7\x45\x36\xb9"</div><div class='add'>+			  "\xa9\x63\xb4\xf1\xc4\xcb\x73\x8b",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct aead_testvec aes_gcm_dec_tv_template[] = {</div><div class='add'>+	{ /* From McGrew &amp; Viega - http://citeseer.ist.psu.edu/656989.html */</div><div class='add'>+		.key    = zeroed_string,</div><div class='add'>+		.klen	= 32,</div><div class='add'>+		.input	= "\xce\xa7\x40\x3d\x4d\x60\x6b\x6e"</div><div class='add'>+			  "\x07\x4e\xc5\xd3\xba\xf3\x9d\x18"</div><div class='add'>+			  "\xd0\xd1\xc8\xa7\x99\x99\x6b\xf0"</div><div class='add'>+			  "\x26\x5b\x98\xb5\xd4\x8a\xb9\x19",</div><div class='add'>+		.ilen	= 32,</div><div class='add'>+		.result  = zeroed_string,</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\xfe\xff\xe9\x92\x86\x65\x73\x1c"</div><div class='add'>+			  "\x6d\x6a\x8f\x94\x67\x30\x83\x08"</div><div class='add'>+			  "\xfe\xff\xe9\x92\x86\x65\x73\x1c"</div><div class='add'>+			  "\x6d\x6a\x8f\x94\x67\x30\x83\x08",</div><div class='add'>+		.klen	= 32,</div><div class='add'>+		.iv	= "\xca\xfe\xba\xbe\xfa\xce\xdb\xad"</div><div class='add'>+			  "\xde\xca\xf8\x88",</div><div class='add'>+		.input	= "\x52\x2d\xc1\xf0\x99\x56\x7d\x07"</div><div class='add'>+			  "\xf4\x7f\x37\xa3\x2a\x84\x42\x7d"</div><div class='add'>+			  "\x64\x3a\x8c\xdc\xbf\xe5\xc0\xc9"</div><div class='add'>+			  "\x75\x98\xa2\xbd\x25\x55\xd1\xaa"</div><div class='add'>+			  "\x8c\xb0\x8e\x48\x59\x0d\xbb\x3d"</div><div class='add'>+			  "\xa7\xb0\x8b\x10\x56\x82\x88\x38"</div><div class='add'>+			  "\xc5\xf6\x1e\x63\x93\xba\x7a\x0a"</div><div class='add'>+			  "\xbc\xc9\xf6\x62\x89\x80\x15\xad"</div><div class='add'>+			  "\xb0\x94\xda\xc5\xd9\x34\x71\xbd"</div><div class='add'>+			  "\xec\x1a\x50\x22\x70\xe3\xcc\x6c",</div><div class='add'>+		.ilen	= 80,</div><div class='add'>+		.result = "\xd9\x31\x32\x25\xf8\x84\x06\xe5"</div><div class='add'>+			  "\xa5\x59\x09\xc5\xaf\xf5\x26\x9a"</div><div class='add'>+			  "\x86\xa7\xa9\x53\x15\x34\xf7\xda"</div><div class='add'>+			  "\x2e\x4c\x30\x3d\x8a\x31\x8a\x72"</div><div class='add'>+			  "\x1c\x3c\x0c\x95\x95\x68\x09\x53"</div><div class='add'>+			  "\x2f\xcf\x0e\x24\x49\xa6\xb5\x25"</div><div class='add'>+			  "\xb1\x6a\xed\xf5\xaa\x0d\xe6\x57"</div><div class='add'>+			  "\xba\x63\x7b\x39\x1a\xaf\xd2\x55",</div><div class='add'>+		.rlen	= 64,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\xfe\xff\xe9\x92\x86\x65\x73\x1c"</div><div class='add'>+			  "\x6d\x6a\x8f\x94\x67\x30\x83\x08"</div><div class='add'>+			  "\xfe\xff\xe9\x92\x86\x65\x73\x1c"</div><div class='add'>+			  "\x6d\x6a\x8f\x94\x67\x30\x83\x08",</div><div class='add'>+		.klen	= 32,</div><div class='add'>+		.iv	= "\xca\xfe\xba\xbe\xfa\xce\xdb\xad"</div><div class='add'>+			  "\xde\xca\xf8\x88",</div><div class='add'>+		.input	= "\x52\x2d\xc1\xf0\x99\x56\x7d\x07"</div><div class='add'>+			  "\xf4\x7f\x37\xa3\x2a\x84\x42\x7d"</div><div class='add'>+			  "\x64\x3a\x8c\xdc\xbf\xe5\xc0\xc9"</div><div class='add'>+			  "\x75\x98\xa2\xbd\x25\x55\xd1\xaa"</div><div class='add'>+			  "\x8c\xb0\x8e\x48\x59\x0d\xbb\x3d"</div><div class='add'>+			  "\xa7\xb0\x8b\x10\x56\x82\x88\x38"</div><div class='add'>+			  "\xc5\xf6\x1e\x63\x93\xba\x7a\x0a"</div><div class='add'>+			  "\xbc\xc9\xf6\x62"</div><div class='add'>+			  "\x76\xfc\x6e\xce\x0f\x4e\x17\x68"</div><div class='add'>+			  "\xcd\xdf\x88\x53\xbb\x2d\x55\x1b",</div><div class='add'>+		.ilen	= 76,</div><div class='add'>+		.assoc	= "\xfe\xed\xfa\xce\xde\xad\xbe\xef"</div><div class='add'>+			  "\xfe\xed\xfa\xce\xde\xad\xbe\xef"</div><div class='add'>+			  "\xab\xad\xda\xd2",</div><div class='add'>+		.alen	= 20,</div><div class='add'>+		.result = "\xd9\x31\x32\x25\xf8\x84\x06\xe5"</div><div class='add'>+			  "\xa5\x59\x09\xc5\xaf\xf5\x26\x9a"</div><div class='add'>+			  "\x86\xa7\xa9\x53\x15\x34\xf7\xda"</div><div class='add'>+			  "\x2e\x4c\x30\x3d\x8a\x31\x8a\x72"</div><div class='add'>+			  "\x1c\x3c\x0c\x95\x95\x68\x09\x53"</div><div class='add'>+			  "\x2f\xcf\x0e\x24\x49\xa6\xb5\x25"</div><div class='add'>+			  "\xb1\x6a\xed\xf5\xaa\x0d\xe6\x57"</div><div class='add'>+			  "\xba\x63\x7b\x39",</div><div class='add'>+		.rlen	= 60,</div><div class='add'>+		.np     = 2,</div><div class='add'>+		.tap    = { 48, 28 },</div><div class='add'>+		.anp	= 3,</div><div class='add'>+		.atap	= { 8, 8, 4 }</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\xfe\xff\xe9\x92\x86\x65\x73\x1c"</div><div class='add'>+			  "\x6d\x6a\x8f\x94\x67\x30\x83\x08",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.iv	= "\xca\xfe\xba\xbe\xfa\xce\xdb\xad"</div><div class='add'>+			  "\xde\xca\xf8\x88",</div><div class='add'>+		.input	= "\x42\x83\x1e\xc2\x21\x77\x74\x24"</div><div class='add'>+			  "\x4b\x72\x21\xb7\x84\xd0\xd4\x9c"</div><div class='add'>+			  "\xe3\xaa\x21\x2f\x2c\x02\xa4\xe0"</div><div class='add'>+			  "\x35\xc1\x7e\x23\x29\xac\xa1\x2e"</div><div class='add'>+			  "\x21\xd5\x14\xb2\x54\x66\x93\x1c"</div><div class='add'>+			  "\x7d\x8f\x6a\x5a\xac\x84\xaa\x05"</div><div class='add'>+			  "\x1b\xa3\x0b\x39\x6a\x0a\xac\x97"</div><div class='add'>+			  "\x3d\x58\xe0\x91\x47\x3f\x59\x85"</div><div class='add'>+			  "\x4d\x5c\x2a\xf3\x27\xcd\x64\xa6"</div><div class='add'>+			  "\x2c\xf3\x5a\xbd\x2b\xa6\xfa\xb4",</div><div class='add'>+		.ilen	= 80,</div><div class='add'>+		.result = "\xd9\x31\x32\x25\xf8\x84\x06\xe5"</div><div class='add'>+			  "\xa5\x59\x09\xc5\xaf\xf5\x26\x9a"</div><div class='add'>+			  "\x86\xa7\xa9\x53\x15\x34\xf7\xda"</div><div class='add'>+			  "\x2e\x4c\x30\x3d\x8a\x31\x8a\x72"</div><div class='add'>+			  "\x1c\x3c\x0c\x95\x95\x68\x09\x53"</div><div class='add'>+			  "\x2f\xcf\x0e\x24\x49\xa6\xb5\x25"</div><div class='add'>+			  "\xb1\x6a\xed\xf5\xaa\x0d\xe6\x57"</div><div class='add'>+			  "\xba\x63\x7b\x39\x1a\xaf\xd2\x55",</div><div class='add'>+		.rlen	= 64,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\xfe\xff\xe9\x92\x86\x65\x73\x1c"</div><div class='add'>+			  "\x6d\x6a\x8f\x94\x67\x30\x83\x08",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.iv	= "\xca\xfe\xba\xbe\xfa\xce\xdb\xad"</div><div class='add'>+			  "\xde\xca\xf8\x88",</div><div class='add'>+		.input	= "\x42\x83\x1e\xc2\x21\x77\x74\x24"</div><div class='add'>+			  "\x4b\x72\x21\xb7\x84\xd0\xd4\x9c"</div><div class='add'>+			  "\xe3\xaa\x21\x2f\x2c\x02\xa4\xe0"</div><div class='add'>+			  "\x35\xc1\x7e\x23\x29\xac\xa1\x2e"</div><div class='add'>+			  "\x21\xd5\x14\xb2\x54\x66\x93\x1c"</div><div class='add'>+			  "\x7d\x8f\x6a\x5a\xac\x84\xaa\x05"</div><div class='add'>+			  "\x1b\xa3\x0b\x39\x6a\x0a\xac\x97"</div><div class='add'>+			  "\x3d\x58\xe0\x91"</div><div class='add'>+			  "\x5b\xc9\x4f\xbc\x32\x21\xa5\xdb"</div><div class='add'>+			  "\x94\xfa\xe9\x5a\xe7\x12\x1a\x47",</div><div class='add'>+		.ilen	= 76,</div><div class='add'>+		.assoc	= "\xfe\xed\xfa\xce\xde\xad\xbe\xef"</div><div class='add'>+			  "\xfe\xed\xfa\xce\xde\xad\xbe\xef"</div><div class='add'>+			  "\xab\xad\xda\xd2",</div><div class='add'>+		.alen	= 20,</div><div class='add'>+		.result = "\xd9\x31\x32\x25\xf8\x84\x06\xe5"</div><div class='add'>+			  "\xa5\x59\x09\xc5\xaf\xf5\x26\x9a"</div><div class='add'>+			  "\x86\xa7\xa9\x53\x15\x34\xf7\xda"</div><div class='add'>+			  "\x2e\x4c\x30\x3d\x8a\x31\x8a\x72"</div><div class='add'>+			  "\x1c\x3c\x0c\x95\x95\x68\x09\x53"</div><div class='add'>+			  "\x2f\xcf\x0e\x24\x49\xa6\xb5\x25"</div><div class='add'>+			  "\xb1\x6a\xed\xf5\xaa\x0d\xe6\x57"</div><div class='add'>+			  "\xba\x63\x7b\x39",</div><div class='add'>+		.rlen	= 60,</div><div class='add'>+	}, {</div><div class='add'>+		.key    = zeroed_string,</div><div class='add'>+		.klen	= 24,</div><div class='add'>+		.input	= "\x98\xe7\x24\x7c\x07\xf0\xfe\x41"</div><div class='add'>+			  "\x1c\x26\x7e\x43\x84\xb0\xf6\x00"</div><div class='add'>+			  "\x2f\xf5\x8d\x80\x03\x39\x27\xab"</div><div class='add'>+			  "\x8e\xf4\xd4\x58\x75\x14\xf0\xfb",</div><div class='add'>+		.ilen	= 32,</div><div class='add'>+		.result  = zeroed_string,</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\xfe\xff\xe9\x92\x86\x65\x73\x1c"</div><div class='add'>+			  "\x6d\x6a\x8f\x94\x67\x30\x83\x08"</div><div class='add'>+			  "\xfe\xff\xe9\x92\x86\x65\x73\x1c",</div><div class='add'>+		.klen	= 24,</div><div class='add'>+		.iv	= "\xca\xfe\xba\xbe\xfa\xce\xdb\xad"</div><div class='add'>+			  "\xde\xca\xf8\x88",</div><div class='add'>+		.input	= "\x39\x80\xca\x0b\x3c\x00\xe8\x41"</div><div class='add'>+			  "\xeb\x06\xfa\xc4\x87\x2a\x27\x57"</div><div class='add'>+			  "\x85\x9e\x1c\xea\xa6\xef\xd9\x84"</div><div class='add'>+			  "\x62\x85\x93\xb4\x0c\xa1\xe1\x9c"</div><div class='add'>+			  "\x7d\x77\x3d\x00\xc1\x44\xc5\x25"</div><div class='add'>+			  "\xac\x61\x9d\x18\xc8\x4a\x3f\x47"</div><div class='add'>+			  "\x18\xe2\x44\x8b\x2f\xe3\x24\xd9"</div><div class='add'>+			  "\xcc\xda\x27\x10\xac\xad\xe2\x56"</div><div class='add'>+			  "\x99\x24\xa7\xc8\x58\x73\x36\xbf"</div><div class='add'>+			  "\xb1\x18\x02\x4d\xb8\x67\x4a\x14",</div><div class='add'>+		.ilen	= 80,</div><div class='add'>+		.result = "\xd9\x31\x32\x25\xf8\x84\x06\xe5"</div><div class='add'>+			  "\xa5\x59\x09\xc5\xaf\xf5\x26\x9a"</div><div class='add'>+			  "\x86\xa7\xa9\x53\x15\x34\xf7\xda"</div><div class='add'>+			  "\x2e\x4c\x30\x3d\x8a\x31\x8a\x72"</div><div class='add'>+			  "\x1c\x3c\x0c\x95\x95\x68\x09\x53"</div><div class='add'>+			  "\x2f\xcf\x0e\x24\x49\xa6\xb5\x25"</div><div class='add'>+			  "\xb1\x6a\xed\xf5\xaa\x0d\xe6\x57"</div><div class='add'>+			  "\xba\x63\x7b\x39\x1a\xaf\xd2\x55",</div><div class='add'>+		.rlen	= 64,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\xfe\xff\xe9\x92\x86\x65\x73\x1c"</div><div class='add'>+			  "\x6d\x6a\x8f\x94\x67\x30\x83\x08"</div><div class='add'>+			  "\xfe\xff\xe9\x92\x86\x65\x73\x1c",</div><div class='add'>+		.klen	= 24,</div><div class='add'>+		.iv	= "\xca\xfe\xba\xbe\xfa\xce\xdb\xad"</div><div class='add'>+			  "\xde\xca\xf8\x88",</div><div class='add'>+		.input	= "\x39\x80\xca\x0b\x3c\x00\xe8\x41"</div><div class='add'>+			  "\xeb\x06\xfa\xc4\x87\x2a\x27\x57"</div><div class='add'>+			  "\x85\x9e\x1c\xea\xa6\xef\xd9\x84"</div><div class='add'>+			  "\x62\x85\x93\xb4\x0c\xa1\xe1\x9c"</div><div class='add'>+			  "\x7d\x77\x3d\x00\xc1\x44\xc5\x25"</div><div class='add'>+			  "\xac\x61\x9d\x18\xc8\x4a\x3f\x47"</div><div class='add'>+			  "\x18\xe2\x44\x8b\x2f\xe3\x24\xd9"</div><div class='add'>+			  "\xcc\xda\x27\x10"</div><div class='add'>+			  "\x25\x19\x49\x8e\x80\xf1\x47\x8f"</div><div class='add'>+			  "\x37\xba\x55\xbd\x6d\x27\x61\x8c",</div><div class='add'>+		.ilen	= 76,</div><div class='add'>+		.assoc	= "\xfe\xed\xfa\xce\xde\xad\xbe\xef"</div><div class='add'>+			  "\xfe\xed\xfa\xce\xde\xad\xbe\xef"</div><div class='add'>+			  "\xab\xad\xda\xd2",</div><div class='add'>+		.alen	= 20,</div><div class='add'>+		.result = "\xd9\x31\x32\x25\xf8\x84\x06\xe5"</div><div class='add'>+			  "\xa5\x59\x09\xc5\xaf\xf5\x26\x9a"</div><div class='add'>+			  "\x86\xa7\xa9\x53\x15\x34\xf7\xda"</div><div class='add'>+			  "\x2e\x4c\x30\x3d\x8a\x31\x8a\x72"</div><div class='add'>+			  "\x1c\x3c\x0c\x95\x95\x68\x09\x53"</div><div class='add'>+			  "\x2f\xcf\x0e\x24\x49\xa6\xb5\x25"</div><div class='add'>+			  "\xb1\x6a\xed\xf5\xaa\x0d\xe6\x57"</div><div class='add'>+			  "\xba\x63\x7b\x39",</div><div class='add'>+		.rlen	= 60,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct aead_testvec aes_ccm_enc_tv_template[] = {</div><div class='add'>+	{ /* From RFC 3610 */</div><div class='add'>+		.key	= "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7"</div><div class='add'>+			  "\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.iv	= "\x01\x00\x00\x00\x03\x02\x01\x00"</div><div class='add'>+			  "\xa0\xa1\xa2\xa3\xa4\xa5\x00\x00",</div><div class='add'>+		.assoc	= "\x00\x01\x02\x03\x04\x05\x06\x07",</div><div class='add'>+		.alen	= 8,</div><div class='add'>+		.input	= "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='add'>+			  "\x10\x11\x12\x13\x14\x15\x16\x17"</div><div class='add'>+			  "\x18\x19\x1a\x1b\x1c\x1d\x1e",</div><div class='add'>+		.ilen	= 23,</div><div class='add'>+		.result	= "\x58\x8c\x97\x9a\x61\xc6\x63\xd2"</div><div class='add'>+			  "\xf0\x66\xd0\xc2\xc0\xf9\x89\x80"</div><div class='add'>+			  "\x6d\x5f\x6b\x61\xda\xc3\x84\x17"</div><div class='add'>+			  "\xe8\xd1\x2c\xfd\xf9\x26\xe0",</div><div class='add'>+		.rlen	= 31,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7"</div><div class='add'>+			  "\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.iv	= "\x01\x00\x00\x00\x07\x06\x05\x04"</div><div class='add'>+			  "\xa0\xa1\xa2\xa3\xa4\xa5\x00\x00",</div><div class='add'>+		.assoc	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			  "\x08\x09\x0a\x0b",</div><div class='add'>+		.alen	= 12,</div><div class='add'>+		.input	= "\x0c\x0d\x0e\x0f\x10\x11\x12\x13"</div><div class='add'>+			  "\x14\x15\x16\x17\x18\x19\x1a\x1b"</div><div class='add'>+			  "\x1c\x1d\x1e\x1f",</div><div class='add'>+		.ilen	= 20,</div><div class='add'>+		.result	= "\xdc\xf1\xfb\x7b\x5d\x9e\x23\xfb"</div><div class='add'>+			  "\x9d\x4e\x13\x12\x53\x65\x8a\xd8"</div><div class='add'>+			  "\x6e\xbd\xca\x3e\x51\xe8\x3f\x07"</div><div class='add'>+			  "\x7d\x9c\x2d\x93",</div><div class='add'>+		.rlen	= 28,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7"</div><div class='add'>+			  "\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.iv	= "\x01\x00\x00\x00\x0b\x0a\x09\x08"</div><div class='add'>+			  "\xa0\xa1\xa2\xa3\xa4\xa5\x00\x00",</div><div class='add'>+		.assoc	= "\x00\x01\x02\x03\x04\x05\x06\x07",</div><div class='add'>+		.alen	= 8,</div><div class='add'>+		.input	= "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='add'>+			  "\x10\x11\x12\x13\x14\x15\x16\x17"</div><div class='add'>+			  "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f"</div><div class='add'>+			  "\x20",</div><div class='add'>+		.ilen	= 25,</div><div class='add'>+		.result	= "\x82\x53\x1a\x60\xcc\x24\x94\x5a"</div><div class='add'>+			  "\x4b\x82\x79\x18\x1a\xb5\xc8\x4d"</div><div class='add'>+			  "\xf2\x1c\xe7\xf9\xb7\x3f\x42\xe1"</div><div class='add'>+			  "\x97\xea\x9c\x07\xe5\x6b\x5e\xb1"</div><div class='add'>+			  "\x7e\x5f\x4e",</div><div class='add'>+		.rlen	= 35,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7"</div><div class='add'>+			  "\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.iv	= "\x01\x00\x00\x00\x0c\x0b\x0a\x09"</div><div class='add'>+			  "\xa0\xa1\xa2\xa3\xa4\xa5\x00\x00",</div><div class='add'>+		.assoc	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			  "\x08\x09\x0a\x0b",</div><div class='add'>+		.alen	= 12,</div><div class='add'>+		.input	= "\x0c\x0d\x0e\x0f\x10\x11\x12\x13"</div><div class='add'>+			  "\x14\x15\x16\x17\x18\x19\x1a\x1b"</div><div class='add'>+			  "\x1c\x1d\x1e",</div><div class='add'>+		.ilen	= 19,</div><div class='add'>+		.result	= "\x07\x34\x25\x94\x15\x77\x85\x15"</div><div class='add'>+			  "\x2b\x07\x40\x98\x33\x0a\xbb\x14"</div><div class='add'>+			  "\x1b\x94\x7b\x56\x6a\xa9\x40\x6b"</div><div class='add'>+			  "\x4d\x99\x99\x88\xdd",</div><div class='add'>+		.rlen	= 29,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\xd7\x82\x8d\x13\xb2\xb0\xbd\xc3"</div><div class='add'>+			  "\x25\xa7\x62\x36\xdf\x93\xcc\x6b",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.iv	= "\x01\x00\x33\x56\x8e\xf7\xb2\x63"</div><div class='add'>+			  "\x3c\x96\x96\x76\x6c\xfa\x00\x00",</div><div class='add'>+		.assoc	= "\x63\x01\x8f\x76\xdc\x8a\x1b\xcb",</div><div class='add'>+		.alen	= 8,</div><div class='add'>+		.input	= "\x90\x20\xea\x6f\x91\xbd\xd8\x5a"</div><div class='add'>+			  "\xfa\x00\x39\xba\x4b\xaf\xf9\xbf"</div><div class='add'>+			  "\xb7\x9c\x70\x28\x94\x9c\xd0\xec",</div><div class='add'>+		.ilen	= 24,</div><div class='add'>+		.result	= "\x4c\xcb\x1e\x7c\xa9\x81\xbe\xfa"</div><div class='add'>+			  "\xa0\x72\x6c\x55\xd3\x78\x06\x12"</div><div class='add'>+			  "\x98\xc8\x5c\x92\x81\x4a\xbc\x33"</div><div class='add'>+			  "\xc5\x2e\xe8\x1d\x7d\x77\xc0\x8a",</div><div class='add'>+		.rlen	= 32,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\xd7\x82\x8d\x13\xb2\xb0\xbd\xc3"</div><div class='add'>+			  "\x25\xa7\x62\x36\xdf\x93\xcc\x6b",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.iv	= "\x01\x00\xd5\x60\x91\x2d\x3f\x70"</div><div class='add'>+			  "\x3c\x96\x96\x76\x6c\xfa\x00\x00",</div><div class='add'>+		.assoc	= "\xcd\x90\x44\xd2\xb7\x1f\xdb\x81"</div><div class='add'>+			  "\x20\xea\x60\xc0",</div><div class='add'>+		.alen	= 12,</div><div class='add'>+		.input	= "\x64\x35\xac\xba\xfb\x11\xa8\x2e"</div><div class='add'>+			  "\x2f\x07\x1d\x7c\xa4\xa5\xeb\xd9"</div><div class='add'>+			  "\x3a\x80\x3b\xa8\x7f",</div><div class='add'>+		.ilen	= 21,</div><div class='add'>+		.result	= "\x00\x97\x69\xec\xab\xdf\x48\x62"</div><div class='add'>+			  "\x55\x94\xc5\x92\x51\xe6\x03\x57"</div><div class='add'>+			  "\x22\x67\x5e\x04\xc8\x47\x09\x9e"</div><div class='add'>+			  "\x5a\xe0\x70\x45\x51",</div><div class='add'>+		.rlen	= 29,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\xd7\x82\x8d\x13\xb2\xb0\xbd\xc3"</div><div class='add'>+			  "\x25\xa7\x62\x36\xdf\x93\xcc\x6b",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.iv	= "\x01\x00\x42\xff\xf8\xf1\x95\x1c"</div><div class='add'>+			  "\x3c\x96\x96\x76\x6c\xfa\x00\x00",</div><div class='add'>+		.assoc	= "\xd8\x5b\xc7\xe6\x9f\x94\x4f\xb8",</div><div class='add'>+		.alen	= 8,</div><div class='add'>+		.input	= "\x8a\x19\xb9\x50\xbc\xf7\x1a\x01"</div><div class='add'>+			  "\x8e\x5e\x67\x01\xc9\x17\x87\x65"</div><div class='add'>+			  "\x98\x09\xd6\x7d\xbe\xdd\x18",</div><div class='add'>+		.ilen	= 23,</div><div class='add'>+		.result	= "\xbc\x21\x8d\xaa\x94\x74\x27\xb6"</div><div class='add'>+			  "\xdb\x38\x6a\x99\xac\x1a\xef\x23"</div><div class='add'>+			  "\xad\xe0\xb5\x29\x39\xcb\x6a\x63"</div><div class='add'>+			  "\x7c\xf9\xbe\xc2\x40\x88\x97\xc6"</div><div class='add'>+			  "\xba",</div><div class='add'>+		.rlen	= 33,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct aead_testvec aes_ccm_dec_tv_template[] = {</div><div class='add'>+	{ /* From RFC 3610 */</div><div class='add'>+		.key	= "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7"</div><div class='add'>+			  "\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.iv	= "\x01\x00\x00\x00\x03\x02\x01\x00"</div><div class='add'>+			  "\xa0\xa1\xa2\xa3\xa4\xa5\x00\x00",</div><div class='add'>+		.assoc	= "\x00\x01\x02\x03\x04\x05\x06\x07",</div><div class='add'>+		.alen	= 8,</div><div class='add'>+		.input	= "\x58\x8c\x97\x9a\x61\xc6\x63\xd2"</div><div class='add'>+			  "\xf0\x66\xd0\xc2\xc0\xf9\x89\x80"</div><div class='add'>+			  "\x6d\x5f\x6b\x61\xda\xc3\x84\x17"</div><div class='add'>+			  "\xe8\xd1\x2c\xfd\xf9\x26\xe0",</div><div class='add'>+		.ilen	= 31,</div><div class='add'>+		.result	= "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='add'>+			  "\x10\x11\x12\x13\x14\x15\x16\x17"</div><div class='add'>+			  "\x18\x19\x1a\x1b\x1c\x1d\x1e",</div><div class='add'>+		.rlen	= 23,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7"</div><div class='add'>+			  "\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.iv	= "\x01\x00\x00\x00\x07\x06\x05\x04"</div><div class='add'>+			  "\xa0\xa1\xa2\xa3\xa4\xa5\x00\x00",</div><div class='add'>+		.assoc	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			  "\x08\x09\x0a\x0b",</div><div class='add'>+		.alen	= 12,</div><div class='add'>+		.input	= "\xdc\xf1\xfb\x7b\x5d\x9e\x23\xfb"</div><div class='add'>+			  "\x9d\x4e\x13\x12\x53\x65\x8a\xd8"</div><div class='add'>+			  "\x6e\xbd\xca\x3e\x51\xe8\x3f\x07"</div><div class='add'>+			  "\x7d\x9c\x2d\x93",</div><div class='add'>+		.ilen	= 28,</div><div class='add'>+		.result	= "\x0c\x0d\x0e\x0f\x10\x11\x12\x13"</div><div class='add'>+			  "\x14\x15\x16\x17\x18\x19\x1a\x1b"</div><div class='add'>+			  "\x1c\x1d\x1e\x1f",</div><div class='add'>+		.rlen	= 20,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7"</div><div class='add'>+			  "\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.iv	= "\x01\x00\x00\x00\x0b\x0a\x09\x08"</div><div class='add'>+			  "\xa0\xa1\xa2\xa3\xa4\xa5\x00\x00",</div><div class='add'>+		.assoc	= "\x00\x01\x02\x03\x04\x05\x06\x07",</div><div class='add'>+		.alen	= 8,</div><div class='add'>+		.input	= "\x82\x53\x1a\x60\xcc\x24\x94\x5a"</div><div class='add'>+			  "\x4b\x82\x79\x18\x1a\xb5\xc8\x4d"</div><div class='add'>+			  "\xf2\x1c\xe7\xf9\xb7\x3f\x42\xe1"</div><div class='add'>+			  "\x97\xea\x9c\x07\xe5\x6b\x5e\xb1"</div><div class='add'>+			  "\x7e\x5f\x4e",</div><div class='add'>+		.ilen	= 35,</div><div class='add'>+		.result	= "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='add'>+			  "\x10\x11\x12\x13\x14\x15\x16\x17"</div><div class='add'>+			  "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f"</div><div class='add'>+			  "\x20",</div><div class='add'>+		.rlen	= 25,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7"</div><div class='add'>+			  "\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.iv	= "\x01\x00\x00\x00\x0c\x0b\x0a\x09"</div><div class='add'>+			  "\xa0\xa1\xa2\xa3\xa4\xa5\x00\x00",</div><div class='add'>+		.assoc	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			  "\x08\x09\x0a\x0b",</div><div class='add'>+		.alen	= 12,</div><div class='add'>+		.input	= "\x07\x34\x25\x94\x15\x77\x85\x15"</div><div class='add'>+			  "\x2b\x07\x40\x98\x33\x0a\xbb\x14"</div><div class='add'>+			  "\x1b\x94\x7b\x56\x6a\xa9\x40\x6b"</div><div class='add'>+			  "\x4d\x99\x99\x88\xdd",</div><div class='add'>+		.ilen	= 29,</div><div class='add'>+		.result	= "\x0c\x0d\x0e\x0f\x10\x11\x12\x13"</div><div class='add'>+			  "\x14\x15\x16\x17\x18\x19\x1a\x1b"</div><div class='add'>+			  "\x1c\x1d\x1e",</div><div class='add'>+		.rlen	= 19,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\xd7\x82\x8d\x13\xb2\xb0\xbd\xc3"</div><div class='add'>+			  "\x25\xa7\x62\x36\xdf\x93\xcc\x6b",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.iv	= "\x01\x00\x33\x56\x8e\xf7\xb2\x63"</div><div class='add'>+			  "\x3c\x96\x96\x76\x6c\xfa\x00\x00",</div><div class='add'>+		.assoc	= "\x63\x01\x8f\x76\xdc\x8a\x1b\xcb",</div><div class='add'>+		.alen	= 8,</div><div class='add'>+		.input	= "\x4c\xcb\x1e\x7c\xa9\x81\xbe\xfa"</div><div class='add'>+			  "\xa0\x72\x6c\x55\xd3\x78\x06\x12"</div><div class='add'>+			  "\x98\xc8\x5c\x92\x81\x4a\xbc\x33"</div><div class='add'>+			  "\xc5\x2e\xe8\x1d\x7d\x77\xc0\x8a",</div><div class='add'>+		.ilen	= 32,</div><div class='add'>+		.result	= "\x90\x20\xea\x6f\x91\xbd\xd8\x5a"</div><div class='add'>+			  "\xfa\x00\x39\xba\x4b\xaf\xf9\xbf"</div><div class='add'>+			  "\xb7\x9c\x70\x28\x94\x9c\xd0\xec",</div><div class='add'>+		.rlen	= 24,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\xd7\x82\x8d\x13\xb2\xb0\xbd\xc3"</div><div class='add'>+			  "\x25\xa7\x62\x36\xdf\x93\xcc\x6b",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.iv	= "\x01\x00\xd5\x60\x91\x2d\x3f\x70"</div><div class='add'>+			  "\x3c\x96\x96\x76\x6c\xfa\x00\x00",</div><div class='add'>+		.assoc	= "\xcd\x90\x44\xd2\xb7\x1f\xdb\x81"</div><div class='add'>+			  "\x20\xea\x60\xc0",</div><div class='add'>+		.alen	= 12,</div><div class='add'>+		.input	= "\x00\x97\x69\xec\xab\xdf\x48\x62"</div><div class='add'>+			  "\x55\x94\xc5\x92\x51\xe6\x03\x57"</div><div class='add'>+			  "\x22\x67\x5e\x04\xc8\x47\x09\x9e"</div><div class='add'>+			  "\x5a\xe0\x70\x45\x51",</div><div class='add'>+		.ilen	= 29,</div><div class='add'>+		.result	= "\x64\x35\xac\xba\xfb\x11\xa8\x2e"</div><div class='add'>+			  "\x2f\x07\x1d\x7c\xa4\xa5\xeb\xd9"</div><div class='add'>+			  "\x3a\x80\x3b\xa8\x7f",</div><div class='add'>+		.rlen	= 21,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\xd7\x82\x8d\x13\xb2\xb0\xbd\xc3"</div><div class='add'>+			  "\x25\xa7\x62\x36\xdf\x93\xcc\x6b",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.iv	= "\x01\x00\x42\xff\xf8\xf1\x95\x1c"</div><div class='add'>+			  "\x3c\x96\x96\x76\x6c\xfa\x00\x00",</div><div class='add'>+		.assoc	= "\xd8\x5b\xc7\xe6\x9f\x94\x4f\xb8",</div><div class='add'>+		.alen	= 8,</div><div class='add'>+		.input	= "\xbc\x21\x8d\xaa\x94\x74\x27\xb6"</div><div class='add'>+			  "\xdb\x38\x6a\x99\xac\x1a\xef\x23"</div><div class='add'>+			  "\xad\xe0\xb5\x29\x39\xcb\x6a\x63"</div><div class='add'>+			  "\x7c\xf9\xbe\xc2\x40\x88\x97\xc6"</div><div class='add'>+			  "\xba",</div><div class='add'>+		.ilen	= 33,</div><div class='add'>+		.result	= "\x8a\x19\xb9\x50\xbc\xf7\x1a\x01"</div><div class='add'>+			  "\x8e\x5e\x67\x01\xc9\x17\x87\x65"</div><div class='add'>+			  "\x98\x09\xd6\x7d\xbe\xdd\x18",</div><div class='add'>+		.rlen	= 23,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Cast5 test vectors from RFC 2144 */</div><div class='add'>+#define CAST5_ENC_TEST_VECTORS	3</div><div class='add'>+#define CAST5_DEC_TEST_VECTORS	3</div><div class='add'>+</div><div class='add'>+static struct cipher_testvec cast5_enc_tv_template[] = {</div><div class='add'>+	{</div><div class='add'>+		.key	= "\x01\x23\x45\x67\x12\x34\x56\x78"</div><div class='add'>+			  "\x23\x45\x67\x89\x34\x56\x78\x9a",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.input	= "\x01\x23\x45\x67\x89\xab\xcd\xef",</div><div class='add'>+		.ilen	= 8,</div><div class='add'>+		.result	= "\x23\x8b\x4f\xe5\x84\x7e\x44\xb2",</div><div class='add'>+		.rlen	= 8,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x01\x23\x45\x67\x12\x34\x56\x78"</div><div class='add'>+			  "\x23\x45",</div><div class='add'>+		.klen	= 10,</div><div class='add'>+		.input	= "\x01\x23\x45\x67\x89\xab\xcd\xef",</div><div class='add'>+		.ilen	= 8,</div><div class='add'>+		.result	= "\xeb\x6a\x71\x1a\x2c\x02\x27\x1b",</div><div class='add'>+		.rlen	= 8,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x01\x23\x45\x67\x12",</div><div class='add'>+		.klen	= 5,</div><div class='add'>+		.input	= "\x01\x23\x45\x67\x89\xab\xcd\xef",</div><div class='add'>+		.ilen	= 8,</div><div class='add'>+		.result	= "\x7a\xc8\x16\xd1\x6e\x9b\x30\x2e",</div><div class='add'>+		.rlen	= 8,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct cipher_testvec cast5_dec_tv_template[] = {</div><div class='add'>+	{</div><div class='add'>+		.key	= "\x01\x23\x45\x67\x12\x34\x56\x78"</div><div class='add'>+			  "\x23\x45\x67\x89\x34\x56\x78\x9a",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.input	= "\x23\x8b\x4f\xe5\x84\x7e\x44\xb2",</div><div class='add'>+		.ilen	= 8,</div><div class='add'>+		.result	= "\x01\x23\x45\x67\x89\xab\xcd\xef",</div><div class='add'>+		.rlen	= 8,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x01\x23\x45\x67\x12\x34\x56\x78"</div><div class='add'>+			  "\x23\x45",</div><div class='add'>+		.klen	= 10,</div><div class='add'>+		.input	= "\xeb\x6a\x71\x1a\x2c\x02\x27\x1b",</div><div class='add'>+		.ilen	= 8,</div><div class='add'>+		.result	= "\x01\x23\x45\x67\x89\xab\xcd\xef",</div><div class='add'>+		.rlen	= 8,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x01\x23\x45\x67\x12",</div><div class='add'>+		.klen	= 5,</div><div class='add'>+		.input	= "\x7a\xc8\x16\xd1\x6e\x9b\x30\x2e",</div><div class='add'>+		.ilen	= 8,</div><div class='add'>+		.result	= "\x01\x23\x45\x67\x89\xab\xcd\xef",</div><div class='add'>+		.rlen	= 8,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * ARC4 test vectors from OpenSSL</div><div class='add'>+ */</div><div class='add'>+#define ARC4_ENC_TEST_VECTORS	7</div><div class='add'>+#define ARC4_DEC_TEST_VECTORS	7</div><div class='add'>+</div><div class='add'>+static struct cipher_testvec arc4_enc_tv_template[] = {</div><div class='add'>+	{</div><div class='add'>+		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef",</div><div class='add'>+		.klen	= 8,</div><div class='add'>+		.input	= "\x01\x23\x45\x67\x89\xab\xcd\xef",</div><div class='add'>+		.ilen	= 8,</div><div class='add'>+		.result	= "\x75\xb7\x87\x80\x99\xe0\xc5\x96",</div><div class='add'>+		.rlen	= 8,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef",</div><div class='add'>+		.klen	= 8,</div><div class='add'>+		.input	= "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.ilen	= 8,</div><div class='add'>+		.result	= "\x74\x94\xc2\xe7\x10\x4b\x08\x79",</div><div class='add'>+		.rlen	= 8,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.klen	= 8,</div><div class='add'>+		.input	= "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.ilen	= 8,</div><div class='add'>+		.result	= "\xde\x18\x89\x41\xa3\x37\x5d\x3a",</div><div class='add'>+		.rlen	= 8,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\xef\x01\x23\x45",</div><div class='add'>+		.klen	= 4,</div><div class='add'>+		.input	= "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00",</div><div class='add'>+		.ilen	= 20,</div><div class='add'>+		.result	= "\xd6\xa1\x41\xa7\xec\x3c\x38\xdf"</div><div class='add'>+			  "\xbd\x61\x5a\x11\x62\xe1\xc7\xba"</div><div class='add'>+			  "\x36\xb6\x78\x58",</div><div class='add'>+		.rlen	= 20,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef",</div><div class='add'>+		.klen	= 8,</div><div class='add'>+		.input	= "\x12\x34\x56\x78\x9A\xBC\xDE\xF0"</div><div class='add'>+			  "\x12\x34\x56\x78\x9A\xBC\xDE\xF0"</div><div class='add'>+			  "\x12\x34\x56\x78\x9A\xBC\xDE\xF0"</div><div class='add'>+			  "\x12\x34\x56\x78",</div><div class='add'>+		.ilen	= 28,</div><div class='add'>+		.result	= "\x66\xa0\x94\x9f\x8a\xf7\xd6\x89"</div><div class='add'>+			  "\x1f\x7f\x83\x2b\xa8\x33\xc0\x0c"</div><div class='add'>+			  "\x89\x2e\xbe\x30\x14\x3c\xe2\x87"</div><div class='add'>+			  "\x40\x01\x1e\xcf",</div><div class='add'>+		.rlen	= 28,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\xef\x01\x23\x45",</div><div class='add'>+		.klen	= 4,</div><div class='add'>+		.input	= "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00",</div><div class='add'>+		.ilen	= 10,</div><div class='add'>+		.result	= "\xd6\xa1\x41\xa7\xec\x3c\x38\xdf"</div><div class='add'>+			  "\xbd\x61",</div><div class='add'>+		.rlen	= 10,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x01\x23\x45\x67\x89\xAB\xCD\xEF"</div><div class='add'>+			"\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.input	= "\x01\x23\x45\x67\x89\xAB\xCD\xEF",</div><div class='add'>+		.ilen	= 8,</div><div class='add'>+		.result	= "\x69\x72\x36\x59\x1B\x52\x42\xB1",</div><div class='add'>+		.rlen	= 8,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct cipher_testvec arc4_dec_tv_template[] = {</div><div class='add'>+	{</div><div class='add'>+		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef",</div><div class='add'>+		.klen	= 8,</div><div class='add'>+		.input	= "\x75\xb7\x87\x80\x99\xe0\xc5\x96",</div><div class='add'>+		.ilen	= 8,</div><div class='add'>+		.result	= "\x01\x23\x45\x67\x89\xab\xcd\xef",</div><div class='add'>+		.rlen	= 8,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef",</div><div class='add'>+		.klen	= 8,</div><div class='add'>+		.input	= "\x74\x94\xc2\xe7\x10\x4b\x08\x79",</div><div class='add'>+		.ilen	= 8,</div><div class='add'>+		.result	= "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.rlen	= 8,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.klen	= 8,</div><div class='add'>+		.input	= "\xde\x18\x89\x41\xa3\x37\x5d\x3a",</div><div class='add'>+		.ilen	= 8,</div><div class='add'>+		.result	= "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.rlen	= 8,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\xef\x01\x23\x45",</div><div class='add'>+		.klen	= 4,</div><div class='add'>+		.input	= "\xd6\xa1\x41\xa7\xec\x3c\x38\xdf"</div><div class='add'>+			  "\xbd\x61\x5a\x11\x62\xe1\xc7\xba"</div><div class='add'>+			  "\x36\xb6\x78\x58",</div><div class='add'>+		.ilen	= 20,</div><div class='add'>+		.result	= "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00",</div><div class='add'>+		.rlen	= 20,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef",</div><div class='add'>+		.klen	= 8,</div><div class='add'>+		.input	= "\x66\xa0\x94\x9f\x8a\xf7\xd6\x89"</div><div class='add'>+			  "\x1f\x7f\x83\x2b\xa8\x33\xc0\x0c"</div><div class='add'>+			  "\x89\x2e\xbe\x30\x14\x3c\xe2\x87"</div><div class='add'>+			  "\x40\x01\x1e\xcf",</div><div class='add'>+		.ilen	= 28,</div><div class='add'>+		.result	= "\x12\x34\x56\x78\x9A\xBC\xDE\xF0"</div><div class='add'>+			  "\x12\x34\x56\x78\x9A\xBC\xDE\xF0"</div><div class='add'>+			  "\x12\x34\x56\x78\x9A\xBC\xDE\xF0"</div><div class='add'>+			  "\x12\x34\x56\x78",</div><div class='add'>+		.rlen	= 28,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\xef\x01\x23\x45",</div><div class='add'>+		.klen	= 4,</div><div class='add'>+		.input	= "\xd6\xa1\x41\xa7\xec\x3c\x38\xdf"</div><div class='add'>+			  "\xbd\x61",</div><div class='add'>+		.ilen	= 10,</div><div class='add'>+		.result	= "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00",</div><div class='add'>+		.rlen	= 10,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x01\x23\x45\x67\x89\xAB\xCD\xEF"</div><div class='add'>+			"\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.input	= "\x69\x72\x36\x59\x1B\x52\x42\xB1",</div><div class='add'>+		.ilen	= 8,</div><div class='add'>+		.result	= "\x01\x23\x45\x67\x89\xAB\xCD\xEF",</div><div class='add'>+		.rlen	= 8,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * TEA test vectors</div><div class='add'>+ */</div><div class='add'>+#define TEA_ENC_TEST_VECTORS	4</div><div class='add'>+#define TEA_DEC_TEST_VECTORS	4</div><div class='add'>+</div><div class='add'>+static struct cipher_testvec tea_enc_tv_template[] = {</div><div class='add'>+	{</div><div class='add'>+		.key    = zeroed_string,</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.input  = zeroed_string,</div><div class='add'>+		.ilen	= 8,</div><div class='add'>+		.result	= "\x0a\x3a\xea\x41\x40\xa9\xba\x94",</div><div class='add'>+		.rlen	= 8,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x2b\x02\x05\x68\x06\x14\x49\x76"</div><div class='add'>+			  "\x77\x5d\x0e\x26\x6c\x28\x78\x43",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.input	= "\x74\x65\x73\x74\x20\x6d\x65\x2e",</div><div class='add'>+		.ilen	= 8,</div><div class='add'>+		.result	= "\x77\x5d\x2a\x6a\xf6\xce\x92\x09",</div><div class='add'>+		.rlen	= 8,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x09\x65\x43\x11\x66\x44\x39\x25"</div><div class='add'>+			  "\x51\x3a\x16\x10\x0a\x08\x12\x6e",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.input	= "\x6c\x6f\x6e\x67\x65\x72\x5f\x74"</div><div class='add'>+			  "\x65\x73\x74\x5f\x76\x65\x63\x74",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\xbe\x7a\xbb\x81\x95\x2d\x1f\x1e"</div><div class='add'>+			  "\xdd\x89\xa1\x25\x04\x21\xdf\x95",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x4d\x76\x32\x17\x05\x3f\x75\x2c"</div><div class='add'>+			  "\x5d\x04\x16\x36\x15\x72\x63\x2f",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.input	= "\x54\x65\x61\x20\x69\x73\x20\x67"</div><div class='add'>+			  "\x6f\x6f\x64\x20\x66\x6f\x72\x20"</div><div class='add'>+			  "\x79\x6f\x75\x21\x21\x21\x20\x72"</div><div class='add'>+			  "\x65\x61\x6c\x6c\x79\x21\x21\x21",</div><div class='add'>+		.ilen	= 32,</div><div class='add'>+		.result	= "\xe0\x4d\x5d\x3c\xb7\x8c\x36\x47"</div><div class='add'>+			  "\x94\x18\x95\x91\xa9\xfc\x49\xf8"</div><div class='add'>+			  "\x44\xd1\x2d\xc2\x99\xb8\x08\x2a"</div><div class='add'>+			  "\x07\x89\x73\xc2\x45\x92\xc6\x90",</div><div class='add'>+		.rlen	= 32,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct cipher_testvec tea_dec_tv_template[] = {</div><div class='add'>+	{</div><div class='add'>+		.key    = zeroed_string,</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.input	= "\x0a\x3a\xea\x41\x40\xa9\xba\x94",</div><div class='add'>+		.ilen	= 8,</div><div class='add'>+		.result = zeroed_string,</div><div class='add'>+		.rlen	= 8,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x2b\x02\x05\x68\x06\x14\x49\x76"</div><div class='add'>+			  "\x77\x5d\x0e\x26\x6c\x28\x78\x43",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.input	= "\x77\x5d\x2a\x6a\xf6\xce\x92\x09",</div><div class='add'>+		.ilen	= 8,</div><div class='add'>+		.result	= "\x74\x65\x73\x74\x20\x6d\x65\x2e",</div><div class='add'>+		.rlen	= 8,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x09\x65\x43\x11\x66\x44\x39\x25"</div><div class='add'>+			  "\x51\x3a\x16\x10\x0a\x08\x12\x6e",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.input	= "\xbe\x7a\xbb\x81\x95\x2d\x1f\x1e"</div><div class='add'>+			  "\xdd\x89\xa1\x25\x04\x21\xdf\x95",</div><div class='add'>+		.ilen   = 16,</div><div class='add'>+		.result	= "\x6c\x6f\x6e\x67\x65\x72\x5f\x74"</div><div class='add'>+			  "\x65\x73\x74\x5f\x76\x65\x63\x74",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x4d\x76\x32\x17\x05\x3f\x75\x2c"</div><div class='add'>+			  "\x5d\x04\x16\x36\x15\x72\x63\x2f",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.input	= "\xe0\x4d\x5d\x3c\xb7\x8c\x36\x47"</div><div class='add'>+			  "\x94\x18\x95\x91\xa9\xfc\x49\xf8"</div><div class='add'>+			  "\x44\xd1\x2d\xc2\x99\xb8\x08\x2a"</div><div class='add'>+			  "\x07\x89\x73\xc2\x45\x92\xc6\x90",</div><div class='add'>+		.ilen	= 32,</div><div class='add'>+		.result	= "\x54\x65\x61\x20\x69\x73\x20\x67"</div><div class='add'>+			  "\x6f\x6f\x64\x20\x66\x6f\x72\x20"</div><div class='add'>+			  "\x79\x6f\x75\x21\x21\x21\x20\x72"</div><div class='add'>+			  "\x65\x61\x6c\x6c\x79\x21\x21\x21",</div><div class='add'>+		.rlen	= 32,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * XTEA test vectors</div><div class='add'>+ */</div><div class='add'>+#define XTEA_ENC_TEST_VECTORS	4</div><div class='add'>+#define XTEA_DEC_TEST_VECTORS	4</div><div class='add'>+</div><div class='add'>+static struct cipher_testvec xtea_enc_tv_template[] = {</div><div class='add'>+	{</div><div class='add'>+		.key    = zeroed_string,</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.input  = zeroed_string,</div><div class='add'>+		.ilen	= 8,</div><div class='add'>+		.result	= "\xd8\xd4\xe9\xde\xd9\x1e\x13\xf7",</div><div class='add'>+		.rlen	= 8,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x2b\x02\x05\x68\x06\x14\x49\x76"</div><div class='add'>+			  "\x77\x5d\x0e\x26\x6c\x28\x78\x43",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.input	= "\x74\x65\x73\x74\x20\x6d\x65\x2e",</div><div class='add'>+		.ilen	= 8,</div><div class='add'>+		.result	= "\x94\xeb\xc8\x96\x84\x6a\x49\xa8",</div><div class='add'>+		.rlen	= 8,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x09\x65\x43\x11\x66\x44\x39\x25"</div><div class='add'>+			  "\x51\x3a\x16\x10\x0a\x08\x12\x6e",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.input	= "\x6c\x6f\x6e\x67\x65\x72\x5f\x74"</div><div class='add'>+			  "\x65\x73\x74\x5f\x76\x65\x63\x74",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\x3e\xce\xae\x22\x60\x56\xa8\x9d"</div><div class='add'>+			  "\x77\x4d\xd4\xb4\x87\x24\xe3\x9a",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x4d\x76\x32\x17\x05\x3f\x75\x2c"</div><div class='add'>+			  "\x5d\x04\x16\x36\x15\x72\x63\x2f",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.input	= "\x54\x65\x61\x20\x69\x73\x20\x67"</div><div class='add'>+			  "\x6f\x6f\x64\x20\x66\x6f\x72\x20"</div><div class='add'>+			  "\x79\x6f\x75\x21\x21\x21\x20\x72"</div><div class='add'>+			  "\x65\x61\x6c\x6c\x79\x21\x21\x21",</div><div class='add'>+		.ilen	= 32,</div><div class='add'>+		.result	= "\x99\x81\x9f\x5d\x6f\x4b\x31\x3a"</div><div class='add'>+			  "\x86\xff\x6f\xd0\xe3\x87\x70\x07"</div><div class='add'>+			  "\x4d\xb8\xcf\xf3\x99\x50\xb3\xd4"</div><div class='add'>+			  "\x73\xa2\xfa\xc9\x16\x59\x5d\x81",</div><div class='add'>+		.rlen	= 32,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct cipher_testvec xtea_dec_tv_template[] = {</div><div class='add'>+	{</div><div class='add'>+		.key    = zeroed_string,</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.input	= "\xd8\xd4\xe9\xde\xd9\x1e\x13\xf7",</div><div class='add'>+		.ilen	= 8,</div><div class='add'>+		.result = zeroed_string,</div><div class='add'>+		.rlen	= 8,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x2b\x02\x05\x68\x06\x14\x49\x76"</div><div class='add'>+			  "\x77\x5d\x0e\x26\x6c\x28\x78\x43",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.input	= "\x94\xeb\xc8\x96\x84\x6a\x49\xa8",</div><div class='add'>+		.ilen	= 8,</div><div class='add'>+		.result	= "\x74\x65\x73\x74\x20\x6d\x65\x2e",</div><div class='add'>+		.rlen	= 8,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x09\x65\x43\x11\x66\x44\x39\x25"</div><div class='add'>+			  "\x51\x3a\x16\x10\x0a\x08\x12\x6e",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.input	= "\x3e\xce\xae\x22\x60\x56\xa8\x9d"</div><div class='add'>+			  "\x77\x4d\xd4\xb4\x87\x24\xe3\x9a",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\x6c\x6f\x6e\x67\x65\x72\x5f\x74"</div><div class='add'>+			  "\x65\x73\x74\x5f\x76\x65\x63\x74",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x4d\x76\x32\x17\x05\x3f\x75\x2c"</div><div class='add'>+			  "\x5d\x04\x16\x36\x15\x72\x63\x2f",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.input	= "\x99\x81\x9f\x5d\x6f\x4b\x31\x3a"</div><div class='add'>+			  "\x86\xff\x6f\xd0\xe3\x87\x70\x07"</div><div class='add'>+			  "\x4d\xb8\xcf\xf3\x99\x50\xb3\xd4"</div><div class='add'>+			  "\x73\xa2\xfa\xc9\x16\x59\x5d\x81",</div><div class='add'>+		.ilen	= 32,</div><div class='add'>+		.result	= "\x54\x65\x61\x20\x69\x73\x20\x67"</div><div class='add'>+			  "\x6f\x6f\x64\x20\x66\x6f\x72\x20"</div><div class='add'>+			  "\x79\x6f\x75\x21\x21\x21\x20\x72"</div><div class='add'>+			  "\x65\x61\x6c\x6c\x79\x21\x21\x21",</div><div class='add'>+		.rlen	= 32,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * KHAZAD test vectors.</div><div class='add'>+ */</div><div class='add'>+#define KHAZAD_ENC_TEST_VECTORS 5</div><div class='add'>+#define KHAZAD_DEC_TEST_VECTORS 5</div><div class='add'>+</div><div class='add'>+static struct cipher_testvec khazad_enc_tv_template[] = {</div><div class='add'>+	{</div><div class='add'>+		.key	= "\x80\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.input	= "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.ilen	= 8,</div><div class='add'>+		.result	= "\x49\xa4\xce\x32\xac\x19\x0e\x3f",</div><div class='add'>+		.rlen	= 8,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x38\x38\x38\x38\x38\x38\x38\x38"</div><div class='add'>+			  "\x38\x38\x38\x38\x38\x38\x38\x38",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.input	= "\x38\x38\x38\x38\x38\x38\x38\x38",</div><div class='add'>+		.ilen	= 8,</div><div class='add'>+		.result	= "\x7e\x82\x12\xa1\xd9\x5b\xe4\xf9",</div><div class='add'>+		.rlen	= 8,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\xa2\xa2\xa2\xa2\xa2\xa2\xa2\xa2"</div><div class='add'>+			"\xa2\xa2\xa2\xa2\xa2\xa2\xa2\xa2",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.input	= "\xa2\xa2\xa2\xa2\xa2\xa2\xa2\xa2",</div><div class='add'>+		.ilen	= 8,</div><div class='add'>+		.result	= "\xaa\xbe\xc1\x95\xc5\x94\x1a\x9c",</div><div class='add'>+		.rlen	= 8,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x2f\x2f\x2f\x2f\x2f\x2f\x2f\x2f"</div><div class='add'>+			"\x2f\x2f\x2f\x2f\x2f\x2f\x2f\x2f",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.input	= "\x2f\x2f\x2f\x2f\x2f\x2f\x2f\x2f",</div><div class='add'>+		.ilen	= 8,</div><div class='add'>+		.result = "\x04\x74\xf5\x70\x50\x16\xd3\xb8",</div><div class='add'>+		.rlen	= 8,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x2f\x2f\x2f\x2f\x2f\x2f\x2f\x2f"</div><div class='add'>+			"\x2f\x2f\x2f\x2f\x2f\x2f\x2f\x2f",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.input	= "\x2f\x2f\x2f\x2f\x2f\x2f\x2f\x2f"</div><div class='add'>+			"\x2f\x2f\x2f\x2f\x2f\x2f\x2f\x2f",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result = "\x04\x74\xf5\x70\x50\x16\xd3\xb8"</div><div class='add'>+			"\x04\x74\xf5\x70\x50\x16\xd3\xb8",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct cipher_testvec khazad_dec_tv_template[] = {</div><div class='add'>+	{</div><div class='add'>+		.key	= "\x80\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.input	= "\x49\xa4\xce\x32\xac\x19\x0e\x3f",</div><div class='add'>+		.ilen	= 8,</div><div class='add'>+		.result	= "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.rlen	= 8,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x38\x38\x38\x38\x38\x38\x38\x38"</div><div class='add'>+			  "\x38\x38\x38\x38\x38\x38\x38\x38",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.input	= "\x7e\x82\x12\xa1\xd9\x5b\xe4\xf9",</div><div class='add'>+		.ilen	= 8,</div><div class='add'>+		.result	= "\x38\x38\x38\x38\x38\x38\x38\x38",</div><div class='add'>+		.rlen	= 8,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\xa2\xa2\xa2\xa2\xa2\xa2\xa2\xa2"</div><div class='add'>+			"\xa2\xa2\xa2\xa2\xa2\xa2\xa2\xa2",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.input	= "\xaa\xbe\xc1\x95\xc5\x94\x1a\x9c",</div><div class='add'>+		.ilen	= 8,</div><div class='add'>+		.result	= "\xa2\xa2\xa2\xa2\xa2\xa2\xa2\xa2",</div><div class='add'>+		.rlen	= 8,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x2f\x2f\x2f\x2f\x2f\x2f\x2f\x2f"</div><div class='add'>+			"\x2f\x2f\x2f\x2f\x2f\x2f\x2f\x2f",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.input  = "\x04\x74\xf5\x70\x50\x16\xd3\xb8",</div><div class='add'>+		.ilen	= 8,</div><div class='add'>+		.result	= "\x2f\x2f\x2f\x2f\x2f\x2f\x2f\x2f",</div><div class='add'>+		.rlen	= 8,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x2f\x2f\x2f\x2f\x2f\x2f\x2f\x2f"</div><div class='add'>+			"\x2f\x2f\x2f\x2f\x2f\x2f\x2f\x2f",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.input  = "\x04\x74\xf5\x70\x50\x16\xd3\xb8"</div><div class='add'>+			"\x04\x74\xf5\x70\x50\x16\xd3\xb8",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\x2f\x2f\x2f\x2f\x2f\x2f\x2f\x2f"</div><div class='add'>+			"\x2f\x2f\x2f\x2f\x2f\x2f\x2f\x2f",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Anubis test vectors.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define ANUBIS_ENC_TEST_VECTORS			5</div><div class='add'>+#define ANUBIS_DEC_TEST_VECTORS			5</div><div class='add'>+#define ANUBIS_CBC_ENC_TEST_VECTORS		2</div><div class='add'>+#define ANUBIS_CBC_DEC_TEST_VECTORS		2</div><div class='add'>+</div><div class='add'>+static struct cipher_testvec anubis_enc_tv_template[] = {</div><div class='add'>+	{</div><div class='add'>+		.key	= "\xfe\xfe\xfe\xfe\xfe\xfe\xfe\xfe"</div><div class='add'>+			  "\xfe\xfe\xfe\xfe\xfe\xfe\xfe\xfe",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.input	= "\xfe\xfe\xfe\xfe\xfe\xfe\xfe\xfe"</div><div class='add'>+			  "\xfe\xfe\xfe\xfe\xfe\xfe\xfe\xfe",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\x6d\xc5\xda\xa2\x26\x7d\x62\x6f"</div><div class='add'>+			  "\x08\xb7\x52\x8e\x6e\x6e\x86\x90",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+</div><div class='add'>+		.key	= "\x03\x03\x03\x03\x03\x03\x03\x03"</div><div class='add'>+			  "\x03\x03\x03\x03\x03\x03\x03\x03"</div><div class='add'>+			  "\x03\x03\x03\x03",</div><div class='add'>+		.klen	= 20,</div><div class='add'>+		.input	= "\x03\x03\x03\x03\x03\x03\x03\x03"</div><div class='add'>+			  "\x03\x03\x03\x03\x03\x03\x03\x03",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\xdb\xf1\x42\xf4\xd1\x8a\xc7\x49"</div><div class='add'>+			  "\x87\x41\x6f\x82\x0a\x98\x64\xae",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x24\x24\x24\x24\x24\x24\x24\x24"</div><div class='add'>+			  "\x24\x24\x24\x24\x24\x24\x24\x24"</div><div class='add'>+			  "\x24\x24\x24\x24\x24\x24\x24\x24"</div><div class='add'>+			  "\x24\x24\x24\x24",</div><div class='add'>+		.klen	= 28,</div><div class='add'>+		.input	= "\x24\x24\x24\x24\x24\x24\x24\x24"</div><div class='add'>+			  "\x24\x24\x24\x24\x24\x24\x24\x24",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\xfd\x1b\x4a\xe3\xbf\xf0\xad\x3d"</div><div class='add'>+			  "\x06\xd3\x61\x27\xfd\x13\x9e\xde",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x25\x25\x25\x25\x25\x25\x25\x25"</div><div class='add'>+			  "\x25\x25\x25\x25\x25\x25\x25\x25"</div><div class='add'>+			  "\x25\x25\x25\x25\x25\x25\x25\x25"</div><div class='add'>+			  "\x25\x25\x25\x25\x25\x25\x25\x25",</div><div class='add'>+		.klen	= 32,</div><div class='add'>+		.input	= "\x25\x25\x25\x25\x25\x25\x25\x25"</div><div class='add'>+			  "\x25\x25\x25\x25\x25\x25\x25\x25",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\x1a\x91\xfb\x2b\xb7\x78\x6b\xc4"</div><div class='add'>+			"\x17\xd9\xff\x40\x3b\x0e\xe5\xfe",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x35\x35\x35\x35\x35\x35\x35\x35"</div><div class='add'>+			  "\x35\x35\x35\x35\x35\x35\x35\x35"</div><div class='add'>+			  "\x35\x35\x35\x35\x35\x35\x35\x35"</div><div class='add'>+			  "\x35\x35\x35\x35\x35\x35\x35\x35"</div><div class='add'>+			  "\x35\x35\x35\x35\x35\x35\x35\x35",</div><div class='add'>+		.klen	= 40,</div><div class='add'>+		.input	= "\x35\x35\x35\x35\x35\x35\x35\x35"</div><div class='add'>+			  "\x35\x35\x35\x35\x35\x35\x35\x35",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result = "\xa5\x2c\x85\x6f\x9c\xba\xa0\x97"</div><div class='add'>+			  "\x9e\xc6\x84\x0f\x17\x21\x07\xee",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct cipher_testvec anubis_dec_tv_template[] = {</div><div class='add'>+	{</div><div class='add'>+		.key	= "\xfe\xfe\xfe\xfe\xfe\xfe\xfe\xfe"</div><div class='add'>+			  "\xfe\xfe\xfe\xfe\xfe\xfe\xfe\xfe",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.input	= "\x6d\xc5\xda\xa2\x26\x7d\x62\x6f"</div><div class='add'>+			  "\x08\xb7\x52\x8e\x6e\x6e\x86\x90",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\xfe\xfe\xfe\xfe\xfe\xfe\xfe\xfe"</div><div class='add'>+			  "\xfe\xfe\xfe\xfe\xfe\xfe\xfe\xfe",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+</div><div class='add'>+		.key	= "\x03\x03\x03\x03\x03\x03\x03\x03"</div><div class='add'>+			  "\x03\x03\x03\x03\x03\x03\x03\x03"</div><div class='add'>+			  "\x03\x03\x03\x03",</div><div class='add'>+		.klen	= 20,</div><div class='add'>+		.input	= "\xdb\xf1\x42\xf4\xd1\x8a\xc7\x49"</div><div class='add'>+			  "\x87\x41\x6f\x82\x0a\x98\x64\xae",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\x03\x03\x03\x03\x03\x03\x03\x03"</div><div class='add'>+			  "\x03\x03\x03\x03\x03\x03\x03\x03",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x24\x24\x24\x24\x24\x24\x24\x24"</div><div class='add'>+			  "\x24\x24\x24\x24\x24\x24\x24\x24"</div><div class='add'>+			  "\x24\x24\x24\x24\x24\x24\x24\x24"</div><div class='add'>+			  "\x24\x24\x24\x24",</div><div class='add'>+		.klen	= 28,</div><div class='add'>+		.input	= "\xfd\x1b\x4a\xe3\xbf\xf0\xad\x3d"</div><div class='add'>+			  "\x06\xd3\x61\x27\xfd\x13\x9e\xde",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\x24\x24\x24\x24\x24\x24\x24\x24"</div><div class='add'>+			  "\x24\x24\x24\x24\x24\x24\x24\x24",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x25\x25\x25\x25\x25\x25\x25\x25"</div><div class='add'>+			  "\x25\x25\x25\x25\x25\x25\x25\x25"</div><div class='add'>+			  "\x25\x25\x25\x25\x25\x25\x25\x25"</div><div class='add'>+			  "\x25\x25\x25\x25\x25\x25\x25\x25",</div><div class='add'>+		.klen	= 32,</div><div class='add'>+		.input	= "\x1a\x91\xfb\x2b\xb7\x78\x6b\xc4"</div><div class='add'>+			"\x17\xd9\xff\x40\x3b\x0e\xe5\xfe",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\x25\x25\x25\x25\x25\x25\x25\x25"</div><div class='add'>+			  "\x25\x25\x25\x25\x25\x25\x25\x25",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x35\x35\x35\x35\x35\x35\x35\x35"</div><div class='add'>+			  "\x35\x35\x35\x35\x35\x35\x35\x35"</div><div class='add'>+			  "\x35\x35\x35\x35\x35\x35\x35\x35"</div><div class='add'>+			  "\x35\x35\x35\x35\x35\x35\x35\x35"</div><div class='add'>+			  "\x35\x35\x35\x35\x35\x35\x35\x35",</div><div class='add'>+		.input = "\xa5\x2c\x85\x6f\x9c\xba\xa0\x97"</div><div class='add'>+			 "\x9e\xc6\x84\x0f\x17\x21\x07\xee",</div><div class='add'>+		.klen	= 40,</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\x35\x35\x35\x35\x35\x35\x35\x35"</div><div class='add'>+			  "\x35\x35\x35\x35\x35\x35\x35\x35",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct cipher_testvec anubis_cbc_enc_tv_template[] = {</div><div class='add'>+	{</div><div class='add'>+		.key	= "\xfe\xfe\xfe\xfe\xfe\xfe\xfe\xfe"</div><div class='add'>+			  "\xfe\xfe\xfe\xfe\xfe\xfe\xfe\xfe",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.input	= "\xfe\xfe\xfe\xfe\xfe\xfe\xfe\xfe"</div><div class='add'>+			  "\xfe\xfe\xfe\xfe\xfe\xfe\xfe\xfe"</div><div class='add'>+			  "\xfe\xfe\xfe\xfe\xfe\xfe\xfe\xfe"</div><div class='add'>+			  "\xfe\xfe\xfe\xfe\xfe\xfe\xfe\xfe",</div><div class='add'>+		.ilen	= 32,</div><div class='add'>+		.result	= "\x6d\xc5\xda\xa2\x26\x7d\x62\x6f"</div><div class='add'>+			  "\x08\xb7\x52\x8e\x6e\x6e\x86\x90"</div><div class='add'>+			  "\x86\xd8\xb5\x6f\x98\x5e\x8a\x66"</div><div class='add'>+			  "\x4f\x1f\x78\xa1\xbb\x37\xf1\xbe",</div><div class='add'>+		.rlen	= 32,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x35\x35\x35\x35\x35\x35\x35\x35"</div><div class='add'>+			  "\x35\x35\x35\x35\x35\x35\x35\x35"</div><div class='add'>+			  "\x35\x35\x35\x35\x35\x35\x35\x35"</div><div class='add'>+			  "\x35\x35\x35\x35\x35\x35\x35\x35"</div><div class='add'>+			  "\x35\x35\x35\x35\x35\x35\x35\x35",</div><div class='add'>+		.klen	= 40,</div><div class='add'>+		.input	= "\x35\x35\x35\x35\x35\x35\x35\x35"</div><div class='add'>+			  "\x35\x35\x35\x35\x35\x35\x35\x35"</div><div class='add'>+			  "\x35\x35\x35\x35\x35\x35\x35\x35"</div><div class='add'>+			  "\x35\x35\x35\x35\x35\x35\x35\x35",</div><div class='add'>+		.ilen	= 32,</div><div class='add'>+		.result = "\xa5\x2c\x85\x6f\x9c\xba\xa0\x97"</div><div class='add'>+			  "\x9e\xc6\x84\x0f\x17\x21\x07\xee"</div><div class='add'>+			  "\xa2\xbc\x06\x98\xc6\x4b\xda\x75"</div><div class='add'>+			  "\x2e\xaa\xbe\x58\xce\x01\x5b\xc7",</div><div class='add'>+		.rlen	= 32,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct cipher_testvec anubis_cbc_dec_tv_template[] = {</div><div class='add'>+	{</div><div class='add'>+		.key	= "\xfe\xfe\xfe\xfe\xfe\xfe\xfe\xfe"</div><div class='add'>+			  "\xfe\xfe\xfe\xfe\xfe\xfe\xfe\xfe",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.input	= "\x6d\xc5\xda\xa2\x26\x7d\x62\x6f"</div><div class='add'>+			  "\x08\xb7\x52\x8e\x6e\x6e\x86\x90"</div><div class='add'>+			  "\x86\xd8\xb5\x6f\x98\x5e\x8a\x66"</div><div class='add'>+			  "\x4f\x1f\x78\xa1\xbb\x37\xf1\xbe",</div><div class='add'>+		.ilen	= 32,</div><div class='add'>+		.result	= "\xfe\xfe\xfe\xfe\xfe\xfe\xfe\xfe"</div><div class='add'>+			  "\xfe\xfe\xfe\xfe\xfe\xfe\xfe\xfe"</div><div class='add'>+			  "\xfe\xfe\xfe\xfe\xfe\xfe\xfe\xfe"</div><div class='add'>+			  "\xfe\xfe\xfe\xfe\xfe\xfe\xfe\xfe",</div><div class='add'>+		.rlen	= 32,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x35\x35\x35\x35\x35\x35\x35\x35"</div><div class='add'>+			  "\x35\x35\x35\x35\x35\x35\x35\x35"</div><div class='add'>+			  "\x35\x35\x35\x35\x35\x35\x35\x35"</div><div class='add'>+			  "\x35\x35\x35\x35\x35\x35\x35\x35"</div><div class='add'>+			  "\x35\x35\x35\x35\x35\x35\x35\x35",</div><div class='add'>+		.klen	= 40,</div><div class='add'>+		.input = "\xa5\x2c\x85\x6f\x9c\xba\xa0\x97"</div><div class='add'>+			  "\x9e\xc6\x84\x0f\x17\x21\x07\xee"</div><div class='add'>+			  "\xa2\xbc\x06\x98\xc6\x4b\xda\x75"</div><div class='add'>+			  "\x2e\xaa\xbe\x58\xce\x01\x5b\xc7",</div><div class='add'>+		.ilen	= 32,</div><div class='add'>+		.result	= "\x35\x35\x35\x35\x35\x35\x35\x35"</div><div class='add'>+			  "\x35\x35\x35\x35\x35\x35\x35\x35"</div><div class='add'>+			  "\x35\x35\x35\x35\x35\x35\x35\x35"</div><div class='add'>+			  "\x35\x35\x35\x35\x35\x35\x35\x35",</div><div class='add'>+		.rlen	= 32,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * XETA test vectors</div><div class='add'>+ */</div><div class='add'>+#define XETA_ENC_TEST_VECTORS	4</div><div class='add'>+#define XETA_DEC_TEST_VECTORS	4</div><div class='add'>+</div><div class='add'>+static struct cipher_testvec xeta_enc_tv_template[] = {</div><div class='add'>+	{</div><div class='add'>+		.key    = zeroed_string,</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.input  = zeroed_string,</div><div class='add'>+		.ilen	= 8,</div><div class='add'>+		.result	= "\xaa\x22\x96\xe5\x6c\x61\xf3\x45",</div><div class='add'>+		.rlen	= 8,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x2b\x02\x05\x68\x06\x14\x49\x76"</div><div class='add'>+			  "\x77\x5d\x0e\x26\x6c\x28\x78\x43",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.input	= "\x74\x65\x73\x74\x20\x6d\x65\x2e",</div><div class='add'>+		.ilen	= 8,</div><div class='add'>+		.result	= "\x82\x3e\xeb\x35\xdc\xdd\xd9\xc3",</div><div class='add'>+		.rlen	= 8,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x09\x65\x43\x11\x66\x44\x39\x25"</div><div class='add'>+			  "\x51\x3a\x16\x10\x0a\x08\x12\x6e",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.input	= "\x6c\x6f\x6e\x67\x65\x72\x5f\x74"</div><div class='add'>+			  "\x65\x73\x74\x5f\x76\x65\x63\x74",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\xe2\x04\xdb\xf2\x89\x85\x9e\xea"</div><div class='add'>+			  "\x61\x35\xaa\xed\xb5\xcb\x71\x2c",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x4d\x76\x32\x17\x05\x3f\x75\x2c"</div><div class='add'>+			  "\x5d\x04\x16\x36\x15\x72\x63\x2f",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.input	= "\x54\x65\x61\x20\x69\x73\x20\x67"</div><div class='add'>+			  "\x6f\x6f\x64\x20\x66\x6f\x72\x20"</div><div class='add'>+			  "\x79\x6f\x75\x21\x21\x21\x20\x72"</div><div class='add'>+			  "\x65\x61\x6c\x6c\x79\x21\x21\x21",</div><div class='add'>+		.ilen	= 32,</div><div class='add'>+		.result	= "\x0b\x03\xcd\x8a\xbe\x95\xfd\xb1"</div><div class='add'>+			  "\xc1\x44\x91\x0b\xa5\xc9\x1b\xb4"</div><div class='add'>+			  "\xa9\xda\x1e\x9e\xb1\x3e\x2a\x8f"</div><div class='add'>+			  "\xea\xa5\x6a\x85\xd1\xf4\xa8\xa5",</div><div class='add'>+		.rlen	= 32,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct cipher_testvec xeta_dec_tv_template[] = {</div><div class='add'>+	{</div><div class='add'>+		.key    = zeroed_string,</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.input	= "\xaa\x22\x96\xe5\x6c\x61\xf3\x45",</div><div class='add'>+		.ilen	= 8,</div><div class='add'>+		.result = zeroed_string,</div><div class='add'>+		.rlen	= 8,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x2b\x02\x05\x68\x06\x14\x49\x76"</div><div class='add'>+			  "\x77\x5d\x0e\x26\x6c\x28\x78\x43",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.input	= "\x82\x3e\xeb\x35\xdc\xdd\xd9\xc3",</div><div class='add'>+		.ilen	= 8,</div><div class='add'>+		.result	= "\x74\x65\x73\x74\x20\x6d\x65\x2e",</div><div class='add'>+		.rlen	= 8,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x09\x65\x43\x11\x66\x44\x39\x25"</div><div class='add'>+			  "\x51\x3a\x16\x10\x0a\x08\x12\x6e",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.input	= "\xe2\x04\xdb\xf2\x89\x85\x9e\xea"</div><div class='add'>+			  "\x61\x35\xaa\xed\xb5\xcb\x71\x2c",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\x6c\x6f\x6e\x67\x65\x72\x5f\x74"</div><div class='add'>+			  "\x65\x73\x74\x5f\x76\x65\x63\x74",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x4d\x76\x32\x17\x05\x3f\x75\x2c"</div><div class='add'>+			  "\x5d\x04\x16\x36\x15\x72\x63\x2f",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.input	= "\x0b\x03\xcd\x8a\xbe\x95\xfd\xb1"</div><div class='add'>+			  "\xc1\x44\x91\x0b\xa5\xc9\x1b\xb4"</div><div class='add'>+			  "\xa9\xda\x1e\x9e\xb1\x3e\x2a\x8f"</div><div class='add'>+			  "\xea\xa5\x6a\x85\xd1\xf4\xa8\xa5",</div><div class='add'>+		.ilen	= 32,</div><div class='add'>+		.result	= "\x54\x65\x61\x20\x69\x73\x20\x67"</div><div class='add'>+			  "\x6f\x6f\x64\x20\x66\x6f\x72\x20"</div><div class='add'>+			  "\x79\x6f\x75\x21\x21\x21\x20\x72"</div><div class='add'>+			  "\x65\x61\x6c\x6c\x79\x21\x21\x21",</div><div class='add'>+		.rlen	= 32,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * FCrypt test vectors</div><div class='add'>+ */</div><div class='add'>+#define FCRYPT_ENC_TEST_VECTORS	ARRAY_SIZE(fcrypt_pcbc_enc_tv_template)</div><div class='add'>+#define FCRYPT_DEC_TEST_VECTORS	ARRAY_SIZE(fcrypt_pcbc_dec_tv_template)</div><div class='add'>+</div><div class='add'>+static struct cipher_testvec fcrypt_pcbc_enc_tv_template[] = {</div><div class='add'>+	{ /* http://www.openafs.org/pipermail/openafs-devel/2000-December/005320.html */</div><div class='add'>+		.key	= "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.klen	= 8,</div><div class='add'>+		.iv	= "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.input	= "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.ilen	= 8,</div><div class='add'>+		.result	= "\x0E\x09\x00\xC7\x3E\xF7\xED\x41",</div><div class='add'>+		.rlen	= 8,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x11\x44\x77\xAA\xDD\x00\x33\x66",</div><div class='add'>+		.klen	= 8,</div><div class='add'>+		.iv	= "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.input	= "\x12\x34\x56\x78\x9A\xBC\xDE\xF0",</div><div class='add'>+		.ilen	= 8,</div><div class='add'>+		.result	= "\xD8\xED\x78\x74\x77\xEC\x06\x80",</div><div class='add'>+		.rlen	= 8,</div><div class='add'>+	}, { /* From Arla */</div><div class='add'>+		.key	= "\xf0\xe1\xd2\xc3\xb4\xa5\x96\x87",</div><div class='add'>+		.klen	= 8,</div><div class='add'>+		.iv	= "\xfe\xdc\xba\x98\x76\x54\x32\x10",</div><div class='add'>+		.input	= "The quick brown fox jumps over the lazy dogs.\0\0",</div><div class='add'>+		.ilen	= 48,</div><div class='add'>+		.result	= "\x00\xf0\x0e\x11\x75\xe6\x23\x82"</div><div class='add'>+			  "\xee\xac\x98\x62\x44\x51\xe4\x84"</div><div class='add'>+			  "\xc3\x59\xd8\xaa\x64\x60\xae\xf7"</div><div class='add'>+			  "\xd2\xd9\x13\x79\x72\xa3\x45\x03"</div><div class='add'>+			  "\x23\xb5\x62\xd7\x0c\xf5\x27\xd1"</div><div class='add'>+			  "\xf8\x91\x3c\xac\x44\x22\x92\xef",</div><div class='add'>+		.rlen	= 48,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\xfe\xdc\xba\x98\x76\x54\x32\x10",</div><div class='add'>+		.klen	= 8,</div><div class='add'>+		.iv	= "\xf0\xe1\xd2\xc3\xb4\xa5\x96\x87",</div><div class='add'>+		.input	= "The quick brown fox jumps over the lazy dogs.\0\0",</div><div class='add'>+		.ilen	= 48,</div><div class='add'>+		.result	= "\xca\x90\xf5\x9d\xcb\xd4\xd2\x3c"</div><div class='add'>+			  "\x01\x88\x7f\x3e\x31\x6e\x62\x9d"</div><div class='add'>+			  "\xd8\xe0\x57\xa3\x06\x3a\x42\x58"</div><div class='add'>+			  "\x2a\x28\xfe\x72\x52\x2f\xdd\xe0"</div><div class='add'>+			  "\x19\x89\x09\x1c\x2a\x8e\x8c\x94"</div><div class='add'>+			  "\xfc\xc7\x68\xe4\x88\xaa\xde\x0f",</div><div class='add'>+		.rlen	= 48,</div><div class='add'>+	}, { /* split-page version */</div><div class='add'>+		.key	= "\xfe\xdc\xba\x98\x76\x54\x32\x10",</div><div class='add'>+		.klen	= 8,</div><div class='add'>+		.iv	= "\xf0\xe1\xd2\xc3\xb4\xa5\x96\x87",</div><div class='add'>+		.input	= "The quick brown fox jumps over the lazy dogs.\0\0",</div><div class='add'>+		.ilen	= 48,</div><div class='add'>+		.result	= "\xca\x90\xf5\x9d\xcb\xd4\xd2\x3c"</div><div class='add'>+			  "\x01\x88\x7f\x3e\x31\x6e\x62\x9d"</div><div class='add'>+			  "\xd8\xe0\x57\xa3\x06\x3a\x42\x58"</div><div class='add'>+			  "\x2a\x28\xfe\x72\x52\x2f\xdd\xe0"</div><div class='add'>+			  "\x19\x89\x09\x1c\x2a\x8e\x8c\x94"</div><div class='add'>+			  "\xfc\xc7\x68\xe4\x88\xaa\xde\x0f",</div><div class='add'>+		.rlen	= 48,</div><div class='add'>+		.np	= 2,</div><div class='add'>+		.tap	= { 20, 28 },</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct cipher_testvec fcrypt_pcbc_dec_tv_template[] = {</div><div class='add'>+	{ /* http://www.openafs.org/pipermail/openafs-devel/2000-December/005320.html */</div><div class='add'>+		.key	= "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.klen	= 8,</div><div class='add'>+		.iv	= "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.input	= "\x0E\x09\x00\xC7\x3E\xF7\xED\x41",</div><div class='add'>+		.ilen	= 8,</div><div class='add'>+		.result	= "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.rlen	= 8,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x11\x44\x77\xAA\xDD\x00\x33\x66",</div><div class='add'>+		.klen	= 8,</div><div class='add'>+		.iv	= "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.input	= "\xD8\xED\x78\x74\x77\xEC\x06\x80",</div><div class='add'>+		.ilen	= 8,</div><div class='add'>+		.result	= "\x12\x34\x56\x78\x9A\xBC\xDE\xF0",</div><div class='add'>+		.rlen	= 8,</div><div class='add'>+	}, { /* From Arla */</div><div class='add'>+		.key	= "\xf0\xe1\xd2\xc3\xb4\xa5\x96\x87",</div><div class='add'>+		.klen	= 8,</div><div class='add'>+		.iv	= "\xfe\xdc\xba\x98\x76\x54\x32\x10",</div><div class='add'>+		.input	= "\x00\xf0\x0e\x11\x75\xe6\x23\x82"</div><div class='add'>+			  "\xee\xac\x98\x62\x44\x51\xe4\x84"</div><div class='add'>+			  "\xc3\x59\xd8\xaa\x64\x60\xae\xf7"</div><div class='add'>+			  "\xd2\xd9\x13\x79\x72\xa3\x45\x03"</div><div class='add'>+			  "\x23\xb5\x62\xd7\x0c\xf5\x27\xd1"</div><div class='add'>+			  "\xf8\x91\x3c\xac\x44\x22\x92\xef",</div><div class='add'>+		.ilen	= 48,</div><div class='add'>+		.result	= "The quick brown fox jumps over the lazy dogs.\0\0",</div><div class='add'>+		.rlen	= 48,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\xfe\xdc\xba\x98\x76\x54\x32\x10",</div><div class='add'>+		.klen	= 8,</div><div class='add'>+		.iv	= "\xf0\xe1\xd2\xc3\xb4\xa5\x96\x87",</div><div class='add'>+		.input	= "\xca\x90\xf5\x9d\xcb\xd4\xd2\x3c"</div><div class='add'>+			  "\x01\x88\x7f\x3e\x31\x6e\x62\x9d"</div><div class='add'>+			  "\xd8\xe0\x57\xa3\x06\x3a\x42\x58"</div><div class='add'>+			  "\x2a\x28\xfe\x72\x52\x2f\xdd\xe0"</div><div class='add'>+			  "\x19\x89\x09\x1c\x2a\x8e\x8c\x94"</div><div class='add'>+			  "\xfc\xc7\x68\xe4\x88\xaa\xde\x0f",</div><div class='add'>+		.ilen	= 48,</div><div class='add'>+		.result	= "The quick brown fox jumps over the lazy dogs.\0\0",</div><div class='add'>+		.rlen	= 48,</div><div class='add'>+	}, { /* split-page version */</div><div class='add'>+		.key	= "\xfe\xdc\xba\x98\x76\x54\x32\x10",</div><div class='add'>+		.klen	= 8,</div><div class='add'>+		.iv	= "\xf0\xe1\xd2\xc3\xb4\xa5\x96\x87",</div><div class='add'>+		.input	= "\xca\x90\xf5\x9d\xcb\xd4\xd2\x3c"</div><div class='add'>+			  "\x01\x88\x7f\x3e\x31\x6e\x62\x9d"</div><div class='add'>+			  "\xd8\xe0\x57\xa3\x06\x3a\x42\x58"</div><div class='add'>+			  "\x2a\x28\xfe\x72\x52\x2f\xdd\xe0"</div><div class='add'>+			  "\x19\x89\x09\x1c\x2a\x8e\x8c\x94"</div><div class='add'>+			  "\xfc\xc7\x68\xe4\x88\xaa\xde\x0f",</div><div class='add'>+		.ilen	= 48,</div><div class='add'>+		.result	= "The quick brown fox jumps over the lazy dogs.\0\0",</div><div class='add'>+		.rlen	= 48,</div><div class='add'>+		.np	= 2,</div><div class='add'>+		.tap	= { 20, 28 },</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * CAMELLIA test vectors.</div><div class='add'>+ */</div><div class='add'>+#define CAMELLIA_ENC_TEST_VECTORS 3</div><div class='add'>+#define CAMELLIA_DEC_TEST_VECTORS 3</div><div class='add'>+#define CAMELLIA_CBC_ENC_TEST_VECTORS 2</div><div class='add'>+#define CAMELLIA_CBC_DEC_TEST_VECTORS 2</div><div class='add'>+</div><div class='add'>+static struct cipher_testvec camellia_enc_tv_template[] = {</div><div class='add'>+	{</div><div class='add'>+		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef"</div><div class='add'>+			  "\xfe\xdc\xba\x98\x76\x54\x32\x10",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.input	= "\x01\x23\x45\x67\x89\xab\xcd\xef"</div><div class='add'>+			  "\xfe\xdc\xba\x98\x76\x54\x32\x10",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\x67\x67\x31\x38\x54\x96\x69\x73"</div><div class='add'>+			  "\x08\x57\x06\x56\x48\xea\xbe\x43",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef"</div><div class='add'>+			  "\xfe\xdc\xba\x98\x76\x54\x32\x10"</div><div class='add'>+			  "\x00\x11\x22\x33\x44\x55\x66\x77",</div><div class='add'>+		.klen	= 24,</div><div class='add'>+		.input	= "\x01\x23\x45\x67\x89\xab\xcd\xef"</div><div class='add'>+			  "\xfe\xdc\xba\x98\x76\x54\x32\x10",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\xb4\x99\x34\x01\xb3\xe9\x96\xf8"</div><div class='add'>+			  "\x4e\xe5\xce\xe7\xd7\x9b\x09\xb9",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef"</div><div class='add'>+			  "\xfe\xdc\xba\x98\x76\x54\x32\x10"</div><div class='add'>+			  "\x00\x11\x22\x33\x44\x55\x66\x77"</div><div class='add'>+			  "\x88\x99\xaa\xbb\xcc\xdd\xee\xff",</div><div class='add'>+		.klen	= 32,</div><div class='add'>+		.input	= "\x01\x23\x45\x67\x89\xab\xcd\xef"</div><div class='add'>+			  "\xfe\xdc\xba\x98\x76\x54\x32\x10",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\x9a\xcc\x23\x7d\xff\x16\xd7\x6c"</div><div class='add'>+			  "\x20\xef\x7c\x91\x9e\x3a\x75\x09",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct cipher_testvec camellia_dec_tv_template[] = {</div><div class='add'>+	{</div><div class='add'>+		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef"</div><div class='add'>+			  "\xfe\xdc\xba\x98\x76\x54\x32\x10",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.input	= "\x67\x67\x31\x38\x54\x96\x69\x73"</div><div class='add'>+			  "\x08\x57\x06\x56\x48\xea\xbe\x43",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\x01\x23\x45\x67\x89\xab\xcd\xef"</div><div class='add'>+			  "\xfe\xdc\xba\x98\x76\x54\x32\x10",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef"</div><div class='add'>+			  "\xfe\xdc\xba\x98\x76\x54\x32\x10"</div><div class='add'>+			  "\x00\x11\x22\x33\x44\x55\x66\x77",</div><div class='add'>+		.klen	= 24,</div><div class='add'>+		.input	= "\xb4\x99\x34\x01\xb3\xe9\x96\xf8"</div><div class='add'>+			  "\x4e\xe5\xce\xe7\xd7\x9b\x09\xb9",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\x01\x23\x45\x67\x89\xab\xcd\xef"</div><div class='add'>+			  "\xfe\xdc\xba\x98\x76\x54\x32\x10",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef"</div><div class='add'>+			  "\xfe\xdc\xba\x98\x76\x54\x32\x10"</div><div class='add'>+			  "\x00\x11\x22\x33\x44\x55\x66\x77"</div><div class='add'>+			  "\x88\x99\xaa\xbb\xcc\xdd\xee\xff",</div><div class='add'>+		.klen	= 32,</div><div class='add'>+		.input	= "\x9a\xcc\x23\x7d\xff\x16\xd7\x6c"</div><div class='add'>+			  "\x20\xef\x7c\x91\x9e\x3a\x75\x09",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\x01\x23\x45\x67\x89\xab\xcd\xef"</div><div class='add'>+			  "\xfe\xdc\xba\x98\x76\x54\x32\x10",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct cipher_testvec camellia_cbc_enc_tv_template[] = {</div><div class='add'>+	{</div><div class='add'>+		.key    = "\x06\xa9\x21\x40\x36\xb8\xa1\x5b"</div><div class='add'>+			  "\x51\x2e\x03\xd5\x34\x12\x00\x06",</div><div class='add'>+		.klen   = 16,</div><div class='add'>+		.iv	= "\x3d\xaf\xba\x42\x9d\x9e\xb4\x30"</div><div class='add'>+			  "\xb4\x22\xda\x80\x2c\x9f\xac\x41",</div><div class='add'>+		.input	= "Single block msg",</div><div class='add'>+		.ilen   = 16,</div><div class='add'>+		.result = "\xea\x32\x12\x76\x3b\x50\x10\xe7"</div><div class='add'>+			  "\x18\xf6\xfd\x5d\xf6\x8f\x13\x51",</div><div class='add'>+		.rlen   = 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key    = "\xc2\x86\x69\x6d\x88\x7c\x9a\xa0"</div><div class='add'>+			  "\x61\x1b\xbb\x3e\x20\x25\xa4\x5a",</div><div class='add'>+		.klen   = 16,</div><div class='add'>+		.iv     = "\x56\x2e\x17\x99\x6d\x09\x3d\x28"</div><div class='add'>+			  "\xdd\xb3\xba\x69\x5a\x2e\x6f\x58",</div><div class='add'>+		.input  = "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='add'>+			  "\x10\x11\x12\x13\x14\x15\x16\x17"</div><div class='add'>+			  "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f",</div><div class='add'>+		.ilen   = 32,</div><div class='add'>+		.result = "\xa5\xdf\x6e\x50\xda\x70\x6c\x01"</div><div class='add'>+			  "\x4a\xab\xf3\xf2\xd6\xfc\x6c\xfd"</div><div class='add'>+			  "\x19\xb4\x3e\x57\x1c\x02\x5e\xa0"</div><div class='add'>+			  "\x15\x78\xe0\x5e\xf2\xcb\x87\x16",</div><div class='add'>+		.rlen   = 32,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct cipher_testvec camellia_cbc_dec_tv_template[] = {</div><div class='add'>+	{</div><div class='add'>+		.key    = "\x06\xa9\x21\x40\x36\xb8\xa1\x5b"</div><div class='add'>+			  "\x51\x2e\x03\xd5\x34\x12\x00\x06",</div><div class='add'>+		.klen   = 16,</div><div class='add'>+		.iv	= "\x3d\xaf\xba\x42\x9d\x9e\xb4\x30"</div><div class='add'>+			  "\xb4\x22\xda\x80\x2c\x9f\xac\x41",</div><div class='add'>+		.input	= "\xea\x32\x12\x76\x3b\x50\x10\xe7"</div><div class='add'>+			  "\x18\xf6\xfd\x5d\xf6\x8f\x13\x51",</div><div class='add'>+		.ilen   = 16,</div><div class='add'>+		.result = "Single block msg",</div><div class='add'>+		.rlen   = 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key    = "\xc2\x86\x69\x6d\x88\x7c\x9a\xa0"</div><div class='add'>+			  "\x61\x1b\xbb\x3e\x20\x25\xa4\x5a",</div><div class='add'>+		.klen   = 16,</div><div class='add'>+		.iv     = "\x56\x2e\x17\x99\x6d\x09\x3d\x28"</div><div class='add'>+			  "\xdd\xb3\xba\x69\x5a\x2e\x6f\x58",</div><div class='add'>+		.input = "\xa5\xdf\x6e\x50\xda\x70\x6c\x01"</div><div class='add'>+			  "\x4a\xab\xf3\xf2\xd6\xfc\x6c\xfd"</div><div class='add'>+			  "\x19\xb4\x3e\x57\x1c\x02\x5e\xa0"</div><div class='add'>+			  "\x15\x78\xe0\x5e\xf2\xcb\x87\x16",</div><div class='add'>+		.ilen   = 32,</div><div class='add'>+		.result = "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='add'>+			  "\x10\x11\x12\x13\x14\x15\x16\x17"</div><div class='add'>+			  "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f",</div><div class='add'>+		.rlen   = 32,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * SEED test vectors</div><div class='add'>+ */</div><div class='add'>+#define SEED_ENC_TEST_VECTORS	4</div><div class='add'>+#define SEED_DEC_TEST_VECTORS	4</div><div class='add'>+</div><div class='add'>+static struct cipher_testvec seed_enc_tv_template[] = {</div><div class='add'>+	{</div><div class='add'>+		.key    = zeroed_string,</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.input  = "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\x5e\xba\xc6\xe0\x05\x4e\x16\x68"</div><div class='add'>+			  "\x19\xaf\xf1\xcc\x6d\x34\x6c\xdb",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.input	= zeroed_string,</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\xc1\x1f\x22\xf2\x01\x40\x50\x50"</div><div class='add'>+			  "\x84\x48\x35\x97\xe4\x37\x0f\x43",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x47\x06\x48\x08\x51\xe6\x1b\xe8"</div><div class='add'>+			  "\x5d\x74\xbf\xb3\xfd\x95\x61\x85",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.input	= "\x83\xa2\xf8\xa2\x88\x64\x1f\xb9"</div><div class='add'>+			  "\xa4\xe9\xa5\xcc\x2f\x13\x1c\x7d",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\xee\x54\xd1\x3e\xbc\xae\x70\x6d"</div><div class='add'>+			  "\x22\x6b\xc3\x14\x2c\xd4\x0d\x4a",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x28\xdb\xc3\xbc\x49\xff\xd8\x7d"</div><div class='add'>+			  "\xcf\xa5\x09\xb1\x1d\x42\x2b\xe7",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.input	= "\xb4\x1e\x6b\xe2\xeb\xa8\x4a\x14"</div><div class='add'>+			  "\x8e\x2e\xed\x84\x59\x3c\x5e\xc7",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\x9b\x9b\x7b\xfc\xd1\x81\x3c\xb9"</div><div class='add'>+			  "\x5d\x0b\x36\x18\xf4\x0f\x51\x22",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct cipher_testvec seed_dec_tv_template[] = {</div><div class='add'>+	{</div><div class='add'>+		.key    = zeroed_string,</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.input	= "\x5e\xba\xc6\xe0\x05\x4e\x16\x68"</div><div class='add'>+			  "\x19\xaf\xf1\xcc\x6d\x34\x6c\xdb",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.input	= "\xc1\x1f\x22\xf2\x01\x40\x50\x50"</div><div class='add'>+			  "\x84\x48\x35\x97\xe4\x37\x0f\x43",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= zeroed_string,</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x47\x06\x48\x08\x51\xe6\x1b\xe8"</div><div class='add'>+			  "\x5d\x74\xbf\xb3\xfd\x95\x61\x85",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.input	= "\xee\x54\xd1\x3e\xbc\xae\x70\x6d"</div><div class='add'>+			  "\x22\x6b\xc3\x14\x2c\xd4\x0d\x4a",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\x83\xa2\xf8\xa2\x88\x64\x1f\xb9"</div><div class='add'>+			  "\xa4\xe9\xa5\xcc\x2f\x13\x1c\x7d",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x28\xdb\xc3\xbc\x49\xff\xd8\x7d"</div><div class='add'>+			  "\xcf\xa5\x09\xb1\x1d\x42\x2b\xe7",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.input	= "\x9b\x9b\x7b\xfc\xd1\x81\x3c\xb9"</div><div class='add'>+			  "\x5d\x0b\x36\x18\xf4\x0f\x51\x22",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\xb4\x1e\x6b\xe2\xeb\xa8\x4a\x14"</div><div class='add'>+			  "\x8e\x2e\xed\x84\x59\x3c\x5e\xc7",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define SALSA20_STREAM_ENC_TEST_VECTORS 5</div><div class='add'>+static struct cipher_testvec salsa20_stream_enc_tv_template[] = {</div><div class='add'>+	/*</div><div class='add'>+	* Testvectors from verified.test-vectors submitted to ECRYPT.</div><div class='add'>+	* They are truncated to size 39, 64, 111, 129 to test a variety</div><div class='add'>+	* of input length.</div><div class='add'>+	*/</div><div class='add'>+	{ /* Set 3, vector 0 */</div><div class='add'>+		.key	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			"\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.iv     = "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.input	= "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			"\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.ilen	= 39,</div><div class='add'>+		.result	= "\x2D\xD5\xC3\xF7\xBA\x2B\x20\xF7"</div><div class='add'>+			 "\x68\x02\x41\x0C\x68\x86\x88\x89"</div><div class='add'>+			 "\x5A\xD8\xC1\xBD\x4E\xA6\xC9\xB1"</div><div class='add'>+			 "\x40\xFB\x9B\x90\xE2\x10\x49\xBF"</div><div class='add'>+			 "\x58\x3F\x52\x79\x70\xEB\xC1",</div><div class='add'>+		.rlen	= 39,</div><div class='add'>+	}, { /* Set 5, vector 0 */</div><div class='add'>+		.key	= "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			"\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.iv     = "\x80\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.input	= "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			"\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.ilen	= 64,</div><div class='add'>+		.result	= "\xB6\x6C\x1E\x44\x46\xDD\x95\x57"</div><div class='add'>+			 "\xE5\x78\xE2\x23\xB0\xB7\x68\x01"</div><div class='add'>+			 "\x7B\x23\xB2\x67\xBB\x02\x34\xAE"</div><div class='add'>+			 "\x46\x26\xBF\x44\x3F\x21\x97\x76"</div><div class='add'>+			 "\x43\x6F\xB1\x9F\xD0\xE8\x86\x6F"</div><div class='add'>+			 "\xCD\x0D\xE9\xA9\x53\x8F\x4A\x09"</div><div class='add'>+			 "\xCA\x9A\xC0\x73\x2E\x30\xBC\xF9"</div><div class='add'>+			 "\x8E\x4F\x13\xE4\xB9\xE2\x01\xD9",</div><div class='add'>+		.rlen	= 64,</div><div class='add'>+	}, { /* Set 3, vector 27 */</div><div class='add'>+		.key	= "\x1B\x1C\x1D\x1E\x1F\x20\x21\x22"</div><div class='add'>+			"\x23\x24\x25\x26\x27\x28\x29\x2A"</div><div class='add'>+			"\x2B\x2C\x2D\x2E\x2F\x30\x31\x32"</div><div class='add'>+			"\x33\x34\x35\x36\x37\x38\x39\x3A",</div><div class='add'>+		.klen	= 32,</div><div class='add'>+		.iv     = "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.input	= "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			"\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.ilen	= 111,</div><div class='add'>+		.result	= "\xAE\x39\x50\x8E\xAC\x9A\xEC\xE7"</div><div class='add'>+			 "\xBF\x97\xBB\x20\xB9\xDE\xE4\x1F"</div><div class='add'>+			 "\x87\xD9\x47\xF8\x28\x91\x35\x98"</div><div class='add'>+			 "\xDB\x72\xCC\x23\x29\x48\x56\x5E"</div><div class='add'>+			 "\x83\x7E\x0B\xF3\x7D\x5D\x38\x7B"</div><div class='add'>+			 "\x2D\x71\x02\xB4\x3B\xB5\xD8\x23"</div><div class='add'>+			 "\xB0\x4A\xDF\x3C\xEC\xB6\xD9\x3B"</div><div class='add'>+			 "\x9B\xA7\x52\xBE\xC5\xD4\x50\x59"</div><div class='add'>+			 "\x15\x14\xB4\x0E\x40\xE6\x53\xD1"</div><div class='add'>+			 "\x83\x9C\x5B\xA0\x92\x29\x6B\x5E"</div><div class='add'>+			 "\x96\x5B\x1E\x2F\xD3\xAC\xC1\x92"</div><div class='add'>+			 "\xB1\x41\x3F\x19\x2F\xC4\x3B\xC6"</div><div class='add'>+			 "\x95\x46\x45\x54\xE9\x75\x03\x08"</div><div class='add'>+			 "\x44\xAF\xE5\x8A\x81\x12\x09",</div><div class='add'>+		.rlen	= 111,</div><div class='add'>+	}, { /* Set 5, vector 27 */</div><div class='add'>+		.key	= "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			"\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.klen	= 32,</div><div class='add'>+		.iv     = "\x00\x00\x00\x10\x00\x00\x00\x00",</div><div class='add'>+		.input	= "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			"\x00",</div><div class='add'>+		.ilen	= 129,</div><div class='add'>+		.result	= "\xD2\xDB\x1A\x5C\xF1\xC1\xAC\xDB"</div><div class='add'>+			 "\xE8\x1A\x7A\x43\x40\xEF\x53\x43"</div><div class='add'>+			 "\x5E\x7F\x4B\x1A\x50\x52\x3F\x8D"</div><div class='add'>+			 "\x28\x3D\xCF\x85\x1D\x69\x6E\x60"</div><div class='add'>+			 "\xF2\xDE\x74\x56\x18\x1B\x84\x10"</div><div class='add'>+			 "\xD4\x62\xBA\x60\x50\xF0\x61\xF2"</div><div class='add'>+			 "\x1C\x78\x7F\xC1\x24\x34\xAF\x58"</div><div class='add'>+			 "\xBF\x2C\x59\xCA\x90\x77\xF3\xB0"</div><div class='add'>+			 "\x5B\x4A\xDF\x89\xCE\x2C\x2F\xFC"</div><div class='add'>+			 "\x67\xF0\xE3\x45\xE8\xB3\xB3\x75"</div><div class='add'>+			 "\xA0\x95\x71\xA1\x29\x39\x94\xCA"</div><div class='add'>+			 "\x45\x2F\xBD\xCB\x10\xB6\xBE\x9F"</div><div class='add'>+			 "\x8E\xF9\xB2\x01\x0A\x5A\x0A\xB7"</div><div class='add'>+			 "\x6B\x9D\x70\x8E\x4B\xD6\x2F\xCD"</div><div class='add'>+			 "\x2E\x40\x48\x75\xE9\xE2\x21\x45"</div><div class='add'>+			 "\x0B\xC9\xB6\xB5\x66\xBC\x9A\x59"</div><div class='add'>+			 "\x5A",</div><div class='add'>+		.rlen	= 129,</div><div class='add'>+	}, { /* large test vector generated using Crypto++ */</div><div class='add'>+		.key =  "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			"\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='add'>+			"\x10\x11\x12\x13\x14\x15\x16\x17"</div><div class='add'>+			"\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f",</div><div class='add'>+		.klen = 32,</div><div class='add'>+		.iv =	"\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			"\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.input =</div><div class='add'>+			"\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			"\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='add'>+			"\x10\x11\x12\x13\x14\x15\x16\x17"</div><div class='add'>+			"\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f"</div><div class='add'>+			"\x20\x21\x22\x23\x24\x25\x26\x27"</div><div class='add'>+			"\x28\x29\x2a\x2b\x2c\x2d\x2e\x2f"</div><div class='add'>+			"\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='add'>+			"\x38\x39\x3a\x3b\x3c\x3d\x3e\x3f"</div><div class='add'>+			"\x40\x41\x42\x43\x44\x45\x46\x47"</div><div class='add'>+			"\x48\x49\x4a\x4b\x4c\x4d\x4e\x4f"</div><div class='add'>+			"\x50\x51\x52\x53\x54\x55\x56\x57"</div><div class='add'>+			"\x58\x59\x5a\x5b\x5c\x5d\x5e\x5f"</div><div class='add'>+			"\x60\x61\x62\x63\x64\x65\x66\x67"</div><div class='add'>+			"\x68\x69\x6a\x6b\x6c\x6d\x6e\x6f"</div><div class='add'>+			"\x70\x71\x72\x73\x74\x75\x76\x77"</div><div class='add'>+			"\x78\x79\x7a\x7b\x7c\x7d\x7e\x7f"</div><div class='add'>+			"\x80\x81\x82\x83\x84\x85\x86\x87"</div><div class='add'>+			"\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f"</div><div class='add'>+			"\x90\x91\x92\x93\x94\x95\x96\x97"</div><div class='add'>+			"\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f"</div><div class='add'>+			"\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7"</div><div class='add'>+			"\xa8\xa9\xaa\xab\xac\xad\xae\xaf"</div><div class='add'>+			"\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7"</div><div class='add'>+			"\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf"</div><div class='add'>+			"\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7"</div><div class='add'>+			"\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf"</div><div class='add'>+			"\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7"</div><div class='add'>+			"\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf"</div><div class='add'>+			"\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7"</div><div class='add'>+			"\xe8\xe9\xea\xeb\xec\xed\xee\xef"</div><div class='add'>+			"\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7"</div><div class='add'>+			"\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff"</div><div class='add'>+			"\x00\x03\x06\x09\x0c\x0f\x12\x15"</div><div class='add'>+			"\x18\x1b\x1e\x21\x24\x27\x2a\x2d"</div><div class='add'>+			"\x30\x33\x36\x39\x3c\x3f\x42\x45"</div><div class='add'>+			"\x48\x4b\x4e\x51\x54\x57\x5a\x5d"</div><div class='add'>+			"\x60\x63\x66\x69\x6c\x6f\x72\x75"</div><div class='add'>+			"\x78\x7b\x7e\x81\x84\x87\x8a\x8d"</div><div class='add'>+			"\x90\x93\x96\x99\x9c\x9f\xa2\xa5"</div><div class='add'>+			"\xa8\xab\xae\xb1\xb4\xb7\xba\xbd"</div><div class='add'>+			"\xc0\xc3\xc6\xc9\xcc\xcf\xd2\xd5"</div><div class='add'>+			"\xd8\xdb\xde\xe1\xe4\xe7\xea\xed"</div><div class='add'>+			"\xf0\xf3\xf6\xf9\xfc\xff\x02\x05"</div><div class='add'>+			"\x08\x0b\x0e\x11\x14\x17\x1a\x1d"</div><div class='add'>+			"\x20\x23\x26\x29\x2c\x2f\x32\x35"</div><div class='add'>+			"\x38\x3b\x3e\x41\x44\x47\x4a\x4d"</div><div class='add'>+			"\x50\x53\x56\x59\x5c\x5f\x62\x65"</div><div class='add'>+			"\x68\x6b\x6e\x71\x74\x77\x7a\x7d"</div><div class='add'>+			"\x80\x83\x86\x89\x8c\x8f\x92\x95"</div><div class='add'>+			"\x98\x9b\x9e\xa1\xa4\xa7\xaa\xad"</div><div class='add'>+			"\xb0\xb3\xb6\xb9\xbc\xbf\xc2\xc5"</div><div class='add'>+			"\xc8\xcb\xce\xd1\xd4\xd7\xda\xdd"</div><div class='add'>+			"\xe0\xe3\xe6\xe9\xec\xef\xf2\xf5"</div><div class='add'>+			"\xf8\xfb\xfe\x01\x04\x07\x0a\x0d"</div><div class='add'>+			"\x10\x13\x16\x19\x1c\x1f\x22\x25"</div><div class='add'>+			"\x28\x2b\x2e\x31\x34\x37\x3a\x3d"</div><div class='add'>+			"\x40\x43\x46\x49\x4c\x4f\x52\x55"</div><div class='add'>+			"\x58\x5b\x5e\x61\x64\x67\x6a\x6d"</div><div class='add'>+			"\x70\x73\x76\x79\x7c\x7f\x82\x85"</div><div class='add'>+			"\x88\x8b\x8e\x91\x94\x97\x9a\x9d"</div><div class='add'>+			"\xa0\xa3\xa6\xa9\xac\xaf\xb2\xb5"</div><div class='add'>+			"\xb8\xbb\xbe\xc1\xc4\xc7\xca\xcd"</div><div class='add'>+			"\xd0\xd3\xd6\xd9\xdc\xdf\xe2\xe5"</div><div class='add'>+			"\xe8\xeb\xee\xf1\xf4\xf7\xfa\xfd"</div><div class='add'>+			"\x00\x05\x0a\x0f\x14\x19\x1e\x23"</div><div class='add'>+			"\x28\x2d\x32\x37\x3c\x41\x46\x4b"</div><div class='add'>+			"\x50\x55\x5a\x5f\x64\x69\x6e\x73"</div><div class='add'>+			"\x78\x7d\x82\x87\x8c\x91\x96\x9b"</div><div class='add'>+			"\xa0\xa5\xaa\xaf\xb4\xb9\xbe\xc3"</div><div class='add'>+			"\xc8\xcd\xd2\xd7\xdc\xe1\xe6\xeb"</div><div class='add'>+			"\xf0\xf5\xfa\xff\x04\x09\x0e\x13"</div><div class='add'>+			"\x18\x1d\x22\x27\x2c\x31\x36\x3b"</div><div class='add'>+			"\x40\x45\x4a\x4f\x54\x59\x5e\x63"</div><div class='add'>+			"\x68\x6d\x72\x77\x7c\x81\x86\x8b"</div><div class='add'>+			"\x90\x95\x9a\x9f\xa4\xa9\xae\xb3"</div><div class='add'>+			"\xb8\xbd\xc2\xc7\xcc\xd1\xd6\xdb"</div><div class='add'>+			"\xe0\xe5\xea\xef\xf4\xf9\xfe\x03"</div><div class='add'>+			"\x08\x0d\x12\x17\x1c\x21\x26\x2b"</div><div class='add'>+			"\x30\x35\x3a\x3f\x44\x49\x4e\x53"</div><div class='add'>+			"\x58\x5d\x62\x67\x6c\x71\x76\x7b"</div><div class='add'>+			"\x80\x85\x8a\x8f\x94\x99\x9e\xa3"</div><div class='add'>+			"\xa8\xad\xb2\xb7\xbc\xc1\xc6\xcb"</div><div class='add'>+			"\xd0\xd5\xda\xdf\xe4\xe9\xee\xf3"</div><div class='add'>+			"\xf8\xfd\x02\x07\x0c\x11\x16\x1b"</div><div class='add'>+			"\x20\x25\x2a\x2f\x34\x39\x3e\x43"</div><div class='add'>+			"\x48\x4d\x52\x57\x5c\x61\x66\x6b"</div><div class='add'>+			"\x70\x75\x7a\x7f\x84\x89\x8e\x93"</div><div class='add'>+			"\x98\x9d\xa2\xa7\xac\xb1\xb6\xbb"</div><div class='add'>+			"\xc0\xc5\xca\xcf\xd4\xd9\xde\xe3"</div><div class='add'>+			"\xe8\xed\xf2\xf7\xfc\x01\x06\x0b"</div><div class='add'>+			"\x10\x15\x1a\x1f\x24\x29\x2e\x33"</div><div class='add'>+			"\x38\x3d\x42\x47\x4c\x51\x56\x5b"</div><div class='add'>+			"\x60\x65\x6a\x6f\x74\x79\x7e\x83"</div><div class='add'>+			"\x88\x8d\x92\x97\x9c\xa1\xa6\xab"</div><div class='add'>+			"\xb0\xb5\xba\xbf\xc4\xc9\xce\xd3"</div><div class='add'>+			"\xd8\xdd\xe2\xe7\xec\xf1\xf6\xfb"</div><div class='add'>+			"\x00\x07\x0e\x15\x1c\x23\x2a\x31"</div><div class='add'>+			"\x38\x3f\x46\x4d\x54\x5b\x62\x69"</div><div class='add'>+			"\x70\x77\x7e\x85\x8c\x93\x9a\xa1"</div><div class='add'>+			"\xa8\xaf\xb6\xbd\xc4\xcb\xd2\xd9"</div><div class='add'>+			"\xe0\xe7\xee\xf5\xfc\x03\x0a\x11"</div><div class='add'>+			"\x18\x1f\x26\x2d\x34\x3b\x42\x49"</div><div class='add'>+			"\x50\x57\x5e\x65\x6c\x73\x7a\x81"</div><div class='add'>+			"\x88\x8f\x96\x9d\xa4\xab\xb2\xb9"</div><div class='add'>+			"\xc0\xc7\xce\xd5\xdc\xe3\xea\xf1"</div><div class='add'>+			"\xf8\xff\x06\x0d\x14\x1b\x22\x29"</div><div class='add'>+			"\x30\x37\x3e\x45\x4c\x53\x5a\x61"</div><div class='add'>+			"\x68\x6f\x76\x7d\x84\x8b\x92\x99"</div><div class='add'>+			"\xa0\xa7\xae\xb5\xbc\xc3\xca\xd1"</div><div class='add'>+			"\xd8\xdf\xe6\xed\xf4\xfb\x02\x09"</div><div class='add'>+			"\x10\x17\x1e\x25\x2c\x33\x3a\x41"</div><div class='add'>+			"\x48\x4f\x56\x5d\x64\x6b\x72\x79"</div><div class='add'>+			"\x80\x87\x8e\x95\x9c\xa3\xaa\xb1"</div><div class='add'>+			"\xb8\xbf\xc6\xcd\xd4\xdb\xe2\xe9"</div><div class='add'>+			"\xf0\xf7\xfe\x05\x0c\x13\x1a\x21"</div><div class='add'>+			"\x28\x2f\x36\x3d\x44\x4b\x52\x59"</div><div class='add'>+			"\x60\x67\x6e\x75\x7c\x83\x8a\x91"</div><div class='add'>+			"\x98\x9f\xa6\xad\xb4\xbb\xc2\xc9"</div><div class='add'>+			"\xd0\xd7\xde\xe5\xec\xf3\xfa\x01"</div><div class='add'>+			"\x08\x0f\x16\x1d\x24\x2b\x32\x39"</div><div class='add'>+			"\x40\x47\x4e\x55\x5c\x63\x6a\x71"</div><div class='add'>+			"\x78\x7f\x86\x8d\x94\x9b\xa2\xa9"</div><div class='add'>+			"\xb0\xb7\xbe\xc5\xcc\xd3\xda\xe1"</div><div class='add'>+			"\xe8\xef\xf6\xfd\x04\x0b\x12\x19"</div><div class='add'>+			"\x20\x27\x2e\x35\x3c\x43\x4a\x51"</div><div class='add'>+			"\x58\x5f\x66\x6d\x74\x7b\x82\x89"</div><div class='add'>+			"\x90\x97\x9e\xa5\xac\xb3\xba\xc1"</div><div class='add'>+			"\xc8\xcf\xd6\xdd\xe4\xeb\xf2\xf9"</div><div class='add'>+			"\x00\x09\x12\x1b\x24\x2d\x36\x3f"</div><div class='add'>+			"\x48\x51\x5a\x63\x6c\x75\x7e\x87"</div><div class='add'>+			"\x90\x99\xa2\xab\xb4\xbd\xc6\xcf"</div><div class='add'>+			"\xd8\xe1\xea\xf3\xfc\x05\x0e\x17"</div><div class='add'>+			"\x20\x29\x32\x3b\x44\x4d\x56\x5f"</div><div class='add'>+			"\x68\x71\x7a\x83\x8c\x95\x9e\xa7"</div><div class='add'>+			"\xb0\xb9\xc2\xcb\xd4\xdd\xe6\xef"</div><div class='add'>+			"\xf8\x01\x0a\x13\x1c\x25\x2e\x37"</div><div class='add'>+			"\x40\x49\x52\x5b\x64\x6d\x76\x7f"</div><div class='add'>+			"\x88\x91\x9a\xa3\xac\xb5\xbe\xc7"</div><div class='add'>+			"\xd0\xd9\xe2\xeb\xf4\xfd\x06\x0f"</div><div class='add'>+			"\x18\x21\x2a\x33\x3c\x45\x4e\x57"</div><div class='add'>+			"\x60\x69\x72\x7b\x84\x8d\x96\x9f"</div><div class='add'>+			"\xa8\xb1\xba\xc3\xcc\xd5\xde\xe7"</div><div class='add'>+			"\xf0\xf9\x02\x0b\x14\x1d\x26\x2f"</div><div class='add'>+			"\x38\x41\x4a\x53\x5c\x65\x6e\x77"</div><div class='add'>+			"\x80\x89\x92\x9b\xa4\xad\xb6\xbf"</div><div class='add'>+			"\xc8\xd1\xda\xe3\xec\xf5\xfe\x07"</div><div class='add'>+			"\x10\x19\x22\x2b\x34\x3d\x46\x4f"</div><div class='add'>+			"\x58\x61\x6a\x73\x7c\x85\x8e\x97"</div><div class='add'>+			"\xa0\xa9\xb2\xbb\xc4\xcd\xd6\xdf"</div><div class='add'>+			"\xe8\xf1\xfa\x03\x0c\x15\x1e\x27"</div><div class='add'>+			"\x30\x39\x42\x4b\x54\x5d\x66\x6f"</div><div class='add'>+			"\x78\x81\x8a\x93\x9c\xa5\xae\xb7"</div><div class='add'>+			"\xc0\xc9\xd2\xdb\xe4\xed\xf6\xff"</div><div class='add'>+			"\x08\x11\x1a\x23\x2c\x35\x3e\x47"</div><div class='add'>+			"\x50\x59\x62\x6b\x74\x7d\x86\x8f"</div><div class='add'>+			"\x98\xa1\xaa\xb3\xbc\xc5\xce\xd7"</div><div class='add'>+			"\xe0\xe9\xf2\xfb\x04\x0d\x16\x1f"</div><div class='add'>+			"\x28\x31\x3a\x43\x4c\x55\x5e\x67"</div><div class='add'>+			"\x70\x79\x82\x8b\x94\x9d\xa6\xaf"</div><div class='add'>+			"\xb8\xc1\xca\xd3\xdc\xe5\xee\xf7"</div><div class='add'>+			"\x00\x0b\x16\x21\x2c\x37\x42\x4d"</div><div class='add'>+			"\x58\x63\x6e\x79\x84\x8f\x9a\xa5"</div><div class='add'>+			"\xb0\xbb\xc6\xd1\xdc\xe7\xf2\xfd"</div><div class='add'>+			"\x08\x13\x1e\x29\x34\x3f\x4a\x55"</div><div class='add'>+			"\x60\x6b\x76\x81\x8c\x97\xa2\xad"</div><div class='add'>+			"\xb8\xc3\xce\xd9\xe4\xef\xfa\x05"</div><div class='add'>+			"\x10\x1b\x26\x31\x3c\x47\x52\x5d"</div><div class='add'>+			"\x68\x73\x7e\x89\x94\x9f\xaa\xb5"</div><div class='add'>+			"\xc0\xcb\xd6\xe1\xec\xf7\x02\x0d"</div><div class='add'>+			"\x18\x23\x2e\x39\x44\x4f\x5a\x65"</div><div class='add'>+			"\x70\x7b\x86\x91\x9c\xa7\xb2\xbd"</div><div class='add'>+			"\xc8\xd3\xde\xe9\xf4\xff\x0a\x15"</div><div class='add'>+			"\x20\x2b\x36\x41\x4c\x57\x62\x6d"</div><div class='add'>+			"\x78\x83\x8e\x99\xa4\xaf\xba\xc5"</div><div class='add'>+			"\xd0\xdb\xe6\xf1\xfc\x07\x12\x1d"</div><div class='add'>+			"\x28\x33\x3e\x49\x54\x5f\x6a\x75"</div><div class='add'>+			"\x80\x8b\x96\xa1\xac\xb7\xc2\xcd"</div><div class='add'>+			"\xd8\xe3\xee\xf9\x04\x0f\x1a\x25"</div><div class='add'>+			"\x30\x3b\x46\x51\x5c\x67\x72\x7d"</div><div class='add'>+			"\x88\x93\x9e\xa9\xb4\xbf\xca\xd5"</div><div class='add'>+			"\xe0\xeb\xf6\x01\x0c\x17\x22\x2d"</div><div class='add'>+			"\x38\x43\x4e\x59\x64\x6f\x7a\x85"</div><div class='add'>+			"\x90\x9b\xa6\xb1\xbc\xc7\xd2\xdd"</div><div class='add'>+			"\xe8\xf3\xfe\x09\x14\x1f\x2a\x35"</div><div class='add'>+			"\x40\x4b\x56\x61\x6c\x77\x82\x8d"</div><div class='add'>+			"\x98\xa3\xae\xb9\xc4\xcf\xda\xe5"</div><div class='add'>+			"\xf0\xfb\x06\x11\x1c\x27\x32\x3d"</div><div class='add'>+			"\x48\x53\x5e\x69\x74\x7f\x8a\x95"</div><div class='add'>+			"\xa0\xab\xb6\xc1\xcc\xd7\xe2\xed"</div><div class='add'>+			"\xf8\x03\x0e\x19\x24\x2f\x3a\x45"</div><div class='add'>+			"\x50\x5b\x66\x71\x7c\x87\x92\x9d"</div><div class='add'>+			"\xa8\xb3\xbe\xc9\xd4\xdf\xea\xf5"</div><div class='add'>+			"\x00\x0d\x1a\x27\x34\x41\x4e\x5b"</div><div class='add'>+			"\x68\x75\x82\x8f\x9c\xa9\xb6\xc3"</div><div class='add'>+			"\xd0\xdd\xea\xf7\x04\x11\x1e\x2b"</div><div class='add'>+			"\x38\x45\x52\x5f\x6c\x79\x86\x93"</div><div class='add'>+			"\xa0\xad\xba\xc7\xd4\xe1\xee\xfb"</div><div class='add'>+			"\x08\x15\x22\x2f\x3c\x49\x56\x63"</div><div class='add'>+			"\x70\x7d\x8a\x97\xa4\xb1\xbe\xcb"</div><div class='add'>+			"\xd8\xe5\xf2\xff\x0c\x19\x26\x33"</div><div class='add'>+			"\x40\x4d\x5a\x67\x74\x81\x8e\x9b"</div><div class='add'>+			"\xa8\xb5\xc2\xcf\xdc\xe9\xf6\x03"</div><div class='add'>+			"\x10\x1d\x2a\x37\x44\x51\x5e\x6b"</div><div class='add'>+			"\x78\x85\x92\x9f\xac\xb9\xc6\xd3"</div><div class='add'>+			"\xe0\xed\xfa\x07\x14\x21\x2e\x3b"</div><div class='add'>+			"\x48\x55\x62\x6f\x7c\x89\x96\xa3"</div><div class='add'>+			"\xb0\xbd\xca\xd7\xe4\xf1\xfe\x0b"</div><div class='add'>+			"\x18\x25\x32\x3f\x4c\x59\x66\x73"</div><div class='add'>+			"\x80\x8d\x9a\xa7\xb4\xc1\xce\xdb"</div><div class='add'>+			"\xe8\xf5\x02\x0f\x1c\x29\x36\x43"</div><div class='add'>+			"\x50\x5d\x6a\x77\x84\x91\x9e\xab"</div><div class='add'>+			"\xb8\xc5\xd2\xdf\xec\xf9\x06\x13"</div><div class='add'>+			"\x20\x2d\x3a\x47\x54\x61\x6e\x7b"</div><div class='add'>+			"\x88\x95\xa2\xaf\xbc\xc9\xd6\xe3"</div><div class='add'>+			"\xf0\xfd\x0a\x17\x24\x31\x3e\x4b"</div><div class='add'>+			"\x58\x65\x72\x7f\x8c\x99\xa6\xb3"</div><div class='add'>+			"\xc0\xcd\xda\xe7\xf4\x01\x0e\x1b"</div><div class='add'>+			"\x28\x35\x42\x4f\x5c\x69\x76\x83"</div><div class='add'>+			"\x90\x9d\xaa\xb7\xc4\xd1\xde\xeb"</div><div class='add'>+			"\xf8\x05\x12\x1f\x2c\x39\x46\x53"</div><div class='add'>+			"\x60\x6d\x7a\x87\x94\xa1\xae\xbb"</div><div class='add'>+			"\xc8\xd5\xe2\xef\xfc\x09\x16\x23"</div><div class='add'>+			"\x30\x3d\x4a\x57\x64\x71\x7e\x8b"</div><div class='add'>+			"\x98\xa5\xb2\xbf\xcc\xd9\xe6\xf3"</div><div class='add'>+			"\x00\x0f\x1e\x2d\x3c\x4b\x5a\x69"</div><div class='add'>+			"\x78\x87\x96\xa5\xb4\xc3\xd2\xe1"</div><div class='add'>+			"\xf0\xff\x0e\x1d\x2c\x3b\x4a\x59"</div><div class='add'>+			"\x68\x77\x86\x95\xa4\xb3\xc2\xd1"</div><div class='add'>+			"\xe0\xef\xfe\x0d\x1c\x2b\x3a\x49"</div><div class='add'>+			"\x58\x67\x76\x85\x94\xa3\xb2\xc1"</div><div class='add'>+			"\xd0\xdf\xee\xfd\x0c\x1b\x2a\x39"</div><div class='add'>+			"\x48\x57\x66\x75\x84\x93\xa2\xb1"</div><div class='add'>+			"\xc0\xcf\xde\xed\xfc\x0b\x1a\x29"</div><div class='add'>+			"\x38\x47\x56\x65\x74\x83\x92\xa1"</div><div class='add'>+			"\xb0\xbf\xce\xdd\xec\xfb\x0a\x19"</div><div class='add'>+			"\x28\x37\x46\x55\x64\x73\x82\x91"</div><div class='add'>+			"\xa0\xaf\xbe\xcd\xdc\xeb\xfa\x09"</div><div class='add'>+			"\x18\x27\x36\x45\x54\x63\x72\x81"</div><div class='add'>+			"\x90\x9f\xae\xbd\xcc\xdb\xea\xf9"</div><div class='add'>+			"\x08\x17\x26\x35\x44\x53\x62\x71"</div><div class='add'>+			"\x80\x8f\x9e\xad\xbc\xcb\xda\xe9"</div><div class='add'>+			"\xf8\x07\x16\x25\x34\x43\x52\x61"</div><div class='add'>+			"\x70\x7f\x8e\x9d\xac\xbb\xca\xd9"</div><div class='add'>+			"\xe8\xf7\x06\x15\x24\x33\x42\x51"</div><div class='add'>+			"\x60\x6f\x7e\x8d\x9c\xab\xba\xc9"</div><div class='add'>+			"\xd8\xe7\xf6\x05\x14\x23\x32\x41"</div><div class='add'>+			"\x50\x5f\x6e\x7d\x8c\x9b\xaa\xb9"</div><div class='add'>+			"\xc8\xd7\xe6\xf5\x04\x13\x22\x31"</div><div class='add'>+			"\x40\x4f\x5e\x6d\x7c\x8b\x9a\xa9"</div><div class='add'>+			"\xb8\xc7\xd6\xe5\xf4\x03\x12\x21"</div><div class='add'>+			"\x30\x3f\x4e\x5d\x6c\x7b\x8a\x99"</div><div class='add'>+			"\xa8\xb7\xc6\xd5\xe4\xf3\x02\x11"</div><div class='add'>+			"\x20\x2f\x3e\x4d\x5c\x6b\x7a\x89"</div><div class='add'>+			"\x98\xa7\xb6\xc5\xd4\xe3\xf2\x01"</div><div class='add'>+			"\x10\x1f\x2e\x3d\x4c\x5b\x6a\x79"</div><div class='add'>+			"\x88\x97\xa6\xb5\xc4\xd3\xe2\xf1"</div><div class='add'>+			"\x00\x11\x22\x33\x44\x55\x66\x77"</div><div class='add'>+			"\x88\x99\xaa\xbb\xcc\xdd\xee\xff"</div><div class='add'>+			"\x10\x21\x32\x43\x54\x65\x76\x87"</div><div class='add'>+			"\x98\xa9\xba\xcb\xdc\xed\xfe\x0f"</div><div class='add'>+			"\x20\x31\x42\x53\x64\x75\x86\x97"</div><div class='add'>+			"\xa8\xb9\xca\xdb\xec\xfd\x0e\x1f"</div><div class='add'>+			"\x30\x41\x52\x63\x74\x85\x96\xa7"</div><div class='add'>+			"\xb8\xc9\xda\xeb\xfc\x0d\x1e\x2f"</div><div class='add'>+			"\x40\x51\x62\x73\x84\x95\xa6\xb7"</div><div class='add'>+			"\xc8\xd9\xea\xfb\x0c\x1d\x2e\x3f"</div><div class='add'>+			"\x50\x61\x72\x83\x94\xa5\xb6\xc7"</div><div class='add'>+			"\xd8\xe9\xfa\x0b\x1c\x2d\x3e\x4f"</div><div class='add'>+			"\x60\x71\x82\x93\xa4\xb5\xc6\xd7"</div><div class='add'>+			"\xe8\xf9\x0a\x1b\x2c\x3d\x4e\x5f"</div><div class='add'>+			"\x70\x81\x92\xa3\xb4\xc5\xd6\xe7"</div><div class='add'>+			"\xf8\x09\x1a\x2b\x3c\x4d\x5e\x6f"</div><div class='add'>+			"\x80\x91\xa2\xb3\xc4\xd5\xe6\xf7"</div><div class='add'>+			"\x08\x19\x2a\x3b\x4c\x5d\x6e\x7f"</div><div class='add'>+			"\x90\xa1\xb2\xc3\xd4\xe5\xf6\x07"</div><div class='add'>+			"\x18\x29\x3a\x4b\x5c\x6d\x7e\x8f"</div><div class='add'>+			"\xa0\xb1\xc2\xd3\xe4\xf5\x06\x17"</div><div class='add'>+			"\x28\x39\x4a\x5b\x6c\x7d\x8e\x9f"</div><div class='add'>+			"\xb0\xc1\xd2\xe3\xf4\x05\x16\x27"</div><div class='add'>+			"\x38\x49\x5a\x6b\x7c\x8d\x9e\xaf"</div><div class='add'>+			"\xc0\xd1\xe2\xf3\x04\x15\x26\x37"</div><div class='add'>+			"\x48\x59\x6a\x7b\x8c\x9d\xae\xbf"</div><div class='add'>+			"\xd0\xe1\xf2\x03\x14\x25\x36\x47"</div><div class='add'>+			"\x58\x69\x7a\x8b\x9c\xad\xbe\xcf"</div><div class='add'>+			"\xe0\xf1\x02\x13\x24\x35\x46\x57"</div><div class='add'>+			"\x68\x79\x8a\x9b\xac\xbd\xce\xdf"</div><div class='add'>+			"\xf0\x01\x12\x23\x34\x45\x56\x67"</div><div class='add'>+			"\x78\x89\x9a\xab\xbc\xcd\xde\xef"</div><div class='add'>+			"\x00\x13\x26\x39\x4c\x5f\x72\x85"</div><div class='add'>+			"\x98\xab\xbe\xd1\xe4\xf7\x0a\x1d"</div><div class='add'>+			"\x30\x43\x56\x69\x7c\x8f\xa2\xb5"</div><div class='add'>+			"\xc8\xdb\xee\x01\x14\x27\x3a\x4d"</div><div class='add'>+			"\x60\x73\x86\x99\xac\xbf\xd2\xe5"</div><div class='add'>+			"\xf8\x0b\x1e\x31\x44\x57\x6a\x7d"</div><div class='add'>+			"\x90\xa3\xb6\xc9\xdc\xef\x02\x15"</div><div class='add'>+			"\x28\x3b\x4e\x61\x74\x87\x9a\xad"</div><div class='add'>+			"\xc0\xd3\xe6\xf9\x0c\x1f\x32\x45"</div><div class='add'>+			"\x58\x6b\x7e\x91\xa4\xb7\xca\xdd"</div><div class='add'>+			"\xf0\x03\x16\x29\x3c\x4f\x62\x75"</div><div class='add'>+			"\x88\x9b\xae\xc1\xd4\xe7\xfa\x0d"</div><div class='add'>+			"\x20\x33\x46\x59\x6c\x7f\x92\xa5"</div><div class='add'>+			"\xb8\xcb\xde\xf1\x04\x17\x2a\x3d"</div><div class='add'>+			"\x50\x63\x76\x89\x9c\xaf\xc2\xd5"</div><div class='add'>+			"\xe8\xfb\x0e\x21\x34\x47\x5a\x6d"</div><div class='add'>+			"\x80\x93\xa6\xb9\xcc\xdf\xf2\x05"</div><div class='add'>+			"\x18\x2b\x3e\x51\x64\x77\x8a\x9d"</div><div class='add'>+			"\xb0\xc3\xd6\xe9\xfc\x0f\x22\x35"</div><div class='add'>+			"\x48\x5b\x6e\x81\x94\xa7\xba\xcd"</div><div class='add'>+			"\xe0\xf3\x06\x19\x2c\x3f\x52\x65"</div><div class='add'>+			"\x78\x8b\x9e\xb1\xc4\xd7\xea\xfd"</div><div class='add'>+			"\x10\x23\x36\x49\x5c\x6f\x82\x95"</div><div class='add'>+			"\xa8\xbb\xce\xe1\xf4\x07\x1a\x2d"</div><div class='add'>+			"\x40\x53\x66\x79\x8c\x9f\xb2\xc5"</div><div class='add'>+			"\xd8\xeb\xfe\x11\x24\x37\x4a\x5d"</div><div class='add'>+			"\x70\x83\x96\xa9\xbc\xcf\xe2\xf5"</div><div class='add'>+			"\x08\x1b\x2e\x41\x54\x67\x7a\x8d"</div><div class='add'>+			"\xa0\xb3\xc6\xd9\xec\xff\x12\x25"</div><div class='add'>+			"\x38\x4b\x5e\x71\x84\x97\xaa\xbd"</div><div class='add'>+			"\xd0\xe3\xf6\x09\x1c\x2f\x42\x55"</div><div class='add'>+			"\x68\x7b\x8e\xa1\xb4\xc7\xda\xed"</div><div class='add'>+			"\x00\x15\x2a\x3f\x54\x69\x7e\x93"</div><div class='add'>+			"\xa8\xbd\xd2\xe7\xfc\x11\x26\x3b"</div><div class='add'>+			"\x50\x65\x7a\x8f\xa4\xb9\xce\xe3"</div><div class='add'>+			"\xf8\x0d\x22\x37\x4c\x61\x76\x8b"</div><div class='add'>+			"\xa0\xb5\xca\xdf\xf4\x09\x1e\x33"</div><div class='add'>+			"\x48\x5d\x72\x87\x9c\xb1\xc6\xdb"</div><div class='add'>+			"\xf0\x05\x1a\x2f\x44\x59\x6e\x83"</div><div class='add'>+			"\x98\xad\xc2\xd7\xec\x01\x16\x2b"</div><div class='add'>+			"\x40\x55\x6a\x7f\x94\xa9\xbe\xd3"</div><div class='add'>+			"\xe8\xfd\x12\x27\x3c\x51\x66\x7b"</div><div class='add'>+			"\x90\xa5\xba\xcf\xe4\xf9\x0e\x23"</div><div class='add'>+			"\x38\x4d\x62\x77\x8c\xa1\xb6\xcb"</div><div class='add'>+			"\xe0\xf5\x0a\x1f\x34\x49\x5e\x73"</div><div class='add'>+			"\x88\x9d\xb2\xc7\xdc\xf1\x06\x1b"</div><div class='add'>+			"\x30\x45\x5a\x6f\x84\x99\xae\xc3"</div><div class='add'>+			"\xd8\xed\x02\x17\x2c\x41\x56\x6b"</div><div class='add'>+			"\x80\x95\xaa\xbf\xd4\xe9\xfe\x13"</div><div class='add'>+			"\x28\x3d\x52\x67\x7c\x91\xa6\xbb"</div><div class='add'>+			"\xd0\xe5\xfa\x0f\x24\x39\x4e\x63"</div><div class='add'>+			"\x78\x8d\xa2\xb7\xcc\xe1\xf6\x0b"</div><div class='add'>+			"\x20\x35\x4a\x5f\x74\x89\x9e\xb3"</div><div class='add'>+			"\xc8\xdd\xf2\x07\x1c\x31\x46\x5b"</div><div class='add'>+			"\x70\x85\x9a\xaf\xc4\xd9\xee\x03"</div><div class='add'>+			"\x18\x2d\x42\x57\x6c\x81\x96\xab"</div><div class='add'>+			"\xc0\xd5\xea\xff\x14\x29\x3e\x53"</div><div class='add'>+			"\x68\x7d\x92\xa7\xbc\xd1\xe6\xfb"</div><div class='add'>+			"\x10\x25\x3a\x4f\x64\x79\x8e\xa3"</div><div class='add'>+			"\xb8\xcd\xe2\xf7\x0c\x21\x36\x4b"</div><div class='add'>+			"\x60\x75\x8a\x9f\xb4\xc9\xde\xf3"</div><div class='add'>+			"\x08\x1d\x32\x47\x5c\x71\x86\x9b"</div><div class='add'>+			"\xb0\xc5\xda\xef\x04\x19\x2e\x43"</div><div class='add'>+			"\x58\x6d\x82\x97\xac\xc1\xd6\xeb"</div><div class='add'>+			"\x00\x17\x2e\x45\x5c\x73\x8a\xa1"</div><div class='add'>+			"\xb8\xcf\xe6\xfd\x14\x2b\x42\x59"</div><div class='add'>+			"\x70\x87\x9e\xb5\xcc\xe3\xfa\x11"</div><div class='add'>+			"\x28\x3f\x56\x6d\x84\x9b\xb2\xc9"</div><div class='add'>+			"\xe0\xf7\x0e\x25\x3c\x53\x6a\x81"</div><div class='add'>+			"\x98\xaf\xc6\xdd\xf4\x0b\x22\x39"</div><div class='add'>+			"\x50\x67\x7e\x95\xac\xc3\xda\xf1"</div><div class='add'>+			"\x08\x1f\x36\x4d\x64\x7b\x92\xa9"</div><div class='add'>+			"\xc0\xd7\xee\x05\x1c\x33\x4a\x61"</div><div class='add'>+			"\x78\x8f\xa6\xbd\xd4\xeb\x02\x19"</div><div class='add'>+			"\x30\x47\x5e\x75\x8c\xa3\xba\xd1"</div><div class='add'>+			"\xe8\xff\x16\x2d\x44\x5b\x72\x89"</div><div class='add'>+			"\xa0\xb7\xce\xe5\xfc\x13\x2a\x41"</div><div class='add'>+			"\x58\x6f\x86\x9d\xb4\xcb\xe2\xf9"</div><div class='add'>+			"\x10\x27\x3e\x55\x6c\x83\x9a\xb1"</div><div class='add'>+			"\xc8\xdf\xf6\x0d\x24\x3b\x52\x69"</div><div class='add'>+			"\x80\x97\xae\xc5\xdc\xf3\x0a\x21"</div><div class='add'>+			"\x38\x4f\x66\x7d\x94\xab\xc2\xd9"</div><div class='add'>+			"\xf0\x07\x1e\x35\x4c\x63\x7a\x91"</div><div class='add'>+			"\xa8\xbf\xd6\xed\x04\x1b\x32\x49"</div><div class='add'>+			"\x60\x77\x8e\xa5\xbc\xd3\xea\x01"</div><div class='add'>+			"\x18\x2f\x46\x5d\x74\x8b\xa2\xb9"</div><div class='add'>+			"\xd0\xe7\xfe\x15\x2c\x43\x5a\x71"</div><div class='add'>+			"\x88\x9f\xb6\xcd\xe4\xfb\x12\x29"</div><div class='add'>+			"\x40\x57\x6e\x85\x9c\xb3\xca\xe1"</div><div class='add'>+			"\xf8\x0f\x26\x3d\x54\x6b\x82\x99"</div><div class='add'>+			"\xb0\xc7\xde\xf5\x0c\x23\x3a\x51"</div><div class='add'>+			"\x68\x7f\x96\xad\xc4\xdb\xf2\x09"</div><div class='add'>+			"\x20\x37\x4e\x65\x7c\x93\xaa\xc1"</div><div class='add'>+			"\xd8\xef\x06\x1d\x34\x4b\x62\x79"</div><div class='add'>+			"\x90\xa7\xbe\xd5\xec\x03\x1a\x31"</div><div class='add'>+			"\x48\x5f\x76\x8d\xa4\xbb\xd2\xe9"</div><div class='add'>+			"\x00\x19\x32\x4b\x64\x7d\x96\xaf"</div><div class='add'>+			"\xc8\xe1\xfa\x13\x2c\x45\x5e\x77"</div><div class='add'>+			"\x90\xa9\xc2\xdb\xf4\x0d\x26\x3f"</div><div class='add'>+			"\x58\x71\x8a\xa3\xbc\xd5\xee\x07"</div><div class='add'>+			"\x20\x39\x52\x6b\x84\x9d\xb6\xcf"</div><div class='add'>+			"\xe8\x01\x1a\x33\x4c\x65\x7e\x97"</div><div class='add'>+			"\xb0\xc9\xe2\xfb\x14\x2d\x46\x5f"</div><div class='add'>+			"\x78\x91\xaa\xc3\xdc\xf5\x0e\x27"</div><div class='add'>+			"\x40\x59\x72\x8b\xa4\xbd\xd6\xef"</div><div class='add'>+			"\x08\x21\x3a\x53\x6c\x85\x9e\xb7"</div><div class='add'>+			"\xd0\xe9\x02\x1b\x34\x4d\x66\x7f"</div><div class='add'>+			"\x98\xb1\xca\xe3\xfc\x15\x2e\x47"</div><div class='add'>+			"\x60\x79\x92\xab\xc4\xdd\xf6\x0f"</div><div class='add'>+			"\x28\x41\x5a\x73\x8c\xa5\xbe\xd7"</div><div class='add'>+			"\xf0\x09\x22\x3b\x54\x6d\x86\x9f"</div><div class='add'>+			"\xb8\xd1\xea\x03\x1c\x35\x4e\x67"</div><div class='add'>+			"\x80\x99\xb2\xcb\xe4\xfd\x16\x2f"</div><div class='add'>+			"\x48\x61\x7a\x93\xac\xc5\xde\xf7"</div><div class='add'>+			"\x10\x29\x42\x5b\x74\x8d\xa6\xbf"</div><div class='add'>+			"\xd8\xf1\x0a\x23\x3c\x55\x6e\x87"</div><div class='add'>+			"\xa0\xb9\xd2\xeb\x04\x1d\x36\x4f"</div><div class='add'>+			"\x68\x81\x9a\xb3\xcc\xe5\xfe\x17"</div><div class='add'>+			"\x30\x49\x62\x7b\x94\xad\xc6\xdf"</div><div class='add'>+			"\xf8\x11\x2a\x43\x5c\x75\x8e\xa7"</div><div class='add'>+			"\xc0\xd9\xf2\x0b\x24\x3d\x56\x6f"</div><div class='add'>+			"\x88\xa1\xba\xd3\xec\x05\x1e\x37"</div><div class='add'>+			"\x50\x69\x82\x9b\xb4\xcd\xe6\xff"</div><div class='add'>+			"\x18\x31\x4a\x63\x7c\x95\xae\xc7"</div><div class='add'>+			"\xe0\xf9\x12\x2b\x44\x5d\x76\x8f"</div><div class='add'>+			"\xa8\xc1\xda\xf3\x0c\x25\x3e\x57"</div><div class='add'>+			"\x70\x89\xa2\xbb\xd4\xed\x06\x1f"</div><div class='add'>+			"\x38\x51\x6a\x83\x9c\xb5\xce\xe7"</div><div class='add'>+			"\x00\x1b\x36\x51\x6c\x87\xa2\xbd"</div><div class='add'>+			"\xd8\xf3\x0e\x29\x44\x5f\x7a\x95"</div><div class='add'>+			"\xb0\xcb\xe6\x01\x1c\x37\x52\x6d"</div><div class='add'>+			"\x88\xa3\xbe\xd9\xf4\x0f\x2a\x45"</div><div class='add'>+			"\x60\x7b\x96\xb1\xcc\xe7\x02\x1d"</div><div class='add'>+			"\x38\x53\x6e\x89\xa4\xbf\xda\xf5"</div><div class='add'>+			"\x10\x2b\x46\x61\x7c\x97\xb2\xcd"</div><div class='add'>+			"\xe8\x03\x1e\x39\x54\x6f\x8a\xa5"</div><div class='add'>+			"\xc0\xdb\xf6\x11\x2c\x47\x62\x7d"</div><div class='add'>+			"\x98\xb3\xce\xe9\x04\x1f\x3a\x55"</div><div class='add'>+			"\x70\x8b\xa6\xc1\xdc\xf7\x12\x2d"</div><div class='add'>+			"\x48\x63\x7e\x99\xb4\xcf\xea\x05"</div><div class='add'>+			"\x20\x3b\x56\x71\x8c\xa7\xc2\xdd"</div><div class='add'>+			"\xf8\x13\x2e\x49\x64\x7f\x9a\xb5"</div><div class='add'>+			"\xd0\xeb\x06\x21\x3c\x57\x72\x8d"</div><div class='add'>+			"\xa8\xc3\xde\xf9\x14\x2f\x4a\x65"</div><div class='add'>+			"\x80\x9b\xb6\xd1\xec\x07\x22\x3d"</div><div class='add'>+			"\x58\x73\x8e\xa9\xc4\xdf\xfa\x15"</div><div class='add'>+			"\x30\x4b\x66\x81\x9c\xb7\xd2\xed"</div><div class='add'>+			"\x08\x23\x3e\x59\x74\x8f\xaa\xc5"</div><div class='add'>+			"\xe0\xfb\x16\x31\x4c\x67\x82\x9d"</div><div class='add'>+			"\xb8\xd3\xee\x09\x24\x3f\x5a\x75"</div><div class='add'>+			"\x90\xab\xc6\xe1\xfc\x17\x32\x4d"</div><div class='add'>+			"\x68\x83\x9e\xb9\xd4\xef\x0a\x25"</div><div class='add'>+			"\x40\x5b\x76\x91\xac\xc7\xe2\xfd"</div><div class='add'>+			"\x18\x33\x4e\x69\x84\x9f\xba\xd5"</div><div class='add'>+			"\xf0\x0b\x26\x41\x5c\x77\x92\xad"</div><div class='add'>+			"\xc8\xe3\xfe\x19\x34\x4f\x6a\x85"</div><div class='add'>+			"\xa0\xbb\xd6\xf1\x0c\x27\x42\x5d"</div><div class='add'>+			"\x78\x93\xae\xc9\xe4\xff\x1a\x35"</div><div class='add'>+			"\x50\x6b\x86\xa1\xbc\xd7\xf2\x0d"</div><div class='add'>+			"\x28\x43\x5e\x79\x94\xaf\xca\xe5"</div><div class='add'>+			"\x00\x1d\x3a\x57\x74\x91\xae\xcb"</div><div class='add'>+			"\xe8\x05\x22\x3f\x5c\x79\x96\xb3"</div><div class='add'>+			"\xd0\xed\x0a\x27\x44\x61\x7e\x9b"</div><div class='add'>+			"\xb8\xd5\xf2\x0f\x2c\x49\x66\x83"</div><div class='add'>+			"\xa0\xbd\xda\xf7\x14\x31\x4e\x6b"</div><div class='add'>+			"\x88\xa5\xc2\xdf\xfc\x19\x36\x53"</div><div class='add'>+			"\x70\x8d\xaa\xc7\xe4\x01\x1e\x3b"</div><div class='add'>+			"\x58\x75\x92\xaf\xcc\xe9\x06\x23"</div><div class='add'>+			"\x40\x5d\x7a\x97\xb4\xd1\xee\x0b"</div><div class='add'>+			"\x28\x45\x62\x7f\x9c\xb9\xd6\xf3"</div><div class='add'>+			"\x10\x2d\x4a\x67\x84\xa1\xbe\xdb"</div><div class='add'>+			"\xf8\x15\x32\x4f\x6c\x89\xa6\xc3"</div><div class='add'>+			"\xe0\xfd\x1a\x37\x54\x71\x8e\xab"</div><div class='add'>+			"\xc8\xe5\x02\x1f\x3c\x59\x76\x93"</div><div class='add'>+			"\xb0\xcd\xea\x07\x24\x41\x5e\x7b"</div><div class='add'>+			"\x98\xb5\xd2\xef\x0c\x29\x46\x63"</div><div class='add'>+			"\x80\x9d\xba\xd7\xf4\x11\x2e\x4b"</div><div class='add'>+			"\x68\x85\xa2\xbf\xdc\xf9\x16\x33"</div><div class='add'>+			"\x50\x6d\x8a\xa7\xc4\xe1\xfe\x1b"</div><div class='add'>+			"\x38\x55\x72\x8f\xac\xc9\xe6\x03"</div><div class='add'>+			"\x20\x3d\x5a\x77\x94\xb1\xce\xeb"</div><div class='add'>+			"\x08\x25\x42\x5f\x7c\x99\xb6\xd3"</div><div class='add'>+			"\xf0\x0d\x2a\x47\x64\x81\x9e\xbb"</div><div class='add'>+			"\xd8\xf5\x12\x2f\x4c\x69\x86\xa3"</div><div class='add'>+			"\xc0\xdd\xfa\x17\x34\x51\x6e\x8b"</div><div class='add'>+			"\xa8\xc5\xe2\xff\x1c\x39\x56\x73"</div><div class='add'>+			"\x90\xad\xca\xe7\x04\x21\x3e\x5b"</div><div class='add'>+			"\x78\x95\xb2\xcf\xec\x09\x26\x43"</div><div class='add'>+			"\x60\x7d\x9a\xb7\xd4\xf1\x0e\x2b"</div><div class='add'>+			"\x48\x65\x82\x9f\xbc\xd9\xf6\x13"</div><div class='add'>+			"\x30\x4d\x6a\x87\xa4\xc1\xde\xfb"</div><div class='add'>+			"\x18\x35\x52\x6f\x8c\xa9\xc6\xe3"</div><div class='add'>+			"\x00\x1f\x3e\x5d\x7c\x9b\xba\xd9"</div><div class='add'>+			"\xf8\x17\x36\x55\x74\x93\xb2\xd1"</div><div class='add'>+			"\xf0\x0f\x2e\x4d\x6c\x8b\xaa\xc9"</div><div class='add'>+			"\xe8\x07\x26\x45\x64\x83\xa2\xc1"</div><div class='add'>+			"\xe0\xff\x1e\x3d\x5c\x7b\x9a\xb9"</div><div class='add'>+			"\xd8\xf7\x16\x35\x54\x73\x92\xb1"</div><div class='add'>+			"\xd0\xef\x0e\x2d\x4c\x6b\x8a\xa9"</div><div class='add'>+			"\xc8\xe7\x06\x25\x44\x63\x82\xa1"</div><div class='add'>+			"\xc0\xdf\xfe\x1d\x3c\x5b\x7a\x99"</div><div class='add'>+			"\xb8\xd7\xf6\x15\x34\x53\x72\x91"</div><div class='add'>+			"\xb0\xcf\xee\x0d\x2c\x4b\x6a\x89"</div><div class='add'>+			"\xa8\xc7\xe6\x05\x24\x43\x62\x81"</div><div class='add'>+			"\xa0\xbf\xde\xfd\x1c\x3b\x5a\x79"</div><div class='add'>+			"\x98\xb7\xd6\xf5\x14\x33\x52\x71"</div><div class='add'>+			"\x90\xaf\xce\xed\x0c\x2b\x4a\x69"</div><div class='add'>+			"\x88\xa7\xc6\xe5\x04\x23\x42\x61"</div><div class='add'>+			"\x80\x9f\xbe\xdd\xfc\x1b\x3a\x59"</div><div class='add'>+			"\x78\x97\xb6\xd5\xf4\x13\x32\x51"</div><div class='add'>+			"\x70\x8f\xae\xcd\xec\x0b\x2a\x49"</div><div class='add'>+			"\x68\x87\xa6\xc5\xe4\x03\x22\x41"</div><div class='add'>+			"\x60\x7f\x9e\xbd\xdc\xfb\x1a\x39"</div><div class='add'>+			"\x58\x77\x96\xb5\xd4\xf3\x12\x31"</div><div class='add'>+			"\x50\x6f\x8e\xad\xcc\xeb\x0a\x29"</div><div class='add'>+			"\x48\x67\x86\xa5\xc4\xe3\x02\x21"</div><div class='add'>+			"\x40\x5f\x7e\x9d\xbc\xdb\xfa\x19"</div><div class='add'>+			"\x38\x57\x76\x95\xb4\xd3\xf2\x11"</div><div class='add'>+			"\x30\x4f\x6e\x8d\xac\xcb\xea\x09"</div><div class='add'>+			"\x28\x47\x66\x85\xa4\xc3\xe2\x01"</div><div class='add'>+			"\x20\x3f\x5e\x7d\x9c\xbb\xda\xf9"</div><div class='add'>+			"\x18\x37\x56\x75\x94\xb3\xd2\xf1"</div><div class='add'>+			"\x10\x2f\x4e\x6d\x8c\xab\xca\xe9"</div><div class='add'>+			"\x08\x27\x46\x65\x84\xa3\xc2\xe1"</div><div class='add'>+			"\x00\x21\x42\x63",</div><div class='add'>+		.ilen = 4100,</div><div class='add'>+		.result =</div><div class='add'>+			"\xb5\x81\xf5\x64\x18\x73\xe3\xf0"</div><div class='add'>+			"\x4c\x13\xf2\x77\x18\x60\x65\x5e"</div><div class='add'>+			"\x29\x01\xce\x98\x55\x53\xf9\x0c"</div><div class='add'>+			"\x2a\x08\xd5\x09\xb3\x57\x55\x56"</div><div class='add'>+			"\xc5\xe9\x56\x90\xcb\x6a\xa3\xc0"</div><div class='add'>+			"\xff\xc4\x79\xb4\xd2\x97\x5d\xc4"</div><div class='add'>+			"\x43\xd1\xfe\x94\x7b\x88\x06\x5a"</div><div class='add'>+			"\xb2\x9e\x2c\xfc\x44\x03\xb7\x90"</div><div class='add'>+			"\xa0\xc1\xba\x6a\x33\xb8\xc7\xb2"</div><div class='add'>+			"\x9d\xe1\x12\x4f\xc0\x64\xd4\x01"</div><div class='add'>+			"\xfe\x8c\x7a\x66\xf7\xe6\x5a\x91"</div><div class='add'>+			"\xbb\xde\x56\x86\xab\x65\x21\x30"</div><div class='add'>+			"\x00\x84\x65\x24\xa5\x7d\x85\xb4"</div><div class='add'>+			"\xe3\x17\xed\x3a\xb7\x6f\xb4\x0b"</div><div class='add'>+			"\x0b\xaf\x15\xae\x5a\x8f\xf2\x0c"</div><div class='add'>+			"\x2f\x27\xf4\x09\xd8\xd2\x96\xb7"</div><div class='add'>+			"\x71\xf2\xc5\x99\x4d\x7e\x7f\x75"</div><div class='add'>+			"\x77\x89\x30\x8b\x59\xdb\xa2\xb2"</div><div class='add'>+			"\xa0\xf3\x19\x39\x2b\xc5\x7e\x3f"</div><div class='add'>+			"\x4f\xd9\xd3\x56\x28\x97\x44\xdc"</div><div class='add'>+			"\xc0\x8b\x77\x24\xd9\x52\xe7\xc5"</div><div class='add'>+			"\xaf\xf6\x7d\x59\xb2\x44\x05\x1d"</div><div class='add'>+			"\xb1\xb0\x11\xa5\x0f\xec\x33\xe1"</div><div class='add'>+			"\x6d\x1b\x4e\x1f\xff\x57\x91\xb4"</div><div class='add'>+			"\x5b\x9a\x96\xc5\x53\xbc\xae\x20"</div><div class='add'>+			"\x3c\xbb\x14\xe2\xe8\x22\x33\xc1"</div><div class='add'>+			"\x5e\x76\x9e\x46\x99\xf6\x2a\x15"</div><div class='add'>+			"\xc6\x97\x02\xa0\x66\x43\xd1\xa6"</div><div class='add'>+			"\x31\xa6\x9f\xfb\xf4\xd3\x69\xe5"</div><div class='add'>+			"\xcd\x76\x95\xb8\x7a\x82\x7f\x21"</div><div class='add'>+			"\x45\xff\x3f\xce\x55\xf6\x95\x10"</div><div class='add'>+			"\x08\x77\x10\x43\xc6\xf3\x09\xe5"</div><div class='add'>+			"\x68\xe7\x3c\xad\x00\x52\x45\x0d"</div><div class='add'>+			"\xfe\x2d\xc6\xc2\x94\x8c\x12\x1d"</div><div class='add'>+			"\xe6\x25\xae\x98\x12\x8e\x19\x9c"</div><div class='add'>+			"\x81\x68\xb1\x11\xf6\x69\xda\xe3"</div><div class='add'>+			"\x62\x08\x18\x7a\x25\x49\x28\xac"</div><div class='add'>+			"\xba\x71\x12\x0b\xe4\xa2\xe5\xc7"</div><div class='add'>+			"\x5d\x8e\xec\x49\x40\x21\xbf\x5a"</div><div class='add'>+			"\x98\xf3\x02\x68\x55\x03\x7f\x8a"</div><div class='add'>+			"\xe5\x94\x0c\x32\x5c\x07\x82\x63"</div><div class='add'>+			"\xaf\x6f\x91\x40\x84\x8e\x52\x25"</div><div class='add'>+			"\xd0\xb0\x29\x53\x05\xe2\x50\x7a"</div><div class='add'>+			"\x34\xeb\xc9\x46\x20\xa8\x3d\xde"</div><div class='add'>+			"\x7f\x16\x5f\x36\xc5\x2e\xdc\xd1"</div><div class='add'>+			"\x15\x47\xc7\x50\x40\x6d\x91\xc5"</div><div class='add'>+			"\xe7\x93\x95\x1a\xd3\x57\xbc\x52"</div><div class='add'>+			"\x33\xee\x14\x19\x22\x52\x89\xa7"</div><div class='add'>+			"\x4a\x25\x56\x77\x4b\xca\xcf\x0a"</div><div class='add'>+			"\xe1\xf5\x35\x85\x30\x7e\x59\x4a"</div><div class='add'>+			"\xbd\x14\x5b\xdf\xe3\x46\xcb\xac"</div><div class='add'>+			"\x1f\x6c\x96\x0e\xf4\x81\xd1\x99"</div><div class='add'>+			"\xca\x88\x63\x3d\x02\x58\x6b\xa9"</div><div class='add'>+			"\xe5\x9f\xb3\x00\xb2\x54\xc6\x74"</div><div class='add'>+			"\x1c\xbf\x46\xab\x97\xcc\xf8\x54"</div><div class='add'>+			"\x04\x07\x08\x52\xe6\xc0\xda\x93"</div><div class='add'>+			"\x74\x7d\x93\x99\x5d\x78\x68\xa6"</div><div class='add'>+			"\x2e\x6b\xd3\x6a\x69\xcc\x12\x6b"</div><div class='add'>+			"\xd4\xc7\xa5\xc6\xe7\xf6\x03\x04"</div><div class='add'>+			"\x5d\xcd\x61\x5e\x17\x40\xdc\xd1"</div><div class='add'>+			"\x5c\xf5\x08\xdf\x5c\x90\x85\xa4"</div><div class='add'>+			"\xaf\xf6\x78\xbb\x0d\xf1\xf4\xa4"</div><div class='add'>+			"\x54\x26\x72\x9e\x61\xfa\x86\xcf"</div><div class='add'>+			"\xe8\x9e\xa1\xe0\xc7\x48\x23\xae"</div><div class='add'>+			"\x5a\x90\xae\x75\x0a\x74\x18\x89"</div><div class='add'>+			"\x05\xb1\x92\xb2\x7f\xd0\x1b\xa6"</div><div class='add'>+			"\x62\x07\x25\x01\xc7\xc2\x4f\xf9"</div><div class='add'>+			"\xe8\xfe\x63\x95\x80\x07\xb4\x26"</div><div class='add'>+			"\xcc\xd1\x26\xb6\xc4\x3f\x9e\xcb"</div><div class='add'>+			"\x8e\x3b\x2e\x44\x16\xd3\x10\x9a"</div><div class='add'>+			"\x95\x08\xeb\xc8\xcb\xeb\xbf\x6f"</div><div class='add'>+			"\x0b\xcd\x1f\xc8\xca\x86\xaa\xec"</div><div class='add'>+			"\x33\xe6\x69\xf4\x45\x25\x86\x3a"</div><div class='add'>+			"\x22\x94\x4f\x00\x23\x6a\x44\xc2"</div><div class='add'>+			"\x49\x97\x33\xab\x36\x14\x0a\x70"</div><div class='add'>+			"\x24\xc3\xbe\x04\x3b\x79\xa0\xf9"</div><div class='add'>+			"\xb8\xe7\x76\x29\x22\x83\xd7\xf2"</div><div class='add'>+			"\x94\xf4\x41\x49\xba\x5f\x7b\x07"</div><div class='add'>+			"\xb5\xfb\xdb\x03\x1a\x9f\xb6\x4c"</div><div class='add'>+			"\xc2\x2e\x37\x40\x49\xc3\x38\x16"</div><div class='add'>+			"\xe2\x4f\x77\x82\xb0\x68\x4c\x71"</div><div class='add'>+			"\x1d\x57\x61\x9c\xd9\x4e\x54\x99"</div><div class='add'>+			"\x47\x13\x28\x73\x3c\xbb\x00\x90"</div><div class='add'>+			"\xf3\x4d\xc9\x0e\xfd\xe7\xb1\x71"</div><div class='add'>+			"\xd3\x15\x79\xbf\xcc\x26\x2f\xbd"</div><div class='add'>+			"\xad\x6c\x50\x69\x6c\x3e\x6d\x80"</div><div class='add'>+			"\x9a\xea\x78\xaf\x19\xb2\x0d\x4d"</div><div class='add'>+			"\xad\x04\x07\xae\x22\x90\x4a\x93"</div><div class='add'>+			"\x32\x0e\x36\x9b\x1b\x46\xba\x3b"</div><div class='add'>+			"\xb4\xac\xc6\xd1\xa2\x31\x53\x3b"</div><div class='add'>+			"\x2a\x3d\x45\xfe\x03\x61\x10\x85"</div><div class='add'>+			"\x17\x69\xa6\x78\xcc\x6c\x87\x49"</div><div class='add'>+			"\x53\xf9\x80\x10\xde\x80\xa2\x41"</div><div class='add'>+			"\x6a\xc3\x32\x02\xad\x6d\x3c\x56"</div><div class='add'>+			"\x00\x71\x51\x06\xa7\xbd\xfb\xef"</div><div class='add'>+			"\x3c\xb5\x9f\xfc\x48\x7d\x53\x7c"</div><div class='add'>+			"\x66\xb0\x49\x23\xc4\x47\x10\x0e"</div><div class='add'>+			"\xe5\x6c\x74\x13\xe6\xc5\x3f\xaa"</div><div class='add'>+			"\xde\xff\x07\x44\xdd\x56\x1b\xad"</div><div class='add'>+			"\x09\x77\xfb\x5b\x12\xb8\x0d\x38"</div><div class='add'>+			"\x17\x37\x35\x7b\x9b\xbc\xfe\xd4"</div><div class='add'>+			"\x7e\x8b\xda\x7e\x5b\x04\xa7\x22"</div><div class='add'>+			"\xa7\x31\xa1\x20\x86\xc7\x1b\x99"</div><div class='add'>+			"\xdb\xd1\x89\xf4\x94\xa3\x53\x69"</div><div class='add'>+			"\x8d\xe7\xe8\x74\x11\x8d\x74\xd6"</div><div class='add'>+			"\x07\x37\x91\x9f\xfd\x67\x50\x3a"</div><div class='add'>+			"\xc9\xe1\xf4\x36\xd5\xa0\x47\xd1"</div><div class='add'>+			"\xf9\xe5\x39\xa3\x31\xac\x07\x36"</div><div class='add'>+			"\x23\xf8\x66\x18\x14\x28\x34\x0f"</div><div class='add'>+			"\xb8\xd0\xe7\x29\xb3\x04\x4b\x55"</div><div class='add'>+			"\x01\x41\xb2\x75\x8d\xcb\x96\x85"</div><div class='add'>+			"\x3a\xfb\xab\x2b\x9e\xfa\x58\x20"</div><div class='add'>+			"\x44\x1f\xc0\x14\x22\x75\x61\xe8"</div><div class='add'>+			"\xaa\x19\xcf\xf1\x82\x56\xf4\xd7"</div><div class='add'>+			"\x78\x7b\x3d\x5f\xb3\x9e\x0b\x8a"</div><div class='add'>+			"\x57\x50\xdb\x17\x41\x65\x4d\xa3"</div><div class='add'>+			"\x02\xc9\x9c\x9c\x53\xfb\x39\x39"</div><div class='add'>+			"\x9b\x1d\x72\x24\xda\xb7\x39\xbe"</div><div class='add'>+			"\x13\x3b\xfa\x29\xda\x9e\x54\x64"</div><div class='add'>+			"\x6e\xba\xd8\xa1\xcb\xb3\x36\xfa"</div><div class='add'>+			"\xcb\x47\x85\xe9\x61\x38\xbc\xbe"</div><div class='add'>+			"\xc5\x00\x38\x2a\x54\xf7\xc4\xb9"</div><div class='add'>+			"\xb3\xd3\x7b\xa0\xa0\xf8\x72\x7f"</div><div class='add'>+			"\x8c\x8e\x82\x0e\xc6\x1c\x75\x9d"</div><div class='add'>+			"\xca\x8e\x61\x87\xde\xad\x80\xd2"</div><div class='add'>+			"\xf5\xf9\x80\xef\x15\x75\xaf\xf5"</div><div class='add'>+			"\x80\xfb\xff\x6d\x1e\x25\xb7\x40"</div><div class='add'>+			"\x61\x6a\x39\x5a\x6a\xb5\x31\xab"</div><div class='add'>+			"\x97\x8a\x19\x89\x44\x40\xc0\xa6"</div><div class='add'>+			"\xb4\x4e\x30\x32\x7b\x13\xe7\x67"</div><div class='add'>+			"\xa9\x8b\x57\x04\xc2\x01\xa6\xf4"</div><div class='add'>+			"\x28\x99\xad\x2c\x76\xa3\x78\xc2"</div><div class='add'>+			"\x4a\xe6\xca\x5c\x50\x6a\xc1\xb0"</div><div class='add'>+			"\x62\x4b\x10\x8e\x7c\x17\x43\xb3"</div><div class='add'>+			"\x17\x66\x1c\x3e\x8d\x69\xf0\x5a"</div><div class='add'>+			"\x71\xf5\x97\xdc\xd1\x45\xdd\x28"</div><div class='add'>+			"\xf3\x5d\xdf\x53\x7b\x11\xe5\xbc"</div><div class='add'>+			"\x4c\xdb\x1b\x51\x6b\xe9\xfb\x3d"</div><div class='add'>+			"\xc1\xc3\x2c\xb9\x71\xf5\xb6\xb2"</div><div class='add'>+			"\x13\x36\x79\x80\x53\xe8\xd3\xa6"</div><div class='add'>+			"\x0a\xaf\xfd\x56\x97\xf7\x40\x8e"</div><div class='add'>+			"\x45\xce\xf8\xb0\x9e\x5c\x33\x82"</div><div class='add'>+			"\xb0\x44\x56\xfc\x05\x09\xe9\x2a"</div><div class='add'>+			"\xac\x26\x80\x14\x1d\xc8\x3a\x35"</div><div class='add'>+			"\x4c\x82\x97\xfd\x76\xb7\xa9\x0a"</div><div class='add'>+			"\x35\x58\x79\x8e\x0f\x66\xea\xaf"</div><div class='add'>+			"\x51\x6c\x09\xa9\x6e\x9b\xcb\x9a"</div><div class='add'>+			"\x31\x47\xa0\x2f\x7c\x71\xb4\x4a"</div><div class='add'>+			"\x11\xaa\x8c\x66\xc5\x64\xe6\x3a"</div><div class='add'>+			"\x54\xda\x24\x6a\xc4\x41\x65\x46"</div><div class='add'>+			"\x82\xa0\x0a\x0f\x5f\xfb\x25\xd0"</div><div class='add'>+			"\x2c\x91\xa7\xee\xc4\x81\x07\x86"</div><div class='add'>+			"\x75\x5e\x33\x69\x97\xe4\x2c\xa8"</div><div class='add'>+			"\x9d\x9f\x0b\x6a\xbe\xad\x98\xda"</div><div class='add'>+			"\x6d\x94\x41\xda\x2c\x1e\x89\xc4"</div><div class='add'>+			"\xc2\xaf\x1e\x00\x05\x0b\x83\x60"</div><div class='add'>+			"\xbd\x43\xea\x15\x23\x7f\xb9\xac"</div><div class='add'>+			"\xee\x4f\x2c\xaf\x2a\xf3\xdf\xd0"</div><div class='add'>+			"\xf3\x19\x31\xbb\x4a\x74\x84\x17"</div><div class='add'>+			"\x52\x32\x2c\x7d\x61\xe4\xcb\xeb"</div><div class='add'>+			"\x80\x38\x15\x52\xcb\x6f\xea\xe5"</div><div class='add'>+			"\x73\x9c\xd9\x24\x69\xc6\x95\x32"</div><div class='add'>+			"\x21\xc8\x11\xe4\xdc\x36\xd7\x93"</div><div class='add'>+			"\x38\x66\xfb\xb2\x7f\x3a\xb9\xaf"</div><div class='add'>+			"\x31\xdd\x93\x75\x78\x8a\x2c\x94"</div><div class='add'>+			"\x87\x1a\x58\xec\x9e\x7d\x4d\xba"</div><div class='add'>+			"\xe1\xe5\x4d\xfc\xbc\xa4\x2a\x14"</div><div class='add'>+			"\xef\xcc\xa7\xec\xab\x43\x09\x18"</div><div class='add'>+			"\xd3\xab\x68\xd1\x07\x99\x44\x47"</div><div class='add'>+			"\xd6\x83\x85\x3b\x30\xea\xa9\x6b"</div><div class='add'>+			"\x63\xea\xc4\x07\xfb\x43\x2f\xa4"</div><div class='add'>+			"\xaa\xb0\xab\x03\x89\xce\x3f\x8c"</div><div class='add'>+			"\x02\x7c\x86\x54\xbc\x88\xaf\x75"</div><div class='add'>+			"\xd2\xdc\x63\x17\xd3\x26\xf6\x96"</div><div class='add'>+			"\xa9\x3c\xf1\x61\x8c\x11\x18\xcc"</div><div class='add'>+			"\xd6\xea\x5b\xe2\xcd\xf0\xf1\xb2"</div><div class='add'>+			"\xe5\x35\x90\x1f\x85\x4c\x76\x5b"</div><div class='add'>+			"\x66\xce\x44\xa4\x32\x9f\xe6\x7b"</div><div class='add'>+			"\x71\x6e\x9f\x58\x15\x67\x72\x87"</div><div class='add'>+			"\x64\x8e\x3a\x44\x45\xd4\x76\xfa"</div><div class='add'>+			"\xc2\xf6\xef\x85\x05\x18\x7a\x9b"</div><div class='add'>+			"\xba\x41\x54\xac\xf0\xfc\x59\x12"</div><div class='add'>+			"\x3f\xdf\xa0\xe5\x8a\x65\xfd\x3a"</div><div class='add'>+			"\x62\x8d\x83\x2c\x03\xbe\x05\x76"</div><div class='add'>+			"\x2e\x53\x49\x97\x94\x33\xae\x40"</div><div class='add'>+			"\x81\x15\xdb\x6e\xad\xaa\xf5\x4b"</div><div class='add'>+			"\xe3\x98\x70\xdf\xe0\x7c\xcd\xdb"</div><div class='add'>+			"\x02\xd4\x7d\x2f\xc1\xe6\xb4\xf3"</div><div class='add'>+			"\xd7\x0d\x7a\xd9\x23\x9e\x87\x2d"</div><div class='add'>+			"\xce\x87\xad\xcc\x72\x05\x00\x29"</div><div class='add'>+			"\xdc\x73\x7f\x64\xc1\x15\x0e\xc2"</div><div class='add'>+			"\xdf\xa7\x5f\xeb\x41\xa1\xcd\xef"</div><div class='add'>+			"\x5c\x50\x79\x2a\x56\x56\x71\x8c"</div><div class='add'>+			"\xac\xc0\x79\x50\x69\xca\x59\x32"</div><div class='add'>+			"\x65\xf2\x54\xe4\x52\x38\x76\xd1"</div><div class='add'>+			"\x5e\xde\x26\x9e\xfb\x75\x2e\x11"</div><div class='add'>+			"\xb5\x10\xf4\x17\x73\xf5\x89\xc7"</div><div class='add'>+			"\x4f\x43\x5c\x8e\x7c\xb9\x05\x52"</div><div class='add'>+			"\x24\x40\x99\xfe\x9b\x85\x0b\x6c"</div><div class='add'>+			"\x22\x3e\x8b\xae\x86\xa1\xd2\x79"</div><div class='add'>+			"\x05\x68\x6b\xab\xe3\x41\x49\xed"</div><div class='add'>+			"\x15\xa1\x8d\x40\x2d\x61\xdf\x1a"</div><div class='add'>+			"\x59\xc9\x26\x8b\xef\x30\x4c\x88"</div><div class='add'>+			"\x4b\x10\xf8\x8d\xa6\x92\x9f\x4b"</div><div class='add'>+			"\xf3\xc4\x53\x0b\x89\x5d\x28\x92"</div><div class='add'>+			"\xcf\x78\xb2\xc0\x5d\xed\x7e\xfc"</div><div class='add'>+			"\xc0\x12\x23\x5f\x5a\x78\x86\x43"</div><div class='add'>+			"\x6e\x27\xf7\x5a\xa7\x6a\xed\x19"</div><div class='add'>+			"\x04\xf0\xb3\x12\xd1\xbd\x0e\x89"</div><div class='add'>+			"\x6e\xbc\x96\xa8\xd8\x49\x39\x9f"</div><div class='add'>+			"\x7e\x67\xf0\x2e\x3e\x01\xa9\xba"</div><div class='add'>+			"\xec\x8b\x62\x8e\xcb\x4a\x70\x43"</div><div class='add'>+			"\xc7\xc2\xc4\xca\x82\x03\x73\xe9"</div><div class='add'>+			"\x11\xdf\xcf\x54\xea\xc9\xb0\x95"</div><div class='add'>+			"\x51\xc0\x13\x3d\x92\x05\xfa\xf4"</div><div class='add'>+			"\xa9\x34\xc8\xce\x6c\x3d\x54\xcc"</div><div class='add'>+			"\xc4\xaf\xf1\xdc\x11\x44\x26\xa2"</div><div class='add'>+			"\xaf\xf1\x85\x75\x7d\x03\x61\x68"</div><div class='add'>+			"\x4e\x78\xc6\x92\x7d\x86\x7d\x77"</div><div class='add'>+			"\xdc\x71\x72\xdb\xc6\xae\xa1\xcb"</div><div class='add'>+			"\x70\x9a\x0b\x19\xbe\x4a\x6c\x2a"</div><div class='add'>+			"\xe2\xba\x6c\x64\x9a\x13\x28\xdf"</div><div class='add'>+			"\x85\x75\xe6\x43\xf6\x87\x08\x68"</div><div class='add'>+			"\x6e\xba\x6e\x79\x9f\x04\xbc\x23"</div><div class='add'>+			"\x50\xf6\x33\x5c\x1f\x24\x25\xbe"</div><div class='add'>+			"\x33\x47\x80\x45\x56\xa3\xa7\xd7"</div><div class='add'>+			"\x7a\xb1\x34\x0b\x90\x3c\x9c\xad"</div><div class='add'>+			"\x44\x5f\x9e\x0e\x9d\xd4\xbd\x93"</div><div class='add'>+			"\x5e\xfa\x3c\xe0\xb0\xd9\xed\xf3"</div><div class='add'>+			"\xd6\x2e\xff\x24\xd8\x71\x6c\xed"</div><div class='add'>+			"\xaf\x55\xeb\x22\xac\x93\x68\x32"</div><div class='add'>+			"\x05\x5b\x47\xdd\xc6\x4a\xcb\xc7"</div><div class='add'>+			"\x10\xe1\x3c\x92\x1a\xf3\x23\x78"</div><div class='add'>+			"\x2b\xa1\xd2\x80\xf4\x12\xb1\x20"</div><div class='add'>+			"\x8f\xff\x26\x35\xdd\xfb\xc7\x4e"</div><div class='add'>+			"\x78\xf1\x2d\x50\x12\x77\xa8\x60"</div><div class='add'>+			"\x7c\x0f\xf5\x16\x2f\x63\x70\x2a"</div><div class='add'>+			"\xc0\x96\x80\x4e\x0a\xb4\x93\x35"</div><div class='add'>+			"\x5d\x1d\x3f\x56\xf7\x2f\xbb\x90"</div><div class='add'>+			"\x11\x16\x8f\xa2\xec\x47\xbe\xac"</div><div class='add'>+			"\x56\x01\x26\x56\xb1\x8c\xb2\x10"</div><div class='add'>+			"\xf9\x1a\xca\xf5\xd1\xb7\x39\x20"</div><div class='add'>+			"\x63\xf1\x69\x20\x4f\x13\x12\x1f"</div><div class='add'>+			"\x5b\x65\xfc\x98\xf7\xc4\x7a\xbe"</div><div class='add'>+			"\xf7\x26\x4d\x2b\x84\x7b\x42\xad"</div><div class='add'>+			"\xd8\x7a\x0a\xb4\xd8\x74\xbf\xc1"</div><div class='add'>+			"\xf0\x6e\xb4\x29\xa3\xbb\xca\x46"</div><div class='add'>+			"\x67\x70\x6a\x2d\xce\x0e\xa2\x8a"</div><div class='add'>+			"\xa9\x87\xbf\x05\xc4\xc1\x04\xa3"</div><div class='add'>+			"\xab\xd4\x45\x43\x8c\xb6\x02\xb0"</div><div class='add'>+			"\x41\xc8\xfc\x44\x3d\x59\xaa\x2e"</div><div class='add'>+			"\x44\x21\x2a\x8d\x88\x9d\x57\xf4"</div><div class='add'>+			"\xa0\x02\x77\xb8\xa6\xa0\xe6\x75"</div><div class='add'>+			"\x5c\x82\x65\x3e\x03\x5c\x29\x8f"</div><div class='add'>+			"\x38\x55\xab\x33\x26\xef\x9f\x43"</div><div class='add'>+			"\x52\xfd\x68\xaf\x36\xb4\xbb\x9a"</div><div class='add'>+			"\x58\x09\x09\x1b\xc3\x65\x46\x46"</div><div class='add'>+			"\x1d\xa7\x94\x18\x23\x50\x2c\xca"</div><div class='add'>+			"\x2c\x55\x19\x97\x01\x9d\x93\x3b"</div><div class='add'>+			"\x63\x86\xf2\x03\x67\x45\xd2\x72"</div><div class='add'>+			"\x28\x52\x6c\xf4\xe3\x1c\xb5\x11"</div><div class='add'>+			"\x13\xf1\xeb\x21\xc7\xd9\x56\x82"</div><div class='add'>+			"\x2b\x82\x39\xbd\x69\x54\xed\x62"</div><div class='add'>+			"\xc3\xe2\xde\x73\xd4\x6a\x12\xae"</div><div class='add'>+			"\x13\x21\x7f\x4b\x5b\xfc\xbf\xe8"</div><div class='add'>+			"\x2b\xbe\x56\xba\x68\x8b\x9a\xb1"</div><div class='add'>+			"\x6e\xfa\xbf\x7e\x5a\x4b\xf1\xac"</div><div class='add'>+			"\x98\x65\x85\xd1\x93\x53\xd3\x7b"</div><div class='add'>+			"\x09\xdd\x4b\x10\x6d\x84\xb0\x13"</div><div class='add'>+			"\x65\xbd\xcf\x52\x09\xc4\x85\xe2"</div><div class='add'>+			"\x84\x74\x15\x65\xb7\xf7\x51\xaf"</div><div class='add'>+			"\x55\xad\xa4\xd1\x22\x54\x70\x94"</div><div class='add'>+			"\xa0\x1c\x90\x41\xfd\x99\xd7\x5a"</div><div class='add'>+			"\x31\xef\xaa\x25\xd0\x7f\x4f\xea"</div><div class='add'>+			"\x1d\x55\x42\xe5\x49\xb0\xd0\x46"</div><div class='add'>+			"\x62\x36\x43\xb2\x82\x15\x75\x50"</div><div class='add'>+			"\xa4\x72\xeb\x54\x27\x1f\x8a\xe4"</div><div class='add'>+			"\x7d\xe9\x66\xc5\xf1\x53\xa4\xd1"</div><div class='add'>+			"\x0c\xeb\xb8\xf8\xbc\xd4\xe2\xe7"</div><div class='add'>+			"\xe1\xf8\x4b\xcb\xa9\xa1\xaf\x15"</div><div class='add'>+			"\x83\xcb\x72\xd0\x33\x79\x00\x2d"</div><div class='add'>+			"\x9f\xd7\xf1\x2e\x1e\x10\xe4\x45"</div><div class='add'>+			"\xc0\x75\x3a\x39\xea\x68\xf7\x5d"</div><div class='add'>+			"\x1b\x73\x8f\xe9\x8e\x0f\x72\x47"</div><div class='add'>+			"\xae\x35\x0a\x31\x7a\x14\x4d\x4a"</div><div class='add'>+			"\x6f\x47\xf7\x7e\x91\x6e\x74\x8b"</div><div class='add'>+			"\x26\x47\xf9\xc3\xf9\xde\x70\xf5"</div><div class='add'>+			"\x61\xab\xa9\x27\x9f\x82\xe4\x9c"</div><div class='add'>+			"\x89\x91\x3f\x2e\x6a\xfd\xb5\x49"</div><div class='add'>+			"\xe9\xfd\x59\x14\x36\x49\x40\x6d"</div><div class='add'>+			"\x32\xd8\x85\x42\xf3\xa5\xdf\x0c"</div><div class='add'>+			"\xa8\x27\xd7\x54\xe2\x63\x2f\xf2"</div><div class='add'>+			"\x7e\x8b\x8b\xe7\xf1\x9a\x95\x35"</div><div class='add'>+			"\x43\xdc\x3a\xe4\xb6\xf4\xd0\xdf"</div><div class='add'>+			"\x9c\xcb\x94\xf3\x21\xa0\x77\x50"</div><div class='add'>+			"\xe2\xc6\xc4\xc6\x5f\x09\x64\x5b"</div><div class='add'>+			"\x92\x90\xd8\xe1\xd1\xed\x4b\x42"</div><div class='add'>+			"\xd7\x37\xaf\x65\x3d\x11\x39\xb6"</div><div class='add'>+			"\x24\x8a\x60\xae\xd6\x1e\xbf\x0e"</div><div class='add'>+			"\x0d\xd7\xdc\x96\x0e\x65\x75\x4e"</div><div class='add'>+			"\x29\x06\x9d\xa4\x51\x3a\x10\x63"</div><div class='add'>+			"\x8f\x17\x07\xd5\x8e\x3c\xf4\x28"</div><div class='add'>+			"\x00\x5a\x5b\x05\x19\xd8\xc0\x6c"</div><div class='add'>+			"\xe5\x15\xe4\x9c\x9d\x71\x9d\x5e"</div><div class='add'>+			"\x94\x29\x1a\xa7\x80\xfa\x0e\x33"</div><div class='add'>+			"\x03\xdd\xb7\x3e\x9a\xa9\x26\x18"</div><div class='add'>+			"\x37\xa9\x64\x08\x4d\x94\x5a\x88"</div><div class='add'>+			"\xca\x35\xce\x81\x02\xe3\x1f\x1b"</div><div class='add'>+			"\x89\x1a\x77\x85\xe3\x41\x6d\x32"</div><div class='add'>+			"\x42\x19\x23\x7d\xc8\x73\xee\x25"</div><div class='add'>+			"\x85\x0d\xf8\x31\x25\x79\x1b\x6f"</div><div class='add'>+			"\x79\x25\xd2\xd8\xd4\x23\xfd\xf7"</div><div class='add'>+			"\x82\x36\x6a\x0c\x46\x22\x15\xe9"</div><div class='add'>+			"\xff\x72\x41\x91\x91\x7d\x3a\xb7"</div><div class='add'>+			"\xdd\x65\x99\x70\xf6\x8d\x84\xf8"</div><div class='add'>+			"\x67\x15\x20\x11\xd6\xb2\x55\x7b"</div><div class='add'>+			"\xdb\x87\xee\xef\x55\x89\x2a\x59"</div><div class='add'>+			"\x2b\x07\x8f\x43\x8a\x59\x3c\x01"</div><div class='add'>+			"\x8b\x65\x54\xa1\x66\xd5\x38\xbd"</div><div class='add'>+			"\xc6\x30\xa9\xcc\x49\xb6\xa8\x1b"</div><div class='add'>+			"\xb8\xc0\x0e\xe3\x45\x28\xe2\xff"</div><div class='add'>+			"\x41\x9f\x7e\x7c\xd1\xae\x9e\x25"</div><div class='add'>+			"\x3f\x4c\x7c\x7c\xf4\xa8\x26\x4d"</div><div class='add'>+			"\x5c\xfd\x4b\x27\x18\xf9\x61\x76"</div><div class='add'>+			"\x48\xba\x0c\x6b\xa9\x4d\xfc\xf5"</div><div class='add'>+			"\x3b\x35\x7e\x2f\x4a\xa9\xc2\x9a"</div><div class='add'>+			"\xae\xab\x86\x09\x89\xc9\xc2\x40"</div><div class='add'>+			"\x39\x2c\x81\xb3\xb8\x17\x67\xc2"</div><div class='add'>+			"\x0d\x32\x4a\x3a\x67\x81\xd7\x1a"</div><div class='add'>+			"\x34\x52\xc5\xdb\x0a\xf5\x63\x39"</div><div class='add'>+			"\xea\x1f\xe1\x7c\xa1\x9e\xc1\x35"</div><div class='add'>+			"\xe3\xb1\x18\x45\x67\xf9\x22\x38"</div><div class='add'>+			"\x95\xd9\x34\x34\x86\xc6\x41\x94"</div><div class='add'>+			"\x15\xf9\x5b\x41\xa6\x87\x8b\xf8"</div><div class='add'>+			"\xd5\xe1\x1b\xe2\x5b\xf3\x86\x10"</div><div class='add'>+			"\xff\xe6\xae\x69\x76\xbc\x0d\xb4"</div><div class='add'>+			"\x09\x90\x0c\xa2\x65\x0c\xad\x74"</div><div class='add'>+			"\xf5\xd7\xff\xda\xc1\xce\x85\xbe"</div><div class='add'>+			"\x00\xa7\xff\x4d\x2f\x65\xd3\x8c"</div><div class='add'>+			"\x86\x2d\x05\xe8\xed\x3e\x6b\x8b"</div><div class='add'>+			"\x0f\x3d\x83\x8c\xf1\x1d\x5b\x96"</div><div class='add'>+			"\x2e\xb1\x9c\xc2\x98\xe1\x70\xb9"</div><div class='add'>+			"\xba\x5c\x8a\x43\xd6\x34\xa7\x2d"</div><div class='add'>+			"\xc9\x92\xae\xf2\xa5\x7b\x05\x49"</div><div class='add'>+			"\xa7\x33\x34\x86\xca\xe4\x96\x23"</div><div class='add'>+			"\x76\x5b\xf2\xc6\xf1\x51\x28\x42"</div><div class='add'>+			"\x7b\xcc\x76\x8f\xfa\xa2\xad\x31"</div><div class='add'>+			"\xd4\xd6\x7a\x6d\x25\x25\x54\xe4"</div><div class='add'>+			"\x3f\x50\x59\xe1\x5c\x05\xb7\x27"</div><div class='add'>+			"\x48\xbf\x07\xec\x1b\x13\xbe\x2b"</div><div class='add'>+			"\xa1\x57\x2b\xd5\xab\xd7\xd0\x4c"</div><div class='add'>+			"\x1e\xcb\x71\x9b\xc5\x90\x85\xd3"</div><div class='add'>+			"\xde\x59\xec\x71\xeb\x89\xbb\xd0"</div><div class='add'>+			"\x09\x50\xe1\x16\x3f\xfd\x1c\x34"</div><div class='add'>+			"\xc3\x1c\xa1\x10\x77\x53\x98\xef"</div><div class='add'>+			"\xf2\xfd\xa5\x01\x59\xc2\x9b\x26"</div><div class='add'>+			"\xc7\x42\xd9\x49\xda\x58\x2b\x6e"</div><div class='add'>+			"\x9f\x53\x19\x76\x7e\xd9\xc9\x0e"</div><div class='add'>+			"\x68\xc8\x7f\x51\x22\x42\xef\x49"</div><div class='add'>+			"\xa4\x55\xb6\x36\xac\x09\xc7\x31"</div><div class='add'>+			"\x88\x15\x4b\x2e\x8f\x3a\x08\xf7"</div><div class='add'>+			"\xd8\xf7\xa8\xc5\xa9\x33\xa6\x45"</div><div class='add'>+			"\xe4\xc4\x94\x76\xf3\x0d\x8f\x7e"</div><div class='add'>+			"\xc8\xf6\xbc\x23\x0a\xb6\x4c\xd3"</div><div class='add'>+			"\x6a\xcd\x36\xc2\x90\x5c\x5c\x3c"</div><div class='add'>+			"\x65\x7b\xc2\xd6\xcc\xe6\x0d\x87"</div><div class='add'>+			"\x73\x2e\x71\x79\x16\x06\x63\x28"</div><div class='add'>+			"\x09\x15\xd8\x89\x38\x38\x3d\xb5"</div><div class='add'>+			"\x42\x1c\x08\x24\xf7\x2a\xd2\x9d"</div><div class='add'>+			"\xc8\xca\xef\xf9\x27\xd8\x07\x86"</div><div class='add'>+			"\xf7\x43\x0b\x55\x15\x3f\x9f\x83"</div><div class='add'>+			"\xef\xdc\x49\x9d\x2a\xc1\x54\x62"</div><div class='add'>+			"\xbd\x9b\x66\x55\x9f\xb7\x12\xf3"</div><div class='add'>+			"\x1b\x4d\x9d\x2a\x5c\xed\x87\x75"</div><div class='add'>+			"\x87\x26\xec\x61\x2c\xb4\x0f\x89"</div><div class='add'>+			"\xb0\xfb\x2e\x68\x5d\x15\xc7\x8d"</div><div class='add'>+			"\x2e\xc0\xd9\xec\xaf\x4f\xd2\x25"</div><div class='add'>+			"\x29\xe8\xd2\x26\x2b\x67\xe9\xfc"</div><div class='add'>+			"\x2b\xa8\x67\x96\x12\x1f\x5b\x96"</div><div class='add'>+			"\xc6\x14\x53\xaf\x44\xea\xd6\xe2"</div><div class='add'>+			"\x94\x98\xe4\x12\x93\x4c\x92\xe0"</div><div class='add'>+			"\x18\xa5\x8d\x2d\xe4\x71\x3c\x47"</div><div class='add'>+			"\x4c\xf7\xe6\x47\x9e\xc0\x68\xdf"</div><div class='add'>+			"\xd4\xf5\x5a\x74\xb1\x2b\x29\x03"</div><div class='add'>+			"\x19\x07\xaf\x90\x62\x5c\x68\x98"</div><div class='add'>+			"\x48\x16\x11\x02\x9d\xee\xb4\x9b"</div><div class='add'>+			"\xe5\x42\x7f\x08\xfd\x16\x32\x0b"</div><div class='add'>+			"\xd0\xb3\xfa\x2b\xb7\x99\xf9\x29"</div><div class='add'>+			"\xcd\x20\x45\x9f\xb3\x1a\x5d\xa2"</div><div class='add'>+			"\xaf\x4d\xe0\xbd\x42\x0d\xbc\x74"</div><div class='add'>+			"\x99\x9c\x8e\x53\x1a\xb4\x3e\xbd"</div><div class='add'>+			"\xa2\x9a\x2d\xf7\xf8\x39\x0f\x67"</div><div class='add'>+			"\x63\xfc\x6b\xc0\xaf\xb3\x4b\x4f"</div><div class='add'>+			"\x55\xc4\xcf\xa7\xc8\x04\x11\x3e"</div><div class='add'>+			"\x14\x32\xbb\x1b\x38\x77\xd6\x7f"</div><div class='add'>+			"\x54\x4c\xdf\x75\xf3\x07\x2d\x33"</div><div class='add'>+			"\x9b\xa8\x20\xe1\x7b\x12\xb5\xf3"</div><div class='add'>+			"\xef\x2f\xce\x72\xe5\x24\x60\xc1"</div><div class='add'>+			"\x30\xe2\xab\xa1\x8e\x11\x09\xa8"</div><div class='add'>+			"\x21\x33\x44\xfe\x7f\x35\x32\x93"</div><div class='add'>+			"\x39\xa7\xad\x8b\x79\x06\xb2\xcb"</div><div class='add'>+			"\x4e\xa9\x5f\xc7\xba\x74\x29\xec"</div><div class='add'>+			"\x93\xa0\x4e\x54\x93\xc0\xbc\x55"</div><div class='add'>+			"\x64\xf0\x48\xe5\x57\x99\xee\x75"</div><div class='add'>+			"\xd6\x79\x0f\x66\xb7\xc6\x57\x76"</div><div class='add'>+			"\xf7\xb7\xf3\x9c\xc5\x60\xe8\x7f"</div><div class='add'>+			"\x83\x76\xd6\x0e\xaa\xe6\x90\x39"</div><div class='add'>+			"\x1d\xa6\x32\x6a\x34\xe3\x55\xf8"</div><div class='add'>+			"\x58\xa0\x58\x7d\x33\xe0\x22\x39"</div><div class='add'>+			"\x44\x64\x87\x86\x5a\x2f\xa7\x7e"</div><div class='add'>+			"\x0f\x38\xea\xb0\x30\xcc\x61\xa5"</div><div class='add'>+			"\x6a\x32\xae\x1e\xf7\xe9\xd0\xa9"</div><div class='add'>+			"\x0c\x32\x4b\xb5\x49\x28\xab\x85"</div><div class='add'>+			"\x2f\x8e\x01\x36\x38\x52\xd0\xba"</div><div class='add'>+			"\xd6\x02\x78\xf8\x0e\x3e\x9c\x8b"</div><div class='add'>+			"\x6b\x45\x99\x3f\x5c\xfe\x58\xf1"</div><div class='add'>+			"\x5c\x94\x04\xe1\xf5\x18\x6d\x51"</div><div class='add'>+			"\xb2\x5d\x18\x20\xb6\xc2\x9a\x42"</div><div class='add'>+			"\x1d\xb3\xab\x3c\xb6\x3a\x13\x03"</div><div class='add'>+			"\xb2\x46\x82\x4f\xfc\x64\xbc\x4f"</div><div class='add'>+			"\xca\xfa\x9c\xc0\xd5\xa7\xbd\x11"</div><div class='add'>+			"\xb7\xe4\x5a\xf6\x6f\x4d\x4d\x54"</div><div class='add'>+			"\xea\xa4\x98\x66\xd4\x22\x3b\xd3"</div><div class='add'>+			"\x8f\x34\x47\xd9\x7c\xf4\x72\x3b"</div><div class='add'>+			"\x4d\x02\x77\xf6\xd6\xdd\x08\x0a"</div><div class='add'>+			"\x81\xe1\x86\x89\x3e\x56\x10\x3c"</div><div class='add'>+			"\xba\xd7\x81\x8c\x08\xbc\x8b\xe2"</div><div class='add'>+			"\x53\xec\xa7\x89\xee\xc8\x56\xb5"</div><div class='add'>+			"\x36\x2c\xb2\x03\xba\x99\xdd\x7c"</div><div class='add'>+			"\x48\xa0\xb0\xbc\x91\x33\xe9\xa8"</div><div class='add'>+			"\xcb\xcd\xcf\x59\x5f\x1f\x15\xe2"</div><div class='add'>+			"\x56\xf5\x4e\x01\x35\x27\x45\x77"</div><div class='add'>+			"\x47\xc8\xbc\xcb\x7e\x39\xc1\x97"</div><div class='add'>+			"\x28\xd3\x84\xfc\x2c\x3e\xc8\xad"</div><div class='add'>+			"\x9c\xf8\x8a\x61\x9c\x28\xaa\xc5"</div><div class='add'>+			"\x99\x20\x43\x85\x9d\xa5\xe2\x8b"</div><div class='add'>+			"\xb8\xae\xeb\xd0\x32\x0d\x52\x78"</div><div class='add'>+			"\x09\x56\x3f\xc7\xd8\x7e\x26\xfc"</div><div class='add'>+			"\x37\xfb\x6f\x04\xfc\xfa\x92\x10"</div><div class='add'>+			"\xac\xf8\x3e\x21\xdc\x8c\x21\x16"</div><div class='add'>+			"\x7d\x67\x6e\xf6\xcd\xda\xb6\x98"</div><div class='add'>+			"\x23\xab\x23\x3c\xb2\x10\xa0\x53"</div><div class='add'>+			"\x5a\x56\x9f\xc5\xd0\xff\xbb\xe4"</div><div class='add'>+			"\x98\x3c\x69\x1e\xdb\x38\x8f\x7e"</div><div class='add'>+			"\x0f\xd2\x98\x88\x81\x8b\x45\x67"</div><div class='add'>+			"\xea\x33\xf1\xeb\xe9\x97\x55\x2e"</div><div class='add'>+			"\xd9\xaa\xeb\x5a\xec\xda\xe1\x68"</div><div class='add'>+			"\xa8\x9d\x3c\x84\x7c\x05\x3d\x62"</div><div class='add'>+			"\x87\x8f\x03\x21\x28\x95\x0c\x89"</div><div class='add'>+			"\x25\x22\x4a\xb0\x93\xa9\x50\xa2"</div><div class='add'>+			"\x2f\x57\x6e\x18\x42\x19\x54\x0c"</div><div class='add'>+			"\x55\x67\xc6\x11\x49\xf4\x5c\xd2"</div><div class='add'>+			"\xe9\x3d\xdd\x8b\x48\x71\x21\x00"</div><div class='add'>+			"\xc3\x9a\x6c\x85\x74\x28\x83\x4a"</div><div class='add'>+			"\x1b\x31\x05\xe1\x06\x92\xe7\xda"</div><div class='add'>+			"\x85\x73\x78\x45\x20\x7f\xae\x13"</div><div class='add'>+			"\x7c\x33\x06\x22\xf4\x83\xf9\x35"</div><div class='add'>+			"\x3f\x6c\x71\xa8\x4e\x48\xbe\x9b"</div><div class='add'>+			"\xce\x8a\xba\xda\xbe\x28\x08\xf7"</div><div class='add'>+			"\xe2\x14\x8c\x71\xea\x72\xf9\x33"</div><div class='add'>+			"\xf2\x88\x3f\xd7\xbb\x69\x6c\x29"</div><div class='add'>+			"\x19\xdc\x84\xce\x1f\x12\x4f\xc8"</div><div class='add'>+			"\xaf\xa5\x04\xba\x5a\xab\xb0\xd9"</div><div class='add'>+			"\x14\x1f\x6c\x68\x98\x39\x89\x7a"</div><div class='add'>+			"\xd9\xd8\x2f\xdf\xa8\x47\x4a\x25"</div><div class='add'>+			"\xe2\xfb\x33\xf4\x59\x78\xe1\x68"</div><div class='add'>+			"\x85\xcf\xfe\x59\x20\xd4\x05\x1d"</div><div class='add'>+			"\x80\x99\xae\xbc\xca\xae\x0f\x2f"</div><div class='add'>+			"\x65\x43\x34\x8e\x7e\xac\xd3\x93"</div><div class='add'>+			"\x2f\xac\x6d\x14\x3d\x02\x07\x70"</div><div class='add'>+			"\x9d\xa4\xf3\x1b\x5c\x36\xfc\x01"</div><div class='add'>+			"\x73\x34\x85\x0c\x6c\xd6\xf1\xbd"</div><div class='add'>+			"\x3f\xdf\xee\xf5\xd9\xba\x56\xef"</div><div class='add'>+			"\xf4\x9b\x6b\xee\x9f\x5a\x78\x6d"</div><div class='add'>+			"\x32\x19\xf4\xf7\xf8\x4c\x69\x0b"</div><div class='add'>+			"\x4b\xbc\xbb\xb7\xf2\x85\xaf\x70"</div><div class='add'>+			"\x75\x24\x6c\x54\xa7\x0e\x4d\x1d"</div><div class='add'>+			"\x01\xbf\x08\xac\xcf\x7f\x2c\xe3"</div><div class='add'>+			"\x14\x89\x5e\x70\x5a\x99\x92\xcd"</div><div class='add'>+			"\x01\x84\xc8\xd2\xab\xe5\x4f\x58"</div><div class='add'>+			"\xe7\x0f\x2f\x0e\xff\x68\xea\xfd"</div><div class='add'>+			"\x15\xb3\x17\xe6\xb0\xe7\x85\xd8"</div><div class='add'>+			"\x23\x2e\x05\xc7\xc9\xc4\x46\x1f"</div><div class='add'>+			"\xe1\x9e\x49\x20\x23\x24\x4d\x7e"</div><div class='add'>+			"\x29\x65\xff\xf4\xb6\xfd\x1a\x85"</div><div class='add'>+			"\xc4\x16\xec\xfc\xea\x7b\xd6\x2c"</div><div class='add'>+			"\x43\xf8\xb7\xbf\x79\xc0\x85\xcd"</div><div class='add'>+			"\xef\xe1\x98\xd3\xa5\xf7\x90\x8c"</div><div class='add'>+			"\xe9\x7f\x80\x6b\xd2\xac\x4c\x30"</div><div class='add'>+			"\xa7\xc6\x61\x6c\xd2\xf9\x2c\xff"</div><div class='add'>+			"\x30\xbc\x22\x81\x7d\x93\x12\xe4"</div><div class='add'>+			"\x0a\xcd\xaf\xdd\xe8\xab\x0a\x1e"</div><div class='add'>+			"\x13\xa4\x27\xc3\x5f\xf7\x4b\xbb"</div><div class='add'>+			"\x37\x09\x4b\x91\x6f\x92\x4f\xaf"</div><div class='add'>+			"\x52\xee\xdf\xef\x09\x6f\xf7\x5c"</div><div class='add'>+			"\x6e\x12\x17\x72\x63\x57\xc7\xba"</div><div class='add'>+			"\x3b\x6b\x38\x32\x73\x1b\x9c\x80"</div><div class='add'>+			"\xc1\x7a\xc6\xcf\xcd\x35\xc0\x6b"</div><div class='add'>+			"\x31\x1a\x6b\xe9\xd8\x2c\x29\x3f"</div><div class='add'>+			"\x96\xfb\xb6\xcd\x13\x91\x3b\xc2"</div><div class='add'>+			"\xd2\xa3\x31\x8d\xa4\xcd\x57\xcd"</div><div class='add'>+			"\x13\x3d\x64\xfd\x06\xce\xe6\xdc"</div><div class='add'>+			"\x0c\x24\x43\x31\x40\x57\xf1\x72"</div><div class='add'>+			"\x17\xe3\x3a\x63\x6d\x35\xcf\x5d"</div><div class='add'>+			"\x97\x40\x59\xdd\xf7\x3c\x02\xf7"</div><div class='add'>+			"\x1c\x7e\x05\xbb\xa9\x0d\x01\xb1"</div><div class='add'>+			"\x8e\xc0\x30\xa9\x53\x24\xc9\x89"</div><div class='add'>+			"\x84\x6d\xaa\xd0\xcd\x91\xc2\x4d"</div><div class='add'>+			"\x91\xb0\x89\xe2\xbf\x83\x44\xaa"</div><div class='add'>+			"\x28\x72\x23\xa0\xc2\xad\xad\x1c"</div><div class='add'>+			"\xfc\x3f\x09\x7a\x0b\xdc\xc5\x1b"</div><div class='add'>+			"\x87\x13\xc6\x5b\x59\x8d\xf2\xc8"</div><div class='add'>+			"\xaf\xdf\x11\x95",</div><div class='add'>+		.rlen	= 4100,</div><div class='add'>+		.np	= 2,</div><div class='add'>+		.tap	= { 4064, 36 },</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * CTS (Cipher Text Stealing) mode tests</div><div class='add'>+ */</div><div class='add'>+#define CTS_MODE_ENC_TEST_VECTORS 6</div><div class='add'>+#define CTS_MODE_DEC_TEST_VECTORS 6</div><div class='add'>+static struct cipher_testvec cts_mode_enc_tv_template[] = {</div><div class='add'>+	{ /* from rfc3962 */</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.key    = "\x63\x68\x69\x63\x6b\x65\x6e\x20"</div><div class='add'>+			  "\x74\x65\x72\x69\x79\x61\x6b\x69",</div><div class='add'>+		.ilen	= 17,</div><div class='add'>+		.input  = "\x49\x20\x77\x6f\x75\x6c\x64\x20"</div><div class='add'>+			  "\x6c\x69\x6b\x65\x20\x74\x68\x65"</div><div class='add'>+			  "\x20",</div><div class='add'>+		.rlen	= 17,</div><div class='add'>+		.result	= "\xc6\x35\x35\x68\xf2\xbf\x8c\xb4"</div><div class='add'>+			  "\xd8\xa5\x80\x36\x2d\xa7\xff\x7f"</div><div class='add'>+			  "\x97",</div><div class='add'>+	}, {</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.key    = "\x63\x68\x69\x63\x6b\x65\x6e\x20"</div><div class='add'>+			  "\x74\x65\x72\x69\x79\x61\x6b\x69",</div><div class='add'>+		.ilen   = 31,</div><div class='add'>+		.input  = "\x49\x20\x77\x6f\x75\x6c\x64\x20"</div><div class='add'>+			  "\x6c\x69\x6b\x65\x20\x74\x68\x65"</div><div class='add'>+			  "\x20\x47\x65\x6e\x65\x72\x61\x6c"</div><div class='add'>+			  "\x20\x47\x61\x75\x27\x73\x20",</div><div class='add'>+		.rlen   = 31,</div><div class='add'>+		.result = "\xfc\x00\x78\x3e\x0e\xfd\xb2\xc1"</div><div class='add'>+			  "\xd4\x45\xd4\xc8\xef\xf7\xed\x22"</div><div class='add'>+			  "\x97\x68\x72\x68\xd6\xec\xcc\xc0"</div><div class='add'>+			  "\xc0\x7b\x25\xe2\x5e\xcf\xe5",</div><div class='add'>+	}, {</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.key    = "\x63\x68\x69\x63\x6b\x65\x6e\x20"</div><div class='add'>+			  "\x74\x65\x72\x69\x79\x61\x6b\x69",</div><div class='add'>+		.ilen   = 32,</div><div class='add'>+		.input  = "\x49\x20\x77\x6f\x75\x6c\x64\x20"</div><div class='add'>+			  "\x6c\x69\x6b\x65\x20\x74\x68\x65"</div><div class='add'>+			  "\x20\x47\x65\x6e\x65\x72\x61\x6c"</div><div class='add'>+			  "\x20\x47\x61\x75\x27\x73\x20\x43",</div><div class='add'>+		.rlen   = 32,</div><div class='add'>+		.result = "\x39\x31\x25\x23\xa7\x86\x62\xd5"</div><div class='add'>+			  "\xbe\x7f\xcb\xcc\x98\xeb\xf5\xa8"</div><div class='add'>+			  "\x97\x68\x72\x68\xd6\xec\xcc\xc0"</div><div class='add'>+			  "\xc0\x7b\x25\xe2\x5e\xcf\xe5\x84",</div><div class='add'>+	}, {</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.key    = "\x63\x68\x69\x63\x6b\x65\x6e\x20"</div><div class='add'>+			  "\x74\x65\x72\x69\x79\x61\x6b\x69",</div><div class='add'>+		.ilen   = 47,</div><div class='add'>+		.input  = "\x49\x20\x77\x6f\x75\x6c\x64\x20"</div><div class='add'>+			  "\x6c\x69\x6b\x65\x20\x74\x68\x65"</div><div class='add'>+			  "\x20\x47\x65\x6e\x65\x72\x61\x6c"</div><div class='add'>+			  "\x20\x47\x61\x75\x27\x73\x20\x43"</div><div class='add'>+			  "\x68\x69\x63\x6b\x65\x6e\x2c\x20"</div><div class='add'>+			  "\x70\x6c\x65\x61\x73\x65\x2c",</div><div class='add'>+		.rlen   = 47,</div><div class='add'>+		.result = "\x97\x68\x72\x68\xd6\xec\xcc\xc0"</div><div class='add'>+			  "\xc0\x7b\x25\xe2\x5e\xcf\xe5\x84"</div><div class='add'>+			  "\xb3\xff\xfd\x94\x0c\x16\xa1\x8c"</div><div class='add'>+			  "\x1b\x55\x49\xd2\xf8\x38\x02\x9e"</div><div class='add'>+			  "\x39\x31\x25\x23\xa7\x86\x62\xd5"</div><div class='add'>+			  "\xbe\x7f\xcb\xcc\x98\xeb\xf5",</div><div class='add'>+	}, {</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.key    = "\x63\x68\x69\x63\x6b\x65\x6e\x20"</div><div class='add'>+			  "\x74\x65\x72\x69\x79\x61\x6b\x69",</div><div class='add'>+		.ilen   = 48,</div><div class='add'>+		.input  = "\x49\x20\x77\x6f\x75\x6c\x64\x20"</div><div class='add'>+			  "\x6c\x69\x6b\x65\x20\x74\x68\x65"</div><div class='add'>+			  "\x20\x47\x65\x6e\x65\x72\x61\x6c"</div><div class='add'>+			  "\x20\x47\x61\x75\x27\x73\x20\x43"</div><div class='add'>+			  "\x68\x69\x63\x6b\x65\x6e\x2c\x20"</div><div class='add'>+			  "\x70\x6c\x65\x61\x73\x65\x2c\x20",</div><div class='add'>+		.rlen   = 48,</div><div class='add'>+		.result = "\x97\x68\x72\x68\xd6\xec\xcc\xc0"</div><div class='add'>+			  "\xc0\x7b\x25\xe2\x5e\xcf\xe5\x84"</div><div class='add'>+			  "\x9d\xad\x8b\xbb\x96\xc4\xcd\xc0"</div><div class='add'>+			  "\x3b\xc1\x03\xe1\xa1\x94\xbb\xd8"</div><div class='add'>+			  "\x39\x31\x25\x23\xa7\x86\x62\xd5"</div><div class='add'>+			  "\xbe\x7f\xcb\xcc\x98\xeb\xf5\xa8",</div><div class='add'>+	}, {</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.key    = "\x63\x68\x69\x63\x6b\x65\x6e\x20"</div><div class='add'>+			  "\x74\x65\x72\x69\x79\x61\x6b\x69",</div><div class='add'>+		.ilen   = 64,</div><div class='add'>+		.input  = "\x49\x20\x77\x6f\x75\x6c\x64\x20"</div><div class='add'>+			  "\x6c\x69\x6b\x65\x20\x74\x68\x65"</div><div class='add'>+			  "\x20\x47\x65\x6e\x65\x72\x61\x6c"</div><div class='add'>+			  "\x20\x47\x61\x75\x27\x73\x20\x43"</div><div class='add'>+			  "\x68\x69\x63\x6b\x65\x6e\x2c\x20"</div><div class='add'>+			  "\x70\x6c\x65\x61\x73\x65\x2c\x20"</div><div class='add'>+			  "\x61\x6e\x64\x20\x77\x6f\x6e\x74"</div><div class='add'>+			  "\x6f\x6e\x20\x73\x6f\x75\x70\x2e",</div><div class='add'>+		.rlen   = 64,</div><div class='add'>+		.result = "\x97\x68\x72\x68\xd6\xec\xcc\xc0"</div><div class='add'>+			  "\xc0\x7b\x25\xe2\x5e\xcf\xe5\x84"</div><div class='add'>+			  "\x39\x31\x25\x23\xa7\x86\x62\xd5"</div><div class='add'>+			  "\xbe\x7f\xcb\xcc\x98\xeb\xf5\xa8"</div><div class='add'>+			  "\x48\x07\xef\xe8\x36\xee\x89\xa5"</div><div class='add'>+			  "\x26\x73\x0d\xbc\x2f\x7b\xc8\x40"</div><div class='add'>+			  "\x9d\xad\x8b\xbb\x96\xc4\xcd\xc0"</div><div class='add'>+			  "\x3b\xc1\x03\xe1\xa1\x94\xbb\xd8",</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct cipher_testvec cts_mode_dec_tv_template[] = {</div><div class='add'>+	{ /* from rfc3962 */</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.key    = "\x63\x68\x69\x63\x6b\x65\x6e\x20"</div><div class='add'>+			  "\x74\x65\x72\x69\x79\x61\x6b\x69",</div><div class='add'>+		.rlen	= 17,</div><div class='add'>+		.result = "\x49\x20\x77\x6f\x75\x6c\x64\x20"</div><div class='add'>+			  "\x6c\x69\x6b\x65\x20\x74\x68\x65"</div><div class='add'>+			  "\x20",</div><div class='add'>+		.ilen	= 17,</div><div class='add'>+		.input	= "\xc6\x35\x35\x68\xf2\xbf\x8c\xb4"</div><div class='add'>+			  "\xd8\xa5\x80\x36\x2d\xa7\xff\x7f"</div><div class='add'>+			  "\x97",</div><div class='add'>+	}, {</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.key    = "\x63\x68\x69\x63\x6b\x65\x6e\x20"</div><div class='add'>+			  "\x74\x65\x72\x69\x79\x61\x6b\x69",</div><div class='add'>+		.rlen   = 31,</div><div class='add'>+		.result = "\x49\x20\x77\x6f\x75\x6c\x64\x20"</div><div class='add'>+			  "\x6c\x69\x6b\x65\x20\x74\x68\x65"</div><div class='add'>+			  "\x20\x47\x65\x6e\x65\x72\x61\x6c"</div><div class='add'>+			  "\x20\x47\x61\x75\x27\x73\x20",</div><div class='add'>+		.ilen   = 31,</div><div class='add'>+		.input  = "\xfc\x00\x78\x3e\x0e\xfd\xb2\xc1"</div><div class='add'>+			  "\xd4\x45\xd4\xc8\xef\xf7\xed\x22"</div><div class='add'>+			  "\x97\x68\x72\x68\xd6\xec\xcc\xc0"</div><div class='add'>+			  "\xc0\x7b\x25\xe2\x5e\xcf\xe5",</div><div class='add'>+	}, {</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.key    = "\x63\x68\x69\x63\x6b\x65\x6e\x20"</div><div class='add'>+			  "\x74\x65\x72\x69\x79\x61\x6b\x69",</div><div class='add'>+		.rlen   = 32,</div><div class='add'>+		.result = "\x49\x20\x77\x6f\x75\x6c\x64\x20"</div><div class='add'>+			  "\x6c\x69\x6b\x65\x20\x74\x68\x65"</div><div class='add'>+			  "\x20\x47\x65\x6e\x65\x72\x61\x6c"</div><div class='add'>+			  "\x20\x47\x61\x75\x27\x73\x20\x43",</div><div class='add'>+		.ilen   = 32,</div><div class='add'>+		.input  = "\x39\x31\x25\x23\xa7\x86\x62\xd5"</div><div class='add'>+			  "\xbe\x7f\xcb\xcc\x98\xeb\xf5\xa8"</div><div class='add'>+			  "\x97\x68\x72\x68\xd6\xec\xcc\xc0"</div><div class='add'>+			  "\xc0\x7b\x25\xe2\x5e\xcf\xe5\x84",</div><div class='add'>+	}, {</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.key    = "\x63\x68\x69\x63\x6b\x65\x6e\x20"</div><div class='add'>+			  "\x74\x65\x72\x69\x79\x61\x6b\x69",</div><div class='add'>+		.rlen   = 47,</div><div class='add'>+		.result = "\x49\x20\x77\x6f\x75\x6c\x64\x20"</div><div class='add'>+			  "\x6c\x69\x6b\x65\x20\x74\x68\x65"</div><div class='add'>+			  "\x20\x47\x65\x6e\x65\x72\x61\x6c"</div><div class='add'>+			  "\x20\x47\x61\x75\x27\x73\x20\x43"</div><div class='add'>+			  "\x68\x69\x63\x6b\x65\x6e\x2c\x20"</div><div class='add'>+			  "\x70\x6c\x65\x61\x73\x65\x2c",</div><div class='add'>+		.ilen   = 47,</div><div class='add'>+		.input  = "\x97\x68\x72\x68\xd6\xec\xcc\xc0"</div><div class='add'>+			  "\xc0\x7b\x25\xe2\x5e\xcf\xe5\x84"</div><div class='add'>+			  "\xb3\xff\xfd\x94\x0c\x16\xa1\x8c"</div><div class='add'>+			  "\x1b\x55\x49\xd2\xf8\x38\x02\x9e"</div><div class='add'>+			  "\x39\x31\x25\x23\xa7\x86\x62\xd5"</div><div class='add'>+			  "\xbe\x7f\xcb\xcc\x98\xeb\xf5",</div><div class='add'>+	}, {</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.key    = "\x63\x68\x69\x63\x6b\x65\x6e\x20"</div><div class='add'>+			  "\x74\x65\x72\x69\x79\x61\x6b\x69",</div><div class='add'>+		.rlen   = 48,</div><div class='add'>+		.result = "\x49\x20\x77\x6f\x75\x6c\x64\x20"</div><div class='add'>+			  "\x6c\x69\x6b\x65\x20\x74\x68\x65"</div><div class='add'>+			  "\x20\x47\x65\x6e\x65\x72\x61\x6c"</div><div class='add'>+			  "\x20\x47\x61\x75\x27\x73\x20\x43"</div><div class='add'>+			  "\x68\x69\x63\x6b\x65\x6e\x2c\x20"</div><div class='add'>+			  "\x70\x6c\x65\x61\x73\x65\x2c\x20",</div><div class='add'>+		.ilen   = 48,</div><div class='add'>+		.input  = "\x97\x68\x72\x68\xd6\xec\xcc\xc0"</div><div class='add'>+			  "\xc0\x7b\x25\xe2\x5e\xcf\xe5\x84"</div><div class='add'>+			  "\x9d\xad\x8b\xbb\x96\xc4\xcd\xc0"</div><div class='add'>+			  "\x3b\xc1\x03\xe1\xa1\x94\xbb\xd8"</div><div class='add'>+			  "\x39\x31\x25\x23\xa7\x86\x62\xd5"</div><div class='add'>+			  "\xbe\x7f\xcb\xcc\x98\xeb\xf5\xa8",</div><div class='add'>+	}, {</div><div class='add'>+		.klen	= 16,</div><div class='add'>+		.key    = "\x63\x68\x69\x63\x6b\x65\x6e\x20"</div><div class='add'>+			  "\x74\x65\x72\x69\x79\x61\x6b\x69",</div><div class='add'>+		.rlen   = 64,</div><div class='add'>+		.result = "\x49\x20\x77\x6f\x75\x6c\x64\x20"</div><div class='add'>+			  "\x6c\x69\x6b\x65\x20\x74\x68\x65"</div><div class='add'>+			  "\x20\x47\x65\x6e\x65\x72\x61\x6c"</div><div class='add'>+			  "\x20\x47\x61\x75\x27\x73\x20\x43"</div><div class='add'>+			  "\x68\x69\x63\x6b\x65\x6e\x2c\x20"</div><div class='add'>+			  "\x70\x6c\x65\x61\x73\x65\x2c\x20"</div><div class='add'>+			  "\x61\x6e\x64\x20\x77\x6f\x6e\x74"</div><div class='add'>+			  "\x6f\x6e\x20\x73\x6f\x75\x70\x2e",</div><div class='add'>+		.ilen   = 64,</div><div class='add'>+		.input  = "\x97\x68\x72\x68\xd6\xec\xcc\xc0"</div><div class='add'>+			  "\xc0\x7b\x25\xe2\x5e\xcf\xe5\x84"</div><div class='add'>+			  "\x39\x31\x25\x23\xa7\x86\x62\xd5"</div><div class='add'>+			  "\xbe\x7f\xcb\xcc\x98\xeb\xf5\xa8"</div><div class='add'>+			  "\x48\x07\xef\xe8\x36\xee\x89\xa5"</div><div class='add'>+			  "\x26\x73\x0d\xbc\x2f\x7b\xc8\x40"</div><div class='add'>+			  "\x9d\xad\x8b\xbb\x96\xc4\xcd\xc0"</div><div class='add'>+			  "\x3b\xc1\x03\xe1\xa1\x94\xbb\xd8",</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Compression stuff.</div><div class='add'>+ */</div><div class='add'>+#define COMP_BUF_SIZE           512</div><div class='add'>+</div><div class='add'>+struct comp_testvec {</div><div class='add'>+	int inlen, outlen;</div><div class='add'>+	char input[COMP_BUF_SIZE];</div><div class='add'>+	char output[COMP_BUF_SIZE];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Deflate test vectors (null-terminated strings).</div><div class='add'>+ * Params: winbits=11, Z_DEFAULT_COMPRESSION, MAX_MEM_LEVEL.</div><div class='add'>+ */</div><div class='add'>+#define DEFLATE_COMP_TEST_VECTORS 2</div><div class='add'>+#define DEFLATE_DECOMP_TEST_VECTORS 2</div><div class='add'>+</div><div class='add'>+static struct comp_testvec deflate_comp_tv_template[] = {</div><div class='add'>+	{</div><div class='add'>+		.inlen	= 70,</div><div class='add'>+		.outlen	= 38,</div><div class='add'>+		.input	= "Join us now and share the software "</div><div class='add'>+			"Join us now and share the software ",</div><div class='add'>+		.output	= "\xf3\xca\xcf\xcc\x53\x28\x2d\x56"</div><div class='add'>+			  "\xc8\xcb\x2f\x57\x48\xcc\x4b\x51"</div><div class='add'>+			  "\x28\xce\x48\x2c\x4a\x55\x28\xc9"</div><div class='add'>+			  "\x48\x55\x28\xce\x4f\x2b\x29\x07"</div><div class='add'>+			  "\x71\xbc\x08\x2b\x01\x00",</div><div class='add'>+	}, {</div><div class='add'>+		.inlen	= 191,</div><div class='add'>+		.outlen	= 122,</div><div class='add'>+		.input	= "This document describes a compression method based on the DEFLATE"</div><div class='add'>+			"compression algorithm.  This document defines the application of "</div><div class='add'>+			"the DEFLATE algorithm to the IP Payload Compression Protocol.",</div><div class='add'>+		.output	= "\x5d\x8d\x31\x0e\xc2\x30\x10\x04"</div><div class='add'>+			  "\xbf\xb2\x2f\xc8\x1f\x10\x04\x09"</div><div class='add'>+			  "\x89\xc2\x85\x3f\x70\xb1\x2f\xf8"</div><div class='add'>+			  "\x24\xdb\x67\xd9\x47\xc1\xef\x49"</div><div class='add'>+			  "\x68\x12\x51\xae\x76\x67\xd6\x27"</div><div class='add'>+			  "\x19\x88\x1a\xde\x85\xab\x21\xf2"</div><div class='add'>+			  "\x08\x5d\x16\x1e\x20\x04\x2d\xad"</div><div class='add'>+			  "\xf3\x18\xa2\x15\x85\x2d\x69\xc4"</div><div class='add'>+			  "\x42\x83\x23\xb6\x6c\x89\x71\x9b"</div><div class='add'>+			  "\xef\xcf\x8b\x9f\xcf\x33\xca\x2f"</div><div class='add'>+			  "\xed\x62\xa9\x4c\x80\xff\x13\xaf"</div><div class='add'>+			  "\x52\x37\xed\x0e\x52\x6b\x59\x02"</div><div class='add'>+			  "\xd9\x4e\xe8\x7a\x76\x1d\x02\x98"</div><div class='add'>+			  "\xfe\x8a\x87\x83\xa3\x4f\x56\x8a"</div><div class='add'>+			  "\xb8\x9e\x8e\x5c\x57\xd3\xa0\x79"</div><div class='add'>+			  "\xfa\x02",</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct comp_testvec deflate_decomp_tv_template[] = {</div><div class='add'>+	{</div><div class='add'>+		.inlen	= 122,</div><div class='add'>+		.outlen	= 191,</div><div class='add'>+		.input	= "\x5d\x8d\x31\x0e\xc2\x30\x10\x04"</div><div class='add'>+			  "\xbf\xb2\x2f\xc8\x1f\x10\x04\x09"</div><div class='add'>+			  "\x89\xc2\x85\x3f\x70\xb1\x2f\xf8"</div><div class='add'>+			  "\x24\xdb\x67\xd9\x47\xc1\xef\x49"</div><div class='add'>+			  "\x68\x12\x51\xae\x76\x67\xd6\x27"</div><div class='add'>+			  "\x19\x88\x1a\xde\x85\xab\x21\xf2"</div><div class='add'>+			  "\x08\x5d\x16\x1e\x20\x04\x2d\xad"</div><div class='add'>+			  "\xf3\x18\xa2\x15\x85\x2d\x69\xc4"</div><div class='add'>+			  "\x42\x83\x23\xb6\x6c\x89\x71\x9b"</div><div class='add'>+			  "\xef\xcf\x8b\x9f\xcf\x33\xca\x2f"</div><div class='add'>+			  "\xed\x62\xa9\x4c\x80\xff\x13\xaf"</div><div class='add'>+			  "\x52\x37\xed\x0e\x52\x6b\x59\x02"</div><div class='add'>+			  "\xd9\x4e\xe8\x7a\x76\x1d\x02\x98"</div><div class='add'>+			  "\xfe\x8a\x87\x83\xa3\x4f\x56\x8a"</div><div class='add'>+			  "\xb8\x9e\x8e\x5c\x57\xd3\xa0\x79"</div><div class='add'>+			  "\xfa\x02",</div><div class='add'>+		.output	= "This document describes a compression method based on the DEFLATE"</div><div class='add'>+			"compression algorithm.  This document defines the application of "</div><div class='add'>+			"the DEFLATE algorithm to the IP Payload Compression Protocol.",</div><div class='add'>+	}, {</div><div class='add'>+		.inlen	= 38,</div><div class='add'>+		.outlen	= 70,</div><div class='add'>+		.input	= "\xf3\xca\xcf\xcc\x53\x28\x2d\x56"</div><div class='add'>+			  "\xc8\xcb\x2f\x57\x48\xcc\x4b\x51"</div><div class='add'>+			  "\x28\xce\x48\x2c\x4a\x55\x28\xc9"</div><div class='add'>+			  "\x48\x55\x28\xce\x4f\x2b\x29\x07"</div><div class='add'>+			  "\x71\xbc\x08\x2b\x01\x00",</div><div class='add'>+		.output	= "Join us now and share the software "</div><div class='add'>+			"Join us now and share the software ",</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * LZO test vectors (null-terminated strings).</div><div class='add'>+ */</div><div class='add'>+#define LZO_COMP_TEST_VECTORS 2</div><div class='add'>+#define LZO_DECOMP_TEST_VECTORS 2</div><div class='add'>+</div><div class='add'>+static struct comp_testvec lzo_comp_tv_template[] = {</div><div class='add'>+	{</div><div class='add'>+		.inlen	= 70,</div><div class='add'>+		.outlen	= 46,</div><div class='add'>+		.input	= "Join us now and share the software "</div><div class='add'>+			"Join us now and share the software ",</div><div class='add'>+		.output	= "\x00\x0d\x4a\x6f\x69\x6e\x20\x75"</div><div class='add'>+			"\x73\x20\x6e\x6f\x77\x20\x61\x6e"</div><div class='add'>+			"\x64\x20\x73\x68\x61\x72\x65\x20"</div><div class='add'>+			"\x74\x68\x65\x20\x73\x6f\x66\x74"</div><div class='add'>+			"\x77\x70\x01\x01\x4a\x6f\x69\x6e"</div><div class='add'>+			"\x3d\x88\x00\x11\x00\x00",</div><div class='add'>+	}, {</div><div class='add'>+		.inlen	= 159,</div><div class='add'>+		.outlen	= 133,</div><div class='add'>+		.input	= "This document describes a compression method based on the LZO "</div><div class='add'>+			"compression algorithm.  This document defines the application of "</div><div class='add'>+			"the LZO algorithm used in UBIFS.",</div><div class='add'>+		.output	= "\x00\x2b\x54\x68\x69\x73\x20\x64"</div><div class='add'>+			  "\x6f\x63\x75\x6d\x65\x6e\x74\x20"</div><div class='add'>+			  "\x64\x65\x73\x63\x72\x69\x62\x65"</div><div class='add'>+			  "\x73\x20\x61\x20\x63\x6f\x6d\x70"</div><div class='add'>+			  "\x72\x65\x73\x73\x69\x6f\x6e\x20"</div><div class='add'>+			  "\x6d\x65\x74\x68\x6f\x64\x20\x62"</div><div class='add'>+			  "\x61\x73\x65\x64\x20\x6f\x6e\x20"</div><div class='add'>+			  "\x74\x68\x65\x20\x4c\x5a\x4f\x2b"</div><div class='add'>+			  "\x8c\x00\x0d\x61\x6c\x67\x6f\x72"</div><div class='add'>+			  "\x69\x74\x68\x6d\x2e\x20\x20\x54"</div><div class='add'>+			  "\x68\x69\x73\x2a\x54\x01\x02\x66"</div><div class='add'>+			  "\x69\x6e\x65\x73\x94\x06\x05\x61"</div><div class='add'>+			  "\x70\x70\x6c\x69\x63\x61\x74\x76"</div><div class='add'>+			  "\x0a\x6f\x66\x88\x02\x60\x09\x27"</div><div class='add'>+			  "\xf0\x00\x0c\x20\x75\x73\x65\x64"</div><div class='add'>+			  "\x20\x69\x6e\x20\x55\x42\x49\x46"</div><div class='add'>+			  "\x53\x2e\x11\x00\x00",</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct comp_testvec lzo_decomp_tv_template[] = {</div><div class='add'>+	{</div><div class='add'>+		.inlen	= 133,</div><div class='add'>+		.outlen	= 159,</div><div class='add'>+		.input	= "\x00\x2b\x54\x68\x69\x73\x20\x64"</div><div class='add'>+			  "\x6f\x63\x75\x6d\x65\x6e\x74\x20"</div><div class='add'>+			  "\x64\x65\x73\x63\x72\x69\x62\x65"</div><div class='add'>+			  "\x73\x20\x61\x20\x63\x6f\x6d\x70"</div><div class='add'>+			  "\x72\x65\x73\x73\x69\x6f\x6e\x20"</div><div class='add'>+			  "\x6d\x65\x74\x68\x6f\x64\x20\x62"</div><div class='add'>+			  "\x61\x73\x65\x64\x20\x6f\x6e\x20"</div><div class='add'>+			  "\x74\x68\x65\x20\x4c\x5a\x4f\x2b"</div><div class='add'>+			  "\x8c\x00\x0d\x61\x6c\x67\x6f\x72"</div><div class='add'>+			  "\x69\x74\x68\x6d\x2e\x20\x20\x54"</div><div class='add'>+			  "\x68\x69\x73\x2a\x54\x01\x02\x66"</div><div class='add'>+			  "\x69\x6e\x65\x73\x94\x06\x05\x61"</div><div class='add'>+			  "\x70\x70\x6c\x69\x63\x61\x74\x76"</div><div class='add'>+			  "\x0a\x6f\x66\x88\x02\x60\x09\x27"</div><div class='add'>+			  "\xf0\x00\x0c\x20\x75\x73\x65\x64"</div><div class='add'>+			  "\x20\x69\x6e\x20\x55\x42\x49\x46"</div><div class='add'>+			  "\x53\x2e\x11\x00\x00",</div><div class='add'>+		.output	= "This document describes a compression method based on the LZO "</div><div class='add'>+			"compression algorithm.  This document defines the application of "</div><div class='add'>+			"the LZO algorithm used in UBIFS.",</div><div class='add'>+	}, {</div><div class='add'>+		.inlen	= 46,</div><div class='add'>+		.outlen	= 70,</div><div class='add'>+		.input	= "\x00\x0d\x4a\x6f\x69\x6e\x20\x75"</div><div class='add'>+			  "\x73\x20\x6e\x6f\x77\x20\x61\x6e"</div><div class='add'>+			  "\x64\x20\x73\x68\x61\x72\x65\x20"</div><div class='add'>+			  "\x74\x68\x65\x20\x73\x6f\x66\x74"</div><div class='add'>+			  "\x77\x70\x01\x01\x4a\x6f\x69\x6e"</div><div class='add'>+			  "\x3d\x88\x00\x11\x00\x00",</div><div class='add'>+		.output	= "Join us now and share the software "</div><div class='add'>+			"Join us now and share the software ",</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Michael MIC test vectors from IEEE 802.11i</div><div class='add'>+ */</div><div class='add'>+#define MICHAEL_MIC_TEST_VECTORS 6</div><div class='add'>+</div><div class='add'>+static struct hash_testvec michael_mic_tv_template[] = {</div><div class='add'>+	{</div><div class='add'>+		.key = "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.ksize = 8,</div><div class='add'>+		.plaintext = zeroed_string,</div><div class='add'>+		.psize = 0,</div><div class='add'>+		.digest = "\x82\x92\x5c\x1c\xa1\xd1\x30\xb8",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.key = "\x82\x92\x5c\x1c\xa1\xd1\x30\xb8",</div><div class='add'>+		.ksize = 8,</div><div class='add'>+		.plaintext = "M",</div><div class='add'>+		.psize = 1,</div><div class='add'>+		.digest = "\x43\x47\x21\xca\x40\x63\x9b\x3f",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.key = "\x43\x47\x21\xca\x40\x63\x9b\x3f",</div><div class='add'>+		.ksize = 8,</div><div class='add'>+		.plaintext = "Mi",</div><div class='add'>+		.psize = 2,</div><div class='add'>+		.digest = "\xe8\xf9\xbe\xca\xe9\x7e\x5d\x29",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.key = "\xe8\xf9\xbe\xca\xe9\x7e\x5d\x29",</div><div class='add'>+		.ksize = 8,</div><div class='add'>+		.plaintext = "Mic",</div><div class='add'>+		.psize = 3,</div><div class='add'>+		.digest = "\x90\x03\x8f\xc6\xcf\x13\xc1\xdb",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.key = "\x90\x03\x8f\xc6\xcf\x13\xc1\xdb",</div><div class='add'>+		.ksize = 8,</div><div class='add'>+		.plaintext = "Mich",</div><div class='add'>+		.psize = 4,</div><div class='add'>+		.digest = "\xd5\x5e\x10\x05\x10\x12\x89\x86",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.key = "\xd5\x5e\x10\x05\x10\x12\x89\x86",</div><div class='add'>+		.ksize = 8,</div><div class='add'>+		.plaintext = "Michael",</div><div class='add'>+		.psize = 7,</div><div class='add'>+		.digest = "\x0a\x94\x2b\x12\x4e\xca\xa5\x46",</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * CRC32C test vectors</div><div class='add'>+ */</div><div class='add'>+#define CRC32C_TEST_VECTORS 14</div><div class='add'>+</div><div class='add'>+static struct hash_testvec crc32c_tv_template[] = {</div><div class='add'>+	{</div><div class='add'>+		.psize = 0,</div><div class='add'>+		.digest = "\x00\x00\x00\x00",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.key = "\x87\xa9\xcb\xed",</div><div class='add'>+		.ksize = 4,</div><div class='add'>+		.psize = 0,</div><div class='add'>+		.digest = "\x78\x56\x34\x12",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.key = "\xff\xff\xff\xff",</div><div class='add'>+		.ksize = 4,</div><div class='add'>+		.plaintext = "\x01\x02\x03\x04\x05\x06\x07\x08"</div><div class='add'>+			     "\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10"</div><div class='add'>+			     "\x11\x12\x13\x14\x15\x16\x17\x18"</div><div class='add'>+			     "\x19\x1a\x1b\x1c\x1d\x1e\x1f\x20"</div><div class='add'>+			     "\x21\x22\x23\x24\x25\x26\x27\x28",</div><div class='add'>+		.psize = 40,</div><div class='add'>+		.digest = "\x7f\x15\x2c\x0e",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.key = "\xff\xff\xff\xff",</div><div class='add'>+		.ksize = 4,</div><div class='add'>+		.plaintext = "\x29\x2a\x2b\x2c\x2d\x2e\x2f\x30"</div><div class='add'>+			     "\x31\x32\x33\x34\x35\x36\x37\x38"</div><div class='add'>+			     "\x39\x3a\x3b\x3c\x3d\x3e\x3f\x40"</div><div class='add'>+			     "\x41\x42\x43\x44\x45\x46\x47\x48"</div><div class='add'>+			     "\x49\x4a\x4b\x4c\x4d\x4e\x4f\x50",</div><div class='add'>+		.psize = 40,</div><div class='add'>+		.digest = "\xf6\xeb\x80\xe9",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.key = "\xff\xff\xff\xff",</div><div class='add'>+		.ksize = 4,</div><div class='add'>+		.plaintext = "\x51\x52\x53\x54\x55\x56\x57\x58"</div><div class='add'>+			     "\x59\x5a\x5b\x5c\x5d\x5e\x5f\x60"</div><div class='add'>+			     "\x61\x62\x63\x64\x65\x66\x67\x68"</div><div class='add'>+			     "\x69\x6a\x6b\x6c\x6d\x6e\x6f\x70"</div><div class='add'>+			     "\x71\x72\x73\x74\x75\x76\x77\x78",</div><div class='add'>+		.psize = 40,</div><div class='add'>+		.digest = "\xed\xbd\x74\xde",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.key = "\xff\xff\xff\xff",</div><div class='add'>+		.ksize = 4,</div><div class='add'>+		.plaintext = "\x79\x7a\x7b\x7c\x7d\x7e\x7f\x80"</div><div class='add'>+			     "\x81\x82\x83\x84\x85\x86\x87\x88"</div><div class='add'>+			     "\x89\x8a\x8b\x8c\x8d\x8e\x8f\x90"</div><div class='add'>+			     "\x91\x92\x93\x94\x95\x96\x97\x98"</div><div class='add'>+			     "\x99\x9a\x9b\x9c\x9d\x9e\x9f\xa0",</div><div class='add'>+		.psize = 40,</div><div class='add'>+		.digest = "\x62\xc8\x79\xd5",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.key = "\xff\xff\xff\xff",</div><div class='add'>+		.ksize = 4,</div><div class='add'>+		.plaintext = "\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8"</div><div class='add'>+			     "\xa9\xaa\xab\xac\xad\xae\xaf\xb0"</div><div class='add'>+			     "\xb1\xb2\xb3\xb4\xb5\xb6\xb7\xb8"</div><div class='add'>+			     "\xb9\xba\xbb\xbc\xbd\xbe\xbf\xc0"</div><div class='add'>+			     "\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8",</div><div class='add'>+		.psize = 40,</div><div class='add'>+		.digest = "\xd0\x9a\x97\xba",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.key = "\xff\xff\xff\xff",</div><div class='add'>+		.ksize = 4,</div><div class='add'>+		.plaintext = "\xc9\xca\xcb\xcc\xcd\xce\xcf\xd0"</div><div class='add'>+			     "\xd1\xd2\xd3\xd4\xd5\xd6\xd7\xd8"</div><div class='add'>+			     "\xd9\xda\xdb\xdc\xdd\xde\xdf\xe0"</div><div class='add'>+			     "\xe1\xe2\xe3\xe4\xe5\xe6\xe7\xe8"</div><div class='add'>+			     "\xe9\xea\xeb\xec\xed\xee\xef\xf0",</div><div class='add'>+		.psize = 40,</div><div class='add'>+		.digest = "\x13\xd9\x29\x2b",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.key = "\x80\xea\xd3\xf1",</div><div class='add'>+		.ksize = 4,</div><div class='add'>+		.plaintext = "\x29\x2a\x2b\x2c\x2d\x2e\x2f\x30"</div><div class='add'>+			     "\x31\x32\x33\x34\x35\x36\x37\x38"</div><div class='add'>+			     "\x39\x3a\x3b\x3c\x3d\x3e\x3f\x40"</div><div class='add'>+			     "\x41\x42\x43\x44\x45\x46\x47\x48"</div><div class='add'>+			     "\x49\x4a\x4b\x4c\x4d\x4e\x4f\x50",</div><div class='add'>+		.psize = 40,</div><div class='add'>+		.digest = "\x0c\xb5\xe2\xa2",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.key = "\xf3\x4a\x1d\x5d",</div><div class='add'>+		.ksize = 4,</div><div class='add'>+		.plaintext = "\x51\x52\x53\x54\x55\x56\x57\x58"</div><div class='add'>+			     "\x59\x5a\x5b\x5c\x5d\x5e\x5f\x60"</div><div class='add'>+			     "\x61\x62\x63\x64\x65\x66\x67\x68"</div><div class='add'>+			     "\x69\x6a\x6b\x6c\x6d\x6e\x6f\x70"</div><div class='add'>+			     "\x71\x72\x73\x74\x75\x76\x77\x78",</div><div class='add'>+		.psize = 40,</div><div class='add'>+		.digest = "\xd1\x7f\xfb\xa6",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.key = "\x2e\x80\x04\x59",</div><div class='add'>+		.ksize = 4,</div><div class='add'>+		.plaintext = "\x79\x7a\x7b\x7c\x7d\x7e\x7f\x80"</div><div class='add'>+			     "\x81\x82\x83\x84\x85\x86\x87\x88"</div><div class='add'>+			     "\x89\x8a\x8b\x8c\x8d\x8e\x8f\x90"</div><div class='add'>+			     "\x91\x92\x93\x94\x95\x96\x97\x98"</div><div class='add'>+			     "\x99\x9a\x9b\x9c\x9d\x9e\x9f\xa0",</div><div class='add'>+		.psize = 40,</div><div class='add'>+		.digest = "\x59\x33\xe6\x7a",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.key = "\xa6\xcc\x19\x85",</div><div class='add'>+		.ksize = 4,</div><div class='add'>+		.plaintext = "\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8"</div><div class='add'>+			     "\xa9\xaa\xab\xac\xad\xae\xaf\xb0"</div><div class='add'>+			     "\xb1\xb2\xb3\xb4\xb5\xb6\xb7\xb8"</div><div class='add'>+			     "\xb9\xba\xbb\xbc\xbd\xbe\xbf\xc0"</div><div class='add'>+			     "\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8",</div><div class='add'>+		.psize = 40,</div><div class='add'>+		.digest = "\xbe\x03\x01\xd2",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.key = "\x41\xfc\xfe\x2d",</div><div class='add'>+		.ksize = 4,</div><div class='add'>+		.plaintext = "\xc9\xca\xcb\xcc\xcd\xce\xcf\xd0"</div><div class='add'>+			     "\xd1\xd2\xd3\xd4\xd5\xd6\xd7\xd8"</div><div class='add'>+			     "\xd9\xda\xdb\xdc\xdd\xde\xdf\xe0"</div><div class='add'>+			     "\xe1\xe2\xe3\xe4\xe5\xe6\xe7\xe8"</div><div class='add'>+			     "\xe9\xea\xeb\xec\xed\xee\xef\xf0",</div><div class='add'>+		.psize = 40,</div><div class='add'>+		.digest = "\x75\xd3\xc5\x24",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.key = "\xff\xff\xff\xff",</div><div class='add'>+		.ksize = 4,</div><div class='add'>+		.plaintext = "\x01\x02\x03\x04\x05\x06\x07\x08"</div><div class='add'>+			     "\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10"</div><div class='add'>+			     "\x11\x12\x13\x14\x15\x16\x17\x18"</div><div class='add'>+			     "\x19\x1a\x1b\x1c\x1d\x1e\x1f\x20"</div><div class='add'>+			     "\x21\x22\x23\x24\x25\x26\x27\x28"</div><div class='add'>+			     "\x29\x2a\x2b\x2c\x2d\x2e\x2f\x30"</div><div class='add'>+			     "\x31\x32\x33\x34\x35\x36\x37\x38"</div><div class='add'>+			     "\x39\x3a\x3b\x3c\x3d\x3e\x3f\x40"</div><div class='add'>+			     "\x41\x42\x43\x44\x45\x46\x47\x48"</div><div class='add'>+			     "\x49\x4a\x4b\x4c\x4d\x4e\x4f\x50"</div><div class='add'>+			     "\x51\x52\x53\x54\x55\x56\x57\x58"</div><div class='add'>+			     "\x59\x5a\x5b\x5c\x5d\x5e\x5f\x60"</div><div class='add'>+			     "\x61\x62\x63\x64\x65\x66\x67\x68"</div><div class='add'>+			     "\x69\x6a\x6b\x6c\x6d\x6e\x6f\x70"</div><div class='add'>+			     "\x71\x72\x73\x74\x75\x76\x77\x78"</div><div class='add'>+			     "\x79\x7a\x7b\x7c\x7d\x7e\x7f\x80"</div><div class='add'>+			     "\x81\x82\x83\x84\x85\x86\x87\x88"</div><div class='add'>+			     "\x89\x8a\x8b\x8c\x8d\x8e\x8f\x90"</div><div class='add'>+			     "\x91\x92\x93\x94\x95\x96\x97\x98"</div><div class='add'>+			     "\x99\x9a\x9b\x9c\x9d\x9e\x9f\xa0"</div><div class='add'>+			     "\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8"</div><div class='add'>+			     "\xa9\xaa\xab\xac\xad\xae\xaf\xb0"</div><div class='add'>+			     "\xb1\xb2\xb3\xb4\xb5\xb6\xb7\xb8"</div><div class='add'>+			     "\xb9\xba\xbb\xbc\xbd\xbe\xbf\xc0"</div><div class='add'>+			     "\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8"</div><div class='add'>+			     "\xc9\xca\xcb\xcc\xcd\xce\xcf\xd0"</div><div class='add'>+			     "\xd1\xd2\xd3\xd4\xd5\xd6\xd7\xd8"</div><div class='add'>+			     "\xd9\xda\xdb\xdc\xdd\xde\xdf\xe0"</div><div class='add'>+			     "\xe1\xe2\xe3\xe4\xe5\xe6\xe7\xe8"</div><div class='add'>+			     "\xe9\xea\xeb\xec\xed\xee\xef\xf0",</div><div class='add'>+		.psize = 240,</div><div class='add'>+		.digest = "\x75\xd3\xc5\x24",</div><div class='add'>+		.np = 2,</div><div class='add'>+		.tap = { 31, 209 }</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif	/* _CRYPTO_TESTMGR_H */</div><div class='head'>diff --git a/drivers/Kconfig b/drivers/Kconfig<br/>index 9b399a1bae8b..d38f43f593d4 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/Kconfig</a></div><div class='hunk'>@@ -103,4 +103,6 @@ source "drivers/auxdisplay/Kconfig"</div><div class='ctx'> source "drivers/uio/Kconfig"</div><div class='ctx'> </div><div class='ctx'> source "drivers/xen/Kconfig"</div><div class='add'>+</div><div class='add'>+source "drivers/staging/Kconfig"</div><div class='ctx'> endmenu</div><div class='head'>diff --git a/drivers/Makefile b/drivers/Makefile<br/>index 1a6930f9726a..cadc64fe8f68 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/Makefile</a></div><div class='hunk'>@@ -99,4 +99,5 @@ obj-$(CONFIG_OF)		+= of/</div><div class='ctx'> obj-$(CONFIG_SSB)		+= ssb/</div><div class='ctx'> obj-$(CONFIG_VIRTIO)		+= virtio/</div><div class='ctx'> obj-$(CONFIG_REGULATOR)		+= regulator/</div><div class='add'>+obj-$(CONFIG_STAGING)		+= staging/</div><div class='ctx'> obj-$(CONFIG_UWB)		+= uwb/</div><div class='head'>diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig<br/>index 735f5ea17473..da49b006bcc5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/acpi/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/acpi/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/acpi/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/acpi/Kconfig</a></div><div class='hunk'>@@ -259,7 +259,10 @@ config ACPI_ASUS</div><div class='ctx'> </div><div class='ctx'> config ACPI_TOSHIBA</div><div class='ctx'> 	tristate "Toshiba Laptop Extras"</div><div class='del'>-	depends on X86</div><div class='add'>+	depends on X86 &amp;&amp; INPUT</div><div class='add'>+	select INPUT_POLLDEV</div><div class='add'>+	select NET</div><div class='add'>+	select RFKILL</div><div class='ctx'> 	select BACKLIGHT_CLASS_DEVICE</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  This driver adds support for access to certain system settings</div><div class='head'>diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c<br/>index 8dd3336efd7e..24649ada08df 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/acpi/glue.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/acpi/glue.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/acpi/glue.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/acpi/glue.c</a></div><div class='hunk'>@@ -260,116 +260,3 @@ static int __init init_acpi_device_notify(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> arch_initcall(init_acpi_device_notify);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_RTC_DRV_CMOS) || defined(CONFIG_RTC_DRV_CMOS_MODULE)</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-static u32 rtc_handler(void *context)</div><div class='del'>-{</div><div class='del'>-	acpi_clear_event(ACPI_EVENT_RTC);</div><div class='del'>-	acpi_disable_event(ACPI_EVENT_RTC, 0);</div><div class='del'>-	return ACPI_INTERRUPT_HANDLED;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void rtc_wake_setup(void)</div><div class='del'>-{</div><div class='del'>-	acpi_install_fixed_event_handler(ACPI_EVENT_RTC, rtc_handler, NULL);</div><div class='del'>-	/*</div><div class='del'>-	 * After the RTC handler is installed, the Fixed_RTC event should</div><div class='del'>-	 * be disabled. Only when the RTC alarm is set will it be enabled.</div><div class='del'>-	 */</div><div class='del'>-	acpi_clear_event(ACPI_EVENT_RTC);</div><div class='del'>-	acpi_disable_event(ACPI_EVENT_RTC, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void rtc_wake_on(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	acpi_clear_event(ACPI_EVENT_RTC);</div><div class='del'>-	acpi_enable_event(ACPI_EVENT_RTC, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void rtc_wake_off(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	acpi_disable_event(ACPI_EVENT_RTC, 0);</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-#define rtc_wake_setup()	do{}while(0)</div><div class='del'>-#define rtc_wake_on		NULL</div><div class='del'>-#define rtc_wake_off		NULL</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* Every ACPI platform has a mc146818 compatible "cmos rtc".  Here we find</div><div class='del'>- * its device node and pass extra config data.  This helps its driver use</div><div class='del'>- * capabilities that the now-obsolete mc146818 didn't have, and informs it</div><div class='del'>- * that this board's RTC is wakeup-capable (per ACPI spec).</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/mc146818rtc.h&gt;</div><div class='del'>-</div><div class='del'>-static struct cmos_rtc_board_info rtc_info;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* PNP devices are registered in a subsys_initcall();</div><div class='del'>- * ACPI specifies the PNP IDs to use.</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/pnp.h&gt;</div><div class='del'>-</div><div class='del'>-static int __init pnp_match(struct device *dev, void *data)</div><div class='del'>-{</div><div class='del'>-	static const char *ids[] = { "PNP0b00", "PNP0b01", "PNP0b02", };</div><div class='del'>-	struct pnp_dev *pnp = to_pnp_dev(dev);</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(ids); i++) {</div><div class='del'>-		if (compare_pnp_id(pnp-&gt;id, ids[i]) != 0)</div><div class='del'>-			return 1;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct device *__init get_rtc_dev(void)</div><div class='del'>-{</div><div class='del'>-	return bus_find_device(&amp;pnp_bus_type, NULL, NULL, pnp_match);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init acpi_rtc_init(void)</div><div class='del'>-{</div><div class='del'>-	struct device *dev = get_rtc_dev();</div><div class='del'>-</div><div class='del'>-	if (acpi_disabled)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (dev) {</div><div class='del'>-		rtc_wake_setup();</div><div class='del'>-		rtc_info.wake_on = rtc_wake_on;</div><div class='del'>-		rtc_info.wake_off = rtc_wake_off;</div><div class='del'>-</div><div class='del'>-		/* workaround bug in some ACPI tables */</div><div class='del'>-		if (acpi_gbl_FADT.month_alarm &amp;&amp; !acpi_gbl_FADT.day_alarm) {</div><div class='del'>-			DBG("bogus FADT month_alarm\n");</div><div class='del'>-			acpi_gbl_FADT.month_alarm = 0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		rtc_info.rtc_day_alarm = acpi_gbl_FADT.day_alarm;</div><div class='del'>-		rtc_info.rtc_mon_alarm = acpi_gbl_FADT.month_alarm;</div><div class='del'>-		rtc_info.rtc_century = acpi_gbl_FADT.century;</div><div class='del'>-</div><div class='del'>-		/* NOTE:  S4_RTC_WAKE is NOT currently useful to Linux */</div><div class='del'>-		if (acpi_gbl_FADT.flags &amp; ACPI_FADT_S4_RTC_WAKE)</div><div class='del'>-			printk(PREFIX "RTC can wake from S4\n");</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-		dev-&gt;platform_data = &amp;rtc_info;</div><div class='del'>-</div><div class='del'>-		/* RTC always wakes from S1/S2/S3, and often S4/STD */</div><div class='del'>-		device_init_wakeup(dev, 1);</div><div class='del'>-</div><div class='del'>-		put_device(dev);</div><div class='del'>-	} else</div><div class='del'>-		DBG("RTC unavailable?\n");</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-/* do this between RTC subsys_initcall() and rtc_cmos driver_initcall() */</div><div class='del'>-fs_initcall(acpi_rtc_init);</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/drivers/acpi/toshiba_acpi.c b/drivers/acpi/toshiba_acpi.c<br/>index 0a43c8e0eff3..8a649f40d162 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/acpi/toshiba_acpi.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/acpi/toshiba_acpi.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/acpi/toshiba_acpi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/acpi/toshiba_acpi.c</a></div><div class='hunk'>@@ -3,6 +3,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2002-2004 John Belmonte</div><div class='add'>+ *  Copyright (C) 2008 Philip Langdale</div><div class='ctx'>  *</div><div class='ctx'>  *  This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  *  it under the terms of the GNU General Public License as published by</div><div class='hunk'>@@ -33,7 +34,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define TOSHIBA_ACPI_VERSION	"0.18"</div><div class='add'>+#define TOSHIBA_ACPI_VERSION	"0.19"</div><div class='ctx'> #define PROC_INTERFACE_VERSION	1</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -42,6 +43,9 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='ctx'> #include &lt;linux/backlight.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/rfkill.h&gt;</div><div class='add'>+#include &lt;linux/input-polldev.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -90,6 +94,7 @@ MODULE_LICENSE("GPL");</div><div class='ctx'> #define HCI_VIDEO_OUT			0x001c</div><div class='ctx'> #define HCI_HOTKEY_EVENT		0x001e</div><div class='ctx'> #define HCI_LCD_BRIGHTNESS		0x002a</div><div class='add'>+#define HCI_WIRELESS			0x0056</div><div class='ctx'> </div><div class='ctx'> /* field definitions */</div><div class='ctx'> #define HCI_LCD_BRIGHTNESS_BITS		3</div><div class='hunk'>@@ -98,9 +103,14 @@ MODULE_LICENSE("GPL");</div><div class='ctx'> #define HCI_VIDEO_OUT_LCD		0x1</div><div class='ctx'> #define HCI_VIDEO_OUT_CRT		0x2</div><div class='ctx'> #define HCI_VIDEO_OUT_TV		0x4</div><div class='add'>+#define HCI_WIRELESS_KILL_SWITCH	0x01</div><div class='add'>+#define HCI_WIRELESS_BT_PRESENT		0x0f</div><div class='add'>+#define HCI_WIRELESS_BT_ATTACH		0x40</div><div class='add'>+#define HCI_WIRELESS_BT_POWER		0x80</div><div class='ctx'> </div><div class='ctx'> static const struct acpi_device_id toshiba_device_ids[] = {</div><div class='ctx'> 	{"TOS6200", 0},</div><div class='add'>+	{"TOS6208", 0},</div><div class='ctx'> 	{"TOS1900", 0},</div><div class='ctx'> 	{"", 0},</div><div class='ctx'> };</div><div class='hunk'>@@ -193,7 +203,7 @@ static acpi_status hci_raw(const u32 in[HCI_WORDS], u32 out[HCI_WORDS])</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* common hci tasks (get or set one value)</div><div class='add'>+/* common hci tasks (get or set one or two value)</div><div class='ctx'>  *</div><div class='ctx'>  * In addition to the ACPI status, the HCI system returns a result which</div><div class='ctx'>  * may be useful (such as "not supported").</div><div class='hunk'>@@ -218,6 +228,152 @@ static acpi_status hci_read1(u32 reg, u32 * out1, u32 * result)</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static acpi_status hci_write2(u32 reg, u32 in1, u32 in2, u32 *result)</div><div class='add'>+{</div><div class='add'>+	u32 in[HCI_WORDS] = { HCI_SET, reg, in1, in2, 0, 0 };</div><div class='add'>+	u32 out[HCI_WORDS];</div><div class='add'>+	acpi_status status = hci_raw(in, out);</div><div class='add'>+	*result = (status == AE_OK) ? out[0] : HCI_FAILURE;</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static acpi_status hci_read2(u32 reg, u32 *out1, u32 *out2, u32 *result)</div><div class='add'>+{</div><div class='add'>+	u32 in[HCI_WORDS] = { HCI_GET, reg, *out1, *out2, 0, 0 };</div><div class='add'>+	u32 out[HCI_WORDS];</div><div class='add'>+	acpi_status status = hci_raw(in, out);</div><div class='add'>+	*out1 = out[2];</div><div class='add'>+	*out2 = out[3];</div><div class='add'>+	*result = (status == AE_OK) ? out[0] : HCI_FAILURE;</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct toshiba_acpi_dev {</div><div class='add'>+	struct platform_device *p_dev;</div><div class='add'>+	struct rfkill *rfk_dev;</div><div class='add'>+	struct input_polled_dev *poll_dev;</div><div class='add'>+</div><div class='add'>+	const char *bt_name;</div><div class='add'>+	const char *rfk_name;</div><div class='add'>+</div><div class='add'>+	bool last_rfk_state;</div><div class='add'>+</div><div class='add'>+	struct mutex mutex;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct toshiba_acpi_dev toshiba_acpi = {</div><div class='add'>+	.bt_name = "Toshiba Bluetooth",</div><div class='add'>+	.rfk_name = "Toshiba RFKill Switch",</div><div class='add'>+	.last_rfk_state = false,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Bluetooth rfkill handlers */</div><div class='add'>+</div><div class='add'>+static u32 hci_get_bt_present(bool *present)</div><div class='add'>+{</div><div class='add'>+	u32 hci_result;</div><div class='add'>+	u32 value, value2;</div><div class='add'>+</div><div class='add'>+	value = 0;</div><div class='add'>+	value2 = 0;</div><div class='add'>+	hci_read2(HCI_WIRELESS, &amp;value, &amp;value2, &amp;hci_result);</div><div class='add'>+	if (hci_result == HCI_SUCCESS)</div><div class='add'>+		*present = (value &amp; HCI_WIRELESS_BT_PRESENT) ? true : false;</div><div class='add'>+</div><div class='add'>+	return hci_result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 hci_get_bt_on(bool *on)</div><div class='add'>+{</div><div class='add'>+	u32 hci_result;</div><div class='add'>+	u32 value, value2;</div><div class='add'>+</div><div class='add'>+	value = 0;</div><div class='add'>+	value2 = 0x0001;</div><div class='add'>+	hci_read2(HCI_WIRELESS, &amp;value, &amp;value2, &amp;hci_result);</div><div class='add'>+	if (hci_result == HCI_SUCCESS)</div><div class='add'>+		*on = (value &amp; HCI_WIRELESS_BT_POWER) &amp;&amp;</div><div class='add'>+		      (value &amp; HCI_WIRELESS_BT_ATTACH);</div><div class='add'>+</div><div class='add'>+	return hci_result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 hci_get_radio_state(bool *radio_state)</div><div class='add'>+{</div><div class='add'>+	u32 hci_result;</div><div class='add'>+	u32 value, value2;</div><div class='add'>+</div><div class='add'>+	value = 0;</div><div class='add'>+	value2 = 0x0001;</div><div class='add'>+	hci_read2(HCI_WIRELESS, &amp;value, &amp;value2, &amp;hci_result);</div><div class='add'>+</div><div class='add'>+	*radio_state = value &amp; HCI_WIRELESS_KILL_SWITCH;</div><div class='add'>+	return hci_result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bt_rfkill_toggle_radio(void *data, enum rfkill_state state)</div><div class='add'>+{</div><div class='add'>+	u32 result1, result2;</div><div class='add'>+	u32 value;</div><div class='add'>+	bool radio_state;</div><div class='add'>+	struct toshiba_acpi_dev *dev = data;</div><div class='add'>+</div><div class='add'>+	value = (state == RFKILL_STATE_UNBLOCKED);</div><div class='add'>+</div><div class='add'>+	if (hci_get_radio_state(&amp;radio_state) != HCI_SUCCESS)</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	switch (state) {</div><div class='add'>+	case RFKILL_STATE_UNBLOCKED:</div><div class='add'>+		if (!radio_state)</div><div class='add'>+			return -EPERM;</div><div class='add'>+		break;</div><div class='add'>+	case RFKILL_STATE_SOFT_BLOCKED:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;mutex);</div><div class='add'>+	hci_write2(HCI_WIRELESS, value, HCI_WIRELESS_BT_POWER, &amp;result1);</div><div class='add'>+	hci_write2(HCI_WIRELESS, value, HCI_WIRELESS_BT_ATTACH, &amp;result2);</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (result1 != HCI_SUCCESS || result2 != HCI_SUCCESS)</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bt_poll_rfkill(struct input_polled_dev *poll_dev)</div><div class='add'>+{</div><div class='add'>+	bool state_changed;</div><div class='add'>+	bool new_rfk_state;</div><div class='add'>+	bool value;</div><div class='add'>+	u32 hci_result;</div><div class='add'>+	struct toshiba_acpi_dev *dev = poll_dev-&gt;private;</div><div class='add'>+</div><div class='add'>+	hci_result = hci_get_radio_state(&amp;value);</div><div class='add'>+	if (hci_result != HCI_SUCCESS)</div><div class='add'>+		return; /* Can't do anything useful */</div><div class='add'>+</div><div class='add'>+	new_rfk_state = value;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;mutex);</div><div class='add'>+	state_changed = new_rfk_state != dev-&gt;last_rfk_state;</div><div class='add'>+	dev-&gt;last_rfk_state = new_rfk_state;</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (unlikely(state_changed)) {</div><div class='add'>+		rfkill_force_state(dev-&gt;rfk_dev,</div><div class='add'>+				   new_rfk_state ?</div><div class='add'>+				   RFKILL_STATE_SOFT_BLOCKED :</div><div class='add'>+				   RFKILL_STATE_HARD_BLOCKED);</div><div class='add'>+		input_report_switch(poll_dev-&gt;input, SW_RFKILL_ALL,</div><div class='add'>+				    new_rfk_state);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct proc_dir_entry *toshiba_proc_dir /*= 0*/ ;</div><div class='ctx'> static struct backlight_device *toshiba_backlight_device;</div><div class='ctx'> static int force_fan;</div><div class='hunk'>@@ -547,6 +703,14 @@ static struct backlight_ops toshiba_backlight_data = {</div><div class='ctx'> </div><div class='ctx'> static void toshiba_acpi_exit(void)</div><div class='ctx'> {</div><div class='add'>+	if (toshiba_acpi.poll_dev) {</div><div class='add'>+		input_unregister_polled_device(toshiba_acpi.poll_dev);</div><div class='add'>+		input_free_polled_device(toshiba_acpi.poll_dev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (toshiba_acpi.rfk_dev)</div><div class='add'>+		rfkill_unregister(toshiba_acpi.rfk_dev);</div><div class='add'>+</div><div class='ctx'> 	if (toshiba_backlight_device)</div><div class='ctx'> 		backlight_device_unregister(toshiba_backlight_device);</div><div class='ctx'> </div><div class='hunk'>@@ -555,6 +719,8 @@ static void toshiba_acpi_exit(void)</div><div class='ctx'> 	if (toshiba_proc_dir)</div><div class='ctx'> 		remove_proc_entry(PROC_TOSHIBA, acpi_root_dir);</div><div class='ctx'> </div><div class='add'>+	platform_device_unregister(toshiba_acpi.p_dev);</div><div class='add'>+</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -562,6 +728,10 @@ static int __init toshiba_acpi_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> 	u32 hci_result;</div><div class='add'>+	bool bt_present;</div><div class='add'>+	bool bt_on;</div><div class='add'>+	bool radio_on;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (acpi_disabled)</div><div class='ctx'> 		return -ENODEV;</div><div class='hunk'>@@ -578,6 +748,18 @@ static int __init toshiba_acpi_init(void)</div><div class='ctx'> 	       TOSHIBA_ACPI_VERSION);</div><div class='ctx'> 	printk(MY_INFO "    HCI method: %s\n", method_hci);</div><div class='ctx'> </div><div class='add'>+	mutex_init(&amp;toshiba_acpi.mutex);</div><div class='add'>+</div><div class='add'>+	toshiba_acpi.p_dev = platform_device_register_simple("toshiba_acpi",</div><div class='add'>+							      -1, NULL, 0);</div><div class='add'>+	if (IS_ERR(toshiba_acpi.p_dev)) {</div><div class='add'>+		ret = PTR_ERR(toshiba_acpi.p_dev);</div><div class='add'>+		printk(MY_ERR "unable to register platform device\n");</div><div class='add'>+		toshiba_acpi.p_dev = NULL;</div><div class='add'>+		toshiba_acpi_exit();</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	force_fan = 0;</div><div class='ctx'> 	key_event_valid = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -586,19 +768,23 @@ static int __init toshiba_acpi_init(void)</div><div class='ctx'> </div><div class='ctx'> 	toshiba_proc_dir = proc_mkdir(PROC_TOSHIBA, acpi_root_dir);</div><div class='ctx'> 	if (!toshiba_proc_dir) {</div><div class='del'>-		status = AE_ERROR;</div><div class='add'>+		toshiba_acpi_exit();</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		toshiba_proc_dir-&gt;owner = THIS_MODULE;</div><div class='ctx'> 		status = add_device();</div><div class='del'>-		if (ACPI_FAILURE(status))</div><div class='del'>-			remove_proc_entry(PROC_TOSHIBA, acpi_root_dir);</div><div class='add'>+		if (ACPI_FAILURE(status)) {</div><div class='add'>+			toshiba_acpi_exit();</div><div class='add'>+			return -ENODEV;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	toshiba_backlight_device = backlight_device_register("toshiba",NULL,</div><div class='add'>+	toshiba_backlight_device = backlight_device_register("toshiba",</div><div class='add'>+						&amp;toshiba_acpi.p_dev-&gt;dev,</div><div class='ctx'> 						NULL,</div><div class='ctx'> 						&amp;toshiba_backlight_data);</div><div class='ctx'>         if (IS_ERR(toshiba_backlight_device)) {</div><div class='del'>-		int ret = PTR_ERR(toshiba_backlight_device);</div><div class='add'>+		ret = PTR_ERR(toshiba_backlight_device);</div><div class='ctx'> </div><div class='ctx'> 		printk(KERN_ERR "Could not register toshiba backlight device\n");</div><div class='ctx'> 		toshiba_backlight_device = NULL;</div><div class='hunk'>@@ -607,7 +793,66 @@ static int __init toshiba_acpi_init(void)</div><div class='ctx'> 	}</div><div class='ctx'>         toshiba_backlight_device-&gt;props.max_brightness = HCI_LCD_BRIGHTNESS_LEVELS - 1;</div><div class='ctx'> </div><div class='del'>-	return (ACPI_SUCCESS(status)) ? 0 : -ENODEV;</div><div class='add'>+	/* Register rfkill switch for Bluetooth */</div><div class='add'>+	if (hci_get_bt_present(&amp;bt_present) == HCI_SUCCESS &amp;&amp; bt_present) {</div><div class='add'>+		toshiba_acpi.rfk_dev = rfkill_allocate(&amp;toshiba_acpi.p_dev-&gt;dev,</div><div class='add'>+							RFKILL_TYPE_BLUETOOTH);</div><div class='add'>+		if (!toshiba_acpi.rfk_dev) {</div><div class='add'>+			printk(MY_ERR "unable to allocate rfkill device\n");</div><div class='add'>+			toshiba_acpi_exit();</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		toshiba_acpi.rfk_dev-&gt;name = toshiba_acpi.bt_name;</div><div class='add'>+		toshiba_acpi.rfk_dev-&gt;toggle_radio = bt_rfkill_toggle_radio;</div><div class='add'>+		toshiba_acpi.rfk_dev-&gt;user_claim_unsupported = 1;</div><div class='add'>+		toshiba_acpi.rfk_dev-&gt;data = &amp;toshiba_acpi;</div><div class='add'>+</div><div class='add'>+		if (hci_get_bt_on(&amp;bt_on) == HCI_SUCCESS &amp;&amp; bt_on) {</div><div class='add'>+			toshiba_acpi.rfk_dev-&gt;state = RFKILL_STATE_UNBLOCKED;</div><div class='add'>+		} else if (hci_get_radio_state(&amp;radio_on) == HCI_SUCCESS &amp;&amp;</div><div class='add'>+			   radio_on) {</div><div class='add'>+			toshiba_acpi.rfk_dev-&gt;state = RFKILL_STATE_SOFT_BLOCKED;</div><div class='add'>+		} else {</div><div class='add'>+			toshiba_acpi.rfk_dev-&gt;state = RFKILL_STATE_HARD_BLOCKED;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = rfkill_register(toshiba_acpi.rfk_dev);</div><div class='add'>+		if (ret) {</div><div class='add'>+			printk(MY_ERR "unable to register rfkill device\n");</div><div class='add'>+			toshiba_acpi_exit();</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Register input device for kill switch */</div><div class='add'>+	toshiba_acpi.poll_dev = input_allocate_polled_device();</div><div class='add'>+	if (!toshiba_acpi.poll_dev) {</div><div class='add'>+		printk(MY_ERR "unable to allocate kill-switch input device\n");</div><div class='add'>+		toshiba_acpi_exit();</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	toshiba_acpi.poll_dev-&gt;private = &amp;toshiba_acpi;</div><div class='add'>+	toshiba_acpi.poll_dev-&gt;poll = bt_poll_rfkill;</div><div class='add'>+	toshiba_acpi.poll_dev-&gt;poll_interval = 1000; /* msecs */</div><div class='add'>+</div><div class='add'>+	toshiba_acpi.poll_dev-&gt;input-&gt;name = toshiba_acpi.rfk_name;</div><div class='add'>+	toshiba_acpi.poll_dev-&gt;input-&gt;id.bustype = BUS_HOST;</div><div class='add'>+	toshiba_acpi.poll_dev-&gt;input-&gt;id.vendor = 0x0930; /* Toshiba USB ID */</div><div class='add'>+	set_bit(EV_SW, toshiba_acpi.poll_dev-&gt;input-&gt;evbit);</div><div class='add'>+	set_bit(SW_RFKILL_ALL, toshiba_acpi.poll_dev-&gt;input-&gt;swbit);</div><div class='add'>+	input_report_switch(toshiba_acpi.poll_dev-&gt;input, SW_RFKILL_ALL, TRUE);</div><div class='add'>+</div><div class='add'>+	ret = input_register_polled_device(toshiba_acpi.poll_dev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		printk(MY_ERR "unable to register kill-switch input device\n");</div><div class='add'>+		rfkill_free(toshiba_acpi.rfk_dev);</div><div class='add'>+		toshiba_acpi.rfk_dev = NULL;</div><div class='add'>+		toshiba_acpi_exit();</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(toshiba_acpi_init);</div><div class='head'>diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig<br/>index 11c8c19f0fb7..78fbec8ceda0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ata/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ata/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ata/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ata/Kconfig</a></div><div class='hunk'>@@ -7,7 +7,6 @@ menuconfig ATA</div><div class='ctx'> 	depends on HAS_IOMEM</div><div class='ctx'> 	depends on BLOCK</div><div class='ctx'> 	depends on !(M32R || M68K) || BROKEN</div><div class='del'>-	depends on !SUN4 || BROKEN</div><div class='ctx'> 	select SCSI</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  If you want to use a ATA hard disk, ATA tape drive, ATA CD-ROM or</div><div class='hunk'>@@ -663,7 +662,7 @@ config HAVE_PATA_PLATFORM</div><div class='ctx'> </div><div class='ctx'> config PATA_PLATFORM</div><div class='ctx'> 	tristate "Generic platform device PATA support"</div><div class='del'>-	depends on EMBEDDED || ARCH_RPC || PPC || HAVE_PATA_PLATFORM</div><div class='add'>+	depends on EMBEDDED || PPC || HAVE_PATA_PLATFORM</div><div class='ctx'> 	help</div><div class='ctx'> 	  This option enables support for generic directly connected ATA</div><div class='ctx'> 	  devices commonly found on embedded systems.</div><div class='head'>diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c<br/>index 2e1a7cb2ed5f..aeadd00411a1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ata/ahci.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ata/ahci.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ata/ahci.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ata/ahci.c</a></div><div class='hunk'>@@ -267,8 +267,8 @@ struct ahci_port_priv {</div><div class='ctx'> 					 	 * per PM slot */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int ahci_scr_read(struct ata_port *ap, unsigned int sc_reg, u32 *val);</div><div class='del'>-static int ahci_scr_write(struct ata_port *ap, unsigned int sc_reg, u32 val);</div><div class='add'>+static int ahci_scr_read(struct ata_link *link, unsigned int sc_reg, u32 *val);</div><div class='add'>+static int ahci_scr_write(struct ata_link *link, unsigned int sc_reg, u32 val);</div><div class='ctx'> static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent);</div><div class='ctx'> static unsigned int ahci_qc_issue(struct ata_queued_cmd *qc);</div><div class='ctx'> static bool ahci_qc_fill_rtf(struct ata_queued_cmd *qc);</div><div class='hunk'>@@ -316,6 +316,7 @@ static struct device_attribute *ahci_shost_attrs[] = {</div><div class='ctx'> </div><div class='ctx'> static struct device_attribute *ahci_sdev_attrs[] = {</div><div class='ctx'> 	&amp;dev_attr_sw_activity,</div><div class='add'>+	&amp;dev_attr_unload_heads,</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -820,10 +821,10 @@ static unsigned ahci_scr_offset(struct ata_port *ap, unsigned int sc_reg)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ahci_scr_read(struct ata_port *ap, unsigned int sc_reg, u32 *val)</div><div class='add'>+static int ahci_scr_read(struct ata_link *link, unsigned int sc_reg, u32 *val)</div><div class='ctx'> {</div><div class='del'>-	void __iomem *port_mmio = ahci_port_base(ap);</div><div class='del'>-	int offset = ahci_scr_offset(ap, sc_reg);</div><div class='add'>+	void __iomem *port_mmio = ahci_port_base(link-&gt;ap);</div><div class='add'>+	int offset = ahci_scr_offset(link-&gt;ap, sc_reg);</div><div class='ctx'> </div><div class='ctx'> 	if (offset) {</div><div class='ctx'> 		*val = readl(port_mmio + offset);</div><div class='hunk'>@@ -832,10 +833,10 @@ static int ahci_scr_read(struct ata_port *ap, unsigned int sc_reg, u32 *val)</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ahci_scr_write(struct ata_port *ap, unsigned int sc_reg, u32 val)</div><div class='add'>+static int ahci_scr_write(struct ata_link *link, unsigned int sc_reg, u32 val)</div><div class='ctx'> {</div><div class='del'>-	void __iomem *port_mmio = ahci_port_base(ap);</div><div class='del'>-	int offset = ahci_scr_offset(ap, sc_reg);</div><div class='add'>+	void __iomem *port_mmio = ahci_port_base(link-&gt;ap);</div><div class='add'>+	int offset = ahci_scr_offset(link-&gt;ap, sc_reg);</div><div class='ctx'> </div><div class='ctx'> 	if (offset) {</div><div class='ctx'> 		writel(val, port_mmio + offset);</div><div class='hunk'>@@ -973,7 +974,7 @@ static void ahci_disable_alpm(struct ata_port *ap)</div><div class='ctx'> 	writel(PORT_IRQ_PHYRDY, port_mmio + PORT_IRQ_STAT);</div><div class='ctx'> </div><div class='ctx'> 	/* go ahead and clean out PhyRdy Change from Serror too */</div><div class='del'>-	ahci_scr_write(ap, SCR_ERROR, ((1 &lt;&lt; 16) | (1 &lt;&lt; 18)));</div><div class='add'>+	ahci_scr_write(&amp;ap-&gt;link, SCR_ERROR, ((1 &lt;&lt; 16) | (1 &lt;&lt; 18)));</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'>  	 * Clear flag to indicate that we should ignore all PhyRdy</div><div class='hunk'>@@ -1937,8 +1938,8 @@ static void ahci_error_intr(struct ata_port *ap, u32 irq_stat)</div><div class='ctx'> 	ata_ehi_push_desc(host_ehi, "irq_stat 0x%08x", irq_stat);</div><div class='ctx'> </div><div class='ctx'> 	/* AHCI needs SError cleared; otherwise, it might lock up */</div><div class='del'>-	ahci_scr_read(ap, SCR_ERROR, &amp;serror);</div><div class='del'>-	ahci_scr_write(ap, SCR_ERROR, serror);</div><div class='add'>+	ahci_scr_read(&amp;ap-&gt;link, SCR_ERROR, &amp;serror);</div><div class='add'>+	ahci_scr_write(&amp;ap-&gt;link, SCR_ERROR, serror);</div><div class='ctx'> 	host_ehi-&gt;serror |= serror;</div><div class='ctx'> </div><div class='ctx'> 	/* some controllers set IRQ_IF_ERR on device errors, ignore it */</div><div class='hunk'>@@ -2027,7 +2028,7 @@ static void ahci_port_intr(struct ata_port *ap)</div><div class='ctx'> 	if ((hpriv-&gt;flags &amp; AHCI_HFLAG_NO_HOTPLUG) &amp;&amp;</div><div class='ctx'> 		(status &amp; PORT_IRQ_PHYRDY)) {</div><div class='ctx'> 		status &amp;= ~PORT_IRQ_PHYRDY;</div><div class='del'>-		ahci_scr_write(ap, SCR_ERROR, ((1 &lt;&lt; 16) | (1 &lt;&lt; 18)));</div><div class='add'>+		ahci_scr_write(&amp;ap-&gt;link, SCR_ERROR, ((1 &lt;&lt; 16) | (1 &lt;&lt; 18)));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(status &amp; PORT_IRQ_ERROR)) {</div><div class='head'>diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c<br/>index e6b4606e36b6..e9e32ed6b1a3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ata/ata_piix.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ata/ata_piix.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ata/ata_piix.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ata/ata_piix.c</a></div><div class='hunk'>@@ -165,8 +165,10 @@ static void piix_set_dmamode(struct ata_port *ap, struct ata_device *adev);</div><div class='ctx'> static void ich_set_dmamode(struct ata_port *ap, struct ata_device *adev);</div><div class='ctx'> static int ich_pata_cable_detect(struct ata_port *ap);</div><div class='ctx'> static u8 piix_vmw_bmdma_status(struct ata_port *ap);</div><div class='del'>-static int piix_sidpr_scr_read(struct ata_port *ap, unsigned int reg, u32 *val);</div><div class='del'>-static int piix_sidpr_scr_write(struct ata_port *ap, unsigned int reg, u32 val);</div><div class='add'>+static int piix_sidpr_scr_read(struct ata_link *link,</div><div class='add'>+			       unsigned int reg, u32 *val);</div><div class='add'>+static int piix_sidpr_scr_write(struct ata_link *link,</div><div class='add'>+				unsigned int reg, u32 val);</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> static int piix_pci_device_suspend(struct pci_dev *pdev, pm_message_t mesg);</div><div class='ctx'> static int piix_pci_device_resume(struct pci_dev *pdev);</div><div class='hunk'>@@ -278,12 +280,15 @@ static const struct pci_device_id piix_pci_tbl[] = {</div><div class='ctx'> 	/* SATA Controller IDE (PCH) */</div><div class='ctx'> 	{ 0x8086, 0x3b20, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata },</div><div class='ctx'> 	/* SATA Controller IDE (PCH) */</div><div class='add'>+	{ 0x8086, 0x3b21, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },</div><div class='add'>+	/* SATA Controller IDE (PCH) */</div><div class='ctx'> 	{ 0x8086, 0x3b26, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },</div><div class='ctx'> 	/* SATA Controller IDE (PCH) */</div><div class='add'>+	{ 0x8086, 0x3b28, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata },</div><div class='add'>+	/* SATA Controller IDE (PCH) */</div><div class='ctx'> 	{ 0x8086, 0x3b2d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },</div><div class='ctx'> 	/* SATA Controller IDE (PCH) */</div><div class='ctx'> 	{ 0x8086, 0x3b2e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata },</div><div class='del'>-</div><div class='ctx'> 	{ }	/* terminate list */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -582,6 +587,7 @@ static const struct ich_laptop ich_laptop[] = {</div><div class='ctx'> 	{ 0x27DF, 0x1025, 0x0110 },	/* ICH7 on Acer 3682WLMi */</div><div class='ctx'> 	{ 0x27DF, 0x1043, 0x1267 },	/* ICH7 on Asus W5F */</div><div class='ctx'> 	{ 0x27DF, 0x103C, 0x30A1 },	/* ICH7 on HP Compaq nc2400 */</div><div class='add'>+	{ 0x27DF, 0x1071, 0xD221 },	/* ICH7 on Hercules EC-900 */</div><div class='ctx'> 	{ 0x24CA, 0x1025, 0x0061 },	/* ICH4 on ACER Aspire 2023WLMi */</div><div class='ctx'> 	{ 0x24CA, 0x1025, 0x003d },	/* ICH4 on ACER TM290 */</div><div class='ctx'> 	{ 0x266F, 0x1025, 0x0066 },	/* ICH6 on ACER Aspire 1694WLMi */</div><div class='hunk'>@@ -885,23 +891,9 @@ static void ich_set_dmamode(struct ata_port *ap, struct ata_device *adev)</div><div class='ctx'>  * Serial ATA Index/Data Pair Superset Registers access</div><div class='ctx'>  *</div><div class='ctx'>  * Beginning from ICH8, there's a sane way to access SCRs using index</div><div class='del'>- * and data register pair located at BAR5.  This creates an</div><div class='del'>- * interesting problem of mapping two SCRs to one port.</div><div class='del'>- *</div><div class='del'>- * Although they have separate SCRs, the master and slave aren't</div><div class='del'>- * independent enough to be treated as separate links - e.g. softreset</div><div class='del'>- * resets both.  Also, there's no protocol defined for hard resetting</div><div class='del'>- * singled device sharing the virtual port (no defined way to acquire</div><div class='del'>- * device signature).  This is worked around by merging the SCR values</div><div class='del'>- * into one sensible value and requesting follow-up SRST after</div><div class='del'>- * hardreset.</div><div class='del'>- *</div><div class='del'>- * SCR merging is perfomed in nibbles which is the unit contents in</div><div class='del'>- * SCRs are organized.  If two values are equal, the value is used.</div><div class='del'>- * When they differ, merge table which lists precedence of possible</div><div class='del'>- * values is consulted and the first match or the last entry when</div><div class='del'>- * nothing matches is used.  When there's no merge table for the</div><div class='del'>- * specific nibble, value from the first port is used.</div><div class='add'>+ * and data register pair located at BAR5 which means that we have</div><div class='add'>+ * separate SCRs for master and slave.  This is handled using libata</div><div class='add'>+ * slave_link facility.</div><div class='ctx'>  */</div><div class='ctx'> static const int piix_sidx_map[] = {</div><div class='ctx'> 	[SCR_STATUS]	= 0,</div><div class='hunk'>@@ -909,120 +901,38 @@ static const int piix_sidx_map[] = {</div><div class='ctx'> 	[SCR_CONTROL]	= 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void piix_sidpr_sel(struct ata_device *dev, unsigned int reg)</div><div class='add'>+static void piix_sidpr_sel(struct ata_link *link, unsigned int reg)</div><div class='ctx'> {</div><div class='del'>-	struct ata_port *ap = dev-&gt;link-&gt;ap;</div><div class='add'>+	struct ata_port *ap = link-&gt;ap;</div><div class='ctx'> 	struct piix_host_priv *hpriv = ap-&gt;host-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	iowrite32(((ap-&gt;port_no * 2 + dev-&gt;devno) &lt;&lt; 8) | piix_sidx_map[reg],</div><div class='add'>+	iowrite32(((ap-&gt;port_no * 2 + link-&gt;pmp) &lt;&lt; 8) | piix_sidx_map[reg],</div><div class='ctx'> 		  hpriv-&gt;sidpr + PIIX_SIDPR_IDX);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int piix_sidpr_read(struct ata_device *dev, unsigned int reg)</div><div class='del'>-{</div><div class='del'>-	struct piix_host_priv *hpriv = dev-&gt;link-&gt;ap-&gt;host-&gt;private_data;</div><div class='del'>-</div><div class='del'>-	piix_sidpr_sel(dev, reg);</div><div class='del'>-	return ioread32(hpriv-&gt;sidpr + PIIX_SIDPR_DATA);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void piix_sidpr_write(struct ata_device *dev, unsigned int reg, u32 val)</div><div class='del'>-{</div><div class='del'>-	struct piix_host_priv *hpriv = dev-&gt;link-&gt;ap-&gt;host-&gt;private_data;</div><div class='del'>-</div><div class='del'>-	piix_sidpr_sel(dev, reg);</div><div class='del'>-	iowrite32(val, hpriv-&gt;sidpr + PIIX_SIDPR_DATA);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u32 piix_merge_scr(u32 val0, u32 val1, const int * const *merge_tbl)</div><div class='del'>-{</div><div class='del'>-	u32 val = 0;</div><div class='del'>-	int i, mi;</div><div class='del'>-</div><div class='del'>-	for (i = 0, mi = 0; i &lt; 32 / 4; i++) {</div><div class='del'>-		u8 c0 = (val0 &gt;&gt; (i * 4)) &amp; 0xf;</div><div class='del'>-		u8 c1 = (val1 &gt;&gt; (i * 4)) &amp; 0xf;</div><div class='del'>-		u8 merged = c0;</div><div class='del'>-		const int *cur;</div><div class='del'>-</div><div class='del'>-		/* if no merge preference, assume the first value */</div><div class='del'>-		cur = merge_tbl[mi];</div><div class='del'>-		if (!cur)</div><div class='del'>-			goto done;</div><div class='del'>-		mi++;</div><div class='del'>-</div><div class='del'>-		/* if two values equal, use it */</div><div class='del'>-		if (c0 == c1)</div><div class='del'>-			goto done;</div><div class='del'>-</div><div class='del'>-		/* choose the first match or the last from the merge table */</div><div class='del'>-		while (*cur != -1) {</div><div class='del'>-			if (c0 == *cur || c1 == *cur)</div><div class='del'>-				break;</div><div class='del'>-			cur++;</div><div class='del'>-		}</div><div class='del'>-		if (*cur == -1)</div><div class='del'>-			cur--;</div><div class='del'>-		merged = *cur;</div><div class='del'>-	done:</div><div class='del'>-		val |= merged &lt;&lt; (i * 4);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int piix_sidpr_scr_read(struct ata_port *ap, unsigned int reg, u32 *val)</div><div class='add'>+static int piix_sidpr_scr_read(struct ata_link *link,</div><div class='add'>+			       unsigned int reg, u32 *val)</div><div class='ctx'> {</div><div class='del'>-	const int * const sstatus_merge_tbl[] = {</div><div class='del'>-		/* DET */ (const int []){ 1, 3, 0, 4, 3, -1 },</div><div class='del'>-		/* SPD */ (const int []){ 2, 1, 0, -1 },</div><div class='del'>-		/* IPM */ (const int []){ 6, 2, 1, 0, -1 },</div><div class='del'>-		NULL,</div><div class='del'>-	};</div><div class='del'>-	const int * const scontrol_merge_tbl[] = {</div><div class='del'>-		/* DET */ (const int []){ 1, 0, 4, 0, -1 },</div><div class='del'>-		/* SPD */ (const int []){ 0, 2, 1, 0, -1 },</div><div class='del'>-		/* IPM */ (const int []){ 0, 1, 2, 3, 0, -1 },</div><div class='del'>-		NULL,</div><div class='del'>-	};</div><div class='del'>-	u32 v0, v1;</div><div class='add'>+	struct piix_host_priv *hpriv = link-&gt;ap-&gt;host-&gt;private_data;</div><div class='ctx'> </div><div class='ctx'> 	if (reg &gt;= ARRAY_SIZE(piix_sidx_map))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (!(ap-&gt;flags &amp; ATA_FLAG_SLAVE_POSS)) {</div><div class='del'>-		*val = piix_sidpr_read(&amp;ap-&gt;link.device[0], reg);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	v0 = piix_sidpr_read(&amp;ap-&gt;link.device[0], reg);</div><div class='del'>-	v1 = piix_sidpr_read(&amp;ap-&gt;link.device[1], reg);</div><div class='del'>-</div><div class='del'>-	switch (reg) {</div><div class='del'>-	case SCR_STATUS:</div><div class='del'>-		*val = piix_merge_scr(v0, v1, sstatus_merge_tbl);</div><div class='del'>-		break;</div><div class='del'>-	case SCR_ERROR:</div><div class='del'>-		*val = v0 | v1;</div><div class='del'>-		break;</div><div class='del'>-	case SCR_CONTROL:</div><div class='del'>-		*val = piix_merge_scr(v0, v1, scontrol_merge_tbl);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='add'>+	piix_sidpr_sel(link, reg);</div><div class='add'>+	*val = ioread32(hpriv-&gt;sidpr + PIIX_SIDPR_DATA);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int piix_sidpr_scr_write(struct ata_port *ap, unsigned int reg, u32 val)</div><div class='add'>+static int piix_sidpr_scr_write(struct ata_link *link,</div><div class='add'>+				unsigned int reg, u32 val)</div><div class='ctx'> {</div><div class='add'>+	struct piix_host_priv *hpriv = link-&gt;ap-&gt;host-&gt;private_data;</div><div class='add'>+</div><div class='ctx'> 	if (reg &gt;= ARRAY_SIZE(piix_sidx_map))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	piix_sidpr_write(&amp;ap-&gt;link.device[0], reg, val);</div><div class='del'>-</div><div class='del'>-	if (ap-&gt;flags &amp; ATA_FLAG_SLAVE_POSS)</div><div class='del'>-		piix_sidpr_write(&amp;ap-&gt;link.device[1], reg, val);</div><div class='del'>-</div><div class='add'>+	piix_sidpr_sel(link, reg);</div><div class='add'>+	iowrite32(val, hpriv-&gt;sidpr + PIIX_SIDPR_DATA);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1363,28 +1273,28 @@ static const int *__devinit piix_init_sata_map(struct pci_dev *pdev,</div><div class='ctx'> 	return map;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devinit piix_init_sidpr(struct ata_host *host)</div><div class='add'>+static int __devinit piix_init_sidpr(struct ata_host *host)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev *pdev = to_pci_dev(host-&gt;dev);</div><div class='ctx'> 	struct piix_host_priv *hpriv = host-&gt;private_data;</div><div class='del'>-	struct ata_device *dev0 = &amp;host-&gt;ports[0]-&gt;link.device[0];</div><div class='add'>+	struct ata_link *link0 = &amp;host-&gt;ports[0]-&gt;link;</div><div class='ctx'> 	u32 scontrol;</div><div class='del'>-	int i;</div><div class='add'>+	int i, rc;</div><div class='ctx'> </div><div class='ctx'> 	/* check for availability */</div><div class='ctx'> 	for (i = 0; i &lt; 4; i++)</div><div class='ctx'> 		if (hpriv-&gt;map[i] == IDE)</div><div class='del'>-			return;</div><div class='add'>+			return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!(host-&gt;ports[0]-&gt;flags &amp; PIIX_FLAG_SIDPR))</div><div class='del'>-		return;</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (pci_resource_start(pdev, PIIX_SIDPR_BAR) == 0 ||</div><div class='ctx'> 	    pci_resource_len(pdev, PIIX_SIDPR_BAR) != PIIX_SIDPR_LEN)</div><div class='del'>-		return;</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (pcim_iomap_regions(pdev, 1 &lt;&lt; PIIX_SIDPR_BAR, DRV_NAME))</div><div class='del'>-		return;</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	hpriv-&gt;sidpr = pcim_iomap_table(pdev)[PIIX_SIDPR_BAR];</div><div class='ctx'> </div><div class='hunk'>@@ -1392,7 +1302,7 @@ static void __devinit piix_init_sidpr(struct ata_host *host)</div><div class='ctx'> 	 * Give it a test drive by inhibiting power save modes which</div><div class='ctx'> 	 * we'll do anyway.</div><div class='ctx'> 	 */</div><div class='del'>-	scontrol = piix_sidpr_read(dev0, SCR_CONTROL);</div><div class='add'>+	piix_sidpr_scr_read(link0, SCR_CONTROL, &amp;scontrol);</div><div class='ctx'> </div><div class='ctx'> 	/* if IPM is already 3, SCR access is probably working.  Don't</div><div class='ctx'> 	 * un-inhibit power save modes as BIOS might have inhibited</div><div class='hunk'>@@ -1400,18 +1310,30 @@ static void __devinit piix_init_sidpr(struct ata_host *host)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if ((scontrol &amp; 0xf00) != 0x300) {</div><div class='ctx'> 		scontrol |= 0x300;</div><div class='del'>-		piix_sidpr_write(dev0, SCR_CONTROL, scontrol);</div><div class='del'>-		scontrol = piix_sidpr_read(dev0, SCR_CONTROL);</div><div class='add'>+		piix_sidpr_scr_write(link0, SCR_CONTROL, scontrol);</div><div class='add'>+		piix_sidpr_scr_read(link0, SCR_CONTROL, &amp;scontrol);</div><div class='ctx'> </div><div class='ctx'> 		if ((scontrol &amp; 0xf00) != 0x300) {</div><div class='ctx'> 			dev_printk(KERN_INFO, host-&gt;dev, "SCR access via "</div><div class='ctx'> 				   "SIDPR is available but doesn't work\n");</div><div class='del'>-			return;</div><div class='add'>+			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	host-&gt;ports[0]-&gt;ops = &amp;piix_sidpr_sata_ops;</div><div class='del'>-	host-&gt;ports[1]-&gt;ops = &amp;piix_sidpr_sata_ops;</div><div class='add'>+	/* okay, SCRs available, set ops and ask libata for slave_link */</div><div class='add'>+	for (i = 0; i &lt; 2; i++) {</div><div class='add'>+		struct ata_port *ap = host-&gt;ports[i];</div><div class='add'>+</div><div class='add'>+		ap-&gt;ops = &amp;piix_sidpr_sata_ops;</div><div class='add'>+</div><div class='add'>+		if (ap-&gt;flags &amp; ATA_FLAG_SLAVE_POSS) {</div><div class='add'>+			rc = ata_slave_link_init(ap);</div><div class='add'>+			if (rc)</div><div class='add'>+				return rc;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void piix_iocfg_bit18_quirk(struct pci_dev *pdev)</div><div class='hunk'>@@ -1521,7 +1443,9 @@ static int __devinit piix_init_one(struct pci_dev *pdev,</div><div class='ctx'> 	/* initialize controller */</div><div class='ctx'> 	if (port_flags &amp; ATA_FLAG_SATA) {</div><div class='ctx'> 		piix_init_pcs(host, piix_map_db_table[ent-&gt;driver_data]);</div><div class='del'>-		piix_init_sidpr(host);</div><div class='add'>+		rc = piix_init_sidpr(host);</div><div class='add'>+		if (rc)</div><div class='add'>+			return rc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* apply IOCFG bit18 quirk */</div><div class='head'>diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c<br/>index 79e3a8e7a84a..1ee9499bd343 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ata/libata-core.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ata/libata-core.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ata/libata-core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ata/libata-core.c</a></div><div class='hunk'>@@ -163,6 +163,67 @@ MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_VERSION(DRV_VERSION);</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Iterator helpers.  Don't use directly.</div><div class='add'>+ *</div><div class='add'>+ * LOCKING:</div><div class='add'>+ * Host lock or EH context.</div><div class='add'>+ */</div><div class='add'>+struct ata_link *__ata_port_next_link(struct ata_port *ap,</div><div class='add'>+				      struct ata_link *link, bool dev_only)</div><div class='add'>+{</div><div class='add'>+	/* NULL link indicates start of iteration */</div><div class='add'>+	if (!link) {</div><div class='add'>+		if (dev_only &amp;&amp; sata_pmp_attached(ap))</div><div class='add'>+			return ap-&gt;pmp_link;</div><div class='add'>+		return &amp;ap-&gt;link;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* we just iterated over the host master link, what's next? */</div><div class='add'>+	if (link == &amp;ap-&gt;link) {</div><div class='add'>+		if (!sata_pmp_attached(ap)) {</div><div class='add'>+			if (unlikely(ap-&gt;slave_link) &amp;&amp; !dev_only)</div><div class='add'>+				return ap-&gt;slave_link;</div><div class='add'>+			return NULL;</div><div class='add'>+		}</div><div class='add'>+		return ap-&gt;pmp_link;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* slave_link excludes PMP */</div><div class='add'>+	if (unlikely(link == ap-&gt;slave_link))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	/* iterate to the next PMP link */</div><div class='add'>+	if (++link &lt; ap-&gt;pmp_link + ap-&gt;nr_pmp_links)</div><div class='add'>+		return link;</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	ata_dev_phys_link - find physical link for a device</div><div class='add'>+ *	@dev: ATA device to look up physical link for</div><div class='add'>+ *</div><div class='add'>+ *	Look up physical link which @dev is attached to.  Note that</div><div class='add'>+ *	this is different from @dev-&gt;link only when @dev is on slave</div><div class='add'>+ *	link.  For all other cases, it's the same as @dev-&gt;link.</div><div class='add'>+ *</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	Don't care.</div><div class='add'>+ *</div><div class='add'>+ *	RETURNS:</div><div class='add'>+ *	Pointer to the found physical link.</div><div class='add'>+ */</div><div class='add'>+struct ata_link *ata_dev_phys_link(struct ata_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct ata_port *ap = dev-&gt;link-&gt;ap;</div><div class='add'>+</div><div class='add'>+	if (!ap-&gt;slave_link)</div><div class='add'>+		return dev-&gt;link;</div><div class='add'>+	if (!dev-&gt;devno)</div><div class='add'>+		return &amp;ap-&gt;link;</div><div class='add'>+	return ap-&gt;slave_link;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  *	ata_force_cbl - force cable type according to libata.force</div><div class='ctx'>  *	@ap: ATA port of interest</div><div class='hunk'>@@ -206,7 +267,8 @@ void ata_force_cbl(struct ata_port *ap)</div><div class='ctx'>  *	the host link and all fan-out ports connected via PMP.  If the</div><div class='ctx'>  *	device part is specified as 0 (e.g. 1.00:), it specifies the</div><div class='ctx'>  *	first fan-out link not the host link.  Device number 15 always</div><div class='del'>- *	points to the host link whether PMP is attached or not.</div><div class='add'>+ *	points to the host link whether PMP is attached or not.  If the</div><div class='add'>+ *	controller has slave link, device number 16 points to it.</div><div class='ctx'>  *</div><div class='ctx'>  *	LOCKING:</div><div class='ctx'>  *	EH context.</div><div class='hunk'>@@ -214,12 +276,11 @@ void ata_force_cbl(struct ata_port *ap)</div><div class='ctx'> static void ata_force_link_limits(struct ata_link *link)</div><div class='ctx'> {</div><div class='ctx'> 	bool did_spd = false;</div><div class='del'>-	int linkno, i;</div><div class='add'>+	int linkno = link-&gt;pmp;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (ata_is_host_link(link))</div><div class='del'>-		linkno = 15;</div><div class='del'>-	else</div><div class='del'>-		linkno = link-&gt;pmp;</div><div class='add'>+		linkno += 15;</div><div class='ctx'> </div><div class='ctx'> 	for (i = ata_force_tbl_size - 1; i &gt;= 0; i--) {</div><div class='ctx'> 		const struct ata_force_ent *fe = &amp;ata_force_tbl[i];</div><div class='hunk'>@@ -266,9 +327,9 @@ static void ata_force_xfermask(struct ata_device *dev)</div><div class='ctx'> 	int alt_devno = devno;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	/* allow n.15 for the first device attached to host port */</div><div class='del'>-	if (ata_is_host_link(dev-&gt;link) &amp;&amp; devno == 0)</div><div class='del'>-		alt_devno = 15;</div><div class='add'>+	/* allow n.15/16 for devices attached to host port */</div><div class='add'>+	if (ata_is_host_link(dev-&gt;link))</div><div class='add'>+		alt_devno += 15;</div><div class='ctx'> </div><div class='ctx'> 	for (i = ata_force_tbl_size - 1; i &gt;= 0; i--) {</div><div class='ctx'> 		const struct ata_force_ent *fe = &amp;ata_force_tbl[i];</div><div class='hunk'>@@ -320,9 +381,9 @@ static void ata_force_horkage(struct ata_device *dev)</div><div class='ctx'> 	int alt_devno = devno;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	/* allow n.15 for the first device attached to host port */</div><div class='del'>-	if (ata_is_host_link(dev-&gt;link) &amp;&amp; devno == 0)</div><div class='del'>-		alt_devno = 15;</div><div class='add'>+	/* allow n.15/16 for devices attached to host port */</div><div class='add'>+	if (ata_is_host_link(dev-&gt;link))</div><div class='add'>+		alt_devno += 15;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ata_force_tbl_size; i++) {</div><div class='ctx'> 		const struct ata_force_ent *fe = &amp;ata_force_tbl[i];</div><div class='hunk'>@@ -2681,7 +2742,7 @@ static void sata_print_link_status(struct ata_link *link)</div><div class='ctx'> 		return;</div><div class='ctx'> 	sata_scr_read(link, SCR_CONTROL, &amp;scontrol);</div><div class='ctx'> </div><div class='del'>-	if (ata_link_online(link)) {</div><div class='add'>+	if (ata_phys_link_online(link)) {</div><div class='ctx'> 		tmp = (sstatus &gt;&gt; 4) &amp; 0xf;</div><div class='ctx'> 		ata_link_printk(link, KERN_INFO,</div><div class='ctx'> 				"SATA link up %s (SStatus %X SControl %X)\n",</div><div class='hunk'>@@ -3372,6 +3433,12 @@ int ata_wait_ready(struct ata_link *link, unsigned long deadline,</div><div class='ctx'> 	unsigned long nodev_deadline = ata_deadline(start, ATA_TMOUT_FF_WAIT);</div><div class='ctx'> 	int warned = 0;</div><div class='ctx'> </div><div class='add'>+	/* Slave readiness can't be tested separately from master.  On</div><div class='add'>+	 * M/S emulation configuration, this function should be called</div><div class='add'>+	 * only on the master and it will handle both master and slave.</div><div class='add'>+	 */</div><div class='add'>+	WARN_ON(link == link-&gt;ap-&gt;slave_link);</div><div class='add'>+</div><div class='ctx'> 	if (time_after(nodev_deadline, deadline))</div><div class='ctx'> 		nodev_deadline = deadline;</div><div class='ctx'> </div><div class='hunk'>@@ -3593,7 +3660,7 @@ int ata_std_prereset(struct ata_link *link, unsigned long deadline)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* no point in trying softreset on offline link */</div><div class='del'>-	if (ata_link_offline(link))</div><div class='add'>+	if (ata_phys_link_offline(link))</div><div class='ctx'> 		ehc-&gt;i.action &amp;= ~ATA_EH_SOFTRESET;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -3671,7 +3738,7 @@ int sata_link_hardreset(struct ata_link *link, const unsigned long *timing,</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	/* if link is offline nothing more to do */</div><div class='del'>-	if (ata_link_offline(link))</div><div class='add'>+	if (ata_phys_link_offline(link))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	/* Link is online.  From this point, -ENODEV too is an error. */</div><div class='hunk'>@@ -4868,10 +4935,8 @@ int sata_scr_valid(struct ata_link *link)</div><div class='ctx'> int sata_scr_read(struct ata_link *link, int reg, u32 *val)</div><div class='ctx'> {</div><div class='ctx'> 	if (ata_is_host_link(link)) {</div><div class='del'>-		struct ata_port *ap = link-&gt;ap;</div><div class='del'>-</div><div class='ctx'> 		if (sata_scr_valid(link))</div><div class='del'>-			return ap-&gt;ops-&gt;scr_read(ap, reg, val);</div><div class='add'>+			return link-&gt;ap-&gt;ops-&gt;scr_read(link, reg, val);</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -4897,10 +4962,8 @@ int sata_scr_read(struct ata_link *link, int reg, u32 *val)</div><div class='ctx'> int sata_scr_write(struct ata_link *link, int reg, u32 val)</div><div class='ctx'> {</div><div class='ctx'> 	if (ata_is_host_link(link)) {</div><div class='del'>-		struct ata_port *ap = link-&gt;ap;</div><div class='del'>-</div><div class='ctx'> 		if (sata_scr_valid(link))</div><div class='del'>-			return ap-&gt;ops-&gt;scr_write(ap, reg, val);</div><div class='add'>+			return link-&gt;ap-&gt;ops-&gt;scr_write(link, reg, val);</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -4925,13 +4988,12 @@ int sata_scr_write(struct ata_link *link, int reg, u32 val)</div><div class='ctx'> int sata_scr_write_flush(struct ata_link *link, int reg, u32 val)</div><div class='ctx'> {</div><div class='ctx'> 	if (ata_is_host_link(link)) {</div><div class='del'>-		struct ata_port *ap = link-&gt;ap;</div><div class='ctx'> 		int rc;</div><div class='ctx'> </div><div class='ctx'> 		if (sata_scr_valid(link)) {</div><div class='del'>-			rc = ap-&gt;ops-&gt;scr_write(ap, reg, val);</div><div class='add'>+			rc = link-&gt;ap-&gt;ops-&gt;scr_write(link, reg, val);</div><div class='ctx'> 			if (rc == 0)</div><div class='del'>-				rc = ap-&gt;ops-&gt;scr_read(ap, reg, &amp;val);</div><div class='add'>+				rc = link-&gt;ap-&gt;ops-&gt;scr_read(link, reg, &amp;val);</div><div class='ctx'> 			return rc;</div><div class='ctx'> 		}</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='hunk'>@@ -4941,7 +5003,7 @@ int sata_scr_write_flush(struct ata_link *link, int reg, u32 val)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *	ata_link_online - test whether the given link is online</div><div class='add'>+ *	ata_phys_link_online - test whether the given link is online</div><div class='ctx'>  *	@link: ATA link to test</div><div class='ctx'>  *</div><div class='ctx'>  *	Test whether @link is online.  Note that this function returns</div><div class='hunk'>@@ -4952,20 +5014,20 @@ int sata_scr_write_flush(struct ata_link *link, int reg, u32 val)</div><div class='ctx'>  *	None.</div><div class='ctx'>  *</div><div class='ctx'>  *	RETURNS:</div><div class='del'>- *	1 if the port online status is available and online.</div><div class='add'>+ *	True if the port online status is available and online.</div><div class='ctx'>  */</div><div class='del'>-int ata_link_online(struct ata_link *link)</div><div class='add'>+bool ata_phys_link_online(struct ata_link *link)</div><div class='ctx'> {</div><div class='ctx'> 	u32 sstatus;</div><div class='ctx'> </div><div class='ctx'> 	if (sata_scr_read(link, SCR_STATUS, &amp;sstatus) == 0 &amp;&amp;</div><div class='ctx'> 	    (sstatus &amp; 0xf) == 0x3)</div><div class='del'>-		return 1;</div><div class='del'>-	return 0;</div><div class='add'>+		return true;</div><div class='add'>+	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *	ata_link_offline - test whether the given link is offline</div><div class='add'>+ *	ata_phys_link_offline - test whether the given link is offline</div><div class='ctx'>  *	@link: ATA link to test</div><div class='ctx'>  *</div><div class='ctx'>  *	Test whether @link is offline.  Note that this function</div><div class='hunk'>@@ -4976,16 +5038,68 @@ int ata_link_online(struct ata_link *link)</div><div class='ctx'>  *	None.</div><div class='ctx'>  *</div><div class='ctx'>  *	RETURNS:</div><div class='del'>- *	1 if the port offline status is available and offline.</div><div class='add'>+ *	True if the port offline status is available and offline.</div><div class='ctx'>  */</div><div class='del'>-int ata_link_offline(struct ata_link *link)</div><div class='add'>+bool ata_phys_link_offline(struct ata_link *link)</div><div class='ctx'> {</div><div class='ctx'> 	u32 sstatus;</div><div class='ctx'> </div><div class='ctx'> 	if (sata_scr_read(link, SCR_STATUS, &amp;sstatus) == 0 &amp;&amp;</div><div class='ctx'> 	    (sstatus &amp; 0xf) != 0x3)</div><div class='del'>-		return 1;</div><div class='del'>-	return 0;</div><div class='add'>+		return true;</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	ata_link_online - test whether the given link is online</div><div class='add'>+ *	@link: ATA link to test</div><div class='add'>+ *</div><div class='add'>+ *	Test whether @link is online.  This is identical to</div><div class='add'>+ *	ata_phys_link_online() when there's no slave link.  When</div><div class='add'>+ *	there's a slave link, this function should only be called on</div><div class='add'>+ *	the master link and will return true if any of M/S links is</div><div class='add'>+ *	online.</div><div class='add'>+ *</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	None.</div><div class='add'>+ *</div><div class='add'>+ *	RETURNS:</div><div class='add'>+ *	True if the port online status is available and online.</div><div class='add'>+ */</div><div class='add'>+bool ata_link_online(struct ata_link *link)</div><div class='add'>+{</div><div class='add'>+	struct ata_link *slave = link-&gt;ap-&gt;slave_link;</div><div class='add'>+</div><div class='add'>+	WARN_ON(link == slave);	/* shouldn't be called on slave link */</div><div class='add'>+</div><div class='add'>+	return ata_phys_link_online(link) ||</div><div class='add'>+		(slave &amp;&amp; ata_phys_link_online(slave));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	ata_link_offline - test whether the given link is offline</div><div class='add'>+ *	@link: ATA link to test</div><div class='add'>+ *</div><div class='add'>+ *	Test whether @link is offline.  This is identical to</div><div class='add'>+ *	ata_phys_link_offline() when there's no slave link.  When</div><div class='add'>+ *	there's a slave link, this function should only be called on</div><div class='add'>+ *	the master link and will return true if both M/S links are</div><div class='add'>+ *	offline.</div><div class='add'>+ *</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	None.</div><div class='add'>+ *</div><div class='add'>+ *	RETURNS:</div><div class='add'>+ *	True if the port offline status is available and offline.</div><div class='add'>+ */</div><div class='add'>+bool ata_link_offline(struct ata_link *link)</div><div class='add'>+{</div><div class='add'>+	struct ata_link *slave = link-&gt;ap-&gt;slave_link;</div><div class='add'>+</div><div class='add'>+	WARN_ON(link == slave);	/* shouldn't be called on slave link */</div><div class='add'>+</div><div class='add'>+	return ata_phys_link_offline(link) &amp;&amp;</div><div class='add'>+		(!slave || ata_phys_link_offline(slave));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PM</div><div class='hunk'>@@ -5127,11 +5241,11 @@ int ata_port_start(struct ata_port *ap)</div><div class='ctx'>  */</div><div class='ctx'> void ata_dev_init(struct ata_device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct ata_link *link = dev-&gt;link;</div><div class='add'>+	struct ata_link *link = ata_dev_phys_link(dev);</div><div class='ctx'> 	struct ata_port *ap = link-&gt;ap;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	/* SATA spd limit is bound to the first device */</div><div class='add'>+	/* SATA spd limit is bound to the attached device, reset together */</div><div class='ctx'> 	link-&gt;sata_spd_limit = link-&gt;hw_sata_spd_limit;</div><div class='ctx'> 	link-&gt;sata_spd = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -5264,6 +5378,7 @@ struct ata_port *ata_port_alloc(struct ata_host *host)</div><div class='ctx'> 	INIT_WORK(&amp;ap-&gt;scsi_rescan_task, ata_scsi_dev_rescan);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;ap-&gt;eh_done_q);</div><div class='ctx'> 	init_waitqueue_head(&amp;ap-&gt;eh_wait_q);</div><div class='add'>+	init_completion(&amp;ap-&gt;park_req_pending);</div><div class='ctx'> 	init_timer_deferrable(&amp;ap-&gt;fastdrain_timer);</div><div class='ctx'> 	ap-&gt;fastdrain_timer.function = ata_eh_fastdrain_timerfn;</div><div class='ctx'> 	ap-&gt;fastdrain_timer.data = (unsigned long)ap;</div><div class='hunk'>@@ -5294,6 +5409,7 @@ static void ata_host_release(struct device *gendev, void *res)</div><div class='ctx'> 			scsi_host_put(ap-&gt;scsi_host);</div><div class='ctx'> </div><div class='ctx'> 		kfree(ap-&gt;pmp_link);</div><div class='add'>+		kfree(ap-&gt;slave_link);</div><div class='ctx'> 		kfree(ap);</div><div class='ctx'> 		host-&gt;ports[i] = NULL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -5414,6 +5530,68 @@ struct ata_host *ata_host_alloc_pinfo(struct device *dev,</div><div class='ctx'> 	return host;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ *	ata_slave_link_init - initialize slave link</div><div class='add'>+ *	@ap: port to initialize slave link for</div><div class='add'>+ *</div><div class='add'>+ *	Create and initialize slave link for @ap.  This enables slave</div><div class='add'>+ *	link handling on the port.</div><div class='add'>+ *</div><div class='add'>+ *	In libata, a port contains links and a link contains devices.</div><div class='add'>+ *	There is single host link but if a PMP is attached to it,</div><div class='add'>+ *	there can be multiple fan-out links.  On SATA, there's usually</div><div class='add'>+ *	a single device connected to a link but PATA and SATA</div><div class='add'>+ *	controllers emulating TF based interface can have two - master</div><div class='add'>+ *	and slave.</div><div class='add'>+ *</div><div class='add'>+ *	However, there are a few controllers which don't fit into this</div><div class='add'>+ *	abstraction too well - SATA controllers which emulate TF</div><div class='add'>+ *	interface with both master and slave devices but also have</div><div class='add'>+ *	separate SCR register sets for each device.  These controllers</div><div class='add'>+ *	need separate links for physical link handling</div><div class='add'>+ *	(e.g. onlineness, link speed) but should be treated like a</div><div class='add'>+ *	traditional M/S controller for everything else (e.g. command</div><div class='add'>+ *	issue, softreset).</div><div class='add'>+ *</div><div class='add'>+ *	slave_link is libata's way of handling this class of</div><div class='add'>+ *	controllers without impacting core layer too much.  For</div><div class='add'>+ *	anything other than physical link handling, the default host</div><div class='add'>+ *	link is used for both master and slave.  For physical link</div><div class='add'>+ *	handling, separate @ap-&gt;slave_link is used.  All dirty details</div><div class='add'>+ *	are implemented inside libata core layer.  From LLD's POV, the</div><div class='add'>+ *	only difference is that prereset, hardreset and postreset are</div><div class='add'>+ *	called once more for the slave link, so the reset sequence</div><div class='add'>+ *	looks like the following.</div><div class='add'>+ *</div><div class='add'>+ *	prereset(M) -&gt; prereset(S) -&gt; hardreset(M) -&gt; hardreset(S) -&gt;</div><div class='add'>+ *	softreset(M) -&gt; postreset(M) -&gt; postreset(S)</div><div class='add'>+ *</div><div class='add'>+ *	Note that softreset is called only for the master.  Softreset</div><div class='add'>+ *	resets both M/S by definition, so SRST on master should handle</div><div class='add'>+ *	both (the standard method will work just fine).</div><div class='add'>+ *</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	Should be called before host is registered.</div><div class='add'>+ *</div><div class='add'>+ *	RETURNS:</div><div class='add'>+ *	0 on success, -errno on failure.</div><div class='add'>+ */</div><div class='add'>+int ata_slave_link_init(struct ata_port *ap)</div><div class='add'>+{</div><div class='add'>+	struct ata_link *link;</div><div class='add'>+</div><div class='add'>+	WARN_ON(ap-&gt;slave_link);</div><div class='add'>+	WARN_ON(ap-&gt;flags &amp; ATA_FLAG_PMP);</div><div class='add'>+</div><div class='add'>+	link = kzalloc(sizeof(*link), GFP_KERNEL);</div><div class='add'>+	if (!link)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ata_link_init(ap, link, 1);</div><div class='add'>+	ap-&gt;slave_link = link;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void ata_host_stop(struct device *gendev, void *res)</div><div class='ctx'> {</div><div class='ctx'> 	struct ata_host *host = dev_get_drvdata(gendev);</div><div class='hunk'>@@ -5640,6 +5818,8 @@ int ata_host_register(struct ata_host *host, struct scsi_host_template *sht)</div><div class='ctx'> </div><div class='ctx'> 		/* init sata_spd_limit to the current value */</div><div class='ctx'> 		sata_link_init_spd(&amp;ap-&gt;link);</div><div class='add'>+		if (ap-&gt;slave_link)</div><div class='add'>+			sata_link_init_spd(ap-&gt;slave_link);</div><div class='ctx'> </div><div class='ctx'> 		/* print per-port info to dmesg */</div><div class='ctx'> 		xfer_mask = ata_pack_xfermask(ap-&gt;pio_mask, ap-&gt;mwdma_mask,</div><div class='hunk'>@@ -6260,10 +6440,12 @@ EXPORT_SYMBOL_GPL(ata_base_port_ops);</div><div class='ctx'> EXPORT_SYMBOL_GPL(sata_port_ops);</div><div class='ctx'> EXPORT_SYMBOL_GPL(ata_dummy_port_ops);</div><div class='ctx'> EXPORT_SYMBOL_GPL(ata_dummy_port_info);</div><div class='add'>+EXPORT_SYMBOL_GPL(__ata_port_next_link);</div><div class='ctx'> EXPORT_SYMBOL_GPL(ata_std_bios_param);</div><div class='ctx'> EXPORT_SYMBOL_GPL(ata_host_init);</div><div class='ctx'> EXPORT_SYMBOL_GPL(ata_host_alloc);</div><div class='ctx'> EXPORT_SYMBOL_GPL(ata_host_alloc_pinfo);</div><div class='add'>+EXPORT_SYMBOL_GPL(ata_slave_link_init);</div><div class='ctx'> EXPORT_SYMBOL_GPL(ata_host_start);</div><div class='ctx'> EXPORT_SYMBOL_GPL(ata_host_register);</div><div class='ctx'> EXPORT_SYMBOL_GPL(ata_host_activate);</div><div class='head'>diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c<br/>index c1db2f234d2e..a93247cc395a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ata/libata-eh.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ata/libata-eh.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ata/libata-eh.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ata/libata-eh.c</a></div><div class='hunk'>@@ -33,6 +33,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/blkdev.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;scsi/scsi.h&gt;</div><div class='ctx'> #include &lt;scsi/scsi_host.h&gt;</div><div class='hunk'>@@ -79,6 +80,8 @@ enum {</div><div class='ctx'> 	 */</div><div class='ctx'> 	ATA_EH_PRERESET_TIMEOUT		= 10000,</div><div class='ctx'> 	ATA_EH_FASTDRAIN_INTERVAL	=  3000,</div><div class='add'>+</div><div class='add'>+	ATA_EH_UA_TRIES			= 5,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* The following table determines how we sequence resets.  Each entry</div><div class='hunk'>@@ -457,29 +460,29 @@ static void ata_eh_clear_action(struct ata_link *link, struct ata_device *dev,</div><div class='ctx'>  *	RETURNS:</div><div class='ctx'>  *	EH_HANDLED or EH_NOT_HANDLED</div><div class='ctx'>  */</div><div class='del'>-enum scsi_eh_timer_return ata_scsi_timed_out(struct scsi_cmnd *cmd)</div><div class='add'>+enum blk_eh_timer_return ata_scsi_timed_out(struct scsi_cmnd *cmd)</div><div class='ctx'> {</div><div class='ctx'> 	struct Scsi_Host *host = cmd-&gt;device-&gt;host;</div><div class='ctx'> 	struct ata_port *ap = ata_shost_to_port(host);</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	struct ata_queued_cmd *qc;</div><div class='del'>-	enum scsi_eh_timer_return ret;</div><div class='add'>+	enum blk_eh_timer_return ret;</div><div class='ctx'> </div><div class='ctx'> 	DPRINTK("ENTER\n");</div><div class='ctx'> </div><div class='ctx'> 	if (ap-&gt;ops-&gt;error_handler) {</div><div class='del'>-		ret = EH_NOT_HANDLED;</div><div class='add'>+		ret = BLK_EH_NOT_HANDLED;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = EH_HANDLED;</div><div class='add'>+	ret = BLK_EH_HANDLED;</div><div class='ctx'> 	spin_lock_irqsave(ap-&gt;lock, flags);</div><div class='ctx'> 	qc = ata_qc_from_tag(ap, ap-&gt;link.active_tag);</div><div class='ctx'> 	if (qc) {</div><div class='ctx'> 		WARN_ON(qc-&gt;scsicmd != cmd);</div><div class='ctx'> 		qc-&gt;flags |= ATA_QCFLAG_EH_SCHEDULED;</div><div class='ctx'> 		qc-&gt;err_mask |= AC_ERR_TIMEOUT;</div><div class='del'>-		ret = EH_NOT_HANDLED;</div><div class='add'>+		ret = BLK_EH_NOT_HANDLED;</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_irqrestore(ap-&gt;lock, flags);</div><div class='ctx'> </div><div class='hunk'>@@ -831,7 +834,7 @@ void ata_qc_schedule_eh(struct ata_queued_cmd *qc)</div><div class='ctx'> 	 * Note that ATA_QCFLAG_FAILED is unconditionally set after</div><div class='ctx'> 	 * this function completes.</div><div class='ctx'> 	 */</div><div class='del'>-	scsi_req_abort_cmd(qc-&gt;scsicmd);</div><div class='add'>+	blk_abort_request(qc-&gt;scsicmd-&gt;request);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1357,6 +1360,37 @@ static int ata_eh_read_log_10h(struct ata_device *dev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ *	atapi_eh_tur - perform ATAPI TEST_UNIT_READY</div><div class='add'>+ *	@dev: target ATAPI device</div><div class='add'>+ *	@r_sense_key: out parameter for sense_key</div><div class='add'>+ *</div><div class='add'>+ *	Perform ATAPI TEST_UNIT_READY.</div><div class='add'>+ *</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	EH context (may sleep).</div><div class='add'>+ *</div><div class='add'>+ *	RETURNS:</div><div class='add'>+ *	0 on success, AC_ERR_* mask on failure.</div><div class='add'>+ */</div><div class='add'>+static unsigned int atapi_eh_tur(struct ata_device *dev, u8 *r_sense_key)</div><div class='add'>+{</div><div class='add'>+	u8 cdb[ATAPI_CDB_LEN] = { TEST_UNIT_READY, 0, 0, 0, 0, 0 };</div><div class='add'>+	struct ata_taskfile tf;</div><div class='add'>+	unsigned int err_mask;</div><div class='add'>+</div><div class='add'>+	ata_tf_init(dev, &amp;tf);</div><div class='add'>+</div><div class='add'>+	tf.flags |= ATA_TFLAG_ISADDR | ATA_TFLAG_DEVICE;</div><div class='add'>+	tf.command = ATA_CMD_PACKET;</div><div class='add'>+	tf.protocol = ATAPI_PROT_NODATA;</div><div class='add'>+</div><div class='add'>+	err_mask = ata_exec_internal(dev, &amp;tf, cdb, DMA_NONE, NULL, 0, 0);</div><div class='add'>+	if (err_mask == AC_ERR_DEV)</div><div class='add'>+		*r_sense_key = tf.feature &gt;&gt; 4;</div><div class='add'>+	return err_mask;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  *	atapi_eh_request_sense - perform ATAPI REQUEST_SENSE</div><div class='ctx'>  *	@dev: device to perform REQUEST_SENSE to</div><div class='ctx'>  *	@sense_buf: result sense data buffer (SCSI_SENSE_BUFFERSIZE bytes long)</div><div class='hunk'>@@ -1756,7 +1790,7 @@ static unsigned int ata_eh_speed_down_verdict(struct ata_device *dev)</div><div class='ctx'> static unsigned int ata_eh_speed_down(struct ata_device *dev,</div><div class='ctx'> 				unsigned int eflags, unsigned int err_mask)</div><div class='ctx'> {</div><div class='del'>-	struct ata_link *link = dev-&gt;link;</div><div class='add'>+	struct ata_link *link = ata_dev_phys_link(dev);</div><div class='ctx'> 	int xfer_ok = 0;</div><div class='ctx'> 	unsigned int verdict;</div><div class='ctx'> 	unsigned int action = 0;</div><div class='hunk'>@@ -1880,7 +1914,8 @@ static void ata_eh_link_autopsy(struct ata_link *link)</div><div class='ctx'> 	for (tag = 0; tag &lt; ATA_MAX_QUEUE; tag++) {</div><div class='ctx'> 		struct ata_queued_cmd *qc = __ata_qc_from_tag(ap, tag);</div><div class='ctx'> </div><div class='del'>-		if (!(qc-&gt;flags &amp; ATA_QCFLAG_FAILED) || qc-&gt;dev-&gt;link != link)</div><div class='add'>+		if (!(qc-&gt;flags &amp; ATA_QCFLAG_FAILED) ||</div><div class='add'>+		    ata_dev_phys_link(qc-&gt;dev) != link)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		/* inherit upper level err_mask */</div><div class='hunk'>@@ -1967,6 +2002,23 @@ void ata_eh_autopsy(struct ata_port *ap)</div><div class='ctx'> 	ata_port_for_each_link(link, ap)</div><div class='ctx'> 		ata_eh_link_autopsy(link);</div><div class='ctx'> </div><div class='add'>+	/* Handle the frigging slave link.  Autopsy is done similarly</div><div class='add'>+	 * but actions and flags are transferred over to the master</div><div class='add'>+	 * link and handled from there.</div><div class='add'>+	 */</div><div class='add'>+	if (ap-&gt;slave_link) {</div><div class='add'>+		struct ata_eh_context *mehc = &amp;ap-&gt;link.eh_context;</div><div class='add'>+		struct ata_eh_context *sehc = &amp;ap-&gt;slave_link-&gt;eh_context;</div><div class='add'>+</div><div class='add'>+		ata_eh_link_autopsy(ap-&gt;slave_link);</div><div class='add'>+</div><div class='add'>+		ata_eh_about_to_do(ap-&gt;slave_link, NULL, ATA_EH_ALL_ACTIONS);</div><div class='add'>+		mehc-&gt;i.action		|= sehc-&gt;i.action;</div><div class='add'>+		mehc-&gt;i.dev_action[1]	|= sehc-&gt;i.dev_action[1];</div><div class='add'>+		mehc-&gt;i.flags		|= sehc-&gt;i.flags;</div><div class='add'>+		ata_eh_done(ap-&gt;slave_link, NULL, ATA_EH_ALL_ACTIONS);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Autopsy of fanout ports can affect host link autopsy.</div><div class='ctx'> 	 * Perform host link autopsy last.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -2001,7 +2053,8 @@ static void ata_eh_link_report(struct ata_link *link)</div><div class='ctx'> 	for (tag = 0; tag &lt; ATA_MAX_QUEUE; tag++) {</div><div class='ctx'> 		struct ata_queued_cmd *qc = __ata_qc_from_tag(ap, tag);</div><div class='ctx'> </div><div class='del'>-		if (!(qc-&gt;flags &amp; ATA_QCFLAG_FAILED) || qc-&gt;dev-&gt;link != link ||</div><div class='add'>+		if (!(qc-&gt;flags &amp; ATA_QCFLAG_FAILED) ||</div><div class='add'>+		    ata_dev_phys_link(qc-&gt;dev) != link ||</div><div class='ctx'> 		    ((qc-&gt;flags &amp; ATA_QCFLAG_QUIET) &amp;&amp;</div><div class='ctx'> 		     qc-&gt;err_mask == AC_ERR_DEV))</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -2068,7 +2121,7 @@ static void ata_eh_link_report(struct ata_link *link)</div><div class='ctx'> 		char cdb_buf[70] = "";</div><div class='ctx'> </div><div class='ctx'> 		if (!(qc-&gt;flags &amp; ATA_QCFLAG_FAILED) ||</div><div class='del'>-		    qc-&gt;dev-&gt;link != link || !qc-&gt;err_mask)</div><div class='add'>+		    ata_dev_phys_link(qc-&gt;dev) != link || !qc-&gt;err_mask)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		if (qc-&gt;dma_dir != DMA_NONE) {</div><div class='hunk'>@@ -2160,12 +2213,14 @@ void ata_eh_report(struct ata_port *ap)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ata_do_reset(struct ata_link *link, ata_reset_fn_t reset,</div><div class='del'>-			unsigned int *classes, unsigned long deadline)</div><div class='add'>+			unsigned int *classes, unsigned long deadline,</div><div class='add'>+			bool clear_classes)</div><div class='ctx'> {</div><div class='ctx'> 	struct ata_device *dev;</div><div class='ctx'> </div><div class='del'>-	ata_link_for_each_dev(dev, link)</div><div class='del'>-		classes[dev-&gt;devno] = ATA_DEV_UNKNOWN;</div><div class='add'>+	if (clear_classes)</div><div class='add'>+		ata_link_for_each_dev(dev, link)</div><div class='add'>+			classes[dev-&gt;devno] = ATA_DEV_UNKNOWN;</div><div class='ctx'> </div><div class='ctx'> 	return reset(link, classes, deadline);</div><div class='ctx'> }</div><div class='hunk'>@@ -2187,17 +2242,20 @@ int ata_eh_reset(struct ata_link *link, int classify,</div><div class='ctx'> 		 ata_reset_fn_t hardreset, ata_postreset_fn_t postreset)</div><div class='ctx'> {</div><div class='ctx'> 	struct ata_port *ap = link-&gt;ap;</div><div class='add'>+	struct ata_link *slave = ap-&gt;slave_link;</div><div class='ctx'> 	struct ata_eh_context *ehc = &amp;link-&gt;eh_context;</div><div class='add'>+	struct ata_eh_context *sehc = &amp;slave-&gt;eh_context;</div><div class='ctx'> 	unsigned int *classes = ehc-&gt;classes;</div><div class='ctx'> 	unsigned int lflags = link-&gt;flags;</div><div class='ctx'> 	int verbose = !(ehc-&gt;i.flags &amp; ATA_EHI_QUIET);</div><div class='ctx'> 	int max_tries = 0, try = 0;</div><div class='add'>+	struct ata_link *failed_link;</div><div class='ctx'> 	struct ata_device *dev;</div><div class='ctx'> 	unsigned long deadline, now;</div><div class='ctx'> 	ata_reset_fn_t reset;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	u32 sstatus;</div><div class='del'>-	int nr_known, rc;</div><div class='add'>+	int nr_unknown, rc;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Prepare to reset</div><div class='hunk'>@@ -2252,8 +2310,30 @@ int ata_eh_reset(struct ata_link *link, int classify,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (prereset) {</div><div class='del'>-		rc = prereset(link,</div><div class='del'>-			      ata_deadline(jiffies, ATA_EH_PRERESET_TIMEOUT));</div><div class='add'>+		unsigned long deadline = ata_deadline(jiffies,</div><div class='add'>+						      ATA_EH_PRERESET_TIMEOUT);</div><div class='add'>+</div><div class='add'>+		if (slave) {</div><div class='add'>+			sehc-&gt;i.action &amp;= ~ATA_EH_RESET;</div><div class='add'>+			sehc-&gt;i.action |= ehc-&gt;i.action;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		rc = prereset(link, deadline);</div><div class='add'>+</div><div class='add'>+		/* If present, do prereset on slave link too.  Reset</div><div class='add'>+		 * is skipped iff both master and slave links report</div><div class='add'>+		 * -ENOENT or clear ATA_EH_RESET.</div><div class='add'>+		 */</div><div class='add'>+		if (slave &amp;&amp; (rc == 0 || rc == -ENOENT)) {</div><div class='add'>+			int tmp;</div><div class='add'>+</div><div class='add'>+			tmp = prereset(slave, deadline);</div><div class='add'>+			if (tmp != -ENOENT)</div><div class='add'>+				rc = tmp;</div><div class='add'>+</div><div class='add'>+			ehc-&gt;i.action |= sehc-&gt;i.action;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		if (rc) {</div><div class='ctx'> 			if (rc == -ENOENT) {</div><div class='ctx'> 				ata_link_printk(link, KERN_DEBUG,</div><div class='hunk'>@@ -2302,25 +2382,51 @@ int ata_eh_reset(struct ata_link *link, int classify,</div><div class='ctx'> 		else</div><div class='ctx'> 			ehc-&gt;i.flags |= ATA_EHI_DID_SOFTRESET;</div><div class='ctx'> </div><div class='del'>-		rc = ata_do_reset(link, reset, classes, deadline);</div><div class='del'>-		if (rc &amp;&amp; rc != -EAGAIN)</div><div class='add'>+		rc = ata_do_reset(link, reset, classes, deadline, true);</div><div class='add'>+		if (rc &amp;&amp; rc != -EAGAIN) {</div><div class='add'>+			failed_link = link;</div><div class='ctx'> 			goto fail;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* hardreset slave link if existent */</div><div class='add'>+		if (slave &amp;&amp; reset == hardreset) {</div><div class='add'>+			int tmp;</div><div class='add'>+</div><div class='add'>+			if (verbose)</div><div class='add'>+				ata_link_printk(slave, KERN_INFO,</div><div class='add'>+						"hard resetting link\n");</div><div class='ctx'> </div><div class='add'>+			ata_eh_about_to_do(slave, NULL, ATA_EH_RESET);</div><div class='add'>+			tmp = ata_do_reset(slave, reset, classes, deadline,</div><div class='add'>+					   false);</div><div class='add'>+			switch (tmp) {</div><div class='add'>+			case -EAGAIN:</div><div class='add'>+				rc = -EAGAIN;</div><div class='add'>+			case 0:</div><div class='add'>+				break;</div><div class='add'>+			default:</div><div class='add'>+				failed_link = slave;</div><div class='add'>+				rc = tmp;</div><div class='add'>+				goto fail;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* perform follow-up SRST if necessary */</div><div class='ctx'> 		if (reset == hardreset &amp;&amp;</div><div class='ctx'> 		    ata_eh_followup_srst_needed(link, rc, classes)) {</div><div class='del'>-			/* okay, let's do follow-up softreset */</div><div class='ctx'> 			reset = softreset;</div><div class='ctx'> </div><div class='ctx'> 			if (!reset) {</div><div class='ctx'> 				ata_link_printk(link, KERN_ERR,</div><div class='ctx'> 						"follow-up softreset required "</div><div class='ctx'> 						"but no softreset avaliable\n");</div><div class='add'>+				failed_link = link;</div><div class='ctx'> 				rc = -EINVAL;</div><div class='ctx'> 				goto fail;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			ata_eh_about_to_do(link, NULL, ATA_EH_RESET);</div><div class='del'>-			rc = ata_do_reset(link, reset, classes, deadline);</div><div class='add'>+			rc = ata_do_reset(link, reset, classes, deadline, true);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (verbose)</div><div class='hunk'>@@ -2341,7 +2447,7 @@ int ata_eh_reset(struct ata_link *link, int classify,</div><div class='ctx'> 		dev-&gt;pio_mode = XFER_PIO_0;</div><div class='ctx'> 		dev-&gt;flags &amp;= ~ATA_DFLAG_SLEEPING;</div><div class='ctx'> </div><div class='del'>-		if (ata_link_offline(link))</div><div class='add'>+		if (ata_phys_link_offline(ata_dev_phys_link(dev)))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		/* apply class override */</div><div class='hunk'>@@ -2354,6 +2460,8 @@ int ata_eh_reset(struct ata_link *link, int classify,</div><div class='ctx'> 	/* record current link speed */</div><div class='ctx'> 	if (sata_scr_read(link, SCR_STATUS, &amp;sstatus) == 0)</div><div class='ctx'> 		link-&gt;sata_spd = (sstatus &gt;&gt; 4) &amp; 0xf;</div><div class='add'>+	if (slave &amp;&amp; sata_scr_read(slave, SCR_STATUS, &amp;sstatus) == 0)</div><div class='add'>+		slave-&gt;sata_spd = (sstatus &gt;&gt; 4) &amp; 0xf;</div><div class='ctx'> </div><div class='ctx'> 	/* thaw the port */</div><div class='ctx'> 	if (ata_is_host_link(link))</div><div class='hunk'>@@ -2366,12 +2474,17 @@ int ata_eh_reset(struct ata_link *link, int classify,</div><div class='ctx'> 	 * reset and here.  This race is mediated by cross checking</div><div class='ctx'> 	 * link onlineness and classification result later.</div><div class='ctx'> 	 */</div><div class='del'>-	if (postreset)</div><div class='add'>+	if (postreset) {</div><div class='ctx'> 		postreset(link, classes);</div><div class='add'>+		if (slave)</div><div class='add'>+			postreset(slave, classes);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* clear cached SError */</div><div class='ctx'> 	spin_lock_irqsave(link-&gt;ap-&gt;lock, flags);</div><div class='ctx'> 	link-&gt;eh_info.serror = 0;</div><div class='add'>+	if (slave)</div><div class='add'>+		slave-&gt;eh_info.serror = 0;</div><div class='ctx'> 	spin_unlock_irqrestore(link-&gt;ap-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	/* Make sure onlineness and classification result correspond.</div><div class='hunk'>@@ -2381,19 +2494,21 @@ int ata_eh_reset(struct ata_link *link, int classify,</div><div class='ctx'> 	 * link onlineness and classification result, those conditions</div><div class='ctx'> 	 * can be reliably detected and retried.</div><div class='ctx'> 	 */</div><div class='del'>-	nr_known = 0;</div><div class='add'>+	nr_unknown = 0;</div><div class='ctx'> 	ata_link_for_each_dev(dev, link) {</div><div class='ctx'> 		/* convert all ATA_DEV_UNKNOWN to ATA_DEV_NONE */</div><div class='del'>-		if (classes[dev-&gt;devno] == ATA_DEV_UNKNOWN)</div><div class='add'>+		if (classes[dev-&gt;devno] == ATA_DEV_UNKNOWN) {</div><div class='ctx'> 			classes[dev-&gt;devno] = ATA_DEV_NONE;</div><div class='del'>-		else</div><div class='del'>-			nr_known++;</div><div class='add'>+			if (ata_phys_link_online(ata_dev_phys_link(dev)))</div><div class='add'>+				nr_unknown++;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (classify &amp;&amp; !nr_known &amp;&amp; ata_link_online(link)) {</div><div class='add'>+	if (classify &amp;&amp; nr_unknown) {</div><div class='ctx'> 		if (try &lt; max_tries) {</div><div class='ctx'> 			ata_link_printk(link, KERN_WARNING, "link online but "</div><div class='ctx'> 				       "device misclassified, retrying\n");</div><div class='add'>+			failed_link = link;</div><div class='ctx'> 			rc = -EAGAIN;</div><div class='ctx'> 			goto fail;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2404,6 +2519,8 @@ int ata_eh_reset(struct ata_link *link, int classify,</div><div class='ctx'> </div><div class='ctx'> 	/* reset successful, schedule revalidation */</div><div class='ctx'> 	ata_eh_done(link, NULL, ATA_EH_RESET);</div><div class='add'>+	if (slave)</div><div class='add'>+		ata_eh_done(slave, NULL, ATA_EH_RESET);</div><div class='ctx'> 	ehc-&gt;last_reset = jiffies;</div><div class='ctx'> 	ehc-&gt;i.action |= ATA_EH_REVALIDATE;</div><div class='ctx'> </div><div class='hunk'>@@ -2411,6 +2528,8 @@ int ata_eh_reset(struct ata_link *link, int classify,</div><div class='ctx'>  out:</div><div class='ctx'> 	/* clear hotplug flag */</div><div class='ctx'> 	ehc-&gt;i.flags &amp;= ~ATA_EHI_HOTPLUGGED;</div><div class='add'>+	if (slave)</div><div class='add'>+		sehc-&gt;i.flags &amp;= ~ATA_EHI_HOTPLUGGED;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(ap-&gt;lock, flags);</div><div class='ctx'> 	ap-&gt;pflags &amp;= ~ATA_PFLAG_RESETTING;</div><div class='hunk'>@@ -2431,7 +2550,7 @@ int ata_eh_reset(struct ata_link *link, int classify,</div><div class='ctx'> 	if (time_before(now, deadline)) {</div><div class='ctx'> 		unsigned long delta = deadline - now;</div><div class='ctx'> </div><div class='del'>-		ata_link_printk(link, KERN_WARNING,</div><div class='add'>+		ata_link_printk(failed_link, KERN_WARNING,</div><div class='ctx'> 			"reset failed (errno=%d), retrying in %u secs\n",</div><div class='ctx'> 			rc, DIV_ROUND_UP(jiffies_to_msecs(delta), 1000));</div><div class='ctx'> </div><div class='hunk'>@@ -2439,13 +2558,92 @@ int ata_eh_reset(struct ata_link *link, int classify,</div><div class='ctx'> 			delta = schedule_timeout_uninterruptible(delta);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (rc == -EPIPE || try == max_tries - 1)</div><div class='add'>+	if (try == max_tries - 1) {</div><div class='ctx'> 		sata_down_spd_limit(link);</div><div class='add'>+		if (slave)</div><div class='add'>+			sata_down_spd_limit(slave);</div><div class='add'>+	} else if (rc == -EPIPE)</div><div class='add'>+		sata_down_spd_limit(failed_link);</div><div class='add'>+</div><div class='ctx'> 	if (hardreset)</div><div class='ctx'> 		reset = hardreset;</div><div class='ctx'> 	goto retry;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void ata_eh_pull_park_action(struct ata_port *ap)</div><div class='add'>+{</div><div class='add'>+	struct ata_link *link;</div><div class='add'>+	struct ata_device *dev;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * This function can be thought of as an extended version of</div><div class='add'>+	 * ata_eh_about_to_do() specially crafted to accommodate the</div><div class='add'>+	 * requirements of ATA_EH_PARK handling. Since the EH thread</div><div class='add'>+	 * does not leave the do {} while () loop in ata_eh_recover as</div><div class='add'>+	 * long as the timeout for a park request to *one* device on</div><div class='add'>+	 * the port has not expired, and since we still want to pick</div><div class='add'>+	 * up park requests to other devices on the same port or</div><div class='add'>+	 * timeout updates for the same device, we have to pull</div><div class='add'>+	 * ATA_EH_PARK actions from eh_info into eh_context.i</div><div class='add'>+	 * ourselves at the beginning of each pass over the loop.</div><div class='add'>+	 *</div><div class='add'>+	 * Additionally, all write accesses to &amp;ap-&gt;park_req_pending</div><div class='add'>+	 * through INIT_COMPLETION() (see below) or complete_all()</div><div class='add'>+	 * (see ata_scsi_park_store()) are protected by the host lock.</div><div class='add'>+	 * As a result we have that park_req_pending.done is zero on</div><div class='add'>+	 * exit from this function, i.e. when ATA_EH_PARK actions for</div><div class='add'>+	 * *all* devices on port ap have been pulled into the</div><div class='add'>+	 * respective eh_context structs. If, and only if,</div><div class='add'>+	 * park_req_pending.done is non-zero by the time we reach</div><div class='add'>+	 * wait_for_completion_timeout(), another ATA_EH_PARK action</div><div class='add'>+	 * has been scheduled for at least one of the devices on port</div><div class='add'>+	 * ap and we have to cycle over the do {} while () loop in</div><div class='add'>+	 * ata_eh_recover() again.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(ap-&gt;lock, flags);</div><div class='add'>+	INIT_COMPLETION(ap-&gt;park_req_pending);</div><div class='add'>+	ata_port_for_each_link(link, ap) {</div><div class='add'>+		ata_link_for_each_dev(dev, link) {</div><div class='add'>+			struct ata_eh_info *ehi = &amp;link-&gt;eh_info;</div><div class='add'>+</div><div class='add'>+			link-&gt;eh_context.i.dev_action[dev-&gt;devno] |=</div><div class='add'>+				ehi-&gt;dev_action[dev-&gt;devno] &amp; ATA_EH_PARK;</div><div class='add'>+			ata_eh_clear_action(link, dev, ehi, ATA_EH_PARK);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(ap-&gt;lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ata_eh_park_issue_cmd(struct ata_device *dev, int park)</div><div class='add'>+{</div><div class='add'>+	struct ata_eh_context *ehc = &amp;dev-&gt;link-&gt;eh_context;</div><div class='add'>+	struct ata_taskfile tf;</div><div class='add'>+	unsigned int err_mask;</div><div class='add'>+</div><div class='add'>+	ata_tf_init(dev, &amp;tf);</div><div class='add'>+	if (park) {</div><div class='add'>+		ehc-&gt;unloaded_mask |= 1 &lt;&lt; dev-&gt;devno;</div><div class='add'>+		tf.command = ATA_CMD_IDLEIMMEDIATE;</div><div class='add'>+		tf.feature = 0x44;</div><div class='add'>+		tf.lbal = 0x4c;</div><div class='add'>+		tf.lbam = 0x4e;</div><div class='add'>+		tf.lbah = 0x55;</div><div class='add'>+	} else {</div><div class='add'>+		ehc-&gt;unloaded_mask &amp;= ~(1 &lt;&lt; dev-&gt;devno);</div><div class='add'>+		tf.command = ATA_CMD_CHK_POWER;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tf.flags |= ATA_TFLAG_DEVICE | ATA_TFLAG_ISADDR;</div><div class='add'>+	tf.protocol |= ATA_PROT_NODATA;</div><div class='add'>+	err_mask = ata_exec_internal(dev, &amp;tf, NULL, DMA_NONE, NULL, 0, 0);</div><div class='add'>+	if (park &amp;&amp; (err_mask || tf.lbal != 0xc4)) {</div><div class='add'>+		ata_dev_printk(dev, KERN_ERR, "head unload failed!\n");</div><div class='add'>+		ehc-&gt;unloaded_mask &amp;= ~(1 &lt;&lt; dev-&gt;devno);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ata_eh_revalidate_and_attach(struct ata_link *link,</div><div class='ctx'> 					struct ata_device **r_failed_dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -2472,7 +2670,7 @@ static int ata_eh_revalidate_and_attach(struct ata_link *link,</div><div class='ctx'> 		if ((action &amp; ATA_EH_REVALIDATE) &amp;&amp; ata_dev_enabled(dev)) {</div><div class='ctx'> 			WARN_ON(dev-&gt;class == ATA_DEV_PMP);</div><div class='ctx'> </div><div class='del'>-			if (ata_link_offline(link)) {</div><div class='add'>+			if (ata_phys_link_offline(ata_dev_phys_link(dev))) {</div><div class='ctx'> 				rc = -EIO;</div><div class='ctx'> 				goto err;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -2610,6 +2808,53 @@ int ata_set_mode(struct ata_link *link, struct ata_device **r_failed_dev)</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ *	atapi_eh_clear_ua - Clear ATAPI UNIT ATTENTION after reset</div><div class='add'>+ *	@dev: ATAPI device to clear UA for</div><div class='add'>+ *</div><div class='add'>+ *	Resets and other operations can make an ATAPI device raise</div><div class='add'>+ *	UNIT ATTENTION which causes the next operation to fail.  This</div><div class='add'>+ *	function clears UA.</div><div class='add'>+ *</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	EH context (may sleep).</div><div class='add'>+ *</div><div class='add'>+ *	RETURNS:</div><div class='add'>+ *	0 on success, -errno on failure.</div><div class='add'>+ */</div><div class='add'>+static int atapi_eh_clear_ua(struct ata_device *dev)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ATA_EH_UA_TRIES; i++) {</div><div class='add'>+		u8 sense_buffer[SCSI_SENSE_BUFFERSIZE];</div><div class='add'>+		u8 sense_key = 0;</div><div class='add'>+		unsigned int err_mask;</div><div class='add'>+</div><div class='add'>+		err_mask = atapi_eh_tur(dev, &amp;sense_key);</div><div class='add'>+		if (err_mask != 0 &amp;&amp; err_mask != AC_ERR_DEV) {</div><div class='add'>+			ata_dev_printk(dev, KERN_WARNING, "TEST_UNIT_READY "</div><div class='add'>+				"failed (err_mask=0x%x)\n", err_mask);</div><div class='add'>+			return -EIO;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!err_mask || sense_key != UNIT_ATTENTION)</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		err_mask = atapi_eh_request_sense(dev, sense_buffer, sense_key);</div><div class='add'>+		if (err_mask) {</div><div class='add'>+			ata_dev_printk(dev, KERN_WARNING, "failed to clear "</div><div class='add'>+				"UNIT ATTENTION (err_mask=0x%x)\n", err_mask);</div><div class='add'>+			return -EIO;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ata_dev_printk(dev, KERN_WARNING,</div><div class='add'>+		"UNIT ATTENTION persists after %d tries\n", ATA_EH_UA_TRIES);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ata_link_nr_enabled(struct ata_link *link)</div><div class='ctx'> {</div><div class='ctx'> 	struct ata_device *dev;</div><div class='hunk'>@@ -2697,7 +2942,7 @@ static int ata_eh_handle_dev_fail(struct ata_device *dev, int err)</div><div class='ctx'> 			/* This is the last chance, better to slow</div><div class='ctx'> 			 * down than lose it.</div><div class='ctx'> 			 */</div><div class='del'>-			sata_down_spd_limit(dev-&gt;link);</div><div class='add'>+			sata_down_spd_limit(ata_dev_phys_link(dev));</div><div class='ctx'> 			ata_down_xfermask_limit(dev, ATA_DNXFER_PIO);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2707,7 +2952,7 @@ static int ata_eh_handle_dev_fail(struct ata_device *dev, int err)</div><div class='ctx'> 		ata_dev_disable(dev);</div><div class='ctx'> </div><div class='ctx'> 		/* detach if offline */</div><div class='del'>-		if (ata_link_offline(dev-&gt;link))</div><div class='add'>+		if (ata_phys_link_offline(ata_dev_phys_link(dev)))</div><div class='ctx'> 			ata_eh_detach_dev(dev);</div><div class='ctx'> </div><div class='ctx'> 		/* schedule probe if necessary */</div><div class='hunk'>@@ -2755,7 +3000,7 @@ int ata_eh_recover(struct ata_port *ap, ata_prereset_fn_t prereset,</div><div class='ctx'> 	struct ata_device *dev;</div><div class='ctx'> 	int nr_failed_devs;</div><div class='ctx'> 	int rc;</div><div class='del'>-	unsigned long flags;</div><div class='add'>+	unsigned long flags, deadline;</div><div class='ctx'> </div><div class='ctx'> 	DPRINTK("ENTER\n");</div><div class='ctx'> </div><div class='hunk'>@@ -2829,6 +3074,56 @@ int ata_eh_recover(struct ata_port *ap, ata_prereset_fn_t prereset,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	do {</div><div class='add'>+		unsigned long now;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * clears ATA_EH_PARK in eh_info and resets</div><div class='add'>+		 * ap-&gt;park_req_pending</div><div class='add'>+		 */</div><div class='add'>+		ata_eh_pull_park_action(ap);</div><div class='add'>+</div><div class='add'>+		deadline = jiffies;</div><div class='add'>+		ata_port_for_each_link(link, ap) {</div><div class='add'>+			ata_link_for_each_dev(dev, link) {</div><div class='add'>+				struct ata_eh_context *ehc = &amp;link-&gt;eh_context;</div><div class='add'>+				unsigned long tmp;</div><div class='add'>+</div><div class='add'>+				if (dev-&gt;class != ATA_DEV_ATA)</div><div class='add'>+					continue;</div><div class='add'>+				if (!(ehc-&gt;i.dev_action[dev-&gt;devno] &amp;</div><div class='add'>+				      ATA_EH_PARK))</div><div class='add'>+					continue;</div><div class='add'>+				tmp = dev-&gt;unpark_deadline;</div><div class='add'>+				if (time_before(deadline, tmp))</div><div class='add'>+					deadline = tmp;</div><div class='add'>+				else if (time_before_eq(tmp, jiffies))</div><div class='add'>+					continue;</div><div class='add'>+				if (ehc-&gt;unloaded_mask &amp; (1 &lt;&lt; dev-&gt;devno))</div><div class='add'>+					continue;</div><div class='add'>+</div><div class='add'>+				ata_eh_park_issue_cmd(dev, 1);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		now = jiffies;</div><div class='add'>+		if (time_before_eq(deadline, now))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		deadline = wait_for_completion_timeout(&amp;ap-&gt;park_req_pending,</div><div class='add'>+						       deadline - now);</div><div class='add'>+	} while (deadline);</div><div class='add'>+	ata_port_for_each_link(link, ap) {</div><div class='add'>+		ata_link_for_each_dev(dev, link) {</div><div class='add'>+			if (!(link-&gt;eh_context.unloaded_mask &amp;</div><div class='add'>+			      (1 &lt;&lt; dev-&gt;devno)))</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			ata_eh_park_issue_cmd(dev, 0);</div><div class='add'>+			ata_eh_done(link, dev, ATA_EH_PARK);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* the rest */</div><div class='ctx'> 	ata_port_for_each_link(link, ap) {</div><div class='ctx'> 		struct ata_eh_context *ehc = &amp;link-&gt;eh_context;</div><div class='hunk'>@@ -2852,6 +3147,20 @@ int ata_eh_recover(struct ata_port *ap, ata_prereset_fn_t prereset,</div><div class='ctx'> 			ehc-&gt;i.flags &amp;= ~ATA_EHI_SETMODE;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		/* If reset has been issued, clear UA to avoid</div><div class='add'>+		 * disrupting the current users of the device.</div><div class='add'>+		 */</div><div class='add'>+		if (ehc-&gt;i.flags &amp; ATA_EHI_DID_RESET) {</div><div class='add'>+			ata_link_for_each_dev(dev, link) {</div><div class='add'>+				if (dev-&gt;class != ATA_DEV_ATAPI)</div><div class='add'>+					continue;</div><div class='add'>+				rc = atapi_eh_clear_ua(dev);</div><div class='add'>+				if (rc)</div><div class='add'>+					goto dev_fail;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* configure link power saving */</div><div class='ctx'> 		if (ehc-&gt;i.action &amp; ATA_EH_LPM)</div><div class='ctx'> 			ata_link_for_each_dev(dev, link)</div><div class='ctx'> 				ata_dev_enable_pm(dev, ap-&gt;pm_policy);</div><div class='head'>diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c<br/>index b9d3ba423cb2..5d312dc9be9f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ata/libata-scsi.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ata/libata-scsi.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ata/libata-scsi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ata/libata-scsi.c</a></div><div class='hunk'>@@ -183,6 +183,105 @@ DEVICE_ATTR(link_power_management_policy, S_IRUGO | S_IWUSR,</div><div class='ctx'> 		ata_scsi_lpm_show, ata_scsi_lpm_put);</div><div class='ctx'> EXPORT_SYMBOL_GPL(dev_attr_link_power_management_policy);</div><div class='ctx'> </div><div class='add'>+static ssize_t ata_scsi_park_show(struct device *device,</div><div class='add'>+				  struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct scsi_device *sdev = to_scsi_device(device);</div><div class='add'>+	struct ata_port *ap;</div><div class='add'>+	struct ata_link *link;</div><div class='add'>+	struct ata_device *dev;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	unsigned int uninitialized_var(msecs);</div><div class='add'>+	int rc = 0;</div><div class='add'>+</div><div class='add'>+	ap = ata_shost_to_port(sdev-&gt;host);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(ap-&gt;lock, flags);</div><div class='add'>+	dev = ata_scsi_find_dev(ap, sdev);</div><div class='add'>+	if (!dev) {</div><div class='add'>+		rc = -ENODEV;</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+	if (dev-&gt;flags &amp; ATA_DFLAG_NO_UNLOAD) {</div><div class='add'>+		rc = -EOPNOTSUPP;</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	link = dev-&gt;link;</div><div class='add'>+	if (ap-&gt;pflags &amp; ATA_PFLAG_EH_IN_PROGRESS &amp;&amp;</div><div class='add'>+	    link-&gt;eh_context.unloaded_mask &amp; (1 &lt;&lt; dev-&gt;devno) &amp;&amp;</div><div class='add'>+	    time_after(dev-&gt;unpark_deadline, jiffies))</div><div class='add'>+		msecs = jiffies_to_msecs(dev-&gt;unpark_deadline - jiffies);</div><div class='add'>+	else</div><div class='add'>+		msecs = 0;</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	spin_unlock_irq(ap-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return rc ? rc : snprintf(buf, 20, "%u\n", msecs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t ata_scsi_park_store(struct device *device,</div><div class='add'>+				   struct device_attribute *attr,</div><div class='add'>+				   const char *buf, size_t len)</div><div class='add'>+{</div><div class='add'>+	struct scsi_device *sdev = to_scsi_device(device);</div><div class='add'>+	struct ata_port *ap;</div><div class='add'>+	struct ata_device *dev;</div><div class='add'>+	long int input;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = strict_strtol(buf, 10, &amp;input);</div><div class='add'>+	if (rc || input &lt; -2)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (input &gt; ATA_TMOUT_MAX_PARK) {</div><div class='add'>+		rc = -EOVERFLOW;</div><div class='add'>+		input = ATA_TMOUT_MAX_PARK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ap = ata_shost_to_port(sdev-&gt;host);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(ap-&gt;lock, flags);</div><div class='add'>+	dev = ata_scsi_find_dev(ap, sdev);</div><div class='add'>+	if (unlikely(!dev)) {</div><div class='add'>+		rc = -ENODEV;</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+	if (dev-&gt;class != ATA_DEV_ATA) {</div><div class='add'>+		rc = -EOPNOTSUPP;</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (input &gt;= 0) {</div><div class='add'>+		if (dev-&gt;flags &amp; ATA_DFLAG_NO_UNLOAD) {</div><div class='add'>+			rc = -EOPNOTSUPP;</div><div class='add'>+			goto unlock;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		dev-&gt;unpark_deadline = ata_deadline(jiffies, input);</div><div class='add'>+		dev-&gt;link-&gt;eh_info.dev_action[dev-&gt;devno] |= ATA_EH_PARK;</div><div class='add'>+		ata_port_schedule_eh(ap);</div><div class='add'>+		complete(&amp;ap-&gt;park_req_pending);</div><div class='add'>+	} else {</div><div class='add'>+		switch (input) {</div><div class='add'>+		case -1:</div><div class='add'>+			dev-&gt;flags &amp;= ~ATA_DFLAG_NO_UNLOAD;</div><div class='add'>+			break;</div><div class='add'>+		case -2:</div><div class='add'>+			dev-&gt;flags |= ATA_DFLAG_NO_UNLOAD;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+unlock:</div><div class='add'>+	spin_unlock_irqrestore(ap-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	return rc ? rc : len;</div><div class='add'>+}</div><div class='add'>+DEVICE_ATTR(unload_heads, S_IRUGO | S_IWUSR,</div><div class='add'>+	    ata_scsi_park_show, ata_scsi_park_store);</div><div class='add'>+EXPORT_SYMBOL_GPL(dev_attr_unload_heads);</div><div class='add'>+</div><div class='ctx'> static void ata_scsi_set_sense(struct scsi_cmnd *cmd, u8 sk, u8 asc, u8 ascq)</div><div class='ctx'> {</div><div class='ctx'> 	cmd-&gt;result = (DRIVER_SENSE &lt;&lt; 24) | SAM_STAT_CHECK_CONDITION;</div><div class='hunk'>@@ -269,6 +368,12 @@ DEVICE_ATTR(sw_activity, S_IWUGO | S_IRUGO, ata_scsi_activity_show,</div><div class='ctx'> 			ata_scsi_activity_store);</div><div class='ctx'> EXPORT_SYMBOL_GPL(dev_attr_sw_activity);</div><div class='ctx'> </div><div class='add'>+struct device_attribute *ata_common_sdev_attrs[] = {</div><div class='add'>+	&amp;dev_attr_unload_heads,</div><div class='add'>+	NULL</div><div class='add'>+};</div><div class='add'>+EXPORT_SYMBOL_GPL(ata_common_sdev_attrs);</div><div class='add'>+</div><div class='ctx'> static void ata_scsi_invalid_field(struct scsi_cmnd *cmd,</div><div class='ctx'> 				   void (*done)(struct scsi_cmnd *))</div><div class='ctx'> {</div><div class='hunk'>@@ -398,7 +503,7 @@ int ata_cmd_ioctl(struct scsi_device *scsidev, void __user *arg)</div><div class='ctx'> 	scsi_cmd[0] = ATA_16;</div><div class='ctx'> </div><div class='ctx'> 	scsi_cmd[4] = args[2];</div><div class='del'>-	if (args[0] == WIN_SMART) { /* hack -- ide driver does this too... */</div><div class='add'>+	if (args[0] == ATA_CMD_SMART) { /* hack -- ide driver does this too */</div><div class='ctx'> 		scsi_cmd[6]  = args[3];</div><div class='ctx'> 		scsi_cmd[8]  = args[1];</div><div class='ctx'> 		scsi_cmd[10] = 0x4f;</div><div class='hunk'>@@ -954,6 +1059,9 @@ static int atapi_drain_needed(struct request *rq)</div><div class='ctx'> static int ata_scsi_dev_config(struct scsi_device *sdev,</div><div class='ctx'> 			       struct ata_device *dev)</div><div class='ctx'> {</div><div class='add'>+	if (!ata_id_has_unload(dev-&gt;id))</div><div class='add'>+		dev-&gt;flags |= ATA_DFLAG_NO_UNLOAD;</div><div class='add'>+</div><div class='ctx'> 	/* configure max sectors */</div><div class='ctx'> 	blk_queue_max_sectors(sdev-&gt;request_queue, dev-&gt;max_sectors);</div><div class='ctx'> </div><div class='hunk'>@@ -977,6 +1085,10 @@ static int ata_scsi_dev_config(struct scsi_device *sdev,</div><div class='ctx'> </div><div class='ctx'> 		blk_queue_dma_drain(q, atapi_drain_needed, buf, ATAPI_MAX_DRAIN);</div><div class='ctx'> 	} else {</div><div class='add'>+		if (ata_id_is_ssd(dev-&gt;id))</div><div class='add'>+			queue_flag_set_unlocked(QUEUE_FLAG_NONROT,</div><div class='add'>+						sdev-&gt;request_queue);</div><div class='add'>+</div><div class='ctx'> 		/* ATA devices must be sector aligned */</div><div class='ctx'> 		blk_queue_update_dma_alignment(sdev-&gt;request_queue,</div><div class='ctx'> 					       ATA_SECT_SIZE - 1);</div><div class='head'>diff --git a/drivers/ata/libata.h b/drivers/ata/libata.h<br/>index ade5c75b6144..fe2839e58774 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ata/libata.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ata/libata.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ata/libata.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ata/libata.h</a></div><div class='hunk'>@@ -70,6 +70,7 @@ extern int atapi_passthru16;</div><div class='ctx'> extern int libata_fua;</div><div class='ctx'> extern int libata_noacpi;</div><div class='ctx'> extern int libata_allow_tpm;</div><div class='add'>+extern struct ata_link *ata_dev_phys_link(struct ata_device *dev);</div><div class='ctx'> extern void ata_force_cbl(struct ata_port *ap);</div><div class='ctx'> extern u64 ata_tf_to_lba(const struct ata_taskfile *tf);</div><div class='ctx'> extern u64 ata_tf_to_lba48(const struct ata_taskfile *tf);</div><div class='hunk'>@@ -107,6 +108,8 @@ extern void ata_qc_issue(struct ata_queued_cmd *qc);</div><div class='ctx'> extern void __ata_qc_complete(struct ata_queued_cmd *qc);</div><div class='ctx'> extern int atapi_check_dma(struct ata_queued_cmd *qc);</div><div class='ctx'> extern void swap_buf_le16(u16 *buf, unsigned int buf_words);</div><div class='add'>+extern bool ata_phys_link_online(struct ata_link *link);</div><div class='add'>+extern bool ata_phys_link_offline(struct ata_link *link);</div><div class='ctx'> extern void ata_dev_init(struct ata_device *dev);</div><div class='ctx'> extern void ata_link_init(struct ata_port *ap, struct ata_link *link, int pmp);</div><div class='ctx'> extern int sata_link_init_spd(struct ata_link *link);</div><div class='hunk'>@@ -152,7 +155,7 @@ extern int ata_bus_probe(struct ata_port *ap);</div><div class='ctx'> /* libata-eh.c */</div><div class='ctx'> extern unsigned long ata_internal_cmd_timeout(struct ata_device *dev, u8 cmd);</div><div class='ctx'> extern void ata_internal_cmd_timed_out(struct ata_device *dev, u8 cmd);</div><div class='del'>-extern enum scsi_eh_timer_return ata_scsi_timed_out(struct scsi_cmnd *cmd);</div><div class='add'>+extern enum blk_eh_timer_return ata_scsi_timed_out(struct scsi_cmnd *cmd);</div><div class='ctx'> extern void ata_scsi_error(struct Scsi_Host *host);</div><div class='ctx'> extern void ata_port_wait_eh(struct ata_port *ap);</div><div class='ctx'> extern void ata_eh_fastdrain_timerfn(unsigned long arg);</div><div class='head'>diff --git a/drivers/ata/pata_bf54x.c b/drivers/ata/pata_bf54x.c<br/>index d3932901a3b3..1266924c11f9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ata/pata_bf54x.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ata/pata_bf54x.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ata/pata_bf54x.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ata/pata_bf54x.c</a></div><div class='hunk'>@@ -1632,6 +1632,8 @@ static int __devinit bfin_atapi_probe(struct platform_device *pdev)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	dev_set_drvdata(&amp;pdev-&gt;dev, host);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1648,6 +1650,7 @@ static int __devexit bfin_atapi_remove(struct platform_device *pdev)</div><div class='ctx'> 	struct ata_host *host = dev_get_drvdata(dev);</div><div class='ctx'> </div><div class='ctx'> 	ata_host_detach(host);</div><div class='add'>+	dev_set_drvdata(&amp;pdev-&gt;dev, NULL);</div><div class='ctx'> </div><div class='ctx'> 	peripheral_free_list(atapi_io_port);</div><div class='ctx'> </div><div class='hunk'>@@ -1655,27 +1658,44 @@ static int __devexit bfin_atapi_remove(struct platform_device *pdev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PM</div><div class='del'>-int bfin_atapi_suspend(struct platform_device *pdev, pm_message_t state)</div><div class='add'>+static int bfin_atapi_suspend(struct platform_device *pdev, pm_message_t state)</div><div class='ctx'> {</div><div class='del'>-	return 0;</div><div class='add'>+	struct ata_host *host = dev_get_drvdata(&amp;pdev-&gt;dev);</div><div class='add'>+	if (host)</div><div class='add'>+		return ata_host_suspend(host, state);</div><div class='add'>+	else</div><div class='add'>+		return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int bfin_atapi_resume(struct platform_device *pdev)</div><div class='add'>+static int bfin_atapi_resume(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='add'>+	struct ata_host *host = dev_get_drvdata(&amp;pdev-&gt;dev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (host) {</div><div class='add'>+		ret = bfin_reset_controller(host);</div><div class='add'>+		if (ret) {</div><div class='add'>+			printk(KERN_ERR DRV_NAME ": Error during HW init\n");</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+		ata_host_resume(host);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+#else</div><div class='add'>+#define bfin_atapi_suspend NULL</div><div class='add'>+#define bfin_atapi_resume NULL</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static struct platform_driver bfin_atapi_driver = {</div><div class='ctx'> 	.probe			= bfin_atapi_probe,</div><div class='ctx'> 	.remove			= __devexit_p(bfin_atapi_remove),</div><div class='add'>+	.suspend		= bfin_atapi_suspend,</div><div class='add'>+	.resume			= bfin_atapi_resume,</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		.name		= DRV_NAME,</div><div class='ctx'> 		.owner		= THIS_MODULE,</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-		.suspend	= bfin_atapi_suspend,</div><div class='del'>-		.resume		= bfin_atapi_resume,</div><div class='del'>-#endif</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/ata/pata_of_platform.c b/drivers/ata/pata_of_platform.c<br/>index 408da30594c4..1f18ad9e4fe1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ata/pata_of_platform.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ata/pata_of_platform.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ata/pata_of_platform.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ata/pata_of_platform.c</a></div><div class='hunk'>@@ -52,7 +52,7 @@ static int __devinit pata_of_platform_probe(struct of_device *ofdev,</div><div class='ctx'> </div><div class='ctx'> 	ret = of_irq_to_resource(dn, 0, &amp;irq_res);</div><div class='ctx'> 	if (ret == NO_IRQ)</div><div class='del'>-		irq_res.start = irq_res.end = -1;</div><div class='add'>+		irq_res.start = irq_res.end = 0;</div><div class='ctx'> 	else</div><div class='ctx'> 		irq_res.flags = 0;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/ata/pata_pcmcia.c b/drivers/ata/pata_pcmcia.c<br/>index 41b4361bbf6e..02b596b9cf6a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ata/pata_pcmcia.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ata/pata_pcmcia.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ata/pata_pcmcia.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ata/pata_pcmcia.c</a></div><div class='hunk'>@@ -148,6 +148,64 @@ static struct ata_port_operations pcmcia_8bit_port_ops = {</div><div class='ctx'> #define CS_CHECK(fn, ret) \</div><div class='ctx'> do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+struct pcmcia_config_check {</div><div class='add'>+	unsigned long ctl_base;</div><div class='add'>+	int skip_vcc;</div><div class='add'>+	int is_kme;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int pcmcia_check_one_config(struct pcmcia_device *pdev,</div><div class='add'>+				   cistpl_cftable_entry_t *cfg,</div><div class='add'>+				   cistpl_cftable_entry_t *dflt,</div><div class='add'>+				   unsigned int vcc,</div><div class='add'>+				   void *priv_data)</div><div class='add'>+{</div><div class='add'>+	struct pcmcia_config_check *stk = priv_data;</div><div class='add'>+</div><div class='add'>+	/* Check for matching Vcc, unless we're desperate */</div><div class='add'>+	if (!stk-&gt;skip_vcc) {</div><div class='add'>+		if (cfg-&gt;vcc.present &amp; (1 &lt;&lt; CISTPL_POWER_VNOM)) {</div><div class='add'>+			if (vcc != cfg-&gt;vcc.param[CISTPL_POWER_VNOM] / 10000)</div><div class='add'>+				return -ENODEV;</div><div class='add'>+		} else if (dflt-&gt;vcc.present &amp; (1 &lt;&lt; CISTPL_POWER_VNOM)) {</div><div class='add'>+			if (vcc != dflt-&gt;vcc.param[CISTPL_POWER_VNOM] / 10000)</div><div class='add'>+				return -ENODEV;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cfg-&gt;vpp1.present &amp; (1 &lt;&lt; CISTPL_POWER_VNOM))</div><div class='add'>+		pdev-&gt;conf.Vpp = cfg-&gt;vpp1.param[CISTPL_POWER_VNOM] / 10000;</div><div class='add'>+	else if (dflt-&gt;vpp1.present &amp; (1 &lt;&lt; CISTPL_POWER_VNOM))</div><div class='add'>+		pdev-&gt;conf.Vpp = dflt-&gt;vpp1.param[CISTPL_POWER_VNOM] / 10000;</div><div class='add'>+</div><div class='add'>+	if ((cfg-&gt;io.nwin &gt; 0) || (dflt-&gt;io.nwin &gt; 0)) {</div><div class='add'>+		cistpl_io_t *io = (cfg-&gt;io.nwin) ? &amp;cfg-&gt;io : &amp;dflt-&gt;io;</div><div class='add'>+		pdev-&gt;io.BasePort1 = io-&gt;win[0].base;</div><div class='add'>+		pdev-&gt;io.IOAddrLines = io-&gt;flags &amp; CISTPL_IO_LINES_MASK;</div><div class='add'>+		if (!(io-&gt;flags &amp; CISTPL_IO_16BIT))</div><div class='add'>+			pdev-&gt;io.Attributes1 = IO_DATA_PATH_WIDTH_8;</div><div class='add'>+		if (io-&gt;nwin == 2) {</div><div class='add'>+			pdev-&gt;io.NumPorts1 = 8;</div><div class='add'>+			pdev-&gt;io.BasePort2 = io-&gt;win[1].base;</div><div class='add'>+			pdev-&gt;io.NumPorts2 = (stk-&gt;is_kme) ? 2 : 1;</div><div class='add'>+			if (pcmcia_request_io(pdev, &amp;pdev-&gt;io) != 0)</div><div class='add'>+				return -ENODEV;</div><div class='add'>+			stk-&gt;ctl_base = pdev-&gt;io.BasePort2;</div><div class='add'>+		} else if ((io-&gt;nwin == 1) &amp;&amp; (io-&gt;win[0].len &gt;= 16)) {</div><div class='add'>+			pdev-&gt;io.NumPorts1 = io-&gt;win[0].len;</div><div class='add'>+			pdev-&gt;io.NumPorts2 = 0;</div><div class='add'>+			if (pcmcia_request_io(pdev, &amp;pdev-&gt;io) != 0)</div><div class='add'>+				return -ENODEV;</div><div class='add'>+			stk-&gt;ctl_base = pdev-&gt;io.BasePort1 + 0x0e;</div><div class='add'>+		} else</div><div class='add'>+			return -ENODEV;</div><div class='add'>+		/* If we've got this far, we're done */</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  *	pcmcia_init_one		-	attach a PCMCIA interface</div><div class='ctx'>  *	@pdev: pcmcia device</div><div class='hunk'>@@ -161,19 +219,11 @@ static int pcmcia_init_one(struct pcmcia_device *pdev)</div><div class='ctx'> 	struct ata_host *host;</div><div class='ctx'> 	struct ata_port *ap;</div><div class='ctx'> 	struct ata_pcmcia_info *info;</div><div class='del'>-	tuple_t tuple;</div><div class='del'>-	struct {</div><div class='del'>-		unsigned short buf[128];</div><div class='del'>-		cisparse_t parse;</div><div class='del'>-		config_info_t conf;</div><div class='del'>-		cistpl_cftable_entry_t dflt;</div><div class='del'>-	} *stk = NULL;</div><div class='del'>-	cistpl_cftable_entry_t *cfg;</div><div class='del'>-	int pass, last_ret = 0, last_fn = 0, is_kme = 0, ret = -ENOMEM, p;</div><div class='add'>+	struct pcmcia_config_check *stk = NULL;</div><div class='add'>+	int last_ret = 0, last_fn = 0, is_kme = 0, ret = -ENOMEM, p;</div><div class='ctx'> 	unsigned long io_base, ctl_base;</div><div class='ctx'> 	void __iomem *io_addr, *ctl_addr;</div><div class='ctx'> 	int n_ports = 1;</div><div class='del'>-</div><div class='ctx'> 	struct ata_port_operations *ops = &amp;pcmcia_port_ops;</div><div class='ctx'> </div><div class='ctx'> 	info = kzalloc(sizeof(*info), GFP_KERNEL);</div><div class='hunk'>@@ -193,96 +243,27 @@ static int pcmcia_init_one(struct pcmcia_device *pdev)</div><div class='ctx'> 	pdev-&gt;conf.Attributes = CONF_ENABLE_IRQ;</div><div class='ctx'> 	pdev-&gt;conf.IntType = INT_MEMORY_AND_IO;</div><div class='ctx'> </div><div class='del'>-	/* Allocate resoure probing structures */</div><div class='del'>-</div><div class='del'>-	stk = kzalloc(sizeof(*stk), GFP_KERNEL);</div><div class='del'>-	if (!stk)</div><div class='del'>-		goto out1;</div><div class='del'>-</div><div class='del'>-	cfg = &amp;stk-&gt;parse.cftable_entry;</div><div class='del'>-</div><div class='del'>-	/* Tuples we are walking */</div><div class='del'>-	tuple.TupleData = (cisdata_t *)&amp;stk-&gt;buf;</div><div class='del'>-	tuple.TupleOffset = 0;</div><div class='del'>-	tuple.TupleDataMax = 255;</div><div class='del'>-	tuple.Attributes = 0;</div><div class='del'>-</div><div class='ctx'> 	/* See if we have a manufacturer identifier. Use it to set is_kme for</div><div class='ctx'> 	   vendor quirks */</div><div class='ctx'> 	is_kme = ((pdev-&gt;manf_id == MANFID_KME) &amp;&amp;</div><div class='ctx'> 		  ((pdev-&gt;card_id == PRODID_KME_KXLC005_A) ||</div><div class='ctx'> 		   (pdev-&gt;card_id == PRODID_KME_KXLC005_B)));</div><div class='ctx'> </div><div class='del'>-	/* Not sure if this is right... look up the current Vcc */</div><div class='del'>-	CS_CHECK(GetConfigurationInfo, pcmcia_get_configuration_info(pdev, &amp;stk-&gt;conf));</div><div class='del'>-/*	link-&gt;conf.Vcc = stk-&gt;conf.Vcc; */</div><div class='del'>-</div><div class='del'>-	pass = io_base = ctl_base = 0;</div><div class='del'>-	tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;</div><div class='del'>-	tuple.Attributes = 0;</div><div class='del'>-	CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(pdev, &amp;tuple));</div><div class='del'>-</div><div class='del'>-	/* Now munch the resources looking for a suitable set */</div><div class='del'>-	while (1) {</div><div class='del'>-		if (pcmcia_get_tuple_data(pdev, &amp;tuple) != 0)</div><div class='del'>-			goto next_entry;</div><div class='del'>-		if (pcmcia_parse_tuple(pdev, &amp;tuple, &amp;stk-&gt;parse) != 0)</div><div class='del'>-			goto next_entry;</div><div class='del'>-		/* Check for matching Vcc, unless we're desperate */</div><div class='del'>-		if (!pass) {</div><div class='del'>-			if (cfg-&gt;vcc.present &amp; (1 &lt;&lt; CISTPL_POWER_VNOM)) {</div><div class='del'>-				if (stk-&gt;conf.Vcc != cfg-&gt;vcc.param[CISTPL_POWER_VNOM] / 10000)</div><div class='del'>-					goto next_entry;</div><div class='del'>-			} else if (stk-&gt;dflt.vcc.present &amp; (1 &lt;&lt; CISTPL_POWER_VNOM)) {</div><div class='del'>-				if (stk-&gt;conf.Vcc != stk-&gt;dflt.vcc.param[CISTPL_POWER_VNOM] / 10000)</div><div class='del'>-					goto next_entry;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='add'>+	/* Allocate resoure probing structures */</div><div class='ctx'> </div><div class='del'>-		if (cfg-&gt;vpp1.present &amp; (1 &lt;&lt; CISTPL_POWER_VNOM))</div><div class='del'>-			pdev-&gt;conf.Vpp = cfg-&gt;vpp1.param[CISTPL_POWER_VNOM] / 10000;</div><div class='del'>-		else if (stk-&gt;dflt.vpp1.present &amp; (1 &lt;&lt; CISTPL_POWER_VNOM))</div><div class='del'>-			pdev-&gt;conf.Vpp = stk-&gt;dflt.vpp1.param[CISTPL_POWER_VNOM] / 10000;</div><div class='del'>-</div><div class='del'>-		if ((cfg-&gt;io.nwin &gt; 0) || (stk-&gt;dflt.io.nwin &gt; 0)) {</div><div class='del'>-			cistpl_io_t *io = (cfg-&gt;io.nwin) ? &amp;cfg-&gt;io : &amp;stk-&gt;dflt.io;</div><div class='del'>-			pdev-&gt;conf.ConfigIndex = cfg-&gt;index;</div><div class='del'>-			pdev-&gt;io.BasePort1 = io-&gt;win[0].base;</div><div class='del'>-			pdev-&gt;io.IOAddrLines = io-&gt;flags &amp; CISTPL_IO_LINES_MASK;</div><div class='del'>-			if (!(io-&gt;flags &amp; CISTPL_IO_16BIT))</div><div class='del'>-				pdev-&gt;io.Attributes1 = IO_DATA_PATH_WIDTH_8;</div><div class='del'>-			if (io-&gt;nwin == 2) {</div><div class='del'>-				pdev-&gt;io.NumPorts1 = 8;</div><div class='del'>-				pdev-&gt;io.BasePort2 = io-&gt;win[1].base;</div><div class='del'>-				pdev-&gt;io.NumPorts2 = (is_kme) ? 2 : 1;</div><div class='del'>-				if (pcmcia_request_io(pdev, &amp;pdev-&gt;io) != 0)</div><div class='del'>-					goto next_entry;</div><div class='del'>-				io_base = pdev-&gt;io.BasePort1;</div><div class='del'>-				ctl_base = pdev-&gt;io.BasePort2;</div><div class='del'>-			} else if ((io-&gt;nwin == 1) &amp;&amp; (io-&gt;win[0].len &gt;= 16)) {</div><div class='del'>-				pdev-&gt;io.NumPorts1 = io-&gt;win[0].len;</div><div class='del'>-				pdev-&gt;io.NumPorts2 = 0;</div><div class='del'>-				if (pcmcia_request_io(pdev, &amp;pdev-&gt;io) != 0)</div><div class='del'>-					goto next_entry;</div><div class='del'>-				io_base = pdev-&gt;io.BasePort1;</div><div class='del'>-				ctl_base = pdev-&gt;io.BasePort1 + 0x0e;</div><div class='del'>-			} else</div><div class='del'>-				goto next_entry;</div><div class='del'>-			/* If we've got this far, we're done */</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-next_entry:</div><div class='del'>-		if (cfg-&gt;flags &amp; CISTPL_CFTABLE_DEFAULT)</div><div class='del'>-			memcpy(&amp;stk-&gt;dflt, cfg, sizeof(stk-&gt;dflt));</div><div class='del'>-		if (pass) {</div><div class='del'>-			CS_CHECK(GetNextTuple, pcmcia_get_next_tuple(pdev, &amp;tuple));</div><div class='del'>-		} else if (pcmcia_get_next_tuple(pdev, &amp;tuple) != 0) {</div><div class='del'>-			CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(pdev, &amp;tuple));</div><div class='del'>-			memset(&amp;stk-&gt;dflt, 0, sizeof(stk-&gt;dflt));</div><div class='del'>-			pass++;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	stk = kzalloc(sizeof(*stk), GFP_KERNEL);</div><div class='add'>+	if (!stk)</div><div class='add'>+		goto out1;</div><div class='add'>+	stk-&gt;is_kme = is_kme;</div><div class='add'>+	stk-&gt;skip_vcc = io_base = ctl_base = 0;</div><div class='ctx'> </div><div class='add'>+	if (pcmcia_loop_config(pdev, pcmcia_check_one_config, stk)) {</div><div class='add'>+		stk-&gt;skip_vcc = 1;</div><div class='add'>+		if (pcmcia_loop_config(pdev, pcmcia_check_one_config, stk))</div><div class='add'>+			goto failed; /* No suitable config found */</div><div class='add'>+	}</div><div class='add'>+	io_base = pdev-&gt;io.BasePort1;</div><div class='add'>+	ctl_base = stk-&gt;ctl_base;</div><div class='ctx'> 	CS_CHECK(RequestIRQ, pcmcia_request_irq(pdev, &amp;pdev-&gt;irq));</div><div class='ctx'> 	CS_CHECK(RequestConfiguration, pcmcia_request_configuration(pdev, &amp;pdev-&gt;conf));</div><div class='ctx'> </div><div class='hunk'>@@ -384,6 +365,7 @@ static struct pcmcia_device_id pcmcia_devices[] = {</div><div class='ctx'> 	PCMCIA_DEVICE_MANF_CARD(0x0032, 0x0704),</div><div class='ctx'> 	PCMCIA_DEVICE_MANF_CARD(0x0032, 0x2904),</div><div class='ctx'> 	PCMCIA_DEVICE_MANF_CARD(0x0045, 0x0401),	/* SanDisk CFA */</div><div class='add'>+	PCMCIA_DEVICE_MANF_CARD(0x004f, 0x0000),	/* Kingston */</div><div class='ctx'> 	PCMCIA_DEVICE_MANF_CARD(0x0097, 0x1620), 	/* TI emulated */</div><div class='ctx'> 	PCMCIA_DEVICE_MANF_CARD(0x0098, 0x0000),	/* Toshiba */</div><div class='ctx'> 	PCMCIA_DEVICE_MANF_CARD(0x00a4, 0x002d),</div><div class='hunk'>@@ -404,9 +386,9 @@ static struct pcmcia_device_id pcmcia_devices[] = {</div><div class='ctx'> 	PCMCIA_DEVICE_PROD_ID12("EXP   ", "CD-ROM", 0x0a5c52fd, 0x66536591),</div><div class='ctx'> 	PCMCIA_DEVICE_PROD_ID12("EXP   ", "PnPIDE", 0x0a5c52fd, 0x0c694728),</div><div class='ctx'> 	PCMCIA_DEVICE_PROD_ID12("FREECOM", "PCCARD-IDE", 0x5714cbf7, 0x48e0ab8e),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID12("Hyperstone", "Model1", 0x3d5b9ef5, 0xca6ab420),</div><div class='ctx'> 	PCMCIA_DEVICE_PROD_ID12("HITACHI", "FLASH", 0xf4f43949, 0x9eb86aae),</div><div class='ctx'> 	PCMCIA_DEVICE_PROD_ID12("HITACHI", "microdrive", 0xf4f43949, 0xa6d76178),</div><div class='add'>+	PCMCIA_DEVICE_PROD_ID12("Hyperstone", "Model1", 0x3d5b9ef5, 0xca6ab420),</div><div class='ctx'> 	PCMCIA_DEVICE_PROD_ID12("IBM", "microdrive", 0xb569a6e5, 0xa6d76178),</div><div class='ctx'> 	PCMCIA_DEVICE_PROD_ID12("IBM", "IBM17JSSFP20", 0xb569a6e5, 0xf2508753),</div><div class='ctx'> 	PCMCIA_DEVICE_PROD_ID12("KINGSTON", "CF8GB", 0x2e6d1829, 0xacbe682e),</div><div class='head'>diff --git a/drivers/ata/pata_sil680.c b/drivers/ata/pata_sil680.c<br/>index e970b227fbce..a598bb36aafc 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ata/pata_sil680.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ata/pata_sil680.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ata/pata_sil680.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ata/pata_sil680.c</a></div><div class='hunk'>@@ -230,7 +230,7 @@ static u8 sil680_init_chip(struct pci_dev *pdev, int *try_mmio)</div><div class='ctx'> 		tmpbyte &amp; 1, tmpbyte &amp; 0x30);</div><div class='ctx'> </div><div class='ctx'> 	*try_mmio = 0;</div><div class='del'>-#ifdef CONFIG_PPC_MERGE</div><div class='add'>+#ifdef CONFIG_PPC</div><div class='ctx'> 	if (machine_is(cell))</div><div class='ctx'> 		*try_mmio = (tmpbyte &amp; 1) || pci_resource_start(pdev, 5);</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/ata/sata_fsl.c b/drivers/ata/sata_fsl.c<br/>index 3924e7209a44..1a56db92ff7a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ata/sata_fsl.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ata/sata_fsl.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ata/sata_fsl.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ata/sata_fsl.c</a></div><div class='hunk'>@@ -469,10 +469,10 @@ static bool sata_fsl_qc_fill_rtf(struct ata_queued_cmd *qc)</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int sata_fsl_scr_write(struct ata_port *ap, unsigned int sc_reg_in,</div><div class='del'>-			       u32 val)</div><div class='add'>+static int sata_fsl_scr_write(struct ata_link *link,</div><div class='add'>+			      unsigned int sc_reg_in, u32 val)</div><div class='ctx'> {</div><div class='del'>-	struct sata_fsl_host_priv *host_priv = ap-&gt;host-&gt;private_data;</div><div class='add'>+	struct sata_fsl_host_priv *host_priv = link-&gt;ap-&gt;host-&gt;private_data;</div><div class='ctx'> 	void __iomem *ssr_base = host_priv-&gt;ssr_base;</div><div class='ctx'> 	unsigned int sc_reg;</div><div class='ctx'> </div><div class='hunk'>@@ -493,10 +493,10 @@ static int sata_fsl_scr_write(struct ata_port *ap, unsigned int sc_reg_in,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int sata_fsl_scr_read(struct ata_port *ap, unsigned int sc_reg_in,</div><div class='del'>-			u32 *val)</div><div class='add'>+static int sata_fsl_scr_read(struct ata_link *link,</div><div class='add'>+			     unsigned int sc_reg_in, u32 *val)</div><div class='ctx'> {</div><div class='del'>-	struct sata_fsl_host_priv *host_priv = ap-&gt;host-&gt;private_data;</div><div class='add'>+	struct sata_fsl_host_priv *host_priv = link-&gt;ap-&gt;host-&gt;private_data;</div><div class='ctx'> 	void __iomem *ssr_base = host_priv-&gt;ssr_base;</div><div class='ctx'> 	unsigned int sc_reg;</div><div class='ctx'> </div><div class='hunk'>@@ -645,12 +645,12 @@ static int sata_fsl_port_start(struct ata_port *ap)</div><div class='ctx'> 	 * Workaround for 8315DS board 3gbps link-up issue,</div><div class='ctx'> 	 * currently limit SATA port to GEN1 speed</div><div class='ctx'> 	 */</div><div class='del'>-	sata_fsl_scr_read(ap, SCR_CONTROL, &amp;temp);</div><div class='add'>+	sata_fsl_scr_read(&amp;ap-&gt;link, SCR_CONTROL, &amp;temp);</div><div class='ctx'> 	temp &amp;= ~(0xF &lt;&lt; 4);</div><div class='ctx'> 	temp |= (0x1 &lt;&lt; 4);</div><div class='del'>-	sata_fsl_scr_write(ap, SCR_CONTROL, temp);</div><div class='add'>+	sata_fsl_scr_write(&amp;ap-&gt;link, SCR_CONTROL, temp);</div><div class='ctx'> </div><div class='del'>-	sata_fsl_scr_read(ap, SCR_CONTROL, &amp;temp);</div><div class='add'>+	sata_fsl_scr_read(&amp;ap-&gt;link, SCR_CONTROL, &amp;temp);</div><div class='ctx'> 	dev_printk(KERN_WARNING, dev, "scr_control, speed limited to %x\n",</div><div class='ctx'> 			temp);</div><div class='ctx'> #endif</div><div class='hunk'>@@ -868,7 +868,7 @@ issue_srst:</div><div class='ctx'> 			ioread32(CQ + hcr_base),</div><div class='ctx'> 			ioread32(CA + hcr_base), ioread32(CC + hcr_base));</div><div class='ctx'> </div><div class='del'>-		sata_fsl_scr_read(ap, SCR_ERROR, &amp;Serror);</div><div class='add'>+		sata_fsl_scr_read(&amp;ap-&gt;link, SCR_ERROR, &amp;Serror);</div><div class='ctx'> </div><div class='ctx'> 		DPRINTK("HStatus = 0x%x\n", ioread32(hcr_base + HSTATUS));</div><div class='ctx'> 		DPRINTK("HControl = 0x%x\n", ioread32(hcr_base + HCONTROL));</div><div class='hunk'>@@ -972,9 +972,9 @@ static void sata_fsl_error_intr(struct ata_port *ap)</div><div class='ctx'> 	 * Handle &amp; Clear SError</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	sata_fsl_scr_read(ap, SCR_ERROR, &amp;SError);</div><div class='add'>+	sata_fsl_scr_read(&amp;ap-&gt;link, SCR_ERROR, &amp;SError);</div><div class='ctx'> 	if (unlikely(SError &amp; 0xFFFF0000)) {</div><div class='del'>-		sata_fsl_scr_write(ap, SCR_ERROR, SError);</div><div class='add'>+		sata_fsl_scr_write(&amp;ap-&gt;link, SCR_ERROR, SError);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	DPRINTK("error_intr,hStat=0x%x,CE=0x%x,DE =0x%x,SErr=0x%x\n",</div><div class='hunk'>@@ -1091,7 +1091,7 @@ static void sata_fsl_host_intr(struct ata_port *ap)</div><div class='ctx'> </div><div class='ctx'> 	hstatus = ioread32(hcr_base + HSTATUS);</div><div class='ctx'> </div><div class='del'>-	sata_fsl_scr_read(ap, SCR_ERROR, &amp;SError);</div><div class='add'>+	sata_fsl_scr_read(&amp;ap-&gt;link, SCR_ERROR, &amp;SError);</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(SError &amp; 0xFFFF0000)) {</div><div class='ctx'> 		DPRINTK("serror @host_intr : 0x%x\n", SError);</div><div class='head'>diff --git a/drivers/ata/sata_inic162x.c b/drivers/ata/sata_inic162x.c<br/>index 5032c32fa505..fbbd87c96f10 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ata/sata_inic162x.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ata/sata_inic162x.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ata/sata_inic162x.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ata/sata_inic162x.c</a></div><div class='hunk'>@@ -269,9 +269,9 @@ static void inic_reset_port(void __iomem *port_base)</div><div class='ctx'> 	writeb(0xff, port_base + PORT_IRQ_STAT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int inic_scr_read(struct ata_port *ap, unsigned sc_reg, u32 *val)</div><div class='add'>+static int inic_scr_read(struct ata_link *link, unsigned sc_reg, u32 *val)</div><div class='ctx'> {</div><div class='del'>-	void __iomem *scr_addr = inic_port_base(ap) + PORT_SCR;</div><div class='add'>+	void __iomem *scr_addr = inic_port_base(link-&gt;ap) + PORT_SCR;</div><div class='ctx'> 	void __iomem *addr;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(sc_reg &gt;= ARRAY_SIZE(scr_map)))</div><div class='hunk'>@@ -286,9 +286,9 @@ static int inic_scr_read(struct ata_port *ap, unsigned sc_reg, u32 *val)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int inic_scr_write(struct ata_port *ap, unsigned sc_reg, u32 val)</div><div class='add'>+static int inic_scr_write(struct ata_link *link, unsigned sc_reg, u32 val)</div><div class='ctx'> {</div><div class='del'>-	void __iomem *scr_addr = inic_port_base(ap) + PORT_SCR;</div><div class='add'>+	void __iomem *scr_addr = inic_port_base(link-&gt;ap) + PORT_SCR;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(sc_reg &gt;= ARRAY_SIZE(scr_map)))</div><div class='ctx'> 		return -EINVAL;</div><div class='head'>diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c<br/>index c815f8ecf6e6..2b24ae58b52e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ata/sata_mv.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ata/sata_mv.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ata/sata_mv.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ata/sata_mv.c</a></div><div class='hunk'>@@ -493,10 +493,10 @@ struct mv_hw_ops {</div><div class='ctx'> 	void (*reset_bus)(struct ata_host *host, void __iomem *mmio);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int mv_scr_read(struct ata_port *ap, unsigned int sc_reg_in, u32 *val);</div><div class='del'>-static int mv_scr_write(struct ata_port *ap, unsigned int sc_reg_in, u32 val);</div><div class='del'>-static int mv5_scr_read(struct ata_port *ap, unsigned int sc_reg_in, u32 *val);</div><div class='del'>-static int mv5_scr_write(struct ata_port *ap, unsigned int sc_reg_in, u32 val);</div><div class='add'>+static int mv_scr_read(struct ata_link *link, unsigned int sc_reg_in, u32 *val);</div><div class='add'>+static int mv_scr_write(struct ata_link *link, unsigned int sc_reg_in, u32 val);</div><div class='add'>+static int mv5_scr_read(struct ata_link *link, unsigned int sc_reg_in, u32 *val);</div><div class='add'>+static int mv5_scr_write(struct ata_link *link, unsigned int sc_reg_in, u32 val);</div><div class='ctx'> static int mv_port_start(struct ata_port *ap);</div><div class='ctx'> static void mv_port_stop(struct ata_port *ap);</div><div class='ctx'> static int mv_qc_defer(struct ata_queued_cmd *qc);</div><div class='hunk'>@@ -1070,23 +1070,23 @@ static unsigned int mv_scr_offset(unsigned int sc_reg_in)</div><div class='ctx'> 	return ofs;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mv_scr_read(struct ata_port *ap, unsigned int sc_reg_in, u32 *val)</div><div class='add'>+static int mv_scr_read(struct ata_link *link, unsigned int sc_reg_in, u32 *val)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int ofs = mv_scr_offset(sc_reg_in);</div><div class='ctx'> </div><div class='ctx'> 	if (ofs != 0xffffffffU) {</div><div class='del'>-		*val = readl(mv_ap_base(ap) + ofs);</div><div class='add'>+		*val = readl(mv_ap_base(link-&gt;ap) + ofs);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	} else</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mv_scr_write(struct ata_port *ap, unsigned int sc_reg_in, u32 val)</div><div class='add'>+static int mv_scr_write(struct ata_link *link, unsigned int sc_reg_in, u32 val)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int ofs = mv_scr_offset(sc_reg_in);</div><div class='ctx'> </div><div class='ctx'> 	if (ofs != 0xffffffffU) {</div><div class='del'>-		writelfl(val, mv_ap_base(ap) + ofs);</div><div class='add'>+		writelfl(val, mv_ap_base(link-&gt;ap) + ofs);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	} else</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -2251,11 +2251,11 @@ static unsigned int mv5_scr_offset(unsigned int sc_reg_in)</div><div class='ctx'> 	return ofs;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mv5_scr_read(struct ata_port *ap, unsigned int sc_reg_in, u32 *val)</div><div class='add'>+static int mv5_scr_read(struct ata_link *link, unsigned int sc_reg_in, u32 *val)</div><div class='ctx'> {</div><div class='del'>-	struct mv_host_priv *hpriv = ap-&gt;host-&gt;private_data;</div><div class='add'>+	struct mv_host_priv *hpriv = link-&gt;ap-&gt;host-&gt;private_data;</div><div class='ctx'> 	void __iomem *mmio = hpriv-&gt;base;</div><div class='del'>-	void __iomem *addr = mv5_phy_base(mmio, ap-&gt;port_no);</div><div class='add'>+	void __iomem *addr = mv5_phy_base(mmio, link-&gt;ap-&gt;port_no);</div><div class='ctx'> 	unsigned int ofs = mv5_scr_offset(sc_reg_in);</div><div class='ctx'> </div><div class='ctx'> 	if (ofs != 0xffffffffU) {</div><div class='hunk'>@@ -2265,11 +2265,11 @@ static int mv5_scr_read(struct ata_port *ap, unsigned int sc_reg_in, u32 *val)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mv5_scr_write(struct ata_port *ap, unsigned int sc_reg_in, u32 val)</div><div class='add'>+static int mv5_scr_write(struct ata_link *link, unsigned int sc_reg_in, u32 val)</div><div class='ctx'> {</div><div class='del'>-	struct mv_host_priv *hpriv = ap-&gt;host-&gt;private_data;</div><div class='add'>+	struct mv_host_priv *hpriv = link-&gt;ap-&gt;host-&gt;private_data;</div><div class='ctx'> 	void __iomem *mmio = hpriv-&gt;base;</div><div class='del'>-	void __iomem *addr = mv5_phy_base(mmio, ap-&gt;port_no);</div><div class='add'>+	void __iomem *addr = mv5_phy_base(mmio, link-&gt;ap-&gt;port_no);</div><div class='ctx'> 	unsigned int ofs = mv5_scr_offset(sc_reg_in);</div><div class='ctx'> </div><div class='ctx'> 	if (ofs != 0xffffffffU) {</div><div class='head'>diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c<br/>index 14601dc05e41..fae3841de0d8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ata/sata_nv.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ata/sata_nv.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ata/sata_nv.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ata/sata_nv.c</a></div><div class='hunk'>@@ -302,8 +302,8 @@ static void nv_ck804_host_stop(struct ata_host *host);</div><div class='ctx'> static irqreturn_t nv_generic_interrupt(int irq, void *dev_instance);</div><div class='ctx'> static irqreturn_t nv_nf2_interrupt(int irq, void *dev_instance);</div><div class='ctx'> static irqreturn_t nv_ck804_interrupt(int irq, void *dev_instance);</div><div class='del'>-static int nv_scr_read(struct ata_port *ap, unsigned int sc_reg, u32 *val);</div><div class='del'>-static int nv_scr_write(struct ata_port *ap, unsigned int sc_reg, u32 val);</div><div class='add'>+static int nv_scr_read(struct ata_link *link, unsigned int sc_reg, u32 *val);</div><div class='add'>+static int nv_scr_write(struct ata_link *link, unsigned int sc_reg, u32 val);</div><div class='ctx'> </div><div class='ctx'> static void nv_nf2_freeze(struct ata_port *ap);</div><div class='ctx'> static void nv_nf2_thaw(struct ata_port *ap);</div><div class='hunk'>@@ -1511,21 +1511,21 @@ static irqreturn_t nv_ck804_interrupt(int irq, void *dev_instance)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int nv_scr_read(struct ata_port *ap, unsigned int sc_reg, u32 *val)</div><div class='add'>+static int nv_scr_read(struct ata_link *link, unsigned int sc_reg, u32 *val)</div><div class='ctx'> {</div><div class='ctx'> 	if (sc_reg &gt; SCR_CONTROL)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	*val = ioread32(ap-&gt;ioaddr.scr_addr + (sc_reg * 4));</div><div class='add'>+	*val = ioread32(link-&gt;ap-&gt;ioaddr.scr_addr + (sc_reg * 4));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int nv_scr_write(struct ata_port *ap, unsigned int sc_reg, u32 val)</div><div class='add'>+static int nv_scr_write(struct ata_link *link, unsigned int sc_reg, u32 val)</div><div class='ctx'> {</div><div class='ctx'> 	if (sc_reg &gt; SCR_CONTROL)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	iowrite32(val, ap-&gt;ioaddr.scr_addr + (sc_reg * 4));</div><div class='add'>+	iowrite32(val, link-&gt;ap-&gt;ioaddr.scr_addr + (sc_reg * 4));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2218,9 +2218,9 @@ static void nv_swncq_host_interrupt(struct ata_port *ap, u16 fis)</div><div class='ctx'> 	if (!pp-&gt;qc_active)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (ap-&gt;ops-&gt;scr_read(ap, SCR_ERROR, &amp;serror))</div><div class='add'>+	if (ap-&gt;ops-&gt;scr_read(&amp;ap-&gt;link, SCR_ERROR, &amp;serror))</div><div class='ctx'> 		return;</div><div class='del'>-	ap-&gt;ops-&gt;scr_write(ap, SCR_ERROR, serror);</div><div class='add'>+	ap-&gt;ops-&gt;scr_write(&amp;ap-&gt;link, SCR_ERROR, serror);</div><div class='ctx'> </div><div class='ctx'> 	if (ata_stat &amp; ATA_ERR) {</div><div class='ctx'> 		ata_ehi_clear_desc(ehi);</div><div class='head'>diff --git a/drivers/ata/sata_promise.c b/drivers/ata/sata_promise.c<br/>index 030665ba76b7..750d8cdc00cd 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ata/sata_promise.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ata/sata_promise.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ata/sata_promise.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ata/sata_promise.c</a></div><div class='hunk'>@@ -137,8 +137,8 @@ struct pdc_port_priv {</div><div class='ctx'> 	dma_addr_t		pkt_dma;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int pdc_sata_scr_read(struct ata_port *ap, unsigned int sc_reg, u32 *val);</div><div class='del'>-static int pdc_sata_scr_write(struct ata_port *ap, unsigned int sc_reg, u32 val);</div><div class='add'>+static int pdc_sata_scr_read(struct ata_link *link, unsigned int sc_reg, u32 *val);</div><div class='add'>+static int pdc_sata_scr_write(struct ata_link *link, unsigned int sc_reg, u32 val);</div><div class='ctx'> static int pdc_ata_init_one(struct pci_dev *pdev, const struct pci_device_id *ent);</div><div class='ctx'> static int pdc_common_port_start(struct ata_port *ap);</div><div class='ctx'> static int pdc_sata_port_start(struct ata_port *ap);</div><div class='hunk'>@@ -386,19 +386,21 @@ static int pdc_sata_cable_detect(struct ata_port *ap)</div><div class='ctx'> 	return ATA_CBL_SATA;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int pdc_sata_scr_read(struct ata_port *ap, unsigned int sc_reg, u32 *val)</div><div class='add'>+static int pdc_sata_scr_read(struct ata_link *link,</div><div class='add'>+			     unsigned int sc_reg, u32 *val)</div><div class='ctx'> {</div><div class='ctx'> 	if (sc_reg &gt; SCR_CONTROL)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	*val = readl(ap-&gt;ioaddr.scr_addr + (sc_reg * 4));</div><div class='add'>+	*val = readl(link-&gt;ap-&gt;ioaddr.scr_addr + (sc_reg * 4));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int pdc_sata_scr_write(struct ata_port *ap, unsigned int sc_reg, u32 val)</div><div class='add'>+static int pdc_sata_scr_write(struct ata_link *link,</div><div class='add'>+			      unsigned int sc_reg, u32 val)</div><div class='ctx'> {</div><div class='ctx'> 	if (sc_reg &gt; SCR_CONTROL)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	writel(val, ap-&gt;ioaddr.scr_addr + (sc_reg * 4));</div><div class='add'>+	writel(val, link-&gt;ap-&gt;ioaddr.scr_addr + (sc_reg * 4));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -731,7 +733,7 @@ static void pdc_error_intr(struct ata_port *ap, struct ata_queued_cmd *qc,</div><div class='ctx'> 	if (sata_scr_valid(&amp;ap-&gt;link)) {</div><div class='ctx'> 		u32 serror;</div><div class='ctx'> </div><div class='del'>-		pdc_sata_scr_read(ap, SCR_ERROR, &amp;serror);</div><div class='add'>+		pdc_sata_scr_read(&amp;ap-&gt;link, SCR_ERROR, &amp;serror);</div><div class='ctx'> 		ehi-&gt;serror |= serror;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/ata/sata_qstor.c b/drivers/ata/sata_qstor.c<br/>index 1600107047cf..a000c86ac859 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ata/sata_qstor.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ata/sata_qstor.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ata/sata_qstor.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ata/sata_qstor.c</a></div><div class='hunk'>@@ -111,8 +111,8 @@ struct qs_port_priv {</div><div class='ctx'> 	qs_state_t		state;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int qs_scr_read(struct ata_port *ap, unsigned int sc_reg, u32 *val);</div><div class='del'>-static int qs_scr_write(struct ata_port *ap, unsigned int sc_reg, u32 val);</div><div class='add'>+static int qs_scr_read(struct ata_link *link, unsigned int sc_reg, u32 *val);</div><div class='add'>+static int qs_scr_write(struct ata_link *link, unsigned int sc_reg, u32 val);</div><div class='ctx'> static int qs_ata_init_one(struct pci_dev *pdev, const struct pci_device_id *ent);</div><div class='ctx'> static int qs_port_start(struct ata_port *ap);</div><div class='ctx'> static void qs_host_stop(struct ata_host *host);</div><div class='hunk'>@@ -242,11 +242,11 @@ static int qs_prereset(struct ata_link *link, unsigned long deadline)</div><div class='ctx'> 	return ata_sff_prereset(link, deadline);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int qs_scr_read(struct ata_port *ap, unsigned int sc_reg, u32 *val)</div><div class='add'>+static int qs_scr_read(struct ata_link *link, unsigned int sc_reg, u32 *val)</div><div class='ctx'> {</div><div class='ctx'> 	if (sc_reg &gt; SCR_CONTROL)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	*val = readl(ap-&gt;ioaddr.scr_addr + (sc_reg * 8));</div><div class='add'>+	*val = readl(link-&gt;ap-&gt;ioaddr.scr_addr + (sc_reg * 8));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -256,11 +256,11 @@ static void qs_error_handler(struct ata_port *ap)</div><div class='ctx'> 	ata_std_error_handler(ap);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int qs_scr_write(struct ata_port *ap, unsigned int sc_reg, u32 val)</div><div class='add'>+static int qs_scr_write(struct ata_link *link, unsigned int sc_reg, u32 val)</div><div class='ctx'> {</div><div class='ctx'> 	if (sc_reg &gt; SCR_CONTROL)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	writel(val, ap-&gt;ioaddr.scr_addr + (sc_reg * 8));</div><div class='add'>+	writel(val, link-&gt;ap-&gt;ioaddr.scr_addr + (sc_reg * 8));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/ata/sata_sil.c b/drivers/ata/sata_sil.c<br/>index 88bf4212590f..031d7b7dee34 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ata/sata_sil.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ata/sata_sil.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ata/sata_sil.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ata/sata_sil.c</a></div><div class='hunk'>@@ -115,8 +115,8 @@ static int sil_init_one(struct pci_dev *pdev, const struct pci_device_id *ent);</div><div class='ctx'> static int sil_pci_device_resume(struct pci_dev *pdev);</div><div class='ctx'> #endif</div><div class='ctx'> static void sil_dev_config(struct ata_device *dev);</div><div class='del'>-static int sil_scr_read(struct ata_port *ap, unsigned int sc_reg, u32 *val);</div><div class='del'>-static int sil_scr_write(struct ata_port *ap, unsigned int sc_reg, u32 val);</div><div class='add'>+static int sil_scr_read(struct ata_link *link, unsigned int sc_reg, u32 *val);</div><div class='add'>+static int sil_scr_write(struct ata_link *link, unsigned int sc_reg, u32 val);</div><div class='ctx'> static int sil_set_mode(struct ata_link *link, struct ata_device **r_failed);</div><div class='ctx'> static void sil_freeze(struct ata_port *ap);</div><div class='ctx'> static void sil_thaw(struct ata_port *ap);</div><div class='hunk'>@@ -317,9 +317,9 @@ static inline void __iomem *sil_scr_addr(struct ata_port *ap,</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int sil_scr_read(struct ata_port *ap, unsigned int sc_reg, u32 *val)</div><div class='add'>+static int sil_scr_read(struct ata_link *link, unsigned int sc_reg, u32 *val)</div><div class='ctx'> {</div><div class='del'>-	void __iomem *mmio = sil_scr_addr(ap, sc_reg);</div><div class='add'>+	void __iomem *mmio = sil_scr_addr(link-&gt;ap, sc_reg);</div><div class='ctx'> </div><div class='ctx'> 	if (mmio) {</div><div class='ctx'> 		*val = readl(mmio);</div><div class='hunk'>@@ -328,9 +328,9 @@ static int sil_scr_read(struct ata_port *ap, unsigned int sc_reg, u32 *val)</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int sil_scr_write(struct ata_port *ap, unsigned int sc_reg, u32 val)</div><div class='add'>+static int sil_scr_write(struct ata_link *link, unsigned int sc_reg, u32 val)</div><div class='ctx'> {</div><div class='del'>-	void __iomem *mmio = sil_scr_addr(ap, sc_reg);</div><div class='add'>+	void __iomem *mmio = sil_scr_addr(link-&gt;ap, sc_reg);</div><div class='ctx'> </div><div class='ctx'> 	if (mmio) {</div><div class='ctx'> 		writel(val, mmio);</div><div class='hunk'>@@ -352,8 +352,8 @@ static void sil_host_intr(struct ata_port *ap, u32 bmdma2)</div><div class='ctx'> 		 * controllers continue to assert IRQ as long as</div><div class='ctx'> 		 * SError bits are pending.  Clear SError immediately.</div><div class='ctx'> 		 */</div><div class='del'>-		sil_scr_read(ap, SCR_ERROR, &amp;serror);</div><div class='del'>-		sil_scr_write(ap, SCR_ERROR, serror);</div><div class='add'>+		sil_scr_read(&amp;ap-&gt;link, SCR_ERROR, &amp;serror);</div><div class='add'>+		sil_scr_write(&amp;ap-&gt;link, SCR_ERROR, serror);</div><div class='ctx'> </div><div class='ctx'> 		/* Sometimes spurious interrupts occur, double check</div><div class='ctx'> 		 * it's PHYRDY CHG.</div><div class='head'>diff --git a/drivers/ata/sata_sil24.c b/drivers/ata/sata_sil24.c<br/>index 84ffcc26a74b..4621807a1a6a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ata/sata_sil24.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ata/sata_sil24.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ata/sata_sil24.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ata/sata_sil24.c</a></div><div class='hunk'>@@ -340,8 +340,8 @@ struct sil24_port_priv {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void sil24_dev_config(struct ata_device *dev);</div><div class='del'>-static int sil24_scr_read(struct ata_port *ap, unsigned sc_reg, u32 *val);</div><div class='del'>-static int sil24_scr_write(struct ata_port *ap, unsigned sc_reg, u32 val);</div><div class='add'>+static int sil24_scr_read(struct ata_link *link, unsigned sc_reg, u32 *val);</div><div class='add'>+static int sil24_scr_write(struct ata_link *link, unsigned sc_reg, u32 val);</div><div class='ctx'> static int sil24_qc_defer(struct ata_queued_cmd *qc);</div><div class='ctx'> static void sil24_qc_prep(struct ata_queued_cmd *qc);</div><div class='ctx'> static unsigned int sil24_qc_issue(struct ata_queued_cmd *qc);</div><div class='hunk'>@@ -504,9 +504,9 @@ static int sil24_scr_map[] = {</div><div class='ctx'> 	[SCR_ACTIVE]	= 3,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int sil24_scr_read(struct ata_port *ap, unsigned sc_reg, u32 *val)</div><div class='add'>+static int sil24_scr_read(struct ata_link *link, unsigned sc_reg, u32 *val)</div><div class='ctx'> {</div><div class='del'>-	void __iomem *scr_addr = sil24_port_base(ap) + PORT_SCONTROL;</div><div class='add'>+	void __iomem *scr_addr = sil24_port_base(link-&gt;ap) + PORT_SCONTROL;</div><div class='ctx'> </div><div class='ctx'> 	if (sc_reg &lt; ARRAY_SIZE(sil24_scr_map)) {</div><div class='ctx'> 		void __iomem *addr;</div><div class='hunk'>@@ -517,9 +517,9 @@ static int sil24_scr_read(struct ata_port *ap, unsigned sc_reg, u32 *val)</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int sil24_scr_write(struct ata_port *ap, unsigned sc_reg, u32 val)</div><div class='add'>+static int sil24_scr_write(struct ata_link *link, unsigned sc_reg, u32 val)</div><div class='ctx'> {</div><div class='del'>-	void __iomem *scr_addr = sil24_port_base(ap) + PORT_SCONTROL;</div><div class='add'>+	void __iomem *scr_addr = sil24_port_base(link-&gt;ap) + PORT_SCONTROL;</div><div class='ctx'> </div><div class='ctx'> 	if (sc_reg &lt; ARRAY_SIZE(sil24_scr_map)) {</div><div class='ctx'> 		void __iomem *addr;</div><div class='head'>diff --git a/drivers/ata/sata_sis.c b/drivers/ata/sata_sis.c<br/>index 1010b3069bd5..9c43b4e7c4a6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ata/sata_sis.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ata/sata_sis.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ata/sata_sis.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ata/sata_sis.c</a></div><div class='hunk'>@@ -64,8 +64,8 @@ enum {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int sis_init_one(struct pci_dev *pdev, const struct pci_device_id *ent);</div><div class='del'>-static int sis_scr_read(struct ata_port *ap, unsigned int sc_reg, u32 *val);</div><div class='del'>-static int sis_scr_write(struct ata_port *ap, unsigned int sc_reg, u32 val);</div><div class='add'>+static int sis_scr_read(struct ata_link *link, unsigned int sc_reg, u32 *val);</div><div class='add'>+static int sis_scr_write(struct ata_link *link, unsigned int sc_reg, u32 val);</div><div class='ctx'> </div><div class='ctx'> static const struct pci_device_id sis_pci_tbl[] = {</div><div class='ctx'> 	{ PCI_VDEVICE(SI, 0x0180), sis_180 },	/* SiS 964/180 */</div><div class='hunk'>@@ -134,10 +134,11 @@ static unsigned int get_scr_cfg_addr(struct ata_port *ap, unsigned int sc_reg)</div><div class='ctx'> 	return addr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 sis_scr_cfg_read(struct ata_port *ap, unsigned int sc_reg, u32 *val)</div><div class='add'>+static u32 sis_scr_cfg_read(struct ata_link *link,</div><div class='add'>+			    unsigned int sc_reg, u32 *val)</div><div class='ctx'> {</div><div class='del'>-	struct pci_dev *pdev = to_pci_dev(ap-&gt;host-&gt;dev);</div><div class='del'>-	unsigned int cfg_addr = get_scr_cfg_addr(ap, sc_reg);</div><div class='add'>+	struct pci_dev *pdev = to_pci_dev(link-&gt;ap-&gt;host-&gt;dev);</div><div class='add'>+	unsigned int cfg_addr = get_scr_cfg_addr(link-&gt;ap, sc_reg);</div><div class='ctx'> 	u32 val2 = 0;</div><div class='ctx'> 	u8 pmr;</div><div class='ctx'> </div><div class='hunk'>@@ -158,10 +159,11 @@ static u32 sis_scr_cfg_read(struct ata_port *ap, unsigned int sc_reg, u32 *val)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int sis_scr_cfg_write(struct ata_port *ap, unsigned int sc_reg, u32 val)</div><div class='add'>+static int sis_scr_cfg_write(struct ata_link *link,</div><div class='add'>+			     unsigned int sc_reg, u32 val)</div><div class='ctx'> {</div><div class='del'>-	struct pci_dev *pdev = to_pci_dev(ap-&gt;host-&gt;dev);</div><div class='del'>-	unsigned int cfg_addr = get_scr_cfg_addr(ap, sc_reg);</div><div class='add'>+	struct pci_dev *pdev = to_pci_dev(link-&gt;ap-&gt;host-&gt;dev);</div><div class='add'>+	unsigned int cfg_addr = get_scr_cfg_addr(link-&gt;ap, sc_reg);</div><div class='ctx'> 	u8 pmr;</div><div class='ctx'> </div><div class='ctx'> 	if (sc_reg == SCR_ERROR) /* doesn't exist in PCI cfg space */</div><div class='hunk'>@@ -178,8 +180,9 @@ static int sis_scr_cfg_write(struct ata_port *ap, unsigned int sc_reg, u32 val)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int sis_scr_read(struct ata_port *ap, unsigned int sc_reg, u32 *val)</div><div class='add'>+static int sis_scr_read(struct ata_link *link, unsigned int sc_reg, u32 *val)</div><div class='ctx'> {</div><div class='add'>+	struct ata_port *ap = link-&gt;ap;</div><div class='ctx'> 	struct pci_dev *pdev = to_pci_dev(ap-&gt;host-&gt;dev);</div><div class='ctx'> 	u8 pmr;</div><div class='ctx'> </div><div class='hunk'>@@ -187,7 +190,7 @@ static int sis_scr_read(struct ata_port *ap, unsigned int sc_reg, u32 *val)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (ap-&gt;flags &amp; SIS_FLAG_CFGSCR)</div><div class='del'>-		return sis_scr_cfg_read(ap, sc_reg, val);</div><div class='add'>+		return sis_scr_cfg_read(link, sc_reg, val);</div><div class='ctx'> </div><div class='ctx'> 	pci_read_config_byte(pdev, SIS_PMR, &amp;pmr);</div><div class='ctx'> </div><div class='hunk'>@@ -202,8 +205,9 @@ static int sis_scr_read(struct ata_port *ap, unsigned int sc_reg, u32 *val)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int sis_scr_write(struct ata_port *ap, unsigned int sc_reg, u32 val)</div><div class='add'>+static int sis_scr_write(struct ata_link *link, unsigned int sc_reg, u32 val)</div><div class='ctx'> {</div><div class='add'>+	struct ata_port *ap = link-&gt;ap;</div><div class='ctx'> 	struct pci_dev *pdev = to_pci_dev(ap-&gt;host-&gt;dev);</div><div class='ctx'> 	u8 pmr;</div><div class='ctx'> </div><div class='hunk'>@@ -213,7 +217,7 @@ static int sis_scr_write(struct ata_port *ap, unsigned int sc_reg, u32 val)</div><div class='ctx'> 	pci_read_config_byte(pdev, SIS_PMR, &amp;pmr);</div><div class='ctx'> </div><div class='ctx'> 	if (ap-&gt;flags &amp; SIS_FLAG_CFGSCR)</div><div class='del'>-		return sis_scr_cfg_write(ap, sc_reg, val);</div><div class='add'>+		return sis_scr_cfg_write(link, sc_reg, val);</div><div class='ctx'> 	else {</div><div class='ctx'> 		iowrite32(val, ap-&gt;ioaddr.scr_addr + (sc_reg * 4));</div><div class='ctx'> 		if ((pdev-&gt;device == 0x0182) || (pdev-&gt;device == 0x0183) ||</div><div class='head'>diff --git a/drivers/ata/sata_svw.c b/drivers/ata/sata_svw.c<br/>index fb13b82aacba..609d147813ae 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ata/sata_svw.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ata/sata_svw.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ata/sata_svw.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ata/sata_svw.c</a></div><div class='hunk'>@@ -123,20 +123,22 @@ static int k2_sata_check_atapi_dma(struct ata_queued_cmd *qc)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int k2_sata_scr_read(struct ata_port *ap, unsigned int sc_reg, u32 *val)</div><div class='add'>+static int k2_sata_scr_read(struct ata_link *link,</div><div class='add'>+			    unsigned int sc_reg, u32 *val)</div><div class='ctx'> {</div><div class='ctx'> 	if (sc_reg &gt; SCR_CONTROL)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	*val = readl(ap-&gt;ioaddr.scr_addr + (sc_reg * 4));</div><div class='add'>+	*val = readl(link-&gt;ap-&gt;ioaddr.scr_addr + (sc_reg * 4));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int k2_sata_scr_write(struct ata_port *ap, unsigned int sc_reg, u32 val)</div><div class='add'>+static int k2_sata_scr_write(struct ata_link *link,</div><div class='add'>+			     unsigned int sc_reg, u32 val)</div><div class='ctx'> {</div><div class='ctx'> 	if (sc_reg &gt; SCR_CONTROL)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	writel(val, ap-&gt;ioaddr.scr_addr + (sc_reg * 4));</div><div class='add'>+	writel(val, link-&gt;ap-&gt;ioaddr.scr_addr + (sc_reg * 4));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/ata/sata_uli.c b/drivers/ata/sata_uli.c<br/>index db529b849948..019575bb3e08 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ata/sata_uli.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ata/sata_uli.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ata/sata_uli.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ata/sata_uli.c</a></div><div class='hunk'>@@ -57,8 +57,8 @@ struct uli_priv {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int uli_init_one(struct pci_dev *pdev, const struct pci_device_id *ent);</div><div class='del'>-static int uli_scr_read(struct ata_port *ap, unsigned int sc_reg, u32 *val);</div><div class='del'>-static int uli_scr_write(struct ata_port *ap, unsigned int sc_reg, u32 val);</div><div class='add'>+static int uli_scr_read(struct ata_link *link, unsigned int sc_reg, u32 *val);</div><div class='add'>+static int uli_scr_write(struct ata_link *link, unsigned int sc_reg, u32 val);</div><div class='ctx'> </div><div class='ctx'> static const struct pci_device_id uli_pci_tbl[] = {</div><div class='ctx'> 	{ PCI_VDEVICE(AL, 0x5289), uli_5289 },</div><div class='hunk'>@@ -107,39 +107,39 @@ static unsigned int get_scr_cfg_addr(struct ata_port *ap, unsigned int sc_reg)</div><div class='ctx'> 	return hpriv-&gt;scr_cfg_addr[ap-&gt;port_no] + (4 * sc_reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 uli_scr_cfg_read(struct ata_port *ap, unsigned int sc_reg)</div><div class='add'>+static u32 uli_scr_cfg_read(struct ata_link *link, unsigned int sc_reg)</div><div class='ctx'> {</div><div class='del'>-	struct pci_dev *pdev = to_pci_dev(ap-&gt;host-&gt;dev);</div><div class='del'>-	unsigned int cfg_addr = get_scr_cfg_addr(ap, sc_reg);</div><div class='add'>+	struct pci_dev *pdev = to_pci_dev(link-&gt;ap-&gt;host-&gt;dev);</div><div class='add'>+	unsigned int cfg_addr = get_scr_cfg_addr(link-&gt;ap, sc_reg);</div><div class='ctx'> 	u32 val;</div><div class='ctx'> </div><div class='ctx'> 	pci_read_config_dword(pdev, cfg_addr, &amp;val);</div><div class='ctx'> 	return val;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void uli_scr_cfg_write(struct ata_port *ap, unsigned int scr, u32 val)</div><div class='add'>+static void uli_scr_cfg_write(struct ata_link *link, unsigned int scr, u32 val)</div><div class='ctx'> {</div><div class='del'>-	struct pci_dev *pdev = to_pci_dev(ap-&gt;host-&gt;dev);</div><div class='del'>-	unsigned int cfg_addr = get_scr_cfg_addr(ap, scr);</div><div class='add'>+	struct pci_dev *pdev = to_pci_dev(link-&gt;ap-&gt;host-&gt;dev);</div><div class='add'>+	unsigned int cfg_addr = get_scr_cfg_addr(link-&gt;ap, scr);</div><div class='ctx'> </div><div class='ctx'> 	pci_write_config_dword(pdev, cfg_addr, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int uli_scr_read(struct ata_port *ap, unsigned int sc_reg, u32 *val)</div><div class='add'>+static int uli_scr_read(struct ata_link *link, unsigned int sc_reg, u32 *val)</div><div class='ctx'> {</div><div class='ctx'> 	if (sc_reg &gt; SCR_CONTROL)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	*val = uli_scr_cfg_read(ap, sc_reg);</div><div class='add'>+	*val = uli_scr_cfg_read(link, sc_reg);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int uli_scr_write(struct ata_port *ap, unsigned int sc_reg, u32 val)</div><div class='add'>+static int uli_scr_write(struct ata_link *link, unsigned int sc_reg, u32 val)</div><div class='ctx'> {</div><div class='ctx'> 	if (sc_reg &gt; SCR_CONTROL) //SCR_CONTROL=2, SCR_ERROR=1, SCR_STATUS=0</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	uli_scr_cfg_write(ap, sc_reg, val);</div><div class='add'>+	uli_scr_cfg_write(link, sc_reg, val);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/ata/sata_via.c b/drivers/ata/sata_via.c<br/>index 96deeb354e16..1cfa74535d91 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ata/sata_via.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ata/sata_via.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ata/sata_via.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ata/sata_via.c</a></div><div class='hunk'>@@ -68,8 +68,8 @@ enum {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int svia_init_one(struct pci_dev *pdev, const struct pci_device_id *ent);</div><div class='del'>-static int svia_scr_read(struct ata_port *ap, unsigned int sc_reg, u32 *val);</div><div class='del'>-static int svia_scr_write(struct ata_port *ap, unsigned int sc_reg, u32 val);</div><div class='add'>+static int svia_scr_read(struct ata_link *link, unsigned int sc_reg, u32 *val);</div><div class='add'>+static int svia_scr_write(struct ata_link *link, unsigned int sc_reg, u32 val);</div><div class='ctx'> static void svia_noop_freeze(struct ata_port *ap);</div><div class='ctx'> static int vt6420_prereset(struct ata_link *link, unsigned long deadline);</div><div class='ctx'> static int vt6421_pata_cable_detect(struct ata_port *ap);</div><div class='hunk'>@@ -152,19 +152,19 @@ MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, svia_pci_tbl);</div><div class='ctx'> MODULE_VERSION(DRV_VERSION);</div><div class='ctx'> </div><div class='del'>-static int svia_scr_read(struct ata_port *ap, unsigned int sc_reg, u32 *val)</div><div class='add'>+static int svia_scr_read(struct ata_link *link, unsigned int sc_reg, u32 *val)</div><div class='ctx'> {</div><div class='ctx'> 	if (sc_reg &gt; SCR_CONTROL)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	*val = ioread32(ap-&gt;ioaddr.scr_addr + (4 * sc_reg));</div><div class='add'>+	*val = ioread32(link-&gt;ap-&gt;ioaddr.scr_addr + (4 * sc_reg));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int svia_scr_write(struct ata_port *ap, unsigned int sc_reg, u32 val)</div><div class='add'>+static int svia_scr_write(struct ata_link *link, unsigned int sc_reg, u32 val)</div><div class='ctx'> {</div><div class='ctx'> 	if (sc_reg &gt; SCR_CONTROL)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	iowrite32(val, ap-&gt;ioaddr.scr_addr + (4 * sc_reg));</div><div class='add'>+	iowrite32(val, link-&gt;ap-&gt;ioaddr.scr_addr + (4 * sc_reg));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -210,20 +210,20 @@ static int vt6420_prereset(struct ata_link *link, unsigned long deadline)</div><div class='ctx'> 		goto skip_scr;</div><div class='ctx'> </div><div class='ctx'> 	/* Resume phy.  This is the old SATA resume sequence */</div><div class='del'>-	svia_scr_write(ap, SCR_CONTROL, 0x300);</div><div class='del'>-	svia_scr_read(ap, SCR_CONTROL, &amp;scontrol); /* flush */</div><div class='add'>+	svia_scr_write(link, SCR_CONTROL, 0x300);</div><div class='add'>+	svia_scr_read(link, SCR_CONTROL, &amp;scontrol); /* flush */</div><div class='ctx'> </div><div class='ctx'> 	/* wait for phy to become ready, if necessary */</div><div class='ctx'> 	do {</div><div class='ctx'> 		msleep(200);</div><div class='del'>-		svia_scr_read(ap, SCR_STATUS, &amp;sstatus);</div><div class='add'>+		svia_scr_read(link, SCR_STATUS, &amp;sstatus);</div><div class='ctx'> 		if ((sstatus &amp; 0xf) != 1)</div><div class='ctx'> 			break;</div><div class='ctx'> 	} while (time_before(jiffies, timeout));</div><div class='ctx'> </div><div class='ctx'> 	/* open code sata_print_link_status() */</div><div class='del'>-	svia_scr_read(ap, SCR_STATUS, &amp;sstatus);</div><div class='del'>-	svia_scr_read(ap, SCR_CONTROL, &amp;scontrol);</div><div class='add'>+	svia_scr_read(link, SCR_STATUS, &amp;sstatus);</div><div class='add'>+	svia_scr_read(link, SCR_CONTROL, &amp;scontrol);</div><div class='ctx'> </div><div class='ctx'> 	online = (sstatus &amp; 0xf) == 0x3;</div><div class='ctx'> </div><div class='hunk'>@@ -232,7 +232,7 @@ static int vt6420_prereset(struct ata_link *link, unsigned long deadline)</div><div class='ctx'> 			online ? "up" : "down", sstatus, scontrol);</div><div class='ctx'> </div><div class='ctx'> 	/* SStatus is read one more time */</div><div class='del'>-	svia_scr_read(ap, SCR_STATUS, &amp;sstatus);</div><div class='add'>+	svia_scr_read(link, SCR_STATUS, &amp;sstatus);</div><div class='ctx'> </div><div class='ctx'> 	if (!online) {</div><div class='ctx'> 		/* tell EH to bail */</div><div class='head'>diff --git a/drivers/ata/sata_vsc.c b/drivers/ata/sata_vsc.c<br/>index f3d635c0a2e9..c57cdff9e6bd 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ata/sata_vsc.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ata/sata_vsc.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ata/sata_vsc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ata/sata_vsc.c</a></div><div class='hunk'>@@ -98,20 +98,22 @@ enum {</div><div class='ctx'> 			      VSC_SATA_INT_PHY_CHANGE),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int vsc_sata_scr_read(struct ata_port *ap, unsigned int sc_reg, u32 *val)</div><div class='add'>+static int vsc_sata_scr_read(struct ata_link *link,</div><div class='add'>+			     unsigned int sc_reg, u32 *val)</div><div class='ctx'> {</div><div class='ctx'> 	if (sc_reg &gt; SCR_CONTROL)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	*val = readl(ap-&gt;ioaddr.scr_addr + (sc_reg * 4));</div><div class='add'>+	*val = readl(link-&gt;ap-&gt;ioaddr.scr_addr + (sc_reg * 4));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int vsc_sata_scr_write(struct ata_port *ap, unsigned int sc_reg, u32 val)</div><div class='add'>+static int vsc_sata_scr_write(struct ata_link *link,</div><div class='add'>+			      unsigned int sc_reg, u32 val)</div><div class='ctx'> {</div><div class='ctx'> 	if (sc_reg &gt; SCR_CONTROL)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	writel(val, ap-&gt;ioaddr.scr_addr + (sc_reg * 4));</div><div class='add'>+	writel(val, link-&gt;ap-&gt;ioaddr.scr_addr + (sc_reg * 4));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c<br/>index 41b2204ebc6e..5503bfc8e132 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/atm/eni.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/atm/eni.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/atm/eni.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/atm/eni.c</a></div><div class='hunk'>@@ -1270,7 +1270,7 @@ static int comp_tx(struct eni_dev *eni_dev,int *pcr,int reserved,int *pre,</div><div class='ctx'> 			if (*pre &lt; 3) (*pre)++; /* else fail later */</div><div class='ctx'> 			div = pre_div[*pre]*-*pcr;</div><div class='ctx'> 			DPRINTK("max div %d\n",div);</div><div class='del'>-			*res = (TS_CLOCK+div-1)/div-1;</div><div class='add'>+			*res = DIV_ROUND_UP(TS_CLOCK, div)-1;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (*res &lt; 0) *res = 0;</div><div class='ctx'> 		if (*res &gt; MID_SEG_MAX_RATE) *res = MID_SEG_MAX_RATE;</div><div class='head'>diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c<br/>index 73338d231db9..937c9c0ef4c9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/atm/fore200e.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/atm/fore200e.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/atm/fore200e.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/atm/fore200e.c</a></div><div class='hunk'>@@ -47,8 +47,9 @@</div><div class='ctx'> #include &lt;asm/atomic.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SBUS</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_device.h&gt;</div><div class='ctx'> #include &lt;asm/idprom.h&gt;</div><div class='del'>-#include &lt;asm/sbus.h&gt;</div><div class='ctx'> #include &lt;asm/openprom.h&gt;</div><div class='ctx'> #include &lt;asm/oplib.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='hunk'>@@ -661,249 +662,189 @@ fore200e_pca_proc_read(struct fore200e* fore200e, char *page)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SBUS</div><div class='ctx'> </div><div class='del'>-static u32</div><div class='del'>-fore200e_sba_read(volatile u32 __iomem *addr)</div><div class='add'>+static u32 fore200e_sba_read(volatile u32 __iomem *addr)</div><div class='ctx'> {</div><div class='ctx'>     return sbus_readl(addr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-fore200e_sba_write(u32 val, volatile u32 __iomem *addr)</div><div class='add'>+static void fore200e_sba_write(u32 val, volatile u32 __iomem *addr)</div><div class='ctx'> {</div><div class='ctx'>     sbus_writel(val, addr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static u32</div><div class='del'>-fore200e_sba_dma_map(struct fore200e* fore200e, void* virt_addr, int size, int direction)</div><div class='add'>+static u32 fore200e_sba_dma_map(struct fore200e *fore200e, void* virt_addr, int size, int direction)</div><div class='ctx'> {</div><div class='del'>-    u32 dma_addr = sbus_map_single((struct sbus_dev*)fore200e-&gt;bus_dev, virt_addr, size, direction);</div><div class='add'>+	struct of_device *op = fore200e-&gt;bus_dev;</div><div class='add'>+	u32 dma_addr;</div><div class='ctx'> </div><div class='del'>-    DPRINTK(3, "SBUS DVMA mapping: virt_addr = 0x%p, size = %d, direction = %d --&gt; dma_addr = 0x%08x\n",</div><div class='del'>-	    virt_addr, size, direction, dma_addr);</div><div class='add'>+	dma_addr = dma_map_single(&amp;op-&gt;dev, virt_addr, size, direction);</div><div class='add'>+</div><div class='add'>+	DPRINTK(3, "SBUS DVMA mapping: virt_addr = 0x%p, size = %d, direction = %d --&gt; dma_addr = 0x%08x\n",</div><div class='add'>+		virt_addr, size, direction, dma_addr);</div><div class='ctx'>     </div><div class='del'>-    return dma_addr;</div><div class='add'>+	return dma_addr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-fore200e_sba_dma_unmap(struct fore200e* fore200e, u32 dma_addr, int size, int direction)</div><div class='add'>+static void fore200e_sba_dma_unmap(struct fore200e *fore200e, u32 dma_addr, int size, int direction)</div><div class='ctx'> {</div><div class='del'>-    DPRINTK(3, "SBUS DVMA unmapping: dma_addr = 0x%08x, size = %d, direction = %d,\n",</div><div class='del'>-	    dma_addr, size, direction);</div><div class='add'>+	struct of_device *op = fore200e-&gt;bus_dev;</div><div class='ctx'> </div><div class='del'>-    sbus_unmap_single((struct sbus_dev*)fore200e-&gt;bus_dev, dma_addr, size, direction);</div><div class='del'>-}</div><div class='add'>+	DPRINTK(3, "SBUS DVMA unmapping: dma_addr = 0x%08x, size = %d, direction = %d,\n",</div><div class='add'>+		dma_addr, size, direction);</div><div class='ctx'> </div><div class='add'>+	dma_unmap_single(&amp;op-&gt;dev, dma_addr, size, direction);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-fore200e_sba_dma_sync_for_cpu(struct fore200e* fore200e, u32 dma_addr, int size, int direction)</div><div class='add'>+static void fore200e_sba_dma_sync_for_cpu(struct fore200e *fore200e, u32 dma_addr, int size, int direction)</div><div class='ctx'> {</div><div class='del'>-    DPRINTK(3, "SBUS DVMA sync: dma_addr = 0x%08x, size = %d, direction = %d\n", dma_addr, size, direction);</div><div class='add'>+	struct of_device *op = fore200e-&gt;bus_dev;</div><div class='add'>+</div><div class='add'>+	DPRINTK(3, "SBUS DVMA sync: dma_addr = 0x%08x, size = %d, direction = %d\n", dma_addr, size, direction);</div><div class='ctx'>     </div><div class='del'>-    sbus_dma_sync_single_for_cpu((struct sbus_dev*)fore200e-&gt;bus_dev, dma_addr, size, direction);</div><div class='add'>+	dma_sync_single_for_cpu(&amp;op-&gt;dev, dma_addr, size, direction);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-fore200e_sba_dma_sync_for_device(struct fore200e* fore200e, u32 dma_addr, int size, int direction)</div><div class='add'>+static void fore200e_sba_dma_sync_for_device(struct fore200e *fore200e, u32 dma_addr, int size, int direction)</div><div class='ctx'> {</div><div class='del'>-    DPRINTK(3, "SBUS DVMA sync: dma_addr = 0x%08x, size = %d, direction = %d\n", dma_addr, size, direction);</div><div class='del'>-</div><div class='del'>-    sbus_dma_sync_single_for_device((struct sbus_dev*)fore200e-&gt;bus_dev, dma_addr, size, direction);</div><div class='del'>-}</div><div class='add'>+	struct of_device *op = fore200e-&gt;bus_dev;</div><div class='ctx'> </div><div class='add'>+	DPRINTK(3, "SBUS DVMA sync: dma_addr = 0x%08x, size = %d, direction = %d\n", dma_addr, size, direction);</div><div class='ctx'> </div><div class='del'>-/* allocate a DVMA consistent chunk of memory intended to act as a communication mechanism</div><div class='del'>-   (to hold descriptors, status, queues, etc.) shared by the driver and the adapter */</div><div class='add'>+	dma_sync_single_for_device(&amp;op-&gt;dev, dma_addr, size, direction);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-fore200e_sba_dma_chunk_alloc(struct fore200e* fore200e, struct chunk* chunk,</div><div class='del'>-			     int size, int nbr, int alignment)</div><div class='add'>+/* Allocate a DVMA consistent chunk of memory intended to act as a communication mechanism</div><div class='add'>+ * (to hold descriptors, status, queues, etc.) shared by the driver and the adapter.</div><div class='add'>+ */</div><div class='add'>+static int fore200e_sba_dma_chunk_alloc(struct fore200e *fore200e, struct chunk *chunk,</div><div class='add'>+					int size, int nbr, int alignment)</div><div class='ctx'> {</div><div class='del'>-    chunk-&gt;alloc_size = chunk-&gt;align_size = size * nbr;</div><div class='add'>+	struct of_device *op = fore200e-&gt;bus_dev;</div><div class='ctx'> </div><div class='del'>-    /* returned chunks are page-aligned */</div><div class='del'>-    chunk-&gt;alloc_addr = sbus_alloc_consistent((struct sbus_dev*)fore200e-&gt;bus_dev,</div><div class='del'>-					      chunk-&gt;alloc_size,</div><div class='del'>-					      &amp;chunk-&gt;dma_addr);</div><div class='add'>+	chunk-&gt;alloc_size = chunk-&gt;align_size = size * nbr;</div><div class='ctx'> </div><div class='del'>-    if ((chunk-&gt;alloc_addr == NULL) || (chunk-&gt;dma_addr == 0))</div><div class='del'>-	return -ENOMEM;</div><div class='add'>+	/* returned chunks are page-aligned */</div><div class='add'>+	chunk-&gt;alloc_addr = dma_alloc_coherent(&amp;op-&gt;dev, chunk-&gt;alloc_size,</div><div class='add'>+					       &amp;chunk-&gt;dma_addr, GFP_ATOMIC);</div><div class='ctx'> </div><div class='del'>-    chunk-&gt;align_addr = chunk-&gt;alloc_addr;</div><div class='add'>+	if ((chunk-&gt;alloc_addr == NULL) || (chunk-&gt;dma_addr == 0))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	chunk-&gt;align_addr = chunk-&gt;alloc_addr;</div><div class='ctx'>     </div><div class='del'>-    return 0;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /* free a DVMA consistent chunk of memory */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-fore200e_sba_dma_chunk_free(struct fore200e* fore200e, struct chunk* chunk)</div><div class='add'>+static void fore200e_sba_dma_chunk_free(struct fore200e *fore200e, struct chunk *chunk)</div><div class='ctx'> {</div><div class='del'>-    sbus_free_consistent((struct sbus_dev*)fore200e-&gt;bus_dev,</div><div class='del'>-			 chunk-&gt;alloc_size,</div><div class='del'>-			 chunk-&gt;alloc_addr,</div><div class='del'>-			 chunk-&gt;dma_addr);</div><div class='del'>-}</div><div class='add'>+	struct of_device *op = fore200e-&gt;bus_dev;</div><div class='ctx'> </div><div class='add'>+	dma_free_coherent(&amp;op-&gt;dev, chunk-&gt;alloc_size,</div><div class='add'>+			  chunk-&gt;alloc_addr, chunk-&gt;dma_addr);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-fore200e_sba_irq_enable(struct fore200e* fore200e)</div><div class='add'>+static void fore200e_sba_irq_enable(struct fore200e *fore200e)</div><div class='ctx'> {</div><div class='del'>-    u32 hcr = fore200e-&gt;bus-&gt;read(fore200e-&gt;regs.sba.hcr) &amp; SBA200E_HCR_STICKY;</div><div class='del'>-    fore200e-&gt;bus-&gt;write(hcr | SBA200E_HCR_INTR_ENA, fore200e-&gt;regs.sba.hcr);</div><div class='add'>+	u32 hcr = fore200e-&gt;bus-&gt;read(fore200e-&gt;regs.sba.hcr) &amp; SBA200E_HCR_STICKY;</div><div class='add'>+	fore200e-&gt;bus-&gt;write(hcr | SBA200E_HCR_INTR_ENA, fore200e-&gt;regs.sba.hcr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-fore200e_sba_irq_check(struct fore200e* fore200e)</div><div class='add'>+static int fore200e_sba_irq_check(struct fore200e *fore200e)</div><div class='ctx'> {</div><div class='del'>-    return fore200e-&gt;bus-&gt;read(fore200e-&gt;regs.sba.hcr) &amp; SBA200E_HCR_INTR_REQ;</div><div class='add'>+	return fore200e-&gt;bus-&gt;read(fore200e-&gt;regs.sba.hcr) &amp; SBA200E_HCR_INTR_REQ;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-fore200e_sba_irq_ack(struct fore200e* fore200e)</div><div class='add'>+static void fore200e_sba_irq_ack(struct fore200e *fore200e)</div><div class='ctx'> {</div><div class='del'>-    u32 hcr = fore200e-&gt;bus-&gt;read(fore200e-&gt;regs.sba.hcr) &amp; SBA200E_HCR_STICKY;</div><div class='del'>-    fore200e-&gt;bus-&gt;write(hcr | SBA200E_HCR_INTR_CLR, fore200e-&gt;regs.sba.hcr);</div><div class='add'>+	u32 hcr = fore200e-&gt;bus-&gt;read(fore200e-&gt;regs.sba.hcr) &amp; SBA200E_HCR_STICKY;</div><div class='add'>+	fore200e-&gt;bus-&gt;write(hcr | SBA200E_HCR_INTR_CLR, fore200e-&gt;regs.sba.hcr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-fore200e_sba_reset(struct fore200e* fore200e)</div><div class='add'>+static void fore200e_sba_reset(struct fore200e *fore200e)</div><div class='ctx'> {</div><div class='del'>-    fore200e-&gt;bus-&gt;write(SBA200E_HCR_RESET, fore200e-&gt;regs.sba.hcr);</div><div class='del'>-    fore200e_spin(10);</div><div class='del'>-    fore200e-&gt;bus-&gt;write(0, fore200e-&gt;regs.sba.hcr);</div><div class='add'>+	fore200e-&gt;bus-&gt;write(SBA200E_HCR_RESET, fore200e-&gt;regs.sba.hcr);</div><div class='add'>+	fore200e_spin(10);</div><div class='add'>+	fore200e-&gt;bus-&gt;write(0, fore200e-&gt;regs.sba.hcr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static int __init</div><div class='del'>-fore200e_sba_map(struct fore200e* fore200e)</div><div class='add'>+static int __init fore200e_sba_map(struct fore200e *fore200e)</div><div class='ctx'> {</div><div class='del'>-    struct sbus_dev* sbus_dev = (struct sbus_dev*)fore200e-&gt;bus_dev;</div><div class='del'>-    unsigned int bursts;</div><div class='add'>+	struct of_device *op = fore200e-&gt;bus_dev;</div><div class='add'>+	unsigned int bursts;</div><div class='ctx'> </div><div class='del'>-    /* gain access to the SBA specific registers  */</div><div class='del'>-    fore200e-&gt;regs.sba.hcr = sbus_ioremap(&amp;sbus_dev-&gt;resource[0], 0, SBA200E_HCR_LENGTH, "SBA HCR");</div><div class='del'>-    fore200e-&gt;regs.sba.bsr = sbus_ioremap(&amp;sbus_dev-&gt;resource[1], 0, SBA200E_BSR_LENGTH, "SBA BSR");</div><div class='del'>-    fore200e-&gt;regs.sba.isr = sbus_ioremap(&amp;sbus_dev-&gt;resource[2], 0, SBA200E_ISR_LENGTH, "SBA ISR");</div><div class='del'>-    fore200e-&gt;virt_base    = sbus_ioremap(&amp;sbus_dev-&gt;resource[3], 0, SBA200E_RAM_LENGTH, "SBA RAM");</div><div class='add'>+	/* gain access to the SBA specific registers  */</div><div class='add'>+	fore200e-&gt;regs.sba.hcr = of_ioremap(&amp;op-&gt;resource[0], 0, SBA200E_HCR_LENGTH, "SBA HCR");</div><div class='add'>+	fore200e-&gt;regs.sba.bsr = of_ioremap(&amp;op-&gt;resource[1], 0, SBA200E_BSR_LENGTH, "SBA BSR");</div><div class='add'>+	fore200e-&gt;regs.sba.isr = of_ioremap(&amp;op-&gt;resource[2], 0, SBA200E_ISR_LENGTH, "SBA ISR");</div><div class='add'>+	fore200e-&gt;virt_base    = of_ioremap(&amp;op-&gt;resource[3], 0, SBA200E_RAM_LENGTH, "SBA RAM");</div><div class='ctx'> </div><div class='del'>-    if (fore200e-&gt;virt_base == NULL) {</div><div class='del'>-	printk(FORE200E "unable to map RAM of device %s\n", fore200e-&gt;name);</div><div class='del'>-	return -EFAULT;</div><div class='del'>-    }</div><div class='add'>+	if (!fore200e-&gt;virt_base) {</div><div class='add'>+		printk(FORE200E "unable to map RAM of device %s\n", fore200e-&gt;name);</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-    DPRINTK(1, "device %s mapped to 0x%p\n", fore200e-&gt;name, fore200e-&gt;virt_base);</div><div class='add'>+	DPRINTK(1, "device %s mapped to 0x%p\n", fore200e-&gt;name, fore200e-&gt;virt_base);</div><div class='ctx'>     </div><div class='del'>-    fore200e-&gt;bus-&gt;write(0x02, fore200e-&gt;regs.sba.isr); /* XXX hardwired interrupt level */</div><div class='add'>+	fore200e-&gt;bus-&gt;write(0x02, fore200e-&gt;regs.sba.isr); /* XXX hardwired interrupt level */</div><div class='ctx'> </div><div class='del'>-    /* get the supported DVMA burst sizes */</div><div class='del'>-    bursts = prom_getintdefault(sbus_dev-&gt;bus-&gt;prom_node, "burst-sizes", 0x00);</div><div class='add'>+	/* get the supported DVMA burst sizes */</div><div class='add'>+	bursts = of_getintprop_default(op-&gt;node-&gt;parent, "burst-sizes", 0x00);</div><div class='ctx'> </div><div class='del'>-    if (sbus_can_dma_64bit(sbus_dev))</div><div class='del'>-	sbus_set_sbus64(sbus_dev, bursts);</div><div class='add'>+	if (sbus_can_dma_64bit())</div><div class='add'>+		sbus_set_sbus64(&amp;op-&gt;dev, bursts);</div><div class='ctx'> </div><div class='del'>-    fore200e-&gt;state = FORE200E_STATE_MAP;</div><div class='del'>-    return 0;</div><div class='add'>+	fore200e-&gt;state = FORE200E_STATE_MAP;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-fore200e_sba_unmap(struct fore200e* fore200e)</div><div class='add'>+static void fore200e_sba_unmap(struct fore200e *fore200e)</div><div class='ctx'> {</div><div class='del'>-    sbus_iounmap(fore200e-&gt;regs.sba.hcr, SBA200E_HCR_LENGTH);</div><div class='del'>-    sbus_iounmap(fore200e-&gt;regs.sba.bsr, SBA200E_BSR_LENGTH);</div><div class='del'>-    sbus_iounmap(fore200e-&gt;regs.sba.isr, SBA200E_ISR_LENGTH);</div><div class='del'>-    sbus_iounmap(fore200e-&gt;virt_base,    SBA200E_RAM_LENGTH);</div><div class='del'>-}</div><div class='add'>+	struct of_device *op = fore200e-&gt;bus_dev;</div><div class='ctx'> </div><div class='add'>+	of_iounmap(&amp;op-&gt;resource[0], fore200e-&gt;regs.sba.hcr, SBA200E_HCR_LENGTH);</div><div class='add'>+	of_iounmap(&amp;op-&gt;resource[1], fore200e-&gt;regs.sba.bsr, SBA200E_BSR_LENGTH);</div><div class='add'>+	of_iounmap(&amp;op-&gt;resource[2], fore200e-&gt;regs.sba.isr, SBA200E_ISR_LENGTH);</div><div class='add'>+	of_iounmap(&amp;op-&gt;resource[3], fore200e-&gt;virt_base,    SBA200E_RAM_LENGTH);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-static int __init</div><div class='del'>-fore200e_sba_configure(struct fore200e* fore200e)</div><div class='add'>+static int __init fore200e_sba_configure(struct fore200e *fore200e)</div><div class='ctx'> {</div><div class='del'>-    fore200e-&gt;state = FORE200E_STATE_CONFIGURE;</div><div class='del'>-    return 0;</div><div class='add'>+	fore200e-&gt;state = FORE200E_STATE_CONFIGURE;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static struct fore200e* __init</div><div class='del'>-fore200e_sba_detect(const struct fore200e_bus* bus, int index)</div><div class='add'>+static int __init fore200e_sba_prom_read(struct fore200e *fore200e, struct prom_data *prom)</div><div class='ctx'> {</div><div class='del'>-    struct fore200e*          fore200e;</div><div class='del'>-    struct sbus_bus* sbus_bus;</div><div class='del'>-    struct sbus_dev* sbus_dev = NULL;</div><div class='del'>-    </div><div class='del'>-    unsigned int     count = 0;</div><div class='del'>-    </div><div class='del'>-    for_each_sbus (sbus_bus) {</div><div class='del'>-	for_each_sbusdev (sbus_dev, sbus_bus) {</div><div class='del'>-	    if (strcmp(sbus_dev-&gt;prom_name, SBA200E_PROM_NAME) == 0) {</div><div class='del'>-		if (count &gt;= index)</div><div class='del'>-		    goto found;</div><div class='del'>-		count++;</div><div class='del'>-	    }</div><div class='del'>-	}</div><div class='del'>-    }</div><div class='del'>-    return NULL;</div><div class='del'>-    </div><div class='del'>-  found:</div><div class='del'>-    if (sbus_dev-&gt;num_registers != 4) {</div><div class='del'>-	printk(FORE200E "this %s device has %d instead of 4 registers\n",</div><div class='del'>-	       bus-&gt;model_name, sbus_dev-&gt;num_registers);</div><div class='del'>-	return NULL;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    fore200e = kzalloc(sizeof(struct fore200e), GFP_KERNEL);</div><div class='del'>-    if (fore200e == NULL)</div><div class='del'>-	return NULL;</div><div class='add'>+	struct of_device *op = fore200e-&gt;bus_dev;</div><div class='add'>+	const u8 *prop;</div><div class='add'>+	int len;</div><div class='ctx'> </div><div class='del'>-    fore200e-&gt;bus     = bus;</div><div class='del'>-    fore200e-&gt;bus_dev = sbus_dev;</div><div class='del'>-    fore200e-&gt;irq     = sbus_dev-&gt;irqs[ 0 ];</div><div class='add'>+	prop = of_get_property(op-&gt;node, "madaddrlo2", &amp;len);</div><div class='add'>+	if (!prop)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	memcpy(&amp;prom-&gt;mac_addr[4], prop, 4);</div><div class='ctx'> </div><div class='del'>-    fore200e-&gt;phys_base = (unsigned long)sbus_dev;</div><div class='add'>+	prop = of_get_property(op-&gt;node, "madaddrhi4", &amp;len);</div><div class='add'>+	if (!prop)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	memcpy(&amp;prom-&gt;mac_addr[2], prop, 4);</div><div class='ctx'> </div><div class='del'>-    sprintf(fore200e-&gt;name, "%s-%d", bus-&gt;model_name, index - 1);</div><div class='add'>+	prom-&gt;serial_number = of_getintprop_default(op-&gt;node, "serialnumber", 0);</div><div class='add'>+	prom-&gt;hw_revision = of_getintprop_default(op-&gt;node, "promversion", 0);</div><div class='ctx'>     </div><div class='del'>-    return fore200e;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static int __init</div><div class='del'>-fore200e_sba_prom_read(struct fore200e* fore200e, struct prom_data* prom)</div><div class='add'>+static int fore200e_sba_proc_read(struct fore200e *fore200e, char *page)</div><div class='ctx'> {</div><div class='del'>-    struct sbus_dev* sbus_dev = (struct sbus_dev*) fore200e-&gt;bus_dev;</div><div class='del'>-    int                       len;</div><div class='del'>-</div><div class='del'>-    len = prom_getproperty(sbus_dev-&gt;prom_node, "macaddrlo2", &amp;prom-&gt;mac_addr[ 4 ], 4);</div><div class='del'>-    if (len &lt; 0)</div><div class='del'>-	return -EBUSY;</div><div class='del'>-</div><div class='del'>-    len = prom_getproperty(sbus_dev-&gt;prom_node, "macaddrhi4", &amp;prom-&gt;mac_addr[ 2 ], 4);</div><div class='del'>-    if (len &lt; 0)</div><div class='del'>-	return -EBUSY;</div><div class='del'>-    </div><div class='del'>-    prom_getproperty(sbus_dev-&gt;prom_node, "serialnumber",</div><div class='del'>-		     (char*)&amp;prom-&gt;serial_number, sizeof(prom-&gt;serial_number));</div><div class='del'>-    </div><div class='del'>-    prom_getproperty(sbus_dev-&gt;prom_node, "promversion",</div><div class='del'>-		     (char*)&amp;prom-&gt;hw_revision, sizeof(prom-&gt;hw_revision));</div><div class='del'>-    </div><div class='del'>-    return 0;</div><div class='del'>-}</div><div class='add'>+	struct of_device *op = fore200e-&gt;bus_dev;</div><div class='add'>+	const struct linux_prom_registers *regs;</div><div class='ctx'> </div><div class='add'>+	regs = of_get_property(op-&gt;node, "reg", NULL);</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-fore200e_sba_proc_read(struct fore200e* fore200e, char *page)</div><div class='del'>-{</div><div class='del'>-    struct sbus_dev* sbus_dev = (struct sbus_dev*)fore200e-&gt;bus_dev;</div><div class='del'>-</div><div class='del'>-    return sprintf(page, "   SBUS slot/device:\t\t%d/'%s'\n", sbus_dev-&gt;slot, sbus_dev-&gt;prom_name);</div><div class='add'>+	return sprintf(page, "   SBUS slot/device:\t\t%d/'%s'\n",</div><div class='add'>+		       (regs ? regs-&gt;which_io : 0), op-&gt;node-&gt;name);</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_SBUS */</div><div class='ctx'> </div><div class='hunk'>@@ -2572,7 +2513,7 @@ fore200e_load_and_start_fw(struct fore200e* fore200e)</div><div class='ctx'> 	device = &amp;((struct pci_dev *) fore200e-&gt;bus_dev)-&gt;dev;</div><div class='ctx'> #ifdef CONFIG_SBUS</div><div class='ctx'>     else if (strcmp(fore200e-&gt;bus-&gt;model_name, "SBA-200E") == 0)</div><div class='del'>-	device = &amp;((struct sbus_dev *) fore200e-&gt;bus_dev)-&gt;ofdev.dev;</div><div class='add'>+	device = &amp;((struct of_device *) fore200e-&gt;bus_dev)-&gt;dev;</div><div class='ctx'> #endif</div><div class='ctx'>     else</div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -2701,6 +2642,66 @@ fore200e_init(struct fore200e* fore200e)</div><div class='ctx'>     return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_SBUS</div><div class='add'>+static int __devinit fore200e_sba_probe(struct of_device *op,</div><div class='add'>+					const struct of_device_id *match)</div><div class='add'>+{</div><div class='add'>+	const struct fore200e_bus *bus = match-&gt;data;</div><div class='add'>+	struct fore200e *fore200e;</div><div class='add'>+	static int index = 0;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	fore200e = kzalloc(sizeof(struct fore200e), GFP_KERNEL);</div><div class='add'>+	if (!fore200e)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	fore200e-&gt;bus = bus;</div><div class='add'>+	fore200e-&gt;bus_dev = op;</div><div class='add'>+	fore200e-&gt;irq = op-&gt;irqs[0];</div><div class='add'>+	fore200e-&gt;phys_base = op-&gt;resource[0].start;</div><div class='add'>+</div><div class='add'>+	sprintf(fore200e-&gt;name, "%s-%d", bus-&gt;model_name, index);</div><div class='add'>+</div><div class='add'>+	err = fore200e_init(fore200e);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		fore200e_shutdown(fore200e);</div><div class='add'>+		kfree(fore200e);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	index++;</div><div class='add'>+	dev_set_drvdata(&amp;op-&gt;dev, fore200e);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devexit fore200e_sba_remove(struct of_device *op)</div><div class='add'>+{</div><div class='add'>+	struct fore200e *fore200e = dev_get_drvdata(&amp;op-&gt;dev);</div><div class='add'>+</div><div class='add'>+	fore200e_shutdown(fore200e);</div><div class='add'>+	kfree(fore200e);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct of_device_id fore200e_sba_match[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = SBA200E_PROM_NAME,</div><div class='add'>+		.data = (void *) &amp;fore200e_bus[1],</div><div class='add'>+	},</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, fore200e_sba_match);</div><div class='add'>+</div><div class='add'>+static struct of_platform_driver fore200e_sba_driver = {</div><div class='add'>+	.name		= "fore_200e",</div><div class='add'>+	.match_table	= fore200e_sba_match,</div><div class='add'>+	.probe		= fore200e_sba_probe,</div><div class='add'>+	.remove		= __devexit_p(fore200e_sba_remove),</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_PCI</div><div class='ctx'> static int __devinit</div><div class='ctx'> fore200e_pca_detect(struct pci_dev *pci_dev, const struct pci_device_id *pci_ent)</div><div class='hunk'>@@ -2784,67 +2785,40 @@ static struct pci_driver fore200e_pca_driver = {</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static int __init</div><div class='del'>-fore200e_module_init(void)</div><div class='add'>+static int __init fore200e_module_init(void)</div><div class='ctx'> {</div><div class='del'>-    const struct fore200e_bus* bus;</div><div class='del'>-    struct       fore200e*     fore200e;</div><div class='del'>-    int                        index;</div><div class='del'>-</div><div class='del'>-    printk(FORE200E "FORE Systems 200E-series ATM driver - version " FORE200E_VERSION "\n");</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-    /* for each configured bus interface */</div><div class='del'>-    for (bus = fore200e_bus; bus-&gt;model_name; bus++) {</div><div class='add'>+	printk(FORE200E "FORE Systems 200E-series ATM driver - version " FORE200E_VERSION "\n");</div><div class='ctx'> </div><div class='del'>-	/* detect all boards present on that bus */</div><div class='del'>-	for (index = 0; bus-&gt;detect &amp;&amp; (fore200e = bus-&gt;detect(bus, index)); index++) {</div><div class='del'>-	    </div><div class='del'>-	    printk(FORE200E "device %s found at 0x%lx, IRQ %s\n",</div><div class='del'>-		   fore200e-&gt;bus-&gt;model_name, </div><div class='del'>-		   fore200e-&gt;phys_base, fore200e_irq_itoa(fore200e-&gt;irq));</div><div class='del'>-</div><div class='del'>-	    sprintf(fore200e-&gt;name, "%s-%d", bus-&gt;model_name, index);</div><div class='del'>-</div><div class='del'>-	    if (fore200e_init(fore200e) &lt; 0) {</div><div class='del'>-</div><div class='del'>-		fore200e_shutdown(fore200e);</div><div class='del'>-		break;</div><div class='del'>-	    }</div><div class='del'>-</div><div class='del'>-	    list_add(&amp;fore200e-&gt;entry, &amp;fore200e_boards);</div><div class='del'>-	}</div><div class='del'>-    }</div><div class='add'>+#ifdef CONFIG_SBUS</div><div class='add'>+	err = of_register_driver(&amp;fore200e_sba_driver, &amp;of_bus_type);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PCI</div><div class='del'>-    if (!pci_register_driver(&amp;fore200e_pca_driver))</div><div class='del'>-	return 0;</div><div class='add'>+	err = pci_register_driver(&amp;fore200e_pca_driver);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-    if (!list_empty(&amp;fore200e_boards))</div><div class='del'>-	return 0;</div><div class='add'>+#ifdef CONFIG_SBUS</div><div class='add'>+	if (err)</div><div class='add'>+		of_unregister_driver(&amp;fore200e_sba_driver);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='del'>-    return -ENODEV;</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static void __exit</div><div class='del'>-fore200e_module_cleanup(void)</div><div class='add'>+static void __exit fore200e_module_cleanup(void)</div><div class='ctx'> {</div><div class='del'>-    struct fore200e *fore200e, *next;</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_PCI</div><div class='del'>-    pci_unregister_driver(&amp;fore200e_pca_driver);</div><div class='add'>+	pci_unregister_driver(&amp;fore200e_pca_driver);</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_SBUS</div><div class='add'>+	of_unregister_driver(&amp;fore200e_sba_driver);</div><div class='ctx'> #endif</div><div class='del'>-</div><div class='del'>-    list_for_each_entry_safe(fore200e, next, &amp;fore200e_boards, entry) {</div><div class='del'>-	fore200e_shutdown(fore200e);</div><div class='del'>-	kfree(fore200e);</div><div class='del'>-    }</div><div class='del'>-    DPRINTK(1, "module being removed\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> static int</div><div class='ctx'> fore200e_proc_read(struct atm_dev *dev, loff_t* pos, char* page)</div><div class='ctx'> {</div><div class='hunk'>@@ -3163,7 +3137,6 @@ static const struct fore200e_bus fore200e_bus[] = {</div><div class='ctx'>       fore200e_pca_dma_sync_for_device,</div><div class='ctx'>       fore200e_pca_dma_chunk_alloc,</div><div class='ctx'>       fore200e_pca_dma_chunk_free,</div><div class='del'>-      NULL,</div><div class='ctx'>       fore200e_pca_configure,</div><div class='ctx'>       fore200e_pca_map,</div><div class='ctx'>       fore200e_pca_reset,</div><div class='hunk'>@@ -3185,7 +3158,6 @@ static const struct fore200e_bus fore200e_bus[] = {</div><div class='ctx'>       fore200e_sba_dma_sync_for_device,</div><div class='ctx'>       fore200e_sba_dma_chunk_alloc,</div><div class='ctx'>       fore200e_sba_dma_chunk_free,</div><div class='del'>-      fore200e_sba_detect, </div><div class='ctx'>       fore200e_sba_configure,</div><div class='ctx'>       fore200e_sba_map,</div><div class='ctx'>       fore200e_sba_reset,</div><div class='head'>diff --git a/drivers/atm/fore200e.h b/drivers/atm/fore200e.h<br/>index 5c6e7adcb19c..7f97c09aaea5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/atm/fore200e.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/atm/fore200e.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/atm/fore200e.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/atm/fore200e.h</a></div><div class='hunk'>@@ -778,9 +778,9 @@ typedef struct fore200e_pca_regs {</div><div class='ctx'> /* SBA-200E registers */</div><div class='ctx'> </div><div class='ctx'> typedef struct fore200e_sba_regs {</div><div class='del'>-    volatile u32 __iomem *hcr;    /* address of host control register              */</div><div class='del'>-    volatile u32 __iomem *bsr;    /* address of burst transfer size register       */</div><div class='del'>-    volatile u32 __iomem *isr;    /* address of interrupt level selection register */</div><div class='add'>+    u32 __iomem *hcr;    /* address of host control register              */</div><div class='add'>+    u32 __iomem *bsr;    /* address of burst transfer size register       */</div><div class='add'>+    u32 __iomem *isr;    /* address of interrupt level selection register */</div><div class='ctx'> } fore200e_sba_regs_t;</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -810,7 +810,6 @@ typedef struct fore200e_bus {</div><div class='ctx'>     void                 (*dma_sync_for_device)(struct fore200e*, u32, int, int);</div><div class='ctx'>     int                  (*dma_chunk_alloc)(struct fore200e*, struct chunk*, int, int, int);</div><div class='ctx'>     void                 (*dma_chunk_free)(struct fore200e*, struct chunk*);</div><div class='del'>-    struct fore200e*     (*detect)(const struct fore200e_bus*, int);</div><div class='ctx'>     int                  (*configure)(struct fore200e*); </div><div class='ctx'>     int                  (*map)(struct fore200e*); </div><div class='ctx'>     void                 (*reset)(struct fore200e*);</div><div class='head'>diff --git a/drivers/atm/horizon.c b/drivers/atm/horizon.c<br/>index c0ac728dc564..615412364e99 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/atm/horizon.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/atm/horizon.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/atm/horizon.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/atm/horizon.c</a></div><div class='hunk'>@@ -635,7 +635,7 @@ static int make_rate (const hrz_dev * dev, u32 c, rounding r,</div><div class='ctx'> 		// take care of rounding</div><div class='ctx'> 		switch (r) {</div><div class='ctx'> 			case round_down:</div><div class='del'>-				pre = (br+(c&lt;&lt;div)-1)/(c&lt;&lt;div);</div><div class='add'>+				pre = DIV_ROUND_UP(br, c&lt;&lt;div);</div><div class='ctx'> 				// but p must be non-zero</div><div class='ctx'> 				if (!pre)</div><div class='ctx'> 					pre = 1;</div><div class='hunk'>@@ -668,7 +668,7 @@ static int make_rate (const hrz_dev * dev, u32 c, rounding r,</div><div class='ctx'> 			// take care of rounding</div><div class='ctx'> 			switch (r) {</div><div class='ctx'> 				case round_down:</div><div class='del'>-					pre = (br+(c&lt;&lt;div)-1)/(c&lt;&lt;div);</div><div class='add'>+					pre = DIV_ROUND_UP(br, c&lt;&lt;div);</div><div class='ctx'> 					break;</div><div class='ctx'> 				case round_nearest:</div><div class='ctx'> 					pre = (br+(c&lt;&lt;div)/2)/(c&lt;&lt;div);</div><div class='hunk'>@@ -698,7 +698,7 @@ got_it:</div><div class='ctx'> 		if (bits)</div><div class='ctx'> 			*bits = (div&lt;&lt;CLOCK_SELECT_SHIFT) | (pre-1);</div><div class='ctx'> 		if (actual) {</div><div class='del'>-			*actual = (br + (pre&lt;&lt;div) - 1) / (pre&lt;&lt;div);</div><div class='add'>+			*actual = DIV_ROUND_UP(br, pre&lt;&lt;div);</div><div class='ctx'> 			PRINTD (DBG_QOS, "actual rate: %u", *actual);</div><div class='ctx'> 		}</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -1967,7 +1967,7 @@ static int __devinit hrz_init (hrz_dev * dev) {</div><div class='ctx'>   // Set the max AAL5 cell count to be just enough to contain the</div><div class='ctx'>   // largest AAL5 frame that the user wants to receive</div><div class='ctx'>   wr_regw (dev, MAX_AAL5_CELL_COUNT_OFF,</div><div class='del'>-	   (max_rx_size + ATM_AAL5_TRAILER + ATM_CELL_PAYLOAD - 1) / ATM_CELL_PAYLOAD);</div><div class='add'>+	   DIV_ROUND_UP(max_rx_size + ATM_AAL5_TRAILER, ATM_CELL_PAYLOAD));</div><div class='ctx'>   </div><div class='ctx'>   // Enable receive</div><div class='ctx'>   wr_regw (dev, RX_CONFIG_OFF, rd_regw (dev, RX_CONFIG_OFF) | RX_ENABLE);</div><div class='head'>diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c<br/>index 3a504e94a4d9..e33ae0025b12 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/atm/idt77252.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/atm/idt77252.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/atm/idt77252.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/atm/idt77252.c</a></div><div class='hunk'>@@ -1114,11 +1114,8 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)</div><div class='ctx'> </div><div class='ctx'> 	rpp = &amp;vc-&gt;rcv.rx_pool;</div><div class='ctx'> </div><div class='add'>+	__skb_queue_tail(&amp;rpp-&gt;queue, skb);</div><div class='ctx'> 	rpp-&gt;len += skb-&gt;len;</div><div class='del'>-	if (!rpp-&gt;count++)</div><div class='del'>-		rpp-&gt;first = skb;</div><div class='del'>-	*rpp-&gt;last = skb;</div><div class='del'>-	rpp-&gt;last = &amp;skb-&gt;next;</div><div class='ctx'> </div><div class='ctx'> 	if (stat &amp; SAR_RSQE_EPDU) {</div><div class='ctx'> 		unsigned char *l1l2;</div><div class='hunk'>@@ -1145,7 +1142,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)</div><div class='ctx'> 			atomic_inc(&amp;vcc-&gt;stats-&gt;rx_err);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='del'>-		if (rpp-&gt;count &gt; 1) {</div><div class='add'>+		if (skb_queue_len(&amp;rpp-&gt;queue) &gt; 1) {</div><div class='ctx'> 			struct sk_buff *sb;</div><div class='ctx'> </div><div class='ctx'> 			skb = dev_alloc_skb(rpp-&gt;len);</div><div class='hunk'>@@ -1161,12 +1158,9 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)</div><div class='ctx'> 				dev_kfree_skb(skb);</div><div class='ctx'> 				return;</div><div class='ctx'> 			}</div><div class='del'>-			sb = rpp-&gt;first;</div><div class='del'>-			for (i = 0; i &lt; rpp-&gt;count; i++) {</div><div class='add'>+			skb_queue_walk(&amp;rpp-&gt;queue, sb)</div><div class='ctx'> 				memcpy(skb_put(skb, sb-&gt;len),</div><div class='ctx'> 				       sb-&gt;data, sb-&gt;len);</div><div class='del'>-				sb = sb-&gt;next;</div><div class='del'>-			}</div><div class='ctx'> </div><div class='ctx'> 			recycle_rx_pool_skb(card, rpp);</div><div class='ctx'> </div><div class='hunk'>@@ -1180,7 +1174,6 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		skb-&gt;next = NULL;</div><div class='ctx'> 		flush_rx_pool(card, rpp);</div><div class='ctx'> </div><div class='ctx'> 		if (!atm_charge(vcc, skb-&gt;truesize)) {</div><div class='hunk'>@@ -1918,25 +1911,18 @@ recycle_rx_skb(struct idt77252_dev *card, struct sk_buff *skb)</div><div class='ctx'> static void</div><div class='ctx'> flush_rx_pool(struct idt77252_dev *card, struct rx_pool *rpp)</div><div class='ctx'> {</div><div class='add'>+	skb_queue_head_init(&amp;rpp-&gt;queue);</div><div class='ctx'> 	rpp-&gt;len = 0;</div><div class='del'>-	rpp-&gt;count = 0;</div><div class='del'>-	rpp-&gt;first = NULL;</div><div class='del'>-	rpp-&gt;last = &amp;rpp-&gt;first;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> recycle_rx_pool_skb(struct idt77252_dev *card, struct rx_pool *rpp)</div><div class='ctx'> {</div><div class='del'>-	struct sk_buff *skb, *next;</div><div class='del'>-	int i;</div><div class='add'>+	struct sk_buff *skb, *tmp;</div><div class='ctx'> </div><div class='del'>-	skb = rpp-&gt;first;</div><div class='del'>-	for (i = 0; i &lt; rpp-&gt;count; i++) {</div><div class='del'>-		next = skb-&gt;next;</div><div class='del'>-		skb-&gt;next = NULL;</div><div class='add'>+	skb_queue_walk_safe(&amp;rpp-&gt;queue, skb, tmp)</div><div class='ctx'> 		recycle_rx_skb(card, skb);</div><div class='del'>-		skb = next;</div><div class='del'>-	}</div><div class='add'>+</div><div class='ctx'> 	flush_rx_pool(card, rpp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2537,7 +2523,7 @@ idt77252_close(struct atm_vcc *vcc)</div><div class='ctx'> 		waitfor_idle(card);</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;card-&gt;cmd_lock, flags);</div><div class='ctx'> </div><div class='del'>-		if (vc-&gt;rcv.rx_pool.count) {</div><div class='add'>+		if (skb_queue_len(&amp;vc-&gt;rcv.rx_pool.queue) != 0) {</div><div class='ctx'> 			DPRINTK("%s: closing a VC with pending rx buffers.\n",</div><div class='ctx'> 				card-&gt;name);</div><div class='ctx'> </div><div class='hunk'>@@ -2970,7 +2956,7 @@ close_card_oam(struct idt77252_dev *card)</div><div class='ctx'> 			waitfor_idle(card);</div><div class='ctx'> 			spin_unlock_irqrestore(&amp;card-&gt;cmd_lock, flags);</div><div class='ctx'> </div><div class='del'>-			if (vc-&gt;rcv.rx_pool.count) {</div><div class='add'>+			if (skb_queue_len(&amp;vc-&gt;rcv.rx_pool.queue) != 0) {</div><div class='ctx'> 				DPRINTK("%s: closing a VC "</div><div class='ctx'> 					"with pending rx buffers.\n",</div><div class='ctx'> 					card-&gt;name);</div><div class='head'>diff --git a/drivers/atm/idt77252.h b/drivers/atm/idt77252.h<br/>index e83eaf120da0..5042bb2dab15 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/atm/idt77252.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/atm/idt77252.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/atm/idt77252.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/atm/idt77252.h</a></div><div class='hunk'>@@ -173,10 +173,8 @@ struct scq_info</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct rx_pool {</div><div class='del'>-	struct sk_buff		*first;</div><div class='del'>-	struct sk_buff		**last;</div><div class='add'>+	struct sk_buff_head	queue;</div><div class='ctx'> 	unsigned int		len;</div><div class='del'>-	unsigned int		count;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct aal1 {</div><div class='head'>diff --git a/drivers/atm/zatm.c b/drivers/atm/zatm.c<br/>index 58583c6ac5be..752b1ba81f7e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/atm/zatm.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/atm/zatm.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/atm/zatm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/atm/zatm.c</a></div><div class='hunk'>@@ -496,8 +496,8 @@ static int open_rx_first(struct atm_vcc *vcc)</div><div class='ctx'> 			vcc-&gt;qos.rxtp.max_sdu = 65464;</div><div class='ctx'> 			/* fix this - we may want to receive 64kB SDUs</div><div class='ctx'> 			   later */</div><div class='del'>-		cells = (vcc-&gt;qos.rxtp.max_sdu+ATM_AAL5_TRAILER+</div><div class='del'>-		    ATM_CELL_PAYLOAD-1)/ATM_CELL_PAYLOAD;</div><div class='add'>+		cells = DIV_ROUND_UP(vcc-&gt;qos.rxtp.max_sdu + ATM_AAL5_TRAILER,</div><div class='add'>+				ATM_CELL_PAYLOAD);</div><div class='ctx'> 		zatm_vcc-&gt;pool = pool_index(cells*ATM_CELL_PAYLOAD);</div><div class='ctx'> 	}</div><div class='ctx'> 	else {</div><div class='hunk'>@@ -820,7 +820,7 @@ static int alloc_shaper(struct atm_dev *dev,int *pcr,int min,int max,int ubr)</div><div class='ctx'> 			}</div><div class='ctx'> 			else {</div><div class='ctx'> 				i = 255;</div><div class='del'>-				m = (ATM_OC3_PCR*255+max-1)/max;</div><div class='add'>+				m = DIV_ROUND_UP(ATM_OC3_PCR*255, max);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		if (i &gt; m) {</div><div class='head'>diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig<br/>index 6318f6b57360..d8e8c49c0cbd 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/base/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/base/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/base/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/base/Kconfig</a></div><div class='hunk'>@@ -54,7 +54,7 @@ config FIRMWARE_IN_KERNEL</div><div class='ctx'> 	  such firmware, and do not wish to use an initrd.</div><div class='ctx'> </div><div class='ctx'> 	  This single option controls the inclusion of firmware for</div><div class='del'>-	  every driver which usees request_firmare() and ships its</div><div class='add'>+	  every driver which uses request_firmare() and ships its</div><div class='ctx'> 	  firmware in the kernel source tree, to avoid a proliferation</div><div class='ctx'> 	  of 'Include firmware for xxx device' options.</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/base/base.h b/drivers/base/base.h<br/>index 31dc0cd84afa..0a5f055dffba 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/base/base.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/base/base.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/base/base.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/base/base.h</a></div><div class='hunk'>@@ -54,7 +54,7 @@ struct driver_private {</div><div class='ctx'>  */</div><div class='ctx'> struct class_private {</div><div class='ctx'> 	struct kset class_subsys;</div><div class='del'>-	struct list_head class_devices;</div><div class='add'>+	struct klist class_devices;</div><div class='ctx'> 	struct list_head class_interfaces;</div><div class='ctx'> 	struct kset class_dirs;</div><div class='ctx'> 	struct mutex class_mutex;</div><div class='head'>diff --git a/drivers/base/bus.c b/drivers/base/bus.c<br/>index ef522ae55480..5aee1c0169ea 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/base/bus.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/base/bus.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/base/bus.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/base/bus.c</a></div><div class='hunk'>@@ -333,9 +333,7 @@ static int match_name(struct device *dev, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	const char *name = data;</div><div class='ctx'> </div><div class='del'>-	if (strcmp(name, dev-&gt;bus_id) == 0)</div><div class='del'>-		return 1;</div><div class='del'>-	return 0;</div><div class='add'>+	return sysfs_streq(name, dev-&gt;bus_id);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -982,6 +980,56 @@ struct klist *bus_get_device_klist(struct bus_type *bus)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(bus_get_device_klist);</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Yes, this forcably breaks the klist abstraction temporarily.  It</div><div class='add'>+ * just wants to sort the klist, not change reference counts and</div><div class='add'>+ * take/drop locks rapidly in the process.  It does all this while</div><div class='add'>+ * holding the lock for the list, so objects can't otherwise be</div><div class='add'>+ * added/removed while we're swizzling.</div><div class='add'>+ */</div><div class='add'>+static void device_insertion_sort_klist(struct device *a, struct list_head *list,</div><div class='add'>+					int (*compare)(const struct device *a,</div><div class='add'>+							const struct device *b))</div><div class='add'>+{</div><div class='add'>+	struct list_head *pos;</div><div class='add'>+	struct klist_node *n;</div><div class='add'>+	struct device *b;</div><div class='add'>+</div><div class='add'>+	list_for_each(pos, list) {</div><div class='add'>+		n = container_of(pos, struct klist_node, n_node);</div><div class='add'>+		b = container_of(n, struct device, knode_bus);</div><div class='add'>+		if (compare(a, b) &lt;= 0) {</div><div class='add'>+			list_move_tail(&amp;a-&gt;knode_bus.n_node,</div><div class='add'>+				       &amp;b-&gt;knode_bus.n_node);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	list_move_tail(&amp;a-&gt;knode_bus.n_node, list);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bus_sort_breadthfirst(struct bus_type *bus,</div><div class='add'>+			   int (*compare)(const struct device *a,</div><div class='add'>+					  const struct device *b))</div><div class='add'>+{</div><div class='add'>+	LIST_HEAD(sorted_devices);</div><div class='add'>+	struct list_head *pos, *tmp;</div><div class='add'>+	struct klist_node *n;</div><div class='add'>+	struct device *dev;</div><div class='add'>+	struct klist *device_klist;</div><div class='add'>+</div><div class='add'>+	device_klist = bus_get_device_klist(bus);</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;device_klist-&gt;k_lock);</div><div class='add'>+	list_for_each_safe(pos, tmp, &amp;device_klist-&gt;k_list) {</div><div class='add'>+		n = container_of(pos, struct klist_node, n_node);</div><div class='add'>+		dev = container_of(n, struct device, knode_bus);</div><div class='add'>+		device_insertion_sort_klist(dev, &amp;sorted_devices, compare);</div><div class='add'>+	}</div><div class='add'>+	list_splice(&amp;sorted_devices, &amp;device_klist-&gt;k_list);</div><div class='add'>+	spin_unlock(&amp;device_klist-&gt;k_lock);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(bus_sort_breadthfirst);</div><div class='add'>+</div><div class='ctx'> int __init buses_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	bus_kset = kset_create_and_add("bus", &amp;bus_uevent_ops, NULL);</div><div class='head'>diff --git a/drivers/base/class.c b/drivers/base/class.c<br/>index cc5e28c8885c..eb85e4312301 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/base/class.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/base/class.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/base/class.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/base/class.c</a></div><div class='hunk'>@@ -135,6 +135,20 @@ static void remove_class_attrs(struct class *cls)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void klist_class_dev_get(struct klist_node *n)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = container_of(n, struct device, knode_class);</div><div class='add'>+</div><div class='add'>+	get_device(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void klist_class_dev_put(struct klist_node *n)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = container_of(n, struct device, knode_class);</div><div class='add'>+</div><div class='add'>+	put_device(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int __class_register(struct class *cls, struct lock_class_key *key)</div><div class='ctx'> {</div><div class='ctx'> 	struct class_private *cp;</div><div class='hunk'>@@ -145,7 +159,7 @@ int __class_register(struct class *cls, struct lock_class_key *key)</div><div class='ctx'> 	cp = kzalloc(sizeof(*cp), GFP_KERNEL);</div><div class='ctx'> 	if (!cp)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	INIT_LIST_HEAD(&amp;cp-&gt;class_devices);</div><div class='add'>+	klist_init(&amp;cp-&gt;class_devices, klist_class_dev_get, klist_class_dev_put);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;cp-&gt;class_interfaces);</div><div class='ctx'> 	kset_init(&amp;cp-&gt;class_dirs);</div><div class='ctx'> 	__mutex_init(&amp;cp-&gt;class_mutex, "struct class mutex", key);</div><div class='hunk'>@@ -269,6 +283,71 @@ char *make_class_name(const char *name, struct kobject *kobj)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * class_dev_iter_init - initialize class device iterator</div><div class='add'>+ * @iter: class iterator to initialize</div><div class='add'>+ * @class: the class we wanna iterate over</div><div class='add'>+ * @start: the device to start iterating from, if any</div><div class='add'>+ * @type: device_type of the devices to iterate over, NULL for all</div><div class='add'>+ *</div><div class='add'>+ * Initialize class iterator @iter such that it iterates over devices</div><div class='add'>+ * of @class.  If @start is set, the list iteration will start there,</div><div class='add'>+ * otherwise if it is NULL, the iteration starts at the beginning of</div><div class='add'>+ * the list.</div><div class='add'>+ */</div><div class='add'>+void class_dev_iter_init(struct class_dev_iter *iter, struct class *class,</div><div class='add'>+			 struct device *start, const struct device_type *type)</div><div class='add'>+{</div><div class='add'>+	struct klist_node *start_knode = NULL;</div><div class='add'>+</div><div class='add'>+	if (start)</div><div class='add'>+		start_knode = &amp;start-&gt;knode_class;</div><div class='add'>+	klist_iter_init_node(&amp;class-&gt;p-&gt;class_devices, &amp;iter-&gt;ki, start_knode);</div><div class='add'>+	iter-&gt;type = type;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(class_dev_iter_init);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * class_dev_iter_next - iterate to the next device</div><div class='add'>+ * @iter: class iterator to proceed</div><div class='add'>+ *</div><div class='add'>+ * Proceed @iter to the next device and return it.  Returns NULL if</div><div class='add'>+ * iteration is complete.</div><div class='add'>+ *</div><div class='add'>+ * The returned device is referenced and won't be released till</div><div class='add'>+ * iterator is proceed to the next device or exited.  The caller is</div><div class='add'>+ * free to do whatever it wants to do with the device including</div><div class='add'>+ * calling back into class code.</div><div class='add'>+ */</div><div class='add'>+struct device *class_dev_iter_next(struct class_dev_iter *iter)</div><div class='add'>+{</div><div class='add'>+	struct klist_node *knode;</div><div class='add'>+	struct device *dev;</div><div class='add'>+</div><div class='add'>+	while (1) {</div><div class='add'>+		knode = klist_next(&amp;iter-&gt;ki);</div><div class='add'>+		if (!knode)</div><div class='add'>+			return NULL;</div><div class='add'>+		dev = container_of(knode, struct device, knode_class);</div><div class='add'>+		if (!iter-&gt;type || iter-&gt;type == dev-&gt;type)</div><div class='add'>+			return dev;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(class_dev_iter_next);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * class_dev_iter_exit - finish iteration</div><div class='add'>+ * @iter: class iterator to finish</div><div class='add'>+ *</div><div class='add'>+ * Finish an iteration.  Always call this function after iteration is</div><div class='add'>+ * complete whether the iteration ran till the end or not.</div><div class='add'>+ */</div><div class='add'>+void class_dev_iter_exit(struct class_dev_iter *iter)</div><div class='add'>+{</div><div class='add'>+	klist_iter_exit(&amp;iter-&gt;ki);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(class_dev_iter_exit);</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * class_for_each_device - device iterator</div><div class='ctx'>  * @class: the class we're iterating</div><div class='ctx'>  * @start: the device to start with in the list, if any.</div><div class='hunk'>@@ -283,13 +362,13 @@ char *make_class_name(const char *name, struct kobject *kobj)</div><div class='ctx'>  * We check the return of @fn each time. If it returns anything</div><div class='ctx'>  * other than 0, we break out and return that value.</div><div class='ctx'>  *</div><div class='del'>- * Note, we hold class-&gt;class_mutex in this function, so it can not be</div><div class='del'>- * re-acquired in @fn, otherwise it will self-deadlocking. For</div><div class='del'>- * example, calls to add or remove class members would be verboten.</div><div class='add'>+ * @fn is allowed to do anything including calling back into class</div><div class='add'>+ * code.  There's no locking restriction.</div><div class='ctx'>  */</div><div class='ctx'> int class_for_each_device(struct class *class, struct device *start,</div><div class='ctx'> 			  void *data, int (*fn)(struct device *, void *))</div><div class='ctx'> {</div><div class='add'>+	struct class_dev_iter iter;</div><div class='ctx'> 	struct device *dev;</div><div class='ctx'> 	int error = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -301,20 +380,13 @@ int class_for_each_device(struct class *class, struct device *start,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;class-&gt;p-&gt;class_mutex);</div><div class='del'>-	list_for_each_entry(dev, &amp;class-&gt;p-&gt;class_devices, node) {</div><div class='del'>-		if (start) {</div><div class='del'>-			if (start == dev)</div><div class='del'>-				start = NULL;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		dev = get_device(dev);</div><div class='add'>+	class_dev_iter_init(&amp;iter, class, start, NULL);</div><div class='add'>+	while ((dev = class_dev_iter_next(&amp;iter))) {</div><div class='ctx'> 		error = fn(dev, data);</div><div class='del'>-		put_device(dev);</div><div class='ctx'> 		if (error)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;class-&gt;p-&gt;class_mutex);</div><div class='add'>+	class_dev_iter_exit(&amp;iter);</div><div class='ctx'> </div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='hunk'>@@ -337,16 +409,15 @@ EXPORT_SYMBOL_GPL(class_for_each_device);</div><div class='ctx'>  *</div><div class='ctx'>  * Note, you will need to drop the reference with put_device() after use.</div><div class='ctx'>  *</div><div class='del'>- * We hold class-&gt;class_mutex in this function, so it can not be</div><div class='del'>- * re-acquired in @match, otherwise it will self-deadlocking. For</div><div class='del'>- * example, calls to add or remove class members would be verboten.</div><div class='add'>+ * @fn is allowed to do anything including calling back into class</div><div class='add'>+ * code.  There's no locking restriction.</div><div class='ctx'>  */</div><div class='ctx'> struct device *class_find_device(struct class *class, struct device *start,</div><div class='ctx'> 				 void *data,</div><div class='ctx'> 				 int (*match)(struct device *, void *))</div><div class='ctx'> {</div><div class='add'>+	struct class_dev_iter iter;</div><div class='ctx'> 	struct device *dev;</div><div class='del'>-	int found = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!class)</div><div class='ctx'> 		return NULL;</div><div class='hunk'>@@ -356,29 +427,23 @@ struct device *class_find_device(struct class *class, struct device *start,</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;class-&gt;p-&gt;class_mutex);</div><div class='del'>-	list_for_each_entry(dev, &amp;class-&gt;p-&gt;class_devices, node) {</div><div class='del'>-		if (start) {</div><div class='del'>-			if (start == dev)</div><div class='del'>-				start = NULL;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		dev = get_device(dev);</div><div class='add'>+	class_dev_iter_init(&amp;iter, class, start, NULL);</div><div class='add'>+	while ((dev = class_dev_iter_next(&amp;iter))) {</div><div class='ctx'> 		if (match(dev, data)) {</div><div class='del'>-			found = 1;</div><div class='add'>+			get_device(dev);</div><div class='ctx'> 			break;</div><div class='del'>-		} else</div><div class='del'>-			put_device(dev);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;class-&gt;p-&gt;class_mutex);</div><div class='add'>+	class_dev_iter_exit(&amp;iter);</div><div class='ctx'> </div><div class='del'>-	return found ? dev : NULL;</div><div class='add'>+	return dev;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(class_find_device);</div><div class='ctx'> </div><div class='ctx'> int class_interface_register(struct class_interface *class_intf)</div><div class='ctx'> {</div><div class='ctx'> 	struct class *parent;</div><div class='add'>+	struct class_dev_iter iter;</div><div class='ctx'> 	struct device *dev;</div><div class='ctx'> </div><div class='ctx'> 	if (!class_intf || !class_intf-&gt;class)</div><div class='hunk'>@@ -391,8 +456,10 @@ int class_interface_register(struct class_interface *class_intf)</div><div class='ctx'> 	mutex_lock(&amp;parent-&gt;p-&gt;class_mutex);</div><div class='ctx'> 	list_add_tail(&amp;class_intf-&gt;node, &amp;parent-&gt;p-&gt;class_interfaces);</div><div class='ctx'> 	if (class_intf-&gt;add_dev) {</div><div class='del'>-		list_for_each_entry(dev, &amp;parent-&gt;p-&gt;class_devices, node)</div><div class='add'>+		class_dev_iter_init(&amp;iter, parent, NULL, NULL);</div><div class='add'>+		while ((dev = class_dev_iter_next(&amp;iter)))</div><div class='ctx'> 			class_intf-&gt;add_dev(dev, class_intf);</div><div class='add'>+		class_dev_iter_exit(&amp;iter);</div><div class='ctx'> 	}</div><div class='ctx'> 	mutex_unlock(&amp;parent-&gt;p-&gt;class_mutex);</div><div class='ctx'> </div><div class='hunk'>@@ -402,6 +469,7 @@ int class_interface_register(struct class_interface *class_intf)</div><div class='ctx'> void class_interface_unregister(struct class_interface *class_intf)</div><div class='ctx'> {</div><div class='ctx'> 	struct class *parent = class_intf-&gt;class;</div><div class='add'>+	struct class_dev_iter iter;</div><div class='ctx'> 	struct device *dev;</div><div class='ctx'> </div><div class='ctx'> 	if (!parent)</div><div class='hunk'>@@ -410,8 +478,10 @@ void class_interface_unregister(struct class_interface *class_intf)</div><div class='ctx'> 	mutex_lock(&amp;parent-&gt;p-&gt;class_mutex);</div><div class='ctx'> 	list_del_init(&amp;class_intf-&gt;node);</div><div class='ctx'> 	if (class_intf-&gt;remove_dev) {</div><div class='del'>-		list_for_each_entry(dev, &amp;parent-&gt;p-&gt;class_devices, node)</div><div class='add'>+		class_dev_iter_init(&amp;iter, parent, NULL, NULL);</div><div class='add'>+		while ((dev = class_dev_iter_next(&amp;iter)))</div><div class='ctx'> 			class_intf-&gt;remove_dev(dev, class_intf);</div><div class='add'>+		class_dev_iter_exit(&amp;iter);</div><div class='ctx'> 	}</div><div class='ctx'> 	mutex_unlock(&amp;parent-&gt;p-&gt;class_mutex);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/base/core.c b/drivers/base/core.c<br/>index d021c98605b3..8c2cc2648f5a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/base/core.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/base/core.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/base/core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/base/core.c</a></div><div class='hunk'>@@ -523,11 +523,16 @@ static void klist_children_put(struct klist_node *n)</div><div class='ctx'>  * device_initialize - init device structure.</div><div class='ctx'>  * @dev: device.</div><div class='ctx'>  *</div><div class='del'>- * This prepares the device for use by other layers,</div><div class='del'>- * including adding it to the device hierarchy.</div><div class='add'>+ * This prepares the device for use by other layers by initializing</div><div class='add'>+ * its fields.</div><div class='ctx'>  * It is the first half of device_register(), if called by</div><div class='del'>- * that, though it can also be called separately, so one</div><div class='del'>- * may use @dev's fields (e.g. the refcount).</div><div class='add'>+ * that function, though it can also be called separately, so one</div><div class='add'>+ * may use @dev's fields. In particular, get_device()/put_device()</div><div class='add'>+ * may be used for reference counting of @dev after calling this</div><div class='add'>+ * function.</div><div class='add'>+ *</div><div class='add'>+ * NOTE: Use put_device() to give up your reference instead of freeing</div><div class='add'>+ * @dev directly once you have called this function.</div><div class='ctx'>  */</div><div class='ctx'> void device_initialize(struct device *dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -536,7 +541,6 @@ void device_initialize(struct device *dev)</div><div class='ctx'> 	klist_init(&amp;dev-&gt;klist_children, klist_children_get,</div><div class='ctx'> 		   klist_children_put);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;dev-&gt;dma_pools);</div><div class='del'>-	INIT_LIST_HEAD(&amp;dev-&gt;node);</div><div class='ctx'> 	init_MUTEX(&amp;dev-&gt;sem);</div><div class='ctx'> 	spin_lock_init(&amp;dev-&gt;devres_lock);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;dev-&gt;devres_head);</div><div class='hunk'>@@ -836,9 +840,13 @@ static void device_remove_sys_dev_entry(struct device *dev)</div><div class='ctx'>  * This is part 2 of device_register(), though may be called</div><div class='ctx'>  * separately _iff_ device_initialize() has been called separately.</div><div class='ctx'>  *</div><div class='del'>- * This adds it to the kobject hierarchy via kobject_add(), adds it</div><div class='add'>+ * This adds @dev to the kobject hierarchy via kobject_add(), adds it</div><div class='ctx'>  * to the global and sibling lists for the device, then</div><div class='ctx'>  * adds it to the other relevant subsystems of the driver model.</div><div class='add'>+ *</div><div class='add'>+ * NOTE: _Never_ directly free @dev after calling this function, even</div><div class='add'>+ * if it returned an error! Always use put_device() to give up your</div><div class='add'>+ * reference instead.</div><div class='ctx'>  */</div><div class='ctx'> int device_add(struct device *dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -916,7 +924,8 @@ int device_add(struct device *dev)</div><div class='ctx'> 	if (dev-&gt;class) {</div><div class='ctx'> 		mutex_lock(&amp;dev-&gt;class-&gt;p-&gt;class_mutex);</div><div class='ctx'> 		/* tie the class to the device */</div><div class='del'>-		list_add_tail(&amp;dev-&gt;node, &amp;dev-&gt;class-&gt;p-&gt;class_devices);</div><div class='add'>+		klist_add_tail(&amp;dev-&gt;knode_class,</div><div class='add'>+			       &amp;dev-&gt;class-&gt;p-&gt;class_devices);</div><div class='ctx'> </div><div class='ctx'> 		/* notify any interfaces that the device is here */</div><div class='ctx'> 		list_for_each_entry(class_intf,</div><div class='hunk'>@@ -965,6 +974,10 @@ done:</div><div class='ctx'>  * I.e. you should only call the two helpers separately if</div><div class='ctx'>  * have a clearly defined need to use and refcount the device</div><div class='ctx'>  * before it is added to the hierarchy.</div><div class='add'>+ *</div><div class='add'>+ * NOTE: _Never_ directly free @dev after calling this function, even</div><div class='add'>+ * if it returned an error! Always use put_device() to give up the</div><div class='add'>+ * reference initialized in this function instead.</div><div class='ctx'>  */</div><div class='ctx'> int device_register(struct device *dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -1032,7 +1045,7 @@ void device_del(struct device *dev)</div><div class='ctx'> 			if (class_intf-&gt;remove_dev)</div><div class='ctx'> 				class_intf-&gt;remove_dev(dev, class_intf);</div><div class='ctx'> 		/* remove the device from the class list */</div><div class='del'>-		list_del_init(&amp;dev-&gt;node);</div><div class='add'>+		klist_del(&amp;dev-&gt;knode_class);</div><div class='ctx'> 		mutex_unlock(&amp;dev-&gt;class-&gt;p-&gt;class_mutex);</div><div class='ctx'> 	}</div><div class='ctx'> 	device_remove_file(dev, &amp;uevent_attr);</div><div class='hunk'>@@ -1243,7 +1256,7 @@ struct device *device_create_vargs(struct class *class, struct device *parent,</div><div class='ctx'> 	return dev;</div><div class='ctx'> </div><div class='ctx'> error:</div><div class='del'>-	kfree(dev);</div><div class='add'>+	put_device(dev);</div><div class='ctx'> 	return ERR_PTR(retval);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(device_create_vargs);</div><div class='hunk'>@@ -1314,6 +1327,11 @@ EXPORT_SYMBOL_GPL(device_destroy);</div><div class='ctx'>  * device_rename - renames a device</div><div class='ctx'>  * @dev: the pointer to the struct device to be renamed</div><div class='ctx'>  * @new_name: the new name of the device</div><div class='add'>+ *</div><div class='add'>+ * It is the responsibility of the caller to provide mutual</div><div class='add'>+ * exclusion between two different calls of device_rename</div><div class='add'>+ * on the same device to ensure that new_name is valid and</div><div class='add'>+ * won't conflict with other devices.</div><div class='ctx'>  */</div><div class='ctx'> int device_rename(struct device *dev, char *new_name)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/base/dd.c b/drivers/base/dd.c<br/>index 3ac443b2ac08..20febc00a525 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/base/dd.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/base/dd.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/base/dd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/base/dd.c</a></div><div class='hunk'>@@ -257,6 +257,9 @@ static int __driver_attach(struct device *dev, void *data)</div><div class='ctx'> 	 * is an error.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='add'>+	if (drv-&gt;bus-&gt;match &amp;&amp; !drv-&gt;bus-&gt;match(dev, drv))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	if (dev-&gt;parent)	/* Needed for USB */</div><div class='ctx'> 		down(&amp;dev-&gt;parent-&gt;sem);</div><div class='ctx'> 	down(&amp;dev-&gt;sem);</div><div class='head'>diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c<br/>index c9c92b00fd55..b7e571031ecd 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/base/firmware_class.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/base/firmware_class.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/base/firmware_class.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/base/firmware_class.c</a></div><div class='hunk'>@@ -164,8 +164,7 @@ static ssize_t firmware_loading_store(struct device *dev,</div><div class='ctx'> 		}</div><div class='ctx'> 		/* fallthrough */</div><div class='ctx'> 	default:</div><div class='del'>-		printk(KERN_ERR "%s: unexpected value (%d)\n", __func__,</div><div class='del'>-		       loading);</div><div class='add'>+		dev_err(dev, "%s: unexpected value (%d)\n", __func__, loading);</div><div class='ctx'> 		/* fallthrough */</div><div class='ctx'> 	case -1:</div><div class='ctx'> 		fw_load_abort(fw_priv);</div><div class='hunk'>@@ -309,7 +308,7 @@ static int fw_register_device(struct device **dev_p, const char *fw_name,</div><div class='ctx'> 	*dev_p = NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (!fw_priv || !f_dev) {</div><div class='del'>-		printk(KERN_ERR "%s: kmalloc failed\n", __func__);</div><div class='add'>+		dev_err(device, "%s: kmalloc failed\n", __func__);</div><div class='ctx'> 		retval = -ENOMEM;</div><div class='ctx'> 		goto error_kfree;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -329,8 +328,7 @@ static int fw_register_device(struct device **dev_p, const char *fw_name,</div><div class='ctx'> 	f_dev-&gt;uevent_suppress = 1;</div><div class='ctx'> 	retval = device_register(f_dev);</div><div class='ctx'> 	if (retval) {</div><div class='del'>-		printk(KERN_ERR "%s: device_register failed\n",</div><div class='del'>-		       __func__);</div><div class='add'>+		dev_err(device, "%s: device_register failed\n", __func__);</div><div class='ctx'> 		goto error_kfree;</div><div class='ctx'> 	}</div><div class='ctx'> 	*dev_p = f_dev;</div><div class='hunk'>@@ -363,15 +361,13 @@ static int fw_setup_device(struct firmware *fw, struct device **dev_p,</div><div class='ctx'> 	fw_priv-&gt;fw = fw;</div><div class='ctx'> 	retval = sysfs_create_bin_file(&amp;f_dev-&gt;kobj, &amp;fw_priv-&gt;attr_data);</div><div class='ctx'> 	if (retval) {</div><div class='del'>-		printk(KERN_ERR "%s: sysfs_create_bin_file failed\n",</div><div class='del'>-		       __func__);</div><div class='add'>+		dev_err(device, "%s: sysfs_create_bin_file failed\n", __func__);</div><div class='ctx'> 		goto error_unreg;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	retval = device_create_file(f_dev, &amp;dev_attr_loading);</div><div class='ctx'> 	if (retval) {</div><div class='del'>-		printk(KERN_ERR "%s: device_create_file failed\n",</div><div class='del'>-		       __func__);</div><div class='add'>+		dev_err(device, "%s: device_create_file failed\n", __func__);</div><div class='ctx'> 		goto error_unreg;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -401,8 +397,8 @@ _request_firmware(const struct firmware **firmware_p, const char *name,</div><div class='ctx'> </div><div class='ctx'> 	*firmware_p = firmware = kzalloc(sizeof(*firmware), GFP_KERNEL);</div><div class='ctx'> 	if (!firmware) {</div><div class='del'>-		printk(KERN_ERR "%s: kmalloc(struct firmware) failed\n",</div><div class='del'>-		       __func__);</div><div class='add'>+		dev_err(device, "%s: kmalloc(struct firmware) failed\n",</div><div class='add'>+			__func__);</div><div class='ctx'> 		retval = -ENOMEM;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -411,15 +407,15 @@ _request_firmware(const struct firmware **firmware_p, const char *name,</div><div class='ctx'> 	     builtin++) {</div><div class='ctx'> 		if (strcmp(name, builtin-&gt;name))</div><div class='ctx'> 			continue;</div><div class='del'>-		printk(KERN_INFO "firmware: using built-in firmware %s\n",</div><div class='del'>-		       name);</div><div class='add'>+		dev_info(device, "firmware: using built-in firmware %s\n",</div><div class='add'>+			 name);</div><div class='ctx'> 		firmware-&gt;size = builtin-&gt;size;</div><div class='ctx'> 		firmware-&gt;data = builtin-&gt;data;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (uevent)</div><div class='del'>-		printk(KERN_INFO "firmware: requesting %s\n", name);</div><div class='add'>+		dev_info(device, "firmware: requesting %s\n", name);</div><div class='ctx'> </div><div class='ctx'> 	retval = fw_setup_device(firmware, &amp;f_dev, name, device, uevent);</div><div class='ctx'> 	if (retval)</div><div class='head'>diff --git a/drivers/base/platform.c b/drivers/base/platform.c<br/>index 3f940393d6c7..dfcbfe504867 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/base/platform.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/base/platform.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/base/platform.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/base/platform.c</a></div><div class='hunk'>@@ -42,10 +42,8 @@ struct resource *platform_get_resource(struct platform_device *dev,</div><div class='ctx'> 	for (i = 0; i &lt; dev-&gt;num_resources; i++) {</div><div class='ctx'> 		struct resource *r = &amp;dev-&gt;resource[i];</div><div class='ctx'> </div><div class='del'>-		if ((r-&gt;flags &amp; (IORESOURCE_IO|IORESOURCE_MEM|</div><div class='del'>-				 IORESOURCE_IRQ|IORESOURCE_DMA)) == type)</div><div class='del'>-			if (num-- == 0)</div><div class='del'>-				return r;</div><div class='add'>+		if (type == resource_type(r) &amp;&amp; num-- == 0)</div><div class='add'>+			return r;</div><div class='ctx'> 	}</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='hunk'>@@ -78,10 +76,8 @@ struct resource *platform_get_resource_byname(struct platform_device *dev,</div><div class='ctx'> 	for (i = 0; i &lt; dev-&gt;num_resources; i++) {</div><div class='ctx'> 		struct resource *r = &amp;dev-&gt;resource[i];</div><div class='ctx'> </div><div class='del'>-		if ((r-&gt;flags &amp; (IORESOURCE_IO|IORESOURCE_MEM|</div><div class='del'>-				 IORESOURCE_IRQ|IORESOURCE_DMA)) == type)</div><div class='del'>-			if (!strcmp(r-&gt;name, name))</div><div class='del'>-				return r;</div><div class='add'>+		if (type == resource_type(r) &amp;&amp; !strcmp(r-&gt;name, name))</div><div class='add'>+			return r;</div><div class='ctx'> 	}</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='hunk'>@@ -259,9 +255,9 @@ int platform_device_add(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 		p = r-&gt;parent;</div><div class='ctx'> 		if (!p) {</div><div class='del'>-			if (r-&gt;flags &amp; IORESOURCE_MEM)</div><div class='add'>+			if (resource_type(r) == IORESOURCE_MEM)</div><div class='ctx'> 				p = &amp;iomem_resource;</div><div class='del'>-			else if (r-&gt;flags &amp; IORESOURCE_IO)</div><div class='add'>+			else if (resource_type(r) == IORESOURCE_IO)</div><div class='ctx'> 				p = &amp;ioport_resource;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -282,9 +278,14 @@ int platform_device_add(struct platform_device *pdev)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'>  failed:</div><div class='del'>-	while (--i &gt;= 0)</div><div class='del'>-		if (pdev-&gt;resource[i].flags &amp; (IORESOURCE_MEM|IORESOURCE_IO))</div><div class='del'>-			release_resource(&amp;pdev-&gt;resource[i]);</div><div class='add'>+	while (--i &gt;= 0) {</div><div class='add'>+		struct resource *r = &amp;pdev-&gt;resource[i];</div><div class='add'>+		unsigned long type = resource_type(r);</div><div class='add'>+</div><div class='add'>+		if (type == IORESOURCE_MEM || type == IORESOURCE_IO)</div><div class='add'>+			release_resource(r);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(platform_device_add);</div><div class='hunk'>@@ -306,7 +307,9 @@ void platform_device_del(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; i &lt; pdev-&gt;num_resources; i++) {</div><div class='ctx'> 			struct resource *r = &amp;pdev-&gt;resource[i];</div><div class='del'>-			if (r-&gt;flags &amp; (IORESOURCE_MEM|IORESOURCE_IO))</div><div class='add'>+			unsigned long type = resource_type(r);</div><div class='add'>+</div><div class='add'>+			if (type == IORESOURCE_MEM || type == IORESOURCE_IO)</div><div class='ctx'> 				release_resource(r);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -391,6 +394,53 @@ error:</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(platform_device_register_simple);</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * platform_device_register_data</div><div class='add'>+ * @parent: parent device for the device we're adding</div><div class='add'>+ * @name: base name of the device we're adding</div><div class='add'>+ * @id: instance id</div><div class='add'>+ * @data: platform specific data for this platform device</div><div class='add'>+ * @size: size of platform specific data</div><div class='add'>+ *</div><div class='add'>+ * This function creates a simple platform device that requires minimal</div><div class='add'>+ * resource and memory management. Canned release function freeing memory</div><div class='add'>+ * allocated for the device allows drivers using such devices to be</div><div class='add'>+ * unloaded without waiting for the last reference to the device to be</div><div class='add'>+ * dropped.</div><div class='add'>+ */</div><div class='add'>+struct platform_device *platform_device_register_data(</div><div class='add'>+		struct device *parent,</div><div class='add'>+		const char *name, int id,</div><div class='add'>+		const void *data, size_t size)</div><div class='add'>+{</div><div class='add'>+	struct platform_device *pdev;</div><div class='add'>+	int retval;</div><div class='add'>+</div><div class='add'>+	pdev = platform_device_alloc(name, id);</div><div class='add'>+	if (!pdev) {</div><div class='add'>+		retval = -ENOMEM;</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pdev-&gt;dev.parent = parent;</div><div class='add'>+</div><div class='add'>+	if (size) {</div><div class='add'>+		retval = platform_device_add_data(pdev, data, size);</div><div class='add'>+		if (retval)</div><div class='add'>+			goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	retval = platform_device_add(pdev);</div><div class='add'>+	if (retval)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	return pdev;</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	platform_device_put(pdev);</div><div class='add'>+	return ERR_PTR(retval);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int platform_drv_probe(struct device *_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct platform_driver *drv = to_platform_driver(_dev-&gt;driver);</div><div class='hunk'>@@ -862,7 +912,7 @@ static int platform_pm_restore_noirq(struct device *dev)</div><div class='ctx'> </div><div class='ctx'> #endif /* !CONFIG_HIBERNATION */</div><div class='ctx'> </div><div class='del'>-struct pm_ext_ops platform_pm_ops = {</div><div class='add'>+static struct pm_ext_ops platform_pm_ops = {</div><div class='ctx'> 	.base = {</div><div class='ctx'> 		.prepare = platform_pm_prepare,</div><div class='ctx'> 		.complete = platform_pm_complete,</div><div class='head'>diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c<br/>index 273a944d4040..692c20ba5144 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/base/power/main.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/base/power/main.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/base/power/main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/base/power/main.c</a></div><div class='hunk'>@@ -83,7 +83,7 @@ void device_pm_add(struct device *dev)</div><div class='ctx'> 		 * transition is in progress in order to avoid leaving them</div><div class='ctx'> 		 * unhandled down the road</div><div class='ctx'> 		 */</div><div class='del'>-		WARN_ON(true);</div><div class='add'>+		dev_WARN(dev, "Parentless device registered during a PM transaction\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	list_add_tail(&amp;dev-&gt;power.entry, &amp;dpm_list);</div><div class='hunk'>@@ -778,10 +778,7 @@ EXPORT_SYMBOL_GPL(device_suspend);</div><div class='ctx'> </div><div class='ctx'> void __suspend_report_result(const char *function, void *fn, int ret)</div><div class='ctx'> {</div><div class='del'>-	if (ret) {</div><div class='del'>-		printk(KERN_ERR "%s(): ", function);</div><div class='del'>-		print_fn_descriptor_symbol("%s returns ", fn);</div><div class='del'>-		printk("%d\n", ret);</div><div class='del'>-	}</div><div class='add'>+	if (ret)</div><div class='add'>+		printk(KERN_ERR "%s(): %pF returns %d\n", function, fn, ret);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(__suspend_report_result);</div><div class='head'>diff --git a/drivers/block/aoe/aoe.h b/drivers/block/aoe/aoe.h<br/>index 5b4c6e649c11..93f3690396a5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/block/aoe/aoe.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/block/aoe/aoe.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/block/aoe/aoe.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/block/aoe/aoe.h</a></div><div class='hunk'>@@ -159,11 +159,8 @@ struct aoedev {</div><div class='ctx'> 	sector_t ssize;</div><div class='ctx'> 	struct timer_list timer;</div><div class='ctx'> 	spinlock_t lock;</div><div class='del'>-	struct sk_buff *sendq_hd; /* packets needing to be sent, list head */</div><div class='del'>-	struct sk_buff *sendq_tl;</div><div class='del'>-	struct sk_buff *skbpool_hd;</div><div class='del'>-	struct sk_buff *skbpool_tl;</div><div class='del'>-	int nskbpool;</div><div class='add'>+	struct sk_buff_head sendq;</div><div class='add'>+	struct sk_buff_head skbpool;</div><div class='ctx'> 	mempool_t *bufpool;	/* for deadlock-free Buf allocation */</div><div class='ctx'> 	struct list_head bufq;	/* queue of bios to work on */</div><div class='ctx'> 	struct buf *inprocess;	/* the one we're currently working on */</div><div class='hunk'>@@ -199,7 +196,7 @@ int aoedev_flush(const char __user *str, size_t size);</div><div class='ctx'> </div><div class='ctx'> int aoenet_init(void);</div><div class='ctx'> void aoenet_exit(void);</div><div class='del'>-void aoenet_xmit(struct sk_buff *);</div><div class='add'>+void aoenet_xmit(struct sk_buff_head *);</div><div class='ctx'> int is_aoe_netif(struct net_device *ifp);</div><div class='ctx'> int set_aoe_iflist(const char __user *str, size_t size);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/block/aoe/aoeblk.c b/drivers/block/aoe/aoeblk.c<br/>index 0c39782b2660..b82654e883a7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/block/aoe/aoeblk.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/block/aoe/aoeblk.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/block/aoe/aoeblk.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/block/aoe/aoeblk.c</a></div><div class='hunk'>@@ -109,12 +109,12 @@ static const struct attribute_group attr_group = {</div><div class='ctx'> static int</div><div class='ctx'> aoedisk_add_sysfs(struct aoedev *d)</div><div class='ctx'> {</div><div class='del'>-	return sysfs_create_group(&amp;d-&gt;gd-&gt;dev.kobj, &amp;attr_group);</div><div class='add'>+	return sysfs_create_group(&amp;disk_to_dev(d-&gt;gd)-&gt;kobj, &amp;attr_group);</div><div class='ctx'> }</div><div class='ctx'> void</div><div class='ctx'> aoedisk_rm_sysfs(struct aoedev *d)</div><div class='ctx'> {</div><div class='del'>-	sysfs_remove_group(&amp;d-&gt;gd-&gt;dev.kobj, &amp;attr_group);</div><div class='add'>+	sysfs_remove_group(&amp;disk_to_dev(d-&gt;gd)-&gt;kobj, &amp;attr_group);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -158,9 +158,9 @@ aoeblk_release(struct inode *inode, struct file *filp)</div><div class='ctx'> static int</div><div class='ctx'> aoeblk_make_request(struct request_queue *q, struct bio *bio)</div><div class='ctx'> {</div><div class='add'>+	struct sk_buff_head queue;</div><div class='ctx'> 	struct aoedev *d;</div><div class='ctx'> 	struct buf *buf;</div><div class='del'>-	struct sk_buff *sl;</div><div class='ctx'> 	ulong flags;</div><div class='ctx'> </div><div class='ctx'> 	blk_queue_bounce(q, &amp;bio);</div><div class='hunk'>@@ -213,11 +213,11 @@ aoeblk_make_request(struct request_queue *q, struct bio *bio)</div><div class='ctx'> 	list_add_tail(&amp;buf-&gt;bufs, &amp;d-&gt;bufq);</div><div class='ctx'> </div><div class='ctx'> 	aoecmd_work(d);</div><div class='del'>-	sl = d-&gt;sendq_hd;</div><div class='del'>-	d-&gt;sendq_hd = d-&gt;sendq_tl = NULL;</div><div class='add'>+	__skb_queue_head_init(&amp;queue);</div><div class='add'>+	skb_queue_splice_init(&amp;d-&gt;sendq, &amp;queue);</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;d-&gt;lock, flags);</div><div class='del'>-	aoenet_xmit(sl);</div><div class='add'>+	aoenet_xmit(&amp;queue);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -276,7 +276,7 @@ aoeblk_gdalloc(void *vp)</div><div class='ctx'> 	gd-&gt;first_minor = d-&gt;sysminor * AOE_PARTITIONS;</div><div class='ctx'> 	gd-&gt;fops = &amp;aoe_bdops;</div><div class='ctx'> 	gd-&gt;private_data = d;</div><div class='del'>-	gd-&gt;capacity = d-&gt;ssize;</div><div class='add'>+	set_capacity(gd, d-&gt;ssize);</div><div class='ctx'> 	snprintf(gd-&gt;disk_name, sizeof gd-&gt;disk_name, "etherd/e%ld.%d",</div><div class='ctx'> 		d-&gt;aoemajor, d-&gt;aoeminor);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/block/aoe/aoechr.c b/drivers/block/aoe/aoechr.c<br/>index 181ebb85f0be..200efc4d2c1e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/block/aoe/aoechr.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/block/aoe/aoechr.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/block/aoe/aoechr.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/block/aoe/aoechr.c</a></div><div class='hunk'>@@ -9,6 +9,7 @@</div><div class='ctx'> #include &lt;linux/completion.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/smp_lock.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include "aoe.h"</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='hunk'>@@ -103,7 +104,12 @@ loop:</div><div class='ctx'> 		spin_lock_irqsave(&amp;d-&gt;lock, flags);</div><div class='ctx'> 		goto loop;</div><div class='ctx'> 	}</div><div class='del'>-	aoenet_xmit(skb);</div><div class='add'>+	if (skb) {</div><div class='add'>+		struct sk_buff_head queue;</div><div class='add'>+		__skb_queue_head_init(&amp;queue);</div><div class='add'>+		__skb_queue_tail(&amp;queue, skb);</div><div class='add'>+		aoenet_xmit(&amp;queue);</div><div class='add'>+	}</div><div class='ctx'> 	aoecmd_cfg(major, minor);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -278,9 +284,9 @@ aoechr_init(void)</div><div class='ctx'> 		return PTR_ERR(aoe_class);</div><div class='ctx'> 	}</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(chardevs); ++i)</div><div class='del'>-		device_create_drvdata(aoe_class, NULL,</div><div class='del'>-				      MKDEV(AOE_MAJOR, chardevs[i].minor),</div><div class='del'>-				      NULL, chardevs[i].name);</div><div class='add'>+		device_create(aoe_class, NULL,</div><div class='add'>+			      MKDEV(AOE_MAJOR, chardevs[i].minor), NULL,</div><div class='add'>+			      chardevs[i].name);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/block/aoe/aoecmd.c b/drivers/block/aoe/aoecmd.c<br/>index 2f1746295d06..71ff78c9e4d6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/block/aoe/aoecmd.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/block/aoe/aoecmd.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/block/aoe/aoecmd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/block/aoe/aoecmd.c</a></div><div class='hunk'>@@ -114,29 +114,22 @@ ifrotate(struct aoetgt *t)</div><div class='ctx'> static void</div><div class='ctx'> skb_pool_put(struct aoedev *d, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	if (!d-&gt;skbpool_hd)</div><div class='del'>-		d-&gt;skbpool_hd = skb;</div><div class='del'>-	else</div><div class='del'>-		d-&gt;skbpool_tl-&gt;next = skb;</div><div class='del'>-	d-&gt;skbpool_tl = skb;</div><div class='add'>+	__skb_queue_tail(&amp;d-&gt;skbpool, skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct sk_buff *</div><div class='ctx'> skb_pool_get(struct aoedev *d)</div><div class='ctx'> {</div><div class='del'>-	struct sk_buff *skb;</div><div class='add'>+	struct sk_buff *skb = skb_peek(&amp;d-&gt;skbpool);</div><div class='ctx'> </div><div class='del'>-	skb = d-&gt;skbpool_hd;</div><div class='ctx'> 	if (skb &amp;&amp; atomic_read(&amp;skb_shinfo(skb)-&gt;dataref) == 1) {</div><div class='del'>-		d-&gt;skbpool_hd = skb-&gt;next;</div><div class='del'>-		skb-&gt;next = NULL;</div><div class='add'>+		__skb_unlink(skb, &amp;d-&gt;skbpool);</div><div class='ctx'> 		return skb;</div><div class='ctx'> 	}</div><div class='del'>-	if (d-&gt;nskbpool &lt; NSKBPOOLMAX</div><div class='del'>-	&amp;&amp; (skb = new_skb(ETH_ZLEN))) {</div><div class='del'>-		d-&gt;nskbpool++;</div><div class='add'>+	if (skb_queue_len(&amp;d-&gt;skbpool) &lt; NSKBPOOLMAX &amp;&amp;</div><div class='add'>+	    (skb = new_skb(ETH_ZLEN)))</div><div class='ctx'> 		return skb;</div><div class='del'>-	}</div><div class='add'>+</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -293,29 +286,22 @@ aoecmd_ata_rw(struct aoedev *d)</div><div class='ctx'> </div><div class='ctx'> 	skb-&gt;dev = t-&gt;ifp-&gt;nd;</div><div class='ctx'> 	skb = skb_clone(skb, GFP_ATOMIC);</div><div class='del'>-	if (skb) {</div><div class='del'>-		if (d-&gt;sendq_hd)</div><div class='del'>-			d-&gt;sendq_tl-&gt;next = skb;</div><div class='del'>-		else</div><div class='del'>-			d-&gt;sendq_hd = skb;</div><div class='del'>-		d-&gt;sendq_tl = skb;</div><div class='del'>-	}</div><div class='add'>+	if (skb)</div><div class='add'>+		__skb_queue_tail(&amp;d-&gt;sendq, skb);</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* some callers cannot sleep, and they can call this function,</div><div class='ctx'>  * transmitting the packets later, when interrupts are on</div><div class='ctx'>  */</div><div class='del'>-static struct sk_buff *</div><div class='del'>-aoecmd_cfg_pkts(ushort aoemajor, unsigned char aoeminor, struct sk_buff **tail)</div><div class='add'>+static void</div><div class='add'>+aoecmd_cfg_pkts(ushort aoemajor, unsigned char aoeminor, struct sk_buff_head *queue)</div><div class='ctx'> {</div><div class='ctx'> 	struct aoe_hdr *h;</div><div class='ctx'> 	struct aoe_cfghdr *ch;</div><div class='del'>-	struct sk_buff *skb, *sl, *sl_tail;</div><div class='add'>+	struct sk_buff *skb;</div><div class='ctx'> 	struct net_device *ifp;</div><div class='ctx'> </div><div class='del'>-	sl = sl_tail = NULL;</div><div class='del'>-</div><div class='ctx'> 	read_lock(&amp;dev_base_lock);</div><div class='ctx'> 	for_each_netdev(&amp;init_net, ifp) {</div><div class='ctx'> 		dev_hold(ifp);</div><div class='hunk'>@@ -329,8 +315,7 @@ aoecmd_cfg_pkts(ushort aoemajor, unsigned char aoeminor, struct sk_buff **tail)</div><div class='ctx'> 		}</div><div class='ctx'> 		skb_put(skb, sizeof *h + sizeof *ch);</div><div class='ctx'> 		skb-&gt;dev = ifp;</div><div class='del'>-		if (sl_tail == NULL)</div><div class='del'>-			sl_tail = skb;</div><div class='add'>+		__skb_queue_tail(queue, skb);</div><div class='ctx'> 		h = (struct aoe_hdr *) skb_mac_header(skb);</div><div class='ctx'> 		memset(h, 0, sizeof *h + sizeof *ch);</div><div class='ctx'> </div><div class='hunk'>@@ -342,16 +327,10 @@ aoecmd_cfg_pkts(ushort aoemajor, unsigned char aoeminor, struct sk_buff **tail)</div><div class='ctx'> 		h-&gt;minor = aoeminor;</div><div class='ctx'> 		h-&gt;cmd = AOECMD_CFG;</div><div class='ctx'> </div><div class='del'>-		skb-&gt;next = sl;</div><div class='del'>-		sl = skb;</div><div class='ctx'> cont:</div><div class='ctx'> 		dev_put(ifp);</div><div class='ctx'> 	}</div><div class='ctx'> 	read_unlock(&amp;dev_base_lock);</div><div class='del'>-</div><div class='del'>-	if (tail != NULL)</div><div class='del'>-		*tail = sl_tail;</div><div class='del'>-	return sl;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -406,11 +385,7 @@ resend(struct aoedev *d, struct aoetgt *t, struct frame *f)</div><div class='ctx'> 	skb = skb_clone(skb, GFP_ATOMIC);</div><div class='ctx'> 	if (skb == NULL)</div><div class='ctx'> 		return;</div><div class='del'>-	if (d-&gt;sendq_hd)</div><div class='del'>-		d-&gt;sendq_tl-&gt;next = skb;</div><div class='del'>-	else</div><div class='del'>-		d-&gt;sendq_hd = skb;</div><div class='del'>-	d-&gt;sendq_tl = skb;</div><div class='add'>+	__skb_queue_tail(&amp;d-&gt;sendq, skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -508,16 +483,15 @@ ata_scnt(unsigned char *packet) {</div><div class='ctx'> static void</div><div class='ctx'> rexmit_timer(ulong vp)</div><div class='ctx'> {</div><div class='add'>+	struct sk_buff_head queue;</div><div class='ctx'> 	struct aoedev *d;</div><div class='ctx'> 	struct aoetgt *t, **tt, **te;</div><div class='ctx'> 	struct aoeif *ifp;</div><div class='ctx'> 	struct frame *f, *e;</div><div class='del'>-	struct sk_buff *sl;</div><div class='ctx'> 	register long timeout;</div><div class='ctx'> 	ulong flags, n;</div><div class='ctx'> </div><div class='ctx'> 	d = (struct aoedev *) vp;</div><div class='del'>-	sl = NULL;</div><div class='ctx'> </div><div class='ctx'> 	/* timeout is always ~150% of the moving average */</div><div class='ctx'> 	timeout = d-&gt;rttavg;</div><div class='hunk'>@@ -589,7 +563,7 @@ rexmit_timer(ulong vp)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (d-&gt;sendq_hd) {</div><div class='add'>+	if (!skb_queue_empty(&amp;d-&gt;sendq)) {</div><div class='ctx'> 		n = d-&gt;rttavg &lt;&lt;= 1;</div><div class='ctx'> 		if (n &gt; MAXTIMER)</div><div class='ctx'> 			d-&gt;rttavg = MAXTIMER;</div><div class='hunk'>@@ -600,15 +574,15 @@ rexmit_timer(ulong vp)</div><div class='ctx'> 		aoecmd_work(d);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	sl = d-&gt;sendq_hd;</div><div class='del'>-	d-&gt;sendq_hd = d-&gt;sendq_tl = NULL;</div><div class='add'>+	__skb_queue_head_init(&amp;queue);</div><div class='add'>+	skb_queue_splice_init(&amp;d-&gt;sendq, &amp;queue);</div><div class='ctx'> </div><div class='ctx'> 	d-&gt;timer.expires = jiffies + TIMERTICK;</div><div class='ctx'> 	add_timer(&amp;d-&gt;timer);</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;d-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-	aoenet_xmit(sl);</div><div class='add'>+	aoenet_xmit(&amp;queue);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* enters with d-&gt;lock held */</div><div class='hunk'>@@ -645,7 +619,7 @@ aoecmd_sleepwork(struct work_struct *work)</div><div class='ctx'> 		unsigned long flags;</div><div class='ctx'> 		u64 ssize;</div><div class='ctx'> </div><div class='del'>-		ssize = d-&gt;gd-&gt;capacity;</div><div class='add'>+		ssize = get_capacity(d-&gt;gd);</div><div class='ctx'> 		bd = bdget_disk(d-&gt;gd, 0);</div><div class='ctx'> </div><div class='ctx'> 		if (bd) {</div><div class='hunk'>@@ -707,7 +681,7 @@ ataid_complete(struct aoedev *d, struct aoetgt *t, unsigned char *id)</div><div class='ctx'> 	if (d-&gt;flags &amp; (DEVFL_GDALLOC|DEVFL_NEWSIZE))</div><div class='ctx'> 		return;</div><div class='ctx'> 	if (d-&gt;gd != NULL) {</div><div class='del'>-		d-&gt;gd-&gt;capacity = ssize;</div><div class='add'>+		set_capacity(d-&gt;gd, ssize);</div><div class='ctx'> 		d-&gt;flags |= DEVFL_NEWSIZE;</div><div class='ctx'> 	} else</div><div class='ctx'> 		d-&gt;flags |= DEVFL_GDALLOC;</div><div class='hunk'>@@ -756,23 +730,28 @@ diskstats(struct gendisk *disk, struct bio *bio, ulong duration, sector_t sector</div><div class='ctx'> 	unsigned long n_sect = bio-&gt;bi_size &gt;&gt; 9;</div><div class='ctx'> 	const int rw = bio_data_dir(bio);</div><div class='ctx'> 	struct hd_struct *part;</div><div class='add'>+	int cpu;</div><div class='add'>+</div><div class='add'>+	cpu = part_stat_lock();</div><div class='add'>+	part = disk_map_sector_rcu(disk, sector);</div><div class='add'>+</div><div class='add'>+	part_stat_inc(cpu, part, ios[rw]);</div><div class='add'>+	part_stat_add(cpu, part, ticks[rw], duration);</div><div class='add'>+	part_stat_add(cpu, part, sectors[rw], n_sect);</div><div class='add'>+	part_stat_add(cpu, part, io_ticks, duration);</div><div class='ctx'> </div><div class='del'>-	part = get_part(disk, sector);</div><div class='del'>-	all_stat_inc(disk, part, ios[rw], sector);</div><div class='del'>-	all_stat_add(disk, part, ticks[rw], duration, sector);</div><div class='del'>-	all_stat_add(disk, part, sectors[rw], n_sect, sector);</div><div class='del'>-	all_stat_add(disk, part, io_ticks, duration, sector);</div><div class='add'>+	part_stat_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void</div><div class='ctx'> aoecmd_ata_rsp(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='add'>+	struct sk_buff_head queue;</div><div class='ctx'> 	struct aoedev *d;</div><div class='ctx'> 	struct aoe_hdr *hin, *hout;</div><div class='ctx'> 	struct aoe_atahdr *ahin, *ahout;</div><div class='ctx'> 	struct frame *f;</div><div class='ctx'> 	struct buf *buf;</div><div class='del'>-	struct sk_buff *sl;</div><div class='ctx'> 	struct aoetgt *t;</div><div class='ctx'> 	struct aoeif *ifp;</div><div class='ctx'> 	register long n;</div><div class='hunk'>@@ -893,21 +872,21 @@ aoecmd_ata_rsp(struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	aoecmd_work(d);</div><div class='ctx'> xmit:</div><div class='del'>-	sl = d-&gt;sendq_hd;</div><div class='del'>-	d-&gt;sendq_hd = d-&gt;sendq_tl = NULL;</div><div class='add'>+	__skb_queue_head_init(&amp;queue);</div><div class='add'>+	skb_queue_splice_init(&amp;d-&gt;sendq, &amp;queue);</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;d-&gt;lock, flags);</div><div class='del'>-	aoenet_xmit(sl);</div><div class='add'>+	aoenet_xmit(&amp;queue);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void</div><div class='ctx'> aoecmd_cfg(ushort aoemajor, unsigned char aoeminor)</div><div class='ctx'> {</div><div class='del'>-	struct sk_buff *sl;</div><div class='add'>+	struct sk_buff_head queue;</div><div class='ctx'> </div><div class='del'>-	sl = aoecmd_cfg_pkts(aoemajor, aoeminor, NULL);</div><div class='del'>-</div><div class='del'>-	aoenet_xmit(sl);</div><div class='add'>+	__skb_queue_head_init(&amp;queue);</div><div class='add'>+	aoecmd_cfg_pkts(aoemajor, aoeminor, &amp;queue);</div><div class='add'>+	aoenet_xmit(&amp;queue);</div><div class='ctx'> }</div><div class='ctx'>  </div><div class='ctx'> struct sk_buff *</div><div class='hunk'>@@ -1076,7 +1055,12 @@ aoecmd_cfg_rsp(struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;d-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-	aoenet_xmit(sl);</div><div class='add'>+	if (sl) {</div><div class='add'>+		struct sk_buff_head queue;</div><div class='add'>+		__skb_queue_head_init(&amp;queue);</div><div class='add'>+		__skb_queue_tail(&amp;queue, sl);</div><div class='add'>+		aoenet_xmit(&amp;queue);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void</div><div class='head'>diff --git a/drivers/block/aoe/aoedev.c b/drivers/block/aoe/aoedev.c<br/>index a1d813ab0d6b..cc250577d405 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/block/aoe/aoedev.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/block/aoe/aoedev.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/block/aoe/aoedev.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/block/aoe/aoedev.c</a></div><div class='hunk'>@@ -91,7 +91,7 @@ aoedev_downdev(struct aoedev *d)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (d-&gt;gd)</div><div class='del'>-		d-&gt;gd-&gt;capacity = 0;</div><div class='add'>+		set_capacity(d-&gt;gd, 0);</div><div class='ctx'> </div><div class='ctx'> 	d-&gt;flags &amp;= ~DEVFL_UP;</div><div class='ctx'> }</div><div class='hunk'>@@ -188,14 +188,12 @@ skbfree(struct sk_buff *skb)</div><div class='ctx'> static void</div><div class='ctx'> skbpoolfree(struct aoedev *d)</div><div class='ctx'> {</div><div class='del'>-	struct sk_buff *skb;</div><div class='add'>+	struct sk_buff *skb, *tmp;</div><div class='ctx'> </div><div class='del'>-	while ((skb = d-&gt;skbpool_hd)) {</div><div class='del'>-		d-&gt;skbpool_hd = skb-&gt;next;</div><div class='del'>-		skb-&gt;next = NULL;</div><div class='add'>+	skb_queue_walk_safe(&amp;d-&gt;skbpool, skb, tmp)</div><div class='ctx'> 		skbfree(skb);</div><div class='del'>-	}</div><div class='del'>-	d-&gt;skbpool_tl = NULL;</div><div class='add'>+</div><div class='add'>+	__skb_queue_head_init(&amp;d-&gt;skbpool);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* find it or malloc it */</div><div class='hunk'>@@ -217,6 +215,8 @@ aoedev_by_sysminor_m(ulong sysminor)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	INIT_WORK(&amp;d-&gt;work, aoecmd_sleepwork);</div><div class='ctx'> 	spin_lock_init(&amp;d-&gt;lock);</div><div class='add'>+	skb_queue_head_init(&amp;d-&gt;sendq);</div><div class='add'>+	skb_queue_head_init(&amp;d-&gt;skbpool);</div><div class='ctx'> 	init_timer(&amp;d-&gt;timer);</div><div class='ctx'> 	d-&gt;timer.data = (ulong) d;</div><div class='ctx'> 	d-&gt;timer.function = dummy_timer;</div><div class='head'>diff --git a/drivers/block/aoe/aoemain.c b/drivers/block/aoe/aoemain.c<br/>index 7b15a5e9cec0..7f83ad90e76f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/block/aoe/aoemain.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/block/aoe/aoemain.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/block/aoe/aoemain.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/block/aoe/aoemain.c</a></div><div class='hunk'>@@ -7,6 +7,7 @@</div><div class='ctx'> #include &lt;linux/hdreg.h&gt;</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include "aoe.h"</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/block/aoe/aoenet.c b/drivers/block/aoe/aoenet.c<br/>index 0c81ca731287..9157d64270cb 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/block/aoe/aoenet.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/block/aoe/aoenet.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/block/aoe/aoenet.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/block/aoe/aoenet.c</a></div><div class='hunk'>@@ -95,13 +95,12 @@ mac_addr(char addr[6])</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void</div><div class='del'>-aoenet_xmit(struct sk_buff *sl)</div><div class='add'>+aoenet_xmit(struct sk_buff_head *queue)</div><div class='ctx'> {</div><div class='del'>-	struct sk_buff *skb;</div><div class='add'>+	struct sk_buff *skb, *tmp;</div><div class='ctx'> </div><div class='del'>-	while ((skb = sl)) {</div><div class='del'>-		sl = sl-&gt;next;</div><div class='del'>-		skb-&gt;next = skb-&gt;prev = NULL;</div><div class='add'>+	skb_queue_walk_safe(queue, skb, tmp) {</div><div class='add'>+		__skb_unlink(skb, queue);</div><div class='ctx'> 		dev_queue_xmit(skb);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/block/ataflop.c b/drivers/block/ataflop.c<br/>index 49f274197b16..432cf4018291 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/block/ataflop.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/block/ataflop.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/block/ataflop.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/block/ataflop.c</a></div><div class='hunk'>@@ -1882,10 +1882,6 @@ static int __init atari_floppy_init (void)</div><div class='ctx'> 		/* Amiga, Mac, ... don't have Atari-compatible floppy :-) */</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	if (MACH_IS_HADES)</div><div class='del'>-		/* Hades doesn't have Atari-compatible floppy */</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='ctx'> 	if (register_blkdev(FLOPPY_MAJOR,"fd"))</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c<br/>index b73116ef9236..1e1f9153000c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/block/cciss.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/block/cciss.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/block/cciss.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/block/cciss.c</a></div><div class='hunk'>@@ -3460,8 +3460,8 @@ static int __devinit cciss_init_one(struct pci_dev *pdev,</div><div class='ctx'> 	       hba[i]-&gt;intr[SIMPLE_MODE_INT], dac ? "" : " not");</div><div class='ctx'> </div><div class='ctx'> 	hba[i]-&gt;cmd_pool_bits =</div><div class='del'>-	    kmalloc(((hba[i]-&gt;nr_cmds + BITS_PER_LONG -</div><div class='del'>-		      1) / BITS_PER_LONG) * sizeof(unsigned long), GFP_KERNEL);</div><div class='add'>+	    kmalloc(DIV_ROUND_UP(hba[i]-&gt;nr_cmds, BITS_PER_LONG)</div><div class='add'>+			* sizeof(unsigned long), GFP_KERNEL);</div><div class='ctx'> 	hba[i]-&gt;cmd_pool = (CommandList_struct *)</div><div class='ctx'> 	    pci_alloc_consistent(hba[i]-&gt;pdev,</div><div class='ctx'> 		    hba[i]-&gt;nr_cmds * sizeof(CommandList_struct),</div><div class='hunk'>@@ -3493,8 +3493,8 @@ static int __devinit cciss_init_one(struct pci_dev *pdev,</div><div class='ctx'> 	/* command and error info recs zeroed out before</div><div class='ctx'> 	   they are used */</div><div class='ctx'> 	memset(hba[i]-&gt;cmd_pool_bits, 0,</div><div class='del'>-	       ((hba[i]-&gt;nr_cmds + BITS_PER_LONG -</div><div class='del'>-		 1) / BITS_PER_LONG) * sizeof(unsigned long));</div><div class='add'>+	       DIV_ROUND_UP(hba[i]-&gt;nr_cmds, BITS_PER_LONG)</div><div class='add'>+			* sizeof(unsigned long));</div><div class='ctx'> </div><div class='ctx'> 	hba[i]-&gt;num_luns = 0;</div><div class='ctx'> 	hba[i]-&gt;highest_lun = -1;</div><div class='head'>diff --git a/drivers/block/cciss_scsi.c b/drivers/block/cciss_scsi.c<br/>index e1233aabda77..a3fd87b41444 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/block/cciss_scsi.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/block/cciss_scsi.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/block/cciss_scsi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/block/cciss_scsi.c</a></div><div class='hunk'>@@ -365,7 +365,7 @@ struct scsi2map {</div><div class='ctx'> </div><div class='ctx'> static int </div><div class='ctx'> cciss_scsi_add_entry(int ctlr, int hostno, </div><div class='del'>-		unsigned char *scsi3addr, int devtype,</div><div class='add'>+		struct cciss_scsi_dev_t *device,</div><div class='ctx'> 		struct scsi2map *added, int *nadded)</div><div class='ctx'> {</div><div class='ctx'> 	/* assumes hba[ctlr]-&gt;scsi_ctlr-&gt;lock is held */ </div><div class='hunk'>@@ -384,12 +384,12 @@ cciss_scsi_add_entry(int ctlr, int hostno,</div><div class='ctx'> 	lun = 0;</div><div class='ctx'> 	/* Is this device a non-zero lun of a multi-lun device */</div><div class='ctx'> 	/* byte 4 of the 8-byte LUN addr will contain the logical unit no. */</div><div class='del'>-	if (scsi3addr[4] != 0) {</div><div class='add'>+	if (device-&gt;scsi3addr[4] != 0) {</div><div class='ctx'> 		/* Search through our list and find the device which */</div><div class='ctx'> 		/* has the same 8 byte LUN address, excepting byte 4. */</div><div class='ctx'> 		/* Assign the same bus and target for this new LUN. */</div><div class='ctx'> 		/* Use the logical unit number from the firmware. */</div><div class='del'>-		memcpy(addr1, scsi3addr, 8);</div><div class='add'>+		memcpy(addr1, device-&gt;scsi3addr, 8);</div><div class='ctx'> 		addr1[4] = 0;</div><div class='ctx'> 		for (i = 0; i &lt; n; i++) {</div><div class='ctx'> 			sd = &amp;ccissscsi[ctlr].dev[i];</div><div class='hunk'>@@ -399,7 +399,7 @@ cciss_scsi_add_entry(int ctlr, int hostno,</div><div class='ctx'> 			if (memcmp(addr1, addr2, 8) == 0) {</div><div class='ctx'> 				bus = sd-&gt;bus;</div><div class='ctx'> 				target = sd-&gt;target;</div><div class='del'>-				lun = scsi3addr[4];</div><div class='add'>+				lun = device-&gt;scsi3addr[4];</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -420,8 +420,12 @@ cciss_scsi_add_entry(int ctlr, int hostno,</div><div class='ctx'> 	added[*nadded].lun = sd-&gt;lun;</div><div class='ctx'> 	(*nadded)++;</div><div class='ctx'> </div><div class='del'>-	memcpy(&amp;sd-&gt;scsi3addr[0], scsi3addr, 8);</div><div class='del'>-	sd-&gt;devtype = devtype;</div><div class='add'>+	memcpy(sd-&gt;scsi3addr, device-&gt;scsi3addr, 8);</div><div class='add'>+	memcpy(sd-&gt;vendor, device-&gt;vendor, sizeof(sd-&gt;vendor));</div><div class='add'>+	memcpy(sd-&gt;revision, device-&gt;revision, sizeof(sd-&gt;revision));</div><div class='add'>+	memcpy(sd-&gt;device_id, device-&gt;device_id, sizeof(sd-&gt;device_id));</div><div class='add'>+	sd-&gt;devtype = device-&gt;devtype;</div><div class='add'>+</div><div class='ctx'> 	ccissscsi[ctlr].ndevices++;</div><div class='ctx'> </div><div class='ctx'> 	/* initially, (before registering with scsi layer) we don't </div><div class='hunk'>@@ -487,6 +491,22 @@ static void fixup_botched_add(int ctlr, char *scsi3addr)</div><div class='ctx'> 	CPQ_TAPE_UNLOCK(ctlr, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int device_is_the_same(struct cciss_scsi_dev_t *dev1,</div><div class='add'>+	struct cciss_scsi_dev_t *dev2)</div><div class='add'>+{</div><div class='add'>+	return dev1-&gt;devtype == dev2-&gt;devtype &amp;&amp;</div><div class='add'>+		memcmp(dev1-&gt;scsi3addr, dev2-&gt;scsi3addr,</div><div class='add'>+			sizeof(dev1-&gt;scsi3addr)) == 0 &amp;&amp;</div><div class='add'>+		memcmp(dev1-&gt;device_id, dev2-&gt;device_id,</div><div class='add'>+			sizeof(dev1-&gt;device_id)) == 0 &amp;&amp;</div><div class='add'>+		memcmp(dev1-&gt;vendor, dev2-&gt;vendor,</div><div class='add'>+			sizeof(dev1-&gt;vendor)) == 0 &amp;&amp;</div><div class='add'>+		memcmp(dev1-&gt;model, dev2-&gt;model,</div><div class='add'>+			sizeof(dev1-&gt;model)) == 0 &amp;&amp;</div><div class='add'>+		memcmp(dev1-&gt;revision, dev2-&gt;revision,</div><div class='add'>+			sizeof(dev1-&gt;revision)) == 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int</div><div class='ctx'> adjust_cciss_scsi_table(int ctlr, int hostno,</div><div class='ctx'> 	struct cciss_scsi_dev_t sd[], int nsds)</div><div class='hunk'>@@ -532,7 +552,7 @@ adjust_cciss_scsi_table(int ctlr, int hostno,</div><div class='ctx'> 		for (j=0;j&lt;nsds;j++) {</div><div class='ctx'> 			if (SCSI3ADDR_EQ(sd[j].scsi3addr,</div><div class='ctx'> 				csd-&gt;scsi3addr)) {</div><div class='del'>-				if (sd[j].devtype == csd-&gt;devtype)</div><div class='add'>+				if (device_is_the_same(&amp;sd[j], csd))</div><div class='ctx'> 					found=2;</div><div class='ctx'> 				else</div><div class='ctx'> 					found=1;</div><div class='hunk'>@@ -548,22 +568,26 @@ adjust_cciss_scsi_table(int ctlr, int hostno,</div><div class='ctx'> 			cciss_scsi_remove_entry(ctlr, hostno, i,</div><div class='ctx'> 				removed, &amp;nremoved);</div><div class='ctx'> 			/* remove ^^^, hence i not incremented */</div><div class='del'>-		} </div><div class='del'>-		else if (found == 1) { /* device is different kind */</div><div class='add'>+		} else if (found == 1) { /* device is different in some way */</div><div class='ctx'> 			changes++;</div><div class='del'>-			printk("cciss%d: device c%db%dt%dl%d type changed "</div><div class='del'>-				"(device type now %s).\n",</div><div class='del'>-				ctlr, hostno, csd-&gt;bus, csd-&gt;target, csd-&gt;lun,</div><div class='del'>-					scsi_device_type(csd-&gt;devtype));</div><div class='add'>+			printk("cciss%d: device c%db%dt%dl%d has changed.\n",</div><div class='add'>+				ctlr, hostno, csd-&gt;bus, csd-&gt;target, csd-&gt;lun);</div><div class='ctx'> 			cciss_scsi_remove_entry(ctlr, hostno, i,</div><div class='ctx'> 				removed, &amp;nremoved);</div><div class='ctx'> 			/* remove ^^^, hence i not incremented */</div><div class='del'>-			if (cciss_scsi_add_entry(ctlr, hostno,</div><div class='del'>-				&amp;sd[j].scsi3addr[0], sd[j].devtype,</div><div class='add'>+			if (cciss_scsi_add_entry(ctlr, hostno, &amp;sd[j],</div><div class='ctx'> 				added, &amp;nadded) != 0)</div><div class='ctx'> 				/* we just removed one, so add can't fail. */</div><div class='ctx'> 					BUG();</div><div class='ctx'> 			csd-&gt;devtype = sd[j].devtype;</div><div class='add'>+			memcpy(csd-&gt;device_id, sd[j].device_id,</div><div class='add'>+				sizeof(csd-&gt;device_id));</div><div class='add'>+			memcpy(csd-&gt;vendor, sd[j].vendor,</div><div class='add'>+				sizeof(csd-&gt;vendor));</div><div class='add'>+			memcpy(csd-&gt;model, sd[j].model,</div><div class='add'>+				sizeof(csd-&gt;model));</div><div class='add'>+			memcpy(csd-&gt;revision, sd[j].revision,</div><div class='add'>+				sizeof(csd-&gt;revision));</div><div class='ctx'> 		} else 		/* device is same as it ever was, */</div><div class='ctx'> 			i++;	/* so just move along. */</div><div class='ctx'> 	}</div><div class='hunk'>@@ -577,7 +601,7 @@ adjust_cciss_scsi_table(int ctlr, int hostno,</div><div class='ctx'> 			csd = &amp;ccissscsi[ctlr].dev[j];</div><div class='ctx'> 			if (SCSI3ADDR_EQ(sd[i].scsi3addr,</div><div class='ctx'> 				csd-&gt;scsi3addr)) {</div><div class='del'>-				if (sd[i].devtype == csd-&gt;devtype)</div><div class='add'>+				if (device_is_the_same(&amp;sd[i], csd))</div><div class='ctx'> 					found=2;	/* found device */</div><div class='ctx'> 				else</div><div class='ctx'> 					found=1; 	/* found a bug. */</div><div class='hunk'>@@ -586,16 +610,14 @@ adjust_cciss_scsi_table(int ctlr, int hostno,</div><div class='ctx'> 		}</div><div class='ctx'> 		if (!found) {</div><div class='ctx'> 			changes++;</div><div class='del'>-			if (cciss_scsi_add_entry(ctlr, hostno, </div><div class='del'>-</div><div class='del'>-				&amp;sd[i].scsi3addr[0], sd[i].devtype,</div><div class='add'>+			if (cciss_scsi_add_entry(ctlr, hostno, &amp;sd[i],</div><div class='ctx'> 				added, &amp;nadded) != 0)</div><div class='ctx'> 				break;</div><div class='ctx'> 		} else if (found == 1) {</div><div class='ctx'> 			/* should never happen... */</div><div class='ctx'> 			changes++;</div><div class='del'>-			printk("cciss%d: device unexpectedly changed type\n",</div><div class='del'>-				ctlr);</div><div class='add'>+			printk(KERN_WARNING "cciss%d: device "</div><div class='add'>+				"unexpectedly changed\n", ctlr);</div><div class='ctx'> 			/* but if it does happen, we just ignore that device */</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1012,7 +1034,8 @@ cciss_scsi_interpret_error(CommandList_struct *cp)</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='ctx'> cciss_scsi_do_inquiry(ctlr_info_t *c, unsigned char *scsi3addr, </div><div class='del'>-		 unsigned char *buf, unsigned char bufsize)</div><div class='add'>+	unsigned char page, unsigned char *buf,</div><div class='add'>+	unsigned char bufsize)</div><div class='ctx'> {</div><div class='ctx'> 	int rc;</div><div class='ctx'> 	CommandList_struct *cp;</div><div class='hunk'>@@ -1032,8 +1055,8 @@ cciss_scsi_do_inquiry(ctlr_info_t *c, unsigned char *scsi3addr,</div><div class='ctx'> 	ei = cp-&gt;err_info; </div><div class='ctx'> </div><div class='ctx'> 	cdb[0] = CISS_INQUIRY;</div><div class='del'>-	cdb[1] = 0;</div><div class='del'>-	cdb[2] = 0;</div><div class='add'>+	cdb[1] = (page != 0);</div><div class='add'>+	cdb[2] = page;</div><div class='ctx'> 	cdb[3] = 0;</div><div class='ctx'> 	cdb[4] = bufsize;</div><div class='ctx'> 	cdb[5] = 0;</div><div class='hunk'>@@ -1053,6 +1076,25 @@ cciss_scsi_do_inquiry(ctlr_info_t *c, unsigned char *scsi3addr,</div><div class='ctx'> 	return rc;	</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Get the device id from inquiry page 0x83 */</div><div class='add'>+static int cciss_scsi_get_device_id(ctlr_info_t *c, unsigned char *scsi3addr,</div><div class='add'>+	unsigned char *device_id, int buflen)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+	unsigned char *buf;</div><div class='add'>+</div><div class='add'>+	if (buflen &gt; 16)</div><div class='add'>+		buflen = 16;</div><div class='add'>+	buf = kzalloc(64, GFP_KERNEL);</div><div class='add'>+	if (!buf)</div><div class='add'>+		return -1;</div><div class='add'>+	rc = cciss_scsi_do_inquiry(c, scsi3addr, 0x83, buf, 64);</div><div class='add'>+	if (rc == 0)</div><div class='add'>+		memcpy(device_id, &amp;buf[8], buflen);</div><div class='add'>+	kfree(buf);</div><div class='add'>+	return rc != 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int</div><div class='ctx'> cciss_scsi_do_report_phys_luns(ctlr_info_t *c, </div><div class='ctx'> 		ReportLunData_struct *buf, int bufsize)</div><div class='hunk'>@@ -1142,25 +1184,21 @@ cciss_update_non_disk_devices(int cntl_num, int hostno)</div><div class='ctx'> 	ctlr_info_t *c;</div><div class='ctx'> 	__u32 num_luns=0;</div><div class='ctx'> 	unsigned char *ch;</div><div class='del'>-	/* unsigned char found[CCISS_MAX_SCSI_DEVS_PER_HBA]; */</div><div class='del'>-	struct cciss_scsi_dev_t currentsd[CCISS_MAX_SCSI_DEVS_PER_HBA];</div><div class='add'>+	struct cciss_scsi_dev_t *currentsd, *this_device;</div><div class='ctx'> 	int ncurrent=0;</div><div class='ctx'> 	int reportlunsize = sizeof(*ld_buff) + CISS_MAX_PHYS_LUN * 8;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	c = (ctlr_info_t *) hba[cntl_num];	</div><div class='ctx'> 	ld_buff = kzalloc(reportlunsize, GFP_KERNEL);</div><div class='del'>-	if (ld_buff == NULL) {</div><div class='del'>-		printk(KERN_ERR "cciss: out of memory\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='ctx'> 	inq_buff = kmalloc(OBDR_TAPE_INQ_SIZE, GFP_KERNEL);</div><div class='del'>-        if (inq_buff == NULL) {</div><div class='del'>-                printk(KERN_ERR "cciss: out of memory\n");</div><div class='del'>-                kfree(ld_buff);</div><div class='del'>-                return;</div><div class='add'>+	currentsd = kzalloc(sizeof(*currentsd) *</div><div class='add'>+			(CCISS_MAX_SCSI_DEVS_PER_HBA+1), GFP_KERNEL);</div><div class='add'>+	if (ld_buff == NULL || inq_buff == NULL || currentsd == NULL) {</div><div class='add'>+		printk(KERN_ERR "cciss: out of memory\n");</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='add'>+	this_device = &amp;currentsd[CCISS_MAX_SCSI_DEVS_PER_HBA];</div><div class='ctx'> 	if (cciss_scsi_do_report_phys_luns(c, ld_buff, reportlunsize) == 0) {</div><div class='ctx'> 		ch = &amp;ld_buff-&gt;LUNListLength[0];</div><div class='ctx'> 		num_luns = ((ch[0]&lt;&lt;24) | (ch[1]&lt;&lt;16) | (ch[2]&lt;&lt;8) | ch[3]) / 8;</div><div class='hunk'>@@ -1179,23 +1217,34 @@ cciss_update_non_disk_devices(int cntl_num, int hostno)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 	/* adjust our table of devices */	</div><div class='del'>-	for(i=0; i&lt;num_luns; i++)</div><div class='del'>-	{</div><div class='del'>-		int devtype;</div><div class='del'>-</div><div class='add'>+	for (i = 0; i &lt; num_luns; i++) {</div><div class='ctx'> 		/* for each physical lun, do an inquiry */</div><div class='ctx'> 		if (ld_buff-&gt;LUN[i][3] &amp; 0xC0) continue;</div><div class='ctx'> 		memset(inq_buff, 0, OBDR_TAPE_INQ_SIZE);</div><div class='ctx'> 		memcpy(&amp;scsi3addr[0], &amp;ld_buff-&gt;LUN[i][0], 8);</div><div class='ctx'> </div><div class='del'>-		if (cciss_scsi_do_inquiry(hba[cntl_num], scsi3addr, inq_buff,</div><div class='del'>-			(unsigned char) OBDR_TAPE_INQ_SIZE) != 0) {</div><div class='add'>+		if (cciss_scsi_do_inquiry(hba[cntl_num], scsi3addr, 0, inq_buff,</div><div class='add'>+			(unsigned char) OBDR_TAPE_INQ_SIZE) != 0)</div><div class='ctx'> 			/* Inquiry failed (msg printed already) */</div><div class='del'>-			devtype = 0; /* so we will skip this device. */</div><div class='del'>-		} else /* what kind of device is this? */</div><div class='del'>-			devtype = (inq_buff[0] &amp; 0x1f);</div><div class='del'>-</div><div class='del'>-		switch (devtype)</div><div class='add'>+			continue; /* so we will skip this device. */</div><div class='add'>+</div><div class='add'>+		this_device-&gt;devtype = (inq_buff[0] &amp; 0x1f);</div><div class='add'>+		this_device-&gt;bus = -1;</div><div class='add'>+		this_device-&gt;target = -1;</div><div class='add'>+		this_device-&gt;lun = -1;</div><div class='add'>+		memcpy(this_device-&gt;scsi3addr, scsi3addr, 8);</div><div class='add'>+		memcpy(this_device-&gt;vendor, &amp;inq_buff[8],</div><div class='add'>+			sizeof(this_device-&gt;vendor));</div><div class='add'>+		memcpy(this_device-&gt;model, &amp;inq_buff[16],</div><div class='add'>+			sizeof(this_device-&gt;model));</div><div class='add'>+		memcpy(this_device-&gt;revision, &amp;inq_buff[32],</div><div class='add'>+			sizeof(this_device-&gt;revision));</div><div class='add'>+		memset(this_device-&gt;device_id, 0,</div><div class='add'>+			sizeof(this_device-&gt;device_id));</div><div class='add'>+		cciss_scsi_get_device_id(hba[cntl_num], scsi3addr,</div><div class='add'>+			this_device-&gt;device_id, sizeof(this_device-&gt;device_id));</div><div class='add'>+</div><div class='add'>+		switch (this_device-&gt;devtype)</div><div class='ctx'> 		{</div><div class='ctx'> 		  case 0x05: /* CD-ROM */ {</div><div class='ctx'> </div><div class='hunk'>@@ -1220,15 +1269,10 @@ cciss_update_non_disk_devices(int cntl_num, int hostno)</div><div class='ctx'> 			if (ncurrent &gt;= CCISS_MAX_SCSI_DEVS_PER_HBA) {</div><div class='ctx'> 				printk(KERN_INFO "cciss%d: %s ignored, "</div><div class='ctx'> 					"too many devices.\n", cntl_num,</div><div class='del'>-					scsi_device_type(devtype));</div><div class='add'>+					scsi_device_type(this_device-&gt;devtype));</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='del'>-			memcpy(&amp;currentsd[ncurrent].scsi3addr[0], </div><div class='del'>-				&amp;scsi3addr[0], 8);</div><div class='del'>-			currentsd[ncurrent].devtype = devtype;</div><div class='del'>-			currentsd[ncurrent].bus = -1;</div><div class='del'>-			currentsd[ncurrent].target = -1;</div><div class='del'>-			currentsd[ncurrent].lun = -1;</div><div class='add'>+			currentsd[ncurrent] = *this_device;</div><div class='ctx'> 			ncurrent++;</div><div class='ctx'> 			break;</div><div class='ctx'> 		  default: </div><div class='hunk'>@@ -1240,6 +1284,7 @@ cciss_update_non_disk_devices(int cntl_num, int hostno)</div><div class='ctx'> out:</div><div class='ctx'> 	kfree(inq_buff);</div><div class='ctx'> 	kfree(ld_buff);</div><div class='add'>+	kfree(currentsd);</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/block/cciss_scsi.h b/drivers/block/cciss_scsi.h<br/>index d9c2c586502f..7b750245ae76 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/block/cciss_scsi.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/block/cciss_scsi.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/block/cciss_scsi.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/block/cciss_scsi.h</a></div><div class='hunk'>@@ -66,6 +66,10 @@ struct cciss_scsi_dev_t {</div><div class='ctx'> 	int devtype;</div><div class='ctx'> 	int bus, target, lun;		/* as presented to the OS */</div><div class='ctx'> 	unsigned char scsi3addr[8];	/* as presented to the HW */</div><div class='add'>+	unsigned char device_id[16];	/* from inquiry pg. 0x83 */</div><div class='add'>+	unsigned char vendor[8];	/* bytes 8-15 of inquiry data */</div><div class='add'>+	unsigned char model[16];	/* bytes 16-31 of inquiry data */</div><div class='add'>+	unsigned char revision[4];	/* bytes 32-35 of inquiry data */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct cciss_scsi_hba_t {</div><div class='head'>diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c<br/>index 09c14341e6e3..3d967525e9a9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/block/cpqarray.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/block/cpqarray.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/block/cpqarray.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/block/cpqarray.c</a></div><div class='hunk'>@@ -424,7 +424,7 @@ static int __init cpqarray_register_ctlr( int i, struct pci_dev *pdev)</div><div class='ctx'> 		hba[i]-&gt;pci_dev, NR_CMDS * sizeof(cmdlist_t),</div><div class='ctx'> 		&amp;(hba[i]-&gt;cmd_pool_dhandle));</div><div class='ctx'> 	hba[i]-&gt;cmd_pool_bits = kcalloc(</div><div class='del'>-		(NR_CMDS+BITS_PER_LONG-1)/BITS_PER_LONG, sizeof(unsigned long),</div><div class='add'>+		DIV_ROUND_UP(NR_CMDS, BITS_PER_LONG), sizeof(unsigned long),</div><div class='ctx'> 		GFP_KERNEL);</div><div class='ctx'> </div><div class='ctx'> 	if (!hba[i]-&gt;cmd_pool_bits || !hba[i]-&gt;cmd_pool)</div><div class='head'>diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c<br/>index 395f8ea7981c..2cea27aba9a0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/block/floppy.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/block/floppy.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/block/floppy.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/block/floppy.c</a></div><div class='hunk'>@@ -423,8 +423,15 @@ static struct floppy_raw_cmd *raw_cmd, default_raw_cmd;</div><div class='ctx'>  * 1581's logical side 0 is on physical side 1, whereas the Sharp's logical</div><div class='ctx'>  * side 0 is on physical side 0 (but with the misnamed sector IDs).</div><div class='ctx'>  * 'stretch' should probably be renamed to something more general, like</div><div class='del'>- * 'options'.  Other parameters should be self-explanatory (see also</div><div class='del'>- * setfdprm(8)).</div><div class='add'>+ * 'options'.</div><div class='add'>+ *</div><div class='add'>+ * Bits 2 through 9 of 'stretch' tell the number of the first sector.</div><div class='add'>+ * The LSB (bit 2) is flipped. For most disks, the first sector</div><div class='add'>+ * is 1 (represented by 0x00&lt;&lt;2).  For some CP/M and music sampler</div><div class='add'>+ * disks (such as Ensoniq EPS 16plus) it is 0 (represented as 0x01&lt;&lt;2).</div><div class='add'>+ * For Amstrad CPC disks it is 0xC1 (represented as 0xC0&lt;&lt;2).</div><div class='add'>+ *</div><div class='add'>+ * Other parameters should be self-explanatory (see also setfdprm(8)).</div><div class='ctx'>  */</div><div class='ctx'> /*</div><div class='ctx'> 	    Size</div><div class='hunk'>@@ -1355,20 +1362,20 @@ static void fdc_specify(void)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Convert step rate from microseconds to milliseconds and 4 bits */</div><div class='del'>-	srt = 16 - (DP-&gt;srt * scale_dtr / 1000 + NOMINAL_DTR - 1) / NOMINAL_DTR;</div><div class='add'>+	srt = 16 - DIV_ROUND_UP(DP-&gt;srt * scale_dtr / 1000, NOMINAL_DTR);</div><div class='ctx'> 	if (slow_floppy) {</div><div class='ctx'> 		srt = srt / 4;</div><div class='ctx'> 	}</div><div class='ctx'> 	SUPBOUND(srt, 0xf);</div><div class='ctx'> 	INFBOUND(srt, 0);</div><div class='ctx'> </div><div class='del'>-	hlt = (DP-&gt;hlt * scale_dtr / 2 + NOMINAL_DTR - 1) / NOMINAL_DTR;</div><div class='add'>+	hlt = DIV_ROUND_UP(DP-&gt;hlt * scale_dtr / 2, NOMINAL_DTR);</div><div class='ctx'> 	if (hlt &lt; 0x01)</div><div class='ctx'> 		hlt = 0x01;</div><div class='ctx'> 	else if (hlt &gt; 0x7f)</div><div class='ctx'> 		hlt = hlt_max_code;</div><div class='ctx'> </div><div class='del'>-	hut = (DP-&gt;hut * scale_dtr / 16 + NOMINAL_DTR - 1) / NOMINAL_DTR;</div><div class='add'>+	hut = DIV_ROUND_UP(DP-&gt;hut * scale_dtr / 16, NOMINAL_DTR);</div><div class='ctx'> 	if (hut &lt; 0x1)</div><div class='ctx'> 		hut = 0x1;</div><div class='ctx'> 	else if (hut &gt; 0xf)</div><div class='hunk'>@@ -2236,9 +2243,9 @@ static void setup_format_params(int track)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	if (_floppy-&gt;stretch &amp; FD_ZEROBASED) {</div><div class='add'>+	if (_floppy-&gt;stretch &amp; FD_SECTBASEMASK) {</div><div class='ctx'> 		for (count = 0; count &lt; F_SECT_PER_TRACK; count++)</div><div class='del'>-			here[count].sect--;</div><div class='add'>+			here[count].sect += FD_SECTBASE(_floppy) - 1;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2385,7 +2392,7 @@ static void rw_interrupt(void)</div><div class='ctx'> </div><div class='ctx'> #ifdef FLOPPY_SANITY_CHECK</div><div class='ctx'> 	if (nr_sectors / ssize &gt;</div><div class='del'>-	    (in_sector_offset + current_count_sectors + ssize - 1) / ssize) {</div><div class='add'>+	    DIV_ROUND_UP(in_sector_offset + current_count_sectors, ssize)) {</div><div class='ctx'> 		DPRINT("long rw: %x instead of %lx\n",</div><div class='ctx'> 		       nr_sectors, current_count_sectors);</div><div class='ctx'> 		printk("rs=%d s=%d\n", R_SECTOR, SECTOR);</div><div class='hunk'>@@ -2649,7 +2656,7 @@ static int make_raw_rw_request(void)</div><div class='ctx'> 	}</div><div class='ctx'> 	HEAD = fsector_t / _floppy-&gt;sect;</div><div class='ctx'> </div><div class='del'>-	if (((_floppy-&gt;stretch &amp; (FD_SWAPSIDES | FD_ZEROBASED)) ||</div><div class='add'>+	if (((_floppy-&gt;stretch &amp; (FD_SWAPSIDES | FD_SECTBASEMASK)) ||</div><div class='ctx'> 	     TESTF(FD_NEED_TWADDLE)) &amp;&amp; fsector_t &lt; _floppy-&gt;sect)</div><div class='ctx'> 		max_sector = _floppy-&gt;sect;</div><div class='ctx'> </div><div class='hunk'>@@ -2679,7 +2686,7 @@ static int make_raw_rw_request(void)</div><div class='ctx'> 	CODE2SIZE;</div><div class='ctx'> 	SECT_PER_TRACK = _floppy-&gt;sect &lt;&lt; 2 &gt;&gt; SIZECODE;</div><div class='ctx'> 	SECTOR = ((fsector_t % _floppy-&gt;sect) &lt;&lt; 2 &gt;&gt; SIZECODE) +</div><div class='del'>-	    ((_floppy-&gt;stretch &amp; FD_ZEROBASED) ? 0 : 1);</div><div class='add'>+	    FD_SECTBASE(_floppy);</div><div class='ctx'> </div><div class='ctx'> 	/* tracksize describes the size which can be filled up with sectors</div><div class='ctx'> 	 * of size ssize.</div><div class='hunk'>@@ -3311,7 +3318,7 @@ static inline int set_geometry(unsigned int cmd, struct floppy_struct *g,</div><div class='ctx'> 	    g-&gt;head &lt;= 0 ||</div><div class='ctx'> 	    g-&gt;track &lt;= 0 || g-&gt;track &gt; UDP-&gt;tracks &gt;&gt; STRETCH(g) ||</div><div class='ctx'> 	    /* check if reserved bits are set */</div><div class='del'>-	    (g-&gt;stretch &amp; ~(FD_STRETCH | FD_SWAPSIDES | FD_ZEROBASED)) != 0)</div><div class='add'>+	    (g-&gt;stretch &amp; ~(FD_STRETCH | FD_SWAPSIDES | FD_SECTBASEMASK)) != 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	if (type) {</div><div class='ctx'> 		if (!capable(CAP_SYS_ADMIN))</div><div class='hunk'>@@ -3356,7 +3363,7 @@ static inline int set_geometry(unsigned int cmd, struct floppy_struct *g,</div><div class='ctx'> 		if (DRS-&gt;maxblock &gt; user_params[drive].sect ||</div><div class='ctx'> 		    DRS-&gt;maxtrack ||</div><div class='ctx'> 		    ((user_params[drive].sect ^ oldStretch) &amp;</div><div class='del'>-		     (FD_SWAPSIDES | FD_ZEROBASED)))</div><div class='add'>+		     (FD_SWAPSIDES | FD_SECTBASEMASK)))</div><div class='ctx'> 			invalidate_drive(bdev);</div><div class='ctx'> 		else</div><div class='ctx'> 			process_fd_request();</div><div class='hunk'>@@ -4165,7 +4172,7 @@ static int __init floppy_init(void)</div><div class='ctx'> 	int i, unit, drive;</div><div class='ctx'> 	int err, dr;</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_PPC_MERGE)</div><div class='add'>+#if defined(CONFIG_PPC)</div><div class='ctx'> 	if (check_legacy_ioport(FDC1))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/block/hd.c b/drivers/block/hd.c<br/>index 682243bf2e46..482c0c4b964f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/block/hd.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/block/hd.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/block/hd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/block/hd.c</a></div><div class='hunk'>@@ -39,6 +39,7 @@</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/blkpg.h&gt;</div><div class='add'>+#include &lt;linux/ata.h&gt;</div><div class='ctx'> #include &lt;linux/hdreg.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define REALLY_SLOW_IO</div><div class='hunk'>@@ -370,7 +371,7 @@ repeat:</div><div class='ctx'> 		struct hd_i_struct *disk = &amp;hd_info[i];</div><div class='ctx'> 		disk-&gt;special_op = disk-&gt;recalibrate = 1;</div><div class='ctx'> 		hd_out(disk, disk-&gt;sect, disk-&gt;sect, disk-&gt;head-1,</div><div class='del'>-			disk-&gt;cyl, WIN_SPECIFY, &amp;reset_hd);</div><div class='add'>+			disk-&gt;cyl, ATA_CMD_INIT_DEV_PARAMS, &amp;reset_hd);</div><div class='ctx'> 		if (reset)</div><div class='ctx'> 			goto repeat;</div><div class='ctx'> 	} else</div><div class='hunk'>@@ -558,7 +559,7 @@ static int do_special_op(struct hd_i_struct *disk, struct request *req)</div><div class='ctx'> {</div><div class='ctx'> 	if (disk-&gt;recalibrate) {</div><div class='ctx'> 		disk-&gt;recalibrate = 0;</div><div class='del'>-		hd_out(disk, disk-&gt;sect, 0, 0, 0, WIN_RESTORE, &amp;recal_intr);</div><div class='add'>+		hd_out(disk, disk-&gt;sect, 0, 0, 0, ATA_CMD_RESTORE, &amp;recal_intr);</div><div class='ctx'> 		return reset;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (disk-&gt;head &gt; 16) {</div><div class='hunk'>@@ -631,13 +632,13 @@ repeat:</div><div class='ctx'> 	if (blk_fs_request(req)) {</div><div class='ctx'> 		switch (rq_data_dir(req)) {</div><div class='ctx'> 		case READ:</div><div class='del'>-			hd_out(disk, nsect, sec, head, cyl, WIN_READ,</div><div class='add'>+			hd_out(disk, nsect, sec, head, cyl, ATA_CMD_PIO_READ,</div><div class='ctx'> 				&amp;read_intr);</div><div class='ctx'> 			if (reset)</div><div class='ctx'> 				goto repeat;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case WRITE:</div><div class='del'>-			hd_out(disk, nsect, sec, head, cyl, WIN_WRITE,</div><div class='add'>+			hd_out(disk, nsect, sec, head, cyl, ATA_CMD_PIO_WRITE,</div><div class='ctx'> 				&amp;write_intr);</div><div class='ctx'> 			if (reset)</div><div class='ctx'> 				goto repeat;</div><div class='head'>diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c<br/>index 1778e4a2c672..7b3351260d56 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/block/nbd.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/block/nbd.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/block/nbd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/block/nbd.c</a></div><div class='hunk'>@@ -403,7 +403,7 @@ static int nbd_do_it(struct nbd_device *lo)</div><div class='ctx'> 	BUG_ON(lo-&gt;magic != LO_MAGIC);</div><div class='ctx'> </div><div class='ctx'> 	lo-&gt;pid = current-&gt;pid;</div><div class='del'>-	ret = sysfs_create_file(&amp;lo-&gt;disk-&gt;dev.kobj, &amp;pid_attr.attr);</div><div class='add'>+	ret = sysfs_create_file(&amp;disk_to_dev(lo-&gt;disk)-&gt;kobj, &amp;pid_attr.attr);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		printk(KERN_ERR "nbd: sysfs_create_file failed!");</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -412,7 +412,7 @@ static int nbd_do_it(struct nbd_device *lo)</div><div class='ctx'> 	while ((req = nbd_read_stat(lo)) != NULL)</div><div class='ctx'> 		nbd_end_request(req);</div><div class='ctx'> </div><div class='del'>-	sysfs_remove_file(&amp;lo-&gt;disk-&gt;dev.kobj, &amp;pid_attr.attr);</div><div class='add'>+	sysfs_remove_file(&amp;disk_to_dev(lo-&gt;disk)-&gt;kobj, &amp;pid_attr.attr);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/block/paride/pg.c b/drivers/block/paride/pg.c<br/>index d731ca42f802..9dfa27163001 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/block/paride/pg.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/block/paride/pg.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/block/paride/pg.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/block/paride/pg.c</a></div><div class='hunk'>@@ -686,9 +686,8 @@ static int __init pg_init(void)</div><div class='ctx'> 	for (unit = 0; unit &lt; PG_UNITS; unit++) {</div><div class='ctx'> 		struct pg *dev = &amp;devices[unit];</div><div class='ctx'> 		if (dev-&gt;present)</div><div class='del'>-			device_create_drvdata(pg_class, NULL,</div><div class='del'>-					      MKDEV(major, unit), NULL,</div><div class='del'>-					      "pg%u", unit);</div><div class='add'>+			device_create(pg_class, NULL, MKDEV(major, unit), NULL,</div><div class='add'>+				      "pg%u", unit);</div><div class='ctx'> 	}</div><div class='ctx'> 	err = 0;</div><div class='ctx'> 	goto out;</div><div class='head'>diff --git a/drivers/block/paride/pt.c b/drivers/block/paride/pt.c<br/>index 673b8b2fd337..5ae229656eaa 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/block/paride/pt.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/block/paride/pt.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/block/paride/pt.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/block/paride/pt.c</a></div><div class='hunk'>@@ -979,12 +979,10 @@ static int __init pt_init(void)</div><div class='ctx'> </div><div class='ctx'> 	for (unit = 0; unit &lt; PT_UNITS; unit++)</div><div class='ctx'> 		if (pt[unit].present) {</div><div class='del'>-			device_create_drvdata(pt_class, NULL,</div><div class='del'>-					      MKDEV(major, unit), NULL,</div><div class='del'>-					      "pt%d", unit);</div><div class='del'>-			device_create_drvdata(pt_class, NULL,</div><div class='del'>-					      MKDEV(major, unit + 128), NULL,</div><div class='del'>-					      "pt%dn", unit);</div><div class='add'>+			device_create(pt_class, NULL, MKDEV(major, unit), NULL,</div><div class='add'>+				      "pt%d", unit);</div><div class='add'>+			device_create(pt_class, NULL, MKDEV(major, unit + 128),</div><div class='add'>+				      NULL, "pt%dn", unit);</div><div class='ctx'> 		}</div><div class='ctx'> 	goto out;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c<br/>index 29b7a648cc6e..195ca7c720f5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/block/pktcdvd.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/block/pktcdvd.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/block/pktcdvd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/block/pktcdvd.c</a></div><div class='hunk'>@@ -302,9 +302,8 @@ static struct kobj_type kobj_pkt_type_wqueue = {</div><div class='ctx'> static void pkt_sysfs_dev_new(struct pktcdvd_device *pd)</div><div class='ctx'> {</div><div class='ctx'> 	if (class_pktcdvd) {</div><div class='del'>-		pd-&gt;dev = device_create_drvdata(class_pktcdvd, NULL,</div><div class='del'>-						pd-&gt;pkt_dev, NULL,</div><div class='del'>-						"%s", pd-&gt;name);</div><div class='add'>+		pd-&gt;dev = device_create(class_pktcdvd, NULL, pd-&gt;pkt_dev, NULL,</div><div class='add'>+					"%s", pd-&gt;name);</div><div class='ctx'> 		if (IS_ERR(pd-&gt;dev))</div><div class='ctx'> 			pd-&gt;dev = NULL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2544,7 +2543,7 @@ static int pkt_make_request(struct request_queue *q, struct bio *bio)</div><div class='ctx'> 		if (last_zone != zone) {</div><div class='ctx'> 			BUG_ON(last_zone != zone + pd-&gt;settings.size);</div><div class='ctx'> 			first_sectors = last_zone - bio-&gt;bi_sector;</div><div class='del'>-			bp = bio_split(bio, bio_split_pool, first_sectors);</div><div class='add'>+			bp = bio_split(bio, first_sectors);</div><div class='ctx'> 			BUG_ON(!bp);</div><div class='ctx'> 			pkt_make_request(q, &amp;bp-&gt;bio1);</div><div class='ctx'> 			pkt_make_request(q, &amp;bp-&gt;bio2);</div><div class='hunk'>@@ -2911,7 +2910,7 @@ static int pkt_setup_dev(dev_t dev, dev_t* pkt_dev)</div><div class='ctx'> 	if (!disk-&gt;queue)</div><div class='ctx'> 		goto out_mem2;</div><div class='ctx'> </div><div class='del'>-	pd-&gt;pkt_dev = MKDEV(disk-&gt;major, disk-&gt;first_minor);</div><div class='add'>+	pd-&gt;pkt_dev = MKDEV(pktdev_major, idx);</div><div class='ctx'> 	ret = pkt_new_dev(pd, dev);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out_new_dev;</div><div class='head'>diff --git a/drivers/block/ps3disk.c b/drivers/block/ps3disk.c<br/>index d797e209951d..936466f62afd 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/block/ps3disk.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/block/ps3disk.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/block/ps3disk.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/block/ps3disk.c</a></div><div class='hunk'>@@ -199,7 +199,8 @@ static void ps3disk_do_request(struct ps3_storage_device *dev,</div><div class='ctx'> 		if (blk_fs_request(req)) {</div><div class='ctx'> 			if (ps3disk_submit_request_sg(dev, req))</div><div class='ctx'> 				break;</div><div class='del'>-		} else if (req-&gt;cmd_type == REQ_TYPE_FLUSH) {</div><div class='add'>+		} else if (req-&gt;cmd_type == REQ_TYPE_LINUX_BLOCK &amp;&amp;</div><div class='add'>+			   req-&gt;cmd[0] == REQ_LB_OP_FLUSH) {</div><div class='ctx'> 			if (ps3disk_submit_flush_request(dev, req))</div><div class='ctx'> 				break;</div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -257,7 +258,8 @@ static irqreturn_t ps3disk_interrupt(int irq, void *data)</div><div class='ctx'> 		return IRQ_HANDLED;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (req-&gt;cmd_type == REQ_TYPE_FLUSH) {</div><div class='add'>+	if (req-&gt;cmd_type == REQ_TYPE_LINUX_BLOCK &amp;&amp;</div><div class='add'>+	    req-&gt;cmd[0] == REQ_LB_OP_FLUSH) {</div><div class='ctx'> 		read = 0;</div><div class='ctx'> 		num_sectors = req-&gt;hard_cur_sectors;</div><div class='ctx'> 		op = "flush";</div><div class='hunk'>@@ -405,7 +407,8 @@ static void ps3disk_prepare_flush(struct request_queue *q, struct request *req)</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(&amp;dev-&gt;sbd.core, "%s:%u\n", __func__, __LINE__);</div><div class='ctx'> </div><div class='del'>-	req-&gt;cmd_type = REQ_TYPE_FLUSH;</div><div class='add'>+	req-&gt;cmd_type = REQ_TYPE_LINUX_BLOCK;</div><div class='add'>+	req-&gt;cmd[0] = REQ_LB_OP_FLUSH;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static unsigned long ps3disk_mask;</div><div class='hunk'>@@ -538,7 +541,7 @@ static int ps3disk_remove(struct ps3_system_bus_device *_dev)</div><div class='ctx'> 	struct ps3disk_private *priv = dev-&gt;sbd.core.driver_data;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;ps3disk_mask_mutex);</div><div class='del'>-	__clear_bit(priv-&gt;gendisk-&gt;first_minor / PS3DISK_MINORS,</div><div class='add'>+	__clear_bit(MINOR(disk_devt(priv-&gt;gendisk)) / PS3DISK_MINORS,</div><div class='ctx'> 		    &amp;ps3disk_mask);</div><div class='ctx'> 	mutex_unlock(&amp;ps3disk_mask_mutex);</div><div class='ctx'> 	del_gendisk(priv-&gt;gendisk);</div><div class='head'>diff --git a/drivers/block/sunvdc.c b/drivers/block/sunvdc.c<br/>index a8de037ecd4a..953c0b83d758 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/block/sunvdc.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/block/sunvdc.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/block/sunvdc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/block/sunvdc.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /* sunvdc.c: Sun LDOM Virtual Disk Client.</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2007 David S. Miller &lt;davem@davemloft.net&gt;</div><div class='add'>+ * Copyright (C) 2007, 2008 David S. Miller &lt;davem@davemloft.net&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -834,7 +834,7 @@ static int vdc_port_remove(struct vio_dev *vdev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct vio_device_id vdc_port_match[] = {</div><div class='add'>+static const struct vio_device_id vdc_port_match[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.type = "vdc-port",</div><div class='ctx'> 	},</div><div class='head'>diff --git a/drivers/block/ub.c b/drivers/block/ub.c<br/>index 3a281ef11ffa..f60e41833f69 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/block/ub.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/block/ub.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/block/ub.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/block/ub.c</a></div><div class='hunk'>@@ -349,8 +349,6 @@ struct ub_dev {</div><div class='ctx'> </div><div class='ctx'> 	struct work_struct reset_work;</div><div class='ctx'> 	wait_queue_head_t reset_wait;</div><div class='del'>-</div><div class='del'>-	int sg_stat[6];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -685,7 +683,6 @@ static int ub_request_fn_1(struct ub_lun *lun, struct request *rq)</div><div class='ctx'> 		goto drop;</div><div class='ctx'> 	}</div><div class='ctx'> 	urq-&gt;nsg = n_elem;</div><div class='del'>-	sc-&gt;sg_stat[n_elem &lt; 5 ? n_elem : 5]++;</div><div class='ctx'> </div><div class='ctx'> 	if (blk_pc_request(rq)) {</div><div class='ctx'> 		ub_cmd_build_packet(sc, lun, cmd, urq);</div><div class='head'>diff --git a/drivers/block/viodasd.c b/drivers/block/viodasd.c<br/>index f1c8feb5510b..1730d29e6044 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/block/viodasd.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/block/viodasd.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/block/viodasd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/block/viodasd.c</a></div><div class='hunk'>@@ -249,7 +249,6 @@ static int send_request(struct request *req)</div><div class='ctx'> 	struct HvLpEvent *hev;</div><div class='ctx'> 	struct scatterlist sg[VIOMAXBLOCKDMA];</div><div class='ctx'> 	int sgindex;</div><div class='del'>-	int statindex;</div><div class='ctx'> 	struct viodasd_device *d;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='hunk'>@@ -258,11 +257,9 @@ static int send_request(struct request *req)</div><div class='ctx'> 	if (rq_data_dir(req) == READ) {</div><div class='ctx'> 		direction = DMA_FROM_DEVICE;</div><div class='ctx'> 		viocmd = viomajorsubtype_blockio | vioblockread;</div><div class='del'>-		statindex = 0;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		direction = DMA_TO_DEVICE;</div><div class='ctx'> 		viocmd = viomajorsubtype_blockio | vioblockwrite;</div><div class='del'>-		statindex = 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'>         d = req-&gt;rq_disk-&gt;private_data;</div><div class='head'>diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c<br/>index 42251095134f..6ec5fc052786 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/block/virtio_blk.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/block/virtio_blk.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/block/virtio_blk.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/block/virtio_blk.c</a></div><div class='hunk'>@@ -47,20 +47,20 @@ static void blk_done(struct virtqueue *vq)</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;vblk-&gt;lock, flags);</div><div class='ctx'> 	while ((vbr = vblk-&gt;vq-&gt;vq_ops-&gt;get_buf(vblk-&gt;vq, &amp;len)) != NULL) {</div><div class='del'>-		int uptodate;</div><div class='add'>+		int error;</div><div class='ctx'> 		switch (vbr-&gt;status) {</div><div class='ctx'> 		case VIRTIO_BLK_S_OK:</div><div class='del'>-			uptodate = 1;</div><div class='add'>+			error = 0;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case VIRTIO_BLK_S_UNSUPP:</div><div class='del'>-			uptodate = -ENOTTY;</div><div class='add'>+			error = -ENOTTY;</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='del'>-			uptodate = 0;</div><div class='add'>+			error = -EIO;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		end_dequeued_request(vbr-&gt;req, uptodate);</div><div class='add'>+		__blk_end_request(vbr-&gt;req, error, blk_rq_bytes(vbr-&gt;req));</div><div class='ctx'> 		list_del(&amp;vbr-&gt;list);</div><div class='ctx'> 		mempool_free(vbr, vblk-&gt;pool);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -84,11 +84,11 @@ static bool do_req(struct request_queue *q, struct virtio_blk *vblk,</div><div class='ctx'> 	if (blk_fs_request(vbr-&gt;req)) {</div><div class='ctx'> 		vbr-&gt;out_hdr.type = 0;</div><div class='ctx'> 		vbr-&gt;out_hdr.sector = vbr-&gt;req-&gt;sector;</div><div class='del'>-		vbr-&gt;out_hdr.ioprio = vbr-&gt;req-&gt;ioprio;</div><div class='add'>+		vbr-&gt;out_hdr.ioprio = req_get_ioprio(vbr-&gt;req);</div><div class='ctx'> 	} else if (blk_pc_request(vbr-&gt;req)) {</div><div class='ctx'> 		vbr-&gt;out_hdr.type = VIRTIO_BLK_T_SCSI_CMD;</div><div class='ctx'> 		vbr-&gt;out_hdr.sector = 0;</div><div class='del'>-		vbr-&gt;out_hdr.ioprio = vbr-&gt;req-&gt;ioprio;</div><div class='add'>+		vbr-&gt;out_hdr.ioprio = req_get_ioprio(vbr-&gt;req);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* We don't put anything else in the queue. */</div><div class='ctx'> 		BUG();</div><div class='head'>diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c<br/>index 3ca643cafccd..1a50ae70f716 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/block/xen-blkfront.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/block/xen-blkfront.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/block/xen-blkfront.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/block/xen-blkfront.c</a></div><div class='hunk'>@@ -105,15 +105,17 @@ static DEFINE_SPINLOCK(blkif_io_lock);</div><div class='ctx'> #define GRANT_INVALID_REF	0</div><div class='ctx'> </div><div class='ctx'> #define PARTS_PER_DISK		16</div><div class='add'>+#define PARTS_PER_EXT_DISK      256</div><div class='ctx'> </div><div class='ctx'> #define BLKIF_MAJOR(dev) ((dev)&gt;&gt;8)</div><div class='ctx'> #define BLKIF_MINOR(dev) ((dev) &amp; 0xff)</div><div class='ctx'> </div><div class='del'>-#define DEV_NAME	"xvd"	/* name in /dev */</div><div class='add'>+#define EXT_SHIFT 28</div><div class='add'>+#define EXTENDED (1&lt;&lt;EXT_SHIFT)</div><div class='add'>+#define VDEV_IS_EXTENDED(dev) ((dev)&amp;(EXTENDED))</div><div class='add'>+#define BLKIF_MINOR_EXT(dev) ((dev)&amp;(~EXTENDED))</div><div class='ctx'> </div><div class='del'>-/* Information about our VBDs. */</div><div class='del'>-#define MAX_VBDS 64</div><div class='del'>-static LIST_HEAD(vbds_list);</div><div class='add'>+#define DEV_NAME	"xvd"	/* name in /dev */</div><div class='ctx'> </div><div class='ctx'> static int get_id_from_freelist(struct blkfront_info *info)</div><div class='ctx'> {</div><div class='hunk'>@@ -386,31 +388,60 @@ static int xlvbd_barrier(struct blkfront_info *info)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int xlvbd_alloc_gendisk(int minor, blkif_sector_t capacity,</div><div class='del'>-			       int vdevice, u16 vdisk_info, u16 sector_size,</div><div class='del'>-			       struct blkfront_info *info)</div><div class='add'>+static int xlvbd_alloc_gendisk(blkif_sector_t capacity,</div><div class='add'>+			       struct blkfront_info *info,</div><div class='add'>+			       u16 vdisk_info, u16 sector_size)</div><div class='ctx'> {</div><div class='ctx'> 	struct gendisk *gd;</div><div class='ctx'> 	int nr_minors = 1;</div><div class='ctx'> 	int err = -ENODEV;</div><div class='add'>+	unsigned int offset;</div><div class='add'>+	int minor;</div><div class='add'>+	int nr_parts;</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(info-&gt;gd != NULL);</div><div class='ctx'> 	BUG_ON(info-&gt;rq != NULL);</div><div class='ctx'> </div><div class='del'>-	if ((minor % PARTS_PER_DISK) == 0)</div><div class='del'>-		nr_minors = PARTS_PER_DISK;</div><div class='add'>+	if ((info-&gt;vdevice&gt;&gt;EXT_SHIFT) &gt; 1) {</div><div class='add'>+		/* this is above the extended range; something is wrong */</div><div class='add'>+		printk(KERN_WARNING "blkfront: vdevice 0x%x is above the extended range; ignoring\n", info-&gt;vdevice);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!VDEV_IS_EXTENDED(info-&gt;vdevice)) {</div><div class='add'>+		minor = BLKIF_MINOR(info-&gt;vdevice);</div><div class='add'>+		nr_parts = PARTS_PER_DISK;</div><div class='add'>+	} else {</div><div class='add'>+		minor = BLKIF_MINOR_EXT(info-&gt;vdevice);</div><div class='add'>+		nr_parts = PARTS_PER_EXT_DISK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((minor % nr_parts) == 0)</div><div class='add'>+		nr_minors = nr_parts;</div><div class='ctx'> </div><div class='ctx'> 	gd = alloc_disk(nr_minors);</div><div class='ctx'> 	if (gd == NULL)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	if (nr_minors &gt; 1)</div><div class='del'>-		sprintf(gd-&gt;disk_name, "%s%c", DEV_NAME,</div><div class='del'>-			'a' + minor / PARTS_PER_DISK);</div><div class='del'>-	else</div><div class='del'>-		sprintf(gd-&gt;disk_name, "%s%c%d", DEV_NAME,</div><div class='del'>-			'a' + minor / PARTS_PER_DISK,</div><div class='del'>-			minor % PARTS_PER_DISK);</div><div class='add'>+	offset = minor / nr_parts;</div><div class='add'>+</div><div class='add'>+	if (nr_minors &gt; 1) {</div><div class='add'>+		if (offset &lt; 26)</div><div class='add'>+			sprintf(gd-&gt;disk_name, "%s%c", DEV_NAME, 'a' + offset);</div><div class='add'>+		else</div><div class='add'>+			sprintf(gd-&gt;disk_name, "%s%c%c", DEV_NAME,</div><div class='add'>+				'a' + ((offset / 26)-1), 'a' + (offset % 26));</div><div class='add'>+	} else {</div><div class='add'>+		if (offset &lt; 26)</div><div class='add'>+			sprintf(gd-&gt;disk_name, "%s%c%d", DEV_NAME,</div><div class='add'>+				'a' + offset,</div><div class='add'>+				minor &amp; (nr_parts - 1));</div><div class='add'>+		else</div><div class='add'>+			sprintf(gd-&gt;disk_name, "%s%c%c%d", DEV_NAME,</div><div class='add'>+				'a' + ((offset / 26) - 1),</div><div class='add'>+				'a' + (offset % 26),</div><div class='add'>+				minor &amp; (nr_parts - 1));</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	gd-&gt;major = XENVBD_MAJOR;</div><div class='ctx'> 	gd-&gt;first_minor = minor;</div><div class='hunk'>@@ -699,8 +730,13 @@ static int blkfront_probe(struct xenbus_device *dev,</div><div class='ctx'> 	err = xenbus_scanf(XBT_NIL, dev-&gt;nodename,</div><div class='ctx'> 			   "virtual-device", "%i", &amp;vdevice);</div><div class='ctx'> 	if (err != 1) {</div><div class='del'>-		xenbus_dev_fatal(dev, err, "reading virtual-device");</div><div class='del'>-		return err;</div><div class='add'>+		/* go looking in the extended area instead */</div><div class='add'>+		err = xenbus_scanf(XBT_NIL, dev-&gt;nodename, "virtual-device-ext",</div><div class='add'>+				   "%i", &amp;vdevice);</div><div class='add'>+		if (err != 1) {</div><div class='add'>+			xenbus_dev_fatal(dev, err, "reading virtual-device");</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	info = kzalloc(sizeof(*info), GFP_KERNEL);</div><div class='hunk'>@@ -861,9 +897,7 @@ static void blkfront_connect(struct blkfront_info *info)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		info-&gt;feature_barrier = 0;</div><div class='ctx'> </div><div class='del'>-	err = xlvbd_alloc_gendisk(BLKIF_MINOR(info-&gt;vdevice),</div><div class='del'>-				  sectors, info-&gt;vdevice,</div><div class='del'>-				  binfo, sector_size, info);</div><div class='add'>+	err = xlvbd_alloc_gendisk(sectors, info, binfo, sector_size);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		xenbus_dev_fatal(info-&gt;xbdev, err, "xlvbd_add at %s",</div><div class='ctx'> 				 info-&gt;xbdev-&gt;otherend);</div><div class='hunk'>@@ -1032,7 +1066,7 @@ static struct xenbus_driver blkfront = {</div><div class='ctx'> </div><div class='ctx'> static int __init xlblk_init(void)</div><div class='ctx'> {</div><div class='del'>-	if (!is_running_on_xen())</div><div class='add'>+	if (!xen_domain())</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	if (register_blkdev(XENVBD_MAJOR, DEV_NAME)) {</div><div class='head'>diff --git a/drivers/bluetooth/bluecard_cs.c b/drivers/bluetooth/bluecard_cs.c<br/>index bcf57927b7a8..e6ee21d99d92 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/bluetooth/bluecard_cs.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/bluetooth/bluecard_cs.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/bluetooth/bluecard_cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/bluetooth/bluecard_cs.c</a></div><div class='hunk'>@@ -901,23 +901,23 @@ static int bluecard_config(struct pcmcia_device *link)</div><div class='ctx'> 	for (n = 0; n &lt; 0x400; n += 0x40) {</div><div class='ctx'> 		link-&gt;io.BasePort1 = n ^ 0x300;</div><div class='ctx'> 		i = pcmcia_request_io(link, &amp;link-&gt;io);</div><div class='del'>-		if (i == CS_SUCCESS)</div><div class='add'>+		if (i == 0)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (i != CS_SUCCESS) {</div><div class='add'>+	if (i != 0) {</div><div class='ctx'> 		cs_error(link, RequestIO, i);</div><div class='ctx'> 		goto failed;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	i = pcmcia_request_irq(link, &amp;link-&gt;irq);</div><div class='del'>-	if (i != CS_SUCCESS) {</div><div class='add'>+	if (i != 0) {</div><div class='ctx'> 		cs_error(link, RequestIRQ, i);</div><div class='ctx'> 		link-&gt;irq.AssignedIRQ = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	i = pcmcia_request_configuration(link, &amp;link-&gt;conf);</div><div class='del'>-	if (i != CS_SUCCESS) {</div><div class='add'>+	if (i != 0) {</div><div class='ctx'> 		cs_error(link, RequestConfiguration, i);</div><div class='ctx'> 		goto failed;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/bluetooth/bt3c_cs.c b/drivers/bluetooth/bt3c_cs.c<br/>index 27058477cc8b..2cbe70b66470 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/bluetooth/bt3c_cs.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/bluetooth/bt3c_cs.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/bluetooth/bt3c_cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/bluetooth/bt3c_cs.c</a></div><div class='hunk'>@@ -678,101 +678,78 @@ static void bt3c_detach(struct pcmcia_device *link)</div><div class='ctx'> 	kfree(info);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int get_tuple(struct pcmcia_device *handle, tuple_t *tuple, cisparse_t *parse)</div><div class='add'>+static int bt3c_check_config(struct pcmcia_device *p_dev,</div><div class='add'>+			     cistpl_cftable_entry_t *cf,</div><div class='add'>+			     cistpl_cftable_entry_t *dflt,</div><div class='add'>+			     unsigned int vcc,</div><div class='add'>+			     void *priv_data)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	i = pcmcia_get_tuple_data(handle, tuple);</div><div class='del'>-	if (i != CS_SUCCESS)</div><div class='del'>-		return i;</div><div class='del'>-</div><div class='del'>-	return pcmcia_parse_tuple(handle, tuple, parse);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int first_tuple(struct pcmcia_device *handle, tuple_t *tuple, cisparse_t *parse)</div><div class='del'>-{</div><div class='del'>-	if (pcmcia_get_first_tuple(handle, tuple) != CS_SUCCESS)</div><div class='del'>-		return CS_NO_MORE_ITEMS;</div><div class='del'>-	return get_tuple(handle, tuple, parse);</div><div class='add'>+	unsigned long try = (unsigned long) priv_data;</div><div class='add'>+</div><div class='add'>+	if (cf-&gt;vpp1.present &amp; (1 &lt;&lt; CISTPL_POWER_VNOM))</div><div class='add'>+		p_dev-&gt;conf.Vpp = cf-&gt;vpp1.param[CISTPL_POWER_VNOM] / 10000;</div><div class='add'>+	if ((cf-&gt;io.nwin &gt; 0) &amp;&amp; (cf-&gt;io.win[0].len == 8) &amp;&amp;</div><div class='add'>+	    (cf-&gt;io.win[0].base != 0)) {</div><div class='add'>+		p_dev-&gt;io.BasePort1 = cf-&gt;io.win[0].base;</div><div class='add'>+		p_dev-&gt;io.IOAddrLines = (try == 0) ? 16 :</div><div class='add'>+			cf-&gt;io.flags &amp; CISTPL_IO_LINES_MASK;</div><div class='add'>+		if (!pcmcia_request_io(p_dev, &amp;p_dev-&gt;io))</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='add'>+	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int next_tuple(struct pcmcia_device *handle, tuple_t *tuple, cisparse_t *parse)</div><div class='add'>+static int bt3c_check_config_notpicky(struct pcmcia_device *p_dev,</div><div class='add'>+				      cistpl_cftable_entry_t *cf,</div><div class='add'>+				      cistpl_cftable_entry_t *dflt,</div><div class='add'>+				      unsigned int vcc,</div><div class='add'>+				      void *priv_data)</div><div class='ctx'> {</div><div class='del'>-	if (pcmcia_get_next_tuple(handle, tuple) != CS_SUCCESS)</div><div class='del'>-		return CS_NO_MORE_ITEMS;</div><div class='del'>-	return get_tuple(handle, tuple, parse);</div><div class='add'>+	static unsigned int base[5] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8, 0x0 };</div><div class='add'>+	int j;</div><div class='add'>+</div><div class='add'>+	if ((cf-&gt;io.nwin &gt; 0) &amp;&amp; ((cf-&gt;io.flags &amp; CISTPL_IO_LINES_MASK) &lt;= 3)) {</div><div class='add'>+		for (j = 0; j &lt; 5; j++) {</div><div class='add'>+			p_dev-&gt;io.BasePort1 = base[j];</div><div class='add'>+			p_dev-&gt;io.IOAddrLines = base[j] ? 16 : 3;</div><div class='add'>+			if (!pcmcia_request_io(p_dev, &amp;p_dev-&gt;io))</div><div class='add'>+				return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bt3c_config(struct pcmcia_device *link)</div><div class='ctx'> {</div><div class='del'>-	static unsigned int base[5] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8, 0x0 };</div><div class='ctx'> 	bt3c_info_t *info = link-&gt;priv;</div><div class='del'>-	tuple_t tuple;</div><div class='del'>-	u_short buf[256];</div><div class='del'>-	cisparse_t parse;</div><div class='del'>-	cistpl_cftable_entry_t *cf = &amp;parse.cftable_entry;</div><div class='del'>-	int i, j, try;</div><div class='del'>-</div><div class='del'>-	/* First pass: look for a config entry that looks normal. */</div><div class='del'>-	tuple.TupleData = (cisdata_t *)buf;</div><div class='del'>-	tuple.TupleOffset = 0;</div><div class='del'>-	tuple.TupleDataMax = 255;</div><div class='del'>-	tuple.Attributes = 0;</div><div class='del'>-	tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;</div><div class='del'>-	/* Two tries: without IO aliases, then with aliases */</div><div class='del'>-	for (try = 0; try &lt; 2; try++) {</div><div class='del'>-		i = first_tuple(link, &amp;tuple, &amp;parse);</div><div class='del'>-		while (i != CS_NO_MORE_ITEMS) {</div><div class='del'>-			if (i != CS_SUCCESS)</div><div class='del'>-				goto next_entry;</div><div class='del'>-			if (cf-&gt;vpp1.present &amp; (1 &lt;&lt; CISTPL_POWER_VNOM))</div><div class='del'>-				link-&gt;conf.Vpp = cf-&gt;vpp1.param[CISTPL_POWER_VNOM] / 10000;</div><div class='del'>-			if ((cf-&gt;io.nwin &gt; 0) &amp;&amp; (cf-&gt;io.win[0].len == 8) &amp;&amp; (cf-&gt;io.win[0].base != 0)) {</div><div class='del'>-				link-&gt;conf.ConfigIndex = cf-&gt;index;</div><div class='del'>-				link-&gt;io.BasePort1 = cf-&gt;io.win[0].base;</div><div class='del'>-				link-&gt;io.IOAddrLines = (try == 0) ? 16 : cf-&gt;io.flags &amp; CISTPL_IO_LINES_MASK;</div><div class='del'>-				i = pcmcia_request_io(link, &amp;link-&gt;io);</div><div class='del'>-				if (i == CS_SUCCESS)</div><div class='del'>-					goto found_port;</div><div class='del'>-			}</div><div class='del'>-next_entry:</div><div class='del'>-			i = next_tuple(link, &amp;tuple, &amp;parse);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	int i;</div><div class='add'>+	unsigned long try;</div><div class='add'>+</div><div class='add'>+	/* First pass: look for a config entry that looks normal.</div><div class='add'>+	   Two tries: without IO aliases, then with aliases */</div><div class='add'>+	for (try = 0; try &lt; 2; try++)</div><div class='add'>+		if (!pcmcia_loop_config(link, bt3c_check_config, (void *) try))</div><div class='add'>+			goto found_port;</div><div class='ctx'> </div><div class='ctx'> 	/* Second pass: try to find an entry that isn't picky about</div><div class='ctx'> 	   its base address, then try to grab any standard serial port</div><div class='ctx'> 	   address, and finally try to get any free port. */</div><div class='del'>-	i = first_tuple(link, &amp;tuple, &amp;parse);</div><div class='del'>-	while (i != CS_NO_MORE_ITEMS) {</div><div class='del'>-		if ((i == CS_SUCCESS) &amp;&amp; (cf-&gt;io.nwin &gt; 0) &amp;&amp; ((cf-&gt;io.flags &amp; CISTPL_IO_LINES_MASK) &lt;= 3)) {</div><div class='del'>-			link-&gt;conf.ConfigIndex = cf-&gt;index;</div><div class='del'>-			for (j = 0; j &lt; 5; j++) {</div><div class='del'>-				link-&gt;io.BasePort1 = base[j];</div><div class='del'>-				link-&gt;io.IOAddrLines = base[j] ? 16 : 3;</div><div class='del'>-				i = pcmcia_request_io(link, &amp;link-&gt;io);</div><div class='del'>-				if (i == CS_SUCCESS)</div><div class='del'>-					goto found_port;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		i = next_tuple(link, &amp;tuple, &amp;parse);</div><div class='del'>-	}</div><div class='add'>+	if (!pcmcia_loop_config(link, bt3c_check_config_notpicky, NULL))</div><div class='add'>+		goto found_port;</div><div class='ctx'> </div><div class='del'>-found_port:</div><div class='del'>-	if (i != CS_SUCCESS) {</div><div class='del'>-		BT_ERR("No usable port range found");</div><div class='del'>-		cs_error(link, RequestIO, i);</div><div class='del'>-		goto failed;</div><div class='del'>-	}</div><div class='add'>+	BT_ERR("No usable port range found");</div><div class='add'>+	cs_error(link, RequestIO, -ENODEV);</div><div class='add'>+	goto failed;</div><div class='ctx'> </div><div class='add'>+found_port:</div><div class='ctx'> 	i = pcmcia_request_irq(link, &amp;link-&gt;irq);</div><div class='del'>-	if (i != CS_SUCCESS) {</div><div class='add'>+	if (i != 0) {</div><div class='ctx'> 		cs_error(link, RequestIRQ, i);</div><div class='ctx'> 		link-&gt;irq.AssignedIRQ = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	i = pcmcia_request_configuration(link, &amp;link-&gt;conf);</div><div class='del'>-	if (i != CS_SUCCESS) {</div><div class='add'>+	if (i != 0) {</div><div class='ctx'> 		cs_error(link, RequestConfiguration, i);</div><div class='ctx'> 		goto failed;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/bluetooth/btuart_cs.c b/drivers/bluetooth/btuart_cs.c<br/>index 68d1d258e6a4..8e556b7ff9f6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/bluetooth/btuart_cs.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/bluetooth/btuart_cs.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/bluetooth/btuart_cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/bluetooth/btuart_cs.c</a></div><div class='hunk'>@@ -607,102 +607,78 @@ static void btuart_detach(struct pcmcia_device *link)</div><div class='ctx'> 	kfree(info);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int get_tuple(struct pcmcia_device *handle, tuple_t *tuple, cisparse_t *parse)</div><div class='add'>+static int btuart_check_config(struct pcmcia_device *p_dev,</div><div class='add'>+			       cistpl_cftable_entry_t *cf,</div><div class='add'>+			       cistpl_cftable_entry_t *dflt,</div><div class='add'>+			       unsigned int vcc,</div><div class='add'>+			       void *priv_data)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	i = pcmcia_get_tuple_data(handle, tuple);</div><div class='del'>-	if (i != CS_SUCCESS)</div><div class='del'>-		return i;</div><div class='del'>-</div><div class='del'>-	return pcmcia_parse_tuple(handle, tuple, parse);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int first_tuple(struct pcmcia_device *handle, tuple_t *tuple, cisparse_t *parse)</div><div class='del'>-{</div><div class='del'>-	if (pcmcia_get_first_tuple(handle, tuple) != CS_SUCCESS)</div><div class='del'>-		return CS_NO_MORE_ITEMS;</div><div class='del'>-	return get_tuple(handle, tuple, parse);</div><div class='add'>+	int *try = priv_data;</div><div class='add'>+</div><div class='add'>+	if (cf-&gt;vpp1.present &amp; (1 &lt;&lt; CISTPL_POWER_VNOM))</div><div class='add'>+		p_dev-&gt;conf.Vpp = cf-&gt;vpp1.param[CISTPL_POWER_VNOM] / 10000;</div><div class='add'>+	if ((cf-&gt;io.nwin &gt; 0) &amp;&amp; (cf-&gt;io.win[0].len == 8) &amp;&amp;</div><div class='add'>+	    (cf-&gt;io.win[0].base != 0)) {</div><div class='add'>+		p_dev-&gt;io.BasePort1 = cf-&gt;io.win[0].base;</div><div class='add'>+		p_dev-&gt;io.IOAddrLines = (*try == 0) ? 16 :</div><div class='add'>+			cf-&gt;io.flags &amp; CISTPL_IO_LINES_MASK;</div><div class='add'>+		if (!pcmcia_request_io(p_dev, &amp;p_dev-&gt;io))</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='add'>+	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int next_tuple(struct pcmcia_device *handle, tuple_t *tuple, cisparse_t *parse)</div><div class='add'>+static int btuart_check_config_notpicky(struct pcmcia_device *p_dev,</div><div class='add'>+					cistpl_cftable_entry_t *cf,</div><div class='add'>+					cistpl_cftable_entry_t *dflt,</div><div class='add'>+					unsigned int vcc,</div><div class='add'>+					void *priv_data)</div><div class='ctx'> {</div><div class='del'>-	if (pcmcia_get_next_tuple(handle, tuple) != CS_SUCCESS)</div><div class='del'>-		return CS_NO_MORE_ITEMS;</div><div class='del'>-	return get_tuple(handle, tuple, parse);</div><div class='add'>+	static unsigned int base[5] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8, 0x0 };</div><div class='add'>+	int j;</div><div class='add'>+</div><div class='add'>+	if ((cf-&gt;io.nwin &gt; 0) &amp;&amp; ((cf-&gt;io.flags &amp; CISTPL_IO_LINES_MASK) &lt;= 3)) {</div><div class='add'>+		for (j = 0; j &lt; 5; j++) {</div><div class='add'>+			p_dev-&gt;io.BasePort1 = base[j];</div><div class='add'>+			p_dev-&gt;io.IOAddrLines = base[j] ? 16 : 3;</div><div class='add'>+			if (!pcmcia_request_io(p_dev, &amp;p_dev-&gt;io))</div><div class='add'>+				return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int btuart_config(struct pcmcia_device *link)</div><div class='ctx'> {</div><div class='del'>-	static unsigned int base[5] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8, 0x0 };</div><div class='ctx'> 	btuart_info_t *info = link-&gt;priv;</div><div class='del'>-	tuple_t tuple;</div><div class='del'>-	u_short buf[256];</div><div class='del'>-	cisparse_t parse;</div><div class='del'>-	cistpl_cftable_entry_t *cf = &amp;parse.cftable_entry;</div><div class='del'>-	int i, j, try;</div><div class='del'>-</div><div class='del'>-	/* First pass: look for a config entry that looks normal. */</div><div class='del'>-	tuple.TupleData = (cisdata_t *) buf;</div><div class='del'>-	tuple.TupleOffset = 0;</div><div class='del'>-	tuple.TupleDataMax = 255;</div><div class='del'>-	tuple.Attributes = 0;</div><div class='del'>-	tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;</div><div class='del'>-	/* Two tries: without IO aliases, then with aliases */</div><div class='del'>-	for (try = 0; try &lt; 2; try++) {</div><div class='del'>-		i = first_tuple(link, &amp;tuple, &amp;parse);</div><div class='del'>-		while (i != CS_NO_MORE_ITEMS) {</div><div class='del'>-			if (i != CS_SUCCESS)</div><div class='del'>-				goto next_entry;</div><div class='del'>-			if (cf-&gt;vpp1.present &amp; (1 &lt;&lt; CISTPL_POWER_VNOM))</div><div class='del'>-				link-&gt;conf.Vpp = cf-&gt;vpp1.param[CISTPL_POWER_VNOM] / 10000;</div><div class='del'>-			if ((cf-&gt;io.nwin &gt; 0) &amp;&amp; (cf-&gt;io.win[0].len == 8) &amp;&amp; (cf-&gt;io.win[0].base != 0)) {</div><div class='del'>-				link-&gt;conf.ConfigIndex = cf-&gt;index;</div><div class='del'>-				link-&gt;io.BasePort1 = cf-&gt;io.win[0].base;</div><div class='del'>-				link-&gt;io.IOAddrLines = (try == 0) ? 16 : cf-&gt;io.flags &amp; CISTPL_IO_LINES_MASK;</div><div class='del'>-				i = pcmcia_request_io(link, &amp;link-&gt;io);</div><div class='del'>-				if (i == CS_SUCCESS)</div><div class='del'>-					goto found_port;</div><div class='del'>-			}</div><div class='del'>-next_entry:</div><div class='del'>-			i = next_tuple(link, &amp;tuple, &amp;parse);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	int i;</div><div class='add'>+	int try;</div><div class='add'>+</div><div class='add'>+	/* First pass: look for a config entry that looks normal.</div><div class='add'>+	   Two tries: without IO aliases, then with aliases */</div><div class='add'>+	for (try = 0; try &lt; 2; try++)</div><div class='add'>+		if (!pcmcia_loop_config(link, btuart_check_config, &amp;try))</div><div class='add'>+			goto found_port;</div><div class='ctx'> </div><div class='ctx'> 	/* Second pass: try to find an entry that isn't picky about</div><div class='ctx'> 	   its base address, then try to grab any standard serial port</div><div class='ctx'> 	   address, and finally try to get any free port. */</div><div class='del'>-	i = first_tuple(link, &amp;tuple, &amp;parse);</div><div class='del'>-	while (i != CS_NO_MORE_ITEMS) {</div><div class='del'>-		if ((i == CS_SUCCESS) &amp;&amp; (cf-&gt;io.nwin &gt; 0)</div><div class='del'>-		    &amp;&amp; ((cf-&gt;io.flags &amp; CISTPL_IO_LINES_MASK) &lt;= 3)) {</div><div class='del'>-			link-&gt;conf.ConfigIndex = cf-&gt;index;</div><div class='del'>-			for (j = 0; j &lt; 5; j++) {</div><div class='del'>-				link-&gt;io.BasePort1 = base[j];</div><div class='del'>-				link-&gt;io.IOAddrLines = base[j] ? 16 : 3;</div><div class='del'>-				i = pcmcia_request_io(link, &amp;link-&gt;io);</div><div class='del'>-				if (i == CS_SUCCESS)</div><div class='del'>-					goto found_port;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		i = next_tuple(link, &amp;tuple, &amp;parse);</div><div class='del'>-	}</div><div class='add'>+	if (!pcmcia_loop_config(link, btuart_check_config_notpicky, NULL))</div><div class='add'>+		goto found_port;</div><div class='ctx'> </div><div class='del'>-found_port:</div><div class='del'>-	if (i != CS_SUCCESS) {</div><div class='del'>-		BT_ERR("No usable port range found");</div><div class='del'>-		cs_error(link, RequestIO, i);</div><div class='del'>-		goto failed;</div><div class='del'>-	}</div><div class='add'>+	BT_ERR("No usable port range found");</div><div class='add'>+	cs_error(link, RequestIO, -ENODEV);</div><div class='add'>+	goto failed;</div><div class='ctx'> </div><div class='add'>+found_port:</div><div class='ctx'> 	i = pcmcia_request_irq(link, &amp;link-&gt;irq);</div><div class='del'>-	if (i != CS_SUCCESS) {</div><div class='add'>+	if (i != 0) {</div><div class='ctx'> 		cs_error(link, RequestIRQ, i);</div><div class='ctx'> 		link-&gt;irq.AssignedIRQ = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	i = pcmcia_request_configuration(link, &amp;link-&gt;conf);</div><div class='del'>-	if (i != CS_SUCCESS) {</div><div class='add'>+	if (i != 0) {</div><div class='ctx'> 		cs_error(link, RequestConfiguration, i);</div><div class='ctx'> 		goto failed;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/bluetooth/dtl1_cs.c b/drivers/bluetooth/dtl1_cs.c<br/>index dae45cdf02b2..e6e6b037695a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/bluetooth/dtl1_cs.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/bluetooth/dtl1_cs.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/bluetooth/dtl1_cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/bluetooth/dtl1_cs.c</a></div><div class='hunk'>@@ -590,75 +590,40 @@ static void dtl1_detach(struct pcmcia_device *link)</div><div class='ctx'> 	kfree(info);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int get_tuple(struct pcmcia_device *handle, tuple_t *tuple, cisparse_t *parse)</div><div class='add'>+static int dtl1_confcheck(struct pcmcia_device *p_dev,</div><div class='add'>+			  cistpl_cftable_entry_t *cf,</div><div class='add'>+			  cistpl_cftable_entry_t *dflt,</div><div class='add'>+			  unsigned int vcc,</div><div class='add'>+			  void *priv_data)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	i = pcmcia_get_tuple_data(handle, tuple);</div><div class='del'>-	if (i != CS_SUCCESS)</div><div class='del'>-		return i;</div><div class='del'>-</div><div class='del'>-	return pcmcia_parse_tuple(handle, tuple, parse);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int first_tuple(struct pcmcia_device *handle, tuple_t *tuple, cisparse_t *parse)</div><div class='del'>-{</div><div class='del'>-	if (pcmcia_get_first_tuple(handle, tuple) != CS_SUCCESS)</div><div class='del'>-		return CS_NO_MORE_ITEMS;</div><div class='del'>-	return get_tuple(handle, tuple, parse);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int next_tuple(struct pcmcia_device *handle, tuple_t *tuple, cisparse_t *parse)</div><div class='del'>-{</div><div class='del'>-	if (pcmcia_get_next_tuple(handle, tuple) != CS_SUCCESS)</div><div class='del'>-		return CS_NO_MORE_ITEMS;</div><div class='del'>-	return get_tuple(handle, tuple, parse);</div><div class='add'>+	if ((cf-&gt;io.nwin == 1) &amp;&amp; (cf-&gt;io.win[0].len &gt; 8)) {</div><div class='add'>+		p_dev-&gt;io.BasePort1 = cf-&gt;io.win[0].base;</div><div class='add'>+		p_dev-&gt;io.NumPorts1 = cf-&gt;io.win[0].len;	/*yo */</div><div class='add'>+		p_dev-&gt;io.IOAddrLines = cf-&gt;io.flags &amp; CISTPL_IO_LINES_MASK;</div><div class='add'>+		if (!pcmcia_request_io(p_dev, &amp;p_dev-&gt;io))</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='add'>+	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int dtl1_config(struct pcmcia_device *link)</div><div class='ctx'> {</div><div class='ctx'> 	dtl1_info_t *info = link-&gt;priv;</div><div class='del'>-	tuple_t tuple;</div><div class='del'>-	u_short buf[256];</div><div class='del'>-	cisparse_t parse;</div><div class='del'>-	cistpl_cftable_entry_t *cf = &amp;parse.cftable_entry;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	tuple.TupleData = (cisdata_t *)buf;</div><div class='del'>-	tuple.TupleOffset = 0;</div><div class='del'>-	tuple.TupleDataMax = 255;</div><div class='del'>-	tuple.Attributes = 0;</div><div class='del'>-	tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;</div><div class='del'>-</div><div class='ctx'> 	/* Look for a generic full-sized window */</div><div class='ctx'> 	link-&gt;io.NumPorts1 = 8;</div><div class='del'>-	i = first_tuple(link, &amp;tuple, &amp;parse);</div><div class='del'>-	while (i != CS_NO_MORE_ITEMS) {</div><div class='del'>-		if ((i == CS_SUCCESS) &amp;&amp; (cf-&gt;io.nwin == 1) &amp;&amp; (cf-&gt;io.win[0].len &gt; 8)) {</div><div class='del'>-			link-&gt;conf.ConfigIndex = cf-&gt;index;</div><div class='del'>-			link-&gt;io.BasePort1 = cf-&gt;io.win[0].base;</div><div class='del'>-			link-&gt;io.NumPorts1 = cf-&gt;io.win[0].len;	/*yo */</div><div class='del'>-			link-&gt;io.IOAddrLines = cf-&gt;io.flags &amp; CISTPL_IO_LINES_MASK;</div><div class='del'>-			i = pcmcia_request_io(link, &amp;link-&gt;io);</div><div class='del'>-			if (i == CS_SUCCESS)</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-		i = next_tuple(link, &amp;tuple, &amp;parse);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (i != CS_SUCCESS) {</div><div class='del'>-		cs_error(link, RequestIO, i);</div><div class='add'>+	if (!pcmcia_loop_config(link, dtl1_confcheck, NULL))</div><div class='ctx'> 		goto failed;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	i = pcmcia_request_irq(link, &amp;link-&gt;irq);</div><div class='del'>-	if (i != CS_SUCCESS) {</div><div class='add'>+	if (i != 0) {</div><div class='ctx'> 		cs_error(link, RequestIRQ, i);</div><div class='ctx'> 		link-&gt;irq.AssignedIRQ = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	i = pcmcia_request_configuration(link, &amp;link-&gt;conf);</div><div class='del'>-	if (i != CS_SUCCESS) {</div><div class='add'>+	if (i != 0) {</div><div class='ctx'> 		cs_error(link, RequestConfiguration, i);</div><div class='ctx'> 		goto failed;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/bluetooth/hci_bcsp.c b/drivers/bluetooth/hci_bcsp.c<br/>index 4d37bb312ee3..7938062c1cc7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/bluetooth/hci_bcsp.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/bluetooth/hci_bcsp.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/bluetooth/hci_bcsp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/bluetooth/hci_bcsp.c</a></div><div class='hunk'>@@ -352,14 +352,14 @@ static int bcsp_flush(struct hci_uart *hu)</div><div class='ctx'> /* Remove ack'ed packets */</div><div class='ctx'> static void bcsp_pkt_cull(struct bcsp_struct *bcsp)</div><div class='ctx'> {</div><div class='add'>+	struct sk_buff *skb, *tmp;</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	struct sk_buff *skb;</div><div class='ctx'> 	int i, pkts_to_be_removed;</div><div class='ctx'> 	u8 seqno;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;bcsp-&gt;unack.lock, flags);</div><div class='ctx'> </div><div class='del'>-	pkts_to_be_removed = bcsp-&gt;unack.qlen;</div><div class='add'>+	pkts_to_be_removed = skb_queue_len(&amp;bcsp-&gt;unack);</div><div class='ctx'> 	seqno = bcsp-&gt;msgq_txseq;</div><div class='ctx'> </div><div class='ctx'> 	while (pkts_to_be_removed) {</div><div class='hunk'>@@ -373,19 +373,19 @@ static void bcsp_pkt_cull(struct bcsp_struct *bcsp)</div><div class='ctx'> 		BT_ERR("Peer acked invalid packet");</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("Removing %u pkts out of %u, up to seqno %u",</div><div class='del'>-		pkts_to_be_removed, bcsp-&gt;unack.qlen, (seqno - 1) &amp; 0x07);</div><div class='add'>+	       pkts_to_be_removed, skb_queue_len(&amp;bcsp-&gt;unack),</div><div class='add'>+	       (seqno - 1) &amp; 0x07);</div><div class='ctx'> </div><div class='del'>-	for (i = 0, skb = ((struct sk_buff *) &amp;bcsp-&gt;unack)-&gt;next; i &lt; pkts_to_be_removed</div><div class='del'>-			&amp;&amp; skb != (struct sk_buff *) &amp;bcsp-&gt;unack; i++) {</div><div class='del'>-		struct sk_buff *nskb;</div><div class='add'>+	i = 0;</div><div class='add'>+	skb_queue_walk_safe(&amp;bcsp-&gt;unack, skb, tmp) {</div><div class='add'>+		if (i++ &gt;= pkts_to_be_removed)</div><div class='add'>+			break;</div><div class='ctx'> </div><div class='del'>-		nskb = skb-&gt;next;</div><div class='ctx'> 		__skb_unlink(skb, &amp;bcsp-&gt;unack);</div><div class='ctx'> 		kfree_skb(skb);</div><div class='del'>-		skb = nskb;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (bcsp-&gt;unack.qlen == 0)</div><div class='add'>+	if (skb_queue_empty(&amp;bcsp-&gt;unack))</div><div class='ctx'> 		del_timer(&amp;bcsp-&gt;tbcsp);</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;bcsp-&gt;unack.lock, flags);</div><div class='head'>diff --git a/drivers/bluetooth/hci_ldisc.c b/drivers/bluetooth/hci_ldisc.c<br/>index 8dfcf77cb717..4426bb552bd9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/bluetooth/hci_ldisc.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/bluetooth/hci_ldisc.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/bluetooth/hci_ldisc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/bluetooth/hci_ldisc.c</a></div><div class='hunk'>@@ -484,7 +484,7 @@ static int hci_uart_tty_ioctl(struct tty_struct *tty, struct file * file,</div><div class='ctx'> 		return -EUNATCH;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='del'>-		err = n_tty_ioctl(tty, file, cmd, arg);</div><div class='add'>+		err = n_tty_ioctl_helper(tty, file, cmd, arg);</div><div class='ctx'> 		break;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/bluetooth/hci_usb.h b/drivers/bluetooth/hci_usb.h<br/>index 1790cc8e431e..8e659914523f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/bluetooth/hci_usb.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/bluetooth/hci_usb.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/bluetooth/hci_usb.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/bluetooth/hci_usb.h</a></div><div class='hunk'>@@ -70,8 +70,8 @@ static inline void _urb_queue_head(struct _urb_queue *q, struct _urb *_urb)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	spin_lock_irqsave(&amp;q-&gt;lock, flags);</div><div class='del'>-	/* _urb_unlink needs to know which spinlock to use, thus mb(). */</div><div class='del'>-	_urb-&gt;queue = q; mb(); list_add(&amp;_urb-&gt;list, &amp;q-&gt;head);</div><div class='add'>+	/* _urb_unlink needs to know which spinlock to use, thus smp_mb(). */</div><div class='add'>+	_urb-&gt;queue = q; smp_mb(); list_add(&amp;_urb-&gt;list, &amp;q-&gt;head);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;q-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -79,8 +79,8 @@ static inline void _urb_queue_tail(struct _urb_queue *q, struct _urb *_urb)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	spin_lock_irqsave(&amp;q-&gt;lock, flags);</div><div class='del'>-	/* _urb_unlink needs to know which spinlock to use, thus mb(). */</div><div class='del'>-	_urb-&gt;queue = q; mb(); list_add_tail(&amp;_urb-&gt;list, &amp;q-&gt;head);</div><div class='add'>+	/* _urb_unlink needs to know which spinlock to use, thus smp_mb(). */</div><div class='add'>+	_urb-&gt;queue = q; smp_mb(); list_add_tail(&amp;_urb-&gt;list, &amp;q-&gt;head);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;q-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -89,7 +89,7 @@ static inline void _urb_unlink(struct _urb *_urb)</div><div class='ctx'> 	struct _urb_queue *q;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	mb();</div><div class='add'>+	smp_mb();</div><div class='ctx'> 	q = _urb-&gt;queue;</div><div class='ctx'> 	/* If q is NULL, it will die at easy-to-debug NULL pointer dereference.</div><div class='ctx'> 	   No need to BUG(). */</div><div class='head'>diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c<br/>index 74031de517e6..d47f2f80accd 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/cdrom/cdrom.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/cdrom/cdrom.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/cdrom/cdrom.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/cdrom/cdrom.c</a></div><div class='hunk'>@@ -2097,7 +2097,7 @@ static int cdrom_read_cdda_bpc(struct cdrom_device_info *cdi, __u8 __user *ubuf,</div><div class='ctx'> </div><div class='ctx'> 		len = nr * CD_FRAMESIZE_RAW;</div><div class='ctx'> </div><div class='del'>-		ret = blk_rq_map_user(q, rq, ubuf, len);</div><div class='add'>+		ret = blk_rq_map_user(q, rq, NULL, ubuf, len, GFP_KERNEL);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c<br/>index 1231d95aa695..d6ba77a2dd7b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/cdrom/gdrom.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/cdrom/gdrom.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/cdrom/gdrom.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/cdrom/gdrom.c</a></div><div class='hunk'>@@ -624,14 +624,14 @@ static void gdrom_readdisk_dma(struct work_struct *work)</div><div class='ctx'> 		ctrl_outb(1, GDROM_DMA_STATUS_REG);</div><div class='ctx'> 		wait_event_interruptible_timeout(request_queue,</div><div class='ctx'> 			gd.transfer == 0, GDROM_DEFAULT_TIMEOUT);</div><div class='del'>-		err = gd.transfer;</div><div class='add'>+		err = gd.transfer ? -EIO : 0;</div><div class='ctx'> 		gd.transfer = 0;</div><div class='ctx'> 		gd.pending = 0;</div><div class='ctx'> 		/* now seek to take the request spinlock</div><div class='ctx'> 		* before handling ending the request */</div><div class='ctx'> 		spin_lock(&amp;gdrom_lock);</div><div class='ctx'> 		list_del_init(&amp;req-&gt;queuelist);</div><div class='del'>-		end_dequeued_request(req, 1 - err);</div><div class='add'>+		__blk_end_request(req, err, blk_rq_bytes(req));</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock(&amp;gdrom_lock);</div><div class='ctx'> 	kfree(read_command);</div><div class='head'>diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig<br/>index caff85149b9d..122254155ae1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/char/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/Kconfig</a></div><div class='hunk'>@@ -350,7 +350,7 @@ config STALDRV</div><div class='ctx'> </div><div class='ctx'> config STALLION</div><div class='ctx'> 	tristate "Stallion EasyIO or EC8/32 support"</div><div class='del'>-	depends on STALDRV &amp;&amp; BROKEN_ON_SMP &amp;&amp; (ISA || EISA || PCI)</div><div class='add'>+	depends on STALDRV &amp;&amp; (ISA || EISA || PCI)</div><div class='ctx'> 	help</div><div class='ctx'> 	  If you have an EasyIO or EasyConnection 8/32 multiport Stallion</div><div class='ctx'> 	  card, then this is for you; say Y.  Make sure to read</div><div class='hunk'>@@ -361,7 +361,7 @@ config STALLION</div><div class='ctx'> </div><div class='ctx'> config ISTALLION</div><div class='ctx'> 	tristate "Stallion EC8/64, ONboard, Brumby support"</div><div class='del'>-	depends on STALDRV &amp;&amp; BROKEN_ON_SMP &amp;&amp; (ISA || EISA || PCI)</div><div class='add'>+	depends on STALDRV &amp;&amp; (ISA || EISA || PCI)</div><div class='ctx'> 	help</div><div class='ctx'> 	  If you have an EasyConnection 8/64, ONboard, Brumby or Stallion</div><div class='ctx'> 	  serial multiport card, say Y here. Make sure to read</div><div class='hunk'>@@ -1043,15 +1043,6 @@ config HPET</div><div class='ctx'> 	  open selects one of the timers supported by the HPET.  The timers are</div><div class='ctx'> 	  non-periodic and/or periodic.</div><div class='ctx'> </div><div class='del'>-config HPET_RTC_IRQ</div><div class='del'>-	bool</div><div class='del'>-	default HPET_EMULATE_RTC</div><div class='del'>-	depends on RTC &amp;&amp; HPET</div><div class='del'>-	help</div><div class='del'>-	  If you say Y here, you will disable RTC_IRQ in drivers/char/rtc.c. It</div><div class='del'>-	  is assumed the platform called hpet_alloc with the RTC IRQ values for</div><div class='del'>-	  the HPET timers.</div><div class='del'>-</div><div class='ctx'> config HPET_MMAP</div><div class='ctx'> 	bool "Allow mmap of HPET"</div><div class='ctx'> 	default y</div><div class='head'>diff --git a/drivers/char/Makefile b/drivers/char/Makefile<br/>index 6850f6da7576..1a4247dccac4 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/char/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/Makefile</a></div><div class='hunk'>@@ -7,7 +7,7 @@</div><div class='ctx'> #</div><div class='ctx'> FONTMAPFILE = cp437.uni</div><div class='ctx'> </div><div class='del'>-obj-y	 += mem.o random.o tty_io.o n_tty.o tty_ioctl.o tty_ldisc.o </div><div class='add'>+obj-y	 += mem.o random.o tty_io.o n_tty.o tty_ioctl.o tty_ldisc.o tty_buffer.o tty_port.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_LEGACY_PTYS)	+= pty.o</div><div class='ctx'> obj-$(CONFIG_UNIX98_PTYS)	+= pty.o</div><div class='head'>diff --git a/drivers/char/agp/agp.h b/drivers/char/agp/agp.h<br/>index 4bada0e8b812..46f507531177 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/agp/agp.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/char/agp/agp.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/agp/agp.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/agp/agp.h</a></div><div class='hunk'>@@ -116,7 +116,9 @@ struct agp_bridge_driver {</div><div class='ctx'> 	struct agp_memory *(*alloc_by_type) (size_t, int);</div><div class='ctx'> 	void (*free_by_type)(struct agp_memory *);</div><div class='ctx'> 	void *(*agp_alloc_page)(struct agp_bridge_data *);</div><div class='add'>+	int (*agp_alloc_pages)(struct agp_bridge_data *, struct agp_memory *, size_t);</div><div class='ctx'> 	void (*agp_destroy_page)(void *, int flags);</div><div class='add'>+	void (*agp_destroy_pages)(struct agp_memory *);</div><div class='ctx'> 	int (*agp_type_to_mask_type) (struct agp_bridge_data *, int);</div><div class='ctx'> 	void (*chipset_flush)(struct agp_bridge_data *);</div><div class='ctx'> };</div><div class='hunk'>@@ -277,7 +279,10 @@ int agp_generic_remove_memory(struct agp_memory *mem, off_t pg_start, int type);</div><div class='ctx'> struct agp_memory *agp_generic_alloc_by_type(size_t page_count, int type);</div><div class='ctx'> void agp_generic_free_by_type(struct agp_memory *curr);</div><div class='ctx'> void *agp_generic_alloc_page(struct agp_bridge_data *bridge);</div><div class='add'>+int agp_generic_alloc_pages(struct agp_bridge_data *agp_bridge,</div><div class='add'>+			    struct agp_memory *memory, size_t page_count);</div><div class='ctx'> void agp_generic_destroy_page(void *addr, int flags);</div><div class='add'>+void agp_generic_destroy_pages(struct agp_memory *memory);</div><div class='ctx'> void agp_free_key(int key);</div><div class='ctx'> int agp_num_entries(void);</div><div class='ctx'> u32 agp_collect_device_status(struct agp_bridge_data *bridge, u32 mode, u32 command);</div><div class='head'>diff --git a/drivers/char/agp/alpha-agp.c b/drivers/char/agp/alpha-agp.c<br/>index 5da89f6c6c25..5ea4da8e9954 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/agp/alpha-agp.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/char/agp/alpha-agp.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/agp/alpha-agp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/agp/alpha-agp.c</a></div><div class='hunk'>@@ -143,7 +143,9 @@ struct agp_bridge_driver alpha_core_agp_driver = {</div><div class='ctx'> 	.alloc_by_type		= agp_generic_alloc_by_type,</div><div class='ctx'> 	.free_by_type		= agp_generic_free_by_type,</div><div class='ctx'> 	.agp_alloc_page		= agp_generic_alloc_page,</div><div class='add'>+	.agp_alloc_pages	= agp_generic_alloc_pages,</div><div class='ctx'> 	.agp_destroy_page	= agp_generic_destroy_page,</div><div class='add'>+	.agp_destroy_pages	= agp_generic_destroy_pages,</div><div class='ctx'> 	.agp_type_to_mask_type  = agp_generic_type_to_mask_type,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/char/agp/amd-k7-agp.c b/drivers/char/agp/amd-k7-agp.c<br/>index e280531843be..3f98254b911f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/agp/amd-k7-agp.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/char/agp/amd-k7-agp.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/agp/amd-k7-agp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/agp/amd-k7-agp.c</a></div><div class='hunk'>@@ -223,12 +223,14 @@ static int amd_irongate_configure(void)</div><div class='ctx'> </div><div class='ctx'> 	current_size = A_SIZE_LVL2(agp_bridge-&gt;current_size);</div><div class='ctx'> </div><div class='del'>-	/* Get the memory mapped registers */</div><div class='del'>-	pci_read_config_dword(agp_bridge-&gt;dev, AMD_MMBASE, &amp;temp);</div><div class='del'>-	temp = (temp &amp; PCI_BASE_ADDRESS_MEM_MASK);</div><div class='del'>-	amd_irongate_private.registers = (volatile u8 __iomem *) ioremap(temp, 4096);</div><div class='del'>-	if (!amd_irongate_private.registers)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	if (!amd_irongate_private.registers) {</div><div class='add'>+		/* Get the memory mapped registers */</div><div class='add'>+		pci_read_config_dword(agp_bridge-&gt;dev, AMD_MMBASE, &amp;temp);</div><div class='add'>+		temp = (temp &amp; PCI_BASE_ADDRESS_MEM_MASK);</div><div class='add'>+		amd_irongate_private.registers = (volatile u8 __iomem *) ioremap(temp, 4096);</div><div class='add'>+		if (!amd_irongate_private.registers)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Write out the address of the gatt table */</div><div class='ctx'> 	writel(agp_bridge-&gt;gatt_bus_addr, amd_irongate_private.registers+AMD_ATTBASE);</div><div class='hunk'>@@ -386,7 +388,9 @@ static const struct agp_bridge_driver amd_irongate_driver = {</div><div class='ctx'> 	.alloc_by_type		= agp_generic_alloc_by_type,</div><div class='ctx'> 	.free_by_type		= agp_generic_free_by_type,</div><div class='ctx'> 	.agp_alloc_page		= agp_generic_alloc_page,</div><div class='add'>+	.agp_alloc_pages	= agp_generic_alloc_pages,</div><div class='ctx'> 	.agp_destroy_page	= agp_generic_destroy_page,</div><div class='add'>+	.agp_destroy_pages	= agp_generic_destroy_pages,</div><div class='ctx'> 	.agp_type_to_mask_type  = agp_generic_type_to_mask_type,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -490,6 +494,26 @@ static void __devexit agp_amdk7_remove(struct pci_dev *pdev)</div><div class='ctx'> 	agp_put_bridge(bridge);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+</div><div class='add'>+static int agp_amdk7_suspend(struct pci_dev *pdev, pm_message_t state)</div><div class='add'>+{</div><div class='add'>+	pci_save_state(pdev);</div><div class='add'>+	pci_set_power_state(pdev, pci_choose_state(pdev, state));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int agp_amdk7_resume(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	pci_set_power_state(pdev, PCI_D0);</div><div class='add'>+	pci_restore_state(pdev);</div><div class='add'>+</div><div class='add'>+	return amd_irongate_driver.configure();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_PM */</div><div class='add'>+</div><div class='ctx'> /* must be the same order as name table above */</div><div class='ctx'> static struct pci_device_id agp_amdk7_pci_table[] = {</div><div class='ctx'> 	{</div><div class='hunk'>@@ -526,6 +550,10 @@ static struct pci_driver agp_amdk7_pci_driver = {</div><div class='ctx'> 	.id_table	= agp_amdk7_pci_table,</div><div class='ctx'> 	.probe		= agp_amdk7_probe,</div><div class='ctx'> 	.remove		= agp_amdk7_remove,</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+	.suspend	= agp_amdk7_suspend,</div><div class='add'>+	.resume		= agp_amdk7_resume,</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init agp_amdk7_init(void)</div><div class='head'>diff --git a/drivers/char/agp/amd64-agp.c b/drivers/char/agp/amd64-agp.c<br/>index 7495c522d8e4..2812ee2b165a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/agp/amd64-agp.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/char/agp/amd64-agp.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/agp/amd64-agp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/agp/amd64-agp.c</a></div><div class='hunk'>@@ -224,7 +224,9 @@ static const struct agp_bridge_driver amd_8151_driver = {</div><div class='ctx'> 	.alloc_by_type		= agp_generic_alloc_by_type,</div><div class='ctx'> 	.free_by_type		= agp_generic_free_by_type,</div><div class='ctx'> 	.agp_alloc_page		= agp_generic_alloc_page,</div><div class='add'>+	.agp_alloc_pages	= agp_generic_alloc_pages,</div><div class='ctx'> 	.agp_destroy_page	= agp_generic_destroy_page,</div><div class='add'>+	.agp_destroy_pages	= agp_generic_destroy_pages,</div><div class='ctx'> 	.agp_type_to_mask_type  = agp_generic_type_to_mask_type,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/char/agp/ati-agp.c b/drivers/char/agp/ati-agp.c<br/>index 6ecbcafb34b1..ae2791b926b9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/agp/ati-agp.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/char/agp/ati-agp.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/agp/ati-agp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/agp/ati-agp.c</a></div><div class='hunk'>@@ -418,7 +418,9 @@ static const struct agp_bridge_driver ati_generic_bridge = {</div><div class='ctx'> 	.alloc_by_type		= agp_generic_alloc_by_type,</div><div class='ctx'> 	.free_by_type		= agp_generic_free_by_type,</div><div class='ctx'> 	.agp_alloc_page		= agp_generic_alloc_page,</div><div class='add'>+	.agp_alloc_pages	= agp_generic_alloc_pages,</div><div class='ctx'> 	.agp_destroy_page	= agp_generic_destroy_page,</div><div class='add'>+	.agp_destroy_pages	= agp_generic_destroy_pages,</div><div class='ctx'> 	.agp_type_to_mask_type  = agp_generic_type_to_mask_type,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/char/agp/efficeon-agp.c b/drivers/char/agp/efficeon-agp.c<br/>index 8ca6f262ef85..453543a1f293 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/agp/efficeon-agp.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/char/agp/efficeon-agp.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/agp/efficeon-agp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/agp/efficeon-agp.c</a></div><div class='hunk'>@@ -335,7 +335,9 @@ static const struct agp_bridge_driver efficeon_driver = {</div><div class='ctx'> 	.alloc_by_type		= agp_generic_alloc_by_type,</div><div class='ctx'> 	.free_by_type		= agp_generic_free_by_type,</div><div class='ctx'> 	.agp_alloc_page		= agp_generic_alloc_page,</div><div class='add'>+	.agp_alloc_pages	= agp_generic_alloc_pages,</div><div class='ctx'> 	.agp_destroy_page	= agp_generic_destroy_page,</div><div class='add'>+	.agp_destroy_pages	= agp_generic_destroy_pages,</div><div class='ctx'> 	.agp_type_to_mask_type  = agp_generic_type_to_mask_type,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/char/agp/generic.c b/drivers/char/agp/generic.c<br/>index 118dbde25dc7..10d6cbd7c05e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/agp/generic.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/char/agp/generic.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/agp/generic.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/agp/generic.c</a></div><div class='hunk'>@@ -201,14 +201,22 @@ void agp_free_memory(struct agp_memory *curr)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (curr-&gt;page_count != 0) {</div><div class='del'>-		for (i = 0; i &lt; curr-&gt;page_count; i++) {</div><div class='del'>-			curr-&gt;memory[i] = (unsigned long)gart_to_virt(curr-&gt;memory[i]);</div><div class='del'>-			curr-&gt;bridge-&gt;driver-&gt;agp_destroy_page((void *)curr-&gt;memory[i],</div><div class='del'>-							       AGP_PAGE_DESTROY_UNMAP);</div><div class='del'>-		}</div><div class='del'>-		for (i = 0; i &lt; curr-&gt;page_count; i++) {</div><div class='del'>-			curr-&gt;bridge-&gt;driver-&gt;agp_destroy_page((void *)curr-&gt;memory[i],</div><div class='del'>-							       AGP_PAGE_DESTROY_FREE);</div><div class='add'>+		if (curr-&gt;bridge-&gt;driver-&gt;agp_destroy_pages) {</div><div class='add'>+			curr-&gt;bridge-&gt;driver-&gt;agp_destroy_pages(curr);</div><div class='add'>+		} else {</div><div class='add'>+</div><div class='add'>+			for (i = 0; i &lt; curr-&gt;page_count; i++) {</div><div class='add'>+				curr-&gt;memory[i] = (unsigned long)gart_to_virt(</div><div class='add'>+					curr-&gt;memory[i]);</div><div class='add'>+				curr-&gt;bridge-&gt;driver-&gt;agp_destroy_page(</div><div class='add'>+					(void *)curr-&gt;memory[i],</div><div class='add'>+					AGP_PAGE_DESTROY_UNMAP);</div><div class='add'>+			}</div><div class='add'>+			for (i = 0; i &lt; curr-&gt;page_count; i++) {</div><div class='add'>+				curr-&gt;bridge-&gt;driver-&gt;agp_destroy_page(</div><div class='add'>+					(void *)curr-&gt;memory[i],</div><div class='add'>+					AGP_PAGE_DESTROY_FREE);</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	agp_free_key(curr-&gt;key);</div><div class='hunk'>@@ -264,6 +272,15 @@ struct agp_memory *agp_allocate_memory(struct agp_bridge_data *bridge,</div><div class='ctx'> 	if (new == NULL)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='add'>+	if (bridge-&gt;driver-&gt;agp_alloc_pages) {</div><div class='add'>+		if (bridge-&gt;driver-&gt;agp_alloc_pages(bridge, new, page_count)) {</div><div class='add'>+			agp_free_memory(new);</div><div class='add'>+			return NULL;</div><div class='add'>+		}</div><div class='add'>+		new-&gt;bridge = bridge;</div><div class='add'>+		return new;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; page_count; i++) {</div><div class='ctx'> 		void *addr = bridge-&gt;driver-&gt;agp_alloc_page(bridge);</div><div class='ctx'> </div><div class='hunk'>@@ -1203,6 +1220,39 @@ EXPORT_SYMBOL(agp_generic_alloc_user);</div><div class='ctx'>  * against a maximum value.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+int agp_generic_alloc_pages(struct agp_bridge_data *bridge, struct agp_memory *mem, size_t num_pages)</div><div class='add'>+{</div><div class='add'>+	struct page * page;</div><div class='add'>+	int i, ret = -ENOMEM;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num_pages; i++) {</div><div class='add'>+		page = alloc_page(GFP_KERNEL | GFP_DMA32);</div><div class='add'>+		/* agp_free_memory() needs gart address */</div><div class='add'>+		if (page == NULL)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+#ifndef CONFIG_X86</div><div class='add'>+		map_page_into_agp(page);</div><div class='add'>+#endif</div><div class='add'>+		get_page(page);</div><div class='add'>+		atomic_inc(&amp;agp_bridge-&gt;current_memory_agp);</div><div class='add'>+</div><div class='add'>+		/* set_memory_array_uc() needs virtual address */</div><div class='add'>+		mem-&gt;memory[i] = (unsigned long)page_address(page);</div><div class='add'>+		mem-&gt;page_count++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_X86</div><div class='add'>+	set_memory_array_uc(mem-&gt;memory, num_pages);</div><div class='add'>+#endif</div><div class='add'>+	ret = 0;</div><div class='add'>+out:</div><div class='add'>+	for (i = 0; i &lt; mem-&gt;page_count; i++)</div><div class='add'>+		mem-&gt;memory[i] = virt_to_gart((void *)mem-&gt;memory[i]);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(agp_generic_alloc_pages);</div><div class='add'>+</div><div class='ctx'> void *agp_generic_alloc_page(struct agp_bridge_data *bridge)</div><div class='ctx'> {</div><div class='ctx'> 	struct page * page;</div><div class='hunk'>@@ -1219,6 +1269,37 @@ void *agp_generic_alloc_page(struct agp_bridge_data *bridge)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(agp_generic_alloc_page);</div><div class='ctx'> </div><div class='add'>+void agp_generic_destroy_pages(struct agp_memory *mem)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	void *addr;</div><div class='add'>+	struct page *page;</div><div class='add'>+</div><div class='add'>+	if (!mem)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; mem-&gt;page_count; i++)</div><div class='add'>+		mem-&gt;memory[i] = (unsigned long)gart_to_virt(mem-&gt;memory[i]);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_X86</div><div class='add'>+	set_memory_array_wb(mem-&gt;memory, mem-&gt;page_count);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; mem-&gt;page_count; i++) {</div><div class='add'>+		addr = (void *)mem-&gt;memory[i];</div><div class='add'>+		page = virt_to_page(addr);</div><div class='add'>+</div><div class='add'>+#ifndef CONFIG_X86</div><div class='add'>+		unmap_page_from_agp(page);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+		put_page(page);</div><div class='add'>+		free_page((unsigned long)addr);</div><div class='add'>+		atomic_dec(&amp;agp_bridge-&gt;current_memory_agp);</div><div class='add'>+		mem-&gt;memory[i] = 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(agp_generic_destroy_pages);</div><div class='ctx'> </div><div class='ctx'> void agp_generic_destroy_page(void *addr, int flags)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/char/agp/hp-agp.c b/drivers/char/agp/hp-agp.c<br/>index 80d7317f85c9..183ac3fe44fb 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/agp/hp-agp.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/char/agp/hp-agp.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/agp/hp-agp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/agp/hp-agp.c</a></div><div class='hunk'>@@ -435,7 +435,9 @@ const struct agp_bridge_driver hp_zx1_driver = {</div><div class='ctx'> 	.alloc_by_type		= agp_generic_alloc_by_type,</div><div class='ctx'> 	.free_by_type		= agp_generic_free_by_type,</div><div class='ctx'> 	.agp_alloc_page		= agp_generic_alloc_page,</div><div class='add'>+	.agp_alloc_pages	= agp_generic_alloc_pages,</div><div class='ctx'> 	.agp_destroy_page	= agp_generic_destroy_page,</div><div class='add'>+	.agp_destroy_pages	= agp_generic_destroy_pages,</div><div class='ctx'> 	.agp_type_to_mask_type  = agp_generic_type_to_mask_type,</div><div class='ctx'> 	.cant_use_aperture	= true,</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/char/agp/i460-agp.c b/drivers/char/agp/i460-agp.c<br/>index e587eebebc67..10da687d131a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/agp/i460-agp.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/char/agp/i460-agp.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/agp/i460-agp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/agp/i460-agp.c</a></div><div class='hunk'>@@ -575,7 +575,9 @@ const struct agp_bridge_driver intel_i460_driver = {</div><div class='ctx'> 	.insert_memory		= i460_insert_memory_small_io_page,</div><div class='ctx'> 	.remove_memory		= i460_remove_memory_small_io_page,</div><div class='ctx'> 	.agp_alloc_page		= agp_generic_alloc_page,</div><div class='add'>+	.agp_alloc_pages	= agp_generic_alloc_pages,</div><div class='ctx'> 	.agp_destroy_page	= agp_generic_destroy_page,</div><div class='add'>+	.agp_destroy_pages	= agp_generic_destroy_pages,</div><div class='ctx'> #endif</div><div class='ctx'> 	.alloc_by_type		= agp_generic_alloc_by_type,</div><div class='ctx'> 	.free_by_type		= agp_generic_free_by_type,</div><div class='head'>diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c<br/>index 016fdf0623a4..1108665913e2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/agp/intel-agp.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/char/agp/intel-agp.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/agp/intel-agp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/agp/intel-agp.c</a></div><div class='hunk'>@@ -54,8 +54,7 @@</div><div class='ctx'> 		 agp_bridge-&gt;dev-&gt;device == PCI_DEVICE_ID_INTEL_82965Q_HB || \</div><div class='ctx'> 		 agp_bridge-&gt;dev-&gt;device == PCI_DEVICE_ID_INTEL_82965G_HB || \</div><div class='ctx'> 		 agp_bridge-&gt;dev-&gt;device == PCI_DEVICE_ID_INTEL_82965GM_HB || \</div><div class='del'>-		 agp_bridge-&gt;dev-&gt;device == PCI_DEVICE_ID_INTEL_82965GME_HB || \</div><div class='del'>-		 agp_bridge-&gt;dev-&gt;device == PCI_DEVICE_ID_INTEL_GM45_HB)</div><div class='add'>+		 agp_bridge-&gt;dev-&gt;device == PCI_DEVICE_ID_INTEL_82965GME_HB)</div><div class='ctx'> </div><div class='ctx'> #define IS_G33 (agp_bridge-&gt;dev-&gt;device == PCI_DEVICE_ID_INTEL_G33_HB || \</div><div class='ctx'> 		agp_bridge-&gt;dev-&gt;device == PCI_DEVICE_ID_INTEL_Q35_HB || \</div><div class='hunk'>@@ -63,7 +62,8 @@</div><div class='ctx'> </div><div class='ctx'> #define IS_G4X (agp_bridge-&gt;dev-&gt;device == PCI_DEVICE_ID_INTEL_IGD_E_HB || \</div><div class='ctx'> 		agp_bridge-&gt;dev-&gt;device == PCI_DEVICE_ID_INTEL_Q45_HB || \</div><div class='del'>-		agp_bridge-&gt;dev-&gt;device == PCI_DEVICE_ID_INTEL_G45_HB)</div><div class='add'>+		agp_bridge-&gt;dev-&gt;device == PCI_DEVICE_ID_INTEL_G45_HB || \</div><div class='add'>+		agp_bridge-&gt;dev-&gt;device == PCI_DEVICE_ID_INTEL_GM45_HB)</div><div class='ctx'> </div><div class='ctx'> extern int agp_memory_reserved;</div><div class='ctx'> </div><div class='hunk'>@@ -214,8 +214,8 @@ static int intel_i810_configure(void)</div><div class='ctx'> 	if (agp_bridge-&gt;driver-&gt;needs_scratch_page) {</div><div class='ctx'> 		for (i = 0; i &lt; current_size-&gt;num_entries; i++) {</div><div class='ctx'> 			writel(agp_bridge-&gt;scratch_page, intel_private.registers+I810_PTE_BASE+(i*4));</div><div class='del'>-			readl(intel_private.registers+I810_PTE_BASE+(i*4));	/* PCI posting. */</div><div class='ctx'> 		}</div><div class='add'>+		readl(intel_private.registers+I810_PTE_BASE+((i-1)*4));	/* PCI posting. */</div><div class='ctx'> 	}</div><div class='ctx'> 	global_cache_flush();</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -525,8 +525,10 @@ static void intel_i830_init_gtt_entries(void)</div><div class='ctx'> 		size += 4;</div><div class='ctx'> 	} else if (IS_G4X) {</div><div class='ctx'> 		/* On 4 series hardware, GTT stolen is separate from graphics</div><div class='del'>-		 * stolen, ignore it in stolen gtt entries counting */</div><div class='del'>-		size = 0;</div><div class='add'>+		 * stolen, ignore it in stolen gtt entries counting.  However,</div><div class='add'>+		 * 4KB of the stolen memory doesn't get mapped to the GTT.</div><div class='add'>+		 */</div><div class='add'>+		size = 4;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* On previous hardware, the GTT size was just what was</div><div class='ctx'> 		 * required to map the aperture.</div><div class='hunk'>@@ -773,8 +775,8 @@ static int intel_i830_configure(void)</div><div class='ctx'> 	if (agp_bridge-&gt;driver-&gt;needs_scratch_page) {</div><div class='ctx'> 		for (i = intel_private.gtt_entries; i &lt; current_size-&gt;num_entries; i++) {</div><div class='ctx'> 			writel(agp_bridge-&gt;scratch_page, intel_private.registers+I810_PTE_BASE+(i*4));</div><div class='del'>-			readl(intel_private.registers+I810_PTE_BASE+(i*4));	/* PCI Posting. */</div><div class='ctx'> 		}</div><div class='add'>+		readl(intel_private.registers+I810_PTE_BASE+((i-1)*4));	/* PCI Posting. */</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	global_cache_flush();</div><div class='hunk'>@@ -989,8 +991,8 @@ static int intel_i915_configure(void)</div><div class='ctx'> 	if (agp_bridge-&gt;driver-&gt;needs_scratch_page) {</div><div class='ctx'> 		for (i = intel_private.gtt_entries; i &lt; current_size-&gt;num_entries; i++) {</div><div class='ctx'> 			writel(agp_bridge-&gt;scratch_page, intel_private.gtt+i);</div><div class='del'>-			readl(intel_private.gtt+i);	/* PCI Posting. */</div><div class='ctx'> 		}</div><div class='add'>+		readl(intel_private.gtt+i-1);	/* PCI Posting. */</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	global_cache_flush();</div><div class='hunk'>@@ -1711,7 +1713,9 @@ static const struct agp_bridge_driver intel_generic_driver = {</div><div class='ctx'> 	.alloc_by_type		= agp_generic_alloc_by_type,</div><div class='ctx'> 	.free_by_type		= agp_generic_free_by_type,</div><div class='ctx'> 	.agp_alloc_page		= agp_generic_alloc_page,</div><div class='add'>+	.agp_alloc_pages        = agp_generic_alloc_pages,</div><div class='ctx'> 	.agp_destroy_page	= agp_generic_destroy_page,</div><div class='add'>+	.agp_destroy_pages      = agp_generic_destroy_pages,</div><div class='ctx'> 	.agp_type_to_mask_type  = agp_generic_type_to_mask_type,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1736,7 +1740,9 @@ static const struct agp_bridge_driver intel_810_driver = {</div><div class='ctx'> 	.alloc_by_type		= intel_i810_alloc_by_type,</div><div class='ctx'> 	.free_by_type		= intel_i810_free_by_type,</div><div class='ctx'> 	.agp_alloc_page		= agp_generic_alloc_page,</div><div class='add'>+	.agp_alloc_pages        = agp_generic_alloc_pages,</div><div class='ctx'> 	.agp_destroy_page	= agp_generic_destroy_page,</div><div class='add'>+	.agp_destroy_pages      = agp_generic_destroy_pages,</div><div class='ctx'> 	.agp_type_to_mask_type  = agp_generic_type_to_mask_type,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1760,7 +1766,9 @@ static const struct agp_bridge_driver intel_815_driver = {</div><div class='ctx'> 	.alloc_by_type		= agp_generic_alloc_by_type,</div><div class='ctx'> 	.free_by_type		= agp_generic_free_by_type,</div><div class='ctx'> 	.agp_alloc_page		= agp_generic_alloc_page,</div><div class='add'>+	.agp_alloc_pages        = agp_generic_alloc_pages,</div><div class='ctx'> 	.agp_destroy_page	= agp_generic_destroy_page,</div><div class='add'>+	.agp_destroy_pages      = agp_generic_destroy_pages,</div><div class='ctx'> 	.agp_type_to_mask_type	= agp_generic_type_to_mask_type,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1785,7 +1793,9 @@ static const struct agp_bridge_driver intel_830_driver = {</div><div class='ctx'> 	.alloc_by_type		= intel_i830_alloc_by_type,</div><div class='ctx'> 	.free_by_type		= intel_i810_free_by_type,</div><div class='ctx'> 	.agp_alloc_page		= agp_generic_alloc_page,</div><div class='add'>+	.agp_alloc_pages        = agp_generic_alloc_pages,</div><div class='ctx'> 	.agp_destroy_page	= agp_generic_destroy_page,</div><div class='add'>+	.agp_destroy_pages      = agp_generic_destroy_pages,</div><div class='ctx'> 	.agp_type_to_mask_type  = intel_i830_type_to_mask_type,</div><div class='ctx'> 	.chipset_flush		= intel_i830_chipset_flush,</div><div class='ctx'> };</div><div class='hunk'>@@ -1810,7 +1820,9 @@ static const struct agp_bridge_driver intel_820_driver = {</div><div class='ctx'> 	.alloc_by_type		= agp_generic_alloc_by_type,</div><div class='ctx'> 	.free_by_type		= agp_generic_free_by_type,</div><div class='ctx'> 	.agp_alloc_page		= agp_generic_alloc_page,</div><div class='add'>+	.agp_alloc_pages        = agp_generic_alloc_pages,</div><div class='ctx'> 	.agp_destroy_page	= agp_generic_destroy_page,</div><div class='add'>+	.agp_destroy_pages      = agp_generic_destroy_pages,</div><div class='ctx'> 	.agp_type_to_mask_type  = agp_generic_type_to_mask_type,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1834,7 +1846,9 @@ static const struct agp_bridge_driver intel_830mp_driver = {</div><div class='ctx'> 	.alloc_by_type		= agp_generic_alloc_by_type,</div><div class='ctx'> 	.free_by_type		= agp_generic_free_by_type,</div><div class='ctx'> 	.agp_alloc_page		= agp_generic_alloc_page,</div><div class='add'>+	.agp_alloc_pages        = agp_generic_alloc_pages,</div><div class='ctx'> 	.agp_destroy_page	= agp_generic_destroy_page,</div><div class='add'>+	.agp_destroy_pages      = agp_generic_destroy_pages,</div><div class='ctx'> 	.agp_type_to_mask_type  = agp_generic_type_to_mask_type,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1858,7 +1872,9 @@ static const struct agp_bridge_driver intel_840_driver = {</div><div class='ctx'> 	.alloc_by_type		= agp_generic_alloc_by_type,</div><div class='ctx'> 	.free_by_type		= agp_generic_free_by_type,</div><div class='ctx'> 	.agp_alloc_page		= agp_generic_alloc_page,</div><div class='add'>+	.agp_alloc_pages        = agp_generic_alloc_pages,</div><div class='ctx'> 	.agp_destroy_page	= agp_generic_destroy_page,</div><div class='add'>+	.agp_destroy_pages      = agp_generic_destroy_pages,</div><div class='ctx'> 	.agp_type_to_mask_type  = agp_generic_type_to_mask_type,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1882,7 +1898,9 @@ static const struct agp_bridge_driver intel_845_driver = {</div><div class='ctx'> 	.alloc_by_type		= agp_generic_alloc_by_type,</div><div class='ctx'> 	.free_by_type		= agp_generic_free_by_type,</div><div class='ctx'> 	.agp_alloc_page		= agp_generic_alloc_page,</div><div class='add'>+	.agp_alloc_pages        = agp_generic_alloc_pages,</div><div class='ctx'> 	.agp_destroy_page	= agp_generic_destroy_page,</div><div class='add'>+	.agp_destroy_pages      = agp_generic_destroy_pages,</div><div class='ctx'> 	.agp_type_to_mask_type  = agp_generic_type_to_mask_type,</div><div class='ctx'> 	.chipset_flush		= intel_i830_chipset_flush,</div><div class='ctx'> };</div><div class='hunk'>@@ -1907,7 +1925,9 @@ static const struct agp_bridge_driver intel_850_driver = {</div><div class='ctx'> 	.alloc_by_type		= agp_generic_alloc_by_type,</div><div class='ctx'> 	.free_by_type		= agp_generic_free_by_type,</div><div class='ctx'> 	.agp_alloc_page		= agp_generic_alloc_page,</div><div class='add'>+	.agp_alloc_pages        = agp_generic_alloc_pages,</div><div class='ctx'> 	.agp_destroy_page	= agp_generic_destroy_page,</div><div class='add'>+	.agp_destroy_pages      = agp_generic_destroy_pages,</div><div class='ctx'> 	.agp_type_to_mask_type  = agp_generic_type_to_mask_type,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1931,7 +1951,9 @@ static const struct agp_bridge_driver intel_860_driver = {</div><div class='ctx'> 	.alloc_by_type		= agp_generic_alloc_by_type,</div><div class='ctx'> 	.free_by_type		= agp_generic_free_by_type,</div><div class='ctx'> 	.agp_alloc_page		= agp_generic_alloc_page,</div><div class='add'>+	.agp_alloc_pages        = agp_generic_alloc_pages,</div><div class='ctx'> 	.agp_destroy_page	= agp_generic_destroy_page,</div><div class='add'>+	.agp_destroy_pages      = agp_generic_destroy_pages,</div><div class='ctx'> 	.agp_type_to_mask_type  = agp_generic_type_to_mask_type,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1956,7 +1978,9 @@ static const struct agp_bridge_driver intel_915_driver = {</div><div class='ctx'> 	.alloc_by_type		= intel_i830_alloc_by_type,</div><div class='ctx'> 	.free_by_type		= intel_i810_free_by_type,</div><div class='ctx'> 	.agp_alloc_page		= agp_generic_alloc_page,</div><div class='add'>+	.agp_alloc_pages        = agp_generic_alloc_pages,</div><div class='ctx'> 	.agp_destroy_page	= agp_generic_destroy_page,</div><div class='add'>+	.agp_destroy_pages      = agp_generic_destroy_pages,</div><div class='ctx'> 	.agp_type_to_mask_type  = intel_i830_type_to_mask_type,</div><div class='ctx'> 	.chipset_flush		= intel_i915_chipset_flush,</div><div class='ctx'> };</div><div class='hunk'>@@ -1982,7 +2006,9 @@ static const struct agp_bridge_driver intel_i965_driver = {</div><div class='ctx'> 	.alloc_by_type		= intel_i830_alloc_by_type,</div><div class='ctx'> 	.free_by_type		= intel_i810_free_by_type,</div><div class='ctx'> 	.agp_alloc_page		= agp_generic_alloc_page,</div><div class='add'>+	.agp_alloc_pages        = agp_generic_alloc_pages,</div><div class='ctx'> 	.agp_destroy_page	= agp_generic_destroy_page,</div><div class='add'>+	.agp_destroy_pages      = agp_generic_destroy_pages,</div><div class='ctx'> 	.agp_type_to_mask_type	= intel_i830_type_to_mask_type,</div><div class='ctx'> 	.chipset_flush		= intel_i915_chipset_flush,</div><div class='ctx'> };</div><div class='hunk'>@@ -2007,7 +2033,9 @@ static const struct agp_bridge_driver intel_7505_driver = {</div><div class='ctx'> 	.alloc_by_type		= agp_generic_alloc_by_type,</div><div class='ctx'> 	.free_by_type		= agp_generic_free_by_type,</div><div class='ctx'> 	.agp_alloc_page		= agp_generic_alloc_page,</div><div class='add'>+	.agp_alloc_pages        = agp_generic_alloc_pages,</div><div class='ctx'> 	.agp_destroy_page	= agp_generic_destroy_page,</div><div class='add'>+	.agp_destroy_pages      = agp_generic_destroy_pages,</div><div class='ctx'> 	.agp_type_to_mask_type  = agp_generic_type_to_mask_type,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2032,7 +2060,9 @@ static const struct agp_bridge_driver intel_g33_driver = {</div><div class='ctx'> 	.alloc_by_type		= intel_i830_alloc_by_type,</div><div class='ctx'> 	.free_by_type		= intel_i810_free_by_type,</div><div class='ctx'> 	.agp_alloc_page		= agp_generic_alloc_page,</div><div class='add'>+	.agp_alloc_pages        = agp_generic_alloc_pages,</div><div class='ctx'> 	.agp_destroy_page	= agp_generic_destroy_page,</div><div class='add'>+	.agp_destroy_pages      = agp_generic_destroy_pages,</div><div class='ctx'> 	.agp_type_to_mask_type	= intel_i830_type_to_mask_type,</div><div class='ctx'> 	.chipset_flush		= intel_i915_chipset_flush,</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/char/agp/nvidia-agp.c b/drivers/char/agp/nvidia-agp.c<br/>index eaceb61ba2dc..5bbed3d79db9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/agp/nvidia-agp.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/char/agp/nvidia-agp.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/agp/nvidia-agp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/agp/nvidia-agp.c</a></div><div class='hunk'>@@ -201,10 +201,15 @@ extern int agp_memory_reserved;</div><div class='ctx'> static int nvidia_insert_memory(struct agp_memory *mem, off_t pg_start, int type)</div><div class='ctx'> {</div><div class='ctx'> 	int i, j;</div><div class='add'>+	int mask_type;</div><div class='ctx'> </div><div class='del'>-	if ((type != 0) || (mem-&gt;type != 0))</div><div class='add'>+	mask_type = agp_generic_type_to_mask_type(mem-&gt;bridge, type);</div><div class='add'>+	if (mask_type != 0 || type != mem-&gt;type)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	if (mem-&gt;page_count == 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	if ((pg_start + mem-&gt;page_count) &gt;</div><div class='ctx'> 		(nvidia_private.num_active_entries - agp_memory_reserved/PAGE_SIZE))</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -220,10 +225,13 @@ static int nvidia_insert_memory(struct agp_memory *mem, off_t pg_start, int type</div><div class='ctx'> 	}</div><div class='ctx'> 	for (i = 0, j = pg_start; i &lt; mem-&gt;page_count; i++, j++) {</div><div class='ctx'> 		writel(agp_bridge-&gt;driver-&gt;mask_memory(agp_bridge,</div><div class='del'>-			mem-&gt;memory[i], mem-&gt;type),</div><div class='add'>+			mem-&gt;memory[i], mask_type),</div><div class='ctx'> 			agp_bridge-&gt;gatt_table+nvidia_private.pg_offset+j);</div><div class='del'>-		readl(agp_bridge-&gt;gatt_table+nvidia_private.pg_offset+j);	/* PCI Posting. */</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	/* PCI Posting. */</div><div class='add'>+	readl(agp_bridge-&gt;gatt_table+nvidia_private.pg_offset+j - 1);</div><div class='add'>+</div><div class='ctx'> 	agp_bridge-&gt;driver-&gt;tlb_flush(mem);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -233,9 +241,15 @@ static int nvidia_remove_memory(struct agp_memory *mem, off_t pg_start, int type</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	if ((type != 0) || (mem-&gt;type != 0))</div><div class='add'>+	int mask_type;</div><div class='add'>+</div><div class='add'>+	mask_type = agp_generic_type_to_mask_type(mem-&gt;bridge, type);</div><div class='add'>+	if (mask_type != 0 || type != mem-&gt;type)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	if (mem-&gt;page_count == 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	for (i = pg_start; i &lt; (mem-&gt;page_count + pg_start); i++)</div><div class='ctx'> 		writel(agp_bridge-&gt;scratch_page, agp_bridge-&gt;gatt_table+nvidia_private.pg_offset+i);</div><div class='ctx'> </div><div class='hunk'>@@ -312,7 +326,9 @@ static const struct agp_bridge_driver nvidia_driver = {</div><div class='ctx'> 	.alloc_by_type		= agp_generic_alloc_by_type,</div><div class='ctx'> 	.free_by_type		= agp_generic_free_by_type,</div><div class='ctx'> 	.agp_alloc_page		= agp_generic_alloc_page,</div><div class='add'>+	.agp_alloc_pages	= agp_generic_alloc_pages,</div><div class='ctx'> 	.agp_destroy_page	= agp_generic_destroy_page,</div><div class='add'>+	.agp_destroy_pages	= agp_generic_destroy_pages,</div><div class='ctx'> 	.agp_type_to_mask_type  = agp_generic_type_to_mask_type,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/char/agp/parisc-agp.c b/drivers/char/agp/parisc-agp.c<br/>index 8c42dcc5958c..f2492ecf0824 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/agp/parisc-agp.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/char/agp/parisc-agp.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/agp/parisc-agp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/agp/parisc-agp.c</a></div><div class='hunk'>@@ -224,7 +224,9 @@ static const struct agp_bridge_driver parisc_agp_driver = {</div><div class='ctx'> 	.alloc_by_type		= agp_generic_alloc_by_type,</div><div class='ctx'> 	.free_by_type		= agp_generic_free_by_type,</div><div class='ctx'> 	.agp_alloc_page		= agp_generic_alloc_page,</div><div class='add'>+	.agp_alloc_pages	= agp_generic_alloc_pages,</div><div class='ctx'> 	.agp_destroy_page	= agp_generic_destroy_page,</div><div class='add'>+	.agp_destroy_pages	= agp_generic_destroy_pages,</div><div class='ctx'> 	.agp_type_to_mask_type  = agp_generic_type_to_mask_type,</div><div class='ctx'> 	.cant_use_aperture	= true,</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/char/agp/sis-agp.c b/drivers/char/agp/sis-agp.c<br/>index 2587ef96a960..6c3837a0184d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/agp/sis-agp.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/char/agp/sis-agp.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/agp/sis-agp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/agp/sis-agp.c</a></div><div class='hunk'>@@ -140,7 +140,9 @@ static struct agp_bridge_driver sis_driver = {</div><div class='ctx'> 	.alloc_by_type		= agp_generic_alloc_by_type,</div><div class='ctx'> 	.free_by_type		= agp_generic_free_by_type,</div><div class='ctx'> 	.agp_alloc_page		= agp_generic_alloc_page,</div><div class='add'>+	.agp_alloc_pages	= agp_generic_alloc_pages,</div><div class='ctx'> 	.agp_destroy_page	= agp_generic_destroy_page,</div><div class='add'>+	.agp_destroy_pages	= agp_generic_destroy_pages,</div><div class='ctx'> 	.agp_type_to_mask_type  = agp_generic_type_to_mask_type,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/char/agp/sworks-agp.c b/drivers/char/agp/sworks-agp.c<br/>index 2fb27fe4c10c..6224df8b7f0a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/agp/sworks-agp.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/char/agp/sworks-agp.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/agp/sworks-agp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/agp/sworks-agp.c</a></div><div class='hunk'>@@ -437,7 +437,9 @@ static const struct agp_bridge_driver sworks_driver = {</div><div class='ctx'> 	.alloc_by_type		= agp_generic_alloc_by_type,</div><div class='ctx'> 	.free_by_type		= agp_generic_free_by_type,</div><div class='ctx'> 	.agp_alloc_page		= agp_generic_alloc_page,</div><div class='add'>+	.agp_alloc_pages	= agp_generic_alloc_pages,</div><div class='ctx'> 	.agp_destroy_page	= agp_generic_destroy_page,</div><div class='add'>+	.agp_destroy_pages	= agp_generic_destroy_pages,</div><div class='ctx'> 	.agp_type_to_mask_type  = agp_generic_type_to_mask_type,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/char/agp/uninorth-agp.c b/drivers/char/agp/uninorth-agp.c<br/>index eef72709ec53..0f004b65ec03 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/agp/uninorth-agp.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/char/agp/uninorth-agp.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/agp/uninorth-agp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/agp/uninorth-agp.c</a></div><div class='hunk'>@@ -509,7 +509,9 @@ const struct agp_bridge_driver uninorth_agp_driver = {</div><div class='ctx'> 	.alloc_by_type		= agp_generic_alloc_by_type,</div><div class='ctx'> 	.free_by_type		= agp_generic_free_by_type,</div><div class='ctx'> 	.agp_alloc_page		= agp_generic_alloc_page,</div><div class='add'>+	.agp_alloc_pages	= agp_generic_alloc_pages,</div><div class='ctx'> 	.agp_destroy_page	= agp_generic_destroy_page,</div><div class='add'>+	.agp_destroy_pages	= agp_generic_destroy_pages,</div><div class='ctx'> 	.agp_type_to_mask_type  = agp_generic_type_to_mask_type,</div><div class='ctx'> 	.cant_use_aperture	= true,</div><div class='ctx'> };</div><div class='hunk'>@@ -534,7 +536,9 @@ const struct agp_bridge_driver u3_agp_driver = {</div><div class='ctx'> 	.alloc_by_type		= agp_generic_alloc_by_type,</div><div class='ctx'> 	.free_by_type		= agp_generic_free_by_type,</div><div class='ctx'> 	.agp_alloc_page		= agp_generic_alloc_page,</div><div class='add'>+	.agp_alloc_pages	= agp_generic_alloc_pages,</div><div class='ctx'> 	.agp_destroy_page	= agp_generic_destroy_page,</div><div class='add'>+	.agp_destroy_pages	= agp_generic_destroy_pages,</div><div class='ctx'> 	.agp_type_to_mask_type  = agp_generic_type_to_mask_type,</div><div class='ctx'> 	.cant_use_aperture	= true,</div><div class='ctx'> 	.needs_scratch_page	= true,</div><div class='head'>diff --git a/drivers/char/agp/via-agp.c b/drivers/char/agp/via-agp.c<br/>index 7b36476dff41..9f4d49e1b59a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/agp/via-agp.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/char/agp/via-agp.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/agp/via-agp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/agp/via-agp.c</a></div><div class='hunk'>@@ -190,7 +190,9 @@ static const struct agp_bridge_driver via_agp3_driver = {</div><div class='ctx'> 	.alloc_by_type		= agp_generic_alloc_by_type,</div><div class='ctx'> 	.free_by_type		= agp_generic_free_by_type,</div><div class='ctx'> 	.agp_alloc_page		= agp_generic_alloc_page,</div><div class='add'>+	.agp_alloc_pages	= agp_generic_alloc_pages,</div><div class='ctx'> 	.agp_destroy_page	= agp_generic_destroy_page,</div><div class='add'>+	.agp_destroy_pages	= agp_generic_destroy_pages,</div><div class='ctx'> 	.agp_type_to_mask_type  = agp_generic_type_to_mask_type,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -214,7 +216,9 @@ static const struct agp_bridge_driver via_driver = {</div><div class='ctx'> 	.alloc_by_type		= agp_generic_alloc_by_type,</div><div class='ctx'> 	.free_by_type		= agp_generic_free_by_type,</div><div class='ctx'> 	.agp_alloc_page		= agp_generic_alloc_page,</div><div class='add'>+	.agp_alloc_pages	= agp_generic_alloc_pages,</div><div class='ctx'> 	.agp_destroy_page	= agp_generic_destroy_page,</div><div class='add'>+	.agp_destroy_pages	= agp_generic_destroy_pages,</div><div class='ctx'> 	.agp_type_to_mask_type  = agp_generic_type_to_mask_type,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/char/amiserial.c b/drivers/char/amiserial.c<br/>index 6e763e3f5a81..98821f97583c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/amiserial.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/char/amiserial.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/amiserial.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/amiserial.c</a></div><div class='hunk'>@@ -837,9 +837,6 @@ static int rs_put_char(struct tty_struct *tty, unsigned char ch)</div><div class='ctx'> 	struct async_struct *info;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	if (!tty)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='ctx'> 	info = tty-&gt;driver_data;</div><div class='ctx'> </div><div class='ctx'> 	if (serial_paranoia_check(info, tty-&gt;name, "rs_put_char"))</div><div class='hunk'>@@ -892,9 +889,6 @@ static int rs_write(struct tty_struct * tty, const unsigned char *buf, int count</div><div class='ctx'> 	struct async_struct *info;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	if (!tty)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='ctx'> 	info = tty-&gt;driver_data;</div><div class='ctx'> </div><div class='ctx'> 	if (serial_paranoia_check(info, tty-&gt;name, "rs_write"))</div><div class='head'>diff --git a/drivers/char/applicom.c b/drivers/char/applicom.c<br/>index 31d08b641f5b..05674febb0c6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/applicom.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/char/applicom.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/applicom.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/applicom.c</a></div><div class='hunk'>@@ -478,7 +478,7 @@ static int do_ac_read(int IndexCard, char __user *buf,</div><div class='ctx'> 		struct st_ram_io *st_loc, struct mailbox *mailbox)</div><div class='ctx'> {</div><div class='ctx'> 	void __iomem *from = apbs[IndexCard].RamIO + RAM_TO_PC;</div><div class='del'>-	unsigned char *to = (unsigned char *)&amp;mailbox;</div><div class='add'>+	unsigned char *to = (unsigned char *)mailbox;</div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 	int c;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -712,8 +712,7 @@ static int ac_ioctl(struct inode *inode, struct file *file, unsigned int cmd, un</div><div class='ctx'> 	</div><div class='ctx'> 	IndexCard = adgl-&gt;num_card-1;</div><div class='ctx'> 	 </div><div class='del'>-	if(cmd != 0 &amp;&amp; cmd != 6 &amp;&amp;</div><div class='del'>-	   ((IndexCard &gt;= MAX_BOARD) || !apbs[IndexCard].RamIO)) {</div><div class='add'>+	if(cmd != 6 &amp;&amp; ((IndexCard &gt;= MAX_BOARD) || !apbs[IndexCard].RamIO)) {</div><div class='ctx'> 		static int warncount = 10;</div><div class='ctx'> 		if (warncount) {</div><div class='ctx'> 			printk( KERN_WARNING "APPLICOM driver IOCTL, bad board number %d\n",(int)IndexCard+1);</div><div class='hunk'>@@ -832,8 +831,7 @@ static int ac_ioctl(struct inode *inode, struct file *file, unsigned int cmd, un</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		printk(KERN_INFO "APPLICOM driver ioctl, unknown function code %d\n",cmd) ;</div><div class='del'>-		ret = -EINVAL;</div><div class='add'>+		ret = -ENOTTY;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	Dummy = readb(apbs[IndexCard].RamIO + VERS);</div><div class='head'>diff --git a/drivers/char/bsr.c b/drivers/char/bsr.c<br/>index b650b4e48e50..456f54db73e2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/bsr.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/char/bsr.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/bsr.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/bsr.c</a></div><div class='hunk'>@@ -229,9 +229,8 @@ static int bsr_create_devs(struct device_node *bn)</div><div class='ctx'> 		if (result)</div><div class='ctx'> 			goto out_err;</div><div class='ctx'> </div><div class='del'>-		cur-&gt;bsr_device = device_create_drvdata(bsr_class, NULL,</div><div class='del'>-							cur-&gt;bsr_dev,</div><div class='del'>-							cur, cur-&gt;bsr_name);</div><div class='add'>+		cur-&gt;bsr_device = device_create(bsr_class, NULL, cur-&gt;bsr_dev,</div><div class='add'>+						cur, cur-&gt;bsr_name);</div><div class='ctx'> 		if (!cur-&gt;bsr_device) {</div><div class='ctx'> 			printk(KERN_ERR "device_create failed for %s\n",</div><div class='ctx'> 			       cur-&gt;bsr_name);</div><div class='head'>diff --git a/drivers/char/cyclades.c b/drivers/char/cyclades.c<br/>index fe6d774fe2e4..5e5b1dc1a0a7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/cyclades.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/char/cyclades.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/cyclades.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/cyclades.c</a></div><div class='hunk'>@@ -4993,12 +4993,14 @@ static int __devinit cy_pci_probe(struct pci_dev *pdev,</div><div class='ctx'> 			device_id == PCI_DEVICE_ID_CYCLOM_Y_Hi) {</div><div class='ctx'> 		card_name = "Cyclom-Y";</div><div class='ctx'> </div><div class='del'>-		addr0 = pci_iomap(pdev, 0, CyPCI_Yctl);</div><div class='add'>+		addr0 = ioremap_nocache(pci_resource_start(pdev, 0),</div><div class='add'>+				CyPCI_Yctl);</div><div class='ctx'> 		if (addr0 == NULL) {</div><div class='ctx'> 			dev_err(&amp;pdev-&gt;dev, "can't remap ctl region\n");</div><div class='ctx'> 			goto err_reg;</div><div class='ctx'> 		}</div><div class='del'>-		addr2 = pci_iomap(pdev, 2, CyPCI_Ywin);</div><div class='add'>+		addr2 = ioremap_nocache(pci_resource_start(pdev, 2),</div><div class='add'>+				CyPCI_Ywin);</div><div class='ctx'> 		if (addr2 == NULL) {</div><div class='ctx'> 			dev_err(&amp;pdev-&gt;dev, "can't remap base region\n");</div><div class='ctx'> 			goto err_unmap;</div><div class='hunk'>@@ -5013,7 +5015,8 @@ static int __devinit cy_pci_probe(struct pci_dev *pdev,</div><div class='ctx'> 	} else if (device_id == PCI_DEVICE_ID_CYCLOM_Z_Hi) {</div><div class='ctx'> 		struct RUNTIME_9060 __iomem *ctl_addr;</div><div class='ctx'> </div><div class='del'>-		ctl_addr = addr0 = pci_iomap(pdev, 0, CyPCI_Zctl);</div><div class='add'>+		ctl_addr = addr0 = ioremap_nocache(pci_resource_start(pdev, 0),</div><div class='add'>+				CyPCI_Zctl);</div><div class='ctx'> 		if (addr0 == NULL) {</div><div class='ctx'> 			dev_err(&amp;pdev-&gt;dev, "can't remap ctl region\n");</div><div class='ctx'> 			goto err_reg;</div><div class='hunk'>@@ -5026,8 +5029,8 @@ static int __devinit cy_pci_probe(struct pci_dev *pdev,</div><div class='ctx'> </div><div class='ctx'> 		mailbox = (u32)readl(&amp;ctl_addr-&gt;mail_box_0);</div><div class='ctx'> </div><div class='del'>-		addr2 = pci_iomap(pdev, 2, mailbox == ZE_V1 ?</div><div class='del'>-				CyPCI_Ze_win : CyPCI_Zwin);</div><div class='add'>+		addr2 = ioremap_nocache(pci_resource_start(pdev, 2),</div><div class='add'>+				mailbox == ZE_V1 ? CyPCI_Ze_win : CyPCI_Zwin);</div><div class='ctx'> 		if (addr2 == NULL) {</div><div class='ctx'> 			dev_err(&amp;pdev-&gt;dev, "can't remap base region\n");</div><div class='ctx'> 			goto err_unmap;</div><div class='hunk'>@@ -5159,9 +5162,9 @@ err_null:</div><div class='ctx'> 	cy_card[card_no].base_addr = NULL;</div><div class='ctx'> 	free_irq(irq, &amp;cy_card[card_no]);</div><div class='ctx'> err_unmap:</div><div class='del'>-	pci_iounmap(pdev, addr0);</div><div class='add'>+	iounmap(addr0);</div><div class='ctx'> 	if (addr2)</div><div class='del'>-		pci_iounmap(pdev, addr2);</div><div class='add'>+		iounmap(addr2);</div><div class='ctx'> err_reg:</div><div class='ctx'> 	pci_release_regions(pdev);</div><div class='ctx'> err_dis:</div><div class='hunk'>@@ -5186,9 +5189,9 @@ static void __devexit cy_pci_remove(struct pci_dev *pdev)</div><div class='ctx'> 		cy_writew(cinfo-&gt;ctl_addr + 0x68,</div><div class='ctx'> 				readw(cinfo-&gt;ctl_addr + 0x68) &amp; ~0x0900);</div><div class='ctx'> </div><div class='del'>-	pci_iounmap(pdev, cinfo-&gt;base_addr);</div><div class='add'>+	iounmap(cinfo-&gt;base_addr);</div><div class='ctx'> 	if (cinfo-&gt;ctl_addr)</div><div class='del'>-		pci_iounmap(pdev, cinfo-&gt;ctl_addr);</div><div class='add'>+		iounmap(cinfo-&gt;ctl_addr);</div><div class='ctx'> 	if (cinfo-&gt;irq</div><div class='ctx'> #ifndef CONFIG_CYZ_INTR</div><div class='ctx'> 		&amp;&amp; !IS_CYC_Z(*cinfo)</div><div class='head'>diff --git a/drivers/char/ds1286.c b/drivers/char/ds1286.c<br/>index fb584938c9c3..5329d482b582 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/ds1286.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/char/ds1286.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/ds1286.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/ds1286.c</a></div><div class='hunk'>@@ -443,7 +443,6 @@ static void ds1286_get_time(struct rtc_time *rtc_tm)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char save_control;</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	unsigned long uip_watchdog = jiffies;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * read RTC once any update in progress is done. The update</div><div class='hunk'>@@ -456,8 +455,7 @@ static void ds1286_get_time(struct rtc_time *rtc_tm)</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	if (ds1286_is_updating() != 0)</div><div class='del'>-		while (time_before(jiffies, uip_watchdog + 2*HZ/100))</div><div class='del'>-			barrier();</div><div class='add'>+		msleep(20);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Only the values that we read from the RTC are set. We leave</div><div class='head'>diff --git a/drivers/char/dsp56k.c b/drivers/char/dsp56k.c<br/>index ca7c72a486b2..85832ab924e6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/dsp56k.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/char/dsp56k.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/dsp56k.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/dsp56k.c</a></div><div class='hunk'>@@ -508,8 +508,8 @@ static int __init dsp56k_init_driver(void)</div><div class='ctx'> 		err = PTR_ERR(dsp56k_class);</div><div class='ctx'> 		goto out_chrdev;</div><div class='ctx'> 	}</div><div class='del'>-	device_create_drvdata(dsp56k_class, NULL, MKDEV(DSP56K_MAJOR, 0),</div><div class='del'>-			      NULL, "dsp56k");</div><div class='add'>+	device_create(dsp56k_class, NULL, MKDEV(DSP56K_MAJOR, 0), NULL,</div><div class='add'>+		      "dsp56k");</div><div class='ctx'> </div><div class='ctx'> 	printk(banner);</div><div class='ctx'> 	goto out;</div><div class='head'>diff --git a/drivers/char/epca.c b/drivers/char/epca.c<br/>index 456e4ede049f..4998b2761e8f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/epca.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/char/epca.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/epca.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/epca.c</a></div><div class='hunk'>@@ -1376,6 +1376,7 @@ static void post_fep_init(unsigned int crd)</div><div class='ctx'> 		unsigned long flags;</div><div class='ctx'> 		u16 tseg, rseg;</div><div class='ctx'> </div><div class='add'>+		tty_port_init(&amp;ch-&gt;port);</div><div class='ctx'> 		ch-&gt;brdchan = bc;</div><div class='ctx'> 		ch-&gt;mailbox = gd;</div><div class='ctx'> 		INIT_WORK(&amp;ch-&gt;tqueue, do_softint);</div><div class='hunk'>@@ -1510,10 +1511,6 @@ static void post_fep_init(unsigned int crd)</div><div class='ctx'> 		ch-&gt;fepstopca = 0;</div><div class='ctx'> </div><div class='ctx'> 		ch-&gt;close_delay = 50;</div><div class='del'>-		ch-&gt;port.count = 0;</div><div class='del'>-		ch-&gt;port.blocked_open = 0;</div><div class='del'>-		init_waitqueue_head(&amp;ch-&gt;port.open_wait);</div><div class='del'>-		init_waitqueue_head(&amp;ch-&gt;port.close_wait);</div><div class='ctx'> </div><div class='ctx'> 		spin_unlock_irqrestore(&amp;epca_lock, flags);</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/char/generic_serial.c b/drivers/char/generic_serial.c<br/>index 19d3afb0e50c..c6090f84a2e4 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/generic_serial.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/char/generic_serial.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/generic_serial.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/generic_serial.c</a></div><div class='hunk'>@@ -54,8 +54,6 @@ int gs_put_char(struct tty_struct * tty, unsigned char ch)</div><div class='ctx'> </div><div class='ctx'> 	func_enter (); </div><div class='ctx'> </div><div class='del'>-	if (!tty) return 0;</div><div class='del'>-</div><div class='ctx'> 	port = tty-&gt;driver_data;</div><div class='ctx'> </div><div class='ctx'> 	if (!port) return 0;</div><div class='hunk'>@@ -97,8 +95,6 @@ int gs_write(struct tty_struct * tty,</div><div class='ctx'> </div><div class='ctx'> 	func_enter ();</div><div class='ctx'> </div><div class='del'>-	if (!tty) return 0;</div><div class='del'>-</div><div class='ctx'> 	port = tty-&gt;driver_data;</div><div class='ctx'> </div><div class='ctx'> 	if (!port) return 0;</div><div class='hunk'>@@ -185,7 +181,6 @@ static int gs_real_chars_in_buffer(struct tty_struct *tty)</div><div class='ctx'> 	struct gs_port *port;</div><div class='ctx'> 	func_enter ();</div><div class='ctx'> </div><div class='del'>-	if (!tty) return 0;</div><div class='ctx'> 	port = tty-&gt;driver_data;</div><div class='ctx'> </div><div class='ctx'> 	if (!port-&gt;rd) return 0;</div><div class='hunk'>@@ -274,8 +269,6 @@ void gs_flush_buffer(struct tty_struct *tty)</div><div class='ctx'> </div><div class='ctx'> 	func_enter ();</div><div class='ctx'> </div><div class='del'>-	if (!tty) return;</div><div class='del'>-</div><div class='ctx'> 	port = tty-&gt;driver_data;</div><div class='ctx'> </div><div class='ctx'> 	if (!port) return;</div><div class='hunk'>@@ -296,8 +289,6 @@ void gs_flush_chars(struct tty_struct * tty)</div><div class='ctx'> </div><div class='ctx'> 	func_enter ();</div><div class='ctx'> </div><div class='del'>-	if (!tty) return;</div><div class='del'>-</div><div class='ctx'> 	port = tty-&gt;driver_data;</div><div class='ctx'> </div><div class='ctx'> 	if (!port) return;</div><div class='hunk'>@@ -321,8 +312,6 @@ void gs_stop(struct tty_struct * tty)</div><div class='ctx'> </div><div class='ctx'> 	func_enter ();</div><div class='ctx'> </div><div class='del'>-	if (!tty) return;</div><div class='del'>-</div><div class='ctx'> 	port = tty-&gt;driver_data;</div><div class='ctx'> </div><div class='ctx'> 	if (!port) return;</div><div class='hunk'>@@ -341,8 +330,6 @@ void gs_start(struct tty_struct * tty)</div><div class='ctx'> {</div><div class='ctx'> 	struct gs_port *port;</div><div class='ctx'> </div><div class='del'>-	if (!tty) return;</div><div class='del'>-</div><div class='ctx'> 	port = tty-&gt;driver_data;</div><div class='ctx'> </div><div class='ctx'> 	if (!port) return;</div><div class='hunk'>@@ -393,8 +380,6 @@ void gs_hangup(struct tty_struct *tty)</div><div class='ctx'> </div><div class='ctx'> 	func_enter ();</div><div class='ctx'> </div><div class='del'>-	if (!tty) return;</div><div class='del'>-</div><div class='ctx'> 	port = tty-&gt;driver_data;</div><div class='ctx'> 	tty = port-&gt;port.tty;</div><div class='ctx'> 	if (!tty) </div><div class='hunk'>@@ -426,8 +411,6 @@ int gs_block_til_ready(void *port_, struct file * filp)</div><div class='ctx'> </div><div class='ctx'> 	tty = port-&gt;port.tty;</div><div class='ctx'> </div><div class='del'>-	if (!tty) return 0;</div><div class='del'>-</div><div class='ctx'> 	gs_dprintk (GS_DEBUG_BTR, "Entering gs_block_till_ready.\n"); </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If the device is in the middle of being closed, then block</div><div class='hunk'>@@ -523,8 +506,6 @@ void gs_close(struct tty_struct * tty, struct file * filp)</div><div class='ctx'> 	</div><div class='ctx'> 	func_enter ();</div><div class='ctx'> </div><div class='del'>-	if (!tty) return;</div><div class='del'>-</div><div class='ctx'> 	port = (struct gs_port *) tty-&gt;driver_data;</div><div class='ctx'> </div><div class='ctx'> 	if (!port) return;</div><div class='hunk'>@@ -621,8 +602,6 @@ void gs_set_termios (struct tty_struct * tty,</div><div class='ctx'> </div><div class='ctx'> 	func_enter();</div><div class='ctx'> </div><div class='del'>-	if (!tty) return;</div><div class='del'>-</div><div class='ctx'> 	port = tty-&gt;driver_data;</div><div class='ctx'> </div><div class='ctx'> 	if (!port) return;</div><div class='head'>diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c<br/>index b3f5dbc6d880..f3cfb4c76125 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/hpet.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/char/hpet.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/hpet.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/hpet.c</a></div><div class='hunk'>@@ -53,6 +53,11 @@</div><div class='ctx'> </div><div class='ctx'> #define HPET_RANGE_SIZE		1024	/* from HPET spec */</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+/* WARNING -- don't get confused.  These macros are never used</div><div class='add'>+ * to write the (single) counter, and rarely to read it.</div><div class='add'>+ * They're badly named; to fix, someday.</div><div class='add'>+ */</div><div class='ctx'> #if BITS_PER_LONG == 64</div><div class='ctx'> #define	write_counter(V, MC)	writeq(V, MC)</div><div class='ctx'> #define	read_counter(MC)	readq(MC)</div><div class='hunk'>@@ -77,7 +82,7 @@ static struct clocksource clocksource_hpet = {</div><div class='ctx'>         .rating         = 250,</div><div class='ctx'>         .read           = read_hpet,</div><div class='ctx'>         .mask           = CLOCKSOURCE_MASK(64),</div><div class='del'>-        .mult           = 0, /*to be caluclated*/</div><div class='add'>+	.mult		= 0, /* to be calculated */</div><div class='ctx'>         .shift          = 10,</div><div class='ctx'>         .flags          = CLOCK_SOURCE_IS_CONTINUOUS,</div><div class='ctx'> };</div><div class='hunk'>@@ -86,8 +91,6 @@ static struct clocksource *hpet_clocksource;</div><div class='ctx'> </div><div class='ctx'> /* A lock for concurrent access by app and isr hpet activity. */</div><div class='ctx'> static DEFINE_SPINLOCK(hpet_lock);</div><div class='del'>-/* A lock for concurrent intermodule access to hpet and isr hpet activity. */</div><div class='del'>-static DEFINE_SPINLOCK(hpet_task_lock);</div><div class='ctx'> </div><div class='ctx'> #define	HPET_DEV_NAME	(7)</div><div class='ctx'> </div><div class='hunk'>@@ -99,7 +102,6 @@ struct hpet_dev {</div><div class='ctx'> 	unsigned long hd_irqdata;</div><div class='ctx'> 	wait_queue_head_t hd_waitqueue;</div><div class='ctx'> 	struct fasync_struct *hd_async_queue;</div><div class='del'>-	struct hpet_task *hd_task;</div><div class='ctx'> 	unsigned int hd_flags;</div><div class='ctx'> 	unsigned int hd_irq;</div><div class='ctx'> 	unsigned int hd_hdwirq;</div><div class='hunk'>@@ -173,11 +175,6 @@ static irqreturn_t hpet_interrupt(int irq, void *data)</div><div class='ctx'> 		writel(isr, &amp;devp-&gt;hd_hpet-&gt;hpet_isr);</div><div class='ctx'> 	spin_unlock(&amp;hpet_lock);</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;hpet_task_lock);</div><div class='del'>-	if (devp-&gt;hd_task)</div><div class='del'>-		devp-&gt;hd_task-&gt;ht_func(devp-&gt;hd_task-&gt;ht_data);</div><div class='del'>-	spin_unlock(&amp;hpet_task_lock);</div><div class='del'>-</div><div class='ctx'> 	wake_up_interruptible(&amp;devp-&gt;hd_waitqueue);</div><div class='ctx'> </div><div class='ctx'> 	kill_fasync(&amp;devp-&gt;hd_async_queue, SIGIO, POLL_IN);</div><div class='hunk'>@@ -185,6 +182,67 @@ static irqreturn_t hpet_interrupt(int irq, void *data)</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void hpet_timer_set_irq(struct hpet_dev *devp)</div><div class='add'>+{</div><div class='add'>+	unsigned long v;</div><div class='add'>+	int irq, gsi;</div><div class='add'>+	struct hpet_timer __iomem *timer;</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(&amp;hpet_lock);</div><div class='add'>+	if (devp-&gt;hd_hdwirq) {</div><div class='add'>+		spin_unlock_irq(&amp;hpet_lock);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	timer = devp-&gt;hd_timer;</div><div class='add'>+</div><div class='add'>+	/* we prefer level triggered mode */</div><div class='add'>+	v = readl(&amp;timer-&gt;hpet_config);</div><div class='add'>+	if (!(v &amp; Tn_INT_TYPE_CNF_MASK)) {</div><div class='add'>+		v |= Tn_INT_TYPE_CNF_MASK;</div><div class='add'>+		writel(v, &amp;timer-&gt;hpet_config);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irq(&amp;hpet_lock);</div><div class='add'>+</div><div class='add'>+	v = (readq(&amp;timer-&gt;hpet_config) &amp; Tn_INT_ROUTE_CAP_MASK) &gt;&gt;</div><div class='add'>+				 Tn_INT_ROUTE_CAP_SHIFT;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * In PIC mode, skip IRQ0-4, IRQ6-9, IRQ12-15 which is always used by</div><div class='add'>+	 * legacy device. In IO APIC mode, we skip all the legacy IRQS.</div><div class='add'>+	 */</div><div class='add'>+	if (acpi_irq_model == ACPI_IRQ_MODEL_PIC)</div><div class='add'>+		v &amp;= ~0xf3df;</div><div class='add'>+	else</div><div class='add'>+		v &amp;= ~0xffff;</div><div class='add'>+</div><div class='add'>+	for (irq = find_first_bit(&amp;v, HPET_MAX_IRQ); irq &lt; HPET_MAX_IRQ;</div><div class='add'>+		irq = find_next_bit(&amp;v, HPET_MAX_IRQ, 1 + irq)) {</div><div class='add'>+</div><div class='add'>+		if (irq &gt;= NR_IRQS) {</div><div class='add'>+			irq = HPET_MAX_IRQ;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		gsi = acpi_register_gsi(irq, ACPI_LEVEL_SENSITIVE,</div><div class='add'>+					ACPI_ACTIVE_LOW);</div><div class='add'>+		if (gsi &gt; 0)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		/* FIXME: Setup interrupt source table */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (irq &lt; HPET_MAX_IRQ) {</div><div class='add'>+		spin_lock_irq(&amp;hpet_lock);</div><div class='add'>+		v = readl(&amp;timer-&gt;hpet_config);</div><div class='add'>+		v |= irq &lt;&lt; Tn_INT_ROUTE_CNF_SHIFT;</div><div class='add'>+		writel(v, &amp;timer-&gt;hpet_config);</div><div class='add'>+		devp-&gt;hd_hdwirq = gsi;</div><div class='add'>+		spin_unlock_irq(&amp;hpet_lock);</div><div class='add'>+	}</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int hpet_open(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpet_dev *devp;</div><div class='hunk'>@@ -199,8 +257,7 @@ static int hpet_open(struct inode *inode, struct file *file)</div><div class='ctx'> </div><div class='ctx'> 	for (devp = NULL, hpetp = hpets; hpetp &amp;&amp; !devp; hpetp = hpetp-&gt;hp_next)</div><div class='ctx'> 		for (i = 0; i &lt; hpetp-&gt;hp_ntimer; i++)</div><div class='del'>-			if (hpetp-&gt;hp_dev[i].hd_flags &amp; HPET_OPEN</div><div class='del'>-			    || hpetp-&gt;hp_dev[i].hd_task)</div><div class='add'>+			if (hpetp-&gt;hp_dev[i].hd_flags &amp; HPET_OPEN)</div><div class='ctx'> 				continue;</div><div class='ctx'> 			else {</div><div class='ctx'> 				devp = &amp;hpetp-&gt;hp_dev[i];</div><div class='hunk'>@@ -219,6 +276,8 @@ static int hpet_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	spin_unlock_irq(&amp;hpet_lock);</div><div class='ctx'> 	unlock_kernel();</div><div class='ctx'> </div><div class='add'>+	hpet_timer_set_irq(devp);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -441,7 +500,11 @@ static int hpet_ioctl_ieon(struct hpet_dev *devp)</div><div class='ctx'> 	devp-&gt;hd_irq = irq;</div><div class='ctx'> 	t = devp-&gt;hd_ireqfreq;</div><div class='ctx'> 	v = readq(&amp;timer-&gt;hpet_config);</div><div class='del'>-	g = v | Tn_INT_ENB_CNF_MASK;</div><div class='add'>+</div><div class='add'>+	/* 64-bit comparators are not yet supported through the ioctls,</div><div class='add'>+	 * so force this into 32-bit mode if it supports both modes</div><div class='add'>+	 */</div><div class='add'>+	g = v | Tn_32MODE_CNF_MASK | Tn_INT_ENB_CNF_MASK;</div><div class='ctx'> </div><div class='ctx'> 	if (devp-&gt;hd_flags &amp; HPET_PERIODIC) {</div><div class='ctx'> 		write_counter(t, &amp;timer-&gt;hpet_compare);</div><div class='hunk'>@@ -451,6 +514,12 @@ static int hpet_ioctl_ieon(struct hpet_dev *devp)</div><div class='ctx'> 		v |= Tn_VAL_SET_CNF_MASK;</div><div class='ctx'> 		writeq(v, &amp;timer-&gt;hpet_config);</div><div class='ctx'> 		local_irq_save(flags);</div><div class='add'>+</div><div class='add'>+		/* NOTE:  what we modify here is a hidden accumulator</div><div class='add'>+		 * register supported by periodic-capable comparators.</div><div class='add'>+		 * We never want to modify the (single) counter; that</div><div class='add'>+		 * would affect all the comparators.</div><div class='add'>+		 */</div><div class='ctx'> 		m = read_counter(&amp;hpet-&gt;hpet_mc);</div><div class='ctx'> 		write_counter(t + m + hpetp-&gt;hp_delta, &amp;timer-&gt;hpet_compare);</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -604,57 +673,6 @@ static int hpet_is_known(struct hpet_data *hdp)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int hpet_tpcheck(struct hpet_task *tp)</div><div class='del'>-{</div><div class='del'>-	struct hpet_dev *devp;</div><div class='del'>-	struct hpets *hpetp;</div><div class='del'>-</div><div class='del'>-	devp = tp-&gt;ht_opaque;</div><div class='del'>-</div><div class='del'>-	if (!devp)</div><div class='del'>-		return -ENXIO;</div><div class='del'>-</div><div class='del'>-	for (hpetp = hpets; hpetp; hpetp = hpetp-&gt;hp_next)</div><div class='del'>-		if (devp &gt;= hpetp-&gt;hp_dev</div><div class='del'>-		    &amp;&amp; devp &lt; (hpetp-&gt;hp_dev + hpetp-&gt;hp_ntimer)</div><div class='del'>-		    &amp;&amp; devp-&gt;hd_hpet == hpetp-&gt;hp_hpet)</div><div class='del'>-			return 0;</div><div class='del'>-</div><div class='del'>-	return -ENXIO;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-int hpet_unregister(struct hpet_task *tp)</div><div class='del'>-{</div><div class='del'>-	struct hpet_dev *devp;</div><div class='del'>-	struct hpet_timer __iomem *timer;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if ((err = hpet_tpcheck(tp)))</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	spin_lock_irq(&amp;hpet_task_lock);</div><div class='del'>-	spin_lock(&amp;hpet_lock);</div><div class='del'>-</div><div class='del'>-	devp = tp-&gt;ht_opaque;</div><div class='del'>-	if (devp-&gt;hd_task != tp) {</div><div class='del'>-		spin_unlock(&amp;hpet_lock);</div><div class='del'>-		spin_unlock_irq(&amp;hpet_task_lock);</div><div class='del'>-		return -ENXIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	timer = devp-&gt;hd_timer;</div><div class='del'>-	writeq((readq(&amp;timer-&gt;hpet_config) &amp; ~Tn_INT_ENB_CNF_MASK),</div><div class='del'>-	       &amp;timer-&gt;hpet_config);</div><div class='del'>-	devp-&gt;hd_flags &amp;= ~(HPET_IE | HPET_PERIODIC);</div><div class='del'>-	devp-&gt;hd_task = NULL;</div><div class='del'>-	spin_unlock(&amp;hpet_lock);</div><div class='del'>-	spin_unlock_irq(&amp;hpet_task_lock);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif  /*  0  */</div><div class='del'>-</div><div class='ctx'> static ctl_table hpet_table[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 	 .ctl_name = CTL_UNNUMBERED,</div><div class='hunk'>@@ -746,6 +764,7 @@ int hpet_alloc(struct hpet_data *hdp)</div><div class='ctx'> 	static struct hpets *last = NULL;</div><div class='ctx'> 	unsigned long period;</div><div class='ctx'> 	unsigned long long temp;</div><div class='add'>+	u32 remainder;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * hpet_alloc can be called by platform dependent code.</div><div class='hunk'>@@ -809,9 +828,13 @@ int hpet_alloc(struct hpet_data *hdp)</div><div class='ctx'> 		printk("%s %d", i &gt; 0 ? "," : "", hdp-&gt;hd_irq[i]);</div><div class='ctx'> 	printk("\n");</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "hpet%u: %u %d-bit timers, %Lu Hz\n",</div><div class='del'>-	       hpetp-&gt;hp_which, hpetp-&gt;hp_ntimer,</div><div class='del'>-	       cap &amp; HPET_COUNTER_SIZE_MASK ? 64 : 32, hpetp-&gt;hp_tick_freq);</div><div class='add'>+	temp = hpetp-&gt;hp_tick_freq;</div><div class='add'>+	remainder = do_div(temp, 1000000);</div><div class='add'>+	printk(KERN_INFO</div><div class='add'>+		"hpet%u: %u comparators, %d-bit %u.%06u MHz counter\n",</div><div class='add'>+		hpetp-&gt;hp_which, hpetp-&gt;hp_ntimer,</div><div class='add'>+		cap &amp; HPET_COUNTER_SIZE_MASK ? 64 : 32,</div><div class='add'>+		(unsigned) temp, remainder);</div><div class='ctx'> </div><div class='ctx'> 	mcfg = readq(&amp;hpet-&gt;hpet_config);</div><div class='ctx'> 	if ((mcfg &amp; HPET_ENABLE_CNF_MASK) == 0) {</div><div class='hunk'>@@ -874,8 +897,6 @@ static acpi_status hpet_resources(struct acpi_resource *res, void *data)</div><div class='ctx'> 		hdp-&gt;hd_address = ioremap(addr.minimum, addr.address_length);</div><div class='ctx'> </div><div class='ctx'> 		if (hpet_is_known(hdp)) {</div><div class='del'>-			printk(KERN_DEBUG "%s: 0x%lx is busy\n",</div><div class='del'>-				__func__, hdp-&gt;hd_phys_address);</div><div class='ctx'> 			iounmap(hdp-&gt;hd_address);</div><div class='ctx'> 			return AE_ALREADY_EXISTS;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -891,8 +912,6 @@ static acpi_status hpet_resources(struct acpi_resource *res, void *data)</div><div class='ctx'> 						HPET_RANGE_SIZE);</div><div class='ctx'> </div><div class='ctx'> 		if (hpet_is_known(hdp)) {</div><div class='del'>-			printk(KERN_DEBUG "%s: 0x%lx is busy\n",</div><div class='del'>-				__func__, hdp-&gt;hd_phys_address);</div><div class='ctx'> 			iounmap(hdp-&gt;hd_address);</div><div class='ctx'> 			return AE_ALREADY_EXISTS;</div><div class='ctx'> 		}</div><div class='head'>diff --git a/drivers/char/hvc_console.c b/drivers/char/hvc_console.c<br/>index fd64137b1ab9..bf70450a49cc 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/hvc_console.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/char/hvc_console.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/hvc_console.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/hvc_console.c</a></div><div class='hunk'>@@ -367,13 +367,13 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)</div><div class='ctx'> 	spin_lock_irqsave(&amp;hp-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	if (--hp-&gt;count == 0) {</div><div class='del'>-		if (hp-&gt;ops-&gt;notifier_del)</div><div class='del'>-			hp-&gt;ops-&gt;notifier_del(hp, hp-&gt;data);</div><div class='del'>-</div><div class='ctx'> 		/* We are done with the tty pointer now. */</div><div class='ctx'> 		hp-&gt;tty = NULL;</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;hp-&gt;lock, flags);</div><div class='ctx'> </div><div class='add'>+		if (hp-&gt;ops-&gt;notifier_del)</div><div class='add'>+			hp-&gt;ops-&gt;notifier_del(hp, hp-&gt;data);</div><div class='add'>+</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Chain calls chars_in_buffer() and returns immediately if</div><div class='ctx'> 		 * there is no buffered data otherwise sleeps on a wait queue</div><div class='hunk'>@@ -416,11 +416,11 @@ static void hvc_hangup(struct tty_struct *tty)</div><div class='ctx'> 	hp-&gt;n_outbuf = 0;</div><div class='ctx'> 	hp-&gt;tty = NULL;</div><div class='ctx'> </div><div class='add'>+	spin_unlock_irqrestore(&amp;hp-&gt;lock, flags);</div><div class='add'>+</div><div class='ctx'> 	if (hp-&gt;ops-&gt;notifier_del)</div><div class='ctx'> 			hp-&gt;ops-&gt;notifier_del(hp, hp-&gt;data);</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irqrestore(&amp;hp-&gt;lock, flags);</div><div class='del'>-</div><div class='ctx'> 	while(temp_open_count) {</div><div class='ctx'> 		--temp_open_count;</div><div class='ctx'> 		kref_put(&amp;hp-&gt;kref, destroy_hvc_struct);</div><div class='hunk'>@@ -819,11 +819,11 @@ static int hvc_init(void)</div><div class='ctx'> 	hvc_driver = drv;</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>-put_tty:</div><div class='del'>-	put_tty_driver(hvc_driver);</div><div class='ctx'> stop_thread:</div><div class='ctx'> 	kthread_stop(hvc_task);</div><div class='ctx'> 	hvc_task = NULL;</div><div class='add'>+put_tty:</div><div class='add'>+	put_tty_driver(drv);</div><div class='ctx'> out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/char/hvc_xen.c b/drivers/char/hvc_xen.c<br/>index 6b70aa66a587..538ceea5e7df 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/hvc_xen.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/char/hvc_xen.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/hvc_xen.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/hvc_xen.c</a></div><div class='hunk'>@@ -108,8 +108,8 @@ static int __init xen_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct hvc_struct *hp;</div><div class='ctx'> </div><div class='del'>-	if (!is_running_on_xen() ||</div><div class='del'>-	    is_initial_xendomain() ||</div><div class='add'>+	if (!xen_pv_domain() ||</div><div class='add'>+	    xen_initial_domain() ||</div><div class='ctx'> 	    !xen_start_info-&gt;console.domU.evtchn)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='hunk'>@@ -142,7 +142,7 @@ static void __exit xen_fini(void)</div><div class='ctx'> </div><div class='ctx'> static int xen_cons_init(void)</div><div class='ctx'> {</div><div class='del'>-	if (!is_running_on_xen())</div><div class='add'>+	if (!xen_pv_domain())</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	hvc_instantiate(HVC_COOKIE, 0, &amp;hvc_ops);</div><div class='head'>diff --git a/drivers/char/hw_random/n2-drv.c b/drivers/char/hw_random/n2-drv.c<br/>index 5220f541df25..8859aeac2d25 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/hw_random/n2-drv.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/char/hw_random/n2-drv.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/hw_random/n2-drv.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/hw_random/n2-drv.c</a></div><div class='hunk'>@@ -736,7 +736,7 @@ static int __devexit n2rng_remove(struct of_device *op)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct of_device_id n2rng_match[] = {</div><div class='add'>+static const struct of_device_id n2rng_match[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.name		= "random-number-generator",</div><div class='ctx'> 		.compatible	= "SUNW,n2-rng",</div><div class='head'>diff --git a/drivers/char/hw_random/omap-rng.c b/drivers/char/hw_random/omap-rng.c<br/>index 51738bdd834e..d4e7dca06e4f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/hw_random/omap-rng.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/char/hw_random/omap-rng.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/hw_random/omap-rng.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/hw_random/omap-rng.c</a></div><div class='hunk'>@@ -118,18 +118,21 @@ static int __init omap_rng_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	mem = request_mem_region(res-&gt;start, res-&gt;end - res-&gt;start + 1,</div><div class='ctx'> 				 pdev-&gt;name);</div><div class='del'>-	if (mem == NULL)</div><div class='del'>-		return -EBUSY;</div><div class='add'>+	if (mem == NULL) {</div><div class='add'>+		ret = -EBUSY;</div><div class='add'>+		goto err_region;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	dev_set_drvdata(&amp;pdev-&gt;dev, mem);</div><div class='del'>-	rng_base = (u32 __force __iomem *)io_p2v(res-&gt;start);</div><div class='add'>+	rng_base = ioremap(res-&gt;start, res-&gt;end - res-&gt;start + 1);</div><div class='add'>+	if (!rng_base) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto err_ioremap;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ret = hwrng_register(&amp;omap_rng_ops);</div><div class='del'>-	if (ret) {</div><div class='del'>-		release_resource(mem);</div><div class='del'>-		rng_base = NULL;</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_register;</div><div class='ctx'> </div><div class='ctx'> 	dev_info(&amp;pdev-&gt;dev, "OMAP Random Number Generator ver. %02x\n",</div><div class='ctx'> 		omap_rng_read_reg(RNG_REV_REG));</div><div class='hunk'>@@ -138,6 +141,18 @@ static int __init omap_rng_probe(struct platform_device *pdev)</div><div class='ctx'> 	rng_dev = pdev;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+err_register:</div><div class='add'>+	iounmap(rng_base);</div><div class='add'>+	rng_base = NULL;</div><div class='add'>+err_ioremap:</div><div class='add'>+	release_resource(mem);</div><div class='add'>+err_region:</div><div class='add'>+	if (cpu_is_omap24xx()) {</div><div class='add'>+		clk_disable(rng_ick);</div><div class='add'>+		clk_put(rng_ick);</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __exit omap_rng_remove(struct platform_device *pdev)</div><div class='hunk'>@@ -148,6 +163,8 @@ static int __exit omap_rng_remove(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	omap_rng_write_reg(RNG_MASK_REG, 0x0);</div><div class='ctx'> </div><div class='add'>+	iounmap(rng_base);</div><div class='add'>+</div><div class='ctx'> 	if (cpu_is_omap24xx()) {</div><div class='ctx'> 		clk_disable(rng_ick);</div><div class='ctx'> 		clk_put(rng_ick);</div><div class='head'>diff --git a/drivers/char/ip2/Makefile b/drivers/char/ip2/Makefile<br/>index 939618f62fe1..bc397d92b499 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/ip2/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/char/ip2/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/ip2/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/ip2/Makefile</a></div><div class='hunk'>@@ -4,5 +4,5 @@</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_COMPUTONE)         += ip2.o</div><div class='ctx'> </div><div class='del'>-ip2-objs			:= ip2base.o ip2main.o</div><div class='add'>+ip2-objs			:= ip2main.o</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/char/ip2/i2ellis.c b/drivers/char/ip2/i2ellis.c<br/>index 3601017f58cf..29db44de399f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/ip2/i2ellis.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/char/ip2/i2ellis.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/ip2/i2ellis.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/ip2/i2ellis.c</a></div><div class='hunk'>@@ -69,38 +69,6 @@ static DEFINE_RWLOCK(Dl_spinlock);</div><div class='ctx'> //=======================================================</div><div class='ctx'> </div><div class='ctx'> //******************************************************************************</div><div class='del'>-// Function:   iiEllisInit()</div><div class='del'>-// Parameters: None</div><div class='del'>-//</div><div class='del'>-// Returns:    Nothing</div><div class='del'>-//</div><div class='del'>-// Description:</div><div class='del'>-//</div><div class='del'>-// This routine performs any required initialization of the iiEllis subsystem.</div><div class='del'>-//</div><div class='del'>-//******************************************************************************</div><div class='del'>-static void</div><div class='del'>-iiEllisInit(void)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-//******************************************************************************</div><div class='del'>-// Function:   iiEllisCleanup()</div><div class='del'>-// Parameters: None</div><div class='del'>-//</div><div class='del'>-// Returns:    Nothing</div><div class='del'>-//</div><div class='del'>-// Description:</div><div class='del'>-//</div><div class='del'>-// This routine performs any required cleanup of the iiEllis subsystem.</div><div class='del'>-//</div><div class='del'>-//******************************************************************************</div><div class='del'>-static void</div><div class='del'>-iiEllisCleanup(void)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-//******************************************************************************</div><div class='ctx'> // Function:   iiSetAddress(pB, address, delay)</div><div class='ctx'> // Parameters: pB      - pointer to the board structure</div><div class='ctx'> //             address - the purported I/O address of the board</div><div class='head'>diff --git a/drivers/char/ip2/i2ellis.h b/drivers/char/ip2/i2ellis.h<br/>index c88a64e527aa..fb6df2456018 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/ip2/i2ellis.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/char/ip2/i2ellis.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/ip2/i2ellis.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/ip2/i2ellis.h</a></div><div class='hunk'>@@ -511,7 +511,6 @@ typedef void (*delayFunc_t)(unsigned int);</div><div class='ctx'> //</div><div class='ctx'> // Initialization of a board &amp; structure is in four (five!) parts:</div><div class='ctx'> //</div><div class='del'>-// 0) iiEllisInit()  - Initialize iiEllis subsystem.</div><div class='ctx'> // 1) iiSetAddress() - Define the board address &amp; delay function for a board.</div><div class='ctx'> // 2) iiReset()      - Reset the board   (provided it exists)</div><div class='ctx'> //       -- Note you may do this to several boards --</div><div class='hunk'>@@ -523,7 +522,6 @@ typedef void (*delayFunc_t)(unsigned int);</div><div class='ctx'> // loadware.  To change loadware, you must begin again with step 2, resetting</div><div class='ctx'> // the board again (step 1 not needed).</div><div class='ctx'> </div><div class='del'>-static void iiEllisInit(void);</div><div class='ctx'> static int iiSetAddress(i2eBordStrPtr, int, delayFunc_t );</div><div class='ctx'> static int iiReset(i2eBordStrPtr);</div><div class='ctx'> static int iiResetDelay(i2eBordStrPtr);</div><div class='head'>diff --git a/drivers/char/ip2/ip2base.c b/drivers/char/ip2/ip2base.c<br/>deleted file mode 100644<br/>index 8155e247c04b..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/ip2/ip2base.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/char/ip2/ip2base.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,108 +0,0 @@</div><div class='del'>-// ip2.c</div><div class='del'>-// This is a dummy module to make the firmware available when needed</div><div class='del'>-// and allows it to be unloaded when not. Rumor is the __initdata </div><div class='del'>-// macro doesn't always works on all platforms so we use this kludge.</div><div class='del'>-// If not compiled as a module it just makes fip_firm avaliable then</div><div class='del'>-//  __initdata should work as advertized</div><div class='del'>-//</div><div class='del'>-</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/wait.h&gt;</div><div class='del'>-</div><div class='del'>-#ifndef __init</div><div class='del'>-#define __init</div><div class='del'>-#endif</div><div class='del'>-#ifndef __initfunc</div><div class='del'>-#define __initfunc(a) a</div><div class='del'>-#endif</div><div class='del'>-#ifndef __initdata</div><div class='del'>-#define __initdata</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include "ip2types.h"		</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-ip2_loadmain(int *, int *); // ref into ip2main.c</div><div class='del'>-</div><div class='del'>-/* Note: Add compiled in defaults to these arrays, not to the structure</div><div class='del'>-	in ip2.h any longer.  That structure WILL get overridden</div><div class='del'>-	by these values, or command line values, or insmod values!!!  =mhw=</div><div class='del'>-*/</div><div class='del'>-static int io[IP2_MAX_BOARDS]= { 0, 0, 0, 0 };</div><div class='del'>-static int irq[IP2_MAX_BOARDS] = { -1, -1, -1, -1 }; </div><div class='del'>-</div><div class='del'>-static int poll_only = 0;</div><div class='del'>-</div><div class='del'>-MODULE_AUTHOR("Doug McNash");</div><div class='del'>-MODULE_DESCRIPTION("Computone IntelliPort Plus Driver");</div><div class='del'>-module_param_array(irq, int, NULL, 0);</div><div class='del'>-MODULE_PARM_DESC(irq,"Interrupts for IntelliPort Cards");</div><div class='del'>-module_param_array(io, int, NULL, 0);</div><div class='del'>-MODULE_PARM_DESC(io,"I/O ports for IntelliPort Cards");</div><div class='del'>-module_param(poll_only, bool, 0);</div><div class='del'>-MODULE_PARM_DESC(poll_only,"Do not use card interrupts");</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int __init ip2_init(void)</div><div class='del'>-{</div><div class='del'>-	if( poll_only ) {</div><div class='del'>-		/* Hard lock the interrupts to zero */</div><div class='del'>-		irq[0] = irq[1] = irq[2] = irq[3] = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ip2_loadmain(io, irq);</div><div class='del'>-}</div><div class='del'>-module_init(ip2_init);</div><div class='del'>-</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-</div><div class='del'>-#ifndef MODULE</div><div class='del'>-/******************************************************************************</div><div class='del'>- *	ip2_setup:</div><div class='del'>- *		str: kernel command line string</div><div class='del'>- *</div><div class='del'>- *	Can't autoprobe the boards so user must specify configuration on</div><div class='del'>- *	kernel command line.  Sane people build it modular but the others</div><div class='del'>- *	come here.</div><div class='del'>- *</div><div class='del'>- *	Alternating pairs of io,irq for up to 4 boards.</div><div class='del'>- *		ip2=io0,irq0,io1,irq1,io2,irq2,io3,irq3</div><div class='del'>- *</div><div class='del'>- *		io=0 =&gt; No board</div><div class='del'>- *		io=1 =&gt; PCI</div><div class='del'>- *		io=2 =&gt; EISA</div><div class='del'>- *		else =&gt; ISA I/O address</div><div class='del'>- *</div><div class='del'>- *		irq=0 or invalid for ISA will revert to polling mode</div><div class='del'>- *</div><div class='del'>- *		Any value = -1, do not overwrite compiled in value.</div><div class='del'>- *</div><div class='del'>- ******************************************************************************/</div><div class='del'>-static int __init ip2_setup(char *str)</div><div class='del'>-{</div><div class='del'>-	int	ints[10];	/* 4 boards, 2 parameters + 2 */</div><div class='del'>-	int	i, j;</div><div class='del'>-</div><div class='del'>-	str = get_options (str, ARRAY_SIZE(ints), ints);</div><div class='del'>-</div><div class='del'>-	for( i = 0, j = 1; i &lt; 4; i++ ) {</div><div class='del'>-		if( j &gt; ints[0] ) {</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		if( ints[j] &gt;= 0 ) {</div><div class='del'>-			io[i] = ints[j];</div><div class='del'>-		}</div><div class='del'>-		j++;</div><div class='del'>-		if( j &gt; ints[0] ) {</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		if( ints[j] &gt;= 0 ) {</div><div class='del'>-			irq[i] = ints[j];</div><div class='del'>-		}</div><div class='del'>-		j++;</div><div class='del'>-	}</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-__setup("ip2=", ip2_setup);</div><div class='del'>-#endif /* !MODULE */</div><div class='head'>diff --git a/drivers/char/ip2/ip2main.c b/drivers/char/ip2/ip2main.c<br/>index 689f9dcd3b86..70e0ebc30bd0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/ip2/ip2main.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/char/ip2/ip2main.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/ip2/ip2main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/ip2/ip2main.c</a></div><div class='hunk'>@@ -150,15 +150,12 @@ static int ip2_read_proc(char *, char **, off_t, int, int *, void * );</div><div class='ctx'> /*************/</div><div class='ctx'> </div><div class='ctx'> /* String constants to identify ourselves */</div><div class='del'>-static char *pcName    = "Computone IntelliPort Plus multiport driver";</div><div class='del'>-static char *pcVersion = "1.2.14";</div><div class='add'>+static const char pcName[] = "Computone IntelliPort Plus multiport driver";</div><div class='add'>+static const char pcVersion[] = "1.2.14";</div><div class='ctx'> </div><div class='ctx'> /* String constants for port names */</div><div class='del'>-static char *pcDriver_name   = "ip2";</div><div class='del'>-static char *pcIpl    		 = "ip2ipl";</div><div class='del'>-</div><div class='del'>-// cheezy kludge or genius - you decide?</div><div class='del'>-int ip2_loadmain(int *, int *);</div><div class='add'>+static const char pcDriver_name[] = "ip2";</div><div class='add'>+static const char pcIpl[] = "ip2ipl";</div><div class='ctx'> </div><div class='ctx'> /***********************/</div><div class='ctx'> /* Function Prototypes */</div><div class='hunk'>@@ -240,8 +237,8 @@ static const struct file_operations ip2_ipl = {</div><div class='ctx'> 	.open		= ip2_ipl_open,</div><div class='ctx'> }; </div><div class='ctx'> </div><div class='del'>-static unsigned long irq_counter = 0;</div><div class='del'>-static unsigned long bh_counter = 0;</div><div class='add'>+static unsigned long irq_counter;</div><div class='add'>+static unsigned long bh_counter;</div><div class='ctx'> </div><div class='ctx'> // Use immediate queue to service interrupts</div><div class='ctx'> #define USE_IQI</div><div class='hunk'>@@ -252,7 +249,6 @@ static unsigned long bh_counter = 0;</div><div class='ctx'>  */</div><div class='ctx'> #define  POLL_TIMEOUT   (jiffies + 1)</div><div class='ctx'> static DEFINE_TIMER(PollTimer, ip2_poll, 0, 0);</div><div class='del'>-static char  TimerOn;</div><div class='ctx'> </div><div class='ctx'> #ifdef IP2DEBUG_TRACE</div><div class='ctx'> /* Trace (debug) buffer data */</div><div class='hunk'>@@ -268,8 +264,8 @@ static int tracewrap;</div><div class='ctx'> /**********/</div><div class='ctx'> </div><div class='ctx'> #if defined(MODULE) &amp;&amp; defined(IP2DEBUG_OPEN)</div><div class='del'>-#define DBG_CNT(s) printk(KERN_DEBUG "(%s): [%x] refc=%d, ttyc=%d, modc=%x -&gt; %s\n", \</div><div class='del'>-		    tty-&gt;name,(pCh-&gt;flags),ip2_tty_driver-&gt;refcount, \</div><div class='add'>+#define DBG_CNT(s) printk(KERN_DEBUG "(%s): [%x] ttyc=%d, modc=%x -&gt; %s\n", \</div><div class='add'>+		    tty-&gt;name,(pCh-&gt;flags), \</div><div class='ctx'> 		    tty-&gt;count,/*GET_USE_COUNT(module)*/0,s)</div><div class='ctx'> #else</div><div class='ctx'> #define DBG_CNT(s)</div><div class='hunk'>@@ -287,8 +283,9 @@ static int tracewrap;</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Doug McNash");</div><div class='ctx'> MODULE_DESCRIPTION("Computone IntelliPort Plus Driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='del'>-static int poll_only = 0;</div><div class='add'>+static int poll_only;</div><div class='ctx'> </div><div class='ctx'> static int Eisa_irq;</div><div class='ctx'> static int Eisa_slot;</div><div class='hunk'>@@ -297,34 +294,46 @@ static int iindx;</div><div class='ctx'> static char rirqs[IP2_MAX_BOARDS];</div><div class='ctx'> static int Valid_Irqs[] = { 3, 4, 5, 7, 10, 11, 12, 15, 0};</div><div class='ctx'> </div><div class='add'>+/* Note: Add compiled in defaults to these arrays, not to the structure</div><div class='add'>+	in ip2.h any longer.  That structure WILL get overridden</div><div class='add'>+	by these values, or command line values, or insmod values!!!  =mhw=</div><div class='add'>+*/</div><div class='add'>+static int io[IP2_MAX_BOARDS];</div><div class='add'>+static int irq[IP2_MAX_BOARDS] = { -1, -1, -1, -1 };</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Doug McNash");</div><div class='add'>+MODULE_DESCRIPTION("Computone IntelliPort Plus Driver");</div><div class='add'>+module_param_array(irq, int, NULL, 0);</div><div class='add'>+MODULE_PARM_DESC(irq, "Interrupts for IntelliPort Cards");</div><div class='add'>+module_param_array(io, int, NULL, 0);</div><div class='add'>+MODULE_PARM_DESC(io, "I/O ports for IntelliPort Cards");</div><div class='add'>+module_param(poll_only, bool, 0);</div><div class='add'>+MODULE_PARM_DESC(poll_only, "Do not use card interrupts");</div><div class='add'>+</div><div class='ctx'> /* for sysfs class support */</div><div class='ctx'> static struct class *ip2_class;</div><div class='ctx'> </div><div class='del'>-// Some functions to keep track of what irq's we have</div><div class='add'>+/* Some functions to keep track of what irqs we have */</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-is_valid_irq(int irq)</div><div class='add'>+static int __init is_valid_irq(int irq)</div><div class='ctx'> {</div><div class='ctx'> 	int *i = Valid_Irqs;</div><div class='ctx'> 	</div><div class='del'>-	while ((*i != 0) &amp;&amp; (*i != irq)) {</div><div class='add'>+	while (*i != 0 &amp;&amp; *i != irq)</div><div class='ctx'> 		i++;</div><div class='del'>-	}</div><div class='del'>-	return (*i);</div><div class='add'>+</div><div class='add'>+	return *i;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-mark_requested_irq( char irq )</div><div class='add'>+static void __init mark_requested_irq(char irq)</div><div class='ctx'> {</div><div class='ctx'> 	rirqs[iindx++] = irq;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef MODULE</div><div class='del'>-static int</div><div class='del'>-clear_requested_irq( char irq )</div><div class='add'>+static int __exit clear_requested_irq(char irq)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='del'>-	for ( i = 0; i &lt; IP2_MAX_BOARDS; ++i ) {</div><div class='add'>+	for (i = 0; i &lt; IP2_MAX_BOARDS; ++i) {</div><div class='ctx'> 		if (rirqs[i] == irq) {</div><div class='ctx'> 			rirqs[i] = 0;</div><div class='ctx'> 			return 1;</div><div class='hunk'>@@ -332,17 +341,15 @@ clear_requested_irq( char irq )</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-have_requested_irq( char irq )</div><div class='add'>+static int have_requested_irq(char irq)</div><div class='ctx'> {</div><div class='del'>-	// array init to zeros so 0 irq will not be requested as a side effect</div><div class='add'>+	/* array init to zeros so 0 irq will not be requested as a side</div><div class='add'>+	 * effect */</div><div class='ctx'> 	int i;</div><div class='del'>-	for ( i = 0; i &lt; IP2_MAX_BOARDS; ++i ) {</div><div class='add'>+	for (i = 0; i &lt; IP2_MAX_BOARDS; ++i)</div><div class='ctx'> 		if (rirqs[i] == irq)</div><div class='ctx'> 			return 1;</div><div class='del'>-	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -361,53 +368,45 @@ have_requested_irq( char irq )</div><div class='ctx'> /* handle subsequent installations of the driver. All memory allocated by the */</div><div class='ctx'> /* driver should be returned since it may be unloaded from memory.            */</div><div class='ctx'> /******************************************************************************/</div><div class='del'>-#ifdef MODULE</div><div class='del'>-void __exit</div><div class='del'>-ip2_cleanup_module(void)</div><div class='add'>+static void __exit ip2_cleanup_module(void)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-#ifdef IP2DEBUG_INIT</div><div class='del'>-	printk (KERN_DEBUG "Unloading %s: version %s\n", pcName, pcVersion );</div><div class='del'>-#endif</div><div class='del'>-	/* Stop poll timer if we had one. */</div><div class='del'>-	if ( TimerOn ) {</div><div class='del'>-		del_timer ( &amp;PollTimer );</div><div class='del'>-		TimerOn = 0;</div><div class='del'>-	}</div><div class='add'>+	del_timer_sync(&amp;PollTimer);</div><div class='ctx'> </div><div class='ctx'> 	/* Reset the boards we have. */</div><div class='del'>-	for( i = 0; i &lt; IP2_MAX_BOARDS; ++i ) {</div><div class='del'>-		if ( i2BoardPtrTable[i] ) {</div><div class='del'>-			iiReset( i2BoardPtrTable[i] );</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	for (i = 0; i &lt; IP2_MAX_BOARDS; i++)</div><div class='add'>+		if (i2BoardPtrTable[i])</div><div class='add'>+			iiReset(i2BoardPtrTable[i]);</div><div class='ctx'> </div><div class='ctx'> 	/* The following is done at most once, if any boards were installed. */</div><div class='del'>-	for ( i = 0; i &lt; IP2_MAX_BOARDS; ++i ) {</div><div class='del'>-		if ( i2BoardPtrTable[i] ) {</div><div class='del'>-			iiResetDelay( i2BoardPtrTable[i] );</div><div class='add'>+	for (i = 0; i &lt; IP2_MAX_BOARDS; i++) {</div><div class='add'>+		if (i2BoardPtrTable[i]) {</div><div class='add'>+			iiResetDelay(i2BoardPtrTable[i]);</div><div class='ctx'> 			/* free io addresses and Tibet */</div><div class='del'>-			release_region( ip2config.addr[i], 8 );</div><div class='add'>+			release_region(ip2config.addr[i], 8);</div><div class='ctx'> 			device_destroy(ip2_class, MKDEV(IP2_IPL_MAJOR, 4 * i));</div><div class='del'>-			device_destroy(ip2_class, MKDEV(IP2_IPL_MAJOR, 4 * i + 1));</div><div class='add'>+			device_destroy(ip2_class, MKDEV(IP2_IPL_MAJOR,</div><div class='add'>+						4 * i + 1));</div><div class='ctx'> 		}</div><div class='ctx'> 		/* Disable and remove interrupt handler. */</div><div class='del'>-		if ( (ip2config.irq[i] &gt; 0) &amp;&amp; have_requested_irq(ip2config.irq[i]) ) {	</div><div class='del'>-			free_irq ( ip2config.irq[i], (void *)&amp;pcName);</div><div class='del'>-			clear_requested_irq( ip2config.irq[i]);</div><div class='add'>+		if (ip2config.irq[i] &gt; 0 &amp;&amp;</div><div class='add'>+				have_requested_irq(ip2config.irq[i])) {</div><div class='add'>+			free_irq(ip2config.irq[i], (void *)&amp;pcName);</div><div class='add'>+			clear_requested_irq(ip2config.irq[i]);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	class_destroy(ip2_class);</div><div class='del'>-	if ( ( err = tty_unregister_driver ( ip2_tty_driver ) ) ) {</div><div class='del'>-		printk(KERN_ERR "IP2: failed to unregister tty driver (%d)\n", err);</div><div class='del'>-	}</div><div class='add'>+	err = tty_unregister_driver(ip2_tty_driver);</div><div class='add'>+	if (err)</div><div class='add'>+		printk(KERN_ERR "IP2: failed to unregister tty driver (%d)\n",</div><div class='add'>+				err);</div><div class='ctx'> 	put_tty_driver(ip2_tty_driver);</div><div class='ctx'> 	unregister_chrdev(IP2_IPL_MAJOR, pcIpl);</div><div class='ctx'> 	remove_proc_entry("ip2mem", NULL);</div><div class='ctx'> </div><div class='del'>-	// free memory</div><div class='add'>+	/* free memory */</div><div class='ctx'> 	for (i = 0; i &lt; IP2_MAX_BOARDS; i++) {</div><div class='ctx'> 		void *pB;</div><div class='ctx'> #ifdef CONFIG_PCI</div><div class='hunk'>@@ -417,24 +416,18 @@ ip2_cleanup_module(void)</div><div class='ctx'> 			ip2config.pci_dev[i] = NULL;</div><div class='ctx'> 		}</div><div class='ctx'> #endif</div><div class='del'>-		if ((pB = i2BoardPtrTable[i]) != 0 ) {</div><div class='del'>-			kfree ( pB );</div><div class='add'>+		pB = i2BoardPtrTable[i];</div><div class='add'>+		if (pB != NULL) {</div><div class='add'>+			kfree(pB);</div><div class='ctx'> 			i2BoardPtrTable[i] = NULL;</div><div class='ctx'> 		}</div><div class='del'>-		if ((DevTableMem[i]) != NULL ) {</div><div class='del'>-			kfree ( DevTableMem[i]  );</div><div class='add'>+		if (DevTableMem[i] != NULL) {</div><div class='add'>+			kfree(DevTableMem[i]);</div><div class='ctx'> 			DevTableMem[i] = NULL;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	/* Cleanup the iiEllis subsystem. */</div><div class='del'>-	iiEllisCleanup();</div><div class='del'>-#ifdef IP2DEBUG_INIT</div><div class='del'>-	printk (KERN_DEBUG "IP2 Unloaded\n" );</div><div class='del'>-#endif</div><div class='ctx'> }</div><div class='ctx'> module_exit(ip2_cleanup_module);</div><div class='del'>-#endif /* MODULE */</div><div class='ctx'> </div><div class='ctx'> static const struct tty_operations ip2_ops = {</div><div class='ctx'> 	.open            = ip2_open,</div><div class='hunk'>@@ -494,139 +487,168 @@ static const struct firmware *ip2_request_firmware(void)</div><div class='ctx'> 	return fw;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int</div><div class='del'>-ip2_loadmain(int *iop, int *irqp)</div><div class='add'>+#ifndef MODULE</div><div class='add'>+/******************************************************************************</div><div class='add'>+ *	ip2_setup:</div><div class='add'>+ *		str: kernel command line string</div><div class='add'>+ *</div><div class='add'>+ *	Can't autoprobe the boards so user must specify configuration on</div><div class='add'>+ *	kernel command line.  Sane people build it modular but the others</div><div class='add'>+ *	come here.</div><div class='add'>+ *</div><div class='add'>+ *	Alternating pairs of io,irq for up to 4 boards.</div><div class='add'>+ *		ip2=io0,irq0,io1,irq1,io2,irq2,io3,irq3</div><div class='add'>+ *</div><div class='add'>+ *		io=0 =&gt; No board</div><div class='add'>+ *		io=1 =&gt; PCI</div><div class='add'>+ *		io=2 =&gt; EISA</div><div class='add'>+ *		else =&gt; ISA I/O address</div><div class='add'>+ *</div><div class='add'>+ *		irq=0 or invalid for ISA will revert to polling mode</div><div class='add'>+ *</div><div class='add'>+ *		Any value = -1, do not overwrite compiled in value.</div><div class='add'>+ *</div><div class='add'>+ ******************************************************************************/</div><div class='add'>+static int __init ip2_setup(char *str)</div><div class='add'>+{</div><div class='add'>+	int j, ints[10];	/* 4 boards, 2 parameters + 2 */</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	str = get_options(str, ARRAY_SIZE(ints), ints);</div><div class='add'>+</div><div class='add'>+	for (i = 0, j = 1; i &lt; 4; i++) {</div><div class='add'>+		if (j &gt; ints[0])</div><div class='add'>+			break;</div><div class='add'>+		if (ints[j] &gt;= 0)</div><div class='add'>+			io[i] = ints[j];</div><div class='add'>+		j++;</div><div class='add'>+		if (j &gt; ints[0])</div><div class='add'>+			break;</div><div class='add'>+		if (ints[j] &gt;= 0)</div><div class='add'>+			irq[i] = ints[j];</div><div class='add'>+		j++;</div><div class='add'>+	}</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+__setup("ip2=", ip2_setup);</div><div class='add'>+#endif /* !MODULE */</div><div class='add'>+</div><div class='add'>+static int __init ip2_loadmain(void)</div><div class='ctx'> {</div><div class='ctx'> 	int i, j, box;</div><div class='ctx'> 	int err = 0;</div><div class='del'>-	static int loaded;</div><div class='ctx'> 	i2eBordStrPtr pB = NULL;</div><div class='ctx'> 	int rc = -1;</div><div class='del'>-	static struct pci_dev *pci_dev_i = NULL;</div><div class='add'>+	struct pci_dev *pdev = NULL;</div><div class='ctx'> 	const struct firmware *fw = NULL;</div><div class='ctx'> </div><div class='del'>-	ip2trace (ITRC_NO_PORT, ITRC_INIT, ITRC_ENTER, 0 );</div><div class='add'>+	if (poll_only) {</div><div class='add'>+		/* Hard lock the interrupts to zero */</div><div class='add'>+		irq[0] = irq[1] = irq[2] = irq[3] = poll_only = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ip2trace(ITRC_NO_PORT, ITRC_INIT, ITRC_ENTER, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* process command line arguments to modprobe or</div><div class='ctx'> 		insmod i.e. iop &amp; irqp */</div><div class='ctx'> 	/* irqp and iop should ALWAYS be specified now...  But we check</div><div class='ctx'> 		them individually just to be sure, anyways... */</div><div class='del'>-	for ( i = 0; i &lt; IP2_MAX_BOARDS; ++i ) {</div><div class='del'>-		if (iop) {</div><div class='del'>-			ip2config.addr[i] = iop[i];</div><div class='del'>-			if (irqp) {</div><div class='del'>-				if( irqp[i] &gt;= 0 ) {</div><div class='del'>-					ip2config.irq[i] = irqp[i];</div><div class='del'>-				} else {</div><div class='del'>-					ip2config.irq[i] = 0;</div><div class='del'>-				}</div><div class='del'>-	// This is a little bit of a hack.  If poll_only=1 on command</div><div class='del'>-	// line back in ip2.c OR all IRQs on all specified boards are</div><div class='del'>-	// explicitly set to 0, then drop to poll only mode and override</div><div class='del'>-	// PCI or EISA interrupts.  This superceeds the old hack of</div><div class='del'>-	// triggering if all interrupts were zero (like da default).</div><div class='del'>-	// Still a hack but less prone to random acts of terrorism.</div><div class='del'>-	//</div><div class='del'>-	// What we really should do, now that the IRQ default is set</div><div class='del'>-	// to -1, is to use 0 as a hard coded, do not probe.</div><div class='del'>-	//</div><div class='del'>-	//	/\/\|=mhw=|\/\/</div><div class='del'>-				poll_only |= irqp[i];</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='add'>+	for (i = 0; i &lt; IP2_MAX_BOARDS; ++i) {</div><div class='add'>+		ip2config.addr[i] = io[i];</div><div class='add'>+		if (irq[i] &gt;= 0)</div><div class='add'>+			ip2config.irq[i] = irq[i];</div><div class='add'>+		else</div><div class='add'>+			ip2config.irq[i] = 0;</div><div class='add'>+	/* This is a little bit of a hack.  If poll_only=1 on command</div><div class='add'>+	   line back in ip2.c OR all IRQs on all specified boards are</div><div class='add'>+	   explicitly set to 0, then drop to poll only mode and override</div><div class='add'>+	   PCI or EISA interrupts.  This superceeds the old hack of</div><div class='add'>+	   triggering if all interrupts were zero (like da default).</div><div class='add'>+	   Still a hack but less prone to random acts of terrorism.</div><div class='add'>+</div><div class='add'>+	   What we really should do, now that the IRQ default is set</div><div class='add'>+	   to -1, is to use 0 as a hard coded, do not probe.</div><div class='add'>+</div><div class='add'>+		/\/\|=mhw=|\/\/</div><div class='add'>+	*/</div><div class='add'>+		poll_only |= irq[i];</div><div class='ctx'> 	}</div><div class='ctx'> 	poll_only = !poll_only;</div><div class='ctx'> </div><div class='ctx'> 	/* Announce our presence */</div><div class='del'>-	printk( KERN_INFO "%s version %s\n", pcName, pcVersion );</div><div class='del'>-</div><div class='del'>-	// ip2 can be unloaded and reloaded for no good reason</div><div class='del'>-	// we can't let that happen here or bad things happen</div><div class='del'>-	// second load hoses board but not system - fixme later</div><div class='del'>-	if (loaded) {</div><div class='del'>-		printk( KERN_INFO "Still loaded\n" );</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	loaded++;</div><div class='add'>+	printk(KERN_INFO "%s version %s\n", pcName, pcVersion);</div><div class='ctx'> </div><div class='ctx'> 	ip2_tty_driver = alloc_tty_driver(IP2_MAX_PORTS);</div><div class='ctx'> 	if (!ip2_tty_driver)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	/* Initialise the iiEllis subsystem. */</div><div class='del'>-	iiEllisInit();</div><div class='del'>-</div><div class='del'>-	/* Initialize arrays. */</div><div class='del'>-	memset( i2BoardPtrTable, 0, sizeof i2BoardPtrTable );</div><div class='del'>-	memset( DevTable, 0, sizeof DevTable );</div><div class='del'>-</div><div class='ctx'> 	/* Initialise all the boards we can find (up to the maximum). */</div><div class='del'>-	for ( i = 0; i &lt; IP2_MAX_BOARDS; ++i ) {</div><div class='del'>-		switch ( ip2config.addr[i] ) { </div><div class='add'>+	for (i = 0; i &lt; IP2_MAX_BOARDS; ++i) {</div><div class='add'>+		switch (ip2config.addr[i]) {</div><div class='ctx'> 		case 0:	/* skip this slot even if card is present */</div><div class='ctx'> 			break;</div><div class='ctx'> 		default: /* ISA */</div><div class='ctx'> 		   /* ISA address must be specified */</div><div class='del'>-			if ( (ip2config.addr[i] &lt; 0x100) || (ip2config.addr[i] &gt; 0x3f8) ) {</div><div class='del'>-				printk ( KERN_ERR "IP2: Bad ISA board %d address %x\n",</div><div class='del'>-							 i, ip2config.addr[i] );</div><div class='add'>+			if (ip2config.addr[i] &lt; 0x100 ||</div><div class='add'>+					ip2config.addr[i] &gt; 0x3f8) {</div><div class='add'>+				printk(KERN_ERR "IP2: Bad ISA board %d "</div><div class='add'>+						"address %x\n", i,</div><div class='add'>+						ip2config.addr[i]);</div><div class='ctx'> 				ip2config.addr[i] = 0;</div><div class='del'>-			} else {</div><div class='del'>-				ip2config.type[i] = ISA;</div><div class='del'>-</div><div class='del'>-				/* Check for valid irq argument, set for polling if invalid */</div><div class='del'>-				if (ip2config.irq[i] &amp;&amp; !is_valid_irq(ip2config.irq[i])) {</div><div class='del'>-					printk(KERN_ERR "IP2: Bad IRQ(%d) specified\n",ip2config.irq[i]);</div><div class='del'>-					ip2config.irq[i] = 0;// 0 is polling and is valid in that sense</div><div class='del'>-				}</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			ip2config.type[i] = ISA;</div><div class='add'>+</div><div class='add'>+			/* Check for valid irq argument, set for polling if</div><div class='add'>+			 * invalid */</div><div class='add'>+			if (ip2config.irq[i] &amp;&amp;</div><div class='add'>+					!is_valid_irq(ip2config.irq[i])) {</div><div class='add'>+				printk(KERN_ERR "IP2: Bad IRQ(%d) specified\n",</div><div class='add'>+						ip2config.irq[i]);</div><div class='add'>+				/* 0 is polling and is valid in that sense */</div><div class='add'>+				ip2config.irq[i] = 0;</div><div class='ctx'> 			}</div><div class='ctx'> 			break;</div><div class='ctx'> 		case PCI:</div><div class='ctx'> #ifdef CONFIG_PCI</div><div class='del'>-			{</div><div class='del'>-				int status;</div><div class='add'>+		{</div><div class='add'>+			u32 addr;</div><div class='add'>+			int status;</div><div class='ctx'> </div><div class='del'>-				pci_dev_i = pci_get_device(PCI_VENDOR_ID_COMPUTONE,</div><div class='del'>-							  PCI_DEVICE_ID_COMPUTONE_IP2EX, pci_dev_i);</div><div class='del'>-				if (pci_dev_i != NULL) {</div><div class='del'>-					unsigned int addr;</div><div class='del'>-</div><div class='del'>-					if (pci_enable_device(pci_dev_i)) {</div><div class='del'>-						printk( KERN_ERR "IP2: can't enable PCI device at %s\n",</div><div class='del'>-							pci_name(pci_dev_i));</div><div class='del'>-						break;</div><div class='del'>-					}</div><div class='del'>-					ip2config.type[i] = PCI;</div><div class='del'>-					ip2config.pci_dev[i] = pci_dev_get(pci_dev_i);</div><div class='del'>-					status =</div><div class='del'>-					pci_read_config_dword(pci_dev_i, PCI_BASE_ADDRESS_1, &amp;addr);</div><div class='del'>-					if ( addr &amp; 1 ) {</div><div class='del'>-						ip2config.addr[i]=(USHORT)(addr&amp;0xfffe);</div><div class='del'>-					} else {</div><div class='del'>-						printk( KERN_ERR "IP2: PCI I/O address error\n");</div><div class='del'>-					}</div><div class='add'>+			pdev = pci_get_device(PCI_VENDOR_ID_COMPUTONE,</div><div class='add'>+					PCI_DEVICE_ID_COMPUTONE_IP2EX, pdev);</div><div class='add'>+			if (pdev == NULL) {</div><div class='add'>+				ip2config.addr[i] = 0;</div><div class='add'>+				printk(KERN_ERR "IP2: PCI board %d not "</div><div class='add'>+						"found\n", i);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='ctx'> </div><div class='del'>-//		If the PCI BIOS assigned it, lets try and use it.  If we</div><div class='del'>-//		can't acquire it or it screws up, deal with it then.</div><div class='del'>-</div><div class='del'>-//					if (!is_valid_irq(pci_irq)) {</div><div class='del'>-//						printk( KERN_ERR "IP2: Bad PCI BIOS IRQ(%d)\n",pci_irq);</div><div class='del'>-//						pci_irq = 0;</div><div class='del'>-//					}</div><div class='del'>-					ip2config.irq[i] = pci_dev_i-&gt;irq;</div><div class='del'>-				} else {	// ann error</div><div class='del'>-					ip2config.addr[i] = 0;</div><div class='del'>-					printk(KERN_ERR "IP2: PCI board %d not found\n", i);</div><div class='del'>-				} </div><div class='add'>+			if (pci_enable_device(pdev)) {</div><div class='add'>+				dev_err(&amp;pdev-&gt;dev, "can't enable device\n");</div><div class='add'>+				break;</div><div class='ctx'> 			}</div><div class='add'>+			ip2config.type[i] = PCI;</div><div class='add'>+			ip2config.pci_dev[i] = pci_dev_get(pdev);</div><div class='add'>+			status = pci_read_config_dword(pdev, PCI_BASE_ADDRESS_1,</div><div class='add'>+					&amp;addr);</div><div class='add'>+			if (addr &amp; 1)</div><div class='add'>+				ip2config.addr[i] = (USHORT)(addr &amp; 0xfffe);</div><div class='add'>+			else</div><div class='add'>+				dev_err(&amp;pdev-&gt;dev, "I/O address error\n");</div><div class='add'>+</div><div class='add'>+			ip2config.irq[i] = pdev-&gt;irq;</div><div class='add'>+		}</div><div class='ctx'> #else</div><div class='del'>-			printk( KERN_ERR "IP2: PCI card specified but PCI support not\n");</div><div class='del'>-			printk( KERN_ERR "IP2: configured in this kernel.\n");</div><div class='del'>-			printk( KERN_ERR "IP2: Recompile kernel with CONFIG_PCI defined!\n");</div><div class='add'>+			printk(KERN_ERR "IP2: PCI card specified but PCI "</div><div class='add'>+					"support not enabled.\n");</div><div class='add'>+			printk(KERN_ERR "IP2: Recompile kernel with CONFIG_PCI "</div><div class='add'>+					"defined!\n");</div><div class='ctx'> #endif /* CONFIG_PCI */</div><div class='ctx'> 			break;</div><div class='ctx'> 		case EISA:</div><div class='del'>-			if ( (ip2config.addr[i] = find_eisa_board( Eisa_slot + 1 )) != 0) {</div><div class='add'>+			ip2config.addr[i] = find_eisa_board(Eisa_slot + 1);</div><div class='add'>+			if (ip2config.addr[i] != 0) {</div><div class='ctx'> 				/* Eisa_irq set as side effect, boo */</div><div class='ctx'> 				ip2config.type[i] = EISA;</div><div class='ctx'> 			} </div><div class='hunk'>@@ -634,31 +656,32 @@ ip2_loadmain(int *iop, int *irqp)</div><div class='ctx'> 			break;</div><div class='ctx'> 		}	/* switch */</div><div class='ctx'> 	}	/* for */</div><div class='del'>-	if (pci_dev_i)</div><div class='del'>-		pci_dev_put(pci_dev_i);</div><div class='add'>+	pci_dev_put(pdev);</div><div class='ctx'> </div><div class='del'>-	for ( i = 0; i &lt; IP2_MAX_BOARDS; ++i ) {</div><div class='del'>-		if ( ip2config.addr[i] ) {</div><div class='add'>+	for (i = 0; i &lt; IP2_MAX_BOARDS; ++i) {</div><div class='add'>+		if (ip2config.addr[i]) {</div><div class='ctx'> 			pB = kzalloc(sizeof(i2eBordStr), GFP_KERNEL);</div><div class='ctx'> 			if (pB) {</div><div class='ctx'> 				i2BoardPtrTable[i] = pB;</div><div class='del'>-				iiSetAddress( pB, ip2config.addr[i], ii2DelayTimer );</div><div class='del'>-				iiReset( pB );</div><div class='del'>-			} else {</div><div class='del'>-				printk(KERN_ERR "IP2: board memory allocation error\n");</div><div class='del'>-			}</div><div class='add'>+				iiSetAddress(pB, ip2config.addr[i],</div><div class='add'>+						ii2DelayTimer);</div><div class='add'>+				iiReset(pB);</div><div class='add'>+			} else</div><div class='add'>+				printk(KERN_ERR "IP2: board memory allocation "</div><div class='add'>+						"error\n");</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	for ( i = 0; i &lt; IP2_MAX_BOARDS; ++i ) {</div><div class='del'>-		if ( ( pB = i2BoardPtrTable[i] ) != NULL ) {</div><div class='del'>-			iiResetDelay( pB );</div><div class='add'>+	for (i = 0; i &lt; IP2_MAX_BOARDS; ++i) {</div><div class='add'>+		pB = i2BoardPtrTable[i];</div><div class='add'>+		if (pB != NULL) {</div><div class='add'>+			iiResetDelay(pB);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	for ( i = 0; i &lt; IP2_MAX_BOARDS; ++i ) {</div><div class='add'>+	for (i = 0; i &lt; IP2_MAX_BOARDS; ++i) {</div><div class='ctx'> 		/* We don't want to request the firmware unless we have at</div><div class='ctx'> 		   least one board */</div><div class='del'>-		if ( i2BoardPtrTable[i] != NULL ) {</div><div class='add'>+		if (i2BoardPtrTable[i] != NULL) {</div><div class='ctx'> 			if (!fw)</div><div class='ctx'> 				fw = ip2_request_firmware();</div><div class='ctx'> 			if (!fw)</div><div class='hunk'>@@ -669,7 +692,7 @@ ip2_loadmain(int *iop, int *irqp)</div><div class='ctx'> 	if (fw)</div><div class='ctx'> 		release_firmware(fw);</div><div class='ctx'> </div><div class='del'>-	ip2trace (ITRC_NO_PORT, ITRC_INIT, 2, 0 );</div><div class='add'>+	ip2trace(ITRC_NO_PORT, ITRC_INIT, 2, 0);</div><div class='ctx'> </div><div class='ctx'> 	ip2_tty_driver-&gt;owner		    = THIS_MODULE;</div><div class='ctx'> 	ip2_tty_driver-&gt;name                 = "ttyF";</div><div class='hunk'>@@ -680,20 +703,23 @@ ip2_loadmain(int *iop, int *irqp)</div><div class='ctx'> 	ip2_tty_driver-&gt;subtype              = SERIAL_TYPE_NORMAL;</div><div class='ctx'> 	ip2_tty_driver-&gt;init_termios         = tty_std_termios;</div><div class='ctx'> 	ip2_tty_driver-&gt;init_termios.c_cflag = B9600|CS8|CREAD|HUPCL|CLOCAL;</div><div class='del'>-	ip2_tty_driver-&gt;flags                = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV;</div><div class='add'>+	ip2_tty_driver-&gt;flags                = TTY_DRIVER_REAL_RAW |</div><div class='add'>+		TTY_DRIVER_DYNAMIC_DEV;</div><div class='ctx'> 	tty_set_operations(ip2_tty_driver, &amp;ip2_ops);</div><div class='ctx'> </div><div class='del'>-	ip2trace (ITRC_NO_PORT, ITRC_INIT, 3, 0 );</div><div class='add'>+	ip2trace(ITRC_NO_PORT, ITRC_INIT, 3, 0);</div><div class='ctx'> </div><div class='del'>-	/* Register the tty devices. */</div><div class='del'>-	if ( ( err = tty_register_driver ( ip2_tty_driver ) ) ) {</div><div class='del'>-		printk(KERN_ERR "IP2: failed to register tty driver (%d)\n", err);</div><div class='add'>+	err = tty_register_driver(ip2_tty_driver);</div><div class='add'>+	if (err) {</div><div class='add'>+		printk(KERN_ERR "IP2: failed to register tty driver\n");</div><div class='ctx'> 		put_tty_driver(ip2_tty_driver);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	} else</div><div class='del'>-	/* Register the IPL driver. */</div><div class='del'>-	if ( ( err = register_chrdev ( IP2_IPL_MAJOR, pcIpl, &amp;ip2_ipl ) ) ) {</div><div class='del'>-		printk(KERN_ERR "IP2: failed to register IPL device (%d)\n", err );</div><div class='add'>+		return err; /* leaking resources */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = register_chrdev(IP2_IPL_MAJOR, pcIpl, &amp;ip2_ipl);</div><div class='add'>+	if (err) {</div><div class='add'>+		printk(KERN_ERR "IP2: failed to register IPL device (%d)\n",</div><div class='add'>+				err);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* create the sysfs class */</div><div class='ctx'> 		ip2_class = class_create(THIS_MODULE, "ip2");</div><div class='hunk'>@@ -705,84 +731,86 @@ ip2_loadmain(int *iop, int *irqp)</div><div class='ctx'> 	/* Register the read_procmem thing */</div><div class='ctx'> 	if (!proc_create("ip2mem",0,NULL,&amp;ip2mem_proc_fops)) {</div><div class='ctx'> 		printk(KERN_ERR "IP2: failed to register read_procmem\n");</div><div class='del'>-	} else {</div><div class='add'>+		return -EIO; /* leaking resources */</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	ip2trace (ITRC_NO_PORT, ITRC_INIT, 4, 0 );</div><div class='del'>-		/* Register the interrupt handler or poll handler, depending upon the</div><div class='del'>-		 * specified interrupt.</div><div class='del'>-		 */</div><div class='add'>+	ip2trace(ITRC_NO_PORT, ITRC_INIT, 4, 0);</div><div class='add'>+	/* Register the interrupt handler or poll handler, depending upon the</div><div class='add'>+	 * specified interrupt.</div><div class='add'>+	 */</div><div class='ctx'> </div><div class='del'>-		for( i = 0; i &lt; IP2_MAX_BOARDS; ++i ) {</div><div class='del'>-			if ( 0 == ip2config.addr[i] ) {</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='add'>+	for (i = 0; i &lt; IP2_MAX_BOARDS; ++i) {</div><div class='add'>+		if (ip2config.addr[i] == 0)</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='del'>-			if ( NULL != ( pB = i2BoardPtrTable[i] ) ) {</div><div class='del'>-				device_create_drvdata(ip2_class, NULL,</div><div class='del'>-						      MKDEV(IP2_IPL_MAJOR, 4 * i),</div><div class='del'>-						      NULL, "ipl%d", i);</div><div class='del'>-				device_create_drvdata(ip2_class, NULL,</div><div class='del'>-						      MKDEV(IP2_IPL_MAJOR, 4 * i + 1),</div><div class='del'>-						      NULL, "stat%d", i);</div><div class='del'>-</div><div class='del'>-			    for ( box = 0; box &lt; ABS_MAX_BOXES; ++box )</div><div class='del'>-			    {</div><div class='del'>-			        for ( j = 0; j &lt; ABS_BIGGEST_BOX; ++j )</div><div class='del'>-			        {</div><div class='del'>-				    if ( pB-&gt;i2eChannelMap[box] &amp; (1 &lt;&lt; j) )</div><div class='del'>-				    {</div><div class='del'>-				        tty_register_device(ip2_tty_driver,</div><div class='del'>-					    j + ABS_BIGGEST_BOX *</div><div class='del'>-						    (box+i*ABS_MAX_BOXES), NULL);</div><div class='del'>-			    	    }</div><div class='del'>-			        }</div><div class='del'>-			    }</div><div class='del'>-			}</div><div class='add'>+		pB = i2BoardPtrTable[i];</div><div class='add'>+		if (pB != NULL) {</div><div class='add'>+			device_create(ip2_class, NULL,</div><div class='add'>+				      MKDEV(IP2_IPL_MAJOR, 4 * i),</div><div class='add'>+				      NULL, "ipl%d", i);</div><div class='add'>+			device_create(ip2_class, NULL,</div><div class='add'>+				      MKDEV(IP2_IPL_MAJOR, 4 * i + 1),</div><div class='add'>+				      NULL, "stat%d", i);</div><div class='add'>+</div><div class='add'>+			for (box = 0; box &lt; ABS_MAX_BOXES; box++)</div><div class='add'>+				for (j = 0; j &lt; ABS_BIGGEST_BOX; j++)</div><div class='add'>+					if (pB-&gt;i2eChannelMap[box] &amp; (1 &lt;&lt; j))</div><div class='add'>+						tty_register_device(</div><div class='add'>+							ip2_tty_driver,</div><div class='add'>+							j + ABS_BIGGEST_BOX *</div><div class='add'>+							(box+i*ABS_MAX_BOXES),</div><div class='add'>+							NULL);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-			if (poll_only) {</div><div class='del'>-//		Poll only forces driver to only use polling and</div><div class='del'>-//		to ignore the probed PCI or EISA interrupts.</div><div class='del'>-				ip2config.irq[i] = CIR_POLL;</div><div class='del'>-			}</div><div class='del'>-			if ( ip2config.irq[i] == CIR_POLL ) {</div><div class='add'>+		if (poll_only) {</div><div class='add'>+			/* Poll only forces driver to only use polling and</div><div class='add'>+			   to ignore the probed PCI or EISA interrupts. */</div><div class='add'>+			ip2config.irq[i] = CIR_POLL;</div><div class='add'>+		}</div><div class='add'>+		if (ip2config.irq[i] == CIR_POLL) {</div><div class='ctx'> retry:</div><div class='del'>-				if (!TimerOn) {</div><div class='del'>-					PollTimer.expires = POLL_TIMEOUT;</div><div class='del'>-					add_timer ( &amp;PollTimer );</div><div class='del'>-					TimerOn = 1;</div><div class='del'>-					printk( KERN_INFO "IP2: polling\n");</div><div class='del'>-				}</div><div class='del'>-			} else {</div><div class='del'>-				if (have_requested_irq(ip2config.irq[i]))</div><div class='del'>-					continue;</div><div class='del'>-				rc = request_irq( ip2config.irq[i], ip2_interrupt,</div><div class='del'>-					IP2_SA_FLAGS | (ip2config.type[i] == PCI ? IRQF_SHARED : 0),</div><div class='del'>-					pcName, i2BoardPtrTable[i]);</div><div class='del'>-				if (rc) {</div><div class='del'>-					printk(KERN_ERR "IP2: an request_irq failed: error %d\n",rc);</div><div class='del'>-					ip2config.irq[i] = CIR_POLL;</div><div class='del'>-					printk( KERN_INFO "IP2: Polling %ld/sec.\n",</div><div class='del'>-							(POLL_TIMEOUT - jiffies));</div><div class='del'>-					goto retry;</div><div class='del'>-				} </div><div class='del'>-				mark_requested_irq(ip2config.irq[i]);</div><div class='del'>-				/* Initialise the interrupt handler bottom half (aka slih). */</div><div class='add'>+			if (!timer_pending(&amp;PollTimer)) {</div><div class='add'>+				mod_timer(&amp;PollTimer, POLL_TIMEOUT);</div><div class='add'>+				printk(KERN_INFO "IP2: polling\n");</div><div class='ctx'> 			}</div><div class='del'>-		}</div><div class='del'>-		for( i = 0; i &lt; IP2_MAX_BOARDS; ++i ) {</div><div class='del'>-			if ( i2BoardPtrTable[i] ) {</div><div class='del'>-				set_irq( i, ip2config.irq[i] ); /* set and enable board interrupt */</div><div class='add'>+		} else {</div><div class='add'>+			if (have_requested_irq(ip2config.irq[i]))</div><div class='add'>+				continue;</div><div class='add'>+			rc = request_irq(ip2config.irq[i], ip2_interrupt,</div><div class='add'>+				IP2_SA_FLAGS |</div><div class='add'>+				(ip2config.type[i] == PCI ? IRQF_SHARED : 0),</div><div class='add'>+				pcName, i2BoardPtrTable[i]);</div><div class='add'>+			if (rc) {</div><div class='add'>+				printk(KERN_ERR "IP2: request_irq failed: "</div><div class='add'>+						"error %d\n", rc);</div><div class='add'>+				ip2config.irq[i] = CIR_POLL;</div><div class='add'>+				printk(KERN_INFO "IP2: Polling %ld/sec.\n",</div><div class='add'>+						(POLL_TIMEOUT - jiffies));</div><div class='add'>+				goto retry;</div><div class='ctx'> 			}</div><div class='add'>+			mark_requested_irq(ip2config.irq[i]);</div><div class='add'>+			/* Initialise the interrupt handler bottom half</div><div class='add'>+			 * (aka slih). */</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	ip2trace (ITRC_NO_PORT, ITRC_INIT, ITRC_RETURN, 0 );</div><div class='del'>-	goto out;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; IP2_MAX_BOARDS; ++i) {</div><div class='add'>+		if (i2BoardPtrTable[i]) {</div><div class='add'>+			/* set and enable board interrupt */</div><div class='add'>+			set_irq(i, ip2config.irq[i]);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ip2trace(ITRC_NO_PORT, ITRC_INIT, ITRC_RETURN, 0);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> </div><div class='ctx'> out_chrdev:</div><div class='ctx'> 	unregister_chrdev(IP2_IPL_MAJOR, "ip2");</div><div class='del'>-out:</div><div class='add'>+	/* unregister and put tty here */</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='add'>+module_init(ip2_loadmain);</div><div class='ctx'> </div><div class='ctx'> /******************************************************************************/</div><div class='ctx'> /* Function:   ip2_init_board()                                               */</div><div class='hunk'>@@ -1199,9 +1227,8 @@ ip2_polled_interrupt(void)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	i2eBordStrPtr  pB;</div><div class='del'>-	const int irq = 0;</div><div class='ctx'> </div><div class='del'>-	ip2trace (ITRC_NO_PORT, ITRC_INTR, 99, 1, irq );</div><div class='add'>+	ip2trace(ITRC_NO_PORT, ITRC_INTR, 99, 1, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* Service just the boards on the list using this irq */</div><div class='ctx'> 	for( i = 0; i &lt; i2nBoards; ++i ) {</div><div class='hunk'>@@ -1210,9 +1237,8 @@ ip2_polled_interrupt(void)</div><div class='ctx'> //		Only process those boards which match our IRQ.</div><div class='ctx'> //			IRQ = 0 for polled boards, we won't poll "IRQ" boards</div><div class='ctx'> </div><div class='del'>-		if ( pB &amp;&amp; (pB-&gt;i2eUsingIrq == irq) ) {</div><div class='add'>+		if (pB &amp;&amp; pB-&gt;i2eUsingIrq == 0)</div><div class='ctx'> 			ip2_irq_work(pB);</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	++irq_counter;</div><div class='hunk'>@@ -1250,16 +1276,12 @@ ip2_poll(unsigned long arg)</div><div class='ctx'> {</div><div class='ctx'> 	ip2trace (ITRC_NO_PORT, ITRC_INTR, 100, 0 );</div><div class='ctx'> </div><div class='del'>-	TimerOn = 0; // it's the truth but not checked in service</div><div class='del'>-</div><div class='ctx'> 	// Just polled boards, IRQ = 0 will hit all non-interrupt boards.</div><div class='ctx'> 	// It will NOT poll boards handled by hard interrupts.</div><div class='ctx'> 	// The issue of queued BH interrupts is handled in ip2_interrupt().</div><div class='ctx'> 	ip2_polled_interrupt();</div><div class='ctx'> </div><div class='del'>-	PollTimer.expires = POLL_TIMEOUT;</div><div class='del'>-	add_timer( &amp;PollTimer );</div><div class='del'>-	TimerOn = 1;</div><div class='add'>+	mod_timer(&amp;PollTimer, POLL_TIMEOUT);</div><div class='ctx'> </div><div class='ctx'> 	ip2trace (ITRC_NO_PORT, ITRC_INTR, ITRC_RETURN, 0 );</div><div class='ctx'> }</div><div class='hunk'>@@ -2871,7 +2893,7 @@ ip2_ipl_ioctl (struct file *pFile, UINT cmd, ULONG arg )</div><div class='ctx'> 	case 13:</div><div class='ctx'> 		switch ( cmd ) {</div><div class='ctx'> 		case 64:	/* Driver - ip2stat */</div><div class='del'>-			rc = put_user(ip2_tty_driver-&gt;refcount, pIndex++ );</div><div class='add'>+			rc = put_user(-1, pIndex++ );</div><div class='ctx'> 			rc = put_user(irq_counter, pIndex++  );</div><div class='ctx'> 			rc = put_user(bh_counter, pIndex++  );</div><div class='ctx'> 			break;</div><div class='head'>diff --git a/drivers/char/ipmi/ipmi_devintf.c b/drivers/char/ipmi/ipmi_devintf.c<br/>index 64e1c169e826..835a33c8d5f5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/ipmi/ipmi_devintf.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/char/ipmi/ipmi_devintf.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/ipmi/ipmi_devintf.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/ipmi/ipmi_devintf.c</a></div><div class='hunk'>@@ -871,7 +871,7 @@ static void ipmi_new_smi(int if_num, struct device *device)</div><div class='ctx'> 	entry-&gt;dev = dev;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;reg_list_mutex);</div><div class='del'>-	device_create_drvdata(ipmi_class, device, dev, NULL, "ipmi%d", if_num);</div><div class='add'>+	device_create(ipmi_class, device, dev, NULL, "ipmi%d", if_num);</div><div class='ctx'> 	list_add(&amp;entry-&gt;link, &amp;reg_list);</div><div class='ctx'> 	mutex_unlock(&amp;reg_list_mutex);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c<br/>index 8e8afb6141f9..3123bf57ad91 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/ipmi/ipmi_si_intf.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/char/ipmi/ipmi_si_intf.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/ipmi/ipmi_si_intf.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/ipmi/ipmi_si_intf.c</a></div><div class='hunk'>@@ -2695,7 +2695,7 @@ static __devinit void default_find_bmc(void)</div><div class='ctx'> 	for (i = 0; ; i++) {</div><div class='ctx'> 		if (!ipmi_defaults[i].port)</div><div class='ctx'> 			break;</div><div class='del'>-#ifdef CONFIG_PPC_MERGE</div><div class='add'>+#ifdef CONFIG_PPC</div><div class='ctx'> 		if (check_legacy_ioport(ipmi_defaults[i].port))</div><div class='ctx'> 			continue;</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/char/isicom.c b/drivers/char/isicom.c<br/>index 8f7cc190b62d..7d30ee1d3fca 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/isicom.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/char/isicom.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/isicom.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/isicom.c</a></div><div class='hunk'>@@ -421,17 +421,16 @@ static void isicom_tx(unsigned long _data)</div><div class='ctx'> 	if (retries &gt;= 100)</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> </div><div class='add'>+	tty = tty_port_tty_get(&amp;port-&gt;port);</div><div class='add'>+	if (tty == NULL)</div><div class='add'>+		goto put_unlock;</div><div class='add'>+</div><div class='ctx'> 	for (; count &gt; 0; count--, port++) {</div><div class='ctx'> 		/* port not active or tx disabled to force flow control */</div><div class='ctx'> 		if (!(port-&gt;port.flags &amp; ASYNC_INITIALIZED) ||</div><div class='ctx'> 				!(port-&gt;status &amp; ISI_TXOK))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		tty = port-&gt;port.tty;</div><div class='del'>-</div><div class='del'>-		if (tty == NULL)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='ctx'> 		txcount = min_t(short, TX_SIZE, port-&gt;xmit_cnt);</div><div class='ctx'> 		if (txcount &lt;= 0 || tty-&gt;stopped || tty-&gt;hw_stopped)</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -489,6 +488,8 @@ static void isicom_tx(unsigned long _data)</div><div class='ctx'> 			tty_wakeup(tty);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+put_unlock:</div><div class='add'>+	tty_kref_put(tty);</div><div class='ctx'> unlock:</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;isi_card[card].card_lock, flags);</div><div class='ctx'> 	/*	schedule another tx for hopefully in about 10ms	*/</div><div class='hunk'>@@ -547,7 +548,7 @@ static irqreturn_t isicom_interrupt(int irq, void *dev_id)</div><div class='ctx'> 		return IRQ_HANDLED;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	tty = port-&gt;port.tty;</div><div class='add'>+	tty = tty_port_tty_get(&amp;port-&gt;port);</div><div class='ctx'> 	if (tty == NULL) {</div><div class='ctx'> 		word_count = byte_count &gt;&gt; 1;</div><div class='ctx'> 		while (byte_count &gt; 1) {</div><div class='hunk'>@@ -588,7 +589,7 @@ static irqreturn_t isicom_interrupt(int irq, void *dev_id)</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			if (port-&gt;port.flags &amp; ASYNC_CTS_FLOW) {</div><div class='del'>-				if (port-&gt;port.tty-&gt;hw_stopped) {</div><div class='add'>+				if (tty-&gt;hw_stopped) {</div><div class='ctx'> 					if (header &amp; ISI_CTS) {</div><div class='ctx'> 						port-&gt;port.tty-&gt;hw_stopped = 0;</div><div class='ctx'> 						/* start tx ing */</div><div class='hunk'>@@ -597,7 +598,7 @@ static irqreturn_t isicom_interrupt(int irq, void *dev_id)</div><div class='ctx'> 						tty_wakeup(tty);</div><div class='ctx'> 					}</div><div class='ctx'> 				} else if (!(header &amp; ISI_CTS)) {</div><div class='del'>-					port-&gt;port.tty-&gt;hw_stopped = 1;</div><div class='add'>+					tty-&gt;hw_stopped = 1;</div><div class='ctx'> 					/* stop tx ing */</div><div class='ctx'> 					port-&gt;status &amp;= ~(ISI_TXOK | ISI_CTS);</div><div class='ctx'> 				}</div><div class='hunk'>@@ -660,24 +661,21 @@ static irqreturn_t isicom_interrupt(int irq, void *dev_id)</div><div class='ctx'> 	}</div><div class='ctx'> 	outw(0x0000, base+0x04); /* enable interrupts */</div><div class='ctx'> 	spin_unlock(&amp;card-&gt;card_lock);</div><div class='add'>+	tty_kref_put(tty);</div><div class='ctx'> </div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void isicom_config_port(struct isi_port *port)</div><div class='add'>+static void isicom_config_port(struct tty_struct *tty)</div><div class='ctx'> {</div><div class='add'>+	struct isi_port *port = tty-&gt;driver_data;</div><div class='ctx'> 	struct isi_board *card = port-&gt;card;</div><div class='del'>-	struct tty_struct *tty;</div><div class='ctx'> 	unsigned long baud;</div><div class='ctx'> 	unsigned long base = card-&gt;base;</div><div class='ctx'> 	u16 channel_setup, channel = port-&gt;channel,</div><div class='ctx'> 		shift_count = card-&gt;shift_count;</div><div class='ctx'> 	unsigned char flow_ctrl;</div><div class='ctx'> </div><div class='del'>-	tty = port-&gt;port.tty;</div><div class='del'>-</div><div class='del'>-	if (tty == NULL)</div><div class='del'>-		return;</div><div class='ctx'> 	/* FIXME: Switch to new tty baud API */</div><div class='ctx'> 	baud = C_BAUD(tty);</div><div class='ctx'> 	if (baud &amp; CBAUDEX) {</div><div class='hunk'>@@ -690,7 +688,7 @@ static void isicom_config_port(struct isi_port *port)</div><div class='ctx'> </div><div class='ctx'> 		/* 1,2,3,4 =&gt; 57.6, 115.2, 230, 460 kbps resp. */</div><div class='ctx'> 		if (baud &lt; 1 || baud &gt; 4)</div><div class='del'>-			port-&gt;port.tty-&gt;termios-&gt;c_cflag &amp;= ~CBAUDEX;</div><div class='add'>+			tty-&gt;termios-&gt;c_cflag &amp;= ~CBAUDEX;</div><div class='ctx'> 		else</div><div class='ctx'> 			baud += 15;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -797,8 +795,9 @@ static inline void isicom_setup_board(struct isi_board *bp)</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;bp-&gt;card_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int isicom_setup_port(struct isi_port *port)</div><div class='add'>+static int isicom_setup_port(struct tty_struct *tty)</div><div class='ctx'> {</div><div class='add'>+	struct isi_port *port = tty-&gt;driver_data;</div><div class='ctx'> 	struct isi_board *card = port-&gt;card;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='hunk'>@@ -808,8 +807,7 @@ static int isicom_setup_port(struct isi_port *port)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;card-&gt;card_lock, flags);</div><div class='del'>-	if (port-&gt;port.tty)</div><div class='del'>-		clear_bit(TTY_IO_ERROR, &amp;port-&gt;port.tty-&gt;flags);</div><div class='add'>+	clear_bit(TTY_IO_ERROR, &amp;tty-&gt;flags);</div><div class='ctx'> 	if (port-&gt;port.count == 1)</div><div class='ctx'> 		card-&gt;count++;</div><div class='ctx'> </div><div class='hunk'>@@ -823,7 +821,7 @@ static int isicom_setup_port(struct isi_port *port)</div><div class='ctx'> 		InterruptTheCard(card-&gt;base);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	isicom_config_port(port);</div><div class='add'>+	isicom_config_port(tty);</div><div class='ctx'> 	port-&gt;port.flags |= ASYNC_INITIALIZED;</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;card-&gt;card_lock, flags);</div><div class='ctx'> </div><div class='hunk'>@@ -934,8 +932,8 @@ static int isicom_open(struct tty_struct *tty, struct file *filp)</div><div class='ctx'> </div><div class='ctx'> 	port-&gt;port.count++;</div><div class='ctx'> 	tty-&gt;driver_data = port;</div><div class='del'>-	port-&gt;port.tty = tty;</div><div class='del'>-	error = isicom_setup_port(port);</div><div class='add'>+	tty_port_tty_set(&amp;port-&gt;port, tty);</div><div class='add'>+	error = isicom_setup_port(tty);</div><div class='ctx'> 	if (error == 0)</div><div class='ctx'> 		error = block_til_ready(tty, filp, port);</div><div class='ctx'> 	return error;</div><div class='hunk'>@@ -955,15 +953,17 @@ static void isicom_shutdown_port(struct isi_port *port)</div><div class='ctx'> 	struct isi_board *card = port-&gt;card;</div><div class='ctx'> 	struct tty_struct *tty;</div><div class='ctx'> </div><div class='del'>-	tty = port-&gt;port.tty;</div><div class='add'>+	tty = tty_port_tty_get(&amp;port-&gt;port);</div><div class='ctx'> </div><div class='del'>-	if (!(port-&gt;port.flags &amp; ASYNC_INITIALIZED))</div><div class='add'>+	if (!(port-&gt;port.flags &amp; ASYNC_INITIALIZED)) {</div><div class='add'>+		tty_kref_put(tty);</div><div class='ctx'> 		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	tty_port_free_xmit_buf(&amp;port-&gt;port);</div><div class='ctx'> 	port-&gt;port.flags &amp;= ~ASYNC_INITIALIZED;</div><div class='ctx'> 	/* 3rd October 2000 : Vinayak P Risbud */</div><div class='del'>-	port-&gt;port.tty = NULL;</div><div class='add'>+	tty_port_tty_set(&amp;port-&gt;port, NULL);</div><div class='ctx'> </div><div class='ctx'> 	/*Fix done by Anil .S on 30-04-2001</div><div class='ctx'> 	remote login through isi port has dtr toggle problem</div><div class='hunk'>@@ -1243,9 +1243,10 @@ static int isicom_tiocmset(struct tty_struct *tty, struct file *file,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int isicom_set_serial_info(struct isi_port *port,</div><div class='del'>-	struct serial_struct __user *info)</div><div class='add'>+static int isicom_set_serial_info(struct tty_struct *tty,</div><div class='add'>+					struct serial_struct __user *info)</div><div class='ctx'> {</div><div class='add'>+	struct isi_port *port = tty-&gt;driver_data;</div><div class='ctx'> 	struct serial_struct newinfo;</div><div class='ctx'> 	int reconfig_port;</div><div class='ctx'> </div><div class='hunk'>@@ -1276,7 +1277,7 @@ static int isicom_set_serial_info(struct isi_port *port,</div><div class='ctx'> 	if (reconfig_port) {</div><div class='ctx'> 		unsigned long flags;</div><div class='ctx'> 		spin_lock_irqsave(&amp;port-&gt;card-&gt;card_lock, flags);</div><div class='del'>-		isicom_config_port(port);</div><div class='add'>+		isicom_config_port(tty);</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;port-&gt;card-&gt;card_lock, flags);</div><div class='ctx'> 	}</div><div class='ctx'> 	unlock_kernel();</div><div class='hunk'>@@ -1318,7 +1319,7 @@ static int isicom_ioctl(struct tty_struct *tty, struct file *filp,</div><div class='ctx'> 		return isicom_get_serial_info(port, argp);</div><div class='ctx'> </div><div class='ctx'> 	case TIOCSSERIAL:</div><div class='del'>-		return isicom_set_serial_info(port, argp);</div><div class='add'>+		return isicom_set_serial_info(tty, argp);</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='ctx'> 		return -ENOIOCTLCMD;</div><div class='hunk'>@@ -1341,7 +1342,7 @@ static void isicom_set_termios(struct tty_struct *tty,</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;port-&gt;card-&gt;card_lock, flags);</div><div class='del'>-	isicom_config_port(port);</div><div class='add'>+	isicom_config_port(tty);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;port-&gt;card-&gt;card_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	if ((old_termios-&gt;c_cflag &amp; CRTSCTS) &amp;&amp;</div><div class='hunk'>@@ -1419,7 +1420,7 @@ static void isicom_hangup(struct tty_struct *tty)</div><div class='ctx'> </div><div class='ctx'> 	port-&gt;port.count = 0;</div><div class='ctx'> 	port-&gt;port.flags &amp;= ~ASYNC_NORMAL_ACTIVE;</div><div class='del'>-	port-&gt;port.tty = NULL;</div><div class='add'>+	tty_port_tty_set(&amp;port-&gt;port, NULL);</div><div class='ctx'> 	wake_up_interruptible(&amp;port-&gt;port.open_wait);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/char/istallion.c b/drivers/char/istallion.c<br/>index 843a2afaf204..44e5d60f517e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/istallion.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/char/istallion.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/istallion.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/istallion.c</a></div><div class='hunk'>@@ -623,24 +623,25 @@ static int	stli_memioctl(struct inode *ip, struct file *fp, unsigned int cmd, un</div><div class='ctx'> static void	stli_brdpoll(struct stlibrd *brdp, cdkhdr_t __iomem *hdrp);</div><div class='ctx'> static void	stli_poll(unsigned long arg);</div><div class='ctx'> static int	stli_hostcmd(struct stlibrd *brdp, struct stliport *portp);</div><div class='del'>-static int	stli_initopen(struct stlibrd *brdp, struct stliport *portp);</div><div class='add'>+static int	stli_initopen(struct tty_struct *tty, struct stlibrd *brdp, struct stliport *portp);</div><div class='ctx'> static int	stli_rawopen(struct stlibrd *brdp, struct stliport *portp, unsigned long arg, int wait);</div><div class='ctx'> static int	stli_rawclose(struct stlibrd *brdp, struct stliport *portp, unsigned long arg, int wait);</div><div class='del'>-static int	stli_waitcarrier(struct stlibrd *brdp, struct stliport *portp, struct file *filp);</div><div class='del'>-static int	stli_setport(struct stliport *portp);</div><div class='add'>+static int	stli_waitcarrier(struct tty_struct *tty, struct stlibrd *brdp,</div><div class='add'>+				struct stliport *portp, struct file *filp);</div><div class='add'>+static int	stli_setport(struct tty_struct *tty);</div><div class='ctx'> static int	stli_cmdwait(struct stlibrd *brdp, struct stliport *portp, unsigned long cmd, void *arg, int size, int copyback);</div><div class='ctx'> static void	stli_sendcmd(struct stlibrd *brdp, struct stliport *portp, unsigned long cmd, void *arg, int size, int copyback);</div><div class='ctx'> static void	__stli_sendcmd(struct stlibrd *brdp, struct stliport *portp, unsigned long cmd, void *arg, int size, int copyback);</div><div class='ctx'> static void	stli_dodelaycmd(struct stliport *portp, cdkctrl_t __iomem *cp);</div><div class='del'>-static void	stli_mkasyport(struct stliport *portp, asyport_t *pp, struct ktermios *tiosp);</div><div class='add'>+static void	stli_mkasyport(struct tty_struct *tty, struct stliport *portp, asyport_t *pp, struct ktermios *tiosp);</div><div class='ctx'> static void	stli_mkasysigs(asysigs_t *sp, int dtr, int rts);</div><div class='ctx'> static long	stli_mktiocm(unsigned long sigvalue);</div><div class='ctx'> static void	stli_read(struct stlibrd *brdp, struct stliport *portp);</div><div class='ctx'> static int	stli_getserial(struct stliport *portp, struct serial_struct __user *sp);</div><div class='del'>-static int	stli_setserial(struct stliport *portp, struct serial_struct __user *sp);</div><div class='add'>+static int	stli_setserial(struct tty_struct *tty, struct serial_struct __user *sp);</div><div class='ctx'> static int	stli_getbrdstats(combrd_t __user *bp);</div><div class='del'>-static int	stli_getportstats(struct stliport *portp, comstats_t __user *cp);</div><div class='del'>-static int	stli_portcmdstats(struct stliport *portp);</div><div class='add'>+static int	stli_getportstats(struct tty_struct *tty, struct stliport *portp, comstats_t __user *cp);</div><div class='add'>+static int	stli_portcmdstats(struct tty_struct *tty, struct stliport *portp);</div><div class='ctx'> static int	stli_clrportstats(struct stliport *portp, comstats_t __user *cp);</div><div class='ctx'> static int	stli_getportstruct(struct stliport __user *arg);</div><div class='ctx'> static int	stli_getbrdstruct(struct stlibrd __user *arg);</div><div class='hunk'>@@ -731,12 +732,16 @@ static void stli_cleanup_ports(struct stlibrd *brdp)</div><div class='ctx'> {</div><div class='ctx'> 	struct stliport *portp;</div><div class='ctx'> 	unsigned int j;</div><div class='add'>+	struct tty_struct *tty;</div><div class='ctx'> </div><div class='ctx'> 	for (j = 0; j &lt; STL_MAXPORTS; j++) {</div><div class='ctx'> 		portp = brdp-&gt;ports[j];</div><div class='ctx'> 		if (portp != NULL) {</div><div class='del'>-			if (portp-&gt;port.tty != NULL)</div><div class='del'>-				tty_hangup(portp-&gt;port.tty);</div><div class='add'>+			tty = tty_port_tty_get(&amp;portp-&gt;port);</div><div class='add'>+			if (tty != NULL) {</div><div class='add'>+				tty_hangup(tty);</div><div class='add'>+				tty_kref_put(tty);</div><div class='add'>+			}</div><div class='ctx'> 			kfree(portp);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -824,7 +829,7 @@ static int stli_open(struct tty_struct *tty, struct file *filp)</div><div class='ctx'>  *	requires several commands to the board we will need to wait for any</div><div class='ctx'>  *	other open that is already initializing the port.</div><div class='ctx'>  */</div><div class='del'>-	portp-&gt;port.tty = tty;</div><div class='add'>+	tty_port_tty_set(&amp;portp-&gt;port, tty);</div><div class='ctx'> 	tty-&gt;driver_data = portp;</div><div class='ctx'> 	portp-&gt;port.count++;</div><div class='ctx'> </div><div class='hunk'>@@ -835,7 +840,7 @@ static int stli_open(struct tty_struct *tty, struct file *filp)</div><div class='ctx'> </div><div class='ctx'> 	if ((portp-&gt;port.flags &amp; ASYNC_INITIALIZED) == 0) {</div><div class='ctx'> 		set_bit(ST_INITIALIZING, &amp;portp-&gt;state);</div><div class='del'>-		if ((rc = stli_initopen(brdp, portp)) &gt;= 0) {</div><div class='add'>+		if ((rc = stli_initopen(tty, brdp, portp)) &gt;= 0) {</div><div class='ctx'> 			portp-&gt;port.flags |= ASYNC_INITIALIZED;</div><div class='ctx'> 			clear_bit(TTY_IO_ERROR, &amp;tty-&gt;flags);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -864,7 +869,7 @@ static int stli_open(struct tty_struct *tty, struct file *filp)</div><div class='ctx'>  *	then also we might have to wait for carrier.</div><div class='ctx'>  */</div><div class='ctx'> 	if (!(filp-&gt;f_flags &amp; O_NONBLOCK)) {</div><div class='del'>-		if ((rc = stli_waitcarrier(brdp, portp, filp)) != 0)</div><div class='add'>+		if ((rc = stli_waitcarrier(tty, brdp, portp, filp)) != 0)</div><div class='ctx'> 			return rc;</div><div class='ctx'> 	}</div><div class='ctx'> 	portp-&gt;port.flags |= ASYNC_NORMAL_ACTIVE;</div><div class='hunk'>@@ -930,7 +935,7 @@ static void stli_close(struct tty_struct *tty, struct file *filp)</div><div class='ctx'> 	stli_flushbuffer(tty);</div><div class='ctx'> </div><div class='ctx'> 	tty-&gt;closing = 0;</div><div class='del'>-	portp-&gt;port.tty = NULL;</div><div class='add'>+	tty_port_tty_set(&amp;portp-&gt;port, NULL);</div><div class='ctx'> </div><div class='ctx'> 	if (portp-&gt;openwaitcnt) {</div><div class='ctx'> 		if (portp-&gt;close_delay)</div><div class='hunk'>@@ -952,9 +957,9 @@ static void stli_close(struct tty_struct *tty, struct file *filp)</div><div class='ctx'>  *	this still all happens pretty quickly.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static int stli_initopen(struct stlibrd *brdp, struct stliport *portp)</div><div class='add'>+static int stli_initopen(struct tty_struct *tty,</div><div class='add'>+				struct stlibrd *brdp, struct stliport *portp)</div><div class='ctx'> {</div><div class='del'>-	struct tty_struct *tty;</div><div class='ctx'> 	asynotify_t nt;</div><div class='ctx'> 	asyport_t aport;</div><div class='ctx'> 	int rc;</div><div class='hunk'>@@ -969,10 +974,7 @@ static int stli_initopen(struct stlibrd *brdp, struct stliport *portp)</div><div class='ctx'> 	    sizeof(asynotify_t), 0)) &lt; 0)</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='del'>-	tty = portp-&gt;port.tty;</div><div class='del'>-	if (tty == NULL)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	stli_mkasyport(portp, &amp;aport, tty-&gt;termios);</div><div class='add'>+	stli_mkasyport(tty, portp, &amp;aport, tty-&gt;termios);</div><div class='ctx'> 	if ((rc = stli_cmdwait(brdp, portp, A_SETPORT, &amp;aport,</div><div class='ctx'> 	    sizeof(asyport_t), 0)) &lt; 0)</div><div class='ctx'> 		return rc;</div><div class='hunk'>@@ -1161,22 +1163,21 @@ static int stli_cmdwait(struct stlibrd *brdp, struct stliport *portp, unsigned l</div><div class='ctx'>  *	waiting for the command to complete - so must have user context.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static int stli_setport(struct stliport *portp)</div><div class='add'>+static int stli_setport(struct tty_struct *tty)</div><div class='ctx'> {</div><div class='add'>+	struct stliport *portp = tty-&gt;driver_data;</div><div class='ctx'> 	struct stlibrd *brdp;</div><div class='ctx'> 	asyport_t aport;</div><div class='ctx'> </div><div class='ctx'> 	if (portp == NULL)</div><div class='ctx'> 		return -ENODEV;</div><div class='del'>-	if (portp-&gt;port.tty == NULL)</div><div class='del'>-		return -ENODEV;</div><div class='ctx'> 	if (portp-&gt;brdnr &gt;= stli_nrbrds)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	brdp = stli_brds[portp-&gt;brdnr];</div><div class='ctx'> 	if (brdp == NULL)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	stli_mkasyport(portp, &amp;aport, portp-&gt;port.tty-&gt;termios);</div><div class='add'>+	stli_mkasyport(tty, portp, &amp;aport, tty-&gt;termios);</div><div class='ctx'> 	return(stli_cmdwait(brdp, portp, A_SETPORT, &amp;aport, sizeof(asyport_t), 0));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1187,7 +1188,8 @@ static int stli_setport(struct stliport *portp)</div><div class='ctx'>  *	maybe because if we are clocal then we don't need to wait...</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static int stli_waitcarrier(struct stlibrd *brdp, struct stliport *portp, struct file *filp)</div><div class='add'>+static int stli_waitcarrier(struct tty_struct *tty, struct stlibrd *brdp,</div><div class='add'>+				struct stliport *portp, struct file *filp)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	int rc, doclocal;</div><div class='hunk'>@@ -1195,7 +1197,7 @@ static int stli_waitcarrier(struct stlibrd *brdp, struct stliport *portp, struct</div><div class='ctx'> 	rc = 0;</div><div class='ctx'> 	doclocal = 0;</div><div class='ctx'> </div><div class='del'>-	if (portp-&gt;port.tty-&gt;termios-&gt;c_cflag &amp; CLOCAL)</div><div class='add'>+	if (tty-&gt;termios-&gt;c_cflag &amp; CLOCAL)</div><div class='ctx'> 		doclocal++;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;stli_lock, flags);</div><div class='hunk'>@@ -1373,8 +1375,6 @@ static void stli_flushchars(struct tty_struct *tty)</div><div class='ctx'> 	stli_txcookrealsize = 0;</div><div class='ctx'> 	stli_txcooktty = NULL;</div><div class='ctx'> </div><div class='del'>-	if (tty == NULL)</div><div class='del'>-		return;</div><div class='ctx'> 	if (cooktty == NULL)</div><div class='ctx'> 		return;</div><div class='ctx'> 	if (tty != cooktty)</div><div class='hunk'>@@ -1572,10 +1572,11 @@ static int stli_getserial(struct stliport *portp, struct serial_struct __user *s</div><div class='ctx'>  *	just quietly ignore any requests to change irq, etc.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static int stli_setserial(struct stliport *portp, struct serial_struct __user *sp)</div><div class='add'>+static int stli_setserial(struct tty_struct *tty, struct serial_struct __user *sp)</div><div class='ctx'> {</div><div class='ctx'> 	struct serial_struct sio;</div><div class='ctx'> 	int rc;</div><div class='add'>+	struct stliport *portp = tty-&gt;driver_data;</div><div class='ctx'> </div><div class='ctx'> 	if (copy_from_user(&amp;sio, sp, sizeof(struct serial_struct)))</div><div class='ctx'> 		return -EFAULT;</div><div class='hunk'>@@ -1594,7 +1595,7 @@ static int stli_setserial(struct stliport *portp, struct serial_struct __user *s</div><div class='ctx'> 	portp-&gt;closing_wait = sio.closing_wait;</div><div class='ctx'> 	portp-&gt;custom_divisor = sio.custom_divisor;</div><div class='ctx'> </div><div class='del'>-	if ((rc = stli_setport(portp)) &lt; 0)</div><div class='add'>+	if ((rc = stli_setport(tty)) &lt; 0)</div><div class='ctx'> 		return rc;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1685,17 +1686,17 @@ static int stli_ioctl(struct tty_struct *tty, struct file *file, unsigned int cm</div><div class='ctx'> 		rc = stli_getserial(portp, argp);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case TIOCSSERIAL:</div><div class='del'>-		rc = stli_setserial(portp, argp);</div><div class='add'>+		rc = stli_setserial(tty, argp);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case STL_GETPFLAG:</div><div class='ctx'> 		rc = put_user(portp-&gt;pflag, (unsigned __user *)argp);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case STL_SETPFLAG:</div><div class='ctx'> 		if ((rc = get_user(portp-&gt;pflag, (unsigned __user *)argp)) == 0)</div><div class='del'>-			stli_setport(portp);</div><div class='add'>+			stli_setport(tty);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case COM_GETPORTSTATS:</div><div class='del'>-		rc = stli_getportstats(portp, argp);</div><div class='add'>+		rc = stli_getportstats(tty, portp, argp);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case COM_CLRPORTSTATS:</div><div class='ctx'> 		rc = stli_clrportstats(portp, argp);</div><div class='hunk'>@@ -1729,8 +1730,6 @@ static void stli_settermios(struct tty_struct *tty, struct ktermios *old)</div><div class='ctx'> 	struct ktermios *tiosp;</div><div class='ctx'> 	asyport_t aport;</div><div class='ctx'> </div><div class='del'>-	if (tty == NULL)</div><div class='del'>-		return;</div><div class='ctx'> 	portp = tty-&gt;driver_data;</div><div class='ctx'> 	if (portp == NULL)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -1742,7 +1741,7 @@ static void stli_settermios(struct tty_struct *tty, struct ktermios *old)</div><div class='ctx'> </div><div class='ctx'> 	tiosp = tty-&gt;termios;</div><div class='ctx'> </div><div class='del'>-	stli_mkasyport(portp, &amp;aport, tiosp);</div><div class='add'>+	stli_mkasyport(tty, portp, &amp;aport, tiosp);</div><div class='ctx'> 	stli_cmdwait(brdp, portp, A_SETPORT, &amp;aport, sizeof(asyport_t), 0);</div><div class='ctx'> 	stli_mkasysigs(&amp;portp-&gt;asig, ((tiosp-&gt;c_cflag &amp; CBAUD) ? 1 : 0), -1);</div><div class='ctx'> 	stli_cmdwait(brdp, portp, A_SETSIGNALS, &amp;portp-&gt;asig,</div><div class='hunk'>@@ -1854,7 +1853,7 @@ static void stli_hangup(struct tty_struct *tty)</div><div class='ctx'> 	clear_bit(ST_TXBUSY, &amp;portp-&gt;state);</div><div class='ctx'> 	clear_bit(ST_RXSTOP, &amp;portp-&gt;state);</div><div class='ctx'> 	set_bit(TTY_IO_ERROR, &amp;tty-&gt;flags);</div><div class='del'>-	portp-&gt;port.tty = NULL;</div><div class='add'>+	tty_port_tty_set(&amp;portp-&gt;port, NULL);</div><div class='ctx'> 	portp-&gt;port.flags &amp;= ~ASYNC_NORMAL_ACTIVE;</div><div class='ctx'> 	portp-&gt;port.count = 0;</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;stli_lock, flags);</div><div class='hunk'>@@ -1935,8 +1934,6 @@ static void stli_waituntilsent(struct tty_struct *tty, int timeout)</div><div class='ctx'> 	struct stliport *portp;</div><div class='ctx'> 	unsigned long tend;</div><div class='ctx'> </div><div class='del'>-	if (tty == NULL)</div><div class='del'>-		return;</div><div class='ctx'> 	portp = tty-&gt;driver_data;</div><div class='ctx'> 	if (portp == NULL)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -1998,7 +1995,7 @@ static int stli_portinfo(struct stlibrd *brdp, struct stliport *portp, int portn</div><div class='ctx'> 	char *sp, *uart;</div><div class='ctx'> 	int rc, cnt;</div><div class='ctx'> </div><div class='del'>-	rc = stli_portcmdstats(portp);</div><div class='add'>+	rc = stli_portcmdstats(NULL, portp);</div><div class='ctx'> </div><div class='ctx'> 	uart = "UNKNOWN";</div><div class='ctx'> 	if (brdp-&gt;state &amp; BST_STARTED) {</div><div class='hunk'>@@ -2188,7 +2185,7 @@ static void stli_read(struct stlibrd *brdp, struct stliport *portp)</div><div class='ctx'> </div><div class='ctx'> 	if (test_bit(ST_RXSTOP, &amp;portp-&gt;state))</div><div class='ctx'> 		return;</div><div class='del'>-	tty = portp-&gt;port.tty;</div><div class='add'>+	tty = tty_port_tty_get(&amp;portp-&gt;port);</div><div class='ctx'> 	if (tty == NULL)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -2230,6 +2227,7 @@ static void stli_read(struct stlibrd *brdp, struct stliport *portp)</div><div class='ctx'> 		set_bit(ST_RXING, &amp;portp-&gt;state);</div><div class='ctx'> </div><div class='ctx'> 	tty_schedule_flip(tty);</div><div class='add'>+	tty_kref_put(tty);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='hunk'>@@ -2362,7 +2360,7 @@ static int stli_hostcmd(struct stlibrd *brdp, struct stliport *portp)</div><div class='ctx'> 	if (ap-&gt;notify) {</div><div class='ctx'> 		nt = ap-&gt;changed;</div><div class='ctx'> 		ap-&gt;notify = 0;</div><div class='del'>-		tty = portp-&gt;port.tty;</div><div class='add'>+		tty = tty_port_tty_get(&amp;portp-&gt;port);</div><div class='ctx'> </div><div class='ctx'> 		if (nt.signal &amp; SG_DCD) {</div><div class='ctx'> 			oldsigs = portp-&gt;sigs;</div><div class='hunk'>@@ -2399,6 +2397,7 @@ static int stli_hostcmd(struct stlibrd *brdp, struct stliport *portp)</div><div class='ctx'> 				tty_schedule_flip(tty);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='add'>+		tty_kref_put(tty);</div><div class='ctx'> </div><div class='ctx'> 		if (nt.data &amp; DT_RXBUSY) {</div><div class='ctx'> 			donerx++;</div><div class='hunk'>@@ -2535,14 +2534,15 @@ static void stli_poll(unsigned long arg)</div><div class='ctx'>  *	the slave.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static void stli_mkasyport(struct stliport *portp, asyport_t *pp, struct ktermios *tiosp)</div><div class='add'>+static void stli_mkasyport(struct tty_struct *tty, struct stliport *portp,</div><div class='add'>+				asyport_t *pp, struct ktermios *tiosp)</div><div class='ctx'> {</div><div class='ctx'> 	memset(pp, 0, sizeof(asyport_t));</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *	Start of by setting the baud, char size, parity and stop bit info.</div><div class='ctx'>  */</div><div class='del'>-	pp-&gt;baudout = tty_get_baud_rate(portp-&gt;port.tty);</div><div class='add'>+	pp-&gt;baudout = tty_get_baud_rate(tty);</div><div class='ctx'> 	if ((tiosp-&gt;c_cflag &amp; CBAUD) == B38400) {</div><div class='ctx'> 		if ((portp-&gt;port.flags &amp; ASYNC_SPD_MASK) == ASYNC_SPD_HI)</div><div class='ctx'> 			pp-&gt;baudout = 57600;</div><div class='hunk'>@@ -2695,7 +2695,7 @@ static int stli_initports(struct stlibrd *brdp)</div><div class='ctx'> 			printk("STALLION: failed to allocate port structure\n");</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='add'>+		tty_port_init(&amp;portp-&gt;port);</div><div class='ctx'> 		portp-&gt;magic = STLI_PORTMAGIC;</div><div class='ctx'> 		portp-&gt;portnr = i;</div><div class='ctx'> 		portp-&gt;brdnr = brdp-&gt;brdnr;</div><div class='hunk'>@@ -4220,7 +4220,7 @@ static struct stliport *stli_getport(unsigned int brdnr, unsigned int panelnr,</div><div class='ctx'>  *	what port to get stats for (used through board control device).</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static int stli_portcmdstats(struct stliport *portp)</div><div class='add'>+static int stli_portcmdstats(struct tty_struct *tty, struct stliport *portp)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long	flags;</div><div class='ctx'> 	struct stlibrd	*brdp;</div><div class='hunk'>@@ -4249,15 +4249,15 @@ static int stli_portcmdstats(struct stliport *portp)</div><div class='ctx'> 	stli_comstats.flags = portp-&gt;port.flags;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;brd_lock, flags);</div><div class='del'>-	if (portp-&gt;port.tty != NULL) {</div><div class='del'>-		if (portp-&gt;port.tty-&gt;driver_data == portp) {</div><div class='del'>-			stli_comstats.ttystate = portp-&gt;port.tty-&gt;flags;</div><div class='add'>+	if (tty != NULL) {</div><div class='add'>+		if (portp-&gt;port.tty == tty) {</div><div class='add'>+			stli_comstats.ttystate = tty-&gt;flags;</div><div class='ctx'> 			stli_comstats.rxbuffered = -1;</div><div class='del'>-			if (portp-&gt;port.tty-&gt;termios != NULL) {</div><div class='del'>-				stli_comstats.cflags = portp-&gt;port.tty-&gt;termios-&gt;c_cflag;</div><div class='del'>-				stli_comstats.iflags = portp-&gt;port.tty-&gt;termios-&gt;c_iflag;</div><div class='del'>-				stli_comstats.oflags = portp-&gt;port.tty-&gt;termios-&gt;c_oflag;</div><div class='del'>-				stli_comstats.lflags = portp-&gt;port.tty-&gt;termios-&gt;c_lflag;</div><div class='add'>+			if (tty-&gt;termios != NULL) {</div><div class='add'>+				stli_comstats.cflags = tty-&gt;termios-&gt;c_cflag;</div><div class='add'>+				stli_comstats.iflags = tty-&gt;termios-&gt;c_iflag;</div><div class='add'>+				stli_comstats.oflags = tty-&gt;termios-&gt;c_oflag;</div><div class='add'>+				stli_comstats.lflags = tty-&gt;termios-&gt;c_lflag;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -4294,7 +4294,8 @@ static int stli_portcmdstats(struct stliport *portp)</div><div class='ctx'>  *	what port to get stats for (used through board control device).</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static int stli_getportstats(struct stliport *portp, comstats_t __user *cp)</div><div class='add'>+static int stli_getportstats(struct tty_struct *tty, struct stliport *portp,</div><div class='add'>+							comstats_t __user *cp)</div><div class='ctx'> {</div><div class='ctx'> 	struct stlibrd *brdp;</div><div class='ctx'> 	int rc;</div><div class='hunk'>@@ -4312,7 +4313,7 @@ static int stli_getportstats(struct stliport *portp, comstats_t __user *cp)</div><div class='ctx'> 	if (!brdp)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	if ((rc = stli_portcmdstats(portp)) &lt; 0)</div><div class='add'>+	if ((rc = stli_portcmdstats(tty, portp)) &lt; 0)</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='ctx'> 	return copy_to_user(cp, &amp;stli_comstats, sizeof(comstats_t)) ?</div><div class='hunk'>@@ -4427,7 +4428,7 @@ static int stli_memioctl(struct inode *ip, struct file *fp, unsigned int cmd, un</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case COM_GETPORTSTATS:</div><div class='del'>-		rc = stli_getportstats(NULL, argp);</div><div class='add'>+		rc = stli_getportstats(NULL, NULL, argp);</div><div class='ctx'> 		done++;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case COM_CLRPORTSTATS:</div><div class='hunk'>@@ -4599,9 +4600,8 @@ static int __init istallion_module_init(void)</div><div class='ctx'> </div><div class='ctx'> 	istallion_class = class_create(THIS_MODULE, "staliomem");</div><div class='ctx'> 	for (i = 0; i &lt; 4; i++)</div><div class='del'>-		device_create_drvdata(istallion_class, NULL,</div><div class='del'>-				      MKDEV(STL_SIOMEMMAJOR, i),</div><div class='del'>-				      NULL, "staliomem%d", i);</div><div class='add'>+		device_create(istallion_class, NULL, MKDEV(STL_SIOMEMMAJOR, i),</div><div class='add'>+			      NULL, "staliomem%d", i);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> err_deinit:</div><div class='head'>diff --git a/drivers/char/keyboard.c b/drivers/char/keyboard.c<br/>index 7b3a212c86b1..de26a978fbdd 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/keyboard.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/char/keyboard.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/keyboard.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/keyboard.c</a></div><div class='hunk'>@@ -1249,7 +1249,7 @@ static void kbd_keycode(unsigned int keycode, int down, int hw_raw)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (keycode &gt; NR_KEYS)</div><div class='add'>+	if (keycode &gt;= NR_KEYS)</div><div class='ctx'> 		if (keycode &gt;= KEY_BRL_DOT1 &amp;&amp; keycode &lt;= KEY_BRL_DOT8)</div><div class='ctx'> 			keysym = K(KT_BRL, keycode - KEY_BRL_DOT1 + 1);</div><div class='ctx'> 		else</div><div class='head'>diff --git a/drivers/char/lp.c b/drivers/char/lp.c<br/>index 3f2719b9f77b..e444c2dba160 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/lp.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/char/lp.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/lp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/lp.c</a></div><div class='hunk'>@@ -813,8 +813,8 @@ static int lp_register(int nr, struct parport *port)</div><div class='ctx'> 	if (reset)</div><div class='ctx'> 		lp_reset(nr);</div><div class='ctx'> </div><div class='del'>-	device_create_drvdata(lp_class, port-&gt;dev, MKDEV(LP_MAJOR, nr), NULL,</div><div class='del'>-			      "lp%d", nr);</div><div class='add'>+	device_create(lp_class, port-&gt;dev, MKDEV(LP_MAJOR, nr), NULL,</div><div class='add'>+		      "lp%d", nr);</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_INFO "lp%d: using %s (%s).\n", nr, port-&gt;name, </div><div class='ctx'> 	       (port-&gt;irq == PARPORT_IRQ_NONE)?"polling":"interrupt-driven");</div><div class='head'>diff --git a/drivers/char/mem.c b/drivers/char/mem.c<br/>index 672b08e694d0..6431f6921a67 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/mem.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/char/mem.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/mem.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/mem.c</a></div><div class='hunk'>@@ -992,9 +992,9 @@ static int __init chr_dev_init(void)</div><div class='ctx'> </div><div class='ctx'> 	mem_class = class_create(THIS_MODULE, "mem");</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(devlist); i++)</div><div class='del'>-		device_create_drvdata(mem_class, NULL,</div><div class='del'>-				      MKDEV(MEM_MAJOR, devlist[i].minor),</div><div class='del'>-				      NULL, devlist[i].name);</div><div class='add'>+		device_create(mem_class, NULL,</div><div class='add'>+			      MKDEV(MEM_MAJOR, devlist[i].minor), NULL,</div><div class='add'>+			      devlist[i].name);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/char/misc.c b/drivers/char/misc.c<br/>index 999aa779c08a..a5e0db9d7662 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/misc.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/char/misc.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/misc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/misc.c</a></div><div class='hunk'>@@ -217,8 +217,8 @@ int misc_register(struct miscdevice * misc)</div><div class='ctx'> 		misc_minors[misc-&gt;minor &gt;&gt; 3] |= 1 &lt;&lt; (misc-&gt;minor &amp; 7);</div><div class='ctx'> 	dev = MKDEV(MISC_MAJOR, misc-&gt;minor);</div><div class='ctx'> </div><div class='del'>-	misc-&gt;this_device = device_create_drvdata(misc_class, misc-&gt;parent,</div><div class='del'>-						  dev, NULL, "%s", misc-&gt;name);</div><div class='add'>+	misc-&gt;this_device = device_create(misc_class, misc-&gt;parent, dev, NULL,</div><div class='add'>+					  "%s", misc-&gt;name);</div><div class='ctx'> 	if (IS_ERR(misc-&gt;this_device)) {</div><div class='ctx'> 		err = PTR_ERR(misc-&gt;this_device);</div><div class='ctx'> 		goto out;</div><div class='head'>diff --git a/drivers/char/moxa.c b/drivers/char/moxa.c<br/>index d3d7864e0c1e..12d327a2c9ba 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/moxa.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/char/moxa.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/moxa.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/moxa.c</a></div><div class='hunk'>@@ -205,7 +205,7 @@ static int moxa_tiocmset(struct tty_struct *tty, struct file *file,</div><div class='ctx'> static void moxa_poll(unsigned long);</div><div class='ctx'> static void moxa_set_tty_param(struct tty_struct *, struct ktermios *);</div><div class='ctx'> static void moxa_setup_empty_event(struct tty_struct *);</div><div class='del'>-static void moxa_shut_down(struct moxa_port *);</div><div class='add'>+static void moxa_shut_down(struct tty_struct *);</div><div class='ctx'> /*</div><div class='ctx'>  * moxa board interface functions:</div><div class='ctx'>  */</div><div class='hunk'>@@ -217,7 +217,7 @@ static void MoxaPortLineCtrl(struct moxa_port *, int, int);</div><div class='ctx'> static void MoxaPortFlowCtrl(struct moxa_port *, int, int, int, int, int);</div><div class='ctx'> static int MoxaPortLineStatus(struct moxa_port *);</div><div class='ctx'> static void MoxaPortFlushData(struct moxa_port *, int);</div><div class='del'>-static int MoxaPortWriteData(struct moxa_port *, const unsigned char *, int);</div><div class='add'>+static int MoxaPortWriteData(struct tty_struct *, const unsigned char *, int);</div><div class='ctx'> static int MoxaPortReadData(struct moxa_port *);</div><div class='ctx'> static int MoxaPortTxQueue(struct moxa_port *);</div><div class='ctx'> static int MoxaPortRxQueue(struct moxa_port *);</div><div class='hunk'>@@ -332,6 +332,7 @@ static int moxa_ioctl(struct tty_struct *tty, struct file *file,</div><div class='ctx'> 		for (i = 0; i &lt; MAX_BOARDS; i++) {</div><div class='ctx'> 			p = moxa_boards[i].ports;</div><div class='ctx'> 			for (j = 0; j &lt; MAX_PORTS_PER_BOARD; j++, p++, argm++) {</div><div class='add'>+				struct tty_struct *ttyp;</div><div class='ctx'> 				memset(&amp;tmp, 0, sizeof(tmp));</div><div class='ctx'> 				if (!moxa_boards[i].ready)</div><div class='ctx'> 					goto copy;</div><div class='hunk'>@@ -344,10 +345,12 @@ static int moxa_ioctl(struct tty_struct *tty, struct file *file,</div><div class='ctx'> 				if (status &amp; 4)</div><div class='ctx'> 					tmp.dcd = 1;</div><div class='ctx'> </div><div class='del'>-				if (!p-&gt;port.tty || !p-&gt;port.tty-&gt;termios)</div><div class='add'>+				ttyp = tty_port_tty_get(&amp;p-&gt;port);</div><div class='add'>+				if (!ttyp || !ttyp-&gt;termios)</div><div class='ctx'> 					tmp.cflag = p-&gt;cflag;</div><div class='ctx'> 				else</div><div class='del'>-					tmp.cflag = p-&gt;port.tty-&gt;termios-&gt;c_cflag;</div><div class='add'>+					tmp.cflag = ttyp-&gt;termios-&gt;c_cflag;</div><div class='add'>+				tty_kref_put(tty);</div><div class='ctx'> copy:</div><div class='ctx'> 				if (copy_to_user(argm, &amp;tmp, sizeof(tmp))) {</div><div class='ctx'> 					mutex_unlock(&amp;moxa_openlock);</div><div class='hunk'>@@ -510,7 +513,7 @@ static int moxa_real_load_code(struct moxa_board_conf *brd, const void *ptr,</div><div class='ctx'> 		size_t len)</div><div class='ctx'> {</div><div class='ctx'> 	void __iomem *baseAddr = brd-&gt;basemem;</div><div class='del'>-	const u16 *uptr = ptr;</div><div class='add'>+	const __le16 *uptr = ptr;</div><div class='ctx'> 	size_t wlen, len2, j;</div><div class='ctx'> 	unsigned long key, loadbuf, loadlen, checksum, checksum_ok;</div><div class='ctx'> 	unsigned int i, retry;</div><div class='hunk'>@@ -880,8 +883,14 @@ static void moxa_board_deinit(struct moxa_board_conf *brd)</div><div class='ctx'> </div><div class='ctx'> 	/* pci hot-un-plug support */</div><div class='ctx'> 	for (a = 0; a &lt; brd-&gt;numPorts; a++)</div><div class='del'>-		if (brd-&gt;ports[a].port.flags &amp; ASYNC_INITIALIZED)</div><div class='del'>-			tty_hangup(brd-&gt;ports[a].port.tty);</div><div class='add'>+		if (brd-&gt;ports[a].port.flags &amp; ASYNC_INITIALIZED) {</div><div class='add'>+			struct tty_struct *tty = tty_port_tty_get(</div><div class='add'>+						&amp;brd-&gt;ports[a].port);</div><div class='add'>+			if (tty) {</div><div class='add'>+				tty_hangup(tty);</div><div class='add'>+				tty_kref_put(tty);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> 	while (1) {</div><div class='ctx'> 		opened = 0;</div><div class='ctx'> 		for (a = 0; a &lt; brd-&gt;numPorts; a++)</div><div class='hunk'>@@ -1096,13 +1105,14 @@ static void __exit moxa_exit(void)</div><div class='ctx'> module_init(moxa_init);</div><div class='ctx'> module_exit(moxa_exit);</div><div class='ctx'> </div><div class='del'>-static void moxa_close_port(struct moxa_port *ch)</div><div class='add'>+static void moxa_close_port(struct tty_struct *tty)</div><div class='ctx'> {</div><div class='del'>-	moxa_shut_down(ch);</div><div class='add'>+	struct moxa_port *ch = tty-&gt;driver_data;</div><div class='add'>+	moxa_shut_down(tty);</div><div class='ctx'> 	MoxaPortFlushData(ch, 2);</div><div class='ctx'> 	ch-&gt;port.flags &amp;= ~ASYNC_NORMAL_ACTIVE;</div><div class='del'>-	ch-&gt;port.tty-&gt;driver_data = NULL;</div><div class='del'>-	ch-&gt;port.tty = NULL;</div><div class='add'>+	tty-&gt;driver_data = NULL;</div><div class='add'>+	tty_port_tty_set(&amp;ch-&gt;port, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int moxa_block_till_ready(struct tty_struct *tty, struct file *filp,</div><div class='hunk'>@@ -1161,7 +1171,7 @@ static int moxa_open(struct tty_struct *tty, struct file *filp)</div><div class='ctx'> 	ch = &amp;brd-&gt;ports[port % MAX_PORTS_PER_BOARD];</div><div class='ctx'> 	ch-&gt;port.count++;</div><div class='ctx'> 	tty-&gt;driver_data = ch;</div><div class='del'>-	ch-&gt;port.tty = tty;</div><div class='add'>+	tty_port_tty_set(&amp;ch-&gt;port, tty);</div><div class='ctx'> 	if (!(ch-&gt;port.flags &amp; ASYNC_INITIALIZED)) {</div><div class='ctx'> 		ch-&gt;statusflags = 0;</div><div class='ctx'> 		moxa_set_tty_param(tty, tty-&gt;termios);</div><div class='hunk'>@@ -1179,7 +1189,7 @@ static int moxa_open(struct tty_struct *tty, struct file *filp)</div><div class='ctx'> 	if (retval) {</div><div class='ctx'> 		if (ch-&gt;port.count) /* 0 means already hung up... */</div><div class='ctx'> 			if (--ch-&gt;port.count == 0)</div><div class='del'>-				moxa_close_port(ch);</div><div class='add'>+				moxa_close_port(tty);</div><div class='ctx'> 	} else</div><div class='ctx'> 		ch-&gt;port.flags |= ASYNC_NORMAL_ACTIVE;</div><div class='ctx'> 	mutex_unlock(&amp;moxa_openlock);</div><div class='hunk'>@@ -1219,7 +1229,7 @@ static void moxa_close(struct tty_struct *tty, struct file *filp)</div><div class='ctx'> 		tty_wait_until_sent(tty, 30 * HZ);	/* 30 seconds timeout */</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	moxa_close_port(ch);</div><div class='add'>+	moxa_close_port(tty);</div><div class='ctx'> unlock:</div><div class='ctx'> 	mutex_unlock(&amp;moxa_openlock);</div><div class='ctx'> }</div><div class='hunk'>@@ -1234,7 +1244,7 @@ static int moxa_write(struct tty_struct *tty,</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;moxa_lock);</div><div class='del'>-	len = MoxaPortWriteData(ch, buf, count);</div><div class='add'>+	len = MoxaPortWriteData(tty, buf, count);</div><div class='ctx'> 	spin_unlock_bh(&amp;moxa_lock);</div><div class='ctx'> </div><div class='ctx'> 	ch-&gt;statusflags |= LOWWAIT;</div><div class='hunk'>@@ -1409,7 +1419,7 @@ static void moxa_hangup(struct tty_struct *tty)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	ch-&gt;port.count = 0;</div><div class='del'>-	moxa_close_port(ch);</div><div class='add'>+	moxa_close_port(tty);</div><div class='ctx'> 	mutex_unlock(&amp;moxa_openlock);</div><div class='ctx'> </div><div class='ctx'> 	wake_up_interruptible(&amp;ch-&gt;port.open_wait);</div><div class='hunk'>@@ -1417,11 +1427,14 @@ static void moxa_hangup(struct tty_struct *tty)</div><div class='ctx'> </div><div class='ctx'> static void moxa_new_dcdstate(struct moxa_port *p, u8 dcd)</div><div class='ctx'> {</div><div class='add'>+	struct tty_struct *tty;</div><div class='ctx'> 	dcd = !!dcd;</div><div class='ctx'> </div><div class='del'>-	if (dcd != p-&gt;DCDState &amp;&amp; p-&gt;port.tty &amp;&amp; C_CLOCAL(p-&gt;port.tty)) {</div><div class='del'>-		if (!dcd)</div><div class='del'>-			tty_hangup(p-&gt;port.tty);</div><div class='add'>+	if (dcd != p-&gt;DCDState) {</div><div class='add'>+		tty = tty_port_tty_get(&amp;p-&gt;port);</div><div class='add'>+		if (tty &amp;&amp; C_CLOCAL(tty) &amp;&amp; !dcd)</div><div class='add'>+			tty_hangup(tty);</div><div class='add'>+		tty_kref_put(tty);</div><div class='ctx'> 	}</div><div class='ctx'> 	p-&gt;DCDState = dcd;</div><div class='ctx'> }</div><div class='hunk'>@@ -1429,7 +1442,7 @@ static void moxa_new_dcdstate(struct moxa_port *p, u8 dcd)</div><div class='ctx'> static int moxa_poll_port(struct moxa_port *p, unsigned int handle,</div><div class='ctx'> 		u16 __iomem *ip)</div><div class='ctx'> {</div><div class='del'>-	struct tty_struct *tty = p-&gt;port.tty;</div><div class='add'>+	struct tty_struct *tty = tty_port_tty_get(&amp;p-&gt;port);</div><div class='ctx'> 	void __iomem *ofsAddr;</div><div class='ctx'> 	unsigned int inited = p-&gt;port.flags &amp; ASYNC_INITIALIZED;</div><div class='ctx'> 	u16 intr;</div><div class='hunk'>@@ -1476,6 +1489,7 @@ static int moxa_poll_port(struct moxa_port *p, unsigned int handle,</div><div class='ctx'> 		tty_insert_flip_char(tty, 0, TTY_BREAK);</div><div class='ctx'> 		tty_schedule_flip(tty);</div><div class='ctx'> 	}</div><div class='add'>+	tty_kref_put(tty);</div><div class='ctx'> </div><div class='ctx'> 	if (intr &amp; IntrLine)</div><div class='ctx'> 		moxa_new_dcdstate(p, readb(ofsAddr + FlagStat) &amp; DCD_state);</div><div class='hunk'>@@ -1560,9 +1574,9 @@ static void moxa_setup_empty_event(struct tty_struct *tty)</div><div class='ctx'> 	spin_unlock_bh(&amp;moxa_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void moxa_shut_down(struct moxa_port *ch)</div><div class='add'>+static void moxa_shut_down(struct tty_struct *tty)</div><div class='ctx'> {</div><div class='del'>-	struct tty_struct *tp = ch-&gt;port.tty;</div><div class='add'>+	struct moxa_port *ch = tty-&gt;driver_data;</div><div class='ctx'> </div><div class='ctx'> 	if (!(ch-&gt;port.flags &amp; ASYNC_INITIALIZED))</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -1572,7 +1586,7 @@ static void moxa_shut_down(struct moxa_port *ch)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If we're a modem control device and HUPCL is on, drop RTS &amp; DTR.</div><div class='ctx'> 	 */</div><div class='del'>-	if (C_HUPCL(tp))</div><div class='add'>+	if (C_HUPCL(tty))</div><div class='ctx'> 		MoxaPortLineCtrl(ch, 0, 0);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;moxa_lock);</div><div class='hunk'>@@ -1953,9 +1967,10 @@ static int MoxaPortLineStatus(struct moxa_port *port)</div><div class='ctx'> 	return val;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int MoxaPortWriteData(struct moxa_port *port,</div><div class='add'>+static int MoxaPortWriteData(struct tty_struct *tty,</div><div class='ctx'> 		const unsigned char *buffer, int len)</div><div class='ctx'> {</div><div class='add'>+	struct moxa_port *port = tty-&gt;driver_data;</div><div class='ctx'> 	void __iomem *baseAddr, *ofsAddr, *ofs;</div><div class='ctx'> 	unsigned int c, total;</div><div class='ctx'> 	u16 head, tail, tx_mask, spage, epage;</div><div class='head'>diff --git a/drivers/char/mxser.c b/drivers/char/mxser.c<br/>index b638403e8e9c..8beef50f95a0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/mxser.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/char/mxser.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/mxser.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/mxser.c</a></div><div class='hunk'>@@ -610,15 +610,13 @@ static int mxser_block_til_ready(struct tty_struct *tty, struct file *filp,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mxser_set_baud(struct mxser_port *info, long newspd)</div><div class='add'>+static int mxser_set_baud(struct tty_struct *tty, long newspd)</div><div class='ctx'> {</div><div class='add'>+	struct mxser_port *info = tty-&gt;driver_data;</div><div class='ctx'> 	int quot = 0, baud;</div><div class='ctx'> 	unsigned char cval;</div><div class='ctx'> </div><div class='del'>-	if (!info-&gt;port.tty || !info-&gt;port.tty-&gt;termios)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	if (!(info-&gt;ioaddr))</div><div class='add'>+	if (!info-&gt;ioaddr)</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='ctx'> 	if (newspd &gt; info-&gt;max_baud)</div><div class='hunk'>@@ -626,13 +624,13 @@ static int mxser_set_baud(struct mxser_port *info, long newspd)</div><div class='ctx'> </div><div class='ctx'> 	if (newspd == 134) {</div><div class='ctx'> 		quot = 2 * info-&gt;baud_base / 269;</div><div class='del'>-		tty_encode_baud_rate(info-&gt;port.tty, 134, 134);</div><div class='add'>+		tty_encode_baud_rate(tty, 134, 134);</div><div class='ctx'> 	} else if (newspd) {</div><div class='ctx'> 		quot = info-&gt;baud_base / newspd;</div><div class='ctx'> 		if (quot == 0)</div><div class='ctx'> 			quot = 1;</div><div class='ctx'> 		baud = info-&gt;baud_base/quot;</div><div class='del'>-		tty_encode_baud_rate(info-&gt;port.tty, baud, baud);</div><div class='add'>+		tty_encode_baud_rate(tty, baud, baud);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		quot = 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -658,7 +656,7 @@ static int mxser_set_baud(struct mxser_port *info, long newspd)</div><div class='ctx'> 	outb(cval, info-&gt;ioaddr + UART_LCR);	/* reset DLAB */</div><div class='ctx'> </div><div class='ctx'> #ifdef BOTHER</div><div class='del'>-	if (C_BAUD(info-&gt;port.tty) == BOTHER) {</div><div class='add'>+	if (C_BAUD(tty) == BOTHER) {</div><div class='ctx'> 		quot = info-&gt;baud_base % newspd;</div><div class='ctx'> 		quot *= 8;</div><div class='ctx'> 		if (quot % newspd &gt; newspd / 2) {</div><div class='hunk'>@@ -679,21 +677,20 @@ static int mxser_set_baud(struct mxser_port *info, long newspd)</div><div class='ctx'>  * This routine is called to set the UART divisor registers to match</div><div class='ctx'>  * the specified baud rate for a serial port.</div><div class='ctx'>  */</div><div class='del'>-static int mxser_change_speed(struct mxser_port *info,</div><div class='del'>-		struct ktermios *old_termios)</div><div class='add'>+static int mxser_change_speed(struct tty_struct *tty,</div><div class='add'>+					struct ktermios *old_termios)</div><div class='ctx'> {</div><div class='add'>+	struct mxser_port *info = tty-&gt;driver_data;</div><div class='ctx'> 	unsigned cflag, cval, fcr;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	unsigned char status;</div><div class='ctx'> </div><div class='del'>-	if (!info-&gt;port.tty || !info-&gt;port.tty-&gt;termios)</div><div class='del'>-		return ret;</div><div class='del'>-	cflag = info-&gt;port.tty-&gt;termios-&gt;c_cflag;</div><div class='del'>-	if (!(info-&gt;ioaddr))</div><div class='add'>+	cflag = tty-&gt;termios-&gt;c_cflag;</div><div class='add'>+	if (!info-&gt;ioaddr)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	if (mxser_set_baud_method[info-&gt;port.tty-&gt;index] == 0)</div><div class='del'>-		mxser_set_baud(info, tty_get_baud_rate(info-&gt;port.tty));</div><div class='add'>+	if (mxser_set_baud_method[tty-&gt;index] == 0)</div><div class='add'>+		mxser_set_baud(tty, tty_get_baud_rate(tty));</div><div class='ctx'> </div><div class='ctx'> 	/* byte size and parity */</div><div class='ctx'> 	switch (cflag &amp; CSIZE) {</div><div class='hunk'>@@ -762,9 +759,9 @@ static int mxser_change_speed(struct mxser_port *info,</div><div class='ctx'> 			info-&gt;MCR |= UART_MCR_AFE;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			status = inb(info-&gt;ioaddr + UART_MSR);</div><div class='del'>-			if (info-&gt;port.tty-&gt;hw_stopped) {</div><div class='add'>+			if (tty-&gt;hw_stopped) {</div><div class='ctx'> 				if (status &amp; UART_MSR_CTS) {</div><div class='del'>-					info-&gt;port.tty-&gt;hw_stopped = 0;</div><div class='add'>+					tty-&gt;hw_stopped = 0;</div><div class='ctx'> 					if (info-&gt;type != PORT_16550A &amp;&amp;</div><div class='ctx'> 							!info-&gt;board-&gt;chip_flag) {</div><div class='ctx'> 						outb(info-&gt;IER &amp; ~UART_IER_THRI,</div><div class='hunk'>@@ -774,11 +771,11 @@ static int mxser_change_speed(struct mxser_port *info,</div><div class='ctx'> 						outb(info-&gt;IER, info-&gt;ioaddr +</div><div class='ctx'> 								UART_IER);</div><div class='ctx'> 					}</div><div class='del'>-					tty_wakeup(info-&gt;port.tty);</div><div class='add'>+					tty_wakeup(tty);</div><div class='ctx'> 				}</div><div class='ctx'> 			} else {</div><div class='ctx'> 				if (!(status &amp; UART_MSR_CTS)) {</div><div class='del'>-					info-&gt;port.tty-&gt;hw_stopped = 1;</div><div class='add'>+					tty-&gt;hw_stopped = 1;</div><div class='ctx'> 					if ((info-&gt;type != PORT_16550A) &amp;&amp;</div><div class='ctx'> 							(!info-&gt;board-&gt;chip_flag)) {</div><div class='ctx'> 						info-&gt;IER &amp;= ~UART_IER_THRI;</div><div class='hunk'>@@ -804,21 +801,21 @@ static int mxser_change_speed(struct mxser_port *info,</div><div class='ctx'> 	 * Set up parity check flag</div><div class='ctx'> 	 */</div><div class='ctx'> 	info-&gt;read_status_mask = UART_LSR_OE | UART_LSR_THRE | UART_LSR_DR;</div><div class='del'>-	if (I_INPCK(info-&gt;port.tty))</div><div class='add'>+	if (I_INPCK(tty))</div><div class='ctx'> 		info-&gt;read_status_mask |= UART_LSR_FE | UART_LSR_PE;</div><div class='del'>-	if (I_BRKINT(info-&gt;port.tty) || I_PARMRK(info-&gt;port.tty))</div><div class='add'>+	if (I_BRKINT(tty) || I_PARMRK(tty))</div><div class='ctx'> 		info-&gt;read_status_mask |= UART_LSR_BI;</div><div class='ctx'> </div><div class='ctx'> 	info-&gt;ignore_status_mask = 0;</div><div class='ctx'> </div><div class='del'>-	if (I_IGNBRK(info-&gt;port.tty)) {</div><div class='add'>+	if (I_IGNBRK(tty)) {</div><div class='ctx'> 		info-&gt;ignore_status_mask |= UART_LSR_BI;</div><div class='ctx'> 		info-&gt;read_status_mask |= UART_LSR_BI;</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * If we're ignore parity and break indicators, ignore</div><div class='ctx'> 		 * overruns too.  (For real raw support).</div><div class='ctx'> 		 */</div><div class='del'>-		if (I_IGNPAR(info-&gt;port.tty)) {</div><div class='add'>+		if (I_IGNPAR(tty)) {</div><div class='ctx'> 			info-&gt;ignore_status_mask |=</div><div class='ctx'> 						UART_LSR_OE |</div><div class='ctx'> 						UART_LSR_PE |</div><div class='hunk'>@@ -830,16 +827,16 @@ static int mxser_change_speed(struct mxser_port *info,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	if (info-&gt;board-&gt;chip_flag) {</div><div class='del'>-		mxser_set_must_xon1_value(info-&gt;ioaddr, START_CHAR(info-&gt;port.tty));</div><div class='del'>-		mxser_set_must_xoff1_value(info-&gt;ioaddr, STOP_CHAR(info-&gt;port.tty));</div><div class='del'>-		if (I_IXON(info-&gt;port.tty)) {</div><div class='add'>+		mxser_set_must_xon1_value(info-&gt;ioaddr, START_CHAR(tty));</div><div class='add'>+		mxser_set_must_xoff1_value(info-&gt;ioaddr, STOP_CHAR(tty));</div><div class='add'>+		if (I_IXON(tty)) {</div><div class='ctx'> 			mxser_enable_must_rx_software_flow_control(</div><div class='ctx'> 					info-&gt;ioaddr);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			mxser_disable_must_rx_software_flow_control(</div><div class='ctx'> 					info-&gt;ioaddr);</div><div class='ctx'> 		}</div><div class='del'>-		if (I_IXOFF(info-&gt;port.tty)) {</div><div class='add'>+		if (I_IXOFF(tty)) {</div><div class='ctx'> 			mxser_enable_must_tx_software_flow_control(</div><div class='ctx'> 					info-&gt;ioaddr);</div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -855,7 +852,8 @@ static int mxser_change_speed(struct mxser_port *info,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mxser_check_modem_status(struct mxser_port *port, int status)</div><div class='add'>+static void mxser_check_modem_status(struct tty_struct *tty,</div><div class='add'>+				struct mxser_port *port, int status)</div><div class='ctx'> {</div><div class='ctx'> 	/* update input line counters */</div><div class='ctx'> 	if (status &amp; UART_MSR_TERI)</div><div class='hunk'>@@ -874,10 +872,11 @@ static void mxser_check_modem_status(struct mxser_port *port, int status)</div><div class='ctx'> 			wake_up_interruptible(&amp;port-&gt;port.open_wait);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	tty = tty_port_tty_get(&amp;port-&gt;port);</div><div class='ctx'> 	if (port-&gt;port.flags &amp; ASYNC_CTS_FLOW) {</div><div class='del'>-		if (port-&gt;port.tty-&gt;hw_stopped) {</div><div class='add'>+		if (tty-&gt;hw_stopped) {</div><div class='ctx'> 			if (status &amp; UART_MSR_CTS) {</div><div class='del'>-				port-&gt;port.tty-&gt;hw_stopped = 0;</div><div class='add'>+				tty-&gt;hw_stopped = 0;</div><div class='ctx'> </div><div class='ctx'> 				if ((port-&gt;type != PORT_16550A) &amp;&amp;</div><div class='ctx'> 						(!port-&gt;board-&gt;chip_flag)) {</div><div class='hunk'>@@ -887,11 +886,11 @@ static void mxser_check_modem_status(struct mxser_port *port, int status)</div><div class='ctx'> 					outb(port-&gt;IER, port-&gt;ioaddr +</div><div class='ctx'> 							UART_IER);</div><div class='ctx'> 				}</div><div class='del'>-				tty_wakeup(port-&gt;port.tty);</div><div class='add'>+				tty_wakeup(tty);</div><div class='ctx'> 			}</div><div class='ctx'> 		} else {</div><div class='ctx'> 			if (!(status &amp; UART_MSR_CTS)) {</div><div class='del'>-				port-&gt;port.tty-&gt;hw_stopped = 1;</div><div class='add'>+				tty-&gt;hw_stopped = 1;</div><div class='ctx'> 				if (port-&gt;type != PORT_16550A &amp;&amp;</div><div class='ctx'> 						!port-&gt;board-&gt;chip_flag) {</div><div class='ctx'> 					port-&gt;IER &amp;= ~UART_IER_THRI;</div><div class='hunk'>@@ -903,8 +902,9 @@ static void mxser_check_modem_status(struct mxser_port *port, int status)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mxser_startup(struct mxser_port *info)</div><div class='add'>+static int mxser_startup(struct tty_struct *tty)</div><div class='ctx'> {</div><div class='add'>+	struct mxser_port *info = tty-&gt;driver_data;</div><div class='ctx'> 	unsigned long page;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='hunk'>@@ -921,8 +921,7 @@ static int mxser_startup(struct mxser_port *info)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!info-&gt;ioaddr || !info-&gt;type) {</div><div class='del'>-		if (info-&gt;port.tty)</div><div class='del'>-			set_bit(TTY_IO_ERROR, &amp;info-&gt;port.tty-&gt;flags);</div><div class='add'>+		set_bit(TTY_IO_ERROR, &amp;tty-&gt;flags);</div><div class='ctx'> 		free_page(page);</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;info-&gt;slock, flags);</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -952,8 +951,8 @@ static int mxser_startup(struct mxser_port *info)</div><div class='ctx'> 	if (inb(info-&gt;ioaddr + UART_LSR) == 0xff) {</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;info-&gt;slock, flags);</div><div class='ctx'> 		if (capable(CAP_SYS_ADMIN)) {</div><div class='del'>-			if (info-&gt;port.tty)</div><div class='del'>-				set_bit(TTY_IO_ERROR, &amp;info-&gt;port.tty-&gt;flags);</div><div class='add'>+			if (tty)</div><div class='add'>+				set_bit(TTY_IO_ERROR, &amp;tty-&gt;flags);</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		} else</div><div class='ctx'> 			return -ENODEV;</div><div class='hunk'>@@ -991,14 +990,13 @@ static int mxser_startup(struct mxser_port *info)</div><div class='ctx'> 	(void) inb(info-&gt;ioaddr + UART_IIR);</div><div class='ctx'> 	(void) inb(info-&gt;ioaddr + UART_MSR);</div><div class='ctx'> </div><div class='del'>-	if (info-&gt;port.tty)</div><div class='del'>-		clear_bit(TTY_IO_ERROR, &amp;info-&gt;port.tty-&gt;flags);</div><div class='add'>+	clear_bit(TTY_IO_ERROR, &amp;tty-&gt;flags);</div><div class='ctx'> 	info-&gt;xmit_cnt = info-&gt;xmit_head = info-&gt;xmit_tail = 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * and set the speed of the serial port</div><div class='ctx'> 	 */</div><div class='del'>-	mxser_change_speed(info, NULL);</div><div class='add'>+	mxser_change_speed(tty, NULL);</div><div class='ctx'> 	info-&gt;port.flags |= ASYNC_INITIALIZED;</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;info-&gt;slock, flags);</div><div class='ctx'> </div><div class='hunk'>@@ -1009,8 +1007,9 @@ static int mxser_startup(struct mxser_port *info)</div><div class='ctx'>  * This routine will shutdown a serial port; interrupts maybe disabled, and</div><div class='ctx'>  * DTR is dropped if the hangup on close termio flag is on.</div><div class='ctx'>  */</div><div class='del'>-static void mxser_shutdown(struct mxser_port *info)</div><div class='add'>+static void mxser_shutdown(struct tty_struct *tty)</div><div class='ctx'> {</div><div class='add'>+	struct mxser_port *info = tty-&gt;driver_data;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	if (!(info-&gt;port.flags &amp; ASYNC_INITIALIZED))</div><div class='hunk'>@@ -1035,7 +1034,7 @@ static void mxser_shutdown(struct mxser_port *info)</div><div class='ctx'> 	info-&gt;IER = 0;</div><div class='ctx'> 	outb(0x00, info-&gt;ioaddr + UART_IER);</div><div class='ctx'> </div><div class='del'>-	if (!info-&gt;port.tty || (info-&gt;port.tty-&gt;termios-&gt;c_cflag &amp; HUPCL))</div><div class='add'>+	if (tty-&gt;termios-&gt;c_cflag &amp; HUPCL)</div><div class='ctx'> 		info-&gt;MCR &amp;= ~(UART_MCR_DTR | UART_MCR_RTS);</div><div class='ctx'> 	outb(info-&gt;MCR, info-&gt;ioaddr + UART_MCR);</div><div class='ctx'> </div><div class='hunk'>@@ -1051,8 +1050,7 @@ static void mxser_shutdown(struct mxser_port *info)</div><div class='ctx'> 	/* read data port to reset things */</div><div class='ctx'> 	(void) inb(info-&gt;ioaddr + UART_RX);</div><div class='ctx'> </div><div class='del'>-	if (info-&gt;port.tty)</div><div class='del'>-		set_bit(TTY_IO_ERROR, &amp;info-&gt;port.tty-&gt;flags);</div><div class='add'>+	set_bit(TTY_IO_ERROR, &amp;tty-&gt;flags);</div><div class='ctx'> </div><div class='ctx'> 	info-&gt;port.flags &amp;= ~ASYNC_INITIALIZED;</div><div class='ctx'> </div><div class='hunk'>@@ -1084,14 +1082,14 @@ static int mxser_open(struct tty_struct *tty, struct file *filp)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	tty-&gt;driver_data = info;</div><div class='del'>-	info-&gt;port.tty = tty;</div><div class='add'>+	tty_port_tty_set(&amp;info-&gt;port, tty);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Start up serial port</div><div class='ctx'> 	 */</div><div class='ctx'> 	spin_lock_irqsave(&amp;info-&gt;slock, flags);</div><div class='ctx'> 	info-&gt;port.count++;</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;info-&gt;slock, flags);</div><div class='del'>-	retval = mxser_startup(info);</div><div class='add'>+	retval = mxser_startup(tty);</div><div class='ctx'> 	if (retval)</div><div class='ctx'> 		return retval;</div><div class='ctx'> </div><div class='hunk'>@@ -1209,13 +1207,13 @@ static void mxser_close(struct tty_struct *tty, struct file *filp)</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	mxser_shutdown(info);</div><div class='add'>+	mxser_shutdown(tty);</div><div class='ctx'> </div><div class='ctx'> 	mxser_flush_buffer(tty);</div><div class='ctx'> 	tty_ldisc_flush(tty);</div><div class='ctx'> </div><div class='ctx'> 	tty-&gt;closing = 0;</div><div class='del'>-	info-&gt;port.tty = NULL;</div><div class='add'>+	tty_port_tty_set(&amp;info-&gt;port, NULL);</div><div class='ctx'> 	if (info-&gt;port.blocked_open) {</div><div class='ctx'> 		if (info-&gt;port.close_delay)</div><div class='ctx'> 			schedule_timeout_interruptible(info-&gt;port.close_delay);</div><div class='hunk'>@@ -1337,12 +1335,13 @@ static int mxser_chars_in_buffer(struct tty_struct *tty)</div><div class='ctx'>  * friends of mxser_ioctl()</div><div class='ctx'>  * ------------------------------------------------------------</div><div class='ctx'>  */</div><div class='del'>-static int mxser_get_serial_info(struct mxser_port *info,</div><div class='add'>+static int mxser_get_serial_info(struct tty_struct *tty,</div><div class='ctx'> 		struct serial_struct __user *retinfo)</div><div class='ctx'> {</div><div class='add'>+	struct mxser_port *info = tty-&gt;driver_data;</div><div class='ctx'> 	struct serial_struct tmp = {</div><div class='ctx'> 		.type = info-&gt;type,</div><div class='del'>-		.line = info-&gt;port.tty-&gt;index,</div><div class='add'>+		.line = tty-&gt;index,</div><div class='ctx'> 		.port = info-&gt;ioaddr,</div><div class='ctx'> 		.irq = info-&gt;board-&gt;irq,</div><div class='ctx'> 		.flags = info-&gt;port.flags,</div><div class='hunk'>@@ -1357,9 +1356,10 @@ static int mxser_get_serial_info(struct mxser_port *info,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mxser_set_serial_info(struct mxser_port *info,</div><div class='add'>+static int mxser_set_serial_info(struct tty_struct *tty,</div><div class='ctx'> 		struct serial_struct __user *new_info)</div><div class='ctx'> {</div><div class='add'>+	struct mxser_port *info = tty-&gt;driver_data;</div><div class='ctx'> 	struct serial_struct new_serial;</div><div class='ctx'> 	speed_t baud;</div><div class='ctx'> 	unsigned long sl_flags;</div><div class='hunk'>@@ -1393,14 +1393,14 @@ static int mxser_set_serial_info(struct mxser_port *info,</div><div class='ctx'> 				(new_serial.flags &amp; ASYNC_FLAGS));</div><div class='ctx'> 		info-&gt;port.close_delay = new_serial.close_delay * HZ / 100;</div><div class='ctx'> 		info-&gt;port.closing_wait = new_serial.closing_wait * HZ / 100;</div><div class='del'>-		info-&gt;port.tty-&gt;low_latency =</div><div class='del'>-				(info-&gt;port.flags &amp; ASYNC_LOW_LATENCY) ? 1 : 0;</div><div class='add'>+		tty-&gt;low_latency = (info-&gt;port.flags &amp; ASYNC_LOW_LATENCY)</div><div class='add'>+								? 1 : 0;</div><div class='ctx'> 		if ((info-&gt;port.flags &amp; ASYNC_SPD_MASK) == ASYNC_SPD_CUST &amp;&amp;</div><div class='ctx'> 				(new_serial.baud_base != info-&gt;baud_base ||</div><div class='ctx'> 				new_serial.custom_divisor !=</div><div class='ctx'> 				info-&gt;custom_divisor)) {</div><div class='ctx'> 			baud = new_serial.baud_base / new_serial.custom_divisor;</div><div class='del'>-			tty_encode_baud_rate(info-&gt;port.tty, baud, baud);</div><div class='add'>+			tty_encode_baud_rate(tty, baud, baud);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1411,11 +1411,11 @@ static int mxser_set_serial_info(struct mxser_port *info,</div><div class='ctx'> 	if (info-&gt;port.flags &amp; ASYNC_INITIALIZED) {</div><div class='ctx'> 		if (flags != (info-&gt;port.flags &amp; ASYNC_SPD_MASK)) {</div><div class='ctx'> 			spin_lock_irqsave(&amp;info-&gt;slock, sl_flags);</div><div class='del'>-			mxser_change_speed(info, NULL);</div><div class='add'>+			mxser_change_speed(tty, NULL);</div><div class='ctx'> 			spin_unlock_irqrestore(&amp;info-&gt;slock, sl_flags);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else</div><div class='del'>-		retval = mxser_startup(info);</div><div class='add'>+		retval = mxser_startup(tty);</div><div class='ctx'> </div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='hunk'>@@ -1461,7 +1461,7 @@ static int mxser_tiocmget(struct tty_struct *tty, struct file *file)</div><div class='ctx'> 	spin_lock_irqsave(&amp;info-&gt;slock, flags);</div><div class='ctx'> 	status = inb(info-&gt;ioaddr + UART_MSR);</div><div class='ctx'> 	if (status &amp; UART_MSR_ANY_DELTA)</div><div class='del'>-		mxser_check_modem_status(info, status);</div><div class='add'>+		mxser_check_modem_status(tty, info, status);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;info-&gt;slock, flags);</div><div class='ctx'> 	return ((control &amp; UART_MCR_RTS) ? TIOCM_RTS : 0) |</div><div class='ctx'> 		    ((control &amp; UART_MCR_DTR) ? TIOCM_DTR : 0) |</div><div class='hunk'>@@ -1606,6 +1606,7 @@ static int __init mxser_read_register(int port, unsigned short *regs)</div><div class='ctx'> static int mxser_ioctl_special(unsigned int cmd, void __user *argp)</div><div class='ctx'> {</div><div class='ctx'> 	struct mxser_port *port;</div><div class='add'>+	struct tty_struct *tty;</div><div class='ctx'> 	int result, status;</div><div class='ctx'> 	unsigned int i, j;</div><div class='ctx'> 	int ret = 0;</div><div class='hunk'>@@ -1643,12 +1644,14 @@ static int mxser_ioctl_special(unsigned int cmd, void __user *argp)</div><div class='ctx'> </div><div class='ctx'> 				if (!port-&gt;ioaddr)</div><div class='ctx'> 					goto copy;</div><div class='add'>+				</div><div class='add'>+				tty = tty_port_tty_get(&amp;port-&gt;port);</div><div class='ctx'> </div><div class='del'>-				if (!port-&gt;port.tty || !port-&gt;port.tty-&gt;termios)</div><div class='add'>+				if (!tty || !tty-&gt;termios)</div><div class='ctx'> 					ms.cflag = port-&gt;normal_termios.c_cflag;</div><div class='ctx'> 				else</div><div class='del'>-					ms.cflag = port-&gt;port.tty-&gt;termios-&gt;c_cflag;</div><div class='del'>-</div><div class='add'>+					ms.cflag = tty-&gt;termios-&gt;c_cflag;</div><div class='add'>+				tty_kref_put(tty);</div><div class='ctx'> 				status = inb(port-&gt;ioaddr + UART_MSR);</div><div class='ctx'> 				if (status &amp; UART_MSR_DCD)</div><div class='ctx'> 					ms.dcd = 1;</div><div class='hunk'>@@ -1704,15 +1707,18 @@ static int mxser_ioctl_special(unsigned int cmd, void __user *argp)</div><div class='ctx'> 				me-&gt;up_txcnt[p] = port-&gt;mon_data.up_txcnt;</div><div class='ctx'> 				me-&gt;modem_status[p] =</div><div class='ctx'> 					port-&gt;mon_data.modem_status;</div><div class='del'>-				me-&gt;baudrate[p] = tty_get_baud_rate(port-&gt;port.tty);</div><div class='add'>+				tty = tty_port_tty_get(&amp;port-&gt;port);</div><div class='ctx'> </div><div class='del'>-				if (!port-&gt;port.tty || !port-&gt;port.tty-&gt;termios) {</div><div class='add'>+				if (!tty || !tty-&gt;termios) {</div><div class='ctx'> 					cflag = port-&gt;normal_termios.c_cflag;</div><div class='ctx'> 					iflag = port-&gt;normal_termios.c_iflag;</div><div class='add'>+					me-&gt;baudrate[p] = tty_termios_baud_rate(&amp;port-&gt;normal_termios);</div><div class='ctx'> 				} else {</div><div class='del'>-					cflag = port-&gt;port.tty-&gt;termios-&gt;c_cflag;</div><div class='del'>-					iflag = port-&gt;port.tty-&gt;termios-&gt;c_iflag;</div><div class='add'>+					cflag = tty-&gt;termios-&gt;c_cflag;</div><div class='add'>+					iflag = tty-&gt;termios-&gt;c_iflag;</div><div class='add'>+					me-&gt;baudrate[p] = tty_get_baud_rate(tty);</div><div class='ctx'> 				}</div><div class='add'>+				tty_kref_put(tty);</div><div class='ctx'> </div><div class='ctx'> 				me-&gt;databits[p] = cflag &amp; CSIZE;</div><div class='ctx'> 				me-&gt;stopbits[p] = cflag &amp; CSTOPB;</div><div class='hunk'>@@ -1822,12 +1828,12 @@ static int mxser_ioctl(struct tty_struct *tty, struct file *file,</div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case TIOCGSERIAL:</div><div class='ctx'> 		lock_kernel();</div><div class='del'>-		retval = mxser_get_serial_info(info, argp);</div><div class='add'>+		retval = mxser_get_serial_info(tty, argp);</div><div class='ctx'> 		unlock_kernel();</div><div class='ctx'> 		return retval;</div><div class='ctx'> 	case TIOCSSERIAL:</div><div class='ctx'> 		lock_kernel();</div><div class='del'>-		retval = mxser_set_serial_info(info, argp);</div><div class='add'>+		retval = mxser_set_serial_info(tty, argp);</div><div class='ctx'> 		unlock_kernel();</div><div class='ctx'> 		return retval;</div><div class='ctx'> 	case TIOCSERGETLSR:	/* Get line status register */</div><div class='hunk'>@@ -1896,7 +1902,7 @@ static int mxser_ioctl(struct tty_struct *tty, struct file *file,</div><div class='ctx'> </div><div class='ctx'> 		lock_kernel();</div><div class='ctx'> 		status = mxser_get_msr(info-&gt;ioaddr, 1, tty-&gt;index);</div><div class='del'>-		mxser_check_modem_status(info, status);</div><div class='add'>+		mxser_check_modem_status(tty, info, status);</div><div class='ctx'> </div><div class='ctx'> 		mcr = inb(info-&gt;ioaddr + UART_MCR);</div><div class='ctx'> 		if (mcr &amp; MOXA_MUST_MCR_XON_FLAG)</div><div class='hunk'>@@ -1909,7 +1915,7 @@ static int mxser_ioctl(struct tty_struct *tty, struct file *file,</div><div class='ctx'> 		else</div><div class='ctx'> 			info-&gt;mon_data.hold_reason |= NPPI_NOTIFY_XOFFXENT;</div><div class='ctx'> </div><div class='del'>-		if (info-&gt;port.tty-&gt;hw_stopped)</div><div class='add'>+		if (tty-&gt;hw_stopped)</div><div class='ctx'> 			info-&gt;mon_data.hold_reason |= NPPI_NOTIFY_CTSHOLD;</div><div class='ctx'> 		else</div><div class='ctx'> 			info-&gt;mon_data.hold_reason &amp;= ~NPPI_NOTIFY_CTSHOLD;</div><div class='hunk'>@@ -1958,7 +1964,7 @@ static void mxser_stoprx(struct tty_struct *tty)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (info-&gt;port.tty-&gt;termios-&gt;c_cflag &amp; CRTSCTS) {</div><div class='add'>+	if (tty-&gt;termios-&gt;c_cflag &amp; CRTSCTS) {</div><div class='ctx'> 		info-&gt;MCR &amp;= ~UART_MCR_RTS;</div><div class='ctx'> 		outb(info-&gt;MCR, info-&gt;ioaddr + UART_MCR);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1995,7 +2001,7 @@ static void mxser_unthrottle(struct tty_struct *tty)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (info-&gt;port.tty-&gt;termios-&gt;c_cflag &amp; CRTSCTS) {</div><div class='add'>+	if (tty-&gt;termios-&gt;c_cflag &amp; CRTSCTS) {</div><div class='ctx'> 		info-&gt;MCR |= UART_MCR_RTS;</div><div class='ctx'> 		outb(info-&gt;MCR, info-&gt;ioaddr + UART_MCR);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2040,7 +2046,7 @@ static void mxser_set_termios(struct tty_struct *tty, struct ktermios *old_termi</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;info-&gt;slock, flags);</div><div class='del'>-	mxser_change_speed(info, old_termios);</div><div class='add'>+	mxser_change_speed(tty, old_termios);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;info-&gt;slock, flags);</div><div class='ctx'> </div><div class='ctx'> 	if ((old_termios-&gt;c_cflag &amp; CRTSCTS) &amp;&amp;</div><div class='hunk'>@@ -2138,10 +2144,10 @@ static void mxser_hangup(struct tty_struct *tty)</div><div class='ctx'> 	struct mxser_port *info = tty-&gt;driver_data;</div><div class='ctx'> </div><div class='ctx'> 	mxser_flush_buffer(tty);</div><div class='del'>-	mxser_shutdown(info);</div><div class='add'>+	mxser_shutdown(tty);</div><div class='ctx'> 	info-&gt;port.count = 0;</div><div class='ctx'> 	info-&gt;port.flags &amp;= ~ASYNC_NORMAL_ACTIVE;</div><div class='del'>-	info-&gt;port.tty = NULL;</div><div class='add'>+	tty_port_tty_set(&amp;info-&gt;port, NULL);</div><div class='ctx'> 	wake_up_interruptible(&amp;info-&gt;port.open_wait);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2164,9 +2170,9 @@ static int mxser_rs_break(struct tty_struct *tty, int break_state)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mxser_receive_chars(struct mxser_port *port, int *status)</div><div class='add'>+static void mxser_receive_chars(struct tty_struct *tty,</div><div class='add'>+				struct mxser_port *port, int *status)</div><div class='ctx'> {</div><div class='del'>-	struct tty_struct *tty = port-&gt;port.tty;</div><div class='ctx'> 	unsigned char ch, gdl;</div><div class='ctx'> 	int ignored = 0;</div><div class='ctx'> 	int cnt = 0;</div><div class='hunk'>@@ -2174,9 +2180,8 @@ static void mxser_receive_chars(struct mxser_port *port, int *status)</div><div class='ctx'> 	int max = 256;</div><div class='ctx'> </div><div class='ctx'> 	recv_room = tty-&gt;receive_room;</div><div class='del'>-	if ((recv_room == 0) &amp;&amp; (!port-&gt;ldisc_stop_rx))</div><div class='add'>+	if (recv_room == 0 &amp;&amp; !port-&gt;ldisc_stop_rx)</div><div class='ctx'> 		mxser_stoprx(tty);</div><div class='del'>-</div><div class='ctx'> 	if (port-&gt;board-&gt;chip_flag != MOXA_OTHER_UART) {</div><div class='ctx'> </div><div class='ctx'> 		if (*status &amp; UART_LSR_SPECIAL)</div><div class='hunk'>@@ -2253,7 +2258,7 @@ intr_old:</div><div class='ctx'> 	} while (*status &amp; UART_LSR_DR);</div><div class='ctx'> </div><div class='ctx'> end_intr:</div><div class='del'>-	mxvar_log.rxcnt[port-&gt;port.tty-&gt;index] += cnt;</div><div class='add'>+	mxvar_log.rxcnt[tty-&gt;index] += cnt;</div><div class='ctx'> 	port-&gt;mon_data.rxcnt += cnt;</div><div class='ctx'> 	port-&gt;mon_data.up_rxcnt += cnt;</div><div class='ctx'> </div><div class='hunk'>@@ -2267,14 +2272,14 @@ end_intr:</div><div class='ctx'> 	spin_lock(&amp;port-&gt;slock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mxser_transmit_chars(struct mxser_port *port)</div><div class='add'>+static void mxser_transmit_chars(struct tty_struct *tty, struct mxser_port *port)</div><div class='ctx'> {</div><div class='ctx'> 	int count, cnt;</div><div class='ctx'> </div><div class='ctx'> 	if (port-&gt;x_char) {</div><div class='ctx'> 		outb(port-&gt;x_char, port-&gt;ioaddr + UART_TX);</div><div class='ctx'> 		port-&gt;x_char = 0;</div><div class='del'>-		mxvar_log.txcnt[port-&gt;port.tty-&gt;index]++;</div><div class='add'>+		mxvar_log.txcnt[tty-&gt;index]++;</div><div class='ctx'> 		port-&gt;mon_data.txcnt++;</div><div class='ctx'> 		port-&gt;mon_data.up_txcnt++;</div><div class='ctx'> 		port-&gt;icount.tx++;</div><div class='hunk'>@@ -2284,8 +2289,8 @@ static void mxser_transmit_chars(struct mxser_port *port)</div><div class='ctx'> 	if (port-&gt;port.xmit_buf == NULL)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if ((port-&gt;xmit_cnt &lt;= 0) || port-&gt;port.tty-&gt;stopped ||</div><div class='del'>-			(port-&gt;port.tty-&gt;hw_stopped &amp;&amp;</div><div class='add'>+	if (port-&gt;xmit_cnt &lt;= 0 || tty-&gt;stopped ||</div><div class='add'>+			(tty-&gt;hw_stopped &amp;&amp;</div><div class='ctx'> 			(port-&gt;type != PORT_16550A) &amp;&amp;</div><div class='ctx'> 			(!port-&gt;board-&gt;chip_flag))) {</div><div class='ctx'> 		port-&gt;IER &amp;= ~UART_IER_THRI;</div><div class='hunk'>@@ -2302,14 +2307,14 @@ static void mxser_transmit_chars(struct mxser_port *port)</div><div class='ctx'> 		if (--port-&gt;xmit_cnt &lt;= 0)</div><div class='ctx'> 			break;</div><div class='ctx'> 	} while (--count &gt; 0);</div><div class='del'>-	mxvar_log.txcnt[port-&gt;port.tty-&gt;index] += (cnt - port-&gt;xmit_cnt);</div><div class='add'>+	mxvar_log.txcnt[tty-&gt;index] += (cnt - port-&gt;xmit_cnt);</div><div class='ctx'> </div><div class='ctx'> 	port-&gt;mon_data.txcnt += (cnt - port-&gt;xmit_cnt);</div><div class='ctx'> 	port-&gt;mon_data.up_txcnt += (cnt - port-&gt;xmit_cnt);</div><div class='ctx'> 	port-&gt;icount.tx += (cnt - port-&gt;xmit_cnt);</div><div class='ctx'> </div><div class='del'>-	if (port-&gt;xmit_cnt &lt; WAKEUP_CHARS)</div><div class='del'>-		tty_wakeup(port-&gt;port.tty);</div><div class='add'>+	if (port-&gt;xmit_cnt &lt; WAKEUP_CHARS &amp;&amp; tty)</div><div class='add'>+		tty_wakeup(tty);</div><div class='ctx'> </div><div class='ctx'> 	if (port-&gt;xmit_cnt &lt;= 0) {</div><div class='ctx'> 		port-&gt;IER &amp;= ~UART_IER_THRI;</div><div class='hunk'>@@ -2328,6 +2333,7 @@ static irqreturn_t mxser_interrupt(int irq, void *dev_id)</div><div class='ctx'> 	int max, irqbits, bits, msr;</div><div class='ctx'> 	unsigned int int_cnt, pass_counter = 0;</div><div class='ctx'> 	int handled = IRQ_NONE;</div><div class='add'>+	struct tty_struct *tty;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; MXSER_BOARDS; i++)</div><div class='ctx'> 		if (dev_id == &amp;mxser_boards[i]) {</div><div class='hunk'>@@ -2360,13 +2366,15 @@ static irqreturn_t mxser_interrupt(int irq, void *dev_id)</div><div class='ctx'> 				if (iir &amp; UART_IIR_NO_INT)</div><div class='ctx'> 					break;</div><div class='ctx'> 				iir &amp;= MOXA_MUST_IIR_MASK;</div><div class='del'>-				if (!port-&gt;port.tty ||</div><div class='add'>+				tty = tty_port_tty_get(&amp;port-&gt;port);</div><div class='add'>+				if (!tty ||</div><div class='ctx'> 						(port-&gt;port.flags &amp; ASYNC_CLOSING) ||</div><div class='ctx'> 						!(port-&gt;port.flags &amp;</div><div class='ctx'> 							ASYNC_INITIALIZED)) {</div><div class='ctx'> 					status = inb(port-&gt;ioaddr + UART_LSR);</div><div class='ctx'> 					outb(0x27, port-&gt;ioaddr + UART_FCR);</div><div class='ctx'> 					inb(port-&gt;ioaddr + UART_MSR);</div><div class='add'>+					tty_kref_put(tty);</div><div class='ctx'> 					break;</div><div class='ctx'> 				}</div><div class='ctx'> </div><div class='hunk'>@@ -2387,27 +2395,28 @@ static irqreturn_t mxser_interrupt(int irq, void *dev_id)</div><div class='ctx'> 					    iir == MOXA_MUST_IIR_RDA ||</div><div class='ctx'> 					    iir == MOXA_MUST_IIR_RTO ||</div><div class='ctx'> 					    iir == MOXA_MUST_IIR_LSR)</div><div class='del'>-						mxser_receive_chars(port,</div><div class='add'>+						mxser_receive_chars(tty, port,</div><div class='ctx'> 								&amp;status);</div><div class='ctx'> </div><div class='ctx'> 				} else {</div><div class='ctx'> 					status &amp;= port-&gt;read_status_mask;</div><div class='ctx'> 					if (status &amp; UART_LSR_DR)</div><div class='del'>-						mxser_receive_chars(port,</div><div class='add'>+						mxser_receive_chars(tty, port,</div><div class='ctx'> 								&amp;status);</div><div class='ctx'> 				}</div><div class='ctx'> 				msr = inb(port-&gt;ioaddr + UART_MSR);</div><div class='ctx'> 				if (msr &amp; UART_MSR_ANY_DELTA)</div><div class='del'>-					mxser_check_modem_status(port, msr);</div><div class='add'>+					mxser_check_modem_status(tty, port, msr);</div><div class='ctx'> </div><div class='ctx'> 				if (port-&gt;board-&gt;chip_flag) {</div><div class='ctx'> 					if (iir == 0x02 &amp;&amp; (status &amp;</div><div class='ctx'> 								UART_LSR_THRE))</div><div class='del'>-						mxser_transmit_chars(port);</div><div class='add'>+						mxser_transmit_chars(tty, port);</div><div class='ctx'> 				} else {</div><div class='ctx'> 					if (status &amp; UART_LSR_THRE)</div><div class='del'>-						mxser_transmit_chars(port);</div><div class='add'>+						mxser_transmit_chars(tty, port);</div><div class='ctx'> 				}</div><div class='add'>+				tty_kref_put(tty);</div><div class='ctx'> 			} while (int_cnt++ &lt; MXSER_ISR_PASS_LIMIT);</div><div class='ctx'> 			spin_unlock(&amp;port-&gt;slock);</div><div class='ctx'> 		}</div><div class='head'>diff --git a/drivers/char/n_hdlc.c b/drivers/char/n_hdlc.c<br/>index 69ec6399c714..bacb3e2872ae 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/n_hdlc.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/char/n_hdlc.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/n_hdlc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/n_hdlc.c</a></div><div class='hunk'>@@ -764,7 +764,7 @@ static int n_hdlc_tty_ioctl(struct tty_struct *tty, struct file *file,</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='del'>-		error = n_tty_ioctl (tty, file, cmd, arg);</div><div class='add'>+		error = n_tty_ioctl_helper(tty, file, cmd, arg);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	return error;</div><div class='head'>diff --git a/drivers/char/n_r3964.c b/drivers/char/n_r3964.c<br/>index ae377aa473ba..4a8215a89ad3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/n_r3964.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/char/n_r3964.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/n_r3964.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/n_r3964.c</a></div><div class='hunk'>@@ -372,14 +372,8 @@ static void remove_from_rx_queue(struct r3964_info *pInfo,</div><div class='ctx'> static void put_char(struct r3964_info *pInfo, unsigned char ch)</div><div class='ctx'> {</div><div class='ctx'> 	struct tty_struct *tty = pInfo-&gt;tty;</div><div class='del'>-</div><div class='del'>-	if (tty == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='ctx'> 	/* FIXME: put_char should not be called from an IRQ */</div><div class='del'>-	if (tty-&gt;ops-&gt;put_char) {</div><div class='del'>-		tty-&gt;ops-&gt;put_char(tty, ch);</div><div class='del'>-	}</div><div class='add'>+	tty_put_char(tty, ch);</div><div class='ctx'> 	pInfo-&gt;bcc ^= ch;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/char/n_tty.c b/drivers/char/n_tty.c<br/>index 708c2b1dbe51..efbfe9612658 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/n_tty.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/char/n_tty.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/n_tty.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/n_tty.c</a></div><div class='hunk'>@@ -26,7 +26,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * 2002/03/18   Implemented n_tty_wakeup to send SIGIO POLL_OUTs to</div><div class='ctx'>  *		waiting writing processes-Sapan Bhatia &lt;sapan@corewars.org&gt;.</div><div class='del'>- *		Also fixed a bug in BLOCKING mode where write_chan returns</div><div class='add'>+ *		Also fixed a bug in BLOCKING mode where n_tty_write returns</div><div class='ctx'>  *		EAGAIN</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -99,6 +99,7 @@ static inline int tty_put_user(struct tty_struct *tty, unsigned char x,</div><div class='ctx'> </div><div class='ctx'> static void n_tty_set_room(struct tty_struct *tty)</div><div class='ctx'> {</div><div class='add'>+	/* tty-&gt;read_cnt is not read locked ? */</div><div class='ctx'> 	int	left = N_TTY_BUF_SIZE - tty-&gt;read_cnt - 1;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -121,6 +122,16 @@ static void put_tty_queue_nolock(unsigned char c, struct tty_struct *tty)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ *	put_tty_queue		-	add character to tty</div><div class='add'>+ *	@c: character</div><div class='add'>+ *	@tty: tty device</div><div class='add'>+ *</div><div class='add'>+ *	Add a character to the tty read_buf queue. This is done under the</div><div class='add'>+ *	read_lock to serialize character addition and also to protect us</div><div class='add'>+ *	against parallel reads or flushes</div><div class='add'>+ */</div><div class='add'>+</div><div class='ctx'> static void put_tty_queue(unsigned char c, struct tty_struct *tty)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='hunk'>@@ -137,14 +148,11 @@ static void put_tty_queue(unsigned char c, struct tty_struct *tty)</div><div class='ctx'>  *	check_unthrottle	-	allow new receive data</div><div class='ctx'>  *	@tty; tty device</div><div class='ctx'>  *</div><div class='del'>- *	Check whether to call the driver.unthrottle function.</div><div class='del'>- *	We test the TTY_THROTTLED bit first so that it always</div><div class='del'>- *	indicates the current state. The decision about whether</div><div class='del'>- *	it is worth allowing more input has been taken by the caller.</div><div class='add'>+ *	Check whether to call the driver unthrottle functions</div><div class='add'>+ *</div><div class='ctx'>  *	Can sleep, may be called under the atomic_read_lock mutex but</div><div class='ctx'>  *	this is not guaranteed.</div><div class='ctx'>  */</div><div class='del'>-</div><div class='ctx'> static void check_unthrottle(struct tty_struct *tty)</div><div class='ctx'> {</div><div class='ctx'> 	if (tty-&gt;count)</div><div class='hunk'>@@ -158,6 +166,8 @@ static void check_unthrottle(struct tty_struct *tty)</div><div class='ctx'>  *	Reset the read buffer counters, clear the flags,</div><div class='ctx'>  *	and make sure the driver is unthrottled. Called</div><div class='ctx'>  *	from n_tty_open() and n_tty_flush_buffer().</div><div class='add'>+ *</div><div class='add'>+ *	Locking: tty_read_lock for read fields.</div><div class='ctx'>  */</div><div class='ctx'> static void reset_buffer_flags(struct tty_struct *tty)</div><div class='ctx'> {</div><div class='hunk'>@@ -181,7 +191,7 @@ static void reset_buffer_flags(struct tty_struct *tty)</div><div class='ctx'>  *	at hangup) or when the N_TTY line discipline internally has to</div><div class='ctx'>  *	clean the pending queue (for example some signals).</div><div class='ctx'>  *</div><div class='del'>- *	Locking: ctrl_lock</div><div class='add'>+ *	Locking: ctrl_lock, read_lock.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static void n_tty_flush_buffer(struct tty_struct *tty)</div><div class='hunk'>@@ -207,6 +217,8 @@ static void n_tty_flush_buffer(struct tty_struct *tty)</div><div class='ctx'>  *</div><div class='ctx'>  *	Report the number of characters buffered to be delivered to user</div><div class='ctx'>  *	at this instant in time.</div><div class='add'>+ *</div><div class='add'>+ *	Locking: read_lock</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static ssize_t n_tty_chars_in_buffer(struct tty_struct *tty)</div><div class='hunk'>@@ -346,7 +358,7 @@ static int opost(unsigned char c, struct tty_struct *tty)</div><div class='ctx'>  *	the simple cases normally found and helps to generate blocks of</div><div class='ctx'>  *	symbols for the console driver and thus improve performance.</div><div class='ctx'>  *</div><div class='del'>- *	Called from write_chan under the tty layer write lock. Relies</div><div class='add'>+ *	Called from n_tty_write under the tty layer write lock. Relies</div><div class='ctx'>  *	on lock_kernel for the tty-&gt;column state.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -410,6 +422,8 @@ break_out:</div><div class='ctx'>  *</div><div class='ctx'>  *	Echo user input back onto the screen. This must be called only when</div><div class='ctx'>  *	L_ECHO(tty) is true. Called from the driver receive_buf path.</div><div class='add'>+ *</div><div class='add'>+ *	Relies on BKL for tty column locking</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static void echo_char(unsigned char c, struct tty_struct *tty)</div><div class='hunk'>@@ -422,6 +436,12 @@ static void echo_char(unsigned char c, struct tty_struct *tty)</div><div class='ctx'> 		opost(c, tty);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ *	finsh_erasing		-	complete erase</div><div class='add'>+ *	@tty: tty doing the erase</div><div class='add'>+ *</div><div class='add'>+ *	Relies on BKL for tty column locking</div><div class='add'>+ */</div><div class='ctx'> static inline void finish_erasing(struct tty_struct *tty)</div><div class='ctx'> {</div><div class='ctx'> 	if (tty-&gt;erasing) {</div><div class='hunk'>@@ -439,6 +459,8 @@ static inline void finish_erasing(struct tty_struct *tty)</div><div class='ctx'>  *	Perform erase and necessary output when an erase character is</div><div class='ctx'>  *	present in the stream from the driver layer. Handles the complexities</div><div class='ctx'>  *	of UTF-8 multibyte symbols.</div><div class='add'>+ *</div><div class='add'>+ *	Locking: read_lock for tty buffers, BKL for column/erasing state</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static void eraser(unsigned char c, struct tty_struct *tty)</div><div class='hunk'>@@ -447,6 +469,7 @@ static void eraser(unsigned char c, struct tty_struct *tty)</div><div class='ctx'> 	int head, seen_alnums, cnt;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='add'>+	/* FIXME: locking needed ? */</div><div class='ctx'> 	if (tty-&gt;read_head == tty-&gt;canon_head) {</div><div class='ctx'> 		/* opost('\a', tty); */		/* what do you think? */</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -481,6 +504,7 @@ static void eraser(unsigned char c, struct tty_struct *tty)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	seen_alnums = 0;</div><div class='add'>+	/* FIXME: Locking ?? */</div><div class='ctx'> 	while (tty-&gt;read_head != tty-&gt;canon_head) {</div><div class='ctx'> 		head = tty-&gt;read_head;</div><div class='ctx'> </div><div class='hunk'>@@ -583,6 +607,8 @@ static void eraser(unsigned char c, struct tty_struct *tty)</div><div class='ctx'>  *	may caus terminal flushing to take place according to the termios</div><div class='ctx'>  *	settings and character used. Called from the driver receive_buf</div><div class='ctx'>  *	path so serialized.</div><div class='add'>+ *</div><div class='add'>+ *	Locking: ctrl_lock, read_lock (both via flush buffer)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static inline void isig(int sig, struct tty_struct *tty, int flush)</div><div class='hunk'>@@ -1007,12 +1033,26 @@ int is_ignored(int sig)</div><div class='ctx'>  *	and is protected from re-entry by the tty layer. The user is</div><div class='ctx'>  *	guaranteed that this function will not be re-entered or in progress</div><div class='ctx'>  *	when the ldisc is closed.</div><div class='add'>+ *</div><div class='add'>+ *	Locking: Caller holds tty-&gt;termios_mutex</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static void n_tty_set_termios(struct tty_struct *tty, struct ktermios *old)</div><div class='ctx'> {</div><div class='del'>-	if (!tty)</div><div class='del'>-		return;</div><div class='add'>+	int canon_change = 1;</div><div class='add'>+	BUG_ON(!tty);</div><div class='add'>+</div><div class='add'>+	if (old)</div><div class='add'>+		canon_change = (old-&gt;c_lflag ^ tty-&gt;termios-&gt;c_lflag) &amp; ICANON;</div><div class='add'>+	if (canon_change) {</div><div class='add'>+		memset(&amp;tty-&gt;read_flags, 0, sizeof tty-&gt;read_flags);</div><div class='add'>+		tty-&gt;canon_head = tty-&gt;read_tail;</div><div class='add'>+		tty-&gt;canon_data = 0;</div><div class='add'>+		tty-&gt;erasing = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (canon_change &amp;&amp; !L_ICANON(tty) &amp;&amp; tty-&gt;read_cnt)</div><div class='add'>+		wake_up_interruptible(&amp;tty-&gt;read_wait);</div><div class='ctx'> </div><div class='ctx'> 	tty-&gt;icanon = (L_ICANON(tty) != 0);</div><div class='ctx'> 	if (test_bit(TTY_HW_COOK_IN, &amp;tty-&gt;flags)) {</div><div class='hunk'>@@ -1143,7 +1183,7 @@ static inline int input_available_p(struct tty_struct *tty, int amt)</div><div class='ctx'>  *	@b: user data</div><div class='ctx'>  *	@nr: size of data</div><div class='ctx'>  *</div><div class='del'>- *	Helper function to speed up read_chan.  It is only called when</div><div class='add'>+ *	Helper function to speed up n_tty_read.  It is only called when</div><div class='ctx'>  *	ICANON is off; it copies characters straight from the tty queue to</div><div class='ctx'>  *	user space directly.  It can be profitably called twice; once to</div><div class='ctx'>  *	drain the space from the tail pointer to the (physical) end of the</div><div class='hunk'>@@ -1210,7 +1250,7 @@ static int job_control(struct tty_struct *tty, struct file *file)</div><div class='ctx'> 	if (file-&gt;f_op-&gt;write != redirected_tty_write &amp;&amp;</div><div class='ctx'> 	    current-&gt;signal-&gt;tty == tty) {</div><div class='ctx'> 		if (!tty-&gt;pgrp)</div><div class='del'>-			printk(KERN_ERR "read_chan: no tty-&gt;pgrp!\n");</div><div class='add'>+			printk(KERN_ERR "n_tty_read: no tty-&gt;pgrp!\n");</div><div class='ctx'> 		else if (task_pgrp(current) != tty-&gt;pgrp) {</div><div class='ctx'> 			if (is_ignored(SIGTTIN) ||</div><div class='ctx'> 			    is_current_pgrp_orphaned())</div><div class='hunk'>@@ -1225,7 +1265,7 @@ static int job_control(struct tty_struct *tty, struct file *file)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *	read_chan		-	read function for tty</div><div class='add'>+ *	n_tty_read		-	read function for tty</div><div class='ctx'>  *	@tty: tty device</div><div class='ctx'>  *	@file: file object</div><div class='ctx'>  *	@buf: userspace buffer pointer</div><div class='hunk'>@@ -1239,7 +1279,7 @@ static int job_control(struct tty_struct *tty, struct file *file)</div><div class='ctx'>  *	This code must be sure never to sleep through a hangup.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static ssize_t read_chan(struct tty_struct *tty, struct file *file,</div><div class='add'>+static ssize_t n_tty_read(struct tty_struct *tty, struct file *file,</div><div class='ctx'> 			 unsigned char __user *buf, size_t nr)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char __user *b = buf;</div><div class='hunk'>@@ -1254,10 +1294,7 @@ static ssize_t read_chan(struct tty_struct *tty, struct file *file,</div><div class='ctx'> </div><div class='ctx'> do_it_again:</div><div class='ctx'> </div><div class='del'>-	if (!tty-&gt;read_buf) {</div><div class='del'>-		printk(KERN_ERR "n_tty_read_chan: read_buf == NULL?!?\n");</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='add'>+	BUG_ON(!tty-&gt;read_buf);</div><div class='ctx'> </div><div class='ctx'> 	c = job_control(tty, file);</div><div class='ctx'> 	if (c &lt; 0)</div><div class='hunk'>@@ -1444,7 +1481,7 @@ do_it_again:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *	write_chan		-	write function for tty</div><div class='add'>+ *	n_tty_write		-	write function for tty</div><div class='ctx'>  *	@tty: tty device</div><div class='ctx'>  *	@file: file object</div><div class='ctx'>  *	@buf: userspace buffer pointer</div><div class='hunk'>@@ -1458,7 +1495,7 @@ do_it_again:</div><div class='ctx'>  *	This code must be sure never to sleep through a hangup.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static ssize_t write_chan(struct tty_struct *tty, struct file *file,</div><div class='add'>+static ssize_t n_tty_write(struct tty_struct *tty, struct file *file,</div><div class='ctx'> 			  const unsigned char *buf, size_t nr)</div><div class='ctx'> {</div><div class='ctx'> 	const unsigned char *b = buf;</div><div class='hunk'>@@ -1532,7 +1569,7 @@ break_out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *	normal_poll		-	poll method for N_TTY</div><div class='add'>+ *	n_tty_poll		-	poll method for N_TTY</div><div class='ctx'>  *	@tty: terminal device</div><div class='ctx'>  *	@file: file accessing it</div><div class='ctx'>  *	@wait: poll table</div><div class='hunk'>@@ -1545,7 +1582,7 @@ break_out:</div><div class='ctx'>  *	Called without the kernel lock held - fine</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static unsigned int normal_poll(struct tty_struct *tty, struct file *file,</div><div class='add'>+static unsigned int n_tty_poll(struct tty_struct *tty, struct file *file,</div><div class='ctx'> 							poll_table *wait)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int mask = 0;</div><div class='hunk'>@@ -1573,6 +1610,44 @@ static unsigned int normal_poll(struct tty_struct *tty, struct file *file,</div><div class='ctx'> 	return mask;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static unsigned long inq_canon(struct tty_struct *tty)</div><div class='add'>+{</div><div class='add'>+	int nr, head, tail;</div><div class='add'>+</div><div class='add'>+	if (!tty-&gt;canon_data)</div><div class='add'>+		return 0;</div><div class='add'>+	head = tty-&gt;canon_head;</div><div class='add'>+	tail = tty-&gt;read_tail;</div><div class='add'>+	nr = (head - tail) &amp; (N_TTY_BUF_SIZE-1);</div><div class='add'>+	/* Skip EOF-chars.. */</div><div class='add'>+	while (head != tail) {</div><div class='add'>+		if (test_bit(tail, tty-&gt;read_flags) &amp;&amp;</div><div class='add'>+		    tty-&gt;read_buf[tail] == __DISABLED_CHAR)</div><div class='add'>+			nr--;</div><div class='add'>+		tail = (tail+1) &amp; (N_TTY_BUF_SIZE-1);</div><div class='add'>+	}</div><div class='add'>+	return nr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int n_tty_ioctl(struct tty_struct *tty, struct file *file,</div><div class='add'>+		       unsigned int cmd, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	int retval;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case TIOCOUTQ:</div><div class='add'>+		return put_user(tty_chars_in_buffer(tty), (int __user *) arg);</div><div class='add'>+	case TIOCINQ:</div><div class='add'>+		/* FIXME: Locking */</div><div class='add'>+		retval = tty-&gt;read_cnt;</div><div class='add'>+		if (L_ICANON(tty))</div><div class='add'>+			retval = inq_canon(tty);</div><div class='add'>+		return put_user(retval, (unsigned int __user *) arg);</div><div class='add'>+	default:</div><div class='add'>+		return n_tty_ioctl_helper(tty, file, cmd, arg);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> struct tty_ldisc_ops tty_ldisc_N_TTY = {</div><div class='ctx'> 	.magic           = TTY_LDISC_MAGIC,</div><div class='ctx'> 	.name            = "n_tty",</div><div class='hunk'>@@ -1580,11 +1655,11 @@ struct tty_ldisc_ops tty_ldisc_N_TTY = {</div><div class='ctx'> 	.close           = n_tty_close,</div><div class='ctx'> 	.flush_buffer    = n_tty_flush_buffer,</div><div class='ctx'> 	.chars_in_buffer = n_tty_chars_in_buffer,</div><div class='del'>-	.read            = read_chan,</div><div class='del'>-	.write           = write_chan,</div><div class='add'>+	.read            = n_tty_read,</div><div class='add'>+	.write           = n_tty_write,</div><div class='ctx'> 	.ioctl           = n_tty_ioctl,</div><div class='ctx'> 	.set_termios     = n_tty_set_termios,</div><div class='del'>-	.poll            = normal_poll,</div><div class='add'>+	.poll            = n_tty_poll,</div><div class='ctx'> 	.receive_buf     = n_tty_receive_buf,</div><div class='ctx'> 	.write_wakeup    = n_tty_write_wakeup</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/char/nozomi.c b/drivers/char/nozomi.c<br/>index 66a0f931c66c..9a34a1935283 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/nozomi.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/char/nozomi.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/nozomi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/nozomi.c</a></div><div class='hunk'>@@ -1599,7 +1599,10 @@ static int ntty_open(struct tty_struct *tty, struct file *file)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Called when the userspace process close the tty, /dev/noz*. */</div><div class='add'>+/* Called when the userspace process close the tty, /dev/noz*. Also</div><div class='add'>+   called immediately if ntty_open fails in which case tty-&gt;driver_data</div><div class='add'>+   will be NULL an we exit by the first return */</div><div class='add'>+</div><div class='ctx'> static void ntty_close(struct tty_struct *tty, struct file *file)</div><div class='ctx'> {</div><div class='ctx'> 	struct nozomi *dc = get_dc_by_tty(tty);</div><div class='head'>diff --git a/drivers/char/pcmcia/cm4000_cs.c b/drivers/char/pcmcia/cm4000_cs.c<br/>index f070ae7bd91a..dbb912574569 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/pcmcia/cm4000_cs.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/char/pcmcia/cm4000_cs.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/pcmcia/cm4000_cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/pcmcia/cm4000_cs.c</a></div><div class='hunk'>@@ -1759,65 +1759,40 @@ static void cmm_cm4000_release(struct pcmcia_device * link)</div><div class='ctx'> </div><div class='ctx'> /*==== Interface to PCMCIA Layer =======================================*/</div><div class='ctx'> </div><div class='add'>+static int cm4000_config_check(struct pcmcia_device *p_dev,</div><div class='add'>+			       cistpl_cftable_entry_t *cfg,</div><div class='add'>+			       cistpl_cftable_entry_t *dflt,</div><div class='add'>+			       unsigned int vcc,</div><div class='add'>+			       void *priv_data)</div><div class='add'>+{</div><div class='add'>+	if (!cfg-&gt;io.nwin)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	/* Get the IOaddr */</div><div class='add'>+	p_dev-&gt;io.BasePort1 = cfg-&gt;io.win[0].base;</div><div class='add'>+	p_dev-&gt;io.NumPorts1 = cfg-&gt;io.win[0].len;</div><div class='add'>+	p_dev-&gt;io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;</div><div class='add'>+	if (!(cfg-&gt;io.flags &amp; CISTPL_IO_8BIT))</div><div class='add'>+		p_dev-&gt;io.Attributes1 = IO_DATA_PATH_WIDTH_16;</div><div class='add'>+	if (!(cfg-&gt;io.flags &amp; CISTPL_IO_16BIT))</div><div class='add'>+		p_dev-&gt;io.Attributes1 = IO_DATA_PATH_WIDTH_8;</div><div class='add'>+	p_dev-&gt;io.IOAddrLines = cfg-&gt;io.flags &amp; CISTPL_IO_LINES_MASK;</div><div class='add'>+</div><div class='add'>+	return pcmcia_request_io(p_dev, &amp;p_dev-&gt;io);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int cm4000_config(struct pcmcia_device * link, int devno)</div><div class='ctx'> {</div><div class='ctx'> 	struct cm4000_dev *dev;</div><div class='del'>-	tuple_t tuple;</div><div class='del'>-	cisparse_t parse;</div><div class='del'>-	u_char buf[64];</div><div class='del'>-	int fail_fn, fail_rc;</div><div class='del'>-	int rc;</div><div class='ctx'> </div><div class='ctx'> 	/* read the config-tuples */</div><div class='del'>-	tuple.Attributes = 0;</div><div class='del'>-	tuple.TupleData = buf;</div><div class='del'>-	tuple.TupleDataMax = sizeof(buf);</div><div class='del'>-	tuple.TupleOffset = 0;</div><div class='del'>-</div><div class='del'>-	link-&gt;io.BasePort2 = 0;</div><div class='del'>-	link-&gt;io.NumPorts2 = 0;</div><div class='del'>-	link-&gt;io.Attributes2 = 0;</div><div class='del'>-	tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;</div><div class='del'>-	for (rc = pcmcia_get_first_tuple(link, &amp;tuple);</div><div class='del'>-	     rc == CS_SUCCESS; rc = pcmcia_get_next_tuple(link, &amp;tuple)) {</div><div class='del'>-</div><div class='del'>-		rc = pcmcia_get_tuple_data(link, &amp;tuple);</div><div class='del'>-		if (rc != CS_SUCCESS)</div><div class='del'>-			continue;</div><div class='del'>-		rc = pcmcia_parse_tuple(link, &amp;tuple, &amp;parse);</div><div class='del'>-		if (rc != CS_SUCCESS)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		link-&gt;conf.ConfigIndex = parse.cftable_entry.index;</div><div class='del'>-</div><div class='del'>-		if (!parse.cftable_entry.io.nwin)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		/* Get the IOaddr */</div><div class='del'>-		link-&gt;io.BasePort1 = parse.cftable_entry.io.win[0].base;</div><div class='del'>-		link-&gt;io.NumPorts1 = parse.cftable_entry.io.win[0].len;</div><div class='del'>-		link-&gt;io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;</div><div class='del'>-		if (!(parse.cftable_entry.io.flags &amp; CISTPL_IO_8BIT))</div><div class='del'>-			link-&gt;io.Attributes1 = IO_DATA_PATH_WIDTH_16;</div><div class='del'>-		if (!(parse.cftable_entry.io.flags &amp; CISTPL_IO_16BIT))</div><div class='del'>-			link-&gt;io.Attributes1 = IO_DATA_PATH_WIDTH_8;</div><div class='del'>-		link-&gt;io.IOAddrLines = parse.cftable_entry.io.flags</div><div class='del'>-		    &amp; CISTPL_IO_LINES_MASK;</div><div class='del'>-</div><div class='del'>-		rc = pcmcia_request_io(link, &amp;link-&gt;io);</div><div class='del'>-		if (rc == CS_SUCCESS)</div><div class='del'>-			break;	/* we are done */</div><div class='del'>-	}</div><div class='del'>-	if (rc != CS_SUCCESS)</div><div class='add'>+	if (pcmcia_loop_config(link, cm4000_config_check, NULL))</div><div class='ctx'> 		goto cs_release;</div><div class='ctx'> </div><div class='ctx'> 	link-&gt;conf.IntType = 00000002;</div><div class='ctx'> </div><div class='del'>-	if ((fail_rc =</div><div class='del'>-	     pcmcia_request_configuration(link, &amp;link-&gt;conf)) != CS_SUCCESS) {</div><div class='del'>-		fail_fn = RequestConfiguration;</div><div class='add'>+	if (pcmcia_request_configuration(link, &amp;link-&gt;conf))</div><div class='ctx'> 		goto cs_release;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	dev = link-&gt;priv;</div><div class='ctx'> 	sprintf(dev-&gt;node.dev_name, DEVICE_NAME "%d", devno);</div><div class='hunk'>@@ -1896,7 +1871,7 @@ static int cm4000_probe(struct pcmcia_device *link)</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	device_create_drvdata(cmm_class, NULL, MKDEV(major, i), NULL, "cmm%d", i);</div><div class='add'>+	device_create(cmm_class, NULL, MKDEV(major, i), NULL, "cmm%d", i);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/char/pcmcia/cm4040_cs.c b/drivers/char/pcmcia/cm4040_cs.c<br/>index 0b5934bef7a4..4f0723b07974 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/pcmcia/cm4040_cs.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/char/pcmcia/cm4040_cs.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/pcmcia/cm4040_cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/pcmcia/cm4040_cs.c</a></div><div class='hunk'>@@ -526,65 +526,49 @@ static void cm4040_reader_release(struct pcmcia_device *link)</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int reader_config(struct pcmcia_device *link, int devno)</div><div class='add'>+static int cm4040_config_check(struct pcmcia_device *p_dev,</div><div class='add'>+			       cistpl_cftable_entry_t *cfg,</div><div class='add'>+			       cistpl_cftable_entry_t *dflt,</div><div class='add'>+			       unsigned int vcc,</div><div class='add'>+			       void *priv_data)</div><div class='ctx'> {</div><div class='del'>-	struct reader_dev *dev;</div><div class='del'>-	tuple_t tuple;</div><div class='del'>-	cisparse_t parse;</div><div class='del'>-	u_char buf[64];</div><div class='del'>-	int fail_fn, fail_rc;</div><div class='ctx'> 	int rc;</div><div class='add'>+	if (!cfg-&gt;io.nwin)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	/* Get the IOaddr */</div><div class='add'>+	p_dev-&gt;io.BasePort1 = cfg-&gt;io.win[0].base;</div><div class='add'>+	p_dev-&gt;io.NumPorts1 = cfg-&gt;io.win[0].len;</div><div class='add'>+	p_dev-&gt;io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;</div><div class='add'>+	if (!(cfg-&gt;io.flags &amp; CISTPL_IO_8BIT))</div><div class='add'>+		p_dev-&gt;io.Attributes1 = IO_DATA_PATH_WIDTH_16;</div><div class='add'>+	if (!(cfg-&gt;io.flags &amp; CISTPL_IO_16BIT))</div><div class='add'>+		p_dev-&gt;io.Attributes1 = IO_DATA_PATH_WIDTH_8;</div><div class='add'>+	p_dev-&gt;io.IOAddrLines = cfg-&gt;io.flags &amp; CISTPL_IO_LINES_MASK;</div><div class='add'>+</div><div class='add'>+	rc = pcmcia_request_io(p_dev, &amp;p_dev-&gt;io);</div><div class='add'>+	dev_printk(KERN_INFO, &amp;handle_to_dev(p_dev),</div><div class='add'>+		   "pcmcia_request_io returned 0x%x\n", rc);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> </div><div class='del'>-	tuple.Attributes = 0;</div><div class='del'>-	tuple.TupleData = buf;</div><div class='del'>-	tuple.TupleDataMax = sizeof(buf);</div><div class='del'>- 	tuple.TupleOffset = 0;</div><div class='add'>+static int reader_config(struct pcmcia_device *link, int devno)</div><div class='add'>+{</div><div class='add'>+	struct reader_dev *dev;</div><div class='add'>+	int fail_rc;</div><div class='ctx'> </div><div class='ctx'> 	link-&gt;io.BasePort2 = 0;</div><div class='ctx'> 	link-&gt;io.NumPorts2 = 0;</div><div class='ctx'> 	link-&gt;io.Attributes2 = 0;</div><div class='del'>-	tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;</div><div class='del'>-	for (rc = pcmcia_get_first_tuple(link, &amp;tuple);</div><div class='del'>-	     rc == CS_SUCCESS;</div><div class='del'>-	     rc = pcmcia_get_next_tuple(link, &amp;tuple)) {</div><div class='del'>-		rc = pcmcia_get_tuple_data(link, &amp;tuple);</div><div class='del'>-		if (rc != CS_SUCCESS)</div><div class='del'>-			continue;</div><div class='del'>-		rc = pcmcia_parse_tuple(link, &amp;tuple, &amp;parse);</div><div class='del'>-		if (rc != CS_SUCCESS)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		link-&gt;conf.ConfigIndex = parse.cftable_entry.index;</div><div class='del'>-</div><div class='del'>-		if (!parse.cftable_entry.io.nwin)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		link-&gt;io.BasePort1 = parse.cftable_entry.io.win[0].base;</div><div class='del'>-		link-&gt;io.NumPorts1 = parse.cftable_entry.io.win[0].len;</div><div class='del'>-		link-&gt;io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;</div><div class='del'>-		if (!(parse.cftable_entry.io.flags &amp; CISTPL_IO_8BIT))</div><div class='del'>-			link-&gt;io.Attributes1 = IO_DATA_PATH_WIDTH_16;</div><div class='del'>-		if (!(parse.cftable_entry.io.flags &amp; CISTPL_IO_16BIT))</div><div class='del'>-			link-&gt;io.Attributes1 = IO_DATA_PATH_WIDTH_8;</div><div class='del'>-		link-&gt;io.IOAddrLines = parse.cftable_entry.io.flags</div><div class='del'>-						&amp; CISTPL_IO_LINES_MASK;</div><div class='del'>-		rc = pcmcia_request_io(link, &amp;link-&gt;io);</div><div class='del'>-</div><div class='del'>-		dev_printk(KERN_INFO, &amp;handle_to_dev(link), "foo");</div><div class='del'>-		if (rc == CS_SUCCESS)</div><div class='del'>-			break;</div><div class='del'>-		else</div><div class='del'>-			dev_printk(KERN_INFO, &amp;handle_to_dev(link),</div><div class='del'>-				   "pcmcia_request_io failed 0x%x\n", rc);</div><div class='del'>-	}</div><div class='del'>-	if (rc != CS_SUCCESS)</div><div class='add'>+</div><div class='add'>+	if (pcmcia_loop_config(link, cm4040_config_check, NULL))</div><div class='ctx'> 		goto cs_release;</div><div class='ctx'> </div><div class='ctx'> 	link-&gt;conf.IntType = 00000002;</div><div class='ctx'> </div><div class='del'>-	if ((fail_rc = pcmcia_request_configuration(link,&amp;link-&gt;conf))</div><div class='del'>-								!=CS_SUCCESS) {</div><div class='del'>-		fail_fn = RequestConfiguration;</div><div class='add'>+	fail_rc = pcmcia_request_configuration(link, &amp;link-&gt;conf);</div><div class='add'>+	if (fail_rc != 0) {</div><div class='ctx'> 		dev_printk(KERN_INFO, &amp;handle_to_dev(link),</div><div class='ctx'> 			   "pcmcia_request_configuration failed 0x%x\n",</div><div class='ctx'> 			   fail_rc);</div><div class='hunk'>@@ -653,8 +637,7 @@ static int reader_probe(struct pcmcia_device *link)</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	device_create_drvdata(cmx_class, NULL, MKDEV(major, i), NULL,</div><div class='del'>-			      "cmx%d", i);</div><div class='add'>+	device_create(cmx_class, NULL, MKDEV(major, i), NULL, "cmx%d", i);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/char/pcmcia/ipwireless/main.c b/drivers/char/pcmcia/ipwireless/main.c<br/>index 5eca7a99afe6..5216fce0c62d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/pcmcia/ipwireless/main.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/char/pcmcia/ipwireless/main.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/pcmcia/ipwireless/main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/pcmcia/ipwireless/main.c</a></div><div class='hunk'>@@ -65,9 +65,9 @@ static void signalled_reboot_work(struct work_struct *work_reboot)</div><div class='ctx'> 	struct ipw_dev *ipw = container_of(work_reboot, struct ipw_dev,</div><div class='ctx'> 			work_reboot);</div><div class='ctx'> 	struct pcmcia_device *link = ipw-&gt;link;</div><div class='del'>-	int ret = pccard_reset_card(link-&gt;socket);</div><div class='add'>+	int ret = pcmcia_reset_card(link-&gt;socket);</div><div class='ctx'> </div><div class='del'>-	if (ret != CS_SUCCESS)</div><div class='add'>+	if (ret != 0)</div><div class='ctx'> 		cs_error(link, ResetCard, ret);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -83,7 +83,6 @@ static int config_ipwireless(struct ipw_dev *ipw)</div><div class='ctx'> {</div><div class='ctx'> 	struct pcmcia_device *link = ipw-&gt;link;</div><div class='ctx'> 	int ret;</div><div class='del'>-	config_info_t conf;</div><div class='ctx'> 	tuple_t tuple;</div><div class='ctx'> 	unsigned short buf[64];</div><div class='ctx'> 	cisparse_t parse;</div><div class='hunk'>@@ -105,7 +104,7 @@ static int config_ipwireless(struct ipw_dev *ipw)</div><div class='ctx'> 	while (ret == 0) {</div><div class='ctx'> 		ret = pcmcia_get_tuple_data(link, &amp;tuple);</div><div class='ctx'> </div><div class='del'>-		if (ret != CS_SUCCESS) {</div><div class='add'>+		if (ret != 0) {</div><div class='ctx'> 			cs_error(link, GetTupleData, ret);</div><div class='ctx'> 			goto exit0;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -116,21 +115,21 @@ static int config_ipwireless(struct ipw_dev *ipw)</div><div class='ctx'> </div><div class='ctx'> 	ret = pcmcia_get_first_tuple(link, &amp;tuple);</div><div class='ctx'> </div><div class='del'>-	if (ret != CS_SUCCESS) {</div><div class='add'>+	if (ret != 0) {</div><div class='ctx'> 		cs_error(link, GetFirstTuple, ret);</div><div class='ctx'> 		goto exit0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = pcmcia_get_tuple_data(link, &amp;tuple);</div><div class='ctx'> </div><div class='del'>-	if (ret != CS_SUCCESS) {</div><div class='add'>+	if (ret != 0) {</div><div class='ctx'> 		cs_error(link, GetTupleData, ret);</div><div class='ctx'> 		goto exit0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = pcmcia_parse_tuple(link, &amp;tuple, &amp;parse);</div><div class='add'>+	ret = pcmcia_parse_tuple(&amp;tuple, &amp;parse);</div><div class='ctx'> </div><div class='del'>-	if (ret != CS_SUCCESS) {</div><div class='add'>+	if (ret != 0) {</div><div class='ctx'> 		cs_error(link, ParseTuple, ret);</div><div class='ctx'> 		goto exit0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -152,21 +151,21 @@ static int config_ipwireless(struct ipw_dev *ipw)</div><div class='ctx'> </div><div class='ctx'> 	ret = pcmcia_get_first_tuple(link, &amp;tuple);</div><div class='ctx'> </div><div class='del'>-	if (ret != CS_SUCCESS) {</div><div class='add'>+	if (ret != 0) {</div><div class='ctx'> 		cs_error(link, GetFirstTuple, ret);</div><div class='ctx'> 		goto exit0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = pcmcia_get_tuple_data(link, &amp;tuple);</div><div class='ctx'> </div><div class='del'>-	if (ret != CS_SUCCESS) {</div><div class='add'>+	if (ret != 0) {</div><div class='ctx'> 		cs_error(link, GetTupleData, ret);</div><div class='ctx'> 		goto exit0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = pcmcia_parse_tuple(link, &amp;tuple, &amp;parse);</div><div class='add'>+	ret = pcmcia_parse_tuple(&amp;tuple, &amp;parse);</div><div class='ctx'> </div><div class='del'>-	if (ret != CS_SUCCESS) {</div><div class='add'>+	if (ret != 0) {</div><div class='ctx'> 		cs_error(link, GetTupleData, ret);</div><div class='ctx'> 		goto exit0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -181,7 +180,7 @@ static int config_ipwireless(struct ipw_dev *ipw)</div><div class='ctx'> </div><div class='ctx'> 	ret = pcmcia_request_io(link, &amp;link-&gt;io);</div><div class='ctx'> </div><div class='del'>-	if (ret != CS_SUCCESS) {</div><div class='add'>+	if (ret != 0) {</div><div class='ctx'> 		cs_error(link, RequestIO, ret);</div><div class='ctx'> 		goto exit0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -195,21 +194,21 @@ static int config_ipwireless(struct ipw_dev *ipw)</div><div class='ctx'> </div><div class='ctx'> 	ret = pcmcia_get_first_tuple(link, &amp;tuple);</div><div class='ctx'> </div><div class='del'>-	if (ret != CS_SUCCESS) {</div><div class='add'>+	if (ret != 0) {</div><div class='ctx'> 		cs_error(link, GetFirstTuple, ret);</div><div class='ctx'> 		goto exit1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = pcmcia_get_tuple_data(link, &amp;tuple);</div><div class='ctx'> </div><div class='del'>-	if (ret != CS_SUCCESS) {</div><div class='add'>+	if (ret != 0) {</div><div class='ctx'> 		cs_error(link, GetTupleData, ret);</div><div class='ctx'> 		goto exit1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = pcmcia_parse_tuple(link, &amp;tuple, &amp;parse);</div><div class='add'>+	ret = pcmcia_parse_tuple(&amp;tuple, &amp;parse);</div><div class='ctx'> </div><div class='del'>-	if (ret != CS_SUCCESS) {</div><div class='add'>+	if (ret != 0) {</div><div class='ctx'> 		cs_error(link, ParseTuple, ret);</div><div class='ctx'> 		goto exit1;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -227,7 +226,7 @@ static int config_ipwireless(struct ipw_dev *ipw)</div><div class='ctx'> 		ret = pcmcia_request_window(&amp;link, &amp;ipw-&gt;request_common_memory,</div><div class='ctx'> 				&amp;ipw-&gt;handle_common_memory);</div><div class='ctx'> </div><div class='del'>-		if (ret != CS_SUCCESS) {</div><div class='add'>+		if (ret != 0) {</div><div class='ctx'> 			cs_error(link, RequestWindow, ret);</div><div class='ctx'> 			goto exit1;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -239,7 +238,7 @@ static int config_ipwireless(struct ipw_dev *ipw)</div><div class='ctx'> 		ret = pcmcia_map_mem_page(ipw-&gt;handle_common_memory,</div><div class='ctx'> 				&amp;memreq_common_memory);</div><div class='ctx'> </div><div class='del'>-		if (ret != CS_SUCCESS) {</div><div class='add'>+		if (ret != 0) {</div><div class='ctx'> 			cs_error(link, MapMemPage, ret);</div><div class='ctx'> 			goto exit1;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -261,7 +260,7 @@ static int config_ipwireless(struct ipw_dev *ipw)</div><div class='ctx'> 		ret = pcmcia_request_window(&amp;link, &amp;ipw-&gt;request_attr_memory,</div><div class='ctx'> 				&amp;ipw-&gt;handle_attr_memory);</div><div class='ctx'> </div><div class='del'>-		if (ret != CS_SUCCESS) {</div><div class='add'>+		if (ret != 0) {</div><div class='ctx'> 			cs_error(link, RequestWindow, ret);</div><div class='ctx'> 			goto exit2;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -272,7 +271,7 @@ static int config_ipwireless(struct ipw_dev *ipw)</div><div class='ctx'> 		ret = pcmcia_map_mem_page(ipw-&gt;handle_attr_memory,</div><div class='ctx'> 				&amp;memreq_attr_memory);</div><div class='ctx'> </div><div class='del'>-		if (ret != CS_SUCCESS) {</div><div class='add'>+		if (ret != 0) {</div><div class='ctx'> 			cs_error(link, MapMemPage, ret);</div><div class='ctx'> 			goto exit2;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -292,20 +291,11 @@ static int config_ipwireless(struct ipw_dev *ipw)</div><div class='ctx'> </div><div class='ctx'> 	ret = pcmcia_request_irq(link, &amp;link-&gt;irq);</div><div class='ctx'> </div><div class='del'>-	if (ret != CS_SUCCESS) {</div><div class='add'>+	if (ret != 0) {</div><div class='ctx'> 		cs_error(link, RequestIRQ, ret);</div><div class='ctx'> 		goto exit3;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Look up current Vcc */</div><div class='del'>-</div><div class='del'>-	ret = pcmcia_get_configuration_info(link, &amp;conf);</div><div class='del'>-</div><div class='del'>-	if (ret != CS_SUCCESS) {</div><div class='del'>-		cs_error(link, GetConfigurationInfo, ret);</div><div class='del'>-		goto exit4;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	printk(KERN_INFO IPWIRELESS_PCCARD_NAME ": Card type %s\n",</div><div class='ctx'> 			ipw-&gt;is_v2_card ? "V2/V3" : "V1");</div><div class='ctx'> 	printk(KERN_INFO IPWIRELESS_PCCARD_NAME</div><div class='hunk'>@@ -341,7 +331,7 @@ static int config_ipwireless(struct ipw_dev *ipw)</div><div class='ctx'> 	 */</div><div class='ctx'> 	ret = pcmcia_request_configuration(link, &amp;link-&gt;conf);</div><div class='ctx'> </div><div class='del'>-	if (ret != CS_SUCCESS) {</div><div class='add'>+	if (ret != 0) {</div><div class='ctx'> 		cs_error(link, RequestConfiguration, ret);</div><div class='ctx'> 		goto exit4;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/char/pcmcia/ipwireless/tty.c b/drivers/char/pcmcia/ipwireless/tty.c<br/>index 3a23e7694d55..569f2f7743a7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/pcmcia/ipwireless/tty.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/char/pcmcia/ipwireless/tty.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/pcmcia/ipwireless/tty.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/pcmcia/ipwireless/tty.c</a></div><div class='hunk'>@@ -276,6 +276,7 @@ static int ipw_write_room(struct tty_struct *linux_tty)</div><div class='ctx'> 	struct ipw_tty *tty = linux_tty-&gt;driver_data;</div><div class='ctx'> 	int room;</div><div class='ctx'> </div><div class='add'>+	/* FIXME: Exactly how is the tty object locked here .. */</div><div class='ctx'> 	if (!tty)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='hunk'>@@ -397,6 +398,7 @@ static int set_control_lines(struct ipw_tty *tty, unsigned int set,</div><div class='ctx'> static int ipw_tiocmget(struct tty_struct *linux_tty, struct file *file)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipw_tty *tty = linux_tty-&gt;driver_data;</div><div class='add'>+	/* FIXME: Exactly how is the tty object locked here .. */</div><div class='ctx'> </div><div class='ctx'> 	if (!tty)</div><div class='ctx'> 		return -ENODEV;</div><div class='hunk'>@@ -412,6 +414,7 @@ ipw_tiocmset(struct tty_struct *linux_tty, struct file *file,</div><div class='ctx'> 	     unsigned int set, unsigned int clear)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipw_tty *tty = linux_tty-&gt;driver_data;</div><div class='add'>+	/* FIXME: Exactly how is the tty object locked here .. */</div><div class='ctx'> </div><div class='ctx'> 	if (!tty)</div><div class='ctx'> 		return -ENODEV;</div><div class='hunk'>@@ -433,6 +436,8 @@ static int ipw_ioctl(struct tty_struct *linux_tty, struct file *file,</div><div class='ctx'> 	if (!tty-&gt;open_count)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	/* FIXME: Exactly how is the tty object locked here .. */</div><div class='add'>+</div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case TIOCGSERIAL:</div><div class='ctx'> 		return ipwireless_get_serial_info(tty, (void __user *) arg);</div><div class='hunk'>@@ -467,13 +472,6 @@ static int ipw_ioctl(struct tty_struct *linux_tty, struct file *file,</div><div class='ctx'> 			}</div><div class='ctx'> 			return 0;</div><div class='ctx'> </div><div class='del'>-		case TCGETS:</div><div class='del'>-		case TCGETA:</div><div class='del'>-			return n_tty_ioctl(linux_tty, file, cmd, arg);</div><div class='del'>-</div><div class='del'>-		case TCFLSH:</div><div class='del'>-			return n_tty_ioctl(linux_tty, file, cmd, arg);</div><div class='del'>-</div><div class='ctx'> 		case FIONREAD:</div><div class='ctx'> 			{</div><div class='ctx'> 				int val = 0;</div><div class='hunk'>@@ -482,10 +480,11 @@ static int ipw_ioctl(struct tty_struct *linux_tty, struct file *file,</div><div class='ctx'> 					return -EFAULT;</div><div class='ctx'> 			}</div><div class='ctx'> 			return 0;</div><div class='add'>+		case TCFLSH:</div><div class='add'>+			return tty_perform_flush(linux_tty, arg);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	return -ENOIOCTLCMD;</div><div class='add'>+	return tty_mode_ioctl(linux_tty, file, cmd , arg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int add_tty(dev_node_t *nodesp, int j,</div><div class='hunk'>@@ -588,6 +587,8 @@ void ipwireless_tty_free(struct ipw_tty *tty)</div><div class='ctx'> 				tty_hangup(ttyj-&gt;linux_tty);</div><div class='ctx'> 				/* Wait till the tty_hangup has completed */</div><div class='ctx'> 				flush_scheduled_work();</div><div class='add'>+				/* FIXME: Exactly how is the tty object locked here</div><div class='add'>+				   against a parallel ioctl etc */</div><div class='ctx'> 				mutex_lock(&amp;ttyj-&gt;ipw_tty_mutex);</div><div class='ctx'> 			}</div><div class='ctx'> 			while (ttyj-&gt;open_count)</div><div class='head'>diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c<br/>index c240562c218b..9a626e50b793 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/pcmcia/synclink_cs.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/char/pcmcia/synclink_cs.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/pcmcia/synclink_cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/pcmcia/synclink_cs.c</a></div><div class='hunk'>@@ -601,7 +601,7 @@ static int mgslpc_config(struct pcmcia_device *link)</div><div class='ctx'> </div><div class='ctx'>     cfg = &amp;(parse.cftable_entry);</div><div class='ctx'>     CS_CHECK(GetTupleData, pcmcia_get_tuple_data(link, &amp;tuple));</div><div class='del'>-    CS_CHECK(ParseTuple, pcmcia_parse_tuple(link, &amp;tuple, &amp;parse));</div><div class='add'>+    CS_CHECK(ParseTuple, pcmcia_parse_tuple(&amp;tuple, &amp;parse));</div><div class='ctx'> </div><div class='ctx'>     if (cfg-&gt;flags &amp; CISTPL_CFTABLE_DEFAULT) dflt = *cfg;</div><div class='ctx'>     if (cfg-&gt;index == 0)</div><div class='head'>diff --git a/drivers/char/ppdev.c b/drivers/char/ppdev.c<br/>index bee39fdfba73..c84c34fb1231 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/ppdev.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/char/ppdev.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/ppdev.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/ppdev.c</a></div><div class='hunk'>@@ -760,9 +760,8 @@ static const struct file_operations pp_fops = {</div><div class='ctx'> </div><div class='ctx'> static void pp_attach(struct parport *port)</div><div class='ctx'> {</div><div class='del'>-	device_create_drvdata(ppdev_class, port-&gt;dev,</div><div class='del'>-			      MKDEV(PP_MAJOR, port-&gt;number),</div><div class='del'>-			      NULL, "parport%d", port-&gt;number);</div><div class='add'>+	device_create(ppdev_class, port-&gt;dev, MKDEV(PP_MAJOR, port-&gt;number),</div><div class='add'>+		      NULL, "parport%d", port-&gt;number);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void pp_detach(struct parport *port)</div><div class='head'>diff --git a/drivers/char/pty.c b/drivers/char/pty.c<br/>index 76b27932d229..6d4582712b1f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/pty.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/char/pty.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/pty.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/pty.c</a></div><div class='hunk'>@@ -8,10 +8,12 @@</div><div class='ctx'>  *  Added TTY_DO_WRITE_WAKEUP to enable n_tty to send POLL_OUT to</div><div class='ctx'>  *      waiting writers -- Sapan Bhatia &lt;sapan@corewars.org&gt;</div><div class='ctx'>  *</div><div class='del'>- *</div><div class='add'>+ *  When reading this code see also fs/devpts. In particular note that the</div><div class='add'>+ *  driver_data field is used by the devpts side as a binding to the devpts</div><div class='add'>+ *  inode.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/module.h&gt;	/* For EXPORT_SYMBOL */</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='hunk'>@@ -23,26 +25,25 @@</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/sysctl.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='del'>-#include &lt;asm/system.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='ctx'> #include &lt;linux/devpts_fs.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/system.h&gt;</div><div class='add'>+</div><div class='ctx'> /* These are global because they are accessed in tty_io.c */</div><div class='ctx'> #ifdef CONFIG_UNIX98_PTYS</div><div class='ctx'> struct tty_driver *ptm_driver;</div><div class='ctx'> static struct tty_driver *pts_driver;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static void pty_close(struct tty_struct * tty, struct file * filp)</div><div class='add'>+static void pty_close(struct tty_struct *tty, struct file *filp)</div><div class='ctx'> {</div><div class='del'>-	if (!tty)</div><div class='del'>-		return;</div><div class='del'>-	if (tty-&gt;driver-&gt;subtype == PTY_TYPE_MASTER) {</div><div class='del'>-		if (tty-&gt;count &gt; 1)</div><div class='del'>-			printk("master pty_close: count = %d!!\n", tty-&gt;count);</div><div class='del'>-	} else {</div><div class='add'>+	BUG_ON(!tty);</div><div class='add'>+	if (tty-&gt;driver-&gt;subtype == PTY_TYPE_MASTER)</div><div class='add'>+		WARN_ON(tty-&gt;count &gt; 1);</div><div class='add'>+	else {</div><div class='ctx'> 		if (tty-&gt;count &gt; 2)</div><div class='ctx'> 			return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -59,7 +60,7 @@ static void pty_close(struct tty_struct * tty, struct file * filp)</div><div class='ctx'> 		set_bit(TTY_OTHER_CLOSED, &amp;tty-&gt;flags);</div><div class='ctx'> #ifdef CONFIG_UNIX98_PTYS</div><div class='ctx'> 		if (tty-&gt;driver == ptm_driver)</div><div class='del'>-			devpts_pty_kill(tty-&gt;index);</div><div class='add'>+			devpts_pty_kill(tty-&gt;link);</div><div class='ctx'> #endif</div><div class='ctx'> 		tty_vhangup(tty-&gt;link);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -69,13 +70,13 @@ static void pty_close(struct tty_struct * tty, struct file * filp)</div><div class='ctx'>  * The unthrottle routine is called by the line discipline to signal</div><div class='ctx'>  * that it can receive more characters.  For PTY's, the TTY_THROTTLED</div><div class='ctx'>  * flag is always set, to force the line discipline to always call the</div><div class='del'>- * unthrottle routine when there are fewer than TTY_THRESHOLD_UNTHROTTLE </div><div class='add'>+ * unthrottle routine when there are fewer than TTY_THRESHOLD_UNTHROTTLE</div><div class='ctx'>  * characters in the queue.  This is necessary since each time this</div><div class='ctx'>  * happens, we need to wake up any sleeping processes that could be</div><div class='ctx'>  * (1) trying to send data to the pty, or (2) waiting in wait_until_sent()</div><div class='ctx'>  * for the pty buffer to be drained.</div><div class='ctx'>  */</div><div class='del'>-static void pty_unthrottle(struct tty_struct * tty)</div><div class='add'>+static void pty_unthrottle(struct tty_struct *tty)</div><div class='ctx'> {</div><div class='ctx'> 	struct tty_struct *o_tty = tty-&gt;link;</div><div class='ctx'> </div><div class='hunk'>@@ -87,7 +88,7 @@ static void pty_unthrottle(struct tty_struct * tty)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * WSH 05/24/97: modified to </div><div class='add'>+ * WSH 05/24/97: modified to</div><div class='ctx'>  *   (1) use space in tty-&gt;flip instead of a shared temp buffer</div><div class='ctx'>  *	 The flip buffers aren't being used for a pty, so there's lots</div><div class='ctx'>  *	 of space available.  The buffer is protected by a per-pty</div><div class='hunk'>@@ -100,7 +101,8 @@ static void pty_unthrottle(struct tty_struct * tty)</div><div class='ctx'>  * not our partners. We can't just take the other one blindly without</div><div class='ctx'>  * risking deadlocks.</div><div class='ctx'>  */</div><div class='del'>-static int pty_write(struct tty_struct * tty, const unsigned char *buf, int count)</div><div class='add'>+static int pty_write(struct tty_struct *tty, const unsigned char *buf,</div><div class='add'>+								int count)</div><div class='ctx'> {</div><div class='ctx'> 	struct tty_struct *to = tty-&gt;link;</div><div class='ctx'> 	int	c;</div><div class='hunk'>@@ -112,7 +114,7 @@ static int pty_write(struct tty_struct * tty, const unsigned char *buf, int coun</div><div class='ctx'> 	if (c &gt; count)</div><div class='ctx'> 		c = count;</div><div class='ctx'> 	to-&gt;ldisc.ops-&gt;receive_buf(to, buf, NULL, c);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	return c;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -128,17 +130,17 @@ static int pty_write_room(struct tty_struct *tty)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *	WSH 05/24/97:  Modified for asymmetric MASTER/SLAVE behavior</div><div class='del'>- *	The chars_in_buffer() value is used by the ldisc select() function </div><div class='add'>+ *	The chars_in_buffer() value is used by the ldisc select() function</div><div class='ctx'>  *	to hold off writing when chars_in_buffer &gt; WAKEUP_CHARS (== 256).</div><div class='ctx'>  *	The pty driver chars_in_buffer() Master/Slave must behave differently:</div><div class='ctx'>  *</div><div class='ctx'>  *      The Master side needs to allow typed-ahead commands to accumulate</div><div class='ctx'>  *      while being canonicalized, so we report "our buffer" as empty until</div><div class='ctx'>  *	some threshold is reached, and then report the count. (Any count &gt;</div><div class='del'>- *	WAKEUP_CHARS is regarded by select() as "full".)  To avoid deadlock </div><div class='del'>- *	the count returned must be 0 if no canonical data is available to be </div><div class='add'>+ *	WAKEUP_CHARS is regarded by select() as "full".)  To avoid deadlock</div><div class='add'>+ *	the count returned must be 0 if no canonical data is available to be</div><div class='ctx'>  *	read. (The N_TTY ldisc.chars_in_buffer now knows this.)</div><div class='del'>- *  </div><div class='add'>+ *</div><div class='ctx'>  *	The Slave side passes all characters in raw mode to the Master side's</div><div class='ctx'>  *	buffer where they can be read immediately, so in this case we can</div><div class='ctx'>  *	return the true count in the buffer.</div><div class='hunk'>@@ -155,21 +157,22 @@ static int pty_chars_in_buffer(struct tty_struct *tty)</div><div class='ctx'> 	/* The ldisc must report 0 if no characters available to be read */</div><div class='ctx'> 	count = to-&gt;ldisc.ops-&gt;chars_in_buffer(to);</div><div class='ctx'> </div><div class='del'>-	if (tty-&gt;driver-&gt;subtype == PTY_TYPE_SLAVE) return count;</div><div class='add'>+	if (tty-&gt;driver-&gt;subtype == PTY_TYPE_SLAVE)</div><div class='add'>+		return count;</div><div class='ctx'> </div><div class='del'>-	/* Master side driver ... if the other side's read buffer is less than </div><div class='add'>+	/* Master side driver ... if the other side's read buffer is less than</div><div class='ctx'> 	 * half full, return 0 to allow writers to proceed; otherwise return</div><div class='del'>-	 * the count.  This leaves a comfortable margin to avoid overflow, </div><div class='add'>+	 * the count.  This leaves a comfortable margin to avoid overflow,</div><div class='ctx'> 	 * and still allows half a buffer's worth of typed-ahead commands.</div><div class='ctx'> 	 */</div><div class='del'>-	return ((count &lt; N_TTY_BUF_SIZE/2) ? 0 : count);</div><div class='add'>+	return (count &lt; N_TTY_BUF_SIZE/2) ? 0 : count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Set the lock flag on a pty */</div><div class='del'>-static int pty_set_lock(struct tty_struct *tty, int __user * arg)</div><div class='add'>+static int pty_set_lock(struct tty_struct *tty, int __user *arg)</div><div class='ctx'> {</div><div class='ctx'> 	int val;</div><div class='del'>-	if (get_user(val,arg))</div><div class='add'>+	if (get_user(val, arg))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	if (val)</div><div class='ctx'> 		set_bit(TTY_PTY_LOCK, &amp;tty-&gt;flags);</div><div class='hunk'>@@ -182,13 +185,13 @@ static void pty_flush_buffer(struct tty_struct *tty)</div><div class='ctx'> {</div><div class='ctx'> 	struct tty_struct *to = tty-&gt;link;</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	if (!to)</div><div class='ctx'> 		return;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	if (to-&gt;ldisc.ops-&gt;flush_buffer)</div><div class='ctx'> 		to-&gt;ldisc.ops-&gt;flush_buffer(to);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	if (to-&gt;packet) {</div><div class='ctx'> 		spin_lock_irqsave(&amp;tty-&gt;ctrl_lock, flags);</div><div class='ctx'> 		tty-&gt;ctrl_status |= TIOCPKT_FLUSHWRITE;</div><div class='hunk'>@@ -197,7 +200,7 @@ static void pty_flush_buffer(struct tty_struct *tty)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int pty_open(struct tty_struct *tty, struct file * filp)</div><div class='add'>+static int pty_open(struct tty_struct *tty, struct file *filp)</div><div class='ctx'> {</div><div class='ctx'> 	int	retval = -ENODEV;</div><div class='ctx'> </div><div class='hunk'>@@ -220,13 +223,65 @@ out:</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void pty_set_termios(struct tty_struct *tty, struct ktermios *old_termios)</div><div class='add'>+static void pty_set_termios(struct tty_struct *tty,</div><div class='add'>+					struct ktermios *old_termios)</div><div class='add'>+{</div><div class='add'>+	tty-&gt;termios-&gt;c_cflag &amp;= ~(CSIZE | PARENB);</div><div class='add'>+	tty-&gt;termios-&gt;c_cflag |= (CS8 | CREAD);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pty_install(struct tty_driver *driver, struct tty_struct *tty)</div><div class='ctx'> {</div><div class='del'>-        tty-&gt;termios-&gt;c_cflag &amp;= ~(CSIZE | PARENB);</div><div class='del'>-        tty-&gt;termios-&gt;c_cflag |= (CS8 | CREAD);</div><div class='add'>+	struct tty_struct *o_tty;</div><div class='add'>+	int idx = tty-&gt;index;</div><div class='add'>+	int retval;</div><div class='add'>+</div><div class='add'>+	o_tty = alloc_tty_struct();</div><div class='add'>+	if (!o_tty)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	if (!try_module_get(driver-&gt;other-&gt;owner)) {</div><div class='add'>+		/* This cannot in fact currently happen */</div><div class='add'>+		free_tty_struct(o_tty);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	initialize_tty_struct(o_tty, driver-&gt;other, idx);</div><div class='add'>+</div><div class='add'>+	/* We always use new tty termios data so we can do this</div><div class='add'>+	   the easy way .. */</div><div class='add'>+	retval = tty_init_termios(tty);</div><div class='add'>+	if (retval)</div><div class='add'>+		goto free_mem_out;</div><div class='add'>+</div><div class='add'>+	retval = tty_init_termios(o_tty);</div><div class='add'>+	if (retval) {</div><div class='add'>+		tty_free_termios(tty);</div><div class='add'>+		goto free_mem_out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Everything allocated ... set up the o_tty structure.</div><div class='add'>+	 */</div><div class='add'>+	driver-&gt;other-&gt;ttys[idx] = o_tty;</div><div class='add'>+	tty_driver_kref_get(driver-&gt;other);</div><div class='add'>+	if (driver-&gt;subtype == PTY_TYPE_MASTER)</div><div class='add'>+		o_tty-&gt;count++;</div><div class='add'>+	/* Establish the links in both directions */</div><div class='add'>+	tty-&gt;link   = o_tty;</div><div class='add'>+	o_tty-&gt;link = tty;</div><div class='add'>+</div><div class='add'>+	tty_driver_kref_get(driver);</div><div class='add'>+	tty-&gt;count++;</div><div class='add'>+	driver-&gt;ttys[idx] = tty;</div><div class='add'>+	return 0;</div><div class='add'>+free_mem_out:</div><div class='add'>+	module_put(o_tty-&gt;driver-&gt;owner);</div><div class='add'>+	free_tty_struct(o_tty);</div><div class='add'>+	return -ENOMEM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> static const struct tty_operations pty_ops = {</div><div class='add'>+	.install = pty_install,</div><div class='ctx'> 	.open = pty_open,</div><div class='ctx'> 	.close = pty_close,</div><div class='ctx'> 	.write = pty_write,</div><div class='hunk'>@@ -329,8 +384,11 @@ static inline void legacy_pty_init(void) { }</div><div class='ctx'>  * Otherwise one can eat up all kernel memory by opening /dev/ptmx repeatedly.</div><div class='ctx'>  */</div><div class='ctx'> int pty_limit = NR_UNIX98_PTY_DEFAULT;</div><div class='del'>-static int pty_limit_min = 0;</div><div class='add'>+static int pty_limit_min;</div><div class='ctx'> static int pty_limit_max = NR_UNIX98_PTY_MAX;</div><div class='add'>+static int pty_count;</div><div class='add'>+</div><div class='add'>+static struct cdev ptmx_cdev;</div><div class='ctx'> </div><div class='ctx'> static struct ctl_table pty_table[] = {</div><div class='ctx'> 	{</div><div class='hunk'>@@ -348,6 +406,7 @@ static struct ctl_table pty_table[] = {</div><div class='ctx'> 		.procname	= "nr",</div><div class='ctx'> 		.maxlen		= sizeof(int),</div><div class='ctx'> 		.mode		= 0444,</div><div class='add'>+		.data		= &amp;pty_count,</div><div class='ctx'> 		.proc_handler	= &amp;proc_dointvec,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.ctl_name	= 0</div><div class='hunk'>@@ -388,7 +447,127 @@ static int pty_unix98_ioctl(struct tty_struct *tty, struct file *file,</div><div class='ctx'> 	return -ENOIOCTLCMD;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ *	ptm_unix98_lookup	-	find a pty master</div><div class='add'>+ *	@driver: ptm driver</div><div class='add'>+ *	@idx: tty index</div><div class='add'>+ *</div><div class='add'>+ *	Look up a pty master device. Called under the tty_mutex for now.</div><div class='add'>+ *	This provides our locking.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static struct tty_struct *ptm_unix98_lookup(struct tty_driver *driver,</div><div class='add'>+		struct inode *ptm_inode, int idx)</div><div class='add'>+{</div><div class='add'>+	struct tty_struct *tty = devpts_get_tty(ptm_inode, idx);</div><div class='add'>+	if (tty)</div><div class='add'>+		tty = tty-&gt;link;</div><div class='add'>+	return tty;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	pts_unix98_lookup	-	find a pty slave</div><div class='add'>+ *	@driver: pts driver</div><div class='add'>+ *	@idx: tty index</div><div class='add'>+ *</div><div class='add'>+ *	Look up a pty master device. Called under the tty_mutex for now.</div><div class='add'>+ *	This provides our locking.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static struct tty_struct *pts_unix98_lookup(struct tty_driver *driver,</div><div class='add'>+		struct inode *pts_inode, int idx)</div><div class='add'>+{</div><div class='add'>+	struct tty_struct *tty = devpts_get_tty(pts_inode, idx);</div><div class='add'>+	/* Master must be open before slave */</div><div class='add'>+	if (!tty)</div><div class='add'>+		return ERR_PTR(-EIO);</div><div class='add'>+	return tty;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pty_unix98_shutdown(struct tty_struct *tty)</div><div class='add'>+{</div><div class='add'>+	/* We have our own method as we don't use the tty index */</div><div class='add'>+	kfree(tty-&gt;termios);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* We have no need to install and remove our tty objects as devpts does all</div><div class='add'>+   the work for us */</div><div class='add'>+</div><div class='add'>+static int pty_unix98_install(struct tty_driver *driver, struct tty_struct *tty)</div><div class='add'>+{</div><div class='add'>+	struct tty_struct *o_tty;</div><div class='add'>+	int idx = tty-&gt;index;</div><div class='add'>+</div><div class='add'>+	o_tty = alloc_tty_struct();</div><div class='add'>+	if (!o_tty)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	if (!try_module_get(driver-&gt;other-&gt;owner)) {</div><div class='add'>+		/* This cannot in fact currently happen */</div><div class='add'>+		free_tty_struct(o_tty);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	initialize_tty_struct(o_tty, driver-&gt;other, idx);</div><div class='add'>+</div><div class='add'>+	tty-&gt;termios = kzalloc(sizeof(struct ktermios[2]), GFP_KERNEL);</div><div class='add'>+	if (tty-&gt;termios == NULL)</div><div class='add'>+		goto free_mem_out;</div><div class='add'>+	*tty-&gt;termios = driver-&gt;init_termios;</div><div class='add'>+	tty-&gt;termios_locked = tty-&gt;termios + 1;</div><div class='add'>+</div><div class='add'>+	o_tty-&gt;termios = kzalloc(sizeof(struct ktermios[2]), GFP_KERNEL);</div><div class='add'>+	if (o_tty-&gt;termios == NULL)</div><div class='add'>+		goto free_mem_out;</div><div class='add'>+	*o_tty-&gt;termios = driver-&gt;other-&gt;init_termios;</div><div class='add'>+	o_tty-&gt;termios_locked = o_tty-&gt;termios + 1;</div><div class='add'>+</div><div class='add'>+	tty_driver_kref_get(driver-&gt;other);</div><div class='add'>+	if (driver-&gt;subtype == PTY_TYPE_MASTER)</div><div class='add'>+		o_tty-&gt;count++;</div><div class='add'>+	/* Establish the links in both directions */</div><div class='add'>+	tty-&gt;link   = o_tty;</div><div class='add'>+	o_tty-&gt;link = tty;</div><div class='add'>+	/*</div><div class='add'>+	 * All structures have been allocated, so now we install them.</div><div class='add'>+	 * Failures after this point use release_tty to clean up, so</div><div class='add'>+	 * there's no need to null out the local pointers.</div><div class='add'>+	 */</div><div class='add'>+	tty_driver_kref_get(driver);</div><div class='add'>+	tty-&gt;count++;</div><div class='add'>+	pty_count++;</div><div class='add'>+	return 0;</div><div class='add'>+free_mem_out:</div><div class='add'>+	kfree(o_tty-&gt;termios);</div><div class='add'>+	module_put(o_tty-&gt;driver-&gt;owner);</div><div class='add'>+	free_tty_struct(o_tty);</div><div class='add'>+	kfree(tty-&gt;termios);</div><div class='add'>+	return -ENOMEM;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pty_unix98_remove(struct tty_driver *driver, struct tty_struct *tty)</div><div class='add'>+{</div><div class='add'>+	pty_count--;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct tty_operations ptm_unix98_ops = {</div><div class='add'>+	.lookup = ptm_unix98_lookup,</div><div class='add'>+	.install = pty_unix98_install,</div><div class='add'>+	.remove = pty_unix98_remove,</div><div class='add'>+	.open = pty_open,</div><div class='add'>+	.close = pty_close,</div><div class='add'>+	.write = pty_write,</div><div class='add'>+	.write_room = pty_write_room,</div><div class='add'>+	.flush_buffer = pty_flush_buffer,</div><div class='add'>+	.chars_in_buffer = pty_chars_in_buffer,</div><div class='add'>+	.unthrottle = pty_unthrottle,</div><div class='add'>+	.set_termios = pty_set_termios,</div><div class='add'>+	.ioctl = pty_unix98_ioctl,</div><div class='add'>+	.shutdown = pty_unix98_shutdown</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const struct tty_operations pty_unix98_ops = {</div><div class='add'>+	.lookup = pts_unix98_lookup,</div><div class='add'>+	.install = pty_unix98_install,</div><div class='add'>+	.remove = pty_unix98_remove,</div><div class='ctx'> 	.open = pty_open,</div><div class='ctx'> 	.close = pty_close,</div><div class='ctx'> 	.write = pty_write,</div><div class='hunk'>@@ -397,9 +576,73 @@ static const struct tty_operations pty_unix98_ops = {</div><div class='ctx'> 	.chars_in_buffer = pty_chars_in_buffer,</div><div class='ctx'> 	.unthrottle = pty_unthrottle,</div><div class='ctx'> 	.set_termios = pty_set_termios,</div><div class='del'>-	.ioctl = pty_unix98_ioctl</div><div class='add'>+	.shutdown = pty_unix98_shutdown</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ *	ptmx_open		-	open a unix 98 pty master</div><div class='add'>+ *	@inode: inode of device file</div><div class='add'>+ *	@filp: file pointer to tty</div><div class='add'>+ *</div><div class='add'>+ *	Allocate a unix98 pty master device from the ptmx driver.</div><div class='add'>+ *</div><div class='add'>+ *	Locking: tty_mutex protects the init_dev work. tty-&gt;count should</div><div class='add'>+ * 		protect the rest.</div><div class='add'>+ *		allocated_ptys_lock handles the list of free pty numbers</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static int __ptmx_open(struct inode *inode, struct file *filp)</div><div class='add'>+{</div><div class='add'>+	struct tty_struct *tty;</div><div class='add'>+	int retval;</div><div class='add'>+	int index;</div><div class='add'>+</div><div class='add'>+	nonseekable_open(inode, filp);</div><div class='add'>+</div><div class='add'>+	/* find a device that is not in use. */</div><div class='add'>+	index = devpts_new_index(inode);</div><div class='add'>+	if (index &lt; 0)</div><div class='add'>+		return index;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;tty_mutex);</div><div class='add'>+	tty = tty_init_dev(ptm_driver, index, 1);</div><div class='add'>+	mutex_unlock(&amp;tty_mutex);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(tty)) {</div><div class='add'>+		retval = PTR_ERR(tty);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	set_bit(TTY_PTY_LOCK, &amp;tty-&gt;flags); /* LOCK THE SLAVE */</div><div class='add'>+	filp-&gt;private_data = tty;</div><div class='add'>+	file_move(filp, &amp;tty-&gt;tty_files);</div><div class='add'>+</div><div class='add'>+	retval = devpts_pty_new(inode, tty-&gt;link);</div><div class='add'>+	if (retval)</div><div class='add'>+		goto out1;</div><div class='add'>+</div><div class='add'>+	retval = ptm_driver-&gt;ops-&gt;open(tty, filp);</div><div class='add'>+	if (!retval)</div><div class='add'>+		return 0;</div><div class='add'>+out1:</div><div class='add'>+	tty_release_dev(filp);</div><div class='add'>+	return retval;</div><div class='add'>+out:</div><div class='add'>+	devpts_kill_index(inode, index);</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ptmx_open(struct inode *inode, struct file *filp)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lock_kernel();</div><div class='add'>+	ret = __ptmx_open(inode, filp);</div><div class='add'>+	unlock_kernel();</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct file_operations ptmx_fops;</div><div class='ctx'> </div><div class='ctx'> static void __init unix98_pty_init(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -427,7 +670,7 @@ static void __init unix98_pty_init(void)</div><div class='ctx'> 	ptm_driver-&gt;flags = TTY_DRIVER_RESET_TERMIOS | TTY_DRIVER_REAL_RAW |</div><div class='ctx'> 		TTY_DRIVER_DYNAMIC_DEV | TTY_DRIVER_DEVPTS_MEM;</div><div class='ctx'> 	ptm_driver-&gt;other = pts_driver;</div><div class='del'>-	tty_set_operations(ptm_driver, &amp;pty_unix98_ops);</div><div class='add'>+	tty_set_operations(ptm_driver, &amp;ptm_unix98_ops);</div><div class='ctx'> </div><div class='ctx'> 	pts_driver-&gt;owner = THIS_MODULE;</div><div class='ctx'> 	pts_driver-&gt;driver_name = "pty_slave";</div><div class='hunk'>@@ -443,16 +686,26 @@ static void __init unix98_pty_init(void)</div><div class='ctx'> 	pts_driver-&gt;flags = TTY_DRIVER_RESET_TERMIOS | TTY_DRIVER_REAL_RAW |</div><div class='ctx'> 		TTY_DRIVER_DYNAMIC_DEV | TTY_DRIVER_DEVPTS_MEM;</div><div class='ctx'> 	pts_driver-&gt;other = ptm_driver;</div><div class='del'>-	tty_set_operations(pts_driver, &amp;pty_ops);</div><div class='del'>-	</div><div class='add'>+	tty_set_operations(pts_driver, &amp;pty_unix98_ops);</div><div class='add'>+</div><div class='ctx'> 	if (tty_register_driver(ptm_driver))</div><div class='ctx'> 		panic("Couldn't register Unix98 ptm driver");</div><div class='ctx'> 	if (tty_register_driver(pts_driver))</div><div class='ctx'> 		panic("Couldn't register Unix98 pts driver");</div><div class='ctx'> </div><div class='del'>-	pty_table[1].data = &amp;ptm_driver-&gt;refcount;</div><div class='ctx'> 	register_sysctl_table(pty_root_table);</div><div class='add'>+</div><div class='add'>+	/* Now create the /dev/ptmx special device */</div><div class='add'>+	tty_default_fops(&amp;ptmx_fops);</div><div class='add'>+	ptmx_fops.open = ptmx_open;</div><div class='add'>+</div><div class='add'>+	cdev_init(&amp;ptmx_cdev, &amp;ptmx_fops);</div><div class='add'>+	if (cdev_add(&amp;ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||</div><div class='add'>+	    register_chrdev_region(MKDEV(TTYAUX_MAJOR, 2), 1, "/dev/ptmx") &lt; 0)</div><div class='add'>+		panic("Couldn't register /dev/ptmx driver\n");</div><div class='add'>+	device_create(tty_class, NULL, MKDEV(TTYAUX_MAJOR, 2), NULL, "ptmx");</div><div class='ctx'> }</div><div class='add'>+</div><div class='ctx'> #else</div><div class='ctx'> static inline void unix98_pty_init(void) { }</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/char/random.c b/drivers/char/random.c<br/>index 7ce1ac4baa6d..c8752eaad483 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/random.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/char/random.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/random.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/random.c</a></div><div class='hunk'>@@ -661,10 +661,10 @@ void add_disk_randomness(struct gendisk *disk)</div><div class='ctx'> 	if (!disk || !disk-&gt;random)</div><div class='ctx'> 		return;</div><div class='ctx'> 	/* first major is 1, so we get &gt;= 0x200 here */</div><div class='del'>-	DEBUG_ENT("disk event %d:%d\n", disk-&gt;major, disk-&gt;first_minor);</div><div class='add'>+	DEBUG_ENT("disk event %d:%d\n",</div><div class='add'>+		  MAJOR(disk_devt(disk)), MINOR(disk_devt(disk)));</div><div class='ctx'> </div><div class='del'>-	add_timer_randomness(disk-&gt;random,</div><div class='del'>-			     0x100 + MKDEV(disk-&gt;major, disk-&gt;first_minor));</div><div class='add'>+	add_timer_randomness(disk-&gt;random, 0x100 + disk_devt(disk));</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -1205,7 +1205,7 @@ static int proc_do_uuid(ctl_table *table, int write, struct file *filp,</div><div class='ctx'> 	return proc_dostring(&amp;fake_table, write, filp, buffer, lenp, ppos);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int uuid_strategy(ctl_table *table, int __user *name, int nlen,</div><div class='add'>+static int uuid_strategy(ctl_table *table,</div><div class='ctx'> 			 void __user *oldval, size_t __user *oldlenp,</div><div class='ctx'> 			 void __user *newval, size_t newlen)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/char/raw.c b/drivers/char/raw.c<br/>index 47b8cf281d4a..e139372d0e69 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/raw.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/char/raw.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/raw.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/raw.c</a></div><div class='hunk'>@@ -131,8 +131,8 @@ raw_ioctl(struct inode *inode, struct file *filp,</div><div class='ctx'> static void bind_device(struct raw_config_request *rq)</div><div class='ctx'> {</div><div class='ctx'> 	device_destroy(raw_class, MKDEV(RAW_MAJOR, rq-&gt;raw_minor));</div><div class='del'>-	device_create_drvdata(raw_class, NULL, MKDEV(RAW_MAJOR, rq-&gt;raw_minor),</div><div class='del'>-			      NULL, "raw%d", rq-&gt;raw_minor);</div><div class='add'>+	device_create(raw_class, NULL, MKDEV(RAW_MAJOR, rq-&gt;raw_minor), NULL,</div><div class='add'>+		      "raw%d", rq-&gt;raw_minor);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -283,8 +283,7 @@ static int __init raw_init(void)</div><div class='ctx'> 		ret = PTR_ERR(raw_class);</div><div class='ctx'> 		goto error_region;</div><div class='ctx'> 	}</div><div class='del'>-	device_create_drvdata(raw_class, NULL, MKDEV(RAW_MAJOR, 0), NULL,</div><div class='del'>-			      "rawctl");</div><div class='add'>+	device_create(raw_class, NULL, MKDEV(RAW_MAJOR, 0), NULL, "rawctl");</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/char/rtc.c b/drivers/char/rtc.c<br/>index f53d4d00faf0..17683de95717 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/rtc.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/char/rtc.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/rtc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/rtc.c</a></div><div class='hunk'>@@ -88,15 +88,15 @@</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SPARC32</div><div class='del'>-#include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/jiffies.h&gt;</div><div class='del'>-#include &lt;asm/ebus.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_device.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> static unsigned long rtc_port;</div><div class='del'>-static int rtc_irq = PCI_IRQ_NONE;</div><div class='add'>+static int rtc_irq;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef	CONFIG_HPET_RTC_IRQ</div><div class='add'>+#ifdef	CONFIG_HPET_EMULATE_RTC</div><div class='ctx'> #undef	RTC_IRQ</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -973,8 +973,8 @@ static int __init rtc_init(void)</div><div class='ctx'> 	char *guess = NULL;</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_SPARC32</div><div class='del'>-	struct linux_ebus *ebus;</div><div class='del'>-	struct linux_ebus_device *edev;</div><div class='add'>+	struct device_node *ebus_dp;</div><div class='add'>+	struct of_device *op;</div><div class='ctx'> #else</div><div class='ctx'> 	void *r;</div><div class='ctx'> #ifdef RTC_IRQ</div><div class='hunk'>@@ -983,12 +983,16 @@ static int __init rtc_init(void)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SPARC32</div><div class='del'>-	for_each_ebus(ebus) {</div><div class='del'>-		for_each_ebusdev(edev, ebus) {</div><div class='del'>-			if (strcmp(edev-&gt;prom_node-&gt;name, "rtc") == 0) {</div><div class='del'>-				rtc_port = edev-&gt;resource[0].start;</div><div class='del'>-				rtc_irq = edev-&gt;irqs[0];</div><div class='del'>-				goto found;</div><div class='add'>+	for_each_node_by_name(ebus_dp, "ebus") {</div><div class='add'>+		struct device_node *dp;</div><div class='add'>+		for (dp = ebus_dp; dp; dp = dp-&gt;sibling) {</div><div class='add'>+			if (!strcmp(dp-&gt;name, "rtc")) {</div><div class='add'>+				op = of_find_device_by_node(dp);</div><div class='add'>+				if (op) {</div><div class='add'>+					rtc_port = op-&gt;resource[0].start;</div><div class='add'>+					rtc_irq = op-&gt;irqs[0];</div><div class='add'>+					goto found;</div><div class='add'>+				}</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -997,7 +1001,7 @@ static int __init rtc_init(void)</div><div class='ctx'> 	return -EIO;</div><div class='ctx'> </div><div class='ctx'> found:</div><div class='del'>-	if (rtc_irq == PCI_IRQ_NONE) {</div><div class='add'>+	if (!rtc_irq) {</div><div class='ctx'> 		rtc_has_irq = 0;</div><div class='ctx'> 		goto no_irq;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/char/snsc.c b/drivers/char/snsc.c<br/>index 3ce60df14c0a..32b74de18f5f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/snsc.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/char/snsc.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/snsc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/snsc.c</a></div><div class='hunk'>@@ -444,8 +444,8 @@ scdrv_init(void)</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			device_create_drvdata(snsc_class, NULL, dev, NULL,</div><div class='del'>-					      "%s", devname);</div><div class='add'>+			device_create(snsc_class, NULL, dev, NULL,</div><div class='add'>+				      "%s", devname);</div><div class='ctx'> </div><div class='ctx'> 			ia64_sn_irtr_intr_enable(scd-&gt;scd_nasid,</div><div class='ctx'> 						 0 /*ignored */ ,</div><div class='head'>diff --git a/drivers/char/stallion.c b/drivers/char/stallion.c<br/>index 19db1eb87c26..963b03fb29e5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/stallion.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/char/stallion.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/stallion.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/stallion.c</a></div><div class='hunk'>@@ -405,9 +405,9 @@ static unsigned int	stl_baudrates[] = {</div><div class='ctx'> </div><div class='ctx'> static int	stl_memioctl(struct inode *ip, struct file *fp, unsigned int cmd, unsigned long arg);</div><div class='ctx'> static int	stl_brdinit(struct stlbrd *brdp);</div><div class='del'>-static int	stl_getportstats(struct stlport *portp, comstats_t __user *cp);</div><div class='add'>+static int	stl_getportstats(struct tty_struct *tty, struct stlport *portp, comstats_t __user *cp);</div><div class='ctx'> static int	stl_clrportstats(struct stlport *portp, comstats_t __user *cp);</div><div class='del'>-static int	stl_waitcarrier(struct stlport *portp, struct file *filp);</div><div class='add'>+static int	stl_waitcarrier(struct tty_struct *tty, struct stlport *portp, struct file *filp);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *	CD1400 uart specific handling functions.</div><div class='hunk'>@@ -612,8 +612,9 @@ static struct class *stallion_class;</div><div class='ctx'> static void stl_cd_change(struct stlport *portp)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int oldsigs = portp-&gt;sigs;</div><div class='add'>+	struct tty_struct *tty = tty_port_tty_get(&amp;portp-&gt;port);</div><div class='ctx'> </div><div class='del'>-	if (!portp-&gt;port.tty)</div><div class='add'>+	if (!tty)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	portp-&gt;sigs = stl_getsignals(portp);</div><div class='hunk'>@@ -623,7 +624,8 @@ static void stl_cd_change(struct stlport *portp)</div><div class='ctx'> </div><div class='ctx'> 	if ((oldsigs &amp; TIOCM_CD) &amp;&amp; ((portp-&gt;sigs &amp; TIOCM_CD) == 0))</div><div class='ctx'> 		if (portp-&gt;port.flags &amp; ASYNC_CHECK_CD)</div><div class='del'>-			tty_hangup(portp-&gt;port.tty);</div><div class='add'>+			tty_hangup(tty);</div><div class='add'>+	tty_kref_put(tty);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -734,7 +736,7 @@ static int stl_open(struct tty_struct *tty, struct file *filp)</div><div class='ctx'>  *	On the first open of the device setup the port hardware, and</div><div class='ctx'>  *	initialize the per port data structure.</div><div class='ctx'>  */</div><div class='del'>-	portp-&gt;port.tty = tty;</div><div class='add'>+	tty_port_tty_set(&amp;portp-&gt;port, tty);</div><div class='ctx'> 	tty-&gt;driver_data = portp;</div><div class='ctx'> 	portp-&gt;port.count++;</div><div class='ctx'> </div><div class='hunk'>@@ -774,7 +776,7 @@ static int stl_open(struct tty_struct *tty, struct file *filp)</div><div class='ctx'>  *	then also we might have to wait for carrier.</div><div class='ctx'>  */</div><div class='ctx'> 	if (!(filp-&gt;f_flags &amp; O_NONBLOCK))</div><div class='del'>-		if ((rc = stl_waitcarrier(portp, filp)) != 0)</div><div class='add'>+		if ((rc = stl_waitcarrier(tty, portp, filp)) != 0)</div><div class='ctx'> 			return rc;</div><div class='ctx'> </div><div class='ctx'> 	portp-&gt;port.flags |= ASYNC_NORMAL_ACTIVE;</div><div class='hunk'>@@ -789,7 +791,8 @@ static int stl_open(struct tty_struct *tty, struct file *filp)</div><div class='ctx'>  *	maybe because if we are clocal then we don't need to wait...</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static int stl_waitcarrier(struct stlport *portp, struct file *filp)</div><div class='add'>+static int stl_waitcarrier(struct tty_struct *tty, struct stlport *portp,</div><div class='add'>+							struct file *filp)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long	flags;</div><div class='ctx'> 	int		rc, doclocal;</div><div class='hunk'>@@ -801,7 +804,7 @@ static int stl_waitcarrier(struct stlport *portp, struct file *filp)</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;stallion_lock, flags);</div><div class='ctx'> </div><div class='del'>-	if (portp-&gt;port.tty-&gt;termios-&gt;c_cflag &amp; CLOCAL)</div><div class='add'>+	if (tty-&gt;termios-&gt;c_cflag &amp; CLOCAL)</div><div class='ctx'> 		doclocal++;</div><div class='ctx'> </div><div class='ctx'> 	portp-&gt;openwaitcnt++;</div><div class='hunk'>@@ -846,8 +849,6 @@ static void stl_flushbuffer(struct tty_struct *tty)</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("stl_flushbuffer(tty=%p)\n", tty);</div><div class='ctx'> </div><div class='del'>-	if (tty == NULL)</div><div class='del'>-		return;</div><div class='ctx'> 	portp = tty-&gt;driver_data;</div><div class='ctx'> 	if (portp == NULL)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -865,8 +866,6 @@ static void stl_waituntilsent(struct tty_struct *tty, int timeout)</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("stl_waituntilsent(tty=%p,timeout=%d)\n", tty, timeout);</div><div class='ctx'> </div><div class='del'>-	if (tty == NULL)</div><div class='del'>-		return;</div><div class='ctx'> 	portp = tty-&gt;driver_data;</div><div class='ctx'> 	if (portp == NULL)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -949,7 +948,7 @@ static void stl_close(struct tty_struct *tty, struct file *filp)</div><div class='ctx'> 	tty_ldisc_flush(tty);</div><div class='ctx'> </div><div class='ctx'> 	tty-&gt;closing = 0;</div><div class='del'>-	portp-&gt;port.tty = NULL;</div><div class='add'>+	tty_port_tty_set(&amp;portp-&gt;port, NULL);</div><div class='ctx'> </div><div class='ctx'> 	if (portp-&gt;openwaitcnt) {</div><div class='ctx'> 		if (portp-&gt;close_delay)</div><div class='hunk'>@@ -1033,8 +1032,6 @@ static int stl_putchar(struct tty_struct *tty, unsigned char ch)</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("stl_putchar(tty=%p,ch=%x)\n", tty, ch);</div><div class='ctx'> </div><div class='del'>-	if (tty == NULL)</div><div class='del'>-		return -EINVAL;</div><div class='ctx'> 	portp = tty-&gt;driver_data;</div><div class='ctx'> 	if (portp == NULL)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -1070,8 +1067,6 @@ static void stl_flushchars(struct tty_struct *tty)</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("stl_flushchars(tty=%p)\n", tty);</div><div class='ctx'> </div><div class='del'>-	if (tty == NULL)</div><div class='del'>-		return;</div><div class='ctx'> 	portp = tty-&gt;driver_data;</div><div class='ctx'> 	if (portp == NULL)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -1090,8 +1085,6 @@ static int stl_writeroom(struct tty_struct *tty)</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("stl_writeroom(tty=%p)\n", tty);</div><div class='ctx'> </div><div class='del'>-	if (tty == NULL)</div><div class='del'>-		return 0;</div><div class='ctx'> 	portp = tty-&gt;driver_data;</div><div class='ctx'> 	if (portp == NULL)</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -1122,8 +1115,6 @@ static int stl_charsinbuffer(struct tty_struct *tty)</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("stl_charsinbuffer(tty=%p)\n", tty);</div><div class='ctx'> </div><div class='del'>-	if (tty == NULL)</div><div class='del'>-		return 0;</div><div class='ctx'> 	portp = tty-&gt;driver_data;</div><div class='ctx'> 	if (portp == NULL)</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -1183,8 +1174,9 @@ static int stl_getserial(struct stlport *portp, struct serial_struct __user *sp)</div><div class='ctx'>  *	just quietly ignore any requests to change irq, etc.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static int stl_setserial(struct stlport *portp, struct serial_struct __user *sp)</div><div class='add'>+static int stl_setserial(struct tty_struct *tty, struct serial_struct __user *sp)</div><div class='ctx'> {</div><div class='add'>+	struct stlport *	portp = tty-&gt;driver_data;</div><div class='ctx'> 	struct serial_struct	sio;</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("stl_setserial(portp=%p,sp=%p)\n", portp, sp);</div><div class='hunk'>@@ -1205,7 +1197,7 @@ static int stl_setserial(struct stlport *portp, struct serial_struct __user *sp)</div><div class='ctx'> 	portp-&gt;close_delay = sio.close_delay;</div><div class='ctx'> 	portp-&gt;closing_wait = sio.closing_wait;</div><div class='ctx'> 	portp-&gt;custom_divisor = sio.custom_divisor;</div><div class='del'>-	stl_setport(portp, portp-&gt;port.tty-&gt;termios);</div><div class='add'>+	stl_setport(portp, tty-&gt;termios);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1215,8 +1207,6 @@ static int stl_tiocmget(struct tty_struct *tty, struct file *file)</div><div class='ctx'> {</div><div class='ctx'> 	struct stlport	*portp;</div><div class='ctx'> </div><div class='del'>-	if (tty == NULL)</div><div class='del'>-		return -ENODEV;</div><div class='ctx'> 	portp = tty-&gt;driver_data;</div><div class='ctx'> 	if (portp == NULL)</div><div class='ctx'> 		return -ENODEV;</div><div class='hunk'>@@ -1232,8 +1222,6 @@ static int stl_tiocmset(struct tty_struct *tty, struct file *file,</div><div class='ctx'> 	struct stlport	*portp;</div><div class='ctx'> 	int rts = -1, dtr = -1;</div><div class='ctx'> </div><div class='del'>-	if (tty == NULL)</div><div class='del'>-		return -ENODEV;</div><div class='ctx'> 	portp = tty-&gt;driver_data;</div><div class='ctx'> 	if (portp == NULL)</div><div class='ctx'> 		return -ENODEV;</div><div class='hunk'>@@ -1262,8 +1250,6 @@ static int stl_ioctl(struct tty_struct *tty, struct file *file, unsigned int cmd</div><div class='ctx'> 	pr_debug("stl_ioctl(tty=%p,file=%p,cmd=%x,arg=%lx)\n", tty, file, cmd,</div><div class='ctx'> 			arg);</div><div class='ctx'> </div><div class='del'>-	if (tty == NULL)</div><div class='del'>-		return -ENODEV;</div><div class='ctx'> 	portp = tty-&gt;driver_data;</div><div class='ctx'> 	if (portp == NULL)</div><div class='ctx'> 		return -ENODEV;</div><div class='hunk'>@@ -1282,10 +1268,10 @@ static int stl_ioctl(struct tty_struct *tty, struct file *file, unsigned int cmd</div><div class='ctx'> 		rc = stl_getserial(portp, argp);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case TIOCSSERIAL:</div><div class='del'>-		rc = stl_setserial(portp, argp);</div><div class='add'>+		rc = stl_setserial(tty, argp);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case COM_GETPORTSTATS:</div><div class='del'>-		rc = stl_getportstats(portp, argp);</div><div class='add'>+		rc = stl_getportstats(tty, portp, argp);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case COM_CLRPORTSTATS:</div><div class='ctx'> 		rc = stl_clrportstats(portp, argp);</div><div class='hunk'>@@ -1317,8 +1303,6 @@ static void stl_start(struct tty_struct *tty)</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("stl_start(tty=%p)\n", tty);</div><div class='ctx'> </div><div class='del'>-	if (tty == NULL)</div><div class='del'>-		return;</div><div class='ctx'> 	portp = tty-&gt;driver_data;</div><div class='ctx'> 	if (portp == NULL)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -1334,8 +1318,6 @@ static void stl_settermios(struct tty_struct *tty, struct ktermios *old)</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("stl_settermios(tty=%p,old=%p)\n", tty, old);</div><div class='ctx'> </div><div class='del'>-	if (tty == NULL)</div><div class='del'>-		return;</div><div class='ctx'> 	portp = tty-&gt;driver_data;</div><div class='ctx'> 	if (portp == NULL)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -1369,8 +1351,6 @@ static void stl_throttle(struct tty_struct *tty)</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("stl_throttle(tty=%p)\n", tty);</div><div class='ctx'> </div><div class='del'>-	if (tty == NULL)</div><div class='del'>-		return;</div><div class='ctx'> 	portp = tty-&gt;driver_data;</div><div class='ctx'> 	if (portp == NULL)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -1389,8 +1369,6 @@ static void stl_unthrottle(struct tty_struct *tty)</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("stl_unthrottle(tty=%p)\n", tty);</div><div class='ctx'> </div><div class='del'>-	if (tty == NULL)</div><div class='del'>-		return;</div><div class='ctx'> 	portp = tty-&gt;driver_data;</div><div class='ctx'> 	if (portp == NULL)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -1410,8 +1388,6 @@ static void stl_stop(struct tty_struct *tty)</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("stl_stop(tty=%p)\n", tty);</div><div class='ctx'> </div><div class='del'>-	if (tty == NULL)</div><div class='del'>-		return;</div><div class='ctx'> 	portp = tty-&gt;driver_data;</div><div class='ctx'> 	if (portp == NULL)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -1432,8 +1408,6 @@ static void stl_hangup(struct tty_struct *tty)</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("stl_hangup(tty=%p)\n", tty);</div><div class='ctx'> </div><div class='del'>-	if (tty == NULL)</div><div class='del'>-		return;</div><div class='ctx'> 	portp = tty-&gt;driver_data;</div><div class='ctx'> 	if (portp == NULL)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -1452,7 +1426,7 @@ static void stl_hangup(struct tty_struct *tty)</div><div class='ctx'> 		portp-&gt;tx.head = NULL;</div><div class='ctx'> 		portp-&gt;tx.tail = NULL;</div><div class='ctx'> 	}</div><div class='del'>-	portp-&gt;port.tty = NULL;</div><div class='add'>+	tty_port_tty_set(&amp;portp-&gt;port, NULL);</div><div class='ctx'> 	portp-&gt;port.flags &amp;= ~ASYNC_NORMAL_ACTIVE;</div><div class='ctx'> 	portp-&gt;port.count = 0;</div><div class='ctx'> 	wake_up_interruptible(&amp;portp-&gt;port.open_wait);</div><div class='hunk'>@@ -1466,8 +1440,6 @@ static int stl_breakctl(struct tty_struct *tty, int state)</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("stl_breakctl(tty=%p,state=%d)\n", tty, state);</div><div class='ctx'> </div><div class='del'>-	if (tty == NULL)</div><div class='del'>-		return -EINVAL;</div><div class='ctx'> 	portp = tty-&gt;driver_data;</div><div class='ctx'> 	if (portp == NULL)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -1484,8 +1456,6 @@ static void stl_sendxchar(struct tty_struct *tty, char ch)</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("stl_sendxchar(tty=%p,ch=%x)\n", tty, ch);</div><div class='ctx'> </div><div class='del'>-	if (tty == NULL)</div><div class='del'>-		return;</div><div class='ctx'> 	portp = tty-&gt;driver_data;</div><div class='ctx'> 	if (portp == NULL)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -1805,7 +1775,7 @@ static int __devinit stl_initports(struct stlbrd *brdp, struct stlpanel *panelp)</div><div class='ctx'> 				"(size=%Zd)\n", sizeof(struct stlport));</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='add'>+		tty_port_init(&amp;portp-&gt;port);</div><div class='ctx'> 		portp-&gt;magic = STL_PORTMAGIC;</div><div class='ctx'> 		portp-&gt;portnr = i;</div><div class='ctx'> 		portp-&gt;brdnr = panelp-&gt;brdnr;</div><div class='hunk'>@@ -1832,6 +1802,7 @@ static void stl_cleanup_panels(struct stlbrd *brdp)</div><div class='ctx'> 	struct stlpanel *panelp;</div><div class='ctx'> 	struct stlport *portp;</div><div class='ctx'> 	unsigned int j, k;</div><div class='add'>+	struct tty_struct *tty;</div><div class='ctx'> </div><div class='ctx'> 	for (j = 0; j &lt; STL_MAXPANELS; j++) {</div><div class='ctx'> 		panelp = brdp-&gt;panels[j];</div><div class='hunk'>@@ -1841,8 +1812,11 @@ static void stl_cleanup_panels(struct stlbrd *brdp)</div><div class='ctx'> 			portp = panelp-&gt;ports[k];</div><div class='ctx'> 			if (portp == NULL)</div><div class='ctx'> 				continue;</div><div class='del'>-			if (portp-&gt;port.tty != NULL)</div><div class='del'>-				stl_hangup(portp-&gt;port.tty);</div><div class='add'>+			tty = tty_port_tty_get(&amp;portp-&gt;port);</div><div class='add'>+			if (tty != NULL) {</div><div class='add'>+				stl_hangup(tty);</div><div class='add'>+				tty_kref_put(tty);</div><div class='add'>+			}</div><div class='ctx'> 			kfree(portp-&gt;tx.buf);</div><div class='ctx'> 			kfree(portp);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2498,7 +2472,7 @@ static struct stlport *stl_getport(int brdnr, int panelnr, int portnr)</div><div class='ctx'>  *	what port to get stats for (used through board control device).</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static int stl_getportstats(struct stlport *portp, comstats_t __user *cp)</div><div class='add'>+static int stl_getportstats(struct tty_struct *tty, struct stlport *portp, comstats_t __user *cp)</div><div class='ctx'> {</div><div class='ctx'> 	comstats_t	stl_comstats;</div><div class='ctx'> 	unsigned char	*head, *tail;</div><div class='hunk'>@@ -2525,18 +2499,17 @@ static int stl_getportstats(struct stlport *portp, comstats_t __user *cp)</div><div class='ctx'> 	portp-&gt;stats.rxbuffered = 0;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;stallion_lock, flags);</div><div class='del'>-	if (portp-&gt;port.tty != NULL)</div><div class='del'>-		if (portp-&gt;port.tty-&gt;driver_data == portp) {</div><div class='del'>-			portp-&gt;stats.ttystate = portp-&gt;port.tty-&gt;flags;</div><div class='del'>-			/* No longer available as a statistic */</div><div class='del'>-			portp-&gt;stats.rxbuffered = 1; /*portp-&gt;port.tty-&gt;flip.count; */</div><div class='del'>-			if (portp-&gt;port.tty-&gt;termios != NULL) {</div><div class='del'>-				portp-&gt;stats.cflags = portp-&gt;port.tty-&gt;termios-&gt;c_cflag;</div><div class='del'>-				portp-&gt;stats.iflags = portp-&gt;port.tty-&gt;termios-&gt;c_iflag;</div><div class='del'>-				portp-&gt;stats.oflags = portp-&gt;port.tty-&gt;termios-&gt;c_oflag;</div><div class='del'>-				portp-&gt;stats.lflags = portp-&gt;port.tty-&gt;termios-&gt;c_lflag;</div><div class='del'>-			}</div><div class='add'>+	if (tty != NULL &amp;&amp; portp-&gt;port.tty == tty) {</div><div class='add'>+		portp-&gt;stats.ttystate = tty-&gt;flags;</div><div class='add'>+		/* No longer available as a statistic */</div><div class='add'>+		portp-&gt;stats.rxbuffered = 1; /*tty-&gt;flip.count; */</div><div class='add'>+		if (tty-&gt;termios != NULL) {</div><div class='add'>+			portp-&gt;stats.cflags = tty-&gt;termios-&gt;c_cflag;</div><div class='add'>+			portp-&gt;stats.iflags = tty-&gt;termios-&gt;c_iflag;</div><div class='add'>+			portp-&gt;stats.oflags = tty-&gt;termios-&gt;c_oflag;</div><div class='add'>+			portp-&gt;stats.lflags = tty-&gt;termios-&gt;c_lflag;</div><div class='ctx'> 		}</div><div class='add'>+	}</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;stallion_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	head = portp-&gt;tx.head;</div><div class='hunk'>@@ -2640,7 +2613,7 @@ static int stl_memioctl(struct inode *ip, struct file *fp, unsigned int cmd, uns</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case COM_GETPORTSTATS:</div><div class='del'>-		rc = stl_getportstats(NULL, argp);</div><div class='add'>+		rc = stl_getportstats(NULL, NULL, argp);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case COM_CLRPORTSTATS:</div><div class='ctx'> 		rc = stl_clrportstats(NULL, argp);</div><div class='hunk'>@@ -3243,7 +3216,7 @@ static void stl_cd1400flowctrl(struct stlport *portp, int state)</div><div class='ctx'> </div><div class='ctx'> 	if (portp == NULL)</div><div class='ctx'> 		return;</div><div class='del'>-	tty = portp-&gt;port.tty;</div><div class='add'>+	tty = tty_port_tty_get(&amp;portp-&gt;port);</div><div class='ctx'> 	if (tty == NULL)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -3288,6 +3261,7 @@ static void stl_cd1400flowctrl(struct stlport *portp, int state)</div><div class='ctx'> </div><div class='ctx'> 	BRDDISABLE(portp-&gt;brdnr);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;brd_lock, flags);</div><div class='add'>+	tty_kref_put(tty);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='hunk'>@@ -3305,7 +3279,7 @@ static void stl_cd1400sendflow(struct stlport *portp, int state)</div><div class='ctx'> </div><div class='ctx'> 	if (portp == NULL)</div><div class='ctx'> 		return;</div><div class='del'>-	tty = portp-&gt;port.tty;</div><div class='add'>+	tty = tty_port_tty_get(&amp;portp-&gt;port);</div><div class='ctx'> 	if (tty == NULL)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -3325,6 +3299,7 @@ static void stl_cd1400sendflow(struct stlport *portp, int state)</div><div class='ctx'> 	}</div><div class='ctx'> 	BRDDISABLE(portp-&gt;brdnr);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;brd_lock, flags);</div><div class='add'>+	tty_kref_put(tty);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='hunk'>@@ -3478,6 +3453,7 @@ static void stl_cd1400txisr(struct stlpanel *panelp, int ioaddr)</div><div class='ctx'> 	int		len, stlen;</div><div class='ctx'> 	char		*head, *tail;</div><div class='ctx'> 	unsigned char	ioack, srer;</div><div class='add'>+	struct tty_struct *tty;</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("stl_cd1400txisr(panelp=%p,ioaddr=%x)\n", panelp, ioaddr);</div><div class='ctx'> </div><div class='hunk'>@@ -3504,8 +3480,11 @@ static void stl_cd1400txisr(struct stlpanel *panelp, int ioaddr)</div><div class='ctx'> 	if ((len == 0) || ((len &lt; STL_TXBUFLOW) &amp;&amp;</div><div class='ctx'> 	    (test_bit(ASYI_TXLOW, &amp;portp-&gt;istate) == 0))) {</div><div class='ctx'> 		set_bit(ASYI_TXLOW, &amp;portp-&gt;istate);</div><div class='del'>-		if (portp-&gt;port.tty)</div><div class='del'>-			tty_wakeup(portp-&gt;port.tty);</div><div class='add'>+		tty = tty_port_tty_get(&amp;portp-&gt;port);</div><div class='add'>+		if (tty) {</div><div class='add'>+			tty_wakeup(tty);</div><div class='add'>+			tty_kref_put(tty);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (len == 0) {</div><div class='hunk'>@@ -3569,7 +3548,7 @@ static void stl_cd1400rxisr(struct stlpanel *panelp, int ioaddr)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	portp = panelp-&gt;ports[(ioack &gt;&gt; 3)];</div><div class='del'>-	tty = portp-&gt;port.tty;</div><div class='add'>+	tty = tty_port_tty_get(&amp;portp-&gt;port);</div><div class='ctx'> </div><div class='ctx'> 	if ((ioack &amp; ACK_TYPMASK) == ACK_TYPRXGOOD) {</div><div class='ctx'> 		outb((RDCR + portp-&gt;uartaddr), ioaddr);</div><div class='hunk'>@@ -3633,10 +3612,12 @@ static void stl_cd1400rxisr(struct stlpanel *panelp, int ioaddr)</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		printk("STALLION: bad RX interrupt ack value=%x\n", ioack);</div><div class='add'>+		tty_kref_put(tty);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> stl_rxalldone:</div><div class='add'>+	tty_kref_put(tty);</div><div class='ctx'> 	outb((EOSRR + portp-&gt;uartaddr), ioaddr);</div><div class='ctx'> 	outb(0, (ioaddr + EREG_DATA));</div><div class='ctx'> }</div><div class='hunk'>@@ -4175,7 +4156,7 @@ static void stl_sc26198flowctrl(struct stlport *portp, int state)</div><div class='ctx'> </div><div class='ctx'> 	if (portp == NULL)</div><div class='ctx'> 		return;</div><div class='del'>-	tty = portp-&gt;port.tty;</div><div class='add'>+	tty = tty_port_tty_get(&amp;portp-&gt;port);</div><div class='ctx'> 	if (tty == NULL)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -4226,6 +4207,7 @@ static void stl_sc26198flowctrl(struct stlport *portp, int state)</div><div class='ctx'> </div><div class='ctx'> 	BRDDISABLE(portp-&gt;brdnr);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;brd_lock, flags);</div><div class='add'>+	tty_kref_put(tty);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='hunk'>@@ -4244,7 +4226,7 @@ static void stl_sc26198sendflow(struct stlport *portp, int state)</div><div class='ctx'> </div><div class='ctx'> 	if (portp == NULL)</div><div class='ctx'> 		return;</div><div class='del'>-	tty = portp-&gt;port.tty;</div><div class='add'>+	tty = tty_port_tty_get(&amp;portp-&gt;port);</div><div class='ctx'> 	if (tty == NULL)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -4269,6 +4251,7 @@ static void stl_sc26198sendflow(struct stlport *portp, int state)</div><div class='ctx'> 	}</div><div class='ctx'> 	BRDDISABLE(portp-&gt;brdnr);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;brd_lock, flags);</div><div class='add'>+	tty_kref_put(tty);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='hunk'>@@ -4408,6 +4391,7 @@ static void stl_sc26198intr(struct stlpanel *panelp, unsigned int iobase)</div><div class='ctx'> </div><div class='ctx'> static void stl_sc26198txisr(struct stlport *portp)</div><div class='ctx'> {</div><div class='add'>+	struct tty_struct *tty;</div><div class='ctx'> 	unsigned int	ioaddr;</div><div class='ctx'> 	unsigned char	mr0;</div><div class='ctx'> 	int		len, stlen;</div><div class='hunk'>@@ -4422,8 +4406,11 @@ static void stl_sc26198txisr(struct stlport *portp)</div><div class='ctx'> 	if ((len == 0) || ((len &lt; STL_TXBUFLOW) &amp;&amp;</div><div class='ctx'> 	    (test_bit(ASYI_TXLOW, &amp;portp-&gt;istate) == 0))) {</div><div class='ctx'> 		set_bit(ASYI_TXLOW, &amp;portp-&gt;istate);</div><div class='del'>-		if (portp-&gt;port.tty)</div><div class='del'>-			tty_wakeup(portp-&gt;port.tty);</div><div class='add'>+		tty = tty_port_tty_get(&amp;portp-&gt;port);</div><div class='add'>+		if (tty) {</div><div class='add'>+			tty_wakeup(tty);</div><div class='add'>+			tty_kref_put(tty);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (len == 0) {</div><div class='hunk'>@@ -4476,7 +4463,7 @@ static void stl_sc26198rxisr(struct stlport *portp, unsigned int iack)</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("stl_sc26198rxisr(portp=%p,iack=%x)\n", portp, iack);</div><div class='ctx'> </div><div class='del'>-	tty = portp-&gt;port.tty;</div><div class='add'>+	tty = tty_port_tty_get(&amp;portp-&gt;port);</div><div class='ctx'> 	ioaddr = portp-&gt;ioaddr;</div><div class='ctx'> 	outb(GIBCR, (ioaddr + XP_ADDR));</div><div class='ctx'> 	len = inb(ioaddr + XP_DATA) + 1;</div><div class='hunk'>@@ -4515,6 +4502,7 @@ static void stl_sc26198rxisr(struct stlport *portp, unsigned int iack)</div><div class='ctx'> 			stl_sc26198txunflow(portp, tty);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+	tty_kref_put(tty);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='hunk'>@@ -4528,7 +4516,7 @@ static void stl_sc26198rxbadch(struct stlport *portp, unsigned char status, char</div><div class='ctx'> 	struct tty_struct	*tty;</div><div class='ctx'> 	unsigned int		ioaddr;</div><div class='ctx'> </div><div class='del'>-	tty = portp-&gt;port.tty;</div><div class='add'>+	tty = tty_port_tty_get(&amp;portp-&gt;port);</div><div class='ctx'> 	ioaddr = portp-&gt;ioaddr;</div><div class='ctx'> </div><div class='ctx'> 	if (status &amp; SR_RXPARITY)</div><div class='hunk'>@@ -4566,6 +4554,7 @@ static void stl_sc26198rxbadch(struct stlport *portp, unsigned char status, char</div><div class='ctx'> 		if (status == 0)</div><div class='ctx'> 			portp-&gt;stats.rxtotal++;</div><div class='ctx'> 	}</div><div class='add'>+	tty_kref_put(tty);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='hunk'>@@ -4754,8 +4743,8 @@ static int __init stallion_module_init(void)</div><div class='ctx'> 	if (IS_ERR(stallion_class))</div><div class='ctx'> 		printk("STALLION: failed to create class\n");</div><div class='ctx'> 	for (i = 0; i &lt; 4; i++)</div><div class='del'>-		device_create_drvdata(stallion_class, NULL, MKDEV(STL_SIOMEMMAJOR, i),</div><div class='del'>-				      NULL, "staliomem%d", i);</div><div class='add'>+		device_create(stallion_class, NULL, MKDEV(STL_SIOMEMMAJOR, i),</div><div class='add'>+			      NULL, "staliomem%d", i);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> err_unrtty:</div><div class='head'>diff --git a/drivers/char/sx.c b/drivers/char/sx.c<br/>index c385206f9db5..5b8d7a1aa3e6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/sx.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/char/sx.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/sx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/sx.c</a></div><div class='hunk'>@@ -2504,7 +2504,7 @@ static void __devexit sx_remove_card(struct sx_board *board,</div><div class='ctx'> 		del_timer(&amp;board-&gt;timer);</div><div class='ctx'> 		if (pdev) {</div><div class='ctx'> #ifdef CONFIG_PCI</div><div class='del'>-			pci_iounmap(pdev, board-&gt;base);</div><div class='add'>+			pci_iounmap(pdev, board-&gt;base2);</div><div class='ctx'> 			pci_release_region(pdev, IS_CF_BOARD(board) ? 3 : 2);</div><div class='ctx'> #endif</div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -2703,7 +2703,7 @@ static int __devinit sx_pci_probe(struct pci_dev *pdev,</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> err_unmap:</div><div class='del'>-	pci_iounmap(pdev, board-&gt;base);</div><div class='add'>+	pci_iounmap(pdev, board-&gt;base2);</div><div class='ctx'> err_reg:</div><div class='ctx'> 	pci_release_region(pdev, reg);</div><div class='ctx'> err_flag:</div><div class='head'>diff --git a/drivers/char/sysrq.c b/drivers/char/sysrq.c<br/>index 8fdfe9c871e3..dce4cc0e6953 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/sysrq.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/char/sysrq.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/sysrq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/sysrq.c</a></div><div class='hunk'>@@ -23,6 +23,7 @@</div><div class='ctx'> #include &lt;linux/reboot.h&gt;</div><div class='ctx'> #include &lt;linux/sysrq.h&gt;</div><div class='ctx'> #include &lt;linux/kbd_kern.h&gt;</div><div class='add'>+#include &lt;linux/proc_fs.h&gt;</div><div class='ctx'> #include &lt;linux/quotaops.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -326,6 +327,7 @@ static struct sysrq_key_op sysrq_moom_op = {</div><div class='ctx'> 	.handler	= sysrq_handle_moom,</div><div class='ctx'> 	.help_msg	= "Full",</div><div class='ctx'> 	.action_msg	= "Manual OOM execution",</div><div class='add'>+	.enable_mask	= SYSRQ_ENABLE_SIGNAL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void sysrq_handle_kill(int key, struct tty_struct *tty)</div><div class='hunk'>@@ -533,3 +535,32 @@ int unregister_sysrq_key(int key, struct sysrq_key_op *op_p)</div><div class='ctx'> 	return __sysrq_swap_key_ops(key, NULL, op_p);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(unregister_sysrq_key);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PROC_FS</div><div class='add'>+/*</div><div class='add'>+ * writing 'C' to /proc/sysrq-trigger is like sysrq-C</div><div class='add'>+ */</div><div class='add'>+static ssize_t write_sysrq_trigger(struct file *file, const char __user *buf,</div><div class='add'>+				   size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	if (count) {</div><div class='add'>+		char c;</div><div class='add'>+</div><div class='add'>+		if (get_user(c, buf))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		__handle_sysrq(c, NULL, 0);</div><div class='add'>+	}</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations proc_sysrq_trigger_operations = {</div><div class='add'>+	.write		= write_sysrq_trigger,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init sysrq_init(void)</div><div class='add'>+{</div><div class='add'>+	proc_create("sysrq-trigger", S_IWUSR, NULL, &amp;proc_sysrq_trigger_operations);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+module_init(sysrq_init);</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/char/tpm/Kconfig b/drivers/char/tpm/Kconfig<br/>index 3738cfa209ff..f5fc64f89c5c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/tpm/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/char/tpm/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/tpm/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/tpm/Kconfig</a></div><div class='hunk'>@@ -6,6 +6,7 @@ menuconfig TCG_TPM</div><div class='ctx'> 	tristate "TPM Hardware Support"</div><div class='ctx'> 	depends on HAS_IOMEM</div><div class='ctx'> 	depends on EXPERIMENTAL</div><div class='add'>+	select SECURITYFS</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  If you have a TPM security chip in your system, which</div><div class='ctx'> 	  implements the Trusted Computing Group's specification,</div><div class='head'>diff --git a/drivers/char/tpm/tpm.c b/drivers/char/tpm/tpm.c<br/>index ae766d868454..e70d13defde4 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/tpm/tpm.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/char/tpm/tpm.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/tpm/tpm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/tpm/tpm.c</a></div><div class='hunk'>@@ -525,19 +525,19 @@ void tpm_get_timeouts(struct tpm_chip *chip)</div><div class='ctx'> 	timeout =</div><div class='ctx'> 	    be32_to_cpu(*((__be32 *) (data + TPM_GET_CAP_RET_UINT32_1_IDX)));</div><div class='ctx'> 	if (timeout)</div><div class='del'>-		chip-&gt;vendor.timeout_a = msecs_to_jiffies(timeout);</div><div class='add'>+		chip-&gt;vendor.timeout_a = usecs_to_jiffies(timeout);</div><div class='ctx'> 	timeout =</div><div class='ctx'> 	    be32_to_cpu(*((__be32 *) (data + TPM_GET_CAP_RET_UINT32_2_IDX)));</div><div class='ctx'> 	if (timeout)</div><div class='del'>-		chip-&gt;vendor.timeout_b = msecs_to_jiffies(timeout);</div><div class='add'>+		chip-&gt;vendor.timeout_b = usecs_to_jiffies(timeout);</div><div class='ctx'> 	timeout =</div><div class='ctx'> 	    be32_to_cpu(*((__be32 *) (data + TPM_GET_CAP_RET_UINT32_3_IDX)));</div><div class='ctx'> 	if (timeout)</div><div class='del'>-		chip-&gt;vendor.timeout_c = msecs_to_jiffies(timeout);</div><div class='add'>+		chip-&gt;vendor.timeout_c = usecs_to_jiffies(timeout);</div><div class='ctx'> 	timeout =</div><div class='ctx'> 	    be32_to_cpu(*((__be32 *) (data + TPM_GET_CAP_RET_UINT32_4_IDX)));</div><div class='ctx'> 	if (timeout)</div><div class='del'>-		chip-&gt;vendor.timeout_d = msecs_to_jiffies(timeout);</div><div class='add'>+		chip-&gt;vendor.timeout_d = usecs_to_jiffies(timeout);</div><div class='ctx'> </div><div class='ctx'> duration:</div><div class='ctx'> 	memcpy(data, tpm_cap, sizeof(tpm_cap));</div><div class='hunk'>@@ -554,15 +554,22 @@ duration:</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;vendor.duration[TPM_SHORT] =</div><div class='del'>-	    msecs_to_jiffies(be32_to_cpu</div><div class='add'>+	    usecs_to_jiffies(be32_to_cpu</div><div class='ctx'> 			     (*((__be32 *) (data +</div><div class='ctx'> 					    TPM_GET_CAP_RET_UINT32_1_IDX))));</div><div class='add'>+	/* The Broadcom BCM0102 chipset in a Dell Latitude D820 gets the above</div><div class='add'>+	 * value wrong and apparently reports msecs rather than usecs. So we</div><div class='add'>+	 * fix up the resulting too-small TPM_SHORT value to make things work.</div><div class='add'>+	 */</div><div class='add'>+	if (chip-&gt;vendor.duration[TPM_SHORT] &lt; (HZ/100))</div><div class='add'>+		chip-&gt;vendor.duration[TPM_SHORT] = HZ;</div><div class='add'>+</div><div class='ctx'> 	chip-&gt;vendor.duration[TPM_MEDIUM] =</div><div class='del'>-	    msecs_to_jiffies(be32_to_cpu</div><div class='add'>+	    usecs_to_jiffies(be32_to_cpu</div><div class='ctx'> 			     (*((__be32 *) (data +</div><div class='ctx'> 					    TPM_GET_CAP_RET_UINT32_2_IDX))));</div><div class='ctx'> 	chip-&gt;vendor.duration[TPM_LONG] =</div><div class='del'>-	    msecs_to_jiffies(be32_to_cpu</div><div class='add'>+	    usecs_to_jiffies(be32_to_cpu</div><div class='ctx'> 			     (*((__be32 *) (data +</div><div class='ctx'> 					    TPM_GET_CAP_RET_UINT32_3_IDX))));</div><div class='ctx'> }</div><div class='hunk'>@@ -954,72 +961,63 @@ EXPORT_SYMBOL_GPL(tpm_store_cancel);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Device file system interface to the TPM</div><div class='add'>+ *</div><div class='add'>+ * It's assured that the chip will be opened just once,</div><div class='add'>+ * by the check of is_open variable, which is protected</div><div class='add'>+ * by driver_lock.</div><div class='ctx'>  */</div><div class='ctx'> int tpm_open(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='del'>-	int rc = 0, minor = iminor(inode);</div><div class='add'>+	int minor = iminor(inode);</div><div class='ctx'> 	struct tpm_chip *chip = NULL, *pos;</div><div class='ctx'> </div><div class='del'>-	lock_kernel();</div><div class='del'>-	spin_lock(&amp;driver_lock);</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(pos, &amp;tpm_chip_list, list) {</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	list_for_each_entry_rcu(pos, &amp;tpm_chip_list, list) {</div><div class='ctx'> 		if (pos-&gt;vendor.miscdev.minor == minor) {</div><div class='ctx'> 			chip = pos;</div><div class='add'>+			get_device(chip-&gt;dev);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> </div><div class='del'>-	if (chip == NULL) {</div><div class='del'>-		rc = -ENODEV;</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='add'>+	if (!chip)</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	if (chip-&gt;num_opens) {</div><div class='add'>+	if (test_and_set_bit(0, &amp;chip-&gt;is_open)) {</div><div class='ctx'> 		dev_dbg(chip-&gt;dev, "Another process owns this TPM\n");</div><div class='del'>-		rc = -EBUSY;</div><div class='del'>-		goto err_out;</div><div class='add'>+		put_device(chip-&gt;dev);</div><div class='add'>+		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	chip-&gt;num_opens++;</div><div class='del'>-	get_device(chip-&gt;dev);</div><div class='del'>-</div><div class='del'>-	spin_unlock(&amp;driver_lock);</div><div class='del'>-</div><div class='ctx'> 	chip-&gt;data_buffer = kmalloc(TPM_BUFSIZE * sizeof(u8), GFP_KERNEL);</div><div class='ctx'> 	if (chip-&gt;data_buffer == NULL) {</div><div class='del'>-		chip-&gt;num_opens--;</div><div class='add'>+		clear_bit(0, &amp;chip-&gt;is_open);</div><div class='ctx'> 		put_device(chip-&gt;dev);</div><div class='del'>-		unlock_kernel();</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	atomic_set(&amp;chip-&gt;data_pending, 0);</div><div class='ctx'> </div><div class='ctx'> 	file-&gt;private_data = chip;</div><div class='del'>-	unlock_kernel();</div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='del'>-err_out:</div><div class='del'>-	spin_unlock(&amp;driver_lock);</div><div class='del'>-	unlock_kernel();</div><div class='del'>-	return rc;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(tpm_open);</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Called on file close</div><div class='add'>+ */</div><div class='ctx'> int tpm_release(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='ctx'> 	struct tpm_chip *chip = file-&gt;private_data;</div><div class='ctx'> </div><div class='add'>+	del_singleshot_timer_sync(&amp;chip-&gt;user_read_timer);</div><div class='ctx'> 	flush_scheduled_work();</div><div class='del'>-	spin_lock(&amp;driver_lock);</div><div class='ctx'> 	file-&gt;private_data = NULL;</div><div class='del'>-	del_singleshot_timer_sync(&amp;chip-&gt;user_read_timer);</div><div class='ctx'> 	atomic_set(&amp;chip-&gt;data_pending, 0);</div><div class='del'>-	chip-&gt;num_opens--;</div><div class='del'>-	put_device(chip-&gt;dev);</div><div class='ctx'> 	kfree(chip-&gt;data_buffer);</div><div class='del'>-	spin_unlock(&amp;driver_lock);</div><div class='add'>+	clear_bit(0, &amp;chip-&gt;is_open);</div><div class='add'>+	put_device(chip-&gt;dev);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(tpm_release);</div><div class='hunk'>@@ -1093,13 +1091,11 @@ void tpm_remove_hardware(struct device *dev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;driver_lock);</div><div class='del'>-</div><div class='del'>-	list_del(&amp;chip-&gt;list);</div><div class='del'>-</div><div class='add'>+	list_del_rcu(&amp;chip-&gt;list);</div><div class='ctx'> 	spin_unlock(&amp;driver_lock);</div><div class='add'>+	synchronize_rcu();</div><div class='ctx'> </div><div class='ctx'> 	misc_deregister(&amp;chip-&gt;vendor.miscdev);</div><div class='del'>-</div><div class='ctx'> 	sysfs_remove_group(&amp;dev-&gt;kobj, chip-&gt;vendor.attr_group);</div><div class='ctx'> 	tpm_bios_log_teardown(chip-&gt;bios_dir);</div><div class='ctx'> </div><div class='hunk'>@@ -1144,25 +1140,33 @@ int tpm_pm_resume(struct device *dev)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(tpm_pm_resume);</div><div class='ctx'> </div><div class='add'>+/* In case vendor provided release function, call it too.*/</div><div class='add'>+</div><div class='add'>+void tpm_dev_vendor_release(struct tpm_chip *chip)</div><div class='add'>+{</div><div class='add'>+	if (chip-&gt;vendor.release)</div><div class='add'>+		chip-&gt;vendor.release(chip-&gt;dev);</div><div class='add'>+</div><div class='add'>+	clear_bit(chip-&gt;dev_num, dev_mask);</div><div class='add'>+	kfree(chip-&gt;vendor.miscdev.name);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(tpm_dev_vendor_release);</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Once all references to platform device are down to 0,</div><div class='ctx'>  * release all allocated structures.</div><div class='del'>- * In case vendor provided release function,</div><div class='del'>- * call it too.</div><div class='ctx'>  */</div><div class='ctx'> static void tpm_dev_release(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct tpm_chip *chip = dev_get_drvdata(dev);</div><div class='ctx'> </div><div class='del'>-	if (chip-&gt;vendor.release)</div><div class='del'>-		chip-&gt;vendor.release(dev);</div><div class='add'>+	tpm_dev_vendor_release(chip);</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;release(dev);</div><div class='del'>-</div><div class='del'>-	clear_bit(chip-&gt;dev_num, dev_mask);</div><div class='del'>-	kfree(chip-&gt;vendor.miscdev.name);</div><div class='ctx'> 	kfree(chip);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(tpm_dev_release);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Called from tpm_&lt;specific&gt;.c probe function only for devices </div><div class='hunk'>@@ -1171,8 +1175,8 @@ static void tpm_dev_release(struct device *dev)</div><div class='ctx'>  * upon errant exit from this function specific probe function should call</div><div class='ctx'>  * pci_disable_device</div><div class='ctx'>  */</div><div class='del'>-struct tpm_chip *tpm_register_hardware(struct device *dev, const struct tpm_vendor_specific</div><div class='del'>-				       *entry)</div><div class='add'>+struct tpm_chip *tpm_register_hardware(struct device *dev,</div><div class='add'>+					const struct tpm_vendor_specific *entry)</div><div class='ctx'> {</div><div class='ctx'> #define DEVNAME_SIZE 7</div><div class='ctx'> </div><div class='hunk'>@@ -1183,11 +1187,8 @@ struct tpm_chip *tpm_register_hardware(struct device *dev, const struct tpm_vend</div><div class='ctx'> 	chip = kzalloc(sizeof(*chip), GFP_KERNEL);</div><div class='ctx'> 	devname = kmalloc(DEVNAME_SIZE, GFP_KERNEL);</div><div class='ctx'> </div><div class='del'>-	if (chip == NULL || devname == NULL) {</div><div class='del'>-		kfree(chip);</div><div class='del'>-		kfree(devname);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='add'>+	if (chip == NULL || devname == NULL)</div><div class='add'>+		goto out_free;</div><div class='ctx'> </div><div class='ctx'> 	mutex_init(&amp;chip-&gt;buffer_mutex);</div><div class='ctx'> 	mutex_init(&amp;chip-&gt;tpm_mutex);</div><div class='hunk'>@@ -1204,8 +1205,7 @@ struct tpm_chip *tpm_register_hardware(struct device *dev, const struct tpm_vend</div><div class='ctx'> </div><div class='ctx'> 	if (chip-&gt;dev_num &gt;= TPM_NUM_DEVICES) {</div><div class='ctx'> 		dev_err(dev, "No available tpm device numbers\n");</div><div class='del'>-		kfree(chip);</div><div class='del'>-		return NULL;</div><div class='add'>+		goto out_free;</div><div class='ctx'> 	} else if (chip-&gt;dev_num == 0)</div><div class='ctx'> 		chip-&gt;vendor.miscdev.minor = TPM_MINOR;</div><div class='ctx'> 	else</div><div class='hunk'>@@ -1231,22 +1231,26 @@ struct tpm_chip *tpm_register_hardware(struct device *dev, const struct tpm_vend</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;driver_lock);</div><div class='del'>-</div><div class='del'>-	list_add(&amp;chip-&gt;list, &amp;tpm_chip_list);</div><div class='del'>-</div><div class='del'>-	spin_unlock(&amp;driver_lock);</div><div class='del'>-</div><div class='ctx'> 	if (sysfs_create_group(&amp;dev-&gt;kobj, chip-&gt;vendor.attr_group)) {</div><div class='del'>-		list_del(&amp;chip-&gt;list);</div><div class='ctx'> 		misc_deregister(&amp;chip-&gt;vendor.miscdev);</div><div class='ctx'> 		put_device(chip-&gt;dev);</div><div class='add'>+</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;bios_dir = tpm_bios_log_setup(devname);</div><div class='ctx'> </div><div class='add'>+	/* Make chip available */</div><div class='add'>+	spin_lock(&amp;driver_lock);</div><div class='add'>+	list_add_rcu(&amp;chip-&gt;list, &amp;tpm_chip_list);</div><div class='add'>+	spin_unlock(&amp;driver_lock);</div><div class='add'>+</div><div class='ctx'> 	return chip;</div><div class='add'>+</div><div class='add'>+out_free:</div><div class='add'>+	kfree(chip);</div><div class='add'>+	kfree(devname);</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(tpm_register_hardware);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h<br/>index e885148b4cfb..8e30df4a4388 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/tpm/tpm.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/char/tpm/tpm.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/tpm/tpm.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/tpm/tpm.h</a></div><div class='hunk'>@@ -90,7 +90,7 @@ struct tpm_chip {</div><div class='ctx'> 	struct device *dev;	/* Device stuff */</div><div class='ctx'> </div><div class='ctx'> 	int dev_num;		/* /dev/tpm# */</div><div class='del'>-	int num_opens;		/* only one allowed */</div><div class='add'>+	unsigned long is_open;	/* only one allowed */</div><div class='ctx'> 	int time_expired;</div><div class='ctx'> </div><div class='ctx'> 	/* Data passed to and from the tpm via the read/write calls */</div><div class='hunk'>@@ -132,6 +132,7 @@ extern struct tpm_chip* tpm_register_hardware(struct device *,</div><div class='ctx'> 				 const struct tpm_vendor_specific *);</div><div class='ctx'> extern int tpm_open(struct inode *, struct file *);</div><div class='ctx'> extern int tpm_release(struct inode *, struct file *);</div><div class='add'>+extern void tpm_dev_vendor_release(struct tpm_chip *);</div><div class='ctx'> extern ssize_t tpm_write(struct file *, const char __user *, size_t,</div><div class='ctx'> 			 loff_t *);</div><div class='ctx'> extern ssize_t tpm_read(struct file *, char __user *, size_t, loff_t *);</div><div class='head'>diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c<br/>index ed1879c0dd8d..717af7ad1bdf 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/tpm/tpm_tis.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/char/tpm/tpm_tis.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/tpm/tpm_tis.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/tpm/tpm_tis.c</a></div><div class='hunk'>@@ -630,12 +630,23 @@ static struct pnp_device_id tpm_pnp_tbl[] __devinitdata = {</div><div class='ctx'> 	{"", 0}			/* Terminator */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static __devexit void tpm_tis_pnp_remove(struct pnp_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct tpm_chip *chip = pnp_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	tpm_dev_vendor_release(chip);</div><div class='add'>+</div><div class='add'>+	kfree(chip);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> static struct pnp_driver tis_pnp_driver = {</div><div class='ctx'> 	.name = "tpm_tis",</div><div class='ctx'> 	.id_table = tpm_pnp_tbl,</div><div class='ctx'> 	.probe = tpm_tis_pnp_init,</div><div class='ctx'> 	.suspend = tpm_tis_pnp_suspend,</div><div class='ctx'> 	.resume = tpm_tis_pnp_resume,</div><div class='add'>+	.remove = tpm_tis_pnp_remove,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define TIS_HID_USR_IDX sizeof(tpm_pnp_tbl)/sizeof(struct pnp_device_id) -2</div><div class='hunk'>@@ -683,6 +694,7 @@ static void __exit cleanup_tis(void)</div><div class='ctx'> 	spin_lock(&amp;tis_lock);</div><div class='ctx'> 	list_for_each_entry_safe(i, j, &amp;tis_chips, list) {</div><div class='ctx'> 		chip = to_tpm_chip(i);</div><div class='add'>+		tpm_remove_hardware(chip-&gt;dev);</div><div class='ctx'> 		iowrite32(~TPM_GLOBAL_INT_ENABLE &amp;</div><div class='ctx'> 			  ioread32(chip-&gt;vendor.iobase +</div><div class='ctx'> 				   TPM_INT_ENABLE(chip-&gt;vendor.</div><div class='hunk'>@@ -694,9 +706,9 @@ static void __exit cleanup_tis(void)</div><div class='ctx'> 			free_irq(chip-&gt;vendor.irq, chip);</div><div class='ctx'> 		iounmap(i-&gt;iobase);</div><div class='ctx'> 		list_del(&amp;i-&gt;list);</div><div class='del'>-		tpm_remove_hardware(chip-&gt;dev);</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock(&amp;tis_lock);</div><div class='add'>+</div><div class='ctx'> 	if (force) {</div><div class='ctx'> 		platform_device_unregister(pdev);</div><div class='ctx'> 		driver_unregister(&amp;tis_drv);</div><div class='head'>diff --git a/drivers/char/tty_audit.c b/drivers/char/tty_audit.c<br/>index 3582f43345a8..5787249934c8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/tty_audit.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/char/tty_audit.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/tty_audit.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/tty_audit.c</a></div><div class='hunk'>@@ -93,7 +93,7 @@ static void tty_audit_buf_push(struct task_struct *tsk, uid_t loginuid,</div><div class='ctx'> 		get_task_comm(name, tsk);</div><div class='ctx'> 		audit_log_untrustedstring(ab, name);</div><div class='ctx'> 		audit_log_format(ab, " data=");</div><div class='del'>-		audit_log_n_untrustedstring(ab, buf-&gt;data, buf-&gt;valid);</div><div class='add'>+		audit_log_n_hex(ab, buf-&gt;data, buf-&gt;valid);</div><div class='ctx'> 		audit_log_end(ab);</div><div class='ctx'> 	}</div><div class='ctx'> 	buf-&gt;valid = 0;</div><div class='head'>diff --git a/drivers/char/tty_buffer.c b/drivers/char/tty_buffer.c<br/>new file mode 100644<br/>index 000000000000..810ee25d66a4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/tty_buffer.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/tty_buffer.c</a></div><div class='hunk'>@@ -0,0 +1,511 @@</div><div class='add'>+/*</div><div class='add'>+ * Tty buffer allocation management</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/tty.h&gt;</div><div class='add'>+#include &lt;linux/tty_driver.h&gt;</div><div class='add'>+#include &lt;linux/tty_flip.h&gt;</div><div class='add'>+#include &lt;linux/timer.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/wait.h&gt;</div><div class='add'>+#include &lt;linux/bitops.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	tty_buffer_free_all		-	free buffers used by a tty</div><div class='add'>+ *	@tty: tty to free from</div><div class='add'>+ *</div><div class='add'>+ *	Remove all the buffers pending on a tty whether queued with data</div><div class='add'>+ *	or in the free ring. Must be called when the tty is no longer in use</div><div class='add'>+ *</div><div class='add'>+ *	Locking: none</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+void tty_buffer_free_all(struct tty_struct *tty)</div><div class='add'>+{</div><div class='add'>+	struct tty_buffer *thead;</div><div class='add'>+	while ((thead = tty-&gt;buf.head) != NULL) {</div><div class='add'>+		tty-&gt;buf.head = thead-&gt;next;</div><div class='add'>+		kfree(thead);</div><div class='add'>+	}</div><div class='add'>+	while ((thead = tty-&gt;buf.free) != NULL) {</div><div class='add'>+		tty-&gt;buf.free = thead-&gt;next;</div><div class='add'>+		kfree(thead);</div><div class='add'>+	}</div><div class='add'>+	tty-&gt;buf.tail = NULL;</div><div class='add'>+	tty-&gt;buf.memory_used = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	tty_buffer_alloc	-	allocate a tty buffer</div><div class='add'>+ *	@tty: tty device</div><div class='add'>+ *	@size: desired size (characters)</div><div class='add'>+ *</div><div class='add'>+ *	Allocate a new tty buffer to hold the desired number of characters.</div><div class='add'>+ *	Return NULL if out of memory or the allocation would exceed the</div><div class='add'>+ *	per device queue</div><div class='add'>+ *</div><div class='add'>+ *	Locking: Caller must hold tty-&gt;buf.lock</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static struct tty_buffer *tty_buffer_alloc(struct tty_struct *tty, size_t size)</div><div class='add'>+{</div><div class='add'>+	struct tty_buffer *p;</div><div class='add'>+</div><div class='add'>+	if (tty-&gt;buf.memory_used + size &gt; 65536)</div><div class='add'>+		return NULL;</div><div class='add'>+	p = kmalloc(sizeof(struct tty_buffer) + 2 * size, GFP_ATOMIC);</div><div class='add'>+	if (p == NULL)</div><div class='add'>+		return NULL;</div><div class='add'>+	p-&gt;used = 0;</div><div class='add'>+	p-&gt;size = size;</div><div class='add'>+	p-&gt;next = NULL;</div><div class='add'>+	p-&gt;commit = 0;</div><div class='add'>+	p-&gt;read = 0;</div><div class='add'>+	p-&gt;char_buf_ptr = (char *)(p-&gt;data);</div><div class='add'>+	p-&gt;flag_buf_ptr = (unsigned char *)p-&gt;char_buf_ptr + size;</div><div class='add'>+	tty-&gt;buf.memory_used += size;</div><div class='add'>+	return p;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	tty_buffer_free		-	free a tty buffer</div><div class='add'>+ *	@tty: tty owning the buffer</div><div class='add'>+ *	@b: the buffer to free</div><div class='add'>+ *</div><div class='add'>+ *	Free a tty buffer, or add it to the free list according to our</div><div class='add'>+ *	internal strategy</div><div class='add'>+ *</div><div class='add'>+ *	Locking: Caller must hold tty-&gt;buf.lock</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static void tty_buffer_free(struct tty_struct *tty, struct tty_buffer *b)</div><div class='add'>+{</div><div class='add'>+	/* Dumb strategy for now - should keep some stats */</div><div class='add'>+	tty-&gt;buf.memory_used -= b-&gt;size;</div><div class='add'>+	WARN_ON(tty-&gt;buf.memory_used &lt; 0);</div><div class='add'>+</div><div class='add'>+	if (b-&gt;size &gt;= 512)</div><div class='add'>+		kfree(b);</div><div class='add'>+	else {</div><div class='add'>+		b-&gt;next = tty-&gt;buf.free;</div><div class='add'>+		tty-&gt;buf.free = b;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	__tty_buffer_flush		-	flush full tty buffers</div><div class='add'>+ *	@tty: tty to flush</div><div class='add'>+ *</div><div class='add'>+ *	flush all the buffers containing receive data. Caller must</div><div class='add'>+ *	hold the buffer lock and must have ensured no parallel flush to</div><div class='add'>+ *	ldisc is running.</div><div class='add'>+ *</div><div class='add'>+ *	Locking: Caller must hold tty-&gt;buf.lock</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static void __tty_buffer_flush(struct tty_struct *tty)</div><div class='add'>+{</div><div class='add'>+	struct tty_buffer *thead;</div><div class='add'>+</div><div class='add'>+	while ((thead = tty-&gt;buf.head) != NULL) {</div><div class='add'>+		tty-&gt;buf.head = thead-&gt;next;</div><div class='add'>+		tty_buffer_free(tty, thead);</div><div class='add'>+	}</div><div class='add'>+	tty-&gt;buf.tail = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	tty_buffer_flush		-	flush full tty buffers</div><div class='add'>+ *	@tty: tty to flush</div><div class='add'>+ *</div><div class='add'>+ *	flush all the buffers containing receive data. If the buffer is</div><div class='add'>+ *	being processed by flush_to_ldisc then we defer the processing</div><div class='add'>+ *	to that function</div><div class='add'>+ *</div><div class='add'>+ *	Locking: none</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+void tty_buffer_flush(struct tty_struct *tty)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	spin_lock_irqsave(&amp;tty-&gt;buf.lock, flags);</div><div class='add'>+</div><div class='add'>+	/* If the data is being pushed to the tty layer then we can't</div><div class='add'>+	   process it here. Instead set a flag and the flush_to_ldisc</div><div class='add'>+	   path will process the flush request before it exits */</div><div class='add'>+	if (test_bit(TTY_FLUSHING, &amp;tty-&gt;flags)) {</div><div class='add'>+		set_bit(TTY_FLUSHPENDING, &amp;tty-&gt;flags);</div><div class='add'>+		spin_unlock_irqrestore(&amp;tty-&gt;buf.lock, flags);</div><div class='add'>+		wait_event(tty-&gt;read_wait,</div><div class='add'>+				test_bit(TTY_FLUSHPENDING, &amp;tty-&gt;flags) == 0);</div><div class='add'>+		return;</div><div class='add'>+	} else</div><div class='add'>+		__tty_buffer_flush(tty);</div><div class='add'>+	spin_unlock_irqrestore(&amp;tty-&gt;buf.lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	tty_buffer_find		-	find a free tty buffer</div><div class='add'>+ *	@tty: tty owning the buffer</div><div class='add'>+ *	@size: characters wanted</div><div class='add'>+ *</div><div class='add'>+ *	Locate an existing suitable tty buffer or if we are lacking one then</div><div class='add'>+ *	allocate a new one. We round our buffers off in 256 character chunks</div><div class='add'>+ *	to get better allocation behaviour.</div><div class='add'>+ *</div><div class='add'>+ *	Locking: Caller must hold tty-&gt;buf.lock</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static struct tty_buffer *tty_buffer_find(struct tty_struct *tty, size_t size)</div><div class='add'>+{</div><div class='add'>+	struct tty_buffer **tbh = &amp;tty-&gt;buf.free;</div><div class='add'>+	while ((*tbh) != NULL) {</div><div class='add'>+		struct tty_buffer *t = *tbh;</div><div class='add'>+		if (t-&gt;size &gt;= size) {</div><div class='add'>+			*tbh = t-&gt;next;</div><div class='add'>+			t-&gt;next = NULL;</div><div class='add'>+			t-&gt;used = 0;</div><div class='add'>+			t-&gt;commit = 0;</div><div class='add'>+			t-&gt;read = 0;</div><div class='add'>+			tty-&gt;buf.memory_used += t-&gt;size;</div><div class='add'>+			return t;</div><div class='add'>+		}</div><div class='add'>+		tbh = &amp;((*tbh)-&gt;next);</div><div class='add'>+	}</div><div class='add'>+	/* Round the buffer size out */</div><div class='add'>+	size = (size + 0xFF) &amp; ~0xFF;</div><div class='add'>+	return tty_buffer_alloc(tty, size);</div><div class='add'>+	/* Should possibly check if this fails for the largest buffer we</div><div class='add'>+	   have queued and recycle that ? */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	tty_buffer_request_room		-	grow tty buffer if needed</div><div class='add'>+ *	@tty: tty structure</div><div class='add'>+ *	@size: size desired</div><div class='add'>+ *</div><div class='add'>+ *	Make at least size bytes of linear space available for the tty</div><div class='add'>+ *	buffer. If we fail return the size we managed to find.</div><div class='add'>+ *</div><div class='add'>+ *	Locking: Takes tty-&gt;buf.lock</div><div class='add'>+ */</div><div class='add'>+int tty_buffer_request_room(struct tty_struct *tty, size_t size)</div><div class='add'>+{</div><div class='add'>+	struct tty_buffer *b, *n;</div><div class='add'>+	int left;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;tty-&gt;buf.lock, flags);</div><div class='add'>+</div><div class='add'>+	/* OPTIMISATION: We could keep a per tty "zero" sized buffer to</div><div class='add'>+	   remove this conditional if its worth it. This would be invisible</div><div class='add'>+	   to the callers */</div><div class='add'>+	if ((b = tty-&gt;buf.tail) != NULL)</div><div class='add'>+		left = b-&gt;size - b-&gt;used;</div><div class='add'>+	else</div><div class='add'>+		left = 0;</div><div class='add'>+</div><div class='add'>+	if (left &lt; size) {</div><div class='add'>+		/* This is the slow path - looking for new buffers to use */</div><div class='add'>+		if ((n = tty_buffer_find(tty, size)) != NULL) {</div><div class='add'>+			if (b != NULL) {</div><div class='add'>+				b-&gt;next = n;</div><div class='add'>+				b-&gt;commit = b-&gt;used;</div><div class='add'>+			} else</div><div class='add'>+				tty-&gt;buf.head = n;</div><div class='add'>+			tty-&gt;buf.tail = n;</div><div class='add'>+		} else</div><div class='add'>+			size = left;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;tty-&gt;buf.lock, flags);</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(tty_buffer_request_room);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	tty_insert_flip_string	-	Add characters to the tty buffer</div><div class='add'>+ *	@tty: tty structure</div><div class='add'>+ *	@chars: characters</div><div class='add'>+ *	@size: size</div><div class='add'>+ *</div><div class='add'>+ *	Queue a series of bytes to the tty buffering. All the characters</div><div class='add'>+ *	passed are marked as without error. Returns the number added.</div><div class='add'>+ *</div><div class='add'>+ *	Locking: Called functions may take tty-&gt;buf.lock</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+int tty_insert_flip_string(struct tty_struct *tty, const unsigned char *chars,</div><div class='add'>+				size_t size)</div><div class='add'>+{</div><div class='add'>+	int copied = 0;</div><div class='add'>+	do {</div><div class='add'>+		int space = tty_buffer_request_room(tty, size - copied);</div><div class='add'>+		struct tty_buffer *tb = tty-&gt;buf.tail;</div><div class='add'>+		/* If there is no space then tb may be NULL */</div><div class='add'>+		if (unlikely(space == 0))</div><div class='add'>+			break;</div><div class='add'>+		memcpy(tb-&gt;char_buf_ptr + tb-&gt;used, chars, space);</div><div class='add'>+		memset(tb-&gt;flag_buf_ptr + tb-&gt;used, TTY_NORMAL, space);</div><div class='add'>+		tb-&gt;used += space;</div><div class='add'>+		copied += space;</div><div class='add'>+		chars += space;</div><div class='add'>+		/* There is a small chance that we need to split the data over</div><div class='add'>+		   several buffers. If this is the case we must loop */</div><div class='add'>+	} while (unlikely(size &gt; copied));</div><div class='add'>+	return copied;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(tty_insert_flip_string);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	tty_insert_flip_string_flags	-	Add characters to the tty buffer</div><div class='add'>+ *	@tty: tty structure</div><div class='add'>+ *	@chars: characters</div><div class='add'>+ *	@flags: flag bytes</div><div class='add'>+ *	@size: size</div><div class='add'>+ *</div><div class='add'>+ *	Queue a series of bytes to the tty buffering. For each character</div><div class='add'>+ *	the flags array indicates the status of the character. Returns the</div><div class='add'>+ *	number added.</div><div class='add'>+ *</div><div class='add'>+ *	Locking: Called functions may take tty-&gt;buf.lock</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+int tty_insert_flip_string_flags(struct tty_struct *tty,</div><div class='add'>+		const unsigned char *chars, const char *flags, size_t size)</div><div class='add'>+{</div><div class='add'>+	int copied = 0;</div><div class='add'>+	do {</div><div class='add'>+		int space = tty_buffer_request_room(tty, size - copied);</div><div class='add'>+		struct tty_buffer *tb = tty-&gt;buf.tail;</div><div class='add'>+		/* If there is no space then tb may be NULL */</div><div class='add'>+		if (unlikely(space == 0))</div><div class='add'>+			break;</div><div class='add'>+		memcpy(tb-&gt;char_buf_ptr + tb-&gt;used, chars, space);</div><div class='add'>+		memcpy(tb-&gt;flag_buf_ptr + tb-&gt;used, flags, space);</div><div class='add'>+		tb-&gt;used += space;</div><div class='add'>+		copied += space;</div><div class='add'>+		chars += space;</div><div class='add'>+		flags += space;</div><div class='add'>+		/* There is a small chance that we need to split the data over</div><div class='add'>+		   several buffers. If this is the case we must loop */</div><div class='add'>+	} while (unlikely(size &gt; copied));</div><div class='add'>+	return copied;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(tty_insert_flip_string_flags);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	tty_schedule_flip	-	push characters to ldisc</div><div class='add'>+ *	@tty: tty to push from</div><div class='add'>+ *</div><div class='add'>+ *	Takes any pending buffers and transfers their ownership to the</div><div class='add'>+ *	ldisc side of the queue. It then schedules those characters for</div><div class='add'>+ *	processing by the line discipline.</div><div class='add'>+ *</div><div class='add'>+ *	Locking: Takes tty-&gt;buf.lock</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+void tty_schedule_flip(struct tty_struct *tty)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	spin_lock_irqsave(&amp;tty-&gt;buf.lock, flags);</div><div class='add'>+	if (tty-&gt;buf.tail != NULL)</div><div class='add'>+		tty-&gt;buf.tail-&gt;commit = tty-&gt;buf.tail-&gt;used;</div><div class='add'>+	spin_unlock_irqrestore(&amp;tty-&gt;buf.lock, flags);</div><div class='add'>+	schedule_delayed_work(&amp;tty-&gt;buf.work, 1);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(tty_schedule_flip);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	tty_prepare_flip_string		-	make room for characters</div><div class='add'>+ *	@tty: tty</div><div class='add'>+ *	@chars: return pointer for character write area</div><div class='add'>+ *	@size: desired size</div><div class='add'>+ *</div><div class='add'>+ *	Prepare a block of space in the buffer for data. Returns the length</div><div class='add'>+ *	available and buffer pointer to the space which is now allocated and</div><div class='add'>+ *	accounted for as ready for normal characters. This is used for drivers</div><div class='add'>+ *	that need their own block copy routines into the buffer. There is no</div><div class='add'>+ *	guarantee the buffer is a DMA target!</div><div class='add'>+ *</div><div class='add'>+ *	Locking: May call functions taking tty-&gt;buf.lock</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+int tty_prepare_flip_string(struct tty_struct *tty, unsigned char **chars,</div><div class='add'>+								size_t size)</div><div class='add'>+{</div><div class='add'>+	int space = tty_buffer_request_room(tty, size);</div><div class='add'>+	if (likely(space)) {</div><div class='add'>+		struct tty_buffer *tb = tty-&gt;buf.tail;</div><div class='add'>+		*chars = tb-&gt;char_buf_ptr + tb-&gt;used;</div><div class='add'>+		memset(tb-&gt;flag_buf_ptr + tb-&gt;used, TTY_NORMAL, space);</div><div class='add'>+		tb-&gt;used += space;</div><div class='add'>+	}</div><div class='add'>+	return space;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(tty_prepare_flip_string);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	tty_prepare_flip_string_flags	-	make room for characters</div><div class='add'>+ *	@tty: tty</div><div class='add'>+ *	@chars: return pointer for character write area</div><div class='add'>+ *	@flags: return pointer for status flag write area</div><div class='add'>+ *	@size: desired size</div><div class='add'>+ *</div><div class='add'>+ *	Prepare a block of space in the buffer for data. Returns the length</div><div class='add'>+ *	available and buffer pointer to the space which is now allocated and</div><div class='add'>+ *	accounted for as ready for characters. This is used for drivers</div><div class='add'>+ *	that need their own block copy routines into the buffer. There is no</div><div class='add'>+ *	guarantee the buffer is a DMA target!</div><div class='add'>+ *</div><div class='add'>+ *	Locking: May call functions taking tty-&gt;buf.lock</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+int tty_prepare_flip_string_flags(struct tty_struct *tty,</div><div class='add'>+			unsigned char **chars, char **flags, size_t size)</div><div class='add'>+{</div><div class='add'>+	int space = tty_buffer_request_room(tty, size);</div><div class='add'>+	if (likely(space)) {</div><div class='add'>+		struct tty_buffer *tb = tty-&gt;buf.tail;</div><div class='add'>+		*chars = tb-&gt;char_buf_ptr + tb-&gt;used;</div><div class='add'>+		*flags = tb-&gt;flag_buf_ptr + tb-&gt;used;</div><div class='add'>+		tb-&gt;used += space;</div><div class='add'>+	}</div><div class='add'>+	return space;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(tty_prepare_flip_string_flags);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	flush_to_ldisc</div><div class='add'>+ *	@work: tty structure passed from work queue.</div><div class='add'>+ *</div><div class='add'>+ *	This routine is called out of the software interrupt to flush data</div><div class='add'>+ *	from the buffer chain to the line discipline.</div><div class='add'>+ *</div><div class='add'>+ *	Locking: holds tty-&gt;buf.lock to guard buffer list. Drops the lock</div><div class='add'>+ *	while invoking the line discipline receive_buf method. The</div><div class='add'>+ *	receive_buf method is single threaded for each tty instance.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static void flush_to_ldisc(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct tty_struct *tty =</div><div class='add'>+		container_of(work, struct tty_struct, buf.work.work);</div><div class='add'>+	unsigned long 	flags;</div><div class='add'>+	struct tty_ldisc *disc;</div><div class='add'>+	struct tty_buffer *tbuf, *head;</div><div class='add'>+	char *char_buf;</div><div class='add'>+	unsigned char *flag_buf;</div><div class='add'>+</div><div class='add'>+	disc = tty_ldisc_ref(tty);</div><div class='add'>+	if (disc == NULL)	/*  !TTY_LDISC */</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;tty-&gt;buf.lock, flags);</div><div class='add'>+	/* So we know a flush is running */</div><div class='add'>+	set_bit(TTY_FLUSHING, &amp;tty-&gt;flags);</div><div class='add'>+	head = tty-&gt;buf.head;</div><div class='add'>+	if (head != NULL) {</div><div class='add'>+		tty-&gt;buf.head = NULL;</div><div class='add'>+		for (;;) {</div><div class='add'>+			int count = head-&gt;commit - head-&gt;read;</div><div class='add'>+			if (!count) {</div><div class='add'>+				if (head-&gt;next == NULL)</div><div class='add'>+					break;</div><div class='add'>+				tbuf = head;</div><div class='add'>+				head = head-&gt;next;</div><div class='add'>+				tty_buffer_free(tty, tbuf);</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+			/* Ldisc or user is trying to flush the buffers</div><div class='add'>+			   we are feeding to the ldisc, stop feeding the</div><div class='add'>+			   line discipline as we want to empty the queue */</div><div class='add'>+			if (test_bit(TTY_FLUSHPENDING, &amp;tty-&gt;flags))</div><div class='add'>+				break;</div><div class='add'>+			if (!tty-&gt;receive_room) {</div><div class='add'>+				schedule_delayed_work(&amp;tty-&gt;buf.work, 1);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			if (count &gt; tty-&gt;receive_room)</div><div class='add'>+				count = tty-&gt;receive_room;</div><div class='add'>+			char_buf = head-&gt;char_buf_ptr + head-&gt;read;</div><div class='add'>+			flag_buf = head-&gt;flag_buf_ptr + head-&gt;read;</div><div class='add'>+			head-&gt;read += count;</div><div class='add'>+			spin_unlock_irqrestore(&amp;tty-&gt;buf.lock, flags);</div><div class='add'>+			disc-&gt;ops-&gt;receive_buf(tty, char_buf,</div><div class='add'>+							flag_buf, count);</div><div class='add'>+			spin_lock_irqsave(&amp;tty-&gt;buf.lock, flags);</div><div class='add'>+		}</div><div class='add'>+		/* Restore the queue head */</div><div class='add'>+		tty-&gt;buf.head = head;</div><div class='add'>+	}</div><div class='add'>+	/* We may have a deferred request to flush the input buffer,</div><div class='add'>+	   if so pull the chain under the lock and empty the queue */</div><div class='add'>+	if (test_bit(TTY_FLUSHPENDING, &amp;tty-&gt;flags)) {</div><div class='add'>+		__tty_buffer_flush(tty);</div><div class='add'>+		clear_bit(TTY_FLUSHPENDING, &amp;tty-&gt;flags);</div><div class='add'>+		wake_up(&amp;tty-&gt;read_wait);</div><div class='add'>+	}</div><div class='add'>+	clear_bit(TTY_FLUSHING, &amp;tty-&gt;flags);</div><div class='add'>+	spin_unlock_irqrestore(&amp;tty-&gt;buf.lock, flags);</div><div class='add'>+</div><div class='add'>+	tty_ldisc_deref(disc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	tty_flip_buffer_push	-	terminal</div><div class='add'>+ *	@tty: tty to push</div><div class='add'>+ *</div><div class='add'>+ *	Queue a push of the terminal flip buffers to the line discipline. This</div><div class='add'>+ *	function must not be called from IRQ context if tty-&gt;low_latency is set.</div><div class='add'>+ *</div><div class='add'>+ *	In the event of the queue being busy for flipping the work will be</div><div class='add'>+ *	held off and retried later.</div><div class='add'>+ *</div><div class='add'>+ *	Locking: tty buffer lock. Driver locks in low latency mode.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+void tty_flip_buffer_push(struct tty_struct *tty)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	spin_lock_irqsave(&amp;tty-&gt;buf.lock, flags);</div><div class='add'>+	if (tty-&gt;buf.tail != NULL)</div><div class='add'>+		tty-&gt;buf.tail-&gt;commit = tty-&gt;buf.tail-&gt;used;</div><div class='add'>+	spin_unlock_irqrestore(&amp;tty-&gt;buf.lock, flags);</div><div class='add'>+</div><div class='add'>+	if (tty-&gt;low_latency)</div><div class='add'>+		flush_to_ldisc(&amp;tty-&gt;buf.work.work);</div><div class='add'>+	else</div><div class='add'>+		schedule_delayed_work(&amp;tty-&gt;buf.work, 1);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(tty_flip_buffer_push);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	tty_buffer_init		-	prepare a tty buffer structure</div><div class='add'>+ *	@tty: tty to initialise</div><div class='add'>+ *</div><div class='add'>+ *	Set up the initial state of the buffer management for a tty device.</div><div class='add'>+ *	Must be called before the other tty buffer functions are used.</div><div class='add'>+ *</div><div class='add'>+ *	Locking: none</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+void tty_buffer_init(struct tty_struct *tty)</div><div class='add'>+{</div><div class='add'>+	spin_lock_init(&amp;tty-&gt;buf.lock);</div><div class='add'>+	tty-&gt;buf.head = NULL;</div><div class='add'>+	tty-&gt;buf.tail = NULL;</div><div class='add'>+	tty-&gt;buf.free = NULL;</div><div class='add'>+	tty-&gt;buf.memory_used = 0;</div><div class='add'>+	INIT_DELAYED_WORK(&amp;tty-&gt;buf.work, flush_to_ldisc);</div><div class='add'>+}</div><div class='add'>+</div><div class='head'>diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c<br/>index e4dce8709541..59f472143f08 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/tty_io.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/char/tty_io.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/tty_io.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/tty_io.c</a></div><div class='hunk'>@@ -49,7 +49,7 @@</div><div class='ctx'>  * implement CONFIG_VT and generalize console device interface.</div><div class='ctx'>  *	-- Marko Kohtala &lt;Marko.Kohtala@hut.fi&gt;, March 97</div><div class='ctx'>  *</div><div class='del'>- * Rewrote init_dev and release_dev to eliminate races.</div><div class='add'>+ * Rewrote tty_init_dev and tty_release_dev to eliminate races.</div><div class='ctx'>  *	-- Bill Hawes &lt;whawes@star.net&gt;, June 97</div><div class='ctx'>  *</div><div class='ctx'>  * Added devfs support.</div><div class='hunk'>@@ -136,13 +136,6 @@ LIST_HEAD(tty_drivers);			/* linked list of tty drivers */</div><div class='ctx'> DEFINE_MUTEX(tty_mutex);</div><div class='ctx'> EXPORT_SYMBOL(tty_mutex);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_UNIX98_PTYS</div><div class='del'>-extern struct tty_driver *ptm_driver;	/* Unix98 pty masters; for /dev/ptmx */</div><div class='del'>-static int ptmx_open(struct inode *, struct file *);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static void initialize_tty_struct(struct tty_struct *tty);</div><div class='del'>-</div><div class='ctx'> static ssize_t tty_read(struct file *, char __user *, size_t, loff_t *);</div><div class='ctx'> static ssize_t tty_write(struct file *, const char __user *, size_t, loff_t *);</div><div class='ctx'> ssize_t redirected_tty_write(struct file *, const char __user *,</div><div class='hunk'>@@ -171,13 +164,11 @@ static void proc_set_tty(struct task_struct *tsk, struct tty_struct *tty);</div><div class='ctx'>  *	Locking: none</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static struct tty_struct *alloc_tty_struct(void)</div><div class='add'>+struct tty_struct *alloc_tty_struct(void)</div><div class='ctx'> {</div><div class='ctx'> 	return kzalloc(sizeof(struct tty_struct), GFP_KERNEL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void tty_buffer_free_all(struct tty_struct *);</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  *	free_tty_struct		-	free a disused tty</div><div class='ctx'>  *	@tty: tty struct to free</div><div class='hunk'>@@ -187,7 +178,7 @@ static void tty_buffer_free_all(struct tty_struct *);</div><div class='ctx'>  *	Locking: none. Must be called after tty is definitely unused</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static inline void free_tty_struct(struct tty_struct *tty)</div><div class='add'>+void free_tty_struct(struct tty_struct *tty)</div><div class='ctx'> {</div><div class='ctx'> 	kfree(tty-&gt;write_buf);</div><div class='ctx'> 	tty_buffer_free_all(tty);</div><div class='hunk'>@@ -263,398 +254,6 @@ static int check_tty_count(struct tty_struct *tty, const char *routine)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Tty buffer allocation management</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	tty_buffer_free_all		-	free buffers used by a tty</div><div class='del'>- *	@tty: tty to free from</div><div class='del'>- *</div><div class='del'>- *	Remove all the buffers pending on a tty whether queued with data</div><div class='del'>- *	or in the free ring. Must be called when the tty is no longer in use</div><div class='del'>- *</div><div class='del'>- *	Locking: none</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void tty_buffer_free_all(struct tty_struct *tty)</div><div class='del'>-{</div><div class='del'>-	struct tty_buffer *thead;</div><div class='del'>-	while ((thead = tty-&gt;buf.head) != NULL) {</div><div class='del'>-		tty-&gt;buf.head = thead-&gt;next;</div><div class='del'>-		kfree(thead);</div><div class='del'>-	}</div><div class='del'>-	while ((thead = tty-&gt;buf.free) != NULL) {</div><div class='del'>-		tty-&gt;buf.free = thead-&gt;next;</div><div class='del'>-		kfree(thead);</div><div class='del'>-	}</div><div class='del'>-	tty-&gt;buf.tail = NULL;</div><div class='del'>-	tty-&gt;buf.memory_used = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	tty_buffer_init		-	prepare a tty buffer structure</div><div class='del'>- *	@tty: tty to initialise</div><div class='del'>- *</div><div class='del'>- *	Set up the initial state of the buffer management for a tty device.</div><div class='del'>- *	Must be called before the other tty buffer functions are used.</div><div class='del'>- *</div><div class='del'>- *	Locking: none</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void tty_buffer_init(struct tty_struct *tty)</div><div class='del'>-{</div><div class='del'>-	spin_lock_init(&amp;tty-&gt;buf.lock);</div><div class='del'>-	tty-&gt;buf.head = NULL;</div><div class='del'>-	tty-&gt;buf.tail = NULL;</div><div class='del'>-	tty-&gt;buf.free = NULL;</div><div class='del'>-	tty-&gt;buf.memory_used = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	tty_buffer_alloc	-	allocate a tty buffer</div><div class='del'>- *	@tty: tty device</div><div class='del'>- *	@size: desired size (characters)</div><div class='del'>- *</div><div class='del'>- *	Allocate a new tty buffer to hold the desired number of characters.</div><div class='del'>- *	Return NULL if out of memory or the allocation would exceed the</div><div class='del'>- *	per device queue</div><div class='del'>- *</div><div class='del'>- *	Locking: Caller must hold tty-&gt;buf.lock</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static struct tty_buffer *tty_buffer_alloc(struct tty_struct *tty, size_t size)</div><div class='del'>-{</div><div class='del'>-	struct tty_buffer *p;</div><div class='del'>-</div><div class='del'>-	if (tty-&gt;buf.memory_used + size &gt; 65536)</div><div class='del'>-		return NULL;</div><div class='del'>-	p = kmalloc(sizeof(struct tty_buffer) + 2 * size, GFP_ATOMIC);</div><div class='del'>-	if (p == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-	p-&gt;used = 0;</div><div class='del'>-	p-&gt;size = size;</div><div class='del'>-	p-&gt;next = NULL;</div><div class='del'>-	p-&gt;commit = 0;</div><div class='del'>-	p-&gt;read = 0;</div><div class='del'>-	p-&gt;char_buf_ptr = (char *)(p-&gt;data);</div><div class='del'>-	p-&gt;flag_buf_ptr = (unsigned char *)p-&gt;char_buf_ptr + size;</div><div class='del'>-	tty-&gt;buf.memory_used += size;</div><div class='del'>-	return p;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	tty_buffer_free		-	free a tty buffer</div><div class='del'>- *	@tty: tty owning the buffer</div><div class='del'>- *	@b: the buffer to free</div><div class='del'>- *</div><div class='del'>- *	Free a tty buffer, or add it to the free list according to our</div><div class='del'>- *	internal strategy</div><div class='del'>- *</div><div class='del'>- *	Locking: Caller must hold tty-&gt;buf.lock</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void tty_buffer_free(struct tty_struct *tty, struct tty_buffer *b)</div><div class='del'>-{</div><div class='del'>-	/* Dumb strategy for now - should keep some stats */</div><div class='del'>-	tty-&gt;buf.memory_used -= b-&gt;size;</div><div class='del'>-	WARN_ON(tty-&gt;buf.memory_used &lt; 0);</div><div class='del'>-</div><div class='del'>-	if (b-&gt;size &gt;= 512)</div><div class='del'>-		kfree(b);</div><div class='del'>-	else {</div><div class='del'>-		b-&gt;next = tty-&gt;buf.free;</div><div class='del'>-		tty-&gt;buf.free = b;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	__tty_buffer_flush		-	flush full tty buffers</div><div class='del'>- *	@tty: tty to flush</div><div class='del'>- *</div><div class='del'>- *	flush all the buffers containing receive data. Caller must</div><div class='del'>- *	hold the buffer lock and must have ensured no parallel flush to</div><div class='del'>- *	ldisc is running.</div><div class='del'>- *</div><div class='del'>- *	Locking: Caller must hold tty-&gt;buf.lock</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void __tty_buffer_flush(struct tty_struct *tty)</div><div class='del'>-{</div><div class='del'>-	struct tty_buffer *thead;</div><div class='del'>-</div><div class='del'>-	while ((thead = tty-&gt;buf.head) != NULL) {</div><div class='del'>-		tty-&gt;buf.head = thead-&gt;next;</div><div class='del'>-		tty_buffer_free(tty, thead);</div><div class='del'>-	}</div><div class='del'>-	tty-&gt;buf.tail = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	tty_buffer_flush		-	flush full tty buffers</div><div class='del'>- *	@tty: tty to flush</div><div class='del'>- *</div><div class='del'>- *	flush all the buffers containing receive data. If the buffer is</div><div class='del'>- *	being processed by flush_to_ldisc then we defer the processing</div><div class='del'>- *	to that function</div><div class='del'>- *</div><div class='del'>- *	Locking: none</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void tty_buffer_flush(struct tty_struct *tty)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	spin_lock_irqsave(&amp;tty-&gt;buf.lock, flags);</div><div class='del'>-</div><div class='del'>-	/* If the data is being pushed to the tty layer then we can't</div><div class='del'>-	   process it here. Instead set a flag and the flush_to_ldisc</div><div class='del'>-	   path will process the flush request before it exits */</div><div class='del'>-	if (test_bit(TTY_FLUSHING, &amp;tty-&gt;flags)) {</div><div class='del'>-		set_bit(TTY_FLUSHPENDING, &amp;tty-&gt;flags);</div><div class='del'>-		spin_unlock_irqrestore(&amp;tty-&gt;buf.lock, flags);</div><div class='del'>-		wait_event(tty-&gt;read_wait,</div><div class='del'>-				test_bit(TTY_FLUSHPENDING, &amp;tty-&gt;flags) == 0);</div><div class='del'>-		return;</div><div class='del'>-	} else</div><div class='del'>-		__tty_buffer_flush(tty);</div><div class='del'>-	spin_unlock_irqrestore(&amp;tty-&gt;buf.lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	tty_buffer_find		-	find a free tty buffer</div><div class='del'>- *	@tty: tty owning the buffer</div><div class='del'>- *	@size: characters wanted</div><div class='del'>- *</div><div class='del'>- *	Locate an existing suitable tty buffer or if we are lacking one then</div><div class='del'>- *	allocate a new one. We round our buffers off in 256 character chunks</div><div class='del'>- *	to get better allocation behaviour.</div><div class='del'>- *</div><div class='del'>- *	Locking: Caller must hold tty-&gt;buf.lock</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static struct tty_buffer *tty_buffer_find(struct tty_struct *tty, size_t size)</div><div class='del'>-{</div><div class='del'>-	struct tty_buffer **tbh = &amp;tty-&gt;buf.free;</div><div class='del'>-	while ((*tbh) != NULL) {</div><div class='del'>-		struct tty_buffer *t = *tbh;</div><div class='del'>-		if (t-&gt;size &gt;= size) {</div><div class='del'>-			*tbh = t-&gt;next;</div><div class='del'>-			t-&gt;next = NULL;</div><div class='del'>-			t-&gt;used = 0;</div><div class='del'>-			t-&gt;commit = 0;</div><div class='del'>-			t-&gt;read = 0;</div><div class='del'>-			tty-&gt;buf.memory_used += t-&gt;size;</div><div class='del'>-			return t;</div><div class='del'>-		}</div><div class='del'>-		tbh = &amp;((*tbh)-&gt;next);</div><div class='del'>-	}</div><div class='del'>-	/* Round the buffer size out */</div><div class='del'>-	size = (size + 0xFF) &amp; ~0xFF;</div><div class='del'>-	return tty_buffer_alloc(tty, size);</div><div class='del'>-	/* Should possibly check if this fails for the largest buffer we</div><div class='del'>-	   have queued and recycle that ? */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	tty_buffer_request_room		-	grow tty buffer if needed</div><div class='del'>- *	@tty: tty structure</div><div class='del'>- *	@size: size desired</div><div class='del'>- *</div><div class='del'>- *	Make at least size bytes of linear space available for the tty</div><div class='del'>- *	buffer. If we fail return the size we managed to find.</div><div class='del'>- *</div><div class='del'>- *	Locking: Takes tty-&gt;buf.lock</div><div class='del'>- */</div><div class='del'>-int tty_buffer_request_room(struct tty_struct *tty, size_t size)</div><div class='del'>-{</div><div class='del'>-	struct tty_buffer *b, *n;</div><div class='del'>-	int left;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;tty-&gt;buf.lock, flags);</div><div class='del'>-</div><div class='del'>-	/* OPTIMISATION: We could keep a per tty "zero" sized buffer to</div><div class='del'>-	   remove this conditional if its worth it. This would be invisible</div><div class='del'>-	   to the callers */</div><div class='del'>-	if ((b = tty-&gt;buf.tail) != NULL)</div><div class='del'>-		left = b-&gt;size - b-&gt;used;</div><div class='del'>-	else</div><div class='del'>-		left = 0;</div><div class='del'>-</div><div class='del'>-	if (left &lt; size) {</div><div class='del'>-		/* This is the slow path - looking for new buffers to use */</div><div class='del'>-		if ((n = tty_buffer_find(tty, size)) != NULL) {</div><div class='del'>-			if (b != NULL) {</div><div class='del'>-				b-&gt;next = n;</div><div class='del'>-				b-&gt;commit = b-&gt;used;</div><div class='del'>-			} else</div><div class='del'>-				tty-&gt;buf.head = n;</div><div class='del'>-			tty-&gt;buf.tail = n;</div><div class='del'>-		} else</div><div class='del'>-			size = left;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;tty-&gt;buf.lock, flags);</div><div class='del'>-	return size;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(tty_buffer_request_room);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	tty_insert_flip_string	-	Add characters to the tty buffer</div><div class='del'>- *	@tty: tty structure</div><div class='del'>- *	@chars: characters</div><div class='del'>- *	@size: size</div><div class='del'>- *</div><div class='del'>- *	Queue a series of bytes to the tty buffering. All the characters</div><div class='del'>- *	passed are marked as without error. Returns the number added.</div><div class='del'>- *</div><div class='del'>- *	Locking: Called functions may take tty-&gt;buf.lock</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-int tty_insert_flip_string(struct tty_struct *tty, const unsigned char *chars,</div><div class='del'>-				size_t size)</div><div class='del'>-{</div><div class='del'>-	int copied = 0;</div><div class='del'>-	do {</div><div class='del'>-		int space = tty_buffer_request_room(tty, size - copied);</div><div class='del'>-		struct tty_buffer *tb = tty-&gt;buf.tail;</div><div class='del'>-		/* If there is no space then tb may be NULL */</div><div class='del'>-		if (unlikely(space == 0))</div><div class='del'>-			break;</div><div class='del'>-		memcpy(tb-&gt;char_buf_ptr + tb-&gt;used, chars, space);</div><div class='del'>-		memset(tb-&gt;flag_buf_ptr + tb-&gt;used, TTY_NORMAL, space);</div><div class='del'>-		tb-&gt;used += space;</div><div class='del'>-		copied += space;</div><div class='del'>-		chars += space;</div><div class='del'>-		/* There is a small chance that we need to split the data over</div><div class='del'>-		   several buffers. If this is the case we must loop */</div><div class='del'>-	} while (unlikely(size &gt; copied));</div><div class='del'>-	return copied;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(tty_insert_flip_string);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	tty_insert_flip_string_flags	-	Add characters to the tty buffer</div><div class='del'>- *	@tty: tty structure</div><div class='del'>- *	@chars: characters</div><div class='del'>- *	@flags: flag bytes</div><div class='del'>- *	@size: size</div><div class='del'>- *</div><div class='del'>- *	Queue a series of bytes to the tty buffering. For each character</div><div class='del'>- *	the flags array indicates the status of the character. Returns the</div><div class='del'>- *	number added.</div><div class='del'>- *</div><div class='del'>- *	Locking: Called functions may take tty-&gt;buf.lock</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-int tty_insert_flip_string_flags(struct tty_struct *tty,</div><div class='del'>-		const unsigned char *chars, const char *flags, size_t size)</div><div class='del'>-{</div><div class='del'>-	int copied = 0;</div><div class='del'>-	do {</div><div class='del'>-		int space = tty_buffer_request_room(tty, size - copied);</div><div class='del'>-		struct tty_buffer *tb = tty-&gt;buf.tail;</div><div class='del'>-		/* If there is no space then tb may be NULL */</div><div class='del'>-		if (unlikely(space == 0))</div><div class='del'>-			break;</div><div class='del'>-		memcpy(tb-&gt;char_buf_ptr + tb-&gt;used, chars, space);</div><div class='del'>-		memcpy(tb-&gt;flag_buf_ptr + tb-&gt;used, flags, space);</div><div class='del'>-		tb-&gt;used += space;</div><div class='del'>-		copied += space;</div><div class='del'>-		chars += space;</div><div class='del'>-		flags += space;</div><div class='del'>-		/* There is a small chance that we need to split the data over</div><div class='del'>-		   several buffers. If this is the case we must loop */</div><div class='del'>-	} while (unlikely(size &gt; copied));</div><div class='del'>-	return copied;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(tty_insert_flip_string_flags);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	tty_schedule_flip	-	push characters to ldisc</div><div class='del'>- *	@tty: tty to push from</div><div class='del'>- *</div><div class='del'>- *	Takes any pending buffers and transfers their ownership to the</div><div class='del'>- *	ldisc side of the queue. It then schedules those characters for</div><div class='del'>- *	processing by the line discipline.</div><div class='del'>- *</div><div class='del'>- *	Locking: Takes tty-&gt;buf.lock</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-void tty_schedule_flip(struct tty_struct *tty)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	spin_lock_irqsave(&amp;tty-&gt;buf.lock, flags);</div><div class='del'>-	if (tty-&gt;buf.tail != NULL)</div><div class='del'>-		tty-&gt;buf.tail-&gt;commit = tty-&gt;buf.tail-&gt;used;</div><div class='del'>-	spin_unlock_irqrestore(&amp;tty-&gt;buf.lock, flags);</div><div class='del'>-	schedule_delayed_work(&amp;tty-&gt;buf.work, 1);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(tty_schedule_flip);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	tty_prepare_flip_string		-	make room for characters</div><div class='del'>- *	@tty: tty</div><div class='del'>- *	@chars: return pointer for character write area</div><div class='del'>- *	@size: desired size</div><div class='del'>- *</div><div class='del'>- *	Prepare a block of space in the buffer for data. Returns the length</div><div class='del'>- *	available and buffer pointer to the space which is now allocated and</div><div class='del'>- *	accounted for as ready for normal characters. This is used for drivers</div><div class='del'>- *	that need their own block copy routines into the buffer. There is no</div><div class='del'>- *	guarantee the buffer is a DMA target!</div><div class='del'>- *</div><div class='del'>- *	Locking: May call functions taking tty-&gt;buf.lock</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-int tty_prepare_flip_string(struct tty_struct *tty, unsigned char **chars,</div><div class='del'>-								size_t size)</div><div class='del'>-{</div><div class='del'>-	int space = tty_buffer_request_room(tty, size);</div><div class='del'>-	if (likely(space)) {</div><div class='del'>-		struct tty_buffer *tb = tty-&gt;buf.tail;</div><div class='del'>-		*chars = tb-&gt;char_buf_ptr + tb-&gt;used;</div><div class='del'>-		memset(tb-&gt;flag_buf_ptr + tb-&gt;used, TTY_NORMAL, space);</div><div class='del'>-		tb-&gt;used += space;</div><div class='del'>-	}</div><div class='del'>-	return space;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL_GPL(tty_prepare_flip_string);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	tty_prepare_flip_string_flags	-	make room for characters</div><div class='del'>- *	@tty: tty</div><div class='del'>- *	@chars: return pointer for character write area</div><div class='del'>- *	@flags: return pointer for status flag write area</div><div class='del'>- *	@size: desired size</div><div class='del'>- *</div><div class='del'>- *	Prepare a block of space in the buffer for data. Returns the length</div><div class='del'>- *	available and buffer pointer to the space which is now allocated and</div><div class='del'>- *	accounted for as ready for characters. This is used for drivers</div><div class='del'>- *	that need their own block copy routines into the buffer. There is no</div><div class='del'>- *	guarantee the buffer is a DMA target!</div><div class='del'>- *</div><div class='del'>- *	Locking: May call functions taking tty-&gt;buf.lock</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-int tty_prepare_flip_string_flags(struct tty_struct *tty,</div><div class='del'>-			unsigned char **chars, char **flags, size_t size)</div><div class='del'>-{</div><div class='del'>-	int space = tty_buffer_request_room(tty, size);</div><div class='del'>-	if (likely(space)) {</div><div class='del'>-		struct tty_buffer *tb = tty-&gt;buf.tail;</div><div class='del'>-		*chars = tb-&gt;char_buf_ptr + tb-&gt;used;</div><div class='del'>-		*flags = tb-&gt;flag_buf_ptr + tb-&gt;used;</div><div class='del'>-		tb-&gt;used += space;</div><div class='del'>-	}</div><div class='del'>-	return space;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL_GPL(tty_prepare_flip_string_flags);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  *	get_tty_driver		-	find device of a tty</div><div class='ctx'>  *	@dev_t: device identifier</div><div class='hunk'>@@ -675,7 +274,7 @@ static struct tty_driver *get_tty_driver(dev_t device, int *index)</div><div class='ctx'> 		if (device &lt; base || device &gt;= base + p-&gt;num)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		*index = device - base;</div><div class='del'>-		return p;</div><div class='add'>+		return tty_driver_kref_get(p);</div><div class='ctx'> 	}</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='hunk'>@@ -719,7 +318,7 @@ struct tty_driver *tty_find_polling_driver(char *name, int *line)</div><div class='ctx'> </div><div class='ctx'> 		if (tty_line &gt;= 0 &amp;&amp; tty_line &lt;= p-&gt;num &amp;&amp; p-&gt;ops &amp;&amp;</div><div class='ctx'> 		    p-&gt;ops-&gt;poll_init &amp;&amp; !p-&gt;ops-&gt;poll_init(p, tty_line, str)) {</div><div class='del'>-			res = p;</div><div class='add'>+			res = tty_driver_kref_get(p);</div><div class='ctx'> 			*line = tty_line;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -819,20 +418,6 @@ static const struct file_operations tty_fops = {</div><div class='ctx'> 	.fasync		= tty_fasync,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_UNIX98_PTYS</div><div class='del'>-static const struct file_operations ptmx_fops = {</div><div class='del'>-	.llseek		= no_llseek,</div><div class='del'>-	.read		= tty_read,</div><div class='del'>-	.write		= tty_write,</div><div class='del'>-	.poll		= tty_poll,</div><div class='del'>-	.unlocked_ioctl	= tty_ioctl,</div><div class='del'>-	.compat_ioctl	= tty_compat_ioctl,</div><div class='del'>-	.open		= ptmx_open,</div><div class='del'>-	.release	= tty_release,</div><div class='del'>-	.fasync		= tty_fasync,</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> static const struct file_operations console_fops = {</div><div class='ctx'> 	.llseek		= no_llseek,</div><div class='ctx'> 	.read		= tty_read,</div><div class='hunk'>@@ -953,6 +538,7 @@ static void do_tty_hangup(struct work_struct *work)</div><div class='ctx'> 	struct tty_ldisc *ld;</div><div class='ctx'> 	int    closecount = 0, n;</div><div class='ctx'> 	unsigned long flags;</div><div class='add'>+	int refs = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!tty)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -1019,8 +605,12 @@ static void do_tty_hangup(struct work_struct *work)</div><div class='ctx'> 	if (tty-&gt;session) {</div><div class='ctx'> 		do_each_pid_task(tty-&gt;session, PIDTYPE_SID, p) {</div><div class='ctx'> 			spin_lock_irq(&amp;p-&gt;sighand-&gt;siglock);</div><div class='del'>-			if (p-&gt;signal-&gt;tty == tty)</div><div class='add'>+			if (p-&gt;signal-&gt;tty == tty) {</div><div class='ctx'> 				p-&gt;signal-&gt;tty = NULL;</div><div class='add'>+				/* We defer the dereferences outside fo</div><div class='add'>+				   the tasklist lock */</div><div class='add'>+				refs++;</div><div class='add'>+			}</div><div class='ctx'> 			if (!p-&gt;signal-&gt;leader) {</div><div class='ctx'> 				spin_unlock_irq(&amp;p-&gt;sighand-&gt;siglock);</div><div class='ctx'> 				continue;</div><div class='hunk'>@@ -1046,6 +636,10 @@ static void do_tty_hangup(struct work_struct *work)</div><div class='ctx'> 	tty-&gt;ctrl_status = 0;</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;tty-&gt;ctrl_lock, flags);</div><div class='ctx'> </div><div class='add'>+	/* Account for the p-&gt;signal references we killed */</div><div class='add'>+	while (refs--)</div><div class='add'>+		tty_kref_put(tty);</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If one of the devices matches a console pointer, we</div><div class='ctx'> 	 * cannot just call hangup() because that will cause</div><div class='hunk'>@@ -1115,6 +709,23 @@ void tty_vhangup(struct tty_struct *tty)</div><div class='ctx'> EXPORT_SYMBOL(tty_vhangup);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ *	tty_vhangup_self	-	process vhangup for own ctty</div><div class='add'>+ *</div><div class='add'>+ *	Perform a vhangup on the current controlling tty</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+void tty_vhangup_self(void)</div><div class='add'>+{</div><div class='add'>+	struct tty_struct *tty;</div><div class='add'>+</div><div class='add'>+	tty = get_current_tty();</div><div class='add'>+	if (tty) {</div><div class='add'>+		tty_vhangup(tty);</div><div class='add'>+		tty_kref_put(tty);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  *	tty_hung_up_p		-	was tty hung up</div><div class='ctx'>  *	@filp: file pointer of tty</div><div class='ctx'>  *</div><div class='hunk'>@@ -1167,16 +778,14 @@ void disassociate_ctty(int on_exit)</div><div class='ctx'> 	struct pid *tty_pgrp = NULL;</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;tty_mutex);</div><div class='ctx'> 	tty = get_current_tty();</div><div class='ctx'> 	if (tty) {</div><div class='ctx'> 		tty_pgrp = get_pid(tty-&gt;pgrp);</div><div class='ctx'> 		lock_kernel();</div><div class='del'>-		mutex_unlock(&amp;tty_mutex);</div><div class='del'>-		/* XXX: here we race, there is nothing protecting tty */</div><div class='ctx'> 		if (on_exit &amp;&amp; tty-&gt;driver-&gt;type != TTY_DRIVER_TYPE_PTY)</div><div class='ctx'> 			tty_vhangup(tty);</div><div class='ctx'> 		unlock_kernel();</div><div class='add'>+		tty_kref_put(tty);</div><div class='ctx'> 	} else if (on_exit) {</div><div class='ctx'> 		struct pid *old_pgrp;</div><div class='ctx'> 		spin_lock_irq(&amp;current-&gt;sighand-&gt;siglock);</div><div class='hunk'>@@ -1188,7 +797,6 @@ void disassociate_ctty(int on_exit)</div><div class='ctx'> 			kill_pgrp(old_pgrp, SIGCONT, on_exit);</div><div class='ctx'> 			put_pid(old_pgrp);</div><div class='ctx'> 		}</div><div class='del'>-		mutex_unlock(&amp;tty_mutex);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (tty_pgrp) {</div><div class='hunk'>@@ -1203,8 +811,6 @@ void disassociate_ctty(int on_exit)</div><div class='ctx'> 	current-&gt;signal-&gt;tty_old_pgrp = NULL;</div><div class='ctx'> 	spin_unlock_irq(&amp;current-&gt;sighand-&gt;siglock);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;tty_mutex);</div><div class='del'>-	/* It is possible that do_tty_hangup has free'd this tty */</div><div class='ctx'> 	tty = get_current_tty();</div><div class='ctx'> 	if (tty) {</div><div class='ctx'> 		unsigned long flags;</div><div class='hunk'>@@ -1214,13 +820,13 @@ void disassociate_ctty(int on_exit)</div><div class='ctx'> 		tty-&gt;session = NULL;</div><div class='ctx'> 		tty-&gt;pgrp = NULL;</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;tty-&gt;ctrl_lock, flags);</div><div class='add'>+		tty_kref_put(tty);</div><div class='ctx'> 	} else {</div><div class='ctx'> #ifdef TTY_DEBUG_HANGUP</div><div class='ctx'> 		printk(KERN_DEBUG "error attempted to write to tty [0x%p]"</div><div class='ctx'> 		       " = NULL", tty);</div><div class='ctx'> #endif</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;tty_mutex);</div><div class='ctx'> </div><div class='ctx'> 	/* Now clear signal-&gt;tty under the lock */</div><div class='ctx'> 	read_lock(&amp;tasklist_lock);</div><div class='hunk'>@@ -1420,19 +1026,19 @@ static inline ssize_t do_tty_write(</div><div class='ctx'> </div><div class='ctx'> 	/* write_buf/write_cnt is protected by the atomic_write_lock mutex */</div><div class='ctx'> 	if (tty-&gt;write_cnt &lt; chunk) {</div><div class='del'>-		unsigned char *buf;</div><div class='add'>+		unsigned char *buf_chunk;</div><div class='ctx'> </div><div class='ctx'> 		if (chunk &lt; 1024)</div><div class='ctx'> 			chunk = 1024;</div><div class='ctx'> </div><div class='del'>-		buf = kmalloc(chunk, GFP_KERNEL);</div><div class='del'>-		if (!buf) {</div><div class='add'>+		buf_chunk = kmalloc(chunk, GFP_KERNEL);</div><div class='add'>+		if (!buf_chunk) {</div><div class='ctx'> 			ret = -ENOMEM;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> 		kfree(tty-&gt;write_buf);</div><div class='ctx'> 		tty-&gt;write_cnt = chunk;</div><div class='del'>-		tty-&gt;write_buf = buf;</div><div class='add'>+		tty-&gt;write_buf = buf_chunk;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Do the write .. */</div><div class='hunk'>@@ -1466,6 +1072,31 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * tty_write_message - write a message to a certain tty, not just the console.</div><div class='add'>+ * @tty: the destination tty_struct</div><div class='add'>+ * @msg: the message to write</div><div class='add'>+ *</div><div class='add'>+ * This is used for messages that need to be redirected to a specific tty.</div><div class='add'>+ * We don't put it into the syslog queue right now maybe in the future if</div><div class='add'>+ * really needed.</div><div class='add'>+ *</div><div class='add'>+ * We must still hold the BKL and test the CLOSING flag for the moment.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+void tty_write_message(struct tty_struct *tty, char *msg)</div><div class='add'>+{</div><div class='add'>+	lock_kernel();</div><div class='add'>+	if (tty) {</div><div class='add'>+		mutex_lock(&amp;tty-&gt;atomic_write_lock);</div><div class='add'>+		if (tty-&gt;ops-&gt;write &amp;&amp; !test_bit(TTY_CLOSING, &amp;tty-&gt;flags))</div><div class='add'>+			tty-&gt;ops-&gt;write(tty, msg, strlen(msg));</div><div class='add'>+		tty_write_unlock(tty);</div><div class='add'>+	}</div><div class='add'>+	unlock_kernel();</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	tty_write		-	write method for tty device file</div><div class='hunk'>@@ -1533,42 +1164,6 @@ ssize_t redirected_tty_write(struct file *file, const char __user *buf,</div><div class='ctx'> 	return tty_write(file, buf, count, ppos);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void tty_port_init(struct tty_port *port)</div><div class='del'>-{</div><div class='del'>-	memset(port, 0, sizeof(*port));</div><div class='del'>-	init_waitqueue_head(&amp;port-&gt;open_wait);</div><div class='del'>-	init_waitqueue_head(&amp;port-&gt;close_wait);</div><div class='del'>-	mutex_init(&amp;port-&gt;mutex);</div><div class='del'>-	port-&gt;close_delay = (50 * HZ) / 100;</div><div class='del'>-	port-&gt;closing_wait = (3000 * HZ) / 100;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(tty_port_init);</div><div class='del'>-</div><div class='del'>-int tty_port_alloc_xmit_buf(struct tty_port *port)</div><div class='del'>-{</div><div class='del'>-	/* We may sleep in get_zeroed_page() */</div><div class='del'>-	mutex_lock(&amp;port-&gt;mutex);</div><div class='del'>-	if (port-&gt;xmit_buf == NULL)</div><div class='del'>-		port-&gt;xmit_buf = (unsigned char *)get_zeroed_page(GFP_KERNEL);</div><div class='del'>-	mutex_unlock(&amp;port-&gt;mutex);</div><div class='del'>-	if (port-&gt;xmit_buf == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(tty_port_alloc_xmit_buf);</div><div class='del'>-</div><div class='del'>-void tty_port_free_xmit_buf(struct tty_port *port)</div><div class='del'>-{</div><div class='del'>-	mutex_lock(&amp;port-&gt;mutex);</div><div class='del'>-	if (port-&gt;xmit_buf != NULL) {</div><div class='del'>-		free_page((unsigned long)port-&gt;xmit_buf);</div><div class='del'>-		port-&gt;xmit_buf = NULL;</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;port-&gt;mutex);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(tty_port_free_xmit_buf);</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> static char ptychar[] = "pqrstuvwxyzabcde";</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1592,7 +1187,7 @@ static void pty_line_name(struct tty_driver *driver, int index, char *p)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *	pty_line_name	-	generate name for a tty</div><div class='add'>+ *	tty_line_name	-	generate name for a tty</div><div class='ctx'>  *	@driver: the tty driver in use</div><div class='ctx'>  *	@index: the minor number</div><div class='ctx'>  *	@p: output buffer of at least 7 bytes</div><div class='hunk'>@@ -1608,10 +1203,148 @@ static void tty_line_name(struct tty_driver *driver, int index, char *p)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *	init_dev		-	initialise a tty device</div><div class='add'>+ *	tty_driver_lookup_tty() - find an existing tty, if any</div><div class='add'>+ *	@driver: the driver for the tty</div><div class='add'>+ *	@idx:	 the minor number</div><div class='add'>+ *</div><div class='add'>+ *	Return the tty, if found or ERR_PTR() otherwise.</div><div class='add'>+ *</div><div class='add'>+ *	Locking: tty_mutex must be held. If tty is found, the mutex must</div><div class='add'>+ *	be held until the 'fast-open' is also done. Will change once we</div><div class='add'>+ *	have refcounting in the driver and per driver locking</div><div class='add'>+ */</div><div class='add'>+struct tty_struct *tty_driver_lookup_tty(struct tty_driver *driver,</div><div class='add'>+		struct inode *inode, int idx)</div><div class='add'>+{</div><div class='add'>+	struct tty_struct *tty;</div><div class='add'>+</div><div class='add'>+	if (driver-&gt;ops-&gt;lookup)</div><div class='add'>+		return driver-&gt;ops-&gt;lookup(driver, inode, idx);</div><div class='add'>+</div><div class='add'>+	tty = driver-&gt;ttys[idx];</div><div class='add'>+	return tty;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	tty_init_termios	-  helper for termios setup</div><div class='add'>+ *	@tty: the tty to set up</div><div class='add'>+ *</div><div class='add'>+ *	Initialise the termios structures for this tty. Thus runs under</div><div class='add'>+ *	the tty_mutex currently so we can be relaxed about ordering.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+int tty_init_termios(struct tty_struct *tty)</div><div class='add'>+{</div><div class='add'>+	struct ktermios *tp;</div><div class='add'>+	int idx = tty-&gt;index;</div><div class='add'>+</div><div class='add'>+	tp = tty-&gt;driver-&gt;termios[idx];</div><div class='add'>+	if (tp == NULL) {</div><div class='add'>+		tp = kzalloc(sizeof(struct ktermios[2]), GFP_KERNEL);</div><div class='add'>+		if (tp == NULL)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		memcpy(tp, &amp;tty-&gt;driver-&gt;init_termios,</div><div class='add'>+						sizeof(struct ktermios));</div><div class='add'>+		tty-&gt;driver-&gt;termios[idx] = tp;</div><div class='add'>+	}</div><div class='add'>+	tty-&gt;termios = tp;</div><div class='add'>+	tty-&gt;termios_locked = tp + 1;</div><div class='add'>+</div><div class='add'>+	/* Compatibility until drivers always set this */</div><div class='add'>+	tty-&gt;termios-&gt;c_ispeed = tty_termios_input_baud_rate(tty-&gt;termios);</div><div class='add'>+	tty-&gt;termios-&gt;c_ospeed = tty_termios_baud_rate(tty-&gt;termios);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	tty_driver_install_tty() - install a tty entry in the driver</div><div class='add'>+ *	@driver: the driver for the tty</div><div class='add'>+ *	@tty: the tty</div><div class='add'>+ *</div><div class='add'>+ *	Install a tty object into the driver tables. The tty-&gt;index field</div><div class='add'>+ *	will be set by the time this is called. This method is responsible</div><div class='add'>+ *	for ensuring any need additional structures are allocated and</div><div class='add'>+ *	configured.</div><div class='add'>+ *</div><div class='add'>+ *	Locking: tty_mutex for now</div><div class='add'>+ */</div><div class='add'>+static int tty_driver_install_tty(struct tty_driver *driver,</div><div class='add'>+						struct tty_struct *tty)</div><div class='add'>+{</div><div class='add'>+	int idx = tty-&gt;index;</div><div class='add'>+</div><div class='add'>+	if (driver-&gt;ops-&gt;install)</div><div class='add'>+		return driver-&gt;ops-&gt;install(driver, tty);</div><div class='add'>+</div><div class='add'>+	if (tty_init_termios(tty) == 0) {</div><div class='add'>+		tty_driver_kref_get(driver);</div><div class='add'>+		tty-&gt;count++;</div><div class='add'>+		driver-&gt;ttys[idx] = tty;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	return -ENOMEM;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	tty_driver_remove_tty() - remove a tty from the driver tables</div><div class='add'>+ *	@driver: the driver for the tty</div><div class='add'>+ *	@idx:	 the minor number</div><div class='add'>+ *</div><div class='add'>+ *	Remvoe a tty object from the driver tables. The tty-&gt;index field</div><div class='add'>+ *	will be set by the time this is called.</div><div class='add'>+ *</div><div class='add'>+ *	Locking: tty_mutex for now</div><div class='add'>+ */</div><div class='add'>+static void tty_driver_remove_tty(struct tty_driver *driver,</div><div class='add'>+						struct tty_struct *tty)</div><div class='add'>+{</div><div class='add'>+	if (driver-&gt;ops-&gt;remove)</div><div class='add'>+		driver-&gt;ops-&gt;remove(driver, tty);</div><div class='add'>+	else</div><div class='add'>+		driver-&gt;ttys[tty-&gt;index] = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * 	tty_reopen()	- fast re-open of an open tty</div><div class='add'>+ * 	@tty	- the tty to open</div><div class='add'>+ *</div><div class='add'>+ *	Return 0 on success, -errno on error.</div><div class='add'>+ *</div><div class='add'>+ *	Locking: tty_mutex must be held from the time the tty was found</div><div class='add'>+ *		 till this open completes.</div><div class='add'>+ */</div><div class='add'>+static int tty_reopen(struct tty_struct *tty)</div><div class='add'>+{</div><div class='add'>+	struct tty_driver *driver = tty-&gt;driver;</div><div class='add'>+</div><div class='add'>+	if (test_bit(TTY_CLOSING, &amp;tty-&gt;flags))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	if (driver-&gt;type == TTY_DRIVER_TYPE_PTY &amp;&amp;</div><div class='add'>+	    driver-&gt;subtype == PTY_TYPE_MASTER) {</div><div class='add'>+		/*</div><div class='add'>+		 * special case for PTY masters: only one open permitted,</div><div class='add'>+		 * and the slave side open count is incremented as well.</div><div class='add'>+		 */</div><div class='add'>+		if (tty-&gt;count)</div><div class='add'>+			return -EIO;</div><div class='add'>+</div><div class='add'>+		tty-&gt;link-&gt;count++;</div><div class='add'>+	}</div><div class='add'>+	tty-&gt;count++;</div><div class='add'>+	tty-&gt;driver = driver; /* N.B. why do this every time?? */</div><div class='add'>+</div><div class='add'>+	WARN_ON(!test_bit(TTY_LDISC, &amp;tty-&gt;flags));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	tty_init_dev		-	initialise a tty device</div><div class='ctx'>  *	@driver: tty driver we are opening a device on</div><div class='ctx'>  *	@idx: device index</div><div class='del'>- *	@tty: returned tty structure</div><div class='add'>+ *	@ret_tty: returned tty structure</div><div class='add'>+ *	@first_ok: ok to open a new device (used by ptmx)</div><div class='ctx'>  *</div><div class='ctx'>  *	Prepare a tty device. This may not be a "new" clean device but</div><div class='ctx'>  *	could also be an active device. The pty drivers require special</div><div class='hunk'>@@ -1631,37 +1364,16 @@ static void tty_line_name(struct tty_driver *driver, int index, char *p)</div><div class='ctx'>  * relaxed for the (most common) case of reopening a tty.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static int init_dev(struct tty_driver *driver, int idx,</div><div class='del'>-	struct tty_struct **ret_tty)</div><div class='add'>+struct tty_struct *tty_init_dev(struct tty_driver *driver, int idx,</div><div class='add'>+								int first_ok)</div><div class='ctx'> {</div><div class='del'>-	struct tty_struct *tty, *o_tty;</div><div class='del'>-	struct ktermios *tp, **tp_loc, *o_tp, **o_tp_loc;</div><div class='del'>-	struct ktermios *ltp, **ltp_loc, *o_ltp, **o_ltp_loc;</div><div class='del'>-	int retval = 0;</div><div class='add'>+	struct tty_struct *tty;</div><div class='add'>+	int retval;</div><div class='ctx'> </div><div class='del'>-	/* check whether we're reopening an existing tty */</div><div class='del'>-	if (driver-&gt;flags &amp; TTY_DRIVER_DEVPTS_MEM) {</div><div class='del'>-		tty = devpts_get_tty(idx);</div><div class='del'>-		/*</div><div class='del'>-		 * If we don't have a tty here on a slave open, it's because</div><div class='del'>-		 * the master already started the close process and there's</div><div class='del'>-		 * no relation between devpts file and tty anymore.</div><div class='del'>-		 */</div><div class='del'>-		if (!tty &amp;&amp; driver-&gt;subtype == PTY_TYPE_SLAVE) {</div><div class='del'>-			retval = -EIO;</div><div class='del'>-			goto end_init;</div><div class='del'>-		}</div><div class='del'>-		/*</div><div class='del'>-		 * It's safe from now on because init_dev() is called with</div><div class='del'>-		 * tty_mutex held and release_dev() won't change tty-&gt;count</div><div class='del'>-		 * or tty-&gt;flags without having to grab tty_mutex</div><div class='del'>-		 */</div><div class='del'>-		if (tty &amp;&amp; driver-&gt;subtype == PTY_TYPE_MASTER)</div><div class='del'>-			tty = tty-&gt;link;</div><div class='del'>-	} else {</div><div class='del'>-		tty = driver-&gt;ttys[idx];</div><div class='del'>-	}</div><div class='del'>-	if (tty) goto fast_track;</div><div class='add'>+	/* Check if pty master is being opened multiple times */</div><div class='add'>+	if (driver-&gt;subtype == PTY_TYPE_MASTER &amp;&amp;</div><div class='add'>+		(driver-&gt;flags &amp; TTY_DRIVER_DEVPTS_MEM) &amp;&amp; !first_ok)</div><div class='add'>+		return ERR_PTR(-EIO);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * First time open is complex, especially for PTY devices.</div><div class='hunk'>@@ -1671,189 +1383,69 @@ static int init_dev(struct tty_driver *driver, int idx,</div><div class='ctx'> 	 * and locked termios may be retained.)</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	if (!try_module_get(driver-&gt;owner)) {</div><div class='del'>-		retval = -ENODEV;</div><div class='del'>-		goto end_init;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	o_tty = NULL;</div><div class='del'>-	tp = o_tp = NULL;</div><div class='del'>-	ltp = o_ltp = NULL;</div><div class='add'>+	if (!try_module_get(driver-&gt;owner))</div><div class='add'>+		return ERR_PTR(-ENODEV);</div><div class='ctx'> </div><div class='ctx'> 	tty = alloc_tty_struct();</div><div class='ctx'> 	if (!tty)</div><div class='ctx'> 		goto fail_no_mem;</div><div class='del'>-	initialize_tty_struct(tty);</div><div class='del'>-	tty-&gt;driver = driver;</div><div class='del'>-	tty-&gt;ops = driver-&gt;ops;</div><div class='del'>-	tty-&gt;index = idx;</div><div class='del'>-	tty_line_name(driver, idx, tty-&gt;name);</div><div class='del'>-</div><div class='del'>-	if (driver-&gt;flags &amp; TTY_DRIVER_DEVPTS_MEM) {</div><div class='del'>-		tp_loc = &amp;tty-&gt;termios;</div><div class='del'>-		ltp_loc = &amp;tty-&gt;termios_locked;</div><div class='del'>-	} else {</div><div class='del'>-		tp_loc = &amp;driver-&gt;termios[idx];</div><div class='del'>-		ltp_loc = &amp;driver-&gt;termios_locked[idx];</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!*tp_loc) {</div><div class='del'>-		tp = kmalloc(sizeof(struct ktermios), GFP_KERNEL);</div><div class='del'>-		if (!tp)</div><div class='del'>-			goto free_mem_out;</div><div class='del'>-		*tp = driver-&gt;init_termios;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!*ltp_loc) {</div><div class='del'>-		ltp = kzalloc(sizeof(struct ktermios), GFP_KERNEL);</div><div class='del'>-		if (!ltp)</div><div class='del'>-			goto free_mem_out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (driver-&gt;type == TTY_DRIVER_TYPE_PTY) {</div><div class='del'>-		o_tty = alloc_tty_struct();</div><div class='del'>-		if (!o_tty)</div><div class='del'>-			goto free_mem_out;</div><div class='del'>-		initialize_tty_struct(o_tty);</div><div class='del'>-		o_tty-&gt;driver = driver-&gt;other;</div><div class='del'>-		o_tty-&gt;ops = driver-&gt;ops;</div><div class='del'>-		o_tty-&gt;index = idx;</div><div class='del'>-		tty_line_name(driver-&gt;other, idx, o_tty-&gt;name);</div><div class='del'>-</div><div class='del'>-		if (driver-&gt;flags &amp; TTY_DRIVER_DEVPTS_MEM) {</div><div class='del'>-			o_tp_loc = &amp;o_tty-&gt;termios;</div><div class='del'>-			o_ltp_loc = &amp;o_tty-&gt;termios_locked;</div><div class='del'>-		} else {</div><div class='del'>-			o_tp_loc = &amp;driver-&gt;other-&gt;termios[idx];</div><div class='del'>-			o_ltp_loc = &amp;driver-&gt;other-&gt;termios_locked[idx];</div><div class='del'>-		}</div><div class='add'>+	initialize_tty_struct(tty, driver, idx);</div><div class='ctx'> </div><div class='del'>-		if (!*o_tp_loc) {</div><div class='del'>-			o_tp = kmalloc(sizeof(struct ktermios), GFP_KERNEL);</div><div class='del'>-			if (!o_tp)</div><div class='del'>-				goto free_mem_out;</div><div class='del'>-			*o_tp = driver-&gt;other-&gt;init_termios;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!*o_ltp_loc) {</div><div class='del'>-			o_ltp = kzalloc(sizeof(struct ktermios), GFP_KERNEL);</div><div class='del'>-			if (!o_ltp)</div><div class='del'>-				goto free_mem_out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Everything allocated ... set up the o_tty structure.</div><div class='del'>-		 */</div><div class='del'>-		if (!(driver-&gt;other-&gt;flags &amp; TTY_DRIVER_DEVPTS_MEM))</div><div class='del'>-			driver-&gt;other-&gt;ttys[idx] = o_tty;</div><div class='del'>-		if (!*o_tp_loc)</div><div class='del'>-			*o_tp_loc = o_tp;</div><div class='del'>-		if (!*o_ltp_loc)</div><div class='del'>-			*o_ltp_loc = o_ltp;</div><div class='del'>-		o_tty-&gt;termios = *o_tp_loc;</div><div class='del'>-		o_tty-&gt;termios_locked = *o_ltp_loc;</div><div class='del'>-		driver-&gt;other-&gt;refcount++;</div><div class='del'>-		if (driver-&gt;subtype == PTY_TYPE_MASTER)</div><div class='del'>-			o_tty-&gt;count++;</div><div class='del'>-</div><div class='del'>-		/* Establish the links in both directions */</div><div class='del'>-		tty-&gt;link   = o_tty;</div><div class='del'>-		o_tty-&gt;link = tty;</div><div class='add'>+	retval = tty_driver_install_tty(driver, tty);</div><div class='add'>+	if (retval &lt; 0) {</div><div class='add'>+		free_tty_struct(tty);</div><div class='add'>+		module_put(driver-&gt;owner);</div><div class='add'>+		return ERR_PTR(retval);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * All structures have been allocated, so now we install them.</div><div class='del'>-	 * Failures after this point use release_tty to clean up, so</div><div class='del'>-	 * there's no need to null out the local pointers.</div><div class='del'>-	 */</div><div class='del'>-	if (!(driver-&gt;flags &amp; TTY_DRIVER_DEVPTS_MEM))</div><div class='del'>-		driver-&gt;ttys[idx] = tty;</div><div class='del'>-</div><div class='del'>-	if (!*tp_loc)</div><div class='del'>-		*tp_loc = tp;</div><div class='del'>-	if (!*ltp_loc)</div><div class='del'>-		*ltp_loc = ltp;</div><div class='del'>-	tty-&gt;termios = *tp_loc;</div><div class='del'>-	tty-&gt;termios_locked = *ltp_loc;</div><div class='del'>-	/* Compatibility until drivers always set this */</div><div class='del'>-	tty-&gt;termios-&gt;c_ispeed = tty_termios_input_baud_rate(tty-&gt;termios);</div><div class='del'>-	tty-&gt;termios-&gt;c_ospeed = tty_termios_baud_rate(tty-&gt;termios);</div><div class='del'>-	driver-&gt;refcount++;</div><div class='del'>-	tty-&gt;count++;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='ctx'> 	 * Structures all installed ... call the ldisc open routines.</div><div class='ctx'> 	 * If we fail here just call release_tty to clean up.  No need</div><div class='ctx'> 	 * to decrement the use counts, as release_tty doesn't care.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	retval = tty_ldisc_setup(tty, o_tty);</div><div class='del'>-</div><div class='add'>+	retval = tty_ldisc_setup(tty, tty-&gt;link);</div><div class='ctx'> 	if (retval)</div><div class='ctx'> 		goto release_mem_out;</div><div class='del'>-	 goto success;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * This fast open can be used if the tty is already open.</div><div class='del'>-	 * No memory is allocated, and the only failures are from</div><div class='del'>-	 * attempting to open a closing tty or attempting multiple</div><div class='del'>-	 * opens on a pty master.</div><div class='del'>-	 */</div><div class='del'>-fast_track:</div><div class='del'>-	if (test_bit(TTY_CLOSING, &amp;tty-&gt;flags)) {</div><div class='del'>-		retval = -EIO;</div><div class='del'>-		goto end_init;</div><div class='del'>-	}</div><div class='del'>-	if (driver-&gt;type == TTY_DRIVER_TYPE_PTY &amp;&amp;</div><div class='del'>-	    driver-&gt;subtype == PTY_TYPE_MASTER) {</div><div class='del'>-		/*</div><div class='del'>-		 * special case for PTY masters: only one open permitted,</div><div class='del'>-		 * and the slave side open count is incremented as well.</div><div class='del'>-		 */</div><div class='del'>-		if (tty-&gt;count) {</div><div class='del'>-			retval = -EIO;</div><div class='del'>-			goto end_init;</div><div class='del'>-		}</div><div class='del'>-		tty-&gt;link-&gt;count++;</div><div class='del'>-	}</div><div class='del'>-	tty-&gt;count++;</div><div class='del'>-	tty-&gt;driver = driver; /* N.B. why do this every time?? */</div><div class='del'>-</div><div class='del'>-	/* FIXME */</div><div class='del'>-	if (!test_bit(TTY_LDISC, &amp;tty-&gt;flags))</div><div class='del'>-		printk(KERN_ERR "init_dev but no ldisc\n");</div><div class='del'>-success:</div><div class='del'>-	*ret_tty = tty;</div><div class='del'>-</div><div class='del'>-	/* All paths come through here to release the mutex */</div><div class='del'>-end_init:</div><div class='del'>-	return retval;</div><div class='del'>-</div><div class='del'>-	/* Release locally allocated memory ... nothing placed in slots */</div><div class='del'>-free_mem_out:</div><div class='del'>-	kfree(o_tp);</div><div class='del'>-	if (o_tty)</div><div class='del'>-		free_tty_struct(o_tty);</div><div class='del'>-	kfree(ltp);</div><div class='del'>-	kfree(tp);</div><div class='del'>-	free_tty_struct(tty);</div><div class='add'>+	return tty;</div><div class='ctx'> </div><div class='ctx'> fail_no_mem:</div><div class='ctx'> 	module_put(driver-&gt;owner);</div><div class='del'>-	retval = -ENOMEM;</div><div class='del'>-	goto end_init;</div><div class='add'>+	return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='ctx'> 	/* call the tty release_tty routine to clean out this slot */</div><div class='ctx'> release_mem_out:</div><div class='ctx'> 	if (printk_ratelimit())</div><div class='del'>-		printk(KERN_INFO "init_dev: ldisc open failed, "</div><div class='add'>+		printk(KERN_INFO "tty_init_dev: ldisc open failed, "</div><div class='ctx'> 				 "clearing slot %d\n", idx);</div><div class='ctx'> 	release_tty(tty, idx);</div><div class='del'>-	goto end_init;</div><div class='add'>+	return ERR_PTR(retval);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void tty_free_termios(struct tty_struct *tty)</div><div class='add'>+{</div><div class='add'>+	struct ktermios *tp;</div><div class='add'>+	int idx = tty-&gt;index;</div><div class='add'>+	/* Kill this flag and push into drivers for locking etc */</div><div class='add'>+	if (tty-&gt;driver-&gt;flags &amp; TTY_DRIVER_RESET_TERMIOS) {</div><div class='add'>+		/* FIXME: Locking on -&gt;termios array */</div><div class='add'>+		tp = tty-&gt;termios;</div><div class='add'>+		tty-&gt;driver-&gt;termios[idx] = NULL;</div><div class='add'>+		kfree(tp);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(tty_free_termios);</div><div class='add'>+</div><div class='add'>+void tty_shutdown(struct tty_struct *tty)</div><div class='add'>+{</div><div class='add'>+	tty_driver_remove_tty(tty-&gt;driver, tty);</div><div class='add'>+	tty_free_termios(tty);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(tty_shutdown);</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  *	release_one_tty		-	release tty structure memory</div><div class='add'>+ *	@kref: kref of tty we are obliterating</div><div class='ctx'>  *</div><div class='ctx'>  *	Releases memory associated with a tty structure, and clears out the</div><div class='ctx'>  *	driver table slots. This function is called when a device is no longer</div><div class='hunk'>@@ -1863,31 +1455,19 @@ release_mem_out:</div><div class='ctx'>  *		tty_mutex - sometimes only</div><div class='ctx'>  *		takes the file list lock internally when working on the list</div><div class='ctx'>  *	of ttys that the driver keeps.</div><div class='del'>- *		FIXME: should we require tty_mutex is held here ??</div><div class='ctx'>  */</div><div class='del'>-static void release_one_tty(struct tty_struct *tty, int idx)</div><div class='add'>+static void release_one_tty(struct kref *kref)</div><div class='ctx'> {</div><div class='del'>-	int devpts = tty-&gt;driver-&gt;flags &amp; TTY_DRIVER_DEVPTS_MEM;</div><div class='del'>-	struct ktermios *tp;</div><div class='del'>-</div><div class='del'>-	if (!devpts)</div><div class='del'>-		tty-&gt;driver-&gt;ttys[idx] = NULL;</div><div class='del'>-</div><div class='del'>-	if (tty-&gt;driver-&gt;flags &amp; TTY_DRIVER_RESET_TERMIOS) {</div><div class='del'>-		tp = tty-&gt;termios;</div><div class='del'>-		if (!devpts)</div><div class='del'>-			tty-&gt;driver-&gt;termios[idx] = NULL;</div><div class='del'>-		kfree(tp);</div><div class='del'>-</div><div class='del'>-		tp = tty-&gt;termios_locked;</div><div class='del'>-		if (!devpts)</div><div class='del'>-			tty-&gt;driver-&gt;termios_locked[idx] = NULL;</div><div class='del'>-		kfree(tp);</div><div class='del'>-	}</div><div class='del'>-</div><div class='add'>+	struct tty_struct *tty = container_of(kref, struct tty_struct, kref);</div><div class='add'>+	struct tty_driver *driver = tty-&gt;driver;</div><div class='ctx'> </div><div class='add'>+	if (tty-&gt;ops-&gt;shutdown)</div><div class='add'>+		tty-&gt;ops-&gt;shutdown(tty);</div><div class='add'>+	else</div><div class='add'>+		tty_shutdown(tty);</div><div class='ctx'> 	tty-&gt;magic = 0;</div><div class='del'>-	tty-&gt;driver-&gt;refcount--;</div><div class='add'>+	tty_driver_kref_put(driver);</div><div class='add'>+	module_put(driver-&gt;owner);</div><div class='ctx'> </div><div class='ctx'> 	file_list_lock();</div><div class='ctx'> 	list_del_init(&amp;tty-&gt;tty_files);</div><div class='hunk'>@@ -1897,6 +1477,21 @@ static void release_one_tty(struct tty_struct *tty, int idx)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ *	tty_kref_put		-	release a tty kref</div><div class='add'>+ *	@tty: tty device</div><div class='add'>+ *</div><div class='add'>+ *	Release a reference to a tty device and if need be let the kref</div><div class='add'>+ *	layer destruct the object for us</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+void tty_kref_put(struct tty_struct *tty)</div><div class='add'>+{</div><div class='add'>+	if (tty)</div><div class='add'>+		kref_put(&amp;tty-&gt;kref, release_one_tty);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(tty_kref_put);</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  *	release_tty		-	release tty structure memory</div><div class='ctx'>  *</div><div class='ctx'>  *	Release both @tty and a possible linked partner (think pty pair),</div><div class='hunk'>@@ -1907,15 +1502,16 @@ static void release_one_tty(struct tty_struct *tty, int idx)</div><div class='ctx'>  *		takes the file list lock internally when working on the list</div><div class='ctx'>  *	of ttys that the driver keeps.</div><div class='ctx'>  *		FIXME: should we require tty_mutex is held here ??</div><div class='add'>+ *</div><div class='ctx'>  */</div><div class='ctx'> static void release_tty(struct tty_struct *tty, int idx)</div><div class='ctx'> {</div><div class='del'>-	struct tty_driver *driver = tty-&gt;driver;</div><div class='add'>+	/* This should always be true but check for the moment */</div><div class='add'>+	WARN_ON(tty-&gt;index != idx);</div><div class='ctx'> </div><div class='ctx'> 	if (tty-&gt;link)</div><div class='del'>-		release_one_tty(tty-&gt;link, idx);</div><div class='del'>-	release_one_tty(tty, idx);</div><div class='del'>-	module_put(driver-&gt;owner);</div><div class='add'>+		tty_kref_put(tty-&gt;link);</div><div class='add'>+	tty_kref_put(tty);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1926,20 +1522,21 @@ static void release_tty(struct tty_struct *tty, int idx)</div><div class='ctx'>  * WSH 09/09/97: rewritten to avoid some nasty race conditions that could</div><div class='ctx'>  * lead to double frees or releasing memory still in use.</div><div class='ctx'>  */</div><div class='del'>-static void release_dev(struct file *filp)</div><div class='add'>+void tty_release_dev(struct file *filp)</div><div class='ctx'> {</div><div class='ctx'> 	struct tty_struct *tty, *o_tty;</div><div class='ctx'> 	int	pty_master, tty_closing, o_tty_closing, do_sleep;</div><div class='ctx'> 	int	devpts;</div><div class='ctx'> 	int	idx;</div><div class='ctx'> 	char	buf[64];</div><div class='add'>+	struct 	inode *inode;</div><div class='ctx'> </div><div class='add'>+	inode = filp-&gt;f_path.dentry-&gt;d_inode;</div><div class='ctx'> 	tty = (struct tty_struct *)filp-&gt;private_data;</div><div class='del'>-	if (tty_paranoia_check(tty, filp-&gt;f_path.dentry-&gt;d_inode,</div><div class='del'>-							"release_dev"))</div><div class='add'>+	if (tty_paranoia_check(tty, inode, "tty_release_dev"))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	check_tty_count(tty, "release_dev");</div><div class='add'>+	check_tty_count(tty, "tty_release_dev");</div><div class='ctx'> </div><div class='ctx'> 	tty_fasync(-1, filp, 0);</div><div class='ctx'> </div><div class='hunk'>@@ -1951,33 +1548,27 @@ static void release_dev(struct file *filp)</div><div class='ctx'> </div><div class='ctx'> #ifdef TTY_PARANOIA_CHECK</div><div class='ctx'> 	if (idx &lt; 0 || idx &gt;= tty-&gt;driver-&gt;num) {</div><div class='del'>-		printk(KERN_DEBUG "release_dev: bad idx when trying to "</div><div class='add'>+		printk(KERN_DEBUG "tty_release_dev: bad idx when trying to "</div><div class='ctx'> 				  "free (%s)\n", tty-&gt;name);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='del'>-	if (!(tty-&gt;driver-&gt;flags &amp; TTY_DRIVER_DEVPTS_MEM)) {</div><div class='add'>+	if (!devpts) {</div><div class='ctx'> 		if (tty != tty-&gt;driver-&gt;ttys[idx]) {</div><div class='del'>-			printk(KERN_DEBUG "release_dev: driver.table[%d] not tty "</div><div class='add'>+			printk(KERN_DEBUG "tty_release_dev: driver.table[%d] not tty "</div><div class='ctx'> 			       "for (%s)\n", idx, tty-&gt;name);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (tty-&gt;termios != tty-&gt;driver-&gt;termios[idx]) {</div><div class='del'>-			printk(KERN_DEBUG "release_dev: driver.termios[%d] not termios "</div><div class='add'>+			printk(KERN_DEBUG "tty_release_dev: driver.termios[%d] not termios "</div><div class='ctx'> 			       "for (%s)\n",</div><div class='ctx'> 			       idx, tty-&gt;name);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='del'>-		if (tty-&gt;termios_locked != tty-&gt;driver-&gt;termios_locked[idx]) {</div><div class='del'>-			printk(KERN_DEBUG "release_dev: driver.termios_locked[%d] not "</div><div class='del'>-			       "termios_locked for (%s)\n",</div><div class='del'>-			       idx, tty-&gt;name);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef TTY_DEBUG_HANGUP</div><div class='del'>-	printk(KERN_DEBUG "release_dev of %s (tty count=%d)...",</div><div class='add'>+	printk(KERN_DEBUG "tty_release_dev of %s (tty count=%d)...",</div><div class='ctx'> 	       tty_name(tty, buf), tty-&gt;count);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -1985,26 +1576,19 @@ static void release_dev(struct file *filp)</div><div class='ctx'> 	if (tty-&gt;driver-&gt;other &amp;&amp;</div><div class='ctx'> 	     !(tty-&gt;driver-&gt;flags &amp; TTY_DRIVER_DEVPTS_MEM)) {</div><div class='ctx'> 		if (o_tty != tty-&gt;driver-&gt;other-&gt;ttys[idx]) {</div><div class='del'>-			printk(KERN_DEBUG "release_dev: other-&gt;table[%d] "</div><div class='add'>+			printk(KERN_DEBUG "tty_release_dev: other-&gt;table[%d] "</div><div class='ctx'> 					  "not o_tty for (%s)\n",</div><div class='ctx'> 			       idx, tty-&gt;name);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (o_tty-&gt;termios != tty-&gt;driver-&gt;other-&gt;termios[idx]) {</div><div class='del'>-			printk(KERN_DEBUG "release_dev: other-&gt;termios[%d] "</div><div class='add'>+			printk(KERN_DEBUG "tty_release_dev: other-&gt;termios[%d] "</div><div class='ctx'> 					  "not o_termios for (%s)\n",</div><div class='ctx'> 			       idx, tty-&gt;name);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='del'>-		if (o_tty-&gt;termios_locked !=</div><div class='del'>-		      tty-&gt;driver-&gt;other-&gt;termios_locked[idx]) {</div><div class='del'>-			printk(KERN_DEBUG "release_dev: other-&gt;termios_locked["</div><div class='del'>-					  "%d] not o_termios_locked for (%s)\n",</div><div class='del'>-			       idx, tty-&gt;name);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='ctx'> 		if (o_tty-&gt;link != tty) {</div><div class='del'>-			printk(KERN_DEBUG "release_dev: bad pty pointers\n");</div><div class='add'>+			printk(KERN_DEBUG "tty_release_dev: bad pty pointers\n");</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2062,7 +1646,7 @@ static void release_dev(struct file *filp)</div><div class='ctx'> 		if (!do_sleep)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		printk(KERN_WARNING "release_dev: %s: read/write wait queue "</div><div class='add'>+		printk(KERN_WARNING "tty_release_dev: %s: read/write wait queue "</div><div class='ctx'> 				    "active!\n", tty_name(tty, buf));</div><div class='ctx'> 		mutex_unlock(&amp;tty_mutex);</div><div class='ctx'> 		schedule();</div><div class='hunk'>@@ -2075,14 +1659,14 @@ static void release_dev(struct file *filp)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (pty_master) {</div><div class='ctx'> 		if (--o_tty-&gt;count &lt; 0) {</div><div class='del'>-			printk(KERN_WARNING "release_dev: bad pty slave count "</div><div class='add'>+			printk(KERN_WARNING "tty_release_dev: bad pty slave count "</div><div class='ctx'> 					    "(%d) for %s\n",</div><div class='ctx'> 			       o_tty-&gt;count, tty_name(o_tty, buf));</div><div class='ctx'> 			o_tty-&gt;count = 0;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	if (--tty-&gt;count &lt; 0) {</div><div class='del'>-		printk(KERN_WARNING "release_dev: bad tty-&gt;count (%d) for %s\n",</div><div class='add'>+		printk(KERN_WARNING "tty_release_dev: bad tty-&gt;count (%d) for %s\n",</div><div class='ctx'> 		       tty-&gt;count, tty_name(tty, buf));</div><div class='ctx'> 		tty-&gt;count = 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2145,11 +1729,11 @@ static void release_dev(struct file *filp)</div><div class='ctx'> </div><div class='ctx'> 	/* Make this pty number available for reallocation */</div><div class='ctx'> 	if (devpts)</div><div class='del'>-		devpts_kill_index(idx);</div><div class='add'>+		devpts_kill_index(inode, idx);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *	tty_open		-	open a tty device</div><div class='add'>+ *	__tty_open		-	open a tty device</div><div class='ctx'>  *	@inode: inode of device file</div><div class='ctx'>  *	@filp: file pointer to tty</div><div class='ctx'>  *</div><div class='hunk'>@@ -2164,14 +1748,14 @@ static void release_dev(struct file *filp)</div><div class='ctx'>  *	The termios state of a pty is reset on first open so that</div><div class='ctx'>  *	settings don't persist across reuse.</div><div class='ctx'>  *</div><div class='del'>- *	Locking: tty_mutex protects tty, get_tty_driver and init_dev work.</div><div class='add'>+ *	Locking: tty_mutex protects tty, get_tty_driver and tty_init_dev work.</div><div class='ctx'>  *		 tty-&gt;count should protect the rest.</div><div class='ctx'>  *		 -&gt;siglock protects -&gt;signal/-&gt;sighand</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static int __tty_open(struct inode *inode, struct file *filp)</div><div class='ctx'> {</div><div class='del'>-	struct tty_struct *tty;</div><div class='add'>+	struct tty_struct *tty = NULL;</div><div class='ctx'> 	int noctty, retval;</div><div class='ctx'> 	struct tty_driver *driver;</div><div class='ctx'> 	int index;</div><div class='hunk'>@@ -2193,23 +1777,25 @@ retry_open:</div><div class='ctx'> 			mutex_unlock(&amp;tty_mutex);</div><div class='ctx'> 			return -ENXIO;</div><div class='ctx'> 		}</div><div class='del'>-		driver = tty-&gt;driver;</div><div class='add'>+		driver = tty_driver_kref_get(tty-&gt;driver);</div><div class='ctx'> 		index = tty-&gt;index;</div><div class='ctx'> 		filp-&gt;f_flags |= O_NONBLOCK; /* Don't let /dev/tty block */</div><div class='ctx'> 		/* noctty = 1; */</div><div class='add'>+		/* FIXME: Should we take a driver reference ? */</div><div class='add'>+		tty_kref_put(tty);</div><div class='ctx'> 		goto got_driver;</div><div class='ctx'> 	}</div><div class='ctx'> #ifdef CONFIG_VT</div><div class='ctx'> 	if (device == MKDEV(TTY_MAJOR, 0)) {</div><div class='ctx'> 		extern struct tty_driver *console_driver;</div><div class='del'>-		driver = console_driver;</div><div class='add'>+		driver = tty_driver_kref_get(console_driver);</div><div class='ctx'> 		index = fg_console;</div><div class='ctx'> 		noctty = 1;</div><div class='ctx'> 		goto got_driver;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> 	if (device == MKDEV(TTYAUX_MAJOR, 1)) {</div><div class='del'>-		driver = console_device(&amp;index);</div><div class='add'>+		driver = tty_driver_kref_get(console_device(&amp;index));</div><div class='ctx'> 		if (driver) {</div><div class='ctx'> 			/* Don't let /dev/console block */</div><div class='ctx'> 			filp-&gt;f_flags |= O_NONBLOCK;</div><div class='hunk'>@@ -2226,10 +1812,25 @@ retry_open:</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> got_driver:</div><div class='del'>-	retval = init_dev(driver, index, &amp;tty);</div><div class='add'>+	if (!tty) {</div><div class='add'>+		/* check whether we're reopening an existing tty */</div><div class='add'>+		tty = tty_driver_lookup_tty(driver, inode, index);</div><div class='add'>+</div><div class='add'>+		if (IS_ERR(tty))</div><div class='add'>+			return PTR_ERR(tty);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tty) {</div><div class='add'>+		retval = tty_reopen(tty);</div><div class='add'>+		if (retval)</div><div class='add'>+			tty = ERR_PTR(retval);</div><div class='add'>+	} else</div><div class='add'>+		tty = tty_init_dev(driver, index, 0);</div><div class='add'>+</div><div class='ctx'> 	mutex_unlock(&amp;tty_mutex);</div><div class='del'>-	if (retval)</div><div class='del'>-		return retval;</div><div class='add'>+	tty_driver_kref_put(driver);</div><div class='add'>+	if (IS_ERR(tty))</div><div class='add'>+		return PTR_ERR(tty);</div><div class='ctx'> </div><div class='ctx'> 	filp-&gt;private_data = tty;</div><div class='ctx'> 	file_move(filp, &amp;tty-&gt;tty_files);</div><div class='hunk'>@@ -2257,7 +1858,7 @@ got_driver:</div><div class='ctx'> 		printk(KERN_DEBUG "error %d in opening %s...", retval,</div><div class='ctx'> 		       tty-&gt;name);</div><div class='ctx'> #endif</div><div class='del'>-		release_dev(filp);</div><div class='add'>+		tty_release_dev(filp);</div><div class='ctx'> 		if (retval != -ERESTARTSYS)</div><div class='ctx'> 			return retval;</div><div class='ctx'> 		if (signal_pending(current))</div><div class='hunk'>@@ -2296,69 +1897,6 @@ static int tty_open(struct inode *inode, struct file *filp)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_UNIX98_PTYS</div><div class='del'>-/**</div><div class='del'>- *	ptmx_open		-	open a unix 98 pty master</div><div class='del'>- *	@inode: inode of device file</div><div class='del'>- *	@filp: file pointer to tty</div><div class='del'>- *</div><div class='del'>- *	Allocate a unix98 pty master device from the ptmx driver.</div><div class='del'>- *</div><div class='del'>- *	Locking: tty_mutex protects theinit_dev work. tty-&gt;count should</div><div class='del'>- * 		protect the rest.</div><div class='del'>- *		allocated_ptys_lock handles the list of free pty numbers</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int __ptmx_open(struct inode *inode, struct file *filp)</div><div class='del'>-{</div><div class='del'>-	struct tty_struct *tty;</div><div class='del'>-	int retval;</div><div class='del'>-	int index;</div><div class='del'>-</div><div class='del'>-	nonseekable_open(inode, filp);</div><div class='del'>-</div><div class='del'>-	/* find a device that is not in use. */</div><div class='del'>-	index = devpts_new_index();</div><div class='del'>-	if (index &lt; 0)</div><div class='del'>-		return index;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;tty_mutex);</div><div class='del'>-	retval = init_dev(ptm_driver, index, &amp;tty);</div><div class='del'>-	mutex_unlock(&amp;tty_mutex);</div><div class='del'>-</div><div class='del'>-	if (retval)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	set_bit(TTY_PTY_LOCK, &amp;tty-&gt;flags); /* LOCK THE SLAVE */</div><div class='del'>-	filp-&gt;private_data = tty;</div><div class='del'>-	file_move(filp, &amp;tty-&gt;tty_files);</div><div class='del'>-</div><div class='del'>-	retval = devpts_pty_new(tty-&gt;link);</div><div class='del'>-	if (retval)</div><div class='del'>-		goto out1;</div><div class='del'>-</div><div class='del'>-	check_tty_count(tty, "ptmx_open");</div><div class='del'>-	retval = ptm_driver-&gt;ops-&gt;open(tty, filp);</div><div class='del'>-	if (!retval)</div><div class='del'>-		return 0;</div><div class='del'>-out1:</div><div class='del'>-	release_dev(filp);</div><div class='del'>-	return retval;</div><div class='del'>-out:</div><div class='del'>-	devpts_kill_index(index);</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ptmx_open(struct inode *inode, struct file *filp)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	lock_kernel();</div><div class='del'>-	ret = __ptmx_open(inode, filp);</div><div class='del'>-	unlock_kernel();</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	tty_release		-	vfs callback for close</div><div class='hunk'>@@ -2369,13 +1907,13 @@ static int ptmx_open(struct inode *inode, struct file *filp)</div><div class='ctx'>  *	this tty. There may however be several such references.</div><div class='ctx'>  *</div><div class='ctx'>  *	Locking:</div><div class='del'>- *		Takes bkl. See release_dev</div><div class='add'>+ *		Takes bkl. See tty_release_dev</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static int tty_release(struct inode *inode, struct file *filp)</div><div class='ctx'> {</div><div class='ctx'> 	lock_kernel();</div><div class='del'>-	release_dev(filp);</div><div class='add'>+	tty_release_dev(filp);</div><div class='ctx'> 	unlock_kernel();</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -2524,7 +2062,7 @@ int tty_do_resize(struct tty_struct *tty, struct tty_struct *real_tty,</div><div class='ctx'> </div><div class='ctx'> 	/* For a PTY we need to lock the tty side */</div><div class='ctx'> 	mutex_lock(&amp;real_tty-&gt;termios_mutex);</div><div class='del'>-	if (!memcmp(ws, &amp;tty-&gt;winsize, sizeof(*ws)))</div><div class='add'>+	if (!memcmp(ws, &amp;real_tty-&gt;winsize, sizeof(*ws)))</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	/* Get the PID values and reference them so we can</div><div class='ctx'> 	   avoid holding the tty ctrl lock while sending signals */</div><div class='hunk'>@@ -2996,7 +2534,7 @@ long tty_ioctl(struct file *file, unsigned int cmd, unsigned long arg)</div><div class='ctx'> 	case TIOCSTI:</div><div class='ctx'> 		return tiocsti(tty, p);</div><div class='ctx'> 	case TIOCGWINSZ:</div><div class='del'>-		return tiocgwinsz(tty, p);</div><div class='add'>+		return tiocgwinsz(real_tty, p);</div><div class='ctx'> 	case TIOCSWINSZ:</div><div class='ctx'> 		return tiocswinsz(tty, real_tty, p);</div><div class='ctx'> 	case TIOCCONS:</div><div class='hunk'>@@ -3026,10 +2564,6 @@ long tty_ioctl(struct file *file, unsigned int cmd, unsigned long arg)</div><div class='ctx'> 		return put_user(tty-&gt;ldisc.ops-&gt;num, (int __user *)p);</div><div class='ctx'> 	case TIOCSETD:</div><div class='ctx'> 		return tiocsetd(tty, p);</div><div class='del'>-#ifdef CONFIG_VT</div><div class='del'>-	case TIOCLINUX:</div><div class='del'>-		return tioclinux(tty, arg);</div><div class='del'>-#endif</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Break handling</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -3220,113 +2754,6 @@ void do_SAK(struct tty_struct *tty)</div><div class='ctx'> EXPORT_SYMBOL(do_SAK);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *	flush_to_ldisc</div><div class='del'>- *	@work: tty structure passed from work queue.</div><div class='del'>- *</div><div class='del'>- *	This routine is called out of the software interrupt to flush data</div><div class='del'>- *	from the buffer chain to the line discipline.</div><div class='del'>- *</div><div class='del'>- *	Locking: holds tty-&gt;buf.lock to guard buffer list. Drops the lock</div><div class='del'>- *	while invoking the line discipline receive_buf method. The</div><div class='del'>- *	receive_buf method is single threaded for each tty instance.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void flush_to_ldisc(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct tty_struct *tty =</div><div class='del'>-		container_of(work, struct tty_struct, buf.work.work);</div><div class='del'>-	unsigned long 	flags;</div><div class='del'>-	struct tty_ldisc *disc;</div><div class='del'>-	struct tty_buffer *tbuf, *head;</div><div class='del'>-	char *char_buf;</div><div class='del'>-	unsigned char *flag_buf;</div><div class='del'>-</div><div class='del'>-	disc = tty_ldisc_ref(tty);</div><div class='del'>-	if (disc == NULL)	/*  !TTY_LDISC */</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;tty-&gt;buf.lock, flags);</div><div class='del'>-	/* So we know a flush is running */</div><div class='del'>-	set_bit(TTY_FLUSHING, &amp;tty-&gt;flags);</div><div class='del'>-	head = tty-&gt;buf.head;</div><div class='del'>-	if (head != NULL) {</div><div class='del'>-		tty-&gt;buf.head = NULL;</div><div class='del'>-		for (;;) {</div><div class='del'>-			int count = head-&gt;commit - head-&gt;read;</div><div class='del'>-			if (!count) {</div><div class='del'>-				if (head-&gt;next == NULL)</div><div class='del'>-					break;</div><div class='del'>-				tbuf = head;</div><div class='del'>-				head = head-&gt;next;</div><div class='del'>-				tty_buffer_free(tty, tbuf);</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-			/* Ldisc or user is trying to flush the buffers</div><div class='del'>-			   we are feeding to the ldisc, stop feeding the</div><div class='del'>-			   line discipline as we want to empty the queue */</div><div class='del'>-			if (test_bit(TTY_FLUSHPENDING, &amp;tty-&gt;flags))</div><div class='del'>-				break;</div><div class='del'>-			if (!tty-&gt;receive_room) {</div><div class='del'>-				schedule_delayed_work(&amp;tty-&gt;buf.work, 1);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			if (count &gt; tty-&gt;receive_room)</div><div class='del'>-				count = tty-&gt;receive_room;</div><div class='del'>-			char_buf = head-&gt;char_buf_ptr + head-&gt;read;</div><div class='del'>-			flag_buf = head-&gt;flag_buf_ptr + head-&gt;read;</div><div class='del'>-			head-&gt;read += count;</div><div class='del'>-			spin_unlock_irqrestore(&amp;tty-&gt;buf.lock, flags);</div><div class='del'>-			disc-&gt;ops-&gt;receive_buf(tty, char_buf,</div><div class='del'>-							flag_buf, count);</div><div class='del'>-			spin_lock_irqsave(&amp;tty-&gt;buf.lock, flags);</div><div class='del'>-		}</div><div class='del'>-		/* Restore the queue head */</div><div class='del'>-		tty-&gt;buf.head = head;</div><div class='del'>-	}</div><div class='del'>-	/* We may have a deferred request to flush the input buffer,</div><div class='del'>-	   if so pull the chain under the lock and empty the queue */</div><div class='del'>-	if (test_bit(TTY_FLUSHPENDING, &amp;tty-&gt;flags)) {</div><div class='del'>-		__tty_buffer_flush(tty);</div><div class='del'>-		clear_bit(TTY_FLUSHPENDING, &amp;tty-&gt;flags);</div><div class='del'>-		wake_up(&amp;tty-&gt;read_wait);</div><div class='del'>-	}</div><div class='del'>-	clear_bit(TTY_FLUSHING, &amp;tty-&gt;flags);</div><div class='del'>-	spin_unlock_irqrestore(&amp;tty-&gt;buf.lock, flags);</div><div class='del'>-</div><div class='del'>-	tty_ldisc_deref(disc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	tty_flip_buffer_push	-	terminal</div><div class='del'>- *	@tty: tty to push</div><div class='del'>- *</div><div class='del'>- *	Queue a push of the terminal flip buffers to the line discipline. This</div><div class='del'>- *	function must not be called from IRQ context if tty-&gt;low_latency is set.</div><div class='del'>- *</div><div class='del'>- *	In the event of the queue being busy for flipping the work will be</div><div class='del'>- *	held off and retried later.</div><div class='del'>- *</div><div class='del'>- *	Locking: tty buffer lock. Driver locks in low latency mode.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-void tty_flip_buffer_push(struct tty_struct *tty)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	spin_lock_irqsave(&amp;tty-&gt;buf.lock, flags);</div><div class='del'>-	if (tty-&gt;buf.tail != NULL)</div><div class='del'>-		tty-&gt;buf.tail-&gt;commit = tty-&gt;buf.tail-&gt;used;</div><div class='del'>-	spin_unlock_irqrestore(&amp;tty-&gt;buf.lock, flags);</div><div class='del'>-</div><div class='del'>-	if (tty-&gt;low_latency)</div><div class='del'>-		flush_to_ldisc(&amp;tty-&gt;buf.work.work);</div><div class='del'>-	else</div><div class='del'>-		schedule_delayed_work(&amp;tty-&gt;buf.work, 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(tty_flip_buffer_push);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  *	initialize_tty_struct</div><div class='ctx'>  *	@tty: tty to initialize</div><div class='ctx'>  *</div><div class='hunk'>@@ -3336,9 +2763,11 @@ EXPORT_SYMBOL(tty_flip_buffer_push);</div><div class='ctx'>  *	Locking: none - tty in question must not be exposed at this point</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static void initialize_tty_struct(struct tty_struct *tty)</div><div class='add'>+void initialize_tty_struct(struct tty_struct *tty,</div><div class='add'>+		struct tty_driver *driver, int idx)</div><div class='ctx'> {</div><div class='ctx'> 	memset(tty, 0, sizeof(struct tty_struct));</div><div class='add'>+	kref_init(&amp;tty-&gt;kref);</div><div class='ctx'> 	tty-&gt;magic = TTY_MAGIC;</div><div class='ctx'> 	tty_ldisc_init(tty);</div><div class='ctx'> 	tty-&gt;session = NULL;</div><div class='hunk'>@@ -3346,7 +2775,6 @@ static void initialize_tty_struct(struct tty_struct *tty)</div><div class='ctx'> 	tty-&gt;overrun_time = jiffies;</div><div class='ctx'> 	tty-&gt;buf.head = tty-&gt;buf.tail = NULL;</div><div class='ctx'> 	tty_buffer_init(tty);</div><div class='del'>-	INIT_DELAYED_WORK(&amp;tty-&gt;buf.work, flush_to_ldisc);</div><div class='ctx'> 	mutex_init(&amp;tty-&gt;termios_mutex);</div><div class='ctx'> 	init_waitqueue_head(&amp;tty-&gt;write_wait);</div><div class='ctx'> 	init_waitqueue_head(&amp;tty-&gt;read_wait);</div><div class='hunk'>@@ -3357,6 +2785,11 @@ static void initialize_tty_struct(struct tty_struct *tty)</div><div class='ctx'> 	spin_lock_init(&amp;tty-&gt;ctrl_lock);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;tty-&gt;tty_files);</div><div class='ctx'> 	INIT_WORK(&amp;tty-&gt;SAK_work, do_SAK_work);</div><div class='add'>+</div><div class='add'>+	tty-&gt;driver = driver;</div><div class='add'>+	tty-&gt;ops = driver-&gt;ops;</div><div class='add'>+	tty-&gt;index = idx;</div><div class='add'>+	tty_line_name(driver, idx, tty-&gt;name);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -3377,10 +2810,9 @@ int tty_put_char(struct tty_struct *tty, unsigned char ch)</div><div class='ctx'> 		return tty-&gt;ops-&gt;put_char(tty, ch);</div><div class='ctx'> 	return tty-&gt;ops-&gt;write(tty, &amp;ch, 1);</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL_GPL(tty_put_char);</div><div class='ctx'> </div><div class='del'>-static struct class *tty_class;</div><div class='add'>+struct class *tty_class;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	tty_register_device - register a tty device</div><div class='hunk'>@@ -3418,8 +2850,9 @@ struct device *tty_register_device(struct tty_driver *driver, unsigned index,</div><div class='ctx'> 	else</div><div class='ctx'> 		tty_line_name(driver, index, name);</div><div class='ctx'> </div><div class='del'>-	return device_create_drvdata(tty_class, device, dev, NULL, name);</div><div class='add'>+	return device_create(tty_class, device, dev, NULL, name);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(tty_register_device);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * 	tty_unregister_device - unregister a tty device</div><div class='hunk'>@@ -3437,8 +2870,6 @@ void tty_unregister_device(struct tty_driver *driver, unsigned index)</div><div class='ctx'> 	device_destroy(tty_class,</div><div class='ctx'> 		MKDEV(driver-&gt;major, driver-&gt;minor_start) + index);</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(tty_register_device);</div><div class='ctx'> EXPORT_SYMBOL(tty_unregister_device);</div><div class='ctx'> </div><div class='ctx'> struct tty_driver *alloc_tty_driver(int lines)</div><div class='hunk'>@@ -3447,27 +2878,65 @@ struct tty_driver *alloc_tty_driver(int lines)</div><div class='ctx'> </div><div class='ctx'> 	driver = kzalloc(sizeof(struct tty_driver), GFP_KERNEL);</div><div class='ctx'> 	if (driver) {</div><div class='add'>+		kref_init(&amp;driver-&gt;kref);</div><div class='ctx'> 		driver-&gt;magic = TTY_DRIVER_MAGIC;</div><div class='ctx'> 		driver-&gt;num = lines;</div><div class='ctx'> 		/* later we'll move allocation of tables here */</div><div class='ctx'> 	}</div><div class='ctx'> 	return driver;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(alloc_tty_driver);</div><div class='ctx'> </div><div class='del'>-void put_tty_driver(struct tty_driver *driver)</div><div class='add'>+static void destruct_tty_driver(struct kref *kref)</div><div class='ctx'> {</div><div class='add'>+	struct tty_driver *driver = container_of(kref, struct tty_driver, kref);</div><div class='add'>+	int i;</div><div class='add'>+	struct ktermios *tp;</div><div class='add'>+	void *p;</div><div class='add'>+</div><div class='add'>+	if (driver-&gt;flags &amp; TTY_DRIVER_INSTALLED) {</div><div class='add'>+		/*</div><div class='add'>+		 * Free the termios and termios_locked structures because</div><div class='add'>+		 * we don't want to get memory leaks when modular tty</div><div class='add'>+		 * drivers are removed from the kernel.</div><div class='add'>+		 */</div><div class='add'>+		for (i = 0; i &lt; driver-&gt;num; i++) {</div><div class='add'>+			tp = driver-&gt;termios[i];</div><div class='add'>+			if (tp) {</div><div class='add'>+				driver-&gt;termios[i] = NULL;</div><div class='add'>+				kfree(tp);</div><div class='add'>+			}</div><div class='add'>+			if (!(driver-&gt;flags &amp; TTY_DRIVER_DYNAMIC_DEV))</div><div class='add'>+				tty_unregister_device(driver, i);</div><div class='add'>+		}</div><div class='add'>+		p = driver-&gt;ttys;</div><div class='add'>+		proc_tty_unregister_driver(driver);</div><div class='add'>+		driver-&gt;ttys = NULL;</div><div class='add'>+		driver-&gt;termios = NULL;</div><div class='add'>+		kfree(p);</div><div class='add'>+		cdev_del(&amp;driver-&gt;cdev);</div><div class='add'>+	}</div><div class='ctx'> 	kfree(driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void tty_driver_kref_put(struct tty_driver *driver)</div><div class='add'>+{</div><div class='add'>+	kref_put(&amp;driver-&gt;kref, destruct_tty_driver);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(tty_driver_kref_put);</div><div class='add'>+</div><div class='ctx'> void tty_set_operations(struct tty_driver *driver,</div><div class='ctx'> 			const struct tty_operations *op)</div><div class='ctx'> {</div><div class='ctx'> 	driver-&gt;ops = op;</div><div class='ctx'> };</div><div class='add'>+EXPORT_SYMBOL(tty_set_operations);</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(alloc_tty_driver);</div><div class='add'>+void put_tty_driver(struct tty_driver *d)</div><div class='add'>+{</div><div class='add'>+	tty_driver_kref_put(d);</div><div class='add'>+}</div><div class='ctx'> EXPORT_SYMBOL(put_tty_driver);</div><div class='del'>-EXPORT_SYMBOL(tty_set_operations);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Called by a tty driver to register itself.</div><div class='hunk'>@@ -3479,11 +2948,8 @@ int tty_register_driver(struct tty_driver *driver)</div><div class='ctx'> 	dev_t dev;</div><div class='ctx'> 	void **p = NULL;</div><div class='ctx'> </div><div class='del'>-	if (driver-&gt;flags &amp; TTY_DRIVER_INSTALLED)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='ctx'> 	if (!(driver-&gt;flags &amp; TTY_DRIVER_DEVPTS_MEM) &amp;&amp; driver-&gt;num) {</div><div class='del'>-		p = kzalloc(driver-&gt;num * 3 * sizeof(void *), GFP_KERNEL);</div><div class='add'>+		p = kzalloc(driver-&gt;num * 2 * sizeof(void *), GFP_KERNEL);</div><div class='ctx'> 		if (!p)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3507,12 +2973,9 @@ int tty_register_driver(struct tty_driver *driver)</div><div class='ctx'> 	if (p) {</div><div class='ctx'> 		driver-&gt;ttys = (struct tty_struct **)p;</div><div class='ctx'> 		driver-&gt;termios = (struct ktermios **)(p + driver-&gt;num);</div><div class='del'>-		driver-&gt;termios_locked = (struct ktermios **)</div><div class='del'>-							(p + driver-&gt;num * 2);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		driver-&gt;ttys = NULL;</div><div class='ctx'> 		driver-&gt;termios = NULL;</div><div class='del'>-		driver-&gt;termios_locked = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	cdev_init(&amp;driver-&gt;cdev, &amp;tty_fops);</div><div class='hunk'>@@ -3521,7 +2984,7 @@ int tty_register_driver(struct tty_driver *driver)</div><div class='ctx'> 	if (error) {</div><div class='ctx'> 		unregister_chrdev_region(dev, driver-&gt;num);</div><div class='ctx'> 		driver-&gt;ttys = NULL;</div><div class='del'>-		driver-&gt;termios = driver-&gt;termios_locked = NULL;</div><div class='add'>+		driver-&gt;termios = NULL;</div><div class='ctx'> 		kfree(p);</div><div class='ctx'> 		return error;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3535,6 +2998,7 @@ int tty_register_driver(struct tty_driver *driver)</div><div class='ctx'> 		    tty_register_device(driver, i, NULL);</div><div class='ctx'> 	}</div><div class='ctx'> 	proc_tty_register_driver(driver);</div><div class='add'>+	driver-&gt;flags |= TTY_DRIVER_INSTALLED;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3545,46 +3009,19 @@ EXPORT_SYMBOL(tty_register_driver);</div><div class='ctx'>  */</div><div class='ctx'> int tty_unregister_driver(struct tty_driver *driver)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='del'>-	struct ktermios *tp;</div><div class='del'>-	void *p;</div><div class='del'>-</div><div class='add'>+#if 0</div><div class='add'>+	/* FIXME */</div><div class='ctx'> 	if (driver-&gt;refcount)</div><div class='ctx'> 		return -EBUSY;</div><div class='del'>-</div><div class='add'>+#endif</div><div class='ctx'> 	unregister_chrdev_region(MKDEV(driver-&gt;major, driver-&gt;minor_start),</div><div class='ctx'> 				driver-&gt;num);</div><div class='ctx'> 	mutex_lock(&amp;tty_mutex);</div><div class='ctx'> 	list_del(&amp;driver-&gt;tty_drivers);</div><div class='ctx'> 	mutex_unlock(&amp;tty_mutex);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Free the termios and termios_locked structures because</div><div class='del'>-	 * we don't want to get memory leaks when modular tty</div><div class='del'>-	 * drivers are removed from the kernel.</div><div class='del'>-	 */</div><div class='del'>-	for (i = 0; i &lt; driver-&gt;num; i++) {</div><div class='del'>-		tp = driver-&gt;termios[i];</div><div class='del'>-		if (tp) {</div><div class='del'>-			driver-&gt;termios[i] = NULL;</div><div class='del'>-			kfree(tp);</div><div class='del'>-		}</div><div class='del'>-		tp = driver-&gt;termios_locked[i];</div><div class='del'>-		if (tp) {</div><div class='del'>-			driver-&gt;termios_locked[i] = NULL;</div><div class='del'>-			kfree(tp);</div><div class='del'>-		}</div><div class='del'>-		if (!(driver-&gt;flags &amp; TTY_DRIVER_DYNAMIC_DEV))</div><div class='del'>-			tty_unregister_device(driver, i);</div><div class='del'>-	}</div><div class='del'>-	p = driver-&gt;ttys;</div><div class='del'>-	proc_tty_unregister_driver(driver);</div><div class='del'>-	driver-&gt;ttys = NULL;</div><div class='del'>-	driver-&gt;termios = driver-&gt;termios_locked = NULL;</div><div class='del'>-	kfree(p);</div><div class='del'>-	cdev_del(&amp;driver-&gt;cdev);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+</div><div class='ctx'> EXPORT_SYMBOL(tty_unregister_driver);</div><div class='ctx'> </div><div class='ctx'> dev_t tty_devnum(struct tty_struct *tty)</div><div class='hunk'>@@ -3595,9 +3032,13 @@ EXPORT_SYMBOL(tty_devnum);</div><div class='ctx'> </div><div class='ctx'> void proc_clear_tty(struct task_struct *p)</div><div class='ctx'> {</div><div class='del'>-	spin_lock_irq(&amp;p-&gt;sighand-&gt;siglock);</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	struct tty_struct *tty;</div><div class='add'>+	spin_lock_irqsave(&amp;p-&gt;sighand-&gt;siglock, flags);</div><div class='add'>+	tty = p-&gt;signal-&gt;tty;</div><div class='ctx'> 	p-&gt;signal-&gt;tty = NULL;</div><div class='del'>-	spin_unlock_irq(&amp;p-&gt;sighand-&gt;siglock);</div><div class='add'>+	spin_unlock_irqrestore(&amp;p-&gt;sighand-&gt;siglock, flags);</div><div class='add'>+	tty_kref_put(tty);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Called under the sighand lock */</div><div class='hunk'>@@ -3613,9 +3054,13 @@ static void __proc_set_tty(struct task_struct *tsk, struct tty_struct *tty)</div><div class='ctx'> 		tty-&gt;pgrp = get_pid(task_pgrp(tsk));</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;tty-&gt;ctrl_lock, flags);</div><div class='ctx'> 		tty-&gt;session = get_pid(task_session(tsk));</div><div class='add'>+		if (tsk-&gt;signal-&gt;tty) {</div><div class='add'>+			printk(KERN_DEBUG "tty not NULL!!\n");</div><div class='add'>+			tty_kref_put(tsk-&gt;signal-&gt;tty);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	put_pid(tsk-&gt;signal-&gt;tty_old_pgrp);</div><div class='del'>-	tsk-&gt;signal-&gt;tty = tty;</div><div class='add'>+	tsk-&gt;signal-&gt;tty = tty_kref_get(tty);</div><div class='ctx'> 	tsk-&gt;signal-&gt;tty_old_pgrp = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3629,18 +3074,20 @@ static void proc_set_tty(struct task_struct *tsk, struct tty_struct *tty)</div><div class='ctx'> struct tty_struct *get_current_tty(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct tty_struct *tty;</div><div class='del'>-	WARN_ON_ONCE(!mutex_is_locked(&amp;tty_mutex));</div><div class='del'>-	tty = current-&gt;signal-&gt;tty;</div><div class='del'>-	/*</div><div class='del'>-	 * session-&gt;tty can be changed/cleared from under us, make sure we</div><div class='del'>-	 * issue the load. The obtained pointer, when not NULL, is valid as</div><div class='del'>-	 * long as we hold tty_mutex.</div><div class='del'>-	 */</div><div class='del'>-	barrier();</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;current-&gt;sighand-&gt;siglock, flags);</div><div class='add'>+	tty = tty_kref_get(current-&gt;signal-&gt;tty);</div><div class='add'>+	spin_unlock_irqrestore(&amp;current-&gt;sighand-&gt;siglock, flags);</div><div class='ctx'> 	return tty;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(get_current_tty);</div><div class='ctx'> </div><div class='add'>+void tty_default_fops(struct file_operations *fops)</div><div class='add'>+{</div><div class='add'>+	*fops = tty_fops;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Initialize the console device. This is called *early*, so</div><div class='ctx'>  * we can't necessarily depend on lots of kernel help here.</div><div class='hunk'>@@ -3678,12 +3125,6 @@ postcore_initcall(tty_class_init);</div><div class='ctx'> /* 3/2004 jmc: why do these devices exist? */</div><div class='ctx'> </div><div class='ctx'> static struct cdev tty_cdev, console_cdev;</div><div class='del'>-#ifdef CONFIG_UNIX98_PTYS</div><div class='del'>-static struct cdev ptmx_cdev;</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_VT</div><div class='del'>-static struct cdev vc0_cdev;</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Ok, now we can initialize the rest of the tty devices and can count</div><div class='hunk'>@@ -3695,32 +3136,18 @@ static int __init tty_init(void)</div><div class='ctx'> 	if (cdev_add(&amp;tty_cdev, MKDEV(TTYAUX_MAJOR, 0), 1) ||</div><div class='ctx'> 	    register_chrdev_region(MKDEV(TTYAUX_MAJOR, 0), 1, "/dev/tty") &lt; 0)</div><div class='ctx'> 		panic("Couldn't register /dev/tty driver\n");</div><div class='del'>-	device_create_drvdata(tty_class, NULL, MKDEV(TTYAUX_MAJOR, 0), NULL,</div><div class='add'>+	device_create(tty_class, NULL, MKDEV(TTYAUX_MAJOR, 0), NULL,</div><div class='ctx'> 			      "tty");</div><div class='ctx'> </div><div class='ctx'> 	cdev_init(&amp;console_cdev, &amp;console_fops);</div><div class='ctx'> 	if (cdev_add(&amp;console_cdev, MKDEV(TTYAUX_MAJOR, 1), 1) ||</div><div class='ctx'> 	    register_chrdev_region(MKDEV(TTYAUX_MAJOR, 1), 1, "/dev/console") &lt; 0)</div><div class='ctx'> 		panic("Couldn't register /dev/console driver\n");</div><div class='del'>-	device_create_drvdata(tty_class, NULL, MKDEV(TTYAUX_MAJOR, 1), NULL,</div><div class='add'>+	device_create(tty_class, NULL, MKDEV(TTYAUX_MAJOR, 1), NULL,</div><div class='ctx'> 			      "console");</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_UNIX98_PTYS</div><div class='del'>-	cdev_init(&amp;ptmx_cdev, &amp;ptmx_fops);</div><div class='del'>-	if (cdev_add(&amp;ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||</div><div class='del'>-	    register_chrdev_region(MKDEV(TTYAUX_MAJOR, 2), 1, "/dev/ptmx") &lt; 0)</div><div class='del'>-		panic("Couldn't register /dev/ptmx driver\n");</div><div class='del'>-	device_create_drvdata(tty_class, NULL, MKDEV(TTYAUX_MAJOR, 2), NULL, "ptmx");</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_VT</div><div class='del'>-	cdev_init(&amp;vc0_cdev, &amp;console_fops);</div><div class='del'>-	if (cdev_add(&amp;vc0_cdev, MKDEV(TTY_MAJOR, 0), 1) ||</div><div class='del'>-	    register_chrdev_region(MKDEV(TTY_MAJOR, 0), 1, "/dev/vc/0") &lt; 0)</div><div class='del'>-		panic("Couldn't register /dev/tty0 driver\n");</div><div class='del'>-	device_create_drvdata(tty_class, NULL, MKDEV(TTY_MAJOR, 0), NULL, "tty0");</div><div class='del'>-</div><div class='del'>-	vty_init();</div><div class='add'>+	vty_init(&amp;console_fops);</div><div class='ctx'> #endif</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/char/tty_ioctl.c b/drivers/char/tty_ioctl.c<br/>index bf34e4597421..a408c8e487ec 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/tty_ioctl.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/char/tty_ioctl.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/tty_ioctl.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/tty_ioctl.c</a></div><div class='hunk'>@@ -40,6 +40,15 @@</div><div class='ctx'> #define TERMIOS_OLD	8</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ *	tty_chars_in_buffer	-	characters pending</div><div class='add'>+ *	@tty: terminal</div><div class='add'>+ *</div><div class='add'>+ *	Return the number of bytes of data in the device private</div><div class='add'>+ *	output queue. If no private method is supplied there is assumed</div><div class='add'>+ *	to be no queue on the device.</div><div class='add'>+ */</div><div class='add'>+</div><div class='ctx'> int tty_chars_in_buffer(struct tty_struct *tty)</div><div class='ctx'> {</div><div class='ctx'> 	if (tty-&gt;ops-&gt;chars_in_buffer)</div><div class='hunk'>@@ -47,26 +56,49 @@ int tty_chars_in_buffer(struct tty_struct *tty)</div><div class='ctx'> 	else</div><div class='ctx'> 		return 0;</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(tty_chars_in_buffer);</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ *	tty_write_room		-	write queue space</div><div class='add'>+ *	@tty: terminal</div><div class='add'>+ *</div><div class='add'>+ *	Return the number of bytes that can be queued to this device</div><div class='add'>+ *	at the present time. The result should be treated as a guarantee</div><div class='add'>+ *	and the driver cannot offer a value it later shrinks by more than</div><div class='add'>+ *	the number of bytes written. If no method is provided 2K is always</div><div class='add'>+ *	returned and data may be lost as there will be no flow control.</div><div class='add'>+ */</div><div class='add'>+ </div><div class='ctx'> int tty_write_room(struct tty_struct *tty)</div><div class='ctx'> {</div><div class='ctx'> 	if (tty-&gt;ops-&gt;write_room)</div><div class='ctx'> 		return tty-&gt;ops-&gt;write_room(tty);</div><div class='ctx'> 	return 2048;</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(tty_write_room);</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ *	tty_driver_flush_buffer	-	discard internal buffer</div><div class='add'>+ *	@tty: terminal</div><div class='add'>+ *</div><div class='add'>+ *	Discard the internal output buffer for this device. If no method</div><div class='add'>+ *	is provided then either the buffer cannot be hardware flushed or</div><div class='add'>+ *	there is no buffer driver side.</div><div class='add'>+ */</div><div class='ctx'> void tty_driver_flush_buffer(struct tty_struct *tty)</div><div class='ctx'> {</div><div class='ctx'> 	if (tty-&gt;ops-&gt;flush_buffer)</div><div class='ctx'> 		tty-&gt;ops-&gt;flush_buffer(tty);</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(tty_driver_flush_buffer);</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ *	tty_throttle		-	flow control</div><div class='add'>+ *	@tty: terminal</div><div class='add'>+ *</div><div class='add'>+ *	Indicate that a tty should stop transmitting data down the stack.</div><div class='add'>+ */</div><div class='add'>+</div><div class='ctx'> void tty_throttle(struct tty_struct *tty)</div><div class='ctx'> {</div><div class='ctx'> 	/* check TTY_THROTTLED first so it indicates our state */</div><div class='hunk'>@@ -76,6 +108,13 @@ void tty_throttle(struct tty_struct *tty)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(tty_throttle);</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ *	tty_unthrottle		-	flow control</div><div class='add'>+ *	@tty: terminal</div><div class='add'>+ *</div><div class='add'>+ *	Indicate that a tty may continue transmitting data down the stack.</div><div class='add'>+ */</div><div class='add'>+</div><div class='ctx'> void tty_unthrottle(struct tty_struct *tty)</div><div class='ctx'> {</div><div class='ctx'> 	if (test_and_clear_bit(TTY_THROTTLED, &amp;tty-&gt;flags) &amp;&amp;</div><div class='hunk'>@@ -112,6 +151,11 @@ void tty_wait_until_sent(struct tty_struct *tty, long timeout)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(tty_wait_until_sent);</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *		Termios Helper Methods</div><div class='add'>+ */</div><div class='add'>+</div><div class='ctx'> static void unset_locked_termios(struct ktermios *termios,</div><div class='ctx'> 				 struct ktermios *old,</div><div class='ctx'> 				 struct ktermios *locked)</div><div class='hunk'>@@ -346,6 +390,16 @@ void tty_termios_encode_baud_rate(struct ktermios *termios,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(tty_termios_encode_baud_rate);</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ *	tty_encode_baud_rate		-	set baud rate of the tty</div><div class='add'>+ *	@ibaud: input baud rate</div><div class='add'>+ *	@obad: output baud rate</div><div class='add'>+ *</div><div class='add'>+ *	Update the current termios data for the tty with the new speed</div><div class='add'>+ *	settings. The caller must hold the termios_mutex for the tty in</div><div class='add'>+ *	question.</div><div class='add'>+ */</div><div class='add'>+</div><div class='ctx'> void tty_encode_baud_rate(struct tty_struct *tty, speed_t ibaud, speed_t obaud)</div><div class='ctx'> {</div><div class='ctx'> 	tty_termios_encode_baud_rate(tty-&gt;termios, ibaud, obaud);</div><div class='hunk'>@@ -430,12 +484,11 @@ EXPORT_SYMBOL(tty_termios_hw_change);</div><div class='ctx'>  *	is a bit of layering violation here with n_tty in terms of the</div><div class='ctx'>  *	internal knowledge of this function.</div><div class='ctx'>  *</div><div class='del'>- *	Locking: termios_sem</div><div class='add'>+ *	Locking: termios_mutex</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static void change_termios(struct tty_struct *tty, struct ktermios *new_termios)</div><div class='ctx'> {</div><div class='del'>-	int canon_change;</div><div class='ctx'> 	struct ktermios old_termios;</div><div class='ctx'> 	struct tty_ldisc *ld;</div><div class='ctx'> 	unsigned long flags;</div><div class='hunk'>@@ -451,18 +504,6 @@ static void change_termios(struct tty_struct *tty, struct ktermios *new_termios)</div><div class='ctx'> 	old_termios = *tty-&gt;termios;</div><div class='ctx'> 	*tty-&gt;termios = *new_termios;</div><div class='ctx'> 	unset_locked_termios(tty-&gt;termios, &amp;old_termios, tty-&gt;termios_locked);</div><div class='del'>-	canon_change = (old_termios.c_lflag ^ tty-&gt;termios-&gt;c_lflag) &amp; ICANON;</div><div class='del'>-	if (canon_change) {</div><div class='del'>-		memset(&amp;tty-&gt;read_flags, 0, sizeof tty-&gt;read_flags);</div><div class='del'>-		tty-&gt;canon_head = tty-&gt;read_tail;</div><div class='del'>-		tty-&gt;canon_data = 0;</div><div class='del'>-		tty-&gt;erasing = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* This bit should be in the ldisc code */</div><div class='del'>-	if (canon_change &amp;&amp; !L_ICANON(tty) &amp;&amp; tty-&gt;read_cnt)</div><div class='del'>-		/* Get characters left over from canonical mode. */</div><div class='del'>-		wake_up_interruptible(&amp;tty-&gt;read_wait);</div><div class='ctx'> </div><div class='ctx'> 	/* See if packet mode change of state. */</div><div class='ctx'> 	if (tty-&gt;link &amp;&amp; tty-&gt;link-&gt;packet) {</div><div class='hunk'>@@ -508,7 +549,7 @@ static void change_termios(struct tty_struct *tty, struct ktermios *new_termios)</div><div class='ctx'>  *	functions before using change_termios to do the actual changes.</div><div class='ctx'>  *</div><div class='ctx'>  *	Locking:</div><div class='del'>- *		Called functions take ldisc and termios_sem locks</div><div class='add'>+ *		Called functions take ldisc and termios_mutex locks</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static int set_termios(struct tty_struct *tty, void __user *arg, int opt)</div><div class='hunk'>@@ -579,25 +620,51 @@ static int get_termio(struct tty_struct *tty, struct termio __user *termio)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned long inq_canon(struct tty_struct *tty)</div><div class='add'>+</div><div class='add'>+#ifdef TCGETX</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	set_termiox	-	set termiox fields if possible</div><div class='add'>+ *	@tty: terminal</div><div class='add'>+ *	@arg: termiox structure from user</div><div class='add'>+ *	@opt: option flags for ioctl type</div><div class='add'>+ *</div><div class='add'>+ *	Implement the device calling points for the SYS5 termiox ioctl</div><div class='add'>+ *	interface in Linux</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static int set_termiox(struct tty_struct *tty, void __user *arg, int opt)</div><div class='ctx'> {</div><div class='del'>-	int nr, head, tail;</div><div class='add'>+	struct termiox tnew;</div><div class='add'>+	struct tty_ldisc *ld;</div><div class='ctx'> </div><div class='del'>-	if (!tty-&gt;canon_data || !tty-&gt;read_buf)</div><div class='del'>-		return 0;</div><div class='del'>-	head = tty-&gt;canon_head;</div><div class='del'>-	tail = tty-&gt;read_tail;</div><div class='del'>-	nr = (head - tail) &amp; (N_TTY_BUF_SIZE-1);</div><div class='del'>-	/* Skip EOF-chars.. */</div><div class='del'>-	while (head != tail) {</div><div class='del'>-		if (test_bit(tail, tty-&gt;read_flags) &amp;&amp;</div><div class='del'>-		    tty-&gt;read_buf[tail] == __DISABLED_CHAR)</div><div class='del'>-			nr--;</div><div class='del'>-		tail = (tail+1) &amp; (N_TTY_BUF_SIZE-1);</div><div class='add'>+	if (tty-&gt;termiox == NULL)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (copy_from_user(&amp;tnew, arg, sizeof(struct termiox)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	ld = tty_ldisc_ref(tty);</div><div class='add'>+	if (ld != NULL) {</div><div class='add'>+		if ((opt &amp; TERMIOS_FLUSH) &amp;&amp; ld-&gt;ops-&gt;flush_buffer)</div><div class='add'>+			ld-&gt;ops-&gt;flush_buffer(tty);</div><div class='add'>+		tty_ldisc_deref(ld);</div><div class='ctx'> 	}</div><div class='del'>-	return nr;</div><div class='add'>+	if (opt &amp; TERMIOS_WAIT) {</div><div class='add'>+		tty_wait_until_sent(tty, 0);</div><div class='add'>+		if (signal_pending(current))</div><div class='add'>+			return -EINTR;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;tty-&gt;termios_mutex);</div><div class='add'>+	if (tty-&gt;ops-&gt;set_termiox)</div><div class='add'>+		tty-&gt;ops-&gt;set_termiox(tty, &amp;tnew);</div><div class='add'>+	mutex_unlock(&amp;tty-&gt;termios_mutex);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> #ifdef TIOCGETP</div><div class='ctx'> /*</div><div class='ctx'>  * These are deprecated, but there is limited support..</div><div class='hunk'>@@ -671,7 +738,7 @@ static void set_sgflags(struct ktermios *termios, int flags)</div><div class='ctx'>  *	Updates a terminal from the legacy BSD style terminal information</div><div class='ctx'>  *	structure.</div><div class='ctx'>  *</div><div class='del'>- *	Locking: termios_sem</div><div class='add'>+ *	Locking: termios_mutex</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static int set_sgttyb(struct tty_struct *tty, struct sgttyb __user *sgttyb)</div><div class='hunk'>@@ -849,6 +916,7 @@ int tty_mode_ioctl(struct tty_struct *tty, struct file *file,</div><div class='ctx'> {</div><div class='ctx'> 	struct tty_struct *real_tty;</div><div class='ctx'> 	void __user *p = (void __user *)arg;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (tty-&gt;driver-&gt;type == TTY_DRIVER_TYPE_PTY &amp;&amp;</div><div class='ctx'> 	    tty-&gt;driver-&gt;subtype == PTY_TYPE_MASTER)</div><div class='hunk'>@@ -884,18 +952,24 @@ int tty_mode_ioctl(struct tty_struct *tty, struct file *file,</div><div class='ctx'> 		return set_termios(real_tty, p, TERMIOS_OLD);</div><div class='ctx'> #ifndef TCGETS2</div><div class='ctx'> 	case TCGETS:</div><div class='add'>+		mutex_lock(&amp;real_tty-&gt;termios_mutex);</div><div class='ctx'> 		if (kernel_termios_to_user_termios((struct termios __user *)arg, real_tty-&gt;termios))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		return 0;</div><div class='add'>+			ret = -EFAULT;</div><div class='add'>+		mutex_unlock(&amp;real_tty-&gt;termios_mutex);</div><div class='add'>+		return ret;</div><div class='ctx'> #else</div><div class='ctx'> 	case TCGETS:</div><div class='add'>+		mutex_lock(&amp;real_tty-&gt;termios_mutex);</div><div class='ctx'> 		if (kernel_termios_to_user_termios_1((struct termios __user *)arg, real_tty-&gt;termios))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		return 0;</div><div class='add'>+			ret = -EFAULT;</div><div class='add'>+		mutex_unlock(&amp;real_tty-&gt;termios_mutex);</div><div class='add'>+		return ret;</div><div class='ctx'> 	case TCGETS2:</div><div class='add'>+		mutex_lock(&amp;real_tty-&gt;termios_mutex);</div><div class='ctx'> 		if (kernel_termios_to_user_termios((struct termios2 __user *)arg, real_tty-&gt;termios))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		return 0;</div><div class='add'>+			ret = -EFAULT;</div><div class='add'>+		mutex_unlock(&amp;real_tty-&gt;termios_mutex);</div><div class='add'>+		return ret;</div><div class='ctx'> 	case TCSETSF2:</div><div class='ctx'> 		return set_termios(real_tty, p,  TERMIOS_FLUSH | TERMIOS_WAIT);</div><div class='ctx'> 	case TCSETSW2:</div><div class='hunk'>@@ -913,34 +987,59 @@ int tty_mode_ioctl(struct tty_struct *tty, struct file *file,</div><div class='ctx'> 		return set_termios(real_tty, p, TERMIOS_TERMIO);</div><div class='ctx'> #ifndef TCGETS2</div><div class='ctx'> 	case TIOCGLCKTRMIOS:</div><div class='add'>+		mutex_lock(&amp;real_tty-&gt;termios_mutex);</div><div class='ctx'> 		if (kernel_termios_to_user_termios((struct termios __user *)arg, real_tty-&gt;termios_locked))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		return 0;</div><div class='add'>+			ret = -EFAULT;</div><div class='add'>+		mutex_unlock(&amp;real_tty-&gt;termios_mutex);</div><div class='add'>+		return ret;</div><div class='ctx'> 	case TIOCSLCKTRMIOS:</div><div class='ctx'> 		if (!capable(CAP_SYS_ADMIN))</div><div class='ctx'> 			return -EPERM;</div><div class='add'>+		mutex_lock(&amp;real_tty-&gt;termios_mutex);</div><div class='ctx'> 		if (user_termios_to_kernel_termios(real_tty-&gt;termios_locked,</div><div class='ctx'> 					       (struct termios __user *) arg))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		return 0;</div><div class='add'>+			ret = -EFAULT;</div><div class='add'>+		mutex_unlock(&amp;real_tty-&gt;termios_mutex);</div><div class='add'>+		return ret;</div><div class='ctx'> #else</div><div class='ctx'> 	case TIOCGLCKTRMIOS:</div><div class='add'>+		mutex_lock(&amp;real_tty-&gt;termios_mutex);</div><div class='ctx'> 		if (kernel_termios_to_user_termios_1((struct termios __user *)arg, real_tty-&gt;termios_locked))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		return 0;</div><div class='add'>+			ret = -EFAULT;</div><div class='add'>+		mutex_unlock(&amp;real_tty-&gt;termios_mutex);</div><div class='add'>+		return ret;</div><div class='ctx'> 	case TIOCSLCKTRMIOS:</div><div class='ctx'> 		if (!capable(CAP_SYS_ADMIN))</div><div class='del'>-			return -EPERM;</div><div class='add'>+			ret = -EPERM;</div><div class='add'>+		mutex_lock(&amp;real_tty-&gt;termios_mutex);</div><div class='ctx'> 		if (user_termios_to_kernel_termios_1(real_tty-&gt;termios_locked,</div><div class='ctx'> 					       (struct termios __user *) arg))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-			return 0;</div><div class='add'>+			ret = -EFAULT;</div><div class='add'>+		mutex_unlock(&amp;real_tty-&gt;termios_mutex);</div><div class='add'>+		return ret;</div><div class='ctx'> #endif</div><div class='add'>+#ifdef TCGETX</div><div class='add'>+	case TCGETX:</div><div class='add'>+		if (real_tty-&gt;termiox == NULL)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		mutex_lock(&amp;real_tty-&gt;termios_mutex);</div><div class='add'>+		if (copy_to_user(p, real_tty-&gt;termiox, sizeof(struct termiox)))</div><div class='add'>+			ret = -EFAULT;</div><div class='add'>+		mutex_unlock(&amp;real_tty-&gt;termios_mutex);</div><div class='add'>+		return ret;</div><div class='add'>+	case TCSETX:</div><div class='add'>+		return set_termiox(real_tty, p, 0);</div><div class='add'>+	case TCSETXW:</div><div class='add'>+		return set_termiox(real_tty, p, TERMIOS_WAIT);</div><div class='add'>+	case TCSETXF:</div><div class='add'>+		return set_termiox(real_tty, p, TERMIOS_FLUSH);</div><div class='add'>+#endif		</div><div class='ctx'> 	case TIOCGSOFTCAR:</div><div class='del'>-		/* FIXME: for correctness we may need to take the termios</div><div class='del'>-		   lock here - review */</div><div class='del'>-		return put_user(C_CLOCAL(real_tty) ? 1 : 0,</div><div class='add'>+		mutex_lock(&amp;real_tty-&gt;termios_mutex);</div><div class='add'>+		ret = put_user(C_CLOCAL(real_tty) ? 1 : 0,</div><div class='ctx'> 						(int __user *)arg);</div><div class='add'>+		mutex_unlock(&amp;real_tty-&gt;termios_mutex);</div><div class='add'>+		return ret;</div><div class='ctx'> 	case TIOCSSOFTCAR:</div><div class='ctx'> 		if (get_user(arg, (unsigned int __user *) arg))</div><div class='ctx'> 			return -EFAULT;</div><div class='hunk'>@@ -980,7 +1079,7 @@ int tty_perform_flush(struct tty_struct *tty, unsigned long arg)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(tty_perform_flush);</div><div class='ctx'> </div><div class='del'>-int n_tty_ioctl(struct tty_struct *tty, struct file *file,</div><div class='add'>+int n_tty_ioctl_helper(struct tty_struct *tty, struct file *file,</div><div class='ctx'> 		       unsigned int cmd, unsigned long arg)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='hunk'>@@ -1018,13 +1117,6 @@ int n_tty_ioctl(struct tty_struct *tty, struct file *file,</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	case TCFLSH:</div><div class='ctx'> 		return tty_perform_flush(tty, arg);</div><div class='del'>-	case TIOCOUTQ:</div><div class='del'>-		return put_user(tty_chars_in_buffer(tty), (int __user *) arg);</div><div class='del'>-	case TIOCINQ:</div><div class='del'>-		retval = tty-&gt;read_cnt;</div><div class='del'>-		if (L_ICANON(tty))</div><div class='del'>-			retval = inq_canon(tty);</div><div class='del'>-		return put_user(retval, (unsigned int __user *) arg);</div><div class='ctx'> 	case TIOCPKT:</div><div class='ctx'> 	{</div><div class='ctx'> 		int pktmode;</div><div class='hunk'>@@ -1050,4 +1142,4 @@ int n_tty_ioctl(struct tty_struct *tty, struct file *file,</div><div class='ctx'> 		return tty_mode_ioctl(tty, file, cmd, arg);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(n_tty_ioctl);</div><div class='add'>+EXPORT_SYMBOL(n_tty_ioctl_helper);</div><div class='head'>diff --git a/drivers/char/tty_port.c b/drivers/char/tty_port.c<br/>new file mode 100644<br/>index 000000000000..553b0e9d8d17<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/tty_port.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/tty_port.c</a></div><div class='hunk'>@@ -0,0 +1,96 @@</div><div class='add'>+/*</div><div class='add'>+ * Tty port functions</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/tty.h&gt;</div><div class='add'>+#include &lt;linux/tty_driver.h&gt;</div><div class='add'>+#include &lt;linux/tty_flip.h&gt;</div><div class='add'>+#include &lt;linux/timer.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/wait.h&gt;</div><div class='add'>+#include &lt;linux/bitops.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+</div><div class='add'>+void tty_port_init(struct tty_port *port)</div><div class='add'>+{</div><div class='add'>+	memset(port, 0, sizeof(*port));</div><div class='add'>+	init_waitqueue_head(&amp;port-&gt;open_wait);</div><div class='add'>+	init_waitqueue_head(&amp;port-&gt;close_wait);</div><div class='add'>+	mutex_init(&amp;port-&gt;mutex);</div><div class='add'>+	spin_lock_init(&amp;port-&gt;lock);</div><div class='add'>+	port-&gt;close_delay = (50 * HZ) / 100;</div><div class='add'>+	port-&gt;closing_wait = (3000 * HZ) / 100;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(tty_port_init);</div><div class='add'>+</div><div class='add'>+int tty_port_alloc_xmit_buf(struct tty_port *port)</div><div class='add'>+{</div><div class='add'>+	/* We may sleep in get_zeroed_page() */</div><div class='add'>+	mutex_lock(&amp;port-&gt;mutex);</div><div class='add'>+	if (port-&gt;xmit_buf == NULL)</div><div class='add'>+		port-&gt;xmit_buf = (unsigned char *)get_zeroed_page(GFP_KERNEL);</div><div class='add'>+	mutex_unlock(&amp;port-&gt;mutex);</div><div class='add'>+	if (port-&gt;xmit_buf == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(tty_port_alloc_xmit_buf);</div><div class='add'>+</div><div class='add'>+void tty_port_free_xmit_buf(struct tty_port *port)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;port-&gt;mutex);</div><div class='add'>+	if (port-&gt;xmit_buf != NULL) {</div><div class='add'>+		free_page((unsigned long)port-&gt;xmit_buf);</div><div class='add'>+		port-&gt;xmit_buf = NULL;</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;port-&gt;mutex);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(tty_port_free_xmit_buf);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	tty_port_tty_get	-	get a tty reference</div><div class='add'>+ *	@port: tty port</div><div class='add'>+ *</div><div class='add'>+ *	Return a refcount protected tty instance or NULL if the port is not</div><div class='add'>+ *	associated with a tty (eg due to close or hangup)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+struct tty_struct *tty_port_tty_get(struct tty_port *port)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	struct tty_struct *tty;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;port-&gt;lock, flags);</div><div class='add'>+	tty = tty_kref_get(port-&gt;tty);</div><div class='add'>+	spin_unlock_irqrestore(&amp;port-&gt;lock, flags);</div><div class='add'>+	return tty;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(tty_port_tty_get);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	tty_port_tty_set	-	set the tty of a port</div><div class='add'>+ *	@port: tty port</div><div class='add'>+ *	@tty: the tty</div><div class='add'>+ *</div><div class='add'>+ *	Associate the port and tty pair. Manages any internal refcounts.</div><div class='add'>+ *	Pass NULL to deassociate a port</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+void tty_port_tty_set(struct tty_port *port, struct tty_struct *tty)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;port-&gt;lock, flags);</div><div class='add'>+	if (port-&gt;tty)</div><div class='add'>+		tty_kref_put(port-&gt;tty);</div><div class='add'>+	port-&gt;tty = tty;</div><div class='add'>+	spin_unlock_irqrestore(&amp;port-&gt;lock, flags);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(tty_port_tty_set);</div><div class='head'>diff --git a/drivers/char/vc_screen.c b/drivers/char/vc_screen.c<br/>index c2ae52dd53d1..4f3b3f95fc42 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/vc_screen.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/char/vc_screen.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/vc_screen.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/vc_screen.c</a></div><div class='hunk'>@@ -481,10 +481,10 @@ static struct class *vc_class;</div><div class='ctx'> </div><div class='ctx'> void vcs_make_sysfs(struct tty_struct *tty)</div><div class='ctx'> {</div><div class='del'>-	device_create_drvdata(vc_class, NULL, MKDEV(VCS_MAJOR, tty-&gt;index + 1),</div><div class='del'>-			      NULL, "vcs%u", tty-&gt;index + 1);</div><div class='del'>-	device_create_drvdata(vc_class, NULL, MKDEV(VCS_MAJOR, tty-&gt;index + 129),</div><div class='del'>-			      NULL, "vcsa%u", tty-&gt;index + 1);</div><div class='add'>+	device_create(vc_class, NULL, MKDEV(VCS_MAJOR, tty-&gt;index + 1), NULL,</div><div class='add'>+		      "vcs%u", tty-&gt;index + 1);</div><div class='add'>+	device_create(vc_class, NULL, MKDEV(VCS_MAJOR, tty-&gt;index + 129), NULL,</div><div class='add'>+		      "vcsa%u", tty-&gt;index + 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void vcs_remove_sysfs(struct tty_struct *tty)</div><div class='hunk'>@@ -499,7 +499,7 @@ int __init vcs_init(void)</div><div class='ctx'> 		panic("unable to get major %d for vcs device", VCS_MAJOR);</div><div class='ctx'> 	vc_class = class_create(THIS_MODULE, "vc");</div><div class='ctx'> </div><div class='del'>-	device_create_drvdata(vc_class, NULL, MKDEV(VCS_MAJOR, 0), NULL, "vcs");</div><div class='del'>-	device_create_drvdata(vc_class, NULL, MKDEV(VCS_MAJOR, 128), NULL, "vcsa");</div><div class='add'>+	device_create(vc_class, NULL, MKDEV(VCS_MAJOR, 0), NULL, "vcs");</div><div class='add'>+	device_create(vc_class, NULL, MKDEV(VCS_MAJOR, 128), NULL, "vcsa");</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/char/viotape.c b/drivers/char/viotape.c<br/>index 7a70a40ad639..ffc9254f7e02 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/viotape.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/char/viotape.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/viotape.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/viotape.c</a></div><div class='hunk'>@@ -886,10 +886,10 @@ static int viotape_probe(struct vio_dev *vdev, const struct vio_device_id *id)</div><div class='ctx'> 	state[i].cur_part = 0;</div><div class='ctx'> 	for (j = 0; j &lt; MAX_PARTITIONS; ++j)</div><div class='ctx'> 		state[i].part_stat_rwi[j] = VIOT_IDLE;</div><div class='del'>-	device_create_drvdata(tape_class, NULL, MKDEV(VIOTAPE_MAJOR, i),</div><div class='del'>-			      NULL, "iseries!vt%d", i);</div><div class='del'>-	device_create_drvdata(tape_class, NULL, MKDEV(VIOTAPE_MAJOR, i | 0x80),</div><div class='del'>-			      NULL, "iseries!nvt%d", i);</div><div class='add'>+	device_create(tape_class, NULL, MKDEV(VIOTAPE_MAJOR, i), NULL,</div><div class='add'>+		      "iseries!vt%d", i);</div><div class='add'>+	device_create(tape_class, NULL, MKDEV(VIOTAPE_MAJOR, i | 0x80), NULL,</div><div class='add'>+		      "iseries!nvt%d", i);</div><div class='ctx'> 	printk(VIOTAPE_KERN_INFO "tape iseries/vt%d is iSeries "</div><div class='ctx'> 			"resource %10.10s type %4.4s, model %3.3s\n",</div><div class='ctx'> 			i, viotape_unitinfo[i].rsrcname,</div><div class='head'>diff --git a/drivers/char/vt.c b/drivers/char/vt.c<br/>index 60359c360912..d8f83e26e4a4 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/vt.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/char/vt.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/vt.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/vt.c</a></div><div class='hunk'>@@ -59,7 +59,7 @@</div><div class='ctx'>  * by Martin Mares &lt;mj@atrey.karlin.mff.cuni.cz&gt;, July 1998</div><div class='ctx'>  *</div><div class='ctx'>  * Removed old-style timers, introduced console_timer, made timer</div><div class='del'>- * deletion SMP-safe.  17Jun00, Andrew Morton &lt;andrewm@uow.edu.au&gt;</div><div class='add'>+ * deletion SMP-safe.  17Jun00, Andrew Morton</div><div class='ctx'>  *</div><div class='ctx'>  * Removed console_lock, enabled interrupts across all console operations</div><div class='ctx'>  * 13 March 2001, Andrew Morton</div><div class='hunk'>@@ -100,10 +100,10 @@</div><div class='ctx'> #include &lt;linux/font.h&gt;</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='ctx'> #include &lt;linux/notifier.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define MAX_NR_CON_DRIVER 16</div><div class='ctx'> </div><div class='hunk'>@@ -301,7 +301,7 @@ static void scrup(struct vc_data *vc, unsigned int t, unsigned int b, int nr)</div><div class='ctx'> 	d = (unsigned short *)(vc-&gt;vc_origin + vc-&gt;vc_size_row * t);</div><div class='ctx'> 	s = (unsigned short *)(vc-&gt;vc_origin + vc-&gt;vc_size_row * (t + nr));</div><div class='ctx'> 	scr_memmovew(d, s, (b - t - nr) * vc-&gt;vc_size_row);</div><div class='del'>-	scr_memsetw(d + (b - t - nr) * vc-&gt;vc_cols, vc-&gt;vc_scrl_erase_char,</div><div class='add'>+	scr_memsetw(d + (b - t - nr) * vc-&gt;vc_cols, vc-&gt;vc_video_erase_char,</div><div class='ctx'> 		    vc-&gt;vc_size_row * nr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -319,7 +319,7 @@ static void scrdown(struct vc_data *vc, unsigned int t, unsigned int b, int nr)</div><div class='ctx'> 	s = (unsigned short *)(vc-&gt;vc_origin + vc-&gt;vc_size_row * t);</div><div class='ctx'> 	step = vc-&gt;vc_cols * nr;</div><div class='ctx'> 	scr_memmovew(s + step, s, (b - t - nr) * vc-&gt;vc_size_row);</div><div class='del'>-	scr_memsetw(s, vc-&gt;vc_scrl_erase_char, 2 * step);</div><div class='add'>+	scr_memsetw(s, vc-&gt;vc_video_erase_char, 2 * step);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void do_update_region(struct vc_data *vc, unsigned long start, int count)</div><div class='hunk'>@@ -434,7 +434,6 @@ static void update_attr(struct vc_data *vc)</div><div class='ctx'> 	              vc-&gt;vc_blink, vc-&gt;vc_underline,</div><div class='ctx'> 	              vc-&gt;vc_reverse ^ vc-&gt;vc_decscnm, vc-&gt;vc_italic);</div><div class='ctx'> 	vc-&gt;vc_video_erase_char = (build_attr(vc, vc-&gt;vc_color, 1, vc-&gt;vc_blink, 0, vc-&gt;vc_decscnm, 0) &lt;&lt; 8) | ' ';</div><div class='del'>-	vc-&gt;vc_scrl_erase_char = (build_attr(vc, vc-&gt;vc_def_color, 1, false, false, vc-&gt;vc_decscnm, false) &lt;&lt; 8) | ' ';</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Note: inverting the screen twice should revert to the original state */</div><div class='hunk'>@@ -2136,27 +2135,9 @@ static int do_con_write(struct tty_struct *tty, const unsigned char *buf, int co</div><div class='ctx'> 	    release_console_sem();</div><div class='ctx'> 	    return 0;</div><div class='ctx'> 	}</div><div class='del'>-	release_console_sem();</div><div class='del'>-</div><div class='ctx'> 	orig_buf = buf;</div><div class='ctx'> 	orig_count = count;</div><div class='ctx'> </div><div class='del'>-	/* At this point 'buf' is guaranteed to be a kernel buffer</div><div class='del'>-	 * and therefore no access to userspace (and therefore sleeping)</div><div class='del'>-	 * will be needed.  The con_buf_mtx serializes all tty based</div><div class='del'>-	 * console rendering and vcs write/read operations.  We hold</div><div class='del'>-	 * the console spinlock during the entire write.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	acquire_console_sem();</div><div class='del'>-</div><div class='del'>-	vc = tty-&gt;driver_data;</div><div class='del'>-	if (vc == NULL) {</div><div class='del'>-		printk(KERN_ERR "vt: argh, driver_data _became_ NULL !\n");</div><div class='del'>-		release_console_sem();</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	himask = vc-&gt;vc_hi_font_mask;</div><div class='ctx'> 	charmask = himask ? 0x1ff : 0xff;</div><div class='ctx'> </div><div class='hunk'>@@ -2370,8 +2351,6 @@ rescan_last_byte:</div><div class='ctx'> 	FLUSH</div><div class='ctx'> 	console_conditional_schedule();</div><div class='ctx'> 	release_console_sem();</div><div class='del'>-</div><div class='del'>-out:</div><div class='ctx'> 	notify_update(vc);</div><div class='ctx'> 	return n;</div><div class='ctx'> #undef FLUSH</div><div class='hunk'>@@ -2583,8 +2562,6 @@ int tioclinux(struct tty_struct *tty, unsigned long arg)</div><div class='ctx'> 	int lines;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (tty-&gt;driver-&gt;type != TTY_DRIVER_TYPE_CONSOLE)</div><div class='del'>-		return -EINVAL;</div><div class='ctx'> 	if (current-&gt;signal-&gt;tty != tty &amp;&amp; !capable(CAP_SYS_ADMIN))</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> 	if (get_user(type, p))</div><div class='hunk'>@@ -2778,6 +2755,12 @@ static int con_open(struct tty_struct *tty, struct file *filp)</div><div class='ctx'> 		ret = vc_allocate(currcons);</div><div class='ctx'> 		if (ret == 0) {</div><div class='ctx'> 			struct vc_data *vc = vc_cons[currcons].d;</div><div class='add'>+</div><div class='add'>+			/* Still being freed */</div><div class='add'>+			if (vc-&gt;vc_tty) {</div><div class='add'>+				release_console_sem();</div><div class='add'>+				return -ERESTARTSYS;</div><div class='add'>+			}</div><div class='ctx'> 			tty-&gt;driver_data = vc;</div><div class='ctx'> 			vc-&gt;vc_tty = tty;</div><div class='ctx'> </div><div class='hunk'>@@ -2798,34 +2781,20 @@ static int con_open(struct tty_struct *tty, struct file *filp)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * We take tty_mutex in here to prevent another thread from coming in via init_dev</div><div class='del'>- * and taking a ref against the tty while we're in the process of forgetting</div><div class='del'>- * about it and cleaning things up.</div><div class='del'>- *</div><div class='del'>- * This is because vcs_remove_sysfs() can sleep and will drop the BKL.</div><div class='del'>- */</div><div class='ctx'> static void con_close(struct tty_struct *tty, struct file *filp)</div><div class='ctx'> {</div><div class='del'>-	mutex_lock(&amp;tty_mutex);</div><div class='del'>-	acquire_console_sem();</div><div class='del'>-	if (tty &amp;&amp; tty-&gt;count == 1) {</div><div class='del'>-		struct vc_data *vc = tty-&gt;driver_data;</div><div class='add'>+	/* Nothing to do - we defer to shutdown */</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		if (vc)</div><div class='del'>-			vc-&gt;vc_tty = NULL;</div><div class='del'>-		tty-&gt;driver_data = NULL;</div><div class='del'>-		vcs_remove_sysfs(tty);</div><div class='del'>-		release_console_sem();</div><div class='del'>-		mutex_unlock(&amp;tty_mutex);</div><div class='del'>-		/*</div><div class='del'>-		 * tty_mutex is released, but we still hold BKL, so there is</div><div class='del'>-		 * still exclusion against init_dev()</div><div class='del'>-		 */</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='add'>+static void con_shutdown(struct tty_struct *tty)</div><div class='add'>+{</div><div class='add'>+	struct vc_data *vc = tty-&gt;driver_data;</div><div class='add'>+	BUG_ON(vc == NULL);</div><div class='add'>+	acquire_console_sem();</div><div class='add'>+	vc-&gt;vc_tty = NULL;</div><div class='add'>+	vcs_remove_sysfs(tty);</div><div class='ctx'> 	release_console_sem();</div><div class='del'>-	mutex_unlock(&amp;tty_mutex);</div><div class='add'>+	tty_shutdown(tty);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int default_italic_color    = 2; // green (ASCII)</div><div class='hunk'>@@ -2950,10 +2919,19 @@ static const struct tty_operations con_ops = {</div><div class='ctx'> 	.throttle = con_throttle,</div><div class='ctx'> 	.unthrottle = con_unthrottle,</div><div class='ctx'> 	.resize = vt_resize,</div><div class='add'>+	.shutdown = con_shutdown</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int __init vty_init(void)</div><div class='add'>+static struct cdev vc0_cdev;</div><div class='add'>+</div><div class='add'>+int __init vty_init(const struct file_operations *console_fops)</div><div class='ctx'> {</div><div class='add'>+	cdev_init(&amp;vc0_cdev, console_fops);</div><div class='add'>+	if (cdev_add(&amp;vc0_cdev, MKDEV(TTY_MAJOR, 0), 1) ||</div><div class='add'>+	    register_chrdev_region(MKDEV(TTY_MAJOR, 0), 1, "/dev/vc/0") &lt; 0)</div><div class='add'>+		panic("Couldn't register /dev/tty0 driver\n");</div><div class='add'>+	device_create(tty_class, NULL, MKDEV(TTY_MAJOR, 0), NULL, "tty0");</div><div class='add'>+</div><div class='ctx'> 	vcs_init();</div><div class='ctx'> </div><div class='ctx'> 	console_driver = alloc_tty_driver(MAX_NR_CONSOLES);</div><div class='hunk'>@@ -2972,7 +2950,6 @@ int __init vty_init(void)</div><div class='ctx'> 	tty_set_operations(console_driver, &amp;con_ops);</div><div class='ctx'> 	if (tty_register_driver(console_driver))</div><div class='ctx'> 		panic("Couldn't register console driver\n");</div><div class='del'>-</div><div class='ctx'> 	kbd_init();</div><div class='ctx'> 	console_map_init();</div><div class='ctx'> #ifdef CONFIG_PROM_CONSOLE</div><div class='hunk'>@@ -3466,7 +3443,7 @@ int register_con_driver(const struct consw *csw, int first, int last)</div><div class='ctx'> 	if (retval)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='del'>-	con_driver-&gt;dev = device_create_drvdata(vtconsole_class, NULL,</div><div class='add'>+	con_driver-&gt;dev = device_create(vtconsole_class, NULL,</div><div class='ctx'> 						MKDEV(0, con_driver-&gt;node),</div><div class='ctx'> 						NULL, "vtcon%i",</div><div class='ctx'> 						con_driver-&gt;node);</div><div class='hunk'>@@ -3577,7 +3554,7 @@ static int __init vtconsole_class_init(void)</div><div class='ctx'> 		struct con_driver *con = &amp;registered_con_driver[i];</div><div class='ctx'> </div><div class='ctx'> 		if (con-&gt;con &amp;&amp; !con-&gt;dev) {</div><div class='del'>-			con-&gt;dev = device_create_drvdata(vtconsole_class, NULL,</div><div class='add'>+			con-&gt;dev = device_create(vtconsole_class, NULL,</div><div class='ctx'> 							 MKDEV(0, con-&gt;node),</div><div class='ctx'> 							 NULL, "vtcon%i",</div><div class='ctx'> 							 con-&gt;node);</div><div class='head'>diff --git a/drivers/char/vt_ioctl.c b/drivers/char/vt_ioctl.c<br/>index c904e9ad4a71..8944ce508e2f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/vt_ioctl.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/char/vt_ioctl.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/vt_ioctl.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/vt_ioctl.c</a></div><div class='hunk'>@@ -395,6 +395,8 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,</div><div class='ctx'>  </div><div class='ctx'> 	kbd = kbd_table + console;</div><div class='ctx'> 	switch (cmd) {</div><div class='add'>+	case TIOCLINUX:</div><div class='add'>+		return tioclinux(tty, arg);</div><div class='ctx'> 	case KIOCSOUND:</div><div class='ctx'> 		if (!perm)</div><div class='ctx'> 			goto eperm;</div><div class='head'>diff --git a/drivers/char/xilinx_hwicap/xilinx_hwicap.c b/drivers/char/xilinx_hwicap/xilinx_hwicap.c<br/>index 278c9857bcf5..ed132fe55d3d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/xilinx_hwicap/xilinx_hwicap.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/char/xilinx_hwicap/xilinx_hwicap.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/char/xilinx_hwicap/xilinx_hwicap.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/char/xilinx_hwicap/xilinx_hwicap.c</a></div><div class='hunk'>@@ -657,8 +657,7 @@ static int __devinit hwicap_setup(struct device *dev, int id,</div><div class='ctx'> 		goto failed3;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	device_create_drvdata(icap_class, dev, devt, NULL,</div><div class='del'>-			      "%s%d", DRIVER_NAME, id);</div><div class='add'>+	device_create(icap_class, dev, devt, NULL, "%s%d", DRIVER_NAME, id);</div><div class='ctx'> 	return 0;		/* success */</div><div class='ctx'> </div><div class='ctx'>  failed3:</div><div class='head'>diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c<br/>index 8a67f16987db..31d6f535a79d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/cpufreq/cpufreq.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/cpufreq/cpufreq.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/cpufreq/cpufreq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/cpufreq/cpufreq.c</a></div><div class='hunk'>@@ -1467,25 +1467,27 @@ int cpufreq_driver_target(struct cpufreq_policy *policy,</div><div class='ctx'> 			  unsigned int target_freq,</div><div class='ctx'> 			  unsigned int relation)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='add'>+	int ret = -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	policy = cpufreq_cpu_get(policy-&gt;cpu);</div><div class='ctx'> 	if (!policy)</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		goto no_policy;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(lock_policy_rwsem_write(policy-&gt;cpu)))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		goto fail;</div><div class='ctx'> </div><div class='ctx'> 	ret = __cpufreq_driver_target(policy, target_freq, relation);</div><div class='ctx'> </div><div class='ctx'> 	unlock_policy_rwsem_write(policy-&gt;cpu);</div><div class='ctx'> </div><div class='add'>+fail:</div><div class='ctx'> 	cpufreq_cpu_put(policy);</div><div class='add'>+no_policy:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(cpufreq_driver_target);</div><div class='ctx'> </div><div class='del'>-int __cpufreq_driver_getavg(struct cpufreq_policy *policy)</div><div class='add'>+int __cpufreq_driver_getavg(struct cpufreq_policy *policy, unsigned int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1493,8 +1495,8 @@ int __cpufreq_driver_getavg(struct cpufreq_policy *policy)</div><div class='ctx'> 	if (!policy)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (cpu_online(policy-&gt;cpu) &amp;&amp; cpufreq_driver-&gt;getavg)</div><div class='del'>-		ret = cpufreq_driver-&gt;getavg(policy-&gt;cpu);</div><div class='add'>+	if (cpu_online(cpu) &amp;&amp; cpufreq_driver-&gt;getavg)</div><div class='add'>+		ret = cpufreq_driver-&gt;getavg(policy, cpu);</div><div class='ctx'> </div><div class='ctx'> 	cpufreq_cpu_put(policy);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -1717,13 +1719,17 @@ int cpufreq_update_policy(unsigned int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	struct cpufreq_policy *data = cpufreq_cpu_get(cpu);</div><div class='ctx'> 	struct cpufreq_policy policy;</div><div class='del'>-	int ret = 0;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	if (!data)</div><div class='del'>-		return -ENODEV;</div><div class='add'>+	if (!data) {</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto no_policy;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (unlikely(lock_policy_rwsem_write(cpu)))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	if (unlikely(lock_policy_rwsem_write(cpu))) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto fail;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	dprintk("updating policy for CPU %u\n", cpu);</div><div class='ctx'> 	memcpy(&amp;policy, data, sizeof(struct cpufreq_policy));</div><div class='hunk'>@@ -1750,7 +1756,9 @@ int cpufreq_update_policy(unsigned int cpu)</div><div class='ctx'> </div><div class='ctx'> 	unlock_policy_rwsem_write(cpu);</div><div class='ctx'> </div><div class='add'>+fail:</div><div class='ctx'> 	cpufreq_cpu_put(data);</div><div class='add'>+no_policy:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(cpufreq_update_policy);</div><div class='head'>diff --git a/drivers/cpufreq/cpufreq_conservative.c b/drivers/cpufreq/cpufreq_conservative.c<br/>index ac0bbf2d234f..e2657837d954 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/cpufreq/cpufreq_conservative.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/cpufreq/cpufreq_conservative.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/cpufreq/cpufreq_conservative.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/cpufreq/cpufreq_conservative.c</a></div><div class='hunk'>@@ -460,6 +460,7 @@ static void do_dbs_timer(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> static inline void dbs_timer_init(void)</div><div class='ctx'> {</div><div class='add'>+	init_timer_deferrable(&amp;dbs_work.timer);</div><div class='ctx'> 	schedule_delayed_work(&amp;dbs_work,</div><div class='ctx'> 			usecs_to_jiffies(dbs_tuners_ins.sampling_rate));</div><div class='ctx'> 	return;</div><div class='hunk'>@@ -575,13 +576,15 @@ static int cpufreq_governor_dbs(struct cpufreq_policy *policy,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifndef CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE</div><div class='add'>+static</div><div class='add'>+#endif</div><div class='ctx'> struct cpufreq_governor cpufreq_gov_conservative = {</div><div class='ctx'> 	.name			= "conservative",</div><div class='ctx'> 	.governor		= cpufreq_governor_dbs,</div><div class='ctx'> 	.max_transition_latency	= TRANSITION_LATENCY_LIMIT,</div><div class='ctx'> 	.owner			= THIS_MODULE,</div><div class='ctx'> };</div><div class='del'>-EXPORT_SYMBOL(cpufreq_gov_conservative);</div><div class='ctx'> </div><div class='ctx'> static int __init cpufreq_gov_dbs_init(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c<br/>index 33855cb3cf16..2ab3c12b88af 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/cpufreq/cpufreq_ondemand.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/cpufreq/cpufreq_ondemand.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/cpufreq/cpufreq_ondemand.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/cpufreq/cpufreq_ondemand.c</a></div><div class='hunk'>@@ -18,13 +18,19 @@</div><div class='ctx'> #include &lt;linux/jiffies.h&gt;</div><div class='ctx'> #include &lt;linux/kernel_stat.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/hrtimer.h&gt;</div><div class='add'>+#include &lt;linux/tick.h&gt;</div><div class='add'>+#include &lt;linux/ktime.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * dbs is used in this file as a shortform for demandbased switching</div><div class='ctx'>  * It helps to keep variable names smaller, simpler</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#define DEF_FREQUENCY_DOWN_DIFFERENTIAL		(10)</div><div class='ctx'> #define DEF_FREQUENCY_UP_THRESHOLD		(80)</div><div class='add'>+#define MICRO_FREQUENCY_DOWN_DIFFERENTIAL	(3)</div><div class='add'>+#define MICRO_FREQUENCY_UP_THRESHOLD		(95)</div><div class='ctx'> #define MIN_FREQUENCY_UP_THRESHOLD		(11)</div><div class='ctx'> #define MAX_FREQUENCY_UP_THRESHOLD		(100)</div><div class='ctx'> </div><div class='hunk'>@@ -57,6 +63,7 @@ enum {DBS_NORMAL_SAMPLE, DBS_SUB_SAMPLE};</div><div class='ctx'> struct cpu_dbs_info_s {</div><div class='ctx'> 	cputime64_t prev_cpu_idle;</div><div class='ctx'> 	cputime64_t prev_cpu_wall;</div><div class='add'>+	cputime64_t prev_cpu_nice;</div><div class='ctx'> 	struct cpufreq_policy *cur_policy;</div><div class='ctx'>  	struct delayed_work work;</div><div class='ctx'> 	struct cpufreq_frequency_table *freq_table;</div><div class='hunk'>@@ -86,21 +93,24 @@ static struct workqueue_struct	*kondemand_wq;</div><div class='ctx'> static struct dbs_tuners {</div><div class='ctx'> 	unsigned int sampling_rate;</div><div class='ctx'> 	unsigned int up_threshold;</div><div class='add'>+	unsigned int down_differential;</div><div class='ctx'> 	unsigned int ignore_nice;</div><div class='ctx'> 	unsigned int powersave_bias;</div><div class='ctx'> } dbs_tuners_ins = {</div><div class='ctx'> 	.up_threshold = DEF_FREQUENCY_UP_THRESHOLD,</div><div class='add'>+	.down_differential = DEF_FREQUENCY_DOWN_DIFFERENTIAL,</div><div class='ctx'> 	.ignore_nice = 0,</div><div class='ctx'> 	.powersave_bias = 0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static inline cputime64_t get_cpu_idle_time(unsigned int cpu)</div><div class='add'>+static inline cputime64_t get_cpu_idle_time_jiffy(unsigned int cpu,</div><div class='add'>+							cputime64_t *wall)</div><div class='ctx'> {</div><div class='ctx'> 	cputime64_t idle_time;</div><div class='del'>-	cputime64_t cur_jiffies;</div><div class='add'>+	cputime64_t cur_wall_time;</div><div class='ctx'> 	cputime64_t busy_time;</div><div class='ctx'> </div><div class='del'>-	cur_jiffies = jiffies64_to_cputime64(get_jiffies_64());</div><div class='add'>+	cur_wall_time = jiffies64_to_cputime64(get_jiffies_64());</div><div class='ctx'> 	busy_time = cputime64_add(kstat_cpu(cpu).cpustat.user,</div><div class='ctx'> 			kstat_cpu(cpu).cpustat.system);</div><div class='ctx'> </div><div class='hunk'>@@ -113,7 +123,37 @@ static inline cputime64_t get_cpu_idle_time(unsigned int cpu)</div><div class='ctx'> 				kstat_cpu(cpu).cpustat.nice);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	idle_time = cputime64_sub(cur_jiffies, busy_time);</div><div class='add'>+	idle_time = cputime64_sub(cur_wall_time, busy_time);</div><div class='add'>+	if (wall)</div><div class='add'>+		*wall = cur_wall_time;</div><div class='add'>+</div><div class='add'>+	return idle_time;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline cputime64_t get_cpu_idle_time(unsigned int cpu, cputime64_t *wall)</div><div class='add'>+{</div><div class='add'>+	u64 idle_time = get_cpu_idle_time_us(cpu, wall);</div><div class='add'>+</div><div class='add'>+	if (idle_time == -1ULL)</div><div class='add'>+		return get_cpu_idle_time_jiffy(cpu, wall);</div><div class='add'>+</div><div class='add'>+	if (dbs_tuners_ins.ignore_nice) {</div><div class='add'>+		cputime64_t cur_nice;</div><div class='add'>+		unsigned long cur_nice_jiffies;</div><div class='add'>+		struct cpu_dbs_info_s *dbs_info;</div><div class='add'>+</div><div class='add'>+		dbs_info = &amp;per_cpu(cpu_dbs_info, cpu);</div><div class='add'>+		cur_nice = cputime64_sub(kstat_cpu(cpu).cpustat.nice,</div><div class='add'>+					 dbs_info-&gt;prev_cpu_nice);</div><div class='add'>+		/*</div><div class='add'>+		 * Assumption: nice time between sampling periods will be</div><div class='add'>+		 * less than 2^32 jiffies for 32 bit sys</div><div class='add'>+		 */</div><div class='add'>+		cur_nice_jiffies = (unsigned long)</div><div class='add'>+					cputime64_to_jiffies64(cur_nice);</div><div class='add'>+		dbs_info-&gt;prev_cpu_nice = kstat_cpu(cpu).cpustat.nice;</div><div class='add'>+		return idle_time + jiffies_to_usecs(cur_nice_jiffies);</div><div class='add'>+	}</div><div class='ctx'> 	return idle_time;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -277,8 +317,8 @@ static ssize_t store_ignore_nice_load(struct cpufreq_policy *policy,</div><div class='ctx'> 	for_each_online_cpu(j) {</div><div class='ctx'> 		struct cpu_dbs_info_s *dbs_info;</div><div class='ctx'> 		dbs_info = &amp;per_cpu(cpu_dbs_info, j);</div><div class='del'>-		dbs_info-&gt;prev_cpu_idle = get_cpu_idle_time(j);</div><div class='del'>-		dbs_info-&gt;prev_cpu_wall = get_jiffies_64();</div><div class='add'>+		dbs_info-&gt;prev_cpu_idle = get_cpu_idle_time(j,</div><div class='add'>+						&amp;dbs_info-&gt;prev_cpu_wall);</div><div class='ctx'> 	}</div><div class='ctx'> 	mutex_unlock(&amp;dbs_mutex);</div><div class='ctx'> </div><div class='hunk'>@@ -334,9 +374,7 @@ static struct attribute_group dbs_attr_group = {</div><div class='ctx'> </div><div class='ctx'> static void dbs_check_cpu(struct cpu_dbs_info_s *this_dbs_info)</div><div class='ctx'> {</div><div class='del'>-	unsigned int idle_ticks, total_ticks;</div><div class='del'>-	unsigned int load = 0;</div><div class='del'>-	cputime64_t cur_jiffies;</div><div class='add'>+	unsigned int max_load_freq;</div><div class='ctx'> </div><div class='ctx'> 	struct cpufreq_policy *policy;</div><div class='ctx'> 	unsigned int j;</div><div class='hunk'>@@ -346,13 +384,7 @@ static void dbs_check_cpu(struct cpu_dbs_info_s *this_dbs_info)</div><div class='ctx'> </div><div class='ctx'> 	this_dbs_info-&gt;freq_lo = 0;</div><div class='ctx'> 	policy = this_dbs_info-&gt;cur_policy;</div><div class='del'>-	cur_jiffies = jiffies64_to_cputime64(get_jiffies_64());</div><div class='del'>-	total_ticks = (unsigned int) cputime64_sub(cur_jiffies,</div><div class='del'>-			this_dbs_info-&gt;prev_cpu_wall);</div><div class='del'>-	this_dbs_info-&gt;prev_cpu_wall = get_jiffies_64();</div><div class='ctx'> </div><div class='del'>-	if (!total_ticks)</div><div class='del'>-		return;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Every sampling_rate, we check, if current idle time is less</div><div class='ctx'> 	 * than 20% (default), then we try to increase frequency</div><div class='hunk'>@@ -365,27 +397,44 @@ static void dbs_check_cpu(struct cpu_dbs_info_s *this_dbs_info)</div><div class='ctx'> 	 * 5% (default) of current frequency</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	/* Get Idle Time */</div><div class='del'>-	idle_ticks = UINT_MAX;</div><div class='add'>+	/* Get Absolute Load - in terms of freq */</div><div class='add'>+	max_load_freq = 0;</div><div class='add'>+</div><div class='ctx'> 	for_each_cpu_mask_nr(j, policy-&gt;cpus) {</div><div class='del'>-		cputime64_t total_idle_ticks;</div><div class='del'>-		unsigned int tmp_idle_ticks;</div><div class='ctx'> 		struct cpu_dbs_info_s *j_dbs_info;</div><div class='add'>+		cputime64_t cur_wall_time, cur_idle_time;</div><div class='add'>+		unsigned int idle_time, wall_time;</div><div class='add'>+		unsigned int load, load_freq;</div><div class='add'>+		int freq_avg;</div><div class='ctx'> </div><div class='ctx'> 		j_dbs_info = &amp;per_cpu(cpu_dbs_info, j);</div><div class='del'>-		total_idle_ticks = get_cpu_idle_time(j);</div><div class='del'>-		tmp_idle_ticks = (unsigned int) cputime64_sub(total_idle_ticks,</div><div class='add'>+</div><div class='add'>+		cur_idle_time = get_cpu_idle_time(j, &amp;cur_wall_time);</div><div class='add'>+</div><div class='add'>+		wall_time = (unsigned int) cputime64_sub(cur_wall_time,</div><div class='add'>+				j_dbs_info-&gt;prev_cpu_wall);</div><div class='add'>+		j_dbs_info-&gt;prev_cpu_wall = cur_wall_time;</div><div class='add'>+</div><div class='add'>+		idle_time = (unsigned int) cputime64_sub(cur_idle_time,</div><div class='ctx'> 				j_dbs_info-&gt;prev_cpu_idle);</div><div class='del'>-		j_dbs_info-&gt;prev_cpu_idle = total_idle_ticks;</div><div class='add'>+		j_dbs_info-&gt;prev_cpu_idle = cur_idle_time;</div><div class='add'>+</div><div class='add'>+		if (unlikely(!wall_time || wall_time &lt; idle_time))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		load = 100 * (wall_time - idle_time) / wall_time;</div><div class='add'>+</div><div class='add'>+		freq_avg = __cpufreq_driver_getavg(policy, j);</div><div class='add'>+		if (freq_avg &lt;= 0)</div><div class='add'>+			freq_avg = policy-&gt;cur;</div><div class='ctx'> </div><div class='del'>-		if (tmp_idle_ticks &lt; idle_ticks)</div><div class='del'>-			idle_ticks = tmp_idle_ticks;</div><div class='add'>+		load_freq = load * freq_avg;</div><div class='add'>+		if (load_freq &gt; max_load_freq)</div><div class='add'>+			max_load_freq = load_freq;</div><div class='ctx'> 	}</div><div class='del'>-	if (likely(total_ticks &gt; idle_ticks))</div><div class='del'>-		load = (100 * (total_ticks - idle_ticks)) / total_ticks;</div><div class='ctx'> </div><div class='ctx'> 	/* Check for frequency increase */</div><div class='del'>-	if (load &gt; dbs_tuners_ins.up_threshold) {</div><div class='add'>+	if (max_load_freq &gt; dbs_tuners_ins.up_threshold * policy-&gt;cur) {</div><div class='ctx'> 		/* if we are already at full speed then break out early */</div><div class='ctx'> 		if (!dbs_tuners_ins.powersave_bias) {</div><div class='ctx'> 			if (policy-&gt;cur == policy-&gt;max)</div><div class='hunk'>@@ -412,15 +461,13 @@ static void dbs_check_cpu(struct cpu_dbs_info_s *this_dbs_info)</div><div class='ctx'> 	 * can support the current CPU usage without triggering the up</div><div class='ctx'> 	 * policy. To be safe, we focus 10 points under the threshold.</div><div class='ctx'> 	 */</div><div class='del'>-	if (load &lt; (dbs_tuners_ins.up_threshold - 10)) {</div><div class='del'>-		unsigned int freq_next, freq_cur;</div><div class='del'>-</div><div class='del'>-		freq_cur = __cpufreq_driver_getavg(policy);</div><div class='del'>-		if (!freq_cur)</div><div class='del'>-			freq_cur = policy-&gt;cur;</div><div class='del'>-</div><div class='del'>-		freq_next = (freq_cur * load) /</div><div class='del'>-			(dbs_tuners_ins.up_threshold - 10);</div><div class='add'>+	if (max_load_freq &lt;</div><div class='add'>+	    (dbs_tuners_ins.up_threshold - dbs_tuners_ins.down_differential) *</div><div class='add'>+	     policy-&gt;cur) {</div><div class='add'>+		unsigned int freq_next;</div><div class='add'>+		freq_next = max_load_freq /</div><div class='add'>+				(dbs_tuners_ins.up_threshold -</div><div class='add'>+				 dbs_tuners_ins.down_differential);</div><div class='ctx'> </div><div class='ctx'> 		if (!dbs_tuners_ins.powersave_bias) {</div><div class='ctx'> 			__cpufreq_driver_target(policy, freq_next,</div><div class='hunk'>@@ -526,8 +573,8 @@ static int cpufreq_governor_dbs(struct cpufreq_policy *policy,</div><div class='ctx'> 			j_dbs_info = &amp;per_cpu(cpu_dbs_info, j);</div><div class='ctx'> 			j_dbs_info-&gt;cur_policy = policy;</div><div class='ctx'> </div><div class='del'>-			j_dbs_info-&gt;prev_cpu_idle = get_cpu_idle_time(j);</div><div class='del'>-			j_dbs_info-&gt;prev_cpu_wall = get_jiffies_64();</div><div class='add'>+			j_dbs_info-&gt;prev_cpu_idle = get_cpu_idle_time(j,</div><div class='add'>+						&amp;j_dbs_info-&gt;prev_cpu_wall);</div><div class='ctx'> 		}</div><div class='ctx'> 		this_dbs_info-&gt;cpu = cpu;</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -579,22 +626,42 @@ static int cpufreq_governor_dbs(struct cpufreq_policy *policy,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifndef CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND</div><div class='add'>+static</div><div class='add'>+#endif</div><div class='ctx'> struct cpufreq_governor cpufreq_gov_ondemand = {</div><div class='ctx'> 	.name			= "ondemand",</div><div class='ctx'> 	.governor		= cpufreq_governor_dbs,</div><div class='ctx'> 	.max_transition_latency = TRANSITION_LATENCY_LIMIT,</div><div class='ctx'> 	.owner			= THIS_MODULE,</div><div class='ctx'> };</div><div class='del'>-EXPORT_SYMBOL(cpufreq_gov_ondemand);</div><div class='ctx'> </div><div class='ctx'> static int __init cpufreq_gov_dbs_init(void)</div><div class='ctx'> {</div><div class='add'>+	int err;</div><div class='add'>+	cputime64_t wall;</div><div class='add'>+	u64 idle_time;</div><div class='add'>+	int cpu = get_cpu();</div><div class='add'>+</div><div class='add'>+	idle_time = get_cpu_idle_time_us(cpu, &amp;wall);</div><div class='add'>+	put_cpu();</div><div class='add'>+	if (idle_time != -1ULL) {</div><div class='add'>+		/* Idle micro accounting is supported. Use finer thresholds */</div><div class='add'>+		dbs_tuners_ins.up_threshold = MICRO_FREQUENCY_UP_THRESHOLD;</div><div class='add'>+		dbs_tuners_ins.down_differential =</div><div class='add'>+					MICRO_FREQUENCY_DOWN_DIFFERENTIAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	kondemand_wq = create_workqueue("kondemand");</div><div class='ctx'> 	if (!kondemand_wq) {</div><div class='ctx'> 		printk(KERN_ERR "Creation of kondemand failed\n");</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	}</div><div class='del'>-	return cpufreq_register_governor(&amp;cpufreq_gov_ondemand);</div><div class='add'>+	err = cpufreq_register_governor(&amp;cpufreq_gov_ondemand);</div><div class='add'>+	if (err)</div><div class='add'>+		destroy_workqueue(kondemand_wq);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit cpufreq_gov_dbs_exit(void)</div><div class='head'>diff --git a/drivers/cpufreq/cpufreq_performance.c b/drivers/cpufreq/cpufreq_performance.c<br/>index e8e1451ef1c1..7e2e515087f8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/cpufreq/cpufreq_performance.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/cpufreq/cpufreq_performance.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/cpufreq/cpufreq_performance.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/cpufreq/cpufreq_performance.c</a></div><div class='hunk'>@@ -36,12 +36,14 @@ static int cpufreq_governor_performance(struct cpufreq_policy *policy,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_CPU_FREQ_GOV_PERFORMANCE_MODULE</div><div class='add'>+static</div><div class='add'>+#endif</div><div class='ctx'> struct cpufreq_governor cpufreq_gov_performance = {</div><div class='ctx'> 	.name		= "performance",</div><div class='ctx'> 	.governor	= cpufreq_governor_performance,</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> };</div><div class='del'>-EXPORT_SYMBOL(cpufreq_gov_performance);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static int __init cpufreq_gov_performance_init(void)</div><div class='head'>diff --git a/drivers/cpufreq/cpufreq_powersave.c b/drivers/cpufreq/cpufreq_powersave.c<br/>index 88d2f44fba48..e6db5faf3eb1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/cpufreq/cpufreq_powersave.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/cpufreq/cpufreq_powersave.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/cpufreq/cpufreq_powersave.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/cpufreq/cpufreq_powersave.c</a></div><div class='hunk'>@@ -35,12 +35,14 @@ static int cpufreq_governor_powersave(struct cpufreq_policy *policy,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifndef CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE</div><div class='add'>+static</div><div class='add'>+#endif</div><div class='ctx'> struct cpufreq_governor cpufreq_gov_powersave = {</div><div class='ctx'> 	.name		= "powersave",</div><div class='ctx'> 	.governor	= cpufreq_governor_powersave,</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> };</div><div class='del'>-EXPORT_SYMBOL(cpufreq_gov_powersave);</div><div class='ctx'> </div><div class='ctx'> static int __init cpufreq_gov_powersave_init(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/cpufreq/cpufreq_userspace.c b/drivers/cpufreq/cpufreq_userspace.c<br/>index 32244aa7cc0c..1442bbada053 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/cpufreq/cpufreq_userspace.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/cpufreq/cpufreq_userspace.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/cpufreq/cpufreq_userspace.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/cpufreq/cpufreq_userspace.c</a></div><div class='hunk'>@@ -187,6 +187,9 @@ static int cpufreq_governor_userspace(struct cpufreq_policy *policy,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+#ifndef CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE</div><div class='add'>+static</div><div class='add'>+#endif</div><div class='ctx'> struct cpufreq_governor cpufreq_gov_userspace = {</div><div class='ctx'> 	.name		= "userspace",</div><div class='ctx'> 	.governor	= cpufreq_governor_userspace,</div><div class='hunk'>@@ -194,7 +197,6 @@ struct cpufreq_governor cpufreq_gov_userspace = {</div><div class='ctx'> 	.show_setspeed	= show_speed,</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> };</div><div class='del'>-EXPORT_SYMBOL(cpufreq_gov_userspace);</div><div class='ctx'> </div><div class='ctx'> static int __init cpufreq_gov_userspace_init(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/dca/dca-sysfs.c b/drivers/dca/dca-sysfs.c<br/>index 7af4b403bd2d..bb538b9690e0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/dca/dca-sysfs.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/dca/dca-sysfs.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/dca/dca-sysfs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/dca/dca-sysfs.c</a></div><div class='hunk'>@@ -15,9 +15,8 @@ int dca_sysfs_add_req(struct dca_provider *dca, struct device *dev, int slot)</div><div class='ctx'> 	struct device *cd;</div><div class='ctx'> 	static int req_count;</div><div class='ctx'> </div><div class='del'>-	cd = device_create_drvdata(dca_class, dca-&gt;cd,</div><div class='del'>-				   MKDEV(0, slot + 1), NULL,</div><div class='del'>-				   "requester%d", req_count++);</div><div class='add'>+	cd = device_create(dca_class, dca-&gt;cd, MKDEV(0, slot + 1), NULL,</div><div class='add'>+			   "requester%d", req_count++);</div><div class='ctx'> 	if (IS_ERR(cd))</div><div class='ctx'> 		return PTR_ERR(cd);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -48,8 +47,7 @@ idr_try_again:</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	cd = device_create_drvdata(dca_class, dev, MKDEV(0, 0), NULL,</div><div class='del'>-				   "dca%d", dca-&gt;id);</div><div class='add'>+	cd = device_create(dca_class, dev, MKDEV(0, 0), NULL, "dca%d", dca-&gt;id);</div><div class='ctx'> 	if (IS_ERR(cd)) {</div><div class='ctx'> 		spin_lock(&amp;dca_idr_lock);</div><div class='ctx'> 		idr_remove(&amp;dca_idr, dca-&gt;id);</div><div class='head'>diff --git a/drivers/edac/i5000_edac.c b/drivers/edac/i5000_edac.c<br/>index 4a16b5b61cfb..f0d9b415db50 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/edac/i5000_edac.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/edac/i5000_edac.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/edac/i5000_edac.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/edac/i5000_edac.c</a></div><div class='hunk'>@@ -119,6 +119,7 @@</div><div class='ctx'> #define			FERR_NF_UNCORRECTABLE	(FERR_NF_M12ERR | \</div><div class='ctx'> 							FERR_NF_M11ERR | \</div><div class='ctx'> 							FERR_NF_M10ERR | \</div><div class='add'>+							FERR_NF_M9ERR | \</div><div class='ctx'> 							FERR_NF_M8ERR | \</div><div class='ctx'> 							FERR_NF_M7ERR | \</div><div class='ctx'> 							FERR_NF_M6ERR | \</div><div class='hunk'>@@ -301,6 +302,9 @@ static char *numcol_toString[] = {</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+/* enables the report of miscellaneous messages as CE errors - default off */</div><div class='add'>+static int misc_messages;</div><div class='add'>+</div><div class='ctx'> /* Enumeration of supported devices */</div><div class='ctx'> enum i5000_chips {</div><div class='ctx'> 	I5000P = 0,</div><div class='hunk'>@@ -466,7 +470,8 @@ static void i5000_process_fatal_error_info(struct mem_ctl_info *mci,</div><div class='ctx'> 					struct i5000_error_info *info,</div><div class='ctx'> 					int handle_errors)</div><div class='ctx'> {</div><div class='del'>-	char msg[EDAC_MC_LABEL_LEN + 1 + 90];</div><div class='add'>+	char msg[EDAC_MC_LABEL_LEN + 1 + 160];</div><div class='add'>+	char *specific = NULL;</div><div class='ctx'> 	u32 allErrors;</div><div class='ctx'> 	int branch;</div><div class='ctx'> 	int channel;</div><div class='hunk'>@@ -480,11 +485,6 @@ static void i5000_process_fatal_error_info(struct mem_ctl_info *mci,</div><div class='ctx'> 	if (!allErrors)</div><div class='ctx'> 		return;		/* if no error, return now */</div><div class='ctx'> </div><div class='del'>-	/* ONLY ONE of the possible error bits will be set, as per the docs */</div><div class='del'>-	i5000_mc_printk(mci, KERN_ERR,</div><div class='del'>-			"FATAL ERRORS Found!!! 1st FATAL Err Reg= 0x%x\n",</div><div class='del'>-			allErrors);</div><div class='del'>-</div><div class='ctx'> 	branch = EXTRACT_FBDCHAN_INDX(info-&gt;ferr_fat_fbd);</div><div class='ctx'> 	channel = branch;</div><div class='ctx'> </div><div class='hunk'>@@ -501,28 +501,42 @@ static void i5000_process_fatal_error_info(struct mem_ctl_info *mci,</div><div class='ctx'> 		rdwr ? "Write" : "Read", ras, cas);</div><div class='ctx'> </div><div class='ctx'> 	/* Only 1 bit will be on */</div><div class='del'>-	if (allErrors &amp; FERR_FAT_M1ERR) {</div><div class='del'>-		i5000_mc_printk(mci, KERN_ERR,</div><div class='del'>-				"Alert on non-redundant retry or fast "</div><div class='del'>-				"reset timeout\n");</div><div class='del'>-</div><div class='del'>-	} else if (allErrors &amp; FERR_FAT_M2ERR) {</div><div class='del'>-		i5000_mc_printk(mci, KERN_ERR,</div><div class='del'>-				"Northbound CRC error on non-redundant "</div><div class='del'>-				"retry\n");</div><div class='del'>-</div><div class='del'>-	} else if (allErrors &amp; FERR_FAT_M3ERR) {</div><div class='del'>-		i5000_mc_printk(mci, KERN_ERR,</div><div class='del'>-				"&gt;Tmid Thermal event with intelligent "</div><div class='del'>-				"throttling disabled\n");</div><div class='add'>+	switch (allErrors) {</div><div class='add'>+	case FERR_FAT_M1ERR:</div><div class='add'>+		specific = "Alert on non-redundant retry or fast "</div><div class='add'>+				"reset timeout";</div><div class='add'>+		break;</div><div class='add'>+	case FERR_FAT_M2ERR:</div><div class='add'>+		specific = "Northbound CRC error on non-redundant "</div><div class='add'>+				"retry";</div><div class='add'>+		break;</div><div class='add'>+	case FERR_FAT_M3ERR:</div><div class='add'>+		{</div><div class='add'>+		static int done;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * This error is generated to inform that the intelligent</div><div class='add'>+		 * throttling is disabled and the temperature passed the</div><div class='add'>+		 * specified middle point. Since this is something the BIOS</div><div class='add'>+		 * should take care of, we'll warn only once to avoid</div><div class='add'>+		 * worthlessly flooding the log.</div><div class='add'>+		 */</div><div class='add'>+		if (done)</div><div class='add'>+			return;</div><div class='add'>+		done++;</div><div class='add'>+</div><div class='add'>+		specific = "&gt;Tmid Thermal event with intelligent "</div><div class='add'>+			   "throttling disabled";</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Form out message */</div><div class='ctx'> 	snprintf(msg, sizeof(msg),</div><div class='ctx'> 		 "(Branch=%d DRAM-Bank=%d RDWR=%s RAS=%d CAS=%d "</div><div class='del'>-		 "FATAL Err=0x%x)",</div><div class='add'>+		 "FATAL Err=0x%x (%s))",</div><div class='ctx'> 		 branch &gt;&gt; 1, bank, rdwr ? "Write" : "Read", ras, cas,</div><div class='del'>-		 allErrors);</div><div class='add'>+		 allErrors, specific);</div><div class='ctx'> </div><div class='ctx'> 	/* Call the helper to output message */</div><div class='ctx'> 	edac_mc_handle_fbd_ue(mci, rank, channel, channel + 1, msg);</div><div class='hunk'>@@ -539,7 +553,8 @@ static void i5000_process_nonfatal_error_info(struct mem_ctl_info *mci,</div><div class='ctx'> 					struct i5000_error_info *info,</div><div class='ctx'> 					int handle_errors)</div><div class='ctx'> {</div><div class='del'>-	char msg[EDAC_MC_LABEL_LEN + 1 + 90];</div><div class='add'>+	char msg[EDAC_MC_LABEL_LEN + 1 + 170];</div><div class='add'>+	char *specific = NULL;</div><div class='ctx'> 	u32 allErrors;</div><div class='ctx'> 	u32 ue_errors;</div><div class='ctx'> 	u32 ce_errors;</div><div class='hunk'>@@ -557,10 +572,6 @@ static void i5000_process_nonfatal_error_info(struct mem_ctl_info *mci,</div><div class='ctx'> 		return;		/* if no error, return now */</div><div class='ctx'> </div><div class='ctx'> 	/* ONLY ONE of the possible error bits will be set, as per the docs */</div><div class='del'>-	i5000_mc_printk(mci, KERN_WARNING,</div><div class='del'>-			"NON-FATAL ERRORS Found!!! 1st NON-FATAL Err "</div><div class='del'>-			"Reg= 0x%x\n", allErrors);</div><div class='del'>-</div><div class='ctx'> 	ue_errors = allErrors &amp; FERR_NF_UNCORRECTABLE;</div><div class='ctx'> 	if (ue_errors) {</div><div class='ctx'> 		debugf0("\tUncorrected bits= 0x%x\n", ue_errors);</div><div class='hunk'>@@ -579,12 +590,47 @@ static void i5000_process_nonfatal_error_info(struct mem_ctl_info *mci,</div><div class='ctx'> 			rank, channel, channel + 1, branch &gt;&gt; 1, bank,</div><div class='ctx'> 			rdwr ? "Write" : "Read", ras, cas);</div><div class='ctx'> </div><div class='add'>+		switch (ue_errors) {</div><div class='add'>+		case FERR_NF_M12ERR:</div><div class='add'>+			specific = "Non-Aliased Uncorrectable Patrol Data ECC";</div><div class='add'>+			break;</div><div class='add'>+		case FERR_NF_M11ERR:</div><div class='add'>+			specific = "Non-Aliased Uncorrectable Spare-Copy "</div><div class='add'>+					"Data ECC";</div><div class='add'>+			break;</div><div class='add'>+		case FERR_NF_M10ERR:</div><div class='add'>+			specific = "Non-Aliased Uncorrectable Mirrored Demand "</div><div class='add'>+					"Data ECC";</div><div class='add'>+			break;</div><div class='add'>+		case FERR_NF_M9ERR:</div><div class='add'>+			specific = "Non-Aliased Uncorrectable Non-Mirrored "</div><div class='add'>+					"Demand Data ECC";</div><div class='add'>+			break;</div><div class='add'>+		case FERR_NF_M8ERR:</div><div class='add'>+			specific = "Aliased Uncorrectable Patrol Data ECC";</div><div class='add'>+			break;</div><div class='add'>+		case FERR_NF_M7ERR:</div><div class='add'>+			specific = "Aliased Uncorrectable Spare-Copy Data ECC";</div><div class='add'>+			break;</div><div class='add'>+		case FERR_NF_M6ERR:</div><div class='add'>+			specific = "Aliased Uncorrectable Mirrored Demand "</div><div class='add'>+					"Data ECC";</div><div class='add'>+			break;</div><div class='add'>+		case FERR_NF_M5ERR:</div><div class='add'>+			specific = "Aliased Uncorrectable Non-Mirrored Demand "</div><div class='add'>+					"Data ECC";</div><div class='add'>+			break;</div><div class='add'>+		case FERR_NF_M4ERR:</div><div class='add'>+			specific = "Uncorrectable Data ECC on Replay";</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		/* Form out message */</div><div class='ctx'> 		snprintf(msg, sizeof(msg),</div><div class='ctx'> 			 "(Branch=%d DRAM-Bank=%d RDWR=%s RAS=%d "</div><div class='del'>-			 "CAS=%d, UE Err=0x%x)",</div><div class='add'>+			 "CAS=%d, UE Err=0x%x (%s))",</div><div class='ctx'> 			 branch &gt;&gt; 1, bank, rdwr ? "Write" : "Read", ras, cas,</div><div class='del'>-			 ue_errors);</div><div class='add'>+			 ue_errors, specific);</div><div class='ctx'> </div><div class='ctx'> 		/* Call the helper to output message */</div><div class='ctx'> 		edac_mc_handle_fbd_ue(mci, rank, channel, channel + 1, msg);</div><div class='hunk'>@@ -616,51 +662,74 @@ static void i5000_process_nonfatal_error_info(struct mem_ctl_info *mci,</div><div class='ctx'> 			rank, channel, branch &gt;&gt; 1, bank,</div><div class='ctx'> 			rdwr ? "Write" : "Read", ras, cas);</div><div class='ctx'> </div><div class='add'>+		switch (ce_errors) {</div><div class='add'>+		case FERR_NF_M17ERR:</div><div class='add'>+			specific = "Correctable Non-Mirrored Demand Data ECC";</div><div class='add'>+			break;</div><div class='add'>+		case FERR_NF_M18ERR:</div><div class='add'>+			specific = "Correctable Mirrored Demand Data ECC";</div><div class='add'>+			break;</div><div class='add'>+		case FERR_NF_M19ERR:</div><div class='add'>+			specific = "Correctable Spare-Copy Data ECC";</div><div class='add'>+			break;</div><div class='add'>+		case FERR_NF_M20ERR:</div><div class='add'>+			specific = "Correctable Patrol Data ECC";</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		/* Form out message */</div><div class='ctx'> 		snprintf(msg, sizeof(msg),</div><div class='ctx'> 			 "(Branch=%d DRAM-Bank=%d RDWR=%s RAS=%d "</div><div class='del'>-			 "CAS=%d, CE Err=0x%x)", branch &gt;&gt; 1, bank,</div><div class='del'>-			 rdwr ? "Write" : "Read", ras, cas, ce_errors);</div><div class='add'>+			 "CAS=%d, CE Err=0x%x (%s))", branch &gt;&gt; 1, bank,</div><div class='add'>+			 rdwr ? "Write" : "Read", ras, cas, ce_errors,</div><div class='add'>+			 specific);</div><div class='ctx'> </div><div class='ctx'> 		/* Call the helper to output message */</div><div class='ctx'> 		edac_mc_handle_fbd_ce(mci, rank, channel, msg);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* See if any of the thermal errors have fired */</div><div class='del'>-	misc_errors = allErrors &amp; FERR_NF_THERMAL;</div><div class='del'>-	if (misc_errors) {</div><div class='del'>-		i5000_printk(KERN_WARNING, "\tTHERMAL Error, bits= 0x%x\n",</div><div class='del'>-			misc_errors);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* See if any of the thermal errors have fired */</div><div class='del'>-	misc_errors = allErrors &amp; FERR_NF_NON_RETRY;</div><div class='del'>-	if (misc_errors) {</div><div class='del'>-		i5000_printk(KERN_WARNING, "\tNON-Retry  Errors, bits= 0x%x\n",</div><div class='del'>-			misc_errors);</div><div class='del'>-	}</div><div class='add'>+	if (!misc_messages)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	/* See if any of the thermal errors have fired */</div><div class='del'>-	misc_errors = allErrors &amp; FERR_NF_NORTH_CRC;</div><div class='add'>+	misc_errors = allErrors &amp; (FERR_NF_NON_RETRY | FERR_NF_NORTH_CRC |</div><div class='add'>+				   FERR_NF_SPD_PROTOCOL | FERR_NF_DIMM_SPARE);</div><div class='ctx'> 	if (misc_errors) {</div><div class='del'>-		i5000_printk(KERN_WARNING,</div><div class='del'>-			"\tNORTHBOUND CRC  Error, bits= 0x%x\n",</div><div class='del'>-			misc_errors);</div><div class='del'>-	}</div><div class='add'>+		switch (misc_errors) {</div><div class='add'>+		case FERR_NF_M13ERR:</div><div class='add'>+			specific = "Non-Retry or Redundant Retry FBD Memory "</div><div class='add'>+					"Alert or Redundant Fast Reset Timeout";</div><div class='add'>+			break;</div><div class='add'>+		case FERR_NF_M14ERR:</div><div class='add'>+			specific = "Non-Retry or Redundant Retry FBD "</div><div class='add'>+					"Configuration Alert";</div><div class='add'>+			break;</div><div class='add'>+		case FERR_NF_M15ERR:</div><div class='add'>+			specific = "Non-Retry or Redundant Retry FBD "</div><div class='add'>+					"Northbound CRC error on read data";</div><div class='add'>+			break;</div><div class='add'>+		case FERR_NF_M21ERR:</div><div class='add'>+			specific = "FBD Northbound CRC error on "</div><div class='add'>+					"FBD Sync Status";</div><div class='add'>+			break;</div><div class='add'>+		case FERR_NF_M22ERR:</div><div class='add'>+			specific = "SPD protocol error";</div><div class='add'>+			break;</div><div class='add'>+		case FERR_NF_M27ERR:</div><div class='add'>+			specific = "DIMM-spare copy started";</div><div class='add'>+			break;</div><div class='add'>+		case FERR_NF_M28ERR:</div><div class='add'>+			specific = "DIMM-spare copy completed";</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		branch = EXTRACT_FBDCHAN_INDX(info-&gt;ferr_nf_fbd);</div><div class='ctx'> </div><div class='del'>-	/* See if any of the thermal errors have fired */</div><div class='del'>-	misc_errors = allErrors &amp; FERR_NF_SPD_PROTOCOL;</div><div class='del'>-	if (misc_errors) {</div><div class='del'>-		i5000_printk(KERN_WARNING,</div><div class='del'>-			"\tSPD Protocol  Error, bits= 0x%x\n",</div><div class='del'>-			misc_errors);</div><div class='del'>-	}</div><div class='add'>+		/* Form out message */</div><div class='add'>+		snprintf(msg, sizeof(msg),</div><div class='add'>+			 "(Branch=%d Err=%#x (%s))", branch &gt;&gt; 1,</div><div class='add'>+			 misc_errors, specific);</div><div class='ctx'> </div><div class='del'>-	/* See if any of the thermal errors have fired */</div><div class='del'>-	misc_errors = allErrors &amp; FERR_NF_DIMM_SPARE;</div><div class='del'>-	if (misc_errors) {</div><div class='del'>-		i5000_printk(KERN_WARNING, "\tDIMM-Spare  Error, bits= 0x%x\n",</div><div class='del'>-			misc_errors);</div><div class='add'>+		/* Call the helper to output message */</div><div class='add'>+		edac_mc_handle_fbd_ce(mci, 0, 0, msg);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1497,3 +1566,6 @@ MODULE_DESCRIPTION("MC Driver for Intel I5000 memory controllers - "</div><div class='ctx'> </div><div class='ctx'> module_param(edac_op_state, int, 0444);</div><div class='ctx'> MODULE_PARM_DESC(edac_op_state, "EDAC Error Reporting state: 0=Poll,1=NMI");</div><div class='add'>+module_param(misc_messages, int, 0444);</div><div class='add'>+MODULE_PARM_DESC(misc_messages, "Log miscellaneous non fatal messages");</div><div class='add'>+</div><div class='head'>diff --git a/drivers/edac/i82443bxgx_edac.c b/drivers/edac/i82443bxgx_edac.c<br/>index c5305e3ee434..577760a82a0f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/edac/i82443bxgx_edac.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/edac/i82443bxgx_edac.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/edac/i82443bxgx_edac.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/edac/i82443bxgx_edac.c</a></div><div class='hunk'>@@ -114,6 +114,12 @@ struct i82443bxgx_edacmc_error_info {</div><div class='ctx'> </div><div class='ctx'> static struct edac_pci_ctl_info *i82443bxgx_pci;</div><div class='ctx'> </div><div class='add'>+static struct pci_dev *mci_pdev;	/* init dev: in case that AGP code has</div><div class='add'>+					 * already registered driver</div><div class='add'>+					 */</div><div class='add'>+</div><div class='add'>+static int i82443bxgx_registered = 1;</div><div class='add'>+</div><div class='ctx'> static void i82443bxgx_edacmc_get_error_info(struct mem_ctl_info *mci,</div><div class='ctx'> 				struct i82443bxgx_edacmc_error_info</div><div class='ctx'> 				*info)</div><div class='hunk'>@@ -345,10 +351,17 @@ EXPORT_SYMBOL_GPL(i82443bxgx_edacmc_probe1);</div><div class='ctx'> static int __devinit i82443bxgx_edacmc_init_one(struct pci_dev *pdev,</div><div class='ctx'> 						const struct pci_device_id *ent)</div><div class='ctx'> {</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='ctx'> 	debugf0("MC: " __FILE__ ": %s()\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	/* don't need to call pci_device_enable() */</div><div class='del'>-	return i82443bxgx_edacmc_probe1(pdev, ent-&gt;driver_data);</div><div class='add'>+	rc = i82443bxgx_edacmc_probe1(pdev, ent-&gt;driver_data);</div><div class='add'>+</div><div class='add'>+	if (mci_pdev == NULL)</div><div class='add'>+		mci_pdev = pci_dev_get(pdev);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __devexit i82443bxgx_edacmc_remove_one(struct pci_dev *pdev)</div><div class='hunk'>@@ -387,15 +400,61 @@ static struct pci_driver i82443bxgx_edacmc_driver = {</div><div class='ctx'> </div><div class='ctx'> static int __init i82443bxgx_edacmc_init(void)</div><div class='ctx'> {</div><div class='add'>+	int pci_rc;</div><div class='ctx'>        /* Ensure that the OPSTATE is set correctly for POLL or NMI */</div><div class='ctx'>        opstate_init();</div><div class='ctx'> </div><div class='del'>-	return pci_register_driver(&amp;i82443bxgx_edacmc_driver);</div><div class='add'>+	pci_rc = pci_register_driver(&amp;i82443bxgx_edacmc_driver);</div><div class='add'>+	if (pci_rc &lt; 0)</div><div class='add'>+		goto fail0;</div><div class='add'>+</div><div class='add'>+	if (mci_pdev == NULL) {</div><div class='add'>+		const struct pci_device_id *id = &amp;i82443bxgx_pci_tbl[0];</div><div class='add'>+		int i = 0;</div><div class='add'>+		i82443bxgx_registered = 0;</div><div class='add'>+</div><div class='add'>+		while (mci_pdev == NULL &amp;&amp; id-&gt;vendor != 0) {</div><div class='add'>+			mci_pdev = pci_get_device(id-&gt;vendor,</div><div class='add'>+					id-&gt;device, NULL);</div><div class='add'>+			i++;</div><div class='add'>+			id = &amp;i82443bxgx_pci_tbl[i];</div><div class='add'>+		}</div><div class='add'>+		if (!mci_pdev) {</div><div class='add'>+			debugf0("i82443bxgx pci_get_device fail\n");</div><div class='add'>+			pci_rc = -ENODEV;</div><div class='add'>+			goto fail1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		pci_rc = i82443bxgx_edacmc_init_one(mci_pdev, i82443bxgx_pci_tbl);</div><div class='add'>+</div><div class='add'>+		if (pci_rc &lt; 0) {</div><div class='add'>+			debugf0("i82443bxgx init fail\n");</div><div class='add'>+			pci_rc = -ENODEV;</div><div class='add'>+			goto fail1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+fail1:</div><div class='add'>+	pci_unregister_driver(&amp;i82443bxgx_edacmc_driver);</div><div class='add'>+</div><div class='add'>+fail0:</div><div class='add'>+	if (mci_pdev != NULL)</div><div class='add'>+		pci_dev_put(mci_pdev);</div><div class='add'>+</div><div class='add'>+	return pci_rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit i82443bxgx_edacmc_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	pci_unregister_driver(&amp;i82443bxgx_edacmc_driver);</div><div class='add'>+</div><div class='add'>+	if (!i82443bxgx_registered)</div><div class='add'>+		i82443bxgx_edacmc_remove_one(mci_pdev);</div><div class='add'>+</div><div class='add'>+	if (mci_pdev)</div><div class='add'>+		pci_dev_put(mci_pdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(i82443bxgx_edacmc_init);</div><div class='head'>diff --git a/drivers/edac/mpc85xx_edac.c b/drivers/edac/mpc85xx_edac.c<br/>index 2265d9ca1535..0cfcb2d075a0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/edac/mpc85xx_edac.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/edac/mpc85xx_edac.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/edac/mpc85xx_edac.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/edac/mpc85xx_edac.c</a></div><div class='hunk'>@@ -17,6 +17,7 @@</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/mod_devicetable.h&gt;</div><div class='ctx'> #include &lt;linux/edac.h&gt;</div><div class='add'>+#include &lt;linux/smp.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/of_platform.h&gt;</div><div class='ctx'> #include &lt;linux/of_device.h&gt;</div><div class='hunk'>@@ -40,7 +41,7 @@ static u32 orig_pci_err_en;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static u32 orig_l2_err_disable;</div><div class='del'>-static u32 orig_hid1;</div><div class='add'>+static u32 orig_hid1[2];</div><div class='ctx'> </div><div class='ctx'> /************************ MC SYSFS parts ***********************************/</div><div class='ctx'> </div><div class='hunk'>@@ -647,6 +648,9 @@ static struct of_device_id mpc85xx_l2_err_of_match[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 	 .compatible = "fsl,8568-l2-cache-controller",</div><div class='ctx'> 	 },</div><div class='add'>+	{</div><div class='add'>+	 .compatible = "fsl,mpc8572-l2-cache-controller",</div><div class='add'>+	 },</div><div class='ctx'> 	{},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -912,7 +916,8 @@ static int __devinit mpc85xx_mc_err_probe(struct of_device *op,</div><div class='ctx'> 		/* register interrupts */</div><div class='ctx'> 		pdata-&gt;irq = irq_of_parse_and_map(op-&gt;node, 0);</div><div class='ctx'> 		res = devm_request_irq(&amp;op-&gt;dev, pdata-&gt;irq,</div><div class='del'>-				       mpc85xx_mc_isr, IRQF_DISABLED,</div><div class='add'>+				       mpc85xx_mc_isr,</div><div class='add'>+					IRQF_DISABLED | IRQF_SHARED,</div><div class='ctx'> 				       "[EDAC] MC err", mci);</div><div class='ctx'> 		if (res &lt; 0) {</div><div class='ctx'> 			printk(KERN_ERR "%s: Unable to request irq %d for "</div><div class='hunk'>@@ -980,6 +985,9 @@ static struct of_device_id mpc85xx_mc_err_of_match[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 	 .compatible = "fsl,8568-memory-controller",</div><div class='ctx'> 	 },</div><div class='add'>+	{</div><div class='add'>+	 .compatible = "fsl,mpc8572-memory-controller",</div><div class='add'>+	 },</div><div class='ctx'> 	{},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -995,6 +1003,14 @@ static struct of_platform_driver mpc85xx_mc_err_driver = {</div><div class='ctx'> 		   },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+static void __init mpc85xx_mc_clear_rfxe(void *data)</div><div class='add'>+{</div><div class='add'>+	orig_hid1[smp_processor_id()] = mfspr(SPRN_HID1);</div><div class='add'>+	mtspr(SPRN_HID1, (orig_hid1[smp_processor_id()] &amp; ~0x20000));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> static int __init mpc85xx_mc_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int res = 0;</div><div class='hunk'>@@ -1030,19 +1046,22 @@ static int __init mpc85xx_mc_init(void)</div><div class='ctx'> 	 * need to clear HID1[RFXE] to disable machine check int</div><div class='ctx'> 	 * so we can catch it</div><div class='ctx'> 	 */</div><div class='del'>-	if (edac_op_state == EDAC_OPSTATE_INT) {</div><div class='del'>-		orig_hid1 = mfspr(SPRN_HID1);</div><div class='del'>-		mtspr(SPRN_HID1, (orig_hid1 &amp; ~0x20000));</div><div class='del'>-	}</div><div class='add'>+	if (edac_op_state == EDAC_OPSTATE_INT)</div><div class='add'>+		on_each_cpu(mpc85xx_mc_clear_rfxe, NULL, 0);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(mpc85xx_mc_init);</div><div class='ctx'> </div><div class='add'>+static void __exit mpc85xx_mc_restore_hid1(void *data)</div><div class='add'>+{</div><div class='add'>+	mtspr(SPRN_HID1, orig_hid1[smp_processor_id()]);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void __exit mpc85xx_mc_exit(void)</div><div class='ctx'> {</div><div class='del'>-	mtspr(SPRN_HID1, orig_hid1);</div><div class='add'>+	on_each_cpu(mpc85xx_mc_restore_hid1, NULL, 0);</div><div class='ctx'> #ifdef CONFIG_PCI</div><div class='ctx'> 	of_unregister_platform_driver(&amp;mpc85xx_pci_err_driver);</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/firewire/fw-card.c b/drivers/firewire/fw-card.c<br/>index bbd73a406e53..418c18f07e9d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/firewire/fw-card.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/firewire/fw-card.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/firewire/fw-card.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/firewire/fw-card.c</a></div><div class='hunk'>@@ -189,39 +189,16 @@ static const char gap_count_table[] = {</div><div class='ctx'> 	63, 5, 7, 8, 10, 13, 16, 18, 21, 24, 26, 29, 32, 35, 37, 40</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct bm_data {</div><div class='del'>-	struct fw_transaction t;</div><div class='del'>-	struct {</div><div class='del'>-		__be32 arg;</div><div class='del'>-		__be32 data;</div><div class='del'>-	} lock;</div><div class='del'>-	u32 old;</div><div class='del'>-	int rcode;</div><div class='del'>-	struct completion done;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-complete_bm_lock(struct fw_card *card, int rcode,</div><div class='del'>-		 void *payload, size_t length, void *data)</div><div class='del'>-{</div><div class='del'>-	struct bm_data *bmd = data;</div><div class='del'>-</div><div class='del'>-	if (rcode == RCODE_COMPLETE)</div><div class='del'>-		bmd-&gt;old = be32_to_cpu(*(__be32 *) payload);</div><div class='del'>-	bmd-&gt;rcode = rcode;</div><div class='del'>-	complete(&amp;bmd-&gt;done);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void</div><div class='ctx'> fw_card_bm_work(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	struct fw_card *card = container_of(work, struct fw_card, work.work);</div><div class='ctx'> 	struct fw_device *root_device;</div><div class='ctx'> 	struct fw_node *root_node, *local_node;</div><div class='del'>-	struct bm_data bmd;</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	int root_id, new_root_id, irm_id, gap_count, generation, grace;</div><div class='add'>+	int root_id, new_root_id, irm_id, gap_count, generation, grace, rcode;</div><div class='ctx'> 	bool do_reset = false;</div><div class='add'>+	__be32 lock_data[2];</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;card-&gt;lock, flags);</div><div class='ctx'> 	local_node = card-&gt;local_node;</div><div class='hunk'>@@ -263,33 +240,28 @@ fw_card_bm_work(struct work_struct *work)</div><div class='ctx'> 			goto pick_me;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		bmd.lock.arg = cpu_to_be32(0x3f);</div><div class='del'>-		bmd.lock.data = cpu_to_be32(local_node-&gt;node_id);</div><div class='add'>+		lock_data[0] = cpu_to_be32(0x3f);</div><div class='add'>+		lock_data[1] = cpu_to_be32(local_node-&gt;node_id);</div><div class='ctx'> </div><div class='ctx'> 		spin_unlock_irqrestore(&amp;card-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-		init_completion(&amp;bmd.done);</div><div class='del'>-		fw_send_request(card, &amp;bmd.t, TCODE_LOCK_COMPARE_SWAP,</div><div class='del'>-				irm_id, generation,</div><div class='del'>-				SCODE_100, CSR_REGISTER_BASE + CSR_BUS_MANAGER_ID,</div><div class='del'>-				&amp;bmd.lock, sizeof(bmd.lock),</div><div class='del'>-				complete_bm_lock, &amp;bmd);</div><div class='del'>-		wait_for_completion(&amp;bmd.done);</div><div class='add'>+		rcode = fw_run_transaction(card, TCODE_LOCK_COMPARE_SWAP,</div><div class='add'>+				irm_id, generation, SCODE_100,</div><div class='add'>+				CSR_REGISTER_BASE + CSR_BUS_MANAGER_ID,</div><div class='add'>+				lock_data, sizeof(lock_data));</div><div class='ctx'> </div><div class='del'>-		if (bmd.rcode == RCODE_GENERATION) {</div><div class='del'>-			/*</div><div class='del'>-			 * Another bus reset happened. Just return,</div><div class='del'>-			 * the BM work has been rescheduled.</div><div class='del'>-			 */</div><div class='add'>+		if (rcode == RCODE_GENERATION)</div><div class='add'>+			/* Another bus reset, BM work has been rescheduled. */</div><div class='ctx'> 			goto out;</div><div class='del'>-		}</div><div class='ctx'> </div><div class='del'>-		if (bmd.rcode == RCODE_COMPLETE &amp;&amp; bmd.old != 0x3f)</div><div class='add'>+		if (rcode == RCODE_COMPLETE &amp;&amp;</div><div class='add'>+		    lock_data[0] != cpu_to_be32(0x3f))</div><div class='ctx'> 			/* Somebody else is BM, let them do the work. */</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='ctx'> 		spin_lock_irqsave(&amp;card-&gt;lock, flags);</div><div class='del'>-		if (bmd.rcode != RCODE_COMPLETE) {</div><div class='add'>+</div><div class='add'>+		if (rcode != RCODE_COMPLETE) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * The lock request failed, maybe the IRM</div><div class='ctx'> 			 * isn't really IRM capable after all. Let's</div><div class='head'>diff --git a/drivers/firewire/fw-cdev.c b/drivers/firewire/fw-cdev.c<br/>index 2e6d5848d217..ed03234cbea8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/firewire/fw-cdev.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/firewire/fw-cdev.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/firewire/fw-cdev.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/firewire/fw-cdev.c</a></div><div class='hunk'>@@ -720,8 +720,8 @@ static int ioctl_create_iso_context(struct client *client, void *buffer)</div><div class='ctx'> #define GET_PAYLOAD_LENGTH(v)	((v) &amp; 0xffff)</div><div class='ctx'> #define GET_INTERRUPT(v)	(((v) &gt;&gt; 16) &amp; 0x01)</div><div class='ctx'> #define GET_SKIP(v)		(((v) &gt;&gt; 17) &amp; 0x01)</div><div class='del'>-#define GET_TAG(v)		(((v) &gt;&gt; 18) &amp; 0x02)</div><div class='del'>-#define GET_SY(v)		(((v) &gt;&gt; 20) &amp; 0x04)</div><div class='add'>+#define GET_TAG(v)		(((v) &gt;&gt; 18) &amp; 0x03)</div><div class='add'>+#define GET_SY(v)		(((v) &gt;&gt; 20) &amp; 0x0f)</div><div class='ctx'> #define GET_HEADER_LENGTH(v)	(((v) &gt;&gt; 24) &amp; 0xff)</div><div class='ctx'> </div><div class='ctx'> static int ioctl_queue_iso(struct client *client, void *buffer)</div><div class='hunk'>@@ -913,7 +913,7 @@ dispatch_ioctl(struct client *client, unsigned int cmd, void __user *arg)</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static long</div><div class='head'>diff --git a/drivers/firewire/fw-device.c b/drivers/firewire/fw-device.c<br/>index 0855fb5568e8..3fccdd484100 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/firewire/fw-device.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/firewire/fw-device.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/firewire/fw-device.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/firewire/fw-device.c</a></div><div class='hunk'>@@ -381,46 +381,21 @@ static struct device_attribute fw_device_attributes[] = {</div><div class='ctx'> 	__ATTR_NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct read_quadlet_callback_data {</div><div class='del'>-	struct completion done;</div><div class='del'>-	int rcode;</div><div class='del'>-	u32 data;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-complete_transaction(struct fw_card *card, int rcode,</div><div class='del'>-		     void *payload, size_t length, void *data)</div><div class='del'>-{</div><div class='del'>-	struct read_quadlet_callback_data *callback_data = data;</div><div class='del'>-</div><div class='del'>-	if (rcode == RCODE_COMPLETE)</div><div class='del'>-		callback_data-&gt;data = be32_to_cpu(*(__be32 *)payload);</div><div class='del'>-	callback_data-&gt;rcode = rcode;</div><div class='del'>-	complete(&amp;callback_data-&gt;done);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int</div><div class='ctx'> read_rom(struct fw_device *device, int generation, int index, u32 *data)</div><div class='ctx'> {</div><div class='del'>-	struct read_quadlet_callback_data callback_data;</div><div class='del'>-	struct fw_transaction t;</div><div class='del'>-	u64 offset;</div><div class='add'>+	int rcode;</div><div class='ctx'> </div><div class='ctx'> 	/* device-&gt;node_id, accessed below, must not be older than generation */</div><div class='ctx'> 	smp_rmb();</div><div class='ctx'> </div><div class='del'>-	init_completion(&amp;callback_data.done);</div><div class='del'>-</div><div class='del'>-	offset = (CSR_REGISTER_BASE | CSR_CONFIG_ROM) + index * 4;</div><div class='del'>-	fw_send_request(device-&gt;card, &amp;t, TCODE_READ_QUADLET_REQUEST,</div><div class='add'>+	rcode = fw_run_transaction(device-&gt;card, TCODE_READ_QUADLET_REQUEST,</div><div class='ctx'> 			device-&gt;node_id, generation, device-&gt;max_speed,</div><div class='del'>-			offset, NULL, 4, complete_transaction, &amp;callback_data);</div><div class='del'>-</div><div class='del'>-	wait_for_completion(&amp;callback_data.done);</div><div class='del'>-</div><div class='del'>-	*data = callback_data.data;</div><div class='add'>+			(CSR_REGISTER_BASE | CSR_CONFIG_ROM) + index * 4,</div><div class='add'>+			data, 4);</div><div class='add'>+	be32_to_cpus(data);</div><div class='ctx'> </div><div class='del'>-	return callback_data.rcode;</div><div class='add'>+	return rcode;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define READ_BIB_ROM_SIZE	256</div><div class='head'>diff --git a/drivers/firewire/fw-sbp2.c b/drivers/firewire/fw-sbp2.c<br/>index aaff50ebba1d..ef0b9b419c27 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/firewire/fw-sbp2.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/firewire/fw-sbp2.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/firewire/fw-sbp2.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/firewire/fw-sbp2.c</a></div><div class='hunk'>@@ -29,6 +29,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='add'>+#include &lt;linux/bug.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='hunk'>@@ -181,10 +182,16 @@ struct sbp2_target {</div><div class='ctx'> #define SBP2_MAX_LOGIN_ORB_TIMEOUT	40000U	/* Timeout in ms */</div><div class='ctx'> #define SBP2_ORB_TIMEOUT		2000U	/* Timeout in ms */</div><div class='ctx'> #define SBP2_ORB_NULL			0x80000000</div><div class='del'>-#define SBP2_MAX_SG_ELEMENT_LENGTH	0xf000</div><div class='ctx'> #define SBP2_RETRY_LIMIT		0xf		/* 15 retries */</div><div class='ctx'> #define SBP2_CYCLE_LIMIT		(0xc8 &lt;&lt; 12)	/* 200 125us cycles */</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * The default maximum s/g segment size of a FireWire controller is</div><div class='add'>+ * usually 0x10000, but SBP-2 only allows 0xffff. Since buffers have to</div><div class='add'>+ * be quadlet-aligned, we set the length limit to 0xffff &amp; ~3.</div><div class='add'>+ */</div><div class='add'>+#define SBP2_MAX_SEG_SIZE		0xfffc</div><div class='add'>+</div><div class='ctx'> /* Unit directory keys */</div><div class='ctx'> #define SBP2_CSR_UNIT_CHARACTERISTICS	0x3a</div><div class='ctx'> #define SBP2_CSR_FIRMWARE_REVISION	0x3c</div><div class='hunk'>@@ -621,25 +628,15 @@ sbp2_send_management_orb(struct sbp2_logical_unit *lu, int node_id,</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-complete_agent_reset_write(struct fw_card *card, int rcode,</div><div class='del'>-			   void *payload, size_t length, void *done)</div><div class='del'>-{</div><div class='del'>-	complete(done);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void sbp2_agent_reset(struct sbp2_logical_unit *lu)</div><div class='ctx'> {</div><div class='ctx'> 	struct fw_device *device = fw_device(lu-&gt;tgt-&gt;unit-&gt;device.parent);</div><div class='del'>-	DECLARE_COMPLETION_ONSTACK(done);</div><div class='del'>-	struct fw_transaction t;</div><div class='del'>-	static u32 z;</div><div class='add'>+	__be32 d = 0;</div><div class='ctx'> </div><div class='del'>-	fw_send_request(device-&gt;card, &amp;t, TCODE_WRITE_QUADLET_REQUEST,</div><div class='del'>-			lu-&gt;tgt-&gt;node_id, lu-&gt;generation, device-&gt;max_speed,</div><div class='del'>-			lu-&gt;command_block_agent_address + SBP2_AGENT_RESET,</div><div class='del'>-			&amp;z, sizeof(z), complete_agent_reset_write, &amp;done);</div><div class='del'>-	wait_for_completion(&amp;done);</div><div class='add'>+	fw_run_transaction(device-&gt;card, TCODE_WRITE_QUADLET_REQUEST,</div><div class='add'>+			   lu-&gt;tgt-&gt;node_id, lu-&gt;generation, device-&gt;max_speed,</div><div class='add'>+			   lu-&gt;command_block_agent_address + SBP2_AGENT_RESET,</div><div class='add'>+			   &amp;d, sizeof(d));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -653,7 +650,7 @@ static void sbp2_agent_reset_no_wait(struct sbp2_logical_unit *lu)</div><div class='ctx'> {</div><div class='ctx'> 	struct fw_device *device = fw_device(lu-&gt;tgt-&gt;unit-&gt;device.parent);</div><div class='ctx'> 	struct fw_transaction *t;</div><div class='del'>-	static u32 z;</div><div class='add'>+	static __be32 d;</div><div class='ctx'> </div><div class='ctx'> 	t = kmalloc(sizeof(*t), GFP_ATOMIC);</div><div class='ctx'> 	if (t == NULL)</div><div class='hunk'>@@ -662,7 +659,7 @@ static void sbp2_agent_reset_no_wait(struct sbp2_logical_unit *lu)</div><div class='ctx'> 	fw_send_request(device-&gt;card, t, TCODE_WRITE_QUADLET_REQUEST,</div><div class='ctx'> 			lu-&gt;tgt-&gt;node_id, lu-&gt;generation, device-&gt;max_speed,</div><div class='ctx'> 			lu-&gt;command_block_agent_address + SBP2_AGENT_RESET,</div><div class='del'>-			&amp;z, sizeof(z), complete_agent_reset_write_no_wait, t);</div><div class='add'>+			&amp;d, sizeof(d), complete_agent_reset_write_no_wait, t);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sbp2_set_generation(struct sbp2_logical_unit *lu, int generation)</div><div class='hunk'>@@ -823,13 +820,6 @@ static void sbp2_target_put(struct sbp2_target *tgt)</div><div class='ctx'> 	kref_put(&amp;tgt-&gt;kref, sbp2_release_target);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-complete_set_busy_timeout(struct fw_card *card, int rcode,</div><div class='del'>-			  void *payload, size_t length, void *done)</div><div class='del'>-{</div><div class='del'>-	complete(done);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Write retransmit retry values into the BUSY_TIMEOUT register.</div><div class='ctx'>  * - The single-phase retry protocol is supported by all SBP-2 devices, but the</div><div class='hunk'>@@ -849,17 +839,12 @@ complete_set_busy_timeout(struct fw_card *card, int rcode,</div><div class='ctx'> static void sbp2_set_busy_timeout(struct sbp2_logical_unit *lu)</div><div class='ctx'> {</div><div class='ctx'> 	struct fw_device *device = fw_device(lu-&gt;tgt-&gt;unit-&gt;device.parent);</div><div class='del'>-	DECLARE_COMPLETION_ONSTACK(done);</div><div class='del'>-	struct fw_transaction t;</div><div class='del'>-	static __be32 busy_timeout;</div><div class='del'>-</div><div class='del'>-	busy_timeout = cpu_to_be32(SBP2_CYCLE_LIMIT | SBP2_RETRY_LIMIT);</div><div class='add'>+	__be32 d = cpu_to_be32(SBP2_CYCLE_LIMIT | SBP2_RETRY_LIMIT);</div><div class='ctx'> </div><div class='del'>-	fw_send_request(device-&gt;card, &amp;t, TCODE_WRITE_QUADLET_REQUEST,</div><div class='del'>-			lu-&gt;tgt-&gt;node_id, lu-&gt;generation, device-&gt;max_speed,</div><div class='del'>-			CSR_REGISTER_BASE + CSR_BUSY_TIMEOUT, &amp;busy_timeout,</div><div class='del'>-			sizeof(busy_timeout), complete_set_busy_timeout, &amp;done);</div><div class='del'>-	wait_for_completion(&amp;done);</div><div class='add'>+	fw_run_transaction(device-&gt;card, TCODE_WRITE_QUADLET_REQUEST,</div><div class='add'>+			   lu-&gt;tgt-&gt;node_id, lu-&gt;generation, device-&gt;max_speed,</div><div class='add'>+			   CSR_REGISTER_BASE + CSR_BUSY_TIMEOUT,</div><div class='add'>+			   &amp;d, sizeof(d));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sbp2_reconnect(struct work_struct *work);</div><div class='hunk'>@@ -1121,6 +1106,10 @@ static int sbp2_probe(struct device *dev)</div><div class='ctx'> 	struct Scsi_Host *shost;</div><div class='ctx'> 	u32 model, firmware_revision;</div><div class='ctx'> </div><div class='add'>+	if (dma_get_max_seg_size(device-&gt;card-&gt;device) &gt; SBP2_MAX_SEG_SIZE)</div><div class='add'>+		BUG_ON(dma_set_max_seg_size(device-&gt;card-&gt;device,</div><div class='add'>+					    SBP2_MAX_SEG_SIZE));</div><div class='add'>+</div><div class='ctx'> 	shost = scsi_host_alloc(&amp;scsi_driver_template, sizeof(*tgt));</div><div class='ctx'> 	if (shost == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -1369,14 +1358,12 @@ static int</div><div class='ctx'> sbp2_map_scatterlist(struct sbp2_command_orb *orb, struct fw_device *device,</div><div class='ctx'> 		     struct sbp2_logical_unit *lu)</div><div class='ctx'> {</div><div class='del'>-	struct scatterlist *sg;</div><div class='del'>-	int sg_len, l, i, j, count;</div><div class='del'>-	dma_addr_t sg_addr;</div><div class='del'>-</div><div class='del'>-	sg = scsi_sglist(orb-&gt;cmd);</div><div class='del'>-	count = dma_map_sg(device-&gt;card-&gt;device, sg, scsi_sg_count(orb-&gt;cmd),</div><div class='del'>-			   orb-&gt;cmd-&gt;sc_data_direction);</div><div class='del'>-	if (count == 0)</div><div class='add'>+	struct scatterlist *sg = scsi_sglist(orb-&gt;cmd);</div><div class='add'>+	int i, n;</div><div class='add'>+</div><div class='add'>+	n = dma_map_sg(device-&gt;card-&gt;device, sg, scsi_sg_count(orb-&gt;cmd),</div><div class='add'>+		       orb-&gt;cmd-&gt;sc_data_direction);</div><div class='add'>+	if (n == 0)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1386,7 +1373,7 @@ sbp2_map_scatterlist(struct sbp2_command_orb *orb, struct fw_device *device,</div><div class='ctx'> 	 * as the second generation iPod which doesn't support page</div><div class='ctx'> 	 * tables.</div><div class='ctx'> 	 */</div><div class='del'>-	if (count == 1 &amp;&amp; sg_dma_len(sg) &lt; SBP2_MAX_SG_ELEMENT_LENGTH) {</div><div class='add'>+	if (n == 1) {</div><div class='ctx'> 		orb-&gt;request.data_descriptor.high =</div><div class='ctx'> 			cpu_to_be32(lu-&gt;tgt-&gt;address_high);</div><div class='ctx'> 		orb-&gt;request.data_descriptor.low  =</div><div class='hunk'>@@ -1396,29 +1383,9 @@ sbp2_map_scatterlist(struct sbp2_command_orb *orb, struct fw_device *device,</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Convert the scatterlist to an sbp2 page table.  If any</div><div class='del'>-	 * scatterlist entries are too big for sbp2, we split them as we</div><div class='del'>-	 * go.  Even if we ask the block I/O layer to not give us sg</div><div class='del'>-	 * elements larger than 65535 bytes, some IOMMUs may merge sg elements</div><div class='del'>-	 * during DMA mapping, and Linux currently doesn't prevent this.</div><div class='del'>-	 */</div><div class='del'>-	for (i = 0, j = 0; i &lt; count; i++, sg = sg_next(sg)) {</div><div class='del'>-		sg_len = sg_dma_len(sg);</div><div class='del'>-		sg_addr = sg_dma_address(sg);</div><div class='del'>-		while (sg_len) {</div><div class='del'>-			/* FIXME: This won't get us out of the pinch. */</div><div class='del'>-			if (unlikely(j &gt;= ARRAY_SIZE(orb-&gt;page_table))) {</div><div class='del'>-				fw_error("page table overflow\n");</div><div class='del'>-				goto fail_page_table;</div><div class='del'>-			}</div><div class='del'>-			l = min(sg_len, SBP2_MAX_SG_ELEMENT_LENGTH);</div><div class='del'>-			orb-&gt;page_table[j].low = cpu_to_be32(sg_addr);</div><div class='del'>-			orb-&gt;page_table[j].high = cpu_to_be32(l &lt;&lt; 16);</div><div class='del'>-			sg_addr += l;</div><div class='del'>-			sg_len -= l;</div><div class='del'>-			j++;</div><div class='del'>-		}</div><div class='add'>+	for_each_sg(sg, sg, n, i) {</div><div class='add'>+		orb-&gt;page_table[i].high = cpu_to_be32(sg_dma_len(sg) &lt;&lt; 16);</div><div class='add'>+		orb-&gt;page_table[i].low = cpu_to_be32(sg_dma_address(sg));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	orb-&gt;page_table_bus =</div><div class='hunk'>@@ -1437,13 +1404,13 @@ sbp2_map_scatterlist(struct sbp2_command_orb *orb, struct fw_device *device,</div><div class='ctx'> 	orb-&gt;request.data_descriptor.high = cpu_to_be32(lu-&gt;tgt-&gt;address_high);</div><div class='ctx'> 	orb-&gt;request.data_descriptor.low  = cpu_to_be32(orb-&gt;page_table_bus);</div><div class='ctx'> 	orb-&gt;request.misc |= cpu_to_be32(COMMAND_ORB_PAGE_TABLE_PRESENT |</div><div class='del'>-					 COMMAND_ORB_DATA_SIZE(j));</div><div class='add'>+					 COMMAND_ORB_DATA_SIZE(n));</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'>  fail_page_table:</div><div class='del'>-	dma_unmap_sg(device-&gt;card-&gt;device, sg, scsi_sg_count(orb-&gt;cmd),</div><div class='del'>-		     orb-&gt;cmd-&gt;sc_data_direction);</div><div class='add'>+	dma_unmap_sg(device-&gt;card-&gt;device, scsi_sglist(orb-&gt;cmd),</div><div class='add'>+		     scsi_sg_count(orb-&gt;cmd), orb-&gt;cmd-&gt;sc_data_direction);</div><div class='ctx'>  fail:</div><div class='ctx'> 	return -ENOMEM;</div><div class='ctx'> }</div><div class='hunk'>@@ -1456,7 +1423,7 @@ static int sbp2_scsi_queuecommand(struct scsi_cmnd *cmd, scsi_done_fn_t done)</div><div class='ctx'> 	struct fw_device *device = fw_device(lu-&gt;tgt-&gt;unit-&gt;device.parent);</div><div class='ctx'> 	struct sbp2_command_orb *orb;</div><div class='ctx'> 	unsigned int max_payload;</div><div class='del'>-	int retval = SCSI_MLQUEUE_HOST_BUSY;</div><div class='add'>+	int generation, retval = SCSI_MLQUEUE_HOST_BUSY;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Bidirectional commands are not yet implemented, and unknown</div><div class='hunk'>@@ -1500,6 +1467,9 @@ static int sbp2_scsi_queuecommand(struct scsi_cmnd *cmd, scsi_done_fn_t done)</div><div class='ctx'> 	if (cmd-&gt;sc_data_direction == DMA_FROM_DEVICE)</div><div class='ctx'> 		orb-&gt;request.misc |= cpu_to_be32(COMMAND_ORB_DIRECTION);</div><div class='ctx'> </div><div class='add'>+	generation = device-&gt;generation;</div><div class='add'>+	smp_rmb();    /* sbp2_map_scatterlist looks at tgt-&gt;address_high */</div><div class='add'>+</div><div class='ctx'> 	if (scsi_sg_count(cmd) &amp;&amp; sbp2_map_scatterlist(orb, device, lu) &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -1512,7 +1482,7 @@ static int sbp2_scsi_queuecommand(struct scsi_cmnd *cmd, scsi_done_fn_t done)</div><div class='ctx'> 	if (dma_mapping_error(device-&gt;card-&gt;device, orb-&gt;base.request_bus))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	sbp2_send_orb(&amp;orb-&gt;base, lu, lu-&gt;tgt-&gt;node_id, lu-&gt;generation,</div><div class='add'>+	sbp2_send_orb(&amp;orb-&gt;base, lu, lu-&gt;tgt-&gt;node_id, generation,</div><div class='ctx'> 		      lu-&gt;command_block_agent_address + SBP2_ORB_POINTER);</div><div class='ctx'> 	retval = 0;</div><div class='ctx'>  out:</div><div class='hunk'>@@ -1564,6 +1534,8 @@ static int sbp2_scsi_slave_configure(struct scsi_device *sdev)</div><div class='ctx'> 	if (lu-&gt;tgt-&gt;workarounds &amp; SBP2_WORKAROUND_128K_MAX_TRANS)</div><div class='ctx'> 		blk_queue_max_sectors(sdev-&gt;request_queue, 128 * 1024 / 512);</div><div class='ctx'> </div><div class='add'>+	blk_queue_max_segment_size(sdev-&gt;request_queue, SBP2_MAX_SEG_SIZE);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/firewire/fw-transaction.c b/drivers/firewire/fw-transaction.c<br/>index e5d1a0b64fcf..022ac4fabb67 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/firewire/fw-transaction.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/firewire/fw-transaction.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/firewire/fw-transaction.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/firewire/fw-transaction.c</a></div><div class='hunk'>@@ -247,7 +247,7 @@ fw_fill_request(struct fw_packet *packet, int tcode, int tlabel,</div><div class='ctx'>  */</div><div class='ctx'> void</div><div class='ctx'> fw_send_request(struct fw_card *card, struct fw_transaction *t,</div><div class='del'>-		int tcode, int node_id, int generation, int speed,</div><div class='add'>+		int tcode, int destination_id, int generation, int speed,</div><div class='ctx'> 		unsigned long long offset,</div><div class='ctx'> 		void *payload, size_t length,</div><div class='ctx'> 		fw_transaction_callback_t callback, void *callback_data)</div><div class='hunk'>@@ -279,13 +279,14 @@ fw_send_request(struct fw_card *card, struct fw_transaction *t,</div><div class='ctx'> 	card-&gt;current_tlabel = (card-&gt;current_tlabel + 1) &amp; 0x1f;</div><div class='ctx'> 	card-&gt;tlabel_mask |= (1 &lt;&lt; tlabel);</div><div class='ctx'> </div><div class='del'>-	t-&gt;node_id = node_id;</div><div class='add'>+	t-&gt;node_id = destination_id;</div><div class='ctx'> 	t-&gt;tlabel = tlabel;</div><div class='ctx'> 	t-&gt;callback = callback;</div><div class='ctx'> 	t-&gt;callback_data = callback_data;</div><div class='ctx'> </div><div class='del'>-	fw_fill_request(&amp;t-&gt;packet, tcode, t-&gt;tlabel, node_id, card-&gt;node_id,</div><div class='del'>-			generation, speed, offset, payload, length);</div><div class='add'>+	fw_fill_request(&amp;t-&gt;packet, tcode, t-&gt;tlabel,</div><div class='add'>+			destination_id, card-&gt;node_id, generation,</div><div class='add'>+			speed, offset, payload, length);</div><div class='ctx'> 	t-&gt;packet.callback = transmit_complete_callback;</div><div class='ctx'> </div><div class='ctx'> 	list_add_tail(&amp;t-&gt;link, &amp;card-&gt;transaction_list);</div><div class='hunk'>@@ -296,6 +297,45 @@ fw_send_request(struct fw_card *card, struct fw_transaction *t,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(fw_send_request);</div><div class='ctx'> </div><div class='add'>+struct transaction_callback_data {</div><div class='add'>+	struct completion done;</div><div class='add'>+	void *payload;</div><div class='add'>+	int rcode;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void transaction_callback(struct fw_card *card, int rcode,</div><div class='add'>+				 void *payload, size_t length, void *data)</div><div class='add'>+{</div><div class='add'>+	struct transaction_callback_data *d = data;</div><div class='add'>+</div><div class='add'>+	if (rcode == RCODE_COMPLETE)</div><div class='add'>+		memcpy(d-&gt;payload, payload, length);</div><div class='add'>+	d-&gt;rcode = rcode;</div><div class='add'>+	complete(&amp;d-&gt;done);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * fw_run_transaction - send request and sleep until transaction is completed</div><div class='add'>+ *</div><div class='add'>+ * Returns the RCODE.</div><div class='add'>+ */</div><div class='add'>+int fw_run_transaction(struct fw_card *card, int tcode, int destination_id,</div><div class='add'>+		int generation, int speed, unsigned long long offset,</div><div class='add'>+		void *data, size_t length)</div><div class='add'>+{</div><div class='add'>+	struct transaction_callback_data d;</div><div class='add'>+	struct fw_transaction t;</div><div class='add'>+</div><div class='add'>+	init_completion(&amp;d.done);</div><div class='add'>+	d.payload = data;</div><div class='add'>+	fw_send_request(card, &amp;t, tcode, destination_id, generation, speed,</div><div class='add'>+			offset, data, length, transaction_callback, &amp;d);</div><div class='add'>+	wait_for_completion(&amp;d.done);</div><div class='add'>+</div><div class='add'>+	return d.rcode;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(fw_run_transaction);</div><div class='add'>+</div><div class='ctx'> static DEFINE_MUTEX(phy_config_mutex);</div><div class='ctx'> static DECLARE_COMPLETION(phy_config_done);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/firewire/fw-transaction.h b/drivers/firewire/fw-transaction.h<br/>index 2ae1b0d6cb7b..027f58ce81ad 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/firewire/fw-transaction.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/firewire/fw-transaction.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/firewire/fw-transaction.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/firewire/fw-transaction.h</a></div><div class='hunk'>@@ -426,11 +426,14 @@ fw_core_initiate_bus_reset(struct fw_card *card, int short_reset);</div><div class='ctx'> </div><div class='ctx'> void</div><div class='ctx'> fw_send_request(struct fw_card *card, struct fw_transaction *t,</div><div class='del'>-		int tcode, int node_id, int generation, int speed,</div><div class='del'>-		unsigned long long offset,</div><div class='del'>-		void *data, size_t length,</div><div class='add'>+		int tcode, int destination_id, int generation, int speed,</div><div class='add'>+		unsigned long long offset, void *data, size_t length,</div><div class='ctx'> 		fw_transaction_callback_t callback, void *callback_data);</div><div class='ctx'> </div><div class='add'>+int fw_run_transaction(struct fw_card *card, int tcode, int destination_id,</div><div class='add'>+		       int generation, int speed, unsigned long long offset,</div><div class='add'>+		       void *data, size_t length);</div><div class='add'>+</div><div class='ctx'> int fw_cancel_transaction(struct fw_card *card,</div><div class='ctx'> 			  struct fw_transaction *transaction);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c<br/>index 455575be3560..3e526b6d00cb 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/firmware/dmi_scan.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/firmware/dmi_scan.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/firmware/dmi_scan.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/firmware/dmi_scan.c</a></div><div class='hunk'>@@ -15,6 +15,11 @@</div><div class='ctx'>  */</div><div class='ctx'> static char dmi_empty_string[] = "        ";</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Catch too early calls to dmi_check_system():</div><div class='add'>+ */</div><div class='add'>+static int dmi_initialized;</div><div class='add'>+</div><div class='ctx'> static const char * __init dmi_string_nosave(const struct dmi_header *dm, u8 s)</div><div class='ctx'> {</div><div class='ctx'> 	const u8 *bp = ((u8 *) dm) + dm-&gt;length;</div><div class='hunk'>@@ -366,7 +371,7 @@ void __init dmi_scan_machine(void)</div><div class='ctx'> </div><div class='ctx'> 	if (efi_enabled) {</div><div class='ctx'> 		if (efi.smbios == EFI_INVALID_TABLE_ADDR)</div><div class='del'>-			goto out;</div><div class='add'>+			goto error;</div><div class='ctx'> </div><div class='ctx'> 		/* This is called as a core_initcall() because it isn't</div><div class='ctx'> 		 * needed during early boot.  This also means we can</div><div class='hunk'>@@ -374,13 +379,13 @@ void __init dmi_scan_machine(void)</div><div class='ctx'> 		 */</div><div class='ctx'> 		p = dmi_ioremap(efi.smbios, 32);</div><div class='ctx'> 		if (p == NULL)</div><div class='del'>-			goto out;</div><div class='add'>+			goto error;</div><div class='ctx'> </div><div class='ctx'> 		rc = dmi_present(p + 0x10); /* offset of _DMI_ string */</div><div class='ctx'> 		dmi_iounmap(p, 32);</div><div class='ctx'> 		if (!rc) {</div><div class='ctx'> 			dmi_available = 1;</div><div class='del'>-			return;</div><div class='add'>+			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	else {</div><div class='hunk'>@@ -391,19 +396,22 @@ void __init dmi_scan_machine(void)</div><div class='ctx'> 		 */</div><div class='ctx'> 		p = dmi_ioremap(0xF0000, 0x10000);</div><div class='ctx'> 		if (p == NULL)</div><div class='del'>-			goto out;</div><div class='add'>+			goto error;</div><div class='ctx'> </div><div class='ctx'> 		for (q = p; q &lt; p + 0x10000; q += 16) {</div><div class='ctx'> 			rc = dmi_present(q);</div><div class='ctx'> 			if (!rc) {</div><div class='ctx'> 				dmi_available = 1;</div><div class='ctx'> 				dmi_iounmap(p, 0x10000);</div><div class='del'>-				return;</div><div class='add'>+				goto out;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		dmi_iounmap(p, 0x10000);</div><div class='ctx'> 	}</div><div class='del'>- out:	printk(KERN_INFO "DMI not present or invalid.\n");</div><div class='add'>+ error:</div><div class='add'>+	printk(KERN_INFO "DMI not present or invalid.\n");</div><div class='add'>+ out:</div><div class='add'>+	dmi_initialized = 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -424,6 +432,8 @@ int dmi_check_system(const struct dmi_system_id *list)</div><div class='ctx'> 	int i, count = 0;</div><div class='ctx'> 	const struct dmi_system_id *d = list;</div><div class='ctx'> </div><div class='add'>+	WARN(!dmi_initialized, KERN_ERR "dmi check: not initialized yet.\n");</div><div class='add'>+</div><div class='ctx'> 	while (d-&gt;ident) {</div><div class='ctx'> 		for (i = 0; i &lt; ARRAY_SIZE(d-&gt;matches); i++) {</div><div class='ctx'> 			int s = d-&gt;matches[i].slot;</div><div class='head'>diff --git a/drivers/firmware/iscsi_ibft.c b/drivers/firmware/iscsi_ibft.c<br/>index b91ef63126ed..deb154aa47c4 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/firmware/iscsi_ibft.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/firmware/iscsi_ibft.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/firmware/iscsi_ibft.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/firmware/iscsi_ibft.c</a></div><div class='hunk'>@@ -334,9 +334,9 @@ static void ibft_release(struct kobject *kobj)</div><div class='ctx'> /*</div><div class='ctx'>  *  Routines for parsing the iBFT data to be human readable.</div><div class='ctx'>  */</div><div class='del'>-ssize_t ibft_attr_show_initiator(struct ibft_kobject *entry,</div><div class='del'>-				  struct ibft_attribute *attr,</div><div class='del'>-				  char *buf)</div><div class='add'>+static ssize_t ibft_attr_show_initiator(struct ibft_kobject *entry,</div><div class='add'>+					struct ibft_attribute *attr,</div><div class='add'>+					char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct ibft_initiator *initiator = entry-&gt;initiator;</div><div class='ctx'> 	void *ibft_loc = entry-&gt;header;</div><div class='hunk'>@@ -376,9 +376,9 @@ ssize_t ibft_attr_show_initiator(struct ibft_kobject *entry,</div><div class='ctx'> 	return str - buf;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-ssize_t ibft_attr_show_nic(struct ibft_kobject *entry,</div><div class='del'>-			    struct ibft_attribute *attr,</div><div class='del'>-			    char *buf)</div><div class='add'>+static ssize_t ibft_attr_show_nic(struct ibft_kobject *entry,</div><div class='add'>+				  struct ibft_attribute *attr,</div><div class='add'>+				  char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct ibft_nic *nic = entry-&gt;nic;</div><div class='ctx'> 	void *ibft_loc = entry-&gt;header;</div><div class='hunk'>@@ -440,9 +440,9 @@ ssize_t ibft_attr_show_nic(struct ibft_kobject *entry,</div><div class='ctx'> 	return str - buf;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-ssize_t ibft_attr_show_target(struct ibft_kobject *entry,</div><div class='del'>-			       struct ibft_attribute *attr,</div><div class='del'>-			       char *buf)</div><div class='add'>+static ssize_t ibft_attr_show_target(struct ibft_kobject *entry,</div><div class='add'>+				     struct ibft_attribute *attr,</div><div class='add'>+				     char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct ibft_tgt *tgt = entry-&gt;tgt;</div><div class='ctx'> 	void *ibft_loc = entry-&gt;header;</div><div class='head'>diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c<br/>index 8d2940517c99..9112830107a5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpio/gpiolib.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/gpio/gpiolib.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpio/gpiolib.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpio/gpiolib.c</a></div><div class='hunk'>@@ -67,17 +67,28 @@ static inline void desc_set_label(struct gpio_desc *d, const char *label)</div><div class='ctx'>  * when setting direction, and otherwise illegal.  Until board setup code</div><div class='ctx'>  * and drivers use explicit requests everywhere (which won't happen when</div><div class='ctx'>  * those calls have no teeth) we can't avoid autorequesting.  This nag</div><div class='del'>- * message should motivate switching to explicit requests...</div><div class='add'>+ * message should motivate switching to explicit requests... so should</div><div class='add'>+ * the weaker cleanup after faults, compared to gpio_request().</div><div class='ctx'>  */</div><div class='del'>-static void gpio_ensure_requested(struct gpio_desc *desc)</div><div class='add'>+static int gpio_ensure_requested(struct gpio_desc *desc, unsigned offset)</div><div class='ctx'> {</div><div class='ctx'> 	if (test_and_set_bit(FLAG_REQUESTED, &amp;desc-&gt;flags) == 0) {</div><div class='del'>-		pr_warning("GPIO-%d autorequested\n", (int)(desc - gpio_desc));</div><div class='add'>+		struct gpio_chip *chip = desc-&gt;chip;</div><div class='add'>+		int gpio = chip-&gt;base + offset;</div><div class='add'>+</div><div class='add'>+		if (!try_module_get(chip-&gt;owner)) {</div><div class='add'>+			pr_err("GPIO-%d: module can't be gotten \n", gpio);</div><div class='add'>+			clear_bit(FLAG_REQUESTED, &amp;desc-&gt;flags);</div><div class='add'>+			/* lose */</div><div class='add'>+			return -EIO;</div><div class='add'>+		}</div><div class='add'>+		pr_warning("GPIO-%d autorequested\n", gpio);</div><div class='ctx'> 		desc_set_label(desc, "[auto]");</div><div class='del'>-		if (!try_module_get(desc-&gt;chip-&gt;owner))</div><div class='del'>-			pr_err("GPIO-%d: module can't be gotten \n",</div><div class='del'>-					(int)(desc - gpio_desc));</div><div class='add'>+		/* caller must chip-&gt;request() w/o spinlock */</div><div class='add'>+		if (chip-&gt;request)</div><div class='add'>+			return 1;</div><div class='ctx'> 	}</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* caller holds gpio_lock *OR* gpio is marked as requested */</div><div class='hunk'>@@ -752,6 +763,7 @@ EXPORT_SYMBOL_GPL(gpiochip_remove);</div><div class='ctx'> int gpio_request(unsigned gpio, const char *label)</div><div class='ctx'> {</div><div class='ctx'> 	struct gpio_desc	*desc;</div><div class='add'>+	struct gpio_chip	*chip;</div><div class='ctx'> 	int			status = -EINVAL;</div><div class='ctx'> 	unsigned long		flags;</div><div class='ctx'> </div><div class='hunk'>@@ -760,14 +772,15 @@ int gpio_request(unsigned gpio, const char *label)</div><div class='ctx'> 	if (!gpio_is_valid(gpio))</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	desc = &amp;gpio_desc[gpio];</div><div class='del'>-	if (desc-&gt;chip == NULL)</div><div class='add'>+	chip = desc-&gt;chip;</div><div class='add'>+	if (chip == NULL)</div><div class='ctx'> 		goto done;</div><div class='ctx'> </div><div class='del'>-	if (!try_module_get(desc-&gt;chip-&gt;owner))</div><div class='add'>+	if (!try_module_get(chip-&gt;owner))</div><div class='ctx'> 		goto done;</div><div class='ctx'> </div><div class='ctx'> 	/* NOTE:  gpio_request() can be called in early boot,</div><div class='del'>-	 * before IRQs are enabled.</div><div class='add'>+	 * before IRQs are enabled, for non-sleeping (SOC) GPIOs.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	if (test_and_set_bit(FLAG_REQUESTED, &amp;desc-&gt;flags) == 0) {</div><div class='hunk'>@@ -775,7 +788,20 @@ int gpio_request(unsigned gpio, const char *label)</div><div class='ctx'> 		status = 0;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		status = -EBUSY;</div><div class='del'>-		module_put(desc-&gt;chip-&gt;owner);</div><div class='add'>+		module_put(chip-&gt;owner);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (chip-&gt;request) {</div><div class='add'>+		/* chip-&gt;request may sleep */</div><div class='add'>+		spin_unlock_irqrestore(&amp;gpio_lock, flags);</div><div class='add'>+		status = chip-&gt;request(chip, gpio - chip-&gt;base);</div><div class='add'>+		spin_lock_irqsave(&amp;gpio_lock, flags);</div><div class='add'>+</div><div class='add'>+		if (status &lt; 0) {</div><div class='add'>+			desc_set_label(desc, NULL);</div><div class='add'>+			module_put(chip-&gt;owner);</div><div class='add'>+			clear_bit(FLAG_REQUESTED, &amp;desc-&gt;flags);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> done:</div><div class='hunk'>@@ -791,6 +817,9 @@ void gpio_free(unsigned gpio)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long		flags;</div><div class='ctx'> 	struct gpio_desc	*desc;</div><div class='add'>+	struct gpio_chip	*chip;</div><div class='add'>+</div><div class='add'>+	might_sleep();</div><div class='ctx'> </div><div class='ctx'> 	if (!gpio_is_valid(gpio)) {</div><div class='ctx'> 		WARN_ON(extra_checks);</div><div class='hunk'>@@ -802,9 +831,17 @@ void gpio_free(unsigned gpio)</div><div class='ctx'> 	spin_lock_irqsave(&amp;gpio_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	desc = &amp;gpio_desc[gpio];</div><div class='del'>-	if (desc-&gt;chip &amp;&amp; test_and_clear_bit(FLAG_REQUESTED, &amp;desc-&gt;flags)) {</div><div class='add'>+	chip = desc-&gt;chip;</div><div class='add'>+	if (chip &amp;&amp; test_bit(FLAG_REQUESTED, &amp;desc-&gt;flags)) {</div><div class='add'>+		if (chip-&gt;free) {</div><div class='add'>+			spin_unlock_irqrestore(&amp;gpio_lock, flags);</div><div class='add'>+			might_sleep_if(extra_checks &amp;&amp; chip-&gt;can_sleep);</div><div class='add'>+			chip-&gt;free(chip, gpio - chip-&gt;base);</div><div class='add'>+			spin_lock_irqsave(&amp;gpio_lock, flags);</div><div class='add'>+		}</div><div class='ctx'> 		desc_set_label(desc, NULL);</div><div class='ctx'> 		module_put(desc-&gt;chip-&gt;owner);</div><div class='add'>+		clear_bit(FLAG_REQUESTED, &amp;desc-&gt;flags);</div><div class='ctx'> 	} else</div><div class='ctx'> 		WARN_ON(extra_checks);</div><div class='ctx'> </div><div class='hunk'>@@ -869,7 +906,9 @@ int gpio_direction_input(unsigned gpio)</div><div class='ctx'> 	gpio -= chip-&gt;base;</div><div class='ctx'> 	if (gpio &gt;= chip-&gt;ngpio)</div><div class='ctx'> 		goto fail;</div><div class='del'>-	gpio_ensure_requested(desc);</div><div class='add'>+	status = gpio_ensure_requested(desc, gpio);</div><div class='add'>+	if (status &lt; 0)</div><div class='add'>+		goto fail;</div><div class='ctx'> </div><div class='ctx'> 	/* now we know the gpio is valid and chip won't vanish */</div><div class='ctx'> </div><div class='hunk'>@@ -877,9 +916,22 @@ int gpio_direction_input(unsigned gpio)</div><div class='ctx'> </div><div class='ctx'> 	might_sleep_if(extra_checks &amp;&amp; chip-&gt;can_sleep);</div><div class='ctx'> </div><div class='add'>+	if (status) {</div><div class='add'>+		status = chip-&gt;request(chip, gpio);</div><div class='add'>+		if (status &lt; 0) {</div><div class='add'>+			pr_debug("GPIO-%d: chip request fail, %d\n",</div><div class='add'>+				chip-&gt;base + gpio, status);</div><div class='add'>+			/* and it's not available to anyone else ...</div><div class='add'>+			 * gpio_request() is the fully clean solution.</div><div class='add'>+			 */</div><div class='add'>+			goto lose;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	status = chip-&gt;direction_input(chip, gpio);</div><div class='ctx'> 	if (status == 0)</div><div class='ctx'> 		clear_bit(FLAG_IS_OUT, &amp;desc-&gt;flags);</div><div class='add'>+lose:</div><div class='ctx'> 	return status;</div><div class='ctx'> fail:</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;gpio_lock, flags);</div><div class='hunk'>@@ -907,7 +959,9 @@ int gpio_direction_output(unsigned gpio, int value)</div><div class='ctx'> 	gpio -= chip-&gt;base;</div><div class='ctx'> 	if (gpio &gt;= chip-&gt;ngpio)</div><div class='ctx'> 		goto fail;</div><div class='del'>-	gpio_ensure_requested(desc);</div><div class='add'>+	status = gpio_ensure_requested(desc, gpio);</div><div class='add'>+	if (status &lt; 0)</div><div class='add'>+		goto fail;</div><div class='ctx'> </div><div class='ctx'> 	/* now we know the gpio is valid and chip won't vanish */</div><div class='ctx'> </div><div class='hunk'>@@ -915,9 +969,22 @@ int gpio_direction_output(unsigned gpio, int value)</div><div class='ctx'> </div><div class='ctx'> 	might_sleep_if(extra_checks &amp;&amp; chip-&gt;can_sleep);</div><div class='ctx'> </div><div class='add'>+	if (status) {</div><div class='add'>+		status = chip-&gt;request(chip, gpio);</div><div class='add'>+		if (status &lt; 0) {</div><div class='add'>+			pr_debug("GPIO-%d: chip request fail, %d\n",</div><div class='add'>+				chip-&gt;base + gpio, status);</div><div class='add'>+			/* and it's not available to anyone else ...</div><div class='add'>+			 * gpio_request() is the fully clean solution.</div><div class='add'>+			 */</div><div class='add'>+			goto lose;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	status = chip-&gt;direction_output(chip, gpio, value);</div><div class='ctx'> 	if (status == 0)</div><div class='ctx'> 		set_bit(FLAG_IS_OUT, &amp;desc-&gt;flags);</div><div class='add'>+lose:</div><div class='ctx'> 	return status;</div><div class='ctx'> fail:</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;gpio_lock, flags);</div><div class='hunk'>@@ -1008,6 +1075,24 @@ int __gpio_cansleep(unsigned gpio)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(__gpio_cansleep);</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * __gpio_to_irq() - return the IRQ corresponding to a GPIO</div><div class='add'>+ * @gpio: gpio whose IRQ will be returned (already requested)</div><div class='add'>+ * Context: any</div><div class='add'>+ *</div><div class='add'>+ * This is used directly or indirectly to implement gpio_to_irq().</div><div class='add'>+ * It returns the number of the IRQ signaled by this (input) GPIO,</div><div class='add'>+ * or a negative errno.</div><div class='add'>+ */</div><div class='add'>+int __gpio_to_irq(unsigned gpio)</div><div class='add'>+{</div><div class='add'>+	struct gpio_chip	*chip;</div><div class='add'>+</div><div class='add'>+	chip = gpio_to_chip(gpio);</div><div class='add'>+	return chip-&gt;to_irq ? chip-&gt;to_irq(chip, gpio - chip-&gt;base) : -ENXIO;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(__gpio_to_irq);</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* There's no value in making it easy to inline GPIO calls that may sleep.</div><div class='head'>diff --git a/drivers/gpio/max7301.c b/drivers/gpio/max7301.c<br/>index 39c795ad8312..8b24d784db93 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpio/max7301.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/gpio/max7301.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpio/max7301.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpio/max7301.c</a></div><div class='hunk'>@@ -255,10 +255,6 @@ static int __devinit max7301_probe(struct spi_device *spi)</div><div class='ctx'> 	ts-&gt;chip.dev = &amp;spi-&gt;dev;</div><div class='ctx'> 	ts-&gt;chip.owner = THIS_MODULE;</div><div class='ctx'> </div><div class='del'>-	ret = gpiochip_add(&amp;ts-&gt;chip);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto exit_destroy;</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * tristate all pins in hardware and cache the</div><div class='ctx'> 	 * register values for later use.</div><div class='hunk'>@@ -269,17 +265,19 @@ static int __devinit max7301_probe(struct spi_device *spi)</div><div class='ctx'> 		max7301_write(spi, 0x08 + i, 0xAA);</div><div class='ctx'> 		ts-&gt;port_config[i] = 0xAA;</div><div class='ctx'> 		for (j = 0; j &lt; 4; j++) {</div><div class='del'>-			int idx = ts-&gt;chip.base + (i - 1) * 4 + j;</div><div class='del'>-			ret = gpio_direction_input(idx);</div><div class='add'>+			int offset = (i - 1) * 4 + j;</div><div class='add'>+			ret = max7301_direction_input(&amp;ts-&gt;chip, offset);</div><div class='ctx'> 			if (ret)</div><div class='del'>-				goto exit_remove;</div><div class='del'>-			gpio_free(idx);</div><div class='add'>+				goto exit_destroy;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	ret = gpiochip_add(&amp;ts-&gt;chip);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto exit_destroy;</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> </div><div class='del'>-exit_remove:</div><div class='del'>-	gpiochip_remove(&amp;ts-&gt;chip);</div><div class='ctx'> exit_destroy:</div><div class='ctx'> 	dev_set_drvdata(&amp;spi-&gt;dev, NULL);</div><div class='ctx'> 	mutex_destroy(&amp;ts-&gt;lock);</div><div class='hunk'>@@ -325,13 +323,15 @@ static int __init max7301_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	return spi_register_driver(&amp;max7301_driver);</div><div class='ctx'> }</div><div class='add'>+/* register after spi postcore initcall and before</div><div class='add'>+ * subsys initcalls that may rely on these GPIOs</div><div class='add'>+ */</div><div class='add'>+subsys_initcall(max7301_init);</div><div class='ctx'> </div><div class='ctx'> static void __exit max7301_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	spi_unregister_driver(&amp;max7301_driver);</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-module_init(max7301_init);</div><div class='ctx'> module_exit(max7301_exit);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Juergen Beisert");</div><div class='head'>diff --git a/drivers/gpio/max732x.c b/drivers/gpio/max732x.c<br/>index b51c8135ca28..55ae9a41897a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpio/max732x.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/gpio/max732x.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpio/max732x.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpio/max732x.c</a></div><div class='hunk'>@@ -372,7 +372,10 @@ static int __init max732x_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	return i2c_add_driver(&amp;max732x_driver);</div><div class='ctx'> }</div><div class='del'>-module_init(max732x_init);</div><div class='add'>+/* register after i2c postcore initcall and before</div><div class='add'>+ * subsys initcalls that may rely on these GPIOs</div><div class='add'>+ */</div><div class='add'>+subsys_initcall(max732x_init);</div><div class='ctx'> </div><div class='ctx'> static void __exit max732x_exit(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/gpio/mcp23s08.c b/drivers/gpio/mcp23s08.c<br/>index 8a1b405fefda..89c1d222e9d1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpio/mcp23s08.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/gpio/mcp23s08.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpio/mcp23s08.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpio/mcp23s08.c</a></div><div class='hunk'>@@ -419,7 +419,10 @@ static int __init mcp23s08_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	return spi_register_driver(&amp;mcp23s08_driver);</div><div class='ctx'> }</div><div class='del'>-module_init(mcp23s08_init);</div><div class='add'>+/* register after spi postcore initcall and before</div><div class='add'>+ * subsys initcalls that may rely on these GPIOs</div><div class='add'>+ */</div><div class='add'>+subsys_initcall(mcp23s08_init);</div><div class='ctx'> </div><div class='ctx'> static void __exit mcp23s08_exit(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/gpio/pca953x.c b/drivers/gpio/pca953x.c<br/>index cc8468692ae0..9ceeb89f1325 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpio/pca953x.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/gpio/pca953x.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpio/pca953x.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpio/pca953x.c</a></div><div class='hunk'>@@ -289,7 +289,10 @@ static int __init pca953x_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	return i2c_add_driver(&amp;pca953x_driver);</div><div class='ctx'> }</div><div class='del'>-module_init(pca953x_init);</div><div class='add'>+/* register after i2c postcore initcall and before</div><div class='add'>+ * subsys initcalls that may rely on these GPIOs</div><div class='add'>+ */</div><div class='add'>+subsys_initcall(pca953x_init);</div><div class='ctx'> </div><div class='ctx'> static void __exit pca953x_exit(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/gpio/pcf857x.c b/drivers/gpio/pcf857x.c<br/>index fc9c6ae739ee..4bc2070dd4a1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpio/pcf857x.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/gpio/pcf857x.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpio/pcf857x.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpio/pcf857x.c</a></div><div class='hunk'>@@ -351,7 +351,10 @@ static int __init pcf857x_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	return i2c_add_driver(&amp;pcf857x_driver);</div><div class='ctx'> }</div><div class='del'>-module_init(pcf857x_init);</div><div class='add'>+/* register after i2c postcore initcall and before</div><div class='add'>+ * subsys initcalls that may rely on these GPIOs</div><div class='add'>+ */</div><div class='add'>+subsys_initcall(pcf857x_init);</div><div class='ctx'> </div><div class='ctx'> static void __exit pcf857x_exit(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig<br/>index 610d6fd5bb50..9097500de5f4 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpu/drm/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/gpu/drm/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpu/drm/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/Kconfig</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'> #</div><div class='ctx'> menuconfig DRM</div><div class='ctx'> 	tristate "Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)"</div><div class='del'>-	depends on (AGP || AGP=n) &amp;&amp; PCI &amp;&amp; !EMULATED_CMPXCHG</div><div class='add'>+	depends on (AGP || AGP=n) &amp;&amp; PCI &amp;&amp; !EMULATED_CMPXCHG &amp;&amp; SHMEM</div><div class='ctx'> 	help</div><div class='ctx'> 	  Kernel-level support for the Direct Rendering Infrastructure (DRI)</div><div class='ctx'> 	  introduced in XFree86 4.0. If you say Y here, you need to select</div><div class='hunk'>@@ -87,6 +87,7 @@ config DRM_MGA</div><div class='ctx'> config DRM_SIS</div><div class='ctx'> 	tristate "SiS video cards"</div><div class='ctx'> 	depends on DRM &amp;&amp; AGP</div><div class='add'>+	depends on FB_SIS || FB_SIS=n</div><div class='ctx'> 	help</div><div class='ctx'> 	  Choose this option if you have a SiS 630 or compatible video</div><div class='ctx'>           chipset. If M is selected the module will be called sis. AGP</div><div class='head'>diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile<br/>index e9f9a97ae00a..74da99495e21 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpu/drm/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/gpu/drm/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpu/drm/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/Makefile</a></div><div class='hunk'>@@ -4,8 +4,9 @@</div><div class='ctx'> </div><div class='ctx'> ccflags-y := -Iinclude/drm</div><div class='ctx'> </div><div class='del'>-drm-y       :=	drm_auth.o drm_bufs.o drm_context.o drm_dma.o drm_drawable.o \</div><div class='del'>-		drm_drv.o drm_fops.o drm_ioctl.o drm_irq.o \</div><div class='add'>+drm-y       :=	drm_auth.o drm_bufs.o drm_cache.o \</div><div class='add'>+		drm_context.o drm_dma.o drm_drawable.o \</div><div class='add'>+		drm_drv.o drm_fops.o drm_gem.o drm_ioctl.o drm_irq.o \</div><div class='ctx'> 		drm_lock.o drm_memory.o drm_proc.o drm_stub.o drm_vm.o \</div><div class='ctx'> 		drm_agpsupport.o drm_scatter.o ati_pcigart.o drm_pci.o \</div><div class='ctx'> 		drm_sysfs.o drm_hashtab.o drm_sman.o drm_mm.o</div><div class='head'>diff --git a/drivers/gpu/drm/drm_agpsupport.c b/drivers/gpu/drm/drm_agpsupport.c<br/>index aefa5ac4c0b1..3d33b8252b58 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpu/drm/drm_agpsupport.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/gpu/drm/drm_agpsupport.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpu/drm/drm_agpsupport.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/drm_agpsupport.c</a></div><div class='hunk'>@@ -33,6 +33,7 @@</div><div class='ctx'> </div><div class='ctx'> #include "drmP.h"</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;asm/agp.h&gt;</div><div class='ctx'> </div><div class='ctx'> #if __OS_HAS_AGP</div><div class='ctx'> </div><div class='hunk'>@@ -452,4 +453,53 @@ int drm_agp_unbind_memory(DRM_AGP_MEM * handle)</div><div class='ctx'> 	return agp_unbind_memory(handle);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#endif				/* __OS_HAS_AGP */</div><div class='add'>+/**</div><div class='add'>+ * Binds a collection of pages into AGP memory at the given offset, returning</div><div class='add'>+ * the AGP memory structure containing them.</div><div class='add'>+ *</div><div class='add'>+ * No reference is held on the pages during this time -- it is up to the</div><div class='add'>+ * caller to handle that.</div><div class='add'>+ */</div><div class='add'>+DRM_AGP_MEM *</div><div class='add'>+drm_agp_bind_pages(struct drm_device *dev,</div><div class='add'>+		   struct page **pages,</div><div class='add'>+		   unsigned long num_pages,</div><div class='add'>+		   uint32_t gtt_offset,</div><div class='add'>+		   u32 type)</div><div class='add'>+{</div><div class='add'>+	DRM_AGP_MEM *mem;</div><div class='add'>+	int ret, i;</div><div class='add'>+</div><div class='add'>+	DRM_DEBUG("\n");</div><div class='add'>+</div><div class='add'>+	mem = drm_agp_allocate_memory(dev-&gt;agp-&gt;bridge, num_pages,</div><div class='add'>+				      type);</div><div class='add'>+	if (mem == NULL) {</div><div class='add'>+		DRM_ERROR("Failed to allocate memory for %ld pages\n",</div><div class='add'>+			  num_pages);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num_pages; i++)</div><div class='add'>+		mem-&gt;memory[i] = phys_to_gart(page_to_phys(pages[i]));</div><div class='add'>+	mem-&gt;page_count = num_pages;</div><div class='add'>+</div><div class='add'>+	mem-&gt;is_flushed = true;</div><div class='add'>+	ret = drm_agp_bind_memory(mem, gtt_offset / PAGE_SIZE);</div><div class='add'>+	if (ret != 0) {</div><div class='add'>+		DRM_ERROR("Failed to bind AGP memory: %d\n", ret);</div><div class='add'>+		agp_free_memory(mem);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return mem;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(drm_agp_bind_pages);</div><div class='add'>+</div><div class='add'>+void drm_agp_chipset_flush(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	agp_flush_chipset(dev-&gt;agp-&gt;bridge);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(drm_agp_chipset_flush);</div><div class='add'>+</div><div class='add'>+#endif /* __OS_HAS_AGP */</div><div class='head'>diff --git a/drivers/gpu/drm/drm_cache.c b/drivers/gpu/drm/drm_cache.c<br/>new file mode 100644<br/>index 000000000000..0e994a0e46d4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpu/drm/drm_cache.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/drm_cache.c</a></div><div class='hunk'>@@ -0,0 +1,69 @@</div><div class='add'>+/**************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2006-2007 Tungsten Graphics, Inc., Cedar Park, TX., USA</div><div class='add'>+ * All Rights Reserved.</div><div class='add'>+ *</div><div class='add'>+ * Permission is hereby granted, free of charge, to any person obtaining a</div><div class='add'>+ * copy of this software and associated documentation files (the</div><div class='add'>+ * "Software"), to deal in the Software without restriction, including</div><div class='add'>+ * without limitation the rights to use, copy, modify, merge, publish,</div><div class='add'>+ * distribute, sub license, and/or sell copies of the Software, and to</div><div class='add'>+ * permit persons to whom the Software is furnished to do so, subject to</div><div class='add'>+ * the following conditions:</div><div class='add'>+ *</div><div class='add'>+ * The above copyright notice and this permission notice (including the</div><div class='add'>+ * next paragraph) shall be included in all copies or substantial portions</div><div class='add'>+ * of the Software.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR</div><div class='add'>+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL</div><div class='add'>+ * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,</div><div class='add'>+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR</div><div class='add'>+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE</div><div class='add'>+ * USE OR OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ **************************************************************************/</div><div class='add'>+/*</div><div class='add'>+ * Authors: Thomas Hellström &lt;thomas-at-tungstengraphics-dot-com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "drmP.h"</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_X86)</div><div class='add'>+static void</div><div class='add'>+drm_clflush_page(struct page *page)</div><div class='add'>+{</div><div class='add'>+	uint8_t *page_virtual;</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	if (unlikely(page == NULL))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	page_virtual = kmap_atomic(page, KM_USER0);</div><div class='add'>+	for (i = 0; i &lt; PAGE_SIZE; i += boot_cpu_data.x86_clflush_size)</div><div class='add'>+		clflush(page_virtual + i);</div><div class='add'>+	kunmap_atomic(page_virtual, KM_USER0);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+drm_clflush_pages(struct page *pages[], unsigned long num_pages)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_X86)</div><div class='add'>+	if (cpu_has_clflush) {</div><div class='add'>+		unsigned long i;</div><div class='add'>+</div><div class='add'>+		mb();</div><div class='add'>+		for (i = 0; i &lt; num_pages; ++i)</div><div class='add'>+			drm_clflush_page(*pages++);</div><div class='add'>+		mb();</div><div class='add'>+</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	wbinvd();</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(drm_clflush_pages);</div><div class='head'>diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c<br/>index 452c2d866ec5..96f416afc3f6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpu/drm/drm_drv.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/gpu/drm/drm_drv.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpu/drm/drm_drv.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/drm_drv.c</a></div><div class='hunk'>@@ -116,7 +116,13 @@ static struct drm_ioctl_desc drm_ioctls[] = {</div><div class='ctx'> </div><div class='ctx'> 	DRM_IOCTL_DEF(DRM_IOCTL_WAIT_VBLANK, drm_wait_vblank, 0),</div><div class='ctx'> </div><div class='add'>+	DRM_IOCTL_DEF(DRM_IOCTL_MODESET_CTL, drm_modeset_ctl, 0),</div><div class='add'>+</div><div class='ctx'> 	DRM_IOCTL_DEF(DRM_IOCTL_UPDATE_DRAW, drm_update_drawable_info, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),</div><div class='add'>+</div><div class='add'>+	DRM_IOCTL_DEF(DRM_IOCTL_GEM_CLOSE, drm_gem_close_ioctl, 0),</div><div class='add'>+	DRM_IOCTL_DEF(DRM_IOCTL_GEM_FLINK, drm_gem_flink_ioctl, DRM_AUTH),</div><div class='add'>+	DRM_IOCTL_DEF(DRM_IOCTL_GEM_OPEN, drm_gem_open_ioctl, DRM_AUTH),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define DRM_CORE_IOCTL_COUNT	ARRAY_SIZE( drm_ioctls )</div><div class='head'>diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c<br/>index 851a53f1acce..0d46627663b1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpu/drm/drm_fops.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/gpu/drm/drm_fops.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpu/drm/drm_fops.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/drm_fops.c</a></div><div class='hunk'>@@ -246,7 +246,7 @@ static int drm_open_helper(struct inode *inode, struct file *filp,</div><div class='ctx'> 	memset(priv, 0, sizeof(*priv));</div><div class='ctx'> 	filp-&gt;private_data = priv;</div><div class='ctx'> 	priv-&gt;filp = filp;</div><div class='del'>-	priv-&gt;uid = current-&gt;euid;</div><div class='add'>+	priv-&gt;uid = current_euid();</div><div class='ctx'> 	priv-&gt;pid = task_pid_nr(current);</div><div class='ctx'> 	priv-&gt;minor = idr_find(&amp;drm_minors_idr, minor_id);</div><div class='ctx'> 	priv-&gt;ioctl_count = 0;</div><div class='hunk'>@@ -256,6 +256,9 @@ static int drm_open_helper(struct inode *inode, struct file *filp,</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;priv-&gt;lhead);</div><div class='ctx'> </div><div class='add'>+	if (dev-&gt;driver-&gt;driver_features &amp; DRIVER_GEM)</div><div class='add'>+		drm_gem_open(dev, priv);</div><div class='add'>+</div><div class='ctx'> 	if (dev-&gt;driver-&gt;open) {</div><div class='ctx'> 		ret = dev-&gt;driver-&gt;open(dev, priv);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='hunk'>@@ -400,6 +403,9 @@ int drm_release(struct inode *inode, struct file *filp)</div><div class='ctx'> 		dev-&gt;driver-&gt;reclaim_buffers(dev, file_priv);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (dev-&gt;driver-&gt;driver_features &amp; DRIVER_GEM)</div><div class='add'>+		drm_gem_release(dev, file_priv);</div><div class='add'>+</div><div class='ctx'> 	drm_fasync(-1, filp, 0);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;ctxlist_mutex);</div><div class='head'>diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c<br/>new file mode 100644<br/>index 000000000000..ccd1afdede02<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpu/drm/drm_gem.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/drm_gem.c</a></div><div class='hunk'>@@ -0,0 +1,421 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright © 2008 Intel Corporation</div><div class='add'>+ *</div><div class='add'>+ * Permission is hereby granted, free of charge, to any person obtaining a</div><div class='add'>+ * copy of this software and associated documentation files (the "Software"),</div><div class='add'>+ * to deal in the Software without restriction, including without limitation</div><div class='add'>+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,</div><div class='add'>+ * and/or sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ * Software is furnished to do so, subject to the following conditions:</div><div class='add'>+ *</div><div class='add'>+ * The above copyright notice and this permission notice (including the next</div><div class='add'>+ * paragraph) shall be included in all copies or substantial portions of the</div><div class='add'>+ * Software.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR</div><div class='add'>+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL</div><div class='add'>+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER</div><div class='add'>+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS</div><div class='add'>+ * IN THE SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ * Authors:</div><div class='add'>+ *    Eric Anholt &lt;eric@anholt.net&gt;</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/file.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/mman.h&gt;</div><div class='add'>+#include &lt;linux/pagemap.h&gt;</div><div class='add'>+#include "drmP.h"</div><div class='add'>+</div><div class='add'>+/** @file drm_gem.c</div><div class='add'>+ *</div><div class='add'>+ * This file provides some of the base ioctls and library routines for</div><div class='add'>+ * the graphics memory manager implemented by each device driver.</div><div class='add'>+ *</div><div class='add'>+ * Because various devices have different requirements in terms of</div><div class='add'>+ * synchronization and migration strategies, implementing that is left up to</div><div class='add'>+ * the driver, and all that the general API provides should be generic --</div><div class='add'>+ * allocating objects, reading/writing data with the cpu, freeing objects.</div><div class='add'>+ * Even there, platform-dependent optimizations for reading/writing data with</div><div class='add'>+ * the CPU mean we'll likely hook those out to driver-specific calls.  However,</div><div class='add'>+ * the DRI2 implementation wants to have at least allocate/mmap be generic.</div><div class='add'>+ *</div><div class='add'>+ * The goal was to have swap-backed object allocation managed through</div><div class='add'>+ * struct file.  However, file descriptors as handles to a struct file have</div><div class='add'>+ * two major failings:</div><div class='add'>+ * - Process limits prevent more than 1024 or so being used at a time by</div><div class='add'>+ *   default.</div><div class='add'>+ * - Inability to allocate high fds will aggravate the X Server's select()</div><div class='add'>+ *   handling, and likely that of many GL client applications as well.</div><div class='add'>+ *</div><div class='add'>+ * This led to a plan of using our own integer IDs (called handles, following</div><div class='add'>+ * DRM terminology) to mimic fds, and implement the fd syscalls we need as</div><div class='add'>+ * ioctls.  The objects themselves will still include the struct file so</div><div class='add'>+ * that we can transition to fds if the required kernel infrastructure shows</div><div class='add'>+ * up at a later date, and as our interface with shmfs for memory allocation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Initialize the GEM device fields</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+drm_gem_init(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	spin_lock_init(&amp;dev-&gt;object_name_lock);</div><div class='add'>+	idr_init(&amp;dev-&gt;object_name_idr);</div><div class='add'>+	atomic_set(&amp;dev-&gt;object_count, 0);</div><div class='add'>+	atomic_set(&amp;dev-&gt;object_memory, 0);</div><div class='add'>+	atomic_set(&amp;dev-&gt;pin_count, 0);</div><div class='add'>+	atomic_set(&amp;dev-&gt;pin_memory, 0);</div><div class='add'>+	atomic_set(&amp;dev-&gt;gtt_count, 0);</div><div class='add'>+	atomic_set(&amp;dev-&gt;gtt_memory, 0);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Allocate a GEM object of the specified size with shmfs backing store</div><div class='add'>+ */</div><div class='add'>+struct drm_gem_object *</div><div class='add'>+drm_gem_object_alloc(struct drm_device *dev, size_t size)</div><div class='add'>+{</div><div class='add'>+	struct drm_gem_object *obj;</div><div class='add'>+</div><div class='add'>+	BUG_ON((size &amp; (PAGE_SIZE - 1)) != 0);</div><div class='add'>+</div><div class='add'>+	obj = kcalloc(1, sizeof(*obj), GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	obj-&gt;dev = dev;</div><div class='add'>+	obj-&gt;filp = shmem_file_setup("drm mm object", size, 0);</div><div class='add'>+	if (IS_ERR(obj-&gt;filp)) {</div><div class='add'>+		kfree(obj);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kref_init(&amp;obj-&gt;refcount);</div><div class='add'>+	kref_init(&amp;obj-&gt;handlecount);</div><div class='add'>+	obj-&gt;size = size;</div><div class='add'>+	if (dev-&gt;driver-&gt;gem_init_object != NULL &amp;&amp;</div><div class='add'>+	    dev-&gt;driver-&gt;gem_init_object(obj) != 0) {</div><div class='add'>+		fput(obj-&gt;filp);</div><div class='add'>+		kfree(obj);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+	atomic_inc(&amp;dev-&gt;object_count);</div><div class='add'>+	atomic_add(obj-&gt;size, &amp;dev-&gt;object_memory);</div><div class='add'>+	return obj;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(drm_gem_object_alloc);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Removes the mapping from handle to filp for this object.</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+drm_gem_handle_delete(struct drm_file *filp, int handle)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev;</div><div class='add'>+	struct drm_gem_object *obj;</div><div class='add'>+</div><div class='add'>+	/* This is gross. The idr system doesn't let us try a delete and</div><div class='add'>+	 * return an error code.  It just spews if you fail at deleting.</div><div class='add'>+	 * So, we have to grab a lock around finding the object and then</div><div class='add'>+	 * doing the delete on it and dropping the refcount, or the user</div><div class='add'>+	 * could race us to double-decrement the refcount and cause a</div><div class='add'>+	 * use-after-free later.  Given the frequency of our handle lookups,</div><div class='add'>+	 * we may want to use ida for number allocation and a hash table</div><div class='add'>+	 * for the pointers, anyway.</div><div class='add'>+	 */</div><div class='add'>+	spin_lock(&amp;filp-&gt;table_lock);</div><div class='add'>+</div><div class='add'>+	/* Check if we currently have a reference on the object */</div><div class='add'>+	obj = idr_find(&amp;filp-&gt;object_idr, handle);</div><div class='add'>+	if (obj == NULL) {</div><div class='add'>+		spin_unlock(&amp;filp-&gt;table_lock);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	dev = obj-&gt;dev;</div><div class='add'>+</div><div class='add'>+	/* Release reference and decrement refcount. */</div><div class='add'>+	idr_remove(&amp;filp-&gt;object_idr, handle);</div><div class='add'>+	spin_unlock(&amp;filp-&gt;table_lock);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+	drm_gem_object_handle_unreference(obj);</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Create a handle for this object. This adds a handle reference</div><div class='add'>+ * to the object, which includes a regular reference count. Callers</div><div class='add'>+ * will likely want to dereference the object afterwards.</div><div class='add'>+ */</div><div class='add'>+int</div><div class='add'>+drm_gem_handle_create(struct drm_file *file_priv,</div><div class='add'>+		       struct drm_gem_object *obj,</div><div class='add'>+		       int *handlep)</div><div class='add'>+{</div><div class='add'>+	int	ret;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Get the user-visible handle using idr.</div><div class='add'>+	 */</div><div class='add'>+again:</div><div class='add'>+	/* ensure there is space available to allocate a handle */</div><div class='add'>+	if (idr_pre_get(&amp;file_priv-&gt;object_idr, GFP_KERNEL) == 0)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* do the allocation under our spinlock */</div><div class='add'>+	spin_lock(&amp;file_priv-&gt;table_lock);</div><div class='add'>+	ret = idr_get_new_above(&amp;file_priv-&gt;object_idr, obj, 1, handlep);</div><div class='add'>+	spin_unlock(&amp;file_priv-&gt;table_lock);</div><div class='add'>+	if (ret == -EAGAIN)</div><div class='add'>+		goto again;</div><div class='add'>+</div><div class='add'>+	if (ret != 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	drm_gem_object_handle_reference(obj);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(drm_gem_handle_create);</div><div class='add'>+</div><div class='add'>+/** Returns a reference to the object named by the handle. */</div><div class='add'>+struct drm_gem_object *</div><div class='add'>+drm_gem_object_lookup(struct drm_device *dev, struct drm_file *filp,</div><div class='add'>+		      int handle)</div><div class='add'>+{</div><div class='add'>+	struct drm_gem_object *obj;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;filp-&gt;table_lock);</div><div class='add'>+</div><div class='add'>+	/* Check if we currently have a reference on the object */</div><div class='add'>+	obj = idr_find(&amp;filp-&gt;object_idr, handle);</div><div class='add'>+	if (obj == NULL) {</div><div class='add'>+		spin_unlock(&amp;filp-&gt;table_lock);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	drm_gem_object_reference(obj);</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;filp-&gt;table_lock);</div><div class='add'>+</div><div class='add'>+	return obj;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(drm_gem_object_lookup);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Releases the handle to an mm object.</div><div class='add'>+ */</div><div class='add'>+int</div><div class='add'>+drm_gem_close_ioctl(struct drm_device *dev, void *data,</div><div class='add'>+		    struct drm_file *file_priv)</div><div class='add'>+{</div><div class='add'>+	struct drm_gem_close *args = data;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!(dev-&gt;driver-&gt;driver_features &amp; DRIVER_GEM))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	ret = drm_gem_handle_delete(file_priv, args-&gt;handle);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Create a global name for an object, returning the name.</div><div class='add'>+ *</div><div class='add'>+ * Note that the name does not hold a reference; when the object</div><div class='add'>+ * is freed, the name goes away.</div><div class='add'>+ */</div><div class='add'>+int</div><div class='add'>+drm_gem_flink_ioctl(struct drm_device *dev, void *data,</div><div class='add'>+		    struct drm_file *file_priv)</div><div class='add'>+{</div><div class='add'>+	struct drm_gem_flink *args = data;</div><div class='add'>+	struct drm_gem_object *obj;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!(dev-&gt;driver-&gt;driver_features &amp; DRIVER_GEM))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	obj = drm_gem_object_lookup(dev, file_priv, args-&gt;handle);</div><div class='add'>+	if (obj == NULL)</div><div class='add'>+		return -EBADF;</div><div class='add'>+</div><div class='add'>+again:</div><div class='add'>+	if (idr_pre_get(&amp;dev-&gt;object_name_idr, GFP_KERNEL) == 0)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;dev-&gt;object_name_lock);</div><div class='add'>+	if (obj-&gt;name) {</div><div class='add'>+		args-&gt;name = obj-&gt;name;</div><div class='add'>+		spin_unlock(&amp;dev-&gt;object_name_lock);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	ret = idr_get_new_above(&amp;dev-&gt;object_name_idr, obj, 1,</div><div class='add'>+				 &amp;obj-&gt;name);</div><div class='add'>+	spin_unlock(&amp;dev-&gt;object_name_lock);</div><div class='add'>+	if (ret == -EAGAIN)</div><div class='add'>+		goto again;</div><div class='add'>+</div><div class='add'>+	if (ret != 0) {</div><div class='add'>+		mutex_lock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+		drm_gem_object_unreference(obj);</div><div class='add'>+		mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Leave the reference from the lookup around as the</div><div class='add'>+	 * name table now holds one</div><div class='add'>+	 */</div><div class='add'>+	args-&gt;name = (uint64_t) obj-&gt;name;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Open an object using the global name, returning a handle and the size.</div><div class='add'>+ *</div><div class='add'>+ * This handle (of course) holds a reference to the object, so the object</div><div class='add'>+ * will not go away until the handle is deleted.</div><div class='add'>+ */</div><div class='add'>+int</div><div class='add'>+drm_gem_open_ioctl(struct drm_device *dev, void *data,</div><div class='add'>+		   struct drm_file *file_priv)</div><div class='add'>+{</div><div class='add'>+	struct drm_gem_open *args = data;</div><div class='add'>+	struct drm_gem_object *obj;</div><div class='add'>+	int ret;</div><div class='add'>+	int handle;</div><div class='add'>+</div><div class='add'>+	if (!(dev-&gt;driver-&gt;driver_features &amp; DRIVER_GEM))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;dev-&gt;object_name_lock);</div><div class='add'>+	obj = idr_find(&amp;dev-&gt;object_name_idr, (int) args-&gt;name);</div><div class='add'>+	if (obj)</div><div class='add'>+		drm_gem_object_reference(obj);</div><div class='add'>+	spin_unlock(&amp;dev-&gt;object_name_lock);</div><div class='add'>+	if (!obj)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	ret = drm_gem_handle_create(file_priv, obj, &amp;handle);</div><div class='add'>+	mutex_lock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+	drm_gem_object_unreference(obj);</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	args-&gt;handle = handle;</div><div class='add'>+	args-&gt;size = obj-&gt;size;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Called at device open time, sets up the structure for handling refcounting</div><div class='add'>+ * of mm objects.</div><div class='add'>+ */</div><div class='add'>+void</div><div class='add'>+drm_gem_open(struct drm_device *dev, struct drm_file *file_private)</div><div class='add'>+{</div><div class='add'>+	idr_init(&amp;file_private-&gt;object_idr);</div><div class='add'>+	spin_lock_init(&amp;file_private-&gt;table_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Called at device close to release the file's</div><div class='add'>+ * handle references on objects.</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+drm_gem_object_release_handle(int id, void *ptr, void *data)</div><div class='add'>+{</div><div class='add'>+	struct drm_gem_object *obj = ptr;</div><div class='add'>+</div><div class='add'>+	drm_gem_object_handle_unreference(obj);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Called at close time when the filp is going away.</div><div class='add'>+ *</div><div class='add'>+ * Releases any remaining references on objects by this filp.</div><div class='add'>+ */</div><div class='add'>+void</div><div class='add'>+drm_gem_release(struct drm_device *dev, struct drm_file *file_private)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+	idr_for_each(&amp;file_private-&gt;object_idr,</div><div class='add'>+		     &amp;drm_gem_object_release_handle, NULL);</div><div class='add'>+</div><div class='add'>+	idr_destroy(&amp;file_private-&gt;object_idr);</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Called after the last reference to the object has been lost.</div><div class='add'>+ *</div><div class='add'>+ * Frees the object</div><div class='add'>+ */</div><div class='add'>+void</div><div class='add'>+drm_gem_object_free(struct kref *kref)</div><div class='add'>+{</div><div class='add'>+	struct drm_gem_object *obj = (struct drm_gem_object *) kref;</div><div class='add'>+	struct drm_device *dev = obj-&gt;dev;</div><div class='add'>+</div><div class='add'>+	BUG_ON(!mutex_is_locked(&amp;dev-&gt;struct_mutex));</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;driver-&gt;gem_free_object != NULL)</div><div class='add'>+		dev-&gt;driver-&gt;gem_free_object(obj);</div><div class='add'>+</div><div class='add'>+	fput(obj-&gt;filp);</div><div class='add'>+	atomic_dec(&amp;dev-&gt;object_count);</div><div class='add'>+	atomic_sub(obj-&gt;size, &amp;dev-&gt;object_memory);</div><div class='add'>+	kfree(obj);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(drm_gem_object_free);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Called after the last handle to the object has been closed</div><div class='add'>+ *</div><div class='add'>+ * Removes any name for the object. Note that this must be</div><div class='add'>+ * called before drm_gem_object_free or we'll be touching</div><div class='add'>+ * freed memory</div><div class='add'>+ */</div><div class='add'>+void</div><div class='add'>+drm_gem_object_handle_free(struct kref *kref)</div><div class='add'>+{</div><div class='add'>+	struct drm_gem_object *obj = container_of(kref,</div><div class='add'>+						  struct drm_gem_object,</div><div class='add'>+						  handlecount);</div><div class='add'>+	struct drm_device *dev = obj-&gt;dev;</div><div class='add'>+</div><div class='add'>+	/* Remove any name for this object */</div><div class='add'>+	spin_lock(&amp;dev-&gt;object_name_lock);</div><div class='add'>+	if (obj-&gt;name) {</div><div class='add'>+		idr_remove(&amp;dev-&gt;object_name_idr, obj-&gt;name);</div><div class='add'>+		spin_unlock(&amp;dev-&gt;object_name_lock);</div><div class='add'>+		/*</div><div class='add'>+		 * The object name held a reference to this object, drop</div><div class='add'>+		 * that now.</div><div class='add'>+		 */</div><div class='add'>+		drm_gem_object_unreference(obj);</div><div class='add'>+	} else</div><div class='add'>+		spin_unlock(&amp;dev-&gt;object_name_lock);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(drm_gem_object_handle_free);</div><div class='add'>+</div><div class='head'>diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c<br/>index 53f0e5af1cc8..4091b9e291f9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpu/drm/drm_irq.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/gpu/drm/drm_irq.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpu/drm/drm_irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/drm_irq.c</a></div><div class='hunk'>@@ -63,7 +63,7 @@ int drm_irq_by_busid(struct drm_device *dev, void *data,</div><div class='ctx'> 	    p-&gt;devnum != PCI_SLOT(dev-&gt;pdev-&gt;devfn) || p-&gt;funcnum != PCI_FUNC(dev-&gt;pdev-&gt;devfn))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	p-&gt;irq = dev-&gt;irq;</div><div class='add'>+	p-&gt;irq = dev-&gt;pdev-&gt;irq;</div><div class='ctx'> </div><div class='ctx'> 	DRM_DEBUG("%d:%d:%d =&gt; IRQ %d\n", p-&gt;busnum, p-&gt;devnum, p-&gt;funcnum,</div><div class='ctx'> 		  p-&gt;irq);</div><div class='hunk'>@@ -71,25 +71,137 @@ int drm_irq_by_busid(struct drm_device *dev, void *data,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void vblank_disable_fn(unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = (struct drm_device *)arg;</div><div class='add'>+	unsigned long irqflags;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!dev-&gt;vblank_disable_allowed)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; dev-&gt;num_crtcs; i++) {</div><div class='add'>+		spin_lock_irqsave(&amp;dev-&gt;vbl_lock, irqflags);</div><div class='add'>+		if (atomic_read(&amp;dev-&gt;vblank_refcount[i]) == 0 &amp;&amp;</div><div class='add'>+		    dev-&gt;vblank_enabled[i]) {</div><div class='add'>+			DRM_DEBUG("disabling vblank on crtc %d\n", i);</div><div class='add'>+			dev-&gt;last_vblank[i] =</div><div class='add'>+				dev-&gt;driver-&gt;get_vblank_counter(dev, i);</div><div class='add'>+			dev-&gt;driver-&gt;disable_vblank(dev, i);</div><div class='add'>+			dev-&gt;vblank_enabled[i] = 0;</div><div class='add'>+		}</div><div class='add'>+		spin_unlock_irqrestore(&amp;dev-&gt;vbl_lock, irqflags);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void drm_vblank_cleanup(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	/* Bail if the driver didn't call drm_vblank_init() */</div><div class='add'>+	if (dev-&gt;num_crtcs == 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	del_timer(&amp;dev-&gt;vblank_disable_timer);</div><div class='add'>+</div><div class='add'>+	vblank_disable_fn((unsigned long)dev);</div><div class='add'>+</div><div class='add'>+	drm_free(dev-&gt;vbl_queue, sizeof(*dev-&gt;vbl_queue) * dev-&gt;num_crtcs,</div><div class='add'>+		 DRM_MEM_DRIVER);</div><div class='add'>+	drm_free(dev-&gt;vbl_sigs, sizeof(*dev-&gt;vbl_sigs) * dev-&gt;num_crtcs,</div><div class='add'>+		 DRM_MEM_DRIVER);</div><div class='add'>+	drm_free(dev-&gt;_vblank_count, sizeof(*dev-&gt;_vblank_count) *</div><div class='add'>+		 dev-&gt;num_crtcs, DRM_MEM_DRIVER);</div><div class='add'>+	drm_free(dev-&gt;vblank_refcount, sizeof(*dev-&gt;vblank_refcount) *</div><div class='add'>+		 dev-&gt;num_crtcs, DRM_MEM_DRIVER);</div><div class='add'>+	drm_free(dev-&gt;vblank_enabled, sizeof(*dev-&gt;vblank_enabled) *</div><div class='add'>+		 dev-&gt;num_crtcs, DRM_MEM_DRIVER);</div><div class='add'>+	drm_free(dev-&gt;last_vblank, sizeof(*dev-&gt;last_vblank) * dev-&gt;num_crtcs,</div><div class='add'>+		 DRM_MEM_DRIVER);</div><div class='add'>+	drm_free(dev-&gt;vblank_inmodeset, sizeof(*dev-&gt;vblank_inmodeset) *</div><div class='add'>+		 dev-&gt;num_crtcs, DRM_MEM_DRIVER);</div><div class='add'>+</div><div class='add'>+	dev-&gt;num_crtcs = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int drm_vblank_init(struct drm_device *dev, int num_crtcs)</div><div class='add'>+{</div><div class='add'>+	int i, ret = -ENOMEM;</div><div class='add'>+</div><div class='add'>+	setup_timer(&amp;dev-&gt;vblank_disable_timer, vblank_disable_fn,</div><div class='add'>+		    (unsigned long)dev);</div><div class='add'>+	spin_lock_init(&amp;dev-&gt;vbl_lock);</div><div class='add'>+	atomic_set(&amp;dev-&gt;vbl_signal_pending, 0);</div><div class='add'>+	dev-&gt;num_crtcs = num_crtcs;</div><div class='add'>+</div><div class='add'>+	dev-&gt;vbl_queue = drm_alloc(sizeof(wait_queue_head_t) * num_crtcs,</div><div class='add'>+				   DRM_MEM_DRIVER);</div><div class='add'>+	if (!dev-&gt;vbl_queue)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	dev-&gt;vbl_sigs = drm_alloc(sizeof(struct list_head) * num_crtcs,</div><div class='add'>+				  DRM_MEM_DRIVER);</div><div class='add'>+	if (!dev-&gt;vbl_sigs)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	dev-&gt;_vblank_count = drm_alloc(sizeof(atomic_t) * num_crtcs,</div><div class='add'>+				      DRM_MEM_DRIVER);</div><div class='add'>+	if (!dev-&gt;_vblank_count)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	dev-&gt;vblank_refcount = drm_alloc(sizeof(atomic_t) * num_crtcs,</div><div class='add'>+					 DRM_MEM_DRIVER);</div><div class='add'>+	if (!dev-&gt;vblank_refcount)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	dev-&gt;vblank_enabled = drm_calloc(num_crtcs, sizeof(int),</div><div class='add'>+					 DRM_MEM_DRIVER);</div><div class='add'>+	if (!dev-&gt;vblank_enabled)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	dev-&gt;last_vblank = drm_calloc(num_crtcs, sizeof(u32), DRM_MEM_DRIVER);</div><div class='add'>+	if (!dev-&gt;last_vblank)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	dev-&gt;vblank_inmodeset = drm_calloc(num_crtcs, sizeof(int),</div><div class='add'>+					 DRM_MEM_DRIVER);</div><div class='add'>+	if (!dev-&gt;vblank_inmodeset)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	/* Zero per-crtc vblank stuff */</div><div class='add'>+	for (i = 0; i &lt; num_crtcs; i++) {</div><div class='add'>+		init_waitqueue_head(&amp;dev-&gt;vbl_queue[i]);</div><div class='add'>+		INIT_LIST_HEAD(&amp;dev-&gt;vbl_sigs[i]);</div><div class='add'>+		atomic_set(&amp;dev-&gt;_vblank_count[i], 0);</div><div class='add'>+		atomic_set(&amp;dev-&gt;vblank_refcount[i], 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev-&gt;vblank_disable_allowed = 0;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	drm_vblank_cleanup(dev);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(drm_vblank_init);</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * Install IRQ handler.</div><div class='ctx'>  *</div><div class='ctx'>  * \param dev DRM device.</div><div class='del'>- * \param irq IRQ number.</div><div class='ctx'>  *</div><div class='del'>- * Initializes the IRQ related data, and setups drm_device::vbl_queue. Installs the handler, calling the driver</div><div class='add'>+ * Initializes the IRQ related data. Installs the handler, calling the driver</div><div class='ctx'>  * \c drm_driver_irq_preinstall() and \c drm_driver_irq_postinstall() functions</div><div class='ctx'>  * before and after the installation.</div><div class='ctx'>  */</div><div class='del'>-static int drm_irq_install(struct drm_device * dev)</div><div class='add'>+int drm_irq_install(struct drm_device *dev)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> 	unsigned long sh_flags = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!drm_core_check_feature(dev, DRIVER_HAVE_IRQ))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;irq == 0)</div><div class='add'>+	if (dev-&gt;pdev-&gt;irq == 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;struct_mutex);</div><div class='hunk'>@@ -107,18 +219,7 @@ static int drm_irq_install(struct drm_device * dev)</div><div class='ctx'> 	dev-&gt;irq_enabled = 1;</div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='ctx'> </div><div class='del'>-	DRM_DEBUG("irq=%d\n", dev-&gt;irq);</div><div class='del'>-</div><div class='del'>-	if (drm_core_check_feature(dev, DRIVER_IRQ_VBL)) {</div><div class='del'>-		init_waitqueue_head(&amp;dev-&gt;vbl_queue);</div><div class='del'>-</div><div class='del'>-		spin_lock_init(&amp;dev-&gt;vbl_lock);</div><div class='del'>-</div><div class='del'>-		INIT_LIST_HEAD(&amp;dev-&gt;vbl_sigs);</div><div class='del'>-		INIT_LIST_HEAD(&amp;dev-&gt;vbl_sigs2);</div><div class='del'>-</div><div class='del'>-		dev-&gt;vbl_pending = 0;</div><div class='del'>-	}</div><div class='add'>+	DRM_DEBUG("irq=%d\n", dev-&gt;pdev-&gt;irq);</div><div class='ctx'> </div><div class='ctx'> 	/* Before installing handler */</div><div class='ctx'> 	dev-&gt;driver-&gt;irq_preinstall(dev);</div><div class='hunk'>@@ -127,8 +228,9 @@ static int drm_irq_install(struct drm_device * dev)</div><div class='ctx'> 	if (drm_core_check_feature(dev, DRIVER_IRQ_SHARED))</div><div class='ctx'> 		sh_flags = IRQF_SHARED;</div><div class='ctx'> </div><div class='del'>-	ret = request_irq(dev-&gt;irq, dev-&gt;driver-&gt;irq_handler,</div><div class='add'>+	ret = request_irq(drm_dev_to_irq(dev), dev-&gt;driver-&gt;irq_handler,</div><div class='ctx'> 			  sh_flags, dev-&gt;devname, dev);</div><div class='add'>+</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		mutex_lock(&amp;dev-&gt;struct_mutex);</div><div class='ctx'> 		dev-&gt;irq_enabled = 0;</div><div class='hunk'>@@ -137,10 +239,16 @@ static int drm_irq_install(struct drm_device * dev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* After installing handler */</div><div class='del'>-	dev-&gt;driver-&gt;irq_postinstall(dev);</div><div class='add'>+	ret = dev-&gt;driver-&gt;irq_postinstall(dev);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		mutex_lock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+		dev-&gt;irq_enabled = 0;</div><div class='add'>+		mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(drm_irq_install);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * Uninstall the IRQ handler.</div><div class='hunk'>@@ -164,17 +272,18 @@ int drm_irq_uninstall(struct drm_device * dev)</div><div class='ctx'> 	if (!irq_enabled)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	DRM_DEBUG("irq=%d\n", dev-&gt;irq);</div><div class='add'>+	DRM_DEBUG("irq=%d\n", dev-&gt;pdev-&gt;irq);</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;driver-&gt;irq_uninstall(dev);</div><div class='ctx'> </div><div class='del'>-	free_irq(dev-&gt;irq, dev);</div><div class='add'>+	free_irq(dev-&gt;pdev-&gt;irq, dev);</div><div class='add'>+</div><div class='add'>+	drm_vblank_cleanup(dev);</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;locked_tasklet_func = NULL;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(drm_irq_uninstall);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -201,7 +310,7 @@ int drm_control(struct drm_device *dev, void *data,</div><div class='ctx'> 		if (!drm_core_check_feature(dev, DRIVER_HAVE_IRQ))</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		if (dev-&gt;if_version &lt; DRM_IF_VERSION(1, 2) &amp;&amp;</div><div class='del'>-		    ctl-&gt;irq != dev-&gt;irq)</div><div class='add'>+		    ctl-&gt;irq != dev-&gt;pdev-&gt;irq)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		return drm_irq_install(dev);</div><div class='ctx'> 	case DRM_UNINST_HANDLER:</div><div class='hunk'>@@ -214,6 +323,174 @@ int drm_control(struct drm_device *dev, void *data,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * drm_vblank_count - retrieve "cooked" vblank counter value</div><div class='add'>+ * @dev: DRM device</div><div class='add'>+ * @crtc: which counter to retrieve</div><div class='add'>+ *</div><div class='add'>+ * Fetches the "cooked" vblank count value that represents the number of</div><div class='add'>+ * vblank events since the system was booted, including lost events due to</div><div class='add'>+ * modesetting activity.</div><div class='add'>+ */</div><div class='add'>+u32 drm_vblank_count(struct drm_device *dev, int crtc)</div><div class='add'>+{</div><div class='add'>+	return atomic_read(&amp;dev-&gt;_vblank_count[crtc]);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(drm_vblank_count);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * drm_update_vblank_count - update the master vblank counter</div><div class='add'>+ * @dev: DRM device</div><div class='add'>+ * @crtc: counter to update</div><div class='add'>+ *</div><div class='add'>+ * Call back into the driver to update the appropriate vblank counter</div><div class='add'>+ * (specified by @crtc).  Deal with wraparound, if it occurred, and</div><div class='add'>+ * update the last read value so we can deal with wraparound on the next</div><div class='add'>+ * call if necessary.</div><div class='add'>+ *</div><div class='add'>+ * Only necessary when going from off-&gt;on, to account for frames we</div><div class='add'>+ * didn't get an interrupt for.</div><div class='add'>+ *</div><div class='add'>+ * Note: caller must hold dev-&gt;vbl_lock since this reads &amp; writes</div><div class='add'>+ * device vblank fields.</div><div class='add'>+ */</div><div class='add'>+static void drm_update_vblank_count(struct drm_device *dev, int crtc)</div><div class='add'>+{</div><div class='add'>+	u32 cur_vblank, diff;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Interrupts were disabled prior to this call, so deal with counter</div><div class='add'>+	 * wrap if needed.</div><div class='add'>+	 * NOTE!  It's possible we lost a full dev-&gt;max_vblank_count events</div><div class='add'>+	 * here if the register is small or we had vblank interrupts off for</div><div class='add'>+	 * a long time.</div><div class='add'>+	 */</div><div class='add'>+	cur_vblank = dev-&gt;driver-&gt;get_vblank_counter(dev, crtc);</div><div class='add'>+	diff = cur_vblank - dev-&gt;last_vblank[crtc];</div><div class='add'>+	if (cur_vblank &lt; dev-&gt;last_vblank[crtc]) {</div><div class='add'>+		diff += dev-&gt;max_vblank_count;</div><div class='add'>+</div><div class='add'>+		DRM_DEBUG("last_vblank[%d]=0x%x, cur_vblank=0x%x =&gt; diff=0x%x\n",</div><div class='add'>+			  crtc, dev-&gt;last_vblank[crtc], cur_vblank, diff);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DRM_DEBUG("enabling vblank interrupts on crtc %d, missed %d\n",</div><div class='add'>+		  crtc, diff);</div><div class='add'>+</div><div class='add'>+	atomic_add(diff, &amp;dev-&gt;_vblank_count[crtc]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * drm_vblank_get - get a reference count on vblank events</div><div class='add'>+ * @dev: DRM device</div><div class='add'>+ * @crtc: which CRTC to own</div><div class='add'>+ *</div><div class='add'>+ * Acquire a reference count on vblank events to avoid having them disabled</div><div class='add'>+ * while in use.</div><div class='add'>+ *</div><div class='add'>+ * RETURNS</div><div class='add'>+ * Zero on success, nonzero on failure.</div><div class='add'>+ */</div><div class='add'>+int drm_vblank_get(struct drm_device *dev, int crtc)</div><div class='add'>+{</div><div class='add'>+	unsigned long irqflags;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;dev-&gt;vbl_lock, irqflags);</div><div class='add'>+	/* Going from 0-&gt;1 means we have to enable interrupts again */</div><div class='add'>+	if (atomic_add_return(1, &amp;dev-&gt;vblank_refcount[crtc]) == 1 &amp;&amp;</div><div class='add'>+	    !dev-&gt;vblank_enabled[crtc]) {</div><div class='add'>+		ret = dev-&gt;driver-&gt;enable_vblank(dev, crtc);</div><div class='add'>+		DRM_DEBUG("enabling vblank on crtc %d, ret: %d\n", crtc, ret);</div><div class='add'>+		if (ret)</div><div class='add'>+			atomic_dec(&amp;dev-&gt;vblank_refcount[crtc]);</div><div class='add'>+		else {</div><div class='add'>+			dev-&gt;vblank_enabled[crtc] = 1;</div><div class='add'>+			drm_update_vblank_count(dev, crtc);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;dev-&gt;vbl_lock, irqflags);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(drm_vblank_get);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * drm_vblank_put - give up ownership of vblank events</div><div class='add'>+ * @dev: DRM device</div><div class='add'>+ * @crtc: which counter to give up</div><div class='add'>+ *</div><div class='add'>+ * Release ownership of a given vblank counter, turning off interrupts</div><div class='add'>+ * if possible.</div><div class='add'>+ */</div><div class='add'>+void drm_vblank_put(struct drm_device *dev, int crtc)</div><div class='add'>+{</div><div class='add'>+	/* Last user schedules interrupt disable */</div><div class='add'>+	if (atomic_dec_and_test(&amp;dev-&gt;vblank_refcount[crtc]))</div><div class='add'>+		mod_timer(&amp;dev-&gt;vblank_disable_timer, jiffies + 5*DRM_HZ);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(drm_vblank_put);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * drm_modeset_ctl - handle vblank event counter changes across mode switch</div><div class='add'>+ * @DRM_IOCTL_ARGS: standard ioctl arguments</div><div class='add'>+ *</div><div class='add'>+ * Applications should call the %_DRM_PRE_MODESET and %_DRM_POST_MODESET</div><div class='add'>+ * ioctls around modesetting so that any lost vblank events are accounted for.</div><div class='add'>+ *</div><div class='add'>+ * Generally the counter will reset across mode sets.  If interrupts are</div><div class='add'>+ * enabled around this call, we don't have to do anything since the counter</div><div class='add'>+ * will have already been incremented.</div><div class='add'>+ */</div><div class='add'>+int drm_modeset_ctl(struct drm_device *dev, void *data,</div><div class='add'>+		    struct drm_file *file_priv)</div><div class='add'>+{</div><div class='add'>+	struct drm_modeset_ctl *modeset = data;</div><div class='add'>+	unsigned long irqflags;</div><div class='add'>+	int crtc, ret = 0;</div><div class='add'>+</div><div class='add'>+	/* If drm_vblank_init() hasn't been called yet, just no-op */</div><div class='add'>+	if (!dev-&gt;num_crtcs)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	crtc = modeset-&gt;crtc;</div><div class='add'>+	if (crtc &gt;= dev-&gt;num_crtcs) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * To avoid all the problems that might happen if interrupts</div><div class='add'>+	 * were enabled/disabled around or between these calls, we just</div><div class='add'>+	 * have the kernel take a reference on the CRTC (just once though</div><div class='add'>+	 * to avoid corrupting the count if multiple, mismatch calls occur),</div><div class='add'>+	 * so that interrupts remain enabled in the interim.</div><div class='add'>+	 */</div><div class='add'>+	switch (modeset-&gt;cmd) {</div><div class='add'>+	case _DRM_PRE_MODESET:</div><div class='add'>+		if (!dev-&gt;vblank_inmodeset[crtc]) {</div><div class='add'>+			dev-&gt;vblank_inmodeset[crtc] = 1;</div><div class='add'>+			drm_vblank_get(dev, crtc);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case _DRM_POST_MODESET:</div><div class='add'>+		if (dev-&gt;vblank_inmodeset[crtc]) {</div><div class='add'>+			spin_lock_irqsave(&amp;dev-&gt;vbl_lock, irqflags);</div><div class='add'>+			dev-&gt;vblank_disable_allowed = 1;</div><div class='add'>+			dev-&gt;vblank_inmodeset[crtc] = 0;</div><div class='add'>+			spin_unlock_irqrestore(&amp;dev-&gt;vbl_lock, irqflags);</div><div class='add'>+			drm_vblank_put(dev, crtc);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * Wait for VBLANK.</div><div class='ctx'>  *</div><div class='ctx'>  * \param inode device inode.</div><div class='hunk'>@@ -232,14 +509,14 @@ int drm_control(struct drm_device *dev, void *data,</div><div class='ctx'>  *</div><div class='ctx'>  * If a signal is not requested, then calls vblank_wait().</div><div class='ctx'>  */</div><div class='del'>-int drm_wait_vblank(struct drm_device *dev, void *data, struct drm_file *file_priv)</div><div class='add'>+int drm_wait_vblank(struct drm_device *dev, void *data,</div><div class='add'>+		    struct drm_file *file_priv)</div><div class='ctx'> {</div><div class='ctx'> 	union drm_wait_vblank *vblwait = data;</div><div class='del'>-	struct timeval now;</div><div class='ctx'> 	int ret = 0;</div><div class='del'>-	unsigned int flags, seq;</div><div class='add'>+	unsigned int flags, seq, crtc;</div><div class='ctx'> </div><div class='del'>-	if ((!dev-&gt;irq) || (!dev-&gt;irq_enabled))</div><div class='add'>+	if ((!dev-&gt;pdev-&gt;irq) || (!dev-&gt;irq_enabled))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (vblwait-&gt;request.type &amp;</div><div class='hunk'>@@ -251,13 +528,17 @@ int drm_wait_vblank(struct drm_device *dev, void *data, struct drm_file *file_pr</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	flags = vblwait-&gt;request.type &amp; _DRM_VBLANK_FLAGS_MASK;</div><div class='add'>+	crtc = flags &amp; _DRM_VBLANK_SECONDARY ? 1 : 0;</div><div class='ctx'> </div><div class='del'>-	if (!drm_core_check_feature(dev, (flags &amp; _DRM_VBLANK_SECONDARY) ?</div><div class='del'>-				    DRIVER_IRQ_VBL2 : DRIVER_IRQ_VBL))</div><div class='add'>+	if (crtc &gt;= dev-&gt;num_crtcs)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	seq = atomic_read((flags &amp; _DRM_VBLANK_SECONDARY) ? &amp;dev-&gt;vbl_received2</div><div class='del'>-			  : &amp;dev-&gt;vbl_received);</div><div class='add'>+	ret = drm_vblank_get(dev, crtc);</div><div class='add'>+	if (ret) {</div><div class='add'>+		DRM_ERROR("failed to acquire vblank counter, %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+	seq = drm_vblank_count(dev, crtc);</div><div class='ctx'> </div><div class='ctx'> 	switch (vblwait-&gt;request.type &amp; _DRM_VBLANK_TYPES_MASK) {</div><div class='ctx'> 	case _DRM_VBLANK_RELATIVE:</div><div class='hunk'>@@ -266,7 +547,8 @@ int drm_wait_vblank(struct drm_device *dev, void *data, struct drm_file *file_pr</div><div class='ctx'> 	case _DRM_VBLANK_ABSOLUTE:</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto done;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if ((flags &amp; _DRM_VBLANK_NEXTONMISS) &amp;&amp;</div><div class='hunk'>@@ -276,8 +558,7 @@ int drm_wait_vblank(struct drm_device *dev, void *data, struct drm_file *file_pr</div><div class='ctx'> </div><div class='ctx'> 	if (flags &amp; _DRM_VBLANK_SIGNAL) {</div><div class='ctx'> 		unsigned long irqflags;</div><div class='del'>-		struct list_head *vbl_sigs = (flags &amp; _DRM_VBLANK_SECONDARY)</div><div class='del'>-				      ? &amp;dev-&gt;vbl_sigs2 : &amp;dev-&gt;vbl_sigs;</div><div class='add'>+		struct list_head *vbl_sigs = &amp;dev-&gt;vbl_sigs[crtc];</div><div class='ctx'> 		struct drm_vbl_sig *vbl_sig;</div><div class='ctx'> </div><div class='ctx'> 		spin_lock_irqsave(&amp;dev-&gt;vbl_lock, irqflags);</div><div class='hunk'>@@ -298,22 +579,29 @@ int drm_wait_vblank(struct drm_device *dev, void *data, struct drm_file *file_pr</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (dev-&gt;vbl_pending &gt;= 100) {</div><div class='add'>+		if (atomic_read(&amp;dev-&gt;vbl_signal_pending) &gt;= 100) {</div><div class='ctx'> 			spin_unlock_irqrestore(&amp;dev-&gt;vbl_lock, irqflags);</div><div class='del'>-			return -EBUSY;</div><div class='add'>+			ret = -EBUSY;</div><div class='add'>+			goto done;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		dev-&gt;vbl_pending++;</div><div class='del'>-</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;dev-&gt;vbl_lock, irqflags);</div><div class='ctx'> </div><div class='del'>-		if (!</div><div class='del'>-		    (vbl_sig =</div><div class='del'>-		     drm_alloc(sizeof(struct drm_vbl_sig), DRM_MEM_DRIVER))) {</div><div class='del'>-			return -ENOMEM;</div><div class='add'>+		vbl_sig = drm_calloc(1, sizeof(struct drm_vbl_sig),</div><div class='add'>+				     DRM_MEM_DRIVER);</div><div class='add'>+		if (!vbl_sig) {</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			goto done;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = drm_vblank_get(dev, crtc);</div><div class='add'>+		if (ret) {</div><div class='add'>+			drm_free(vbl_sig, sizeof(struct drm_vbl_sig),</div><div class='add'>+				 DRM_MEM_DRIVER);</div><div class='add'>+			return ret;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		memset((void *)vbl_sig, 0, sizeof(*vbl_sig));</div><div class='add'>+		atomic_inc(&amp;dev-&gt;vbl_signal_pending);</div><div class='ctx'> </div><div class='ctx'> 		vbl_sig-&gt;sequence = vblwait-&gt;request.sequence;</div><div class='ctx'> 		vbl_sig-&gt;info.si_signo = vblwait-&gt;request.signal;</div><div class='hunk'>@@ -327,20 +615,29 @@ int drm_wait_vblank(struct drm_device *dev, void *data, struct drm_file *file_pr</div><div class='ctx'> </div><div class='ctx'> 		vblwait-&gt;reply.sequence = seq;</div><div class='ctx'> 	} else {</div><div class='del'>-		if (flags &amp; _DRM_VBLANK_SECONDARY) {</div><div class='del'>-			if (dev-&gt;driver-&gt;vblank_wait2)</div><div class='del'>-				ret = dev-&gt;driver-&gt;vblank_wait2(dev, &amp;vblwait-&gt;request.sequence);</div><div class='del'>-		} else if (dev-&gt;driver-&gt;vblank_wait)</div><div class='del'>-			ret =</div><div class='del'>-			    dev-&gt;driver-&gt;vblank_wait(dev,</div><div class='del'>-						     &amp;vblwait-&gt;request.sequence);</div><div class='del'>-</div><div class='del'>-		do_gettimeofday(&amp;now);</div><div class='del'>-		vblwait-&gt;reply.tval_sec = now.tv_sec;</div><div class='del'>-		vblwait-&gt;reply.tval_usec = now.tv_usec;</div><div class='add'>+		DRM_DEBUG("waiting on vblank count %d, crtc %d\n",</div><div class='add'>+			  vblwait-&gt;request.sequence, crtc);</div><div class='add'>+		DRM_WAIT_ON(ret, dev-&gt;vbl_queue[crtc], 3 * DRM_HZ,</div><div class='add'>+			    ((drm_vblank_count(dev, crtc)</div><div class='add'>+			      - vblwait-&gt;request.sequence) &lt;= (1 &lt;&lt; 23)));</div><div class='add'>+</div><div class='add'>+		if (ret != -EINTR) {</div><div class='add'>+			struct timeval now;</div><div class='add'>+</div><div class='add'>+			do_gettimeofday(&amp;now);</div><div class='add'>+</div><div class='add'>+			vblwait-&gt;reply.tval_sec = now.tv_sec;</div><div class='add'>+			vblwait-&gt;reply.tval_usec = now.tv_usec;</div><div class='add'>+			vblwait-&gt;reply.sequence = drm_vblank_count(dev, crtc);</div><div class='add'>+			DRM_DEBUG("returning %d to client\n",</div><div class='add'>+				  vblwait-&gt;reply.sequence);</div><div class='add'>+		} else {</div><div class='add'>+			DRM_DEBUG("vblank wait interrupted by signal\n");</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-      done:</div><div class='add'>+done:</div><div class='add'>+	drm_vblank_put(dev, crtc);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -348,44 +645,57 @@ int drm_wait_vblank(struct drm_device *dev, void *data, struct drm_file *file_pr</div><div class='ctx'>  * Send the VBLANK signals.</div><div class='ctx'>  *</div><div class='ctx'>  * \param dev DRM device.</div><div class='add'>+ * \param crtc CRTC where the vblank event occurred</div><div class='ctx'>  *</div><div class='ctx'>  * Sends a signal for each task in drm_device::vbl_sigs and empties the list.</div><div class='ctx'>  *</div><div class='ctx'>  * If a signal is not requested, then calls vblank_wait().</div><div class='ctx'>  */</div><div class='del'>-void drm_vbl_send_signals(struct drm_device * dev)</div><div class='add'>+static void drm_vbl_send_signals(struct drm_device *dev, int crtc)</div><div class='ctx'> {</div><div class='add'>+	struct drm_vbl_sig *vbl_sig, *tmp;</div><div class='add'>+	struct list_head *vbl_sigs;</div><div class='add'>+	unsigned int vbl_seq;</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	int i;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;dev-&gt;vbl_lock, flags);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; 2; i++) {</div><div class='del'>-		struct drm_vbl_sig *vbl_sig, *tmp;</div><div class='del'>-		struct list_head *vbl_sigs = i ? &amp;dev-&gt;vbl_sigs2 : &amp;dev-&gt;vbl_sigs;</div><div class='del'>-		unsigned int vbl_seq = atomic_read(i ? &amp;dev-&gt;vbl_received2 :</div><div class='del'>-						   &amp;dev-&gt;vbl_received);</div><div class='add'>+	vbl_sigs = &amp;dev-&gt;vbl_sigs[crtc];</div><div class='add'>+	vbl_seq = drm_vblank_count(dev, crtc);</div><div class='ctx'> </div><div class='del'>-		list_for_each_entry_safe(vbl_sig, tmp, vbl_sigs, head) {</div><div class='del'>-			if ((vbl_seq - vbl_sig-&gt;sequence) &lt;= (1 &lt;&lt; 23)) {</div><div class='del'>-				vbl_sig-&gt;info.si_code = vbl_seq;</div><div class='del'>-				send_sig_info(vbl_sig-&gt;info.si_signo,</div><div class='del'>-					      &amp;vbl_sig-&gt;info, vbl_sig-&gt;task);</div><div class='add'>+	list_for_each_entry_safe(vbl_sig, tmp, vbl_sigs, head) {</div><div class='add'>+	    if ((vbl_seq - vbl_sig-&gt;sequence) &lt;= (1 &lt;&lt; 23)) {</div><div class='add'>+		vbl_sig-&gt;info.si_code = vbl_seq;</div><div class='add'>+		send_sig_info(vbl_sig-&gt;info.si_signo,</div><div class='add'>+			      &amp;vbl_sig-&gt;info, vbl_sig-&gt;task);</div><div class='ctx'> </div><div class='del'>-				list_del(&amp;vbl_sig-&gt;head);</div><div class='del'>-</div><div class='del'>-				drm_free(vbl_sig, sizeof(*vbl_sig),</div><div class='del'>-					 DRM_MEM_DRIVER);</div><div class='add'>+		list_del(&amp;vbl_sig-&gt;head);</div><div class='ctx'> </div><div class='del'>-				dev-&gt;vbl_pending--;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='add'>+		drm_free(vbl_sig, sizeof(*vbl_sig),</div><div class='add'>+			 DRM_MEM_DRIVER);</div><div class='add'>+		atomic_dec(&amp;dev-&gt;vbl_signal_pending);</div><div class='add'>+		drm_vblank_put(dev, crtc);</div><div class='add'>+	    }</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;dev-&gt;vbl_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(drm_vbl_send_signals);</div><div class='add'>+/**</div><div class='add'>+ * drm_handle_vblank - handle a vblank event</div><div class='add'>+ * @dev: DRM device</div><div class='add'>+ * @crtc: where this event occurred</div><div class='add'>+ *</div><div class='add'>+ * Drivers should call this routine in their vblank interrupt handlers to</div><div class='add'>+ * update the vblank counter and send any signals that may be pending.</div><div class='add'>+ */</div><div class='add'>+void drm_handle_vblank(struct drm_device *dev, int crtc)</div><div class='add'>+{</div><div class='add'>+	atomic_inc(&amp;dev-&gt;_vblank_count[crtc]);</div><div class='add'>+	DRM_WAKEUP(&amp;dev-&gt;vbl_queue[crtc]);</div><div class='add'>+	drm_vbl_send_signals(dev, crtc);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(drm_handle_vblank);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * Tasklet wrapper function.</div><div class='head'>diff --git a/drivers/gpu/drm/drm_memory.c b/drivers/gpu/drm/drm_memory.c<br/>index 0177012845c6..803bc9e7ce3c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpu/drm/drm_memory.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/gpu/drm/drm_memory.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpu/drm/drm_memory.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/drm_memory.c</a></div><div class='hunk'>@@ -133,6 +133,7 @@ int drm_free_agp(DRM_AGP_MEM * handle, int pages)</div><div class='ctx'> {</div><div class='ctx'> 	return drm_agp_free_memory(handle) ? 0 : -EINVAL;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(drm_free_agp);</div><div class='ctx'> </div><div class='ctx'> /** Wrapper around agp_bind_memory() */</div><div class='ctx'> int drm_bind_agp(DRM_AGP_MEM * handle, unsigned int start)</div><div class='hunk'>@@ -145,6 +146,7 @@ int drm_unbind_agp(DRM_AGP_MEM * handle)</div><div class='ctx'> {</div><div class='ctx'> 	return drm_agp_unbind_memory(handle);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(drm_unbind_agp);</div><div class='ctx'> </div><div class='ctx'> #else  /*  __OS_HAS_AGP  */</div><div class='ctx'> static inline void *agp_remap(unsigned long offset, unsigned long size,</div><div class='head'>diff --git a/drivers/gpu/drm/drm_mm.c b/drivers/gpu/drm/drm_mm.c<br/>index dcff9e9b52e3..217ad7dc7076 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpu/drm/drm_mm.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/gpu/drm/drm_mm.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpu/drm/drm_mm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/drm_mm.c</a></div><div class='hunk'>@@ -169,6 +169,7 @@ struct drm_mm_node *drm_mm_get_block(struct drm_mm_node * parent,</div><div class='ctx'> </div><div class='ctx'> 	return child;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(drm_mm_get_block);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Put a block. Merge with the previous and / or next block if they are free.</div><div class='hunk'>@@ -217,6 +218,7 @@ void drm_mm_put_block(struct drm_mm_node * cur)</div><div class='ctx'> 		drm_free(cur, sizeof(*cur), DRM_MEM_MM);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(drm_mm_put_block);</div><div class='ctx'> </div><div class='ctx'> struct drm_mm_node *drm_mm_search_free(const struct drm_mm * mm,</div><div class='ctx'> 				  unsigned long size,</div><div class='hunk'>@@ -265,6 +267,7 @@ int drm_mm_clean(struct drm_mm * mm)</div><div class='ctx'> </div><div class='ctx'> 	return (head-&gt;next-&gt;next == head);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(drm_mm_search_free);</div><div class='ctx'> </div><div class='ctx'> int drm_mm_init(struct drm_mm * mm, unsigned long start, unsigned long size)</div><div class='ctx'> {</div><div class='hunk'>@@ -273,7 +276,7 @@ int drm_mm_init(struct drm_mm * mm, unsigned long start, unsigned long size)</div><div class='ctx'> </div><div class='ctx'> 	return drm_mm_create_tail_node(mm, start, size);</div><div class='ctx'> }</div><div class='del'>-</div><div class='add'>+EXPORT_SYMBOL(drm_mm_init);</div><div class='ctx'> </div><div class='ctx'> void drm_mm_takedown(struct drm_mm * mm)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/gpu/drm/drm_proc.c b/drivers/gpu/drm/drm_proc.c<br/>index 93b1e0475c93..d490db4c0de0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpu/drm/drm_proc.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/gpu/drm/drm_proc.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpu/drm/drm_proc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/drm_proc.c</a></div><div class='hunk'>@@ -49,6 +49,10 @@ static int drm_queues_info(char *buf, char **start, off_t offset,</div><div class='ctx'> 			   int request, int *eof, void *data);</div><div class='ctx'> static int drm_bufs_info(char *buf, char **start, off_t offset,</div><div class='ctx'> 			 int request, int *eof, void *data);</div><div class='add'>+static int drm_gem_name_info(char *buf, char **start, off_t offset,</div><div class='add'>+			     int request, int *eof, void *data);</div><div class='add'>+static int drm_gem_object_info(char *buf, char **start, off_t offset,</div><div class='add'>+			       int request, int *eof, void *data);</div><div class='ctx'> #if DRM_DEBUG_CODE</div><div class='ctx'> static int drm_vma_info(char *buf, char **start, off_t offset,</div><div class='ctx'> 			int request, int *eof, void *data);</div><div class='hunk'>@@ -60,13 +64,16 @@ static int drm_vma_info(char *buf, char **start, off_t offset,</div><div class='ctx'> static struct drm_proc_list {</div><div class='ctx'> 	const char *name;	/**&lt; file name */</div><div class='ctx'> 	int (*f) (char *, char **, off_t, int, int *, void *);		/**&lt; proc callback*/</div><div class='add'>+	u32 driver_features; /**&lt; Required driver features for this entry */</div><div class='ctx'> } drm_proc_list[] = {</div><div class='del'>-	{"name", drm_name_info},</div><div class='del'>-	{"mem", drm_mem_info},</div><div class='del'>-	{"vm", drm_vm_info},</div><div class='del'>-	{"clients", drm_clients_info},</div><div class='del'>-	{"queues", drm_queues_info},</div><div class='del'>-	{"bufs", drm_bufs_info},</div><div class='add'>+	{"name", drm_name_info, 0},</div><div class='add'>+	{"mem", drm_mem_info, 0},</div><div class='add'>+	{"vm", drm_vm_info, 0},</div><div class='add'>+	{"clients", drm_clients_info, 0},</div><div class='add'>+	{"queues", drm_queues_info, 0},</div><div class='add'>+	{"bufs", drm_bufs_info, 0},</div><div class='add'>+	{"gem_names", drm_gem_name_info, DRIVER_GEM},</div><div class='add'>+	{"gem_objects", drm_gem_object_info, DRIVER_GEM},</div><div class='ctx'> #if DRM_DEBUG_CODE</div><div class='ctx'> 	{"vma", drm_vma_info},</div><div class='ctx'> #endif</div><div class='hunk'>@@ -90,8 +97,9 @@ static struct drm_proc_list {</div><div class='ctx'> int drm_proc_init(struct drm_minor *minor, int minor_id,</div><div class='ctx'> 		  struct proc_dir_entry *root)</div><div class='ctx'> {</div><div class='add'>+	struct drm_device *dev = minor-&gt;dev;</div><div class='ctx'> 	struct proc_dir_entry *ent;</div><div class='del'>-	int i, j;</div><div class='add'>+	int i, j, ret;</div><div class='ctx'> 	char name[64];</div><div class='ctx'> </div><div class='ctx'> 	sprintf(name, "%d", minor_id);</div><div class='hunk'>@@ -102,23 +110,42 @@ int drm_proc_init(struct drm_minor *minor, int minor_id,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; DRM_PROC_ENTRIES; i++) {</div><div class='add'>+		u32 features = drm_proc_list[i].driver_features;</div><div class='add'>+</div><div class='add'>+		if (features != 0 &amp;&amp;</div><div class='add'>+		    (dev-&gt;driver-&gt;driver_features &amp; features) != features)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='ctx'> 		ent = create_proc_entry(drm_proc_list[i].name,</div><div class='ctx'> 					S_IFREG | S_IRUGO, minor-&gt;dev_root);</div><div class='ctx'> 		if (!ent) {</div><div class='ctx'> 			DRM_ERROR("Cannot create /proc/dri/%s/%s\n",</div><div class='ctx'> 				  name, drm_proc_list[i].name);</div><div class='del'>-			for (j = 0; j &lt; i; j++)</div><div class='del'>-				remove_proc_entry(drm_proc_list[i].name,</div><div class='del'>-						  minor-&gt;dev_root);</div><div class='del'>-			remove_proc_entry(name, root);</div><div class='del'>-			minor-&gt;dev_root = NULL;</div><div class='del'>-			return -1;</div><div class='add'>+			ret = -1;</div><div class='add'>+			goto fail;</div><div class='ctx'> 		}</div><div class='ctx'> 		ent-&gt;read_proc = drm_proc_list[i].f;</div><div class='ctx'> 		ent-&gt;data = minor;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (dev-&gt;driver-&gt;proc_init) {</div><div class='add'>+		ret = dev-&gt;driver-&gt;proc_init(minor);</div><div class='add'>+		if (ret) {</div><div class='add'>+			DRM_ERROR("DRM: Driver failed to initialize "</div><div class='add'>+				  "/proc/dri.\n");</div><div class='add'>+			goto fail;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='add'>+ fail:</div><div class='add'>+</div><div class='add'>+	for (j = 0; j &lt; i; j++)</div><div class='add'>+		remove_proc_entry(drm_proc_list[i].name,</div><div class='add'>+				  minor-&gt;dev_root);</div><div class='add'>+	remove_proc_entry(name, root);</div><div class='add'>+	minor-&gt;dev_root = NULL;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -133,12 +160,16 @@ int drm_proc_init(struct drm_minor *minor, int minor_id,</div><div class='ctx'>  */</div><div class='ctx'> int drm_proc_cleanup(struct drm_minor *minor, struct proc_dir_entry *root)</div><div class='ctx'> {</div><div class='add'>+	struct drm_device *dev = minor-&gt;dev;</div><div class='ctx'> 	int i;</div><div class='ctx'> 	char name[64];</div><div class='ctx'> </div><div class='ctx'> 	if (!root || !minor-&gt;dev_root)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	if (dev-&gt;driver-&gt;proc_cleanup)</div><div class='add'>+		dev-&gt;driver-&gt;proc_cleanup(minor);</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; DRM_PROC_ENTRIES; i++)</div><div class='ctx'> 		remove_proc_entry(drm_proc_list[i].name, minor-&gt;dev_root);</div><div class='ctx'> 	sprintf(name, "%d", minor-&gt;index);</div><div class='hunk'>@@ -480,6 +511,84 @@ static int drm_clients_info(char *buf, char **start, off_t offset,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct drm_gem_name_info_data {</div><div class='add'>+       int                     len;</div><div class='add'>+       char                    *buf;</div><div class='add'>+       int                     eof;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int drm_gem_one_name_info(int id, void *ptr, void *data)</div><div class='add'>+{</div><div class='add'>+	struct drm_gem_object *obj = ptr;</div><div class='add'>+	struct drm_gem_name_info_data   *nid = data;</div><div class='add'>+</div><div class='add'>+	DRM_INFO("name %d size %d\n", obj-&gt;name, obj-&gt;size);</div><div class='add'>+	if (nid-&gt;eof)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	nid-&gt;len += sprintf(&amp;nid-&gt;buf[nid-&gt;len],</div><div class='add'>+			    "%6d%9d%8d%9d\n",</div><div class='add'>+			    obj-&gt;name, obj-&gt;size,</div><div class='add'>+			    atomic_read(&amp;obj-&gt;handlecount.refcount),</div><div class='add'>+			    atomic_read(&amp;obj-&gt;refcount.refcount));</div><div class='add'>+	if (nid-&gt;len &gt; DRM_PROC_LIMIT) {</div><div class='add'>+		nid-&gt;eof = 1;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int drm_gem_name_info(char *buf, char **start, off_t offset,</div><div class='add'>+			     int request, int *eof, void *data)</div><div class='add'>+{</div><div class='add'>+	struct drm_minor *minor = (struct drm_minor *) data;</div><div class='add'>+	struct drm_device *dev = minor-&gt;dev;</div><div class='add'>+	struct drm_gem_name_info_data nid;</div><div class='add'>+</div><div class='add'>+	if (offset &gt; DRM_PROC_LIMIT) {</div><div class='add'>+		*eof = 1;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nid.len = sprintf(buf, "  name     size handles refcount\n");</div><div class='add'>+	nid.buf = buf;</div><div class='add'>+	nid.eof = 0;</div><div class='add'>+	idr_for_each(&amp;dev-&gt;object_name_idr, drm_gem_one_name_info, &amp;nid);</div><div class='add'>+</div><div class='add'>+	*start = &amp;buf[offset];</div><div class='add'>+	*eof = 0;</div><div class='add'>+	if (nid.len &gt; request + offset)</div><div class='add'>+		return request;</div><div class='add'>+	*eof = 1;</div><div class='add'>+	return nid.len - offset;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int drm_gem_object_info(char *buf, char **start, off_t offset,</div><div class='add'>+			       int request, int *eof, void *data)</div><div class='add'>+{</div><div class='add'>+	struct drm_minor *minor = (struct drm_minor *) data;</div><div class='add'>+	struct drm_device *dev = minor-&gt;dev;</div><div class='add'>+	int len = 0;</div><div class='add'>+</div><div class='add'>+	if (offset &gt; DRM_PROC_LIMIT) {</div><div class='add'>+		*eof = 1;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*start = &amp;buf[offset];</div><div class='add'>+	*eof = 0;</div><div class='add'>+	DRM_PROC_PRINT("%d objects\n", atomic_read(&amp;dev-&gt;object_count));</div><div class='add'>+	DRM_PROC_PRINT("%d object bytes\n", atomic_read(&amp;dev-&gt;object_memory));</div><div class='add'>+	DRM_PROC_PRINT("%d pinned\n", atomic_read(&amp;dev-&gt;pin_count));</div><div class='add'>+	DRM_PROC_PRINT("%d pin bytes\n", atomic_read(&amp;dev-&gt;pin_memory));</div><div class='add'>+	DRM_PROC_PRINT("%d gtt bytes\n", atomic_read(&amp;dev-&gt;gtt_memory));</div><div class='add'>+	DRM_PROC_PRINT("%d gtt total\n", dev-&gt;gtt_total);</div><div class='add'>+	if (len &gt; request + offset)</div><div class='add'>+		return request;</div><div class='add'>+	*eof = 1;</div><div class='add'>+	return len - offset;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #if DRM_DEBUG_CODE</div><div class='ctx'> </div><div class='ctx'> static int drm__vma_info(char *buf, char **start, off_t offset, int request,</div><div class='head'>diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c<br/>index c2f584f3b46c..141e33004a76 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpu/drm/drm_stub.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/gpu/drm/drm_stub.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpu/drm/drm_stub.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/drm_stub.c</a></div><div class='hunk'>@@ -107,7 +107,6 @@ static int drm_fill_in_dev(struct drm_device * dev, struct pci_dev *pdev,</div><div class='ctx'> #ifdef __alpha__</div><div class='ctx'> 	dev-&gt;hose = pdev-&gt;sysdata;</div><div class='ctx'> #endif</div><div class='del'>-	dev-&gt;irq = pdev-&gt;irq;</div><div class='ctx'> </div><div class='ctx'> 	if (drm_ht_create(&amp;dev-&gt;map_hash, 12)) {</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -152,6 +151,15 @@ static int drm_fill_in_dev(struct drm_device * dev, struct pci_dev *pdev,</div><div class='ctx'> 		goto error_out_unreg;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (driver-&gt;driver_features &amp; DRIVER_GEM) {</div><div class='add'>+		retcode = drm_gem_init(dev);</div><div class='add'>+		if (retcode) {</div><div class='add'>+			DRM_ERROR("Cannot initialize graphics execution "</div><div class='add'>+				  "manager (GEM)\n");</div><div class='add'>+			goto error_out_unreg;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'>       error_out_unreg:</div><div class='hunk'>@@ -317,6 +325,7 @@ int drm_put_dev(struct drm_device * dev)</div><div class='ctx'> int drm_put_minor(struct drm_minor **minor_p)</div><div class='ctx'> {</div><div class='ctx'> 	struct drm_minor *minor = *minor_p;</div><div class='add'>+</div><div class='ctx'> 	DRM_DEBUG("release secondary minor %d\n", minor-&gt;index);</div><div class='ctx'> </div><div class='ctx'> 	if (minor-&gt;type == DRM_MINOR_LEGACY)</div><div class='head'>diff --git a/drivers/gpu/drm/drm_sysfs.c b/drivers/gpu/drm/drm_sysfs.c<br/>index af211a0ef179..1611b9bcbe7f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpu/drm/drm_sysfs.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/gpu/drm/drm_sysfs.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpu/drm/drm_sysfs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/drm_sysfs.c</a></div><div class='hunk'>@@ -184,7 +184,7 @@ int drm_sysfs_device_add(struct drm_minor *minor)</div><div class='ctx'> err_out_files:</div><div class='ctx'> 	if (i &gt; 0)</div><div class='ctx'> 		for (j = 0; j &lt; i; j++)</div><div class='del'>-			device_remove_file(&amp;minor-&gt;kdev, &amp;device_attrs[i]);</div><div class='add'>+			device_remove_file(&amp;minor-&gt;kdev, &amp;device_attrs[j]);</div><div class='ctx'> 	device_unregister(&amp;minor-&gt;kdev);</div><div class='ctx'> err_out:</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile<br/>index a9e60464df74..5ba78e4fd2b5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpu/drm/i915/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/gpu/drm/i915/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpu/drm/i915/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/i915/Makefile</a></div><div class='hunk'>@@ -3,7 +3,12 @@</div><div class='ctx'> # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.</div><div class='ctx'> </div><div class='ctx'> ccflags-y := -Iinclude/drm</div><div class='del'>-i915-y := i915_drv.o i915_dma.o i915_irq.o i915_mem.o</div><div class='add'>+i915-y := i915_drv.o i915_dma.o i915_irq.o i915_mem.o i915_opregion.o \</div><div class='add'>+          i915_suspend.o \</div><div class='add'>+	  i915_gem.o \</div><div class='add'>+	  i915_gem_debug.o \</div><div class='add'>+	  i915_gem_proc.o \</div><div class='add'>+	  i915_gem_tiling.o</div><div class='ctx'> </div><div class='ctx'> i915-$(CONFIG_COMPAT)   += i915_ioc32.o</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c<br/>index 88974342933c..db34780edbb2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpu/drm/i915/i915_dma.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/gpu/drm/i915/i915_dma.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpu/drm/i915/i915_dma.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/i915/i915_dma.c</a></div><div class='hunk'>@@ -40,40 +40,96 @@ int i915_wait_ring(struct drm_device * dev, int n, const char *caller)</div><div class='ctx'> {</div><div class='ctx'> 	drm_i915_private_t *dev_priv = dev-&gt;dev_private;</div><div class='ctx'> 	drm_i915_ring_buffer_t *ring = &amp;(dev_priv-&gt;ring);</div><div class='del'>-	u32 last_head = I915_READ(LP_RING + RING_HEAD) &amp; HEAD_ADDR;</div><div class='add'>+	u32 acthd_reg = IS_I965G(dev) ? ACTHD_I965 : ACTHD;</div><div class='add'>+	u32 last_acthd = I915_READ(acthd_reg);</div><div class='add'>+	u32 acthd;</div><div class='add'>+	u32 last_head = I915_READ(PRB0_HEAD) &amp; HEAD_ADDR;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; 10000; i++) {</div><div class='del'>-		ring-&gt;head = I915_READ(LP_RING + RING_HEAD) &amp; HEAD_ADDR;</div><div class='add'>+	for (i = 0; i &lt; 100000; i++) {</div><div class='add'>+		ring-&gt;head = I915_READ(PRB0_HEAD) &amp; HEAD_ADDR;</div><div class='add'>+		acthd = I915_READ(acthd_reg);</div><div class='ctx'> 		ring-&gt;space = ring-&gt;head - (ring-&gt;tail + 8);</div><div class='ctx'> 		if (ring-&gt;space &lt; 0)</div><div class='ctx'> 			ring-&gt;space += ring-&gt;Size;</div><div class='ctx'> 		if (ring-&gt;space &gt;= n)</div><div class='ctx'> 			return 0;</div><div class='ctx'> </div><div class='del'>-		dev_priv-&gt;sarea_priv-&gt;perf_boxes |= I915_BOX_WAIT;</div><div class='add'>+		if (dev_priv-&gt;sarea_priv)</div><div class='add'>+			dev_priv-&gt;sarea_priv-&gt;perf_boxes |= I915_BOX_WAIT;</div><div class='ctx'> </div><div class='ctx'> 		if (ring-&gt;head != last_head)</div><div class='ctx'> 			i = 0;</div><div class='add'>+		if (acthd != last_acthd)</div><div class='add'>+			i = 0;</div><div class='ctx'> </div><div class='ctx'> 		last_head = ring-&gt;head;</div><div class='add'>+		last_acthd = acthd;</div><div class='add'>+		msleep_interruptible(10);</div><div class='add'>+</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return -EBUSY;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * Sets up the hardware status page for devices that need a physical address</div><div class='add'>+ * in the register.</div><div class='add'>+ */</div><div class='add'>+static int i915_init_phys_hws(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	drm_i915_private_t *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	/* Program Hardware Status Page */</div><div class='add'>+	dev_priv-&gt;status_page_dmah =</div><div class='add'>+		drm_pci_alloc(dev, PAGE_SIZE, PAGE_SIZE, 0xffffffff);</div><div class='add'>+</div><div class='add'>+	if (!dev_priv-&gt;status_page_dmah) {</div><div class='add'>+		DRM_ERROR("Can not allocate hardware status page\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	dev_priv-&gt;hw_status_page = dev_priv-&gt;status_page_dmah-&gt;vaddr;</div><div class='add'>+	dev_priv-&gt;dma_status_page = dev_priv-&gt;status_page_dmah-&gt;busaddr;</div><div class='add'>+</div><div class='add'>+	memset(dev_priv-&gt;hw_status_page, 0, PAGE_SIZE);</div><div class='add'>+</div><div class='add'>+	I915_WRITE(HWS_PGA, dev_priv-&gt;dma_status_page);</div><div class='add'>+	DRM_DEBUG("Enabled hardware status page\n");</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Frees the hardware status page, whether it's a physical address or a virtual</div><div class='add'>+ * address set up by the X Server.</div><div class='add'>+ */</div><div class='add'>+static void i915_free_hws(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	drm_i915_private_t *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	if (dev_priv-&gt;status_page_dmah) {</div><div class='add'>+		drm_pci_free(dev, dev_priv-&gt;status_page_dmah);</div><div class='add'>+		dev_priv-&gt;status_page_dmah = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dev_priv-&gt;status_gfx_addr) {</div><div class='add'>+		dev_priv-&gt;status_gfx_addr = 0;</div><div class='add'>+		drm_core_ioremapfree(&amp;dev_priv-&gt;hws_map, dev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Need to rewrite hardware status page */</div><div class='add'>+	I915_WRITE(HWS_PGA, 0x1ffff000);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void i915_kernel_lost_context(struct drm_device * dev)</div><div class='ctx'> {</div><div class='ctx'> 	drm_i915_private_t *dev_priv = dev-&gt;dev_private;</div><div class='ctx'> 	drm_i915_ring_buffer_t *ring = &amp;(dev_priv-&gt;ring);</div><div class='ctx'> </div><div class='del'>-	ring-&gt;head = I915_READ(LP_RING + RING_HEAD) &amp; HEAD_ADDR;</div><div class='del'>-	ring-&gt;tail = I915_READ(LP_RING + RING_TAIL) &amp; TAIL_ADDR;</div><div class='add'>+	ring-&gt;head = I915_READ(PRB0_HEAD) &amp; HEAD_ADDR;</div><div class='add'>+	ring-&gt;tail = I915_READ(PRB0_TAIL) &amp; TAIL_ADDR;</div><div class='ctx'> 	ring-&gt;space = ring-&gt;head - (ring-&gt;tail + 8);</div><div class='ctx'> 	if (ring-&gt;space &lt; 0)</div><div class='ctx'> 		ring-&gt;space += ring-&gt;Size;</div><div class='ctx'> </div><div class='del'>-	if (ring-&gt;head == ring-&gt;tail)</div><div class='add'>+	if (ring-&gt;head == ring-&gt;tail &amp;&amp; dev_priv-&gt;sarea_priv)</div><div class='ctx'> 		dev_priv-&gt;sarea_priv-&gt;perf_boxes |= I915_BOX_RING_EMPTY;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -84,28 +140,19 @@ static int i915_dma_cleanup(struct drm_device * dev)</div><div class='ctx'> 	 * may not have been called from userspace and after dev_private</div><div class='ctx'> 	 * is freed, it's too late.</div><div class='ctx'> 	 */</div><div class='del'>-	if (dev-&gt;irq)</div><div class='add'>+	if (dev-&gt;irq_enabled)</div><div class='ctx'> 		drm_irq_uninstall(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (dev_priv-&gt;ring.virtual_start) {</div><div class='ctx'> 		drm_core_ioremapfree(&amp;dev_priv-&gt;ring.map, dev);</div><div class='del'>-		dev_priv-&gt;ring.virtual_start = 0;</div><div class='del'>-		dev_priv-&gt;ring.map.handle = 0;</div><div class='add'>+		dev_priv-&gt;ring.virtual_start = NULL;</div><div class='add'>+		dev_priv-&gt;ring.map.handle = NULL;</div><div class='ctx'> 		dev_priv-&gt;ring.map.size = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (dev_priv-&gt;status_page_dmah) {</div><div class='del'>-		drm_pci_free(dev, dev_priv-&gt;status_page_dmah);</div><div class='del'>-		dev_priv-&gt;status_page_dmah = NULL;</div><div class='del'>-		/* Need to rewrite hardware status page */</div><div class='del'>-		I915_WRITE(0x02080, 0x1ffff000);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (dev_priv-&gt;status_gfx_addr) {</div><div class='del'>-		dev_priv-&gt;status_gfx_addr = 0;</div><div class='del'>-		drm_core_ioremapfree(&amp;dev_priv-&gt;hws_map, dev);</div><div class='del'>-		I915_WRITE(0x2080, 0x1ffff000);</div><div class='del'>-	}</div><div class='add'>+	/* Clear the HWS virtual address at teardown */</div><div class='add'>+	if (I915_NEED_GFX_HWS(dev))</div><div class='add'>+		i915_free_hws(dev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -121,34 +168,34 @@ static int i915_initialize(struct drm_device * dev, drm_i915_init_t * init)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dev_priv-&gt;mmio_map = drm_core_findmap(dev, init-&gt;mmio_offset);</div><div class='del'>-	if (!dev_priv-&gt;mmio_map) {</div><div class='del'>-		i915_dma_cleanup(dev);</div><div class='del'>-		DRM_ERROR("can not find mmio map!\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	dev_priv-&gt;sarea_priv = (drm_i915_sarea_t *)</div><div class='ctx'> 	    ((u8 *) dev_priv-&gt;sarea-&gt;handle + init-&gt;sarea_priv_offset);</div><div class='ctx'> </div><div class='del'>-	dev_priv-&gt;ring.Start = init-&gt;ring_start;</div><div class='del'>-	dev_priv-&gt;ring.End = init-&gt;ring_end;</div><div class='del'>-	dev_priv-&gt;ring.Size = init-&gt;ring_size;</div><div class='del'>-	dev_priv-&gt;ring.tail_mask = dev_priv-&gt;ring.Size - 1;</div><div class='add'>+	if (init-&gt;ring_size != 0) {</div><div class='add'>+		if (dev_priv-&gt;ring.ring_obj != NULL) {</div><div class='add'>+			i915_dma_cleanup(dev);</div><div class='add'>+			DRM_ERROR("Client tried to initialize ringbuffer in "</div><div class='add'>+				  "GEM mode\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	dev_priv-&gt;ring.map.offset = init-&gt;ring_start;</div><div class='del'>-	dev_priv-&gt;ring.map.size = init-&gt;ring_size;</div><div class='del'>-	dev_priv-&gt;ring.map.type = 0;</div><div class='del'>-	dev_priv-&gt;ring.map.flags = 0;</div><div class='del'>-	dev_priv-&gt;ring.map.mtrr = 0;</div><div class='add'>+		dev_priv-&gt;ring.Size = init-&gt;ring_size;</div><div class='add'>+		dev_priv-&gt;ring.tail_mask = dev_priv-&gt;ring.Size - 1;</div><div class='ctx'> </div><div class='del'>-	drm_core_ioremap(&amp;dev_priv-&gt;ring.map, dev);</div><div class='add'>+		dev_priv-&gt;ring.map.offset = init-&gt;ring_start;</div><div class='add'>+		dev_priv-&gt;ring.map.size = init-&gt;ring_size;</div><div class='add'>+		dev_priv-&gt;ring.map.type = 0;</div><div class='add'>+		dev_priv-&gt;ring.map.flags = 0;</div><div class='add'>+		dev_priv-&gt;ring.map.mtrr = 0;</div><div class='ctx'> </div><div class='del'>-	if (dev_priv-&gt;ring.map.handle == NULL) {</div><div class='del'>-		i915_dma_cleanup(dev);</div><div class='del'>-		DRM_ERROR("can not ioremap virtual address for"</div><div class='del'>-			  " ring buffer\n");</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+		drm_core_ioremap(&amp;dev_priv-&gt;ring.map, dev);</div><div class='add'>+</div><div class='add'>+		if (dev_priv-&gt;ring.map.handle == NULL) {</div><div class='add'>+			i915_dma_cleanup(dev);</div><div class='add'>+			DRM_ERROR("can not ioremap virtual address for"</div><div class='add'>+				  " ring buffer\n");</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dev_priv-&gt;ring.virtual_start = dev_priv-&gt;ring.map.handle;</div><div class='hunk'>@@ -159,34 +206,10 @@ static int i915_initialize(struct drm_device * dev, drm_i915_init_t * init)</div><div class='ctx'> 	dev_priv-&gt;current_page = 0;</div><div class='ctx'> 	dev_priv-&gt;sarea_priv-&gt;pf_current_page = dev_priv-&gt;current_page;</div><div class='ctx'> </div><div class='del'>-	/* We are using separate values as placeholders for mechanisms for</div><div class='del'>-	 * private backbuffer/depthbuffer usage.</div><div class='del'>-	 */</div><div class='del'>-	dev_priv-&gt;use_mi_batchbuffer_start = 0;</div><div class='del'>-	if (IS_I965G(dev)) /* 965 doesn't support older method */</div><div class='del'>-		dev_priv-&gt;use_mi_batchbuffer_start = 1;</div><div class='del'>-</div><div class='ctx'> 	/* Allow hardware batchbuffers unless told otherwise.</div><div class='ctx'> 	 */</div><div class='ctx'> 	dev_priv-&gt;allow_batchbuffer = 1;</div><div class='ctx'> </div><div class='del'>-	/* Program Hardware Status Page */</div><div class='del'>-	if (!I915_NEED_GFX_HWS(dev)) {</div><div class='del'>-		dev_priv-&gt;status_page_dmah =</div><div class='del'>-			drm_pci_alloc(dev, PAGE_SIZE, PAGE_SIZE, 0xffffffff);</div><div class='del'>-</div><div class='del'>-		if (!dev_priv-&gt;status_page_dmah) {</div><div class='del'>-			i915_dma_cleanup(dev);</div><div class='del'>-			DRM_ERROR("Can not allocate hardware status page\n");</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		}</div><div class='del'>-		dev_priv-&gt;hw_status_page = dev_priv-&gt;status_page_dmah-&gt;vaddr;</div><div class='del'>-		dev_priv-&gt;dma_status_page = dev_priv-&gt;status_page_dmah-&gt;busaddr;</div><div class='del'>-</div><div class='del'>-		memset(dev_priv-&gt;hw_status_page, 0, PAGE_SIZE);</div><div class='del'>-		I915_WRITE(0x02080, dev_priv-&gt;dma_status_page);</div><div class='del'>-	}</div><div class='del'>-	DRM_DEBUG("Enabled hardware status page\n");</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -201,11 +224,6 @@ static int i915_dma_resume(struct drm_device * dev)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!dev_priv-&gt;mmio_map) {</div><div class='del'>-		DRM_ERROR("can not find mmio map!\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if (dev_priv-&gt;ring.map.handle == NULL) {</div><div class='ctx'> 		DRM_ERROR("can not ioremap virtual address for"</div><div class='ctx'> 			  " ring buffer\n");</div><div class='hunk'>@@ -220,9 +238,9 @@ static int i915_dma_resume(struct drm_device * dev)</div><div class='ctx'> 	DRM_DEBUG("hw status page @ %p\n", dev_priv-&gt;hw_status_page);</div><div class='ctx'> </div><div class='ctx'> 	if (dev_priv-&gt;status_gfx_addr != 0)</div><div class='del'>-		I915_WRITE(0x02080, dev_priv-&gt;status_gfx_addr);</div><div class='add'>+		I915_WRITE(HWS_PGA, dev_priv-&gt;status_gfx_addr);</div><div class='ctx'> 	else</div><div class='del'>-		I915_WRITE(0x02080, dev_priv-&gt;dma_status_page);</div><div class='add'>+		I915_WRITE(HWS_PGA, dev_priv-&gt;dma_status_page);</div><div class='ctx'> 	DRM_DEBUG("Enabled hardware status page\n");</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -367,9 +385,10 @@ static int i915_emit_cmds(struct drm_device * dev, int __user * buffer, int dwor</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int i915_emit_box(struct drm_device * dev,</div><div class='del'>-			 struct drm_clip_rect __user * boxes,</div><div class='del'>-			 int i, int DR1, int DR4)</div><div class='add'>+int</div><div class='add'>+i915_emit_box(struct drm_device *dev,</div><div class='add'>+	      struct drm_clip_rect __user *boxes,</div><div class='add'>+	      int i, int DR1, int DR4)</div><div class='ctx'> {</div><div class='ctx'> 	drm_i915_private_t *dev_priv = dev-&gt;dev_private;</div><div class='ctx'> 	struct drm_clip_rect box;</div><div class='hunk'>@@ -415,14 +434,15 @@ static void i915_emit_breadcrumb(struct drm_device *dev)</div><div class='ctx'> 	drm_i915_private_t *dev_priv = dev-&gt;dev_private;</div><div class='ctx'> 	RING_LOCALS;</div><div class='ctx'> </div><div class='del'>-	dev_priv-&gt;sarea_priv-&gt;last_enqueue = ++dev_priv-&gt;counter;</div><div class='del'>-</div><div class='add'>+	dev_priv-&gt;counter++;</div><div class='ctx'> 	if (dev_priv-&gt;counter &gt; 0x7FFFFFFFUL)</div><div class='del'>-		dev_priv-&gt;sarea_priv-&gt;last_enqueue = dev_priv-&gt;counter = 1;</div><div class='add'>+		dev_priv-&gt;counter = 0;</div><div class='add'>+	if (dev_priv-&gt;sarea_priv)</div><div class='add'>+		dev_priv-&gt;sarea_priv-&gt;last_enqueue = dev_priv-&gt;counter;</div><div class='ctx'> </div><div class='ctx'> 	BEGIN_LP_RING(4);</div><div class='del'>-	OUT_RING(CMD_STORE_DWORD_IDX);</div><div class='del'>-	OUT_RING(20);</div><div class='add'>+	OUT_RING(MI_STORE_DWORD_INDEX);</div><div class='add'>+	OUT_RING(5 &lt;&lt; MI_STORE_DWORD_INDEX_SHIFT);</div><div class='ctx'> 	OUT_RING(dev_priv-&gt;counter);</div><div class='ctx'> 	OUT_RING(0);</div><div class='ctx'> 	ADVANCE_LP_RING();</div><div class='hunk'>@@ -486,7 +506,7 @@ static int i915_dispatch_batchbuffer(struct drm_device * dev,</div><div class='ctx'> 				return ret;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (dev_priv-&gt;use_mi_batchbuffer_start) {</div><div class='add'>+		if (!IS_I830(dev) &amp;&amp; !IS_845G(dev)) {</div><div class='ctx'> 			BEGIN_LP_RING(2);</div><div class='ctx'> 			if (IS_I965G(dev)) {</div><div class='ctx'> 				OUT_RING(MI_BATCH_BUFFER_START | (2 &lt;&lt; 6) | MI_BATCH_NON_SECURE_I965);</div><div class='hunk'>@@ -516,15 +536,18 @@ static int i915_dispatch_flip(struct drm_device * dev)</div><div class='ctx'> 	drm_i915_private_t *dev_priv = dev-&gt;dev_private;</div><div class='ctx'> 	RING_LOCALS;</div><div class='ctx'> </div><div class='add'>+	if (!dev_priv-&gt;sarea_priv)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	DRM_DEBUG("%s: page=%d pfCurrentPage=%d\n",</div><div class='del'>-		  __FUNCTION__,</div><div class='add'>+		  __func__,</div><div class='ctx'> 		  dev_priv-&gt;current_page,</div><div class='ctx'> 		  dev_priv-&gt;sarea_priv-&gt;pf_current_page);</div><div class='ctx'> </div><div class='ctx'> 	i915_kernel_lost_context(dev);</div><div class='ctx'> </div><div class='ctx'> 	BEGIN_LP_RING(2);</div><div class='del'>-	OUT_RING(INST_PARSER_CLIENT | INST_OP_FLUSH | INST_FLUSH_MAP_CACHE);</div><div class='add'>+	OUT_RING(MI_FLUSH | MI_READ_FLUSH);</div><div class='ctx'> 	OUT_RING(0);</div><div class='ctx'> 	ADVANCE_LP_RING();</div><div class='ctx'> </div><div class='hunk'>@@ -549,8 +572,8 @@ static int i915_dispatch_flip(struct drm_device * dev)</div><div class='ctx'> 	dev_priv-&gt;sarea_priv-&gt;last_enqueue = dev_priv-&gt;counter++;</div><div class='ctx'> </div><div class='ctx'> 	BEGIN_LP_RING(4);</div><div class='del'>-	OUT_RING(CMD_STORE_DWORD_IDX);</div><div class='del'>-	OUT_RING(20);</div><div class='add'>+	OUT_RING(MI_STORE_DWORD_INDEX);</div><div class='add'>+	OUT_RING(5 &lt;&lt; MI_STORE_DWORD_INDEX_SHIFT);</div><div class='ctx'> 	OUT_RING(dev_priv-&gt;counter);</div><div class='ctx'> 	OUT_RING(0);</div><div class='ctx'> 	ADVANCE_LP_RING();</div><div class='hunk'>@@ -570,9 +593,15 @@ static int i915_quiescent(struct drm_device * dev)</div><div class='ctx'> static int i915_flush_ioctl(struct drm_device *dev, void *data,</div><div class='ctx'> 			    struct drm_file *file_priv)</div><div class='ctx'> {</div><div class='del'>-	LOCK_TEST_WITH_RETURN(dev, file_priv);</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	return i915_quiescent(dev);</div><div class='add'>+	RING_LOCK_TEST_WITH_RETURN(dev, file_priv);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+	ret = i915_quiescent(dev);</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int i915_batchbuffer(struct drm_device *dev, void *data,</div><div class='hunk'>@@ -593,16 +622,19 @@ static int i915_batchbuffer(struct drm_device *dev, void *data,</div><div class='ctx'> 	DRM_DEBUG("i915 batchbuffer, start %x used %d cliprects %d\n",</div><div class='ctx'> 		  batch-&gt;start, batch-&gt;used, batch-&gt;num_cliprects);</div><div class='ctx'> </div><div class='del'>-	LOCK_TEST_WITH_RETURN(dev, file_priv);</div><div class='add'>+	RING_LOCK_TEST_WITH_RETURN(dev, file_priv);</div><div class='ctx'> </div><div class='ctx'> 	if (batch-&gt;num_cliprects &amp;&amp; DRM_VERIFYAREA_READ(batch-&gt;cliprects,</div><div class='ctx'> 						       batch-&gt;num_cliprects *</div><div class='ctx'> 						       sizeof(struct drm_clip_rect)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='add'>+	mutex_lock(&amp;dev-&gt;struct_mutex);</div><div class='ctx'> 	ret = i915_dispatch_batchbuffer(dev, batch);</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='ctx'> </div><div class='del'>-	sarea_priv-&gt;last_dispatch = (int)hw_status[5];</div><div class='add'>+	if (sarea_priv)</div><div class='add'>+		sarea_priv-&gt;last_dispatch = (int)hw_status[5];</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -619,7 +651,7 @@ static int i915_cmdbuffer(struct drm_device *dev, void *data,</div><div class='ctx'> 	DRM_DEBUG("i915 cmdbuffer, buf %p sz %d cliprects %d\n",</div><div class='ctx'> 		  cmdbuf-&gt;buf, cmdbuf-&gt;sz, cmdbuf-&gt;num_cliprects);</div><div class='ctx'> </div><div class='del'>-	LOCK_TEST_WITH_RETURN(dev, file_priv);</div><div class='add'>+	RING_LOCK_TEST_WITH_RETURN(dev, file_priv);</div><div class='ctx'> </div><div class='ctx'> 	if (cmdbuf-&gt;num_cliprects &amp;&amp;</div><div class='ctx'> 	    DRM_VERIFYAREA_READ(cmdbuf-&gt;cliprects,</div><div class='hunk'>@@ -629,24 +661,33 @@ static int i915_cmdbuffer(struct drm_device *dev, void *data,</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	mutex_lock(&amp;dev-&gt;struct_mutex);</div><div class='ctx'> 	ret = i915_dispatch_cmdbuffer(dev, cmdbuf);</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		DRM_ERROR("i915_dispatch_cmdbuffer failed\n");</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	sarea_priv-&gt;last_dispatch = (int)hw_status[5];</div><div class='add'>+	if (sarea_priv)</div><div class='add'>+		sarea_priv-&gt;last_dispatch = (int)hw_status[5];</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int i915_flip_bufs(struct drm_device *dev, void *data,</div><div class='ctx'> 			  struct drm_file *file_priv)</div><div class='ctx'> {</div><div class='del'>-	DRM_DEBUG("%s\n", __FUNCTION__);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	DRM_DEBUG("%s\n", __func__);</div><div class='add'>+</div><div class='add'>+	RING_LOCK_TEST_WITH_RETURN(dev, file_priv);</div><div class='ctx'> </div><div class='del'>-	LOCK_TEST_WITH_RETURN(dev, file_priv);</div><div class='add'>+	mutex_lock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+	ret = i915_dispatch_flip(dev);</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='ctx'> </div><div class='del'>-	return i915_dispatch_flip(dev);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int i915_getparam(struct drm_device *dev, void *data,</div><div class='hunk'>@@ -663,7 +704,7 @@ static int i915_getparam(struct drm_device *dev, void *data,</div><div class='ctx'> </div><div class='ctx'> 	switch (param-&gt;param) {</div><div class='ctx'> 	case I915_PARAM_IRQ_ACTIVE:</div><div class='del'>-		value = dev-&gt;irq ? 1 : 0;</div><div class='add'>+		value = dev-&gt;pdev-&gt;irq ? 1 : 0;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case I915_PARAM_ALLOW_BATCHBUFFER:</div><div class='ctx'> 		value = dev_priv-&gt;allow_batchbuffer ? 1 : 0;</div><div class='hunk'>@@ -671,6 +712,12 @@ static int i915_getparam(struct drm_device *dev, void *data,</div><div class='ctx'> 	case I915_PARAM_LAST_DISPATCH:</div><div class='ctx'> 		value = READ_BREADCRUMB(dev_priv);</div><div class='ctx'> 		break;</div><div class='add'>+	case I915_PARAM_CHIPSET_ID:</div><div class='add'>+		value = dev-&gt;pci_device;</div><div class='add'>+		break;</div><div class='add'>+	case I915_PARAM_HAS_GEM:</div><div class='add'>+		value = 1;</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		DRM_ERROR("Unknown parameter %d\n", param-&gt;param);</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -697,8 +744,6 @@ static int i915_setparam(struct drm_device *dev, void *data,</div><div class='ctx'> </div><div class='ctx'> 	switch (param-&gt;param) {</div><div class='ctx'> 	case I915_SETPARAM_USE_MI_BATCHBUFFER_START:</div><div class='del'>-		if (!IS_I965G(dev))</div><div class='del'>-			dev_priv-&gt;use_mi_batchbuffer_start = param-&gt;value;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case I915_SETPARAM_TEX_LRU_LOG_GRANULARITY:</div><div class='ctx'> 		dev_priv-&gt;tex_lru_log_granularity = param-&gt;value;</div><div class='hunk'>@@ -749,8 +794,8 @@ static int i915_set_status_page(struct drm_device *dev, void *data,</div><div class='ctx'> 	dev_priv-&gt;hw_status_page = dev_priv-&gt;hws_map.handle;</div><div class='ctx'> </div><div class='ctx'> 	memset(dev_priv-&gt;hw_status_page, 0, PAGE_SIZE);</div><div class='del'>-	I915_WRITE(0x02080, dev_priv-&gt;status_gfx_addr);</div><div class='del'>-	DRM_DEBUG("load hws 0x2080 with gfx mem 0x%x\n",</div><div class='add'>+	I915_WRITE(HWS_PGA, dev_priv-&gt;status_gfx_addr);</div><div class='add'>+	DRM_DEBUG("load hws HWS_PGA with gfx mem 0x%x\n",</div><div class='ctx'> 			dev_priv-&gt;status_gfx_addr);</div><div class='ctx'> 	DRM_DEBUG("load hws at %p\n", dev_priv-&gt;hw_status_page);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -776,14 +821,38 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)</div><div class='ctx'> 	memset(dev_priv, 0, sizeof(drm_i915_private_t));</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;dev_private = (void *)dev_priv;</div><div class='add'>+	dev_priv-&gt;dev = dev;</div><div class='ctx'> </div><div class='ctx'> 	/* Add register map (needed for suspend/resume) */</div><div class='ctx'> 	base = drm_get_resource_start(dev, mmio_bar);</div><div class='ctx'> 	size = drm_get_resource_len(dev, mmio_bar);</div><div class='ctx'> </div><div class='del'>-	ret = drm_addmap(dev, base, size, _DRM_REGISTERS,</div><div class='del'>-			 _DRM_KERNEL | _DRM_DRIVER,</div><div class='del'>-			 &amp;dev_priv-&gt;mmio_map);</div><div class='add'>+	dev_priv-&gt;regs = ioremap(base, size);</div><div class='add'>+</div><div class='add'>+	i915_gem_load(dev);</div><div class='add'>+</div><div class='add'>+	/* Init HWS */</div><div class='add'>+	if (!I915_NEED_GFX_HWS(dev)) {</div><div class='add'>+		ret = i915_init_phys_hws(dev);</div><div class='add'>+		if (ret != 0)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* On the 945G/GM, the chipset reports the MSI capability on the</div><div class='add'>+	 * integrated graphics even though the support isn't actually there</div><div class='add'>+	 * according to the published specs.  It doesn't appear to function</div><div class='add'>+	 * correctly in testing on 945G.</div><div class='add'>+	 * This may be a side effect of MSI having been made available for PEG</div><div class='add'>+	 * and the registers being closely associated.</div><div class='add'>+	 */</div><div class='add'>+	if (!IS_I945G(dev) &amp;&amp; !IS_I945GM(dev))</div><div class='add'>+		if (pci_enable_msi(dev-&gt;pdev))</div><div class='add'>+			DRM_ERROR("failed to enable MSI\n");</div><div class='add'>+</div><div class='add'>+	intel_opregion_init(dev);</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;dev_priv-&gt;user_irq_lock);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -791,8 +860,15 @@ int i915_driver_unload(struct drm_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct drm_i915_private *dev_priv = dev-&gt;dev_private;</div><div class='ctx'> </div><div class='del'>-	if (dev_priv-&gt;mmio_map)</div><div class='del'>-		drm_rmmap(dev, dev_priv-&gt;mmio_map);</div><div class='add'>+	if (dev-&gt;pdev-&gt;msi_enabled)</div><div class='add'>+		pci_disable_msi(dev-&gt;pdev);</div><div class='add'>+</div><div class='add'>+	i915_free_hws(dev);</div><div class='add'>+</div><div class='add'>+	if (dev_priv-&gt;regs != NULL)</div><div class='add'>+		iounmap(dev_priv-&gt;regs);</div><div class='add'>+</div><div class='add'>+	intel_opregion_free(dev);</div><div class='ctx'> </div><div class='ctx'> 	drm_free(dev-&gt;dev_private, sizeof(drm_i915_private_t),</div><div class='ctx'> 		 DRM_MEM_DRIVER);</div><div class='hunk'>@@ -800,6 +876,25 @@ int i915_driver_unload(struct drm_device *dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int i915_driver_open(struct drm_device *dev, struct drm_file *file_priv)</div><div class='add'>+{</div><div class='add'>+	struct drm_i915_file_private *i915_file_priv;</div><div class='add'>+</div><div class='add'>+	DRM_DEBUG("\n");</div><div class='add'>+	i915_file_priv = (struct drm_i915_file_private *)</div><div class='add'>+	    drm_alloc(sizeof(*i915_file_priv), DRM_MEM_FILES);</div><div class='add'>+</div><div class='add'>+	if (!i915_file_priv)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	file_priv-&gt;driver_priv = i915_file_priv;</div><div class='add'>+</div><div class='add'>+	i915_file_priv-&gt;mm.last_gem_seqno = 0;</div><div class='add'>+	i915_file_priv-&gt;mm.last_gem_throttle_seqno = 0;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void i915_driver_lastclose(struct drm_device * dev)</div><div class='ctx'> {</div><div class='ctx'> 	drm_i915_private_t *dev_priv = dev-&gt;dev_private;</div><div class='hunk'>@@ -807,6 +902,8 @@ void i915_driver_lastclose(struct drm_device * dev)</div><div class='ctx'> 	if (!dev_priv)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	i915_gem_lastclose(dev);</div><div class='add'>+</div><div class='ctx'> 	if (dev_priv-&gt;agp_heap)</div><div class='ctx'> 		i915_mem_takedown(&amp;(dev_priv-&gt;agp_heap));</div><div class='ctx'> </div><div class='hunk'>@@ -819,6 +916,13 @@ void i915_driver_preclose(struct drm_device * dev, struct drm_file *file_priv)</div><div class='ctx'> 	i915_mem_release(dev, file_priv, dev_priv-&gt;agp_heap);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void i915_driver_postclose(struct drm_device *dev, struct drm_file *file_priv)</div><div class='add'>+{</div><div class='add'>+	struct drm_i915_file_private *i915_file_priv = file_priv-&gt;driver_priv;</div><div class='add'>+</div><div class='add'>+	drm_free(i915_file_priv, sizeof(*i915_file_priv), DRM_MEM_FILES);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> struct drm_ioctl_desc i915_ioctls[] = {</div><div class='ctx'> 	DRM_IOCTL_DEF(DRM_I915_INIT, i915_dma_init, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),</div><div class='ctx'> 	DRM_IOCTL_DEF(DRM_I915_FLUSH, i915_flush_ioctl, DRM_AUTH),</div><div class='hunk'>@@ -836,7 +940,23 @@ struct drm_ioctl_desc i915_ioctls[] = {</div><div class='ctx'> 	DRM_IOCTL_DEF(DRM_I915_SET_VBLANK_PIPE,  i915_vblank_pipe_set, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY ),</div><div class='ctx'> 	DRM_IOCTL_DEF(DRM_I915_GET_VBLANK_PIPE,  i915_vblank_pipe_get, DRM_AUTH ),</div><div class='ctx'> 	DRM_IOCTL_DEF(DRM_I915_VBLANK_SWAP, i915_vblank_swap, DRM_AUTH),</div><div class='del'>-	DRM_IOCTL_DEF(DRM_I915_HWS_ADDR, i915_set_status_page, DRM_AUTH),</div><div class='add'>+	DRM_IOCTL_DEF(DRM_I915_HWS_ADDR, i915_set_status_page, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),</div><div class='add'>+	DRM_IOCTL_DEF(DRM_I915_GEM_INIT, i915_gem_init_ioctl, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),</div><div class='add'>+	DRM_IOCTL_DEF(DRM_I915_GEM_EXECBUFFER, i915_gem_execbuffer, DRM_AUTH),</div><div class='add'>+	DRM_IOCTL_DEF(DRM_I915_GEM_PIN, i915_gem_pin_ioctl, DRM_AUTH|DRM_ROOT_ONLY),</div><div class='add'>+	DRM_IOCTL_DEF(DRM_I915_GEM_UNPIN, i915_gem_unpin_ioctl, DRM_AUTH|DRM_ROOT_ONLY),</div><div class='add'>+	DRM_IOCTL_DEF(DRM_I915_GEM_BUSY, i915_gem_busy_ioctl, DRM_AUTH),</div><div class='add'>+	DRM_IOCTL_DEF(DRM_I915_GEM_THROTTLE, i915_gem_throttle_ioctl, DRM_AUTH),</div><div class='add'>+	DRM_IOCTL_DEF(DRM_I915_GEM_ENTERVT, i915_gem_entervt_ioctl, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),</div><div class='add'>+	DRM_IOCTL_DEF(DRM_I915_GEM_LEAVEVT, i915_gem_leavevt_ioctl, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),</div><div class='add'>+	DRM_IOCTL_DEF(DRM_I915_GEM_CREATE, i915_gem_create_ioctl, 0),</div><div class='add'>+	DRM_IOCTL_DEF(DRM_I915_GEM_PREAD, i915_gem_pread_ioctl, 0),</div><div class='add'>+	DRM_IOCTL_DEF(DRM_I915_GEM_PWRITE, i915_gem_pwrite_ioctl, 0),</div><div class='add'>+	DRM_IOCTL_DEF(DRM_I915_GEM_MMAP, i915_gem_mmap_ioctl, 0),</div><div class='add'>+	DRM_IOCTL_DEF(DRM_I915_GEM_SET_DOMAIN, i915_gem_set_domain_ioctl, 0),</div><div class='add'>+	DRM_IOCTL_DEF(DRM_I915_GEM_SW_FINISH, i915_gem_sw_finish_ioctl, 0),</div><div class='add'>+	DRM_IOCTL_DEF(DRM_I915_GEM_SET_TILING, i915_gem_set_tiling, 0),</div><div class='add'>+	DRM_IOCTL_DEF(DRM_I915_GEM_GET_TILING, i915_gem_get_tiling, 0),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int i915_max_ioctl = DRM_ARRAY_SIZE(i915_ioctls);</div><div class='head'>diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c<br/>index 93aed1c38bd2..a80ead215282 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpu/drm/i915/i915_drv.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/gpu/drm/i915/i915_drv.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpu/drm/i915/i915_drv.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/i915/i915_drv.c</a></div><div class='hunk'>@@ -38,211 +38,9 @@ static struct pci_device_id pciidlist[] = {</div><div class='ctx'> 	i915_PCI_IDS</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-enum pipe {</div><div class='del'>-    PIPE_A = 0,</div><div class='del'>-    PIPE_B,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static bool i915_pipe_enabled(struct drm_device *dev, enum pipe pipe)</div><div class='del'>-{</div><div class='del'>-	struct drm_i915_private *dev_priv = dev-&gt;dev_private;</div><div class='del'>-</div><div class='del'>-	if (pipe == PIPE_A)</div><div class='del'>-		return (I915_READ(DPLL_A) &amp; DPLL_VCO_ENABLE);</div><div class='del'>-	else</div><div class='del'>-		return (I915_READ(DPLL_B) &amp; DPLL_VCO_ENABLE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void i915_save_palette(struct drm_device *dev, enum pipe pipe)</div><div class='del'>-{</div><div class='del'>-	struct drm_i915_private *dev_priv = dev-&gt;dev_private;</div><div class='del'>-	unsigned long reg = (pipe == PIPE_A ? PALETTE_A : PALETTE_B);</div><div class='del'>-	u32 *array;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (!i915_pipe_enabled(dev, pipe))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (pipe == PIPE_A)</div><div class='del'>-		array = dev_priv-&gt;save_palette_a;</div><div class='del'>-	else</div><div class='del'>-		array = dev_priv-&gt;save_palette_b;</div><div class='del'>-</div><div class='del'>-	for(i = 0; i &lt; 256; i++)</div><div class='del'>-		array[i] = I915_READ(reg + (i &lt;&lt; 2));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void i915_restore_palette(struct drm_device *dev, enum pipe pipe)</div><div class='del'>-{</div><div class='del'>-	struct drm_i915_private *dev_priv = dev-&gt;dev_private;</div><div class='del'>-	unsigned long reg = (pipe == PIPE_A ? PALETTE_A : PALETTE_B);</div><div class='del'>-	u32 *array;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (!i915_pipe_enabled(dev, pipe))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (pipe == PIPE_A)</div><div class='del'>-		array = dev_priv-&gt;save_palette_a;</div><div class='del'>-	else</div><div class='del'>-		array = dev_priv-&gt;save_palette_b;</div><div class='del'>-</div><div class='del'>-	for(i = 0; i &lt; 256; i++)</div><div class='del'>-		I915_WRITE(reg + (i &lt;&lt; 2), array[i]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u8 i915_read_indexed(u16 index_port, u16 data_port, u8 reg)</div><div class='del'>-{</div><div class='del'>-	outb(reg, index_port);</div><div class='del'>-	return inb(data_port);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u8 i915_read_ar(u16 st01, u8 reg, u16 palette_enable)</div><div class='del'>-{</div><div class='del'>-	inb(st01);</div><div class='del'>-	outb(palette_enable | reg, VGA_AR_INDEX);</div><div class='del'>-	return inb(VGA_AR_DATA_READ);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void i915_write_ar(u8 st01, u8 reg, u8 val, u16 palette_enable)</div><div class='del'>-{</div><div class='del'>-	inb(st01);</div><div class='del'>-	outb(palette_enable | reg, VGA_AR_INDEX);</div><div class='del'>-	outb(val, VGA_AR_DATA_WRITE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void i915_write_indexed(u16 index_port, u16 data_port, u8 reg, u8 val)</div><div class='del'>-{</div><div class='del'>-	outb(reg, index_port);</div><div class='del'>-	outb(val, data_port);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void i915_save_vga(struct drm_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct drm_i915_private *dev_priv = dev-&gt;dev_private;</div><div class='del'>-	int i;</div><div class='del'>-	u16 cr_index, cr_data, st01;</div><div class='del'>-</div><div class='del'>-	/* VGA color palette registers */</div><div class='del'>-	dev_priv-&gt;saveDACMASK = inb(VGA_DACMASK);</div><div class='del'>-	/* DACCRX automatically increments during read */</div><div class='del'>-	outb(0, VGA_DACRX);</div><div class='del'>-	/* Read 3 bytes of color data from each index */</div><div class='del'>-	for (i = 0; i &lt; 256 * 3; i++)</div><div class='del'>-		dev_priv-&gt;saveDACDATA[i] = inb(VGA_DACDATA);</div><div class='del'>-</div><div class='del'>-	/* MSR bits */</div><div class='del'>-	dev_priv-&gt;saveMSR = inb(VGA_MSR_READ);</div><div class='del'>-	if (dev_priv-&gt;saveMSR &amp; VGA_MSR_CGA_MODE) {</div><div class='del'>-		cr_index = VGA_CR_INDEX_CGA;</div><div class='del'>-		cr_data = VGA_CR_DATA_CGA;</div><div class='del'>-		st01 = VGA_ST01_CGA;</div><div class='del'>-	} else {</div><div class='del'>-		cr_index = VGA_CR_INDEX_MDA;</div><div class='del'>-		cr_data = VGA_CR_DATA_MDA;</div><div class='del'>-		st01 = VGA_ST01_MDA;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* CRT controller regs */</div><div class='del'>-	i915_write_indexed(cr_index, cr_data, 0x11,</div><div class='del'>-			   i915_read_indexed(cr_index, cr_data, 0x11) &amp;</div><div class='del'>-			   (~0x80));</div><div class='del'>-	for (i = 0; i &lt;= 0x24; i++)</div><div class='del'>-		dev_priv-&gt;saveCR[i] =</div><div class='del'>-			i915_read_indexed(cr_index, cr_data, i);</div><div class='del'>-	/* Make sure we don't turn off CR group 0 writes */</div><div class='del'>-	dev_priv-&gt;saveCR[0x11] &amp;= ~0x80;</div><div class='del'>-</div><div class='del'>-	/* Attribute controller registers */</div><div class='del'>-	inb(st01);</div><div class='del'>-	dev_priv-&gt;saveAR_INDEX = inb(VGA_AR_INDEX);</div><div class='del'>-	for (i = 0; i &lt;= 0x14; i++)</div><div class='del'>-		dev_priv-&gt;saveAR[i] = i915_read_ar(st01, i, 0);</div><div class='del'>-	inb(st01);</div><div class='del'>-	outb(dev_priv-&gt;saveAR_INDEX, VGA_AR_INDEX);</div><div class='del'>-	inb(st01);</div><div class='del'>-</div><div class='del'>-	/* Graphics controller registers */</div><div class='del'>-	for (i = 0; i &lt; 9; i++)</div><div class='del'>-		dev_priv-&gt;saveGR[i] =</div><div class='del'>-			i915_read_indexed(VGA_GR_INDEX, VGA_GR_DATA, i);</div><div class='del'>-</div><div class='del'>-	dev_priv-&gt;saveGR[0x10] =</div><div class='del'>-		i915_read_indexed(VGA_GR_INDEX, VGA_GR_DATA, 0x10);</div><div class='del'>-	dev_priv-&gt;saveGR[0x11] =</div><div class='del'>-		i915_read_indexed(VGA_GR_INDEX, VGA_GR_DATA, 0x11);</div><div class='del'>-	dev_priv-&gt;saveGR[0x18] =</div><div class='del'>-		i915_read_indexed(VGA_GR_INDEX, VGA_GR_DATA, 0x18);</div><div class='del'>-</div><div class='del'>-	/* Sequencer registers */</div><div class='del'>-	for (i = 0; i &lt; 8; i++)</div><div class='del'>-		dev_priv-&gt;saveSR[i] =</div><div class='del'>-			i915_read_indexed(VGA_SR_INDEX, VGA_SR_DATA, i);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void i915_restore_vga(struct drm_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct drm_i915_private *dev_priv = dev-&gt;dev_private;</div><div class='del'>-	int i;</div><div class='del'>-	u16 cr_index, cr_data, st01;</div><div class='del'>-</div><div class='del'>-	/* MSR bits */</div><div class='del'>-	outb(dev_priv-&gt;saveMSR, VGA_MSR_WRITE);</div><div class='del'>-	if (dev_priv-&gt;saveMSR &amp; VGA_MSR_CGA_MODE) {</div><div class='del'>-		cr_index = VGA_CR_INDEX_CGA;</div><div class='del'>-		cr_data = VGA_CR_DATA_CGA;</div><div class='del'>-		st01 = VGA_ST01_CGA;</div><div class='del'>-	} else {</div><div class='del'>-		cr_index = VGA_CR_INDEX_MDA;</div><div class='del'>-		cr_data = VGA_CR_DATA_MDA;</div><div class='del'>-		st01 = VGA_ST01_MDA;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Sequencer registers, don't write SR07 */</div><div class='del'>-	for (i = 0; i &lt; 7; i++)</div><div class='del'>-		i915_write_indexed(VGA_SR_INDEX, VGA_SR_DATA, i,</div><div class='del'>-				   dev_priv-&gt;saveSR[i]);</div><div class='del'>-</div><div class='del'>-	/* CRT controller regs */</div><div class='del'>-	/* Enable CR group 0 writes */</div><div class='del'>-	i915_write_indexed(cr_index, cr_data, 0x11, dev_priv-&gt;saveCR[0x11]);</div><div class='del'>-	for (i = 0; i &lt;= 0x24; i++)</div><div class='del'>-		i915_write_indexed(cr_index, cr_data, i, dev_priv-&gt;saveCR[i]);</div><div class='del'>-</div><div class='del'>-	/* Graphics controller regs */</div><div class='del'>-	for (i = 0; i &lt; 9; i++)</div><div class='del'>-		i915_write_indexed(VGA_GR_INDEX, VGA_GR_DATA, i,</div><div class='del'>-				   dev_priv-&gt;saveGR[i]);</div><div class='del'>-</div><div class='del'>-	i915_write_indexed(VGA_GR_INDEX, VGA_GR_DATA, 0x10,</div><div class='del'>-			   dev_priv-&gt;saveGR[0x10]);</div><div class='del'>-	i915_write_indexed(VGA_GR_INDEX, VGA_GR_DATA, 0x11,</div><div class='del'>-			   dev_priv-&gt;saveGR[0x11]);</div><div class='del'>-	i915_write_indexed(VGA_GR_INDEX, VGA_GR_DATA, 0x18,</div><div class='del'>-			   dev_priv-&gt;saveGR[0x18]);</div><div class='del'>-</div><div class='del'>-	/* Attribute controller registers */</div><div class='del'>-	inb(st01);</div><div class='del'>-	for (i = 0; i &lt;= 0x14; i++)</div><div class='del'>-		i915_write_ar(st01, i, dev_priv-&gt;saveAR[i], 0);</div><div class='del'>-	inb(st01); /* switch back to index mode */</div><div class='del'>-	outb(dev_priv-&gt;saveAR_INDEX | 0x20, VGA_AR_INDEX);</div><div class='del'>-	inb(st01);</div><div class='del'>-</div><div class='del'>-	/* VGA color palette registers */</div><div class='del'>-	outb(dev_priv-&gt;saveDACMASK, VGA_DACMASK);</div><div class='del'>-	/* DACCRX automatically increments during read */</div><div class='del'>-	outb(0, VGA_DACWX);</div><div class='del'>-	/* Read 3 bytes of color data from each index */</div><div class='del'>-	for (i = 0; i &lt; 256 * 3; i++)</div><div class='del'>-		outb(dev_priv-&gt;saveDACDATA[i], VGA_DACDATA);</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int i915_suspend(struct drm_device *dev, pm_message_t state)</div><div class='ctx'> {</div><div class='ctx'> 	struct drm_i915_private *dev_priv = dev-&gt;dev_private;</div><div class='del'>-	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (!dev || !dev_priv) {</div><div class='ctx'> 		printk(KERN_ERR "dev: %p, dev_priv: %p\n", dev, dev_priv);</div><div class='hunk'>@@ -254,122 +52,10 @@ static int i915_suspend(struct drm_device *dev, pm_message_t state)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	pci_save_state(dev-&gt;pdev);</div><div class='del'>-	pci_read_config_byte(dev-&gt;pdev, LBB, &amp;dev_priv-&gt;saveLBB);</div><div class='del'>-</div><div class='del'>-	/* Display arbitration control */</div><div class='del'>-	dev_priv-&gt;saveDSPARB = I915_READ(DSPARB);</div><div class='del'>-</div><div class='del'>-	/* Pipe &amp; plane A info */</div><div class='del'>-	dev_priv-&gt;savePIPEACONF = I915_READ(PIPEACONF);</div><div class='del'>-	dev_priv-&gt;savePIPEASRC = I915_READ(PIPEASRC);</div><div class='del'>-	dev_priv-&gt;saveFPA0 = I915_READ(FPA0);</div><div class='del'>-	dev_priv-&gt;saveFPA1 = I915_READ(FPA1);</div><div class='del'>-	dev_priv-&gt;saveDPLL_A = I915_READ(DPLL_A);</div><div class='del'>-	if (IS_I965G(dev))</div><div class='del'>-		dev_priv-&gt;saveDPLL_A_MD = I915_READ(DPLL_A_MD);</div><div class='del'>-	dev_priv-&gt;saveHTOTAL_A = I915_READ(HTOTAL_A);</div><div class='del'>-	dev_priv-&gt;saveHBLANK_A = I915_READ(HBLANK_A);</div><div class='del'>-	dev_priv-&gt;saveHSYNC_A = I915_READ(HSYNC_A);</div><div class='del'>-	dev_priv-&gt;saveVTOTAL_A = I915_READ(VTOTAL_A);</div><div class='del'>-	dev_priv-&gt;saveVBLANK_A = I915_READ(VBLANK_A);</div><div class='del'>-	dev_priv-&gt;saveVSYNC_A = I915_READ(VSYNC_A);</div><div class='del'>-	dev_priv-&gt;saveBCLRPAT_A = I915_READ(BCLRPAT_A);</div><div class='del'>-</div><div class='del'>-	dev_priv-&gt;saveDSPACNTR = I915_READ(DSPACNTR);</div><div class='del'>-	dev_priv-&gt;saveDSPASTRIDE = I915_READ(DSPASTRIDE);</div><div class='del'>-	dev_priv-&gt;saveDSPASIZE = I915_READ(DSPASIZE);</div><div class='del'>-	dev_priv-&gt;saveDSPAPOS = I915_READ(DSPAPOS);</div><div class='del'>-	dev_priv-&gt;saveDSPABASE = I915_READ(DSPABASE);</div><div class='del'>-	if (IS_I965G(dev)) {</div><div class='del'>-		dev_priv-&gt;saveDSPASURF = I915_READ(DSPASURF);</div><div class='del'>-		dev_priv-&gt;saveDSPATILEOFF = I915_READ(DSPATILEOFF);</div><div class='del'>-	}</div><div class='del'>-	i915_save_palette(dev, PIPE_A);</div><div class='del'>-	dev_priv-&gt;savePIPEASTAT = I915_READ(I915REG_PIPEASTAT);</div><div class='del'>-</div><div class='del'>-	/* Pipe &amp; plane B info */</div><div class='del'>-	dev_priv-&gt;savePIPEBCONF = I915_READ(PIPEBCONF);</div><div class='del'>-	dev_priv-&gt;savePIPEBSRC = I915_READ(PIPEBSRC);</div><div class='del'>-	dev_priv-&gt;saveFPB0 = I915_READ(FPB0);</div><div class='del'>-	dev_priv-&gt;saveFPB1 = I915_READ(FPB1);</div><div class='del'>-	dev_priv-&gt;saveDPLL_B = I915_READ(DPLL_B);</div><div class='del'>-	if (IS_I965G(dev))</div><div class='del'>-		dev_priv-&gt;saveDPLL_B_MD = I915_READ(DPLL_B_MD);</div><div class='del'>-	dev_priv-&gt;saveHTOTAL_B = I915_READ(HTOTAL_B);</div><div class='del'>-	dev_priv-&gt;saveHBLANK_B = I915_READ(HBLANK_B);</div><div class='del'>-	dev_priv-&gt;saveHSYNC_B = I915_READ(HSYNC_B);</div><div class='del'>-	dev_priv-&gt;saveVTOTAL_B = I915_READ(VTOTAL_B);</div><div class='del'>-	dev_priv-&gt;saveVBLANK_B = I915_READ(VBLANK_B);</div><div class='del'>-	dev_priv-&gt;saveVSYNC_B = I915_READ(VSYNC_B);</div><div class='del'>-	dev_priv-&gt;saveBCLRPAT_A = I915_READ(BCLRPAT_A);</div><div class='del'>-</div><div class='del'>-	dev_priv-&gt;saveDSPBCNTR = I915_READ(DSPBCNTR);</div><div class='del'>-	dev_priv-&gt;saveDSPBSTRIDE = I915_READ(DSPBSTRIDE);</div><div class='del'>-	dev_priv-&gt;saveDSPBSIZE = I915_READ(DSPBSIZE);</div><div class='del'>-	dev_priv-&gt;saveDSPBPOS = I915_READ(DSPBPOS);</div><div class='del'>-	dev_priv-&gt;saveDSPBBASE = I915_READ(DSPBBASE);</div><div class='del'>-	if (IS_I965GM(dev) || IS_IGD_GM(dev)) {</div><div class='del'>-		dev_priv-&gt;saveDSPBSURF = I915_READ(DSPBSURF);</div><div class='del'>-		dev_priv-&gt;saveDSPBTILEOFF = I915_READ(DSPBTILEOFF);</div><div class='del'>-	}</div><div class='del'>-	i915_save_palette(dev, PIPE_B);</div><div class='del'>-	dev_priv-&gt;savePIPEBSTAT = I915_READ(I915REG_PIPEBSTAT);</div><div class='ctx'> </div><div class='del'>-	/* CRT state */</div><div class='del'>-	dev_priv-&gt;saveADPA = I915_READ(ADPA);</div><div class='add'>+	i915_save_state(dev);</div><div class='ctx'> </div><div class='del'>-	/* LVDS state */</div><div class='del'>-	dev_priv-&gt;savePP_CONTROL = I915_READ(PP_CONTROL);</div><div class='del'>-	dev_priv-&gt;savePFIT_PGM_RATIOS = I915_READ(PFIT_PGM_RATIOS);</div><div class='del'>-	dev_priv-&gt;saveBLC_PWM_CTL = I915_READ(BLC_PWM_CTL);</div><div class='del'>-	if (IS_I965G(dev))</div><div class='del'>-		dev_priv-&gt;saveBLC_PWM_CTL2 = I915_READ(BLC_PWM_CTL2);</div><div class='del'>-	if (IS_MOBILE(dev) &amp;&amp; !IS_I830(dev))</div><div class='del'>-		dev_priv-&gt;saveLVDS = I915_READ(LVDS);</div><div class='del'>-	if (!IS_I830(dev) &amp;&amp; !IS_845G(dev))</div><div class='del'>-		dev_priv-&gt;savePFIT_CONTROL = I915_READ(PFIT_CONTROL);</div><div class='del'>-	dev_priv-&gt;saveLVDSPP_ON = I915_READ(LVDSPP_ON);</div><div class='del'>-	dev_priv-&gt;saveLVDSPP_OFF = I915_READ(LVDSPP_OFF);</div><div class='del'>-	dev_priv-&gt;savePP_CYCLE = I915_READ(PP_CYCLE);</div><div class='del'>-</div><div class='del'>-	/* FIXME: save TV &amp; SDVO state */</div><div class='del'>-</div><div class='del'>-	/* FBC state */</div><div class='del'>-	dev_priv-&gt;saveFBC_CFB_BASE = I915_READ(FBC_CFB_BASE);</div><div class='del'>-	dev_priv-&gt;saveFBC_LL_BASE = I915_READ(FBC_LL_BASE);</div><div class='del'>-	dev_priv-&gt;saveFBC_CONTROL2 = I915_READ(FBC_CONTROL2);</div><div class='del'>-	dev_priv-&gt;saveFBC_CONTROL = I915_READ(FBC_CONTROL);</div><div class='del'>-</div><div class='del'>-	/* Interrupt state */</div><div class='del'>-	dev_priv-&gt;saveIIR = I915_READ(I915REG_INT_IDENTITY_R);</div><div class='del'>-	dev_priv-&gt;saveIER = I915_READ(I915REG_INT_ENABLE_R);</div><div class='del'>-	dev_priv-&gt;saveIMR = I915_READ(I915REG_INT_MASK_R);</div><div class='del'>-</div><div class='del'>-	/* VGA state */</div><div class='del'>-	dev_priv-&gt;saveVCLK_DIVISOR_VGA0 = I915_READ(VCLK_DIVISOR_VGA0);</div><div class='del'>-	dev_priv-&gt;saveVCLK_DIVISOR_VGA1 = I915_READ(VCLK_DIVISOR_VGA1);</div><div class='del'>-	dev_priv-&gt;saveVCLK_POST_DIV = I915_READ(VCLK_POST_DIV);</div><div class='del'>-	dev_priv-&gt;saveVGACNTRL = I915_READ(VGACNTRL);</div><div class='del'>-</div><div class='del'>-	/* Clock gating state */</div><div class='del'>-	dev_priv-&gt;saveD_STATE = I915_READ(D_STATE);</div><div class='del'>-	dev_priv-&gt;saveDSPCLK_GATE_D = I915_READ(DSPCLK_GATE_D);</div><div class='del'>-</div><div class='del'>-	/* Cache mode state */</div><div class='del'>-	dev_priv-&gt;saveCACHE_MODE_0 = I915_READ(CACHE_MODE_0);</div><div class='del'>-</div><div class='del'>-	/* Memory Arbitration state */</div><div class='del'>-	dev_priv-&gt;saveMI_ARB_STATE = I915_READ(MI_ARB_STATE);</div><div class='del'>-</div><div class='del'>-	/* Scratch space */</div><div class='del'>-	for (i = 0; i &lt; 16; i++) {</div><div class='del'>-		dev_priv-&gt;saveSWF0[i] = I915_READ(SWF0 + (i &lt;&lt; 2));</div><div class='del'>-		dev_priv-&gt;saveSWF1[i] = I915_READ(SWF10 + (i &lt;&lt; 2));</div><div class='del'>-	}</div><div class='del'>-	for (i = 0; i &lt; 3; i++)</div><div class='del'>-		dev_priv-&gt;saveSWF2[i] = I915_READ(SWF30 + (i &lt;&lt; 2));</div><div class='del'>-</div><div class='del'>-	i915_save_vga(dev);</div><div class='add'>+	intel_opregion_free(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (state.event == PM_EVENT_SUSPEND) {</div><div class='ctx'> 		/* Shut down the device */</div><div class='hunk'>@@ -382,155 +68,15 @@ static int i915_suspend(struct drm_device *dev, pm_message_t state)</div><div class='ctx'> </div><div class='ctx'> static int i915_resume(struct drm_device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct drm_i915_private *dev_priv = dev-&gt;dev_private;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='ctx'> 	pci_set_power_state(dev-&gt;pdev, PCI_D0);</div><div class='ctx'> 	pci_restore_state(dev-&gt;pdev);</div><div class='ctx'> 	if (pci_enable_device(dev-&gt;pdev))</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	pci_set_master(dev-&gt;pdev);</div><div class='ctx'> </div><div class='del'>-	pci_write_config_byte(dev-&gt;pdev, LBB, dev_priv-&gt;saveLBB);</div><div class='del'>-</div><div class='del'>-	I915_WRITE(DSPARB, dev_priv-&gt;saveDSPARB);</div><div class='del'>-</div><div class='del'>-	/* Pipe &amp; plane A info */</div><div class='del'>-	/* Prime the clock */</div><div class='del'>-	if (dev_priv-&gt;saveDPLL_A &amp; DPLL_VCO_ENABLE) {</div><div class='del'>-		I915_WRITE(DPLL_A, dev_priv-&gt;saveDPLL_A &amp;</div><div class='del'>-			   ~DPLL_VCO_ENABLE);</div><div class='del'>-		udelay(150);</div><div class='del'>-	}</div><div class='del'>-	I915_WRITE(FPA0, dev_priv-&gt;saveFPA0);</div><div class='del'>-	I915_WRITE(FPA1, dev_priv-&gt;saveFPA1);</div><div class='del'>-	/* Actually enable it */</div><div class='del'>-	I915_WRITE(DPLL_A, dev_priv-&gt;saveDPLL_A);</div><div class='del'>-	udelay(150);</div><div class='del'>-	if (IS_I965G(dev))</div><div class='del'>-		I915_WRITE(DPLL_A_MD, dev_priv-&gt;saveDPLL_A_MD);</div><div class='del'>-	udelay(150);</div><div class='del'>-</div><div class='del'>-	/* Restore mode */</div><div class='del'>-	I915_WRITE(HTOTAL_A, dev_priv-&gt;saveHTOTAL_A);</div><div class='del'>-	I915_WRITE(HBLANK_A, dev_priv-&gt;saveHBLANK_A);</div><div class='del'>-	I915_WRITE(HSYNC_A, dev_priv-&gt;saveHSYNC_A);</div><div class='del'>-	I915_WRITE(VTOTAL_A, dev_priv-&gt;saveVTOTAL_A);</div><div class='del'>-	I915_WRITE(VBLANK_A, dev_priv-&gt;saveVBLANK_A);</div><div class='del'>-	I915_WRITE(VSYNC_A, dev_priv-&gt;saveVSYNC_A);</div><div class='del'>-	I915_WRITE(BCLRPAT_A, dev_priv-&gt;saveBCLRPAT_A);</div><div class='del'>-</div><div class='del'>-	/* Restore plane info */</div><div class='del'>-	I915_WRITE(DSPASIZE, dev_priv-&gt;saveDSPASIZE);</div><div class='del'>-	I915_WRITE(DSPAPOS, dev_priv-&gt;saveDSPAPOS);</div><div class='del'>-	I915_WRITE(PIPEASRC, dev_priv-&gt;savePIPEASRC);</div><div class='del'>-	I915_WRITE(DSPABASE, dev_priv-&gt;saveDSPABASE);</div><div class='del'>-	I915_WRITE(DSPASTRIDE, dev_priv-&gt;saveDSPASTRIDE);</div><div class='del'>-	if (IS_I965G(dev)) {</div><div class='del'>-		I915_WRITE(DSPASURF, dev_priv-&gt;saveDSPASURF);</div><div class='del'>-		I915_WRITE(DSPATILEOFF, dev_priv-&gt;saveDSPATILEOFF);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	I915_WRITE(PIPEACONF, dev_priv-&gt;savePIPEACONF);</div><div class='del'>-</div><div class='del'>-	i915_restore_palette(dev, PIPE_A);</div><div class='del'>-	/* Enable the plane */</div><div class='del'>-	I915_WRITE(DSPACNTR, dev_priv-&gt;saveDSPACNTR);</div><div class='del'>-	I915_WRITE(DSPABASE, I915_READ(DSPABASE));</div><div class='del'>-</div><div class='del'>-	/* Pipe &amp; plane B info */</div><div class='del'>-	if (dev_priv-&gt;saveDPLL_B &amp; DPLL_VCO_ENABLE) {</div><div class='del'>-		I915_WRITE(DPLL_B, dev_priv-&gt;saveDPLL_B &amp;</div><div class='del'>-			   ~DPLL_VCO_ENABLE);</div><div class='del'>-		udelay(150);</div><div class='del'>-	}</div><div class='del'>-	I915_WRITE(FPB0, dev_priv-&gt;saveFPB0);</div><div class='del'>-	I915_WRITE(FPB1, dev_priv-&gt;saveFPB1);</div><div class='del'>-	/* Actually enable it */</div><div class='del'>-	I915_WRITE(DPLL_B, dev_priv-&gt;saveDPLL_B);</div><div class='del'>-	udelay(150);</div><div class='del'>-	if (IS_I965G(dev))</div><div class='del'>-		I915_WRITE(DPLL_B_MD, dev_priv-&gt;saveDPLL_B_MD);</div><div class='del'>-	udelay(150);</div><div class='del'>-</div><div class='del'>-	/* Restore mode */</div><div class='del'>-	I915_WRITE(HTOTAL_B, dev_priv-&gt;saveHTOTAL_B);</div><div class='del'>-	I915_WRITE(HBLANK_B, dev_priv-&gt;saveHBLANK_B);</div><div class='del'>-	I915_WRITE(HSYNC_B, dev_priv-&gt;saveHSYNC_B);</div><div class='del'>-	I915_WRITE(VTOTAL_B, dev_priv-&gt;saveVTOTAL_B);</div><div class='del'>-	I915_WRITE(VBLANK_B, dev_priv-&gt;saveVBLANK_B);</div><div class='del'>-	I915_WRITE(VSYNC_B, dev_priv-&gt;saveVSYNC_B);</div><div class='del'>-	I915_WRITE(BCLRPAT_B, dev_priv-&gt;saveBCLRPAT_B);</div><div class='del'>-</div><div class='del'>-	/* Restore plane info */</div><div class='del'>-	I915_WRITE(DSPBSIZE, dev_priv-&gt;saveDSPBSIZE);</div><div class='del'>-	I915_WRITE(DSPBPOS, dev_priv-&gt;saveDSPBPOS);</div><div class='del'>-	I915_WRITE(PIPEBSRC, dev_priv-&gt;savePIPEBSRC);</div><div class='del'>-	I915_WRITE(DSPBBASE, dev_priv-&gt;saveDSPBBASE);</div><div class='del'>-	I915_WRITE(DSPBSTRIDE, dev_priv-&gt;saveDSPBSTRIDE);</div><div class='del'>-	if (IS_I965G(dev)) {</div><div class='del'>-		I915_WRITE(DSPBSURF, dev_priv-&gt;saveDSPBSURF);</div><div class='del'>-		I915_WRITE(DSPBTILEOFF, dev_priv-&gt;saveDSPBTILEOFF);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	I915_WRITE(PIPEBCONF, dev_priv-&gt;savePIPEBCONF);</div><div class='del'>-</div><div class='del'>-	i915_restore_palette(dev, PIPE_B);</div><div class='del'>-	/* Enable the plane */</div><div class='del'>-	I915_WRITE(DSPBCNTR, dev_priv-&gt;saveDSPBCNTR);</div><div class='del'>-	I915_WRITE(DSPBBASE, I915_READ(DSPBBASE));</div><div class='del'>-</div><div class='del'>-	/* CRT state */</div><div class='del'>-	I915_WRITE(ADPA, dev_priv-&gt;saveADPA);</div><div class='del'>-</div><div class='del'>-	/* LVDS state */</div><div class='del'>-	if (IS_I965G(dev))</div><div class='del'>-		I915_WRITE(BLC_PWM_CTL2, dev_priv-&gt;saveBLC_PWM_CTL2);</div><div class='del'>-	if (IS_MOBILE(dev) &amp;&amp; !IS_I830(dev))</div><div class='del'>-		I915_WRITE(LVDS, dev_priv-&gt;saveLVDS);</div><div class='del'>-	if (!IS_I830(dev) &amp;&amp; !IS_845G(dev))</div><div class='del'>-		I915_WRITE(PFIT_CONTROL, dev_priv-&gt;savePFIT_CONTROL);</div><div class='del'>-</div><div class='del'>-	I915_WRITE(PFIT_PGM_RATIOS, dev_priv-&gt;savePFIT_PGM_RATIOS);</div><div class='del'>-	I915_WRITE(BLC_PWM_CTL, dev_priv-&gt;saveBLC_PWM_CTL);</div><div class='del'>-	I915_WRITE(LVDSPP_ON, dev_priv-&gt;saveLVDSPP_ON);</div><div class='del'>-	I915_WRITE(LVDSPP_OFF, dev_priv-&gt;saveLVDSPP_OFF);</div><div class='del'>-	I915_WRITE(PP_CYCLE, dev_priv-&gt;savePP_CYCLE);</div><div class='del'>-	I915_WRITE(PP_CONTROL, dev_priv-&gt;savePP_CONTROL);</div><div class='del'>-</div><div class='del'>-	/* FIXME: restore TV &amp; SDVO state */</div><div class='del'>-</div><div class='del'>-	/* FBC info */</div><div class='del'>-	I915_WRITE(FBC_CFB_BASE, dev_priv-&gt;saveFBC_CFB_BASE);</div><div class='del'>-	I915_WRITE(FBC_LL_BASE, dev_priv-&gt;saveFBC_LL_BASE);</div><div class='del'>-	I915_WRITE(FBC_CONTROL2, dev_priv-&gt;saveFBC_CONTROL2);</div><div class='del'>-	I915_WRITE(FBC_CONTROL, dev_priv-&gt;saveFBC_CONTROL);</div><div class='del'>-</div><div class='del'>-	/* VGA state */</div><div class='del'>-	I915_WRITE(VGACNTRL, dev_priv-&gt;saveVGACNTRL);</div><div class='del'>-	I915_WRITE(VCLK_DIVISOR_VGA0, dev_priv-&gt;saveVCLK_DIVISOR_VGA0);</div><div class='del'>-	I915_WRITE(VCLK_DIVISOR_VGA1, dev_priv-&gt;saveVCLK_DIVISOR_VGA1);</div><div class='del'>-	I915_WRITE(VCLK_POST_DIV, dev_priv-&gt;saveVCLK_POST_DIV);</div><div class='del'>-	udelay(150);</div><div class='del'>-</div><div class='del'>-	/* Clock gating state */</div><div class='del'>-	I915_WRITE (D_STATE, dev_priv-&gt;saveD_STATE);</div><div class='del'>-	I915_WRITE (DSPCLK_GATE_D, dev_priv-&gt;saveDSPCLK_GATE_D);</div><div class='del'>-</div><div class='del'>-	/* Cache mode state */</div><div class='del'>-	I915_WRITE (CACHE_MODE_0, dev_priv-&gt;saveCACHE_MODE_0 | 0xffff0000);</div><div class='del'>-</div><div class='del'>-	/* Memory arbitration state */</div><div class='del'>-	I915_WRITE (MI_ARB_STATE, dev_priv-&gt;saveMI_ARB_STATE | 0xffff0000);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 16; i++) {</div><div class='del'>-		I915_WRITE(SWF0 + (i &lt;&lt; 2), dev_priv-&gt;saveSWF0[i]);</div><div class='del'>-		I915_WRITE(SWF10 + (i &lt;&lt; 2), dev_priv-&gt;saveSWF1[i+7]);</div><div class='del'>-	}</div><div class='del'>-	for (i = 0; i &lt; 3; i++)</div><div class='del'>-		I915_WRITE(SWF30 + (i &lt;&lt; 2), dev_priv-&gt;saveSWF2[i]);</div><div class='add'>+	i915_restore_state(dev);</div><div class='ctx'> </div><div class='del'>-	i915_restore_vga(dev);</div><div class='add'>+	intel_opregion_init(dev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -541,17 +87,19 @@ static struct drm_driver driver = {</div><div class='ctx'> 	 */</div><div class='ctx'> 	.driver_features =</div><div class='ctx'> 	    DRIVER_USE_AGP | DRIVER_REQUIRE_AGP | /* DRIVER_USE_MTRR |*/</div><div class='del'>-	    DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | DRIVER_IRQ_VBL |</div><div class='del'>-	    DRIVER_IRQ_VBL2,</div><div class='add'>+	    DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | DRIVER_GEM,</div><div class='ctx'> 	.load = i915_driver_load,</div><div class='ctx'> 	.unload = i915_driver_unload,</div><div class='add'>+	.open = i915_driver_open,</div><div class='ctx'> 	.lastclose = i915_driver_lastclose,</div><div class='ctx'> 	.preclose = i915_driver_preclose,</div><div class='add'>+	.postclose = i915_driver_postclose,</div><div class='ctx'> 	.suspend = i915_suspend,</div><div class='ctx'> 	.resume = i915_resume,</div><div class='ctx'> 	.device_is_agp = i915_driver_device_is_agp,</div><div class='del'>-	.vblank_wait = i915_driver_vblank_wait,</div><div class='del'>-	.vblank_wait2 = i915_driver_vblank_wait2,</div><div class='add'>+	.get_vblank_counter = i915_get_vblank_counter,</div><div class='add'>+	.enable_vblank = i915_enable_vblank,</div><div class='add'>+	.disable_vblank = i915_disable_vblank,</div><div class='ctx'> 	.irq_preinstall = i915_driver_irq_preinstall,</div><div class='ctx'> 	.irq_postinstall = i915_driver_irq_postinstall,</div><div class='ctx'> 	.irq_uninstall = i915_driver_irq_uninstall,</div><div class='hunk'>@@ -559,6 +107,10 @@ static struct drm_driver driver = {</div><div class='ctx'> 	.reclaim_buffers = drm_core_reclaim_buffers,</div><div class='ctx'> 	.get_map_ofs = drm_core_get_map_ofs,</div><div class='ctx'> 	.get_reg_ofs = drm_core_get_reg_ofs,</div><div class='add'>+	.proc_init = i915_gem_proc_init,</div><div class='add'>+	.proc_cleanup = i915_gem_proc_cleanup,</div><div class='add'>+	.gem_init_object = i915_gem_init_object,</div><div class='add'>+	.gem_free_object = i915_gem_free_object,</div><div class='ctx'> 	.ioctls = i915_ioctls,</div><div class='ctx'> 	.fops = {</div><div class='ctx'> 		 .owner = THIS_MODULE,</div><div class='head'>diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h<br/>index d7326d92a237..eae4ed3956e0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpu/drm/i915/i915_drv.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/gpu/drm/i915/i915_drv.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpu/drm/i915/i915_drv.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/i915/i915_drv.h</a></div><div class='hunk'>@@ -30,6 +30,8 @@</div><div class='ctx'> #ifndef _I915_DRV_H_</div><div class='ctx'> #define _I915_DRV_H_</div><div class='ctx'> </div><div class='add'>+#include "i915_reg.h"</div><div class='add'>+</div><div class='ctx'> /* General customization:</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -37,7 +39,12 @@</div><div class='ctx'> </div><div class='ctx'> #define DRIVER_NAME		"i915"</div><div class='ctx'> #define DRIVER_DESC		"Intel Graphics"</div><div class='del'>-#define DRIVER_DATE		"20060119"</div><div class='add'>+#define DRIVER_DATE		"20080730"</div><div class='add'>+</div><div class='add'>+enum pipe {</div><div class='add'>+	PIPE_A = 0,</div><div class='add'>+	PIPE_B,</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> /* Interface history:</div><div class='ctx'>  *</div><div class='hunk'>@@ -53,16 +60,23 @@</div><div class='ctx'> #define DRIVER_MINOR		6</div><div class='ctx'> #define DRIVER_PATCHLEVEL	0</div><div class='ctx'> </div><div class='add'>+#define WATCH_COHERENCY	0</div><div class='add'>+#define WATCH_BUF	0</div><div class='add'>+#define WATCH_EXEC	0</div><div class='add'>+#define WATCH_LRU	0</div><div class='add'>+#define WATCH_RELOC	0</div><div class='add'>+#define WATCH_INACTIVE	0</div><div class='add'>+#define WATCH_PWRITE	0</div><div class='add'>+</div><div class='ctx'> typedef struct _drm_i915_ring_buffer {</div><div class='ctx'> 	int tail_mask;</div><div class='del'>-	unsigned long Start;</div><div class='del'>-	unsigned long End;</div><div class='ctx'> 	unsigned long Size;</div><div class='ctx'> 	u8 *virtual_start;</div><div class='ctx'> 	int head;</div><div class='ctx'> 	int tail;</div><div class='ctx'> 	int space;</div><div class='ctx'> 	drm_local_map_t map;</div><div class='add'>+	struct drm_gem_object *ring_obj;</div><div class='ctx'> } drm_i915_ring_buffer_t;</div><div class='ctx'> </div><div class='ctx'> struct mem_block {</div><div class='hunk'>@@ -76,13 +90,28 @@ struct mem_block {</div><div class='ctx'> typedef struct _drm_i915_vbl_swap {</div><div class='ctx'> 	struct list_head head;</div><div class='ctx'> 	drm_drawable_t drw_id;</div><div class='del'>-	unsigned int pipe;</div><div class='add'>+	unsigned int plane;</div><div class='ctx'> 	unsigned int sequence;</div><div class='ctx'> } drm_i915_vbl_swap_t;</div><div class='ctx'> </div><div class='add'>+struct opregion_header;</div><div class='add'>+struct opregion_acpi;</div><div class='add'>+struct opregion_swsci;</div><div class='add'>+struct opregion_asle;</div><div class='add'>+</div><div class='add'>+struct intel_opregion {</div><div class='add'>+	struct opregion_header *header;</div><div class='add'>+	struct opregion_acpi *acpi;</div><div class='add'>+	struct opregion_swsci *swsci;</div><div class='add'>+	struct opregion_asle *asle;</div><div class='add'>+	int enabled;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> typedef struct drm_i915_private {</div><div class='add'>+	struct drm_device *dev;</div><div class='add'>+</div><div class='add'>+	void __iomem *regs;</div><div class='ctx'> 	drm_local_map_t *sarea;</div><div class='del'>-	drm_local_map_t *mmio_map;</div><div class='ctx'> </div><div class='ctx'> 	drm_i915_sarea_t *sarea_priv;</div><div class='ctx'> 	drm_i915_ring_buffer_t ring;</div><div class='hunk'>@@ -90,20 +119,25 @@ typedef struct drm_i915_private {</div><div class='ctx'> 	drm_dma_handle_t *status_page_dmah;</div><div class='ctx'> 	void *hw_status_page;</div><div class='ctx'> 	dma_addr_t dma_status_page;</div><div class='del'>-	unsigned long counter;</div><div class='add'>+	uint32_t counter;</div><div class='ctx'> 	unsigned int status_gfx_addr;</div><div class='ctx'> 	drm_local_map_t hws_map;</div><div class='add'>+	struct drm_gem_object *hws_obj;</div><div class='ctx'> </div><div class='ctx'> 	unsigned int cpp;</div><div class='ctx'> 	int back_offset;</div><div class='ctx'> 	int front_offset;</div><div class='ctx'> 	int current_page;</div><div class='ctx'> 	int page_flipping;</div><div class='del'>-	int use_mi_batchbuffer_start;</div><div class='ctx'> </div><div class='ctx'> 	wait_queue_head_t irq_queue;</div><div class='ctx'> 	atomic_t irq_received;</div><div class='del'>-	atomic_t irq_emitted;</div><div class='add'>+	/** Protects user_irq_refcount and irq_mask_reg */</div><div class='add'>+	spinlock_t user_irq_lock;</div><div class='add'>+	/** Refcount for i915_user_irq_get() versus i915_user_irq_put(). */</div><div class='add'>+	int user_irq_refcount;</div><div class='add'>+	/** Cached value of IMR to avoid reads in updating the bitfield */</div><div class='add'>+	u32 irq_mask_reg;</div><div class='ctx'> </div><div class='ctx'> 	int tex_lru_log_granularity;</div><div class='ctx'> 	int allow_batchbuffer;</div><div class='hunk'>@@ -115,6 +149,8 @@ typedef struct drm_i915_private {</div><div class='ctx'> 	drm_i915_vbl_swap_t vbl_swaps;</div><div class='ctx'> 	unsigned int swaps_pending;</div><div class='ctx'> </div><div class='add'>+	struct intel_opregion opregion;</div><div class='add'>+</div><div class='ctx'> 	/* Register state */</div><div class='ctx'> 	u8 saveLBB;</div><div class='ctx'> 	u32 saveDSPACNTR;</div><div class='hunk'>@@ -139,7 +175,7 @@ typedef struct drm_i915_private {</div><div class='ctx'> 	u32 saveDSPASTRIDE;</div><div class='ctx'> 	u32 saveDSPASIZE;</div><div class='ctx'> 	u32 saveDSPAPOS;</div><div class='del'>-	u32 saveDSPABASE;</div><div class='add'>+	u32 saveDSPAADDR;</div><div class='ctx'> 	u32 saveDSPASURF;</div><div class='ctx'> 	u32 saveDSPATILEOFF;</div><div class='ctx'> 	u32 savePFIT_PGM_RATIOS;</div><div class='hunk'>@@ -160,24 +196,24 @@ typedef struct drm_i915_private {</div><div class='ctx'> 	u32 saveDSPBSTRIDE;</div><div class='ctx'> 	u32 saveDSPBSIZE;</div><div class='ctx'> 	u32 saveDSPBPOS;</div><div class='del'>-	u32 saveDSPBBASE;</div><div class='add'>+	u32 saveDSPBADDR;</div><div class='ctx'> 	u32 saveDSPBSURF;</div><div class='ctx'> 	u32 saveDSPBTILEOFF;</div><div class='del'>-	u32 saveVCLK_DIVISOR_VGA0;</div><div class='del'>-	u32 saveVCLK_DIVISOR_VGA1;</div><div class='del'>-	u32 saveVCLK_POST_DIV;</div><div class='add'>+	u32 saveVGA0;</div><div class='add'>+	u32 saveVGA1;</div><div class='add'>+	u32 saveVGA_PD;</div><div class='ctx'> 	u32 saveVGACNTRL;</div><div class='ctx'> 	u32 saveADPA;</div><div class='ctx'> 	u32 saveLVDS;</div><div class='del'>-	u32 saveLVDSPP_ON;</div><div class='del'>-	u32 saveLVDSPP_OFF;</div><div class='add'>+	u32 savePP_ON_DELAYS;</div><div class='add'>+	u32 savePP_OFF_DELAYS;</div><div class='ctx'> 	u32 saveDVOA;</div><div class='ctx'> 	u32 saveDVOB;</div><div class='ctx'> 	u32 saveDVOC;</div><div class='ctx'> 	u32 savePP_ON;</div><div class='ctx'> 	u32 savePP_OFF;</div><div class='ctx'> 	u32 savePP_CONTROL;</div><div class='del'>-	u32 savePP_CYCLE;</div><div class='add'>+	u32 savePP_DIVISOR;</div><div class='ctx'> 	u32 savePFIT_CONTROL;</div><div class='ctx'> 	u32 save_palette_a[256];</div><div class='ctx'> 	u32 save_palette_b[256];</div><div class='hunk'>@@ -190,7 +226,7 @@ typedef struct drm_i915_private {</div><div class='ctx'> 	u32 saveIMR;</div><div class='ctx'> 	u32 saveCACHE_MODE_0;</div><div class='ctx'> 	u32 saveD_STATE;</div><div class='del'>-	u32 saveDSPCLK_GATE_D;</div><div class='add'>+	u32 saveCG_2D_DIS;</div><div class='ctx'> 	u32 saveMI_ARB_STATE;</div><div class='ctx'> 	u32 saveSWF0[16];</div><div class='ctx'> 	u32 saveSWF1[16];</div><div class='hunk'>@@ -203,8 +239,180 @@ typedef struct drm_i915_private {</div><div class='ctx'> 	u8 saveDACMASK;</div><div class='ctx'> 	u8 saveDACDATA[256*3]; /* 256 3-byte colors */</div><div class='ctx'> 	u8 saveCR[37];</div><div class='add'>+</div><div class='add'>+	struct {</div><div class='add'>+		struct drm_mm gtt_space;</div><div class='add'>+</div><div class='add'>+		/**</div><div class='add'>+		 * List of objects currently involved in rendering from the</div><div class='add'>+		 * ringbuffer.</div><div class='add'>+		 *</div><div class='add'>+		 * A reference is held on the buffer while on this list.</div><div class='add'>+		 */</div><div class='add'>+		struct list_head active_list;</div><div class='add'>+</div><div class='add'>+		/**</div><div class='add'>+		 * List of objects which are not in the ringbuffer but which</div><div class='add'>+		 * still have a write_domain which needs to be flushed before</div><div class='add'>+		 * unbinding.</div><div class='add'>+		 *</div><div class='add'>+		 * A reference is held on the buffer while on this list.</div><div class='add'>+		 */</div><div class='add'>+		struct list_head flushing_list;</div><div class='add'>+</div><div class='add'>+		/**</div><div class='add'>+		 * LRU list of objects which are not in the ringbuffer and</div><div class='add'>+		 * are ready to unbind, but are still in the GTT.</div><div class='add'>+		 *</div><div class='add'>+		 * A reference is not held on the buffer while on this list,</div><div class='add'>+		 * as merely being GTT-bound shouldn't prevent its being</div><div class='add'>+		 * freed, and we'll pull it off the list in the free path.</div><div class='add'>+		 */</div><div class='add'>+		struct list_head inactive_list;</div><div class='add'>+</div><div class='add'>+		/**</div><div class='add'>+		 * List of breadcrumbs associated with GPU requests currently</div><div class='add'>+		 * outstanding.</div><div class='add'>+		 */</div><div class='add'>+		struct list_head request_list;</div><div class='add'>+</div><div class='add'>+		/**</div><div class='add'>+		 * We leave the user IRQ off as much as possible,</div><div class='add'>+		 * but this means that requests will finish and never</div><div class='add'>+		 * be retired once the system goes idle. Set a timer to</div><div class='add'>+		 * fire periodically while the ring is running. When it</div><div class='add'>+		 * fires, go retire requests.</div><div class='add'>+		 */</div><div class='add'>+		struct delayed_work retire_work;</div><div class='add'>+</div><div class='add'>+		/** Work task for vblank-related ring access */</div><div class='add'>+		struct work_struct vblank_work;</div><div class='add'>+</div><div class='add'>+		uint32_t next_gem_seqno;</div><div class='add'>+</div><div class='add'>+		/**</div><div class='add'>+		 * Waiting sequence number, if any</div><div class='add'>+		 */</div><div class='add'>+		uint32_t waiting_gem_seqno;</div><div class='add'>+</div><div class='add'>+		/**</div><div class='add'>+		 * Last seq seen at irq time</div><div class='add'>+		 */</div><div class='add'>+		uint32_t irq_gem_seqno;</div><div class='add'>+</div><div class='add'>+		/**</div><div class='add'>+		 * Flag if the X Server, and thus DRM, is not currently in</div><div class='add'>+		 * control of the device.</div><div class='add'>+		 *</div><div class='add'>+		 * This is set between LeaveVT and EnterVT.  It needs to be</div><div class='add'>+		 * replaced with a semaphore.  It also needs to be</div><div class='add'>+		 * transitioned away from for kernel modesetting.</div><div class='add'>+		 */</div><div class='add'>+		int suspended;</div><div class='add'>+</div><div class='add'>+		/**</div><div class='add'>+		 * Flag if the hardware appears to be wedged.</div><div class='add'>+		 *</div><div class='add'>+		 * This is set when attempts to idle the device timeout.</div><div class='add'>+		 * It prevents command submission from occuring and makes</div><div class='add'>+		 * every pending request fail</div><div class='add'>+		 */</div><div class='add'>+		int wedged;</div><div class='add'>+</div><div class='add'>+		/** Bit 6 swizzling required for X tiling */</div><div class='add'>+		uint32_t bit_6_swizzle_x;</div><div class='add'>+		/** Bit 6 swizzling required for Y tiling */</div><div class='add'>+		uint32_t bit_6_swizzle_y;</div><div class='add'>+	} mm;</div><div class='ctx'> } drm_i915_private_t;</div><div class='ctx'> </div><div class='add'>+/** driver private structure attached to each drm_gem_object */</div><div class='add'>+struct drm_i915_gem_object {</div><div class='add'>+	struct drm_gem_object *obj;</div><div class='add'>+</div><div class='add'>+	/** Current space allocated to this object in the GTT, if any. */</div><div class='add'>+	struct drm_mm_node *gtt_space;</div><div class='add'>+</div><div class='add'>+	/** This object's place on the active/flushing/inactive lists */</div><div class='add'>+	struct list_head list;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * This is set if the object is on the active or flushing lists</div><div class='add'>+	 * (has pending rendering), and is not set if it's on inactive (ready</div><div class='add'>+	 * to be unbound).</div><div class='add'>+	 */</div><div class='add'>+	int active;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * This is set if the object has been written to since last bound</div><div class='add'>+	 * to the GTT</div><div class='add'>+	 */</div><div class='add'>+	int dirty;</div><div class='add'>+</div><div class='add'>+	/** AGP memory structure for our GTT binding. */</div><div class='add'>+	DRM_AGP_MEM *agp_mem;</div><div class='add'>+</div><div class='add'>+	struct page **page_list;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * Current offset of the object in GTT space.</div><div class='add'>+	 *</div><div class='add'>+	 * This is the same as gtt_space-&gt;start</div><div class='add'>+	 */</div><div class='add'>+	uint32_t gtt_offset;</div><div class='add'>+</div><div class='add'>+	/** Boolean whether this object has a valid gtt offset. */</div><div class='add'>+	int gtt_bound;</div><div class='add'>+</div><div class='add'>+	/** How many users have pinned this object in GTT space */</div><div class='add'>+	int pin_count;</div><div class='add'>+</div><div class='add'>+	/** Breadcrumb of last rendering to the buffer. */</div><div class='add'>+	uint32_t last_rendering_seqno;</div><div class='add'>+</div><div class='add'>+	/** Current tiling mode for the object. */</div><div class='add'>+	uint32_t tiling_mode;</div><div class='add'>+</div><div class='add'>+	/** AGP mapping type (AGP_USER_MEMORY or AGP_USER_CACHED_MEMORY */</div><div class='add'>+	uint32_t agp_type;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * Flagging of which individual pages are valid in GEM_DOMAIN_CPU when</div><div class='add'>+	 * GEM_DOMAIN_CPU is not in the object's read domain.</div><div class='add'>+	 */</div><div class='add'>+	uint8_t *page_cpu_valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Request queue structure.</div><div class='add'>+ *</div><div class='add'>+ * The request queue allows us to note sequence numbers that have been emitted</div><div class='add'>+ * and may be associated with active buffers to be retired.</div><div class='add'>+ *</div><div class='add'>+ * By keeping this list, we can avoid having to do questionable</div><div class='add'>+ * sequence-number comparisons on buffer last_rendering_seqnos, and associate</div><div class='add'>+ * an emission time with seqnos for tracking how far ahead of the GPU we are.</div><div class='add'>+ */</div><div class='add'>+struct drm_i915_gem_request {</div><div class='add'>+	/** GEM sequence number associated with this request. */</div><div class='add'>+	uint32_t seqno;</div><div class='add'>+</div><div class='add'>+	/** Time at which this request was emitted, in jiffies. */</div><div class='add'>+	unsigned long emitted_jiffies;</div><div class='add'>+</div><div class='add'>+	/** Cache domains that were flushed at the start of the request. */</div><div class='add'>+	uint32_t flush_domains;</div><div class='add'>+</div><div class='add'>+	struct list_head list;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct drm_i915_file_private {</div><div class='add'>+	struct {</div><div class='add'>+		uint32_t last_gem_seqno;</div><div class='add'>+		uint32_t last_gem_throttle_seqno;</div><div class='add'>+	} mm;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> extern struct drm_ioctl_desc i915_ioctls[];</div><div class='ctx'> extern int i915_max_ioctl;</div><div class='ctx'> </div><div class='hunk'>@@ -212,31 +420,42 @@ extern int i915_max_ioctl;</div><div class='ctx'> extern void i915_kernel_lost_context(struct drm_device * dev);</div><div class='ctx'> extern int i915_driver_load(struct drm_device *, unsigned long flags);</div><div class='ctx'> extern int i915_driver_unload(struct drm_device *);</div><div class='add'>+extern int i915_driver_open(struct drm_device *dev, struct drm_file *file_priv);</div><div class='ctx'> extern void i915_driver_lastclose(struct drm_device * dev);</div><div class='ctx'> extern void i915_driver_preclose(struct drm_device *dev,</div><div class='ctx'> 				 struct drm_file *file_priv);</div><div class='add'>+extern void i915_driver_postclose(struct drm_device *dev,</div><div class='add'>+				  struct drm_file *file_priv);</div><div class='ctx'> extern int i915_driver_device_is_agp(struct drm_device * dev);</div><div class='ctx'> extern long i915_compat_ioctl(struct file *filp, unsigned int cmd,</div><div class='ctx'> 			      unsigned long arg);</div><div class='add'>+extern int i915_emit_box(struct drm_device *dev,</div><div class='add'>+			 struct drm_clip_rect __user *boxes,</div><div class='add'>+			 int i, int DR1, int DR4);</div><div class='ctx'> </div><div class='ctx'> /* i915_irq.c */</div><div class='ctx'> extern int i915_irq_emit(struct drm_device *dev, void *data,</div><div class='ctx'> 			 struct drm_file *file_priv);</div><div class='ctx'> extern int i915_irq_wait(struct drm_device *dev, void *data,</div><div class='ctx'> 			 struct drm_file *file_priv);</div><div class='add'>+void i915_user_irq_get(struct drm_device *dev);</div><div class='add'>+void i915_user_irq_put(struct drm_device *dev);</div><div class='ctx'> </div><div class='del'>-extern int i915_driver_vblank_wait(struct drm_device *dev, unsigned int *sequence);</div><div class='del'>-extern int i915_driver_vblank_wait2(struct drm_device *dev, unsigned int *sequence);</div><div class='add'>+extern void i915_gem_vblank_work_handler(struct work_struct *work);</div><div class='ctx'> extern irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS);</div><div class='ctx'> extern void i915_driver_irq_preinstall(struct drm_device * dev);</div><div class='del'>-extern void i915_driver_irq_postinstall(struct drm_device * dev);</div><div class='add'>+extern int i915_driver_irq_postinstall(struct drm_device *dev);</div><div class='ctx'> extern void i915_driver_irq_uninstall(struct drm_device * dev);</div><div class='ctx'> extern int i915_vblank_pipe_set(struct drm_device *dev, void *data,</div><div class='ctx'> 				struct drm_file *file_priv);</div><div class='ctx'> extern int i915_vblank_pipe_get(struct drm_device *dev, void *data,</div><div class='ctx'> 				struct drm_file *file_priv);</div><div class='add'>+extern int i915_enable_vblank(struct drm_device *dev, int crtc);</div><div class='add'>+extern void i915_disable_vblank(struct drm_device *dev, int crtc);</div><div class='add'>+extern u32 i915_get_vblank_counter(struct drm_device *dev, int crtc);</div><div class='ctx'> extern int i915_vblank_swap(struct drm_device *dev, void *data,</div><div class='ctx'> 			    struct drm_file *file_priv);</div><div class='add'>+extern void i915_enable_irq(drm_i915_private_t *dev_priv, u32 mask);</div><div class='ctx'> </div><div class='ctx'> /* i915_mem.c */</div><div class='ctx'> extern int i915_mem_alloc(struct drm_device *dev, void *data,</div><div class='hunk'>@@ -250,11 +469,99 @@ extern int i915_mem_destroy_heap(struct drm_device *dev, void *data,</div><div class='ctx'> extern void i915_mem_takedown(struct mem_block **heap);</div><div class='ctx'> extern void i915_mem_release(struct drm_device * dev,</div><div class='ctx'> 			     struct drm_file *file_priv, struct mem_block *heap);</div><div class='add'>+/* i915_gem.c */</div><div class='add'>+int i915_gem_init_ioctl(struct drm_device *dev, void *data,</div><div class='add'>+			struct drm_file *file_priv);</div><div class='add'>+int i915_gem_create_ioctl(struct drm_device *dev, void *data,</div><div class='add'>+			  struct drm_file *file_priv);</div><div class='add'>+int i915_gem_pread_ioctl(struct drm_device *dev, void *data,</div><div class='add'>+			 struct drm_file *file_priv);</div><div class='add'>+int i915_gem_pwrite_ioctl(struct drm_device *dev, void *data,</div><div class='add'>+			  struct drm_file *file_priv);</div><div class='add'>+int i915_gem_mmap_ioctl(struct drm_device *dev, void *data,</div><div class='add'>+			struct drm_file *file_priv);</div><div class='add'>+int i915_gem_set_domain_ioctl(struct drm_device *dev, void *data,</div><div class='add'>+			      struct drm_file *file_priv);</div><div class='add'>+int i915_gem_sw_finish_ioctl(struct drm_device *dev, void *data,</div><div class='add'>+			     struct drm_file *file_priv);</div><div class='add'>+int i915_gem_execbuffer(struct drm_device *dev, void *data,</div><div class='add'>+			struct drm_file *file_priv);</div><div class='add'>+int i915_gem_pin_ioctl(struct drm_device *dev, void *data,</div><div class='add'>+		       struct drm_file *file_priv);</div><div class='add'>+int i915_gem_unpin_ioctl(struct drm_device *dev, void *data,</div><div class='add'>+			 struct drm_file *file_priv);</div><div class='add'>+int i915_gem_busy_ioctl(struct drm_device *dev, void *data,</div><div class='add'>+			struct drm_file *file_priv);</div><div class='add'>+int i915_gem_throttle_ioctl(struct drm_device *dev, void *data,</div><div class='add'>+			    struct drm_file *file_priv);</div><div class='add'>+int i915_gem_entervt_ioctl(struct drm_device *dev, void *data,</div><div class='add'>+			   struct drm_file *file_priv);</div><div class='add'>+int i915_gem_leavevt_ioctl(struct drm_device *dev, void *data,</div><div class='add'>+			   struct drm_file *file_priv);</div><div class='add'>+int i915_gem_set_tiling(struct drm_device *dev, void *data,</div><div class='add'>+			struct drm_file *file_priv);</div><div class='add'>+int i915_gem_get_tiling(struct drm_device *dev, void *data,</div><div class='add'>+			struct drm_file *file_priv);</div><div class='add'>+void i915_gem_load(struct drm_device *dev);</div><div class='add'>+int i915_gem_proc_init(struct drm_minor *minor);</div><div class='add'>+void i915_gem_proc_cleanup(struct drm_minor *minor);</div><div class='add'>+int i915_gem_init_object(struct drm_gem_object *obj);</div><div class='add'>+void i915_gem_free_object(struct drm_gem_object *obj);</div><div class='add'>+int i915_gem_object_pin(struct drm_gem_object *obj, uint32_t alignment);</div><div class='add'>+void i915_gem_object_unpin(struct drm_gem_object *obj);</div><div class='add'>+void i915_gem_lastclose(struct drm_device *dev);</div><div class='add'>+uint32_t i915_get_gem_seqno(struct drm_device *dev);</div><div class='add'>+void i915_gem_retire_requests(struct drm_device *dev);</div><div class='add'>+void i915_gem_retire_work_handler(struct work_struct *work);</div><div class='add'>+void i915_gem_clflush_object(struct drm_gem_object *obj);</div><div class='add'>+</div><div class='add'>+/* i915_gem_tiling.c */</div><div class='add'>+void i915_gem_detect_bit_6_swizzle(struct drm_device *dev);</div><div class='add'>+</div><div class='add'>+/* i915_gem_debug.c */</div><div class='add'>+void i915_gem_dump_object(struct drm_gem_object *obj, int len,</div><div class='add'>+			  const char *where, uint32_t mark);</div><div class='add'>+#if WATCH_INACTIVE</div><div class='add'>+void i915_verify_inactive(struct drm_device *dev, char *file, int line);</div><div class='add'>+#else</div><div class='add'>+#define i915_verify_inactive(dev, file, line)</div><div class='add'>+#endif</div><div class='add'>+void i915_gem_object_check_coherency(struct drm_gem_object *obj, int handle);</div><div class='add'>+void i915_gem_dump_object(struct drm_gem_object *obj, int len,</div><div class='add'>+			  const char *where, uint32_t mark);</div><div class='add'>+void i915_dump_lru(struct drm_device *dev, const char *where);</div><div class='add'>+</div><div class='add'>+/* i915_suspend.c */</div><div class='add'>+extern int i915_save_state(struct drm_device *dev);</div><div class='add'>+extern int i915_restore_state(struct drm_device *dev);</div><div class='add'>+</div><div class='add'>+/* i915_suspend.c */</div><div class='add'>+extern int i915_save_state(struct drm_device *dev);</div><div class='add'>+extern int i915_restore_state(struct drm_device *dev);</div><div class='add'>+</div><div class='add'>+/* i915_opregion.c */</div><div class='add'>+extern int intel_opregion_init(struct drm_device *dev);</div><div class='add'>+extern void intel_opregion_free(struct drm_device *dev);</div><div class='add'>+extern void opregion_asle_intr(struct drm_device *dev);</div><div class='add'>+extern void opregion_enable_asle(struct drm_device *dev);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Lock test for when it's just for synchronization of ring access.</div><div class='add'>+ *</div><div class='add'>+ * In that case, we don't need to do it when GEM is initialized as nobody else</div><div class='add'>+ * has access to the ring.</div><div class='add'>+ */</div><div class='add'>+#define RING_LOCK_TEST_WITH_RETURN(dev, file_priv) do {			\</div><div class='add'>+	if (((drm_i915_private_t *)dev-&gt;dev_private)-&gt;ring.ring_obj == NULL) \</div><div class='add'>+		LOCK_TEST_WITH_RETURN(dev, file_priv);			\</div><div class='add'>+} while (0)</div><div class='ctx'> </div><div class='del'>-#define I915_READ(reg)          DRM_READ32(dev_priv-&gt;mmio_map, (reg))</div><div class='del'>-#define I915_WRITE(reg,val)     DRM_WRITE32(dev_priv-&gt;mmio_map, (reg), (val))</div><div class='del'>-#define I915_READ16(reg)	DRM_READ16(dev_priv-&gt;mmio_map, (reg))</div><div class='del'>-#define I915_WRITE16(reg,val)	DRM_WRITE16(dev_priv-&gt;mmio_map, (reg), (val))</div><div class='add'>+#define I915_READ(reg)          readl(dev_priv-&gt;regs + (reg))</div><div class='add'>+#define I915_WRITE(reg, val)     writel(val, dev_priv-&gt;regs + (reg))</div><div class='add'>+#define I915_READ16(reg)	readw(dev_priv-&gt;regs + (reg))</div><div class='add'>+#define I915_WRITE16(reg, val)	writel(val, dev_priv-&gt;regs + (reg))</div><div class='add'>+#define I915_READ8(reg)		readb(dev_priv-&gt;regs + (reg))</div><div class='add'>+#define I915_WRITE8(reg, val)	writeb(val, dev_priv-&gt;regs + (reg))</div><div class='ctx'> </div><div class='ctx'> #define I915_VERBOSE 0</div><div class='ctx'> </div><div class='hunk'>@@ -284,816 +591,29 @@ extern void i915_mem_release(struct drm_device * dev,</div><div class='ctx'> 	if (I915_VERBOSE) DRM_DEBUG("ADVANCE_LP_RING %x\n", outring);	\</div><div class='ctx'> 	dev_priv-&gt;ring.tail = outring;					\</div><div class='ctx'> 	dev_priv-&gt;ring.space -= outcount * 4;				\</div><div class='del'>-	I915_WRITE(LP_RING + RING_TAIL, outring);			\</div><div class='add'>+	I915_WRITE(PRB0_TAIL, outring);			\</div><div class='ctx'> } while(0)</div><div class='ctx'> </div><div class='del'>-extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);</div><div class='del'>-</div><div class='del'>-/* Extended config space */</div><div class='del'>-#define LBB 0xf4</div><div class='del'>-</div><div class='del'>-/* VGA stuff */</div><div class='del'>-</div><div class='del'>-#define VGA_ST01_MDA 0x3ba</div><div class='del'>-#define VGA_ST01_CGA 0x3da</div><div class='del'>-</div><div class='del'>-#define VGA_MSR_WRITE 0x3c2</div><div class='del'>-#define VGA_MSR_READ 0x3cc</div><div class='del'>-#define   VGA_MSR_MEM_EN (1&lt;&lt;1)</div><div class='del'>-#define   VGA_MSR_CGA_MODE (1&lt;&lt;0)</div><div class='del'>-</div><div class='del'>-#define VGA_SR_INDEX 0x3c4</div><div class='del'>-#define VGA_SR_DATA 0x3c5</div><div class='del'>-</div><div class='del'>-#define VGA_AR_INDEX 0x3c0</div><div class='del'>-#define   VGA_AR_VID_EN (1&lt;&lt;5)</div><div class='del'>-#define VGA_AR_DATA_WRITE 0x3c0</div><div class='del'>-#define VGA_AR_DATA_READ 0x3c1</div><div class='del'>-</div><div class='del'>-#define VGA_GR_INDEX 0x3ce</div><div class='del'>-#define VGA_GR_DATA 0x3cf</div><div class='del'>-/* GR05 */</div><div class='del'>-#define   VGA_GR_MEM_READ_MODE_SHIFT 3</div><div class='del'>-#define     VGA_GR_MEM_READ_MODE_PLANE 1</div><div class='del'>-/* GR06 */</div><div class='del'>-#define   VGA_GR_MEM_MODE_MASK 0xc</div><div class='del'>-#define   VGA_GR_MEM_MODE_SHIFT 2</div><div class='del'>-#define   VGA_GR_MEM_A0000_AFFFF 0</div><div class='del'>-#define   VGA_GR_MEM_A0000_BFFFF 1</div><div class='del'>-#define   VGA_GR_MEM_B0000_B7FFF 2</div><div class='del'>-#define   VGA_GR_MEM_B0000_BFFFF 3</div><div class='del'>-</div><div class='del'>-#define VGA_DACMASK 0x3c6</div><div class='del'>-#define VGA_DACRX 0x3c7</div><div class='del'>-#define VGA_DACWX 0x3c8</div><div class='del'>-#define VGA_DACDATA 0x3c9</div><div class='del'>-</div><div class='del'>-#define VGA_CR_INDEX_MDA 0x3b4</div><div class='del'>-#define VGA_CR_DATA_MDA 0x3b5</div><div class='del'>-#define VGA_CR_INDEX_CGA 0x3d4</div><div class='del'>-#define VGA_CR_DATA_CGA 0x3d5</div><div class='del'>-</div><div class='del'>-#define GFX_OP_USER_INTERRUPT		((0&lt;&lt;29)|(2&lt;&lt;23))</div><div class='del'>-#define GFX_OP_BREAKPOINT_INTERRUPT	((0&lt;&lt;29)|(1&lt;&lt;23))</div><div class='del'>-#define CMD_REPORT_HEAD			(7&lt;&lt;23)</div><div class='del'>-#define CMD_STORE_DWORD_IDX		((0x21&lt;&lt;23) | 0x1)</div><div class='del'>-#define CMD_OP_BATCH_BUFFER  ((0x0&lt;&lt;29)|(0x30&lt;&lt;23)|0x1)</div><div class='del'>-</div><div class='del'>-#define INST_PARSER_CLIENT   0x00000000</div><div class='del'>-#define INST_OP_FLUSH        0x02000000</div><div class='del'>-#define INST_FLUSH_MAP_CACHE 0x00000001</div><div class='del'>-</div><div class='del'>-#define BB1_START_ADDR_MASK   (~0x7)</div><div class='del'>-#define BB1_PROTECTED         (1&lt;&lt;0)</div><div class='del'>-#define BB1_UNPROTECTED       (0&lt;&lt;0)</div><div class='del'>-#define BB2_END_ADDR_MASK     (~0x7)</div><div class='del'>-</div><div class='del'>-/* Framebuffer compression */</div><div class='del'>-#define FBC_CFB_BASE		0x03200 /* 4k page aligned */</div><div class='del'>-#define FBC_LL_BASE		0x03204 /* 4k page aligned */</div><div class='del'>-#define FBC_CONTROL		0x03208</div><div class='del'>-#define   FBC_CTL_EN		(1&lt;&lt;31)</div><div class='del'>-#define   FBC_CTL_PERIODIC	(1&lt;&lt;30)</div><div class='del'>-#define   FBC_CTL_INTERVAL_SHIFT (16)</div><div class='del'>-#define   FBC_CTL_UNCOMPRESSIBLE (1&lt;&lt;14)</div><div class='del'>-#define   FBC_CTL_STRIDE_SHIFT	(5)</div><div class='del'>-#define   FBC_CTL_FENCENO	(1&lt;&lt;0)</div><div class='del'>-#define FBC_COMMAND		0x0320c</div><div class='del'>-#define   FBC_CMD_COMPRESS	(1&lt;&lt;0)</div><div class='del'>-#define FBC_STATUS		0x03210</div><div class='del'>-#define   FBC_STAT_COMPRESSING	(1&lt;&lt;31)</div><div class='del'>-#define   FBC_STAT_COMPRESSED	(1&lt;&lt;30)</div><div class='del'>-#define   FBC_STAT_MODIFIED	(1&lt;&lt;29)</div><div class='del'>-#define   FBC_STAT_CURRENT_LINE	(1&lt;&lt;0)</div><div class='del'>-#define FBC_CONTROL2		0x03214</div><div class='del'>-#define   FBC_CTL_FENCE_DBL	(0&lt;&lt;4)</div><div class='del'>-#define   FBC_CTL_IDLE_IMM	(0&lt;&lt;2)</div><div class='del'>-#define   FBC_CTL_IDLE_FULL	(1&lt;&lt;2)</div><div class='del'>-#define   FBC_CTL_IDLE_LINE	(2&lt;&lt;2)</div><div class='del'>-#define   FBC_CTL_IDLE_DEBUG	(3&lt;&lt;2)</div><div class='del'>-#define   FBC_CTL_CPU_FENCE	(1&lt;&lt;1)</div><div class='del'>-#define   FBC_CTL_PLANEA	(0&lt;&lt;0)</div><div class='del'>-#define   FBC_CTL_PLANEB	(1&lt;&lt;0)</div><div class='del'>-#define FBC_FENCE_OFF		0x0321b</div><div class='del'>-</div><div class='del'>-#define FBC_LL_SIZE		(1536)</div><div class='del'>-#define FBC_LL_PAD		(32)</div><div class='del'>-</div><div class='del'>-/* Interrupt bits:</div><div class='del'>- */</div><div class='del'>-#define USER_INT_FLAG    (1&lt;&lt;1)</div><div class='del'>-#define VSYNC_PIPEB_FLAG (1&lt;&lt;5)</div><div class='del'>-#define VSYNC_PIPEA_FLAG (1&lt;&lt;7)</div><div class='del'>-#define HWB_OOM_FLAG     (1&lt;&lt;13) /* binner out of memory */</div><div class='del'>-</div><div class='del'>-#define I915REG_HWSTAM		0x02098</div><div class='del'>-#define I915REG_INT_IDENTITY_R	0x020a4</div><div class='del'>-#define I915REG_INT_MASK_R	0x020a8</div><div class='del'>-#define I915REG_INT_ENABLE_R	0x020a0</div><div class='del'>-</div><div class='del'>-#define I915REG_PIPEASTAT	0x70024</div><div class='del'>-#define I915REG_PIPEBSTAT	0x71024</div><div class='del'>-</div><div class='del'>-#define I915_VBLANK_INTERRUPT_ENABLE	(1UL&lt;&lt;17)</div><div class='del'>-#define I915_VBLANK_CLEAR		(1UL&lt;&lt;1)</div><div class='del'>-</div><div class='del'>-#define SRX_INDEX		0x3c4</div><div class='del'>-#define SRX_DATA		0x3c5</div><div class='del'>-#define SR01			1</div><div class='del'>-#define SR01_SCREEN_OFF		(1&lt;&lt;5)</div><div class='del'>-</div><div class='del'>-#define PPCR			0x61204</div><div class='del'>-#define PPCR_ON			(1&lt;&lt;0)</div><div class='del'>-</div><div class='del'>-#define DVOB			0x61140</div><div class='del'>-#define DVOB_ON			(1&lt;&lt;31)</div><div class='del'>-#define DVOC			0x61160</div><div class='del'>-#define DVOC_ON			(1&lt;&lt;31)</div><div class='del'>-#define LVDS			0x61180</div><div class='del'>-#define LVDS_ON			(1&lt;&lt;31)</div><div class='del'>-</div><div class='del'>-#define ADPA			0x61100</div><div class='del'>-#define ADPA_DPMS_MASK		(~(3&lt;&lt;10))</div><div class='del'>-#define ADPA_DPMS_ON		(0&lt;&lt;10)</div><div class='del'>-#define ADPA_DPMS_SUSPEND	(1&lt;&lt;10)</div><div class='del'>-#define ADPA_DPMS_STANDBY	(2&lt;&lt;10)</div><div class='del'>-#define ADPA_DPMS_OFF		(3&lt;&lt;10)</div><div class='del'>-</div><div class='del'>-#define NOPID                   0x2094</div><div class='del'>-#define LP_RING			0x2030</div><div class='del'>-#define HP_RING			0x2040</div><div class='del'>-/* The binner has its own ring buffer:</div><div class='del'>- */</div><div class='del'>-#define HWB_RING		0x2400</div><div class='del'>-</div><div class='del'>-#define RING_TAIL		0x00</div><div class='del'>-#define TAIL_ADDR		0x001FFFF8</div><div class='del'>-#define RING_HEAD		0x04</div><div class='del'>-#define HEAD_WRAP_COUNT		0xFFE00000</div><div class='del'>-#define HEAD_WRAP_ONE		0x00200000</div><div class='del'>-#define HEAD_ADDR		0x001FFFFC</div><div class='del'>-#define RING_START		0x08</div><div class='del'>-#define START_ADDR		0x0xFFFFF000</div><div class='del'>-#define RING_LEN		0x0C</div><div class='del'>-#define RING_NR_PAGES		0x001FF000</div><div class='del'>-#define RING_REPORT_MASK	0x00000006</div><div class='del'>-#define RING_REPORT_64K		0x00000002</div><div class='del'>-#define RING_REPORT_128K	0x00000004</div><div class='del'>-#define RING_NO_REPORT		0x00000000</div><div class='del'>-#define RING_VALID_MASK		0x00000001</div><div class='del'>-#define RING_VALID		0x00000001</div><div class='del'>-#define RING_INVALID		0x00000000</div><div class='del'>-</div><div class='del'>-/* Instruction parser error reg:</div><div class='del'>- */</div><div class='del'>-#define IPEIR			0x2088</div><div class='del'>-</div><div class='del'>-/* Scratch pad debug 0 reg:</div><div class='del'>- */</div><div class='del'>-#define SCPD0			0x209c</div><div class='del'>-</div><div class='del'>-/* Error status reg:</div><div class='del'>- */</div><div class='del'>-#define ESR			0x20b8</div><div class='del'>-</div><div class='del'>-/* Secondary DMA fetch address debug reg:</div><div class='del'>- */</div><div class='del'>-#define DMA_FADD_S		0x20d4</div><div class='del'>-</div><div class='del'>-/* Memory Interface Arbitration State</div><div class='del'>- */</div><div class='del'>-#define MI_ARB_STATE		0x20e4</div><div class='del'>-</div><div class='del'>-/* Cache mode 0 reg.</div><div class='del'>- *  - Manipulating render cache behaviour is central</div><div class='del'>- *    to the concept of zone rendering, tuning this reg can help avoid</div><div class='del'>- *    unnecessary render cache reads and even writes (for z/stencil)</div><div class='del'>- *    at beginning and end of scene.</div><div class='del'>- *</div><div class='del'>- * - To change a bit, write to this reg with a mask bit set and the</div><div class='del'>- * bit of interest either set or cleared.  EG: (BIT&lt;&lt;16) | BIT to set.</div><div class='del'>- */</div><div class='del'>-#define Cache_Mode_0		0x2120</div><div class='del'>-#define CACHE_MODE_0		0x2120</div><div class='del'>-#define CM0_MASK_SHIFT          16</div><div class='del'>-#define CM0_IZ_OPT_DISABLE      (1&lt;&lt;6)</div><div class='del'>-#define CM0_ZR_OPT_DISABLE      (1&lt;&lt;5)</div><div class='del'>-#define CM0_DEPTH_EVICT_DISABLE (1&lt;&lt;4)</div><div class='del'>-#define CM0_COLOR_EVICT_DISABLE (1&lt;&lt;3)</div><div class='del'>-#define CM0_DEPTH_WRITE_DISABLE (1&lt;&lt;1)</div><div class='del'>-#define CM0_RC_OP_FLUSH_DISABLE (1&lt;&lt;0)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Graphics flush control.  A CPU write flushes the GWB of all writes.</div><div class='del'>- * The data is discarded.</div><div class='del'>- */</div><div class='del'>-#define GFX_FLSH_CNTL		0x2170</div><div class='del'>-</div><div class='del'>-/* Binner control.  Defines the location of the bin pointer list:</div><div class='del'>- */</div><div class='del'>-#define BINCTL			0x2420</div><div class='del'>-#define BC_MASK			(1 &lt;&lt; 9)</div><div class='del'>-</div><div class='del'>-/* Binned scene info.</div><div class='del'>- */</div><div class='del'>-#define BINSCENE		0x2428</div><div class='del'>-#define BS_OP_LOAD		(1 &lt;&lt; 8)</div><div class='del'>-#define BS_MASK			(1 &lt;&lt; 22)</div><div class='del'>-</div><div class='del'>-/* Bin command parser debug reg:</div><div class='del'>- */</div><div class='del'>-#define BCPD			0x2480</div><div class='del'>-</div><div class='del'>-/* Bin memory control debug reg:</div><div class='del'>- */</div><div class='del'>-#define BMCD			0x2484</div><div class='del'>-</div><div class='del'>-/* Bin data cache debug reg:</div><div class='del'>- */</div><div class='del'>-#define BDCD			0x2488</div><div class='del'>-</div><div class='del'>-/* Binner pointer cache debug reg:</div><div class='del'>- */</div><div class='del'>-#define BPCD			0x248c</div><div class='del'>-</div><div class='del'>-/* Binner scratch pad debug reg:</div><div class='del'>- */</div><div class='del'>-#define BINSKPD			0x24f0</div><div class='del'>-</div><div class='del'>-/* HWB scratch pad debug reg:</div><div class='del'>- */</div><div class='del'>-#define HWBSKPD			0x24f4</div><div class='del'>-</div><div class='del'>-/* Binner memory pool reg:</div><div class='del'>- */</div><div class='del'>-#define BMP_BUFFER		0x2430</div><div class='del'>-#define BMP_PAGE_SIZE_4K	(0 &lt;&lt; 10)</div><div class='del'>-#define BMP_BUFFER_SIZE_SHIFT	1</div><div class='del'>-#define BMP_ENABLE		(1 &lt;&lt; 0)</div><div class='del'>-</div><div class='del'>-/* Get/put memory from the binner memory pool:</div><div class='del'>- */</div><div class='del'>-#define BMP_GET			0x2438</div><div class='del'>-#define BMP_PUT			0x2440</div><div class='del'>-#define BMP_OFFSET_SHIFT	5</div><div class='del'>-</div><div class='del'>-/* 3D state packets:</div><div class='del'>- */</div><div class='del'>-#define GFX_OP_RASTER_RULES    ((0x3&lt;&lt;29)|(0x7&lt;&lt;24))</div><div class='del'>-</div><div class='del'>-#define GFX_OP_SCISSOR         ((0x3&lt;&lt;29)|(0x1c&lt;&lt;24)|(0x10&lt;&lt;19))</div><div class='del'>-#define SC_UPDATE_SCISSOR       (0x1&lt;&lt;1)</div><div class='del'>-#define SC_ENABLE_MASK          (0x1&lt;&lt;0)</div><div class='del'>-#define SC_ENABLE               (0x1&lt;&lt;0)</div><div class='del'>-</div><div class='del'>-#define GFX_OP_LOAD_INDIRECT   ((0x3&lt;&lt;29)|(0x1d&lt;&lt;24)|(0x7&lt;&lt;16))</div><div class='del'>-</div><div class='del'>-#define GFX_OP_SCISSOR_INFO    ((0x3&lt;&lt;29)|(0x1d&lt;&lt;24)|(0x81&lt;&lt;16)|(0x1))</div><div class='del'>-#define SCI_YMIN_MASK      (0xffff&lt;&lt;16)</div><div class='del'>-#define SCI_XMIN_MASK      (0xffff&lt;&lt;0)</div><div class='del'>-#define SCI_YMAX_MASK      (0xffff&lt;&lt;16)</div><div class='del'>-#define SCI_XMAX_MASK      (0xffff&lt;&lt;0)</div><div class='del'>-</div><div class='del'>-#define GFX_OP_SCISSOR_ENABLE	 ((0x3&lt;&lt;29)|(0x1c&lt;&lt;24)|(0x10&lt;&lt;19))</div><div class='del'>-#define GFX_OP_SCISSOR_RECT	 ((0x3&lt;&lt;29)|(0x1d&lt;&lt;24)|(0x81&lt;&lt;16)|1)</div><div class='del'>-#define GFX_OP_COLOR_FACTOR      ((0x3&lt;&lt;29)|(0x1d&lt;&lt;24)|(0x1&lt;&lt;16)|0x0)</div><div class='del'>-#define GFX_OP_STIPPLE           ((0x3&lt;&lt;29)|(0x1d&lt;&lt;24)|(0x83&lt;&lt;16))</div><div class='del'>-#define GFX_OP_MAP_INFO          ((0x3&lt;&lt;29)|(0x1d&lt;&lt;24)|0x4)</div><div class='del'>-#define GFX_OP_DESTBUFFER_VARS   ((0x3&lt;&lt;29)|(0x1d&lt;&lt;24)|(0x85&lt;&lt;16)|0x0)</div><div class='del'>-#define GFX_OP_DRAWRECT_INFO     ((0x3&lt;&lt;29)|(0x1d&lt;&lt;24)|(0x80&lt;&lt;16)|(0x3))</div><div class='del'>-</div><div class='del'>-#define GFX_OP_DRAWRECT_INFO_I965 ((0x7900&lt;&lt;16)|0x2)</div><div class='del'>-</div><div class='del'>-#define SRC_COPY_BLT_CMD                ((2&lt;&lt;29)|(0x43&lt;&lt;22)|4)</div><div class='del'>-#define XY_SRC_COPY_BLT_CMD		((2&lt;&lt;29)|(0x53&lt;&lt;22)|6)</div><div class='del'>-#define XY_SRC_COPY_BLT_WRITE_ALPHA	(1&lt;&lt;21)</div><div class='del'>-#define XY_SRC_COPY_BLT_WRITE_RGB	(1&lt;&lt;20)</div><div class='del'>-#define XY_SRC_COPY_BLT_SRC_TILED	(1&lt;&lt;15)</div><div class='del'>-#define XY_SRC_COPY_BLT_DST_TILED	(1&lt;&lt;11)</div><div class='del'>-</div><div class='del'>-#define MI_BATCH_BUFFER		((0x30&lt;&lt;23)|1)</div><div class='del'>-#define MI_BATCH_BUFFER_START	(0x31&lt;&lt;23)</div><div class='del'>-#define MI_BATCH_BUFFER_END	(0xA&lt;&lt;23)</div><div class='del'>-#define MI_BATCH_NON_SECURE	(1)</div><div class='del'>-#define MI_BATCH_NON_SECURE_I965 (1&lt;&lt;8)</div><div class='del'>-</div><div class='del'>-#define MI_WAIT_FOR_EVENT       ((0x3&lt;&lt;23))</div><div class='del'>-#define MI_WAIT_FOR_PLANE_B_FLIP      (1&lt;&lt;6)</div><div class='del'>-#define MI_WAIT_FOR_PLANE_A_FLIP      (1&lt;&lt;2)</div><div class='del'>-#define MI_WAIT_FOR_PLANE_A_SCANLINES (1&lt;&lt;1)</div><div class='del'>-</div><div class='del'>-#define MI_LOAD_SCAN_LINES_INCL  ((0x12&lt;&lt;23))</div><div class='del'>-</div><div class='del'>-#define CMD_OP_DISPLAYBUFFER_INFO ((0x0&lt;&lt;29)|(0x14&lt;&lt;23)|2)</div><div class='del'>-#define ASYNC_FLIP                (1&lt;&lt;22)</div><div class='del'>-#define DISPLAY_PLANE_A           (0&lt;&lt;20)</div><div class='del'>-#define DISPLAY_PLANE_B           (1&lt;&lt;20)</div><div class='del'>-</div><div class='del'>-/* Display regs */</div><div class='del'>-#define DSPACNTR                0x70180</div><div class='del'>-#define DSPBCNTR                0x71180</div><div class='del'>-#define DISPPLANE_SEL_PIPE_MASK                 (1&lt;&lt;24)</div><div class='del'>-</div><div class='del'>-/* Define the region of interest for the binner:</div><div class='del'>- */</div><div class='del'>-#define CMD_OP_BIN_CONTROL	 ((0x3&lt;&lt;29)|(0x1d&lt;&lt;24)|(0x84&lt;&lt;16)|4)</div><div class='del'>-</div><div class='del'>-#define CMD_OP_DESTBUFFER_INFO	 ((0x3&lt;&lt;29)|(0x1d&lt;&lt;24)|(0x8e&lt;&lt;16)|1)</div><div class='del'>-</div><div class='del'>-#define CMD_MI_FLUSH         (0x04 &lt;&lt; 23)</div><div class='del'>-#define MI_NO_WRITE_FLUSH    (1 &lt;&lt; 2)</div><div class='del'>-#define MI_READ_FLUSH        (1 &lt;&lt; 0)</div><div class='del'>-#define MI_EXE_FLUSH         (1 &lt;&lt; 1)</div><div class='del'>-#define MI_END_SCENE         (1 &lt;&lt; 4) /* flush binner and incr scene count */</div><div class='del'>-#define MI_SCENE_COUNT       (1 &lt;&lt; 3) /* just increment scene count */</div><div class='del'>-</div><div class='del'>-#define BREADCRUMB_BITS 31</div><div class='del'>-#define BREADCRUMB_MASK ((1U &lt;&lt; BREADCRUMB_BITS) - 1)</div><div class='del'>-</div><div class='del'>-#define READ_BREADCRUMB(dev_priv)  (((volatile u32*)(dev_priv-&gt;hw_status_page))[5])</div><div class='del'>-#define READ_HWSP(dev_priv, reg)  (((volatile u32*)(dev_priv-&gt;hw_status_page))[reg])</div><div class='del'>-</div><div class='del'>-#define BLC_PWM_CTL		0x61254</div><div class='del'>-#define BACKLIGHT_MODULATION_FREQ_SHIFT		(17)</div><div class='del'>-</div><div class='del'>-#define BLC_PWM_CTL2		0x61250</div><div class='del'>-/**</div><div class='del'>- * This is the most significant 15 bits of the number of backlight cycles in a</div><div class='del'>- * complete cycle of the modulated backlight control.</div><div class='del'>- *</div><div class='del'>- * The actual value is this field multiplied by two.</div><div class='del'>- */</div><div class='del'>-#define BACKLIGHT_MODULATION_FREQ_MASK		(0x7fff &lt;&lt; 17)</div><div class='del'>-#define BLM_LEGACY_MODE				(1 &lt;&lt; 16)</div><div class='del'>-/**</div><div class='del'>- * This is the number of cycles out of the backlight modulation cycle for which</div><div class='del'>- * the backlight is on.</div><div class='del'>- *</div><div class='del'>- * This field must be no greater than the number of cycles in the complete</div><div class='del'>- * backlight modulation cycle.</div><div class='del'>- */</div><div class='del'>-#define BACKLIGHT_DUTY_CYCLE_SHIFT		(0)</div><div class='del'>-#define BACKLIGHT_DUTY_CYCLE_MASK		(0xffff)</div><div class='del'>-</div><div class='del'>-#define I915_GCFGC			0xf0</div><div class='del'>-#define I915_LOW_FREQUENCY_ENABLE		(1 &lt;&lt; 7)</div><div class='del'>-#define I915_DISPLAY_CLOCK_190_200_MHZ		(0 &lt;&lt; 4)</div><div class='del'>-#define I915_DISPLAY_CLOCK_333_MHZ		(4 &lt;&lt; 4)</div><div class='del'>-#define I915_DISPLAY_CLOCK_MASK			(7 &lt;&lt; 4)</div><div class='del'>-</div><div class='del'>-#define I855_HPLLCC			0xc0</div><div class='del'>-#define I855_CLOCK_CONTROL_MASK			(3 &lt;&lt; 0)</div><div class='del'>-#define I855_CLOCK_133_200			(0 &lt;&lt; 0)</div><div class='del'>-#define I855_CLOCK_100_200			(1 &lt;&lt; 0)</div><div class='del'>-#define I855_CLOCK_100_133			(2 &lt;&lt; 0)</div><div class='del'>-#define I855_CLOCK_166_250			(3 &lt;&lt; 0)</div><div class='del'>-</div><div class='del'>-/* p317, 319</div><div class='del'>- */</div><div class='del'>-#define VCLK2_VCO_M        0x6008 /* treat as 16 bit? (includes msbs) */</div><div class='del'>-#define VCLK2_VCO_N        0x600a</div><div class='del'>-#define VCLK2_VCO_DIV_SEL  0x6012</div><div class='del'>-</div><div class='del'>-#define VCLK_DIVISOR_VGA0   0x6000</div><div class='del'>-#define VCLK_DIVISOR_VGA1   0x6004</div><div class='del'>-#define VCLK_POST_DIV	    0x6010</div><div class='del'>-/** Selects a post divisor of 4 instead of 2. */</div><div class='del'>-# define VGA1_PD_P2_DIV_4	(1 &lt;&lt; 15)</div><div class='del'>-/** Overrides the p2 post divisor field */</div><div class='del'>-# define VGA1_PD_P1_DIV_2	(1 &lt;&lt; 13)</div><div class='del'>-# define VGA1_PD_P1_SHIFT	8</div><div class='del'>-/** P1 value is 2 greater than this field */</div><div class='del'>-# define VGA1_PD_P1_MASK	(0x1f &lt;&lt; 8)</div><div class='del'>-/** Selects a post divisor of 4 instead of 2. */</div><div class='del'>-# define VGA0_PD_P2_DIV_4	(1 &lt;&lt; 7)</div><div class='del'>-/** Overrides the p2 post divisor field */</div><div class='del'>-# define VGA0_PD_P1_DIV_2	(1 &lt;&lt; 5)</div><div class='del'>-# define VGA0_PD_P1_SHIFT	0</div><div class='del'>-/** P1 value is 2 greater than this field */</div><div class='del'>-# define VGA0_PD_P1_MASK	(0x1f &lt;&lt; 0)</div><div class='del'>-</div><div class='del'>-/* PCI D state control register */</div><div class='del'>-#define D_STATE		0x6104</div><div class='del'>-#define DSPCLK_GATE_D	0x6200</div><div class='del'>-</div><div class='del'>-/* I830 CRTC registers */</div><div class='del'>-#define HTOTAL_A	0x60000</div><div class='del'>-#define HBLANK_A	0x60004</div><div class='del'>-#define HSYNC_A		0x60008</div><div class='del'>-#define VTOTAL_A	0x6000c</div><div class='del'>-#define VBLANK_A	0x60010</div><div class='del'>-#define VSYNC_A		0x60014</div><div class='del'>-#define PIPEASRC	0x6001c</div><div class='del'>-#define BCLRPAT_A	0x60020</div><div class='del'>-#define VSYNCSHIFT_A	0x60028</div><div class='del'>-</div><div class='del'>-#define HTOTAL_B	0x61000</div><div class='del'>-#define HBLANK_B	0x61004</div><div class='del'>-#define HSYNC_B		0x61008</div><div class='del'>-#define VTOTAL_B	0x6100c</div><div class='del'>-#define VBLANK_B	0x61010</div><div class='del'>-#define VSYNC_B		0x61014</div><div class='del'>-#define PIPEBSRC	0x6101c</div><div class='del'>-#define BCLRPAT_B	0x61020</div><div class='del'>-#define VSYNCSHIFT_B	0x61028</div><div class='del'>-</div><div class='del'>-#define PP_STATUS	0x61200</div><div class='del'>-# define PP_ON					(1 &lt;&lt; 31)</div><div class='del'>-/**</div><div class='del'>- * Indicates that all dependencies of the panel are on:</div><div class='del'>- *</div><div class='del'>- * - PLL enabled</div><div class='del'>- * - pipe enabled</div><div class='del'>- * - LVDS/DVOB/DVOC on</div><div class='del'>- */</div><div class='del'>-# define PP_READY				(1 &lt;&lt; 30)</div><div class='del'>-# define PP_SEQUENCE_NONE			(0 &lt;&lt; 28)</div><div class='del'>-# define PP_SEQUENCE_ON				(1 &lt;&lt; 28)</div><div class='del'>-# define PP_SEQUENCE_OFF			(2 &lt;&lt; 28)</div><div class='del'>-# define PP_SEQUENCE_MASK			0x30000000</div><div class='del'>-#define PP_CONTROL	0x61204</div><div class='del'>-# define POWER_TARGET_ON			(1 &lt;&lt; 0)</div><div class='del'>-</div><div class='del'>-#define LVDSPP_ON       0x61208</div><div class='del'>-#define LVDSPP_OFF      0x6120c</div><div class='del'>-#define PP_CYCLE        0x61210</div><div class='del'>-</div><div class='del'>-#define PFIT_CONTROL	0x61230</div><div class='del'>-# define PFIT_ENABLE				(1 &lt;&lt; 31)</div><div class='del'>-# define PFIT_PIPE_MASK				(3 &lt;&lt; 29)</div><div class='del'>-# define PFIT_PIPE_SHIFT			29</div><div class='del'>-# define VERT_INTERP_DISABLE			(0 &lt;&lt; 10)</div><div class='del'>-# define VERT_INTERP_BILINEAR			(1 &lt;&lt; 10)</div><div class='del'>-# define VERT_INTERP_MASK			(3 &lt;&lt; 10)</div><div class='del'>-# define VERT_AUTO_SCALE			(1 &lt;&lt; 9)</div><div class='del'>-# define HORIZ_INTERP_DISABLE			(0 &lt;&lt; 6)</div><div class='del'>-# define HORIZ_INTERP_BILINEAR			(1 &lt;&lt; 6)</div><div class='del'>-# define HORIZ_INTERP_MASK			(3 &lt;&lt; 6)</div><div class='del'>-# define HORIZ_AUTO_SCALE			(1 &lt;&lt; 5)</div><div class='del'>-# define PANEL_8TO6_DITHER_ENABLE		(1 &lt;&lt; 3)</div><div class='del'>-</div><div class='del'>-#define PFIT_PGM_RATIOS	0x61234</div><div class='del'>-# define PFIT_VERT_SCALE_MASK			0xfff00000</div><div class='del'>-# define PFIT_HORIZ_SCALE_MASK			0x0000fff0</div><div class='del'>-</div><div class='del'>-#define PFIT_AUTO_RATIOS	0x61238</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define DPLL_A		0x06014</div><div class='del'>-#define DPLL_B		0x06018</div><div class='del'>-# define DPLL_VCO_ENABLE			(1 &lt;&lt; 31)</div><div class='del'>-# define DPLL_DVO_HIGH_SPEED			(1 &lt;&lt; 30)</div><div class='del'>-# define DPLL_SYNCLOCK_ENABLE			(1 &lt;&lt; 29)</div><div class='del'>-# define DPLL_VGA_MODE_DIS			(1 &lt;&lt; 28)</div><div class='del'>-# define DPLLB_MODE_DAC_SERIAL			(1 &lt;&lt; 26) /* i915 */</div><div class='del'>-# define DPLLB_MODE_LVDS			(2 &lt;&lt; 26) /* i915 */</div><div class='del'>-# define DPLL_MODE_MASK				(3 &lt;&lt; 26)</div><div class='del'>-# define DPLL_DAC_SERIAL_P2_CLOCK_DIV_10	(0 &lt;&lt; 24) /* i915 */</div><div class='del'>-# define DPLL_DAC_SERIAL_P2_CLOCK_DIV_5		(1 &lt;&lt; 24) /* i915 */</div><div class='del'>-# define DPLLB_LVDS_P2_CLOCK_DIV_14		(0 &lt;&lt; 24) /* i915 */</div><div class='del'>-# define DPLLB_LVDS_P2_CLOCK_DIV_7		(1 &lt;&lt; 24) /* i915 */</div><div class='del'>-# define DPLL_P2_CLOCK_DIV_MASK			0x03000000 /* i915 */</div><div class='del'>-# define DPLL_FPA01_P1_POST_DIV_MASK		0x00ff0000 /* i915 */</div><div class='del'>-/**</div><div class='del'>- *  The i830 generation, in DAC/serial mode, defines p1 as two plus this</div><div class='del'>- * bitfield, or just 2 if PLL_P1_DIVIDE_BY_TWO is set.</div><div class='del'>- */</div><div class='del'>-# define DPLL_FPA01_P1_POST_DIV_MASK_I830	0x001f0000</div><div class='del'>-/**</div><div class='del'>- * The i830 generation, in LVDS mode, defines P1 as the bit number set within</div><div class='del'>- * this field (only one bit may be set).</div><div class='del'>- */</div><div class='del'>-# define DPLL_FPA01_P1_POST_DIV_MASK_I830_LVDS	0x003f0000</div><div class='del'>-# define DPLL_FPA01_P1_POST_DIV_SHIFT		16</div><div class='del'>-# define PLL_P2_DIVIDE_BY_4			(1 &lt;&lt; 23) /* i830, required in DVO non-gang */</div><div class='del'>-# define PLL_P1_DIVIDE_BY_TWO			(1 &lt;&lt; 21) /* i830 */</div><div class='del'>-# define PLL_REF_INPUT_DREFCLK			(0 &lt;&lt; 13)</div><div class='del'>-# define PLL_REF_INPUT_TVCLKINA			(1 &lt;&lt; 13) /* i830 */</div><div class='del'>-# define PLL_REF_INPUT_TVCLKINBC		(2 &lt;&lt; 13) /* SDVO TVCLKIN */</div><div class='del'>-# define PLLB_REF_INPUT_SPREADSPECTRUMIN	(3 &lt;&lt; 13)</div><div class='del'>-# define PLL_REF_INPUT_MASK			(3 &lt;&lt; 13)</div><div class='del'>-# define PLL_LOAD_PULSE_PHASE_SHIFT		9</div><div class='del'>-/*</div><div class='del'>- * Parallel to Serial Load Pulse phase selection.</div><div class='del'>- * Selects the phase for the 10X DPLL clock for the PCIe</div><div class='del'>- * digital display port. The range is 4 to 13; 10 or more</div><div class='del'>- * is just a flip delay. The default is 6</div><div class='del'>- */</div><div class='del'>-# define PLL_LOAD_PULSE_PHASE_MASK		(0xf &lt;&lt; PLL_LOAD_PULSE_PHASE_SHIFT)</div><div class='del'>-# define DISPLAY_RATE_SELECT_FPA1		(1 &lt;&lt; 8)</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * SDVO multiplier for 945G/GM. Not used on 965.</div><div class='del'>- *</div><div class='del'>- * \sa DPLL_MD_UDI_MULTIPLIER_MASK</div><div class='del'>- */</div><div class='del'>-# define SDVO_MULTIPLIER_MASK			0x000000ff</div><div class='del'>-# define SDVO_MULTIPLIER_SHIFT_HIRES		4</div><div class='del'>-# define SDVO_MULTIPLIER_SHIFT_VGA		0</div><div class='del'>-</div><div class='del'>-/** @defgroup DPLL_MD</div><div class='del'>- * @{</div><div class='del'>- */</div><div class='del'>-/** Pipe A SDVO/UDI clock multiplier/divider register for G965. */</div><div class='del'>-#define DPLL_A_MD		0x0601c</div><div class='del'>-/** Pipe B SDVO/UDI clock multiplier/divider register for G965. */</div><div class='del'>-#define DPLL_B_MD		0x06020</div><div class='del'>-/**</div><div class='del'>- * UDI pixel divider, controlling how many pixels are stuffed into a packet.</div><div class='del'>- *</div><div class='del'>- * Value is pixels minus 1.  Must be set to 1 pixel for SDVO.</div><div class='del'>- */</div><div class='del'>-# define DPLL_MD_UDI_DIVIDER_MASK		0x3f000000</div><div class='del'>-# define DPLL_MD_UDI_DIVIDER_SHIFT		24</div><div class='del'>-/** UDI pixel divider for VGA, same as DPLL_MD_UDI_DIVIDER_MASK. */</div><div class='del'>-# define DPLL_MD_VGA_UDI_DIVIDER_MASK		0x003f0000</div><div class='del'>-# define DPLL_MD_VGA_UDI_DIVIDER_SHIFT		16</div><div class='del'>-/**</div><div class='del'>- * SDVO/UDI pixel multiplier.</div><div class='del'>- *</div><div class='del'>- * SDVO requires that the bus clock rate be between 1 and 2 Ghz, and the bus</div><div class='del'>- * clock rate is 10 times the DPLL clock.  At low resolution/refresh rate</div><div class='del'>- * modes, the bus rate would be below the limits, so SDVO allows for stuffing</div><div class='del'>- * dummy bytes in the datastream at an increased clock rate, with both sides of</div><div class='del'>- * the link knowing how many bytes are fill.</div><div class='del'>- *</div><div class='del'>- * So, for a mode with a dotclock of 65Mhz, we would want to double the clock</div><div class='del'>- * rate to 130Mhz to get a bus rate of 1.30Ghz.  The DPLL clock rate would be</div><div class='del'>- * set to 130Mhz, and the SDVO multiplier set to 2x in this register and</div><div class='del'>- * through an SDVO command.</div><div class='del'>- *</div><div class='del'>- * This register field has values of multiplication factor minus 1, with</div><div class='del'>- * a maximum multiplier of 5 for SDVO.</div><div class='del'>- */</div><div class='del'>-# define DPLL_MD_UDI_MULTIPLIER_MASK		0x00003f00</div><div class='del'>-# define DPLL_MD_UDI_MULTIPLIER_SHIFT		8</div><div class='del'>-/** SDVO/UDI pixel multiplier for VGA, same as DPLL_MD_UDI_MULTIPLIER_MASK.</div><div class='del'>- * This best be set to the default value (3) or the CRT won't work. No,</div><div class='del'>- * I don't entirely understand what this does...</div><div class='del'>- */</div><div class='del'>-# define DPLL_MD_VGA_UDI_MULTIPLIER_MASK	0x0000003f</div><div class='del'>-# define DPLL_MD_VGA_UDI_MULTIPLIER_SHIFT	0</div><div class='del'>-/** @} */</div><div class='del'>-</div><div class='del'>-#define DPLL_TEST		0x606c</div><div class='del'>-# define DPLLB_TEST_SDVO_DIV_1			(0 &lt;&lt; 22)</div><div class='del'>-# define DPLLB_TEST_SDVO_DIV_2			(1 &lt;&lt; 22)</div><div class='del'>-# define DPLLB_TEST_SDVO_DIV_4			(2 &lt;&lt; 22)</div><div class='del'>-# define DPLLB_TEST_SDVO_DIV_MASK		(3 &lt;&lt; 22)</div><div class='del'>-# define DPLLB_TEST_N_BYPASS			(1 &lt;&lt; 19)</div><div class='del'>-# define DPLLB_TEST_M_BYPASS			(1 &lt;&lt; 18)</div><div class='del'>-# define DPLLB_INPUT_BUFFER_ENABLE		(1 &lt;&lt; 16)</div><div class='del'>-# define DPLLA_TEST_N_BYPASS			(1 &lt;&lt; 3)</div><div class='del'>-# define DPLLA_TEST_M_BYPASS			(1 &lt;&lt; 2)</div><div class='del'>-# define DPLLA_INPUT_BUFFER_ENABLE		(1 &lt;&lt; 0)</div><div class='del'>-</div><div class='del'>-#define ADPA			0x61100</div><div class='del'>-#define ADPA_DAC_ENABLE		(1&lt;&lt;31)</div><div class='del'>-#define ADPA_DAC_DISABLE	0</div><div class='del'>-#define ADPA_PIPE_SELECT_MASK	(1&lt;&lt;30)</div><div class='del'>-#define ADPA_PIPE_A_SELECT	0</div><div class='del'>-#define ADPA_PIPE_B_SELECT	(1&lt;&lt;30)</div><div class='del'>-#define ADPA_USE_VGA_HVPOLARITY (1&lt;&lt;15)</div><div class='del'>-#define ADPA_SETS_HVPOLARITY	0</div><div class='del'>-#define ADPA_VSYNC_CNTL_DISABLE (1&lt;&lt;11)</div><div class='del'>-#define ADPA_VSYNC_CNTL_ENABLE	0</div><div class='del'>-#define ADPA_HSYNC_CNTL_DISABLE (1&lt;&lt;10)</div><div class='del'>-#define ADPA_HSYNC_CNTL_ENABLE	0</div><div class='del'>-#define ADPA_VSYNC_ACTIVE_HIGH	(1&lt;&lt;4)</div><div class='del'>-#define ADPA_VSYNC_ACTIVE_LOW	0</div><div class='del'>-#define ADPA_HSYNC_ACTIVE_HIGH	(1&lt;&lt;3)</div><div class='del'>-#define ADPA_HSYNC_ACTIVE_LOW	0</div><div class='del'>-</div><div class='del'>-#define FPA0		0x06040</div><div class='del'>-#define FPA1		0x06044</div><div class='del'>-#define FPB0		0x06048</div><div class='del'>-#define FPB1		0x0604c</div><div class='del'>-# define FP_N_DIV_MASK				0x003f0000</div><div class='del'>-# define FP_N_DIV_SHIFT				16</div><div class='del'>-# define FP_M1_DIV_MASK				0x00003f00</div><div class='del'>-# define FP_M1_DIV_SHIFT			8</div><div class='del'>-# define FP_M2_DIV_MASK				0x0000003f</div><div class='del'>-# define FP_M2_DIV_SHIFT			0</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define PORT_HOTPLUG_EN		0x61110</div><div class='del'>-# define SDVOB_HOTPLUG_INT_EN			(1 &lt;&lt; 26)</div><div class='del'>-# define SDVOC_HOTPLUG_INT_EN			(1 &lt;&lt; 25)</div><div class='del'>-# define TV_HOTPLUG_INT_EN			(1 &lt;&lt; 18)</div><div class='del'>-# define CRT_HOTPLUG_INT_EN			(1 &lt;&lt; 9)</div><div class='del'>-# define CRT_HOTPLUG_FORCE_DETECT		(1 &lt;&lt; 3)</div><div class='del'>-</div><div class='del'>-#define PORT_HOTPLUG_STAT	0x61114</div><div class='del'>-# define CRT_HOTPLUG_INT_STATUS			(1 &lt;&lt; 11)</div><div class='del'>-# define TV_HOTPLUG_INT_STATUS			(1 &lt;&lt; 10)</div><div class='del'>-# define CRT_HOTPLUG_MONITOR_MASK		(3 &lt;&lt; 8)</div><div class='del'>-# define CRT_HOTPLUG_MONITOR_COLOR		(3 &lt;&lt; 8)</div><div class='del'>-# define CRT_HOTPLUG_MONITOR_MONO		(2 &lt;&lt; 8)</div><div class='del'>-# define CRT_HOTPLUG_MONITOR_NONE		(0 &lt;&lt; 8)</div><div class='del'>-# define SDVOC_HOTPLUG_INT_STATUS		(1 &lt;&lt; 7)</div><div class='del'>-# define SDVOB_HOTPLUG_INT_STATUS		(1 &lt;&lt; 6)</div><div class='del'>-</div><div class='del'>-#define SDVOB			0x61140</div><div class='del'>-#define SDVOC			0x61160</div><div class='del'>-#define SDVO_ENABLE				(1 &lt;&lt; 31)</div><div class='del'>-#define SDVO_PIPE_B_SELECT			(1 &lt;&lt; 30)</div><div class='del'>-#define SDVO_STALL_SELECT			(1 &lt;&lt; 29)</div><div class='del'>-#define SDVO_INTERRUPT_ENABLE			(1 &lt;&lt; 26)</div><div class='ctx'> /**</div><div class='del'>- * 915G/GM SDVO pixel multiplier.</div><div class='add'>+ * Reads a dword out of the status page, which is written to from the command</div><div class='add'>+ * queue by automatic updates, MI_REPORT_HEAD, MI_STORE_DATA_INDEX, or</div><div class='add'>+ * MI_STORE_DATA_IMM.</div><div class='ctx'>  *</div><div class='del'>- * Programmed value is multiplier - 1, up to 5x.</div><div class='del'>- *</div><div class='del'>- * \sa DPLL_MD_UDI_MULTIPLIER_MASK</div><div class='del'>- */</div><div class='del'>-#define SDVO_PORT_MULTIPLY_MASK			(7 &lt;&lt; 23)</div><div class='del'>-#define SDVO_PORT_MULTIPLY_SHIFT		23</div><div class='del'>-#define SDVO_PHASE_SELECT_MASK			(15 &lt;&lt; 19)</div><div class='del'>-#define SDVO_PHASE_SELECT_DEFAULT		(6 &lt;&lt; 19)</div><div class='del'>-#define SDVO_CLOCK_OUTPUT_INVERT		(1 &lt;&lt; 18)</div><div class='del'>-#define SDVOC_GANG_MODE				(1 &lt;&lt; 16)</div><div class='del'>-#define SDVO_BORDER_ENABLE			(1 &lt;&lt; 7)</div><div class='del'>-#define SDVOB_PCIE_CONCURRENCY			(1 &lt;&lt; 3)</div><div class='del'>-#define SDVO_DETECTED				(1 &lt;&lt; 2)</div><div class='del'>-/* Bits to be preserved when writing */</div><div class='del'>-#define SDVOB_PRESERVE_MASK			((1 &lt;&lt; 17) | (1 &lt;&lt; 16) | (1 &lt;&lt; 14))</div><div class='del'>-#define SDVOC_PRESERVE_MASK			(1 &lt;&lt; 17)</div><div class='del'>-</div><div class='del'>-/** @defgroup LVDS</div><div class='del'>- * @{</div><div class='del'>- */</div><div class='del'>-/**</div><div class='del'>- * This register controls the LVDS output enable, pipe selection, and data</div><div class='del'>- * format selection.</div><div class='add'>+ * The following dwords have a reserved meaning:</div><div class='add'>+ * 0x00: ISR copy, updated when an ISR bit not set in the HWSTAM changes.</div><div class='add'>+ * 0x04: ring 0 head pointer</div><div class='add'>+ * 0x05: ring 1 head pointer (915-class)</div><div class='add'>+ * 0x06: ring 2 head pointer (915-class)</div><div class='add'>+ * 0x10-0x1b: Context status DWords (GM45)</div><div class='add'>+ * 0x1f: Last written status offset. (GM45)</div><div class='ctx'>  *</div><div class='del'>- * All of the clock/data pairs are force powered down by power sequencing.</div><div class='del'>- */</div><div class='del'>-#define LVDS			0x61180</div><div class='del'>-/**</div><div class='del'>- * Enables the LVDS port.  This bit must be set before DPLLs are enabled, as</div><div class='del'>- * the DPLL semantics change when the LVDS is assigned to that pipe.</div><div class='del'>- */</div><div class='del'>-# define LVDS_PORT_EN			(1 &lt;&lt; 31)</div><div class='del'>-/** Selects pipe B for LVDS data.  Must be set on pre-965. */</div><div class='del'>-# define LVDS_PIPEB_SELECT		(1 &lt;&lt; 30)</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * Enables the A0-A2 data pairs and CLKA, containing 18 bits of color data per</div><div class='del'>- * pixel.</div><div class='del'>- */</div><div class='del'>-# define LVDS_A0A2_CLKA_POWER_MASK	(3 &lt;&lt; 8)</div><div class='del'>-# define LVDS_A0A2_CLKA_POWER_DOWN	(0 &lt;&lt; 8)</div><div class='del'>-# define LVDS_A0A2_CLKA_POWER_UP	(3 &lt;&lt; 8)</div><div class='del'>-/**</div><div class='del'>- * Controls the A3 data pair, which contains the additional LSBs for 24 bit</div><div class='del'>- * mode.  Only enabled if LVDS_A0A2_CLKA_POWER_UP also indicates it should be</div><div class='del'>- * on.</div><div class='del'>- */</div><div class='del'>-# define LVDS_A3_POWER_MASK		(3 &lt;&lt; 6)</div><div class='del'>-# define LVDS_A3_POWER_DOWN		(0 &lt;&lt; 6)</div><div class='del'>-# define LVDS_A3_POWER_UP		(3 &lt;&lt; 6)</div><div class='del'>-/**</div><div class='del'>- * Controls the CLKB pair.  This should only be set when LVDS_B0B3_POWER_UP</div><div class='del'>- * is set.</div><div class='del'>- */</div><div class='del'>-# define LVDS_CLKB_POWER_MASK		(3 &lt;&lt; 4)</div><div class='del'>-# define LVDS_CLKB_POWER_DOWN		(0 &lt;&lt; 4)</div><div class='del'>-# define LVDS_CLKB_POWER_UP		(3 &lt;&lt; 4)</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * Controls the B0-B3 data pairs.  This must be set to match the DPLL p2</div><div class='del'>- * setting for whether we are in dual-channel mode.  The B3 pair will</div><div class='del'>- * additionally only be powered up when LVDS_A3_POWER_UP is set.</div><div class='del'>- */</div><div class='del'>-# define LVDS_B0B3_POWER_MASK		(3 &lt;&lt; 2)</div><div class='del'>-# define LVDS_B0B3_POWER_DOWN		(0 &lt;&lt; 2)</div><div class='del'>-# define LVDS_B0B3_POWER_UP		(3 &lt;&lt; 2)</div><div class='del'>-</div><div class='del'>-#define PIPEACONF 0x70008</div><div class='del'>-#define PIPEACONF_ENABLE	(1&lt;&lt;31)</div><div class='del'>-#define PIPEACONF_DISABLE	0</div><div class='del'>-#define PIPEACONF_DOUBLE_WIDE	(1&lt;&lt;30)</div><div class='del'>-#define I965_PIPECONF_ACTIVE	(1&lt;&lt;30)</div><div class='del'>-#define PIPEACONF_SINGLE_WIDE	0</div><div class='del'>-#define PIPEACONF_PIPE_UNLOCKED 0</div><div class='del'>-#define PIPEACONF_PIPE_LOCKED	(1&lt;&lt;25)</div><div class='del'>-#define PIPEACONF_PALETTE	0</div><div class='del'>-#define PIPEACONF_GAMMA		(1&lt;&lt;24)</div><div class='del'>-#define PIPECONF_FORCE_BORDER	(1&lt;&lt;25)</div><div class='del'>-#define PIPECONF_PROGRESSIVE	(0 &lt;&lt; 21)</div><div class='del'>-#define PIPECONF_INTERLACE_W_FIELD_INDICATION	(6 &lt;&lt; 21)</div><div class='del'>-#define PIPECONF_INTERLACE_FIELD_0_ONLY		(7 &lt;&lt; 21)</div><div class='del'>-</div><div class='del'>-#define DSPARB	  0x70030</div><div class='del'>-#define DSPARB_CSTART_MASK	(0x7f &lt;&lt; 7)</div><div class='del'>-#define DSPARB_CSTART_SHIFT	7</div><div class='del'>-#define DSPARB_BSTART_MASK	(0x7f)		 </div><div class='del'>-#define DSPARB_BSTART_SHIFT	0</div><div class='del'>-</div><div class='del'>-#define PIPEBCONF 0x71008</div><div class='del'>-#define PIPEBCONF_ENABLE	(1&lt;&lt;31)</div><div class='del'>-#define PIPEBCONF_DISABLE	0</div><div class='del'>-#define PIPEBCONF_DOUBLE_WIDE	(1&lt;&lt;30)</div><div class='del'>-#define PIPEBCONF_DISABLE	0</div><div class='del'>-#define PIPEBCONF_GAMMA		(1&lt;&lt;24)</div><div class='del'>-#define PIPEBCONF_PALETTE	0</div><div class='del'>-</div><div class='del'>-#define PIPEBGCMAXRED		0x71010</div><div class='del'>-#define PIPEBGCMAXGREEN		0x71014</div><div class='del'>-#define PIPEBGCMAXBLUE		0x71018</div><div class='del'>-#define PIPEBSTAT		0x71024</div><div class='del'>-#define PIPEBFRAMEHIGH		0x71040</div><div class='del'>-#define PIPEBFRAMEPIXEL		0x71044</div><div class='del'>-</div><div class='del'>-#define DSPACNTR		0x70180</div><div class='del'>-#define DSPBCNTR		0x71180</div><div class='del'>-#define DISPLAY_PLANE_ENABLE			(1&lt;&lt;31)</div><div class='del'>-#define DISPLAY_PLANE_DISABLE			0</div><div class='del'>-#define DISPPLANE_GAMMA_ENABLE			(1&lt;&lt;30)</div><div class='del'>-#define DISPPLANE_GAMMA_DISABLE			0</div><div class='del'>-#define DISPPLANE_PIXFORMAT_MASK		(0xf&lt;&lt;26)</div><div class='del'>-#define DISPPLANE_8BPP				(0x2&lt;&lt;26)</div><div class='del'>-#define DISPPLANE_15_16BPP			(0x4&lt;&lt;26)</div><div class='del'>-#define DISPPLANE_16BPP				(0x5&lt;&lt;26)</div><div class='del'>-#define DISPPLANE_32BPP_NO_ALPHA		(0x6&lt;&lt;26)</div><div class='del'>-#define DISPPLANE_32BPP				(0x7&lt;&lt;26)</div><div class='del'>-#define DISPPLANE_STEREO_ENABLE			(1&lt;&lt;25)</div><div class='del'>-#define DISPPLANE_STEREO_DISABLE		0</div><div class='del'>-#define DISPPLANE_SEL_PIPE_MASK			(1&lt;&lt;24)</div><div class='del'>-#define DISPPLANE_SEL_PIPE_A			0</div><div class='del'>-#define DISPPLANE_SEL_PIPE_B			(1&lt;&lt;24)</div><div class='del'>-#define DISPPLANE_SRC_KEY_ENABLE		(1&lt;&lt;22)</div><div class='del'>-#define DISPPLANE_SRC_KEY_DISABLE		0</div><div class='del'>-#define DISPPLANE_LINE_DOUBLE			(1&lt;&lt;20)</div><div class='del'>-#define DISPPLANE_NO_LINE_DOUBLE		0</div><div class='del'>-#define DISPPLANE_STEREO_POLARITY_FIRST		0</div><div class='del'>-#define DISPPLANE_STEREO_POLARITY_SECOND	(1&lt;&lt;18)</div><div class='del'>-/* plane B only */</div><div class='del'>-#define DISPPLANE_ALPHA_TRANS_ENABLE		(1&lt;&lt;15)</div><div class='del'>-#define DISPPLANE_ALPHA_TRANS_DISABLE		0</div><div class='del'>-#define DISPPLANE_SPRITE_ABOVE_DISPLAYA		0</div><div class='del'>-#define DISPPLANE_SPRITE_ABOVE_OVERLAY		(1)</div><div class='del'>-</div><div class='del'>-#define DSPABASE		0x70184</div><div class='del'>-#define DSPASTRIDE		0x70188</div><div class='del'>-</div><div class='del'>-#define DSPBBASE		0x71184</div><div class='del'>-#define DSPBADDR		DSPBBASE</div><div class='del'>-#define DSPBSTRIDE		0x71188</div><div class='del'>-</div><div class='del'>-#define DSPAKEYVAL		0x70194</div><div class='del'>-#define DSPAKEYMASK		0x70198</div><div class='del'>-</div><div class='del'>-#define DSPAPOS			0x7018C /* reserved */</div><div class='del'>-#define DSPASIZE		0x70190</div><div class='del'>-#define DSPBPOS			0x7118C</div><div class='del'>-#define DSPBSIZE		0x71190</div><div class='del'>-</div><div class='del'>-#define DSPASURF		0x7019C</div><div class='del'>-#define DSPATILEOFF		0x701A4</div><div class='del'>-</div><div class='del'>-#define DSPBSURF		0x7119C</div><div class='del'>-#define DSPBTILEOFF		0x711A4</div><div class='del'>-</div><div class='del'>-#define VGACNTRL		0x71400</div><div class='del'>-# define VGA_DISP_DISABLE			(1 &lt;&lt; 31)</div><div class='del'>-# define VGA_2X_MODE				(1 &lt;&lt; 30)</div><div class='del'>-# define VGA_PIPE_B_SELECT			(1 &lt;&lt; 29)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Some BIOS scratch area registers.  The 845 (and 830?) store the amount</div><div class='del'>- * of video memory available to the BIOS in SWF1.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define SWF0			0x71410</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 855 scratch registers.</div><div class='del'>- */</div><div class='del'>-#define SWF10			0x70410</div><div class='del'>-</div><div class='del'>-#define SWF30			0x72414</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Overlay registers.  These are overlay registers accessed via MMIO.</div><div class='del'>- * Those loaded via the overlay register page are defined in i830_video.c.</div><div class='add'>+ * The area from dword 0x20 to 0x3ff is available for driver usage.</div><div class='ctx'>  */</div><div class='del'>-#define OVADD			0x30000</div><div class='del'>-</div><div class='del'>-#define DOVSTA			0x30008</div><div class='del'>-#define OC_BUF			(0x3&lt;&lt;20)</div><div class='add'>+#define READ_HWSP(dev_priv, reg)  (((volatile u32*)(dev_priv-&gt;hw_status_page))[reg])</div><div class='add'>+#define READ_BREADCRUMB(dev_priv) READ_HWSP(dev_priv, 5)</div><div class='add'>+#define I915_GEM_HWS_INDEX		0x20</div><div class='ctx'> </div><div class='del'>-#define OGAMC5			0x30010</div><div class='del'>-#define OGAMC4			0x30014</div><div class='del'>-#define OGAMC3			0x30018</div><div class='del'>-#define OGAMC2			0x3001c</div><div class='del'>-#define OGAMC1			0x30020</div><div class='del'>-#define OGAMC0			0x30024</div><div class='del'>-/*</div><div class='del'>- * Palette registers</div><div class='del'>- */</div><div class='del'>-#define PALETTE_A		0x0a000</div><div class='del'>-#define PALETTE_B		0x0a800</div><div class='add'>+extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);</div><div class='ctx'> </div><div class='ctx'> #define IS_I830(dev) ((dev)-&gt;pci_device == 0x3577)</div><div class='ctx'> #define IS_845G(dev) ((dev)-&gt;pci_device == 0x2562)</div><div class='hunk'>@@ -1119,7 +639,7 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);</div><div class='ctx'> </div><div class='ctx'> #define IS_I965GM(dev) ((dev)-&gt;pci_device == 0x2A02)</div><div class='ctx'> </div><div class='del'>-#define IS_IGD_GM(dev) ((dev)-&gt;pci_device == 0x2A42)</div><div class='add'>+#define IS_GM45(dev) ((dev)-&gt;pci_device == 0x2A42)</div><div class='ctx'> </div><div class='ctx'> #define IS_G4X(dev) ((dev)-&gt;pci_device == 0x2E02 || \</div><div class='ctx'> 		     (dev)-&gt;pci_device == 0x2E12 || \</div><div class='hunk'>@@ -1133,9 +653,9 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);</div><div class='ctx'> 		      IS_I945GM(dev) || IS_I965G(dev) || IS_G33(dev))</div><div class='ctx'> </div><div class='ctx'> #define IS_MOBILE(dev) (IS_I830(dev) || IS_I85X(dev) || IS_I915GM(dev) || \</div><div class='del'>-			IS_I945GM(dev) || IS_I965GM(dev) || IS_IGD_GM(dev))</div><div class='add'>+			IS_I945GM(dev) || IS_I965GM(dev) || IS_GM45(dev))</div><div class='ctx'> </div><div class='del'>-#define I915_NEED_GFX_HWS(dev) (IS_G33(dev) || IS_IGD_GM(dev) || IS_G4X(dev))</div><div class='add'>+#define I915_NEED_GFX_HWS(dev) (IS_G33(dev) || IS_GM45(dev) || IS_G4X(dev))</div><div class='ctx'> </div><div class='ctx'> #define PRIMARY_RINGBUFFER_SIZE         (128*1024)</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c<br/>new file mode 100644<br/>index 000000000000..9ac73dd1b422<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpu/drm/i915/i915_gem.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/i915/i915_gem.c</a></div><div class='hunk'>@@ -0,0 +1,2558 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright © 2008 Intel Corporation</div><div class='add'>+ *</div><div class='add'>+ * Permission is hereby granted, free of charge, to any person obtaining a</div><div class='add'>+ * copy of this software and associated documentation files (the "Software"),</div><div class='add'>+ * to deal in the Software without restriction, including without limitation</div><div class='add'>+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,</div><div class='add'>+ * and/or sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ * Software is furnished to do so, subject to the following conditions:</div><div class='add'>+ *</div><div class='add'>+ * The above copyright notice and this permission notice (including the next</div><div class='add'>+ * paragraph) shall be included in all copies or substantial portions of the</div><div class='add'>+ * Software.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR</div><div class='add'>+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL</div><div class='add'>+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER</div><div class='add'>+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS</div><div class='add'>+ * IN THE SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ * Authors:</div><div class='add'>+ *    Eric Anholt &lt;eric@anholt.net&gt;</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "drmP.h"</div><div class='add'>+#include "drm.h"</div><div class='add'>+#include "i915_drm.h"</div><div class='add'>+#include "i915_drv.h"</div><div class='add'>+#include &lt;linux/swap.h&gt;</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+i915_gem_object_set_domain(struct drm_gem_object *obj,</div><div class='add'>+			    uint32_t read_domains,</div><div class='add'>+			    uint32_t write_domain);</div><div class='add'>+static int</div><div class='add'>+i915_gem_object_set_domain_range(struct drm_gem_object *obj,</div><div class='add'>+				 uint64_t offset,</div><div class='add'>+				 uint64_t size,</div><div class='add'>+				 uint32_t read_domains,</div><div class='add'>+				 uint32_t write_domain);</div><div class='add'>+static int</div><div class='add'>+i915_gem_set_domain(struct drm_gem_object *obj,</div><div class='add'>+		    struct drm_file *file_priv,</div><div class='add'>+		    uint32_t read_domains,</div><div class='add'>+		    uint32_t write_domain);</div><div class='add'>+static int i915_gem_object_get_page_list(struct drm_gem_object *obj);</div><div class='add'>+static void i915_gem_object_free_page_list(struct drm_gem_object *obj);</div><div class='add'>+static int i915_gem_object_wait_rendering(struct drm_gem_object *obj);</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+i915_gem_cleanup_ringbuffer(struct drm_device *dev);</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+i915_gem_init_ioctl(struct drm_device *dev, void *data,</div><div class='add'>+		    struct drm_file *file_priv)</div><div class='add'>+{</div><div class='add'>+	drm_i915_private_t *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct drm_i915_gem_init *args = data;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+</div><div class='add'>+	if (args-&gt;gtt_start &gt;= args-&gt;gtt_end ||</div><div class='add'>+	    (args-&gt;gtt_start &amp; (PAGE_SIZE - 1)) != 0 ||</div><div class='add'>+	    (args-&gt;gtt_end &amp; (PAGE_SIZE - 1)) != 0) {</div><div class='add'>+		mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	drm_mm_init(&amp;dev_priv-&gt;mm.gtt_space, args-&gt;gtt_start,</div><div class='add'>+	    args-&gt;gtt_end - args-&gt;gtt_start);</div><div class='add'>+</div><div class='add'>+	dev-&gt;gtt_total = (uint32_t) (args-&gt;gtt_end - args-&gt;gtt_start);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Creates a new mm object and returns a handle to it.</div><div class='add'>+ */</div><div class='add'>+int</div><div class='add'>+i915_gem_create_ioctl(struct drm_device *dev, void *data,</div><div class='add'>+		      struct drm_file *file_priv)</div><div class='add'>+{</div><div class='add'>+	struct drm_i915_gem_create *args = data;</div><div class='add'>+	struct drm_gem_object *obj;</div><div class='add'>+	int handle, ret;</div><div class='add'>+</div><div class='add'>+	args-&gt;size = roundup(args-&gt;size, PAGE_SIZE);</div><div class='add'>+</div><div class='add'>+	/* Allocate the new object */</div><div class='add'>+	obj = drm_gem_object_alloc(dev, args-&gt;size);</div><div class='add'>+	if (obj == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ret = drm_gem_handle_create(file_priv, obj, &amp;handle);</div><div class='add'>+	mutex_lock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+	drm_gem_object_handle_unreference(obj);</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	args-&gt;handle = handle;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Reads data from the object referenced by handle.</div><div class='add'>+ *</div><div class='add'>+ * On error, the contents of *data are undefined.</div><div class='add'>+ */</div><div class='add'>+int</div><div class='add'>+i915_gem_pread_ioctl(struct drm_device *dev, void *data,</div><div class='add'>+		     struct drm_file *file_priv)</div><div class='add'>+{</div><div class='add'>+	struct drm_i915_gem_pread *args = data;</div><div class='add'>+	struct drm_gem_object *obj;</div><div class='add'>+	struct drm_i915_gem_object *obj_priv;</div><div class='add'>+	ssize_t read;</div><div class='add'>+	loff_t offset;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	obj = drm_gem_object_lookup(dev, file_priv, args-&gt;handle);</div><div class='add'>+	if (obj == NULL)</div><div class='add'>+		return -EBADF;</div><div class='add'>+	obj_priv = obj-&gt;driver_private;</div><div class='add'>+</div><div class='add'>+	/* Bounds check source.</div><div class='add'>+	 *</div><div class='add'>+	 * XXX: This could use review for overflow issues...</div><div class='add'>+	 */</div><div class='add'>+	if (args-&gt;offset &gt; obj-&gt;size || args-&gt;size &gt; obj-&gt;size ||</div><div class='add'>+	    args-&gt;offset + args-&gt;size &gt; obj-&gt;size) {</div><div class='add'>+		drm_gem_object_unreference(obj);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+</div><div class='add'>+	ret = i915_gem_object_set_domain_range(obj, args-&gt;offset, args-&gt;size,</div><div class='add'>+					       I915_GEM_DOMAIN_CPU, 0);</div><div class='add'>+	if (ret != 0) {</div><div class='add'>+		drm_gem_object_unreference(obj);</div><div class='add'>+		mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	offset = args-&gt;offset;</div><div class='add'>+</div><div class='add'>+	read = vfs_read(obj-&gt;filp, (char __user *)(uintptr_t)args-&gt;data_ptr,</div><div class='add'>+			args-&gt;size, &amp;offset);</div><div class='add'>+	if (read != args-&gt;size) {</div><div class='add'>+		drm_gem_object_unreference(obj);</div><div class='add'>+		mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+		if (read &lt; 0)</div><div class='add'>+			return read;</div><div class='add'>+		else</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	drm_gem_object_unreference(obj);</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+i915_gem_gtt_pwrite(struct drm_device *dev, struct drm_gem_object *obj,</div><div class='add'>+		    struct drm_i915_gem_pwrite *args,</div><div class='add'>+		    struct drm_file *file_priv)</div><div class='add'>+{</div><div class='add'>+	struct drm_i915_gem_object *obj_priv = obj-&gt;driver_private;</div><div class='add'>+	ssize_t remain;</div><div class='add'>+	loff_t offset;</div><div class='add'>+	char __user *user_data;</div><div class='add'>+	char __iomem *vaddr;</div><div class='add'>+	char *vaddr_atomic;</div><div class='add'>+	int i, o, l;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	unsigned long pfn;</div><div class='add'>+	unsigned long unwritten;</div><div class='add'>+</div><div class='add'>+	user_data = (char __user *) (uintptr_t) args-&gt;data_ptr;</div><div class='add'>+	remain = args-&gt;size;</div><div class='add'>+	if (!access_ok(VERIFY_READ, user_data, remain))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+	ret = i915_gem_object_pin(obj, 0);</div><div class='add'>+	if (ret) {</div><div class='add'>+		mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+	ret = i915_gem_set_domain(obj, file_priv,</div><div class='add'>+				  I915_GEM_DOMAIN_GTT, I915_GEM_DOMAIN_GTT);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	obj_priv = obj-&gt;driver_private;</div><div class='add'>+	offset = obj_priv-&gt;gtt_offset + args-&gt;offset;</div><div class='add'>+	obj_priv-&gt;dirty = 1;</div><div class='add'>+</div><div class='add'>+	while (remain &gt; 0) {</div><div class='add'>+		/* Operation in this page</div><div class='add'>+		 *</div><div class='add'>+		 * i = page number</div><div class='add'>+		 * o = offset within page</div><div class='add'>+		 * l = bytes to copy</div><div class='add'>+		 */</div><div class='add'>+		i = offset &gt;&gt; PAGE_SHIFT;</div><div class='add'>+		o = offset &amp; (PAGE_SIZE-1);</div><div class='add'>+		l = remain;</div><div class='add'>+		if ((o + l) &gt; PAGE_SIZE)</div><div class='add'>+			l = PAGE_SIZE - o;</div><div class='add'>+</div><div class='add'>+		pfn = (dev-&gt;agp-&gt;base &gt;&gt; PAGE_SHIFT) + i;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_HIGHMEM</div><div class='add'>+		/* This is a workaround for the low performance of iounmap</div><div class='add'>+		 * (approximate 10% cpu cost on normal 3D workloads).</div><div class='add'>+		 * kmap_atomic on HIGHMEM kernels happens to let us map card</div><div class='add'>+		 * memory without taking IPIs.  When the vmap rework lands</div><div class='add'>+		 * we should be able to dump this hack.</div><div class='add'>+		 */</div><div class='add'>+		vaddr_atomic = kmap_atomic_pfn(pfn, KM_USER0);</div><div class='add'>+#if WATCH_PWRITE</div><div class='add'>+		DRM_INFO("pwrite i %d o %d l %d pfn %ld vaddr %p\n",</div><div class='add'>+			 i, o, l, pfn, vaddr_atomic);</div><div class='add'>+#endif</div><div class='add'>+		unwritten = __copy_from_user_inatomic_nocache(vaddr_atomic + o,</div><div class='add'>+							      user_data, l);</div><div class='add'>+		kunmap_atomic(vaddr_atomic, KM_USER0);</div><div class='add'>+</div><div class='add'>+		if (unwritten)</div><div class='add'>+#endif /* CONFIG_HIGHMEM */</div><div class='add'>+		{</div><div class='add'>+			vaddr = ioremap_wc(pfn &lt;&lt; PAGE_SHIFT, PAGE_SIZE);</div><div class='add'>+#if WATCH_PWRITE</div><div class='add'>+			DRM_INFO("pwrite slow i %d o %d l %d "</div><div class='add'>+				 "pfn %ld vaddr %p\n",</div><div class='add'>+				 i, o, l, pfn, vaddr);</div><div class='add'>+#endif</div><div class='add'>+			if (vaddr == NULL) {</div><div class='add'>+				ret = -EFAULT;</div><div class='add'>+				goto fail;</div><div class='add'>+			}</div><div class='add'>+			unwritten = __copy_from_user(vaddr + o, user_data, l);</div><div class='add'>+#if WATCH_PWRITE</div><div class='add'>+			DRM_INFO("unwritten %ld\n", unwritten);</div><div class='add'>+#endif</div><div class='add'>+			iounmap(vaddr);</div><div class='add'>+			if (unwritten) {</div><div class='add'>+				ret = -EFAULT;</div><div class='add'>+				goto fail;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		remain -= l;</div><div class='add'>+		user_data += l;</div><div class='add'>+		offset += l;</div><div class='add'>+	}</div><div class='add'>+#if WATCH_PWRITE &amp;&amp; 1</div><div class='add'>+	i915_gem_clflush_object(obj);</div><div class='add'>+	i915_gem_dump_object(obj, args-&gt;offset + args-&gt;size, __func__, ~0);</div><div class='add'>+	i915_gem_clflush_object(obj);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+fail:</div><div class='add'>+	i915_gem_object_unpin(obj);</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+i915_gem_shmem_pwrite(struct drm_device *dev, struct drm_gem_object *obj,</div><div class='add'>+		      struct drm_i915_gem_pwrite *args,</div><div class='add'>+		      struct drm_file *file_priv)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	loff_t offset;</div><div class='add'>+	ssize_t written;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+</div><div class='add'>+	ret = i915_gem_set_domain(obj, file_priv,</div><div class='add'>+				  I915_GEM_DOMAIN_CPU, I915_GEM_DOMAIN_CPU);</div><div class='add'>+	if (ret) {</div><div class='add'>+		mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	offset = args-&gt;offset;</div><div class='add'>+</div><div class='add'>+	written = vfs_write(obj-&gt;filp,</div><div class='add'>+			    (char __user *)(uintptr_t) args-&gt;data_ptr,</div><div class='add'>+			    args-&gt;size, &amp;offset);</div><div class='add'>+	if (written != args-&gt;size) {</div><div class='add'>+		mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+		if (written &lt; 0)</div><div class='add'>+			return written;</div><div class='add'>+		else</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Writes data to the object referenced by handle.</div><div class='add'>+ *</div><div class='add'>+ * On error, the contents of the buffer that were to be modified are undefined.</div><div class='add'>+ */</div><div class='add'>+int</div><div class='add'>+i915_gem_pwrite_ioctl(struct drm_device *dev, void *data,</div><div class='add'>+		      struct drm_file *file_priv)</div><div class='add'>+{</div><div class='add'>+	struct drm_i915_gem_pwrite *args = data;</div><div class='add'>+	struct drm_gem_object *obj;</div><div class='add'>+	struct drm_i915_gem_object *obj_priv;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	obj = drm_gem_object_lookup(dev, file_priv, args-&gt;handle);</div><div class='add'>+	if (obj == NULL)</div><div class='add'>+		return -EBADF;</div><div class='add'>+	obj_priv = obj-&gt;driver_private;</div><div class='add'>+</div><div class='add'>+	/* Bounds check destination.</div><div class='add'>+	 *</div><div class='add'>+	 * XXX: This could use review for overflow issues...</div><div class='add'>+	 */</div><div class='add'>+	if (args-&gt;offset &gt; obj-&gt;size || args-&gt;size &gt; obj-&gt;size ||</div><div class='add'>+	    args-&gt;offset + args-&gt;size &gt; obj-&gt;size) {</div><div class='add'>+		drm_gem_object_unreference(obj);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* We can only do the GTT pwrite on untiled buffers, as otherwise</div><div class='add'>+	 * it would end up going through the fenced access, and we'll get</div><div class='add'>+	 * different detiling behavior between reading and writing.</div><div class='add'>+	 * pread/pwrite currently are reading and writing from the CPU</div><div class='add'>+	 * perspective, requiring manual detiling by the client.</div><div class='add'>+	 */</div><div class='add'>+	if (obj_priv-&gt;tiling_mode == I915_TILING_NONE &amp;&amp;</div><div class='add'>+	    dev-&gt;gtt_total != 0)</div><div class='add'>+		ret = i915_gem_gtt_pwrite(dev, obj, args, file_priv);</div><div class='add'>+	else</div><div class='add'>+		ret = i915_gem_shmem_pwrite(dev, obj, args, file_priv);</div><div class='add'>+</div><div class='add'>+#if WATCH_PWRITE</div><div class='add'>+	if (ret)</div><div class='add'>+		DRM_INFO("pwrite failed %d\n", ret);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	drm_gem_object_unreference(obj);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Called when user space prepares to use an object</div><div class='add'>+ */</div><div class='add'>+int</div><div class='add'>+i915_gem_set_domain_ioctl(struct drm_device *dev, void *data,</div><div class='add'>+			  struct drm_file *file_priv)</div><div class='add'>+{</div><div class='add'>+	struct drm_i915_gem_set_domain *args = data;</div><div class='add'>+	struct drm_gem_object *obj;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!(dev-&gt;driver-&gt;driver_features &amp; DRIVER_GEM))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	obj = drm_gem_object_lookup(dev, file_priv, args-&gt;handle);</div><div class='add'>+	if (obj == NULL)</div><div class='add'>+		return -EBADF;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+#if WATCH_BUF</div><div class='add'>+	DRM_INFO("set_domain_ioctl %p(%d), %08x %08x\n",</div><div class='add'>+		 obj, obj-&gt;size, args-&gt;read_domains, args-&gt;write_domain);</div><div class='add'>+#endif</div><div class='add'>+	ret = i915_gem_set_domain(obj, file_priv,</div><div class='add'>+				  args-&gt;read_domains, args-&gt;write_domain);</div><div class='add'>+	drm_gem_object_unreference(obj);</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Called when user space has done writes to this buffer</div><div class='add'>+ */</div><div class='add'>+int</div><div class='add'>+i915_gem_sw_finish_ioctl(struct drm_device *dev, void *data,</div><div class='add'>+		      struct drm_file *file_priv)</div><div class='add'>+{</div><div class='add'>+	struct drm_i915_gem_sw_finish *args = data;</div><div class='add'>+	struct drm_gem_object *obj;</div><div class='add'>+	struct drm_i915_gem_object *obj_priv;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (!(dev-&gt;driver-&gt;driver_features &amp; DRIVER_GEM))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+	obj = drm_gem_object_lookup(dev, file_priv, args-&gt;handle);</div><div class='add'>+	if (obj == NULL) {</div><div class='add'>+		mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+		return -EBADF;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#if WATCH_BUF</div><div class='add'>+	DRM_INFO("%s: sw_finish %d (%p %d)\n",</div><div class='add'>+		 __func__, args-&gt;handle, obj, obj-&gt;size);</div><div class='add'>+#endif</div><div class='add'>+	obj_priv = obj-&gt;driver_private;</div><div class='add'>+</div><div class='add'>+	/* Pinned buffers may be scanout, so flush the cache */</div><div class='add'>+	if ((obj-&gt;write_domain &amp; I915_GEM_DOMAIN_CPU) &amp;&amp; obj_priv-&gt;pin_count) {</div><div class='add'>+		i915_gem_clflush_object(obj);</div><div class='add'>+		drm_agp_chipset_flush(dev);</div><div class='add'>+	}</div><div class='add'>+	drm_gem_object_unreference(obj);</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Maps the contents of an object, returning the address it is mapped</div><div class='add'>+ * into.</div><div class='add'>+ *</div><div class='add'>+ * While the mapping holds a reference on the contents of the object, it doesn't</div><div class='add'>+ * imply a ref on the object itself.</div><div class='add'>+ */</div><div class='add'>+int</div><div class='add'>+i915_gem_mmap_ioctl(struct drm_device *dev, void *data,</div><div class='add'>+		   struct drm_file *file_priv)</div><div class='add'>+{</div><div class='add'>+	struct drm_i915_gem_mmap *args = data;</div><div class='add'>+	struct drm_gem_object *obj;</div><div class='add'>+	loff_t offset;</div><div class='add'>+	unsigned long addr;</div><div class='add'>+</div><div class='add'>+	if (!(dev-&gt;driver-&gt;driver_features &amp; DRIVER_GEM))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	obj = drm_gem_object_lookup(dev, file_priv, args-&gt;handle);</div><div class='add'>+	if (obj == NULL)</div><div class='add'>+		return -EBADF;</div><div class='add'>+</div><div class='add'>+	offset = args-&gt;offset;</div><div class='add'>+</div><div class='add'>+	down_write(&amp;current-&gt;mm-&gt;mmap_sem);</div><div class='add'>+	addr = do_mmap(obj-&gt;filp, 0, args-&gt;size,</div><div class='add'>+		       PROT_READ | PROT_WRITE, MAP_SHARED,</div><div class='add'>+		       args-&gt;offset);</div><div class='add'>+	up_write(&amp;current-&gt;mm-&gt;mmap_sem);</div><div class='add'>+	mutex_lock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+	drm_gem_object_unreference(obj);</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+	if (IS_ERR((void *)addr))</div><div class='add'>+		return addr;</div><div class='add'>+</div><div class='add'>+	args-&gt;addr_ptr = (uint64_t) addr;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+i915_gem_object_free_page_list(struct drm_gem_object *obj)</div><div class='add'>+{</div><div class='add'>+	struct drm_i915_gem_object *obj_priv = obj-&gt;driver_private;</div><div class='add'>+	int page_count = obj-&gt;size / PAGE_SIZE;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (obj_priv-&gt;page_list == NULL)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; page_count; i++)</div><div class='add'>+		if (obj_priv-&gt;page_list[i] != NULL) {</div><div class='add'>+			if (obj_priv-&gt;dirty)</div><div class='add'>+				set_page_dirty(obj_priv-&gt;page_list[i]);</div><div class='add'>+			mark_page_accessed(obj_priv-&gt;page_list[i]);</div><div class='add'>+			page_cache_release(obj_priv-&gt;page_list[i]);</div><div class='add'>+		}</div><div class='add'>+	obj_priv-&gt;dirty = 0;</div><div class='add'>+</div><div class='add'>+	drm_free(obj_priv-&gt;page_list,</div><div class='add'>+		 page_count * sizeof(struct page *),</div><div class='add'>+		 DRM_MEM_DRIVER);</div><div class='add'>+	obj_priv-&gt;page_list = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+i915_gem_object_move_to_active(struct drm_gem_object *obj)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = obj-&gt;dev;</div><div class='add'>+	drm_i915_private_t *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct drm_i915_gem_object *obj_priv = obj-&gt;driver_private;</div><div class='add'>+</div><div class='add'>+	/* Add a reference if we're newly entering the active list. */</div><div class='add'>+	if (!obj_priv-&gt;active) {</div><div class='add'>+		drm_gem_object_reference(obj);</div><div class='add'>+		obj_priv-&gt;active = 1;</div><div class='add'>+	}</div><div class='add'>+	/* Move from whatever list we were on to the tail of execution. */</div><div class='add'>+	list_move_tail(&amp;obj_priv-&gt;list,</div><div class='add'>+		       &amp;dev_priv-&gt;mm.active_list);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+i915_gem_object_move_to_inactive(struct drm_gem_object *obj)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = obj-&gt;dev;</div><div class='add'>+	drm_i915_private_t *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct drm_i915_gem_object *obj_priv = obj-&gt;driver_private;</div><div class='add'>+</div><div class='add'>+	i915_verify_inactive(dev, __FILE__, __LINE__);</div><div class='add'>+	if (obj_priv-&gt;pin_count != 0)</div><div class='add'>+		list_del_init(&amp;obj_priv-&gt;list);</div><div class='add'>+	else</div><div class='add'>+		list_move_tail(&amp;obj_priv-&gt;list, &amp;dev_priv-&gt;mm.inactive_list);</div><div class='add'>+</div><div class='add'>+	if (obj_priv-&gt;active) {</div><div class='add'>+		obj_priv-&gt;active = 0;</div><div class='add'>+		drm_gem_object_unreference(obj);</div><div class='add'>+	}</div><div class='add'>+	i915_verify_inactive(dev, __FILE__, __LINE__);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Creates a new sequence number, emitting a write of it to the status page</div><div class='add'>+ * plus an interrupt, which will trigger i915_user_interrupt_handler.</div><div class='add'>+ *</div><div class='add'>+ * Must be called with struct_lock held.</div><div class='add'>+ *</div><div class='add'>+ * Returned sequence numbers are nonzero on success.</div><div class='add'>+ */</div><div class='add'>+static uint32_t</div><div class='add'>+i915_add_request(struct drm_device *dev, uint32_t flush_domains)</div><div class='add'>+{</div><div class='add'>+	drm_i915_private_t *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct drm_i915_gem_request *request;</div><div class='add'>+	uint32_t seqno;</div><div class='add'>+	int was_empty;</div><div class='add'>+	RING_LOCALS;</div><div class='add'>+</div><div class='add'>+	request = drm_calloc(1, sizeof(*request), DRM_MEM_DRIVER);</div><div class='add'>+	if (request == NULL)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Grab the seqno we're going to make this request be, and bump the</div><div class='add'>+	 * next (skipping 0 so it can be the reserved no-seqno value).</div><div class='add'>+	 */</div><div class='add'>+	seqno = dev_priv-&gt;mm.next_gem_seqno;</div><div class='add'>+	dev_priv-&gt;mm.next_gem_seqno++;</div><div class='add'>+	if (dev_priv-&gt;mm.next_gem_seqno == 0)</div><div class='add'>+		dev_priv-&gt;mm.next_gem_seqno++;</div><div class='add'>+</div><div class='add'>+	BEGIN_LP_RING(4);</div><div class='add'>+	OUT_RING(MI_STORE_DWORD_INDEX);</div><div class='add'>+	OUT_RING(I915_GEM_HWS_INDEX &lt;&lt; MI_STORE_DWORD_INDEX_SHIFT);</div><div class='add'>+	OUT_RING(seqno);</div><div class='add'>+</div><div class='add'>+	OUT_RING(MI_USER_INTERRUPT);</div><div class='add'>+	ADVANCE_LP_RING();</div><div class='add'>+</div><div class='add'>+	DRM_DEBUG("%d\n", seqno);</div><div class='add'>+</div><div class='add'>+	request-&gt;seqno = seqno;</div><div class='add'>+	request-&gt;emitted_jiffies = jiffies;</div><div class='add'>+	request-&gt;flush_domains = flush_domains;</div><div class='add'>+	was_empty = list_empty(&amp;dev_priv-&gt;mm.request_list);</div><div class='add'>+	list_add_tail(&amp;request-&gt;list, &amp;dev_priv-&gt;mm.request_list);</div><div class='add'>+</div><div class='add'>+	if (was_empty &amp;&amp; !dev_priv-&gt;mm.suspended)</div><div class='add'>+		schedule_delayed_work(&amp;dev_priv-&gt;mm.retire_work, HZ);</div><div class='add'>+	return seqno;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Command execution barrier</div><div class='add'>+ *</div><div class='add'>+ * Ensures that all commands in the ring are finished</div><div class='add'>+ * before signalling the CPU</div><div class='add'>+ */</div><div class='add'>+static uint32_t</div><div class='add'>+i915_retire_commands(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	drm_i915_private_t *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	uint32_t cmd = MI_FLUSH | MI_NO_WRITE_FLUSH;</div><div class='add'>+	uint32_t flush_domains = 0;</div><div class='add'>+	RING_LOCALS;</div><div class='add'>+</div><div class='add'>+	/* The sampler always gets flushed on i965 (sigh) */</div><div class='add'>+	if (IS_I965G(dev))</div><div class='add'>+		flush_domains |= I915_GEM_DOMAIN_SAMPLER;</div><div class='add'>+	BEGIN_LP_RING(2);</div><div class='add'>+	OUT_RING(cmd);</div><div class='add'>+	OUT_RING(0); /* noop */</div><div class='add'>+	ADVANCE_LP_RING();</div><div class='add'>+	return flush_domains;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Moves buffers associated only with the given active seqno from the active</div><div class='add'>+ * to inactive list, potentially freeing them.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+i915_gem_retire_request(struct drm_device *dev,</div><div class='add'>+			struct drm_i915_gem_request *request)</div><div class='add'>+{</div><div class='add'>+	drm_i915_private_t *dev_priv = dev-&gt;dev_private;</div><div class='add'>+</div><div class='add'>+	/* Move any buffers on the active list that are no longer referenced</div><div class='add'>+	 * by the ringbuffer to the flushing/inactive lists as appropriate.</div><div class='add'>+	 */</div><div class='add'>+	while (!list_empty(&amp;dev_priv-&gt;mm.active_list)) {</div><div class='add'>+		struct drm_gem_object *obj;</div><div class='add'>+		struct drm_i915_gem_object *obj_priv;</div><div class='add'>+</div><div class='add'>+		obj_priv = list_first_entry(&amp;dev_priv-&gt;mm.active_list,</div><div class='add'>+					    struct drm_i915_gem_object,</div><div class='add'>+					    list);</div><div class='add'>+		obj = obj_priv-&gt;obj;</div><div class='add'>+</div><div class='add'>+		/* If the seqno being retired doesn't match the oldest in the</div><div class='add'>+		 * list, then the oldest in the list must still be newer than</div><div class='add'>+		 * this seqno.</div><div class='add'>+		 */</div><div class='add'>+		if (obj_priv-&gt;last_rendering_seqno != request-&gt;seqno)</div><div class='add'>+			return;</div><div class='add'>+#if WATCH_LRU</div><div class='add'>+		DRM_INFO("%s: retire %d moves to inactive list %p\n",</div><div class='add'>+			 __func__, request-&gt;seqno, obj);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+		if (obj-&gt;write_domain != 0) {</div><div class='add'>+			list_move_tail(&amp;obj_priv-&gt;list,</div><div class='add'>+				       &amp;dev_priv-&gt;mm.flushing_list);</div><div class='add'>+		} else {</div><div class='add'>+			i915_gem_object_move_to_inactive(obj);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (request-&gt;flush_domains != 0) {</div><div class='add'>+		struct drm_i915_gem_object *obj_priv, *next;</div><div class='add'>+</div><div class='add'>+		/* Clear the write domain and activity from any buffers</div><div class='add'>+		 * that are just waiting for a flush matching the one retired.</div><div class='add'>+		 */</div><div class='add'>+		list_for_each_entry_safe(obj_priv, next,</div><div class='add'>+					 &amp;dev_priv-&gt;mm.flushing_list, list) {</div><div class='add'>+			struct drm_gem_object *obj = obj_priv-&gt;obj;</div><div class='add'>+</div><div class='add'>+			if (obj-&gt;write_domain &amp; request-&gt;flush_domains) {</div><div class='add'>+				obj-&gt;write_domain = 0;</div><div class='add'>+				i915_gem_object_move_to_inactive(obj);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Returns true if seq1 is later than seq2.</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+i915_seqno_passed(uint32_t seq1, uint32_t seq2)</div><div class='add'>+{</div><div class='add'>+	return (int32_t)(seq1 - seq2) &gt;= 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+uint32_t</div><div class='add'>+i915_get_gem_seqno(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	drm_i915_private_t *dev_priv = dev-&gt;dev_private;</div><div class='add'>+</div><div class='add'>+	return READ_HWSP(dev_priv, I915_GEM_HWS_INDEX);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * This function clears the request list as sequence numbers are passed.</div><div class='add'>+ */</div><div class='add'>+void</div><div class='add'>+i915_gem_retire_requests(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	drm_i915_private_t *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	uint32_t seqno;</div><div class='add'>+</div><div class='add'>+	seqno = i915_get_gem_seqno(dev);</div><div class='add'>+</div><div class='add'>+	while (!list_empty(&amp;dev_priv-&gt;mm.request_list)) {</div><div class='add'>+		struct drm_i915_gem_request *request;</div><div class='add'>+		uint32_t retiring_seqno;</div><div class='add'>+</div><div class='add'>+		request = list_first_entry(&amp;dev_priv-&gt;mm.request_list,</div><div class='add'>+					   struct drm_i915_gem_request,</div><div class='add'>+					   list);</div><div class='add'>+		retiring_seqno = request-&gt;seqno;</div><div class='add'>+</div><div class='add'>+		if (i915_seqno_passed(seqno, retiring_seqno) ||</div><div class='add'>+		    dev_priv-&gt;mm.wedged) {</div><div class='add'>+			i915_gem_retire_request(dev, request);</div><div class='add'>+</div><div class='add'>+			list_del(&amp;request-&gt;list);</div><div class='add'>+			drm_free(request, sizeof(*request), DRM_MEM_DRIVER);</div><div class='add'>+		} else</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+i915_gem_retire_work_handler(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	drm_i915_private_t *dev_priv;</div><div class='add'>+	struct drm_device *dev;</div><div class='add'>+</div><div class='add'>+	dev_priv = container_of(work, drm_i915_private_t,</div><div class='add'>+				mm.retire_work.work);</div><div class='add'>+	dev = dev_priv-&gt;dev;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+	i915_gem_retire_requests(dev);</div><div class='add'>+	if (!dev_priv-&gt;mm.suspended &amp;&amp;</div><div class='add'>+	    !list_empty(&amp;dev_priv-&gt;mm.request_list))</div><div class='add'>+		schedule_delayed_work(&amp;dev_priv-&gt;mm.retire_work, HZ);</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Waits for a sequence number to be signaled, and cleans up the</div><div class='add'>+ * request and object lists appropriately for that event.</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+i915_wait_request(struct drm_device *dev, uint32_t seqno)</div><div class='add'>+{</div><div class='add'>+	drm_i915_private_t *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	BUG_ON(seqno == 0);</div><div class='add'>+</div><div class='add'>+	if (!i915_seqno_passed(i915_get_gem_seqno(dev), seqno)) {</div><div class='add'>+		dev_priv-&gt;mm.waiting_gem_seqno = seqno;</div><div class='add'>+		i915_user_irq_get(dev);</div><div class='add'>+		ret = wait_event_interruptible(dev_priv-&gt;irq_queue,</div><div class='add'>+					       i915_seqno_passed(i915_get_gem_seqno(dev),</div><div class='add'>+								 seqno) ||</div><div class='add'>+					       dev_priv-&gt;mm.wedged);</div><div class='add'>+		i915_user_irq_put(dev);</div><div class='add'>+		dev_priv-&gt;mm.waiting_gem_seqno = 0;</div><div class='add'>+	}</div><div class='add'>+	if (dev_priv-&gt;mm.wedged)</div><div class='add'>+		ret = -EIO;</div><div class='add'>+</div><div class='add'>+	if (ret &amp;&amp; ret != -ERESTARTSYS)</div><div class='add'>+		DRM_ERROR("%s returns %d (awaiting %d at %d)\n",</div><div class='add'>+			  __func__, ret, seqno, i915_get_gem_seqno(dev));</div><div class='add'>+</div><div class='add'>+	/* Directly dispatch request retiring.  While we have the work queue</div><div class='add'>+	 * to handle this, the waiter on a request often wants an associated</div><div class='add'>+	 * buffer to have made it to the inactive list, and we would need</div><div class='add'>+	 * a separate wait queue to handle that.</div><div class='add'>+	 */</div><div class='add'>+	if (ret == 0)</div><div class='add'>+		i915_gem_retire_requests(dev);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+i915_gem_flush(struct drm_device *dev,</div><div class='add'>+	       uint32_t invalidate_domains,</div><div class='add'>+	       uint32_t flush_domains)</div><div class='add'>+{</div><div class='add'>+	drm_i915_private_t *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	uint32_t cmd;</div><div class='add'>+	RING_LOCALS;</div><div class='add'>+</div><div class='add'>+#if WATCH_EXEC</div><div class='add'>+	DRM_INFO("%s: invalidate %08x flush %08x\n", __func__,</div><div class='add'>+		  invalidate_domains, flush_domains);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	if (flush_domains &amp; I915_GEM_DOMAIN_CPU)</div><div class='add'>+		drm_agp_chipset_flush(dev);</div><div class='add'>+</div><div class='add'>+	if ((invalidate_domains | flush_domains) &amp; ~(I915_GEM_DOMAIN_CPU |</div><div class='add'>+						     I915_GEM_DOMAIN_GTT)) {</div><div class='add'>+		/*</div><div class='add'>+		 * read/write caches:</div><div class='add'>+		 *</div><div class='add'>+		 * I915_GEM_DOMAIN_RENDER is always invalidated, but is</div><div class='add'>+		 * only flushed if MI_NO_WRITE_FLUSH is unset.  On 965, it is</div><div class='add'>+		 * also flushed at 2d versus 3d pipeline switches.</div><div class='add'>+		 *</div><div class='add'>+		 * read-only caches:</div><div class='add'>+		 *</div><div class='add'>+		 * I915_GEM_DOMAIN_SAMPLER is flushed on pre-965 if</div><div class='add'>+		 * MI_READ_FLUSH is set, and is always flushed on 965.</div><div class='add'>+		 *</div><div class='add'>+		 * I915_GEM_DOMAIN_COMMAND may not exist?</div><div class='add'>+		 *</div><div class='add'>+		 * I915_GEM_DOMAIN_INSTRUCTION, which exists on 965, is</div><div class='add'>+		 * invalidated when MI_EXE_FLUSH is set.</div><div class='add'>+		 *</div><div class='add'>+		 * I915_GEM_DOMAIN_VERTEX, which exists on 965, is</div><div class='add'>+		 * invalidated with every MI_FLUSH.</div><div class='add'>+		 *</div><div class='add'>+		 * TLBs:</div><div class='add'>+		 *</div><div class='add'>+		 * On 965, TLBs associated with I915_GEM_DOMAIN_COMMAND</div><div class='add'>+		 * and I915_GEM_DOMAIN_CPU in are invalidated at PTE write and</div><div class='add'>+		 * I915_GEM_DOMAIN_RENDER and I915_GEM_DOMAIN_SAMPLER</div><div class='add'>+		 * are flushed at any MI_FLUSH.</div><div class='add'>+		 */</div><div class='add'>+</div><div class='add'>+		cmd = MI_FLUSH | MI_NO_WRITE_FLUSH;</div><div class='add'>+		if ((invalidate_domains|flush_domains) &amp;</div><div class='add'>+		    I915_GEM_DOMAIN_RENDER)</div><div class='add'>+			cmd &amp;= ~MI_NO_WRITE_FLUSH;</div><div class='add'>+		if (!IS_I965G(dev)) {</div><div class='add'>+			/*</div><div class='add'>+			 * On the 965, the sampler cache always gets flushed</div><div class='add'>+			 * and this bit is reserved.</div><div class='add'>+			 */</div><div class='add'>+			if (invalidate_domains &amp; I915_GEM_DOMAIN_SAMPLER)</div><div class='add'>+				cmd |= MI_READ_FLUSH;</div><div class='add'>+		}</div><div class='add'>+		if (invalidate_domains &amp; I915_GEM_DOMAIN_INSTRUCTION)</div><div class='add'>+			cmd |= MI_EXE_FLUSH;</div><div class='add'>+</div><div class='add'>+#if WATCH_EXEC</div><div class='add'>+		DRM_INFO("%s: queue flush %08x to ring\n", __func__, cmd);</div><div class='add'>+#endif</div><div class='add'>+		BEGIN_LP_RING(2);</div><div class='add'>+		OUT_RING(cmd);</div><div class='add'>+		OUT_RING(0); /* noop */</div><div class='add'>+		ADVANCE_LP_RING();</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Ensures that all rendering to the object has completed and the object is</div><div class='add'>+ * safe to unbind from the GTT or access from the CPU.</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+i915_gem_object_wait_rendering(struct drm_gem_object *obj)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = obj-&gt;dev;</div><div class='add'>+	struct drm_i915_gem_object *obj_priv = obj-&gt;driver_private;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* If there are writes queued to the buffer, flush and</div><div class='add'>+	 * create a new seqno to wait for.</div><div class='add'>+	 */</div><div class='add'>+	if (obj-&gt;write_domain &amp; ~(I915_GEM_DOMAIN_CPU|I915_GEM_DOMAIN_GTT)) {</div><div class='add'>+		uint32_t write_domain = obj-&gt;write_domain;</div><div class='add'>+#if WATCH_BUF</div><div class='add'>+		DRM_INFO("%s: flushing object %p from write domain %08x\n",</div><div class='add'>+			  __func__, obj, write_domain);</div><div class='add'>+#endif</div><div class='add'>+		i915_gem_flush(dev, 0, write_domain);</div><div class='add'>+</div><div class='add'>+		i915_gem_object_move_to_active(obj);</div><div class='add'>+		obj_priv-&gt;last_rendering_seqno = i915_add_request(dev,</div><div class='add'>+								  write_domain);</div><div class='add'>+		BUG_ON(obj_priv-&gt;last_rendering_seqno == 0);</div><div class='add'>+#if WATCH_LRU</div><div class='add'>+		DRM_INFO("%s: flush moves to exec list %p\n", __func__, obj);</div><div class='add'>+#endif</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If there is rendering queued on the buffer being evicted, wait for</div><div class='add'>+	 * it.</div><div class='add'>+	 */</div><div class='add'>+	if (obj_priv-&gt;active) {</div><div class='add'>+#if WATCH_BUF</div><div class='add'>+		DRM_INFO("%s: object %p wait for seqno %08x\n",</div><div class='add'>+			  __func__, obj, obj_priv-&gt;last_rendering_seqno);</div><div class='add'>+#endif</div><div class='add'>+		ret = i915_wait_request(dev, obj_priv-&gt;last_rendering_seqno);</div><div class='add'>+		if (ret != 0)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Unbinds an object from the GTT aperture.</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+i915_gem_object_unbind(struct drm_gem_object *obj)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = obj-&gt;dev;</div><div class='add'>+	struct drm_i915_gem_object *obj_priv = obj-&gt;driver_private;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+#if WATCH_BUF</div><div class='add'>+	DRM_INFO("%s:%d %p\n", __func__, __LINE__, obj);</div><div class='add'>+	DRM_INFO("gtt_space %p\n", obj_priv-&gt;gtt_space);</div><div class='add'>+#endif</div><div class='add'>+	if (obj_priv-&gt;gtt_space == NULL)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (obj_priv-&gt;pin_count != 0) {</div><div class='add'>+		DRM_ERROR("Attempting to unbind pinned buffer\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Wait for any rendering to complete</div><div class='add'>+	 */</div><div class='add'>+	ret = i915_gem_object_wait_rendering(obj);</div><div class='add'>+	if (ret) {</div><div class='add'>+		DRM_ERROR("wait_rendering failed: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Move the object to the CPU domain to ensure that</div><div class='add'>+	 * any possible CPU writes while it's not in the GTT</div><div class='add'>+	 * are flushed when we go to remap it. This will</div><div class='add'>+	 * also ensure that all pending GPU writes are finished</div><div class='add'>+	 * before we unbind.</div><div class='add'>+	 */</div><div class='add'>+	ret = i915_gem_object_set_domain(obj, I915_GEM_DOMAIN_CPU,</div><div class='add'>+					 I915_GEM_DOMAIN_CPU);</div><div class='add'>+	if (ret) {</div><div class='add'>+		DRM_ERROR("set_domain failed: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (obj_priv-&gt;agp_mem != NULL) {</div><div class='add'>+		drm_unbind_agp(obj_priv-&gt;agp_mem);</div><div class='add'>+		drm_free_agp(obj_priv-&gt;agp_mem, obj-&gt;size / PAGE_SIZE);</div><div class='add'>+		obj_priv-&gt;agp_mem = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	BUG_ON(obj_priv-&gt;active);</div><div class='add'>+</div><div class='add'>+	i915_gem_object_free_page_list(obj);</div><div class='add'>+</div><div class='add'>+	if (obj_priv-&gt;gtt_space) {</div><div class='add'>+		atomic_dec(&amp;dev-&gt;gtt_count);</div><div class='add'>+		atomic_sub(obj-&gt;size, &amp;dev-&gt;gtt_memory);</div><div class='add'>+</div><div class='add'>+		drm_mm_put_block(obj_priv-&gt;gtt_space);</div><div class='add'>+		obj_priv-&gt;gtt_space = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Remove ourselves from the LRU list if present. */</div><div class='add'>+	if (!list_empty(&amp;obj_priv-&gt;list))</div><div class='add'>+		list_del_init(&amp;obj_priv-&gt;list);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+i915_gem_evict_something(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	drm_i915_private_t *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct drm_gem_object *obj;</div><div class='add'>+	struct drm_i915_gem_object *obj_priv;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	for (;;) {</div><div class='add'>+		/* If there's an inactive buffer available now, grab it</div><div class='add'>+		 * and be done.</div><div class='add'>+		 */</div><div class='add'>+		if (!list_empty(&amp;dev_priv-&gt;mm.inactive_list)) {</div><div class='add'>+			obj_priv = list_first_entry(&amp;dev_priv-&gt;mm.inactive_list,</div><div class='add'>+						    struct drm_i915_gem_object,</div><div class='add'>+						    list);</div><div class='add'>+			obj = obj_priv-&gt;obj;</div><div class='add'>+			BUG_ON(obj_priv-&gt;pin_count != 0);</div><div class='add'>+#if WATCH_LRU</div><div class='add'>+			DRM_INFO("%s: evicting %p\n", __func__, obj);</div><div class='add'>+#endif</div><div class='add'>+			BUG_ON(obj_priv-&gt;active);</div><div class='add'>+</div><div class='add'>+			/* Wait on the rendering and unbind the buffer. */</div><div class='add'>+			ret = i915_gem_object_unbind(obj);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* If we didn't get anything, but the ring is still processing</div><div class='add'>+		 * things, wait for one of those things to finish and hopefully</div><div class='add'>+		 * leave us a buffer to evict.</div><div class='add'>+		 */</div><div class='add'>+		if (!list_empty(&amp;dev_priv-&gt;mm.request_list)) {</div><div class='add'>+			struct drm_i915_gem_request *request;</div><div class='add'>+</div><div class='add'>+			request = list_first_entry(&amp;dev_priv-&gt;mm.request_list,</div><div class='add'>+						   struct drm_i915_gem_request,</div><div class='add'>+						   list);</div><div class='add'>+</div><div class='add'>+			ret = i915_wait_request(dev, request-&gt;seqno);</div><div class='add'>+			if (ret)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			/* if waiting caused an object to become inactive,</div><div class='add'>+			 * then loop around and wait for it. Otherwise, we</div><div class='add'>+			 * assume that waiting freed and unbound something,</div><div class='add'>+			 * so there should now be some space in the GTT</div><div class='add'>+			 */</div><div class='add'>+			if (!list_empty(&amp;dev_priv-&gt;mm.inactive_list))</div><div class='add'>+				continue;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* If we didn't have anything on the request list but there</div><div class='add'>+		 * are buffers awaiting a flush, emit one and try again.</div><div class='add'>+		 * When we wait on it, those buffers waiting for that flush</div><div class='add'>+		 * will get moved to inactive.</div><div class='add'>+		 */</div><div class='add'>+		if (!list_empty(&amp;dev_priv-&gt;mm.flushing_list)) {</div><div class='add'>+			obj_priv = list_first_entry(&amp;dev_priv-&gt;mm.flushing_list,</div><div class='add'>+						    struct drm_i915_gem_object,</div><div class='add'>+						    list);</div><div class='add'>+			obj = obj_priv-&gt;obj;</div><div class='add'>+</div><div class='add'>+			i915_gem_flush(dev,</div><div class='add'>+				       obj-&gt;write_domain,</div><div class='add'>+				       obj-&gt;write_domain);</div><div class='add'>+			i915_add_request(dev, obj-&gt;write_domain);</div><div class='add'>+</div><div class='add'>+			obj = NULL;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		DRM_ERROR("inactive empty %d request empty %d "</div><div class='add'>+			  "flushing empty %d\n",</div><div class='add'>+			  list_empty(&amp;dev_priv-&gt;mm.inactive_list),</div><div class='add'>+			  list_empty(&amp;dev_priv-&gt;mm.request_list),</div><div class='add'>+			  list_empty(&amp;dev_priv-&gt;mm.flushing_list));</div><div class='add'>+		/* If we didn't do any of the above, there's nothing to be done</div><div class='add'>+		 * and we just can't fit it in.</div><div class='add'>+		 */</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+i915_gem_object_get_page_list(struct drm_gem_object *obj)</div><div class='add'>+{</div><div class='add'>+	struct drm_i915_gem_object *obj_priv = obj-&gt;driver_private;</div><div class='add'>+	int page_count, i;</div><div class='add'>+	struct address_space *mapping;</div><div class='add'>+	struct inode *inode;</div><div class='add'>+	struct page *page;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (obj_priv-&gt;page_list)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Get the list of pages out of our struct file.  They'll be pinned</div><div class='add'>+	 * at this point until we release them.</div><div class='add'>+	 */</div><div class='add'>+	page_count = obj-&gt;size / PAGE_SIZE;</div><div class='add'>+	BUG_ON(obj_priv-&gt;page_list != NULL);</div><div class='add'>+	obj_priv-&gt;page_list = drm_calloc(page_count, sizeof(struct page *),</div><div class='add'>+					 DRM_MEM_DRIVER);</div><div class='add'>+	if (obj_priv-&gt;page_list == NULL) {</div><div class='add'>+		DRM_ERROR("Faled to allocate page list\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	inode = obj-&gt;filp-&gt;f_path.dentry-&gt;d_inode;</div><div class='add'>+	mapping = inode-&gt;i_mapping;</div><div class='add'>+	for (i = 0; i &lt; page_count; i++) {</div><div class='add'>+		page = read_mapping_page(mapping, i, NULL);</div><div class='add'>+		if (IS_ERR(page)) {</div><div class='add'>+			ret = PTR_ERR(page);</div><div class='add'>+			DRM_ERROR("read_mapping_page failed: %d\n", ret);</div><div class='add'>+			i915_gem_object_free_page_list(obj);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+		obj_priv-&gt;page_list[i] = page;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Finds free space in the GTT aperture and binds the object there.</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+i915_gem_object_bind_to_gtt(struct drm_gem_object *obj, unsigned alignment)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = obj-&gt;dev;</div><div class='add'>+	drm_i915_private_t *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct drm_i915_gem_object *obj_priv = obj-&gt;driver_private;</div><div class='add'>+	struct drm_mm_node *free_space;</div><div class='add'>+	int page_count, ret;</div><div class='add'>+</div><div class='add'>+	if (alignment == 0)</div><div class='add'>+		alignment = PAGE_SIZE;</div><div class='add'>+	if (alignment &amp; (PAGE_SIZE - 1)) {</div><div class='add'>+		DRM_ERROR("Invalid object alignment requested %u\n", alignment);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+ search_free:</div><div class='add'>+	free_space = drm_mm_search_free(&amp;dev_priv-&gt;mm.gtt_space,</div><div class='add'>+					obj-&gt;size, alignment, 0);</div><div class='add'>+	if (free_space != NULL) {</div><div class='add'>+		obj_priv-&gt;gtt_space = drm_mm_get_block(free_space, obj-&gt;size,</div><div class='add'>+						       alignment);</div><div class='add'>+		if (obj_priv-&gt;gtt_space != NULL) {</div><div class='add'>+			obj_priv-&gt;gtt_space-&gt;private = obj;</div><div class='add'>+			obj_priv-&gt;gtt_offset = obj_priv-&gt;gtt_space-&gt;start;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (obj_priv-&gt;gtt_space == NULL) {</div><div class='add'>+		/* If the gtt is empty and we're still having trouble</div><div class='add'>+		 * fitting our object in, we're out of memory.</div><div class='add'>+		 */</div><div class='add'>+#if WATCH_LRU</div><div class='add'>+		DRM_INFO("%s: GTT full, evicting something\n", __func__);</div><div class='add'>+#endif</div><div class='add'>+		if (list_empty(&amp;dev_priv-&gt;mm.inactive_list) &amp;&amp;</div><div class='add'>+		    list_empty(&amp;dev_priv-&gt;mm.flushing_list) &amp;&amp;</div><div class='add'>+		    list_empty(&amp;dev_priv-&gt;mm.active_list)) {</div><div class='add'>+			DRM_ERROR("GTT full, but LRU list empty\n");</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = i915_gem_evict_something(dev);</div><div class='add'>+		if (ret != 0) {</div><div class='add'>+			DRM_ERROR("Failed to evict a buffer %d\n", ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+		goto search_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#if WATCH_BUF</div><div class='add'>+	DRM_INFO("Binding object of size %d at 0x%08x\n",</div><div class='add'>+		 obj-&gt;size, obj_priv-&gt;gtt_offset);</div><div class='add'>+#endif</div><div class='add'>+	ret = i915_gem_object_get_page_list(obj);</div><div class='add'>+	if (ret) {</div><div class='add'>+		drm_mm_put_block(obj_priv-&gt;gtt_space);</div><div class='add'>+		obj_priv-&gt;gtt_space = NULL;</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	page_count = obj-&gt;size / PAGE_SIZE;</div><div class='add'>+	/* Create an AGP memory structure pointing at our pages, and bind it</div><div class='add'>+	 * into the GTT.</div><div class='add'>+	 */</div><div class='add'>+	obj_priv-&gt;agp_mem = drm_agp_bind_pages(dev,</div><div class='add'>+					       obj_priv-&gt;page_list,</div><div class='add'>+					       page_count,</div><div class='add'>+					       obj_priv-&gt;gtt_offset,</div><div class='add'>+					       obj_priv-&gt;agp_type);</div><div class='add'>+	if (obj_priv-&gt;agp_mem == NULL) {</div><div class='add'>+		i915_gem_object_free_page_list(obj);</div><div class='add'>+		drm_mm_put_block(obj_priv-&gt;gtt_space);</div><div class='add'>+		obj_priv-&gt;gtt_space = NULL;</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	atomic_inc(&amp;dev-&gt;gtt_count);</div><div class='add'>+	atomic_add(obj-&gt;size, &amp;dev-&gt;gtt_memory);</div><div class='add'>+</div><div class='add'>+	/* Assert that the object is not currently in any GPU domain. As it</div><div class='add'>+	 * wasn't in the GTT, there shouldn't be any way it could have been in</div><div class='add'>+	 * a GPU cache</div><div class='add'>+	 */</div><div class='add'>+	BUG_ON(obj-&gt;read_domains &amp; ~(I915_GEM_DOMAIN_CPU|I915_GEM_DOMAIN_GTT));</div><div class='add'>+	BUG_ON(obj-&gt;write_domain &amp; ~(I915_GEM_DOMAIN_CPU|I915_GEM_DOMAIN_GTT));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+i915_gem_clflush_object(struct drm_gem_object *obj)</div><div class='add'>+{</div><div class='add'>+	struct drm_i915_gem_object	*obj_priv = obj-&gt;driver_private;</div><div class='add'>+</div><div class='add'>+	/* If we don't have a page list set up, then we're not pinned</div><div class='add'>+	 * to GPU, and we can ignore the cache flush because it'll happen</div><div class='add'>+	 * again at bind time.</div><div class='add'>+	 */</div><div class='add'>+	if (obj_priv-&gt;page_list == NULL)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	drm_clflush_pages(obj_priv-&gt;page_list, obj-&gt;size / PAGE_SIZE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Set the next domain for the specified object. This</div><div class='add'>+ * may not actually perform the necessary flushing/invaliding though,</div><div class='add'>+ * as that may want to be batched with other set_domain operations</div><div class='add'>+ *</div><div class='add'>+ * This is (we hope) the only really tricky part of gem. The goal</div><div class='add'>+ * is fairly simple -- track which caches hold bits of the object</div><div class='add'>+ * and make sure they remain coherent. A few concrete examples may</div><div class='add'>+ * help to explain how it works. For shorthand, we use the notation</div><div class='add'>+ * (read_domains, write_domain), e.g. (CPU, CPU) to indicate the</div><div class='add'>+ * a pair of read and write domain masks.</div><div class='add'>+ *</div><div class='add'>+ * Case 1: the batch buffer</div><div class='add'>+ *</div><div class='add'>+ *	1. Allocated</div><div class='add'>+ *	2. Written by CPU</div><div class='add'>+ *	3. Mapped to GTT</div><div class='add'>+ *	4. Read by GPU</div><div class='add'>+ *	5. Unmapped from GTT</div><div class='add'>+ *	6. Freed</div><div class='add'>+ *</div><div class='add'>+ *	Let's take these a step at a time</div><div class='add'>+ *</div><div class='add'>+ *	1. Allocated</div><div class='add'>+ *		Pages allocated from the kernel may still have</div><div class='add'>+ *		cache contents, so we set them to (CPU, CPU) always.</div><div class='add'>+ *	2. Written by CPU (using pwrite)</div><div class='add'>+ *		The pwrite function calls set_domain (CPU, CPU) and</div><div class='add'>+ *		this function does nothing (as nothing changes)</div><div class='add'>+ *	3. Mapped by GTT</div><div class='add'>+ *		This function asserts that the object is not</div><div class='add'>+ *		currently in any GPU-based read or write domains</div><div class='add'>+ *	4. Read by GPU</div><div class='add'>+ *		i915_gem_execbuffer calls set_domain (COMMAND, 0).</div><div class='add'>+ *		As write_domain is zero, this function adds in the</div><div class='add'>+ *		current read domains (CPU+COMMAND, 0).</div><div class='add'>+ *		flush_domains is set to CPU.</div><div class='add'>+ *		invalidate_domains is set to COMMAND</div><div class='add'>+ *		clflush is run to get data out of the CPU caches</div><div class='add'>+ *		then i915_dev_set_domain calls i915_gem_flush to</div><div class='add'>+ *		emit an MI_FLUSH and drm_agp_chipset_flush</div><div class='add'>+ *	5. Unmapped from GTT</div><div class='add'>+ *		i915_gem_object_unbind calls set_domain (CPU, CPU)</div><div class='add'>+ *		flush_domains and invalidate_domains end up both zero</div><div class='add'>+ *		so no flushing/invalidating happens</div><div class='add'>+ *	6. Freed</div><div class='add'>+ *		yay, done</div><div class='add'>+ *</div><div class='add'>+ * Case 2: The shared render buffer</div><div class='add'>+ *</div><div class='add'>+ *	1. Allocated</div><div class='add'>+ *	2. Mapped to GTT</div><div class='add'>+ *	3. Read/written by GPU</div><div class='add'>+ *	4. set_domain to (CPU,CPU)</div><div class='add'>+ *	5. Read/written by CPU</div><div class='add'>+ *	6. Read/written by GPU</div><div class='add'>+ *</div><div class='add'>+ *	1. Allocated</div><div class='add'>+ *		Same as last example, (CPU, CPU)</div><div class='add'>+ *	2. Mapped to GTT</div><div class='add'>+ *		Nothing changes (assertions find that it is not in the GPU)</div><div class='add'>+ *	3. Read/written by GPU</div><div class='add'>+ *		execbuffer calls set_domain (RENDER, RENDER)</div><div class='add'>+ *		flush_domains gets CPU</div><div class='add'>+ *		invalidate_domains gets GPU</div><div class='add'>+ *		clflush (obj)</div><div class='add'>+ *		MI_FLUSH and drm_agp_chipset_flush</div><div class='add'>+ *	4. set_domain (CPU, CPU)</div><div class='add'>+ *		flush_domains gets GPU</div><div class='add'>+ *		invalidate_domains gets CPU</div><div class='add'>+ *		wait_rendering (obj) to make sure all drawing is complete.</div><div class='add'>+ *		This will include an MI_FLUSH to get the data from GPU</div><div class='add'>+ *		to memory</div><div class='add'>+ *		clflush (obj) to invalidate the CPU cache</div><div class='add'>+ *		Another MI_FLUSH in i915_gem_flush (eliminate this somehow?)</div><div class='add'>+ *	5. Read/written by CPU</div><div class='add'>+ *		cache lines are loaded and dirtied</div><div class='add'>+ *	6. Read written by GPU</div><div class='add'>+ *		Same as last GPU access</div><div class='add'>+ *</div><div class='add'>+ * Case 3: The constant buffer</div><div class='add'>+ *</div><div class='add'>+ *	1. Allocated</div><div class='add'>+ *	2. Written by CPU</div><div class='add'>+ *	3. Read by GPU</div><div class='add'>+ *	4. Updated (written) by CPU again</div><div class='add'>+ *	5. Read by GPU</div><div class='add'>+ *</div><div class='add'>+ *	1. Allocated</div><div class='add'>+ *		(CPU, CPU)</div><div class='add'>+ *	2. Written by CPU</div><div class='add'>+ *		(CPU, CPU)</div><div class='add'>+ *	3. Read by GPU</div><div class='add'>+ *		(CPU+RENDER, 0)</div><div class='add'>+ *		flush_domains = CPU</div><div class='add'>+ *		invalidate_domains = RENDER</div><div class='add'>+ *		clflush (obj)</div><div class='add'>+ *		MI_FLUSH</div><div class='add'>+ *		drm_agp_chipset_flush</div><div class='add'>+ *	4. Updated (written) by CPU again</div><div class='add'>+ *		(CPU, CPU)</div><div class='add'>+ *		flush_domains = 0 (no previous write domain)</div><div class='add'>+ *		invalidate_domains = 0 (no new read domains)</div><div class='add'>+ *	5. Read by GPU</div><div class='add'>+ *		(CPU+RENDER, 0)</div><div class='add'>+ *		flush_domains = CPU</div><div class='add'>+ *		invalidate_domains = RENDER</div><div class='add'>+ *		clflush (obj)</div><div class='add'>+ *		MI_FLUSH</div><div class='add'>+ *		drm_agp_chipset_flush</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+i915_gem_object_set_domain(struct drm_gem_object *obj,</div><div class='add'>+			    uint32_t read_domains,</div><div class='add'>+			    uint32_t write_domain)</div><div class='add'>+{</div><div class='add'>+	struct drm_device		*dev = obj-&gt;dev;</div><div class='add'>+	struct drm_i915_gem_object	*obj_priv = obj-&gt;driver_private;</div><div class='add'>+	uint32_t			invalidate_domains = 0;</div><div class='add'>+	uint32_t			flush_domains = 0;</div><div class='add'>+	int				ret;</div><div class='add'>+</div><div class='add'>+#if WATCH_BUF</div><div class='add'>+	DRM_INFO("%s: object %p read %08x -&gt; %08x write %08x -&gt; %08x\n",</div><div class='add'>+		 __func__, obj,</div><div class='add'>+		 obj-&gt;read_domains, read_domains,</div><div class='add'>+		 obj-&gt;write_domain, write_domain);</div><div class='add'>+#endif</div><div class='add'>+	/*</div><div class='add'>+	 * If the object isn't moving to a new write domain,</div><div class='add'>+	 * let the object stay in multiple read domains</div><div class='add'>+	 */</div><div class='add'>+	if (write_domain == 0)</div><div class='add'>+		read_domains |= obj-&gt;read_domains;</div><div class='add'>+	else</div><div class='add'>+		obj_priv-&gt;dirty = 1;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Flush the current write domain if</div><div class='add'>+	 * the new read domains don't match. Invalidate</div><div class='add'>+	 * any read domains which differ from the old</div><div class='add'>+	 * write domain</div><div class='add'>+	 */</div><div class='add'>+	if (obj-&gt;write_domain &amp;&amp; obj-&gt;write_domain != read_domains) {</div><div class='add'>+		flush_domains |= obj-&gt;write_domain;</div><div class='add'>+		invalidate_domains |= read_domains &amp; ~obj-&gt;write_domain;</div><div class='add'>+	}</div><div class='add'>+	/*</div><div class='add'>+	 * Invalidate any read caches which may have</div><div class='add'>+	 * stale data. That is, any new read domains.</div><div class='add'>+	 */</div><div class='add'>+	invalidate_domains |= read_domains &amp; ~obj-&gt;read_domains;</div><div class='add'>+	if ((flush_domains | invalidate_domains) &amp; I915_GEM_DOMAIN_CPU) {</div><div class='add'>+#if WATCH_BUF</div><div class='add'>+		DRM_INFO("%s: CPU domain flush %08x invalidate %08x\n",</div><div class='add'>+			 __func__, flush_domains, invalidate_domains);</div><div class='add'>+#endif</div><div class='add'>+		/*</div><div class='add'>+		 * If we're invaliding the CPU cache and flushing a GPU cache,</div><div class='add'>+		 * then pause for rendering so that the GPU caches will be</div><div class='add'>+		 * flushed before the cpu cache is invalidated</div><div class='add'>+		 */</div><div class='add'>+		if ((invalidate_domains &amp; I915_GEM_DOMAIN_CPU) &amp;&amp;</div><div class='add'>+		    (flush_domains &amp; ~(I915_GEM_DOMAIN_CPU |</div><div class='add'>+				       I915_GEM_DOMAIN_GTT))) {</div><div class='add'>+			ret = i915_gem_object_wait_rendering(obj);</div><div class='add'>+			if (ret)</div><div class='add'>+				return ret;</div><div class='add'>+		}</div><div class='add'>+		i915_gem_clflush_object(obj);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((write_domain | flush_domains) != 0)</div><div class='add'>+		obj-&gt;write_domain = write_domain;</div><div class='add'>+</div><div class='add'>+	/* If we're invalidating the CPU domain, clear the per-page CPU</div><div class='add'>+	 * domain list as well.</div><div class='add'>+	 */</div><div class='add'>+	if (obj_priv-&gt;page_cpu_valid != NULL &amp;&amp;</div><div class='add'>+	    (write_domain != 0 ||</div><div class='add'>+	     read_domains &amp; I915_GEM_DOMAIN_CPU)) {</div><div class='add'>+		drm_free(obj_priv-&gt;page_cpu_valid, obj-&gt;size / PAGE_SIZE,</div><div class='add'>+			 DRM_MEM_DRIVER);</div><div class='add'>+		obj_priv-&gt;page_cpu_valid = NULL;</div><div class='add'>+	}</div><div class='add'>+	obj-&gt;read_domains = read_domains;</div><div class='add'>+</div><div class='add'>+	dev-&gt;invalidate_domains |= invalidate_domains;</div><div class='add'>+	dev-&gt;flush_domains |= flush_domains;</div><div class='add'>+#if WATCH_BUF</div><div class='add'>+	DRM_INFO("%s: read %08x write %08x invalidate %08x flush %08x\n",</div><div class='add'>+		 __func__,</div><div class='add'>+		 obj-&gt;read_domains, obj-&gt;write_domain,</div><div class='add'>+		 dev-&gt;invalidate_domains, dev-&gt;flush_domains);</div><div class='add'>+#endif</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Set the read/write domain on a range of the object.</div><div class='add'>+ *</div><div class='add'>+ * Currently only implemented for CPU reads, otherwise drops to normal</div><div class='add'>+ * i915_gem_object_set_domain().</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+i915_gem_object_set_domain_range(struct drm_gem_object *obj,</div><div class='add'>+				 uint64_t offset,</div><div class='add'>+				 uint64_t size,</div><div class='add'>+				 uint32_t read_domains,</div><div class='add'>+				 uint32_t write_domain)</div><div class='add'>+{</div><div class='add'>+	struct drm_i915_gem_object *obj_priv = obj-&gt;driver_private;</div><div class='add'>+	int ret, i;</div><div class='add'>+</div><div class='add'>+	if (obj-&gt;read_domains &amp; I915_GEM_DOMAIN_CPU)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (read_domains != I915_GEM_DOMAIN_CPU ||</div><div class='add'>+	    write_domain != 0)</div><div class='add'>+		return i915_gem_object_set_domain(obj,</div><div class='add'>+						  read_domains, write_domain);</div><div class='add'>+</div><div class='add'>+	/* Wait on any GPU rendering to the object to be flushed. */</div><div class='add'>+	if (obj-&gt;write_domain &amp; ~(I915_GEM_DOMAIN_CPU | I915_GEM_DOMAIN_GTT)) {</div><div class='add'>+		ret = i915_gem_object_wait_rendering(obj);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (obj_priv-&gt;page_cpu_valid == NULL) {</div><div class='add'>+		obj_priv-&gt;page_cpu_valid = drm_calloc(1, obj-&gt;size / PAGE_SIZE,</div><div class='add'>+						      DRM_MEM_DRIVER);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Flush the cache on any pages that are still invalid from the CPU's</div><div class='add'>+	 * perspective.</div><div class='add'>+	 */</div><div class='add'>+	for (i = offset / PAGE_SIZE; i &lt;= (offset + size - 1) / PAGE_SIZE; i++) {</div><div class='add'>+		if (obj_priv-&gt;page_cpu_valid[i])</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		drm_clflush_pages(obj_priv-&gt;page_list + i, 1);</div><div class='add'>+</div><div class='add'>+		obj_priv-&gt;page_cpu_valid[i] = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Once all of the objects have been set in the proper domain,</div><div class='add'>+ * perform the necessary flush and invalidate operations.</div><div class='add'>+ *</div><div class='add'>+ * Returns the write domains flushed, for use in flush tracking.</div><div class='add'>+ */</div><div class='add'>+static uint32_t</div><div class='add'>+i915_gem_dev_set_domain(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	uint32_t flush_domains = dev-&gt;flush_domains;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Now that all the buffers are synced to the proper domains,</div><div class='add'>+	 * flush and invalidate the collected domains</div><div class='add'>+	 */</div><div class='add'>+	if (dev-&gt;invalidate_domains | dev-&gt;flush_domains) {</div><div class='add'>+#if WATCH_EXEC</div><div class='add'>+		DRM_INFO("%s: invalidate_domains %08x flush_domains %08x\n",</div><div class='add'>+			  __func__,</div><div class='add'>+			 dev-&gt;invalidate_domains,</div><div class='add'>+			 dev-&gt;flush_domains);</div><div class='add'>+#endif</div><div class='add'>+		i915_gem_flush(dev,</div><div class='add'>+			       dev-&gt;invalidate_domains,</div><div class='add'>+			       dev-&gt;flush_domains);</div><div class='add'>+		dev-&gt;invalidate_domains = 0;</div><div class='add'>+		dev-&gt;flush_domains = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return flush_domains;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Pin an object to the GTT and evaluate the relocations landing in it.</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+i915_gem_object_pin_and_relocate(struct drm_gem_object *obj,</div><div class='add'>+				 struct drm_file *file_priv,</div><div class='add'>+				 struct drm_i915_gem_exec_object *entry)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = obj-&gt;dev;</div><div class='add'>+	struct drm_i915_gem_relocation_entry reloc;</div><div class='add'>+	struct drm_i915_gem_relocation_entry __user *relocs;</div><div class='add'>+	struct drm_i915_gem_object *obj_priv = obj-&gt;driver_private;</div><div class='add'>+	int i, ret;</div><div class='add'>+	uint32_t last_reloc_offset = -1;</div><div class='add'>+	void __iomem *reloc_page = NULL;</div><div class='add'>+</div><div class='add'>+	/* Choose the GTT offset for our buffer and put it there. */</div><div class='add'>+	ret = i915_gem_object_pin(obj, (uint32_t) entry-&gt;alignment);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	entry-&gt;offset = obj_priv-&gt;gtt_offset;</div><div class='add'>+</div><div class='add'>+	relocs = (struct drm_i915_gem_relocation_entry __user *)</div><div class='add'>+		 (uintptr_t) entry-&gt;relocs_ptr;</div><div class='add'>+	/* Apply the relocations, using the GTT aperture to avoid cache</div><div class='add'>+	 * flushing requirements.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; entry-&gt;relocation_count; i++) {</div><div class='add'>+		struct drm_gem_object *target_obj;</div><div class='add'>+		struct drm_i915_gem_object *target_obj_priv;</div><div class='add'>+		uint32_t reloc_val, reloc_offset;</div><div class='add'>+		uint32_t __iomem *reloc_entry;</div><div class='add'>+</div><div class='add'>+		ret = copy_from_user(&amp;reloc, relocs + i, sizeof(reloc));</div><div class='add'>+		if (ret != 0) {</div><div class='add'>+			i915_gem_object_unpin(obj);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		target_obj = drm_gem_object_lookup(obj-&gt;dev, file_priv,</div><div class='add'>+						   reloc.target_handle);</div><div class='add'>+		if (target_obj == NULL) {</div><div class='add'>+			i915_gem_object_unpin(obj);</div><div class='add'>+			return -EBADF;</div><div class='add'>+		}</div><div class='add'>+		target_obj_priv = target_obj-&gt;driver_private;</div><div class='add'>+</div><div class='add'>+		/* The target buffer should have appeared before us in the</div><div class='add'>+		 * exec_object list, so it should have a GTT space bound by now.</div><div class='add'>+		 */</div><div class='add'>+		if (target_obj_priv-&gt;gtt_space == NULL) {</div><div class='add'>+			DRM_ERROR("No GTT space found for object %d\n",</div><div class='add'>+				  reloc.target_handle);</div><div class='add'>+			drm_gem_object_unreference(target_obj);</div><div class='add'>+			i915_gem_object_unpin(obj);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (reloc.offset &gt; obj-&gt;size - 4) {</div><div class='add'>+			DRM_ERROR("Relocation beyond object bounds: "</div><div class='add'>+				  "obj %p target %d offset %d size %d.\n",</div><div class='add'>+				  obj, reloc.target_handle,</div><div class='add'>+				  (int) reloc.offset, (int) obj-&gt;size);</div><div class='add'>+			drm_gem_object_unreference(target_obj);</div><div class='add'>+			i915_gem_object_unpin(obj);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		if (reloc.offset &amp; 3) {</div><div class='add'>+			DRM_ERROR("Relocation not 4-byte aligned: "</div><div class='add'>+				  "obj %p target %d offset %d.\n",</div><div class='add'>+				  obj, reloc.target_handle,</div><div class='add'>+				  (int) reloc.offset);</div><div class='add'>+			drm_gem_object_unreference(target_obj);</div><div class='add'>+			i915_gem_object_unpin(obj);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (reloc.write_domain &amp;&amp; target_obj-&gt;pending_write_domain &amp;&amp;</div><div class='add'>+		    reloc.write_domain != target_obj-&gt;pending_write_domain) {</div><div class='add'>+			DRM_ERROR("Write domain conflict: "</div><div class='add'>+				  "obj %p target %d offset %d "</div><div class='add'>+				  "new %08x old %08x\n",</div><div class='add'>+				  obj, reloc.target_handle,</div><div class='add'>+				  (int) reloc.offset,</div><div class='add'>+				  reloc.write_domain,</div><div class='add'>+				  target_obj-&gt;pending_write_domain);</div><div class='add'>+			drm_gem_object_unreference(target_obj);</div><div class='add'>+			i915_gem_object_unpin(obj);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+#if WATCH_RELOC</div><div class='add'>+		DRM_INFO("%s: obj %p offset %08x target %d "</div><div class='add'>+			 "read %08x write %08x gtt %08x "</div><div class='add'>+			 "presumed %08x delta %08x\n",</div><div class='add'>+			 __func__,</div><div class='add'>+			 obj,</div><div class='add'>+			 (int) reloc.offset,</div><div class='add'>+			 (int) reloc.target_handle,</div><div class='add'>+			 (int) reloc.read_domains,</div><div class='add'>+			 (int) reloc.write_domain,</div><div class='add'>+			 (int) target_obj_priv-&gt;gtt_offset,</div><div class='add'>+			 (int) reloc.presumed_offset,</div><div class='add'>+			 reloc.delta);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+		target_obj-&gt;pending_read_domains |= reloc.read_domains;</div><div class='add'>+		target_obj-&gt;pending_write_domain |= reloc.write_domain;</div><div class='add'>+</div><div class='add'>+		/* If the relocation already has the right value in it, no</div><div class='add'>+		 * more work needs to be done.</div><div class='add'>+		 */</div><div class='add'>+		if (target_obj_priv-&gt;gtt_offset == reloc.presumed_offset) {</div><div class='add'>+			drm_gem_object_unreference(target_obj);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Now that we're going to actually write some data in,</div><div class='add'>+		 * make sure that any rendering using this buffer's contents</div><div class='add'>+		 * is completed.</div><div class='add'>+		 */</div><div class='add'>+		i915_gem_object_wait_rendering(obj);</div><div class='add'>+</div><div class='add'>+		/* As we're writing through the gtt, flush</div><div class='add'>+		 * any CPU writes before we write the relocations</div><div class='add'>+		 */</div><div class='add'>+		if (obj-&gt;write_domain &amp; I915_GEM_DOMAIN_CPU) {</div><div class='add'>+			i915_gem_clflush_object(obj);</div><div class='add'>+			drm_agp_chipset_flush(dev);</div><div class='add'>+			obj-&gt;write_domain = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Map the page containing the relocation we're going to</div><div class='add'>+		 * perform.</div><div class='add'>+		 */</div><div class='add'>+		reloc_offset = obj_priv-&gt;gtt_offset + reloc.offset;</div><div class='add'>+		if (reloc_page == NULL ||</div><div class='add'>+		    (last_reloc_offset &amp; ~(PAGE_SIZE - 1)) !=</div><div class='add'>+		    (reloc_offset &amp; ~(PAGE_SIZE - 1))) {</div><div class='add'>+			if (reloc_page != NULL)</div><div class='add'>+				iounmap(reloc_page);</div><div class='add'>+</div><div class='add'>+			reloc_page = ioremap_wc(dev-&gt;agp-&gt;base +</div><div class='add'>+						(reloc_offset &amp;</div><div class='add'>+						 ~(PAGE_SIZE - 1)),</div><div class='add'>+						PAGE_SIZE);</div><div class='add'>+			last_reloc_offset = reloc_offset;</div><div class='add'>+			if (reloc_page == NULL) {</div><div class='add'>+				drm_gem_object_unreference(target_obj);</div><div class='add'>+				i915_gem_object_unpin(obj);</div><div class='add'>+				return -ENOMEM;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		reloc_entry = (uint32_t __iomem *)(reloc_page +</div><div class='add'>+					   (reloc_offset &amp; (PAGE_SIZE - 1)));</div><div class='add'>+		reloc_val = target_obj_priv-&gt;gtt_offset + reloc.delta;</div><div class='add'>+</div><div class='add'>+#if WATCH_BUF</div><div class='add'>+		DRM_INFO("Applied relocation: %p@0x%08x %08x -&gt; %08x\n",</div><div class='add'>+			  obj, (unsigned int) reloc.offset,</div><div class='add'>+			  readl(reloc_entry), reloc_val);</div><div class='add'>+#endif</div><div class='add'>+		writel(reloc_val, reloc_entry);</div><div class='add'>+</div><div class='add'>+		/* Write the updated presumed offset for this entry back out</div><div class='add'>+		 * to the user.</div><div class='add'>+		 */</div><div class='add'>+		reloc.presumed_offset = target_obj_priv-&gt;gtt_offset;</div><div class='add'>+		ret = copy_to_user(relocs + i, &amp;reloc, sizeof(reloc));</div><div class='add'>+		if (ret != 0) {</div><div class='add'>+			drm_gem_object_unreference(target_obj);</div><div class='add'>+			i915_gem_object_unpin(obj);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		drm_gem_object_unreference(target_obj);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (reloc_page != NULL)</div><div class='add'>+		iounmap(reloc_page);</div><div class='add'>+</div><div class='add'>+#if WATCH_BUF</div><div class='add'>+	if (0)</div><div class='add'>+		i915_gem_dump_object(obj, 128, __func__, ~0);</div><div class='add'>+#endif</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/** Dispatch a batchbuffer to the ring</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+i915_dispatch_gem_execbuffer(struct drm_device *dev,</div><div class='add'>+			      struct drm_i915_gem_execbuffer *exec,</div><div class='add'>+			      uint64_t exec_offset)</div><div class='add'>+{</div><div class='add'>+	drm_i915_private_t *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct drm_clip_rect __user *boxes = (struct drm_clip_rect __user *)</div><div class='add'>+					     (uintptr_t) exec-&gt;cliprects_ptr;</div><div class='add'>+	int nbox = exec-&gt;num_cliprects;</div><div class='add'>+	int i = 0, count;</div><div class='add'>+	uint32_t	exec_start, exec_len;</div><div class='add'>+	RING_LOCALS;</div><div class='add'>+</div><div class='add'>+	exec_start = (uint32_t) exec_offset + exec-&gt;batch_start_offset;</div><div class='add'>+	exec_len = (uint32_t) exec-&gt;batch_len;</div><div class='add'>+</div><div class='add'>+	if ((exec_start | exec_len) &amp; 0x7) {</div><div class='add'>+		DRM_ERROR("alignment\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!exec_start)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	count = nbox ? nbox : 1;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; count; i++) {</div><div class='add'>+		if (i &lt; nbox) {</div><div class='add'>+			int ret = i915_emit_box(dev, boxes, i,</div><div class='add'>+						exec-&gt;DR1, exec-&gt;DR4);</div><div class='add'>+			if (ret)</div><div class='add'>+				return ret;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (IS_I830(dev) || IS_845G(dev)) {</div><div class='add'>+			BEGIN_LP_RING(4);</div><div class='add'>+			OUT_RING(MI_BATCH_BUFFER);</div><div class='add'>+			OUT_RING(exec_start | MI_BATCH_NON_SECURE);</div><div class='add'>+			OUT_RING(exec_start + exec_len - 4);</div><div class='add'>+			OUT_RING(0);</div><div class='add'>+			ADVANCE_LP_RING();</div><div class='add'>+		} else {</div><div class='add'>+			BEGIN_LP_RING(2);</div><div class='add'>+			if (IS_I965G(dev)) {</div><div class='add'>+				OUT_RING(MI_BATCH_BUFFER_START |</div><div class='add'>+					 (2 &lt;&lt; 6) |</div><div class='add'>+					 MI_BATCH_NON_SECURE_I965);</div><div class='add'>+				OUT_RING(exec_start);</div><div class='add'>+			} else {</div><div class='add'>+				OUT_RING(MI_BATCH_BUFFER_START |</div><div class='add'>+					 (2 &lt;&lt; 6));</div><div class='add'>+				OUT_RING(exec_start | MI_BATCH_NON_SECURE);</div><div class='add'>+			}</div><div class='add'>+			ADVANCE_LP_RING();</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* XXX breadcrumb */</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Throttle our rendering by waiting until the ring has completed our requests</div><div class='add'>+ * emitted over 20 msec ago.</div><div class='add'>+ *</div><div class='add'>+ * This should get us reasonable parallelism between CPU and GPU but also</div><div class='add'>+ * relatively low latency when blocking on a particular request to finish.</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+i915_gem_ring_throttle(struct drm_device *dev, struct drm_file *file_priv)</div><div class='add'>+{</div><div class='add'>+	struct drm_i915_file_private *i915_file_priv = file_priv-&gt;driver_priv;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	uint32_t seqno;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+	seqno = i915_file_priv-&gt;mm.last_gem_throttle_seqno;</div><div class='add'>+	i915_file_priv-&gt;mm.last_gem_throttle_seqno =</div><div class='add'>+		i915_file_priv-&gt;mm.last_gem_seqno;</div><div class='add'>+	if (seqno)</div><div class='add'>+		ret = i915_wait_request(dev, seqno);</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+i915_gem_execbuffer(struct drm_device *dev, void *data,</div><div class='add'>+		    struct drm_file *file_priv)</div><div class='add'>+{</div><div class='add'>+	drm_i915_private_t *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct drm_i915_file_private *i915_file_priv = file_priv-&gt;driver_priv;</div><div class='add'>+	struct drm_i915_gem_execbuffer *args = data;</div><div class='add'>+	struct drm_i915_gem_exec_object *exec_list = NULL;</div><div class='add'>+	struct drm_gem_object **object_list = NULL;</div><div class='add'>+	struct drm_gem_object *batch_obj;</div><div class='add'>+	int ret, i, pinned = 0;</div><div class='add'>+	uint64_t exec_offset;</div><div class='add'>+	uint32_t seqno, flush_domains;</div><div class='add'>+</div><div class='add'>+#if WATCH_EXEC</div><div class='add'>+	DRM_INFO("buffers_ptr %d buffer_count %d len %08x\n",</div><div class='add'>+		  (int) args-&gt;buffers_ptr, args-&gt;buffer_count, args-&gt;batch_len);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	if (args-&gt;buffer_count &lt; 1) {</div><div class='add'>+		DRM_ERROR("execbuf with %d buffers\n", args-&gt;buffer_count);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	/* Copy in the exec list from userland */</div><div class='add'>+	exec_list = drm_calloc(sizeof(*exec_list), args-&gt;buffer_count,</div><div class='add'>+			       DRM_MEM_DRIVER);</div><div class='add'>+	object_list = drm_calloc(sizeof(*object_list), args-&gt;buffer_count,</div><div class='add'>+				 DRM_MEM_DRIVER);</div><div class='add'>+	if (exec_list == NULL || object_list == NULL) {</div><div class='add'>+		DRM_ERROR("Failed to allocate exec or object list "</div><div class='add'>+			  "for %d buffers\n",</div><div class='add'>+			  args-&gt;buffer_count);</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto pre_mutex_err;</div><div class='add'>+	}</div><div class='add'>+	ret = copy_from_user(exec_list,</div><div class='add'>+			     (struct drm_i915_relocation_entry __user *)</div><div class='add'>+			     (uintptr_t) args-&gt;buffers_ptr,</div><div class='add'>+			     sizeof(*exec_list) * args-&gt;buffer_count);</div><div class='add'>+	if (ret != 0) {</div><div class='add'>+		DRM_ERROR("copy %d exec entries failed %d\n",</div><div class='add'>+			  args-&gt;buffer_count, ret);</div><div class='add'>+		goto pre_mutex_err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+</div><div class='add'>+	i915_verify_inactive(dev, __FILE__, __LINE__);</div><div class='add'>+</div><div class='add'>+	if (dev_priv-&gt;mm.wedged) {</div><div class='add'>+		DRM_ERROR("Execbuf while wedged\n");</div><div class='add'>+		mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dev_priv-&gt;mm.suspended) {</div><div class='add'>+		DRM_ERROR("Execbuf while VT-switched.\n");</div><div class='add'>+		mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Zero the gloabl flush/invalidate flags. These</div><div class='add'>+	 * will be modified as each object is bound to the</div><div class='add'>+	 * gtt</div><div class='add'>+	 */</div><div class='add'>+	dev-&gt;invalidate_domains = 0;</div><div class='add'>+	dev-&gt;flush_domains = 0;</div><div class='add'>+</div><div class='add'>+	/* Look up object handles and perform the relocations */</div><div class='add'>+	for (i = 0; i &lt; args-&gt;buffer_count; i++) {</div><div class='add'>+		object_list[i] = drm_gem_object_lookup(dev, file_priv,</div><div class='add'>+						       exec_list[i].handle);</div><div class='add'>+		if (object_list[i] == NULL) {</div><div class='add'>+			DRM_ERROR("Invalid object handle %d at index %d\n",</div><div class='add'>+				   exec_list[i].handle, i);</div><div class='add'>+			ret = -EBADF;</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		object_list[i]-&gt;pending_read_domains = 0;</div><div class='add'>+		object_list[i]-&gt;pending_write_domain = 0;</div><div class='add'>+		ret = i915_gem_object_pin_and_relocate(object_list[i],</div><div class='add'>+						       file_priv,</div><div class='add'>+						       &amp;exec_list[i]);</div><div class='add'>+		if (ret) {</div><div class='add'>+			DRM_ERROR("object bind and relocate failed %d\n", ret);</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='add'>+		pinned = i + 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Set the pending read domains for the batch buffer to COMMAND */</div><div class='add'>+	batch_obj = object_list[args-&gt;buffer_count-1];</div><div class='add'>+	batch_obj-&gt;pending_read_domains = I915_GEM_DOMAIN_COMMAND;</div><div class='add'>+	batch_obj-&gt;pending_write_domain = 0;</div><div class='add'>+</div><div class='add'>+	i915_verify_inactive(dev, __FILE__, __LINE__);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; args-&gt;buffer_count; i++) {</div><div class='add'>+		struct drm_gem_object *obj = object_list[i];</div><div class='add'>+		struct drm_i915_gem_object *obj_priv = obj-&gt;driver_private;</div><div class='add'>+</div><div class='add'>+		if (obj_priv-&gt;gtt_space == NULL) {</div><div class='add'>+			/* We evicted the buffer in the process of validating</div><div class='add'>+			 * our set of buffers in.  We could try to recover by</div><div class='add'>+			 * kicking them everything out and trying again from</div><div class='add'>+			 * the start.</div><div class='add'>+			 */</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* make sure all previous memory operations have passed */</div><div class='add'>+		ret = i915_gem_object_set_domain(obj,</div><div class='add'>+						 obj-&gt;pending_read_domains,</div><div class='add'>+						 obj-&gt;pending_write_domain);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	i915_verify_inactive(dev, __FILE__, __LINE__);</div><div class='add'>+</div><div class='add'>+	/* Flush/invalidate caches and chipset buffer */</div><div class='add'>+	flush_domains = i915_gem_dev_set_domain(dev);</div><div class='add'>+</div><div class='add'>+	i915_verify_inactive(dev, __FILE__, __LINE__);</div><div class='add'>+</div><div class='add'>+#if WATCH_COHERENCY</div><div class='add'>+	for (i = 0; i &lt; args-&gt;buffer_count; i++) {</div><div class='add'>+		i915_gem_object_check_coherency(object_list[i],</div><div class='add'>+						exec_list[i].handle);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	exec_offset = exec_list[args-&gt;buffer_count - 1].offset;</div><div class='add'>+</div><div class='add'>+#if WATCH_EXEC</div><div class='add'>+	i915_gem_dump_object(object_list[args-&gt;buffer_count - 1],</div><div class='add'>+			      args-&gt;batch_len,</div><div class='add'>+			      __func__,</div><div class='add'>+			      ~0);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	(void)i915_add_request(dev, flush_domains);</div><div class='add'>+</div><div class='add'>+	/* Exec the batchbuffer */</div><div class='add'>+	ret = i915_dispatch_gem_execbuffer(dev, args, exec_offset);</div><div class='add'>+	if (ret) {</div><div class='add'>+		DRM_ERROR("dispatch failed %d\n", ret);</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Ensure that the commands in the batch buffer are</div><div class='add'>+	 * finished before the interrupt fires</div><div class='add'>+	 */</div><div class='add'>+	flush_domains = i915_retire_commands(dev);</div><div class='add'>+</div><div class='add'>+	i915_verify_inactive(dev, __FILE__, __LINE__);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Get a seqno representing the execution of the current buffer,</div><div class='add'>+	 * which we can wait on.  We would like to mitigate these interrupts,</div><div class='add'>+	 * likely by only creating seqnos occasionally (so that we have</div><div class='add'>+	 * *some* interrupts representing completion of buffers that we can</div><div class='add'>+	 * wait on when trying to clear up gtt space).</div><div class='add'>+	 */</div><div class='add'>+	seqno = i915_add_request(dev, flush_domains);</div><div class='add'>+	BUG_ON(seqno == 0);</div><div class='add'>+	i915_file_priv-&gt;mm.last_gem_seqno = seqno;</div><div class='add'>+	for (i = 0; i &lt; args-&gt;buffer_count; i++) {</div><div class='add'>+		struct drm_gem_object *obj = object_list[i];</div><div class='add'>+		struct drm_i915_gem_object *obj_priv = obj-&gt;driver_private;</div><div class='add'>+</div><div class='add'>+		i915_gem_object_move_to_active(obj);</div><div class='add'>+		obj_priv-&gt;last_rendering_seqno = seqno;</div><div class='add'>+#if WATCH_LRU</div><div class='add'>+		DRM_INFO("%s: move to exec list %p\n", __func__, obj);</div><div class='add'>+#endif</div><div class='add'>+	}</div><div class='add'>+#if WATCH_LRU</div><div class='add'>+	i915_dump_lru(dev, __func__);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	i915_verify_inactive(dev, __FILE__, __LINE__);</div><div class='add'>+</div><div class='add'>+	/* Copy the new buffer offsets back to the user's exec list. */</div><div class='add'>+	ret = copy_to_user((struct drm_i915_relocation_entry __user *)</div><div class='add'>+			   (uintptr_t) args-&gt;buffers_ptr,</div><div class='add'>+			   exec_list,</div><div class='add'>+			   sizeof(*exec_list) * args-&gt;buffer_count);</div><div class='add'>+	if (ret)</div><div class='add'>+		DRM_ERROR("failed to copy %d exec entries "</div><div class='add'>+			  "back to user (%d)\n",</div><div class='add'>+			   args-&gt;buffer_count, ret);</div><div class='add'>+err:</div><div class='add'>+	if (object_list != NULL) {</div><div class='add'>+		for (i = 0; i &lt; pinned; i++)</div><div class='add'>+			i915_gem_object_unpin(object_list[i]);</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; args-&gt;buffer_count; i++)</div><div class='add'>+			drm_gem_object_unreference(object_list[i]);</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+</div><div class='add'>+pre_mutex_err:</div><div class='add'>+	drm_free(object_list, sizeof(*object_list) * args-&gt;buffer_count,</div><div class='add'>+		 DRM_MEM_DRIVER);</div><div class='add'>+	drm_free(exec_list, sizeof(*exec_list) * args-&gt;buffer_count,</div><div class='add'>+		 DRM_MEM_DRIVER);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+i915_gem_object_pin(struct drm_gem_object *obj, uint32_t alignment)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = obj-&gt;dev;</div><div class='add'>+	struct drm_i915_gem_object *obj_priv = obj-&gt;driver_private;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	i915_verify_inactive(dev, __FILE__, __LINE__);</div><div class='add'>+	if (obj_priv-&gt;gtt_space == NULL) {</div><div class='add'>+		ret = i915_gem_object_bind_to_gtt(obj, alignment);</div><div class='add'>+		if (ret != 0) {</div><div class='add'>+			DRM_ERROR("Failure to bind: %d", ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	obj_priv-&gt;pin_count++;</div><div class='add'>+</div><div class='add'>+	/* If the object is not active and not pending a flush,</div><div class='add'>+	 * remove it from the inactive list</div><div class='add'>+	 */</div><div class='add'>+	if (obj_priv-&gt;pin_count == 1) {</div><div class='add'>+		atomic_inc(&amp;dev-&gt;pin_count);</div><div class='add'>+		atomic_add(obj-&gt;size, &amp;dev-&gt;pin_memory);</div><div class='add'>+		if (!obj_priv-&gt;active &amp;&amp;</div><div class='add'>+		    (obj-&gt;write_domain &amp; ~(I915_GEM_DOMAIN_CPU |</div><div class='add'>+					   I915_GEM_DOMAIN_GTT)) == 0 &amp;&amp;</div><div class='add'>+		    !list_empty(&amp;obj_priv-&gt;list))</div><div class='add'>+			list_del_init(&amp;obj_priv-&gt;list);</div><div class='add'>+	}</div><div class='add'>+	i915_verify_inactive(dev, __FILE__, __LINE__);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+i915_gem_object_unpin(struct drm_gem_object *obj)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = obj-&gt;dev;</div><div class='add'>+	drm_i915_private_t *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct drm_i915_gem_object *obj_priv = obj-&gt;driver_private;</div><div class='add'>+</div><div class='add'>+	i915_verify_inactive(dev, __FILE__, __LINE__);</div><div class='add'>+	obj_priv-&gt;pin_count--;</div><div class='add'>+	BUG_ON(obj_priv-&gt;pin_count &lt; 0);</div><div class='add'>+	BUG_ON(obj_priv-&gt;gtt_space == NULL);</div><div class='add'>+</div><div class='add'>+	/* If the object is no longer pinned, and is</div><div class='add'>+	 * neither active nor being flushed, then stick it on</div><div class='add'>+	 * the inactive list</div><div class='add'>+	 */</div><div class='add'>+	if (obj_priv-&gt;pin_count == 0) {</div><div class='add'>+		if (!obj_priv-&gt;active &amp;&amp;</div><div class='add'>+		    (obj-&gt;write_domain &amp; ~(I915_GEM_DOMAIN_CPU |</div><div class='add'>+					   I915_GEM_DOMAIN_GTT)) == 0)</div><div class='add'>+			list_move_tail(&amp;obj_priv-&gt;list,</div><div class='add'>+				       &amp;dev_priv-&gt;mm.inactive_list);</div><div class='add'>+		atomic_dec(&amp;dev-&gt;pin_count);</div><div class='add'>+		atomic_sub(obj-&gt;size, &amp;dev-&gt;pin_memory);</div><div class='add'>+	}</div><div class='add'>+	i915_verify_inactive(dev, __FILE__, __LINE__);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+i915_gem_pin_ioctl(struct drm_device *dev, void *data,</div><div class='add'>+		   struct drm_file *file_priv)</div><div class='add'>+{</div><div class='add'>+	struct drm_i915_gem_pin *args = data;</div><div class='add'>+	struct drm_gem_object *obj;</div><div class='add'>+	struct drm_i915_gem_object *obj_priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+</div><div class='add'>+	obj = drm_gem_object_lookup(dev, file_priv, args-&gt;handle);</div><div class='add'>+	if (obj == NULL) {</div><div class='add'>+		DRM_ERROR("Bad handle in i915_gem_pin_ioctl(): %d\n",</div><div class='add'>+			  args-&gt;handle);</div><div class='add'>+		mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+		return -EBADF;</div><div class='add'>+	}</div><div class='add'>+	obj_priv = obj-&gt;driver_private;</div><div class='add'>+</div><div class='add'>+	ret = i915_gem_object_pin(obj, args-&gt;alignment);</div><div class='add'>+	if (ret != 0) {</div><div class='add'>+		drm_gem_object_unreference(obj);</div><div class='add'>+		mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* XXX - flush the CPU caches for pinned objects</div><div class='add'>+	 * as the X server doesn't manage domains yet</div><div class='add'>+	 */</div><div class='add'>+	if (obj-&gt;write_domain &amp; I915_GEM_DOMAIN_CPU) {</div><div class='add'>+		i915_gem_clflush_object(obj);</div><div class='add'>+		drm_agp_chipset_flush(dev);</div><div class='add'>+		obj-&gt;write_domain = 0;</div><div class='add'>+	}</div><div class='add'>+	args-&gt;offset = obj_priv-&gt;gtt_offset;</div><div class='add'>+	drm_gem_object_unreference(obj);</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+i915_gem_unpin_ioctl(struct drm_device *dev, void *data,</div><div class='add'>+		     struct drm_file *file_priv)</div><div class='add'>+{</div><div class='add'>+	struct drm_i915_gem_pin *args = data;</div><div class='add'>+	struct drm_gem_object *obj;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+</div><div class='add'>+	obj = drm_gem_object_lookup(dev, file_priv, args-&gt;handle);</div><div class='add'>+	if (obj == NULL) {</div><div class='add'>+		DRM_ERROR("Bad handle in i915_gem_unpin_ioctl(): %d\n",</div><div class='add'>+			  args-&gt;handle);</div><div class='add'>+		mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+		return -EBADF;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	i915_gem_object_unpin(obj);</div><div class='add'>+</div><div class='add'>+	drm_gem_object_unreference(obj);</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+i915_gem_busy_ioctl(struct drm_device *dev, void *data,</div><div class='add'>+		    struct drm_file *file_priv)</div><div class='add'>+{</div><div class='add'>+	struct drm_i915_gem_busy *args = data;</div><div class='add'>+	struct drm_gem_object *obj;</div><div class='add'>+	struct drm_i915_gem_object *obj_priv;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+	obj = drm_gem_object_lookup(dev, file_priv, args-&gt;handle);</div><div class='add'>+	if (obj == NULL) {</div><div class='add'>+		DRM_ERROR("Bad handle in i915_gem_busy_ioctl(): %d\n",</div><div class='add'>+			  args-&gt;handle);</div><div class='add'>+		mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+		return -EBADF;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	obj_priv = obj-&gt;driver_private;</div><div class='add'>+	args-&gt;busy = obj_priv-&gt;active;</div><div class='add'>+</div><div class='add'>+	drm_gem_object_unreference(obj);</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+i915_gem_throttle_ioctl(struct drm_device *dev, void *data,</div><div class='add'>+			struct drm_file *file_priv)</div><div class='add'>+{</div><div class='add'>+    return i915_gem_ring_throttle(dev, file_priv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int i915_gem_init_object(struct drm_gem_object *obj)</div><div class='add'>+{</div><div class='add'>+	struct drm_i915_gem_object *obj_priv;</div><div class='add'>+</div><div class='add'>+	obj_priv = drm_calloc(1, sizeof(*obj_priv), DRM_MEM_DRIVER);</div><div class='add'>+	if (obj_priv == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We've just allocated pages from the kernel,</div><div class='add'>+	 * so they've just been written by the CPU with</div><div class='add'>+	 * zeros. They'll need to be clflushed before we</div><div class='add'>+	 * use them with the GPU.</div><div class='add'>+	 */</div><div class='add'>+	obj-&gt;write_domain = I915_GEM_DOMAIN_CPU;</div><div class='add'>+	obj-&gt;read_domains = I915_GEM_DOMAIN_CPU;</div><div class='add'>+</div><div class='add'>+	obj_priv-&gt;agp_type = AGP_USER_MEMORY;</div><div class='add'>+</div><div class='add'>+	obj-&gt;driver_private = obj_priv;</div><div class='add'>+	obj_priv-&gt;obj = obj;</div><div class='add'>+	INIT_LIST_HEAD(&amp;obj_priv-&gt;list);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void i915_gem_free_object(struct drm_gem_object *obj)</div><div class='add'>+{</div><div class='add'>+	struct drm_i915_gem_object *obj_priv = obj-&gt;driver_private;</div><div class='add'>+</div><div class='add'>+	while (obj_priv-&gt;pin_count &gt; 0)</div><div class='add'>+		i915_gem_object_unpin(obj);</div><div class='add'>+</div><div class='add'>+	i915_gem_object_unbind(obj);</div><div class='add'>+</div><div class='add'>+	drm_free(obj_priv-&gt;page_cpu_valid, 1, DRM_MEM_DRIVER);</div><div class='add'>+	drm_free(obj-&gt;driver_private, 1, DRM_MEM_DRIVER);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+i915_gem_set_domain(struct drm_gem_object *obj,</div><div class='add'>+		    struct drm_file *file_priv,</div><div class='add'>+		    uint32_t read_domains,</div><div class='add'>+		    uint32_t write_domain)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = obj-&gt;dev;</div><div class='add'>+	int ret;</div><div class='add'>+	uint32_t flush_domains;</div><div class='add'>+</div><div class='add'>+	BUG_ON(!mutex_is_locked(&amp;dev-&gt;struct_mutex));</div><div class='add'>+</div><div class='add'>+	ret = i915_gem_object_set_domain(obj, read_domains, write_domain);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	flush_domains = i915_gem_dev_set_domain(obj-&gt;dev);</div><div class='add'>+</div><div class='add'>+	if (flush_domains &amp; ~(I915_GEM_DOMAIN_CPU|I915_GEM_DOMAIN_GTT))</div><div class='add'>+		(void) i915_add_request(dev, flush_domains);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/** Unbinds all objects that are on the given buffer list. */</div><div class='add'>+static int</div><div class='add'>+i915_gem_evict_from_list(struct drm_device *dev, struct list_head *head)</div><div class='add'>+{</div><div class='add'>+	struct drm_gem_object *obj;</div><div class='add'>+	struct drm_i915_gem_object *obj_priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	while (!list_empty(head)) {</div><div class='add'>+		obj_priv = list_first_entry(head,</div><div class='add'>+					    struct drm_i915_gem_object,</div><div class='add'>+					    list);</div><div class='add'>+		obj = obj_priv-&gt;obj;</div><div class='add'>+</div><div class='add'>+		if (obj_priv-&gt;pin_count != 0) {</div><div class='add'>+			DRM_ERROR("Pinned object in unbind list\n");</div><div class='add'>+			mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = i915_gem_object_unbind(obj);</div><div class='add'>+		if (ret != 0) {</div><div class='add'>+			DRM_ERROR("Error unbinding object in LeaveVT: %d\n",</div><div class='add'>+				  ret);</div><div class='add'>+			mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+i915_gem_idle(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	drm_i915_private_t *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	uint32_t seqno, cur_seqno, last_seqno;</div><div class='add'>+	int stuck, ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+</div><div class='add'>+	if (dev_priv-&gt;mm.suspended || dev_priv-&gt;ring.ring_obj == NULL) {</div><div class='add'>+		mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Hack!  Don't let anybody do execbuf while we don't control the chip.</div><div class='add'>+	 * We need to replace this with a semaphore, or something.</div><div class='add'>+	 */</div><div class='add'>+	dev_priv-&gt;mm.suspended = 1;</div><div class='add'>+</div><div class='add'>+	/* Cancel the retire work handler, wait for it to finish if running</div><div class='add'>+	 */</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+	cancel_delayed_work_sync(&amp;dev_priv-&gt;mm.retire_work);</div><div class='add'>+	mutex_lock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+</div><div class='add'>+	i915_kernel_lost_context(dev);</div><div class='add'>+</div><div class='add'>+	/* Flush the GPU along with all non-CPU write domains</div><div class='add'>+	 */</div><div class='add'>+	i915_gem_flush(dev, ~(I915_GEM_DOMAIN_CPU|I915_GEM_DOMAIN_GTT),</div><div class='add'>+		       ~(I915_GEM_DOMAIN_CPU|I915_GEM_DOMAIN_GTT));</div><div class='add'>+	seqno = i915_add_request(dev, ~(I915_GEM_DOMAIN_CPU |</div><div class='add'>+					I915_GEM_DOMAIN_GTT));</div><div class='add'>+</div><div class='add'>+	if (seqno == 0) {</div><div class='add'>+		mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_priv-&gt;mm.waiting_gem_seqno = seqno;</div><div class='add'>+	last_seqno = 0;</div><div class='add'>+	stuck = 0;</div><div class='add'>+	for (;;) {</div><div class='add'>+		cur_seqno = i915_get_gem_seqno(dev);</div><div class='add'>+		if (i915_seqno_passed(cur_seqno, seqno))</div><div class='add'>+			break;</div><div class='add'>+		if (last_seqno == cur_seqno) {</div><div class='add'>+			if (stuck++ &gt; 100) {</div><div class='add'>+				DRM_ERROR("hardware wedged\n");</div><div class='add'>+				dev_priv-&gt;mm.wedged = 1;</div><div class='add'>+				DRM_WAKEUP(&amp;dev_priv-&gt;irq_queue);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		msleep(10);</div><div class='add'>+		last_seqno = cur_seqno;</div><div class='add'>+	}</div><div class='add'>+	dev_priv-&gt;mm.waiting_gem_seqno = 0;</div><div class='add'>+</div><div class='add'>+	i915_gem_retire_requests(dev);</div><div class='add'>+</div><div class='add'>+	/* Active and flushing should now be empty as we've</div><div class='add'>+	 * waited for a sequence higher than any pending execbuffer</div><div class='add'>+	 */</div><div class='add'>+	BUG_ON(!list_empty(&amp;dev_priv-&gt;mm.active_list));</div><div class='add'>+	BUG_ON(!list_empty(&amp;dev_priv-&gt;mm.flushing_list));</div><div class='add'>+</div><div class='add'>+	/* Request should now be empty as we've also waited</div><div class='add'>+	 * for the last request in the list</div><div class='add'>+	 */</div><div class='add'>+	BUG_ON(!list_empty(&amp;dev_priv-&gt;mm.request_list));</div><div class='add'>+</div><div class='add'>+	/* Move all buffers out of the GTT. */</div><div class='add'>+	ret = i915_gem_evict_from_list(dev, &amp;dev_priv-&gt;mm.inactive_list);</div><div class='add'>+	if (ret) {</div><div class='add'>+		mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	BUG_ON(!list_empty(&amp;dev_priv-&gt;mm.active_list));</div><div class='add'>+	BUG_ON(!list_empty(&amp;dev_priv-&gt;mm.flushing_list));</div><div class='add'>+	BUG_ON(!list_empty(&amp;dev_priv-&gt;mm.inactive_list));</div><div class='add'>+	BUG_ON(!list_empty(&amp;dev_priv-&gt;mm.request_list));</div><div class='add'>+</div><div class='add'>+	i915_gem_cleanup_ringbuffer(dev);</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+i915_gem_init_hws(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	drm_i915_private_t *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct drm_gem_object *obj;</div><div class='add'>+	struct drm_i915_gem_object *obj_priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* If we need a physical address for the status page, it's already</div><div class='add'>+	 * initialized at driver load time.</div><div class='add'>+	 */</div><div class='add'>+	if (!I915_NEED_GFX_HWS(dev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	obj = drm_gem_object_alloc(dev, 4096);</div><div class='add'>+	if (obj == NULL) {</div><div class='add'>+		DRM_ERROR("Failed to allocate status page\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	obj_priv = obj-&gt;driver_private;</div><div class='add'>+	obj_priv-&gt;agp_type = AGP_USER_CACHED_MEMORY;</div><div class='add'>+</div><div class='add'>+	ret = i915_gem_object_pin(obj, 4096);</div><div class='add'>+	if (ret != 0) {</div><div class='add'>+		drm_gem_object_unreference(obj);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_priv-&gt;status_gfx_addr = obj_priv-&gt;gtt_offset;</div><div class='add'>+</div><div class='add'>+	dev_priv-&gt;hw_status_page = kmap(obj_priv-&gt;page_list[0]);</div><div class='add'>+	if (dev_priv-&gt;hw_status_page == NULL) {</div><div class='add'>+		DRM_ERROR("Failed to map status page.\n");</div><div class='add'>+		memset(&amp;dev_priv-&gt;hws_map, 0, sizeof(dev_priv-&gt;hws_map));</div><div class='add'>+		drm_gem_object_unreference(obj);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	dev_priv-&gt;hws_obj = obj;</div><div class='add'>+	memset(dev_priv-&gt;hw_status_page, 0, PAGE_SIZE);</div><div class='add'>+	I915_WRITE(HWS_PGA, dev_priv-&gt;status_gfx_addr);</div><div class='add'>+	I915_READ(HWS_PGA); /* posting read */</div><div class='add'>+	DRM_DEBUG("hws offset: 0x%08x\n", dev_priv-&gt;status_gfx_addr);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+i915_gem_init_ringbuffer(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	drm_i915_private_t *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct drm_gem_object *obj;</div><div class='add'>+	struct drm_i915_gem_object *obj_priv;</div><div class='add'>+	int ret;</div><div class='add'>+	u32 head;</div><div class='add'>+</div><div class='add'>+	ret = i915_gem_init_hws(dev);</div><div class='add'>+	if (ret != 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	obj = drm_gem_object_alloc(dev, 128 * 1024);</div><div class='add'>+	if (obj == NULL) {</div><div class='add'>+		DRM_ERROR("Failed to allocate ringbuffer\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	obj_priv = obj-&gt;driver_private;</div><div class='add'>+</div><div class='add'>+	ret = i915_gem_object_pin(obj, 4096);</div><div class='add'>+	if (ret != 0) {</div><div class='add'>+		drm_gem_object_unreference(obj);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Set up the kernel mapping for the ring. */</div><div class='add'>+	dev_priv-&gt;ring.Size = obj-&gt;size;</div><div class='add'>+	dev_priv-&gt;ring.tail_mask = obj-&gt;size - 1;</div><div class='add'>+</div><div class='add'>+	dev_priv-&gt;ring.map.offset = dev-&gt;agp-&gt;base + obj_priv-&gt;gtt_offset;</div><div class='add'>+	dev_priv-&gt;ring.map.size = obj-&gt;size;</div><div class='add'>+	dev_priv-&gt;ring.map.type = 0;</div><div class='add'>+	dev_priv-&gt;ring.map.flags = 0;</div><div class='add'>+	dev_priv-&gt;ring.map.mtrr = 0;</div><div class='add'>+</div><div class='add'>+	drm_core_ioremap_wc(&amp;dev_priv-&gt;ring.map, dev);</div><div class='add'>+	if (dev_priv-&gt;ring.map.handle == NULL) {</div><div class='add'>+		DRM_ERROR("Failed to map ringbuffer.\n");</div><div class='add'>+		memset(&amp;dev_priv-&gt;ring, 0, sizeof(dev_priv-&gt;ring));</div><div class='add'>+		drm_gem_object_unreference(obj);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	dev_priv-&gt;ring.ring_obj = obj;</div><div class='add'>+	dev_priv-&gt;ring.virtual_start = dev_priv-&gt;ring.map.handle;</div><div class='add'>+</div><div class='add'>+	/* Stop the ring if it's running. */</div><div class='add'>+	I915_WRITE(PRB0_CTL, 0);</div><div class='add'>+	I915_WRITE(PRB0_TAIL, 0);</div><div class='add'>+	I915_WRITE(PRB0_HEAD, 0);</div><div class='add'>+</div><div class='add'>+	/* Initialize the ring. */</div><div class='add'>+	I915_WRITE(PRB0_START, obj_priv-&gt;gtt_offset);</div><div class='add'>+	head = I915_READ(PRB0_HEAD) &amp; HEAD_ADDR;</div><div class='add'>+</div><div class='add'>+	/* G45 ring initialization fails to reset head to zero */</div><div class='add'>+	if (head != 0) {</div><div class='add'>+		DRM_ERROR("Ring head not reset to zero "</div><div class='add'>+			  "ctl %08x head %08x tail %08x start %08x\n",</div><div class='add'>+			  I915_READ(PRB0_CTL),</div><div class='add'>+			  I915_READ(PRB0_HEAD),</div><div class='add'>+			  I915_READ(PRB0_TAIL),</div><div class='add'>+			  I915_READ(PRB0_START));</div><div class='add'>+		I915_WRITE(PRB0_HEAD, 0);</div><div class='add'>+</div><div class='add'>+		DRM_ERROR("Ring head forced to zero "</div><div class='add'>+			  "ctl %08x head %08x tail %08x start %08x\n",</div><div class='add'>+			  I915_READ(PRB0_CTL),</div><div class='add'>+			  I915_READ(PRB0_HEAD),</div><div class='add'>+			  I915_READ(PRB0_TAIL),</div><div class='add'>+			  I915_READ(PRB0_START));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	I915_WRITE(PRB0_CTL,</div><div class='add'>+		   ((obj-&gt;size - 4096) &amp; RING_NR_PAGES) |</div><div class='add'>+		   RING_NO_REPORT |</div><div class='add'>+		   RING_VALID);</div><div class='add'>+</div><div class='add'>+	head = I915_READ(PRB0_HEAD) &amp; HEAD_ADDR;</div><div class='add'>+</div><div class='add'>+	/* If the head is still not zero, the ring is dead */</div><div class='add'>+	if (head != 0) {</div><div class='add'>+		DRM_ERROR("Ring initialization failed "</div><div class='add'>+			  "ctl %08x head %08x tail %08x start %08x\n",</div><div class='add'>+			  I915_READ(PRB0_CTL),</div><div class='add'>+			  I915_READ(PRB0_HEAD),</div><div class='add'>+			  I915_READ(PRB0_TAIL),</div><div class='add'>+			  I915_READ(PRB0_START));</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Update our cache of the ring state */</div><div class='add'>+	i915_kernel_lost_context(dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+i915_gem_cleanup_ringbuffer(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	drm_i915_private_t *dev_priv = dev-&gt;dev_private;</div><div class='add'>+</div><div class='add'>+	if (dev_priv-&gt;ring.ring_obj == NULL)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	drm_core_ioremapfree(&amp;dev_priv-&gt;ring.map, dev);</div><div class='add'>+</div><div class='add'>+	i915_gem_object_unpin(dev_priv-&gt;ring.ring_obj);</div><div class='add'>+	drm_gem_object_unreference(dev_priv-&gt;ring.ring_obj);</div><div class='add'>+	dev_priv-&gt;ring.ring_obj = NULL;</div><div class='add'>+	memset(&amp;dev_priv-&gt;ring, 0, sizeof(dev_priv-&gt;ring));</div><div class='add'>+</div><div class='add'>+	if (dev_priv-&gt;hws_obj != NULL) {</div><div class='add'>+		struct drm_gem_object *obj = dev_priv-&gt;hws_obj;</div><div class='add'>+		struct drm_i915_gem_object *obj_priv = obj-&gt;driver_private;</div><div class='add'>+</div><div class='add'>+		kunmap(obj_priv-&gt;page_list[0]);</div><div class='add'>+		i915_gem_object_unpin(obj);</div><div class='add'>+		drm_gem_object_unreference(obj);</div><div class='add'>+		dev_priv-&gt;hws_obj = NULL;</div><div class='add'>+		memset(&amp;dev_priv-&gt;hws_map, 0, sizeof(dev_priv-&gt;hws_map));</div><div class='add'>+		dev_priv-&gt;hw_status_page = NULL;</div><div class='add'>+</div><div class='add'>+		/* Write high address into HWS_PGA when disabling. */</div><div class='add'>+		I915_WRITE(HWS_PGA, 0x1ffff000);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+i915_gem_entervt_ioctl(struct drm_device *dev, void *data,</div><div class='add'>+		       struct drm_file *file_priv)</div><div class='add'>+{</div><div class='add'>+	drm_i915_private_t *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (dev_priv-&gt;mm.wedged) {</div><div class='add'>+		DRM_ERROR("Reenabling wedged hardware, good luck\n");</div><div class='add'>+		dev_priv-&gt;mm.wedged = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = i915_gem_init_ringbuffer(dev);</div><div class='add'>+	if (ret != 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+	BUG_ON(!list_empty(&amp;dev_priv-&gt;mm.active_list));</div><div class='add'>+	BUG_ON(!list_empty(&amp;dev_priv-&gt;mm.flushing_list));</div><div class='add'>+	BUG_ON(!list_empty(&amp;dev_priv-&gt;mm.inactive_list));</div><div class='add'>+	BUG_ON(!list_empty(&amp;dev_priv-&gt;mm.request_list));</div><div class='add'>+	dev_priv-&gt;mm.suspended = 0;</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+</div><div class='add'>+	drm_irq_install(dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+i915_gem_leavevt_ioctl(struct drm_device *dev, void *data,</div><div class='add'>+		       struct drm_file *file_priv)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = i915_gem_idle(dev);</div><div class='add'>+	drm_irq_uninstall(dev);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+i915_gem_lastclose(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = i915_gem_idle(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		DRM_ERROR("failed to idle hardware: %d\n", ret);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+i915_gem_load(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	drm_i915_private_t *dev_priv = dev-&gt;dev_private;</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;dev_priv-&gt;mm.active_list);</div><div class='add'>+	INIT_LIST_HEAD(&amp;dev_priv-&gt;mm.flushing_list);</div><div class='add'>+	INIT_LIST_HEAD(&amp;dev_priv-&gt;mm.inactive_list);</div><div class='add'>+	INIT_LIST_HEAD(&amp;dev_priv-&gt;mm.request_list);</div><div class='add'>+	INIT_DELAYED_WORK(&amp;dev_priv-&gt;mm.retire_work,</div><div class='add'>+			  i915_gem_retire_work_handler);</div><div class='add'>+	INIT_WORK(&amp;dev_priv-&gt;mm.vblank_work,</div><div class='add'>+		  i915_gem_vblank_work_handler);</div><div class='add'>+	dev_priv-&gt;mm.next_gem_seqno = 1;</div><div class='add'>+</div><div class='add'>+	i915_gem_detect_bit_6_swizzle(dev);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/gpu/drm/i915/i915_gem_debug.c b/drivers/gpu/drm/i915/i915_gem_debug.c<br/>new file mode 100644<br/>index 000000000000..131c088f8c8a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpu/drm/i915/i915_gem_debug.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/i915/i915_gem_debug.c</a></div><div class='hunk'>@@ -0,0 +1,201 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright © 2008 Intel Corporation</div><div class='add'>+ *</div><div class='add'>+ * Permission is hereby granted, free of charge, to any person obtaining a</div><div class='add'>+ * copy of this software and associated documentation files (the "Software"),</div><div class='add'>+ * to deal in the Software without restriction, including without limitation</div><div class='add'>+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,</div><div class='add'>+ * and/or sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ * Software is furnished to do so, subject to the following conditions:</div><div class='add'>+ *</div><div class='add'>+ * The above copyright notice and this permission notice (including the next</div><div class='add'>+ * paragraph) shall be included in all copies or substantial portions of the</div><div class='add'>+ * Software.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR</div><div class='add'>+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL</div><div class='add'>+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER</div><div class='add'>+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS</div><div class='add'>+ * IN THE SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ * Authors:</div><div class='add'>+ *    Keith Packard &lt;keithp@keithp.com&gt;</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "drmP.h"</div><div class='add'>+#include "drm.h"</div><div class='add'>+#include "i915_drm.h"</div><div class='add'>+#include "i915_drv.h"</div><div class='add'>+</div><div class='add'>+#if WATCH_INACTIVE</div><div class='add'>+void</div><div class='add'>+i915_verify_inactive(struct drm_device *dev, char *file, int line)</div><div class='add'>+{</div><div class='add'>+	drm_i915_private_t *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct drm_gem_object *obj;</div><div class='add'>+	struct drm_i915_gem_object *obj_priv;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(obj_priv, &amp;dev_priv-&gt;mm.inactive_list, list) {</div><div class='add'>+		obj = obj_priv-&gt;obj;</div><div class='add'>+		if (obj_priv-&gt;pin_count || obj_priv-&gt;active ||</div><div class='add'>+		    (obj-&gt;write_domain &amp; ~(I915_GEM_DOMAIN_CPU |</div><div class='add'>+					   I915_GEM_DOMAIN_GTT)))</div><div class='add'>+			DRM_ERROR("inactive %p (p %d a %d w %x)  %s:%d\n",</div><div class='add'>+				  obj,</div><div class='add'>+				  obj_priv-&gt;pin_count, obj_priv-&gt;active,</div><div class='add'>+				  obj-&gt;write_domain, file, line);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+#endif /* WATCH_INACTIVE */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#if WATCH_BUF | WATCH_EXEC | WATCH_PWRITE</div><div class='add'>+static void</div><div class='add'>+i915_gem_dump_page(struct page *page, uint32_t start, uint32_t end,</div><div class='add'>+		   uint32_t bias, uint32_t mark)</div><div class='add'>+{</div><div class='add'>+	uint32_t *mem = kmap_atomic(page, KM_USER0);</div><div class='add'>+	int i;</div><div class='add'>+	for (i = start; i &lt; end; i += 4)</div><div class='add'>+		DRM_INFO("%08x: %08x%s\n",</div><div class='add'>+			  (int) (bias + i), mem[i / 4],</div><div class='add'>+			  (bias + i == mark) ? " ********" : "");</div><div class='add'>+	kunmap_atomic(mem, KM_USER0);</div><div class='add'>+	/* give syslog time to catch up */</div><div class='add'>+	msleep(1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+i915_gem_dump_object(struct drm_gem_object *obj, int len,</div><div class='add'>+		     const char *where, uint32_t mark)</div><div class='add'>+{</div><div class='add'>+	struct drm_i915_gem_object *obj_priv = obj-&gt;driver_private;</div><div class='add'>+	int page;</div><div class='add'>+</div><div class='add'>+	DRM_INFO("%s: object at offset %08x\n", where, obj_priv-&gt;gtt_offset);</div><div class='add'>+	for (page = 0; page &lt; (len + PAGE_SIZE-1) / PAGE_SIZE; page++) {</div><div class='add'>+		int page_len, chunk, chunk_len;</div><div class='add'>+</div><div class='add'>+		page_len = len - page * PAGE_SIZE;</div><div class='add'>+		if (page_len &gt; PAGE_SIZE)</div><div class='add'>+			page_len = PAGE_SIZE;</div><div class='add'>+</div><div class='add'>+		for (chunk = 0; chunk &lt; page_len; chunk += 128) {</div><div class='add'>+			chunk_len = page_len - chunk;</div><div class='add'>+			if (chunk_len &gt; 128)</div><div class='add'>+				chunk_len = 128;</div><div class='add'>+			i915_gem_dump_page(obj_priv-&gt;page_list[page],</div><div class='add'>+					   chunk, chunk + chunk_len,</div><div class='add'>+					   obj_priv-&gt;gtt_offset +</div><div class='add'>+					   page * PAGE_SIZE,</div><div class='add'>+					   mark);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if WATCH_LRU</div><div class='add'>+void</div><div class='add'>+i915_dump_lru(struct drm_device *dev, const char *where)</div><div class='add'>+{</div><div class='add'>+	drm_i915_private_t		*dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct drm_i915_gem_object	*obj_priv;</div><div class='add'>+</div><div class='add'>+	DRM_INFO("active list %s {\n", where);</div><div class='add'>+	list_for_each_entry(obj_priv, &amp;dev_priv-&gt;mm.active_list,</div><div class='add'>+			    list)</div><div class='add'>+	{</div><div class='add'>+		DRM_INFO("    %p: %08x\n", obj_priv,</div><div class='add'>+			 obj_priv-&gt;last_rendering_seqno);</div><div class='add'>+	}</div><div class='add'>+	DRM_INFO("}\n");</div><div class='add'>+	DRM_INFO("flushing list %s {\n", where);</div><div class='add'>+	list_for_each_entry(obj_priv, &amp;dev_priv-&gt;mm.flushing_list,</div><div class='add'>+			    list)</div><div class='add'>+	{</div><div class='add'>+		DRM_INFO("    %p: %08x\n", obj_priv,</div><div class='add'>+			 obj_priv-&gt;last_rendering_seqno);</div><div class='add'>+	}</div><div class='add'>+	DRM_INFO("}\n");</div><div class='add'>+	DRM_INFO("inactive %s {\n", where);</div><div class='add'>+	list_for_each_entry(obj_priv, &amp;dev_priv-&gt;mm.inactive_list, list) {</div><div class='add'>+		DRM_INFO("    %p: %08x\n", obj_priv,</div><div class='add'>+			 obj_priv-&gt;last_rendering_seqno);</div><div class='add'>+	}</div><div class='add'>+	DRM_INFO("}\n");</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#if WATCH_COHERENCY</div><div class='add'>+void</div><div class='add'>+i915_gem_object_check_coherency(struct drm_gem_object *obj, int handle)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = obj-&gt;dev;</div><div class='add'>+	struct drm_i915_gem_object *obj_priv = obj-&gt;driver_private;</div><div class='add'>+	int page;</div><div class='add'>+	uint32_t *gtt_mapping;</div><div class='add'>+	uint32_t *backing_map = NULL;</div><div class='add'>+	int bad_count = 0;</div><div class='add'>+</div><div class='add'>+	DRM_INFO("%s: checking coherency of object %p@0x%08x (%d, %dkb):\n",</div><div class='add'>+		 __func__, obj, obj_priv-&gt;gtt_offset, handle,</div><div class='add'>+		 obj-&gt;size / 1024);</div><div class='add'>+</div><div class='add'>+	gtt_mapping = ioremap(dev-&gt;agp-&gt;base + obj_priv-&gt;gtt_offset,</div><div class='add'>+			      obj-&gt;size);</div><div class='add'>+	if (gtt_mapping == NULL) {</div><div class='add'>+		DRM_ERROR("failed to map GTT space\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (page = 0; page &lt; obj-&gt;size / PAGE_SIZE; page++) {</div><div class='add'>+		int i;</div><div class='add'>+</div><div class='add'>+		backing_map = kmap_atomic(obj_priv-&gt;page_list[page], KM_USER0);</div><div class='add'>+</div><div class='add'>+		if (backing_map == NULL) {</div><div class='add'>+			DRM_ERROR("failed to map backing page\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; PAGE_SIZE / 4; i++) {</div><div class='add'>+			uint32_t cpuval = backing_map[i];</div><div class='add'>+			uint32_t gttval = readl(gtt_mapping +</div><div class='add'>+						page * 1024 + i);</div><div class='add'>+</div><div class='add'>+			if (cpuval != gttval) {</div><div class='add'>+				DRM_INFO("incoherent CPU vs GPU at 0x%08x: "</div><div class='add'>+					 "0x%08x vs 0x%08x\n",</div><div class='add'>+					 (int)(obj_priv-&gt;gtt_offset +</div><div class='add'>+					       page * PAGE_SIZE + i * 4),</div><div class='add'>+					 cpuval, gttval);</div><div class='add'>+				if (bad_count++ &gt;= 8) {</div><div class='add'>+					DRM_INFO("...\n");</div><div class='add'>+					goto out;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		kunmap_atomic(backing_map, KM_USER0);</div><div class='add'>+		backing_map = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+ out:</div><div class='add'>+	if (backing_map != NULL)</div><div class='add'>+		kunmap_atomic(backing_map, KM_USER0);</div><div class='add'>+	iounmap(gtt_mapping);</div><div class='add'>+</div><div class='add'>+	/* give syslog time to catch up */</div><div class='add'>+	msleep(1);</div><div class='add'>+</div><div class='add'>+	/* Directly flush the object, since we just loaded values with the CPU</div><div class='add'>+	 * from the backing pages and we don't want to disturb the cache</div><div class='add'>+	 * management that we're trying to observe.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	i915_gem_clflush_object(obj);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/gpu/drm/i915/i915_gem_proc.c b/drivers/gpu/drm/i915/i915_gem_proc.c<br/>new file mode 100644<br/>index 000000000000..15d4160415b0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpu/drm/i915/i915_gem_proc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/i915/i915_gem_proc.c</a></div><div class='hunk'>@@ -0,0 +1,292 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright © 2008 Intel Corporation</div><div class='add'>+ *</div><div class='add'>+ * Permission is hereby granted, free of charge, to any person obtaining a</div><div class='add'>+ * copy of this software and associated documentation files (the "Software"),</div><div class='add'>+ * to deal in the Software without restriction, including without limitation</div><div class='add'>+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,</div><div class='add'>+ * and/or sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ * Software is furnished to do so, subject to the following conditions:</div><div class='add'>+ *</div><div class='add'>+ * The above copyright notice and this permission notice (including the next</div><div class='add'>+ * paragraph) shall be included in all copies or substantial portions of the</div><div class='add'>+ * Software.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR</div><div class='add'>+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL</div><div class='add'>+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER</div><div class='add'>+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS</div><div class='add'>+ * IN THE SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ * Authors:</div><div class='add'>+ *    Eric Anholt &lt;eric@anholt.net&gt;</div><div class='add'>+ *    Keith Packard &lt;keithp@keithp.com&gt;</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "drmP.h"</div><div class='add'>+#include "drm.h"</div><div class='add'>+#include "i915_drm.h"</div><div class='add'>+#include "i915_drv.h"</div><div class='add'>+</div><div class='add'>+static int i915_gem_active_info(char *buf, char **start, off_t offset,</div><div class='add'>+				int request, int *eof, void *data)</div><div class='add'>+{</div><div class='add'>+	struct drm_minor *minor = (struct drm_minor *) data;</div><div class='add'>+	struct drm_device *dev = minor-&gt;dev;</div><div class='add'>+	drm_i915_private_t *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct drm_i915_gem_object *obj_priv;</div><div class='add'>+	int len = 0;</div><div class='add'>+</div><div class='add'>+	if (offset &gt; DRM_PROC_LIMIT) {</div><div class='add'>+		*eof = 1;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*start = &amp;buf[offset];</div><div class='add'>+	*eof = 0;</div><div class='add'>+	DRM_PROC_PRINT("Active:\n");</div><div class='add'>+	list_for_each_entry(obj_priv, &amp;dev_priv-&gt;mm.active_list,</div><div class='add'>+			    list)</div><div class='add'>+	{</div><div class='add'>+		struct drm_gem_object *obj = obj_priv-&gt;obj;</div><div class='add'>+		if (obj-&gt;name) {</div><div class='add'>+			DRM_PROC_PRINT("    %p(%d): %08x %08x %d\n",</div><div class='add'>+				       obj, obj-&gt;name,</div><div class='add'>+				       obj-&gt;read_domains, obj-&gt;write_domain,</div><div class='add'>+				       obj_priv-&gt;last_rendering_seqno);</div><div class='add'>+		} else {</div><div class='add'>+			DRM_PROC_PRINT("       %p: %08x %08x %d\n",</div><div class='add'>+				       obj,</div><div class='add'>+				       obj-&gt;read_domains, obj-&gt;write_domain,</div><div class='add'>+				       obj_priv-&gt;last_rendering_seqno);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (len &gt; request + offset)</div><div class='add'>+		return request;</div><div class='add'>+	*eof = 1;</div><div class='add'>+	return len - offset;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int i915_gem_flushing_info(char *buf, char **start, off_t offset,</div><div class='add'>+				  int request, int *eof, void *data)</div><div class='add'>+{</div><div class='add'>+	struct drm_minor *minor = (struct drm_minor *) data;</div><div class='add'>+	struct drm_device *dev = minor-&gt;dev;</div><div class='add'>+	drm_i915_private_t *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct drm_i915_gem_object *obj_priv;</div><div class='add'>+	int len = 0;</div><div class='add'>+</div><div class='add'>+	if (offset &gt; DRM_PROC_LIMIT) {</div><div class='add'>+		*eof = 1;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*start = &amp;buf[offset];</div><div class='add'>+	*eof = 0;</div><div class='add'>+	DRM_PROC_PRINT("Flushing:\n");</div><div class='add'>+	list_for_each_entry(obj_priv, &amp;dev_priv-&gt;mm.flushing_list,</div><div class='add'>+			    list)</div><div class='add'>+	{</div><div class='add'>+		struct drm_gem_object *obj = obj_priv-&gt;obj;</div><div class='add'>+		if (obj-&gt;name) {</div><div class='add'>+			DRM_PROC_PRINT("    %p(%d): %08x %08x %d\n",</div><div class='add'>+				       obj, obj-&gt;name,</div><div class='add'>+				       obj-&gt;read_domains, obj-&gt;write_domain,</div><div class='add'>+				       obj_priv-&gt;last_rendering_seqno);</div><div class='add'>+		} else {</div><div class='add'>+			DRM_PROC_PRINT("       %p: %08x %08x %d\n", obj,</div><div class='add'>+				       obj-&gt;read_domains, obj-&gt;write_domain,</div><div class='add'>+				       obj_priv-&gt;last_rendering_seqno);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (len &gt; request + offset)</div><div class='add'>+		return request;</div><div class='add'>+	*eof = 1;</div><div class='add'>+	return len - offset;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int i915_gem_inactive_info(char *buf, char **start, off_t offset,</div><div class='add'>+				  int request, int *eof, void *data)</div><div class='add'>+{</div><div class='add'>+	struct drm_minor *minor = (struct drm_minor *) data;</div><div class='add'>+	struct drm_device *dev = minor-&gt;dev;</div><div class='add'>+	drm_i915_private_t *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct drm_i915_gem_object *obj_priv;</div><div class='add'>+	int len = 0;</div><div class='add'>+</div><div class='add'>+	if (offset &gt; DRM_PROC_LIMIT) {</div><div class='add'>+		*eof = 1;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*start = &amp;buf[offset];</div><div class='add'>+	*eof = 0;</div><div class='add'>+	DRM_PROC_PRINT("Inactive:\n");</div><div class='add'>+	list_for_each_entry(obj_priv, &amp;dev_priv-&gt;mm.inactive_list,</div><div class='add'>+			    list)</div><div class='add'>+	{</div><div class='add'>+		struct drm_gem_object *obj = obj_priv-&gt;obj;</div><div class='add'>+		if (obj-&gt;name) {</div><div class='add'>+			DRM_PROC_PRINT("    %p(%d): %08x %08x %d\n",</div><div class='add'>+				       obj, obj-&gt;name,</div><div class='add'>+				       obj-&gt;read_domains, obj-&gt;write_domain,</div><div class='add'>+				       obj_priv-&gt;last_rendering_seqno);</div><div class='add'>+		} else {</div><div class='add'>+			DRM_PROC_PRINT("       %p: %08x %08x %d\n", obj,</div><div class='add'>+				       obj-&gt;read_domains, obj-&gt;write_domain,</div><div class='add'>+				       obj_priv-&gt;last_rendering_seqno);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (len &gt; request + offset)</div><div class='add'>+		return request;</div><div class='add'>+	*eof = 1;</div><div class='add'>+	return len - offset;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int i915_gem_request_info(char *buf, char **start, off_t offset,</div><div class='add'>+				 int request, int *eof, void *data)</div><div class='add'>+{</div><div class='add'>+	struct drm_minor *minor = (struct drm_minor *) data;</div><div class='add'>+	struct drm_device *dev = minor-&gt;dev;</div><div class='add'>+	drm_i915_private_t *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct drm_i915_gem_request *gem_request;</div><div class='add'>+	int len = 0;</div><div class='add'>+</div><div class='add'>+	if (offset &gt; DRM_PROC_LIMIT) {</div><div class='add'>+		*eof = 1;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*start = &amp;buf[offset];</div><div class='add'>+	*eof = 0;</div><div class='add'>+	DRM_PROC_PRINT("Request:\n");</div><div class='add'>+	list_for_each_entry(gem_request, &amp;dev_priv-&gt;mm.request_list,</div><div class='add'>+			    list)</div><div class='add'>+	{</div><div class='add'>+		DRM_PROC_PRINT("    %d @ %d %08x\n",</div><div class='add'>+			       gem_request-&gt;seqno,</div><div class='add'>+			       (int) (jiffies - gem_request-&gt;emitted_jiffies),</div><div class='add'>+			       gem_request-&gt;flush_domains);</div><div class='add'>+	}</div><div class='add'>+	if (len &gt; request + offset)</div><div class='add'>+		return request;</div><div class='add'>+	*eof = 1;</div><div class='add'>+	return len - offset;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int i915_gem_seqno_info(char *buf, char **start, off_t offset,</div><div class='add'>+			       int request, int *eof, void *data)</div><div class='add'>+{</div><div class='add'>+	struct drm_minor *minor = (struct drm_minor *) data;</div><div class='add'>+	struct drm_device *dev = minor-&gt;dev;</div><div class='add'>+	drm_i915_private_t *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	int len = 0;</div><div class='add'>+</div><div class='add'>+	if (offset &gt; DRM_PROC_LIMIT) {</div><div class='add'>+		*eof = 1;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*start = &amp;buf[offset];</div><div class='add'>+	*eof = 0;</div><div class='add'>+	DRM_PROC_PRINT("Current sequence: %d\n", i915_get_gem_seqno(dev));</div><div class='add'>+	DRM_PROC_PRINT("Waiter sequence:  %d\n",</div><div class='add'>+		       dev_priv-&gt;mm.waiting_gem_seqno);</div><div class='add'>+	DRM_PROC_PRINT("IRQ sequence:     %d\n", dev_priv-&gt;mm.irq_gem_seqno);</div><div class='add'>+	if (len &gt; request + offset)</div><div class='add'>+		return request;</div><div class='add'>+	*eof = 1;</div><div class='add'>+	return len - offset;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int i915_interrupt_info(char *buf, char **start, off_t offset,</div><div class='add'>+			       int request, int *eof, void *data)</div><div class='add'>+{</div><div class='add'>+	struct drm_minor *minor = (struct drm_minor *) data;</div><div class='add'>+	struct drm_device *dev = minor-&gt;dev;</div><div class='add'>+	drm_i915_private_t *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	int len = 0;</div><div class='add'>+</div><div class='add'>+	if (offset &gt; DRM_PROC_LIMIT) {</div><div class='add'>+		*eof = 1;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*start = &amp;buf[offset];</div><div class='add'>+	*eof = 0;</div><div class='add'>+	DRM_PROC_PRINT("Interrupt enable:    %08x\n",</div><div class='add'>+		       I915_READ(IER));</div><div class='add'>+	DRM_PROC_PRINT("Interrupt identity:  %08x\n",</div><div class='add'>+		       I915_READ(IIR));</div><div class='add'>+	DRM_PROC_PRINT("Interrupt mask:      %08x\n",</div><div class='add'>+		       I915_READ(IMR));</div><div class='add'>+	DRM_PROC_PRINT("Pipe A stat:         %08x\n",</div><div class='add'>+		       I915_READ(PIPEASTAT));</div><div class='add'>+	DRM_PROC_PRINT("Pipe B stat:         %08x\n",</div><div class='add'>+		       I915_READ(PIPEBSTAT));</div><div class='add'>+	DRM_PROC_PRINT("Interrupts received: %d\n",</div><div class='add'>+		       atomic_read(&amp;dev_priv-&gt;irq_received));</div><div class='add'>+	DRM_PROC_PRINT("Current sequence:    %d\n",</div><div class='add'>+		       i915_get_gem_seqno(dev));</div><div class='add'>+	DRM_PROC_PRINT("Waiter sequence:     %d\n",</div><div class='add'>+		       dev_priv-&gt;mm.waiting_gem_seqno);</div><div class='add'>+	DRM_PROC_PRINT("IRQ sequence:        %d\n",</div><div class='add'>+		       dev_priv-&gt;mm.irq_gem_seqno);</div><div class='add'>+	if (len &gt; request + offset)</div><div class='add'>+		return request;</div><div class='add'>+	*eof = 1;</div><div class='add'>+	return len - offset;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct drm_proc_list {</div><div class='add'>+	/** file name */</div><div class='add'>+	const char *name;</div><div class='add'>+	/** proc callback*/</div><div class='add'>+	int (*f) (char *, char **, off_t, int, int *, void *);</div><div class='add'>+} i915_gem_proc_list[] = {</div><div class='add'>+	{"i915_gem_active", i915_gem_active_info},</div><div class='add'>+	{"i915_gem_flushing", i915_gem_flushing_info},</div><div class='add'>+	{"i915_gem_inactive", i915_gem_inactive_info},</div><div class='add'>+	{"i915_gem_request", i915_gem_request_info},</div><div class='add'>+	{"i915_gem_seqno", i915_gem_seqno_info},</div><div class='add'>+	{"i915_gem_interrupt", i915_interrupt_info},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define I915_GEM_PROC_ENTRIES ARRAY_SIZE(i915_gem_proc_list)</div><div class='add'>+</div><div class='add'>+int i915_gem_proc_init(struct drm_minor *minor)</div><div class='add'>+{</div><div class='add'>+	struct proc_dir_entry *ent;</div><div class='add'>+	int i, j;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; I915_GEM_PROC_ENTRIES; i++) {</div><div class='add'>+		ent = create_proc_entry(i915_gem_proc_list[i].name,</div><div class='add'>+					S_IFREG | S_IRUGO, minor-&gt;dev_root);</div><div class='add'>+		if (!ent) {</div><div class='add'>+			DRM_ERROR("Cannot create /proc/dri/.../%s\n",</div><div class='add'>+				  i915_gem_proc_list[i].name);</div><div class='add'>+			for (j = 0; j &lt; i; j++)</div><div class='add'>+				remove_proc_entry(i915_gem_proc_list[i].name,</div><div class='add'>+						  minor-&gt;dev_root);</div><div class='add'>+			return -1;</div><div class='add'>+		}</div><div class='add'>+		ent-&gt;read_proc = i915_gem_proc_list[i].f;</div><div class='add'>+		ent-&gt;data = minor;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void i915_gem_proc_cleanup(struct drm_minor *minor)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!minor-&gt;dev_root)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; I915_GEM_PROC_ENTRIES; i++)</div><div class='add'>+		remove_proc_entry(i915_gem_proc_list[i].name, minor-&gt;dev_root);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/gpu/drm/i915/i915_gem_tiling.c b/drivers/gpu/drm/i915/i915_gem_tiling.c<br/>new file mode 100644<br/>index 000000000000..e8b85ac4ca04<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpu/drm/i915/i915_gem_tiling.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/i915/i915_gem_tiling.c</a></div><div class='hunk'>@@ -0,0 +1,257 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright © 2008 Intel Corporation</div><div class='add'>+ *</div><div class='add'>+ * Permission is hereby granted, free of charge, to any person obtaining a</div><div class='add'>+ * copy of this software and associated documentation files (the "Software"),</div><div class='add'>+ * to deal in the Software without restriction, including without limitation</div><div class='add'>+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,</div><div class='add'>+ * and/or sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ * Software is furnished to do so, subject to the following conditions:</div><div class='add'>+ *</div><div class='add'>+ * The above copyright notice and this permission notice (including the next</div><div class='add'>+ * paragraph) shall be included in all copies or substantial portions of the</div><div class='add'>+ * Software.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR</div><div class='add'>+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL</div><div class='add'>+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER</div><div class='add'>+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS</div><div class='add'>+ * IN THE SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ * Authors:</div><div class='add'>+ *    Eric Anholt &lt;eric@anholt.net&gt;</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "drmP.h"</div><div class='add'>+#include "drm.h"</div><div class='add'>+#include "i915_drm.h"</div><div class='add'>+#include "i915_drv.h"</div><div class='add'>+</div><div class='add'>+/** @file i915_gem_tiling.c</div><div class='add'>+ *</div><div class='add'>+ * Support for managing tiling state of buffer objects.</div><div class='add'>+ *</div><div class='add'>+ * The idea behind tiling is to increase cache hit rates by rearranging</div><div class='add'>+ * pixel data so that a group of pixel accesses are in the same cacheline.</div><div class='add'>+ * Performance improvement from doing this on the back/depth buffer are on</div><div class='add'>+ * the order of 30%.</div><div class='add'>+ *</div><div class='add'>+ * Intel architectures make this somewhat more complicated, though, by</div><div class='add'>+ * adjustments made to addressing of data when the memory is in interleaved</div><div class='add'>+ * mode (matched pairs of DIMMS) to improve memory bandwidth.</div><div class='add'>+ * For interleaved memory, the CPU sends every sequential 64 bytes</div><div class='add'>+ * to an alternate memory channel so it can get the bandwidth from both.</div><div class='add'>+ *</div><div class='add'>+ * The GPU also rearranges its accesses for increased bandwidth to interleaved</div><div class='add'>+ * memory, and it matches what the CPU does for non-tiled.  However, when tiled</div><div class='add'>+ * it does it a little differently, since one walks addresses not just in the</div><div class='add'>+ * X direction but also Y.  So, along with alternating channels when bit</div><div class='add'>+ * 6 of the address flips, it also alternates when other bits flip --  Bits 9</div><div class='add'>+ * (every 512 bytes, an X tile scanline) and 10 (every two X tile scanlines)</div><div class='add'>+ * are common to both the 915 and 965-class hardware.</div><div class='add'>+ *</div><div class='add'>+ * The CPU also sometimes XORs in higher bits as well, to improve</div><div class='add'>+ * bandwidth doing strided access like we do so frequently in graphics.  This</div><div class='add'>+ * is called "Channel XOR Randomization" in the MCH documentation.  The result</div><div class='add'>+ * is that the CPU is XORing in either bit 11 or bit 17 to bit 6 of its address</div><div class='add'>+ * decode.</div><div class='add'>+ *</div><div class='add'>+ * All of this bit 6 XORing has an effect on our memory management,</div><div class='add'>+ * as we need to make sure that the 3d driver can correctly address object</div><div class='add'>+ * contents.</div><div class='add'>+ *</div><div class='add'>+ * If we don't have interleaved memory, all tiling is safe and no swizzling is</div><div class='add'>+ * required.</div><div class='add'>+ *</div><div class='add'>+ * When bit 17 is XORed in, we simply refuse to tile at all.  Bit</div><div class='add'>+ * 17 is not just a page offset, so as we page an objet out and back in,</div><div class='add'>+ * individual pages in it will have different bit 17 addresses, resulting in</div><div class='add'>+ * each 64 bytes being swapped with its neighbor!</div><div class='add'>+ *</div><div class='add'>+ * Otherwise, if interleaved, we have to tell the 3d driver what the address</div><div class='add'>+ * swizzling it needs to do is, since it's writing with the CPU to the pages</div><div class='add'>+ * (bit 6 and potentially bit 11 XORed in), and the GPU is reading from the</div><div class='add'>+ * pages (bit 6, 9, and 10 XORed in), resulting in a cumulative bit swizzling</div><div class='add'>+ * required by the CPU of XORing in bit 6, 9, 10, and potentially 11, in order</div><div class='add'>+ * to match what the GPU expects.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Detects bit 6 swizzling of address lookup between IGD access and CPU</div><div class='add'>+ * access through main memory.</div><div class='add'>+ */</div><div class='add'>+void</div><div class='add'>+i915_gem_detect_bit_6_swizzle(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	drm_i915_private_t *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	uint32_t swizzle_x = I915_BIT_6_SWIZZLE_UNKNOWN;</div><div class='add'>+	uint32_t swizzle_y = I915_BIT_6_SWIZZLE_UNKNOWN;</div><div class='add'>+</div><div class='add'>+	if (!IS_I9XX(dev)) {</div><div class='add'>+		/* As far as we know, the 865 doesn't have these bit 6</div><div class='add'>+		 * swizzling issues.</div><div class='add'>+		 */</div><div class='add'>+		swizzle_x = I915_BIT_6_SWIZZLE_NONE;</div><div class='add'>+		swizzle_y = I915_BIT_6_SWIZZLE_NONE;</div><div class='add'>+	} else if ((!IS_I965G(dev) &amp;&amp; !IS_G33(dev)) || IS_I965GM(dev) ||</div><div class='add'>+		   IS_GM45(dev)) {</div><div class='add'>+		uint32_t dcc;</div><div class='add'>+</div><div class='add'>+		/* On 915-945 and GM965, channel interleave by the CPU is</div><div class='add'>+		 * determined by DCC.  The CPU will alternate based on bit 6</div><div class='add'>+		 * in interleaved mode, and the GPU will then also alternate</div><div class='add'>+		 * on bit 6, 9, and 10 for X, but the CPU may also optionally</div><div class='add'>+		 * alternate based on bit 17 (XOR not disabled and XOR</div><div class='add'>+		 * bit == 17).</div><div class='add'>+		 */</div><div class='add'>+		dcc = I915_READ(DCC);</div><div class='add'>+		switch (dcc &amp; DCC_ADDRESSING_MODE_MASK) {</div><div class='add'>+		case DCC_ADDRESSING_MODE_SINGLE_CHANNEL:</div><div class='add'>+		case DCC_ADDRESSING_MODE_DUAL_CHANNEL_ASYMMETRIC:</div><div class='add'>+			swizzle_x = I915_BIT_6_SWIZZLE_NONE;</div><div class='add'>+			swizzle_y = I915_BIT_6_SWIZZLE_NONE;</div><div class='add'>+			break;</div><div class='add'>+		case DCC_ADDRESSING_MODE_DUAL_CHANNEL_INTERLEAVED:</div><div class='add'>+			if (IS_I915G(dev) || IS_I915GM(dev) ||</div><div class='add'>+			    dcc &amp; DCC_CHANNEL_XOR_DISABLE) {</div><div class='add'>+				swizzle_x = I915_BIT_6_SWIZZLE_9_10;</div><div class='add'>+				swizzle_y = I915_BIT_6_SWIZZLE_9;</div><div class='add'>+			} else if (IS_I965GM(dev) || IS_GM45(dev)) {</div><div class='add'>+				/* GM965 only does bit 11-based channel</div><div class='add'>+				 * randomization</div><div class='add'>+				 */</div><div class='add'>+				swizzle_x = I915_BIT_6_SWIZZLE_9_10_11;</div><div class='add'>+				swizzle_y = I915_BIT_6_SWIZZLE_9_11;</div><div class='add'>+			} else {</div><div class='add'>+				/* Bit 17 or perhaps other swizzling */</div><div class='add'>+				swizzle_x = I915_BIT_6_SWIZZLE_UNKNOWN;</div><div class='add'>+				swizzle_y = I915_BIT_6_SWIZZLE_UNKNOWN;</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		if (dcc == 0xffffffff) {</div><div class='add'>+			DRM_ERROR("Couldn't read from MCHBAR.  "</div><div class='add'>+				  "Disabling tiling.\n");</div><div class='add'>+			swizzle_x = I915_BIT_6_SWIZZLE_UNKNOWN;</div><div class='add'>+			swizzle_y = I915_BIT_6_SWIZZLE_UNKNOWN;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		/* The 965, G33, and newer, have a very flexible memory</div><div class='add'>+		 * configuration.  It will enable dual-channel mode</div><div class='add'>+		 * (interleaving) on as much memory as it can, and the GPU</div><div class='add'>+		 * will additionally sometimes enable different bit 6</div><div class='add'>+		 * swizzling for tiled objects from the CPU.</div><div class='add'>+		 *</div><div class='add'>+		 * Here's what I found on the G965:</div><div class='add'>+		 *    slot fill         memory size  swizzling</div><div class='add'>+		 * 0A   0B   1A   1B    1-ch   2-ch</div><div class='add'>+		 * 512  0    0    0     512    0     O</div><div class='add'>+		 * 512  0    512  0     16     1008  X</div><div class='add'>+		 * 512  0    0    512   16     1008  X</div><div class='add'>+		 * 0    512  0    512   16     1008  X</div><div class='add'>+		 * 1024 1024 1024 0     2048   1024  O</div><div class='add'>+		 *</div><div class='add'>+		 * We could probably detect this based on either the DRB</div><div class='add'>+		 * matching, which was the case for the swizzling required in</div><div class='add'>+		 * the table above, or from the 1-ch value being less than</div><div class='add'>+		 * the minimum size of a rank.</div><div class='add'>+		 */</div><div class='add'>+		if (I915_READ16(C0DRB3) != I915_READ16(C1DRB3)) {</div><div class='add'>+			swizzle_x = I915_BIT_6_SWIZZLE_NONE;</div><div class='add'>+			swizzle_y = I915_BIT_6_SWIZZLE_NONE;</div><div class='add'>+		} else {</div><div class='add'>+			swizzle_x = I915_BIT_6_SWIZZLE_9_10;</div><div class='add'>+			swizzle_y = I915_BIT_6_SWIZZLE_9;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_priv-&gt;mm.bit_6_swizzle_x = swizzle_x;</div><div class='add'>+	dev_priv-&gt;mm.bit_6_swizzle_y = swizzle_y;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Sets the tiling mode of an object, returning the required swizzling of</div><div class='add'>+ * bit 6 of addresses in the object.</div><div class='add'>+ */</div><div class='add'>+int</div><div class='add'>+i915_gem_set_tiling(struct drm_device *dev, void *data,</div><div class='add'>+		   struct drm_file *file_priv)</div><div class='add'>+{</div><div class='add'>+	struct drm_i915_gem_set_tiling *args = data;</div><div class='add'>+	drm_i915_private_t *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct drm_gem_object *obj;</div><div class='add'>+	struct drm_i915_gem_object *obj_priv;</div><div class='add'>+</div><div class='add'>+	obj = drm_gem_object_lookup(dev, file_priv, args-&gt;handle);</div><div class='add'>+	if (obj == NULL)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	obj_priv = obj-&gt;driver_private;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+</div><div class='add'>+	if (args-&gt;tiling_mode == I915_TILING_NONE) {</div><div class='add'>+		obj_priv-&gt;tiling_mode = I915_TILING_NONE;</div><div class='add'>+		args-&gt;swizzle_mode = I915_BIT_6_SWIZZLE_NONE;</div><div class='add'>+	} else {</div><div class='add'>+		if (args-&gt;tiling_mode == I915_TILING_X)</div><div class='add'>+			args-&gt;swizzle_mode = dev_priv-&gt;mm.bit_6_swizzle_x;</div><div class='add'>+		else</div><div class='add'>+			args-&gt;swizzle_mode = dev_priv-&gt;mm.bit_6_swizzle_y;</div><div class='add'>+		/* If we can't handle the swizzling, make it untiled. */</div><div class='add'>+		if (args-&gt;swizzle_mode == I915_BIT_6_SWIZZLE_UNKNOWN) {</div><div class='add'>+			args-&gt;tiling_mode = I915_TILING_NONE;</div><div class='add'>+			args-&gt;swizzle_mode = I915_BIT_6_SWIZZLE_NONE;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	obj_priv-&gt;tiling_mode = args-&gt;tiling_mode;</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+</div><div class='add'>+	drm_gem_object_unreference(obj);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Returns the current tiling mode and required bit 6 swizzling for the object.</div><div class='add'>+ */</div><div class='add'>+int</div><div class='add'>+i915_gem_get_tiling(struct drm_device *dev, void *data,</div><div class='add'>+		   struct drm_file *file_priv)</div><div class='add'>+{</div><div class='add'>+	struct drm_i915_gem_get_tiling *args = data;</div><div class='add'>+	drm_i915_private_t *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct drm_gem_object *obj;</div><div class='add'>+	struct drm_i915_gem_object *obj_priv;</div><div class='add'>+</div><div class='add'>+	obj = drm_gem_object_lookup(dev, file_priv, args-&gt;handle);</div><div class='add'>+	if (obj == NULL)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	obj_priv = obj-&gt;driver_private;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+</div><div class='add'>+	args-&gt;tiling_mode = obj_priv-&gt;tiling_mode;</div><div class='add'>+	switch (obj_priv-&gt;tiling_mode) {</div><div class='add'>+	case I915_TILING_X:</div><div class='add'>+		args-&gt;swizzle_mode = dev_priv-&gt;mm.bit_6_swizzle_x;</div><div class='add'>+		break;</div><div class='add'>+	case I915_TILING_Y:</div><div class='add'>+		args-&gt;swizzle_mode = dev_priv-&gt;mm.bit_6_swizzle_y;</div><div class='add'>+		break;</div><div class='add'>+	case I915_TILING_NONE:</div><div class='add'>+		args-&gt;swizzle_mode = I915_BIT_6_SWIZZLE_NONE;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		DRM_ERROR("unknown tiling mode\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+</div><div class='add'>+	drm_gem_object_unreference(obj);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c<br/>index df036118b8b1..baae511c785b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpu/drm/i915/i915_irq.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/gpu/drm/i915/i915_irq.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpu/drm/i915/i915_irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/i915/i915_irq.c</a></div><div class='hunk'>@@ -31,12 +31,92 @@</div><div class='ctx'> #include "i915_drm.h"</div><div class='ctx'> #include "i915_drv.h"</div><div class='ctx'> </div><div class='del'>-#define USER_INT_FLAG (1&lt;&lt;1)</div><div class='del'>-#define VSYNC_PIPEB_FLAG (1&lt;&lt;5)</div><div class='del'>-#define VSYNC_PIPEA_FLAG (1&lt;&lt;7)</div><div class='del'>-</div><div class='ctx'> #define MAX_NOPID ((u32)~0)</div><div class='ctx'> </div><div class='add'>+/** These are the interrupts used by the driver */</div><div class='add'>+#define I915_INTERRUPT_ENABLE_MASK (I915_USER_INTERRUPT |		\</div><div class='add'>+				    I915_ASLE_INTERRUPT |		\</div><div class='add'>+				    I915_DISPLAY_PIPE_A_EVENT_INTERRUPT | \</div><div class='add'>+				    I915_DISPLAY_PIPE_B_EVENT_INTERRUPT)</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+i915_enable_irq(drm_i915_private_t *dev_priv, u32 mask)</div><div class='add'>+{</div><div class='add'>+	if ((dev_priv-&gt;irq_mask_reg &amp; mask) != 0) {</div><div class='add'>+		dev_priv-&gt;irq_mask_reg &amp;= ~mask;</div><div class='add'>+		I915_WRITE(IMR, dev_priv-&gt;irq_mask_reg);</div><div class='add'>+		(void) I915_READ(IMR);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+i915_disable_irq(drm_i915_private_t *dev_priv, u32 mask)</div><div class='add'>+{</div><div class='add'>+	if ((dev_priv-&gt;irq_mask_reg &amp; mask) != mask) {</div><div class='add'>+		dev_priv-&gt;irq_mask_reg |= mask;</div><div class='add'>+		I915_WRITE(IMR, dev_priv-&gt;irq_mask_reg);</div><div class='add'>+		(void) I915_READ(IMR);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * i915_get_pipe - return the the pipe associated with a given plane</div><div class='add'>+ * @dev: DRM device</div><div class='add'>+ * @plane: plane to look for</div><div class='add'>+ *</div><div class='add'>+ * The Intel Mesa &amp; 2D drivers call the vblank routines with a plane number</div><div class='add'>+ * rather than a pipe number, since they may not always be equal.  This routine</div><div class='add'>+ * maps the given @plane back to a pipe number.</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+i915_get_pipe(struct drm_device *dev, int plane)</div><div class='add'>+{</div><div class='add'>+	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev-&gt;dev_private;</div><div class='add'>+	u32 dspcntr;</div><div class='add'>+</div><div class='add'>+	dspcntr = plane ? I915_READ(DSPBCNTR) : I915_READ(DSPACNTR);</div><div class='add'>+</div><div class='add'>+	return dspcntr &amp; DISPPLANE_SEL_PIPE_MASK ? 1 : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * i915_get_plane - return the the plane associated with a given pipe</div><div class='add'>+ * @dev: DRM device</div><div class='add'>+ * @pipe: pipe to look for</div><div class='add'>+ *</div><div class='add'>+ * The Intel Mesa &amp; 2D drivers call the vblank routines with a plane number</div><div class='add'>+ * rather than a plane number, since they may not always be equal.  This routine</div><div class='add'>+ * maps the given @pipe back to a plane number.</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+i915_get_plane(struct drm_device *dev, int pipe)</div><div class='add'>+{</div><div class='add'>+	if (i915_get_pipe(dev, 0) == pipe)</div><div class='add'>+		return 0;</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * i915_pipe_enabled - check if a pipe is enabled</div><div class='add'>+ * @dev: DRM device</div><div class='add'>+ * @pipe: pipe to check</div><div class='add'>+ *</div><div class='add'>+ * Reading certain registers when the pipe is disabled can hang the chip.</div><div class='add'>+ * Use this routine to make sure the PLL is running and the pipe is active</div><div class='add'>+ * before reading such registers if unsure.</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+i915_pipe_enabled(struct drm_device *dev, int pipe)</div><div class='add'>+{</div><div class='add'>+	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev-&gt;dev_private;</div><div class='add'>+	unsigned long pipeconf = pipe ? PIPEBCONF : PIPEACONF;</div><div class='add'>+</div><div class='add'>+	if (I915_READ(pipeconf) &amp; PIPEACONF_ENABLE)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * Emit blits for scheduled buffer swaps.</div><div class='ctx'>  *</div><div class='hunk'>@@ -48,8 +128,7 @@ static void i915_vblank_tasklet(struct drm_device *dev)</div><div class='ctx'> 	unsigned long irqflags;</div><div class='ctx'> 	struct list_head *list, *tmp, hits, *hit;</div><div class='ctx'> 	int nhits, nrects, slice[2], upper[2], lower[2], i;</div><div class='del'>-	unsigned counter[2] = { atomic_read(&amp;dev-&gt;vbl_received),</div><div class='del'>-				atomic_read(&amp;dev-&gt;vbl_received2) };</div><div class='add'>+	unsigned counter[2];</div><div class='ctx'> 	struct drm_drawable_info *drw;</div><div class='ctx'> 	drm_i915_sarea_t *sarea_priv = dev_priv-&gt;sarea_priv;</div><div class='ctx'> 	u32 cpp = dev_priv-&gt;cpp;</div><div class='hunk'>@@ -71,6 +150,9 @@ static void i915_vblank_tasklet(struct drm_device *dev)</div><div class='ctx'> 		src_pitch &gt;&gt;= 2;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	counter[0] = drm_vblank_count(dev, 0);</div><div class='add'>+	counter[1] = drm_vblank_count(dev, 1);</div><div class='add'>+</div><div class='ctx'> 	DRM_DEBUG("\n");</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;hits);</div><div class='hunk'>@@ -83,12 +165,14 @@ static void i915_vblank_tasklet(struct drm_device *dev)</div><div class='ctx'> 	list_for_each_safe(list, tmp, &amp;dev_priv-&gt;vbl_swaps.head) {</div><div class='ctx'> 		drm_i915_vbl_swap_t *vbl_swap =</div><div class='ctx'> 			list_entry(list, drm_i915_vbl_swap_t, head);</div><div class='add'>+		int pipe = i915_get_pipe(dev, vbl_swap-&gt;plane);</div><div class='ctx'> </div><div class='del'>-		if ((counter[vbl_swap-&gt;pipe] - vbl_swap-&gt;sequence) &gt; (1&lt;&lt;23))</div><div class='add'>+		if ((counter[pipe] - vbl_swap-&gt;sequence) &gt; (1&lt;&lt;23))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		list_del(list);</div><div class='ctx'> 		dev_priv-&gt;swaps_pending--;</div><div class='add'>+		drm_vblank_put(dev, pipe);</div><div class='ctx'> </div><div class='ctx'> 		spin_unlock(&amp;dev_priv-&gt;swaps_lock);</div><div class='ctx'> 		spin_lock(&amp;dev-&gt;drw_lock);</div><div class='hunk'>@@ -181,7 +265,7 @@ static void i915_vblank_tasklet(struct drm_device *dev)</div><div class='ctx'> 			drm_i915_vbl_swap_t *swap_hit =</div><div class='ctx'> 				list_entry(hit, drm_i915_vbl_swap_t, head);</div><div class='ctx'> 			struct drm_clip_rect *rect;</div><div class='del'>-			int num_rects, pipe;</div><div class='add'>+			int num_rects, plane;</div><div class='ctx'> 			unsigned short top, bottom;</div><div class='ctx'> </div><div class='ctx'> 			drw = drm_get_drawable_info(dev, swap_hit-&gt;drw_id);</div><div class='hunk'>@@ -190,9 +274,9 @@ static void i915_vblank_tasklet(struct drm_device *dev)</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='ctx'> 			rect = drw-&gt;rects;</div><div class='del'>-			pipe = swap_hit-&gt;pipe;</div><div class='del'>-			top = upper[pipe];</div><div class='del'>-			bottom = lower[pipe];</div><div class='add'>+			plane = swap_hit-&gt;plane;</div><div class='add'>+			top = upper[plane];</div><div class='add'>+			bottom = lower[plane];</div><div class='ctx'> </div><div class='ctx'> 			for (num_rects = drw-&gt;num_rects; num_rects--; rect++) {</div><div class='ctx'> 				int y1 = max(rect-&gt;y1, top);</div><div class='hunk'>@@ -229,61 +313,139 @@ static void i915_vblank_tasklet(struct drm_device *dev)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+u32 i915_get_vblank_counter(struct drm_device *dev, int plane)</div><div class='add'>+{</div><div class='add'>+	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev-&gt;dev_private;</div><div class='add'>+	unsigned long high_frame;</div><div class='add'>+	unsigned long low_frame;</div><div class='add'>+	u32 high1, high2, low, count;</div><div class='add'>+	int pipe;</div><div class='add'>+</div><div class='add'>+	pipe = i915_get_pipe(dev, plane);</div><div class='add'>+	high_frame = pipe ? PIPEBFRAMEHIGH : PIPEAFRAMEHIGH;</div><div class='add'>+	low_frame = pipe ? PIPEBFRAMEPIXEL : PIPEAFRAMEPIXEL;</div><div class='add'>+</div><div class='add'>+	if (!i915_pipe_enabled(dev, pipe)) {</div><div class='add'>+		DRM_ERROR("trying to get vblank count for disabled pipe %d\n", pipe);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * High &amp; low register fields aren't synchronized, so make sure</div><div class='add'>+	 * we get a low value that's stable across two reads of the high</div><div class='add'>+	 * register.</div><div class='add'>+	 */</div><div class='add'>+	do {</div><div class='add'>+		high1 = ((I915_READ(high_frame) &amp; PIPE_FRAME_HIGH_MASK) &gt;&gt;</div><div class='add'>+			 PIPE_FRAME_HIGH_SHIFT);</div><div class='add'>+		low =  ((I915_READ(low_frame) &amp; PIPE_FRAME_LOW_MASK) &gt;&gt;</div><div class='add'>+			PIPE_FRAME_LOW_SHIFT);</div><div class='add'>+		high2 = ((I915_READ(high_frame) &amp; PIPE_FRAME_HIGH_MASK) &gt;&gt;</div><div class='add'>+			 PIPE_FRAME_HIGH_SHIFT);</div><div class='add'>+	} while (high1 != high2);</div><div class='add'>+</div><div class='add'>+	count = (high1 &lt;&lt; 8) | low;</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+i915_gem_vblank_work_handler(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	drm_i915_private_t *dev_priv;</div><div class='add'>+	struct drm_device *dev;</div><div class='add'>+</div><div class='add'>+	dev_priv = container_of(work, drm_i915_private_t,</div><div class='add'>+				mm.vblank_work);</div><div class='add'>+	dev = dev_priv-&gt;dev;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+	i915_vblank_tasklet(dev);</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)</div><div class='ctx'> {</div><div class='ctx'> 	struct drm_device *dev = (struct drm_device *) arg;</div><div class='ctx'> 	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev-&gt;dev_private;</div><div class='del'>-	u16 temp;</div><div class='add'>+	u32 iir;</div><div class='ctx'> 	u32 pipea_stats, pipeb_stats;</div><div class='add'>+	int vblank = 0;</div><div class='ctx'> </div><div class='del'>-	pipea_stats = I915_READ(I915REG_PIPEASTAT);</div><div class='del'>-	pipeb_stats = I915_READ(I915REG_PIPEBSTAT);</div><div class='add'>+	atomic_inc(&amp;dev_priv-&gt;irq_received);</div><div class='ctx'> </div><div class='del'>-	temp = I915_READ16(I915REG_INT_IDENTITY_R);</div><div class='add'>+	if (dev-&gt;pdev-&gt;msi_enabled)</div><div class='add'>+		I915_WRITE(IMR, ~0);</div><div class='add'>+	iir = I915_READ(IIR);</div><div class='ctx'> </div><div class='del'>-	temp &amp;= (USER_INT_FLAG | VSYNC_PIPEA_FLAG | VSYNC_PIPEB_FLAG);</div><div class='add'>+	if (iir == 0) {</div><div class='add'>+		if (dev-&gt;pdev-&gt;msi_enabled) {</div><div class='add'>+			I915_WRITE(IMR, dev_priv-&gt;irq_mask_reg);</div><div class='add'>+			(void) I915_READ(IMR);</div><div class='add'>+		}</div><div class='add'>+		return IRQ_NONE;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	DRM_DEBUG("%s flag=%08x\n", __FUNCTION__, temp);</div><div class='add'>+	/*</div><div class='add'>+	 * Clear the PIPE(A|B)STAT regs before the IIR otherwise</div><div class='add'>+	 * we may get extra interrupts.</div><div class='add'>+	 */</div><div class='add'>+	if (iir &amp; I915_DISPLAY_PIPE_A_EVENT_INTERRUPT) {</div><div class='add'>+		pipea_stats = I915_READ(PIPEASTAT);</div><div class='add'>+		if (!(dev_priv-&gt;vblank_pipe &amp; DRM_I915_VBLANK_PIPE_A))</div><div class='add'>+			pipea_stats &amp;= ~(PIPE_START_VBLANK_INTERRUPT_ENABLE |</div><div class='add'>+					 PIPE_VBLANK_INTERRUPT_ENABLE);</div><div class='add'>+		else if (pipea_stats &amp; (PIPE_START_VBLANK_INTERRUPT_STATUS|</div><div class='add'>+					PIPE_VBLANK_INTERRUPT_STATUS)) {</div><div class='add'>+			vblank++;</div><div class='add'>+			drm_handle_vblank(dev, i915_get_plane(dev, 0));</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	if (temp == 0)</div><div class='del'>-		return IRQ_NONE;</div><div class='add'>+		I915_WRITE(PIPEASTAT, pipea_stats);</div><div class='add'>+	}</div><div class='add'>+	if (iir &amp; I915_DISPLAY_PIPE_B_EVENT_INTERRUPT) {</div><div class='add'>+		pipeb_stats = I915_READ(PIPEBSTAT);</div><div class='add'>+		/* Ack the event */</div><div class='add'>+		I915_WRITE(PIPEBSTAT, pipeb_stats);</div><div class='add'>+</div><div class='add'>+		/* The vblank interrupt gets enabled even if we didn't ask for</div><div class='add'>+		   it, so make sure it's shut down again */</div><div class='add'>+		if (!(dev_priv-&gt;vblank_pipe &amp; DRM_I915_VBLANK_PIPE_B))</div><div class='add'>+			pipeb_stats &amp;= ~(PIPE_START_VBLANK_INTERRUPT_ENABLE |</div><div class='add'>+					 PIPE_VBLANK_INTERRUPT_ENABLE);</div><div class='add'>+		else if (pipeb_stats &amp; (PIPE_START_VBLANK_INTERRUPT_STATUS|</div><div class='add'>+					PIPE_VBLANK_INTERRUPT_STATUS)) {</div><div class='add'>+			vblank++;</div><div class='add'>+			drm_handle_vblank(dev, i915_get_plane(dev, 1));</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	I915_WRITE16(I915REG_INT_IDENTITY_R, temp);</div><div class='del'>-	(void) I915_READ16(I915REG_INT_IDENTITY_R);</div><div class='del'>-	DRM_READMEMORYBARRIER();</div><div class='add'>+		if (pipeb_stats &amp; I915_LEGACY_BLC_EVENT_STATUS)</div><div class='add'>+			opregion_asle_intr(dev);</div><div class='add'>+		I915_WRITE(PIPEBSTAT, pipeb_stats);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	I915_WRITE(IIR, iir);</div><div class='add'>+	if (dev-&gt;pdev-&gt;msi_enabled)</div><div class='add'>+		I915_WRITE(IMR, dev_priv-&gt;irq_mask_reg);</div><div class='add'>+	(void) I915_READ(IIR); /* Flush posted writes */</div><div class='ctx'> </div><div class='del'>-	dev_priv-&gt;sarea_priv-&gt;last_dispatch = READ_BREADCRUMB(dev_priv);</div><div class='add'>+	if (dev_priv-&gt;sarea_priv)</div><div class='add'>+		dev_priv-&gt;sarea_priv-&gt;last_dispatch =</div><div class='add'>+			READ_BREADCRUMB(dev_priv);</div><div class='ctx'> </div><div class='del'>-	if (temp &amp; USER_INT_FLAG)</div><div class='add'>+	if (iir &amp; I915_USER_INTERRUPT) {</div><div class='add'>+		dev_priv-&gt;mm.irq_gem_seqno = i915_get_gem_seqno(dev);</div><div class='ctx'> 		DRM_WAKEUP(&amp;dev_priv-&gt;irq_queue);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (temp &amp; (VSYNC_PIPEA_FLAG | VSYNC_PIPEB_FLAG)) {</div><div class='del'>-		int vblank_pipe = dev_priv-&gt;vblank_pipe;</div><div class='del'>-</div><div class='del'>-		if ((vblank_pipe &amp;</div><div class='del'>-		     (DRM_I915_VBLANK_PIPE_A | DRM_I915_VBLANK_PIPE_B))</div><div class='del'>-		    == (DRM_I915_VBLANK_PIPE_A | DRM_I915_VBLANK_PIPE_B)) {</div><div class='del'>-			if (temp &amp; VSYNC_PIPEA_FLAG)</div><div class='del'>-				atomic_inc(&amp;dev-&gt;vbl_received);</div><div class='del'>-			if (temp &amp; VSYNC_PIPEB_FLAG)</div><div class='del'>-				atomic_inc(&amp;dev-&gt;vbl_received2);</div><div class='del'>-		} else if (((temp &amp; VSYNC_PIPEA_FLAG) &amp;&amp;</div><div class='del'>-			    (vblank_pipe &amp; DRM_I915_VBLANK_PIPE_A)) ||</div><div class='del'>-			   ((temp &amp; VSYNC_PIPEB_FLAG) &amp;&amp;</div><div class='del'>-			    (vblank_pipe &amp; DRM_I915_VBLANK_PIPE_B)))</div><div class='del'>-			atomic_inc(&amp;dev-&gt;vbl_received);</div><div class='del'>-</div><div class='del'>-		DRM_WAKEUP(&amp;dev-&gt;vbl_queue);</div><div class='del'>-		drm_vbl_send_signals(dev);</div><div class='del'>-</div><div class='del'>-		if (dev_priv-&gt;swaps_pending &gt; 0)</div><div class='add'>+	if (iir &amp; I915_ASLE_INTERRUPT)</div><div class='add'>+		opregion_asle_intr(dev);</div><div class='add'>+</div><div class='add'>+	if (vblank &amp;&amp; dev_priv-&gt;swaps_pending &gt; 0) {</div><div class='add'>+		if (dev_priv-&gt;ring.ring_obj == NULL)</div><div class='ctx'> 			drm_locked_tasklet(dev, i915_vblank_tasklet);</div><div class='del'>-		I915_WRITE(I915REG_PIPEASTAT,</div><div class='del'>-			pipea_stats|I915_VBLANK_INTERRUPT_ENABLE|</div><div class='del'>-			I915_VBLANK_CLEAR);</div><div class='del'>-		I915_WRITE(I915REG_PIPEBSTAT,</div><div class='del'>-			pipeb_stats|I915_VBLANK_INTERRUPT_ENABLE|</div><div class='del'>-			I915_VBLANK_CLEAR);</div><div class='add'>+		else</div><div class='add'>+			schedule_work(&amp;dev_priv-&gt;mm.vblank_work);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='hunk'>@@ -298,23 +460,45 @@ static int i915_emit_irq(struct drm_device * dev)</div><div class='ctx'> </div><div class='ctx'> 	DRM_DEBUG("\n");</div><div class='ctx'> </div><div class='del'>-	dev_priv-&gt;sarea_priv-&gt;last_enqueue = ++dev_priv-&gt;counter;</div><div class='del'>-</div><div class='add'>+	dev_priv-&gt;counter++;</div><div class='ctx'> 	if (dev_priv-&gt;counter &gt; 0x7FFFFFFFUL)</div><div class='del'>-		dev_priv-&gt;sarea_priv-&gt;last_enqueue = dev_priv-&gt;counter = 1;</div><div class='add'>+		dev_priv-&gt;counter = 1;</div><div class='add'>+	if (dev_priv-&gt;sarea_priv)</div><div class='add'>+		dev_priv-&gt;sarea_priv-&gt;last_enqueue = dev_priv-&gt;counter;</div><div class='ctx'> </div><div class='ctx'> 	BEGIN_LP_RING(6);</div><div class='del'>-	OUT_RING(CMD_STORE_DWORD_IDX);</div><div class='del'>-	OUT_RING(20);</div><div class='add'>+	OUT_RING(MI_STORE_DWORD_INDEX);</div><div class='add'>+	OUT_RING(5 &lt;&lt; MI_STORE_DWORD_INDEX_SHIFT);</div><div class='ctx'> 	OUT_RING(dev_priv-&gt;counter);</div><div class='ctx'> 	OUT_RING(0);</div><div class='ctx'> 	OUT_RING(0);</div><div class='del'>-	OUT_RING(GFX_OP_USER_INTERRUPT);</div><div class='add'>+	OUT_RING(MI_USER_INTERRUPT);</div><div class='ctx'> 	ADVANCE_LP_RING();</div><div class='ctx'> </div><div class='ctx'> 	return dev_priv-&gt;counter;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void i915_user_irq_get(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev-&gt;dev_private;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;dev_priv-&gt;user_irq_lock);</div><div class='add'>+	if (dev-&gt;irq_enabled &amp;&amp; (++dev_priv-&gt;user_irq_refcount == 1))</div><div class='add'>+		i915_enable_irq(dev_priv, I915_USER_INTERRUPT);</div><div class='add'>+	spin_unlock(&amp;dev_priv-&gt;user_irq_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void i915_user_irq_put(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev-&gt;dev_private;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;dev_priv-&gt;user_irq_lock);</div><div class='add'>+	BUG_ON(dev-&gt;irq_enabled &amp;&amp; dev_priv-&gt;user_irq_refcount &lt;= 0);</div><div class='add'>+	if (dev-&gt;irq_enabled &amp;&amp; (--dev_priv-&gt;user_irq_refcount == 0))</div><div class='add'>+		i915_disable_irq(dev_priv, I915_USER_INTERRUPT);</div><div class='add'>+	spin_unlock(&amp;dev_priv-&gt;user_irq_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int i915_wait_irq(struct drm_device * dev, int irq_nr)</div><div class='ctx'> {</div><div class='ctx'> 	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev-&gt;dev_private;</div><div class='hunk'>@@ -323,55 +507,34 @@ static int i915_wait_irq(struct drm_device * dev, int irq_nr)</div><div class='ctx'> 	DRM_DEBUG("irq_nr=%d breadcrumb=%d\n", irq_nr,</div><div class='ctx'> 		  READ_BREADCRUMB(dev_priv));</div><div class='ctx'> </div><div class='del'>-	if (READ_BREADCRUMB(dev_priv) &gt;= irq_nr)</div><div class='add'>+	if (READ_BREADCRUMB(dev_priv) &gt;= irq_nr) {</div><div class='add'>+		if (dev_priv-&gt;sarea_priv) {</div><div class='add'>+			dev_priv-&gt;sarea_priv-&gt;last_dispatch =</div><div class='add'>+				READ_BREADCRUMB(dev_priv);</div><div class='add'>+		}</div><div class='ctx'> 		return 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	dev_priv-&gt;sarea_priv-&gt;perf_boxes |= I915_BOX_WAIT;</div><div class='add'>+	if (dev_priv-&gt;sarea_priv)</div><div class='add'>+		dev_priv-&gt;sarea_priv-&gt;perf_boxes |= I915_BOX_WAIT;</div><div class='ctx'> </div><div class='add'>+	i915_user_irq_get(dev);</div><div class='ctx'> 	DRM_WAIT_ON(ret, dev_priv-&gt;irq_queue, 3 * DRM_HZ,</div><div class='ctx'> 		    READ_BREADCRUMB(dev_priv) &gt;= irq_nr);</div><div class='add'>+	i915_user_irq_put(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (ret == -EBUSY) {</div><div class='ctx'> 		DRM_ERROR("EBUSY -- rec: %d emitted: %d\n",</div><div class='ctx'> 			  READ_BREADCRUMB(dev_priv), (int)dev_priv-&gt;counter);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dev_priv-&gt;sarea_priv-&gt;last_dispatch = READ_BREADCRUMB(dev_priv);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int i915_driver_vblank_do_wait(struct drm_device *dev, unsigned int *sequence,</div><div class='del'>-				      atomic_t *counter)</div><div class='del'>-{</div><div class='del'>-	drm_i915_private_t *dev_priv = dev-&gt;dev_private;</div><div class='del'>-	unsigned int cur_vblank;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (!dev_priv) {</div><div class='del'>-		DRM_ERROR("called with no initialization\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	DRM_WAIT_ON(ret, dev-&gt;vbl_queue, 3 * DRM_HZ,</div><div class='del'>-		    (((cur_vblank = atomic_read(counter))</div><div class='del'>-			- *sequence) &lt;= (1&lt;&lt;23)));</div><div class='del'>-</div><div class='del'>-	*sequence = cur_vblank;</div><div class='add'>+	if (dev_priv-&gt;sarea_priv)</div><div class='add'>+		dev_priv-&gt;sarea_priv-&gt;last_dispatch =</div><div class='add'>+			READ_BREADCRUMB(dev_priv);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-int i915_driver_vblank_wait(struct drm_device *dev, unsigned int *sequence)</div><div class='del'>-{</div><div class='del'>-	return i915_driver_vblank_do_wait(dev, sequence, &amp;dev-&gt;vbl_received);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int i915_driver_vblank_wait2(struct drm_device *dev, unsigned int *sequence)</div><div class='del'>-{</div><div class='del'>-	return i915_driver_vblank_do_wait(dev, sequence, &amp;dev-&gt;vbl_received2);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* Needs the lock as it touches the ring.</div><div class='ctx'>  */</div><div class='ctx'> int i915_irq_emit(struct drm_device *dev, void *data,</div><div class='hunk'>@@ -381,14 +544,15 @@ int i915_irq_emit(struct drm_device *dev, void *data,</div><div class='ctx'> 	drm_i915_irq_emit_t *emit = data;</div><div class='ctx'> 	int result;</div><div class='ctx'> </div><div class='del'>-	LOCK_TEST_WITH_RETURN(dev, file_priv);</div><div class='add'>+	RING_LOCK_TEST_WITH_RETURN(dev, file_priv);</div><div class='ctx'> </div><div class='ctx'> 	if (!dev_priv) {</div><div class='ctx'> 		DRM_ERROR("called with no initialization\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='add'>+	mutex_lock(&amp;dev-&gt;struct_mutex);</div><div class='ctx'> 	result = i915_emit_irq(dev);</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='ctx'> </div><div class='ctx'> 	if (DRM_COPY_TO_USER(emit-&gt;irq_seq, &amp;result, sizeof(int))) {</div><div class='ctx'> 		DRM_ERROR("copy_to_user\n");</div><div class='hunk'>@@ -414,18 +578,74 @@ int i915_irq_wait(struct drm_device *dev, void *data,</div><div class='ctx'> 	return i915_wait_irq(dev, irqwait-&gt;irq_seq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void i915_enable_interrupt (struct drm_device *dev)</div><div class='add'>+int i915_enable_vblank(struct drm_device *dev, int plane)</div><div class='ctx'> {</div><div class='ctx'> 	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev-&gt;dev_private;</div><div class='del'>-	u16 flag;</div><div class='add'>+	int pipe = i915_get_pipe(dev, plane);</div><div class='add'>+	u32	pipestat_reg = 0;</div><div class='add'>+	u32	pipestat;</div><div class='add'>+</div><div class='add'>+	switch (pipe) {</div><div class='add'>+	case 0:</div><div class='add'>+		pipestat_reg = PIPEASTAT;</div><div class='add'>+		i915_enable_irq(dev_priv, I915_DISPLAY_PIPE_A_EVENT_INTERRUPT);</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		pipestat_reg = PIPEBSTAT;</div><div class='add'>+		i915_enable_irq(dev_priv, I915_DISPLAY_PIPE_B_EVENT_INTERRUPT);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		DRM_ERROR("tried to enable vblank on non-existent pipe %d\n",</div><div class='add'>+			  pipe);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pipestat_reg) {</div><div class='add'>+		pipestat = I915_READ(pipestat_reg);</div><div class='add'>+		if (IS_I965G(dev))</div><div class='add'>+			pipestat |= PIPE_START_VBLANK_INTERRUPT_ENABLE;</div><div class='add'>+		else</div><div class='add'>+			pipestat |= PIPE_VBLANK_INTERRUPT_ENABLE;</div><div class='add'>+		/* Clear any stale interrupt status */</div><div class='add'>+		pipestat |= (PIPE_START_VBLANK_INTERRUPT_STATUS |</div><div class='add'>+			     PIPE_VBLANK_INTERRUPT_STATUS);</div><div class='add'>+		I915_WRITE(pipestat_reg, pipestat);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	flag = 0;</div><div class='del'>-	if (dev_priv-&gt;vblank_pipe &amp; DRM_I915_VBLANK_PIPE_A)</div><div class='del'>-		flag |= VSYNC_PIPEA_FLAG;</div><div class='del'>-	if (dev_priv-&gt;vblank_pipe &amp; DRM_I915_VBLANK_PIPE_B)</div><div class='del'>-		flag |= VSYNC_PIPEB_FLAG;</div><div class='add'>+void i915_disable_vblank(struct drm_device *dev, int plane)</div><div class='add'>+{</div><div class='add'>+	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev-&gt;dev_private;</div><div class='add'>+	int pipe = i915_get_pipe(dev, plane);</div><div class='add'>+	u32	pipestat_reg = 0;</div><div class='add'>+	u32	pipestat;</div><div class='add'>+</div><div class='add'>+	switch (pipe) {</div><div class='add'>+	case 0:</div><div class='add'>+		pipestat_reg = PIPEASTAT;</div><div class='add'>+		i915_disable_irq(dev_priv, I915_DISPLAY_PIPE_A_EVENT_INTERRUPT);</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		pipestat_reg = PIPEBSTAT;</div><div class='add'>+		i915_disable_irq(dev_priv, I915_DISPLAY_PIPE_B_EVENT_INTERRUPT);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		DRM_ERROR("tried to disable vblank on non-existent pipe %d\n",</div><div class='add'>+			  pipe);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	I915_WRITE16(I915REG_INT_ENABLE_R, USER_INT_FLAG | flag);</div><div class='add'>+	if (pipestat_reg) {</div><div class='add'>+		pipestat = I915_READ(pipestat_reg);</div><div class='add'>+		pipestat &amp;= ~(PIPE_START_VBLANK_INTERRUPT_ENABLE |</div><div class='add'>+			      PIPE_VBLANK_INTERRUPT_ENABLE);</div><div class='add'>+		/* Clear any stale interrupt status */</div><div class='add'>+		pipestat |= (PIPE_START_VBLANK_INTERRUPT_STATUS |</div><div class='add'>+			     PIPE_VBLANK_INTERRUPT_STATUS);</div><div class='add'>+		I915_WRITE(pipestat_reg, pipestat);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Set the vblank monitor pipe</div><div class='hunk'>@@ -434,22 +654,12 @@ int i915_vblank_pipe_set(struct drm_device *dev, void *data,</div><div class='ctx'> 			 struct drm_file *file_priv)</div><div class='ctx'> {</div><div class='ctx'> 	drm_i915_private_t *dev_priv = dev-&gt;dev_private;</div><div class='del'>-	drm_i915_vblank_pipe_t *pipe = data;</div><div class='ctx'> </div><div class='ctx'> 	if (!dev_priv) {</div><div class='ctx'> 		DRM_ERROR("called with no initialization\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (pipe-&gt;pipe &amp; ~(DRM_I915_VBLANK_PIPE_A|DRM_I915_VBLANK_PIPE_B)) {</div><div class='del'>-		DRM_ERROR("called with invalid pipe 0x%x\n", pipe-&gt;pipe);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dev_priv-&gt;vblank_pipe = pipe-&gt;pipe;</div><div class='del'>-</div><div class='del'>-	i915_enable_interrupt (dev);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -458,19 +668,13 @@ int i915_vblank_pipe_get(struct drm_device *dev, void *data,</div><div class='ctx'> {</div><div class='ctx'> 	drm_i915_private_t *dev_priv = dev-&gt;dev_private;</div><div class='ctx'> 	drm_i915_vblank_pipe_t *pipe = data;</div><div class='del'>-	u16 flag;</div><div class='ctx'> </div><div class='ctx'> 	if (!dev_priv) {</div><div class='ctx'> 		DRM_ERROR("called with no initialization\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	flag = I915_READ(I915REG_INT_ENABLE_R);</div><div class='del'>-	pipe-&gt;pipe = 0;</div><div class='del'>-	if (flag &amp; VSYNC_PIPEA_FLAG)</div><div class='del'>-		pipe-&gt;pipe |= DRM_I915_VBLANK_PIPE_A;</div><div class='del'>-	if (flag &amp; VSYNC_PIPEB_FLAG)</div><div class='del'>-		pipe-&gt;pipe |= DRM_I915_VBLANK_PIPE_B;</div><div class='add'>+	pipe-&gt;pipe = DRM_I915_VBLANK_PIPE_A | DRM_I915_VBLANK_PIPE_B;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -484,11 +688,12 @@ int i915_vblank_swap(struct drm_device *dev, void *data,</div><div class='ctx'> 	drm_i915_private_t *dev_priv = dev-&gt;dev_private;</div><div class='ctx'> 	drm_i915_vblank_swap_t *swap = data;</div><div class='ctx'> 	drm_i915_vbl_swap_t *vbl_swap;</div><div class='del'>-	unsigned int pipe, seqtype, curseq;</div><div class='add'>+	unsigned int pipe, seqtype, curseq, plane;</div><div class='ctx'> 	unsigned long irqflags;</div><div class='ctx'> 	struct list_head *list;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	if (!dev_priv) {</div><div class='add'>+	if (!dev_priv || !dev_priv-&gt;sarea_priv) {</div><div class='ctx'> 		DRM_ERROR("%s called with no initialization\n", __func__);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -504,7 +709,8 @@ int i915_vblank_swap(struct drm_device *dev, void *data,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pipe = (swap-&gt;seqtype &amp; _DRM_VBLANK_SECONDARY) ? 1 : 0;</div><div class='add'>+	plane = (swap-&gt;seqtype &amp; _DRM_VBLANK_SECONDARY) ? 1 : 0;</div><div class='add'>+	pipe = i915_get_pipe(dev, plane);</div><div class='ctx'> </div><div class='ctx'> 	seqtype = swap-&gt;seqtype &amp; (_DRM_VBLANK_RELATIVE | _DRM_VBLANK_ABSOLUTE);</div><div class='ctx'> </div><div class='hunk'>@@ -523,7 +729,14 @@ int i915_vblank_swap(struct drm_device *dev, void *data,</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;dev-&gt;drw_lock, irqflags);</div><div class='ctx'> </div><div class='del'>-	curseq = atomic_read(pipe ? &amp;dev-&gt;vbl_received2 : &amp;dev-&gt;vbl_received);</div><div class='add'>+	/*</div><div class='add'>+	 * We take the ref here and put it when the swap actually completes</div><div class='add'>+	 * in the tasklet.</div><div class='add'>+	 */</div><div class='add'>+	ret = drm_vblank_get(dev, pipe);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	curseq = drm_vblank_count(dev, pipe);</div><div class='ctx'> </div><div class='ctx'> 	if (seqtype == _DRM_VBLANK_RELATIVE)</div><div class='ctx'> 		swap-&gt;sequence += curseq;</div><div class='hunk'>@@ -533,6 +746,7 @@ int i915_vblank_swap(struct drm_device *dev, void *data,</div><div class='ctx'> 			swap-&gt;sequence = curseq + 1;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			DRM_DEBUG("Missed target sequence\n");</div><div class='add'>+			drm_vblank_put(dev, pipe);</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -543,7 +757,7 @@ int i915_vblank_swap(struct drm_device *dev, void *data,</div><div class='ctx'> 		vbl_swap = list_entry(list, drm_i915_vbl_swap_t, head);</div><div class='ctx'> </div><div class='ctx'> 		if (vbl_swap-&gt;drw_id == swap-&gt;drawable &amp;&amp;</div><div class='del'>-		    vbl_swap-&gt;pipe == pipe &amp;&amp;</div><div class='add'>+		    vbl_swap-&gt;plane == plane &amp;&amp;</div><div class='ctx'> 		    vbl_swap-&gt;sequence == swap-&gt;sequence) {</div><div class='ctx'> 			spin_unlock_irqrestore(&amp;dev_priv-&gt;swaps_lock, irqflags);</div><div class='ctx'> 			DRM_DEBUG("Already scheduled\n");</div><div class='hunk'>@@ -555,6 +769,7 @@ int i915_vblank_swap(struct drm_device *dev, void *data,</div><div class='ctx'> </div><div class='ctx'> 	if (dev_priv-&gt;swaps_pending &gt;= 100) {</div><div class='ctx'> 		DRM_DEBUG("Too many swaps queued\n");</div><div class='add'>+		drm_vblank_put(dev, pipe);</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -562,13 +777,14 @@ int i915_vblank_swap(struct drm_device *dev, void *data,</div><div class='ctx'> </div><div class='ctx'> 	if (!vbl_swap) {</div><div class='ctx'> 		DRM_ERROR("Failed to allocate memory to queue swap\n");</div><div class='add'>+		drm_vblank_put(dev, pipe);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	DRM_DEBUG("\n");</div><div class='ctx'> </div><div class='ctx'> 	vbl_swap-&gt;drw_id = swap-&gt;drawable;</div><div class='del'>-	vbl_swap-&gt;pipe = pipe;</div><div class='add'>+	vbl_swap-&gt;plane = plane;</div><div class='ctx'> 	vbl_swap-&gt;sequence = swap-&gt;sequence;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;dev_priv-&gt;swaps_lock, irqflags);</div><div class='hunk'>@@ -587,37 +803,63 @@ void i915_driver_irq_preinstall(struct drm_device * dev)</div><div class='ctx'> {</div><div class='ctx'> 	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev-&gt;dev_private;</div><div class='ctx'> </div><div class='del'>-	I915_WRITE16(I915REG_HWSTAM, 0xfffe);</div><div class='del'>-	I915_WRITE16(I915REG_INT_MASK_R, 0x0);</div><div class='del'>-	I915_WRITE16(I915REG_INT_ENABLE_R, 0x0);</div><div class='add'>+	I915_WRITE(HWSTAM, 0xeffe);</div><div class='add'>+	I915_WRITE(IMR, 0xffffffff);</div><div class='add'>+	I915_WRITE(IER, 0x0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void i915_driver_irq_postinstall(struct drm_device * dev)</div><div class='add'>+int i915_driver_irq_postinstall(struct drm_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev-&gt;dev_private;</div><div class='add'>+	int ret, num_pipes = 2;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;dev_priv-&gt;swaps_lock);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;dev_priv-&gt;vbl_swaps.head);</div><div class='ctx'> 	dev_priv-&gt;swaps_pending = 0;</div><div class='ctx'> </div><div class='del'>-	if (!dev_priv-&gt;vblank_pipe)</div><div class='del'>-		dev_priv-&gt;vblank_pipe = DRM_I915_VBLANK_PIPE_A;</div><div class='del'>-	i915_enable_interrupt(dev);</div><div class='add'>+	/* Set initial unmasked IRQs to just the selected vblank pipes. */</div><div class='add'>+	dev_priv-&gt;irq_mask_reg = ~0;</div><div class='add'>+</div><div class='add'>+	ret = drm_vblank_init(dev, num_pipes);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	dev_priv-&gt;vblank_pipe = DRM_I915_VBLANK_PIPE_A | DRM_I915_VBLANK_PIPE_B;</div><div class='add'>+	dev_priv-&gt;irq_mask_reg &amp;= ~I915_DISPLAY_PIPE_A_VBLANK_INTERRUPT;</div><div class='add'>+	dev_priv-&gt;irq_mask_reg &amp;= ~I915_DISPLAY_PIPE_B_VBLANK_INTERRUPT;</div><div class='add'>+</div><div class='add'>+	dev-&gt;max_vblank_count = 0xffffff; /* only 24 bits of frame count */</div><div class='add'>+</div><div class='add'>+	dev_priv-&gt;irq_mask_reg &amp;= I915_INTERRUPT_ENABLE_MASK;</div><div class='add'>+</div><div class='add'>+	I915_WRITE(IMR, dev_priv-&gt;irq_mask_reg);</div><div class='add'>+	I915_WRITE(IER, I915_INTERRUPT_ENABLE_MASK);</div><div class='add'>+	(void) I915_READ(IER);</div><div class='add'>+</div><div class='add'>+	opregion_enable_asle(dev);</div><div class='ctx'> 	DRM_INIT_WAITQUEUE(&amp;dev_priv-&gt;irq_queue);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void i915_driver_irq_uninstall(struct drm_device * dev)</div><div class='ctx'> {</div><div class='ctx'> 	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev-&gt;dev_private;</div><div class='del'>-	u16 temp;</div><div class='add'>+	u32 temp;</div><div class='ctx'> </div><div class='ctx'> 	if (!dev_priv)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	I915_WRITE16(I915REG_HWSTAM, 0xffff);</div><div class='del'>-	I915_WRITE16(I915REG_INT_MASK_R, 0xffff);</div><div class='del'>-	I915_WRITE16(I915REG_INT_ENABLE_R, 0x0);</div><div class='add'>+	dev_priv-&gt;vblank_pipe = 0;</div><div class='add'>+</div><div class='add'>+	I915_WRITE(HWSTAM, 0xffffffff);</div><div class='add'>+	I915_WRITE(IMR, 0xffffffff);</div><div class='add'>+	I915_WRITE(IER, 0x0);</div><div class='ctx'> </div><div class='del'>-	temp = I915_READ16(I915REG_INT_IDENTITY_R);</div><div class='del'>-	I915_WRITE16(I915REG_INT_IDENTITY_R, temp);</div><div class='add'>+	temp = I915_READ(PIPEASTAT);</div><div class='add'>+	I915_WRITE(PIPEASTAT, temp);</div><div class='add'>+	temp = I915_READ(PIPEBSTAT);</div><div class='add'>+	I915_WRITE(PIPEBSTAT, temp);</div><div class='add'>+	temp = I915_READ(IIR);</div><div class='add'>+	I915_WRITE(IIR, temp);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/gpu/drm/i915/i915_opregion.c b/drivers/gpu/drm/i915/i915_opregion.c<br/>new file mode 100644<br/>index 000000000000..1787a0c7e3ab<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpu/drm/i915/i915_opregion.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/i915/i915_opregion.c</a></div><div class='hunk'>@@ -0,0 +1,371 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2008 Intel Corporation &lt;hong.liu@intel.com&gt;</div><div class='add'>+ * Copyright 2008 Red Hat &lt;mjg@redhat.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * Permission is hereby granted, free of charge, to any person obtaining</div><div class='add'>+ * a copy of this software and associated documentation files (the</div><div class='add'>+ * "Software"), to deal in the Software without restriction, including</div><div class='add'>+ * without limitation the rights to use, copy, modify, merge, publish,</div><div class='add'>+ * distribute, sub license, and/or sell copies of the Software, and to</div><div class='add'>+ * permit persons to whom the Software is furnished to do so, subject to</div><div class='add'>+ * the following conditions:</div><div class='add'>+ *</div><div class='add'>+ * The above copyright notice and this permission notice (including the</div><div class='add'>+ * next paragraph) shall be included in all copies or substantial</div><div class='add'>+ * portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ * NON-INFRINGEMENT.  IN NO EVENT SHALL INTEL AND/OR ITS SUPPLIERS BE</div><div class='add'>+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='add'>+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='add'>+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='add'>+ * SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/acpi.h&gt;</div><div class='add'>+</div><div class='add'>+#include "drmP.h"</div><div class='add'>+#include "i915_drm.h"</div><div class='add'>+#include "i915_drv.h"</div><div class='add'>+</div><div class='add'>+#define PCI_ASLE 0xe4</div><div class='add'>+#define PCI_LBPC 0xf4</div><div class='add'>+#define PCI_ASLS 0xfc</div><div class='add'>+</div><div class='add'>+#define OPREGION_SZ            (8*1024)</div><div class='add'>+#define OPREGION_HEADER_OFFSET 0</div><div class='add'>+#define OPREGION_ACPI_OFFSET   0x100</div><div class='add'>+#define OPREGION_SWSCI_OFFSET  0x200</div><div class='add'>+#define OPREGION_ASLE_OFFSET   0x300</div><div class='add'>+#define OPREGION_VBT_OFFSET    0x1000</div><div class='add'>+</div><div class='add'>+#define OPREGION_SIGNATURE "IntelGraphicsMem"</div><div class='add'>+#define MBOX_ACPI      (1&lt;&lt;0)</div><div class='add'>+#define MBOX_SWSCI     (1&lt;&lt;1)</div><div class='add'>+#define MBOX_ASLE      (1&lt;&lt;2)</div><div class='add'>+</div><div class='add'>+struct opregion_header {</div><div class='add'>+       u8 signature[16];</div><div class='add'>+       u32 size;</div><div class='add'>+       u32 opregion_ver;</div><div class='add'>+       u8 bios_ver[32];</div><div class='add'>+       u8 vbios_ver[16];</div><div class='add'>+       u8 driver_ver[16];</div><div class='add'>+       u32 mboxes;</div><div class='add'>+       u8 reserved[164];</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+/* OpRegion mailbox #1: public ACPI methods */</div><div class='add'>+struct opregion_acpi {</div><div class='add'>+       u32 drdy;       /* driver readiness */</div><div class='add'>+       u32 csts;       /* notification status */</div><div class='add'>+       u32 cevt;       /* current event */</div><div class='add'>+       u8 rsvd1[20];</div><div class='add'>+       u32 didl[8];    /* supported display devices ID list */</div><div class='add'>+       u32 cpdl[8];    /* currently presented display list */</div><div class='add'>+       u32 cadl[8];    /* currently active display list */</div><div class='add'>+       u32 nadl[8];    /* next active devices list */</div><div class='add'>+       u32 aslp;       /* ASL sleep time-out */</div><div class='add'>+       u32 tidx;       /* toggle table index */</div><div class='add'>+       u32 chpd;       /* current hotplug enable indicator */</div><div class='add'>+       u32 clid;       /* current lid state*/</div><div class='add'>+       u32 cdck;       /* current docking state */</div><div class='add'>+       u32 sxsw;       /* Sx state resume */</div><div class='add'>+       u32 evts;       /* ASL supported events */</div><div class='add'>+       u32 cnot;       /* current OS notification */</div><div class='add'>+       u32 nrdy;       /* driver status */</div><div class='add'>+       u8 rsvd2[60];</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+/* OpRegion mailbox #2: SWSCI */</div><div class='add'>+struct opregion_swsci {</div><div class='add'>+       u32 scic;       /* SWSCI command|status|data */</div><div class='add'>+       u32 parm;       /* command parameters */</div><div class='add'>+       u32 dslp;       /* driver sleep time-out */</div><div class='add'>+       u8 rsvd[244];</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+/* OpRegion mailbox #3: ASLE */</div><div class='add'>+struct opregion_asle {</div><div class='add'>+       u32 ardy;       /* driver readiness */</div><div class='add'>+       u32 aslc;       /* ASLE interrupt command */</div><div class='add'>+       u32 tche;       /* technology enabled indicator */</div><div class='add'>+       u32 alsi;       /* current ALS illuminance reading */</div><div class='add'>+       u32 bclp;       /* backlight brightness to set */</div><div class='add'>+       u32 pfit;       /* panel fitting state */</div><div class='add'>+       u32 cblv;       /* current brightness level */</div><div class='add'>+       u16 bclm[20];   /* backlight level duty cycle mapping table */</div><div class='add'>+       u32 cpfm;       /* current panel fitting mode */</div><div class='add'>+       u32 epfm;       /* enabled panel fitting modes */</div><div class='add'>+       u8 plut[74];    /* panel LUT and identifier */</div><div class='add'>+       u32 pfmb;       /* PWM freq and min brightness */</div><div class='add'>+       u8 rsvd[102];</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+/* ASLE irq request bits */</div><div class='add'>+#define ASLE_SET_ALS_ILLUM     (1 &lt;&lt; 0)</div><div class='add'>+#define ASLE_SET_BACKLIGHT     (1 &lt;&lt; 1)</div><div class='add'>+#define ASLE_SET_PFIT          (1 &lt;&lt; 2)</div><div class='add'>+#define ASLE_SET_PWM_FREQ      (1 &lt;&lt; 3)</div><div class='add'>+#define ASLE_REQ_MSK           0xf</div><div class='add'>+</div><div class='add'>+/* response bits of ASLE irq request */</div><div class='add'>+#define ASLE_ALS_ILLUM_FAIL    (2&lt;&lt;10)</div><div class='add'>+#define ASLE_BACKLIGHT_FAIL    (2&lt;&lt;12)</div><div class='add'>+#define ASLE_PFIT_FAIL         (2&lt;&lt;14)</div><div class='add'>+#define ASLE_PWM_FREQ_FAIL     (2&lt;&lt;16)</div><div class='add'>+</div><div class='add'>+/* ASLE backlight brightness to set */</div><div class='add'>+#define ASLE_BCLP_VALID                (1&lt;&lt;31)</div><div class='add'>+#define ASLE_BCLP_MSK          (~(1&lt;&lt;31))</div><div class='add'>+</div><div class='add'>+/* ASLE panel fitting request */</div><div class='add'>+#define ASLE_PFIT_VALID         (1&lt;&lt;31)</div><div class='add'>+#define ASLE_PFIT_CENTER (1&lt;&lt;0)</div><div class='add'>+#define ASLE_PFIT_STRETCH_TEXT (1&lt;&lt;1)</div><div class='add'>+#define ASLE_PFIT_STRETCH_GFX (1&lt;&lt;2)</div><div class='add'>+</div><div class='add'>+/* PWM frequency and minimum brightness */</div><div class='add'>+#define ASLE_PFMB_BRIGHTNESS_MASK (0xff)</div><div class='add'>+#define ASLE_PFMB_BRIGHTNESS_VALID (1&lt;&lt;8)</div><div class='add'>+#define ASLE_PFMB_PWM_MASK (0x7ffffe00)</div><div class='add'>+#define ASLE_PFMB_PWM_VALID (1&lt;&lt;31)</div><div class='add'>+</div><div class='add'>+#define ASLE_CBLV_VALID         (1&lt;&lt;31)</div><div class='add'>+</div><div class='add'>+static u32 asle_set_backlight(struct drm_device *dev, u32 bclp)</div><div class='add'>+{</div><div class='add'>+	struct drm_i915_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct opregion_asle *asle = dev_priv-&gt;opregion.asle;</div><div class='add'>+	u32 blc_pwm_ctl, blc_pwm_ctl2;</div><div class='add'>+</div><div class='add'>+	if (!(bclp &amp; ASLE_BCLP_VALID))</div><div class='add'>+		return ASLE_BACKLIGHT_FAIL;</div><div class='add'>+</div><div class='add'>+	bclp &amp;= ASLE_BCLP_MSK;</div><div class='add'>+	if (bclp &lt; 0 || bclp &gt; 255)</div><div class='add'>+		return ASLE_BACKLIGHT_FAIL;</div><div class='add'>+</div><div class='add'>+	blc_pwm_ctl = I915_READ(BLC_PWM_CTL);</div><div class='add'>+	blc_pwm_ctl &amp;= ~BACKLIGHT_DUTY_CYCLE_MASK;</div><div class='add'>+	blc_pwm_ctl2 = I915_READ(BLC_PWM_CTL2);</div><div class='add'>+</div><div class='add'>+	if (blc_pwm_ctl2 &amp; BLM_COMBINATION_MODE)</div><div class='add'>+		pci_write_config_dword(dev-&gt;pdev, PCI_LBPC, bclp);</div><div class='add'>+	else</div><div class='add'>+		I915_WRITE(BLC_PWM_CTL, blc_pwm_ctl | ((bclp * 0x101)-1));</div><div class='add'>+</div><div class='add'>+	asle-&gt;cblv = (bclp*0x64)/0xff | ASLE_CBLV_VALID;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 asle_set_als_illum(struct drm_device *dev, u32 alsi)</div><div class='add'>+{</div><div class='add'>+	/* alsi is the current ALS reading in lux. 0 indicates below sensor</div><div class='add'>+	   range, 0xffff indicates above sensor range. 1-0xfffe are valid */</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 asle_set_pwm_freq(struct drm_device *dev, u32 pfmb)</div><div class='add'>+{</div><div class='add'>+	struct drm_i915_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	if (pfmb &amp; ASLE_PFMB_PWM_VALID) {</div><div class='add'>+		u32 blc_pwm_ctl = I915_READ(BLC_PWM_CTL);</div><div class='add'>+		u32 pwm = pfmb &amp; ASLE_PFMB_PWM_MASK;</div><div class='add'>+		blc_pwm_ctl &amp;= BACKLIGHT_DUTY_CYCLE_MASK;</div><div class='add'>+		pwm = pwm &gt;&gt; 9;</div><div class='add'>+		/* FIXME - what do we do with the PWM? */</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 asle_set_pfit(struct drm_device *dev, u32 pfit)</div><div class='add'>+{</div><div class='add'>+	/* Panel fitting is currently controlled by the X code, so this is a</div><div class='add'>+	   noop until modesetting support works fully */</div><div class='add'>+	if (!(pfit &amp; ASLE_PFIT_VALID))</div><div class='add'>+		return ASLE_PFIT_FAIL;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void opregion_asle_intr(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_i915_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct opregion_asle *asle = dev_priv-&gt;opregion.asle;</div><div class='add'>+	u32 asle_stat = 0;</div><div class='add'>+	u32 asle_req;</div><div class='add'>+</div><div class='add'>+	if (!asle)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	asle_req = asle-&gt;aslc &amp; ASLE_REQ_MSK;</div><div class='add'>+</div><div class='add'>+	if (!asle_req) {</div><div class='add'>+		DRM_DEBUG("non asle set request??\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (asle_req &amp; ASLE_SET_ALS_ILLUM)</div><div class='add'>+		asle_stat |= asle_set_als_illum(dev, asle-&gt;alsi);</div><div class='add'>+</div><div class='add'>+	if (asle_req &amp; ASLE_SET_BACKLIGHT)</div><div class='add'>+		asle_stat |= asle_set_backlight(dev, asle-&gt;bclp);</div><div class='add'>+</div><div class='add'>+	if (asle_req &amp; ASLE_SET_PFIT)</div><div class='add'>+		asle_stat |= asle_set_pfit(dev, asle-&gt;pfit);</div><div class='add'>+</div><div class='add'>+	if (asle_req &amp; ASLE_SET_PWM_FREQ)</div><div class='add'>+		asle_stat |= asle_set_pwm_freq(dev, asle-&gt;pfmb);</div><div class='add'>+</div><div class='add'>+	asle-&gt;aslc = asle_stat;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define ASLE_ALS_EN    (1&lt;&lt;0)</div><div class='add'>+#define ASLE_BLC_EN    (1&lt;&lt;1)</div><div class='add'>+#define ASLE_PFIT_EN   (1&lt;&lt;2)</div><div class='add'>+#define ASLE_PFMB_EN   (1&lt;&lt;3)</div><div class='add'>+</div><div class='add'>+void opregion_enable_asle(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_i915_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct opregion_asle *asle = dev_priv-&gt;opregion.asle;</div><div class='add'>+</div><div class='add'>+	if (asle) {</div><div class='add'>+		u32 pipeb_stats = I915_READ(PIPEBSTAT);</div><div class='add'>+		if (IS_MOBILE(dev)) {</div><div class='add'>+			/* Many devices trigger events with a write to the</div><div class='add'>+			   legacy backlight controller, so we need to ensure</div><div class='add'>+			   that it's able to generate interrupts */</div><div class='add'>+			I915_WRITE(PIPEBSTAT, pipeb_stats |=</div><div class='add'>+				   I915_LEGACY_BLC_EVENT_ENABLE);</div><div class='add'>+			i915_enable_irq(dev_priv, I915_ASLE_INTERRUPT |</div><div class='add'>+					I915_DISPLAY_PIPE_B_EVENT_INTERRUPT);</div><div class='add'>+		} else</div><div class='add'>+			i915_enable_irq(dev_priv, I915_ASLE_INTERRUPT);</div><div class='add'>+</div><div class='add'>+		asle-&gt;tche = ASLE_ALS_EN | ASLE_BLC_EN | ASLE_PFIT_EN |</div><div class='add'>+			ASLE_PFMB_EN;</div><div class='add'>+		asle-&gt;ardy = 1;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define ACPI_EV_DISPLAY_SWITCH (1&lt;&lt;0)</div><div class='add'>+#define ACPI_EV_LID            (1&lt;&lt;1)</div><div class='add'>+#define ACPI_EV_DOCK           (1&lt;&lt;2)</div><div class='add'>+</div><div class='add'>+static struct intel_opregion *system_opregion;</div><div class='add'>+</div><div class='add'>+int intel_opregion_video_event(struct notifier_block *nb, unsigned long val,</div><div class='add'>+			       void *data)</div><div class='add'>+{</div><div class='add'>+	/* The only video events relevant to opregion are 0x80. These indicate</div><div class='add'>+	   either a docking event, lid switch or display switch request. In</div><div class='add'>+	   Linux, these are handled by the dock, button and video drivers.</div><div class='add'>+	   We might want to fix the video driver to be opregion-aware in</div><div class='add'>+	   future, but right now we just indicate to the firmware that the</div><div class='add'>+	   request has been handled */</div><div class='add'>+</div><div class='add'>+	struct opregion_acpi *acpi;</div><div class='add'>+</div><div class='add'>+	if (!system_opregion)</div><div class='add'>+		return NOTIFY_DONE;</div><div class='add'>+</div><div class='add'>+	acpi = system_opregion-&gt;acpi;</div><div class='add'>+	acpi-&gt;csts = 0;</div><div class='add'>+</div><div class='add'>+	return NOTIFY_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct notifier_block intel_opregion_notifier = {</div><div class='add'>+	.notifier_call = intel_opregion_video_event,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int intel_opregion_init(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_i915_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct intel_opregion *opregion = &amp;dev_priv-&gt;opregion;</div><div class='add'>+	void *base;</div><div class='add'>+	u32 asls, mboxes;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	pci_read_config_dword(dev-&gt;pdev, PCI_ASLS, &amp;asls);</div><div class='add'>+	DRM_DEBUG("graphic opregion physical addr: 0x%x\n", asls);</div><div class='add'>+	if (asls == 0) {</div><div class='add'>+		DRM_DEBUG("ACPI OpRegion not supported!\n");</div><div class='add'>+		return -ENOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	base = ioremap(asls, OPREGION_SZ);</div><div class='add'>+	if (!base)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	opregion-&gt;header = base;</div><div class='add'>+	if (memcmp(opregion-&gt;header-&gt;signature, OPREGION_SIGNATURE, 16)) {</div><div class='add'>+		DRM_DEBUG("opregion signature mismatch\n");</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto err_out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mboxes = opregion-&gt;header-&gt;mboxes;</div><div class='add'>+	if (mboxes &amp; MBOX_ACPI) {</div><div class='add'>+		DRM_DEBUG("Public ACPI methods supported\n");</div><div class='add'>+		opregion-&gt;acpi = base + OPREGION_ACPI_OFFSET;</div><div class='add'>+	} else {</div><div class='add'>+		DRM_DEBUG("Public ACPI methods not supported\n");</div><div class='add'>+		err = -ENOTSUPP;</div><div class='add'>+		goto err_out;</div><div class='add'>+	}</div><div class='add'>+	opregion-&gt;enabled = 1;</div><div class='add'>+</div><div class='add'>+	if (mboxes &amp; MBOX_SWSCI) {</div><div class='add'>+		DRM_DEBUG("SWSCI supported\n");</div><div class='add'>+		opregion-&gt;swsci = base + OPREGION_SWSCI_OFFSET;</div><div class='add'>+	}</div><div class='add'>+	if (mboxes &amp; MBOX_ASLE) {</div><div class='add'>+		DRM_DEBUG("ASLE supported\n");</div><div class='add'>+		opregion-&gt;asle = base + OPREGION_ASLE_OFFSET;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Notify BIOS we are ready to handle ACPI video ext notifs.</div><div class='add'>+	 * Right now, all the events are handled by the ACPI video module.</div><div class='add'>+	 * We don't actually need to do anything with them. */</div><div class='add'>+	opregion-&gt;acpi-&gt;csts = 0;</div><div class='add'>+	opregion-&gt;acpi-&gt;drdy = 1;</div><div class='add'>+</div><div class='add'>+	system_opregion = opregion;</div><div class='add'>+	register_acpi_notifier(&amp;intel_opregion_notifier);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_out:</div><div class='add'>+	iounmap(opregion-&gt;header);</div><div class='add'>+	opregion-&gt;header = NULL;</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void intel_opregion_free(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_i915_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct intel_opregion *opregion = &amp;dev_priv-&gt;opregion;</div><div class='add'>+</div><div class='add'>+	if (!opregion-&gt;enabled)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	opregion-&gt;acpi-&gt;drdy = 0;</div><div class='add'>+</div><div class='add'>+	system_opregion = NULL;</div><div class='add'>+	unregister_acpi_notifier(&amp;intel_opregion_notifier);</div><div class='add'>+</div><div class='add'>+	/* just clear all opregion memory pointers now */</div><div class='add'>+	iounmap(opregion-&gt;header);</div><div class='add'>+	opregion-&gt;header = NULL;</div><div class='add'>+	opregion-&gt;acpi = NULL;</div><div class='add'>+	opregion-&gt;swsci = NULL;</div><div class='add'>+	opregion-&gt;asle = NULL;</div><div class='add'>+</div><div class='add'>+	opregion-&gt;enabled = 0;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h<br/>new file mode 100644<br/>index 000000000000..5c2d9f206d05<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpu/drm/i915/i915_reg.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/i915/i915_reg.h</a></div><div class='hunk'>@@ -0,0 +1,1417 @@</div><div class='add'>+/* Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.</div><div class='add'>+ * All Rights Reserved.</div><div class='add'>+ *</div><div class='add'>+ * Permission is hereby granted, free of charge, to any person obtaining a</div><div class='add'>+ * copy of this software and associated documentation files (the</div><div class='add'>+ * "Software"), to deal in the Software without restriction, including</div><div class='add'>+ * without limitation the rights to use, copy, modify, merge, publish,</div><div class='add'>+ * distribute, sub license, and/or sell copies of the Software, and to</div><div class='add'>+ * permit persons to whom the Software is furnished to do so, subject to</div><div class='add'>+ * the following conditions:</div><div class='add'>+ *</div><div class='add'>+ * The above copyright notice and this permission notice (including the</div><div class='add'>+ * next paragraph) shall be included in all copies or substantial portions</div><div class='add'>+ * of the Software.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS</div><div class='add'>+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.</div><div class='add'>+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR</div><div class='add'>+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,</div><div class='add'>+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE</div><div class='add'>+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _I915_REG_H_</div><div class='add'>+#define _I915_REG_H_</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The Bridge device's PCI config space has information about the</div><div class='add'>+ * fb aperture size and the amount of pre-reserved memory.</div><div class='add'>+ */</div><div class='add'>+#define INTEL_GMCH_CTRL		0x52</div><div class='add'>+#define INTEL_GMCH_ENABLED	0x4</div><div class='add'>+#define INTEL_GMCH_MEM_MASK	0x1</div><div class='add'>+#define INTEL_GMCH_MEM_64M	0x1</div><div class='add'>+#define INTEL_GMCH_MEM_128M	0</div><div class='add'>+</div><div class='add'>+#define INTEL_855_GMCH_GMS_MASK		(0x7 &lt;&lt; 4)</div><div class='add'>+#define INTEL_855_GMCH_GMS_DISABLED	(0x0 &lt;&lt; 4)</div><div class='add'>+#define INTEL_855_GMCH_GMS_STOLEN_1M	(0x1 &lt;&lt; 4)</div><div class='add'>+#define INTEL_855_GMCH_GMS_STOLEN_4M	(0x2 &lt;&lt; 4)</div><div class='add'>+#define INTEL_855_GMCH_GMS_STOLEN_8M	(0x3 &lt;&lt; 4)</div><div class='add'>+#define INTEL_855_GMCH_GMS_STOLEN_16M	(0x4 &lt;&lt; 4)</div><div class='add'>+#define INTEL_855_GMCH_GMS_STOLEN_32M	(0x5 &lt;&lt; 4)</div><div class='add'>+</div><div class='add'>+#define INTEL_915G_GMCH_GMS_STOLEN_48M	(0x6 &lt;&lt; 4)</div><div class='add'>+#define INTEL_915G_GMCH_GMS_STOLEN_64M	(0x7 &lt;&lt; 4)</div><div class='add'>+</div><div class='add'>+/* PCI config space */</div><div class='add'>+</div><div class='add'>+#define HPLLCC	0xc0 /* 855 only */</div><div class='add'>+#define   GC_CLOCK_CONTROL_MASK		(3 &lt;&lt; 0)</div><div class='add'>+#define   GC_CLOCK_133_200		(0 &lt;&lt; 0)</div><div class='add'>+#define   GC_CLOCK_100_200		(1 &lt;&lt; 0)</div><div class='add'>+#define   GC_CLOCK_100_133		(2 &lt;&lt; 0)</div><div class='add'>+#define   GC_CLOCK_166_250		(3 &lt;&lt; 0)</div><div class='add'>+#define GCFGC	0xf0 /* 915+ only */</div><div class='add'>+#define   GC_LOW_FREQUENCY_ENABLE	(1 &lt;&lt; 7)</div><div class='add'>+#define   GC_DISPLAY_CLOCK_190_200_MHZ	(0 &lt;&lt; 4)</div><div class='add'>+#define   GC_DISPLAY_CLOCK_333_MHZ	(4 &lt;&lt; 4)</div><div class='add'>+#define   GC_DISPLAY_CLOCK_MASK		(7 &lt;&lt; 4)</div><div class='add'>+#define LBB	0xf4</div><div class='add'>+</div><div class='add'>+/* VGA stuff */</div><div class='add'>+</div><div class='add'>+#define VGA_ST01_MDA 0x3ba</div><div class='add'>+#define VGA_ST01_CGA 0x3da</div><div class='add'>+</div><div class='add'>+#define VGA_MSR_WRITE 0x3c2</div><div class='add'>+#define VGA_MSR_READ 0x3cc</div><div class='add'>+#define   VGA_MSR_MEM_EN (1&lt;&lt;1)</div><div class='add'>+#define   VGA_MSR_CGA_MODE (1&lt;&lt;0)</div><div class='add'>+</div><div class='add'>+#define VGA_SR_INDEX 0x3c4</div><div class='add'>+#define VGA_SR_DATA 0x3c5</div><div class='add'>+</div><div class='add'>+#define VGA_AR_INDEX 0x3c0</div><div class='add'>+#define   VGA_AR_VID_EN (1&lt;&lt;5)</div><div class='add'>+#define VGA_AR_DATA_WRITE 0x3c0</div><div class='add'>+#define VGA_AR_DATA_READ 0x3c1</div><div class='add'>+</div><div class='add'>+#define VGA_GR_INDEX 0x3ce</div><div class='add'>+#define VGA_GR_DATA 0x3cf</div><div class='add'>+/* GR05 */</div><div class='add'>+#define   VGA_GR_MEM_READ_MODE_SHIFT 3</div><div class='add'>+#define     VGA_GR_MEM_READ_MODE_PLANE 1</div><div class='add'>+/* GR06 */</div><div class='add'>+#define   VGA_GR_MEM_MODE_MASK 0xc</div><div class='add'>+#define   VGA_GR_MEM_MODE_SHIFT 2</div><div class='add'>+#define   VGA_GR_MEM_A0000_AFFFF 0</div><div class='add'>+#define   VGA_GR_MEM_A0000_BFFFF 1</div><div class='add'>+#define   VGA_GR_MEM_B0000_B7FFF 2</div><div class='add'>+#define   VGA_GR_MEM_B0000_BFFFF 3</div><div class='add'>+</div><div class='add'>+#define VGA_DACMASK 0x3c6</div><div class='add'>+#define VGA_DACRX 0x3c7</div><div class='add'>+#define VGA_DACWX 0x3c8</div><div class='add'>+#define VGA_DACDATA 0x3c9</div><div class='add'>+</div><div class='add'>+#define VGA_CR_INDEX_MDA 0x3b4</div><div class='add'>+#define VGA_CR_DATA_MDA 0x3b5</div><div class='add'>+#define VGA_CR_INDEX_CGA 0x3d4</div><div class='add'>+#define VGA_CR_DATA_CGA 0x3d5</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Memory interface instructions used by the kernel</div><div class='add'>+ */</div><div class='add'>+#define MI_INSTR(opcode, flags) (((opcode) &lt;&lt; 23) | (flags))</div><div class='add'>+</div><div class='add'>+#define MI_NOOP			MI_INSTR(0, 0)</div><div class='add'>+#define MI_USER_INTERRUPT	MI_INSTR(0x02, 0)</div><div class='add'>+#define MI_WAIT_FOR_EVENT       MI_INSTR(0x03, 0)</div><div class='add'>+#define   MI_WAIT_FOR_PLANE_B_FLIP      (1&lt;&lt;6)</div><div class='add'>+#define   MI_WAIT_FOR_PLANE_A_FLIP      (1&lt;&lt;2)</div><div class='add'>+#define   MI_WAIT_FOR_PLANE_A_SCANLINES (1&lt;&lt;1)</div><div class='add'>+#define MI_FLUSH		MI_INSTR(0x04, 0)</div><div class='add'>+#define   MI_READ_FLUSH		(1 &lt;&lt; 0)</div><div class='add'>+#define   MI_EXE_FLUSH		(1 &lt;&lt; 1)</div><div class='add'>+#define   MI_NO_WRITE_FLUSH	(1 &lt;&lt; 2)</div><div class='add'>+#define   MI_SCENE_COUNT	(1 &lt;&lt; 3) /* just increment scene count */</div><div class='add'>+#define   MI_END_SCENE		(1 &lt;&lt; 4) /* flush binner and incr scene count */</div><div class='add'>+#define MI_BATCH_BUFFER_END	MI_INSTR(0x0a, 0)</div><div class='add'>+#define MI_REPORT_HEAD		MI_INSTR(0x07, 0)</div><div class='add'>+#define MI_LOAD_SCAN_LINES_INCL MI_INSTR(0x12, 0)</div><div class='add'>+#define MI_STORE_DWORD_IMM	MI_INSTR(0x20, 1)</div><div class='add'>+#define   MI_MEM_VIRTUAL	(1 &lt;&lt; 22) /* 965+ only */</div><div class='add'>+#define MI_STORE_DWORD_INDEX	MI_INSTR(0x21, 1)</div><div class='add'>+#define   MI_STORE_DWORD_INDEX_SHIFT 2</div><div class='add'>+#define MI_LOAD_REGISTER_IMM	MI_INSTR(0x22, 1)</div><div class='add'>+#define MI_BATCH_BUFFER		MI_INSTR(0x30, 1)</div><div class='add'>+#define   MI_BATCH_NON_SECURE	(1)</div><div class='add'>+#define   MI_BATCH_NON_SECURE_I965 (1&lt;&lt;8)</div><div class='add'>+#define MI_BATCH_BUFFER_START	MI_INSTR(0x31, 0)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * 3D instructions used by the kernel</div><div class='add'>+ */</div><div class='add'>+#define GFX_INSTR(opcode, flags) ((0x3 &lt;&lt; 29) | ((opcode) &lt;&lt; 24) | (flags))</div><div class='add'>+</div><div class='add'>+#define GFX_OP_RASTER_RULES    ((0x3&lt;&lt;29)|(0x7&lt;&lt;24))</div><div class='add'>+#define GFX_OP_SCISSOR         ((0x3&lt;&lt;29)|(0x1c&lt;&lt;24)|(0x10&lt;&lt;19))</div><div class='add'>+#define   SC_UPDATE_SCISSOR       (0x1&lt;&lt;1)</div><div class='add'>+#define   SC_ENABLE_MASK          (0x1&lt;&lt;0)</div><div class='add'>+#define   SC_ENABLE               (0x1&lt;&lt;0)</div><div class='add'>+#define GFX_OP_LOAD_INDIRECT   ((0x3&lt;&lt;29)|(0x1d&lt;&lt;24)|(0x7&lt;&lt;16))</div><div class='add'>+#define GFX_OP_SCISSOR_INFO    ((0x3&lt;&lt;29)|(0x1d&lt;&lt;24)|(0x81&lt;&lt;16)|(0x1))</div><div class='add'>+#define   SCI_YMIN_MASK      (0xffff&lt;&lt;16)</div><div class='add'>+#define   SCI_XMIN_MASK      (0xffff&lt;&lt;0)</div><div class='add'>+#define   SCI_YMAX_MASK      (0xffff&lt;&lt;16)</div><div class='add'>+#define   SCI_XMAX_MASK      (0xffff&lt;&lt;0)</div><div class='add'>+#define GFX_OP_SCISSOR_ENABLE	 ((0x3&lt;&lt;29)|(0x1c&lt;&lt;24)|(0x10&lt;&lt;19))</div><div class='add'>+#define GFX_OP_SCISSOR_RECT	 ((0x3&lt;&lt;29)|(0x1d&lt;&lt;24)|(0x81&lt;&lt;16)|1)</div><div class='add'>+#define GFX_OP_COLOR_FACTOR      ((0x3&lt;&lt;29)|(0x1d&lt;&lt;24)|(0x1&lt;&lt;16)|0x0)</div><div class='add'>+#define GFX_OP_STIPPLE           ((0x3&lt;&lt;29)|(0x1d&lt;&lt;24)|(0x83&lt;&lt;16))</div><div class='add'>+#define GFX_OP_MAP_INFO          ((0x3&lt;&lt;29)|(0x1d&lt;&lt;24)|0x4)</div><div class='add'>+#define GFX_OP_DESTBUFFER_VARS   ((0x3&lt;&lt;29)|(0x1d&lt;&lt;24)|(0x85&lt;&lt;16)|0x0)</div><div class='add'>+#define GFX_OP_DESTBUFFER_INFO	 ((0x3&lt;&lt;29)|(0x1d&lt;&lt;24)|(0x8e&lt;&lt;16)|1)</div><div class='add'>+#define GFX_OP_DRAWRECT_INFO     ((0x3&lt;&lt;29)|(0x1d&lt;&lt;24)|(0x80&lt;&lt;16)|(0x3))</div><div class='add'>+#define GFX_OP_DRAWRECT_INFO_I965  ((0x7900&lt;&lt;16)|0x2)</div><div class='add'>+#define SRC_COPY_BLT_CMD                ((2&lt;&lt;29)|(0x43&lt;&lt;22)|4)</div><div class='add'>+#define XY_SRC_COPY_BLT_CMD		((2&lt;&lt;29)|(0x53&lt;&lt;22)|6)</div><div class='add'>+#define XY_MONO_SRC_COPY_IMM_BLT	((2&lt;&lt;29)|(0x71&lt;&lt;22)|5)</div><div class='add'>+#define XY_SRC_COPY_BLT_WRITE_ALPHA	(1&lt;&lt;21)</div><div class='add'>+#define XY_SRC_COPY_BLT_WRITE_RGB	(1&lt;&lt;20)</div><div class='add'>+#define   BLT_DEPTH_8			(0&lt;&lt;24)</div><div class='add'>+#define   BLT_DEPTH_16_565		(1&lt;&lt;24)</div><div class='add'>+#define   BLT_DEPTH_16_1555		(2&lt;&lt;24)</div><div class='add'>+#define   BLT_DEPTH_32			(3&lt;&lt;24)</div><div class='add'>+#define   BLT_ROP_GXCOPY		(0xcc&lt;&lt;16)</div><div class='add'>+#define XY_SRC_COPY_BLT_SRC_TILED	(1&lt;&lt;15) /* 965+ only */</div><div class='add'>+#define XY_SRC_COPY_BLT_DST_TILED	(1&lt;&lt;11) /* 965+ only */</div><div class='add'>+#define CMD_OP_DISPLAYBUFFER_INFO ((0x0&lt;&lt;29)|(0x14&lt;&lt;23)|2)</div><div class='add'>+#define   ASYNC_FLIP                (1&lt;&lt;22)</div><div class='add'>+#define   DISPLAY_PLANE_A           (0&lt;&lt;20)</div><div class='add'>+#define   DISPLAY_PLANE_B           (1&lt;&lt;20)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Instruction and interrupt control regs</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define PRB0_TAIL	0x02030</div><div class='add'>+#define PRB0_HEAD	0x02034</div><div class='add'>+#define PRB0_START	0x02038</div><div class='add'>+#define PRB0_CTL	0x0203c</div><div class='add'>+#define   TAIL_ADDR		0x001FFFF8</div><div class='add'>+#define   HEAD_WRAP_COUNT	0xFFE00000</div><div class='add'>+#define   HEAD_WRAP_ONE		0x00200000</div><div class='add'>+#define   HEAD_ADDR		0x001FFFFC</div><div class='add'>+#define   RING_NR_PAGES		0x001FF000</div><div class='add'>+#define   RING_REPORT_MASK	0x00000006</div><div class='add'>+#define   RING_REPORT_64K	0x00000002</div><div class='add'>+#define   RING_REPORT_128K	0x00000004</div><div class='add'>+#define   RING_NO_REPORT	0x00000000</div><div class='add'>+#define   RING_VALID_MASK	0x00000001</div><div class='add'>+#define   RING_VALID		0x00000001</div><div class='add'>+#define   RING_INVALID		0x00000000</div><div class='add'>+#define PRB1_TAIL	0x02040 /* 915+ only */</div><div class='add'>+#define PRB1_HEAD	0x02044 /* 915+ only */</div><div class='add'>+#define PRB1_START	0x02048 /* 915+ only */</div><div class='add'>+#define PRB1_CTL	0x0204c /* 915+ only */</div><div class='add'>+#define ACTHD_I965	0x02074</div><div class='add'>+#define HWS_PGA		0x02080</div><div class='add'>+#define HWS_ADDRESS_MASK	0xfffff000</div><div class='add'>+#define HWS_START_ADDRESS_SHIFT	4</div><div class='add'>+#define IPEIR		0x02088</div><div class='add'>+#define NOPID		0x02094</div><div class='add'>+#define HWSTAM		0x02098</div><div class='add'>+#define SCPD0		0x0209c /* 915+ only */</div><div class='add'>+#define IER		0x020a0</div><div class='add'>+#define IIR		0x020a4</div><div class='add'>+#define IMR		0x020a8</div><div class='add'>+#define ISR		0x020ac</div><div class='add'>+#define   I915_PIPE_CONTROL_NOTIFY_INTERRUPT		(1&lt;&lt;18)</div><div class='add'>+#define   I915_DISPLAY_PORT_INTERRUPT			(1&lt;&lt;17)</div><div class='add'>+#define   I915_RENDER_COMMAND_PARSER_ERROR_INTERRUPT	(1&lt;&lt;15)</div><div class='add'>+#define   I915_GMCH_THERMAL_SENSOR_EVENT_INTERRUPT	(1&lt;&lt;14)</div><div class='add'>+#define   I915_HWB_OOM_INTERRUPT			(1&lt;&lt;13)</div><div class='add'>+#define   I915_SYNC_STATUS_INTERRUPT			(1&lt;&lt;12)</div><div class='add'>+#define   I915_DISPLAY_PLANE_A_FLIP_PENDING_INTERRUPT	(1&lt;&lt;11)</div><div class='add'>+#define   I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT	(1&lt;&lt;10)</div><div class='add'>+#define   I915_OVERLAY_PLANE_FLIP_PENDING_INTERRUPT	(1&lt;&lt;9)</div><div class='add'>+#define   I915_DISPLAY_PLANE_C_FLIP_PENDING_INTERRUPT	(1&lt;&lt;8)</div><div class='add'>+#define   I915_DISPLAY_PIPE_A_VBLANK_INTERRUPT		(1&lt;&lt;7)</div><div class='add'>+#define   I915_DISPLAY_PIPE_A_EVENT_INTERRUPT		(1&lt;&lt;6)</div><div class='add'>+#define   I915_DISPLAY_PIPE_B_VBLANK_INTERRUPT		(1&lt;&lt;5)</div><div class='add'>+#define   I915_DISPLAY_PIPE_B_EVENT_INTERRUPT		(1&lt;&lt;4)</div><div class='add'>+#define   I915_DEBUG_INTERRUPT				(1&lt;&lt;2)</div><div class='add'>+#define   I915_USER_INTERRUPT				(1&lt;&lt;1)</div><div class='add'>+#define   I915_ASLE_INTERRUPT				(1&lt;&lt;0)</div><div class='add'>+#define EIR		0x020b0</div><div class='add'>+#define EMR		0x020b4</div><div class='add'>+#define ESR		0x020b8</div><div class='add'>+#define INSTPM	        0x020c0</div><div class='add'>+#define ACTHD	        0x020c8</div><div class='add'>+#define FW_BLC		0x020d8</div><div class='add'>+#define FW_BLC_SELF	0x020e0 /* 915+ only */</div><div class='add'>+#define MI_ARB_STATE	0x020e4 /* 915+ only */</div><div class='add'>+#define CACHE_MODE_0	0x02120 /* 915+ only */</div><div class='add'>+#define   CM0_MASK_SHIFT          16</div><div class='add'>+#define   CM0_IZ_OPT_DISABLE      (1&lt;&lt;6)</div><div class='add'>+#define   CM0_ZR_OPT_DISABLE      (1&lt;&lt;5)</div><div class='add'>+#define   CM0_DEPTH_EVICT_DISABLE (1&lt;&lt;4)</div><div class='add'>+#define   CM0_COLOR_EVICT_DISABLE (1&lt;&lt;3)</div><div class='add'>+#define   CM0_DEPTH_WRITE_DISABLE (1&lt;&lt;1)</div><div class='add'>+#define   CM0_RC_OP_FLUSH_DISABLE (1&lt;&lt;0)</div><div class='add'>+#define GFX_FLSH_CNTL	0x02170 /* 915+ only */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Framebuffer compression (915+ only)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define FBC_CFB_BASE		0x03200 /* 4k page aligned */</div><div class='add'>+#define FBC_LL_BASE		0x03204 /* 4k page aligned */</div><div class='add'>+#define FBC_CONTROL		0x03208</div><div class='add'>+#define   FBC_CTL_EN		(1&lt;&lt;31)</div><div class='add'>+#define   FBC_CTL_PERIODIC	(1&lt;&lt;30)</div><div class='add'>+#define   FBC_CTL_INTERVAL_SHIFT (16)</div><div class='add'>+#define   FBC_CTL_UNCOMPRESSIBLE (1&lt;&lt;14)</div><div class='add'>+#define   FBC_CTL_STRIDE_SHIFT	(5)</div><div class='add'>+#define   FBC_CTL_FENCENO	(1&lt;&lt;0)</div><div class='add'>+#define FBC_COMMAND		0x0320c</div><div class='add'>+#define   FBC_CMD_COMPRESS	(1&lt;&lt;0)</div><div class='add'>+#define FBC_STATUS		0x03210</div><div class='add'>+#define   FBC_STAT_COMPRESSING	(1&lt;&lt;31)</div><div class='add'>+#define   FBC_STAT_COMPRESSED	(1&lt;&lt;30)</div><div class='add'>+#define   FBC_STAT_MODIFIED	(1&lt;&lt;29)</div><div class='add'>+#define   FBC_STAT_CURRENT_LINE	(1&lt;&lt;0)</div><div class='add'>+#define FBC_CONTROL2		0x03214</div><div class='add'>+#define   FBC_CTL_FENCE_DBL	(0&lt;&lt;4)</div><div class='add'>+#define   FBC_CTL_IDLE_IMM	(0&lt;&lt;2)</div><div class='add'>+#define   FBC_CTL_IDLE_FULL	(1&lt;&lt;2)</div><div class='add'>+#define   FBC_CTL_IDLE_LINE	(2&lt;&lt;2)</div><div class='add'>+#define   FBC_CTL_IDLE_DEBUG	(3&lt;&lt;2)</div><div class='add'>+#define   FBC_CTL_CPU_FENCE	(1&lt;&lt;1)</div><div class='add'>+#define   FBC_CTL_PLANEA	(0&lt;&lt;0)</div><div class='add'>+#define   FBC_CTL_PLANEB	(1&lt;&lt;0)</div><div class='add'>+#define FBC_FENCE_OFF		0x0321b</div><div class='add'>+</div><div class='add'>+#define FBC_LL_SIZE		(1536)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * GPIO regs</div><div class='add'>+ */</div><div class='add'>+#define GPIOA			0x5010</div><div class='add'>+#define GPIOB			0x5014</div><div class='add'>+#define GPIOC			0x5018</div><div class='add'>+#define GPIOD			0x501c</div><div class='add'>+#define GPIOE			0x5020</div><div class='add'>+#define GPIOF			0x5024</div><div class='add'>+#define GPIOG			0x5028</div><div class='add'>+#define GPIOH			0x502c</div><div class='add'>+# define GPIO_CLOCK_DIR_MASK		(1 &lt;&lt; 0)</div><div class='add'>+# define GPIO_CLOCK_DIR_IN		(0 &lt;&lt; 1)</div><div class='add'>+# define GPIO_CLOCK_DIR_OUT		(1 &lt;&lt; 1)</div><div class='add'>+# define GPIO_CLOCK_VAL_MASK		(1 &lt;&lt; 2)</div><div class='add'>+# define GPIO_CLOCK_VAL_OUT		(1 &lt;&lt; 3)</div><div class='add'>+# define GPIO_CLOCK_VAL_IN		(1 &lt;&lt; 4)</div><div class='add'>+# define GPIO_CLOCK_PULLUP_DISABLE	(1 &lt;&lt; 5)</div><div class='add'>+# define GPIO_DATA_DIR_MASK		(1 &lt;&lt; 8)</div><div class='add'>+# define GPIO_DATA_DIR_IN		(0 &lt;&lt; 9)</div><div class='add'>+# define GPIO_DATA_DIR_OUT		(1 &lt;&lt; 9)</div><div class='add'>+# define GPIO_DATA_VAL_MASK		(1 &lt;&lt; 10)</div><div class='add'>+# define GPIO_DATA_VAL_OUT		(1 &lt;&lt; 11)</div><div class='add'>+# define GPIO_DATA_VAL_IN		(1 &lt;&lt; 12)</div><div class='add'>+# define GPIO_DATA_PULLUP_DISABLE	(1 &lt;&lt; 13)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Clock control &amp; power management</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define VGA0	0x6000</div><div class='add'>+#define VGA1	0x6004</div><div class='add'>+#define VGA_PD	0x6010</div><div class='add'>+#define   VGA0_PD_P2_DIV_4	(1 &lt;&lt; 7)</div><div class='add'>+#define   VGA0_PD_P1_DIV_2	(1 &lt;&lt; 5)</div><div class='add'>+#define   VGA0_PD_P1_SHIFT	0</div><div class='add'>+#define   VGA0_PD_P1_MASK	(0x1f &lt;&lt; 0)</div><div class='add'>+#define   VGA1_PD_P2_DIV_4	(1 &lt;&lt; 15)</div><div class='add'>+#define   VGA1_PD_P1_DIV_2	(1 &lt;&lt; 13)</div><div class='add'>+#define   VGA1_PD_P1_SHIFT	8</div><div class='add'>+#define   VGA1_PD_P1_MASK	(0x1f &lt;&lt; 8)</div><div class='add'>+#define DPLL_A	0x06014</div><div class='add'>+#define DPLL_B	0x06018</div><div class='add'>+#define   DPLL_VCO_ENABLE		(1 &lt;&lt; 31)</div><div class='add'>+#define   DPLL_DVO_HIGH_SPEED		(1 &lt;&lt; 30)</div><div class='add'>+#define   DPLL_SYNCLOCK_ENABLE		(1 &lt;&lt; 29)</div><div class='add'>+#define   DPLL_VGA_MODE_DIS		(1 &lt;&lt; 28)</div><div class='add'>+#define   DPLLB_MODE_DAC_SERIAL		(1 &lt;&lt; 26) /* i915 */</div><div class='add'>+#define   DPLLB_MODE_LVDS		(2 &lt;&lt; 26) /* i915 */</div><div class='add'>+#define   DPLL_MODE_MASK		(3 &lt;&lt; 26)</div><div class='add'>+#define   DPLL_DAC_SERIAL_P2_CLOCK_DIV_10 (0 &lt;&lt; 24) /* i915 */</div><div class='add'>+#define   DPLL_DAC_SERIAL_P2_CLOCK_DIV_5 (1 &lt;&lt; 24) /* i915 */</div><div class='add'>+#define   DPLLB_LVDS_P2_CLOCK_DIV_14	(0 &lt;&lt; 24) /* i915 */</div><div class='add'>+#define   DPLLB_LVDS_P2_CLOCK_DIV_7	(1 &lt;&lt; 24) /* i915 */</div><div class='add'>+#define   DPLL_P2_CLOCK_DIV_MASK	0x03000000 /* i915 */</div><div class='add'>+#define   DPLL_FPA01_P1_POST_DIV_MASK	0x00ff0000 /* i915 */</div><div class='add'>+</div><div class='add'>+#define I915_FIFO_UNDERRUN_STATUS		(1UL&lt;&lt;31)</div><div class='add'>+#define I915_CRC_ERROR_ENABLE			(1UL&lt;&lt;29)</div><div class='add'>+#define I915_CRC_DONE_ENABLE			(1UL&lt;&lt;28)</div><div class='add'>+#define I915_GMBUS_EVENT_ENABLE			(1UL&lt;&lt;27)</div><div class='add'>+#define I915_VSYNC_INTERRUPT_ENABLE		(1UL&lt;&lt;25)</div><div class='add'>+#define I915_DISPLAY_LINE_COMPARE_ENABLE	(1UL&lt;&lt;24)</div><div class='add'>+#define I915_DPST_EVENT_ENABLE			(1UL&lt;&lt;23)</div><div class='add'>+#define I915_LEGACY_BLC_EVENT_ENABLE		(1UL&lt;&lt;22)</div><div class='add'>+#define I915_ODD_FIELD_INTERRUPT_ENABLE		(1UL&lt;&lt;21)</div><div class='add'>+#define I915_EVEN_FIELD_INTERRUPT_ENABLE	(1UL&lt;&lt;20)</div><div class='add'>+#define I915_START_VBLANK_INTERRUPT_ENABLE	(1UL&lt;&lt;18)	/* 965 or later */</div><div class='add'>+#define I915_VBLANK_INTERRUPT_ENABLE		(1UL&lt;&lt;17)</div><div class='add'>+#define I915_OVERLAY_UPDATED_ENABLE		(1UL&lt;&lt;16)</div><div class='add'>+#define I915_CRC_ERROR_INTERRUPT_STATUS		(1UL&lt;&lt;13)</div><div class='add'>+#define I915_CRC_DONE_INTERRUPT_STATUS		(1UL&lt;&lt;12)</div><div class='add'>+#define I915_GMBUS_INTERRUPT_STATUS		(1UL&lt;&lt;11)</div><div class='add'>+#define I915_VSYNC_INTERRUPT_STATUS		(1UL&lt;&lt;9)</div><div class='add'>+#define I915_DISPLAY_LINE_COMPARE_STATUS	(1UL&lt;&lt;8)</div><div class='add'>+#define I915_DPST_EVENT_STATUS			(1UL&lt;&lt;7)</div><div class='add'>+#define I915_LEGACY_BLC_EVENT_STATUS		(1UL&lt;&lt;6)</div><div class='add'>+#define I915_ODD_FIELD_INTERRUPT_STATUS		(1UL&lt;&lt;5)</div><div class='add'>+#define I915_EVEN_FIELD_INTERRUPT_STATUS	(1UL&lt;&lt;4)</div><div class='add'>+#define I915_START_VBLANK_INTERRUPT_STATUS	(1UL&lt;&lt;2)	/* 965 or later */</div><div class='add'>+#define I915_VBLANK_INTERRUPT_STATUS		(1UL&lt;&lt;1)</div><div class='add'>+#define I915_OVERLAY_UPDATED_STATUS		(1UL&lt;&lt;0)</div><div class='add'>+</div><div class='add'>+#define SRX_INDEX		0x3c4</div><div class='add'>+#define SRX_DATA		0x3c5</div><div class='add'>+#define SR01			1</div><div class='add'>+#define SR01_SCREEN_OFF		(1&lt;&lt;5)</div><div class='add'>+</div><div class='add'>+#define PPCR			0x61204</div><div class='add'>+#define PPCR_ON			(1&lt;&lt;0)</div><div class='add'>+</div><div class='add'>+#define DVOB			0x61140</div><div class='add'>+#define DVOB_ON			(1&lt;&lt;31)</div><div class='add'>+#define DVOC			0x61160</div><div class='add'>+#define DVOC_ON			(1&lt;&lt;31)</div><div class='add'>+#define LVDS			0x61180</div><div class='add'>+#define LVDS_ON			(1&lt;&lt;31)</div><div class='add'>+</div><div class='add'>+#define ADPA			0x61100</div><div class='add'>+#define ADPA_DPMS_MASK		(~(3&lt;&lt;10))</div><div class='add'>+#define ADPA_DPMS_ON		(0&lt;&lt;10)</div><div class='add'>+#define ADPA_DPMS_SUSPEND	(1&lt;&lt;10)</div><div class='add'>+#define ADPA_DPMS_STANDBY	(2&lt;&lt;10)</div><div class='add'>+#define ADPA_DPMS_OFF		(3&lt;&lt;10)</div><div class='add'>+</div><div class='add'>+#define RING_TAIL		0x00</div><div class='add'>+#define TAIL_ADDR		0x001FFFF8</div><div class='add'>+#define RING_HEAD		0x04</div><div class='add'>+#define HEAD_WRAP_COUNT		0xFFE00000</div><div class='add'>+#define HEAD_WRAP_ONE		0x00200000</div><div class='add'>+#define HEAD_ADDR		0x001FFFFC</div><div class='add'>+#define RING_START		0x08</div><div class='add'>+#define START_ADDR		0xFFFFF000</div><div class='add'>+#define RING_LEN		0x0C</div><div class='add'>+#define RING_NR_PAGES		0x001FF000</div><div class='add'>+#define RING_REPORT_MASK	0x00000006</div><div class='add'>+#define RING_REPORT_64K		0x00000002</div><div class='add'>+#define RING_REPORT_128K	0x00000004</div><div class='add'>+#define RING_NO_REPORT		0x00000000</div><div class='add'>+#define RING_VALID_MASK		0x00000001</div><div class='add'>+#define RING_VALID		0x00000001</div><div class='add'>+#define RING_INVALID		0x00000000</div><div class='add'>+</div><div class='add'>+/* Scratch pad debug 0 reg:</div><div class='add'>+ */</div><div class='add'>+#define   DPLL_FPA01_P1_POST_DIV_MASK_I830	0x001f0000</div><div class='add'>+/*</div><div class='add'>+ * The i830 generation, in LVDS mode, defines P1 as the bit number set within</div><div class='add'>+ * this field (only one bit may be set).</div><div class='add'>+ */</div><div class='add'>+#define   DPLL_FPA01_P1_POST_DIV_MASK_I830_LVDS	0x003f0000</div><div class='add'>+#define   DPLL_FPA01_P1_POST_DIV_SHIFT	16</div><div class='add'>+/* i830, required in DVO non-gang */</div><div class='add'>+#define   PLL_P2_DIVIDE_BY_4		(1 &lt;&lt; 23)</div><div class='add'>+#define   PLL_P1_DIVIDE_BY_TWO		(1 &lt;&lt; 21) /* i830 */</div><div class='add'>+#define   PLL_REF_INPUT_DREFCLK		(0 &lt;&lt; 13)</div><div class='add'>+#define   PLL_REF_INPUT_TVCLKINA	(1 &lt;&lt; 13) /* i830 */</div><div class='add'>+#define   PLL_REF_INPUT_TVCLKINBC	(2 &lt;&lt; 13) /* SDVO TVCLKIN */</div><div class='add'>+#define   PLLB_REF_INPUT_SPREADSPECTRUMIN (3 &lt;&lt; 13)</div><div class='add'>+#define   PLL_REF_INPUT_MASK		(3 &lt;&lt; 13)</div><div class='add'>+#define   PLL_LOAD_PULSE_PHASE_SHIFT		9</div><div class='add'>+/*</div><div class='add'>+ * Parallel to Serial Load Pulse phase selection.</div><div class='add'>+ * Selects the phase for the 10X DPLL clock for the PCIe</div><div class='add'>+ * digital display port. The range is 4 to 13; 10 or more</div><div class='add'>+ * is just a flip delay. The default is 6</div><div class='add'>+ */</div><div class='add'>+#define   PLL_LOAD_PULSE_PHASE_MASK		(0xf &lt;&lt; PLL_LOAD_PULSE_PHASE_SHIFT)</div><div class='add'>+#define   DISPLAY_RATE_SELECT_FPA1		(1 &lt;&lt; 8)</div><div class='add'>+/*</div><div class='add'>+ * SDVO multiplier for 945G/GM. Not used on 965.</div><div class='add'>+ */</div><div class='add'>+#define   SDVO_MULTIPLIER_MASK			0x000000ff</div><div class='add'>+#define   SDVO_MULTIPLIER_SHIFT_HIRES		4</div><div class='add'>+#define   SDVO_MULTIPLIER_SHIFT_VGA		0</div><div class='add'>+#define DPLL_A_MD 0x0601c /* 965+ only */</div><div class='add'>+/*</div><div class='add'>+ * UDI pixel divider, controlling how many pixels are stuffed into a packet.</div><div class='add'>+ *</div><div class='add'>+ * Value is pixels minus 1.  Must be set to 1 pixel for SDVO.</div><div class='add'>+ */</div><div class='add'>+#define   DPLL_MD_UDI_DIVIDER_MASK		0x3f000000</div><div class='add'>+#define   DPLL_MD_UDI_DIVIDER_SHIFT		24</div><div class='add'>+/* UDI pixel divider for VGA, same as DPLL_MD_UDI_DIVIDER_MASK. */</div><div class='add'>+#define   DPLL_MD_VGA_UDI_DIVIDER_MASK		0x003f0000</div><div class='add'>+#define   DPLL_MD_VGA_UDI_DIVIDER_SHIFT		16</div><div class='add'>+/*</div><div class='add'>+ * SDVO/UDI pixel multiplier.</div><div class='add'>+ *</div><div class='add'>+ * SDVO requires that the bus clock rate be between 1 and 2 Ghz, and the bus</div><div class='add'>+ * clock rate is 10 times the DPLL clock.  At low resolution/refresh rate</div><div class='add'>+ * modes, the bus rate would be below the limits, so SDVO allows for stuffing</div><div class='add'>+ * dummy bytes in the datastream at an increased clock rate, with both sides of</div><div class='add'>+ * the link knowing how many bytes are fill.</div><div class='add'>+ *</div><div class='add'>+ * So, for a mode with a dotclock of 65Mhz, we would want to double the clock</div><div class='add'>+ * rate to 130Mhz to get a bus rate of 1.30Ghz.  The DPLL clock rate would be</div><div class='add'>+ * set to 130Mhz, and the SDVO multiplier set to 2x in this register and</div><div class='add'>+ * through an SDVO command.</div><div class='add'>+ *</div><div class='add'>+ * This register field has values of multiplication factor minus 1, with</div><div class='add'>+ * a maximum multiplier of 5 for SDVO.</div><div class='add'>+ */</div><div class='add'>+#define   DPLL_MD_UDI_MULTIPLIER_MASK		0x00003f00</div><div class='add'>+#define   DPLL_MD_UDI_MULTIPLIER_SHIFT		8</div><div class='add'>+/*</div><div class='add'>+ * SDVO/UDI pixel multiplier for VGA, same as DPLL_MD_UDI_MULTIPLIER_MASK.</div><div class='add'>+ * This best be set to the default value (3) or the CRT won't work. No,</div><div class='add'>+ * I don't entirely understand what this does...</div><div class='add'>+ */</div><div class='add'>+#define   DPLL_MD_VGA_UDI_MULTIPLIER_MASK	0x0000003f</div><div class='add'>+#define   DPLL_MD_VGA_UDI_MULTIPLIER_SHIFT	0</div><div class='add'>+#define DPLL_B_MD 0x06020 /* 965+ only */</div><div class='add'>+#define FPA0	0x06040</div><div class='add'>+#define FPA1	0x06044</div><div class='add'>+#define FPB0	0x06048</div><div class='add'>+#define FPB1	0x0604c</div><div class='add'>+#define   FP_N_DIV_MASK		0x003f0000</div><div class='add'>+#define   FP_N_DIV_SHIFT		16</div><div class='add'>+#define   FP_M1_DIV_MASK	0x00003f00</div><div class='add'>+#define   FP_M1_DIV_SHIFT		 8</div><div class='add'>+#define   FP_M2_DIV_MASK	0x0000003f</div><div class='add'>+#define   FP_M2_DIV_SHIFT		 0</div><div class='add'>+#define DPLL_TEST	0x606c</div><div class='add'>+#define   DPLLB_TEST_SDVO_DIV_1		(0 &lt;&lt; 22)</div><div class='add'>+#define   DPLLB_TEST_SDVO_DIV_2		(1 &lt;&lt; 22)</div><div class='add'>+#define   DPLLB_TEST_SDVO_DIV_4		(2 &lt;&lt; 22)</div><div class='add'>+#define   DPLLB_TEST_SDVO_DIV_MASK	(3 &lt;&lt; 22)</div><div class='add'>+#define   DPLLB_TEST_N_BYPASS		(1 &lt;&lt; 19)</div><div class='add'>+#define   DPLLB_TEST_M_BYPASS		(1 &lt;&lt; 18)</div><div class='add'>+#define   DPLLB_INPUT_BUFFER_ENABLE	(1 &lt;&lt; 16)</div><div class='add'>+#define   DPLLA_TEST_N_BYPASS		(1 &lt;&lt; 3)</div><div class='add'>+#define   DPLLA_TEST_M_BYPASS		(1 &lt;&lt; 2)</div><div class='add'>+#define   DPLLA_INPUT_BUFFER_ENABLE	(1 &lt;&lt; 0)</div><div class='add'>+#define D_STATE		0x6104</div><div class='add'>+#define CG_2D_DIS	0x6200</div><div class='add'>+#define CG_3D_DIS	0x6204</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Palette regs</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define PALETTE_A		0x0a000</div><div class='add'>+#define PALETTE_B		0x0a800</div><div class='add'>+</div><div class='add'>+/* MCH MMIO space */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * MCHBAR mirror.</div><div class='add'>+ *</div><div class='add'>+ * This mirrors the MCHBAR MMIO space whose location is determined by</div><div class='add'>+ * device 0 function 0's pci config register 0x44 or 0x48 and matches it in</div><div class='add'>+ * every way.  It is not accessible from the CP register read instructions.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+#define MCHBAR_MIRROR_BASE	0x10000</div><div class='add'>+</div><div class='add'>+/** 915-945 and GM965 MCH register controlling DRAM channel access */</div><div class='add'>+#define DCC			0x10200</div><div class='add'>+#define DCC_ADDRESSING_MODE_SINGLE_CHANNEL		(0 &lt;&lt; 0)</div><div class='add'>+#define DCC_ADDRESSING_MODE_DUAL_CHANNEL_ASYMMETRIC	(1 &lt;&lt; 0)</div><div class='add'>+#define DCC_ADDRESSING_MODE_DUAL_CHANNEL_INTERLEAVED	(2 &lt;&lt; 0)</div><div class='add'>+#define DCC_ADDRESSING_MODE_MASK			(3 &lt;&lt; 0)</div><div class='add'>+#define DCC_CHANNEL_XOR_DISABLE				(1 &lt;&lt; 10)</div><div class='add'>+</div><div class='add'>+/** 965 MCH register controlling DRAM channel configuration */</div><div class='add'>+#define C0DRB3			0x10206</div><div class='add'>+#define C1DRB3			0x10606</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Overlay regs</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define OVADD			0x30000</div><div class='add'>+#define DOVSTA			0x30008</div><div class='add'>+#define OC_BUF			(0x3&lt;&lt;20)</div><div class='add'>+#define OGAMC5			0x30010</div><div class='add'>+#define OGAMC4			0x30014</div><div class='add'>+#define OGAMC3			0x30018</div><div class='add'>+#define OGAMC2			0x3001c</div><div class='add'>+#define OGAMC1			0x30020</div><div class='add'>+#define OGAMC0			0x30024</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Display engine regs</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* Pipe A timing regs */</div><div class='add'>+#define HTOTAL_A	0x60000</div><div class='add'>+#define HBLANK_A	0x60004</div><div class='add'>+#define HSYNC_A		0x60008</div><div class='add'>+#define VTOTAL_A	0x6000c</div><div class='add'>+#define VBLANK_A	0x60010</div><div class='add'>+#define VSYNC_A		0x60014</div><div class='add'>+#define PIPEASRC	0x6001c</div><div class='add'>+#define BCLRPAT_A	0x60020</div><div class='add'>+</div><div class='add'>+/* Pipe B timing regs */</div><div class='add'>+#define HTOTAL_B	0x61000</div><div class='add'>+#define HBLANK_B	0x61004</div><div class='add'>+#define HSYNC_B		0x61008</div><div class='add'>+#define VTOTAL_B	0x6100c</div><div class='add'>+#define VBLANK_B	0x61010</div><div class='add'>+#define VSYNC_B		0x61014</div><div class='add'>+#define PIPEBSRC	0x6101c</div><div class='add'>+#define BCLRPAT_B	0x61020</div><div class='add'>+</div><div class='add'>+/* VGA port control */</div><div class='add'>+#define ADPA			0x61100</div><div class='add'>+#define   ADPA_DAC_ENABLE	(1&lt;&lt;31)</div><div class='add'>+#define   ADPA_DAC_DISABLE	0</div><div class='add'>+#define   ADPA_PIPE_SELECT_MASK	(1&lt;&lt;30)</div><div class='add'>+#define   ADPA_PIPE_A_SELECT	0</div><div class='add'>+#define   ADPA_PIPE_B_SELECT	(1&lt;&lt;30)</div><div class='add'>+#define   ADPA_USE_VGA_HVPOLARITY (1&lt;&lt;15)</div><div class='add'>+#define   ADPA_SETS_HVPOLARITY	0</div><div class='add'>+#define   ADPA_VSYNC_CNTL_DISABLE (1&lt;&lt;11)</div><div class='add'>+#define   ADPA_VSYNC_CNTL_ENABLE 0</div><div class='add'>+#define   ADPA_HSYNC_CNTL_DISABLE (1&lt;&lt;10)</div><div class='add'>+#define   ADPA_HSYNC_CNTL_ENABLE 0</div><div class='add'>+#define   ADPA_VSYNC_ACTIVE_HIGH (1&lt;&lt;4)</div><div class='add'>+#define   ADPA_VSYNC_ACTIVE_LOW	0</div><div class='add'>+#define   ADPA_HSYNC_ACTIVE_HIGH (1&lt;&lt;3)</div><div class='add'>+#define   ADPA_HSYNC_ACTIVE_LOW	0</div><div class='add'>+#define   ADPA_DPMS_MASK	(~(3&lt;&lt;10))</div><div class='add'>+#define   ADPA_DPMS_ON		(0&lt;&lt;10)</div><div class='add'>+#define   ADPA_DPMS_SUSPEND	(1&lt;&lt;10)</div><div class='add'>+#define   ADPA_DPMS_STANDBY	(2&lt;&lt;10)</div><div class='add'>+#define   ADPA_DPMS_OFF		(3&lt;&lt;10)</div><div class='add'>+</div><div class='add'>+/* Hotplug control (945+ only) */</div><div class='add'>+#define PORT_HOTPLUG_EN		0x61110</div><div class='add'>+#define   SDVOB_HOTPLUG_INT_EN			(1 &lt;&lt; 26)</div><div class='add'>+#define   SDVOC_HOTPLUG_INT_EN			(1 &lt;&lt; 25)</div><div class='add'>+#define   TV_HOTPLUG_INT_EN			(1 &lt;&lt; 18)</div><div class='add'>+#define   CRT_HOTPLUG_INT_EN			(1 &lt;&lt; 9)</div><div class='add'>+#define   CRT_HOTPLUG_FORCE_DETECT		(1 &lt;&lt; 3)</div><div class='add'>+</div><div class='add'>+#define PORT_HOTPLUG_STAT	0x61114</div><div class='add'>+#define   CRT_HOTPLUG_INT_STATUS		(1 &lt;&lt; 11)</div><div class='add'>+#define   TV_HOTPLUG_INT_STATUS			(1 &lt;&lt; 10)</div><div class='add'>+#define   CRT_HOTPLUG_MONITOR_MASK		(3 &lt;&lt; 8)</div><div class='add'>+#define   CRT_HOTPLUG_MONITOR_COLOR		(3 &lt;&lt; 8)</div><div class='add'>+#define   CRT_HOTPLUG_MONITOR_MONO		(2 &lt;&lt; 8)</div><div class='add'>+#define   CRT_HOTPLUG_MONITOR_NONE		(0 &lt;&lt; 8)</div><div class='add'>+#define   SDVOC_HOTPLUG_INT_STATUS		(1 &lt;&lt; 7)</div><div class='add'>+#define   SDVOB_HOTPLUG_INT_STATUS		(1 &lt;&lt; 6)</div><div class='add'>+</div><div class='add'>+/* SDVO port control */</div><div class='add'>+#define SDVOB			0x61140</div><div class='add'>+#define SDVOC			0x61160</div><div class='add'>+#define   SDVO_ENABLE		(1 &lt;&lt; 31)</div><div class='add'>+#define   SDVO_PIPE_B_SELECT	(1 &lt;&lt; 30)</div><div class='add'>+#define   SDVO_STALL_SELECT	(1 &lt;&lt; 29)</div><div class='add'>+#define   SDVO_INTERRUPT_ENABLE	(1 &lt;&lt; 26)</div><div class='add'>+/**</div><div class='add'>+ * 915G/GM SDVO pixel multiplier.</div><div class='add'>+ *</div><div class='add'>+ * Programmed value is multiplier - 1, up to 5x.</div><div class='add'>+ *</div><div class='add'>+ * \sa DPLL_MD_UDI_MULTIPLIER_MASK</div><div class='add'>+ */</div><div class='add'>+#define   SDVO_PORT_MULTIPLY_MASK	(7 &lt;&lt; 23)</div><div class='add'>+#define   SDVO_PORT_MULTIPLY_SHIFT		23</div><div class='add'>+#define   SDVO_PHASE_SELECT_MASK	(15 &lt;&lt; 19)</div><div class='add'>+#define   SDVO_PHASE_SELECT_DEFAULT	(6 &lt;&lt; 19)</div><div class='add'>+#define   SDVO_CLOCK_OUTPUT_INVERT	(1 &lt;&lt; 18)</div><div class='add'>+#define   SDVOC_GANG_MODE		(1 &lt;&lt; 16)</div><div class='add'>+#define   SDVO_BORDER_ENABLE		(1 &lt;&lt; 7)</div><div class='add'>+#define   SDVOB_PCIE_CONCURRENCY	(1 &lt;&lt; 3)</div><div class='add'>+#define   SDVO_DETECTED			(1 &lt;&lt; 2)</div><div class='add'>+/* Bits to be preserved when writing */</div><div class='add'>+#define   SDVOB_PRESERVE_MASK ((1 &lt;&lt; 17) | (1 &lt;&lt; 16) | (1 &lt;&lt; 14) | (1 &lt;&lt; 26))</div><div class='add'>+#define   SDVOC_PRESERVE_MASK ((1 &lt;&lt; 17) | (1 &lt;&lt; 26))</div><div class='add'>+</div><div class='add'>+/* DVO port control */</div><div class='add'>+#define DVOA			0x61120</div><div class='add'>+#define DVOB			0x61140</div><div class='add'>+#define DVOC			0x61160</div><div class='add'>+#define   DVO_ENABLE			(1 &lt;&lt; 31)</div><div class='add'>+#define   DVO_PIPE_B_SELECT		(1 &lt;&lt; 30)</div><div class='add'>+#define   DVO_PIPE_STALL_UNUSED		(0 &lt;&lt; 28)</div><div class='add'>+#define   DVO_PIPE_STALL		(1 &lt;&lt; 28)</div><div class='add'>+#define   DVO_PIPE_STALL_TV		(2 &lt;&lt; 28)</div><div class='add'>+#define   DVO_PIPE_STALL_MASK		(3 &lt;&lt; 28)</div><div class='add'>+#define   DVO_USE_VGA_SYNC		(1 &lt;&lt; 15)</div><div class='add'>+#define   DVO_DATA_ORDER_I740		(0 &lt;&lt; 14)</div><div class='add'>+#define   DVO_DATA_ORDER_FP		(1 &lt;&lt; 14)</div><div class='add'>+#define   DVO_VSYNC_DISABLE		(1 &lt;&lt; 11)</div><div class='add'>+#define   DVO_HSYNC_DISABLE		(1 &lt;&lt; 10)</div><div class='add'>+#define   DVO_VSYNC_TRISTATE		(1 &lt;&lt; 9)</div><div class='add'>+#define   DVO_HSYNC_TRISTATE		(1 &lt;&lt; 8)</div><div class='add'>+#define   DVO_BORDER_ENABLE		(1 &lt;&lt; 7)</div><div class='add'>+#define   DVO_DATA_ORDER_GBRG		(1 &lt;&lt; 6)</div><div class='add'>+#define   DVO_DATA_ORDER_RGGB		(0 &lt;&lt; 6)</div><div class='add'>+#define   DVO_DATA_ORDER_GBRG_ERRATA	(0 &lt;&lt; 6)</div><div class='add'>+#define   DVO_DATA_ORDER_RGGB_ERRATA	(1 &lt;&lt; 6)</div><div class='add'>+#define   DVO_VSYNC_ACTIVE_HIGH		(1 &lt;&lt; 4)</div><div class='add'>+#define   DVO_HSYNC_ACTIVE_HIGH		(1 &lt;&lt; 3)</div><div class='add'>+#define   DVO_BLANK_ACTIVE_HIGH		(1 &lt;&lt; 2)</div><div class='add'>+#define   DVO_OUTPUT_CSTATE_PIXELS	(1 &lt;&lt; 1)	/* SDG only */</div><div class='add'>+#define   DVO_OUTPUT_SOURCE_SIZE_PIXELS	(1 &lt;&lt; 0)	/* SDG only */</div><div class='add'>+#define   DVO_PRESERVE_MASK		(0x7&lt;&lt;24)</div><div class='add'>+#define DVOA_SRCDIM		0x61124</div><div class='add'>+#define DVOB_SRCDIM		0x61144</div><div class='add'>+#define DVOC_SRCDIM		0x61164</div><div class='add'>+#define   DVO_SRCDIM_HORIZONTAL_SHIFT	12</div><div class='add'>+#define   DVO_SRCDIM_VERTICAL_SHIFT	0</div><div class='add'>+</div><div class='add'>+/* LVDS port control */</div><div class='add'>+#define LVDS			0x61180</div><div class='add'>+/*</div><div class='add'>+ * Enables the LVDS port.  This bit must be set before DPLLs are enabled, as</div><div class='add'>+ * the DPLL semantics change when the LVDS is assigned to that pipe.</div><div class='add'>+ */</div><div class='add'>+#define   LVDS_PORT_EN			(1 &lt;&lt; 31)</div><div class='add'>+/* Selects pipe B for LVDS data.  Must be set on pre-965. */</div><div class='add'>+#define   LVDS_PIPEB_SELECT		(1 &lt;&lt; 30)</div><div class='add'>+/*</div><div class='add'>+ * Enables the A0-A2 data pairs and CLKA, containing 18 bits of color data per</div><div class='add'>+ * pixel.</div><div class='add'>+ */</div><div class='add'>+#define   LVDS_A0A2_CLKA_POWER_MASK	(3 &lt;&lt; 8)</div><div class='add'>+#define   LVDS_A0A2_CLKA_POWER_DOWN	(0 &lt;&lt; 8)</div><div class='add'>+#define   LVDS_A0A2_CLKA_POWER_UP	(3 &lt;&lt; 8)</div><div class='add'>+/*</div><div class='add'>+ * Controls the A3 data pair, which contains the additional LSBs for 24 bit</div><div class='add'>+ * mode.  Only enabled if LVDS_A0A2_CLKA_POWER_UP also indicates it should be</div><div class='add'>+ * on.</div><div class='add'>+ */</div><div class='add'>+#define   LVDS_A3_POWER_MASK		(3 &lt;&lt; 6)</div><div class='add'>+#define   LVDS_A3_POWER_DOWN		(0 &lt;&lt; 6)</div><div class='add'>+#define   LVDS_A3_POWER_UP		(3 &lt;&lt; 6)</div><div class='add'>+/*</div><div class='add'>+ * Controls the CLKB pair.  This should only be set when LVDS_B0B3_POWER_UP</div><div class='add'>+ * is set.</div><div class='add'>+ */</div><div class='add'>+#define   LVDS_CLKB_POWER_MASK		(3 &lt;&lt; 4)</div><div class='add'>+#define   LVDS_CLKB_POWER_DOWN		(0 &lt;&lt; 4)</div><div class='add'>+#define   LVDS_CLKB_POWER_UP		(3 &lt;&lt; 4)</div><div class='add'>+/*</div><div class='add'>+ * Controls the B0-B3 data pairs.  This must be set to match the DPLL p2</div><div class='add'>+ * setting for whether we are in dual-channel mode.  The B3 pair will</div><div class='add'>+ * additionally only be powered up when LVDS_A3_POWER_UP is set.</div><div class='add'>+ */</div><div class='add'>+#define   LVDS_B0B3_POWER_MASK		(3 &lt;&lt; 2)</div><div class='add'>+#define   LVDS_B0B3_POWER_DOWN		(0 &lt;&lt; 2)</div><div class='add'>+#define   LVDS_B0B3_POWER_UP		(3 &lt;&lt; 2)</div><div class='add'>+</div><div class='add'>+/* Panel power sequencing */</div><div class='add'>+#define PP_STATUS	0x61200</div><div class='add'>+#define   PP_ON		(1 &lt;&lt; 31)</div><div class='add'>+/*</div><div class='add'>+ * Indicates that all dependencies of the panel are on:</div><div class='add'>+ *</div><div class='add'>+ * - PLL enabled</div><div class='add'>+ * - pipe enabled</div><div class='add'>+ * - LVDS/DVOB/DVOC on</div><div class='add'>+ */</div><div class='add'>+#define   PP_READY		(1 &lt;&lt; 30)</div><div class='add'>+#define   PP_SEQUENCE_NONE	(0 &lt;&lt; 28)</div><div class='add'>+#define   PP_SEQUENCE_ON	(1 &lt;&lt; 28)</div><div class='add'>+#define   PP_SEQUENCE_OFF	(2 &lt;&lt; 28)</div><div class='add'>+#define   PP_SEQUENCE_MASK	0x30000000</div><div class='add'>+#define PP_CONTROL	0x61204</div><div class='add'>+#define   POWER_TARGET_ON	(1 &lt;&lt; 0)</div><div class='add'>+#define PP_ON_DELAYS	0x61208</div><div class='add'>+#define PP_OFF_DELAYS	0x6120c</div><div class='add'>+#define PP_DIVISOR	0x61210</div><div class='add'>+</div><div class='add'>+/* Panel fitting */</div><div class='add'>+#define PFIT_CONTROL	0x61230</div><div class='add'>+#define   PFIT_ENABLE		(1 &lt;&lt; 31)</div><div class='add'>+#define   PFIT_PIPE_MASK	(3 &lt;&lt; 29)</div><div class='add'>+#define   PFIT_PIPE_SHIFT	29</div><div class='add'>+#define   VERT_INTERP_DISABLE	(0 &lt;&lt; 10)</div><div class='add'>+#define   VERT_INTERP_BILINEAR	(1 &lt;&lt; 10)</div><div class='add'>+#define   VERT_INTERP_MASK	(3 &lt;&lt; 10)</div><div class='add'>+#define   VERT_AUTO_SCALE	(1 &lt;&lt; 9)</div><div class='add'>+#define   HORIZ_INTERP_DISABLE	(0 &lt;&lt; 6)</div><div class='add'>+#define   HORIZ_INTERP_BILINEAR	(1 &lt;&lt; 6)</div><div class='add'>+#define   HORIZ_INTERP_MASK	(3 &lt;&lt; 6)</div><div class='add'>+#define   HORIZ_AUTO_SCALE	(1 &lt;&lt; 5)</div><div class='add'>+#define   PANEL_8TO6_DITHER_ENABLE (1 &lt;&lt; 3)</div><div class='add'>+#define PFIT_PGM_RATIOS	0x61234</div><div class='add'>+#define   PFIT_VERT_SCALE_MASK			0xfff00000</div><div class='add'>+#define   PFIT_HORIZ_SCALE_MASK			0x0000fff0</div><div class='add'>+#define PFIT_AUTO_RATIOS 0x61238</div><div class='add'>+</div><div class='add'>+/* Backlight control */</div><div class='add'>+#define BLC_PWM_CTL		0x61254</div><div class='add'>+#define   BACKLIGHT_MODULATION_FREQ_SHIFT		(17)</div><div class='add'>+#define BLC_PWM_CTL2		0x61250 /* 965+ only */</div><div class='add'>+#define   BLM_COMBINATION_MODE (1 &lt;&lt; 30)</div><div class='add'>+/*</div><div class='add'>+ * This is the most significant 15 bits of the number of backlight cycles in a</div><div class='add'>+ * complete cycle of the modulated backlight control.</div><div class='add'>+ *</div><div class='add'>+ * The actual value is this field multiplied by two.</div><div class='add'>+ */</div><div class='add'>+#define   BACKLIGHT_MODULATION_FREQ_MASK		(0x7fff &lt;&lt; 17)</div><div class='add'>+#define   BLM_LEGACY_MODE				(1 &lt;&lt; 16)</div><div class='add'>+/*</div><div class='add'>+ * This is the number of cycles out of the backlight modulation cycle for which</div><div class='add'>+ * the backlight is on.</div><div class='add'>+ *</div><div class='add'>+ * This field must be no greater than the number of cycles in the complete</div><div class='add'>+ * backlight modulation cycle.</div><div class='add'>+ */</div><div class='add'>+#define   BACKLIGHT_DUTY_CYCLE_SHIFT		(0)</div><div class='add'>+#define   BACKLIGHT_DUTY_CYCLE_MASK		(0xffff)</div><div class='add'>+</div><div class='add'>+/* TV port control */</div><div class='add'>+#define TV_CTL			0x68000</div><div class='add'>+/** Enables the TV encoder */</div><div class='add'>+# define TV_ENC_ENABLE			(1 &lt;&lt; 31)</div><div class='add'>+/** Sources the TV encoder input from pipe B instead of A. */</div><div class='add'>+# define TV_ENC_PIPEB_SELECT		(1 &lt;&lt; 30)</div><div class='add'>+/** Outputs composite video (DAC A only) */</div><div class='add'>+# define TV_ENC_OUTPUT_COMPOSITE	(0 &lt;&lt; 28)</div><div class='add'>+/** Outputs SVideo video (DAC B/C) */</div><div class='add'>+# define TV_ENC_OUTPUT_SVIDEO		(1 &lt;&lt; 28)</div><div class='add'>+/** Outputs Component video (DAC A/B/C) */</div><div class='add'>+# define TV_ENC_OUTPUT_COMPONENT	(2 &lt;&lt; 28)</div><div class='add'>+/** Outputs Composite and SVideo (DAC A/B/C) */</div><div class='add'>+# define TV_ENC_OUTPUT_SVIDEO_COMPOSITE	(3 &lt;&lt; 28)</div><div class='add'>+# define TV_TRILEVEL_SYNC		(1 &lt;&lt; 21)</div><div class='add'>+/** Enables slow sync generation (945GM only) */</div><div class='add'>+# define TV_SLOW_SYNC			(1 &lt;&lt; 20)</div><div class='add'>+/** Selects 4x oversampling for 480i and 576p */</div><div class='add'>+# define TV_OVERSAMPLE_4X		(0 &lt;&lt; 18)</div><div class='add'>+/** Selects 2x oversampling for 720p and 1080i */</div><div class='add'>+# define TV_OVERSAMPLE_2X		(1 &lt;&lt; 18)</div><div class='add'>+/** Selects no oversampling for 1080p */</div><div class='add'>+# define TV_OVERSAMPLE_NONE		(2 &lt;&lt; 18)</div><div class='add'>+/** Selects 8x oversampling */</div><div class='add'>+# define TV_OVERSAMPLE_8X		(3 &lt;&lt; 18)</div><div class='add'>+/** Selects progressive mode rather than interlaced */</div><div class='add'>+# define TV_PROGRESSIVE			(1 &lt;&lt; 17)</div><div class='add'>+/** Sets the colorburst to PAL mode.  Required for non-M PAL modes. */</div><div class='add'>+# define TV_PAL_BURST			(1 &lt;&lt; 16)</div><div class='add'>+/** Field for setting delay of Y compared to C */</div><div class='add'>+# define TV_YC_SKEW_MASK		(7 &lt;&lt; 12)</div><div class='add'>+/** Enables a fix for 480p/576p standard definition modes on the 915GM only */</div><div class='add'>+# define TV_ENC_SDP_FIX			(1 &lt;&lt; 11)</div><div class='add'>+/**</div><div class='add'>+ * Enables a fix for the 915GM only.</div><div class='add'>+ *</div><div class='add'>+ * Not sure what it does.</div><div class='add'>+ */</div><div class='add'>+# define TV_ENC_C0_FIX			(1 &lt;&lt; 10)</div><div class='add'>+/** Bits that must be preserved by software */</div><div class='add'>+# define TV_CTL_SAVE			((3 &lt;&lt; 8) | (3 &lt;&lt; 6))</div><div class='add'>+# define TV_FUSE_STATE_MASK		(3 &lt;&lt; 4)</div><div class='add'>+/** Read-only state that reports all features enabled */</div><div class='add'>+# define TV_FUSE_STATE_ENABLED		(0 &lt;&lt; 4)</div><div class='add'>+/** Read-only state that reports that Macrovision is disabled in hardware*/</div><div class='add'>+# define TV_FUSE_STATE_NO_MACROVISION	(1 &lt;&lt; 4)</div><div class='add'>+/** Read-only state that reports that TV-out is disabled in hardware. */</div><div class='add'>+# define TV_FUSE_STATE_DISABLED		(2 &lt;&lt; 4)</div><div class='add'>+/** Normal operation */</div><div class='add'>+# define TV_TEST_MODE_NORMAL		(0 &lt;&lt; 0)</div><div class='add'>+/** Encoder test pattern 1 - combo pattern */</div><div class='add'>+# define TV_TEST_MODE_PATTERN_1		(1 &lt;&lt; 0)</div><div class='add'>+/** Encoder test pattern 2 - full screen vertical 75% color bars */</div><div class='add'>+# define TV_TEST_MODE_PATTERN_2		(2 &lt;&lt; 0)</div><div class='add'>+/** Encoder test pattern 3 - full screen horizontal 75% color bars */</div><div class='add'>+# define TV_TEST_MODE_PATTERN_3		(3 &lt;&lt; 0)</div><div class='add'>+/** Encoder test pattern 4 - random noise */</div><div class='add'>+# define TV_TEST_MODE_PATTERN_4		(4 &lt;&lt; 0)</div><div class='add'>+/** Encoder test pattern 5 - linear color ramps */</div><div class='add'>+# define TV_TEST_MODE_PATTERN_5		(5 &lt;&lt; 0)</div><div class='add'>+/**</div><div class='add'>+ * This test mode forces the DACs to 50% of full output.</div><div class='add'>+ *</div><div class='add'>+ * This is used for load detection in combination with TVDAC_SENSE_MASK</div><div class='add'>+ */</div><div class='add'>+# define TV_TEST_MODE_MONITOR_DETECT	(7 &lt;&lt; 0)</div><div class='add'>+# define TV_TEST_MODE_MASK		(7 &lt;&lt; 0)</div><div class='add'>+</div><div class='add'>+#define TV_DAC			0x68004</div><div class='add'>+/**</div><div class='add'>+ * Reports that DAC state change logic has reported change (RO).</div><div class='add'>+ *</div><div class='add'>+ * This gets cleared when TV_DAC_STATE_EN is cleared</div><div class='add'>+*/</div><div class='add'>+# define TVDAC_STATE_CHG		(1 &lt;&lt; 31)</div><div class='add'>+# define TVDAC_SENSE_MASK		(7 &lt;&lt; 28)</div><div class='add'>+/** Reports that DAC A voltage is above the detect threshold */</div><div class='add'>+# define TVDAC_A_SENSE			(1 &lt;&lt; 30)</div><div class='add'>+/** Reports that DAC B voltage is above the detect threshold */</div><div class='add'>+# define TVDAC_B_SENSE			(1 &lt;&lt; 29)</div><div class='add'>+/** Reports that DAC C voltage is above the detect threshold */</div><div class='add'>+# define TVDAC_C_SENSE			(1 &lt;&lt; 28)</div><div class='add'>+/**</div><div class='add'>+ * Enables DAC state detection logic, for load-based TV detection.</div><div class='add'>+ *</div><div class='add'>+ * The PLL of the chosen pipe (in TV_CTL) must be running, and the encoder set</div><div class='add'>+ * to off, for load detection to work.</div><div class='add'>+ */</div><div class='add'>+# define TVDAC_STATE_CHG_EN		(1 &lt;&lt; 27)</div><div class='add'>+/** Sets the DAC A sense value to high */</div><div class='add'>+# define TVDAC_A_SENSE_CTL		(1 &lt;&lt; 26)</div><div class='add'>+/** Sets the DAC B sense value to high */</div><div class='add'>+# define TVDAC_B_SENSE_CTL		(1 &lt;&lt; 25)</div><div class='add'>+/** Sets the DAC C sense value to high */</div><div class='add'>+# define TVDAC_C_SENSE_CTL		(1 &lt;&lt; 24)</div><div class='add'>+/** Overrides the ENC_ENABLE and DAC voltage levels */</div><div class='add'>+# define DAC_CTL_OVERRIDE		(1 &lt;&lt; 7)</div><div class='add'>+/** Sets the slew rate.  Must be preserved in software */</div><div class='add'>+# define ENC_TVDAC_SLEW_FAST		(1 &lt;&lt; 6)</div><div class='add'>+# define DAC_A_1_3_V			(0 &lt;&lt; 4)</div><div class='add'>+# define DAC_A_1_1_V			(1 &lt;&lt; 4)</div><div class='add'>+# define DAC_A_0_7_V			(2 &lt;&lt; 4)</div><div class='add'>+# define DAC_A_OFF			(3 &lt;&lt; 4)</div><div class='add'>+# define DAC_B_1_3_V			(0 &lt;&lt; 2)</div><div class='add'>+# define DAC_B_1_1_V			(1 &lt;&lt; 2)</div><div class='add'>+# define DAC_B_0_7_V			(2 &lt;&lt; 2)</div><div class='add'>+# define DAC_B_OFF			(3 &lt;&lt; 2)</div><div class='add'>+# define DAC_C_1_3_V			(0 &lt;&lt; 0)</div><div class='add'>+# define DAC_C_1_1_V			(1 &lt;&lt; 0)</div><div class='add'>+# define DAC_C_0_7_V			(2 &lt;&lt; 0)</div><div class='add'>+# define DAC_C_OFF			(3 &lt;&lt; 0)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * CSC coefficients are stored in a floating point format with 9 bits of</div><div class='add'>+ * mantissa and 2 or 3 bits of exponent.  The exponent is represented as 2**-n,</div><div class='add'>+ * where 2-bit exponents are unsigned n, and 3-bit exponents are signed n with</div><div class='add'>+ * -1 (0x3) being the only legal negative value.</div><div class='add'>+ */</div><div class='add'>+#define TV_CSC_Y		0x68010</div><div class='add'>+# define TV_RY_MASK			0x07ff0000</div><div class='add'>+# define TV_RY_SHIFT			16</div><div class='add'>+# define TV_GY_MASK			0x00000fff</div><div class='add'>+# define TV_GY_SHIFT			0</div><div class='add'>+</div><div class='add'>+#define TV_CSC_Y2		0x68014</div><div class='add'>+# define TV_BY_MASK			0x07ff0000</div><div class='add'>+# define TV_BY_SHIFT			16</div><div class='add'>+/**</div><div class='add'>+ * Y attenuation for component video.</div><div class='add'>+ *</div><div class='add'>+ * Stored in 1.9 fixed point.</div><div class='add'>+ */</div><div class='add'>+# define TV_AY_MASK			0x000003ff</div><div class='add'>+# define TV_AY_SHIFT			0</div><div class='add'>+</div><div class='add'>+#define TV_CSC_U		0x68018</div><div class='add'>+# define TV_RU_MASK			0x07ff0000</div><div class='add'>+# define TV_RU_SHIFT			16</div><div class='add'>+# define TV_GU_MASK			0x000007ff</div><div class='add'>+# define TV_GU_SHIFT			0</div><div class='add'>+</div><div class='add'>+#define TV_CSC_U2		0x6801c</div><div class='add'>+# define TV_BU_MASK			0x07ff0000</div><div class='add'>+# define TV_BU_SHIFT			16</div><div class='add'>+/**</div><div class='add'>+ * U attenuation for component video.</div><div class='add'>+ *</div><div class='add'>+ * Stored in 1.9 fixed point.</div><div class='add'>+ */</div><div class='add'>+# define TV_AU_MASK			0x000003ff</div><div class='add'>+# define TV_AU_SHIFT			0</div><div class='add'>+</div><div class='add'>+#define TV_CSC_V		0x68020</div><div class='add'>+# define TV_RV_MASK			0x0fff0000</div><div class='add'>+# define TV_RV_SHIFT			16</div><div class='add'>+# define TV_GV_MASK			0x000007ff</div><div class='add'>+# define TV_GV_SHIFT			0</div><div class='add'>+</div><div class='add'>+#define TV_CSC_V2		0x68024</div><div class='add'>+# define TV_BV_MASK			0x07ff0000</div><div class='add'>+# define TV_BV_SHIFT			16</div><div class='add'>+/**</div><div class='add'>+ * V attenuation for component video.</div><div class='add'>+ *</div><div class='add'>+ * Stored in 1.9 fixed point.</div><div class='add'>+ */</div><div class='add'>+# define TV_AV_MASK			0x000007ff</div><div class='add'>+# define TV_AV_SHIFT			0</div><div class='add'>+</div><div class='add'>+#define TV_CLR_KNOBS		0x68028</div><div class='add'>+/** 2s-complement brightness adjustment */</div><div class='add'>+# define TV_BRIGHTNESS_MASK		0xff000000</div><div class='add'>+# define TV_BRIGHTNESS_SHIFT		24</div><div class='add'>+/** Contrast adjustment, as a 2.6 unsigned floating point number */</div><div class='add'>+# define TV_CONTRAST_MASK		0x00ff0000</div><div class='add'>+# define TV_CONTRAST_SHIFT		16</div><div class='add'>+/** Saturation adjustment, as a 2.6 unsigned floating point number */</div><div class='add'>+# define TV_SATURATION_MASK		0x0000ff00</div><div class='add'>+# define TV_SATURATION_SHIFT		8</div><div class='add'>+/** Hue adjustment, as an integer phase angle in degrees */</div><div class='add'>+# define TV_HUE_MASK			0x000000ff</div><div class='add'>+# define TV_HUE_SHIFT			0</div><div class='add'>+</div><div class='add'>+#define TV_CLR_LEVEL		0x6802c</div><div class='add'>+/** Controls the DAC level for black */</div><div class='add'>+# define TV_BLACK_LEVEL_MASK		0x01ff0000</div><div class='add'>+# define TV_BLACK_LEVEL_SHIFT		16</div><div class='add'>+/** Controls the DAC level for blanking */</div><div class='add'>+# define TV_BLANK_LEVEL_MASK		0x000001ff</div><div class='add'>+# define TV_BLANK_LEVEL_SHIFT		0</div><div class='add'>+</div><div class='add'>+#define TV_H_CTL_1		0x68030</div><div class='add'>+/** Number of pixels in the hsync. */</div><div class='add'>+# define TV_HSYNC_END_MASK		0x1fff0000</div><div class='add'>+# define TV_HSYNC_END_SHIFT		16</div><div class='add'>+/** Total number of pixels minus one in the line (display and blanking). */</div><div class='add'>+# define TV_HTOTAL_MASK			0x00001fff</div><div class='add'>+# define TV_HTOTAL_SHIFT		0</div><div class='add'>+</div><div class='add'>+#define TV_H_CTL_2		0x68034</div><div class='add'>+/** Enables the colorburst (needed for non-component color) */</div><div class='add'>+# define TV_BURST_ENA			(1 &lt;&lt; 31)</div><div class='add'>+/** Offset of the colorburst from the start of hsync, in pixels minus one. */</div><div class='add'>+# define TV_HBURST_START_SHIFT		16</div><div class='add'>+# define TV_HBURST_START_MASK		0x1fff0000</div><div class='add'>+/** Length of the colorburst */</div><div class='add'>+# define TV_HBURST_LEN_SHIFT		0</div><div class='add'>+# define TV_HBURST_LEN_MASK		0x0001fff</div><div class='add'>+</div><div class='add'>+#define TV_H_CTL_3		0x68038</div><div class='add'>+/** End of hblank, measured in pixels minus one from start of hsync */</div><div class='add'>+# define TV_HBLANK_END_SHIFT		16</div><div class='add'>+# define TV_HBLANK_END_MASK		0x1fff0000</div><div class='add'>+/** Start of hblank, measured in pixels minus one from start of hsync */</div><div class='add'>+# define TV_HBLANK_START_SHIFT		0</div><div class='add'>+# define TV_HBLANK_START_MASK		0x0001fff</div><div class='add'>+</div><div class='add'>+#define TV_V_CTL_1		0x6803c</div><div class='add'>+/** XXX */</div><div class='add'>+# define TV_NBR_END_SHIFT		16</div><div class='add'>+# define TV_NBR_END_MASK		0x07ff0000</div><div class='add'>+/** XXX */</div><div class='add'>+# define TV_VI_END_F1_SHIFT		8</div><div class='add'>+# define TV_VI_END_F1_MASK		0x00003f00</div><div class='add'>+/** XXX */</div><div class='add'>+# define TV_VI_END_F2_SHIFT		0</div><div class='add'>+# define TV_VI_END_F2_MASK		0x0000003f</div><div class='add'>+</div><div class='add'>+#define TV_V_CTL_2		0x68040</div><div class='add'>+/** Length of vsync, in half lines */</div><div class='add'>+# define TV_VSYNC_LEN_MASK		0x07ff0000</div><div class='add'>+# define TV_VSYNC_LEN_SHIFT		16</div><div class='add'>+/** Offset of the start of vsync in field 1, measured in one less than the</div><div class='add'>+ * number of half lines.</div><div class='add'>+ */</div><div class='add'>+# define TV_VSYNC_START_F1_MASK		0x00007f00</div><div class='add'>+# define TV_VSYNC_START_F1_SHIFT	8</div><div class='add'>+/**</div><div class='add'>+ * Offset of the start of vsync in field 2, measured in one less than the</div><div class='add'>+ * number of half lines.</div><div class='add'>+ */</div><div class='add'>+# define TV_VSYNC_START_F2_MASK		0x0000007f</div><div class='add'>+# define TV_VSYNC_START_F2_SHIFT	0</div><div class='add'>+</div><div class='add'>+#define TV_V_CTL_3		0x68044</div><div class='add'>+/** Enables generation of the equalization signal */</div><div class='add'>+# define TV_EQUAL_ENA			(1 &lt;&lt; 31)</div><div class='add'>+/** Length of vsync, in half lines */</div><div class='add'>+# define TV_VEQ_LEN_MASK		0x007f0000</div><div class='add'>+# define TV_VEQ_LEN_SHIFT		16</div><div class='add'>+/** Offset of the start of equalization in field 1, measured in one less than</div><div class='add'>+ * the number of half lines.</div><div class='add'>+ */</div><div class='add'>+# define TV_VEQ_START_F1_MASK		0x0007f00</div><div class='add'>+# define TV_VEQ_START_F1_SHIFT		8</div><div class='add'>+/**</div><div class='add'>+ * Offset of the start of equalization in field 2, measured in one less than</div><div class='add'>+ * the number of half lines.</div><div class='add'>+ */</div><div class='add'>+# define TV_VEQ_START_F2_MASK		0x000007f</div><div class='add'>+# define TV_VEQ_START_F2_SHIFT		0</div><div class='add'>+</div><div class='add'>+#define TV_V_CTL_4		0x68048</div><div class='add'>+/**</div><div class='add'>+ * Offset to start of vertical colorburst, measured in one less than the</div><div class='add'>+ * number of lines from vertical start.</div><div class='add'>+ */</div><div class='add'>+# define TV_VBURST_START_F1_MASK	0x003f0000</div><div class='add'>+# define TV_VBURST_START_F1_SHIFT	16</div><div class='add'>+/**</div><div class='add'>+ * Offset to the end of vertical colorburst, measured in one less than the</div><div class='add'>+ * number of lines from the start of NBR.</div><div class='add'>+ */</div><div class='add'>+# define TV_VBURST_END_F1_MASK		0x000000ff</div><div class='add'>+# define TV_VBURST_END_F1_SHIFT		0</div><div class='add'>+</div><div class='add'>+#define TV_V_CTL_5		0x6804c</div><div class='add'>+/**</div><div class='add'>+ * Offset to start of vertical colorburst, measured in one less than the</div><div class='add'>+ * number of lines from vertical start.</div><div class='add'>+ */</div><div class='add'>+# define TV_VBURST_START_F2_MASK	0x003f0000</div><div class='add'>+# define TV_VBURST_START_F2_SHIFT	16</div><div class='add'>+/**</div><div class='add'>+ * Offset to the end of vertical colorburst, measured in one less than the</div><div class='add'>+ * number of lines from the start of NBR.</div><div class='add'>+ */</div><div class='add'>+# define TV_VBURST_END_F2_MASK		0x000000ff</div><div class='add'>+# define TV_VBURST_END_F2_SHIFT		0</div><div class='add'>+</div><div class='add'>+#define TV_V_CTL_6		0x68050</div><div class='add'>+/**</div><div class='add'>+ * Offset to start of vertical colorburst, measured in one less than the</div><div class='add'>+ * number of lines from vertical start.</div><div class='add'>+ */</div><div class='add'>+# define TV_VBURST_START_F3_MASK	0x003f0000</div><div class='add'>+# define TV_VBURST_START_F3_SHIFT	16</div><div class='add'>+/**</div><div class='add'>+ * Offset to the end of vertical colorburst, measured in one less than the</div><div class='add'>+ * number of lines from the start of NBR.</div><div class='add'>+ */</div><div class='add'>+# define TV_VBURST_END_F3_MASK		0x000000ff</div><div class='add'>+# define TV_VBURST_END_F3_SHIFT		0</div><div class='add'>+</div><div class='add'>+#define TV_V_CTL_7		0x68054</div><div class='add'>+/**</div><div class='add'>+ * Offset to start of vertical colorburst, measured in one less than the</div><div class='add'>+ * number of lines from vertical start.</div><div class='add'>+ */</div><div class='add'>+# define TV_VBURST_START_F4_MASK	0x003f0000</div><div class='add'>+# define TV_VBURST_START_F4_SHIFT	16</div><div class='add'>+/**</div><div class='add'>+ * Offset to the end of vertical colorburst, measured in one less than the</div><div class='add'>+ * number of lines from the start of NBR.</div><div class='add'>+ */</div><div class='add'>+# define TV_VBURST_END_F4_MASK		0x000000ff</div><div class='add'>+# define TV_VBURST_END_F4_SHIFT		0</div><div class='add'>+</div><div class='add'>+#define TV_SC_CTL_1		0x68060</div><div class='add'>+/** Turns on the first subcarrier phase generation DDA */</div><div class='add'>+# define TV_SC_DDA1_EN			(1 &lt;&lt; 31)</div><div class='add'>+/** Turns on the first subcarrier phase generation DDA */</div><div class='add'>+# define TV_SC_DDA2_EN			(1 &lt;&lt; 30)</div><div class='add'>+/** Turns on the first subcarrier phase generation DDA */</div><div class='add'>+# define TV_SC_DDA3_EN			(1 &lt;&lt; 29)</div><div class='add'>+/** Sets the subcarrier DDA to reset frequency every other field */</div><div class='add'>+# define TV_SC_RESET_EVERY_2		(0 &lt;&lt; 24)</div><div class='add'>+/** Sets the subcarrier DDA to reset frequency every fourth field */</div><div class='add'>+# define TV_SC_RESET_EVERY_4		(1 &lt;&lt; 24)</div><div class='add'>+/** Sets the subcarrier DDA to reset frequency every eighth field */</div><div class='add'>+# define TV_SC_RESET_EVERY_8		(2 &lt;&lt; 24)</div><div class='add'>+/** Sets the subcarrier DDA to never reset the frequency */</div><div class='add'>+# define TV_SC_RESET_NEVER		(3 &lt;&lt; 24)</div><div class='add'>+/** Sets the peak amplitude of the colorburst.*/</div><div class='add'>+# define TV_BURST_LEVEL_MASK		0x00ff0000</div><div class='add'>+# define TV_BURST_LEVEL_SHIFT		16</div><div class='add'>+/** Sets the increment of the first subcarrier phase generation DDA */</div><div class='add'>+# define TV_SCDDA1_INC_MASK		0x00000fff</div><div class='add'>+# define TV_SCDDA1_INC_SHIFT		0</div><div class='add'>+</div><div class='add'>+#define TV_SC_CTL_2		0x68064</div><div class='add'>+/** Sets the rollover for the second subcarrier phase generation DDA */</div><div class='add'>+# define TV_SCDDA2_SIZE_MASK		0x7fff0000</div><div class='add'>+# define TV_SCDDA2_SIZE_SHIFT		16</div><div class='add'>+/** Sets the increent of the second subcarrier phase generation DDA */</div><div class='add'>+# define TV_SCDDA2_INC_MASK		0x00007fff</div><div class='add'>+# define TV_SCDDA2_INC_SHIFT		0</div><div class='add'>+</div><div class='add'>+#define TV_SC_CTL_3		0x68068</div><div class='add'>+/** Sets the rollover for the third subcarrier phase generation DDA */</div><div class='add'>+# define TV_SCDDA3_SIZE_MASK		0x7fff0000</div><div class='add'>+# define TV_SCDDA3_SIZE_SHIFT		16</div><div class='add'>+/** Sets the increent of the third subcarrier phase generation DDA */</div><div class='add'>+# define TV_SCDDA3_INC_MASK		0x00007fff</div><div class='add'>+# define TV_SCDDA3_INC_SHIFT		0</div><div class='add'>+</div><div class='add'>+#define TV_WIN_POS		0x68070</div><div class='add'>+/** X coordinate of the display from the start of horizontal active */</div><div class='add'>+# define TV_XPOS_MASK			0x1fff0000</div><div class='add'>+# define TV_XPOS_SHIFT			16</div><div class='add'>+/** Y coordinate of the display from the start of vertical active (NBR) */</div><div class='add'>+# define TV_YPOS_MASK			0x00000fff</div><div class='add'>+# define TV_YPOS_SHIFT			0</div><div class='add'>+</div><div class='add'>+#define TV_WIN_SIZE		0x68074</div><div class='add'>+/** Horizontal size of the display window, measured in pixels*/</div><div class='add'>+# define TV_XSIZE_MASK			0x1fff0000</div><div class='add'>+# define TV_XSIZE_SHIFT			16</div><div class='add'>+/**</div><div class='add'>+ * Vertical size of the display window, measured in pixels.</div><div class='add'>+ *</div><div class='add'>+ * Must be even for interlaced modes.</div><div class='add'>+ */</div><div class='add'>+# define TV_YSIZE_MASK			0x00000fff</div><div class='add'>+# define TV_YSIZE_SHIFT			0</div><div class='add'>+</div><div class='add'>+#define TV_FILTER_CTL_1		0x68080</div><div class='add'>+/**</div><div class='add'>+ * Enables automatic scaling calculation.</div><div class='add'>+ *</div><div class='add'>+ * If set, the rest of the registers are ignored, and the calculated values can</div><div class='add'>+ * be read back from the register.</div><div class='add'>+ */</div><div class='add'>+# define TV_AUTO_SCALE			(1 &lt;&lt; 31)</div><div class='add'>+/**</div><div class='add'>+ * Disables the vertical filter.</div><div class='add'>+ *</div><div class='add'>+ * This is required on modes more than 1024 pixels wide */</div><div class='add'>+# define TV_V_FILTER_BYPASS		(1 &lt;&lt; 29)</div><div class='add'>+/** Enables adaptive vertical filtering */</div><div class='add'>+# define TV_VADAPT			(1 &lt;&lt; 28)</div><div class='add'>+# define TV_VADAPT_MODE_MASK		(3 &lt;&lt; 26)</div><div class='add'>+/** Selects the least adaptive vertical filtering mode */</div><div class='add'>+# define TV_VADAPT_MODE_LEAST		(0 &lt;&lt; 26)</div><div class='add'>+/** Selects the moderately adaptive vertical filtering mode */</div><div class='add'>+# define TV_VADAPT_MODE_MODERATE	(1 &lt;&lt; 26)</div><div class='add'>+/** Selects the most adaptive vertical filtering mode */</div><div class='add'>+# define TV_VADAPT_MODE_MOST		(3 &lt;&lt; 26)</div><div class='add'>+/**</div><div class='add'>+ * Sets the horizontal scaling factor.</div><div class='add'>+ *</div><div class='add'>+ * This should be the fractional part of the horizontal scaling factor divided</div><div class='add'>+ * by the oversampling rate.  TV_HSCALE should be less than 1, and set to:</div><div class='add'>+ *</div><div class='add'>+ * (src width - 1) / ((oversample * dest width) - 1)</div><div class='add'>+ */</div><div class='add'>+# define TV_HSCALE_FRAC_MASK		0x00003fff</div><div class='add'>+# define TV_HSCALE_FRAC_SHIFT		0</div><div class='add'>+</div><div class='add'>+#define TV_FILTER_CTL_2		0x68084</div><div class='add'>+/**</div><div class='add'>+ * Sets the integer part of the 3.15 fixed-point vertical scaling factor.</div><div class='add'>+ *</div><div class='add'>+ * TV_VSCALE should be (src height - 1) / ((interlace * dest height) - 1)</div><div class='add'>+ */</div><div class='add'>+# define TV_VSCALE_INT_MASK		0x00038000</div><div class='add'>+# define TV_VSCALE_INT_SHIFT		15</div><div class='add'>+/**</div><div class='add'>+ * Sets the fractional part of the 3.15 fixed-point vertical scaling factor.</div><div class='add'>+ *</div><div class='add'>+ * \sa TV_VSCALE_INT_MASK</div><div class='add'>+ */</div><div class='add'>+# define TV_VSCALE_FRAC_MASK		0x00007fff</div><div class='add'>+# define TV_VSCALE_FRAC_SHIFT		0</div><div class='add'>+</div><div class='add'>+#define TV_FILTER_CTL_3		0x68088</div><div class='add'>+/**</div><div class='add'>+ * Sets the integer part of the 3.15 fixed-point vertical scaling factor.</div><div class='add'>+ *</div><div class='add'>+ * TV_VSCALE should be (src height - 1) / (1/4 * (dest height - 1))</div><div class='add'>+ *</div><div class='add'>+ * For progressive modes, TV_VSCALE_IP_INT should be set to zeroes.</div><div class='add'>+ */</div><div class='add'>+# define TV_VSCALE_IP_INT_MASK		0x00038000</div><div class='add'>+# define TV_VSCALE_IP_INT_SHIFT		15</div><div class='add'>+/**</div><div class='add'>+ * Sets the fractional part of the 3.15 fixed-point vertical scaling factor.</div><div class='add'>+ *</div><div class='add'>+ * For progressive modes, TV_VSCALE_IP_INT should be set to zeroes.</div><div class='add'>+ *</div><div class='add'>+ * \sa TV_VSCALE_IP_INT_MASK</div><div class='add'>+ */</div><div class='add'>+# define TV_VSCALE_IP_FRAC_MASK		0x00007fff</div><div class='add'>+# define TV_VSCALE_IP_FRAC_SHIFT		0</div><div class='add'>+</div><div class='add'>+#define TV_CC_CONTROL		0x68090</div><div class='add'>+# define TV_CC_ENABLE			(1 &lt;&lt; 31)</div><div class='add'>+/**</div><div class='add'>+ * Specifies which field to send the CC data in.</div><div class='add'>+ *</div><div class='add'>+ * CC data is usually sent in field 0.</div><div class='add'>+ */</div><div class='add'>+# define TV_CC_FID_MASK			(1 &lt;&lt; 27)</div><div class='add'>+# define TV_CC_FID_SHIFT		27</div><div class='add'>+/** Sets the horizontal position of the CC data.  Usually 135. */</div><div class='add'>+# define TV_CC_HOFF_MASK		0x03ff0000</div><div class='add'>+# define TV_CC_HOFF_SHIFT		16</div><div class='add'>+/** Sets the vertical position of the CC data.  Usually 21 */</div><div class='add'>+# define TV_CC_LINE_MASK		0x0000003f</div><div class='add'>+# define TV_CC_LINE_SHIFT		0</div><div class='add'>+</div><div class='add'>+#define TV_CC_DATA		0x68094</div><div class='add'>+# define TV_CC_RDY			(1 &lt;&lt; 31)</div><div class='add'>+/** Second word of CC data to be transmitted. */</div><div class='add'>+# define TV_CC_DATA_2_MASK		0x007f0000</div><div class='add'>+# define TV_CC_DATA_2_SHIFT		16</div><div class='add'>+/** First word of CC data to be transmitted. */</div><div class='add'>+# define TV_CC_DATA_1_MASK		0x0000007f</div><div class='add'>+# define TV_CC_DATA_1_SHIFT		0</div><div class='add'>+</div><div class='add'>+#define TV_H_LUMA_0		0x68100</div><div class='add'>+#define TV_H_LUMA_59		0x681ec</div><div class='add'>+#define TV_H_CHROMA_0		0x68200</div><div class='add'>+#define TV_H_CHROMA_59		0x682ec</div><div class='add'>+#define TV_V_LUMA_0		0x68300</div><div class='add'>+#define TV_V_LUMA_42		0x683a8</div><div class='add'>+#define TV_V_CHROMA_0		0x68400</div><div class='add'>+#define TV_V_CHROMA_42		0x684a8</div><div class='add'>+</div><div class='add'>+/* Display &amp; cursor control */</div><div class='add'>+</div><div class='add'>+/* Pipe A */</div><div class='add'>+#define PIPEADSL		0x70000</div><div class='add'>+#define PIPEACONF		0x70008</div><div class='add'>+#define   PIPEACONF_ENABLE	(1&lt;&lt;31)</div><div class='add'>+#define   PIPEACONF_DISABLE	0</div><div class='add'>+#define   PIPEACONF_DOUBLE_WIDE	(1&lt;&lt;30)</div><div class='add'>+#define   I965_PIPECONF_ACTIVE	(1&lt;&lt;30)</div><div class='add'>+#define   PIPEACONF_SINGLE_WIDE	0</div><div class='add'>+#define   PIPEACONF_PIPE_UNLOCKED 0</div><div class='add'>+#define   PIPEACONF_PIPE_LOCKED	(1&lt;&lt;25)</div><div class='add'>+#define   PIPEACONF_PALETTE	0</div><div class='add'>+#define   PIPEACONF_GAMMA		(1&lt;&lt;24)</div><div class='add'>+#define   PIPECONF_FORCE_BORDER	(1&lt;&lt;25)</div><div class='add'>+#define   PIPECONF_PROGRESSIVE	(0 &lt;&lt; 21)</div><div class='add'>+#define   PIPECONF_INTERLACE_W_FIELD_INDICATION	(6 &lt;&lt; 21)</div><div class='add'>+#define   PIPECONF_INTERLACE_FIELD_0_ONLY		(7 &lt;&lt; 21)</div><div class='add'>+#define PIPEASTAT		0x70024</div><div class='add'>+#define   PIPE_FIFO_UNDERRUN_STATUS		(1UL&lt;&lt;31)</div><div class='add'>+#define   PIPE_CRC_ERROR_ENABLE			(1UL&lt;&lt;29)</div><div class='add'>+#define   PIPE_CRC_DONE_ENABLE			(1UL&lt;&lt;28)</div><div class='add'>+#define   PIPE_GMBUS_EVENT_ENABLE		(1UL&lt;&lt;27)</div><div class='add'>+#define   PIPE_HOTPLUG_INTERRUPT_ENABLE		(1UL&lt;&lt;26)</div><div class='add'>+#define   PIPE_VSYNC_INTERRUPT_ENABLE		(1UL&lt;&lt;25)</div><div class='add'>+#define   PIPE_DISPLAY_LINE_COMPARE_ENABLE	(1UL&lt;&lt;24)</div><div class='add'>+#define   PIPE_DPST_EVENT_ENABLE		(1UL&lt;&lt;23)</div><div class='add'>+#define   PIPE_LEGACY_BLC_EVENT_ENABLE		(1UL&lt;&lt;22)</div><div class='add'>+#define   PIPE_ODD_FIELD_INTERRUPT_ENABLE	(1UL&lt;&lt;21)</div><div class='add'>+#define   PIPE_EVEN_FIELD_INTERRUPT_ENABLE	(1UL&lt;&lt;20)</div><div class='add'>+#define   PIPE_HOTPLUG_TV_INTERRUPT_ENABLE	(1UL&lt;&lt;18) /* pre-965 */</div><div class='add'>+#define   PIPE_START_VBLANK_INTERRUPT_ENABLE	(1UL&lt;&lt;18) /* 965 or later */</div><div class='add'>+#define   PIPE_VBLANK_INTERRUPT_ENABLE		(1UL&lt;&lt;17)</div><div class='add'>+#define   PIPE_OVERLAY_UPDATED_ENABLE		(1UL&lt;&lt;16)</div><div class='add'>+#define   PIPE_CRC_ERROR_INTERRUPT_STATUS	(1UL&lt;&lt;13)</div><div class='add'>+#define   PIPE_CRC_DONE_INTERRUPT_STATUS	(1UL&lt;&lt;12)</div><div class='add'>+#define   PIPE_GMBUS_INTERRUPT_STATUS		(1UL&lt;&lt;11)</div><div class='add'>+#define   PIPE_HOTPLUG_INTERRUPT_STATUS		(1UL&lt;&lt;10)</div><div class='add'>+#define   PIPE_VSYNC_INTERRUPT_STATUS		(1UL&lt;&lt;9)</div><div class='add'>+#define   PIPE_DISPLAY_LINE_COMPARE_STATUS	(1UL&lt;&lt;8)</div><div class='add'>+#define   PIPE_DPST_EVENT_STATUS		(1UL&lt;&lt;7)</div><div class='add'>+#define   PIPE_LEGACY_BLC_EVENT_STATUS		(1UL&lt;&lt;6)</div><div class='add'>+#define   PIPE_ODD_FIELD_INTERRUPT_STATUS	(1UL&lt;&lt;5)</div><div class='add'>+#define   PIPE_EVEN_FIELD_INTERRUPT_STATUS	(1UL&lt;&lt;4)</div><div class='add'>+#define   PIPE_HOTPLUG_TV_INTERRUPT_STATUS	(1UL&lt;&lt;2) /* pre-965 */</div><div class='add'>+#define   PIPE_START_VBLANK_INTERRUPT_STATUS	(1UL&lt;&lt;2) /* 965 or later */</div><div class='add'>+#define   PIPE_VBLANK_INTERRUPT_STATUS		(1UL&lt;&lt;1)</div><div class='add'>+#define   PIPE_OVERLAY_UPDATED_STATUS		(1UL&lt;&lt;0)</div><div class='add'>+</div><div class='add'>+#define DSPARB			0x70030</div><div class='add'>+#define   DSPARB_CSTART_MASK	(0x7f &lt;&lt; 7)</div><div class='add'>+#define   DSPARB_CSTART_SHIFT	7</div><div class='add'>+#define   DSPARB_BSTART_MASK	(0x7f)</div><div class='add'>+#define   DSPARB_BSTART_SHIFT	0</div><div class='add'>+/*</div><div class='add'>+ * The two pipe frame counter registers are not synchronized, so</div><div class='add'>+ * reading a stable value is somewhat tricky. The following code</div><div class='add'>+ * should work:</div><div class='add'>+ *</div><div class='add'>+ *  do {</div><div class='add'>+ *    high1 = ((INREG(PIPEAFRAMEHIGH) &amp; PIPE_FRAME_HIGH_MASK) &gt;&gt;</div><div class='add'>+ *             PIPE_FRAME_HIGH_SHIFT;</div><div class='add'>+ *    low1 =  ((INREG(PIPEAFRAMEPIXEL) &amp; PIPE_FRAME_LOW_MASK) &gt;&gt;</div><div class='add'>+ *             PIPE_FRAME_LOW_SHIFT);</div><div class='add'>+ *    high2 = ((INREG(PIPEAFRAMEHIGH) &amp; PIPE_FRAME_HIGH_MASK) &gt;&gt;</div><div class='add'>+ *             PIPE_FRAME_HIGH_SHIFT);</div><div class='add'>+ *  } while (high1 != high2);</div><div class='add'>+ *  frame = (high1 &lt;&lt; 8) | low1;</div><div class='add'>+ */</div><div class='add'>+#define PIPEAFRAMEHIGH          0x70040</div><div class='add'>+#define   PIPE_FRAME_HIGH_MASK    0x0000ffff</div><div class='add'>+#define   PIPE_FRAME_HIGH_SHIFT   0</div><div class='add'>+#define PIPEAFRAMEPIXEL         0x70044</div><div class='add'>+#define   PIPE_FRAME_LOW_MASK     0xff000000</div><div class='add'>+#define   PIPE_FRAME_LOW_SHIFT    24</div><div class='add'>+#define   PIPE_PIXEL_MASK         0x00ffffff</div><div class='add'>+#define   PIPE_PIXEL_SHIFT        0</div><div class='add'>+</div><div class='add'>+/* Cursor A &amp; B regs */</div><div class='add'>+#define CURACNTR		0x70080</div><div class='add'>+#define   CURSOR_MODE_DISABLE   0x00</div><div class='add'>+#define   CURSOR_MODE_64_32B_AX 0x07</div><div class='add'>+#define   CURSOR_MODE_64_ARGB_AX ((1 &lt;&lt; 5) | CURSOR_MODE_64_32B_AX)</div><div class='add'>+#define   MCURSOR_GAMMA_ENABLE  (1 &lt;&lt; 26)</div><div class='add'>+#define CURABASE		0x70084</div><div class='add'>+#define CURAPOS			0x70088</div><div class='add'>+#define   CURSOR_POS_MASK       0x007FF</div><div class='add'>+#define   CURSOR_POS_SIGN       0x8000</div><div class='add'>+#define   CURSOR_X_SHIFT        0</div><div class='add'>+#define   CURSOR_Y_SHIFT        16</div><div class='add'>+#define CURBCNTR		0x700c0</div><div class='add'>+#define CURBBASE		0x700c4</div><div class='add'>+#define CURBPOS			0x700c8</div><div class='add'>+</div><div class='add'>+/* Display A control */</div><div class='add'>+#define DSPACNTR                0x70180</div><div class='add'>+#define   DISPLAY_PLANE_ENABLE			(1&lt;&lt;31)</div><div class='add'>+#define   DISPLAY_PLANE_DISABLE			0</div><div class='add'>+#define   DISPPLANE_GAMMA_ENABLE		(1&lt;&lt;30)</div><div class='add'>+#define   DISPPLANE_GAMMA_DISABLE		0</div><div class='add'>+#define   DISPPLANE_PIXFORMAT_MASK		(0xf&lt;&lt;26)</div><div class='add'>+#define   DISPPLANE_8BPP			(0x2&lt;&lt;26)</div><div class='add'>+#define   DISPPLANE_15_16BPP			(0x4&lt;&lt;26)</div><div class='add'>+#define   DISPPLANE_16BPP			(0x5&lt;&lt;26)</div><div class='add'>+#define   DISPPLANE_32BPP_NO_ALPHA		(0x6&lt;&lt;26)</div><div class='add'>+#define   DISPPLANE_32BPP			(0x7&lt;&lt;26)</div><div class='add'>+#define   DISPPLANE_STEREO_ENABLE		(1&lt;&lt;25)</div><div class='add'>+#define   DISPPLANE_STEREO_DISABLE		0</div><div class='add'>+#define   DISPPLANE_SEL_PIPE_MASK		(1&lt;&lt;24)</div><div class='add'>+#define   DISPPLANE_SEL_PIPE_A			0</div><div class='add'>+#define   DISPPLANE_SEL_PIPE_B			(1&lt;&lt;24)</div><div class='add'>+#define   DISPPLANE_SRC_KEY_ENABLE		(1&lt;&lt;22)</div><div class='add'>+#define   DISPPLANE_SRC_KEY_DISABLE		0</div><div class='add'>+#define   DISPPLANE_LINE_DOUBLE			(1&lt;&lt;20)</div><div class='add'>+#define   DISPPLANE_NO_LINE_DOUBLE		0</div><div class='add'>+#define   DISPPLANE_STEREO_POLARITY_FIRST	0</div><div class='add'>+#define   DISPPLANE_STEREO_POLARITY_SECOND	(1&lt;&lt;18)</div><div class='add'>+#define DSPAADDR		0x70184</div><div class='add'>+#define DSPASTRIDE		0x70188</div><div class='add'>+#define DSPAPOS			0x7018C /* reserved */</div><div class='add'>+#define DSPASIZE		0x70190</div><div class='add'>+#define DSPASURF		0x7019C /* 965+ only */</div><div class='add'>+#define DSPATILEOFF		0x701A4 /* 965+ only */</div><div class='add'>+</div><div class='add'>+/* VBIOS flags */</div><div class='add'>+#define SWF00			0x71410</div><div class='add'>+#define SWF01			0x71414</div><div class='add'>+#define SWF02			0x71418</div><div class='add'>+#define SWF03			0x7141c</div><div class='add'>+#define SWF04			0x71420</div><div class='add'>+#define SWF05			0x71424</div><div class='add'>+#define SWF06			0x71428</div><div class='add'>+#define SWF10			0x70410</div><div class='add'>+#define SWF11			0x70414</div><div class='add'>+#define SWF14			0x71420</div><div class='add'>+#define SWF30			0x72414</div><div class='add'>+#define SWF31			0x72418</div><div class='add'>+#define SWF32			0x7241c</div><div class='add'>+</div><div class='add'>+/* Pipe B */</div><div class='add'>+#define PIPEBDSL		0x71000</div><div class='add'>+#define PIPEBCONF		0x71008</div><div class='add'>+#define PIPEBSTAT		0x71024</div><div class='add'>+#define PIPEBFRAMEHIGH		0x71040</div><div class='add'>+#define PIPEBFRAMEPIXEL		0x71044</div><div class='add'>+</div><div class='add'>+/* Display B control */</div><div class='add'>+#define DSPBCNTR		0x71180</div><div class='add'>+#define   DISPPLANE_ALPHA_TRANS_ENABLE		(1&lt;&lt;15)</div><div class='add'>+#define   DISPPLANE_ALPHA_TRANS_DISABLE		0</div><div class='add'>+#define   DISPPLANE_SPRITE_ABOVE_DISPLAY	0</div><div class='add'>+#define   DISPPLANE_SPRITE_ABOVE_OVERLAY	(1)</div><div class='add'>+#define DSPBADDR		0x71184</div><div class='add'>+#define DSPBSTRIDE		0x71188</div><div class='add'>+#define DSPBPOS			0x7118C</div><div class='add'>+#define DSPBSIZE		0x71190</div><div class='add'>+#define DSPBSURF		0x7119C</div><div class='add'>+#define DSPBTILEOFF		0x711A4</div><div class='add'>+</div><div class='add'>+/* VBIOS regs */</div><div class='add'>+#define VGACNTRL		0x71400</div><div class='add'>+# define VGA_DISP_DISABLE			(1 &lt;&lt; 31)</div><div class='add'>+# define VGA_2X_MODE				(1 &lt;&lt; 30)</div><div class='add'>+# define VGA_PIPE_B_SELECT			(1 &lt;&lt; 29)</div><div class='add'>+</div><div class='add'>+#endif /* _I915_REG_H_ */</div><div class='head'>diff --git a/drivers/gpu/drm/i915/i915_suspend.c b/drivers/gpu/drm/i915/i915_suspend.c<br/>new file mode 100644<br/>index 000000000000..603fe742ccd4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpu/drm/i915/i915_suspend.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/i915/i915_suspend.c</a></div><div class='hunk'>@@ -0,0 +1,509 @@</div><div class='add'>+/*</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2008 (c) Intel Corporation</div><div class='add'>+ *   Jesse Barnes &lt;jbarnes@virtuousgeek.org&gt;</div><div class='add'>+ *</div><div class='add'>+ * Permission is hereby granted, free of charge, to any person obtaining a</div><div class='add'>+ * copy of this software and associated documentation files (the</div><div class='add'>+ * "Software"), to deal in the Software without restriction, including</div><div class='add'>+ * without limitation the rights to use, copy, modify, merge, publish,</div><div class='add'>+ * distribute, sub license, and/or sell copies of the Software, and to</div><div class='add'>+ * permit persons to whom the Software is furnished to do so, subject to</div><div class='add'>+ * the following conditions:</div><div class='add'>+ *</div><div class='add'>+ * The above copyright notice and this permission notice (including the</div><div class='add'>+ * next paragraph) shall be included in all copies or substantial portions</div><div class='add'>+ * of the Software.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS</div><div class='add'>+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.</div><div class='add'>+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR</div><div class='add'>+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,</div><div class='add'>+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE</div><div class='add'>+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "drmP.h"</div><div class='add'>+#include "drm.h"</div><div class='add'>+#include "i915_drm.h"</div><div class='add'>+#include "i915_drv.h"</div><div class='add'>+</div><div class='add'>+static bool i915_pipe_enabled(struct drm_device *dev, enum pipe pipe)</div><div class='add'>+{</div><div class='add'>+	struct drm_i915_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+</div><div class='add'>+	if (pipe == PIPE_A)</div><div class='add'>+		return (I915_READ(DPLL_A) &amp; DPLL_VCO_ENABLE);</div><div class='add'>+	else</div><div class='add'>+		return (I915_READ(DPLL_B) &amp; DPLL_VCO_ENABLE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void i915_save_palette(struct drm_device *dev, enum pipe pipe)</div><div class='add'>+{</div><div class='add'>+	struct drm_i915_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	unsigned long reg = (pipe == PIPE_A ? PALETTE_A : PALETTE_B);</div><div class='add'>+	u32 *array;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!i915_pipe_enabled(dev, pipe))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (pipe == PIPE_A)</div><div class='add'>+		array = dev_priv-&gt;save_palette_a;</div><div class='add'>+	else</div><div class='add'>+		array = dev_priv-&gt;save_palette_b;</div><div class='add'>+</div><div class='add'>+	for(i = 0; i &lt; 256; i++)</div><div class='add'>+		array[i] = I915_READ(reg + (i &lt;&lt; 2));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void i915_restore_palette(struct drm_device *dev, enum pipe pipe)</div><div class='add'>+{</div><div class='add'>+	struct drm_i915_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	unsigned long reg = (pipe == PIPE_A ? PALETTE_A : PALETTE_B);</div><div class='add'>+	u32 *array;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!i915_pipe_enabled(dev, pipe))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (pipe == PIPE_A)</div><div class='add'>+		array = dev_priv-&gt;save_palette_a;</div><div class='add'>+	else</div><div class='add'>+		array = dev_priv-&gt;save_palette_b;</div><div class='add'>+</div><div class='add'>+	for(i = 0; i &lt; 256; i++)</div><div class='add'>+		I915_WRITE(reg + (i &lt;&lt; 2), array[i]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 i915_read_indexed(struct drm_device *dev, u16 index_port, u16 data_port, u8 reg)</div><div class='add'>+{</div><div class='add'>+	struct drm_i915_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+</div><div class='add'>+	I915_WRITE8(index_port, reg);</div><div class='add'>+	return I915_READ8(data_port);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 i915_read_ar(struct drm_device *dev, u16 st01, u8 reg, u16 palette_enable)</div><div class='add'>+{</div><div class='add'>+	struct drm_i915_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+</div><div class='add'>+	I915_READ8(st01);</div><div class='add'>+	I915_WRITE8(VGA_AR_INDEX, palette_enable | reg);</div><div class='add'>+	return I915_READ8(VGA_AR_DATA_READ);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void i915_write_ar(struct drm_device *dev, u16 st01, u8 reg, u8 val, u16 palette_enable)</div><div class='add'>+{</div><div class='add'>+	struct drm_i915_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+</div><div class='add'>+	I915_READ8(st01);</div><div class='add'>+	I915_WRITE8(VGA_AR_INDEX, palette_enable | reg);</div><div class='add'>+	I915_WRITE8(VGA_AR_DATA_WRITE, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void i915_write_indexed(struct drm_device *dev, u16 index_port, u16 data_port, u8 reg, u8 val)</div><div class='add'>+{</div><div class='add'>+	struct drm_i915_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+</div><div class='add'>+	I915_WRITE8(index_port, reg);</div><div class='add'>+	I915_WRITE8(data_port, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void i915_save_vga(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_i915_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	int i;</div><div class='add'>+	u16 cr_index, cr_data, st01;</div><div class='add'>+</div><div class='add'>+	/* VGA color palette registers */</div><div class='add'>+	dev_priv-&gt;saveDACMASK = I915_READ8(VGA_DACMASK);</div><div class='add'>+	/* DACCRX automatically increments during read */</div><div class='add'>+	I915_WRITE8(VGA_DACRX, 0);</div><div class='add'>+	/* Read 3 bytes of color data from each index */</div><div class='add'>+	for (i = 0; i &lt; 256 * 3; i++)</div><div class='add'>+		dev_priv-&gt;saveDACDATA[i] = I915_READ8(VGA_DACDATA);</div><div class='add'>+</div><div class='add'>+	/* MSR bits */</div><div class='add'>+	dev_priv-&gt;saveMSR = I915_READ8(VGA_MSR_READ);</div><div class='add'>+	if (dev_priv-&gt;saveMSR &amp; VGA_MSR_CGA_MODE) {</div><div class='add'>+		cr_index = VGA_CR_INDEX_CGA;</div><div class='add'>+		cr_data = VGA_CR_DATA_CGA;</div><div class='add'>+		st01 = VGA_ST01_CGA;</div><div class='add'>+	} else {</div><div class='add'>+		cr_index = VGA_CR_INDEX_MDA;</div><div class='add'>+		cr_data = VGA_CR_DATA_MDA;</div><div class='add'>+		st01 = VGA_ST01_MDA;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* CRT controller regs */</div><div class='add'>+	i915_write_indexed(dev, cr_index, cr_data, 0x11,</div><div class='add'>+			   i915_read_indexed(dev, cr_index, cr_data, 0x11) &amp;</div><div class='add'>+			   (~0x80));</div><div class='add'>+	for (i = 0; i &lt;= 0x24; i++)</div><div class='add'>+		dev_priv-&gt;saveCR[i] =</div><div class='add'>+			i915_read_indexed(dev, cr_index, cr_data, i);</div><div class='add'>+	/* Make sure we don't turn off CR group 0 writes */</div><div class='add'>+	dev_priv-&gt;saveCR[0x11] &amp;= ~0x80;</div><div class='add'>+</div><div class='add'>+	/* Attribute controller registers */</div><div class='add'>+	I915_READ8(st01);</div><div class='add'>+	dev_priv-&gt;saveAR_INDEX = I915_READ8(VGA_AR_INDEX);</div><div class='add'>+	for (i = 0; i &lt;= 0x14; i++)</div><div class='add'>+		dev_priv-&gt;saveAR[i] = i915_read_ar(dev, st01, i, 0);</div><div class='add'>+	I915_READ8(st01);</div><div class='add'>+	I915_WRITE8(VGA_AR_INDEX, dev_priv-&gt;saveAR_INDEX);</div><div class='add'>+	I915_READ8(st01);</div><div class='add'>+</div><div class='add'>+	/* Graphics controller registers */</div><div class='add'>+	for (i = 0; i &lt; 9; i++)</div><div class='add'>+		dev_priv-&gt;saveGR[i] =</div><div class='add'>+			i915_read_indexed(dev, VGA_GR_INDEX, VGA_GR_DATA, i);</div><div class='add'>+</div><div class='add'>+	dev_priv-&gt;saveGR[0x10] =</div><div class='add'>+		i915_read_indexed(dev, VGA_GR_INDEX, VGA_GR_DATA, 0x10);</div><div class='add'>+	dev_priv-&gt;saveGR[0x11] =</div><div class='add'>+		i915_read_indexed(dev, VGA_GR_INDEX, VGA_GR_DATA, 0x11);</div><div class='add'>+	dev_priv-&gt;saveGR[0x18] =</div><div class='add'>+		i915_read_indexed(dev, VGA_GR_INDEX, VGA_GR_DATA, 0x18);</div><div class='add'>+</div><div class='add'>+	/* Sequencer registers */</div><div class='add'>+	for (i = 0; i &lt; 8; i++)</div><div class='add'>+		dev_priv-&gt;saveSR[i] =</div><div class='add'>+			i915_read_indexed(dev, VGA_SR_INDEX, VGA_SR_DATA, i);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void i915_restore_vga(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_i915_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	int i;</div><div class='add'>+	u16 cr_index, cr_data, st01;</div><div class='add'>+</div><div class='add'>+	/* MSR bits */</div><div class='add'>+	I915_WRITE8(VGA_MSR_WRITE, dev_priv-&gt;saveMSR);</div><div class='add'>+	if (dev_priv-&gt;saveMSR &amp; VGA_MSR_CGA_MODE) {</div><div class='add'>+		cr_index = VGA_CR_INDEX_CGA;</div><div class='add'>+		cr_data = VGA_CR_DATA_CGA;</div><div class='add'>+		st01 = VGA_ST01_CGA;</div><div class='add'>+	} else {</div><div class='add'>+		cr_index = VGA_CR_INDEX_MDA;</div><div class='add'>+		cr_data = VGA_CR_DATA_MDA;</div><div class='add'>+		st01 = VGA_ST01_MDA;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Sequencer registers, don't write SR07 */</div><div class='add'>+	for (i = 0; i &lt; 7; i++)</div><div class='add'>+		i915_write_indexed(dev, VGA_SR_INDEX, VGA_SR_DATA, i,</div><div class='add'>+				   dev_priv-&gt;saveSR[i]);</div><div class='add'>+</div><div class='add'>+	/* CRT controller regs */</div><div class='add'>+	/* Enable CR group 0 writes */</div><div class='add'>+	i915_write_indexed(dev, cr_index, cr_data, 0x11, dev_priv-&gt;saveCR[0x11]);</div><div class='add'>+	for (i = 0; i &lt;= 0x24; i++)</div><div class='add'>+		i915_write_indexed(dev, cr_index, cr_data, i, dev_priv-&gt;saveCR[i]);</div><div class='add'>+</div><div class='add'>+	/* Graphics controller regs */</div><div class='add'>+	for (i = 0; i &lt; 9; i++)</div><div class='add'>+		i915_write_indexed(dev, VGA_GR_INDEX, VGA_GR_DATA, i,</div><div class='add'>+				   dev_priv-&gt;saveGR[i]);</div><div class='add'>+</div><div class='add'>+	i915_write_indexed(dev, VGA_GR_INDEX, VGA_GR_DATA, 0x10,</div><div class='add'>+			   dev_priv-&gt;saveGR[0x10]);</div><div class='add'>+	i915_write_indexed(dev, VGA_GR_INDEX, VGA_GR_DATA, 0x11,</div><div class='add'>+			   dev_priv-&gt;saveGR[0x11]);</div><div class='add'>+	i915_write_indexed(dev, VGA_GR_INDEX, VGA_GR_DATA, 0x18,</div><div class='add'>+			   dev_priv-&gt;saveGR[0x18]);</div><div class='add'>+</div><div class='add'>+	/* Attribute controller registers */</div><div class='add'>+	I915_READ8(st01); /* switch back to index mode */</div><div class='add'>+	for (i = 0; i &lt;= 0x14; i++)</div><div class='add'>+		i915_write_ar(dev, st01, i, dev_priv-&gt;saveAR[i], 0);</div><div class='add'>+	I915_READ8(st01); /* switch back to index mode */</div><div class='add'>+	I915_WRITE8(VGA_AR_INDEX, dev_priv-&gt;saveAR_INDEX | 0x20);</div><div class='add'>+	I915_READ8(st01);</div><div class='add'>+</div><div class='add'>+	/* VGA color palette registers */</div><div class='add'>+	I915_WRITE8(VGA_DACMASK, dev_priv-&gt;saveDACMASK);</div><div class='add'>+	/* DACCRX automatically increments during read */</div><div class='add'>+	I915_WRITE8(VGA_DACWX, 0);</div><div class='add'>+	/* Read 3 bytes of color data from each index */</div><div class='add'>+	for (i = 0; i &lt; 256 * 3; i++)</div><div class='add'>+		I915_WRITE8(VGA_DACDATA, dev_priv-&gt;saveDACDATA[i]);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int i915_save_state(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_i915_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	pci_read_config_byte(dev-&gt;pdev, LBB, &amp;dev_priv-&gt;saveLBB);</div><div class='add'>+</div><div class='add'>+	/* Display arbitration control */</div><div class='add'>+	dev_priv-&gt;saveDSPARB = I915_READ(DSPARB);</div><div class='add'>+</div><div class='add'>+	/* Pipe &amp; plane A info */</div><div class='add'>+	dev_priv-&gt;savePIPEACONF = I915_READ(PIPEACONF);</div><div class='add'>+	dev_priv-&gt;savePIPEASRC = I915_READ(PIPEASRC);</div><div class='add'>+	dev_priv-&gt;saveFPA0 = I915_READ(FPA0);</div><div class='add'>+	dev_priv-&gt;saveFPA1 = I915_READ(FPA1);</div><div class='add'>+	dev_priv-&gt;saveDPLL_A = I915_READ(DPLL_A);</div><div class='add'>+	if (IS_I965G(dev))</div><div class='add'>+		dev_priv-&gt;saveDPLL_A_MD = I915_READ(DPLL_A_MD);</div><div class='add'>+	dev_priv-&gt;saveHTOTAL_A = I915_READ(HTOTAL_A);</div><div class='add'>+	dev_priv-&gt;saveHBLANK_A = I915_READ(HBLANK_A);</div><div class='add'>+	dev_priv-&gt;saveHSYNC_A = I915_READ(HSYNC_A);</div><div class='add'>+	dev_priv-&gt;saveVTOTAL_A = I915_READ(VTOTAL_A);</div><div class='add'>+	dev_priv-&gt;saveVBLANK_A = I915_READ(VBLANK_A);</div><div class='add'>+	dev_priv-&gt;saveVSYNC_A = I915_READ(VSYNC_A);</div><div class='add'>+	dev_priv-&gt;saveBCLRPAT_A = I915_READ(BCLRPAT_A);</div><div class='add'>+</div><div class='add'>+	dev_priv-&gt;saveDSPACNTR = I915_READ(DSPACNTR);</div><div class='add'>+	dev_priv-&gt;saveDSPASTRIDE = I915_READ(DSPASTRIDE);</div><div class='add'>+	dev_priv-&gt;saveDSPASIZE = I915_READ(DSPASIZE);</div><div class='add'>+	dev_priv-&gt;saveDSPAPOS = I915_READ(DSPAPOS);</div><div class='add'>+	dev_priv-&gt;saveDSPAADDR = I915_READ(DSPAADDR);</div><div class='add'>+	if (IS_I965G(dev)) {</div><div class='add'>+		dev_priv-&gt;saveDSPASURF = I915_READ(DSPASURF);</div><div class='add'>+		dev_priv-&gt;saveDSPATILEOFF = I915_READ(DSPATILEOFF);</div><div class='add'>+	}</div><div class='add'>+	i915_save_palette(dev, PIPE_A);</div><div class='add'>+	dev_priv-&gt;savePIPEASTAT = I915_READ(PIPEASTAT);</div><div class='add'>+</div><div class='add'>+	/* Pipe &amp; plane B info */</div><div class='add'>+	dev_priv-&gt;savePIPEBCONF = I915_READ(PIPEBCONF);</div><div class='add'>+	dev_priv-&gt;savePIPEBSRC = I915_READ(PIPEBSRC);</div><div class='add'>+	dev_priv-&gt;saveFPB0 = I915_READ(FPB0);</div><div class='add'>+	dev_priv-&gt;saveFPB1 = I915_READ(FPB1);</div><div class='add'>+	dev_priv-&gt;saveDPLL_B = I915_READ(DPLL_B);</div><div class='add'>+	if (IS_I965G(dev))</div><div class='add'>+		dev_priv-&gt;saveDPLL_B_MD = I915_READ(DPLL_B_MD);</div><div class='add'>+	dev_priv-&gt;saveHTOTAL_B = I915_READ(HTOTAL_B);</div><div class='add'>+	dev_priv-&gt;saveHBLANK_B = I915_READ(HBLANK_B);</div><div class='add'>+	dev_priv-&gt;saveHSYNC_B = I915_READ(HSYNC_B);</div><div class='add'>+	dev_priv-&gt;saveVTOTAL_B = I915_READ(VTOTAL_B);</div><div class='add'>+	dev_priv-&gt;saveVBLANK_B = I915_READ(VBLANK_B);</div><div class='add'>+	dev_priv-&gt;saveVSYNC_B = I915_READ(VSYNC_B);</div><div class='add'>+	dev_priv-&gt;saveBCLRPAT_A = I915_READ(BCLRPAT_A);</div><div class='add'>+</div><div class='add'>+	dev_priv-&gt;saveDSPBCNTR = I915_READ(DSPBCNTR);</div><div class='add'>+	dev_priv-&gt;saveDSPBSTRIDE = I915_READ(DSPBSTRIDE);</div><div class='add'>+	dev_priv-&gt;saveDSPBSIZE = I915_READ(DSPBSIZE);</div><div class='add'>+	dev_priv-&gt;saveDSPBPOS = I915_READ(DSPBPOS);</div><div class='add'>+	dev_priv-&gt;saveDSPBADDR = I915_READ(DSPBADDR);</div><div class='add'>+	if (IS_I965GM(dev) || IS_GM45(dev)) {</div><div class='add'>+		dev_priv-&gt;saveDSPBSURF = I915_READ(DSPBSURF);</div><div class='add'>+		dev_priv-&gt;saveDSPBTILEOFF = I915_READ(DSPBTILEOFF);</div><div class='add'>+	}</div><div class='add'>+	i915_save_palette(dev, PIPE_B);</div><div class='add'>+	dev_priv-&gt;savePIPEBSTAT = I915_READ(PIPEBSTAT);</div><div class='add'>+</div><div class='add'>+	/* CRT state */</div><div class='add'>+	dev_priv-&gt;saveADPA = I915_READ(ADPA);</div><div class='add'>+</div><div class='add'>+	/* LVDS state */</div><div class='add'>+	dev_priv-&gt;savePP_CONTROL = I915_READ(PP_CONTROL);</div><div class='add'>+	dev_priv-&gt;savePFIT_PGM_RATIOS = I915_READ(PFIT_PGM_RATIOS);</div><div class='add'>+	dev_priv-&gt;saveBLC_PWM_CTL = I915_READ(BLC_PWM_CTL);</div><div class='add'>+	if (IS_I965G(dev))</div><div class='add'>+		dev_priv-&gt;saveBLC_PWM_CTL2 = I915_READ(BLC_PWM_CTL2);</div><div class='add'>+	if (IS_MOBILE(dev) &amp;&amp; !IS_I830(dev))</div><div class='add'>+		dev_priv-&gt;saveLVDS = I915_READ(LVDS);</div><div class='add'>+	if (!IS_I830(dev) &amp;&amp; !IS_845G(dev))</div><div class='add'>+		dev_priv-&gt;savePFIT_CONTROL = I915_READ(PFIT_CONTROL);</div><div class='add'>+	dev_priv-&gt;savePP_ON_DELAYS = I915_READ(PP_ON_DELAYS);</div><div class='add'>+	dev_priv-&gt;savePP_OFF_DELAYS = I915_READ(PP_OFF_DELAYS);</div><div class='add'>+	dev_priv-&gt;savePP_DIVISOR = I915_READ(PP_DIVISOR);</div><div class='add'>+</div><div class='add'>+	/* FIXME: save TV &amp; SDVO state */</div><div class='add'>+</div><div class='add'>+	/* FBC state */</div><div class='add'>+	dev_priv-&gt;saveFBC_CFB_BASE = I915_READ(FBC_CFB_BASE);</div><div class='add'>+	dev_priv-&gt;saveFBC_LL_BASE = I915_READ(FBC_LL_BASE);</div><div class='add'>+	dev_priv-&gt;saveFBC_CONTROL2 = I915_READ(FBC_CONTROL2);</div><div class='add'>+	dev_priv-&gt;saveFBC_CONTROL = I915_READ(FBC_CONTROL);</div><div class='add'>+</div><div class='add'>+	/* Interrupt state */</div><div class='add'>+	dev_priv-&gt;saveIIR = I915_READ(IIR);</div><div class='add'>+	dev_priv-&gt;saveIER = I915_READ(IER);</div><div class='add'>+	dev_priv-&gt;saveIMR = I915_READ(IMR);</div><div class='add'>+</div><div class='add'>+	/* VGA state */</div><div class='add'>+	dev_priv-&gt;saveVGA0 = I915_READ(VGA0);</div><div class='add'>+	dev_priv-&gt;saveVGA1 = I915_READ(VGA1);</div><div class='add'>+	dev_priv-&gt;saveVGA_PD = I915_READ(VGA_PD);</div><div class='add'>+	dev_priv-&gt;saveVGACNTRL = I915_READ(VGACNTRL);</div><div class='add'>+</div><div class='add'>+	/* Clock gating state */</div><div class='add'>+	dev_priv-&gt;saveD_STATE = I915_READ(D_STATE);</div><div class='add'>+	dev_priv-&gt;saveCG_2D_DIS = I915_READ(CG_2D_DIS);</div><div class='add'>+</div><div class='add'>+	/* Cache mode state */</div><div class='add'>+	dev_priv-&gt;saveCACHE_MODE_0 = I915_READ(CACHE_MODE_0);</div><div class='add'>+</div><div class='add'>+	/* Memory Arbitration state */</div><div class='add'>+	dev_priv-&gt;saveMI_ARB_STATE = I915_READ(MI_ARB_STATE);</div><div class='add'>+</div><div class='add'>+	/* Scratch space */</div><div class='add'>+	for (i = 0; i &lt; 16; i++) {</div><div class='add'>+		dev_priv-&gt;saveSWF0[i] = I915_READ(SWF00 + (i &lt;&lt; 2));</div><div class='add'>+		dev_priv-&gt;saveSWF1[i] = I915_READ(SWF10 + (i &lt;&lt; 2));</div><div class='add'>+	}</div><div class='add'>+	for (i = 0; i &lt; 3; i++)</div><div class='add'>+		dev_priv-&gt;saveSWF2[i] = I915_READ(SWF30 + (i &lt;&lt; 2));</div><div class='add'>+</div><div class='add'>+	i915_save_vga(dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int i915_restore_state(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_i915_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	pci_write_config_byte(dev-&gt;pdev, LBB, dev_priv-&gt;saveLBB);</div><div class='add'>+</div><div class='add'>+	I915_WRITE(DSPARB, dev_priv-&gt;saveDSPARB);</div><div class='add'>+</div><div class='add'>+	/* Pipe &amp; plane A info */</div><div class='add'>+	/* Prime the clock */</div><div class='add'>+	if (dev_priv-&gt;saveDPLL_A &amp; DPLL_VCO_ENABLE) {</div><div class='add'>+		I915_WRITE(DPLL_A, dev_priv-&gt;saveDPLL_A &amp;</div><div class='add'>+			   ~DPLL_VCO_ENABLE);</div><div class='add'>+		DRM_UDELAY(150);</div><div class='add'>+	}</div><div class='add'>+	I915_WRITE(FPA0, dev_priv-&gt;saveFPA0);</div><div class='add'>+	I915_WRITE(FPA1, dev_priv-&gt;saveFPA1);</div><div class='add'>+	/* Actually enable it */</div><div class='add'>+	I915_WRITE(DPLL_A, dev_priv-&gt;saveDPLL_A);</div><div class='add'>+	DRM_UDELAY(150);</div><div class='add'>+	if (IS_I965G(dev))</div><div class='add'>+		I915_WRITE(DPLL_A_MD, dev_priv-&gt;saveDPLL_A_MD);</div><div class='add'>+	DRM_UDELAY(150);</div><div class='add'>+</div><div class='add'>+	/* Restore mode */</div><div class='add'>+	I915_WRITE(HTOTAL_A, dev_priv-&gt;saveHTOTAL_A);</div><div class='add'>+	I915_WRITE(HBLANK_A, dev_priv-&gt;saveHBLANK_A);</div><div class='add'>+	I915_WRITE(HSYNC_A, dev_priv-&gt;saveHSYNC_A);</div><div class='add'>+	I915_WRITE(VTOTAL_A, dev_priv-&gt;saveVTOTAL_A);</div><div class='add'>+	I915_WRITE(VBLANK_A, dev_priv-&gt;saveVBLANK_A);</div><div class='add'>+	I915_WRITE(VSYNC_A, dev_priv-&gt;saveVSYNC_A);</div><div class='add'>+	I915_WRITE(BCLRPAT_A, dev_priv-&gt;saveBCLRPAT_A);</div><div class='add'>+</div><div class='add'>+	/* Restore plane info */</div><div class='add'>+	I915_WRITE(DSPASIZE, dev_priv-&gt;saveDSPASIZE);</div><div class='add'>+	I915_WRITE(DSPAPOS, dev_priv-&gt;saveDSPAPOS);</div><div class='add'>+	I915_WRITE(PIPEASRC, dev_priv-&gt;savePIPEASRC);</div><div class='add'>+	I915_WRITE(DSPAADDR, dev_priv-&gt;saveDSPAADDR);</div><div class='add'>+	I915_WRITE(DSPASTRIDE, dev_priv-&gt;saveDSPASTRIDE);</div><div class='add'>+	if (IS_I965G(dev)) {</div><div class='add'>+		I915_WRITE(DSPASURF, dev_priv-&gt;saveDSPASURF);</div><div class='add'>+		I915_WRITE(DSPATILEOFF, dev_priv-&gt;saveDSPATILEOFF);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	I915_WRITE(PIPEACONF, dev_priv-&gt;savePIPEACONF);</div><div class='add'>+</div><div class='add'>+	i915_restore_palette(dev, PIPE_A);</div><div class='add'>+	/* Enable the plane */</div><div class='add'>+	I915_WRITE(DSPACNTR, dev_priv-&gt;saveDSPACNTR);</div><div class='add'>+	I915_WRITE(DSPAADDR, I915_READ(DSPAADDR));</div><div class='add'>+</div><div class='add'>+	/* Pipe &amp; plane B info */</div><div class='add'>+	if (dev_priv-&gt;saveDPLL_B &amp; DPLL_VCO_ENABLE) {</div><div class='add'>+		I915_WRITE(DPLL_B, dev_priv-&gt;saveDPLL_B &amp;</div><div class='add'>+			   ~DPLL_VCO_ENABLE);</div><div class='add'>+		DRM_UDELAY(150);</div><div class='add'>+	}</div><div class='add'>+	I915_WRITE(FPB0, dev_priv-&gt;saveFPB0);</div><div class='add'>+	I915_WRITE(FPB1, dev_priv-&gt;saveFPB1);</div><div class='add'>+	/* Actually enable it */</div><div class='add'>+	I915_WRITE(DPLL_B, dev_priv-&gt;saveDPLL_B);</div><div class='add'>+	DRM_UDELAY(150);</div><div class='add'>+	if (IS_I965G(dev))</div><div class='add'>+		I915_WRITE(DPLL_B_MD, dev_priv-&gt;saveDPLL_B_MD);</div><div class='add'>+	DRM_UDELAY(150);</div><div class='add'>+</div><div class='add'>+	/* Restore mode */</div><div class='add'>+	I915_WRITE(HTOTAL_B, dev_priv-&gt;saveHTOTAL_B);</div><div class='add'>+	I915_WRITE(HBLANK_B, dev_priv-&gt;saveHBLANK_B);</div><div class='add'>+	I915_WRITE(HSYNC_B, dev_priv-&gt;saveHSYNC_B);</div><div class='add'>+	I915_WRITE(VTOTAL_B, dev_priv-&gt;saveVTOTAL_B);</div><div class='add'>+	I915_WRITE(VBLANK_B, dev_priv-&gt;saveVBLANK_B);</div><div class='add'>+	I915_WRITE(VSYNC_B, dev_priv-&gt;saveVSYNC_B);</div><div class='add'>+	I915_WRITE(BCLRPAT_B, dev_priv-&gt;saveBCLRPAT_B);</div><div class='add'>+</div><div class='add'>+	/* Restore plane info */</div><div class='add'>+	I915_WRITE(DSPBSIZE, dev_priv-&gt;saveDSPBSIZE);</div><div class='add'>+	I915_WRITE(DSPBPOS, dev_priv-&gt;saveDSPBPOS);</div><div class='add'>+	I915_WRITE(PIPEBSRC, dev_priv-&gt;savePIPEBSRC);</div><div class='add'>+	I915_WRITE(DSPBADDR, dev_priv-&gt;saveDSPBADDR);</div><div class='add'>+	I915_WRITE(DSPBSTRIDE, dev_priv-&gt;saveDSPBSTRIDE);</div><div class='add'>+	if (IS_I965G(dev)) {</div><div class='add'>+		I915_WRITE(DSPBSURF, dev_priv-&gt;saveDSPBSURF);</div><div class='add'>+		I915_WRITE(DSPBTILEOFF, dev_priv-&gt;saveDSPBTILEOFF);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	I915_WRITE(PIPEBCONF, dev_priv-&gt;savePIPEBCONF);</div><div class='add'>+</div><div class='add'>+	i915_restore_palette(dev, PIPE_B);</div><div class='add'>+	/* Enable the plane */</div><div class='add'>+	I915_WRITE(DSPBCNTR, dev_priv-&gt;saveDSPBCNTR);</div><div class='add'>+	I915_WRITE(DSPBADDR, I915_READ(DSPBADDR));</div><div class='add'>+</div><div class='add'>+	/* CRT state */</div><div class='add'>+	I915_WRITE(ADPA, dev_priv-&gt;saveADPA);</div><div class='add'>+</div><div class='add'>+	/* LVDS state */</div><div class='add'>+	if (IS_I965G(dev))</div><div class='add'>+		I915_WRITE(BLC_PWM_CTL2, dev_priv-&gt;saveBLC_PWM_CTL2);</div><div class='add'>+	if (IS_MOBILE(dev) &amp;&amp; !IS_I830(dev))</div><div class='add'>+		I915_WRITE(LVDS, dev_priv-&gt;saveLVDS);</div><div class='add'>+	if (!IS_I830(dev) &amp;&amp; !IS_845G(dev))</div><div class='add'>+		I915_WRITE(PFIT_CONTROL, dev_priv-&gt;savePFIT_CONTROL);</div><div class='add'>+</div><div class='add'>+	I915_WRITE(PFIT_PGM_RATIOS, dev_priv-&gt;savePFIT_PGM_RATIOS);</div><div class='add'>+	I915_WRITE(BLC_PWM_CTL, dev_priv-&gt;saveBLC_PWM_CTL);</div><div class='add'>+	I915_WRITE(PP_ON_DELAYS, dev_priv-&gt;savePP_ON_DELAYS);</div><div class='add'>+	I915_WRITE(PP_OFF_DELAYS, dev_priv-&gt;savePP_OFF_DELAYS);</div><div class='add'>+	I915_WRITE(PP_DIVISOR, dev_priv-&gt;savePP_DIVISOR);</div><div class='add'>+	I915_WRITE(PP_CONTROL, dev_priv-&gt;savePP_CONTROL);</div><div class='add'>+</div><div class='add'>+	/* FIXME: restore TV &amp; SDVO state */</div><div class='add'>+</div><div class='add'>+	/* FBC info */</div><div class='add'>+	I915_WRITE(FBC_CFB_BASE, dev_priv-&gt;saveFBC_CFB_BASE);</div><div class='add'>+	I915_WRITE(FBC_LL_BASE, dev_priv-&gt;saveFBC_LL_BASE);</div><div class='add'>+	I915_WRITE(FBC_CONTROL2, dev_priv-&gt;saveFBC_CONTROL2);</div><div class='add'>+	I915_WRITE(FBC_CONTROL, dev_priv-&gt;saveFBC_CONTROL);</div><div class='add'>+</div><div class='add'>+	/* VGA state */</div><div class='add'>+	I915_WRITE(VGACNTRL, dev_priv-&gt;saveVGACNTRL);</div><div class='add'>+	I915_WRITE(VGA0, dev_priv-&gt;saveVGA0);</div><div class='add'>+	I915_WRITE(VGA1, dev_priv-&gt;saveVGA1);</div><div class='add'>+	I915_WRITE(VGA_PD, dev_priv-&gt;saveVGA_PD);</div><div class='add'>+	DRM_UDELAY(150);</div><div class='add'>+</div><div class='add'>+	/* Clock gating state */</div><div class='add'>+	I915_WRITE (D_STATE, dev_priv-&gt;saveD_STATE);</div><div class='add'>+	I915_WRITE (CG_2D_DIS, dev_priv-&gt;saveCG_2D_DIS);</div><div class='add'>+</div><div class='add'>+	/* Cache mode state */</div><div class='add'>+	I915_WRITE (CACHE_MODE_0, dev_priv-&gt;saveCACHE_MODE_0 | 0xffff0000);</div><div class='add'>+</div><div class='add'>+	/* Memory arbitration state */</div><div class='add'>+	I915_WRITE (MI_ARB_STATE, dev_priv-&gt;saveMI_ARB_STATE | 0xffff0000);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 16; i++) {</div><div class='add'>+		I915_WRITE(SWF00 + (i &lt;&lt; 2), dev_priv-&gt;saveSWF0[i]);</div><div class='add'>+		I915_WRITE(SWF10 + (i &lt;&lt; 2), dev_priv-&gt;saveSWF1[i+7]);</div><div class='add'>+	}</div><div class='add'>+	for (i = 0; i &lt; 3; i++)</div><div class='add'>+		I915_WRITE(SWF30 + (i &lt;&lt; 2), dev_priv-&gt;saveSWF2[i]);</div><div class='add'>+</div><div class='add'>+	i915_restore_vga(dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='head'>diff --git a/drivers/gpu/drm/mga/mga_drv.c b/drivers/gpu/drm/mga/mga_drv.c<br/>index 5572939fc7d1..97ee566ef749 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpu/drm/mga/mga_drv.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/gpu/drm/mga/mga_drv.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpu/drm/mga/mga_drv.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/mga/mga_drv.c</a></div><div class='hunk'>@@ -45,15 +45,16 @@ static struct pci_device_id pciidlist[] = {</div><div class='ctx'> static struct drm_driver driver = {</div><div class='ctx'> 	.driver_features =</div><div class='ctx'> 	    DRIVER_USE_AGP | DRIVER_USE_MTRR | DRIVER_PCI_DMA |</div><div class='del'>-	    DRIVER_HAVE_DMA | DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED |</div><div class='del'>-	    DRIVER_IRQ_VBL,</div><div class='add'>+	    DRIVER_HAVE_DMA | DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED,</div><div class='ctx'> 	.dev_priv_size = sizeof(drm_mga_buf_priv_t),</div><div class='ctx'> 	.load = mga_driver_load,</div><div class='ctx'> 	.unload = mga_driver_unload,</div><div class='ctx'> 	.lastclose = mga_driver_lastclose,</div><div class='ctx'> 	.dma_quiescent = mga_driver_dma_quiescent,</div><div class='ctx'> 	.device_is_agp = mga_driver_device_is_agp,</div><div class='del'>-	.vblank_wait = mga_driver_vblank_wait,</div><div class='add'>+	.get_vblank_counter = mga_get_vblank_counter,</div><div class='add'>+	.enable_vblank = mga_enable_vblank,</div><div class='add'>+	.disable_vblank = mga_disable_vblank,</div><div class='ctx'> 	.irq_preinstall = mga_driver_irq_preinstall,</div><div class='ctx'> 	.irq_postinstall = mga_driver_irq_postinstall,</div><div class='ctx'> 	.irq_uninstall = mga_driver_irq_uninstall,</div><div class='hunk'>@@ -64,20 +65,20 @@ static struct drm_driver driver = {</div><div class='ctx'> 	.ioctls = mga_ioctls,</div><div class='ctx'> 	.dma_ioctl = mga_dma_buffers,</div><div class='ctx'> 	.fops = {</div><div class='del'>-		 .owner = THIS_MODULE,</div><div class='del'>-		 .open = drm_open,</div><div class='del'>-		 .release = drm_release,</div><div class='del'>-		 .ioctl = drm_ioctl,</div><div class='del'>-		 .mmap = drm_mmap,</div><div class='del'>-		 .poll = drm_poll,</div><div class='del'>-		 .fasync = drm_fasync,</div><div class='add'>+		.owner = THIS_MODULE,</div><div class='add'>+		.open = drm_open,</div><div class='add'>+		.release = drm_release,</div><div class='add'>+		.ioctl = drm_ioctl,</div><div class='add'>+		.mmap = drm_mmap,</div><div class='add'>+		.poll = drm_poll,</div><div class='add'>+		.fasync = drm_fasync,</div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='del'>-		 .compat_ioctl = mga_compat_ioctl,</div><div class='add'>+		.compat_ioctl = mga_compat_ioctl,</div><div class='ctx'> #endif</div><div class='del'>-		 },</div><div class='add'>+	},</div><div class='ctx'> 	.pci_driver = {</div><div class='del'>-		 .name = DRIVER_NAME,</div><div class='del'>-		 .id_table = pciidlist,</div><div class='add'>+		.name = DRIVER_NAME,</div><div class='add'>+		.id_table = pciidlist,</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='ctx'> 	.name = DRIVER_NAME,</div><div class='head'>diff --git a/drivers/gpu/drm/mga/mga_drv.h b/drivers/gpu/drm/mga/mga_drv.h<br/>index f6ebd24bd587..88257c276eb9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpu/drm/mga/mga_drv.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/gpu/drm/mga/mga_drv.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpu/drm/mga/mga_drv.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/mga/mga_drv.h</a></div><div class='hunk'>@@ -120,6 +120,7 @@ typedef struct drm_mga_private {</div><div class='ctx'> 	u32 clear_cmd;</div><div class='ctx'> 	u32 maccess;</div><div class='ctx'> </div><div class='add'>+	atomic_t vbl_received;          /**&lt; Number of vblanks received. */</div><div class='ctx'> 	wait_queue_head_t fence_queue;</div><div class='ctx'> 	atomic_t last_fence_retired;</div><div class='ctx'> 	u32 next_fence_to_post;</div><div class='hunk'>@@ -181,11 +182,14 @@ extern int mga_warp_install_microcode(drm_mga_private_t * dev_priv);</div><div class='ctx'> extern int mga_warp_init(drm_mga_private_t * dev_priv);</div><div class='ctx'> </div><div class='ctx'> 				/* mga_irq.c */</div><div class='add'>+extern int mga_enable_vblank(struct drm_device *dev, int crtc);</div><div class='add'>+extern void mga_disable_vblank(struct drm_device *dev, int crtc);</div><div class='add'>+extern u32 mga_get_vblank_counter(struct drm_device *dev, int crtc);</div><div class='ctx'> extern int mga_driver_fence_wait(struct drm_device * dev, unsigned int *sequence);</div><div class='ctx'> extern int mga_driver_vblank_wait(struct drm_device * dev, unsigned int *sequence);</div><div class='ctx'> extern irqreturn_t mga_driver_irq_handler(DRM_IRQ_ARGS);</div><div class='ctx'> extern void mga_driver_irq_preinstall(struct drm_device * dev);</div><div class='del'>-extern void mga_driver_irq_postinstall(struct drm_device * dev);</div><div class='add'>+extern int mga_driver_irq_postinstall(struct drm_device *dev);</div><div class='ctx'> extern void mga_driver_irq_uninstall(struct drm_device * dev);</div><div class='ctx'> extern long mga_compat_ioctl(struct file *filp, unsigned int cmd,</div><div class='ctx'> 			     unsigned long arg);</div><div class='head'>diff --git a/drivers/gpu/drm/mga/mga_irq.c b/drivers/gpu/drm/mga/mga_irq.c<br/>index 9302cb8f0f83..bab42f41188b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpu/drm/mga/mga_irq.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/gpu/drm/mga/mga_irq.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpu/drm/mga/mga_irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/mga/mga_irq.c</a></div><div class='hunk'>@@ -1,5 +1,6 @@</div><div class='ctx'> /* mga_irq.c -- IRQ handling for radeon -*- linux-c -*-</div><div class='del'>- *</div><div class='add'>+ */</div><div class='add'>+/*</div><div class='ctx'>  * Copyright (C) The Weather Channel, Inc.  2002.  All Rights Reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * The Weather Channel (TM) funded Tungsten Graphics to develop the</div><div class='hunk'>@@ -35,6 +36,18 @@</div><div class='ctx'> #include "mga_drm.h"</div><div class='ctx'> #include "mga_drv.h"</div><div class='ctx'> </div><div class='add'>+u32 mga_get_vblank_counter(struct drm_device *dev, int crtc)</div><div class='add'>+{</div><div class='add'>+	const drm_mga_private_t *const dev_priv =</div><div class='add'>+		(drm_mga_private_t *) dev-&gt;dev_private;</div><div class='add'>+</div><div class='add'>+	if (crtc != 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return atomic_read(&amp;dev_priv-&gt;vbl_received);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> irqreturn_t mga_driver_irq_handler(DRM_IRQ_ARGS)</div><div class='ctx'> {</div><div class='ctx'> 	struct drm_device *dev = (struct drm_device *) arg;</div><div class='hunk'>@@ -47,9 +60,8 @@ irqreturn_t mga_driver_irq_handler(DRM_IRQ_ARGS)</div><div class='ctx'> 	/* VBLANK interrupt */</div><div class='ctx'> 	if (status &amp; MGA_VLINEPEN) {</div><div class='ctx'> 		MGA_WRITE(MGA_ICLEAR, MGA_VLINEICLR);</div><div class='del'>-		atomic_inc(&amp;dev-&gt;vbl_received);</div><div class='del'>-		DRM_WAKEUP(&amp;dev-&gt;vbl_queue);</div><div class='del'>-		drm_vbl_send_signals(dev);</div><div class='add'>+		atomic_inc(&amp;dev_priv-&gt;vbl_received);</div><div class='add'>+		drm_handle_vblank(dev, 0);</div><div class='ctx'> 		handled = 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -58,6 +70,7 @@ irqreturn_t mga_driver_irq_handler(DRM_IRQ_ARGS)</div><div class='ctx'> 		const u32 prim_start = MGA_READ(MGA_PRIMADDRESS);</div><div class='ctx'> 		const u32 prim_end = MGA_READ(MGA_PRIMEND);</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> 		MGA_WRITE(MGA_ICLEAR, MGA_SOFTRAPICLR);</div><div class='ctx'> </div><div class='ctx'> 		/* In addition to clearing the interrupt-pending bit, we</div><div class='hunk'>@@ -72,28 +85,39 @@ irqreturn_t mga_driver_irq_handler(DRM_IRQ_ARGS)</div><div class='ctx'> 		handled = 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (handled) {</div><div class='add'>+	if (handled)</div><div class='ctx'> 		return IRQ_HANDLED;</div><div class='del'>-	}</div><div class='ctx'> 	return IRQ_NONE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mga_driver_vblank_wait(struct drm_device * dev, unsigned int *sequence)</div><div class='add'>+int mga_enable_vblank(struct drm_device *dev, int crtc)</div><div class='ctx'> {</div><div class='del'>-	unsigned int cur_vblank;</div><div class='del'>-	int ret = 0;</div><div class='add'>+	drm_mga_private_t *dev_priv = (drm_mga_private_t *) dev-&gt;dev_private;</div><div class='ctx'> </div><div class='del'>-	/* Assume that the user has missed the current sequence number</div><div class='del'>-	 * by about a day rather than she wants to wait for years</div><div class='del'>-	 * using vertical blanks...</div><div class='del'>-	 */</div><div class='del'>-	DRM_WAIT_ON(ret, dev-&gt;vbl_queue, 3 * DRM_HZ,</div><div class='del'>-		    (((cur_vblank = atomic_read(&amp;dev-&gt;vbl_received))</div><div class='del'>-		      - *sequence) &lt;= (1 &lt;&lt; 23)));</div><div class='add'>+	if (crtc != 0) {</div><div class='add'>+		DRM_ERROR("tried to enable vblank on non-existent crtc %d\n",</div><div class='add'>+			  crtc);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	*sequence = cur_vblank;</div><div class='add'>+	MGA_WRITE(MGA_IEN, MGA_VLINEIEN | MGA_SOFTRAPEN);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+</div><div class='add'>+void mga_disable_vblank(struct drm_device *dev, int crtc)</div><div class='add'>+{</div><div class='add'>+	if (crtc != 0) {</div><div class='add'>+		DRM_ERROR("tried to disable vblank on non-existent crtc %d\n",</div><div class='add'>+			  crtc);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Do *NOT* disable the vertical refresh interrupt.  MGA doesn't have</div><div class='add'>+	 * a nice hardware counter that tracks the number of refreshes when</div><div class='add'>+	 * the interrupt is disabled, and the kernel doesn't know the refresh</div><div class='add'>+	 * rate to calculate an estimate.</div><div class='add'>+	 */</div><div class='add'>+	/* MGA_WRITE(MGA_IEN, MGA_VLINEIEN | MGA_SOFTRAPEN); */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int mga_driver_fence_wait(struct drm_device * dev, unsigned int *sequence)</div><div class='hunk'>@@ -125,14 +149,22 @@ void mga_driver_irq_preinstall(struct drm_device * dev)</div><div class='ctx'> 	MGA_WRITE(MGA_ICLEAR, ~0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void mga_driver_irq_postinstall(struct drm_device * dev)</div><div class='add'>+int mga_driver_irq_postinstall(struct drm_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	drm_mga_private_t *dev_priv = (drm_mga_private_t *) dev-&gt;dev_private;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = drm_vblank_init(dev, 1);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	DRM_INIT_WAITQUEUE(&amp;dev_priv-&gt;fence_queue);</div><div class='ctx'> </div><div class='del'>-	/* Turn on vertical blank interrupt and soft trap interrupt. */</div><div class='del'>-	MGA_WRITE(MGA_IEN, MGA_VLINEIEN | MGA_SOFTRAPEN);</div><div class='add'>+	/* Turn on soft trap interrupt.  Vertical blank interrupts are enabled</div><div class='add'>+	 * in mga_enable_vblank.</div><div class='add'>+	 */</div><div class='add'>+	MGA_WRITE(MGA_IEN, MGA_SOFTRAPEN);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void mga_driver_irq_uninstall(struct drm_device * dev)</div><div class='head'>diff --git a/drivers/gpu/drm/mga/mga_state.c b/drivers/gpu/drm/mga/mga_state.c<br/>index d3f8aade07b3..b710fab21cb3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpu/drm/mga/mga_state.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/gpu/drm/mga/mga_state.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpu/drm/mga/mga_state.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/mga/mga_state.c</a></div><div class='hunk'>@@ -1022,7 +1022,7 @@ static int mga_getparam(struct drm_device *dev, void *data, struct drm_file *fil</div><div class='ctx'> </div><div class='ctx'> 	switch (param-&gt;param) {</div><div class='ctx'> 	case MGA_PARAM_IRQ_NR:</div><div class='del'>-		value = dev-&gt;irq;</div><div class='add'>+		value = drm_dev_to_irq(dev);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case MGA_PARAM_CARD_TYPE:</div><div class='ctx'> 		value = dev_priv-&gt;chipset;</div><div class='head'>diff --git a/drivers/gpu/drm/r128/r128_drv.c b/drivers/gpu/drm/r128/r128_drv.c<br/>index 6108e7587e12..3265d53ba91f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpu/drm/r128/r128_drv.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/gpu/drm/r128/r128_drv.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpu/drm/r128/r128_drv.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/r128/r128_drv.c</a></div><div class='hunk'>@@ -43,12 +43,13 @@ static struct pci_device_id pciidlist[] = {</div><div class='ctx'> static struct drm_driver driver = {</div><div class='ctx'> 	.driver_features =</div><div class='ctx'> 	    DRIVER_USE_AGP | DRIVER_USE_MTRR | DRIVER_PCI_DMA | DRIVER_SG |</div><div class='del'>-	    DRIVER_HAVE_DMA | DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED |</div><div class='del'>-	    DRIVER_IRQ_VBL,</div><div class='add'>+	    DRIVER_HAVE_DMA | DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED,</div><div class='ctx'> 	.dev_priv_size = sizeof(drm_r128_buf_priv_t),</div><div class='ctx'> 	.preclose = r128_driver_preclose,</div><div class='ctx'> 	.lastclose = r128_driver_lastclose,</div><div class='del'>-	.vblank_wait = r128_driver_vblank_wait,</div><div class='add'>+	.get_vblank_counter = r128_get_vblank_counter,</div><div class='add'>+	.enable_vblank = r128_enable_vblank,</div><div class='add'>+	.disable_vblank = r128_disable_vblank,</div><div class='ctx'> 	.irq_preinstall = r128_driver_irq_preinstall,</div><div class='ctx'> 	.irq_postinstall = r128_driver_irq_postinstall,</div><div class='ctx'> 	.irq_uninstall = r128_driver_irq_uninstall,</div><div class='hunk'>@@ -59,21 +60,20 @@ static struct drm_driver driver = {</div><div class='ctx'> 	.ioctls = r128_ioctls,</div><div class='ctx'> 	.dma_ioctl = r128_cce_buffers,</div><div class='ctx'> 	.fops = {</div><div class='del'>-		 .owner = THIS_MODULE,</div><div class='del'>-		 .open = drm_open,</div><div class='del'>-		 .release = drm_release,</div><div class='del'>-		 .ioctl = drm_ioctl,</div><div class='del'>-		 .mmap = drm_mmap,</div><div class='del'>-		 .poll = drm_poll,</div><div class='del'>-		 .fasync = drm_fasync,</div><div class='add'>+		.owner = THIS_MODULE,</div><div class='add'>+		.open = drm_open,</div><div class='add'>+		.release = drm_release,</div><div class='add'>+		.ioctl = drm_ioctl,</div><div class='add'>+		.mmap = drm_mmap,</div><div class='add'>+		.poll = drm_poll,</div><div class='add'>+		.fasync = drm_fasync,</div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='del'>-		 .compat_ioctl = r128_compat_ioctl,</div><div class='add'>+		.compat_ioctl = r128_compat_ioctl,</div><div class='ctx'> #endif</div><div class='ctx'> 	},</div><div class='del'>-</div><div class='ctx'> 	.pci_driver = {</div><div class='del'>-		 .name = DRIVER_NAME,</div><div class='del'>-		 .id_table = pciidlist,</div><div class='add'>+		.name = DRIVER_NAME,</div><div class='add'>+		.id_table = pciidlist,</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='ctx'> 	.name = DRIVER_NAME,</div><div class='hunk'>@@ -87,6 +87,7 @@ static struct drm_driver driver = {</div><div class='ctx'> static int __init r128_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	driver.num_ioctls = r128_max_ioctl;</div><div class='add'>+</div><div class='ctx'> 	return drm_init(&amp;driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/gpu/drm/r128/r128_drv.h b/drivers/gpu/drm/r128/r128_drv.h<br/>index 011105e51ac6..5898b274279d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpu/drm/r128/r128_drv.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/gpu/drm/r128/r128_drv.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpu/drm/r128/r128_drv.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/r128/r128_drv.h</a></div><div class='hunk'>@@ -29,7 +29,7 @@</div><div class='ctx'>  *    Rickard E. (Rik) Faith &lt;faith@valinux.com&gt;</div><div class='ctx'>  *    Kevin E. Martin &lt;martin@valinux.com&gt;</div><div class='ctx'>  *    Gareth Hughes &lt;gareth@valinux.com&gt;</div><div class='del'>- *    Michel Dänzer &lt;daenzerm@student.ethz.ch&gt;</div><div class='add'>+ *    Michel D�zer &lt;daenzerm@student.ethz.ch&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef __R128_DRV_H__</div><div class='hunk'>@@ -97,6 +97,8 @@ typedef struct drm_r128_private {</div><div class='ctx'> 	u32 crtc_offset;</div><div class='ctx'> 	u32 crtc_offset_cntl;</div><div class='ctx'> </div><div class='add'>+	atomic_t vbl_received;</div><div class='add'>+</div><div class='ctx'> 	u32 color_fmt;</div><div class='ctx'> 	unsigned int front_offset;</div><div class='ctx'> 	unsigned int front_pitch;</div><div class='hunk'>@@ -149,11 +151,12 @@ extern int r128_wait_ring(drm_r128_private_t * dev_priv, int n);</div><div class='ctx'> extern int r128_do_cce_idle(drm_r128_private_t * dev_priv);</div><div class='ctx'> extern int r128_do_cleanup_cce(struct drm_device * dev);</div><div class='ctx'> </div><div class='del'>-extern int r128_driver_vblank_wait(struct drm_device * dev, unsigned int *sequence);</div><div class='del'>-</div><div class='add'>+extern int r128_enable_vblank(struct drm_device *dev, int crtc);</div><div class='add'>+extern void r128_disable_vblank(struct drm_device *dev, int crtc);</div><div class='add'>+extern u32 r128_get_vblank_counter(struct drm_device *dev, int crtc);</div><div class='ctx'> extern irqreturn_t r128_driver_irq_handler(DRM_IRQ_ARGS);</div><div class='ctx'> extern void r128_driver_irq_preinstall(struct drm_device * dev);</div><div class='del'>-extern void r128_driver_irq_postinstall(struct drm_device * dev);</div><div class='add'>+extern int r128_driver_irq_postinstall(struct drm_device *dev);</div><div class='ctx'> extern void r128_driver_irq_uninstall(struct drm_device * dev);</div><div class='ctx'> extern void r128_driver_lastclose(struct drm_device * dev);</div><div class='ctx'> extern void r128_driver_preclose(struct drm_device * dev,</div><div class='head'>diff --git a/drivers/gpu/drm/r128/r128_irq.c b/drivers/gpu/drm/r128/r128_irq.c<br/>index c76fdca7662d..d7349012a680 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpu/drm/r128/r128_irq.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/gpu/drm/r128/r128_irq.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpu/drm/r128/r128_irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/r128/r128_irq.c</a></div><div class='hunk'>@@ -35,6 +35,16 @@</div><div class='ctx'> #include "r128_drm.h"</div><div class='ctx'> #include "r128_drv.h"</div><div class='ctx'> </div><div class='add'>+u32 r128_get_vblank_counter(struct drm_device *dev, int crtc)</div><div class='add'>+{</div><div class='add'>+	const drm_r128_private_t *dev_priv = dev-&gt;dev_private;</div><div class='add'>+</div><div class='add'>+	if (crtc != 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return atomic_read(&amp;dev_priv-&gt;vbl_received);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> irqreturn_t r128_driver_irq_handler(DRM_IRQ_ARGS)</div><div class='ctx'> {</div><div class='ctx'> 	struct drm_device *dev = (struct drm_device *) arg;</div><div class='hunk'>@@ -46,30 +56,38 @@ irqreturn_t r128_driver_irq_handler(DRM_IRQ_ARGS)</div><div class='ctx'> 	/* VBLANK interrupt */</div><div class='ctx'> 	if (status &amp; R128_CRTC_VBLANK_INT) {</div><div class='ctx'> 		R128_WRITE(R128_GEN_INT_STATUS, R128_CRTC_VBLANK_INT_AK);</div><div class='del'>-		atomic_inc(&amp;dev-&gt;vbl_received);</div><div class='del'>-		DRM_WAKEUP(&amp;dev-&gt;vbl_queue);</div><div class='del'>-		drm_vbl_send_signals(dev);</div><div class='add'>+		atomic_inc(&amp;dev_priv-&gt;vbl_received);</div><div class='add'>+		drm_handle_vblank(dev, 0);</div><div class='ctx'> 		return IRQ_HANDLED;</div><div class='ctx'> 	}</div><div class='ctx'> 	return IRQ_NONE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int r128_driver_vblank_wait(struct drm_device * dev, unsigned int *sequence)</div><div class='add'>+int r128_enable_vblank(struct drm_device *dev, int crtc)</div><div class='ctx'> {</div><div class='del'>-	unsigned int cur_vblank;</div><div class='del'>-	int ret = 0;</div><div class='add'>+	drm_r128_private_t *dev_priv = dev-&gt;dev_private;</div><div class='ctx'> </div><div class='del'>-	/* Assume that the user has missed the current sequence number</div><div class='del'>-	 * by about a day rather than she wants to wait for years</div><div class='del'>-	 * using vertical blanks...</div><div class='del'>-	 */</div><div class='del'>-	DRM_WAIT_ON(ret, dev-&gt;vbl_queue, 3 * DRM_HZ,</div><div class='del'>-		    (((cur_vblank = atomic_read(&amp;dev-&gt;vbl_received))</div><div class='del'>-		      - *sequence) &lt;= (1 &lt;&lt; 23)));</div><div class='add'>+	if (crtc != 0) {</div><div class='add'>+		DRM_ERROR("%s:  bad crtc %d\n", __func__, crtc);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	*sequence = cur_vblank;</div><div class='add'>+	R128_WRITE(R128_GEN_INT_CNTL, R128_CRTC_VBLANK_INT_EN);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void r128_disable_vblank(struct drm_device *dev, int crtc)</div><div class='add'>+{</div><div class='add'>+	if (crtc != 0)</div><div class='add'>+		DRM_ERROR("%s:  bad crtc %d\n", __func__, crtc);</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	/*</div><div class='add'>+	 * FIXME: implement proper interrupt disable by using the vblank</div><div class='add'>+	 * counter register (if available)</div><div class='add'>+	 *</div><div class='add'>+	 * R128_WRITE(R128_GEN_INT_CNTL,</div><div class='add'>+	 *            R128_READ(R128_GEN_INT_CNTL) &amp; ~R128_CRTC_VBLANK_INT_EN);</div><div class='add'>+	 */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void r128_driver_irq_preinstall(struct drm_device * dev)</div><div class='hunk'>@@ -82,12 +100,9 @@ void r128_driver_irq_preinstall(struct drm_device * dev)</div><div class='ctx'> 	R128_WRITE(R128_GEN_INT_STATUS, R128_CRTC_VBLANK_INT_AK);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void r128_driver_irq_postinstall(struct drm_device * dev)</div><div class='add'>+int r128_driver_irq_postinstall(struct drm_device *dev)</div><div class='ctx'> {</div><div class='del'>-	drm_r128_private_t *dev_priv = (drm_r128_private_t *) dev-&gt;dev_private;</div><div class='del'>-</div><div class='del'>-	/* Turn on VBL interrupt */</div><div class='del'>-	R128_WRITE(R128_GEN_INT_CNTL, R128_CRTC_VBLANK_INT_EN);</div><div class='add'>+	return drm_vblank_init(dev, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void r128_driver_irq_uninstall(struct drm_device * dev)</div><div class='head'>diff --git a/drivers/gpu/drm/r128/r128_state.c b/drivers/gpu/drm/r128/r128_state.c<br/>index 51a9afce7b9b..f7a5b5740764 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpu/drm/r128/r128_state.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/gpu/drm/r128/r128_state.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpu/drm/r128/r128_state.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/r128/r128_state.c</a></div><div class='hunk'>@@ -1629,7 +1629,7 @@ static int r128_getparam(struct drm_device *dev, void *data, struct drm_file *fi</div><div class='ctx'> </div><div class='ctx'> 	switch (param-&gt;param) {</div><div class='ctx'> 	case R128_PARAM_IRQ_NR:</div><div class='del'>-		value = dev-&gt;irq;</div><div class='add'>+		value = drm_dev_to_irq(dev);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EINVAL;</div><div class='head'>diff --git a/drivers/gpu/drm/radeon/radeon_cp.c b/drivers/gpu/drm/radeon/radeon_cp.c<br/>index 248ab4a7d39f..59a2132a8f57 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpu/drm/radeon/radeon_cp.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/gpu/drm/radeon/radeon_cp.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpu/drm/radeon/radeon_cp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/radeon/radeon_cp.c</a></div><div class='hunk'>@@ -71,7 +71,8 @@ static u32 RS690_READ_MCIND(drm_radeon_private_t *dev_priv, int addr)</div><div class='ctx'> </div><div class='ctx'> static u32 IGP_READ_MCIND(drm_radeon_private_t *dev_priv, int addr)</div><div class='ctx'> {</div><div class='del'>-	if ((dev_priv-&gt;flags &amp; RADEON_FAMILY_MASK) == CHIP_RS690)</div><div class='add'>+	if (((dev_priv-&gt;flags &amp; RADEON_FAMILY_MASK) == CHIP_RS690) ||</div><div class='add'>+	    ((dev_priv-&gt;flags &amp; RADEON_FAMILY_MASK) == CHIP_RS740))</div><div class='ctx'> 		return RS690_READ_MCIND(dev_priv, addr);</div><div class='ctx'> 	else</div><div class='ctx'> 		return RS480_READ_MCIND(dev_priv, addr);</div><div class='hunk'>@@ -82,7 +83,8 @@ u32 radeon_read_fb_location(drm_radeon_private_t *dev_priv)</div><div class='ctx'> </div><div class='ctx'> 	if ((dev_priv-&gt;flags &amp; RADEON_FAMILY_MASK) == CHIP_RV515)</div><div class='ctx'> 		return R500_READ_MCIND(dev_priv, RV515_MC_FB_LOCATION);</div><div class='del'>-	else if ((dev_priv-&gt;flags &amp; RADEON_FAMILY_MASK) == CHIP_RS690)</div><div class='add'>+	else if (((dev_priv-&gt;flags &amp; RADEON_FAMILY_MASK) == CHIP_RS690) ||</div><div class='add'>+		 ((dev_priv-&gt;flags &amp; RADEON_FAMILY_MASK) == CHIP_RS740))</div><div class='ctx'> 		return RS690_READ_MCIND(dev_priv, RS690_MC_FB_LOCATION);</div><div class='ctx'> 	else if ((dev_priv-&gt;flags &amp; RADEON_FAMILY_MASK) &gt; CHIP_RV515)</div><div class='ctx'> 		return R500_READ_MCIND(dev_priv, R520_MC_FB_LOCATION);</div><div class='hunk'>@@ -94,7 +96,8 @@ static void radeon_write_fb_location(drm_radeon_private_t *dev_priv, u32 fb_loc)</div><div class='ctx'> {</div><div class='ctx'> 	if ((dev_priv-&gt;flags &amp; RADEON_FAMILY_MASK) == CHIP_RV515)</div><div class='ctx'> 		R500_WRITE_MCIND(RV515_MC_FB_LOCATION, fb_loc);</div><div class='del'>-	else if ((dev_priv-&gt;flags &amp; RADEON_FAMILY_MASK) == CHIP_RS690)</div><div class='add'>+	else if (((dev_priv-&gt;flags &amp; RADEON_FAMILY_MASK) == CHIP_RS690) ||</div><div class='add'>+		 ((dev_priv-&gt;flags &amp; RADEON_FAMILY_MASK) == CHIP_RS740))</div><div class='ctx'> 		RS690_WRITE_MCIND(RS690_MC_FB_LOCATION, fb_loc);</div><div class='ctx'> 	else if ((dev_priv-&gt;flags &amp; RADEON_FAMILY_MASK) &gt; CHIP_RV515)</div><div class='ctx'> 		R500_WRITE_MCIND(R520_MC_FB_LOCATION, fb_loc);</div><div class='hunk'>@@ -106,7 +109,8 @@ static void radeon_write_agp_location(drm_radeon_private_t *dev_priv, u32 agp_lo</div><div class='ctx'> {</div><div class='ctx'> 	if ((dev_priv-&gt;flags &amp; RADEON_FAMILY_MASK) == CHIP_RV515)</div><div class='ctx'> 		R500_WRITE_MCIND(RV515_MC_AGP_LOCATION, agp_loc);</div><div class='del'>-	else if ((dev_priv-&gt;flags &amp; RADEON_FAMILY_MASK) == CHIP_RS690)</div><div class='add'>+	else if (((dev_priv-&gt;flags &amp; RADEON_FAMILY_MASK) == CHIP_RS690) ||</div><div class='add'>+		 ((dev_priv-&gt;flags &amp; RADEON_FAMILY_MASK) == CHIP_RS740))</div><div class='ctx'> 		RS690_WRITE_MCIND(RS690_MC_AGP_LOCATION, agp_loc);</div><div class='ctx'> 	else if ((dev_priv-&gt;flags &amp; RADEON_FAMILY_MASK) &gt; CHIP_RV515)</div><div class='ctx'> 		R500_WRITE_MCIND(R520_MC_AGP_LOCATION, agp_loc);</div><div class='hunk'>@@ -122,15 +126,17 @@ static void radeon_write_agp_base(drm_radeon_private_t *dev_priv, u64 agp_base)</div><div class='ctx'> 	if ((dev_priv-&gt;flags &amp; RADEON_FAMILY_MASK) == CHIP_RV515) {</div><div class='ctx'> 		R500_WRITE_MCIND(RV515_MC_AGP_BASE, agp_base_lo);</div><div class='ctx'> 		R500_WRITE_MCIND(RV515_MC_AGP_BASE_2, agp_base_hi);</div><div class='del'>-	} else if ((dev_priv-&gt;flags &amp; RADEON_FAMILY_MASK) == CHIP_RS690) {</div><div class='add'>+	} else if (((dev_priv-&gt;flags &amp; RADEON_FAMILY_MASK) == CHIP_RS690) ||</div><div class='add'>+		 ((dev_priv-&gt;flags &amp; RADEON_FAMILY_MASK) == CHIP_RS740)) {</div><div class='ctx'> 		RS690_WRITE_MCIND(RS690_MC_AGP_BASE, agp_base_lo);</div><div class='ctx'> 		RS690_WRITE_MCIND(RS690_MC_AGP_BASE_2, agp_base_hi);</div><div class='ctx'> 	} else if ((dev_priv-&gt;flags &amp; RADEON_FAMILY_MASK) &gt; CHIP_RV515) {</div><div class='ctx'> 		R500_WRITE_MCIND(R520_MC_AGP_BASE, agp_base_lo);</div><div class='ctx'> 		R500_WRITE_MCIND(R520_MC_AGP_BASE_2, agp_base_hi);</div><div class='del'>-	} else if ((dev_priv-&gt;flags &amp; RADEON_FAMILY_MASK) == CHIP_RS480) {</div><div class='add'>+	} else if (((dev_priv-&gt;flags &amp; RADEON_FAMILY_MASK) == CHIP_RS400) ||</div><div class='add'>+		   ((dev_priv-&gt;flags &amp; RADEON_FAMILY_MASK) == CHIP_RS480)) {</div><div class='ctx'> 		RADEON_WRITE(RADEON_AGP_BASE, agp_base_lo);</div><div class='del'>-		RADEON_WRITE(RS480_AGP_BASE_2, 0);</div><div class='add'>+		RADEON_WRITE(RS480_AGP_BASE_2, agp_base_hi);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		RADEON_WRITE(RADEON_AGP_BASE, agp_base_lo);</div><div class='ctx'> 		if ((dev_priv-&gt;flags &amp; RADEON_FAMILY_MASK) &gt;= CHIP_R200)</div><div class='hunk'>@@ -347,6 +353,7 @@ static void radeon_cp_load_microcode(drm_radeon_private_t * dev_priv)</div><div class='ctx'> 		   ((dev_priv-&gt;flags &amp; RADEON_FAMILY_MASK) == CHIP_R350) ||</div><div class='ctx'> 		   ((dev_priv-&gt;flags &amp; RADEON_FAMILY_MASK) == CHIP_RV350) ||</div><div class='ctx'> 		   ((dev_priv-&gt;flags &amp; RADEON_FAMILY_MASK) == CHIP_RV380) ||</div><div class='add'>+		   ((dev_priv-&gt;flags &amp; RADEON_FAMILY_MASK) == CHIP_RS400) ||</div><div class='ctx'> 		   ((dev_priv-&gt;flags &amp; RADEON_FAMILY_MASK) == CHIP_RS480)) {</div><div class='ctx'> 		DRM_INFO("Loading R300 Microcode\n");</div><div class='ctx'> 		for (i = 0; i &lt; 256; i++) {</div><div class='hunk'>@@ -356,6 +363,7 @@ static void radeon_cp_load_microcode(drm_radeon_private_t * dev_priv)</div><div class='ctx'> 				     R300_cp_microcode[i][0]);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else if (((dev_priv-&gt;flags &amp; RADEON_FAMILY_MASK) == CHIP_R420) ||</div><div class='add'>+		   ((dev_priv-&gt;flags &amp; RADEON_FAMILY_MASK) == CHIP_R423) ||</div><div class='ctx'> 		   ((dev_priv-&gt;flags &amp; RADEON_FAMILY_MASK) == CHIP_RV410)) {</div><div class='ctx'> 		DRM_INFO("Loading R400 Microcode\n");</div><div class='ctx'> 		for (i = 0; i &lt; 256; i++) {</div><div class='hunk'>@@ -364,8 +372,9 @@ static void radeon_cp_load_microcode(drm_radeon_private_t * dev_priv)</div><div class='ctx'> 			RADEON_WRITE(RADEON_CP_ME_RAM_DATAL,</div><div class='ctx'> 				     R420_cp_microcode[i][0]);</div><div class='ctx'> 		}</div><div class='del'>-	} else if ((dev_priv-&gt;flags &amp; RADEON_FAMILY_MASK) == CHIP_RS690) {</div><div class='del'>-		DRM_INFO("Loading RS690 Microcode\n");</div><div class='add'>+	} else if (((dev_priv-&gt;flags &amp; RADEON_FAMILY_MASK) == CHIP_RS690) ||</div><div class='add'>+		   ((dev_priv-&gt;flags &amp; RADEON_FAMILY_MASK) == CHIP_RS740)) {</div><div class='add'>+		DRM_INFO("Loading RS690/RS740 Microcode\n");</div><div class='ctx'> 		for (i = 0; i &lt; 256; i++) {</div><div class='ctx'> 			RADEON_WRITE(RADEON_CP_ME_RAM_DATAH,</div><div class='ctx'> 				     RS690_cp_microcode[i][1]);</div><div class='hunk'>@@ -626,8 +635,6 @@ static void radeon_cp_init_ring_buffer(struct drm_device * dev,</div><div class='ctx'> 		     dev_priv-&gt;ring.size_l2qw);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	/* Start with assuming that writeback doesn't work */</div><div class='del'>-	dev_priv-&gt;writeback_works = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize the scratch register pointer.  This will cause</div><div class='ctx'> 	 * the scratch register values to be written out to memory</div><div class='hunk'>@@ -646,8 +653,18 @@ static void radeon_cp_init_ring_buffer(struct drm_device * dev,</div><div class='ctx'> 	RADEON_WRITE(RADEON_SCRATCH_UMSK, 0x7);</div><div class='ctx'> </div><div class='ctx'> 	/* Turn on bus mastering */</div><div class='del'>-	tmp = RADEON_READ(RADEON_BUS_CNTL) &amp; ~RADEON_BUS_MASTER_DIS;</div><div class='del'>-	RADEON_WRITE(RADEON_BUS_CNTL, tmp);</div><div class='add'>+	if (((dev_priv-&gt;flags &amp; RADEON_FAMILY_MASK) == CHIP_RS400) ||</div><div class='add'>+	    ((dev_priv-&gt;flags &amp; RADEON_FAMILY_MASK) == CHIP_RS690) ||</div><div class='add'>+	    ((dev_priv-&gt;flags &amp; RADEON_FAMILY_MASK) == CHIP_RS740)) {</div><div class='add'>+		/* rs400, rs690/rs740 */</div><div class='add'>+		tmp = RADEON_READ(RADEON_BUS_CNTL) &amp; ~RS400_BUS_MASTER_DIS;</div><div class='add'>+		RADEON_WRITE(RADEON_BUS_CNTL, tmp);</div><div class='add'>+	} else if (!(((dev_priv-&gt;flags &amp; RADEON_FAMILY_MASK) == CHIP_RV380) ||</div><div class='add'>+		    ((dev_priv-&gt;flags &amp; RADEON_FAMILY_MASK) &gt;= CHIP_R423))) {</div><div class='add'>+		/* r1xx, r2xx, r300, r(v)350, r420/r481, rs480 */</div><div class='add'>+		tmp = RADEON_READ(RADEON_BUS_CNTL) &amp; ~RADEON_BUS_MASTER_DIS;</div><div class='add'>+		RADEON_WRITE(RADEON_BUS_CNTL, tmp);</div><div class='add'>+	} /* PCIE cards appears to not need this */</div><div class='ctx'> </div><div class='ctx'> 	dev_priv-&gt;sarea_priv-&gt;last_frame = dev_priv-&gt;scratch[0] = 0;</div><div class='ctx'> 	RADEON_WRITE(RADEON_LAST_FRAME_REG, dev_priv-&gt;sarea_priv-&gt;last_frame);</div><div class='hunk'>@@ -674,6 +691,9 @@ static void radeon_test_writeback(drm_radeon_private_t * dev_priv)</div><div class='ctx'> {</div><div class='ctx'> 	u32 tmp;</div><div class='ctx'> </div><div class='add'>+	/* Start with assuming that writeback doesn't work */</div><div class='add'>+	dev_priv-&gt;writeback_works = 0;</div><div class='add'>+</div><div class='ctx'> 	/* Writeback doesn't seem to work everywhere, test it here and possibly</div><div class='ctx'> 	 * enable it if it appears to work</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -719,7 +739,8 @@ static void radeon_set_igpgart(drm_radeon_private_t * dev_priv, int on)</div><div class='ctx'> 			  dev_priv-&gt;gart_size);</div><div class='ctx'> </div><div class='ctx'> 		temp = IGP_READ_MCIND(dev_priv, RS480_MC_MISC_CNTL);</div><div class='del'>-		if ((dev_priv-&gt;flags &amp; RADEON_FAMILY_MASK) == CHIP_RS690)</div><div class='add'>+		if (((dev_priv-&gt;flags &amp; RADEON_FAMILY_MASK) == CHIP_RS690) ||</div><div class='add'>+		    ((dev_priv-&gt;flags &amp; RADEON_FAMILY_MASK) == CHIP_RS740))</div><div class='ctx'> 			IGP_WRITE_MCIND(RS480_MC_MISC_CNTL, (RS480_GART_INDEX_REG_EN |</div><div class='ctx'> 							     RS690_BLOCK_GFX_D3_EN));</div><div class='ctx'> 		else</div><div class='hunk'>@@ -812,6 +833,7 @@ static void radeon_set_pcigart(drm_radeon_private_t * dev_priv, int on)</div><div class='ctx'> 	u32 tmp;</div><div class='ctx'> </div><div class='ctx'> 	if (((dev_priv-&gt;flags &amp; RADEON_FAMILY_MASK) == CHIP_RS690) ||</div><div class='add'>+	    ((dev_priv-&gt;flags &amp; RADEON_FAMILY_MASK) == CHIP_RS740) ||</div><div class='ctx'> 	    (dev_priv-&gt;flags &amp; RADEON_IS_IGPGART)) {</div><div class='ctx'> 		radeon_set_igpgart(dev_priv, on);</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -1286,7 +1308,7 @@ static int radeon_do_resume_cp(struct drm_device * dev)</div><div class='ctx'> 	radeon_cp_init_ring_buffer(dev, dev_priv);</div><div class='ctx'> </div><div class='ctx'> 	radeon_do_engine_reset(dev);</div><div class='del'>-	radeon_enable_interrupt(dev);</div><div class='add'>+	radeon_irq_set_state(dev, RADEON_SW_INT_ENABLE, 1);</div><div class='ctx'> </div><div class='ctx'> 	DRM_DEBUG("radeon_do_resume_cp() complete\n");</div><div class='ctx'> </div><div class='hunk'>@@ -1708,6 +1730,7 @@ int radeon_driver_load(struct drm_device *dev, unsigned long flags)</div><div class='ctx'> 	case CHIP_R300:</div><div class='ctx'> 	case CHIP_R350:</div><div class='ctx'> 	case CHIP_R420:</div><div class='add'>+	case CHIP_R423:</div><div class='ctx'> 	case CHIP_RV410:</div><div class='ctx'> 	case CHIP_RV515:</div><div class='ctx'> 	case CHIP_R520:</div><div class='head'>diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c<br/>index 637bd7faf132..71af746a4e47 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpu/drm/radeon/radeon_drv.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/gpu/drm/radeon/radeon_drv.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpu/drm/radeon/radeon_drv.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/radeon/radeon_drv.c</a></div><div class='hunk'>@@ -52,6 +52,28 @@ static int dri_library_name(struct drm_device *dev, char *buf)</div><div class='ctx'> 		        "r300"));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int radeon_suspend(struct drm_device *dev, pm_message_t state)</div><div class='add'>+{</div><div class='add'>+	drm_radeon_private_t *dev_priv = dev-&gt;dev_private;</div><div class='add'>+</div><div class='add'>+	/* Disable *all* interrupts */</div><div class='add'>+	if ((dev_priv-&gt;flags &amp; RADEON_FAMILY_MASK) &gt;= CHIP_RS690)</div><div class='add'>+		RADEON_WRITE(R500_DxMODE_INT_MASK, 0);</div><div class='add'>+	RADEON_WRITE(RADEON_GEN_INT_CNTL, 0);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int radeon_resume(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	drm_radeon_private_t *dev_priv = dev-&gt;dev_private;</div><div class='add'>+</div><div class='add'>+	/* Restore interrupt registers */</div><div class='add'>+	if ((dev_priv-&gt;flags &amp; RADEON_FAMILY_MASK) &gt;= CHIP_RS690)</div><div class='add'>+		RADEON_WRITE(R500_DxMODE_INT_MASK, dev_priv-&gt;r500_disp_irq_reg);</div><div class='add'>+	RADEON_WRITE(RADEON_GEN_INT_CNTL, dev_priv-&gt;irq_enable_reg);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct pci_device_id pciidlist[] = {</div><div class='ctx'> 	radeon_PCI_IDS</div><div class='ctx'> };</div><div class='hunk'>@@ -59,8 +81,7 @@ static struct pci_device_id pciidlist[] = {</div><div class='ctx'> static struct drm_driver driver = {</div><div class='ctx'> 	.driver_features =</div><div class='ctx'> 	    DRIVER_USE_AGP | DRIVER_USE_MTRR | DRIVER_PCI_DMA | DRIVER_SG |</div><div class='del'>-	    DRIVER_HAVE_IRQ | DRIVER_HAVE_DMA | DRIVER_IRQ_SHARED |</div><div class='del'>-	    DRIVER_IRQ_VBL | DRIVER_IRQ_VBL2,</div><div class='add'>+	    DRIVER_HAVE_IRQ | DRIVER_HAVE_DMA | DRIVER_IRQ_SHARED,</div><div class='ctx'> 	.dev_priv_size = sizeof(drm_radeon_buf_priv_t),</div><div class='ctx'> 	.load = radeon_driver_load,</div><div class='ctx'> 	.firstopen = radeon_driver_firstopen,</div><div class='hunk'>@@ -69,8 +90,11 @@ static struct drm_driver driver = {</div><div class='ctx'> 	.postclose = radeon_driver_postclose,</div><div class='ctx'> 	.lastclose = radeon_driver_lastclose,</div><div class='ctx'> 	.unload = radeon_driver_unload,</div><div class='del'>-	.vblank_wait = radeon_driver_vblank_wait,</div><div class='del'>-	.vblank_wait2 = radeon_driver_vblank_wait2,</div><div class='add'>+	.suspend = radeon_suspend,</div><div class='add'>+	.resume = radeon_resume,</div><div class='add'>+	.get_vblank_counter = radeon_get_vblank_counter,</div><div class='add'>+	.enable_vblank = radeon_enable_vblank,</div><div class='add'>+	.disable_vblank = radeon_disable_vblank,</div><div class='ctx'> 	.dri_library_name = dri_library_name,</div><div class='ctx'> 	.irq_preinstall = radeon_driver_irq_preinstall,</div><div class='ctx'> 	.irq_postinstall = radeon_driver_irq_postinstall,</div><div class='head'>diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h<br/>index 099381693175..4dbb813910c3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpu/drm/radeon/radeon_drv.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/gpu/drm/radeon/radeon_drv.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpu/drm/radeon/radeon_drv.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/radeon/radeon_drv.h</a></div><div class='hunk'>@@ -122,9 +122,12 @@ enum radeon_family {</div><div class='ctx'> 	CHIP_RV350,</div><div class='ctx'> 	CHIP_RV380,</div><div class='ctx'> 	CHIP_R420,</div><div class='add'>+	CHIP_R423,</div><div class='ctx'> 	CHIP_RV410,</div><div class='add'>+	CHIP_RS400,</div><div class='ctx'> 	CHIP_RS480,</div><div class='ctx'> 	CHIP_RS690,</div><div class='add'>+	CHIP_RS740,</div><div class='ctx'> 	CHIP_RV515,</div><div class='ctx'> 	CHIP_R520,</div><div class='ctx'> 	CHIP_RV530,</div><div class='hunk'>@@ -378,17 +381,17 @@ extern void radeon_mem_release(struct drm_file *file_priv,</div><div class='ctx'> 			       struct mem_block *heap);</div><div class='ctx'> </div><div class='ctx'> 				/* radeon_irq.c */</div><div class='add'>+extern void radeon_irq_set_state(struct drm_device *dev, u32 mask, int state);</div><div class='ctx'> extern int radeon_irq_emit(struct drm_device *dev, void *data, struct drm_file *file_priv);</div><div class='ctx'> extern int radeon_irq_wait(struct drm_device *dev, void *data, struct drm_file *file_priv);</div><div class='ctx'> </div><div class='ctx'> extern void radeon_do_release(struct drm_device * dev);</div><div class='del'>-extern int radeon_driver_vblank_wait(struct drm_device * dev,</div><div class='del'>-				     unsigned int *sequence);</div><div class='del'>-extern int radeon_driver_vblank_wait2(struct drm_device * dev,</div><div class='del'>-				      unsigned int *sequence);</div><div class='add'>+extern u32 radeon_get_vblank_counter(struct drm_device *dev, int crtc);</div><div class='add'>+extern int radeon_enable_vblank(struct drm_device *dev, int crtc);</div><div class='add'>+extern void radeon_disable_vblank(struct drm_device *dev, int crtc);</div><div class='ctx'> extern irqreturn_t radeon_driver_irq_handler(DRM_IRQ_ARGS);</div><div class='ctx'> extern void radeon_driver_irq_preinstall(struct drm_device * dev);</div><div class='del'>-extern void radeon_driver_irq_postinstall(struct drm_device * dev);</div><div class='add'>+extern int radeon_driver_irq_postinstall(struct drm_device *dev);</div><div class='ctx'> extern void radeon_driver_irq_uninstall(struct drm_device * dev);</div><div class='ctx'> extern void radeon_enable_interrupt(struct drm_device *dev);</div><div class='ctx'> extern int radeon_vblank_crtc_get(struct drm_device *dev);</div><div class='hunk'>@@ -397,19 +400,22 @@ extern int radeon_vblank_crtc_set(struct drm_device *dev, int64_t value);</div><div class='ctx'> extern int radeon_driver_load(struct drm_device *dev, unsigned long flags);</div><div class='ctx'> extern int radeon_driver_unload(struct drm_device *dev);</div><div class='ctx'> extern int radeon_driver_firstopen(struct drm_device *dev);</div><div class='del'>-extern void radeon_driver_preclose(struct drm_device * dev, struct drm_file *file_priv);</div><div class='del'>-extern void radeon_driver_postclose(struct drm_device * dev, struct drm_file * filp);</div><div class='add'>+extern void radeon_driver_preclose(struct drm_device *dev,</div><div class='add'>+				   struct drm_file *file_priv);</div><div class='add'>+extern void radeon_driver_postclose(struct drm_device *dev,</div><div class='add'>+				    struct drm_file *file_priv);</div><div class='ctx'> extern void radeon_driver_lastclose(struct drm_device * dev);</div><div class='del'>-extern int radeon_driver_open(struct drm_device * dev, struct drm_file * filp_priv);</div><div class='add'>+extern int radeon_driver_open(struct drm_device *dev,</div><div class='add'>+			      struct drm_file *file_priv);</div><div class='ctx'> extern long radeon_compat_ioctl(struct file *filp, unsigned int cmd,</div><div class='ctx'> 				unsigned long arg);</div><div class='ctx'> </div><div class='ctx'> /* r300_cmdbuf.c */</div><div class='ctx'> extern void r300_init_reg_flags(struct drm_device *dev);</div><div class='ctx'> </div><div class='del'>-extern int r300_do_cp_cmdbuf(struct drm_device * dev,</div><div class='add'>+extern int r300_do_cp_cmdbuf(struct drm_device *dev,</div><div class='ctx'> 			     struct drm_file *file_priv,</div><div class='del'>-			     drm_radeon_kcmd_buffer_t * cmdbuf);</div><div class='add'>+			     drm_radeon_kcmd_buffer_t *cmdbuf);</div><div class='ctx'> </div><div class='ctx'> /* Flags for stats.boxes</div><div class='ctx'>  */</div><div class='hunk'>@@ -434,8 +440,31 @@ extern int r300_do_cp_cmdbuf(struct drm_device * dev,</div><div class='ctx'> #	define RADEON_SCISSOR_1_ENABLE		(1 &lt;&lt; 29)</div><div class='ctx'> #	define RADEON_SCISSOR_2_ENABLE		(1 &lt;&lt; 30)</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * PCIE radeons (rv370/rv380, rv410, r423/r430/r480, r5xx)</div><div class='add'>+ * don't have an explicit bus mastering disable bit.  It's handled</div><div class='add'>+ * by the PCI D-states.  PMI_BM_DIS disables D-state bus master</div><div class='add'>+ * handling, not bus mastering itself.</div><div class='add'>+ */</div><div class='ctx'> #define RADEON_BUS_CNTL			0x0030</div><div class='add'>+/* r1xx, r2xx, r300, r(v)350, r420/r481, rs480 */</div><div class='ctx'> #	define RADEON_BUS_MASTER_DIS		(1 &lt;&lt; 6)</div><div class='add'>+/* rs400, rs690/rs740 */</div><div class='add'>+#	define RS400_BUS_MASTER_DIS		(1 &lt;&lt; 14)</div><div class='add'>+#	define RS400_MSI_REARM		        (1 &lt;&lt; 20)</div><div class='add'>+/* see RS480_MSI_REARM in AIC_CNTL for rs480 */</div><div class='add'>+</div><div class='add'>+#define RADEON_BUS_CNTL1		0x0034</div><div class='add'>+#	define RADEON_PMI_BM_DIS		(1 &lt;&lt; 2)</div><div class='add'>+#	define RADEON_PMI_INT_DIS		(1 &lt;&lt; 3)</div><div class='add'>+</div><div class='add'>+#define RV370_BUS_CNTL			0x004c</div><div class='add'>+#	define RV370_PMI_BM_DIS		        (1 &lt;&lt; 5)</div><div class='add'>+#	define RV370_PMI_INT_DIS		(1 &lt;&lt; 6)</div><div class='add'>+</div><div class='add'>+#define RADEON_MSI_REARM_EN		0x0160</div><div class='add'>+/* rv370/rv380, rv410, r423/r430/r480, r5xx */</div><div class='add'>+#	define RV370_MSI_REARM_EN		(1 &lt;&lt; 0)</div><div class='ctx'> </div><div class='ctx'> #define RADEON_CLOCK_CNTL_DATA		0x000c</div><div class='ctx'> #	define RADEON_PLL_WR_EN			(1 &lt;&lt; 7)</div><div class='hunk'>@@ -623,6 +652,7 @@ extern int r300_do_cp_cmdbuf(struct drm_device * dev,</div><div class='ctx'> #	define RADEON_SW_INT_TEST		(1 &lt;&lt; 25)</div><div class='ctx'> #	define RADEON_SW_INT_TEST_ACK		(1 &lt;&lt; 25)</div><div class='ctx'> #	define RADEON_SW_INT_FIRE		(1 &lt;&lt; 26)</div><div class='add'>+#       define R500_DISPLAY_INT_STATUS          (1 &lt;&lt; 0)</div><div class='ctx'> </div><div class='ctx'> #define RADEON_HOST_PATH_CNTL		0x0130</div><div class='ctx'> #	define RADEON_HDP_SOFT_RESET		(1 &lt;&lt; 26)</div><div class='hunk'>@@ -907,6 +937,7 @@ extern int r300_do_cp_cmdbuf(struct drm_device * dev,</div><div class='ctx'> </div><div class='ctx'> #define RADEON_AIC_CNTL			0x01d0</div><div class='ctx'> #	define RADEON_PCIGART_TRANSLATE_EN	(1 &lt;&lt; 0)</div><div class='add'>+#	define RS480_MSI_REARM	                (1 &lt;&lt; 3)</div><div class='ctx'> #define RADEON_AIC_STAT			0x01d4</div><div class='ctx'> #define RADEON_AIC_PT_BASE		0x01d8</div><div class='ctx'> #define RADEON_AIC_LO_ADDR		0x01dc</div><div class='hunk'>@@ -1116,6 +1147,9 @@ extern int r300_do_cp_cmdbuf(struct drm_device * dev,</div><div class='ctx'> </div><div class='ctx'> #define R200_VAP_PVS_CNTL_1               0x22D0</div><div class='ctx'> </div><div class='add'>+#define RADEON_CRTC_CRNT_FRAME 0x0214</div><div class='add'>+#define RADEON_CRTC2_CRNT_FRAME 0x0314</div><div class='add'>+</div><div class='ctx'> #define R500_D1CRTC_STATUS 0x609c</div><div class='ctx'> #define R500_D2CRTC_STATUS 0x689c</div><div class='ctx'> #define R500_CRTC_V_BLANK (1&lt;&lt;0)</div><div class='hunk'>@@ -1200,7 +1234,8 @@ do {								\</div><div class='ctx'> </div><div class='ctx'> #define IGP_WRITE_MCIND(addr, val)				\</div><div class='ctx'> do {									\</div><div class='del'>-	if ((dev_priv-&gt;flags &amp; RADEON_FAMILY_MASK) == CHIP_RS690)       \</div><div class='add'>+	if (((dev_priv-&gt;flags &amp; RADEON_FAMILY_MASK) == CHIP_RS690) ||   \</div><div class='add'>+	    ((dev_priv-&gt;flags &amp; RADEON_FAMILY_MASK) == CHIP_RS740))      \</div><div class='ctx'> 		RS690_WRITE_MCIND(addr, val);				\</div><div class='ctx'> 	else								\</div><div class='ctx'> 		RS480_WRITE_MCIND(addr, val);				\</div><div class='head'>diff --git a/drivers/gpu/drm/radeon/radeon_irq.c b/drivers/gpu/drm/radeon/radeon_irq.c<br/>index ee40d197deb7..5079f7054a2f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpu/drm/radeon/radeon_irq.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/gpu/drm/radeon/radeon_irq.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpu/drm/radeon/radeon_irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/radeon/radeon_irq.c</a></div><div class='hunk'>@@ -27,7 +27,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Authors:</div><div class='ctx'>  *    Keith Whitwell &lt;keith@tungstengraphics.com&gt;</div><div class='del'>- *    Michel Dänzer &lt;michel@daenzer.net&gt;</div><div class='add'>+ *    Michel D�zer &lt;michel@daenzer.net&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "drmP.h"</div><div class='hunk'>@@ -35,12 +35,128 @@</div><div class='ctx'> #include "radeon_drm.h"</div><div class='ctx'> #include "radeon_drv.h"</div><div class='ctx'> </div><div class='del'>-static __inline__ u32 radeon_acknowledge_irqs(drm_radeon_private_t * dev_priv,</div><div class='del'>-					      u32 mask)</div><div class='add'>+void radeon_irq_set_state(struct drm_device *dev, u32 mask, int state)</div><div class='ctx'> {</div><div class='del'>-	u32 irqs = RADEON_READ(RADEON_GEN_INT_STATUS) &amp; mask;</div><div class='add'>+	drm_radeon_private_t *dev_priv = dev-&gt;dev_private;</div><div class='add'>+</div><div class='add'>+	if (state)</div><div class='add'>+		dev_priv-&gt;irq_enable_reg |= mask;</div><div class='add'>+	else</div><div class='add'>+		dev_priv-&gt;irq_enable_reg &amp;= ~mask;</div><div class='add'>+</div><div class='add'>+	RADEON_WRITE(RADEON_GEN_INT_CNTL, dev_priv-&gt;irq_enable_reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void r500_vbl_irq_set_state(struct drm_device *dev, u32 mask, int state)</div><div class='add'>+{</div><div class='add'>+	drm_radeon_private_t *dev_priv = dev-&gt;dev_private;</div><div class='add'>+</div><div class='add'>+	if (state)</div><div class='add'>+		dev_priv-&gt;r500_disp_irq_reg |= mask;</div><div class='add'>+	else</div><div class='add'>+		dev_priv-&gt;r500_disp_irq_reg &amp;= ~mask;</div><div class='add'>+</div><div class='add'>+	RADEON_WRITE(R500_DxMODE_INT_MASK, dev_priv-&gt;r500_disp_irq_reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int radeon_enable_vblank(struct drm_device *dev, int crtc)</div><div class='add'>+{</div><div class='add'>+	drm_radeon_private_t *dev_priv = dev-&gt;dev_private;</div><div class='add'>+</div><div class='add'>+	if ((dev_priv-&gt;flags &amp; RADEON_FAMILY_MASK) &gt;= CHIP_RS690) {</div><div class='add'>+		switch (crtc) {</div><div class='add'>+		case 0:</div><div class='add'>+			r500_vbl_irq_set_state(dev, R500_D1MODE_INT_MASK, 1);</div><div class='add'>+			break;</div><div class='add'>+		case 1:</div><div class='add'>+			r500_vbl_irq_set_state(dev, R500_D2MODE_INT_MASK, 1);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			DRM_ERROR("tried to enable vblank on non-existent crtc %d\n",</div><div class='add'>+				  crtc);</div><div class='add'>+			return EINVAL;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		switch (crtc) {</div><div class='add'>+		case 0:</div><div class='add'>+			radeon_irq_set_state(dev, RADEON_CRTC_VBLANK_MASK, 1);</div><div class='add'>+			break;</div><div class='add'>+		case 1:</div><div class='add'>+			radeon_irq_set_state(dev, RADEON_CRTC2_VBLANK_MASK, 1);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			DRM_ERROR("tried to enable vblank on non-existent crtc %d\n",</div><div class='add'>+				  crtc);</div><div class='add'>+			return EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void radeon_disable_vblank(struct drm_device *dev, int crtc)</div><div class='add'>+{</div><div class='add'>+	drm_radeon_private_t *dev_priv = dev-&gt;dev_private;</div><div class='add'>+</div><div class='add'>+	if ((dev_priv-&gt;flags &amp; RADEON_FAMILY_MASK) &gt;= CHIP_RS690) {</div><div class='add'>+		switch (crtc) {</div><div class='add'>+		case 0:</div><div class='add'>+			r500_vbl_irq_set_state(dev, R500_D1MODE_INT_MASK, 0);</div><div class='add'>+			break;</div><div class='add'>+		case 1:</div><div class='add'>+			r500_vbl_irq_set_state(dev, R500_D2MODE_INT_MASK, 0);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			DRM_ERROR("tried to enable vblank on non-existent crtc %d\n",</div><div class='add'>+				  crtc);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		switch (crtc) {</div><div class='add'>+		case 0:</div><div class='add'>+			radeon_irq_set_state(dev, RADEON_CRTC_VBLANK_MASK, 0);</div><div class='add'>+			break;</div><div class='add'>+		case 1:</div><div class='add'>+			radeon_irq_set_state(dev, RADEON_CRTC2_VBLANK_MASK, 0);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			DRM_ERROR("tried to enable vblank on non-existent crtc %d\n",</div><div class='add'>+				  crtc);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32 radeon_acknowledge_irqs(drm_radeon_private_t *dev_priv, u32 *r500_disp_int)</div><div class='add'>+{</div><div class='add'>+	u32 irqs = RADEON_READ(RADEON_GEN_INT_STATUS);</div><div class='add'>+	u32 irq_mask = RADEON_SW_INT_TEST;</div><div class='add'>+</div><div class='add'>+	*r500_disp_int = 0;</div><div class='add'>+	if ((dev_priv-&gt;flags &amp; RADEON_FAMILY_MASK) &gt;= CHIP_RS690) {</div><div class='add'>+		/* vbl interrupts in a different place */</div><div class='add'>+</div><div class='add'>+		if (irqs &amp; R500_DISPLAY_INT_STATUS) {</div><div class='add'>+			/* if a display interrupt */</div><div class='add'>+			u32 disp_irq;</div><div class='add'>+</div><div class='add'>+			disp_irq = RADEON_READ(R500_DISP_INTERRUPT_STATUS);</div><div class='add'>+</div><div class='add'>+			*r500_disp_int = disp_irq;</div><div class='add'>+			if (disp_irq &amp; R500_D1_VBLANK_INTERRUPT)</div><div class='add'>+				RADEON_WRITE(R500_D1MODE_VBLANK_STATUS, R500_VBLANK_ACK);</div><div class='add'>+			if (disp_irq &amp; R500_D2_VBLANK_INTERRUPT)</div><div class='add'>+				RADEON_WRITE(R500_D2MODE_VBLANK_STATUS, R500_VBLANK_ACK);</div><div class='add'>+		}</div><div class='add'>+		irq_mask |= R500_DISPLAY_INT_STATUS;</div><div class='add'>+	} else</div><div class='add'>+		irq_mask |= RADEON_CRTC_VBLANK_STAT | RADEON_CRTC2_VBLANK_STAT;</div><div class='add'>+</div><div class='add'>+	irqs &amp;=	irq_mask;</div><div class='add'>+</div><div class='ctx'> 	if (irqs)</div><div class='ctx'> 		RADEON_WRITE(RADEON_GEN_INT_STATUS, irqs);</div><div class='add'>+</div><div class='ctx'> 	return irqs;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -68,44 +184,33 @@ irqreturn_t radeon_driver_irq_handler(DRM_IRQ_ARGS)</div><div class='ctx'> 	drm_radeon_private_t *dev_priv =</div><div class='ctx'> 	    (drm_radeon_private_t *) dev-&gt;dev_private;</div><div class='ctx'> 	u32 stat;</div><div class='add'>+	u32 r500_disp_int;</div><div class='ctx'> </div><div class='ctx'> 	/* Only consider the bits we're interested in - others could be used</div><div class='ctx'> 	 * outside the DRM</div><div class='ctx'> 	 */</div><div class='del'>-	stat = radeon_acknowledge_irqs(dev_priv, (RADEON_SW_INT_TEST_ACK |</div><div class='del'>-						  RADEON_CRTC_VBLANK_STAT |</div><div class='del'>-						  RADEON_CRTC2_VBLANK_STAT));</div><div class='add'>+	stat = radeon_acknowledge_irqs(dev_priv, &amp;r500_disp_int);</div><div class='ctx'> 	if (!stat)</div><div class='ctx'> 		return IRQ_NONE;</div><div class='ctx'> </div><div class='ctx'> 	stat &amp;= dev_priv-&gt;irq_enable_reg;</div><div class='ctx'> </div><div class='ctx'> 	/* SW interrupt */</div><div class='del'>-	if (stat &amp; RADEON_SW_INT_TEST) {</div><div class='add'>+	if (stat &amp; RADEON_SW_INT_TEST)</div><div class='ctx'> 		DRM_WAKEUP(&amp;dev_priv-&gt;swi_queue);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	/* VBLANK interrupt */</div><div class='del'>-	if (stat &amp; (RADEON_CRTC_VBLANK_STAT|RADEON_CRTC2_VBLANK_STAT)) {</div><div class='del'>-		int vblank_crtc = dev_priv-&gt;vblank_crtc;</div><div class='del'>-</div><div class='del'>-		if ((vblank_crtc &amp;</div><div class='del'>-		     (DRM_RADEON_VBLANK_CRTC1 | DRM_RADEON_VBLANK_CRTC2)) ==</div><div class='del'>-		    (DRM_RADEON_VBLANK_CRTC1 | DRM_RADEON_VBLANK_CRTC2)) {</div><div class='del'>-			if (stat &amp; RADEON_CRTC_VBLANK_STAT)</div><div class='del'>-				atomic_inc(&amp;dev-&gt;vbl_received);</div><div class='del'>-			if (stat &amp; RADEON_CRTC2_VBLANK_STAT)</div><div class='del'>-				atomic_inc(&amp;dev-&gt;vbl_received2);</div><div class='del'>-		} else if (((stat &amp; RADEON_CRTC_VBLANK_STAT) &amp;&amp;</div><div class='del'>-			   (vblank_crtc &amp; DRM_RADEON_VBLANK_CRTC1)) ||</div><div class='del'>-			   ((stat &amp; RADEON_CRTC2_VBLANK_STAT) &amp;&amp;</div><div class='del'>-			    (vblank_crtc &amp; DRM_RADEON_VBLANK_CRTC2)))</div><div class='del'>-			atomic_inc(&amp;dev-&gt;vbl_received);</div><div class='del'>-</div><div class='del'>-		DRM_WAKEUP(&amp;dev-&gt;vbl_queue);</div><div class='del'>-		drm_vbl_send_signals(dev);</div><div class='add'>+	if ((dev_priv-&gt;flags &amp; RADEON_FAMILY_MASK) &gt;= CHIP_RS690) {</div><div class='add'>+		if (r500_disp_int &amp; R500_D1_VBLANK_INTERRUPT)</div><div class='add'>+			drm_handle_vblank(dev, 0);</div><div class='add'>+		if (r500_disp_int &amp; R500_D2_VBLANK_INTERRUPT)</div><div class='add'>+			drm_handle_vblank(dev, 1);</div><div class='add'>+	} else {</div><div class='add'>+		if (stat &amp; RADEON_CRTC_VBLANK_STAT)</div><div class='add'>+			drm_handle_vblank(dev, 0);</div><div class='add'>+		if (stat &amp; RADEON_CRTC2_VBLANK_STAT)</div><div class='add'>+			drm_handle_vblank(dev, 1);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -144,54 +249,31 @@ static int radeon_wait_irq(struct drm_device * dev, int swi_nr)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int radeon_driver_vblank_do_wait(struct drm_device * dev,</div><div class='del'>-					unsigned int *sequence, int crtc)</div><div class='add'>+u32 radeon_get_vblank_counter(struct drm_device *dev, int crtc)</div><div class='ctx'> {</div><div class='del'>-	drm_radeon_private_t *dev_priv =</div><div class='del'>-	    (drm_radeon_private_t *) dev-&gt;dev_private;</div><div class='del'>-	unsigned int cur_vblank;</div><div class='del'>-	int ret = 0;</div><div class='del'>-	int ack = 0;</div><div class='del'>-	atomic_t *counter;</div><div class='add'>+	drm_radeon_private_t *dev_priv = dev-&gt;dev_private;</div><div class='add'>+</div><div class='ctx'> 	if (!dev_priv) {</div><div class='ctx'> 		DRM_ERROR("called with no initialization\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (crtc == DRM_RADEON_VBLANK_CRTC1) {</div><div class='del'>-		counter = &amp;dev-&gt;vbl_received;</div><div class='del'>-		ack |= RADEON_CRTC_VBLANK_STAT;</div><div class='del'>-	} else if (crtc == DRM_RADEON_VBLANK_CRTC2) {</div><div class='del'>-		counter = &amp;dev-&gt;vbl_received2;</div><div class='del'>-		ack |= RADEON_CRTC2_VBLANK_STAT;</div><div class='del'>-	} else</div><div class='add'>+	if (crtc &lt; 0 || crtc &gt; 1) {</div><div class='add'>+		DRM_ERROR("Invalid crtc %d\n", crtc);</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	radeon_acknowledge_irqs(dev_priv, ack);</div><div class='del'>-</div><div class='del'>-	dev_priv-&gt;stats.boxes |= RADEON_BOX_WAIT_IDLE;</div><div class='del'>-</div><div class='del'>-	/* Assume that the user has missed the current sequence number</div><div class='del'>-	 * by about a day rather than she wants to wait for years</div><div class='del'>-	 * using vertical blanks...</div><div class='del'>-	 */</div><div class='del'>-	DRM_WAIT_ON(ret, dev-&gt;vbl_queue, 3 * DRM_HZ,</div><div class='del'>-		    (((cur_vblank = atomic_read(counter))</div><div class='del'>-		      - *sequence) &lt;= (1 &lt;&lt; 23)));</div><div class='del'>-</div><div class='del'>-	*sequence = cur_vblank;</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int radeon_driver_vblank_wait(struct drm_device *dev, unsigned int *sequence)</div><div class='del'>-{</div><div class='del'>-	return radeon_driver_vblank_do_wait(dev, sequence, DRM_RADEON_VBLANK_CRTC1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int radeon_driver_vblank_wait2(struct drm_device *dev, unsigned int *sequence)</div><div class='del'>-{</div><div class='del'>-	return radeon_driver_vblank_do_wait(dev, sequence, DRM_RADEON_VBLANK_CRTC2);</div><div class='add'>+	if ((dev_priv-&gt;flags &amp; RADEON_FAMILY_MASK) &gt;= CHIP_RS690) {</div><div class='add'>+		if (crtc == 0)</div><div class='add'>+			return RADEON_READ(R500_D1CRTC_FRAME_COUNT);</div><div class='add'>+		else</div><div class='add'>+			return RADEON_READ(R500_D2CRTC_FRAME_COUNT);</div><div class='add'>+	} else {</div><div class='add'>+		if (crtc == 0)</div><div class='add'>+			return RADEON_READ(RADEON_CRTC_CRNT_FRAME);</div><div class='add'>+		else</div><div class='add'>+			return RADEON_READ(RADEON_CRTC2_CRNT_FRAME);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Needs the lock as it touches the ring.</div><div class='hunk'>@@ -234,46 +316,41 @@ int radeon_irq_wait(struct drm_device *dev, void *data, struct drm_file *file_pr</div><div class='ctx'> 	return radeon_wait_irq(dev, irqwait-&gt;irq_seq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void radeon_enable_interrupt(struct drm_device *dev)</div><div class='del'>-{</div><div class='del'>-	drm_radeon_private_t *dev_priv = (drm_radeon_private_t *) dev-&gt;dev_private;</div><div class='del'>-</div><div class='del'>-	dev_priv-&gt;irq_enable_reg = RADEON_SW_INT_ENABLE;</div><div class='del'>-	if (dev_priv-&gt;vblank_crtc &amp; DRM_RADEON_VBLANK_CRTC1)</div><div class='del'>-		dev_priv-&gt;irq_enable_reg |= RADEON_CRTC_VBLANK_MASK;</div><div class='del'>-</div><div class='del'>-	if (dev_priv-&gt;vblank_crtc &amp; DRM_RADEON_VBLANK_CRTC2)</div><div class='del'>-		dev_priv-&gt;irq_enable_reg |= RADEON_CRTC2_VBLANK_MASK;</div><div class='del'>-</div><div class='del'>-	RADEON_WRITE(RADEON_GEN_INT_CNTL, dev_priv-&gt;irq_enable_reg);</div><div class='del'>-	dev_priv-&gt;irq_enabled = 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* drm_dma.h hooks</div><div class='ctx'> */</div><div class='ctx'> void radeon_driver_irq_preinstall(struct drm_device * dev)</div><div class='ctx'> {</div><div class='ctx'> 	drm_radeon_private_t *dev_priv =</div><div class='ctx'> 	    (drm_radeon_private_t *) dev-&gt;dev_private;</div><div class='add'>+	u32 dummy;</div><div class='ctx'> </div><div class='ctx'> 	/* Disable *all* interrupts */</div><div class='add'>+	if ((dev_priv-&gt;flags &amp; RADEON_FAMILY_MASK) &gt;= CHIP_RS690)</div><div class='add'>+		RADEON_WRITE(R500_DxMODE_INT_MASK, 0);</div><div class='ctx'> 	RADEON_WRITE(RADEON_GEN_INT_CNTL, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* Clear bits if they're already high */</div><div class='del'>-	radeon_acknowledge_irqs(dev_priv, (RADEON_SW_INT_TEST_ACK |</div><div class='del'>-					   RADEON_CRTC_VBLANK_STAT |</div><div class='del'>-					   RADEON_CRTC2_VBLANK_STAT));</div><div class='add'>+	radeon_acknowledge_irqs(dev_priv, &amp;dummy);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void radeon_driver_irq_postinstall(struct drm_device * dev)</div><div class='add'>+int radeon_driver_irq_postinstall(struct drm_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	drm_radeon_private_t *dev_priv =</div><div class='ctx'> 	    (drm_radeon_private_t *) dev-&gt;dev_private;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	atomic_set(&amp;dev_priv-&gt;swi_emitted, 0);</div><div class='ctx'> 	DRM_INIT_WAITQUEUE(&amp;dev_priv-&gt;swi_queue);</div><div class='ctx'> </div><div class='del'>-	radeon_enable_interrupt(dev);</div><div class='add'>+	ret = drm_vblank_init(dev, 2);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	dev-&gt;max_vblank_count = 0x001fffff;</div><div class='add'>+</div><div class='add'>+	radeon_irq_set_state(dev, RADEON_SW_INT_ENABLE, 1);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void radeon_driver_irq_uninstall(struct drm_device * dev)</div><div class='hunk'>@@ -285,6 +362,8 @@ void radeon_driver_irq_uninstall(struct drm_device * dev)</div><div class='ctx'> </div><div class='ctx'> 	dev_priv-&gt;irq_enabled = 0;</div><div class='ctx'> </div><div class='add'>+	if ((dev_priv-&gt;flags &amp; RADEON_FAMILY_MASK) &gt;= CHIP_RS690)</div><div class='add'>+		RADEON_WRITE(R500_DxMODE_INT_MASK, 0);</div><div class='ctx'> 	/* Disable *all* interrupts */</div><div class='ctx'> 	RADEON_WRITE(RADEON_GEN_INT_CNTL, 0);</div><div class='ctx'> }</div><div class='hunk'>@@ -293,18 +372,8 @@ void radeon_driver_irq_uninstall(struct drm_device * dev)</div><div class='ctx'> int radeon_vblank_crtc_get(struct drm_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	drm_radeon_private_t *dev_priv = (drm_radeon_private_t *) dev-&gt;dev_private;</div><div class='del'>-	u32 flag;</div><div class='del'>-	u32 value;</div><div class='del'>-</div><div class='del'>-	flag = RADEON_READ(RADEON_GEN_INT_CNTL);</div><div class='del'>-	value = 0;</div><div class='del'>-</div><div class='del'>-	if (flag &amp; RADEON_CRTC_VBLANK_MASK)</div><div class='del'>-		value |= DRM_RADEON_VBLANK_CRTC1;</div><div class='ctx'> </div><div class='del'>-	if (flag &amp; RADEON_CRTC2_VBLANK_MASK)</div><div class='del'>-		value |= DRM_RADEON_VBLANK_CRTC2;</div><div class='del'>-	return value;</div><div class='add'>+	return dev_priv-&gt;vblank_crtc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int radeon_vblank_crtc_set(struct drm_device *dev, int64_t value)</div><div class='hunk'>@@ -315,6 +384,5 @@ int radeon_vblank_crtc_set(struct drm_device *dev, int64_t value)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	dev_priv-&gt;vblank_crtc = (unsigned int)value;</div><div class='del'>-	radeon_enable_interrupt(dev);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/gpu/drm/radeon/radeon_state.c b/drivers/gpu/drm/radeon/radeon_state.c<br/>index 11c146b49211..5d7153fcc7b0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpu/drm/radeon/radeon_state.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/gpu/drm/radeon/radeon_state.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpu/drm/radeon/radeon_state.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/radeon/radeon_state.c</a></div><div class='hunk'>@@ -2997,7 +2997,7 @@ static int radeon_cp_getparam(struct drm_device *dev, void *data, struct drm_fil</div><div class='ctx'> 		value = GET_SCRATCH(2);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case RADEON_PARAM_IRQ_NR:</div><div class='del'>-		value = dev-&gt;irq;</div><div class='add'>+		value = drm_dev_to_irq(dev);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case RADEON_PARAM_GART_BASE:</div><div class='ctx'> 		value = dev_priv-&gt;gart_vm_start;</div><div class='head'>diff --git a/drivers/gpu/drm/sis/sis_mm.c b/drivers/gpu/drm/sis/sis_mm.c<br/>index b3878770fce1..af22111397d8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpu/drm/sis/sis_mm.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/gpu/drm/sis/sis_mm.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpu/drm/sis/sis_mm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/sis/sis_mm.c</a></div><div class='hunk'>@@ -41,7 +41,7 @@</div><div class='ctx'> #define AGP_TYPE 1</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_FB_SIS)</div><div class='add'>+#if defined(CONFIG_FB_SIS) || defined(CONFIG_FB_SIS_MODULE)</div><div class='ctx'> /* fb management via fb device */</div><div class='ctx'> </div><div class='ctx'> #define SIS_MM_ALIGN_SHIFT 0</div><div class='hunk'>@@ -57,7 +57,7 @@ static void *sis_sman_mm_allocate(void *private, unsigned long size,</div><div class='ctx'> 	if (req.size == 0)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	else</div><div class='del'>-		return (void *)~req.offset;</div><div class='add'>+		return (void *)(unsigned long)~req.offset;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sis_sman_mm_free(void *private, void *ref)</div><div class='hunk'>@@ -75,12 +75,12 @@ static unsigned long sis_sman_mm_offset(void *private, void *ref)</div><div class='ctx'> 	return ~((unsigned long)ref);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#else /* CONFIG_FB_SIS */</div><div class='add'>+#else /* CONFIG_FB_SIS[_MODULE] */</div><div class='ctx'> </div><div class='ctx'> #define SIS_MM_ALIGN_SHIFT 4</div><div class='ctx'> #define SIS_MM_ALIGN_MASK ( (1 &lt;&lt; SIS_MM_ALIGN_SHIFT) - 1)</div><div class='ctx'> </div><div class='del'>-#endif /* CONFIG_FB_SIS */</div><div class='add'>+#endif /* CONFIG_FB_SIS[_MODULE] */</div><div class='ctx'> </div><div class='ctx'> static int sis_fb_init(struct drm_device *dev, void *data, struct drm_file *file_priv)</div><div class='ctx'> {</div><div class='hunk'>@@ -89,7 +89,7 @@ static int sis_fb_init(struct drm_device *dev, void *data, struct drm_file *file</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;struct_mutex);</div><div class='del'>-#if defined(CONFIG_FB_SIS)</div><div class='add'>+#if defined(CONFIG_FB_SIS) || defined(CONFIG_FB_SIS_MODULE)</div><div class='ctx'> 	{</div><div class='ctx'> 		struct drm_sman_mm sman_mm;</div><div class='ctx'> 		sman_mm.private = (void *)0xFFFFFFFF;</div><div class='head'>diff --git a/drivers/gpu/drm/via/via_drv.c b/drivers/gpu/drm/via/via_drv.c<br/>index 80c01cdfa37d..0993b441fc42 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpu/drm/via/via_drv.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/gpu/drm/via/via_drv.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpu/drm/via/via_drv.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/via/via_drv.c</a></div><div class='hunk'>@@ -40,11 +40,13 @@ static struct pci_device_id pciidlist[] = {</div><div class='ctx'> static struct drm_driver driver = {</div><div class='ctx'> 	.driver_features =</div><div class='ctx'> 	    DRIVER_USE_AGP | DRIVER_USE_MTRR | DRIVER_HAVE_IRQ |</div><div class='del'>-	    DRIVER_IRQ_SHARED | DRIVER_IRQ_VBL,</div><div class='add'>+	    DRIVER_IRQ_SHARED,</div><div class='ctx'> 	.load = via_driver_load,</div><div class='ctx'> 	.unload = via_driver_unload,</div><div class='ctx'> 	.context_dtor = via_final_context,</div><div class='del'>-	.vblank_wait = via_driver_vblank_wait,</div><div class='add'>+	.get_vblank_counter = via_get_vblank_counter,</div><div class='add'>+	.enable_vblank = via_enable_vblank,</div><div class='add'>+	.disable_vblank = via_disable_vblank,</div><div class='ctx'> 	.irq_preinstall = via_driver_irq_preinstall,</div><div class='ctx'> 	.irq_postinstall = via_driver_irq_postinstall,</div><div class='ctx'> 	.irq_uninstall = via_driver_irq_uninstall,</div><div class='hunk'>@@ -59,17 +61,17 @@ static struct drm_driver driver = {</div><div class='ctx'> 	.get_reg_ofs = drm_core_get_reg_ofs,</div><div class='ctx'> 	.ioctls = via_ioctls,</div><div class='ctx'> 	.fops = {</div><div class='del'>-		 .owner = THIS_MODULE,</div><div class='del'>-		 .open = drm_open,</div><div class='del'>-		 .release = drm_release,</div><div class='del'>-		 .ioctl = drm_ioctl,</div><div class='del'>-		 .mmap = drm_mmap,</div><div class='del'>-		 .poll = drm_poll,</div><div class='del'>-		 .fasync = drm_fasync,</div><div class='del'>-	},</div><div class='add'>+		.owner = THIS_MODULE,</div><div class='add'>+		.open = drm_open,</div><div class='add'>+		.release = drm_release,</div><div class='add'>+		.ioctl = drm_ioctl,</div><div class='add'>+		.mmap = drm_mmap,</div><div class='add'>+		.poll = drm_poll,</div><div class='add'>+		.fasync = drm_fasync,</div><div class='add'>+		},</div><div class='ctx'> 	.pci_driver = {</div><div class='del'>-		 .name = DRIVER_NAME,</div><div class='del'>-		 .id_table = pciidlist,</div><div class='add'>+		.name = DRIVER_NAME,</div><div class='add'>+		.id_table = pciidlist,</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='ctx'> 	.name = DRIVER_NAME,</div><div class='head'>diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h<br/>index 2daae81874cd..cafcb844a223 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpu/drm/via/via_drv.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/gpu/drm/via/via_drv.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpu/drm/via/via_drv.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/via/via_drv.h</a></div><div class='hunk'>@@ -75,6 +75,7 @@ typedef struct drm_via_private {</div><div class='ctx'> 	struct timeval last_vblank;</div><div class='ctx'> 	int last_vblank_valid;</div><div class='ctx'> 	unsigned usec_per_vblank;</div><div class='add'>+	atomic_t vbl_received;</div><div class='ctx'> 	drm_via_state_t hc_state;</div><div class='ctx'> 	char pci_buf[VIA_PCI_BUF_SIZE];</div><div class='ctx'> 	const uint32_t *fire_offsets[VIA_FIRE_BUF_SIZE];</div><div class='hunk'>@@ -130,21 +131,24 @@ extern int via_init_context(struct drm_device * dev, int context);</div><div class='ctx'> extern int via_final_context(struct drm_device * dev, int context);</div><div class='ctx'> </div><div class='ctx'> extern int via_do_cleanup_map(struct drm_device * dev);</div><div class='del'>-extern int via_driver_vblank_wait(struct drm_device * dev, unsigned int *sequence);</div><div class='add'>+extern u32 via_get_vblank_counter(struct drm_device *dev, int crtc);</div><div class='add'>+extern int via_enable_vblank(struct drm_device *dev, int crtc);</div><div class='add'>+extern void via_disable_vblank(struct drm_device *dev, int crtc);</div><div class='ctx'> </div><div class='ctx'> extern irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS);</div><div class='ctx'> extern void via_driver_irq_preinstall(struct drm_device * dev);</div><div class='del'>-extern void via_driver_irq_postinstall(struct drm_device * dev);</div><div class='add'>+extern int via_driver_irq_postinstall(struct drm_device *dev);</div><div class='ctx'> extern void via_driver_irq_uninstall(struct drm_device * dev);</div><div class='ctx'> </div><div class='ctx'> extern int via_dma_cleanup(struct drm_device * dev);</div><div class='ctx'> extern void via_init_command_verifier(void);</div><div class='ctx'> extern int via_driver_dma_quiescent(struct drm_device * dev);</div><div class='del'>-extern void via_init_futex(drm_via_private_t * dev_priv);</div><div class='del'>-extern void via_cleanup_futex(drm_via_private_t * dev_priv);</div><div class='del'>-extern void via_release_futex(drm_via_private_t * dev_priv, int context);</div><div class='add'>+extern void via_init_futex(drm_via_private_t *dev_priv);</div><div class='add'>+extern void via_cleanup_futex(drm_via_private_t *dev_priv);</div><div class='add'>+extern void via_release_futex(drm_via_private_t *dev_priv, int context);</div><div class='ctx'> </div><div class='del'>-extern void via_reclaim_buffers_locked(struct drm_device *dev, struct drm_file *file_priv);</div><div class='add'>+extern void via_reclaim_buffers_locked(struct drm_device *dev,</div><div class='add'>+				       struct drm_file *file_priv);</div><div class='ctx'> extern void via_lastclose(struct drm_device *dev);</div><div class='ctx'> </div><div class='ctx'> extern void via_dmablit_handler(struct drm_device *dev, int engine, int from_irq);</div><div class='head'>diff --git a/drivers/gpu/drm/via/via_irq.c b/drivers/gpu/drm/via/via_irq.c<br/>index c6bb978a1106..665d319b927b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpu/drm/via/via_irq.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/gpu/drm/via/via_irq.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpu/drm/via/via_irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/via/via_irq.c</a></div><div class='hunk'>@@ -43,7 +43,7 @@</div><div class='ctx'> #define VIA_REG_INTERRUPT       0x200</div><div class='ctx'> </div><div class='ctx'> /* VIA_REG_INTERRUPT */</div><div class='del'>-#define VIA_IRQ_GLOBAL          (1 &lt;&lt; 31)</div><div class='add'>+#define VIA_IRQ_GLOBAL	  (1 &lt;&lt; 31)</div><div class='ctx'> #define VIA_IRQ_VBLANK_ENABLE   (1 &lt;&lt; 19)</div><div class='ctx'> #define VIA_IRQ_VBLANK_PENDING  (1 &lt;&lt; 3)</div><div class='ctx'> #define VIA_IRQ_HQV0_ENABLE     (1 &lt;&lt; 11)</div><div class='hunk'>@@ -68,16 +68,15 @@</div><div class='ctx'> </div><div class='ctx'> static maskarray_t via_pro_group_a_irqs[] = {</div><div class='ctx'> 	{VIA_IRQ_HQV0_ENABLE, VIA_IRQ_HQV0_PENDING, 0x000003D0, 0x00008010,</div><div class='del'>-	 0x00000000},</div><div class='add'>+	 0x00000000 },</div><div class='ctx'> 	{VIA_IRQ_HQV1_ENABLE, VIA_IRQ_HQV1_PENDING, 0x000013D0, 0x00008010,</div><div class='del'>-	 0x00000000},</div><div class='add'>+	 0x00000000 },</div><div class='ctx'> 	{VIA_IRQ_DMA0_TD_ENABLE, VIA_IRQ_DMA0_TD_PENDING, VIA_PCI_DMA_CSR0,</div><div class='ctx'> 	 VIA_DMA_CSR_TA | VIA_DMA_CSR_TD, 0x00000008},</div><div class='ctx'> 	{VIA_IRQ_DMA1_TD_ENABLE, VIA_IRQ_DMA1_TD_PENDING, VIA_PCI_DMA_CSR1,</div><div class='ctx'> 	 VIA_DMA_CSR_TA | VIA_DMA_CSR_TD, 0x00000008},</div><div class='ctx'> };</div><div class='del'>-static int via_num_pro_group_a =</div><div class='del'>-    sizeof(via_pro_group_a_irqs) / sizeof(maskarray_t);</div><div class='add'>+static int via_num_pro_group_a = ARRAY_SIZE(via_pro_group_a_irqs);</div><div class='ctx'> static int via_irqmap_pro_group_a[] = {0, 1, -1, 2, -1, 3};</div><div class='ctx'> </div><div class='ctx'> static maskarray_t via_unichrome_irqs[] = {</div><div class='hunk'>@@ -86,14 +85,24 @@ static maskarray_t via_unichrome_irqs[] = {</div><div class='ctx'> 	{VIA_IRQ_DMA1_TD_ENABLE, VIA_IRQ_DMA1_TD_PENDING, VIA_PCI_DMA_CSR1,</div><div class='ctx'> 	 VIA_DMA_CSR_TA | VIA_DMA_CSR_TD, 0x00000008}</div><div class='ctx'> };</div><div class='del'>-static int via_num_unichrome = sizeof(via_unichrome_irqs) / sizeof(maskarray_t);</div><div class='add'>+static int via_num_unichrome = ARRAY_SIZE(via_unichrome_irqs);</div><div class='ctx'> static int via_irqmap_unichrome[] = {-1, -1, -1, 0, -1, 1};</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> static unsigned time_diff(struct timeval *now, struct timeval *then)</div><div class='ctx'> {</div><div class='ctx'> 	return (now-&gt;tv_usec &gt;= then-&gt;tv_usec) ?</div><div class='del'>-	    now-&gt;tv_usec - then-&gt;tv_usec :</div><div class='del'>-	    1000000 - (then-&gt;tv_usec - now-&gt;tv_usec);</div><div class='add'>+		now-&gt;tv_usec - then-&gt;tv_usec :</div><div class='add'>+		1000000 - (then-&gt;tv_usec - now-&gt;tv_usec);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 via_get_vblank_counter(struct drm_device *dev, int crtc)</div><div class='add'>+{</div><div class='add'>+	drm_via_private_t *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	if (crtc != 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return atomic_read(&amp;dev_priv-&gt;vbl_received);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)</div><div class='hunk'>@@ -108,23 +117,22 @@ irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)</div><div class='ctx'> </div><div class='ctx'> 	status = VIA_READ(VIA_REG_INTERRUPT);</div><div class='ctx'> 	if (status &amp; VIA_IRQ_VBLANK_PENDING) {</div><div class='del'>-		atomic_inc(&amp;dev-&gt;vbl_received);</div><div class='del'>-		if (!(atomic_read(&amp;dev-&gt;vbl_received) &amp; 0x0F)) {</div><div class='add'>+		atomic_inc(&amp;dev_priv-&gt;vbl_received);</div><div class='add'>+		if (!(atomic_read(&amp;dev_priv-&gt;vbl_received) &amp; 0x0F)) {</div><div class='ctx'> 			do_gettimeofday(&amp;cur_vblank);</div><div class='ctx'> 			if (dev_priv-&gt;last_vblank_valid) {</div><div class='ctx'> 				dev_priv-&gt;usec_per_vblank =</div><div class='del'>-				    time_diff(&amp;cur_vblank,</div><div class='del'>-					      &amp;dev_priv-&gt;last_vblank) &gt;&gt; 4;</div><div class='add'>+					time_diff(&amp;cur_vblank,</div><div class='add'>+						  &amp;dev_priv-&gt;last_vblank) &gt;&gt; 4;</div><div class='ctx'> 			}</div><div class='ctx'> 			dev_priv-&gt;last_vblank = cur_vblank;</div><div class='ctx'> 			dev_priv-&gt;last_vblank_valid = 1;</div><div class='ctx'> 		}</div><div class='del'>-		if (!(atomic_read(&amp;dev-&gt;vbl_received) &amp; 0xFF)) {</div><div class='add'>+		if (!(atomic_read(&amp;dev_priv-&gt;vbl_received) &amp; 0xFF)) {</div><div class='ctx'> 			DRM_DEBUG("US per vblank is: %u\n",</div><div class='ctx'> 				  dev_priv-&gt;usec_per_vblank);</div><div class='ctx'> 		}</div><div class='del'>-		DRM_WAKEUP(&amp;dev-&gt;vbl_queue);</div><div class='del'>-		drm_vbl_send_signals(dev);</div><div class='add'>+		drm_handle_vblank(dev, 0);</div><div class='ctx'> 		handled = 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -145,6 +153,7 @@ irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)</div><div class='ctx'> 	/* Acknowlege interrupts */</div><div class='ctx'> 	VIA_WRITE(VIA_REG_INTERRUPT, status);</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> 	if (handled)</div><div class='ctx'> 		return IRQ_HANDLED;</div><div class='ctx'> 	else</div><div class='hunk'>@@ -163,31 +172,34 @@ static __inline__ void viadrv_acknowledge_irqs(drm_via_private_t * dev_priv)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int via_driver_vblank_wait(struct drm_device * dev, unsigned int *sequence)</div><div class='add'>+int via_enable_vblank(struct drm_device *dev, int crtc)</div><div class='ctx'> {</div><div class='del'>-	drm_via_private_t *dev_priv = (drm_via_private_t *) dev-&gt;dev_private;</div><div class='del'>-	unsigned int cur_vblank;</div><div class='del'>-	int ret = 0;</div><div class='add'>+	drm_via_private_t *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	u32 status;</div><div class='ctx'> </div><div class='del'>-	DRM_DEBUG("\n");</div><div class='del'>-	if (!dev_priv) {</div><div class='del'>-		DRM_ERROR("called with no initialization\n");</div><div class='add'>+	if (crtc != 0) {</div><div class='add'>+		DRM_ERROR("%s:  bad crtc %d\n", __func__, crtc);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	viadrv_acknowledge_irqs(dev_priv);</div><div class='add'>+	status = VIA_READ(VIA_REG_INTERRUPT);</div><div class='add'>+	VIA_WRITE(VIA_REG_INTERRUPT, status &amp; VIA_IRQ_VBLANK_ENABLE);</div><div class='add'>+</div><div class='add'>+	VIA_WRITE8(0x83d4, 0x11);</div><div class='add'>+	VIA_WRITE8(0x83d5, VIA_READ8(0x83d5) | 0x30);</div><div class='ctx'> </div><div class='del'>-	/* Assume that the user has missed the current sequence number</div><div class='del'>-	 * by about a day rather than she wants to wait for years</div><div class='del'>-	 * using vertical blanks...</div><div class='del'>-	 */</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void via_disable_vblank(struct drm_device *dev, int crtc)</div><div class='add'>+{</div><div class='add'>+	drm_via_private_t *dev_priv = dev-&gt;dev_private;</div><div class='ctx'> </div><div class='del'>-	DRM_WAIT_ON(ret, dev-&gt;vbl_queue, 3 * DRM_HZ,</div><div class='del'>-		    (((cur_vblank = atomic_read(&amp;dev-&gt;vbl_received)) -</div><div class='del'>-		      *sequence) &lt;= (1 &lt;&lt; 23)));</div><div class='add'>+	VIA_WRITE8(0x83d4, 0x11);</div><div class='add'>+	VIA_WRITE8(0x83d5, VIA_READ8(0x83d5) &amp; ~0x30);</div><div class='ctx'> </div><div class='del'>-	*sequence = cur_vblank;</div><div class='del'>-	return ret;</div><div class='add'>+	if (crtc != 0)</div><div class='add'>+		DRM_ERROR("%s:  bad crtc %d\n", __func__, crtc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -239,6 +251,7 @@ via_driver_irq_wait(struct drm_device * dev, unsigned int irq, int force_sequenc</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * drm_dma.h hooks</div><div class='ctx'>  */</div><div class='hunk'>@@ -292,23 +305,25 @@ void via_driver_irq_preinstall(struct drm_device * dev)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void via_driver_irq_postinstall(struct drm_device * dev)</div><div class='add'>+int via_driver_irq_postinstall(struct drm_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	drm_via_private_t *dev_priv = (drm_via_private_t *) dev-&gt;dev_private;</div><div class='ctx'> 	u32 status;</div><div class='ctx'> </div><div class='del'>-	DRM_DEBUG("\n");</div><div class='del'>-	if (dev_priv) {</div><div class='del'>-		status = VIA_READ(VIA_REG_INTERRUPT);</div><div class='del'>-		VIA_WRITE(VIA_REG_INTERRUPT, status | VIA_IRQ_GLOBAL</div><div class='del'>-			  | dev_priv-&gt;irq_enable_mask);</div><div class='add'>+	DRM_DEBUG("via_driver_irq_postinstall\n");</div><div class='add'>+	if (!dev_priv)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-		/* Some magic, oh for some data sheets ! */</div><div class='add'>+	drm_vblank_init(dev, 1);</div><div class='add'>+	status = VIA_READ(VIA_REG_INTERRUPT);</div><div class='add'>+	VIA_WRITE(VIA_REG_INTERRUPT, status | VIA_IRQ_GLOBAL</div><div class='add'>+		  | dev_priv-&gt;irq_enable_mask);</div><div class='ctx'> </div><div class='del'>-		VIA_WRITE8(0x83d4, 0x11);</div><div class='del'>-		VIA_WRITE8(0x83d5, VIA_READ8(0x83d5) | 0x30);</div><div class='add'>+	/* Some magic, oh for some data sheets ! */</div><div class='add'>+	VIA_WRITE8(0x83d4, 0x11);</div><div class='add'>+	VIA_WRITE8(0x83d5, VIA_READ8(0x83d5) | 0x30);</div><div class='ctx'> </div><div class='del'>-	}</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void via_driver_irq_uninstall(struct drm_device * dev)</div><div class='hunk'>@@ -339,9 +354,6 @@ int via_wait_irq(struct drm_device *dev, void *data, struct drm_file *file_priv)</div><div class='ctx'> 	drm_via_irq_t *cur_irq = dev_priv-&gt;via_irqs;</div><div class='ctx'> 	int force_sequence;</div><div class='ctx'> </div><div class='del'>-	if (!dev-&gt;irq)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='ctx'> 	if (irqwait-&gt;request.irq &gt;= dev_priv-&gt;num_irqs) {</div><div class='ctx'> 		DRM_ERROR("Trying to wait on unknown irq %d\n",</div><div class='ctx'> 			  irqwait-&gt;request.irq);</div><div class='hunk'>@@ -352,7 +364,8 @@ int via_wait_irq(struct drm_device *dev, void *data, struct drm_file *file_priv)</div><div class='ctx'> </div><div class='ctx'> 	switch (irqwait-&gt;request.type &amp; ~VIA_IRQ_FLAGS_MASK) {</div><div class='ctx'> 	case VIA_IRQ_RELATIVE:</div><div class='del'>-		irqwait-&gt;request.sequence += atomic_read(&amp;cur_irq-&gt;irq_received);</div><div class='add'>+		irqwait-&gt;request.sequence +=</div><div class='add'>+			atomic_read(&amp;cur_irq-&gt;irq_received);</div><div class='ctx'> 		irqwait-&gt;request.type &amp;= ~_DRM_VBLANK_RELATIVE;</div><div class='ctx'> 	case VIA_IRQ_ABSOLUTE:</div><div class='ctx'> 		break;</div><div class='head'>diff --git a/drivers/gpu/drm/via/via_mm.c b/drivers/gpu/drm/via/via_mm.c<br/>index e64094916e4f..f694cb5ededc 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpu/drm/via/via_mm.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/gpu/drm/via/via_mm.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/gpu/drm/via/via_mm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/gpu/drm/via/via_mm.c</a></div><div class='hunk'>@@ -93,8 +93,7 @@ int via_final_context(struct drm_device *dev, int context)</div><div class='ctx'> 	/* Last context, perform cleanup */</div><div class='ctx'> 	if (dev-&gt;ctx_count == 1 &amp;&amp; dev-&gt;dev_private) {</div><div class='ctx'> 		DRM_DEBUG("Last Context\n");</div><div class='del'>-		if (dev-&gt;irq)</div><div class='del'>-			drm_irq_uninstall(dev);</div><div class='add'>+		drm_irq_uninstall(dev);</div><div class='ctx'> 		via_cleanup_futex(dev_priv);</div><div class='ctx'> 		via_do_cleanup_map(dev);</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig<br/>index cacf89e65af4..f5999a91614e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hid/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/hid/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hid/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/Kconfig</a></div><div class='hunk'>@@ -67,4 +67,201 @@ config HIDRAW</div><div class='ctx'> </div><div class='ctx'> source "drivers/hid/usbhid/Kconfig"</div><div class='ctx'> </div><div class='add'>+menu "Special HID drivers"</div><div class='add'>+	depends on HID</div><div class='add'>+</div><div class='add'>+config HID_COMPAT</div><div class='add'>+	bool "Load all HID drivers on hid core load"</div><div class='add'>+	default y</div><div class='add'>+	---help---</div><div class='add'>+	Compatible option for older userspace. If you have system without udev</div><div class='add'>+	support of module loading through aliases and also old</div><div class='add'>+	module-init-tools which can't handle hid bus, choose Y here. Otherwise</div><div class='add'>+	say N. If you say N and your userspace is old enough, the only</div><div class='add'>+	functionality you lose is modules autoloading.</div><div class='add'>+</div><div class='add'>+	If unsure, say Y.</div><div class='add'>+</div><div class='add'>+config HID_A4TECH</div><div class='add'>+	tristate "A4 tech" if EMBEDDED</div><div class='add'>+	depends on USB_HID</div><div class='add'>+	default y</div><div class='add'>+	---help---</div><div class='add'>+	Support for A4 tech X5 and WOP-35 / Trust 450L mice.</div><div class='add'>+</div><div class='add'>+config HID_APPLE</div><div class='add'>+	tristate "Apple" if EMBEDDED</div><div class='add'>+	depends on (USB_HID || BT_HIDP)</div><div class='add'>+	default y</div><div class='add'>+	---help---</div><div class='add'>+	Support for some Apple devices which less or more break</div><div class='add'>+	HID specification.</div><div class='add'>+</div><div class='add'>+	Say Y here if you want support for keyboards of	Apple iBooks, PowerBooks,</div><div class='add'>+	MacBooks, MacBook Pros and Apple Aluminum.</div><div class='add'>+</div><div class='add'>+config HID_BELKIN</div><div class='add'>+	tristate "Belkin" if EMBEDDED</div><div class='add'>+	depends on USB_HID</div><div class='add'>+	default y</div><div class='add'>+	---help---</div><div class='add'>+	Support for Belkin Flip KVM and Wireless keyboard.</div><div class='add'>+</div><div class='add'>+config HID_BRIGHT</div><div class='add'>+	tristate "Bright" if EMBEDDED</div><div class='add'>+	depends on USB_HID</div><div class='add'>+	default y</div><div class='add'>+	---help---</div><div class='add'>+	Support for Bright ABNT-2 keyboard.</div><div class='add'>+</div><div class='add'>+config HID_CHERRY</div><div class='add'>+	tristate "Cherry" if EMBEDDED</div><div class='add'>+	depends on USB_HID</div><div class='add'>+	default y</div><div class='add'>+	---help---</div><div class='add'>+	Support for Cherry Cymotion keyboard.</div><div class='add'>+</div><div class='add'>+config HID_CHICONY</div><div class='add'>+	tristate "Chicony" if EMBEDDED</div><div class='add'>+	depends on USB_HID</div><div class='add'>+	default y</div><div class='add'>+	---help---</div><div class='add'>+	Support for Chicony Tactical pad.</div><div class='add'>+</div><div class='add'>+config HID_CYPRESS</div><div class='add'>+	tristate "Cypress" if EMBEDDED</div><div class='add'>+	depends on USB_HID</div><div class='add'>+	default y</div><div class='add'>+	---help---</div><div class='add'>+	Support for cypress mouse and barcode readers.</div><div class='add'>+</div><div class='add'>+config HID_DELL</div><div class='add'>+	tristate "Dell" if EMBEDDED</div><div class='add'>+	depends on USB_HID</div><div class='add'>+	default y</div><div class='add'>+	---help---</div><div class='add'>+	Support for quirky Dell HID hardware that require</div><div class='add'>+	special LED handling (W7658 and SK8115 models)</div><div class='add'>+</div><div class='add'>+config HID_EZKEY</div><div class='add'>+	tristate "Ezkey" if EMBEDDED</div><div class='add'>+	depends on USB_HID</div><div class='add'>+	default y</div><div class='add'>+	---help---</div><div class='add'>+	Support for Ezkey BTC 8193 keyboard.</div><div class='add'>+</div><div class='add'>+config HID_GYRATION</div><div class='add'>+	tristate "Gyration" if EMBEDDED</div><div class='add'>+	depends on USB_HID</div><div class='add'>+	default y</div><div class='add'>+	---help---</div><div class='add'>+	Support for Gyration remote control.</div><div class='add'>+</div><div class='add'>+config HID_LOGITECH</div><div class='add'>+	tristate "Logitech" if EMBEDDED</div><div class='add'>+	depends on USB_HID</div><div class='add'>+	default y</div><div class='add'>+	---help---</div><div class='add'>+	Support for Logitech devices that are not fully compliant with HID standard.</div><div class='add'>+</div><div class='add'>+config LOGITECH_FF</div><div class='add'>+	bool "Logitech force feedback"</div><div class='add'>+	depends on HID_LOGITECH</div><div class='add'>+	select INPUT_FF_MEMLESS</div><div class='add'>+	help</div><div class='add'>+	  Say Y here if you have one of these devices:</div><div class='add'>+	  - Logitech WingMan Cordless RumblePad</div><div class='add'>+	  - Logitech WingMan Cordless RumblePad 2</div><div class='add'>+	  - Logitech WingMan Force 3D</div><div class='add'>+	  - Logitech Formula Force EX</div><div class='add'>+	  - Logitech MOMO Force wheel</div><div class='add'>+</div><div class='add'>+	  and if you want to enable force feedback for them.</div><div class='add'>+	  Note: if you say N here, this device will still be supported, but without</div><div class='add'>+	  force feedback.</div><div class='add'>+</div><div class='add'>+config LOGIRUMBLEPAD2_FF</div><div class='add'>+	bool "Logitech Rumblepad 2 force feedback"</div><div class='add'>+	depends on HID_LOGITECH</div><div class='add'>+	select INPUT_FF_MEMLESS</div><div class='add'>+	help</div><div class='add'>+	  Say Y here if you want to enable force feedback support for Logitech</div><div class='add'>+	  Rumblepad 2 devices.</div><div class='add'>+</div><div class='add'>+config HID_MICROSOFT</div><div class='add'>+	tristate "Microsoft" if EMBEDDED</div><div class='add'>+	depends on USB_HID</div><div class='add'>+	default y</div><div class='add'>+	---help---</div><div class='add'>+	Support for Microsoft devices that are not fully compliant with HID standard.</div><div class='add'>+</div><div class='add'>+config HID_MONTEREY</div><div class='add'>+	tristate "Monterey" if EMBEDDED</div><div class='add'>+	depends on USB_HID</div><div class='add'>+	default y</div><div class='add'>+	---help---</div><div class='add'>+	Support for Monterey Genius KB29E.</div><div class='add'>+</div><div class='add'>+config HID_PANTHERLORD</div><div class='add'>+	tristate "Pantherlord devices support" if EMBEDDED</div><div class='add'>+	depends on USB_HID</div><div class='add'>+	default y</div><div class='add'>+	---help---</div><div class='add'>+	Support for PantherLord/GreenAsia based device support.</div><div class='add'>+</div><div class='add'>+config PANTHERLORD_FF</div><div class='add'>+	bool "Pantherlord force feedback support"</div><div class='add'>+	depends on HID_PANTHERLORD</div><div class='add'>+	select INPUT_FF_MEMLESS</div><div class='add'>+	help</div><div class='add'>+	  Say Y here if you have a PantherLord/GreenAsia based game controller</div><div class='add'>+	  or adapter and want to enable force feedback support for it.</div><div class='add'>+</div><div class='add'>+config HID_PETALYNX</div><div class='add'>+	tristate "Petalynx" if EMBEDDED</div><div class='add'>+	depends on USB_HID</div><div class='add'>+	default y</div><div class='add'>+	---help---</div><div class='add'>+	Support for Petalynx Maxter remote control.</div><div class='add'>+</div><div class='add'>+config HID_SAMSUNG</div><div class='add'>+	tristate "Samsung" if EMBEDDED</div><div class='add'>+	depends on USB_HID</div><div class='add'>+	default y</div><div class='add'>+	---help---</div><div class='add'>+	Support for Samsung InfraRed remote control.</div><div class='add'>+</div><div class='add'>+config HID_SONY</div><div class='add'>+	tristate "Sony" if EMBEDDED</div><div class='add'>+	depends on USB_HID</div><div class='add'>+	default y</div><div class='add'>+	---help---</div><div class='add'>+	Support for Sony PS3 controller.</div><div class='add'>+</div><div class='add'>+config HID_SUNPLUS</div><div class='add'>+	tristate "Sunplus" if EMBEDDED</div><div class='add'>+	depends on USB_HID</div><div class='add'>+	default y</div><div class='add'>+	---help---</div><div class='add'>+	Support for Sunplus wireless desktop.</div><div class='add'>+</div><div class='add'>+config THRUSTMASTER_FF</div><div class='add'>+	tristate "ThrustMaster devices support"</div><div class='add'>+	default m</div><div class='add'>+	depends on USB_HID</div><div class='add'>+	select INPUT_FF_MEMLESS</div><div class='add'>+	help</div><div class='add'>+	  Say Y here if you have a THRUSTMASTER FireStore Dual Power 2 or</div><div class='add'>+	  a THRUSTMASTER Ferrari GT Rumble Force or Force Feedback Wheel.</div><div class='add'>+</div><div class='add'>+config ZEROPLUS_FF</div><div class='add'>+	tristate "Zeroplus based game controller support"</div><div class='add'>+	default m</div><div class='add'>+	depends on USB_HID</div><div class='add'>+	select INPUT_FF_MEMLESS</div><div class='add'>+	help</div><div class='add'>+	  Say Y here if you have a Zeroplus based game controller.</div><div class='add'>+</div><div class='add'>+endmenu</div><div class='add'>+</div><div class='ctx'> endif # HID_SUPPORT</div><div class='head'>diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile<br/>index 275dc522c738..b09e43e7413e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hid/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/hid/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hid/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/Makefile</a></div><div class='hunk'>@@ -1,13 +1,46 @@</div><div class='ctx'> #</div><div class='ctx'> # Makefile for the HID driver</div><div class='ctx'> #</div><div class='del'>-hid-objs			:= hid-core.o hid-input.o hid-input-quirks.o</div><div class='add'>+hid-objs			:= hid-core.o hid-input.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_HID)		+= hid.o</div><div class='ctx'> </div><div class='ctx'> hid-$(CONFIG_HID_DEBUG)		+= hid-debug.o</div><div class='ctx'> hid-$(CONFIG_HIDRAW)		+= hidraw.o</div><div class='ctx'> </div><div class='add'>+ifdef CONFIG_HID_COMPAT</div><div class='add'>+obj-m				+= hid-dummy.o</div><div class='add'>+endif</div><div class='add'>+</div><div class='add'>+hid-logitech-objs		:= hid-lg.o</div><div class='add'>+ifdef CONFIG_LOGITECH_FF</div><div class='add'>+	hid-logitech-objs	+= hid-lgff.o</div><div class='add'>+endif</div><div class='add'>+ifdef CONFIG_LOGIRUMBLEPAD2_FF</div><div class='add'>+	hid-logitech-objs	+= hid-lg2ff.o</div><div class='add'>+endif</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_HID_A4TECH)	+= hid-a4tech.o</div><div class='add'>+obj-$(CONFIG_HID_APPLE)		+= hid-apple.o</div><div class='add'>+obj-$(CONFIG_HID_BELKIN)	+= hid-belkin.o</div><div class='add'>+obj-$(CONFIG_HID_BRIGHT)	+= hid-bright.o</div><div class='add'>+obj-$(CONFIG_HID_CHERRY)	+= hid-cherry.o</div><div class='add'>+obj-$(CONFIG_HID_CHICONY)	+= hid-chicony.o</div><div class='add'>+obj-$(CONFIG_HID_CYPRESS)	+= hid-cypress.o</div><div class='add'>+obj-$(CONFIG_HID_DELL)		+= hid-dell.o</div><div class='add'>+obj-$(CONFIG_HID_EZKEY)		+= hid-ezkey.o</div><div class='add'>+obj-$(CONFIG_HID_GYRATION)	+= hid-gyration.o</div><div class='add'>+obj-$(CONFIG_HID_LOGITECH)	+= hid-logitech.o</div><div class='add'>+obj-$(CONFIG_HID_MICROSOFT)	+= hid-microsoft.o</div><div class='add'>+obj-$(CONFIG_HID_MONTEREY)	+= hid-monterey.o</div><div class='add'>+obj-$(CONFIG_HID_PANTHERLORD)	+= hid-pl.o</div><div class='add'>+obj-$(CONFIG_HID_PETALYNX)	+= hid-petalynx.o</div><div class='add'>+obj-$(CONFIG_HID_SAMSUNG)	+= hid-samsung.o</div><div class='add'>+obj-$(CONFIG_HID_SONY)		+= hid-sony.o</div><div class='add'>+obj-$(CONFIG_HID_SUNPLUS)	+= hid-sunplus.o</div><div class='add'>+obj-$(CONFIG_THRUSTMASTER_FF)	+= hid-tmff.o</div><div class='add'>+obj-$(CONFIG_ZEROPLUS_FF)	+= hid-zpff.o</div><div class='add'>+</div><div class='ctx'> obj-$(CONFIG_USB_HID)		+= usbhid/</div><div class='ctx'> obj-$(CONFIG_USB_MOUSE)		+= usbhid/</div><div class='ctx'> obj-$(CONFIG_USB_KBD)		+= usbhid/</div><div class='head'>diff --git a/drivers/hid/hid-a4tech.c b/drivers/hid/hid-a4tech.c<br/>new file mode 100644<br/>index 000000000000..ebca00e6c103<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hid/hid-a4tech.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/hid-a4tech.c</a></div><div class='hunk'>@@ -0,0 +1,162 @@</div><div class='add'>+/*</div><div class='add'>+ *  HID driver for some a4tech "special" devices</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (c) 1999 Andreas Gal</div><div class='add'>+ *  Copyright (c) 2000-2005 Vojtech Pavlik &lt;vojtech@suse.cz&gt;</div><div class='add'>+ *  Copyright (c) 2005 Michael Haboustak &lt;mike-@cinci.rr.com&gt; for Concept2, Inc</div><div class='add'>+ *  Copyright (c) 2006-2007 Jiri Kosina</div><div class='add'>+ *  Copyright (c) 2007 Paul Walmsley</div><div class='add'>+ *  Copyright (c) 2008 Jiri Slaby</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms of the GNU General Public License as published by the Free</div><div class='add'>+ * Software Foundation; either version 2 of the License, or (at your option)</div><div class='add'>+ * any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/input.h&gt;</div><div class='add'>+#include &lt;linux/hid.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+</div><div class='add'>+#include "hid-ids.h"</div><div class='add'>+</div><div class='add'>+#define A4_2WHEEL_MOUSE_HACK_7	0x01</div><div class='add'>+#define A4_2WHEEL_MOUSE_HACK_B8	0x02</div><div class='add'>+</div><div class='add'>+struct a4tech_sc {</div><div class='add'>+	unsigned long quirks;</div><div class='add'>+	unsigned int hw_wheel;</div><div class='add'>+	__s32 delayed_value;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int a4_input_mapped(struct hid_device *hdev, struct hid_input *hi,</div><div class='add'>+		struct hid_field *field, struct hid_usage *usage,</div><div class='add'>+		unsigned long **bit, int *max)</div><div class='add'>+{</div><div class='add'>+	struct a4tech_sc *a4 = hid_get_drvdata(hdev);</div><div class='add'>+</div><div class='add'>+	if (usage-&gt;type == EV_REL &amp;&amp; usage-&gt;code == REL_WHEEL)</div><div class='add'>+		set_bit(REL_HWHEEL, *bit);</div><div class='add'>+</div><div class='add'>+	if ((a4-&gt;quirks &amp; A4_2WHEEL_MOUSE_HACK_7) &amp;&amp; usage-&gt;hid == 0x00090007)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int a4_event(struct hid_device *hdev, struct hid_field *field,</div><div class='add'>+		struct hid_usage *usage, __s32 value)</div><div class='add'>+{</div><div class='add'>+	struct a4tech_sc *a4 = hid_get_drvdata(hdev);</div><div class='add'>+	struct input_dev *input;</div><div class='add'>+</div><div class='add'>+	if (!(hdev-&gt;claimed &amp; HID_CLAIMED_INPUT) || !field-&gt;hidinput ||</div><div class='add'>+			!usage-&gt;type)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	input = field-&gt;hidinput-&gt;input;</div><div class='add'>+</div><div class='add'>+	if (a4-&gt;quirks &amp; A4_2WHEEL_MOUSE_HACK_B8) {</div><div class='add'>+		if (usage-&gt;type == EV_REL &amp;&amp; usage-&gt;code == REL_WHEEL) {</div><div class='add'>+			a4-&gt;delayed_value = value;</div><div class='add'>+			return 1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (usage-&gt;hid == 0x000100b8) {</div><div class='add'>+			input_event(input, EV_REL, value ? REL_HWHEEL :</div><div class='add'>+					REL_WHEEL, a4-&gt;delayed_value);</div><div class='add'>+			return 1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((a4-&gt;quirks &amp; A4_2WHEEL_MOUSE_HACK_7) &amp;&amp; usage-&gt;hid == 0x00090007) {</div><div class='add'>+		a4-&gt;hw_wheel = !!value;</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (usage-&gt;code == REL_WHEEL &amp;&amp; a4-&gt;hw_wheel) {</div><div class='add'>+		input_event(input, usage-&gt;type, REL_HWHEEL, value);</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int a4_probe(struct hid_device *hdev, const struct hid_device_id *id)</div><div class='add'>+{</div><div class='add'>+	struct a4tech_sc *a4;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	a4 = kzalloc(sizeof(*a4), GFP_KERNEL);</div><div class='add'>+	if (a4 == NULL) {</div><div class='add'>+		dev_err(&amp;hdev-&gt;dev, "can't alloc device descriptor\n");</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto err_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	a4-&gt;quirks = id-&gt;driver_data;</div><div class='add'>+</div><div class='add'>+	hid_set_drvdata(hdev, a4);</div><div class='add'>+</div><div class='add'>+	ret = hid_parse(hdev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;hdev-&gt;dev, "parse failed\n");</div><div class='add'>+		goto err_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;hdev-&gt;dev, "hw start failed\n");</div><div class='add'>+		goto err_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+err_free:</div><div class='add'>+	kfree(a4);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void a4_remove(struct hid_device *hdev)</div><div class='add'>+{</div><div class='add'>+	struct a4tech_sc *a4 = hid_get_drvdata(hdev);</div><div class='add'>+</div><div class='add'>+	hid_hw_stop(hdev);</div><div class='add'>+	kfree(a4);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hid_device_id a4_devices[] = {</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_WCP32PU),</div><div class='add'>+		.driver_data = A4_2WHEEL_MOUSE_HACK_7 },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_X5_005D),</div><div class='add'>+		.driver_data = A4_2WHEEL_MOUSE_HACK_B8 },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(hid, a4_devices);</div><div class='add'>+</div><div class='add'>+static struct hid_driver a4_driver = {</div><div class='add'>+	.name = "a4tech",</div><div class='add'>+	.id_table = a4_devices,</div><div class='add'>+	.input_mapped = a4_input_mapped,</div><div class='add'>+	.event = a4_event,</div><div class='add'>+	.probe = a4_probe,</div><div class='add'>+	.remove = a4_remove,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int a4_init(void)</div><div class='add'>+{</div><div class='add'>+	return hid_register_driver(&amp;a4_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void a4_exit(void)</div><div class='add'>+{</div><div class='add'>+	hid_unregister_driver(&amp;a4_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(a4_init);</div><div class='add'>+module_exit(a4_exit);</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='add'>+HID_COMPAT_LOAD_DRIVER(a4tech);</div><div class='head'>diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c<br/>new file mode 100644<br/>index 000000000000..fd7f896b34f7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hid/hid-apple.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/hid-apple.c</a></div><div class='hunk'>@@ -0,0 +1,484 @@</div><div class='add'>+/*</div><div class='add'>+ *  USB HID quirks support for Linux</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (c) 1999 Andreas Gal</div><div class='add'>+ *  Copyright (c) 2000-2005 Vojtech Pavlik &lt;vojtech@suse.cz&gt;</div><div class='add'>+ *  Copyright (c) 2005 Michael Haboustak &lt;mike-@cinci.rr.com&gt; for Concept2, Inc</div><div class='add'>+ *  Copyright (c) 2006-2007 Jiri Kosina</div><div class='add'>+ *  Copyright (c) 2007 Paul Walmsley</div><div class='add'>+ *  Copyright (c) 2008 Jiri Slaby &lt;jirislaby@gmail.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms of the GNU General Public License as published by the Free</div><div class='add'>+ * Software Foundation; either version 2 of the License, or (at your option)</div><div class='add'>+ * any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/hid.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/usb.h&gt;</div><div class='add'>+</div><div class='add'>+#include "hid-ids.h"</div><div class='add'>+</div><div class='add'>+#define APPLE_RDESC_JIS		0x0001</div><div class='add'>+#define APPLE_IGNORE_MOUSE	0x0002</div><div class='add'>+#define APPLE_HAS_FN		0x0004</div><div class='add'>+#define APPLE_HIDDEV		0x0008</div><div class='add'>+#define APPLE_ISO_KEYBOARD	0x0010</div><div class='add'>+#define APPLE_MIGHTYMOUSE	0x0020</div><div class='add'>+#define APPLE_INVERT_HWHEEL	0x0040</div><div class='add'>+#define APPLE_IGNORE_HIDINPUT	0x0080</div><div class='add'>+#define APPLE_NUMLOCK_EMULATION	0x0100</div><div class='add'>+</div><div class='add'>+#define APPLE_FLAG_FKEY		0x01</div><div class='add'>+</div><div class='add'>+static unsigned int fnmode = 1;</div><div class='add'>+module_param(fnmode, uint, 0644);</div><div class='add'>+MODULE_PARM_DESC(fnmode, "Mode of fn key on Apple keyboards (0 = disabled, "</div><div class='add'>+		"[1] = fkeyslast, 2 = fkeysfirst)");</div><div class='add'>+</div><div class='add'>+struct apple_sc {</div><div class='add'>+	unsigned long quirks;</div><div class='add'>+	unsigned int fn_on;</div><div class='add'>+	DECLARE_BITMAP(pressed_fn, KEY_CNT);</div><div class='add'>+	DECLARE_BITMAP(pressed_numlock, KEY_CNT);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct apple_key_translation {</div><div class='add'>+	u16 from;</div><div class='add'>+	u16 to;</div><div class='add'>+	u8 flags;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct apple_key_translation apple_fn_keys[] = {</div><div class='add'>+	{ KEY_BACKSPACE, KEY_DELETE },</div><div class='add'>+	{ KEY_F1,	KEY_BRIGHTNESSDOWN, APPLE_FLAG_FKEY },</div><div class='add'>+	{ KEY_F2,	KEY_BRIGHTNESSUP,   APPLE_FLAG_FKEY },</div><div class='add'>+	{ KEY_F3,	KEY_FN_F5,          APPLE_FLAG_FKEY }, /* Exposé */</div><div class='add'>+	{ KEY_F4,	KEY_FN_F4,          APPLE_FLAG_FKEY }, /* Dashboard */</div><div class='add'>+	{ KEY_F5,	KEY_KBDILLUMDOWN,   APPLE_FLAG_FKEY },</div><div class='add'>+	{ KEY_F6,	KEY_KBDILLUMUP,     APPLE_FLAG_FKEY },</div><div class='add'>+	{ KEY_F7,	KEY_PREVIOUSSONG,   APPLE_FLAG_FKEY },</div><div class='add'>+	{ KEY_F8,	KEY_PLAYPAUSE,      APPLE_FLAG_FKEY },</div><div class='add'>+	{ KEY_F9,	KEY_NEXTSONG,       APPLE_FLAG_FKEY },</div><div class='add'>+	{ KEY_F10,	KEY_MUTE,           APPLE_FLAG_FKEY },</div><div class='add'>+	{ KEY_F11,	KEY_VOLUMEDOWN,     APPLE_FLAG_FKEY },</div><div class='add'>+	{ KEY_F12,	KEY_VOLUMEUP,       APPLE_FLAG_FKEY },</div><div class='add'>+	{ KEY_UP,	KEY_PAGEUP },</div><div class='add'>+	{ KEY_DOWN,	KEY_PAGEDOWN },</div><div class='add'>+	{ KEY_LEFT,	KEY_HOME },</div><div class='add'>+	{ KEY_RIGHT,	KEY_END },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct apple_key_translation powerbook_fn_keys[] = {</div><div class='add'>+	{ KEY_BACKSPACE, KEY_DELETE },</div><div class='add'>+	{ KEY_F1,	KEY_BRIGHTNESSDOWN,     APPLE_FLAG_FKEY },</div><div class='add'>+	{ KEY_F2,	KEY_BRIGHTNESSUP,       APPLE_FLAG_FKEY },</div><div class='add'>+	{ KEY_F3,	KEY_MUTE,               APPLE_FLAG_FKEY },</div><div class='add'>+	{ KEY_F4,	KEY_VOLUMEDOWN,         APPLE_FLAG_FKEY },</div><div class='add'>+	{ KEY_F5,	KEY_VOLUMEUP,           APPLE_FLAG_FKEY },</div><div class='add'>+	{ KEY_F6,	KEY_NUMLOCK,            APPLE_FLAG_FKEY },</div><div class='add'>+	{ KEY_F7,	KEY_SWITCHVIDEOMODE,    APPLE_FLAG_FKEY },</div><div class='add'>+	{ KEY_F8,	KEY_KBDILLUMTOGGLE,     APPLE_FLAG_FKEY },</div><div class='add'>+	{ KEY_F9,	KEY_KBDILLUMDOWN,       APPLE_FLAG_FKEY },</div><div class='add'>+	{ KEY_F10,	KEY_KBDILLUMUP,         APPLE_FLAG_FKEY },</div><div class='add'>+	{ KEY_UP,	KEY_PAGEUP },</div><div class='add'>+	{ KEY_DOWN,	KEY_PAGEDOWN },</div><div class='add'>+	{ KEY_LEFT,	KEY_HOME },</div><div class='add'>+	{ KEY_RIGHT,	KEY_END },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct apple_key_translation powerbook_numlock_keys[] = {</div><div class='add'>+	{ KEY_J,	KEY_KP1 },</div><div class='add'>+	{ KEY_K,	KEY_KP2 },</div><div class='add'>+	{ KEY_L,	KEY_KP3 },</div><div class='add'>+	{ KEY_U,	KEY_KP4 },</div><div class='add'>+	{ KEY_I,	KEY_KP5 },</div><div class='add'>+	{ KEY_O,	KEY_KP6 },</div><div class='add'>+	{ KEY_7,	KEY_KP7 },</div><div class='add'>+	{ KEY_8,	KEY_KP8 },</div><div class='add'>+	{ KEY_9,	KEY_KP9 },</div><div class='add'>+	{ KEY_M,	KEY_KP0 },</div><div class='add'>+	{ KEY_DOT,	KEY_KPDOT },</div><div class='add'>+	{ KEY_SLASH,	KEY_KPPLUS },</div><div class='add'>+	{ KEY_SEMICOLON, KEY_KPMINUS },</div><div class='add'>+	{ KEY_P,	KEY_KPASTERISK },</div><div class='add'>+	{ KEY_MINUS,	KEY_KPEQUAL },</div><div class='add'>+	{ KEY_0,	KEY_KPSLASH },</div><div class='add'>+	{ KEY_F6,	KEY_NUMLOCK },</div><div class='add'>+	{ KEY_KPENTER,	KEY_KPENTER },</div><div class='add'>+	{ KEY_BACKSPACE, KEY_BACKSPACE },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct apple_key_translation apple_iso_keyboard[] = {</div><div class='add'>+	{ KEY_GRAVE,	KEY_102ND },</div><div class='add'>+	{ KEY_102ND,	KEY_GRAVE },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct apple_key_translation *apple_find_translation(</div><div class='add'>+		struct apple_key_translation *table, u16 from)</div><div class='add'>+{</div><div class='add'>+	struct apple_key_translation *trans;</div><div class='add'>+</div><div class='add'>+	/* Look for the translation */</div><div class='add'>+	for (trans = table; trans-&gt;from; trans++)</div><div class='add'>+		if (trans-&gt;from == from)</div><div class='add'>+			return trans;</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hidinput_apple_event(struct hid_device *hid, struct input_dev *input,</div><div class='add'>+		struct hid_usage *usage, __s32 value)</div><div class='add'>+{</div><div class='add'>+	struct apple_sc *asc = hid_get_drvdata(hid);</div><div class='add'>+	struct apple_key_translation *trans;</div><div class='add'>+</div><div class='add'>+	if (usage-&gt;code == KEY_FN) {</div><div class='add'>+		asc-&gt;fn_on = !!value;</div><div class='add'>+		input_event(input, usage-&gt;type, usage-&gt;code, value);</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (fnmode) {</div><div class='add'>+		int do_translate;</div><div class='add'>+</div><div class='add'>+		trans = apple_find_translation((hid-&gt;product &lt; 0x220 ||</div><div class='add'>+					hid-&gt;product &gt;= 0x300) ?</div><div class='add'>+					powerbook_fn_keys : apple_fn_keys,</div><div class='add'>+					usage-&gt;code);</div><div class='add'>+		if (trans) {</div><div class='add'>+			if (test_bit(usage-&gt;code, asc-&gt;pressed_fn))</div><div class='add'>+				do_translate = 1;</div><div class='add'>+			else if (trans-&gt;flags &amp; APPLE_FLAG_FKEY)</div><div class='add'>+				do_translate = (fnmode == 2 &amp;&amp; asc-&gt;fn_on) ||</div><div class='add'>+					(fnmode == 1 &amp;&amp; !asc-&gt;fn_on);</div><div class='add'>+			else</div><div class='add'>+				do_translate = asc-&gt;fn_on;</div><div class='add'>+</div><div class='add'>+			if (do_translate) {</div><div class='add'>+				if (value)</div><div class='add'>+					set_bit(usage-&gt;code, asc-&gt;pressed_fn);</div><div class='add'>+				else</div><div class='add'>+					clear_bit(usage-&gt;code, asc-&gt;pressed_fn);</div><div class='add'>+</div><div class='add'>+				input_event(input, usage-&gt;type, trans-&gt;to,</div><div class='add'>+						value);</div><div class='add'>+</div><div class='add'>+				return 1;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (asc-&gt;quirks &amp; APPLE_NUMLOCK_EMULATION &amp;&amp;</div><div class='add'>+				(test_bit(usage-&gt;code, asc-&gt;pressed_numlock) ||</div><div class='add'>+				test_bit(LED_NUML, input-&gt;led))) {</div><div class='add'>+			trans = apple_find_translation(powerbook_numlock_keys,</div><div class='add'>+					usage-&gt;code);</div><div class='add'>+</div><div class='add'>+			if (trans) {</div><div class='add'>+				if (value)</div><div class='add'>+					set_bit(usage-&gt;code,</div><div class='add'>+							asc-&gt;pressed_numlock);</div><div class='add'>+				else</div><div class='add'>+					clear_bit(usage-&gt;code,</div><div class='add'>+							asc-&gt;pressed_numlock);</div><div class='add'>+</div><div class='add'>+				input_event(input, usage-&gt;type, trans-&gt;to,</div><div class='add'>+						value);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			return 1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (asc-&gt;quirks &amp; APPLE_ISO_KEYBOARD) {</div><div class='add'>+		trans = apple_find_translation(apple_iso_keyboard, usage-&gt;code);</div><div class='add'>+		if (trans) {</div><div class='add'>+			input_event(input, usage-&gt;type, trans-&gt;to, value);</div><div class='add'>+			return 1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int apple_event(struct hid_device *hdev, struct hid_field *field,</div><div class='add'>+		struct hid_usage *usage, __s32 value)</div><div class='add'>+{</div><div class='add'>+	struct apple_sc *asc = hid_get_drvdata(hdev);</div><div class='add'>+</div><div class='add'>+	if (!(hdev-&gt;claimed &amp; HID_CLAIMED_INPUT) || !field-&gt;hidinput ||</div><div class='add'>+			!usage-&gt;type)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if ((asc-&gt;quirks &amp; APPLE_INVERT_HWHEEL) &amp;&amp;</div><div class='add'>+			usage-&gt;code == REL_HWHEEL) {</div><div class='add'>+		input_event(field-&gt;hidinput-&gt;input, usage-&gt;type, usage-&gt;code,</div><div class='add'>+				-value);</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((asc-&gt;quirks &amp; APPLE_HAS_FN) &amp;&amp;</div><div class='add'>+			hidinput_apple_event(hdev, field-&gt;hidinput-&gt;input,</div><div class='add'>+				usage, value))</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * MacBook JIS keyboard has wrong logical maximum</div><div class='add'>+ */</div><div class='add'>+static void apple_report_fixup(struct hid_device *hdev, __u8 *rdesc,</div><div class='add'>+		unsigned int rsize)</div><div class='add'>+{</div><div class='add'>+	struct apple_sc *asc = hid_get_drvdata(hdev);</div><div class='add'>+</div><div class='add'>+	if ((asc-&gt;quirks &amp; APPLE_RDESC_JIS) &amp;&amp; rsize &gt;= 60 &amp;&amp;</div><div class='add'>+			rdesc[53] == 0x65 &amp;&amp; rdesc[59] == 0x65) {</div><div class='add'>+		dev_info(&amp;hdev-&gt;dev, "fixing up MacBook JIS keyboard report "</div><div class='add'>+				"descriptor\n");</div><div class='add'>+		rdesc[53] = rdesc[59] = 0xe7;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void apple_setup_input(struct input_dev *input)</div><div class='add'>+{</div><div class='add'>+	struct apple_key_translation *trans;</div><div class='add'>+</div><div class='add'>+	set_bit(KEY_NUMLOCK, input-&gt;keybit);</div><div class='add'>+</div><div class='add'>+	/* Enable all needed keys */</div><div class='add'>+	for (trans = apple_fn_keys; trans-&gt;from; trans++)</div><div class='add'>+		set_bit(trans-&gt;to, input-&gt;keybit);</div><div class='add'>+</div><div class='add'>+	for (trans = powerbook_fn_keys; trans-&gt;from; trans++)</div><div class='add'>+		set_bit(trans-&gt;to, input-&gt;keybit);</div><div class='add'>+</div><div class='add'>+	for (trans = powerbook_numlock_keys; trans-&gt;from; trans++)</div><div class='add'>+		set_bit(trans-&gt;to, input-&gt;keybit);</div><div class='add'>+</div><div class='add'>+	for (trans = apple_iso_keyboard; trans-&gt;from; trans++)</div><div class='add'>+		set_bit(trans-&gt;to, input-&gt;keybit);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int apple_input_mapping(struct hid_device *hdev, struct hid_input *hi,</div><div class='add'>+		struct hid_field *field, struct hid_usage *usage,</div><div class='add'>+		unsigned long **bit, int *max)</div><div class='add'>+{</div><div class='add'>+	if (usage-&gt;hid == (HID_UP_CUSTOM | 0x0003)) {</div><div class='add'>+		/* The fn key on Apple USB keyboards */</div><div class='add'>+		set_bit(EV_REP, hi-&gt;input-&gt;evbit);</div><div class='add'>+		hid_map_usage_clear(hi, usage, bit, max, EV_KEY, KEY_FN);</div><div class='add'>+		apple_setup_input(hi-&gt;input);</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* we want the hid layer to go through standard path (set and ignore) */</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int apple_input_mapped(struct hid_device *hdev, struct hid_input *hi,</div><div class='add'>+		struct hid_field *field, struct hid_usage *usage,</div><div class='add'>+		unsigned long **bit, int *max)</div><div class='add'>+{</div><div class='add'>+	struct apple_sc *asc = hid_get_drvdata(hdev);</div><div class='add'>+</div><div class='add'>+	if (asc-&gt;quirks &amp; APPLE_MIGHTYMOUSE) {</div><div class='add'>+		if (usage-&gt;hid == HID_GD_Z)</div><div class='add'>+			hid_map_usage(hi, usage, bit, max, EV_REL, REL_HWHEEL);</div><div class='add'>+		else if (usage-&gt;code == BTN_1)</div><div class='add'>+			hid_map_usage(hi, usage, bit, max, EV_KEY, BTN_2);</div><div class='add'>+		else if (usage-&gt;code == BTN_2)</div><div class='add'>+			hid_map_usage(hi, usage, bit, max, EV_KEY, BTN_1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int apple_probe(struct hid_device *hdev,</div><div class='add'>+		const struct hid_device_id *id)</div><div class='add'>+{</div><div class='add'>+	unsigned long quirks = id-&gt;driver_data;</div><div class='add'>+	struct apple_sc *asc;</div><div class='add'>+	unsigned int connect_mask = HID_CONNECT_DEFAULT;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* return something else or move to hid layer? device will reside</div><div class='add'>+	   allocated */</div><div class='add'>+	if (id-&gt;bus == BUS_USB &amp;&amp; (quirks &amp; APPLE_IGNORE_MOUSE) &amp;&amp;</div><div class='add'>+			to_usb_interface(hdev-&gt;dev.parent)-&gt;cur_altsetting-&gt;</div><div class='add'>+			desc.bInterfaceProtocol == USB_INTERFACE_PROTOCOL_MOUSE)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	asc = kzalloc(sizeof(*asc), GFP_KERNEL);</div><div class='add'>+	if (asc == NULL) {</div><div class='add'>+		dev_err(&amp;hdev-&gt;dev, "can't alloc apple descriptor\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	asc-&gt;quirks = quirks;</div><div class='add'>+</div><div class='add'>+	hid_set_drvdata(hdev, asc);</div><div class='add'>+</div><div class='add'>+	ret = hid_parse(hdev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;hdev-&gt;dev, "parse failed\n");</div><div class='add'>+		goto err_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (quirks &amp; APPLE_HIDDEV)</div><div class='add'>+		connect_mask |= HID_CONNECT_HIDDEV_FORCE;</div><div class='add'>+	if (quirks &amp; APPLE_IGNORE_HIDINPUT)</div><div class='add'>+		connect_mask &amp;= ~HID_CONNECT_HIDINPUT;</div><div class='add'>+</div><div class='add'>+	ret = hid_hw_start(hdev, connect_mask);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;hdev-&gt;dev, "hw start failed\n");</div><div class='add'>+		goto err_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+err_free:</div><div class='add'>+	kfree(asc);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void apple_remove(struct hid_device *hdev)</div><div class='add'>+{</div><div class='add'>+	hid_hw_stop(hdev);</div><div class='add'>+	kfree(hid_get_drvdata(hdev));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hid_device_id apple_devices[] = {</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ATV_IRCONTROL),</div><div class='add'>+		.driver_data = APPLE_HIDDEV | APPLE_IGNORE_HIDINPUT },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL4),</div><div class='add'>+		.driver_data = APPLE_HIDDEV | APPLE_IGNORE_HIDINPUT },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MIGHTYMOUSE),</div><div class='add'>+		.driver_data = APPLE_MIGHTYMOUSE | APPLE_INVERT_HWHEEL },</div><div class='add'>+</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_ANSI),</div><div class='add'>+		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |</div><div class='add'>+			APPLE_IGNORE_MOUSE },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_ISO),</div><div class='add'>+		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |</div><div class='add'>+			APPLE_IGNORE_MOUSE },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_ANSI),</div><div class='add'>+		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |</div><div class='add'>+			APPLE_IGNORE_MOUSE },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_ISO),</div><div class='add'>+		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |</div><div class='add'>+			APPLE_IGNORE_MOUSE | APPLE_ISO_KEYBOARD },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_JIS),</div><div class='add'>+		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |</div><div class='add'>+			APPLE_IGNORE_MOUSE },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_ANSI),</div><div class='add'>+		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |</div><div class='add'>+			APPLE_IGNORE_MOUSE },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_ISO),</div><div class='add'>+		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |</div><div class='add'>+			APPLE_IGNORE_MOUSE | APPLE_ISO_KEYBOARD },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_JIS),</div><div class='add'>+		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |</div><div class='add'>+			APPLE_IGNORE_MOUSE | APPLE_RDESC_JIS },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_ANSI),</div><div class='add'>+		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |</div><div class='add'>+			APPLE_IGNORE_MOUSE },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_ISO),</div><div class='add'>+		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |</div><div class='add'>+			APPLE_IGNORE_MOUSE | APPLE_ISO_KEYBOARD },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_JIS),</div><div class='add'>+		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |</div><div class='add'>+			APPLE_IGNORE_MOUSE | APPLE_RDESC_JIS},</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_ANSI),</div><div class='add'>+		.driver_data = APPLE_HAS_FN },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_ISO),</div><div class='add'>+		.driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_JIS),</div><div class='add'>+		.driver_data = APPLE_HAS_FN },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_ANSI),</div><div class='add'>+		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |</div><div class='add'>+			APPLE_IGNORE_MOUSE },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_ISO),</div><div class='add'>+		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |</div><div class='add'>+			APPLE_IGNORE_MOUSE },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_JIS),</div><div class='add'>+		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |</div><div class='add'>+			APPLE_IGNORE_MOUSE | APPLE_RDESC_JIS },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI),</div><div class='add'>+		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO),</div><div class='add'>+		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |</div><div class='add'>+			APPLE_ISO_KEYBOARD },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS),</div><div class='add'>+		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ANSI),</div><div class='add'>+		.driver_data = APPLE_HAS_FN | APPLE_IGNORE_MOUSE },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ISO),</div><div class='add'>+		.driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD |</div><div class='add'>+			APPLE_IGNORE_MOUSE },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_JIS),</div><div class='add'>+		.driver_data = APPLE_HAS_FN | APPLE_IGNORE_MOUSE | APPLE_RDESC_JIS },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ANSI),</div><div class='add'>+		.driver_data = APPLE_HAS_FN | APPLE_IGNORE_MOUSE },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ISO),</div><div class='add'>+		.driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD |</div><div class='add'>+			APPLE_IGNORE_MOUSE },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_JIS),</div><div class='add'>+		.driver_data = APPLE_HAS_FN | APPLE_IGNORE_MOUSE | APPLE_RDESC_JIS },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY),</div><div class='add'>+		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |</div><div class='add'>+			APPLE_IGNORE_MOUSE },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY),</div><div class='add'>+		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |</div><div class='add'>+			APPLE_IGNORE_MOUSE },</div><div class='add'>+</div><div class='add'>+	/* Apple wireless Mighty Mouse */</div><div class='add'>+	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, 0x030c),</div><div class='add'>+		.driver_data = APPLE_MIGHTYMOUSE | APPLE_INVERT_HWHEEL },</div><div class='add'>+</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(hid, apple_devices);</div><div class='add'>+</div><div class='add'>+static struct hid_driver apple_driver = {</div><div class='add'>+	.name = "apple",</div><div class='add'>+	.id_table = apple_devices,</div><div class='add'>+	.report_fixup = apple_report_fixup,</div><div class='add'>+	.probe = apple_probe,</div><div class='add'>+	.remove = apple_remove,</div><div class='add'>+	.event = apple_event,</div><div class='add'>+	.input_mapping = apple_input_mapping,</div><div class='add'>+	.input_mapped = apple_input_mapped,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int apple_init(void)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = hid_register_driver(&amp;apple_driver);</div><div class='add'>+	if (ret)</div><div class='add'>+		printk(KERN_ERR "can't register apple driver\n");</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void apple_exit(void)</div><div class='add'>+{</div><div class='add'>+	hid_unregister_driver(&amp;apple_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(apple_init);</div><div class='add'>+module_exit(apple_exit);</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='add'>+HID_COMPAT_LOAD_DRIVER(apple);</div><div class='head'>diff --git a/drivers/hid/hid-belkin.c b/drivers/hid/hid-belkin.c<br/>new file mode 100644<br/>index 000000000000..12c8a9ba6ed6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hid/hid-belkin.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/hid-belkin.c</a></div><div class='hunk'>@@ -0,0 +1,105 @@</div><div class='add'>+/*</div><div class='add'>+ *  HID driver for some belkin "special" devices</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (c) 1999 Andreas Gal</div><div class='add'>+ *  Copyright (c) 2000-2005 Vojtech Pavlik &lt;vojtech@suse.cz&gt;</div><div class='add'>+ *  Copyright (c) 2005 Michael Haboustak &lt;mike-@cinci.rr.com&gt; for Concept2, Inc</div><div class='add'>+ *  Copyright (c) 2006-2007 Jiri Kosina</div><div class='add'>+ *  Copyright (c) 2007 Paul Walmsley</div><div class='add'>+ *  Copyright (c) 2008 Jiri Slaby</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms of the GNU General Public License as published by the Free</div><div class='add'>+ * Software Foundation; either version 2 of the License, or (at your option)</div><div class='add'>+ * any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/hid.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+</div><div class='add'>+#include "hid-ids.h"</div><div class='add'>+</div><div class='add'>+#define BELKIN_HIDDEV	0x01</div><div class='add'>+#define BELKIN_WKBD	0x02</div><div class='add'>+</div><div class='add'>+#define belkin_map_key_clear(c)	hid_map_usage_clear(hi, usage, bit, max, \</div><div class='add'>+					EV_KEY, (c))</div><div class='add'>+static int belkin_input_mapping(struct hid_device *hdev, struct hid_input *hi,</div><div class='add'>+		struct hid_field *field, struct hid_usage *usage,</div><div class='add'>+		unsigned long **bit, int *max)</div><div class='add'>+{</div><div class='add'>+	unsigned long quirks = (unsigned long)hid_get_drvdata(hdev);</div><div class='add'>+</div><div class='add'>+	if ((usage-&gt;hid &amp; HID_USAGE_PAGE) != HID_UP_CONSUMER ||</div><div class='add'>+			!(quirks &amp; BELKIN_WKBD))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	switch (usage-&gt;hid &amp; HID_USAGE) {</div><div class='add'>+	case 0x03a: belkin_map_key_clear(KEY_SOUND);		break;</div><div class='add'>+	case 0x03b: belkin_map_key_clear(KEY_CAMERA);		break;</div><div class='add'>+	case 0x03c: belkin_map_key_clear(KEY_DOCUMENTS);	break;</div><div class='add'>+	default:</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int belkin_probe(struct hid_device *hdev, const struct hid_device_id *id)</div><div class='add'>+{</div><div class='add'>+	unsigned long quirks = id-&gt;driver_data;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	hid_set_drvdata(hdev, (void *)quirks);</div><div class='add'>+</div><div class='add'>+	ret = hid_parse(hdev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;hdev-&gt;dev, "parse failed\n");</div><div class='add'>+		goto err_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT |</div><div class='add'>+		((quirks &amp; BELKIN_HIDDEV) ? HID_CONNECT_HIDDEV_FORCE : 0));</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;hdev-&gt;dev, "hw start failed\n");</div><div class='add'>+		goto err_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+err_free:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hid_device_id belkin_devices[] = {</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_BELKIN, USB_DEVICE_ID_FLIP_KVM),</div><div class='add'>+		.driver_data = BELKIN_HIDDEV },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_LABTEC, USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD),</div><div class='add'>+		.driver_data = BELKIN_WKBD },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(hid, belkin_devices);</div><div class='add'>+</div><div class='add'>+static struct hid_driver belkin_driver = {</div><div class='add'>+	.name = "belkin",</div><div class='add'>+	.id_table = belkin_devices,</div><div class='add'>+	.input_mapping = belkin_input_mapping,</div><div class='add'>+	.probe = belkin_probe,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int belkin_init(void)</div><div class='add'>+{</div><div class='add'>+	return hid_register_driver(&amp;belkin_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void belkin_exit(void)</div><div class='add'>+{</div><div class='add'>+	hid_unregister_driver(&amp;belkin_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(belkin_init);</div><div class='add'>+module_exit(belkin_exit);</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='add'>+HID_COMPAT_LOAD_DRIVER(belkin);</div><div class='head'>diff --git a/drivers/hid/hid-bright.c b/drivers/hid/hid-bright.c<br/>new file mode 100644<br/>index 000000000000..38517a117dfd<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hid/hid-bright.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/hid-bright.c</a></div><div class='hunk'>@@ -0,0 +1,71 @@</div><div class='add'>+/*</div><div class='add'>+ *  HID driver for some bright "special" devices</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (c) 2008 Mauro Carvalho Chehab &lt;mchehab@redhat.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * Based on hid-dell driver</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms of the GNU General Public License as published by the Free</div><div class='add'>+ * Software Foundation; either version 2 of the License, or (at your option)</div><div class='add'>+ * any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/hid.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+</div><div class='add'>+#include "hid-ids.h"</div><div class='add'>+</div><div class='add'>+static int bright_probe(struct hid_device *hdev, const struct hid_device_id *id)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = hid_parse(hdev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;hdev-&gt;dev, "parse failed\n");</div><div class='add'>+		goto err_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;hdev-&gt;dev, "hw start failed\n");</div><div class='add'>+		goto err_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	usbhid_set_leds(hdev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+err_free:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hid_device_id bright_devices[] = {</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_BRIGHT, USB_DEVICE_ID_BRIGHT_ABNT2) },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(hid, bright_devices);</div><div class='add'>+</div><div class='add'>+static struct hid_driver bright_driver = {</div><div class='add'>+	.name = "bright",</div><div class='add'>+	.id_table = bright_devices,</div><div class='add'>+	.probe = bright_probe,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int bright_init(void)</div><div class='add'>+{</div><div class='add'>+	return hid_register_driver(&amp;bright_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bright_exit(void)</div><div class='add'>+{</div><div class='add'>+	hid_unregister_driver(&amp;bright_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(bright_init);</div><div class='add'>+module_exit(bright_exit);</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='add'>+HID_COMPAT_LOAD_DRIVER(bright);</div><div class='head'>diff --git a/drivers/hid/hid-cherry.c b/drivers/hid/hid-cherry.c<br/>new file mode 100644<br/>index 000000000000..b833b9769aba<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hid/hid-cherry.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/hid-cherry.c</a></div><div class='hunk'>@@ -0,0 +1,87 @@</div><div class='add'>+/*</div><div class='add'>+ *  HID driver for some cherry "special" devices</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (c) 1999 Andreas Gal</div><div class='add'>+ *  Copyright (c) 2000-2005 Vojtech Pavlik &lt;vojtech@suse.cz&gt;</div><div class='add'>+ *  Copyright (c) 2005 Michael Haboustak &lt;mike-@cinci.rr.com&gt; for Concept2, Inc</div><div class='add'>+ *  Copyright (c) 2006-2007 Jiri Kosina</div><div class='add'>+ *  Copyright (c) 2007 Paul Walmsley</div><div class='add'>+ *  Copyright (c) 2008 Jiri Slaby</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms of the GNU General Public License as published by the Free</div><div class='add'>+ * Software Foundation; either version 2 of the License, or (at your option)</div><div class='add'>+ * any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/hid.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+</div><div class='add'>+#include "hid-ids.h"</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Cherry Cymotion keyboard have an invalid HID report descriptor,</div><div class='add'>+ * that needs fixing before we can parse it.</div><div class='add'>+ */</div><div class='add'>+static void ch_report_fixup(struct hid_device *hdev, __u8 *rdesc,</div><div class='add'>+		unsigned int rsize)</div><div class='add'>+{</div><div class='add'>+	if (rsize &gt;= 17 &amp;&amp; rdesc[11] == 0x3c &amp;&amp; rdesc[12] == 0x02) {</div><div class='add'>+		dev_info(&amp;hdev-&gt;dev, "fixing up Cherry Cymotion report "</div><div class='add'>+				"descriptor\n");</div><div class='add'>+		rdesc[11] = rdesc[16] = 0xff;</div><div class='add'>+		rdesc[12] = rdesc[17] = 0x03;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define ch_map_key_clear(c)	hid_map_usage_clear(hi, usage, bit, max, \</div><div class='add'>+					EV_KEY, (c))</div><div class='add'>+static int ch_input_mapping(struct hid_device *hdev, struct hid_input *hi,</div><div class='add'>+		struct hid_field *field, struct hid_usage *usage,</div><div class='add'>+		unsigned long **bit, int *max)</div><div class='add'>+{</div><div class='add'>+	if ((usage-&gt;hid &amp; HID_USAGE_PAGE) != HID_UP_CONSUMER)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	switch (usage-&gt;hid &amp; HID_USAGE) {</div><div class='add'>+	case 0x301: ch_map_key_clear(KEY_PROG1);	break;</div><div class='add'>+	case 0x302: ch_map_key_clear(KEY_PROG2);	break;</div><div class='add'>+	case 0x303: ch_map_key_clear(KEY_PROG3);	break;</div><div class='add'>+	default:</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hid_device_id ch_devices[] = {</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_CHERRY, USB_DEVICE_ID_CHERRY_CYMOTION) },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(hid, ch_devices);</div><div class='add'>+</div><div class='add'>+static struct hid_driver ch_driver = {</div><div class='add'>+	.name = "cherry",</div><div class='add'>+	.id_table = ch_devices,</div><div class='add'>+	.report_fixup = ch_report_fixup,</div><div class='add'>+	.input_mapping = ch_input_mapping,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int ch_init(void)</div><div class='add'>+{</div><div class='add'>+	return hid_register_driver(&amp;ch_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ch_exit(void)</div><div class='add'>+{</div><div class='add'>+	hid_unregister_driver(&amp;ch_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(ch_init);</div><div class='add'>+module_exit(ch_exit);</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='add'>+HID_COMPAT_LOAD_DRIVER(cherry);</div><div class='head'>diff --git a/drivers/hid/hid-chicony.c b/drivers/hid/hid-chicony.c<br/>new file mode 100644<br/>index 000000000000..a54d4096e0f7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hid/hid-chicony.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/hid-chicony.c</a></div><div class='hunk'>@@ -0,0 +1,80 @@</div><div class='add'>+/*</div><div class='add'>+ *  HID driver for some chicony "special" devices</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (c) 1999 Andreas Gal</div><div class='add'>+ *  Copyright (c) 2000-2005 Vojtech Pavlik &lt;vojtech@suse.cz&gt;</div><div class='add'>+ *  Copyright (c) 2005 Michael Haboustak &lt;mike-@cinci.rr.com&gt; for Concept2, Inc</div><div class='add'>+ *  Copyright (c) 2006-2007 Jiri Kosina</div><div class='add'>+ *  Copyright (c) 2007 Paul Walmsley</div><div class='add'>+ *  Copyright (c) 2008 Jiri Slaby</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms of the GNU General Public License as published by the Free</div><div class='add'>+ * Software Foundation; either version 2 of the License, or (at your option)</div><div class='add'>+ * any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/input.h&gt;</div><div class='add'>+#include &lt;linux/hid.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+</div><div class='add'>+#include "hid-ids.h"</div><div class='add'>+</div><div class='add'>+#define ch_map_key_clear(c)	hid_map_usage_clear(hi, usage, bit, max, \</div><div class='add'>+					EV_KEY, (c))</div><div class='add'>+static int ch_input_mapping(struct hid_device *hdev, struct hid_input *hi,</div><div class='add'>+		struct hid_field *field, struct hid_usage *usage,</div><div class='add'>+		unsigned long **bit, int *max)</div><div class='add'>+{</div><div class='add'>+	if ((usage-&gt;hid &amp; HID_USAGE_PAGE) != HID_UP_MSVENDOR)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	set_bit(EV_REP, hi-&gt;input-&gt;evbit);</div><div class='add'>+	switch (usage-&gt;hid &amp; HID_USAGE) {</div><div class='add'>+	case 0xff01: ch_map_key_clear(BTN_1);	break;</div><div class='add'>+	case 0xff02: ch_map_key_clear(BTN_2);	break;</div><div class='add'>+	case 0xff03: ch_map_key_clear(BTN_3);	break;</div><div class='add'>+	case 0xff04: ch_map_key_clear(BTN_4);	break;</div><div class='add'>+	case 0xff05: ch_map_key_clear(BTN_5);	break;</div><div class='add'>+	case 0xff06: ch_map_key_clear(BTN_6);	break;</div><div class='add'>+	case 0xff07: ch_map_key_clear(BTN_7);	break;</div><div class='add'>+	case 0xff08: ch_map_key_clear(BTN_8);	break;</div><div class='add'>+	case 0xff09: ch_map_key_clear(BTN_9);	break;</div><div class='add'>+	case 0xff0a: ch_map_key_clear(BTN_A);	break;</div><div class='add'>+	case 0xff0b: ch_map_key_clear(BTN_B);	break;</div><div class='add'>+	default:</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hid_device_id ch_devices[] = {</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_TACTICAL_PAD) },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(hid, ch_devices);</div><div class='add'>+</div><div class='add'>+static struct hid_driver ch_driver = {</div><div class='add'>+	.name = "chicony",</div><div class='add'>+	.id_table = ch_devices,</div><div class='add'>+	.input_mapping = ch_input_mapping,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int ch_init(void)</div><div class='add'>+{</div><div class='add'>+	return hid_register_driver(&amp;ch_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ch_exit(void)</div><div class='add'>+{</div><div class='add'>+	hid_unregister_driver(&amp;ch_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(ch_init);</div><div class='add'>+module_exit(ch_exit);</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='add'>+HID_COMPAT_LOAD_DRIVER(chicony);</div><div class='head'>diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c<br/>index 426ac5add585..721a36d97582 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hid/hid-core.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/hid/hid-core.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hid/hid-core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/hid-core.c</a></div><div class='hunk'>@@ -33,6 +33,8 @@</div><div class='ctx'> #include &lt;linux/hid-debug.h&gt;</div><div class='ctx'> #include &lt;linux/hidraw.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "hid-ids.h"</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Version Information</div><div class='ctx'>  */</div><div class='hunk'>@@ -268,9 +270,9 @@ static int hid_add_field(struct hid_parser *parser, unsigned report_type, unsign</div><div class='ctx'> static u32 item_udata(struct hid_item *item)</div><div class='ctx'> {</div><div class='ctx'> 	switch (item-&gt;size) {</div><div class='del'>-		case 1: return item-&gt;data.u8;</div><div class='del'>-		case 2: return item-&gt;data.u16;</div><div class='del'>-		case 4: return item-&gt;data.u32;</div><div class='add'>+	case 1: return item-&gt;data.u8;</div><div class='add'>+	case 2: return item-&gt;data.u16;</div><div class='add'>+	case 4: return item-&gt;data.u32;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -278,9 +280,9 @@ static u32 item_udata(struct hid_item *item)</div><div class='ctx'> static s32 item_sdata(struct hid_item *item)</div><div class='ctx'> {</div><div class='ctx'> 	switch (item-&gt;size) {</div><div class='del'>-		case 1: return item-&gt;data.s8;</div><div class='del'>-		case 2: return item-&gt;data.s16;</div><div class='del'>-		case 4: return item-&gt;data.s32;</div><div class='add'>+	case 1: return item-&gt;data.s8;</div><div class='add'>+	case 2: return item-&gt;data.s16;</div><div class='add'>+	case 4: return item-&gt;data.s32;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -292,87 +294,91 @@ static s32 item_sdata(struct hid_item *item)</div><div class='ctx'> static int hid_parser_global(struct hid_parser *parser, struct hid_item *item)</div><div class='ctx'> {</div><div class='ctx'> 	switch (item-&gt;tag) {</div><div class='add'>+	case HID_GLOBAL_ITEM_TAG_PUSH:</div><div class='ctx'> </div><div class='del'>-		case HID_GLOBAL_ITEM_TAG_PUSH:</div><div class='del'>-</div><div class='del'>-			if (parser-&gt;global_stack_ptr == HID_GLOBAL_STACK_SIZE) {</div><div class='del'>-				dbg_hid("global enviroment stack overflow\n");</div><div class='del'>-				return -1;</div><div class='del'>-			}</div><div class='add'>+		if (parser-&gt;global_stack_ptr == HID_GLOBAL_STACK_SIZE) {</div><div class='add'>+			dbg_hid("global enviroment stack overflow\n");</div><div class='add'>+			return -1;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-			memcpy(parser-&gt;global_stack + parser-&gt;global_stack_ptr++,</div><div class='del'>-				&amp;parser-&gt;global, sizeof(struct hid_global));</div><div class='del'>-			return 0;</div><div class='add'>+		memcpy(parser-&gt;global_stack + parser-&gt;global_stack_ptr++,</div><div class='add'>+			&amp;parser-&gt;global, sizeof(struct hid_global));</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-		case HID_GLOBAL_ITEM_TAG_POP:</div><div class='add'>+	case HID_GLOBAL_ITEM_TAG_POP:</div><div class='ctx'> </div><div class='del'>-			if (!parser-&gt;global_stack_ptr) {</div><div class='del'>-				dbg_hid("global enviroment stack underflow\n");</div><div class='del'>-				return -1;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			memcpy(&amp;parser-&gt;global, parser-&gt;global_stack + --parser-&gt;global_stack_ptr,</div><div class='del'>-				sizeof(struct hid_global));</div><div class='del'>-			return 0;</div><div class='add'>+		if (!parser-&gt;global_stack_ptr) {</div><div class='add'>+			dbg_hid("global enviroment stack underflow\n");</div><div class='add'>+			return -1;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		case HID_GLOBAL_ITEM_TAG_USAGE_PAGE:</div><div class='del'>-			parser-&gt;global.usage_page = item_udata(item);</div><div class='del'>-			return 0;</div><div class='add'>+		memcpy(&amp;parser-&gt;global, parser-&gt;global_stack +</div><div class='add'>+			--parser-&gt;global_stack_ptr, sizeof(struct hid_global));</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-		case HID_GLOBAL_ITEM_TAG_LOGICAL_MINIMUM:</div><div class='del'>-			parser-&gt;global.logical_minimum = item_sdata(item);</div><div class='del'>-			return 0;</div><div class='add'>+	case HID_GLOBAL_ITEM_TAG_USAGE_PAGE:</div><div class='add'>+		parser-&gt;global.usage_page = item_udata(item);</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-		case HID_GLOBAL_ITEM_TAG_LOGICAL_MAXIMUM:</div><div class='del'>-			if (parser-&gt;global.logical_minimum &lt; 0)</div><div class='del'>-				parser-&gt;global.logical_maximum = item_sdata(item);</div><div class='del'>-			else</div><div class='del'>-				parser-&gt;global.logical_maximum = item_udata(item);</div><div class='del'>-			return 0;</div><div class='add'>+	case HID_GLOBAL_ITEM_TAG_LOGICAL_MINIMUM:</div><div class='add'>+		parser-&gt;global.logical_minimum = item_sdata(item);</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-		case HID_GLOBAL_ITEM_TAG_PHYSICAL_MINIMUM:</div><div class='del'>-			parser-&gt;global.physical_minimum = item_sdata(item);</div><div class='del'>-			return 0;</div><div class='add'>+	case HID_GLOBAL_ITEM_TAG_LOGICAL_MAXIMUM:</div><div class='add'>+		if (parser-&gt;global.logical_minimum &lt; 0)</div><div class='add'>+			parser-&gt;global.logical_maximum = item_sdata(item);</div><div class='add'>+		else</div><div class='add'>+			parser-&gt;global.logical_maximum = item_udata(item);</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-		case HID_GLOBAL_ITEM_TAG_PHYSICAL_MAXIMUM:</div><div class='del'>-			if (parser-&gt;global.physical_minimum &lt; 0)</div><div class='del'>-				parser-&gt;global.physical_maximum = item_sdata(item);</div><div class='del'>-			else</div><div class='del'>-				parser-&gt;global.physical_maximum = item_udata(item);</div><div class='del'>-			return 0;</div><div class='add'>+	case HID_GLOBAL_ITEM_TAG_PHYSICAL_MINIMUM:</div><div class='add'>+		parser-&gt;global.physical_minimum = item_sdata(item);</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-		case HID_GLOBAL_ITEM_TAG_UNIT_EXPONENT:</div><div class='del'>-			parser-&gt;global.unit_exponent = item_sdata(item);</div><div class='del'>-			return 0;</div><div class='add'>+	case HID_GLOBAL_ITEM_TAG_PHYSICAL_MAXIMUM:</div><div class='add'>+		if (parser-&gt;global.physical_minimum &lt; 0)</div><div class='add'>+			parser-&gt;global.physical_maximum = item_sdata(item);</div><div class='add'>+		else</div><div class='add'>+			parser-&gt;global.physical_maximum = item_udata(item);</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-		case HID_GLOBAL_ITEM_TAG_UNIT:</div><div class='del'>-			parser-&gt;global.unit = item_udata(item);</div><div class='del'>-			return 0;</div><div class='add'>+	case HID_GLOBAL_ITEM_TAG_UNIT_EXPONENT:</div><div class='add'>+		parser-&gt;global.unit_exponent = item_sdata(item);</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-		case HID_GLOBAL_ITEM_TAG_REPORT_SIZE:</div><div class='del'>-			if ((parser-&gt;global.report_size = item_udata(item)) &gt; 32) {</div><div class='del'>-				dbg_hid("invalid report_size %d\n", parser-&gt;global.report_size);</div><div class='del'>-				return -1;</div><div class='del'>-			}</div><div class='del'>-			return 0;</div><div class='add'>+	case HID_GLOBAL_ITEM_TAG_UNIT:</div><div class='add'>+		parser-&gt;global.unit = item_udata(item);</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-		case HID_GLOBAL_ITEM_TAG_REPORT_COUNT:</div><div class='del'>-			if ((parser-&gt;global.report_count = item_udata(item)) &gt; HID_MAX_USAGES) {</div><div class='del'>-				dbg_hid("invalid report_count %d\n", parser-&gt;global.report_count);</div><div class='del'>-				return -1;</div><div class='del'>-			}</div><div class='del'>-			return 0;</div><div class='add'>+	case HID_GLOBAL_ITEM_TAG_REPORT_SIZE:</div><div class='add'>+		parser-&gt;global.report_size = item_udata(item);</div><div class='add'>+		if (parser-&gt;global.report_size &gt; 32) {</div><div class='add'>+			dbg_hid("invalid report_size %d\n",</div><div class='add'>+					parser-&gt;global.report_size);</div><div class='add'>+			return -1;</div><div class='add'>+		}</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-		case HID_GLOBAL_ITEM_TAG_REPORT_ID:</div><div class='del'>-			if ((parser-&gt;global.report_id = item_udata(item)) == 0) {</div><div class='del'>-				dbg_hid("report_id 0 is invalid\n");</div><div class='del'>-				return -1;</div><div class='del'>-			}</div><div class='del'>-			return 0;</div><div class='add'>+	case HID_GLOBAL_ITEM_TAG_REPORT_COUNT:</div><div class='add'>+		parser-&gt;global.report_count = item_udata(item);</div><div class='add'>+		if (parser-&gt;global.report_count &gt; HID_MAX_USAGES) {</div><div class='add'>+			dbg_hid("invalid report_count %d\n",</div><div class='add'>+					parser-&gt;global.report_count);</div><div class='add'>+			return -1;</div><div class='add'>+		}</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-		default:</div><div class='del'>-			dbg_hid("unknown global tag 0x%x\n", item-&gt;tag);</div><div class='add'>+	case HID_GLOBAL_ITEM_TAG_REPORT_ID:</div><div class='add'>+		parser-&gt;global.report_id = item_udata(item);</div><div class='add'>+		if (parser-&gt;global.report_id == 0) {</div><div class='add'>+			dbg_hid("report_id 0 is invalid\n");</div><div class='ctx'> 			return -1;</div><div class='add'>+		}</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		dbg_hid("unknown global tag 0x%x\n", item-&gt;tag);</div><div class='add'>+		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -393,77 +399,76 @@ static int hid_parser_local(struct hid_parser *parser, struct hid_item *item)</div><div class='ctx'> 	data = item_udata(item);</div><div class='ctx'> </div><div class='ctx'> 	switch (item-&gt;tag) {</div><div class='del'>-</div><div class='del'>-		case HID_LOCAL_ITEM_TAG_DELIMITER:</div><div class='del'>-</div><div class='del'>-			if (data) {</div><div class='del'>-				/*</div><div class='del'>-				 * We treat items before the first delimiter</div><div class='del'>-				 * as global to all usage sets (branch 0).</div><div class='del'>-				 * In the moment we process only these global</div><div class='del'>-				 * items and the first delimiter set.</div><div class='del'>-				 */</div><div class='del'>-				if (parser-&gt;local.delimiter_depth != 0) {</div><div class='del'>-					dbg_hid("nested delimiters\n");</div><div class='del'>-					return -1;</div><div class='del'>-				}</div><div class='del'>-				parser-&gt;local.delimiter_depth++;</div><div class='del'>-				parser-&gt;local.delimiter_branch++;</div><div class='del'>-			} else {</div><div class='del'>-				if (parser-&gt;local.delimiter_depth &lt; 1) {</div><div class='del'>-					dbg_hid("bogus close delimiter\n");</div><div class='del'>-					return -1;</div><div class='del'>-				}</div><div class='del'>-				parser-&gt;local.delimiter_depth--;</div><div class='add'>+	case HID_LOCAL_ITEM_TAG_DELIMITER:</div><div class='add'>+</div><div class='add'>+		if (data) {</div><div class='add'>+			/*</div><div class='add'>+			 * We treat items before the first delimiter</div><div class='add'>+			 * as global to all usage sets (branch 0).</div><div class='add'>+			 * In the moment we process only these global</div><div class='add'>+			 * items and the first delimiter set.</div><div class='add'>+			 */</div><div class='add'>+			if (parser-&gt;local.delimiter_depth != 0) {</div><div class='add'>+				dbg_hid("nested delimiters\n");</div><div class='add'>+				return -1;</div><div class='ctx'> 			}</div><div class='del'>-			return 1;</div><div class='del'>-</div><div class='del'>-		case HID_LOCAL_ITEM_TAG_USAGE:</div><div class='del'>-</div><div class='del'>-			if (parser-&gt;local.delimiter_branch &gt; 1) {</div><div class='del'>-				dbg_hid("alternative usage ignored\n");</div><div class='del'>-				return 0;</div><div class='add'>+			parser-&gt;local.delimiter_depth++;</div><div class='add'>+			parser-&gt;local.delimiter_branch++;</div><div class='add'>+		} else {</div><div class='add'>+			if (parser-&gt;local.delimiter_depth &lt; 1) {</div><div class='add'>+				dbg_hid("bogus close delimiter\n");</div><div class='add'>+				return -1;</div><div class='ctx'> 			}</div><div class='add'>+			parser-&gt;local.delimiter_depth--;</div><div class='add'>+		}</div><div class='add'>+		return 1;</div><div class='ctx'> </div><div class='del'>-			if (item-&gt;size &lt;= 2)</div><div class='del'>-				data = (parser-&gt;global.usage_page &lt;&lt; 16) + data;</div><div class='add'>+	case HID_LOCAL_ITEM_TAG_USAGE:</div><div class='ctx'> </div><div class='del'>-			return hid_add_usage(parser, data);</div><div class='add'>+		if (parser-&gt;local.delimiter_branch &gt; 1) {</div><div class='add'>+			dbg_hid("alternative usage ignored\n");</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		case HID_LOCAL_ITEM_TAG_USAGE_MINIMUM:</div><div class='add'>+		if (item-&gt;size &lt;= 2)</div><div class='add'>+			data = (parser-&gt;global.usage_page &lt;&lt; 16) + data;</div><div class='ctx'> </div><div class='del'>-			if (parser-&gt;local.delimiter_branch &gt; 1) {</div><div class='del'>-				dbg_hid("alternative usage ignored\n");</div><div class='del'>-				return 0;</div><div class='del'>-			}</div><div class='add'>+		return hid_add_usage(parser, data);</div><div class='ctx'> </div><div class='del'>-			if (item-&gt;size &lt;= 2)</div><div class='del'>-				data = (parser-&gt;global.usage_page &lt;&lt; 16) + data;</div><div class='add'>+	case HID_LOCAL_ITEM_TAG_USAGE_MINIMUM:</div><div class='ctx'> </div><div class='del'>-			parser-&gt;local.usage_minimum = data;</div><div class='add'>+		if (parser-&gt;local.delimiter_branch &gt; 1) {</div><div class='add'>+			dbg_hid("alternative usage ignored\n");</div><div class='ctx'> 			return 0;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		case HID_LOCAL_ITEM_TAG_USAGE_MAXIMUM:</div><div class='add'>+		if (item-&gt;size &lt;= 2)</div><div class='add'>+			data = (parser-&gt;global.usage_page &lt;&lt; 16) + data;</div><div class='ctx'> </div><div class='del'>-			if (parser-&gt;local.delimiter_branch &gt; 1) {</div><div class='del'>-				dbg_hid("alternative usage ignored\n");</div><div class='del'>-				return 0;</div><div class='del'>-			}</div><div class='add'>+		parser-&gt;local.usage_minimum = data;</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-			if (item-&gt;size &lt;= 2)</div><div class='del'>-				data = (parser-&gt;global.usage_page &lt;&lt; 16) + data;</div><div class='add'>+	case HID_LOCAL_ITEM_TAG_USAGE_MAXIMUM:</div><div class='ctx'> </div><div class='del'>-			for (n = parser-&gt;local.usage_minimum; n &lt;= data; n++)</div><div class='del'>-				if (hid_add_usage(parser, n)) {</div><div class='del'>-					dbg_hid("hid_add_usage failed\n");</div><div class='del'>-					return -1;</div><div class='del'>-				}</div><div class='add'>+		if (parser-&gt;local.delimiter_branch &gt; 1) {</div><div class='add'>+			dbg_hid("alternative usage ignored\n");</div><div class='ctx'> 			return 0;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		default:</div><div class='add'>+		if (item-&gt;size &lt;= 2)</div><div class='add'>+			data = (parser-&gt;global.usage_page &lt;&lt; 16) + data;</div><div class='ctx'> </div><div class='del'>-			dbg_hid("unknown local item tag 0x%x\n", item-&gt;tag);</div><div class='del'>-			return 0;</div><div class='add'>+		for (n = parser-&gt;local.usage_minimum; n &lt;= data; n++)</div><div class='add'>+			if (hid_add_usage(parser, n)) {</div><div class='add'>+				dbg_hid("hid_add_usage failed\n");</div><div class='add'>+				return -1;</div><div class='add'>+			}</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+</div><div class='add'>+		dbg_hid("unknown local item tag 0x%x\n", item-&gt;tag);</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -480,24 +485,24 @@ static int hid_parser_main(struct hid_parser *parser, struct hid_item *item)</div><div class='ctx'> 	data = item_udata(item);</div><div class='ctx'> </div><div class='ctx'> 	switch (item-&gt;tag) {</div><div class='del'>-		case HID_MAIN_ITEM_TAG_BEGIN_COLLECTION:</div><div class='del'>-			ret = open_collection(parser, data &amp; 0xff);</div><div class='del'>-			break;</div><div class='del'>-		case HID_MAIN_ITEM_TAG_END_COLLECTION:</div><div class='del'>-			ret = close_collection(parser);</div><div class='del'>-			break;</div><div class='del'>-		case HID_MAIN_ITEM_TAG_INPUT:</div><div class='del'>-			ret = hid_add_field(parser, HID_INPUT_REPORT, data);</div><div class='del'>-			break;</div><div class='del'>-		case HID_MAIN_ITEM_TAG_OUTPUT:</div><div class='del'>-			ret = hid_add_field(parser, HID_OUTPUT_REPORT, data);</div><div class='del'>-			break;</div><div class='del'>-		case HID_MAIN_ITEM_TAG_FEATURE:</div><div class='del'>-			ret = hid_add_field(parser, HID_FEATURE_REPORT, data);</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			dbg_hid("unknown main item tag 0x%x\n", item-&gt;tag);</div><div class='del'>-			ret = 0;</div><div class='add'>+	case HID_MAIN_ITEM_TAG_BEGIN_COLLECTION:</div><div class='add'>+		ret = open_collection(parser, data &amp; 0xff);</div><div class='add'>+		break;</div><div class='add'>+	case HID_MAIN_ITEM_TAG_END_COLLECTION:</div><div class='add'>+		ret = close_collection(parser);</div><div class='add'>+		break;</div><div class='add'>+	case HID_MAIN_ITEM_TAG_INPUT:</div><div class='add'>+		ret = hid_add_field(parser, HID_INPUT_REPORT, data);</div><div class='add'>+		break;</div><div class='add'>+	case HID_MAIN_ITEM_TAG_OUTPUT:</div><div class='add'>+		ret = hid_add_field(parser, HID_OUTPUT_REPORT, data);</div><div class='add'>+		break;</div><div class='add'>+	case HID_MAIN_ITEM_TAG_FEATURE:</div><div class='add'>+		ret = hid_add_field(parser, HID_FEATURE_REPORT, data);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dbg_hid("unknown main item tag 0x%x\n", item-&gt;tag);</div><div class='add'>+		ret = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;parser-&gt;local, 0, sizeof(parser-&gt;local));	/* Reset the local parser environment */</div><div class='hunk'>@@ -534,9 +539,10 @@ static void hid_free_report(struct hid_report *report)</div><div class='ctx'>  * Free a device structure, all reports, and all fields.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-void hid_free_device(struct hid_device *device)</div><div class='add'>+static void hid_device_release(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	unsigned i,j;</div><div class='add'>+	struct hid_device *device = container_of(dev, struct hid_device, dev);</div><div class='add'>+	unsigned i, j;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; HID_REPORT_TYPES; i++) {</div><div class='ctx'> 		struct hid_report_enum *report_enum = device-&gt;report_enum + i;</div><div class='hunk'>@@ -552,7 +558,6 @@ void hid_free_device(struct hid_device *device)</div><div class='ctx'> 	kfree(device-&gt;collection);</div><div class='ctx'> 	kfree(device);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(hid_free_device);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Fetch a report description item from the data stream. We support long</div><div class='hunk'>@@ -593,47 +598,52 @@ static u8 *fetch_item(__u8 *start, __u8 *end, struct hid_item *item)</div><div class='ctx'> 	item-&gt;size = b &amp; 3;</div><div class='ctx'> </div><div class='ctx'> 	switch (item-&gt;size) {</div><div class='add'>+	case 0:</div><div class='add'>+		return start;</div><div class='ctx'> </div><div class='del'>-		case 0:</div><div class='del'>-			return start;</div><div class='del'>-</div><div class='del'>-		case 1:</div><div class='del'>-			if ((end - start) &lt; 1)</div><div class='del'>-				return NULL;</div><div class='del'>-			item-&gt;data.u8 = *start++;</div><div class='del'>-			return start;</div><div class='add'>+	case 1:</div><div class='add'>+		if ((end - start) &lt; 1)</div><div class='add'>+			return NULL;</div><div class='add'>+		item-&gt;data.u8 = *start++;</div><div class='add'>+		return start;</div><div class='ctx'> </div><div class='del'>-		case 2:</div><div class='del'>-			if ((end - start) &lt; 2)</div><div class='del'>-				return NULL;</div><div class='del'>-			item-&gt;data.u16 = get_unaligned_le16(start);</div><div class='del'>-			start = (__u8 *)((__le16 *)start + 1);</div><div class='del'>-			return start;</div><div class='add'>+	case 2:</div><div class='add'>+		if ((end - start) &lt; 2)</div><div class='add'>+			return NULL;</div><div class='add'>+		item-&gt;data.u16 = get_unaligned_le16(start);</div><div class='add'>+		start = (__u8 *)((__le16 *)start + 1);</div><div class='add'>+		return start;</div><div class='ctx'> </div><div class='del'>-		case 3:</div><div class='del'>-			item-&gt;size++;</div><div class='del'>-			if ((end - start) &lt; 4)</div><div class='del'>-				return NULL;</div><div class='del'>-			item-&gt;data.u32 = get_unaligned_le32(start);</div><div class='del'>-			start = (__u8 *)((__le32 *)start + 1);</div><div class='del'>-			return start;</div><div class='add'>+	case 3:</div><div class='add'>+		item-&gt;size++;</div><div class='add'>+		if ((end - start) &lt; 4)</div><div class='add'>+			return NULL;</div><div class='add'>+		item-&gt;data.u32 = get_unaligned_le32(start);</div><div class='add'>+		start = (__u8 *)((__le32 *)start + 1);</div><div class='add'>+		return start;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='add'>+/**</div><div class='add'>+ * hid_parse_report - parse device report</div><div class='add'>+ *</div><div class='add'>+ * @device: hid device</div><div class='add'>+ * @start: report start</div><div class='add'>+ * @size: report size</div><div class='add'>+ *</div><div class='ctx'>  * Parse a report description into a hid_device structure. Reports are</div><div class='ctx'>  * enumerated, fields are attached to these reports.</div><div class='add'>+ * 0 returned on success, otherwise nonzero error value.</div><div class='ctx'>  */</div><div class='del'>-</div><div class='del'>-struct hid_device *hid_parse_report(__u8 *start, unsigned size)</div><div class='add'>+int hid_parse_report(struct hid_device *device, __u8 *start,</div><div class='add'>+		unsigned size)</div><div class='ctx'> {</div><div class='del'>-	struct hid_device *device;</div><div class='ctx'> 	struct hid_parser *parser;</div><div class='ctx'> 	struct hid_item item;</div><div class='ctx'> 	__u8 *end;</div><div class='del'>-	unsigned i;</div><div class='add'>+	int ret;</div><div class='ctx'> 	static int (*dispatch_type[])(struct hid_parser *parser,</div><div class='ctx'> 				      struct hid_item *item) = {</div><div class='ctx'> 		hid_parser_main,</div><div class='hunk'>@@ -642,76 +652,57 @@ struct hid_device *hid_parse_report(__u8 *start, unsigned size)</div><div class='ctx'> 		hid_parser_reserved</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	if (!(device = kzalloc(sizeof(struct hid_device), GFP_KERNEL)))</div><div class='del'>-		return NULL;</div><div class='add'>+	if (device-&gt;driver-&gt;report_fixup)</div><div class='add'>+		device-&gt;driver-&gt;report_fixup(device, start, size);</div><div class='ctx'> </div><div class='del'>-	if (!(device-&gt;collection = kzalloc(sizeof(struct hid_collection) *</div><div class='del'>-				   HID_DEFAULT_NUM_COLLECTIONS, GFP_KERNEL))) {</div><div class='del'>-		kfree(device);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	device-&gt;collection_size = HID_DEFAULT_NUM_COLLECTIONS;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; HID_REPORT_TYPES; i++)</div><div class='del'>-		INIT_LIST_HEAD(&amp;device-&gt;report_enum[i].report_list);</div><div class='del'>-</div><div class='del'>-	if (!(device-&gt;rdesc = kmalloc(size, GFP_KERNEL))) {</div><div class='del'>-		kfree(device-&gt;collection);</div><div class='del'>-		kfree(device);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='add'>+	device-&gt;rdesc = kmalloc(size, GFP_KERNEL);</div><div class='add'>+	if (device-&gt;rdesc == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	memcpy(device-&gt;rdesc, start, size);</div><div class='ctx'> 	device-&gt;rsize = size;</div><div class='ctx'> </div><div class='del'>-	if (!(parser = vmalloc(sizeof(struct hid_parser)))) {</div><div class='del'>-		kfree(device-&gt;rdesc);</div><div class='del'>-		kfree(device-&gt;collection);</div><div class='del'>-		kfree(device);</div><div class='del'>-		return NULL;</div><div class='add'>+	parser = vmalloc(sizeof(struct hid_parser));</div><div class='add'>+	if (!parser) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto err;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	memset(parser, 0, sizeof(struct hid_parser));</div><div class='ctx'> 	parser-&gt;device = device;</div><div class='ctx'> </div><div class='ctx'> 	end = start + size;</div><div class='add'>+	ret = -EINVAL;</div><div class='ctx'> 	while ((start = fetch_item(start, end, &amp;item)) != NULL) {</div><div class='ctx'> </div><div class='ctx'> 		if (item.format != HID_ITEM_FORMAT_SHORT) {</div><div class='ctx'> 			dbg_hid("unexpected long global item\n");</div><div class='del'>-			hid_free_device(device);</div><div class='del'>-			vfree(parser);</div><div class='del'>-			return NULL;</div><div class='add'>+			goto err;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (dispatch_type[item.type](parser, &amp;item)) {</div><div class='ctx'> 			dbg_hid("item %u %u %u %u parsing failed\n",</div><div class='ctx'> 				item.format, (unsigned)item.size, (unsigned)item.type, (unsigned)item.tag);</div><div class='del'>-			hid_free_device(device);</div><div class='del'>-			vfree(parser);</div><div class='del'>-			return NULL;</div><div class='add'>+			goto err;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (start == end) {</div><div class='ctx'> 			if (parser-&gt;collection_stack_ptr) {</div><div class='ctx'> 				dbg_hid("unbalanced collection at end of report description\n");</div><div class='del'>-				hid_free_device(device);</div><div class='del'>-				vfree(parser);</div><div class='del'>-				return NULL;</div><div class='add'>+				goto err;</div><div class='ctx'> 			}</div><div class='ctx'> 			if (parser-&gt;local.delimiter_depth) {</div><div class='ctx'> 				dbg_hid("unbalanced delimiter at end of report description\n");</div><div class='del'>-				hid_free_device(device);</div><div class='del'>-				vfree(parser);</div><div class='del'>-				return NULL;</div><div class='add'>+				goto err;</div><div class='ctx'> 			}</div><div class='ctx'> 			vfree(parser);</div><div class='del'>-			return device;</div><div class='add'>+			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dbg_hid("item fetching failed at offset %d\n", (int)(end - start));</div><div class='del'>-	hid_free_device(device);</div><div class='add'>+err:</div><div class='ctx'> 	vfree(parser);</div><div class='del'>-	return NULL;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(hid_parse_report);</div><div class='ctx'> </div><div class='hunk'>@@ -724,9 +715,9 @@ EXPORT_SYMBOL_GPL(hid_parse_report);</div><div class='ctx'> static s32 snto32(__u32 value, unsigned n)</div><div class='ctx'> {</div><div class='ctx'> 	switch (n) {</div><div class='del'>-		case 8:  return ((__s8)value);</div><div class='del'>-		case 16: return ((__s16)value);</div><div class='del'>-		case 32: return ((__s32)value);</div><div class='add'>+	case 8:  return ((__s8)value);</div><div class='add'>+	case 16: return ((__s16)value);</div><div class='add'>+	case 32: return ((__s32)value);</div><div class='ctx'> 	}</div><div class='ctx'> 	return value &amp; (1 &lt;&lt; (n - 1)) ? value | (-1 &lt;&lt; n) : value;</div><div class='ctx'> }</div><div class='hunk'>@@ -815,9 +806,73 @@ static __inline__ int search(__s32 *array, __s32 value, unsigned n)</div><div class='ctx'> 	return -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hid_process_event(struct hid_device *hid, struct hid_field *field, struct hid_usage *usage, __s32 value, int interrupt)</div><div class='add'>+/**</div><div class='add'>+ * hid_match_report - check if driver's raw_event should be called</div><div class='add'>+ *</div><div class='add'>+ * @hid: hid device</div><div class='add'>+ * @report_type: type to match against</div><div class='add'>+ *</div><div class='add'>+ * compare hid-&gt;driver-&gt;report_table-&gt;report_type to report-&gt;type</div><div class='add'>+ */</div><div class='add'>+static int hid_match_report(struct hid_device *hid, struct hid_report *report)</div><div class='add'>+{</div><div class='add'>+	const struct hid_report_id *id = hid-&gt;driver-&gt;report_table;</div><div class='add'>+</div><div class='add'>+	if (!id) /* NULL means all */</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	for (; id-&gt;report_type != HID_TERMINATOR; id++)</div><div class='add'>+		if (id-&gt;report_type == HID_ANY_ID ||</div><div class='add'>+				id-&gt;report_type == report-&gt;type)</div><div class='add'>+			return 1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * hid_match_usage - check if driver's event should be called</div><div class='add'>+ *</div><div class='add'>+ * @hid: hid device</div><div class='add'>+ * @usage: usage to match against</div><div class='add'>+ *</div><div class='add'>+ * compare hid-&gt;driver-&gt;usage_table-&gt;usage_{type,code} to</div><div class='add'>+ * usage-&gt;usage_{type,code}</div><div class='add'>+ */</div><div class='add'>+static int hid_match_usage(struct hid_device *hid, struct hid_usage *usage)</div><div class='ctx'> {</div><div class='add'>+	const struct hid_usage_id *id = hid-&gt;driver-&gt;usage_table;</div><div class='add'>+</div><div class='add'>+	if (!id) /* NULL means all */</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	for (; id-&gt;usage_type != HID_ANY_ID - 1; id++)</div><div class='add'>+		if ((id-&gt;usage_hid == HID_ANY_ID ||</div><div class='add'>+				id-&gt;usage_hid == usage-&gt;hid) &amp;&amp;</div><div class='add'>+				(id-&gt;usage_type == HID_ANY_ID ||</div><div class='add'>+				id-&gt;usage_type == usage-&gt;type) &amp;&amp;</div><div class='add'>+				(id-&gt;usage_code == HID_ANY_ID ||</div><div class='add'>+				 id-&gt;usage_code == usage-&gt;code))</div><div class='add'>+			return 1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hid_process_event(struct hid_device *hid, struct hid_field *field,</div><div class='add'>+		struct hid_usage *usage, __s32 value, int interrupt)</div><div class='add'>+{</div><div class='add'>+	struct hid_driver *hdrv = hid-&gt;driver;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='ctx'> 	hid_dump_input(usage, value);</div><div class='add'>+</div><div class='add'>+	if (hdrv &amp;&amp; hdrv-&gt;event &amp;&amp; hid_match_usage(hid, usage)) {</div><div class='add'>+		ret = hdrv-&gt;event(hid, field, usage, value);</div><div class='add'>+		if (ret != 0) {</div><div class='add'>+			if (ret &lt; 0)</div><div class='add'>+				dbg_hid("%s's event failed with %d\n",</div><div class='add'>+						hdrv-&gt;name, ret);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (hid-&gt;claimed &amp; HID_CLAIMED_INPUT)</div><div class='ctx'> 		hidinput_hid_event(hid, field, usage, value);</div><div class='ctx'> 	if (hid-&gt;claimed &amp; HID_CLAIMED_HIDDEV &amp;&amp; interrupt &amp;&amp; hid-&gt;hiddev_hid_event)</div><div class='hunk'>@@ -946,44 +1001,47 @@ int hid_set_field(struct hid_field *field, unsigned offset, __s32 value)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(hid_set_field);</div><div class='ctx'> </div><div class='del'>-int hid_input_report(struct hid_device *hid, int type, u8 *data, int size, int interrupt)</div><div class='add'>+static struct hid_report *hid_get_report(struct hid_report_enum *report_enum,</div><div class='add'>+		const u8 *data)</div><div class='ctx'> {</div><div class='del'>-	struct hid_report_enum *report_enum = hid-&gt;report_enum + type;</div><div class='ctx'> 	struct hid_report *report;</div><div class='del'>-	int n, rsize, i;</div><div class='add'>+	unsigned int n = 0;	/* Normally report number is 0 */</div><div class='ctx'> </div><div class='del'>-	if (!hid)</div><div class='del'>-		return -ENODEV;</div><div class='add'>+	/* Device uses numbered reports, data[0] is report number */</div><div class='add'>+	if (report_enum-&gt;numbered)</div><div class='add'>+		n = *data;</div><div class='ctx'> </div><div class='del'>-	if (!size) {</div><div class='del'>-		dbg_hid("empty report\n");</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='add'>+	report = report_enum-&gt;report_id_hash[n];</div><div class='add'>+	if (report == NULL)</div><div class='add'>+		dbg_hid("undefined report_id %u received\n", n);</div><div class='ctx'> </div><div class='del'>-	dbg_hid("report (size %u) (%snumbered)\n", size, report_enum-&gt;numbered ? "" : "un");</div><div class='add'>+	return report;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	n = 0;                          /* Normally report number is 0 */</div><div class='del'>-	if (report_enum-&gt;numbered) {    /* Device uses numbered reports, data[0] is report number */</div><div class='del'>-		n = *data++;</div><div class='del'>-		size--;</div><div class='del'>-	}</div><div class='add'>+void hid_report_raw_event(struct hid_device *hid, int type, u8 *data, int size,</div><div class='add'>+		int interrupt)</div><div class='add'>+{</div><div class='add'>+	struct hid_report_enum *report_enum = hid-&gt;report_enum + type;</div><div class='add'>+	struct hid_report *report;</div><div class='add'>+	unsigned int a;</div><div class='add'>+	int rsize, csize = size;</div><div class='add'>+	u8 *cdata = data;</div><div class='ctx'> </div><div class='del'>-	/* dump the report */</div><div class='del'>-	dbg_hid("report %d (size %u) = ", n, size);</div><div class='del'>-	for (i = 0; i &lt; size; i++)</div><div class='del'>-		dbg_hid_line(" %02x", data[i]);</div><div class='del'>-	dbg_hid_line("\n");</div><div class='add'>+	report = hid_get_report(report_enum, data);</div><div class='add'>+	if (!report)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	if (!(report = report_enum-&gt;report_id_hash[n])) {</div><div class='del'>-		dbg_hid("undefined report_id %d received\n", n);</div><div class='del'>-		return -1;</div><div class='add'>+	if (report_enum-&gt;numbered) {</div><div class='add'>+		cdata++;</div><div class='add'>+		csize--;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	rsize = ((report-&gt;size - 1) &gt;&gt; 3) + 1;</div><div class='ctx'> </div><div class='del'>-	if (size &lt; rsize) {</div><div class='del'>-		dbg_hid("report %d is too short, (%d &lt; %d)\n", report-&gt;id, size, rsize);</div><div class='del'>-		memset(data + size, 0, rsize - size);</div><div class='add'>+	if (csize &lt; rsize) {</div><div class='add'>+		dbg_hid("report %d is too short, (%d &lt; %d)\n", report-&gt;id,</div><div class='add'>+				csize, rsize);</div><div class='add'>+		memset(cdata + csize, 0, rsize - csize);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if ((hid-&gt;claimed &amp; HID_CLAIMED_HIDDEV) &amp;&amp; hid-&gt;hiddev_report_event)</div><div class='hunk'>@@ -996,24 +1054,663 @@ int hid_input_report(struct hid_device *hid, int type, u8 *data, int size, int i</div><div class='ctx'> 			hidraw_report_event(hid, data, size);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (n = 0; n &lt; report-&gt;maxfield; n++)</div><div class='del'>-		hid_input_field(hid, report-&gt;field[n], data, interrupt);</div><div class='add'>+	for (a = 0; a &lt; report-&gt;maxfield; a++)</div><div class='add'>+		hid_input_field(hid, report-&gt;field[a], cdata, interrupt);</div><div class='ctx'> </div><div class='ctx'> 	if (hid-&gt;claimed &amp; HID_CLAIMED_INPUT)</div><div class='ctx'> 		hidinput_report_event(hid, report);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(hid_report_raw_event);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * hid_input_report - report data from lower layer (usb, bt...)</div><div class='add'>+ *</div><div class='add'>+ * @hid: hid device</div><div class='add'>+ * @type: HID report type (HID_*_REPORT)</div><div class='add'>+ * @data: report contents</div><div class='add'>+ * @size: size of data parameter</div><div class='add'>+ * @interrupt: called from atomic?</div><div class='add'>+ *</div><div class='add'>+ * This is data entry for lower layers.</div><div class='add'>+ */</div><div class='add'>+int hid_input_report(struct hid_device *hid, int type, u8 *data, int size, int interrupt)</div><div class='add'>+{</div><div class='add'>+	struct hid_report_enum *report_enum = hid-&gt;report_enum + type;</div><div class='add'>+	struct hid_driver *hdrv = hid-&gt;driver;</div><div class='add'>+	struct hid_report *report;</div><div class='add'>+	unsigned int i;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!hid || !hid-&gt;driver)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	if (!size) {</div><div class='add'>+		dbg_hid("empty report\n");</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dbg_hid("report (size %u) (%snumbered)\n", size, report_enum-&gt;numbered ? "" : "un");</div><div class='add'>+</div><div class='add'>+	report = hid_get_report(report_enum, data);</div><div class='add'>+	if (!report)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	/* dump the report */</div><div class='add'>+	dbg_hid("report %d (size %u) = ", report-&gt;id, size);</div><div class='add'>+	for (i = 0; i &lt; size; i++)</div><div class='add'>+		dbg_hid_line(" %02x", data[i]);</div><div class='add'>+	dbg_hid_line("\n");</div><div class='add'>+</div><div class='add'>+	if (hdrv &amp;&amp; hdrv-&gt;raw_event &amp;&amp; hid_match_report(hid, report)) {</div><div class='add'>+		ret = hdrv-&gt;raw_event(hid, report, data, size);</div><div class='add'>+		if (ret != 0)</div><div class='add'>+			return ret &lt; 0 ? ret : 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hid_report_raw_event(hid, type, data, size, interrupt);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(hid_input_report);</div><div class='ctx'> </div><div class='add'>+static bool hid_match_one_id(struct hid_device *hdev,</div><div class='add'>+		const struct hid_device_id *id)</div><div class='add'>+{</div><div class='add'>+	return id-&gt;bus == hdev-&gt;bus &amp;&amp;</div><div class='add'>+		(id-&gt;vendor == HID_ANY_ID || id-&gt;vendor == hdev-&gt;vendor) &amp;&amp;</div><div class='add'>+		(id-&gt;product == HID_ANY_ID || id-&gt;product == hdev-&gt;product);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hid_device_id *hid_match_id(struct hid_device *hdev,</div><div class='add'>+		const struct hid_device_id *id)</div><div class='add'>+{</div><div class='add'>+	for (; id-&gt;bus; id++)</div><div class='add'>+		if (hid_match_one_id(hdev, id))</div><div class='add'>+			return id;</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hid_device_id hid_hiddev_list[] = {</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_MGE, USB_DEVICE_ID_MGE_UPS) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_MGE, USB_DEVICE_ID_MGE_UPS1) },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static bool hid_hiddev(struct hid_device *hdev)</div><div class='add'>+{</div><div class='add'>+	return !!hid_match_id(hdev, hid_hiddev_list);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hid_connect(struct hid_device *hdev, unsigned int connect_mask)</div><div class='add'>+{</div><div class='add'>+	static const char *types[] = { "Device", "Pointer", "Mouse", "Device",</div><div class='add'>+		"Joystick", "Gamepad", "Keyboard", "Keypad",</div><div class='add'>+		"Multi-Axis Controller"</div><div class='add'>+	};</div><div class='add'>+	const char *type, *bus;</div><div class='add'>+	char buf[64];</div><div class='add'>+	unsigned int i;</div><div class='add'>+	int len;</div><div class='add'>+</div><div class='add'>+	if (hdev-&gt;bus != BUS_USB)</div><div class='add'>+		connect_mask &amp;= ~HID_CONNECT_HIDDEV;</div><div class='add'>+	if (hid_hiddev(hdev))</div><div class='add'>+		connect_mask |= HID_CONNECT_HIDDEV_FORCE;</div><div class='add'>+</div><div class='add'>+	if ((connect_mask &amp; HID_CONNECT_HIDINPUT) &amp;&amp; !hidinput_connect(hdev,</div><div class='add'>+				connect_mask &amp; HID_CONNECT_HIDINPUT_FORCE))</div><div class='add'>+		hdev-&gt;claimed |= HID_CLAIMED_INPUT;</div><div class='add'>+	if ((connect_mask &amp; HID_CONNECT_HIDDEV) &amp;&amp; hdev-&gt;hiddev_connect &amp;&amp;</div><div class='add'>+			!hdev-&gt;hiddev_connect(hdev,</div><div class='add'>+				connect_mask &amp; HID_CONNECT_HIDDEV_FORCE))</div><div class='add'>+		hdev-&gt;claimed |= HID_CLAIMED_HIDDEV;</div><div class='add'>+	if ((connect_mask &amp; HID_CONNECT_HIDRAW) &amp;&amp; !hidraw_connect(hdev))</div><div class='add'>+		hdev-&gt;claimed |= HID_CLAIMED_HIDRAW;</div><div class='add'>+</div><div class='add'>+	if (!hdev-&gt;claimed) {</div><div class='add'>+		dev_err(&amp;hdev-&gt;dev, "claimed by neither input, hiddev nor "</div><div class='add'>+				"hidraw\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((hdev-&gt;claimed &amp; HID_CLAIMED_INPUT) &amp;&amp;</div><div class='add'>+			(connect_mask &amp; HID_CONNECT_FF) &amp;&amp; hdev-&gt;ff_init)</div><div class='add'>+		hdev-&gt;ff_init(hdev);</div><div class='add'>+</div><div class='add'>+	len = 0;</div><div class='add'>+	if (hdev-&gt;claimed &amp; HID_CLAIMED_INPUT)</div><div class='add'>+		len += sprintf(buf + len, "input");</div><div class='add'>+	if (hdev-&gt;claimed &amp; HID_CLAIMED_HIDDEV)</div><div class='add'>+		len += sprintf(buf + len, "%shiddev%d", len ? "," : "",</div><div class='add'>+				hdev-&gt;minor);</div><div class='add'>+	if (hdev-&gt;claimed &amp; HID_CLAIMED_HIDRAW)</div><div class='add'>+		len += sprintf(buf + len, "%shidraw%d", len ? "," : "",</div><div class='add'>+				((struct hidraw *)hdev-&gt;hidraw)-&gt;minor);</div><div class='add'>+</div><div class='add'>+	type = "Device";</div><div class='add'>+	for (i = 0; i &lt; hdev-&gt;maxcollection; i++) {</div><div class='add'>+		struct hid_collection *col = &amp;hdev-&gt;collection[i];</div><div class='add'>+		if (col-&gt;type == HID_COLLECTION_APPLICATION &amp;&amp;</div><div class='add'>+		   (col-&gt;usage &amp; HID_USAGE_PAGE) == HID_UP_GENDESK &amp;&amp;</div><div class='add'>+		   (col-&gt;usage &amp; 0xffff) &lt; ARRAY_SIZE(types)) {</div><div class='add'>+			type = types[col-&gt;usage &amp; 0xffff];</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (hdev-&gt;bus) {</div><div class='add'>+	case BUS_USB:</div><div class='add'>+		bus = "USB";</div><div class='add'>+		break;</div><div class='add'>+	case BUS_BLUETOOTH:</div><div class='add'>+		bus = "BLUETOOTH";</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		bus = "&lt;UNKNOWN&gt;";</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_info(&amp;hdev-&gt;dev, "%s: %s HID v%x.%02x %s [%s] on %s\n",</div><div class='add'>+			buf, bus, hdev-&gt;version &gt;&gt; 8, hdev-&gt;version &amp; 0xff,</div><div class='add'>+			type, hdev-&gt;name, hdev-&gt;phys);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(hid_connect);</div><div class='add'>+</div><div class='add'>+static const struct hid_device_id hid_blacklist[] = {</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_WCP32PU) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_X5_005D) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ATV_IRCONTROL) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL4) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MIGHTYMOUSE) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_ANSI) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_ISO) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_ANSI) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_ISO) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_JIS) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_ANSI) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_ISO) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_JIS) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_ANSI) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_ISO) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_JIS) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_ANSI) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_ISO) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_JIS) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_ANSI) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_ISO) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_JIS) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ANSI) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ISO) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_JIS) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ANSI) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ISO) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_JIS) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_AVERMEDIA, USB_DEVICE_ID_AVER_FM_MR800) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_BELKIN, USB_DEVICE_ID_FLIP_KVM) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_BRIGHT, USB_DEVICE_ID_BRIGHT_ABNT2) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_CHERRY, USB_DEVICE_ID_CHERRY_CYMOTION) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_TACTICAL_PAD) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_1) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_2) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_MOUSE) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_DELL, USB_DEVICE_ID_DELL_W7658) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_DELL, USB_DEVICE_ID_DELL_SK8115) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_EZKEY, USB_DEVICE_ID_BTC_8193) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_LABTEC, USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_MX3000_RECEIVER) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_S510_RECEIVER) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_S510_RECEIVER_2) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_RECEIVER) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_DINOVO_DESKTOP) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_DINOVO_EDGE) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_DINOVO_MINI) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_KBD) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_ELITE_KBD) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_CORDLESS_DESKTOP_LX500) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_LX3) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_V150) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_EXTREME_3D) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_WHEEL) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_RUMBLEPAD) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_RUMBLEPAD2_2) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_WINGMAN_F3D) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_FORCE3D_PRO) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_MOMO_WHEEL) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_MOMO_WHEEL2) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_RUMBLEPAD2) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_SIDEWINDER_GV) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_NE4K) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_LK6K) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_USB) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_MONTEREY, USB_DEVICE_ID_GENIUS_KB29E) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_PETALYNX, USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_SUNPLUS, USB_DEVICE_ID_SUNPLUS_WDESKTOP) },</div><div class='add'>+</div><div class='add'>+	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, 0x030c) },</div><div class='add'>+	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_BT) },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int hid_bus_match(struct device *dev, struct device_driver *drv)</div><div class='add'>+{</div><div class='add'>+	struct hid_driver *hdrv = container_of(drv, struct hid_driver, driver);</div><div class='add'>+	struct hid_device *hdev = container_of(dev, struct hid_device, dev);</div><div class='add'>+</div><div class='add'>+	if (!hid_match_id(hdev, hdrv-&gt;id_table))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* generic wants all non-blacklisted */</div><div class='add'>+	if (!strncmp(hdrv-&gt;name, "generic-", 8))</div><div class='add'>+		return !hid_match_id(hdev, hid_blacklist);</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hid_device_probe(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct hid_driver *hdrv = container_of(dev-&gt;driver,</div><div class='add'>+			struct hid_driver, driver);</div><div class='add'>+	struct hid_device *hdev = container_of(dev, struct hid_device, dev);</div><div class='add'>+	const struct hid_device_id *id;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (!hdev-&gt;driver) {</div><div class='add'>+		id = hid_match_id(hdev, hdrv-&gt;id_table);</div><div class='add'>+		if (id == NULL)</div><div class='add'>+			return -ENODEV;</div><div class='add'>+</div><div class='add'>+		hdev-&gt;driver = hdrv;</div><div class='add'>+		if (hdrv-&gt;probe) {</div><div class='add'>+			ret = hdrv-&gt;probe(hdev, id);</div><div class='add'>+		} else { /* default probe */</div><div class='add'>+			ret = hid_parse(hdev);</div><div class='add'>+			if (!ret)</div><div class='add'>+				ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT);</div><div class='add'>+		}</div><div class='add'>+		if (ret)</div><div class='add'>+			hdev-&gt;driver = NULL;</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hid_device_remove(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct hid_device *hdev = container_of(dev, struct hid_device, dev);</div><div class='add'>+	struct hid_driver *hdrv = hdev-&gt;driver;</div><div class='add'>+</div><div class='add'>+	if (hdrv) {</div><div class='add'>+		if (hdrv-&gt;remove)</div><div class='add'>+			hdrv-&gt;remove(hdev);</div><div class='add'>+		else /* default remove */</div><div class='add'>+			hid_hw_stop(hdev);</div><div class='add'>+		hdev-&gt;driver = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hid_uevent(struct device *dev, struct kobj_uevent_env *env)</div><div class='add'>+{</div><div class='add'>+	struct hid_device *hdev = container_of(dev, struct hid_device, dev);</div><div class='add'>+</div><div class='add'>+	if (add_uevent_var(env, "HID_ID=%04X:%08X:%08X",</div><div class='add'>+			hdev-&gt;bus, hdev-&gt;vendor, hdev-&gt;product))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (add_uevent_var(env, "HID_NAME=%s", hdev-&gt;name))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (add_uevent_var(env, "HID_PHYS=%s", hdev-&gt;phys))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (add_uevent_var(env, "HID_UNIQ=%s", hdev-&gt;uniq))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (add_uevent_var(env, "MODALIAS=hid:b%04Xv%08Xp%08X",</div><div class='add'>+			hdev-&gt;bus, hdev-&gt;vendor, hdev-&gt;product))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct bus_type hid_bus_type = {</div><div class='add'>+	.name		= "hid",</div><div class='add'>+	.match		= hid_bus_match,</div><div class='add'>+	.probe		= hid_device_probe,</div><div class='add'>+	.remove		= hid_device_remove,</div><div class='add'>+	.uevent		= hid_uevent,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hid_device_id hid_ignore_list[] = {</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_ACECAD, USB_DEVICE_ID_ACECAD_FLAIR) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_ACECAD, USB_DEVICE_ID_ACECAD_302) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_ADS_TECH, USB_DEVICE_ID_ADS_TECH_RADIO_SI470X) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_AIPTEK, USB_DEVICE_ID_AIPTEK_01) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_AIPTEK, USB_DEVICE_ID_AIPTEK_10) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_AIPTEK, USB_DEVICE_ID_AIPTEK_20) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_AIPTEK, USB_DEVICE_ID_AIPTEK_21) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_AIPTEK, USB_DEVICE_ID_AIPTEK_22) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_AIPTEK, USB_DEVICE_ID_AIPTEK_23) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_AIPTEK, USB_DEVICE_ID_AIPTEK_24) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_AIRCABLE, USB_DEVICE_ID_AIRCABLE1) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_ALCOR, USB_DEVICE_ID_ALCOR_USBRS232) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUS, USB_DEVICE_ID_ASUS_LCM)},</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_BERKSHIRE, USB_DEVICE_ID_BERKSHIRE_PCWD) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_CIDC, 0x0103) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_CYGNAL, USB_DEVICE_ID_CYGNAL_RADIO_SI470X) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_CMEDIA, USB_DEVICE_ID_CM109) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_HIDCOM) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_ULTRAMOUSE) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_DELORME, USB_DEVICE_ID_DELORME_EARTHMATE) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_DELORME, USB_DEVICE_ID_DELORME_EM_LT20) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_ESSENTIAL_REALITY, USB_DEVICE_ID_ESSENTIAL_REALITY_P5) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PSX_ADAPTOR) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH, 0x0001) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH, 0x0002) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH, 0x0003) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH, 0x0004) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_GLAB, USB_DEVICE_ID_4_PHIDGETSERVO_30) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_GLAB, USB_DEVICE_ID_1_PHIDGETSERVO_30) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_GLAB, USB_DEVICE_ID_0_0_4_IF_KIT) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_GLAB, USB_DEVICE_ID_0_16_16_IF_KIT) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_GLAB, USB_DEVICE_ID_8_8_8_IF_KIT) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_GLAB, USB_DEVICE_ID_0_8_7_IF_KIT) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_GLAB, USB_DEVICE_ID_0_8_8_IF_KIT) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_GLAB, USB_DEVICE_ID_PHIDGET_MOTORCONTROL) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_GOTOP, USB_DEVICE_ID_SUPER_Q2) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_GOTOP, USB_DEVICE_ID_GOGOPEN) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_GOTOP, USB_DEVICE_ID_PENPOWER) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_GREENASIA, 0x0003) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_GRETAGMACBETH, USB_DEVICE_ID_GRETAGMACBETH_HUEY) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_GRIFFIN, USB_DEVICE_ID_POWERMATE) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_GRIFFIN, USB_DEVICE_ID_SOUNDKNOB) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_90) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_100) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_101) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_103) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_104) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_105) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_106) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_107) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_108) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_200) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_201) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_202) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_203) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_204) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_205) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_206) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_207) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_300) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_301) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_302) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_303) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_304) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_305) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_306) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_307) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_308) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_309) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_400) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_401) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_402) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_403) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_404) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_405) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_500) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_501) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_502) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_503) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_504) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_1000) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_1001) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_1002) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_1003) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_1004) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_1005) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_1006) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_1007) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_IMATION, USB_DEVICE_ID_DISC_STAKKA) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_KBGEAR, USB_DEVICE_ID_KBGEAR_JAMSTUDIO) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_GPEN_560) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_CASSY) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_POCKETCASSY) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MOBILECASSY) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_JWM) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_DMMP) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_UMIP) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_XRAY1) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_XRAY2) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_VIDEOCOM) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_COM3LAB) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_TELEPORT) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_NETWORKANALYSER) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_POWERCONTROL) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MACHINETEST) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_MCC, USB_DEVICE_ID_MCC_PMD1024LS) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_MCC, USB_DEVICE_ID_MCC_PMD1208LS) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_PICKIT1) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_PICKIT2) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_NATIONAL_SEMICONDUCTOR, USB_DEVICE_ID_N_S_HARMONY) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_ONTRAK, USB_DEVICE_ID_ONTRAK_ADU100) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_ONTRAK, USB_DEVICE_ID_ONTRAK_ADU100 + 20) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_ONTRAK, USB_DEVICE_ID_ONTRAK_ADU100 + 30) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_ONTRAK, USB_DEVICE_ID_ONTRAK_ADU100 + 100) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_ONTRAK, USB_DEVICE_ID_ONTRAK_ADU100 + 108) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_ONTRAK, USB_DEVICE_ID_ONTRAK_ADU100 + 118) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_ONTRAK, USB_DEVICE_ID_ONTRAK_ADU100 + 200) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_ONTRAK, USB_DEVICE_ID_ONTRAK_ADU100 + 300) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_ONTRAK, USB_DEVICE_ID_ONTRAK_ADU100 + 400) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_ONTRAK, USB_DEVICE_ID_ONTRAK_ADU100 + 500) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_PANJIT, 0x0001) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_PANJIT, 0x0002) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_PANJIT, 0x0003) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_PANJIT, 0x0004) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD2) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD3) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_TENX, USB_DEVICE_ID_TENX_IBUDDY1) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_TENX, USB_DEVICE_ID_TENX_IBUDDY2) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb300) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb304) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb651) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb654) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_LABPRO) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_GOTEMP) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_SKIP) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_CYCLOPS) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_LCSPEC) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_WACOM, HID_ANY_ID) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_4_PHIDGETSERVO_20) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_1_PHIDGETSERVO_20) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_8_8_4_IF_KIT) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_YEALINK, USB_DEVICE_ID_YEALINK_P1K_P4K_B2K) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0005) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0030) },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static bool hid_ignore(struct hid_device *hdev)</div><div class='add'>+{</div><div class='add'>+	switch (hdev-&gt;vendor) {</div><div class='add'>+	case USB_VENDOR_ID_CODEMERCS:</div><div class='add'>+		/* ignore all Code Mercenaries IOWarrior devices */</div><div class='add'>+		if (hdev-&gt;product &gt;= USB_DEVICE_ID_CODEMERCS_IOW_FIRST &amp;&amp;</div><div class='add'>+				hdev-&gt;product &lt;= USB_DEVICE_ID_CODEMERCS_IOW_LAST)</div><div class='add'>+			return true;</div><div class='add'>+		break;</div><div class='add'>+	case USB_VENDOR_ID_LOGITECH:</div><div class='add'>+		if (hdev-&gt;product &gt;= USB_DEVICE_ID_LOGITECH_HARMONY_FIRST &amp;&amp;</div><div class='add'>+				hdev-&gt;product &lt;= USB_DEVICE_ID_LOGITECH_HARMONY_LAST)</div><div class='add'>+			return true;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return !!hid_match_id(hdev, hid_ignore_list);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hid_add_device(struct hid_device *hdev)</div><div class='add'>+{</div><div class='add'>+	static atomic_t id = ATOMIC_INIT(0);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(hdev-&gt;status &amp; HID_STAT_ADDED))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	/* we need to kill them here, otherwise they will stay allocated to</div><div class='add'>+	 * wait for coming driver */</div><div class='add'>+	if (hid_ignore(hdev))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	/* XXX hack, any other cleaner solution &lt; 20 bus_id bytes? */</div><div class='add'>+	sprintf(hdev-&gt;dev.bus_id, "%04X:%04X:%04X.%04X", hdev-&gt;bus,</div><div class='add'>+			hdev-&gt;vendor, hdev-&gt;product, atomic_inc_return(&amp;id));</div><div class='add'>+</div><div class='add'>+	ret = device_add(&amp;hdev-&gt;dev);</div><div class='add'>+	if (!ret)</div><div class='add'>+		hdev-&gt;status |= HID_STAT_ADDED;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(hid_add_device);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * hid_allocate_device - allocate new hid device descriptor</div><div class='add'>+ *</div><div class='add'>+ * Allocate and initialize hid device, so that hid_destroy_device might be</div><div class='add'>+ * used to free it.</div><div class='add'>+ *</div><div class='add'>+ * New hid_device pointer is returned on success, otherwise ERR_PTR encoded</div><div class='add'>+ * error value.</div><div class='add'>+ */</div><div class='add'>+struct hid_device *hid_allocate_device(void)</div><div class='add'>+{</div><div class='add'>+	struct hid_device *hdev;</div><div class='add'>+	unsigned int i;</div><div class='add'>+	int ret = -ENOMEM;</div><div class='add'>+</div><div class='add'>+	hdev = kzalloc(sizeof(*hdev), GFP_KERNEL);</div><div class='add'>+	if (hdev == NULL)</div><div class='add'>+		return ERR_PTR(ret);</div><div class='add'>+</div><div class='add'>+	device_initialize(&amp;hdev-&gt;dev);</div><div class='add'>+	hdev-&gt;dev.release = hid_device_release;</div><div class='add'>+	hdev-&gt;dev.bus = &amp;hid_bus_type;</div><div class='add'>+</div><div class='add'>+	hdev-&gt;collection = kcalloc(HID_DEFAULT_NUM_COLLECTIONS,</div><div class='add'>+			sizeof(struct hid_collection), GFP_KERNEL);</div><div class='add'>+	if (hdev-&gt;collection == NULL)</div><div class='add'>+		goto err;</div><div class='add'>+	hdev-&gt;collection_size = HID_DEFAULT_NUM_COLLECTIONS;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; HID_REPORT_TYPES; i++)</div><div class='add'>+		INIT_LIST_HEAD(&amp;hdev-&gt;report_enum[i].report_list);</div><div class='add'>+</div><div class='add'>+	return hdev;</div><div class='add'>+err:</div><div class='add'>+	put_device(&amp;hdev-&gt;dev);</div><div class='add'>+	return ERR_PTR(ret);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(hid_allocate_device);</div><div class='add'>+</div><div class='add'>+static void hid_remove_device(struct hid_device *hdev)</div><div class='add'>+{</div><div class='add'>+	if (hdev-&gt;status &amp; HID_STAT_ADDED) {</div><div class='add'>+		device_del(&amp;hdev-&gt;dev);</div><div class='add'>+		hdev-&gt;status &amp;= ~HID_STAT_ADDED;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * hid_destroy_device - free previously allocated device</div><div class='add'>+ *</div><div class='add'>+ * @hdev: hid device</div><div class='add'>+ *</div><div class='add'>+ * If you allocate hid_device through hid_allocate_device, you should ever</div><div class='add'>+ * free by this function.</div><div class='add'>+ */</div><div class='add'>+void hid_destroy_device(struct hid_device *hdev)</div><div class='add'>+{</div><div class='add'>+	hid_remove_device(hdev);</div><div class='add'>+	put_device(&amp;hdev-&gt;dev);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(hid_destroy_device);</div><div class='add'>+</div><div class='add'>+int __hid_register_driver(struct hid_driver *hdrv, struct module *owner,</div><div class='add'>+		const char *mod_name)</div><div class='add'>+{</div><div class='add'>+	hdrv-&gt;driver.name = hdrv-&gt;name;</div><div class='add'>+	hdrv-&gt;driver.bus = &amp;hid_bus_type;</div><div class='add'>+	hdrv-&gt;driver.owner = owner;</div><div class='add'>+	hdrv-&gt;driver.mod_name = mod_name;</div><div class='add'>+</div><div class='add'>+	return driver_register(&amp;hdrv-&gt;driver);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(__hid_register_driver);</div><div class='add'>+</div><div class='add'>+void hid_unregister_driver(struct hid_driver *hdrv)</div><div class='add'>+{</div><div class='add'>+	driver_unregister(&amp;hdrv-&gt;driver);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(hid_unregister_driver);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_HID_COMPAT</div><div class='add'>+static void hid_compat_load(struct work_struct *ws)</div><div class='add'>+{</div><div class='add'>+	request_module("hid-dummy");</div><div class='add'>+}</div><div class='add'>+static DECLARE_WORK(hid_compat_work, hid_compat_load);</div><div class='add'>+static struct workqueue_struct *hid_compat_wq;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static int __init hid_init(void)</div><div class='ctx'> {</div><div class='del'>-	return hidraw_init();</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = bus_register(&amp;hid_bus_type);</div><div class='add'>+	if (ret) {</div><div class='add'>+		printk(KERN_ERR "HID: can't register hid bus\n");</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = hidraw_init();</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_bus;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_HID_COMPAT</div><div class='add'>+	hid_compat_wq = create_workqueue("hid_compat");</div><div class='add'>+	if (!hid_compat_wq) {</div><div class='add'>+		hidraw_exit();</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+	queue_work(hid_compat_wq, &amp;hid_compat_work);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+err_bus:</div><div class='add'>+	bus_unregister(&amp;hid_bus_type);</div><div class='add'>+err:</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit hid_exit(void)</div><div class='ctx'> {</div><div class='add'>+#ifdef CONFIG_HID_COMPAT</div><div class='add'>+	destroy_workqueue(hid_compat_wq);</div><div class='add'>+#endif</div><div class='ctx'> 	hidraw_exit();</div><div class='add'>+	bus_unregister(&amp;hid_bus_type);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(hid_init);</div><div class='head'>diff --git a/drivers/hid/hid-cypress.c b/drivers/hid/hid-cypress.c<br/>new file mode 100644<br/>index 000000000000..5d69d27b935d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hid/hid-cypress.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/hid-cypress.c</a></div><div class='hunk'>@@ -0,0 +1,158 @@</div><div class='add'>+/*</div><div class='add'>+ *  HID driver for some cypress "special" devices</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (c) 1999 Andreas Gal</div><div class='add'>+ *  Copyright (c) 2000-2005 Vojtech Pavlik &lt;vojtech@suse.cz&gt;</div><div class='add'>+ *  Copyright (c) 2005 Michael Haboustak &lt;mike-@cinci.rr.com&gt; for Concept2, Inc</div><div class='add'>+ *  Copyright (c) 2006-2007 Jiri Kosina</div><div class='add'>+ *  Copyright (c) 2007 Paul Walmsley</div><div class='add'>+ *  Copyright (c) 2008 Jiri Slaby</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms of the GNU General Public License as published by the Free</div><div class='add'>+ * Software Foundation; either version 2 of the License, or (at your option)</div><div class='add'>+ * any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/hid.h&gt;</div><div class='add'>+#include &lt;linux/input.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+</div><div class='add'>+#include "hid-ids.h"</div><div class='add'>+</div><div class='add'>+#define CP_RDESC_SWAPPED_MIN_MAX	0x01</div><div class='add'>+#define CP_2WHEEL_MOUSE_HACK		0x02</div><div class='add'>+#define CP_2WHEEL_MOUSE_HACK_ON		0x04</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Some USB barcode readers from cypress have usage min and usage max in</div><div class='add'>+ * the wrong order</div><div class='add'>+ */</div><div class='add'>+static void cp_report_fixup(struct hid_device *hdev, __u8 *rdesc,</div><div class='add'>+		unsigned int rsize)</div><div class='add'>+{</div><div class='add'>+	unsigned long quirks = (unsigned long)hid_get_drvdata(hdev);</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	if (!(quirks &amp; CP_RDESC_SWAPPED_MIN_MAX))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; rsize - 4; i++)</div><div class='add'>+		if (rdesc[i] == 0x29 &amp;&amp; rdesc[i + 2] == 0x19) {</div><div class='add'>+			__u8 tmp;</div><div class='add'>+</div><div class='add'>+			rdesc[i] = 0x19;</div><div class='add'>+			rdesc[i + 2] = 0x29;</div><div class='add'>+			tmp = rdesc[i + 3];</div><div class='add'>+			rdesc[i + 3] = rdesc[i + 1];</div><div class='add'>+			rdesc[i + 1] = tmp;</div><div class='add'>+		}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cp_input_mapped(struct hid_device *hdev, struct hid_input *hi,</div><div class='add'>+		struct hid_field *field, struct hid_usage *usage,</div><div class='add'>+		unsigned long **bit, int *max)</div><div class='add'>+{</div><div class='add'>+	unsigned long quirks = (unsigned long)hid_get_drvdata(hdev);</div><div class='add'>+</div><div class='add'>+	if (!(quirks &amp; CP_2WHEEL_MOUSE_HACK))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (usage-&gt;type == EV_REL &amp;&amp; usage-&gt;code == REL_WHEEL)</div><div class='add'>+		set_bit(REL_HWHEEL, *bit);</div><div class='add'>+	if (usage-&gt;hid == 0x00090005)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cp_event(struct hid_device *hdev, struct hid_field *field,</div><div class='add'>+		struct hid_usage *usage, __s32 value)</div><div class='add'>+{</div><div class='add'>+	unsigned long quirks = (unsigned long)hid_get_drvdata(hdev);</div><div class='add'>+</div><div class='add'>+	if (!(hdev-&gt;claimed &amp; HID_CLAIMED_INPUT) || !field-&gt;hidinput ||</div><div class='add'>+			!usage-&gt;type || !(quirks &amp; CP_2WHEEL_MOUSE_HACK))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (usage-&gt;hid == 0x00090005) {</div><div class='add'>+		if (value)</div><div class='add'>+			quirks |=  CP_2WHEEL_MOUSE_HACK_ON;</div><div class='add'>+		else</div><div class='add'>+			quirks &amp;= ~CP_2WHEEL_MOUSE_HACK_ON;</div><div class='add'>+		hid_set_drvdata(hdev, (void *)quirks);</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (usage-&gt;code == REL_WHEEL &amp;&amp; (quirks &amp; CP_2WHEEL_MOUSE_HACK_ON)) {</div><div class='add'>+		struct input_dev *input = field-&gt;hidinput-&gt;input;</div><div class='add'>+</div><div class='add'>+		input_event(input, usage-&gt;type, REL_HWHEEL, value);</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cp_probe(struct hid_device *hdev, const struct hid_device_id *id)</div><div class='add'>+{</div><div class='add'>+	unsigned long quirks = id-&gt;driver_data;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	hid_set_drvdata(hdev, (void *)quirks);</div><div class='add'>+</div><div class='add'>+	ret = hid_parse(hdev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;hdev-&gt;dev, "parse failed\n");</div><div class='add'>+		goto err_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;hdev-&gt;dev, "hw start failed\n");</div><div class='add'>+		goto err_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+err_free:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hid_device_id cp_devices[] = {</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_1),</div><div class='add'>+		.driver_data = CP_RDESC_SWAPPED_MIN_MAX },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_2),</div><div class='add'>+		.driver_data = CP_RDESC_SWAPPED_MIN_MAX },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_MOUSE),</div><div class='add'>+		.driver_data = CP_2WHEEL_MOUSE_HACK },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(hid, cp_devices);</div><div class='add'>+</div><div class='add'>+static struct hid_driver cp_driver = {</div><div class='add'>+	.name = "cypress",</div><div class='add'>+	.id_table = cp_devices,</div><div class='add'>+	.report_fixup = cp_report_fixup,</div><div class='add'>+	.input_mapped = cp_input_mapped,</div><div class='add'>+	.event = cp_event,</div><div class='add'>+	.probe = cp_probe,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int cp_init(void)</div><div class='add'>+{</div><div class='add'>+	return hid_register_driver(&amp;cp_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cp_exit(void)</div><div class='add'>+{</div><div class='add'>+	hid_unregister_driver(&amp;cp_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(cp_init);</div><div class='add'>+module_exit(cp_exit);</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='add'>+HID_COMPAT_LOAD_DRIVER(cypress);</div><div class='head'>diff --git a/drivers/hid/hid-dell.c b/drivers/hid/hid-dell.c<br/>new file mode 100644<br/>index 000000000000..1a0d0dfc62fc<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hid/hid-dell.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/hid-dell.c</a></div><div class='hunk'>@@ -0,0 +1,75 @@</div><div class='add'>+/*</div><div class='add'>+ *  HID driver for some dell "special" devices</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (c) 1999 Andreas Gal</div><div class='add'>+ *  Copyright (c) 2000-2005 Vojtech Pavlik &lt;vojtech@suse.cz&gt;</div><div class='add'>+ *  Copyright (c) 2005 Michael Haboustak &lt;mike-@cinci.rr.com&gt; for Concept2, Inc</div><div class='add'>+ *  Copyright (c) 2006-2007 Jiri Kosina</div><div class='add'>+ *  Copyright (c) 2007 Paul Walmsley</div><div class='add'>+ *  Copyright (c) 2008 Jiri Slaby</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms of the GNU General Public License as published by the Free</div><div class='add'>+ * Software Foundation; either version 2 of the License, or (at your option)</div><div class='add'>+ * any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/hid.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+</div><div class='add'>+#include "hid-ids.h"</div><div class='add'>+</div><div class='add'>+static int dell_probe(struct hid_device *hdev, const struct hid_device_id *id)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = hid_parse(hdev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;hdev-&gt;dev, "parse failed\n");</div><div class='add'>+		goto err_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;hdev-&gt;dev, "hw start failed\n");</div><div class='add'>+		goto err_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	usbhid_set_leds(hdev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+err_free:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hid_device_id dell_devices[] = {</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_DELL, USB_DEVICE_ID_DELL_W7658) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_DELL, USB_DEVICE_ID_DELL_SK8115) },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(hid, dell_devices);</div><div class='add'>+</div><div class='add'>+static struct hid_driver dell_driver = {</div><div class='add'>+	.name = "dell",</div><div class='add'>+	.id_table = dell_devices,</div><div class='add'>+	.probe = dell_probe,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int dell_init(void)</div><div class='add'>+{</div><div class='add'>+	return hid_register_driver(&amp;dell_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dell_exit(void)</div><div class='add'>+{</div><div class='add'>+	hid_unregister_driver(&amp;dell_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(dell_init);</div><div class='add'>+module_exit(dell_exit);</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='add'>+HID_COMPAT_LOAD_DRIVER(dell);</div><div class='head'>diff --git a/drivers/hid/hid-dummy.c b/drivers/hid/hid-dummy.c<br/>new file mode 100644<br/>index 000000000000..e148f86fb58e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hid/hid-dummy.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/hid-dummy.c</a></div><div class='hunk'>@@ -0,0 +1,72 @@</div><div class='add'>+#include &lt;linux/autoconf.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/hid.h&gt;</div><div class='add'>+</div><div class='add'>+static int __init hid_dummy_init(void)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_HID_A4TECH_MODULE</div><div class='add'>+	HID_COMPAT_CALL_DRIVER(a4tech);</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_HID_APPLE_MODULE</div><div class='add'>+	HID_COMPAT_CALL_DRIVER(apple);</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_HID_BELKIN_MODULE</div><div class='add'>+	HID_COMPAT_CALL_DRIVER(belkin);</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_HID_BRIGHT_MODULE</div><div class='add'>+	HID_COMPAT_CALL_DRIVER(bright);</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_HID_CHERRY_MODULE</div><div class='add'>+	HID_COMPAT_CALL_DRIVER(cherry);</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_HID_CHICONY_MODULE</div><div class='add'>+	HID_COMPAT_CALL_DRIVER(chicony);</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_HID_CYPRESS_MODULE</div><div class='add'>+	HID_COMPAT_CALL_DRIVER(cypress);</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_HID_DELL_MODULE</div><div class='add'>+	HID_COMPAT_CALL_DRIVER(dell);</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_HID_EZKEY_MODULE</div><div class='add'>+	HID_COMPAT_CALL_DRIVER(ezkey);</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_HID_GYRATION_MODULE</div><div class='add'>+	HID_COMPAT_CALL_DRIVER(gyration);</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_HID_LOGITECH_MODULE</div><div class='add'>+	HID_COMPAT_CALL_DRIVER(logitech);</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_HID_MICROSOFT_MODULE</div><div class='add'>+	HID_COMPAT_CALL_DRIVER(microsoft);</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_HID_MONTEREY_MODULE</div><div class='add'>+	HID_COMPAT_CALL_DRIVER(monterey);</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_HID_PANTHERLORD_MODULE</div><div class='add'>+	HID_COMPAT_CALL_DRIVER(pantherlord);</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_HID_PETALYNX_MODULE</div><div class='add'>+	HID_COMPAT_CALL_DRIVER(petalynx);</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_HID_SAMSUNG_MODULE</div><div class='add'>+	HID_COMPAT_CALL_DRIVER(samsung);</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_HID_SONY_MODULE</div><div class='add'>+	HID_COMPAT_CALL_DRIVER(sony);</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_HID_SUNPLUS_MODULE</div><div class='add'>+	HID_COMPAT_CALL_DRIVER(sunplus);</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_THRUSTMASTER_FF_MODULE</div><div class='add'>+	HID_COMPAT_CALL_DRIVER(thrustmaster);</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_ZEROPLUS_FF_MODULE</div><div class='add'>+	HID_COMPAT_CALL_DRIVER(zeroplus);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	return -EIO;</div><div class='add'>+}</div><div class='add'>+module_init(hid_dummy_init);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/hid/hid-ezkey.c b/drivers/hid/hid-ezkey.c<br/>new file mode 100644<br/>index 000000000000..deb42f931b7e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hid/hid-ezkey.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/hid-ezkey.c</a></div><div class='hunk'>@@ -0,0 +1,95 @@</div><div class='add'>+/*</div><div class='add'>+ *  HID driver for some ezkey "special" devices</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (c) 1999 Andreas Gal</div><div class='add'>+ *  Copyright (c) 2000-2005 Vojtech Pavlik &lt;vojtech@suse.cz&gt;</div><div class='add'>+ *  Copyright (c) 2005 Michael Haboustak &lt;mike-@cinci.rr.com&gt; for Concept2, Inc</div><div class='add'>+ *  Copyright (c) 2006-2007 Jiri Kosina</div><div class='add'>+ *  Copyright (c) 2007 Paul Walmsley</div><div class='add'>+ *  Copyright (c) 2008 Jiri Slaby</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms of the GNU General Public License as published by the Free</div><div class='add'>+ * Software Foundation; either version 2 of the License, or (at your option)</div><div class='add'>+ * any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/input.h&gt;</div><div class='add'>+#include &lt;linux/hid.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+</div><div class='add'>+#include "hid-ids.h"</div><div class='add'>+</div><div class='add'>+#define ez_map_rel(c)	hid_map_usage(hi, usage, bit, max, EV_REL, (c))</div><div class='add'>+#define ez_map_key(c)	hid_map_usage(hi, usage, bit, max, EV_KEY, (c))</div><div class='add'>+</div><div class='add'>+static int ez_input_mapping(struct hid_device *hdev, struct hid_input *hi,</div><div class='add'>+		struct hid_field *field, struct hid_usage *usage,</div><div class='add'>+		unsigned long **bit, int *max)</div><div class='add'>+{</div><div class='add'>+	if ((usage-&gt;hid &amp; HID_USAGE_PAGE) != HID_UP_CONSUMER)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	switch (usage-&gt;hid &amp; HID_USAGE) {</div><div class='add'>+	case 0x230: ez_map_key(BTN_MOUSE);	break;</div><div class='add'>+	case 0x231: ez_map_rel(REL_WHEEL);	break;</div><div class='add'>+	/*</div><div class='add'>+	 * this keyboard has a scrollwheel implemented in</div><div class='add'>+	 * totally broken way. We map this usage temporarily</div><div class='add'>+	 * to HWHEEL and handle it in the event quirk handler</div><div class='add'>+	 */</div><div class='add'>+	case 0x232: ez_map_rel(REL_HWHEEL);	break;</div><div class='add'>+	default:</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ez_event(struct hid_device *hdev, struct hid_field *field,</div><div class='add'>+		struct hid_usage *usage, __s32 value)</div><div class='add'>+{</div><div class='add'>+	if (!(hdev-&gt;claimed &amp; HID_CLAIMED_INPUT) || !field-&gt;hidinput ||</div><div class='add'>+			!usage-&gt;type)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* handle the temporary quirky mapping to HWHEEL */</div><div class='add'>+	if (usage-&gt;type == EV_REL &amp;&amp; usage-&gt;code == REL_HWHEEL) {</div><div class='add'>+		struct input_dev *input = field-&gt;hidinput-&gt;input;</div><div class='add'>+		input_event(input, usage-&gt;type, REL_WHEEL, -value);</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hid_device_id ez_devices[] = {</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_EZKEY, USB_DEVICE_ID_BTC_8193) },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(hid, ez_devices);</div><div class='add'>+</div><div class='add'>+static struct hid_driver ez_driver = {</div><div class='add'>+	.name = "ezkey",</div><div class='add'>+	.id_table = ez_devices,</div><div class='add'>+	.input_mapping = ez_input_mapping,</div><div class='add'>+	.event = ez_event,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int ez_init(void)</div><div class='add'>+{</div><div class='add'>+	return hid_register_driver(&amp;ez_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ez_exit(void)</div><div class='add'>+{</div><div class='add'>+	hid_unregister_driver(&amp;ez_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(ez_init);</div><div class='add'>+module_exit(ez_exit);</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='add'>+HID_COMPAT_LOAD_DRIVER(ezkey);</div><div class='head'>diff --git a/drivers/hid/hid-gyration.c b/drivers/hid/hid-gyration.c<br/>new file mode 100644<br/>index 000000000000..ac5120f542cc<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hid/hid-gyration.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/hid-gyration.c</a></div><div class='hunk'>@@ -0,0 +1,96 @@</div><div class='add'>+/*</div><div class='add'>+ *  HID driver for some gyration "special" devices</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (c) 1999 Andreas Gal</div><div class='add'>+ *  Copyright (c) 2000-2005 Vojtech Pavlik &lt;vojtech@suse.cz&gt;</div><div class='add'>+ *  Copyright (c) 2005 Michael Haboustak &lt;mike-@cinci.rr.com&gt; for Concept2, Inc</div><div class='add'>+ *  Copyright (c) 2006-2007 Jiri Kosina</div><div class='add'>+ *  Copyright (c) 2007 Paul Walmsley</div><div class='add'>+ *  Copyright (c) 2008 Jiri Slaby</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms of the GNU General Public License as published by the Free</div><div class='add'>+ * Software Foundation; either version 2 of the License, or (at your option)</div><div class='add'>+ * any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/input.h&gt;</div><div class='add'>+#include &lt;linux/hid.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+</div><div class='add'>+#include "hid-ids.h"</div><div class='add'>+</div><div class='add'>+#define gy_map_key_clear(c)	hid_map_usage_clear(hi, usage, bit, max, \</div><div class='add'>+					EV_KEY, (c))</div><div class='add'>+static int gyration_input_mapping(struct hid_device *hdev, struct hid_input *hi,</div><div class='add'>+		struct hid_field *field, struct hid_usage *usage,</div><div class='add'>+		unsigned long **bit, int *max)</div><div class='add'>+{</div><div class='add'>+	if ((usage-&gt;hid &amp; HID_USAGE_PAGE) != HID_UP_LOGIVENDOR)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	set_bit(EV_REP, hi-&gt;input-&gt;evbit);</div><div class='add'>+	switch (usage-&gt;hid &amp; HID_USAGE) {</div><div class='add'>+	/* Reported on Gyration MCE Remote */</div><div class='add'>+	case 0x00d: gy_map_key_clear(KEY_HOME);		break;</div><div class='add'>+	case 0x024: gy_map_key_clear(KEY_DVD);		break;</div><div class='add'>+	case 0x025: gy_map_key_clear(KEY_PVR);		break;</div><div class='add'>+	case 0x046: gy_map_key_clear(KEY_MEDIA);	break;</div><div class='add'>+	case 0x047: gy_map_key_clear(KEY_MP3);		break;</div><div class='add'>+	case 0x049: gy_map_key_clear(KEY_CAMERA);	break;</div><div class='add'>+	case 0x04a: gy_map_key_clear(KEY_VIDEO);	break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gyration_event(struct hid_device *hdev, struct hid_field *field,</div><div class='add'>+		struct hid_usage *usage, __s32 value)</div><div class='add'>+{</div><div class='add'>+	struct input_dev *input = field-&gt;hidinput-&gt;input;</div><div class='add'>+</div><div class='add'>+	if ((usage-&gt;hid &amp; HID_USAGE_PAGE) == HID_UP_GENDESK &amp;&amp;</div><div class='add'>+			(usage-&gt;hid &amp; 0xff) == 0x82) {</div><div class='add'>+		input_event(input, usage-&gt;type, usage-&gt;code, 1);</div><div class='add'>+		input_sync(input);</div><div class='add'>+		input_event(input, usage-&gt;type, usage-&gt;code, 0);</div><div class='add'>+		input_sync(input);</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hid_device_id gyration_devices[] = {</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE) },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(hid, gyration_devices);</div><div class='add'>+</div><div class='add'>+static struct hid_driver gyration_driver = {</div><div class='add'>+	.name = "gyration",</div><div class='add'>+	.id_table = gyration_devices,</div><div class='add'>+	.input_mapping = gyration_input_mapping,</div><div class='add'>+	.event = gyration_event,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int gyration_init(void)</div><div class='add'>+{</div><div class='add'>+	return hid_register_driver(&amp;gyration_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void gyration_exit(void)</div><div class='add'>+{</div><div class='add'>+	hid_unregister_driver(&amp;gyration_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(gyration_init);</div><div class='add'>+module_exit(gyration_exit);</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='add'>+HID_COMPAT_LOAD_DRIVER(gyration);</div><div class='head'>diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h<br/>new file mode 100644<br/>index 000000000000..d9a1ba920c23<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hid/hid-ids.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/hid-ids.h</a></div><div class='hunk'>@@ -0,0 +1,406 @@</div><div class='add'>+/*</div><div class='add'>+ *  USB HID quirks support for Linux</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (c) 1999 Andreas Gal</div><div class='add'>+ *  Copyright (c) 2000-2005 Vojtech Pavlik &lt;vojtech@suse.cz&gt;</div><div class='add'>+ *  Copyright (c) 2005 Michael Haboustak &lt;mike-@cinci.rr.com&gt; for Concept2, Inc</div><div class='add'>+ *  Copyright (c) 2006-2007 Jiri Kosina</div><div class='add'>+ *  Copyright (c) 2007 Paul Walmsley</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms of the GNU General Public License as published by the Free</div><div class='add'>+ * Software Foundation; either version 2 of the License, or (at your option)</div><div class='add'>+ * any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef HID_IDS_H_FILE</div><div class='add'>+#define HID_IDS_H_FILE</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_ID_A4TECH		0x09da</div><div class='add'>+#define USB_DEVICE_ID_A4TECH_WCP32PU	0x0006</div><div class='add'>+#define USB_DEVICE_ID_A4TECH_X5_005D	0x000a</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_ID_AASHIMA		0x06d6</div><div class='add'>+#define USB_DEVICE_ID_AASHIMA_GAMEPAD	0x0025</div><div class='add'>+#define USB_DEVICE_ID_AASHIMA_PREDATOR	0x0026</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_ID_ACECAD		0x0460</div><div class='add'>+#define USB_DEVICE_ID_ACECAD_FLAIR	0x0004</div><div class='add'>+#define USB_DEVICE_ID_ACECAD_302	0x0008</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_ID_ADS_TECH 		0x06e1</div><div class='add'>+#define USB_DEVICE_ID_ADS_TECH_RADIO_SI470X	0xa155</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_ID_AFATECH		0x15a4</div><div class='add'>+#define USB_DEVICE_ID_AFATECH_AF9016	0x9016</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_ID_AIPTEK		0x08ca</div><div class='add'>+#define USB_DEVICE_ID_AIPTEK_01		0x0001</div><div class='add'>+#define USB_DEVICE_ID_AIPTEK_10		0x0010</div><div class='add'>+#define USB_DEVICE_ID_AIPTEK_20		0x0020</div><div class='add'>+#define USB_DEVICE_ID_AIPTEK_21		0x0021</div><div class='add'>+#define USB_DEVICE_ID_AIPTEK_22		0x0022</div><div class='add'>+#define USB_DEVICE_ID_AIPTEK_23		0x0023</div><div class='add'>+#define USB_DEVICE_ID_AIPTEK_24		0x0024</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_ID_AIRCABLE		0x16CA</div><div class='add'>+#define USB_DEVICE_ID_AIRCABLE1		0x1502</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_ID_ALCOR		0x058f</div><div class='add'>+#define USB_DEVICE_ID_ALCOR_USBRS232	0x9720</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_ID_ALPS		0x0433</div><div class='add'>+#define USB_DEVICE_ID_IBM_GAMEPAD	0x1101</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_ID_APPLE		0x05ac</div><div class='add'>+#define USB_DEVICE_ID_APPLE_MIGHTYMOUSE	0x0304</div><div class='add'>+#define USB_DEVICE_ID_APPLE_FOUNTAIN_ANSI	0x020e</div><div class='add'>+#define USB_DEVICE_ID_APPLE_FOUNTAIN_ISO	0x020f</div><div class='add'>+#define USB_DEVICE_ID_APPLE_GEYSER_ANSI	0x0214</div><div class='add'>+#define USB_DEVICE_ID_APPLE_GEYSER_ISO	0x0215</div><div class='add'>+#define USB_DEVICE_ID_APPLE_GEYSER_JIS	0x0216</div><div class='add'>+#define USB_DEVICE_ID_APPLE_GEYSER3_ANSI	0x0217</div><div class='add'>+#define USB_DEVICE_ID_APPLE_GEYSER3_ISO	0x0218</div><div class='add'>+#define USB_DEVICE_ID_APPLE_GEYSER3_JIS	0x0219</div><div class='add'>+#define USB_DEVICE_ID_APPLE_GEYSER4_ANSI	0x021a</div><div class='add'>+#define USB_DEVICE_ID_APPLE_GEYSER4_ISO	0x021b</div><div class='add'>+#define USB_DEVICE_ID_APPLE_GEYSER4_JIS	0x021c</div><div class='add'>+#define USB_DEVICE_ID_APPLE_ALU_ANSI	0x0220</div><div class='add'>+#define USB_DEVICE_ID_APPLE_ALU_ISO	0x0221</div><div class='add'>+#define USB_DEVICE_ID_APPLE_ALU_JIS	0x0222</div><div class='add'>+#define USB_DEVICE_ID_APPLE_WELLSPRING_ANSI	0x0223</div><div class='add'>+#define USB_DEVICE_ID_APPLE_WELLSPRING_ISO	0x0224</div><div class='add'>+#define USB_DEVICE_ID_APPLE_WELLSPRING_JIS	0x0225</div><div class='add'>+#define USB_DEVICE_ID_APPLE_GEYSER4_HF_ANSI    0x0229</div><div class='add'>+#define USB_DEVICE_ID_APPLE_GEYSER4_HF_ISO     0x022a</div><div class='add'>+#define USB_DEVICE_ID_APPLE_GEYSER4_HF_JIS     0x022b</div><div class='add'>+#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI  0x022c</div><div class='add'>+#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO   0x022d</div><div class='add'>+#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS   0x022e</div><div class='add'>+#define USB_DEVICE_ID_APPLE_WELLSPRING2_ANSI	0x0230</div><div class='add'>+#define USB_DEVICE_ID_APPLE_WELLSPRING2_ISO	0x0231</div><div class='add'>+#define USB_DEVICE_ID_APPLE_WELLSPRING2_JIS	0x0232</div><div class='add'>+#define USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY	0x030a</div><div class='add'>+#define USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY	0x030b</div><div class='add'>+#define USB_DEVICE_ID_APPLE_ATV_IRCONTROL	0x8241</div><div class='add'>+#define USB_DEVICE_ID_APPLE_IRCONTROL4	0x8242</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_ID_ASUS		0x0b05</div><div class='add'>+#define USB_DEVICE_ID_ASUS_LCM		0x1726</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_ID_ATEN		0x0557</div><div class='add'>+#define USB_DEVICE_ID_ATEN_UC100KM	0x2004</div><div class='add'>+#define USB_DEVICE_ID_ATEN_CS124U	0x2202</div><div class='add'>+#define USB_DEVICE_ID_ATEN_2PORTKVM	0x2204</div><div class='add'>+#define USB_DEVICE_ID_ATEN_4PORTKVM	0x2205</div><div class='add'>+#define USB_DEVICE_ID_ATEN_4PORTKVMC	0x2208</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_ID_AVERMEDIA		0x07ca</div><div class='add'>+#define USB_DEVICE_ID_AVER_FM_MR800	0xb800</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_ID_BELKIN           0x050d</div><div class='add'>+#define USB_DEVICE_ID_FLIP_KVM         0x3201</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_ID_BRIGHT		0x1241</div><div class='add'>+#define USB_DEVICE_ID_BRIGHT_ABNT2	0x1503</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_ID_BERKSHIRE		0x0c98</div><div class='add'>+#define USB_DEVICE_ID_BERKSHIRE_PCWD	0x1140</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_ID_CHERRY		0x046a</div><div class='add'>+#define USB_DEVICE_ID_CHERRY_CYMOTION	0x0023</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_ID_CHIC		0x05fe</div><div class='add'>+#define USB_DEVICE_ID_CHIC_GAMEPAD	0x0014</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_ID_CHICONY		0x04f2</div><div class='add'>+#define USB_DEVICE_ID_CHICONY_TACTICAL_PAD	0x0418</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_ID_CIDC		0x1677</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_ID_CMEDIA		0x0d8c</div><div class='add'>+#define USB_DEVICE_ID_CM109		0x000e</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_ID_CODEMERCS		0x07c0</div><div class='add'>+#define USB_DEVICE_ID_CODEMERCS_IOW_FIRST	0x1500</div><div class='add'>+#define USB_DEVICE_ID_CODEMERCS_IOW_LAST	0x15ff</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_ID_CYGNAL		0x10c4</div><div class='add'>+#define USB_DEVICE_ID_CYGNAL_RADIO_SI470X	0x818a</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_ID_CYPRESS		0x04b4</div><div class='add'>+#define USB_DEVICE_ID_CYPRESS_MOUSE	0x0001</div><div class='add'>+#define USB_DEVICE_ID_CYPRESS_HIDCOM	0x5500</div><div class='add'>+#define USB_DEVICE_ID_CYPRESS_ULTRAMOUSE	0x7417</div><div class='add'>+#define USB_DEVICE_ID_CYPRESS_BARCODE_1	0xde61</div><div class='add'>+#define USB_DEVICE_ID_CYPRESS_BARCODE_2	0xde64</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_ID_DELL		0x413c</div><div class='add'>+#define USB_DEVICE_ID_DELL_W7658	0x2005</div><div class='add'>+#define USB_DEVICE_ID_DELL_SK8115	0x2105</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_ID_DELORME		0x1163</div><div class='add'>+#define USB_DEVICE_ID_DELORME_EARTHMATE 0x0100</div><div class='add'>+#define USB_DEVICE_ID_DELORME_EM_LT20	0x0200</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_ID_DMI		0x0c0b</div><div class='add'>+#define USB_DEVICE_ID_DMI_ENC		0x5fab</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_ID_ELO		0x04E7</div><div class='add'>+#define USB_DEVICE_ID_ELO_TS2700	0x0020</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_ID_ESSENTIAL_REALITY	0x0d7f</div><div class='add'>+#define USB_DEVICE_ID_ESSENTIAL_REALITY_P5 0x0100</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_ID_EZKEY 		0x0518</div><div class='add'>+#define USB_DEVICE_ID_BTC_8193		0x0002</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_ID_GAMERON		0x0810</div><div class='add'>+#define USB_DEVICE_ID_GAMERON_DUAL_PSX_ADAPTOR	0x0001</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_ID_GENERAL_TOUCH	0x0dfc</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_ID_GLAB		0x06c2</div><div class='add'>+#define USB_DEVICE_ID_4_PHIDGETSERVO_30	0x0038</div><div class='add'>+#define USB_DEVICE_ID_1_PHIDGETSERVO_30	0x0039</div><div class='add'>+#define USB_DEVICE_ID_0_0_4_IF_KIT	0x0040</div><div class='add'>+#define USB_DEVICE_ID_0_16_16_IF_KIT	0x0044</div><div class='add'>+#define USB_DEVICE_ID_8_8_8_IF_KIT	0x0045</div><div class='add'>+#define USB_DEVICE_ID_0_8_7_IF_KIT	0x0051</div><div class='add'>+#define USB_DEVICE_ID_0_8_8_IF_KIT	0x0053</div><div class='add'>+#define USB_DEVICE_ID_PHIDGET_MOTORCONTROL	0x0058</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_ID_GOTOP		0x08f2</div><div class='add'>+#define USB_DEVICE_ID_SUPER_Q2		0x007f</div><div class='add'>+#define USB_DEVICE_ID_GOGOPEN		0x00ce</div><div class='add'>+#define USB_DEVICE_ID_PENPOWER		0x00f4</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_ID_GREENASIA		0x0e8f</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_ID_GRETAGMACBETH	0x0971</div><div class='add'>+#define USB_DEVICE_ID_GRETAGMACBETH_HUEY	0x2005</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_ID_GRIFFIN		0x077d</div><div class='add'>+#define USB_DEVICE_ID_POWERMATE		0x0410</div><div class='add'>+#define USB_DEVICE_ID_SOUNDKNOB		0x04AA</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_ID_GTCO		0x078c</div><div class='add'>+#define USB_DEVICE_ID_GTCO_90		0x0090</div><div class='add'>+#define USB_DEVICE_ID_GTCO_100		0x0100</div><div class='add'>+#define USB_DEVICE_ID_GTCO_101		0x0101</div><div class='add'>+#define USB_DEVICE_ID_GTCO_103		0x0103</div><div class='add'>+#define USB_DEVICE_ID_GTCO_104		0x0104</div><div class='add'>+#define USB_DEVICE_ID_GTCO_105		0x0105</div><div class='add'>+#define USB_DEVICE_ID_GTCO_106		0x0106</div><div class='add'>+#define USB_DEVICE_ID_GTCO_107		0x0107</div><div class='add'>+#define USB_DEVICE_ID_GTCO_108		0x0108</div><div class='add'>+#define USB_DEVICE_ID_GTCO_200		0x0200</div><div class='add'>+#define USB_DEVICE_ID_GTCO_201		0x0201</div><div class='add'>+#define USB_DEVICE_ID_GTCO_202		0x0202</div><div class='add'>+#define USB_DEVICE_ID_GTCO_203		0x0203</div><div class='add'>+#define USB_DEVICE_ID_GTCO_204		0x0204</div><div class='add'>+#define USB_DEVICE_ID_GTCO_205		0x0205</div><div class='add'>+#define USB_DEVICE_ID_GTCO_206		0x0206</div><div class='add'>+#define USB_DEVICE_ID_GTCO_207		0x0207</div><div class='add'>+#define USB_DEVICE_ID_GTCO_300		0x0300</div><div class='add'>+#define USB_DEVICE_ID_GTCO_301		0x0301</div><div class='add'>+#define USB_DEVICE_ID_GTCO_302		0x0302</div><div class='add'>+#define USB_DEVICE_ID_GTCO_303		0x0303</div><div class='add'>+#define USB_DEVICE_ID_GTCO_304		0x0304</div><div class='add'>+#define USB_DEVICE_ID_GTCO_305		0x0305</div><div class='add'>+#define USB_DEVICE_ID_GTCO_306		0x0306</div><div class='add'>+#define USB_DEVICE_ID_GTCO_307		0x0307</div><div class='add'>+#define USB_DEVICE_ID_GTCO_308		0x0308</div><div class='add'>+#define USB_DEVICE_ID_GTCO_309		0x0309</div><div class='add'>+#define USB_DEVICE_ID_GTCO_400		0x0400</div><div class='add'>+#define USB_DEVICE_ID_GTCO_401		0x0401</div><div class='add'>+#define USB_DEVICE_ID_GTCO_402		0x0402</div><div class='add'>+#define USB_DEVICE_ID_GTCO_403		0x0403</div><div class='add'>+#define USB_DEVICE_ID_GTCO_404		0x0404</div><div class='add'>+#define USB_DEVICE_ID_GTCO_405		0x0405</div><div class='add'>+#define USB_DEVICE_ID_GTCO_500		0x0500</div><div class='add'>+#define USB_DEVICE_ID_GTCO_501		0x0501</div><div class='add'>+#define USB_DEVICE_ID_GTCO_502		0x0502</div><div class='add'>+#define USB_DEVICE_ID_GTCO_503		0x0503</div><div class='add'>+#define USB_DEVICE_ID_GTCO_504		0x0504</div><div class='add'>+#define USB_DEVICE_ID_GTCO_1000		0x1000</div><div class='add'>+#define USB_DEVICE_ID_GTCO_1001		0x1001</div><div class='add'>+#define USB_DEVICE_ID_GTCO_1002		0x1002</div><div class='add'>+#define USB_DEVICE_ID_GTCO_1003		0x1003</div><div class='add'>+#define USB_DEVICE_ID_GTCO_1004		0x1004</div><div class='add'>+#define USB_DEVICE_ID_GTCO_1005		0x1005</div><div class='add'>+#define USB_DEVICE_ID_GTCO_1006		0x1006</div><div class='add'>+#define USB_DEVICE_ID_GTCO_1007		0x1007</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_ID_GYRATION		0x0c16</div><div class='add'>+#define USB_DEVICE_ID_GYRATION_REMOTE	0x0002</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_ID_HAPP		0x078b</div><div class='add'>+#define USB_DEVICE_ID_UGCI_DRIVING	0x0010</div><div class='add'>+#define USB_DEVICE_ID_UGCI_FLYING	0x0020</div><div class='add'>+#define USB_DEVICE_ID_UGCI_FIGHTING	0x0030</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_ID_IMATION		0x0718</div><div class='add'>+#define USB_DEVICE_ID_DISC_STAKKA	0xd000</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_ID_KBGEAR		0x084e</div><div class='add'>+#define USB_DEVICE_ID_KBGEAR_JAMSTUDIO	0x1001</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_ID_LABTEC		0x1020</div><div class='add'>+#define USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD	0x0006</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_ID_LD		0x0f11</div><div class='add'>+#define USB_DEVICE_ID_LD_CASSY		0x1000</div><div class='add'>+#define USB_DEVICE_ID_LD_POCKETCASSY	0x1010</div><div class='add'>+#define USB_DEVICE_ID_LD_MOBILECASSY	0x1020</div><div class='add'>+#define USB_DEVICE_ID_LD_JWM		0x1080</div><div class='add'>+#define USB_DEVICE_ID_LD_DMMP		0x1081</div><div class='add'>+#define USB_DEVICE_ID_LD_UMIP		0x1090</div><div class='add'>+#define USB_DEVICE_ID_LD_XRAY1		0x1100</div><div class='add'>+#define USB_DEVICE_ID_LD_XRAY2		0x1101</div><div class='add'>+#define USB_DEVICE_ID_LD_VIDEOCOM	0x1200</div><div class='add'>+#define USB_DEVICE_ID_LD_COM3LAB	0x2000</div><div class='add'>+#define USB_DEVICE_ID_LD_TELEPORT	0x2010</div><div class='add'>+#define USB_DEVICE_ID_LD_NETWORKANALYSER 0x2020</div><div class='add'>+#define USB_DEVICE_ID_LD_POWERCONTROL	0x2030</div><div class='add'>+#define USB_DEVICE_ID_LD_MACHINETEST	0x2040</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_ID_LOGITECH		0x046d</div><div class='add'>+#define USB_DEVICE_ID_LOGITECH_LX3	0xc044</div><div class='add'>+#define USB_DEVICE_ID_LOGITECH_V150	0xc047</div><div class='add'>+#define USB_DEVICE_ID_LOGITECH_RECEIVER	0xc101</div><div class='add'>+#define USB_DEVICE_ID_LOGITECH_HARMONY_FIRST  0xc110</div><div class='add'>+#define USB_DEVICE_ID_LOGITECH_HARMONY_LAST 0xc14f</div><div class='add'>+#define USB_DEVICE_ID_LOGITECH_RUMBLEPAD	0xc211</div><div class='add'>+#define USB_DEVICE_ID_LOGITECH_EXTREME_3D	0xc215</div><div class='add'>+#define USB_DEVICE_ID_LOGITECH_RUMBLEPAD2	0xc218</div><div class='add'>+#define USB_DEVICE_ID_LOGITECH_RUMBLEPAD2_2	0xc219</div><div class='add'>+#define USB_DEVICE_ID_LOGITECH_WINGMAN_F3D	0xc283</div><div class='add'>+#define USB_DEVICE_ID_LOGITECH_FORCE3D_PRO	0xc286</div><div class='add'>+#define USB_DEVICE_ID_LOGITECH_WHEEL	0xc294</div><div class='add'>+#define USB_DEVICE_ID_LOGITECH_MOMO_WHEEL	0xc295</div><div class='add'>+#define USB_DEVICE_ID_LOGITECH_ELITE_KBD	0xc30a</div><div class='add'>+#define USB_DEVICE_ID_LOGITECH_KBD	0xc311</div><div class='add'>+#define USB_DEVICE_ID_S510_RECEIVER	0xc50c</div><div class='add'>+#define USB_DEVICE_ID_S510_RECEIVER_2	0xc517</div><div class='add'>+#define USB_DEVICE_ID_LOGITECH_CORDLESS_DESKTOP_LX500	0xc512</div><div class='add'>+#define USB_DEVICE_ID_MX3000_RECEIVER	0xc513</div><div class='add'>+#define USB_DEVICE_ID_DINOVO_DESKTOP	0xc704</div><div class='add'>+#define USB_DEVICE_ID_DINOVO_EDGE	0xc714</div><div class='add'>+#define USB_DEVICE_ID_DINOVO_MINI	0xc71f</div><div class='add'>+#define USB_DEVICE_ID_LOGITECH_MOMO_WHEEL2	0xca03</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_ID_MCC		0x09db</div><div class='add'>+#define USB_DEVICE_ID_MCC_PMD1024LS	0x0076</div><div class='add'>+#define USB_DEVICE_ID_MCC_PMD1208LS	0x007a</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_ID_MGE		0x0463</div><div class='add'>+#define USB_DEVICE_ID_MGE_UPS		0xffff</div><div class='add'>+#define USB_DEVICE_ID_MGE_UPS1		0x0001</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_ID_MICROCHIP		0x04d8</div><div class='add'>+#define USB_DEVICE_ID_PICKIT1		0x0032</div><div class='add'>+#define USB_DEVICE_ID_PICKIT2		0x0033</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_ID_MICROSOFT		0x045e</div><div class='add'>+#define USB_DEVICE_ID_SIDEWINDER_GV	0x003b</div><div class='add'>+#define USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0 0x009d</div><div class='add'>+#define USB_DEVICE_ID_MS_NE4K		0x00db</div><div class='add'>+#define USB_DEVICE_ID_MS_LK6K		0x00f9</div><div class='add'>+#define USB_DEVICE_ID_MS_PRESENTER_8K_BT	0x0701</div><div class='add'>+#define USB_DEVICE_ID_MS_PRESENTER_8K_USB	0x0713</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_ID_MONTEREY		0x0566</div><div class='add'>+#define USB_DEVICE_ID_GENIUS_KB29E	0x3004</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_ID_NCR		0x0404</div><div class='add'>+#define USB_DEVICE_ID_NCR_FIRST		0x0300</div><div class='add'>+#define USB_DEVICE_ID_NCR_LAST		0x03ff</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_ID_NATIONAL_SEMICONDUCTOR 0x0400</div><div class='add'>+#define USB_DEVICE_ID_N_S_HARMONY       0xc359</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_ID_NATSU             0x08b7</div><div class='add'>+#define USB_DEVICE_ID_NATSU_GAMEPAD     0x0001</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_ID_NEC		0x073e</div><div class='add'>+#define USB_DEVICE_ID_NEC_USB_GAME_PAD	0x0301</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_ID_ONTRAK		0x0a07</div><div class='add'>+#define USB_DEVICE_ID_ONTRAK_ADU100	0x0064</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_ID_PANJIT		0x134c</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_ID_PANTHERLORD	0x0810</div><div class='add'>+#define USB_DEVICE_ID_PANTHERLORD_TWIN_USB_JOYSTICK	0x0001</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_ID_PETALYNX		0x18b1</div><div class='add'>+#define USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE	0x0037</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_ID_PLAYDOTCOM	0x0b43</div><div class='add'>+#define USB_DEVICE_ID_PLAYDOTCOM_EMS_USBII	0x0003</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_ID_SAITEK		0x06a3</div><div class='add'>+#define USB_DEVICE_ID_SAITEK_RUMBLEPAD	0xff17</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_ID_SAMSUNG		0x0419</div><div class='add'>+#define USB_DEVICE_ID_SAMSUNG_IR_REMOTE	0x0001</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_ID_SONY			0x054c</div><div class='add'>+#define USB_DEVICE_ID_SONY_PS3_CONTROLLER	0x0268</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_ID_SOUNDGRAPH	0x15c2</div><div class='add'>+#define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD	0x0038</div><div class='add'>+#define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD2	0x0036</div><div class='add'>+#define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD3	0x0034</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_ID_SUN		0x0430</div><div class='add'>+#define USB_DEVICE_ID_RARITAN_KVM_DONGLE	0xcdab</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_ID_SUNPLUS		0x04fc</div><div class='add'>+#define USB_DEVICE_ID_SUNPLUS_WDESKTOP	0x05d8</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_ID_TENX		0x1130</div><div class='add'>+#define USB_DEVICE_ID_TENX_IBUDDY1	0x0001</div><div class='add'>+#define USB_DEVICE_ID_TENX_IBUDDY2	0x0002</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_ID_THRUSTMASTER	0x044f</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_ID_TOPMAX		0x0663</div><div class='add'>+#define USB_DEVICE_ID_TOPMAX_COBRAPAD	0x0103</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_ID_TURBOX		0x062a</div><div class='add'>+#define USB_DEVICE_ID_TURBOX_KEYBOARD	0x0201</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_ID_VERNIER		0x08f7</div><div class='add'>+#define USB_DEVICE_ID_VERNIER_LABPRO	0x0001</div><div class='add'>+#define USB_DEVICE_ID_VERNIER_GOTEMP	0x0002</div><div class='add'>+#define USB_DEVICE_ID_VERNIER_SKIP	0x0003</div><div class='add'>+#define USB_DEVICE_ID_VERNIER_CYCLOPS	0x0004</div><div class='add'>+#define USB_DEVICE_ID_VERNIER_LCSPEC	0x0006</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_ID_WACOM		0x056a</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_ID_WISEGROUP		0x0925</div><div class='add'>+#define USB_DEVICE_ID_1_PHIDGETSERVO_20	0x8101</div><div class='add'>+#define USB_DEVICE_ID_4_PHIDGETSERVO_20	0x8104</div><div class='add'>+#define USB_DEVICE_ID_8_8_4_IF_KIT	0x8201</div><div class='add'>+#define USB_DEVICE_ID_QUAD_USB_JOYPAD	0x8800</div><div class='add'>+#define USB_DEVICE_ID_DUAL_USB_JOYPAD	0x8866</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_ID_WISEGROUP_LTD	0x6666</div><div class='add'>+#define USB_VENDOR_ID_WISEGROUP_LTD2	0x6677</div><div class='add'>+#define USB_DEVICE_ID_SMARTJOY_DUAL_PLUS 0x8802</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_ID_YEALINK		0x6993</div><div class='add'>+#define USB_DEVICE_ID_YEALINK_P1K_P4K_B2K	0xb001</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_ID_ZEROPLUS		0x0c12</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_ID_KYE		0x0458</div><div class='add'>+#define USB_DEVICE_ID_KYE_GPEN_560	0x5003</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/hid/hid-input-quirks.c b/drivers/hid/hid-input-quirks.c<br/>deleted file mode 100644<br/>index 16feea014494..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hid/hid-input-quirks.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/hid/hid-input-quirks.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,484 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  HID-input usage mapping quirks</div><div class='del'>- *</div><div class='del'>- *  This is used to handle HID-input mappings for devices violating</div><div class='del'>- *  HUT 1.12 specification.</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2007-2008 Jiri Kosina</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This program is free software; you can redistribute it and/or modify it</div><div class='del'>- * under the terms of the GNU General Public License as published by the Free</div><div class='del'>- * Software Foundation; either version 2 of the License</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/input.h&gt;</div><div class='del'>-#include &lt;linux/hid.h&gt;</div><div class='del'>-</div><div class='del'>-#define map_abs(c)      do { usage-&gt;code = c; usage-&gt;type = EV_ABS; *bit = input-&gt;absbit; *max = ABS_MAX; } while (0)</div><div class='del'>-#define map_rel(c)      do { usage-&gt;code = c; usage-&gt;type = EV_REL; *bit = input-&gt;relbit; *max = REL_MAX; } while (0)</div><div class='del'>-#define map_key(c)      do { usage-&gt;code = c; usage-&gt;type = EV_KEY; *bit = input-&gt;keybit; *max = KEY_MAX; } while (0)</div><div class='del'>-#define map_led(c)      do { usage-&gt;code = c; usage-&gt;type = EV_LED; *bit = input-&gt;ledbit; *max = LED_MAX; } while (0)</div><div class='del'>-</div><div class='del'>-#define map_abs_clear(c)        do { map_abs(c); clear_bit(c, *bit); } while (0)</div><div class='del'>-#define map_key_clear(c)        do { map_key(c); clear_bit(c, *bit); } while (0)</div><div class='del'>-</div><div class='del'>-static int quirk_belkin_wkbd(struct hid_usage *usage, struct input_dev *input,</div><div class='del'>-			      unsigned long **bit, int *max)</div><div class='del'>-{</div><div class='del'>-	if ((usage-&gt;hid &amp; HID_USAGE_PAGE) != HID_UP_CONSUMER)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	switch (usage-&gt;hid &amp; HID_USAGE) {</div><div class='del'>-		case 0x03a: map_key_clear(KEY_SOUND);		break;</div><div class='del'>-		case 0x03b: map_key_clear(KEY_CAMERA);		break;</div><div class='del'>-		case 0x03c: map_key_clear(KEY_DOCUMENTS);	break;</div><div class='del'>-		default:</div><div class='del'>-			return 0;</div><div class='del'>-	}</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int quirk_cherry_cymotion(struct hid_usage *usage, struct input_dev *input,</div><div class='del'>-			      unsigned long **bit, int *max)</div><div class='del'>-{</div><div class='del'>-	if ((usage-&gt;hid &amp; HID_USAGE_PAGE) != HID_UP_CONSUMER)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	switch (usage-&gt;hid &amp; HID_USAGE) {</div><div class='del'>-		case 0x301: map_key_clear(KEY_PROG1);		break;</div><div class='del'>-		case 0x302: map_key_clear(KEY_PROG2);		break;</div><div class='del'>-		case 0x303: map_key_clear(KEY_PROG3);		break;</div><div class='del'>-		default:</div><div class='del'>-			return 0;</div><div class='del'>-	}</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int quirk_logitech_ultrax_remote(struct hid_usage *usage, struct input_dev *input,</div><div class='del'>-			      unsigned long **bit, int *max)</div><div class='del'>-{</div><div class='del'>-	if ((usage-&gt;hid &amp; HID_USAGE_PAGE) != HID_UP_LOGIVENDOR)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	set_bit(EV_REP, input-&gt;evbit);</div><div class='del'>-	switch(usage-&gt;hid &amp; HID_USAGE) {</div><div class='del'>-		/* Reported on Logitech Ultra X Media Remote */</div><div class='del'>-		case 0x004: map_key_clear(KEY_AGAIN);		break;</div><div class='del'>-		case 0x00d: map_key_clear(KEY_HOME);		break;</div><div class='del'>-		case 0x024: map_key_clear(KEY_SHUFFLE);		break;</div><div class='del'>-		case 0x025: map_key_clear(KEY_TV);		break;</div><div class='del'>-		case 0x026: map_key_clear(KEY_MENU);		break;</div><div class='del'>-		case 0x031: map_key_clear(KEY_AUDIO);		break;</div><div class='del'>-		case 0x032: map_key_clear(KEY_TEXT);		break;</div><div class='del'>-		case 0x033: map_key_clear(KEY_LAST);		break;</div><div class='del'>-		case 0x047: map_key_clear(KEY_MP3);		break;</div><div class='del'>-		case 0x048: map_key_clear(KEY_DVD);		break;</div><div class='del'>-		case 0x049: map_key_clear(KEY_MEDIA);		break;</div><div class='del'>-		case 0x04a: map_key_clear(KEY_VIDEO);		break;</div><div class='del'>-		case 0x04b: map_key_clear(KEY_ANGLE);		break;</div><div class='del'>-		case 0x04c: map_key_clear(KEY_LANGUAGE);	break;</div><div class='del'>-		case 0x04d: map_key_clear(KEY_SUBTITLE);	break;</div><div class='del'>-		case 0x051: map_key_clear(KEY_RED);		break;</div><div class='del'>-		case 0x052: map_key_clear(KEY_CLOSE);		break;</div><div class='del'>-</div><div class='del'>-		default:</div><div class='del'>-			return 0;</div><div class='del'>-	}</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int quirk_gyration_remote(struct hid_usage *usage, struct input_dev *input,</div><div class='del'>-			      unsigned long **bit, int *max)</div><div class='del'>-{</div><div class='del'>-	if ((usage-&gt;hid &amp; HID_USAGE_PAGE) != HID_UP_LOGIVENDOR)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	set_bit(EV_REP, input-&gt;evbit);</div><div class='del'>-	switch(usage-&gt;hid &amp; HID_USAGE) {</div><div class='del'>-		/* Reported on Gyration MCE Remote */</div><div class='del'>-		case 0x00d: map_key_clear(KEY_HOME);		break;</div><div class='del'>-		case 0x024: map_key_clear(KEY_DVD);		break;</div><div class='del'>-		case 0x025: map_key_clear(KEY_PVR);		break;</div><div class='del'>-		case 0x046: map_key_clear(KEY_MEDIA);		break;</div><div class='del'>-		case 0x047: map_key_clear(KEY_MP3);		break;</div><div class='del'>-		case 0x049: map_key_clear(KEY_CAMERA);		break;</div><div class='del'>-		case 0x04a: map_key_clear(KEY_VIDEO);		break;</div><div class='del'>-</div><div class='del'>-		default:</div><div class='del'>-			return 0;</div><div class='del'>-	}</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int quirk_chicony_tactical_pad(struct hid_usage *usage, struct input_dev *input,</div><div class='del'>-			      unsigned long **bit, int *max)</div><div class='del'>-{</div><div class='del'>-	if ((usage-&gt;hid &amp; HID_USAGE_PAGE) != HID_UP_MSVENDOR)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	set_bit(EV_REP, input-&gt;evbit);</div><div class='del'>-	switch (usage-&gt;hid &amp; HID_USAGE) {</div><div class='del'>-		case 0xff01: map_key_clear(BTN_1);		break;</div><div class='del'>-		case 0xff02: map_key_clear(BTN_2);		break;</div><div class='del'>-		case 0xff03: map_key_clear(BTN_3);		break;</div><div class='del'>-		case 0xff04: map_key_clear(BTN_4);		break;</div><div class='del'>-		case 0xff05: map_key_clear(BTN_5);		break;</div><div class='del'>-		case 0xff06: map_key_clear(BTN_6);		break;</div><div class='del'>-		case 0xff07: map_key_clear(BTN_7);		break;</div><div class='del'>-		case 0xff08: map_key_clear(BTN_8);		break;</div><div class='del'>-		case 0xff09: map_key_clear(BTN_9);		break;</div><div class='del'>-		case 0xff0a: map_key_clear(BTN_A);		break;</div><div class='del'>-		case 0xff0b: map_key_clear(BTN_B);		break;</div><div class='del'>-		default:</div><div class='del'>-			return 0;</div><div class='del'>-	}</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int quirk_microsoft_ergonomy_kb(struct hid_usage *usage, struct input_dev *input,</div><div class='del'>-			      unsigned long **bit, int *max)</div><div class='del'>-{</div><div class='del'>-	if ((usage-&gt;hid &amp; HID_USAGE_PAGE) != HID_UP_MSVENDOR)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	switch(usage-&gt;hid &amp; HID_USAGE) {</div><div class='del'>-		case 0xfd06: map_key_clear(KEY_CHAT);		break;</div><div class='del'>-		case 0xfd07: map_key_clear(KEY_PHONE);		break;</div><div class='del'>-		case 0xff05:</div><div class='del'>-			set_bit(EV_REP, input-&gt;evbit);</div><div class='del'>-			map_key_clear(KEY_F13);</div><div class='del'>-			set_bit(KEY_F14, input-&gt;keybit);</div><div class='del'>-			set_bit(KEY_F15, input-&gt;keybit);</div><div class='del'>-			set_bit(KEY_F16, input-&gt;keybit);</div><div class='del'>-			set_bit(KEY_F17, input-&gt;keybit);</div><div class='del'>-			set_bit(KEY_F18, input-&gt;keybit);</div><div class='del'>-		default:</div><div class='del'>-			return 0;</div><div class='del'>-	}</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int quirk_microsoft_presenter_8k(struct hid_usage *usage, struct input_dev *input,</div><div class='del'>-			      unsigned long **bit, int *max)</div><div class='del'>-{</div><div class='del'>-	if ((usage-&gt;hid &amp; HID_USAGE_PAGE) != HID_UP_MSVENDOR)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	set_bit(EV_REP, input-&gt;evbit);</div><div class='del'>-	switch(usage-&gt;hid &amp; HID_USAGE) {</div><div class='del'>-		case 0xfd08: map_key_clear(KEY_FORWARD);	break;</div><div class='del'>-		case 0xfd09: map_key_clear(KEY_BACK);		break;</div><div class='del'>-		case 0xfd0b: map_key_clear(KEY_PLAYPAUSE);	break;</div><div class='del'>-		case 0xfd0e: map_key_clear(KEY_CLOSE);		break;</div><div class='del'>-		case 0xfd0f: map_key_clear(KEY_PLAY);		break;</div><div class='del'>-		default:</div><div class='del'>-			return 0;</div><div class='del'>-	}</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int quirk_petalynx_remote(struct hid_usage *usage, struct input_dev *input,</div><div class='del'>-			      unsigned long **bit, int *max)</div><div class='del'>-{</div><div class='del'>-	if (((usage-&gt;hid &amp; HID_USAGE_PAGE) != HID_UP_LOGIVENDOR) &amp;&amp;</div><div class='del'>-			((usage-&gt;hid &amp; HID_USAGE_PAGE) != HID_UP_CONSUMER))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if ((usage-&gt;hid &amp; HID_USAGE_PAGE) == HID_UP_LOGIVENDOR)</div><div class='del'>-		switch(usage-&gt;hid &amp; HID_USAGE) {</div><div class='del'>-			case 0x05a: map_key_clear(KEY_TEXT);		break;</div><div class='del'>-			case 0x05b: map_key_clear(KEY_RED);		break;</div><div class='del'>-			case 0x05c: map_key_clear(KEY_GREEN);		break;</div><div class='del'>-			case 0x05d: map_key_clear(KEY_YELLOW);		break;</div><div class='del'>-			case 0x05e: map_key_clear(KEY_BLUE);		break;</div><div class='del'>-			default:</div><div class='del'>-				return 0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	if ((usage-&gt;hid &amp; HID_USAGE_PAGE) == HID_UP_CONSUMER)</div><div class='del'>-		switch(usage-&gt;hid &amp; HID_USAGE) {</div><div class='del'>-			case 0x0f6: map_key_clear(KEY_NEXT);            break;</div><div class='del'>-			case 0x0fa: map_key_clear(KEY_BACK);            break;</div><div class='del'>-			default:</div><div class='del'>-				return 0;</div><div class='del'>-		}</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int quirk_logitech_wireless(struct hid_usage *usage, struct input_dev *input,</div><div class='del'>-			      unsigned long **bit, int *max)</div><div class='del'>-{</div><div class='del'>-	if ((usage-&gt;hid &amp; HID_USAGE_PAGE) != HID_UP_CONSUMER)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	switch (usage-&gt;hid &amp; HID_USAGE) {</div><div class='del'>-		case 0x1001: map_key_clear(KEY_MESSENGER);	break;</div><div class='del'>-		case 0x1003: map_key_clear(KEY_SOUND);		break;</div><div class='del'>-		case 0x1004: map_key_clear(KEY_VIDEO);		break;</div><div class='del'>-		case 0x1005: map_key_clear(KEY_AUDIO);		break;</div><div class='del'>-		case 0x100a: map_key_clear(KEY_DOCUMENTS);	break;</div><div class='del'>-		case 0x1011: map_key_clear(KEY_PREVIOUSSONG);	break;</div><div class='del'>-		case 0x1012: map_key_clear(KEY_NEXTSONG);	break;</div><div class='del'>-		case 0x1013: map_key_clear(KEY_CAMERA);		break;</div><div class='del'>-		case 0x1014: map_key_clear(KEY_MESSENGER);	break;</div><div class='del'>-		case 0x1015: map_key_clear(KEY_RECORD);		break;</div><div class='del'>-		case 0x1016: map_key_clear(KEY_PLAYER);		break;</div><div class='del'>-		case 0x1017: map_key_clear(KEY_EJECTCD);	break;</div><div class='del'>-		case 0x1018: map_key_clear(KEY_MEDIA);		break;</div><div class='del'>-		case 0x1019: map_key_clear(KEY_PROG1);		break;</div><div class='del'>-		case 0x101a: map_key_clear(KEY_PROG2);		break;</div><div class='del'>-		case 0x101b: map_key_clear(KEY_PROG3);		break;</div><div class='del'>-		case 0x101f: map_key_clear(KEY_ZOOMIN);		break;</div><div class='del'>-		case 0x1020: map_key_clear(KEY_ZOOMOUT);	break;</div><div class='del'>-		case 0x1021: map_key_clear(KEY_ZOOMRESET);	break;</div><div class='del'>-		case 0x1023: map_key_clear(KEY_CLOSE);		break;</div><div class='del'>-		case 0x1027: map_key_clear(KEY_MENU);		break;</div><div class='del'>-		/* this one is marked as 'Rotate' */</div><div class='del'>-		case 0x1028: map_key_clear(KEY_ANGLE);		break;</div><div class='del'>-		case 0x1029: map_key_clear(KEY_SHUFFLE);	break;</div><div class='del'>-		case 0x102a: map_key_clear(KEY_BACK);		break;</div><div class='del'>-		case 0x102b: map_key_clear(KEY_CYCLEWINDOWS);	break;</div><div class='del'>-		case 0x1041: map_key_clear(KEY_BATTERY);	break;</div><div class='del'>-		case 0x1042: map_key_clear(KEY_WORDPROCESSOR);	break;</div><div class='del'>-		case 0x1043: map_key_clear(KEY_SPREADSHEET);	break;</div><div class='del'>-		case 0x1044: map_key_clear(KEY_PRESENTATION);	break;</div><div class='del'>-		case 0x1045: map_key_clear(KEY_UNDO);		break;</div><div class='del'>-		case 0x1046: map_key_clear(KEY_REDO);		break;</div><div class='del'>-		case 0x1047: map_key_clear(KEY_PRINT);		break;</div><div class='del'>-		case 0x1048: map_key_clear(KEY_SAVE);		break;</div><div class='del'>-		case 0x1049: map_key_clear(KEY_PROG1);		break;</div><div class='del'>-		case 0x104a: map_key_clear(KEY_PROG2);		break;</div><div class='del'>-		case 0x104b: map_key_clear(KEY_PROG3);		break;</div><div class='del'>-		case 0x104c: map_key_clear(KEY_PROG4);		break;</div><div class='del'>-</div><div class='del'>-		default:</div><div class='del'>-			return 0;</div><div class='del'>-	}</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int quirk_cherry_genius_29e(struct hid_usage *usage, struct input_dev *input,</div><div class='del'>-			      unsigned long **bit, int *max)</div><div class='del'>-{</div><div class='del'>-	if ((usage-&gt;hid &amp; HID_USAGE_PAGE) != HID_UP_CONSUMER)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	switch (usage-&gt;hid &amp; HID_USAGE) {</div><div class='del'>-		case 0x156: map_key_clear(KEY_WORDPROCESSOR);	break;</div><div class='del'>-		case 0x157: map_key_clear(KEY_SPREADSHEET);	break;</div><div class='del'>-		case 0x158: map_key_clear(KEY_PRESENTATION);	break;</div><div class='del'>-		case 0x15c: map_key_clear(KEY_STOP);		break;</div><div class='del'>-</div><div class='del'>-		default:</div><div class='del'>-			return 0;</div><div class='del'>-	}</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int quirk_btc_8193(struct hid_usage *usage, struct input_dev *input,</div><div class='del'>-			      unsigned long **bit, int *max)</div><div class='del'>-{</div><div class='del'>-	if ((usage-&gt;hid &amp; HID_USAGE_PAGE) != HID_UP_CONSUMER)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	switch (usage-&gt;hid &amp; HID_USAGE) {</div><div class='del'>-		case 0x230: map_key(BTN_MOUSE);			break;</div><div class='del'>-		case 0x231: map_rel(REL_WHEEL);			break;</div><div class='del'>-		/* </div><div class='del'>-		 * this keyboard has a scrollwheel implemented in</div><div class='del'>-		 * totally broken way. We map this usage temporarily</div><div class='del'>-		 * to HWHEEL and handle it in the event quirk handler</div><div class='del'>-		 */</div><div class='del'>-		case 0x232: map_rel(REL_HWHEEL);		break;</div><div class='del'>-</div><div class='del'>-		default:</div><div class='del'>-			return 0;</div><div class='del'>-	}</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int quirk_sunplus_wdesktop(struct hid_usage *usage, struct input_dev *input,</div><div class='del'>-			      unsigned long **bit, int *max)</div><div class='del'>-{</div><div class='del'>-	if ((usage-&gt;hid &amp; HID_USAGE_PAGE) != HID_UP_CONSUMER)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	switch (usage-&gt;hid &amp; HID_USAGE) {</div><div class='del'>-		case 0x2003: map_key_clear(KEY_ZOOMIN);		break;</div><div class='del'>-		case 0x2103: map_key_clear(KEY_ZOOMOUT);	break;</div><div class='del'>-		default:</div><div class='del'>-			return 0;</div><div class='del'>-	}</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define VENDOR_ID_BELKIN			0x1020</div><div class='del'>-#define DEVICE_ID_BELKIN_WIRELESS_KEYBOARD	0x0006</div><div class='del'>-</div><div class='del'>-#define VENDOR_ID_CHERRY			0x046a</div><div class='del'>-#define DEVICE_ID_CHERRY_CYMOTION		0x0023</div><div class='del'>-</div><div class='del'>-#define VENDOR_ID_CHICONY			0x04f2</div><div class='del'>-#define DEVICE_ID_CHICONY_TACTICAL_PAD		0x0418</div><div class='del'>-</div><div class='del'>-#define VENDOR_ID_EZKEY				0x0518</div><div class='del'>-#define DEVICE_ID_BTC_8193			0x0002</div><div class='del'>-</div><div class='del'>-#define VENDOR_ID_GYRATION			0x0c16</div><div class='del'>-#define DEVICE_ID_GYRATION_REMOTE		0x0002</div><div class='del'>-</div><div class='del'>-#define VENDOR_ID_LOGITECH			0x046d</div><div class='del'>-#define DEVICE_ID_LOGITECH_RECEIVER		0xc101</div><div class='del'>-#define DEVICE_ID_S510_RECEIVER			0xc50c</div><div class='del'>-#define DEVICE_ID_S510_RECEIVER_2		0xc517</div><div class='del'>-#define DEVICE_ID_MX3000_RECEIVER		0xc513</div><div class='del'>-</div><div class='del'>-#define VENDOR_ID_MICROSOFT			0x045e</div><div class='del'>-#define DEVICE_ID_MS4K				0x00db</div><div class='del'>-#define DEVICE_ID_MS6K				0x00f9</div><div class='del'>-#define DEVICE_IS_MS_PRESENTER_8K_BT		0x0701</div><div class='del'>-#define DEVICE_ID_MS_PRESENTER_8K_USB		0x0713</div><div class='del'>-</div><div class='del'>-#define VENDOR_ID_MONTEREY			0x0566</div><div class='del'>-#define DEVICE_ID_GENIUS_KB29E			0x3004</div><div class='del'>-</div><div class='del'>-#define VENDOR_ID_PETALYNX			0x18b1</div><div class='del'>-#define DEVICE_ID_PETALYNX_MAXTER_REMOTE	0x0037</div><div class='del'>-</div><div class='del'>-#define VENDOR_ID_SUNPLUS			0x04fc</div><div class='del'>-#define DEVICE_ID_SUNPLUS_WDESKTOP		0x05d8</div><div class='del'>-</div><div class='del'>-static const struct hid_input_blacklist {</div><div class='del'>-	__u16 idVendor;</div><div class='del'>-	__u16 idProduct;</div><div class='del'>-	int (*quirk)(struct hid_usage *, struct input_dev *, unsigned long **, int *);</div><div class='del'>-} hid_input_blacklist[] = {</div><div class='del'>-	{ VENDOR_ID_BELKIN, DEVICE_ID_BELKIN_WIRELESS_KEYBOARD, quirk_belkin_wkbd },</div><div class='del'>-</div><div class='del'>-	{ VENDOR_ID_CHERRY, DEVICE_ID_CHERRY_CYMOTION, quirk_cherry_cymotion },</div><div class='del'>-</div><div class='del'>-	{ VENDOR_ID_CHICONY, DEVICE_ID_CHICONY_TACTICAL_PAD, quirk_chicony_tactical_pad },</div><div class='del'>-</div><div class='del'>-	{ VENDOR_ID_EZKEY, DEVICE_ID_BTC_8193, quirk_btc_8193 },</div><div class='del'>-</div><div class='del'>-	{ VENDOR_ID_GYRATION, DEVICE_ID_GYRATION_REMOTE, quirk_gyration_remote },</div><div class='del'>-</div><div class='del'>-	{ VENDOR_ID_LOGITECH, DEVICE_ID_LOGITECH_RECEIVER, quirk_logitech_ultrax_remote },</div><div class='del'>-	{ VENDOR_ID_LOGITECH, DEVICE_ID_S510_RECEIVER, quirk_logitech_wireless },</div><div class='del'>-	{ VENDOR_ID_LOGITECH, DEVICE_ID_S510_RECEIVER_2, quirk_logitech_wireless },</div><div class='del'>-	{ VENDOR_ID_LOGITECH, DEVICE_ID_MX3000_RECEIVER, quirk_logitech_wireless },</div><div class='del'>-</div><div class='del'>-	{ VENDOR_ID_MICROSOFT, DEVICE_ID_MS4K, quirk_microsoft_ergonomy_kb },</div><div class='del'>-	{ VENDOR_ID_MICROSOFT, DEVICE_ID_MS6K, quirk_microsoft_ergonomy_kb },</div><div class='del'>-	{ VENDOR_ID_MICROSOFT, DEVICE_IS_MS_PRESENTER_8K_BT, quirk_microsoft_presenter_8k },</div><div class='del'>-	{ VENDOR_ID_MICROSOFT, DEVICE_ID_MS_PRESENTER_8K_USB, quirk_microsoft_presenter_8k },</div><div class='del'>-</div><div class='del'>-	{ VENDOR_ID_MONTEREY, DEVICE_ID_GENIUS_KB29E, quirk_cherry_genius_29e },</div><div class='del'>-</div><div class='del'>-	{ VENDOR_ID_PETALYNX, DEVICE_ID_PETALYNX_MAXTER_REMOTE, quirk_petalynx_remote },</div><div class='del'>-</div><div class='del'>-	{ VENDOR_ID_SUNPLUS, DEVICE_ID_SUNPLUS_WDESKTOP, quirk_sunplus_wdesktop },</div><div class='del'>-</div><div class='del'>-	{ 0, 0, NULL }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int hidinput_mapping_quirks(struct hid_usage *usage, </div><div class='del'>-				   struct input_dev *input, </div><div class='del'>-				   unsigned long **bit, int *max)</div><div class='del'>-{</div><div class='del'>-	struct hid_device *device = input_get_drvdata(input);</div><div class='del'>-	int i = 0;</div><div class='del'>-	</div><div class='del'>-	while (hid_input_blacklist[i].quirk) {</div><div class='del'>-		if (hid_input_blacklist[i].idVendor == device-&gt;vendor &amp;&amp;</div><div class='del'>-				hid_input_blacklist[i].idProduct == device-&gt;product)</div><div class='del'>-			return hid_input_blacklist[i].quirk(usage, input, bit, max);</div><div class='del'>-		i++;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int hidinput_event_quirks(struct hid_device *hid, struct hid_field *field, struct hid_usage *usage, __s32 value)</div><div class='del'>-{</div><div class='del'>-	struct input_dev *input;</div><div class='del'>-</div><div class='del'>-	input = field-&gt;hidinput-&gt;input;</div><div class='del'>-</div><div class='del'>-	if (((hid-&gt;quirks &amp; HID_QUIRK_2WHEEL_MOUSE_HACK_5) &amp;&amp; (usage-&gt;hid == 0x00090005))</div><div class='del'>-		|| ((hid-&gt;quirks &amp; HID_QUIRK_2WHEEL_MOUSE_HACK_7) &amp;&amp; (usage-&gt;hid == 0x00090007))) {</div><div class='del'>-		if (value) hid-&gt;quirks |=  HID_QUIRK_2WHEEL_MOUSE_HACK_ON;</div><div class='del'>-		else       hid-&gt;quirks &amp;= ~HID_QUIRK_2WHEEL_MOUSE_HACK_ON;</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((hid-&gt;quirks &amp; HID_QUIRK_2WHEEL_MOUSE_HACK_B8) &amp;&amp;</div><div class='del'>-			(usage-&gt;type == EV_REL) &amp;&amp;</div><div class='del'>-			(usage-&gt;code == REL_WHEEL)) {</div><div class='del'>-		hid-&gt;delayed_value = value;</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((hid-&gt;quirks &amp; HID_QUIRK_2WHEEL_MOUSE_HACK_B8) &amp;&amp;</div><div class='del'>-			(usage-&gt;hid == 0x000100b8)) {</div><div class='del'>-		input_event(input, EV_REL, value ? REL_HWHEEL : REL_WHEEL, hid-&gt;delayed_value);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((hid-&gt;quirks &amp; HID_QUIRK_INVERT_HWHEEL) &amp;&amp; (usage-&gt;code == REL_HWHEEL)) {</div><div class='del'>-		input_event(input, usage-&gt;type, usage-&gt;code, -value);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((hid-&gt;quirks &amp; HID_QUIRK_2WHEEL_MOUSE_HACK_ON) &amp;&amp; (usage-&gt;code == REL_WHEEL)) {</div><div class='del'>-		input_event(input, usage-&gt;type, REL_HWHEEL, value);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((hid-&gt;quirks &amp; HID_QUIRK_APPLE_HAS_FN) &amp;&amp; hidinput_apple_event(hid, input, usage, value))</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	/* Handling MS keyboards special buttons */</div><div class='del'>-	if (hid-&gt;quirks &amp; HID_QUIRK_MICROSOFT_KEYS &amp;&amp; </div><div class='del'>-			usage-&gt;hid == (HID_UP_MSVENDOR | 0xff05)) {</div><div class='del'>-		int key = 0;</div><div class='del'>-		static int last_key = 0;</div><div class='del'>-		switch (value) {</div><div class='del'>-			case 0x01: key = KEY_F14; break;</div><div class='del'>-			case 0x02: key = KEY_F15; break;</div><div class='del'>-			case 0x04: key = KEY_F16; break;</div><div class='del'>-			case 0x08: key = KEY_F17; break;</div><div class='del'>-			case 0x10: key = KEY_F18; break;</div><div class='del'>-			default: break;</div><div class='del'>-		}</div><div class='del'>-		if (key) {</div><div class='del'>-			input_event(input, usage-&gt;type, key, 1);</div><div class='del'>-			last_key = key;</div><div class='del'>-		} else {</div><div class='del'>-			input_event(input, usage-&gt;type, last_key, 0);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* handle the temporary quirky mapping to HWHEEL */</div><div class='del'>-	if (hid-&gt;quirks &amp; HID_QUIRK_HWHEEL_WHEEL_INVERT &amp;&amp;</div><div class='del'>-			usage-&gt;type == EV_REL &amp;&amp; usage-&gt;code == REL_HWHEEL) {</div><div class='del'>-		input_event(input, usage-&gt;type, REL_WHEEL, -value);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Gyration MCE remote "Sleep" key */</div><div class='del'>-	if (hid-&gt;vendor == VENDOR_ID_GYRATION &amp;&amp;</div><div class='del'>-	    hid-&gt;product == DEVICE_ID_GYRATION_REMOTE &amp;&amp;</div><div class='del'>-	    (usage-&gt;hid &amp; HID_USAGE_PAGE) == HID_UP_GENDESK &amp;&amp;</div><div class='del'>-	    (usage-&gt;hid &amp; 0xff) == 0x82) {</div><div class='del'>-		input_event(input, usage-&gt;type, usage-&gt;code, 1);</div><div class='del'>-		input_sync(input);</div><div class='del'>-		input_event(input, usage-&gt;type, usage-&gt;code, 0);</div><div class='del'>-		input_sync(input);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c<br/>index 1b2e8dc3398d..7f183b7147e1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hid/hid-input.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/hid/hid-input.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hid/hid-input.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/hid-input.c</a></div><div class='hunk'>@@ -32,11 +32,6 @@</div><div class='ctx'> #include &lt;linux/hid.h&gt;</div><div class='ctx'> #include &lt;linux/hid-debug.h&gt;</div><div class='ctx'> </div><div class='del'>-static int hid_apple_fnmode = 1;</div><div class='del'>-module_param_named(pb_fnmode, hid_apple_fnmode, int, 0644);</div><div class='del'>-MODULE_PARM_DESC(pb_fnmode,</div><div class='del'>-		"Mode of fn key on Apple keyboards (0 = disabled, 1 = fkeyslast, 2 = fkeysfirst)");</div><div class='del'>-</div><div class='ctx'> #define unk	KEY_UNKNOWN</div><div class='ctx'> </div><div class='ctx'> static const unsigned char hid_keyboard[256] = {</div><div class='hunk'>@@ -58,227 +53,20 @@ static const unsigned char hid_keyboard[256] = {</div><div class='ctx'> 	150,158,159,128,136,177,178,176,142,152,173,140,unk,unk,unk,unk</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* extended mapping for certain Logitech hardware (Logitech cordless desktop LX500) */</div><div class='del'>-#define LOGITECH_EXPANDED_KEYMAP_SIZE 80</div><div class='del'>-static int logitech_expanded_keymap[LOGITECH_EXPANDED_KEYMAP_SIZE] = {</div><div class='del'>-	  0,216,  0,213,175,156,  0,  0,  0,  0,</div><div class='del'>-	144,  0,  0,  0,  0,  0,  0,  0,  0,212,</div><div class='del'>-	174,167,152,161,112,  0,  0,  0,154,  0,</div><div class='del'>-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,</div><div class='del'>-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,</div><div class='del'>-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,</div><div class='del'>-	  0,  0,  0,  0,  0,183,184,185,186,187,</div><div class='del'>-	188,189,190,191,192,193,194,  0,  0,  0</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static const struct {</div><div class='ctx'> 	__s32 x;</div><div class='ctx'> 	__s32 y;</div><div class='ctx'> }  hid_hat_to_axis[] = {{ 0, 0}, { 0,-1}, { 1,-1}, { 1, 0}, { 1, 1}, { 0, 1}, {-1, 1}, {-1, 0}, {-1,-1}};</div><div class='ctx'> </div><div class='del'>-#define map_abs(c)	do { usage-&gt;code = c; usage-&gt;type = EV_ABS; bit = input-&gt;absbit; max = ABS_MAX; } while (0)</div><div class='del'>-#define map_rel(c)	do { usage-&gt;code = c; usage-&gt;type = EV_REL; bit = input-&gt;relbit; max = REL_MAX; } while (0)</div><div class='del'>-#define map_key(c)	do { usage-&gt;code = c; usage-&gt;type = EV_KEY; bit = input-&gt;keybit; max = KEY_MAX; } while (0)</div><div class='del'>-#define map_led(c)	do { usage-&gt;code = c; usage-&gt;type = EV_LED; bit = input-&gt;ledbit; max = LED_MAX; } while (0)</div><div class='del'>-</div><div class='del'>-#define map_abs_clear(c)	do { map_abs(c); clear_bit(c, bit); } while (0)</div><div class='del'>-#define map_key_clear(c)	do { map_key(c); clear_bit(c, bit); } while (0)</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_USB_HIDINPUT_POWERBOOK</div><div class='del'>-</div><div class='del'>-struct hidinput_key_translation {</div><div class='del'>-	u16 from;</div><div class='del'>-	u16 to;</div><div class='del'>-	u8 flags;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define APPLE_FLAG_FKEY 0x01</div><div class='del'>-</div><div class='del'>-static struct hidinput_key_translation apple_fn_keys[] = {</div><div class='del'>-	{ KEY_BACKSPACE, KEY_DELETE },</div><div class='del'>-	{ KEY_F1,       KEY_BRIGHTNESSDOWN, APPLE_FLAG_FKEY },</div><div class='del'>-	{ KEY_F2,       KEY_BRIGHTNESSUP,   APPLE_FLAG_FKEY },</div><div class='del'>-	{ KEY_F3,       KEY_FN_F5,          APPLE_FLAG_FKEY }, /* Exposé */</div><div class='del'>-	{ KEY_F4,       KEY_FN_F4,          APPLE_FLAG_FKEY }, /* Dashboard */</div><div class='del'>-	{ KEY_F5,       KEY_KBDILLUMDOWN,   APPLE_FLAG_FKEY },</div><div class='del'>-	{ KEY_F6,       KEY_KBDILLUMUP,     APPLE_FLAG_FKEY },</div><div class='del'>-	{ KEY_F7,       KEY_PREVIOUSSONG,   APPLE_FLAG_FKEY },</div><div class='del'>-	{ KEY_F8,       KEY_PLAYPAUSE,      APPLE_FLAG_FKEY },</div><div class='del'>-	{ KEY_F9,       KEY_NEXTSONG,       APPLE_FLAG_FKEY },</div><div class='del'>-	{ KEY_F10,      KEY_MUTE,           APPLE_FLAG_FKEY },</div><div class='del'>-	{ KEY_F11,      KEY_VOLUMEDOWN,     APPLE_FLAG_FKEY },</div><div class='del'>-	{ KEY_F12,      KEY_VOLUMEUP,       APPLE_FLAG_FKEY },</div><div class='del'>-	{ KEY_UP,       KEY_PAGEUP },</div><div class='del'>-	{ KEY_DOWN,     KEY_PAGEDOWN },</div><div class='del'>-	{ KEY_LEFT,     KEY_HOME },</div><div class='del'>-	{ KEY_RIGHT,    KEY_END },</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hidinput_key_translation powerbook_fn_keys[] = {</div><div class='del'>-	{ KEY_BACKSPACE, KEY_DELETE },</div><div class='del'>-	{ KEY_F1,       KEY_BRIGHTNESSDOWN,     APPLE_FLAG_FKEY },</div><div class='del'>-	{ KEY_F2,       KEY_BRIGHTNESSUP,       APPLE_FLAG_FKEY },</div><div class='del'>-	{ KEY_F3,       KEY_MUTE,               APPLE_FLAG_FKEY },</div><div class='del'>-	{ KEY_F4,       KEY_VOLUMEDOWN,         APPLE_FLAG_FKEY },</div><div class='del'>-	{ KEY_F5,       KEY_VOLUMEUP,           APPLE_FLAG_FKEY },</div><div class='del'>-	{ KEY_F6,       KEY_NUMLOCK,            APPLE_FLAG_FKEY },</div><div class='del'>-	{ KEY_F7,       KEY_SWITCHVIDEOMODE,    APPLE_FLAG_FKEY },</div><div class='del'>-	{ KEY_F8,       KEY_KBDILLUMTOGGLE,     APPLE_FLAG_FKEY },</div><div class='del'>-	{ KEY_F9,       KEY_KBDILLUMDOWN,       APPLE_FLAG_FKEY },</div><div class='del'>-	{ KEY_F10,      KEY_KBDILLUMUP,         APPLE_FLAG_FKEY },</div><div class='del'>-	{ KEY_UP,       KEY_PAGEUP },</div><div class='del'>-	{ KEY_DOWN,     KEY_PAGEDOWN },</div><div class='del'>-	{ KEY_LEFT,     KEY_HOME },</div><div class='del'>-	{ KEY_RIGHT,    KEY_END },</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hidinput_key_translation powerbook_numlock_keys[] = {</div><div class='del'>-	{ KEY_J,        KEY_KP1 },</div><div class='del'>-	{ KEY_K,        KEY_KP2 },</div><div class='del'>-	{ KEY_L,        KEY_KP3 },</div><div class='del'>-	{ KEY_U,        KEY_KP4 },</div><div class='del'>-	{ KEY_I,        KEY_KP5 },</div><div class='del'>-	{ KEY_O,        KEY_KP6 },</div><div class='del'>-	{ KEY_7,        KEY_KP7 },</div><div class='del'>-	{ KEY_8,        KEY_KP8 },</div><div class='del'>-	{ KEY_9,        KEY_KP9 },</div><div class='del'>-	{ KEY_M,        KEY_KP0 },</div><div class='del'>-	{ KEY_DOT,      KEY_KPDOT },</div><div class='del'>-	{ KEY_SLASH,    KEY_KPPLUS },</div><div class='del'>-	{ KEY_SEMICOLON, KEY_KPMINUS },</div><div class='del'>-	{ KEY_P,        KEY_KPASTERISK },</div><div class='del'>-	{ KEY_MINUS,    KEY_KPEQUAL },</div><div class='del'>-	{ KEY_0,        KEY_KPSLASH },</div><div class='del'>-	{ KEY_F6,       KEY_NUMLOCK },</div><div class='del'>-	{ KEY_KPENTER,  KEY_KPENTER },</div><div class='del'>-	{ KEY_BACKSPACE, KEY_BACKSPACE },</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hidinput_key_translation apple_iso_keyboard[] = {</div><div class='del'>-	{ KEY_GRAVE,    KEY_102ND },</div><div class='del'>-	{ KEY_102ND,    KEY_GRAVE },</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='add'>+#define map_abs(c)	hid_map_usage(hidinput, usage, &amp;bit, &amp;max, EV_ABS, (c))</div><div class='add'>+#define map_rel(c)	hid_map_usage(hidinput, usage, &amp;bit, &amp;max, EV_REL, (c))</div><div class='add'>+#define map_key(c)	hid_map_usage(hidinput, usage, &amp;bit, &amp;max, EV_KEY, (c))</div><div class='add'>+#define map_led(c)	hid_map_usage(hidinput, usage, &amp;bit, &amp;max, EV_LED, (c))</div><div class='ctx'> </div><div class='del'>-static struct hidinput_key_translation *find_translation(struct hidinput_key_translation *table, u16 from)</div><div class='del'>-{</div><div class='del'>-	struct hidinput_key_translation *trans;</div><div class='del'>-</div><div class='del'>-	/* Look for the translation */</div><div class='del'>-	for (trans = table; trans-&gt;from; trans++)</div><div class='del'>-		if (trans-&gt;from == from)</div><div class='del'>-			return trans;</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int hidinput_apple_event(struct hid_device *hid, struct input_dev *input,</div><div class='del'>-		struct hid_usage *usage, __s32 value)</div><div class='del'>-{</div><div class='del'>-	struct hidinput_key_translation *trans;</div><div class='del'>-</div><div class='del'>-	if (usage-&gt;code == KEY_FN) {</div><div class='del'>-		if (value) hid-&gt;quirks |=  HID_QUIRK_APPLE_FN_ON;</div><div class='del'>-		else       hid-&gt;quirks &amp;= ~HID_QUIRK_APPLE_FN_ON;</div><div class='del'>-</div><div class='del'>-		input_event(input, usage-&gt;type, usage-&gt;code, value);</div><div class='del'>-</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (hid_apple_fnmode) {</div><div class='del'>-		int do_translate;</div><div class='del'>-</div><div class='del'>-		trans = find_translation((hid-&gt;product &lt; 0x220 ||</div><div class='del'>-					  hid-&gt;product &gt;= 0x300) ?</div><div class='del'>-					 powerbook_fn_keys : apple_fn_keys,</div><div class='del'>-					 usage-&gt;code);</div><div class='del'>-		if (trans) {</div><div class='del'>-			if (test_bit(usage-&gt;code, hid-&gt;apple_pressed_fn))</div><div class='del'>-				do_translate = 1;</div><div class='del'>-			else if (trans-&gt;flags &amp; APPLE_FLAG_FKEY)</div><div class='del'>-				do_translate =</div><div class='del'>-					(hid_apple_fnmode == 2 &amp;&amp;  (hid-&gt;quirks &amp; HID_QUIRK_APPLE_FN_ON)) ||</div><div class='del'>-					(hid_apple_fnmode == 1 &amp;&amp; !(hid-&gt;quirks &amp; HID_QUIRK_APPLE_FN_ON));</div><div class='del'>-			else</div><div class='del'>-				do_translate = (hid-&gt;quirks &amp; HID_QUIRK_APPLE_FN_ON);</div><div class='del'>-</div><div class='del'>-			if (do_translate) {</div><div class='del'>-				if (value)</div><div class='del'>-					set_bit(usage-&gt;code, hid-&gt;apple_pressed_fn);</div><div class='del'>-				else</div><div class='del'>-					clear_bit(usage-&gt;code, hid-&gt;apple_pressed_fn);</div><div class='del'>-</div><div class='del'>-				input_event(input, usage-&gt;type, trans-&gt;to, value);</div><div class='del'>-</div><div class='del'>-				return 1;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (hid-&gt;quirks &amp; HID_QUIRK_APPLE_NUMLOCK_EMULATION &amp;&amp; (</div><div class='del'>-				test_bit(usage-&gt;code, hid-&gt;pb_pressed_numlock) ||</div><div class='del'>-				test_bit(LED_NUML, input-&gt;led))) {</div><div class='del'>-			trans = find_translation(powerbook_numlock_keys, usage-&gt;code);</div><div class='del'>-</div><div class='del'>-			if (trans) {</div><div class='del'>-				if (value)</div><div class='del'>-					set_bit(usage-&gt;code, hid-&gt;pb_pressed_numlock);</div><div class='del'>-				else</div><div class='del'>-					clear_bit(usage-&gt;code, hid-&gt;pb_pressed_numlock);</div><div class='del'>-</div><div class='del'>-				input_event(input, usage-&gt;type, trans-&gt;to, value);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			return 1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (hid-&gt;quirks &amp; HID_QUIRK_APPLE_ISO_KEYBOARD) {</div><div class='del'>-		trans = find_translation(apple_iso_keyboard, usage-&gt;code);</div><div class='del'>-		if (trans) {</div><div class='del'>-			input_event(input, usage-&gt;type, trans-&gt;to, value);</div><div class='del'>-			return 1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void hidinput_apple_setup(struct input_dev *input)</div><div class='del'>-{</div><div class='del'>-	struct hidinput_key_translation *trans;</div><div class='del'>-</div><div class='del'>-	set_bit(KEY_NUMLOCK, input-&gt;keybit);</div><div class='del'>-</div><div class='del'>-	/* Enable all needed keys */</div><div class='del'>-	for (trans = apple_fn_keys; trans-&gt;from; trans++)</div><div class='del'>-		set_bit(trans-&gt;to, input-&gt;keybit);</div><div class='del'>-</div><div class='del'>-	for (trans = powerbook_fn_keys; trans-&gt;from; trans++)</div><div class='del'>-		set_bit(trans-&gt;to, input-&gt;keybit);</div><div class='del'>-</div><div class='del'>-	for (trans = powerbook_numlock_keys; trans-&gt;from; trans++)</div><div class='del'>-		set_bit(trans-&gt;to, input-&gt;keybit);</div><div class='del'>-</div><div class='del'>-	for (trans = apple_iso_keyboard; trans-&gt;from; trans++)</div><div class='del'>-		set_bit(trans-&gt;to, input-&gt;keybit);</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-inline int hidinput_apple_event(struct hid_device *hid,</div><div class='del'>-				       struct input_dev *input,</div><div class='del'>-				       struct hid_usage *usage, __s32 value)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void hidinput_apple_setup(struct input_dev *input)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='add'>+#define map_abs_clear(c)	hid_map_usage_clear(hidinput, usage, &amp;bit, \</div><div class='add'>+		&amp;max, EV_ABS, (c))</div><div class='add'>+#define map_key_clear(c)	hid_map_usage_clear(hidinput, usage, &amp;bit, \</div><div class='add'>+		&amp;max, EV_KEY, (c))</div><div class='ctx'> </div><div class='ctx'> static inline int match_scancode(int code, int scancode)</div><div class='ctx'> {</div><div class='hunk'>@@ -366,7 +154,7 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel</div><div class='ctx'> {</div><div class='ctx'> 	struct input_dev *input = hidinput-&gt;input;</div><div class='ctx'> 	struct hid_device *device = input_get_drvdata(input);</div><div class='del'>-	int max = 0, code, ret;</div><div class='add'>+	int max = 0, code;</div><div class='ctx'> 	unsigned long *bit = NULL;</div><div class='ctx'> </div><div class='ctx'> 	field-&gt;hidinput = hidinput;</div><div class='hunk'>@@ -385,406 +173,345 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel</div><div class='ctx'> 		goto ignore;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* handle input mappings for quirky devices */</div><div class='del'>-	ret = hidinput_mapping_quirks(usage, input, &amp;bit, &amp;max);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto mapped;</div><div class='add'>+	if (device-&gt;driver-&gt;input_mapping) {</div><div class='add'>+		int ret = device-&gt;driver-&gt;input_mapping(device, hidinput, field,</div><div class='add'>+				usage, &amp;bit, &amp;max);</div><div class='add'>+		if (ret &gt; 0)</div><div class='add'>+			goto mapped;</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto ignore;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	switch (usage-&gt;hid &amp; HID_USAGE_PAGE) {</div><div class='add'>+	case HID_UP_UNDEFINED:</div><div class='add'>+		goto ignore;</div><div class='ctx'> </div><div class='del'>-		case HID_UP_UNDEFINED:</div><div class='del'>-			goto ignore;</div><div class='del'>-</div><div class='del'>-		case HID_UP_KEYBOARD:</div><div class='add'>+	case HID_UP_KEYBOARD:</div><div class='add'>+		set_bit(EV_REP, input-&gt;evbit);</div><div class='ctx'> </div><div class='del'>-			set_bit(EV_REP, input-&gt;evbit);</div><div class='add'>+		if ((usage-&gt;hid &amp; HID_USAGE) &lt; 256) {</div><div class='add'>+			if (!hid_keyboard[usage-&gt;hid &amp; HID_USAGE]) goto ignore;</div><div class='add'>+			map_key_clear(hid_keyboard[usage-&gt;hid &amp; HID_USAGE]);</div><div class='add'>+		} else</div><div class='add'>+			map_key(KEY_UNKNOWN);</div><div class='ctx'> </div><div class='del'>-			if ((usage-&gt;hid &amp; HID_USAGE) &lt; 256) {</div><div class='del'>-				if (!hid_keyboard[usage-&gt;hid &amp; HID_USAGE]) goto ignore;</div><div class='del'>-				map_key_clear(hid_keyboard[usage-&gt;hid &amp; HID_USAGE]);</div><div class='del'>-			} else</div><div class='del'>-				map_key(KEY_UNKNOWN);</div><div class='add'>+		break;</div><div class='ctx'> </div><div class='del'>-			break;</div><div class='add'>+	case HID_UP_BUTTON:</div><div class='add'>+		code = ((usage-&gt;hid - 1) &amp; 0xf);</div><div class='ctx'> </div><div class='del'>-		case HID_UP_BUTTON:</div><div class='del'>-</div><div class='del'>-			code = ((usage-&gt;hid - 1) &amp; 0xf);</div><div class='del'>-</div><div class='del'>-			switch (field-&gt;application) {</div><div class='del'>-				case HID_GD_MOUSE:</div><div class='del'>-				case HID_GD_POINTER:  code += 0x110; break;</div><div class='del'>-				case HID_GD_JOYSTICK: code += 0x120; break;</div><div class='del'>-				case HID_GD_GAMEPAD:  code += 0x130; break;</div><div class='del'>-				default:</div><div class='del'>-					switch (field-&gt;physical) {</div><div class='del'>-						case HID_GD_MOUSE:</div><div class='del'>-						case HID_GD_POINTER:  code += 0x110; break;</div><div class='del'>-						case HID_GD_JOYSTICK: code += 0x120; break;</div><div class='del'>-						case HID_GD_GAMEPAD:  code += 0x130; break;</div><div class='del'>-						default:              code += 0x100;</div><div class='del'>-					}</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* Special handling for Logitech Cordless Desktop */</div><div class='del'>-			if (field-&gt;application != HID_GD_MOUSE) {</div><div class='del'>-				if (device-&gt;quirks &amp; HID_QUIRK_LOGITECH_EXPANDED_KEYMAP) {</div><div class='del'>-					int hid = usage-&gt;hid &amp; HID_USAGE;</div><div class='del'>-					if (hid &lt; LOGITECH_EXPANDED_KEYMAP_SIZE &amp;&amp; logitech_expanded_keymap[hid] != 0)</div><div class='del'>-						code = logitech_expanded_keymap[hid];</div><div class='del'>-				}</div><div class='del'>-			} else {</div><div class='del'>-				if (device-&gt;quirks &amp; HID_QUIRK_LOGITECH_IGNORE_DOUBLED_WHEEL) {</div><div class='del'>-					int hid = usage-&gt;hid &amp; HID_USAGE;</div><div class='del'>-					if (hid == 7 || hid == 8)</div><div class='del'>-						goto ignore;</div><div class='del'>-				}</div><div class='add'>+		switch (field-&gt;application) {</div><div class='add'>+		case HID_GD_MOUSE:</div><div class='add'>+		case HID_GD_POINTER:  code += 0x110; break;</div><div class='add'>+		case HID_GD_JOYSTICK: code += 0x120; break;</div><div class='add'>+		case HID_GD_GAMEPAD:  code += 0x130; break;</div><div class='add'>+		default:</div><div class='add'>+			switch (field-&gt;physical) {</div><div class='add'>+			case HID_GD_MOUSE:</div><div class='add'>+			case HID_GD_POINTER:  code += 0x110; break;</div><div class='add'>+			case HID_GD_JOYSTICK: code += 0x120; break;</div><div class='add'>+			case HID_GD_GAMEPAD:  code += 0x130; break;</div><div class='add'>+			default:              code += 0x100;</div><div class='ctx'> 			}</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-			map_key(code);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-		case HID_UP_SIMULATION:</div><div class='del'>-</div><div class='del'>-			switch (usage-&gt;hid &amp; 0xffff) {</div><div class='del'>-				case 0xba: map_abs(ABS_RUDDER);   break;</div><div class='del'>-				case 0xbb: map_abs(ABS_THROTTLE); break;</div><div class='del'>-				case 0xc4: map_abs(ABS_GAS);      break;</div><div class='del'>-				case 0xc5: map_abs(ABS_BRAKE);    break;</div><div class='del'>-				case 0xc8: map_abs(ABS_WHEEL);    break;</div><div class='del'>-				default:   goto ignore;</div><div class='add'>+		map_key(code);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case HID_UP_SIMULATION:</div><div class='add'>+		switch (usage-&gt;hid &amp; 0xffff) {</div><div class='add'>+		case 0xba: map_abs(ABS_RUDDER);   break;</div><div class='add'>+		case 0xbb: map_abs(ABS_THROTTLE); break;</div><div class='add'>+		case 0xc4: map_abs(ABS_GAS);      break;</div><div class='add'>+		case 0xc5: map_abs(ABS_BRAKE);    break;</div><div class='add'>+		case 0xc8: map_abs(ABS_WHEEL);    break;</div><div class='add'>+		default:   goto ignore;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case HID_UP_GENDESK:</div><div class='add'>+		if ((usage-&gt;hid &amp; 0xf0) == 0x80) {	/* SystemControl */</div><div class='add'>+			switch (usage-&gt;hid &amp; 0xf) {</div><div class='add'>+			case 0x1: map_key_clear(KEY_POWER);  break;</div><div class='add'>+			case 0x2: map_key_clear(KEY_SLEEP);  break;</div><div class='add'>+			case 0x3: map_key_clear(KEY_WAKEUP); break;</div><div class='add'>+			default: goto unknown;</div><div class='ctx'> 			}</div><div class='ctx'> 			break;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		case HID_UP_GENDESK:</div><div class='del'>-</div><div class='del'>-			if ((usage-&gt;hid &amp; 0xf0) == 0x80) {	/* SystemControl */</div><div class='del'>-				switch (usage-&gt;hid &amp; 0xf) {</div><div class='del'>-					case 0x1: map_key_clear(KEY_POWER);  break;</div><div class='del'>-					case 0x2: map_key_clear(KEY_SLEEP);  break;</div><div class='del'>-					case 0x3: map_key_clear(KEY_WAKEUP); break;</div><div class='del'>-					default: goto unknown;</div><div class='del'>-				}</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if ((usage-&gt;hid &amp; 0xf0) == 0x90) {	/* D-pad */</div><div class='del'>-				switch (usage-&gt;hid) {</div><div class='del'>-					case HID_GD_UP:	   usage-&gt;hat_dir = 1; break;</div><div class='del'>-					case HID_GD_DOWN:  usage-&gt;hat_dir = 5; break;</div><div class='del'>-					case HID_GD_RIGHT: usage-&gt;hat_dir = 3; break;</div><div class='del'>-					case HID_GD_LEFT:  usage-&gt;hat_dir = 7; break;</div><div class='del'>-					default: goto unknown;</div><div class='del'>-				}</div><div class='del'>-				if (field-&gt;dpad) {</div><div class='del'>-					map_abs(field-&gt;dpad);</div><div class='del'>-					goto ignore;</div><div class='del'>-				}</div><div class='del'>-				map_abs(ABS_HAT0X);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-</div><div class='add'>+		if ((usage-&gt;hid &amp; 0xf0) == 0x90) {	/* D-pad */</div><div class='ctx'> 			switch (usage-&gt;hid) {</div><div class='del'>-</div><div class='del'>-				/* These usage IDs map directly to the usage codes. */</div><div class='del'>-				case HID_GD_X: case HID_GD_Y: case HID_GD_Z:</div><div class='del'>-				case HID_GD_RX: case HID_GD_RY: case HID_GD_RZ:</div><div class='del'>-				case HID_GD_SLIDER: case HID_GD_DIAL: case HID_GD_WHEEL:</div><div class='del'>-					if (field-&gt;flags &amp; HID_MAIN_ITEM_RELATIVE)</div><div class='del'>-						map_rel(usage-&gt;hid &amp; 0xf);</div><div class='del'>-					else</div><div class='del'>-						map_abs(usage-&gt;hid &amp; 0xf);</div><div class='del'>-					break;</div><div class='del'>-</div><div class='del'>-				case HID_GD_HATSWITCH:</div><div class='del'>-					usage-&gt;hat_min = field-&gt;logical_minimum;</div><div class='del'>-					usage-&gt;hat_max = field-&gt;logical_maximum;</div><div class='del'>-					map_abs(ABS_HAT0X);</div><div class='del'>-					break;</div><div class='del'>-</div><div class='del'>-				case HID_GD_START:	map_key_clear(BTN_START);	break;</div><div class='del'>-				case HID_GD_SELECT:	map_key_clear(BTN_SELECT);	break;</div><div class='del'>-</div><div class='del'>-				default: goto unknown;</div><div class='add'>+			case HID_GD_UP:	   usage-&gt;hat_dir = 1; break;</div><div class='add'>+			case HID_GD_DOWN:  usage-&gt;hat_dir = 5; break;</div><div class='add'>+			case HID_GD_RIGHT: usage-&gt;hat_dir = 3; break;</div><div class='add'>+			case HID_GD_LEFT:  usage-&gt;hat_dir = 7; break;</div><div class='add'>+			default: goto unknown;</div><div class='ctx'> 			}</div><div class='del'>-</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case HID_UP_LED:</div><div class='del'>-</div><div class='del'>-			switch (usage-&gt;hid &amp; 0xffff) {                        /* HID-Value:                   */</div><div class='del'>-				case 0x01:  map_led (LED_NUML);     break;    /*   "Num Lock"                 */</div><div class='del'>-				case 0x02:  map_led (LED_CAPSL);    break;    /*   "Caps Lock"                */</div><div class='del'>-				case 0x03:  map_led (LED_SCROLLL);  break;    /*   "Scroll Lock"              */</div><div class='del'>-				case 0x04:  map_led (LED_COMPOSE);  break;    /*   "Compose"                  */</div><div class='del'>-				case 0x05:  map_led (LED_KANA);     break;    /*   "Kana"                     */</div><div class='del'>-				case 0x27:  map_led (LED_SLEEP);    break;    /*   "Stand-By"                 */</div><div class='del'>-				case 0x4c:  map_led (LED_SUSPEND);  break;    /*   "System Suspend"           */</div><div class='del'>-				case 0x09:  map_led (LED_MUTE);     break;    /*   "Mute"                     */</div><div class='del'>-				case 0x4b:  map_led (LED_MISC);     break;    /*   "Generic Indicator"        */</div><div class='del'>-				case 0x19:  map_led (LED_MAIL);     break;    /*   "Message Waiting"          */</div><div class='del'>-				case 0x4d:  map_led (LED_CHARGING); break;    /*   "External Power Connected" */</div><div class='del'>-</div><div class='del'>-				default: goto ignore;</div><div class='add'>+			if (field-&gt;dpad) {</div><div class='add'>+				map_abs(field-&gt;dpad);</div><div class='add'>+				goto ignore;</div><div class='ctx'> 			}</div><div class='add'>+			map_abs(ABS_HAT0X);</div><div class='ctx'> 			break;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		case HID_UP_DIGITIZER:</div><div class='del'>-</div><div class='del'>-			switch (usage-&gt;hid &amp; 0xff) {</div><div class='del'>-</div><div class='del'>-				case 0x30: /* TipPressure */</div><div class='del'>-					if (!test_bit(BTN_TOUCH, input-&gt;keybit)) {</div><div class='del'>-						device-&gt;quirks |= HID_QUIRK_NOTOUCH;</div><div class='del'>-						set_bit(EV_KEY, input-&gt;evbit);</div><div class='del'>-						set_bit(BTN_TOUCH, input-&gt;keybit);</div><div class='del'>-					}</div><div class='del'>-</div><div class='del'>-					map_abs_clear(ABS_PRESSURE);</div><div class='del'>-					break;</div><div class='del'>-</div><div class='del'>-				case 0x32: /* InRange */</div><div class='del'>-					switch (field-&gt;physical &amp; 0xff) {</div><div class='del'>-						case 0x21: map_key(BTN_TOOL_MOUSE); break;</div><div class='del'>-						case 0x22: map_key(BTN_TOOL_FINGER); break;</div><div class='del'>-						default: map_key(BTN_TOOL_PEN); break;</div><div class='del'>-					}</div><div class='del'>-					break;</div><div class='add'>+		switch (usage-&gt;hid) {</div><div class='add'>+		/* These usage IDs map directly to the usage codes. */</div><div class='add'>+		case HID_GD_X: case HID_GD_Y: case HID_GD_Z:</div><div class='add'>+		case HID_GD_RX: case HID_GD_RY: case HID_GD_RZ:</div><div class='add'>+		case HID_GD_SLIDER: case HID_GD_DIAL: case HID_GD_WHEEL:</div><div class='add'>+			if (field-&gt;flags &amp; HID_MAIN_ITEM_RELATIVE)</div><div class='add'>+				map_rel(usage-&gt;hid &amp; 0xf);</div><div class='add'>+			else</div><div class='add'>+				map_abs(usage-&gt;hid &amp; 0xf);</div><div class='add'>+			break;</div><div class='ctx'> </div><div class='del'>-				case 0x3c: /* Invert */</div><div class='del'>-					map_key_clear(BTN_TOOL_RUBBER);</div><div class='del'>-					break;</div><div class='add'>+		case HID_GD_HATSWITCH:</div><div class='add'>+			usage-&gt;hat_min = field-&gt;logical_minimum;</div><div class='add'>+			usage-&gt;hat_max = field-&gt;logical_maximum;</div><div class='add'>+			map_abs(ABS_HAT0X);</div><div class='add'>+			break;</div><div class='ctx'> </div><div class='del'>-				case 0x33: /* Touch */</div><div class='del'>-				case 0x42: /* TipSwitch */</div><div class='del'>-				case 0x43: /* TipSwitch2 */</div><div class='del'>-					device-&gt;quirks &amp;= ~HID_QUIRK_NOTOUCH;</div><div class='del'>-					map_key_clear(BTN_TOUCH);</div><div class='del'>-					break;</div><div class='add'>+		case HID_GD_START:	map_key_clear(BTN_START);	break;</div><div class='add'>+		case HID_GD_SELECT:	map_key_clear(BTN_SELECT);	break;</div><div class='ctx'> </div><div class='del'>-				case 0x44: /* BarrelSwitch */</div><div class='del'>-					map_key_clear(BTN_STYLUS);</div><div class='del'>-					break;</div><div class='add'>+		default: goto unknown;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-				default:  goto unknown;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case HID_UP_LED:</div><div class='add'>+		switch (usage-&gt;hid &amp; 0xffff) {		      /* HID-Value:                   */</div><div class='add'>+		case 0x01:  map_led (LED_NUML);     break;    /*   "Num Lock"                 */</div><div class='add'>+		case 0x02:  map_led (LED_CAPSL);    break;    /*   "Caps Lock"                */</div><div class='add'>+		case 0x03:  map_led (LED_SCROLLL);  break;    /*   "Scroll Lock"              */</div><div class='add'>+		case 0x04:  map_led (LED_COMPOSE);  break;    /*   "Compose"                  */</div><div class='add'>+		case 0x05:  map_led (LED_KANA);     break;    /*   "Kana"                     */</div><div class='add'>+		case 0x27:  map_led (LED_SLEEP);    break;    /*   "Stand-By"                 */</div><div class='add'>+		case 0x4c:  map_led (LED_SUSPEND);  break;    /*   "System Suspend"           */</div><div class='add'>+		case 0x09:  map_led (LED_MUTE);     break;    /*   "Mute"                     */</div><div class='add'>+		case 0x4b:  map_led (LED_MISC);     break;    /*   "Generic Indicator"        */</div><div class='add'>+		case 0x19:  map_led (LED_MAIL);     break;    /*   "Message Waiting"          */</div><div class='add'>+		case 0x4d:  map_led (LED_CHARGING); break;    /*   "External Power Connected" */</div><div class='add'>+</div><div class='add'>+		default: goto ignore;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case HID_UP_DIGITIZER:</div><div class='add'>+		switch (usage-&gt;hid &amp; 0xff) {</div><div class='add'>+		case 0x30: /* TipPressure */</div><div class='add'>+			if (!test_bit(BTN_TOUCH, input-&gt;keybit)) {</div><div class='add'>+				device-&gt;quirks |= HID_QUIRK_NOTOUCH;</div><div class='add'>+				set_bit(EV_KEY, input-&gt;evbit);</div><div class='add'>+				set_bit(BTN_TOUCH, input-&gt;keybit);</div><div class='ctx'> 			}</div><div class='add'>+			map_abs_clear(ABS_PRESSURE);</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		case HID_UP_CONSUMER:	/* USB HUT v1.1, pages 56-62 */</div><div class='del'>-</div><div class='del'>-			switch (usage-&gt;hid &amp; HID_USAGE) {</div><div class='del'>-				case 0x000: goto ignore;</div><div class='del'>-				case 0x034: map_key_clear(KEY_SLEEP);		break;</div><div class='del'>-				case 0x036: map_key_clear(BTN_MISC);		break;</div><div class='del'>-</div><div class='del'>-				case 0x040: map_key_clear(KEY_MENU);		break;</div><div class='del'>-				case 0x045: map_key_clear(KEY_RADIO);		break;</div><div class='del'>-</div><div class='del'>-				case 0x083: map_key_clear(KEY_LAST);		break;</div><div class='del'>-				case 0x088: map_key_clear(KEY_PC);		break;</div><div class='del'>-				case 0x089: map_key_clear(KEY_TV);		break;</div><div class='del'>-				case 0x08a: map_key_clear(KEY_WWW);		break;</div><div class='del'>-				case 0x08b: map_key_clear(KEY_DVD);		break;</div><div class='del'>-				case 0x08c: map_key_clear(KEY_PHONE);		break;</div><div class='del'>-				case 0x08d: map_key_clear(KEY_PROGRAM);		break;</div><div class='del'>-				case 0x08e: map_key_clear(KEY_VIDEOPHONE);	break;</div><div class='del'>-				case 0x08f: map_key_clear(KEY_GAMES);		break;</div><div class='del'>-				case 0x090: map_key_clear(KEY_MEMO);		break;</div><div class='del'>-				case 0x091: map_key_clear(KEY_CD);		break;</div><div class='del'>-				case 0x092: map_key_clear(KEY_VCR);		break;</div><div class='del'>-				case 0x093: map_key_clear(KEY_TUNER);		break;</div><div class='del'>-				case 0x094: map_key_clear(KEY_EXIT);		break;</div><div class='del'>-				case 0x095: map_key_clear(KEY_HELP);		break;</div><div class='del'>-				case 0x096: map_key_clear(KEY_TAPE);		break;</div><div class='del'>-				case 0x097: map_key_clear(KEY_TV2);		break;</div><div class='del'>-				case 0x098: map_key_clear(KEY_SAT);		break;</div><div class='del'>-				case 0x09a: map_key_clear(KEY_PVR);		break;</div><div class='del'>-</div><div class='del'>-				case 0x09c: map_key_clear(KEY_CHANNELUP);	break;</div><div class='del'>-				case 0x09d: map_key_clear(KEY_CHANNELDOWN);	break;</div><div class='del'>-				case 0x0a0: map_key_clear(KEY_VCR2);		break;</div><div class='del'>-</div><div class='del'>-				case 0x0b0: map_key_clear(KEY_PLAY);		break;</div><div class='del'>-				case 0x0b1: map_key_clear(KEY_PAUSE);		break;</div><div class='del'>-				case 0x0b2: map_key_clear(KEY_RECORD);		break;</div><div class='del'>-				case 0x0b3: map_key_clear(KEY_FASTFORWARD);	break;</div><div class='del'>-				case 0x0b4: map_key_clear(KEY_REWIND);		break;</div><div class='del'>-				case 0x0b5: map_key_clear(KEY_NEXTSONG);	break;</div><div class='del'>-				case 0x0b6: map_key_clear(KEY_PREVIOUSSONG);	break;</div><div class='del'>-				case 0x0b7: map_key_clear(KEY_STOPCD);		break;</div><div class='del'>-				case 0x0b8: map_key_clear(KEY_EJECTCD);		break;</div><div class='del'>-				case 0x0bc: map_key_clear(KEY_MEDIA_REPEAT);	break;</div><div class='del'>-</div><div class='del'>-				case 0x0cd: map_key_clear(KEY_PLAYPAUSE);	break;</div><div class='del'>-			        case 0x0e0: map_abs_clear(ABS_VOLUME);		break;</div><div class='del'>-				case 0x0e2: map_key_clear(KEY_MUTE);		break;</div><div class='del'>-				case 0x0e5: map_key_clear(KEY_BASSBOOST);	break;</div><div class='del'>-				case 0x0e9: map_key_clear(KEY_VOLUMEUP);	break;</div><div class='del'>-				case 0x0ea: map_key_clear(KEY_VOLUMEDOWN);	break;</div><div class='del'>-</div><div class='del'>-				case 0x182: map_key_clear(KEY_BOOKMARKS);	break;</div><div class='del'>-				case 0x183: map_key_clear(KEY_CONFIG);		break;</div><div class='del'>-				case 0x184: map_key_clear(KEY_WORDPROCESSOR);	break;</div><div class='del'>-				case 0x185: map_key_clear(KEY_EDITOR);		break;</div><div class='del'>-				case 0x186: map_key_clear(KEY_SPREADSHEET);	break;</div><div class='del'>-				case 0x187: map_key_clear(KEY_GRAPHICSEDITOR);	break;</div><div class='del'>-				case 0x188: map_key_clear(KEY_PRESENTATION);	break;</div><div class='del'>-				case 0x189: map_key_clear(KEY_DATABASE);	break;</div><div class='del'>-				case 0x18a: map_key_clear(KEY_MAIL);		break;</div><div class='del'>-				case 0x18b: map_key_clear(KEY_NEWS);		break;</div><div class='del'>-				case 0x18c: map_key_clear(KEY_VOICEMAIL);	break;</div><div class='del'>-				case 0x18d: map_key_clear(KEY_ADDRESSBOOK);	break;</div><div class='del'>-				case 0x18e: map_key_clear(KEY_CALENDAR);	break;</div><div class='del'>-				case 0x191: map_key_clear(KEY_FINANCE);		break;</div><div class='del'>-				case 0x192: map_key_clear(KEY_CALC);		break;</div><div class='del'>-				case 0x194: map_key_clear(KEY_FILE);		break;</div><div class='del'>-				case 0x196: map_key_clear(KEY_WWW);		break;</div><div class='del'>-				case 0x19c: map_key_clear(KEY_LOGOFF);		break;</div><div class='del'>-				case 0x19e: map_key_clear(KEY_COFFEE);		break;</div><div class='del'>-				case 0x1a6: map_key_clear(KEY_HELP);		break;</div><div class='del'>-				case 0x1a7: map_key_clear(KEY_DOCUMENTS);	break;</div><div class='del'>-				case 0x1ab: map_key_clear(KEY_SPELLCHECK);	break;</div><div class='del'>-				case 0x1b6: map_key_clear(KEY_MEDIA);		break;</div><div class='del'>-				case 0x1b7: map_key_clear(KEY_SOUND);		break;</div><div class='del'>-				case 0x1bc: map_key_clear(KEY_MESSENGER);	break;</div><div class='del'>-				case 0x1bd: map_key_clear(KEY_INFO);		break;</div><div class='del'>-				case 0x201: map_key_clear(KEY_NEW);		break;</div><div class='del'>-				case 0x202: map_key_clear(KEY_OPEN);		break;</div><div class='del'>-				case 0x203: map_key_clear(KEY_CLOSE);		break;</div><div class='del'>-				case 0x204: map_key_clear(KEY_EXIT);		break;</div><div class='del'>-				case 0x207: map_key_clear(KEY_SAVE);		break;</div><div class='del'>-				case 0x208: map_key_clear(KEY_PRINT);		break;</div><div class='del'>-				case 0x209: map_key_clear(KEY_PROPS);		break;</div><div class='del'>-				case 0x21a: map_key_clear(KEY_UNDO);		break;</div><div class='del'>-				case 0x21b: map_key_clear(KEY_COPY);		break;</div><div class='del'>-				case 0x21c: map_key_clear(KEY_CUT);		break;</div><div class='del'>-				case 0x21d: map_key_clear(KEY_PASTE);		break;</div><div class='del'>-				case 0x21f: map_key_clear(KEY_FIND);		break;</div><div class='del'>-				case 0x221: map_key_clear(KEY_SEARCH);		break;</div><div class='del'>-				case 0x222: map_key_clear(KEY_GOTO);		break;</div><div class='del'>-				case 0x223: map_key_clear(KEY_HOMEPAGE);	break;</div><div class='del'>-				case 0x224: map_key_clear(KEY_BACK);		break;</div><div class='del'>-				case 0x225: map_key_clear(KEY_FORWARD);		break;</div><div class='del'>-				case 0x226: map_key_clear(KEY_STOP);		break;</div><div class='del'>-				case 0x227: map_key_clear(KEY_REFRESH);		break;</div><div class='del'>-				case 0x22a: map_key_clear(KEY_BOOKMARKS);	break;</div><div class='del'>-				case 0x22d: map_key_clear(KEY_ZOOMIN);		break;</div><div class='del'>-				case 0x22e: map_key_clear(KEY_ZOOMOUT);		break;</div><div class='del'>-				case 0x22f: map_key_clear(KEY_ZOOMRESET);	break;</div><div class='del'>-				case 0x233: map_key_clear(KEY_SCROLLUP);	break;</div><div class='del'>-				case 0x234: map_key_clear(KEY_SCROLLDOWN);	break;</div><div class='del'>-				case 0x238: map_rel(REL_HWHEEL);		break;</div><div class='del'>-				case 0x25f: map_key_clear(KEY_CANCEL);		break;</div><div class='del'>-				case 0x279: map_key_clear(KEY_REDO);		break;</div><div class='del'>-</div><div class='del'>-				case 0x289: map_key_clear(KEY_REPLY);		break;</div><div class='del'>-				case 0x28b: map_key_clear(KEY_FORWARDMAIL);	break;</div><div class='del'>-				case 0x28c: map_key_clear(KEY_SEND);		break;</div><div class='del'>-</div><div class='del'>-				default:    goto ignore;</div><div class='add'>+		case 0x32: /* InRange */</div><div class='add'>+			switch (field-&gt;physical &amp; 0xff) {</div><div class='add'>+			case 0x21: map_key(BTN_TOOL_MOUSE); break;</div><div class='add'>+			case 0x22: map_key(BTN_TOOL_FINGER); break;</div><div class='add'>+			default: map_key(BTN_TOOL_PEN); break;</div><div class='ctx'> 			}</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		case HID_UP_HPVENDOR:	/* Reported on a Dutch layout HP5308 */</div><div class='del'>-</div><div class='del'>-			set_bit(EV_REP, input-&gt;evbit);</div><div class='del'>-			switch (usage-&gt;hid &amp; HID_USAGE) {</div><div class='del'>-			        case 0x021: map_key_clear(KEY_PRINT);           break;</div><div class='del'>-				case 0x070: map_key_clear(KEY_HP);		break;</div><div class='del'>-				case 0x071: map_key_clear(KEY_CAMERA);		break;</div><div class='del'>-				case 0x072: map_key_clear(KEY_SOUND);		break;</div><div class='del'>-				case 0x073: map_key_clear(KEY_QUESTION);	break;</div><div class='del'>-				case 0x080: map_key_clear(KEY_EMAIL);		break;</div><div class='del'>-				case 0x081: map_key_clear(KEY_CHAT);		break;</div><div class='del'>-				case 0x082: map_key_clear(KEY_SEARCH);		break;</div><div class='del'>-				case 0x083: map_key_clear(KEY_CONNECT);	        break;</div><div class='del'>-				case 0x084: map_key_clear(KEY_FINANCE);		break;</div><div class='del'>-				case 0x085: map_key_clear(KEY_SPORT);		break;</div><div class='del'>-				case 0x086: map_key_clear(KEY_SHOP);	        break;</div><div class='del'>-				default:    goto ignore;</div><div class='del'>-			}</div><div class='add'>+		case 0x3c: /* Invert */</div><div class='add'>+			map_key_clear(BTN_TOOL_RUBBER);</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		case HID_UP_MSVENDOR:</div><div class='del'>-</div><div class='del'>-			goto ignore;</div><div class='del'>-</div><div class='del'>-		case HID_UP_CUSTOM: /* Reported on Logitech and Apple USB keyboards */</div><div class='del'>-</div><div class='del'>-			set_bit(EV_REP, input-&gt;evbit);</div><div class='del'>-			switch(usage-&gt;hid &amp; HID_USAGE) {</div><div class='del'>-				case 0x003:</div><div class='del'>-					/* The fn key on Apple USB keyboards */</div><div class='del'>-					map_key_clear(KEY_FN);</div><div class='del'>-					hidinput_apple_setup(input);</div><div class='del'>-					break;</div><div class='add'>+		case 0x33: /* Touch */</div><div class='add'>+		case 0x42: /* TipSwitch */</div><div class='add'>+		case 0x43: /* TipSwitch2 */</div><div class='add'>+			device-&gt;quirks &amp;= ~HID_QUIRK_NOTOUCH;</div><div class='add'>+			map_key_clear(BTN_TOUCH);</div><div class='add'>+			break;</div><div class='ctx'> </div><div class='del'>-				default:    goto ignore;</div><div class='del'>-			}</div><div class='add'>+		case 0x44: /* BarrelSwitch */</div><div class='add'>+			map_key_clear(BTN_STYLUS);</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		case HID_UP_LOGIVENDOR:</div><div class='add'>+		default:  goto unknown;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case HID_UP_CONSUMER:	/* USB HUT v1.1, pages 56-62 */</div><div class='add'>+		switch (usage-&gt;hid &amp; HID_USAGE) {</div><div class='add'>+		case 0x000: goto ignore;</div><div class='add'>+		case 0x034: map_key_clear(KEY_SLEEP);		break;</div><div class='add'>+		case 0x036: map_key_clear(BTN_MISC);		break;</div><div class='add'>+</div><div class='add'>+		case 0x040: map_key_clear(KEY_MENU);		break;</div><div class='add'>+		case 0x045: map_key_clear(KEY_RADIO);		break;</div><div class='add'>+</div><div class='add'>+		case 0x083: map_key_clear(KEY_LAST);		break;</div><div class='add'>+		case 0x088: map_key_clear(KEY_PC);		break;</div><div class='add'>+		case 0x089: map_key_clear(KEY_TV);		break;</div><div class='add'>+		case 0x08a: map_key_clear(KEY_WWW);		break;</div><div class='add'>+		case 0x08b: map_key_clear(KEY_DVD);		break;</div><div class='add'>+		case 0x08c: map_key_clear(KEY_PHONE);		break;</div><div class='add'>+		case 0x08d: map_key_clear(KEY_PROGRAM);		break;</div><div class='add'>+		case 0x08e: map_key_clear(KEY_VIDEOPHONE);	break;</div><div class='add'>+		case 0x08f: map_key_clear(KEY_GAMES);		break;</div><div class='add'>+		case 0x090: map_key_clear(KEY_MEMO);		break;</div><div class='add'>+		case 0x091: map_key_clear(KEY_CD);		break;</div><div class='add'>+		case 0x092: map_key_clear(KEY_VCR);		break;</div><div class='add'>+		case 0x093: map_key_clear(KEY_TUNER);		break;</div><div class='add'>+		case 0x094: map_key_clear(KEY_EXIT);		break;</div><div class='add'>+		case 0x095: map_key_clear(KEY_HELP);		break;</div><div class='add'>+		case 0x096: map_key_clear(KEY_TAPE);		break;</div><div class='add'>+		case 0x097: map_key_clear(KEY_TV2);		break;</div><div class='add'>+		case 0x098: map_key_clear(KEY_SAT);		break;</div><div class='add'>+		case 0x09a: map_key_clear(KEY_PVR);		break;</div><div class='add'>+</div><div class='add'>+		case 0x09c: map_key_clear(KEY_CHANNELUP);	break;</div><div class='add'>+		case 0x09d: map_key_clear(KEY_CHANNELDOWN);	break;</div><div class='add'>+		case 0x0a0: map_key_clear(KEY_VCR2);		break;</div><div class='add'>+</div><div class='add'>+		case 0x0b0: map_key_clear(KEY_PLAY);		break;</div><div class='add'>+		case 0x0b1: map_key_clear(KEY_PAUSE);		break;</div><div class='add'>+		case 0x0b2: map_key_clear(KEY_RECORD);		break;</div><div class='add'>+		case 0x0b3: map_key_clear(KEY_FASTFORWARD);	break;</div><div class='add'>+		case 0x0b4: map_key_clear(KEY_REWIND);		break;</div><div class='add'>+		case 0x0b5: map_key_clear(KEY_NEXTSONG);	break;</div><div class='add'>+		case 0x0b6: map_key_clear(KEY_PREVIOUSSONG);	break;</div><div class='add'>+		case 0x0b7: map_key_clear(KEY_STOPCD);		break;</div><div class='add'>+		case 0x0b8: map_key_clear(KEY_EJECTCD);		break;</div><div class='add'>+		case 0x0bc: map_key_clear(KEY_MEDIA_REPEAT);	break;</div><div class='add'>+</div><div class='add'>+		case 0x0cd: map_key_clear(KEY_PLAYPAUSE);	break;</div><div class='add'>+		case 0x0e0: map_abs_clear(ABS_VOLUME);		break;</div><div class='add'>+		case 0x0e2: map_key_clear(KEY_MUTE);		break;</div><div class='add'>+		case 0x0e5: map_key_clear(KEY_BASSBOOST);	break;</div><div class='add'>+		case 0x0e9: map_key_clear(KEY_VOLUMEUP);	break;</div><div class='add'>+		case 0x0ea: map_key_clear(KEY_VOLUMEDOWN);	break;</div><div class='add'>+</div><div class='add'>+		case 0x182: map_key_clear(KEY_BOOKMARKS);	break;</div><div class='add'>+		case 0x183: map_key_clear(KEY_CONFIG);		break;</div><div class='add'>+		case 0x184: map_key_clear(KEY_WORDPROCESSOR);	break;</div><div class='add'>+		case 0x185: map_key_clear(KEY_EDITOR);		break;</div><div class='add'>+		case 0x186: map_key_clear(KEY_SPREADSHEET);	break;</div><div class='add'>+		case 0x187: map_key_clear(KEY_GRAPHICSEDITOR);	break;</div><div class='add'>+		case 0x188: map_key_clear(KEY_PRESENTATION);	break;</div><div class='add'>+		case 0x189: map_key_clear(KEY_DATABASE);	break;</div><div class='add'>+		case 0x18a: map_key_clear(KEY_MAIL);		break;</div><div class='add'>+		case 0x18b: map_key_clear(KEY_NEWS);		break;</div><div class='add'>+		case 0x18c: map_key_clear(KEY_VOICEMAIL);	break;</div><div class='add'>+		case 0x18d: map_key_clear(KEY_ADDRESSBOOK);	break;</div><div class='add'>+		case 0x18e: map_key_clear(KEY_CALENDAR);	break;</div><div class='add'>+		case 0x191: map_key_clear(KEY_FINANCE);		break;</div><div class='add'>+		case 0x192: map_key_clear(KEY_CALC);		break;</div><div class='add'>+		case 0x194: map_key_clear(KEY_FILE);		break;</div><div class='add'>+		case 0x196: map_key_clear(KEY_WWW);		break;</div><div class='add'>+		case 0x19c: map_key_clear(KEY_LOGOFF);		break;</div><div class='add'>+		case 0x19e: map_key_clear(KEY_COFFEE);		break;</div><div class='add'>+		case 0x1a6: map_key_clear(KEY_HELP);		break;</div><div class='add'>+		case 0x1a7: map_key_clear(KEY_DOCUMENTS);	break;</div><div class='add'>+		case 0x1ab: map_key_clear(KEY_SPELLCHECK);	break;</div><div class='add'>+		case 0x1b6: map_key_clear(KEY_MEDIA);		break;</div><div class='add'>+		case 0x1b7: map_key_clear(KEY_SOUND);		break;</div><div class='add'>+		case 0x1bc: map_key_clear(KEY_MESSENGER);	break;</div><div class='add'>+		case 0x1bd: map_key_clear(KEY_INFO);		break;</div><div class='add'>+		case 0x201: map_key_clear(KEY_NEW);		break;</div><div class='add'>+		case 0x202: map_key_clear(KEY_OPEN);		break;</div><div class='add'>+		case 0x203: map_key_clear(KEY_CLOSE);		break;</div><div class='add'>+		case 0x204: map_key_clear(KEY_EXIT);		break;</div><div class='add'>+		case 0x207: map_key_clear(KEY_SAVE);		break;</div><div class='add'>+		case 0x208: map_key_clear(KEY_PRINT);		break;</div><div class='add'>+		case 0x209: map_key_clear(KEY_PROPS);		break;</div><div class='add'>+		case 0x21a: map_key_clear(KEY_UNDO);		break;</div><div class='add'>+		case 0x21b: map_key_clear(KEY_COPY);		break;</div><div class='add'>+		case 0x21c: map_key_clear(KEY_CUT);		break;</div><div class='add'>+		case 0x21d: map_key_clear(KEY_PASTE);		break;</div><div class='add'>+		case 0x21f: map_key_clear(KEY_FIND);		break;</div><div class='add'>+		case 0x221: map_key_clear(KEY_SEARCH);		break;</div><div class='add'>+		case 0x222: map_key_clear(KEY_GOTO);		break;</div><div class='add'>+		case 0x223: map_key_clear(KEY_HOMEPAGE);	break;</div><div class='add'>+		case 0x224: map_key_clear(KEY_BACK);		break;</div><div class='add'>+		case 0x225: map_key_clear(KEY_FORWARD);		break;</div><div class='add'>+		case 0x226: map_key_clear(KEY_STOP);		break;</div><div class='add'>+		case 0x227: map_key_clear(KEY_REFRESH);		break;</div><div class='add'>+		case 0x22a: map_key_clear(KEY_BOOKMARKS);	break;</div><div class='add'>+		case 0x22d: map_key_clear(KEY_ZOOMIN);		break;</div><div class='add'>+		case 0x22e: map_key_clear(KEY_ZOOMOUT);		break;</div><div class='add'>+		case 0x22f: map_key_clear(KEY_ZOOMRESET);	break;</div><div class='add'>+		case 0x233: map_key_clear(KEY_SCROLLUP);	break;</div><div class='add'>+		case 0x234: map_key_clear(KEY_SCROLLDOWN);	break;</div><div class='add'>+		case 0x238: map_rel(REL_HWHEEL);		break;</div><div class='add'>+		case 0x25f: map_key_clear(KEY_CANCEL);		break;</div><div class='add'>+		case 0x279: map_key_clear(KEY_REDO);		break;</div><div class='add'>+</div><div class='add'>+		case 0x289: map_key_clear(KEY_REPLY);		break;</div><div class='add'>+		case 0x28b: map_key_clear(KEY_FORWARDMAIL);	break;</div><div class='add'>+		case 0x28c: map_key_clear(KEY_SEND);		break;</div><div class='add'>+</div><div class='add'>+		default:    goto ignore;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case HID_UP_HPVENDOR:	/* Reported on a Dutch layout HP5308 */</div><div class='add'>+		set_bit(EV_REP, input-&gt;evbit);</div><div class='add'>+		switch (usage-&gt;hid &amp; HID_USAGE) {</div><div class='add'>+		case 0x021: map_key_clear(KEY_PRINT);           break;</div><div class='add'>+		case 0x070: map_key_clear(KEY_HP);		break;</div><div class='add'>+		case 0x071: map_key_clear(KEY_CAMERA);		break;</div><div class='add'>+		case 0x072: map_key_clear(KEY_SOUND);		break;</div><div class='add'>+		case 0x073: map_key_clear(KEY_QUESTION);	break;</div><div class='add'>+		case 0x080: map_key_clear(KEY_EMAIL);		break;</div><div class='add'>+		case 0x081: map_key_clear(KEY_CHAT);		break;</div><div class='add'>+		case 0x082: map_key_clear(KEY_SEARCH);		break;</div><div class='add'>+		case 0x083: map_key_clear(KEY_CONNECT);	        break;</div><div class='add'>+		case 0x084: map_key_clear(KEY_FINANCE);		break;</div><div class='add'>+		case 0x085: map_key_clear(KEY_SPORT);		break;</div><div class='add'>+		case 0x086: map_key_clear(KEY_SHOP);	        break;</div><div class='add'>+		default:    goto ignore;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='ctx'> </div><div class='del'>-			goto ignore;</div><div class='del'>-		</div><div class='del'>-		case HID_UP_PID:</div><div class='add'>+	case HID_UP_MSVENDOR:</div><div class='add'>+		goto ignore;</div><div class='ctx'> </div><div class='del'>-			switch(usage-&gt;hid &amp; HID_USAGE) {</div><div class='del'>-				case 0xa4: map_key_clear(BTN_DEAD);	break;</div><div class='del'>-				default: goto ignore;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='add'>+	case HID_UP_CUSTOM: /* Reported on Logitech and Apple USB keyboards */</div><div class='add'>+		set_bit(EV_REP, input-&gt;evbit);</div><div class='add'>+		goto ignore;</div><div class='ctx'> </div><div class='del'>-		default:</div><div class='del'>-		unknown:</div><div class='del'>-			if (field-&gt;report_size == 1) {</div><div class='del'>-				if (field-&gt;report-&gt;type == HID_OUTPUT_REPORT) {</div><div class='del'>-					map_led(LED_MISC);</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-				map_key(BTN_MISC);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			if (field-&gt;flags &amp; HID_MAIN_ITEM_RELATIVE) {</div><div class='del'>-				map_rel(REL_MISC);</div><div class='add'>+	case HID_UP_LOGIVENDOR:</div><div class='add'>+		goto ignore;</div><div class='add'>+	</div><div class='add'>+	case HID_UP_PID:</div><div class='add'>+		switch (usage-&gt;hid &amp; HID_USAGE) {</div><div class='add'>+		case 0xa4: map_key_clear(BTN_DEAD);	break;</div><div class='add'>+		default: goto ignore;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+	unknown:</div><div class='add'>+		if (field-&gt;report_size == 1) {</div><div class='add'>+			if (field-&gt;report-&gt;type == HID_OUTPUT_REPORT) {</div><div class='add'>+				map_led(LED_MISC);</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='del'>-			map_abs(ABS_MISC);</div><div class='add'>+			map_key(BTN_MISC);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		if (field-&gt;flags &amp; HID_MAIN_ITEM_RELATIVE) {</div><div class='add'>+			map_rel(REL_MISC);</div><div class='ctx'> 			break;</div><div class='add'>+		}</div><div class='add'>+		map_abs(ABS_MISC);</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> mapped:</div><div class='del'>-	if (device-&gt;quirks &amp; HID_QUIRK_MIGHTYMOUSE) {</div><div class='del'>-		if (usage-&gt;hid == HID_GD_Z)</div><div class='del'>-			map_rel(REL_HWHEEL);</div><div class='del'>-		else if (usage-&gt;code == BTN_1)</div><div class='del'>-			map_key(BTN_2);</div><div class='del'>-		else if (usage-&gt;code == BTN_2)</div><div class='del'>-			map_key(BTN_1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((device-&gt;quirks &amp; (HID_QUIRK_2WHEEL_MOUSE_HACK_7 | HID_QUIRK_2WHEEL_MOUSE_HACK_5 |</div><div class='del'>-			HID_QUIRK_2WHEEL_MOUSE_HACK_B8)) &amp;&amp; (usage-&gt;type == EV_REL) &amp;&amp;</div><div class='del'>-			(usage-&gt;code == REL_WHEEL))</div><div class='del'>-		set_bit(REL_HWHEEL, bit);</div><div class='del'>-</div><div class='del'>-	if (((device-&gt;quirks &amp; HID_QUIRK_2WHEEL_MOUSE_HACK_5) &amp;&amp; (usage-&gt;hid == 0x00090005))</div><div class='del'>-		|| ((device-&gt;quirks &amp; HID_QUIRK_2WHEEL_MOUSE_HACK_7) &amp;&amp; (usage-&gt;hid == 0x00090007)))</div><div class='add'>+	if (device-&gt;driver-&gt;input_mapped &amp;&amp; device-&gt;driver-&gt;input_mapped(device,</div><div class='add'>+				hidinput, field, usage, &amp;bit, &amp;max) &lt; 0)</div><div class='ctx'> 		goto ignore;</div><div class='ctx'> </div><div class='del'>-	if ((device-&gt;quirks &amp; HID_QUIRK_BAD_RELATIVE_KEYS) &amp;&amp;</div><div class='del'>-		usage-&gt;type == EV_KEY &amp;&amp; (field-&gt;flags &amp; HID_MAIN_ITEM_RELATIVE))</div><div class='del'>-		field-&gt;flags &amp;= ~HID_MAIN_ITEM_RELATIVE;</div><div class='del'>-</div><div class='ctx'> 	set_bit(usage-&gt;type, input-&gt;evbit);</div><div class='ctx'> </div><div class='del'>-	if (device-&gt;quirks &amp; HID_QUIRK_DUPLICATE_USAGES &amp;&amp;</div><div class='del'>-			(usage-&gt;type == EV_KEY ||</div><div class='del'>-			 usage-&gt;type == EV_REL ||</div><div class='del'>-			 usage-&gt;type == EV_ABS))</div><div class='del'>-		clear_bit(usage-&gt;code, bit);</div><div class='del'>-</div><div class='ctx'> 	while (usage-&gt;code &lt;= max &amp;&amp; test_and_set_bit(usage-&gt;code, bit))</div><div class='ctx'> 		usage-&gt;code = find_next_zero_bit(bit, max + 1, usage-&gt;code);</div><div class='ctx'> </div><div class='hunk'>@@ -858,10 +585,6 @@ void hidinput_hid_event(struct hid_device *hid, struct hid_field *field, struct</div><div class='ctx'> 	if (!usage-&gt;type)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	/* handle input events for quirky devices */</div><div class='del'>-	if (hidinput_event_quirks(hid, field, usage, value))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='ctx'> 	if (usage-&gt;hat_min &lt; usage-&gt;hat_max || usage-&gt;hat_dir) {</div><div class='ctx'> 		int hat_dir = usage-&gt;hat_dir;</div><div class='ctx'> 		if (!hat_dir)</div><div class='hunk'>@@ -961,14 +684,14 @@ static int hidinput_open(struct input_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct hid_device *hid = input_get_drvdata(dev);</div><div class='ctx'> </div><div class='del'>-	return hid-&gt;hid_open(hid);</div><div class='add'>+	return hid-&gt;ll_driver-&gt;open(hid);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void hidinput_close(struct input_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct hid_device *hid = input_get_drvdata(dev);</div><div class='ctx'> </div><div class='del'>-	hid-&gt;hid_close(hid);</div><div class='add'>+	hid-&gt;ll_driver-&gt;close(hid);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -977,7 +700,7 @@ static void hidinput_close(struct input_dev *dev)</div><div class='ctx'>  * Read all reports and initialize the absolute field values.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-int hidinput_connect(struct hid_device *hid)</div><div class='add'>+int hidinput_connect(struct hid_device *hid, unsigned int force)</div><div class='ctx'> {</div><div class='ctx'> 	struct hid_report *report;</div><div class='ctx'> 	struct hid_input *hidinput = NULL;</div><div class='hunk'>@@ -985,19 +708,20 @@ int hidinput_connect(struct hid_device *hid)</div><div class='ctx'> 	int i, j, k;</div><div class='ctx'> 	int max_report_type = HID_OUTPUT_REPORT;</div><div class='ctx'> </div><div class='del'>-	if (hid-&gt;quirks &amp; HID_QUIRK_IGNORE_HIDINPUT)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;hid-&gt;inputs);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; hid-&gt;maxcollection; i++)</div><div class='del'>-		if (hid-&gt;collection[i].type == HID_COLLECTION_APPLICATION ||</div><div class='del'>-		    hid-&gt;collection[i].type == HID_COLLECTION_PHYSICAL)</div><div class='del'>-			if (IS_INPUT_APPLICATION(hid-&gt;collection[i].usage))</div><div class='del'>-				break;</div><div class='add'>+	if (!force) {</div><div class='add'>+		for (i = 0; i &lt; hid-&gt;maxcollection; i++) {</div><div class='add'>+			struct hid_collection *col = &amp;hid-&gt;collection[i];</div><div class='add'>+			if (col-&gt;type == HID_COLLECTION_APPLICATION ||</div><div class='add'>+					col-&gt;type == HID_COLLECTION_PHYSICAL)</div><div class='add'>+				if (IS_INPUT_APPLICATION(col-&gt;usage))</div><div class='add'>+					break;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	if (i == hid-&gt;maxcollection &amp;&amp; (hid-&gt;quirks &amp; HID_QUIRK_HIDINPUT) == 0)</div><div class='del'>-		return -1;</div><div class='add'>+		if (i == hid-&gt;maxcollection)</div><div class='add'>+			return -1;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (hid-&gt;quirks &amp; HID_QUIRK_SKIP_OUTPUT_REPORTS)</div><div class='ctx'> 		max_report_type = HID_INPUT_REPORT;</div><div class='hunk'>@@ -1019,7 +743,8 @@ int hidinput_connect(struct hid_device *hid)</div><div class='ctx'> 				}</div><div class='ctx'> </div><div class='ctx'> 				input_set_drvdata(input_dev, hid);</div><div class='del'>-				input_dev-&gt;event = hid-&gt;hidinput_input_event;</div><div class='add'>+				input_dev-&gt;event =</div><div class='add'>+					hid-&gt;ll_driver-&gt;hidinput_input_event;</div><div class='ctx'> 				input_dev-&gt;open = hidinput_open;</div><div class='ctx'> 				input_dev-&gt;close = hidinput_close;</div><div class='ctx'> 				input_dev-&gt;setkeycode = hidinput_setkeycode;</div><div class='hunk'>@@ -1032,7 +757,7 @@ int hidinput_connect(struct hid_device *hid)</div><div class='ctx'> 				input_dev-&gt;id.vendor  = hid-&gt;vendor;</div><div class='ctx'> 				input_dev-&gt;id.product = hid-&gt;product;</div><div class='ctx'> 				input_dev-&gt;id.version = hid-&gt;version;</div><div class='del'>-				input_dev-&gt;dev.parent = hid-&gt;dev;</div><div class='add'>+				input_dev-&gt;dev.parent = hid-&gt;dev.parent;</div><div class='ctx'> 				hidinput-&gt;input = input_dev;</div><div class='ctx'> 				list_add_tail(&amp;hidinput-&gt;list, &amp;hid-&gt;inputs);</div><div class='ctx'> 			}</div><div class='head'>diff --git a/drivers/hid/hid-lg.c b/drivers/hid/hid-lg.c<br/>new file mode 100644<br/>index 000000000000..406d8c82abf1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hid/hid-lg.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/hid-lg.c</a></div><div class='hunk'>@@ -0,0 +1,342 @@</div><div class='add'>+/*</div><div class='add'>+ *  HID driver for some logitech "special" devices</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (c) 1999 Andreas Gal</div><div class='add'>+ *  Copyright (c) 2000-2005 Vojtech Pavlik &lt;vojtech@suse.cz&gt;</div><div class='add'>+ *  Copyright (c) 2005 Michael Haboustak &lt;mike-@cinci.rr.com&gt; for Concept2, Inc</div><div class='add'>+ *  Copyright (c) 2006-2007 Jiri Kosina</div><div class='add'>+ *  Copyright (c) 2007 Paul Walmsley</div><div class='add'>+ *  Copyright (c) 2008 Jiri Slaby</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms of the GNU General Public License as published by the Free</div><div class='add'>+ * Software Foundation; either version 2 of the License, or (at your option)</div><div class='add'>+ * any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/hid.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+</div><div class='add'>+#include "hid-ids.h"</div><div class='add'>+#include "hid-lg.h"</div><div class='add'>+</div><div class='add'>+#define LG_RDESC		0x001</div><div class='add'>+#define LG_BAD_RELATIVE_KEYS	0x002</div><div class='add'>+#define LG_DUPLICATE_USAGES	0x004</div><div class='add'>+#define LG_RESET_LEDS		0x008</div><div class='add'>+#define LG_EXPANDED_KEYMAP	0x010</div><div class='add'>+#define LG_IGNORE_DOUBLED_WHEEL	0x020</div><div class='add'>+#define LG_WIRELESS		0x040</div><div class='add'>+#define LG_INVERT_HWHEEL	0x080</div><div class='add'>+#define LG_NOGET		0x100</div><div class='add'>+#define LG_FF			0x200</div><div class='add'>+#define LG_FF2			0x400</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Certain Logitech keyboards send in report #3 keys which are far</div><div class='add'>+ * above the logical maximum described in descriptor. This extends</div><div class='add'>+ * the original value of 0x28c of logical maximum to 0x104d</div><div class='add'>+ */</div><div class='add'>+static void lg_report_fixup(struct hid_device *hdev, __u8 *rdesc,</div><div class='add'>+		unsigned int rsize)</div><div class='add'>+{</div><div class='add'>+	unsigned long quirks = (unsigned long)hid_get_drvdata(hdev);</div><div class='add'>+</div><div class='add'>+	if ((quirks &amp; LG_RDESC) &amp;&amp; rsize &gt;= 90 &amp;&amp; rdesc[83] == 0x26 &amp;&amp;</div><div class='add'>+			rdesc[84] == 0x8c &amp;&amp; rdesc[85] == 0x02) {</div><div class='add'>+		dev_info(&amp;hdev-&gt;dev, "fixing up Logitech keyboard report "</div><div class='add'>+				"descriptor\n");</div><div class='add'>+		rdesc[84] = rdesc[89] = 0x4d;</div><div class='add'>+		rdesc[85] = rdesc[90] = 0x10;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define lg_map_key_clear(c)	hid_map_usage_clear(hi, usage, bit, max, \</div><div class='add'>+		EV_KEY, (c))</div><div class='add'>+</div><div class='add'>+static int lg_ultrax_remote_mapping(struct hid_input *hi,</div><div class='add'>+		struct hid_usage *usage, unsigned long **bit, int *max)</div><div class='add'>+{</div><div class='add'>+	if ((usage-&gt;hid &amp; HID_USAGE_PAGE) != HID_UP_LOGIVENDOR)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	set_bit(EV_REP, hi-&gt;input-&gt;evbit);</div><div class='add'>+	switch (usage-&gt;hid &amp; HID_USAGE) {</div><div class='add'>+	/* Reported on Logitech Ultra X Media Remote */</div><div class='add'>+	case 0x004: lg_map_key_clear(KEY_AGAIN);	break;</div><div class='add'>+	case 0x00d: lg_map_key_clear(KEY_HOME);		break;</div><div class='add'>+	case 0x024: lg_map_key_clear(KEY_SHUFFLE);	break;</div><div class='add'>+	case 0x025: lg_map_key_clear(KEY_TV);		break;</div><div class='add'>+	case 0x026: lg_map_key_clear(KEY_MENU);		break;</div><div class='add'>+	case 0x031: lg_map_key_clear(KEY_AUDIO);	break;</div><div class='add'>+	case 0x032: lg_map_key_clear(KEY_TEXT);		break;</div><div class='add'>+	case 0x033: lg_map_key_clear(KEY_LAST);		break;</div><div class='add'>+	case 0x047: lg_map_key_clear(KEY_MP3);		break;</div><div class='add'>+	case 0x048: lg_map_key_clear(KEY_DVD);		break;</div><div class='add'>+	case 0x049: lg_map_key_clear(KEY_MEDIA);	break;</div><div class='add'>+	case 0x04a: lg_map_key_clear(KEY_VIDEO);	break;</div><div class='add'>+	case 0x04b: lg_map_key_clear(KEY_ANGLE);	break;</div><div class='add'>+	case 0x04c: lg_map_key_clear(KEY_LANGUAGE);	break;</div><div class='add'>+	case 0x04d: lg_map_key_clear(KEY_SUBTITLE);	break;</div><div class='add'>+	case 0x051: lg_map_key_clear(KEY_RED);		break;</div><div class='add'>+	case 0x052: lg_map_key_clear(KEY_CLOSE);	break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lg_wireless_mapping(struct hid_input *hi, struct hid_usage *usage,</div><div class='add'>+		unsigned long **bit, int *max)</div><div class='add'>+{</div><div class='add'>+	if ((usage-&gt;hid &amp; HID_USAGE_PAGE) != HID_UP_CONSUMER)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	switch (usage-&gt;hid &amp; HID_USAGE) {</div><div class='add'>+	case 0x1001: lg_map_key_clear(KEY_MESSENGER);		break;</div><div class='add'>+	case 0x1003: lg_map_key_clear(KEY_SOUND);		break;</div><div class='add'>+	case 0x1004: lg_map_key_clear(KEY_VIDEO);		break;</div><div class='add'>+	case 0x1005: lg_map_key_clear(KEY_AUDIO);		break;</div><div class='add'>+	case 0x100a: lg_map_key_clear(KEY_DOCUMENTS);		break;</div><div class='add'>+	case 0x1011: lg_map_key_clear(KEY_PREVIOUSSONG);	break;</div><div class='add'>+	case 0x1012: lg_map_key_clear(KEY_NEXTSONG);		break;</div><div class='add'>+	case 0x1013: lg_map_key_clear(KEY_CAMERA);		break;</div><div class='add'>+	case 0x1014: lg_map_key_clear(KEY_MESSENGER);		break;</div><div class='add'>+	case 0x1015: lg_map_key_clear(KEY_RECORD);		break;</div><div class='add'>+	case 0x1016: lg_map_key_clear(KEY_PLAYER);		break;</div><div class='add'>+	case 0x1017: lg_map_key_clear(KEY_EJECTCD);		break;</div><div class='add'>+	case 0x1018: lg_map_key_clear(KEY_MEDIA);		break;</div><div class='add'>+	case 0x1019: lg_map_key_clear(KEY_PROG1);		break;</div><div class='add'>+	case 0x101a: lg_map_key_clear(KEY_PROG2);		break;</div><div class='add'>+	case 0x101b: lg_map_key_clear(KEY_PROG3);		break;</div><div class='add'>+	case 0x101f: lg_map_key_clear(KEY_ZOOMIN);		break;</div><div class='add'>+	case 0x1020: lg_map_key_clear(KEY_ZOOMOUT);		break;</div><div class='add'>+	case 0x1021: lg_map_key_clear(KEY_ZOOMRESET);		break;</div><div class='add'>+	case 0x1023: lg_map_key_clear(KEY_CLOSE);		break;</div><div class='add'>+	case 0x1027: lg_map_key_clear(KEY_MENU);		break;</div><div class='add'>+	/* this one is marked as 'Rotate' */</div><div class='add'>+	case 0x1028: lg_map_key_clear(KEY_ANGLE);		break;</div><div class='add'>+	case 0x1029: lg_map_key_clear(KEY_SHUFFLE);		break;</div><div class='add'>+	case 0x102a: lg_map_key_clear(KEY_BACK);		break;</div><div class='add'>+	case 0x102b: lg_map_key_clear(KEY_CYCLEWINDOWS);	break;</div><div class='add'>+	case 0x1041: lg_map_key_clear(KEY_BATTERY);		break;</div><div class='add'>+	case 0x1042: lg_map_key_clear(KEY_WORDPROCESSOR);	break;</div><div class='add'>+	case 0x1043: lg_map_key_clear(KEY_SPREADSHEET);		break;</div><div class='add'>+	case 0x1044: lg_map_key_clear(KEY_PRESENTATION);	break;</div><div class='add'>+	case 0x1045: lg_map_key_clear(KEY_UNDO);		break;</div><div class='add'>+	case 0x1046: lg_map_key_clear(KEY_REDO);		break;</div><div class='add'>+	case 0x1047: lg_map_key_clear(KEY_PRINT);		break;</div><div class='add'>+	case 0x1048: lg_map_key_clear(KEY_SAVE);		break;</div><div class='add'>+	case 0x1049: lg_map_key_clear(KEY_PROG1);		break;</div><div class='add'>+	case 0x104a: lg_map_key_clear(KEY_PROG2);		break;</div><div class='add'>+	case 0x104b: lg_map_key_clear(KEY_PROG3);		break;</div><div class='add'>+	case 0x104c: lg_map_key_clear(KEY_PROG4);		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lg_input_mapping(struct hid_device *hdev, struct hid_input *hi,</div><div class='add'>+		struct hid_field *field, struct hid_usage *usage,</div><div class='add'>+		unsigned long **bit, int *max)</div><div class='add'>+{</div><div class='add'>+	/* extended mapping for certain Logitech hardware (Logitech cordless</div><div class='add'>+	   desktop LX500) */</div><div class='add'>+	static const u8 e_keymap[] = {</div><div class='add'>+		  0,216,  0,213,175,156,  0,  0,  0,  0,</div><div class='add'>+		144,  0,  0,  0,  0,  0,  0,  0,  0,212,</div><div class='add'>+		174,167,152,161,112,  0,  0,  0,154,  0,</div><div class='add'>+		  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,</div><div class='add'>+		  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,</div><div class='add'>+		  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,</div><div class='add'>+		  0,  0,  0,  0,  0,183,184,185,186,187,</div><div class='add'>+		188,189,190,191,192,193,194,  0,  0,  0</div><div class='add'>+	};</div><div class='add'>+	unsigned long quirks = (unsigned long)hid_get_drvdata(hdev);</div><div class='add'>+	unsigned int hid = usage-&gt;hid;</div><div class='add'>+</div><div class='add'>+	if (hdev-&gt;product == USB_DEVICE_ID_LOGITECH_RECEIVER &amp;&amp;</div><div class='add'>+			lg_ultrax_remote_mapping(hi, usage, bit, max))</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	if ((quirks &amp; LG_WIRELESS) &amp;&amp; lg_wireless_mapping(hi, usage, bit, max))</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	if ((hid &amp; HID_USAGE_PAGE) != HID_UP_BUTTON)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	hid &amp;= HID_USAGE;</div><div class='add'>+</div><div class='add'>+	/* Special handling for Logitech Cordless Desktop */</div><div class='add'>+	if (field-&gt;application == HID_GD_MOUSE) {</div><div class='add'>+		if ((quirks &amp; LG_IGNORE_DOUBLED_WHEEL) &amp;&amp;</div><div class='add'>+				(hid == 7 || hid == 8))</div><div class='add'>+			return -1;</div><div class='add'>+	} else {</div><div class='add'>+		if ((quirks &amp; LG_EXPANDED_KEYMAP) &amp;&amp;</div><div class='add'>+				hid &lt; ARRAY_SIZE(e_keymap) &amp;&amp;</div><div class='add'>+				e_keymap[hid] != 0) {</div><div class='add'>+			hid_map_usage(hi, usage, bit, max, EV_KEY,</div><div class='add'>+					e_keymap[hid]);</div><div class='add'>+			return 1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lg_input_mapped(struct hid_device *hdev, struct hid_input *hi,</div><div class='add'>+		struct hid_field *field, struct hid_usage *usage,</div><div class='add'>+		unsigned long **bit, int *max)</div><div class='add'>+{</div><div class='add'>+	unsigned long quirks = (unsigned long)hid_get_drvdata(hdev);</div><div class='add'>+</div><div class='add'>+	if ((quirks &amp; LG_BAD_RELATIVE_KEYS) &amp;&amp; usage-&gt;type == EV_KEY &amp;&amp;</div><div class='add'>+			(field-&gt;flags &amp; HID_MAIN_ITEM_RELATIVE))</div><div class='add'>+		field-&gt;flags &amp;= ~HID_MAIN_ITEM_RELATIVE;</div><div class='add'>+</div><div class='add'>+	if ((quirks &amp; LG_DUPLICATE_USAGES) &amp;&amp; (usage-&gt;type == EV_KEY ||</div><div class='add'>+			 usage-&gt;type == EV_REL || usage-&gt;type == EV_ABS))</div><div class='add'>+		clear_bit(usage-&gt;code, *bit);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lg_event(struct hid_device *hdev, struct hid_field *field,</div><div class='add'>+		struct hid_usage *usage, __s32 value)</div><div class='add'>+{</div><div class='add'>+	unsigned long quirks = (unsigned long)hid_get_drvdata(hdev);</div><div class='add'>+</div><div class='add'>+	if ((quirks &amp; LG_INVERT_HWHEEL) &amp;&amp; usage-&gt;code == REL_HWHEEL) {</div><div class='add'>+		input_event(field-&gt;hidinput-&gt;input, usage-&gt;type, usage-&gt;code,</div><div class='add'>+				-value);</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lg_probe(struct hid_device *hdev, const struct hid_device_id *id)</div><div class='add'>+{</div><div class='add'>+	unsigned long quirks = id-&gt;driver_data;</div><div class='add'>+	unsigned int connect_mask = HID_CONNECT_DEFAULT;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	hid_set_drvdata(hdev, (void *)quirks);</div><div class='add'>+</div><div class='add'>+	if (quirks &amp; LG_NOGET)</div><div class='add'>+		hdev-&gt;quirks |= HID_QUIRK_NOGET;</div><div class='add'>+</div><div class='add'>+	ret = hid_parse(hdev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;hdev-&gt;dev, "parse failed\n");</div><div class='add'>+		goto err_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (quirks &amp; (LG_FF | LG_FF2))</div><div class='add'>+		connect_mask &amp;= ~HID_CONNECT_FF;</div><div class='add'>+</div><div class='add'>+	ret = hid_hw_start(hdev, connect_mask);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;hdev-&gt;dev, "hw start failed\n");</div><div class='add'>+		goto err_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (quirks &amp; LG_RESET_LEDS)</div><div class='add'>+		usbhid_set_leds(hdev);</div><div class='add'>+</div><div class='add'>+	if (quirks &amp; LG_FF)</div><div class='add'>+		lgff_init(hdev);</div><div class='add'>+	if (quirks &amp; LG_FF2)</div><div class='add'>+		lg2ff_init(hdev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+err_free:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hid_device_id lg_devices[] = {</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_MX3000_RECEIVER),</div><div class='add'>+		.driver_data = LG_RDESC | LG_WIRELESS },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_S510_RECEIVER),</div><div class='add'>+		.driver_data = LG_RDESC | LG_WIRELESS },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_S510_RECEIVER_2),</div><div class='add'>+		.driver_data = LG_RDESC | LG_WIRELESS },</div><div class='add'>+</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_RECEIVER),</div><div class='add'>+		.driver_data = LG_BAD_RELATIVE_KEYS },</div><div class='add'>+</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_DINOVO_DESKTOP),</div><div class='add'>+		.driver_data = LG_DUPLICATE_USAGES },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_DINOVO_EDGE),</div><div class='add'>+		.driver_data = LG_DUPLICATE_USAGES },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_DINOVO_MINI),</div><div class='add'>+		.driver_data = LG_DUPLICATE_USAGES },</div><div class='add'>+</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_KBD),</div><div class='add'>+		.driver_data = LG_RESET_LEDS },</div><div class='add'>+</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_ELITE_KBD),</div><div class='add'>+		.driver_data = LG_IGNORE_DOUBLED_WHEEL | LG_EXPANDED_KEYMAP },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_CORDLESS_DESKTOP_LX500),</div><div class='add'>+		.driver_data = LG_IGNORE_DOUBLED_WHEEL | LG_EXPANDED_KEYMAP },</div><div class='add'>+</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_LX3),</div><div class='add'>+		.driver_data = LG_INVERT_HWHEEL },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_V150),</div><div class='add'>+		.driver_data = LG_INVERT_HWHEEL },</div><div class='add'>+</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_EXTREME_3D),</div><div class='add'>+		.driver_data = LG_NOGET },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_WHEEL),</div><div class='add'>+		.driver_data = LG_NOGET | LG_FF },</div><div class='add'>+</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_RUMBLEPAD),</div><div class='add'>+		.driver_data = LG_FF },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_RUMBLEPAD2_2),</div><div class='add'>+		.driver_data = LG_FF },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_WINGMAN_F3D),</div><div class='add'>+		.driver_data = LG_FF },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_FORCE3D_PRO),</div><div class='add'>+		.driver_data = LG_FF },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_MOMO_WHEEL),</div><div class='add'>+		.driver_data = LG_FF },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_MOMO_WHEEL2),</div><div class='add'>+		.driver_data = LG_FF },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_RUMBLEPAD2),</div><div class='add'>+		.driver_data = LG_FF2 },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(hid, lg_devices);</div><div class='add'>+</div><div class='add'>+static struct hid_driver lg_driver = {</div><div class='add'>+	.name = "logitech",</div><div class='add'>+	.id_table = lg_devices,</div><div class='add'>+	.report_fixup = lg_report_fixup,</div><div class='add'>+	.input_mapping = lg_input_mapping,</div><div class='add'>+	.input_mapped = lg_input_mapped,</div><div class='add'>+	.event = lg_event,</div><div class='add'>+	.probe = lg_probe,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int lg_init(void)</div><div class='add'>+{</div><div class='add'>+	return hid_register_driver(&amp;lg_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void lg_exit(void)</div><div class='add'>+{</div><div class='add'>+	hid_unregister_driver(&amp;lg_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(lg_init);</div><div class='add'>+module_exit(lg_exit);</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='add'>+HID_COMPAT_LOAD_DRIVER(logitech);</div><div class='head'>diff --git a/drivers/hid/hid-lg.h b/drivers/hid/hid-lg.h<br/>new file mode 100644<br/>index 000000000000..27ae750ca878<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hid/hid-lg.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/hid-lg.h</a></div><div class='hunk'>@@ -0,0 +1,18 @@</div><div class='add'>+#ifndef __HID_LG_H</div><div class='add'>+#define __HID_LG_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/autoconf.h&gt;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_LOGITECH_FF</div><div class='add'>+int lgff_init(struct hid_device *hdev);</div><div class='add'>+#else</div><div class='add'>+static inline int lgff_init(struct hid_device *hdev) { return -1; }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_LOGIRUMBLEPAD2_FF</div><div class='add'>+int lg2ff_init(struct hid_device *hdev);</div><div class='add'>+#else</div><div class='add'>+static inline int lg2ff_init(struct hid_device *hdev) { return -1; }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/hid/usbhid/hid-lg2ff.c b/drivers/hid/hid-lg2ff.c<br/>index d469bd0061c9..4e6dc6e26523 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hid/usbhid/hid-lg2ff.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/hid/usbhid/hid-lg2ff.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hid/hid-lg2ff.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/hid-lg2ff.c</a></div><div class='hunk'>@@ -24,7 +24,9 @@</div><div class='ctx'> #include &lt;linux/input.h&gt;</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='ctx'> #include &lt;linux/hid.h&gt;</div><div class='del'>-#include "usbhid.h"</div><div class='add'>+</div><div class='add'>+#include "usbhid/usbhid.h"</div><div class='add'>+#include "hid-lg.h"</div><div class='ctx'> </div><div class='ctx'> struct lg2ff_device {</div><div class='ctx'> 	struct hid_report *report;</div><div class='hunk'>@@ -57,7 +59,7 @@ static int play_effect(struct input_dev *dev, void *data,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int hid_lg2ff_init(struct hid_device *hid)</div><div class='add'>+int lg2ff_init(struct hid_device *hid)</div><div class='ctx'> {</div><div class='ctx'> 	struct lg2ff_device *lg2ff;</div><div class='ctx'> 	struct hid_report *report;</div><div class='hunk'>@@ -69,18 +71,18 @@ int hid_lg2ff_init(struct hid_device *hid)</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='ctx'> 	if (list_empty(report_list)) {</div><div class='del'>-		printk(KERN_ERR "hid-lg2ff: no output report found\n");</div><div class='add'>+		dev_err(&amp;hid-&gt;dev, "no output report found\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	report = list_entry(report_list-&gt;next, struct hid_report, list);</div><div class='ctx'> </div><div class='ctx'> 	if (report-&gt;maxfield &lt; 1) {</div><div class='del'>-		printk(KERN_ERR "hid-lg2ff: output report is empty\n");</div><div class='add'>+		dev_err(&amp;hid-&gt;dev, "output report is empty\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (report-&gt;field[0]-&gt;report_count &lt; 7) {</div><div class='del'>-		printk(KERN_ERR "hid-lg2ff: not enough values in the field\n");</div><div class='add'>+		dev_err(&amp;hid-&gt;dev, "not enough values in the field\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -107,7 +109,7 @@ int hid_lg2ff_init(struct hid_device *hid)</div><div class='ctx'> </div><div class='ctx'> 	usbhid_submit_report(hid, report, USB_DIR_OUT);</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "Force feedback for Logitech Rumblepad 2 by "</div><div class='add'>+	dev_info(&amp;hid-&gt;dev, "Force feedback for Logitech Rumblepad 2 by "</div><div class='ctx'> 	       "Anssi Hannula &lt;anssi.hannula@gmail.com&gt;\n");</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/hid/usbhid/hid-lgff.c b/drivers/hid/hid-lgff.c<br/>index 4b7ab6a46d93..51aff08e10ce 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hid/usbhid/hid-lgff.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/hid/usbhid/hid-lgff.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hid/hid-lgff.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/hid-lgff.c</a></div><div class='hunk'>@@ -30,7 +30,9 @@</div><div class='ctx'> #include &lt;linux/input.h&gt;</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='ctx'> #include &lt;linux/hid.h&gt;</div><div class='del'>-#include "usbhid.h"</div><div class='add'>+</div><div class='add'>+#include "usbhid/usbhid.h"</div><div class='add'>+#include "hid-lg.h"</div><div class='ctx'> </div><div class='ctx'> struct dev_type {</div><div class='ctx'> 	u16 idVendor;</div><div class='hunk'>@@ -48,6 +50,12 @@ static const signed short ff_joystick[] = {</div><div class='ctx'> 	-1</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const signed short ff_wheel[] = {</div><div class='add'>+	FF_CONSTANT,</div><div class='add'>+	FF_AUTOCENTER,</div><div class='add'>+	-1</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const struct dev_type devices[] = {</div><div class='ctx'> 	{ 0x046d, 0xc211, ff_rumble },</div><div class='ctx'> 	{ 0x046d, 0xc219, ff_rumble },</div><div class='hunk'>@@ -55,7 +63,7 @@ static const struct dev_type devices[] = {</div><div class='ctx'> 	{ 0x046d, 0xc286, ff_joystick },</div><div class='ctx'> 	{ 0x046d, 0xc294, ff_joystick },</div><div class='ctx'> 	{ 0x046d, 0xc295, ff_joystick },</div><div class='del'>-	{ 0x046d, 0xca03, ff_joystick },</div><div class='add'>+	{ 0x046d, 0xca03, ff_wheel },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int hid_lgff_play(struct input_dev *dev, void *data, struct ff_effect *effect)</div><div class='hunk'>@@ -100,7 +108,24 @@ static int hid_lgff_play(struct input_dev *dev, void *data, struct ff_effect *ef</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int hid_lgff_init(struct hid_device* hid)</div><div class='add'>+static void hid_lgff_set_autocenter(struct input_dev *dev, u16 magnitude)</div><div class='add'>+{</div><div class='add'>+	struct hid_device *hid = input_get_drvdata(dev);</div><div class='add'>+	struct list_head *report_list = &amp;hid-&gt;report_enum[HID_OUTPUT_REPORT].report_list;</div><div class='add'>+	struct hid_report *report = list_entry(report_list-&gt;next, struct hid_report, list);</div><div class='add'>+	__s32 *value = report-&gt;field[0]-&gt;value;</div><div class='add'>+	magnitude = (magnitude &gt;&gt; 12) &amp; 0xf;</div><div class='add'>+	*value++ = 0xfe;</div><div class='add'>+	*value++ = 0x0d;</div><div class='add'>+	*value++ = magnitude;   /* clockwise strength */</div><div class='add'>+	*value++ = magnitude;   /* counter-clockwise strength */</div><div class='add'>+	*value++ = 0x80;</div><div class='add'>+	*value++ = 0x00;</div><div class='add'>+	*value = 0x00;</div><div class='add'>+	usbhid_submit_report(hid, report, USB_DIR_OUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int lgff_init(struct hid_device* hid)</div><div class='ctx'> {</div><div class='ctx'> 	struct hid_input *hidinput = list_entry(hid-&gt;inputs.next, struct hid_input, list);</div><div class='ctx'> 	struct list_head *report_list = &amp;hid-&gt;report_enum[HID_OUTPUT_REPORT].report_list;</div><div class='hunk'>@@ -145,6 +170,9 @@ int hid_lgff_init(struct hid_device* hid)</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		return error;</div><div class='ctx'> </div><div class='add'>+	if ( test_bit(FF_AUTOCENTER, dev-&gt;ffbit) )</div><div class='add'>+		dev-&gt;ff-&gt;set_autocenter = hid_lgff_set_autocenter;</div><div class='add'>+</div><div class='ctx'> 	printk(KERN_INFO "Force feedback for Logitech force feedback devices by Johann Deneux &lt;johann.deneux@it.uu.se&gt;\n");</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/hid/hid-microsoft.c b/drivers/hid/hid-microsoft.c<br/>new file mode 100644<br/>index 000000000000..d718b1607d0f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hid/hid-microsoft.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/hid-microsoft.c</a></div><div class='hunk'>@@ -0,0 +1,219 @@</div><div class='add'>+/*</div><div class='add'>+ *  HID driver for some microsoft "special" devices</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (c) 1999 Andreas Gal</div><div class='add'>+ *  Copyright (c) 2000-2005 Vojtech Pavlik &lt;vojtech@suse.cz&gt;</div><div class='add'>+ *  Copyright (c) 2005 Michael Haboustak &lt;mike-@cinci.rr.com&gt; for Concept2, Inc</div><div class='add'>+ *  Copyright (c) 2006-2007 Jiri Kosina</div><div class='add'>+ *  Copyright (c) 2007 Paul Walmsley</div><div class='add'>+ *  Copyright (c) 2008 Jiri Slaby</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms of the GNU General Public License as published by the Free</div><div class='add'>+ * Software Foundation; either version 2 of the License, or (at your option)</div><div class='add'>+ * any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/input.h&gt;</div><div class='add'>+#include &lt;linux/hid.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+</div><div class='add'>+#include "hid-ids.h"</div><div class='add'>+</div><div class='add'>+#define MS_HIDINPUT	0x01</div><div class='add'>+#define MS_ERGONOMY	0x02</div><div class='add'>+#define MS_PRESENTER	0x04</div><div class='add'>+#define MS_RDESC	0x08</div><div class='add'>+#define MS_NOGET	0x10</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Microsoft Wireless Desktop Receiver (Model 1028) has several</div><div class='add'>+ * 'Usage Min/Max' where it ought to have 'Physical Min/Max'</div><div class='add'>+ */</div><div class='add'>+static void ms_report_fixup(struct hid_device *hdev, __u8 *rdesc,</div><div class='add'>+		unsigned int rsize)</div><div class='add'>+{</div><div class='add'>+	unsigned long quirks = (unsigned long)hid_get_drvdata(hdev);</div><div class='add'>+</div><div class='add'>+	if ((quirks &amp; MS_RDESC) &amp;&amp; rsize == 571 &amp;&amp; rdesc[284] == 0x19 &amp;&amp;</div><div class='add'>+			rdesc[286] == 0x2a &amp;&amp; rdesc[304] == 0x19 &amp;&amp;</div><div class='add'>+			rdesc[306] == 0x29 &amp;&amp; rdesc[352] == 0x1a &amp;&amp;</div><div class='add'>+			rdesc[355] == 0x2a &amp;&amp; rdesc[557] == 0x19 &amp;&amp;</div><div class='add'>+			rdesc[559] == 0x29) {</div><div class='add'>+		dev_info(&amp;hdev-&gt;dev, "fixing up Microsoft Wireless Receiver "</div><div class='add'>+				"Model 1028 report descriptor\n");</div><div class='add'>+		rdesc[284] = rdesc[304] = rdesc[557] = 0x35;</div><div class='add'>+		rdesc[352] = 0x36;</div><div class='add'>+		rdesc[286] = rdesc[355] = 0x46;</div><div class='add'>+		rdesc[306] = rdesc[559] = 0x45;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define ms_map_key_clear(c)	hid_map_usage_clear(hi, usage, bit, max, \</div><div class='add'>+					EV_KEY, (c))</div><div class='add'>+static int ms_ergonomy_kb_quirk(struct hid_input *hi, struct hid_usage *usage,</div><div class='add'>+		unsigned long **bit, int *max)</div><div class='add'>+{</div><div class='add'>+	struct input_dev *input = hi-&gt;input;</div><div class='add'>+</div><div class='add'>+	switch (usage-&gt;hid &amp; HID_USAGE) {</div><div class='add'>+	case 0xfd06: ms_map_key_clear(KEY_CHAT);	break;</div><div class='add'>+	case 0xfd07: ms_map_key_clear(KEY_PHONE);	break;</div><div class='add'>+	case 0xff05:</div><div class='add'>+		set_bit(EV_REP, input-&gt;evbit);</div><div class='add'>+		ms_map_key_clear(KEY_F13);</div><div class='add'>+		set_bit(KEY_F14, input-&gt;keybit);</div><div class='add'>+		set_bit(KEY_F15, input-&gt;keybit);</div><div class='add'>+		set_bit(KEY_F16, input-&gt;keybit);</div><div class='add'>+		set_bit(KEY_F17, input-&gt;keybit);</div><div class='add'>+		set_bit(KEY_F18, input-&gt;keybit);</div><div class='add'>+	default:</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ms_presenter_8k_quirk(struct hid_input *hi, struct hid_usage *usage,</div><div class='add'>+		unsigned long **bit, int *max)</div><div class='add'>+{</div><div class='add'>+	set_bit(EV_REP, hi-&gt;input-&gt;evbit);</div><div class='add'>+	switch (usage-&gt;hid &amp; HID_USAGE) {</div><div class='add'>+	case 0xfd08: ms_map_key_clear(KEY_FORWARD);	break;</div><div class='add'>+	case 0xfd09: ms_map_key_clear(KEY_BACK);	break;</div><div class='add'>+	case 0xfd0b: ms_map_key_clear(KEY_PLAYPAUSE);	break;</div><div class='add'>+	case 0xfd0e: ms_map_key_clear(KEY_CLOSE);	break;</div><div class='add'>+	case 0xfd0f: ms_map_key_clear(KEY_PLAY);	break;</div><div class='add'>+	default:</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ms_input_mapping(struct hid_device *hdev, struct hid_input *hi,</div><div class='add'>+		struct hid_field *field, struct hid_usage *usage,</div><div class='add'>+		unsigned long **bit, int *max)</div><div class='add'>+{</div><div class='add'>+	unsigned long quirks = (unsigned long)hid_get_drvdata(hdev);</div><div class='add'>+</div><div class='add'>+	if ((usage-&gt;hid &amp; HID_USAGE_PAGE) != HID_UP_MSVENDOR)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (quirks &amp; MS_ERGONOMY) {</div><div class='add'>+		int ret = ms_ergonomy_kb_quirk(hi, usage, bit, max);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((quirks &amp; MS_PRESENTER) &amp;&amp;</div><div class='add'>+			ms_presenter_8k_quirk(hi, usage, bit, max))</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ms_event(struct hid_device *hdev, struct hid_field *field,</div><div class='add'>+		struct hid_usage *usage, __s32 value)</div><div class='add'>+{</div><div class='add'>+	unsigned long quirks = (unsigned long)hid_get_drvdata(hdev);</div><div class='add'>+</div><div class='add'>+	if (!(hdev-&gt;claimed &amp; HID_CLAIMED_INPUT) || !field-&gt;hidinput ||</div><div class='add'>+			!usage-&gt;type)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Handling MS keyboards special buttons */</div><div class='add'>+	if (quirks &amp; MS_ERGONOMY &amp;&amp; usage-&gt;hid == (HID_UP_MSVENDOR | 0xff05)) {</div><div class='add'>+		struct input_dev *input = field-&gt;hidinput-&gt;input;</div><div class='add'>+		static unsigned int last_key = 0;</div><div class='add'>+		unsigned int key = 0;</div><div class='add'>+		switch (value) {</div><div class='add'>+		case 0x01: key = KEY_F14; break;</div><div class='add'>+		case 0x02: key = KEY_F15; break;</div><div class='add'>+		case 0x04: key = KEY_F16; break;</div><div class='add'>+		case 0x08: key = KEY_F17; break;</div><div class='add'>+		case 0x10: key = KEY_F18; break;</div><div class='add'>+		}</div><div class='add'>+		if (key) {</div><div class='add'>+			input_event(input, usage-&gt;type, key, 1);</div><div class='add'>+			last_key = key;</div><div class='add'>+		} else</div><div class='add'>+			input_event(input, usage-&gt;type, last_key, 0);</div><div class='add'>+</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ms_probe(struct hid_device *hdev, const struct hid_device_id *id)</div><div class='add'>+{</div><div class='add'>+	unsigned long quirks = id-&gt;driver_data;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	hid_set_drvdata(hdev, (void *)quirks);</div><div class='add'>+</div><div class='add'>+	if (quirks &amp; MS_NOGET)</div><div class='add'>+		hdev-&gt;quirks |= HID_QUIRK_NOGET;</div><div class='add'>+</div><div class='add'>+	ret = hid_parse(hdev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;hdev-&gt;dev, "parse failed\n");</div><div class='add'>+		goto err_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT | ((quirks &amp; MS_HIDINPUT) ?</div><div class='add'>+				HID_CONNECT_HIDINPUT_FORCE : 0));</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;hdev-&gt;dev, "hw start failed\n");</div><div class='add'>+		goto err_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+err_free:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hid_device_id ms_devices[] = {</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_SIDEWINDER_GV),</div><div class='add'>+		.driver_data = MS_HIDINPUT },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_NE4K),</div><div class='add'>+		.driver_data = MS_ERGONOMY },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_LK6K),</div><div class='add'>+		.driver_data = MS_ERGONOMY | MS_RDESC },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_USB),</div><div class='add'>+		.driver_data = MS_PRESENTER },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0),</div><div class='add'>+		.driver_data = MS_NOGET },</div><div class='add'>+</div><div class='add'>+	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_BT),</div><div class='add'>+		.driver_data = MS_PRESENTER },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(hid, ms_devices);</div><div class='add'>+</div><div class='add'>+static struct hid_driver ms_driver = {</div><div class='add'>+	.name = "microsoft",</div><div class='add'>+	.id_table = ms_devices,</div><div class='add'>+	.report_fixup = ms_report_fixup,</div><div class='add'>+	.input_mapping = ms_input_mapping,</div><div class='add'>+	.event = ms_event,</div><div class='add'>+	.probe = ms_probe,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int ms_init(void)</div><div class='add'>+{</div><div class='add'>+	return hid_register_driver(&amp;ms_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ms_exit(void)</div><div class='add'>+{</div><div class='add'>+	hid_unregister_driver(&amp;ms_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(ms_init);</div><div class='add'>+module_exit(ms_exit);</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='add'>+HID_COMPAT_LOAD_DRIVER(microsoft);</div><div class='head'>diff --git a/drivers/hid/hid-monterey.c b/drivers/hid/hid-monterey.c<br/>new file mode 100644<br/>index 000000000000..f3a85a065f18<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hid/hid-monterey.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/hid-monterey.c</a></div><div class='hunk'>@@ -0,0 +1,82 @@</div><div class='add'>+/*</div><div class='add'>+ *  HID driver for some monterey "special" devices</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (c) 1999 Andreas Gal</div><div class='add'>+ *  Copyright (c) 2000-2005 Vojtech Pavlik &lt;vojtech@suse.cz&gt;</div><div class='add'>+ *  Copyright (c) 2005 Michael Haboustak &lt;mike-@cinci.rr.com&gt; for Concept2, Inc</div><div class='add'>+ *  Copyright (c) 2006-2007 Jiri Kosina</div><div class='add'>+ *  Copyright (c) 2007 Paul Walmsley</div><div class='add'>+ *  Copyright (c) 2008 Jiri Slaby</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms of the GNU General Public License as published by the Free</div><div class='add'>+ * Software Foundation; either version 2 of the License, or (at your option)</div><div class='add'>+ * any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/hid.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+</div><div class='add'>+#include "hid-ids.h"</div><div class='add'>+</div><div class='add'>+static void mr_report_fixup(struct hid_device *hdev, __u8 *rdesc,</div><div class='add'>+		unsigned int rsize)</div><div class='add'>+{</div><div class='add'>+	if (rsize &gt;= 30 &amp;&amp; rdesc[29] == 0x05 &amp;&amp; rdesc[30] == 0x09) {</div><div class='add'>+		dev_info(&amp;hdev-&gt;dev, "fixing up button/consumer in HID report "</div><div class='add'>+				"descriptor\n");</div><div class='add'>+		rdesc[30] = 0x0c;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define mr_map_key_clear(c)	hid_map_usage_clear(hi, usage, bit, max, \</div><div class='add'>+					EV_KEY, (c))</div><div class='add'>+static int mr_input_mapping(struct hid_device *hdev, struct hid_input *hi,</div><div class='add'>+		struct hid_field *field, struct hid_usage *usage,</div><div class='add'>+		unsigned long **bit, int *max)</div><div class='add'>+{</div><div class='add'>+	if ((usage-&gt;hid &amp; HID_USAGE_PAGE) != HID_UP_CONSUMER)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	switch (usage-&gt;hid &amp; HID_USAGE) {</div><div class='add'>+	case 0x156: mr_map_key_clear(KEY_WORDPROCESSOR);	break;</div><div class='add'>+	case 0x157: mr_map_key_clear(KEY_SPREADSHEET);		break;</div><div class='add'>+	case 0x158: mr_map_key_clear(KEY_PRESENTATION);		break;</div><div class='add'>+	case 0x15c: mr_map_key_clear(KEY_STOP);			break;</div><div class='add'>+	default:</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hid_device_id mr_devices[] = {</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_MONTEREY, USB_DEVICE_ID_GENIUS_KB29E) },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(hid, mr_devices);</div><div class='add'>+</div><div class='add'>+static struct hid_driver mr_driver = {</div><div class='add'>+	.name = "monterey",</div><div class='add'>+	.id_table = mr_devices,</div><div class='add'>+	.report_fixup = mr_report_fixup,</div><div class='add'>+	.input_mapping = mr_input_mapping,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int mr_init(void)</div><div class='add'>+{</div><div class='add'>+	return hid_register_driver(&amp;mr_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mr_exit(void)</div><div class='add'>+{</div><div class='add'>+	hid_unregister_driver(&amp;mr_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(mr_init);</div><div class='add'>+module_exit(mr_exit);</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='add'>+HID_COMPAT_LOAD_DRIVER(monterey);</div><div class='head'>diff --git a/drivers/hid/hid-petalynx.c b/drivers/hid/hid-petalynx.c<br/>new file mode 100644<br/>index 000000000000..10945fe12d50<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hid/hid-petalynx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/hid-petalynx.c</a></div><div class='hunk'>@@ -0,0 +1,122 @@</div><div class='add'>+/*</div><div class='add'>+ *  HID driver for some petalynx "special" devices</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (c) 1999 Andreas Gal</div><div class='add'>+ *  Copyright (c) 2000-2005 Vojtech Pavlik &lt;vojtech@suse.cz&gt;</div><div class='add'>+ *  Copyright (c) 2005 Michael Haboustak &lt;mike-@cinci.rr.com&gt; for Concept2, Inc</div><div class='add'>+ *  Copyright (c) 2006-2007 Jiri Kosina</div><div class='add'>+ *  Copyright (c) 2007 Paul Walmsley</div><div class='add'>+ *  Copyright (c) 2008 Jiri Slaby</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms of the GNU General Public License as published by the Free</div><div class='add'>+ * Software Foundation; either version 2 of the License, or (at your option)</div><div class='add'>+ * any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/hid.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+</div><div class='add'>+#include "hid-ids.h"</div><div class='add'>+</div><div class='add'>+/* Petalynx Maxter Remote has maximum for consumer page set too low */</div><div class='add'>+static void pl_report_fixup(struct hid_device *hdev, __u8 *rdesc,</div><div class='add'>+		unsigned int rsize)</div><div class='add'>+{</div><div class='add'>+	if (rsize &gt;= 60 &amp;&amp; rdesc[39] == 0x2a &amp;&amp; rdesc[40] == 0xf5 &amp;&amp;</div><div class='add'>+			rdesc[41] == 0x00 &amp;&amp; rdesc[59] == 0x26 &amp;&amp;</div><div class='add'>+			rdesc[60] == 0xf9 &amp;&amp; rdesc[61] == 0x00) {</div><div class='add'>+		dev_info(&amp;hdev-&gt;dev, "fixing up Petalynx Maxter Remote report "</div><div class='add'>+				"descriptor\n");</div><div class='add'>+		rdesc[60] = 0xfa;</div><div class='add'>+		rdesc[40] = 0xfa;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define pl_map_key_clear(c)	hid_map_usage_clear(hi, usage, bit, max, \</div><div class='add'>+					EV_KEY, (c))</div><div class='add'>+static int pl_input_mapping(struct hid_device *hdev, struct hid_input *hi,</div><div class='add'>+		struct hid_field *field, struct hid_usage *usage,</div><div class='add'>+		unsigned long **bit, int *max)</div><div class='add'>+{</div><div class='add'>+	if ((usage-&gt;hid &amp; HID_USAGE_PAGE) == HID_UP_LOGIVENDOR) {</div><div class='add'>+		switch (usage-&gt;hid &amp; HID_USAGE) {</div><div class='add'>+		case 0x05a: pl_map_key_clear(KEY_TEXT);		break;</div><div class='add'>+		case 0x05b: pl_map_key_clear(KEY_RED);		break;</div><div class='add'>+		case 0x05c: pl_map_key_clear(KEY_GREEN);	break;</div><div class='add'>+		case 0x05d: pl_map_key_clear(KEY_YELLOW);	break;</div><div class='add'>+		case 0x05e: pl_map_key_clear(KEY_BLUE);		break;</div><div class='add'>+		default:</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((usage-&gt;hid &amp; HID_USAGE_PAGE) == HID_UP_CONSUMER) {</div><div class='add'>+		switch (usage-&gt;hid &amp; HID_USAGE) {</div><div class='add'>+		case 0x0f6: pl_map_key_clear(KEY_NEXT);		break;</div><div class='add'>+		case 0x0fa: pl_map_key_clear(KEY_BACK);		break;</div><div class='add'>+		default:</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pl_probe(struct hid_device *hdev, const struct hid_device_id *id)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	hdev-&gt;quirks |= HID_QUIRK_NOGET;</div><div class='add'>+</div><div class='add'>+	ret = hid_parse(hdev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;hdev-&gt;dev, "parse failed\n");</div><div class='add'>+		goto err_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;hdev-&gt;dev, "hw start failed\n");</div><div class='add'>+		goto err_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+err_free:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hid_device_id pl_devices[] = {</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_PETALYNX, USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE) },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(hid, pl_devices);</div><div class='add'>+</div><div class='add'>+static struct hid_driver pl_driver = {</div><div class='add'>+	.name = "petalynx",</div><div class='add'>+	.id_table = pl_devices,</div><div class='add'>+	.report_fixup = pl_report_fixup,</div><div class='add'>+	.input_mapping = pl_input_mapping,</div><div class='add'>+	.probe = pl_probe,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int pl_init(void)</div><div class='add'>+{</div><div class='add'>+	return hid_register_driver(&amp;pl_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pl_exit(void)</div><div class='add'>+{</div><div class='add'>+	hid_unregister_driver(&amp;pl_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(pl_init);</div><div class='add'>+module_exit(pl_exit);</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='add'>+HID_COMPAT_LOAD_DRIVER(petalynx);</div><div class='head'>diff --git a/drivers/hid/usbhid/hid-plff.c b/drivers/hid/hid-pl.c<br/>index 9eb83cf9d22b..acd815586182 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hid/usbhid/hid-plff.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/hid/usbhid/hid-plff.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hid/hid-pl.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/hid-pl.c</a></div><div class='hunk'>@@ -9,7 +9,7 @@</div><div class='ctx'>  *   - contains two reports, one for each port (HID_QUIRK_MULTI_INPUT)</div><div class='ctx'>  *</div><div class='ctx'>  *  0e8f:0003 "GreenAsia Inc.    USB Joystick     "</div><div class='del'>- *   - tested with Köng Gaming gamepad</div><div class='add'>+ *   - tested with K??ng Gaming gamepad</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (c) 2007 Anssi Hannula &lt;anssi.hannula@gmail.com&gt;</div><div class='ctx'>  */</div><div class='hunk'>@@ -38,7 +38,11 @@</div><div class='ctx'> #include &lt;linux/input.h&gt;</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='ctx'> #include &lt;linux/hid.h&gt;</div><div class='del'>-#include "usbhid.h"</div><div class='add'>+</div><div class='add'>+#include "hid-ids.h"</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PANTHERLORD_FF</div><div class='add'>+#include "usbhid/usbhid.h"</div><div class='ctx'> </div><div class='ctx'> struct plff_device {</div><div class='ctx'> 	struct hid_report *report;</div><div class='hunk'>@@ -66,7 +70,7 @@ static int hid_plff_play(struct input_dev *dev, void *data,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int hid_plff_init(struct hid_device *hid)</div><div class='add'>+static int plff_init(struct hid_device *hid)</div><div class='ctx'> {</div><div class='ctx'> 	struct plff_device *plff;</div><div class='ctx'> 	struct hid_report *report;</div><div class='hunk'>@@ -86,7 +90,7 @@ int hid_plff_init(struct hid_device *hid)</div><div class='ctx'> 	   currently unknown. */</div><div class='ctx'> </div><div class='ctx'> 	if (list_empty(report_list)) {</div><div class='del'>-		printk(KERN_ERR "hid-plff: no output reports found\n");</div><div class='add'>+		dev_err(&amp;hid-&gt;dev, "no output reports found\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -95,18 +99,19 @@ int hid_plff_init(struct hid_device *hid)</div><div class='ctx'> 		report_ptr = report_ptr-&gt;next;</div><div class='ctx'> </div><div class='ctx'> 		if (report_ptr == report_list) {</div><div class='del'>-			printk(KERN_ERR "hid-plff: required output report is missing\n");</div><div class='add'>+			dev_err(&amp;hid-&gt;dev, "required output report is "</div><div class='add'>+					"missing\n");</div><div class='ctx'> 			return -ENODEV;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		report = list_entry(report_ptr, struct hid_report, list);</div><div class='ctx'> 		if (report-&gt;maxfield &lt; 1) {</div><div class='del'>-			printk(KERN_ERR "hid-plff: no fields in the report\n");</div><div class='add'>+			dev_err(&amp;hid-&gt;dev, "no fields in the report\n");</div><div class='ctx'> 			return -ENODEV;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (report-&gt;field[0]-&gt;report_count &lt; 4) {</div><div class='del'>-			printk(KERN_ERR "hid-plff: not enough values in the field\n");</div><div class='add'>+			dev_err(&amp;hid-&gt;dev, "not enough values in the field\n");</div><div class='ctx'> 			return -ENODEV;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -132,8 +137,70 @@ int hid_plff_init(struct hid_device *hid)</div><div class='ctx'> 		usbhid_submit_report(hid, plff-&gt;report, USB_DIR_OUT);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "hid-plff: Force feedback for PantherLord/GreenAsia "</div><div class='add'>+	dev_info(&amp;hid-&gt;dev, "Force feedback for PantherLord/GreenAsia "</div><div class='ctx'> 	       "devices by Anssi Hannula &lt;anssi.hannula@gmail.com&gt;\n");</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+#else</div><div class='add'>+static inline int plff_init(struct hid_device *hid)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static int pl_probe(struct hid_device *hdev, const struct hid_device_id *id)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (id-&gt;driver_data)</div><div class='add'>+		hdev-&gt;quirks |= HID_QUIRK_MULTI_INPUT;</div><div class='add'>+</div><div class='add'>+	ret = hid_parse(hdev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;hdev-&gt;dev, "parse failed\n");</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT &amp; ~HID_CONNECT_FF);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;hdev-&gt;dev, "hw start failed\n");</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	plff_init(hdev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+err:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hid_device_id pl_devices[] = {</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PSX_ADAPTOR),</div><div class='add'>+		.driver_data = 1 }, /* Twin USB Joystick */</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_GREENASIA, 0x0003), }, /* GreenAsia Inc. USB Joystick */</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(hid, pl_devices);</div><div class='add'>+</div><div class='add'>+static struct hid_driver pl_driver = {</div><div class='add'>+	.name = "pantherlord",</div><div class='add'>+	.id_table = pl_devices,</div><div class='add'>+	.probe = pl_probe,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int pl_init(void)</div><div class='add'>+{</div><div class='add'>+	return hid_register_driver(&amp;pl_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pl_exit(void)</div><div class='add'>+{</div><div class='add'>+	hid_unregister_driver(&amp;pl_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(pl_init);</div><div class='add'>+module_exit(pl_exit);</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='add'>+HID_COMPAT_LOAD_DRIVER(pantherlord);</div><div class='head'>diff --git a/drivers/hid/hid-samsung.c b/drivers/hid/hid-samsung.c<br/>new file mode 100644<br/>index 000000000000..15f3c0492450<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hid/hid-samsung.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/hid-samsung.c</a></div><div class='hunk'>@@ -0,0 +1,100 @@</div><div class='add'>+/*</div><div class='add'>+ *  HID driver for some samsung "special" devices</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (c) 1999 Andreas Gal</div><div class='add'>+ *  Copyright (c) 2000-2005 Vojtech Pavlik &lt;vojtech@suse.cz&gt;</div><div class='add'>+ *  Copyright (c) 2005 Michael Haboustak &lt;mike-@cinci.rr.com&gt; for Concept2, Inc</div><div class='add'>+ *  Copyright (c) 2006-2007 Jiri Kosina</div><div class='add'>+ *  Copyright (c) 2007 Paul Walmsley</div><div class='add'>+ *  Copyright (c) 2008 Jiri Slaby</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms of the GNU General Public License as published by the Free</div><div class='add'>+ * Software Foundation; either version 2 of the License, or (at your option)</div><div class='add'>+ * any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/hid.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+</div><div class='add'>+#include "hid-ids.h"</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Samsung IrDA remote controller (reports as Cypress USB Mouse).</div><div class='add'>+ *</div><div class='add'>+ * Vendor specific report #4 has a size of 48 bit,</div><div class='add'>+ * and therefore is not accepted when inspecting the descriptors.</div><div class='add'>+ * As a workaround we reinterpret the report as:</div><div class='add'>+ *   Variable type, count 6, size 8 bit, log. maximum 255</div><div class='add'>+ * The burden to reconstruct the data is moved into user space.</div><div class='add'>+ */</div><div class='add'>+static void samsung_report_fixup(struct hid_device *hdev, __u8 *rdesc,</div><div class='add'>+		unsigned int rsize)</div><div class='add'>+{</div><div class='add'>+	if (rsize &gt;= 182 &amp;&amp; rdesc[175] == 0x25 &amp;&amp; rdesc[176] == 0x40 &amp;&amp;</div><div class='add'>+			rdesc[177] == 0x75 &amp;&amp; rdesc[178] == 0x30 &amp;&amp;</div><div class='add'>+			rdesc[179] == 0x95 &amp;&amp; rdesc[180] == 0x01 &amp;&amp;</div><div class='add'>+			rdesc[182] == 0x40) {</div><div class='add'>+		dev_info(&amp;hdev-&gt;dev, "fixing up Samsung IrDA report "</div><div class='add'>+				"descriptor\n");</div><div class='add'>+		rdesc[176] = 0xff;</div><div class='add'>+		rdesc[178] = 0x08;</div><div class='add'>+		rdesc[180] = 0x06;</div><div class='add'>+		rdesc[182] = 0x42;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int samsung_probe(struct hid_device *hdev,</div><div class='add'>+		const struct hid_device_id *id)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = hid_parse(hdev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;hdev-&gt;dev, "parse failed\n");</div><div class='add'>+		goto err_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = hid_hw_start(hdev, (HID_CONNECT_DEFAULT &amp; ~HID_CONNECT_HIDINPUT) |</div><div class='add'>+			HID_CONNECT_HIDDEV_FORCE);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;hdev-&gt;dev, "hw start failed\n");</div><div class='add'>+		goto err_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+err_free:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hid_device_id samsung_devices[] = {</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE) },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(hid, samsung_devices);</div><div class='add'>+</div><div class='add'>+static struct hid_driver samsung_driver = {</div><div class='add'>+	.name = "samsung",</div><div class='add'>+	.id_table = samsung_devices,</div><div class='add'>+	.report_fixup = samsung_report_fixup,</div><div class='add'>+	.probe = samsung_probe,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int samsung_init(void)</div><div class='add'>+{</div><div class='add'>+	return hid_register_driver(&amp;samsung_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void samsung_exit(void)</div><div class='add'>+{</div><div class='add'>+	hid_unregister_driver(&amp;samsung_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(samsung_init);</div><div class='add'>+module_exit(samsung_exit);</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='add'>+HID_COMPAT_LOAD_DRIVER(samsung);</div><div class='head'>diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c<br/>new file mode 100644<br/>index 000000000000..3af8095a7de1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hid/hid-sony.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/hid-sony.c</a></div><div class='hunk'>@@ -0,0 +1,110 @@</div><div class='add'>+/*</div><div class='add'>+ *  HID driver for some sony "special" devices</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (c) 1999 Andreas Gal</div><div class='add'>+ *  Copyright (c) 2000-2005 Vojtech Pavlik &lt;vojtech@suse.cz&gt;</div><div class='add'>+ *  Copyright (c) 2005 Michael Haboustak &lt;mike-@cinci.rr.com&gt; for Concept2, Inc</div><div class='add'>+ *  Copyright (c) 2006-2007 Jiri Kosina</div><div class='add'>+ *  Copyright (c) 2007 Paul Walmsley</div><div class='add'>+ *  Copyright (c) 2008 Jiri Slaby</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms of the GNU General Public License as published by the Free</div><div class='add'>+ * Software Foundation; either version 2 of the License, or (at your option)</div><div class='add'>+ * any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/hid.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/usb.h&gt;</div><div class='add'>+</div><div class='add'>+#include "hid-ids.h"</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Sending HID_REQ_GET_REPORT changes the operation mode of the ps3 controller</div><div class='add'>+ * to "operational".  Without this, the ps3 controller will not report any</div><div class='add'>+ * events.</div><div class='add'>+ */</div><div class='add'>+static int sony_set_operational(struct hid_device *hdev)</div><div class='add'>+{</div><div class='add'>+	struct usb_interface *intf = to_usb_interface(hdev-&gt;dev.parent);</div><div class='add'>+	struct usb_device *dev = interface_to_usbdev(intf);</div><div class='add'>+	__u16 ifnum = intf-&gt;cur_altsetting-&gt;desc.bInterfaceNumber;</div><div class='add'>+	int ret;</div><div class='add'>+	char *buf = kmalloc(18, GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (!buf)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ret = usb_control_msg(dev, usb_rcvctrlpipe(dev, 0),</div><div class='add'>+				 HID_REQ_GET_REPORT,</div><div class='add'>+				 USB_DIR_IN | USB_TYPE_CLASS |</div><div class='add'>+				 USB_RECIP_INTERFACE,</div><div class='add'>+				 (3 &lt;&lt; 8) | 0xf2, ifnum, buf, 17,</div><div class='add'>+				 USB_CTRL_GET_TIMEOUT);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		dev_err(&amp;hdev-&gt;dev, "can't set operational mode\n");</div><div class='add'>+</div><div class='add'>+	kfree(buf);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sony_probe(struct hid_device *hdev, const struct hid_device_id *id)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = hid_parse(hdev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;hdev-&gt;dev, "parse failed\n");</div><div class='add'>+		goto err_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT |</div><div class='add'>+			HID_CONNECT_HIDDEV_FORCE);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;hdev-&gt;dev, "hw start failed\n");</div><div class='add'>+		goto err_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = sony_set_operational(hdev);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_stop;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+err_stop:</div><div class='add'>+	hid_hw_stop(hdev);</div><div class='add'>+err_free:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hid_device_id sony_devices[] = {</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(hid, sony_devices);</div><div class='add'>+</div><div class='add'>+static struct hid_driver sony_driver = {</div><div class='add'>+	.name = "sony",</div><div class='add'>+	.id_table = sony_devices,</div><div class='add'>+	.probe = sony_probe,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int sony_init(void)</div><div class='add'>+{</div><div class='add'>+	return hid_register_driver(&amp;sony_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sony_exit(void)</div><div class='add'>+{</div><div class='add'>+	hid_unregister_driver(&amp;sony_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(sony_init);</div><div class='add'>+module_exit(sony_exit);</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='add'>+HID_COMPAT_LOAD_DRIVER(sony);</div><div class='head'>diff --git a/drivers/hid/hid-sunplus.c b/drivers/hid/hid-sunplus.c<br/>new file mode 100644<br/>index 000000000000..5ba68f7dbb78<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hid/hid-sunplus.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/hid-sunplus.c</a></div><div class='hunk'>@@ -0,0 +1,82 @@</div><div class='add'>+/*</div><div class='add'>+ *  HID driver for some sunplus "special" devices</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (c) 1999 Andreas Gal</div><div class='add'>+ *  Copyright (c) 2000-2005 Vojtech Pavlik &lt;vojtech@suse.cz&gt;</div><div class='add'>+ *  Copyright (c) 2005 Michael Haboustak &lt;mike-@cinci.rr.com&gt; for Concept2, Inc</div><div class='add'>+ *  Copyright (c) 2006-2007 Jiri Kosina</div><div class='add'>+ *  Copyright (c) 2007 Paul Walmsley</div><div class='add'>+ *  Copyright (c) 2008 Jiri Slaby</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms of the GNU General Public License as published by the Free</div><div class='add'>+ * Software Foundation; either version 2 of the License, or (at your option)</div><div class='add'>+ * any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/hid.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+</div><div class='add'>+#include "hid-ids.h"</div><div class='add'>+</div><div class='add'>+static void sp_report_fixup(struct hid_device *hdev, __u8 *rdesc,</div><div class='add'>+		unsigned int rsize)</div><div class='add'>+{</div><div class='add'>+	if (rsize &gt;= 107 &amp;&amp; rdesc[104] == 0x26 &amp;&amp; rdesc[105] == 0x80 &amp;&amp;</div><div class='add'>+			rdesc[106] == 0x03) {</div><div class='add'>+		dev_info(&amp;hdev-&gt;dev, "fixing up Sunplus Wireless Desktop "</div><div class='add'>+				"report descriptor\n");</div><div class='add'>+		rdesc[105] = rdesc[110] = 0x03;</div><div class='add'>+		rdesc[106] = rdesc[111] = 0x21;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define sp_map_key_clear(c)	hid_map_usage_clear(hi, usage, bit, max, \</div><div class='add'>+		EV_KEY, (c))</div><div class='add'>+static int sp_input_mapping(struct hid_device *hdev, struct hid_input *hi,</div><div class='add'>+		struct hid_field *field, struct hid_usage *usage,</div><div class='add'>+		unsigned long **bit, int *max)</div><div class='add'>+{</div><div class='add'>+	if ((usage-&gt;hid &amp; HID_USAGE_PAGE) != HID_UP_CONSUMER)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	switch (usage-&gt;hid &amp; HID_USAGE) {</div><div class='add'>+	case 0x2003: sp_map_key_clear(KEY_ZOOMIN);		break;</div><div class='add'>+	case 0x2103: sp_map_key_clear(KEY_ZOOMOUT);	break;</div><div class='add'>+	default:</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hid_device_id sp_devices[] = {</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_SUNPLUS, USB_DEVICE_ID_SUNPLUS_WDESKTOP) },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(hid, sp_devices);</div><div class='add'>+</div><div class='add'>+static struct hid_driver sp_driver = {</div><div class='add'>+	.name = "sunplus",</div><div class='add'>+	.id_table = sp_devices,</div><div class='add'>+	.report_fixup = sp_report_fixup,</div><div class='add'>+	.input_mapping = sp_input_mapping,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int sp_init(void)</div><div class='add'>+{</div><div class='add'>+	return hid_register_driver(&amp;sp_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sp_exit(void)</div><div class='add'>+{</div><div class='add'>+	hid_unregister_driver(&amp;sp_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(sp_init);</div><div class='add'>+module_exit(sp_exit);</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='add'>+HID_COMPAT_LOAD_DRIVER(sunplus);</div><div class='head'>diff --git a/drivers/hid/usbhid/hid-tmff.c b/drivers/hid/hid-tmff.c<br/>index 144578b1a00c..1b7cba0f7e1f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hid/usbhid/hid-tmff.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/hid/usbhid/hid-tmff.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hid/hid-tmff.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/hid-tmff.c</a></div><div class='hunk'>@@ -27,23 +27,17 @@</div><div class='ctx'>  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/hid.h&gt;</div><div class='ctx'> #include &lt;linux/input.h&gt;</div><div class='del'>-</div><div class='del'>-#undef DEBUG</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/hid.h&gt;</div><div class='del'>-#include "usbhid.h"</div><div class='add'>+#include "hid-ids.h"</div><div class='add'>+</div><div class='add'>+#include "usbhid/usbhid.h"</div><div class='ctx'> </div><div class='ctx'> /* Usages for thrustmaster devices I know about */</div><div class='ctx'> #define THRUSTMASTER_USAGE_FF	(HID_UP_GENDESK | 0xbb)</div><div class='ctx'> </div><div class='del'>-struct dev_type {</div><div class='del'>-	u16 idVendor;</div><div class='del'>-	u16 idProduct;</div><div class='del'>-	const signed short *ff;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static const signed short ff_rumble[] = {</div><div class='ctx'> 	FF_RUMBLE,</div><div class='ctx'> 	-1</div><div class='hunk'>@@ -54,21 +48,13 @@ static const signed short ff_joystick[] = {</div><div class='ctx'> 	-1</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const struct dev_type devices[] = {</div><div class='del'>-	{ 0x44f, 0xb300, ff_rumble },</div><div class='del'>-	{ 0x44f, 0xb304, ff_rumble },</div><div class='del'>-	{ 0x44f, 0xb651, ff_rumble },	/* FGT Rumble Force Wheel */</div><div class='del'>-	{ 0x44f, 0xb654, ff_joystick },	/* FGT Force Feedback Wheel */</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> struct tmff_device {</div><div class='ctx'> 	struct hid_report *report;</div><div class='ctx'> 	struct hid_field *ff_field;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Changes values from 0 to 0xffff into values from minimum to maximum */</div><div class='del'>-static inline int hid_tmff_scale_u16(unsigned int in,</div><div class='del'>-				int minimum, int maximum)</div><div class='add'>+static inline int tmff_scale_u16(unsigned int in, int minimum, int maximum)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -81,8 +67,7 @@ static inline int hid_tmff_scale_u16(unsigned int in,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Changes values from -0x80 to 0x7f into values from minimum to maximum */</div><div class='del'>-static inline int hid_tmff_scale_s8(int in,</div><div class='del'>-				    int minimum, int maximum)</div><div class='add'>+static inline int tmff_scale_s8(int in, int minimum, int maximum)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -94,7 +79,8 @@ static inline int hid_tmff_scale_s8(int in,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int hid_tmff_play(struct input_dev *dev, void *data, struct ff_effect *effect)</div><div class='add'>+static int tmff_play(struct input_dev *dev, void *data,</div><div class='add'>+		struct ff_effect *effect)</div><div class='ctx'> {</div><div class='ctx'> 	struct hid_device *hid = input_get_drvdata(dev);</div><div class='ctx'> 	struct tmff_device *tmff = data;</div><div class='hunk'>@@ -104,10 +90,10 @@ static int hid_tmff_play(struct input_dev *dev, void *data, struct ff_effect *ef</div><div class='ctx'> </div><div class='ctx'> 	switch (effect-&gt;type) {</div><div class='ctx'> 	case FF_CONSTANT:</div><div class='del'>-		x = hid_tmff_scale_s8(effect-&gt;u.ramp.start_level,</div><div class='add'>+		x = tmff_scale_s8(effect-&gt;u.ramp.start_level,</div><div class='ctx'> 					ff_field-&gt;logical_minimum,</div><div class='ctx'> 					ff_field-&gt;logical_maximum);</div><div class='del'>-		y = hid_tmff_scale_s8(effect-&gt;u.ramp.end_level,</div><div class='add'>+		y = tmff_scale_s8(effect-&gt;u.ramp.end_level,</div><div class='ctx'> 					ff_field-&gt;logical_minimum,</div><div class='ctx'> 					ff_field-&gt;logical_maximum);</div><div class='ctx'> </div><div class='hunk'>@@ -118,10 +104,10 @@ static int hid_tmff_play(struct input_dev *dev, void *data, struct ff_effect *ef</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case FF_RUMBLE:</div><div class='del'>-		left = hid_tmff_scale_u16(effect-&gt;u.rumble.weak_magnitude,</div><div class='add'>+		left = tmff_scale_u16(effect-&gt;u.rumble.weak_magnitude,</div><div class='ctx'> 					ff_field-&gt;logical_minimum,</div><div class='ctx'> 					ff_field-&gt;logical_maximum);</div><div class='del'>-		right = hid_tmff_scale_u16(effect-&gt;u.rumble.strong_magnitude,</div><div class='add'>+		right = tmff_scale_u16(effect-&gt;u.rumble.strong_magnitude,</div><div class='ctx'> 					ff_field-&gt;logical_minimum,</div><div class='ctx'> 					ff_field-&gt;logical_maximum);</div><div class='ctx'> </div><div class='hunk'>@@ -134,14 +120,14 @@ static int hid_tmff_play(struct input_dev *dev, void *data, struct ff_effect *ef</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int hid_tmff_init(struct hid_device *hid)</div><div class='add'>+static int tmff_init(struct hid_device *hid, const signed short *ff_bits)</div><div class='ctx'> {</div><div class='ctx'> 	struct tmff_device *tmff;</div><div class='ctx'> 	struct hid_report *report;</div><div class='ctx'> 	struct list_head *report_list;</div><div class='del'>-	struct hid_input *hidinput = list_entry(hid-&gt;inputs.next, struct hid_input, list);</div><div class='add'>+	struct hid_input *hidinput = list_entry(hid-&gt;inputs.next,</div><div class='add'>+							struct hid_input, list);</div><div class='ctx'> 	struct input_dev *input_dev = hidinput-&gt;input;</div><div class='del'>-	const signed short *ff_bits = ff_joystick;</div><div class='ctx'> 	int error;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -163,63 +149,121 @@ int hid_tmff_init(struct hid_device *hid)</div><div class='ctx'> 			switch (field-&gt;usage[0].hid) {</div><div class='ctx'> 			case THRUSTMASTER_USAGE_FF:</div><div class='ctx'> 				if (field-&gt;report_count &lt; 2) {</div><div class='del'>-					warn("ignoring FF field with report_count &lt; 2");</div><div class='add'>+					dev_warn(&amp;hid-&gt;dev, "ignoring FF field "</div><div class='add'>+						"with report_count &lt; 2\n");</div><div class='ctx'> 					continue;</div><div class='ctx'> 				}</div><div class='ctx'> </div><div class='del'>-				if (field-&gt;logical_maximum == field-&gt;logical_minimum) {</div><div class='del'>-					warn("ignoring FF field with logical_maximum == logical_minimum");</div><div class='add'>+				if (field-&gt;logical_maximum ==</div><div class='add'>+						field-&gt;logical_minimum) {</div><div class='add'>+					dev_warn(&amp;hid-&gt;dev, "ignoring FF field "</div><div class='add'>+							"with logical_maximum "</div><div class='add'>+							"== logical_minimum\n");</div><div class='ctx'> 					continue;</div><div class='ctx'> 				}</div><div class='ctx'> </div><div class='ctx'> 				if (tmff-&gt;report &amp;&amp; tmff-&gt;report != report) {</div><div class='del'>-					warn("ignoring FF field in other report");</div><div class='add'>+					dev_warn(&amp;hid-&gt;dev, "ignoring FF field "</div><div class='add'>+							"in other report\n");</div><div class='ctx'> 					continue;</div><div class='ctx'> 				}</div><div class='ctx'> </div><div class='ctx'> 				if (tmff-&gt;ff_field &amp;&amp; tmff-&gt;ff_field != field) {</div><div class='del'>-					warn("ignoring duplicate FF field");</div><div class='add'>+					dev_warn(&amp;hid-&gt;dev, "ignoring "</div><div class='add'>+							"duplicate FF field\n");</div><div class='ctx'> 					continue;</div><div class='ctx'> 				}</div><div class='ctx'> </div><div class='ctx'> 				tmff-&gt;report = report;</div><div class='ctx'> 				tmff-&gt;ff_field = field;</div><div class='ctx'> </div><div class='del'>-				for (i = 0; i &lt; ARRAY_SIZE(devices); i++) {</div><div class='del'>-					if (input_dev-&gt;id.vendor == devices[i].idVendor &amp;&amp;</div><div class='del'>-					    input_dev-&gt;id.product == devices[i].idProduct) {</div><div class='del'>-						ff_bits = devices[i].ff;</div><div class='del'>-						break;</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-</div><div class='ctx'> 				for (i = 0; ff_bits[i] &gt;= 0; i++)</div><div class='ctx'> 					set_bit(ff_bits[i], input_dev-&gt;ffbit);</div><div class='ctx'> </div><div class='ctx'> 				break;</div><div class='ctx'> </div><div class='ctx'> 			default:</div><div class='del'>-				warn("ignoring unknown output usage %08x", field-&gt;usage[0].hid);</div><div class='add'>+				dev_warn(&amp;hid-&gt;dev, "ignoring unknown output "</div><div class='add'>+						"usage %08x\n",</div><div class='add'>+						field-&gt;usage[0].hid);</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!tmff-&gt;report) {</div><div class='del'>-		err("cant find FF field in output reports\n");</div><div class='add'>+		dev_err(&amp;hid-&gt;dev, "can't find FF field in output reports\n");</div><div class='ctx'> 		error = -ENODEV;</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	error = input_ff_create_memless(input_dev, tmff, hid_tmff_play);</div><div class='add'>+	error = input_ff_create_memless(input_dev, tmff, tmff_play);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='del'>-	info("Force feedback for ThrustMaster devices by Zinx Verituse &lt;zinx@epicsol.org&gt;");</div><div class='add'>+	dev_info(&amp;hid-&gt;dev, "force feedback for ThrustMaster devices by Zinx "</div><div class='add'>+			"Verituse &lt;zinx@epicsol.org&gt;");</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>- fail:</div><div class='add'>+fail:</div><div class='ctx'> 	kfree(tmff);</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int tm_probe(struct hid_device *hdev, const struct hid_device_id *id)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = hid_parse(hdev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;hdev-&gt;dev, "parse failed\n");</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT &amp; ~HID_CONNECT_FF);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;hdev-&gt;dev, "hw start failed\n");</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tmff_init(hdev, (void *)id-&gt;driver_data);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+err:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hid_device_id tm_devices[] = {</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb300),</div><div class='add'>+		.driver_data = (unsigned long)ff_rumble },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb304),</div><div class='add'>+		.driver_data = (unsigned long)ff_rumble },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb651),	/* FGT Rumble Force Wheel */</div><div class='add'>+		.driver_data = (unsigned long)ff_rumble },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb654),	/* FGT Force Feedback Wheel */</div><div class='add'>+		.driver_data = (unsigned long)ff_joystick },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(hid, tm_devices);</div><div class='add'>+</div><div class='add'>+static struct hid_driver tm_driver = {</div><div class='add'>+	.name = "thrustmaster",</div><div class='add'>+	.id_table = tm_devices,</div><div class='add'>+	.probe = tm_probe,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int tm_init(void)</div><div class='add'>+{</div><div class='add'>+	return hid_register_driver(&amp;tm_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tm_exit(void)</div><div class='add'>+{</div><div class='add'>+	hid_unregister_driver(&amp;tm_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(tm_init);</div><div class='add'>+module_exit(tm_exit);</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='add'>+HID_COMPAT_LOAD_DRIVER(thrustmaster);</div><div class='head'>diff --git a/drivers/hid/usbhid/hid-zpff.c b/drivers/hid/hid-zpff.c<br/>index 5a688274f6a3..ea82f3718b21 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hid/usbhid/hid-zpff.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/hid/usbhid/hid-zpff.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hid/hid-zpff.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/hid-zpff.c</a></div><div class='hunk'>@@ -21,16 +21,19 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+#include &lt;linux/hid.h&gt;</div><div class='ctx'> #include &lt;linux/input.h&gt;</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='del'>-#include &lt;linux/hid.h&gt;</div><div class='del'>-#include "usbhid.h"</div><div class='add'>+</div><div class='add'>+#include "hid-ids.h"</div><div class='add'>+</div><div class='add'>+#include "usbhid/usbhid.h"</div><div class='ctx'> </div><div class='ctx'> struct zpff_device {</div><div class='ctx'> 	struct hid_report *report;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int hid_zpff_play(struct input_dev *dev, void *data,</div><div class='add'>+static int zpff_play(struct input_dev *dev, void *data,</div><div class='ctx'> 			 struct ff_effect *effect)</div><div class='ctx'> {</div><div class='ctx'> 	struct hid_device *hid = input_get_drvdata(dev);</div><div class='hunk'>@@ -58,7 +61,7 @@ static int hid_zpff_play(struct input_dev *dev, void *data,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int hid_zpff_init(struct hid_device *hid)</div><div class='add'>+static int zpff_init(struct hid_device *hid)</div><div class='ctx'> {</div><div class='ctx'> 	struct zpff_device *zpff;</div><div class='ctx'> 	struct hid_report *report;</div><div class='hunk'>@@ -70,14 +73,14 @@ int hid_zpff_init(struct hid_device *hid)</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='ctx'> 	if (list_empty(report_list)) {</div><div class='del'>-		printk(KERN_ERR "hid-zpff: no output report found\n");</div><div class='add'>+		dev_err(&amp;hid-&gt;dev, "no output report found\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	report = list_entry(report_list-&gt;next, struct hid_report, list);</div><div class='ctx'> </div><div class='ctx'> 	if (report-&gt;maxfield &lt; 4) {</div><div class='del'>-		printk(KERN_ERR "hid-zpff: not enough fields in report\n");</div><div class='add'>+		dev_err(&amp;hid-&gt;dev, "not enough fields in report\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -87,7 +90,7 @@ int hid_zpff_init(struct hid_device *hid)</div><div class='ctx'> </div><div class='ctx'> 	set_bit(FF_RUMBLE, dev-&gt;ffbit);</div><div class='ctx'> </div><div class='del'>-	error = input_ff_create_memless(dev, zpff, hid_zpff_play);</div><div class='add'>+	error = input_ff_create_memless(dev, zpff, zpff_play);</div><div class='ctx'> 	if (error) {</div><div class='ctx'> 		kfree(zpff);</div><div class='ctx'> 		return error;</div><div class='hunk'>@@ -100,8 +103,60 @@ int hid_zpff_init(struct hid_device *hid)</div><div class='ctx'> 	zpff-&gt;report-&gt;field[3]-&gt;value[0] = 0x00;</div><div class='ctx'> 	usbhid_submit_report(hid, zpff-&gt;report, USB_DIR_OUT);</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "Force feedback for Zeroplus based devices by "</div><div class='add'>+	dev_info(&amp;hid-&gt;dev, "force feedback for Zeroplus based devices by "</div><div class='ctx'> 	       "Anssi Hannula &lt;anssi.hannula@gmail.com&gt;\n");</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static int zp_probe(struct hid_device *hdev, const struct hid_device_id *id)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = hid_parse(hdev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;hdev-&gt;dev, "parse failed\n");</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT &amp; ~HID_CONNECT_FF);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;hdev-&gt;dev, "hw start failed\n");</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	zpff_init(hdev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+err:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hid_device_id zp_devices[] = {</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0005) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0030) },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(hid, zp_devices);</div><div class='add'>+</div><div class='add'>+static struct hid_driver zp_driver = {</div><div class='add'>+	.name = "zeroplus",</div><div class='add'>+	.id_table = zp_devices,</div><div class='add'>+	.probe = zp_probe,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int zp_init(void)</div><div class='add'>+{</div><div class='add'>+	return hid_register_driver(&amp;zp_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void zp_exit(void)</div><div class='add'>+{</div><div class='add'>+	hid_unregister_driver(&amp;zp_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(zp_init);</div><div class='add'>+module_exit(zp_exit);</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='add'>+HID_COMPAT_LOAD_DRIVER(zeroplus);</div><div class='head'>diff --git a/drivers/hid/hidraw.c b/drivers/hid/hidraw.c<br/>index c40f0403edaf..af3edb98df43 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hid/hidraw.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/hid/hidraw.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hid/hidraw.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/hidraw.c</a></div><div class='hunk'>@@ -113,7 +113,7 @@ static ssize_t hidraw_write(struct file *file, const char __user *buffer, size_t</div><div class='ctx'> 	if (!dev-&gt;hid_output_raw_report)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	if (count &gt; HID_MIN_BUFFER_SIZE) {</div><div class='add'>+	if (count &gt; HID_MAX_BUFFER_SIZE) {</div><div class='ctx'> 		printk(KERN_WARNING "hidraw: pid %d passed too large report\n",</div><div class='ctx'> 				task_pid_nr(current));</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -181,7 +181,7 @@ static int hidraw_open(struct inode *inode, struct file *file)</div><div class='ctx'> </div><div class='ctx'> 	dev = hidraw_table[minor];</div><div class='ctx'> 	if (!dev-&gt;open++)</div><div class='del'>-		dev-&gt;hid-&gt;hid_open(dev-&gt;hid);</div><div class='add'>+		dev-&gt;hid-&gt;ll_driver-&gt;open(dev-&gt;hid);</div><div class='ctx'> </div><div class='ctx'> out_unlock:</div><div class='ctx'> 	spin_unlock(&amp;minors_lock);</div><div class='hunk'>@@ -207,7 +207,7 @@ static int hidraw_release(struct inode * inode, struct file * file)</div><div class='ctx'> 	dev = hidraw_table[minor];</div><div class='ctx'> 	if (!dev-&gt;open--) {</div><div class='ctx'> 		if (list-&gt;hidraw-&gt;exist)</div><div class='del'>-			dev-&gt;hid-&gt;hid_close(dev-&gt;hid);</div><div class='add'>+			dev-&gt;hid-&gt;ll_driver-&gt;close(dev-&gt;hid);</div><div class='ctx'> 		else</div><div class='ctx'> 			kfree(list-&gt;hidraw);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -326,9 +326,8 @@ int hidraw_connect(struct hid_device *hid)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dev-&gt;dev = device_create_drvdata(hidraw_class, NULL,</div><div class='del'>-					 MKDEV(hidraw_major, minor), NULL,</div><div class='del'>-					 "%s%d", "hidraw", minor);</div><div class='add'>+	dev-&gt;dev = device_create(hidraw_class, NULL, MKDEV(hidraw_major, minor),</div><div class='add'>+				 NULL, "%s%d", "hidraw", minor);</div><div class='ctx'> </div><div class='ctx'> 	if (IS_ERR(dev-&gt;dev)) {</div><div class='ctx'> 		spin_lock(&amp;minors_lock);</div><div class='hunk'>@@ -367,7 +366,7 @@ void hidraw_disconnect(struct hid_device *hid)</div><div class='ctx'> 	device_destroy(hidraw_class, MKDEV(hidraw_major, hidraw-&gt;minor));</div><div class='ctx'> </div><div class='ctx'> 	if (hidraw-&gt;open) {</div><div class='del'>-		hid-&gt;hid_close(hid);</div><div class='add'>+		hid-&gt;ll_driver-&gt;close(hid);</div><div class='ctx'> 		wake_up_interruptible(&amp;hidraw-&gt;wait);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		kfree(hidraw);</div><div class='head'>diff --git a/drivers/hid/usbhid/Kconfig b/drivers/hid/usbhid/Kconfig<br/>index 18f09104765c..5d9aa95fc3ef 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hid/usbhid/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/hid/usbhid/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hid/usbhid/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/usbhid/Kconfig</a></div><div class='hunk'>@@ -24,88 +24,13 @@ config USB_HID</div><div class='ctx'> comment "Input core support is needed for USB HID input layer or HIDBP support"</div><div class='ctx'> 	depends on USB_HID &amp;&amp; INPUT=n</div><div class='ctx'> </div><div class='del'>-config USB_HIDINPUT_POWERBOOK</div><div class='del'>-	bool "Enable support for Apple laptop/aluminum USB special keys"</div><div class='del'>-	default n</div><div class='del'>-	depends on USB_HID</div><div class='del'>-	help</div><div class='del'>-	  Say Y here if you want support for the special keys (Fn, Numlock) on</div><div class='del'>-	  Apple iBooks, PowerBooks, MacBooks, MacBook Pros and aluminum USB</div><div class='del'>-	  keyboards.</div><div class='del'>-</div><div class='del'>-	  If unsure, say N.</div><div class='del'>-</div><div class='del'>-config HID_FF</div><div class='del'>-	bool "Force feedback support (EXPERIMENTAL)"</div><div class='del'>-	depends on USB_HID &amp;&amp; EXPERIMENTAL</div><div class='del'>-	help</div><div class='del'>-	  Say Y here is you want force feedback support for a few HID devices.</div><div class='del'>-	  See below for a list of supported devices.</div><div class='del'>-</div><div class='del'>-	  See &lt;file:Documentation/input/ff.txt&gt; for a description of the force</div><div class='del'>-	  feedback API.</div><div class='del'>-</div><div class='del'>-	  If unsure, say N.</div><div class='del'>-</div><div class='ctx'> config HID_PID</div><div class='ctx'> 	bool "PID device support"</div><div class='del'>-	depends on HID_FF</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say Y here if you have a PID-compliant device and wish to enable force</div><div class='ctx'> 	  feedback for it. Microsoft Sidewinder Force Feedback 2 is one of such</div><div class='ctx'> 	  devices.</div><div class='ctx'> </div><div class='del'>-config LOGITECH_FF</div><div class='del'>-	bool "Logitech devices support"</div><div class='del'>-	depends on HID_FF</div><div class='del'>-	select INPUT_FF_MEMLESS if USB_HID</div><div class='del'>-	help</div><div class='del'>-	  Say Y here if you have one of these devices:</div><div class='del'>-	  - Logitech WingMan Cordless RumblePad</div><div class='del'>-	  - Logitech WingMan Cordless RumblePad 2</div><div class='del'>-	  - Logitech WingMan Force 3D</div><div class='del'>-	  - Logitech Formula Force EX</div><div class='del'>-	  - Logitech MOMO Force wheel</div><div class='del'>-</div><div class='del'>-	  and if you want to enable force feedback for them.</div><div class='del'>-	  Note: if you say N here, this device will still be supported, but without</div><div class='del'>-	  force feedback.</div><div class='del'>-</div><div class='del'>-config LOGIRUMBLEPAD2_FF</div><div class='del'>-	bool "Logitech Rumblepad 2 support"</div><div class='del'>-	depends on HID_FF</div><div class='del'>-	select INPUT_FF_MEMLESS if USB_HID</div><div class='del'>-	help</div><div class='del'>-	  Say Y here if you want to enable force feedback support for Logitech</div><div class='del'>-	  Rumblepad 2 devices.</div><div class='del'>-</div><div class='del'>-config PANTHERLORD_FF</div><div class='del'>-	bool "PantherLord/GreenAsia based device support"</div><div class='del'>-	depends on HID_FF</div><div class='del'>-	select INPUT_FF_MEMLESS if USB_HID</div><div class='del'>-	help</div><div class='del'>-	  Say Y here if you have a PantherLord/GreenAsia based game controller</div><div class='del'>-	  or adapter and want to enable force feedback support for it.</div><div class='del'>-</div><div class='del'>-config THRUSTMASTER_FF</div><div class='del'>-	bool "ThrustMaster devices support"</div><div class='del'>-	depends on HID_FF</div><div class='del'>-	select INPUT_FF_MEMLESS if USB_HID</div><div class='del'>-	help</div><div class='del'>-	  Say Y here if you have a THRUSTMASTER FireStore Dual Power 2 or</div><div class='del'>-	  a THRUSTMASTER Ferrari GT Rumble Force or Force Feedback Wheel,</div><div class='del'>-	  and want to enable force feedback support for it.</div><div class='del'>-	  Note: if you say N here, this device will still be supported, but without</div><div class='del'>-	  force feedback.</div><div class='del'>-</div><div class='del'>-config ZEROPLUS_FF</div><div class='del'>-	bool "Zeroplus based game controller support"</div><div class='del'>-	depends on HID_FF</div><div class='del'>-	select INPUT_FF_MEMLESS if USB_HID</div><div class='del'>-	help</div><div class='del'>-	  Say Y here if you have a Zeroplus based game controller and want to</div><div class='del'>-	  enable force feedback for it.</div><div class='del'>-</div><div class='ctx'> config USB_HIDDEV</div><div class='ctx'> 	bool "/dev/hiddev raw HID device support"</div><div class='ctx'> 	depends on USB_HID</div><div class='head'>diff --git a/drivers/hid/usbhid/Makefile b/drivers/hid/usbhid/Makefile<br/>index 00a7b7090192..1329ecb37a1c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hid/usbhid/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/hid/usbhid/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hid/usbhid/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/usbhid/Makefile</a></div><div class='hunk'>@@ -13,24 +13,6 @@ endif</div><div class='ctx'> ifeq ($(CONFIG_HID_PID),y)</div><div class='ctx'> 	usbhid-objs	+= hid-pidff.o</div><div class='ctx'> endif</div><div class='del'>-ifeq ($(CONFIG_LOGITECH_FF),y)</div><div class='del'>-	usbhid-objs	+= hid-lgff.o</div><div class='del'>-endif</div><div class='del'>-ifeq ($(CONFIG_LOGIRUMBLEPAD2_FF),y)</div><div class='del'>-	usbhid-objs	+= hid-lg2ff.o</div><div class='del'>-endif</div><div class='del'>-ifeq ($(CONFIG_PANTHERLORD_FF),y)</div><div class='del'>-	usbhid-objs	+= hid-plff.o</div><div class='del'>-endif</div><div class='del'>-ifeq ($(CONFIG_THRUSTMASTER_FF),y)</div><div class='del'>-	usbhid-objs	+= hid-tmff.o</div><div class='del'>-endif</div><div class='del'>-ifeq ($(CONFIG_ZEROPLUS_FF),y)</div><div class='del'>-	usbhid-objs	+= hid-zpff.o</div><div class='del'>-endif</div><div class='del'>-ifeq ($(CONFIG_HID_FF),y)</div><div class='del'>-	usbhid-objs	+= hid-ff.o</div><div class='del'>-endif</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_USB_HID)		+= usbhid.o</div><div class='ctx'> obj-$(CONFIG_USB_KBD)		+= usbkbd.o</div><div class='head'>diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c<br/>index 27fe4d8912cb..705a43cdeea4 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hid/usbhid/hid-core.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/hid/usbhid/hid-core.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hid/usbhid/hid-core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/usbhid/hid-core.c</a></div><div class='hunk'>@@ -44,8 +44,6 @@</div><div class='ctx'> #define DRIVER_DESC "USB HID core driver"</div><div class='ctx'> #define DRIVER_LICENSE "GPL"</div><div class='ctx'> </div><div class='del'>-static char *hid_types[] = {"Device", "Pointer", "Mouse", "Device", "Joystick",</div><div class='del'>-				"Gamepad", "Keyboard", "Keypad", "Multi-Axis Controller"};</div><div class='ctx'> /*</div><div class='ctx'>  * Module parameters.</div><div class='ctx'>  */</div><div class='hunk'>@@ -61,12 +59,6 @@ MODULE_PARM_DESC(quirks, "Add/modify USB HID quirks by specifying "</div><div class='ctx'> 		" quirks=vendorID:productID:quirks"</div><div class='ctx'> 		" where vendorID, productID, and quirks are all in"</div><div class='ctx'> 		" 0x-prefixed hex");</div><div class='del'>-static char *rdesc_quirks_param[MAX_USBHID_BOOT_QUIRKS] = { [ 0 ... (MAX_USBHID_BOOT_QUIRKS - 1) ] = NULL };</div><div class='del'>-module_param_array_named(rdesc_quirks, rdesc_quirks_param, charp, NULL, 0444);</div><div class='del'>-MODULE_PARM_DESC(rdesc_quirks, "Add/modify report descriptor quirks by specifying "</div><div class='del'>-		" rdesc_quirks=vendorID:productID:rdesc_quirks"</div><div class='del'>-		" where vendorID, productID, and rdesc_quirks are all in"</div><div class='del'>-		" 0x-prefixed hex");</div><div class='ctx'> /*</div><div class='ctx'>  * Input submission and I/O error handler.</div><div class='ctx'>  */</div><div class='hunk'>@@ -197,31 +189,32 @@ static void hid_irq_in(struct urb *urb)</div><div class='ctx'> 	int			status;</div><div class='ctx'> </div><div class='ctx'> 	switch (urb-&gt;status) {</div><div class='del'>-		case 0:			/* success */</div><div class='del'>-			usbhid-&gt;retry_delay = 0;</div><div class='del'>-			hid_input_report(urb-&gt;context, HID_INPUT_REPORT,</div><div class='del'>-					 urb-&gt;transfer_buffer,</div><div class='del'>-					 urb-&gt;actual_length, 1);</div><div class='del'>-			break;</div><div class='del'>-		case -EPIPE:		/* stall */</div><div class='del'>-			clear_bit(HID_IN_RUNNING, &amp;usbhid-&gt;iofl);</div><div class='del'>-			set_bit(HID_CLEAR_HALT, &amp;usbhid-&gt;iofl);</div><div class='del'>-			schedule_work(&amp;usbhid-&gt;reset_work);</div><div class='del'>-			return;</div><div class='del'>-		case -ECONNRESET:	/* unlink */</div><div class='del'>-		case -ENOENT:</div><div class='del'>-		case -ESHUTDOWN:	/* unplug */</div><div class='del'>-			clear_bit(HID_IN_RUNNING, &amp;usbhid-&gt;iofl);</div><div class='del'>-			return;</div><div class='del'>-		case -EILSEQ:		/* protocol error or unplug */</div><div class='del'>-		case -EPROTO:		/* protocol error or unplug */</div><div class='del'>-		case -ETIME:		/* protocol error or unplug */</div><div class='del'>-		case -ETIMEDOUT:	/* Should never happen, but... */</div><div class='del'>-			clear_bit(HID_IN_RUNNING, &amp;usbhid-&gt;iofl);</div><div class='del'>-			hid_io_error(hid);</div><div class='del'>-			return;</div><div class='del'>-		default:		/* error */</div><div class='del'>-			warn("input irq status %d received", urb-&gt;status);</div><div class='add'>+	case 0:			/* success */</div><div class='add'>+		usbhid-&gt;retry_delay = 0;</div><div class='add'>+		hid_input_report(urb-&gt;context, HID_INPUT_REPORT,</div><div class='add'>+				 urb-&gt;transfer_buffer,</div><div class='add'>+				 urb-&gt;actual_length, 1);</div><div class='add'>+		break;</div><div class='add'>+	case -EPIPE:		/* stall */</div><div class='add'>+		clear_bit(HID_IN_RUNNING, &amp;usbhid-&gt;iofl);</div><div class='add'>+		set_bit(HID_CLEAR_HALT, &amp;usbhid-&gt;iofl);</div><div class='add'>+		schedule_work(&amp;usbhid-&gt;reset_work);</div><div class='add'>+		return;</div><div class='add'>+	case -ECONNRESET:	/* unlink */</div><div class='add'>+	case -ENOENT:</div><div class='add'>+	case -ESHUTDOWN:	/* unplug */</div><div class='add'>+		clear_bit(HID_IN_RUNNING, &amp;usbhid-&gt;iofl);</div><div class='add'>+		return;</div><div class='add'>+	case -EILSEQ:		/* protocol error or unplug */</div><div class='add'>+	case -EPROTO:		/* protocol error or unplug */</div><div class='add'>+	case -ETIME:		/* protocol error or unplug */</div><div class='add'>+	case -ETIMEDOUT:	/* Should never happen, but... */</div><div class='add'>+		clear_bit(HID_IN_RUNNING, &amp;usbhid-&gt;iofl);</div><div class='add'>+		hid_io_error(hid);</div><div class='add'>+		return;</div><div class='add'>+	default:		/* error */</div><div class='add'>+		dev_warn(&amp;urb-&gt;dev-&gt;dev, "input irq status %d  "</div><div class='add'>+				"received\n", urb-&gt;status);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	status = usb_submit_urb(urb, GFP_ATOMIC);</div><div class='hunk'>@@ -240,13 +233,16 @@ static void hid_irq_in(struct urb *urb)</div><div class='ctx'> static int hid_submit_out(struct hid_device *hid)</div><div class='ctx'> {</div><div class='ctx'> 	struct hid_report *report;</div><div class='add'>+	char *raw_report;</div><div class='ctx'> 	struct usbhid_device *usbhid = hid-&gt;driver_data;</div><div class='ctx'> </div><div class='del'>-	report = usbhid-&gt;out[usbhid-&gt;outtail];</div><div class='add'>+	report = usbhid-&gt;out[usbhid-&gt;outtail].report;</div><div class='add'>+	raw_report = usbhid-&gt;out[usbhid-&gt;outtail].raw_report;</div><div class='ctx'> </div><div class='del'>-	hid_output_report(report, usbhid-&gt;outbuf);</div><div class='ctx'> 	usbhid-&gt;urbout-&gt;transfer_buffer_length = ((report-&gt;size - 1) &gt;&gt; 3) + 1 + (report-&gt;id &gt; 0);</div><div class='ctx'> 	usbhid-&gt;urbout-&gt;dev = hid_to_usb_dev(hid);</div><div class='add'>+	memcpy(usbhid-&gt;outbuf, raw_report, usbhid-&gt;urbout-&gt;transfer_buffer_length);</div><div class='add'>+	kfree(raw_report);</div><div class='ctx'> </div><div class='ctx'> 	dbg_hid("submitting out urb\n");</div><div class='ctx'> </div><div class='hunk'>@@ -262,17 +258,20 @@ static int hid_submit_ctrl(struct hid_device *hid)</div><div class='ctx'> {</div><div class='ctx'> 	struct hid_report *report;</div><div class='ctx'> 	unsigned char dir;</div><div class='add'>+	char *raw_report;</div><div class='ctx'> 	int len;</div><div class='ctx'> 	struct usbhid_device *usbhid = hid-&gt;driver_data;</div><div class='ctx'> </div><div class='ctx'> 	report = usbhid-&gt;ctrl[usbhid-&gt;ctrltail].report;</div><div class='add'>+	raw_report = usbhid-&gt;ctrl[usbhid-&gt;ctrltail].raw_report;</div><div class='ctx'> 	dir = usbhid-&gt;ctrl[usbhid-&gt;ctrltail].dir;</div><div class='ctx'> </div><div class='ctx'> 	len = ((report-&gt;size - 1) &gt;&gt; 3) + 1 + (report-&gt;id &gt; 0);</div><div class='ctx'> 	if (dir == USB_DIR_OUT) {</div><div class='del'>-		hid_output_report(report, usbhid-&gt;ctrlbuf);</div><div class='ctx'> 		usbhid-&gt;urbctrl-&gt;pipe = usb_sndctrlpipe(hid_to_usb_dev(hid), 0);</div><div class='ctx'> 		usbhid-&gt;urbctrl-&gt;transfer_buffer_length = len;</div><div class='add'>+		memcpy(usbhid-&gt;ctrlbuf, raw_report, len);</div><div class='add'>+		kfree(raw_report);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		int maxpacket, padlen;</div><div class='ctx'> </div><div class='hunk'>@@ -319,17 +318,18 @@ static void hid_irq_out(struct urb *urb)</div><div class='ctx'> 	int unplug = 0;</div><div class='ctx'> </div><div class='ctx'> 	switch (urb-&gt;status) {</div><div class='del'>-		case 0:			/* success */</div><div class='del'>-			break;</div><div class='del'>-		case -ESHUTDOWN:	/* unplug */</div><div class='del'>-			unplug = 1;</div><div class='del'>-		case -EILSEQ:		/* protocol error or unplug */</div><div class='del'>-		case -EPROTO:		/* protocol error or unplug */</div><div class='del'>-		case -ECONNRESET:	/* unlink */</div><div class='del'>-		case -ENOENT:</div><div class='del'>-			break;</div><div class='del'>-		default:		/* error */</div><div class='del'>-			warn("output irq status %d received", urb-&gt;status);</div><div class='add'>+	case 0:			/* success */</div><div class='add'>+		break;</div><div class='add'>+	case -ESHUTDOWN:	/* unplug */</div><div class='add'>+		unplug = 1;</div><div class='add'>+	case -EILSEQ:		/* protocol error or unplug */</div><div class='add'>+	case -EPROTO:		/* protocol error or unplug */</div><div class='add'>+	case -ECONNRESET:	/* unlink */</div><div class='add'>+	case -ENOENT:</div><div class='add'>+		break;</div><div class='add'>+	default:		/* error */</div><div class='add'>+		dev_warn(&amp;urb-&gt;dev-&gt;dev, "output irq status %d "</div><div class='add'>+				"received\n", urb-&gt;status);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;usbhid-&gt;outlock, flags);</div><div class='hunk'>@@ -367,21 +367,23 @@ static void hid_ctrl(struct urb *urb)</div><div class='ctx'> 	spin_lock_irqsave(&amp;usbhid-&gt;ctrllock, flags);</div><div class='ctx'> </div><div class='ctx'> 	switch (urb-&gt;status) {</div><div class='del'>-		case 0:			/* success */</div><div class='del'>-			if (usbhid-&gt;ctrl[usbhid-&gt;ctrltail].dir == USB_DIR_IN)</div><div class='del'>-				hid_input_report(urb-&gt;context, usbhid-&gt;ctrl[usbhid-&gt;ctrltail].report-&gt;type,</div><div class='del'>-						urb-&gt;transfer_buffer, urb-&gt;actual_length, 0);</div><div class='del'>-			break;</div><div class='del'>-		case -ESHUTDOWN:	/* unplug */</div><div class='del'>-			unplug = 1;</div><div class='del'>-		case -EILSEQ:		/* protocol error or unplug */</div><div class='del'>-		case -EPROTO:		/* protocol error or unplug */</div><div class='del'>-		case -ECONNRESET:	/* unlink */</div><div class='del'>-		case -ENOENT:</div><div class='del'>-		case -EPIPE:		/* report not available */</div><div class='del'>-			break;</div><div class='del'>-		default:		/* error */</div><div class='del'>-			warn("ctrl urb status %d received", urb-&gt;status);</div><div class='add'>+	case 0:			/* success */</div><div class='add'>+		if (usbhid-&gt;ctrl[usbhid-&gt;ctrltail].dir == USB_DIR_IN)</div><div class='add'>+			hid_input_report(urb-&gt;context,</div><div class='add'>+				usbhid-&gt;ctrl[usbhid-&gt;ctrltail].report-&gt;type,</div><div class='add'>+				urb-&gt;transfer_buffer, urb-&gt;actual_length, 0);</div><div class='add'>+		break;</div><div class='add'>+	case -ESHUTDOWN:	/* unplug */</div><div class='add'>+		unplug = 1;</div><div class='add'>+	case -EILSEQ:		/* protocol error or unplug */</div><div class='add'>+	case -EPROTO:		/* protocol error or unplug */</div><div class='add'>+	case -ECONNRESET:	/* unlink */</div><div class='add'>+	case -ENOENT:</div><div class='add'>+	case -EPIPE:		/* report not available */</div><div class='add'>+		break;</div><div class='add'>+	default:		/* error */</div><div class='add'>+		dev_warn(&amp;urb-&gt;dev-&gt;dev, "ctrl urb status %d "</div><div class='add'>+				"received\n", urb-&gt;status);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (unplug)</div><div class='hunk'>@@ -408,6 +410,7 @@ void usbhid_submit_report(struct hid_device *hid, struct hid_report *report, uns</div><div class='ctx'> 	int head;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	struct usbhid_device *usbhid = hid-&gt;driver_data;</div><div class='add'>+	int len = ((report-&gt;size - 1) &gt;&gt; 3) + 1 + (report-&gt;id &gt; 0);</div><div class='ctx'> </div><div class='ctx'> 	if ((hid-&gt;quirks &amp; HID_QUIRK_NOGET) &amp;&amp; dir == USB_DIR_IN)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -418,11 +421,18 @@ void usbhid_submit_report(struct hid_device *hid, struct hid_report *report, uns</div><div class='ctx'> </div><div class='ctx'> 		if ((head = (usbhid-&gt;outhead + 1) &amp; (HID_OUTPUT_FIFO_SIZE - 1)) == usbhid-&gt;outtail) {</div><div class='ctx'> 			spin_unlock_irqrestore(&amp;usbhid-&gt;outlock, flags);</div><div class='del'>-			warn("output queue full");</div><div class='add'>+			dev_warn(&amp;hid-&gt;dev, "output queue full\n");</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		usbhid-&gt;out[usbhid-&gt;outhead] = report;</div><div class='add'>+		usbhid-&gt;out[usbhid-&gt;outhead].raw_report = kmalloc(len, GFP_ATOMIC);</div><div class='add'>+		if (!usbhid-&gt;out[usbhid-&gt;outhead].raw_report) {</div><div class='add'>+			spin_unlock_irqrestore(&amp;usbhid-&gt;outlock, flags);</div><div class='add'>+			dev_warn(&amp;hid-&gt;dev, "output queueing failed\n");</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+		hid_output_report(report, usbhid-&gt;out[usbhid-&gt;outhead].raw_report);</div><div class='add'>+		usbhid-&gt;out[usbhid-&gt;outhead].report = report;</div><div class='ctx'> 		usbhid-&gt;outhead = head;</div><div class='ctx'> </div><div class='ctx'> 		if (!test_and_set_bit(HID_OUT_RUNNING, &amp;usbhid-&gt;iofl))</div><div class='hunk'>@@ -437,10 +447,19 @@ void usbhid_submit_report(struct hid_device *hid, struct hid_report *report, uns</div><div class='ctx'> </div><div class='ctx'> 	if ((head = (usbhid-&gt;ctrlhead + 1) &amp; (HID_CONTROL_FIFO_SIZE - 1)) == usbhid-&gt;ctrltail) {</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;usbhid-&gt;ctrllock, flags);</div><div class='del'>-		warn("control queue full");</div><div class='add'>+		dev_warn(&amp;hid-&gt;dev, "control queue full\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (dir == USB_DIR_OUT) {</div><div class='add'>+		usbhid-&gt;ctrl[usbhid-&gt;ctrlhead].raw_report = kmalloc(len, GFP_ATOMIC);</div><div class='add'>+		if (!usbhid-&gt;ctrl[usbhid-&gt;ctrlhead].raw_report) {</div><div class='add'>+			spin_unlock_irqrestore(&amp;usbhid-&gt;ctrllock, flags);</div><div class='add'>+			dev_warn(&amp;hid-&gt;dev, "control queueing failed\n");</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+		hid_output_report(report, usbhid-&gt;ctrl[usbhid-&gt;ctrlhead].raw_report);</div><div class='add'>+	}</div><div class='ctx'> 	usbhid-&gt;ctrl[usbhid-&gt;ctrlhead].report = report;</div><div class='ctx'> 	usbhid-&gt;ctrl[usbhid-&gt;ctrlhead].dir = dir;</div><div class='ctx'> 	usbhid-&gt;ctrlhead = head;</div><div class='hunk'>@@ -451,6 +470,7 @@ void usbhid_submit_report(struct hid_device *hid, struct hid_report *report, uns</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;usbhid-&gt;ctrllock, flags);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(usbhid_submit_report);</div><div class='ctx'> </div><div class='ctx'> static int usb_hidinput_input_event(struct input_dev *dev, unsigned int type, unsigned int code, int value)</div><div class='ctx'> {</div><div class='hunk'>@@ -465,7 +485,7 @@ static int usb_hidinput_input_event(struct input_dev *dev, unsigned int type, un</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='ctx'> 	if ((offset = hidinput_find_field(hid, type, code, &amp;field)) == -1) {</div><div class='del'>-		warn("event field not found");</div><div class='add'>+		dev_warn(&amp;dev-&gt;dev, "event field not found\n");</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -568,7 +588,7 @@ void usbhid_init_reports(struct hid_device *hid)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (err)</div><div class='del'>-		warn("timeout initializing reports");</div><div class='add'>+		dev_warn(&amp;hid-&gt;dev, "timeout initializing reports\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -598,7 +618,7 @@ static int hid_find_field_early(struct hid_device *hid, unsigned int page,</div><div class='ctx'> 	return -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void usbhid_set_leds(struct hid_device *hid)</div><div class='add'>+void usbhid_set_leds(struct hid_device *hid)</div><div class='ctx'> {</div><div class='ctx'> 	struct hid_field *field;</div><div class='ctx'> 	int offset;</div><div class='hunk'>@@ -608,6 +628,7 @@ static void usbhid_set_leds(struct hid_device *hid)</div><div class='ctx'> 		usbhid_submit_report(hid, field-&gt;report, USB_DIR_OUT);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(usbhid_set_leds);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Traverse the supplied list of reports and find the longest</div><div class='hunk'>@@ -675,43 +696,16 @@ static void hid_free_buffers(struct usb_device *dev, struct hid_device *hid)</div><div class='ctx'> 	usb_buffer_free(dev, usbhid-&gt;bufsize, usbhid-&gt;ctrlbuf, usbhid-&gt;ctrlbuf_dma);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Sending HID_REQ_GET_REPORT changes the operation mode of the ps3 controller</div><div class='del'>- * to "operational".  Without this, the ps3 controller will not report any</div><div class='del'>- * events.</div><div class='del'>- */</div><div class='del'>-static void hid_fixup_sony_ps3_controller(struct usb_device *dev, int ifnum)</div><div class='del'>-{</div><div class='del'>-	int result;</div><div class='del'>-	char *buf = kmalloc(18, GFP_KERNEL);</div><div class='del'>-</div><div class='del'>-	if (!buf)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	result = usb_control_msg(dev, usb_rcvctrlpipe(dev, 0),</div><div class='del'>-				 HID_REQ_GET_REPORT,</div><div class='del'>-				 USB_DIR_IN | USB_TYPE_CLASS |</div><div class='del'>-				 USB_RECIP_INTERFACE,</div><div class='del'>-				 (3 &lt;&lt; 8) | 0xf2, ifnum, buf, 17,</div><div class='del'>-				 USB_CTRL_GET_TIMEOUT);</div><div class='del'>-</div><div class='del'>-	if (result &lt; 0)</div><div class='del'>-		err_hid("%s failed: %d\n", __func__, result);</div><div class='del'>-</div><div class='del'>-	kfree(buf);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct hid_device *usb_hid_configure(struct usb_interface *intf)</div><div class='add'>+static int usbhid_parse(struct hid_device *hid)</div><div class='ctx'> {</div><div class='add'>+	struct usb_interface *intf = to_usb_interface(hid-&gt;dev.parent);</div><div class='ctx'> 	struct usb_host_interface *interface = intf-&gt;cur_altsetting;</div><div class='ctx'> 	struct usb_device *dev = interface_to_usbdev (intf);</div><div class='ctx'> 	struct hid_descriptor *hdesc;</div><div class='del'>-	struct hid_device *hid;</div><div class='ctx'> 	u32 quirks = 0;</div><div class='del'>-	unsigned int insize = 0, rsize = 0;</div><div class='add'>+	unsigned int rsize = 0;</div><div class='ctx'> 	char *rdesc;</div><div class='del'>-	int n, len;</div><div class='del'>-	struct usbhid_device *usbhid;</div><div class='add'>+	int ret, n;</div><div class='ctx'> </div><div class='ctx'> 	quirks = usbhid_lookup_quirk(le16_to_cpu(dev-&gt;descriptor.idVendor),</div><div class='ctx'> 			le16_to_cpu(dev-&gt;descriptor.idProduct));</div><div class='hunk'>@@ -724,63 +718,75 @@ static struct hid_device *usb_hid_configure(struct usb_interface *intf)</div><div class='ctx'> 				quirks |= HID_QUIRK_NOGET;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (quirks &amp; HID_QUIRK_IGNORE)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	if ((quirks &amp; HID_QUIRK_IGNORE_MOUSE) &amp;&amp;</div><div class='del'>-		(interface-&gt;desc.bInterfaceProtocol == USB_INTERFACE_PROTOCOL_MOUSE))</div><div class='del'>-			return NULL;</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> 	if (usb_get_extra_descriptor(interface, HID_DT_HID, &amp;hdesc) &amp;&amp;</div><div class='ctx'> 	    (!interface-&gt;desc.bNumEndpoints ||</div><div class='ctx'> 	     usb_get_extra_descriptor(&amp;interface-&gt;endpoint[0], HID_DT_HID, &amp;hdesc))) {</div><div class='ctx'> 		dbg_hid("class descriptor not present\n");</div><div class='del'>-		return NULL;</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	hid-&gt;version = le16_to_cpu(hdesc-&gt;bcdHID);</div><div class='add'>+	hid-&gt;country = hdesc-&gt;bCountryCode;</div><div class='add'>+</div><div class='ctx'> 	for (n = 0; n &lt; hdesc-&gt;bNumDescriptors; n++)</div><div class='ctx'> 		if (hdesc-&gt;desc[n].bDescriptorType == HID_DT_REPORT)</div><div class='ctx'> 			rsize = le16_to_cpu(hdesc-&gt;desc[n].wDescriptorLength);</div><div class='ctx'> </div><div class='ctx'> 	if (!rsize || rsize &gt; HID_MAX_DESCRIPTOR_SIZE) {</div><div class='ctx'> 		dbg_hid("weird size of report descriptor (%u)\n", rsize);</div><div class='del'>-		return NULL;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!(rdesc = kmalloc(rsize, GFP_KERNEL))) {</div><div class='ctx'> 		dbg_hid("couldn't allocate rdesc memory\n");</div><div class='del'>-		return NULL;</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	hid_set_idle(dev, interface-&gt;desc.bInterfaceNumber, 0, 0);</div><div class='ctx'> </div><div class='del'>-	if ((n = hid_get_class_descriptor(dev, interface-&gt;desc.bInterfaceNumber, HID_DT_REPORT, rdesc, rsize)) &lt; 0) {</div><div class='add'>+	ret = hid_get_class_descriptor(dev, interface-&gt;desc.bInterfaceNumber,</div><div class='add'>+			HID_DT_REPORT, rdesc, rsize);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='ctx'> 		dbg_hid("reading report descriptor failed\n");</div><div class='ctx'> 		kfree(rdesc);</div><div class='del'>-		return NULL;</div><div class='add'>+		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	usbhid_fixup_report_descriptor(le16_to_cpu(dev-&gt;descriptor.idVendor),</div><div class='del'>-			le16_to_cpu(dev-&gt;descriptor.idProduct), rdesc,</div><div class='del'>-			rsize, rdesc_quirks_param);</div><div class='del'>-</div><div class='ctx'> 	dbg_hid("report descriptor (size %u, read %d) = ", rsize, n);</div><div class='ctx'> 	for (n = 0; n &lt; rsize; n++)</div><div class='ctx'> 		dbg_hid_line(" %02x", (unsigned char) rdesc[n]);</div><div class='ctx'> 	dbg_hid_line("\n");</div><div class='ctx'> </div><div class='del'>-	if (!(hid = hid_parse_report(rdesc, n))) {</div><div class='add'>+	ret = hid_parse_report(hid, rdesc, rsize);</div><div class='add'>+	kfree(rdesc);</div><div class='add'>+	if (ret) {</div><div class='ctx'> 		dbg_hid("parsing report descriptor failed\n");</div><div class='del'>-		kfree(rdesc);</div><div class='del'>-		return NULL;</div><div class='add'>+		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	kfree(rdesc);</div><div class='ctx'> 	hid-&gt;quirks = quirks;</div><div class='ctx'> </div><div class='del'>-	if (!(usbhid = kzalloc(sizeof(struct usbhid_device), GFP_KERNEL)))</div><div class='del'>-		goto fail_no_usbhid;</div><div class='add'>+	return 0;</div><div class='add'>+err:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int usbhid_start(struct hid_device *hid)</div><div class='add'>+{</div><div class='add'>+	struct usb_interface *intf = to_usb_interface(hid-&gt;dev.parent);</div><div class='add'>+	struct usb_host_interface *interface = intf-&gt;cur_altsetting;</div><div class='add'>+	struct usb_device *dev = interface_to_usbdev(intf);</div><div class='add'>+	struct usbhid_device *usbhid;</div><div class='add'>+	unsigned int n, insize = 0;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	WARN_ON(hid-&gt;driver_data);</div><div class='add'>+</div><div class='add'>+	usbhid = kzalloc(sizeof(struct usbhid_device), GFP_KERNEL);</div><div class='add'>+	if (usbhid == NULL) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	hid-&gt;driver_data = usbhid;</div><div class='ctx'> 	usbhid-&gt;hid = hid;</div><div class='hunk'>@@ -799,28 +805,11 @@ static struct hid_device *usb_hid_configure(struct usb_interface *intf)</div><div class='ctx'> 		insize = HID_MAX_BUFFER_SIZE;</div><div class='ctx'> </div><div class='ctx'> 	if (hid_alloc_buffers(dev, hid)) {</div><div class='del'>-		hid_free_buffers(dev, hid);</div><div class='add'>+		ret = -ENOMEM;</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	hid-&gt;name[0] = 0;</div><div class='del'>-</div><div class='del'>-	if (dev-&gt;manufacturer)</div><div class='del'>-		strlcpy(hid-&gt;name, dev-&gt;manufacturer, sizeof(hid-&gt;name));</div><div class='del'>-</div><div class='del'>-	if (dev-&gt;product) {</div><div class='del'>-		if (dev-&gt;manufacturer)</div><div class='del'>-			strlcat(hid-&gt;name, " ", sizeof(hid-&gt;name));</div><div class='del'>-		strlcat(hid-&gt;name, dev-&gt;product, sizeof(hid-&gt;name));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!strlen(hid-&gt;name))</div><div class='del'>-		snprintf(hid-&gt;name, sizeof(hid-&gt;name), "HID %04x:%04x",</div><div class='del'>-			 le16_to_cpu(dev-&gt;descriptor.idVendor),</div><div class='del'>-			 le16_to_cpu(dev-&gt;descriptor.idProduct));</div><div class='del'>-</div><div class='ctx'> 	for (n = 0; n &lt; interface-&gt;desc.bNumEndpoints; n++) {</div><div class='del'>-</div><div class='ctx'> 		struct usb_endpoint_descriptor *endpoint;</div><div class='ctx'> 		int pipe;</div><div class='ctx'> 		int interval;</div><div class='hunk'>@@ -832,7 +821,7 @@ static struct hid_device *usb_hid_configure(struct usb_interface *intf)</div><div class='ctx'> 		interval = endpoint-&gt;bInterval;</div><div class='ctx'> </div><div class='ctx'> 		/* Some vendors give fullspeed interval on highspeed devides */</div><div class='del'>-		if (quirks &amp; HID_QUIRK_FULLSPEED_INTERVAL  &amp;&amp;</div><div class='add'>+		if (hid-&gt;quirks &amp; HID_QUIRK_FULLSPEED_INTERVAL &amp;&amp;</div><div class='ctx'> 		    dev-&gt;speed == USB_SPEED_HIGH) {</div><div class='ctx'> 			interval = fls(endpoint-&gt;bInterval*8);</div><div class='ctx'> 			printk(KERN_INFO "%s: Fixing fullspeed to highspeed interval: %d -&gt; %d\n",</div><div class='hunk'>@@ -843,6 +832,7 @@ static struct hid_device *usb_hid_configure(struct usb_interface *intf)</div><div class='ctx'> 		if (hid-&gt;collection-&gt;usage == HID_GD_MOUSE &amp;&amp; hid_mousepoll_interval &gt; 0)</div><div class='ctx'> 			interval = hid_mousepoll_interval;</div><div class='ctx'> </div><div class='add'>+		ret = -ENOMEM;</div><div class='ctx'> 		if (usb_endpoint_dir_in(endpoint)) {</div><div class='ctx'> 			if (usbhid-&gt;urbin)</div><div class='ctx'> 				continue;</div><div class='hunk'>@@ -868,6 +858,7 @@ static struct hid_device *usb_hid_configure(struct usb_interface *intf)</div><div class='ctx'> </div><div class='ctx'> 	if (!usbhid-&gt;urbin) {</div><div class='ctx'> 		err_hid("couldn't find an input interrupt endpoint");</div><div class='add'>+		ret = -ENODEV;</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -879,44 +870,25 @@ static struct hid_device *usb_hid_configure(struct usb_interface *intf)</div><div class='ctx'> 	spin_lock_init(&amp;usbhid-&gt;outlock);</div><div class='ctx'> 	spin_lock_init(&amp;usbhid-&gt;ctrllock);</div><div class='ctx'> </div><div class='del'>-	hid-&gt;version = le16_to_cpu(hdesc-&gt;bcdHID);</div><div class='del'>-	hid-&gt;country = hdesc-&gt;bCountryCode;</div><div class='del'>-	hid-&gt;dev = &amp;intf-&gt;dev;</div><div class='ctx'> 	usbhid-&gt;intf = intf;</div><div class='ctx'> 	usbhid-&gt;ifnum = interface-&gt;desc.bInterfaceNumber;</div><div class='ctx'> </div><div class='del'>-	hid-&gt;bus = BUS_USB;</div><div class='del'>-	hid-&gt;vendor = le16_to_cpu(dev-&gt;descriptor.idVendor);</div><div class='del'>-	hid-&gt;product = le16_to_cpu(dev-&gt;descriptor.idProduct);</div><div class='del'>-</div><div class='del'>-	usb_make_path(dev, hid-&gt;phys, sizeof(hid-&gt;phys));</div><div class='del'>-	strlcat(hid-&gt;phys, "/input", sizeof(hid-&gt;phys));</div><div class='del'>-	len = strlen(hid-&gt;phys);</div><div class='del'>-	if (len &lt; sizeof(hid-&gt;phys) - 1)</div><div class='del'>-		snprintf(hid-&gt;phys + len, sizeof(hid-&gt;phys) - len,</div><div class='del'>-			 "%d", intf-&gt;altsetting[0].desc.bInterfaceNumber);</div><div class='del'>-</div><div class='del'>-	if (usb_string(dev, dev-&gt;descriptor.iSerialNumber, hid-&gt;uniq, 64) &lt;= 0)</div><div class='del'>-		hid-&gt;uniq[0] = 0;</div><div class='del'>-</div><div class='ctx'> 	usbhid-&gt;urbctrl = usb_alloc_urb(0, GFP_KERNEL);</div><div class='del'>-	if (!usbhid-&gt;urbctrl)</div><div class='add'>+	if (!usbhid-&gt;urbctrl) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='ctx'> 		goto fail;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	usb_fill_control_urb(usbhid-&gt;urbctrl, dev, 0, (void *) usbhid-&gt;cr,</div><div class='ctx'> 			     usbhid-&gt;ctrlbuf, 1, hid_ctrl, hid);</div><div class='ctx'> 	usbhid-&gt;urbctrl-&gt;setup_dma = usbhid-&gt;cr_dma;</div><div class='ctx'> 	usbhid-&gt;urbctrl-&gt;transfer_dma = usbhid-&gt;ctrlbuf_dma;</div><div class='ctx'> 	usbhid-&gt;urbctrl-&gt;transfer_flags |= (URB_NO_TRANSFER_DMA_MAP | URB_NO_SETUP_DMA_MAP);</div><div class='del'>-	hid-&gt;hidinput_input_event = usb_hidinput_input_event;</div><div class='del'>-	hid-&gt;hid_open = usbhid_open;</div><div class='del'>-	hid-&gt;hid_close = usbhid_close;</div><div class='del'>-#ifdef CONFIG_USB_HIDDEV</div><div class='del'>-	hid-&gt;hiddev_hid_event = hiddev_hid_event;</div><div class='del'>-	hid-&gt;hiddev_report_event = hiddev_report_event;</div><div class='del'>-#endif</div><div class='del'>-	hid-&gt;hid_output_raw_report = usbhid_output_raw_report;</div><div class='del'>-	return hid;</div><div class='add'>+</div><div class='add'>+	usbhid_init_reports(hid);</div><div class='add'>+	hid_dump_device(hid);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> </div><div class='ctx'> fail:</div><div class='ctx'> 	usb_free_urb(usbhid-&gt;urbin);</div><div class='hunk'>@@ -924,24 +896,18 @@ fail:</div><div class='ctx'> 	usb_free_urb(usbhid-&gt;urbctrl);</div><div class='ctx'> 	hid_free_buffers(dev, hid);</div><div class='ctx'> 	kfree(usbhid);</div><div class='del'>-fail_no_usbhid:</div><div class='del'>-	hid_free_device(hid);</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='add'>+err:</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hid_disconnect(struct usb_interface *intf)</div><div class='add'>+static void usbhid_stop(struct hid_device *hid)</div><div class='ctx'> {</div><div class='del'>-	struct hid_device *hid = usb_get_intfdata (intf);</div><div class='del'>-	struct usbhid_device *usbhid;</div><div class='add'>+	struct usbhid_device *usbhid = hid-&gt;driver_data;</div><div class='ctx'> </div><div class='del'>-	if (!hid)</div><div class='add'>+	if (WARN_ON(!usbhid))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	usbhid = hid-&gt;driver_data;</div><div class='del'>-</div><div class='ctx'> 	spin_lock_irq(&amp;usbhid-&gt;inlock);	/* Sync with error handler */</div><div class='del'>-	usb_set_intfdata(intf, NULL);</div><div class='ctx'> 	set_bit(HID_DISCONNECTED, &amp;usbhid-&gt;iofl);</div><div class='ctx'> 	spin_unlock_irq(&amp;usbhid-&gt;inlock);</div><div class='ctx'> 	usb_kill_urb(usbhid-&gt;urbin);</div><div class='hunk'>@@ -958,86 +924,100 @@ static void hid_disconnect(struct usb_interface *intf)</div><div class='ctx'> 	if (hid-&gt;claimed &amp; HID_CLAIMED_HIDRAW)</div><div class='ctx'> 		hidraw_disconnect(hid);</div><div class='ctx'> </div><div class='add'>+	hid-&gt;claimed = 0;</div><div class='add'>+</div><div class='ctx'> 	usb_free_urb(usbhid-&gt;urbin);</div><div class='ctx'> 	usb_free_urb(usbhid-&gt;urbctrl);</div><div class='ctx'> 	usb_free_urb(usbhid-&gt;urbout);</div><div class='ctx'> </div><div class='ctx'> 	hid_free_buffers(hid_to_usb_dev(hid), hid);</div><div class='ctx'> 	kfree(usbhid);</div><div class='del'>-	hid_free_device(hid);</div><div class='add'>+	hid-&gt;driver_data = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct hid_ll_driver usb_hid_driver = {</div><div class='add'>+	.parse = usbhid_parse,</div><div class='add'>+	.start = usbhid_start,</div><div class='add'>+	.stop = usbhid_stop,</div><div class='add'>+	.open = usbhid_open,</div><div class='add'>+	.close = usbhid_close,</div><div class='add'>+	.hidinput_input_event = usb_hidinput_input_event,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int hid_probe(struct usb_interface *intf, const struct usb_device_id *id)</div><div class='ctx'> {</div><div class='add'>+	struct usb_device *dev = interface_to_usbdev(intf);</div><div class='ctx'> 	struct hid_device *hid;</div><div class='del'>-	char path[64];</div><div class='del'>-	int i;</div><div class='del'>-	char *c;</div><div class='add'>+	size_t len;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	dbg_hid("HID probe called for ifnum %d\n",</div><div class='ctx'> 			intf-&gt;altsetting-&gt;desc.bInterfaceNumber);</div><div class='ctx'> </div><div class='del'>-	if (!(hid = usb_hid_configure(intf)))</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	usbhid_init_reports(hid);</div><div class='del'>-	hid_dump_device(hid);</div><div class='del'>-	if (hid-&gt;quirks &amp; HID_QUIRK_RESET_LEDS)</div><div class='del'>-		usbhid_set_leds(hid);</div><div class='del'>-</div><div class='del'>-	if (!hidinput_connect(hid))</div><div class='del'>-		hid-&gt;claimed |= HID_CLAIMED_INPUT;</div><div class='del'>-	if (!hiddev_connect(hid))</div><div class='del'>-		hid-&gt;claimed |= HID_CLAIMED_HIDDEV;</div><div class='del'>-	if (!hidraw_connect(hid))</div><div class='del'>-		hid-&gt;claimed |= HID_CLAIMED_HIDRAW;</div><div class='add'>+	hid = hid_allocate_device();</div><div class='add'>+	if (IS_ERR(hid))</div><div class='add'>+		return PTR_ERR(hid);</div><div class='ctx'> </div><div class='ctx'> 	usb_set_intfdata(intf, hid);</div><div class='add'>+	hid-&gt;ll_driver = &amp;usb_hid_driver;</div><div class='add'>+	hid-&gt;hid_output_raw_report = usbhid_output_raw_report;</div><div class='add'>+	hid-&gt;ff_init = hid_pidff_init;</div><div class='add'>+#ifdef CONFIG_USB_HIDDEV</div><div class='add'>+	hid-&gt;hiddev_connect = hiddev_connect;</div><div class='add'>+	hid-&gt;hiddev_hid_event = hiddev_hid_event;</div><div class='add'>+	hid-&gt;hiddev_report_event = hiddev_report_event;</div><div class='add'>+#endif</div><div class='add'>+	hid-&gt;dev.parent = &amp;intf-&gt;dev;</div><div class='add'>+	hid-&gt;bus = BUS_USB;</div><div class='add'>+	hid-&gt;vendor = le16_to_cpu(dev-&gt;descriptor.idVendor);</div><div class='add'>+	hid-&gt;product = le16_to_cpu(dev-&gt;descriptor.idProduct);</div><div class='add'>+	hid-&gt;name[0] = 0;</div><div class='ctx'> </div><div class='del'>-	if (!hid-&gt;claimed) {</div><div class='del'>-		printk ("HID device claimed by neither input, hiddev nor hidraw\n");</div><div class='del'>-		hid_disconnect(intf);</div><div class='del'>-		return -ENODEV;</div><div class='add'>+	if (dev-&gt;manufacturer)</div><div class='add'>+		strlcpy(hid-&gt;name, dev-&gt;manufacturer, sizeof(hid-&gt;name));</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;product) {</div><div class='add'>+		if (dev-&gt;manufacturer)</div><div class='add'>+			strlcat(hid-&gt;name, " ", sizeof(hid-&gt;name));</div><div class='add'>+		strlcat(hid-&gt;name, dev-&gt;product, sizeof(hid-&gt;name));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((hid-&gt;claimed &amp; HID_CLAIMED_INPUT))</div><div class='del'>-		hid_ff_init(hid);</div><div class='add'>+	if (!strlen(hid-&gt;name))</div><div class='add'>+		snprintf(hid-&gt;name, sizeof(hid-&gt;name), "HID %04x:%04x",</div><div class='add'>+			 le16_to_cpu(dev-&gt;descriptor.idVendor),</div><div class='add'>+			 le16_to_cpu(dev-&gt;descriptor.idProduct));</div><div class='ctx'> </div><div class='del'>-	if (hid-&gt;quirks &amp; HID_QUIRK_SONY_PS3_CONTROLLER)</div><div class='del'>-		hid_fixup_sony_ps3_controller(interface_to_usbdev(intf),</div><div class='del'>-			intf-&gt;cur_altsetting-&gt;desc.bInterfaceNumber);</div><div class='add'>+	usb_make_path(dev, hid-&gt;phys, sizeof(hid-&gt;phys));</div><div class='add'>+	strlcat(hid-&gt;phys, "/input", sizeof(hid-&gt;phys));</div><div class='add'>+	len = strlen(hid-&gt;phys);</div><div class='add'>+	if (len &lt; sizeof(hid-&gt;phys) - 1)</div><div class='add'>+		snprintf(hid-&gt;phys + len, sizeof(hid-&gt;phys) - len,</div><div class='add'>+			 "%d", intf-&gt;altsetting[0].desc.bInterfaceNumber);</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO);</div><div class='add'>+	if (usb_string(dev, dev-&gt;descriptor.iSerialNumber, hid-&gt;uniq, 64) &lt;= 0)</div><div class='add'>+		hid-&gt;uniq[0] = 0;</div><div class='ctx'> </div><div class='del'>-	if (hid-&gt;claimed &amp; HID_CLAIMED_INPUT)</div><div class='del'>-		printk("input");</div><div class='del'>-	if ((hid-&gt;claimed &amp; HID_CLAIMED_INPUT) &amp;&amp; ((hid-&gt;claimed &amp; HID_CLAIMED_HIDDEV) ||</div><div class='del'>-				hid-&gt;claimed &amp; HID_CLAIMED_HIDRAW))</div><div class='del'>-		printk(",");</div><div class='del'>-	if (hid-&gt;claimed &amp; HID_CLAIMED_HIDDEV)</div><div class='del'>-		printk("hiddev%d", hid-&gt;minor);</div><div class='del'>-	if ((hid-&gt;claimed &amp; HID_CLAIMED_INPUT) &amp;&amp; (hid-&gt;claimed &amp; HID_CLAIMED_HIDDEV) &amp;&amp;</div><div class='del'>-			(hid-&gt;claimed &amp; HID_CLAIMED_HIDRAW))</div><div class='del'>-		printk(",");</div><div class='del'>-	if (hid-&gt;claimed &amp; HID_CLAIMED_HIDRAW)</div><div class='del'>-		printk("hidraw%d", ((struct hidraw*)hid-&gt;hidraw)-&gt;minor);</div><div class='del'>-</div><div class='del'>-	c = "Device";</div><div class='del'>-	for (i = 0; i &lt; hid-&gt;maxcollection; i++) {</div><div class='del'>-		if (hid-&gt;collection[i].type == HID_COLLECTION_APPLICATION &amp;&amp;</div><div class='del'>-		    (hid-&gt;collection[i].usage &amp; HID_USAGE_PAGE) == HID_UP_GENDESK &amp;&amp;</div><div class='del'>-		    (hid-&gt;collection[i].usage &amp; 0xffff) &lt; ARRAY_SIZE(hid_types)) {</div><div class='del'>-			c = hid_types[hid-&gt;collection[i].usage &amp; 0xffff];</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='add'>+	ret = hid_add_device(hid);</div><div class='add'>+	if (ret) {</div><div class='add'>+		if (ret != -ENODEV)</div><div class='add'>+			dev_err(&amp;intf-&gt;dev, "can't add hid device: %d\n", ret);</div><div class='add'>+		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	usb_make_path(interface_to_usbdev(intf), path, 63);</div><div class='add'>+	return 0;</div><div class='add'>+err:</div><div class='add'>+	hid_destroy_device(hid);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	printk(": USB HID v%x.%02x %s [%s] on %s\n",</div><div class='del'>-		hid-&gt;version &gt;&gt; 8, hid-&gt;version &amp; 0xff, c, hid-&gt;name, path);</div><div class='add'>+static void hid_disconnect(struct usb_interface *intf)</div><div class='add'>+{</div><div class='add'>+	struct hid_device *hid = usb_get_intfdata(intf);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	if (WARN_ON(!hid))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	hid_destroy_device(hid);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int hid_suspend(struct usb_interface *intf, pm_message_t message)</div><div class='hunk'>@@ -1107,9 +1087,22 @@ static struct usb_driver hid_driver = {</div><div class='ctx'> 	.supports_autosuspend = 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct hid_device_id hid_usb_table[] = {</div><div class='add'>+	{ HID_USB_DEVICE(HID_ANY_ID, HID_ANY_ID) },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct hid_driver hid_usb_driver = {</div><div class='add'>+	.name = "generic-usb",</div><div class='add'>+	.id_table = hid_usb_table,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int __init hid_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int retval;</div><div class='add'>+	retval = hid_register_driver(&amp;hid_usb_driver);</div><div class='add'>+	if (retval)</div><div class='add'>+		goto hid_register_fail;</div><div class='ctx'> 	retval = usbhid_quirks_init(quirks_param);</div><div class='ctx'> 	if (retval)</div><div class='ctx'> 		goto usbhid_quirks_init_fail;</div><div class='hunk'>@@ -1119,7 +1112,8 @@ static int __init hid_init(void)</div><div class='ctx'> 	retval = usb_register(&amp;hid_driver);</div><div class='ctx'> 	if (retval)</div><div class='ctx'> 		goto usb_register_fail;</div><div class='del'>-	info(DRIVER_VERSION ":" DRIVER_DESC);</div><div class='add'>+	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"</div><div class='add'>+			DRIVER_DESC "\n");</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> usb_register_fail:</div><div class='hunk'>@@ -1127,6 +1121,8 @@ usb_register_fail:</div><div class='ctx'> hiddev_init_fail:</div><div class='ctx'> 	usbhid_quirks_exit();</div><div class='ctx'> usbhid_quirks_init_fail:</div><div class='add'>+	hid_unregister_driver(&amp;hid_usb_driver);</div><div class='add'>+hid_register_fail:</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1135,6 +1131,7 @@ static void __exit hid_exit(void)</div><div class='ctx'> 	usb_deregister(&amp;hid_driver);</div><div class='ctx'> 	hiddev_exit();</div><div class='ctx'> 	usbhid_quirks_exit();</div><div class='add'>+	hid_unregister_driver(&amp;hid_usb_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(hid_init);</div><div class='head'>diff --git a/drivers/hid/usbhid/hid-ff.c b/drivers/hid/usbhid/hid-ff.c<br/>deleted file mode 100644<br/>index 1d0dac52f166..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hid/usbhid/hid-ff.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/hid/usbhid/hid-ff.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,95 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Force feedback support for hid devices.</div><div class='del'>- *  Not all hid devices use the same protocol. For example, some use PID,</div><div class='del'>- *  other use their own proprietary procotol.</div><div class='del'>- *</div><div class='del'>- *  Copyright (c) 2002-2004 Johann Deneux</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA</div><div class='del'>- *</div><div class='del'>- * Should you need to contact me, the author, you can do so by</div><div class='del'>- * e-mail - mail your message to &lt;johann.deneux@it.uu.se&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/input.h&gt;</div><div class='del'>-</div><div class='del'>-#undef DEBUG</div><div class='del'>-#include &lt;linux/usb.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;linux/hid.h&gt;</div><div class='del'>-#include "usbhid.h"</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This table contains pointers to initializers. To add support for new</div><div class='del'>- * devices, you need to add the USB vendor and product ids here.</div><div class='del'>- */</div><div class='del'>-struct hid_ff_initializer {</div><div class='del'>-	u16 idVendor;</div><div class='del'>-	u16 idProduct;</div><div class='del'>-	int (*init)(struct hid_device*);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * We try pidff when no other driver is found because PID is the</div><div class='del'>- * standards compliant way of implementing force feedback in HID.</div><div class='del'>- * pidff_init() will quickly abort if the device doesn't appear to</div><div class='del'>- * be a PID device</div><div class='del'>- */</div><div class='del'>-static struct hid_ff_initializer inits[] = {</div><div class='del'>-#ifdef CONFIG_LOGITECH_FF</div><div class='del'>-	{ 0x46d, 0xc211, hid_lgff_init }, /* Logitech Cordless rumble pad */</div><div class='del'>-	{ 0x46d, 0xc219, hid_lgff_init }, /* Logitech Cordless rumble pad 2 */</div><div class='del'>-	{ 0x46d, 0xc283, hid_lgff_init }, /* Logitech Wingman Force 3d */</div><div class='del'>-	{ 0x46d, 0xc286, hid_lgff_init }, /* Logitech Force 3D Pro Joystick */</div><div class='del'>-	{ 0x46d, 0xc294, hid_lgff_init }, /* Logitech Formula Force EX */</div><div class='del'>-	{ 0x46d, 0xc295, hid_lgff_init }, /* Logitech MOMO force wheel */</div><div class='del'>-	{ 0x46d, 0xca03, hid_lgff_init }, /* Logitech MOMO force wheel */</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_LOGIRUMBLEPAD2_FF</div><div class='del'>-	{ 0x46d, 0xc218, hid_lg2ff_init }, /* Logitech Rumblepad 2 */</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_PANTHERLORD_FF</div><div class='del'>-	{ 0x810, 0x0001, hid_plff_init }, /* "Twin USB Joystick" */</div><div class='del'>-	{ 0xe8f, 0x0003, hid_plff_init }, /* "GreenAsia Inc.    USB Joystick     " */</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_THRUSTMASTER_FF</div><div class='del'>-	{ 0x44f, 0xb300, hid_tmff_init },</div><div class='del'>-	{ 0x44f, 0xb304, hid_tmff_init },</div><div class='del'>-	{ 0x44f, 0xb651, hid_tmff_init }, /* FGT Rumble Force Wheel */</div><div class='del'>-	{ 0x44f, 0xb654, hid_tmff_init }, /* FGT Force Feedback Wheel */</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_ZEROPLUS_FF</div><div class='del'>-	{ 0xc12, 0x0005, hid_zpff_init },</div><div class='del'>-	{ 0xc12, 0x0030, hid_zpff_init },</div><div class='del'>-#endif</div><div class='del'>-	{ 0,	 0,	 hid_pidff_init}  /* Matches anything */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int hid_ff_init(struct hid_device* hid)</div><div class='del'>-{</div><div class='del'>-	struct hid_ff_initializer *init;</div><div class='del'>-	int vendor = le16_to_cpu(hid_to_usb_dev(hid)-&gt;descriptor.idVendor);</div><div class='del'>-	int product = le16_to_cpu(hid_to_usb_dev(hid)-&gt;descriptor.idProduct);</div><div class='del'>-</div><div class='del'>-	for (init = inits; init-&gt;idVendor; init++)</div><div class='del'>-		if (init-&gt;idVendor == vendor &amp;&amp; init-&gt;idProduct == product)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-	return init-&gt;init(hid);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(hid_ff_init);</div><div class='del'>-</div><div class='head'>diff --git a/drivers/hid/usbhid/hid-pidff.c b/drivers/hid/usbhid/hid-pidff.c<br/>index 011326178c06..484e3eec2f88 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hid/usbhid/hid-pidff.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/hid/usbhid/hid-pidff.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hid/usbhid/hid-pidff.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/usbhid/hid-pidff.c</a></div><div class='hunk'>@@ -397,7 +397,6 @@ static void pidff_set_condition_report(struct pidff_device *pidff,</div><div class='ctx'> 			  effect-&gt;u.condition[i].left_saturation);</div><div class='ctx'> 		pidff_set(&amp;pidff-&gt;set_condition[PID_DEAD_BAND],</div><div class='ctx'> 			  effect-&gt;u.condition[i].deadband);</div><div class='del'>-		usbhid_wait_io(pidff-&gt;hid);</div><div class='ctx'> 		usbhid_submit_report(pidff-&gt;hid, pidff-&gt;reports[PID_SET_CONDITION],</div><div class='ctx'> 				  USB_DIR_OUT);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -512,7 +511,6 @@ static void pidff_playback_pid(struct pidff_device *pidff, int pid_id, int n)</div><div class='ctx'> 		pidff-&gt;effect_operation[PID_LOOP_COUNT].value[0] = n;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	usbhid_wait_io(pidff-&gt;hid);</div><div class='ctx'> 	usbhid_submit_report(pidff-&gt;hid, pidff-&gt;reports[PID_EFFECT_OPERATION],</div><div class='ctx'> 			  USB_DIR_OUT);</div><div class='ctx'> }</div><div class='hunk'>@@ -548,6 +546,9 @@ static int pidff_erase_effect(struct input_dev *dev, int effect_id)</div><div class='ctx'> 	int pid_id = pidff-&gt;pid_id[effect_id];</div><div class='ctx'> </div><div class='ctx'> 	debug("starting to erase %d/%d", effect_id, pidff-&gt;pid_id[effect_id]);</div><div class='add'>+	/* Wait for the queue to clear. We do not want a full fifo to</div><div class='add'>+	   prevent the effect removal. */</div><div class='add'>+	usbhid_wait_io(pidff-&gt;hid);</div><div class='ctx'> 	pidff_playback_pid(pidff, pid_id, 0);</div><div class='ctx'> 	pidff_erase_pid(pidff, pid_id);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c<br/>index b15f88249639..47ebe045f9b5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hid/usbhid/hid-quirks.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/hid/usbhid/hid-quirks.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hid/usbhid/hid-quirks.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/usbhid/hid-quirks.c</a></div><div class='hunk'>@@ -17,412 +17,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/hid.h&gt;</div><div class='ctx'> </div><div class='del'>-#define USB_VENDOR_ID_A4TECH		0x09da</div><div class='del'>-#define USB_DEVICE_ID_A4TECH_WCP32PU	0x0006</div><div class='del'>-#define USB_DEVICE_ID_A4TECH_X5_005D	0x000a</div><div class='del'>-</div><div class='del'>-#define USB_VENDOR_ID_AASHIMA		0x06d6</div><div class='del'>-#define USB_DEVICE_ID_AASHIMA_GAMEPAD	0x0025</div><div class='del'>-#define USB_DEVICE_ID_AASHIMA_PREDATOR	0x0026</div><div class='del'>-</div><div class='del'>-#define USB_VENDOR_ID_ACECAD		0x0460</div><div class='del'>-#define USB_DEVICE_ID_ACECAD_FLAIR	0x0004</div><div class='del'>-#define USB_DEVICE_ID_ACECAD_302	0x0008</div><div class='del'>-</div><div class='del'>-#define USB_VENDOR_ID_ADS_TECH 		0x06e1</div><div class='del'>-#define USB_DEVICE_ID_ADS_TECH_RADIO_SI470X	0xa155</div><div class='del'>-</div><div class='del'>-#define USB_VENDOR_ID_AFATECH		0x15a4</div><div class='del'>-#define USB_DEVICE_ID_AFATECH_AF9016	0x9016</div><div class='del'>-</div><div class='del'>-#define USB_VENDOR_ID_AIPTEK		0x08ca</div><div class='del'>-#define USB_DEVICE_ID_AIPTEK_01		0x0001</div><div class='del'>-#define USB_DEVICE_ID_AIPTEK_10		0x0010</div><div class='del'>-#define USB_DEVICE_ID_AIPTEK_20		0x0020</div><div class='del'>-#define USB_DEVICE_ID_AIPTEK_21		0x0021</div><div class='del'>-#define USB_DEVICE_ID_AIPTEK_22		0x0022</div><div class='del'>-#define USB_DEVICE_ID_AIPTEK_23		0x0023</div><div class='del'>-#define USB_DEVICE_ID_AIPTEK_24		0x0024</div><div class='del'>-</div><div class='del'>-#define USB_VENDOR_ID_AIRCABLE		0x16CA</div><div class='del'>-#define USB_DEVICE_ID_AIRCABLE1		0x1502</div><div class='del'>-</div><div class='del'>-#define USB_VENDOR_ID_ALCOR		0x058f</div><div class='del'>-#define USB_DEVICE_ID_ALCOR_USBRS232	0x9720</div><div class='del'>-</div><div class='del'>-#define USB_VENDOR_ID_ALPS		0x0433</div><div class='del'>-#define USB_DEVICE_ID_IBM_GAMEPAD	0x1101</div><div class='del'>-</div><div class='del'>-#define USB_VENDOR_ID_APPLE		0x05ac</div><div class='del'>-#define USB_DEVICE_ID_APPLE_MIGHTYMOUSE	0x0304</div><div class='del'>-#define USB_DEVICE_ID_APPLE_FOUNTAIN_ANSI	0x020e</div><div class='del'>-#define USB_DEVICE_ID_APPLE_FOUNTAIN_ISO	0x020f</div><div class='del'>-#define USB_DEVICE_ID_APPLE_GEYSER_ANSI	0x0214</div><div class='del'>-#define USB_DEVICE_ID_APPLE_GEYSER_ISO	0x0215</div><div class='del'>-#define USB_DEVICE_ID_APPLE_GEYSER_JIS	0x0216</div><div class='del'>-#define USB_DEVICE_ID_APPLE_GEYSER3_ANSI	0x0217</div><div class='del'>-#define USB_DEVICE_ID_APPLE_GEYSER3_ISO	0x0218</div><div class='del'>-#define USB_DEVICE_ID_APPLE_GEYSER3_JIS	0x0219</div><div class='del'>-#define USB_DEVICE_ID_APPLE_GEYSER4_ANSI	0x021a</div><div class='del'>-#define USB_DEVICE_ID_APPLE_GEYSER4_ISO	0x021b</div><div class='del'>-#define USB_DEVICE_ID_APPLE_GEYSER4_JIS	0x021c</div><div class='del'>-#define USB_DEVICE_ID_APPLE_ALU_ANSI	0x0220</div><div class='del'>-#define USB_DEVICE_ID_APPLE_ALU_ISO	0x0221</div><div class='del'>-#define USB_DEVICE_ID_APPLE_ALU_JIS	0x0222</div><div class='del'>-#define USB_DEVICE_ID_APPLE_WELLSPRING_ANSI	0x0223</div><div class='del'>-#define USB_DEVICE_ID_APPLE_WELLSPRING_ISO	0x0224</div><div class='del'>-#define USB_DEVICE_ID_APPLE_WELLSPRING_JIS	0x0225</div><div class='del'>-#define USB_DEVICE_ID_APPLE_GEYSER4_HF_ANSI    0x0229</div><div class='del'>-#define USB_DEVICE_ID_APPLE_GEYSER4_HF_ISO     0x022a</div><div class='del'>-#define USB_DEVICE_ID_APPLE_GEYSER4_HF_JIS     0x022b</div><div class='del'>-#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI  0x022c</div><div class='del'>-#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO   0x022d</div><div class='del'>-#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS   0x022e</div><div class='del'>-#define USB_DEVICE_ID_APPLE_WELLSPRING2_ANSI	0x0230</div><div class='del'>-#define USB_DEVICE_ID_APPLE_WELLSPRING2_ISO	0x0231</div><div class='del'>-#define USB_DEVICE_ID_APPLE_WELLSPRING2_JIS	0x0232</div><div class='del'>-#define USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY	0x030a</div><div class='del'>-#define USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY	0x030b</div><div class='del'>-#define USB_DEVICE_ID_APPLE_IRCONTROL4	0x8242</div><div class='del'>-</div><div class='del'>-#define USB_VENDOR_ID_ASUS		0x0b05</div><div class='del'>-#define USB_DEVICE_ID_ASUS_LCM		0x1726</div><div class='del'>-</div><div class='del'>-#define USB_VENDOR_ID_ATEN		0x0557</div><div class='del'>-#define USB_DEVICE_ID_ATEN_UC100KM	0x2004</div><div class='del'>-#define USB_DEVICE_ID_ATEN_CS124U	0x2202</div><div class='del'>-#define USB_DEVICE_ID_ATEN_2PORTKVM	0x2204</div><div class='del'>-#define USB_DEVICE_ID_ATEN_4PORTKVM	0x2205</div><div class='del'>-#define USB_DEVICE_ID_ATEN_4PORTKVMC	0x2208</div><div class='del'>-</div><div class='del'>-#define USB_VENDOR_ID_BELKIN           0x050d</div><div class='del'>-#define USB_DEVICE_ID_FLIP_KVM         0x3201</div><div class='del'>-</div><div class='del'>-#define USB_VENDOR_ID_BERKSHIRE		0x0c98</div><div class='del'>-#define USB_DEVICE_ID_BERKSHIRE_PCWD	0x1140</div><div class='del'>-</div><div class='del'>-#define USB_VENDOR_ID_CHERRY		0x046a</div><div class='del'>-#define USB_DEVICE_ID_CHERRY_CYMOTION	0x0023</div><div class='del'>-</div><div class='del'>-#define USB_VENDOR_ID_CHIC		0x05fe</div><div class='del'>-#define USB_DEVICE_ID_CHIC_GAMEPAD	0x0014</div><div class='del'>-</div><div class='del'>-#define USB_VENDOR_ID_CIDC		0x1677</div><div class='del'>-</div><div class='del'>-#define USB_VENDOR_ID_CMEDIA		0x0d8c</div><div class='del'>-#define USB_DEVICE_ID_CM109		0x000e</div><div class='del'>-</div><div class='del'>-#define USB_VENDOR_ID_CODEMERCS		0x07c0</div><div class='del'>-#define USB_DEVICE_ID_CODEMERCS_IOW_FIRST	0x1500</div><div class='del'>-#define USB_DEVICE_ID_CODEMERCS_IOW_LAST	0x15ff</div><div class='del'>-</div><div class='del'>-#define USB_VENDOR_ID_CYGNAL		0x10c4</div><div class='del'>-#define USB_DEVICE_ID_CYGNAL_RADIO_SI470X	0x818a</div><div class='del'>-</div><div class='del'>-#define USB_VENDOR_ID_CYPRESS		0x04b4</div><div class='del'>-#define USB_DEVICE_ID_CYPRESS_MOUSE	0x0001</div><div class='del'>-#define USB_DEVICE_ID_CYPRESS_HIDCOM	0x5500</div><div class='del'>-#define USB_DEVICE_ID_CYPRESS_ULTRAMOUSE	0x7417</div><div class='del'>-#define USB_DEVICE_ID_CYPRESS_BARCODE_1	0xde61</div><div class='del'>-#define USB_DEVICE_ID_CYPRESS_BARCODE_2	0xde64</div><div class='del'>-</div><div class='del'>-#define USB_VENDOR_ID_DELL		0x413c</div><div class='del'>-#define USB_DEVICE_ID_DELL_W7658	0x2005</div><div class='del'>-</div><div class='del'>-#define USB_VENDOR_ID_DELORME		0x1163</div><div class='del'>-#define USB_DEVICE_ID_DELORME_EARTHMATE 0x0100</div><div class='del'>-#define USB_DEVICE_ID_DELORME_EM_LT20	0x0200</div><div class='del'>-</div><div class='del'>-#define USB_VENDOR_ID_DMI		0x0c0b</div><div class='del'>-#define USB_DEVICE_ID_DMI_ENC		0x5fab</div><div class='del'>-</div><div class='del'>-#define USB_VENDOR_ID_ELO		0x04E7</div><div class='del'>-#define USB_DEVICE_ID_ELO_TS2700	0x0020</div><div class='del'>-</div><div class='del'>-#define USB_VENDOR_ID_ESSENTIAL_REALITY	0x0d7f</div><div class='del'>-#define USB_DEVICE_ID_ESSENTIAL_REALITY_P5 0x0100</div><div class='del'>-</div><div class='del'>-#define USB_VENDOR_ID_EZKEY 		0x0518</div><div class='del'>-#define USB_DEVICE_ID_BTC_8193		0x0002</div><div class='del'>-</div><div class='del'>-#define USB_VENDOR_ID_GAMERON		0x0810</div><div class='del'>-#define USB_DEVICE_ID_GAMERON_DUAL_PSX_ADAPTOR	0x0001</div><div class='del'>-</div><div class='del'>-#define USB_VENDOR_ID_GENERAL_TOUCH	0x0dfc</div><div class='del'>-</div><div class='del'>-#define USB_VENDOR_ID_GLAB		0x06c2</div><div class='del'>-#define USB_DEVICE_ID_4_PHIDGETSERVO_30	0x0038</div><div class='del'>-#define USB_DEVICE_ID_1_PHIDGETSERVO_30	0x0039</div><div class='del'>-#define USB_DEVICE_ID_0_0_4_IF_KIT	0x0040</div><div class='del'>-#define USB_DEVICE_ID_0_16_16_IF_KIT	0x0044</div><div class='del'>-#define USB_DEVICE_ID_8_8_8_IF_KIT	0x0045</div><div class='del'>-#define USB_DEVICE_ID_0_8_7_IF_KIT	0x0051</div><div class='del'>-#define USB_DEVICE_ID_0_8_8_IF_KIT	0x0053</div><div class='del'>-#define USB_DEVICE_ID_PHIDGET_MOTORCONTROL	0x0058</div><div class='del'>-</div><div class='del'>-#define USB_VENDOR_ID_GOTOP		0x08f2</div><div class='del'>-#define USB_DEVICE_ID_SUPER_Q2		0x007f</div><div class='del'>-#define USB_DEVICE_ID_GOGOPEN		0x00ce</div><div class='del'>-#define USB_DEVICE_ID_PENPOWER		0x00f4</div><div class='del'>-</div><div class='del'>-#define USB_VENDOR_ID_GRETAGMACBETH	0x0971</div><div class='del'>-#define USB_DEVICE_ID_GRETAGMACBETH_HUEY	0x2005</div><div class='del'>-</div><div class='del'>-#define USB_VENDOR_ID_GRIFFIN		0x077d</div><div class='del'>-#define USB_DEVICE_ID_POWERMATE		0x0410</div><div class='del'>-#define USB_DEVICE_ID_SOUNDKNOB		0x04AA</div><div class='del'>-</div><div class='del'>-#define USB_VENDOR_ID_GTCO		0x078c</div><div class='del'>-#define USB_DEVICE_ID_GTCO_90		0x0090</div><div class='del'>-#define USB_DEVICE_ID_GTCO_100		0x0100</div><div class='del'>-#define USB_DEVICE_ID_GTCO_101		0x0101</div><div class='del'>-#define USB_DEVICE_ID_GTCO_103		0x0103</div><div class='del'>-#define USB_DEVICE_ID_GTCO_104		0x0104</div><div class='del'>-#define USB_DEVICE_ID_GTCO_105		0x0105</div><div class='del'>-#define USB_DEVICE_ID_GTCO_106		0x0106</div><div class='del'>-#define USB_DEVICE_ID_GTCO_107		0x0107</div><div class='del'>-#define USB_DEVICE_ID_GTCO_108		0x0108</div><div class='del'>-#define USB_DEVICE_ID_GTCO_200		0x0200</div><div class='del'>-#define USB_DEVICE_ID_GTCO_201		0x0201</div><div class='del'>-#define USB_DEVICE_ID_GTCO_202		0x0202</div><div class='del'>-#define USB_DEVICE_ID_GTCO_203		0x0203</div><div class='del'>-#define USB_DEVICE_ID_GTCO_204		0x0204</div><div class='del'>-#define USB_DEVICE_ID_GTCO_205		0x0205</div><div class='del'>-#define USB_DEVICE_ID_GTCO_206		0x0206</div><div class='del'>-#define USB_DEVICE_ID_GTCO_207		0x0207</div><div class='del'>-#define USB_DEVICE_ID_GTCO_300		0x0300</div><div class='del'>-#define USB_DEVICE_ID_GTCO_301		0x0301</div><div class='del'>-#define USB_DEVICE_ID_GTCO_302		0x0302</div><div class='del'>-#define USB_DEVICE_ID_GTCO_303		0x0303</div><div class='del'>-#define USB_DEVICE_ID_GTCO_304		0x0304</div><div class='del'>-#define USB_DEVICE_ID_GTCO_305		0x0305</div><div class='del'>-#define USB_DEVICE_ID_GTCO_306		0x0306</div><div class='del'>-#define USB_DEVICE_ID_GTCO_307		0x0307</div><div class='del'>-#define USB_DEVICE_ID_GTCO_308		0x0308</div><div class='del'>-#define USB_DEVICE_ID_GTCO_309		0x0309</div><div class='del'>-#define USB_DEVICE_ID_GTCO_400		0x0400</div><div class='del'>-#define USB_DEVICE_ID_GTCO_401		0x0401</div><div class='del'>-#define USB_DEVICE_ID_GTCO_402		0x0402</div><div class='del'>-#define USB_DEVICE_ID_GTCO_403		0x0403</div><div class='del'>-#define USB_DEVICE_ID_GTCO_404		0x0404</div><div class='del'>-#define USB_DEVICE_ID_GTCO_405		0x0405</div><div class='del'>-#define USB_DEVICE_ID_GTCO_500		0x0500</div><div class='del'>-#define USB_DEVICE_ID_GTCO_501		0x0501</div><div class='del'>-#define USB_DEVICE_ID_GTCO_502		0x0502</div><div class='del'>-#define USB_DEVICE_ID_GTCO_503		0x0503</div><div class='del'>-#define USB_DEVICE_ID_GTCO_504		0x0504</div><div class='del'>-#define USB_DEVICE_ID_GTCO_1000		0x1000</div><div class='del'>-#define USB_DEVICE_ID_GTCO_1001		0x1001</div><div class='del'>-#define USB_DEVICE_ID_GTCO_1002		0x1002</div><div class='del'>-#define USB_DEVICE_ID_GTCO_1003		0x1003</div><div class='del'>-#define USB_DEVICE_ID_GTCO_1004		0x1004</div><div class='del'>-#define USB_DEVICE_ID_GTCO_1005		0x1005</div><div class='del'>-#define USB_DEVICE_ID_GTCO_1006		0x1006</div><div class='del'>-#define USB_DEVICE_ID_GTCO_1007		0x1007</div><div class='del'>-#define USB_VENDOR_ID_HAPP		0x078b</div><div class='del'>-#define USB_DEVICE_ID_UGCI_DRIVING	0x0010</div><div class='del'>-#define USB_DEVICE_ID_UGCI_FLYING	0x0020</div><div class='del'>-#define USB_DEVICE_ID_UGCI_FIGHTING	0x0030</div><div class='del'>-</div><div class='del'>-#define USB_VENDOR_ID_IMATION		0x0718</div><div class='del'>-#define USB_DEVICE_ID_DISC_STAKKA	0xd000</div><div class='del'>-</div><div class='del'>-#define USB_VENDOR_ID_KBGEAR		0x084e</div><div class='del'>-#define USB_DEVICE_ID_KBGEAR_JAMSTUDIO	0x1001</div><div class='del'>-</div><div class='del'>-#define USB_VENDOR_ID_LD		0x0f11</div><div class='del'>-#define USB_DEVICE_ID_LD_CASSY		0x1000</div><div class='del'>-#define USB_DEVICE_ID_LD_POCKETCASSY	0x1010</div><div class='del'>-#define USB_DEVICE_ID_LD_MOBILECASSY	0x1020</div><div class='del'>-#define USB_DEVICE_ID_LD_JWM		0x1080</div><div class='del'>-#define USB_DEVICE_ID_LD_DMMP		0x1081</div><div class='del'>-#define USB_DEVICE_ID_LD_UMIP		0x1090</div><div class='del'>-#define USB_DEVICE_ID_LD_XRAY1		0x1100</div><div class='del'>-#define USB_DEVICE_ID_LD_XRAY2		0x1101</div><div class='del'>-#define USB_DEVICE_ID_LD_VIDEOCOM	0x1200</div><div class='del'>-#define USB_DEVICE_ID_LD_COM3LAB	0x2000</div><div class='del'>-#define USB_DEVICE_ID_LD_TELEPORT	0x2010</div><div class='del'>-#define USB_DEVICE_ID_LD_NETWORKANALYSER 0x2020</div><div class='del'>-#define USB_DEVICE_ID_LD_POWERCONTROL	0x2030</div><div class='del'>-#define USB_DEVICE_ID_LD_MACHINETEST	0x2040</div><div class='del'>-</div><div class='del'>-#define USB_VENDOR_ID_LOGITECH		0x046d</div><div class='del'>-#define USB_DEVICE_ID_LOGITECH_LX3	0xc044</div><div class='del'>-#define USB_DEVICE_ID_LOGITECH_V150	0xc047</div><div class='del'>-#define USB_DEVICE_ID_LOGITECH_RECEIVER	0xc101</div><div class='del'>-#define USB_DEVICE_ID_LOGITECH_HARMONY  0xc110</div><div class='del'>-#define USB_DEVICE_ID_LOGITECH_HARMONY_2 0xc111</div><div class='del'>-#define USB_DEVICE_ID_LOGITECH_HARMONY_3 0xc112</div><div class='del'>-#define USB_DEVICE_ID_LOGITECH_HARMONY_4 0xc113</div><div class='del'>-#define USB_DEVICE_ID_LOGITECH_HARMONY_5 0xc114</div><div class='del'>-#define USB_DEVICE_ID_LOGITECH_HARMONY_6 0xc115</div><div class='del'>-#define USB_DEVICE_ID_LOGITECH_HARMONY_7 0xc116</div><div class='del'>-#define USB_DEVICE_ID_LOGITECH_HARMONY_8 0xc117</div><div class='del'>-#define USB_DEVICE_ID_LOGITECH_HARMONY_9 0xc118</div><div class='del'>-#define USB_DEVICE_ID_LOGITECH_HARMONY_10 0xc119</div><div class='del'>-#define USB_DEVICE_ID_LOGITECH_HARMONY_11 0xc11a</div><div class='del'>-#define USB_DEVICE_ID_LOGITECH_HARMONY_12 0xc11b</div><div class='del'>-#define USB_DEVICE_ID_LOGITECH_HARMONY_13 0xc11c</div><div class='del'>-#define USB_DEVICE_ID_LOGITECH_HARMONY_14 0xc11d</div><div class='del'>-#define USB_DEVICE_ID_LOGITECH_HARMONY_15 0xc11e</div><div class='del'>-#define USB_DEVICE_ID_LOGITECH_HARMONY_16 0xc11f</div><div class='del'>-#define USB_DEVICE_ID_LOGITECH_HARMONY_17 0xc120</div><div class='del'>-#define USB_DEVICE_ID_LOGITECH_HARMONY_18 0xc121</div><div class='del'>-#define USB_DEVICE_ID_LOGITECH_HARMONY_19 0xc122</div><div class='del'>-#define USB_DEVICE_ID_LOGITECH_HARMONY_20 0xc123</div><div class='del'>-#define USB_DEVICE_ID_LOGITECH_HARMONY_21 0xc124</div><div class='del'>-#define USB_DEVICE_ID_LOGITECH_HARMONY_22 0xc125</div><div class='del'>-#define USB_DEVICE_ID_LOGITECH_HARMONY_23 0xc126</div><div class='del'>-#define USB_DEVICE_ID_LOGITECH_HARMONY_24 0xc127</div><div class='del'>-#define USB_DEVICE_ID_LOGITECH_HARMONY_25 0xc128</div><div class='del'>-#define USB_DEVICE_ID_LOGITECH_HARMONY_26 0xc129</div><div class='del'>-#define USB_DEVICE_ID_LOGITECH_HARMONY_27 0xc12a</div><div class='del'>-#define USB_DEVICE_ID_LOGITECH_HARMONY_28 0xc12b</div><div class='del'>-#define USB_DEVICE_ID_LOGITECH_HARMONY_29 0xc12c</div><div class='del'>-#define USB_DEVICE_ID_LOGITECH_HARMONY_30 0xc12d</div><div class='del'>-#define USB_DEVICE_ID_LOGITECH_HARMONY_31 0xc12e</div><div class='del'>-#define USB_DEVICE_ID_LOGITECH_HARMONY_32 0xc12f</div><div class='del'>-#define USB_DEVICE_ID_LOGITECH_HARMONY_33 0xc130</div><div class='del'>-#define USB_DEVICE_ID_LOGITECH_HARMONY_34 0xc131</div><div class='del'>-#define USB_DEVICE_ID_LOGITECH_HARMONY_35 0xc132</div><div class='del'>-#define USB_DEVICE_ID_LOGITECH_HARMONY_36 0xc133</div><div class='del'>-#define USB_DEVICE_ID_LOGITECH_HARMONY_37 0xc134</div><div class='del'>-#define USB_DEVICE_ID_LOGITECH_HARMONY_38 0xc135</div><div class='del'>-#define USB_DEVICE_ID_LOGITECH_HARMONY_39 0xc136</div><div class='del'>-#define USB_DEVICE_ID_LOGITECH_HARMONY_40 0xc137</div><div class='del'>-#define USB_DEVICE_ID_LOGITECH_HARMONY_41 0xc138</div><div class='del'>-#define USB_DEVICE_ID_LOGITECH_HARMONY_42 0xc139</div><div class='del'>-#define USB_DEVICE_ID_LOGITECH_HARMONY_43 0xc13a</div><div class='del'>-#define USB_DEVICE_ID_LOGITECH_HARMONY_44 0xc13b</div><div class='del'>-#define USB_DEVICE_ID_LOGITECH_HARMONY_45 0xc13c</div><div class='del'>-#define USB_DEVICE_ID_LOGITECH_HARMONY_46 0xc13d</div><div class='del'>-#define USB_DEVICE_ID_LOGITECH_HARMONY_47 0xc13e</div><div class='del'>-#define USB_DEVICE_ID_LOGITECH_HARMONY_48 0xc13f</div><div class='del'>-#define USB_DEVICE_ID_LOGITECH_HARMONY_49 0xc140</div><div class='del'>-#define USB_DEVICE_ID_LOGITECH_HARMONY_50 0xc141</div><div class='del'>-#define USB_DEVICE_ID_LOGITECH_HARMONY_51 0xc142</div><div class='del'>-#define USB_DEVICE_ID_LOGITECH_HARMONY_52 0xc143</div><div class='del'>-#define USB_DEVICE_ID_LOGITECH_HARMONY_53 0xc144</div><div class='del'>-#define USB_DEVICE_ID_LOGITECH_HARMONY_54 0xc145</div><div class='del'>-#define USB_DEVICE_ID_LOGITECH_HARMONY_55 0xc146</div><div class='del'>-#define USB_DEVICE_ID_LOGITECH_HARMONY_56 0xc147</div><div class='del'>-#define USB_DEVICE_ID_LOGITECH_HARMONY_57 0xc148</div><div class='del'>-#define USB_DEVICE_ID_LOGITECH_HARMONY_58 0xc149</div><div class='del'>-#define USB_DEVICE_ID_LOGITECH_HARMONY_59 0xc14a</div><div class='del'>-#define USB_DEVICE_ID_LOGITECH_HARMONY_60 0xc14b</div><div class='del'>-#define USB_DEVICE_ID_LOGITECH_HARMONY_61 0xc14c</div><div class='del'>-#define USB_DEVICE_ID_LOGITECH_HARMONY_62 0xc14d</div><div class='del'>-#define USB_DEVICE_ID_LOGITECH_HARMONY_63 0xc14e</div><div class='del'>-#define USB_DEVICE_ID_LOGITECH_HARMONY_64 0xc14f</div><div class='del'>-#define USB_DEVICE_ID_LOGITECH_EXTREME_3D	0xc215</div><div class='del'>-#define USB_DEVICE_ID_LOGITECH_WHEEL	0xc294</div><div class='del'>-#define USB_DEVICE_ID_LOGITECH_ELITE_KBD	0xc30a</div><div class='del'>-#define USB_DEVICE_ID_LOGITECH_KBD	0xc311</div><div class='del'>-#define USB_DEVICE_ID_S510_RECEIVER	0xc50c</div><div class='del'>-#define USB_DEVICE_ID_S510_RECEIVER_2	0xc517</div><div class='del'>-#define USB_DEVICE_ID_LOGITECH_CORDLESS_DESKTOP_LX500	0xc512</div><div class='del'>-#define USB_DEVICE_ID_MX3000_RECEIVER	0xc513</div><div class='del'>-#define USB_DEVICE_ID_DINOVO_DESKTOP	0xc704</div><div class='del'>-#define USB_DEVICE_ID_DINOVO_EDGE	0xc714</div><div class='del'>-#define USB_DEVICE_ID_DINOVO_MINI	0xc71f</div><div class='del'>-</div><div class='del'>-#define USB_VENDOR_ID_MCC		0x09db</div><div class='del'>-#define USB_DEVICE_ID_MCC_PMD1024LS	0x0076</div><div class='del'>-#define USB_DEVICE_ID_MCC_PMD1208LS	0x007a</div><div class='del'>-</div><div class='del'>-#define USB_VENDOR_ID_MGE		0x0463</div><div class='del'>-#define USB_DEVICE_ID_MGE_UPS		0xffff</div><div class='del'>-#define USB_DEVICE_ID_MGE_UPS1		0x0001</div><div class='del'>-</div><div class='del'>-#define USB_VENDOR_ID_MICROCHIP		0x04d8</div><div class='del'>-#define USB_DEVICE_ID_PICKIT1		0x0032</div><div class='del'>-#define USB_DEVICE_ID_PICKIT2		0x0033</div><div class='del'>-</div><div class='del'>-#define USB_VENDOR_ID_MICROSOFT		0x045e</div><div class='del'>-#define USB_DEVICE_ID_SIDEWINDER_GV	0x003b</div><div class='del'>-#define USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0 0x009d</div><div class='del'>-#define USB_DEVICE_ID_DESKTOP_RECV_1028 0x00f9</div><div class='del'>-#define USB_DEVICE_ID_MS_NE4K		0x00db</div><div class='del'>-#define USB_DEVICE_ID_MS_LK6K		0x00f9</div><div class='del'>-</div><div class='del'>-#define USB_VENDOR_ID_MONTEREY		0x0566</div><div class='del'>-#define USB_DEVICE_ID_GENIUS_KB29E	0x3004</div><div class='del'>-</div><div class='del'>-#define USB_VENDOR_ID_NCR		0x0404</div><div class='del'>-#define USB_DEVICE_ID_NCR_FIRST		0x0300</div><div class='del'>-#define USB_DEVICE_ID_NCR_LAST		0x03ff</div><div class='del'>-</div><div class='del'>-#define USB_VENDOR_ID_NATIONAL_SEMICONDUCTOR 0x0400</div><div class='del'>-#define USB_DEVICE_ID_N_S_HARMONY       0xc359</div><div class='del'>-</div><div class='del'>-#define USB_VENDOR_ID_NATSU             0x08b7</div><div class='del'>-#define USB_DEVICE_ID_NATSU_GAMEPAD     0x0001</div><div class='del'>-</div><div class='del'>-#define USB_VENDOR_ID_NEC		0x073e</div><div class='del'>-#define USB_DEVICE_ID_NEC_USB_GAME_PAD	0x0301</div><div class='del'>-</div><div class='del'>-#define USB_VENDOR_ID_ONTRAK		0x0a07</div><div class='del'>-#define USB_DEVICE_ID_ONTRAK_ADU100	0x0064</div><div class='del'>-</div><div class='del'>-#define USB_VENDOR_ID_PANJIT		0x134c</div><div class='del'>-</div><div class='del'>-#define USB_VENDOR_ID_PANTHERLORD	0x0810</div><div class='del'>-#define USB_DEVICE_ID_PANTHERLORD_TWIN_USB_JOYSTICK	0x0001</div><div class='del'>-</div><div class='del'>-#define USB_VENDOR_ID_PETALYNX		0x18b1</div><div class='del'>-#define USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE	0x0037</div><div class='del'>-</div><div class='del'>-#define USB_VENDOR_ID_PLAYDOTCOM	0x0b43</div><div class='del'>-#define USB_DEVICE_ID_PLAYDOTCOM_EMS_USBII	0x0003</div><div class='del'>-</div><div class='del'>-#define USB_VENDOR_ID_SAITEK		0x06a3</div><div class='del'>-#define USB_DEVICE_ID_SAITEK_RUMBLEPAD	0xff17</div><div class='del'>-</div><div class='del'>-#define USB_VENDOR_ID_SAMSUNG		0x0419</div><div class='del'>-#define USB_DEVICE_ID_SAMSUNG_IR_REMOTE	0x0001</div><div class='del'>-</div><div class='del'>-#define USB_VENDOR_ID_SONY			0x054c</div><div class='del'>-#define USB_DEVICE_ID_SONY_PS3_CONTROLLER	0x0268</div><div class='del'>-</div><div class='del'>-#define USB_VENDOR_ID_SOUNDGRAPH	0x15c2</div><div class='del'>-#define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD	0x0038</div><div class='del'>-</div><div class='del'>-#define USB_VENDOR_ID_SUN		0x0430</div><div class='del'>-#define USB_DEVICE_ID_RARITAN_KVM_DONGLE	0xcdab</div><div class='del'>-</div><div class='del'>-#define USB_VENDOR_ID_SUNPLUS		0x04fc</div><div class='del'>-#define USB_DEVICE_ID_SUNPLUS_WDESKTOP	0x05d8</div><div class='del'>-</div><div class='del'>-#define USB_VENDOR_ID_TOPMAX		0x0663</div><div class='del'>-#define USB_DEVICE_ID_TOPMAX_COBRAPAD	0x0103</div><div class='del'>-</div><div class='del'>-#define USB_VENDOR_ID_TURBOX		0x062a</div><div class='del'>-#define USB_DEVICE_ID_TURBOX_KEYBOARD	0x0201</div><div class='del'>-</div><div class='del'>-#define USB_VENDOR_ID_VERNIER		0x08f7</div><div class='del'>-#define USB_DEVICE_ID_VERNIER_LABPRO	0x0001</div><div class='del'>-#define USB_DEVICE_ID_VERNIER_GOTEMP	0x0002</div><div class='del'>-#define USB_DEVICE_ID_VERNIER_SKIP	0x0003</div><div class='del'>-#define USB_DEVICE_ID_VERNIER_CYCLOPS	0x0004</div><div class='del'>-#define USB_DEVICE_ID_VERNIER_LCSPEC	0x0006</div><div class='del'>-</div><div class='del'>-#define USB_VENDOR_ID_WACOM		0x056a</div><div class='del'>-</div><div class='del'>-#define USB_VENDOR_ID_WISEGROUP		0x0925</div><div class='del'>-#define USB_DEVICE_ID_1_PHIDGETSERVO_20	0x8101</div><div class='del'>-#define USB_DEVICE_ID_4_PHIDGETSERVO_20	0x8104</div><div class='del'>-#define USB_DEVICE_ID_8_8_4_IF_KIT	0x8201</div><div class='del'>-#define USB_DEVICE_ID_QUAD_USB_JOYPAD	0x8800</div><div class='del'>-#define USB_DEVICE_ID_DUAL_USB_JOYPAD	0x8866</div><div class='del'>-</div><div class='del'>-#define USB_VENDOR_ID_WISEGROUP_LTD	0x6677</div><div class='del'>-#define USB_DEVICE_ID_SMARTJOY_DUAL_PLUS 0x8802</div><div class='del'>-</div><div class='del'>-#define USB_VENDOR_ID_YEALINK		0x6993</div><div class='del'>-#define USB_DEVICE_ID_YEALINK_P1K_P4K_B2K	0xb001</div><div class='del'>-</div><div class='del'>-#define USB_VENDOR_ID_KYE		0x0458</div><div class='del'>-#define USB_DEVICE_ID_KYE_GPEN_560	0x5003</div><div class='add'>+#include "../hid-ids.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Alphabetically sorted blacklist by quirk type.</div><div class='hunk'>@@ -433,18 +28,10 @@ static const struct hid_blacklist {</div><div class='ctx'> 	__u16 idProduct;</div><div class='ctx'> 	__u32 quirks;</div><div class='ctx'> } hid_blacklist[] = {</div><div class='del'>-</div><div class='del'>-	{ USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_WCP32PU, HID_QUIRK_2WHEEL_MOUSE_HACK_7 },</div><div class='del'>-	{ USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_X5_005D, HID_QUIRK_2WHEEL_MOUSE_HACK_B8 },</div><div class='del'>-	{ USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_MOUSE, HID_QUIRK_2WHEEL_MOUSE_HACK_5 },</div><div class='del'>-</div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_RECEIVER, HID_QUIRK_BAD_RELATIVE_KEYS },</div><div class='del'>-</div><div class='ctx'> 	{ USB_VENDOR_ID_AASHIMA, USB_DEVICE_ID_AASHIMA_GAMEPAD, HID_QUIRK_BADPAD },</div><div class='ctx'> 	{ USB_VENDOR_ID_AASHIMA, USB_DEVICE_ID_AASHIMA_PREDATOR, HID_QUIRK_BADPAD },</div><div class='ctx'> 	{ USB_VENDOR_ID_ALPS, USB_DEVICE_ID_IBM_GAMEPAD, HID_QUIRK_BADPAD },</div><div class='ctx'> 	{ USB_VENDOR_ID_CHIC, USB_DEVICE_ID_CHIC_GAMEPAD, HID_QUIRK_BADPAD },</div><div class='del'>-	{ USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PSX_ADAPTOR, HID_QUIRK_MULTI_INPUT },</div><div class='ctx'> 	{ USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_DRIVING, HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT },</div><div class='ctx'> 	{ USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_FLYING, HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT },</div><div class='ctx'> 	{ USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_FIGHTING, HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT },</div><div class='hunk'>@@ -453,169 +40,11 @@ static const struct hid_blacklist {</div><div class='ctx'> 	{ USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_RUMBLEPAD, HID_QUIRK_BADPAD },</div><div class='ctx'> 	{ USB_VENDOR_ID_TOPMAX, USB_DEVICE_ID_TOPMAX_COBRAPAD, HID_QUIRK_BADPAD },</div><div class='ctx'> </div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_DINOVO_DESKTOP, HID_QUIRK_DUPLICATE_USAGES },</div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_DINOVO_EDGE, HID_QUIRK_DUPLICATE_USAGES },</div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_DINOVO_MINI, HID_QUIRK_DUPLICATE_USAGES },</div><div class='del'>-</div><div class='ctx'> 	{ USB_VENDOR_ID_AFATECH, USB_DEVICE_ID_AFATECH_AF9016, HID_QUIRK_FULLSPEED_INTERVAL },</div><div class='ctx'> </div><div class='del'>-	{ USB_VENDOR_ID_BELKIN, USB_DEVICE_ID_FLIP_KVM, HID_QUIRK_HIDDEV },</div><div class='del'>-	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL4, HID_QUIRK_HIDDEV | HID_QUIRK_IGNORE_HIDINPUT },</div><div class='del'>-	{ USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE, HID_QUIRK_HIDDEV | HID_QUIRK_IGNORE_HIDINPUT },</div><div class='del'>-	{ USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_SIDEWINDER_GV, HID_QUIRK_HIDINPUT },</div><div class='del'>-</div><div class='del'>-	{ USB_VENDOR_ID_EZKEY, USB_DEVICE_ID_BTC_8193, HID_QUIRK_HWHEEL_WHEEL_INVERT },</div><div class='del'>-</div><div class='del'>-	{ USB_VENDOR_ID_ADS_TECH, USB_DEVICE_ID_ADS_TECH_RADIO_SI470X, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_AIPTEK, USB_DEVICE_ID_AIPTEK_01, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_AIPTEK, USB_DEVICE_ID_AIPTEK_10, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_AIPTEK, USB_DEVICE_ID_AIPTEK_20, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_AIPTEK, USB_DEVICE_ID_AIPTEK_21, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_AIPTEK, USB_DEVICE_ID_AIPTEK_22, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_AIPTEK, USB_DEVICE_ID_AIPTEK_23, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_AIPTEK, USB_DEVICE_ID_AIPTEK_24, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_AIRCABLE, USB_DEVICE_ID_AIRCABLE1, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_ALCOR, USB_DEVICE_ID_ALCOR_USBRS232, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_ASUS, USB_DEVICE_ID_ASUS_LCM, HID_QUIRK_IGNORE},</div><div class='del'>-	{ USB_VENDOR_ID_BERKSHIRE, USB_DEVICE_ID_BERKSHIRE_PCWD, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_CIDC, 0x0103, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_CYGNAL, USB_DEVICE_ID_CYGNAL_RADIO_SI470X, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_CMEDIA, USB_DEVICE_ID_CM109, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_HIDCOM, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_ULTRAMOUSE, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_DELORME, USB_DEVICE_ID_DELORME_EARTHMATE, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_DELORME, USB_DEVICE_ID_DELORME_EM_LT20, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_ESSENTIAL_REALITY, USB_DEVICE_ID_ESSENTIAL_REALITY_P5, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_GENERAL_TOUCH, 0x0001, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_GENERAL_TOUCH, 0x0002, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_GENERAL_TOUCH, 0x0003, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_GENERAL_TOUCH, 0x0004, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_GLAB, USB_DEVICE_ID_4_PHIDGETSERVO_30, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_GLAB, USB_DEVICE_ID_1_PHIDGETSERVO_30, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_GLAB, USB_DEVICE_ID_0_0_4_IF_KIT, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_GLAB, USB_DEVICE_ID_0_16_16_IF_KIT, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_GLAB, USB_DEVICE_ID_8_8_8_IF_KIT, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_GLAB, USB_DEVICE_ID_0_8_7_IF_KIT, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_GLAB, USB_DEVICE_ID_0_8_8_IF_KIT, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_GLAB, USB_DEVICE_ID_PHIDGET_MOTORCONTROL, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_GOTOP, USB_DEVICE_ID_SUPER_Q2, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_GOTOP, USB_DEVICE_ID_GOGOPEN, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_GOTOP, USB_DEVICE_ID_PENPOWER, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_GRETAGMACBETH, USB_DEVICE_ID_GRETAGMACBETH_HUEY, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_GRIFFIN, USB_DEVICE_ID_POWERMATE, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_GRIFFIN, USB_DEVICE_ID_SOUNDKNOB, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_90, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_100, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_101, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_103, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_104, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_105, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_106, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_107, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_108, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_200, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_201, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_202, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_203, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_204, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_205, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_206, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_207, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_300, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_301, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_302, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_303, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_304, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_305, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_306, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_307, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_308, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_309, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_400, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_401, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_402, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_403, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_404, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_405, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_500, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_501, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_502, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_503, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_504, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_1000, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_1001, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_1002, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_1003, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_1004, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_1005, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_1006, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_1007, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_IMATION, USB_DEVICE_ID_DISC_STAKKA, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_KBGEAR, USB_DEVICE_ID_KBGEAR_JAMSTUDIO, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_CASSY, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_POCKETCASSY, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MOBILECASSY, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_JWM, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_DMMP, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_UMIP, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_XRAY1, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_XRAY2, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_VIDEOCOM, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_COM3LAB, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_TELEPORT, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_NETWORKANALYSER, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_POWERCONTROL, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MACHINETEST, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_MCC, USB_DEVICE_ID_MCC_PMD1024LS, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_MCC, USB_DEVICE_ID_MCC_PMD1208LS, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_MGE, USB_DEVICE_ID_MGE_UPS, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_MGE, USB_DEVICE_ID_MGE_UPS1, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_ONTRAK, USB_DEVICE_ID_ONTRAK_ADU100, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_ONTRAK, USB_DEVICE_ID_ONTRAK_ADU100 + 20, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_ONTRAK, USB_DEVICE_ID_ONTRAK_ADU100 + 30, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_ONTRAK, USB_DEVICE_ID_ONTRAK_ADU100 + 100, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_ONTRAK, USB_DEVICE_ID_ONTRAK_ADU100 + 108, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_ONTRAK, USB_DEVICE_ID_ONTRAK_ADU100 + 118, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_ONTRAK, USB_DEVICE_ID_ONTRAK_ADU100 + 200, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_ONTRAK, USB_DEVICE_ID_ONTRAK_ADU100 + 300, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_ONTRAK, USB_DEVICE_ID_ONTRAK_ADU100 + 400, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_ONTRAK, USB_DEVICE_ID_ONTRAK_ADU100 + 500, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_PANJIT, 0x0001, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_PANJIT, 0x0002, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_PANJIT, 0x0003, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_PANJIT, 0x0004, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_LABPRO, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_GOTEMP, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_SKIP, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_CYCLOPS, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_LCSPEC, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_4_PHIDGETSERVO_20, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_1_PHIDGETSERVO_20, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_8_8_4_IF_KIT, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_YEALINK, USB_DEVICE_ID_YEALINK_P1K_P4K_B2K, HID_QUIRK_IGNORE },</div><div class='del'>-</div><div class='del'>-	{ USB_VENDOR_ID_ACECAD, USB_DEVICE_ID_ACECAD_FLAIR, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_ACECAD, USB_DEVICE_ID_ACECAD_302, HID_QUIRK_IGNORE },</div><div class='del'>-</div><div class='del'>-	{ USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_PICKIT1, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_PICKIT2, HID_QUIRK_IGNORE },</div><div class='del'>-</div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_ELITE_KBD, HID_QUIRK_LOGITECH_IGNORE_DOUBLED_WHEEL | HID_QUIRK_LOGITECH_EXPANDED_KEYMAP },</div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_CORDLESS_DESKTOP_LX500, HID_QUIRK_LOGITECH_IGNORE_DOUBLED_WHEEL | HID_QUIRK_LOGITECH_EXPANDED_KEYMAP },</div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_LX3, HID_QUIRK_INVERT_HWHEEL },</div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_V150, HID_QUIRK_INVERT_HWHEEL },</div><div class='del'>-</div><div class='del'>-	{ USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_NE4K, HID_QUIRK_MICROSOFT_KEYS },</div><div class='del'>-	{ USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_LK6K, HID_QUIRK_MICROSOFT_KEYS },</div><div class='del'>-</div><div class='del'>-	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MIGHTYMOUSE, HID_QUIRK_MIGHTYMOUSE | HID_QUIRK_INVERT_HWHEEL },</div><div class='del'>-</div><div class='ctx'> 	{ USB_VENDOR_ID_PANTHERLORD, USB_DEVICE_ID_PANTHERLORD_TWIN_USB_JOYSTICK, HID_QUIRK_MULTI_INPUT | HID_QUIRK_SKIP_OUTPUT_REPORTS },</div><div class='ctx'> 	{ USB_VENDOR_ID_PLAYDOTCOM, USB_DEVICE_ID_PLAYDOTCOM_EMS_USBII, HID_QUIRK_MULTI_INPUT },</div><div class='ctx'> </div><div class='del'>-	{ USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER, HID_QUIRK_SONY_PS3_CONTROLLER | HID_QUIRK_HIDDEV },</div><div class='del'>-</div><div class='ctx'> 	{ USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_UC100KM, HID_QUIRK_NOGET },</div><div class='ctx'> 	{ USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_CS124U, HID_QUIRK_NOGET },</div><div class='ctx'> 	{ USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_2PORTKVM, HID_QUIRK_NOGET },</div><div class='hunk'>@@ -623,144 +52,13 @@ static const struct hid_blacklist {</div><div class='ctx'> 	{ USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_4PORTKVMC, HID_QUIRK_NOGET },</div><div class='ctx'> 	{ USB_VENDOR_ID_DMI, USB_DEVICE_ID_DMI_ENC, HID_QUIRK_NOGET },</div><div class='ctx'> 	{ USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_TS2700, HID_QUIRK_NOGET },</div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_EXTREME_3D, HID_QUIRK_NOGET },</div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_WHEEL, HID_QUIRK_NOGET },</div><div class='del'>-	{ USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0, HID_QUIRK_NOGET },</div><div class='del'>-	{ USB_VENDOR_ID_PETALYNX, USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE, HID_QUIRK_NOGET },</div><div class='ctx'> 	{ USB_VENDOR_ID_SUN, USB_DEVICE_ID_RARITAN_KVM_DONGLE, HID_QUIRK_NOGET },</div><div class='ctx'> 	{ USB_VENDOR_ID_TURBOX, USB_DEVICE_ID_TURBOX_KEYBOARD, HID_QUIRK_NOGET },</div><div class='ctx'> 	{ USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_DUAL_USB_JOYPAD, HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT | HID_QUIRK_SKIP_OUTPUT_REPORTS },</div><div class='ctx'> 	{ USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_QUAD_USB_JOYPAD, HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT },</div><div class='ctx'> </div><div class='ctx'> 	{ USB_VENDOR_ID_WISEGROUP_LTD, USB_DEVICE_ID_SMARTJOY_DUAL_PLUS, HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT },</div><div class='del'>-</div><div class='del'>-	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_ANSI, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },</div><div class='del'>-	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_ISO, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },</div><div class='del'>-	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_ANSI, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },</div><div class='del'>-	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_ISO, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE | HID_QUIRK_APPLE_ISO_KEYBOARD},</div><div class='del'>-	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_JIS, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },</div><div class='del'>-	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_ANSI, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },</div><div class='del'>-	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_ISO, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE | HID_QUIRK_APPLE_ISO_KEYBOARD},</div><div class='del'>-	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_JIS, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },</div><div class='del'>-	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_ANSI, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },</div><div class='del'>-	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_ISO, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE | HID_QUIRK_APPLE_ISO_KEYBOARD},</div><div class='del'>-	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_JIS, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },</div><div class='del'>-	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_ANSI, HID_QUIRK_APPLE_HAS_FN },</div><div class='del'>-	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_ISO, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_APPLE_ISO_KEYBOARD },</div><div class='del'>-	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_JIS, HID_QUIRK_APPLE_HAS_FN },</div><div class='del'>-	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_ANSI, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },</div><div class='del'>-	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_ISO, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },</div><div class='del'>-	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_JIS, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },</div><div class='del'>-	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN },</div><div class='del'>-	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_APPLE_ISO_KEYBOARD },</div><div class='del'>-	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN },</div><div class='del'>-	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ANSI, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },</div><div class='del'>-	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ISO, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_APPLE_ISO_KEYBOARD | HID_QUIRK_IGNORE_MOUSE},</div><div class='del'>-	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_JIS, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE},</div><div class='del'>-	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ANSI, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE},</div><div class='del'>-	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ISO, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_APPLE_ISO_KEYBOARD | HID_QUIRK_IGNORE_MOUSE },</div><div class='del'>-	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_JIS, HID_QUIRK_APPLE_HAS_FN  | HID_QUIRK_IGNORE_MOUSE },</div><div class='del'>-	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },</div><div class='del'>-	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },</div><div class='del'>-</div><div class='del'>-	{ USB_VENDOR_ID_DELL, USB_DEVICE_ID_DELL_W7658, HID_QUIRK_RESET_LEDS },</div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_KBD, HID_QUIRK_RESET_LEDS },</div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_2, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_3, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_4, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_5, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_6, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_7, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_8, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_9, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_10, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_11, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_12, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_13, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_14, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_15, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_16, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_17, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_18, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_19, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_20, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_21, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_22, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_23, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_24, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_25, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_26, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_27, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_28, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_29, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_30, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_31, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_32, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_33, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_34, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_35, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_36, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_37, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_38, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_39, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_40, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_41, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_42, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_43, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_44, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_45, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_46, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_47, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_48, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_49, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_50, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_51, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_52, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_53, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_54, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_55, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_56, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_57, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_58, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_59, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_60, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_61, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_62, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_63, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_64, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_NATIONAL_SEMICONDUCTOR, USB_DEVICE_ID_N_S_HARMONY, HID_QUIRK_IGNORE },</div><div class='del'>-	{ USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_GPEN_560, HID_QUIRK_IGNORE },</div><div class='del'>-</div><div class='del'>-	{ 0, 0 }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Quirks for devices which require report descriptor fixup go here */</div><div class='del'>-static const struct hid_rdesc_blacklist {</div><div class='del'>-	__u16 idVendor;</div><div class='del'>-	__u16 idProduct;</div><div class='del'>-	__u32 quirks;</div><div class='del'>-} hid_rdesc_blacklist[] = {</div><div class='del'>-</div><div class='del'>-	{ USB_VENDOR_ID_CHERRY, USB_DEVICE_ID_CHERRY_CYMOTION, HID_QUIRK_RDESC_CYMOTION },</div><div class='del'>-</div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_MX3000_RECEIVER, HID_QUIRK_RDESC_LOGITECH },</div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_S510_RECEIVER, HID_QUIRK_RDESC_LOGITECH },</div><div class='del'>-	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_S510_RECEIVER_2, HID_QUIRK_RDESC_LOGITECH },</div><div class='del'>-	{ USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_DESKTOP_RECV_1028, HID_QUIRK_RDESC_MICROSOFT_RECV_1028 },</div><div class='del'>-</div><div class='del'>-	{ USB_VENDOR_ID_MONTEREY, USB_DEVICE_ID_GENIUS_KB29E, HID_QUIRK_RDESC_BUTTON_CONSUMER },</div><div class='del'>-</div><div class='del'>-	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_JIS, HID_QUIRK_RDESC_MACBOOK_JIS },</div><div class='del'>-</div><div class='del'>-	{ USB_VENDOR_ID_PETALYNX, USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE, HID_QUIRK_RDESC_PETALYNX },</div><div class='del'>-</div><div class='del'>-	{ USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE, HID_QUIRK_RDESC_SAMSUNG_REMOTE },</div><div class='del'>-</div><div class='del'>-	{ USB_VENDOR_ID_SUNPLUS, USB_DEVICE_ID_SUNPLUS_WDESKTOP, HID_QUIRK_RDESC_SUNPLUS_WDESKTOP },</div><div class='del'>-</div><div class='del'>-	{ USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_1, HID_QUIRK_RDESC_SWAPPED_MIN_MAX },</div><div class='del'>-	{ USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_2, HID_QUIRK_RDESC_SWAPPED_MIN_MAX },</div><div class='add'>+	{ USB_VENDOR_ID_WISEGROUP_LTD2, USB_DEVICE_ID_SMARTJOY_DUAL_PLUS, HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT },</div><div class='ctx'> </div><div class='ctx'> 	{ 0, 0 }</div><div class='ctx'> };</div><div class='hunk'>@@ -974,16 +272,6 @@ u32 usbhid_lookup_quirk(const u16 idVendor, const u16 idProduct)</div><div class='ctx'> 	u32 quirks = 0;</div><div class='ctx'> 	const struct hid_blacklist *bl_entry = NULL;</div><div class='ctx'> </div><div class='del'>-	/* Ignore all Wacom devices */</div><div class='del'>-	if (idVendor == USB_VENDOR_ID_WACOM)</div><div class='del'>-		return HID_QUIRK_IGNORE;</div><div class='del'>-</div><div class='del'>-	/* ignore all Code Mercenaries IOWarrior devices */</div><div class='del'>-	if (idVendor == USB_VENDOR_ID_CODEMERCS)</div><div class='del'>-		if (idProduct &gt;= USB_DEVICE_ID_CODEMERCS_IOW_FIRST &amp;&amp;</div><div class='del'>-				idProduct &lt;= USB_DEVICE_ID_CODEMERCS_IOW_LAST)</div><div class='del'>-			return HID_QUIRK_IGNORE;</div><div class='del'>-</div><div class='ctx'> 	/* NCR devices must not be queried for reports */</div><div class='ctx'> 	if (idVendor == USB_VENDOR_ID_NCR &amp;&amp;</div><div class='ctx'> 			idProduct &gt;= USB_DEVICE_ID_NCR_FIRST &amp;&amp;</div><div class='hunk'>@@ -1002,221 +290,3 @@ u32 usbhid_lookup_quirk(const u16 idVendor, const u16 idProduct)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL_GPL(usbhid_lookup_quirk);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Cherry Cymotion keyboard have an invalid HID report descriptor,</div><div class='del'>- * that needs fixing before we can parse it.</div><div class='del'>- */</div><div class='del'>-static void usbhid_fixup_cymotion_descriptor(char *rdesc, int rsize)</div><div class='del'>-{</div><div class='del'>-	if (rsize &gt;= 17 &amp;&amp; rdesc[11] == 0x3c &amp;&amp; rdesc[12] == 0x02) {</div><div class='del'>-		printk(KERN_INFO "Fixing up Cherry Cymotion report descriptor\n");</div><div class='del'>-		rdesc[11] = rdesc[16] = 0xff;</div><div class='del'>-		rdesc[12] = rdesc[17] = 0x03;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Certain Logitech keyboards send in report #3 keys which are far</div><div class='del'>- * above the logical maximum described in descriptor. This extends</div><div class='del'>- * the original value of 0x28c of logical maximum to 0x104d</div><div class='del'>- */</div><div class='del'>-static void usbhid_fixup_logitech_descriptor(unsigned char *rdesc, int rsize)</div><div class='del'>-{</div><div class='del'>-	if (rsize &gt;= 90 &amp;&amp; rdesc[83] == 0x26</div><div class='del'>-			&amp;&amp; rdesc[84] == 0x8c</div><div class='del'>-			&amp;&amp; rdesc[85] == 0x02) {</div><div class='del'>-		printk(KERN_INFO "Fixing up Logitech keyboard report descriptor\n");</div><div class='del'>-		rdesc[84] = rdesc[89] = 0x4d;</div><div class='del'>-		rdesc[85] = rdesc[90] = 0x10;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void usbhid_fixup_sunplus_wdesktop(unsigned char *rdesc, int rsize)</div><div class='del'>-{</div><div class='del'>-	if (rsize &gt;= 107 &amp;&amp; rdesc[104] == 0x26</div><div class='del'>-			 &amp;&amp; rdesc[105] == 0x80</div><div class='del'>-			 &amp;&amp; rdesc[106] == 0x03) {</div><div class='del'>-		printk(KERN_INFO "Fixing up Sunplus Wireless Desktop report descriptor\n");</div><div class='del'>-		rdesc[105] = rdesc[110] = 0x03;</div><div class='del'>-		rdesc[106] = rdesc[111] = 0x21;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Samsung IrDA remote controller (reports as Cypress USB Mouse).</div><div class='del'>- *</div><div class='del'>- * Vendor specific report #4 has a size of 48 bit,</div><div class='del'>- * and therefore is not accepted when inspecting the descriptors.</div><div class='del'>- * As a workaround we reinterpret the report as:</div><div class='del'>- *   Variable type, count 6, size 8 bit, log. maximum 255</div><div class='del'>- * The burden to reconstruct the data is moved into user space.</div><div class='del'>- */</div><div class='del'>-static void usbhid_fixup_samsung_irda_descriptor(unsigned char *rdesc,</div><div class='del'>-						  int rsize)</div><div class='del'>-{</div><div class='del'>-	if (rsize &gt;= 182 &amp;&amp; rdesc[175] == 0x25</div><div class='del'>-			 &amp;&amp; rdesc[176] == 0x40</div><div class='del'>-			 &amp;&amp; rdesc[177] == 0x75</div><div class='del'>-			 &amp;&amp; rdesc[178] == 0x30</div><div class='del'>-			 &amp;&amp; rdesc[179] == 0x95</div><div class='del'>-			 &amp;&amp; rdesc[180] == 0x01</div><div class='del'>-			 &amp;&amp; rdesc[182] == 0x40) {</div><div class='del'>-		printk(KERN_INFO "Fixing up Samsung IrDA report descriptor\n");</div><div class='del'>-		rdesc[176] = 0xff;</div><div class='del'>-		rdesc[178] = 0x08;</div><div class='del'>-		rdesc[180] = 0x06;</div><div class='del'>-		rdesc[182] = 0x42;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Petalynx Maxter Remote has maximum for consumer page set too low */</div><div class='del'>-static void usbhid_fixup_petalynx_descriptor(unsigned char *rdesc, int rsize)</div><div class='del'>-{</div><div class='del'>-	if (rsize &gt;= 60 &amp;&amp; rdesc[39] == 0x2a</div><div class='del'>-			&amp;&amp; rdesc[40] == 0xf5</div><div class='del'>-			&amp;&amp; rdesc[41] == 0x00</div><div class='del'>-			&amp;&amp; rdesc[59] == 0x26</div><div class='del'>-			&amp;&amp; rdesc[60] == 0xf9</div><div class='del'>-			&amp;&amp; rdesc[61] == 0x00) {</div><div class='del'>-		printk(KERN_INFO "Fixing up Petalynx Maxter Remote report descriptor\n");</div><div class='del'>-		rdesc[60] = 0xfa;</div><div class='del'>-		rdesc[40] = 0xfa;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Some USB barcode readers from cypress have usage min and usage max in</div><div class='del'>- * the wrong order</div><div class='del'>- */</div><div class='del'>-static void usbhid_fixup_cypress_descriptor(unsigned char *rdesc, int rsize)</div><div class='del'>-{</div><div class='del'>-	short fixed = 0;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; rsize - 4; i++) {</div><div class='del'>-		if (rdesc[i] == 0x29 &amp;&amp; rdesc [i+2] == 0x19) {</div><div class='del'>-			unsigned char tmp;</div><div class='del'>-</div><div class='del'>-			rdesc[i] = 0x19; rdesc[i+2] = 0x29;</div><div class='del'>-			tmp = rdesc[i+3];</div><div class='del'>-			rdesc[i+3] = rdesc[i+1];</div><div class='del'>-			rdesc[i+1] = tmp;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (fixed)</div><div class='del'>-		printk(KERN_INFO "Fixing up Cypress report descriptor\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * MacBook JIS keyboard has wrong logical maximum</div><div class='del'>- */</div><div class='del'>-static void usbhid_fixup_macbook_descriptor(unsigned char *rdesc, int rsize)</div><div class='del'>-{</div><div class='del'>-	if (rsize &gt;= 60 &amp;&amp; rdesc[53] == 0x65</div><div class='del'>-			&amp;&amp; rdesc[59] == 0x65) {</div><div class='del'>-		printk(KERN_INFO "Fixing up MacBook JIS keyboard report descriptor\n");</div><div class='del'>-		rdesc[53] = rdesc[59] = 0xe7;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void usbhid_fixup_button_consumer_descriptor(unsigned char *rdesc, int rsize)</div><div class='del'>-{</div><div class='del'>-	if (rsize &gt;= 30 &amp;&amp; rdesc[29] == 0x05</div><div class='del'>-			&amp;&amp; rdesc[30] == 0x09) {</div><div class='del'>-		printk(KERN_INFO "Fixing up button/consumer in HID report descriptor\n");</div><div class='del'>-		rdesc[30] = 0x0c;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Microsoft Wireless Desktop Receiver (Model 1028) has several</div><div class='del'>- * 'Usage Min/Max' where it ought to have 'Physical Min/Max'</div><div class='del'>- */</div><div class='del'>-static void usbhid_fixup_microsoft_descriptor(unsigned char *rdesc, int rsize)</div><div class='del'>-{</div><div class='del'>-	if (rsize == 571 &amp;&amp; rdesc[284] == 0x19</div><div class='del'>-	                 &amp;&amp; rdesc[286] == 0x2a</div><div class='del'>-	                 &amp;&amp; rdesc[304] == 0x19</div><div class='del'>-	                 &amp;&amp; rdesc[306] == 0x29</div><div class='del'>-	                 &amp;&amp; rdesc[352] == 0x1a</div><div class='del'>-	                 &amp;&amp; rdesc[355] == 0x2a</div><div class='del'>-			 &amp;&amp; rdesc[557] == 0x19</div><div class='del'>-			 &amp;&amp; rdesc[559] == 0x29) {</div><div class='del'>-		printk(KERN_INFO "Fixing up Microsoft Wireless Receiver Model 1028 report descriptor\n");</div><div class='del'>-		rdesc[284] = rdesc[304] = rdesc[557] = 0x35;</div><div class='del'>-		rdesc[352] = 0x36;</div><div class='del'>-		rdesc[286] = rdesc[355] = 0x46;</div><div class='del'>-		rdesc[306] = rdesc[559] = 0x45;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __usbhid_fixup_report_descriptor(__u32 quirks, char *rdesc, unsigned rsize)</div><div class='del'>-{</div><div class='del'>-	if ((quirks &amp; HID_QUIRK_RDESC_CYMOTION))</div><div class='del'>-		usbhid_fixup_cymotion_descriptor(rdesc, rsize);</div><div class='del'>-</div><div class='del'>-	if (quirks &amp; HID_QUIRK_RDESC_LOGITECH)</div><div class='del'>-		usbhid_fixup_logitech_descriptor(rdesc, rsize);</div><div class='del'>-</div><div class='del'>-	if (quirks &amp; HID_QUIRK_RDESC_SWAPPED_MIN_MAX)</div><div class='del'>-		usbhid_fixup_cypress_descriptor(rdesc, rsize);</div><div class='del'>-</div><div class='del'>-	if (quirks &amp; HID_QUIRK_RDESC_PETALYNX)</div><div class='del'>-		usbhid_fixup_petalynx_descriptor(rdesc, rsize);</div><div class='del'>-</div><div class='del'>-	if (quirks &amp; HID_QUIRK_RDESC_MACBOOK_JIS)</div><div class='del'>-		usbhid_fixup_macbook_descriptor(rdesc, rsize);</div><div class='del'>-</div><div class='del'>-	if (quirks &amp; HID_QUIRK_RDESC_BUTTON_CONSUMER)</div><div class='del'>-		usbhid_fixup_button_consumer_descriptor(rdesc, rsize);</div><div class='del'>-</div><div class='del'>-	if (quirks &amp; HID_QUIRK_RDESC_SAMSUNG_REMOTE)</div><div class='del'>-		usbhid_fixup_samsung_irda_descriptor(rdesc, rsize);</div><div class='del'>-</div><div class='del'>-	if (quirks &amp; HID_QUIRK_RDESC_MICROSOFT_RECV_1028)</div><div class='del'>-		usbhid_fixup_microsoft_descriptor(rdesc, rsize);</div><div class='del'>-</div><div class='del'>-	if (quirks &amp; HID_QUIRK_RDESC_SUNPLUS_WDESKTOP)</div><div class='del'>-		usbhid_fixup_sunplus_wdesktop(rdesc, rsize);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * usbhid_fixup_report_descriptor: check if report descriptor needs fixup</div><div class='del'>- *</div><div class='del'>- * Description:</div><div class='del'>- *	Walks the hid_rdesc_blacklist[] array and checks whether the device</div><div class='del'>- *	is known to have broken report descriptor that needs to be fixed up</div><div class='del'>- *	prior to entering the HID parser</div><div class='del'>- *</div><div class='del'>- * Returns: nothing</div><div class='del'>- */</div><div class='del'>-void usbhid_fixup_report_descriptor(const u16 idVendor, const u16 idProduct,</div><div class='del'>-				    char *rdesc, unsigned rsize, char **quirks_param)</div><div class='del'>-{</div><div class='del'>-	int n, m;</div><div class='del'>-	u16 paramVendor, paramProduct;</div><div class='del'>-	u32 quirks;</div><div class='del'>-</div><div class='del'>-	/* static rdesc quirk entries */</div><div class='del'>-	for (n = 0; hid_rdesc_blacklist[n].idVendor; n++)</div><div class='del'>-		if (hid_rdesc_blacklist[n].idVendor == idVendor &amp;&amp;</div><div class='del'>-				hid_rdesc_blacklist[n].idProduct == idProduct)</div><div class='del'>-			__usbhid_fixup_report_descriptor(hid_rdesc_blacklist[n].quirks,</div><div class='del'>-					rdesc, rsize);</div><div class='del'>-</div><div class='del'>-	/* runtime rdesc quirk entries handling */</div><div class='del'>-	for (n = 0; quirks_param[n] &amp;&amp; n &lt; MAX_USBHID_BOOT_QUIRKS; n++) {</div><div class='del'>-		m = sscanf(quirks_param[n], "0x%hx:0x%hx:0x%x",</div><div class='del'>-				&amp;paramVendor, &amp;paramProduct, &amp;quirks);</div><div class='del'>-</div><div class='del'>-		if (m != 3)</div><div class='del'>-			printk(KERN_WARNING</div><div class='del'>-				"Could not parse HID quirk module param %s\n",</div><div class='del'>-				quirks_param[n]);</div><div class='del'>-		else if (paramVendor == idVendor &amp;&amp; paramProduct == idProduct)</div><div class='del'>-			__usbhid_fixup_report_descriptor(quirks, rdesc, rsize);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/hid/usbhid/hiddev.c b/drivers/hid/usbhid/hiddev.c<br/>index 842e9edb888e..babd65dd46ad 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hid/usbhid/hiddev.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/hid/usbhid/hiddev.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hid/usbhid/hiddev.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/usbhid/hiddev.c</a></div><div class='hunk'>@@ -790,21 +790,23 @@ static struct usb_class_driver hiddev_class = {</div><div class='ctx'> /*</div><div class='ctx'>  * This is where hid.c calls us to connect a hid device to the hiddev driver</div><div class='ctx'>  */</div><div class='del'>-int hiddev_connect(struct hid_device *hid)</div><div class='add'>+int hiddev_connect(struct hid_device *hid, unsigned int force)</div><div class='ctx'> {</div><div class='ctx'> 	struct hiddev *hiddev;</div><div class='ctx'> 	struct usbhid_device *usbhid = hid-&gt;driver_data;</div><div class='del'>-	int i;</div><div class='ctx'> 	int retval;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; hid-&gt;maxcollection; i++)</div><div class='del'>-		if (hid-&gt;collection[i].type ==</div><div class='del'>-		    HID_COLLECTION_APPLICATION &amp;&amp;</div><div class='del'>-		    !IS_INPUT_APPLICATION(hid-&gt;collection[i].usage))</div><div class='del'>-			break;</div><div class='add'>+	if (!force) {</div><div class='add'>+		unsigned int i;</div><div class='add'>+		for (i = 0; i &lt; hid-&gt;maxcollection; i++)</div><div class='add'>+			if (hid-&gt;collection[i].type ==</div><div class='add'>+			    HID_COLLECTION_APPLICATION &amp;&amp;</div><div class='add'>+			    !IS_INPUT_APPLICATION(hid-&gt;collection[i].usage))</div><div class='add'>+				break;</div><div class='ctx'> </div><div class='del'>-	if (i == hid-&gt;maxcollection &amp;&amp; (hid-&gt;quirks &amp; HID_QUIRK_HIDDEV) == 0)</div><div class='del'>-		return -1;</div><div class='add'>+		if (i == hid-&gt;maxcollection)</div><div class='add'>+			return -1;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (!(hiddev = kzalloc(sizeof(struct hiddev), GFP_KERNEL)))</div><div class='ctx'> 		return -1;</div><div class='head'>diff --git a/drivers/hid/usbhid/usbhid.h b/drivers/hid/usbhid/usbhid.h<br/>index 62d2d7c925bd..abedb13c623e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hid/usbhid/usbhid.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/hid/usbhid/usbhid.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hid/usbhid/usbhid.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/usbhid/usbhid.h</a></div><div class='hunk'>@@ -67,7 +67,7 @@ struct usbhid_device {</div><div class='ctx'> 	spinlock_t ctrllock;                                            /* Control fifo spinlock */</div><div class='ctx'> </div><div class='ctx'> 	struct urb *urbout;                                             /* Output URB */</div><div class='del'>-	struct hid_report *out[HID_CONTROL_FIFO_SIZE];                  /* Output pipe fifo */</div><div class='add'>+	struct hid_output_fifo out[HID_CONTROL_FIFO_SIZE];              /* Output pipe fifo */</div><div class='ctx'> 	unsigned char outhead, outtail;                                 /* Output pipe fifo head &amp; tail */</div><div class='ctx'> 	char *outbuf;                                                   /* Output buffer */</div><div class='ctx'> 	dma_addr_t outbuf_dma;                                          /* Output buffer dma */</div><div class='hunk'>@@ -82,7 +82,7 @@ struct usbhid_device {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define	hid_to_usb_dev(hid_dev) \</div><div class='del'>-	container_of(hid_dev-&gt;dev-&gt;parent, struct usb_device, dev)</div><div class='add'>+	container_of(hid_dev-&gt;dev.parent-&gt;parent, struct usb_device, dev)</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/hid/usbhid/usbkbd.c b/drivers/hid/usbhid/usbkbd.c<br/>index 0caaafe01843..b342926dd7fc 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hid/usbhid/usbkbd.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/hid/usbhid/usbkbd.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hid/usbhid/usbkbd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/usbhid/usbkbd.c</a></div><div class='hunk'>@@ -105,14 +105,16 @@ static void usb_kbd_irq(struct urb *urb)</div><div class='ctx'> 			if (usb_kbd_keycode[kbd-&gt;old[i]])</div><div class='ctx'> 				input_report_key(kbd-&gt;dev, usb_kbd_keycode[kbd-&gt;old[i]], 0);</div><div class='ctx'> 			else</div><div class='del'>-				info("Unknown key (scancode %#x) released.", kbd-&gt;old[i]);</div><div class='add'>+				dev_info(&amp;urb-&gt;dev-&gt;dev,</div><div class='add'>+						"Unknown key (scancode %#x) released.\n", kbd-&gt;old[i]);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (kbd-&gt;new[i] &gt; 3 &amp;&amp; memscan(kbd-&gt;old + 2, kbd-&gt;new[i], 6) == kbd-&gt;old + 8) {</div><div class='ctx'> 			if (usb_kbd_keycode[kbd-&gt;new[i]])</div><div class='ctx'> 				input_report_key(kbd-&gt;dev, usb_kbd_keycode[kbd-&gt;new[i]], 1);</div><div class='ctx'> 			else</div><div class='del'>-				info("Unknown key (scancode %#x) pressed.", kbd-&gt;new[i]);</div><div class='add'>+				dev_info(&amp;urb-&gt;dev-&gt;dev,</div><div class='add'>+						"Unknown key (scancode %#x) released.\n", kbd-&gt;new[i]);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -159,7 +161,8 @@ static void usb_kbd_led(struct urb *urb)</div><div class='ctx'> 	struct usb_kbd *kbd = urb-&gt;context;</div><div class='ctx'> </div><div class='ctx'> 	if (urb-&gt;status)</div><div class='del'>-		warn("led urb status %d received", urb-&gt;status);</div><div class='add'>+		dev_warn(&amp;urb-&gt;dev-&gt;dev, "led urb status %d received\n",</div><div class='add'>+			 urb-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	if (*(kbd-&gt;leds) == kbd-&gt;newleds)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -352,7 +355,8 @@ static int __init usb_kbd_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int result = usb_register(&amp;usb_kbd_driver);</div><div class='ctx'> 	if (result == 0)</div><div class='del'>-		info(DRIVER_VERSION ":" DRIVER_DESC);</div><div class='add'>+		printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"</div><div class='add'>+				DRIVER_DESC "\n");</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/hid/usbhid/usbmouse.c b/drivers/hid/usbhid/usbmouse.c<br/>index 35689ef172cc..72ab4b268096 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hid/usbhid/usbmouse.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/hid/usbhid/usbmouse.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hid/usbhid/usbmouse.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hid/usbhid/usbmouse.c</a></div><div class='hunk'>@@ -31,6 +31,11 @@</div><div class='ctx'> #include &lt;linux/usb/input.h&gt;</div><div class='ctx'> #include &lt;linux/hid.h&gt;</div><div class='ctx'> </div><div class='add'>+/* for apple IDs */</div><div class='add'>+#ifdef CONFIG_USB_HID_MODULE</div><div class='add'>+#include "../hid-ids.h"</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Version Information</div><div class='ctx'>  */</div><div class='hunk'>@@ -240,7 +245,8 @@ static int __init usb_mouse_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int retval = usb_register(&amp;usb_mouse_driver);</div><div class='ctx'> 	if (retval == 0)</div><div class='del'>-		info(DRIVER_VERSION ":" DRIVER_DESC);</div><div class='add'>+		printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"</div><div class='add'>+				DRIVER_DESC "\n");</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig<br/>index d402e8d813ce..6de1e0ffd391 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hwmon/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/hwmon/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hwmon/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hwmon/Kconfig</a></div><div class='hunk'>@@ -510,11 +510,9 @@ config SENSORS_LM90</div><div class='ctx'> 	depends on I2C</div><div class='ctx'> 	help</div><div class='ctx'> 	  If you say yes here you get support for National Semiconductor LM90,</div><div class='del'>-	  LM86, LM89 and LM99, Analog Devices ADM1032 and Maxim MAX6657,</div><div class='del'>-	  MAX6658, MAX6659, MAX6680 and MAX6681 sensor chips.</div><div class='del'>-</div><div class='del'>-	  The Analog Devices ADT7461 sensor chip is also supported, but only</div><div class='del'>-	  if found in ADM1032 compatibility mode.</div><div class='add'>+	  LM86, LM89 and LM99, Analog Devices ADM1032 and ADT7461, and Maxim</div><div class='add'>+	  MAX6646, MAX6647, MAX6649, MAX6657, MAX6658, MAX6659, MAX6680 and</div><div class='add'>+	  MAX6681 sensor chips.</div><div class='ctx'> </div><div class='ctx'> 	  This driver can also be built as a module.  If so, the module</div><div class='ctx'> 	  will be called lm90.</div><div class='hunk'>@@ -540,6 +538,15 @@ config SENSORS_LM93</div><div class='ctx'> 	  This driver can also be built as a module.  If so, the module</div><div class='ctx'> 	  will be called lm93.</div><div class='ctx'> </div><div class='add'>+config SENSORS_MAX1111</div><div class='add'>+	tristate "Maxim MAX1111 Multichannel, Serial 8-bit ADC chip"</div><div class='add'>+	depends on SPI_MASTER</div><div class='add'>+	help</div><div class='add'>+	  Say y here to support Maxim's MAX1111 ADC chips.</div><div class='add'>+</div><div class='add'>+	  This driver can also be built as a module.  If so, the module</div><div class='add'>+	  will be called max1111.</div><div class='add'>+</div><div class='ctx'> config SENSORS_MAX1619</div><div class='ctx'> 	tristate "Maxim MAX1619 sensor chip"</div><div class='ctx'> 	depends on I2C</div><div class='hunk'>@@ -791,6 +798,13 @@ config SENSORS_W83627EHF</div><div class='ctx'> 	  This driver can also be built as a module.  If so, the module</div><div class='ctx'> 	  will be called w83627ehf.</div><div class='ctx'> </div><div class='add'>+config SENSORS_ULTRA45</div><div class='add'>+	tristate "Sun Ultra45 PIC16F747"</div><div class='add'>+	depends on SPARC64</div><div class='add'>+	help</div><div class='add'>+	  This driver provides support for the Ultra45 workstation environmental</div><div class='add'>+	  sensors.</div><div class='add'>+</div><div class='ctx'> config SENSORS_HDAPS</div><div class='ctx'> 	tristate "IBM Hard Drive Active Protection System (hdaps)"</div><div class='ctx'> 	depends on INPUT &amp;&amp; X86</div><div class='head'>diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile<br/>index 950134ab8426..042d5a78622e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hwmon/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/hwmon/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hwmon/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hwmon/Makefile</a></div><div class='hunk'>@@ -41,6 +41,7 @@ obj-$(CONFIG_SENSORS_FSCHMD)	+= fschmd.o</div><div class='ctx'> obj-$(CONFIG_SENSORS_FSCPOS)	+= fscpos.o</div><div class='ctx'> obj-$(CONFIG_SENSORS_GL518SM)	+= gl518sm.o</div><div class='ctx'> obj-$(CONFIG_SENSORS_GL520SM)	+= gl520sm.o</div><div class='add'>+obj-$(CONFIG_SENSORS_ULTRA45)	+= ultra45_env.o</div><div class='ctx'> obj-$(CONFIG_SENSORS_HDAPS)	+= hdaps.o</div><div class='ctx'> obj-$(CONFIG_SENSORS_I5K_AMB)	+= i5k_amb.o</div><div class='ctx'> obj-$(CONFIG_SENSORS_IBMAEM)	+= ibmaem.o</div><div class='hunk'>@@ -59,6 +60,7 @@ obj-$(CONFIG_SENSORS_LM87)	+= lm87.o</div><div class='ctx'> obj-$(CONFIG_SENSORS_LM90)	+= lm90.o</div><div class='ctx'> obj-$(CONFIG_SENSORS_LM92)	+= lm92.o</div><div class='ctx'> obj-$(CONFIG_SENSORS_LM93)	+= lm93.o</div><div class='add'>+obj-$(CONFIG_SENSORS_MAX1111)	+= max1111.o</div><div class='ctx'> obj-$(CONFIG_SENSORS_MAX1619)	+= max1619.o</div><div class='ctx'> obj-$(CONFIG_SENSORS_MAX6650)	+= max6650.o</div><div class='ctx'> obj-$(CONFIG_SENSORS_PC87360)	+= pc87360.o</div><div class='head'>diff --git a/drivers/hwmon/adm1026.c b/drivers/hwmon/adm1026.c<br/>index 7fe2441fc845..ff7de40b6e35 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hwmon/adm1026.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/hwmon/adm1026.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hwmon/adm1026.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hwmon/adm1026.c</a></div><div class='hunk'>@@ -279,7 +279,6 @@ struct adm1026_data {</div><div class='ctx'> 	u8 fan_min[8];		/* Register value */</div><div class='ctx'> 	u8 fan_div[8];		/* Decoded value */</div><div class='ctx'> 	struct pwm_data pwm1;	/* Pwm control values */</div><div class='del'>-	int vid;		/* Decoded value */</div><div class='ctx'> 	u8 vrm;			/* VRM version */</div><div class='ctx'> 	u8 analog_out;		/* Register value (DAC) */</div><div class='ctx'> 	long alarms;		/* Register encoding, combined */</div><div class='hunk'>@@ -455,7 +454,7 @@ static void adm1026_print_gpio(struct i2c_client *client)</div><div class='ctx'> 	struct adm1026_data *data = i2c_get_clientdata(client);</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	dev_dbg(&amp;client-&gt;dev, "GPIO config is:");</div><div class='add'>+	dev_dbg(&amp;client-&gt;dev, "GPIO config is:\n");</div><div class='ctx'> 	for (i = 0;i &lt;= 7;++i) {</div><div class='ctx'> 		if (data-&gt;config2 &amp; (1 &lt;&lt; i)) {</div><div class='ctx'> 			dev_dbg(&amp;client-&gt;dev, "\t%sGP%s%d\n",</div><div class='hunk'>@@ -697,8 +696,6 @@ static struct adm1026_data *adm1026_update_device(struct device *dev)</div><div class='ctx'> 		data-&gt;last_config = jiffies;</div><div class='ctx'> 	}; /* last_config */</div><div class='ctx'> </div><div class='del'>-	dev_dbg(&amp;client-&gt;dev, "Setting VID from GPIO11-15.\n");</div><div class='del'>-	data-&gt;vid = (data-&gt;gpio &gt;&gt; 11) &amp; 0x1f;</div><div class='ctx'> 	data-&gt;valid = 1;</div><div class='ctx'> 	mutex_unlock(&amp;data-&gt;update_lock);</div><div class='ctx'> 	return data;</div><div class='hunk'>@@ -1215,7 +1212,10 @@ static DEVICE_ATTR(analog_out, S_IRUGO | S_IWUSR, show_analog_out_reg,</div><div class='ctx'> static ssize_t show_vid_reg(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct adm1026_data *data = adm1026_update_device(dev);</div><div class='del'>-	return sprintf(buf, "%d\n", vid_from_reg(data-&gt;vid &amp; 0x3f, data-&gt;vrm));</div><div class='add'>+	int vid = (data-&gt;gpio &gt;&gt; 11) &amp; 0x1f;</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev, "Setting VID from GPIO11-15.\n");</div><div class='add'>+	return sprintf(buf, "%d\n", vid_from_reg(vid, data-&gt;vrm));</div><div class='ctx'> }</div><div class='ctx'> static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid_reg, NULL);</div><div class='ctx'> </div><div class='hunk'>@@ -1681,17 +1681,16 @@ static int adm1026_detect(struct i2c_client *client, int kind,</div><div class='ctx'> 			kind = adm1026;</div><div class='ctx'> 		} else if (company == ADM1026_COMPANY_ANALOG_DEV</div><div class='ctx'> 			&amp;&amp; (verstep &amp; 0xf0) == ADM1026_VERSTEP_GENERIC) {</div><div class='del'>-			dev_err(&amp;adapter-&gt;dev, ": Unrecognized stepping "</div><div class='add'>+			dev_err(&amp;adapter-&gt;dev, "Unrecognized stepping "</div><div class='ctx'> 				"0x%02x. Defaulting to ADM1026.\n", verstep);</div><div class='ctx'> 			kind = adm1026;</div><div class='ctx'> 		} else if ((verstep &amp; 0xf0) == ADM1026_VERSTEP_GENERIC) {</div><div class='del'>-			dev_err(&amp;adapter-&gt;dev, ": Found version/stepping "</div><div class='add'>+			dev_err(&amp;adapter-&gt;dev, "Found version/stepping "</div><div class='ctx'> 				"0x%02x. Assuming generic ADM1026.\n",</div><div class='ctx'> 				verstep);</div><div class='ctx'> 			kind = any_chip;</div><div class='ctx'> 		} else {</div><div class='del'>-			dev_dbg(&amp;adapter-&gt;dev, ": Autodetection "</div><div class='del'>-				"failed\n");</div><div class='add'>+			dev_dbg(&amp;adapter-&gt;dev, "Autodetection failed\n");</div><div class='ctx'> 			/* Not an ADM1026 ... */</div><div class='ctx'> 			if (kind == 0) { /* User used force=x,y */</div><div class='ctx'> 				dev_err(&amp;adapter-&gt;dev, "Generic ADM1026 not "</div><div class='head'>diff --git a/drivers/hwmon/adm1029.c b/drivers/hwmon/adm1029.c<br/>index ba84ca5923f9..36718150b475 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hwmon/adm1029.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/hwmon/adm1029.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hwmon/adm1029.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hwmon/adm1029.c</a></div><div class='hunk'>@@ -179,7 +179,8 @@ show_fan(struct device *dev, struct device_attribute *devattr, char *buf)</div><div class='ctx'> 	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);</div><div class='ctx'> 	struct adm1029_data *data = adm1029_update_device(dev);</div><div class='ctx'> 	u16 val;</div><div class='del'>-	if (data-&gt;fan[attr-&gt;index] == 0 || data-&gt;fan_div[attr-&gt;index] == 0</div><div class='add'>+	if (data-&gt;fan[attr-&gt;index] == 0</div><div class='add'>+	    || (data-&gt;fan_div[attr-&gt;index] &amp; 0xC0) == 0</div><div class='ctx'> 	    || data-&gt;fan[attr-&gt;index] == 255) {</div><div class='ctx'> 		return sprintf(buf, "0\n");</div><div class='ctx'> 	}</div><div class='hunk'>@@ -194,7 +195,7 @@ show_fan_div(struct device *dev, struct device_attribute *devattr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);</div><div class='ctx'> 	struct adm1029_data *data = adm1029_update_device(dev);</div><div class='del'>-	if (data-&gt;fan_div[attr-&gt;index] == 0)</div><div class='add'>+	if ((data-&gt;fan_div[attr-&gt;index] &amp; 0xC0) == 0)</div><div class='ctx'> 		return sprintf(buf, "0\n");</div><div class='ctx'> 	return sprintf(buf, "%d\n", DIV_FROM_REG(data-&gt;fan_div[attr-&gt;index]));</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/hwmon/ams/ams-core.c b/drivers/hwmon/ams/ams-core.c<br/>index fbefa82a015c..6c9ace1b76f6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hwmon/ams/ams-core.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/hwmon/ams/ams-core.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hwmon/ams/ams-core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hwmon/ams/ams-core.c</a></div><div class='hunk'>@@ -99,39 +99,31 @@ static struct pmf_irq_client ams_shock_client = {</div><div class='ctx'>  */</div><div class='ctx'> static void ams_worker(struct work_struct *work)</div><div class='ctx'> {</div><div class='del'>-	mutex_lock(&amp;ams_info.lock);</div><div class='del'>-</div><div class='del'>-	if (ams_info.has_device) {</div><div class='del'>-		unsigned long flags;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u8 irqs_to_clear;</div><div class='ctx'> </div><div class='del'>-		spin_lock_irqsave(&amp;ams_info.irq_lock, flags);</div><div class='add'>+	mutex_lock(&amp;ams_info.lock);</div><div class='ctx'> </div><div class='del'>-		if (ams_info.worker_irqs &amp; AMS_IRQ_FREEFALL) {</div><div class='del'>-			if (verbose)</div><div class='del'>-				printk(KERN_INFO "ams: freefall detected!\n");</div><div class='add'>+	spin_lock_irqsave(&amp;ams_info.irq_lock, flags);</div><div class='add'>+	irqs_to_clear = ams_info.worker_irqs;</div><div class='ctx'> </div><div class='del'>-			ams_info.worker_irqs &amp;= ~AMS_IRQ_FREEFALL;</div><div class='add'>+	if (ams_info.worker_irqs &amp; AMS_IRQ_FREEFALL) {</div><div class='add'>+		if (verbose)</div><div class='add'>+			printk(KERN_INFO "ams: freefall detected!\n");</div><div class='ctx'> </div><div class='del'>-			/* we must call this with interrupts enabled */</div><div class='del'>-			spin_unlock_irqrestore(&amp;ams_info.irq_lock, flags);</div><div class='del'>-			ams_info.clear_irq(AMS_IRQ_FREEFALL);</div><div class='del'>-			spin_lock_irqsave(&amp;ams_info.irq_lock, flags);</div><div class='del'>-		}</div><div class='add'>+		ams_info.worker_irqs &amp;= ~AMS_IRQ_FREEFALL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		if (ams_info.worker_irqs &amp; AMS_IRQ_SHOCK) {</div><div class='del'>-			if (verbose)</div><div class='del'>-				printk(KERN_INFO "ams: shock detected!\n");</div><div class='add'>+	if (ams_info.worker_irqs &amp; AMS_IRQ_SHOCK) {</div><div class='add'>+		if (verbose)</div><div class='add'>+			printk(KERN_INFO "ams: shock detected!\n");</div><div class='ctx'> </div><div class='del'>-			ams_info.worker_irqs &amp;= ~AMS_IRQ_SHOCK;</div><div class='add'>+		ams_info.worker_irqs &amp;= ~AMS_IRQ_SHOCK;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-			/* we must call this with interrupts enabled */</div><div class='del'>-			spin_unlock_irqrestore(&amp;ams_info.irq_lock, flags);</div><div class='del'>-			ams_info.clear_irq(AMS_IRQ_SHOCK);</div><div class='del'>-			spin_lock_irqsave(&amp;ams_info.irq_lock, flags);</div><div class='del'>-		}</div><div class='add'>+	spin_unlock_irqrestore(&amp;ams_info.irq_lock, flags);</div><div class='ctx'> </div><div class='del'>-		spin_unlock_irqrestore(&amp;ams_info.irq_lock, flags);</div><div class='del'>-	}</div><div class='add'>+	ams_info.clear_irq(irqs_to_clear);</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;ams_info.lock);</div><div class='ctx'> }</div><div class='hunk'>@@ -223,34 +215,28 @@ int __init ams_init(void)</div><div class='ctx'> </div><div class='ctx'> void ams_exit(void)</div><div class='ctx'> {</div><div class='del'>-	mutex_lock(&amp;ams_info.lock);</div><div class='del'>-</div><div class='del'>-	if (ams_info.has_device) {</div><div class='del'>-		/* Remove input device */</div><div class='del'>-		ams_input_exit();</div><div class='add'>+	/* Remove input device */</div><div class='add'>+	ams_input_exit();</div><div class='ctx'> </div><div class='del'>-		/* Shut down implementation */</div><div class='del'>-		ams_info.exit();</div><div class='del'>-</div><div class='del'>-		/* Flush interrupt worker</div><div class='del'>-		 *</div><div class='del'>-		 * We do this after ams_info.exit(), because an interrupt might</div><div class='del'>-		 * have arrived before disabling them.</div><div class='del'>-		 */</div><div class='del'>-		flush_scheduled_work();</div><div class='add'>+	/* Remove attributes */</div><div class='add'>+	device_remove_file(&amp;ams_info.of_dev-&gt;dev, &amp;dev_attr_current);</div><div class='ctx'> </div><div class='del'>-		/* Remove attributes */</div><div class='del'>-		device_remove_file(&amp;ams_info.of_dev-&gt;dev, &amp;dev_attr_current);</div><div class='add'>+	/* Shut down implementation */</div><div class='add'>+	ams_info.exit();</div><div class='ctx'> </div><div class='del'>-		/* Remove device */</div><div class='del'>-		of_device_unregister(ams_info.of_dev);</div><div class='add'>+	/* Flush interrupt worker</div><div class='add'>+	 *</div><div class='add'>+	 * We do this after ams_info.exit(), because an interrupt might</div><div class='add'>+	 * have arrived before disabling them.</div><div class='add'>+	 */</div><div class='add'>+	flush_scheduled_work();</div><div class='ctx'> </div><div class='del'>-		/* Remove handler */</div><div class='del'>-		pmf_unregister_irq_client(&amp;ams_shock_client);</div><div class='del'>-		pmf_unregister_irq_client(&amp;ams_freefall_client);</div><div class='del'>-	}</div><div class='add'>+	/* Remove device */</div><div class='add'>+	of_device_unregister(ams_info.of_dev);</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;ams_info.lock);</div><div class='add'>+	/* Remove handler */</div><div class='add'>+	pmf_unregister_irq_client(&amp;ams_shock_client);</div><div class='add'>+	pmf_unregister_irq_client(&amp;ams_freefall_client);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Stelian Pop, Michael Hanselmann");</div><div class='head'>diff --git a/drivers/hwmon/ams/ams-i2c.c b/drivers/hwmon/ams/ams-i2c.c<br/>index 957760536a4c..2cbf8a6506c7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hwmon/ams/ams-i2c.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/hwmon/ams/ams-i2c.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hwmon/ams/ams-i2c.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hwmon/ams/ams-i2c.c</a></div><div class='hunk'>@@ -60,26 +60,34 @@ enum ams_i2c_cmd {</div><div class='ctx'> 	AMS_CMD_START,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int ams_i2c_attach(struct i2c_adapter *adapter);</div><div class='del'>-static int ams_i2c_detach(struct i2c_adapter *adapter);</div><div class='add'>+static int ams_i2c_probe(struct i2c_client *client,</div><div class='add'>+			 const struct i2c_device_id *id);</div><div class='add'>+static int ams_i2c_remove(struct i2c_client *client);</div><div class='add'>+</div><div class='add'>+static const struct i2c_device_id ams_id[] = {</div><div class='add'>+	{ "ams", 0 },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(i2c, ams_id);</div><div class='ctx'> </div><div class='ctx'> static struct i2c_driver ams_i2c_driver = {</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		.name   = "ams",</div><div class='ctx'> 		.owner  = THIS_MODULE,</div><div class='ctx'> 	},</div><div class='del'>-	.attach_adapter = ams_i2c_attach,</div><div class='del'>-	.detach_adapter = ams_i2c_detach,</div><div class='add'>+	.probe          = ams_i2c_probe,</div><div class='add'>+	.remove         = ams_i2c_remove,</div><div class='add'>+	.id_table       = ams_id,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static s32 ams_i2c_read(u8 reg)</div><div class='ctx'> {</div><div class='del'>-	return i2c_smbus_read_byte_data(&amp;ams_info.i2c_client, reg);</div><div class='add'>+	return i2c_smbus_read_byte_data(ams_info.i2c_client, reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ams_i2c_write(u8 reg, u8 value)</div><div class='ctx'> {</div><div class='del'>-	return i2c_smbus_write_byte_data(&amp;ams_info.i2c_client, reg, value);</div><div class='add'>+	return i2c_smbus_write_byte_data(ams_info.i2c_client, reg, value);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ams_i2c_cmd(enum ams_i2c_cmd cmd)</div><div class='hunk'>@@ -152,9 +160,9 @@ static void ams_i2c_get_xyz(s8 *x, s8 *y, s8 *z)</div><div class='ctx'> 	*z = ams_i2c_read(AMS_DATAZ);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ams_i2c_attach(struct i2c_adapter *adapter)</div><div class='add'>+static int ams_i2c_probe(struct i2c_client *client,</div><div class='add'>+			 const struct i2c_device_id *id)</div><div class='ctx'> {</div><div class='del'>-	unsigned long bus;</div><div class='ctx'> 	int vmaj, vmin;</div><div class='ctx'> 	int result;</div><div class='ctx'> </div><div class='hunk'>@@ -162,17 +170,7 @@ static int ams_i2c_attach(struct i2c_adapter *adapter)</div><div class='ctx'> 	if (unlikely(ams_info.has_device))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	if (strncmp(adapter-&gt;name, "uni-n", 5))</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	bus = simple_strtoul(adapter-&gt;name + 6, NULL, 10);</div><div class='del'>-	if (bus != ams_info.i2c_bus)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	ams_info.i2c_client.addr = ams_info.i2c_address;</div><div class='del'>-	ams_info.i2c_client.adapter = adapter;</div><div class='del'>-	ams_info.i2c_client.driver = &amp;ams_i2c_driver;</div><div class='del'>-	strcpy(ams_info.i2c_client.name, "Apple Motion Sensor");</div><div class='add'>+	ams_info.i2c_client = client;</div><div class='ctx'> </div><div class='ctx'> 	if (ams_i2c_cmd(AMS_CMD_RESET)) {</div><div class='ctx'> 		printk(KERN_INFO "ams: Failed to reset the device\n");</div><div class='hunk'>@@ -237,7 +235,7 @@ static int ams_i2c_attach(struct i2c_adapter *adapter)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ams_i2c_detach(struct i2c_adapter *adapter)</div><div class='add'>+static int ams_i2c_remove(struct i2c_client *client)</div><div class='ctx'> {</div><div class='ctx'> 	if (ams_info.has_device) {</div><div class='ctx'> 		/* Disable interrupts */</div><div class='hunk'>@@ -261,11 +259,7 @@ static void ams_i2c_exit(void)</div><div class='ctx'> </div><div class='ctx'> int __init ams_i2c_init(struct device_node *np)</div><div class='ctx'> {</div><div class='del'>-	char *tmp_bus;</div><div class='ctx'> 	int result;</div><div class='del'>-	const u32 *prop;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;ams_info.lock);</div><div class='ctx'> </div><div class='ctx'> 	/* Set implementation stuff */</div><div class='ctx'> 	ams_info.of_node = np;</div><div class='hunk'>@@ -275,25 +269,7 @@ int __init ams_i2c_init(struct device_node *np)</div><div class='ctx'> 	ams_info.clear_irq = ams_i2c_clear_irq;</div><div class='ctx'> 	ams_info.bustype = BUS_I2C;</div><div class='ctx'> </div><div class='del'>-	/* look for bus either using "reg" or by path */</div><div class='del'>-	prop = of_get_property(ams_info.of_node, "reg", NULL);</div><div class='del'>-	if (!prop) {</div><div class='del'>-		result = -ENODEV;</div><div class='del'>-</div><div class='del'>-		goto exit;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	tmp_bus = strstr(ams_info.of_node-&gt;full_name, "/i2c-bus@");</div><div class='del'>-	if (tmp_bus)</div><div class='del'>-		ams_info.i2c_bus = *(tmp_bus + 9) - '0';</div><div class='del'>-	else</div><div class='del'>-		ams_info.i2c_bus = ((*prop) &gt;&gt; 8) &amp; 0x0f;</div><div class='del'>-	ams_info.i2c_address = ((*prop) &amp; 0xff) &gt;&gt; 1;</div><div class='del'>-</div><div class='ctx'> 	result = i2c_add_driver(&amp;ams_i2c_driver);</div><div class='ctx'> </div><div class='del'>-exit:</div><div class='del'>-	mutex_unlock(&amp;ams_info.lock);</div><div class='del'>-</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/hwmon/ams/ams-input.c b/drivers/hwmon/ams/ams-input.c<br/>index 7b81e0c2c2d9..8a712392cd38 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hwmon/ams/ams-input.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/hwmon/ams/ams-input.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hwmon/ams/ams-input.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hwmon/ams/ams-input.c</a></div><div class='hunk'>@@ -20,13 +20,15 @@</div><div class='ctx'> #include "ams.h"</div><div class='ctx'> </div><div class='ctx'> static unsigned int joystick;</div><div class='del'>-module_param(joystick, bool, 0644);</div><div class='add'>+module_param(joystick, bool, S_IRUGO);</div><div class='ctx'> MODULE_PARM_DESC(joystick, "Enable the input class device on module load");</div><div class='ctx'> </div><div class='ctx'> static unsigned int invert;</div><div class='del'>-module_param(invert, bool, 0644);</div><div class='add'>+module_param(invert, bool, S_IWUSR | S_IRUGO);</div><div class='ctx'> MODULE_PARM_DESC(invert, "Invert input data on X and Y axis");</div><div class='ctx'> </div><div class='add'>+static DEFINE_MUTEX(ams_input_mutex);</div><div class='add'>+</div><div class='ctx'> static void ams_idev_poll(struct input_polled_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct input_dev *idev = dev-&gt;input;</div><div class='hunk'>@@ -50,13 +52,11 @@ static void ams_idev_poll(struct input_polled_dev *dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Call with ams_info.lock held! */</div><div class='del'>-static void ams_input_enable(void)</div><div class='add'>+static int ams_input_enable(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct input_dev *input;</div><div class='ctx'> 	s8 x, y, z;</div><div class='del'>-</div><div class='del'>-	if (ams_info.idev)</div><div class='del'>-		return;</div><div class='add'>+	int error;</div><div class='ctx'> </div><div class='ctx'> 	ams_sensors(&amp;x, &amp;y, &amp;z);</div><div class='ctx'> 	ams_info.xcalib = x;</div><div class='hunk'>@@ -65,7 +65,7 @@ static void ams_input_enable(void)</div><div class='ctx'> </div><div class='ctx'> 	ams_info.idev = input_allocate_polled_device();</div><div class='ctx'> 	if (!ams_info.idev)</div><div class='del'>-		return;</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	ams_info.idev-&gt;poll = ams_idev_poll;</div><div class='ctx'> 	ams_info.idev-&gt;poll_interval = 25;</div><div class='hunk'>@@ -84,14 +84,18 @@ static void ams_input_enable(void)</div><div class='ctx'> 	set_bit(EV_KEY, input-&gt;evbit);</div><div class='ctx'> 	set_bit(BTN_TOUCH, input-&gt;keybit);</div><div class='ctx'> </div><div class='del'>-	if (input_register_polled_device(ams_info.idev)) {</div><div class='add'>+	error = input_register_polled_device(ams_info.idev);</div><div class='add'>+	if (error) {</div><div class='ctx'> 		input_free_polled_device(ams_info.idev);</div><div class='ctx'> 		ams_info.idev = NULL;</div><div class='del'>-		return;</div><div class='add'>+		return error;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	joystick = 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Call with ams_info.lock held! */</div><div class='ctx'> static void ams_input_disable(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (ams_info.idev) {</div><div class='hunk'>@@ -99,6 +103,8 @@ static void ams_input_disable(void)</div><div class='ctx'> 		input_free_polled_device(ams_info.idev);</div><div class='ctx'> 		ams_info.idev = NULL;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	joystick = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t ams_input_show_joystick(struct device *dev,</div><div class='hunk'>@@ -110,39 +116,42 @@ static ssize_t ams_input_show_joystick(struct device *dev,</div><div class='ctx'> static ssize_t ams_input_store_joystick(struct device *dev,</div><div class='ctx'> 	struct device_attribute *attr, const char *buf, size_t count)</div><div class='ctx'> {</div><div class='del'>-	if (sscanf(buf, "%d\n", &amp;joystick) != 1)</div><div class='add'>+	unsigned long enable;</div><div class='add'>+	int error = 0;</div><div class='add'>+</div><div class='add'>+	if (strict_strtoul(buf, 0, &amp;enable) || enable &gt; 1)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ams_info.lock);</div><div class='add'>+	mutex_lock(&amp;ams_input_mutex);</div><div class='ctx'> </div><div class='del'>-	if (joystick)</div><div class='del'>-		ams_input_enable();</div><div class='del'>-	else</div><div class='del'>-		ams_input_disable();</div><div class='add'>+	if (enable != joystick) {</div><div class='add'>+		if (enable)</div><div class='add'>+			error = ams_input_enable();</div><div class='add'>+		else</div><div class='add'>+			ams_input_disable();</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;ams_info.lock);</div><div class='add'>+	mutex_unlock(&amp;ams_input_mutex);</div><div class='ctx'> </div><div class='del'>-	return count;</div><div class='add'>+	return error ? error : count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static DEVICE_ATTR(joystick, S_IRUGO | S_IWUSR,</div><div class='ctx'> 	ams_input_show_joystick, ams_input_store_joystick);</div><div class='ctx'> </div><div class='del'>-/* Call with ams_info.lock held! */</div><div class='ctx'> int ams_input_init(void)</div><div class='ctx'> {</div><div class='del'>-	int result;</div><div class='del'>-</div><div class='del'>-	result = device_create_file(&amp;ams_info.of_dev-&gt;dev, &amp;dev_attr_joystick);</div><div class='del'>-</div><div class='del'>-	if (!result &amp;&amp; joystick)</div><div class='add'>+	if (joystick)</div><div class='ctx'> 		ams_input_enable();</div><div class='del'>-	return result;</div><div class='add'>+</div><div class='add'>+	return device_create_file(&amp;ams_info.of_dev-&gt;dev, &amp;dev_attr_joystick);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Call with ams_info.lock held! */</div><div class='ctx'> void ams_input_exit(void)</div><div class='ctx'> {</div><div class='del'>-	ams_input_disable();</div><div class='ctx'> 	device_remove_file(&amp;ams_info.of_dev-&gt;dev, &amp;dev_attr_joystick);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ams_input_mutex);</div><div class='add'>+	ams_input_disable();</div><div class='add'>+	mutex_unlock(&amp;ams_input_mutex);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/hwmon/ams/ams-pmu.c b/drivers/hwmon/ams/ams-pmu.c<br/>index 9463e9768f6f..fb18b3d3162b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hwmon/ams/ams-pmu.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/hwmon/ams/ams-pmu.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hwmon/ams/ams-pmu.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hwmon/ams/ams-pmu.c</a></div><div class='hunk'>@@ -149,8 +149,6 @@ int __init ams_pmu_init(struct device_node *np)</div><div class='ctx'> 	const u32 *prop;</div><div class='ctx'> 	int result;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ams_info.lock);</div><div class='del'>-</div><div class='ctx'> 	/* Set implementation stuff */</div><div class='ctx'> 	ams_info.of_node = np;</div><div class='ctx'> 	ams_info.exit = ams_pmu_exit;</div><div class='hunk'>@@ -161,10 +159,9 @@ int __init ams_pmu_init(struct device_node *np)</div><div class='ctx'> </div><div class='ctx'> 	/* Get PMU command, should be 0x4e, but we can never know */</div><div class='ctx'> 	prop = of_get_property(ams_info.of_node, "reg", NULL);</div><div class='del'>-	if (!prop) {</div><div class='del'>-		result = -ENODEV;</div><div class='del'>-		goto exit;</div><div class='del'>-	}</div><div class='add'>+	if (!prop)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='ctx'> 	ams_pmu_cmd = ((*prop) &gt;&gt; 8) &amp; 0xff;</div><div class='ctx'> </div><div class='ctx'> 	/* Disable interrupts */</div><div class='hunk'>@@ -175,7 +172,7 @@ int __init ams_pmu_init(struct device_node *np)</div><div class='ctx'> </div><div class='ctx'> 	result = ams_sensor_attach();</div><div class='ctx'> 	if (result &lt; 0)</div><div class='del'>-		goto exit;</div><div class='add'>+		return result;</div><div class='ctx'> </div><div class='ctx'> 	/* Set default values */</div><div class='ctx'> 	ams_pmu_set_register(AMS_FF_LOW_LIMIT, 0x15);</div><div class='hunk'>@@ -198,10 +195,5 @@ int __init ams_pmu_init(struct device_node *np)</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_INFO "ams: Found PMU based motion sensor\n");</div><div class='ctx'> </div><div class='del'>-	result = 0;</div><div class='del'>-</div><div class='del'>-exit:</div><div class='del'>-	mutex_unlock(&amp;ams_info.lock);</div><div class='del'>-</div><div class='del'>-	return result;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/hwmon/ams/ams.h b/drivers/hwmon/ams/ams.h<br/>index a6221e5dd984..5ed387b0bd9a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hwmon/ams/ams.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/hwmon/ams/ams.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hwmon/ams/ams.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hwmon/ams/ams.h</a></div><div class='hunk'>@@ -4,7 +4,7 @@</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;asm/of_device.h&gt;</div><div class='add'>+#include &lt;linux/of_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> enum ams_irq {</div><div class='ctx'> 	AMS_IRQ_FREEFALL = 0x01,</div><div class='hunk'>@@ -46,9 +46,7 @@ struct ams {</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SENSORS_AMS_I2C</div><div class='ctx'> 	/* I2C properties */</div><div class='del'>-	int i2c_bus;</div><div class='del'>-	int i2c_address;</div><div class='del'>-	struct i2c_client i2c_client;</div><div class='add'>+	struct i2c_client *i2c_client;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	/* Joystick emulation */</div><div class='head'>diff --git a/drivers/hwmon/dme1737.c b/drivers/hwmon/dme1737.c<br/>index cdb8311e4ef7..27a5d397f9a1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hwmon/dme1737.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/hwmon/dme1737.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hwmon/dme1737.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hwmon/dme1737.c</a></div><div class='hunk'>@@ -175,11 +175,11 @@ static const u8 DME1737_BIT_ALARM_FAN[] = {10, 11, 12, 13, 22, 23};</div><div class='ctx'>  * Data structures and manipulation thereof</div><div class='ctx'>  * --------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='del'>-/* For ISA chips, we abuse the i2c_client addr and name fields. We also use</div><div class='del'>-   the driver field to differentiate between I2C and ISA chips. */</div><div class='ctx'> struct dme1737_data {</div><div class='del'>-	struct i2c_client client;</div><div class='add'>+	struct i2c_client *client;	/* for I2C devices only */</div><div class='ctx'> 	struct device *hwmon_dev;</div><div class='add'>+	const char *name;</div><div class='add'>+	unsigned int addr;		/* for ISA devices only */</div><div class='ctx'> </div><div class='ctx'> 	struct mutex update_lock;</div><div class='ctx'> 	int valid;			/* !=0 if following fields are valid */</div><div class='hunk'>@@ -512,11 +512,12 @@ static inline int PWM_OFF_TO_REG(int val, int ix, int reg)</div><div class='ctx'>  * before calling dme1737_read or dme1737_write.</div><div class='ctx'>  * --------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='del'>-static u8 dme1737_read(struct i2c_client *client, u8 reg)</div><div class='add'>+static u8 dme1737_read(const struct dme1737_data *data, u8 reg)</div><div class='ctx'> {</div><div class='add'>+	struct i2c_client *client = data-&gt;client;</div><div class='ctx'> 	s32 val;</div><div class='ctx'> </div><div class='del'>-	if (client-&gt;driver) { /* I2C device */</div><div class='add'>+	if (client) { /* I2C device */</div><div class='ctx'> 		val = i2c_smbus_read_byte_data(client, reg);</div><div class='ctx'> </div><div class='ctx'> 		if (val &lt; 0) {</div><div class='hunk'>@@ -525,18 +526,19 @@ static u8 dme1737_read(struct i2c_client *client, u8 reg)</div><div class='ctx'> 				 "maintainer.\n", reg);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else { /* ISA device */</div><div class='del'>-		outb(reg, client-&gt;addr);</div><div class='del'>-		val = inb(client-&gt;addr + 1);</div><div class='add'>+		outb(reg, data-&gt;addr);</div><div class='add'>+		val = inb(data-&gt;addr + 1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return val;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static s32 dme1737_write(struct i2c_client *client, u8 reg, u8 val)</div><div class='add'>+static s32 dme1737_write(const struct dme1737_data *data, u8 reg, u8 val)</div><div class='ctx'> {</div><div class='add'>+	struct i2c_client *client = data-&gt;client;</div><div class='ctx'> 	s32 res = 0;</div><div class='ctx'> </div><div class='del'>-	if (client-&gt;driver) { /* I2C device */</div><div class='add'>+	if (client) { /* I2C device */</div><div class='ctx'> 		res = i2c_smbus_write_byte_data(client, reg, val);</div><div class='ctx'> </div><div class='ctx'> 		if (res &lt; 0) {</div><div class='hunk'>@@ -545,8 +547,8 @@ static s32 dme1737_write(struct i2c_client *client, u8 reg, u8 val)</div><div class='ctx'> 				 "maintainer.\n", reg);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else { /* ISA device */</div><div class='del'>-		outb(reg, client-&gt;addr);</div><div class='del'>-		outb(val, client-&gt;addr + 1);</div><div class='add'>+		outb(reg, data-&gt;addr);</div><div class='add'>+		outb(val, data-&gt;addr + 1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return res;</div><div class='hunk'>@@ -555,7 +557,6 @@ static s32 dme1737_write(struct i2c_client *client, u8 reg, u8 val)</div><div class='ctx'> static struct dme1737_data *dme1737_update_device(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct dme1737_data *data = dev_get_drvdata(dev);</div><div class='del'>-	struct i2c_client *client = &amp;data-&gt;client;</div><div class='ctx'> 	int ix;</div><div class='ctx'> 	u8 lsb[5];</div><div class='ctx'> </div><div class='hunk'>@@ -563,7 +564,7 @@ static struct dme1737_data *dme1737_update_device(struct device *dev)</div><div class='ctx'> </div><div class='ctx'> 	/* Enable a Vbat monitoring cycle every 10 mins */</div><div class='ctx'> 	if (time_after(jiffies, data-&gt;last_vbat + 600 * HZ) || !data-&gt;valid) {</div><div class='del'>-		dme1737_write(client, DME1737_REG_CONFIG, dme1737_read(client,</div><div class='add'>+		dme1737_write(data, DME1737_REG_CONFIG, dme1737_read(data,</div><div class='ctx'> 						DME1737_REG_CONFIG) | 0x10);</div><div class='ctx'> 		data-&gt;last_vbat = jiffies;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -571,7 +572,7 @@ static struct dme1737_data *dme1737_update_device(struct device *dev)</div><div class='ctx'> 	/* Sample register contents every 1 sec */</div><div class='ctx'> 	if (time_after(jiffies, data-&gt;last_update + HZ) || !data-&gt;valid) {</div><div class='ctx'> 		if (data-&gt;type != sch5027) {</div><div class='del'>-			data-&gt;vid = dme1737_read(client, DME1737_REG_VID) &amp;</div><div class='add'>+			data-&gt;vid = dme1737_read(data, DME1737_REG_VID) &amp;</div><div class='ctx'> 				0x3f;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -580,11 +581,11 @@ static struct dme1737_data *dme1737_update_device(struct device *dev)</div><div class='ctx'> 			/* Voltage inputs are stored as 16 bit values even</div><div class='ctx'> 			 * though they have only 12 bits resolution. This is</div><div class='ctx'> 			 * to make it consistent with the temp inputs. */</div><div class='del'>-			data-&gt;in[ix] = dme1737_read(client,</div><div class='add'>+			data-&gt;in[ix] = dme1737_read(data,</div><div class='ctx'> 					DME1737_REG_IN(ix)) &lt;&lt; 8;</div><div class='del'>-			data-&gt;in_min[ix] = dme1737_read(client,</div><div class='add'>+			data-&gt;in_min[ix] = dme1737_read(data,</div><div class='ctx'> 					DME1737_REG_IN_MIN(ix));</div><div class='del'>-			data-&gt;in_max[ix] = dme1737_read(client,</div><div class='add'>+			data-&gt;in_max[ix] = dme1737_read(data,</div><div class='ctx'> 					DME1737_REG_IN_MAX(ix));</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -595,14 +596,14 @@ static struct dme1737_data *dme1737_update_device(struct device *dev)</div><div class='ctx'> 			 * to take advantage of implicit conversions between</div><div class='ctx'> 			 * register values (2's complement) and temp values</div><div class='ctx'> 			 * (signed decimal). */</div><div class='del'>-			data-&gt;temp[ix] = dme1737_read(client,</div><div class='add'>+			data-&gt;temp[ix] = dme1737_read(data,</div><div class='ctx'> 					DME1737_REG_TEMP(ix)) &lt;&lt; 8;</div><div class='del'>-			data-&gt;temp_min[ix] = dme1737_read(client,</div><div class='add'>+			data-&gt;temp_min[ix] = dme1737_read(data,</div><div class='ctx'> 					DME1737_REG_TEMP_MIN(ix));</div><div class='del'>-			data-&gt;temp_max[ix] = dme1737_read(client,</div><div class='add'>+			data-&gt;temp_max[ix] = dme1737_read(data,</div><div class='ctx'> 					DME1737_REG_TEMP_MAX(ix));</div><div class='ctx'> 			if (data-&gt;type != sch5027) {</div><div class='del'>-				data-&gt;temp_offset[ix] = dme1737_read(client,</div><div class='add'>+				data-&gt;temp_offset[ix] = dme1737_read(data,</div><div class='ctx'> 						DME1737_REG_TEMP_OFFSET(ix));</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -612,7 +613,7 @@ static struct dme1737_data *dme1737_update_device(struct device *dev)</div><div class='ctx'> 		 * which the registers are read (MSB first, then LSB) is</div><div class='ctx'> 		 * important! */</div><div class='ctx'> 		for (ix = 0; ix &lt; ARRAY_SIZE(lsb); ix++) {</div><div class='del'>-			lsb[ix] = dme1737_read(client,</div><div class='add'>+			lsb[ix] = dme1737_read(data,</div><div class='ctx'> 					DME1737_REG_IN_TEMP_LSB(ix));</div><div class='ctx'> 		}</div><div class='ctx'> 		for (ix = 0; ix &lt; ARRAY_SIZE(data-&gt;in); ix++) {</div><div class='hunk'>@@ -631,19 +632,19 @@ static struct dme1737_data *dme1737_update_device(struct device *dev)</div><div class='ctx'> 			if (!(data-&gt;has_fan &amp; (1 &lt;&lt; ix))) {</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='del'>-			data-&gt;fan[ix] = dme1737_read(client,</div><div class='add'>+			data-&gt;fan[ix] = dme1737_read(data,</div><div class='ctx'> 					DME1737_REG_FAN(ix));</div><div class='del'>-			data-&gt;fan[ix] |= dme1737_read(client,</div><div class='add'>+			data-&gt;fan[ix] |= dme1737_read(data,</div><div class='ctx'> 					DME1737_REG_FAN(ix) + 1) &lt;&lt; 8;</div><div class='del'>-			data-&gt;fan_min[ix] = dme1737_read(client,</div><div class='add'>+			data-&gt;fan_min[ix] = dme1737_read(data,</div><div class='ctx'> 					DME1737_REG_FAN_MIN(ix));</div><div class='del'>-			data-&gt;fan_min[ix] |= dme1737_read(client,</div><div class='add'>+			data-&gt;fan_min[ix] |= dme1737_read(data,</div><div class='ctx'> 					DME1737_REG_FAN_MIN(ix) + 1) &lt;&lt; 8;</div><div class='del'>-			data-&gt;fan_opt[ix] = dme1737_read(client,</div><div class='add'>+			data-&gt;fan_opt[ix] = dme1737_read(data,</div><div class='ctx'> 					DME1737_REG_FAN_OPT(ix));</div><div class='ctx'> 			/* fan_max exists only for fan[5-6] */</div><div class='ctx'> 			if (ix &gt; 3) {</div><div class='del'>-				data-&gt;fan_max[ix - 4] = dme1737_read(client,</div><div class='add'>+				data-&gt;fan_max[ix - 4] = dme1737_read(data,</div><div class='ctx'> 					DME1737_REG_FAN_MAX(ix));</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -655,63 +656,63 @@ static struct dme1737_data *dme1737_update_device(struct device *dev)</div><div class='ctx'> 			if (!(data-&gt;has_pwm &amp; (1 &lt;&lt; ix))) {</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='del'>-			data-&gt;pwm[ix] = dme1737_read(client,</div><div class='add'>+			data-&gt;pwm[ix] = dme1737_read(data,</div><div class='ctx'> 					DME1737_REG_PWM(ix));</div><div class='del'>-			data-&gt;pwm_freq[ix] = dme1737_read(client,</div><div class='add'>+			data-&gt;pwm_freq[ix] = dme1737_read(data,</div><div class='ctx'> 					DME1737_REG_PWM_FREQ(ix));</div><div class='ctx'> 			/* pwm_config and pwm_min exist only for pwm[1-3] */</div><div class='ctx'> 			if (ix &lt; 3) {</div><div class='del'>-				data-&gt;pwm_config[ix] = dme1737_read(client,</div><div class='add'>+				data-&gt;pwm_config[ix] = dme1737_read(data,</div><div class='ctx'> 						DME1737_REG_PWM_CONFIG(ix));</div><div class='del'>-				data-&gt;pwm_min[ix] = dme1737_read(client,</div><div class='add'>+				data-&gt;pwm_min[ix] = dme1737_read(data,</div><div class='ctx'> 						DME1737_REG_PWM_MIN(ix));</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		for (ix = 0; ix &lt; ARRAY_SIZE(data-&gt;pwm_rr); ix++) {</div><div class='del'>-			data-&gt;pwm_rr[ix] = dme1737_read(client,</div><div class='add'>+			data-&gt;pwm_rr[ix] = dme1737_read(data,</div><div class='ctx'> 						DME1737_REG_PWM_RR(ix));</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Thermal zone registers */</div><div class='ctx'> 		for (ix = 0; ix &lt; ARRAY_SIZE(data-&gt;zone_low); ix++) {</div><div class='del'>-			data-&gt;zone_low[ix] = dme1737_read(client,</div><div class='add'>+			data-&gt;zone_low[ix] = dme1737_read(data,</div><div class='ctx'> 					DME1737_REG_ZONE_LOW(ix));</div><div class='del'>-			data-&gt;zone_abs[ix] = dme1737_read(client,</div><div class='add'>+			data-&gt;zone_abs[ix] = dme1737_read(data,</div><div class='ctx'> 					DME1737_REG_ZONE_ABS(ix));</div><div class='ctx'> 		}</div><div class='ctx'> 		if (data-&gt;type != sch5027) {</div><div class='ctx'> 			for (ix = 0; ix &lt; ARRAY_SIZE(data-&gt;zone_hyst); ix++) {</div><div class='del'>-				data-&gt;zone_hyst[ix] = dme1737_read(client,</div><div class='add'>+				data-&gt;zone_hyst[ix] = dme1737_read(data,</div><div class='ctx'> 						DME1737_REG_ZONE_HYST(ix));</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Alarm registers */</div><div class='del'>-		data-&gt;alarms = dme1737_read(client,</div><div class='add'>+		data-&gt;alarms = dme1737_read(data,</div><div class='ctx'> 						DME1737_REG_ALARM1);</div><div class='ctx'> 		/* Bit 7 tells us if the other alarm registers are non-zero and</div><div class='ctx'> 		 * therefore also need to be read */</div><div class='ctx'> 		if (data-&gt;alarms &amp; 0x80) {</div><div class='del'>-			data-&gt;alarms |= dme1737_read(client,</div><div class='add'>+			data-&gt;alarms |= dme1737_read(data,</div><div class='ctx'> 						DME1737_REG_ALARM2) &lt;&lt; 8;</div><div class='del'>-			data-&gt;alarms |= dme1737_read(client,</div><div class='add'>+			data-&gt;alarms |= dme1737_read(data,</div><div class='ctx'> 						DME1737_REG_ALARM3) &lt;&lt; 16;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* The ISA chips require explicit clearing of alarm bits.</div><div class='ctx'> 		 * Don't worry, an alarm will come back if the condition</div><div class='ctx'> 		 * that causes it still exists */</div><div class='del'>-		if (!client-&gt;driver) {</div><div class='add'>+		if (!data-&gt;client) {</div><div class='ctx'> 			if (data-&gt;alarms &amp; 0xff0000) {</div><div class='del'>-				dme1737_write(client, DME1737_REG_ALARM3,</div><div class='add'>+				dme1737_write(data, DME1737_REG_ALARM3,</div><div class='ctx'> 					      0xff);</div><div class='ctx'> 			}</div><div class='ctx'> 			if (data-&gt;alarms &amp; 0xff00) {</div><div class='del'>-				dme1737_write(client, DME1737_REG_ALARM2,</div><div class='add'>+				dme1737_write(data, DME1737_REG_ALARM2,</div><div class='ctx'> 					      0xff);</div><div class='ctx'> 			}</div><div class='ctx'> 			if (data-&gt;alarms &amp; 0xff) {</div><div class='del'>-				dme1737_write(client, DME1737_REG_ALARM1,</div><div class='add'>+				dme1737_write(data, DME1737_REG_ALARM1,</div><div class='ctx'> 					      0xff);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -770,7 +771,6 @@ static ssize_t set_in(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 		      const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct dme1737_data *data = dev_get_drvdata(dev);</div><div class='del'>-	struct i2c_client *client = &amp;data-&gt;client;</div><div class='ctx'> 	struct sensor_device_attribute_2</div><div class='ctx'> 		*sensor_attr_2 = to_sensor_dev_attr_2(attr);</div><div class='ctx'> 	int ix = sensor_attr_2-&gt;index;</div><div class='hunk'>@@ -781,12 +781,12 @@ static ssize_t set_in(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	switch (fn) {</div><div class='ctx'> 	case SYS_IN_MIN:</div><div class='ctx'> 		data-&gt;in_min[ix] = IN_TO_REG(val, data-&gt;in_nominal[ix]);</div><div class='del'>-		dme1737_write(client, DME1737_REG_IN_MIN(ix),</div><div class='add'>+		dme1737_write(data, DME1737_REG_IN_MIN(ix),</div><div class='ctx'> 			      data-&gt;in_min[ix]);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SYS_IN_MAX:</div><div class='ctx'> 		data-&gt;in_max[ix] = IN_TO_REG(val, data-&gt;in_nominal[ix]);</div><div class='del'>-		dme1737_write(client, DME1737_REG_IN_MAX(ix),</div><div class='add'>+		dme1737_write(data, DME1737_REG_IN_MAX(ix),</div><div class='ctx'> 			      data-&gt;in_max[ix]);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -850,7 +850,6 @@ static ssize_t set_temp(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 			const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct dme1737_data *data = dev_get_drvdata(dev);</div><div class='del'>-	struct i2c_client *client = &amp;data-&gt;client;</div><div class='ctx'> 	struct sensor_device_attribute_2</div><div class='ctx'> 		*sensor_attr_2 = to_sensor_dev_attr_2(attr);</div><div class='ctx'> 	int ix = sensor_attr_2-&gt;index;</div><div class='hunk'>@@ -861,17 +860,17 @@ static ssize_t set_temp(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	switch (fn) {</div><div class='ctx'> 	case SYS_TEMP_MIN:</div><div class='ctx'> 		data-&gt;temp_min[ix] = TEMP_TO_REG(val);</div><div class='del'>-		dme1737_write(client, DME1737_REG_TEMP_MIN(ix),</div><div class='add'>+		dme1737_write(data, DME1737_REG_TEMP_MIN(ix),</div><div class='ctx'> 			      data-&gt;temp_min[ix]);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SYS_TEMP_MAX:</div><div class='ctx'> 		data-&gt;temp_max[ix] = TEMP_TO_REG(val);</div><div class='del'>-		dme1737_write(client, DME1737_REG_TEMP_MAX(ix),</div><div class='add'>+		dme1737_write(data, DME1737_REG_TEMP_MAX(ix),</div><div class='ctx'> 			      data-&gt;temp_max[ix]);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SYS_TEMP_OFFSET:</div><div class='ctx'> 		data-&gt;temp_offset[ix] = TEMP_TO_REG(val);</div><div class='del'>-		dme1737_write(client, DME1737_REG_TEMP_OFFSET(ix),</div><div class='add'>+		dme1737_write(data, DME1737_REG_TEMP_OFFSET(ix),</div><div class='ctx'> 			      data-&gt;temp_offset[ix]);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -939,7 +938,6 @@ static ssize_t set_zone(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 			const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct dme1737_data *data = dev_get_drvdata(dev);</div><div class='del'>-	struct i2c_client *client = &amp;data-&gt;client;</div><div class='ctx'> 	struct sensor_device_attribute_2</div><div class='ctx'> 		*sensor_attr_2 = to_sensor_dev_attr_2(attr);</div><div class='ctx'> 	int ix = sensor_attr_2-&gt;index;</div><div class='hunk'>@@ -950,37 +948,37 @@ static ssize_t set_zone(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	switch (fn) {</div><div class='ctx'> 	case SYS_ZONE_AUTO_POINT1_TEMP_HYST:</div><div class='ctx'> 		/* Refresh the cache */</div><div class='del'>-		data-&gt;zone_low[ix] = dme1737_read(client,</div><div class='add'>+		data-&gt;zone_low[ix] = dme1737_read(data,</div><div class='ctx'> 						  DME1737_REG_ZONE_LOW(ix));</div><div class='ctx'> 		/* Modify the temp hyst value */</div><div class='ctx'> 		data-&gt;zone_hyst[ix == 2] = TEMP_HYST_TO_REG(</div><div class='ctx'> 					TEMP_FROM_REG(data-&gt;zone_low[ix], 8) -</div><div class='del'>-					val, ix, dme1737_read(client,</div><div class='add'>+					val, ix, dme1737_read(data,</div><div class='ctx'> 					DME1737_REG_ZONE_HYST(ix == 2)));</div><div class='del'>-		dme1737_write(client, DME1737_REG_ZONE_HYST(ix == 2),</div><div class='add'>+		dme1737_write(data, DME1737_REG_ZONE_HYST(ix == 2),</div><div class='ctx'> 			      data-&gt;zone_hyst[ix == 2]);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SYS_ZONE_AUTO_POINT1_TEMP:</div><div class='ctx'> 		data-&gt;zone_low[ix] = TEMP_TO_REG(val);</div><div class='del'>-		dme1737_write(client, DME1737_REG_ZONE_LOW(ix),</div><div class='add'>+		dme1737_write(data, DME1737_REG_ZONE_LOW(ix),</div><div class='ctx'> 			      data-&gt;zone_low[ix]);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SYS_ZONE_AUTO_POINT2_TEMP:</div><div class='ctx'> 		/* Refresh the cache */</div><div class='del'>-		data-&gt;zone_low[ix] = dme1737_read(client,</div><div class='add'>+		data-&gt;zone_low[ix] = dme1737_read(data,</div><div class='ctx'> 						  DME1737_REG_ZONE_LOW(ix));</div><div class='ctx'> 		/* Modify the temp range value (which is stored in the upper</div><div class='ctx'> 		 * nibble of the pwm_freq register) */</div><div class='ctx'> 		data-&gt;pwm_freq[ix] = TEMP_RANGE_TO_REG(val -</div><div class='ctx'> 					TEMP_FROM_REG(data-&gt;zone_low[ix], 8),</div><div class='del'>-					dme1737_read(client,</div><div class='add'>+					dme1737_read(data,</div><div class='ctx'> 					DME1737_REG_PWM_FREQ(ix)));</div><div class='del'>-		dme1737_write(client, DME1737_REG_PWM_FREQ(ix),</div><div class='add'>+		dme1737_write(data, DME1737_REG_PWM_FREQ(ix),</div><div class='ctx'> 			      data-&gt;pwm_freq[ix]);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SYS_ZONE_AUTO_POINT3_TEMP:</div><div class='ctx'> 		data-&gt;zone_abs[ix] = TEMP_TO_REG(val);</div><div class='del'>-		dme1737_write(client, DME1737_REG_ZONE_ABS(ix),</div><div class='add'>+		dme1737_write(data, DME1737_REG_ZONE_ABS(ix),</div><div class='ctx'> 			      data-&gt;zone_abs[ix]);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -1046,7 +1044,6 @@ static ssize_t set_fan(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 		       const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct dme1737_data *data = dev_get_drvdata(dev);</div><div class='del'>-	struct i2c_client *client = &amp;data-&gt;client;</div><div class='ctx'> 	struct sensor_device_attribute_2</div><div class='ctx'> 		*sensor_attr_2 = to_sensor_dev_attr_2(attr);</div><div class='ctx'> 	int ix = sensor_attr_2-&gt;index;</div><div class='hunk'>@@ -1060,21 +1057,21 @@ static ssize_t set_fan(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 			data-&gt;fan_min[ix] = FAN_TO_REG(val, 0);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* Refresh the cache */</div><div class='del'>-			data-&gt;fan_opt[ix] = dme1737_read(client,</div><div class='add'>+			data-&gt;fan_opt[ix] = dme1737_read(data,</div><div class='ctx'> 						DME1737_REG_FAN_OPT(ix));</div><div class='ctx'> 			/* Modify the fan min value */</div><div class='ctx'> 			data-&gt;fan_min[ix] = FAN_TO_REG(val,</div><div class='ctx'> 					FAN_TPC_FROM_REG(data-&gt;fan_opt[ix]));</div><div class='ctx'> 		}</div><div class='del'>-		dme1737_write(client, DME1737_REG_FAN_MIN(ix),</div><div class='add'>+		dme1737_write(data, DME1737_REG_FAN_MIN(ix),</div><div class='ctx'> 			      data-&gt;fan_min[ix] &amp; 0xff);</div><div class='del'>-		dme1737_write(client, DME1737_REG_FAN_MIN(ix) + 1,</div><div class='add'>+		dme1737_write(data, DME1737_REG_FAN_MIN(ix) + 1,</div><div class='ctx'> 			      data-&gt;fan_min[ix] &gt;&gt; 8);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SYS_FAN_MAX:</div><div class='ctx'> 		/* Only valid for fan[5-6] */</div><div class='ctx'> 		data-&gt;fan_max[ix - 4] = FAN_MAX_TO_REG(val);</div><div class='del'>-		dme1737_write(client, DME1737_REG_FAN_MAX(ix),</div><div class='add'>+		dme1737_write(data, DME1737_REG_FAN_MAX(ix),</div><div class='ctx'> 			      data-&gt;fan_max[ix - 4]);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SYS_FAN_TYPE:</div><div class='hunk'>@@ -1086,9 +1083,9 @@ static ssize_t set_fan(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 				 val);</div><div class='ctx'> 			goto exit;</div><div class='ctx'> 		}</div><div class='del'>-		data-&gt;fan_opt[ix] = FAN_TYPE_TO_REG(val, dme1737_read(client,</div><div class='add'>+		data-&gt;fan_opt[ix] = FAN_TYPE_TO_REG(val, dme1737_read(data,</div><div class='ctx'> 					DME1737_REG_FAN_OPT(ix)));</div><div class='del'>-		dme1737_write(client, DME1737_REG_FAN_OPT(ix),</div><div class='add'>+		dme1737_write(data, DME1737_REG_FAN_OPT(ix),</div><div class='ctx'> 			      data-&gt;fan_opt[ix]);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -1185,7 +1182,6 @@ static ssize_t set_pwm(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 		       const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct dme1737_data *data = dev_get_drvdata(dev);</div><div class='del'>-	struct i2c_client *client = &amp;data-&gt;client;</div><div class='ctx'> 	struct sensor_device_attribute_2</div><div class='ctx'> 		*sensor_attr_2 = to_sensor_dev_attr_2(attr);</div><div class='ctx'> 	int ix = sensor_attr_2-&gt;index;</div><div class='hunk'>@@ -1196,12 +1192,12 @@ static ssize_t set_pwm(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	switch (fn) {</div><div class='ctx'> 	case SYS_PWM:</div><div class='ctx'> 		data-&gt;pwm[ix] = SENSORS_LIMIT(val, 0, 255);</div><div class='del'>-		dme1737_write(client, DME1737_REG_PWM(ix), data-&gt;pwm[ix]);</div><div class='add'>+		dme1737_write(data, DME1737_REG_PWM(ix), data-&gt;pwm[ix]);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SYS_PWM_FREQ:</div><div class='del'>-		data-&gt;pwm_freq[ix] = PWM_FREQ_TO_REG(val, dme1737_read(client,</div><div class='add'>+		data-&gt;pwm_freq[ix] = PWM_FREQ_TO_REG(val, dme1737_read(data,</div><div class='ctx'> 						DME1737_REG_PWM_FREQ(ix)));</div><div class='del'>-		dme1737_write(client, DME1737_REG_PWM_FREQ(ix),</div><div class='add'>+		dme1737_write(data, DME1737_REG_PWM_FREQ(ix),</div><div class='ctx'> 			      data-&gt;pwm_freq[ix]);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SYS_PWM_ENABLE:</div><div class='hunk'>@@ -1214,7 +1210,7 @@ static ssize_t set_pwm(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 			goto exit;</div><div class='ctx'> 		}</div><div class='ctx'> 		/* Refresh the cache */</div><div class='del'>-		data-&gt;pwm_config[ix] = dme1737_read(client,</div><div class='add'>+		data-&gt;pwm_config[ix] = dme1737_read(data,</div><div class='ctx'> 						DME1737_REG_PWM_CONFIG(ix));</div><div class='ctx'> 		if (val == PWM_EN_FROM_REG(data-&gt;pwm_config[ix])) {</div><div class='ctx'> 			/* Bail out if no change */</div><div class='hunk'>@@ -1226,14 +1222,14 @@ static ssize_t set_pwm(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 			data-&gt;pwm_acz[ix] = PWM_ACZ_FROM_REG(</div><div class='ctx'> 							data-&gt;pwm_config[ix]);</div><div class='ctx'> 			/* Save the current ramp rate state and disable it */</div><div class='del'>-			data-&gt;pwm_rr[ix &gt; 0] = dme1737_read(client,</div><div class='add'>+			data-&gt;pwm_rr[ix &gt; 0] = dme1737_read(data,</div><div class='ctx'> 						DME1737_REG_PWM_RR(ix &gt; 0));</div><div class='ctx'> 			data-&gt;pwm_rr_en &amp;= ~(1 &lt;&lt; ix);</div><div class='ctx'> 			if (PWM_RR_EN_FROM_REG(data-&gt;pwm_rr[ix &gt; 0], ix)) {</div><div class='ctx'> 				data-&gt;pwm_rr_en |= (1 &lt;&lt; ix);</div><div class='ctx'> 				data-&gt;pwm_rr[ix &gt; 0] = PWM_RR_EN_TO_REG(0, ix,</div><div class='ctx'> 							data-&gt;pwm_rr[ix &gt; 0]);</div><div class='del'>-				dme1737_write(client,</div><div class='add'>+				dme1737_write(data,</div><div class='ctx'> 					      DME1737_REG_PWM_RR(ix &gt; 0),</div><div class='ctx'> 					      data-&gt;pwm_rr[ix &gt; 0]);</div><div class='ctx'> 			}</div><div class='hunk'>@@ -1247,14 +1243,14 @@ static ssize_t set_pwm(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 			/* Turn fan fully on */</div><div class='ctx'> 			data-&gt;pwm_config[ix] = PWM_EN_TO_REG(0,</div><div class='ctx'> 							data-&gt;pwm_config[ix]);</div><div class='del'>-			dme1737_write(client, DME1737_REG_PWM_CONFIG(ix),</div><div class='add'>+			dme1737_write(data, DME1737_REG_PWM_CONFIG(ix),</div><div class='ctx'> 				      data-&gt;pwm_config[ix]);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 1:</div><div class='ctx'> 			/* Turn on manual mode */</div><div class='ctx'> 			data-&gt;pwm_config[ix] = PWM_EN_TO_REG(1,</div><div class='ctx'> 							data-&gt;pwm_config[ix]);</div><div class='del'>-			dme1737_write(client, DME1737_REG_PWM_CONFIG(ix),</div><div class='add'>+			dme1737_write(data, DME1737_REG_PWM_CONFIG(ix),</div><div class='ctx'> 				      data-&gt;pwm_config[ix]);</div><div class='ctx'> 			/* Change permissions of pwm[ix] to read-writeable */</div><div class='ctx'> 			dme1737_chmod_file(dev, dme1737_pwm_chmod_attr[ix],</div><div class='hunk'>@@ -1269,14 +1265,14 @@ static ssize_t set_pwm(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 			data-&gt;pwm_config[ix] = PWM_ACZ_TO_REG(</div><div class='ctx'> 							data-&gt;pwm_acz[ix],</div><div class='ctx'> 							data-&gt;pwm_config[ix]);</div><div class='del'>-			dme1737_write(client, DME1737_REG_PWM_CONFIG(ix),</div><div class='add'>+			dme1737_write(data, DME1737_REG_PWM_CONFIG(ix),</div><div class='ctx'> 				      data-&gt;pwm_config[ix]);</div><div class='ctx'> 			/* Enable PWM ramp rate if previously enabled */</div><div class='ctx'> 			if (data-&gt;pwm_rr_en &amp; (1 &lt;&lt; ix)) {</div><div class='ctx'> 				data-&gt;pwm_rr[ix &gt; 0] = PWM_RR_EN_TO_REG(1, ix,</div><div class='del'>-						dme1737_read(client,</div><div class='add'>+						dme1737_read(data,</div><div class='ctx'> 						DME1737_REG_PWM_RR(ix &gt; 0)));</div><div class='del'>-				dme1737_write(client,</div><div class='add'>+				dme1737_write(data,</div><div class='ctx'> 					      DME1737_REG_PWM_RR(ix &gt; 0),</div><div class='ctx'> 					      data-&gt;pwm_rr[ix &gt; 0]);</div><div class='ctx'> 			}</div><div class='hunk'>@@ -1286,9 +1282,9 @@ static ssize_t set_pwm(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	case SYS_PWM_RAMP_RATE:</div><div class='ctx'> 		/* Only valid for pwm[1-3] */</div><div class='ctx'> 		/* Refresh the cache */</div><div class='del'>-		data-&gt;pwm_config[ix] = dme1737_read(client,</div><div class='add'>+		data-&gt;pwm_config[ix] = dme1737_read(data,</div><div class='ctx'> 						DME1737_REG_PWM_CONFIG(ix));</div><div class='del'>-		data-&gt;pwm_rr[ix &gt; 0] = dme1737_read(client,</div><div class='add'>+		data-&gt;pwm_rr[ix &gt; 0] = dme1737_read(data,</div><div class='ctx'> 						DME1737_REG_PWM_RR(ix &gt; 0));</div><div class='ctx'> 		/* Set the ramp rate value */</div><div class='ctx'> 		if (val &gt; 0) {</div><div class='hunk'>@@ -1301,7 +1297,7 @@ static ssize_t set_pwm(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 			data-&gt;pwm_rr[ix &gt; 0] = PWM_RR_EN_TO_REG(val &gt; 0, ix,</div><div class='ctx'> 							data-&gt;pwm_rr[ix &gt; 0]);</div><div class='ctx'> 		}</div><div class='del'>-		dme1737_write(client, DME1737_REG_PWM_RR(ix &gt; 0),</div><div class='add'>+		dme1737_write(data, DME1737_REG_PWM_RR(ix &gt; 0),</div><div class='ctx'> 			      data-&gt;pwm_rr[ix &gt; 0]);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SYS_PWM_AUTO_CHANNELS_ZONE:</div><div class='hunk'>@@ -1315,14 +1311,14 @@ static ssize_t set_pwm(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 			goto exit;</div><div class='ctx'> 		}</div><div class='ctx'> 		/* Refresh the cache */</div><div class='del'>-		data-&gt;pwm_config[ix] = dme1737_read(client,</div><div class='add'>+		data-&gt;pwm_config[ix] = dme1737_read(data,</div><div class='ctx'> 						DME1737_REG_PWM_CONFIG(ix));</div><div class='ctx'> 		if (PWM_EN_FROM_REG(data-&gt;pwm_config[ix]) == 2) {</div><div class='ctx'> 			/* PWM is already in auto mode so update the temp</div><div class='ctx'> 			 * channel assignment */</div><div class='ctx'> 			data-&gt;pwm_config[ix] = PWM_ACZ_TO_REG(val,</div><div class='ctx'> 						data-&gt;pwm_config[ix]);</div><div class='del'>-			dme1737_write(client, DME1737_REG_PWM_CONFIG(ix),</div><div class='add'>+			dme1737_write(data, DME1737_REG_PWM_CONFIG(ix),</div><div class='ctx'> 				      data-&gt;pwm_config[ix]);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* PWM is not in auto mode so we save the temp</div><div class='hunk'>@@ -1333,7 +1329,7 @@ static ssize_t set_pwm(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	case SYS_PWM_AUTO_PWM_MIN:</div><div class='ctx'> 		/* Only valid for pwm[1-3] */</div><div class='ctx'> 		/* Refresh the cache */</div><div class='del'>-		data-&gt;pwm_min[ix] = dme1737_read(client,</div><div class='add'>+		data-&gt;pwm_min[ix] = dme1737_read(data,</div><div class='ctx'> 						DME1737_REG_PWM_MIN(ix));</div><div class='ctx'> 		/* There are only 2 values supported for the auto_pwm_min</div><div class='ctx'> 		 * value: 0 or auto_point1_pwm. So if the temperature drops</div><div class='hunk'>@@ -1341,20 +1337,20 @@ static ssize_t set_pwm(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 		 * off or runs at auto_point1_pwm duty-cycle. */</div><div class='ctx'> 		if (val &gt; ((data-&gt;pwm_min[ix] + 1) / 2)) {</div><div class='ctx'> 			data-&gt;pwm_rr[0] = PWM_OFF_TO_REG(1, ix,</div><div class='del'>-						dme1737_read(client,</div><div class='add'>+						dme1737_read(data,</div><div class='ctx'> 						DME1737_REG_PWM_RR(0)));</div><div class='ctx'> 		} else {</div><div class='ctx'> 			data-&gt;pwm_rr[0] = PWM_OFF_TO_REG(0, ix,</div><div class='del'>-						dme1737_read(client,</div><div class='add'>+						dme1737_read(data,</div><div class='ctx'> 						DME1737_REG_PWM_RR(0)));</div><div class='ctx'> 		}</div><div class='del'>-		dme1737_write(client, DME1737_REG_PWM_RR(0),</div><div class='add'>+		dme1737_write(data, DME1737_REG_PWM_RR(0),</div><div class='ctx'> 			      data-&gt;pwm_rr[0]);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SYS_PWM_AUTO_POINT1_PWM:</div><div class='ctx'> 		/* Only valid for pwm[1-3] */</div><div class='ctx'> 		data-&gt;pwm_min[ix] = SENSORS_LIMIT(val, 0, 255);</div><div class='del'>-		dme1737_write(client, DME1737_REG_PWM_MIN(ix),</div><div class='add'>+		dme1737_write(data, DME1737_REG_PWM_MIN(ix),</div><div class='ctx'> 			      data-&gt;pwm_min[ix]);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -1402,7 +1398,7 @@ static ssize_t show_name(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> {</div><div class='ctx'> 	struct dme1737_data *data = dev_get_drvdata(dev);</div><div class='ctx'> </div><div class='del'>-	return sprintf(buf, "%s\n", data-&gt;client.name);</div><div class='add'>+	return sprintf(buf, "%s\n", data-&gt;name);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* ---------------------------------------------------------------------</div><div class='hunk'>@@ -1908,7 +1904,7 @@ static void dme1737_remove_files(struct device *dev)</div><div class='ctx'> </div><div class='ctx'> 	sysfs_remove_group(&amp;dev-&gt;kobj, &amp;dme1737_group);</div><div class='ctx'> </div><div class='del'>-	if (!data-&gt;client.driver) {</div><div class='add'>+	if (!data-&gt;client) {</div><div class='ctx'> 		sysfs_remove_file(&amp;dev-&gt;kobj, &amp;dev_attr_name.attr);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -1919,7 +1915,7 @@ static int dme1737_create_files(struct device *dev)</div><div class='ctx'> 	int err, ix;</div><div class='ctx'> </div><div class='ctx'> 	/* Create a name attribute for ISA devices */</div><div class='del'>-	if (!data-&gt;client.driver &amp;&amp;</div><div class='add'>+	if (!data-&gt;client &amp;&amp;</div><div class='ctx'> 	    (err = sysfs_create_file(&amp;dev-&gt;kobj, &amp;dev_attr_name.attr))) {</div><div class='ctx'> 		goto exit;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2013,14 +2009,14 @@ exit:</div><div class='ctx'> static int dme1737_init_device(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct dme1737_data *data = dev_get_drvdata(dev);</div><div class='del'>-	struct i2c_client *client = &amp;data-&gt;client;</div><div class='add'>+	struct i2c_client *client = data-&gt;client;</div><div class='ctx'> 	int ix;</div><div class='ctx'> 	u8 reg;</div><div class='ctx'> </div><div class='ctx'> 	/* Point to the right nominal voltages array */</div><div class='ctx'> 	data-&gt;in_nominal = IN_NOMINAL(data-&gt;type);</div><div class='ctx'> </div><div class='del'>-	data-&gt;config = dme1737_read(client, DME1737_REG_CONFIG);</div><div class='add'>+	data-&gt;config = dme1737_read(data, DME1737_REG_CONFIG);</div><div class='ctx'> 	/* Inform if part is not monitoring/started */</div><div class='ctx'> 	if (!(data-&gt;config &amp; 0x01)) {</div><div class='ctx'> 		if (!force_start) {</div><div class='hunk'>@@ -2032,7 +2028,7 @@ static int dme1737_init_device(struct device *dev)</div><div class='ctx'> </div><div class='ctx'> 		/* Force monitoring */</div><div class='ctx'> 		data-&gt;config |= 0x01;</div><div class='del'>-		dme1737_write(client, DME1737_REG_CONFIG, data-&gt;config);</div><div class='add'>+		dme1737_write(data, DME1737_REG_CONFIG, data-&gt;config);</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Inform if part is not ready */</div><div class='ctx'> 	if (!(data-&gt;config &amp; 0x04)) {</div><div class='hunk'>@@ -2041,8 +2037,8 @@ static int dme1737_init_device(struct device *dev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Determine which optional fan and pwm features are enabled/present */</div><div class='del'>-	if (client-&gt;driver) {   /* I2C chip */</div><div class='del'>-		data-&gt;config2 = dme1737_read(client, DME1737_REG_CONFIG2);</div><div class='add'>+	if (client) {   /* I2C chip */</div><div class='add'>+		data-&gt;config2 = dme1737_read(data, DME1737_REG_CONFIG2);</div><div class='ctx'> 		/* Check if optional fan3 input is enabled */</div><div class='ctx'> 		if (data-&gt;config2 &amp; 0x04) {</div><div class='ctx'> 			data-&gt;has_fan |= (1 &lt;&lt; 2);</div><div class='hunk'>@@ -2051,7 +2047,7 @@ static int dme1737_init_device(struct device *dev)</div><div class='ctx'> 		/* Fan4 and pwm3 are only available if the client's I2C address</div><div class='ctx'> 		 * is the default 0x2e. Otherwise the I/Os associated with</div><div class='ctx'> 		 * these functions are used for addr enable/select. */</div><div class='del'>-		if (data-&gt;client.addr == 0x2e) {</div><div class='add'>+		if (client-&gt;addr == 0x2e) {</div><div class='ctx'> 			data-&gt;has_fan |= (1 &lt;&lt; 3);</div><div class='ctx'> 			data-&gt;has_pwm |= (1 &lt;&lt; 2);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2086,16 +2082,16 @@ static int dme1737_init_device(struct device *dev)</div><div class='ctx'> 		 (data-&gt;has_fan &amp; (1 &lt;&lt; 4)) ? "yes" : "no",</div><div class='ctx'> 		 (data-&gt;has_fan &amp; (1 &lt;&lt; 5)) ? "yes" : "no");</div><div class='ctx'> </div><div class='del'>-	reg = dme1737_read(client, DME1737_REG_TACH_PWM);</div><div class='add'>+	reg = dme1737_read(data, DME1737_REG_TACH_PWM);</div><div class='ctx'> 	/* Inform if fan-to-pwm mapping differs from the default */</div><div class='del'>-	if (client-&gt;driver &amp;&amp; reg != 0xa4) {   /* I2C chip */</div><div class='add'>+	if (client &amp;&amp; reg != 0xa4) {   /* I2C chip */</div><div class='ctx'> 		dev_warn(dev, "Non-standard fan to pwm mapping: "</div><div class='ctx'> 			 "fan1-&gt;pwm%d, fan2-&gt;pwm%d, fan3-&gt;pwm%d, "</div><div class='ctx'> 			 "fan4-&gt;pwm%d. Please report to the driver "</div><div class='ctx'> 			 "maintainer.\n",</div><div class='ctx'> 			 (reg &amp; 0x03) + 1, ((reg &gt;&gt; 2) &amp; 0x03) + 1,</div><div class='ctx'> 			 ((reg &gt;&gt; 4) &amp; 0x03) + 1, ((reg &gt;&gt; 6) &amp; 0x03) + 1);</div><div class='del'>-	} else if (!client-&gt;driver &amp;&amp; reg != 0x24) {   /* ISA chip */</div><div class='add'>+	} else if (!client &amp;&amp; reg != 0x24) {   /* ISA chip */</div><div class='ctx'> 		dev_warn(dev, "Non-standard fan to pwm mapping: "</div><div class='ctx'> 			 "fan1-&gt;pwm%d, fan2-&gt;pwm%d, fan3-&gt;pwm%d. "</div><div class='ctx'> 			 "Please report to the driver maintainer.\n",</div><div class='hunk'>@@ -2108,7 +2104,7 @@ static int dme1737_init_device(struct device *dev)</div><div class='ctx'> 	 * disabled). */</div><div class='ctx'> 	if (!(data-&gt;config &amp; 0x02)) {</div><div class='ctx'> 		for (ix = 0; ix &lt; 3; ix++) {</div><div class='del'>-			data-&gt;pwm_config[ix] = dme1737_read(client,</div><div class='add'>+			data-&gt;pwm_config[ix] = dme1737_read(data,</div><div class='ctx'> 						DME1737_REG_PWM_CONFIG(ix));</div><div class='ctx'> 			if ((data-&gt;has_pwm &amp; (1 &lt;&lt; ix)) &amp;&amp;</div><div class='ctx'> 			    (PWM_EN_FROM_REG(data-&gt;pwm_config[ix]) == -1)) {</div><div class='hunk'>@@ -2116,8 +2112,8 @@ static int dme1737_init_device(struct device *dev)</div><div class='ctx'> 					 "manual mode.\n", ix + 1);</div><div class='ctx'> 				data-&gt;pwm_config[ix] = PWM_EN_TO_REG(1,</div><div class='ctx'> 							data-&gt;pwm_config[ix]);</div><div class='del'>-				dme1737_write(client, DME1737_REG_PWM(ix), 0);</div><div class='del'>-				dme1737_write(client,</div><div class='add'>+				dme1737_write(data, DME1737_REG_PWM(ix), 0);</div><div class='add'>+				dme1737_write(data,</div><div class='ctx'> 					      DME1737_REG_PWM_CONFIG(ix),</div><div class='ctx'> 					      data-&gt;pwm_config[ix]);</div><div class='ctx'> 			}</div><div class='hunk'>@@ -2191,37 +2187,24 @@ exit:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dme1737_i2c_detect(struct i2c_adapter *adapter, int address,</div><div class='del'>-			      int kind)</div><div class='add'>+/* Return 0 if detection is successful, -ENODEV otherwise */</div><div class='add'>+static int dme1737_i2c_detect(struct i2c_client *client, int kind,</div><div class='add'>+			      struct i2c_board_info *info)</div><div class='ctx'> {</div><div class='add'>+	struct i2c_adapter *adapter = client-&gt;adapter;</div><div class='add'>+	struct device *dev = &amp;adapter-&gt;dev;</div><div class='ctx'> 	u8 company, verstep = 0;</div><div class='del'>-	struct i2c_client *client;</div><div class='del'>-	struct dme1737_data *data;</div><div class='del'>-	struct device *dev;</div><div class='del'>-	int err = 0;</div><div class='ctx'> 	const char *name;</div><div class='ctx'> </div><div class='ctx'> 	if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) {</div><div class='del'>-		goto exit;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!(data = kzalloc(sizeof(struct dme1737_data), GFP_KERNEL))) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto exit;</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	client = &amp;data-&gt;client;</div><div class='del'>-	i2c_set_clientdata(client, data);</div><div class='del'>-	client-&gt;addr = address;</div><div class='del'>-	client-&gt;adapter = adapter;</div><div class='del'>-	client-&gt;driver = &amp;dme1737_i2c_driver;</div><div class='del'>-	dev = &amp;client-&gt;dev;</div><div class='del'>-</div><div class='ctx'> 	/* A negative kind means that the driver was loaded with no force</div><div class='ctx'> 	 * parameter (default), so we must identify the chip. */</div><div class='ctx'> 	if (kind &lt; 0) {</div><div class='del'>-		company = dme1737_read(client, DME1737_REG_COMPANY);</div><div class='del'>-		verstep = dme1737_read(client, DME1737_REG_VERSTEP);</div><div class='add'>+		company = i2c_smbus_read_byte_data(client, DME1737_REG_COMPANY);</div><div class='add'>+		verstep = i2c_smbus_read_byte_data(client, DME1737_REG_VERSTEP);</div><div class='ctx'> </div><div class='ctx'> 		if (company == DME1737_COMPANY_SMSC &amp;&amp;</div><div class='ctx'> 		    (verstep &amp; DME1737_VERSTEP_MASK) == DME1737_VERSTEP) {</div><div class='hunk'>@@ -2230,8 +2213,7 @@ static int dme1737_i2c_detect(struct i2c_adapter *adapter, int address,</div><div class='ctx'> 			   verstep == SCH5027_VERSTEP) {</div><div class='ctx'> 			kind = sch5027;</div><div class='ctx'> 		} else {</div><div class='del'>-			err = -ENODEV;</div><div class='del'>-			goto exit_kfree;</div><div class='add'>+			return -ENODEV;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2241,32 +2223,44 @@ static int dme1737_i2c_detect(struct i2c_adapter *adapter, int address,</div><div class='ctx'> 		kind = dme1737;</div><div class='ctx'> 		name = "dme1737";</div><div class='ctx'> 	}</div><div class='del'>-	data-&gt;type = kind;</div><div class='del'>-</div><div class='del'>-	/* Fill in the remaining client fields and put it into the global</div><div class='del'>-	 * list */</div><div class='del'>-	strlcpy(client-&gt;name, name, I2C_NAME_SIZE);</div><div class='del'>-	mutex_init(&amp;data-&gt;update_lock);</div><div class='del'>-</div><div class='del'>-	/* Tell the I2C layer a new client has arrived */</div><div class='del'>-	if ((err = i2c_attach_client(client))) {</div><div class='del'>-		goto exit_kfree;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	dev_info(dev, "Found a %s chip at 0x%02x (rev 0x%02x).\n",</div><div class='ctx'> 		 kind == sch5027 ? "SCH5027" : "DME1737", client-&gt;addr,</div><div class='ctx'> 		 verstep);</div><div class='add'>+	strlcpy(info-&gt;type, name, I2C_NAME_SIZE);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dme1737_i2c_probe(struct i2c_client *client,</div><div class='add'>+			     const struct i2c_device_id *id)</div><div class='add'>+{</div><div class='add'>+	struct dme1737_data *data;</div><div class='add'>+	struct device *dev = &amp;client-&gt;dev;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	data = kzalloc(sizeof(struct dme1737_data), GFP_KERNEL);</div><div class='add'>+	if (!data) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	i2c_set_clientdata(client, data);</div><div class='add'>+	data-&gt;type = id-&gt;driver_data;</div><div class='add'>+	data-&gt;client = client;</div><div class='add'>+	data-&gt;name = client-&gt;name;</div><div class='add'>+	mutex_init(&amp;data-&gt;update_lock);</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize the DME1737 chip */</div><div class='ctx'> 	if ((err = dme1737_init_device(dev))) {</div><div class='ctx'> 		dev_err(dev, "Failed to initialize device.\n");</div><div class='del'>-		goto exit_detach;</div><div class='add'>+		goto exit_kfree;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Create sysfs files */</div><div class='ctx'> 	if ((err = dme1737_create_files(dev))) {</div><div class='ctx'> 		dev_err(dev, "Failed to create sysfs files.\n");</div><div class='del'>-		goto exit_detach;</div><div class='add'>+		goto exit_kfree;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Register device */</div><div class='hunk'>@@ -2281,45 +2275,40 @@ static int dme1737_i2c_detect(struct i2c_adapter *adapter, int address,</div><div class='ctx'> </div><div class='ctx'> exit_remove:</div><div class='ctx'> 	dme1737_remove_files(dev);</div><div class='del'>-exit_detach:</div><div class='del'>-	i2c_detach_client(client);</div><div class='ctx'> exit_kfree:</div><div class='ctx'> 	kfree(data);</div><div class='ctx'> exit:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dme1737_i2c_attach_adapter(struct i2c_adapter *adapter)</div><div class='del'>-{</div><div class='del'>-	if (!(adapter-&gt;class &amp; I2C_CLASS_HWMON)) {</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return i2c_probe(adapter, &amp;addr_data, dme1737_i2c_detect);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dme1737_i2c_detach_client(struct i2c_client *client)</div><div class='add'>+static int dme1737_i2c_remove(struct i2c_client *client)</div><div class='ctx'> {</div><div class='ctx'> 	struct dme1737_data *data = i2c_get_clientdata(client);</div><div class='del'>-	int err;</div><div class='ctx'> </div><div class='ctx'> 	hwmon_device_unregister(data-&gt;hwmon_dev);</div><div class='ctx'> 	dme1737_remove_files(&amp;client-&gt;dev);</div><div class='ctx'> </div><div class='del'>-	if ((err = i2c_detach_client(client))) {</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	kfree(data);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static const struct i2c_device_id dme1737_id[] = {</div><div class='add'>+	{ "dme1737", dme1737 },</div><div class='add'>+	{ "sch5027", sch5027 },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(i2c, dme1737_id);</div><div class='add'>+</div><div class='ctx'> static struct i2c_driver dme1737_i2c_driver = {</div><div class='add'>+	.class = I2C_CLASS_HWMON,</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		.name = "dme1737",</div><div class='ctx'> 	},</div><div class='del'>-	.attach_adapter	= dme1737_i2c_attach_adapter,</div><div class='del'>-	.detach_client = dme1737_i2c_detach_client,</div><div class='add'>+	.probe = dme1737_i2c_probe,</div><div class='add'>+	.remove = dme1737_i2c_remove,</div><div class='add'>+	.id_table = dme1737_id,</div><div class='add'>+	.detect = dme1737_i2c_detect,</div><div class='add'>+	.address_data = &amp;addr_data,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* ---------------------------------------------------------------------</div><div class='hunk'>@@ -2403,7 +2392,6 @@ static int __devinit dme1737_isa_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	u8 company, device;</div><div class='ctx'> 	struct resource *res;</div><div class='del'>-	struct i2c_client *client;</div><div class='ctx'> 	struct dme1737_data *data;</div><div class='ctx'> 	struct device *dev = &amp;pdev-&gt;dev;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -2422,15 +2410,13 @@ static int __devinit dme1737_isa_probe(struct platform_device *pdev)</div><div class='ctx'> 		goto exit_release_region;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	client = &amp;data-&gt;client;</div><div class='del'>-	i2c_set_clientdata(client, data);</div><div class='del'>-	client-&gt;addr = res-&gt;start;</div><div class='add'>+	data-&gt;addr = res-&gt;start;</div><div class='ctx'> 	platform_set_drvdata(pdev, data);</div><div class='ctx'> </div><div class='ctx'> 	/* Skip chip detection if module is loaded with force_id parameter */</div><div class='ctx'> 	if (!force_id) {</div><div class='del'>-		company = dme1737_read(client, DME1737_REG_COMPANY);</div><div class='del'>-		device = dme1737_read(client, DME1737_REG_DEVICE);</div><div class='add'>+		company = dme1737_read(data, DME1737_REG_COMPANY);</div><div class='add'>+		device = dme1737_read(data, DME1737_REG_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 		if (!((company == DME1737_COMPANY_SMSC) &amp;&amp;</div><div class='ctx'> 		      (device == SCH311X_DEVICE))) {</div><div class='hunk'>@@ -2441,10 +2427,10 @@ static int __devinit dme1737_isa_probe(struct platform_device *pdev)</div><div class='ctx'> 	data-&gt;type = sch311x;</div><div class='ctx'> </div><div class='ctx'> 	/* Fill in the remaining client fields and initialize the mutex */</div><div class='del'>-	strlcpy(client-&gt;name, "sch311x", I2C_NAME_SIZE);</div><div class='add'>+	data-&gt;name = "sch311x";</div><div class='ctx'> 	mutex_init(&amp;data-&gt;update_lock);</div><div class='ctx'> </div><div class='del'>-	dev_info(dev, "Found a SCH311x chip at 0x%04x\n", client-&gt;addr);</div><div class='add'>+	dev_info(dev, "Found a SCH311x chip at 0x%04x\n", data-&gt;addr);</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize the chip */</div><div class='ctx'> 	if ((err = dme1737_init_device(dev))) {</div><div class='hunk'>@@ -2485,7 +2471,7 @@ static int __devexit dme1737_isa_remove(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	hwmon_device_unregister(data-&gt;hwmon_dev);</div><div class='ctx'> 	dme1737_remove_files(&amp;pdev-&gt;dev);</div><div class='del'>-	release_region(data-&gt;client.addr, DME1737_EXTENT);</div><div class='add'>+	release_region(data-&gt;addr, DME1737_EXTENT);</div><div class='ctx'> 	platform_set_drvdata(pdev, NULL);</div><div class='ctx'> 	kfree(data);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/hwmon/hwmon.c b/drivers/hwmon/hwmon.c<br/>index 7321a88a5112..076a59cdabe9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hwmon/hwmon.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/hwmon/hwmon.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hwmon/hwmon.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hwmon/hwmon.c</a></div><div class='hunk'>@@ -55,8 +55,8 @@ again:</div><div class='ctx'> 		return ERR_PTR(err);</div><div class='ctx'> </div><div class='ctx'> 	id = id &amp; MAX_ID_MASK;</div><div class='del'>-	hwdev = device_create_drvdata(hwmon_class, dev, MKDEV(0, 0), NULL,</div><div class='del'>-				      HWMON_ID_FORMAT, id);</div><div class='add'>+	hwdev = device_create(hwmon_class, dev, MKDEV(0, 0), NULL,</div><div class='add'>+			      HWMON_ID_FORMAT, id);</div><div class='ctx'> </div><div class='ctx'> 	if (IS_ERR(hwdev)) {</div><div class='ctx'> 		spin_lock(&amp;idr_lock);</div><div class='head'>diff --git a/drivers/hwmon/ibmaem.c b/drivers/hwmon/ibmaem.c<br/>index 0f70dc204105..7b0ed5dea399 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hwmon/ibmaem.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/hwmon/ibmaem.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hwmon/ibmaem.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hwmon/ibmaem.c</a></div><div class='hunk'>@@ -1118,3 +1118,10 @@ MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='ctx'> module_init(aem_init);</div><div class='ctx'> module_exit(aem_exit);</div><div class='add'>+</div><div class='add'>+MODULE_ALIAS("dmi:bvnIBM:*:pnIBMSystemx3350-*");</div><div class='add'>+MODULE_ALIAS("dmi:bvnIBM:*:pnIBMSystemx3550-*");</div><div class='add'>+MODULE_ALIAS("dmi:bvnIBM:*:pnIBMSystemx3650-*");</div><div class='add'>+MODULE_ALIAS("dmi:bvnIBM:*:pnIBMSystemx3655-*");</div><div class='add'>+MODULE_ALIAS("dmi:bvnIBM:*:pnIBMSystemx3755-*");</div><div class='add'>+MODULE_ALIAS("dmi:bvnIBM:*:pnIBM3850M2/x3950M2-*");</div><div class='head'>diff --git a/drivers/hwmon/ibmpex.c b/drivers/hwmon/ibmpex.c<br/>index 4e9b19c6732f..537d9fb2ff88 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hwmon/ibmpex.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/hwmon/ibmpex.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hwmon/ibmpex.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hwmon/ibmpex.c</a></div><div class='hunk'>@@ -608,3 +608,9 @@ MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='ctx'> module_init(ibmpex_init);</div><div class='ctx'> module_exit(ibmpex_exit);</div><div class='add'>+</div><div class='add'>+MODULE_ALIAS("dmi:bvnIBM:*:pnIBMSystemx3350-*");</div><div class='add'>+MODULE_ALIAS("dmi:bvnIBM:*:pnIBMSystemx3550-*");</div><div class='add'>+MODULE_ALIAS("dmi:bvnIBM:*:pnIBMSystemx3650-*");</div><div class='add'>+MODULE_ALIAS("dmi:bvnIBM:*:pnIBMSystemx3655-*");</div><div class='add'>+MODULE_ALIAS("dmi:bvnIBM:*:pnIBMSystemx3755-*");</div><div class='head'>diff --git a/drivers/hwmon/it87.c b/drivers/hwmon/it87.c<br/>index d793cc011990..b74c95735f95 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hwmon/it87.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/hwmon/it87.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hwmon/it87.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hwmon/it87.c</a></div><div class='hunk'>@@ -477,7 +477,7 @@ static ssize_t show_sensor(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	if (reg &amp; (1 &lt;&lt; nr))</div><div class='ctx'> 		return sprintf(buf, "3\n");  /* thermal diode */</div><div class='ctx'> 	if (reg &amp; (8 &lt;&lt; nr))</div><div class='del'>-		return sprintf(buf, "2\n");  /* thermistor */</div><div class='add'>+		return sprintf(buf, "4\n");  /* thermistor */</div><div class='ctx'> 	return sprintf(buf, "0\n");      /* disabled */</div><div class='ctx'> }</div><div class='ctx'> static ssize_t set_sensor(struct device *dev, struct device_attribute *attr,</div><div class='hunk'>@@ -493,10 +493,15 @@ static ssize_t set_sensor(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> </div><div class='ctx'> 	data-&gt;sensor &amp;= ~(1 &lt;&lt; nr);</div><div class='ctx'> 	data-&gt;sensor &amp;= ~(8 &lt;&lt; nr);</div><div class='del'>-	/* 3 = thermal diode; 2 = thermistor; 0 = disabled */</div><div class='add'>+	if (val == 2) {	/* backwards compatibility */</div><div class='add'>+		dev_warn(dev, "Sensor type 2 is deprecated, please use 4 "</div><div class='add'>+			 "instead\n");</div><div class='add'>+		val = 4;</div><div class='add'>+	}</div><div class='add'>+	/* 3 = thermal diode; 4 = thermistor; 0 = disabled */</div><div class='ctx'> 	if (val == 3)</div><div class='ctx'> 	    data-&gt;sensor |= 1 &lt;&lt; nr;</div><div class='del'>-	else if (val == 2)</div><div class='add'>+	else if (val == 4)</div><div class='ctx'> 	    data-&gt;sensor |= 8 &lt;&lt; nr;</div><div class='ctx'> 	else if (val != 0) {</div><div class='ctx'> 		mutex_unlock(&amp;data-&gt;update_lock);</div><div class='head'>diff --git a/drivers/hwmon/lm78.c b/drivers/hwmon/lm78.c<br/>index ed7859f0e16a..b5e3b2851698 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hwmon/lm78.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/hwmon/lm78.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hwmon/lm78.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hwmon/lm78.c</a></div><div class='hunk'>@@ -114,25 +114,16 @@ static inline int TEMP_FROM_REG(s8 val)</div><div class='ctx'> </div><div class='ctx'> #define DIV_FROM_REG(val) (1 &lt;&lt; (val))</div><div class='ctx'> </div><div class='del'>-/* There are some complications in a module like this. First off, LM78 chips</div><div class='del'>-   may be both present on the SMBus and the ISA bus, and we have to handle</div><div class='del'>-   those cases separately at some places. Second, there might be several</div><div class='del'>-   LM78 chips available (well, actually, that is probably never done; but</div><div class='del'>-   it is a clean illustration of how to handle a case like that). Finally,</div><div class='del'>-   a specific chip may be attached to *both* ISA and SMBus, and we would</div><div class='del'>-   not like to detect it double. Fortunately, in the case of the LM78 at</div><div class='del'>-   least, a register tells us what SMBus address we are on, so that helps</div><div class='del'>-   a bit - except if there could be more than one SMBus. Groan. No solution</div><div class='del'>-   for this yet. */</div><div class='del'>-</div><div class='del'>-/* For ISA chips, we abuse the i2c_client addr and name fields. We also use</div><div class='del'>-   the driver field to differentiate between I2C and ISA chips. */</div><div class='ctx'> struct lm78_data {</div><div class='del'>-	struct i2c_client client;</div><div class='add'>+	struct i2c_client *client;</div><div class='ctx'> 	struct device *hwmon_dev;</div><div class='ctx'> 	struct mutex lock;</div><div class='ctx'> 	enum chips type;</div><div class='ctx'> </div><div class='add'>+	/* For ISA device only */</div><div class='add'>+	const char *name;</div><div class='add'>+	int isa_addr;</div><div class='add'>+</div><div class='ctx'> 	struct mutex update_lock;</div><div class='ctx'> 	char valid;		/* !=0 if following fields are valid */</div><div class='ctx'> 	unsigned long last_updated;	/* In jiffies */</div><div class='hunk'>@@ -151,9 +142,11 @@ struct lm78_data {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int lm78_attach_adapter(struct i2c_adapter *adapter);</div><div class='del'>-static int lm78_detect(struct i2c_adapter *adapter, int address, int kind);</div><div class='del'>-static int lm78_detach_client(struct i2c_client *client);</div><div class='add'>+static int lm78_i2c_detect(struct i2c_client *client, int kind,</div><div class='add'>+			   struct i2c_board_info *info);</div><div class='add'>+static int lm78_i2c_probe(struct i2c_client *client,</div><div class='add'>+			  const struct i2c_device_id *id);</div><div class='add'>+static int lm78_i2c_remove(struct i2c_client *client);</div><div class='ctx'> </div><div class='ctx'> static int __devinit lm78_isa_probe(struct platform_device *pdev);</div><div class='ctx'> static int __devexit lm78_isa_remove(struct platform_device *pdev);</div><div class='hunk'>@@ -164,12 +157,23 @@ static struct lm78_data *lm78_update_device(struct device *dev);</div><div class='ctx'> static void lm78_init_device(struct lm78_data *data);</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+static const struct i2c_device_id lm78_i2c_id[] = {</div><div class='add'>+	{ "lm78", lm78 },</div><div class='add'>+	{ "lm79", lm79 },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(i2c, lm78_i2c_id);</div><div class='add'>+</div><div class='ctx'> static struct i2c_driver lm78_driver = {</div><div class='add'>+	.class		= I2C_CLASS_HWMON,</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		.name	= "lm78",</div><div class='ctx'> 	},</div><div class='del'>-	.attach_adapter	= lm78_attach_adapter,</div><div class='del'>-	.detach_client	= lm78_detach_client,</div><div class='add'>+	.probe		= lm78_i2c_probe,</div><div class='add'>+	.remove		= lm78_i2c_remove,</div><div class='add'>+	.id_table	= lm78_i2c_id,</div><div class='add'>+	.detect		= lm78_i2c_detect,</div><div class='add'>+	.address_data	= &amp;addr_data,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct platform_driver lm78_isa_driver = {</div><div class='hunk'>@@ -454,17 +458,6 @@ static SENSOR_DEVICE_ATTR(fan2_alarm, S_IRUGO, show_alarm, NULL, 7);</div><div class='ctx'> static SENSOR_DEVICE_ATTR(fan3_alarm, S_IRUGO, show_alarm, NULL, 11);</div><div class='ctx'> static SENSOR_DEVICE_ATTR(temp1_alarm, S_IRUGO, show_alarm, NULL, 4);</div><div class='ctx'> </div><div class='del'>-/* This function is called when:</div><div class='del'>-     * lm78_driver is inserted (when this module is loaded), for each</div><div class='del'>-       available adapter</div><div class='del'>-     * when a new adapter is inserted (and lm78_driver is still present) */</div><div class='del'>-static int lm78_attach_adapter(struct i2c_adapter *adapter)</div><div class='del'>-{</div><div class='del'>-	if (!(adapter-&gt;class &amp; I2C_CLASS_HWMON))</div><div class='del'>-		return 0;</div><div class='del'>-	return i2c_probe(adapter, &amp;addr_data, lm78_detect);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static struct attribute *lm78_attributes[] = {</div><div class='ctx'> 	&amp;sensor_dev_attr_in0_input.dev_attr.attr,</div><div class='ctx'> 	&amp;sensor_dev_attr_in0_min.dev_attr.attr,</div><div class='hunk'>@@ -527,54 +520,77 @@ static ssize_t show_name(struct device *dev, struct device_attribute</div><div class='ctx'> {</div><div class='ctx'> 	struct lm78_data *data = dev_get_drvdata(dev);</div><div class='ctx'> </div><div class='del'>-	return sprintf(buf, "%s\n", data-&gt;client.name);</div><div class='add'>+	return sprintf(buf, "%s\n", data-&gt;name);</div><div class='ctx'> }</div><div class='ctx'> static DEVICE_ATTR(name, S_IRUGO, show_name, NULL);</div><div class='ctx'> </div><div class='del'>-/* This function is called by i2c_probe */</div><div class='del'>-static int lm78_detect(struct i2c_adapter *adapter, int address, int kind)</div><div class='add'>+/* Returns 1 if the I2C chip appears to be an alias of the ISA chip */</div><div class='add'>+static int lm78_alias_detect(struct i2c_client *client, u8 chipid)</div><div class='ctx'> {</div><div class='del'>-	int i, err;</div><div class='del'>-	struct i2c_client *new_client;</div><div class='del'>-	struct lm78_data *data;</div><div class='del'>-	const char *client_name = "";</div><div class='add'>+	struct lm78_data *isa;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-	if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) {</div><div class='del'>-		err = -ENODEV;</div><div class='del'>-		goto ERROR1;</div><div class='add'>+	if (!pdev)	/* No ISA chip */</div><div class='add'>+		return 0;</div><div class='add'>+	isa = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	if (lm78_read_value(isa, LM78_REG_I2C_ADDR) != client-&gt;addr)</div><div class='add'>+		return 0;	/* Address doesn't match */</div><div class='add'>+	if ((lm78_read_value(isa, LM78_REG_CHIPID) &amp; 0xfe) != (chipid &amp; 0xfe))</div><div class='add'>+		return 0;	/* Chip type doesn't match */</div><div class='add'>+</div><div class='add'>+	/* We compare all the limit registers, the config register and the</div><div class='add'>+	 * interrupt mask registers */</div><div class='add'>+	for (i = 0x2b; i &lt;= 0x3d; i++) {</div><div class='add'>+		if (lm78_read_value(isa, i) !=</div><div class='add'>+		    i2c_smbus_read_byte_data(client, i))</div><div class='add'>+			return 0;</div><div class='ctx'> 	}</div><div class='add'>+	if (lm78_read_value(isa, LM78_REG_CONFIG) !=</div><div class='add'>+	    i2c_smbus_read_byte_data(client, LM78_REG_CONFIG))</div><div class='add'>+		return 0;</div><div class='add'>+	for (i = 0x43; i &lt;= 0x46; i++) {</div><div class='add'>+		if (lm78_read_value(isa, i) !=</div><div class='add'>+		    i2c_smbus_read_byte_data(client, i))</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	/* OK. For now, we presume we have a valid client. We now create the</div><div class='del'>-	   client structure, even though we cannot fill it completely yet.</div><div class='del'>-	   But it allows us to access lm78_{read,write}_value. */</div><div class='add'>+static int lm78_i2c_detect(struct i2c_client *client, int kind,</div><div class='add'>+			   struct i2c_board_info *info)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	struct lm78_data *isa = pdev ? platform_get_drvdata(pdev) : NULL;</div><div class='add'>+	const char *client_name;</div><div class='add'>+	struct i2c_adapter *adapter = client-&gt;adapter;</div><div class='add'>+	int address = client-&gt;addr;</div><div class='ctx'> </div><div class='del'>-	if (!(data = kzalloc(sizeof(struct lm78_data), GFP_KERNEL))) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto ERROR1;</div><div class='del'>-	}</div><div class='add'>+	if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	new_client = &amp;data-&gt;client;</div><div class='del'>-	i2c_set_clientdata(new_client, data);</div><div class='del'>-	new_client-&gt;addr = address;</div><div class='del'>-	new_client-&gt;adapter = adapter;</div><div class='del'>-	new_client-&gt;driver = &amp;lm78_driver;</div><div class='add'>+	/* We block updates of the ISA device to minimize the risk of</div><div class='add'>+	   concurrent access to the same LM78 chip through different</div><div class='add'>+	   interfaces. */</div><div class='add'>+	if (isa)</div><div class='add'>+		mutex_lock(&amp;isa-&gt;update_lock);</div><div class='ctx'> </div><div class='del'>-	/* Now, we do the remaining detection. */</div><div class='ctx'> 	if (kind &lt; 0) {</div><div class='del'>-		if (lm78_read_value(data, LM78_REG_CONFIG) &amp; 0x80) {</div><div class='del'>-			err = -ENODEV;</div><div class='del'>-			goto ERROR2;</div><div class='del'>-		}</div><div class='del'>-		if (lm78_read_value(data, LM78_REG_I2C_ADDR) !=</div><div class='del'>-		    address) {</div><div class='del'>-			err = -ENODEV;</div><div class='del'>-			goto ERROR2;</div><div class='del'>-		}</div><div class='add'>+		if ((i2c_smbus_read_byte_data(client, LM78_REG_CONFIG) &amp; 0x80)</div><div class='add'>+		 || i2c_smbus_read_byte_data(client, LM78_REG_I2C_ADDR)</div><div class='add'>+		    != address)</div><div class='add'>+			goto err_nodev;</div><div class='add'>+</div><div class='add'>+		/* Explicitly prevent the misdetection of Winbond chips */</div><div class='add'>+		i = i2c_smbus_read_byte_data(client, 0x4f);</div><div class='add'>+		if (i == 0xa3 || i == 0x5c)</div><div class='add'>+			goto err_nodev;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Determine the chip type. */</div><div class='ctx'> 	if (kind &lt;= 0) {</div><div class='del'>-		i = lm78_read_value(data, LM78_REG_CHIPID);</div><div class='add'>+		i = i2c_smbus_read_byte_data(client, LM78_REG_CHIPID);</div><div class='ctx'> 		if (i == 0x00 || i == 0x20	/* LM78 */</div><div class='ctx'> 		 || i == 0x40)			/* LM78-J */</div><div class='ctx'> 			kind = lm78;</div><div class='hunk'>@@ -586,33 +602,59 @@ static int lm78_detect(struct i2c_adapter *adapter, int address, int kind)</div><div class='ctx'> 					"parameter for unknown chip at "</div><div class='ctx'> 					"adapter %d, address 0x%02x\n",</div><div class='ctx'> 					i2c_adapter_id(adapter), address);</div><div class='del'>-			err = -ENODEV;</div><div class='del'>-			goto ERROR2;</div><div class='add'>+			goto err_nodev;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (lm78_alias_detect(client, i)) {</div><div class='add'>+			dev_dbg(&amp;adapter-&gt;dev, "Device at 0x%02x appears to "</div><div class='add'>+				"be the same as ISA device\n", address);</div><div class='add'>+			goto err_nodev;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (kind == lm78) {</div><div class='del'>-		client_name = "lm78";</div><div class='del'>-	} else if (kind == lm79) {</div><div class='add'>+	if (isa)</div><div class='add'>+		mutex_unlock(&amp;isa-&gt;update_lock);</div><div class='add'>+</div><div class='add'>+	switch (kind) {</div><div class='add'>+	case lm79:</div><div class='ctx'> 		client_name = "lm79";</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		client_name = "lm78";</div><div class='ctx'> 	}</div><div class='add'>+	strlcpy(info-&gt;type, client_name, I2C_NAME_SIZE);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+ err_nodev:</div><div class='add'>+	if (isa)</div><div class='add'>+		mutex_unlock(&amp;isa-&gt;update_lock);</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lm78_i2c_probe(struct i2c_client *client,</div><div class='add'>+			  const struct i2c_device_id *id)</div><div class='add'>+{</div><div class='add'>+	struct lm78_data *data;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	/* Fill in the remaining client fields and put into the global list */</div><div class='del'>-	strlcpy(new_client-&gt;name, client_name, I2C_NAME_SIZE);</div><div class='del'>-	data-&gt;type = kind;</div><div class='add'>+	data = kzalloc(sizeof(struct lm78_data), GFP_KERNEL);</div><div class='add'>+	if (!data)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	/* Tell the I2C layer a new client has arrived */</div><div class='del'>-	if ((err = i2c_attach_client(new_client)))</div><div class='del'>-		goto ERROR2;</div><div class='add'>+	i2c_set_clientdata(client, data);</div><div class='add'>+	data-&gt;client = client;</div><div class='add'>+	data-&gt;type = id-&gt;driver_data;</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize the LM78 chip */</div><div class='ctx'> 	lm78_init_device(data);</div><div class='ctx'> </div><div class='ctx'> 	/* Register sysfs hooks */</div><div class='del'>-	if ((err = sysfs_create_group(&amp;new_client-&gt;dev.kobj, &amp;lm78_group)))</div><div class='add'>+	err = sysfs_create_group(&amp;client-&gt;dev.kobj, &amp;lm78_group);</div><div class='add'>+	if (err)</div><div class='ctx'> 		goto ERROR3;</div><div class='ctx'> </div><div class='del'>-	data-&gt;hwmon_dev = hwmon_device_register(&amp;new_client-&gt;dev);</div><div class='add'>+	data-&gt;hwmon_dev = hwmon_device_register(&amp;client-&gt;dev);</div><div class='ctx'> 	if (IS_ERR(data-&gt;hwmon_dev)) {</div><div class='ctx'> 		err = PTR_ERR(data-&gt;hwmon_dev);</div><div class='ctx'> 		goto ERROR4;</div><div class='hunk'>@@ -621,26 +663,18 @@ static int lm78_detect(struct i2c_adapter *adapter, int address, int kind)</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> ERROR4:</div><div class='del'>-	sysfs_remove_group(&amp;new_client-&gt;dev.kobj, &amp;lm78_group);</div><div class='add'>+	sysfs_remove_group(&amp;client-&gt;dev.kobj, &amp;lm78_group);</div><div class='ctx'> ERROR3:</div><div class='del'>-	i2c_detach_client(new_client);</div><div class='del'>-ERROR2:</div><div class='ctx'> 	kfree(data);</div><div class='del'>-ERROR1:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int lm78_detach_client(struct i2c_client *client)</div><div class='add'>+static int lm78_i2c_remove(struct i2c_client *client)</div><div class='ctx'> {</div><div class='ctx'> 	struct lm78_data *data = i2c_get_clientdata(client);</div><div class='del'>-	int err;</div><div class='ctx'> </div><div class='ctx'> 	hwmon_device_unregister(data-&gt;hwmon_dev);</div><div class='ctx'> 	sysfs_remove_group(&amp;client-&gt;dev.kobj, &amp;lm78_group);</div><div class='del'>-</div><div class='del'>-	if ((err = i2c_detach_client(client)))</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='ctx'> 	kfree(data);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -651,11 +685,10 @@ static int __devinit lm78_isa_probe(struct platform_device *pdev)</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct lm78_data *data;</div><div class='ctx'> 	struct resource *res;</div><div class='del'>-	const char *name;</div><div class='ctx'> </div><div class='ctx'> 	/* Reserve the ISA region */</div><div class='ctx'> 	res = platform_get_resource(pdev, IORESOURCE_IO, 0);</div><div class='del'>-	if (!request_region(res-&gt;start, LM78_EXTENT, "lm78")) {</div><div class='add'>+	if (!request_region(res-&gt;start + LM78_ADDR_REG_OFFSET, 2, "lm78")) {</div><div class='ctx'> 		err = -EBUSY;</div><div class='ctx'> 		goto exit;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -665,18 +698,16 @@ static int __devinit lm78_isa_probe(struct platform_device *pdev)</div><div class='ctx'> 		goto exit_release_region;</div><div class='ctx'> 	}</div><div class='ctx'> 	mutex_init(&amp;data-&gt;lock);</div><div class='del'>-	data-&gt;client.addr = res-&gt;start;</div><div class='del'>-	i2c_set_clientdata(&amp;data-&gt;client, data);</div><div class='add'>+	data-&gt;isa_addr = res-&gt;start;</div><div class='ctx'> 	platform_set_drvdata(pdev, data);</div><div class='ctx'> </div><div class='ctx'> 	if (lm78_read_value(data, LM78_REG_CHIPID) &amp; 0x80) {</div><div class='ctx'> 		data-&gt;type = lm79;</div><div class='del'>-		name = "lm79";</div><div class='add'>+		data-&gt;name = "lm79";</div><div class='ctx'> 	} else {</div><div class='ctx'> 		data-&gt;type = lm78;</div><div class='del'>-		name = "lm78";</div><div class='add'>+		data-&gt;name = "lm78";</div><div class='ctx'> 	}</div><div class='del'>-	strlcpy(data-&gt;client.name, name, I2C_NAME_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize the LM78 chip */</div><div class='ctx'> 	lm78_init_device(data);</div><div class='hunk'>@@ -699,7 +730,7 @@ static int __devinit lm78_isa_probe(struct platform_device *pdev)</div><div class='ctx'> 	device_remove_file(&amp;pdev-&gt;dev, &amp;dev_attr_name);</div><div class='ctx'> 	kfree(data);</div><div class='ctx'>  exit_release_region:</div><div class='del'>-	release_region(res-&gt;start, LM78_EXTENT);</div><div class='add'>+	release_region(res-&gt;start + LM78_ADDR_REG_OFFSET, 2);</div><div class='ctx'>  exit:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -707,13 +738,16 @@ static int __devinit lm78_isa_probe(struct platform_device *pdev)</div><div class='ctx'> static int __devexit lm78_isa_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct lm78_data *data = platform_get_drvdata(pdev);</div><div class='add'>+	struct resource *res;</div><div class='ctx'> </div><div class='ctx'> 	hwmon_device_unregister(data-&gt;hwmon_dev);</div><div class='ctx'> 	sysfs_remove_group(&amp;pdev-&gt;dev.kobj, &amp;lm78_group);</div><div class='ctx'> 	device_remove_file(&amp;pdev-&gt;dev, &amp;dev_attr_name);</div><div class='del'>-	release_region(data-&gt;client.addr, LM78_EXTENT);</div><div class='ctx'> 	kfree(data);</div><div class='ctx'> </div><div class='add'>+	res = platform_get_resource(pdev, IORESOURCE_IO, 0);</div><div class='add'>+	release_region(res-&gt;start + LM78_ADDR_REG_OFFSET, 2);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -724,13 +758,13 @@ static int __devexit lm78_isa_remove(struct platform_device *pdev)</div><div class='ctx'>    would slow down the LM78 access and should not be necessary.  */</div><div class='ctx'> static int lm78_read_value(struct lm78_data *data, u8 reg)</div><div class='ctx'> {</div><div class='del'>-	struct i2c_client *client = &amp;data-&gt;client;</div><div class='add'>+	struct i2c_client *client = data-&gt;client;</div><div class='ctx'> </div><div class='del'>-	if (!client-&gt;driver) { /* ISA device */</div><div class='add'>+	if (!client) { /* ISA device */</div><div class='ctx'> 		int res;</div><div class='ctx'> 		mutex_lock(&amp;data-&gt;lock);</div><div class='del'>-		outb_p(reg, client-&gt;addr + LM78_ADDR_REG_OFFSET);</div><div class='del'>-		res = inb_p(client-&gt;addr + LM78_DATA_REG_OFFSET);</div><div class='add'>+		outb_p(reg, data-&gt;isa_addr + LM78_ADDR_REG_OFFSET);</div><div class='add'>+		res = inb_p(data-&gt;isa_addr + LM78_DATA_REG_OFFSET);</div><div class='ctx'> 		mutex_unlock(&amp;data-&gt;lock);</div><div class='ctx'> 		return res;</div><div class='ctx'> 	} else</div><div class='hunk'>@@ -746,12 +780,12 @@ static int lm78_read_value(struct lm78_data *data, u8 reg)</div><div class='ctx'>    nowhere else be necessary! */</div><div class='ctx'> static int lm78_write_value(struct lm78_data *data, u8 reg, u8 value)</div><div class='ctx'> {</div><div class='del'>-	struct i2c_client *client = &amp;data-&gt;client;</div><div class='add'>+	struct i2c_client *client = data-&gt;client;</div><div class='ctx'> </div><div class='del'>-	if (!client-&gt;driver) { /* ISA device */</div><div class='add'>+	if (!client) { /* ISA device */</div><div class='ctx'> 		mutex_lock(&amp;data-&gt;lock);</div><div class='del'>-		outb_p(reg, client-&gt;addr + LM78_ADDR_REG_OFFSET);</div><div class='del'>-		outb_p(value, client-&gt;addr + LM78_DATA_REG_OFFSET);</div><div class='add'>+		outb_p(reg, data-&gt;isa_addr + LM78_ADDR_REG_OFFSET);</div><div class='add'>+		outb_p(value, data-&gt;isa_addr + LM78_DATA_REG_OFFSET);</div><div class='ctx'> 		mutex_unlock(&amp;data-&gt;lock);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	} else</div><div class='hunk'>@@ -837,8 +871,17 @@ static int __init lm78_isa_found(unsigned short address)</div><div class='ctx'> {</div><div class='ctx'> 	int val, save, found = 0;</div><div class='ctx'> </div><div class='del'>-	if (!request_region(address, LM78_EXTENT, "lm78"))</div><div class='add'>+	/* We have to request the region in two parts because some</div><div class='add'>+	   boards declare base+4 to base+7 as a PNP device */</div><div class='add'>+	if (!request_region(address, 4, "lm78")) {</div><div class='add'>+		pr_debug("lm78: Failed to request low part of region\n");</div><div class='ctx'> 		return 0;</div><div class='add'>+	}</div><div class='add'>+	if (!request_region(address + 4, 4, "lm78")) {</div><div class='add'>+		pr_debug("lm78: Failed to request high part of region\n");</div><div class='add'>+		release_region(address, 4);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> #define REALLY_SLOW_IO</div><div class='ctx'> 	/* We need the timeouts for at least some LM78-like</div><div class='hunk'>@@ -901,7 +944,8 @@ static int __init lm78_isa_found(unsigned short address)</div><div class='ctx'> 			val &amp; 0x80 ? "LM79" : "LM78", (int)address);</div><div class='ctx'> </div><div class='ctx'>  release:</div><div class='del'>-	release_region(address, LM78_EXTENT);</div><div class='add'>+	release_region(address + 4, 4);</div><div class='add'>+	release_region(address, 4);</div><div class='ctx'> 	return found;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -949,14 +993,12 @@ static int __init sm_lm78_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int res;</div><div class='ctx'> </div><div class='del'>-	res = i2c_add_driver(&amp;lm78_driver);</div><div class='del'>-	if (res)</div><div class='del'>-		goto exit;</div><div class='del'>-</div><div class='add'>+	/* We register the ISA device first, so that we can skip the</div><div class='add'>+	 * registration of an I2C interface to the same device. */</div><div class='ctx'> 	if (lm78_isa_found(isa_address)) {</div><div class='ctx'> 		res = platform_driver_register(&amp;lm78_isa_driver);</div><div class='ctx'> 		if (res)</div><div class='del'>-			goto exit_unreg_i2c_driver;</div><div class='add'>+			goto exit;</div><div class='ctx'> </div><div class='ctx'> 		/* Sets global pdev as a side effect */</div><div class='ctx'> 		res = lm78_isa_device_add(isa_address);</div><div class='hunk'>@@ -964,12 +1006,16 @@ static int __init sm_lm78_init(void)</div><div class='ctx'> 			goto exit_unreg_isa_driver;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	res = i2c_add_driver(&amp;lm78_driver);</div><div class='add'>+	if (res)</div><div class='add'>+		goto exit_unreg_isa_device;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='add'>+ exit_unreg_isa_device:</div><div class='add'>+	platform_device_unregister(pdev);</div><div class='ctx'>  exit_unreg_isa_driver:</div><div class='ctx'> 	platform_driver_unregister(&amp;lm78_isa_driver);</div><div class='del'>- exit_unreg_i2c_driver:</div><div class='del'>-	i2c_del_driver(&amp;lm78_driver);</div><div class='ctx'>  exit:</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/hwmon/lm85.c b/drivers/hwmon/lm85.c<br/>index 12d446f54f97..3ff0285396fa 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hwmon/lm85.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/hwmon/lm85.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hwmon/lm85.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hwmon/lm85.c</a></div><div class='hunk'>@@ -5,6 +5,7 @@</div><div class='ctx'>     Copyright (c) 2002, 2003  Philip Pokorny &lt;ppokorny@penguincomputing.com&gt;</div><div class='ctx'>     Copyright (c) 2003        Margit Schubert-While &lt;margitsw@t-online.de&gt;</div><div class='ctx'>     Copyright (c) 2004        Justin Thiessen &lt;jthiessen@penguincomputing.com&gt;</div><div class='add'>+    Copyright (C) 2007, 2008  Jean Delvare &lt;khali@linux-fr.org&gt;</div><div class='ctx'> </div><div class='ctx'>     Chip details at	      &lt;http://www.national.com/ds/LM/LM85.pdf&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -173,40 +174,39 @@ static int RANGE_TO_REG(int range)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	if (range &gt;= lm85_range_map[15])</div><div class='del'>-		return 15;</div><div class='del'>-</div><div class='ctx'> 	/* Find the closest match */</div><div class='del'>-	for (i = 14; i &gt;= 0; --i) {</div><div class='del'>-		if (range &gt;= lm85_range_map[i]) {</div><div class='del'>-			if ((lm85_range_map[i + 1] - range) &lt;</div><div class='del'>-					(range - lm85_range_map[i]))</div><div class='del'>-				return i + 1;</div><div class='del'>-			return i;</div><div class='del'>-		}</div><div class='add'>+	for (i = 0; i &lt; 15; ++i) {</div><div class='add'>+		if (range &lt;= (lm85_range_map[i] + lm85_range_map[i + 1]) / 2)</div><div class='add'>+			break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return i;</div><div class='ctx'> }</div><div class='ctx'> #define RANGE_FROM_REG(val)	lm85_range_map[(val) &amp; 0x0f]</div><div class='ctx'> </div><div class='ctx'> /* These are the PWM frequency encodings */</div><div class='del'>-static const int lm85_freq_map[] = { /* .1 Hz */</div><div class='del'>-	100, 150, 230, 300, 380, 470, 620, 940</div><div class='add'>+static const int lm85_freq_map[8] = { /* 1 Hz */</div><div class='add'>+	10, 15, 23, 30, 38, 47, 61, 94</div><div class='add'>+};</div><div class='add'>+static const int adm1027_freq_map[8] = { /* 1 Hz */</div><div class='add'>+	11, 15, 22, 29, 35, 44, 59, 88</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int FREQ_TO_REG(int freq)</div><div class='add'>+static int FREQ_TO_REG(const int *map, int freq)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	if (freq &gt;= lm85_freq_map[7])</div><div class='del'>-		return 7;</div><div class='add'>+	/* Find the closest match */</div><div class='ctx'> 	for (i = 0; i &lt; 7; ++i)</div><div class='del'>-		if (freq &lt;= lm85_freq_map[i])</div><div class='add'>+		if (freq &lt;= (map[i] + map[i + 1]) / 2)</div><div class='ctx'> 			break;</div><div class='ctx'> 	return i;</div><div class='ctx'> }</div><div class='del'>-#define FREQ_FROM_REG(val)	lm85_freq_map[(val) &amp; 0x07]</div><div class='add'>+</div><div class='add'>+static int FREQ_FROM_REG(const int *map, u8 reg)</div><div class='add'>+{</div><div class='add'>+	return map[reg &amp; 0x07];</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /* Since we can't use strings, I'm abusing these numbers</div><div class='ctx'>  *   to stand in for the following meanings:</div><div class='hunk'>@@ -275,7 +275,6 @@ struct lm85_zone {</div><div class='ctx'> </div><div class='ctx'> struct lm85_autofan {</div><div class='ctx'> 	u8 config;	/* Register value */</div><div class='del'>-	u8 freq;	/* PWM frequency, encoded */</div><div class='ctx'> 	u8 min_pwm;	/* Minimum PWM value, encoded */</div><div class='ctx'> 	u8 min_off;	/* Min PWM or OFF below "limit", flag */</div><div class='ctx'> };</div><div class='hunk'>@@ -283,8 +282,8 @@ struct lm85_autofan {</div><div class='ctx'> /* For each registered chip, we need to keep some data in memory.</div><div class='ctx'>    The structure is dynamically allocated. */</div><div class='ctx'> struct lm85_data {</div><div class='del'>-	struct i2c_client client;</div><div class='ctx'> 	struct device *hwmon_dev;</div><div class='add'>+	const int *freq_map;</div><div class='ctx'> 	enum chips type;</div><div class='ctx'> </div><div class='ctx'> 	struct mutex update_lock;</div><div class='hunk'>@@ -301,6 +300,7 @@ struct lm85_data {</div><div class='ctx'> 	u16 fan[4];		/* Register value */</div><div class='ctx'> 	u16 fan_min[4];		/* Register value */</div><div class='ctx'> 	u8 pwm[3];		/* Register value */</div><div class='add'>+	u8 pwm_freq[3];		/* Register encoding */</div><div class='ctx'> 	u8 temp_ext[3];		/* Decoded values */</div><div class='ctx'> 	u8 in_ext[8];		/* Decoded values */</div><div class='ctx'> 	u8 vid;			/* Register value */</div><div class='hunk'>@@ -310,22 +310,40 @@ struct lm85_data {</div><div class='ctx'> 	struct lm85_zone zone[3];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int lm85_attach_adapter(struct i2c_adapter *adapter);</div><div class='del'>-static int lm85_detect(struct i2c_adapter *adapter, int address,</div><div class='del'>-			int kind);</div><div class='del'>-static int lm85_detach_client(struct i2c_client *client);</div><div class='add'>+static int lm85_detect(struct i2c_client *client, int kind,</div><div class='add'>+		       struct i2c_board_info *info);</div><div class='add'>+static int lm85_probe(struct i2c_client *client,</div><div class='add'>+		      const struct i2c_device_id *id);</div><div class='add'>+static int lm85_remove(struct i2c_client *client);</div><div class='ctx'> </div><div class='ctx'> static int lm85_read_value(struct i2c_client *client, u8 reg);</div><div class='ctx'> static void lm85_write_value(struct i2c_client *client, u8 reg, int value);</div><div class='ctx'> static struct lm85_data *lm85_update_device(struct device *dev);</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+static const struct i2c_device_id lm85_id[] = {</div><div class='add'>+	{ "adm1027", adm1027 },</div><div class='add'>+	{ "adt7463", adt7463 },</div><div class='add'>+	{ "lm85", any_chip },</div><div class='add'>+	{ "lm85b", lm85b },</div><div class='add'>+	{ "lm85c", lm85c },</div><div class='add'>+	{ "emc6d100", emc6d100 },</div><div class='add'>+	{ "emc6d101", emc6d100 },</div><div class='add'>+	{ "emc6d102", emc6d102 },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(i2c, lm85_id);</div><div class='add'>+</div><div class='ctx'> static struct i2c_driver lm85_driver = {</div><div class='add'>+	.class		= I2C_CLASS_HWMON,</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		.name   = "lm85",</div><div class='ctx'> 	},</div><div class='del'>-	.attach_adapter = lm85_attach_adapter,</div><div class='del'>-	.detach_client  = lm85_detach_client,</div><div class='add'>+	.probe		= lm85_probe,</div><div class='add'>+	.remove		= lm85_remove,</div><div class='add'>+	.id_table	= lm85_id,</div><div class='add'>+	.detect		= lm85_detect,</div><div class='add'>+	.address_data	= &amp;addr_data,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -528,11 +546,39 @@ static ssize_t set_pwm_enable(struct device *dev, struct device_attribute</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static ssize_t show_pwm_freq(struct device *dev,</div><div class='add'>+		struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='add'>+	struct lm85_data *data = lm85_update_device(dev);</div><div class='add'>+	return sprintf(buf, "%d\n", FREQ_FROM_REG(data-&gt;freq_map,</div><div class='add'>+						  data-&gt;pwm_freq[nr]));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t set_pwm_freq(struct device *dev,</div><div class='add'>+		struct device_attribute *attr, const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='add'>+	struct i2c_client *client = to_i2c_client(dev);</div><div class='add'>+	struct lm85_data *data = i2c_get_clientdata(client);</div><div class='add'>+	long val = simple_strtol(buf, NULL, 10);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;data-&gt;update_lock);</div><div class='add'>+	data-&gt;pwm_freq[nr] = FREQ_TO_REG(data-&gt;freq_map, val);</div><div class='add'>+	lm85_write_value(client, LM85_REG_AFAN_RANGE(nr),</div><div class='add'>+		(data-&gt;zone[nr].range &lt;&lt; 4)</div><div class='add'>+		| data-&gt;pwm_freq[nr]);</div><div class='add'>+	mutex_unlock(&amp;data-&gt;update_lock);</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #define show_pwm_reg(offset)						\</div><div class='ctx'> static SENSOR_DEVICE_ATTR(pwm##offset, S_IRUGO | S_IWUSR,		\</div><div class='ctx'> 		show_pwm, set_pwm, offset - 1);				\</div><div class='ctx'> static SENSOR_DEVICE_ATTR(pwm##offset##_enable, S_IRUGO | S_IWUSR,	\</div><div class='del'>-		show_pwm_enable, set_pwm_enable, offset - 1)</div><div class='add'>+		show_pwm_enable, set_pwm_enable, offset - 1);		\</div><div class='add'>+static SENSOR_DEVICE_ATTR(pwm##offset##_freq, S_IRUGO | S_IWUSR,	\</div><div class='add'>+		show_pwm_freq, set_pwm_freq, offset - 1)</div><div class='ctx'> </div><div class='ctx'> show_pwm_reg(1);</div><div class='ctx'> show_pwm_reg(2);</div><div class='hunk'>@@ -761,31 +807,6 @@ static ssize_t set_pwm_auto_pwm_minctl(struct device *dev,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_pwm_auto_pwm_freq(struct device *dev,</div><div class='del'>-		struct device_attribute *attr, char *buf)</div><div class='del'>-{</div><div class='del'>-	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='del'>-	struct lm85_data *data = lm85_update_device(dev);</div><div class='del'>-	return sprintf(buf, "%d\n", FREQ_FROM_REG(data-&gt;autofan[nr].freq));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t set_pwm_auto_pwm_freq(struct device *dev,</div><div class='del'>-		struct device_attribute *attr, const char *buf, size_t count)</div><div class='del'>-{</div><div class='del'>-	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='del'>-	struct i2c_client *client = to_i2c_client(dev);</div><div class='del'>-	struct lm85_data *data = i2c_get_clientdata(client);</div><div class='del'>-	long val = simple_strtol(buf, NULL, 10);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;data-&gt;update_lock);</div><div class='del'>-	data-&gt;autofan[nr].freq = FREQ_TO_REG(val);</div><div class='del'>-	lm85_write_value(client, LM85_REG_AFAN_RANGE(nr),</div><div class='del'>-		(data-&gt;zone[nr].range &lt;&lt; 4)</div><div class='del'>-		| data-&gt;autofan[nr].freq);</div><div class='del'>-	mutex_unlock(&amp;data-&gt;update_lock);</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #define pwm_auto(offset)						\</div><div class='ctx'> static SENSOR_DEVICE_ATTR(pwm##offset##_auto_channels,			\</div><div class='ctx'> 		S_IRUGO | S_IWUSR, show_pwm_auto_channels,		\</div><div class='hunk'>@@ -795,10 +816,7 @@ static SENSOR_DEVICE_ATTR(pwm##offset##_auto_pwm_min,			\</div><div class='ctx'> 		set_pwm_auto_pwm_min, offset - 1);			\</div><div class='ctx'> static SENSOR_DEVICE_ATTR(pwm##offset##_auto_pwm_minctl,		\</div><div class='ctx'> 		S_IRUGO | S_IWUSR, show_pwm_auto_pwm_minctl,		\</div><div class='del'>-		set_pwm_auto_pwm_minctl, offset - 1);			\</div><div class='del'>-static SENSOR_DEVICE_ATTR(pwm##offset##_auto_pwm_freq,			\</div><div class='del'>-		S_IRUGO | S_IWUSR, show_pwm_auto_pwm_freq,		\</div><div class='del'>-		set_pwm_auto_pwm_freq, offset - 1);</div><div class='add'>+		set_pwm_auto_pwm_minctl, offset - 1)</div><div class='ctx'> </div><div class='ctx'> pwm_auto(1);</div><div class='ctx'> pwm_auto(2);</div><div class='hunk'>@@ -867,7 +885,7 @@ static ssize_t set_temp_auto_temp_min(struct device *dev,</div><div class='ctx'> 		TEMP_FROM_REG(data-&gt;zone[nr].limit));</div><div class='ctx'> 	lm85_write_value(client, LM85_REG_AFAN_RANGE(nr),</div><div class='ctx'> 		((data-&gt;zone[nr].range &amp; 0x0f) &lt;&lt; 4)</div><div class='del'>-		| (data-&gt;autofan[nr].freq &amp; 0x07));</div><div class='add'>+		| (data-&gt;pwm_freq[nr] &amp; 0x07));</div><div class='ctx'> </div><div class='ctx'> /* Update temp_auto_hyst and temp_auto_off */</div><div class='ctx'> 	data-&gt;zone[nr].hyst = HYST_TO_REG(TEMP_FROM_REG(</div><div class='hunk'>@@ -910,7 +928,7 @@ static ssize_t set_temp_auto_temp_max(struct device *dev,</div><div class='ctx'> 		val - min);</div><div class='ctx'> 	lm85_write_value(client, LM85_REG_AFAN_RANGE(nr),</div><div class='ctx'> 		((data-&gt;zone[nr].range &amp; 0x0f) &lt;&lt; 4)</div><div class='del'>-		| (data-&gt;autofan[nr].freq &amp; 0x07));</div><div class='add'>+		| (data-&gt;pwm_freq[nr] &amp; 0x07));</div><div class='ctx'> 	mutex_unlock(&amp;data-&gt;update_lock);</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='hunk'>@@ -957,13 +975,6 @@ temp_auto(1);</div><div class='ctx'> temp_auto(2);</div><div class='ctx'> temp_auto(3);</div><div class='ctx'> </div><div class='del'>-static int lm85_attach_adapter(struct i2c_adapter *adapter)</div><div class='del'>-{</div><div class='del'>-	if (!(adapter-&gt;class &amp; I2C_CLASS_HWMON))</div><div class='del'>-		return 0;</div><div class='del'>-	return i2c_probe(adapter, &amp;addr_data, lm85_detect);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static struct attribute *lm85_attributes[] = {</div><div class='ctx'> 	&amp;sensor_dev_attr_fan1_input.dev_attr.attr,</div><div class='ctx'> 	&amp;sensor_dev_attr_fan2_input.dev_attr.attr,</div><div class='hunk'>@@ -984,6 +995,9 @@ static struct attribute *lm85_attributes[] = {</div><div class='ctx'> 	&amp;sensor_dev_attr_pwm1_enable.dev_attr.attr,</div><div class='ctx'> 	&amp;sensor_dev_attr_pwm2_enable.dev_attr.attr,</div><div class='ctx'> 	&amp;sensor_dev_attr_pwm3_enable.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm1_freq.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm2_freq.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm3_freq.dev_attr.attr,</div><div class='ctx'> </div><div class='ctx'> 	&amp;sensor_dev_attr_in0_input.dev_attr.attr,</div><div class='ctx'> 	&amp;sensor_dev_attr_in1_input.dev_attr.attr,</div><div class='hunk'>@@ -1026,9 +1040,6 @@ static struct attribute *lm85_attributes[] = {</div><div class='ctx'> 	&amp;sensor_dev_attr_pwm1_auto_pwm_minctl.dev_attr.attr,</div><div class='ctx'> 	&amp;sensor_dev_attr_pwm2_auto_pwm_minctl.dev_attr.attr,</div><div class='ctx'> 	&amp;sensor_dev_attr_pwm3_auto_pwm_minctl.dev_attr.attr,</div><div class='del'>-	&amp;sensor_dev_attr_pwm1_auto_pwm_freq.dev_attr.attr,</div><div class='del'>-	&amp;sensor_dev_attr_pwm2_auto_pwm_freq.dev_attr.attr,</div><div class='del'>-	&amp;sensor_dev_attr_pwm3_auto_pwm_freq.dev_attr.attr,</div><div class='ctx'> </div><div class='ctx'> 	&amp;sensor_dev_attr_temp1_auto_temp_off.dev_attr.attr,</div><div class='ctx'> 	&amp;sensor_dev_attr_temp2_auto_temp_off.dev_attr.attr,</div><div class='hunk'>@@ -1103,109 +1114,74 @@ static void lm85_init_client(struct i2c_client *client)</div><div class='ctx'> 		dev_warn(&amp;client-&gt;dev, "Device is not ready\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int lm85_detect(struct i2c_adapter *adapter, int address,</div><div class='del'>-		int kind)</div><div class='add'>+/* Return 0 if detection is successful, -ENODEV otherwise */</div><div class='add'>+static int lm85_detect(struct i2c_client *client, int kind,</div><div class='add'>+		       struct i2c_board_info *info)</div><div class='ctx'> {</div><div class='del'>-	int company, verstep;</div><div class='del'>-	struct i2c_client *client;</div><div class='del'>-	struct lm85_data *data;</div><div class='del'>-	int err = 0;</div><div class='add'>+	struct i2c_adapter *adapter = client-&gt;adapter;</div><div class='add'>+	int address = client-&gt;addr;</div><div class='ctx'> 	const char *type_name;</div><div class='ctx'> </div><div class='ctx'> 	if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) {</div><div class='ctx'> 		/* We need to be able to do byte I/O */</div><div class='del'>-		goto ERROR0;</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* OK. For now, we presume we have a valid client. We now create the</div><div class='del'>-	   client structure, even though we cannot fill it completely yet.</div><div class='del'>-	   But it allows us to access lm85_{read,write}_value. */</div><div class='add'>+	/* If auto-detecting, determine the chip type */</div><div class='add'>+	if (kind &lt; 0) {</div><div class='add'>+		int company = lm85_read_value(client, LM85_REG_COMPANY);</div><div class='add'>+		int verstep = lm85_read_value(client, LM85_REG_VERSTEP);</div><div class='ctx'> </div><div class='del'>-	if (!(data = kzalloc(sizeof(struct lm85_data), GFP_KERNEL))) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto ERROR0;</div><div class='del'>-	}</div><div class='add'>+		dev_dbg(&amp;adapter-&gt;dev, "Detecting device at 0x%02x with "</div><div class='add'>+			"COMPANY: 0x%02x and VERSTEP: 0x%02x\n",</div><div class='add'>+			address, company, verstep);</div><div class='ctx'> </div><div class='del'>-	client = &amp;data-&gt;client;</div><div class='del'>-	i2c_set_clientdata(client, data);</div><div class='del'>-	client-&gt;addr = address;</div><div class='del'>-	client-&gt;adapter = adapter;</div><div class='del'>-	client-&gt;driver = &amp;lm85_driver;</div><div class='del'>-</div><div class='del'>-	/* Now, we do the remaining detection. */</div><div class='del'>-</div><div class='del'>-	company = lm85_read_value(client, LM85_REG_COMPANY);</div><div class='del'>-	verstep = lm85_read_value(client, LM85_REG_VERSTEP);</div><div class='del'>-</div><div class='del'>-	dev_dbg(&amp;adapter-&gt;dev, "Detecting device at %d,0x%02x with"</div><div class='del'>-		" COMPANY: 0x%02x and VERSTEP: 0x%02x\n",</div><div class='del'>-		i2c_adapter_id(client-&gt;adapter), client-&gt;addr,</div><div class='del'>-		company, verstep);</div><div class='del'>-</div><div class='del'>-	/* If auto-detecting, Determine the chip type. */</div><div class='del'>-	if (kind &lt;= 0) {</div><div class='del'>-		dev_dbg(&amp;adapter-&gt;dev, "Autodetecting device at %d,0x%02x ...\n",</div><div class='del'>-			i2c_adapter_id(adapter), address);</div><div class='del'>-		if (company == LM85_COMPANY_NATIONAL</div><div class='del'>-		    &amp;&amp; verstep == LM85_VERSTEP_LM85C) {</div><div class='del'>-			kind = lm85c;</div><div class='del'>-		} else if (company == LM85_COMPANY_NATIONAL</div><div class='del'>-		    &amp;&amp; verstep == LM85_VERSTEP_LM85B) {</div><div class='del'>-			kind = lm85b;</div><div class='del'>-		} else if (company == LM85_COMPANY_NATIONAL</div><div class='del'>-		    &amp;&amp; (verstep &amp; LM85_VERSTEP_VMASK) == LM85_VERSTEP_GENERIC) {</div><div class='del'>-			dev_err(&amp;adapter-&gt;dev, "Unrecognized version/stepping 0x%02x"</div><div class='del'>-				" Defaulting to LM85.\n", verstep);</div><div class='del'>-			kind = any_chip;</div><div class='del'>-		} else if (company == LM85_COMPANY_ANALOG_DEV</div><div class='del'>-		    &amp;&amp; verstep == LM85_VERSTEP_ADM1027) {</div><div class='del'>-			kind = adm1027;</div><div class='del'>-		} else if (company == LM85_COMPANY_ANALOG_DEV</div><div class='del'>-		    &amp;&amp; (verstep == LM85_VERSTEP_ADT7463</div><div class='del'>-			 || verstep == LM85_VERSTEP_ADT7463C)) {</div><div class='del'>-			kind = adt7463;</div><div class='del'>-		} else if (company == LM85_COMPANY_ANALOG_DEV</div><div class='del'>-		    &amp;&amp; (verstep &amp; LM85_VERSTEP_VMASK) == LM85_VERSTEP_GENERIC) {</div><div class='del'>-			dev_err(&amp;adapter-&gt;dev, "Unrecognized version/stepping 0x%02x"</div><div class='del'>-				" Defaulting to Generic LM85.\n", verstep);</div><div class='del'>-			kind = any_chip;</div><div class='del'>-		} else if (company == LM85_COMPANY_SMSC</div><div class='del'>-		    &amp;&amp; (verstep == LM85_VERSTEP_EMC6D100_A0</div><div class='del'>-			 || verstep == LM85_VERSTEP_EMC6D100_A1)) {</div><div class='del'>-			/* Unfortunately, we can't tell a '100 from a '101</div><div class='del'>-			 * from the registers.  Since a '101 is a '100</div><div class='del'>-			 * in a package with fewer pins and therefore no</div><div class='del'>-			 * 3.3V, 1.5V or 1.8V inputs, perhaps if those</div><div class='del'>-			 * inputs read 0, then it's a '101.</div><div class='del'>-			 */</div><div class='del'>-			kind = emc6d100;</div><div class='del'>-		} else if (company == LM85_COMPANY_SMSC</div><div class='del'>-		    &amp;&amp; verstep == LM85_VERSTEP_EMC6D102) {</div><div class='del'>-			kind = emc6d102;</div><div class='del'>-		} else if (company == LM85_COMPANY_SMSC</div><div class='del'>-		    &amp;&amp; (verstep &amp; LM85_VERSTEP_VMASK) == LM85_VERSTEP_GENERIC) {</div><div class='del'>-			dev_err(&amp;adapter-&gt;dev, "lm85: Detected SMSC chip\n");</div><div class='del'>-			dev_err(&amp;adapter-&gt;dev, "lm85: Unrecognized version/stepping 0x%02x"</div><div class='del'>-			    " Defaulting to Generic LM85.\n", verstep);</div><div class='del'>-			kind = any_chip;</div><div class='del'>-		} else if (kind == any_chip</div><div class='del'>-		    &amp;&amp; (verstep &amp; LM85_VERSTEP_VMASK) == LM85_VERSTEP_GENERIC) {</div><div class='del'>-			dev_err(&amp;adapter-&gt;dev, "Generic LM85 Version 6 detected\n");</div><div class='del'>-			/* Leave kind as "any_chip" */</div><div class='del'>-		} else {</div><div class='del'>-			dev_dbg(&amp;adapter-&gt;dev, "Autodetection failed\n");</div><div class='del'>-			/* Not an LM85... */</div><div class='del'>-			if (kind == any_chip) {  /* User used force=x,y */</div><div class='del'>-				dev_err(&amp;adapter-&gt;dev, "Generic LM85 Version 6 not"</div><div class='del'>-					" found at %d,0x%02x. Try force_lm85c.\n",</div><div class='del'>-					i2c_adapter_id(adapter), address);</div><div class='add'>+		/* All supported chips have the version in common */</div><div class='add'>+		if ((verstep &amp; LM85_VERSTEP_VMASK) != LM85_VERSTEP_GENERIC) {</div><div class='add'>+			dev_dbg(&amp;adapter-&gt;dev, "Autodetection failed: "</div><div class='add'>+				"unsupported version\n");</div><div class='add'>+			return -ENODEV;</div><div class='add'>+		}</div><div class='add'>+		kind = any_chip;</div><div class='add'>+</div><div class='add'>+		/* Now, refine the detection */</div><div class='add'>+		if (company == LM85_COMPANY_NATIONAL) {</div><div class='add'>+			switch (verstep) {</div><div class='add'>+			case LM85_VERSTEP_LM85C:</div><div class='add'>+				kind = lm85c;</div><div class='add'>+				break;</div><div class='add'>+			case LM85_VERSTEP_LM85B:</div><div class='add'>+				kind = lm85b;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		} else if (company == LM85_COMPANY_ANALOG_DEV) {</div><div class='add'>+			switch (verstep) {</div><div class='add'>+			case LM85_VERSTEP_ADM1027:</div><div class='add'>+				kind = adm1027;</div><div class='add'>+				break;</div><div class='add'>+			case LM85_VERSTEP_ADT7463:</div><div class='add'>+			case LM85_VERSTEP_ADT7463C:</div><div class='add'>+				kind = adt7463;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		} else if (company == LM85_COMPANY_SMSC) {</div><div class='add'>+			switch (verstep) {</div><div class='add'>+			case LM85_VERSTEP_EMC6D100_A0:</div><div class='add'>+			case LM85_VERSTEP_EMC6D100_A1:</div><div class='add'>+				/* Note: we can't tell a '100 from a '101 */</div><div class='add'>+				kind = emc6d100;</div><div class='add'>+				break;</div><div class='add'>+			case LM85_VERSTEP_EMC6D102:</div><div class='add'>+				kind = emc6d102;</div><div class='add'>+				break;</div><div class='ctx'> 			}</div><div class='del'>-			err = 0;</div><div class='del'>-			goto ERROR1;</div><div class='add'>+		} else {</div><div class='add'>+			dev_dbg(&amp;adapter-&gt;dev, "Autodetection failed: "</div><div class='add'>+				"unknown vendor\n");</div><div class='add'>+			return -ENODEV;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Fill in the chip specific driver values */</div><div class='ctx'> 	switch (kind) {</div><div class='ctx'> 	case lm85b:</div><div class='ctx'> 		type_name = "lm85b";</div><div class='hunk'>@@ -1228,16 +1204,36 @@ static int lm85_detect(struct i2c_adapter *adapter, int address,</div><div class='ctx'> 	default:</div><div class='ctx'> 		type_name = "lm85";</div><div class='ctx'> 	}</div><div class='del'>-	strlcpy(client-&gt;name, type_name, I2C_NAME_SIZE);</div><div class='add'>+	strlcpy(info-&gt;type, type_name, I2C_NAME_SIZE);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	/* Fill in the remaining client fields */</div><div class='del'>-	data-&gt;type = kind;</div><div class='add'>+static int lm85_probe(struct i2c_client *client,</div><div class='add'>+		      const struct i2c_device_id *id)</div><div class='add'>+{</div><div class='add'>+	struct lm85_data *data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	data = kzalloc(sizeof(struct lm85_data), GFP_KERNEL);</div><div class='add'>+	if (!data)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	i2c_set_clientdata(client, data);</div><div class='add'>+	data-&gt;type = id-&gt;driver_data;</div><div class='ctx'> 	mutex_init(&amp;data-&gt;update_lock);</div><div class='ctx'> </div><div class='del'>-	/* Tell the I2C layer a new client has arrived */</div><div class='del'>-	err = i2c_attach_client(client);</div><div class='del'>-	if (err)</div><div class='del'>-		goto ERROR1;</div><div class='add'>+	/* Fill in the chip specific driver values */</div><div class='add'>+	switch (data-&gt;type) {</div><div class='add'>+	case adm1027:</div><div class='add'>+	case adt7463:</div><div class='add'>+	case emc6d100:</div><div class='add'>+	case emc6d102:</div><div class='add'>+		data-&gt;freq_map = adm1027_freq_map;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		data-&gt;freq_map = lm85_freq_map;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Set the VRM version */</div><div class='ctx'> 	data-&gt;vrm = vid_which_vrm();</div><div class='hunk'>@@ -1248,45 +1244,42 @@ static int lm85_detect(struct i2c_adapter *adapter, int address,</div><div class='ctx'> 	/* Register sysfs hooks */</div><div class='ctx'> 	err = sysfs_create_group(&amp;client-&gt;dev.kobj, &amp;lm85_group);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto ERROR2;</div><div class='add'>+		goto err_kfree;</div><div class='ctx'> </div><div class='ctx'> 	/* The ADT7463 has an optional VRM 10 mode where pin 21 is used</div><div class='ctx'> 	   as a sixth digital VID input rather than an analog input. */</div><div class='ctx'> 	data-&gt;vid = lm85_read_value(client, LM85_REG_VID);</div><div class='del'>-	if (!(kind == adt7463 &amp;&amp; (data-&gt;vid &amp; 0x80)))</div><div class='add'>+	if (!(data-&gt;type == adt7463 &amp;&amp; (data-&gt;vid &amp; 0x80)))</div><div class='ctx'> 		if ((err = sysfs_create_group(&amp;client-&gt;dev.kobj,</div><div class='ctx'> 					&amp;lm85_group_in4)))</div><div class='del'>-			goto ERROR3;</div><div class='add'>+			goto err_remove_files;</div><div class='ctx'> </div><div class='ctx'> 	/* The EMC6D100 has 3 additional voltage inputs */</div><div class='del'>-	if (kind == emc6d100)</div><div class='add'>+	if (data-&gt;type == emc6d100)</div><div class='ctx'> 		if ((err = sysfs_create_group(&amp;client-&gt;dev.kobj,</div><div class='ctx'> 					&amp;lm85_group_in567)))</div><div class='del'>-			goto ERROR3;</div><div class='add'>+			goto err_remove_files;</div><div class='ctx'> </div><div class='ctx'> 	data-&gt;hwmon_dev = hwmon_device_register(&amp;client-&gt;dev);</div><div class='ctx'> 	if (IS_ERR(data-&gt;hwmon_dev)) {</div><div class='ctx'> 		err = PTR_ERR(data-&gt;hwmon_dev);</div><div class='del'>-		goto ERROR3;</div><div class='add'>+		goto err_remove_files;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Error out and cleanup code */</div><div class='del'>- ERROR3:</div><div class='add'>+ err_remove_files:</div><div class='ctx'> 	sysfs_remove_group(&amp;client-&gt;dev.kobj, &amp;lm85_group);</div><div class='ctx'> 	sysfs_remove_group(&amp;client-&gt;dev.kobj, &amp;lm85_group_in4);</div><div class='del'>-	if (kind == emc6d100)</div><div class='add'>+	if (data-&gt;type == emc6d100)</div><div class='ctx'> 		sysfs_remove_group(&amp;client-&gt;dev.kobj, &amp;lm85_group_in567);</div><div class='del'>- ERROR2:</div><div class='del'>-	i2c_detach_client(client);</div><div class='del'>- ERROR1:</div><div class='add'>+ err_kfree:</div><div class='ctx'> 	kfree(data);</div><div class='del'>- ERROR0:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int lm85_detach_client(struct i2c_client *client)</div><div class='add'>+static int lm85_remove(struct i2c_client *client)</div><div class='ctx'> {</div><div class='ctx'> 	struct lm85_data *data = i2c_get_clientdata(client);</div><div class='ctx'> 	hwmon_device_unregister(data-&gt;hwmon_dev);</div><div class='hunk'>@@ -1294,7 +1287,6 @@ static int lm85_detach_client(struct i2c_client *client)</div><div class='ctx'> 	sysfs_remove_group(&amp;client-&gt;dev.kobj, &amp;lm85_group_in4);</div><div class='ctx'> 	if (data-&gt;type == emc6d100)</div><div class='ctx'> 		sysfs_remove_group(&amp;client-&gt;dev.kobj, &amp;lm85_group_in567);</div><div class='del'>-	i2c_detach_client(client);</div><div class='ctx'> 	kfree(data);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1481,7 +1473,7 @@ static struct lm85_data *lm85_update_device(struct device *dev)</div><div class='ctx'> 			data-&gt;autofan[i].config =</div><div class='ctx'> 			    lm85_read_value(client, LM85_REG_AFAN_CONFIG(i));</div><div class='ctx'> 			val = lm85_read_value(client, LM85_REG_AFAN_RANGE(i));</div><div class='del'>-			data-&gt;autofan[i].freq = val &amp; 0x07;</div><div class='add'>+			data-&gt;pwm_freq[i] = val &amp; 0x07;</div><div class='ctx'> 			data-&gt;zone[i].range = val &gt;&gt; 4;</div><div class='ctx'> 			data-&gt;autofan[i].min_pwm =</div><div class='ctx'> 			    lm85_read_value(client, LM85_REG_AFAN_MINPWM(i));</div><div class='head'>diff --git a/drivers/hwmon/lm87.c b/drivers/hwmon/lm87.c<br/>index 21970f0d53a1..2e4a3cea95f7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hwmon/lm87.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/hwmon/lm87.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hwmon/lm87.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hwmon/lm87.c</a></div><div class='hunk'>@@ -21,11 +21,10 @@</div><div class='ctx'>  *   http://www.national.com/pf/LM/LM87.html</div><div class='ctx'>  *</div><div class='ctx'>  * Some functions share pins, so not all functions are available at the same</div><div class='del'>- * time. Which are depends on the hardware setup. This driver assumes that</div><div class='del'>- * the BIOS configured the chip correctly. In that respect, it  differs from</div><div class='del'>- * the original driver (from lm_sensors for Linux 2.4), which would force the</div><div class='del'>- * LM87 to an arbitrary, compile-time chosen mode, regardless of the actual</div><div class='del'>- * chipset wiring.</div><div class='add'>+ * time. Which are depends on the hardware setup. This driver normally</div><div class='add'>+ * assumes that firmware configured the chip correctly. Where this is not</div><div class='add'>+ * the case, platform code must set the I2C client's platform_data to point</div><div class='add'>+ * to a u8 value to be written to the channel register.</div><div class='ctx'>  * For reference, here is the list of exclusive functions:</div><div class='ctx'>  *  - in0+in5 (default) or temp3</div><div class='ctx'>  *  - fan1 (default) or in6</div><div class='hunk'>@@ -199,6 +198,7 @@ struct lm87_data {</div><div class='ctx'> 	unsigned long last_updated; /* In jiffies */</div><div class='ctx'> </div><div class='ctx'> 	u8 channel;		/* register value */</div><div class='add'>+	u8 config;		/* original register value */</div><div class='ctx'> </div><div class='ctx'> 	u8 in[8];		/* register value */</div><div class='ctx'> 	u8 in_max[8];		/* register value */</div><div class='hunk'>@@ -832,6 +832,7 @@ exit_remove:</div><div class='ctx'> 	sysfs_remove_group(&amp;new_client-&gt;dev.kobj, &amp;lm87_group);</div><div class='ctx'> 	sysfs_remove_group(&amp;new_client-&gt;dev.kobj, &amp;lm87_group_opt);</div><div class='ctx'> exit_free:</div><div class='add'>+	lm87_write_value(new_client, LM87_REG_CONFIG, data-&gt;config);</div><div class='ctx'> 	kfree(data);</div><div class='ctx'> exit:</div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -840,12 +841,17 @@ exit:</div><div class='ctx'> static void lm87_init_client(struct i2c_client *client)</div><div class='ctx'> {</div><div class='ctx'> 	struct lm87_data *data = i2c_get_clientdata(client);</div><div class='del'>-	u8 config;</div><div class='ctx'> </div><div class='del'>-	data-&gt;channel = lm87_read_value(client, LM87_REG_CHANNEL_MODE);</div><div class='add'>+	if (client-&gt;dev.platform_data) {</div><div class='add'>+		data-&gt;channel = *(u8 *)client-&gt;dev.platform_data;</div><div class='add'>+		lm87_write_value(client,</div><div class='add'>+				 LM87_REG_CHANNEL_MODE, data-&gt;channel);</div><div class='add'>+	} else {</div><div class='add'>+		data-&gt;channel = lm87_read_value(client, LM87_REG_CHANNEL_MODE);</div><div class='add'>+	}</div><div class='add'>+	data-&gt;config = lm87_read_value(client, LM87_REG_CONFIG) &amp; 0x6F;</div><div class='ctx'> </div><div class='del'>-	config = lm87_read_value(client, LM87_REG_CONFIG);</div><div class='del'>-	if (!(config &amp; 0x01)) {</div><div class='add'>+	if (!(data-&gt;config &amp; 0x01)) {</div><div class='ctx'> 		int i;</div><div class='ctx'> </div><div class='ctx'> 		/* Limits are left uninitialized after power-up */</div><div class='hunk'>@@ -867,11 +873,11 @@ static void lm87_init_client(struct i2c_client *client)</div><div class='ctx'> 			lm87_write_value(client, LM87_REG_IN_MAX(0), 0xFF);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	if ((config &amp; 0x81) != 0x01) {</div><div class='del'>-		/* Start monitoring */</div><div class='add'>+</div><div class='add'>+	/* Make sure Start is set and INT#_Clear is clear */</div><div class='add'>+	if ((data-&gt;config &amp; 0x09) != 0x01)</div><div class='ctx'> 		lm87_write_value(client, LM87_REG_CONFIG,</div><div class='del'>-				 (config &amp; 0xF7) | 0x01);</div><div class='del'>-	}</div><div class='add'>+				 (data-&gt;config &amp; 0x77) | 0x01);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int lm87_remove(struct i2c_client *client)</div><div class='hunk'>@@ -882,6 +888,7 @@ static int lm87_remove(struct i2c_client *client)</div><div class='ctx'> 	sysfs_remove_group(&amp;client-&gt;dev.kobj, &amp;lm87_group);</div><div class='ctx'> 	sysfs_remove_group(&amp;client-&gt;dev.kobj, &amp;lm87_group_opt);</div><div class='ctx'> </div><div class='add'>+	lm87_write_value(client, LM87_REG_CONFIG, data-&gt;config);</div><div class='ctx'> 	kfree(data);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/hwmon/lm90.c b/drivers/hwmon/lm90.c<br/>index c24fe36ac787..3edeebc0b835 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hwmon/lm90.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/hwmon/lm90.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hwmon/lm90.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hwmon/lm90.c</a></div><div class='hunk'>@@ -1,14 +1,12 @@</div><div class='ctx'> /*</div><div class='ctx'>  * lm90.c - Part of lm_sensors, Linux kernel modules for hardware</div><div class='ctx'>  *          monitoring</div><div class='del'>- * Copyright (C) 2003-2006  Jean Delvare &lt;khali@linux-fr.org&gt;</div><div class='add'>+ * Copyright (C) 2003-2008  Jean Delvare &lt;khali@linux-fr.org&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * Based on the lm83 driver. The LM90 is a sensor chip made by National</div><div class='ctx'>  * Semiconductor. It reports up to two temperatures (its own plus up to</div><div class='ctx'>  * one external one) with a 0.125 deg resolution (1 deg for local</div><div class='del'>- * temperature) and a 3-4 deg accuracy. Complete datasheet can be</div><div class='del'>- * obtained from National's website at:</div><div class='del'>- *   http://www.national.com/pf/LM/LM90.html</div><div class='add'>+ * temperature) and a 3-4 deg accuracy.</div><div class='ctx'>  *</div><div class='ctx'>  * This driver also supports the LM89 and LM99, two other sensor chips</div><div class='ctx'>  * made by National Semiconductor. Both have an increased remote</div><div class='hunk'>@@ -16,48 +14,38 @@</div><div class='ctx'>  * additionally shifts remote temperatures (measured and limits) by 16</div><div class='ctx'>  * degrees, which allows for higher temperatures measurement. The</div><div class='ctx'>  * driver doesn't handle it since it can be done easily in user-space.</div><div class='del'>- * Complete datasheets can be obtained from National's website at:</div><div class='del'>- *   http://www.national.com/pf/LM/LM89.html</div><div class='del'>- *   http://www.national.com/pf/LM/LM99.html</div><div class='ctx'>  * Note that there is no way to differentiate between both chips.</div><div class='ctx'>  *</div><div class='ctx'>  * This driver also supports the LM86, another sensor chip made by</div><div class='ctx'>  * National Semiconductor. It is exactly similar to the LM90 except it</div><div class='ctx'>  * has a higher accuracy.</div><div class='del'>- * Complete datasheet can be obtained from National's website at:</div><div class='del'>- *   http://www.national.com/pf/LM/LM86.html</div><div class='ctx'>  *</div><div class='ctx'>  * This driver also supports the ADM1032, a sensor chip made by Analog</div><div class='ctx'>  * Devices. That chip is similar to the LM90, with a few differences</div><div class='del'>- * that are not handled by this driver. Complete datasheet can be</div><div class='del'>- * obtained from Analog's website at:</div><div class='del'>- *   http://www.analog.com/en/prod/0,2877,ADM1032,00.html</div><div class='del'>- * Among others, it has a higher accuracy than the LM90, much like the</div><div class='del'>- * LM86 does.</div><div class='add'>+ * that are not handled by this driver. Among others, it has a higher</div><div class='add'>+ * accuracy than the LM90, much like the LM86 does.</div><div class='ctx'>  *</div><div class='ctx'>  * This driver also supports the MAX6657, MAX6658 and MAX6659 sensor</div><div class='del'>- * chips made by Maxim. These chips are similar to the LM86. Complete</div><div class='del'>- * datasheet can be obtained at Maxim's website at:</div><div class='del'>- *   http://www.maxim-ic.com/quick_view2.cfm/qv_pk/2578</div><div class='add'>+ * chips made by Maxim. These chips are similar to the LM86.</div><div class='ctx'>  * Note that there is no easy way to differentiate between the three</div><div class='ctx'>  * variants. The extra address and features of the MAX6659 are not</div><div class='ctx'>  * supported by this driver. These chips lack the remote temperature</div><div class='ctx'>  * offset feature.</div><div class='ctx'>  *</div><div class='add'>+ * This driver also supports the MAX6646, MAX6647 and MAX6649 chips</div><div class='add'>+ * made by Maxim.  These are again similar to the LM86, but they use</div><div class='add'>+ * unsigned temperature values and can report temperatures from 0 to</div><div class='add'>+ * 145 degrees.</div><div class='add'>+ *</div><div class='ctx'>  * This driver also supports the MAX6680 and MAX6681, two other sensor</div><div class='ctx'>  * chips made by Maxim. These are quite similar to the other Maxim</div><div class='del'>- * chips. Complete datasheet can be obtained at:</div><div class='del'>- *   http://www.maxim-ic.com/quick_view2.cfm/qv_pk/3370</div><div class='del'>- * The MAX6680 and MAX6681 only differ in the pinout so they can be</div><div class='del'>- * treated identically.</div><div class='add'>+ * chips. The MAX6680 and MAX6681 only differ in the pinout so they can</div><div class='add'>+ * be treated identically.</div><div class='ctx'>  *</div><div class='del'>- * This driver also supports the ADT7461 chip from Analog Devices but</div><div class='del'>- * only in its "compatability mode". If an ADT7461 chip is found but</div><div class='del'>- * is configured in non-compatible mode (where its temperature</div><div class='del'>- * register values are decoded differently) it is ignored by this</div><div class='del'>- * driver. Complete datasheet can be obtained from Analog's website</div><div class='del'>- * at:</div><div class='del'>- *   http://www.analog.com/en/prod/0,2877,ADT7461,00.html</div><div class='add'>+ * This driver also supports the ADT7461 chip from Analog Devices.</div><div class='add'>+ * It's supported in both compatibility and extended mode. It is mostly</div><div class='add'>+ * compatible with LM90 except for a data format difference for the</div><div class='add'>+ * temperature value registers.</div><div class='ctx'>  *</div><div class='ctx'>  * Since the LM90 was the first chipset supported by this driver, most</div><div class='ctx'>  * comments will refer to this chipset, but are actually general and</div><div class='hunk'>@@ -93,9 +81,10 @@</div><div class='ctx'>  * Addresses to scan</div><div class='ctx'>  * Address is fully defined internally and cannot be changed except for</div><div class='ctx'>  * MAX6659, MAX6680 and MAX6681.</div><div class='del'>- * LM86, LM89, LM90, LM99, ADM1032, ADM1032-1, ADT7461, MAX6657 and MAX6658</div><div class='del'>- * have address 0x4c.</div><div class='del'>- * ADM1032-2, ADT7461-2, LM89-1, and LM99-1 have address 0x4d.</div><div class='add'>+ * LM86, LM89, LM90, LM99, ADM1032, ADM1032-1, ADT7461, MAX6649, MAX6657</div><div class='add'>+ * and MAX6658 have address 0x4c.</div><div class='add'>+ * ADM1032-2, ADT7461-2, LM89-1, LM99-1 and MAX6646 have address 0x4d.</div><div class='add'>+ * MAX6647 has address 0x4e.</div><div class='ctx'>  * MAX6659 can have address 0x4c, 0x4d or 0x4e (unsupported).</div><div class='ctx'>  * MAX6680 and MAX6681 can have address 0x18, 0x19, 0x1a, 0x29, 0x2a, 0x2b,</div><div class='ctx'>  * 0x4c, 0x4d or 0x4e.</div><div class='hunk'>@@ -108,7 +97,8 @@ static const unsigned short normal_i2c[] = {</div><div class='ctx'>  * Insmod parameters</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-I2C_CLIENT_INSMOD_7(lm90, adm1032, lm99, lm86, max6657, adt7461, max6680);</div><div class='add'>+I2C_CLIENT_INSMOD_8(lm90, adm1032, lm99, lm86, max6657, adt7461, max6680,</div><div class='add'>+		    max6646);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * The LM90 registers</div><div class='hunk'>@@ -149,39 +139,14 @@ I2C_CLIENT_INSMOD_7(lm90, adm1032, lm99, lm86, max6657, adt7461, max6680);</div><div class='ctx'> #define LM90_REG_R_TCRIT_HYST		0x21</div><div class='ctx'> #define LM90_REG_W_TCRIT_HYST		0x21</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Conversions and various macros</div><div class='del'>- * For local temperatures and limits, critical limits and the hysteresis</div><div class='del'>- * value, the LM90 uses signed 8-bit values with LSB = 1 degree Celsius.</div><div class='del'>- * For remote temperatures and limits, it uses signed 11-bit values with</div><div class='del'>- * LSB = 0.125 degree Celsius, left-justified in 16-bit registers.</div><div class='del'>- */</div><div class='add'>+/* MAX6646/6647/6649/6657/6658/6659 registers */</div><div class='ctx'> </div><div class='del'>-#define TEMP1_FROM_REG(val)	((val) * 1000)</div><div class='del'>-#define TEMP1_TO_REG(val)	((val) &lt;= -128000 ? -128 : \</div><div class='del'>-				 (val) &gt;= 127000 ? 127 : \</div><div class='del'>-				 (val) &lt; 0 ? ((val) - 500) / 1000 : \</div><div class='del'>-				 ((val) + 500) / 1000)</div><div class='del'>-#define TEMP2_FROM_REG(val)	((val) / 32 * 125)</div><div class='del'>-#define TEMP2_TO_REG(val)	((val) &lt;= -128000 ? 0x8000 : \</div><div class='del'>-				 (val) &gt;= 127875 ? 0x7FE0 : \</div><div class='del'>-				 (val) &lt; 0 ? ((val) - 62) / 125 * 32 : \</div><div class='del'>-				 ((val) + 62) / 125 * 32)</div><div class='del'>-#define HYST_TO_REG(val)	((val) &lt;= 0 ? 0 : (val) &gt;= 30500 ? 31 : \</div><div class='del'>-				 ((val) + 500) / 1000)</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * ADT7461 is almost identical to LM90 except that attempts to write</div><div class='del'>- * values that are outside the range 0 &lt; temp &lt; 127 are treated as</div><div class='del'>- * the boundary value. </div><div class='del'>- */</div><div class='add'>+#define MAX6657_REG_R_LOCAL_TEMPL	0x11</div><div class='ctx'> </div><div class='del'>-#define TEMP1_TO_REG_ADT7461(val) ((val) &lt;= 0 ? 0 : \</div><div class='del'>-				 (val) &gt;= 127000 ? 127 : \</div><div class='del'>-				 ((val) + 500) / 1000)</div><div class='del'>-#define TEMP2_TO_REG_ADT7461(val) ((val) &lt;= 0 ? 0 : \</div><div class='del'>-				 (val) &gt;= 127750 ? 0x7FC0 : \</div><div class='del'>-				 ((val) + 125) / 250 * 64)</div><div class='add'>+/*</div><div class='add'>+ * Device flags</div><div class='add'>+ */</div><div class='add'>+#define LM90_FLAG_ADT7461_EXT		0x01	/* ADT7461 extended mode */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Functions declaration</div><div class='hunk'>@@ -206,6 +171,9 @@ static const struct i2c_device_id lm90_id[] = {</div><div class='ctx'> 	{ "lm86", lm86 },</div><div class='ctx'> 	{ "lm89", lm99 },</div><div class='ctx'> 	{ "lm99", lm99 },	/* Missing temperature offset */</div><div class='add'>+	{ "max6646", max6646 },</div><div class='add'>+	{ "max6647", max6646 },</div><div class='add'>+	{ "max6649", max6646 },</div><div class='ctx'> 	{ "max6657", max6657 },</div><div class='ctx'> 	{ "max6658", max6657 },</div><div class='ctx'> 	{ "max6659", max6657 },</div><div class='hunk'>@@ -237,22 +205,150 @@ struct lm90_data {</div><div class='ctx'> 	char valid; /* zero until following fields are valid */</div><div class='ctx'> 	unsigned long last_updated; /* in jiffies */</div><div class='ctx'> 	int kind;</div><div class='add'>+	int flags;</div><div class='ctx'> </div><div class='ctx'> 	/* registers values */</div><div class='del'>-	s8 temp8[5];	/* 0: local input</div><div class='del'>-			   1: local low limit</div><div class='del'>-			   2: local high limit</div><div class='del'>-			   3: local critical limit</div><div class='del'>-			   4: remote critical limit */</div><div class='del'>-	s16 temp11[4];	/* 0: remote input</div><div class='add'>+	s8 temp8[4];	/* 0: local low limit</div><div class='add'>+			   1: local high limit</div><div class='add'>+			   2: local critical limit</div><div class='add'>+			   3: remote critical limit */</div><div class='add'>+	s16 temp11[5];	/* 0: remote input</div><div class='ctx'> 			   1: remote low limit</div><div class='ctx'> 			   2: remote high limit</div><div class='del'>-			   3: remote offset (except max6657) */</div><div class='add'>+			   3: remote offset (except max6646 and max6657)</div><div class='add'>+			   4: local input */</div><div class='ctx'> 	u8 temp_hyst;</div><div class='ctx'> 	u8 alarms; /* bitvector */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Conversions</div><div class='add'>+ * For local temperatures and limits, critical limits and the hysteresis</div><div class='add'>+ * value, the LM90 uses signed 8-bit values with LSB = 1 degree Celsius.</div><div class='add'>+ * For remote temperatures and limits, it uses signed 11-bit values with</div><div class='add'>+ * LSB = 0.125 degree Celsius, left-justified in 16-bit registers.  Some</div><div class='add'>+ * Maxim chips use unsigned values.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static inline int temp_from_s8(s8 val)</div><div class='add'>+{</div><div class='add'>+	return val * 1000;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int temp_from_u8(u8 val)</div><div class='add'>+{</div><div class='add'>+	return val * 1000;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int temp_from_s16(s16 val)</div><div class='add'>+{</div><div class='add'>+	return val / 32 * 125;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int temp_from_u16(u16 val)</div><div class='add'>+{</div><div class='add'>+	return val / 32 * 125;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static s8 temp_to_s8(long val)</div><div class='add'>+{</div><div class='add'>+	if (val &lt;= -128000)</div><div class='add'>+		return -128;</div><div class='add'>+	if (val &gt;= 127000)</div><div class='add'>+		return 127;</div><div class='add'>+	if (val &lt; 0)</div><div class='add'>+		return (val - 500) / 1000;</div><div class='add'>+	return (val + 500) / 1000;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 temp_to_u8(long val)</div><div class='add'>+{</div><div class='add'>+	if (val &lt;= 0)</div><div class='add'>+		return 0;</div><div class='add'>+	if (val &gt;= 255000)</div><div class='add'>+		return 255;</div><div class='add'>+	return (val + 500) / 1000;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static s16 temp_to_s16(long val)</div><div class='add'>+{</div><div class='add'>+	if (val &lt;= -128000)</div><div class='add'>+		return 0x8000;</div><div class='add'>+	if (val &gt;= 127875)</div><div class='add'>+		return 0x7FE0;</div><div class='add'>+	if (val &lt; 0)</div><div class='add'>+		return (val - 62) / 125 * 32;</div><div class='add'>+	return (val + 62) / 125 * 32;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 hyst_to_reg(long val)</div><div class='add'>+{</div><div class='add'>+	if (val &lt;= 0)</div><div class='add'>+		return 0;</div><div class='add'>+	if (val &gt;= 30500)</div><div class='add'>+		return 31;</div><div class='add'>+	return (val + 500) / 1000;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * ADT7461 in compatibility mode is almost identical to LM90 except that</div><div class='add'>+ * attempts to write values that are outside the range 0 &lt; temp &lt; 127 are</div><div class='add'>+ * treated as the boundary value.</div><div class='add'>+ *</div><div class='add'>+ * ADT7461 in "extended mode" operation uses unsigned integers offset by</div><div class='add'>+ * 64 (e.g., 0 -&gt; -64 degC).  The range is restricted to -64..191 degC.</div><div class='add'>+ */</div><div class='add'>+static inline int temp_from_u8_adt7461(struct lm90_data *data, u8 val)</div><div class='add'>+{</div><div class='add'>+	if (data-&gt;flags &amp; LM90_FLAG_ADT7461_EXT)</div><div class='add'>+		return (val - 64) * 1000;</div><div class='add'>+	else</div><div class='add'>+		return temp_from_s8(val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int temp_from_u16_adt7461(struct lm90_data *data, u16 val)</div><div class='add'>+{</div><div class='add'>+	if (data-&gt;flags &amp; LM90_FLAG_ADT7461_EXT)</div><div class='add'>+		return (val - 0x4000) / 64 * 250;</div><div class='add'>+	else</div><div class='add'>+		return temp_from_s16(val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 temp_to_u8_adt7461(struct lm90_data *data, long val)</div><div class='add'>+{</div><div class='add'>+	if (data-&gt;flags &amp; LM90_FLAG_ADT7461_EXT) {</div><div class='add'>+		if (val &lt;= -64000)</div><div class='add'>+			return 0;</div><div class='add'>+		if (val &gt;= 191000)</div><div class='add'>+			return 0xFF;</div><div class='add'>+		return (val + 500 + 64000) / 1000;</div><div class='add'>+	} else {</div><div class='add'>+		if (val &lt;= 0)</div><div class='add'>+			return 0;</div><div class='add'>+		if (val &gt;= 127000)</div><div class='add'>+			return 127;</div><div class='add'>+		return (val + 500) / 1000;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 temp_to_u16_adt7461(struct lm90_data *data, long val)</div><div class='add'>+{</div><div class='add'>+	if (data-&gt;flags &amp; LM90_FLAG_ADT7461_EXT) {</div><div class='add'>+		if (val &lt;= -64000)</div><div class='add'>+			return 0;</div><div class='add'>+		if (val &gt;= 191750)</div><div class='add'>+			return 0xFFC0;</div><div class='add'>+		return (val + 64000 + 125) / 250 * 64;</div><div class='add'>+	} else {</div><div class='add'>+		if (val &lt;= 0)</div><div class='add'>+			return 0;</div><div class='add'>+		if (val &gt;= 127750)</div><div class='add'>+			return 0x7FC0;</div><div class='add'>+		return (val + 125) / 250 * 64;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Sysfs stuff</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -261,7 +357,16 @@ static ssize_t show_temp8(struct device *dev, struct device_attribute *devattr,</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);</div><div class='ctx'> 	struct lm90_data *data = lm90_update_device(dev);</div><div class='del'>-	return sprintf(buf, "%d\n", TEMP1_FROM_REG(data-&gt;temp8[attr-&gt;index]));</div><div class='add'>+	int temp;</div><div class='add'>+</div><div class='add'>+	if (data-&gt;kind == adt7461)</div><div class='add'>+		temp = temp_from_u8_adt7461(data, data-&gt;temp8[attr-&gt;index]);</div><div class='add'>+	else if (data-&gt;kind == max6646)</div><div class='add'>+		temp = temp_from_u8(data-&gt;temp8[attr-&gt;index]);</div><div class='add'>+	else</div><div class='add'>+		temp = temp_from_s8(data-&gt;temp8[attr-&gt;index]);</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "%d\n", temp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t set_temp8(struct device *dev, struct device_attribute *devattr,</div><div class='hunk'>@@ -282,10 +387,12 @@ static ssize_t set_temp8(struct device *dev, struct device_attribute *devattr,</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;data-&gt;update_lock);</div><div class='ctx'> 	if (data-&gt;kind == adt7461)</div><div class='del'>-		data-&gt;temp8[nr] = TEMP1_TO_REG_ADT7461(val);</div><div class='add'>+		data-&gt;temp8[nr] = temp_to_u8_adt7461(data, val);</div><div class='add'>+	else if (data-&gt;kind == max6646)</div><div class='add'>+		data-&gt;temp8[nr] = temp_to_u8(val);</div><div class='ctx'> 	else</div><div class='del'>-		data-&gt;temp8[nr] = TEMP1_TO_REG(val);</div><div class='del'>-	i2c_smbus_write_byte_data(client, reg[nr - 1], data-&gt;temp8[nr]);</div><div class='add'>+		data-&gt;temp8[nr] = temp_to_s8(val);</div><div class='add'>+	i2c_smbus_write_byte_data(client, reg[nr], data-&gt;temp8[nr]);</div><div class='ctx'> 	mutex_unlock(&amp;data-&gt;update_lock);</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='hunk'>@@ -295,7 +402,16 @@ static ssize_t show_temp11(struct device *dev, struct device_attribute *devattr,</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);</div><div class='ctx'> 	struct lm90_data *data = lm90_update_device(dev);</div><div class='del'>-	return sprintf(buf, "%d\n", TEMP2_FROM_REG(data-&gt;temp11[attr-&gt;index]));</div><div class='add'>+	int temp;</div><div class='add'>+</div><div class='add'>+	if (data-&gt;kind == adt7461)</div><div class='add'>+		temp = temp_from_u16_adt7461(data, data-&gt;temp11[attr-&gt;index]);</div><div class='add'>+	else if (data-&gt;kind == max6646)</div><div class='add'>+		temp = temp_from_u16(data-&gt;temp11[attr-&gt;index]);</div><div class='add'>+	else</div><div class='add'>+		temp = temp_from_s16(data-&gt;temp11[attr-&gt;index]);</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "%d\n", temp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t set_temp11(struct device *dev, struct device_attribute *devattr,</div><div class='hunk'>@@ -318,13 +434,20 @@ static ssize_t set_temp11(struct device *dev, struct device_attribute *devattr,</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;data-&gt;update_lock);</div><div class='ctx'> 	if (data-&gt;kind == adt7461)</div><div class='del'>-		data-&gt;temp11[nr] = TEMP2_TO_REG_ADT7461(val);</div><div class='add'>+		data-&gt;temp11[nr] = temp_to_u16_adt7461(data, val);</div><div class='add'>+	else if (data-&gt;kind == max6657 || data-&gt;kind == max6680)</div><div class='add'>+		data-&gt;temp11[nr] = temp_to_s8(val) &lt;&lt; 8;</div><div class='add'>+	else if (data-&gt;kind == max6646)</div><div class='add'>+		data-&gt;temp11[nr] = temp_to_u8(val) &lt;&lt; 8;</div><div class='ctx'> 	else</div><div class='del'>-		data-&gt;temp11[nr] = TEMP2_TO_REG(val);</div><div class='add'>+		data-&gt;temp11[nr] = temp_to_s16(val);</div><div class='add'>+</div><div class='ctx'> 	i2c_smbus_write_byte_data(client, reg[(nr - 1) * 2],</div><div class='ctx'> 				  data-&gt;temp11[nr] &gt;&gt; 8);</div><div class='del'>-	i2c_smbus_write_byte_data(client, reg[(nr - 1) * 2 + 1],</div><div class='del'>-				  data-&gt;temp11[nr] &amp; 0xff);</div><div class='add'>+	if (data-&gt;kind != max6657 &amp;&amp; data-&gt;kind != max6680</div><div class='add'>+	    &amp;&amp; data-&gt;kind != max6646)</div><div class='add'>+		i2c_smbus_write_byte_data(client, reg[(nr - 1) * 2 + 1],</div><div class='add'>+					  data-&gt;temp11[nr] &amp; 0xff);</div><div class='ctx'> 	mutex_unlock(&amp;data-&gt;update_lock);</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='hunk'>@@ -334,8 +457,14 @@ static ssize_t show_temphyst(struct device *dev, struct device_attribute *devatt</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);</div><div class='ctx'> 	struct lm90_data *data = lm90_update_device(dev);</div><div class='del'>-	return sprintf(buf, "%d\n", TEMP1_FROM_REG(data-&gt;temp8[attr-&gt;index])</div><div class='del'>-		       - TEMP1_FROM_REG(data-&gt;temp_hyst));</div><div class='add'>+	int temp;</div><div class='add'>+</div><div class='add'>+	if (data-&gt;kind == adt7461)</div><div class='add'>+		temp = temp_from_u8_adt7461(data, data-&gt;temp8[attr-&gt;index]);</div><div class='add'>+	else</div><div class='add'>+		temp = temp_from_s8(data-&gt;temp8[attr-&gt;index]);</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "%d\n", temp - temp_from_s8(data-&gt;temp_hyst));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t set_temphyst(struct device *dev, struct device_attribute *dummy,</div><div class='hunk'>@@ -347,9 +476,9 @@ static ssize_t set_temphyst(struct device *dev, struct device_attribute *dummy,</div><div class='ctx'> 	long hyst;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;data-&gt;update_lock);</div><div class='del'>-	hyst = TEMP1_FROM_REG(data-&gt;temp8[3]) - val;</div><div class='add'>+	hyst = temp_from_s8(data-&gt;temp8[2]) - val;</div><div class='ctx'> 	i2c_smbus_write_byte_data(client, LM90_REG_W_TCRIT_HYST,</div><div class='del'>-				  HYST_TO_REG(hyst));</div><div class='add'>+				  hyst_to_reg(hyst));</div><div class='ctx'> 	mutex_unlock(&amp;data-&gt;update_lock);</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='hunk'>@@ -371,23 +500,23 @@ static ssize_t show_alarm(struct device *dev, struct device_attribute</div><div class='ctx'> 	return sprintf(buf, "%d\n", (data-&gt;alarms &gt;&gt; bitnr) &amp; 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, show_temp8, NULL, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, show_temp11, NULL, 4);</div><div class='ctx'> static SENSOR_DEVICE_ATTR(temp2_input, S_IRUGO, show_temp11, NULL, 0);</div><div class='ctx'> static SENSOR_DEVICE_ATTR(temp1_min, S_IWUSR | S_IRUGO, show_temp8,</div><div class='del'>-	set_temp8, 1);</div><div class='add'>+	set_temp8, 0);</div><div class='ctx'> static SENSOR_DEVICE_ATTR(temp2_min, S_IWUSR | S_IRUGO, show_temp11,</div><div class='ctx'> 	set_temp11, 1);</div><div class='ctx'> static SENSOR_DEVICE_ATTR(temp1_max, S_IWUSR | S_IRUGO, show_temp8,</div><div class='del'>-	set_temp8, 2);</div><div class='add'>+	set_temp8, 1);</div><div class='ctx'> static SENSOR_DEVICE_ATTR(temp2_max, S_IWUSR | S_IRUGO, show_temp11,</div><div class='ctx'> 	set_temp11, 2);</div><div class='ctx'> static SENSOR_DEVICE_ATTR(temp1_crit, S_IWUSR | S_IRUGO, show_temp8,</div><div class='del'>-	set_temp8, 3);</div><div class='add'>+	set_temp8, 2);</div><div class='ctx'> static SENSOR_DEVICE_ATTR(temp2_crit, S_IWUSR | S_IRUGO, show_temp8,</div><div class='del'>-	set_temp8, 4);</div><div class='add'>+	set_temp8, 3);</div><div class='ctx'> static SENSOR_DEVICE_ATTR(temp1_crit_hyst, S_IWUSR | S_IRUGO, show_temphyst,</div><div class='del'>-	set_temphyst, 3);</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp2_crit_hyst, S_IRUGO, show_temphyst, NULL, 4);</div><div class='add'>+	set_temphyst, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR(temp2_crit_hyst, S_IRUGO, show_temphyst, NULL, 3);</div><div class='ctx'> static SENSOR_DEVICE_ATTR(temp2_offset, S_IWUSR | S_IRUGO, show_temp11,</div><div class='ctx'> 	set_temp11, 3);</div><div class='ctx'> </div><div class='hunk'>@@ -568,7 +697,7 @@ static int lm90_detect(struct i2c_client *new_client, int kind,</div><div class='ctx'> 				kind = adm1032;</div><div class='ctx'> 			} else</div><div class='ctx'> 			if (chip_id == 0x51 /* ADT7461 */</div><div class='del'>-			 &amp;&amp; (reg_config1 &amp; 0x1F) == 0x00 /* check compat mode */</div><div class='add'>+			 &amp;&amp; (reg_config1 &amp; 0x1B) == 0x00</div><div class='ctx'> 			 &amp;&amp; reg_convrate &lt;= 0x0A) {</div><div class='ctx'> 				kind = adt7461;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -599,13 +728,23 @@ static int lm90_detect(struct i2c_client *new_client, int kind,</div><div class='ctx'> 			 &amp;&amp; (reg_config1 &amp; 0x03) == 0x00</div><div class='ctx'> 			 &amp;&amp; reg_convrate &lt;= 0x07) {</div><div class='ctx'> 			 	kind = max6680;</div><div class='add'>+			} else</div><div class='add'>+			/* The chip_id register of the MAX6646/6647/6649</div><div class='add'>+			 * holds the revision of the chip.</div><div class='add'>+			 * The lowest 6 bits of the config1 register are</div><div class='add'>+			 * unused and should return zero when read.</div><div class='add'>+			 */</div><div class='add'>+			if (chip_id == 0x59</div><div class='add'>+			 &amp;&amp; (reg_config1 &amp; 0x3f) == 0x00</div><div class='add'>+			 &amp;&amp; reg_convrate &lt;= 0x07) {</div><div class='add'>+				kind = max6646;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (kind &lt;= 0) { /* identification failed */</div><div class='del'>-			dev_info(&amp;adapter-&gt;dev,</div><div class='del'>-			    "Unsupported chip (man_id=0x%02X, "</div><div class='del'>-			    "chip_id=0x%02X).\n", man_id, chip_id);</div><div class='add'>+			dev_dbg(&amp;adapter-&gt;dev,</div><div class='add'>+				"Unsupported chip at 0x%02x (man_id=0x%02X, "</div><div class='add'>+				"chip_id=0x%02X)\n", address, man_id, chip_id);</div><div class='ctx'> 			return -ENODEV;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -629,6 +768,8 @@ static int lm90_detect(struct i2c_client *new_client, int kind,</div><div class='ctx'> 		name = "max6680";</div><div class='ctx'> 	} else if (kind == adt7461) {</div><div class='ctx'> 		name = "adt7461";</div><div class='add'>+	} else if (kind == max6646) {</div><div class='add'>+		name = "max6646";</div><div class='ctx'> 	}</div><div class='ctx'> 	strlcpy(info-&gt;type, name, I2C_NAME_SIZE);</div><div class='ctx'> </div><div class='hunk'>@@ -668,7 +809,7 @@ static int lm90_probe(struct i2c_client *new_client,</div><div class='ctx'> 					      &amp;dev_attr_pec)))</div><div class='ctx'> 			goto exit_remove_files;</div><div class='ctx'> 	}</div><div class='del'>-	if (data-&gt;kind != max6657) {</div><div class='add'>+	if (data-&gt;kind != max6657 &amp;&amp; data-&gt;kind != max6646) {</div><div class='ctx'> 		if ((err = device_create_file(&amp;new_client-&gt;dev,</div><div class='ctx'> 				&amp;sensor_dev_attr_temp2_offset.dev_attr)))</div><div class='ctx'> 			goto exit_remove_files;</div><div class='hunk'>@@ -707,6 +848,12 @@ static void lm90_init_client(struct i2c_client *client)</div><div class='ctx'> 	}</div><div class='ctx'> 	config_orig = config;</div><div class='ctx'> </div><div class='add'>+	/* Check Temperature Range Select */</div><div class='add'>+	if (data-&gt;kind == adt7461) {</div><div class='add'>+		if (config &amp; 0x04)</div><div class='add'>+			data-&gt;flags |= LM90_FLAG_ADT7461_EXT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Put MAX6680/MAX8881 into extended resolution (bit 0x10,</div><div class='ctx'> 	 * 0.125 degree resolution) and range (0x08, extend range</div><div class='hunk'>@@ -728,7 +875,7 @@ static int lm90_remove(struct i2c_client *client)</div><div class='ctx'> 	hwmon_device_unregister(data-&gt;hwmon_dev);</div><div class='ctx'> 	sysfs_remove_group(&amp;client-&gt;dev.kobj, &amp;lm90_group);</div><div class='ctx'> 	device_remove_file(&amp;client-&gt;dev, &amp;dev_attr_pec);</div><div class='del'>-	if (data-&gt;kind != max6657)</div><div class='add'>+	if (data-&gt;kind != max6657 &amp;&amp; data-&gt;kind != max6646)</div><div class='ctx'> 		device_remove_file(&amp;client-&gt;dev,</div><div class='ctx'> 				   &amp;sensor_dev_attr_temp2_offset.dev_attr);</div><div class='ctx'> </div><div class='hunk'>@@ -736,6 +883,38 @@ static int lm90_remove(struct i2c_client *client)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int lm90_read16(struct i2c_client *client, u8 regh, u8 regl, u16 *value)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	u8 oldh, newh, l;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * There is a trick here. We have to read two registers to have the</div><div class='add'>+	 * sensor temperature, but we have to beware a conversion could occur</div><div class='add'>+	 * inbetween the readings. The datasheet says we should either use</div><div class='add'>+	 * the one-shot conversion register, which we don't want to do</div><div class='add'>+	 * (disables hardware monitoring) or monitor the busy bit, which is</div><div class='add'>+	 * impossible (we can't read the values and monitor that bit at the</div><div class='add'>+	 * exact same time). So the solution used here is to read the high</div><div class='add'>+	 * byte once, then the low byte, then the high byte again. If the new</div><div class='add'>+	 * high byte matches the old one, then we have a valid reading. Else</div><div class='add'>+	 * we have to read the low byte again, and now we believe we have a</div><div class='add'>+	 * correct reading.</div><div class='add'>+	 */</div><div class='add'>+	if ((err = lm90_read_reg(client, regh, &amp;oldh))</div><div class='add'>+	 || (err = lm90_read_reg(client, regl, &amp;l))</div><div class='add'>+	 || (err = lm90_read_reg(client, regh, &amp;newh)))</div><div class='add'>+		return err;</div><div class='add'>+	if (oldh != newh) {</div><div class='add'>+		err = lm90_read_reg(client, regl, &amp;l);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+	*value = (newh &lt;&lt; 8) | l;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct lm90_data *lm90_update_device(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct i2c_client *client = to_i2c_client(dev);</div><div class='hunk'>@@ -744,49 +923,50 @@ static struct lm90_data *lm90_update_device(struct device *dev)</div><div class='ctx'> 	mutex_lock(&amp;data-&gt;update_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (time_after(jiffies, data-&gt;last_updated + HZ * 2) || !data-&gt;valid) {</div><div class='del'>-		u8 oldh, newh, l;</div><div class='add'>+		u8 h, l;</div><div class='ctx'> </div><div class='ctx'> 		dev_dbg(&amp;client-&gt;dev, "Updating lm90 data.\n");</div><div class='del'>-		lm90_read_reg(client, LM90_REG_R_LOCAL_TEMP, &amp;data-&gt;temp8[0]);</div><div class='del'>-		lm90_read_reg(client, LM90_REG_R_LOCAL_LOW, &amp;data-&gt;temp8[1]);</div><div class='del'>-		lm90_read_reg(client, LM90_REG_R_LOCAL_HIGH, &amp;data-&gt;temp8[2]);</div><div class='del'>-		lm90_read_reg(client, LM90_REG_R_LOCAL_CRIT, &amp;data-&gt;temp8[3]);</div><div class='del'>-		lm90_read_reg(client, LM90_REG_R_REMOTE_CRIT, &amp;data-&gt;temp8[4]);</div><div class='add'>+		lm90_read_reg(client, LM90_REG_R_LOCAL_LOW, &amp;data-&gt;temp8[0]);</div><div class='add'>+		lm90_read_reg(client, LM90_REG_R_LOCAL_HIGH, &amp;data-&gt;temp8[1]);</div><div class='add'>+		lm90_read_reg(client, LM90_REG_R_LOCAL_CRIT, &amp;data-&gt;temp8[2]);</div><div class='add'>+		lm90_read_reg(client, LM90_REG_R_REMOTE_CRIT, &amp;data-&gt;temp8[3]);</div><div class='ctx'> 		lm90_read_reg(client, LM90_REG_R_TCRIT_HYST, &amp;data-&gt;temp_hyst);</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * There is a trick here. We have to read two registers to</div><div class='del'>-		 * have the remote sensor temperature, but we have to beware</div><div class='del'>-		 * a conversion could occur inbetween the readings. The</div><div class='del'>-		 * datasheet says we should either use the one-shot</div><div class='del'>-		 * conversion register, which we don't want to do (disables</div><div class='del'>-		 * hardware monitoring) or monitor the busy bit, which is</div><div class='del'>-		 * impossible (we can't read the values and monitor that bit</div><div class='del'>-		 * at the exact same time). So the solution used here is to</div><div class='del'>-		 * read the high byte once, then the low byte, then the high</div><div class='del'>-		 * byte again. If the new high byte matches the old one,</div><div class='del'>-		 * then we have a valid reading. Else we have to read the low</div><div class='del'>-		 * byte again, and now we believe we have a correct reading.</div><div class='del'>-		 */</div><div class='del'>-		if (lm90_read_reg(client, LM90_REG_R_REMOTE_TEMPH, &amp;oldh) == 0</div><div class='del'>-		 &amp;&amp; lm90_read_reg(client, LM90_REG_R_REMOTE_TEMPL, &amp;l) == 0</div><div class='del'>-		 &amp;&amp; lm90_read_reg(client, LM90_REG_R_REMOTE_TEMPH, &amp;newh) == 0</div><div class='del'>-		 &amp;&amp; (newh == oldh</div><div class='del'>-		  || lm90_read_reg(client, LM90_REG_R_REMOTE_TEMPL, &amp;l) == 0))</div><div class='del'>-			data-&gt;temp11[0] = (newh &lt;&lt; 8) | l;</div><div class='del'>-</div><div class='del'>-		if (lm90_read_reg(client, LM90_REG_R_REMOTE_LOWH, &amp;newh) == 0</div><div class='del'>-		 &amp;&amp; lm90_read_reg(client, LM90_REG_R_REMOTE_LOWL, &amp;l) == 0)</div><div class='del'>-			data-&gt;temp11[1] = (newh &lt;&lt; 8) | l;</div><div class='del'>-		if (lm90_read_reg(client, LM90_REG_R_REMOTE_HIGHH, &amp;newh) == 0</div><div class='del'>-		 &amp;&amp; lm90_read_reg(client, LM90_REG_R_REMOTE_HIGHL, &amp;l) == 0)</div><div class='del'>-			data-&gt;temp11[2] = (newh &lt;&lt; 8) | l;</div><div class='del'>-		if (data-&gt;kind != max6657) {</div><div class='add'>+		if (data-&gt;kind == max6657 || data-&gt;kind == max6646) {</div><div class='add'>+			lm90_read16(client, LM90_REG_R_LOCAL_TEMP,</div><div class='add'>+				    MAX6657_REG_R_LOCAL_TEMPL,</div><div class='add'>+				    &amp;data-&gt;temp11[4]);</div><div class='add'>+		} else {</div><div class='add'>+			if (lm90_read_reg(client, LM90_REG_R_LOCAL_TEMP,</div><div class='add'>+					  &amp;h) == 0)</div><div class='add'>+				data-&gt;temp11[4] = h &lt;&lt; 8;</div><div class='add'>+		}</div><div class='add'>+		lm90_read16(client, LM90_REG_R_REMOTE_TEMPH,</div><div class='add'>+			    LM90_REG_R_REMOTE_TEMPL, &amp;data-&gt;temp11[0]);</div><div class='add'>+</div><div class='add'>+		if (lm90_read_reg(client, LM90_REG_R_REMOTE_LOWH, &amp;h) == 0) {</div><div class='add'>+			data-&gt;temp11[1] = h &lt;&lt; 8;</div><div class='add'>+			if (data-&gt;kind != max6657 &amp;&amp; data-&gt;kind != max6680</div><div class='add'>+			 &amp;&amp; data-&gt;kind != max6646</div><div class='add'>+			 &amp;&amp; lm90_read_reg(client, LM90_REG_R_REMOTE_LOWL,</div><div class='add'>+					  &amp;l) == 0)</div><div class='add'>+				data-&gt;temp11[1] |= l;</div><div class='add'>+		}</div><div class='add'>+		if (lm90_read_reg(client, LM90_REG_R_REMOTE_HIGHH, &amp;h) == 0) {</div><div class='add'>+			data-&gt;temp11[2] = h &lt;&lt; 8;</div><div class='add'>+			if (data-&gt;kind != max6657 &amp;&amp; data-&gt;kind != max6680</div><div class='add'>+			 &amp;&amp; data-&gt;kind != max6646</div><div class='add'>+			 &amp;&amp; lm90_read_reg(client, LM90_REG_R_REMOTE_HIGHL,</div><div class='add'>+					  &amp;l) == 0)</div><div class='add'>+				data-&gt;temp11[2] |= l;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (data-&gt;kind != max6657 &amp;&amp; data-&gt;kind != max6646) {</div><div class='ctx'> 			if (lm90_read_reg(client, LM90_REG_R_REMOTE_OFFSH,</div><div class='del'>-					  &amp;newh) == 0</div><div class='add'>+					  &amp;h) == 0</div><div class='ctx'> 			 &amp;&amp; lm90_read_reg(client, LM90_REG_R_REMOTE_OFFSL,</div><div class='ctx'> 					  &amp;l) == 0)</div><div class='del'>-				data-&gt;temp11[3] = (newh &lt;&lt; 8) | l;</div><div class='add'>+				data-&gt;temp11[3] = (h &lt;&lt; 8) | l;</div><div class='ctx'> 		}</div><div class='ctx'> 		lm90_read_reg(client, LM90_REG_R_STATUS, &amp;data-&gt;alarms);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/hwmon/max1111.c b/drivers/hwmon/max1111.c<br/>new file mode 100644<br/>index 000000000000..bfaa665ccf32<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hwmon/max1111.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hwmon/max1111.c</a></div><div class='hunk'>@@ -0,0 +1,244 @@</div><div class='add'>+/*</div><div class='add'>+ * max1111.c - +2.7V, Low-Power, Multichannel, Serial 8-bit ADCs</div><div class='add'>+ *</div><div class='add'>+ * Based on arch/arm/mach-pxa/corgi_ssp.c</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2004-2005 Richard Purdie</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2008 Marvell International Ltd.</div><div class='add'>+ * 	Eric Miao &lt;eric.miao@marvell.com&gt;</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ *  publishhed by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/hwmon.h&gt;</div><div class='add'>+#include &lt;linux/hwmon-sysfs.h&gt;</div><div class='add'>+#include &lt;linux/spi/spi.h&gt;</div><div class='add'>+</div><div class='add'>+#define MAX1111_TX_BUF_SIZE	1</div><div class='add'>+#define MAX1111_RX_BUF_SIZE	2</div><div class='add'>+</div><div class='add'>+/* MAX1111 Commands */</div><div class='add'>+#define MAX1111_CTRL_PD0      (1u &lt;&lt; 0)</div><div class='add'>+#define MAX1111_CTRL_PD1      (1u &lt;&lt; 1)</div><div class='add'>+#define MAX1111_CTRL_SGL      (1u &lt;&lt; 2)</div><div class='add'>+#define MAX1111_CTRL_UNI      (1u &lt;&lt; 3)</div><div class='add'>+#define MAX1111_CTRL_SEL_SH   (5)	/* NOTE: bit 4 is ignored */</div><div class='add'>+#define MAX1111_CTRL_STR      (1u &lt;&lt; 7)</div><div class='add'>+</div><div class='add'>+struct max1111_data {</div><div class='add'>+	struct spi_device	*spi;</div><div class='add'>+	struct device		*hwmon_dev;</div><div class='add'>+	struct spi_message	msg;</div><div class='add'>+	struct spi_transfer	xfer[2];</div><div class='add'>+	uint8_t *tx_buf;</div><div class='add'>+	uint8_t *rx_buf;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int max1111_read(struct device *dev, int channel)</div><div class='add'>+{</div><div class='add'>+	struct max1111_data *data = dev_get_drvdata(dev);</div><div class='add'>+	uint8_t v1, v2;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	data-&gt;tx_buf[0] = (channel &lt;&lt; MAX1111_CTRL_SEL_SH) |</div><div class='add'>+		MAX1111_CTRL_PD0 | MAX1111_CTRL_PD1 |</div><div class='add'>+		MAX1111_CTRL_SGL | MAX1111_CTRL_UNI | MAX1111_CTRL_STR;</div><div class='add'>+</div><div class='add'>+	err = spi_sync(data-&gt;spi, &amp;data-&gt;msg);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(dev, "spi_sync failed with %d\n", err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	v1 = data-&gt;rx_buf[0];</div><div class='add'>+	v2 = data-&gt;rx_buf[1];</div><div class='add'>+</div><div class='add'>+	if ((v1 &amp; 0xc0) || (v2 &amp; 0x3f))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return (v1 &lt;&lt; 2) | (v2 &gt;&gt; 6);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SHARPSL_PM</div><div class='add'>+static struct max1111_data *the_max1111;</div><div class='add'>+</div><div class='add'>+int max1111_read_channel(int channel)</div><div class='add'>+{</div><div class='add'>+	return max1111_read(&amp;the_max1111-&gt;spi-&gt;dev, channel);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(max1111_read_channel);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * NOTE: SPI devices do not have a default 'name' attribute, which is</div><div class='add'>+ * likely to be used by hwmon applications to distinguish between</div><div class='add'>+ * different devices, explicitly add a name attribute here.</div><div class='add'>+ */</div><div class='add'>+static ssize_t show_name(struct device *dev,</div><div class='add'>+			 struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	return sprintf(buf, "max1111\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t show_adc(struct device *dev,</div><div class='add'>+			struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	int channel = to_sensor_dev_attr(attr)-&gt;index;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = max1111_read(dev, channel);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "%d\n", ret);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define MAX1111_ADC_ATTR(_id)		\</div><div class='add'>+	SENSOR_DEVICE_ATTR(adc##_id##_in, S_IRUGO, show_adc, NULL, _id)</div><div class='add'>+</div><div class='add'>+static DEVICE_ATTR(name, S_IRUGO, show_name, NULL);</div><div class='add'>+static MAX1111_ADC_ATTR(0);</div><div class='add'>+static MAX1111_ADC_ATTR(1);</div><div class='add'>+static MAX1111_ADC_ATTR(2);</div><div class='add'>+static MAX1111_ADC_ATTR(3);</div><div class='add'>+</div><div class='add'>+static struct attribute *max1111_attributes[] = {</div><div class='add'>+	&amp;dev_attr_name.attr,</div><div class='add'>+	&amp;sensor_dev_attr_adc0_in.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_adc1_in.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_adc2_in.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_adc3_in.dev_attr.attr,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct attribute_group max1111_attr_group = {</div><div class='add'>+	.attrs	= max1111_attributes,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int setup_transfer(struct max1111_data *data)</div><div class='add'>+{</div><div class='add'>+	struct spi_message *m;</div><div class='add'>+	struct spi_transfer *x;</div><div class='add'>+</div><div class='add'>+	data-&gt;tx_buf = kmalloc(MAX1111_TX_BUF_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!data-&gt;tx_buf)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	data-&gt;rx_buf = kmalloc(MAX1111_RX_BUF_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!data-&gt;rx_buf) {</div><div class='add'>+		kfree(data-&gt;tx_buf);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	m = &amp;data-&gt;msg;</div><div class='add'>+	x = &amp;data-&gt;xfer[0];</div><div class='add'>+</div><div class='add'>+	spi_message_init(m);</div><div class='add'>+</div><div class='add'>+	x-&gt;tx_buf = &amp;data-&gt;tx_buf[0];</div><div class='add'>+	x-&gt;len = 1;</div><div class='add'>+	spi_message_add_tail(x, m);</div><div class='add'>+</div><div class='add'>+	x++;</div><div class='add'>+	x-&gt;rx_buf = &amp;data-&gt;rx_buf[0];</div><div class='add'>+	x-&gt;len = 2;</div><div class='add'>+	spi_message_add_tail(x, m);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devinit max1111_probe(struct spi_device *spi)</div><div class='add'>+{</div><div class='add'>+	struct max1111_data *data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	spi-&gt;bits_per_word = 8;</div><div class='add'>+	spi-&gt;mode = SPI_MODE_0;</div><div class='add'>+	err = spi_setup(spi);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	data = kzalloc(sizeof(struct max1111_data), GFP_KERNEL);</div><div class='add'>+	if (data == NULL) {</div><div class='add'>+		dev_err(&amp;spi-&gt;dev, "failed to allocate memory\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = setup_transfer(data);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_free_data;</div><div class='add'>+</div><div class='add'>+	data-&gt;spi = spi;</div><div class='add'>+	spi_set_drvdata(spi, data);</div><div class='add'>+</div><div class='add'>+	err = sysfs_create_group(&amp;spi-&gt;dev.kobj, &amp;max1111_attr_group);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(&amp;spi-&gt;dev, "failed to create attribute group\n");</div><div class='add'>+		goto err_free_all;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	data-&gt;hwmon_dev = hwmon_device_register(&amp;spi-&gt;dev);</div><div class='add'>+	if (IS_ERR(data-&gt;hwmon_dev)) {</div><div class='add'>+		dev_err(&amp;spi-&gt;dev, "failed to create hwmon device\n");</div><div class='add'>+		err = PTR_ERR(data-&gt;hwmon_dev);</div><div class='add'>+		goto err_remove;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SHARPSL_PM</div><div class='add'>+	the_max1111 = data;</div><div class='add'>+#endif</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_remove:</div><div class='add'>+	sysfs_remove_group(&amp;spi-&gt;dev.kobj, &amp;max1111_attr_group);</div><div class='add'>+err_free_all:</div><div class='add'>+	kfree(data-&gt;rx_buf);</div><div class='add'>+	kfree(data-&gt;tx_buf);</div><div class='add'>+err_free_data:</div><div class='add'>+	kfree(data);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devexit max1111_remove(struct spi_device *spi)</div><div class='add'>+{</div><div class='add'>+	struct max1111_data *data = spi_get_drvdata(spi);</div><div class='add'>+</div><div class='add'>+	hwmon_device_unregister(data-&gt;hwmon_dev);</div><div class='add'>+	sysfs_remove_group(&amp;spi-&gt;dev.kobj, &amp;max1111_attr_group);</div><div class='add'>+	kfree(data-&gt;rx_buf);</div><div class='add'>+	kfree(data-&gt;tx_buf);</div><div class='add'>+	kfree(data);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct spi_driver max1111_driver = {</div><div class='add'>+	.driver		= {</div><div class='add'>+		.name	= "max1111",</div><div class='add'>+		.owner	= THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+	.probe		= max1111_probe,</div><div class='add'>+	.remove		= __devexit_p(max1111_remove),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init max1111_init(void)</div><div class='add'>+{</div><div class='add'>+	return spi_register_driver(&amp;max1111_driver);</div><div class='add'>+}</div><div class='add'>+module_init(max1111_init);</div><div class='add'>+</div><div class='add'>+static void __exit max1111_exit(void)</div><div class='add'>+{</div><div class='add'>+	spi_unregister_driver(&amp;max1111_driver);</div><div class='add'>+}</div><div class='add'>+module_exit(max1111_exit);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Eric Miao &lt;eric.miao@marvell.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("MAX1111 ADC Driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/hwmon/max1619.c b/drivers/hwmon/max1619.c<br/>index 1ab1cacad598..7897754f3a5c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hwmon/max1619.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/hwmon/max1619.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hwmon/max1619.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hwmon/max1619.c</a></div><div class='hunk'>@@ -69,11 +69,18 @@ I2C_CLIENT_INSMOD_1(max1619);</div><div class='ctx'> #define MAX1619_REG_W_TCRIT_HYST	0x13</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Conversions and various macros</div><div class='add'>+ * Conversions</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define TEMP_FROM_REG(val)	((val &amp; 0x80 ? val-0x100 : val) * 1000)</div><div class='del'>-#define TEMP_TO_REG(val)	((val &lt; 0 ? val+0x100*1000 : val) / 1000)</div><div class='add'>+static int temp_from_reg(int val)</div><div class='add'>+{</div><div class='add'>+	return (val &amp; 0x80 ? val-0x100 : val) * 1000;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int temp_to_reg(int val)</div><div class='add'>+{</div><div class='add'>+	return (val &lt; 0 ? val+0x100*1000 : val) / 1000;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Functions declaration</div><div class='hunk'>@@ -135,7 +142,7 @@ struct max1619_data {</div><div class='ctx'> static ssize_t show_##value(struct device *dev, struct device_attribute *attr, char *buf) \</div><div class='ctx'> { \</div><div class='ctx'> 	struct max1619_data *data = max1619_update_device(dev); \</div><div class='del'>-	return sprintf(buf, "%d\n", TEMP_FROM_REG(data-&gt;value)); \</div><div class='add'>+	return sprintf(buf, "%d\n", temp_from_reg(data-&gt;value)); \</div><div class='ctx'> }</div><div class='ctx'> show_temp(temp_input1);</div><div class='ctx'> show_temp(temp_input2);</div><div class='hunk'>@@ -153,7 +160,7 @@ static ssize_t set_##value(struct device *dev, struct device_attribute *attr, co</div><div class='ctx'> 	long val = simple_strtol(buf, NULL, 10); \</div><div class='ctx'>  \</div><div class='ctx'> 	mutex_lock(&amp;data-&gt;update_lock); \</div><div class='del'>-	data-&gt;value = TEMP_TO_REG(val); \</div><div class='add'>+	data-&gt;value = temp_to_reg(val); \</div><div class='ctx'> 	i2c_smbus_write_byte_data(client, reg, data-&gt;value); \</div><div class='ctx'> 	mutex_unlock(&amp;data-&gt;update_lock); \</div><div class='ctx'> 	return count; \</div><div class='head'>diff --git a/drivers/hwmon/ultra45_env.c b/drivers/hwmon/ultra45_env.c<br/>new file mode 100644<br/>index 000000000000..68e90abeba96<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hwmon/ultra45_env.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hwmon/ultra45_env.c</a></div><div class='hunk'>@@ -0,0 +1,320 @@</div><div class='add'>+/* ultra45_env.c: Driver for Ultra45 PIC16F747 environmental monitor.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2008 David S. Miller &lt;davem@davemloft.net&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/of_device.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/hwmon.h&gt;</div><div class='add'>+#include &lt;linux/hwmon-sysfs.h&gt;</div><div class='add'>+</div><div class='add'>+#define DRV_MODULE_VERSION	"0.1"</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("David S. Miller (davem@davemloft.net)");</div><div class='add'>+MODULE_DESCRIPTION("Ultra45 environmental monitor driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_VERSION(DRV_MODULE_VERSION);</div><div class='add'>+</div><div class='add'>+/* PIC device registers */</div><div class='add'>+#define REG_CMD		0x00UL</div><div class='add'>+#define  REG_CMD_RESET	0x80</div><div class='add'>+#define  REG_CMD_ESTAR	0x01</div><div class='add'>+#define REG_STAT	0x01UL</div><div class='add'>+#define  REG_STAT_FWVER	0xf0</div><div class='add'>+#define  REG_STAT_TGOOD	0x08</div><div class='add'>+#define  REG_STAT_STALE	0x04</div><div class='add'>+#define  REG_STAT_BUSY	0x02</div><div class='add'>+#define  REG_STAT_FAULT	0x01</div><div class='add'>+#define REG_DATA	0x40UL</div><div class='add'>+#define REG_ADDR	0x41UL</div><div class='add'>+#define REG_SIZE	0x42UL</div><div class='add'>+</div><div class='add'>+/* Registers accessed indirectly via REG_DATA/REG_ADDR */</div><div class='add'>+#define IREG_FAN0		0x00</div><div class='add'>+#define IREG_FAN1		0x01</div><div class='add'>+#define IREG_FAN2		0x02</div><div class='add'>+#define IREG_FAN3		0x03</div><div class='add'>+#define IREG_FAN4		0x04</div><div class='add'>+#define IREG_FAN5		0x05</div><div class='add'>+#define IREG_LCL_TEMP		0x06</div><div class='add'>+#define IREG_RMT1_TEMP		0x07</div><div class='add'>+#define IREG_RMT2_TEMP		0x08</div><div class='add'>+#define IREG_RMT3_TEMP		0x09</div><div class='add'>+#define IREG_LM95221_TEMP	0x0a</div><div class='add'>+#define IREG_FIRE_TEMP		0x0b</div><div class='add'>+#define IREG_LSI1064_TEMP	0x0c</div><div class='add'>+#define IREG_FRONT_TEMP		0x0d</div><div class='add'>+#define IREG_FAN_STAT		0x0e</div><div class='add'>+#define IREG_VCORE0		0x0f</div><div class='add'>+#define IREG_VCORE1		0x10</div><div class='add'>+#define IREG_VMEM0		0x11</div><div class='add'>+#define IREG_VMEM1		0x12</div><div class='add'>+#define IREG_PSU_TEMP		0x13</div><div class='add'>+</div><div class='add'>+struct env {</div><div class='add'>+	void __iomem	*regs;</div><div class='add'>+	spinlock_t	lock;</div><div class='add'>+</div><div class='add'>+	struct device	*hwmon_dev;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u8 env_read(struct env *p, u8 ireg)</div><div class='add'>+{</div><div class='add'>+	u8 ret;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;p-&gt;lock);</div><div class='add'>+	writeb(ireg, p-&gt;regs + REG_ADDR);</div><div class='add'>+	ret = readb(p-&gt;regs + REG_DATA);</div><div class='add'>+	spin_unlock(&amp;p-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void env_write(struct env *p, u8 ireg, u8 val)</div><div class='add'>+{</div><div class='add'>+	spin_lock(&amp;p-&gt;lock);</div><div class='add'>+	writeb(ireg, p-&gt;regs + REG_ADDR);</div><div class='add'>+	writeb(val, p-&gt;regs + REG_DATA);</div><div class='add'>+	spin_unlock(&amp;p-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* There seems to be a adr7462 providing these values, thus a lot</div><div class='add'>+ * of these calculations are borrowed from the adt7470 driver.</div><div class='add'>+ */</div><div class='add'>+#define FAN_PERIOD_TO_RPM(x)	((90000 * 60) / (x))</div><div class='add'>+#define FAN_RPM_TO_PERIOD	FAN_PERIOD_TO_RPM</div><div class='add'>+#define FAN_PERIOD_INVALID	(0xff &lt;&lt; 8)</div><div class='add'>+#define FAN_DATA_VALID(x)	((x) &amp;&amp; (x) != FAN_PERIOD_INVALID)</div><div class='add'>+</div><div class='add'>+static ssize_t show_fan_speed(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	int fan_nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='add'>+	struct env *p = dev_get_drvdata(dev);</div><div class='add'>+	int rpm, period;</div><div class='add'>+	u8 val;</div><div class='add'>+</div><div class='add'>+	val = env_read(p, IREG_FAN0 + fan_nr);</div><div class='add'>+	period = (int) val &lt;&lt; 8;</div><div class='add'>+	if (FAN_DATA_VALID(period))</div><div class='add'>+		rpm = FAN_PERIOD_TO_RPM(period);</div><div class='add'>+	else</div><div class='add'>+		rpm = 0;</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "%d\n", rpm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t set_fan_speed(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			     const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	int fan_nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='add'>+	int rpm = simple_strtol(buf, NULL, 10);</div><div class='add'>+	struct env *p = dev_get_drvdata(dev);</div><div class='add'>+	int period;</div><div class='add'>+	u8 val;</div><div class='add'>+</div><div class='add'>+	if (!rpm)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	period = FAN_RPM_TO_PERIOD(rpm);</div><div class='add'>+	val = period &gt;&gt; 8;</div><div class='add'>+	env_write(p, IREG_FAN0 + fan_nr, val);</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t show_fan_fault(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	int fan_nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='add'>+	struct env *p = dev_get_drvdata(dev);</div><div class='add'>+	u8 val = env_read(p, IREG_FAN_STAT);</div><div class='add'>+	return sprintf(buf, "%d\n", (val &amp; (1 &lt;&lt; fan_nr)) ? 1 : 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define fan(index)							\</div><div class='add'>+static SENSOR_DEVICE_ATTR(fan##index##_speed, S_IRUGO | S_IWUSR,	\</div><div class='add'>+		show_fan_speed, set_fan_speed, index);			\</div><div class='add'>+static SENSOR_DEVICE_ATTR(fan##index##_fault, S_IRUGO,			\</div><div class='add'>+		show_fan_fault, NULL, index)</div><div class='add'>+</div><div class='add'>+fan(0);</div><div class='add'>+fan(1);</div><div class='add'>+fan(2);</div><div class='add'>+fan(3);</div><div class='add'>+fan(4);</div><div class='add'>+</div><div class='add'>+static SENSOR_DEVICE_ATTR(psu_fan_fault, S_IRUGO, show_fan_fault, NULL, 6);</div><div class='add'>+</div><div class='add'>+static ssize_t show_temp(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	int temp_nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='add'>+	struct env *p = dev_get_drvdata(dev);</div><div class='add'>+	s8 val;</div><div class='add'>+</div><div class='add'>+	val = env_read(p, IREG_LCL_TEMP + temp_nr);</div><div class='add'>+	return sprintf(buf, "%d\n", ((int) val) - 64);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static SENSOR_DEVICE_ATTR(adt7462_local_temp, S_IRUGO, show_temp, NULL, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR(cpu0_temp, S_IRUGO, show_temp, NULL, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR(cpu1_temp, S_IRUGO, show_temp, NULL, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR(motherboard_temp, S_IRUGO, show_temp, NULL, 3);</div><div class='add'>+static SENSOR_DEVICE_ATTR(lm95221_local_temp, S_IRUGO, show_temp, NULL, 4);</div><div class='add'>+static SENSOR_DEVICE_ATTR(fire_temp, S_IRUGO, show_temp, NULL, 5);</div><div class='add'>+static SENSOR_DEVICE_ATTR(lsi1064_local_temp, S_IRUGO, show_temp, NULL, 6);</div><div class='add'>+static SENSOR_DEVICE_ATTR(front_panel_temp, S_IRUGO, show_temp, NULL, 7);</div><div class='add'>+static SENSOR_DEVICE_ATTR(psu_temp, S_IRUGO, show_temp, NULL, 13);</div><div class='add'>+</div><div class='add'>+static ssize_t show_stat_bit(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	int index = to_sensor_dev_attr(attr)-&gt;index;</div><div class='add'>+	struct env *p = dev_get_drvdata(dev);</div><div class='add'>+	u8 val;</div><div class='add'>+</div><div class='add'>+	val = readb(p-&gt;regs + REG_STAT);</div><div class='add'>+	return sprintf(buf, "%d\n", (val &amp; (1 &lt;&lt; index)) ? 1 : 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static SENSOR_DEVICE_ATTR(fan_failure, S_IRUGO, show_stat_bit, NULL, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR(env_bus_busy, S_IRUGO, show_stat_bit, NULL, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR(env_data_stale, S_IRUGO, show_stat_bit, NULL, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR(tpm_self_test_passed, S_IRUGO, show_stat_bit, NULL, 3);</div><div class='add'>+</div><div class='add'>+static ssize_t show_fwver(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct env *p = dev_get_drvdata(dev);</div><div class='add'>+	u8 val;</div><div class='add'>+</div><div class='add'>+	val = readb(p-&gt;regs + REG_STAT);</div><div class='add'>+	return sprintf(buf, "%d\n", val &gt;&gt; 4);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static SENSOR_DEVICE_ATTR(firmware_version, S_IRUGO, show_fwver, NULL, 0);</div><div class='add'>+</div><div class='add'>+static ssize_t show_name(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	return sprintf(buf, "ultra45\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static SENSOR_DEVICE_ATTR(name, S_IRUGO, show_name, NULL, 0);</div><div class='add'>+</div><div class='add'>+static struct attribute *env_attributes[] = {</div><div class='add'>+	&amp;sensor_dev_attr_fan0_speed.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_fan0_fault.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_fan1_speed.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_fan1_fault.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_fan2_speed.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_fan2_fault.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_fan3_speed.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_fan3_fault.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_fan4_speed.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_fan4_fault.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_psu_fan_fault.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_adt7462_local_temp.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_cpu0_temp.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_cpu1_temp.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_motherboard_temp.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_lm95221_local_temp.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_fire_temp.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_lsi1064_local_temp.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_front_panel_temp.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_psu_temp.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_fan_failure.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_env_bus_busy.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_env_data_stale.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_tpm_self_test_passed.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_firmware_version.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_name.dev_attr.attr,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct attribute_group env_group = {</div><div class='add'>+	.attrs = env_attributes,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __devinit env_probe(struct of_device *op,</div><div class='add'>+			       const struct of_device_id *match)</div><div class='add'>+{</div><div class='add'>+	struct env *p = kzalloc(sizeof(*p), GFP_KERNEL);</div><div class='add'>+	int err = -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (!p)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;p-&gt;lock);</div><div class='add'>+</div><div class='add'>+	p-&gt;regs = of_ioremap(&amp;op-&gt;resource[0], 0, REG_SIZE, "pic16f747");</div><div class='add'>+	if (!p-&gt;regs)</div><div class='add'>+		goto out_free;</div><div class='add'>+</div><div class='add'>+	err = sysfs_create_group(&amp;op-&gt;dev.kobj, &amp;env_group);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_iounmap;</div><div class='add'>+</div><div class='add'>+	p-&gt;hwmon_dev = hwmon_device_register(&amp;op-&gt;dev);</div><div class='add'>+	if (IS_ERR(p-&gt;hwmon_dev)) {</div><div class='add'>+		err = PTR_ERR(p-&gt;hwmon_dev);</div><div class='add'>+		goto out_sysfs_remove_group;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(&amp;op-&gt;dev, p);</div><div class='add'>+	err = 0;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='add'>+</div><div class='add'>+out_sysfs_remove_group:</div><div class='add'>+	sysfs_remove_group(&amp;op-&gt;dev.kobj, &amp;env_group);</div><div class='add'>+</div><div class='add'>+out_iounmap:</div><div class='add'>+	of_iounmap(&amp;op-&gt;resource[0], p-&gt;regs, REG_SIZE);</div><div class='add'>+</div><div class='add'>+out_free:</div><div class='add'>+	kfree(p);</div><div class='add'>+	goto out;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devexit env_remove(struct of_device *op)</div><div class='add'>+{</div><div class='add'>+	struct env *p = dev_get_drvdata(&amp;op-&gt;dev);</div><div class='add'>+</div><div class='add'>+	if (p) {</div><div class='add'>+		sysfs_remove_group(&amp;op-&gt;dev.kobj, &amp;env_group);</div><div class='add'>+		hwmon_device_unregister(p-&gt;hwmon_dev);</div><div class='add'>+		of_iounmap(&amp;op-&gt;resource[0], p-&gt;regs, REG_SIZE);</div><div class='add'>+		kfree(p);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct of_device_id env_match[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "env-monitor",</div><div class='add'>+		.compatible = "SUNW,ebus-pic16f747-env",</div><div class='add'>+	},</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, env_match);</div><div class='add'>+</div><div class='add'>+static struct of_platform_driver env_driver = {</div><div class='add'>+	.name		= "ultra45_env",</div><div class='add'>+	.match_table	= env_match,</div><div class='add'>+	.probe		= env_probe,</div><div class='add'>+	.remove		= __devexit_p(env_remove),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init env_init(void)</div><div class='add'>+{</div><div class='add'>+	return of_register_driver(&amp;env_driver, &amp;of_bus_type);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit env_exit(void)</div><div class='add'>+{</div><div class='add'>+	of_unregister_driver(&amp;env_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(env_init);</div><div class='add'>+module_exit(env_exit);</div><div class='head'>diff --git a/drivers/hwmon/w83781d.c b/drivers/hwmon/w83781d.c<br/>index f942ecdd47c8..d4d1b859d4f1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hwmon/w83781d.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/hwmon/w83781d.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hwmon/w83781d.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hwmon/w83781d.c</a></div><div class='hunk'>@@ -4,7 +4,7 @@</div><div class='ctx'>     Copyright (c) 1998 - 2001  Frodo Looijaard &lt;frodol@dds.nl&gt;,</div><div class='ctx'>                                Philip Edelbrock &lt;phil@netroedge.com&gt;,</div><div class='ctx'>                                and Mark Studebaker &lt;mdsxyz123@yahoo.com&gt;</div><div class='del'>-    Copyright (c) 2007         Jean Delvare &lt;khali@linux-fr.org&gt;</div><div class='add'>+    Copyright (c) 2007 - 2008  Jean Delvare &lt;khali@linux-fr.org&gt;</div><div class='ctx'> </div><div class='ctx'>     This program is free software; you can redistribute it and/or modify</div><div class='ctx'>     it under the terms of the GNU General Public License as published by</div><div class='hunk'>@@ -38,25 +38,24 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/jiffies.h&gt;</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='del'>-#include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/hwmon.h&gt;</div><div class='ctx'> #include &lt;linux/hwmon-vid.h&gt;</div><div class='ctx'> #include &lt;linux/hwmon-sysfs.h&gt;</div><div class='ctx'> #include &lt;linux/sysfs.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ISA</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include "lm75.h"</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='del'>-/* ISA device, if found */</div><div class='del'>-static struct platform_device *pdev;</div><div class='add'>+#include "lm75.h"</div><div class='ctx'> </div><div class='ctx'> /* Addresses to scan */</div><div class='ctx'> static const unsigned short normal_i2c[] = { 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d,</div><div class='ctx'> 						0x2e, 0x2f, I2C_CLIENT_END };</div><div class='del'>-static unsigned short isa_address = 0x290;</div><div class='del'>-</div><div class='ctx'> /* Insmod parameters */</div><div class='ctx'> I2C_CLIENT_INSMOD_4(w83781d, w83782d, w83783s, as99127f);</div><div class='ctx'> I2C_CLIENT_MODULE_PARM(force_subclients, "List of subclient addresses: "</div><div class='hunk'>@@ -178,9 +177,9 @@ FAN_FROM_REG(u8 val, int div)</div><div class='ctx'> #define TEMP_FROM_REG(val)		((val) * 1000)</div><div class='ctx'> </div><div class='ctx'> #define BEEP_MASK_FROM_REG(val,type)	((type) == as99127f ? \</div><div class='del'>-					 (val) ^ 0x7fff : (val))</div><div class='add'>+					 (~(val)) &amp; 0x7fff : (val) &amp; 0xff7fff)</div><div class='ctx'> #define BEEP_MASK_TO_REG(val,type)	((type) == as99127f ? \</div><div class='del'>-					 (~(val)) &amp; 0x7fff : (val) &amp; 0xffffff)</div><div class='add'>+					 (~(val)) &amp; 0x7fff : (val) &amp; 0xff7fff)</div><div class='ctx'> </div><div class='ctx'> #define DIV_FROM_REG(val)		(1 &lt;&lt; (val))</div><div class='ctx'> </div><div class='hunk'>@@ -199,25 +198,16 @@ DIV_TO_REG(long val, enum chips type)</div><div class='ctx'> 	return i;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* There are some complications in a module like this. First off, W83781D chips</div><div class='del'>-   may be both present on the SMBus and the ISA bus, and we have to handle</div><div class='del'>-   those cases separately at some places. Second, there might be several</div><div class='del'>-   W83781D chips available (well, actually, that is probably never done; but</div><div class='del'>-   it is a clean illustration of how to handle a case like that). Finally,</div><div class='del'>-   a specific chip may be attached to *both* ISA and SMBus, and we would</div><div class='del'>-   not like to detect it double. Fortunately, in the case of the W83781D at</div><div class='del'>-   least, a register tells us what SMBus address we are on, so that helps</div><div class='del'>-   a bit - except if there could be more than one SMBus. Groan. No solution</div><div class='del'>-   for this yet. */</div><div class='del'>-</div><div class='del'>-/* For ISA chips, we abuse the i2c_client addr and name fields. We also use</div><div class='del'>-   the driver field to differentiate between I2C and ISA chips. */</div><div class='ctx'> struct w83781d_data {</div><div class='del'>-	struct i2c_client client;</div><div class='add'>+	struct i2c_client *client;</div><div class='ctx'> 	struct device *hwmon_dev;</div><div class='ctx'> 	struct mutex lock;</div><div class='ctx'> 	enum chips type;</div><div class='ctx'> </div><div class='add'>+	/* For ISA device only */</div><div class='add'>+	const char *name;</div><div class='add'>+	int isa_addr;</div><div class='add'>+</div><div class='ctx'> 	struct mutex update_lock;</div><div class='ctx'> 	char valid;		/* !=0 if following fields are valid */</div><div class='ctx'> 	unsigned long last_updated;	/* In jiffies */</div><div class='hunk'>@@ -240,7 +230,6 @@ struct w83781d_data {</div><div class='ctx'> 	u8 vid;			/* Register encoding, combined */</div><div class='ctx'> 	u32 alarms;		/* Register encoding, combined */</div><div class='ctx'> 	u32 beep_mask;		/* Register encoding, combined */</div><div class='del'>-	u8 beep_enable;		/* Boolean */</div><div class='ctx'> 	u8 pwm[4];		/* Register value */</div><div class='ctx'> 	u8 pwm2_enable;		/* Boolean */</div><div class='ctx'> 	u16 sens[3];		/* 782D/783S only.</div><div class='hunk'>@@ -249,36 +238,14 @@ struct w83781d_data {</div><div class='ctx'> 	u8 vrm;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int w83781d_attach_adapter(struct i2c_adapter *adapter);</div><div class='del'>-static int w83781d_detect(struct i2c_adapter *adapter, int address, int kind);</div><div class='del'>-static int w83781d_detach_client(struct i2c_client *client);</div><div class='del'>-</div><div class='del'>-static int __devinit w83781d_isa_probe(struct platform_device *pdev);</div><div class='del'>-static int __devexit w83781d_isa_remove(struct platform_device *pdev);</div><div class='add'>+static struct w83781d_data *w83781d_data_if_isa(void);</div><div class='add'>+static int w83781d_alias_detect(struct i2c_client *client, u8 chipid);</div><div class='ctx'> </div><div class='ctx'> static int w83781d_read_value(struct w83781d_data *data, u16 reg);</div><div class='ctx'> static int w83781d_write_value(struct w83781d_data *data, u16 reg, u16 value);</div><div class='ctx'> static struct w83781d_data *w83781d_update_device(struct device *dev);</div><div class='ctx'> static void w83781d_init_device(struct device *dev);</div><div class='ctx'> </div><div class='del'>-static struct i2c_driver w83781d_driver = {</div><div class='del'>-	.driver = {</div><div class='del'>-		.name = "w83781d",</div><div class='del'>-	},</div><div class='del'>-	.attach_adapter = w83781d_attach_adapter,</div><div class='del'>-	.detach_client = w83781d_detach_client,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct platform_driver w83781d_isa_driver = {</div><div class='del'>-	.driver = {</div><div class='del'>-		.owner = THIS_MODULE,</div><div class='del'>-		.name = "w83781d",</div><div class='del'>-	},</div><div class='del'>-	.probe = w83781d_isa_probe,</div><div class='del'>-	.remove = w83781d_isa_remove,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> /* following are the sysfs callback functions */</div><div class='ctx'> #define show_in_reg(reg) \</div><div class='ctx'> static ssize_t show_##reg (struct device *dev, struct device_attribute *da, \</div><div class='hunk'>@@ -513,11 +480,6 @@ static ssize_t show_beep_mask (struct device *dev, struct device_attribute *attr</div><div class='ctx'> 	return sprintf(buf, "%ld\n",</div><div class='ctx'> 		       (long)BEEP_MASK_FROM_REG(data-&gt;beep_mask, data-&gt;type));</div><div class='ctx'> }</div><div class='del'>-static ssize_t show_beep_enable (struct device *dev, struct device_attribute *attr, char *buf)</div><div class='del'>-{</div><div class='del'>-	struct w83781d_data *data = w83781d_update_device(dev);</div><div class='del'>-	return sprintf(buf, "%ld\n", (long)data-&gt;beep_enable);</div><div class='del'>-}</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='ctx'> store_beep_mask(struct device *dev, struct device_attribute *attr,</div><div class='hunk'>@@ -529,12 +491,12 @@ store_beep_mask(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	val = simple_strtoul(buf, NULL, 10);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;data-&gt;update_lock);</div><div class='del'>-	data-&gt;beep_mask = BEEP_MASK_TO_REG(val, data-&gt;type);</div><div class='add'>+	data-&gt;beep_mask &amp;= 0x8000; /* preserve beep enable */</div><div class='add'>+	data-&gt;beep_mask |= BEEP_MASK_TO_REG(val, data-&gt;type);</div><div class='ctx'> 	w83781d_write_value(data, W83781D_REG_BEEP_INTS1,</div><div class='ctx'> 			    data-&gt;beep_mask &amp; 0xff);</div><div class='ctx'> 	w83781d_write_value(data, W83781D_REG_BEEP_INTS2,</div><div class='del'>-			    ((data-&gt;beep_mask &gt;&gt; 8) &amp; 0x7f)</div><div class='del'>-			    | data-&gt;beep_enable &lt;&lt; 7);</div><div class='add'>+			    (data-&gt;beep_mask &gt;&gt; 8) &amp; 0xff);</div><div class='ctx'> 	if (data-&gt;type != w83781d &amp;&amp; data-&gt;type != as99127f) {</div><div class='ctx'> 		w83781d_write_value(data, W83781D_REG_BEEP_INTS3,</div><div class='ctx'> 				    ((data-&gt;beep_mask) &gt;&gt; 16) &amp; 0xff);</div><div class='hunk'>@@ -544,31 +506,8 @@ store_beep_mask(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t</div><div class='del'>-store_beep_enable(struct device *dev, struct device_attribute *attr,</div><div class='del'>-		const char *buf, size_t count)</div><div class='del'>-{</div><div class='del'>-	struct w83781d_data *data = dev_get_drvdata(dev);</div><div class='del'>-	u32 val;</div><div class='del'>-</div><div class='del'>-	val = simple_strtoul(buf, NULL, 10);</div><div class='del'>-	if (val != 0 &amp;&amp; val != 1)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;data-&gt;update_lock);</div><div class='del'>-	data-&gt;beep_enable = val;</div><div class='del'>-	val = w83781d_read_value(data, W83781D_REG_BEEP_INTS2) &amp; 0x7f;</div><div class='del'>-	val |= data-&gt;beep_enable &lt;&lt; 7;</div><div class='del'>-	w83781d_write_value(data, W83781D_REG_BEEP_INTS2, val);</div><div class='del'>-	mutex_unlock(&amp;data-&gt;update_lock);</div><div class='del'>-</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static DEVICE_ATTR(beep_mask, S_IRUGO | S_IWUSR,</div><div class='ctx'> 		show_beep_mask, store_beep_mask);</div><div class='del'>-static DEVICE_ATTR(beep_enable, S_IRUGO | S_IWUSR,</div><div class='del'>-		show_beep_enable, store_beep_enable);</div><div class='ctx'> </div><div class='ctx'> static ssize_t show_beep(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 		char *buf)</div><div class='hunk'>@@ -663,6 +602,8 @@ static SENSOR_DEVICE_ATTR(temp2_beep, S_IRUGO | S_IWUSR,</div><div class='ctx'> 			show_beep, store_beep, 5);</div><div class='ctx'> static SENSOR_DEVICE_ATTR(temp3_beep, S_IRUGO,</div><div class='ctx'> 			show_temp3_beep, store_beep, 13);</div><div class='add'>+static SENSOR_DEVICE_ATTR(beep_enable, S_IRUGO | S_IWUSR,</div><div class='add'>+			show_beep, store_beep, 15);</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='ctx'> show_fan_div(struct device *dev, struct device_attribute *da, char *buf)</div><div class='hunk'>@@ -866,45 +807,19 @@ static SENSOR_DEVICE_ATTR(temp2_type, S_IRUGO | S_IWUSR,</div><div class='ctx'> static SENSOR_DEVICE_ATTR(temp3_type, S_IRUGO | S_IWUSR,</div><div class='ctx'> 	show_sensor, store_sensor, 2);</div><div class='ctx'> </div><div class='del'>-/* I2C devices get this name attribute automatically, but for ISA devices</div><div class='del'>-   we must create it by ourselves. */</div><div class='del'>-static ssize_t</div><div class='del'>-show_name(struct device *dev, struct device_attribute *devattr, char *buf)</div><div class='del'>-{</div><div class='del'>-	struct w83781d_data *data = dev_get_drvdata(dev);</div><div class='del'>-	return sprintf(buf, "%s\n", data-&gt;client.name);</div><div class='del'>-}</div><div class='del'>-static DEVICE_ATTR(name, S_IRUGO, show_name, NULL);</div><div class='del'>-</div><div class='del'>-/* This function is called when:</div><div class='del'>-     * w83781d_driver is inserted (when this module is loaded), for each</div><div class='del'>-       available adapter</div><div class='del'>-     * when a new adapter is inserted (and w83781d_driver is still present) */</div><div class='del'>-static int</div><div class='del'>-w83781d_attach_adapter(struct i2c_adapter *adapter)</div><div class='del'>-{</div><div class='del'>-	if (!(adapter-&gt;class &amp; I2C_CLASS_HWMON))</div><div class='del'>-		return 0;</div><div class='del'>-	return i2c_probe(adapter, &amp;addr_data, w83781d_detect);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* Assumes that adapter is of I2C, not ISA variety.</div><div class='ctx'>  * OTHERWISE DON'T CALL THIS</div><div class='ctx'>  */</div><div class='ctx'> static int</div><div class='del'>-w83781d_detect_subclients(struct i2c_adapter *adapter, int address, int kind,</div><div class='del'>-		struct i2c_client *new_client)</div><div class='add'>+w83781d_detect_subclients(struct i2c_client *new_client)</div><div class='ctx'> {</div><div class='ctx'> 	int i, val1 = 0, id;</div><div class='ctx'> 	int err;</div><div class='del'>-	const char *client_name = "";</div><div class='add'>+	int address = new_client-&gt;addr;</div><div class='add'>+	unsigned short sc_addr[2];</div><div class='add'>+	struct i2c_adapter *adapter = new_client-&gt;adapter;</div><div class='ctx'> 	struct w83781d_data *data = i2c_get_clientdata(new_client);</div><div class='del'>-</div><div class='del'>-	data-&gt;lm75[0] = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);</div><div class='del'>-	if (!(data-&gt;lm75[0])) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto ERROR_SC_0;</div><div class='del'>-	}</div><div class='add'>+	enum chips kind = data-&gt;type;</div><div class='ctx'> </div><div class='ctx'> 	id = i2c_adapter_id(adapter);</div><div class='ctx'> </div><div class='hunk'>@@ -922,55 +837,35 @@ w83781d_detect_subclients(struct i2c_adapter *adapter, int address, int kind,</div><div class='ctx'> 		w83781d_write_value(data, W83781D_REG_I2C_SUBADDR,</div><div class='ctx'> 				(force_subclients[2] &amp; 0x07) |</div><div class='ctx'> 				((force_subclients[3] &amp; 0x07) &lt;&lt; 4));</div><div class='del'>-		data-&gt;lm75[0]-&gt;addr = force_subclients[2];</div><div class='add'>+		sc_addr[0] = force_subclients[2];</div><div class='ctx'> 	} else {</div><div class='ctx'> 		val1 = w83781d_read_value(data, W83781D_REG_I2C_SUBADDR);</div><div class='del'>-		data-&gt;lm75[0]-&gt;addr = 0x48 + (val1 &amp; 0x07);</div><div class='add'>+		sc_addr[0] = 0x48 + (val1 &amp; 0x07);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (kind != w83783s) {</div><div class='del'>-		data-&gt;lm75[1] = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);</div><div class='del'>-		if (!(data-&gt;lm75[1])) {</div><div class='del'>-			err = -ENOMEM;</div><div class='del'>-			goto ERROR_SC_1;</div><div class='del'>-		}</div><div class='del'>-</div><div class='ctx'> 		if (force_subclients[0] == id &amp;&amp;</div><div class='ctx'> 		    force_subclients[1] == address) {</div><div class='del'>-			data-&gt;lm75[1]-&gt;addr = force_subclients[3];</div><div class='add'>+			sc_addr[1] = force_subclients[3];</div><div class='ctx'> 		} else {</div><div class='del'>-			data-&gt;lm75[1]-&gt;addr = 0x48 + ((val1 &gt;&gt; 4) &amp; 0x07);</div><div class='add'>+			sc_addr[1] = 0x48 + ((val1 &gt;&gt; 4) &amp; 0x07);</div><div class='ctx'> 		}</div><div class='del'>-		if (data-&gt;lm75[0]-&gt;addr == data-&gt;lm75[1]-&gt;addr) {</div><div class='add'>+		if (sc_addr[0] == sc_addr[1]) {</div><div class='ctx'> 			dev_err(&amp;new_client-&gt;dev,</div><div class='ctx'> 			       "Duplicate addresses 0x%x for subclients.\n",</div><div class='del'>-			       data-&gt;lm75[0]-&gt;addr);</div><div class='add'>+			       sc_addr[0]);</div><div class='ctx'> 			err = -EBUSY;</div><div class='ctx'> 			goto ERROR_SC_2;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (kind == w83781d)</div><div class='del'>-		client_name = "w83781d subclient";</div><div class='del'>-	else if (kind == w83782d)</div><div class='del'>-		client_name = "w83782d subclient";</div><div class='del'>-	else if (kind == w83783s)</div><div class='del'>-		client_name = "w83783s subclient";</div><div class='del'>-	else if (kind == as99127f)</div><div class='del'>-		client_name = "as99127f subclient";</div><div class='del'>-</div><div class='ctx'> 	for (i = 0; i &lt;= 1; i++) {</div><div class='del'>-		/* store all data in w83781d */</div><div class='del'>-		i2c_set_clientdata(data-&gt;lm75[i], NULL);</div><div class='del'>-		data-&gt;lm75[i]-&gt;adapter = adapter;</div><div class='del'>-		data-&gt;lm75[i]-&gt;driver = &amp;w83781d_driver;</div><div class='del'>-		data-&gt;lm75[i]-&gt;flags = 0;</div><div class='del'>-		strlcpy(data-&gt;lm75[i]-&gt;name, client_name,</div><div class='del'>-			I2C_NAME_SIZE);</div><div class='del'>-		if ((err = i2c_attach_client(data-&gt;lm75[i]))) {</div><div class='add'>+		data-&gt;lm75[i] = i2c_new_dummy(adapter, sc_addr[i]);</div><div class='add'>+		if (!data-&gt;lm75[i]) {</div><div class='ctx'> 			dev_err(&amp;new_client-&gt;dev, "Subclient %d "</div><div class='ctx'> 				"registration at address 0x%x "</div><div class='del'>-				"failed.\n", i, data-&gt;lm75[i]-&gt;addr);</div><div class='add'>+				"failed.\n", i, sc_addr[i]);</div><div class='add'>+			err = -ENOMEM;</div><div class='ctx'> 			if (i == 1)</div><div class='ctx'> 				goto ERROR_SC_3;</div><div class='ctx'> 			goto ERROR_SC_2;</div><div class='hunk'>@@ -983,12 +878,9 @@ w83781d_detect_subclients(struct i2c_adapter *adapter, int address, int kind,</div><div class='ctx'> </div><div class='ctx'> /* Undo inits in case of errors */</div><div class='ctx'> ERROR_SC_3:</div><div class='del'>-	i2c_detach_client(data-&gt;lm75[0]);</div><div class='add'>+	i2c_unregister_device(data-&gt;lm75[0]);</div><div class='ctx'> ERROR_SC_2:</div><div class='del'>-	kfree(data-&gt;lm75[1]);</div><div class='ctx'> ERROR_SC_1:</div><div class='del'>-	kfree(data-&gt;lm75[0]);</div><div class='del'>-ERROR_SC_0:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1029,7 +921,7 @@ static struct attribute* w83781d_attributes[] = {</div><div class='ctx'> 	&amp;dev_attr_vrm.attr,</div><div class='ctx'> 	&amp;dev_attr_alarms.attr,</div><div class='ctx'> 	&amp;dev_attr_beep_mask.attr,</div><div class='del'>-	&amp;dev_attr_beep_enable.attr,</div><div class='add'>+	&amp;sensor_dev_attr_beep_enable.dev_attr.attr,</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> static const struct attribute_group w83781d_group = {</div><div class='hunk'>@@ -1151,96 +1043,74 @@ w83781d_create_files(struct device *dev, int kind, int is_isa)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (is_isa) {</div><div class='del'>-		err = device_create_file(&amp;pdev-&gt;dev, &amp;dev_attr_name);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Return 0 if detection is successful, -ENODEV otherwise */</div><div class='ctx'> static int</div><div class='del'>-w83781d_detect(struct i2c_adapter *adapter, int address, int kind)</div><div class='add'>+w83781d_detect(struct i2c_client *client, int kind,</div><div class='add'>+	       struct i2c_board_info *info)</div><div class='ctx'> {</div><div class='ctx'> 	int val1 = 0, val2;</div><div class='del'>-	struct i2c_client *client;</div><div class='del'>-	struct device *dev;</div><div class='del'>-	struct w83781d_data *data;</div><div class='del'>-	int err;</div><div class='add'>+	struct w83781d_data *isa = w83781d_data_if_isa();</div><div class='add'>+	struct i2c_adapter *adapter = client-&gt;adapter;</div><div class='add'>+	int address = client-&gt;addr;</div><div class='ctx'> 	const char *client_name = "";</div><div class='ctx'> 	enum vendor { winbond, asus } vendid;</div><div class='ctx'> </div><div class='del'>-	if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) {</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-		goto ERROR1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* OK. For now, we presume we have a valid client. We now create the</div><div class='del'>-	   client structure, even though we cannot fill it completely yet.</div><div class='del'>-	   But it allows us to access w83781d_{read,write}_value. */</div><div class='del'>-</div><div class='del'>-	if (!(data = kzalloc(sizeof(struct w83781d_data), GFP_KERNEL))) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto ERROR1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	client = &amp;data-&gt;client;</div><div class='del'>-	i2c_set_clientdata(client, data);</div><div class='del'>-	client-&gt;addr = address;</div><div class='del'>-	mutex_init(&amp;data-&gt;lock);</div><div class='del'>-	client-&gt;adapter = adapter;</div><div class='del'>-	client-&gt;driver = &amp;w83781d_driver;</div><div class='del'>-	dev = &amp;client-&gt;dev;</div><div class='add'>+	if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	/* Now, we do the remaining detection. */</div><div class='add'>+	/* We block updates of the ISA device to minimize the risk of</div><div class='add'>+	   concurrent access to the same W83781D chip through different</div><div class='add'>+	   interfaces. */</div><div class='add'>+	if (isa)</div><div class='add'>+		mutex_lock(&amp;isa-&gt;update_lock);</div><div class='ctx'> </div><div class='ctx'> 	/* The w8378?d may be stuck in some other bank than bank 0. This may</div><div class='ctx'> 	   make reading other information impossible. Specify a force=... or</div><div class='ctx'> 	   force_*=... parameter, and the Winbond will be reset to the right</div><div class='ctx'> 	   bank. */</div><div class='ctx'> 	if (kind &lt; 0) {</div><div class='del'>-		if (w83781d_read_value(data, W83781D_REG_CONFIG) &amp; 0x80) {</div><div class='add'>+		if (i2c_smbus_read_byte_data</div><div class='add'>+		    (client, W83781D_REG_CONFIG) &amp; 0x80) {</div><div class='ctx'> 			dev_dbg(&amp;adapter-&gt;dev, "Detection of w83781d chip "</div><div class='ctx'> 				"failed at step 3\n");</div><div class='del'>-			err = -ENODEV;</div><div class='del'>-			goto ERROR2;</div><div class='add'>+			goto err_nodev;</div><div class='ctx'> 		}</div><div class='del'>-		val1 = w83781d_read_value(data, W83781D_REG_BANK);</div><div class='del'>-		val2 = w83781d_read_value(data, W83781D_REG_CHIPMAN);</div><div class='add'>+		val1 = i2c_smbus_read_byte_data(client, W83781D_REG_BANK);</div><div class='add'>+		val2 = i2c_smbus_read_byte_data(client, W83781D_REG_CHIPMAN);</div><div class='ctx'> 		/* Check for Winbond or Asus ID if in bank 0 */</div><div class='ctx'> 		if ((!(val1 &amp; 0x07)) &amp;&amp;</div><div class='ctx'> 		    (((!(val1 &amp; 0x80)) &amp;&amp; (val2 != 0xa3) &amp;&amp; (val2 != 0xc3))</div><div class='ctx'> 		     || ((val1 &amp; 0x80) &amp;&amp; (val2 != 0x5c) &amp;&amp; (val2 != 0x12)))) {</div><div class='ctx'> 			dev_dbg(&amp;adapter-&gt;dev, "Detection of w83781d chip "</div><div class='ctx'> 				"failed at step 4\n");</div><div class='del'>-			err = -ENODEV;</div><div class='del'>-			goto ERROR2;</div><div class='add'>+			goto err_nodev;</div><div class='ctx'> 		}</div><div class='ctx'> 		/* If Winbond SMBus, check address at 0x48.</div><div class='ctx'> 		   Asus doesn't support, except for as99127f rev.2 */</div><div class='ctx'> 		if ((!(val1 &amp; 0x80) &amp;&amp; (val2 == 0xa3)) ||</div><div class='ctx'> 		    ((val1 &amp; 0x80) &amp;&amp; (val2 == 0x5c))) {</div><div class='del'>-			if (w83781d_read_value</div><div class='del'>-			    (data, W83781D_REG_I2C_ADDR) != address) {</div><div class='add'>+			if (i2c_smbus_read_byte_data</div><div class='add'>+			    (client, W83781D_REG_I2C_ADDR) != address) {</div><div class='ctx'> 				dev_dbg(&amp;adapter-&gt;dev, "Detection of w83781d "</div><div class='ctx'> 					"chip failed at step 5\n");</div><div class='del'>-				err = -ENODEV;</div><div class='del'>-				goto ERROR2;</div><div class='add'>+				goto err_nodev;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* We have either had a force parameter, or we have already detected the</div><div class='ctx'> 	   Winbond. Put it now into bank 0 and Vendor ID High Byte */</div><div class='del'>-	w83781d_write_value(data, W83781D_REG_BANK,</div><div class='del'>-			    (w83781d_read_value(data, W83781D_REG_BANK)</div><div class='del'>-			     &amp; 0x78) | 0x80);</div><div class='add'>+	i2c_smbus_write_byte_data(client, W83781D_REG_BANK,</div><div class='add'>+		(i2c_smbus_read_byte_data(client, W83781D_REG_BANK)</div><div class='add'>+		 &amp; 0x78) | 0x80);</div><div class='ctx'> </div><div class='ctx'> 	/* Determine the chip type. */</div><div class='ctx'> 	if (kind &lt;= 0) {</div><div class='ctx'> 		/* get vendor ID */</div><div class='del'>-		val2 = w83781d_read_value(data, W83781D_REG_CHIPMAN);</div><div class='add'>+		val2 = i2c_smbus_read_byte_data(client, W83781D_REG_CHIPMAN);</div><div class='ctx'> 		if (val2 == 0x5c)</div><div class='ctx'> 			vendid = winbond;</div><div class='ctx'> 		else if (val2 == 0x12)</div><div class='hunk'>@@ -1248,11 +1118,10 @@ w83781d_detect(struct i2c_adapter *adapter, int address, int kind)</div><div class='ctx'> 		else {</div><div class='ctx'> 			dev_dbg(&amp;adapter-&gt;dev, "w83781d chip vendor is "</div><div class='ctx'> 				"neither Winbond nor Asus\n");</div><div class='del'>-			err = -ENODEV;</div><div class='del'>-			goto ERROR2;</div><div class='add'>+			goto err_nodev;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		val1 = w83781d_read_value(data, W83781D_REG_WCHIPID);</div><div class='add'>+		val1 = i2c_smbus_read_byte_data(client, W83781D_REG_WCHIPID);</div><div class='ctx'> 		if ((val1 == 0x10 || val1 == 0x11) &amp;&amp; vendid == winbond)</div><div class='ctx'> 			kind = w83781d;</div><div class='ctx'> 		else if (val1 == 0x30 &amp;&amp; vendid == winbond)</div><div class='hunk'>@@ -1266,11 +1135,20 @@ w83781d_detect(struct i2c_adapter *adapter, int address, int kind)</div><div class='ctx'> 				dev_warn(&amp;adapter-&gt;dev, "Ignoring 'force' "</div><div class='ctx'> 					 "parameter for unknown chip at "</div><div class='ctx'> 					 "address 0x%02x\n", address);</div><div class='del'>-			err = -EINVAL;</div><div class='del'>-			goto ERROR2;</div><div class='add'>+			goto err_nodev;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if ((kind == w83781d || kind == w83782d)</div><div class='add'>+		 &amp;&amp; w83781d_alias_detect(client, val1)) {</div><div class='add'>+			dev_dbg(&amp;adapter-&gt;dev, "Device at 0x%02x appears to "</div><div class='add'>+				"be the same as ISA device\n", address);</div><div class='add'>+			goto err_nodev;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (isa)</div><div class='add'>+		mutex_unlock(&amp;isa-&gt;update_lock);</div><div class='add'>+</div><div class='ctx'> 	if (kind == w83781d) {</div><div class='ctx'> 		client_name = "w83781d";</div><div class='ctx'> 	} else if (kind == w83782d) {</div><div class='hunk'>@@ -1281,24 +1159,46 @@ w83781d_detect(struct i2c_adapter *adapter, int address, int kind)</div><div class='ctx'> 		client_name = "as99127f";</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Fill in the remaining client fields and put into the global list */</div><div class='del'>-	strlcpy(client-&gt;name, client_name, I2C_NAME_SIZE);</div><div class='del'>-	data-&gt;type = kind;</div><div class='add'>+	strlcpy(info-&gt;type, client_name, I2C_NAME_SIZE);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+ err_nodev:</div><div class='add'>+	if (isa)</div><div class='add'>+		mutex_unlock(&amp;isa-&gt;update_lock);</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+w83781d_probe(struct i2c_client *client, const struct i2c_device_id *id)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = &amp;client-&gt;dev;</div><div class='add'>+	struct w83781d_data *data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	data = kzalloc(sizeof(struct w83781d_data), GFP_KERNEL);</div><div class='add'>+	if (!data) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto ERROR1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	i2c_set_clientdata(client, data);</div><div class='add'>+	mutex_init(&amp;data-&gt;lock);</div><div class='add'>+	mutex_init(&amp;data-&gt;update_lock);</div><div class='ctx'> </div><div class='del'>-	/* Tell the I2C layer a new client has arrived */</div><div class='del'>-	if ((err = i2c_attach_client(client)))</div><div class='del'>-		goto ERROR2;</div><div class='add'>+	data-&gt;type = id-&gt;driver_data;</div><div class='add'>+	data-&gt;client = client;</div><div class='ctx'> </div><div class='ctx'> 	/* attach secondary i2c lm75-like clients */</div><div class='del'>-	if ((err = w83781d_detect_subclients(adapter, address,</div><div class='del'>-			kind, client)))</div><div class='add'>+	err = w83781d_detect_subclients(client);</div><div class='add'>+	if (err)</div><div class='ctx'> 		goto ERROR3;</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize the chip */</div><div class='ctx'> 	w83781d_init_device(dev);</div><div class='ctx'> </div><div class='ctx'> 	/* Register sysfs hooks */</div><div class='del'>-	err = w83781d_create_files(dev, kind, 0);</div><div class='add'>+	err = w83781d_create_files(dev, data-&gt;type, 0);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto ERROR4;</div><div class='ctx'> </div><div class='hunk'>@@ -1314,264 +1214,113 @@ ERROR4:</div><div class='ctx'> 	sysfs_remove_group(&amp;dev-&gt;kobj, &amp;w83781d_group);</div><div class='ctx'> 	sysfs_remove_group(&amp;dev-&gt;kobj, &amp;w83781d_group_opt);</div><div class='ctx'> </div><div class='del'>-	if (data-&gt;lm75[1]) {</div><div class='del'>-		i2c_detach_client(data-&gt;lm75[1]);</div><div class='del'>-		kfree(data-&gt;lm75[1]);</div><div class='del'>-	}</div><div class='del'>-	if (data-&gt;lm75[0]) {</div><div class='del'>-		i2c_detach_client(data-&gt;lm75[0]);</div><div class='del'>-		kfree(data-&gt;lm75[0]);</div><div class='del'>-	}</div><div class='add'>+	if (data-&gt;lm75[0])</div><div class='add'>+		i2c_unregister_device(data-&gt;lm75[0]);</div><div class='add'>+	if (data-&gt;lm75[1])</div><div class='add'>+		i2c_unregister_device(data-&gt;lm75[1]);</div><div class='ctx'> ERROR3:</div><div class='del'>-	i2c_detach_client(client);</div><div class='del'>-ERROR2:</div><div class='add'>+	i2c_set_clientdata(client, NULL);</div><div class='ctx'> 	kfree(data);</div><div class='ctx'> ERROR1:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-w83781d_detach_client(struct i2c_client *client)</div><div class='add'>+w83781d_remove(struct i2c_client *client)</div><div class='ctx'> {</div><div class='ctx'> 	struct w83781d_data *data = i2c_get_clientdata(client);</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	/* main client */</div><div class='del'>-	if (data) {</div><div class='del'>-		hwmon_device_unregister(data-&gt;hwmon_dev);</div><div class='del'>-		sysfs_remove_group(&amp;client-&gt;dev.kobj, &amp;w83781d_group);</div><div class='del'>-		sysfs_remove_group(&amp;client-&gt;dev.kobj, &amp;w83781d_group_opt);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((err = i2c_detach_client(client)))</div><div class='del'>-		return err;</div><div class='add'>+	struct device *dev = &amp;client-&gt;dev;</div><div class='ctx'> </div><div class='del'>-	/* main client */</div><div class='del'>-	if (data)</div><div class='del'>-		kfree(data);</div><div class='del'>-</div><div class='del'>-	/* subclient */</div><div class='del'>-	else</div><div class='del'>-		kfree(client);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __devinit</div><div class='del'>-w83781d_isa_probe(struct platform_device *pdev)</div><div class='del'>-{</div><div class='del'>-	int err, reg;</div><div class='del'>-	struct w83781d_data *data;</div><div class='del'>-	struct resource *res;</div><div class='del'>-	const char *name;</div><div class='del'>-</div><div class='del'>-	/* Reserve the ISA region */</div><div class='del'>-	res = platform_get_resource(pdev, IORESOURCE_IO, 0);</div><div class='del'>-	if (!request_region(res-&gt;start + W83781D_ADDR_REG_OFFSET, 2,</div><div class='del'>-			    "w83781d")) {</div><div class='del'>-		err = -EBUSY;</div><div class='del'>-		goto exit;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!(data = kzalloc(sizeof(struct w83781d_data), GFP_KERNEL))) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto exit_release_region;</div><div class='del'>-	}</div><div class='del'>-	mutex_init(&amp;data-&gt;lock);</div><div class='del'>-	data-&gt;client.addr = res-&gt;start;</div><div class='del'>-	i2c_set_clientdata(&amp;data-&gt;client, data);</div><div class='del'>-	platform_set_drvdata(pdev, data);</div><div class='del'>-</div><div class='del'>-	reg = w83781d_read_value(data, W83781D_REG_WCHIPID);</div><div class='del'>-	switch (reg) {</div><div class='del'>-	case 0x30:</div><div class='del'>-		data-&gt;type = w83782d;</div><div class='del'>-		name = "w83782d";</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		data-&gt;type = w83781d;</div><div class='del'>-		name = "w83781d";</div><div class='del'>-	}</div><div class='del'>-	strlcpy(data-&gt;client.name, name, I2C_NAME_SIZE);</div><div class='del'>-</div><div class='del'>-	/* Initialize the W83781D chip */</div><div class='del'>-	w83781d_init_device(&amp;pdev-&gt;dev);</div><div class='del'>-</div><div class='del'>-	/* Register sysfs hooks */</div><div class='del'>-	err = w83781d_create_files(&amp;pdev-&gt;dev, data-&gt;type, 1);</div><div class='del'>-	if (err)</div><div class='del'>-		goto exit_remove_files;</div><div class='del'>-</div><div class='del'>-	data-&gt;hwmon_dev = hwmon_device_register(&amp;pdev-&gt;dev);</div><div class='del'>-	if (IS_ERR(data-&gt;hwmon_dev)) {</div><div class='del'>-		err = PTR_ERR(data-&gt;hwmon_dev);</div><div class='del'>-		goto exit_remove_files;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	hwmon_device_unregister(data-&gt;hwmon_dev);</div><div class='ctx'> </div><div class='del'>- exit_remove_files:</div><div class='del'>-	sysfs_remove_group(&amp;pdev-&gt;dev.kobj, &amp;w83781d_group);</div><div class='del'>-	sysfs_remove_group(&amp;pdev-&gt;dev.kobj, &amp;w83781d_group_opt);</div><div class='del'>-	device_remove_file(&amp;pdev-&gt;dev, &amp;dev_attr_name);</div><div class='del'>-	kfree(data);</div><div class='del'>- exit_release_region:</div><div class='del'>-	release_region(res-&gt;start + W83781D_ADDR_REG_OFFSET, 2);</div><div class='del'>- exit:</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='add'>+	sysfs_remove_group(&amp;dev-&gt;kobj, &amp;w83781d_group);</div><div class='add'>+	sysfs_remove_group(&amp;dev-&gt;kobj, &amp;w83781d_group_opt);</div><div class='ctx'> </div><div class='del'>-static int __devexit</div><div class='del'>-w83781d_isa_remove(struct platform_device *pdev)</div><div class='del'>-{</div><div class='del'>-	struct w83781d_data *data = platform_get_drvdata(pdev);</div><div class='add'>+	if (data-&gt;lm75[0])</div><div class='add'>+		i2c_unregister_device(data-&gt;lm75[0]);</div><div class='add'>+	if (data-&gt;lm75[1])</div><div class='add'>+		i2c_unregister_device(data-&gt;lm75[1]);</div><div class='ctx'> </div><div class='del'>-	hwmon_device_unregister(data-&gt;hwmon_dev);</div><div class='del'>-	sysfs_remove_group(&amp;pdev-&gt;dev.kobj, &amp;w83781d_group);</div><div class='del'>-	sysfs_remove_group(&amp;pdev-&gt;dev.kobj, &amp;w83781d_group_opt);</div><div class='del'>-	device_remove_file(&amp;pdev-&gt;dev, &amp;dev_attr_name);</div><div class='del'>-	release_region(data-&gt;client.addr + W83781D_ADDR_REG_OFFSET, 2);</div><div class='add'>+	i2c_set_clientdata(client, NULL);</div><div class='ctx'> 	kfree(data);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* The SMBus locks itself, usually, but nothing may access the Winbond between</div><div class='del'>-   bank switches. ISA access must always be locked explicitly!</div><div class='del'>-   We ignore the W83781D BUSY flag at this moment - it could lead to deadlocks,</div><div class='del'>-   would slow down the W83781D access and should not be necessary.</div><div class='del'>-   There are some ugly typecasts here, but the good news is - they should</div><div class='del'>-   nowhere else be necessary! */</div><div class='ctx'> static int</div><div class='del'>-w83781d_read_value(struct w83781d_data *data, u16 reg)</div><div class='add'>+w83781d_read_value_i2c(struct w83781d_data *data, u16 reg)</div><div class='ctx'> {</div><div class='del'>-	struct i2c_client *client = &amp;data-&gt;client;</div><div class='del'>-	int res, word_sized, bank;</div><div class='add'>+	struct i2c_client *client = data-&gt;client;</div><div class='add'>+	int res, bank;</div><div class='ctx'> 	struct i2c_client *cl;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;data-&gt;lock);</div><div class='del'>-	if (!client-&gt;driver) { /* ISA device */</div><div class='del'>-		word_sized = (((reg &amp; 0xff00) == 0x100)</div><div class='del'>-			      || ((reg &amp; 0xff00) == 0x200))</div><div class='del'>-		    &amp;&amp; (((reg &amp; 0x00ff) == 0x50)</div><div class='del'>-			|| ((reg &amp; 0x00ff) == 0x53)</div><div class='del'>-			|| ((reg &amp; 0x00ff) == 0x55));</div><div class='del'>-		if (reg &amp; 0xff00) {</div><div class='del'>-			outb_p(W83781D_REG_BANK,</div><div class='del'>-			       client-&gt;addr + W83781D_ADDR_REG_OFFSET);</div><div class='del'>-			outb_p(reg &gt;&gt; 8,</div><div class='del'>-			       client-&gt;addr + W83781D_DATA_REG_OFFSET);</div><div class='del'>-		}</div><div class='del'>-		outb_p(reg &amp; 0xff, client-&gt;addr + W83781D_ADDR_REG_OFFSET);</div><div class='del'>-		res = inb_p(client-&gt;addr + W83781D_DATA_REG_OFFSET);</div><div class='del'>-		if (word_sized) {</div><div class='del'>-			outb_p((reg &amp; 0xff) + 1,</div><div class='del'>-			       client-&gt;addr + W83781D_ADDR_REG_OFFSET);</div><div class='del'>-			res =</div><div class='del'>-			    (res &lt;&lt; 8) + inb_p(client-&gt;addr +</div><div class='del'>-					       W83781D_DATA_REG_OFFSET);</div><div class='del'>-		}</div><div class='del'>-		if (reg &amp; 0xff00) {</div><div class='del'>-			outb_p(W83781D_REG_BANK,</div><div class='del'>-			       client-&gt;addr + W83781D_ADDR_REG_OFFSET);</div><div class='del'>-			outb_p(0, client-&gt;addr + W83781D_DATA_REG_OFFSET);</div><div class='del'>-		}</div><div class='add'>+	bank = (reg &gt;&gt; 8) &amp; 0x0f;</div><div class='add'>+	if (bank &gt; 2)</div><div class='add'>+		/* switch banks */</div><div class='add'>+		i2c_smbus_write_byte_data(client, W83781D_REG_BANK,</div><div class='add'>+					  bank);</div><div class='add'>+	if (bank == 0 || bank &gt; 2) {</div><div class='add'>+		res = i2c_smbus_read_byte_data(client, reg &amp; 0xff);</div><div class='ctx'> 	} else {</div><div class='del'>-		bank = (reg &gt;&gt; 8) &amp; 0x0f;</div><div class='del'>-		if (bank &gt; 2)</div><div class='del'>-			/* switch banks */</div><div class='del'>-			i2c_smbus_write_byte_data(client, W83781D_REG_BANK,</div><div class='del'>-						  bank);</div><div class='del'>-		if (bank == 0 || bank &gt; 2) {</div><div class='del'>-			res = i2c_smbus_read_byte_data(client, reg &amp; 0xff);</div><div class='del'>-		} else {</div><div class='del'>-			/* switch to subclient */</div><div class='del'>-			cl = data-&gt;lm75[bank - 1];</div><div class='del'>-			/* convert from ISA to LM75 I2C addresses */</div><div class='del'>-			switch (reg &amp; 0xff) {</div><div class='del'>-			case 0x50:	/* TEMP */</div><div class='del'>-				res = swab16(i2c_smbus_read_word_data(cl, 0));</div><div class='del'>-				break;</div><div class='del'>-			case 0x52:	/* CONFIG */</div><div class='del'>-				res = i2c_smbus_read_byte_data(cl, 1);</div><div class='del'>-				break;</div><div class='del'>-			case 0x53:	/* HYST */</div><div class='del'>-				res = swab16(i2c_smbus_read_word_data(cl, 2));</div><div class='del'>-				break;</div><div class='del'>-			case 0x55:	/* OVER */</div><div class='del'>-			default:</div><div class='del'>-				res = swab16(i2c_smbus_read_word_data(cl, 3));</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='add'>+		/* switch to subclient */</div><div class='add'>+		cl = data-&gt;lm75[bank - 1];</div><div class='add'>+		/* convert from ISA to LM75 I2C addresses */</div><div class='add'>+		switch (reg &amp; 0xff) {</div><div class='add'>+		case 0x50:	/* TEMP */</div><div class='add'>+			res = swab16(i2c_smbus_read_word_data(cl, 0));</div><div class='add'>+			break;</div><div class='add'>+		case 0x52:	/* CONFIG */</div><div class='add'>+			res = i2c_smbus_read_byte_data(cl, 1);</div><div class='add'>+			break;</div><div class='add'>+		case 0x53:	/* HYST */</div><div class='add'>+			res = swab16(i2c_smbus_read_word_data(cl, 2));</div><div class='add'>+			break;</div><div class='add'>+		case 0x55:	/* OVER */</div><div class='add'>+		default:</div><div class='add'>+			res = swab16(i2c_smbus_read_word_data(cl, 3));</div><div class='add'>+			break;</div><div class='ctx'> 		}</div><div class='del'>-		if (bank &gt; 2)</div><div class='del'>-			i2c_smbus_write_byte_data(client, W83781D_REG_BANK, 0);</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;data-&gt;lock);</div><div class='add'>+	if (bank &gt; 2)</div><div class='add'>+		i2c_smbus_write_byte_data(client, W83781D_REG_BANK, 0);</div><div class='add'>+</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-w83781d_write_value(struct w83781d_data *data, u16 reg, u16 value)</div><div class='add'>+w83781d_write_value_i2c(struct w83781d_data *data, u16 reg, u16 value)</div><div class='ctx'> {</div><div class='del'>-	struct i2c_client *client = &amp;data-&gt;client;</div><div class='del'>-	int word_sized, bank;</div><div class='add'>+	struct i2c_client *client = data-&gt;client;</div><div class='add'>+	int bank;</div><div class='ctx'> 	struct i2c_client *cl;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;data-&gt;lock);</div><div class='del'>-	if (!client-&gt;driver) { /* ISA device */</div><div class='del'>-		word_sized = (((reg &amp; 0xff00) == 0x100)</div><div class='del'>-			      || ((reg &amp; 0xff00) == 0x200))</div><div class='del'>-		    &amp;&amp; (((reg &amp; 0x00ff) == 0x53)</div><div class='del'>-			|| ((reg &amp; 0x00ff) == 0x55));</div><div class='del'>-		if (reg &amp; 0xff00) {</div><div class='del'>-			outb_p(W83781D_REG_BANK,</div><div class='del'>-			       client-&gt;addr + W83781D_ADDR_REG_OFFSET);</div><div class='del'>-			outb_p(reg &gt;&gt; 8,</div><div class='del'>-			       client-&gt;addr + W83781D_DATA_REG_OFFSET);</div><div class='del'>-		}</div><div class='del'>-		outb_p(reg &amp; 0xff, client-&gt;addr + W83781D_ADDR_REG_OFFSET);</div><div class='del'>-		if (word_sized) {</div><div class='del'>-			outb_p(value &gt;&gt; 8,</div><div class='del'>-			       client-&gt;addr + W83781D_DATA_REG_OFFSET);</div><div class='del'>-			outb_p((reg &amp; 0xff) + 1,</div><div class='del'>-			       client-&gt;addr + W83781D_ADDR_REG_OFFSET);</div><div class='del'>-		}</div><div class='del'>-		outb_p(value &amp; 0xff, client-&gt;addr + W83781D_DATA_REG_OFFSET);</div><div class='del'>-		if (reg &amp; 0xff00) {</div><div class='del'>-			outb_p(W83781D_REG_BANK,</div><div class='del'>-			       client-&gt;addr + W83781D_ADDR_REG_OFFSET);</div><div class='del'>-			outb_p(0, client-&gt;addr + W83781D_DATA_REG_OFFSET);</div><div class='del'>-		}</div><div class='add'>+	bank = (reg &gt;&gt; 8) &amp; 0x0f;</div><div class='add'>+	if (bank &gt; 2)</div><div class='add'>+		/* switch banks */</div><div class='add'>+		i2c_smbus_write_byte_data(client, W83781D_REG_BANK,</div><div class='add'>+					  bank);</div><div class='add'>+	if (bank == 0 || bank &gt; 2) {</div><div class='add'>+		i2c_smbus_write_byte_data(client, reg &amp; 0xff,</div><div class='add'>+					  value &amp; 0xff);</div><div class='ctx'> 	} else {</div><div class='del'>-		bank = (reg &gt;&gt; 8) &amp; 0x0f;</div><div class='del'>-		if (bank &gt; 2)</div><div class='del'>-			/* switch banks */</div><div class='del'>-			i2c_smbus_write_byte_data(client, W83781D_REG_BANK,</div><div class='del'>-						  bank);</div><div class='del'>-		if (bank == 0 || bank &gt; 2) {</div><div class='del'>-			i2c_smbus_write_byte_data(client, reg &amp; 0xff,</div><div class='del'>-						  value &amp; 0xff);</div><div class='del'>-		} else {</div><div class='del'>-			/* switch to subclient */</div><div class='del'>-			cl = data-&gt;lm75[bank - 1];</div><div class='del'>-			/* convert from ISA to LM75 I2C addresses */</div><div class='del'>-			switch (reg &amp; 0xff) {</div><div class='del'>-			case 0x52:	/* CONFIG */</div><div class='del'>-				i2c_smbus_write_byte_data(cl, 1, value &amp; 0xff);</div><div class='del'>-				break;</div><div class='del'>-			case 0x53:	/* HYST */</div><div class='del'>-				i2c_smbus_write_word_data(cl, 2, swab16(value));</div><div class='del'>-				break;</div><div class='del'>-			case 0x55:	/* OVER */</div><div class='del'>-				i2c_smbus_write_word_data(cl, 3, swab16(value));</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='add'>+		/* switch to subclient */</div><div class='add'>+		cl = data-&gt;lm75[bank - 1];</div><div class='add'>+		/* convert from ISA to LM75 I2C addresses */</div><div class='add'>+		switch (reg &amp; 0xff) {</div><div class='add'>+		case 0x52:	/* CONFIG */</div><div class='add'>+			i2c_smbus_write_byte_data(cl, 1, value &amp; 0xff);</div><div class='add'>+			break;</div><div class='add'>+		case 0x53:	/* HYST */</div><div class='add'>+			i2c_smbus_write_word_data(cl, 2, swab16(value));</div><div class='add'>+			break;</div><div class='add'>+		case 0x55:	/* OVER */</div><div class='add'>+			i2c_smbus_write_word_data(cl, 3, swab16(value));</div><div class='add'>+			break;</div><div class='ctx'> 		}</div><div class='del'>-		if (bank &gt; 2)</div><div class='del'>-			i2c_smbus_write_byte_data(client, W83781D_REG_BANK, 0);</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;data-&gt;lock);</div><div class='add'>+	if (bank &gt; 2)</div><div class='add'>+		i2c_smbus_write_byte_data(client, W83781D_REG_BANK, 0);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1678,7 +1427,7 @@ w83781d_init_device(struct device *dev)</div><div class='ctx'> static struct w83781d_data *w83781d_update_device(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct w83781d_data *data = dev_get_drvdata(dev);</div><div class='del'>-	struct i2c_client *client = &amp;data-&gt;client;</div><div class='add'>+	struct i2c_client *client = data-&gt;client;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;data-&gt;update_lock);</div><div class='hunk'>@@ -1775,8 +1524,7 @@ static struct w83781d_data *w83781d_update_device(struct device *dev)</div><div class='ctx'> 						W83781D_REG_ALARM2) &lt;&lt; 8);</div><div class='ctx'> 		}</div><div class='ctx'> 		i = w83781d_read_value(data, W83781D_REG_BEEP_INTS2);</div><div class='del'>-		data-&gt;beep_enable = i &gt;&gt; 7;</div><div class='del'>-		data-&gt;beep_mask = ((i &amp; 0x7f) &lt;&lt; 8) +</div><div class='add'>+		data-&gt;beep_mask = (i &lt;&lt; 8) +</div><div class='ctx'> 		    w83781d_read_value(data, W83781D_REG_BEEP_INTS1);</div><div class='ctx'> 		if ((data-&gt;type != w83781d) &amp;&amp; (data-&gt;type != as99127f)) {</div><div class='ctx'> 			data-&gt;beep_mask |=</div><div class='hunk'>@@ -1792,6 +1540,275 @@ static struct w83781d_data *w83781d_update_device(struct device *dev)</div><div class='ctx'> 	return data;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static const struct i2c_device_id w83781d_ids[] = {</div><div class='add'>+	{ "w83781d", w83781d, },</div><div class='add'>+	{ "w83782d", w83782d, },</div><div class='add'>+	{ "w83783s", w83783s, },</div><div class='add'>+	{ "as99127f", as99127f },</div><div class='add'>+	{ /* LIST END */ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(i2c, w83781d_ids);</div><div class='add'>+</div><div class='add'>+static struct i2c_driver w83781d_driver = {</div><div class='add'>+	.class		= I2C_CLASS_HWMON,</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = "w83781d",</div><div class='add'>+	},</div><div class='add'>+	.probe		= w83781d_probe,</div><div class='add'>+	.remove		= w83781d_remove,</div><div class='add'>+	.id_table	= w83781d_ids,</div><div class='add'>+	.detect		= w83781d_detect,</div><div class='add'>+	.address_data	= &amp;addr_data,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * ISA related code</div><div class='add'>+ */</div><div class='add'>+#ifdef CONFIG_ISA</div><div class='add'>+</div><div class='add'>+/* ISA device, if found */</div><div class='add'>+static struct platform_device *pdev;</div><div class='add'>+</div><div class='add'>+static unsigned short isa_address = 0x290;</div><div class='add'>+</div><div class='add'>+/* I2C devices get this name attribute automatically, but for ISA devices</div><div class='add'>+   we must create it by ourselves. */</div><div class='add'>+static ssize_t</div><div class='add'>+show_name(struct device *dev, struct device_attribute *devattr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct w83781d_data *data = dev_get_drvdata(dev);</div><div class='add'>+	return sprintf(buf, "%s\n", data-&gt;name);</div><div class='add'>+}</div><div class='add'>+static DEVICE_ATTR(name, S_IRUGO, show_name, NULL);</div><div class='add'>+</div><div class='add'>+static struct w83781d_data *w83781d_data_if_isa(void)</div><div class='add'>+{</div><div class='add'>+	return pdev ? platform_get_drvdata(pdev) : NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Returns 1 if the I2C chip appears to be an alias of the ISA chip */</div><div class='add'>+static int w83781d_alias_detect(struct i2c_client *client, u8 chipid)</div><div class='add'>+{</div><div class='add'>+	struct w83781d_data *isa;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!pdev)	/* No ISA chip */</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	isa = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	if (w83781d_read_value(isa, W83781D_REG_I2C_ADDR) != client-&gt;addr)</div><div class='add'>+		return 0;	/* Address doesn't match */</div><div class='add'>+	if (w83781d_read_value(isa, W83781D_REG_WCHIPID) != chipid)</div><div class='add'>+		return 0;	/* Chip type doesn't match */</div><div class='add'>+</div><div class='add'>+	/* We compare all the limit registers, the config register and the</div><div class='add'>+	 * interrupt mask registers */</div><div class='add'>+	for (i = 0x2b; i &lt;= 0x3d; i++) {</div><div class='add'>+		if (w83781d_read_value(isa, i) !=</div><div class='add'>+		    i2c_smbus_read_byte_data(client, i))</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='add'>+	if (w83781d_read_value(isa, W83781D_REG_CONFIG) !=</div><div class='add'>+	    i2c_smbus_read_byte_data(client, W83781D_REG_CONFIG))</div><div class='add'>+		return 0;</div><div class='add'>+	for (i = 0x43; i &lt;= 0x46; i++) {</div><div class='add'>+		if (w83781d_read_value(isa, i) !=</div><div class='add'>+		    i2c_smbus_read_byte_data(client, i))</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+w83781d_read_value_isa(struct w83781d_data *data, u16 reg)</div><div class='add'>+{</div><div class='add'>+	int word_sized, res;</div><div class='add'>+</div><div class='add'>+	word_sized = (((reg &amp; 0xff00) == 0x100)</div><div class='add'>+		      || ((reg &amp; 0xff00) == 0x200))</div><div class='add'>+	    &amp;&amp; (((reg &amp; 0x00ff) == 0x50)</div><div class='add'>+		|| ((reg &amp; 0x00ff) == 0x53)</div><div class='add'>+		|| ((reg &amp; 0x00ff) == 0x55));</div><div class='add'>+	if (reg &amp; 0xff00) {</div><div class='add'>+		outb_p(W83781D_REG_BANK,</div><div class='add'>+		       data-&gt;isa_addr + W83781D_ADDR_REG_OFFSET);</div><div class='add'>+		outb_p(reg &gt;&gt; 8,</div><div class='add'>+		       data-&gt;isa_addr + W83781D_DATA_REG_OFFSET);</div><div class='add'>+	}</div><div class='add'>+	outb_p(reg &amp; 0xff, data-&gt;isa_addr + W83781D_ADDR_REG_OFFSET);</div><div class='add'>+	res = inb_p(data-&gt;isa_addr + W83781D_DATA_REG_OFFSET);</div><div class='add'>+	if (word_sized) {</div><div class='add'>+		outb_p((reg &amp; 0xff) + 1,</div><div class='add'>+		       data-&gt;isa_addr + W83781D_ADDR_REG_OFFSET);</div><div class='add'>+		res =</div><div class='add'>+		    (res &lt;&lt; 8) + inb_p(data-&gt;isa_addr +</div><div class='add'>+				       W83781D_DATA_REG_OFFSET);</div><div class='add'>+	}</div><div class='add'>+	if (reg &amp; 0xff00) {</div><div class='add'>+		outb_p(W83781D_REG_BANK,</div><div class='add'>+		       data-&gt;isa_addr + W83781D_ADDR_REG_OFFSET);</div><div class='add'>+		outb_p(0, data-&gt;isa_addr + W83781D_DATA_REG_OFFSET);</div><div class='add'>+	}</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+w83781d_write_value_isa(struct w83781d_data *data, u16 reg, u16 value)</div><div class='add'>+{</div><div class='add'>+	int word_sized;</div><div class='add'>+</div><div class='add'>+	word_sized = (((reg &amp; 0xff00) == 0x100)</div><div class='add'>+		      || ((reg &amp; 0xff00) == 0x200))</div><div class='add'>+	    &amp;&amp; (((reg &amp; 0x00ff) == 0x53)</div><div class='add'>+		|| ((reg &amp; 0x00ff) == 0x55));</div><div class='add'>+	if (reg &amp; 0xff00) {</div><div class='add'>+		outb_p(W83781D_REG_BANK,</div><div class='add'>+		       data-&gt;isa_addr + W83781D_ADDR_REG_OFFSET);</div><div class='add'>+		outb_p(reg &gt;&gt; 8,</div><div class='add'>+		       data-&gt;isa_addr + W83781D_DATA_REG_OFFSET);</div><div class='add'>+	}</div><div class='add'>+	outb_p(reg &amp; 0xff, data-&gt;isa_addr + W83781D_ADDR_REG_OFFSET);</div><div class='add'>+	if (word_sized) {</div><div class='add'>+		outb_p(value &gt;&gt; 8,</div><div class='add'>+		       data-&gt;isa_addr + W83781D_DATA_REG_OFFSET);</div><div class='add'>+		outb_p((reg &amp; 0xff) + 1,</div><div class='add'>+		       data-&gt;isa_addr + W83781D_ADDR_REG_OFFSET);</div><div class='add'>+	}</div><div class='add'>+	outb_p(value &amp; 0xff, data-&gt;isa_addr + W83781D_DATA_REG_OFFSET);</div><div class='add'>+	if (reg &amp; 0xff00) {</div><div class='add'>+		outb_p(W83781D_REG_BANK,</div><div class='add'>+		       data-&gt;isa_addr + W83781D_ADDR_REG_OFFSET);</div><div class='add'>+		outb_p(0, data-&gt;isa_addr + W83781D_DATA_REG_OFFSET);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* The SMBus locks itself, usually, but nothing may access the Winbond between</div><div class='add'>+   bank switches. ISA access must always be locked explicitly!</div><div class='add'>+   We ignore the W83781D BUSY flag at this moment - it could lead to deadlocks,</div><div class='add'>+   would slow down the W83781D access and should not be necessary.</div><div class='add'>+   There are some ugly typecasts here, but the good news is - they should</div><div class='add'>+   nowhere else be necessary! */</div><div class='add'>+static int</div><div class='add'>+w83781d_read_value(struct w83781d_data *data, u16 reg)</div><div class='add'>+{</div><div class='add'>+	struct i2c_client *client = data-&gt;client;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;data-&gt;lock);</div><div class='add'>+	if (client)</div><div class='add'>+		res = w83781d_read_value_i2c(data, reg);</div><div class='add'>+	else</div><div class='add'>+		res = w83781d_read_value_isa(data, reg);</div><div class='add'>+	mutex_unlock(&amp;data-&gt;lock);</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+w83781d_write_value(struct w83781d_data *data, u16 reg, u16 value)</div><div class='add'>+{</div><div class='add'>+	struct i2c_client *client = data-&gt;client;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;data-&gt;lock);</div><div class='add'>+	if (client)</div><div class='add'>+		w83781d_write_value_i2c(data, reg, value);</div><div class='add'>+	else</div><div class='add'>+		w83781d_write_value_isa(data, reg, value);</div><div class='add'>+	mutex_unlock(&amp;data-&gt;lock);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devinit</div><div class='add'>+w83781d_isa_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	int err, reg;</div><div class='add'>+	struct w83781d_data *data;</div><div class='add'>+	struct resource *res;</div><div class='add'>+</div><div class='add'>+	/* Reserve the ISA region */</div><div class='add'>+	res = platform_get_resource(pdev, IORESOURCE_IO, 0);</div><div class='add'>+	if (!request_region(res-&gt;start + W83781D_ADDR_REG_OFFSET, 2,</div><div class='add'>+			    "w83781d")) {</div><div class='add'>+		err = -EBUSY;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	data = kzalloc(sizeof(struct w83781d_data), GFP_KERNEL);</div><div class='add'>+	if (!data) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto exit_release_region;</div><div class='add'>+	}</div><div class='add'>+	mutex_init(&amp;data-&gt;lock);</div><div class='add'>+	data-&gt;isa_addr = res-&gt;start;</div><div class='add'>+	platform_set_drvdata(pdev, data);</div><div class='add'>+</div><div class='add'>+	reg = w83781d_read_value(data, W83781D_REG_WCHIPID);</div><div class='add'>+	switch (reg) {</div><div class='add'>+	case 0x30:</div><div class='add'>+		data-&gt;type = w83782d;</div><div class='add'>+		data-&gt;name = "w83782d";</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		data-&gt;type = w83781d;</div><div class='add'>+		data-&gt;name = "w83781d";</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Initialize the W83781D chip */</div><div class='add'>+	w83781d_init_device(&amp;pdev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	/* Register sysfs hooks */</div><div class='add'>+	err = w83781d_create_files(&amp;pdev-&gt;dev, data-&gt;type, 1);</div><div class='add'>+	if (err)</div><div class='add'>+		goto exit_remove_files;</div><div class='add'>+</div><div class='add'>+	err = device_create_file(&amp;pdev-&gt;dev, &amp;dev_attr_name);</div><div class='add'>+	if (err)</div><div class='add'>+		goto exit_remove_files;</div><div class='add'>+</div><div class='add'>+	data-&gt;hwmon_dev = hwmon_device_register(&amp;pdev-&gt;dev);</div><div class='add'>+	if (IS_ERR(data-&gt;hwmon_dev)) {</div><div class='add'>+		err = PTR_ERR(data-&gt;hwmon_dev);</div><div class='add'>+		goto exit_remove_files;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+ exit_remove_files:</div><div class='add'>+	sysfs_remove_group(&amp;pdev-&gt;dev.kobj, &amp;w83781d_group);</div><div class='add'>+	sysfs_remove_group(&amp;pdev-&gt;dev.kobj, &amp;w83781d_group_opt);</div><div class='add'>+	device_remove_file(&amp;pdev-&gt;dev, &amp;dev_attr_name);</div><div class='add'>+	kfree(data);</div><div class='add'>+ exit_release_region:</div><div class='add'>+	release_region(res-&gt;start + W83781D_ADDR_REG_OFFSET, 2);</div><div class='add'>+ exit:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devexit</div><div class='add'>+w83781d_isa_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct w83781d_data *data = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	hwmon_device_unregister(data-&gt;hwmon_dev);</div><div class='add'>+	sysfs_remove_group(&amp;pdev-&gt;dev.kobj, &amp;w83781d_group);</div><div class='add'>+	sysfs_remove_group(&amp;pdev-&gt;dev.kobj, &amp;w83781d_group_opt);</div><div class='add'>+	device_remove_file(&amp;pdev-&gt;dev, &amp;dev_attr_name);</div><div class='add'>+	release_region(data-&gt;isa_addr + W83781D_ADDR_REG_OFFSET, 2);</div><div class='add'>+	kfree(data);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct platform_driver w83781d_isa_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.owner = THIS_MODULE,</div><div class='add'>+		.name = "w83781d",</div><div class='add'>+	},</div><div class='add'>+	.probe = w83781d_isa_probe,</div><div class='add'>+	.remove = __devexit_p(w83781d_isa_remove),</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* return 1 if a supported chip is found, 0 otherwise */</div><div class='ctx'> static int __init</div><div class='ctx'> w83781d_isa_found(unsigned short address)</div><div class='hunk'>@@ -1928,18 +1945,14 @@ w83781d_isa_device_add(unsigned short address)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init</div><div class='del'>-sensors_w83781d_init(void)</div><div class='add'>+w83781d_isa_register(void)</div><div class='ctx'> {</div><div class='ctx'> 	int res;</div><div class='ctx'> </div><div class='del'>-	res = i2c_add_driver(&amp;w83781d_driver);</div><div class='del'>-	if (res)</div><div class='del'>-		goto exit;</div><div class='del'>-</div><div class='ctx'> 	if (w83781d_isa_found(isa_address)) {</div><div class='ctx'> 		res = platform_driver_register(&amp;w83781d_isa_driver);</div><div class='ctx'> 		if (res)</div><div class='del'>-			goto exit_unreg_i2c_driver;</div><div class='add'>+			goto exit;</div><div class='ctx'> </div><div class='ctx'> 		/* Sets global pdev as a side effect */</div><div class='ctx'> 		res = w83781d_isa_device_add(isa_address);</div><div class='hunk'>@@ -1949,21 +1962,94 @@ sensors_w83781d_init(void)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>- exit_unreg_isa_driver:</div><div class='add'>+exit_unreg_isa_driver:</div><div class='ctx'> 	platform_driver_unregister(&amp;w83781d_isa_driver);</div><div class='del'>- exit_unreg_i2c_driver:</div><div class='del'>-	i2c_del_driver(&amp;w83781d_driver);</div><div class='del'>- exit:</div><div class='add'>+exit:</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit</div><div class='del'>-sensors_w83781d_exit(void)</div><div class='add'>+w83781d_isa_unregister(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (pdev) {</div><div class='ctx'> 		platform_device_unregister(pdev);</div><div class='ctx'> 		platform_driver_unregister(&amp;w83781d_isa_driver);</div><div class='ctx'> 	}</div><div class='add'>+}</div><div class='add'>+#else /* !CONFIG_ISA */</div><div class='add'>+</div><div class='add'>+static struct w83781d_data *w83781d_data_if_isa(void)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+w83781d_alias_detect(struct i2c_client *client, u8 chipid)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+w83781d_read_value(struct w83781d_data *data, u16 reg)</div><div class='add'>+{</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;data-&gt;lock);</div><div class='add'>+	res = w83781d_read_value_i2c(data, reg);</div><div class='add'>+	mutex_unlock(&amp;data-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+w83781d_write_value(struct w83781d_data *data, u16 reg, u16 value)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;data-&gt;lock);</div><div class='add'>+	w83781d_write_value_i2c(data, reg, value);</div><div class='add'>+	mutex_unlock(&amp;data-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init</div><div class='add'>+w83781d_isa_register(void)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit</div><div class='add'>+w83781d_isa_unregister(void)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_ISA */</div><div class='add'>+</div><div class='add'>+static int __init</div><div class='add'>+sensors_w83781d_init(void)</div><div class='add'>+{</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	/* We register the ISA device first, so that we can skip the</div><div class='add'>+	 * registration of an I2C interface to the same device. */</div><div class='add'>+	res = w83781d_isa_register();</div><div class='add'>+	if (res)</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	res = i2c_add_driver(&amp;w83781d_driver);</div><div class='add'>+	if (res)</div><div class='add'>+		goto exit_unreg_isa;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+ exit_unreg_isa:</div><div class='add'>+	w83781d_isa_unregister();</div><div class='add'>+ exit:</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit</div><div class='add'>+sensors_w83781d_exit(void)</div><div class='add'>+{</div><div class='add'>+	w83781d_isa_unregister();</div><div class='ctx'> 	i2c_del_driver(&amp;w83781d_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/hwmon/w83791d.c b/drivers/hwmon/w83791d.c<br/>index de21142d106c..5768def8a4f2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hwmon/w83791d.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/hwmon/w83791d.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/hwmon/w83791d.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/hwmon/w83791d.c</a></div><div class='hunk'>@@ -23,7 +23,7 @@</div><div class='ctx'>     Supports following chips:</div><div class='ctx'> </div><div class='ctx'>     Chip	#vin	#fanin	#pwm	#temp	wchipid	vendid	i2c	ISA</div><div class='del'>-    w83791d	10	5	3	3	0x71	0x5ca3	yes	no</div><div class='add'>+    w83791d	10	5	5	3	0x71	0x5ca3	yes	no</div><div class='ctx'> </div><div class='ctx'>     The w83791d chip appears to be part way between the 83781d and the</div><div class='ctx'>     83792d. Thus, this file is derived from both the w83792d.c and</div><div class='hunk'>@@ -45,6 +45,7 @@</div><div class='ctx'> #define NUMBER_OF_VIN		10</div><div class='ctx'> #define NUMBER_OF_FANIN		5</div><div class='ctx'> #define NUMBER_OF_TEMPIN	3</div><div class='add'>+#define NUMBER_OF_PWM		5</div><div class='ctx'> </div><div class='ctx'> /* Addresses to scan */</div><div class='ctx'> static const unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, 0x2f,</div><div class='hunk'>@@ -116,6 +117,25 @@ static const u8 W83791D_REG_FAN_MIN[NUMBER_OF_FANIN] = {</div><div class='ctx'> 	0xBD,			/* FAN 5 Count Low Limit in DataSheet */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const u8 W83791D_REG_PWM[NUMBER_OF_PWM] = {</div><div class='add'>+	0x81,			/* PWM 1 duty cycle register in DataSheet */</div><div class='add'>+	0x83,			/* PWM 2 duty cycle register in DataSheet */</div><div class='add'>+	0x94,			/* PWM 3 duty cycle register in DataSheet */</div><div class='add'>+	0xA0,			/* PWM 4 duty cycle register in DataSheet */</div><div class='add'>+	0xA1,			/* PWM 5 duty cycle register in DataSheet */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u8 W83791D_REG_TEMP_TARGET[3] = {</div><div class='add'>+	0x85,			/* PWM 1 target temperature for temp 1 */</div><div class='add'>+	0x86,			/* PWM 2 target temperature for temp 2 */</div><div class='add'>+	0x96,			/* PWM 3 target temperature for temp 3 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u8 W83791D_REG_TEMP_TOL[2] = {</div><div class='add'>+	0x87,			/* PWM 1/2 temperature tolerance */</div><div class='add'>+	0x97,			/* PWM 3 temperature tolerance */</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const u8 W83791D_REG_FAN_CFG[2] = {</div><div class='ctx'> 	0x84,			/* FAN 1/2 configuration */</div><div class='ctx'> 	0x95,			/* FAN 3 configuration */</div><div class='hunk'>@@ -160,6 +180,7 @@ static const u8 W83791D_REG_BEEP_CTRL[3] = {</div><div class='ctx'> 	0xA3,			/* BEEP Control Register 3 */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define W83791D_REG_GPIO		0x15</div><div class='ctx'> #define W83791D_REG_CONFIG		0x40</div><div class='ctx'> #define W83791D_REG_VID_FANDIV		0x47</div><div class='ctx'> #define W83791D_REG_DID_VID4		0x49</div><div class='hunk'>@@ -224,6 +245,15 @@ static u8 fan_to_reg(long rpm, int div)</div><div class='ctx'> 				 (val) &lt; 0 ? ((val) - 250) / 500 * 128 : \</div><div class='ctx'> 				 ((val) + 250) / 500 * 128)</div><div class='ctx'> </div><div class='add'>+/* for thermal cruise target temp, 7-bits, LSB = 1 degree Celsius */</div><div class='add'>+#define TARGET_TEMP_TO_REG(val)		((val) &lt; 0 ? 0 : \</div><div class='add'>+					(val) &gt;= 127000 ? 127 : \</div><div class='add'>+					((val) + 500) / 1000)</div><div class='add'>+</div><div class='add'>+/* for thermal cruise temp tolerance, 4-bits, LSB = 1 degree Celsius */</div><div class='add'>+#define TOL_TEMP_TO_REG(val)		((val) &lt; 0 ? 0 : \</div><div class='add'>+					(val) &gt;= 15000 ? 15 : \</div><div class='add'>+					((val) + 500) / 1000)</div><div class='ctx'> </div><div class='ctx'> #define BEEP_MASK_TO_REG(val)		((val) &amp; 0xffffff)</div><div class='ctx'> #define BEEP_MASK_FROM_REG(val)		((val) &amp; 0xffffff)</div><div class='hunk'>@@ -275,6 +305,14 @@ struct w83791d_data {</div><div class='ctx'> 				   two sensors with three values</div><div class='ctx'> 				   (cur, over, hyst)  */</div><div class='ctx'> </div><div class='add'>+	/* PWMs */</div><div class='add'>+	u8 pwm[5];		/* pwm duty cycle */</div><div class='add'>+	u8 pwm_enable[3];	/* pwm enable status for fan 1-3</div><div class='add'>+					(fan 4-5 only support manual mode) */</div><div class='add'>+</div><div class='add'>+	u8 temp_target[3];	/* pwm 1-3 target temperature */</div><div class='add'>+	u8 temp_tolerance[3];	/* pwm 1-3 temperature tolerance */</div><div class='add'>+</div><div class='ctx'> 	/* Misc */</div><div class='ctx'> 	u32 alarms;		/* realtime status register encoding,combined */</div><div class='ctx'> 	u8 beep_enable;		/* Global beep enable */</div><div class='hunk'>@@ -652,6 +690,217 @@ static struct sensor_device_attribute sda_fan_alarm[] = {</div><div class='ctx'> 	SENSOR_ATTR(fan5_alarm, S_IRUGO, show_alarm, NULL, 22),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* read/write PWMs */</div><div class='add'>+static ssize_t show_pwm(struct device *dev, struct device_attribute *attr,</div><div class='add'>+				char *buf)</div><div class='add'>+{</div><div class='add'>+	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='add'>+	int nr = sensor_attr-&gt;index;</div><div class='add'>+	struct w83791d_data *data = w83791d_update_device(dev);</div><div class='add'>+	return sprintf(buf, "%u\n", data-&gt;pwm[nr]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t store_pwm(struct device *dev, struct device_attribute *attr,</div><div class='add'>+		const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='add'>+	struct i2c_client *client = to_i2c_client(dev);</div><div class='add'>+	struct w83791d_data *data = i2c_get_clientdata(client);</div><div class='add'>+	int nr = sensor_attr-&gt;index;</div><div class='add'>+	unsigned long val;</div><div class='add'>+</div><div class='add'>+	if (strict_strtoul(buf, 10, &amp;val))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;data-&gt;update_lock);</div><div class='add'>+	data-&gt;pwm[nr] = SENSORS_LIMIT(val, 0, 255);</div><div class='add'>+	w83791d_write(client, W83791D_REG_PWM[nr], data-&gt;pwm[nr]);</div><div class='add'>+	mutex_unlock(&amp;data-&gt;update_lock);</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sensor_device_attribute sda_pwm[] = {</div><div class='add'>+	SENSOR_ATTR(pwm1, S_IWUSR | S_IRUGO,</div><div class='add'>+			show_pwm, store_pwm, 0),</div><div class='add'>+	SENSOR_ATTR(pwm2, S_IWUSR | S_IRUGO,</div><div class='add'>+			show_pwm, store_pwm, 1),</div><div class='add'>+	SENSOR_ATTR(pwm3, S_IWUSR | S_IRUGO,</div><div class='add'>+			show_pwm, store_pwm, 2),</div><div class='add'>+	SENSOR_ATTR(pwm4, S_IWUSR | S_IRUGO,</div><div class='add'>+			show_pwm, store_pwm, 3),</div><div class='add'>+	SENSOR_ATTR(pwm5, S_IWUSR | S_IRUGO,</div><div class='add'>+			show_pwm, store_pwm, 4),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static ssize_t show_pwmenable(struct device *dev, struct device_attribute *attr,</div><div class='add'>+				char *buf)</div><div class='add'>+{</div><div class='add'>+	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='add'>+	int nr = sensor_attr-&gt;index;</div><div class='add'>+	struct w83791d_data *data = w83791d_update_device(dev);</div><div class='add'>+	return sprintf(buf, "%u\n", data-&gt;pwm_enable[nr] + 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t store_pwmenable(struct device *dev,</div><div class='add'>+		struct device_attribute *attr, const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='add'>+	struct i2c_client *client = to_i2c_client(dev);</div><div class='add'>+	struct w83791d_data *data = i2c_get_clientdata(client);</div><div class='add'>+	int nr = sensor_attr-&gt;index;</div><div class='add'>+	unsigned long val;</div><div class='add'>+	u8 reg_cfg_tmp;</div><div class='add'>+	u8 reg_idx = 0;</div><div class='add'>+	u8 val_shift = 0;</div><div class='add'>+	u8 keep_mask = 0;</div><div class='add'>+</div><div class='add'>+	int ret = strict_strtoul(buf, 10, &amp;val);</div><div class='add'>+</div><div class='add'>+	if (ret || val &lt; 1 || val &gt; 3)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;data-&gt;update_lock);</div><div class='add'>+	data-&gt;pwm_enable[nr] = val - 1;</div><div class='add'>+	switch (nr) {</div><div class='add'>+	case 0:</div><div class='add'>+		reg_idx = 0;</div><div class='add'>+		val_shift = 2;</div><div class='add'>+		keep_mask = 0xf3;</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		reg_idx = 0;</div><div class='add'>+		val_shift = 4;</div><div class='add'>+		keep_mask = 0xcf;</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		reg_idx = 1;</div><div class='add'>+		val_shift = 2;</div><div class='add'>+		keep_mask = 0xf3;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	reg_cfg_tmp = w83791d_read(client, W83791D_REG_FAN_CFG[reg_idx]);</div><div class='add'>+	reg_cfg_tmp = (reg_cfg_tmp &amp; keep_mask) |</div><div class='add'>+					data-&gt;pwm_enable[nr] &lt;&lt; val_shift;</div><div class='add'>+</div><div class='add'>+	w83791d_write(client, W83791D_REG_FAN_CFG[reg_idx], reg_cfg_tmp);</div><div class='add'>+	mutex_unlock(&amp;data-&gt;update_lock);</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+static struct sensor_device_attribute sda_pwmenable[] = {</div><div class='add'>+	SENSOR_ATTR(pwm1_enable, S_IWUSR | S_IRUGO,</div><div class='add'>+			show_pwmenable, store_pwmenable, 0),</div><div class='add'>+	SENSOR_ATTR(pwm2_enable, S_IWUSR | S_IRUGO,</div><div class='add'>+			show_pwmenable, store_pwmenable, 1),</div><div class='add'>+	SENSOR_ATTR(pwm3_enable, S_IWUSR | S_IRUGO,</div><div class='add'>+			show_pwmenable, store_pwmenable, 2),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* For Smart Fan I / Thermal Cruise */</div><div class='add'>+static ssize_t show_temp_target(struct device *dev,</div><div class='add'>+			struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='add'>+	struct w83791d_data *data = w83791d_update_device(dev);</div><div class='add'>+	int nr = sensor_attr-&gt;index;</div><div class='add'>+	return sprintf(buf, "%d\n", TEMP1_FROM_REG(data-&gt;temp_target[nr]));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t store_temp_target(struct device *dev,</div><div class='add'>+		struct device_attribute *attr, const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='add'>+	struct i2c_client *client = to_i2c_client(dev);</div><div class='add'>+	struct w83791d_data *data = i2c_get_clientdata(client);</div><div class='add'>+	int nr = sensor_attr-&gt;index;</div><div class='add'>+	unsigned long val;</div><div class='add'>+	u8 target_mask;</div><div class='add'>+</div><div class='add'>+	if (strict_strtoul(buf, 10, &amp;val))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;data-&gt;update_lock);</div><div class='add'>+	data-&gt;temp_target[nr] = TARGET_TEMP_TO_REG(val);</div><div class='add'>+	target_mask = w83791d_read(client,</div><div class='add'>+				W83791D_REG_TEMP_TARGET[nr]) &amp; 0x80;</div><div class='add'>+	w83791d_write(client, W83791D_REG_TEMP_TARGET[nr],</div><div class='add'>+				data-&gt;temp_target[nr] | target_mask);</div><div class='add'>+	mutex_unlock(&amp;data-&gt;update_lock);</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sensor_device_attribute sda_temp_target[] = {</div><div class='add'>+	SENSOR_ATTR(temp1_target, S_IWUSR | S_IRUGO,</div><div class='add'>+			show_temp_target, store_temp_target, 0),</div><div class='add'>+	SENSOR_ATTR(temp2_target, S_IWUSR | S_IRUGO,</div><div class='add'>+			show_temp_target, store_temp_target, 1),</div><div class='add'>+	SENSOR_ATTR(temp3_target, S_IWUSR | S_IRUGO,</div><div class='add'>+			show_temp_target, store_temp_target, 2),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static ssize_t show_temp_tolerance(struct device *dev,</div><div class='add'>+			struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='add'>+	struct w83791d_data *data = w83791d_update_device(dev);</div><div class='add'>+	int nr = sensor_attr-&gt;index;</div><div class='add'>+	return sprintf(buf, "%d\n", TEMP1_FROM_REG(data-&gt;temp_tolerance[nr]));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t store_temp_tolerance(struct device *dev,</div><div class='add'>+		struct device_attribute *attr, const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='add'>+	struct i2c_client *client = to_i2c_client(dev);</div><div class='add'>+	struct w83791d_data *data = i2c_get_clientdata(client);</div><div class='add'>+	int nr = sensor_attr-&gt;index;</div><div class='add'>+	unsigned long val;</div><div class='add'>+	u8 target_mask;</div><div class='add'>+	u8 reg_idx = 0;</div><div class='add'>+	u8 val_shift = 0;</div><div class='add'>+	u8 keep_mask = 0;</div><div class='add'>+</div><div class='add'>+	if (strict_strtoul(buf, 10, &amp;val))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	switch (nr) {</div><div class='add'>+	case 0:</div><div class='add'>+		reg_idx = 0;</div><div class='add'>+		val_shift = 0;</div><div class='add'>+		keep_mask = 0xf0;</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		reg_idx = 0;</div><div class='add'>+		val_shift = 4;</div><div class='add'>+		keep_mask = 0x0f;</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		reg_idx = 1;</div><div class='add'>+		val_shift = 0;</div><div class='add'>+		keep_mask = 0xf0;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;data-&gt;update_lock);</div><div class='add'>+	data-&gt;temp_tolerance[nr] = TOL_TEMP_TO_REG(val);</div><div class='add'>+	target_mask = w83791d_read(client,</div><div class='add'>+			W83791D_REG_TEMP_TOL[reg_idx]) &amp; keep_mask;</div><div class='add'>+	w83791d_write(client, W83791D_REG_TEMP_TOL[reg_idx],</div><div class='add'>+			(data-&gt;temp_tolerance[nr] &lt;&lt; val_shift) | target_mask);</div><div class='add'>+	mutex_unlock(&amp;data-&gt;update_lock);</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sensor_device_attribute sda_temp_tolerance[] = {</div><div class='add'>+	SENSOR_ATTR(temp1_tolerance, S_IWUSR | S_IRUGO,</div><div class='add'>+			show_temp_tolerance, store_temp_tolerance, 0),</div><div class='add'>+	SENSOR_ATTR(temp2_tolerance, S_IWUSR | S_IRUGO,</div><div class='add'>+			show_temp_tolerance, store_temp_tolerance, 1),</div><div class='add'>+	SENSOR_ATTR(temp3_tolerance, S_IWUSR | S_IRUGO,</div><div class='add'>+			show_temp_tolerance, store_temp_tolerance, 2),</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* read/write the temperature1, includes measured value and limits */</div><div class='ctx'> static ssize_t show_temp1(struct device *dev, struct device_attribute *devattr,</div><div class='ctx'> 				char *buf)</div><div class='hunk'>@@ -908,8 +1157,6 @@ static struct attribute *w83791d_attributes[] = {</div><div class='ctx'> 	FAN_UNIT_ATTRS(0),</div><div class='ctx'> 	FAN_UNIT_ATTRS(1),</div><div class='ctx'> 	FAN_UNIT_ATTRS(2),</div><div class='del'>-	FAN_UNIT_ATTRS(3),</div><div class='del'>-	FAN_UNIT_ATTRS(4),</div><div class='ctx'> 	TEMP_UNIT_ATTRS(0),</div><div class='ctx'> 	TEMP_UNIT_ATTRS(1),</div><div class='ctx'> 	TEMP_UNIT_ATTRS(2),</div><div class='hunk'>@@ -918,6 +1165,18 @@ static struct attribute *w83791d_attributes[] = {</div><div class='ctx'> 	&amp;sda_beep_ctrl[1].dev_attr.attr,</div><div class='ctx'> 	&amp;dev_attr_cpu0_vid.attr,</div><div class='ctx'> 	&amp;dev_attr_vrm.attr,</div><div class='add'>+	&amp;sda_pwm[0].dev_attr.attr,</div><div class='add'>+	&amp;sda_pwm[1].dev_attr.attr,</div><div class='add'>+	&amp;sda_pwm[2].dev_attr.attr,</div><div class='add'>+	&amp;sda_pwmenable[0].dev_attr.attr,</div><div class='add'>+	&amp;sda_pwmenable[1].dev_attr.attr,</div><div class='add'>+	&amp;sda_pwmenable[2].dev_attr.attr,</div><div class='add'>+	&amp;sda_temp_target[0].dev_attr.attr,</div><div class='add'>+	&amp;sda_temp_target[1].dev_attr.attr,</div><div class='add'>+	&amp;sda_temp_target[2].dev_attr.attr,</div><div class='add'>+	&amp;sda_temp_tolerance[0].dev_attr.attr,</div><div class='add'>+	&amp;sda_temp_tolerance[1].dev_attr.attr,</div><div class='add'>+	&amp;sda_temp_tolerance[2].dev_attr.attr,</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -925,6 +1184,20 @@ static const struct attribute_group w83791d_group = {</div><div class='ctx'> 	.attrs = w83791d_attributes,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* Separate group of attributes for fan/pwm 4-5. Their pins can also be</div><div class='add'>+   in use for GPIO in which case their sysfs-interface should not be made</div><div class='add'>+   available */</div><div class='add'>+static struct attribute *w83791d_attributes_fanpwm45[] = {</div><div class='add'>+	FAN_UNIT_ATTRS(3),</div><div class='add'>+	FAN_UNIT_ATTRS(4),</div><div class='add'>+	&amp;sda_pwm[3].dev_attr.attr,</div><div class='add'>+	&amp;sda_pwm[4].dev_attr.attr,</div><div class='add'>+	NULL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct attribute_group w83791d_group_fanpwm45 = {</div><div class='add'>+	.attrs = w83791d_attributes_fanpwm45,</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> static int w83791d_detect_subclients(struct i2c_client *client)</div><div class='ctx'> {</div><div class='hunk'>@@ -1056,6 +1329,7 @@ static int w83791d_probe(struct i2c_client *client,</div><div class='ctx'> 	struct w83791d_data *data;</div><div class='ctx'> 	struct device *dev = &amp;client-&gt;dev;</div><div class='ctx'> 	int i, err;</div><div class='add'>+	u8 has_fanpwm45;</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 	int val1;</div><div class='hunk'>@@ -1090,15 +1364,27 @@ static int w83791d_probe(struct i2c_client *client,</div><div class='ctx'> 	if ((err = sysfs_create_group(&amp;client-&gt;dev.kobj, &amp;w83791d_group)))</div><div class='ctx'> 		goto error3;</div><div class='ctx'> </div><div class='add'>+	/* Check if pins of fan/pwm 4-5 are in use as GPIO */</div><div class='add'>+	has_fanpwm45 = w83791d_read(client, W83791D_REG_GPIO) &amp; 0x10;</div><div class='add'>+	if (has_fanpwm45) {</div><div class='add'>+		err = sysfs_create_group(&amp;client-&gt;dev.kobj,</div><div class='add'>+					 &amp;w83791d_group_fanpwm45);</div><div class='add'>+		if (err)</div><div class='add'>+			goto error4;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Everything is ready, now register the working device */</div><div class='ctx'> 	data-&gt;hwmon_dev = hwmon_device_register(dev);</div><div class='ctx'> 	if (IS_ERR(data-&gt;hwmon_dev)) {</div><div class='ctx'> 		err = PTR_ERR(data-&gt;hwmon_dev);</div><div class='del'>-		goto error4;</div><div class='add'>+		goto error5;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='add'>+error5:</div><div class='add'>+	if (has_fanpwm45)</div><div class='add'>+		sysfs_remove_group(&amp;client-&gt;dev.kobj, &amp;w83791d_group_fanpwm45);</div><div class='ctx'> error4:</div><div class='ctx'> 	sysfs_remove_group(&amp;client-&gt;dev.kobj, &amp;w83791d_group);</div><div class='ctx'> error3:</div><div class='hunk'>@@ -1236,6 +1522,36 @@ static struct w83791d_data *w83791d_update_device(struct device *dev)</div><div class='ctx'> 		for (i = 0; i &lt; 3; i++)</div><div class='ctx'> 			data-&gt;fan_div[i] |= (vbat_reg &gt;&gt; (3 + i)) &amp; 0x04;</div><div class='ctx'> </div><div class='add'>+		/* Update PWM duty cycle */</div><div class='add'>+		for (i = 0; i &lt; NUMBER_OF_PWM; i++) {</div><div class='add'>+			data-&gt;pwm[i] =  w83791d_read(client,</div><div class='add'>+						W83791D_REG_PWM[i]);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Update PWM enable status */</div><div class='add'>+		for (i = 0; i &lt; 2; i++) {</div><div class='add'>+			reg_array_tmp[i] = w83791d_read(client,</div><div class='add'>+						W83791D_REG_FAN_CFG[i]);</div><div class='add'>+		}</div><div class='add'>+		data-&gt;pwm_enable[0] = (reg_array_tmp[0] &gt;&gt; 2) &amp; 0x03;</div><div class='add'>+		data-&gt;pwm_enable[1] = (reg_array_tmp[0] &gt;&gt; 4) &amp; 0x03;</div><div class='add'>+		data-&gt;pwm_enable[2] = (reg_array_tmp[1] &gt;&gt; 2) &amp; 0x03;</div><div class='add'>+</div><div class='add'>+		/* Update PWM target temperature */</div><div class='add'>+		for (i = 0; i &lt; 3; i++) {</div><div class='add'>+			data-&gt;temp_target[i] = w83791d_read(client,</div><div class='add'>+				W83791D_REG_TEMP_TARGET[i]) &amp; 0x7f;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Update PWM temperature tolerance */</div><div class='add'>+		for (i = 0; i &lt; 2; i++) {</div><div class='add'>+			reg_array_tmp[i] = w83791d_read(client,</div><div class='add'>+					W83791D_REG_TEMP_TOL[i]);</div><div class='add'>+		}</div><div class='add'>+		data-&gt;temp_tolerance[0] = reg_array_tmp[0] &amp; 0x0f;</div><div class='add'>+		data-&gt;temp_tolerance[1] = (reg_array_tmp[0] &gt;&gt; 4) &amp; 0x0f;</div><div class='add'>+		data-&gt;temp_tolerance[2] = reg_array_tmp[1] &amp; 0x0f;</div><div class='add'>+</div><div class='ctx'> 		/* Update the first temperature sensor */</div><div class='ctx'> 		for (i = 0; i &lt; 3; i++) {</div><div class='ctx'> 			data-&gt;temp1[i] = w83791d_read(client,</div><div class='head'>diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig<br/>index 6ee997b2817c..acadbc51fc0f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/i2c/busses/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/i2c/busses/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/i2c/busses/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/i2c/busses/Kconfig</a></div><div class='hunk'>@@ -55,7 +55,7 @@ config I2C_AMD756</div><div class='ctx'> </div><div class='ctx'> config I2C_AMD756_S4882</div><div class='ctx'> 	tristate "SMBus multiplexing on the Tyan S4882"</div><div class='del'>-	depends on I2C_AMD756 &amp;&amp; EXPERIMENTAL</div><div class='add'>+	depends on I2C_AMD756 &amp;&amp; X86 &amp;&amp; EXPERIMENTAL</div><div class='ctx'> 	help</div><div class='ctx'> 	  Enabling this option will add specific SMBus support for the Tyan</div><div class='ctx'> 	  S4882 motherboard.  On this 4-CPU board, the SMBus is multiplexed</div><div class='hunk'>@@ -148,7 +148,7 @@ config I2C_NFORCE2</div><div class='ctx'> </div><div class='ctx'> config I2C_NFORCE2_S4985</div><div class='ctx'> 	tristate "SMBus multiplexing on the Tyan S4985"</div><div class='del'>-	depends on I2C_NFORCE2 &amp;&amp; EXPERIMENTAL</div><div class='add'>+	depends on I2C_NFORCE2 &amp;&amp; X86 &amp;&amp; EXPERIMENTAL</div><div class='ctx'> 	help</div><div class='ctx'> 	  Enabling this option will add specific SMBus support for the Tyan</div><div class='ctx'> 	  S4985 motherboard.  On this 4-CPU board, the SMBus is multiplexed</div><div class='hunk'>@@ -209,7 +209,7 @@ config I2C_VIA</div><div class='ctx'> 	  will be called i2c-via.</div><div class='ctx'> </div><div class='ctx'> config I2C_VIAPRO</div><div class='del'>-	tristate "VIA VT82C596/82C686/82xx and CX700"</div><div class='add'>+	tristate "VIA VT82C596/82C686/82xx and CX700/VX800/VX820"</div><div class='ctx'> 	depends on PCI</div><div class='ctx'> 	help</div><div class='ctx'> 	  If you say yes to this option, support will be included for the VIA</div><div class='hunk'>@@ -223,6 +223,8 @@ config I2C_VIAPRO</div><div class='ctx'> 	    VT8237R/A/S</div><div class='ctx'> 	    VT8251</div><div class='ctx'> 	    CX700</div><div class='add'>+	    VX800</div><div class='add'>+	    VX820</div><div class='ctx'> </div><div class='ctx'> 	  This driver can also be built as a module.  If so, the module</div><div class='ctx'> 	  will be called i2c-viapro.</div><div class='hunk'>@@ -330,6 +332,18 @@ config I2C_GPIO</div><div class='ctx'> 	  This is a very simple bitbanging I2C driver utilizing the</div><div class='ctx'> 	  arch-neutral GPIO API to control the SCL and SDA lines.</div><div class='ctx'> </div><div class='add'>+config I2C_HIGHLANDER</div><div class='add'>+	tristate "Highlander FPGA SMBus interface"</div><div class='add'>+	depends on SH_HIGHLANDER</div><div class='add'>+	help</div><div class='add'>+	  If you say yes to this option, support will be included for</div><div class='add'>+	  the SMBus interface located in the FPGA on various Highlander</div><div class='add'>+	  boards, particularly the R0P7780LC0011RL and R0P7785LC0011RL</div><div class='add'>+	  FPGAs. This is wholly unrelated to the SoC I2C.</div><div class='add'>+</div><div class='add'>+	  This driver can also be built as a module.  If so, the module</div><div class='add'>+	  will be called i2c-highlander.</div><div class='add'>+</div><div class='ctx'> config I2C_IBM_IIC</div><div class='ctx'> 	tristate "IBM PPC 4xx on-chip I2C interface"</div><div class='ctx'> 	depends on 4xx</div><div class='head'>diff --git a/drivers/i2c/busses/Makefile b/drivers/i2c/busses/Makefile<br/>index 97dbfa2107fe..0c2c4b26cdf1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/i2c/busses/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/i2c/busses/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/i2c/busses/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/i2c/busses/Makefile</a></div><div class='hunk'>@@ -31,6 +31,7 @@ obj-$(CONFIG_I2C_BLACKFIN_TWI)	+= i2c-bfin-twi.o</div><div class='ctx'> obj-$(CONFIG_I2C_CPM)		+= i2c-cpm.o</div><div class='ctx'> obj-$(CONFIG_I2C_DAVINCI)	+= i2c-davinci.o</div><div class='ctx'> obj-$(CONFIG_I2C_GPIO)		+= i2c-gpio.o</div><div class='add'>+obj-$(CONFIG_I2C_HIGHLANDER)	+= i2c-highlander.o</div><div class='ctx'> obj-$(CONFIG_I2C_IBM_IIC)	+= i2c-ibm_iic.o</div><div class='ctx'> obj-$(CONFIG_I2C_IOP3XX)	+= i2c-iop3xx.o</div><div class='ctx'> obj-$(CONFIG_I2C_IXP2000)	+= i2c-ixp2000.o</div><div class='head'>diff --git a/drivers/i2c/busses/i2c-highlander.c b/drivers/i2c/busses/i2c-highlander.c<br/>new file mode 100644<br/>index 000000000000..f4d22ae9d294<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/i2c/busses/i2c-highlander.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/i2c/busses/i2c-highlander.c</a></div><div class='hunk'>@@ -0,0 +1,498 @@</div><div class='add'>+/*</div><div class='add'>+ * Renesas Solutions Highlander FPGA I2C/SMBus support.</div><div class='add'>+ *</div><div class='add'>+ * Supported devices: R0P7780LC0011RL, R0P7785LC0011RL</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2008  Paul Mundt</div><div class='add'>+ * Copyright (C) 2008  Renesas Solutions Corp.</div><div class='add'>+ * Copyright (C) 2008  Atom Create Engineering Co., Ltd.</div><div class='add'>+ *</div><div class='add'>+ * This file is subject to the terms and conditions of the GNU General</div><div class='add'>+ * Public License version 2. See the file "COPYING" in the main directory</div><div class='add'>+ * of this archive for more details.</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/completion.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+</div><div class='add'>+#define SMCR		0x00</div><div class='add'>+#define SMCR_START	(1 &lt;&lt; 0)</div><div class='add'>+#define SMCR_IRIC	(1 &lt;&lt; 1)</div><div class='add'>+#define SMCR_BBSY	(1 &lt;&lt; 2)</div><div class='add'>+#define SMCR_ACKE	(1 &lt;&lt; 3)</div><div class='add'>+#define SMCR_RST	(1 &lt;&lt; 4)</div><div class='add'>+#define SMCR_IEIC	(1 &lt;&lt; 6)</div><div class='add'>+</div><div class='add'>+#define SMSMADR		0x02</div><div class='add'>+</div><div class='add'>+#define SMMR		0x04</div><div class='add'>+#define SMMR_MODE0	(1 &lt;&lt; 0)</div><div class='add'>+#define SMMR_MODE1	(1 &lt;&lt; 1)</div><div class='add'>+#define SMMR_CAP	(1 &lt;&lt; 3)</div><div class='add'>+#define SMMR_TMMD	(1 &lt;&lt; 4)</div><div class='add'>+#define SMMR_SP		(1 &lt;&lt; 7)</div><div class='add'>+</div><div class='add'>+#define SMSADR		0x06</div><div class='add'>+#define SMTRDR		0x46</div><div class='add'>+</div><div class='add'>+struct highlander_i2c_dev {</div><div class='add'>+	struct device		*dev;</div><div class='add'>+	void __iomem		*base;</div><div class='add'>+	struct i2c_adapter	adapter;</div><div class='add'>+	struct completion	cmd_complete;</div><div class='add'>+	unsigned long		last_read_time;</div><div class='add'>+	int			irq;</div><div class='add'>+	u8			*buf;</div><div class='add'>+	size_t			buf_len;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int iic_force_poll, iic_force_normal;</div><div class='add'>+static int iic_timeout = 1000, iic_read_delay;</div><div class='add'>+</div><div class='add'>+static inline void highlander_i2c_irq_enable(struct highlander_i2c_dev *dev)</div><div class='add'>+{</div><div class='add'>+	iowrite16(ioread16(dev-&gt;base + SMCR) | SMCR_IEIC, dev-&gt;base + SMCR);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void highlander_i2c_irq_disable(struct highlander_i2c_dev *dev)</div><div class='add'>+{</div><div class='add'>+	iowrite16(ioread16(dev-&gt;base + SMCR) &amp; ~SMCR_IEIC, dev-&gt;base + SMCR);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void highlander_i2c_start(struct highlander_i2c_dev *dev)</div><div class='add'>+{</div><div class='add'>+	iowrite16(ioread16(dev-&gt;base + SMCR) | SMCR_START, dev-&gt;base + SMCR);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void highlander_i2c_done(struct highlander_i2c_dev *dev)</div><div class='add'>+{</div><div class='add'>+	iowrite16(ioread16(dev-&gt;base + SMCR) | SMCR_IRIC, dev-&gt;base + SMCR);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void highlander_i2c_setup(struct highlander_i2c_dev *dev)</div><div class='add'>+{</div><div class='add'>+	u16 smmr;</div><div class='add'>+</div><div class='add'>+	smmr = ioread16(dev-&gt;base + SMMR);</div><div class='add'>+	smmr |= SMMR_TMMD;</div><div class='add'>+</div><div class='add'>+	if (iic_force_normal)</div><div class='add'>+		smmr &amp;= ~SMMR_SP;</div><div class='add'>+	else</div><div class='add'>+		smmr |= SMMR_SP;</div><div class='add'>+</div><div class='add'>+	iowrite16(smmr, dev-&gt;base + SMMR);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void smbus_write_data(u8 *src, u16 *dst, int len)</div><div class='add'>+{</div><div class='add'>+	for (; len &gt; 1; len -= 2) {</div><div class='add'>+		*dst++ = be16_to_cpup((u16 *)src);</div><div class='add'>+		src += 2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (len)</div><div class='add'>+		*dst = *src &lt;&lt; 8;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void smbus_read_data(u16 *src, u8 *dst, int len)</div><div class='add'>+{</div><div class='add'>+	for (; len &gt; 1; len -= 2) {</div><div class='add'>+		*(u16 *)dst = cpu_to_be16p(src++);</div><div class='add'>+		dst += 2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (len)</div><div class='add'>+		*dst = *src &gt;&gt; 8;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void highlander_i2c_command(struct highlander_i2c_dev *dev,</div><div class='add'>+				   u8 command, int len)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+	u16 cmd = (command &lt;&lt; 8) | command;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; len; i += 2) {</div><div class='add'>+		if (len - i == 1)</div><div class='add'>+			cmd = command &lt;&lt; 8;</div><div class='add'>+		iowrite16(cmd, dev-&gt;base + SMSADR + i);</div><div class='add'>+		dev_dbg(dev-&gt;dev, "command data[%x] 0x%04x\n", i/2, cmd);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int highlander_i2c_wait_for_bbsy(struct highlander_i2c_dev *dev)</div><div class='add'>+{</div><div class='add'>+	unsigned long timeout;</div><div class='add'>+</div><div class='add'>+	timeout = jiffies + msecs_to_jiffies(iic_timeout);</div><div class='add'>+	while (ioread16(dev-&gt;base + SMCR) &amp; SMCR_BBSY) {</div><div class='add'>+		if (time_after(jiffies, timeout)) {</div><div class='add'>+			dev_warn(dev-&gt;dev, "timeout waiting for bus ready\n");</div><div class='add'>+			return -ETIMEDOUT;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		msleep(1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int highlander_i2c_reset(struct highlander_i2c_dev *dev)</div><div class='add'>+{</div><div class='add'>+	iowrite16(ioread16(dev-&gt;base + SMCR) | SMCR_RST, dev-&gt;base + SMCR);</div><div class='add'>+	return highlander_i2c_wait_for_bbsy(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int highlander_i2c_wait_for_ack(struct highlander_i2c_dev *dev)</div><div class='add'>+{</div><div class='add'>+	u16 tmp = ioread16(dev-&gt;base + SMCR);</div><div class='add'>+</div><div class='add'>+	if ((tmp &amp; (SMCR_IRIC | SMCR_ACKE)) == SMCR_ACKE) {</div><div class='add'>+		dev_warn(dev-&gt;dev, "ack abnormality\n");</div><div class='add'>+		return highlander_i2c_reset(dev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t highlander_i2c_irq(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	struct highlander_i2c_dev *dev = dev_id;</div><div class='add'>+</div><div class='add'>+	highlander_i2c_done(dev);</div><div class='add'>+	complete(&amp;dev-&gt;cmd_complete);</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void highlander_i2c_poll(struct highlander_i2c_dev *dev)</div><div class='add'>+{</div><div class='add'>+	unsigned long timeout;</div><div class='add'>+	u16 smcr;</div><div class='add'>+</div><div class='add'>+	timeout = jiffies + msecs_to_jiffies(iic_timeout);</div><div class='add'>+	for (;;) {</div><div class='add'>+		smcr = ioread16(dev-&gt;base + SMCR);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Don't bother checking ACKE here, this and the reset</div><div class='add'>+		 * are handled in highlander_i2c_wait_xfer_done() when</div><div class='add'>+		 * waiting for the ACK.</div><div class='add'>+		 */</div><div class='add'>+</div><div class='add'>+		if (smcr &amp; SMCR_IRIC)</div><div class='add'>+			return;</div><div class='add'>+		if (time_after(jiffies, timeout))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		cpu_relax();</div><div class='add'>+		cond_resched();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_err(dev-&gt;dev, "polling timed out\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int highlander_i2c_wait_xfer_done(struct highlander_i2c_dev *dev)</div><div class='add'>+{</div><div class='add'>+	if (dev-&gt;irq)</div><div class='add'>+		wait_for_completion_timeout(&amp;dev-&gt;cmd_complete,</div><div class='add'>+					  msecs_to_jiffies(iic_timeout));</div><div class='add'>+	else</div><div class='add'>+		/* busy looping, the IRQ of champions */</div><div class='add'>+		highlander_i2c_poll(dev);</div><div class='add'>+</div><div class='add'>+	return highlander_i2c_wait_for_ack(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int highlander_i2c_read(struct highlander_i2c_dev *dev)</div><div class='add'>+{</div><div class='add'>+	int i, cnt;</div><div class='add'>+	u16 data[16];</div><div class='add'>+</div><div class='add'>+	if (highlander_i2c_wait_for_bbsy(dev))</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+</div><div class='add'>+	highlander_i2c_start(dev);</div><div class='add'>+</div><div class='add'>+	if (highlander_i2c_wait_xfer_done(dev)) {</div><div class='add'>+		dev_err(dev-&gt;dev, "Arbitration loss\n");</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The R0P7780LC0011RL FPGA needs a significant delay between</div><div class='add'>+	 * data read cycles, otherwise the transciever gets confused and</div><div class='add'>+	 * garbage is returned when the read is subsequently aborted.</div><div class='add'>+	 *</div><div class='add'>+	 * It is not sufficient to wait for BBSY.</div><div class='add'>+	 *</div><div class='add'>+	 * While this generally only applies to the older SH7780-based</div><div class='add'>+	 * Highlanders, the same issue can be observed on SH7785 ones,</div><div class='add'>+	 * albeit less frequently. SH7780-based Highlanders may need</div><div class='add'>+	 * this to be as high as 1000 ms.</div><div class='add'>+	 */</div><div class='add'>+	if (iic_read_delay &amp;&amp; time_before(jiffies, dev-&gt;last_read_time +</div><div class='add'>+				 msecs_to_jiffies(iic_read_delay)))</div><div class='add'>+		msleep(jiffies_to_msecs((dev-&gt;last_read_time +</div><div class='add'>+				msecs_to_jiffies(iic_read_delay)) - jiffies));</div><div class='add'>+</div><div class='add'>+	cnt = (dev-&gt;buf_len + 1) &gt;&gt; 1;</div><div class='add'>+	for (i = 0; i &lt; cnt; i++) {</div><div class='add'>+		data[i] = ioread16(dev-&gt;base + SMTRDR + (i * sizeof(u16)));</div><div class='add'>+		dev_dbg(dev-&gt;dev, "read data[%x] 0x%04x\n", i, data[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	smbus_read_data(data, dev-&gt;buf, dev-&gt;buf_len);</div><div class='add'>+</div><div class='add'>+	dev-&gt;last_read_time = jiffies;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int highlander_i2c_write(struct highlander_i2c_dev *dev)</div><div class='add'>+{</div><div class='add'>+	int i, cnt;</div><div class='add'>+	u16 data[16];</div><div class='add'>+</div><div class='add'>+	smbus_write_data(dev-&gt;buf, data, dev-&gt;buf_len);</div><div class='add'>+</div><div class='add'>+	cnt = (dev-&gt;buf_len + 1) &gt;&gt; 1;</div><div class='add'>+	for (i = 0; i &lt; cnt; i++) {</div><div class='add'>+		iowrite16(data[i], dev-&gt;base + SMTRDR + (i * sizeof(u16)));</div><div class='add'>+		dev_dbg(dev-&gt;dev, "write data[%x] 0x%04x\n", i, data[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (highlander_i2c_wait_for_bbsy(dev))</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+</div><div class='add'>+	highlander_i2c_start(dev);</div><div class='add'>+</div><div class='add'>+	return highlander_i2c_wait_xfer_done(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int highlander_i2c_smbus_xfer(struct i2c_adapter *adap, u16 addr,</div><div class='add'>+				  unsigned short flags, char read_write,</div><div class='add'>+				  u8 command, int size,</div><div class='add'>+				  union i2c_smbus_data *data)</div><div class='add'>+{</div><div class='add'>+	struct highlander_i2c_dev *dev = i2c_get_adapdata(adap);</div><div class='add'>+	int read = read_write &amp; I2C_SMBUS_READ;</div><div class='add'>+	u16 tmp;</div><div class='add'>+</div><div class='add'>+	init_completion(&amp;dev-&gt;cmd_complete);</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev-&gt;dev, "addr %04x, command %02x, read_write %d, size %d\n",</div><div class='add'>+		addr, command, read_write, size);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Set up the buffer and transfer size</div><div class='add'>+	 */</div><div class='add'>+	switch (size) {</div><div class='add'>+	case I2C_SMBUS_BYTE_DATA:</div><div class='add'>+		dev-&gt;buf = &amp;data-&gt;byte;</div><div class='add'>+		dev-&gt;buf_len = 1;</div><div class='add'>+		break;</div><div class='add'>+	case I2C_SMBUS_I2C_BLOCK_DATA:</div><div class='add'>+		dev-&gt;buf = &amp;data-&gt;block[1];</div><div class='add'>+		dev-&gt;buf_len = data-&gt;block[0];</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dev_err(dev-&gt;dev, "unsupported command %d\n", size);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Encode the mode setting</div><div class='add'>+	 */</div><div class='add'>+	tmp = ioread16(dev-&gt;base + SMMR);</div><div class='add'>+	tmp &amp;= ~(SMMR_MODE0 | SMMR_MODE1);</div><div class='add'>+</div><div class='add'>+	switch (dev-&gt;buf_len) {</div><div class='add'>+	case 1:</div><div class='add'>+		/* default */</div><div class='add'>+		break;</div><div class='add'>+	case 8:</div><div class='add'>+		tmp |= SMMR_MODE0;</div><div class='add'>+		break;</div><div class='add'>+	case 16:</div><div class='add'>+		tmp |= SMMR_MODE1;</div><div class='add'>+		break;</div><div class='add'>+	case 32:</div><div class='add'>+		tmp |= (SMMR_MODE0 | SMMR_MODE1);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dev_err(dev-&gt;dev, "unsupported xfer size %d\n", dev-&gt;buf_len);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iowrite16(tmp, dev-&gt;base + SMMR);</div><div class='add'>+</div><div class='add'>+	/* Ensure we're in a sane state */</div><div class='add'>+	highlander_i2c_done(dev);</div><div class='add'>+</div><div class='add'>+	/* Set slave address */</div><div class='add'>+	iowrite16((addr &lt;&lt; 1) | read, dev-&gt;base + SMSMADR);</div><div class='add'>+</div><div class='add'>+	highlander_i2c_command(dev, command, dev-&gt;buf_len);</div><div class='add'>+</div><div class='add'>+	if (read)</div><div class='add'>+		return highlander_i2c_read(dev);</div><div class='add'>+	else</div><div class='add'>+		return highlander_i2c_write(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 highlander_i2c_func(struct i2c_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	return I2C_FUNC_SMBUS_BYTE_DATA | I2C_FUNC_SMBUS_I2C_BLOCK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct i2c_algorithm highlander_i2c_algo = {</div><div class='add'>+	.smbus_xfer	= highlander_i2c_smbus_xfer,</div><div class='add'>+	.functionality	= highlander_i2c_func,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __devinit highlander_i2c_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct highlander_i2c_dev *dev;</div><div class='add'>+	struct i2c_adapter *adap;</div><div class='add'>+	struct resource *res;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='add'>+	if (unlikely(!res)) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "no mem resource\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev = kzalloc(sizeof(struct highlander_i2c_dev), GFP_KERNEL);</div><div class='add'>+	if (unlikely(!dev))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	dev-&gt;base = ioremap_nocache(res-&gt;start, res-&gt;end - res-&gt;start + 1);</div><div class='add'>+	if (unlikely(!dev-&gt;base)) {</div><div class='add'>+		ret = -ENXIO;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev-&gt;dev = &amp;pdev-&gt;dev;</div><div class='add'>+	platform_set_drvdata(pdev, dev);</div><div class='add'>+</div><div class='add'>+	dev-&gt;irq = platform_get_irq(pdev, 0);</div><div class='add'>+	if (iic_force_poll)</div><div class='add'>+		dev-&gt;irq = 0;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;irq) {</div><div class='add'>+		ret = request_irq(dev-&gt;irq, highlander_i2c_irq, IRQF_DISABLED,</div><div class='add'>+				  pdev-&gt;name, dev);</div><div class='add'>+		if (unlikely(ret))</div><div class='add'>+			goto err_unmap;</div><div class='add'>+</div><div class='add'>+		highlander_i2c_irq_enable(dev);</div><div class='add'>+	} else {</div><div class='add'>+		dev_notice(&amp;pdev-&gt;dev, "no IRQ, using polling mode\n");</div><div class='add'>+		highlander_i2c_irq_disable(dev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev-&gt;last_read_time = jiffies;	/* initial read jiffies */</div><div class='add'>+</div><div class='add'>+	highlander_i2c_setup(dev);</div><div class='add'>+</div><div class='add'>+	adap = &amp;dev-&gt;adapter;</div><div class='add'>+	i2c_set_adapdata(adap, dev);</div><div class='add'>+	adap-&gt;owner = THIS_MODULE;</div><div class='add'>+	adap-&gt;class = I2C_CLASS_HWMON;</div><div class='add'>+	strlcpy(adap-&gt;name, "HL FPGA I2C adapter", sizeof(adap-&gt;name));</div><div class='add'>+	adap-&gt;algo = &amp;highlander_i2c_algo;</div><div class='add'>+	adap-&gt;dev.parent = &amp;pdev-&gt;dev;</div><div class='add'>+	adap-&gt;nr = pdev-&gt;id;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Reset the adapter</div><div class='add'>+	 */</div><div class='add'>+	ret = highlander_i2c_reset(dev);</div><div class='add'>+	if (unlikely(ret)) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "controller didn't come up\n");</div><div class='add'>+		goto err_free_irq;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = i2c_add_numbered_adapter(adap);</div><div class='add'>+	if (unlikely(ret)) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "failure adding adapter\n");</div><div class='add'>+		goto err_free_irq;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_free_irq:</div><div class='add'>+	if (dev-&gt;irq)</div><div class='add'>+		free_irq(dev-&gt;irq, dev);</div><div class='add'>+err_unmap:</div><div class='add'>+	iounmap(dev-&gt;base);</div><div class='add'>+err:</div><div class='add'>+	kfree(dev);</div><div class='add'>+</div><div class='add'>+	platform_set_drvdata(pdev, NULL);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devexit highlander_i2c_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct highlander_i2c_dev *dev = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	i2c_del_adapter(&amp;dev-&gt;adapter);</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;irq)</div><div class='add'>+		free_irq(dev-&gt;irq, dev);</div><div class='add'>+</div><div class='add'>+	iounmap(dev-&gt;base);</div><div class='add'>+	kfree(dev);</div><div class='add'>+</div><div class='add'>+	platform_set_drvdata(pdev, NULL);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct platform_driver highlander_i2c_driver = {</div><div class='add'>+	.driver		= {</div><div class='add'>+		.name	= "i2c-highlander",</div><div class='add'>+		.owner	= THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	.probe		= highlander_i2c_probe,</div><div class='add'>+	.remove		= __devexit_p(highlander_i2c_remove),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init highlander_i2c_init(void)</div><div class='add'>+{</div><div class='add'>+	return platform_driver_register(&amp;highlander_i2c_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit highlander_i2c_exit(void)</div><div class='add'>+{</div><div class='add'>+	platform_driver_unregister(&amp;highlander_i2c_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(highlander_i2c_init);</div><div class='add'>+module_exit(highlander_i2c_exit);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Paul Mundt");</div><div class='add'>+MODULE_DESCRIPTION("Renesas Highlander FPGA I2C/SMBus adapter");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='add'>+</div><div class='add'>+module_param(iic_force_poll, bool, 0);</div><div class='add'>+module_param(iic_force_normal, bool, 0);</div><div class='add'>+module_param(iic_timeout, int, 0);</div><div class='add'>+module_param(iic_read_delay, int, 0);</div><div class='add'>+</div><div class='add'>+MODULE_PARM_DESC(iic_force_poll, "Force polling mode");</div><div class='add'>+MODULE_PARM_DESC(iic_force_normal,</div><div class='add'>+		 "Force normal mode (100 kHz), default is fast mode (400 kHz)");</div><div class='add'>+MODULE_PARM_DESC(iic_timeout, "Set timeout value in msecs (default 1000 ms)");</div><div class='add'>+MODULE_PARM_DESC(iic_read_delay,</div><div class='add'>+		 "Delay between data read cycles (default 0 ms)");</div><div class='head'>diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c<br/>index 27443f073bc9..a9a45fcc8544 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/i2c/busses/i2c-mpc.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/i2c/busses/i2c-mpc.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/i2c/busses/i2c-mpc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/i2c/busses/i2c-mpc.c</a></div><div class='hunk'>@@ -312,7 +312,6 @@ static struct i2c_adapter mpc_ops = {</div><div class='ctx'> 	.name = "MPC adapter",</div><div class='ctx'> 	.id = I2C_HW_MPC107,</div><div class='ctx'> 	.algo = &amp;mpc_algo,</div><div class='del'>-	.class = I2C_CLASS_HWMON | I2C_CLASS_SPD,</div><div class='ctx'> 	.timeout = 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c<br/>index e7eb7bf9ddec..608038d64f81 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/i2c/busses/i2c-omap.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/i2c/busses/i2c-omap.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/i2c/busses/i2c-omap.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/i2c/busses/i2c-omap.c</a></div><div class='hunk'>@@ -589,11 +589,16 @@ omap_i2c_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;dev = &amp;pdev-&gt;dev;</div><div class='ctx'> 	dev-&gt;irq = irq-&gt;start;</div><div class='del'>-	dev-&gt;base = (void __iomem *) IO_ADDRESS(mem-&gt;start);</div><div class='add'>+	dev-&gt;base = ioremap(mem-&gt;start, mem-&gt;end - mem-&gt;start + 1);</div><div class='add'>+	if (!dev-&gt;base) {</div><div class='add'>+		r = -ENOMEM;</div><div class='add'>+		goto err_free_mem;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	platform_set_drvdata(pdev, dev);</div><div class='ctx'> </div><div class='ctx'> 	if ((r = omap_i2c_get_clocks(dev)) != 0)</div><div class='del'>-		goto err_free_mem;</div><div class='add'>+		goto err_iounmap;</div><div class='ctx'> </div><div class='ctx'> 	omap_i2c_unidle(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -640,6 +645,8 @@ err_unuse_clocks:</div><div class='ctx'> 	omap_i2c_write_reg(dev, OMAP_I2C_CON_REG, 0);</div><div class='ctx'> 	omap_i2c_idle(dev);</div><div class='ctx'> 	omap_i2c_put_clocks(dev);</div><div class='add'>+err_iounmap:</div><div class='add'>+	iounmap(dev-&gt;base);</div><div class='ctx'> err_free_mem:</div><div class='ctx'> 	platform_set_drvdata(pdev, NULL);</div><div class='ctx'> 	kfree(dev);</div><div class='hunk'>@@ -661,6 +668,7 @@ omap_i2c_remove(struct platform_device *pdev)</div><div class='ctx'> 	i2c_del_adapter(&amp;dev-&gt;adapter);</div><div class='ctx'> 	omap_i2c_write_reg(dev, OMAP_I2C_CON_REG, 0);</div><div class='ctx'> 	omap_i2c_put_clocks(dev);</div><div class='add'>+	iounmap(dev-&gt;base);</div><div class='ctx'> 	kfree(dev);</div><div class='ctx'> 	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='ctx'> 	release_mem_region(mem-&gt;start, (mem-&gt;end - mem-&gt;start) + 1);</div><div class='head'>diff --git a/drivers/i2c/busses/i2c-parport-light.c b/drivers/i2c/busses/i2c-parport-light.c<br/>index c6faf9bdad18..b2b8380f6602 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/i2c/busses/i2c-parport-light.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/i2c/busses/i2c-parport-light.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/i2c/busses/i2c-parport-light.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/i2c/busses/i2c-parport-light.c</a></div><div class='hunk'>@@ -123,11 +123,6 @@ static struct i2c_adapter parport_adapter = {</div><div class='ctx'> static int __devinit i2c_parport_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='del'>-	struct resource *res;</div><div class='del'>-</div><div class='del'>-	res = platform_get_resource(pdev, IORESOURCE_IO, 0);</div><div class='del'>-	if (!request_region(res-&gt;start, res-&gt;end - res-&gt;start + 1, DRVNAME))</div><div class='del'>-		return -EBUSY;</div><div class='ctx'> </div><div class='ctx'> 	/* Reset hardware to a sane state (SCL and SDA high) */</div><div class='ctx'> 	parport_setsda(NULL, 1);</div><div class='hunk'>@@ -138,29 +133,19 @@ static int __devinit i2c_parport_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	parport_adapter.dev.parent = &amp;pdev-&gt;dev;</div><div class='ctx'> 	err = i2c_bit_add_bus(&amp;parport_adapter);</div><div class='del'>-	if (err) {</div><div class='add'>+	if (err)</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "Unable to register with I2C\n");</div><div class='del'>-		goto exit_region;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-exit_region:</div><div class='del'>-	release_region(res-&gt;start, res-&gt;end - res-&gt;start + 1);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __devexit i2c_parport_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='del'>-	struct resource *res;</div><div class='del'>-</div><div class='ctx'> 	i2c_del_adapter(&amp;parport_adapter);</div><div class='ctx'> </div><div class='ctx'> 	/* Un-init if needed (power off...) */</div><div class='ctx'> 	if (adapter_parm[type].init.val)</div><div class='ctx'> 		line_set(0, &amp;adapter_parm[type].init);</div><div class='ctx'> </div><div class='del'>-	res = platform_get_resource(pdev, IORESOURCE_IO, 0);</div><div class='del'>-	release_region(res-&gt;start, res-&gt;end - res-&gt;start + 1);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -175,12 +160,6 @@ static struct platform_driver i2c_parport_driver = {</div><div class='ctx'> </div><div class='ctx'> static int __init i2c_parport_device_add(u16 address)</div><div class='ctx'> {</div><div class='del'>-	struct resource res = {</div><div class='del'>-		.start	= address,</div><div class='del'>-		.end	= address + 2,</div><div class='del'>-		.name	= DRVNAME,</div><div class='del'>-		.flags	= IORESOURCE_IO,</div><div class='del'>-	};</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	pdev = platform_device_alloc(DRVNAME, -1);</div><div class='hunk'>@@ -190,13 +169,6 @@ static int __init i2c_parport_device_add(u16 address)</div><div class='ctx'> 		goto exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = platform_device_add_resources(pdev, &amp;res, 1);</div><div class='del'>-	if (err) {</div><div class='del'>-		printk(KERN_ERR DRVNAME ": Device resource addition failed "</div><div class='del'>-		       "(%d)\n", err);</div><div class='del'>-		goto exit_device_put;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	err = platform_device_add(pdev);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		printk(KERN_ERR DRVNAME ": Device addition failed (%d)\n",</div><div class='hunk'>@@ -231,13 +203,16 @@ static int __init i2c_parport_init(void)</div><div class='ctx'> 		base = DEFAULT_BASE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (!request_region(base, 3, DRVNAME))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='ctx'>         if (!adapter_parm[type].getscl.val)</div><div class='ctx'> 		parport_algo_data.getscl = NULL;</div><div class='ctx'> </div><div class='ctx'> 	/* Sets global pdev as a side effect */</div><div class='ctx'> 	err = i2c_parport_device_add(base);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto exit;</div><div class='add'>+		goto exit_release;</div><div class='ctx'> </div><div class='ctx'> 	err = platform_driver_register(&amp;i2c_parport_driver);</div><div class='ctx'> 	if (err)</div><div class='hunk'>@@ -247,7 +222,8 @@ static int __init i2c_parport_init(void)</div><div class='ctx'> </div><div class='ctx'> exit_device:</div><div class='ctx'> 	platform_device_unregister(pdev);</div><div class='del'>-exit:</div><div class='add'>+exit_release:</div><div class='add'>+	release_region(base, 3);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -255,6 +231,7 @@ static void __exit i2c_parport_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	platform_driver_unregister(&amp;i2c_parport_driver);</div><div class='ctx'> 	platform_device_unregister(pdev);</div><div class='add'>+	release_region(base, 3);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Jean Delvare &lt;khali@linux-fr.org&gt;");</div><div class='head'>diff --git a/drivers/i2c/busses/i2c-pca-isa.c b/drivers/i2c/busses/i2c-pca-isa.c<br/>index a119784bae10..9eb76268ec78 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/i2c/busses/i2c-pca-isa.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/i2c/busses/i2c-pca-isa.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/i2c/busses/i2c-pca-isa.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/i2c/busses/i2c-pca-isa.c</a></div><div class='hunk'>@@ -36,8 +36,8 @@</div><div class='ctx'> #define DRIVER "i2c-pca-isa"</div><div class='ctx'> #define IO_SIZE 4</div><div class='ctx'> </div><div class='del'>-static unsigned long base   = 0x330;</div><div class='del'>-static int irq 	  = 10;</div><div class='add'>+static unsigned long base;</div><div class='add'>+static int irq = -1;</div><div class='ctx'> </div><div class='ctx'> /* Data sheet recommends 59kHz for 100kHz operation due to variation</div><div class='ctx'>  * in the actual clock rate */</div><div class='hunk'>@@ -107,13 +107,26 @@ static struct i2c_adapter pca_isa_ops = {</div><div class='ctx'> 	.timeout	= 100,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static int __devinit pca_isa_match(struct device *dev, unsigned int id)</div><div class='add'>+{</div><div class='add'>+	int match = base != 0;</div><div class='add'>+</div><div class='add'>+	if (match) {</div><div class='add'>+		if (irq &lt;= -1)</div><div class='add'>+			dev_warn(dev, "Using polling mode (specify irq)\n");</div><div class='add'>+	} else</div><div class='add'>+		dev_err(dev, "Please specify I/O base\n");</div><div class='add'>+</div><div class='add'>+	return match;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int __devinit pca_isa_probe(struct device *dev, unsigned int id)</div><div class='ctx'> {</div><div class='ctx'> 	init_waitqueue_head(&amp;pca_wait);</div><div class='ctx'> </div><div class='ctx'> 	dev_info(dev, "i/o base %#08lx. irq %d\n", base, irq);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PPC_MERGE</div><div class='add'>+#ifdef CONFIG_PPC</div><div class='ctx'> 	if (check_legacy_ioport(base)) {</div><div class='ctx'> 		dev_err(dev, "I/O address %#08lx is not available\n", base);</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -153,7 +166,7 @@ static int __devexit pca_isa_remove(struct device *dev, unsigned int id)</div><div class='ctx'> {</div><div class='ctx'> 	i2c_del_adapter(&amp;pca_isa_ops);</div><div class='ctx'> </div><div class='del'>-	if (irq &gt; 0) {</div><div class='add'>+	if (irq &gt; -1) {</div><div class='ctx'> 		disable_irq(irq);</div><div class='ctx'> 		free_irq(irq, &amp;pca_isa_ops);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -163,6 +176,7 @@ static int __devexit pca_isa_remove(struct device *dev, unsigned int id)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct isa_driver pca_isa_driver = {</div><div class='add'>+	.match		= pca_isa_match,</div><div class='ctx'> 	.probe		= pca_isa_probe,</div><div class='ctx'> 	.remove		= __devexit_p(pca_isa_remove),</div><div class='ctx'> 	.driver = {</div><div class='head'>diff --git a/drivers/i2c/busses/i2c-powermac.c b/drivers/i2c/busses/i2c-powermac.c<br/>index 0e7b1c6724aa..60ca91745e55 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/i2c/busses/i2c-powermac.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/i2c/busses/i2c-powermac.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/i2c/busses/i2c-powermac.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/i2c/busses/i2c-powermac.c</a></div><div class='hunk'>@@ -259,6 +259,35 @@ static int __devinit i2c_powermac_probe(struct platform_device *dev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_INFO "PowerMac i2c bus %s registered\n", name);</div><div class='add'>+</div><div class='add'>+	if (!strncmp(basename, "uni-n", 5)) {</div><div class='add'>+		struct device_node *np;</div><div class='add'>+		const u32 *prop;</div><div class='add'>+		struct i2c_board_info info;</div><div class='add'>+</div><div class='add'>+		/* Instantiate I2C motion sensor if present */</div><div class='add'>+		np = of_find_node_by_name(NULL, "accelerometer");</div><div class='add'>+		if (np &amp;&amp; of_device_is_compatible(np, "AAPL,accelerometer_1") &amp;&amp;</div><div class='add'>+		    (prop = of_get_property(np, "reg", NULL))) {</div><div class='add'>+			int i2c_bus;</div><div class='add'>+			const char *tmp_bus;</div><div class='add'>+</div><div class='add'>+			/* look for bus either using "reg" or by path */</div><div class='add'>+			tmp_bus = strstr(np-&gt;full_name, "/i2c-bus@");</div><div class='add'>+			if (tmp_bus)</div><div class='add'>+				i2c_bus = *(tmp_bus + 9) - '0';</div><div class='add'>+			else</div><div class='add'>+				i2c_bus = ((*prop) &gt;&gt; 8) &amp; 0x0f;</div><div class='add'>+</div><div class='add'>+			if (pmac_i2c_get_channel(bus) == i2c_bus) {</div><div class='add'>+				memset(&amp;info, 0, sizeof(struct i2c_board_info));</div><div class='add'>+				info.addr = ((*prop) &amp; 0xff) &gt;&gt; 1;</div><div class='add'>+				strlcpy(info.type, "ams", I2C_NAME_SIZE);</div><div class='add'>+				i2c_new_device(adapter, &amp;info);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c<br/>index 44d838410f15..906f9b9d715d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/i2c/busses/i2c-pxa.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/i2c/busses/i2c-pxa.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/i2c/busses/i2c-pxa.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/i2c/busses/i2c-pxa.c</a></div><div class='hunk'>@@ -38,7 +38,44 @@</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;mach/i2c.h&gt;</div><div class='del'>-#include &lt;mach/pxa-regs.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * I2C registers and bit definitions</div><div class='add'>+ */</div><div class='add'>+#define IBMR		(0x00)</div><div class='add'>+#define IDBR		(0x08)</div><div class='add'>+#define ICR		(0x10)</div><div class='add'>+#define ISR		(0x18)</div><div class='add'>+#define ISAR		(0x20)</div><div class='add'>+</div><div class='add'>+#define ICR_START	(1 &lt;&lt; 0)	   /* start bit */</div><div class='add'>+#define ICR_STOP	(1 &lt;&lt; 1)	   /* stop bit */</div><div class='add'>+#define ICR_ACKNAK	(1 &lt;&lt; 2)	   /* send ACK(0) or NAK(1) */</div><div class='add'>+#define ICR_TB		(1 &lt;&lt; 3)	   /* transfer byte bit */</div><div class='add'>+#define ICR_MA		(1 &lt;&lt; 4)	   /* master abort */</div><div class='add'>+#define ICR_SCLE	(1 &lt;&lt; 5)	   /* master clock enable */</div><div class='add'>+#define ICR_IUE		(1 &lt;&lt; 6)	   /* unit enable */</div><div class='add'>+#define ICR_GCD		(1 &lt;&lt; 7)	   /* general call disable */</div><div class='add'>+#define ICR_ITEIE	(1 &lt;&lt; 8)	   /* enable tx interrupts */</div><div class='add'>+#define ICR_IRFIE	(1 &lt;&lt; 9)	   /* enable rx interrupts */</div><div class='add'>+#define ICR_BEIE	(1 &lt;&lt; 10)	   /* enable bus error ints */</div><div class='add'>+#define ICR_SSDIE	(1 &lt;&lt; 11)	   /* slave STOP detected int enable */</div><div class='add'>+#define ICR_ALDIE	(1 &lt;&lt; 12)	   /* enable arbitration interrupt */</div><div class='add'>+#define ICR_SADIE	(1 &lt;&lt; 13)	   /* slave address detected int enable */</div><div class='add'>+#define ICR_UR		(1 &lt;&lt; 14)	   /* unit reset */</div><div class='add'>+#define ICR_FM		(1 &lt;&lt; 15)	   /* fast mode */</div><div class='add'>+</div><div class='add'>+#define ISR_RWM		(1 &lt;&lt; 0)	   /* read/write mode */</div><div class='add'>+#define ISR_ACKNAK	(1 &lt;&lt; 1)	   /* ack/nak status */</div><div class='add'>+#define ISR_UB		(1 &lt;&lt; 2)	   /* unit busy */</div><div class='add'>+#define ISR_IBB		(1 &lt;&lt; 3)	   /* bus busy */</div><div class='add'>+#define ISR_SSD		(1 &lt;&lt; 4)	   /* slave stop detected */</div><div class='add'>+#define ISR_ALD		(1 &lt;&lt; 5)	   /* arbitration loss detected */</div><div class='add'>+#define ISR_ITE		(1 &lt;&lt; 6)	   /* tx buffer empty */</div><div class='add'>+#define ISR_IRF		(1 &lt;&lt; 7)	   /* rx buffer full */</div><div class='add'>+#define ISR_GCAD	(1 &lt;&lt; 8)	   /* general call address detected */</div><div class='add'>+#define ISR_SAD		(1 &lt;&lt; 9)	   /* slave address detected */</div><div class='add'>+#define ISR_BED		(1 &lt;&lt; 10)	   /* bus error no ACK/NAK */</div><div class='ctx'> </div><div class='ctx'> struct pxa_i2c {</div><div class='ctx'> 	spinlock_t		lock;</div><div class='hunk'>@@ -60,19 +97,21 @@ struct pxa_i2c {</div><div class='ctx'> 	u32			icrlog[32];</div><div class='ctx'> </div><div class='ctx'> 	void __iomem		*reg_base;</div><div class='add'>+	unsigned int		reg_shift;</div><div class='ctx'> </div><div class='ctx'> 	unsigned long		iobase;</div><div class='ctx'> 	unsigned long		iosize;</div><div class='ctx'> </div><div class='ctx'> 	int			irq;</div><div class='del'>-	int			use_pio;</div><div class='add'>+	unsigned int		use_pio :1;</div><div class='add'>+	unsigned int		fast_mode :1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define _IBMR(i2c)	((i2c)-&gt;reg_base + 0)</div><div class='del'>-#define _IDBR(i2c)	((i2c)-&gt;reg_base + 8)</div><div class='del'>-#define _ICR(i2c)	((i2c)-&gt;reg_base + 0x10)</div><div class='del'>-#define _ISR(i2c)	((i2c)-&gt;reg_base + 0x18)</div><div class='del'>-#define _ISAR(i2c)	((i2c)-&gt;reg_base + 0x20)</div><div class='add'>+#define _IBMR(i2c)	((i2c)-&gt;reg_base + (0x0 &lt;&lt; (i2c)-&gt;reg_shift))</div><div class='add'>+#define _IDBR(i2c)	((i2c)-&gt;reg_base + (0x4 &lt;&lt; (i2c)-&gt;reg_shift))</div><div class='add'>+#define _ICR(i2c)	((i2c)-&gt;reg_base + (0x8 &lt;&lt; (i2c)-&gt;reg_shift))</div><div class='add'>+#define _ISR(i2c)	((i2c)-&gt;reg_base + (0xc &lt;&lt; (i2c)-&gt;reg_shift))</div><div class='add'>+#define _ISAR(i2c)	((i2c)-&gt;reg_base + (0x10 &lt;&lt; (i2c)-&gt;reg_shift))</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * I2C Slave mode address</div><div class='hunk'>@@ -188,14 +227,14 @@ static inline int i2c_pxa_is_slavemode(struct pxa_i2c *i2c)</div><div class='ctx'> </div><div class='ctx'> static void i2c_pxa_abort(struct pxa_i2c *i2c)</div><div class='ctx'> {</div><div class='del'>-	unsigned long timeout = jiffies + HZ/4;</div><div class='add'>+	int i = 250;</div><div class='ctx'> </div><div class='ctx'> 	if (i2c_pxa_is_slavemode(i2c)) {</div><div class='ctx'> 		dev_dbg(&amp;i2c-&gt;adap.dev, "%s: called in slave mode\n", __func__);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	while (time_before(jiffies, timeout) &amp;&amp; (readl(_IBMR(i2c)) &amp; 0x1) == 0) {</div><div class='add'>+	while ((i &gt; 0) &amp;&amp; (readl(_IBMR(i2c)) &amp; 0x1) == 0) {</div><div class='ctx'> 		unsigned long icr = readl(_ICR(i2c));</div><div class='ctx'> </div><div class='ctx'> 		icr &amp;= ~ICR_START;</div><div class='hunk'>@@ -205,7 +244,8 @@ static void i2c_pxa_abort(struct pxa_i2c *i2c)</div><div class='ctx'> </div><div class='ctx'> 		show_state(i2c);</div><div class='ctx'> </div><div class='del'>-		msleep(1);</div><div class='add'>+		mdelay(1);</div><div class='add'>+		i --;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	writel(readl(_ICR(i2c)) &amp; ~(ICR_MA | ICR_START | ICR_STOP),</div><div class='hunk'>@@ -364,7 +404,7 @@ static void i2c_pxa_reset(struct pxa_i2c *i2c)</div><div class='ctx'> 	writel(i2c-&gt;slave_addr, _ISAR(i2c));</div><div class='ctx'> </div><div class='ctx'> 	/* set control register values */</div><div class='del'>-	writel(I2C_ICR_INIT, _ICR(i2c));</div><div class='add'>+	writel(I2C_ICR_INIT | (i2c-&gt;fast_mode ? ICR_FM : 0), _ICR(i2c));</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_I2C_PXA_SLAVE</div><div class='ctx'> 	dev_info(&amp;i2c-&gt;adap.dev, "Enabling slave mode\n");</div><div class='hunk'>@@ -907,12 +947,6 @@ static int i2c_pxa_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num</div><div class='ctx'> 	struct pxa_i2c *i2c = adap-&gt;algo_data;</div><div class='ctx'> 	int ret, i;</div><div class='ctx'> </div><div class='del'>-	/* If the I2C controller is disabled we need to reset it (probably due</div><div class='del'>- 	   to a suspend/resume destroying state). We do this here as we can then</div><div class='del'>- 	   avoid worrying about resuming the controller before its users. */</div><div class='del'>-	if (!(readl(_ICR(i2c)) &amp; ICR_IUE))</div><div class='del'>-		i2c_pxa_reset(i2c);</div><div class='del'>-</div><div class='ctx'> 	for (i = adap-&gt;retries; i &gt;= 0; i--) {</div><div class='ctx'> 		ret = i2c_pxa_do_xfer(i2c, msgs, num);</div><div class='ctx'> 		if (ret != I2C_RETRY)</div><div class='hunk'>@@ -993,6 +1027,7 @@ static int i2c_pxa_probe(struct platform_device *dev)</div><div class='ctx'> 		ret = -EIO;</div><div class='ctx'> 		goto eremap;</div><div class='ctx'> 	}</div><div class='add'>+	i2c-&gt;reg_shift = (cpu_is_pxa3xx() &amp;&amp; (dev-&gt;id == 1)) ? 0 : 1;</div><div class='ctx'> </div><div class='ctx'> 	i2c-&gt;iobase = res-&gt;start;</div><div class='ctx'> 	i2c-&gt;iosize = res_len(res);</div><div class='hunk'>@@ -1013,6 +1048,7 @@ static int i2c_pxa_probe(struct platform_device *dev)</div><div class='ctx'> 	if (plat) {</div><div class='ctx'> 		i2c-&gt;adap.class = plat-&gt;class;</div><div class='ctx'> 		i2c-&gt;use_pio = plat-&gt;use_pio;</div><div class='add'>+		i2c-&gt;fast_mode = plat-&gt;fast_mode;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (i2c-&gt;use_pio) {</div><div class='hunk'>@@ -1082,9 +1118,33 @@ static int __exit i2c_pxa_remove(struct platform_device *dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+static int i2c_pxa_suspend_late(struct platform_device *dev, pm_message_t state)</div><div class='add'>+{</div><div class='add'>+	struct pxa_i2c *i2c = platform_get_drvdata(dev);</div><div class='add'>+	clk_disable(i2c-&gt;clk);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int i2c_pxa_resume_early(struct platform_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct pxa_i2c *i2c = platform_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	clk_enable(i2c-&gt;clk);</div><div class='add'>+	i2c_pxa_reset(i2c);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+#define i2c_pxa_suspend_late NULL</div><div class='add'>+#define i2c_pxa_resume_early NULL</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static struct platform_driver i2c_pxa_driver = {</div><div class='ctx'> 	.probe		= i2c_pxa_probe,</div><div class='ctx'> 	.remove		= __exit_p(i2c_pxa_remove),</div><div class='add'>+	.suspend_late	= i2c_pxa_suspend_late,</div><div class='add'>+	.resume_early	= i2c_pxa_resume_early,</div><div class='ctx'> 	.driver		= {</div><div class='ctx'> 		.name	= "pxa2xx-i2c",</div><div class='ctx'> 		.owner	= THIS_MODULE,</div><div class='head'>diff --git a/drivers/i2c/busses/i2c-viapro.c b/drivers/i2c/busses/i2c-viapro.c<br/>index 862eb352a2d9..73dc52e114eb 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/i2c/busses/i2c-viapro.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/i2c/busses/i2c-viapro.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/i2c/busses/i2c-viapro.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/i2c/busses/i2c-viapro.c</a></div><div class='hunk'>@@ -36,6 +36,7 @@</div><div class='ctx'>    VT8237S            0x3372             yes</div><div class='ctx'>    VT8251             0x3287             yes</div><div class='ctx'>    CX700              0x8324             yes</div><div class='add'>+   VX800/VX820        0x8353             yes</div><div class='ctx'> </div><div class='ctx'>    Note: we assume there can only be one device, with one SMBus interface.</div><div class='ctx'> */</div><div class='hunk'>@@ -82,6 +83,7 @@ static unsigned short SMBHSTCFG = 0xD2;</div><div class='ctx'> #define VT596_BYTE		0x04</div><div class='ctx'> #define VT596_BYTE_DATA		0x08</div><div class='ctx'> #define VT596_WORD_DATA		0x0C</div><div class='add'>+#define VT596_PROC_CALL		0x10</div><div class='ctx'> #define VT596_BLOCK_DATA	0x14</div><div class='ctx'> #define VT596_I2C_BLOCK_DATA	0x34</div><div class='ctx'> </div><div class='hunk'>@@ -232,6 +234,12 @@ static s32 vt596_access(struct i2c_adapter *adap, u16 addr,</div><div class='ctx'> 		}</div><div class='ctx'> 		size = VT596_WORD_DATA;</div><div class='ctx'> 		break;</div><div class='add'>+	case I2C_SMBUS_PROC_CALL:</div><div class='add'>+		outb_p(command, SMBHSTCMD);</div><div class='add'>+		outb_p(data-&gt;word &amp; 0xff, SMBHSTDAT0);</div><div class='add'>+		outb_p((data-&gt;word &amp; 0xff00) &gt;&gt; 8, SMBHSTDAT1);</div><div class='add'>+		size = VT596_PROC_CALL;</div><div class='add'>+		break;</div><div class='ctx'> 	case I2C_SMBUS_I2C_BLOCK_DATA:</div><div class='ctx'> 		if (!(vt596_features &amp; FEATURE_I2CBLOCK))</div><div class='ctx'> 			goto exit_unsupported;</div><div class='hunk'>@@ -262,6 +270,9 @@ static s32 vt596_access(struct i2c_adapter *adap, u16 addr,</div><div class='ctx'> 	if (status)</div><div class='ctx'> 		return status;</div><div class='ctx'> </div><div class='add'>+	if (size == VT596_PROC_CALL)</div><div class='add'>+		read_write = I2C_SMBUS_READ;</div><div class='add'>+</div><div class='ctx'> 	if ((read_write == I2C_SMBUS_WRITE) || (size == VT596_QUICK))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -271,6 +282,7 @@ static s32 vt596_access(struct i2c_adapter *adap, u16 addr,</div><div class='ctx'> 		data-&gt;byte = inb_p(SMBHSTDAT0);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case VT596_WORD_DATA:</div><div class='add'>+	case VT596_PROC_CALL:</div><div class='ctx'> 		data-&gt;word = inb_p(SMBHSTDAT0) + (inb_p(SMBHSTDAT1) &lt;&lt; 8);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case VT596_I2C_BLOCK_DATA:</div><div class='hunk'>@@ -295,7 +307,7 @@ static u32 vt596_func(struct i2c_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	u32 func = I2C_FUNC_SMBUS_QUICK | I2C_FUNC_SMBUS_BYTE |</div><div class='ctx'> 	    I2C_FUNC_SMBUS_BYTE_DATA | I2C_FUNC_SMBUS_WORD_DATA |</div><div class='del'>-	    I2C_FUNC_SMBUS_BLOCK_DATA;</div><div class='add'>+	    I2C_SMBUS_PROC_CALL | I2C_FUNC_SMBUS_BLOCK_DATA;</div><div class='ctx'> </div><div class='ctx'> 	if (vt596_features &amp; FEATURE_I2CBLOCK)</div><div class='ctx'> 		func |= I2C_FUNC_SMBUS_I2C_BLOCK;</div><div class='hunk'>@@ -396,6 +408,7 @@ found:</div><div class='ctx'> </div><div class='ctx'> 	switch (pdev-&gt;device) {</div><div class='ctx'> 	case PCI_DEVICE_ID_VIA_CX700:</div><div class='add'>+	case PCI_DEVICE_ID_VIA_VX800:</div><div class='ctx'> 	case PCI_DEVICE_ID_VIA_8251:</div><div class='ctx'> 	case PCI_DEVICE_ID_VIA_8237:</div><div class='ctx'> 	case PCI_DEVICE_ID_VIA_8237A:</div><div class='hunk'>@@ -459,6 +472,8 @@ static struct pci_device_id vt596_ids[] = {</div><div class='ctx'> 	  .driver_data = SMBBA3 },</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_CX700),</div><div class='ctx'> 	  .driver_data = SMBBA3 },</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_VX800),</div><div class='add'>+	  .driver_data = SMBBA3 },</div><div class='ctx'> 	{ 0, }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/i2c/chips/Kconfig b/drivers/i2c/chips/Kconfig<br/>index a95cb9465d65..17356827b93d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/i2c/chips/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/i2c/chips/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/i2c/chips/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/i2c/chips/Kconfig</a></div><div class='hunk'>@@ -172,4 +172,15 @@ config MENELAUS</div><div class='ctx'> 	  and other features that are often used in portable devices like</div><div class='ctx'> 	  cell phones and PDAs.</div><div class='ctx'> </div><div class='add'>+config MCU_MPC8349EMITX</div><div class='add'>+	tristate "MPC8349E-mITX MCU driver"</div><div class='add'>+	depends on I2C &amp;&amp; PPC_83xx</div><div class='add'>+	select GENERIC_GPIO</div><div class='add'>+	select ARCH_REQUIRE_GPIOLIB</div><div class='add'>+	help</div><div class='add'>+	  Say Y here to enable soft power-off functionality on the Freescale</div><div class='add'>+	  boards with the MPC8349E-mITX-compatible MCU chips. This driver will</div><div class='add'>+	  also register MCU GPIOs with the generic GPIO API, so you'll able</div><div class='add'>+	  to use MCU pins as GPIOs.</div><div class='add'>+</div><div class='ctx'> endmenu</div><div class='head'>diff --git a/drivers/i2c/chips/Makefile b/drivers/i2c/chips/Makefile<br/>index 39e3e69ed125..ca520fa143d6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/i2c/chips/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/i2c/chips/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/i2c/chips/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/i2c/chips/Makefile</a></div><div class='hunk'>@@ -21,6 +21,7 @@ obj-$(CONFIG_ISP1301_OMAP)	+= isp1301_omap.o</div><div class='ctx'> obj-$(CONFIG_TPS65010)		+= tps65010.o</div><div class='ctx'> obj-$(CONFIG_MENELAUS)		+= menelaus.o</div><div class='ctx'> obj-$(CONFIG_SENSORS_TSL2550)	+= tsl2550.o</div><div class='add'>+obj-$(CONFIG_MCU_MPC8349EMITX)	+= mcu_mpc8349emitx.o</div><div class='ctx'> </div><div class='ctx'> ifeq ($(CONFIG_I2C_DEBUG_CHIP),y)</div><div class='ctx'> EXTRA_CFLAGS += -DDEBUG</div><div class='head'>diff --git a/drivers/i2c/chips/isp1301_omap.c b/drivers/i2c/chips/isp1301_omap.c<br/>index 4655b794ebe3..28902ebd5539 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/i2c/chips/isp1301_omap.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/i2c/chips/isp1301_omap.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/i2c/chips/isp1301_omap.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/i2c/chips/isp1301_omap.c</a></div><div class='hunk'>@@ -49,10 +49,9 @@ MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='ctx'> struct isp1301 {</div><div class='ctx'> 	struct otg_transceiver	otg;</div><div class='del'>-	struct i2c_client	client;</div><div class='add'>+	struct i2c_client	*client;</div><div class='ctx'> 	void			(*i2c_release)(struct device *dev);</div><div class='ctx'> </div><div class='del'>-	int			irq;</div><div class='ctx'> 	int			irq_type;</div><div class='ctx'> </div><div class='ctx'> 	u32			last_otg_ctrl;</div><div class='hunk'>@@ -138,14 +137,6 @@ static inline void notresponding(struct isp1301 *isp)</div><div class='ctx'> </div><div class='ctx'> /*-------------------------------------------------------------------------*/</div><div class='ctx'> </div><div class='del'>-/* only two addresses possible */</div><div class='del'>-#define	ISP_BASE		0x2c</div><div class='del'>-static unsigned short normal_i2c[] = {</div><div class='del'>-	ISP_BASE, ISP_BASE + 1,</div><div class='del'>-	I2C_CLIENT_END };</div><div class='del'>-</div><div class='del'>-I2C_CLIENT_INSMOD;</div><div class='del'>-</div><div class='ctx'> static struct i2c_driver isp1301_driver;</div><div class='ctx'> </div><div class='ctx'> /* smbus apis are used for portability */</div><div class='hunk'>@@ -153,25 +144,25 @@ static struct i2c_driver isp1301_driver;</div><div class='ctx'> static inline u8</div><div class='ctx'> isp1301_get_u8(struct isp1301 *isp, u8 reg)</div><div class='ctx'> {</div><div class='del'>-	return i2c_smbus_read_byte_data(&amp;isp-&gt;client, reg + 0);</div><div class='add'>+	return i2c_smbus_read_byte_data(isp-&gt;client, reg + 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int</div><div class='ctx'> isp1301_get_u16(struct isp1301 *isp, u8 reg)</div><div class='ctx'> {</div><div class='del'>-	return i2c_smbus_read_word_data(&amp;isp-&gt;client, reg);</div><div class='add'>+	return i2c_smbus_read_word_data(isp-&gt;client, reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int</div><div class='ctx'> isp1301_set_bits(struct isp1301 *isp, u8 reg, u8 bits)</div><div class='ctx'> {</div><div class='del'>-	return i2c_smbus_write_byte_data(&amp;isp-&gt;client, reg + 0, bits);</div><div class='add'>+	return i2c_smbus_write_byte_data(isp-&gt;client, reg + 0, bits);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int</div><div class='ctx'> isp1301_clear_bits(struct isp1301 *isp, u8 reg, u8 bits)</div><div class='ctx'> {</div><div class='del'>-	return i2c_smbus_write_byte_data(&amp;isp-&gt;client, reg + 1, bits);</div><div class='add'>+	return i2c_smbus_write_byte_data(isp-&gt;client, reg + 1, bits);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*-------------------------------------------------------------------------*/</div><div class='hunk'>@@ -349,10 +340,10 @@ isp1301_defer_work(struct isp1301 *isp, int work)</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='ctx'> 	if (isp &amp;&amp; !test_and_set_bit(work, &amp;isp-&gt;todo)) {</div><div class='del'>-		(void) get_device(&amp;isp-&gt;client.dev);</div><div class='add'>+		(void) get_device(&amp;isp-&gt;client-&gt;dev);</div><div class='ctx'> 		status = schedule_work(&amp;isp-&gt;work);</div><div class='ctx'> 		if (!status &amp;&amp; !isp-&gt;working)</div><div class='del'>-			dev_vdbg(&amp;isp-&gt;client.dev,</div><div class='add'>+			dev_vdbg(&amp;isp-&gt;client-&gt;dev,</div><div class='ctx'> 				"work item %d may be lost\n", work);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -1135,7 +1126,7 @@ isp1301_work(struct work_struct *work)</div><div class='ctx'> 		/* transfer state from otg engine to isp1301 */</div><div class='ctx'> 		if (test_and_clear_bit(WORK_UPDATE_ISP, &amp;isp-&gt;todo)) {</div><div class='ctx'> 			otg_update_isp(isp);</div><div class='del'>-			put_device(&amp;isp-&gt;client.dev);</div><div class='add'>+			put_device(&amp;isp-&gt;client-&gt;dev);</div><div class='ctx'> 		}</div><div class='ctx'> #endif</div><div class='ctx'> 		/* transfer state from isp1301 to otg engine */</div><div class='hunk'>@@ -1143,7 +1134,7 @@ isp1301_work(struct work_struct *work)</div><div class='ctx'> 			u8		stat = isp1301_clear_latch(isp);</div><div class='ctx'> </div><div class='ctx'> 			isp_update_otg(isp, stat);</div><div class='del'>-			put_device(&amp;isp-&gt;client.dev);</div><div class='add'>+			put_device(&amp;isp-&gt;client-&gt;dev);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (test_and_clear_bit(WORK_HOST_RESUME, &amp;isp-&gt;todo)) {</div><div class='hunk'>@@ -1178,7 +1169,7 @@ isp1301_work(struct work_struct *work)</div><div class='ctx'> 			}</div><div class='ctx'> 			host_resume(isp);</div><div class='ctx'> 			// mdelay(10);</div><div class='del'>-			put_device(&amp;isp-&gt;client.dev);</div><div class='add'>+			put_device(&amp;isp-&gt;client-&gt;dev);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (test_and_clear_bit(WORK_TIMER, &amp;isp-&gt;todo)) {</div><div class='hunk'>@@ -1187,15 +1178,15 @@ isp1301_work(struct work_struct *work)</div><div class='ctx'> 			if (!stop)</div><div class='ctx'> 				mod_timer(&amp;isp-&gt;timer, jiffies + TIMER_JIFFIES);</div><div class='ctx'> #endif</div><div class='del'>-			put_device(&amp;isp-&gt;client.dev);</div><div class='add'>+			put_device(&amp;isp-&gt;client-&gt;dev);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (isp-&gt;todo)</div><div class='del'>-			dev_vdbg(&amp;isp-&gt;client.dev,</div><div class='add'>+			dev_vdbg(&amp;isp-&gt;client-&gt;dev,</div><div class='ctx'> 				"work done, todo = 0x%lx\n",</div><div class='ctx'> 				isp-&gt;todo);</div><div class='ctx'> 		if (stop) {</div><div class='del'>-			dev_dbg(&amp;isp-&gt;client.dev, "stop\n");</div><div class='add'>+			dev_dbg(&amp;isp-&gt;client-&gt;dev, "stop\n");</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	} while (isp-&gt;todo);</div><div class='hunk'>@@ -1219,7 +1210,7 @@ static void isp1301_release(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct isp1301	*isp;</div><div class='ctx'> </div><div class='del'>-	isp = container_of(dev, struct isp1301, client.dev);</div><div class='add'>+	isp = dev_get_drvdata(dev);</div><div class='ctx'> </div><div class='ctx'> 	/* ugly -- i2c hijacks our memory hook to wait_for_completion() */</div><div class='ctx'> 	if (isp-&gt;i2c_release)</div><div class='hunk'>@@ -1229,15 +1220,15 @@ static void isp1301_release(struct device *dev)</div><div class='ctx'> </div><div class='ctx'> static struct isp1301 *the_transceiver;</div><div class='ctx'> </div><div class='del'>-static int isp1301_detach_client(struct i2c_client *i2c)</div><div class='add'>+static int __exit isp1301_remove(struct i2c_client *i2c)</div><div class='ctx'> {</div><div class='ctx'> 	struct isp1301	*isp;</div><div class='ctx'> </div><div class='del'>-	isp = container_of(i2c, struct isp1301, client);</div><div class='add'>+	isp = i2c_get_clientdata(i2c);</div><div class='ctx'> </div><div class='ctx'> 	isp1301_clear_bits(isp, ISP1301_INTERRUPT_FALLING, ~0);</div><div class='ctx'> 	isp1301_clear_bits(isp, ISP1301_INTERRUPT_RISING, ~0);</div><div class='del'>-	free_irq(isp-&gt;irq, isp);</div><div class='add'>+	free_irq(i2c-&gt;irq, isp);</div><div class='ctx'> #ifdef	CONFIG_USB_OTG</div><div class='ctx'> 	otg_unbind(isp);</div><div class='ctx'> #endif</div><div class='hunk'>@@ -1252,7 +1243,7 @@ static int isp1301_detach_client(struct i2c_client *i2c)</div><div class='ctx'> 	put_device(&amp;i2c-&gt;dev);</div><div class='ctx'> 	the_transceiver = 0;</div><div class='ctx'> </div><div class='del'>-	return i2c_detach_client(i2c);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*-------------------------------------------------------------------------*/</div><div class='hunk'>@@ -1285,7 +1276,7 @@ static int isp1301_otg_enable(struct isp1301 *isp)</div><div class='ctx'> 	isp1301_set_bits(isp, ISP1301_INTERRUPT_FALLING,</div><div class='ctx'> 		INTR_VBUS_VLD | INTR_SESS_VLD | INTR_ID_GND);</div><div class='ctx'> </div><div class='del'>-	dev_info(&amp;isp-&gt;client.dev, "ready for dual-role USB ...\n");</div><div class='add'>+	dev_info(&amp;isp-&gt;client-&gt;dev, "ready for dual-role USB ...\n");</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1310,7 +1301,7 @@ isp1301_set_host(struct otg_transceiver *otg, struct usb_bus *host)</div><div class='ctx'> </div><div class='ctx'> #ifdef	CONFIG_USB_OTG</div><div class='ctx'> 	isp-&gt;otg.host = host;</div><div class='del'>-	dev_dbg(&amp;isp-&gt;client.dev, "registered host\n");</div><div class='add'>+	dev_dbg(&amp;isp-&gt;client-&gt;dev, "registered host\n");</div><div class='ctx'> 	host_suspend(isp);</div><div class='ctx'> 	if (isp-&gt;otg.gadget)</div><div class='ctx'> 		return isp1301_otg_enable(isp);</div><div class='hunk'>@@ -1325,7 +1316,7 @@ isp1301_set_host(struct otg_transceiver *otg, struct usb_bus *host)</div><div class='ctx'> 	if (machine_is_omap_h2())</div><div class='ctx'> 		isp1301_set_bits(isp, ISP1301_MODE_CONTROL_1, MC1_DAT_SE0);</div><div class='ctx'> </div><div class='del'>-	dev_info(&amp;isp-&gt;client.dev, "A-Host sessions ok\n");</div><div class='add'>+	dev_info(&amp;isp-&gt;client-&gt;dev, "A-Host sessions ok\n");</div><div class='ctx'> 	isp1301_set_bits(isp, ISP1301_INTERRUPT_RISING,</div><div class='ctx'> 		INTR_ID_GND);</div><div class='ctx'> 	isp1301_set_bits(isp, ISP1301_INTERRUPT_FALLING,</div><div class='hunk'>@@ -1343,7 +1334,7 @@ isp1301_set_host(struct otg_transceiver *otg, struct usb_bus *host)</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='del'>-	dev_dbg(&amp;isp-&gt;client.dev, "host sessions not allowed\n");</div><div class='add'>+	dev_dbg(&amp;isp-&gt;client-&gt;dev, "host sessions not allowed\n");</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -1370,7 +1361,7 @@ isp1301_set_peripheral(struct otg_transceiver *otg, struct usb_gadget *gadget)</div><div class='ctx'> </div><div class='ctx'> #ifdef	CONFIG_USB_OTG</div><div class='ctx'> 	isp-&gt;otg.gadget = gadget;</div><div class='del'>-	dev_dbg(&amp;isp-&gt;client.dev, "registered gadget\n");</div><div class='add'>+	dev_dbg(&amp;isp-&gt;client-&gt;dev, "registered gadget\n");</div><div class='ctx'> 	/* gadget driver may be suspended until vbus_connect () */</div><div class='ctx'> 	if (isp-&gt;otg.host)</div><div class='ctx'> 		return isp1301_otg_enable(isp);</div><div class='hunk'>@@ -1395,7 +1386,7 @@ isp1301_set_peripheral(struct otg_transceiver *otg, struct usb_gadget *gadget)</div><div class='ctx'> 		INTR_SESS_VLD);</div><div class='ctx'> 	isp1301_set_bits(isp, ISP1301_INTERRUPT_FALLING,</div><div class='ctx'> 		INTR_VBUS_VLD);</div><div class='del'>-	dev_info(&amp;isp-&gt;client.dev, "B-Peripheral sessions ok\n");</div><div class='add'>+	dev_info(&amp;isp-&gt;client-&gt;dev, "B-Peripheral sessions ok\n");</div><div class='ctx'> 	dump_regs(isp, __func__);</div><div class='ctx'> </div><div class='ctx'> 	/* If this has a Mini-AB connector, this mode is highly</div><div class='hunk'>@@ -1408,7 +1399,7 @@ isp1301_set_peripheral(struct otg_transceiver *otg, struct usb_gadget *gadget)</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='del'>-	dev_dbg(&amp;isp-&gt;client.dev, "peripheral sessions not allowed\n");</div><div class='add'>+	dev_dbg(&amp;isp-&gt;client-&gt;dev, "peripheral sessions not allowed\n");</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='hunk'>@@ -1508,12 +1499,10 @@ isp1301_start_hnp(struct otg_transceiver *dev)</div><div class='ctx'> </div><div class='ctx'> /*-------------------------------------------------------------------------*/</div><div class='ctx'> </div><div class='del'>-/* no error returns, they'd just make bus scanning stop */</div><div class='del'>-static int isp1301_probe(struct i2c_adapter *bus, int address, int kind)</div><div class='add'>+static int __init isp1301_probe(struct i2c_client *i2c)</div><div class='ctx'> {</div><div class='ctx'> 	int			status;</div><div class='ctx'> 	struct isp1301		*isp;</div><div class='del'>-	struct i2c_client	*i2c;</div><div class='ctx'> </div><div class='ctx'> 	if (the_transceiver)</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -1527,37 +1516,19 @@ static int isp1301_probe(struct i2c_adapter *bus, int address, int kind)</div><div class='ctx'> 	isp-&gt;timer.function = isp1301_timer;</div><div class='ctx'> 	isp-&gt;timer.data = (unsigned long) isp;</div><div class='ctx'> </div><div class='del'>-	isp-&gt;irq = -1;</div><div class='del'>-	isp-&gt;client.addr = address;</div><div class='del'>-	i2c_set_clientdata(&amp;isp-&gt;client, isp);</div><div class='del'>-	isp-&gt;client.adapter = bus;</div><div class='del'>-	isp-&gt;client.driver = &amp;isp1301_driver;</div><div class='del'>-	strlcpy(isp-&gt;client.name, DRIVER_NAME, I2C_NAME_SIZE);</div><div class='del'>-	i2c = &amp;isp-&gt;client;</div><div class='del'>-</div><div class='del'>-	/* if this is a true probe, verify the chip ... */</div><div class='del'>-	if (kind &lt; 0) {</div><div class='del'>-		status = isp1301_get_u16(isp, ISP1301_VENDOR_ID);</div><div class='del'>-		if (status != I2C_VENDOR_ID_PHILIPS) {</div><div class='del'>-			dev_dbg(&amp;bus-&gt;dev, "addr %d not philips id: %d\n",</div><div class='del'>-				address, status);</div><div class='del'>-			goto fail1;</div><div class='del'>-		}</div><div class='del'>-		status = isp1301_get_u16(isp, ISP1301_PRODUCT_ID);</div><div class='del'>-		if (status != I2C_PRODUCT_ID_PHILIPS_1301) {</div><div class='del'>-			dev_dbg(&amp;bus-&gt;dev, "%d not isp1301, %d\n",</div><div class='del'>-				address, status);</div><div class='del'>-			goto fail1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	i2c_set_clientdata(i2c, isp);</div><div class='add'>+	isp-&gt;client = i2c;</div><div class='ctx'> </div><div class='del'>-	status = i2c_attach_client(i2c);</div><div class='del'>-	if (status &lt; 0) {</div><div class='del'>-		dev_dbg(&amp;bus-&gt;dev, "can't attach %s to device %d, err %d\n",</div><div class='del'>-				DRIVER_NAME, address, status);</div><div class='del'>-fail1:</div><div class='del'>-		kfree(isp);</div><div class='del'>-		return 0;</div><div class='add'>+	/* verify the chip (shouldn't be necesary) */</div><div class='add'>+	status = isp1301_get_u16(isp, ISP1301_VENDOR_ID);</div><div class='add'>+	if (status != I2C_VENDOR_ID_PHILIPS) {</div><div class='add'>+		dev_dbg(&amp;i2c-&gt;dev, "not philips id: %d\n", status);</div><div class='add'>+		goto fail;</div><div class='add'>+	}</div><div class='add'>+	status = isp1301_get_u16(isp, ISP1301_PRODUCT_ID);</div><div class='add'>+	if (status != I2C_PRODUCT_ID_PHILIPS_1301) {</div><div class='add'>+		dev_dbg(&amp;i2c-&gt;dev, "not isp1301, %d\n", status);</div><div class='add'>+		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> 	isp-&gt;i2c_release = i2c-&gt;dev.release;</div><div class='ctx'> 	i2c-&gt;dev.release = isp1301_release;</div><div class='hunk'>@@ -1586,7 +1557,7 @@ fail1:</div><div class='ctx'> 	status = otg_bind(isp);</div><div class='ctx'> 	if (status &lt; 0) {</div><div class='ctx'> 		dev_dbg(&amp;i2c-&gt;dev, "can't bind OTG\n");</div><div class='del'>-		goto fail2;</div><div class='add'>+		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -1599,26 +1570,21 @@ fail1:</div><div class='ctx'> </div><div class='ctx'> 		/* IRQ wired at M14 */</div><div class='ctx'> 		omap_cfg_reg(M14_1510_GPIO2);</div><div class='del'>-		isp-&gt;irq = OMAP_GPIO_IRQ(2);</div><div class='ctx'> 		if (gpio_request(2, "isp1301") == 0)</div><div class='ctx'> 			gpio_direction_input(2);</div><div class='ctx'> 		isp-&gt;irq_type = IRQF_TRIGGER_FALLING;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	isp-&gt;irq_type |= IRQF_SAMPLE_RANDOM;</div><div class='del'>-	status = request_irq(isp-&gt;irq, isp1301_irq,</div><div class='add'>+	status = request_irq(i2c-&gt;irq, isp1301_irq,</div><div class='ctx'> 			isp-&gt;irq_type, DRIVER_NAME, isp);</div><div class='ctx'> 	if (status &lt; 0) {</div><div class='ctx'> 		dev_dbg(&amp;i2c-&gt;dev, "can't get IRQ %d, err %d\n",</div><div class='del'>-				isp-&gt;irq, status);</div><div class='del'>-#ifdef	CONFIG_USB_OTG</div><div class='del'>-fail2:</div><div class='del'>-#endif</div><div class='del'>-		i2c_detach_client(i2c);</div><div class='del'>-		goto fail1;</div><div class='add'>+				i2c-&gt;irq, status);</div><div class='add'>+		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	isp-&gt;otg.dev = &amp;isp-&gt;client.dev;</div><div class='add'>+	isp-&gt;otg.dev = &amp;i2c-&gt;dev;</div><div class='ctx'> 	isp-&gt;otg.label = DRIVER_NAME;</div><div class='ctx'> </div><div class='ctx'> 	isp-&gt;otg.set_host = isp1301_set_host,</div><div class='hunk'>@@ -1649,22 +1615,25 @@ fail2:</div><div class='ctx'> 			status);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-static int isp1301_scan_bus(struct i2c_adapter *bus)</div><div class='del'>-{</div><div class='del'>-	if (!i2c_check_functionality(bus, I2C_FUNC_SMBUS_BYTE_DATA</div><div class='del'>-			| I2C_FUNC_SMBUS_READ_WORD_DATA))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	return i2c_probe(bus, &amp;addr_data, isp1301_probe);</div><div class='add'>+fail:</div><div class='add'>+	kfree(isp);</div><div class='add'>+	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static const struct i2c_device_id isp1301_id[] = {</div><div class='add'>+	{ "isp1301_omap", 0 },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(i2c, isp1301_id);</div><div class='add'>+</div><div class='ctx'> static struct i2c_driver isp1301_driver = {</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		.name	= "isp1301_omap",</div><div class='ctx'> 	},</div><div class='del'>-	.attach_adapter	= isp1301_scan_bus,</div><div class='del'>-	.detach_client	= isp1301_detach_client,</div><div class='add'>+	.probe		= isp1301_probe,</div><div class='add'>+	.remove		= __exit_p(isp1301_remove),</div><div class='add'>+	.id_table	= isp1301_id,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*-------------------------------------------------------------------------*/</div><div class='head'>diff --git a/drivers/i2c/chips/mcu_mpc8349emitx.c b/drivers/i2c/chips/mcu_mpc8349emitx.c<br/>new file mode 100644<br/>index 000000000000..82a9bcb858b6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/i2c/chips/mcu_mpc8349emitx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/i2c/chips/mcu_mpc8349emitx.c</a></div><div class='hunk'>@@ -0,0 +1,209 @@</div><div class='add'>+/*</div><div class='add'>+ * Power Management and GPIO expander driver for MPC8349E-mITX-compatible MCU</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2008  MontaVista Software, Inc.</div><div class='add'>+ *</div><div class='add'>+ * Author: Anton Vorontsov &lt;avorontsov@ru.mvista.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/gpio.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_gpio.h&gt;</div><div class='add'>+#include &lt;asm/prom.h&gt;</div><div class='add'>+#include &lt;asm/machdep.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * I don't have specifications for the MCU firmware, I found this register</div><div class='add'>+ * and bits positions by the trial&amp;error method.</div><div class='add'>+ */</div><div class='add'>+#define MCU_REG_CTRL	0x20</div><div class='add'>+#define MCU_CTRL_POFF	0x40</div><div class='add'>+</div><div class='add'>+#define MCU_NUM_GPIO	2</div><div class='add'>+</div><div class='add'>+struct mcu {</div><div class='add'>+	struct mutex lock;</div><div class='add'>+	struct device_node *np;</div><div class='add'>+	struct i2c_client *client;</div><div class='add'>+	struct of_gpio_chip of_gc;</div><div class='add'>+	u8 reg_ctrl;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct mcu *glob_mcu;</div><div class='add'>+</div><div class='add'>+static void mcu_power_off(void)</div><div class='add'>+{</div><div class='add'>+	struct mcu *mcu = glob_mcu;</div><div class='add'>+</div><div class='add'>+	pr_info("Sending power-off request to the MCU...\n");</div><div class='add'>+	mutex_lock(&amp;mcu-&gt;lock);</div><div class='add'>+	i2c_smbus_write_byte_data(glob_mcu-&gt;client, MCU_REG_CTRL,</div><div class='add'>+				  mcu-&gt;reg_ctrl | MCU_CTRL_POFF);</div><div class='add'>+	mutex_unlock(&amp;mcu-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mcu_gpio_set(struct gpio_chip *gc, unsigned int gpio, int val)</div><div class='add'>+{</div><div class='add'>+	struct of_gpio_chip *of_gc = to_of_gpio_chip(gc);</div><div class='add'>+	struct mcu *mcu = container_of(of_gc, struct mcu, of_gc);</div><div class='add'>+	u8 bit = 1 &lt;&lt; (4 + gpio);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;mcu-&gt;lock);</div><div class='add'>+	if (val)</div><div class='add'>+		mcu-&gt;reg_ctrl &amp;= ~bit;</div><div class='add'>+	else</div><div class='add'>+		mcu-&gt;reg_ctrl |= bit;</div><div class='add'>+</div><div class='add'>+	i2c_smbus_write_byte_data(mcu-&gt;client, MCU_REG_CTRL, mcu-&gt;reg_ctrl);</div><div class='add'>+	mutex_unlock(&amp;mcu-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mcu_gpio_dir_out(struct gpio_chip *gc, unsigned int gpio, int val)</div><div class='add'>+{</div><div class='add'>+	mcu_gpio_set(gc, gpio, val);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mcu_gpiochip_add(struct mcu *mcu)</div><div class='add'>+{</div><div class='add'>+	struct device_node *np;</div><div class='add'>+	struct of_gpio_chip *of_gc = &amp;mcu-&gt;of_gc;</div><div class='add'>+	struct gpio_chip *gc = &amp;of_gc-&gt;gc;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	np = of_find_compatible_node(NULL, NULL, "fsl,mcu-mpc8349emitx");</div><div class='add'>+	if (!np)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	gc-&gt;owner = THIS_MODULE;</div><div class='add'>+	gc-&gt;label = np-&gt;full_name;</div><div class='add'>+	gc-&gt;can_sleep = 1;</div><div class='add'>+	gc-&gt;ngpio = MCU_NUM_GPIO;</div><div class='add'>+	gc-&gt;base = -1;</div><div class='add'>+	gc-&gt;set = mcu_gpio_set;</div><div class='add'>+	gc-&gt;direction_output = mcu_gpio_dir_out;</div><div class='add'>+	of_gc-&gt;gpio_cells = 2;</div><div class='add'>+	of_gc-&gt;xlate = of_gpio_simple_xlate;</div><div class='add'>+</div><div class='add'>+	np-&gt;data = of_gc;</div><div class='add'>+	mcu-&gt;np = np;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We don't want to lose the node, its -&gt;data and -&gt;full_name...</div><div class='add'>+	 * So, if succeeded, we don't put the node here.</div><div class='add'>+	 */</div><div class='add'>+	ret = gpiochip_add(gc);</div><div class='add'>+	if (ret)</div><div class='add'>+		of_node_put(np);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mcu_gpiochip_remove(struct mcu *mcu)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = gpiochip_remove(&amp;mcu-&gt;of_gc.gc);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	of_node_put(mcu-&gt;np);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devinit mcu_probe(struct i2c_client *client,</div><div class='add'>+			       const struct i2c_device_id *id)</div><div class='add'>+{</div><div class='add'>+	struct mcu *mcu;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mcu = kzalloc(sizeof(*mcu), GFP_KERNEL);</div><div class='add'>+	if (!mcu)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	mutex_init(&amp;mcu-&gt;lock);</div><div class='add'>+	mcu-&gt;client = client;</div><div class='add'>+	i2c_set_clientdata(client, mcu);</div><div class='add'>+</div><div class='add'>+	ret = i2c_smbus_read_byte_data(mcu-&gt;client, MCU_REG_CTRL);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err;</div><div class='add'>+	mcu-&gt;reg_ctrl = ret;</div><div class='add'>+</div><div class='add'>+	ret = mcu_gpiochip_add(mcu);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	/* XXX: this is potentially racy, but there is no lock for ppc_md */</div><div class='add'>+	if (!ppc_md.power_off) {</div><div class='add'>+		glob_mcu = mcu;</div><div class='add'>+		ppc_md.power_off = mcu_power_off;</div><div class='add'>+		dev_info(&amp;client-&gt;dev, "will provide power-off service\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+err:</div><div class='add'>+	kfree(mcu);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devexit mcu_remove(struct i2c_client *client)</div><div class='add'>+{</div><div class='add'>+	struct mcu *mcu = i2c_get_clientdata(client);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (glob_mcu == mcu) {</div><div class='add'>+		ppc_md.power_off = NULL;</div><div class='add'>+		glob_mcu = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = mcu_gpiochip_remove(mcu);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	i2c_set_clientdata(client, NULL);</div><div class='add'>+	kfree(mcu);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct i2c_device_id mcu_ids[] = {</div><div class='add'>+	{ "mcu-mpc8349emitx", },</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(i2c, mcu_ids);</div><div class='add'>+</div><div class='add'>+static struct i2c_driver mcu_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = "mcu-mpc8349emitx",</div><div class='add'>+		.owner = THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+	.probe = mcu_probe,</div><div class='add'>+	.remove	= __devexit_p(mcu_remove),</div><div class='add'>+	.id_table = mcu_ids,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init mcu_init(void)</div><div class='add'>+{</div><div class='add'>+	return i2c_add_driver(&amp;mcu_driver);</div><div class='add'>+}</div><div class='add'>+module_init(mcu_init);</div><div class='add'>+</div><div class='add'>+static void __exit mcu_exit(void)</div><div class='add'>+{</div><div class='add'>+	i2c_del_driver(&amp;mcu_driver);</div><div class='add'>+}</div><div class='add'>+module_exit(mcu_exit);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("Power Management and GPIO expander driver for "</div><div class='add'>+		   "MPC8349E-mITX-compatible MCU");</div><div class='add'>+MODULE_AUTHOR("Anton Vorontsov &lt;avorontsov@ru.mvista.com&gt;");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/i2c/chips/tps65010.c b/drivers/i2c/chips/tps65010.c<br/>index cf02e8fceb42..acf8b9d5f575 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/i2c/chips/tps65010.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/i2c/chips/tps65010.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/i2c/chips/tps65010.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/i2c/chips/tps65010.c</a></div><div class='hunk'>@@ -456,14 +456,17 @@ static irqreturn_t tps65010_irq(int irq, void *_tps)</div><div class='ctx'> </div><div class='ctx'> /* offsets 0..3 == GPIO1..GPIO4</div><div class='ctx'>  * offsets 4..5 == LED1/nPG, LED2 (we set one of the non-BLINK modes)</div><div class='add'>+ * offset 6 == vibrator motor driver</div><div class='ctx'>  */</div><div class='ctx'> static void</div><div class='ctx'> tps65010_gpio_set(struct gpio_chip *chip, unsigned offset, int value)</div><div class='ctx'> {</div><div class='ctx'> 	if (offset &lt; 4)</div><div class='ctx'> 		tps65010_set_gpio_out_value(offset + 1, value);</div><div class='del'>-	else</div><div class='add'>+	else if (offset &lt; 6)</div><div class='ctx'> 		tps65010_set_led(offset - 3, value ? ON : OFF);</div><div class='add'>+	else</div><div class='add'>+		tps65010_set_vib(value);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -477,8 +480,10 @@ tps65010_output(struct gpio_chip *chip, unsigned offset, int value)</div><div class='ctx'> 		if (!(tps-&gt;outmask &amp; (1 &lt;&lt; offset)))</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		tps65010_set_gpio_out_value(offset + 1, value);</div><div class='del'>-	} else</div><div class='add'>+	} else if (offset &lt; 6)</div><div class='ctx'> 		tps65010_set_led(offset - 3, value ? ON : OFF);</div><div class='add'>+	else</div><div class='add'>+		tps65010_set_vib(value);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -646,7 +651,7 @@ static int tps65010_probe(struct i2c_client *client,</div><div class='ctx'> 		tps-&gt;chip.get = tps65010_gpio_get;</div><div class='ctx'> </div><div class='ctx'> 		tps-&gt;chip.base = board-&gt;base;</div><div class='del'>-		tps-&gt;chip.ngpio = 6;</div><div class='add'>+		tps-&gt;chip.ngpio = 7;</div><div class='ctx'> 		tps-&gt;chip.can_sleep = 1;</div><div class='ctx'> </div><div class='ctx'> 		status = gpiochip_add(&amp;tps-&gt;chip);</div><div class='hunk'>@@ -675,6 +680,7 @@ static const struct i2c_device_id tps65010_id[] = {</div><div class='ctx'> 	{ "tps65011", TPS65011 },</div><div class='ctx'> 	{ "tps65012", TPS65012 },</div><div class='ctx'> 	{ "tps65013", TPS65013 },</div><div class='add'>+	{ "tps65014", TPS65011 },	/* tps65011 charging at 6.5V max */</div><div class='ctx'> 	{ }</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(i2c, tps65010_id);</div><div class='head'>diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c<br/>index b346a687ab59..42e852d79ffa 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/i2c/i2c-core.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/i2c/i2c-core.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/i2c/i2c-core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/i2c/i2c-core.c</a></div><div class='hunk'>@@ -437,6 +437,10 @@ static int i2c_register_adapter(struct i2c_adapter *adap)</div><div class='ctx'> {</div><div class='ctx'> 	int res = 0, dummy;</div><div class='ctx'> </div><div class='add'>+	/* Can't register until after driver model init */</div><div class='add'>+	if (unlikely(WARN_ON(!i2c_bus_type.p)))</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+</div><div class='ctx'> 	mutex_init(&amp;adap-&gt;bus_lock);</div><div class='ctx'> 	mutex_init(&amp;adap-&gt;clist_lock);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;adap-&gt;clients);</div><div class='hunk'>@@ -696,6 +700,10 @@ int i2c_register_driver(struct module *owner, struct i2c_driver *driver)</div><div class='ctx'> {</div><div class='ctx'> 	int res;</div><div class='ctx'> </div><div class='add'>+	/* Can't register until after driver model init */</div><div class='add'>+	if (unlikely(WARN_ON(!i2c_bus_type.p)))</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+</div><div class='ctx'> 	/* new style driver methods can't mix with legacy ones */</div><div class='ctx'> 	if (is_newstyle_driver(driver)) {</div><div class='ctx'> 		if (driver-&gt;attach_adapter || driver-&gt;detach_adapter</div><div class='hunk'>@@ -978,7 +986,10 @@ static void __exit i2c_exit(void)</div><div class='ctx'> 	bus_unregister(&amp;i2c_bus_type);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-subsys_initcall(i2c_init);</div><div class='add'>+/* We must initialize early, because some subsystems register i2c drivers</div><div class='add'>+ * in subsys_initcall() code, but are linked (and initialized) before i2c.</div><div class='add'>+ */</div><div class='add'>+postcore_initcall(i2c_init);</div><div class='ctx'> module_exit(i2c_exit);</div><div class='ctx'> </div><div class='ctx'> /* ----------------------------------------------------</div><div class='hunk'>@@ -1677,6 +1688,28 @@ s32 i2c_smbus_write_word_data(struct i2c_client *client, u8 command, u16 value)</div><div class='ctx'> EXPORT_SYMBOL(i2c_smbus_write_word_data);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * i2c_smbus_process_call - SMBus "process call" protocol</div><div class='add'>+ * @client: Handle to slave device</div><div class='add'>+ * @command: Byte interpreted by slave</div><div class='add'>+ * @value: 16-bit "word" being written</div><div class='add'>+ *</div><div class='add'>+ * This executes the SMBus "process call" protocol, returning negative errno</div><div class='add'>+ * else a 16-bit unsigned "word" received from the device.</div><div class='add'>+ */</div><div class='add'>+s32 i2c_smbus_process_call(struct i2c_client *client, u8 command, u16 value)</div><div class='add'>+{</div><div class='add'>+	union i2c_smbus_data data;</div><div class='add'>+	int status;</div><div class='add'>+	data.word = value;</div><div class='add'>+</div><div class='add'>+	status = i2c_smbus_xfer(client-&gt;adapter, client-&gt;addr, client-&gt;flags,</div><div class='add'>+				I2C_SMBUS_WRITE, command,</div><div class='add'>+				I2C_SMBUS_PROC_CALL, &amp;data);</div><div class='add'>+	return (status &lt; 0) ? status : data.word;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(i2c_smbus_process_call);</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * i2c_smbus_read_block_data - SMBus "block read" protocol</div><div class='ctx'>  * @client: Handle to slave device</div><div class='ctx'>  * @command: Byte interpreted by slave</div><div class='head'>diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c<br/>index 307d976c9b69..c171988a9f51 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/i2c/i2c-dev.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/i2c/i2c-dev.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/i2c/i2c-dev.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/i2c/i2c-dev.c</a></div><div class='hunk'>@@ -521,9 +521,9 @@ static int i2cdev_attach_adapter(struct i2c_adapter *adap)</div><div class='ctx'> 		return PTR_ERR(i2c_dev);</div><div class='ctx'> </div><div class='ctx'> 	/* register this i2c device with the driver core */</div><div class='del'>-	i2c_dev-&gt;dev = device_create_drvdata(i2c_dev_class, &amp;adap-&gt;dev,</div><div class='del'>-					     MKDEV(I2C_MAJOR, adap-&gt;nr),</div><div class='del'>-					     NULL, "i2c-%d", adap-&gt;nr);</div><div class='add'>+	i2c_dev-&gt;dev = device_create(i2c_dev_class, &amp;adap-&gt;dev,</div><div class='add'>+				     MKDEV(I2C_MAJOR, adap-&gt;nr), NULL,</div><div class='add'>+				     "i2c-%d", adap-&gt;nr);</div><div class='ctx'> 	if (IS_ERR(i2c_dev-&gt;dev)) {</div><div class='ctx'> 		res = PTR_ERR(i2c_dev-&gt;dev);</div><div class='ctx'> 		goto error;</div><div class='head'>diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig<br/>index 052879a6f853..74a369a6116f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ide/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/Kconfig</a></div><div class='hunk'>@@ -4,7 +4,7 @@</div><div class='ctx'> </div><div class='ctx'> # Select HAVE_IDE if IDE is supported</div><div class='ctx'> config HAVE_IDE</div><div class='del'>-	def_bool n</div><div class='add'>+	bool</div><div class='ctx'> </div><div class='ctx'> menuconfig IDE</div><div class='ctx'> 	tristate "ATA/ATAPI/MFM/RLL support"</div><div class='hunk'>@@ -54,38 +54,6 @@ menuconfig IDE</div><div class='ctx'> </div><div class='ctx'> if IDE</div><div class='ctx'> </div><div class='del'>-config BLK_DEV_IDE</div><div class='del'>-	tristate "Enhanced IDE/MFM/RLL disk/cdrom/tape/floppy support"</div><div class='del'>-	---help---</div><div class='del'>-	  If you say Y here, you will use the full-featured IDE driver to</div><div class='del'>-	  control up to ten ATA/IDE interfaces, each being able to serve a</div><div class='del'>-	  "master" and a "slave" device, for a total of up to twenty ATA/IDE</div><div class='del'>-	  disk/cdrom/tape/floppy drives.</div><div class='del'>-</div><div class='del'>-	  Useful information about large (&gt;540 MB) IDE disks, multiple</div><div class='del'>-	  interfaces, what to do if ATA/IDE devices are not automatically</div><div class='del'>-	  detected, sound card ATA/IDE ports, module support, and other</div><div class='del'>-	  topics, is contained in &lt;file:Documentation/ide/ide.txt&gt;. For detailed</div><div class='del'>-	  information about hard drives, consult the Disk-HOWTO and the</div><div class='del'>-	  Multi-Disk-HOWTO, available from</div><div class='del'>-	  &lt;http://www.tldp.org/docs.html#howto&gt;.</div><div class='del'>-</div><div class='del'>-	  To fine-tune ATA/IDE drive/interface parameters for improved</div><div class='del'>-	  performance, look for the hdparm package at</div><div class='del'>-	  &lt;ftp://ibiblio.org/pub/Linux/system/hardware/&gt;.</div><div class='del'>-</div><div class='del'>-	  To compile this driver as a module, choose M here and read</div><div class='del'>-	  &lt;file:Documentation/ide/ide.txt&gt;. The module will be called ide-mod.</div><div class='del'>-	  Do not compile this driver as a module if your root file system (the</div><div class='del'>-	  one containing the directory /) is located on an IDE device.</div><div class='del'>-</div><div class='del'>-	  If you have one or more IDE drives, say Y or M here. If your system</div><div class='del'>-	  has no IDE drives, or if memory requirements are really tight, you</div><div class='del'>-	  could say N here, and select the "Old hard disk driver" below</div><div class='del'>-	  instead to save about 13 KB of memory in the kernel.</div><div class='del'>-</div><div class='del'>-if BLK_DEV_IDE</div><div class='del'>-</div><div class='ctx'> comment "Please see Documentation/ide/ide.txt for help/info on IDE drives"</div><div class='ctx'> </div><div class='ctx'> config IDE_TIMINGS</div><div class='hunk'>@@ -131,29 +99,6 @@ config BLK_DEV_IDEDISK</div><div class='ctx'> </div><div class='ctx'> 	  If unsure, say Y.</div><div class='ctx'> </div><div class='del'>-config IDEDISK_MULTI_MODE</div><div class='del'>-	bool "Use multiple sector mode for Programmed Input/Output by default"</div><div class='del'>-	help</div><div class='del'>-	  This setting is irrelevant for most IDE disks, with direct memory</div><div class='del'>-	  access, to which multiple sector mode does not apply. Multiple sector</div><div class='del'>-	  mode is a feature of most modern IDE hard drives, permitting the</div><div class='del'>-	  transfer of multiple sectors per Programmed Input/Output interrupt,</div><div class='del'>-	  rather than the usual one sector per interrupt. When this feature is</div><div class='del'>-	  enabled, it can reduce operating system overhead for disk Programmed</div><div class='del'>-	  Input/Output. On some systems, it also can increase the data</div><div class='del'>-	  throughput of Programmed Input/Output. Some drives, however, seemed</div><div class='del'>-	  to run slower with multiple sector mode enabled. Some drives claimed</div><div class='del'>-	  to support multiple sector mode, but lost data at some settings.</div><div class='del'>-	  Under rare circumstances, such failures could result in massive</div><div class='del'>-	  filesystem corruption.</div><div class='del'>-</div><div class='del'>-	  If you get the following error, try to say Y here:</div><div class='del'>-</div><div class='del'>-	  hda: set_multmode: status=0x51 { DriveReady SeekComplete Error }</div><div class='del'>-	  hda: set_multmode: error=0x04 { DriveStatusError }</div><div class='del'>-</div><div class='del'>-	  If in doubt, say N.</div><div class='del'>-</div><div class='ctx'> config BLK_DEV_IDECS</div><div class='ctx'> 	tristate "PCMCIA IDE support"</div><div class='ctx'> 	depends on PCMCIA</div><div class='hunk'>@@ -371,7 +316,7 @@ config BLK_DEV_IDEPCI</div><div class='ctx'> </div><div class='ctx'> config IDEPCI_PCIBUS_ORDER</div><div class='ctx'> 	bool "Probe IDE PCI devices in the PCI bus order (DEPRECATED)"</div><div class='del'>-	depends on BLK_DEV_IDE=y &amp;&amp; BLK_DEV_IDEPCI</div><div class='add'>+	depends on IDE=y &amp;&amp; BLK_DEV_IDEPCI</div><div class='ctx'> 	default y</div><div class='ctx'> 	help</div><div class='ctx'> 	  Probe IDE PCI devices in the order in which they appear on the</div><div class='hunk'>@@ -752,7 +697,7 @@ endif</div><div class='ctx'> </div><div class='ctx'> config BLK_DEV_IDE_PMAC</div><div class='ctx'> 	tristate "PowerMac on-board IDE support"</div><div class='del'>-	depends on PPC_PMAC &amp;&amp; IDE=y &amp;&amp; BLK_DEV_IDE=y</div><div class='add'>+	depends on PPC_PMAC &amp;&amp; IDE=y</div><div class='ctx'> 	select IDE_TIMINGS</div><div class='ctx'> 	help</div><div class='ctx'> 	  This driver provides support for the on-board IDE controller on</div><div class='hunk'>@@ -986,6 +931,4 @@ config BLK_DEV_IDEDMA</div><div class='ctx'> 	def_bool BLK_DEV_IDEDMA_SFF || BLK_DEV_IDEDMA_PMAC || \</div><div class='ctx'> 		 BLK_DEV_IDEDMA_ICS || BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA</div><div class='ctx'> </div><div class='del'>-endif</div><div class='del'>-</div><div class='ctx'> endif # IDE</div><div class='head'>diff --git a/drivers/ide/Makefile b/drivers/ide/Makefile<br/>index 64e0ecdc4ed5..ceaf779054ea 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ide/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/Makefile</a></div><div class='hunk'>@@ -4,25 +4,26 @@</div><div class='ctx'> </div><div class='ctx'> EXTRA_CFLAGS				+= -Idrivers/ide</div><div class='ctx'> </div><div class='del'>-ide-core-y += ide.o ide-io.o ide-iops.o ide-lib.o ide-probe.o ide-taskfile.o \</div><div class='del'>-	      ide-pio-blacklist.o</div><div class='add'>+ide-core-y += ide.o ide-ioctls.o ide-io.o ide-iops.o ide-lib.o ide-probe.o \</div><div class='add'>+	      ide-taskfile.o ide-park.o ide-pio-blacklist.o</div><div class='ctx'> </div><div class='ctx'> # core IDE code</div><div class='ctx'> ide-core-$(CONFIG_IDE_TIMINGS)		+= ide-timings.o</div><div class='ctx'> ide-core-$(CONFIG_IDE_ATAPI)		+= ide-atapi.o</div><div class='ctx'> ide-core-$(CONFIG_BLK_DEV_IDEPCI)	+= setup-pci.o</div><div class='ctx'> ide-core-$(CONFIG_BLK_DEV_IDEDMA)	+= ide-dma.o</div><div class='add'>+ide-core-$(CONFIG_BLK_DEV_IDEDMA_SFF)	+= ide-dma-sff.o</div><div class='ctx'> ide-core-$(CONFIG_IDE_PROC_FS)		+= ide-proc.o</div><div class='ctx'> ide-core-$(CONFIG_BLK_DEV_IDEACPI)	+= ide-acpi.o</div><div class='ctx'> </div><div class='del'>-obj-$(CONFIG_BLK_DEV_IDE)		+= ide-core.o</div><div class='add'>+obj-$(CONFIG_IDE)			+= ide-core.o</div><div class='ctx'> </div><div class='ctx'> ifeq ($(CONFIG_IDE_ARM), y)</div><div class='ctx'> 	ide-arm-core-y += arm/ide_arm.o</div><div class='ctx'> 	obj-y += ide-arm-core.o</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='del'>-obj-$(CONFIG_BLK_DEV_IDE)		+= legacy/ pci/</div><div class='add'>+obj-$(CONFIG_IDE)			+= legacy/ pci/</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_IDEPCI_PCIBUS_ORDER)	+= ide-scan-pci.o</div><div class='ctx'> </div><div class='hunk'>@@ -31,17 +32,24 @@ ifeq ($(CONFIG_BLK_DEV_CMD640), y)</div><div class='ctx'> 	obj-y += cmd640-core.o</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='del'>-obj-$(CONFIG_BLK_DEV_IDE)		+= ppc/</div><div class='add'>+obj-$(CONFIG_IDE)			+= ppc/</div><div class='ctx'> obj-$(CONFIG_IDE_H8300)			+= h8300/</div><div class='ctx'> obj-$(CONFIG_IDE_GENERIC)		+= ide-generic.o</div><div class='ctx'> obj-$(CONFIG_BLK_DEV_IDEPNP)		+= ide-pnp.o</div><div class='ctx'> </div><div class='add'>+ide-disk_mod-y += ide-disk.o ide-disk_ioctl.o</div><div class='ctx'> ide-cd_mod-y += ide-cd.o ide-cd_ioctl.o ide-cd_verbose.o</div><div class='add'>+ide-floppy_mod-y += ide-floppy.o ide-floppy_ioctl.o</div><div class='ctx'> </div><div class='del'>-obj-$(CONFIG_BLK_DEV_IDEDISK)		+= ide-disk.o</div><div class='add'>+ifeq ($(CONFIG_IDE_PROC_FS), y)</div><div class='add'>+	ide-disk_mod-y += ide-disk_proc.o</div><div class='add'>+	ide-floppy_mod-y += ide-floppy_proc.o</div><div class='add'>+endif</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_BLK_DEV_IDEDISK)		+= ide-disk_mod.o</div><div class='ctx'> obj-$(CONFIG_BLK_DEV_IDECD)		+= ide-cd_mod.o</div><div class='add'>+obj-$(CONFIG_BLK_DEV_IDEFLOPPY)		+= ide-floppy_mod.o</div><div class='ctx'> obj-$(CONFIG_BLK_DEV_IDETAPE)		+= ide-tape.o</div><div class='del'>-obj-$(CONFIG_BLK_DEV_IDEFLOPPY)		+= ide-floppy.o</div><div class='ctx'> </div><div class='ctx'> ifeq ($(CONFIG_BLK_DEV_IDECS), y)</div><div class='ctx'> 	ide-cs-core-y += legacy/ide-cs.o</div><div class='hunk'>@@ -53,4 +61,4 @@ ifeq ($(CONFIG_BLK_DEV_PLATFORM), y)</div><div class='ctx'> 	obj-y += ide-platform-core.o</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='del'>-obj-$(CONFIG_BLK_DEV_IDE)		+= arm/ mips/</div><div class='add'>+obj-$(CONFIG_IDE)			+= arm/ mips/</div><div class='head'>diff --git a/drivers/ide/arm/icside.c b/drivers/ide/arm/icside.c<br/>index df4af4083954..76bdc9a27f6f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/arm/icside.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ide/arm/icside.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/arm/icside.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/arm/icside.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/hdreg.h&gt;</div><div class='ctx'> #include &lt;linux/ide.h&gt;</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='hunk'>@@ -265,8 +264,8 @@ static void icside_set_dma_mode(ide_drive_t *drive, const u8 xfer_mode)</div><div class='ctx'> 	 * If we're going to be doing MW_DMA_1 or MW_DMA_2, we should</div><div class='ctx'> 	 * take care to note the values in the ID...</div><div class='ctx'> 	 */</div><div class='del'>-	if (use_dma_info &amp;&amp; drive-&gt;id-&gt;eide_dma_time &gt; cycle_time)</div><div class='del'>-		cycle_time = drive-&gt;id-&gt;eide_dma_time;</div><div class='add'>+	if (use_dma_info &amp;&amp; drive-&gt;id[ATA_ID_EIDE_DMA_TIME] &gt; cycle_time)</div><div class='add'>+		cycle_time = drive-&gt;id[ATA_ID_EIDE_DMA_TIME];</div><div class='ctx'> </div><div class='ctx'> 	drive-&gt;drive_data = cycle_time;</div><div class='ctx'> </div><div class='hunk'>@@ -373,25 +372,6 @@ static int icside_dma_test_irq(ide_drive_t *drive)</div><div class='ctx'> 			ICS_ARCIN_V6_INTRSTAT_1)) &amp; 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void icside_dma_timeout(ide_drive_t *drive)</div><div class='del'>-{</div><div class='del'>-	ide_hwif_t *hwif = drive-&gt;hwif;</div><div class='del'>-</div><div class='del'>-	printk(KERN_ERR "%s: DMA timeout occurred: ", drive-&gt;name);</div><div class='del'>-</div><div class='del'>-	if (icside_dma_test_irq(drive))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	ide_dump_status(drive, "DMA timeout", hwif-&gt;tp_ops-&gt;read_status(hwif));</div><div class='del'>-</div><div class='del'>-	icside_dma_end(drive);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void icside_dma_lost_irq(ide_drive_t *drive)</div><div class='del'>-{</div><div class='del'>-	printk(KERN_ERR "%s: IRQ lost\n", drive-&gt;name);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int icside_dma_init(ide_hwif_t *hwif, const struct ide_port_info *d)</div><div class='ctx'> {</div><div class='ctx'> 	hwif-&gt;dmatable_cpu	= NULL;</div><div class='hunk'>@@ -407,8 +387,8 @@ static const struct ide_dma_ops icside_v6_dma_ops = {</div><div class='ctx'> 	.dma_start		= icside_dma_start,</div><div class='ctx'> 	.dma_end		= icside_dma_end,</div><div class='ctx'> 	.dma_test_irq		= icside_dma_test_irq,</div><div class='del'>-	.dma_timeout		= icside_dma_timeout,</div><div class='del'>-	.dma_lost_irq		= icside_dma_lost_irq,</div><div class='add'>+	.dma_timeout		= ide_dma_timeout,</div><div class='add'>+	.dma_lost_irq		= ide_dma_lost_irq,</div><div class='ctx'> };</div><div class='ctx'> #else</div><div class='ctx'> #define icside_v6_dma_ops NULL</div><div class='head'>diff --git a/drivers/ide/arm/palm_bk3710.c b/drivers/ide/arm/palm_bk3710.c<br/>index 4fd91dcf1dc2..122ed3c072fd 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/arm/palm_bk3710.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ide/arm/palm_bk3710.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/arm/palm_bk3710.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/arm/palm_bk3710.c</a></div><div class='hunk'>@@ -27,7 +27,6 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='del'>-#include &lt;linux/hdreg.h&gt;</div><div class='ctx'> #include &lt;linux/ide.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -180,7 +179,7 @@ static void palm_bk3710_setpiomode(void __iomem *base, ide_drive_t *mate,</div><div class='ctx'> 	val32 |= (t2i &lt;&lt; (dev ? 8 : 0));</div><div class='ctx'> 	writel(val32, base + BK3710_DATRCVR);</div><div class='ctx'> </div><div class='del'>-	if (mate &amp;&amp; mate-&gt;present) {</div><div class='add'>+	if (mate) {</div><div class='ctx'> 		u8 mode2 = ide_get_best_pio_mode(mate, 255, 4);</div><div class='ctx'> </div><div class='ctx'> 		if (mode2 &lt; mode)</div><div class='hunk'>@@ -213,7 +212,8 @@ static void palm_bk3710_set_dma_mode(ide_drive_t *drive, u8 xferspeed)</div><div class='ctx'> 		palm_bk3710_setudmamode(base, is_slave,</div><div class='ctx'> 					xferspeed - XFER_UDMA_0);</div><div class='ctx'> 	} else {</div><div class='del'>-		palm_bk3710_setdmamode(base, is_slave, drive-&gt;id-&gt;eide_dma_min,</div><div class='add'>+		palm_bk3710_setdmamode(base, is_slave,</div><div class='add'>+				       drive-&gt;id[ATA_ID_EIDE_DMA_MIN],</div><div class='ctx'> 				       xferspeed);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -229,7 +229,7 @@ static void palm_bk3710_set_pio_mode(ide_drive_t *drive, u8 pio)</div><div class='ctx'> 	 * Obtain the drive PIO data for tuning the Palm Chip registers</div><div class='ctx'> 	 */</div><div class='ctx'> 	cycle_time = ide_pio_cycle_time(drive, pio);</div><div class='del'>-	mate = ide_get_paired_drive(drive);</div><div class='add'>+	mate = ide_get_pair_dev(drive);</div><div class='ctx'> 	palm_bk3710_setpiomode(base, mate, is_slave, cycle_time, pio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/ide/h8300/ide-h8300.c b/drivers/ide/h8300/ide-h8300.c<br/>index bde7a585f198..e2cdd2e9cdec 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/h8300/ide-h8300.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ide/h8300/ide-h8300.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/h8300/ide-h8300.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/h8300/ide-h8300.c</a></div><div class='hunk'>@@ -80,7 +80,7 @@ static void h8300_tf_load(ide_drive_t *drive, ide_task_t *task)</div><div class='ctx'> 		outb(tf-&gt;lbah, io_ports-&gt;lbah_addr);</div><div class='ctx'> </div><div class='ctx'> 	if (task-&gt;tf_flags &amp; IDE_TFLAG_OUT_DEVICE)</div><div class='del'>-		outb((tf-&gt;device &amp; HIHI) | drive-&gt;select.all,</div><div class='add'>+		outb((tf-&gt;device &amp; HIHI) | drive-&gt;select,</div><div class='ctx'> 		     io_ports-&gt;device_addr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/ide/ide-acpi.c b/drivers/ide/ide-acpi.c<br/>index 6f704628c27d..244a8a052ce8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/ide-acpi.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ide/ide-acpi.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/ide-acpi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/ide-acpi.c</a></div><div class='hunk'>@@ -290,7 +290,7 @@ static int do_drive_get_GTF(ide_drive_t *drive,</div><div class='ctx'> 	DEBPRINT("ENTER: %s at %s, port#: %d, hard_port#: %d\n",</div><div class='ctx'> 		 hwif-&gt;name, dev-&gt;bus_id, port, hwif-&gt;channel);</div><div class='ctx'> </div><div class='del'>-	if (!drive-&gt;present) {</div><div class='add'>+	if ((drive-&gt;dev_flags &amp; IDE_DFLAG_PRESENT) == 0) {</div><div class='ctx'> 		DEBPRINT("%s drive %d:%d not present\n",</div><div class='ctx'> 			 hwif-&gt;name, hwif-&gt;channel, port);</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -420,8 +420,9 @@ static int do_drive_set_taskfiles(ide_drive_t *drive,</div><div class='ctx'> </div><div class='ctx'> 	DEBPRINT("ENTER: %s, hard_port#: %d\n", drive-&gt;name, drive-&gt;dn);</div><div class='ctx'> </div><div class='del'>-	if (!drive-&gt;present)</div><div class='add'>+	if ((drive-&gt;dev_flags &amp; IDE_DFLAG_PRESENT) == 0)</div><div class='ctx'> 		goto out;</div><div class='add'>+</div><div class='ctx'> 	if (!gtf_count)		/* shouldn't be here */</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -584,7 +585,7 @@ void ide_acpi_get_timing(ide_hwif_t *hwif)</div><div class='ctx'>  * This function executes the _STM ACPI method for the target channel.</div><div class='ctx'>  *</div><div class='ctx'>  * _STM requires Identify Drive data, which has to passed as an argument.</div><div class='del'>- * Unfortunately hd_driveid is a mangled version which we can't readily</div><div class='add'>+ * Unfortunately drive-&gt;id is a mangled version which we can't readily</div><div class='ctx'>  * use; hence we'll get the information afresh.</div><div class='ctx'>  */</div><div class='ctx'> void ide_acpi_push_timing(ide_hwif_t *hwif)</div><div class='hunk'>@@ -614,10 +615,10 @@ void ide_acpi_push_timing(ide_hwif_t *hwif)</div><div class='ctx'> 	in_params[0].buffer.length = sizeof(struct GTM_buffer);</div><div class='ctx'> 	in_params[0].buffer.pointer = (u8 *)&amp;hwif-&gt;acpidata-&gt;gtm;</div><div class='ctx'> 	in_params[1].type = ACPI_TYPE_BUFFER;</div><div class='del'>-	in_params[1].buffer.length = sizeof(struct hd_driveid);</div><div class='add'>+	in_params[1].buffer.length = sizeof(ATA_ID_WORDS * 2);</div><div class='ctx'> 	in_params[1].buffer.pointer = (u8 *)&amp;master-&gt;idbuff;</div><div class='ctx'> 	in_params[2].type = ACPI_TYPE_BUFFER;</div><div class='del'>-	in_params[2].buffer.length = sizeof(struct hd_driveid);</div><div class='add'>+	in_params[2].buffer.length = sizeof(ATA_ID_WORDS * 2);</div><div class='ctx'> 	in_params[2].buffer.pointer = (u8 *)&amp;slave-&gt;idbuff;</div><div class='ctx'> 	/* Output buffer: _STM has no output */</div><div class='ctx'> </div><div class='hunk'>@@ -660,7 +661,8 @@ void ide_acpi_set_state(ide_hwif_t *hwif, int on)</div><div class='ctx'> 		if (!drive-&gt;acpidata-&gt;obj_handle)</div><div class='ctx'> 			drive-&gt;acpidata-&gt;obj_handle = ide_acpi_drive_get_handle(drive);</div><div class='ctx'> </div><div class='del'>-		if (drive-&gt;acpidata-&gt;obj_handle &amp;&amp; drive-&gt;present) {</div><div class='add'>+		if (drive-&gt;acpidata-&gt;obj_handle &amp;&amp;</div><div class='add'>+		    (drive-&gt;dev_flags &amp; IDE_DFLAG_PRESENT)) {</div><div class='ctx'> 			acpi_bus_set_power(drive-&gt;acpidata-&gt;obj_handle,</div><div class='ctx'> 				on? ACPI_STATE_D0: ACPI_STATE_D3);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -720,7 +722,7 @@ void ide_acpi_port_init_devices(ide_hwif_t *hwif)</div><div class='ctx'> </div><div class='ctx'> 		memset(drive-&gt;acpidata, 0, sizeof(*drive-&gt;acpidata));</div><div class='ctx'> </div><div class='del'>-		if (!drive-&gt;present)</div><div class='add'>+		if ((drive-&gt;dev_flags &amp; IDE_DFLAG_PRESENT) == 0)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		err = taskfile_lib_get_identify(drive, drive-&gt;acpidata-&gt;idbuff);</div><div class='hunk'>@@ -745,7 +747,7 @@ void ide_acpi_port_init_devices(ide_hwif_t *hwif)</div><div class='ctx'> 	for (i = 0; i &lt; MAX_DRIVES; i++) {</div><div class='ctx'> 		drive = &amp;hwif-&gt;drives[i];</div><div class='ctx'> </div><div class='del'>-		if (drive-&gt;present)</div><div class='add'>+		if (drive-&gt;dev_flags &amp; IDE_DFLAG_PRESENT)</div><div class='ctx'> 			/* Execute ACPI startup code */</div><div class='ctx'> 			ide_acpi_exec_tfs(drive);</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/ide/ide-atapi.c b/drivers/ide/ide-atapi.c<br/>index adf04f99cdeb..2e305714c209 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/ide-atapi.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ide/ide-atapi.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/ide-atapi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/ide-atapi.c</a></div><div class='hunk'>@@ -14,25 +14,268 @@</div><div class='ctx'> #define debug_log(fmt, args...) do {} while (0)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-/* TODO: unify the code thus making some arguments go away */</div><div class='del'>-ide_startstop_t ide_pc_intr(ide_drive_t *drive, struct ide_atapi_pc *pc,</div><div class='del'>-	ide_handler_t *handler, unsigned int timeout, ide_expiry_t *expiry,</div><div class='del'>-	void (*update_buffers)(ide_drive_t *, struct ide_atapi_pc *),</div><div class='del'>-	void (*retry_pc)(ide_drive_t *), void (*dsc_handle)(ide_drive_t *),</div><div class='del'>-	void (*io_buffers)(ide_drive_t *, struct ide_atapi_pc *, unsigned, int))</div><div class='add'>+/*</div><div class='add'>+ * Check whether we can support a device,</div><div class='add'>+ * based on the ATAPI IDENTIFY command results.</div><div class='add'>+ */</div><div class='add'>+int ide_check_atapi_device(ide_drive_t *drive, const char *s)</div><div class='add'>+{</div><div class='add'>+	u16 *id = drive-&gt;id;</div><div class='add'>+	u8 gcw[2], protocol, device_type, removable, drq_type, packet_size;</div><div class='add'>+</div><div class='add'>+	*((u16 *)&amp;gcw) = id[ATA_ID_CONFIG];</div><div class='add'>+</div><div class='add'>+	protocol    = (gcw[1] &amp; 0xC0) &gt;&gt; 6;</div><div class='add'>+	device_type =  gcw[1] &amp; 0x1F;</div><div class='add'>+	removable   = (gcw[0] &amp; 0x80) &gt;&gt; 7;</div><div class='add'>+	drq_type    = (gcw[0] &amp; 0x60) &gt;&gt; 5;</div><div class='add'>+	packet_size =  gcw[0] &amp; 0x03;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PPC</div><div class='add'>+	/* kludge for Apple PowerBook internal zip */</div><div class='add'>+	if (drive-&gt;media == ide_floppy &amp;&amp; device_type == 5 &amp;&amp;</div><div class='add'>+	    !strstr((char *)&amp;id[ATA_ID_PROD], "CD-ROM") &amp;&amp;</div><div class='add'>+	    strstr((char *)&amp;id[ATA_ID_PROD], "ZIP"))</div><div class='add'>+		device_type = 0;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	if (protocol != 2)</div><div class='add'>+		printk(KERN_ERR "%s: %s: protocol (0x%02x) is not ATAPI\n",</div><div class='add'>+			s, drive-&gt;name, protocol);</div><div class='add'>+	else if ((drive-&gt;media == ide_floppy &amp;&amp; device_type != 0) ||</div><div class='add'>+		 (drive-&gt;media == ide_tape &amp;&amp; device_type != 1))</div><div class='add'>+		printk(KERN_ERR "%s: %s: invalid device type (0x%02x)\n",</div><div class='add'>+			s, drive-&gt;name, device_type);</div><div class='add'>+	else if (removable == 0)</div><div class='add'>+		printk(KERN_ERR "%s: %s: the removable flag is not set\n",</div><div class='add'>+			s, drive-&gt;name);</div><div class='add'>+	else if (drive-&gt;media == ide_floppy &amp;&amp; drq_type == 3)</div><div class='add'>+		printk(KERN_ERR "%s: %s: sorry, DRQ type (0x%02x) not "</div><div class='add'>+			"supported\n", s, drive-&gt;name, drq_type);</div><div class='add'>+	else if (packet_size != 0)</div><div class='add'>+		printk(KERN_ERR "%s: %s: packet size (0x%02x) is not 12 "</div><div class='add'>+			"bytes\n", s, drive-&gt;name, packet_size);</div><div class='add'>+	else</div><div class='add'>+		return 1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(ide_check_atapi_device);</div><div class='add'>+</div><div class='add'>+/* PIO data transfer routine using the scatter gather table. */</div><div class='add'>+int ide_io_buffers(ide_drive_t *drive, struct ide_atapi_pc *pc,</div><div class='add'>+		    unsigned int bcount, int write)</div><div class='add'>+{</div><div class='add'>+	ide_hwif_t *hwif = drive-&gt;hwif;</div><div class='add'>+	const struct ide_tp_ops *tp_ops = hwif-&gt;tp_ops;</div><div class='add'>+	xfer_func_t *xf = write ? tp_ops-&gt;output_data : tp_ops-&gt;input_data;</div><div class='add'>+	struct scatterlist *sg = pc-&gt;sg;</div><div class='add'>+	char *buf;</div><div class='add'>+	int count, done = 0;</div><div class='add'>+</div><div class='add'>+	while (bcount) {</div><div class='add'>+		count = min(sg-&gt;length - pc-&gt;b_count, bcount);</div><div class='add'>+</div><div class='add'>+		if (PageHighMem(sg_page(sg))) {</div><div class='add'>+			unsigned long flags;</div><div class='add'>+</div><div class='add'>+			local_irq_save(flags);</div><div class='add'>+			buf = kmap_atomic(sg_page(sg), KM_IRQ0) + sg-&gt;offset;</div><div class='add'>+			xf(drive, NULL, buf + pc-&gt;b_count, count);</div><div class='add'>+			kunmap_atomic(buf - sg-&gt;offset, KM_IRQ0);</div><div class='add'>+			local_irq_restore(flags);</div><div class='add'>+		} else {</div><div class='add'>+			buf = sg_virt(sg);</div><div class='add'>+			xf(drive, NULL, buf + pc-&gt;b_count, count);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		bcount -= count;</div><div class='add'>+		pc-&gt;b_count += count;</div><div class='add'>+		done += count;</div><div class='add'>+</div><div class='add'>+		if (pc-&gt;b_count == sg-&gt;length) {</div><div class='add'>+			if (!--pc-&gt;sg_cnt)</div><div class='add'>+				break;</div><div class='add'>+			pc-&gt;sg = sg = sg_next(sg);</div><div class='add'>+			pc-&gt;b_count = 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (bcount) {</div><div class='add'>+		printk(KERN_ERR "%s: %d leftover bytes, %s\n", drive-&gt;name,</div><div class='add'>+			bcount, write ? "padding with zeros"</div><div class='add'>+				      : "discarding data");</div><div class='add'>+		ide_pad_transfer(drive, write, bcount);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return done;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(ide_io_buffers);</div><div class='add'>+</div><div class='add'>+void ide_init_pc(struct ide_atapi_pc *pc)</div><div class='add'>+{</div><div class='add'>+	memset(pc, 0, sizeof(*pc));</div><div class='add'>+	pc-&gt;buf = pc-&gt;pc_buf;</div><div class='add'>+	pc-&gt;buf_size = IDE_PC_BUFFER_SIZE;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(ide_init_pc);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Generate a new packet command request in front of the request queue, before</div><div class='add'>+ * the current request, so that it will be processed immediately, on the next</div><div class='add'>+ * pass through the driver.</div><div class='add'>+ */</div><div class='add'>+static void ide_queue_pc_head(ide_drive_t *drive, struct gendisk *disk,</div><div class='add'>+			      struct ide_atapi_pc *pc, struct request *rq)</div><div class='add'>+{</div><div class='add'>+	blk_rq_init(NULL, rq);</div><div class='add'>+	rq-&gt;cmd_type = REQ_TYPE_SPECIAL;</div><div class='add'>+	rq-&gt;cmd_flags |= REQ_PREEMPT;</div><div class='add'>+	rq-&gt;buffer = (char *)pc;</div><div class='add'>+	rq-&gt;rq_disk = disk;</div><div class='add'>+	memcpy(rq-&gt;cmd, pc-&gt;c, 12);</div><div class='add'>+	if (drive-&gt;media == ide_tape)</div><div class='add'>+		rq-&gt;cmd[13] = REQ_IDETAPE_PC1;</div><div class='add'>+	ide_do_drive_cmd(drive, rq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Add a special packet command request to the tail of the request queue,</div><div class='add'>+ * and wait for it to be serviced.</div><div class='add'>+ */</div><div class='add'>+int ide_queue_pc_tail(ide_drive_t *drive, struct gendisk *disk,</div><div class='add'>+		      struct ide_atapi_pc *pc)</div><div class='add'>+{</div><div class='add'>+	struct request *rq;</div><div class='add'>+	int error;</div><div class='add'>+</div><div class='add'>+	rq = blk_get_request(drive-&gt;queue, READ, __GFP_WAIT);</div><div class='add'>+	rq-&gt;cmd_type = REQ_TYPE_SPECIAL;</div><div class='add'>+	rq-&gt;buffer = (char *)pc;</div><div class='add'>+	memcpy(rq-&gt;cmd, pc-&gt;c, 12);</div><div class='add'>+	if (drive-&gt;media == ide_tape)</div><div class='add'>+		rq-&gt;cmd[13] = REQ_IDETAPE_PC1;</div><div class='add'>+	error = blk_execute_rq(drive-&gt;queue, disk, rq, 0);</div><div class='add'>+	blk_put_request(rq);</div><div class='add'>+</div><div class='add'>+	return error;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(ide_queue_pc_tail);</div><div class='add'>+</div><div class='add'>+int ide_do_test_unit_ready(ide_drive_t *drive, struct gendisk *disk)</div><div class='add'>+{</div><div class='add'>+	struct ide_atapi_pc pc;</div><div class='add'>+</div><div class='add'>+	ide_init_pc(&amp;pc);</div><div class='add'>+	pc.c[0] = TEST_UNIT_READY;</div><div class='add'>+</div><div class='add'>+	return ide_queue_pc_tail(drive, disk, &amp;pc);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(ide_do_test_unit_ready);</div><div class='add'>+</div><div class='add'>+int ide_do_start_stop(ide_drive_t *drive, struct gendisk *disk, int start)</div><div class='add'>+{</div><div class='add'>+	struct ide_atapi_pc pc;</div><div class='add'>+</div><div class='add'>+	ide_init_pc(&amp;pc);</div><div class='add'>+	pc.c[0] = START_STOP;</div><div class='add'>+	pc.c[4] = start;</div><div class='add'>+</div><div class='add'>+	if (drive-&gt;media == ide_tape)</div><div class='add'>+		pc.flags |= PC_FLAG_WAIT_FOR_DSC;</div><div class='add'>+</div><div class='add'>+	return ide_queue_pc_tail(drive, disk, &amp;pc);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(ide_do_start_stop);</div><div class='add'>+</div><div class='add'>+int ide_set_media_lock(ide_drive_t *drive, struct gendisk *disk, int on)</div><div class='ctx'> {</div><div class='add'>+	struct ide_atapi_pc pc;</div><div class='add'>+</div><div class='add'>+	if (drive-&gt;atapi_flags &amp; IDE_AFLAG_NO_DOORLOCK)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ide_init_pc(&amp;pc);</div><div class='add'>+	pc.c[0] = ALLOW_MEDIUM_REMOVAL;</div><div class='add'>+	pc.c[4] = on;</div><div class='add'>+</div><div class='add'>+	return ide_queue_pc_tail(drive, disk, &amp;pc);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(ide_set_media_lock);</div><div class='add'>+</div><div class='add'>+void ide_create_request_sense_cmd(ide_drive_t *drive, struct ide_atapi_pc *pc)</div><div class='add'>+{</div><div class='add'>+	ide_init_pc(pc);</div><div class='add'>+	pc-&gt;c[0] = REQUEST_SENSE;</div><div class='add'>+	if (drive-&gt;media == ide_floppy) {</div><div class='add'>+		pc-&gt;c[4] = 255;</div><div class='add'>+		pc-&gt;req_xfer = 18;</div><div class='add'>+	} else {</div><div class='add'>+		pc-&gt;c[4] = 20;</div><div class='add'>+		pc-&gt;req_xfer = 20;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(ide_create_request_sense_cmd);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Called when an error was detected during the last packet command.</div><div class='add'>+ * We queue a request sense packet command in the head of the request list.</div><div class='add'>+ */</div><div class='add'>+void ide_retry_pc(ide_drive_t *drive, struct gendisk *disk)</div><div class='add'>+{</div><div class='add'>+	struct request *rq = &amp;drive-&gt;request_sense_rq;</div><div class='add'>+	struct ide_atapi_pc *pc = &amp;drive-&gt;request_sense_pc;</div><div class='add'>+</div><div class='add'>+	(void)ide_read_error(drive);</div><div class='add'>+	ide_create_request_sense_cmd(drive, pc);</div><div class='add'>+	if (drive-&gt;media == ide_tape)</div><div class='add'>+		set_bit(IDE_AFLAG_IGNORE_DSC, &amp;drive-&gt;atapi_flags);</div><div class='add'>+	ide_queue_pc_head(drive, disk, pc, rq);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(ide_retry_pc);</div><div class='add'>+</div><div class='add'>+int ide_scsi_expiry(ide_drive_t *drive)</div><div class='add'>+{</div><div class='add'>+	struct ide_atapi_pc *pc = drive-&gt;pc;</div><div class='add'>+</div><div class='add'>+	debug_log("%s called for %lu at %lu\n", __func__,</div><div class='add'>+		  pc-&gt;scsi_cmd-&gt;serial_number, jiffies);</div><div class='add'>+</div><div class='add'>+	pc-&gt;flags |= PC_FLAG_TIMEDOUT;</div><div class='add'>+</div><div class='add'>+	return 0; /* we do not want the IDE subsystem to retry */</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(ide_scsi_expiry);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This is the usual interrupt handler which will be called during a packet</div><div class='add'>+ * command.  We will transfer some of the data (as requested by the drive)</div><div class='add'>+ * and will re-point interrupt handler to us.</div><div class='add'>+ */</div><div class='add'>+static ide_startstop_t ide_pc_intr(ide_drive_t *drive)</div><div class='add'>+{</div><div class='add'>+	struct ide_atapi_pc *pc = drive-&gt;pc;</div><div class='ctx'> 	ide_hwif_t *hwif = drive-&gt;hwif;</div><div class='ctx'> 	struct request *rq = hwif-&gt;hwgroup-&gt;rq;</div><div class='ctx'> 	const struct ide_tp_ops *tp_ops = hwif-&gt;tp_ops;</div><div class='ctx'> 	xfer_func_t *xferfunc;</div><div class='del'>-	unsigned int temp;</div><div class='add'>+	ide_expiry_t *expiry;</div><div class='add'>+	unsigned int timeout, temp;</div><div class='ctx'> 	u16 bcount;</div><div class='del'>-	u8 stat, ireason, scsi = drive-&gt;scsi;</div><div class='add'>+	u8 stat, ireason, scsi = !!(drive-&gt;dev_flags &amp; IDE_DFLAG_SCSI), dsc = 0;</div><div class='ctx'> </div><div class='ctx'> 	debug_log("Enter %s - interrupt handler\n", __func__);</div><div class='ctx'> </div><div class='add'>+	if (scsi) {</div><div class='add'>+		timeout = ide_scsi_get_timeout(pc);</div><div class='add'>+		expiry = ide_scsi_expiry;</div><div class='add'>+	} else {</div><div class='add'>+		timeout = (drive-&gt;media == ide_floppy) ? WAIT_FLOPPY_CMD</div><div class='add'>+						       : WAIT_TAPE_CMD;</div><div class='add'>+		expiry = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (pc-&gt;flags &amp; PC_FLAG_TIMEDOUT) {</div><div class='del'>-		drive-&gt;pc_callback(drive);</div><div class='add'>+		drive-&gt;pc_callback(drive, 0);</div><div class='ctx'> 		return ide_stopped;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -41,7 +284,7 @@ ide_startstop_t ide_pc_intr(ide_drive_t *drive, struct ide_atapi_pc *pc,</div><div class='ctx'> </div><div class='ctx'> 	if (pc-&gt;flags &amp; PC_FLAG_DMA_IN_PROGRESS) {</div><div class='ctx'> 		if (hwif-&gt;dma_ops-&gt;dma_end(drive) ||</div><div class='del'>-		    (drive-&gt;media == ide_tape &amp;&amp; !scsi &amp;&amp; (stat &amp; ERR_STAT))) {</div><div class='add'>+		    (drive-&gt;media == ide_tape &amp;&amp; !scsi &amp;&amp; (stat &amp; ATA_ERR))) {</div><div class='ctx'> 			if (drive-&gt;media == ide_floppy &amp;&amp; !scsi)</div><div class='ctx'> 				printk(KERN_ERR "%s: DMA %s error\n",</div><div class='ctx'> 					drive-&gt;name, rq_data_dir(pc-&gt;rq)</div><div class='hunk'>@@ -49,14 +292,14 @@ ide_startstop_t ide_pc_intr(ide_drive_t *drive, struct ide_atapi_pc *pc,</div><div class='ctx'> 			pc-&gt;flags |= PC_FLAG_DMA_ERROR;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			pc-&gt;xferred = pc-&gt;req_xfer;</div><div class='del'>-			if (update_buffers)</div><div class='del'>-				update_buffers(drive, pc);</div><div class='add'>+			if (drive-&gt;pc_update_buffers)</div><div class='add'>+				drive-&gt;pc_update_buffers(drive, pc);</div><div class='ctx'> 		}</div><div class='ctx'> 		debug_log("%s: DMA finished\n", drive-&gt;name);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* No more interrupts */</div><div class='del'>-	if ((stat &amp; DRQ_STAT) == 0) {</div><div class='add'>+	if ((stat &amp; ATA_DRQ) == 0) {</div><div class='ctx'> 		debug_log("Packet command completed, %d bytes transferred\n",</div><div class='ctx'> 			  pc-&gt;xferred);</div><div class='ctx'> </div><div class='hunk'>@@ -65,10 +308,10 @@ ide_startstop_t ide_pc_intr(ide_drive_t *drive, struct ide_atapi_pc *pc,</div><div class='ctx'> 		local_irq_enable_in_hardirq();</div><div class='ctx'> </div><div class='ctx'> 		if (drive-&gt;media == ide_tape &amp;&amp; !scsi &amp;&amp;</div><div class='del'>-		    (stat &amp; ERR_STAT) &amp;&amp; rq-&gt;cmd[0] == REQUEST_SENSE)</div><div class='del'>-			stat &amp;= ~ERR_STAT;</div><div class='add'>+		    (stat &amp; ATA_ERR) &amp;&amp; rq-&gt;cmd[0] == REQUEST_SENSE)</div><div class='add'>+			stat &amp;= ~ATA_ERR;</div><div class='ctx'> </div><div class='del'>-		if ((stat &amp; ERR_STAT) || (pc-&gt;flags &amp; PC_FLAG_DMA_ERROR)) {</div><div class='add'>+		if ((stat &amp; ATA_ERR) || (pc-&gt;flags &amp; PC_FLAG_DMA_ERROR)) {</div><div class='ctx'> 			/* Error detected */</div><div class='ctx'> 			debug_log("%s: I/O error\n", drive-&gt;name);</div><div class='ctx'> </div><div class='hunk'>@@ -87,21 +330,19 @@ ide_startstop_t ide_pc_intr(ide_drive_t *drive, struct ide_atapi_pc *pc,</div><div class='ctx'> 			debug_log("[cmd %x]: check condition\n", rq-&gt;cmd[0]);</div><div class='ctx'> </div><div class='ctx'> 			/* Retry operation */</div><div class='del'>-			retry_pc(drive);</div><div class='add'>+			ide_retry_pc(drive, rq-&gt;rq_disk);</div><div class='ctx'> </div><div class='ctx'> 			/* queued, but not started */</div><div class='ctx'> 			return ide_stopped;</div><div class='ctx'> 		}</div><div class='ctx'> cmd_finished:</div><div class='ctx'> 		pc-&gt;error = 0;</div><div class='del'>-		if ((pc-&gt;flags &amp; PC_FLAG_WAIT_FOR_DSC) &amp;&amp;</div><div class='del'>-		    (stat &amp; SEEK_STAT) == 0) {</div><div class='del'>-			dsc_handle(drive);</div><div class='del'>-			return ide_stopped;</div><div class='del'>-		}</div><div class='add'>+</div><div class='add'>+		if ((pc-&gt;flags &amp; PC_FLAG_WAIT_FOR_DSC) &amp;&amp; (stat &amp; ATA_DSC) == 0)</div><div class='add'>+			dsc = 1;</div><div class='ctx'> </div><div class='ctx'> 		/* Command finished - Call the callback function */</div><div class='del'>-		drive-&gt;pc_callback(drive);</div><div class='add'>+		drive-&gt;pc_callback(drive, dsc);</div><div class='ctx'> </div><div class='ctx'> 		return ide_stopped;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -117,17 +358,18 @@ cmd_finished:</div><div class='ctx'> 	/* Get the number of bytes to transfer on this interrupt. */</div><div class='ctx'> 	ide_read_bcount_and_ireason(drive, &amp;bcount, &amp;ireason);</div><div class='ctx'> </div><div class='del'>-	if (ireason &amp; CD) {</div><div class='add'>+	if (ireason &amp; ATAPI_COD) {</div><div class='ctx'> 		printk(KERN_ERR "%s: CoD != 0 in %s\n", drive-&gt;name, __func__);</div><div class='ctx'> 		return ide_do_reset(drive);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (((ireason &amp; IO) == IO) == !!(pc-&gt;flags &amp; PC_FLAG_WRITING)) {</div><div class='add'>+	if (((ireason &amp; ATAPI_IO) == ATAPI_IO) ==</div><div class='add'>+		!!(pc-&gt;flags &amp; PC_FLAG_WRITING)) {</div><div class='ctx'> 		/* Hopefully, we will never get here */</div><div class='ctx'> 		printk(KERN_ERR "%s: We wanted to %s, but the device wants us "</div><div class='ctx'> 				"to %s!\n", drive-&gt;name,</div><div class='del'>-				(ireason &amp; IO) ? "Write" : "Read",</div><div class='del'>-				(ireason &amp; IO) ? "Read" : "Write");</div><div class='add'>+				(ireason &amp; ATAPI_IO) ? "Write" : "Read",</div><div class='add'>+				(ireason &amp; ATAPI_IO) ? "Read" : "Write");</div><div class='ctx'> 		return ide_do_reset(drive);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -146,7 +388,8 @@ cmd_finished:</div><div class='ctx'> 					temp = 0;</div><div class='ctx'> 				if (temp) {</div><div class='ctx'> 					if (pc-&gt;sg)</div><div class='del'>-						io_buffers(drive, pc, temp, 0);</div><div class='add'>+						drive-&gt;pc_io_buffers(drive, pc,</div><div class='add'>+								     temp, 0);</div><div class='ctx'> 					else</div><div class='ctx'> 						tp_ops-&gt;input_data(drive, NULL,</div><div class='ctx'> 							pc-&gt;cur_pos, temp);</div><div class='hunk'>@@ -158,9 +401,7 @@ cmd_finished:</div><div class='ctx'> 				pc-&gt;xferred += temp;</div><div class='ctx'> 				pc-&gt;cur_pos += temp;</div><div class='ctx'> 				ide_pad_transfer(drive, 0, bcount - temp);</div><div class='del'>-				ide_set_handler(drive, handler, timeout,</div><div class='del'>-						expiry);</div><div class='del'>-				return ide_started;</div><div class='add'>+				goto next_irq;</div><div class='ctx'> 			}</div><div class='ctx'> 			debug_log("The device wants to send us more data than "</div><div class='ctx'> 				  "expected - allowing transfer\n");</div><div class='hunk'>@@ -171,9 +412,14 @@ cmd_finished:</div><div class='ctx'> </div><div class='ctx'> 	if ((drive-&gt;media == ide_floppy &amp;&amp; !scsi &amp;&amp; !pc-&gt;buf) ||</div><div class='ctx'> 	    (drive-&gt;media == ide_tape &amp;&amp; !scsi &amp;&amp; pc-&gt;bh) ||</div><div class='del'>-	    (scsi &amp;&amp; pc-&gt;sg))</div><div class='del'>-		io_buffers(drive, pc, bcount, !!(pc-&gt;flags &amp; PC_FLAG_WRITING));</div><div class='del'>-	else</div><div class='add'>+	    (scsi &amp;&amp; pc-&gt;sg)) {</div><div class='add'>+		int done = drive-&gt;pc_io_buffers(drive, pc, bcount,</div><div class='add'>+				  !!(pc-&gt;flags &amp; PC_FLAG_WRITING));</div><div class='add'>+</div><div class='add'>+		/* FIXME: don't do partial completions */</div><div class='add'>+		if (drive-&gt;media == ide_floppy &amp;&amp; !scsi)</div><div class='add'>+			ide_end_request(drive, 1, done &gt;&gt; 9);</div><div class='add'>+	} else</div><div class='ctx'> 		xferfunc(drive, NULL, pc-&gt;cur_pos, bcount);</div><div class='ctx'> </div><div class='ctx'> 	/* Update the current position */</div><div class='hunk'>@@ -182,12 +428,11 @@ cmd_finished:</div><div class='ctx'> </div><div class='ctx'> 	debug_log("[cmd %x] transferred %d bytes on that intr.\n",</div><div class='ctx'> 		  rq-&gt;cmd[0], bcount);</div><div class='del'>-</div><div class='add'>+next_irq:</div><div class='ctx'> 	/* And set the interrupt handler again */</div><div class='del'>-	ide_set_handler(drive, handler, timeout, expiry);</div><div class='add'>+	ide_set_handler(drive, ide_pc_intr, timeout, expiry);</div><div class='ctx'> 	return ide_started;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(ide_pc_intr);</div><div class='ctx'> </div><div class='ctx'> static u8 ide_read_ireason(ide_drive_t *drive)</div><div class='ctx'> {</div><div class='hunk'>@@ -205,7 +450,8 @@ static u8 ide_wait_ireason(ide_drive_t *drive, u8 ireason)</div><div class='ctx'> {</div><div class='ctx'> 	int retries = 100;</div><div class='ctx'> </div><div class='del'>-	while (retries-- &amp;&amp; ((ireason &amp; CD) == 0 || (ireason &amp; IO))) {</div><div class='add'>+	while (retries-- &amp;&amp; ((ireason &amp; ATAPI_COD) == 0 ||</div><div class='add'>+		(ireason &amp; ATAPI_IO))) {</div><div class='ctx'> 		printk(KERN_ERR "%s: (IO,CoD != (0,1) while issuing "</div><div class='ctx'> 				"a packet command, retrying\n", drive-&gt;name);</div><div class='ctx'> 		udelay(100);</div><div class='hunk'>@@ -214,41 +460,71 @@ static u8 ide_wait_ireason(ide_drive_t *drive, u8 ireason)</div><div class='ctx'> 			printk(KERN_ERR "%s: (IO,CoD != (0,1) while issuing "</div><div class='ctx'> 					"a packet command, ignoring\n",</div><div class='ctx'> 					drive-&gt;name);</div><div class='del'>-			ireason |= CD;</div><div class='del'>-			ireason &amp;= ~IO;</div><div class='add'>+			ireason |= ATAPI_COD;</div><div class='add'>+			ireason &amp;= ~ATAPI_IO;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return ireason;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-ide_startstop_t ide_transfer_pc(ide_drive_t *drive, struct ide_atapi_pc *pc,</div><div class='del'>-				ide_handler_t *handler, unsigned int timeout,</div><div class='del'>-				ide_expiry_t *expiry)</div><div class='add'>+static int ide_delayed_transfer_pc(ide_drive_t *drive)</div><div class='ctx'> {</div><div class='add'>+	/* Send the actual packet */</div><div class='add'>+	drive-&gt;hwif-&gt;tp_ops-&gt;output_data(drive, NULL, drive-&gt;pc-&gt;c, 12);</div><div class='add'>+</div><div class='add'>+	/* Timeout for the packet command */</div><div class='add'>+	return WAIT_FLOPPY_CMD;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ide_startstop_t ide_transfer_pc(ide_drive_t *drive)</div><div class='add'>+{</div><div class='add'>+	struct ide_atapi_pc *pc = drive-&gt;pc;</div><div class='ctx'> 	ide_hwif_t *hwif = drive-&gt;hwif;</div><div class='ctx'> 	struct request *rq = hwif-&gt;hwgroup-&gt;rq;</div><div class='add'>+	ide_expiry_t *expiry;</div><div class='add'>+	unsigned int timeout;</div><div class='ctx'> 	ide_startstop_t startstop;</div><div class='ctx'> 	u8 ireason;</div><div class='ctx'> </div><div class='del'>-	if (ide_wait_stat(&amp;startstop, drive, DRQ_STAT, BUSY_STAT, WAIT_READY)) {</div><div class='add'>+	if (ide_wait_stat(&amp;startstop, drive, ATA_DRQ, ATA_BUSY, WAIT_READY)) {</div><div class='ctx'> 		printk(KERN_ERR "%s: Strange, packet command initiated yet "</div><div class='ctx'> 				"DRQ isn't asserted\n", drive-&gt;name);</div><div class='ctx'> 		return startstop;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ireason = ide_read_ireason(drive);</div><div class='del'>-	if (drive-&gt;media == ide_tape &amp;&amp; !drive-&gt;scsi)</div><div class='add'>+	if (drive-&gt;media == ide_tape &amp;&amp;</div><div class='add'>+	    (drive-&gt;dev_flags &amp; IDE_DFLAG_SCSI) == 0)</div><div class='ctx'> 		ireason = ide_wait_ireason(drive, ireason);</div><div class='ctx'> </div><div class='del'>-	if ((ireason &amp; CD) == 0 || (ireason &amp; IO)) {</div><div class='add'>+	if ((ireason &amp; ATAPI_COD) == 0 || (ireason &amp; ATAPI_IO)) {</div><div class='ctx'> 		printk(KERN_ERR "%s: (IO,CoD) != (0,1) while issuing "</div><div class='ctx'> 				"a packet command\n", drive-&gt;name);</div><div class='ctx'> 		return ide_do_reset(drive);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * If necessary schedule the packet transfer to occur 'timeout'</div><div class='add'>+	 * miliseconds later in ide_delayed_transfer_pc() after the device</div><div class='add'>+	 * says it's ready for a packet.</div><div class='add'>+	 */</div><div class='add'>+	if (drive-&gt;atapi_flags &amp; IDE_AFLAG_ZIP_DRIVE) {</div><div class='add'>+		timeout = drive-&gt;pc_delay;</div><div class='add'>+		expiry = &amp;ide_delayed_transfer_pc;</div><div class='add'>+	} else {</div><div class='add'>+		if (drive-&gt;dev_flags &amp; IDE_DFLAG_SCSI) {</div><div class='add'>+			timeout = ide_scsi_get_timeout(pc);</div><div class='add'>+			expiry = ide_scsi_expiry;</div><div class='add'>+		} else {</div><div class='add'>+			timeout = (drive-&gt;media == ide_floppy) ? WAIT_FLOPPY_CMD</div><div class='add'>+							       : WAIT_TAPE_CMD;</div><div class='add'>+			expiry = NULL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Set the interrupt routine */</div><div class='del'>-	ide_set_handler(drive, handler, timeout, expiry);</div><div class='add'>+	ide_set_handler(drive, ide_pc_intr, timeout, expiry);</div><div class='ctx'> </div><div class='ctx'> 	/* Begin DMA, if necessary */</div><div class='ctx'> 	if (pc-&gt;flags &amp; PC_FLAG_DMA_OK) {</div><div class='hunk'>@@ -262,22 +538,22 @@ ide_startstop_t ide_transfer_pc(ide_drive_t *drive, struct ide_atapi_pc *pc,</div><div class='ctx'> </div><div class='ctx'> 	return ide_started;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(ide_transfer_pc);</div><div class='ctx'> </div><div class='del'>-ide_startstop_t ide_issue_pc(ide_drive_t *drive, struct ide_atapi_pc *pc,</div><div class='del'>-			     ide_handler_t *handler, unsigned int timeout,</div><div class='add'>+ide_startstop_t ide_issue_pc(ide_drive_t *drive, unsigned int timeout,</div><div class='ctx'> 			     ide_expiry_t *expiry)</div><div class='ctx'> {</div><div class='add'>+	struct ide_atapi_pc *pc = drive-&gt;pc;</div><div class='ctx'> 	ide_hwif_t *hwif = drive-&gt;hwif;</div><div class='add'>+	u32 tf_flags;</div><div class='ctx'> 	u16 bcount;</div><div class='del'>-	u8 dma = 0;</div><div class='add'>+	u8 scsi = !!(drive-&gt;dev_flags &amp; IDE_DFLAG_SCSI);</div><div class='ctx'> </div><div class='ctx'> 	/* We haven't transferred any data yet */</div><div class='ctx'> 	pc-&gt;xferred = 0;</div><div class='ctx'> 	pc-&gt;cur_pos = pc-&gt;buf;</div><div class='ctx'> </div><div class='ctx'> 	/* Request to transfer the entire buffer at once */</div><div class='del'>-	if (drive-&gt;media == ide_tape &amp;&amp; !drive-&gt;scsi)</div><div class='add'>+	if (drive-&gt;media == ide_tape &amp;&amp; scsi == 0)</div><div class='ctx'> 		bcount = pc-&gt;req_xfer;</div><div class='ctx'> 	else</div><div class='ctx'> 		bcount = min(pc-&gt;req_xfer, 63 * 1024);</div><div class='hunk'>@@ -287,28 +563,35 @@ ide_startstop_t ide_issue_pc(ide_drive_t *drive, struct ide_atapi_pc *pc,</div><div class='ctx'> 		ide_dma_off(drive);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((pc-&gt;flags &amp; PC_FLAG_DMA_OK) &amp;&amp; drive-&gt;using_dma) {</div><div class='del'>-		if (drive-&gt;scsi)</div><div class='add'>+	if ((pc-&gt;flags &amp; PC_FLAG_DMA_OK) &amp;&amp;</div><div class='add'>+	    (drive-&gt;dev_flags &amp; IDE_DFLAG_USING_DMA)) {</div><div class='add'>+		if (scsi)</div><div class='ctx'> 			hwif-&gt;sg_mapped = 1;</div><div class='del'>-		dma = !hwif-&gt;dma_ops-&gt;dma_setup(drive);</div><div class='del'>-		if (drive-&gt;scsi)</div><div class='add'>+		drive-&gt;dma = !hwif-&gt;dma_ops-&gt;dma_setup(drive);</div><div class='add'>+		if (scsi)</div><div class='ctx'> 			hwif-&gt;sg_mapped = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!dma)</div><div class='add'>+	if (!drive-&gt;dma)</div><div class='ctx'> 		pc-&gt;flags &amp;= ~PC_FLAG_DMA_OK;</div><div class='ctx'> </div><div class='del'>-	ide_pktcmd_tf_load(drive, drive-&gt;scsi ? 0 : IDE_TFLAG_OUT_DEVICE,</div><div class='del'>-			   bcount, dma);</div><div class='add'>+	if (scsi)</div><div class='add'>+		tf_flags = 0;</div><div class='add'>+	else if (drive-&gt;media == ide_cdrom || drive-&gt;media == ide_optical)</div><div class='add'>+		tf_flags = IDE_TFLAG_OUT_NSECT | IDE_TFLAG_OUT_LBAL;</div><div class='add'>+	else</div><div class='add'>+		tf_flags = IDE_TFLAG_OUT_DEVICE;</div><div class='add'>+</div><div class='add'>+	ide_pktcmd_tf_load(drive, tf_flags, bcount, drive-&gt;dma);</div><div class='ctx'> </div><div class='ctx'> 	/* Issue the packet command */</div><div class='ctx'> 	if (drive-&gt;atapi_flags &amp; IDE_AFLAG_DRQ_INTERRUPT) {</div><div class='del'>-		ide_execute_command(drive, WIN_PACKETCMD, handler,</div><div class='add'>+		ide_execute_command(drive, ATA_CMD_PACKET, ide_transfer_pc,</div><div class='ctx'> 				    timeout, NULL);</div><div class='ctx'> 		return ide_started;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ide_execute_pkt_cmd(drive);</div><div class='del'>-		return (*handler)(drive);</div><div class='add'>+		return ide_transfer_pc(drive);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(ide_issue_pc);</div><div class='head'>diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c<br/>index f16bb4667238..3308b1cd3a33 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/ide-cd.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ide/ide-cd.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/ide-cd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/ide-cd.c</a></div><div class='hunk'>@@ -23,6 +23,9 @@</div><div class='ctx'>  *	Documentation/ide/ChangeLog.ide-cd.1994-2004</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#define DRV_NAME "ide-cd"</div><div class='add'>+#define PFX DRV_NAME ": "</div><div class='add'>+</div><div class='ctx'> #define IDECD_VERSION "5.00"</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -50,12 +53,15 @@</div><div class='ctx'> </div><div class='ctx'> #include "ide-cd.h"</div><div class='ctx'> </div><div class='del'>-static DEFINE_MUTEX(idecd_ref_mutex);</div><div class='add'>+#define IDECD_DEBUG_LOG		1</div><div class='ctx'> </div><div class='del'>-#define to_ide_cd(obj) container_of(obj, struct cdrom_info, kref)</div><div class='add'>+#if IDECD_DEBUG_LOG</div><div class='add'>+#define ide_debug_log(lvl, fmt, args...) __ide_debug_log(lvl, fmt, args)</div><div class='add'>+#else</div><div class='add'>+#define ide_debug_log(lvl, fmt, args...) do {} while (0)</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='del'>-#define ide_cd_g(disk) \</div><div class='del'>-	container_of((disk)-&gt;private_data, struct cdrom_info, driver)</div><div class='add'>+static DEFINE_MUTEX(idecd_ref_mutex);</div><div class='ctx'> </div><div class='ctx'> static void ide_cd_release(struct kref *);</div><div class='ctx'> </div><div class='hunk'>@@ -64,7 +70,7 @@ static struct cdrom_info *ide_cd_get(struct gendisk *disk)</div><div class='ctx'> 	struct cdrom_info *cd = NULL;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;idecd_ref_mutex);</div><div class='del'>-	cd = ide_cd_g(disk);</div><div class='add'>+	cd = ide_drv_g(disk, cdrom_info);</div><div class='ctx'> 	if (cd) {</div><div class='ctx'> 		if (ide_device_get(cd-&gt;drive))</div><div class='ctx'> 			cd = NULL;</div><div class='hunk'>@@ -102,6 +108,9 @@ static int cdrom_log_sense(ide_drive_t *drive, struct request *rq,</div><div class='ctx'> {</div><div class='ctx'> 	int log = 0;</div><div class='ctx'> </div><div class='add'>+	ide_debug_log(IDE_DBG_SENSE, "Call %s, sense_key: 0x%x\n", __func__,</div><div class='add'>+		      sense-&gt;sense_key);</div><div class='add'>+</div><div class='ctx'> 	if (!sense || !rq || (rq-&gt;cmd_flags &amp; REQ_QUIET))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -150,6 +159,14 @@ static void cdrom_analyze_sense_data(ide_drive_t *drive,</div><div class='ctx'> 	unsigned long bio_sectors;</div><div class='ctx'> 	struct cdrom_info *info = drive-&gt;driver_data;</div><div class='ctx'> </div><div class='add'>+	ide_debug_log(IDE_DBG_SENSE, "Call %s, error_code: 0x%x, "</div><div class='add'>+			"sense_key: 0x%x\n", __func__, sense-&gt;error_code,</div><div class='add'>+			sense-&gt;sense_key);</div><div class='add'>+</div><div class='add'>+	if (failed_command)</div><div class='add'>+		ide_debug_log(IDE_DBG_SENSE, "%s: failed cmd: 0x%x\n",</div><div class='add'>+				__func__, failed_command-&gt;cmd[0]);</div><div class='add'>+</div><div class='ctx'> 	if (!cdrom_log_sense(drive, failed_command, sense))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -200,6 +217,8 @@ static void cdrom_queue_request_sense(ide_drive_t *drive, void *sense,</div><div class='ctx'> 	struct cdrom_info *info		= drive-&gt;driver_data;</div><div class='ctx'> 	struct request *rq		= &amp;info-&gt;request_sense_request;</div><div class='ctx'> </div><div class='add'>+	ide_debug_log(IDE_DBG_SENSE, "Call %s\n", __func__);</div><div class='add'>+</div><div class='ctx'> 	if (sense == NULL)</div><div class='ctx'> 		sense = &amp;info-&gt;sense_data;</div><div class='ctx'> </div><div class='hunk'>@@ -219,6 +238,10 @@ static void cdrom_queue_request_sense(ide_drive_t *drive, void *sense,</div><div class='ctx'> 	/* NOTE! Save the failed command in "rq-&gt;buffer" */</div><div class='ctx'> 	rq-&gt;buffer = (void *) failed_command;</div><div class='ctx'> </div><div class='add'>+	if (failed_command)</div><div class='add'>+		ide_debug_log(IDE_DBG_SENSE, "failed_cmd: 0x%x\n",</div><div class='add'>+			      failed_command-&gt;cmd[0]);</div><div class='add'>+</div><div class='ctx'> 	ide_do_drive_cmd(drive, rq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -227,6 +250,10 @@ static void cdrom_end_request(ide_drive_t *drive, int uptodate)</div><div class='ctx'> 	struct request *rq = HWGROUP(drive)-&gt;rq;</div><div class='ctx'> 	int nsectors = rq-&gt;hard_cur_sectors;</div><div class='ctx'> </div><div class='add'>+	ide_debug_log(IDE_DBG_FUNC, "Call %s, cmd: 0x%x, uptodate: 0x%x, "</div><div class='add'>+		      "nsectors: %d\n", __func__, rq-&gt;cmd[0], uptodate,</div><div class='add'>+		      nsectors);</div><div class='add'>+</div><div class='ctx'> 	if (blk_sense_request(rq) &amp;&amp; uptodate) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * For REQ_TYPE_SENSE, "rq-&gt;buffer" points to the original</div><div class='hunk'>@@ -269,6 +296,9 @@ static void cdrom_end_request(ide_drive_t *drive, int uptodate)</div><div class='ctx'> 	if (!nsectors)</div><div class='ctx'> 		nsectors = 1;</div><div class='ctx'> </div><div class='add'>+	ide_debug_log(IDE_DBG_FUNC, "Exit %s, uptodate: 0x%x, nsectors: %d\n",</div><div class='add'>+		      __func__, uptodate, nsectors);</div><div class='add'>+</div><div class='ctx'> 	ide_end_request(drive, uptodate, nsectors);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -304,11 +334,15 @@ static int cdrom_decode_status(ide_drive_t *drive, int good_stat, int *stat_ret)</div><div class='ctx'> 	sense_key = err &gt;&gt; 4;</div><div class='ctx'> </div><div class='ctx'> 	if (rq == NULL) {</div><div class='del'>-		printk(KERN_ERR "%s: missing rq in %s\n",</div><div class='add'>+		printk(KERN_ERR PFX "%s: missing rq in %s\n",</div><div class='ctx'> 				drive-&gt;name, __func__);</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ide_debug_log(IDE_DBG_RQ, "%s: stat: 0x%x, good_stat: 0x%x, "</div><div class='add'>+		      "rq-&gt;cmd_type: 0x%x, err: 0x%x\n", __func__, stat,</div><div class='add'>+		      good_stat, rq-&gt;cmd_type, err);</div><div class='add'>+</div><div class='ctx'> 	if (blk_sense_request(rq)) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * We got an error trying to get sense info from the drive</div><div class='hunk'>@@ -374,7 +408,8 @@ static int cdrom_decode_status(ide_drive_t *drive, int good_stat, int *stat_ret)</div><div class='ctx'> 				cdrom_saw_media_change(drive);</div><div class='ctx'> </div><div class='ctx'> 				/* fail the request */</div><div class='del'>-				printk(KERN_ERR "%s: tray open\n", drive-&gt;name);</div><div class='add'>+				printk(KERN_ERR PFX "%s: tray open\n",</div><div class='add'>+						drive-&gt;name);</div><div class='ctx'> 				do_end_request = 1;</div><div class='ctx'> 			} else {</div><div class='ctx'> 				struct cdrom_info *info = drive-&gt;driver_data;</div><div class='hunk'>@@ -436,7 +471,7 @@ static int cdrom_decode_status(ide_drive_t *drive, int good_stat, int *stat_ret)</div><div class='ctx'> 			ide_dump_status_no_sense(drive, "media error (blank)",</div><div class='ctx'> 						 stat);</div><div class='ctx'> 			do_end_request = 1;</div><div class='del'>-		} else if ((err &amp; ~ABRT_ERR) != 0) {</div><div class='add'>+		} else if ((err &amp; ~ATA_ABORTED) != 0) {</div><div class='ctx'> 			/* go to the default handler for other errors */</div><div class='ctx'> 			ide_error(drive, "cdrom_decode_status", stat);</div><div class='ctx'> 			return 1;</div><div class='hunk'>@@ -457,10 +492,10 @@ static int cdrom_decode_status(ide_drive_t *drive, int good_stat, int *stat_ret)</div><div class='ctx'> 		 * If we got a CHECK_CONDITION status, queue</div><div class='ctx'> 		 * a request sense command.</div><div class='ctx'> 		 */</div><div class='del'>-		if (stat &amp; ERR_STAT)</div><div class='add'>+		if (stat &amp; ATA_ERR)</div><div class='ctx'> 			cdrom_queue_request_sense(drive, NULL, NULL);</div><div class='ctx'> 	} else {</div><div class='del'>-		blk_dump_rq_flags(rq, "ide-cd: bad rq");</div><div class='add'>+		blk_dump_rq_flags(rq, PFX "bad rq");</div><div class='ctx'> 		cdrom_end_request(drive, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -468,7 +503,7 @@ static int cdrom_decode_status(ide_drive_t *drive, int good_stat, int *stat_ret)</div><div class='ctx'> 	return 1;</div><div class='ctx'> </div><div class='ctx'> end_request:</div><div class='del'>-	if (stat &amp; ERR_STAT) {</div><div class='add'>+	if (stat &amp; ATA_ERR) {</div><div class='ctx'> 		unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 		spin_lock_irqsave(&amp;ide_lock, flags);</div><div class='hunk'>@@ -488,6 +523,9 @@ static int cdrom_timer_expiry(ide_drive_t *drive)</div><div class='ctx'> 	struct request *rq = HWGROUP(drive)-&gt;rq;</div><div class='ctx'> 	unsigned long wait = 0;</div><div class='ctx'> </div><div class='add'>+	ide_debug_log(IDE_DBG_RQ, "Call %s: rq-&gt;cmd[0]: 0x%x\n", __func__,</div><div class='add'>+		      rq-&gt;cmd[0]);</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Some commands are *slow* and normally take a long time to complete.</div><div class='ctx'> 	 * Usually we can use the ATAPI "disconnect" to bypass this, but not all</div><div class='hunk'>@@ -504,7 +542,7 @@ static int cdrom_timer_expiry(ide_drive_t *drive)</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		if (!(rq-&gt;cmd_flags &amp; REQ_QUIET))</div><div class='del'>-			printk(KERN_INFO "ide-cd: cmd 0x%x timed out\n",</div><div class='add'>+			printk(KERN_INFO PFX "cmd 0x%x timed out\n",</div><div class='ctx'> 					 rq-&gt;cmd[0]);</div><div class='ctx'> 		wait = 0;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -524,24 +562,25 @@ static ide_startstop_t cdrom_start_packet_command(ide_drive_t *drive,</div><div class='ctx'> 						  int xferlen,</div><div class='ctx'> 						  ide_handler_t *handler)</div><div class='ctx'> {</div><div class='del'>-	struct cdrom_info *info = drive-&gt;driver_data;</div><div class='ctx'> 	ide_hwif_t *hwif = drive-&gt;hwif;</div><div class='ctx'> </div><div class='add'>+	ide_debug_log(IDE_DBG_PC, "Call %s, xferlen: %d\n", __func__, xferlen);</div><div class='add'>+</div><div class='ctx'> 	/* FIXME: for Virtual DMA we must check harder */</div><div class='del'>-	if (info-&gt;dma)</div><div class='del'>-		info-&gt;dma = !hwif-&gt;dma_ops-&gt;dma_setup(drive);</div><div class='add'>+	if (drive-&gt;dma)</div><div class='add'>+		drive-&gt;dma = !hwif-&gt;dma_ops-&gt;dma_setup(drive);</div><div class='ctx'> </div><div class='ctx'> 	/* set up the controller registers */</div><div class='ctx'> 	ide_pktcmd_tf_load(drive, IDE_TFLAG_OUT_NSECT | IDE_TFLAG_OUT_LBAL,</div><div class='del'>-			   xferlen, info-&gt;dma);</div><div class='add'>+			   xferlen, drive-&gt;dma);</div><div class='ctx'> </div><div class='ctx'> 	if (drive-&gt;atapi_flags &amp; IDE_AFLAG_DRQ_INTERRUPT) {</div><div class='ctx'> 		/* waiting for CDB interrupt, not DMA yet. */</div><div class='del'>-		if (info-&gt;dma)</div><div class='add'>+		if (drive-&gt;dma)</div><div class='ctx'> 			drive-&gt;waiting_for_dma = 0;</div><div class='ctx'> </div><div class='ctx'> 		/* packet command */</div><div class='del'>-		ide_execute_command(drive, WIN_PACKETCMD, handler,</div><div class='add'>+		ide_execute_command(drive, ATA_CMD_PACKET, handler,</div><div class='ctx'> 				    ATAPI_WAIT_PC, cdrom_timer_expiry);</div><div class='ctx'> 		return ide_started;</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -564,9 +603,10 @@ static ide_startstop_t cdrom_transfer_packet_command(ide_drive_t *drive,</div><div class='ctx'> {</div><div class='ctx'> 	ide_hwif_t *hwif = drive-&gt;hwif;</div><div class='ctx'> 	int cmd_len;</div><div class='del'>-	struct cdrom_info *info = drive-&gt;driver_data;</div><div class='ctx'> 	ide_startstop_t startstop;</div><div class='ctx'> </div><div class='add'>+	ide_debug_log(IDE_DBG_PC, "Call %s\n", __func__);</div><div class='add'>+</div><div class='ctx'> 	if (drive-&gt;atapi_flags &amp; IDE_AFLAG_DRQ_INTERRUPT) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Here we should have been called after receiving an interrupt</div><div class='hunk'>@@ -574,16 +614,16 @@ static ide_startstop_t cdrom_transfer_packet_command(ide_drive_t *drive,</div><div class='ctx'> 		 */</div><div class='ctx'> </div><div class='ctx'> 		/* check for errors */</div><div class='del'>-		if (cdrom_decode_status(drive, DRQ_STAT, NULL))</div><div class='add'>+		if (cdrom_decode_status(drive, ATA_DRQ, NULL))</div><div class='ctx'> 			return ide_stopped;</div><div class='ctx'> </div><div class='ctx'> 		/* ok, next interrupt will be DMA interrupt */</div><div class='del'>-		if (info-&gt;dma)</div><div class='add'>+		if (drive-&gt;dma)</div><div class='ctx'> 			drive-&gt;waiting_for_dma = 1;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* otherwise, we must wait for DRQ to get set */</div><div class='del'>-		if (ide_wait_stat(&amp;startstop, drive, DRQ_STAT,</div><div class='del'>-				BUSY_STAT, WAIT_READY))</div><div class='add'>+		if (ide_wait_stat(&amp;startstop, drive, ATA_DRQ,</div><div class='add'>+				  ATA_BUSY, WAIT_READY))</div><div class='ctx'> 			return startstop;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -599,7 +639,7 @@ static ide_startstop_t cdrom_transfer_packet_command(ide_drive_t *drive,</div><div class='ctx'> 	hwif-&gt;tp_ops-&gt;output_data(drive, NULL, rq-&gt;cmd, cmd_len);</div><div class='ctx'> </div><div class='ctx'> 	/* start the DMA if need be */</div><div class='del'>-	if (info-&gt;dma)</div><div class='add'>+	if (drive-&gt;dma)</div><div class='ctx'> 		hwif-&gt;dma_ops-&gt;dma_start(drive);</div><div class='ctx'> </div><div class='ctx'> 	return ide_started;</div><div class='hunk'>@@ -615,6 +655,9 @@ static int ide_cd_check_ireason(ide_drive_t *drive, struct request *rq,</div><div class='ctx'> {</div><div class='ctx'> 	ide_hwif_t *hwif = drive-&gt;hwif;</div><div class='ctx'> </div><div class='add'>+	ide_debug_log(IDE_DBG_FUNC, "Call %s, ireason: 0x%x, rw: 0x%x\n",</div><div class='add'>+		      __func__, ireason, rw);</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * ireason == 0: the drive wants to receive data from us</div><div class='ctx'> 	 * ireason == 2: the drive is expecting to transfer data to us</div><div class='hunk'>@@ -624,7 +667,7 @@ static int ide_cd_check_ireason(ide_drive_t *drive, struct request *rq,</div><div class='ctx'> 	else if (ireason == (rw &lt;&lt; 1)) {</div><div class='ctx'> </div><div class='ctx'> 		/* whoops... */</div><div class='del'>-		printk(KERN_ERR "%s: %s: wrong transfer direction!\n",</div><div class='add'>+		printk(KERN_ERR PFX "%s: %s: wrong transfer direction!\n",</div><div class='ctx'> 				drive-&gt;name, __func__);</div><div class='ctx'> </div><div class='ctx'> 		ide_pad_transfer(drive, rw, len);</div><div class='hunk'>@@ -637,7 +680,7 @@ static int ide_cd_check_ireason(ide_drive_t *drive, struct request *rq,</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* drive wants a command packet, or invalid ireason... */</div><div class='del'>-		printk(KERN_ERR "%s: %s: bad interrupt reason 0x%02x\n",</div><div class='add'>+		printk(KERN_ERR PFX "%s: %s: bad interrupt reason 0x%02x\n",</div><div class='ctx'> 				drive-&gt;name, __func__, ireason);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -654,17 +697,19 @@ static int ide_cd_check_ireason(ide_drive_t *drive, struct request *rq,</div><div class='ctx'>  */</div><div class='ctx'> static int ide_cd_check_transfer_size(ide_drive_t *drive, int len)</div><div class='ctx'> {</div><div class='add'>+	ide_debug_log(IDE_DBG_FUNC, "Call %s, len: %d\n", __func__, len);</div><div class='add'>+</div><div class='ctx'> 	if ((len % SECTOR_SIZE) == 0)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	printk(KERN_ERR "%s: %s: Bad transfer size %d\n",</div><div class='del'>-			drive-&gt;name, __func__, len);</div><div class='add'>+	printk(KERN_ERR PFX "%s: %s: Bad transfer size %d\n", drive-&gt;name,</div><div class='add'>+			__func__, len);</div><div class='ctx'> </div><div class='ctx'> 	if (drive-&gt;atapi_flags &amp; IDE_AFLAG_LIMIT_NFRAMES)</div><div class='del'>-		printk(KERN_ERR "  This drive is not supported by "</div><div class='del'>-				"this version of the driver\n");</div><div class='add'>+		printk(KERN_ERR PFX "This drive is not supported by this "</div><div class='add'>+				"version of the driver\n");</div><div class='ctx'> 	else {</div><div class='del'>-		printk(KERN_ERR "  Trying to limit transfer sizes\n");</div><div class='add'>+		printk(KERN_ERR PFX "Trying to limit transfer sizes\n");</div><div class='ctx'> 		drive-&gt;atapi_flags |= IDE_AFLAG_LIMIT_NFRAMES;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -676,6 +721,9 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *);</div><div class='ctx'> static ide_startstop_t ide_cd_prepare_rw_request(ide_drive_t *drive,</div><div class='ctx'> 						 struct request *rq)</div><div class='ctx'> {</div><div class='add'>+	ide_debug_log(IDE_DBG_RQ, "Call %s: rq-&gt;cmd_flags: 0x%x\n", __func__,</div><div class='add'>+		      rq-&gt;cmd_flags);</div><div class='add'>+</div><div class='ctx'> 	if (rq_data_dir(rq) == READ) {</div><div class='ctx'> 		unsigned short sectors_per_frame =</div><div class='ctx'> 			queue_hardsect_size(drive-&gt;queue) &gt;&gt; SECTOR_BITS;</div><div class='hunk'>@@ -695,7 +743,7 @@ static ide_startstop_t ide_cd_prepare_rw_request(ide_drive_t *drive,</div><div class='ctx'> 			/* sanity check... */</div><div class='ctx'> 			if (rq-&gt;current_nr_sectors !=</div><div class='ctx'> 			    bio_cur_sectors(rq-&gt;bio)) {</div><div class='del'>-				printk(KERN_ERR "%s: %s: buffer botch (%u)\n",</div><div class='add'>+				printk(KERN_ERR PFX "%s: %s: buffer botch (%u)\n",</div><div class='ctx'> 						drive-&gt;name, __func__,</div><div class='ctx'> 						rq-&gt;current_nr_sectors);</div><div class='ctx'> 				cdrom_end_request(drive, 0);</div><div class='hunk'>@@ -704,11 +752,7 @@ static ide_startstop_t ide_cd_prepare_rw_request(ide_drive_t *drive,</div><div class='ctx'> 			rq-&gt;current_nr_sectors += nskip;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-#if 0</div><div class='del'>-	else</div><div class='del'>-		/* the immediate bit */</div><div class='del'>-		rq-&gt;cmd[1] = 1 &lt;&lt; 3;</div><div class='del'>-#endif</div><div class='add'>+</div><div class='ctx'> 	/* set up the command */</div><div class='ctx'> 	rq-&gt;timeout = ATAPI_WAIT_PC;</div><div class='ctx'> </div><div class='hunk'>@@ -739,6 +783,8 @@ static ide_startstop_t cdrom_seek_intr(ide_drive_t *drive)</div><div class='ctx'> 	int stat;</div><div class='ctx'> 	static int retry = 10;</div><div class='ctx'> </div><div class='add'>+	ide_debug_log(IDE_DBG_FUNC, "Call %s\n", __func__);</div><div class='add'>+</div><div class='ctx'> 	if (cdrom_decode_status(drive, 0, &amp;stat))</div><div class='ctx'> 		return ide_stopped;</div><div class='ctx'> </div><div class='hunk'>@@ -746,7 +792,7 @@ static ide_startstop_t cdrom_seek_intr(ide_drive_t *drive)</div><div class='ctx'> </div><div class='ctx'> 	if (retry &amp;&amp; time_after(jiffies, info-&gt;start_seek + IDECD_SEEK_TIMER)) {</div><div class='ctx'> 		if (--retry == 0)</div><div class='del'>-			drive-&gt;dsc_overlap = 0;</div><div class='add'>+			drive-&gt;dev_flags &amp;= ~IDE_DFLAG_DSC_OVERLAP;</div><div class='ctx'> 	}</div><div class='ctx'> 	return ide_stopped;</div><div class='ctx'> }</div><div class='hunk'>@@ -755,6 +801,8 @@ static void ide_cd_prepare_seek_request(ide_drive_t *drive, struct request *rq)</div><div class='ctx'> {</div><div class='ctx'> 	sector_t frame = rq-&gt;sector;</div><div class='ctx'> </div><div class='add'>+	ide_debug_log(IDE_DBG_FUNC, "Call %s\n", __func__);</div><div class='add'>+</div><div class='ctx'> 	sector_div(frame, queue_hardsect_size(drive-&gt;queue) &gt;&gt; SECTOR_BITS);</div><div class='ctx'> </div><div class='ctx'> 	memset(rq-&gt;cmd, 0, BLK_MAX_CDB);</div><div class='hunk'>@@ -775,8 +823,11 @@ static ide_startstop_t cdrom_start_seek_continuation(ide_drive_t *drive)</div><div class='ctx'>  * Fix up a possibly partially-processed request so that we can start it over</div><div class='ctx'>  * entirely, or even put it back on the request queue.</div><div class='ctx'>  */</div><div class='del'>-static void restore_request(struct request *rq)</div><div class='add'>+static void ide_cd_restore_request(ide_drive_t *drive, struct request *rq)</div><div class='ctx'> {</div><div class='add'>+</div><div class='add'>+	ide_debug_log(IDE_DBG_FUNC, "Call %s\n", __func__);</div><div class='add'>+</div><div class='ctx'> 	if (rq-&gt;buffer != bio_data(rq-&gt;bio)) {</div><div class='ctx'> 		sector_t n =</div><div class='ctx'> 			(rq-&gt;buffer - (char *)bio_data(rq-&gt;bio)) / SECTOR_SIZE;</div><div class='hunk'>@@ -795,8 +846,11 @@ static void restore_request(struct request *rq)</div><div class='ctx'> /*</div><div class='ctx'>  * All other packet commands.</div><div class='ctx'>  */</div><div class='del'>-static void ide_cd_request_sense_fixup(struct request *rq)</div><div class='add'>+static void ide_cd_request_sense_fixup(ide_drive_t *drive, struct request *rq)</div><div class='ctx'> {</div><div class='add'>+</div><div class='add'>+	ide_debug_log(IDE_DBG_FUNC, "Call %s\n", __func__);</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Some of the trailing request sense fields are optional,</div><div class='ctx'> 	 * and some drives don't send them.  Sigh.</div><div class='hunk'>@@ -822,6 +876,10 @@ int ide_cd_queue_pc(ide_drive_t *drive, const unsigned char *cmd,</div><div class='ctx'> 	if (!sense)</div><div class='ctx'> 		sense = &amp;local_sense;</div><div class='ctx'> </div><div class='add'>+	ide_debug_log(IDE_DBG_PC, "Call %s, rq-&gt;cmd[0]: 0x%x, write: 0x%x, "</div><div class='add'>+		      "timeout: %d, cmd_flags: 0x%x\n", __func__, cmd[0], write,</div><div class='add'>+		      timeout, cmd_flags);</div><div class='add'>+</div><div class='ctx'> 	/* start of retry loop */</div><div class='ctx'> 	do {</div><div class='ctx'> 		struct request *rq;</div><div class='hunk'>@@ -895,7 +953,6 @@ static int cdrom_newpc_intr_dummy_cb(struct request *rq)</div><div class='ctx'> static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive)</div><div class='ctx'> {</div><div class='ctx'> 	ide_hwif_t *hwif = drive-&gt;hwif;</div><div class='del'>-	struct cdrom_info *info = drive-&gt;driver_data;</div><div class='ctx'> 	struct request *rq = HWGROUP(drive)-&gt;rq;</div><div class='ctx'> 	xfer_func_t *xferfunc;</div><div class='ctx'> 	ide_expiry_t *expiry = NULL;</div><div class='hunk'>@@ -905,13 +962,16 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive)</div><div class='ctx'> 	u16 len;</div><div class='ctx'> 	u8 ireason;</div><div class='ctx'> </div><div class='add'>+	ide_debug_log(IDE_DBG_PC, "Call %s, rq-&gt;cmd[0]: 0x%x, write: 0x%x\n",</div><div class='add'>+		      __func__, rq-&gt;cmd[0], write);</div><div class='add'>+</div><div class='ctx'> 	/* check for errors */</div><div class='del'>-	dma = info-&gt;dma;</div><div class='add'>+	dma = drive-&gt;dma;</div><div class='ctx'> 	if (dma) {</div><div class='del'>-		info-&gt;dma = 0;</div><div class='add'>+		drive-&gt;dma = 0;</div><div class='ctx'> 		dma_error = hwif-&gt;dma_ops-&gt;dma_end(drive);</div><div class='ctx'> 		if (dma_error) {</div><div class='del'>-			printk(KERN_ERR "%s: DMA %s error\n", drive-&gt;name,</div><div class='add'>+			printk(KERN_ERR PFX "%s: DMA %s error\n", drive-&gt;name,</div><div class='ctx'> 					write ? "write" : "read");</div><div class='ctx'> 			ide_dma_off(drive);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -937,8 +997,11 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive)</div><div class='ctx'> 	if (thislen &gt; len)</div><div class='ctx'> 		thislen = len;</div><div class='ctx'> </div><div class='add'>+	ide_debug_log(IDE_DBG_PC, "%s: DRQ: stat: 0x%x, thislen: %d\n",</div><div class='add'>+		      __func__, stat, thislen);</div><div class='add'>+</div><div class='ctx'> 	/* If DRQ is clear, the command has completed. */</div><div class='del'>-	if ((stat &amp; DRQ_STAT) == 0) {</div><div class='add'>+	if ((stat &amp; ATA_DRQ) == 0) {</div><div class='ctx'> 		if (blk_fs_request(rq)) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * If we're not done reading/writing, complain.</div><div class='hunk'>@@ -946,7 +1009,7 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive)</div><div class='ctx'> 			 */</div><div class='ctx'> 			uptodate = 1;</div><div class='ctx'> 			if (rq-&gt;current_nr_sectors &gt; 0) {</div><div class='del'>-				printk(KERN_ERR "%s: %s: data underrun "</div><div class='add'>+				printk(KERN_ERR PFX "%s: %s: data underrun "</div><div class='ctx'> 						"(%d blocks)\n",</div><div class='ctx'> 						drive-&gt;name, __func__,</div><div class='ctx'> 						rq-&gt;current_nr_sectors);</div><div class='hunk'>@@ -957,7 +1020,7 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive)</div><div class='ctx'> 			cdrom_end_request(drive, uptodate);</div><div class='ctx'> 			return ide_stopped;</div><div class='ctx'> 		} else if (!blk_pc_request(rq)) {</div><div class='del'>-			ide_cd_request_sense_fixup(rq);</div><div class='add'>+			ide_cd_request_sense_fixup(drive, rq);</div><div class='ctx'> 			/* complain if we still have data left to transfer */</div><div class='ctx'> 			uptodate = rq-&gt;data_len ? 0 : 1;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1000,6 +1063,9 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive)</div><div class='ctx'> 		xferfunc = hwif-&gt;tp_ops-&gt;input_data;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ide_debug_log(IDE_DBG_PC, "%s: data transfer, rq-&gt;cmd_type: 0x%x, "</div><div class='add'>+		      "ireason: 0x%x\n", __func__, rq-&gt;cmd_type, ireason);</div><div class='add'>+</div><div class='ctx'> 	/* transfer data */</div><div class='ctx'> 	while (thislen &gt; 0) {</div><div class='ctx'> 		u8 *ptr = blk_fs_request(rq) ? NULL : rq-&gt;data;</div><div class='hunk'>@@ -1024,7 +1090,7 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive)</div><div class='ctx'> 				 */</div><div class='ctx'> 				ide_pad_transfer(drive, 0, thislen);</div><div class='ctx'> 			else {</div><div class='del'>-				printk(KERN_ERR "%s: confused, missing data\n",</div><div class='add'>+				printk(KERN_ERR PFX "%s: confused, missing data\n",</div><div class='ctx'> 						drive-&gt;name);</div><div class='ctx'> 				blk_dump_rq_flags(rq, rq_data_dir(rq)</div><div class='ctx'> 						  ? "cdrom_newpc_intr, write"</div><div class='hunk'>@@ -1111,9 +1177,12 @@ static ide_startstop_t cdrom_start_rw(ide_drive_t *drive, struct request *rq)</div><div class='ctx'> 	unsigned short sectors_per_frame =</div><div class='ctx'> 		queue_hardsect_size(drive-&gt;queue) &gt;&gt; SECTOR_BITS;</div><div class='ctx'> </div><div class='add'>+	ide_debug_log(IDE_DBG_RQ, "Call %s, write: 0x%x, secs_per_frame: %u\n",</div><div class='add'>+		      __func__, write, sectors_per_frame);</div><div class='add'>+</div><div class='ctx'> 	if (write) {</div><div class='ctx'> 		/* disk has become write protected */</div><div class='del'>-		if (cd-&gt;disk-&gt;policy) {</div><div class='add'>+		if (get_disk_ro(cd-&gt;disk)) {</div><div class='ctx'> 			cdrom_end_request(drive, 0);</div><div class='ctx'> 			return ide_stopped;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1122,7 +1191,7 @@ static ide_startstop_t cdrom_start_rw(ide_drive_t *drive, struct request *rq)</div><div class='ctx'> 		 * We may be retrying this request after an error.  Fix up any</div><div class='ctx'> 		 * weirdness which might be present in the request packet.</div><div class='ctx'> 		 */</div><div class='del'>-		restore_request(rq);</div><div class='add'>+		ide_cd_restore_request(drive, rq);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* use DMA, if possible / writes *must* be hardware frame aligned */</div><div class='hunk'>@@ -1132,9 +1201,9 @@ static ide_startstop_t cdrom_start_rw(ide_drive_t *drive, struct request *rq)</div><div class='ctx'> 			cdrom_end_request(drive, 0);</div><div class='ctx'> 			return ide_stopped;</div><div class='ctx'> 		}</div><div class='del'>-		cd-&gt;dma = 0;</div><div class='add'>+		drive-&gt;dma = 0;</div><div class='ctx'> 	} else</div><div class='del'>-		cd-&gt;dma = drive-&gt;using_dma;</div><div class='add'>+		drive-&gt;dma = !!(drive-&gt;dev_flags &amp; IDE_DFLAG_USING_DMA);</div><div class='ctx'> </div><div class='ctx'> 	if (write)</div><div class='ctx'> 		cd-&gt;devinfo.media_written = 1;</div><div class='hunk'>@@ -1151,28 +1220,29 @@ static ide_startstop_t cdrom_do_newpc_cont(ide_drive_t *drive)</div><div class='ctx'> </div><div class='ctx'> static void cdrom_do_block_pc(ide_drive_t *drive, struct request *rq)</div><div class='ctx'> {</div><div class='del'>-	struct cdrom_info *info = drive-&gt;driver_data;</div><div class='add'>+</div><div class='add'>+	ide_debug_log(IDE_DBG_PC, "Call %s, rq-&gt;cmd_type: 0x%x\n", __func__,</div><div class='add'>+		      rq-&gt;cmd_type);</div><div class='ctx'> </div><div class='ctx'> 	if (blk_pc_request(rq))</div><div class='ctx'> 		rq-&gt;cmd_flags |= REQ_QUIET;</div><div class='ctx'> 	else</div><div class='ctx'> 		rq-&gt;cmd_flags &amp;= ~REQ_FAILED;</div><div class='ctx'> </div><div class='del'>-	info-&gt;dma = 0;</div><div class='add'>+	drive-&gt;dma = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* sg request */</div><div class='ctx'> 	if (rq-&gt;bio || ((rq-&gt;cmd_type == REQ_TYPE_ATA_PC) &amp;&amp; rq-&gt;data_len)) {</div><div class='ctx'> 		struct request_queue *q = drive-&gt;queue;</div><div class='ctx'> 		unsigned int alignment;</div><div class='del'>-		unsigned long addr;</div><div class='del'>-		unsigned long stack_mask = ~(THREAD_SIZE - 1);</div><div class='add'>+		char *buf;</div><div class='ctx'> </div><div class='ctx'> 		if (rq-&gt;bio)</div><div class='del'>-			addr = (unsigned long)bio_data(rq-&gt;bio);</div><div class='add'>+			buf = bio_data(rq-&gt;bio);</div><div class='ctx'> 		else</div><div class='del'>-			addr = (unsigned long)rq-&gt;data;</div><div class='add'>+			buf = rq-&gt;data;</div><div class='ctx'> </div><div class='del'>-		info-&gt;dma = drive-&gt;using_dma;</div><div class='add'>+		drive-&gt;dma = !!(drive-&gt;dev_flags &amp; IDE_DFLAG_USING_DMA);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * check if dma is safe</div><div class='hunk'>@@ -1181,12 +1251,9 @@ static void cdrom_do_block_pc(ide_drive_t *drive, struct request *rq)</div><div class='ctx'> 		 * separate masks.</div><div class='ctx'> 		 */</div><div class='ctx'> 		alignment = queue_dma_alignment(q) | q-&gt;dma_pad_mask;</div><div class='del'>-		if (addr &amp; alignment || rq-&gt;data_len &amp; alignment)</div><div class='del'>-			info-&gt;dma = 0;</div><div class='del'>-</div><div class='del'>-		if (!((addr &amp; stack_mask) ^</div><div class='del'>-		      ((unsigned long)current-&gt;stack &amp; stack_mask)))</div><div class='del'>-			info-&gt;dma = 0;</div><div class='add'>+		if ((unsigned long)buf &amp; alignment || rq-&gt;data_len &amp; alignment</div><div class='add'>+		    || object_is_on_stack(buf))</div><div class='add'>+			drive-&gt;dma = 0;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1200,19 +1267,22 @@ static ide_startstop_t ide_cd_do_request(ide_drive_t *drive, struct request *rq,</div><div class='ctx'> 	ide_handler_t *fn;</div><div class='ctx'> 	int xferlen;</div><div class='ctx'> </div><div class='add'>+	ide_debug_log(IDE_DBG_RQ, "Call %s, rq-&gt;cmd_type: 0x%x, block: %llu\n",</div><div class='add'>+		      __func__, rq-&gt;cmd_type, (unsigned long long)block);</div><div class='add'>+</div><div class='ctx'> 	if (blk_fs_request(rq)) {</div><div class='ctx'> 		if (drive-&gt;atapi_flags &amp; IDE_AFLAG_SEEKING) {</div><div class='ctx'> 			ide_hwif_t *hwif = drive-&gt;hwif;</div><div class='ctx'> 			unsigned long elapsed = jiffies - info-&gt;start_seek;</div><div class='ctx'> 			int stat = hwif-&gt;tp_ops-&gt;read_status(hwif);</div><div class='ctx'> </div><div class='del'>-			if ((stat &amp; SEEK_STAT) != SEEK_STAT) {</div><div class='add'>+			if ((stat &amp; ATA_DSC) != ATA_DSC) {</div><div class='ctx'> 				if (elapsed &lt; IDECD_SEEK_TIMEOUT) {</div><div class='ctx'> 					ide_stall_queue(drive,</div><div class='ctx'> 							IDECD_SEEK_TIMER);</div><div class='ctx'> 					return ide_stopped;</div><div class='ctx'> 				}</div><div class='del'>-				printk(KERN_ERR "%s: DSC timeout\n",</div><div class='add'>+				printk(KERN_ERR PFX "%s: DSC timeout\n",</div><div class='ctx'> 						drive-&gt;name);</div><div class='ctx'> 			}</div><div class='ctx'> 			drive-&gt;atapi_flags &amp;= ~IDE_AFLAG_SEEKING;</div><div class='hunk'>@@ -1220,11 +1290,11 @@ static ide_startstop_t ide_cd_do_request(ide_drive_t *drive, struct request *rq,</div><div class='ctx'> 		if (rq_data_dir(rq) == READ &amp;&amp;</div><div class='ctx'> 		    IDE_LARGE_SEEK(info-&gt;last_block, block,</div><div class='ctx'> 			    IDECD_SEEK_THRESHOLD) &amp;&amp;</div><div class='del'>-		    drive-&gt;dsc_overlap) {</div><div class='add'>+		    (drive-&gt;dev_flags &amp; IDE_DFLAG_DSC_OVERLAP)) {</div><div class='ctx'> 			xferlen = 0;</div><div class='ctx'> 			fn = cdrom_start_seek_continuation;</div><div class='ctx'> </div><div class='del'>-			info-&gt;dma = 0;</div><div class='add'>+			drive-&gt;dma = 0;</div><div class='ctx'> 			info-&gt;start_seek = jiffies;</div><div class='ctx'> </div><div class='ctx'> 			ide_cd_prepare_seek_request(drive, rq);</div><div class='hunk'>@@ -1253,7 +1323,7 @@ static ide_startstop_t ide_cd_do_request(ide_drive_t *drive, struct request *rq,</div><div class='ctx'> 		cdrom_end_request(drive, 1);</div><div class='ctx'> 		return ide_stopped;</div><div class='ctx'> 	} else {</div><div class='del'>-		blk_dump_rq_flags(rq, "ide-cd bad flags");</div><div class='add'>+		blk_dump_rq_flags(rq, DRV_NAME " bad flags");</div><div class='ctx'> 		cdrom_end_request(drive, 0);</div><div class='ctx'> 		return ide_stopped;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1283,6 +1353,8 @@ int cdrom_check_status(ide_drive_t *drive, struct request_sense *sense)</div><div class='ctx'> 	struct cdrom_device_info *cdi = &amp;info-&gt;devinfo;</div><div class='ctx'> 	unsigned char cmd[BLK_MAX_CDB];</div><div class='ctx'> </div><div class='add'>+	ide_debug_log(IDE_DBG_FUNC, "Call %s\n", __func__);</div><div class='add'>+</div><div class='ctx'> 	memset(cmd, 0, BLK_MAX_CDB);</div><div class='ctx'> 	cmd[0] = GPCMD_TEST_UNIT_READY;</div><div class='ctx'> </div><div class='hunk'>@@ -1309,6 +1381,8 @@ static int cdrom_read_capacity(ide_drive_t *drive, unsigned long *capacity,</div><div class='ctx'> 	unsigned len = sizeof(capbuf);</div><div class='ctx'> 	u32 blocklen;</div><div class='ctx'> </div><div class='add'>+	ide_debug_log(IDE_DBG_FUNC, "Call %s\n", __func__);</div><div class='add'>+</div><div class='ctx'> 	memset(cmd, 0, BLK_MAX_CDB);</div><div class='ctx'> 	cmd[0] = GPCMD_READ_CDVD_CAPACITY;</div><div class='ctx'> </div><div class='hunk'>@@ -1328,10 +1402,10 @@ static int cdrom_read_capacity(ide_drive_t *drive, unsigned long *capacity,</div><div class='ctx'> 	case 4096:</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		printk(KERN_ERR "%s: weird block size %u\n",</div><div class='del'>-			drive-&gt;name, blocklen);</div><div class='del'>-		printk(KERN_ERR "%s: default to 2kb block size\n",</div><div class='del'>-			drive-&gt;name);</div><div class='add'>+		printk(KERN_ERR PFX "%s: weird block size %u\n",</div><div class='add'>+				drive-&gt;name, blocklen);</div><div class='add'>+		printk(KERN_ERR PFX "%s: default to 2kb block size\n",</div><div class='add'>+				drive-&gt;name);</div><div class='ctx'> 		blocklen = 2048;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1347,6 +1421,8 @@ static int cdrom_read_tocentry(ide_drive_t *drive, int trackno, int msf_flag,</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char cmd[BLK_MAX_CDB];</div><div class='ctx'> </div><div class='add'>+	ide_debug_log(IDE_DBG_FUNC, "Call %s\n", __func__);</div><div class='add'>+</div><div class='ctx'> 	memset(cmd, 0, BLK_MAX_CDB);</div><div class='ctx'> </div><div class='ctx'> 	cmd[0] = GPCMD_READ_TOC_PMA_ATIP;</div><div class='hunk'>@@ -1375,11 +1451,13 @@ int ide_cd_read_toc(ide_drive_t *drive, struct request_sense *sense)</div><div class='ctx'> 	long last_written;</div><div class='ctx'> 	unsigned long sectors_per_frame = SECTORS_PER_FRAME;</div><div class='ctx'> </div><div class='add'>+	ide_debug_log(IDE_DBG_FUNC, "Call %s\n", __func__);</div><div class='add'>+</div><div class='ctx'> 	if (toc == NULL) {</div><div class='ctx'> 		/* try to allocate space */</div><div class='ctx'> 		toc = kmalloc(sizeof(struct atapi_toc), GFP_KERNEL);</div><div class='ctx'> 		if (toc == NULL) {</div><div class='del'>-			printk(KERN_ERR "%s: No cdrom TOC buffer!\n",</div><div class='add'>+			printk(KERN_ERR PFX "%s: No cdrom TOC buffer!\n",</div><div class='ctx'> 					drive-&gt;name);</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1535,6 +1613,8 @@ int ide_cdrom_get_capabilities(ide_drive_t *drive, u8 *buf)</div><div class='ctx'> 	struct packet_command cgc;</div><div class='ctx'> 	int stat, attempts = 3, size = ATAPI_CAPABILITIES_PAGE_SIZE;</div><div class='ctx'> </div><div class='add'>+	ide_debug_log(IDE_DBG_FUNC, "Call %s\n", __func__);</div><div class='add'>+</div><div class='ctx'> 	if ((drive-&gt;atapi_flags &amp; IDE_AFLAG_FULL_CAPS_PAGE) == 0)</div><div class='ctx'> 		size -= ATAPI_CAPABILITIES_PAGE_PAD_SIZE;</div><div class='ctx'> </div><div class='hunk'>@@ -1553,6 +1633,8 @@ void ide_cdrom_update_speed(ide_drive_t *drive, u8 *buf)</div><div class='ctx'> 	struct cdrom_info *cd = drive-&gt;driver_data;</div><div class='ctx'> 	u16 curspeed, maxspeed;</div><div class='ctx'> </div><div class='add'>+	ide_debug_log(IDE_DBG_FUNC, "Call %s\n", __func__);</div><div class='add'>+</div><div class='ctx'> 	if (drive-&gt;atapi_flags &amp; IDE_AFLAG_LE_SPEED_FIELDS) {</div><div class='ctx'> 		curspeed = le16_to_cpup((__le16 *)&amp;buf[8 + 14]);</div><div class='ctx'> 		maxspeed = le16_to_cpup((__le16 *)&amp;buf[8 + 8]);</div><div class='hunk'>@@ -1593,6 +1675,8 @@ static int ide_cdrom_register(ide_drive_t *drive, int nslots)</div><div class='ctx'> 	struct cdrom_info *info = drive-&gt;driver_data;</div><div class='ctx'> 	struct cdrom_device_info *devinfo = &amp;info-&gt;devinfo;</div><div class='ctx'> </div><div class='add'>+	ide_debug_log(IDE_DBG_PROBE, "Call %s, nslots: %d\n", __func__, nslots);</div><div class='add'>+</div><div class='ctx'> 	devinfo-&gt;ops = &amp;ide_cdrom_dops;</div><div class='ctx'> 	devinfo-&gt;speed = info-&gt;current_speed;</div><div class='ctx'> 	devinfo-&gt;capacity = nslots;</div><div class='hunk'>@@ -1614,13 +1698,17 @@ static int ide_cdrom_probe_capabilities(ide_drive_t *drive)</div><div class='ctx'> 	mechtype_t mechtype;</div><div class='ctx'> 	int nslots = 1;</div><div class='ctx'> </div><div class='add'>+	ide_debug_log(IDE_DBG_PROBE, "Call %s, drive-&gt;media: 0x%x, "</div><div class='add'>+		      "drive-&gt;atapi_flags: 0x%lx\n", __func__, drive-&gt;media,</div><div class='add'>+		      drive-&gt;atapi_flags);</div><div class='add'>+</div><div class='ctx'> 	cdi-&gt;mask = (CDC_CD_R | CDC_CD_RW | CDC_DVD | CDC_DVD_R |</div><div class='ctx'> 		     CDC_DVD_RAM | CDC_SELECT_DISC | CDC_PLAY_AUDIO |</div><div class='ctx'> 		     CDC_MO_DRIVE | CDC_RAM);</div><div class='ctx'> </div><div class='ctx'> 	if (drive-&gt;media == ide_optical) {</div><div class='ctx'> 		cdi-&gt;mask &amp;= ~(CDC_MO_DRIVE | CDC_RAM);</div><div class='del'>-		printk(KERN_ERR "%s: ATAPI magneto-optical drive\n",</div><div class='add'>+		printk(KERN_ERR PFX "%s: ATAPI magneto-optical drive\n",</div><div class='ctx'> 				drive-&gt;name);</div><div class='ctx'> 		return nslots;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1678,7 +1766,7 @@ static int ide_cdrom_probe_capabilities(ide_drive_t *drive)</div><div class='ctx'> </div><div class='ctx'> 	ide_cdrom_update_speed(drive, buf);</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "%s: ATAPI", drive-&gt;name);</div><div class='add'>+	printk(KERN_INFO PFX "%s: ATAPI", drive-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	/* don't print speed if the drive reported 0 */</div><div class='ctx'> 	if (cd-&gt;max_speed)</div><div class='hunk'>@@ -1701,7 +1789,8 @@ static int ide_cdrom_probe_capabilities(ide_drive_t *drive)</div><div class='ctx'> 	else</div><div class='ctx'> 		printk(KERN_CONT " drive");</div><div class='ctx'> </div><div class='del'>-	printk(KERN_CONT ", %dkB Cache\n", be16_to_cpup((__be16 *)&amp;buf[8 + 12]));</div><div class='add'>+	printk(KERN_CONT ", %dkB Cache\n",</div><div class='add'>+			 be16_to_cpup((__be16 *)&amp;buf[8 + 12]));</div><div class='ctx'> </div><div class='ctx'> 	return nslots;</div><div class='ctx'> }</div><div class='hunk'>@@ -1813,13 +1902,12 @@ static ide_proc_entry_t idecd_proc[] = {</div><div class='ctx'> 	{ NULL, 0, NULL, NULL }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void ide_cdrom_add_settings(ide_drive_t *drive)</div><div class='del'>-{</div><div class='del'>-	ide_add_setting(drive, "dsc_overlap", SETTING_RW, TYPE_BYTE, 0, 1, 1, 1,</div><div class='del'>-			&amp;drive-&gt;dsc_overlap, NULL);</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-static inline void ide_cdrom_add_settings(ide_drive_t *drive) { ; }</div><div class='add'>+ide_devset_rw_flag(dsc_overlap, IDE_DFLAG_DSC_OVERLAP);</div><div class='add'>+</div><div class='add'>+static const struct ide_proc_devset idecd_settings[] = {</div><div class='add'>+	IDE_PROC_DEVSET(dsc_overlap, 0, 1),</div><div class='add'>+	{ 0 },</div><div class='add'>+};</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static const struct cd_list_entry ide_cd_quirks_list[] = {</div><div class='hunk'>@@ -1866,14 +1954,14 @@ static const struct cd_list_entry ide_cd_quirks_list[] = {</div><div class='ctx'> 	{ NULL, NULL, 0 }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static unsigned int ide_cd_flags(struct hd_driveid *id)</div><div class='add'>+static unsigned int ide_cd_flags(u16 *id)</div><div class='ctx'> {</div><div class='ctx'> 	const struct cd_list_entry *cle = ide_cd_quirks_list;</div><div class='ctx'> </div><div class='ctx'> 	while (cle-&gt;id_model) {</div><div class='del'>-		if (strcmp(cle-&gt;id_model, id-&gt;model) == 0 &amp;&amp;</div><div class='add'>+		if (strcmp(cle-&gt;id_model, (char *)&amp;id[ATA_ID_PROD]) == 0 &amp;&amp;</div><div class='ctx'> 		    (cle-&gt;id_firmware == NULL ||</div><div class='del'>-		     strstr(id-&gt;fw_rev, cle-&gt;id_firmware)))</div><div class='add'>+		     strstr((char *)&amp;id[ATA_ID_FW_REV], cle-&gt;id_firmware)))</div><div class='ctx'> 			return cle-&gt;cd_flags;</div><div class='ctx'> 		cle++;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1885,9 +1973,12 @@ static int ide_cdrom_setup(ide_drive_t *drive)</div><div class='ctx'> {</div><div class='ctx'> 	struct cdrom_info *cd = drive-&gt;driver_data;</div><div class='ctx'> 	struct cdrom_device_info *cdi = &amp;cd-&gt;devinfo;</div><div class='del'>-	struct hd_driveid *id = drive-&gt;id;</div><div class='add'>+	u16 *id = drive-&gt;id;</div><div class='add'>+	char *fw_rev = (char *)&amp;id[ATA_ID_FW_REV];</div><div class='ctx'> 	int nslots;</div><div class='ctx'> </div><div class='add'>+	ide_debug_log(IDE_DBG_PROBE, "Call %s\n", __func__);</div><div class='add'>+</div><div class='ctx'> 	blk_queue_prep_rq(drive-&gt;queue, ide_cdrom_prep_fn);</div><div class='ctx'> 	blk_queue_dma_alignment(drive-&gt;queue, 31);</div><div class='ctx'> 	blk_queue_update_dma_pad(drive-&gt;queue, 15);</div><div class='hunk'>@@ -1895,20 +1986,15 @@ static int ide_cdrom_setup(ide_drive_t *drive)</div><div class='ctx'> 	if (!drive-&gt;queue-&gt;unplug_delay)</div><div class='ctx'> 		drive-&gt;queue-&gt;unplug_delay = 1;</div><div class='ctx'> </div><div class='del'>-	drive-&gt;special.all	= 0;</div><div class='del'>-</div><div class='ctx'> 	drive-&gt;atapi_flags = IDE_AFLAG_MEDIA_CHANGED | IDE_AFLAG_NO_EJECT |</div><div class='ctx'> 		       ide_cd_flags(id);</div><div class='ctx'> </div><div class='del'>-	if ((id-&gt;config &amp; 0x0060) == 0x20)</div><div class='del'>-		drive-&gt;atapi_flags |= IDE_AFLAG_DRQ_INTERRUPT;</div><div class='del'>-</div><div class='ctx'> 	if ((drive-&gt;atapi_flags &amp; IDE_AFLAG_VERTOS_300_SSD) &amp;&amp;</div><div class='del'>-	    id-&gt;fw_rev[4] == '1' &amp;&amp; id-&gt;fw_rev[6] &lt;= '2')</div><div class='add'>+	    fw_rev[4] == '1' &amp;&amp; fw_rev[6] &lt;= '2')</div><div class='ctx'> 		drive-&gt;atapi_flags |= (IDE_AFLAG_TOCTRACKS_AS_BCD |</div><div class='ctx'> 				     IDE_AFLAG_TOCADDR_AS_BCD);</div><div class='ctx'> 	else if ((drive-&gt;atapi_flags &amp; IDE_AFLAG_VERTOS_600_ESD) &amp;&amp;</div><div class='del'>-		 id-&gt;fw_rev[4] == '1' &amp;&amp; id-&gt;fw_rev[6] &lt;= '2')</div><div class='add'>+		 fw_rev[4] == '1' &amp;&amp; fw_rev[6] &lt;= '2')</div><div class='ctx'> 		drive-&gt;atapi_flags |= IDE_AFLAG_TOCTRACKS_AS_BCD;</div><div class='ctx'> 	else if (drive-&gt;atapi_flags &amp; IDE_AFLAG_SANYO_3CD)</div><div class='ctx'> 		/* 3 =&gt; use CD in slot 0 */</div><div class='hunk'>@@ -1919,15 +2005,19 @@ static int ide_cdrom_setup(ide_drive_t *drive)</div><div class='ctx'> 	/* set correct block size */</div><div class='ctx'> 	blk_queue_hardsect_size(drive-&gt;queue, CD_FRAMESIZE);</div><div class='ctx'> </div><div class='del'>-	drive-&gt;dsc_overlap = (drive-&gt;next != drive);</div><div class='add'>+	if (drive-&gt;next != drive)</div><div class='add'>+		drive-&gt;dev_flags |= IDE_DFLAG_DSC_OVERLAP;</div><div class='add'>+	else</div><div class='add'>+		drive-&gt;dev_flags &amp;= ~IDE_DFLAG_DSC_OVERLAP;</div><div class='ctx'> </div><div class='ctx'> 	if (ide_cdrom_register(drive, nslots)) {</div><div class='del'>-		printk(KERN_ERR "%s: %s failed to register device with the"</div><div class='add'>+		printk(KERN_ERR PFX "%s: %s failed to register device with the"</div><div class='ctx'> 				" cdrom driver.\n", drive-&gt;name, __func__);</div><div class='ctx'> 		cd-&gt;devinfo.handle = NULL;</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='del'>-	ide_cdrom_add_settings(drive);</div><div class='add'>+</div><div class='add'>+	ide_proc_register_driver(drive, cd-&gt;driver);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1935,6 +2025,8 @@ static void ide_cd_remove(ide_drive_t *drive)</div><div class='ctx'> {</div><div class='ctx'> 	struct cdrom_info *info = drive-&gt;driver_data;</div><div class='ctx'> </div><div class='add'>+	ide_debug_log(IDE_DBG_FUNC, "Call %s\n", __func__);</div><div class='add'>+</div><div class='ctx'> 	ide_proc_unregister_driver(drive, info-&gt;driver);</div><div class='ctx'> </div><div class='ctx'> 	del_gendisk(info-&gt;disk);</div><div class='hunk'>@@ -1944,15 +2036,17 @@ static void ide_cd_remove(ide_drive_t *drive)</div><div class='ctx'> </div><div class='ctx'> static void ide_cd_release(struct kref *kref)</div><div class='ctx'> {</div><div class='del'>-	struct cdrom_info *info = to_ide_cd(kref);</div><div class='add'>+	struct cdrom_info *info = to_ide_drv(kref, cdrom_info);</div><div class='ctx'> 	struct cdrom_device_info *devinfo = &amp;info-&gt;devinfo;</div><div class='ctx'> 	ide_drive_t *drive = info-&gt;drive;</div><div class='ctx'> 	struct gendisk *g = info-&gt;disk;</div><div class='ctx'> </div><div class='add'>+	ide_debug_log(IDE_DBG_FUNC, "Call %s\n", __func__);</div><div class='add'>+</div><div class='ctx'> 	kfree(info-&gt;toc);</div><div class='ctx'> 	if (devinfo-&gt;handle == drive)</div><div class='ctx'> 		unregister_cdrom(devinfo);</div><div class='del'>-	drive-&gt;dsc_overlap = 0;</div><div class='add'>+	drive-&gt;dev_flags &amp;= ~IDE_DFLAG_DSC_OVERLAP;</div><div class='ctx'> 	drive-&gt;driver_data = NULL;</div><div class='ctx'> 	blk_queue_prep_rq(drive-&gt;queue, NULL);</div><div class='ctx'> 	g-&gt;private_data = NULL;</div><div class='hunk'>@@ -1971,13 +2065,12 @@ static ide_driver_t ide_cdrom_driver = {</div><div class='ctx'> 	.probe			= ide_cd_probe,</div><div class='ctx'> 	.remove			= ide_cd_remove,</div><div class='ctx'> 	.version		= IDECD_VERSION,</div><div class='del'>-	.media			= ide_cdrom,</div><div class='del'>-	.supports_dsc_overlap	= 1,</div><div class='ctx'> 	.do_request		= ide_cd_do_request,</div><div class='ctx'> 	.end_request		= ide_end_request,</div><div class='ctx'> 	.error			= __ide_error,</div><div class='ctx'> #ifdef CONFIG_IDE_PROC_FS</div><div class='ctx'> 	.proc			= idecd_proc,</div><div class='add'>+	.settings		= idecd_settings,</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2002,7 +2095,7 @@ static int idecd_open(struct inode *inode, struct file *file)</div><div class='ctx'> static int idecd_release(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='ctx'> 	struct gendisk *disk = inode-&gt;i_bdev-&gt;bd_disk;</div><div class='del'>-	struct cdrom_info *info = ide_cd_g(disk);</div><div class='add'>+	struct cdrom_info *info = ide_drv_g(disk, cdrom_info);</div><div class='ctx'> </div><div class='ctx'> 	cdrom_release(&amp;info-&gt;devinfo, file);</div><div class='ctx'> </div><div class='hunk'>@@ -2054,7 +2147,7 @@ static int idecd_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 			unsigned int cmd, unsigned long arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct block_device *bdev = inode-&gt;i_bdev;</div><div class='del'>-	struct cdrom_info *info = ide_cd_g(bdev-&gt;bd_disk);</div><div class='add'>+	struct cdrom_info *info = ide_drv_g(bdev-&gt;bd_disk, cdrom_info);</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='hunk'>@@ -2075,13 +2168,13 @@ static int idecd_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> </div><div class='ctx'> static int idecd_media_changed(struct gendisk *disk)</div><div class='ctx'> {</div><div class='del'>-	struct cdrom_info *info = ide_cd_g(disk);</div><div class='add'>+	struct cdrom_info *info = ide_drv_g(disk, cdrom_info);</div><div class='ctx'> 	return cdrom_media_changed(&amp;info-&gt;devinfo);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int idecd_revalidate_disk(struct gendisk *disk)</div><div class='ctx'> {</div><div class='del'>-	struct cdrom_info *info = ide_cd_g(disk);</div><div class='add'>+	struct cdrom_info *info = ide_drv_g(disk, cdrom_info);</div><div class='ctx'> 	struct request_sense sense;</div><div class='ctx'> </div><div class='ctx'> 	ide_cd_read_toc(info-&gt;drive, &amp;sense);</div><div class='hunk'>@@ -2100,8 +2193,11 @@ static struct block_device_operations idecd_ops = {</div><div class='ctx'> </div><div class='ctx'> /* module options */</div><div class='ctx'> static char *ignore;</div><div class='del'>-</div><div class='ctx'> module_param(ignore, charp, 0400);</div><div class='add'>+</div><div class='add'>+static unsigned long debug_mask;</div><div class='add'>+module_param(debug_mask, ulong, 0644);</div><div class='add'>+</div><div class='ctx'> MODULE_DESCRIPTION("ATAPI CD-ROM Driver");</div><div class='ctx'> </div><div class='ctx'> static int ide_cd_probe(ide_drive_t *drive)</div><div class='hunk'>@@ -2110,23 +2206,30 @@ static int ide_cd_probe(ide_drive_t *drive)</div><div class='ctx'> 	struct gendisk *g;</div><div class='ctx'> 	struct request_sense sense;</div><div class='ctx'> </div><div class='add'>+	ide_debug_log(IDE_DBG_PROBE, "Call %s, drive-&gt;driver_req: %s, "</div><div class='add'>+		      "drive-&gt;media: 0x%x\n", __func__, drive-&gt;driver_req,</div><div class='add'>+		      drive-&gt;media);</div><div class='add'>+</div><div class='ctx'> 	if (!strstr("ide-cdrom", drive-&gt;driver_req))</div><div class='ctx'> 		goto failed;</div><div class='del'>-	if (!drive-&gt;present)</div><div class='del'>-		goto failed;</div><div class='add'>+</div><div class='ctx'> 	if (drive-&gt;media != ide_cdrom &amp;&amp; drive-&gt;media != ide_optical)</div><div class='ctx'> 		goto failed;</div><div class='add'>+</div><div class='ctx'> 	/* skip drives that we were told to ignore */</div><div class='ctx'> 	if (ignore != NULL) {</div><div class='ctx'> 		if (strstr(ignore, drive-&gt;name)) {</div><div class='del'>-			printk(KERN_INFO "ide-cd: ignoring drive %s\n",</div><div class='add'>+			printk(KERN_INFO PFX "ignoring drive %s\n",</div><div class='ctx'> 					 drive-&gt;name);</div><div class='ctx'> 			goto failed;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	drive-&gt;debug_mask = debug_mask;</div><div class='add'>+</div><div class='ctx'> 	info = kzalloc(sizeof(struct cdrom_info), GFP_KERNEL);</div><div class='ctx'> 	if (info == NULL) {</div><div class='del'>-		printk(KERN_ERR "%s: Can't allocate a cdrom structure\n",</div><div class='add'>+		printk(KERN_ERR PFX "%s: Can't allocate a cdrom structure\n",</div><div class='ctx'> 				drive-&gt;name);</div><div class='ctx'> 		goto failed;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2137,8 +2240,6 @@ static int ide_cd_probe(ide_drive_t *drive)</div><div class='ctx'> </div><div class='ctx'> 	ide_init_disk(g, drive);</div><div class='ctx'> </div><div class='del'>-	ide_proc_register_driver(drive, &amp;ide_cdrom_driver);</div><div class='del'>-</div><div class='ctx'> 	kref_init(&amp;info-&gt;kref);</div><div class='ctx'> </div><div class='ctx'> 	info-&gt;drive = drive;</div><div class='hunk'>@@ -2153,7 +2254,6 @@ static int ide_cd_probe(ide_drive_t *drive)</div><div class='ctx'> 	g-&gt;driverfs_dev = &amp;drive-&gt;gendev;</div><div class='ctx'> 	g-&gt;flags = GENHD_FL_CD | GENHD_FL_REMOVABLE;</div><div class='ctx'> 	if (ide_cdrom_setup(drive)) {</div><div class='del'>-		ide_proc_unregister_driver(drive, &amp;ide_cdrom_driver);</div><div class='ctx'> 		ide_cd_release(&amp;info-&gt;kref);</div><div class='ctx'> 		goto failed;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2177,6 +2277,7 @@ static void __exit ide_cdrom_exit(void)</div><div class='ctx'> </div><div class='ctx'> static int __init ide_cdrom_init(void)</div><div class='ctx'> {</div><div class='add'>+	printk(KERN_INFO DRV_NAME " driver " IDECD_VERSION "\n");</div><div class='ctx'> 	return driver_register(&amp;ide_cdrom_driver.gen_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/ide/ide-cd.h b/drivers/ide/ide-cd.h<br/>index 61a4599b77db..5882b9a9ea8b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/ide-cd.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ide/ide-cd.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/ide-cd.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/ide-cd.h</a></div><div class='hunk'>@@ -88,7 +88,6 @@ struct cdrom_info {</div><div class='ctx'> 	struct request_sense sense_data;</div><div class='ctx'> </div><div class='ctx'> 	struct request request_sense_request;</div><div class='del'>-	int dma;</div><div class='ctx'> 	unsigned long last_block;</div><div class='ctx'> 	unsigned long start_seek;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c<br/>index 07ef88bd109b..3853bde8eedc 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/ide-disk.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ide/ide-disk.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/ide-disk.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/ide-disk.c</a></div><div class='hunk'>@@ -30,10 +30,8 @@</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/leds.h&gt;</div><div class='del'>-</div><div class='del'>-#define _IDE_DISK</div><div class='del'>-</div><div class='ctx'> #include &lt;linux/ide.h&gt;</div><div class='add'>+#include &lt;linux/hdreg.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/byteorder.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='hunk'>@@ -41,21 +39,18 @@</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/div64.h&gt;</div><div class='ctx'> </div><div class='del'>-struct ide_disk_obj {</div><div class='del'>-	ide_drive_t	*drive;</div><div class='del'>-	ide_driver_t	*driver;</div><div class='del'>-	struct gendisk	*disk;</div><div class='del'>-	struct kref	kref;</div><div class='del'>-	unsigned int	openers;	/* protected by BKL for now */</div><div class='del'>-};</div><div class='add'>+#if !defined(CONFIG_DEBUG_BLOCK_EXT_DEVT)</div><div class='add'>+#define IDE_DISK_MINORS		(1 &lt;&lt; PARTN_BITS)</div><div class='add'>+#else</div><div class='add'>+#define IDE_DISK_MINORS		0</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#include "ide-disk.h"</div><div class='ctx'> </div><div class='ctx'> static DEFINE_MUTEX(idedisk_ref_mutex);</div><div class='ctx'> </div><div class='ctx'> #define to_ide_disk(obj) container_of(obj, struct ide_disk_obj, kref)</div><div class='ctx'> </div><div class='del'>-#define ide_disk_g(disk) \</div><div class='del'>-	container_of((disk)-&gt;private_data, struct ide_disk_obj, driver)</div><div class='del'>-</div><div class='ctx'> static void ide_disk_release(struct kref *);</div><div class='ctx'> </div><div class='ctx'> static struct ide_disk_obj *ide_disk_get(struct gendisk *disk)</div><div class='hunk'>@@ -84,68 +79,19 @@ static void ide_disk_put(struct ide_disk_obj *idkp)</div><div class='ctx'> 	mutex_unlock(&amp;idedisk_ref_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * lba_capacity_is_ok() performs a sanity check on the claimed "lba_capacity"</div><div class='del'>- * value for this drive (from its reported identification information).</div><div class='del'>- *</div><div class='del'>- * Returns:	1 if lba_capacity looks sensible</div><div class='del'>- *		0 otherwise</div><div class='del'>- *</div><div class='del'>- * It is called only once for each drive.</div><div class='del'>- */</div><div class='del'>-static int lba_capacity_is_ok(struct hd_driveid *id)</div><div class='del'>-{</div><div class='del'>-	unsigned long lba_sects, chs_sects, head, tail;</div><div class='del'>-</div><div class='del'>-	/* No non-LBA info .. so valid! */</div><div class='del'>-	if (id-&gt;cyls == 0)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * The ATA spec tells large drives to return</div><div class='del'>-	 * C/H/S = 16383/16/63 independent of their size.</div><div class='del'>-	 * Some drives can be jumpered to use 15 heads instead of 16.</div><div class='del'>-	 * Some drives can be jumpered to use 4092 cyls instead of 16383.</div><div class='del'>-	 */</div><div class='del'>-	if ((id-&gt;cyls == 16383</div><div class='del'>-	     || (id-&gt;cyls == 4092 &amp;&amp; id-&gt;cur_cyls == 16383)) &amp;&amp;</div><div class='del'>-	    id-&gt;sectors == 63 &amp;&amp;</div><div class='del'>-	    (id-&gt;heads == 15 || id-&gt;heads == 16) &amp;&amp;</div><div class='del'>-	    (id-&gt;lba_capacity &gt;= 16383*63*id-&gt;heads))</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	lba_sects   = id-&gt;lba_capacity;</div><div class='del'>-	chs_sects   = id-&gt;cyls * id-&gt;heads * id-&gt;sectors;</div><div class='del'>-</div><div class='del'>-	/* perform a rough sanity check on lba_sects:  within 10% is OK */</div><div class='del'>-	if ((lba_sects - chs_sects) &lt; chs_sects/10)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	/* some drives have the word order reversed */</div><div class='del'>-	head = ((lba_sects &gt;&gt; 16) &amp; 0xffff);</div><div class='del'>-	tail = (lba_sects &amp; 0xffff);</div><div class='del'>-	lba_sects = (head | (tail &lt;&lt; 16));</div><div class='del'>-	if ((lba_sects - chs_sects) &lt; chs_sects/10) {</div><div class='del'>-		id-&gt;lba_capacity = lba_sects;</div><div class='del'>-		return 1;	/* lba_capacity is (now) good */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;	/* lba_capacity value may be bad */</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static const u8 ide_rw_cmds[] = {</div><div class='del'>-	WIN_MULTREAD,</div><div class='del'>-	WIN_MULTWRITE,</div><div class='del'>-	WIN_MULTREAD_EXT,</div><div class='del'>-	WIN_MULTWRITE_EXT,</div><div class='del'>-	WIN_READ,</div><div class='del'>-	WIN_WRITE,</div><div class='del'>-	WIN_READ_EXT,</div><div class='del'>-	WIN_WRITE_EXT,</div><div class='del'>-	WIN_READDMA,</div><div class='del'>-	WIN_WRITEDMA,</div><div class='del'>-	WIN_READDMA_EXT,</div><div class='del'>-	WIN_WRITEDMA_EXT,</div><div class='add'>+	ATA_CMD_READ_MULTI,</div><div class='add'>+	ATA_CMD_WRITE_MULTI,</div><div class='add'>+	ATA_CMD_READ_MULTI_EXT,</div><div class='add'>+	ATA_CMD_WRITE_MULTI_EXT,</div><div class='add'>+	ATA_CMD_PIO_READ,</div><div class='add'>+	ATA_CMD_PIO_WRITE,</div><div class='add'>+	ATA_CMD_PIO_READ_EXT,</div><div class='add'>+	ATA_CMD_PIO_WRITE_EXT,</div><div class='add'>+	ATA_CMD_READ,</div><div class='add'>+	ATA_CMD_WRITE,</div><div class='add'>+	ATA_CMD_READ_EXT,</div><div class='add'>+	ATA_CMD_WRITE_EXT,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const u8 ide_data_phases[] = {</div><div class='hunk'>@@ -185,9 +131,9 @@ static ide_startstop_t __ide_do_rw_disk(ide_drive_t *drive, struct request *rq,</div><div class='ctx'> 					sector_t block)</div><div class='ctx'> {</div><div class='ctx'> 	ide_hwif_t *hwif	= HWIF(drive);</div><div class='del'>-	unsigned int dma	= drive-&gt;using_dma;</div><div class='ctx'> 	u16 nsectors		= (u16)rq-&gt;nr_sectors;</div><div class='del'>-	u8 lba48		= (drive-&gt;addressing == 1) ? 1 : 0;</div><div class='add'>+	u8 lba48		= !!(drive-&gt;dev_flags &amp; IDE_DFLAG_LBA48);</div><div class='add'>+	u8 dma			= !!(drive-&gt;dev_flags &amp; IDE_DFLAG_USING_DMA);</div><div class='ctx'> 	ide_task_t		task;</div><div class='ctx'> 	struct ide_taskfile	*tf = &amp;task.tf;</div><div class='ctx'> 	ide_startstop_t		rc;</div><div class='hunk'>@@ -207,7 +153,7 @@ static ide_startstop_t __ide_do_rw_disk(ide_drive_t *drive, struct request *rq,</div><div class='ctx'> 	memset(&amp;task, 0, sizeof(task));</div><div class='ctx'> 	task.tf_flags = IDE_TFLAG_TF | IDE_TFLAG_DEVICE;</div><div class='ctx'> </div><div class='del'>-	if (drive-&gt;select.b.lba) {</div><div class='add'>+	if (drive-&gt;dev_flags &amp; IDE_DFLAG_LBA) {</div><div class='ctx'> 		if (lba48) {</div><div class='ctx'> 			pr_debug("%s: LBA=0x%012llx\n", drive-&gt;name,</div><div class='ctx'> 					(unsigned long long)block);</div><div class='hunk'>@@ -232,6 +178,8 @@ static ide_startstop_t __ide_do_rw_disk(ide_drive_t *drive, struct request *rq,</div><div class='ctx'> 			tf-&gt;lbah   = block &gt;&gt;= 8;</div><div class='ctx'> 			tf-&gt;device = (block &gt;&gt; 8) &amp; 0xf;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		tf-&gt;device |= ATA_LBA;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		unsigned int sect, head, cyl, track;</div><div class='ctx'> </div><div class='hunk'>@@ -282,7 +230,7 @@ static ide_startstop_t ide_do_rw_disk(ide_drive_t *drive, struct request *rq,</div><div class='ctx'> {</div><div class='ctx'> 	ide_hwif_t *hwif = HWIF(drive);</div><div class='ctx'> </div><div class='del'>-	BUG_ON(drive-&gt;blocked);</div><div class='add'>+	BUG_ON(drive-&gt;dev_flags &amp; IDE_DFLAG_BLOCKED);</div><div class='ctx'> </div><div class='ctx'> 	if (!blk_fs_request(rq)) {</div><div class='ctx'> 		blk_dump_rq_flags(rq, "ide_do_rw_disk - bad command");</div><div class='hunk'>@@ -316,9 +264,9 @@ static u64 idedisk_read_native_max_address(ide_drive_t *drive, int lba48)</div><div class='ctx'> 	/* Create IDE/ATA command request structure */</div><div class='ctx'> 	memset(&amp;args, 0, sizeof(ide_task_t));</div><div class='ctx'> 	if (lba48)</div><div class='del'>-		tf-&gt;command = WIN_READ_NATIVE_MAX_EXT;</div><div class='add'>+		tf-&gt;command = ATA_CMD_READ_NATIVE_MAX_EXT;</div><div class='ctx'> 	else</div><div class='del'>-		tf-&gt;command = WIN_READ_NATIVE_MAX;</div><div class='add'>+		tf-&gt;command = ATA_CMD_READ_NATIVE_MAX;</div><div class='ctx'> 	tf-&gt;device  = ATA_LBA;</div><div class='ctx'> 	args.tf_flags = IDE_TFLAG_TF | IDE_TFLAG_DEVICE;</div><div class='ctx'> 	if (lba48)</div><div class='hunk'>@@ -353,10 +301,10 @@ static u64 idedisk_set_max_address(ide_drive_t *drive, u64 addr_req, int lba48)</div><div class='ctx'> 		tf-&gt;hob_lbal = (addr_req &gt;&gt;= 8) &amp; 0xff;</div><div class='ctx'> 		tf-&gt;hob_lbam = (addr_req &gt;&gt;= 8) &amp; 0xff;</div><div class='ctx'> 		tf-&gt;hob_lbah = (addr_req &gt;&gt;= 8) &amp; 0xff;</div><div class='del'>-		tf-&gt;command  = WIN_SET_MAX_EXT;</div><div class='add'>+		tf-&gt;command  = ATA_CMD_SET_MAX_EXT;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		tf-&gt;device   = (addr_req &gt;&gt;= 8) &amp; 0x0f;</div><div class='del'>-		tf-&gt;command  = WIN_SET_MAX;</div><div class='add'>+		tf-&gt;command  = ATA_CMD_SET_MAX;</div><div class='ctx'> 	}</div><div class='ctx'> 	tf-&gt;device |= ATA_LBA;</div><div class='ctx'> 	args.tf_flags = IDE_TFLAG_TF | IDE_TFLAG_DEVICE;</div><div class='hunk'>@@ -379,25 +327,6 @@ static unsigned long long sectors_to_MB(unsigned long long n)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Bits 10 of command_set_1 and cfs_enable_1 must be equal,</div><div class='del'>- * so on non-buggy drives we need test only one.</div><div class='del'>- * However, we should also check whether these fields are valid.</div><div class='del'>- */</div><div class='del'>-static inline int idedisk_supports_hpa(const struct hd_driveid *id)</div><div class='del'>-{</div><div class='del'>-	return (id-&gt;command_set_1 &amp; 0x0400) &amp;&amp; (id-&gt;cfs_enable_1 &amp; 0x0400);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The same here.</div><div class='del'>- */</div><div class='del'>-static inline int idedisk_supports_lba48(const struct hd_driveid *id)</div><div class='del'>-{</div><div class='del'>-	return (id-&gt;command_set_2 &amp; 0x0400) &amp;&amp; (id-&gt;cfs_enable_2 &amp; 0x0400)</div><div class='del'>-	       &amp;&amp; id-&gt;lba_capacity_2;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * Some disks report total number of sectors instead of</div><div class='ctx'>  * maximum sector address.  We list them here.</div><div class='ctx'>  */</div><div class='hunk'>@@ -411,7 +340,7 @@ static const struct drive_list_entry hpa_list[] = {</div><div class='ctx'> static void idedisk_check_hpa(ide_drive_t *drive)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long long capacity, set_max;</div><div class='del'>-	int lba48 = idedisk_supports_lba48(drive-&gt;id);</div><div class='add'>+	int lba48 = ata_id_lba48_enabled(drive-&gt;id);</div><div class='ctx'> </div><div class='ctx'> 	capacity = drive-&gt;capacity64;</div><div class='ctx'> </div><div class='hunk'>@@ -447,139 +376,40 @@ static void idedisk_check_hpa(ide_drive_t *drive)</div><div class='ctx'> </div><div class='ctx'> static void init_idedisk_capacity(ide_drive_t *drive)</div><div class='ctx'> {</div><div class='del'>-	struct hd_driveid *id = drive-&gt;id;</div><div class='del'>-	/*</div><div class='del'>-	 * If this drive supports the Host Protected Area feature set,</div><div class='del'>-	 * then we may need to change our opinion about the drive's capacity.</div><div class='del'>-	 */</div><div class='del'>-	int hpa = idedisk_supports_hpa(id);</div><div class='add'>+	u16 *id = drive-&gt;id;</div><div class='add'>+	int lba;</div><div class='ctx'> </div><div class='del'>-	if (idedisk_supports_lba48(id)) {</div><div class='add'>+	if (ata_id_lba48_enabled(id)) {</div><div class='ctx'> 		/* drive speaks 48-bit LBA */</div><div class='del'>-		drive-&gt;select.b.lba = 1;</div><div class='del'>-		drive-&gt;capacity64 = id-&gt;lba_capacity_2;</div><div class='del'>-		if (hpa)</div><div class='del'>-			idedisk_check_hpa(drive);</div><div class='del'>-	} else if ((id-&gt;capability &amp; 2) &amp;&amp; lba_capacity_is_ok(id)) {</div><div class='add'>+		lba = 1;</div><div class='add'>+		drive-&gt;capacity64 = ata_id_u64(id, ATA_ID_LBA_CAPACITY_2);</div><div class='add'>+	} else if (ata_id_has_lba(id) &amp;&amp; ata_id_is_lba_capacity_ok(id)) {</div><div class='ctx'> 		/* drive speaks 28-bit LBA */</div><div class='del'>-		drive-&gt;select.b.lba = 1;</div><div class='del'>-		drive-&gt;capacity64 = id-&gt;lba_capacity;</div><div class='del'>-		if (hpa)</div><div class='del'>-			idedisk_check_hpa(drive);</div><div class='add'>+		lba = 1;</div><div class='add'>+		drive-&gt;capacity64 = ata_id_u32(id, ATA_ID_LBA_CAPACITY);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* drive speaks boring old 28-bit CHS */</div><div class='add'>+		lba = 0;</div><div class='ctx'> 		drive-&gt;capacity64 = drive-&gt;cyl * drive-&gt;head * drive-&gt;sect;</div><div class='ctx'> 	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static sector_t idedisk_capacity(ide_drive_t *drive)</div><div class='del'>-{</div><div class='del'>-	return drive-&gt;capacity64 - drive-&gt;sect0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_IDE_PROC_FS</div><div class='del'>-static int smart_enable(ide_drive_t *drive)</div><div class='del'>-{</div><div class='del'>-	ide_task_t args;</div><div class='del'>-	struct ide_taskfile *tf = &amp;args.tf;</div><div class='del'>-</div><div class='del'>-	memset(&amp;args, 0, sizeof(ide_task_t));</div><div class='del'>-	tf-&gt;feature = SMART_ENABLE;</div><div class='del'>-	tf-&gt;lbam    = SMART_LCYL_PASS;</div><div class='del'>-	tf-&gt;lbah    = SMART_HCYL_PASS;</div><div class='del'>-	tf-&gt;command = WIN_SMART;</div><div class='del'>-	args.tf_flags = IDE_TFLAG_TF | IDE_TFLAG_DEVICE;</div><div class='del'>-	return ide_no_data_taskfile(drive, &amp;args);</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-static int get_smart_data(ide_drive_t *drive, u8 *buf, u8 sub_cmd)</div><div class='del'>-{</div><div class='del'>-	ide_task_t args;</div><div class='del'>-	struct ide_taskfile *tf = &amp;args.tf;</div><div class='del'>-</div><div class='del'>-	memset(&amp;args, 0, sizeof(ide_task_t));</div><div class='del'>-	tf-&gt;feature = sub_cmd;</div><div class='del'>-	tf-&gt;nsect   = 0x01;</div><div class='del'>-	tf-&gt;lbam    = SMART_LCYL_PASS;</div><div class='del'>-	tf-&gt;lbah    = SMART_HCYL_PASS;</div><div class='del'>-	tf-&gt;command = WIN_SMART;</div><div class='del'>-	args.tf_flags	= IDE_TFLAG_TF | IDE_TFLAG_DEVICE;</div><div class='del'>-	args.data_phase	= TASKFILE_IN;</div><div class='del'>-	(void) smart_enable(drive);</div><div class='del'>-	return ide_raw_taskfile(drive, &amp;args, buf, 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int proc_idedisk_read_cache</div><div class='del'>-	(char *page, char **start, off_t off, int count, int *eof, void *data)</div><div class='del'>-{</div><div class='del'>-	ide_drive_t	*drive = (ide_drive_t *) data;</div><div class='del'>-	char		*out = page;</div><div class='del'>-	int		len;</div><div class='add'>+	if (lba) {</div><div class='add'>+		drive-&gt;dev_flags |= IDE_DFLAG_LBA;</div><div class='ctx'> </div><div class='del'>-	if (drive-&gt;id_read)</div><div class='del'>-		len = sprintf(out, "%i\n", drive-&gt;id-&gt;buf_size / 2);</div><div class='del'>-	else</div><div class='del'>-		len = sprintf(out, "(none)\n");</div><div class='del'>-</div><div class='del'>-	PROC_IDE_READ_RETURN(page, start, off, count, eof, len);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int proc_idedisk_read_capacity</div><div class='del'>-	(char *page, char **start, off_t off, int count, int *eof, void *data)</div><div class='del'>-{</div><div class='del'>-	ide_drive_t*drive = (ide_drive_t *)data;</div><div class='del'>-	int len;</div><div class='del'>-</div><div class='del'>-	len = sprintf(page, "%llu\n", (long long)idedisk_capacity(drive));</div><div class='del'>-</div><div class='del'>-	PROC_IDE_READ_RETURN(page, start, off, count, eof, len);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int proc_idedisk_read_smart(char *page, char **start, off_t off,</div><div class='del'>-				   int count, int *eof, void *data, u8 sub_cmd)</div><div class='del'>-{</div><div class='del'>-	ide_drive_t	*drive = (ide_drive_t *)data;</div><div class='del'>-	int		len = 0, i = 0;</div><div class='del'>-</div><div class='del'>-	if (get_smart_data(drive, page, sub_cmd) == 0) {</div><div class='del'>-		unsigned short *val = (unsigned short *) page;</div><div class='del'>-		char *out = ((char *)val) + (SECTOR_WORDS * 4);</div><div class='del'>-		page = out;</div><div class='del'>-		do {</div><div class='del'>-			out += sprintf(out, "%04x%c", le16_to_cpu(*val),</div><div class='del'>-				       (++i &amp; 7) ? ' ' : '\n');</div><div class='del'>-			val += 1;</div><div class='del'>-		} while (i &lt; (SECTOR_WORDS * 2));</div><div class='del'>-		len = out - page;</div><div class='add'>+		/*</div><div class='add'>+		* If this device supports the Host Protected Area feature set,</div><div class='add'>+		* then we may need to change our opinion about its capacity.</div><div class='add'>+		*/</div><div class='add'>+		if (ata_id_hpa_enabled(id))</div><div class='add'>+			idedisk_check_hpa(drive);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	PROC_IDE_READ_RETURN(page, start, off, count, eof, len);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int proc_idedisk_read_sv</div><div class='del'>-	(char *page, char **start, off_t off, int count, int *eof, void *data)</div><div class='del'>-{</div><div class='del'>-	return proc_idedisk_read_smart(page, start, off, count, eof, data,</div><div class='del'>-				       SMART_READ_VALUES);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int proc_idedisk_read_st</div><div class='del'>-	(char *page, char **start, off_t off, int count, int *eof, void *data)</div><div class='add'>+sector_t ide_disk_capacity(ide_drive_t *drive)</div><div class='ctx'> {</div><div class='del'>-	return proc_idedisk_read_smart(page, start, off, count, eof, data,</div><div class='del'>-				       SMART_READ_THRESHOLDS);</div><div class='add'>+	return drive-&gt;capacity64;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ide_proc_entry_t idedisk_proc[] = {</div><div class='del'>-	{ "cache",	  S_IFREG|S_IRUGO, proc_idedisk_read_cache,    NULL },</div><div class='del'>-	{ "capacity",	  S_IFREG|S_IRUGO, proc_idedisk_read_capacity, NULL },</div><div class='del'>-	{ "geometry",	  S_IFREG|S_IRUGO, proc_ide_read_geometry,     NULL },</div><div class='del'>-	{ "smart_values", S_IFREG|S_IRUSR, proc_idedisk_read_sv,       NULL },</div><div class='del'>-	{ "smart_thresholds", S_IFREG|S_IRUSR, proc_idedisk_read_st,   NULL },</div><div class='del'>-	{ NULL, 0, NULL, NULL }</div><div class='del'>-};</div><div class='del'>-#endif	/* CONFIG_IDE_PROC_FS */</div><div class='del'>-</div><div class='ctx'> static void idedisk_prepare_flush(struct request_queue *q, struct request *rq)</div><div class='ctx'> {</div><div class='ctx'> 	ide_drive_t *drive = q-&gt;queuedata;</div><div class='hunk'>@@ -589,11 +419,11 @@ static void idedisk_prepare_flush(struct request_queue *q, struct request *rq)</div><div class='ctx'> 	BUG_ON(task == NULL);</div><div class='ctx'> </div><div class='ctx'> 	memset(task, 0, sizeof(*task));</div><div class='del'>-	if (ide_id_has_flush_cache_ext(drive-&gt;id) &amp;&amp;</div><div class='add'>+	if (ata_id_flush_ext_enabled(drive-&gt;id) &amp;&amp;</div><div class='ctx'> 	    (drive-&gt;capacity64 &gt;= (1UL &lt;&lt; 28)))</div><div class='del'>-		task-&gt;tf.command = WIN_FLUSH_CACHE_EXT;</div><div class='add'>+		task-&gt;tf.command = ATA_CMD_FLUSH_EXT;</div><div class='ctx'> 	else</div><div class='del'>-		task-&gt;tf.command = WIN_FLUSH_CACHE;</div><div class='add'>+		task-&gt;tf.command = ATA_CMD_FLUSH;</div><div class='ctx'> 	task-&gt;tf_flags	 = IDE_TFLAG_OUT_TF | IDE_TFLAG_OUT_DEVICE |</div><div class='ctx'> 			   IDE_TFLAG_DYN;</div><div class='ctx'> 	task-&gt;data_phase = TASKFILE_NO_DATA;</div><div class='hunk'>@@ -603,6 +433,8 @@ static void idedisk_prepare_flush(struct request_queue *q, struct request *rq)</div><div class='ctx'> 	rq-&gt;special = task;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+ide_devset_get(multcount, mult_count);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * This is tightly woven into the driver-&gt;do_special can not touch.</div><div class='ctx'>  * DON'T do it again until a total personality rewrite is committed.</div><div class='hunk'>@@ -612,7 +444,7 @@ static int set_multcount(ide_drive_t *drive, int arg)</div><div class='ctx'> 	struct request *rq;</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='del'>-	if (arg &lt; 0 || arg &gt; drive-&gt;id-&gt;max_multsect)</div><div class='add'>+	if (arg &lt; 0 || arg &gt; (drive-&gt;id[ATA_ID_MAX_MULTSECT] &amp; 0xff))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (drive-&gt;special.b.set_multmode)</div><div class='hunk'>@@ -629,26 +461,43 @@ static int set_multcount(ide_drive_t *drive, int arg)</div><div class='ctx'> 	return (drive-&gt;mult_count == arg) ? 0 : -EIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+ide_devset_get_flag(nowerr, IDE_DFLAG_NOWERR);</div><div class='add'>+</div><div class='ctx'> static int set_nowerr(ide_drive_t *drive, int arg)</div><div class='ctx'> {</div><div class='ctx'> 	if (arg &lt; 0 || arg &gt; 1)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (ide_spin_wait_hwgroup(drive))</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	drive-&gt;nowerr = arg;</div><div class='add'>+	if (arg)</div><div class='add'>+		drive-&gt;dev_flags |= IDE_DFLAG_NOWERR;</div><div class='add'>+	else</div><div class='add'>+		drive-&gt;dev_flags &amp;= ~IDE_DFLAG_NOWERR;</div><div class='add'>+</div><div class='ctx'> 	drive-&gt;bad_wstat = arg ? BAD_R_STAT : BAD_W_STAT;</div><div class='del'>-	spin_unlock_irq(&amp;ide_lock);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int ide_do_setfeature(ide_drive_t *drive, u8 feature, u8 nsect)</div><div class='add'>+{</div><div class='add'>+	ide_task_t task;</div><div class='add'>+</div><div class='add'>+	memset(&amp;task, 0, sizeof(task));</div><div class='add'>+	task.tf.feature = feature;</div><div class='add'>+	task.tf.nsect   = nsect;</div><div class='add'>+	task.tf.command = ATA_CMD_SET_FEATURES;</div><div class='add'>+	task.tf_flags = IDE_TFLAG_TF | IDE_TFLAG_DEVICE;</div><div class='add'>+</div><div class='add'>+	return ide_no_data_taskfile(drive, &amp;task);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void update_ordered(ide_drive_t *drive)</div><div class='ctx'> {</div><div class='del'>-	struct hd_driveid *id = drive-&gt;id;</div><div class='add'>+	u16 *id = drive-&gt;id;</div><div class='ctx'> 	unsigned ordered = QUEUE_ORDERED_NONE;</div><div class='ctx'> 	prepare_flush_fn *prep_fn = NULL;</div><div class='ctx'> </div><div class='del'>-	if (drive-&gt;wcache) {</div><div class='add'>+	if (drive-&gt;dev_flags &amp; IDE_DFLAG_WCACHE) {</div><div class='ctx'> 		unsigned long long capacity;</div><div class='ctx'> 		int barrier;</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -659,10 +508,12 @@ static void update_ordered(ide_drive_t *drive)</div><div class='ctx'> 		 * time we have trimmed the drive capacity if LBA48 is</div><div class='ctx'> 		 * not available so we don't need to recheck that.</div><div class='ctx'> 		 */</div><div class='del'>-		capacity = idedisk_capacity(drive);</div><div class='del'>-		barrier = ide_id_has_flush_cache(id) &amp;&amp; !drive-&gt;noflush &amp;&amp;</div><div class='del'>-			(drive-&gt;addressing == 0 || capacity &lt;= (1ULL &lt;&lt; 28) ||</div><div class='del'>-			 ide_id_has_flush_cache_ext(id));</div><div class='add'>+		capacity = ide_disk_capacity(drive);</div><div class='add'>+		barrier = ata_id_flush_enabled(id) &amp;&amp;</div><div class='add'>+			(drive-&gt;dev_flags &amp; IDE_DFLAG_NOFLUSH) == 0 &amp;&amp;</div><div class='add'>+			((drive-&gt;dev_flags &amp; IDE_DFLAG_LBA48) == 0 ||</div><div class='add'>+			 capacity &lt;= (1ULL &lt;&lt; 28) ||</div><div class='add'>+			 ata_id_flush_ext_enabled(id));</div><div class='ctx'> </div><div class='ctx'> 		printk(KERN_INFO "%s: cache flushes %ssupported\n",</div><div class='ctx'> 		       drive-&gt;name, barrier ? "" : "not ");</div><div class='hunk'>@@ -677,23 +528,24 @@ static void update_ordered(ide_drive_t *drive)</div><div class='ctx'> 	blk_queue_ordered(drive-&gt;queue, ordered, prep_fn);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int write_cache(ide_drive_t *drive, int arg)</div><div class='add'>+ide_devset_get_flag(wcache, IDE_DFLAG_WCACHE);</div><div class='add'>+</div><div class='add'>+static int set_wcache(ide_drive_t *drive, int arg)</div><div class='ctx'> {</div><div class='del'>-	ide_task_t args;</div><div class='ctx'> 	int err = 1;</div><div class='ctx'> </div><div class='ctx'> 	if (arg &lt; 0 || arg &gt; 1)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (ide_id_has_flush_cache(drive-&gt;id)) {</div><div class='del'>-		memset(&amp;args, 0, sizeof(ide_task_t));</div><div class='del'>-		args.tf.feature = arg ?</div><div class='del'>-			SETFEATURES_EN_WCACHE : SETFEATURES_DIS_WCACHE;</div><div class='del'>-		args.tf.command = WIN_SETFEATURES;</div><div class='del'>-		args.tf_flags = IDE_TFLAG_TF | IDE_TFLAG_DEVICE;</div><div class='del'>-		err = ide_no_data_taskfile(drive, &amp;args);</div><div class='del'>-		if (err == 0)</div><div class='del'>-			drive-&gt;wcache = arg;</div><div class='add'>+	if (ata_id_flush_enabled(drive-&gt;id)) {</div><div class='add'>+		err = ide_do_setfeature(drive,</div><div class='add'>+			arg ? SETFEATURES_WC_ON : SETFEATURES_WC_OFF, 0);</div><div class='add'>+		if (err == 0) {</div><div class='add'>+			if (arg)</div><div class='add'>+				drive-&gt;dev_flags |= IDE_DFLAG_WCACHE;</div><div class='add'>+			else</div><div class='add'>+				drive-&gt;dev_flags &amp;= ~IDE_DFLAG_WCACHE;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	update_ordered(drive);</div><div class='hunk'>@@ -706,108 +558,88 @@ static int do_idedisk_flushcache(ide_drive_t *drive)</div><div class='ctx'> 	ide_task_t args;</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;args, 0, sizeof(ide_task_t));</div><div class='del'>-	if (ide_id_has_flush_cache_ext(drive-&gt;id))</div><div class='del'>-		args.tf.command = WIN_FLUSH_CACHE_EXT;</div><div class='add'>+	if (ata_id_flush_ext_enabled(drive-&gt;id))</div><div class='add'>+		args.tf.command = ATA_CMD_FLUSH_EXT;</div><div class='ctx'> 	else</div><div class='del'>-		args.tf.command = WIN_FLUSH_CACHE;</div><div class='add'>+		args.tf.command = ATA_CMD_FLUSH;</div><div class='ctx'> 	args.tf_flags = IDE_TFLAG_TF | IDE_TFLAG_DEVICE;</div><div class='ctx'> 	return ide_no_data_taskfile(drive, &amp;args);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+ide_devset_get(acoustic, acoustic);</div><div class='add'>+</div><div class='ctx'> static int set_acoustic(ide_drive_t *drive, int arg)</div><div class='ctx'> {</div><div class='del'>-	ide_task_t args;</div><div class='del'>-</div><div class='ctx'> 	if (arg &lt; 0 || arg &gt; 254)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	memset(&amp;args, 0, sizeof(ide_task_t));</div><div class='del'>-	args.tf.feature = arg ? SETFEATURES_EN_AAM : SETFEATURES_DIS_AAM;</div><div class='del'>-	args.tf.nsect   = arg;</div><div class='del'>-	args.tf.command = WIN_SETFEATURES;</div><div class='del'>-	args.tf_flags = IDE_TFLAG_TF | IDE_TFLAG_DEVICE;</div><div class='del'>-	ide_no_data_taskfile(drive, &amp;args);</div><div class='add'>+	ide_do_setfeature(drive,</div><div class='add'>+		arg ? SETFEATURES_AAM_ON : SETFEATURES_AAM_OFF, arg);</div><div class='add'>+</div><div class='ctx'> 	drive-&gt;acoustic = arg;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+ide_devset_get_flag(addressing, IDE_DFLAG_LBA48);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * drive-&gt;addressing:</div><div class='ctx'>  *	0: 28-bit</div><div class='ctx'>  *	1: 48-bit</div><div class='ctx'>  *	2: 48-bit capable doing 28-bit</div><div class='ctx'>  */</div><div class='del'>-static int set_lba_addressing(ide_drive_t *drive, int arg)</div><div class='add'>+static int set_addressing(ide_drive_t *drive, int arg)</div><div class='ctx'> {</div><div class='ctx'> 	if (arg &lt; 0 || arg &gt; 2)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	drive-&gt;addressing =  0;</div><div class='add'>+	if (arg &amp;&amp; ((drive-&gt;hwif-&gt;host_flags &amp; IDE_HFLAG_NO_LBA48) ||</div><div class='add'>+	    ata_id_lba48_enabled(drive-&gt;id) == 0))</div><div class='add'>+		return -EIO;</div><div class='ctx'> </div><div class='del'>-	if (drive-&gt;hwif-&gt;host_flags &amp; IDE_HFLAG_NO_LBA48)</div><div class='del'>-		return 0;</div><div class='add'>+	if (arg == 2)</div><div class='add'>+		arg = 0;</div><div class='add'>+</div><div class='add'>+	if (arg)</div><div class='add'>+		drive-&gt;dev_flags |= IDE_DFLAG_LBA48;</div><div class='add'>+	else</div><div class='add'>+		drive-&gt;dev_flags &amp;= ~IDE_DFLAG_LBA48;</div><div class='ctx'> </div><div class='del'>-	if (!idedisk_supports_lba48(drive-&gt;id))</div><div class='del'>-		return -EIO;</div><div class='del'>-	drive-&gt;addressing = arg;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_IDE_PROC_FS</div><div class='del'>-static void idedisk_add_settings(ide_drive_t *drive)</div><div class='del'>-{</div><div class='del'>-	struct hd_driveid *id = drive-&gt;id;</div><div class='del'>-</div><div class='del'>-	ide_add_setting(drive, "bios_cyl", SETTING_RW, TYPE_INT, 0, 65535, 1, 1,</div><div class='del'>-			&amp;drive-&gt;bios_cyl, NULL);</div><div class='del'>-	ide_add_setting(drive, "bios_head", SETTING_RW, TYPE_BYTE, 0, 255, 1, 1,</div><div class='del'>-			&amp;drive-&gt;bios_head, NULL);</div><div class='del'>-	ide_add_setting(drive, "bios_sect", SETTING_RW, TYPE_BYTE, 0, 63, 1, 1,</div><div class='del'>-			&amp;drive-&gt;bios_sect, NULL);</div><div class='del'>-	ide_add_setting(drive, "address", SETTING_RW, TYPE_BYTE, 0, 2, 1, 1,</div><div class='del'>-			&amp;drive-&gt;addressing, set_lba_addressing);</div><div class='del'>-	ide_add_setting(drive, "multcount", SETTING_RW, TYPE_BYTE, 0,</div><div class='del'>-			id-&gt;max_multsect, 1, 1, &amp;drive-&gt;mult_count,</div><div class='del'>-			set_multcount);</div><div class='del'>-	ide_add_setting(drive, "nowerr", SETTING_RW, TYPE_BYTE, 0, 1, 1, 1,</div><div class='del'>-			&amp;drive-&gt;nowerr, set_nowerr);</div><div class='del'>-	ide_add_setting(drive, "lun", SETTING_RW, TYPE_INT, 0, 7, 1, 1,</div><div class='del'>-			&amp;drive-&gt;lun, NULL);</div><div class='del'>-	ide_add_setting(drive, "wcache", SETTING_RW, TYPE_BYTE, 0, 1, 1, 1,</div><div class='del'>-			&amp;drive-&gt;wcache, write_cache);</div><div class='del'>-	ide_add_setting(drive, "acoustic", SETTING_RW, TYPE_BYTE, 0, 254, 1, 1,</div><div class='del'>-			&amp;drive-&gt;acoustic, set_acoustic);</div><div class='del'>-	ide_add_setting(drive, "failures", SETTING_RW, TYPE_INT, 0, 65535, 1, 1,</div><div class='del'>-			&amp;drive-&gt;failures, NULL);</div><div class='del'>-	ide_add_setting(drive, "max_failures", SETTING_RW, TYPE_INT, 0, 65535,</div><div class='del'>-			1, 1, &amp;drive-&gt;max_failures, NULL);</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-static inline void idedisk_add_settings(ide_drive_t *drive) { ; }</div><div class='del'>-#endif</div><div class='add'>+ide_ext_devset_rw(acoustic, acoustic);</div><div class='add'>+ide_ext_devset_rw(address, addressing);</div><div class='add'>+ide_ext_devset_rw(multcount, multcount);</div><div class='add'>+ide_ext_devset_rw(wcache, wcache);</div><div class='add'>+</div><div class='add'>+ide_ext_devset_rw_sync(nowerr, nowerr);</div><div class='ctx'> </div><div class='ctx'> static void idedisk_setup(ide_drive_t *drive)</div><div class='ctx'> {</div><div class='add'>+	struct ide_disk_obj *idkp = drive-&gt;driver_data;</div><div class='ctx'> 	ide_hwif_t *hwif = drive-&gt;hwif;</div><div class='del'>-	struct hd_driveid *id = drive-&gt;id;</div><div class='add'>+	u16 *id = drive-&gt;id;</div><div class='add'>+	char *m = (char *)&amp;id[ATA_ID_PROD];</div><div class='ctx'> 	unsigned long long capacity;</div><div class='ctx'> </div><div class='del'>-	idedisk_add_settings(drive);</div><div class='add'>+	ide_proc_register_driver(drive, idkp-&gt;driver);</div><div class='ctx'> </div><div class='del'>-	if (drive-&gt;id_read == 0)</div><div class='add'>+	if ((drive-&gt;dev_flags &amp; IDE_DFLAG_ID_READ) == 0)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (drive-&gt;removable) {</div><div class='add'>+	if (drive-&gt;dev_flags &amp; IDE_DFLAG_REMOVABLE) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Removable disks (eg. SYQUEST); ignore 'WD' drives</div><div class='ctx'> 		 */</div><div class='del'>-		if (id-&gt;model[0] != 'W' || id-&gt;model[1] != 'D')</div><div class='del'>-			drive-&gt;doorlocking = 1;</div><div class='add'>+		if (m[0] != 'W' || m[1] != 'D')</div><div class='add'>+			drive-&gt;dev_flags |= IDE_DFLAG_DOORLOCKING;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	(void)set_lba_addressing(drive, 1);</div><div class='add'>+	(void)set_addressing(drive, 1);</div><div class='ctx'> </div><div class='del'>-	if (drive-&gt;addressing == 1) {</div><div class='add'>+	if (drive-&gt;dev_flags &amp; IDE_DFLAG_LBA48) {</div><div class='ctx'> 		int max_s = 2048;</div><div class='ctx'> </div><div class='ctx'> 		if (max_s &gt; hwif-&gt;rqsize)</div><div class='hunk'>@@ -823,7 +655,8 @@ static void idedisk_setup(ide_drive_t *drive)</div><div class='ctx'> 	init_idedisk_capacity(drive);</div><div class='ctx'> </div><div class='ctx'> 	/* limit drive capacity to 137GB if LBA48 cannot be used */</div><div class='del'>-	if (drive-&gt;addressing == 0 &amp;&amp; drive-&gt;capacity64 &gt; 1ULL &lt;&lt; 28) {</div><div class='add'>+	if ((drive-&gt;dev_flags &amp; IDE_DFLAG_LBA48) == 0 &amp;&amp;</div><div class='add'>+	    drive-&gt;capacity64 &gt; 1ULL &lt;&lt; 28) {</div><div class='ctx'> 		printk(KERN_WARNING "%s: cannot use LBA48 - full capacity "</div><div class='ctx'> 		       "%llu sectors (%llu MB)\n",</div><div class='ctx'> 		       drive-&gt;name, (unsigned long long)drive-&gt;capacity64,</div><div class='hunk'>@@ -831,24 +664,24 @@ static void idedisk_setup(ide_drive_t *drive)</div><div class='ctx'> 		drive-&gt;capacity64 = 1ULL &lt;&lt; 28;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((hwif-&gt;host_flags &amp; IDE_HFLAG_NO_LBA48_DMA) &amp;&amp; drive-&gt;addressing) {</div><div class='add'>+	if ((hwif-&gt;host_flags &amp; IDE_HFLAG_NO_LBA48_DMA) &amp;&amp;</div><div class='add'>+	    (drive-&gt;dev_flags &amp; IDE_DFLAG_LBA48)) {</div><div class='ctx'> 		if (drive-&gt;capacity64 &gt; 1ULL &lt;&lt; 28) {</div><div class='ctx'> 			printk(KERN_INFO "%s: cannot use LBA48 DMA - PIO mode"</div><div class='ctx'> 					 " will be used for accessing sectors "</div><div class='ctx'> 					 "&gt; %u\n", drive-&gt;name, 1 &lt;&lt; 28);</div><div class='ctx'> 		} else</div><div class='del'>-			drive-&gt;addressing = 0;</div><div class='add'>+			drive-&gt;dev_flags &amp;= ~IDE_DFLAG_LBA48;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * if possible, give fdisk access to more of the drive,</div><div class='ctx'> 	 * by correcting bios_cyls:</div><div class='ctx'> 	 */</div><div class='del'>-	capacity = idedisk_capacity(drive);</div><div class='del'>-</div><div class='del'>-	if (!drive-&gt;forced_geom) {</div><div class='add'>+	capacity = ide_disk_capacity(drive);</div><div class='ctx'> </div><div class='del'>-		if (idedisk_supports_lba48(drive-&gt;id)) {</div><div class='add'>+	if ((drive-&gt;dev_flags &amp; IDE_DFLAG_FORCED_GEOM) == 0) {</div><div class='add'>+		if (ata_id_lba48_enabled(drive-&gt;id)) {</div><div class='ctx'> 			/* compatibility */</div><div class='ctx'> 			drive-&gt;bios_sect = 63;</div><div class='ctx'> 			drive-&gt;bios_head = 255;</div><div class='hunk'>@@ -874,22 +707,23 @@ static void idedisk_setup(ide_drive_t *drive)</div><div class='ctx'> 			 drive-&gt;name, capacity, sectors_to_MB(capacity));</div><div class='ctx'> </div><div class='ctx'> 	/* Only print cache size when it was specified */</div><div class='del'>-	if (id-&gt;buf_size)</div><div class='del'>-		printk(KERN_CONT " w/%dKiB Cache", id-&gt;buf_size / 2);</div><div class='add'>+	if (id[ATA_ID_BUF_SIZE])</div><div class='add'>+		printk(KERN_CONT " w/%dKiB Cache", id[ATA_ID_BUF_SIZE] / 2);</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_CONT ", CHS=%d/%d/%d\n",</div><div class='ctx'> 			 drive-&gt;bios_cyl, drive-&gt;bios_head, drive-&gt;bios_sect);</div><div class='ctx'> </div><div class='ctx'> 	/* write cache enabled? */</div><div class='del'>-	if ((id-&gt;csfo &amp; 1) || (id-&gt;cfs_enable_1 &amp; (1 &lt;&lt; 5)))</div><div class='del'>-		drive-&gt;wcache = 1;</div><div class='add'>+	if ((id[ATA_ID_CSFO] &amp; 1) || ata_id_wcache_enabled(id))</div><div class='add'>+		drive-&gt;dev_flags |= IDE_DFLAG_WCACHE;</div><div class='ctx'> </div><div class='del'>-	write_cache(drive, 1);</div><div class='add'>+	set_wcache(drive, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ide_cacheflush_p(ide_drive_t *drive)</div><div class='ctx'> {</div><div class='del'>-	if (!drive-&gt;wcache || !ide_id_has_flush_cache(drive-&gt;id))</div><div class='add'>+	if (ata_id_flush_enabled(drive-&gt;id) == 0 ||</div><div class='add'>+	    (drive-&gt;dev_flags &amp; IDE_DFLAG_WCACHE) == 0)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (do_idedisk_flushcache(drive))</div><div class='hunk'>@@ -931,7 +765,7 @@ static int ide_disk_probe(ide_drive_t *drive);</div><div class='ctx'>  */</div><div class='ctx'> static void ide_disk_resume(ide_drive_t *drive)</div><div class='ctx'> {</div><div class='del'>-	if (idedisk_supports_hpa(drive-&gt;id))</div><div class='add'>+	if (ata_id_hpa_enabled(drive-&gt;id))</div><div class='ctx'> 		init_idedisk_capacity(drive);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -973,13 +807,12 @@ static ide_driver_t idedisk_driver = {</div><div class='ctx'> 	.resume			= ide_disk_resume,</div><div class='ctx'> 	.shutdown		= ide_device_shutdown,</div><div class='ctx'> 	.version		= IDEDISK_VERSION,</div><div class='del'>-	.media			= ide_disk,</div><div class='del'>-	.supports_dsc_overlap	= 0,</div><div class='ctx'> 	.do_request		= ide_do_rw_disk,</div><div class='ctx'> 	.end_request		= ide_end_request,</div><div class='ctx'> 	.error			= __ide_error,</div><div class='ctx'> #ifdef CONFIG_IDE_PROC_FS</div><div class='del'>-	.proc			= idedisk_proc,</div><div class='add'>+	.proc			= ide_disk_proc,</div><div class='add'>+	.settings		= ide_disk_settings,</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -988,7 +821,7 @@ static int idedisk_set_doorlock(ide_drive_t *drive, int on)</div><div class='ctx'> 	ide_task_t task;</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;task, 0, sizeof(task));</div><div class='del'>-	task.tf.command = on ? WIN_DOORLOCK : WIN_DOORUNLOCK;</div><div class='add'>+	task.tf.command = on ? ATA_CMD_MEDIA_LOCK : ATA_CMD_MEDIA_UNLOCK;</div><div class='ctx'> 	task.tf_flags = IDE_TFLAG_TF | IDE_TFLAG_DEVICE;</div><div class='ctx'> </div><div class='ctx'> 	return ide_no_data_taskfile(drive, &amp;task);</div><div class='hunk'>@@ -1008,15 +841,16 @@ static int idedisk_open(struct inode *inode, struct file *filp)</div><div class='ctx'> </div><div class='ctx'> 	idkp-&gt;openers++;</div><div class='ctx'> </div><div class='del'>-	if (drive-&gt;removable &amp;&amp; idkp-&gt;openers == 1) {</div><div class='add'>+	if ((drive-&gt;dev_flags &amp; IDE_DFLAG_REMOVABLE) &amp;&amp; idkp-&gt;openers == 1) {</div><div class='ctx'> 		check_disk_change(inode-&gt;i_bdev);</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Ignore the return code from door_lock,</div><div class='ctx'> 		 * since the open() has already succeeded,</div><div class='ctx'> 		 * and the door_lock is irrelevant at this point.</div><div class='ctx'> 		 */</div><div class='del'>-		if (drive-&gt;doorlocking &amp;&amp; idedisk_set_doorlock(drive, 1))</div><div class='del'>-			drive-&gt;doorlocking = 0;</div><div class='add'>+		if ((drive-&gt;dev_flags &amp; IDE_DFLAG_DOORLOCKING) &amp;&amp;</div><div class='add'>+		    idedisk_set_doorlock(drive, 1))</div><div class='add'>+			drive-&gt;dev_flags &amp;= ~IDE_DFLAG_DOORLOCKING;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1030,9 +864,10 @@ static int idedisk_release(struct inode *inode, struct file *filp)</div><div class='ctx'> 	if (idkp-&gt;openers == 1)</div><div class='ctx'> 		ide_cacheflush_p(drive);</div><div class='ctx'> </div><div class='del'>-	if (drive-&gt;removable &amp;&amp; idkp-&gt;openers == 1) {</div><div class='del'>-		if (drive-&gt;doorlocking &amp;&amp; idedisk_set_doorlock(drive, 0))</div><div class='del'>-			drive-&gt;doorlocking = 0;</div><div class='add'>+	if ((drive-&gt;dev_flags &amp; IDE_DFLAG_REMOVABLE) &amp;&amp; idkp-&gt;openers == 1) {</div><div class='add'>+		if ((drive-&gt;dev_flags &amp; IDE_DFLAG_DOORLOCKING) &amp;&amp;</div><div class='add'>+		    idedisk_set_doorlock(drive, 0))</div><div class='add'>+			drive-&gt;dev_flags &amp;= ~IDE_DFLAG_DOORLOCKING;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	idkp-&gt;openers--;</div><div class='hunk'>@@ -1053,72 +888,25 @@ static int idedisk_getgeo(struct block_device *bdev, struct hd_geometry *geo)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int idedisk_ioctl(struct inode *inode, struct file *file,</div><div class='del'>-			unsigned int cmd, unsigned long arg)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	struct block_device *bdev = inode-&gt;i_bdev;</div><div class='del'>-	struct ide_disk_obj *idkp = ide_disk_g(bdev-&gt;bd_disk);</div><div class='del'>-	ide_drive_t *drive = idkp-&gt;drive;</div><div class='del'>-	int err, (*setfunc)(ide_drive_t *, int);</div><div class='del'>-	u8 *val;</div><div class='del'>-</div><div class='del'>-	switch (cmd) {</div><div class='del'>-	case HDIO_GET_ADDRESS:	 val = &amp;drive-&gt;addressing;	goto read_val;</div><div class='del'>-	case HDIO_GET_MULTCOUNT: val = &amp;drive-&gt;mult_count;	goto read_val;</div><div class='del'>-	case HDIO_GET_NOWERR:	 val = &amp;drive-&gt;nowerr;		goto read_val;</div><div class='del'>-	case HDIO_GET_WCACHE:	 val = &amp;drive-&gt;wcache;		goto read_val;</div><div class='del'>-	case HDIO_GET_ACOUSTIC:	 val = &amp;drive-&gt;acoustic;	goto read_val;</div><div class='del'>-	case HDIO_SET_ADDRESS:	 setfunc = set_lba_addressing;	goto set_val;</div><div class='del'>-	case HDIO_SET_MULTCOUNT: setfunc = set_multcount;	goto set_val;</div><div class='del'>-	case HDIO_SET_NOWERR:	 setfunc = set_nowerr;		goto set_val;</div><div class='del'>-	case HDIO_SET_WCACHE:	 setfunc = write_cache;		goto set_val;</div><div class='del'>-	case HDIO_SET_ACOUSTIC:	 setfunc = set_acoustic;	goto set_val;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return generic_ide_ioctl(drive, file, bdev, cmd, arg);</div><div class='del'>-</div><div class='del'>-read_val:</div><div class='del'>-	mutex_lock(&amp;ide_setting_mtx);</div><div class='del'>-	spin_lock_irqsave(&amp;ide_lock, flags);</div><div class='del'>-	err = *val;</div><div class='del'>-	spin_unlock_irqrestore(&amp;ide_lock, flags);</div><div class='del'>-	mutex_unlock(&amp;ide_setting_mtx);</div><div class='del'>-	return err &gt;= 0 ? put_user(err, (long __user *)arg) : err;</div><div class='del'>-</div><div class='del'>-set_val:</div><div class='del'>-	if (bdev != bdev-&gt;bd_contains)</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-	else {</div><div class='del'>-		if (!capable(CAP_SYS_ADMIN))</div><div class='del'>-			err = -EACCES;</div><div class='del'>-		else {</div><div class='del'>-			mutex_lock(&amp;ide_setting_mtx);</div><div class='del'>-			err = setfunc(drive, arg);</div><div class='del'>-			mutex_unlock(&amp;ide_setting_mtx);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int idedisk_media_changed(struct gendisk *disk)</div><div class='ctx'> {</div><div class='ctx'> 	struct ide_disk_obj *idkp = ide_disk_g(disk);</div><div class='ctx'> 	ide_drive_t *drive = idkp-&gt;drive;</div><div class='ctx'> </div><div class='ctx'> 	/* do not scan partitions twice if this is a removable device */</div><div class='del'>-	if (drive-&gt;attach) {</div><div class='del'>-		drive-&gt;attach = 0;</div><div class='add'>+	if (drive-&gt;dev_flags &amp; IDE_DFLAG_ATTACH) {</div><div class='add'>+		drive-&gt;dev_flags &amp;= ~IDE_DFLAG_ATTACH;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	/* if removable, always assume it was changed */</div><div class='del'>-	return drive-&gt;removable;</div><div class='add'>+	return !!(drive-&gt;dev_flags &amp; IDE_DFLAG_REMOVABLE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int idedisk_revalidate_disk(struct gendisk *disk)</div><div class='ctx'> {</div><div class='ctx'> 	struct ide_disk_obj *idkp = ide_disk_g(disk);</div><div class='del'>-	set_capacity(disk, idedisk_capacity(idkp-&gt;drive));</div><div class='add'>+	set_capacity(disk, ide_disk_capacity(idkp-&gt;drive));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1126,7 +914,7 @@ static struct block_device_operations idedisk_ops = {</div><div class='ctx'> 	.owner			= THIS_MODULE,</div><div class='ctx'> 	.open			= idedisk_open,</div><div class='ctx'> 	.release		= idedisk_release,</div><div class='del'>-	.ioctl			= idedisk_ioctl,</div><div class='add'>+	.ioctl			= ide_disk_ioctl,</div><div class='ctx'> 	.getgeo			= idedisk_getgeo,</div><div class='ctx'> 	.media_changed		= idedisk_media_changed,</div><div class='ctx'> 	.revalidate_disk	= idedisk_revalidate_disk</div><div class='hunk'>@@ -1142,8 +930,7 @@ static int ide_disk_probe(ide_drive_t *drive)</div><div class='ctx'> 	/* strstr("foo", "") is non-NULL */</div><div class='ctx'> 	if (!strstr("ide-disk", drive-&gt;driver_req))</div><div class='ctx'> 		goto failed;</div><div class='del'>-	if (!drive-&gt;present)</div><div class='del'>-		goto failed;</div><div class='add'>+</div><div class='ctx'> 	if (drive-&gt;media != ide_disk)</div><div class='ctx'> 		goto failed;</div><div class='ctx'> </div><div class='hunk'>@@ -1151,15 +938,12 @@ static int ide_disk_probe(ide_drive_t *drive)</div><div class='ctx'> 	if (!idkp)</div><div class='ctx'> 		goto failed;</div><div class='ctx'> </div><div class='del'>-	g = alloc_disk_node(1 &lt;&lt; PARTN_BITS,</div><div class='del'>-			hwif_to_node(drive-&gt;hwif));</div><div class='add'>+	g = alloc_disk_node(IDE_DISK_MINORS, hwif_to_node(drive-&gt;hwif));</div><div class='ctx'> 	if (!g)</div><div class='ctx'> 		goto out_free_idkp;</div><div class='ctx'> </div><div class='ctx'> 	ide_init_disk(g, drive);</div><div class='ctx'> </div><div class='del'>-	ide_proc_register_driver(drive, &amp;idedisk_driver);</div><div class='del'>-</div><div class='ctx'> 	kref_init(&amp;idkp-&gt;kref);</div><div class='ctx'> </div><div class='ctx'> 	idkp-&gt;drive = drive;</div><div class='hunk'>@@ -1171,17 +955,20 @@ static int ide_disk_probe(ide_drive_t *drive)</div><div class='ctx'> 	drive-&gt;driver_data = idkp;</div><div class='ctx'> </div><div class='ctx'> 	idedisk_setup(drive);</div><div class='del'>-	if ((!drive-&gt;head || drive-&gt;head &gt; 16) &amp;&amp; !drive-&gt;select.b.lba) {</div><div class='add'>+	if ((drive-&gt;dev_flags &amp; IDE_DFLAG_LBA) == 0 &amp;&amp;</div><div class='add'>+	    (drive-&gt;head == 0 || drive-&gt;head &gt; 16)) {</div><div class='ctx'> 		printk(KERN_ERR "%s: INVALID GEOMETRY: %d PHYSICAL HEADS?\n",</div><div class='ctx'> 			drive-&gt;name, drive-&gt;head);</div><div class='del'>-		drive-&gt;attach = 0;</div><div class='add'>+		drive-&gt;dev_flags &amp;= ~IDE_DFLAG_ATTACH;</div><div class='ctx'> 	} else</div><div class='del'>-		drive-&gt;attach = 1;</div><div class='add'>+		drive-&gt;dev_flags |= IDE_DFLAG_ATTACH;</div><div class='ctx'> </div><div class='del'>-	g-&gt;minors = 1 &lt;&lt; PARTN_BITS;</div><div class='add'>+	g-&gt;minors = IDE_DISK_MINORS;</div><div class='ctx'> 	g-&gt;driverfs_dev = &amp;drive-&gt;gendev;</div><div class='del'>-	g-&gt;flags = drive-&gt;removable ? GENHD_FL_REMOVABLE : 0;</div><div class='del'>-	set_capacity(g, idedisk_capacity(drive));</div><div class='add'>+	g-&gt;flags |= GENHD_FL_EXT_DEVT;</div><div class='add'>+	if (drive-&gt;dev_flags &amp; IDE_DFLAG_REMOVABLE)</div><div class='add'>+		g-&gt;flags = GENHD_FL_REMOVABLE;</div><div class='add'>+	set_capacity(g, ide_disk_capacity(drive));</div><div class='ctx'> 	g-&gt;fops = &amp;idedisk_ops;</div><div class='ctx'> 	add_disk(g);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1203,6 +990,7 @@ static int __init idedisk_init(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> MODULE_ALIAS("ide:*m-disk*");</div><div class='add'>+MODULE_ALIAS("ide-disk");</div><div class='ctx'> module_init(idedisk_init);</div><div class='ctx'> module_exit(idedisk_exit);</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/ide/ide-disk.h b/drivers/ide/ide-disk.h<br/>new file mode 100644<br/>index 000000000000..a82fa4355665<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/ide-disk.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/ide-disk.h</a></div><div class='hunk'>@@ -0,0 +1,32 @@</div><div class='add'>+#ifndef __IDE_DISK_H</div><div class='add'>+#define __IDE_DISK_H</div><div class='add'>+</div><div class='add'>+struct ide_disk_obj {</div><div class='add'>+	ide_drive_t	*drive;</div><div class='add'>+	ide_driver_t	*driver;</div><div class='add'>+	struct gendisk	*disk;</div><div class='add'>+	struct kref	kref;</div><div class='add'>+	unsigned int	openers;	/* protected by BKL for now */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define ide_disk_g(disk) \</div><div class='add'>+	container_of((disk)-&gt;private_data, struct ide_disk_obj, driver)</div><div class='add'>+</div><div class='add'>+/* ide-disk.c */</div><div class='add'>+sector_t ide_disk_capacity(ide_drive_t *);</div><div class='add'>+ide_decl_devset(address);</div><div class='add'>+ide_decl_devset(multcount);</div><div class='add'>+ide_decl_devset(nowerr);</div><div class='add'>+ide_decl_devset(wcache);</div><div class='add'>+ide_decl_devset(acoustic);</div><div class='add'>+</div><div class='add'>+/* ide-disk_ioctl.c */</div><div class='add'>+int ide_disk_ioctl(struct inode *, struct file *, unsigned int, unsigned long);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_IDE_PROC_FS</div><div class='add'>+/* ide-disk_proc.c */</div><div class='add'>+extern ide_proc_entry_t ide_disk_proc[];</div><div class='add'>+extern const struct ide_proc_devset ide_disk_settings[];</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif /* __IDE_DISK_H */</div><div class='head'>diff --git a/drivers/ide/ide-disk_ioctl.c b/drivers/ide/ide-disk_ioctl.c<br/>new file mode 100644<br/>index 000000000000..a6cf1a03a806<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/ide-disk_ioctl.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/ide-disk_ioctl.c</a></div><div class='hunk'>@@ -0,0 +1,29 @@</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/ide.h&gt;</div><div class='add'>+#include &lt;linux/hdreg.h&gt;</div><div class='add'>+</div><div class='add'>+#include "ide-disk.h"</div><div class='add'>+</div><div class='add'>+static const struct ide_ioctl_devset ide_disk_ioctl_settings[] = {</div><div class='add'>+{ HDIO_GET_ADDRESS,	HDIO_SET_ADDRESS,   &amp;ide_devset_address   },</div><div class='add'>+{ HDIO_GET_MULTCOUNT,	HDIO_SET_MULTCOUNT, &amp;ide_devset_multcount },</div><div class='add'>+{ HDIO_GET_NOWERR,	HDIO_SET_NOWERR,    &amp;ide_devset_nowerr	  },</div><div class='add'>+{ HDIO_GET_WCACHE,	HDIO_SET_WCACHE,    &amp;ide_devset_wcache	  },</div><div class='add'>+{ HDIO_GET_ACOUSTIC,	HDIO_SET_ACOUSTIC,  &amp;ide_devset_acoustic  },</div><div class='add'>+{ 0 }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int ide_disk_ioctl(struct inode *inode, struct file *file,</div><div class='add'>+		   unsigned int cmd, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	struct block_device *bdev = inode-&gt;i_bdev;</div><div class='add'>+	struct ide_disk_obj *idkp = ide_disk_g(bdev-&gt;bd_disk);</div><div class='add'>+	ide_drive_t *drive = idkp-&gt;drive;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = ide_setting_ioctl(drive, bdev, cmd, arg, ide_disk_ioctl_settings);</div><div class='add'>+	if (err != -EOPNOTSUPP)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return generic_ide_ioctl(drive, file, bdev, cmd, arg);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/ide/ide-disk_proc.c b/drivers/ide/ide-disk_proc.c<br/>new file mode 100644<br/>index 000000000000..4724976afe71<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/ide-disk_proc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/ide-disk_proc.c</a></div><div class='hunk'>@@ -0,0 +1,129 @@</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/ide.h&gt;</div><div class='add'>+#include &lt;linux/hdreg.h&gt;</div><div class='add'>+</div><div class='add'>+#include "ide-disk.h"</div><div class='add'>+</div><div class='add'>+static int smart_enable(ide_drive_t *drive)</div><div class='add'>+{</div><div class='add'>+	ide_task_t args;</div><div class='add'>+	struct ide_taskfile *tf = &amp;args.tf;</div><div class='add'>+</div><div class='add'>+	memset(&amp;args, 0, sizeof(ide_task_t));</div><div class='add'>+	tf-&gt;feature = ATA_SMART_ENABLE;</div><div class='add'>+	tf-&gt;lbam    = ATA_SMART_LBAM_PASS;</div><div class='add'>+	tf-&gt;lbah    = ATA_SMART_LBAH_PASS;</div><div class='add'>+	tf-&gt;command = ATA_CMD_SMART;</div><div class='add'>+	args.tf_flags = IDE_TFLAG_TF | IDE_TFLAG_DEVICE;</div><div class='add'>+	return ide_no_data_taskfile(drive, &amp;args);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int get_smart_data(ide_drive_t *drive, u8 *buf, u8 sub_cmd)</div><div class='add'>+{</div><div class='add'>+	ide_task_t args;</div><div class='add'>+	struct ide_taskfile *tf = &amp;args.tf;</div><div class='add'>+</div><div class='add'>+	memset(&amp;args, 0, sizeof(ide_task_t));</div><div class='add'>+	tf-&gt;feature = sub_cmd;</div><div class='add'>+	tf-&gt;nsect   = 0x01;</div><div class='add'>+	tf-&gt;lbam    = ATA_SMART_LBAM_PASS;</div><div class='add'>+	tf-&gt;lbah    = ATA_SMART_LBAH_PASS;</div><div class='add'>+	tf-&gt;command = ATA_CMD_SMART;</div><div class='add'>+	args.tf_flags	= IDE_TFLAG_TF | IDE_TFLAG_DEVICE;</div><div class='add'>+	args.data_phase	= TASKFILE_IN;</div><div class='add'>+	(void) smart_enable(drive);</div><div class='add'>+	return ide_raw_taskfile(drive, &amp;args, buf, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int proc_idedisk_read_cache</div><div class='add'>+	(char *page, char **start, off_t off, int count, int *eof, void *data)</div><div class='add'>+{</div><div class='add'>+	ide_drive_t	*drive = (ide_drive_t *) data;</div><div class='add'>+	char		*out = page;</div><div class='add'>+	int		len;</div><div class='add'>+</div><div class='add'>+	if (drive-&gt;dev_flags &amp; IDE_DFLAG_ID_READ)</div><div class='add'>+		len = sprintf(out, "%i\n", drive-&gt;id[ATA_ID_BUF_SIZE] / 2);</div><div class='add'>+	else</div><div class='add'>+		len = sprintf(out, "(none)\n");</div><div class='add'>+</div><div class='add'>+	PROC_IDE_READ_RETURN(page, start, off, count, eof, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int proc_idedisk_read_capacity</div><div class='add'>+	(char *page, char **start, off_t off, int count, int *eof, void *data)</div><div class='add'>+{</div><div class='add'>+	ide_drive_t*drive = (ide_drive_t *)data;</div><div class='add'>+	int len;</div><div class='add'>+</div><div class='add'>+	len = sprintf(page, "%llu\n", (long long)ide_disk_capacity(drive));</div><div class='add'>+</div><div class='add'>+	PROC_IDE_READ_RETURN(page, start, off, count, eof, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int proc_idedisk_read_smart(char *page, char **start, off_t off,</div><div class='add'>+				   int count, int *eof, void *data, u8 sub_cmd)</div><div class='add'>+{</div><div class='add'>+	ide_drive_t	*drive = (ide_drive_t *)data;</div><div class='add'>+	int		len = 0, i = 0;</div><div class='add'>+</div><div class='add'>+	if (get_smart_data(drive, page, sub_cmd) == 0) {</div><div class='add'>+		unsigned short *val = (unsigned short *) page;</div><div class='add'>+		char *out = (char *)val + SECTOR_SIZE;</div><div class='add'>+</div><div class='add'>+		page = out;</div><div class='add'>+		do {</div><div class='add'>+			out += sprintf(out, "%04x%c", le16_to_cpu(*val),</div><div class='add'>+				       (++i &amp; 7) ? ' ' : '\n');</div><div class='add'>+			val += 1;</div><div class='add'>+		} while (i &lt; SECTOR_SIZE / 2);</div><div class='add'>+		len = out - page;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	PROC_IDE_READ_RETURN(page, start, off, count, eof, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int proc_idedisk_read_sv</div><div class='add'>+	(char *page, char **start, off_t off, int count, int *eof, void *data)</div><div class='add'>+{</div><div class='add'>+	return proc_idedisk_read_smart(page, start, off, count, eof, data,</div><div class='add'>+				       ATA_SMART_READ_VALUES);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int proc_idedisk_read_st</div><div class='add'>+	(char *page, char **start, off_t off, int count, int *eof, void *data)</div><div class='add'>+{</div><div class='add'>+	return proc_idedisk_read_smart(page, start, off, count, eof, data,</div><div class='add'>+				       ATA_SMART_READ_THRESHOLDS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+ide_proc_entry_t ide_disk_proc[] = {</div><div class='add'>+	{ "cache",	  S_IFREG|S_IRUGO, proc_idedisk_read_cache,    NULL },</div><div class='add'>+	{ "capacity",	  S_IFREG|S_IRUGO, proc_idedisk_read_capacity, NULL },</div><div class='add'>+	{ "geometry",	  S_IFREG|S_IRUGO, proc_ide_read_geometry,     NULL },</div><div class='add'>+	{ "smart_values", S_IFREG|S_IRUSR, proc_idedisk_read_sv,       NULL },</div><div class='add'>+	{ "smart_thresholds", S_IFREG|S_IRUSR, proc_idedisk_read_st,   NULL },</div><div class='add'>+	{ NULL, 0, NULL, NULL }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+ide_devset_rw_field(bios_cyl, bios_cyl);</div><div class='add'>+ide_devset_rw_field(bios_head, bios_head);</div><div class='add'>+ide_devset_rw_field(bios_sect, bios_sect);</div><div class='add'>+ide_devset_rw_field(failures, failures);</div><div class='add'>+ide_devset_rw_field(lun, lun);</div><div class='add'>+ide_devset_rw_field(max_failures, max_failures);</div><div class='add'>+</div><div class='add'>+const struct ide_proc_devset ide_disk_settings[] = {</div><div class='add'>+	IDE_PROC_DEVSET(acoustic,	0,   254),</div><div class='add'>+	IDE_PROC_DEVSET(address,	0,     2),</div><div class='add'>+	IDE_PROC_DEVSET(bios_cyl,	0, 65535),</div><div class='add'>+	IDE_PROC_DEVSET(bios_head,	0,   255),</div><div class='add'>+	IDE_PROC_DEVSET(bios_sect,	0,    63),</div><div class='add'>+	IDE_PROC_DEVSET(failures,	0, 65535),</div><div class='add'>+	IDE_PROC_DEVSET(lun,		0,     7),</div><div class='add'>+	IDE_PROC_DEVSET(max_failures,	0, 65535),</div><div class='add'>+	IDE_PROC_DEVSET(multcount,	0,    16),</div><div class='add'>+	IDE_PROC_DEVSET(nowerr,		0,     1),</div><div class='add'>+	IDE_PROC_DEVSET(wcache,		0,     1),</div><div class='add'>+	{ 0 },</div><div class='add'>+};</div><div class='head'>diff --git a/drivers/ide/ide-dma-sff.c b/drivers/ide/ide-dma-sff.c<br/>new file mode 100644<br/>index 000000000000..0903782689e9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/ide-dma-sff.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/ide-dma-sff.c</a></div><div class='hunk'>@@ -0,0 +1,356 @@</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/ide.h&gt;</div><div class='add'>+#include &lt;linux/scatterlist.h&gt;</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	config_drive_for_dma	-	attempt to activate IDE DMA</div><div class='add'>+ *	@drive: the drive to place in DMA mode</div><div class='add'>+ *</div><div class='add'>+ *	If the drive supports at least mode 2 DMA or UDMA of any kind</div><div class='add'>+ *	then attempt to place it into DMA mode. Drives that are known to</div><div class='add'>+ *	support DMA but predate the DMA properties or that are known</div><div class='add'>+ *	to have DMA handling bugs are also set up appropriately based</div><div class='add'>+ *	on the good/bad drive lists.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+int config_drive_for_dma(ide_drive_t *drive)</div><div class='add'>+{</div><div class='add'>+	ide_hwif_t *hwif = drive-&gt;hwif;</div><div class='add'>+	u16 *id = drive-&gt;id;</div><div class='add'>+</div><div class='add'>+	if (drive-&gt;media != ide_disk) {</div><div class='add'>+		if (hwif-&gt;host_flags &amp; IDE_HFLAG_NO_ATAPI_DMA)</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Enable DMA on any drive that has</div><div class='add'>+	 * UltraDMA (mode 0/1/2/3/4/5/6) enabled</div><div class='add'>+	 */</div><div class='add'>+	if ((id[ATA_ID_FIELD_VALID] &amp; 4) &amp;&amp;</div><div class='add'>+	    ((id[ATA_ID_UDMA_MODES] &gt;&gt; 8) &amp; 0x7f))</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Enable DMA on any drive that has mode2 DMA</div><div class='add'>+	 * (multi or single) enabled</div><div class='add'>+	 */</div><div class='add'>+	if (id[ATA_ID_FIELD_VALID] &amp; 2)	/* regular DMA */</div><div class='add'>+		if ((id[ATA_ID_MWDMA_MODES] &amp; 0x404) == 0x404 ||</div><div class='add'>+		    (id[ATA_ID_SWDMA_MODES] &amp; 0x404) == 0x404)</div><div class='add'>+			return 1;</div><div class='add'>+</div><div class='add'>+	/* Consult the list of known "good" drives */</div><div class='add'>+	if (ide_dma_good_drive(drive))</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	ide_dma_host_set	-	Enable/disable DMA on a host</div><div class='add'>+ *	@drive: drive to control</div><div class='add'>+ *</div><div class='add'>+ *	Enable/disable DMA on an IDE controller following generic</div><div class='add'>+ *	bus-mastering IDE controller behaviour.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+void ide_dma_host_set(ide_drive_t *drive, int on)</div><div class='add'>+{</div><div class='add'>+	ide_hwif_t *hwif = drive-&gt;hwif;</div><div class='add'>+	u8 unit = drive-&gt;dn &amp; 1;</div><div class='add'>+	u8 dma_stat = hwif-&gt;tp_ops-&gt;read_sff_dma_status(hwif);</div><div class='add'>+</div><div class='add'>+	if (on)</div><div class='add'>+		dma_stat |= (1 &lt;&lt; (5 + unit));</div><div class='add'>+	else</div><div class='add'>+		dma_stat &amp;= ~(1 &lt;&lt; (5 + unit));</div><div class='add'>+</div><div class='add'>+	if (hwif-&gt;host_flags &amp; IDE_HFLAG_MMIO)</div><div class='add'>+		writeb(dma_stat,</div><div class='add'>+		       (void __iomem *)(hwif-&gt;dma_base + ATA_DMA_STATUS));</div><div class='add'>+	else</div><div class='add'>+		outb(dma_stat, hwif-&gt;dma_base + ATA_DMA_STATUS);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(ide_dma_host_set);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	ide_build_dmatable	-	build IDE DMA table</div><div class='add'>+ *</div><div class='add'>+ *	ide_build_dmatable() prepares a dma request. We map the command</div><div class='add'>+ *	to get the pci bus addresses of the buffers and then build up</div><div class='add'>+ *	the PRD table that the IDE layer wants to be fed.</div><div class='add'>+ *</div><div class='add'>+ *	Most chipsets correctly interpret a length of 0x0000 as 64KB,</div><div class='add'>+ *	but at least one (e.g. CS5530) misinterprets it as zero (!).</div><div class='add'>+ *	So we break the 64KB entry into two 32KB entries instead.</div><div class='add'>+ *</div><div class='add'>+ *	Returns the number of built PRD entries if all went okay,</div><div class='add'>+ *	returns 0 otherwise.</div><div class='add'>+ *</div><div class='add'>+ *	May also be invoked from trm290.c</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+int ide_build_dmatable(ide_drive_t *drive, struct request *rq)</div><div class='add'>+{</div><div class='add'>+	ide_hwif_t *hwif = drive-&gt;hwif;</div><div class='add'>+	__le32 *table = (__le32 *)hwif-&gt;dmatable_cpu;</div><div class='add'>+	unsigned int is_trm290	= (hwif-&gt;chipset == ide_trm290) ? 1 : 0;</div><div class='add'>+	unsigned int count = 0;</div><div class='add'>+	int i;</div><div class='add'>+	struct scatterlist *sg;</div><div class='add'>+</div><div class='add'>+	hwif-&gt;sg_nents = ide_build_sglist(drive, rq);</div><div class='add'>+	if (hwif-&gt;sg_nents == 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	for_each_sg(hwif-&gt;sg_table, sg, hwif-&gt;sg_nents, i) {</div><div class='add'>+		u32 cur_addr, cur_len, xcount, bcount;</div><div class='add'>+</div><div class='add'>+		cur_addr = sg_dma_address(sg);</div><div class='add'>+		cur_len = sg_dma_len(sg);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Fill in the dma table, without crossing any 64kB boundaries.</div><div class='add'>+		 * Most hardware requires 16-bit alignment of all blocks,</div><div class='add'>+		 * but the trm290 requires 32-bit alignment.</div><div class='add'>+		 */</div><div class='add'>+</div><div class='add'>+		while (cur_len) {</div><div class='add'>+			if (count++ &gt;= PRD_ENTRIES)</div><div class='add'>+				goto use_pio_instead;</div><div class='add'>+</div><div class='add'>+			bcount = 0x10000 - (cur_addr &amp; 0xffff);</div><div class='add'>+			if (bcount &gt; cur_len)</div><div class='add'>+				bcount = cur_len;</div><div class='add'>+			*table++ = cpu_to_le32(cur_addr);</div><div class='add'>+			xcount = bcount &amp; 0xffff;</div><div class='add'>+			if (is_trm290)</div><div class='add'>+				xcount = ((xcount &gt;&gt; 2) - 1) &lt;&lt; 16;</div><div class='add'>+			if (xcount == 0x0000) {</div><div class='add'>+				if (count++ &gt;= PRD_ENTRIES)</div><div class='add'>+					goto use_pio_instead;</div><div class='add'>+				*table++ = cpu_to_le32(0x8000);</div><div class='add'>+				*table++ = cpu_to_le32(cur_addr + 0x8000);</div><div class='add'>+				xcount = 0x8000;</div><div class='add'>+			}</div><div class='add'>+			*table++ = cpu_to_le32(xcount);</div><div class='add'>+			cur_addr += bcount;</div><div class='add'>+			cur_len -= bcount;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (count) {</div><div class='add'>+		if (!is_trm290)</div><div class='add'>+			*--table |= cpu_to_le32(0x80000000);</div><div class='add'>+		return count;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+use_pio_instead:</div><div class='add'>+	printk(KERN_ERR "%s: %s\n", drive-&gt;name,</div><div class='add'>+		count ? "DMA table too small" : "empty DMA table?");</div><div class='add'>+</div><div class='add'>+	ide_destroy_dmatable(drive);</div><div class='add'>+</div><div class='add'>+	return 0; /* revert to PIO for this request */</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(ide_build_dmatable);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	ide_dma_setup	-	begin a DMA phase</div><div class='add'>+ *	@drive: target device</div><div class='add'>+ *</div><div class='add'>+ *	Build an IDE DMA PRD (IDE speak for scatter gather table)</div><div class='add'>+ *	and then set up the DMA transfer registers for a device</div><div class='add'>+ *	that follows generic IDE PCI DMA behaviour. Controllers can</div><div class='add'>+ *	override this function if they need to</div><div class='add'>+ *</div><div class='add'>+ *	Returns 0 on success. If a PIO fallback is required then 1</div><div class='add'>+ *	is returned.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+int ide_dma_setup(ide_drive_t *drive)</div><div class='add'>+{</div><div class='add'>+	ide_hwif_t *hwif = drive-&gt;hwif;</div><div class='add'>+	struct request *rq = hwif-&gt;hwgroup-&gt;rq;</div><div class='add'>+	unsigned int reading;</div><div class='add'>+	u8 mmio = (hwif-&gt;host_flags &amp; IDE_HFLAG_MMIO) ? 1 : 0;</div><div class='add'>+	u8 dma_stat;</div><div class='add'>+</div><div class='add'>+	if (rq_data_dir(rq))</div><div class='add'>+		reading = 0;</div><div class='add'>+	else</div><div class='add'>+		reading = 1 &lt;&lt; 3;</div><div class='add'>+</div><div class='add'>+	/* fall back to pio! */</div><div class='add'>+	if (!ide_build_dmatable(drive, rq)) {</div><div class='add'>+		ide_map_sg(drive, rq);</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* PRD table */</div><div class='add'>+	if (hwif-&gt;host_flags &amp; IDE_HFLAG_MMIO)</div><div class='add'>+		writel(hwif-&gt;dmatable_dma,</div><div class='add'>+		       (void __iomem *)(hwif-&gt;dma_base + ATA_DMA_TABLE_OFS));</div><div class='add'>+	else</div><div class='add'>+		outl(hwif-&gt;dmatable_dma, hwif-&gt;dma_base + ATA_DMA_TABLE_OFS);</div><div class='add'>+</div><div class='add'>+	/* specify r/w */</div><div class='add'>+	if (mmio)</div><div class='add'>+		writeb(reading, (void __iomem *)(hwif-&gt;dma_base + ATA_DMA_CMD));</div><div class='add'>+	else</div><div class='add'>+		outb(reading, hwif-&gt;dma_base + ATA_DMA_CMD);</div><div class='add'>+</div><div class='add'>+	/* read DMA status for INTR &amp; ERROR flags */</div><div class='add'>+	dma_stat = hwif-&gt;tp_ops-&gt;read_sff_dma_status(hwif);</div><div class='add'>+</div><div class='add'>+	/* clear INTR &amp; ERROR flags */</div><div class='add'>+	if (mmio)</div><div class='add'>+		writeb(dma_stat | 6,</div><div class='add'>+		       (void __iomem *)(hwif-&gt;dma_base + ATA_DMA_STATUS));</div><div class='add'>+	else</div><div class='add'>+		outb(dma_stat | 6, hwif-&gt;dma_base + ATA_DMA_STATUS);</div><div class='add'>+</div><div class='add'>+	drive-&gt;waiting_for_dma = 1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(ide_dma_setup);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	dma_timer_expiry	-	handle a DMA timeout</div><div class='add'>+ *	@drive: Drive that timed out</div><div class='add'>+ *</div><div class='add'>+ *	An IDE DMA transfer timed out. In the event of an error we ask</div><div class='add'>+ *	the driver to resolve the problem, if a DMA transfer is still</div><div class='add'>+ *	in progress we continue to wait (arguably we need to add a</div><div class='add'>+ *	secondary 'I don't care what the drive thinks' timeout here)</div><div class='add'>+ *	Finally if we have an interrupt we let it complete the I/O.</div><div class='add'>+ *	But only one time - we clear expiry and if it's still not</div><div class='add'>+ *	completed after WAIT_CMD, we error and retry in PIO.</div><div class='add'>+ *	This can occur if an interrupt is lost or due to hang or bugs.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static int dma_timer_expiry(ide_drive_t *drive)</div><div class='add'>+{</div><div class='add'>+	ide_hwif_t *hwif = drive-&gt;hwif;</div><div class='add'>+	u8 dma_stat = hwif-&gt;tp_ops-&gt;read_sff_dma_status(hwif);</div><div class='add'>+</div><div class='add'>+	printk(KERN_WARNING "%s: %s: DMA status (0x%02x)\n",</div><div class='add'>+		drive-&gt;name, __func__, dma_stat);</div><div class='add'>+</div><div class='add'>+	if ((dma_stat &amp; 0x18) == 0x18)	/* BUSY Stupid Early Timer !! */</div><div class='add'>+		return WAIT_CMD;</div><div class='add'>+</div><div class='add'>+	hwif-&gt;hwgroup-&gt;expiry = NULL;	/* one free ride for now */</div><div class='add'>+</div><div class='add'>+	/* 1 dmaing, 2 error, 4 intr */</div><div class='add'>+	if (dma_stat &amp; 2)	/* ERROR */</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	if (dma_stat &amp; 1)	/* DMAing */</div><div class='add'>+		return WAIT_CMD;</div><div class='add'>+</div><div class='add'>+	if (dma_stat &amp; 4)	/* Got an Interrupt */</div><div class='add'>+		return WAIT_CMD;</div><div class='add'>+</div><div class='add'>+	return 0;	/* Status is unknown -- reset the bus */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ide_dma_exec_cmd(ide_drive_t *drive, u8 command)</div><div class='add'>+{</div><div class='add'>+	/* issue cmd to drive */</div><div class='add'>+	ide_execute_command(drive, command, &amp;ide_dma_intr, 2 * WAIT_CMD,</div><div class='add'>+			    dma_timer_expiry);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(ide_dma_exec_cmd);</div><div class='add'>+</div><div class='add'>+void ide_dma_start(ide_drive_t *drive)</div><div class='add'>+{</div><div class='add'>+	ide_hwif_t *hwif = drive-&gt;hwif;</div><div class='add'>+	u8 dma_cmd;</div><div class='add'>+</div><div class='add'>+	/* Note that this is done *after* the cmd has</div><div class='add'>+	 * been issued to the drive, as per the BM-IDE spec.</div><div class='add'>+	 * The Promise Ultra33 doesn't work correctly when</div><div class='add'>+	 * we do this part before issuing the drive cmd.</div><div class='add'>+	 */</div><div class='add'>+	if (hwif-&gt;host_flags &amp; IDE_HFLAG_MMIO) {</div><div class='add'>+		dma_cmd = readb((void __iomem *)(hwif-&gt;dma_base + ATA_DMA_CMD));</div><div class='add'>+		/* start DMA */</div><div class='add'>+		writeb(dma_cmd | 1,</div><div class='add'>+		       (void __iomem *)(hwif-&gt;dma_base + ATA_DMA_CMD));</div><div class='add'>+	} else {</div><div class='add'>+		dma_cmd = inb(hwif-&gt;dma_base + ATA_DMA_CMD);</div><div class='add'>+		outb(dma_cmd | 1, hwif-&gt;dma_base + ATA_DMA_CMD);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	wmb();</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(ide_dma_start);</div><div class='add'>+</div><div class='add'>+/* returns 1 on error, 0 otherwise */</div><div class='add'>+int ide_dma_end(ide_drive_t *drive)</div><div class='add'>+{</div><div class='add'>+	ide_hwif_t *hwif = drive-&gt;hwif;</div><div class='add'>+	u8 mmio = (hwif-&gt;host_flags &amp; IDE_HFLAG_MMIO) ? 1 : 0;</div><div class='add'>+	u8 dma_stat = 0, dma_cmd = 0;</div><div class='add'>+</div><div class='add'>+	drive-&gt;waiting_for_dma = 0;</div><div class='add'>+</div><div class='add'>+	if (mmio) {</div><div class='add'>+		/* get DMA command mode */</div><div class='add'>+		dma_cmd = readb((void __iomem *)(hwif-&gt;dma_base + ATA_DMA_CMD));</div><div class='add'>+		/* stop DMA */</div><div class='add'>+		writeb(dma_cmd &amp; ~1,</div><div class='add'>+		       (void __iomem *)(hwif-&gt;dma_base + ATA_DMA_CMD));</div><div class='add'>+	} else {</div><div class='add'>+		dma_cmd = inb(hwif-&gt;dma_base + ATA_DMA_CMD);</div><div class='add'>+		outb(dma_cmd &amp; ~1, hwif-&gt;dma_base + ATA_DMA_CMD);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* get DMA status */</div><div class='add'>+	dma_stat = hwif-&gt;tp_ops-&gt;read_sff_dma_status(hwif);</div><div class='add'>+</div><div class='add'>+	if (mmio)</div><div class='add'>+		/* clear the INTR &amp; ERROR bits */</div><div class='add'>+		writeb(dma_stat | 6,</div><div class='add'>+		       (void __iomem *)(hwif-&gt;dma_base + ATA_DMA_STATUS));</div><div class='add'>+	else</div><div class='add'>+		outb(dma_stat | 6, hwif-&gt;dma_base + ATA_DMA_STATUS);</div><div class='add'>+</div><div class='add'>+	/* purge DMA mappings */</div><div class='add'>+	ide_destroy_dmatable(drive);</div><div class='add'>+	/* verify good DMA status */</div><div class='add'>+	wmb();</div><div class='add'>+	return (dma_stat &amp; 7) != 4 ? (0x10 | dma_stat) : 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(ide_dma_end);</div><div class='add'>+</div><div class='add'>+/* returns 1 if dma irq issued, 0 otherwise */</div><div class='add'>+int ide_dma_test_irq(ide_drive_t *drive)</div><div class='add'>+{</div><div class='add'>+	ide_hwif_t *hwif = drive-&gt;hwif;</div><div class='add'>+	u8 dma_stat = hwif-&gt;tp_ops-&gt;read_sff_dma_status(hwif);</div><div class='add'>+</div><div class='add'>+	/* return 1 if INTR asserted */</div><div class='add'>+	if ((dma_stat &amp; 4) == 4)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(ide_dma_test_irq);</div><div class='add'>+</div><div class='add'>+const struct ide_dma_ops sff_dma_ops = {</div><div class='add'>+	.dma_host_set		= ide_dma_host_set,</div><div class='add'>+	.dma_setup		= ide_dma_setup,</div><div class='add'>+	.dma_exec_cmd		= ide_dma_exec_cmd,</div><div class='add'>+	.dma_start		= ide_dma_start,</div><div class='add'>+	.dma_end		= ide_dma_end,</div><div class='add'>+	.dma_test_irq		= ide_dma_test_irq,</div><div class='add'>+	.dma_timeout		= ide_dma_timeout,</div><div class='add'>+	.dma_lost_irq		= ide_dma_lost_irq,</div><div class='add'>+};</div><div class='add'>+EXPORT_SYMBOL_GPL(sff_dma_ops);</div><div class='head'>diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c<br/>index 3fa07c0aeaa4..fffd11717b2d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/ide-dma.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ide/ide-dma.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/ide-dma.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/ide-dma.c</a></div><div class='hunk'>@@ -28,24 +28,13 @@</div><div class='ctx'>  * for supplying a Promise UDMA board &amp; WD UDMA drive for this work!</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/timer.h&gt;</div><div class='del'>-#include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/ide.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/scatterlist.h&gt;</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/irq.h&gt;</div><div class='del'>-</div><div class='del'>-static const struct drive_list_entry drive_whitelist [] = {</div><div class='del'>-</div><div class='add'>+static const struct drive_list_entry drive_whitelist[] = {</div><div class='ctx'> 	{ "Micropolis 2112A"	,       NULL		},</div><div class='ctx'> 	{ "CONNER CTMA 4000"	,       NULL		},</div><div class='ctx'> 	{ "CONNER CTT8000-A"	,       NULL		},</div><div class='hunk'>@@ -53,8 +42,7 @@ static const struct drive_list_entry drive_whitelist [] = {</div><div class='ctx'> 	{ NULL			,	NULL		}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const struct drive_list_entry drive_blacklist [] = {</div><div class='del'>-</div><div class='add'>+static const struct drive_list_entry drive_blacklist[] = {</div><div class='ctx'> 	{ "WDC AC11000H"	,	NULL 		},</div><div class='ctx'> 	{ "WDC AC22100H"	,	NULL 		},</div><div class='ctx'> 	{ "WDC AC32500H"	,	NULL 		},</div><div class='hunk'>@@ -94,11 +82,11 @@ static const struct drive_list_entry drive_blacklist [] = {</div><div class='ctx'>  *	ide_dma_intr	-	IDE DMA interrupt handler</div><div class='ctx'>  *	@drive: the drive the interrupt is for</div><div class='ctx'>  *</div><div class='del'>- *	Handle an interrupt completing a read/write DMA transfer on an </div><div class='add'>+ *	Handle an interrupt completing a read/write DMA transfer on an</div><div class='ctx'>  *	IDE device</div><div class='ctx'>  */</div><div class='del'>- </div><div class='del'>-ide_startstop_t ide_dma_intr (ide_drive_t *drive)</div><div class='add'>+</div><div class='add'>+ide_startstop_t ide_dma_intr(ide_drive_t *drive)</div><div class='ctx'> {</div><div class='ctx'> 	ide_hwif_t *hwif = drive-&gt;hwif;</div><div class='ctx'> 	u8 stat = 0, dma_stat = 0;</div><div class='hunk'>@@ -106,22 +94,21 @@ ide_startstop_t ide_dma_intr (ide_drive_t *drive)</div><div class='ctx'> 	dma_stat = hwif-&gt;dma_ops-&gt;dma_end(drive);</div><div class='ctx'> 	stat = hwif-&gt;tp_ops-&gt;read_status(hwif);</div><div class='ctx'> </div><div class='del'>-	if (OK_STAT(stat,DRIVE_READY,drive-&gt;bad_wstat|DRQ_STAT)) {</div><div class='add'>+	if (OK_STAT(stat, DRIVE_READY, drive-&gt;bad_wstat | ATA_DRQ)) {</div><div class='ctx'> 		if (!dma_stat) {</div><div class='del'>-			struct request *rq = HWGROUP(drive)-&gt;rq;</div><div class='add'>+			struct request *rq = hwif-&gt;hwgroup-&gt;rq;</div><div class='ctx'> </div><div class='ctx'> 			task_end_request(drive, rq, stat);</div><div class='ctx'> 			return ide_stopped;</div><div class='ctx'> 		}</div><div class='del'>-		printk(KERN_ERR "%s: dma_intr: bad DMA status (dma_stat=%x)\n", </div><div class='del'>-		       drive-&gt;name, dma_stat);</div><div class='add'>+		printk(KERN_ERR "%s: %s: bad DMA status (0x%02x)\n",</div><div class='add'>+			drive-&gt;name, __func__, dma_stat);</div><div class='ctx'> 	}</div><div class='ctx'> 	return ide_error(drive, "dma_intr", stat);</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL_GPL(ide_dma_intr);</div><div class='ctx'> </div><div class='del'>-static int ide_dma_good_drive(ide_drive_t *drive)</div><div class='add'>+int ide_dma_good_drive(ide_drive_t *drive)</div><div class='ctx'> {</div><div class='ctx'> 	return ide_in_drive_list(drive-&gt;id, drive_whitelist);</div><div class='ctx'> }</div><div class='hunk'>@@ -139,7 +126,7 @@ static int ide_dma_good_drive(ide_drive_t *drive)</div><div class='ctx'> </div><div class='ctx'> int ide_build_sglist(ide_drive_t *drive, struct request *rq)</div><div class='ctx'> {</div><div class='del'>-	ide_hwif_t *hwif = HWIF(drive);</div><div class='add'>+	ide_hwif_t *hwif = drive-&gt;hwif;</div><div class='ctx'> 	struct scatterlist *sg = hwif-&gt;sg_table;</div><div class='ctx'> </div><div class='ctx'> 	ide_map_sg(drive, rq);</div><div class='hunk'>@@ -152,106 +139,8 @@ int ide_build_sglist(ide_drive_t *drive, struct request *rq)</div><div class='ctx'> 	return dma_map_sg(hwif-&gt;dev, sg, hwif-&gt;sg_nents,</div><div class='ctx'> 			  hwif-&gt;sg_dma_direction);</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL_GPL(ide_build_sglist);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_BLK_DEV_IDEDMA_SFF</div><div class='del'>-/**</div><div class='del'>- *	ide_build_dmatable	-	build IDE DMA table</div><div class='del'>- *</div><div class='del'>- *	ide_build_dmatable() prepares a dma request. We map the command</div><div class='del'>- *	to get the pci bus addresses of the buffers and then build up</div><div class='del'>- *	the PRD table that the IDE layer wants to be fed. The code</div><div class='del'>- *	knows about the 64K wrap bug in the CS5530.</div><div class='del'>- *</div><div class='del'>- *	Returns the number of built PRD entries if all went okay,</div><div class='del'>- *	returns 0 otherwise.</div><div class='del'>- *</div><div class='del'>- *	May also be invoked from trm290.c</div><div class='del'>- */</div><div class='del'>- </div><div class='del'>-int ide_build_dmatable (ide_drive_t *drive, struct request *rq)</div><div class='del'>-{</div><div class='del'>-	ide_hwif_t *hwif	= HWIF(drive);</div><div class='del'>-	__le32 *table = (__le32 *)hwif-&gt;dmatable_cpu;</div><div class='del'>-	unsigned int is_trm290	= (hwif-&gt;chipset == ide_trm290) ? 1 : 0;</div><div class='del'>-	unsigned int count = 0;</div><div class='del'>-	int i;</div><div class='del'>-	struct scatterlist *sg;</div><div class='del'>-</div><div class='del'>-	hwif-&gt;sg_nents = i = ide_build_sglist(drive, rq);</div><div class='del'>-</div><div class='del'>-	if (!i)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	sg = hwif-&gt;sg_table;</div><div class='del'>-	while (i) {</div><div class='del'>-		u32 cur_addr;</div><div class='del'>-		u32 cur_len;</div><div class='del'>-</div><div class='del'>-		cur_addr = sg_dma_address(sg);</div><div class='del'>-		cur_len = sg_dma_len(sg);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Fill in the dma table, without crossing any 64kB boundaries.</div><div class='del'>-		 * Most hardware requires 16-bit alignment of all blocks,</div><div class='del'>-		 * but the trm290 requires 32-bit alignment.</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		while (cur_len) {</div><div class='del'>-			if (count++ &gt;= PRD_ENTRIES) {</div><div class='del'>-				printk(KERN_ERR "%s: DMA table too small\n", drive-&gt;name);</div><div class='del'>-				goto use_pio_instead;</div><div class='del'>-			} else {</div><div class='del'>-				u32 xcount, bcount = 0x10000 - (cur_addr &amp; 0xffff);</div><div class='del'>-</div><div class='del'>-				if (bcount &gt; cur_len)</div><div class='del'>-					bcount = cur_len;</div><div class='del'>-				*table++ = cpu_to_le32(cur_addr);</div><div class='del'>-				xcount = bcount &amp; 0xffff;</div><div class='del'>-				if (is_trm290)</div><div class='del'>-					xcount = ((xcount &gt;&gt; 2) - 1) &lt;&lt; 16;</div><div class='del'>-				else if (xcount == 0x0000) {</div><div class='del'>-	/* </div><div class='del'>-	 * Most chipsets correctly interpret a length of 0x0000 as 64KB,</div><div class='del'>-	 * but at least one (e.g. CS5530) misinterprets it as zero (!).</div><div class='del'>-	 * So here we break the 64KB entry into two 32KB entries instead.</div><div class='del'>-	 */</div><div class='del'>-					if (count++ &gt;= PRD_ENTRIES) {</div><div class='del'>-						printk(KERN_ERR "%s: DMA table too small\n", drive-&gt;name);</div><div class='del'>-						goto use_pio_instead;</div><div class='del'>-					}</div><div class='del'>-					*table++ = cpu_to_le32(0x8000);</div><div class='del'>-					*table++ = cpu_to_le32(cur_addr + 0x8000);</div><div class='del'>-					xcount = 0x8000;</div><div class='del'>-				}</div><div class='del'>-				*table++ = cpu_to_le32(xcount);</div><div class='del'>-				cur_addr += bcount;</div><div class='del'>-				cur_len -= bcount;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		sg = sg_next(sg);</div><div class='del'>-		i--;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (count) {</div><div class='del'>-		if (!is_trm290)</div><div class='del'>-			*--table |= cpu_to_le32(0x80000000);</div><div class='del'>-		return count;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printk(KERN_ERR "%s: empty DMA table?\n", drive-&gt;name);</div><div class='del'>-</div><div class='del'>-use_pio_instead:</div><div class='del'>-	ide_destroy_dmatable(drive);</div><div class='del'>-</div><div class='del'>-	return 0; /* revert to PIO for this request */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL_GPL(ide_build_dmatable);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  *	ide_destroy_dmatable	-	clean up DMA mapping</div><div class='ctx'>  *	@drive: The drive to unmap</div><div class='hunk'>@@ -262,146 +151,30 @@ EXPORT_SYMBOL_GPL(ide_build_dmatable);</div><div class='ctx'>  *	an oops as only one mapping can be live for each target at a given</div><div class='ctx'>  *	time.</div><div class='ctx'>  */</div><div class='del'>- </div><div class='del'>-void ide_destroy_dmatable (ide_drive_t *drive)</div><div class='add'>+</div><div class='add'>+void ide_destroy_dmatable(ide_drive_t *drive)</div><div class='ctx'> {</div><div class='ctx'> 	ide_hwif_t *hwif = drive-&gt;hwif;</div><div class='ctx'> </div><div class='ctx'> 	dma_unmap_sg(hwif-&gt;dev, hwif-&gt;sg_table, hwif-&gt;sg_nents,</div><div class='ctx'> 		     hwif-&gt;sg_dma_direction);</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL_GPL(ide_destroy_dmatable);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_BLK_DEV_IDEDMA_SFF</div><div class='del'>-/**</div><div class='del'>- *	config_drive_for_dma	-	attempt to activate IDE DMA</div><div class='del'>- *	@drive: the drive to place in DMA mode</div><div class='del'>- *</div><div class='del'>- *	If the drive supports at least mode 2 DMA or UDMA of any kind</div><div class='del'>- *	then attempt to place it into DMA mode. Drives that are known to</div><div class='del'>- *	support DMA but predate the DMA properties or that are known</div><div class='del'>- *	to have DMA handling bugs are also set up appropriately based</div><div class='del'>- *	on the good/bad drive lists.</div><div class='del'>- */</div><div class='del'>- </div><div class='del'>-static int config_drive_for_dma (ide_drive_t *drive)</div><div class='del'>-{</div><div class='del'>-	ide_hwif_t *hwif = drive-&gt;hwif;</div><div class='del'>-	struct hd_driveid *id = drive-&gt;id;</div><div class='del'>-</div><div class='del'>-	if (drive-&gt;media != ide_disk) {</div><div class='del'>-		if (hwif-&gt;host_flags &amp; IDE_HFLAG_NO_ATAPI_DMA)</div><div class='del'>-			return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Enable DMA on any drive that has</div><div class='del'>-	 * UltraDMA (mode 0/1/2/3/4/5/6) enabled</div><div class='del'>-	 */</div><div class='del'>-	if ((id-&gt;field_valid &amp; 4) &amp;&amp; ((id-&gt;dma_ultra &gt;&gt; 8) &amp; 0x7f))</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Enable DMA on any drive that has mode2 DMA</div><div class='del'>-	 * (multi or single) enabled</div><div class='del'>-	 */</div><div class='del'>-	if (id-&gt;field_valid &amp; 2)	/* regular DMA */</div><div class='del'>-		if ((id-&gt;dma_mword &amp; 0x404) == 0x404 ||</div><div class='del'>-		    (id-&gt;dma_1word &amp; 0x404) == 0x404)</div><div class='del'>-			return 1;</div><div class='del'>-</div><div class='del'>-	/* Consult the list of known "good" drives */</div><div class='del'>-	if (ide_dma_good_drive(drive))</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	dma_timer_expiry	-	handle a DMA timeout</div><div class='del'>- *	@drive: Drive that timed out</div><div class='del'>- *</div><div class='del'>- *	An IDE DMA transfer timed out. In the event of an error we ask</div><div class='del'>- *	the driver to resolve the problem, if a DMA transfer is still</div><div class='del'>- *	in progress we continue to wait (arguably we need to add a </div><div class='del'>- *	secondary 'I don't care what the drive thinks' timeout here)</div><div class='del'>- *	Finally if we have an interrupt we let it complete the I/O.</div><div class='del'>- *	But only one time - we clear expiry and if it's still not</div><div class='del'>- *	completed after WAIT_CMD, we error and retry in PIO.</div><div class='del'>- *	This can occur if an interrupt is lost or due to hang or bugs.</div><div class='del'>- */</div><div class='del'>- </div><div class='del'>-static int dma_timer_expiry (ide_drive_t *drive)</div><div class='del'>-{</div><div class='del'>-	ide_hwif_t *hwif	= HWIF(drive);</div><div class='del'>-	u8 dma_stat		= hwif-&gt;tp_ops-&gt;read_sff_dma_status(hwif);</div><div class='del'>-</div><div class='del'>-	printk(KERN_WARNING "%s: dma_timer_expiry: dma status == 0x%02x\n",</div><div class='del'>-		drive-&gt;name, dma_stat);</div><div class='del'>-</div><div class='del'>-	if ((dma_stat &amp; 0x18) == 0x18)	/* BUSY Stupid Early Timer !! */</div><div class='del'>-		return WAIT_CMD;</div><div class='del'>-</div><div class='del'>-	HWGROUP(drive)-&gt;expiry = NULL;	/* one free ride for now */</div><div class='del'>-</div><div class='del'>-	/* 1 dmaing, 2 error, 4 intr */</div><div class='del'>-	if (dma_stat &amp; 2)	/* ERROR */</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	if (dma_stat &amp; 1)	/* DMAing */</div><div class='del'>-		return WAIT_CMD;</div><div class='del'>-</div><div class='del'>-	if (dma_stat &amp; 4)	/* Got an Interrupt */</div><div class='del'>-		return WAIT_CMD;</div><div class='del'>-</div><div class='del'>-	return 0;	/* Status is unknown -- reset the bus */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	ide_dma_host_set	-	Enable/disable DMA on a host</div><div class='del'>- *	@drive: drive to control</div><div class='del'>- *</div><div class='del'>- *	Enable/disable DMA on an IDE controller following generic</div><div class='del'>- *	bus-mastering IDE controller behaviour.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-void ide_dma_host_set(ide_drive_t *drive, int on)</div><div class='del'>-{</div><div class='del'>-	ide_hwif_t *hwif	= HWIF(drive);</div><div class='del'>-	u8 unit			= (drive-&gt;select.b.unit &amp; 0x01);</div><div class='del'>-	u8 dma_stat		= hwif-&gt;tp_ops-&gt;read_sff_dma_status(hwif);</div><div class='del'>-</div><div class='del'>-	if (on)</div><div class='del'>-		dma_stat |= (1 &lt;&lt; (5 + unit));</div><div class='del'>-	else</div><div class='del'>-		dma_stat &amp;= ~(1 &lt;&lt; (5 + unit));</div><div class='del'>-</div><div class='del'>-	if (hwif-&gt;host_flags &amp; IDE_HFLAG_MMIO)</div><div class='del'>-		writeb(dma_stat,</div><div class='del'>-		       (void __iomem *)(hwif-&gt;dma_base + ATA_DMA_STATUS));</div><div class='del'>-	else</div><div class='del'>-		outb(dma_stat, hwif-&gt;dma_base + ATA_DMA_STATUS);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL_GPL(ide_dma_host_set);</div><div class='del'>-#endif /* CONFIG_BLK_DEV_IDEDMA_SFF  */</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  *	ide_dma_off_quietly	-	Generic DMA kill</div><div class='ctx'>  *	@drive: drive to control</div><div class='ctx'>  *</div><div class='del'>- *	Turn off the current DMA on this IDE controller. </div><div class='add'>+ *	Turn off the current DMA on this IDE controller.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> void ide_dma_off_quietly(ide_drive_t *drive)</div><div class='ctx'> {</div><div class='del'>-	drive-&gt;using_dma = 0;</div><div class='add'>+	drive-&gt;dev_flags &amp;= ~IDE_DFLAG_USING_DMA;</div><div class='ctx'> 	ide_toggle_bounce(drive, 0);</div><div class='ctx'> </div><div class='ctx'> 	drive-&gt;hwif-&gt;dma_ops-&gt;dma_host_set(drive, 0);</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(ide_dma_off_quietly);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -417,7 +190,6 @@ void ide_dma_off(ide_drive_t *drive)</div><div class='ctx'> 	printk(KERN_INFO "%s: DMA disabled\n", drive-&gt;name);</div><div class='ctx'> 	ide_dma_off_quietly(drive);</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(ide_dma_off);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -429,179 +201,24 @@ EXPORT_SYMBOL(ide_dma_off);</div><div class='ctx'> </div><div class='ctx'> void ide_dma_on(ide_drive_t *drive)</div><div class='ctx'> {</div><div class='del'>-	drive-&gt;using_dma = 1;</div><div class='add'>+	drive-&gt;dev_flags |= IDE_DFLAG_USING_DMA;</div><div class='ctx'> 	ide_toggle_bounce(drive, 1);</div><div class='ctx'> </div><div class='ctx'> 	drive-&gt;hwif-&gt;dma_ops-&gt;dma_host_set(drive, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_BLK_DEV_IDEDMA_SFF</div><div class='del'>-/**</div><div class='del'>- *	ide_dma_setup	-	begin a DMA phase</div><div class='del'>- *	@drive: target device</div><div class='del'>- *</div><div class='del'>- *	Build an IDE DMA PRD (IDE speak for scatter gather table)</div><div class='del'>- *	and then set up the DMA transfer registers for a device</div><div class='del'>- *	that follows generic IDE PCI DMA behaviour. Controllers can</div><div class='del'>- *	override this function if they need to</div><div class='del'>- *</div><div class='del'>- *	Returns 0 on success. If a PIO fallback is required then 1</div><div class='del'>- *	is returned. </div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-int ide_dma_setup(ide_drive_t *drive)</div><div class='add'>+int __ide_dma_bad_drive(ide_drive_t *drive)</div><div class='ctx'> {</div><div class='del'>-	ide_hwif_t *hwif = drive-&gt;hwif;</div><div class='del'>-	struct request *rq = HWGROUP(drive)-&gt;rq;</div><div class='del'>-	unsigned int reading;</div><div class='del'>-	u8 mmio = (hwif-&gt;host_flags &amp; IDE_HFLAG_MMIO) ? 1 : 0;</div><div class='del'>-	u8 dma_stat;</div><div class='del'>-</div><div class='del'>-	if (rq_data_dir(rq))</div><div class='del'>-		reading = 0;</div><div class='del'>-	else</div><div class='del'>-		reading = 1 &lt;&lt; 3;</div><div class='del'>-</div><div class='del'>-	/* fall back to pio! */</div><div class='del'>-	if (!ide_build_dmatable(drive, rq)) {</div><div class='del'>-		ide_map_sg(drive, rq);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* PRD table */</div><div class='del'>-	if (hwif-&gt;host_flags &amp; IDE_HFLAG_MMIO)</div><div class='del'>-		writel(hwif-&gt;dmatable_dma,</div><div class='del'>-		       (void __iomem *)(hwif-&gt;dma_base + ATA_DMA_TABLE_OFS));</div><div class='del'>-	else</div><div class='del'>-		outl(hwif-&gt;dmatable_dma, hwif-&gt;dma_base + ATA_DMA_TABLE_OFS);</div><div class='del'>-</div><div class='del'>-	/* specify r/w */</div><div class='del'>-	if (mmio)</div><div class='del'>-		writeb(reading, (void __iomem *)(hwif-&gt;dma_base + ATA_DMA_CMD));</div><div class='del'>-	else</div><div class='del'>-		outb(reading, hwif-&gt;dma_base + ATA_DMA_CMD);</div><div class='del'>-</div><div class='del'>-	/* read DMA status for INTR &amp; ERROR flags */</div><div class='del'>-	dma_stat = hwif-&gt;tp_ops-&gt;read_sff_dma_status(hwif);</div><div class='del'>-</div><div class='del'>-	/* clear INTR &amp; ERROR flags */</div><div class='del'>-	if (mmio)</div><div class='del'>-		writeb(dma_stat | 6,</div><div class='del'>-		       (void __iomem *)(hwif-&gt;dma_base + ATA_DMA_STATUS));</div><div class='del'>-	else</div><div class='del'>-		outb(dma_stat | 6, hwif-&gt;dma_base + ATA_DMA_STATUS);</div><div class='del'>-</div><div class='del'>-	drive-&gt;waiting_for_dma = 1;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL_GPL(ide_dma_setup);</div><div class='del'>-</div><div class='del'>-void ide_dma_exec_cmd(ide_drive_t *drive, u8 command)</div><div class='del'>-{</div><div class='del'>-	/* issue cmd to drive */</div><div class='del'>-	ide_execute_command(drive, command, &amp;ide_dma_intr, 2*WAIT_CMD, dma_timer_expiry);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(ide_dma_exec_cmd);</div><div class='del'>-</div><div class='del'>-void ide_dma_start(ide_drive_t *drive)</div><div class='del'>-{</div><div class='del'>-	ide_hwif_t *hwif = drive-&gt;hwif;</div><div class='del'>-	u8 dma_cmd;</div><div class='del'>-</div><div class='del'>-	/* Note that this is done *after* the cmd has</div><div class='del'>-	 * been issued to the drive, as per the BM-IDE spec.</div><div class='del'>-	 * The Promise Ultra33 doesn't work correctly when</div><div class='del'>-	 * we do this part before issuing the drive cmd.</div><div class='del'>-	 */</div><div class='del'>-	if (hwif-&gt;host_flags &amp; IDE_HFLAG_MMIO) {</div><div class='del'>-		dma_cmd = readb((void __iomem *)(hwif-&gt;dma_base + ATA_DMA_CMD));</div><div class='del'>-		/* start DMA */</div><div class='del'>-		writeb(dma_cmd | 1,</div><div class='del'>-		       (void __iomem *)(hwif-&gt;dma_base + ATA_DMA_CMD));</div><div class='del'>-	} else {</div><div class='del'>-		dma_cmd = inb(hwif-&gt;dma_base + ATA_DMA_CMD);</div><div class='del'>-		outb(dma_cmd | 1, hwif-&gt;dma_base + ATA_DMA_CMD);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hwif-&gt;dma = 1;</div><div class='del'>-	wmb();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL_GPL(ide_dma_start);</div><div class='del'>-</div><div class='del'>-/* returns 1 on error, 0 otherwise */</div><div class='del'>-int __ide_dma_end (ide_drive_t *drive)</div><div class='del'>-{</div><div class='del'>-	ide_hwif_t *hwif = drive-&gt;hwif;</div><div class='del'>-	u8 mmio = (hwif-&gt;host_flags &amp; IDE_HFLAG_MMIO) ? 1 : 0;</div><div class='del'>-	u8 dma_stat = 0, dma_cmd = 0;</div><div class='del'>-</div><div class='del'>-	drive-&gt;waiting_for_dma = 0;</div><div class='del'>-</div><div class='del'>-	if (mmio) {</div><div class='del'>-		/* get DMA command mode */</div><div class='del'>-		dma_cmd = readb((void __iomem *)(hwif-&gt;dma_base + ATA_DMA_CMD));</div><div class='del'>-		/* stop DMA */</div><div class='del'>-		writeb(dma_cmd &amp; ~1,</div><div class='del'>-		       (void __iomem *)(hwif-&gt;dma_base + ATA_DMA_CMD));</div><div class='del'>-	} else {</div><div class='del'>-		dma_cmd = inb(hwif-&gt;dma_base + ATA_DMA_CMD);</div><div class='del'>-		outb(dma_cmd &amp; ~1, hwif-&gt;dma_base + ATA_DMA_CMD);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* get DMA status */</div><div class='del'>-	dma_stat = hwif-&gt;tp_ops-&gt;read_sff_dma_status(hwif);</div><div class='del'>-</div><div class='del'>-	if (mmio)</div><div class='del'>-		/* clear the INTR &amp; ERROR bits */</div><div class='del'>-		writeb(dma_stat | 6,</div><div class='del'>-		       (void __iomem *)(hwif-&gt;dma_base + ATA_DMA_STATUS));</div><div class='del'>-	else</div><div class='del'>-		outb(dma_stat | 6, hwif-&gt;dma_base + ATA_DMA_STATUS);</div><div class='del'>-</div><div class='del'>-	/* purge DMA mappings */</div><div class='del'>-	ide_destroy_dmatable(drive);</div><div class='del'>-	/* verify good DMA status */</div><div class='del'>-	hwif-&gt;dma = 0;</div><div class='del'>-	wmb();</div><div class='del'>-	return (dma_stat &amp; 7) != 4 ? (0x10 | dma_stat) : 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(__ide_dma_end);</div><div class='del'>-</div><div class='del'>-/* returns 1 if dma irq issued, 0 otherwise */</div><div class='del'>-int ide_dma_test_irq(ide_drive_t *drive)</div><div class='del'>-{</div><div class='del'>-	ide_hwif_t *hwif	= HWIF(drive);</div><div class='del'>-	u8 dma_stat		= hwif-&gt;tp_ops-&gt;read_sff_dma_status(hwif);</div><div class='del'>-</div><div class='del'>-	/* return 1 if INTR asserted */</div><div class='del'>-	if ((dma_stat &amp; 4) == 4)</div><div class='del'>-		return 1;</div><div class='del'>-	if (!drive-&gt;waiting_for_dma)</div><div class='del'>-		printk(KERN_WARNING "%s: (%s) called while not waiting\n",</div><div class='del'>-			drive-&gt;name, __func__);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(ide_dma_test_irq);</div><div class='del'>-#else</div><div class='del'>-static inline int config_drive_for_dma(ide_drive_t *drive) { return 0; }</div><div class='del'>-#endif /* CONFIG_BLK_DEV_IDEDMA_SFF */</div><div class='del'>-</div><div class='del'>-int __ide_dma_bad_drive (ide_drive_t *drive)</div><div class='del'>-{</div><div class='del'>-	struct hd_driveid *id = drive-&gt;id;</div><div class='add'>+	u16 *id = drive-&gt;id;</div><div class='ctx'> </div><div class='ctx'> 	int blacklist = ide_in_drive_list(id, drive_blacklist);</div><div class='ctx'> 	if (blacklist) {</div><div class='ctx'> 		printk(KERN_WARNING "%s: Disabling (U)DMA for %s (blacklisted)\n",</div><div class='del'>-				    drive-&gt;name, id-&gt;model);</div><div class='add'>+				    drive-&gt;name, (char *)&amp;id[ATA_ID_PROD]);</div><div class='ctx'> 		return blacklist;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(__ide_dma_bad_drive);</div><div class='ctx'> </div><div class='ctx'> static const u8 xfer_mode_bases[] = {</div><div class='hunk'>@@ -612,21 +229,21 @@ static const u8 xfer_mode_bases[] = {</div><div class='ctx'> </div><div class='ctx'> static unsigned int ide_get_mode_mask(ide_drive_t *drive, u8 base, u8 req_mode)</div><div class='ctx'> {</div><div class='del'>-	struct hd_driveid *id = drive-&gt;id;</div><div class='add'>+	u16 *id = drive-&gt;id;</div><div class='ctx'> 	ide_hwif_t *hwif = drive-&gt;hwif;</div><div class='ctx'> 	const struct ide_port_ops *port_ops = hwif-&gt;port_ops;</div><div class='ctx'> 	unsigned int mask = 0;</div><div class='ctx'> </div><div class='del'>-	switch(base) {</div><div class='add'>+	switch (base) {</div><div class='ctx'> 	case XFER_UDMA_0:</div><div class='del'>-		if ((id-&gt;field_valid &amp; 4) == 0)</div><div class='add'>+		if ((id[ATA_ID_FIELD_VALID] &amp; 4) == 0)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		if (port_ops &amp;&amp; port_ops-&gt;udma_filter)</div><div class='ctx'> 			mask = port_ops-&gt;udma_filter(drive);</div><div class='ctx'> 		else</div><div class='ctx'> 			mask = hwif-&gt;ultra_mask;</div><div class='del'>-		mask &amp;= id-&gt;dma_ultra;</div><div class='add'>+		mask &amp;= id[ATA_ID_UDMA_MODES];</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * avoid false cable warning from eighty_ninty_three()</div><div class='hunk'>@@ -637,19 +254,19 @@ static unsigned int ide_get_mode_mask(ide_drive_t *drive, u8 base, u8 req_mode)</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case XFER_MW_DMA_0:</div><div class='del'>-		if ((id-&gt;field_valid &amp; 2) == 0)</div><div class='add'>+		if ((id[ATA_ID_FIELD_VALID] &amp; 2) == 0)</div><div class='ctx'> 			break;</div><div class='ctx'> 		if (port_ops &amp;&amp; port_ops-&gt;mdma_filter)</div><div class='ctx'> 			mask = port_ops-&gt;mdma_filter(drive);</div><div class='ctx'> 		else</div><div class='ctx'> 			mask = hwif-&gt;mwdma_mask;</div><div class='del'>-		mask &amp;= id-&gt;dma_mword;</div><div class='add'>+		mask &amp;= id[ATA_ID_MWDMA_MODES];</div><div class='ctx'> 		break;</div><div class='ctx'> 	case XFER_SW_DMA_0:</div><div class='del'>-		if (id-&gt;field_valid &amp; 2) {</div><div class='del'>-			mask = id-&gt;dma_1word &amp; hwif-&gt;swdma_mask;</div><div class='del'>-		} else if (id-&gt;tDMA) {</div><div class='del'>-			u8 mode = id-&gt;tDMA;</div><div class='add'>+		if (id[ATA_ID_FIELD_VALID] &amp; 2) {</div><div class='add'>+			mask = id[ATA_ID_SWDMA_MODES] &amp; hwif-&gt;swdma_mask;</div><div class='add'>+		} else if (id[ATA_ID_OLD_DMA_MODES] &gt;&gt; 8) {</div><div class='add'>+			u8 mode = id[ATA_ID_OLD_DMA_MODES] &gt;&gt; 8;</div><div class='ctx'> </div><div class='ctx'> 			/*</div><div class='ctx'> 			 * if the mode is valid convert it to the mask</div><div class='hunk'>@@ -706,7 +323,8 @@ u8 ide_find_dma_mode(ide_drive_t *drive, u8 req_mode)</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * is this correct?</div><div class='ctx'> 		 */</div><div class='del'>-		if (ide_dma_good_drive(drive) &amp;&amp; drive-&gt;id-&gt;eide_dma_time &lt; 150)</div><div class='add'>+		if (ide_dma_good_drive(drive) &amp;&amp;</div><div class='add'>+		    drive-&gt;id[ATA_ID_EIDE_DMA_TIME] &lt; 150)</div><div class='ctx'> 			mode = XFER_MW_DMA_1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -717,7 +335,6 @@ u8 ide_find_dma_mode(ide_drive_t *drive, u8 req_mode)</div><div class='ctx'> </div><div class='ctx'> 	return mode;</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL_GPL(ide_find_dma_mode);</div><div class='ctx'> </div><div class='ctx'> static int ide_tune_dma(ide_drive_t *drive)</div><div class='hunk'>@@ -725,7 +342,8 @@ static int ide_tune_dma(ide_drive_t *drive)</div><div class='ctx'> 	ide_hwif_t *hwif = drive-&gt;hwif;</div><div class='ctx'> 	u8 speed;</div><div class='ctx'> </div><div class='del'>-	if (drive-&gt;nodma || (drive-&gt;id-&gt;capability &amp; 1) == 0)</div><div class='add'>+	if (ata_id_has_dma(drive-&gt;id) == 0 ||</div><div class='add'>+	    (drive-&gt;dev_flags &amp; IDE_DFLAG_NODMA))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* consult the list of known "bad" drives */</div><div class='hunk'>@@ -767,13 +385,15 @@ static int ide_dma_check(ide_drive_t *drive)</div><div class='ctx'> </div><div class='ctx'> int ide_id_dma_bug(ide_drive_t *drive)</div><div class='ctx'> {</div><div class='del'>-	struct hd_driveid *id = drive-&gt;id;</div><div class='add'>+	u16 *id = drive-&gt;id;</div><div class='ctx'> </div><div class='del'>-	if (id-&gt;field_valid &amp; 4) {</div><div class='del'>-		if ((id-&gt;dma_ultra &gt;&gt; 8) &amp;&amp; (id-&gt;dma_mword &gt;&gt; 8))</div><div class='add'>+	if (id[ATA_ID_FIELD_VALID] &amp; 4) {</div><div class='add'>+		if ((id[ATA_ID_UDMA_MODES] &gt;&gt; 8) &amp;&amp;</div><div class='add'>+		    (id[ATA_ID_MWDMA_MODES] &gt;&gt; 8))</div><div class='ctx'> 			goto err_out;</div><div class='del'>-	} else if (id-&gt;field_valid &amp; 2) {</div><div class='del'>-		if ((id-&gt;dma_mword &gt;&gt; 8) &amp;&amp; (id-&gt;dma_1word &gt;&gt; 8))</div><div class='add'>+	} else if (id[ATA_ID_FIELD_VALID] &amp; 2) {</div><div class='add'>+		if ((id[ATA_ID_MWDMA_MODES] &gt;&gt; 8) &amp;&amp;</div><div class='add'>+		    (id[ATA_ID_SWDMA_MODES] &gt;&gt; 8))</div><div class='ctx'> 			goto err_out;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -823,66 +443,59 @@ void ide_check_dma_crc(ide_drive_t *drive)</div><div class='ctx'> 		ide_dma_on(drive);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_BLK_DEV_IDEDMA_SFF</div><div class='del'>-void ide_dma_lost_irq (ide_drive_t *drive)</div><div class='add'>+void ide_dma_lost_irq(ide_drive_t *drive)</div><div class='ctx'> {</div><div class='del'>-	printk("%s: DMA interrupt recovery\n", drive-&gt;name);</div><div class='add'>+	printk(KERN_ERR "%s: DMA interrupt recovery\n", drive-&gt;name);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(ide_dma_lost_irq);</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(ide_dma_lost_irq);</div><div class='del'>-</div><div class='del'>-void ide_dma_timeout (ide_drive_t *drive)</div><div class='add'>+void ide_dma_timeout(ide_drive_t *drive)</div><div class='ctx'> {</div><div class='del'>-	ide_hwif_t *hwif = HWIF(drive);</div><div class='add'>+	ide_hwif_t *hwif = drive-&gt;hwif;</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_ERR "%s: timeout waiting for DMA\n", drive-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	if (hwif-&gt;dma_ops-&gt;dma_test_irq(drive))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	ide_dump_status(drive, "DMA timeout", hwif-&gt;tp_ops-&gt;read_status(hwif));</div><div class='add'>+</div><div class='ctx'> 	hwif-&gt;dma_ops-&gt;dma_end(drive);</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(ide_dma_timeout);</div><div class='add'>+EXPORT_SYMBOL_GPL(ide_dma_timeout);</div><div class='ctx'> </div><div class='ctx'> void ide_release_dma_engine(ide_hwif_t *hwif)</div><div class='ctx'> {</div><div class='ctx'> 	if (hwif-&gt;dmatable_cpu) {</div><div class='del'>-		struct pci_dev *pdev = to_pci_dev(hwif-&gt;dev);</div><div class='add'>+		int prd_size = hwif-&gt;prd_max_nents * hwif-&gt;prd_ent_size;</div><div class='ctx'> </div><div class='del'>-		pci_free_consistent(pdev, PRD_ENTRIES * PRD_BYTES,</div><div class='del'>-				    hwif-&gt;dmatable_cpu, hwif-&gt;dmatable_dma);</div><div class='add'>+		dma_free_coherent(hwif-&gt;dev, prd_size,</div><div class='add'>+				  hwif-&gt;dmatable_cpu, hwif-&gt;dmatable_dma);</div><div class='ctx'> 		hwif-&gt;dmatable_cpu = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(ide_release_dma_engine);</div><div class='ctx'> </div><div class='ctx'> int ide_allocate_dma_engine(ide_hwif_t *hwif)</div><div class='ctx'> {</div><div class='del'>-	struct pci_dev *pdev = to_pci_dev(hwif-&gt;dev);</div><div class='add'>+	int prd_size;</div><div class='ctx'> </div><div class='del'>-	hwif-&gt;dmatable_cpu = pci_alloc_consistent(pdev,</div><div class='del'>-						  PRD_ENTRIES * PRD_BYTES,</div><div class='del'>-						  &amp;hwif-&gt;dmatable_dma);</div><div class='add'>+	if (hwif-&gt;prd_max_nents == 0)</div><div class='add'>+		hwif-&gt;prd_max_nents = PRD_ENTRIES;</div><div class='add'>+	if (hwif-&gt;prd_ent_size == 0)</div><div class='add'>+		hwif-&gt;prd_ent_size = PRD_BYTES;</div><div class='ctx'> </div><div class='del'>-	if (hwif-&gt;dmatable_cpu)</div><div class='del'>-		return 0;</div><div class='add'>+	prd_size = hwif-&gt;prd_max_nents * hwif-&gt;prd_ent_size;</div><div class='ctx'> </div><div class='del'>-	printk(KERN_ERR "%s: -- Error, unable to allocate DMA table.\n",</div><div class='add'>+	hwif-&gt;dmatable_cpu = dma_alloc_coherent(hwif-&gt;dev, prd_size,</div><div class='add'>+						&amp;hwif-&gt;dmatable_dma,</div><div class='add'>+						GFP_ATOMIC);</div><div class='add'>+	if (hwif-&gt;dmatable_cpu == NULL) {</div><div class='add'>+		printk(KERN_ERR "%s: unable to allocate PRD table\n",</div><div class='ctx'> 			hwif-&gt;name);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return 1;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(ide_allocate_dma_engine);</div><div class='del'>-</div><div class='del'>-const struct ide_dma_ops sff_dma_ops = {</div><div class='del'>-	.dma_host_set		= ide_dma_host_set,</div><div class='del'>-	.dma_setup		= ide_dma_setup,</div><div class='del'>-	.dma_exec_cmd		= ide_dma_exec_cmd,</div><div class='del'>-	.dma_start		= ide_dma_start,</div><div class='del'>-	.dma_end		= __ide_dma_end,</div><div class='del'>-	.dma_test_irq		= ide_dma_test_irq,</div><div class='del'>-	.dma_timeout		= ide_dma_timeout,</div><div class='del'>-	.dma_lost_irq		= ide_dma_lost_irq,</div><div class='del'>-};</div><div class='del'>-EXPORT_SYMBOL_GPL(sff_dma_ops);</div><div class='del'>-#endif /* CONFIG_BLK_DEV_IDEDMA_SFF */</div><div class='head'>diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c<br/>index e9034c0125f3..cf0aa25470ee 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/ide-floppy.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ide/ide-floppy.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/ide-floppy.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/ide-floppy.c</a></div><div class='hunk'>@@ -15,6 +15,9 @@</div><div class='ctx'>  * Documentation/ide/ChangeLog.ide-floppy.1996-2002</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#define DRV_NAME "ide-floppy"</div><div class='add'>+#define PFX DRV_NAME ": "</div><div class='add'>+</div><div class='ctx'> #define IDEFLOPPY_VERSION "1.00"</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -31,8 +34,10 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/cdrom.h&gt;</div><div class='ctx'> #include &lt;linux/ide.h&gt;</div><div class='add'>+#include &lt;linux/hdreg.h&gt;</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/scatterlist.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;scsi/scsi_ioctl.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -42,42 +47,27 @@</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;asm/unaligned.h&gt;</div><div class='ctx'> </div><div class='del'>-/* define to see debug info */</div><div class='del'>-#define IDEFLOPPY_DEBUG_LOG		0</div><div class='add'>+#include "ide-floppy.h"</div><div class='ctx'> </div><div class='del'>-/* #define IDEFLOPPY_DEBUG(fmt, args...) printk(KERN_INFO fmt, ## args) */</div><div class='del'>-#define IDEFLOPPY_DEBUG(fmt, args...)</div><div class='add'>+/* module parameters */</div><div class='add'>+static unsigned long debug_mask;</div><div class='add'>+module_param(debug_mask, ulong, 0644);</div><div class='add'>+</div><div class='add'>+/* define to see debug info */</div><div class='add'>+#define IDEFLOPPY_DEBUG_LOG	0</div><div class='ctx'> </div><div class='ctx'> #if IDEFLOPPY_DEBUG_LOG</div><div class='del'>-#define debug_log(fmt, args...) \</div><div class='del'>-	printk(KERN_INFO "ide-floppy: " fmt, ## args)</div><div class='add'>+#define ide_debug_log(lvl, fmt, args...) __ide_debug_log(lvl, fmt, args)</div><div class='ctx'> #else</div><div class='del'>-#define debug_log(fmt, args...) do {} while (0)</div><div class='add'>+#define ide_debug_log(lvl, fmt, args...) do {} while (0)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-/* Some drives require a longer irq timeout. */</div><div class='del'>-#define IDEFLOPPY_WAIT_CMD		(5 * WAIT_CMD)</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * After each failed packet command we issue a request sense command and retry</div><div class='ctx'>  * the packet command IDEFLOPPY_MAX_PC_RETRIES times.</div><div class='ctx'>  */</div><div class='ctx'> #define IDEFLOPPY_MAX_PC_RETRIES	3</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * With each packet command, we allocate a buffer of IDEFLOPPY_PC_BUFFER_SIZE</div><div class='del'>- * bytes.</div><div class='del'>- */</div><div class='del'>-#define IDEFLOPPY_PC_BUFFER_SIZE	256</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * In various places in the driver, we need to allocate storage for packet</div><div class='del'>- * commands and requests, which will remain valid while	we leave the driver to</div><div class='del'>- * wait for an interrupt or a timeout event.</div><div class='del'>- */</div><div class='del'>-#define IDEFLOPPY_PC_STACK		(10 + IDEFLOPPY_MAX_PC_RETRIES)</div><div class='del'>-</div><div class='ctx'> /* format capacities descriptor codes */</div><div class='ctx'> #define CAPACITY_INVALID	0x00</div><div class='ctx'> #define CAPACITY_UNFORMATTED	0x01</div><div class='hunk'>@@ -85,79 +75,16 @@</div><div class='ctx'> #define CAPACITY_NO_CARTRIDGE	0x03</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Most of our global data which we need to save even as we leave the driver</div><div class='del'>- * due to an interrupt or a timer event is stored in a variable of type</div><div class='del'>- * idefloppy_floppy_t, defined below.</div><div class='add'>+ * The following delay solves a problem with ATAPI Zip 100 drive where BSY bit</div><div class='add'>+ * was apparently being deasserted before the unit was ready to receive data.</div><div class='ctx'>  */</div><div class='del'>-typedef struct ide_floppy_obj {</div><div class='del'>-	ide_drive_t	*drive;</div><div class='del'>-	ide_driver_t	*driver;</div><div class='del'>-	struct gendisk	*disk;</div><div class='del'>-	struct kref	kref;</div><div class='del'>-	unsigned int	openers;	/* protected by BKL for now */</div><div class='del'>-</div><div class='del'>-	/* Current packet command */</div><div class='del'>-	struct ide_atapi_pc *pc;</div><div class='del'>-	/* Last failed packet command */</div><div class='del'>-	struct ide_atapi_pc *failed_pc;</div><div class='del'>-	/* Packet command stack */</div><div class='del'>-	struct ide_atapi_pc pc_stack[IDEFLOPPY_PC_STACK];</div><div class='del'>-	/* Next free packet command storage space */</div><div class='del'>-	int pc_stack_index;</div><div class='del'>-	struct request rq_stack[IDEFLOPPY_PC_STACK];</div><div class='del'>-	/* We implement a circular array */</div><div class='del'>-	int rq_stack_index;</div><div class='del'>-</div><div class='del'>-	/* Last error information */</div><div class='del'>-	u8 sense_key, asc, ascq;</div><div class='del'>-	/* delay this long before sending packet command */</div><div class='del'>-	u8 ticks;</div><div class='del'>-	int progress_indication;</div><div class='del'>-</div><div class='del'>-	/* Device information */</div><div class='del'>-	/* Current format */</div><div class='del'>-	int blocks, block_size, bs_factor;</div><div class='del'>-	/* Last format capacity descriptor */</div><div class='del'>-	u8 cap_desc[8];</div><div class='del'>-	/* Copy of the flexible disk page */</div><div class='del'>-	u8 flexible_disk_page[32];</div><div class='del'>-	/* Write protect */</div><div class='del'>-	int wp;</div><div class='del'>-	/* Supports format progress report */</div><div class='del'>-	int srfp;</div><div class='del'>-} idefloppy_floppy_t;</div><div class='del'>-</div><div class='del'>-#define IDEFLOPPY_TICKS_DELAY	HZ/20	/* default delay for ZIP 100 (50ms) */</div><div class='del'>-</div><div class='del'>-/* Defines for the MODE SENSE command */</div><div class='del'>-#define MODE_SENSE_CURRENT		0x00</div><div class='del'>-#define MODE_SENSE_CHANGEABLE		0x01</div><div class='del'>-#define MODE_SENSE_DEFAULT		0x02</div><div class='del'>-#define MODE_SENSE_SAVED		0x03</div><div class='del'>-</div><div class='del'>-/* IOCTLs used in low-level formatting. */</div><div class='del'>-#define	IDEFLOPPY_IOCTL_FORMAT_SUPPORTED	0x4600</div><div class='del'>-#define	IDEFLOPPY_IOCTL_FORMAT_GET_CAPACITY	0x4601</div><div class='del'>-#define	IDEFLOPPY_IOCTL_FORMAT_START		0x4602</div><div class='del'>-#define IDEFLOPPY_IOCTL_FORMAT_GET_PROGRESS	0x4603</div><div class='add'>+#define IDEFLOPPY_PC_DELAY	(HZ/20)	/* default delay for ZIP 100 (50ms) */</div><div class='ctx'> </div><div class='ctx'> /* Error code returned in rq-&gt;errors to the higher part of the driver. */</div><div class='ctx'> #define	IDEFLOPPY_ERROR_GENERAL		101</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Pages of the SELECT SENSE / MODE SENSE packet commands.</div><div class='del'>- * See SFF-8070i spec.</div><div class='del'>- */</div><div class='del'>-#define	IDEFLOPPY_CAPABILITIES_PAGE	0x1b</div><div class='del'>-#define IDEFLOPPY_FLEXIBLE_DISK_PAGE	0x05</div><div class='del'>-</div><div class='ctx'> static DEFINE_MUTEX(idefloppy_ref_mutex);</div><div class='ctx'> </div><div class='del'>-#define to_ide_floppy(obj) container_of(obj, struct ide_floppy_obj, kref)</div><div class='del'>-</div><div class='del'>-#define ide_floppy_g(disk) \</div><div class='del'>-	container_of((disk)-&gt;private_data, struct ide_floppy_obj, driver)</div><div class='del'>-</div><div class='ctx'> static void idefloppy_cleanup_obj(struct kref *);</div><div class='ctx'> </div><div class='ctx'> static struct ide_floppy_obj *ide_floppy_get(struct gendisk *disk)</div><div class='hunk'>@@ -165,7 +92,7 @@ static struct ide_floppy_obj *ide_floppy_get(struct gendisk *disk)</div><div class='ctx'> 	struct ide_floppy_obj *floppy = NULL;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;idefloppy_ref_mutex);</div><div class='del'>-	floppy = ide_floppy_g(disk);</div><div class='add'>+	floppy = ide_drv_g(disk, ide_floppy_obj);</div><div class='ctx'> 	if (floppy) {</div><div class='ctx'> 		if (ide_device_get(floppy-&gt;drive))</div><div class='ctx'> 			floppy = NULL;</div><div class='hunk'>@@ -196,13 +123,21 @@ static int idefloppy_end_request(ide_drive_t *drive, int uptodate, int nsecs)</div><div class='ctx'> 	struct request *rq = HWGROUP(drive)-&gt;rq;</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='del'>-	debug_log("Reached %s\n", __func__);</div><div class='add'>+	ide_debug_log(IDE_DBG_FUNC, "Call %s\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	switch (uptodate) {</div><div class='del'>-	case 0: error = IDEFLOPPY_ERROR_GENERAL; break;</div><div class='del'>-	case 1: error = 0; break;</div><div class='del'>-	default: error = uptodate;</div><div class='add'>+	case 0:</div><div class='add'>+		error = IDEFLOPPY_ERROR_GENERAL;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 1:</div><div class='add'>+		error = 0;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		error = uptodate;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		floppy-&gt;failed_pc = NULL;</div><div class='ctx'> 	/* Why does this happen? */</div><div class='hunk'>@@ -219,44 +154,6 @@ static int idefloppy_end_request(ide_drive_t *drive, int uptodate, int nsecs)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ide_floppy_io_buffers(ide_drive_t *drive, struct ide_atapi_pc *pc,</div><div class='del'>-				  unsigned int bcount, int direction)</div><div class='del'>-{</div><div class='del'>-	ide_hwif_t *hwif = drive-&gt;hwif;</div><div class='del'>-	struct request *rq = pc-&gt;rq;</div><div class='del'>-	struct req_iterator iter;</div><div class='del'>-	struct bio_vec *bvec;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int count, done = 0;</div><div class='del'>-	char *data;</div><div class='del'>-</div><div class='del'>-	rq_for_each_segment(bvec, rq, iter) {</div><div class='del'>-		if (!bcount)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		count = min(bvec-&gt;bv_len, bcount);</div><div class='del'>-</div><div class='del'>-		data = bvec_kmap_irq(bvec, &amp;flags);</div><div class='del'>-		if (direction)</div><div class='del'>-			hwif-&gt;tp_ops-&gt;output_data(drive, NULL, data, count);</div><div class='del'>-		else</div><div class='del'>-			hwif-&gt;tp_ops-&gt;input_data(drive, NULL, data, count);</div><div class='del'>-		bvec_kunmap_irq(data, &amp;flags);</div><div class='del'>-</div><div class='del'>-		bcount -= count;</div><div class='del'>-		pc-&gt;b_count += count;</div><div class='del'>-		done += count;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	idefloppy_end_request(drive, 1, done &gt;&gt; 9);</div><div class='del'>-</div><div class='del'>-	if (bcount) {</div><div class='del'>-		printk(KERN_ERR "%s: leftover data in %s, bcount == %d\n",</div><div class='del'>-				drive-&gt;name, __func__, bcount);</div><div class='del'>-		ide_pad_transfer(drive, direction, bcount);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void idefloppy_update_buffers(ide_drive_t *drive,</div><div class='ctx'> 				struct ide_atapi_pc *pc)</div><div class='ctx'> {</div><div class='hunk'>@@ -267,50 +164,13 @@ static void idefloppy_update_buffers(ide_drive_t *drive,</div><div class='ctx'> 		idefloppy_end_request(drive, 1, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Generate a new packet command request in front of the request queue, before</div><div class='del'>- * the current request so that it will be processed immediately, on the next</div><div class='del'>- * pass through the driver.</div><div class='del'>- */</div><div class='del'>-static void idefloppy_queue_pc_head(ide_drive_t *drive, struct ide_atapi_pc *pc,</div><div class='del'>-		struct request *rq)</div><div class='del'>-{</div><div class='del'>-	struct ide_floppy_obj *floppy = drive-&gt;driver_data;</div><div class='del'>-</div><div class='del'>-	blk_rq_init(NULL, rq);</div><div class='del'>-	rq-&gt;buffer = (char *) pc;</div><div class='del'>-	rq-&gt;cmd_type = REQ_TYPE_SPECIAL;</div><div class='del'>-	rq-&gt;cmd_flags |= REQ_PREEMPT;</div><div class='del'>-	rq-&gt;rq_disk = floppy-&gt;disk;</div><div class='del'>-	memcpy(rq-&gt;cmd, pc-&gt;c, 12);</div><div class='del'>-	ide_do_drive_cmd(drive, rq);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct ide_atapi_pc *idefloppy_next_pc_storage(ide_drive_t *drive)</div><div class='add'>+static void ide_floppy_callback(ide_drive_t *drive, int dsc)</div><div class='ctx'> {</div><div class='ctx'> 	idefloppy_floppy_t *floppy = drive-&gt;driver_data;</div><div class='del'>-</div><div class='del'>-	if (floppy-&gt;pc_stack_index == IDEFLOPPY_PC_STACK)</div><div class='del'>-		floppy-&gt;pc_stack_index = 0;</div><div class='del'>-	return (&amp;floppy-&gt;pc_stack[floppy-&gt;pc_stack_index++]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct request *idefloppy_next_rq_storage(ide_drive_t *drive)</div><div class='del'>-{</div><div class='del'>-	idefloppy_floppy_t *floppy = drive-&gt;driver_data;</div><div class='del'>-</div><div class='del'>-	if (floppy-&gt;rq_stack_index == IDEFLOPPY_PC_STACK)</div><div class='del'>-		floppy-&gt;rq_stack_index = 0;</div><div class='del'>-	return (&amp;floppy-&gt;rq_stack[floppy-&gt;rq_stack_index++]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ide_floppy_callback(ide_drive_t *drive)</div><div class='del'>-{</div><div class='del'>-	idefloppy_floppy_t *floppy = drive-&gt;driver_data;</div><div class='del'>-	struct ide_atapi_pc *pc = floppy-&gt;pc;</div><div class='add'>+	struct ide_atapi_pc *pc = drive-&gt;pc;</div><div class='ctx'> 	int uptodate = pc-&gt;error ? 0 : 1;</div><div class='ctx'> </div><div class='del'>-	debug_log("Reached %s\n", __func__);</div><div class='add'>+	ide_debug_log(IDE_DBG_FUNC, "Call %s\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	if (floppy-&gt;failed_pc == pc)</div><div class='ctx'> 		floppy-&gt;failed_pc = NULL;</div><div class='hunk'>@@ -319,7 +179,7 @@ static void ide_floppy_callback(ide_drive_t *drive)</div><div class='ctx'> 	    (pc-&gt;rq &amp;&amp; blk_pc_request(pc-&gt;rq)))</div><div class='ctx'> 		uptodate = 1; /* FIXME */</div><div class='ctx'> 	else if (pc-&gt;c[0] == GPCMD_REQUEST_SENSE) {</div><div class='del'>-		u8 *buf = floppy-&gt;pc-&gt;buf;</div><div class='add'>+		u8 *buf = pc-&gt;buf;</div><div class='ctx'> </div><div class='ctx'> 		if (!pc-&gt;error) {</div><div class='ctx'> 			floppy-&gt;sense_key = buf[2] &amp; 0x0F;</div><div class='hunk'>@@ -329,108 +189,20 @@ static void ide_floppy_callback(ide_drive_t *drive)</div><div class='ctx'> 				(u16)get_unaligned((u16 *)&amp;buf[16]) : 0x10000;</div><div class='ctx'> </div><div class='ctx'> 			if (floppy-&gt;failed_pc)</div><div class='del'>-				debug_log("pc = %x, ", floppy-&gt;failed_pc-&gt;c[0]);</div><div class='add'>+				ide_debug_log(IDE_DBG_PC, "pc = %x, ",</div><div class='add'>+					      floppy-&gt;failed_pc-&gt;c[0]);</div><div class='ctx'> </div><div class='del'>-			debug_log("sense key = %x, asc = %x, ascq = %x\n",</div><div class='del'>-				  floppy-&gt;sense_key, floppy-&gt;asc, floppy-&gt;ascq);</div><div class='add'>+			ide_debug_log(IDE_DBG_SENSE, "sense key = %x, asc = %x,"</div><div class='add'>+				      "ascq = %x\n", floppy-&gt;sense_key,</div><div class='add'>+				      floppy-&gt;asc, floppy-&gt;ascq);</div><div class='ctx'> 		} else</div><div class='del'>-			printk(KERN_ERR "Error in REQUEST SENSE itself - "</div><div class='del'>-					"Aborting request!\n");</div><div class='add'>+			printk(KERN_ERR PFX "Error in REQUEST SENSE itself - "</div><div class='add'>+			       "Aborting request!\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	idefloppy_end_request(drive, uptodate, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void idefloppy_init_pc(struct ide_atapi_pc *pc)</div><div class='del'>-{</div><div class='del'>-	memset(pc, 0, sizeof(*pc));</div><div class='del'>-	pc-&gt;buf = pc-&gt;pc_buf;</div><div class='del'>-	pc-&gt;buf_size = IDEFLOPPY_PC_BUFFER_SIZE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void idefloppy_create_request_sense_cmd(struct ide_atapi_pc *pc)</div><div class='del'>-{</div><div class='del'>-	idefloppy_init_pc(pc);</div><div class='del'>-	pc-&gt;c[0] = GPCMD_REQUEST_SENSE;</div><div class='del'>-	pc-&gt;c[4] = 255;</div><div class='del'>-	pc-&gt;req_xfer = 18;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Called when an error was detected during the last packet command. We queue a</div><div class='del'>- * request sense packet command in the head of the request list.</div><div class='del'>- */</div><div class='del'>-static void idefloppy_retry_pc(ide_drive_t *drive)</div><div class='del'>-{</div><div class='del'>-	struct ide_atapi_pc *pc;</div><div class='del'>-	struct request *rq;</div><div class='del'>-</div><div class='del'>-	(void)ide_read_error(drive);</div><div class='del'>-	pc = idefloppy_next_pc_storage(drive);</div><div class='del'>-	rq = idefloppy_next_rq_storage(drive);</div><div class='del'>-	idefloppy_create_request_sense_cmd(pc);</div><div class='del'>-	idefloppy_queue_pc_head(drive, pc, rq);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* The usual interrupt handler called during a packet command. */</div><div class='del'>-static ide_startstop_t idefloppy_pc_intr(ide_drive_t *drive)</div><div class='del'>-{</div><div class='del'>-	idefloppy_floppy_t *floppy = drive-&gt;driver_data;</div><div class='del'>-</div><div class='del'>-	return ide_pc_intr(drive, floppy-&gt;pc, idefloppy_pc_intr,</div><div class='del'>-			   IDEFLOPPY_WAIT_CMD, NULL, idefloppy_update_buffers,</div><div class='del'>-			   idefloppy_retry_pc, NULL, ide_floppy_io_buffers);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * What we have here is a classic case of a top half / bottom half interrupt</div><div class='del'>- * service routine. In interrupt mode, the device sends an interrupt to signal</div><div class='del'>- * that it is ready to receive a packet. However, we need to delay about 2-3</div><div class='del'>- * ticks before issuing the packet or we gets in trouble.</div><div class='del'>- */</div><div class='del'>-static int idefloppy_transfer_pc(ide_drive_t *drive)</div><div class='del'>-{</div><div class='del'>-	idefloppy_floppy_t *floppy = drive-&gt;driver_data;</div><div class='del'>-</div><div class='del'>-	/* Send the actual packet */</div><div class='del'>-	drive-&gt;hwif-&gt;tp_ops-&gt;output_data(drive, NULL, floppy-&gt;pc-&gt;c, 12);</div><div class='del'>-</div><div class='del'>-	/* Timeout for the packet command */</div><div class='del'>-	return IDEFLOPPY_WAIT_CMD;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Called as an interrupt (or directly). When the device says it's ready for a</div><div class='del'>- * packet, we schedule the packet transfer to occur about 2-3 ticks later in</div><div class='del'>- * transfer_pc.</div><div class='del'>- */</div><div class='del'>-static ide_startstop_t idefloppy_start_pc_transfer(ide_drive_t *drive)</div><div class='del'>-{</div><div class='del'>-	idefloppy_floppy_t *floppy = drive-&gt;driver_data;</div><div class='del'>-	struct ide_atapi_pc *pc = floppy-&gt;pc;</div><div class='del'>-	ide_expiry_t *expiry;</div><div class='del'>-	unsigned int timeout;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * The following delay solves a problem with ATAPI Zip 100 drives</div><div class='del'>-	 * where the Busy flag was apparently being deasserted before the</div><div class='del'>-	 * unit was ready to receive data. This was happening on a</div><div class='del'>-	 * 1200 MHz Athlon system. 10/26/01 25msec is too short,</div><div class='del'>-	 * 40 and 50msec work well. idefloppy_pc_intr will not be actually</div><div class='del'>-	 * used until after the packet is moved in about 50 msec.</div><div class='del'>-	 */</div><div class='del'>-	if (drive-&gt;atapi_flags &amp; IDE_AFLAG_ZIP_DRIVE) {</div><div class='del'>-		timeout = floppy-&gt;ticks;</div><div class='del'>-		expiry = &amp;idefloppy_transfer_pc;</div><div class='del'>-	} else {</div><div class='del'>-		timeout = IDEFLOPPY_WAIT_CMD;</div><div class='del'>-		expiry = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ide_transfer_pc(drive, pc, idefloppy_pc_intr, timeout, expiry);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void ide_floppy_report_error(idefloppy_floppy_t *floppy,</div><div class='ctx'> 				    struct ide_atapi_pc *pc)</div><div class='ctx'> {</div><div class='hunk'>@@ -440,7 +212,7 @@ static void ide_floppy_report_error(idefloppy_floppy_t *floppy,</div><div class='ctx'> 	    floppy-&gt;ascq      == 0x00)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	printk(KERN_ERR "ide-floppy: %s: I/O error, pc = %2x, key = %2x, "</div><div class='add'>+	printk(KERN_ERR PFX "%s: I/O error, pc = %2x, key = %2x, "</div><div class='ctx'> 			"asc = %2x, ascq = %2x\n",</div><div class='ctx'> 			floppy-&gt;drive-&gt;name, pc-&gt;c[0], floppy-&gt;sense_key,</div><div class='ctx'> 			floppy-&gt;asc, floppy-&gt;ascq);</div><div class='hunk'>@@ -455,8 +227,9 @@ static ide_startstop_t idefloppy_issue_pc(ide_drive_t *drive,</div><div class='ctx'> 	if (floppy-&gt;failed_pc == NULL &amp;&amp;</div><div class='ctx'> 	    pc-&gt;c[0] != GPCMD_REQUEST_SENSE)</div><div class='ctx'> 		floppy-&gt;failed_pc = pc;</div><div class='add'>+</div><div class='ctx'> 	/* Set the current packet command */</div><div class='del'>-	floppy-&gt;pc = pc;</div><div class='add'>+	drive-&gt;pc = pc;</div><div class='ctx'> </div><div class='ctx'> 	if (pc-&gt;retries &gt; IDEFLOPPY_MAX_PC_RETRIES) {</div><div class='ctx'> 		if (!(pc-&gt;flags &amp; PC_FLAG_SUPPRESS_ERROR))</div><div class='hunk'>@@ -465,67 +238,35 @@ static ide_startstop_t idefloppy_issue_pc(ide_drive_t *drive,</div><div class='ctx'> 		pc-&gt;error = IDEFLOPPY_ERROR_GENERAL;</div><div class='ctx'> </div><div class='ctx'> 		floppy-&gt;failed_pc = NULL;</div><div class='del'>-		drive-&gt;pc_callback(drive);</div><div class='add'>+		drive-&gt;pc_callback(drive, 0);</div><div class='ctx'> 		return ide_stopped;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	debug_log("Retry number - %d\n", pc-&gt;retries);</div><div class='add'>+	ide_debug_log(IDE_DBG_FUNC, "%s: Retry #%d\n", __func__, pc-&gt;retries);</div><div class='ctx'> </div><div class='ctx'> 	pc-&gt;retries++;</div><div class='ctx'> </div><div class='del'>-	return ide_issue_pc(drive, pc, idefloppy_start_pc_transfer,</div><div class='del'>-			    IDEFLOPPY_WAIT_CMD, NULL);</div><div class='add'>+	return ide_issue_pc(drive, WAIT_FLOPPY_CMD, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void idefloppy_create_prevent_cmd(struct ide_atapi_pc *pc, int prevent)</div><div class='add'>+void ide_floppy_create_read_capacity_cmd(struct ide_atapi_pc *pc)</div><div class='ctx'> {</div><div class='del'>-	debug_log("creating prevent removal command, prevent = %d\n", prevent);</div><div class='del'>-</div><div class='del'>-	idefloppy_init_pc(pc);</div><div class='del'>-	pc-&gt;c[0] = GPCMD_PREVENT_ALLOW_MEDIUM_REMOVAL;</div><div class='del'>-	pc-&gt;c[4] = prevent;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void idefloppy_create_read_capacity_cmd(struct ide_atapi_pc *pc)</div><div class='del'>-{</div><div class='del'>-	idefloppy_init_pc(pc);</div><div class='add'>+	ide_init_pc(pc);</div><div class='ctx'> 	pc-&gt;c[0] = GPCMD_READ_FORMAT_CAPACITIES;</div><div class='ctx'> 	pc-&gt;c[7] = 255;</div><div class='ctx'> 	pc-&gt;c[8] = 255;</div><div class='ctx'> 	pc-&gt;req_xfer = 255;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void idefloppy_create_format_unit_cmd(struct ide_atapi_pc *pc, int b,</div><div class='del'>-		int l, int flags)</div><div class='del'>-{</div><div class='del'>-	idefloppy_init_pc(pc);</div><div class='del'>-	pc-&gt;c[0] = GPCMD_FORMAT_UNIT;</div><div class='del'>-	pc-&gt;c[1] = 0x17;</div><div class='del'>-</div><div class='del'>-	memset(pc-&gt;buf, 0, 12);</div><div class='del'>-	pc-&gt;buf[1] = 0xA2;</div><div class='del'>-	/* Default format list header, u8 1: FOV/DCRT/IMM bits set */</div><div class='del'>-</div><div class='del'>-	if (flags &amp; 1)				/* Verify bit on... */</div><div class='del'>-		pc-&gt;buf[1] ^= 0x20;		/* ... turn off DCRT bit */</div><div class='del'>-	pc-&gt;buf[3] = 8;</div><div class='del'>-</div><div class='del'>-	put_unaligned(cpu_to_be32(b), (unsigned int *)(&amp;pc-&gt;buf[4]));</div><div class='del'>-	put_unaligned(cpu_to_be32(l), (unsigned int *)(&amp;pc-&gt;buf[8]));</div><div class='del'>-	pc-&gt;buf_size = 12;</div><div class='del'>-	pc-&gt;flags |= PC_FLAG_WRITING;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* A mode sense command is used to "sense" floppy parameters. */</div><div class='del'>-static void idefloppy_create_mode_sense_cmd(struct ide_atapi_pc *pc,</div><div class='del'>-		u8 page_code, u8 type)</div><div class='add'>+void ide_floppy_create_mode_sense_cmd(struct ide_atapi_pc *pc, u8 page_code)</div><div class='ctx'> {</div><div class='ctx'> 	u16 length = 8; /* sizeof(Mode Parameter Header) = 8 Bytes */</div><div class='ctx'> </div><div class='del'>-	idefloppy_init_pc(pc);</div><div class='add'>+	ide_init_pc(pc);</div><div class='ctx'> 	pc-&gt;c[0] = GPCMD_MODE_SENSE_10;</div><div class='ctx'> 	pc-&gt;c[1] = 0;</div><div class='del'>-	pc-&gt;c[2] = page_code + (type &lt;&lt; 6);</div><div class='add'>+	pc-&gt;c[2] = page_code;</div><div class='ctx'> </div><div class='ctx'> 	switch (page_code) {</div><div class='ctx'> 	case IDEFLOPPY_CAPABILITIES_PAGE:</div><div class='hunk'>@@ -535,32 +276,25 @@ static void idefloppy_create_mode_sense_cmd(struct ide_atapi_pc *pc,</div><div class='ctx'> 		length += 32;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		printk(KERN_ERR "ide-floppy: unsupported page code "</div><div class='del'>-				"in create_mode_sense_cmd\n");</div><div class='add'>+		printk(KERN_ERR PFX "unsupported page code in %s\n", __func__);</div><div class='ctx'> 	}</div><div class='ctx'> 	put_unaligned(cpu_to_be16(length), (u16 *) &amp;pc-&gt;c[7]);</div><div class='ctx'> 	pc-&gt;req_xfer = length;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void idefloppy_create_start_stop_cmd(struct ide_atapi_pc *pc, int start)</div><div class='del'>-{</div><div class='del'>-	idefloppy_init_pc(pc);</div><div class='del'>-	pc-&gt;c[0] = GPCMD_START_STOP_UNIT;</div><div class='del'>-	pc-&gt;c[4] = start;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void idefloppy_create_rw_cmd(idefloppy_floppy_t *floppy,</div><div class='add'>+static void idefloppy_create_rw_cmd(ide_drive_t *drive,</div><div class='ctx'> 				    struct ide_atapi_pc *pc, struct request *rq,</div><div class='ctx'> 				    unsigned long sector)</div><div class='ctx'> {</div><div class='add'>+	idefloppy_floppy_t *floppy = drive-&gt;driver_data;</div><div class='ctx'> 	int block = sector / floppy-&gt;bs_factor;</div><div class='ctx'> 	int blocks = rq-&gt;nr_sectors / floppy-&gt;bs_factor;</div><div class='ctx'> 	int cmd = rq_data_dir(rq);</div><div class='ctx'> </div><div class='del'>-	debug_log("create_rw10_cmd: block == %d, blocks == %d\n",</div><div class='del'>-		block, blocks);</div><div class='add'>+	ide_debug_log(IDE_DBG_FUNC, "%s: block: %d, blocks: %d\n", __func__,</div><div class='add'>+		      block, blocks);</div><div class='ctx'> </div><div class='del'>-	idefloppy_init_pc(pc);</div><div class='add'>+	ide_init_pc(pc);</div><div class='ctx'> 	pc-&gt;c[0] = cmd == READ ? GPCMD_READ_10 : GPCMD_WRITE_10;</div><div class='ctx'> 	put_unaligned(cpu_to_be16(blocks), (unsigned short *)&amp;pc-&gt;c[7]);</div><div class='ctx'> 	put_unaligned(cpu_to_be32(block), (unsigned int *) &amp;pc-&gt;c[2]);</div><div class='hunk'>@@ -568,7 +302,7 @@ static void idefloppy_create_rw_cmd(idefloppy_floppy_t *floppy,</div><div class='ctx'> 	memcpy(rq-&gt;cmd, pc-&gt;c, 12);</div><div class='ctx'> </div><div class='ctx'> 	pc-&gt;rq = rq;</div><div class='del'>-	pc-&gt;b_count = cmd == READ ? 0 : rq-&gt;bio-&gt;bi_size;</div><div class='add'>+	pc-&gt;b_count = 0;</div><div class='ctx'> 	if (rq-&gt;cmd_flags &amp; REQ_RW)</div><div class='ctx'> 		pc-&gt;flags |= PC_FLAG_WRITING;</div><div class='ctx'> 	pc-&gt;buf = NULL;</div><div class='hunk'>@@ -579,10 +313,10 @@ static void idefloppy_create_rw_cmd(idefloppy_floppy_t *floppy,</div><div class='ctx'> static void idefloppy_blockpc_cmd(idefloppy_floppy_t *floppy,</div><div class='ctx'> 		struct ide_atapi_pc *pc, struct request *rq)</div><div class='ctx'> {</div><div class='del'>-	idefloppy_init_pc(pc);</div><div class='add'>+	ide_init_pc(pc);</div><div class='ctx'> 	memcpy(pc-&gt;c, rq-&gt;cmd, sizeof(pc-&gt;c));</div><div class='ctx'> 	pc-&gt;rq = rq;</div><div class='del'>-	pc-&gt;b_count = rq-&gt;data_len;</div><div class='add'>+	pc-&gt;b_count = 0;</div><div class='ctx'> 	if (rq-&gt;data_len &amp;&amp; rq_data_dir(rq) == WRITE)</div><div class='ctx'> 		pc-&gt;flags |= PC_FLAG_WRITING;</div><div class='ctx'> 	pc-&gt;buf = rq-&gt;data;</div><div class='hunk'>@@ -599,70 +333,59 @@ static ide_startstop_t idefloppy_do_request(ide_drive_t *drive,</div><div class='ctx'> 		struct request *rq, sector_t block_s)</div><div class='ctx'> {</div><div class='ctx'> 	idefloppy_floppy_t *floppy = drive-&gt;driver_data;</div><div class='add'>+	ide_hwif_t *hwif = drive-&gt;hwif;</div><div class='ctx'> 	struct ide_atapi_pc *pc;</div><div class='ctx'> 	unsigned long block = (unsigned long)block_s;</div><div class='ctx'> </div><div class='del'>-	debug_log("dev: %s, cmd_type: %x, errors: %d\n",</div><div class='del'>-			rq-&gt;rq_disk ? rq-&gt;rq_disk-&gt;disk_name : "?",</div><div class='del'>-			rq-&gt;cmd_type, rq-&gt;errors);</div><div class='del'>-	debug_log("sector: %ld, nr_sectors: %ld, "</div><div class='del'>-			"current_nr_sectors: %d\n", (long)rq-&gt;sector,</div><div class='del'>-			rq-&gt;nr_sectors, rq-&gt;current_nr_sectors);</div><div class='add'>+	ide_debug_log(IDE_DBG_FUNC, "%s: dev: %s, cmd: 0x%x, cmd_type: %x, "</div><div class='add'>+		      "errors: %d\n",</div><div class='add'>+		      __func__, rq-&gt;rq_disk ? rq-&gt;rq_disk-&gt;disk_name : "?",</div><div class='add'>+		      rq-&gt;cmd[0], rq-&gt;cmd_type, rq-&gt;errors);</div><div class='add'>+</div><div class='add'>+	ide_debug_log(IDE_DBG_FUNC, "%s: sector: %ld, nr_sectors: %ld, "</div><div class='add'>+		      "current_nr_sectors: %d\n",</div><div class='add'>+		      __func__, (long)rq-&gt;sector, rq-&gt;nr_sectors,</div><div class='add'>+		      rq-&gt;current_nr_sectors);</div><div class='ctx'> </div><div class='ctx'> 	if (rq-&gt;errors &gt;= ERROR_MAX) {</div><div class='ctx'> 		if (floppy-&gt;failed_pc)</div><div class='ctx'> 			ide_floppy_report_error(floppy, floppy-&gt;failed_pc);</div><div class='ctx'> 		else</div><div class='del'>-			printk(KERN_ERR "ide-floppy: %s: I/O error\n",</div><div class='del'>-				drive-&gt;name);</div><div class='add'>+			printk(KERN_ERR PFX "%s: I/O error\n", drive-&gt;name);</div><div class='add'>+</div><div class='ctx'> 		idefloppy_end_request(drive, 0, 0);</div><div class='ctx'> 		return ide_stopped;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (blk_fs_request(rq)) {</div><div class='ctx'> 		if (((long)rq-&gt;sector % floppy-&gt;bs_factor) ||</div><div class='ctx'> 		    (rq-&gt;nr_sectors % floppy-&gt;bs_factor)) {</div><div class='del'>-			printk(KERN_ERR "%s: unsupported r/w request size\n",</div><div class='del'>-					drive-&gt;name);</div><div class='add'>+			printk(KERN_ERR PFX "%s: unsupported r/w rq size\n",</div><div class='add'>+				drive-&gt;name);</div><div class='ctx'> 			idefloppy_end_request(drive, 0, 0);</div><div class='ctx'> 			return ide_stopped;</div><div class='ctx'> 		}</div><div class='del'>-		pc = idefloppy_next_pc_storage(drive);</div><div class='del'>-		idefloppy_create_rw_cmd(floppy, pc, rq, block);</div><div class='add'>+		pc = &amp;floppy-&gt;queued_pc;</div><div class='add'>+		idefloppy_create_rw_cmd(drive, pc, rq, block);</div><div class='ctx'> 	} else if (blk_special_request(rq)) {</div><div class='ctx'> 		pc = (struct ide_atapi_pc *) rq-&gt;buffer;</div><div class='ctx'> 	} else if (blk_pc_request(rq)) {</div><div class='del'>-		pc = idefloppy_next_pc_storage(drive);</div><div class='add'>+		pc = &amp;floppy-&gt;queued_pc;</div><div class='ctx'> 		idefloppy_blockpc_cmd(floppy, pc, rq);</div><div class='ctx'> 	} else {</div><div class='del'>-		blk_dump_rq_flags(rq,</div><div class='del'>-			"ide-floppy: unsupported command in queue");</div><div class='add'>+		blk_dump_rq_flags(rq, PFX "unsupported command in queue");</div><div class='ctx'> 		idefloppy_end_request(drive, 0, 0);</div><div class='ctx'> 		return ide_stopped;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pc-&gt;rq = rq;</div><div class='add'>+	ide_init_sg_cmd(drive, rq);</div><div class='add'>+	ide_map_sg(drive, rq);</div><div class='ctx'> </div><div class='del'>-	return idefloppy_issue_pc(drive, pc);</div><div class='del'>-}</div><div class='add'>+	pc-&gt;sg = hwif-&gt;sg_table;</div><div class='add'>+	pc-&gt;sg_cnt = hwif-&gt;sg_nents;</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Add a special packet command request to the tail of the request queue,</div><div class='del'>- * and wait for it to be serviced.</div><div class='del'>- */</div><div class='del'>-static int idefloppy_queue_pc_tail(ide_drive_t *drive, struct ide_atapi_pc *pc)</div><div class='del'>-{</div><div class='del'>-	struct ide_floppy_obj *floppy = drive-&gt;driver_data;</div><div class='del'>-	struct request *rq;</div><div class='del'>-	int error;</div><div class='del'>-</div><div class='del'>-	rq = blk_get_request(drive-&gt;queue, READ, __GFP_WAIT);</div><div class='del'>-	rq-&gt;buffer = (char *) pc;</div><div class='del'>-	rq-&gt;cmd_type = REQ_TYPE_SPECIAL;</div><div class='del'>-	memcpy(rq-&gt;cmd, pc-&gt;c, 12);</div><div class='del'>-	error = blk_execute_rq(drive-&gt;queue, floppy-&gt;disk, rq, 0);</div><div class='del'>-	blk_put_request(rq);</div><div class='add'>+	pc-&gt;rq = rq;</div><div class='ctx'> </div><div class='del'>-	return error;</div><div class='add'>+	return idefloppy_issue_pc(drive, pc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -672,22 +395,27 @@ static int idefloppy_queue_pc_tail(ide_drive_t *drive, struct ide_atapi_pc *pc)</div><div class='ctx'> static int ide_floppy_get_flexible_disk_page(ide_drive_t *drive)</div><div class='ctx'> {</div><div class='ctx'> 	idefloppy_floppy_t *floppy = drive-&gt;driver_data;</div><div class='add'>+	struct gendisk *disk = floppy-&gt;disk;</div><div class='ctx'> 	struct ide_atapi_pc pc;</div><div class='ctx'> 	u8 *page;</div><div class='ctx'> 	int capacity, lba_capacity;</div><div class='ctx'> 	u16 transfer_rate, sector_size, cyls, rpm;</div><div class='ctx'> 	u8 heads, sectors;</div><div class='ctx'> </div><div class='del'>-	idefloppy_create_mode_sense_cmd(&amp;pc, IDEFLOPPY_FLEXIBLE_DISK_PAGE,</div><div class='del'>-					MODE_SENSE_CURRENT);</div><div class='add'>+	ide_floppy_create_mode_sense_cmd(&amp;pc, IDEFLOPPY_FLEXIBLE_DISK_PAGE);</div><div class='ctx'> </div><div class='del'>-	if (idefloppy_queue_pc_tail(drive, &amp;pc)) {</div><div class='del'>-		printk(KERN_ERR "ide-floppy: Can't get flexible disk page"</div><div class='del'>-				" parameters\n");</div><div class='add'>+	if (ide_queue_pc_tail(drive, disk, &amp;pc)) {</div><div class='add'>+		printk(KERN_ERR PFX "Can't get flexible disk page params\n");</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='del'>-	floppy-&gt;wp = !!(pc.buf[3] &amp; 0x80);</div><div class='del'>-	set_disk_ro(floppy-&gt;disk, floppy-&gt;wp);</div><div class='add'>+</div><div class='add'>+	if (pc.buf[3] &amp; 0x80)</div><div class='add'>+		drive-&gt;atapi_flags |= IDE_AFLAG_WP;</div><div class='add'>+	else</div><div class='add'>+		drive-&gt;atapi_flags &amp;= ~IDE_AFLAG_WP;</div><div class='add'>+</div><div class='add'>+	set_disk_ro(disk, !!(drive-&gt;atapi_flags &amp; IDE_AFLAG_WP));</div><div class='add'>+</div><div class='ctx'> 	page = &amp;pc.buf[8];</div><div class='ctx'> </div><div class='ctx'> 	transfer_rate = be16_to_cpup((__be16 *)&amp;pc.buf[8 + 2]);</div><div class='hunk'>@@ -700,7 +428,7 @@ static int ide_floppy_get_flexible_disk_page(ide_drive_t *drive)</div><div class='ctx'> 	capacity = cyls * heads * sectors * sector_size;</div><div class='ctx'> </div><div class='ctx'> 	if (memcmp(page, &amp;floppy-&gt;flexible_disk_page, 32))</div><div class='del'>-		printk(KERN_INFO "%s: %dkB, %d/%d/%d CHS, %d kBps, "</div><div class='add'>+		printk(KERN_INFO PFX "%s: %dkB, %d/%d/%d CHS, %d kBps, "</div><div class='ctx'> 				"%d sector size, %d rpm\n",</div><div class='ctx'> 				drive-&gt;name, capacity / 1024, cyls, heads,</div><div class='ctx'> 				sectors, transfer_rate / 8, sector_size, rpm);</div><div class='hunk'>@@ -712,7 +440,7 @@ static int ide_floppy_get_flexible_disk_page(ide_drive_t *drive)</div><div class='ctx'> 	lba_capacity = floppy-&gt;blocks * floppy-&gt;block_size;</div><div class='ctx'> </div><div class='ctx'> 	if (capacity &lt; lba_capacity) {</div><div class='del'>-		printk(KERN_NOTICE "%s: The disk reports a capacity of %d "</div><div class='add'>+		printk(KERN_NOTICE PFX "%s: The disk reports a capacity of %d "</div><div class='ctx'> 			"bytes, but the drive only handles %d\n",</div><div class='ctx'> 			drive-&gt;name, lba_capacity, capacity);</div><div class='ctx'> 		floppy-&gt;blocks = floppy-&gt;block_size ?</div><div class='hunk'>@@ -721,23 +449,6 @@ static int ide_floppy_get_flexible_disk_page(ide_drive_t *drive)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int idefloppy_get_sfrp_bit(ide_drive_t *drive)</div><div class='del'>-{</div><div class='del'>-	idefloppy_floppy_t *floppy = drive-&gt;driver_data;</div><div class='del'>-	struct ide_atapi_pc pc;</div><div class='del'>-</div><div class='del'>-	floppy-&gt;srfp = 0;</div><div class='del'>-	idefloppy_create_mode_sense_cmd(&amp;pc, IDEFLOPPY_CAPABILITIES_PAGE,</div><div class='del'>-						 MODE_SENSE_CURRENT);</div><div class='del'>-</div><div class='del'>-	pc.flags |= PC_FLAG_SUPPRESS_ERROR;</div><div class='del'>-	if (idefloppy_queue_pc_tail(drive, &amp;pc))</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	floppy-&gt;srfp = pc.buf[8 + 2] &amp; 0x40;</div><div class='del'>-	return (0);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Determine if a media is present in the floppy drive, and if so, its LBA</div><div class='ctx'>  * capacity.</div><div class='hunk'>@@ -745,6 +456,7 @@ static int idefloppy_get_sfrp_bit(ide_drive_t *drive)</div><div class='ctx'> static int ide_floppy_get_capacity(ide_drive_t *drive)</div><div class='ctx'> {</div><div class='ctx'> 	idefloppy_floppy_t *floppy = drive-&gt;driver_data;</div><div class='add'>+	struct gendisk *disk = floppy-&gt;disk;</div><div class='ctx'> 	struct ide_atapi_pc pc;</div><div class='ctx'> 	u8 *cap_desc;</div><div class='ctx'> 	u8 header_len, desc_cnt;</div><div class='hunk'>@@ -756,9 +468,9 @@ static int ide_floppy_get_capacity(ide_drive_t *drive)</div><div class='ctx'> 	floppy-&gt;bs_factor = 1;</div><div class='ctx'> 	set_capacity(floppy-&gt;disk, 0);</div><div class='ctx'> </div><div class='del'>-	idefloppy_create_read_capacity_cmd(&amp;pc);</div><div class='del'>-	if (idefloppy_queue_pc_tail(drive, &amp;pc)) {</div><div class='del'>-		printk(KERN_ERR "ide-floppy: Can't get floppy parameters\n");</div><div class='add'>+	ide_floppy_create_read_capacity_cmd(&amp;pc);</div><div class='add'>+	if (ide_queue_pc_tail(drive, disk, &amp;pc)) {</div><div class='add'>+		printk(KERN_ERR PFX "Can't get floppy parameters\n");</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='ctx'> 	header_len = pc.buf[3];</div><div class='hunk'>@@ -771,8 +483,9 @@ static int ide_floppy_get_capacity(ide_drive_t *drive)</div><div class='ctx'> 		blocks = be32_to_cpup((__be32 *)&amp;pc.buf[desc_start]);</div><div class='ctx'> 		length = be16_to_cpup((__be16 *)&amp;pc.buf[desc_start + 6]);</div><div class='ctx'> </div><div class='del'>-		debug_log("Descriptor %d: %dkB, %d blocks, %d sector size\n",</div><div class='del'>-				i, blocks * length / 1024, blocks, length);</div><div class='add'>+		ide_debug_log(IDE_DBG_PROBE, "Descriptor %d: %dkB, %d blocks, "</div><div class='add'>+			      "%d sector size\n",</div><div class='add'>+			      i, blocks * length / 1024, blocks, length);</div><div class='ctx'> </div><div class='ctx'> 		if (i)</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -792,23 +505,24 @@ static int ide_floppy_get_capacity(ide_drive_t *drive)</div><div class='ctx'> 		case CAPACITY_CURRENT:</div><div class='ctx'> 			/* Normal Zip/LS-120 disks */</div><div class='ctx'> 			if (memcmp(cap_desc, &amp;floppy-&gt;cap_desc, 8))</div><div class='del'>-				printk(KERN_INFO "%s: %dkB, %d blocks, %d "</div><div class='del'>-					"sector size\n", drive-&gt;name,</div><div class='del'>-					blocks * length / 1024, blocks, length);</div><div class='add'>+				printk(KERN_INFO PFX "%s: %dkB, %d blocks, %d "</div><div class='add'>+				       "sector size\n",</div><div class='add'>+				       drive-&gt;name, blocks * length / 1024,</div><div class='add'>+				       blocks, length);</div><div class='ctx'> 			memcpy(&amp;floppy-&gt;cap_desc, cap_desc, 8);</div><div class='ctx'> </div><div class='ctx'> 			if (!length || length % 512) {</div><div class='del'>-				printk(KERN_NOTICE "%s: %d bytes block size "</div><div class='del'>-					"not supported\n", drive-&gt;name, length);</div><div class='add'>+				printk(KERN_NOTICE PFX "%s: %d bytes block size"</div><div class='add'>+				       " not supported\n", drive-&gt;name, length);</div><div class='ctx'> 			} else {</div><div class='ctx'> 				floppy-&gt;blocks = blocks;</div><div class='ctx'> 				floppy-&gt;block_size = length;</div><div class='ctx'> 				floppy-&gt;bs_factor = length / 512;</div><div class='ctx'> 				if (floppy-&gt;bs_factor != 1)</div><div class='del'>-					printk(KERN_NOTICE "%s: warning: non "</div><div class='del'>-						"512 bytes block size not "</div><div class='del'>-						"fully supported\n",</div><div class='del'>-						drive-&gt;name);</div><div class='add'>+					printk(KERN_NOTICE PFX "%s: Warning: "</div><div class='add'>+					       "non 512 bytes block size not "</div><div class='add'>+					       "fully supported\n",</div><div class='add'>+					       drive-&gt;name);</div><div class='ctx'> 				rc = 0;</div><div class='ctx'> 			}</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -817,143 +531,28 @@ static int ide_floppy_get_capacity(ide_drive_t *drive)</div><div class='ctx'> 			 * This is a KERN_ERR so it appears on screen</div><div class='ctx'> 			 * for the user to see</div><div class='ctx'> 			 */</div><div class='del'>-			printk(KERN_ERR "%s: No disk in drive\n", drive-&gt;name);</div><div class='add'>+			printk(KERN_ERR PFX "%s: No disk in drive\n",</div><div class='add'>+			       drive-&gt;name);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case CAPACITY_INVALID:</div><div class='del'>-			printk(KERN_ERR "%s: Invalid capacity for disk "</div><div class='add'>+			printk(KERN_ERR PFX "%s: Invalid capacity for disk "</div><div class='ctx'> 				"in drive\n", drive-&gt;name);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		debug_log("Descriptor 0 Code: %d\n",</div><div class='del'>-			  pc.buf[desc_start + 4] &amp; 0x03);</div><div class='add'>+		ide_debug_log(IDE_DBG_PROBE, "Descriptor 0 Code: %d\n",</div><div class='add'>+			      pc.buf[desc_start + 4] &amp; 0x03);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Clik! disk does not support get_flexible_disk_page */</div><div class='ctx'> 	if (!(drive-&gt;atapi_flags &amp; IDE_AFLAG_CLIK_DRIVE))</div><div class='ctx'> 		(void) ide_floppy_get_flexible_disk_page(drive);</div><div class='ctx'> </div><div class='del'>-	set_capacity(floppy-&gt;disk, floppy-&gt;blocks * floppy-&gt;bs_factor);</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='add'>+	set_capacity(disk, floppy-&gt;blocks * floppy-&gt;bs_factor);</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Obtain the list of formattable capacities.</div><div class='del'>- * Very similar to ide_floppy_get_capacity, except that we push the capacity</div><div class='del'>- * descriptors to userland, instead of our own structures.</div><div class='del'>- *</div><div class='del'>- * Userland gives us the following structure:</div><div class='del'>- *</div><div class='del'>- * struct idefloppy_format_capacities {</div><div class='del'>- *	int nformats;</div><div class='del'>- *	struct {</div><div class='del'>- *		int nblocks;</div><div class='del'>- *		int blocksize;</div><div class='del'>- *	} formats[];</div><div class='del'>- * };</div><div class='del'>- *</div><div class='del'>- * userland initializes nformats to the number of allocated formats[] records.</div><div class='del'>- * On exit we set nformats to the number of records we've actually initialized.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int ide_floppy_get_format_capacities(ide_drive_t *drive, int __user *arg)</div><div class='del'>-{</div><div class='del'>-	struct ide_atapi_pc pc;</div><div class='del'>-	u8 header_len, desc_cnt;</div><div class='del'>-	int i, blocks, length, u_array_size, u_index;</div><div class='del'>-	int __user *argp;</div><div class='del'>-</div><div class='del'>-	if (get_user(u_array_size, arg))</div><div class='del'>-		return (-EFAULT);</div><div class='del'>-</div><div class='del'>-	if (u_array_size &lt;= 0)</div><div class='del'>-		return (-EINVAL);</div><div class='del'>-</div><div class='del'>-	idefloppy_create_read_capacity_cmd(&amp;pc);</div><div class='del'>-	if (idefloppy_queue_pc_tail(drive, &amp;pc)) {</div><div class='del'>-		printk(KERN_ERR "ide-floppy: Can't get floppy parameters\n");</div><div class='del'>-		return (-EIO);</div><div class='del'>-	}</div><div class='del'>-	header_len = pc.buf[3];</div><div class='del'>-	desc_cnt = header_len / 8; /* capacity descriptor of 8 bytes */</div><div class='del'>-</div><div class='del'>-	u_index = 0;</div><div class='del'>-	argp = arg + 1;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We always skip the first capacity descriptor.  That's the current</div><div class='del'>-	 * capacity.  We are interested in the remaining descriptors, the</div><div class='del'>-	 * formattable capacities.</div><div class='del'>-	 */</div><div class='del'>-	for (i = 1; i &lt; desc_cnt; i++) {</div><div class='del'>-		unsigned int desc_start = 4 + i*8;</div><div class='del'>-</div><div class='del'>-		if (u_index &gt;= u_array_size)</div><div class='del'>-			break;	/* User-supplied buffer too small */</div><div class='del'>-</div><div class='del'>-		blocks = be32_to_cpup((__be32 *)&amp;pc.buf[desc_start]);</div><div class='del'>-		length = be16_to_cpup((__be16 *)&amp;pc.buf[desc_start + 6]);</div><div class='del'>-</div><div class='del'>-		if (put_user(blocks, argp))</div><div class='del'>-			return(-EFAULT);</div><div class='del'>-		++argp;</div><div class='del'>-</div><div class='del'>-		if (put_user(length, argp))</div><div class='del'>-			return (-EFAULT);</div><div class='del'>-		++argp;</div><div class='del'>-</div><div class='del'>-		++u_index;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (put_user(u_index, arg))</div><div class='del'>-		return (-EFAULT);</div><div class='del'>-	return (0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Get ATAPI_FORMAT_UNIT progress indication.</div><div class='del'>- *</div><div class='del'>- * Userland gives a pointer to an int.  The int is set to a progress</div><div class='del'>- * indicator 0-65536, with 65536=100%.</div><div class='del'>- *</div><div class='del'>- * If the drive does not support format progress indication, we just check</div><div class='del'>- * the dsc bit, and return either 0 or 65536.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int idefloppy_get_format_progress(ide_drive_t *drive, int __user *arg)</div><div class='del'>-{</div><div class='del'>-	idefloppy_floppy_t *floppy = drive-&gt;driver_data;</div><div class='del'>-	struct ide_atapi_pc pc;</div><div class='del'>-	int progress_indication = 0x10000;</div><div class='del'>-</div><div class='del'>-	if (floppy-&gt;srfp) {</div><div class='del'>-		idefloppy_create_request_sense_cmd(&amp;pc);</div><div class='del'>-		if (idefloppy_queue_pc_tail(drive, &amp;pc))</div><div class='del'>-			return (-EIO);</div><div class='del'>-</div><div class='del'>-		if (floppy-&gt;sense_key == 2 &amp;&amp;</div><div class='del'>-		    floppy-&gt;asc == 4 &amp;&amp;</div><div class='del'>-		    floppy-&gt;ascq == 4)</div><div class='del'>-			progress_indication = floppy-&gt;progress_indication;</div><div class='del'>-</div><div class='del'>-		/* Else assume format_unit has finished, and we're at 0x10000 */</div><div class='del'>-	} else {</div><div class='del'>-		ide_hwif_t *hwif = drive-&gt;hwif;</div><div class='del'>-		unsigned long flags;</div><div class='del'>-		u8 stat;</div><div class='del'>-</div><div class='del'>-		local_irq_save(flags);</div><div class='del'>-		stat = hwif-&gt;tp_ops-&gt;read_status(hwif);</div><div class='del'>-		local_irq_restore(flags);</div><div class='del'>-</div><div class='del'>-		progress_indication = ((stat &amp; SEEK_STAT) == 0) ? 0 : 0x10000;</div><div class='del'>-	}</div><div class='del'>-	if (put_user(progress_indication, arg))</div><div class='del'>-		return (-EFAULT);</div><div class='del'>-</div><div class='del'>-	return (0);</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static sector_t idefloppy_capacity(ide_drive_t *drive)</div><div class='add'>+sector_t ide_floppy_capacity(ide_drive_t *drive)</div><div class='ctx'> {</div><div class='ctx'> 	idefloppy_floppy_t *floppy = drive-&gt;driver_data;</div><div class='ctx'> 	unsigned long capacity = floppy-&gt;blocks * floppy-&gt;bs_factor;</div><div class='hunk'>@@ -961,77 +560,14 @@ static sector_t idefloppy_capacity(ide_drive_t *drive)</div><div class='ctx'> 	return capacity;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Check whether we can support a drive, based on the ATAPI IDENTIFY command</div><div class='del'>- * results.</div><div class='del'>- */</div><div class='del'>-static int idefloppy_identify_device(ide_drive_t *drive, struct hd_driveid *id)</div><div class='del'>-{</div><div class='del'>-	u8 gcw[2];</div><div class='del'>-	u8 device_type, protocol, removable, drq_type, packet_size;</div><div class='del'>-</div><div class='del'>-	*((u16 *) &amp;gcw) = id-&gt;config;</div><div class='del'>-</div><div class='del'>-	device_type =  gcw[1] &amp; 0x1F;</div><div class='del'>-	removable   = (gcw[0] &amp; 0x80) &gt;&gt; 7;</div><div class='del'>-	protocol    = (gcw[1] &amp; 0xC0) &gt;&gt; 6;</div><div class='del'>-	drq_type    = (gcw[0] &amp; 0x60) &gt;&gt; 5;</div><div class='del'>-	packet_size =  gcw[0] &amp; 0x03;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PPC</div><div class='del'>-	/* kludge for Apple PowerBook internal zip */</div><div class='del'>-	if (device_type == 5 &amp;&amp;</div><div class='del'>-	    !strstr(id-&gt;model, "CD-ROM") &amp;&amp; strstr(id-&gt;model, "ZIP"))</div><div class='del'>-		device_type = 0;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (protocol != 2)</div><div class='del'>-		printk(KERN_ERR "ide-floppy: Protocol (0x%02x) is not ATAPI\n",</div><div class='del'>-			protocol);</div><div class='del'>-	else if (device_type != 0)</div><div class='del'>-		printk(KERN_ERR "ide-floppy: Device type (0x%02x) is not set "</div><div class='del'>-				"to floppy\n", device_type);</div><div class='del'>-	else if (!removable)</div><div class='del'>-		printk(KERN_ERR "ide-floppy: The removable flag is not set\n");</div><div class='del'>-	else if (drq_type == 3)</div><div class='del'>-		printk(KERN_ERR "ide-floppy: Sorry, DRQ type (0x%02x) not "</div><div class='del'>-				"supported\n", drq_type);</div><div class='del'>-	else if (packet_size != 0)</div><div class='del'>-		printk(KERN_ERR "ide-floppy: Packet size (0x%02x) is not 12 "</div><div class='del'>-				"bytes\n", packet_size);</div><div class='del'>-	else</div><div class='del'>-		return 1;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_IDE_PROC_FS</div><div class='del'>-static void idefloppy_add_settings(ide_drive_t *drive)</div><div class='del'>-{</div><div class='del'>-	idefloppy_floppy_t *floppy = drive-&gt;driver_data;</div><div class='del'>-</div><div class='del'>-	ide_add_setting(drive, "bios_cyl", SETTING_RW, TYPE_INT, 0, 1023, 1, 1,</div><div class='del'>-			&amp;drive-&gt;bios_cyl, NULL);</div><div class='del'>-	ide_add_setting(drive, "bios_head", SETTING_RW, TYPE_BYTE, 0, 255, 1, 1,</div><div class='del'>-			&amp;drive-&gt;bios_head, NULL);</div><div class='del'>-	ide_add_setting(drive, "bios_sect", SETTING_RW,	TYPE_BYTE, 0,  63, 1, 1,</div><div class='del'>-			&amp;drive-&gt;bios_sect, NULL);</div><div class='del'>-	ide_add_setting(drive, "ticks",	   SETTING_RW, TYPE_BYTE, 0, 255, 1, 1,</div><div class='del'>-			&amp;floppy-&gt;ticks,	 NULL);</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-static inline void idefloppy_add_settings(ide_drive_t *drive) { ; }</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> static void idefloppy_setup(ide_drive_t *drive, idefloppy_floppy_t *floppy)</div><div class='ctx'> {</div><div class='del'>-	u8 gcw[2];</div><div class='add'>+	u16 *id = drive-&gt;id;</div><div class='ctx'> </div><div class='del'>-	*((u16 *) &amp;gcw) = drive-&gt;id-&gt;config;</div><div class='del'>-	floppy-&gt;pc = floppy-&gt;pc_stack;</div><div class='del'>-	drive-&gt;pc_callback = ide_floppy_callback;</div><div class='add'>+	drive-&gt;pc_callback	 = ide_floppy_callback;</div><div class='add'>+	drive-&gt;pc_update_buffers = idefloppy_update_buffers;</div><div class='add'>+	drive-&gt;pc_io_buffers	 = ide_io_buffers;</div><div class='ctx'> </div><div class='del'>-	if (((gcw[0] &amp; 0x60) &gt;&gt; 5) == 1)</div><div class='del'>-		drive-&gt;atapi_flags |= IDE_AFLAG_DRQ_INTERRUPT;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We used to check revisions here. At this point however I'm giving up.</div><div class='ctx'> 	 * Just assume they are all broken, its easier.</div><div class='hunk'>@@ -1041,10 +577,10 @@ static void idefloppy_setup(ide_drive_t *drive, idefloppy_floppy_t *floppy)</div><div class='ctx'> 	 * it. It should be fixed as of version 1.9, but to be on the safe side</div><div class='ctx'> 	 * we'll leave the limitation below for the 2.2.x tree.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!strncmp(drive-&gt;id-&gt;model, "IOMEGA ZIP 100 ATAPI", 20)) {</div><div class='add'>+	if (!strncmp((char *)&amp;id[ATA_ID_PROD], "IOMEGA ZIP 100 ATAPI", 20)) {</div><div class='ctx'> 		drive-&gt;atapi_flags |= IDE_AFLAG_ZIP_DRIVE;</div><div class='ctx'> 		/* This value will be visible in the /proc/ide/hdx/settings */</div><div class='del'>-		floppy-&gt;ticks = IDEFLOPPY_TICKS_DELAY;</div><div class='add'>+		drive-&gt;pc_delay = IDEFLOPPY_PC_DELAY;</div><div class='ctx'> 		blk_queue_max_sectors(drive-&gt;queue, 64);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1052,13 +588,16 @@ static void idefloppy_setup(ide_drive_t *drive, idefloppy_floppy_t *floppy)</div><div class='ctx'> 	 * Guess what? The IOMEGA Clik! drive also needs the above fix. It makes</div><div class='ctx'> 	 * nasty clicking noises without it, so please don't remove this.</div><div class='ctx'> 	 */</div><div class='del'>-	if (strncmp(drive-&gt;id-&gt;model, "IOMEGA Clik!", 11) == 0) {</div><div class='add'>+	if (strncmp((char *)&amp;id[ATA_ID_PROD], "IOMEGA Clik!", 11) == 0) {</div><div class='ctx'> 		blk_queue_max_sectors(drive-&gt;queue, 64);</div><div class='ctx'> 		drive-&gt;atapi_flags |= IDE_AFLAG_CLIK_DRIVE;</div><div class='add'>+		/* IOMEGA Clik! drives do not support lock/unlock commands */</div><div class='add'>+		drive-&gt;atapi_flags |= IDE_AFLAG_NO_DOORLOCK;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	(void) ide_floppy_get_capacity(drive);</div><div class='del'>-	idefloppy_add_settings(drive);</div><div class='add'>+</div><div class='add'>+	ide_proc_register_driver(drive, floppy-&gt;driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ide_floppy_remove(ide_drive_t *drive)</div><div class='hunk'>@@ -1075,7 +614,7 @@ static void ide_floppy_remove(ide_drive_t *drive)</div><div class='ctx'> </div><div class='ctx'> static void idefloppy_cleanup_obj(struct kref *kref)</div><div class='ctx'> {</div><div class='del'>-	struct ide_floppy_obj *floppy = to_ide_floppy(kref);</div><div class='add'>+	struct ide_floppy_obj *floppy = to_ide_drv(kref, ide_floppy_obj);</div><div class='ctx'> 	ide_drive_t *drive = floppy-&gt;drive;</div><div class='ctx'> 	struct gendisk *g = floppy-&gt;disk;</div><div class='ctx'> </div><div class='hunk'>@@ -1085,24 +624,6 @@ static void idefloppy_cleanup_obj(struct kref *kref)</div><div class='ctx'> 	kfree(floppy);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_IDE_PROC_FS</div><div class='del'>-static int proc_idefloppy_read_capacity(char *page, char **start, off_t off,</div><div class='del'>-		int count, int *eof, void *data)</div><div class='del'>-{</div><div class='del'>-	ide_drive_t*drive = (ide_drive_t *)data;</div><div class='del'>-	int len;</div><div class='del'>-</div><div class='del'>-	len = sprintf(page, "%llu\n", (long long)idefloppy_capacity(drive));</div><div class='del'>-	PROC_IDE_READ_RETURN(page, start, off, count, eof, len);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ide_proc_entry_t idefloppy_proc[] = {</div><div class='del'>-	{ "capacity",	S_IFREG|S_IRUGO, proc_idefloppy_read_capacity,	NULL },</div><div class='del'>-	{ "geometry",	S_IFREG|S_IRUGO, proc_ide_read_geometry,	NULL },</div><div class='del'>-	{ NULL, 0, NULL, NULL }</div><div class='del'>-};</div><div class='del'>-#endif	/* CONFIG_IDE_PROC_FS */</div><div class='del'>-</div><div class='ctx'> static int ide_floppy_probe(ide_drive_t *);</div><div class='ctx'> </div><div class='ctx'> static ide_driver_t idefloppy_driver = {</div><div class='hunk'>@@ -1114,13 +635,12 @@ static ide_driver_t idefloppy_driver = {</div><div class='ctx'> 	.probe			= ide_floppy_probe,</div><div class='ctx'> 	.remove			= ide_floppy_remove,</div><div class='ctx'> 	.version		= IDEFLOPPY_VERSION,</div><div class='del'>-	.media			= ide_floppy,</div><div class='del'>-	.supports_dsc_overlap	= 0,</div><div class='ctx'> 	.do_request		= idefloppy_do_request,</div><div class='ctx'> 	.end_request		= idefloppy_end_request,</div><div class='ctx'> 	.error			= __ide_error,</div><div class='ctx'> #ifdef CONFIG_IDE_PROC_FS</div><div class='del'>-	.proc			= idefloppy_proc,</div><div class='add'>+	.proc			= ide_floppy_proc,</div><div class='add'>+	.settings		= ide_floppy_settings,</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1129,30 +649,24 @@ static int idefloppy_open(struct inode *inode, struct file *filp)</div><div class='ctx'> 	struct gendisk *disk = inode-&gt;i_bdev-&gt;bd_disk;</div><div class='ctx'> 	struct ide_floppy_obj *floppy;</div><div class='ctx'> 	ide_drive_t *drive;</div><div class='del'>-	struct ide_atapi_pc pc;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	debug_log("Reached %s\n", __func__);</div><div class='del'>-</div><div class='ctx'> 	floppy = ide_floppy_get(disk);</div><div class='ctx'> 	if (!floppy)</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> </div><div class='ctx'> 	drive = floppy-&gt;drive;</div><div class='ctx'> </div><div class='add'>+	ide_debug_log(IDE_DBG_FUNC, "Call %s\n", __func__);</div><div class='add'>+</div><div class='ctx'> 	floppy-&gt;openers++;</div><div class='ctx'> </div><div class='ctx'> 	if (floppy-&gt;openers == 1) {</div><div class='ctx'> 		drive-&gt;atapi_flags &amp;= ~IDE_AFLAG_FORMAT_IN_PROGRESS;</div><div class='ctx'> 		/* Just in case */</div><div class='ctx'> </div><div class='del'>-		idefloppy_init_pc(&amp;pc);</div><div class='del'>-		pc.c[0] = GPCMD_TEST_UNIT_READY;</div><div class='del'>-</div><div class='del'>-		if (idefloppy_queue_pc_tail(drive, &amp;pc)) {</div><div class='del'>-			idefloppy_create_start_stop_cmd(&amp;pc, 1);</div><div class='del'>-			(void) idefloppy_queue_pc_tail(drive, &amp;pc);</div><div class='del'>-		}</div><div class='add'>+		if (ide_do_test_unit_ready(drive, disk))</div><div class='add'>+			ide_do_start_stop(drive, disk, 1);</div><div class='ctx'> </div><div class='ctx'> 		if (ide_floppy_get_capacity(drive)</div><div class='ctx'> 		   &amp;&amp; (filp-&gt;f_flags &amp; O_NDELAY) == 0</div><div class='hunk'>@@ -1166,16 +680,13 @@ static int idefloppy_open(struct inode *inode, struct file *filp)</div><div class='ctx'> 			goto out_put_floppy;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (floppy-&gt;wp &amp;&amp; (filp-&gt;f_mode &amp; 2)) {</div><div class='add'>+		if ((drive-&gt;atapi_flags &amp; IDE_AFLAG_WP) &amp;&amp; (filp-&gt;f_mode &amp; 2)) {</div><div class='ctx'> 			ret = -EROFS;</div><div class='ctx'> 			goto out_put_floppy;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='ctx'> 		drive-&gt;atapi_flags |= IDE_AFLAG_MEDIA_CHANGED;</div><div class='del'>-		/* IOMEGA Clik! drives do not support lock/unlock commands */</div><div class='del'>-		if (!(drive-&gt;atapi_flags &amp; IDE_AFLAG_CLIK_DRIVE)) {</div><div class='del'>-			idefloppy_create_prevent_cmd(&amp;pc, 1);</div><div class='del'>-			(void) idefloppy_queue_pc_tail(drive, &amp;pc);</div><div class='del'>-		}</div><div class='add'>+		ide_set_media_lock(drive, disk, 1);</div><div class='ctx'> 		check_disk_change(inode-&gt;i_bdev);</div><div class='ctx'> 	} else if (drive-&gt;atapi_flags &amp; IDE_AFLAG_FORMAT_IN_PROGRESS) {</div><div class='ctx'> 		ret = -EBUSY;</div><div class='hunk'>@@ -1192,19 +703,13 @@ out_put_floppy:</div><div class='ctx'> static int idefloppy_release(struct inode *inode, struct file *filp)</div><div class='ctx'> {</div><div class='ctx'> 	struct gendisk *disk = inode-&gt;i_bdev-&gt;bd_disk;</div><div class='del'>-	struct ide_floppy_obj *floppy = ide_floppy_g(disk);</div><div class='add'>+	struct ide_floppy_obj *floppy = ide_drv_g(disk, ide_floppy_obj);</div><div class='ctx'> 	ide_drive_t *drive = floppy-&gt;drive;</div><div class='del'>-	struct ide_atapi_pc pc;</div><div class='ctx'> </div><div class='del'>-	debug_log("Reached %s\n", __func__);</div><div class='add'>+	ide_debug_log(IDE_DBG_FUNC, "Call %s\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	if (floppy-&gt;openers == 1) {</div><div class='del'>-		/* IOMEGA Clik! drives do not support lock/unlock commands */</div><div class='del'>-		if (!(drive-&gt;atapi_flags &amp; IDE_AFLAG_CLIK_DRIVE)) {</div><div class='del'>-			idefloppy_create_prevent_cmd(&amp;pc, 0);</div><div class='del'>-			(void) idefloppy_queue_pc_tail(drive, &amp;pc);</div><div class='del'>-		}</div><div class='del'>-</div><div class='add'>+		ide_set_media_lock(drive, disk, 0);</div><div class='ctx'> 		drive-&gt;atapi_flags &amp;= ~IDE_AFLAG_FORMAT_IN_PROGRESS;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1217,7 +722,8 @@ static int idefloppy_release(struct inode *inode, struct file *filp)</div><div class='ctx'> </div><div class='ctx'> static int idefloppy_getgeo(struct block_device *bdev, struct hd_geometry *geo)</div><div class='ctx'> {</div><div class='del'>-	struct ide_floppy_obj *floppy = ide_floppy_g(bdev-&gt;bd_disk);</div><div class='add'>+	struct ide_floppy_obj *floppy = ide_drv_g(bdev-&gt;bd_disk,</div><div class='add'>+						     ide_floppy_obj);</div><div class='ctx'> 	ide_drive_t *drive = floppy-&gt;drive;</div><div class='ctx'> </div><div class='ctx'> 	geo-&gt;heads = drive-&gt;bios_head;</div><div class='hunk'>@@ -1226,137 +732,15 @@ static int idefloppy_getgeo(struct block_device *bdev, struct hd_geometry *geo)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ide_floppy_lockdoor(ide_drive_t *drive, struct ide_atapi_pc *pc,</div><div class='del'>-			       unsigned long arg, unsigned int cmd)</div><div class='del'>-{</div><div class='del'>-	idefloppy_floppy_t *floppy = drive-&gt;driver_data;</div><div class='del'>-</div><div class='del'>-	if (floppy-&gt;openers &gt; 1)</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='del'>-	/* The IOMEGA Clik! Drive doesn't support this command -</div><div class='del'>-	 * no room for an eject mechanism */</div><div class='del'>-	if (!(drive-&gt;atapi_flags &amp; IDE_AFLAG_CLIK_DRIVE)) {</div><div class='del'>-		int prevent = arg ? 1 : 0;</div><div class='del'>-</div><div class='del'>-		if (cmd == CDROMEJECT)</div><div class='del'>-			prevent = 0;</div><div class='del'>-</div><div class='del'>-		idefloppy_create_prevent_cmd(pc, prevent);</div><div class='del'>-		(void) idefloppy_queue_pc_tail(floppy-&gt;drive, pc);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (cmd == CDROMEJECT) {</div><div class='del'>-		idefloppy_create_start_stop_cmd(pc, 2);</div><div class='del'>-		(void) idefloppy_queue_pc_tail(floppy-&gt;drive, pc);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ide_floppy_format_unit(idefloppy_floppy_t *floppy,</div><div class='del'>-				  int __user *arg)</div><div class='del'>-{</div><div class='del'>-	struct ide_atapi_pc pc;</div><div class='del'>-	ide_drive_t *drive = floppy-&gt;drive;</div><div class='del'>-	int blocks, length, flags, err = 0;</div><div class='del'>-</div><div class='del'>-	if (floppy-&gt;openers &gt; 1) {</div><div class='del'>-		/* Don't format if someone is using the disk */</div><div class='del'>-		drive-&gt;atapi_flags &amp;= ~IDE_AFLAG_FORMAT_IN_PROGRESS;</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	drive-&gt;atapi_flags |= IDE_AFLAG_FORMAT_IN_PROGRESS;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Send ATAPI_FORMAT_UNIT to the drive.</div><div class='del'>-	 *</div><div class='del'>-	 * Userland gives us the following structure:</div><div class='del'>-	 *</div><div class='del'>-	 * struct idefloppy_format_command {</div><div class='del'>-	 *        int nblocks;</div><div class='del'>-	 *        int blocksize;</div><div class='del'>-	 *        int flags;</div><div class='del'>-	 *        } ;</div><div class='del'>-	 *</div><div class='del'>-	 * flags is a bitmask, currently, the only defined flag is:</div><div class='del'>-	 *</div><div class='del'>-	 *        0x01 - verify media after format.</div><div class='del'>-	 */</div><div class='del'>-	if (get_user(blocks, arg) ||</div><div class='del'>-			get_user(length, arg+1) ||</div><div class='del'>-			get_user(flags, arg+2)) {</div><div class='del'>-		err = -EFAULT;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	(void) idefloppy_get_sfrp_bit(drive);</div><div class='del'>-	idefloppy_create_format_unit_cmd(&amp;pc, blocks, length, flags);</div><div class='del'>-</div><div class='del'>-	if (idefloppy_queue_pc_tail(drive, &amp;pc))</div><div class='del'>-		err = -EIO;</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	if (err)</div><div class='del'>-		drive-&gt;atapi_flags &amp;= ~IDE_AFLAG_FORMAT_IN_PROGRESS;</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int idefloppy_ioctl(struct inode *inode, struct file *file,</div><div class='del'>-			unsigned int cmd, unsigned long arg)</div><div class='del'>-{</div><div class='del'>-	struct block_device *bdev = inode-&gt;i_bdev;</div><div class='del'>-	struct ide_floppy_obj *floppy = ide_floppy_g(bdev-&gt;bd_disk);</div><div class='del'>-	ide_drive_t *drive = floppy-&gt;drive;</div><div class='del'>-	struct ide_atapi_pc pc;</div><div class='del'>-	void __user *argp = (void __user *)arg;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	switch (cmd) {</div><div class='del'>-	case CDROMEJECT:</div><div class='del'>-		/* fall through */</div><div class='del'>-	case CDROM_LOCKDOOR:</div><div class='del'>-		return ide_floppy_lockdoor(drive, &amp;pc, arg, cmd);</div><div class='del'>-	case IDEFLOPPY_IOCTL_FORMAT_SUPPORTED:</div><div class='del'>-		return 0;</div><div class='del'>-	case IDEFLOPPY_IOCTL_FORMAT_GET_CAPACITY:</div><div class='del'>-		return ide_floppy_get_format_capacities(drive, argp);</div><div class='del'>-	case IDEFLOPPY_IOCTL_FORMAT_START:</div><div class='del'>-		if (!(file-&gt;f_mode &amp; 2))</div><div class='del'>-			return -EPERM;</div><div class='del'>-</div><div class='del'>-		return ide_floppy_format_unit(floppy, (int __user *)arg);</div><div class='del'>-	case IDEFLOPPY_IOCTL_FORMAT_GET_PROGRESS:</div><div class='del'>-		return idefloppy_get_format_progress(drive, argp);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * skip SCSI_IOCTL_SEND_COMMAND (deprecated)</div><div class='del'>-	 * and CDROM_SEND_PACKET (legacy) ioctls</div><div class='del'>-	 */</div><div class='del'>-	if (cmd != CDROM_SEND_PACKET &amp;&amp; cmd != SCSI_IOCTL_SEND_COMMAND)</div><div class='del'>-		err = scsi_cmd_ioctl(file, bdev-&gt;bd_disk-&gt;queue,</div><div class='del'>-					bdev-&gt;bd_disk, cmd, argp);</div><div class='del'>-	else</div><div class='del'>-		err = -ENOTTY;</div><div class='del'>-</div><div class='del'>-	if (err == -ENOTTY)</div><div class='del'>-		err = generic_ide_ioctl(drive, file, bdev, cmd, arg);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int idefloppy_media_changed(struct gendisk *disk)</div><div class='ctx'> {</div><div class='del'>-	struct ide_floppy_obj *floppy = ide_floppy_g(disk);</div><div class='add'>+	struct ide_floppy_obj *floppy = ide_drv_g(disk, ide_floppy_obj);</div><div class='ctx'> 	ide_drive_t *drive = floppy-&gt;drive;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/* do not scan partitions twice if this is a removable device */</div><div class='del'>-	if (drive-&gt;attach) {</div><div class='del'>-		drive-&gt;attach = 0;</div><div class='add'>+	if (drive-&gt;dev_flags &amp; IDE_DFLAG_ATTACH) {</div><div class='add'>+		drive-&gt;dev_flags &amp;= ~IDE_DFLAG_ATTACH;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	ret = !!(drive-&gt;atapi_flags &amp; IDE_AFLAG_MEDIA_CHANGED);</div><div class='hunk'>@@ -1366,8 +750,8 @@ static int idefloppy_media_changed(struct gendisk *disk)</div><div class='ctx'> </div><div class='ctx'> static int idefloppy_revalidate_disk(struct gendisk *disk)</div><div class='ctx'> {</div><div class='del'>-	struct ide_floppy_obj *floppy = ide_floppy_g(disk);</div><div class='del'>-	set_capacity(disk, idefloppy_capacity(floppy-&gt;drive));</div><div class='add'>+	struct ide_floppy_obj *floppy = ide_drv_g(disk, ide_floppy_obj);</div><div class='add'>+	set_capacity(disk, ide_floppy_capacity(floppy-&gt;drive));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1375,7 +759,7 @@ static struct block_device_operations idefloppy_ops = {</div><div class='ctx'> 	.owner			= THIS_MODULE,</div><div class='ctx'> 	.open			= idefloppy_open,</div><div class='ctx'> 	.release		= idefloppy_release,</div><div class='del'>-	.ioctl			= idefloppy_ioctl,</div><div class='add'>+	.ioctl			= ide_floppy_ioctl,</div><div class='ctx'> 	.getgeo			= idefloppy_getgeo,</div><div class='ctx'> 	.media_changed		= idefloppy_media_changed,</div><div class='ctx'> 	.revalidate_disk	= idefloppy_revalidate_disk</div><div class='hunk'>@@ -1388,19 +772,19 @@ static int ide_floppy_probe(ide_drive_t *drive)</div><div class='ctx'> </div><div class='ctx'> 	if (!strstr("ide-floppy", drive-&gt;driver_req))</div><div class='ctx'> 		goto failed;</div><div class='del'>-	if (!drive-&gt;present)</div><div class='del'>-		goto failed;</div><div class='add'>+</div><div class='ctx'> 	if (drive-&gt;media != ide_floppy)</div><div class='ctx'> 		goto failed;</div><div class='del'>-	if (!idefloppy_identify_device(drive, drive-&gt;id)) {</div><div class='del'>-		printk(KERN_ERR "ide-floppy: %s: not supported by this version"</div><div class='del'>-				" of ide-floppy\n", drive-&gt;name);</div><div class='add'>+</div><div class='add'>+	if (!ide_check_atapi_device(drive, DRV_NAME)) {</div><div class='add'>+		printk(KERN_ERR PFX "%s: not supported by this version of "</div><div class='add'>+		       DRV_NAME "\n", drive-&gt;name);</div><div class='ctx'> 		goto failed;</div><div class='ctx'> 	}</div><div class='ctx'> 	floppy = kzalloc(sizeof(idefloppy_floppy_t), GFP_KERNEL);</div><div class='ctx'> 	if (!floppy) {</div><div class='del'>-		printk(KERN_ERR "ide-floppy: %s: Can't allocate a floppy"</div><div class='del'>-				" structure\n", drive-&gt;name);</div><div class='add'>+		printk(KERN_ERR PFX "%s: Can't allocate a floppy structure\n",</div><div class='add'>+		       drive-&gt;name);</div><div class='ctx'> 		goto failed;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1410,8 +794,6 @@ static int ide_floppy_probe(ide_drive_t *drive)</div><div class='ctx'> </div><div class='ctx'> 	ide_init_disk(g, drive);</div><div class='ctx'> </div><div class='del'>-	ide_proc_register_driver(drive, &amp;idefloppy_driver);</div><div class='del'>-</div><div class='ctx'> 	kref_init(&amp;floppy-&gt;kref);</div><div class='ctx'> </div><div class='ctx'> 	floppy-&gt;drive = drive;</div><div class='hunk'>@@ -1422,13 +804,16 @@ static int ide_floppy_probe(ide_drive_t *drive)</div><div class='ctx'> </div><div class='ctx'> 	drive-&gt;driver_data = floppy;</div><div class='ctx'> </div><div class='add'>+	drive-&gt;debug_mask = debug_mask;</div><div class='add'>+</div><div class='ctx'> 	idefloppy_setup(drive, floppy);</div><div class='add'>+	drive-&gt;dev_flags |= IDE_DFLAG_ATTACH;</div><div class='ctx'> </div><div class='ctx'> 	g-&gt;minors = 1 &lt;&lt; PARTN_BITS;</div><div class='ctx'> 	g-&gt;driverfs_dev = &amp;drive-&gt;gendev;</div><div class='del'>-	g-&gt;flags = drive-&gt;removable ? GENHD_FL_REMOVABLE : 0;</div><div class='add'>+	if (drive-&gt;dev_flags &amp; IDE_DFLAG_REMOVABLE)</div><div class='add'>+		g-&gt;flags = GENHD_FL_REMOVABLE;</div><div class='ctx'> 	g-&gt;fops = &amp;idefloppy_ops;</div><div class='del'>-	drive-&gt;attach = 1;</div><div class='ctx'> 	add_disk(g);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1445,11 +830,12 @@ static void __exit idefloppy_exit(void)</div><div class='ctx'> </div><div class='ctx'> static int __init idefloppy_init(void)</div><div class='ctx'> {</div><div class='del'>-	printk("ide-floppy driver " IDEFLOPPY_VERSION "\n");</div><div class='add'>+	printk(KERN_INFO DRV_NAME " driver " IDEFLOPPY_VERSION "\n");</div><div class='ctx'> 	return driver_register(&amp;idefloppy_driver.gen_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> MODULE_ALIAS("ide:*m-floppy*");</div><div class='add'>+MODULE_ALIAS("ide-floppy");</div><div class='ctx'> module_init(idefloppy_init);</div><div class='ctx'> module_exit(idefloppy_exit);</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/ide/ide-floppy.h b/drivers/ide/ide-floppy.h<br/>new file mode 100644<br/>index 000000000000..17cf865e583d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/ide-floppy.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/ide-floppy.h</a></div><div class='hunk'>@@ -0,0 +1,62 @@</div><div class='add'>+#ifndef __IDE_FLOPPY_H</div><div class='add'>+#define __IDE_FLOPPY_H</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Most of our global data which we need to save even as we leave the driver</div><div class='add'>+ * due to an interrupt or a timer event is stored in a variable of type</div><div class='add'>+ * idefloppy_floppy_t, defined below.</div><div class='add'>+ */</div><div class='add'>+typedef struct ide_floppy_obj {</div><div class='add'>+	ide_drive_t	*drive;</div><div class='add'>+	ide_driver_t	*driver;</div><div class='add'>+	struct gendisk	*disk;</div><div class='add'>+	struct kref	kref;</div><div class='add'>+	unsigned int	openers;	/* protected by BKL for now */</div><div class='add'>+</div><div class='add'>+	/* Last failed packet command */</div><div class='add'>+	struct ide_atapi_pc *failed_pc;</div><div class='add'>+	/* used for blk_{fs,pc}_request() requests */</div><div class='add'>+	struct ide_atapi_pc queued_pc;</div><div class='add'>+</div><div class='add'>+	/* Last error information */</div><div class='add'>+	u8 sense_key, asc, ascq;</div><div class='add'>+</div><div class='add'>+	int progress_indication;</div><div class='add'>+</div><div class='add'>+	/* Device information */</div><div class='add'>+	/* Current format */</div><div class='add'>+	int blocks, block_size, bs_factor;</div><div class='add'>+	/* Last format capacity descriptor */</div><div class='add'>+	u8 cap_desc[8];</div><div class='add'>+	/* Copy of the flexible disk page */</div><div class='add'>+	u8 flexible_disk_page[32];</div><div class='add'>+} idefloppy_floppy_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Pages of the SELECT SENSE / MODE SENSE packet commands.</div><div class='add'>+ * See SFF-8070i spec.</div><div class='add'>+ */</div><div class='add'>+#define	IDEFLOPPY_CAPABILITIES_PAGE	0x1b</div><div class='add'>+#define IDEFLOPPY_FLEXIBLE_DISK_PAGE	0x05</div><div class='add'>+</div><div class='add'>+/* IOCTLs used in low-level formatting. */</div><div class='add'>+#define	IDEFLOPPY_IOCTL_FORMAT_SUPPORTED	0x4600</div><div class='add'>+#define	IDEFLOPPY_IOCTL_FORMAT_GET_CAPACITY	0x4601</div><div class='add'>+#define	IDEFLOPPY_IOCTL_FORMAT_START		0x4602</div><div class='add'>+#define IDEFLOPPY_IOCTL_FORMAT_GET_PROGRESS	0x4603</div><div class='add'>+</div><div class='add'>+/* ide-floppy.c */</div><div class='add'>+void ide_floppy_create_mode_sense_cmd(struct ide_atapi_pc *, u8);</div><div class='add'>+void ide_floppy_create_read_capacity_cmd(struct ide_atapi_pc *);</div><div class='add'>+sector_t ide_floppy_capacity(ide_drive_t *);</div><div class='add'>+</div><div class='add'>+/* ide-floppy_ioctl.c */</div><div class='add'>+int ide_floppy_ioctl(struct inode *, struct file *, unsigned, unsigned long);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_IDE_PROC_FS</div><div class='add'>+/* ide-floppy_proc.c */</div><div class='add'>+extern ide_proc_entry_t ide_floppy_proc[];</div><div class='add'>+extern const struct ide_proc_devset ide_floppy_settings[];</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif /*__IDE_FLOPPY_H */</div><div class='head'>diff --git a/drivers/ide/ide-floppy_ioctl.c b/drivers/ide/ide-floppy_ioctl.c<br/>new file mode 100644<br/>index 000000000000..a3a7a0809e2b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/ide-floppy_ioctl.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/ide-floppy_ioctl.c</a></div><div class='hunk'>@@ -0,0 +1,293 @@</div><div class='add'>+/*</div><div class='add'>+ * ide-floppy IOCTLs handling.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/ide.h&gt;</div><div class='add'>+#include &lt;linux/cdrom.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/unaligned.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;scsi/scsi_ioctl.h&gt;</div><div class='add'>+</div><div class='add'>+#include "ide-floppy.h"</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Obtain the list of formattable capacities.</div><div class='add'>+ * Very similar to ide_floppy_get_capacity, except that we push the capacity</div><div class='add'>+ * descriptors to userland, instead of our own structures.</div><div class='add'>+ *</div><div class='add'>+ * Userland gives us the following structure:</div><div class='add'>+ *</div><div class='add'>+ * struct idefloppy_format_capacities {</div><div class='add'>+ *	int nformats;</div><div class='add'>+ *	struct {</div><div class='add'>+ *		int nblocks;</div><div class='add'>+ *		int blocksize;</div><div class='add'>+ *	} formats[];</div><div class='add'>+ * };</div><div class='add'>+ *</div><div class='add'>+ * userland initializes nformats to the number of allocated formats[] records.</div><div class='add'>+ * On exit we set nformats to the number of records we've actually initialized.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static int ide_floppy_get_format_capacities(ide_drive_t *drive, int __user *arg)</div><div class='add'>+{</div><div class='add'>+	struct ide_floppy_obj *floppy = drive-&gt;driver_data;</div><div class='add'>+	struct ide_atapi_pc pc;</div><div class='add'>+	u8 header_len, desc_cnt;</div><div class='add'>+	int i, blocks, length, u_array_size, u_index;</div><div class='add'>+	int __user *argp;</div><div class='add'>+</div><div class='add'>+	if (get_user(u_array_size, arg))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	if (u_array_size &lt;= 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ide_floppy_create_read_capacity_cmd(&amp;pc);</div><div class='add'>+	if (ide_queue_pc_tail(drive, floppy-&gt;disk, &amp;pc)) {</div><div class='add'>+		printk(KERN_ERR "ide-floppy: Can't get floppy parameters\n");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	header_len = pc.buf[3];</div><div class='add'>+	desc_cnt = header_len / 8; /* capacity descriptor of 8 bytes */</div><div class='add'>+</div><div class='add'>+	u_index = 0;</div><div class='add'>+	argp = arg + 1;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We always skip the first capacity descriptor.  That's the current</div><div class='add'>+	 * capacity.  We are interested in the remaining descriptors, the</div><div class='add'>+	 * formattable capacities.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 1; i &lt; desc_cnt; i++) {</div><div class='add'>+		unsigned int desc_start = 4 + i*8;</div><div class='add'>+</div><div class='add'>+		if (u_index &gt;= u_array_size)</div><div class='add'>+			break;	/* User-supplied buffer too small */</div><div class='add'>+</div><div class='add'>+		blocks = be32_to_cpup((__be32 *)&amp;pc.buf[desc_start]);</div><div class='add'>+		length = be16_to_cpup((__be16 *)&amp;pc.buf[desc_start + 6]);</div><div class='add'>+</div><div class='add'>+		if (put_user(blocks, argp))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+</div><div class='add'>+		++argp;</div><div class='add'>+</div><div class='add'>+		if (put_user(length, argp))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+</div><div class='add'>+		++argp;</div><div class='add'>+</div><div class='add'>+		++u_index;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (put_user(u_index, arg))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ide_floppy_create_format_unit_cmd(struct ide_atapi_pc *pc, int b,</div><div class='add'>+		int l, int flags)</div><div class='add'>+{</div><div class='add'>+	ide_init_pc(pc);</div><div class='add'>+	pc-&gt;c[0] = GPCMD_FORMAT_UNIT;</div><div class='add'>+	pc-&gt;c[1] = 0x17;</div><div class='add'>+</div><div class='add'>+	memset(pc-&gt;buf, 0, 12);</div><div class='add'>+	pc-&gt;buf[1] = 0xA2;</div><div class='add'>+	/* Default format list header, u8 1: FOV/DCRT/IMM bits set */</div><div class='add'>+</div><div class='add'>+	if (flags &amp; 1)				/* Verify bit on... */</div><div class='add'>+		pc-&gt;buf[1] ^= 0x20;		/* ... turn off DCRT bit */</div><div class='add'>+	pc-&gt;buf[3] = 8;</div><div class='add'>+</div><div class='add'>+	put_unaligned(cpu_to_be32(b), (unsigned int *)(&amp;pc-&gt;buf[4]));</div><div class='add'>+	put_unaligned(cpu_to_be32(l), (unsigned int *)(&amp;pc-&gt;buf[8]));</div><div class='add'>+	pc-&gt;buf_size = 12;</div><div class='add'>+	pc-&gt;flags |= PC_FLAG_WRITING;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ide_floppy_get_sfrp_bit(ide_drive_t *drive)</div><div class='add'>+{</div><div class='add'>+	idefloppy_floppy_t *floppy = drive-&gt;driver_data;</div><div class='add'>+	struct ide_atapi_pc pc;</div><div class='add'>+</div><div class='add'>+	drive-&gt;atapi_flags &amp;= ~IDE_AFLAG_SRFP;</div><div class='add'>+</div><div class='add'>+	ide_floppy_create_mode_sense_cmd(&amp;pc, IDEFLOPPY_CAPABILITIES_PAGE);</div><div class='add'>+	pc.flags |= PC_FLAG_SUPPRESS_ERROR;</div><div class='add'>+</div><div class='add'>+	if (ide_queue_pc_tail(drive, floppy-&gt;disk, &amp;pc))</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	if (pc.buf[8 + 2] &amp; 0x40)</div><div class='add'>+		drive-&gt;atapi_flags |= IDE_AFLAG_SRFP;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ide_floppy_format_unit(ide_drive_t *drive, int __user *arg)</div><div class='add'>+{</div><div class='add'>+	idefloppy_floppy_t *floppy = drive-&gt;driver_data;</div><div class='add'>+	struct ide_atapi_pc pc;</div><div class='add'>+	int blocks, length, flags, err = 0;</div><div class='add'>+</div><div class='add'>+	if (floppy-&gt;openers &gt; 1) {</div><div class='add'>+		/* Don't format if someone is using the disk */</div><div class='add'>+		drive-&gt;atapi_flags &amp;= ~IDE_AFLAG_FORMAT_IN_PROGRESS;</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	drive-&gt;atapi_flags |= IDE_AFLAG_FORMAT_IN_PROGRESS;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Send ATAPI_FORMAT_UNIT to the drive.</div><div class='add'>+	 *</div><div class='add'>+	 * Userland gives us the following structure:</div><div class='add'>+	 *</div><div class='add'>+	 * struct idefloppy_format_command {</div><div class='add'>+	 *        int nblocks;</div><div class='add'>+	 *        int blocksize;</div><div class='add'>+	 *        int flags;</div><div class='add'>+	 *        } ;</div><div class='add'>+	 *</div><div class='add'>+	 * flags is a bitmask, currently, the only defined flag is:</div><div class='add'>+	 *</div><div class='add'>+	 *        0x01 - verify media after format.</div><div class='add'>+	 */</div><div class='add'>+	if (get_user(blocks, arg) ||</div><div class='add'>+			get_user(length, arg+1) ||</div><div class='add'>+			get_user(flags, arg+2)) {</div><div class='add'>+		err = -EFAULT;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	(void)ide_floppy_get_sfrp_bit(drive);</div><div class='add'>+	ide_floppy_create_format_unit_cmd(&amp;pc, blocks, length, flags);</div><div class='add'>+</div><div class='add'>+	if (ide_queue_pc_tail(drive, floppy-&gt;disk, &amp;pc))</div><div class='add'>+		err = -EIO;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	if (err)</div><div class='add'>+		drive-&gt;atapi_flags &amp;= ~IDE_AFLAG_FORMAT_IN_PROGRESS;</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Get ATAPI_FORMAT_UNIT progress indication.</div><div class='add'>+ *</div><div class='add'>+ * Userland gives a pointer to an int.  The int is set to a progress</div><div class='add'>+ * indicator 0-65536, with 65536=100%.</div><div class='add'>+ *</div><div class='add'>+ * If the drive does not support format progress indication, we just check</div><div class='add'>+ * the dsc bit, and return either 0 or 65536.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static int ide_floppy_get_format_progress(ide_drive_t *drive, int __user *arg)</div><div class='add'>+{</div><div class='add'>+	idefloppy_floppy_t *floppy = drive-&gt;driver_data;</div><div class='add'>+	struct ide_atapi_pc pc;</div><div class='add'>+	int progress_indication = 0x10000;</div><div class='add'>+</div><div class='add'>+	if (drive-&gt;atapi_flags &amp; IDE_AFLAG_SRFP) {</div><div class='add'>+		ide_create_request_sense_cmd(drive, &amp;pc);</div><div class='add'>+		if (ide_queue_pc_tail(drive, floppy-&gt;disk, &amp;pc))</div><div class='add'>+			return -EIO;</div><div class='add'>+</div><div class='add'>+		if (floppy-&gt;sense_key == 2 &amp;&amp;</div><div class='add'>+		    floppy-&gt;asc == 4 &amp;&amp;</div><div class='add'>+		    floppy-&gt;ascq == 4)</div><div class='add'>+			progress_indication = floppy-&gt;progress_indication;</div><div class='add'>+</div><div class='add'>+		/* Else assume format_unit has finished, and we're at 0x10000 */</div><div class='add'>+	} else {</div><div class='add'>+		ide_hwif_t *hwif = drive-&gt;hwif;</div><div class='add'>+		unsigned long flags;</div><div class='add'>+		u8 stat;</div><div class='add'>+</div><div class='add'>+		local_irq_save(flags);</div><div class='add'>+		stat = hwif-&gt;tp_ops-&gt;read_status(hwif);</div><div class='add'>+		local_irq_restore(flags);</div><div class='add'>+</div><div class='add'>+		progress_indication = ((stat &amp; ATA_DSC) == 0) ? 0 : 0x10000;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (put_user(progress_indication, arg))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ide_floppy_lockdoor(ide_drive_t *drive, struct ide_atapi_pc *pc,</div><div class='add'>+			       unsigned long arg, unsigned int cmd)</div><div class='add'>+{</div><div class='add'>+	idefloppy_floppy_t *floppy = drive-&gt;driver_data;</div><div class='add'>+	struct gendisk *disk = floppy-&gt;disk;</div><div class='add'>+	int prevent = (arg &amp;&amp; cmd != CDROMEJECT) ? 1 : 0;</div><div class='add'>+</div><div class='add'>+	if (floppy-&gt;openers &gt; 1)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	ide_set_media_lock(drive, disk, prevent);</div><div class='add'>+</div><div class='add'>+	if (cmd == CDROMEJECT)</div><div class='add'>+		ide_do_start_stop(drive, disk, 2);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ide_floppy_format_ioctl(ide_drive_t *drive, struct file *file,</div><div class='add'>+				   unsigned int cmd, void __user *argp)</div><div class='add'>+{</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case IDEFLOPPY_IOCTL_FORMAT_SUPPORTED:</div><div class='add'>+		return 0;</div><div class='add'>+	case IDEFLOPPY_IOCTL_FORMAT_GET_CAPACITY:</div><div class='add'>+		return ide_floppy_get_format_capacities(drive, argp);</div><div class='add'>+	case IDEFLOPPY_IOCTL_FORMAT_START:</div><div class='add'>+		if (!(file-&gt;f_mode &amp; 2))</div><div class='add'>+			return -EPERM;</div><div class='add'>+		return ide_floppy_format_unit(drive, (int __user *)argp);</div><div class='add'>+	case IDEFLOPPY_IOCTL_FORMAT_GET_PROGRESS:</div><div class='add'>+		return ide_floppy_get_format_progress(drive, argp);</div><div class='add'>+	default:</div><div class='add'>+		return -ENOTTY;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ide_floppy_ioctl(struct inode *inode, struct file *file,</div><div class='add'>+		    unsigned int cmd, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	struct block_device *bdev = inode-&gt;i_bdev;</div><div class='add'>+	struct ide_floppy_obj *floppy = ide_drv_g(bdev-&gt;bd_disk,</div><div class='add'>+						     ide_floppy_obj);</div><div class='add'>+	ide_drive_t *drive = floppy-&gt;drive;</div><div class='add'>+	struct ide_atapi_pc pc;</div><div class='add'>+	void __user *argp = (void __user *)arg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (cmd == CDROMEJECT || cmd == CDROM_LOCKDOOR)</div><div class='add'>+		return ide_floppy_lockdoor(drive, &amp;pc, arg, cmd);</div><div class='add'>+</div><div class='add'>+	err = ide_floppy_format_ioctl(drive, file, cmd, argp);</div><div class='add'>+	if (err != -ENOTTY)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * skip SCSI_IOCTL_SEND_COMMAND (deprecated)</div><div class='add'>+	 * and CDROM_SEND_PACKET (legacy) ioctls</div><div class='add'>+	 */</div><div class='add'>+	if (cmd != CDROM_SEND_PACKET &amp;&amp; cmd != SCSI_IOCTL_SEND_COMMAND)</div><div class='add'>+		err = scsi_cmd_ioctl(file, bdev-&gt;bd_disk-&gt;queue,</div><div class='add'>+					bdev-&gt;bd_disk, cmd, argp);</div><div class='add'>+</div><div class='add'>+	if (err == -ENOTTY)</div><div class='add'>+		err = generic_ide_ioctl(drive, file, bdev, cmd, arg);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/ide/ide-floppy_proc.c b/drivers/ide/ide-floppy_proc.c<br/>new file mode 100644<br/>index 000000000000..76f0c6c4eca3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/ide-floppy_proc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/ide-floppy_proc.c</a></div><div class='hunk'>@@ -0,0 +1,33 @@</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/ide.h&gt;</div><div class='add'>+</div><div class='add'>+#include "ide-floppy.h"</div><div class='add'>+</div><div class='add'>+static int proc_idefloppy_read_capacity(char *page, char **start, off_t off,</div><div class='add'>+		int count, int *eof, void *data)</div><div class='add'>+{</div><div class='add'>+	ide_drive_t*drive = (ide_drive_t *)data;</div><div class='add'>+	int len;</div><div class='add'>+</div><div class='add'>+	len = sprintf(page, "%llu\n", (long long)ide_floppy_capacity(drive));</div><div class='add'>+	PROC_IDE_READ_RETURN(page, start, off, count, eof, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+ide_proc_entry_t ide_floppy_proc[] = {</div><div class='add'>+	{ "capacity",	S_IFREG|S_IRUGO, proc_idefloppy_read_capacity,	NULL },</div><div class='add'>+	{ "geometry",	S_IFREG|S_IRUGO, proc_ide_read_geometry,	NULL },</div><div class='add'>+	{ NULL, 0, NULL, NULL }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+ide_devset_rw_field(bios_cyl, bios_cyl);</div><div class='add'>+ide_devset_rw_field(bios_head, bios_head);</div><div class='add'>+ide_devset_rw_field(bios_sect, bios_sect);</div><div class='add'>+ide_devset_rw_field(ticks, pc_delay);</div><div class='add'>+</div><div class='add'>+const struct ide_proc_devset ide_floppy_settings[] = {</div><div class='add'>+	IDE_PROC_DEVSET(bios_cyl,  0, 1023),</div><div class='add'>+	IDE_PROC_DEVSET(bios_head, 0,  255),</div><div class='add'>+	IDE_PROC_DEVSET(bios_sect, 0,   63),</div><div class='add'>+	IDE_PROC_DEVSET(ticks,	   0,  255),</div><div class='add'>+	{ 0 },</div><div class='add'>+};</div><div class='head'>diff --git a/drivers/ide/ide-generic.c b/drivers/ide/ide-generic.c<br/>index 8fe8b5b9cf7d..81a5282ce1eb 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/ide-generic.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ide/ide-generic.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/ide-generic.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/ide-generic.c</a></div><div class='hunk'>@@ -19,6 +19,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/ide.h&gt;</div><div class='add'>+#include &lt;linux/pci_ids.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* FIXME: convert m32r to use ide_platform host driver */</div><div class='ctx'> #ifdef CONFIG_M32R</div><div class='hunk'>@@ -27,7 +28,7 @@</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME	"ide_generic"</div><div class='ctx'> </div><div class='del'>-static int probe_mask = 0x03;</div><div class='add'>+static int probe_mask;</div><div class='ctx'> module_param(probe_mask, int, 0);</div><div class='ctx'> MODULE_PARM_DESC(probe_mask, "probe mask for legacy ISA IDE ports");</div><div class='ctx'> </div><div class='hunk'>@@ -100,27 +101,64 @@ static const u16 legacy_bases[] = { 0x1f0, 0x170, 0x1e8, 0x168, 0x1e0, 0x160 };</div><div class='ctx'> static const int legacy_irqs[]  = { 14, 15, 11, 10, 8, 12 };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+static void ide_generic_check_pci_legacy_iobases(int *primary, int *secondary)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *p = NULL;</div><div class='add'>+	u16 val;</div><div class='add'>+</div><div class='add'>+	for_each_pci_dev(p) {</div><div class='add'>+</div><div class='add'>+		if (pci_resource_start(p, 0) == 0x1f0)</div><div class='add'>+			*primary = 1;</div><div class='add'>+		if (pci_resource_start(p, 2) == 0x170)</div><div class='add'>+			*secondary = 1;</div><div class='add'>+</div><div class='add'>+		/* Cyrix CS55{1,2}0 pre SFF MWDMA ATA on the bridge */</div><div class='add'>+		if (p-&gt;vendor == PCI_VENDOR_ID_CYRIX &amp;&amp;</div><div class='add'>+		    (p-&gt;device == PCI_DEVICE_ID_CYRIX_5510 ||</div><div class='add'>+		     p-&gt;device == PCI_DEVICE_ID_CYRIX_5520))</div><div class='add'>+			*primary = *secondary = 1;</div><div class='add'>+</div><div class='add'>+		/* Intel MPIIX - PIO ATA on non PCI side of bridge */</div><div class='add'>+		if (p-&gt;vendor == PCI_VENDOR_ID_INTEL &amp;&amp;</div><div class='add'>+		    p-&gt;device == PCI_DEVICE_ID_INTEL_82371MX) {</div><div class='add'>+</div><div class='add'>+			pci_read_config_word(p, 0x6C, &amp;val);</div><div class='add'>+			if (val &amp; 0x8000) {</div><div class='add'>+				/* ATA port enabled */</div><div class='add'>+				if (val &amp; 0x4000)</div><div class='add'>+					*secondary = 1;</div><div class='add'>+				else</div><div class='add'>+					*primary = 1;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int __init ide_generic_init(void)</div><div class='ctx'> {</div><div class='del'>-	hw_regs_t hw[MAX_HWIFS], *hws[MAX_HWIFS];</div><div class='del'>-	struct ide_host *host;</div><div class='add'>+	hw_regs_t hw, *hws[] = { &amp;hw, NULL, NULL, NULL };</div><div class='ctx'> 	unsigned long io_addr;</div><div class='del'>-	int i, rc;</div><div class='add'>+	int i, rc = 0, primary = 0, secondary = 0;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_MIPS</div><div class='del'>-	if (!ide_probe_legacy())</div><div class='del'>-		return -ENODEV;</div><div class='del'>-#endif</div><div class='del'>-	printk(KERN_INFO DRV_NAME ": please use \"probe_mask=0x3f\" module "</div><div class='del'>-			 "parameter for probing all legacy ISA IDE ports\n");</div><div class='add'>+	ide_generic_check_pci_legacy_iobases(&amp;primary, &amp;secondary);</div><div class='add'>+</div><div class='add'>+	if (!probe_mask) {</div><div class='add'>+		printk(KERN_INFO DRV_NAME ": please use \"probe_mask=0x3f\" "</div><div class='add'>+		     "module parameter for probing all legacy ISA IDE ports\n");</div><div class='add'>+</div><div class='add'>+		if (primary == 0)</div><div class='add'>+			probe_mask |= 0x1;</div><div class='ctx'> </div><div class='del'>-	memset(hws, 0, sizeof(hw_regs_t *) * MAX_HWIFS);</div><div class='add'>+		if (secondary == 0)</div><div class='add'>+			probe_mask |= 0x2;</div><div class='add'>+	} else</div><div class='add'>+		printk(KERN_INFO DRV_NAME ": enforcing probing of I/O ports "</div><div class='add'>+			"upon user request\n");</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(legacy_bases); i++) {</div><div class='ctx'> 		io_addr = legacy_bases[i];</div><div class='ctx'> </div><div class='del'>-		hws[i] = NULL;</div><div class='del'>-</div><div class='ctx'> 		if ((probe_mask &amp; (1 &lt;&lt; i)) &amp;&amp; io_addr) {</div><div class='ctx'> 			if (!request_region(io_addr, 8, DRV_NAME)) {</div><div class='ctx'> 				printk(KERN_ERR "%s: I/O resource 0x%lX-0x%lX "</div><div class='hunk'>@@ -137,45 +175,27 @@ static int __init ide_generic_init(void)</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			memset(&amp;hw[i], 0, sizeof(hw[i]));</div><div class='del'>-			ide_std_init_ports(&amp;hw[i], io_addr, io_addr + 0x206);</div><div class='add'>+			memset(&amp;hw, 0, sizeof(hw));</div><div class='add'>+			ide_std_init_ports(&amp;hw, io_addr, io_addr + 0x206);</div><div class='ctx'> #ifdef CONFIG_IA64</div><div class='del'>-			hw[i].irq = isa_irq_to_vector(legacy_irqs[i]);</div><div class='add'>+			hw.irq = isa_irq_to_vector(legacy_irqs[i]);</div><div class='ctx'> #else</div><div class='del'>-			hw[i].irq = legacy_irqs[i];</div><div class='add'>+			hw.irq = legacy_irqs[i];</div><div class='ctx'> #endif</div><div class='del'>-			hw[i].chipset = ide_generic;</div><div class='add'>+			hw.chipset = ide_generic;</div><div class='ctx'> </div><div class='del'>-			hws[i] = &amp;hw[i];</div><div class='add'>+			rc = ide_host_add(NULL, hws, NULL);</div><div class='add'>+			if (rc) {</div><div class='add'>+				release_region(io_addr + 0x206, 1);</div><div class='add'>+				release_region(io_addr, 8);</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	host = ide_host_alloc_all(NULL, hws);</div><div class='del'>-	if (host == NULL) {</div><div class='del'>-		rc = -ENOMEM;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rc = ide_host_register(host, NULL, hws);</div><div class='del'>-	if (rc)</div><div class='del'>-		goto err_free;</div><div class='del'>-</div><div class='ctx'> 	if (ide_generic_sysfs_init())</div><div class='ctx'> 		printk(KERN_ERR DRV_NAME ": failed to create ide_generic "</div><div class='ctx'> 					 "class\n");</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='del'>-err_free:</div><div class='del'>-	ide_host_free(host);</div><div class='del'>-err:</div><div class='del'>-	for (i = 0; i &lt; MAX_HWIFS; i++) {</div><div class='del'>-		if (hws[i] == NULL)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		io_addr = hws[i]-&gt;io_ports.data_addr;</div><div class='del'>-		release_region(io_addr + 0x206, 1);</div><div class='del'>-		release_region(io_addr, 8);</div><div class='del'>-	}</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c<br/>index a896a283f27f..7162d67562af 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/ide-io.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ide/ide-io.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/ide-io.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/ide-io.c</a></div><div class='hunk'>@@ -40,6 +40,7 @@</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/ide.h&gt;</div><div class='add'>+#include &lt;linux/hdreg.h&gt;</div><div class='ctx'> #include &lt;linux/completion.h&gt;</div><div class='ctx'> #include &lt;linux/reboot.h&gt;</div><div class='ctx'> #include &lt;linux/cdrom.h&gt;</div><div class='hunk'>@@ -77,8 +78,9 @@ static int __ide_end_request(ide_drive_t *drive, struct request *rq,</div><div class='ctx'> 	 * decide whether to reenable DMA -- 3 is a random magic for now,</div><div class='ctx'> 	 * if we DMA timeout more than 3 times, just stay in PIO</div><div class='ctx'> 	 */</div><div class='del'>-	if (drive-&gt;state == DMA_PIO_RETRY &amp;&amp; drive-&gt;retry_pio &lt;= 3) {</div><div class='del'>-		drive-&gt;state = 0;</div><div class='add'>+	if ((drive-&gt;dev_flags &amp; IDE_DFLAG_DMA_PIO_RETRY) &amp;&amp;</div><div class='add'>+	    drive-&gt;retry_pio &lt;= 3) {</div><div class='add'>+		drive-&gt;dev_flags &amp;= ~IDE_DFLAG_DMA_PIO_RETRY;</div><div class='ctx'> 		ide_dma_on(drive);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -130,21 +132,6 @@ int ide_end_request (ide_drive_t *drive, int uptodate, int nr_sectors)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ide_end_request);</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Power Management state machine. This one is rather trivial for now,</div><div class='del'>- * we should probably add more, like switching back to PIO on suspend</div><div class='del'>- * to help some BIOSes, re-do the door locking on resume, etc...</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	ide_pm_flush_cache	= ide_pm_state_start_suspend,</div><div class='del'>-	idedisk_pm_standby,</div><div class='del'>-</div><div class='del'>-	idedisk_pm_restore_pio	= ide_pm_state_start_resume,</div><div class='del'>-	idedisk_pm_idle,</div><div class='del'>-	ide_pm_restore_dma,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static void ide_complete_power_step(ide_drive_t *drive, struct request *rq, u8 stat, u8 error)</div><div class='ctx'> {</div><div class='ctx'> 	struct request_pm_state *pm = rq-&gt;data;</div><div class='hunk'>@@ -153,20 +140,20 @@ static void ide_complete_power_step(ide_drive_t *drive, struct request *rq, u8 s</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	switch (pm-&gt;pm_step) {</div><div class='del'>-	case ide_pm_flush_cache:	/* Suspend step 1 (flush cache) complete */</div><div class='add'>+	case IDE_PM_FLUSH_CACHE:	/* Suspend step 1 (flush cache) */</div><div class='ctx'> 		if (pm-&gt;pm_state == PM_EVENT_FREEZE)</div><div class='del'>-			pm-&gt;pm_step = ide_pm_state_completed;</div><div class='add'>+			pm-&gt;pm_step = IDE_PM_COMPLETED;</div><div class='ctx'> 		else</div><div class='del'>-			pm-&gt;pm_step = idedisk_pm_standby;</div><div class='add'>+			pm-&gt;pm_step = IDE_PM_STANDBY;</div><div class='ctx'> 		break;</div><div class='del'>-	case idedisk_pm_standby:	/* Suspend step 2 (standby) complete */</div><div class='del'>-		pm-&gt;pm_step = ide_pm_state_completed;</div><div class='add'>+	case IDE_PM_STANDBY:		/* Suspend step 2 (standby) */</div><div class='add'>+		pm-&gt;pm_step = IDE_PM_COMPLETED;</div><div class='ctx'> 		break;</div><div class='del'>-	case idedisk_pm_restore_pio:	/* Resume step 1 complete */</div><div class='del'>-		pm-&gt;pm_step = idedisk_pm_idle;</div><div class='add'>+	case IDE_PM_RESTORE_PIO:	/* Resume step 1 (restore PIO) */</div><div class='add'>+		pm-&gt;pm_step = IDE_PM_IDLE;</div><div class='ctx'> 		break;</div><div class='del'>-	case idedisk_pm_idle:		/* Resume step 2 (idle) complete */</div><div class='del'>-		pm-&gt;pm_step = ide_pm_restore_dma;</div><div class='add'>+	case IDE_PM_IDLE:		/* Resume step 2 (idle)*/</div><div class='add'>+		pm-&gt;pm_step = IDE_PM_RESTORE_DMA;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -179,40 +166,37 @@ static ide_startstop_t ide_start_power_step(ide_drive_t *drive, struct request *</div><div class='ctx'> 	memset(args, 0, sizeof(*args));</div><div class='ctx'> </div><div class='ctx'> 	switch (pm-&gt;pm_step) {</div><div class='del'>-	case ide_pm_flush_cache:	/* Suspend step 1 (flush cache) */</div><div class='add'>+	case IDE_PM_FLUSH_CACHE:	/* Suspend step 1 (flush cache) */</div><div class='ctx'> 		if (drive-&gt;media != ide_disk)</div><div class='ctx'> 			break;</div><div class='ctx'> 		/* Not supported? Switch to next step now. */</div><div class='del'>-		if (!drive-&gt;wcache || !ide_id_has_flush_cache(drive-&gt;id)) {</div><div class='add'>+		if (ata_id_flush_enabled(drive-&gt;id) == 0 ||</div><div class='add'>+		    (drive-&gt;dev_flags &amp; IDE_DFLAG_WCACHE) == 0) {</div><div class='ctx'> 			ide_complete_power_step(drive, rq, 0, 0);</div><div class='ctx'> 			return ide_stopped;</div><div class='ctx'> 		}</div><div class='del'>-		if (ide_id_has_flush_cache_ext(drive-&gt;id))</div><div class='del'>-			args-&gt;tf.command = WIN_FLUSH_CACHE_EXT;</div><div class='add'>+		if (ata_id_flush_ext_enabled(drive-&gt;id))</div><div class='add'>+			args-&gt;tf.command = ATA_CMD_FLUSH_EXT;</div><div class='ctx'> 		else</div><div class='del'>-			args-&gt;tf.command = WIN_FLUSH_CACHE;</div><div class='add'>+			args-&gt;tf.command = ATA_CMD_FLUSH;</div><div class='ctx'> 		goto out_do_tf;</div><div class='del'>-</div><div class='del'>-	case idedisk_pm_standby:	/* Suspend step 2 (standby) */</div><div class='del'>-		args-&gt;tf.command = WIN_STANDBYNOW1;</div><div class='add'>+	case IDE_PM_STANDBY:		/* Suspend step 2 (standby) */</div><div class='add'>+		args-&gt;tf.command = ATA_CMD_STANDBYNOW1;</div><div class='ctx'> 		goto out_do_tf;</div><div class='del'>-</div><div class='del'>-	case idedisk_pm_restore_pio:	/* Resume step 1 (restore PIO) */</div><div class='add'>+	case IDE_PM_RESTORE_PIO:	/* Resume step 1 (restore PIO) */</div><div class='ctx'> 		ide_set_max_pio(drive);</div><div class='ctx'> 		/*</div><div class='del'>-		 * skip idedisk_pm_idle for ATAPI devices</div><div class='add'>+		 * skip IDE_PM_IDLE for ATAPI devices</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (drive-&gt;media != ide_disk)</div><div class='del'>-			pm-&gt;pm_step = ide_pm_restore_dma;</div><div class='add'>+			pm-&gt;pm_step = IDE_PM_RESTORE_DMA;</div><div class='ctx'> 		else</div><div class='ctx'> 			ide_complete_power_step(drive, rq, 0, 0);</div><div class='ctx'> 		return ide_stopped;</div><div class='del'>-</div><div class='del'>-	case idedisk_pm_idle:		/* Resume step 2 (idle) */</div><div class='del'>-		args-&gt;tf.command = WIN_IDLEIMMEDIATE;</div><div class='add'>+	case IDE_PM_IDLE:		/* Resume step 2 (idle) */</div><div class='add'>+		args-&gt;tf.command = ATA_CMD_IDLEIMMEDIATE;</div><div class='ctx'> 		goto out_do_tf;</div><div class='del'>-</div><div class='del'>-	case ide_pm_restore_dma:	/* Resume step 3 (restore DMA) */</div><div class='add'>+	case IDE_PM_RESTORE_DMA:	/* Resume step 3 (restore DMA) */</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Right now, all we do is call ide_set_dma(drive),</div><div class='ctx'> 		 * we could be smarter and check for current xfer_speed</div><div class='hunk'>@@ -221,12 +205,13 @@ static ide_startstop_t ide_start_power_step(ide_drive_t *drive, struct request *</div><div class='ctx'> 		if (drive-&gt;hwif-&gt;dma_ops == NULL)</div><div class='ctx'> 			break;</div><div class='ctx'> 		/*</div><div class='del'>-		 * TODO: respect -&gt;using_dma setting</div><div class='add'>+		 * TODO: respect IDE_DFLAG_USING_DMA</div><div class='ctx'> 		 */</div><div class='ctx'> 		ide_set_dma(drive);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	pm-&gt;pm_step = ide_pm_state_completed;</div><div class='add'>+</div><div class='add'>+	pm-&gt;pm_step = IDE_PM_COMPLETED;</div><div class='ctx'> 	return ide_stopped;</div><div class='ctx'> </div><div class='ctx'> out_do_tf:</div><div class='hunk'>@@ -286,7 +271,7 @@ static void ide_complete_pm_request (ide_drive_t *drive, struct request *rq)</div><div class='ctx'> 	if (blk_pm_suspend_request(rq)) {</div><div class='ctx'> 		blk_stop_queue(drive-&gt;queue);</div><div class='ctx'> 	} else {</div><div class='del'>-		drive-&gt;blocked = 0;</div><div class='add'>+		drive-&gt;dev_flags &amp;= ~IDE_DFLAG_BLOCKED;</div><div class='ctx'> 		blk_start_queue(drive-&gt;queue);</div><div class='ctx'> 	}</div><div class='ctx'> 	HWGROUP(drive)-&gt;rq = NULL;</div><div class='hunk'>@@ -322,7 +307,7 @@ void ide_end_drive_cmd (ide_drive_t *drive, u8 stat, u8 err)</div><div class='ctx'> 		ide_task_t *task = (ide_task_t *)rq-&gt;special;</div><div class='ctx'> </div><div class='ctx'> 		if (rq-&gt;errors == 0)</div><div class='del'>-			rq-&gt;errors = !OK_STAT(stat, READY_STAT, BAD_STAT);</div><div class='add'>+			rq-&gt;errors = !OK_STAT(stat, ATA_DRDY, BAD_STAT);</div><div class='ctx'> </div><div class='ctx'> 		if (task) {</div><div class='ctx'> 			struct ide_taskfile *tf = &amp;task-&gt;tf;</div><div class='hunk'>@@ -342,7 +327,7 @@ void ide_end_drive_cmd (ide_drive_t *drive, u8 stat, u8 err)</div><div class='ctx'> 			drive-&gt;name, rq-&gt;pm-&gt;pm_step, stat, err);</div><div class='ctx'> #endif</div><div class='ctx'> 		ide_complete_power_step(drive, rq, stat, err);</div><div class='del'>-		if (pm-&gt;pm_step == ide_pm_state_completed)</div><div class='add'>+		if (pm-&gt;pm_step == IDE_PM_COMPLETED)</div><div class='ctx'> 			ide_complete_pm_request(drive, rq);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -373,29 +358,30 @@ static ide_startstop_t ide_ata_error(ide_drive_t *drive, struct request *rq, u8</div><div class='ctx'> {</div><div class='ctx'> 	ide_hwif_t *hwif = drive-&gt;hwif;</div><div class='ctx'> </div><div class='del'>-	if (stat &amp; BUSY_STAT || ((stat &amp; WRERR_STAT) &amp;&amp; !drive-&gt;nowerr)) {</div><div class='add'>+	if ((stat &amp; ATA_BUSY) ||</div><div class='add'>+	    ((stat &amp; ATA_DF) &amp;&amp; (drive-&gt;dev_flags &amp; IDE_DFLAG_NOWERR) == 0)) {</div><div class='ctx'> 		/* other bits are useless when BUSY */</div><div class='ctx'> 		rq-&gt;errors |= ERROR_RESET;</div><div class='del'>-	} else if (stat &amp; ERR_STAT) {</div><div class='add'>+	} else if (stat &amp; ATA_ERR) {</div><div class='ctx'> 		/* err has different meaning on cdrom and tape */</div><div class='del'>-		if (err == ABRT_ERR) {</div><div class='del'>-			if (drive-&gt;select.b.lba &amp;&amp;</div><div class='del'>-			    /* some newer drives don't support WIN_SPECIFY */</div><div class='del'>-			    hwif-&gt;tp_ops-&gt;read_status(hwif) == WIN_SPECIFY)</div><div class='add'>+		if (err == ATA_ABORTED) {</div><div class='add'>+			if ((drive-&gt;dev_flags &amp; IDE_DFLAG_LBA) &amp;&amp;</div><div class='add'>+			    /* some newer drives don't support ATA_CMD_INIT_DEV_PARAMS */</div><div class='add'>+			    hwif-&gt;tp_ops-&gt;read_status(hwif) == ATA_CMD_INIT_DEV_PARAMS)</div><div class='ctx'> 				return ide_stopped;</div><div class='ctx'> 		} else if ((err &amp; BAD_CRC) == BAD_CRC) {</div><div class='ctx'> 			/* UDMA crc error, just retry the operation */</div><div class='ctx'> 			drive-&gt;crc_count++;</div><div class='del'>-		} else if (err &amp; (BBD_ERR | ECC_ERR)) {</div><div class='add'>+		} else if (err &amp; (ATA_BBK | ATA_UNC)) {</div><div class='ctx'> 			/* retries won't help these */</div><div class='ctx'> 			rq-&gt;errors = ERROR_MAX;</div><div class='del'>-		} else if (err &amp; TRK0_ERR) {</div><div class='add'>+		} else if (err &amp; ATA_TRK0NF) {</div><div class='ctx'> 			/* help it find track zero */</div><div class='ctx'> 			rq-&gt;errors |= ERROR_RECAL;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((stat &amp; DRQ_STAT) &amp;&amp; rq_data_dir(rq) == READ &amp;&amp;</div><div class='add'>+	if ((stat &amp; ATA_DRQ) &amp;&amp; rq_data_dir(rq) == READ &amp;&amp;</div><div class='ctx'> 	    (hwif-&gt;host_flags &amp; IDE_HFLAG_ERROR_STOPS_FIFO) == 0) {</div><div class='ctx'> 		int nsect = drive-&gt;mult_count ? drive-&gt;mult_count : 1;</div><div class='ctx'> </div><div class='hunk'>@@ -407,7 +393,7 @@ static ide_startstop_t ide_ata_error(ide_drive_t *drive, struct request *rq, u8</div><div class='ctx'> 		return ide_stopped;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (hwif-&gt;tp_ops-&gt;read_status(hwif) &amp; (BUSY_STAT | DRQ_STAT))</div><div class='add'>+	if (hwif-&gt;tp_ops-&gt;read_status(hwif) &amp; (ATA_BUSY | ATA_DRQ))</div><div class='ctx'> 		rq-&gt;errors |= ERROR_RESET;</div><div class='ctx'> </div><div class='ctx'> 	if ((rq-&gt;errors &amp; ERROR_RESET) == ERROR_RESET) {</div><div class='hunk'>@@ -427,16 +413,17 @@ static ide_startstop_t ide_atapi_error(ide_drive_t *drive, struct request *rq, u</div><div class='ctx'> {</div><div class='ctx'> 	ide_hwif_t *hwif = drive-&gt;hwif;</div><div class='ctx'> </div><div class='del'>-	if (stat &amp; BUSY_STAT || ((stat &amp; WRERR_STAT) &amp;&amp; !drive-&gt;nowerr)) {</div><div class='add'>+	if ((stat &amp; ATA_BUSY) ||</div><div class='add'>+	    ((stat &amp; ATA_DF) &amp;&amp; (drive-&gt;dev_flags &amp; IDE_DFLAG_NOWERR) == 0)) {</div><div class='ctx'> 		/* other bits are useless when BUSY */</div><div class='ctx'> 		rq-&gt;errors |= ERROR_RESET;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* add decoding error stuff */</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (hwif-&gt;tp_ops-&gt;read_status(hwif) &amp; (BUSY_STAT | DRQ_STAT))</div><div class='add'>+	if (hwif-&gt;tp_ops-&gt;read_status(hwif) &amp; (ATA_BUSY | ATA_DRQ))</div><div class='ctx'> 		/* force an abort */</div><div class='del'>-		hwif-&gt;tp_ops-&gt;exec_command(hwif, WIN_IDLEIMMEDIATE);</div><div class='add'>+		hwif-&gt;tp_ops-&gt;exec_command(hwif, ATA_CMD_IDLEIMMEDIATE);</div><div class='ctx'> </div><div class='ctx'> 	if (rq-&gt;errors &gt;= ERROR_MAX) {</div><div class='ctx'> 		ide_kill_rq(drive, rq);</div><div class='hunk'>@@ -508,20 +495,20 @@ static void ide_tf_set_specify_cmd(ide_drive_t *drive, struct ide_taskfile *tf)</div><div class='ctx'> 	tf-&gt;lbal    = drive-&gt;sect;</div><div class='ctx'> 	tf-&gt;lbam    = drive-&gt;cyl;</div><div class='ctx'> 	tf-&gt;lbah    = drive-&gt;cyl &gt;&gt; 8;</div><div class='del'>-	tf-&gt;device  = ((drive-&gt;head - 1) | drive-&gt;select.all) &amp; ~ATA_LBA;</div><div class='del'>-	tf-&gt;command = WIN_SPECIFY;</div><div class='add'>+	tf-&gt;device  = (drive-&gt;head - 1) | drive-&gt;select;</div><div class='add'>+	tf-&gt;command = ATA_CMD_INIT_DEV_PARAMS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ide_tf_set_restore_cmd(ide_drive_t *drive, struct ide_taskfile *tf)</div><div class='ctx'> {</div><div class='ctx'> 	tf-&gt;nsect   = drive-&gt;sect;</div><div class='del'>-	tf-&gt;command = WIN_RESTORE;</div><div class='add'>+	tf-&gt;command = ATA_CMD_RESTORE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ide_tf_set_setmult_cmd(ide_drive_t *drive, struct ide_taskfile *tf)</div><div class='ctx'> {</div><div class='ctx'> 	tf-&gt;nsect   = drive-&gt;mult_req;</div><div class='del'>-	tf-&gt;command = WIN_SETMULT;</div><div class='add'>+	tf-&gt;command = ATA_CMD_SET_MULTI;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ide_startstop_t ide_disk_special(ide_drive_t *drive)</div><div class='hunk'>@@ -540,8 +527,6 @@ static ide_startstop_t ide_disk_special(ide_drive_t *drive)</div><div class='ctx'> 		ide_tf_set_restore_cmd(drive, &amp;args.tf);</div><div class='ctx'> 	} else if (s-&gt;b.set_multmode) {</div><div class='ctx'> 		s-&gt;b.set_multmode = 0;</div><div class='del'>-		if (drive-&gt;mult_req &gt; drive-&gt;id-&gt;max_multsect)</div><div class='del'>-			drive-&gt;mult_req = drive-&gt;id-&gt;max_multsect;</div><div class='ctx'> 		ide_tf_set_setmult_cmd(drive, &amp;args.tf);</div><div class='ctx'> 	} else if (s-&gt;all) {</div><div class='ctx'> 		int special = s-&gt;all;</div><div class='hunk'>@@ -558,37 +543,14 @@ static ide_startstop_t ide_disk_special(ide_drive_t *drive)</div><div class='ctx'> 	return ide_started;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * handle HDIO_SET_PIO_MODE ioctl abusers here, eventually it will go away</div><div class='del'>- */</div><div class='del'>-static int set_pio_mode_abuse(ide_hwif_t *hwif, u8 req_pio)</div><div class='del'>-{</div><div class='del'>-	switch (req_pio) {</div><div class='del'>-	case 202:</div><div class='del'>-	case 201:</div><div class='del'>-	case 200:</div><div class='del'>-	case 102:</div><div class='del'>-	case 101:</div><div class='del'>-	case 100:</div><div class='del'>-		return (hwif-&gt;host_flags &amp; IDE_HFLAG_ABUSE_DMA_MODES) ? 1 : 0;</div><div class='del'>-	case 9:</div><div class='del'>-	case 8:</div><div class='del'>-		return (hwif-&gt;host_flags &amp; IDE_HFLAG_ABUSE_PREFETCH) ? 1 : 0;</div><div class='del'>-	case 7:</div><div class='del'>-	case 6:</div><div class='del'>-		return (hwif-&gt;host_flags &amp; IDE_HFLAG_ABUSE_FAST_DEVSEL) ? 1 : 0;</div><div class='del'>-	default:</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  *	do_special		-	issue some special commands</div><div class='ctx'>  *	@drive: drive the command is for</div><div class='ctx'>  *</div><div class='del'>- *	do_special() is used to issue WIN_SPECIFY, WIN_RESTORE, and WIN_SETMULT</div><div class='del'>- *	commands to a drive.  It used to do much more, but has been scaled</div><div class='del'>- *	back.</div><div class='add'>+ *	do_special() is used to issue ATA_CMD_INIT_DEV_PARAMS,</div><div class='add'>+ *	ATA_CMD_RESTORE and ATA_CMD_SET_MULTI commands to a drive.</div><div class='add'>+ *</div><div class='add'>+ *	It used to do much more, but has been scaled back.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static ide_startstop_t do_special (ide_drive_t *drive)</div><div class='hunk'>@@ -598,45 +560,12 @@ static ide_startstop_t do_special (ide_drive_t *drive)</div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 	printk("%s: do_special: 0x%02x\n", drive-&gt;name, s-&gt;all);</div><div class='ctx'> #endif</div><div class='del'>-	if (s-&gt;b.set_tune) {</div><div class='del'>-		ide_hwif_t *hwif = drive-&gt;hwif;</div><div class='del'>-		const struct ide_port_ops *port_ops = hwif-&gt;port_ops;</div><div class='del'>-		u8 req_pio = drive-&gt;tune_req;</div><div class='del'>-</div><div class='del'>-		s-&gt;b.set_tune = 0;</div><div class='del'>-</div><div class='del'>-		if (set_pio_mode_abuse(drive-&gt;hwif, req_pio)) {</div><div class='del'>-			/*</div><div class='del'>-			 * take ide_lock for drive-&gt;[no_]unmask/[no_]io_32bit</div><div class='del'>-			 */</div><div class='del'>-			if (req_pio == 8 || req_pio == 9) {</div><div class='del'>-				unsigned long flags;</div><div class='del'>-</div><div class='del'>-				spin_lock_irqsave(&amp;ide_lock, flags);</div><div class='del'>-				port_ops-&gt;set_pio_mode(drive, req_pio);</div><div class='del'>-				spin_unlock_irqrestore(&amp;ide_lock, flags);</div><div class='del'>-			} else</div><div class='del'>-				port_ops-&gt;set_pio_mode(drive, req_pio);</div><div class='del'>-		} else {</div><div class='del'>-			int keep_dma = drive-&gt;using_dma;</div><div class='del'>-</div><div class='del'>-			ide_set_pio(drive, req_pio);</div><div class='del'>-</div><div class='del'>-			if (hwif-&gt;host_flags &amp; IDE_HFLAG_SET_PIO_MODE_KEEP_DMA) {</div><div class='del'>-				if (keep_dma)</div><div class='del'>-					ide_dma_on(drive);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		return ide_stopped;</div><div class='del'>-	} else {</div><div class='del'>-		if (drive-&gt;media == ide_disk)</div><div class='del'>-			return ide_disk_special(drive);</div><div class='add'>+	if (drive-&gt;media == ide_disk)</div><div class='add'>+		return ide_disk_special(drive);</div><div class='ctx'> </div><div class='del'>-		s-&gt;all = 0;</div><div class='del'>-		drive-&gt;mult_req = 0;</div><div class='del'>-		return ide_stopped;</div><div class='del'>-	}</div><div class='add'>+	s-&gt;all = 0;</div><div class='add'>+	drive-&gt;mult_req = 0;</div><div class='add'>+	return ide_stopped;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void ide_map_sg(ide_drive_t *drive, struct request *rq)</div><div class='hunk'>@@ -716,9 +645,71 @@ static ide_startstop_t execute_drive_cmd (ide_drive_t *drive,</div><div class='ctx'>  	return ide_stopped;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int ide_devset_execute(ide_drive_t *drive, const struct ide_devset *setting,</div><div class='add'>+		       int arg)</div><div class='add'>+{</div><div class='add'>+	struct request_queue *q = drive-&gt;queue;</div><div class='add'>+	struct request *rq;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (!(setting-&gt;flags &amp; DS_SYNC))</div><div class='add'>+		return setting-&gt;set(drive, arg);</div><div class='add'>+</div><div class='add'>+	rq = blk_get_request(q, READ, __GFP_WAIT);</div><div class='add'>+	rq-&gt;cmd_type = REQ_TYPE_SPECIAL;</div><div class='add'>+	rq-&gt;cmd_len = 5;</div><div class='add'>+	rq-&gt;cmd[0] = REQ_DEVSET_EXEC;</div><div class='add'>+	*(int *)&amp;rq-&gt;cmd[1] = arg;</div><div class='add'>+	rq-&gt;special = setting-&gt;set;</div><div class='add'>+</div><div class='add'>+	if (blk_execute_rq(q, NULL, rq, 0))</div><div class='add'>+		ret = rq-&gt;errors;</div><div class='add'>+	blk_put_request(rq);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(ide_devset_execute);</div><div class='add'>+</div><div class='ctx'> static ide_startstop_t ide_special_rq(ide_drive_t *drive, struct request *rq)</div><div class='ctx'> {</div><div class='del'>-	switch (rq-&gt;cmd[0]) {</div><div class='add'>+	u8 cmd = rq-&gt;cmd[0];</div><div class='add'>+</div><div class='add'>+	if (cmd == REQ_PARK_HEADS || cmd == REQ_UNPARK_HEADS) {</div><div class='add'>+		ide_task_t task;</div><div class='add'>+		struct ide_taskfile *tf = &amp;task.tf;</div><div class='add'>+</div><div class='add'>+		memset(&amp;task, 0, sizeof(task));</div><div class='add'>+		if (cmd == REQ_PARK_HEADS) {</div><div class='add'>+			drive-&gt;sleep = *(unsigned long *)rq-&gt;special;</div><div class='add'>+			drive-&gt;dev_flags |= IDE_DFLAG_SLEEPING;</div><div class='add'>+			tf-&gt;command = ATA_CMD_IDLEIMMEDIATE;</div><div class='add'>+			tf-&gt;feature = 0x44;</div><div class='add'>+			tf-&gt;lbal = 0x4c;</div><div class='add'>+			tf-&gt;lbam = 0x4e;</div><div class='add'>+			tf-&gt;lbah = 0x55;</div><div class='add'>+			task.tf_flags |= IDE_TFLAG_CUSTOM_HANDLER;</div><div class='add'>+		} else		/* cmd == REQ_UNPARK_HEADS */</div><div class='add'>+			tf-&gt;command = ATA_CMD_CHK_POWER;</div><div class='add'>+</div><div class='add'>+		task.tf_flags |= IDE_TFLAG_TF | IDE_TFLAG_DEVICE;</div><div class='add'>+		task.rq = rq;</div><div class='add'>+		drive-&gt;hwif-&gt;data_phase = task.data_phase = TASKFILE_NO_DATA;</div><div class='add'>+		return do_rw_taskfile(drive, &amp;task);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case REQ_DEVSET_EXEC:</div><div class='add'>+	{</div><div class='add'>+		int err, (*setfunc)(ide_drive_t *, int) = rq-&gt;special;</div><div class='add'>+</div><div class='add'>+		err = setfunc(drive, *(int *)&amp;rq-&gt;cmd[1]);</div><div class='add'>+		if (err)</div><div class='add'>+			rq-&gt;errors = err;</div><div class='add'>+		else</div><div class='add'>+			err = 1;</div><div class='add'>+		ide_end_request(drive, err, 0);</div><div class='add'>+		return ide_stopped;</div><div class='add'>+	}</div><div class='ctx'> 	case REQ_DRIVE_RESET:</div><div class='ctx'> 		return ide_do_reset(drive);</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -733,11 +724,11 @@ static void ide_check_pm_state(ide_drive_t *drive, struct request *rq)</div><div class='ctx'> 	struct request_pm_state *pm = rq-&gt;data;</div><div class='ctx'> </div><div class='ctx'> 	if (blk_pm_suspend_request(rq) &amp;&amp;</div><div class='del'>-	    pm-&gt;pm_step == ide_pm_state_start_suspend)</div><div class='add'>+	    pm-&gt;pm_step == IDE_PM_START_SUSPEND)</div><div class='ctx'> 		/* Mark drive blocked when starting the suspend sequence. */</div><div class='del'>-		drive-&gt;blocked = 1;</div><div class='add'>+		drive-&gt;dev_flags |= IDE_DFLAG_BLOCKED;</div><div class='ctx'> 	else if (blk_pm_resume_request(rq) &amp;&amp;</div><div class='del'>-		 pm-&gt;pm_step == ide_pm_state_start_resume) {</div><div class='add'>+		 pm-&gt;pm_step == IDE_PM_START_RESUME) {</div><div class='ctx'> 		/* </div><div class='ctx'> 		 * The first thing we do on wakeup is to wait for BSY bit to</div><div class='ctx'> 		 * go away (with a looong timeout) as a drive on this hwif may</div><div class='hunk'>@@ -766,9 +757,7 @@ static void ide_check_pm_state(ide_drive_t *drive, struct request *rq)</div><div class='ctx'>  *	start_request	-	start of I/O and command issuing for IDE</div><div class='ctx'>  *</div><div class='ctx'>  *	start_request() initiates handling of a new I/O request. It</div><div class='del'>- *	accepts commands and I/O (read/write) requests. It also does</div><div class='del'>- *	the final remapping for weird stuff like EZDrive. Once </div><div class='del'>- *	device mapper can work sector level the EZDrive stuff can go away</div><div class='add'>+ *	accepts commands and I/O (read/write) requests.</div><div class='ctx'>  *</div><div class='ctx'>  *	FIXME: this function needs a rename</div><div class='ctx'>  */</div><div class='hunk'>@@ -776,7 +765,6 @@ static void ide_check_pm_state(ide_drive_t *drive, struct request *rq)</div><div class='ctx'> static ide_startstop_t start_request (ide_drive_t *drive, struct request *rq)</div><div class='ctx'> {</div><div class='ctx'> 	ide_startstop_t startstop;</div><div class='del'>-	sector_t block;</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(!blk_rq_started(rq));</div><div class='ctx'> </div><div class='hunk'>@@ -791,21 +779,12 @@ static ide_startstop_t start_request (ide_drive_t *drive, struct request *rq)</div><div class='ctx'> 		goto kill_rq;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	block    = rq-&gt;sector;</div><div class='del'>-	if (blk_fs_request(rq) &amp;&amp;</div><div class='del'>-	    (drive-&gt;media == ide_disk || drive-&gt;media == ide_floppy)) {</div><div class='del'>-		block += drive-&gt;sect0;</div><div class='del'>-	}</div><div class='del'>-	/* Yecch - this will shift the entire interval,</div><div class='del'>-	   possibly killing some innocent following sector */</div><div class='del'>-	if (block == 0 &amp;&amp; drive-&gt;remap_0_to_1 == 1)</div><div class='del'>-		block = 1;  /* redirect MBR access to EZ-Drive partn table */</div><div class='del'>-</div><div class='ctx'> 	if (blk_pm_request(rq))</div><div class='ctx'> 		ide_check_pm_state(drive, rq);</div><div class='ctx'> </div><div class='ctx'> 	SELECT_DRIVE(drive);</div><div class='del'>-	if (ide_wait_stat(&amp;startstop, drive, drive-&gt;ready_stat, BUSY_STAT|DRQ_STAT, WAIT_READY)) {</div><div class='add'>+	if (ide_wait_stat(&amp;startstop, drive, drive-&gt;ready_stat,</div><div class='add'>+			  ATA_BUSY | ATA_DRQ, WAIT_READY)) {</div><div class='ctx'> 		printk(KERN_ERR "%s: drive not ready for command\n", drive-&gt;name);</div><div class='ctx'> 		return startstop;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -829,7 +808,7 @@ static ide_startstop_t start_request (ide_drive_t *drive, struct request *rq)</div><div class='ctx'> #endif</div><div class='ctx'> 			startstop = ide_start_power_step(drive, rq);</div><div class='ctx'> 			if (startstop == ide_stopped &amp;&amp;</div><div class='del'>-			    pm-&gt;pm_step == ide_pm_state_completed)</div><div class='add'>+			    pm-&gt;pm_step == IDE_PM_COMPLETED)</div><div class='ctx'> 				ide_complete_pm_request(drive, rq);</div><div class='ctx'> 			return startstop;</div><div class='ctx'> 		} else if (!rq-&gt;rq_disk &amp;&amp; blk_special_request(rq))</div><div class='hunk'>@@ -844,7 +823,8 @@ static ide_startstop_t start_request (ide_drive_t *drive, struct request *rq)</div><div class='ctx'> 			return ide_special_rq(drive, rq);</div><div class='ctx'> </div><div class='ctx'> 		drv = *(ide_driver_t **)rq-&gt;rq_disk-&gt;private_data;</div><div class='del'>-		return drv-&gt;do_request(drive, rq, block);</div><div class='add'>+</div><div class='add'>+		return drv-&gt;do_request(drive, rq, rq-&gt;sector);</div><div class='ctx'> 	}</div><div class='ctx'> 	return do_special(drive);</div><div class='ctx'> kill_rq:</div><div class='hunk'>@@ -866,7 +846,7 @@ void ide_stall_queue (ide_drive_t *drive, unsigned long timeout)</div><div class='ctx'> 	if (timeout &gt; WAIT_WORSTCASE)</div><div class='ctx'> 		timeout = WAIT_WORSTCASE;</div><div class='ctx'> 	drive-&gt;sleep = timeout + jiffies;</div><div class='del'>-	drive-&gt;sleeping = 1;</div><div class='add'>+	drive-&gt;dev_flags |= IDE_DFLAG_SLEEPING;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(ide_stall_queue);</div><div class='hunk'>@@ -906,18 +886,23 @@ repeat:</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='del'>-		if ((!drive-&gt;sleeping || time_after_eq(jiffies, drive-&gt;sleep))</div><div class='del'>-		    &amp;&amp; !elv_queue_empty(drive-&gt;queue)) {</div><div class='del'>-			if (!best</div><div class='del'>-			 || (drive-&gt;sleeping &amp;&amp; (!best-&gt;sleeping || time_before(drive-&gt;sleep, best-&gt;sleep)))</div><div class='del'>-			 || (!best-&gt;sleeping &amp;&amp; time_before(WAKEUP(drive), WAKEUP(best))))</div><div class='del'>-			{</div><div class='add'>+		u8 dev_s = !!(drive-&gt;dev_flags &amp; IDE_DFLAG_SLEEPING);</div><div class='add'>+		u8 best_s = (best &amp;&amp; !!(best-&gt;dev_flags &amp; IDE_DFLAG_SLEEPING));</div><div class='add'>+</div><div class='add'>+		if ((dev_s == 0 || time_after_eq(jiffies, drive-&gt;sleep)) &amp;&amp;</div><div class='add'>+		    !elv_queue_empty(drive-&gt;queue)) {</div><div class='add'>+			if (best == NULL ||</div><div class='add'>+			    (dev_s &amp;&amp; (best_s == 0 || time_before(drive-&gt;sleep, best-&gt;sleep))) ||</div><div class='add'>+			    (best_s == 0 &amp;&amp; time_before(WAKEUP(drive), WAKEUP(best)))) {</div><div class='ctx'> 				if (!blk_queue_plugged(drive-&gt;queue))</div><div class='ctx'> 					best = drive;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	} while ((drive = drive-&gt;next) != hwgroup-&gt;drive);</div><div class='del'>-	if (best &amp;&amp; best-&gt;nice1 &amp;&amp; !best-&gt;sleeping &amp;&amp; best != hwgroup-&gt;drive &amp;&amp; best-&gt;service_time &gt; WAIT_MIN_SLEEP) {</div><div class='add'>+</div><div class='add'>+	if (best &amp;&amp; (best-&gt;dev_flags &amp; IDE_DFLAG_NICE1) &amp;&amp;</div><div class='add'>+	    (best-&gt;dev_flags &amp; IDE_DFLAG_SLEEPING) == 0 &amp;&amp;</div><div class='add'>+	    best != hwgroup-&gt;drive &amp;&amp; best-&gt;service_time &gt; WAIT_MIN_SLEEP) {</div><div class='ctx'> 		long t = (signed long)(WAKEUP(best) - jiffies);</div><div class='ctx'> 		if (t &gt;= WAIT_MIN_SLEEP) {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -926,7 +911,7 @@ repeat:</div><div class='ctx'> 		 */</div><div class='ctx'> 			drive = best-&gt;next;</div><div class='ctx'> 			do {</div><div class='del'>-				if (!drive-&gt;sleeping</div><div class='add'>+				if ((drive-&gt;dev_flags &amp; IDE_DFLAG_SLEEPING) == 0</div><div class='ctx'> 				 &amp;&amp; time_before(jiffies - best-&gt;service_time, WAKEUP(drive))</div><div class='ctx'> 				 &amp;&amp; time_before(WAKEUP(drive), jiffies + t))</div><div class='ctx'> 				{</div><div class='hunk'>@@ -997,7 +982,9 @@ static void ide_do_request (ide_hwgroup_t *hwgroup, int masked_irq)</div><div class='ctx'> 			hwgroup-&gt;rq = NULL;</div><div class='ctx'> 			drive = hwgroup-&gt;drive;</div><div class='ctx'> 			do {</div><div class='del'>-				if (drive-&gt;sleeping &amp;&amp; (!sleeping || time_before(drive-&gt;sleep, sleep))) {</div><div class='add'>+				if ((drive-&gt;dev_flags &amp; IDE_DFLAG_SLEEPING) &amp;&amp;</div><div class='add'>+				    (sleeping == 0 ||</div><div class='add'>+				     time_before(drive-&gt;sleep, sleep))) {</div><div class='ctx'> 					sleeping = 1;</div><div class='ctx'> 					sleep = drive-&gt;sleep;</div><div class='ctx'> 				}</div><div class='hunk'>@@ -1046,7 +1033,7 @@ static void ide_do_request (ide_hwgroup_t *hwgroup, int masked_irq)</div><div class='ctx'> 		}</div><div class='ctx'> 		hwgroup-&gt;hwif = hwif;</div><div class='ctx'> 		hwgroup-&gt;drive = drive;</div><div class='del'>-		drive-&gt;sleeping = 0;</div><div class='add'>+		drive-&gt;dev_flags &amp;= ~(IDE_DFLAG_SLEEPING | IDE_DFLAG_PARKED);</div><div class='ctx'> 		drive-&gt;service_start = jiffies;</div><div class='ctx'> </div><div class='ctx'> 		if (blk_queue_plugged(drive-&gt;queue)) {</div><div class='hunk'>@@ -1080,7 +1067,9 @@ static void ide_do_request (ide_hwgroup_t *hwgroup, int masked_irq)</div><div class='ctx'> 		 * We count how many times we loop here to make sure we service</div><div class='ctx'> 		 * all drives in the hwgroup without looping for ever</div><div class='ctx'> 		 */</div><div class='del'>-		if (drive-&gt;blocked &amp;&amp; !blk_pm_request(rq) &amp;&amp; !(rq-&gt;cmd_flags &amp; REQ_PREEMPT)) {</div><div class='add'>+		if ((drive-&gt;dev_flags &amp; IDE_DFLAG_BLOCKED) &amp;&amp;</div><div class='add'>+		    blk_pm_request(rq) == 0 &amp;&amp;</div><div class='add'>+		    (rq-&gt;cmd_flags &amp; REQ_PREEMPT) == 0) {</div><div class='ctx'> 			drive = drive-&gt;next ? drive-&gt;next : hwgroup-&gt;drive;</div><div class='ctx'> 			if (loops++ &lt; 4 &amp;&amp; !blk_queue_plugged(drive-&gt;queue))</div><div class='ctx'> 				goto again;</div><div class='hunk'>@@ -1153,8 +1142,8 @@ static ide_startstop_t ide_dma_timeout_retry(ide_drive_t *drive, int error)</div><div class='ctx'> 	 * a timeout -- we'll reenable after we finish this next request</div><div class='ctx'> 	 * (or rather the first chunk of it) in pio.</div><div class='ctx'> 	 */</div><div class='add'>+	drive-&gt;dev_flags |= IDE_DFLAG_DMA_PIO_RETRY;</div><div class='ctx'> 	drive-&gt;retry_pio++;</div><div class='del'>-	drive-&gt;state = DMA_PIO_RETRY;</div><div class='ctx'> 	ide_dma_off_quietly(drive);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1325,7 +1314,7 @@ static void unexpected_intr (int irq, ide_hwgroup_t *hwgroup)</div><div class='ctx'> 		if (hwif-&gt;irq == irq) {</div><div class='ctx'> 			stat = hwif-&gt;tp_ops-&gt;read_status(hwif);</div><div class='ctx'> </div><div class='del'>-			if (!OK_STAT(stat, READY_STAT, BAD_STAT)) {</div><div class='add'>+			if (!OK_STAT(stat, ATA_DRDY, BAD_STAT)) {</div><div class='ctx'> 				/* Try to not flood the console with msgs */</div><div class='ctx'> 				static unsigned long last_msgtime, count;</div><div class='ctx'> 				++count;</div><div class='hunk'>@@ -1451,23 +1440,16 @@ irqreturn_t ide_intr (int irq, void *dev_id)</div><div class='ctx'> 	del_timer(&amp;hwgroup-&gt;timer);</div><div class='ctx'> 	spin_unlock(&amp;ide_lock);</div><div class='ctx'> </div><div class='del'>-	/* Some controllers might set DMA INTR no matter DMA or PIO;</div><div class='del'>-	 * bmdma status might need to be cleared even for</div><div class='del'>-	 * PIO interrupts to prevent spurious/lost irq.</div><div class='del'>-	 */</div><div class='del'>-	if (hwif-&gt;ide_dma_clear_irq &amp;&amp; !(drive-&gt;waiting_for_dma))</div><div class='del'>-		/* ide_dma_end() needs bmdma status for error checking.</div><div class='del'>-		 * So, skip clearing bmdma status here and leave it</div><div class='del'>-		 * to ide_dma_end() if this is dma interrupt.</div><div class='del'>-		 */</div><div class='del'>-		hwif-&gt;ide_dma_clear_irq(drive);</div><div class='add'>+	if (hwif-&gt;port_ops &amp;&amp; hwif-&gt;port_ops-&gt;clear_irq)</div><div class='add'>+		hwif-&gt;port_ops-&gt;clear_irq(drive);</div><div class='ctx'> </div><div class='del'>-	if (drive-&gt;unmask)</div><div class='add'>+	if (drive-&gt;dev_flags &amp; IDE_DFLAG_UNMASK)</div><div class='ctx'> 		local_irq_enable_in_hardirq();</div><div class='add'>+</div><div class='ctx'> 	/* service this interrupt, may set handler for next interrupt */</div><div class='ctx'> 	startstop = handler(drive);</div><div class='del'>-	spin_lock_irq(&amp;ide_lock);</div><div class='ctx'> </div><div class='add'>+	spin_lock_irq(&amp;ide_lock);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Note that handler() may have set things up for another</div><div class='ctx'> 	 * interrupt to occur soon, but it cannot happen until</div><div class='hunk'>@@ -1511,8 +1493,8 @@ void ide_do_drive_cmd(ide_drive_t *drive, struct request *rq)</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;ide_lock, flags);</div><div class='ctx'> 	hwgroup-&gt;rq = NULL;</div><div class='del'>-	__elv_add_request(drive-&gt;queue, rq, ELEVATOR_INSERT_FRONT, 1);</div><div class='del'>-	__generic_unplug_device(drive-&gt;queue);</div><div class='add'>+	__elv_add_request(drive-&gt;queue, rq, ELEVATOR_INSERT_FRONT, 0);</div><div class='add'>+	blk_start_queueing(drive-&gt;queue);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;ide_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/ide/ide-ioctls.c b/drivers/ide/ide-ioctls.c<br/>new file mode 100644<br/>index 000000000000..a90945f49792<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/ide-ioctls.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/ide-ioctls.c</a></div><div class='hunk'>@@ -0,0 +1,299 @@</div><div class='add'>+/*</div><div class='add'>+ * IDE ioctls handling.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/hdreg.h&gt;</div><div class='add'>+#include &lt;linux/ide.h&gt;</div><div class='add'>+</div><div class='add'>+static const struct ide_ioctl_devset ide_ioctl_settings[] = {</div><div class='add'>+{ HDIO_GET_32BIT,	 HDIO_SET_32BIT,	&amp;ide_devset_io_32bit  },</div><div class='add'>+{ HDIO_GET_KEEPSETTINGS, HDIO_SET_KEEPSETTINGS,	&amp;ide_devset_keepsettings },</div><div class='add'>+{ HDIO_GET_UNMASKINTR,	 HDIO_SET_UNMASKINTR,	&amp;ide_devset_unmaskirq },</div><div class='add'>+{ HDIO_GET_DMA,		 HDIO_SET_DMA,		&amp;ide_devset_using_dma },</div><div class='add'>+{ -1,			 HDIO_SET_PIO_MODE,	&amp;ide_devset_pio_mode  },</div><div class='add'>+{ 0 }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int ide_setting_ioctl(ide_drive_t *drive, struct block_device *bdev,</div><div class='add'>+		      unsigned int cmd, unsigned long arg,</div><div class='add'>+		      const struct ide_ioctl_devset *s)</div><div class='add'>+{</div><div class='add'>+	const struct ide_devset *ds;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int err = -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	for (; (ds = s-&gt;setting); s++) {</div><div class='add'>+		if (ds-&gt;get &amp;&amp; s-&gt;get_ioctl == cmd)</div><div class='add'>+			goto read_val;</div><div class='add'>+		else if (ds-&gt;set &amp;&amp; s-&gt;set_ioctl == cmd)</div><div class='add'>+			goto set_val;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+</div><div class='add'>+read_val:</div><div class='add'>+	mutex_lock(&amp;ide_setting_mtx);</div><div class='add'>+	spin_lock_irqsave(&amp;ide_lock, flags);</div><div class='add'>+	err = ds-&gt;get(drive);</div><div class='add'>+	spin_unlock_irqrestore(&amp;ide_lock, flags);</div><div class='add'>+	mutex_unlock(&amp;ide_setting_mtx);</div><div class='add'>+	return err &gt;= 0 ? put_user(err, (long __user *)arg) : err;</div><div class='add'>+</div><div class='add'>+set_val:</div><div class='add'>+	if (bdev != bdev-&gt;bd_contains)</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+	else {</div><div class='add'>+		if (!capable(CAP_SYS_ADMIN))</div><div class='add'>+			err = -EACCES;</div><div class='add'>+		else {</div><div class='add'>+			mutex_lock(&amp;ide_setting_mtx);</div><div class='add'>+			err = ide_devset_execute(drive, ds, arg);</div><div class='add'>+			mutex_unlock(&amp;ide_setting_mtx);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(ide_setting_ioctl);</div><div class='add'>+</div><div class='add'>+static int ide_get_identity_ioctl(ide_drive_t *drive, unsigned int cmd,</div><div class='add'>+				  unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	u16 *id = NULL;</div><div class='add'>+	int size = (cmd == HDIO_GET_IDENTITY) ? (ATA_ID_WORDS * 2) : 142;</div><div class='add'>+	int rc = 0;</div><div class='add'>+</div><div class='add'>+	if ((drive-&gt;dev_flags &amp; IDE_DFLAG_ID_READ) == 0) {</div><div class='add'>+		rc = -ENOMSG;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	id = kmalloc(size, GFP_KERNEL);</div><div class='add'>+	if (id == NULL) {</div><div class='add'>+		rc = -ENOMEM;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(id, drive-&gt;id, size);</div><div class='add'>+	ata_id_to_hd_driveid(id);</div><div class='add'>+</div><div class='add'>+	if (copy_to_user((void __user *)arg, id, size))</div><div class='add'>+		rc = -EFAULT;</div><div class='add'>+</div><div class='add'>+	kfree(id);</div><div class='add'>+out:</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ide_get_nice_ioctl(ide_drive_t *drive, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	return put_user((!!(drive-&gt;dev_flags &amp; IDE_DFLAG_DSC_OVERLAP)</div><div class='add'>+			 &lt;&lt; IDE_NICE_DSC_OVERLAP) |</div><div class='add'>+			(!!(drive-&gt;dev_flags &amp; IDE_DFLAG_NICE1)</div><div class='add'>+			 &lt;&lt; IDE_NICE_1), (long __user *)arg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ide_set_nice_ioctl(ide_drive_t *drive, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	if (arg != (arg &amp; ((1 &lt;&lt; IDE_NICE_DSC_OVERLAP) | (1 &lt;&lt; IDE_NICE_1))))</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	if (((arg &gt;&gt; IDE_NICE_DSC_OVERLAP) &amp; 1) &amp;&amp;</div><div class='add'>+	    (drive-&gt;media == ide_disk || drive-&gt;media == ide_floppy ||</div><div class='add'>+	     (drive-&gt;dev_flags &amp; IDE_DFLAG_SCSI)))</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	if ((arg &gt;&gt; IDE_NICE_DSC_OVERLAP) &amp; 1)</div><div class='add'>+		drive-&gt;dev_flags |= IDE_DFLAG_DSC_OVERLAP;</div><div class='add'>+	else</div><div class='add'>+		drive-&gt;dev_flags &amp;= ~IDE_DFLAG_DSC_OVERLAP;</div><div class='add'>+</div><div class='add'>+	if ((arg &gt;&gt; IDE_NICE_1) &amp; 1)</div><div class='add'>+		drive-&gt;dev_flags |= IDE_DFLAG_NICE1;</div><div class='add'>+	else</div><div class='add'>+		drive-&gt;dev_flags &amp;= ~IDE_DFLAG_NICE1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ide_cmd_ioctl(ide_drive_t *drive, unsigned cmd, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	u8 *buf = NULL;</div><div class='add'>+	int bufsize = 0, err = 0;</div><div class='add'>+	u8 args[4], xfer_rate = 0;</div><div class='add'>+	ide_task_t tfargs;</div><div class='add'>+	struct ide_taskfile *tf = &amp;tfargs.tf;</div><div class='add'>+	u16 *id = drive-&gt;id;</div><div class='add'>+</div><div class='add'>+	if (NULL == (void *) arg) {</div><div class='add'>+		struct request *rq;</div><div class='add'>+</div><div class='add'>+		rq = blk_get_request(drive-&gt;queue, READ, __GFP_WAIT);</div><div class='add'>+		rq-&gt;cmd_type = REQ_TYPE_ATA_TASKFILE;</div><div class='add'>+		err = blk_execute_rq(drive-&gt;queue, NULL, rq, 0);</div><div class='add'>+		blk_put_request(rq);</div><div class='add'>+</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (copy_from_user(args, (void __user *)arg, 4))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	memset(&amp;tfargs, 0, sizeof(ide_task_t));</div><div class='add'>+	tf-&gt;feature = args[2];</div><div class='add'>+	if (args[0] == ATA_CMD_SMART) {</div><div class='add'>+		tf-&gt;nsect = args[3];</div><div class='add'>+		tf-&gt;lbal  = args[1];</div><div class='add'>+		tf-&gt;lbam  = 0x4f;</div><div class='add'>+		tf-&gt;lbah  = 0xc2;</div><div class='add'>+		tfargs.tf_flags = IDE_TFLAG_OUT_TF | IDE_TFLAG_IN_NSECT;</div><div class='add'>+	} else {</div><div class='add'>+		tf-&gt;nsect = args[1];</div><div class='add'>+		tfargs.tf_flags = IDE_TFLAG_OUT_FEATURE |</div><div class='add'>+				  IDE_TFLAG_OUT_NSECT | IDE_TFLAG_IN_NSECT;</div><div class='add'>+	}</div><div class='add'>+	tf-&gt;command = args[0];</div><div class='add'>+	tfargs.data_phase = args[3] ? TASKFILE_IN : TASKFILE_NO_DATA;</div><div class='add'>+</div><div class='add'>+	if (args[3]) {</div><div class='add'>+		tfargs.tf_flags |= IDE_TFLAG_IO_16BIT;</div><div class='add'>+		bufsize = SECTOR_SIZE * args[3];</div><div class='add'>+		buf = kzalloc(bufsize, GFP_KERNEL);</div><div class='add'>+		if (buf == NULL)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tf-&gt;command == ATA_CMD_SET_FEATURES &amp;&amp;</div><div class='add'>+	    tf-&gt;feature == SETFEATURES_XFER &amp;&amp;</div><div class='add'>+	    tf-&gt;nsect &gt;= XFER_SW_DMA_0 &amp;&amp;</div><div class='add'>+	    (id[ATA_ID_UDMA_MODES] ||</div><div class='add'>+	     id[ATA_ID_MWDMA_MODES] ||</div><div class='add'>+	     id[ATA_ID_SWDMA_MODES])) {</div><div class='add'>+		xfer_rate = args[1];</div><div class='add'>+		if (tf-&gt;nsect &gt; XFER_UDMA_2 &amp;&amp; !eighty_ninty_three(drive)) {</div><div class='add'>+			printk(KERN_WARNING "%s: UDMA speeds &gt;UDMA33 cannot "</div><div class='add'>+					    "be set\n", drive-&gt;name);</div><div class='add'>+			goto abort;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = ide_raw_taskfile(drive, &amp;tfargs, buf, args[3]);</div><div class='add'>+</div><div class='add'>+	args[0] = tf-&gt;status;</div><div class='add'>+	args[1] = tf-&gt;error;</div><div class='add'>+	args[2] = tf-&gt;nsect;</div><div class='add'>+</div><div class='add'>+	if (!err &amp;&amp; xfer_rate) {</div><div class='add'>+		/* active-retuning-calls future */</div><div class='add'>+		ide_set_xfer_rate(drive, xfer_rate);</div><div class='add'>+		ide_driveid_update(drive);</div><div class='add'>+	}</div><div class='add'>+abort:</div><div class='add'>+	if (copy_to_user((void __user *)arg, &amp;args, 4))</div><div class='add'>+		err = -EFAULT;</div><div class='add'>+	if (buf) {</div><div class='add'>+		if (copy_to_user((void __user *)(arg + 4), buf, bufsize))</div><div class='add'>+			err = -EFAULT;</div><div class='add'>+		kfree(buf);</div><div class='add'>+	}</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ide_task_ioctl(ide_drive_t *drive, unsigned cmd, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	void __user *p = (void __user *)arg;</div><div class='add'>+	int err = 0;</div><div class='add'>+	u8 args[7];</div><div class='add'>+	ide_task_t task;</div><div class='add'>+</div><div class='add'>+	if (copy_from_user(args, p, 7))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	memset(&amp;task, 0, sizeof(task));</div><div class='add'>+	memcpy(&amp;task.tf_array[7], &amp;args[1], 6);</div><div class='add'>+	task.tf.command = args[0];</div><div class='add'>+	task.tf_flags = IDE_TFLAG_TF | IDE_TFLAG_DEVICE;</div><div class='add'>+</div><div class='add'>+	err = ide_no_data_taskfile(drive, &amp;task);</div><div class='add'>+</div><div class='add'>+	args[0] = task.tf.command;</div><div class='add'>+	memcpy(&amp;args[1], &amp;task.tf_array[7], 6);</div><div class='add'>+</div><div class='add'>+	if (copy_to_user(p, args, 7))</div><div class='add'>+		err = -EFAULT;</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int generic_drive_reset(ide_drive_t *drive)</div><div class='add'>+{</div><div class='add'>+	struct request *rq;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	rq = blk_get_request(drive-&gt;queue, READ, __GFP_WAIT);</div><div class='add'>+	rq-&gt;cmd_type = REQ_TYPE_SPECIAL;</div><div class='add'>+	rq-&gt;cmd_len = 1;</div><div class='add'>+	rq-&gt;cmd[0] = REQ_DRIVE_RESET;</div><div class='add'>+	rq-&gt;cmd_flags |= REQ_SOFTBARRIER;</div><div class='add'>+	if (blk_execute_rq(drive-&gt;queue, NULL, rq, 1))</div><div class='add'>+		ret = rq-&gt;errors;</div><div class='add'>+	blk_put_request(rq);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int generic_ide_ioctl(ide_drive_t *drive, struct file *file,</div><div class='add'>+		      struct block_device *bdev,</div><div class='add'>+		      unsigned int cmd, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = ide_setting_ioctl(drive, bdev, cmd, arg, ide_ioctl_settings);</div><div class='add'>+	if (err != -EOPNOTSUPP)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case HDIO_OBSOLETE_IDENTITY:</div><div class='add'>+	case HDIO_GET_IDENTITY:</div><div class='add'>+		if (bdev != bdev-&gt;bd_contains)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		return ide_get_identity_ioctl(drive, cmd, arg);</div><div class='add'>+	case HDIO_GET_NICE:</div><div class='add'>+		return ide_get_nice_ioctl(drive, arg);</div><div class='add'>+	case HDIO_SET_NICE:</div><div class='add'>+		if (!capable(CAP_SYS_ADMIN))</div><div class='add'>+			return -EACCES;</div><div class='add'>+		return ide_set_nice_ioctl(drive, arg);</div><div class='add'>+#ifdef CONFIG_IDE_TASK_IOCTL</div><div class='add'>+	case HDIO_DRIVE_TASKFILE:</div><div class='add'>+		if (!capable(CAP_SYS_ADMIN) || !capable(CAP_SYS_RAWIO))</div><div class='add'>+			return -EACCES;</div><div class='add'>+		if (drive-&gt;media == ide_disk)</div><div class='add'>+			return ide_taskfile_ioctl(drive, cmd, arg);</div><div class='add'>+		return -ENOMSG;</div><div class='add'>+#endif</div><div class='add'>+	case HDIO_DRIVE_CMD:</div><div class='add'>+		if (!capable(CAP_SYS_RAWIO))</div><div class='add'>+			return -EACCES;</div><div class='add'>+		return ide_cmd_ioctl(drive, cmd, arg);</div><div class='add'>+	case HDIO_DRIVE_TASK:</div><div class='add'>+		if (!capable(CAP_SYS_RAWIO))</div><div class='add'>+			return -EACCES;</div><div class='add'>+		return ide_task_ioctl(drive, cmd, arg);</div><div class='add'>+	case HDIO_DRIVE_RESET:</div><div class='add'>+		if (!capable(CAP_SYS_ADMIN))</div><div class='add'>+			return -EACCES;</div><div class='add'>+		return generic_drive_reset(drive);</div><div class='add'>+	case HDIO_GET_BUSSTATE:</div><div class='add'>+		if (!capable(CAP_SYS_ADMIN))</div><div class='add'>+			return -EACCES;</div><div class='add'>+		if (put_user(BUSSTATE_ON, (long __user *)arg))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		return 0;</div><div class='add'>+	case HDIO_SET_BUSSTATE:</div><div class='add'>+		if (!capable(CAP_SYS_ADMIN))</div><div class='add'>+			return -EACCES;</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(generic_ide_ioctl);</div><div class='head'>diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c<br/>index 2cbadffe922e..b762deb2dacb 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/ide-iops.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ide/ide-iops.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/ide-iops.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/ide-iops.c</a></div><div class='hunk'>@@ -18,7 +18,6 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/hdreg.h&gt;</div><div class='ctx'> #include &lt;linux/ide.h&gt;</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='ctx'> #include &lt;linux/nmi.h&gt;</div><div class='hunk'>@@ -182,7 +181,7 @@ void ide_tf_load(ide_drive_t *drive, ide_task_t *task)</div><div class='ctx'> 		tf_outb(tf-&gt;lbah, io_ports-&gt;lbah_addr);</div><div class='ctx'> </div><div class='ctx'> 	if (task-&gt;tf_flags &amp; IDE_TFLAG_OUT_DEVICE)</div><div class='del'>-		tf_outb((tf-&gt;device &amp; HIHI) | drive-&gt;select.all,</div><div class='add'>+		tf_outb((tf-&gt;device &amp; HIHI) | drive-&gt;select,</div><div class='ctx'> 			 io_ports-&gt;device_addr);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(ide_tf_load);</div><div class='hunk'>@@ -400,97 +399,14 @@ const struct ide_tp_ops default_tp_ops = {</div><div class='ctx'> 	.output_data		= ide_output_data,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-void ide_fix_driveid (struct hd_driveid *id)</div><div class='add'>+void ide_fix_driveid(u16 *id)</div><div class='ctx'> {</div><div class='ctx'> #ifndef __LITTLE_ENDIAN</div><div class='ctx'> # ifdef __BIG_ENDIAN</div><div class='ctx'> 	int i;</div><div class='del'>-	u16 *stringcast;</div><div class='del'>-</div><div class='del'>-	id-&gt;config         = __le16_to_cpu(id-&gt;config);</div><div class='del'>-	id-&gt;cyls           = __le16_to_cpu(id-&gt;cyls);</div><div class='del'>-	id-&gt;reserved2      = __le16_to_cpu(id-&gt;reserved2);</div><div class='del'>-	id-&gt;heads          = __le16_to_cpu(id-&gt;heads);</div><div class='del'>-	id-&gt;track_bytes    = __le16_to_cpu(id-&gt;track_bytes);</div><div class='del'>-	id-&gt;sector_bytes   = __le16_to_cpu(id-&gt;sector_bytes);</div><div class='del'>-	id-&gt;sectors        = __le16_to_cpu(id-&gt;sectors);</div><div class='del'>-	id-&gt;vendor0        = __le16_to_cpu(id-&gt;vendor0);</div><div class='del'>-	id-&gt;vendor1        = __le16_to_cpu(id-&gt;vendor1);</div><div class='del'>-	id-&gt;vendor2        = __le16_to_cpu(id-&gt;vendor2);</div><div class='del'>-	stringcast = (u16 *)&amp;id-&gt;serial_no[0];</div><div class='del'>-	for (i = 0; i &lt; (20/2); i++)</div><div class='del'>-		stringcast[i] = __le16_to_cpu(stringcast[i]);</div><div class='del'>-	id-&gt;buf_type       = __le16_to_cpu(id-&gt;buf_type);</div><div class='del'>-	id-&gt;buf_size       = __le16_to_cpu(id-&gt;buf_size);</div><div class='del'>-	id-&gt;ecc_bytes      = __le16_to_cpu(id-&gt;ecc_bytes);</div><div class='del'>-	stringcast = (u16 *)&amp;id-&gt;fw_rev[0];</div><div class='del'>-	for (i = 0; i &lt; (8/2); i++)</div><div class='del'>-		stringcast[i] = __le16_to_cpu(stringcast[i]);</div><div class='del'>-	stringcast = (u16 *)&amp;id-&gt;model[0];</div><div class='del'>-	for (i = 0; i &lt; (40/2); i++)</div><div class='del'>-		stringcast[i] = __le16_to_cpu(stringcast[i]);</div><div class='del'>-	id-&gt;dword_io       = __le16_to_cpu(id-&gt;dword_io);</div><div class='del'>-	id-&gt;reserved50     = __le16_to_cpu(id-&gt;reserved50);</div><div class='del'>-	id-&gt;field_valid    = __le16_to_cpu(id-&gt;field_valid);</div><div class='del'>-	id-&gt;cur_cyls       = __le16_to_cpu(id-&gt;cur_cyls);</div><div class='del'>-	id-&gt;cur_heads      = __le16_to_cpu(id-&gt;cur_heads);</div><div class='del'>-	id-&gt;cur_sectors    = __le16_to_cpu(id-&gt;cur_sectors);</div><div class='del'>-	id-&gt;cur_capacity0  = __le16_to_cpu(id-&gt;cur_capacity0);</div><div class='del'>-	id-&gt;cur_capacity1  = __le16_to_cpu(id-&gt;cur_capacity1);</div><div class='del'>-	id-&gt;lba_capacity   = __le32_to_cpu(id-&gt;lba_capacity);</div><div class='del'>-	id-&gt;dma_1word      = __le16_to_cpu(id-&gt;dma_1word);</div><div class='del'>-	id-&gt;dma_mword      = __le16_to_cpu(id-&gt;dma_mword);</div><div class='del'>-	id-&gt;eide_pio_modes = __le16_to_cpu(id-&gt;eide_pio_modes);</div><div class='del'>-	id-&gt;eide_dma_min   = __le16_to_cpu(id-&gt;eide_dma_min);</div><div class='del'>-	id-&gt;eide_dma_time  = __le16_to_cpu(id-&gt;eide_dma_time);</div><div class='del'>-	id-&gt;eide_pio       = __le16_to_cpu(id-&gt;eide_pio);</div><div class='del'>-	id-&gt;eide_pio_iordy = __le16_to_cpu(id-&gt;eide_pio_iordy);</div><div class='del'>-	for (i = 0; i &lt; 2; ++i)</div><div class='del'>-		id-&gt;words69_70[i] = __le16_to_cpu(id-&gt;words69_70[i]);</div><div class='del'>-	for (i = 0; i &lt; 4; ++i)</div><div class='del'>-		id-&gt;words71_74[i] = __le16_to_cpu(id-&gt;words71_74[i]);</div><div class='del'>-	id-&gt;queue_depth    = __le16_to_cpu(id-&gt;queue_depth);</div><div class='del'>-	for (i = 0; i &lt; 4; ++i)</div><div class='del'>-		id-&gt;words76_79[i] = __le16_to_cpu(id-&gt;words76_79[i]);</div><div class='del'>-	id-&gt;major_rev_num  = __le16_to_cpu(id-&gt;major_rev_num);</div><div class='del'>-	id-&gt;minor_rev_num  = __le16_to_cpu(id-&gt;minor_rev_num);</div><div class='del'>-	id-&gt;command_set_1  = __le16_to_cpu(id-&gt;command_set_1);</div><div class='del'>-	id-&gt;command_set_2  = __le16_to_cpu(id-&gt;command_set_2);</div><div class='del'>-	id-&gt;cfsse          = __le16_to_cpu(id-&gt;cfsse);</div><div class='del'>-	id-&gt;cfs_enable_1   = __le16_to_cpu(id-&gt;cfs_enable_1);</div><div class='del'>-	id-&gt;cfs_enable_2   = __le16_to_cpu(id-&gt;cfs_enable_2);</div><div class='del'>-	id-&gt;csf_default    = __le16_to_cpu(id-&gt;csf_default);</div><div class='del'>-	id-&gt;dma_ultra      = __le16_to_cpu(id-&gt;dma_ultra);</div><div class='del'>-	id-&gt;trseuc         = __le16_to_cpu(id-&gt;trseuc);</div><div class='del'>-	id-&gt;trsEuc         = __le16_to_cpu(id-&gt;trsEuc);</div><div class='del'>-	id-&gt;CurAPMvalues   = __le16_to_cpu(id-&gt;CurAPMvalues);</div><div class='del'>-	id-&gt;mprc           = __le16_to_cpu(id-&gt;mprc);</div><div class='del'>-	id-&gt;hw_config      = __le16_to_cpu(id-&gt;hw_config);</div><div class='del'>-	id-&gt;acoustic       = __le16_to_cpu(id-&gt;acoustic);</div><div class='del'>-	id-&gt;msrqs          = __le16_to_cpu(id-&gt;msrqs);</div><div class='del'>-	id-&gt;sxfert         = __le16_to_cpu(id-&gt;sxfert);</div><div class='del'>-	id-&gt;sal            = __le16_to_cpu(id-&gt;sal);</div><div class='del'>-	id-&gt;spg            = __le32_to_cpu(id-&gt;spg);</div><div class='del'>-	id-&gt;lba_capacity_2 = __le64_to_cpu(id-&gt;lba_capacity_2);</div><div class='del'>-	for (i = 0; i &lt; 22; i++)</div><div class='del'>-		id-&gt;words104_125[i]   = __le16_to_cpu(id-&gt;words104_125[i]);</div><div class='del'>-	id-&gt;last_lun       = __le16_to_cpu(id-&gt;last_lun);</div><div class='del'>-	id-&gt;word127        = __le16_to_cpu(id-&gt;word127);</div><div class='del'>-	id-&gt;dlf            = __le16_to_cpu(id-&gt;dlf);</div><div class='del'>-	id-&gt;csfo           = __le16_to_cpu(id-&gt;csfo);</div><div class='del'>-	for (i = 0; i &lt; 26; i++)</div><div class='del'>-		id-&gt;words130_155[i] = __le16_to_cpu(id-&gt;words130_155[i]);</div><div class='del'>-	id-&gt;word156        = __le16_to_cpu(id-&gt;word156);</div><div class='del'>-	for (i = 0; i &lt; 3; i++)</div><div class='del'>-		id-&gt;words157_159[i] = __le16_to_cpu(id-&gt;words157_159[i]);</div><div class='del'>-	id-&gt;cfa_power      = __le16_to_cpu(id-&gt;cfa_power);</div><div class='del'>-	for (i = 0; i &lt; 15; i++)</div><div class='del'>-		id-&gt;words161_175[i] = __le16_to_cpu(id-&gt;words161_175[i]);</div><div class='del'>-	for (i = 0; i &lt; 30; i++)</div><div class='del'>-		id-&gt;words176_205[i] = __le16_to_cpu(id-&gt;words176_205[i]);</div><div class='del'>-	for (i = 0; i &lt; 49; i++)</div><div class='del'>-		id-&gt;words206_254[i] = __le16_to_cpu(id-&gt;words206_254[i]);</div><div class='del'>-	id-&gt;integrity_word  = __le16_to_cpu(id-&gt;integrity_word);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 256; i++)</div><div class='add'>+		id[i] = __le16_to_cpu(id[i]);</div><div class='ctx'> # else</div><div class='ctx'> #  error "Please fix &lt;asm/byteorder.h&gt;"</div><div class='ctx'> # endif</div><div class='hunk'>@@ -501,19 +417,21 @@ void ide_fix_driveid (struct hd_driveid *id)</div><div class='ctx'>  * ide_fixstring() cleans up and (optionally) byte-swaps a text string,</div><div class='ctx'>  * removing leading/trailing blanks and compressing internal blanks.</div><div class='ctx'>  * It is primarily used to tidy up the model name/number fields as</div><div class='del'>- * returned by the WIN_[P]IDENTIFY commands.</div><div class='add'>+ * returned by the ATA_CMD_ID_ATA[PI] commands.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> void ide_fixstring (u8 *s, const int bytecount, const int byteswap)</div><div class='ctx'> {</div><div class='del'>-	u8 *p = s, *end = &amp;s[bytecount &amp; ~1]; /* bytecount must be even */</div><div class='add'>+	u8 *p, *end = &amp;s[bytecount &amp; ~1]; /* bytecount must be even */</div><div class='ctx'> </div><div class='ctx'> 	if (byteswap) {</div><div class='ctx'> 		/* convert from big-endian to host byte order */</div><div class='del'>-		for (p = end ; p != s;)</div><div class='del'>-			be16_to_cpus((u16 *)(p -= 2));</div><div class='add'>+		for (p = s ; p != end ; p += 2)</div><div class='add'>+			be16_to_cpus((u16 *) p);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	/* strip leading blanks */</div><div class='add'>+	p = s;</div><div class='ctx'> 	while (s != end &amp;&amp; *s == ' ')</div><div class='ctx'> 		++s;</div><div class='ctx'> 	/* compress internal blanks and strip trailing blanks */</div><div class='hunk'>@@ -556,7 +474,7 @@ int drive_is_ready (ide_drive_t *drive)</div><div class='ctx'> 		/* Note: this may clear a pending IRQ!! */</div><div class='ctx'> 		stat = hwif-&gt;tp_ops-&gt;read_status(hwif);</div><div class='ctx'> </div><div class='del'>-	if (stat &amp; BUSY_STAT)</div><div class='add'>+	if (stat &amp; ATA_BUSY)</div><div class='ctx'> 		/* drive busy:  definitely not interrupting */</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -588,10 +506,10 @@ static int __ide_wait_stat(ide_drive_t *drive, u8 good, u8 bad, unsigned long ti</div><div class='ctx'> 	udelay(1);	/* spec allows drive 400ns to assert "BUSY" */</div><div class='ctx'> 	stat = tp_ops-&gt;read_status(hwif);</div><div class='ctx'> </div><div class='del'>-	if (stat &amp; BUSY_STAT) {</div><div class='add'>+	if (stat &amp; ATA_BUSY) {</div><div class='ctx'> 		local_irq_set(flags);</div><div class='ctx'> 		timeout += jiffies;</div><div class='del'>-		while ((stat = tp_ops-&gt;read_status(hwif)) &amp; BUSY_STAT) {</div><div class='add'>+		while ((stat = tp_ops-&gt;read_status(hwif)) &amp; ATA_BUSY) {</div><div class='ctx'> 			if (time_after(jiffies, timeout)) {</div><div class='ctx'> 				/*</div><div class='ctx'> 				 * One last read after the timeout in case</div><div class='hunk'>@@ -599,7 +517,7 @@ static int __ide_wait_stat(ide_drive_t *drive, u8 good, u8 bad, unsigned long ti</div><div class='ctx'> 				 * progress during the timeout..</div><div class='ctx'> 				 */</div><div class='ctx'> 				stat = tp_ops-&gt;read_status(hwif);</div><div class='del'>-				if (!(stat &amp; BUSY_STAT))</div><div class='add'>+				if ((stat &amp; ATA_BUSY) == 0)</div><div class='ctx'> 					break;</div><div class='ctx'> </div><div class='ctx'> 				local_irq_restore(flags);</div><div class='hunk'>@@ -660,18 +578,18 @@ EXPORT_SYMBOL(ide_wait_stat);</div><div class='ctx'> /**</div><div class='ctx'>  *	ide_in_drive_list	-	look for drive in black/white list</div><div class='ctx'>  *	@id: drive identifier</div><div class='del'>- *	@drive_table: list to inspect</div><div class='add'>+ *	@table: list to inspect</div><div class='ctx'>  *</div><div class='ctx'>  *	Look for a drive in the blacklist and the whitelist tables</div><div class='ctx'>  *	Returns 1 if the drive is found in the table.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-int ide_in_drive_list(struct hd_driveid *id, const struct drive_list_entry *drive_table)</div><div class='add'>+int ide_in_drive_list(u16 *id, const struct drive_list_entry *table)</div><div class='ctx'> {</div><div class='del'>-	for ( ; drive_table-&gt;id_model; drive_table++)</div><div class='del'>-		if ((!strcmp(drive_table-&gt;id_model, id-&gt;model)) &amp;&amp;</div><div class='del'>-		    (!drive_table-&gt;id_firmware ||</div><div class='del'>-		     strstr(id-&gt;fw_rev, drive_table-&gt;id_firmware)))</div><div class='add'>+	for ( ; table-&gt;id_model; table++)</div><div class='add'>+		if ((!strcmp(table-&gt;id_model, (char *)&amp;id[ATA_ID_PROD])) &amp;&amp;</div><div class='add'>+		    (!table-&gt;id_firmware ||</div><div class='add'>+		     strstr((char *)&amp;id[ATA_ID_FW_REV], table-&gt;id_firmware)))</div><div class='ctx'> 			return 1;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -702,7 +620,7 @@ static const struct drive_list_entry ivb_list[] = {</div><div class='ctx'> u8 eighty_ninty_three (ide_drive_t *drive)</div><div class='ctx'> {</div><div class='ctx'> 	ide_hwif_t *hwif = drive-&gt;hwif;</div><div class='del'>-	struct hd_driveid *id = drive-&gt;id;</div><div class='add'>+	u16 *id = drive-&gt;id;</div><div class='ctx'> 	int ivb = ide_in_drive_list(id, ivb_list);</div><div class='ctx'> </div><div class='ctx'> 	if (hwif-&gt;cbl == ATA_CBL_PATA40_SHORT)</div><div class='hunk'>@@ -712,7 +630,7 @@ u8 eighty_ninty_three (ide_drive_t *drive)</div><div class='ctx'> 		printk(KERN_DEBUG "%s: skipping word 93 validity check\n",</div><div class='ctx'> 				  drive-&gt;name);</div><div class='ctx'> </div><div class='del'>-	if (ide_dev_is_sata(id) &amp;&amp; !ivb)</div><div class='add'>+	if (ata_id_is_sata(id) &amp;&amp; !ivb)</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='ctx'> 	if (hwif-&gt;cbl != ATA_CBL_PATA80 &amp;&amp; !ivb)</div><div class='hunk'>@@ -724,11 +642,12 @@ u8 eighty_ninty_three (ide_drive_t *drive)</div><div class='ctx'> 	 * - force bit13 (80c cable present) check also for !ivb devices</div><div class='ctx'> 	 *   (unless the slave device is pre-ATA3)</div><div class='ctx'> 	 */</div><div class='del'>-	if ((id-&gt;hw_config &amp; 0x4000) || (ivb &amp;&amp; (id-&gt;hw_config &amp; 0x2000)))</div><div class='add'>+	if ((id[ATA_ID_HW_CONFIG] &amp; 0x4000) ||</div><div class='add'>+	    (ivb &amp;&amp; (id[ATA_ID_HW_CONFIG] &amp; 0x2000)))</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='ctx'> no_80w:</div><div class='del'>-	if (drive-&gt;udma33_warned == 1)</div><div class='add'>+	if (drive-&gt;dev_flags &amp; IDE_DFLAG_UDMA33_WARNED)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_WARNING "%s: %s side 80-wire cable detection failed, "</div><div class='hunk'>@@ -736,7 +655,7 @@ no_80w:</div><div class='ctx'> 			    drive-&gt;name,</div><div class='ctx'> 			    hwif-&gt;cbl == ATA_CBL_PATA80 ? "drive" : "host");</div><div class='ctx'> </div><div class='del'>-	drive-&gt;udma33_warned = 1;</div><div class='add'>+	drive-&gt;dev_flags |= IDE_DFLAG_UDMA33_WARNED;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -745,8 +664,8 @@ int ide_driveid_update(ide_drive_t *drive)</div><div class='ctx'> {</div><div class='ctx'> 	ide_hwif_t *hwif = drive-&gt;hwif;</div><div class='ctx'> 	const struct ide_tp_ops *tp_ops = hwif-&gt;tp_ops;</div><div class='del'>-	struct hd_driveid *id;</div><div class='del'>-	unsigned long timeout, flags;</div><div class='add'>+	u16 *id;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> 	u8 stat;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -757,29 +676,24 @@ int ide_driveid_update(ide_drive_t *drive)</div><div class='ctx'> 	SELECT_MASK(drive, 1);</div><div class='ctx'> 	tp_ops-&gt;set_irq(hwif, 0);</div><div class='ctx'> 	msleep(50);</div><div class='del'>-	tp_ops-&gt;exec_command(hwif, WIN_IDENTIFY);</div><div class='del'>-	timeout = jiffies + WAIT_WORSTCASE;</div><div class='del'>-	do {</div><div class='del'>-		if (time_after(jiffies, timeout)) {</div><div class='del'>-			SELECT_MASK(drive, 0);</div><div class='del'>-			return 0;	/* drive timed-out */</div><div class='del'>-		}</div><div class='add'>+	tp_ops-&gt;exec_command(hwif, ATA_CMD_ID_ATA);</div><div class='ctx'> </div><div class='del'>-		msleep(50);	/* give drive a breather */</div><div class='del'>-		stat = tp_ops-&gt;read_altstatus(hwif);</div><div class='del'>-	} while (stat &amp; BUSY_STAT);</div><div class='add'>+	if (ide_busy_sleep(hwif, WAIT_WORSTCASE, 1)) {</div><div class='add'>+		SELECT_MASK(drive, 0);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	msleep(50);	/* wait for IRQ and DRQ_STAT */</div><div class='add'>+	msleep(50);	/* wait for IRQ and ATA_DRQ */</div><div class='ctx'> 	stat = tp_ops-&gt;read_status(hwif);</div><div class='ctx'> </div><div class='del'>-	if (!OK_STAT(stat, DRQ_STAT, BAD_R_STAT)) {</div><div class='add'>+	if (!OK_STAT(stat, ATA_DRQ, BAD_R_STAT)) {</div><div class='ctx'> 		SELECT_MASK(drive, 0);</div><div class='ctx'> 		printk("%s: CHECK for good STATUS\n", drive-&gt;name);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	local_irq_save(flags);</div><div class='ctx'> 	SELECT_MASK(drive, 0);</div><div class='del'>-	id = kmalloc(SECTOR_WORDS*4, GFP_ATOMIC);</div><div class='add'>+	id = kmalloc(SECTOR_SIZE, GFP_ATOMIC);</div><div class='ctx'> 	if (!id) {</div><div class='ctx'> 		local_irq_restore(flags);</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -789,16 +703,16 @@ int ide_driveid_update(ide_drive_t *drive)</div><div class='ctx'> 	local_irq_enable();</div><div class='ctx'> 	local_irq_restore(flags);</div><div class='ctx'> 	ide_fix_driveid(id);</div><div class='del'>-	if (id) {</div><div class='del'>-		drive-&gt;id-&gt;dma_ultra = id-&gt;dma_ultra;</div><div class='del'>-		drive-&gt;id-&gt;dma_mword = id-&gt;dma_mword;</div><div class='del'>-		drive-&gt;id-&gt;dma_1word = id-&gt;dma_1word;</div><div class='del'>-		/* anything more ? */</div><div class='del'>-		kfree(id);</div><div class='del'>-</div><div class='del'>-		if (drive-&gt;using_dma &amp;&amp; ide_id_dma_bug(drive))</div><div class='del'>-			ide_dma_off(drive);</div><div class='del'>-	}</div><div class='add'>+</div><div class='add'>+	drive-&gt;id[ATA_ID_UDMA_MODES]  = id[ATA_ID_UDMA_MODES];</div><div class='add'>+	drive-&gt;id[ATA_ID_MWDMA_MODES] = id[ATA_ID_MWDMA_MODES];</div><div class='add'>+	drive-&gt;id[ATA_ID_SWDMA_MODES] = id[ATA_ID_SWDMA_MODES];</div><div class='add'>+	/* anything more ? */</div><div class='add'>+</div><div class='add'>+	kfree(id);</div><div class='add'>+</div><div class='add'>+	if ((drive-&gt;dev_flags &amp; IDE_DFLAG_USING_DMA) &amp;&amp; ide_id_dma_bug(drive))</div><div class='add'>+		ide_dma_off(drive);</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='hunk'>@@ -807,6 +721,7 @@ int ide_config_drive_speed(ide_drive_t *drive, u8 speed)</div><div class='ctx'> {</div><div class='ctx'> 	ide_hwif_t *hwif = drive-&gt;hwif;</div><div class='ctx'> 	const struct ide_tp_ops *tp_ops = hwif-&gt;tp_ops;</div><div class='add'>+	u16 *id = drive-&gt;id, i;</div><div class='ctx'> 	int error = 0;</div><div class='ctx'> 	u8 stat;</div><div class='ctx'> 	ide_task_t task;</div><div class='hunk'>@@ -817,7 +732,7 @@ int ide_config_drive_speed(ide_drive_t *drive, u8 speed)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	/* Skip setting PIO flow-control modes on pre-EIDE drives */</div><div class='del'>-	if ((speed &amp; 0xf8) == XFER_PIO_0 &amp;&amp; !(drive-&gt;id-&gt;capability &amp; 0x08))</div><div class='add'>+	if ((speed &amp; 0xf8) == XFER_PIO_0 &amp;&amp; ata_id_has_iordy(drive-&gt;id) == 0)</div><div class='ctx'> 		goto skip;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -851,13 +766,13 @@ int ide_config_drive_speed(ide_drive_t *drive, u8 speed)</div><div class='ctx'> </div><div class='ctx'> 	tp_ops-&gt;tf_load(drive, &amp;task);</div><div class='ctx'> </div><div class='del'>-	tp_ops-&gt;exec_command(hwif, WIN_SETFEATURES);</div><div class='add'>+	tp_ops-&gt;exec_command(hwif, ATA_CMD_SET_FEATURES);</div><div class='ctx'> </div><div class='ctx'> 	if (drive-&gt;quirk_list == 2)</div><div class='ctx'> 		tp_ops-&gt;set_irq(hwif, 1);</div><div class='ctx'> </div><div class='ctx'> 	error = __ide_wait_stat(drive, drive-&gt;ready_stat,</div><div class='del'>-				BUSY_STAT|DRQ_STAT|ERR_STAT,</div><div class='add'>+				ATA_BUSY | ATA_DRQ | ATA_ERR,</div><div class='ctx'> 				WAIT_CMD, &amp;stat);</div><div class='ctx'> </div><div class='ctx'> 	SELECT_MASK(drive, 0);</div><div class='hunk'>@@ -869,35 +784,29 @@ int ide_config_drive_speed(ide_drive_t *drive, u8 speed)</div><div class='ctx'> 		return error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	drive-&gt;id-&gt;dma_ultra &amp;= ~0xFF00;</div><div class='del'>-	drive-&gt;id-&gt;dma_mword &amp;= ~0x0F00;</div><div class='del'>-	drive-&gt;id-&gt;dma_1word &amp;= ~0x0F00;</div><div class='add'>+	id[ATA_ID_UDMA_MODES]  &amp;= ~0xFF00;</div><div class='add'>+	id[ATA_ID_MWDMA_MODES] &amp;= ~0x0F00;</div><div class='add'>+	id[ATA_ID_SWDMA_MODES] &amp;= ~0x0F00;</div><div class='ctx'> </div><div class='ctx'>  skip:</div><div class='ctx'> #ifdef CONFIG_BLK_DEV_IDEDMA</div><div class='del'>-	if (speed &gt;= XFER_SW_DMA_0 &amp;&amp; drive-&gt;using_dma)</div><div class='add'>+	if (speed &gt;= XFER_SW_DMA_0 &amp;&amp; (drive-&gt;dev_flags &amp; IDE_DFLAG_USING_DMA))</div><div class='ctx'> 		hwif-&gt;dma_ops-&gt;dma_host_set(drive, 1);</div><div class='ctx'> 	else if (hwif-&gt;dma_ops)	/* check if host supports DMA */</div><div class='ctx'> 		ide_dma_off_quietly(drive);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	switch(speed) {</div><div class='del'>-		case XFER_UDMA_7:   drive-&gt;id-&gt;dma_ultra |= 0x8080; break;</div><div class='del'>-		case XFER_UDMA_6:   drive-&gt;id-&gt;dma_ultra |= 0x4040; break;</div><div class='del'>-		case XFER_UDMA_5:   drive-&gt;id-&gt;dma_ultra |= 0x2020; break;</div><div class='del'>-		case XFER_UDMA_4:   drive-&gt;id-&gt;dma_ultra |= 0x1010; break;</div><div class='del'>-		case XFER_UDMA_3:   drive-&gt;id-&gt;dma_ultra |= 0x0808; break;</div><div class='del'>-		case XFER_UDMA_2:   drive-&gt;id-&gt;dma_ultra |= 0x0404; break;</div><div class='del'>-		case XFER_UDMA_1:   drive-&gt;id-&gt;dma_ultra |= 0x0202; break;</div><div class='del'>-		case XFER_UDMA_0:   drive-&gt;id-&gt;dma_ultra |= 0x0101; break;</div><div class='del'>-		case XFER_MW_DMA_2: drive-&gt;id-&gt;dma_mword |= 0x0404; break;</div><div class='del'>-		case XFER_MW_DMA_1: drive-&gt;id-&gt;dma_mword |= 0x0202; break;</div><div class='del'>-		case XFER_MW_DMA_0: drive-&gt;id-&gt;dma_mword |= 0x0101; break;</div><div class='del'>-		case XFER_SW_DMA_2: drive-&gt;id-&gt;dma_1word |= 0x0404; break;</div><div class='del'>-		case XFER_SW_DMA_1: drive-&gt;id-&gt;dma_1word |= 0x0202; break;</div><div class='del'>-		case XFER_SW_DMA_0: drive-&gt;id-&gt;dma_1word |= 0x0101; break;</div><div class='del'>-		default: break;</div><div class='add'>+	if (speed &gt;= XFER_UDMA_0) {</div><div class='add'>+		i = 1 &lt;&lt; (speed - XFER_UDMA_0);</div><div class='add'>+		id[ATA_ID_UDMA_MODES] |= (i &lt;&lt; 8 | i);</div><div class='add'>+	} else if (speed &gt;= XFER_MW_DMA_0) {</div><div class='add'>+		i = 1 &lt;&lt; (speed - XFER_MW_DMA_0);</div><div class='add'>+		id[ATA_ID_MWDMA_MODES] |= (i &lt;&lt; 8 | i);</div><div class='add'>+	} else if (speed &gt;= XFER_SW_DMA_0) {</div><div class='add'>+		i = 1 &lt;&lt; (speed - XFER_SW_DMA_0);</div><div class='add'>+		id[ATA_ID_SWDMA_MODES] |= (i &lt;&lt; 8 | i);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	if (!drive-&gt;init_speed)</div><div class='ctx'> 		drive-&gt;init_speed = speed;</div><div class='ctx'> 	drive-&gt;current_speed = speed;</div><div class='hunk'>@@ -977,7 +886,7 @@ void ide_execute_pkt_cmd(ide_drive_t *drive)</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;ide_lock, flags);</div><div class='del'>-	hwif-&gt;tp_ops-&gt;exec_command(hwif, WIN_PACKETCMD);</div><div class='add'>+	hwif-&gt;tp_ops-&gt;exec_command(hwif, ATA_CMD_PACKET);</div><div class='ctx'> 	ndelay(400);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;ide_lock, flags);</div><div class='ctx'> }</div><div class='hunk'>@@ -1010,7 +919,7 @@ static ide_startstop_t atapi_reset_pollfunc (ide_drive_t *drive)</div><div class='ctx'> 	udelay (10);</div><div class='ctx'> 	stat = hwif-&gt;tp_ops-&gt;read_status(hwif);</div><div class='ctx'> </div><div class='del'>-	if (OK_STAT(stat, 0, BUSY_STAT))</div><div class='add'>+	if (OK_STAT(stat, 0, ATA_BUSY))</div><div class='ctx'> 		printk("%s: ATAPI reset complete\n", drive-&gt;name);</div><div class='ctx'> 	else {</div><div class='ctx'> 		if (time_before(jiffies, hwgroup-&gt;poll_timeout)) {</div><div class='hunk'>@@ -1031,6 +940,25 @@ static ide_startstop_t atapi_reset_pollfunc (ide_drive_t *drive)</div><div class='ctx'> 	return ide_stopped;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void ide_reset_report_error(ide_hwif_t *hwif, u8 err)</div><div class='add'>+{</div><div class='add'>+	static const char *err_master_vals[] =</div><div class='add'>+		{ NULL, "passed", "formatter device error",</div><div class='add'>+		  "sector buffer error", "ECC circuitry error",</div><div class='add'>+		  "controlling MPU error" };</div><div class='add'>+</div><div class='add'>+	u8 err_master = err &amp; 0x7f;</div><div class='add'>+</div><div class='add'>+	printk(KERN_ERR "%s: reset: master: ", hwif-&gt;name);</div><div class='add'>+	if (err_master &amp;&amp; err_master &lt; 6)</div><div class='add'>+		printk(KERN_CONT "%s", err_master_vals[err_master]);</div><div class='add'>+	else</div><div class='add'>+		printk(KERN_CONT "error (0x%02x?)", err);</div><div class='add'>+	if (err &amp; 0x80)</div><div class='add'>+		printk(KERN_CONT "; slave: failed");</div><div class='add'>+	printk(KERN_CONT "\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * reset_pollfunc() gets invoked to poll the interface for completion every 50ms</div><div class='ctx'>  * during an ide reset operation. If the drives have not yet responded,</div><div class='hunk'>@@ -1056,7 +984,7 @@ static ide_startstop_t reset_pollfunc (ide_drive_t *drive)</div><div class='ctx'> </div><div class='ctx'> 	tmp = hwif-&gt;tp_ops-&gt;read_status(hwif);</div><div class='ctx'> </div><div class='del'>-	if (!OK_STAT(tmp, 0, BUSY_STAT)) {</div><div class='add'>+	if (!OK_STAT(tmp, 0, ATA_BUSY)) {</div><div class='ctx'> 		if (time_before(jiffies, hwgroup-&gt;poll_timeout)) {</div><div class='ctx'> 			ide_set_handler(drive, &amp;reset_pollfunc, HZ/20, NULL);</div><div class='ctx'> 			/* continue polling */</div><div class='hunk'>@@ -1066,31 +994,14 @@ static ide_startstop_t reset_pollfunc (ide_drive_t *drive)</div><div class='ctx'> 		drive-&gt;failures++;</div><div class='ctx'> 		err = -EIO;</div><div class='ctx'> 	} else  {</div><div class='del'>-		printk("%s: reset: ", hwif-&gt;name);</div><div class='ctx'> 		tmp = ide_read_error(drive);</div><div class='ctx'> </div><div class='ctx'> 		if (tmp == 1) {</div><div class='del'>-			printk("success\n");</div><div class='add'>+			printk(KERN_INFO "%s: reset: success\n", hwif-&gt;name);</div><div class='ctx'> 			drive-&gt;failures = 0;</div><div class='ctx'> 		} else {</div><div class='add'>+			ide_reset_report_error(hwif, tmp);</div><div class='ctx'> 			drive-&gt;failures++;</div><div class='del'>-			printk("master: ");</div><div class='del'>-			switch (tmp &amp; 0x7f) {</div><div class='del'>-				case 1: printk("passed");</div><div class='del'>-					break;</div><div class='del'>-				case 2: printk("formatter device error");</div><div class='del'>-					break;</div><div class='del'>-				case 3: printk("sector buffer error");</div><div class='del'>-					break;</div><div class='del'>-				case 4: printk("ECC circuitry error");</div><div class='del'>-					break;</div><div class='del'>-				case 5: printk("controlling MPU error");</div><div class='del'>-					break;</div><div class='del'>-				default:printk("error (0x%02x?)", tmp);</div><div class='del'>-			}</div><div class='del'>-			if (tmp &amp; 0x80)</div><div class='del'>-				printk("; slave: failed");</div><div class='del'>-			printk("\n");</div><div class='ctx'> 			err = -EIO;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1102,14 +1013,19 @@ out:</div><div class='ctx'> </div><div class='ctx'> static void ide_disk_pre_reset(ide_drive_t *drive)</div><div class='ctx'> {</div><div class='del'>-	int legacy = (drive-&gt;id-&gt;cfs_enable_2 &amp; 0x0400) ? 0 : 1;</div><div class='add'>+	int legacy = (drive-&gt;id[ATA_ID_CFS_ENABLE_2] &amp; 0x0400) ? 0 : 1;</div><div class='ctx'> </div><div class='ctx'> 	drive-&gt;special.all = 0;</div><div class='ctx'> 	drive-&gt;special.b.set_geometry = legacy;</div><div class='ctx'> 	drive-&gt;special.b.recalibrate  = legacy;</div><div class='add'>+</div><div class='ctx'> 	drive-&gt;mult_count = 0;</div><div class='del'>-	if (!drive-&gt;keep_settings &amp;&amp; !drive-&gt;using_dma)</div><div class='add'>+	drive-&gt;dev_flags &amp;= ~IDE_DFLAG_PARKED;</div><div class='add'>+</div><div class='add'>+	if ((drive-&gt;dev_flags &amp; IDE_DFLAG_KEEP_SETTINGS) == 0 &amp;&amp;</div><div class='add'>+	    (drive-&gt;dev_flags &amp; IDE_DFLAG_USING_DMA) == 0)</div><div class='ctx'> 		drive-&gt;mult_req = 0;</div><div class='add'>+</div><div class='ctx'> 	if (drive-&gt;mult_req != drive-&gt;mult_count)</div><div class='ctx'> 		drive-&gt;special.b.set_multmode = 1;</div><div class='ctx'> }</div><div class='hunk'>@@ -1121,18 +1037,18 @@ static void pre_reset(ide_drive_t *drive)</div><div class='ctx'> 	if (drive-&gt;media == ide_disk)</div><div class='ctx'> 		ide_disk_pre_reset(drive);</div><div class='ctx'> 	else</div><div class='del'>-		drive-&gt;post_reset = 1;</div><div class='add'>+		drive-&gt;dev_flags |= IDE_DFLAG_POST_RESET;</div><div class='ctx'> </div><div class='del'>-	if (drive-&gt;using_dma) {</div><div class='add'>+	if (drive-&gt;dev_flags &amp; IDE_DFLAG_USING_DMA) {</div><div class='ctx'> 		if (drive-&gt;crc_count)</div><div class='ctx'> 			ide_check_dma_crc(drive);</div><div class='ctx'> 		else</div><div class='ctx'> 			ide_dma_off(drive);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!drive-&gt;keep_settings) {</div><div class='del'>-		if (!drive-&gt;using_dma) {</div><div class='del'>-			drive-&gt;unmask = 0;</div><div class='add'>+	if ((drive-&gt;dev_flags &amp; IDE_DFLAG_KEEP_SETTINGS) == 0) {</div><div class='add'>+		if ((drive-&gt;dev_flags &amp; IDE_DFLAG_USING_DMA) == 0) {</div><div class='add'>+			drive-&gt;dev_flags &amp;= ~IDE_DFLAG_UNMASK;</div><div class='ctx'> 			drive-&gt;io_32bit = 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -1164,12 +1080,13 @@ static void pre_reset(ide_drive_t *drive)</div><div class='ctx'> static ide_startstop_t do_reset1 (ide_drive_t *drive, int do_not_try_atapi)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int unit;</div><div class='del'>-	unsigned long flags;</div><div class='add'>+	unsigned long flags, timeout;</div><div class='ctx'> 	ide_hwif_t *hwif;</div><div class='ctx'> 	ide_hwgroup_t *hwgroup;</div><div class='ctx'> 	struct ide_io_ports *io_ports;</div><div class='ctx'> 	const struct ide_tp_ops *tp_ops;</div><div class='ctx'> 	const struct ide_port_ops *port_ops;</div><div class='add'>+	DEFINE_WAIT(wait);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;ide_lock, flags);</div><div class='ctx'> 	hwif = HWIF(drive);</div><div class='hunk'>@@ -1187,7 +1104,7 @@ static ide_startstop_t do_reset1 (ide_drive_t *drive, int do_not_try_atapi)</div><div class='ctx'> 		pre_reset(drive);</div><div class='ctx'> 		SELECT_DRIVE(drive);</div><div class='ctx'> 		udelay (20);</div><div class='del'>-		tp_ops-&gt;exec_command(hwif, WIN_SRST);</div><div class='add'>+		tp_ops-&gt;exec_command(hwif, ATA_CMD_DEV_RESET);</div><div class='ctx'> 		ndelay(400);</div><div class='ctx'> 		hwgroup-&gt;poll_timeout = jiffies + WAIT_WORSTCASE;</div><div class='ctx'> 		hwgroup-&gt;polling = 1;</div><div class='hunk'>@@ -1196,6 +1113,31 @@ static ide_startstop_t do_reset1 (ide_drive_t *drive, int do_not_try_atapi)</div><div class='ctx'> 		return ide_started;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* We must not disturb devices in the IDE_DFLAG_PARKED state. */</div><div class='add'>+	do {</div><div class='add'>+		unsigned long now;</div><div class='add'>+</div><div class='add'>+		prepare_to_wait(&amp;ide_park_wq, &amp;wait, TASK_UNINTERRUPTIBLE);</div><div class='add'>+		timeout = jiffies;</div><div class='add'>+		for (unit = 0; unit &lt; MAX_DRIVES; unit++) {</div><div class='add'>+			ide_drive_t *tdrive = &amp;hwif-&gt;drives[unit];</div><div class='add'>+</div><div class='add'>+			if (tdrive-&gt;dev_flags &amp; IDE_DFLAG_PRESENT &amp;&amp;</div><div class='add'>+			    tdrive-&gt;dev_flags &amp; IDE_DFLAG_PARKED &amp;&amp;</div><div class='add'>+			    time_after(tdrive-&gt;sleep, timeout))</div><div class='add'>+				timeout = tdrive-&gt;sleep;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		now = jiffies;</div><div class='add'>+		if (time_before_eq(timeout, now))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		spin_unlock_irqrestore(&amp;ide_lock, flags);</div><div class='add'>+		timeout = schedule_timeout_uninterruptible(timeout - now);</div><div class='add'>+		spin_lock_irqsave(&amp;ide_lock, flags);</div><div class='add'>+	} while (timeout);</div><div class='add'>+	finish_wait(&amp;ide_park_wq, &amp;wait);</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * First, reset any device state data we were maintaining</div><div class='ctx'> 	 * for any of the drives on this interface.</div><div class='hunk'>@@ -1270,7 +1212,7 @@ int ide_wait_not_busy(ide_hwif_t *hwif, unsigned long timeout)</div><div class='ctx'> 		 */</div><div class='ctx'> 		mdelay(1);</div><div class='ctx'> 		stat = hwif-&gt;tp_ops-&gt;read_status(hwif);</div><div class='del'>-		if ((stat &amp; BUSY_STAT) == 0)</div><div class='add'>+		if ((stat &amp; ATA_BUSY) == 0)</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Assume a value of 0xff means nothing is connected to</div><div class='head'>diff --git a/drivers/ide/ide-lib.c b/drivers/ide/ide-lib.c<br/>index 97fefabea8b8..9fc4cfb2a272 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/ide-lib.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ide/ide-lib.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/ide-lib.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/ide-lib.c</a></div><div class='hunk'>@@ -2,7 +2,6 @@</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/hdreg.h&gt;</div><div class='ctx'> #include &lt;linux/ide.h&gt;</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -90,29 +89,31 @@ static u8 ide_rate_filter(ide_drive_t *drive, u8 speed)</div><div class='ctx'> </div><div class='ctx'> u8 ide_get_best_pio_mode (ide_drive_t *drive, u8 mode_wanted, u8 max_mode)</div><div class='ctx'> {</div><div class='del'>-	int pio_mode;</div><div class='del'>-	struct hd_driveid* id = drive-&gt;id;</div><div class='del'>-	int overridden  = 0;</div><div class='add'>+	u16 *id = drive-&gt;id;</div><div class='add'>+	int pio_mode = -1, overridden = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (mode_wanted != 255)</div><div class='ctx'> 		return min_t(u8, mode_wanted, max_mode);</div><div class='ctx'> </div><div class='del'>-	if ((drive-&gt;hwif-&gt;host_flags &amp; IDE_HFLAG_PIO_NO_BLACKLIST) == 0 &amp;&amp;</div><div class='del'>-	    (pio_mode = ide_scan_pio_blacklist(id-&gt;model)) != -1) {</div><div class='add'>+	if ((drive-&gt;hwif-&gt;host_flags &amp; IDE_HFLAG_PIO_NO_BLACKLIST) == 0)</div><div class='add'>+		pio_mode = ide_scan_pio_blacklist((char *)&amp;id[ATA_ID_PROD]);</div><div class='add'>+</div><div class='add'>+	if (pio_mode != -1) {</div><div class='ctx'> 		printk(KERN_INFO "%s: is on PIO blacklist\n", drive-&gt;name);</div><div class='ctx'> 	} else {</div><div class='del'>-		pio_mode = id-&gt;tPIO;</div><div class='add'>+		pio_mode = id[ATA_ID_OLD_PIO_MODES] &gt;&gt; 8;</div><div class='ctx'> 		if (pio_mode &gt; 2) {	/* 2 is maximum allowed tPIO value */</div><div class='ctx'> 			pio_mode = 2;</div><div class='ctx'> 			overridden = 1;</div><div class='ctx'> 		}</div><div class='del'>-		if (id-&gt;field_valid &amp; 2) {	  /* drive implements ATA2? */</div><div class='del'>-			if (id-&gt;capability &amp; 8) { /* IORDY supported? */</div><div class='del'>-				if (id-&gt;eide_pio_modes &amp; 7) {</div><div class='add'>+</div><div class='add'>+		if (id[ATA_ID_FIELD_VALID] &amp; 2) {	      /* ATA2? */</div><div class='add'>+			if (ata_id_has_iordy(id)) {</div><div class='add'>+				if (id[ATA_ID_PIO_MODES] &amp; 7) {</div><div class='ctx'> 					overridden = 0;</div><div class='del'>-					if (id-&gt;eide_pio_modes &amp; 4)</div><div class='add'>+					if (id[ATA_ID_PIO_MODES] &amp; 4)</div><div class='ctx'> 						pio_mode = 5;</div><div class='del'>-					else if (id-&gt;eide_pio_modes &amp; 2)</div><div class='add'>+					else if (id[ATA_ID_PIO_MODES] &amp; 2)</div><div class='ctx'> 						pio_mode = 4;</div><div class='ctx'> 					else</div><div class='ctx'> 						pio_mode = 3;</div><div class='hunk'>@@ -316,7 +317,7 @@ static void ide_dump_sector(ide_drive_t *drive)</div><div class='ctx'> {</div><div class='ctx'> 	ide_task_t task;</div><div class='ctx'> 	struct ide_taskfile *tf = &amp;task.tf;</div><div class='del'>-	int lba48 = (drive-&gt;addressing == 1) ? 1 : 0;</div><div class='add'>+	u8 lba48 = !!(drive-&gt;dev_flags &amp; IDE_DFLAG_LBA48);</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;task, 0, sizeof(task));</div><div class='ctx'> 	if (lba48)</div><div class='hunk'>@@ -338,16 +339,16 @@ static void ide_dump_sector(ide_drive_t *drive)</div><div class='ctx'> static void ide_dump_ata_error(ide_drive_t *drive, u8 err)</div><div class='ctx'> {</div><div class='ctx'> 	printk("{ ");</div><div class='del'>-	if (err &amp; ABRT_ERR)	printk("DriveStatusError ");</div><div class='del'>-	if (err &amp; ICRC_ERR)</div><div class='del'>-		printk((err &amp; ABRT_ERR) ? "BadCRC " : "BadSector ");</div><div class='del'>-	if (err &amp; ECC_ERR)	printk("UncorrectableError ");</div><div class='del'>-	if (err &amp; ID_ERR)	printk("SectorIdNotFound ");</div><div class='del'>-	if (err &amp; TRK0_ERR)	printk("TrackZeroNotFound ");</div><div class='del'>-	if (err &amp; MARK_ERR)	printk("AddrMarkNotFound ");</div><div class='add'>+	if (err &amp; ATA_ABORTED)	printk("DriveStatusError ");</div><div class='add'>+	if (err &amp; ATA_ICRC)</div><div class='add'>+		printk((err &amp; ATA_ABORTED) ? "BadCRC " : "BadSector ");</div><div class='add'>+	if (err &amp; ATA_UNC)	printk("UncorrectableError ");</div><div class='add'>+	if (err &amp; ATA_IDNF)	printk("SectorIdNotFound ");</div><div class='add'>+	if (err &amp; ATA_TRK0NF)	printk("TrackZeroNotFound ");</div><div class='add'>+	if (err &amp; ATA_AMNF)	printk("AddrMarkNotFound ");</div><div class='ctx'> 	printk("}");</div><div class='del'>-	if ((err &amp; (BBD_ERR | ABRT_ERR)) == BBD_ERR ||</div><div class='del'>-	    (err &amp; (ECC_ERR|ID_ERR|MARK_ERR))) {</div><div class='add'>+	if ((err &amp; (ATA_BBK | ATA_ABORTED)) == ATA_BBK ||</div><div class='add'>+	    (err &amp; (ATA_UNC | ATA_IDNF | ATA_AMNF))) {</div><div class='ctx'> 		ide_dump_sector(drive);</div><div class='ctx'> 		if (HWGROUP(drive) &amp;&amp; HWGROUP(drive)-&gt;rq)</div><div class='ctx'> 			printk(", sector=%llu",</div><div class='hunk'>@@ -359,12 +360,12 @@ static void ide_dump_ata_error(ide_drive_t *drive, u8 err)</div><div class='ctx'> static void ide_dump_atapi_error(ide_drive_t *drive, u8 err)</div><div class='ctx'> {</div><div class='ctx'> 	printk("{ ");</div><div class='del'>-	if (err &amp; ILI_ERR)	printk("IllegalLengthIndication ");</div><div class='del'>-	if (err &amp; EOM_ERR)	printk("EndOfMedia ");</div><div class='del'>-	if (err &amp; ABRT_ERR)	printk("AbortedCommand ");</div><div class='del'>-	if (err &amp; MCR_ERR)	printk("MediaChangeRequested ");</div><div class='del'>-	if (err &amp; LFS_ERR)	printk("LastFailedSense=0x%02x ",</div><div class='del'>-				       (err &amp; LFS_ERR) &gt;&gt; 4);</div><div class='add'>+	if (err &amp; ATAPI_ILI)	printk("IllegalLengthIndication ");</div><div class='add'>+	if (err &amp; ATAPI_EOM)	printk("EndOfMedia ");</div><div class='add'>+	if (err &amp; ATA_ABORTED)	printk("AbortedCommand ");</div><div class='add'>+	if (err &amp; ATA_MCR)	printk("MediaChangeRequested ");</div><div class='add'>+	if (err &amp; ATAPI_LFS)	printk("LastFailedSense=0x%02x ",</div><div class='add'>+				       (err &amp; ATAPI_LFS) &gt;&gt; 4);</div><div class='ctx'> 	printk("}\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -386,19 +387,19 @@ u8 ide_dump_status(ide_drive_t *drive, const char *msg, u8 stat)</div><div class='ctx'> </div><div class='ctx'> 	local_irq_save(flags);</div><div class='ctx'> 	printk("%s: %s: status=0x%02x { ", drive-&gt;name, msg, stat);</div><div class='del'>-	if (stat &amp; BUSY_STAT)</div><div class='add'>+	if (stat &amp; ATA_BUSY)</div><div class='ctx'> 		printk("Busy ");</div><div class='ctx'> 	else {</div><div class='del'>-		if (stat &amp; READY_STAT)	printk("DriveReady ");</div><div class='del'>-		if (stat &amp; WRERR_STAT)	printk("DeviceFault ");</div><div class='del'>-		if (stat &amp; SEEK_STAT)	printk("SeekComplete ");</div><div class='del'>-		if (stat &amp; DRQ_STAT)	printk("DataRequest ");</div><div class='del'>-		if (stat &amp; ECC_STAT)	printk("CorrectedError ");</div><div class='del'>-		if (stat &amp; INDEX_STAT)	printk("Index ");</div><div class='del'>-		if (stat &amp; ERR_STAT)	printk("Error ");</div><div class='add'>+		if (stat &amp; ATA_DRDY)	printk("DriveReady ");</div><div class='add'>+		if (stat &amp; ATA_DF)	printk("DeviceFault ");</div><div class='add'>+		if (stat &amp; ATA_DSC)	printk("SeekComplete ");</div><div class='add'>+		if (stat &amp; ATA_DRQ)	printk("DataRequest ");</div><div class='add'>+		if (stat &amp; ATA_CORR)	printk("CorrectedError ");</div><div class='add'>+		if (stat &amp; ATA_IDX)	printk("Index ");</div><div class='add'>+		if (stat &amp; ATA_ERR)	printk("Error ");</div><div class='ctx'> 	}</div><div class='ctx'> 	printk("}\n");</div><div class='del'>-	if ((stat &amp; (BUSY_STAT|ERR_STAT)) == ERR_STAT) {</div><div class='add'>+	if ((stat &amp; (ATA_BUSY | ATA_ERR)) == ATA_ERR) {</div><div class='ctx'> 		err = ide_read_error(drive);</div><div class='ctx'> 		printk("%s: %s: error=0x%02x ", drive-&gt;name, msg, err);</div><div class='ctx'> 		if (drive-&gt;media == ide_disk)</div><div class='head'>diff --git a/drivers/ide/ide-park.c b/drivers/ide/ide-park.c<br/>new file mode 100644<br/>index 000000000000..03b00e57e93f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/ide-park.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/ide-park.c</a></div><div class='hunk'>@@ -0,0 +1,121 @@</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/ide.h&gt;</div><div class='add'>+#include &lt;linux/jiffies.h&gt;</div><div class='add'>+#include &lt;linux/blkdev.h&gt;</div><div class='add'>+</div><div class='add'>+DECLARE_WAIT_QUEUE_HEAD(ide_park_wq);</div><div class='add'>+</div><div class='add'>+static void issue_park_cmd(ide_drive_t *drive, unsigned long timeout)</div><div class='add'>+{</div><div class='add'>+	struct request_queue *q = drive-&gt;queue;</div><div class='add'>+	struct request *rq;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	timeout += jiffies;</div><div class='add'>+	spin_lock_irq(&amp;ide_lock);</div><div class='add'>+	if (drive-&gt;dev_flags &amp; IDE_DFLAG_PARKED) {</div><div class='add'>+		ide_hwgroup_t *hwgroup = drive-&gt;hwif-&gt;hwgroup;</div><div class='add'>+		int reset_timer;</div><div class='add'>+</div><div class='add'>+		reset_timer = time_before(timeout, drive-&gt;sleep);</div><div class='add'>+		drive-&gt;sleep = timeout;</div><div class='add'>+		wake_up_all(&amp;ide_park_wq);</div><div class='add'>+		if (reset_timer &amp;&amp; hwgroup-&gt;sleeping &amp;&amp;</div><div class='add'>+		    del_timer(&amp;hwgroup-&gt;timer)) {</div><div class='add'>+			hwgroup-&gt;sleeping = 0;</div><div class='add'>+			hwgroup-&gt;busy = 0;</div><div class='add'>+			blk_start_queueing(q);</div><div class='add'>+		}</div><div class='add'>+		spin_unlock_irq(&amp;ide_lock);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irq(&amp;ide_lock);</div><div class='add'>+</div><div class='add'>+	rq = blk_get_request(q, READ, __GFP_WAIT);</div><div class='add'>+	rq-&gt;cmd[0] = REQ_PARK_HEADS;</div><div class='add'>+	rq-&gt;cmd_len = 1;</div><div class='add'>+	rq-&gt;cmd_type = REQ_TYPE_SPECIAL;</div><div class='add'>+	rq-&gt;special = &amp;timeout;</div><div class='add'>+	rc = blk_execute_rq(q, NULL, rq, 1);</div><div class='add'>+	blk_put_request(rq);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Make sure that *some* command is sent to the drive after the</div><div class='add'>+	 * timeout has expired, so power management will be reenabled.</div><div class='add'>+	 */</div><div class='add'>+	rq = blk_get_request(q, READ, GFP_NOWAIT);</div><div class='add'>+	if (unlikely(!rq))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	rq-&gt;cmd[0] = REQ_UNPARK_HEADS;</div><div class='add'>+	rq-&gt;cmd_len = 1;</div><div class='add'>+	rq-&gt;cmd_type = REQ_TYPE_SPECIAL;</div><div class='add'>+	elv_add_request(q, rq, ELEVATOR_INSERT_FRONT, 1);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+ssize_t ide_park_show(struct device *dev, struct device_attribute *attr,</div><div class='add'>+		      char *buf)</div><div class='add'>+{</div><div class='add'>+	ide_drive_t *drive = to_ide_device(dev);</div><div class='add'>+	unsigned long now;</div><div class='add'>+	unsigned int msecs;</div><div class='add'>+</div><div class='add'>+	if (drive-&gt;dev_flags &amp; IDE_DFLAG_NO_UNLOAD)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(&amp;ide_lock);</div><div class='add'>+	now = jiffies;</div><div class='add'>+	if (drive-&gt;dev_flags &amp; IDE_DFLAG_PARKED &amp;&amp;</div><div class='add'>+	    time_after(drive-&gt;sleep, now))</div><div class='add'>+		msecs = jiffies_to_msecs(drive-&gt;sleep - now);</div><div class='add'>+	else</div><div class='add'>+		msecs = 0;</div><div class='add'>+	spin_unlock_irq(&amp;ide_lock);</div><div class='add'>+</div><div class='add'>+	return snprintf(buf, 20, "%u\n", msecs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+ssize_t ide_park_store(struct device *dev, struct device_attribute *attr,</div><div class='add'>+		       const char *buf, size_t len)</div><div class='add'>+{</div><div class='add'>+#define MAX_PARK_TIMEOUT 30000</div><div class='add'>+	ide_drive_t *drive = to_ide_device(dev);</div><div class='add'>+	long int input;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = strict_strtol(buf, 10, &amp;input);</div><div class='add'>+	if (rc || input &lt; -2)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (input &gt; MAX_PARK_TIMEOUT) {</div><div class='add'>+		input = MAX_PARK_TIMEOUT;</div><div class='add'>+		rc = -EOVERFLOW;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ide_setting_mtx);</div><div class='add'>+	if (input &gt;= 0) {</div><div class='add'>+		if (drive-&gt;dev_flags &amp; IDE_DFLAG_NO_UNLOAD)</div><div class='add'>+			rc = -EOPNOTSUPP;</div><div class='add'>+		else if (input || drive-&gt;dev_flags &amp; IDE_DFLAG_PARKED)</div><div class='add'>+			issue_park_cmd(drive, msecs_to_jiffies(input));</div><div class='add'>+	} else {</div><div class='add'>+		if (drive-&gt;media == ide_disk)</div><div class='add'>+			switch (input) {</div><div class='add'>+			case -1:</div><div class='add'>+				drive-&gt;dev_flags &amp;= ~IDE_DFLAG_NO_UNLOAD;</div><div class='add'>+				break;</div><div class='add'>+			case -2:</div><div class='add'>+				drive-&gt;dev_flags |= IDE_DFLAG_NO_UNLOAD;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		else</div><div class='add'>+			rc = -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;ide_setting_mtx);</div><div class='add'>+</div><div class='add'>+	return rc ? rc : len;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c<br/>index a51a30e9eab3..19f8c7770a25 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/ide-probe.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ide/ide-probe.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/ide-probe.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/ide-probe.c</a></div><div class='hunk'>@@ -50,59 +50,54 @@</div><div class='ctx'>  </div><div class='ctx'> static void generic_id(ide_drive_t *drive)</div><div class='ctx'> {</div><div class='del'>-	drive-&gt;id-&gt;cyls = drive-&gt;cyl;</div><div class='del'>-	drive-&gt;id-&gt;heads = drive-&gt;head;</div><div class='del'>-	drive-&gt;id-&gt;sectors = drive-&gt;sect;</div><div class='del'>-	drive-&gt;id-&gt;cur_cyls = drive-&gt;cyl;</div><div class='del'>-	drive-&gt;id-&gt;cur_heads = drive-&gt;head;</div><div class='del'>-	drive-&gt;id-&gt;cur_sectors = drive-&gt;sect;</div><div class='add'>+	u16 *id = drive-&gt;id;</div><div class='add'>+</div><div class='add'>+	id[ATA_ID_CUR_CYLS]	= id[ATA_ID_CYLS]	= drive-&gt;cyl;</div><div class='add'>+	id[ATA_ID_CUR_HEADS]	= id[ATA_ID_HEADS]	= drive-&gt;head;</div><div class='add'>+	id[ATA_ID_CUR_SECTORS]	= id[ATA_ID_SECTORS]	= drive-&gt;sect;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ide_disk_init_chs(ide_drive_t *drive)</div><div class='ctx'> {</div><div class='del'>-	struct hd_driveid *id = drive-&gt;id;</div><div class='add'>+	u16 *id = drive-&gt;id;</div><div class='ctx'> </div><div class='ctx'> 	/* Extract geometry if we did not already have one for the drive */</div><div class='ctx'> 	if (!drive-&gt;cyl || !drive-&gt;head || !drive-&gt;sect) {</div><div class='del'>-		drive-&gt;cyl  = drive-&gt;bios_cyl  = id-&gt;cyls;</div><div class='del'>-		drive-&gt;head = drive-&gt;bios_head = id-&gt;heads;</div><div class='del'>-		drive-&gt;sect = drive-&gt;bios_sect = id-&gt;sectors;</div><div class='add'>+		drive-&gt;cyl  = drive-&gt;bios_cyl  = id[ATA_ID_CYLS];</div><div class='add'>+		drive-&gt;head = drive-&gt;bios_head = id[ATA_ID_HEADS];</div><div class='add'>+		drive-&gt;sect = drive-&gt;bios_sect = id[ATA_ID_SECTORS];</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Handle logical geometry translation by the drive */</div><div class='del'>-	if ((id-&gt;field_valid &amp; 1) &amp;&amp; id-&gt;cur_cyls &amp;&amp;</div><div class='del'>-	    id-&gt;cur_heads &amp;&amp; (id-&gt;cur_heads &lt;= 16) &amp;&amp; id-&gt;cur_sectors) {</div><div class='del'>-		drive-&gt;cyl  = id-&gt;cur_cyls;</div><div class='del'>-		drive-&gt;head = id-&gt;cur_heads;</div><div class='del'>-		drive-&gt;sect = id-&gt;cur_sectors;</div><div class='add'>+	if (ata_id_current_chs_valid(id)) {</div><div class='add'>+		drive-&gt;cyl  = id[ATA_ID_CUR_CYLS];</div><div class='add'>+		drive-&gt;head = id[ATA_ID_CUR_HEADS];</div><div class='add'>+		drive-&gt;sect = id[ATA_ID_CUR_SECTORS];</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Use physical geometry if what we have still makes no sense */</div><div class='del'>-	if (drive-&gt;head &gt; 16 &amp;&amp; id-&gt;heads &amp;&amp; id-&gt;heads &lt;= 16) {</div><div class='del'>-		drive-&gt;cyl  = id-&gt;cyls;</div><div class='del'>-		drive-&gt;head = id-&gt;heads;</div><div class='del'>-		drive-&gt;sect = id-&gt;sectors;</div><div class='add'>+	if (drive-&gt;head &gt; 16 &amp;&amp; id[ATA_ID_HEADS] &amp;&amp; id[ATA_ID_HEADS] &lt;= 16) {</div><div class='add'>+		drive-&gt;cyl  = id[ATA_ID_CYLS];</div><div class='add'>+		drive-&gt;head = id[ATA_ID_HEADS];</div><div class='add'>+		drive-&gt;sect = id[ATA_ID_SECTORS];</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ide_disk_init_mult_count(ide_drive_t *drive)</div><div class='ctx'> {</div><div class='del'>-	struct hd_driveid *id = drive-&gt;id;</div><div class='del'>-</div><div class='del'>-	drive-&gt;mult_count = 0;</div><div class='del'>-	if (id-&gt;max_multsect) {</div><div class='del'>-#ifdef CONFIG_IDEDISK_MULTI_MODE</div><div class='del'>-		id-&gt;multsect = ((id-&gt;max_multsect/2) &gt; 1) ? id-&gt;max_multsect : 0;</div><div class='del'>-		id-&gt;multsect_valid = id-&gt;multsect ? 1 : 0;</div><div class='del'>-		drive-&gt;mult_req = id-&gt;multsect_valid ? id-&gt;max_multsect : 0;</div><div class='del'>-		drive-&gt;special.b.set_multmode = drive-&gt;mult_req ? 1 : 0;</div><div class='del'>-#else	/* original, pre IDE-NFG, per request of AC */</div><div class='del'>-		drive-&gt;mult_req = 0;</div><div class='del'>-		if (drive-&gt;mult_req &gt; id-&gt;max_multsect)</div><div class='del'>-			drive-&gt;mult_req = id-&gt;max_multsect;</div><div class='del'>-		if (drive-&gt;mult_req || ((id-&gt;multsect_valid &amp; 1) &amp;&amp; id-&gt;multsect))</div><div class='add'>+	u16 *id = drive-&gt;id;</div><div class='add'>+	u8 max_multsect = id[ATA_ID_MAX_MULTSECT] &amp; 0xff;</div><div class='add'>+</div><div class='add'>+	if (max_multsect) {</div><div class='add'>+		if ((max_multsect / 2) &gt; 1)</div><div class='add'>+			id[ATA_ID_MULTSECT] = max_multsect | 0x100;</div><div class='add'>+		else</div><div class='add'>+			id[ATA_ID_MULTSECT] &amp;= ~0x1ff;</div><div class='add'>+</div><div class='add'>+		drive-&gt;mult_req = id[ATA_ID_MULTSECT] &amp; 0xff;</div><div class='add'>+</div><div class='add'>+		if (drive-&gt;mult_req)</div><div class='ctx'> 			drive-&gt;special.b.set_multmode = 1;</div><div class='del'>-#endif</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -119,14 +114,15 @@ static void ide_disk_init_mult_count(ide_drive_t *drive)</div><div class='ctx'> static inline void do_identify (ide_drive_t *drive, u8 cmd)</div><div class='ctx'> {</div><div class='ctx'> 	ide_hwif_t *hwif = HWIF(drive);</div><div class='del'>-	int bswap = 1;</div><div class='del'>-	struct hd_driveid *id;</div><div class='add'>+	u16 *id = drive-&gt;id;</div><div class='add'>+	char *m = (char *)&amp;id[ATA_ID_PROD];</div><div class='add'>+	int bswap = 1, is_cfa;</div><div class='ctx'> </div><div class='del'>-	id = drive-&gt;id;</div><div class='ctx'> 	/* read 512 bytes of id info */</div><div class='ctx'> 	hwif-&gt;tp_ops-&gt;input_data(drive, NULL, id, SECTOR_SIZE);</div><div class='ctx'> </div><div class='del'>-	drive-&gt;id_read = 1;</div><div class='add'>+	drive-&gt;dev_flags |= IDE_DFLAG_ID_READ;</div><div class='add'>+</div><div class='ctx'> 	local_irq_enable();</div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 	printk(KERN_INFO "%s: dumping identify data\n", drive-&gt;name);</div><div class='hunk'>@@ -135,59 +131,59 @@ static inline void do_identify (ide_drive_t *drive, u8 cmd)</div><div class='ctx'> 	ide_fix_driveid(id);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 *  WIN_IDENTIFY returns little-endian info,</div><div class='del'>-	 *  WIN_PIDENTIFY *usually* returns little-endian info.</div><div class='add'>+	 *  ATA_CMD_ID_ATA returns little-endian info,</div><div class='add'>+	 *  ATA_CMD_ID_ATAPI *usually* returns little-endian info.</div><div class='ctx'> 	 */</div><div class='del'>-	if (cmd == WIN_PIDENTIFY) {</div><div class='del'>-		if ((id-&gt;model[0] == 'N' &amp;&amp; id-&gt;model[1] == 'E') /* NEC */</div><div class='del'>-		 || (id-&gt;model[0] == 'F' &amp;&amp; id-&gt;model[1] == 'X') /* Mitsumi */</div><div class='del'>-		 || (id-&gt;model[0] == 'P' &amp;&amp; id-&gt;model[1] == 'i'))/* Pioneer */</div><div class='add'>+	if (cmd == ATA_CMD_ID_ATAPI) {</div><div class='add'>+		if ((m[0] == 'N' &amp;&amp; m[1] == 'E') ||  /* NEC */</div><div class='add'>+		    (m[0] == 'F' &amp;&amp; m[1] == 'X') ||  /* Mitsumi */</div><div class='add'>+		    (m[0] == 'P' &amp;&amp; m[1] == 'i'))    /* Pioneer */</div><div class='ctx'> 			/* Vertos drives may still be weird */</div><div class='del'>-			bswap ^= 1;	</div><div class='add'>+			bswap ^= 1;</div><div class='ctx'> 	}</div><div class='del'>-	ide_fixstring(id-&gt;model,     sizeof(id-&gt;model),     bswap);</div><div class='del'>-	ide_fixstring(id-&gt;fw_rev,    sizeof(id-&gt;fw_rev),    bswap);</div><div class='del'>-	ide_fixstring(id-&gt;serial_no, sizeof(id-&gt;serial_no), bswap);</div><div class='add'>+</div><div class='add'>+	ide_fixstring(m, ATA_ID_PROD_LEN, bswap);</div><div class='add'>+	ide_fixstring((char *)&amp;id[ATA_ID_FW_REV], ATA_ID_FW_REV_LEN, bswap);</div><div class='add'>+	ide_fixstring((char *)&amp;id[ATA_ID_SERNO], ATA_ID_SERNO_LEN, bswap);</div><div class='ctx'> </div><div class='ctx'> 	/* we depend on this a lot! */</div><div class='del'>-	id-&gt;model[sizeof(id-&gt;model)-1] = '\0';</div><div class='add'>+	m[ATA_ID_PROD_LEN - 1] = '\0';</div><div class='ctx'> </div><div class='del'>-	if (strstr(id-&gt;model, "E X A B Y T E N E S T"))</div><div class='add'>+	if (strstr(m, "E X A B Y T E N E S T"))</div><div class='ctx'> 		goto err_misc;</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "%s: %s, ", drive-&gt;name, id-&gt;model);</div><div class='add'>+	printk(KERN_INFO "%s: %s, ", drive-&gt;name, m);</div><div class='ctx'> </div><div class='del'>-	drive-&gt;present = 1;</div><div class='del'>-	drive-&gt;dead = 0;</div><div class='add'>+	drive-&gt;dev_flags |= IDE_DFLAG_PRESENT;</div><div class='add'>+	drive-&gt;dev_flags &amp;= ~IDE_DFLAG_DEAD;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Check for an ATAPI device</div><div class='ctx'> 	 */</div><div class='del'>-	if (cmd == WIN_PIDENTIFY) {</div><div class='del'>-		u8 type = (id-&gt;config &gt;&gt; 8) &amp; 0x1f;</div><div class='add'>+	if (cmd == ATA_CMD_ID_ATAPI) {</div><div class='add'>+		u8 type = (id[ATA_ID_CONFIG] &gt;&gt; 8) &amp; 0x1f;</div><div class='ctx'> </div><div class='ctx'> 		printk(KERN_CONT "ATAPI ");</div><div class='ctx'> 		switch (type) {</div><div class='ctx'> 			case ide_floppy:</div><div class='del'>-				if (!strstr(id-&gt;model, "CD-ROM")) {</div><div class='del'>-					if (!strstr(id-&gt;model, "oppy") &amp;&amp;</div><div class='del'>-					    !strstr(id-&gt;model, "poyp") &amp;&amp;</div><div class='del'>-					    !strstr(id-&gt;model, "ZIP"))</div><div class='add'>+				if (!strstr(m, "CD-ROM")) {</div><div class='add'>+					if (!strstr(m, "oppy") &amp;&amp;</div><div class='add'>+					    !strstr(m, "poyp") &amp;&amp;</div><div class='add'>+					    !strstr(m, "ZIP"))</div><div class='ctx'> 						printk(KERN_CONT "cdrom or floppy?, assuming ");</div><div class='ctx'> 					if (drive-&gt;media != ide_cdrom) {</div><div class='ctx'> 						printk(KERN_CONT "FLOPPY");</div><div class='del'>-						drive-&gt;removable = 1;</div><div class='add'>+						drive-&gt;dev_flags |= IDE_DFLAG_REMOVABLE;</div><div class='ctx'> 						break;</div><div class='ctx'> 					}</div><div class='ctx'> 				}</div><div class='ctx'> 				/* Early cdrom models used zero */</div><div class='ctx'> 				type = ide_cdrom;</div><div class='ctx'> 			case ide_cdrom:</div><div class='del'>-				drive-&gt;removable = 1;</div><div class='add'>+				drive-&gt;dev_flags |= IDE_DFLAG_REMOVABLE;</div><div class='ctx'> #ifdef CONFIG_PPC</div><div class='ctx'> 				/* kludge for Apple PowerBook internal zip */</div><div class='del'>-				if (!strstr(id-&gt;model, "CD-ROM") &amp;&amp;</div><div class='del'>-				    strstr(id-&gt;model, "ZIP")) {</div><div class='add'>+				if (!strstr(m, "CD-ROM") &amp;&amp; strstr(m, "ZIP")) {</div><div class='ctx'> 					printk(KERN_CONT "FLOPPY");</div><div class='ctx'> 					type = ide_floppy;</div><div class='ctx'> 					break;</div><div class='hunk'>@@ -200,7 +196,7 @@ static inline void do_identify (ide_drive_t *drive, u8 cmd)</div><div class='ctx'> 				break;</div><div class='ctx'> 			case ide_optical:</div><div class='ctx'> 				printk(KERN_CONT "OPTICAL");</div><div class='del'>-				drive-&gt;removable = 1;</div><div class='add'>+				drive-&gt;dev_flags |= IDE_DFLAG_REMOVABLE;</div><div class='ctx'> 				break;</div><div class='ctx'> 			default:</div><div class='ctx'> 				printk(KERN_CONT "UNKNOWN (type %d)", type);</div><div class='hunk'>@@ -210,6 +206,10 @@ static inline void do_identify (ide_drive_t *drive, u8 cmd)</div><div class='ctx'> 		drive-&gt;media = type;</div><div class='ctx'> 		/* an ATAPI device ignores DRDY */</div><div class='ctx'> 		drive-&gt;ready_stat = 0;</div><div class='add'>+		if (ata_id_cdb_intr(id))</div><div class='add'>+			drive-&gt;atapi_flags |= IDE_AFLAG_DRQ_INTERRUPT;</div><div class='add'>+		/* we don't do head unloading on ATAPI devices */</div><div class='add'>+		drive-&gt;dev_flags |= IDE_DFLAG_NO_UNLOAD;</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -217,24 +217,24 @@ static inline void do_identify (ide_drive_t *drive, u8 cmd)</div><div class='ctx'> 	 * Not an ATAPI device: looks like a "regular" hard disk</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * 0x848a = CompactFlash device</div><div class='del'>-	 * These are *not* removable in Linux definition of the term</div><div class='del'>-	 */</div><div class='add'>+	is_cfa = ata_id_is_cfa(id);</div><div class='ctx'> </div><div class='del'>-	if ((id-&gt;config != 0x848a) &amp;&amp; (id-&gt;config &amp; (1&lt;&lt;7)))</div><div class='del'>-		drive-&gt;removable = 1;</div><div class='add'>+	/* CF devices are *not* removable in Linux definition of the term */</div><div class='add'>+	if (is_cfa == 0 &amp;&amp; (id[ATA_ID_CONFIG] &amp; (1 &lt;&lt; 7)))</div><div class='add'>+		drive-&gt;dev_flags |= IDE_DFLAG_REMOVABLE;</div><div class='ctx'> </div><div class='ctx'> 	drive-&gt;media = ide_disk;</div><div class='ctx'> </div><div class='del'>-	printk(KERN_CONT "%s DISK drive\n",</div><div class='del'>-		(id-&gt;config == 0x848a) ? "CFA" : "ATA");</div><div class='add'>+	if (!ata_id_has_unload(drive-&gt;id))</div><div class='add'>+		drive-&gt;dev_flags |= IDE_DFLAG_NO_UNLOAD;</div><div class='add'>+</div><div class='add'>+	printk(KERN_CONT "%s DISK drive\n", is_cfa ? "CFA" : "ATA");</div><div class='ctx'> </div><div class='ctx'> 	return;</div><div class='ctx'> </div><div class='ctx'> err_misc:</div><div class='ctx'> 	kfree(id);</div><div class='del'>-	drive-&gt;present = 0;</div><div class='add'>+	drive-&gt;dev_flags &amp;= ~IDE_DFLAG_PRESENT;</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -268,7 +268,7 @@ static int actual_try_to_identify (ide_drive_t *drive, u8 cmd)</div><div class='ctx'> 	if (io_ports-&gt;ctl_addr) {</div><div class='ctx'> 		a = tp_ops-&gt;read_altstatus(hwif);</div><div class='ctx'> 		s = tp_ops-&gt;read_status(hwif);</div><div class='del'>-		if ((a ^ s) &amp; ~INDEX_STAT)</div><div class='add'>+		if ((a ^ s) &amp; ~ATA_IDX)</div><div class='ctx'> 			/* ancient Seagate drives, broken interfaces */</div><div class='ctx'> 			printk(KERN_INFO "%s: probing with STATUS(0x%02x) "</div><div class='ctx'> 					 "instead of ALTSTATUS(0x%02x)\n",</div><div class='hunk'>@@ -281,7 +281,7 @@ static int actual_try_to_identify (ide_drive_t *drive, u8 cmd)</div><div class='ctx'> 	/* set features register for atapi</div><div class='ctx'> 	 * identify command to be sure of reply</div><div class='ctx'> 	 */</div><div class='del'>-	if (cmd == WIN_PIDENTIFY) {</div><div class='add'>+	if (cmd == ATA_CMD_ID_ATAPI) {</div><div class='ctx'> 		ide_task_t task;</div><div class='ctx'> </div><div class='ctx'> 		memset(&amp;task, 0, sizeof(task));</div><div class='hunk'>@@ -294,24 +294,16 @@ static int actual_try_to_identify (ide_drive_t *drive, u8 cmd)</div><div class='ctx'> 	/* ask drive for ID */</div><div class='ctx'> 	tp_ops-&gt;exec_command(hwif, cmd);</div><div class='ctx'> </div><div class='del'>-	timeout = ((cmd == WIN_IDENTIFY) ? WAIT_WORSTCASE : WAIT_PIDENTIFY) / 2;</div><div class='del'>-	timeout += jiffies;</div><div class='del'>-	do {</div><div class='del'>-		if (time_after(jiffies, timeout)) {</div><div class='del'>-			/* drive timed-out */</div><div class='del'>-			return 1;</div><div class='del'>-		}</div><div class='del'>-		/* give drive a breather */</div><div class='del'>-		msleep(50);</div><div class='del'>-		s = use_altstatus ? tp_ops-&gt;read_altstatus(hwif)</div><div class='del'>-				  : tp_ops-&gt;read_status(hwif);</div><div class='del'>-	} while (s &amp; BUSY_STAT);</div><div class='add'>+	timeout = ((cmd == ATA_CMD_ID_ATA) ? WAIT_WORSTCASE : WAIT_PIDENTIFY) / 2;</div><div class='ctx'> </div><div class='del'>-	/* wait for IRQ and DRQ_STAT */</div><div class='add'>+	if (ide_busy_sleep(hwif, timeout, use_altstatus))</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	/* wait for IRQ and ATA_DRQ */</div><div class='ctx'> 	msleep(50);</div><div class='ctx'> 	s = tp_ops-&gt;read_status(hwif);</div><div class='ctx'> </div><div class='del'>-	if (OK_STAT(s, DRQ_STAT, BAD_R_STAT)) {</div><div class='add'>+	if (OK_STAT(s, ATA_DRQ, BAD_R_STAT)) {</div><div class='ctx'> 		unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 		/* local CPU only; some systems need this */</div><div class='hunk'>@@ -387,19 +379,21 @@ static int try_to_identify (ide_drive_t *drive, u8 cmd)</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ide_busy_sleep(ide_hwif_t *hwif)</div><div class='add'>+int ide_busy_sleep(ide_hwif_t *hwif, unsigned long timeout, int altstatus)</div><div class='ctx'> {</div><div class='del'>-	unsigned long timeout = jiffies + WAIT_WORSTCASE;</div><div class='ctx'> 	u8 stat;</div><div class='ctx'> </div><div class='add'>+	timeout += jiffies;</div><div class='add'>+</div><div class='ctx'> 	do {</div><div class='del'>-		msleep(50);</div><div class='del'>-		stat = hwif-&gt;tp_ops-&gt;read_status(hwif);</div><div class='del'>-		if ((stat &amp; BUSY_STAT) == 0)</div><div class='add'>+		msleep(50);	/* give drive a breather */</div><div class='add'>+		stat = altstatus ? hwif-&gt;tp_ops-&gt;read_altstatus(hwif)</div><div class='add'>+				 : hwif-&gt;tp_ops-&gt;read_status(hwif);</div><div class='add'>+		if ((stat &amp; ATA_BUSY) == 0)</div><div class='ctx'> 			return 0;</div><div class='ctx'> 	} while (time_before(jiffies, timeout));</div><div class='ctx'> </div><div class='del'>-	return 1;</div><div class='add'>+	return 1;	/* drive timed-out */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u8 ide_read_device(ide_drive_t *drive)</div><div class='hunk'>@@ -440,17 +434,16 @@ static int do_probe (ide_drive_t *drive, u8 cmd)</div><div class='ctx'> 	ide_hwif_t *hwif = HWIF(drive);</div><div class='ctx'> 	const struct ide_tp_ops *tp_ops = hwif-&gt;tp_ops;</div><div class='ctx'> 	int rc;</div><div class='del'>-	u8 stat;</div><div class='add'>+	u8 present = !!(drive-&gt;dev_flags &amp; IDE_DFLAG_PRESENT), stat;</div><div class='add'>+</div><div class='add'>+	/* avoid waiting for inappropriate probes */</div><div class='add'>+	if (present &amp;&amp; drive-&gt;media != ide_disk &amp;&amp; cmd == ATA_CMD_ID_ATA)</div><div class='add'>+		return 4;</div><div class='ctx'> </div><div class='del'>-	if (drive-&gt;present) {</div><div class='del'>-		/* avoid waiting for inappropriate probes */</div><div class='del'>-		if ((drive-&gt;media != ide_disk) &amp;&amp; (cmd == WIN_IDENTIFY))</div><div class='del'>-			return 4;</div><div class='del'>-	}</div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 	printk(KERN_INFO "probing for %s: present=%d, media=%d, probetype=%s\n",</div><div class='del'>-		drive-&gt;name, drive-&gt;present, drive-&gt;media,</div><div class='del'>-		(cmd == WIN_IDENTIFY) ? "ATA" : "ATAPI");</div><div class='add'>+		drive-&gt;name, present, drive-&gt;media,</div><div class='add'>+		(cmd == ATA_CMD_ID_ATA) ? "ATA" : "ATAPI");</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	/* needed for some systems</div><div class='hunk'>@@ -460,11 +453,11 @@ static int do_probe (ide_drive_t *drive, u8 cmd)</div><div class='ctx'> 	SELECT_DRIVE(drive);</div><div class='ctx'> 	msleep(50);</div><div class='ctx'> </div><div class='del'>-	if (ide_read_device(drive) != drive-&gt;select.all &amp;&amp; !drive-&gt;present) {</div><div class='del'>-		if (drive-&gt;select.b.unit != 0) {</div><div class='add'>+	if (ide_read_device(drive) != drive-&gt;select &amp;&amp; present == 0) {</div><div class='add'>+		if (drive-&gt;dn &amp; 1) {</div><div class='ctx'> 			/* exit with drive0 selected */</div><div class='ctx'> 			SELECT_DRIVE(&amp;hwif-&gt;drives[0]);</div><div class='del'>-			/* allow BUSY_STAT to assert &amp; clear */</div><div class='add'>+			/* allow ATA_BUSY to assert &amp; clear */</div><div class='ctx'> 			msleep(50);</div><div class='ctx'> 		}</div><div class='ctx'> 		/* no i/f present: mmm.. this should be a 4 -ml */</div><div class='hunk'>@@ -473,8 +466,8 @@ static int do_probe (ide_drive_t *drive, u8 cmd)</div><div class='ctx'> </div><div class='ctx'> 	stat = tp_ops-&gt;read_status(hwif);</div><div class='ctx'> </div><div class='del'>-	if (OK_STAT(stat, READY_STAT, BUSY_STAT) ||</div><div class='del'>-	    drive-&gt;present || cmd == WIN_PIDENTIFY) {</div><div class='add'>+	if (OK_STAT(stat, ATA_DRDY, ATA_BUSY) ||</div><div class='add'>+	    present || cmd == ATA_CMD_ID_ATAPI) {</div><div class='ctx'> 		/* send cmd and wait */</div><div class='ctx'> 		if ((rc = try_to_identify(drive, cmd))) {</div><div class='ctx'> 			/* failed: try again */</div><div class='hunk'>@@ -483,17 +476,17 @@ static int do_probe (ide_drive_t *drive, u8 cmd)</div><div class='ctx'> </div><div class='ctx'> 		stat = tp_ops-&gt;read_status(hwif);</div><div class='ctx'> </div><div class='del'>-		if (stat == (BUSY_STAT | READY_STAT))</div><div class='add'>+		if (stat == (ATA_BUSY | ATA_DRDY))</div><div class='ctx'> 			return 4;</div><div class='ctx'> </div><div class='del'>-		if (rc == 1 &amp;&amp; cmd == WIN_PIDENTIFY) {</div><div class='add'>+		if (rc == 1 &amp;&amp; cmd == ATA_CMD_ID_ATAPI) {</div><div class='ctx'> 			printk(KERN_ERR "%s: no response (status = 0x%02x), "</div><div class='ctx'> 					"resetting drive\n", drive-&gt;name, stat);</div><div class='ctx'> 			msleep(50);</div><div class='ctx'> 			SELECT_DRIVE(drive);</div><div class='ctx'> 			msleep(50);</div><div class='del'>-			tp_ops-&gt;exec_command(hwif, WIN_SRST);</div><div class='del'>-			(void)ide_busy_sleep(hwif);</div><div class='add'>+			tp_ops-&gt;exec_command(hwif, ATA_CMD_DEV_RESET);</div><div class='add'>+			(void)ide_busy_sleep(hwif, WAIT_WORSTCASE, 0);</div><div class='ctx'> 			rc = try_to_identify(drive, cmd);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -507,7 +500,7 @@ static int do_probe (ide_drive_t *drive, u8 cmd)</div><div class='ctx'> 		/* not present or maybe ATAPI */</div><div class='ctx'> 		rc = 3;</div><div class='ctx'> 	}</div><div class='del'>-	if (drive-&gt;select.b.unit != 0) {</div><div class='add'>+	if (drive-&gt;dn &amp; 1) {</div><div class='ctx'> 		/* exit with drive0 selected */</div><div class='ctx'> 		SELECT_DRIVE(&amp;hwif-&gt;drives[0]);</div><div class='ctx'> 		msleep(50);</div><div class='hunk'>@@ -526,13 +519,14 @@ static void enable_nest (ide_drive_t *drive)</div><div class='ctx'> 	const struct ide_tp_ops *tp_ops = hwif-&gt;tp_ops;</div><div class='ctx'> 	u8 stat;</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "%s: enabling %s -- ", hwif-&gt;name, drive-&gt;id-&gt;model);</div><div class='add'>+	printk(KERN_INFO "%s: enabling %s -- ",</div><div class='add'>+		hwif-&gt;name, (char *)&amp;drive-&gt;id[ATA_ID_PROD]);</div><div class='ctx'> </div><div class='ctx'> 	SELECT_DRIVE(drive);</div><div class='ctx'> 	msleep(50);</div><div class='del'>-	tp_ops-&gt;exec_command(hwif, EXABYTE_ENABLE_NEST);</div><div class='add'>+	tp_ops-&gt;exec_command(hwif, ATA_EXABYTE_ENABLE_NEST);</div><div class='ctx'> </div><div class='del'>-	if (ide_busy_sleep(hwif)) {</div><div class='add'>+	if (ide_busy_sleep(hwif, WAIT_WORSTCASE, 0)) {</div><div class='ctx'> 		printk(KERN_CONT "failed (timeout)\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -545,12 +539,6 @@ static void enable_nest (ide_drive_t *drive)</div><div class='ctx'> 		printk(KERN_CONT "failed (status = 0x%02x)\n", stat);</div><div class='ctx'> 	else</div><div class='ctx'> 		printk(KERN_CONT "success\n");</div><div class='del'>-</div><div class='del'>-	/* if !(success||timed-out) */</div><div class='del'>-	if (do_probe(drive, WIN_IDENTIFY) &gt;= 2) {</div><div class='del'>-		/* look for ATAPI device */</div><div class='del'>-		(void) do_probe(drive, WIN_PIDENTIFY);</div><div class='del'>-	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -561,12 +549,14 @@ static void enable_nest (ide_drive_t *drive)</div><div class='ctx'>  *	and presents things to the user as needed.</div><div class='ctx'>  *</div><div class='ctx'>  *	Returns:	0  no device was found</div><div class='del'>- *			1  device was found (note: drive-&gt;present might</div><div class='del'>- *			   still be 0)</div><div class='add'>+ *			1  device was found</div><div class='add'>+ *			   (note: IDE_DFLAG_PRESENT might still be not set)</div><div class='ctx'>  */</div><div class='ctx'>  </div><div class='ctx'> static inline u8 probe_for_drive (ide_drive_t *drive)</div><div class='ctx'> {</div><div class='add'>+	char *m;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 *	In order to keep things simple we have an id</div><div class='ctx'> 	 *	block for all drives at all times. If the device</div><div class='hunk'>@@ -576,31 +566,36 @@ static inline u8 probe_for_drive (ide_drive_t *drive)</div><div class='ctx'> 	 *	Also note that 0 everywhere means "can't do X"</div><div class='ctx'> 	 */</div><div class='ctx'>  </div><div class='del'>-	drive-&gt;id = kzalloc(SECTOR_WORDS *4, GFP_KERNEL);</div><div class='del'>-	drive-&gt;id_read = 0;</div><div class='del'>-	if(drive-&gt;id == NULL)</div><div class='del'>-	{</div><div class='add'>+	drive-&gt;dev_flags &amp;= ~IDE_DFLAG_ID_READ;</div><div class='add'>+</div><div class='add'>+	drive-&gt;id = kzalloc(SECTOR_SIZE, GFP_KERNEL);</div><div class='add'>+	if (drive-&gt;id == NULL) {</div><div class='ctx'> 		printk(KERN_ERR "ide: out of memory for id data.\n");</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='del'>-	strcpy(drive-&gt;id-&gt;model, "UNKNOWN");</div><div class='del'>-	</div><div class='add'>+</div><div class='add'>+	m = (char *)&amp;drive-&gt;id[ATA_ID_PROD];</div><div class='add'>+	strcpy(m, "UNKNOWN");</div><div class='add'>+</div><div class='ctx'> 	/* skip probing? */</div><div class='del'>-	if (!drive-&gt;noprobe)</div><div class='del'>-	{</div><div class='add'>+	if ((drive-&gt;dev_flags &amp; IDE_DFLAG_NOPROBE) == 0) {</div><div class='add'>+retry:</div><div class='ctx'> 		/* if !(success||timed-out) */</div><div class='del'>-		if (do_probe(drive, WIN_IDENTIFY) &gt;= 2) {</div><div class='add'>+		if (do_probe(drive, ATA_CMD_ID_ATA) &gt;= 2)</div><div class='ctx'> 			/* look for ATAPI device */</div><div class='del'>-			(void) do_probe(drive, WIN_PIDENTIFY);</div><div class='del'>-		}</div><div class='del'>-		if (!drive-&gt;present)</div><div class='add'>+			(void)do_probe(drive, ATA_CMD_ID_ATAPI);</div><div class='add'>+</div><div class='add'>+		if ((drive-&gt;dev_flags &amp; IDE_DFLAG_PRESENT) == 0)</div><div class='ctx'> 			/* drive not found */</div><div class='ctx'> 			return 0;</div><div class='del'>-		if (strstr(drive-&gt;id-&gt;model, "E X A B Y T E N E S T"))</div><div class='add'>+</div><div class='add'>+		if (strstr(m, "E X A B Y T E N E S T")) {</div><div class='ctx'> 			enable_nest(drive);</div><div class='del'>-	</div><div class='add'>+			goto retry;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		/* identification failed? */</div><div class='del'>-		if (!drive-&gt;id_read) {</div><div class='add'>+		if ((drive-&gt;dev_flags &amp; IDE_DFLAG_ID_READ) == 0) {</div><div class='ctx'> 			if (drive-&gt;media == ide_disk) {</div><div class='ctx'> 				printk(KERN_INFO "%s: non-IDE drive, CHS=%d/%d/%d\n",</div><div class='ctx'> 					drive-&gt;name, drive-&gt;cyl,</div><div class='hunk'>@@ -610,15 +605,17 @@ static inline u8 probe_for_drive (ide_drive_t *drive)</div><div class='ctx'> 			} else {</div><div class='ctx'> 				/* nuke it */</div><div class='ctx'> 				printk(KERN_WARNING "%s: Unknown device on bus refused identification. Ignoring.\n", drive-&gt;name);</div><div class='del'>-				drive-&gt;present = 0;</div><div class='add'>+				drive-&gt;dev_flags &amp;= ~IDE_DFLAG_PRESENT;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		/* drive was found */</div><div class='ctx'> 	}</div><div class='del'>-	if(!drive-&gt;present)</div><div class='add'>+</div><div class='add'>+	if ((drive-&gt;dev_flags &amp; IDE_DFLAG_PRESENT) == 0)</div><div class='ctx'> 		return 0;</div><div class='add'>+</div><div class='ctx'> 	/* The drive wasn't being helpful. Add generic info only */</div><div class='del'>-	if (drive-&gt;id_read == 0) {</div><div class='add'>+	if ((drive-&gt;dev_flags &amp; IDE_DFLAG_ID_READ) == 0) {</div><div class='ctx'> 		generic_id(drive);</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -628,7 +625,7 @@ static inline u8 probe_for_drive (ide_drive_t *drive)</div><div class='ctx'> 		ide_disk_init_mult_count(drive);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return drive-&gt;present;</div><div class='add'>+	return !!(drive-&gt;dev_flags &amp; IDE_DFLAG_PRESENT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void hwif_release_dev(struct device *dev)</div><div class='hunk'>@@ -660,8 +657,8 @@ static int ide_register_port(ide_hwif_t *hwif)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	hwif-&gt;portdev = device_create_drvdata(ide_port_class, &amp;hwif-&gt;gendev,</div><div class='del'>-					      MKDEV(0, 0), hwif, hwif-&gt;name);</div><div class='add'>+	hwif-&gt;portdev = device_create(ide_port_class, &amp;hwif-&gt;gendev,</div><div class='add'>+				      MKDEV(0, 0), hwif, hwif-&gt;name);</div><div class='ctx'> 	if (IS_ERR(hwif-&gt;portdev)) {</div><div class='ctx'> 		ret = PTR_ERR(hwif-&gt;portdev);</div><div class='ctx'> 		device_unregister(&amp;hwif-&gt;gendev);</div><div class='hunk'>@@ -719,7 +716,8 @@ static int ide_port_wait_ready(ide_hwif_t *hwif)</div><div class='ctx'> 		ide_drive_t *drive = &amp;hwif-&gt;drives[unit];</div><div class='ctx'> </div><div class='ctx'> 		/* Ignore disks that we will not probe for later. */</div><div class='del'>-		if (!drive-&gt;noprobe || drive-&gt;present) {</div><div class='add'>+		if ((drive-&gt;dev_flags &amp; IDE_DFLAG_NOPROBE) == 0 ||</div><div class='add'>+		    (drive-&gt;dev_flags &amp; IDE_DFLAG_PRESENT)) {</div><div class='ctx'> 			SELECT_DRIVE(drive);</div><div class='ctx'> 			hwif-&gt;tp_ops-&gt;set_irq(hwif, 1);</div><div class='ctx'> 			mdelay(2);</div><div class='hunk'>@@ -740,36 +738,38 @@ out:</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	ide_undecoded_slave	-	look for bad CF adapters</div><div class='del'>- *	@drive1: drive</div><div class='add'>+ *	@dev1: slave device</div><div class='ctx'>  *</div><div class='ctx'>  *	Analyse the drives on the interface and attempt to decide if we</div><div class='ctx'>  *	have the same drive viewed twice. This occurs with crap CF adapters</div><div class='ctx'>  *	and PCMCIA sometimes.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-void ide_undecoded_slave(ide_drive_t *drive1)</div><div class='add'>+void ide_undecoded_slave(ide_drive_t *dev1)</div><div class='ctx'> {</div><div class='del'>-	ide_drive_t *drive0 = &amp;drive1-&gt;hwif-&gt;drives[0];</div><div class='add'>+	ide_drive_t *dev0 = &amp;dev1-&gt;hwif-&gt;drives[0];</div><div class='ctx'> </div><div class='del'>-	if ((drive1-&gt;dn &amp; 1) == 0 || drive0-&gt;present == 0)</div><div class='add'>+	if ((dev1-&gt;dn &amp; 1) == 0 || (dev0-&gt;dev_flags &amp; IDE_DFLAG_PRESENT) == 0)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/* If the models don't match they are not the same product */</div><div class='del'>-	if (strcmp(drive0-&gt;id-&gt;model, drive1-&gt;id-&gt;model))</div><div class='add'>+	if (strcmp((char *)&amp;dev0-&gt;id[ATA_ID_PROD],</div><div class='add'>+		   (char *)&amp;dev1-&gt;id[ATA_ID_PROD]))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/* Serial numbers do not match */</div><div class='del'>-	if (strncmp(drive0-&gt;id-&gt;serial_no, drive1-&gt;id-&gt;serial_no, 20))</div><div class='add'>+	if (strncmp((char *)&amp;dev0-&gt;id[ATA_ID_SERNO],</div><div class='add'>+		    (char *)&amp;dev1-&gt;id[ATA_ID_SERNO], ATA_ID_SERNO_LEN))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/* No serial number, thankfully very rare for CF */</div><div class='del'>-	if (drive0-&gt;id-&gt;serial_no[0] == 0)</div><div class='add'>+	if (*(char *)&amp;dev0-&gt;id[ATA_ID_SERNO] == 0)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/* Appears to be an IDE flash adapter with decode bugs */</div><div class='ctx'> 	printk(KERN_WARNING "ide-probe: ignoring undecoded slave\n");</div><div class='ctx'> </div><div class='del'>-	drive1-&gt;present = 0;</div><div class='add'>+	dev1-&gt;dev_flags &amp;= ~IDE_DFLAG_PRESENT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL_GPL(ide_undecoded_slave);</div><div class='hunk'>@@ -782,7 +782,8 @@ static int ide_probe_port(ide_hwif_t *hwif)</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(hwif-&gt;present);</div><div class='ctx'> </div><div class='del'>-	if (hwif-&gt;drives[0].noprobe &amp;&amp; hwif-&gt;drives[1].noprobe)</div><div class='add'>+	if ((hwif-&gt;drives[0].dev_flags &amp; IDE_DFLAG_NOPROBE) &amp;&amp;</div><div class='add'>+	    (hwif-&gt;drives[1].dev_flags &amp; IDE_DFLAG_NOPROBE))</div><div class='ctx'> 		return -EACCES;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -804,9 +805,9 @@ static int ide_probe_port(ide_hwif_t *hwif)</div><div class='ctx'> 	 */</div><div class='ctx'> 	for (unit = 0; unit &lt; MAX_DRIVES; ++unit) {</div><div class='ctx'> 		ide_drive_t *drive = &amp;hwif-&gt;drives[unit];</div><div class='del'>-		drive-&gt;dn = (hwif-&gt;channel ? 2 : 0) + unit;</div><div class='add'>+</div><div class='ctx'> 		(void) probe_for_drive(drive);</div><div class='del'>-		if (drive-&gt;present)</div><div class='add'>+		if (drive-&gt;dev_flags &amp; IDE_DFLAG_PRESENT)</div><div class='ctx'> 			rc = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -830,17 +831,19 @@ static void ide_port_tune_devices(ide_hwif_t *hwif)</div><div class='ctx'> 	for (unit = 0; unit &lt; MAX_DRIVES; unit++) {</div><div class='ctx'> 		ide_drive_t *drive = &amp;hwif-&gt;drives[unit];</div><div class='ctx'> </div><div class='del'>-		if (drive-&gt;present &amp;&amp; port_ops &amp;&amp; port_ops-&gt;quirkproc)</div><div class='del'>-			port_ops-&gt;quirkproc(drive);</div><div class='add'>+		if (drive-&gt;dev_flags &amp; IDE_DFLAG_PRESENT) {</div><div class='add'>+			if (port_ops &amp;&amp; port_ops-&gt;quirkproc)</div><div class='add'>+				port_ops-&gt;quirkproc(drive);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (unit = 0; unit &lt; MAX_DRIVES; ++unit) {</div><div class='ctx'> 		ide_drive_t *drive = &amp;hwif-&gt;drives[unit];</div><div class='ctx'> </div><div class='del'>-		if (drive-&gt;present) {</div><div class='add'>+		if (drive-&gt;dev_flags &amp; IDE_DFLAG_PRESENT) {</div><div class='ctx'> 			ide_set_max_pio(drive);</div><div class='ctx'> </div><div class='del'>-			drive-&gt;nice1 = 1;</div><div class='add'>+			drive-&gt;dev_flags |= IDE_DFLAG_NICE1;</div><div class='ctx'> </div><div class='ctx'> 			if (hwif-&gt;dma_ops)</div><div class='ctx'> 				ide_set_dma(drive);</div><div class='hunk'>@@ -850,14 +853,14 @@ static void ide_port_tune_devices(ide_hwif_t *hwif)</div><div class='ctx'> 	for (unit = 0; unit &lt; MAX_DRIVES; ++unit) {</div><div class='ctx'> 		ide_drive_t *drive = &amp;hwif-&gt;drives[unit];</div><div class='ctx'> </div><div class='del'>-		if (hwif-&gt;host_flags &amp; IDE_HFLAG_NO_IO_32BIT)</div><div class='del'>-			drive-&gt;no_io_32bit = 1;</div><div class='add'>+		if ((hwif-&gt;host_flags &amp; IDE_HFLAG_NO_IO_32BIT) ||</div><div class='add'>+		    drive-&gt;id[ATA_ID_DWORD_IO])</div><div class='add'>+			drive-&gt;dev_flags |= IDE_DFLAG_NO_IO_32BIT;</div><div class='ctx'> 		else</div><div class='del'>-			drive-&gt;no_io_32bit = drive-&gt;id-&gt;dword_io ? 1 : 0;</div><div class='add'>+			drive-&gt;dev_flags &amp;= ~IDE_DFLAG_NO_IO_32BIT;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#if MAX_HWIFS &gt; 1</div><div class='ctx'> /*</div><div class='ctx'>  * save_match() is used to simplify logic in init_irq() below.</div><div class='ctx'>  *</div><div class='hunk'>@@ -882,7 +885,6 @@ static void save_match(ide_hwif_t *hwif, ide_hwif_t *new, ide_hwif_t **match)</div><div class='ctx'> 	if (!m || m-&gt;irq != hwif-&gt;irq) /* don't undo a prior perfect match */</div><div class='ctx'> 		*match = new;</div><div class='ctx'> }</div><div class='del'>-#endif /* MAX_HWIFS &gt; 1 */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * init request queue</div><div class='hunk'>@@ -961,26 +963,33 @@ static void ide_add_drive_to_hwgroup(ide_drive_t *drive)</div><div class='ctx'>  * - allocate the block device queue</div><div class='ctx'>  * - link drive into the hwgroup</div><div class='ctx'>  */</div><div class='del'>-static void ide_port_setup_devices(ide_hwif_t *hwif)</div><div class='add'>+static int ide_port_setup_devices(ide_hwif_t *hwif)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='add'>+	int i, j = 0;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;ide_cfg_mtx);</div><div class='ctx'> 	for (i = 0; i &lt; MAX_DRIVES; i++) {</div><div class='ctx'> 		ide_drive_t *drive = &amp;hwif-&gt;drives[i];</div><div class='ctx'> </div><div class='del'>-		if (!drive-&gt;present)</div><div class='add'>+		if ((drive-&gt;dev_flags &amp; IDE_DFLAG_PRESENT) == 0)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		if (ide_init_queue(drive)) {</div><div class='ctx'> 			printk(KERN_ERR "ide: failed to init %s\n",</div><div class='ctx'> 					drive-&gt;name);</div><div class='add'>+			kfree(drive-&gt;id);</div><div class='add'>+			drive-&gt;id = NULL;</div><div class='add'>+			drive-&gt;dev_flags &amp;= ~IDE_DFLAG_PRESENT;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		j++;</div><div class='add'>+</div><div class='ctx'> 		ide_add_drive_to_hwgroup(drive);</div><div class='ctx'> 	}</div><div class='ctx'> 	mutex_unlock(&amp;ide_cfg_mtx);</div><div class='add'>+</div><div class='add'>+	return j;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ide_hwif_t *ide_ports[MAX_HWIFS];</div><div class='hunk'>@@ -1037,14 +1046,9 @@ static int init_irq (ide_hwif_t *hwif)</div><div class='ctx'> 	ide_hwgroup_t *hwgroup;</div><div class='ctx'> 	ide_hwif_t *match = NULL;</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-	BUG_ON(in_interrupt());</div><div class='del'>-	BUG_ON(irqs_disabled());	</div><div class='del'>-	BUG_ON(hwif == NULL);</div><div class='del'>-</div><div class='ctx'> 	mutex_lock(&amp;ide_cfg_mtx);</div><div class='ctx'> 	hwif-&gt;hwgroup = NULL;</div><div class='del'>-#if MAX_HWIFS &gt; 1</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Group up with any other hwifs that share our irq(s).</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -1069,7 +1073,7 @@ static int init_irq (ide_hwif_t *hwif)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-#endif /* MAX_HWIFS &gt; 1 */</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If we are still without a hwgroup, then form a new one</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -1116,7 +1120,8 @@ static int init_irq (ide_hwif_t *hwif)</div><div class='ctx'> 		sa = IRQF_SHARED;</div><div class='ctx'> #endif /* __mc68000__ */</div><div class='ctx'> </div><div class='del'>-		if (IDE_CHIPSET_IS_PCI(hwif-&gt;chipset))</div><div class='add'>+		if (hwif-&gt;chipset == ide_pci || hwif-&gt;chipset == ide_cmd646 ||</div><div class='add'>+		    hwif-&gt;chipset == ide_ali14xx)</div><div class='ctx'> 			sa = IRQF_SHARED;</div><div class='ctx'> </div><div class='ctx'> 		if (io_ports-&gt;ctl_addr)</div><div class='hunk'>@@ -1167,12 +1172,13 @@ static struct kobject *ata_probe(dev_t dev, int *part, void *data)</div><div class='ctx'> 	ide_hwif_t *hwif = data;</div><div class='ctx'> 	int unit = *part &gt;&gt; PARTN_BITS;</div><div class='ctx'> 	ide_drive_t *drive = &amp;hwif-&gt;drives[unit];</div><div class='del'>-	if (!drive-&gt;present)</div><div class='add'>+</div><div class='add'>+	if ((drive-&gt;dev_flags &amp; IDE_DFLAG_PRESENT) == 0)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (drive-&gt;media == ide_disk)</div><div class='ctx'> 		request_module("ide-disk");</div><div class='del'>-	if (drive-&gt;scsi)</div><div class='add'>+	if (drive-&gt;dev_flags &amp; IDE_DFLAG_SCSI)</div><div class='ctx'> 		request_module("ide-scsi");</div><div class='ctx'> 	if (drive-&gt;media == ide_cdrom || drive-&gt;media == ide_optical)</div><div class='ctx'> 		request_module("ide-cd");</div><div class='hunk'>@@ -1188,7 +1194,7 @@ static struct kobject *exact_match(dev_t dev, int *part, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct gendisk *p = data;</div><div class='ctx'> 	*part &amp;= (1 &lt;&lt; PARTN_BITS) - 1;</div><div class='del'>-	return &amp;p-&gt;dev.kobj;</div><div class='add'>+	return &amp;disk_to_dev(p)-&gt;kobj;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int exact_lock(dev_t dev, void *data)</div><div class='hunk'>@@ -1219,7 +1225,7 @@ EXPORT_SYMBOL_GPL(ide_unregister_region);</div><div class='ctx'> void ide_init_disk(struct gendisk *disk, ide_drive_t *drive)</div><div class='ctx'> {</div><div class='ctx'> 	ide_hwif_t *hwif = drive-&gt;hwif;</div><div class='del'>-	unsigned int unit = (drive-&gt;select.all &gt;&gt; 4) &amp; 1;</div><div class='add'>+	unsigned int unit = drive-&gt;dn &amp; 1;</div><div class='ctx'> </div><div class='ctx'> 	disk-&gt;major = hwif-&gt;major;</div><div class='ctx'> 	disk-&gt;first_minor = unit &lt;&lt; PARTN_BITS;</div><div class='hunk'>@@ -1262,7 +1268,7 @@ static void drive_release_dev (struct device *dev)</div><div class='ctx'> 	ide_remove_drive_from_hwgroup(drive);</div><div class='ctx'> 	kfree(drive-&gt;id);</div><div class='ctx'> 	drive-&gt;id = NULL;</div><div class='del'>-	drive-&gt;present = 0;</div><div class='add'>+	drive-&gt;dev_flags &amp;= ~IDE_DFLAG_PRESENT;</div><div class='ctx'> 	/* Messed up locking ... */</div><div class='ctx'> 	spin_unlock_irq(&amp;ide_lock);</div><div class='ctx'> 	blk_cleanup_queue(drive-&gt;queue);</div><div class='hunk'>@@ -1341,11 +1347,9 @@ static void hwif_register_devices(ide_hwif_t *hwif)</div><div class='ctx'> 		struct device *dev = &amp;drive-&gt;gendev;</div><div class='ctx'> 		int ret;</div><div class='ctx'> </div><div class='del'>-		if (!drive-&gt;present)</div><div class='add'>+		if ((drive-&gt;dev_flags &amp; IDE_DFLAG_PRESENT) == 0)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		ide_add_generic_settings(drive);</div><div class='del'>-</div><div class='ctx'> 		snprintf(dev-&gt;bus_id, BUS_ID_SIZE, "%u.%u", hwif-&gt;index, i);</div><div class='ctx'> 		dev-&gt;parent = &amp;hwif-&gt;gendev;</div><div class='ctx'> 		dev-&gt;bus = &amp;ide_bus_type;</div><div class='hunk'>@@ -1367,12 +1371,14 @@ static void ide_port_init_devices(ide_hwif_t *hwif)</div><div class='ctx'> 	for (i = 0; i &lt; MAX_DRIVES; i++) {</div><div class='ctx'> 		ide_drive_t *drive = &amp;hwif-&gt;drives[i];</div><div class='ctx'> </div><div class='add'>+		drive-&gt;dn = i + hwif-&gt;channel * 2;</div><div class='add'>+</div><div class='ctx'> 		if (hwif-&gt;host_flags &amp; IDE_HFLAG_IO_32BIT)</div><div class='ctx'> 			drive-&gt;io_32bit = 1;</div><div class='ctx'> 		if (hwif-&gt;host_flags &amp; IDE_HFLAG_UNMASK_IRQS)</div><div class='del'>-			drive-&gt;unmask = 1;</div><div class='add'>+			drive-&gt;dev_flags |= IDE_DFLAG_UNMASK;</div><div class='ctx'> 		if (hwif-&gt;host_flags &amp; IDE_HFLAG_NO_UNMASK_IRQS)</div><div class='del'>-			drive-&gt;no_unmask = 1;</div><div class='add'>+			drive-&gt;dev_flags |= IDE_DFLAG_NO_UNMASK;</div><div class='ctx'> </div><div class='ctx'> 		if (port_ops &amp;&amp; port_ops-&gt;init_dev)</div><div class='ctx'> 			port_ops-&gt;init_dev(drive);</div><div class='hunk'>@@ -1529,19 +1535,14 @@ static int ide_find_port_slot(const struct ide_port_info *d)</div><div class='ctx'> 	 * ports 0x1f0/0x170 (the ide0/ide1 defaults).</div><div class='ctx'> 	 */</div><div class='ctx'> 	mutex_lock(&amp;ide_cfg_mtx);</div><div class='del'>-	if (MAX_HWIFS == 1) {</div><div class='del'>-		if (ide_indexes == 0 &amp;&amp; i == 0)</div><div class='del'>-			idx = 1;</div><div class='add'>+	if (bootable) {</div><div class='add'>+		if ((ide_indexes | i) != (1 &lt;&lt; MAX_HWIFS) - 1)</div><div class='add'>+			idx = ffz(ide_indexes | i);</div><div class='ctx'> 	} else {</div><div class='del'>-		if (bootable) {</div><div class='del'>-			if ((ide_indexes | i) != (1 &lt;&lt; MAX_HWIFS) - 1)</div><div class='del'>-				idx = ffz(ide_indexes | i);</div><div class='del'>-		} else {</div><div class='del'>-			if ((ide_indexes | 3) != (1 &lt;&lt; MAX_HWIFS) - 1)</div><div class='del'>-				idx = ffz(ide_indexes | 3);</div><div class='del'>-			else if ((ide_indexes &amp; 3) != 3)</div><div class='del'>-				idx = ffz(ide_indexes);</div><div class='del'>-		}</div><div class='add'>+		if ((ide_indexes | 3) != (1 &lt;&lt; MAX_HWIFS) - 1)</div><div class='add'>+			idx = ffz(ide_indexes | 3);</div><div class='add'>+		else if ((ide_indexes &amp; 3) != 3)</div><div class='add'>+			idx = ffz(ide_indexes);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (idx &gt;= 0)</div><div class='ctx'> 		ide_indexes |= (1 &lt;&lt; idx);</div><div class='hunk'>@@ -1557,8 +1558,7 @@ static void ide_free_port_slot(int idx)</div><div class='ctx'> 	mutex_unlock(&amp;ide_cfg_mtx);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct ide_host *ide_host_alloc_all(const struct ide_port_info *d,</div><div class='del'>-				    hw_regs_t **hws)</div><div class='add'>+struct ide_host *ide_host_alloc(const struct ide_port_info *d, hw_regs_t **hws)</div><div class='ctx'> {</div><div class='ctx'> 	struct ide_host *host;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -1567,7 +1567,7 @@ struct ide_host *ide_host_alloc_all(const struct ide_port_info *d,</div><div class='ctx'> 	if (host == NULL)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; MAX_HWIFS; i++) {</div><div class='add'>+	for (i = 0; i &lt; MAX_HOST_PORTS; i++) {</div><div class='ctx'> 		ide_hwif_t *hwif;</div><div class='ctx'> 		int idx;</div><div class='ctx'> </div><div class='hunk'>@@ -1602,23 +1602,13 @@ struct ide_host *ide_host_alloc_all(const struct ide_port_info *d,</div><div class='ctx'> 	if (hws[0])</div><div class='ctx'> 		host-&gt;dev[0] = hws[0]-&gt;dev;</div><div class='ctx'> </div><div class='del'>-	if (d)</div><div class='add'>+	if (d) {</div><div class='add'>+		host-&gt;init_chipset = d-&gt;init_chipset;</div><div class='ctx'> 		host-&gt;host_flags = d-&gt;host_flags;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return host;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(ide_host_alloc_all);</div><div class='del'>-</div><div class='del'>-struct ide_host *ide_host_alloc(const struct ide_port_info *d, hw_regs_t **hws)</div><div class='del'>-{</div><div class='del'>-	hw_regs_t *hws_all[MAX_HWIFS];</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; MAX_HWIFS; i++)</div><div class='del'>-		hws_all[i] = (i &lt; 4) ? hws[i] : NULL;</div><div class='del'>-</div><div class='del'>-	return ide_host_alloc_all(d, hws_all);</div><div class='del'>-}</div><div class='ctx'> EXPORT_SYMBOL_GPL(ide_host_alloc);</div><div class='ctx'> </div><div class='ctx'> int ide_host_register(struct ide_host *host, const struct ide_port_info *d,</div><div class='hunk'>@@ -1627,7 +1617,7 @@ int ide_host_register(struct ide_host *host, const struct ide_port_info *d,</div><div class='ctx'> 	ide_hwif_t *hwif, *mate = NULL;</div><div class='ctx'> 	int i, j = 0;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; MAX_HWIFS; i++) {</div><div class='add'>+	for (i = 0; i &lt; MAX_HOST_PORTS; i++) {</div><div class='ctx'> 		hwif = host-&gt;ports[i];</div><div class='ctx'> </div><div class='ctx'> 		if (hwif == NULL) {</div><div class='hunk'>@@ -1640,22 +1630,22 @@ int ide_host_register(struct ide_host *host, const struct ide_port_info *d,</div><div class='ctx'> </div><div class='ctx'> 		if (d == NULL) {</div><div class='ctx'> 			mate = NULL;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='add'>+		} else {</div><div class='add'>+			if ((i &amp; 1) &amp;&amp; mate) {</div><div class='add'>+				hwif-&gt;mate = mate;</div><div class='add'>+				mate-&gt;mate = hwif;</div><div class='add'>+			}</div><div class='ctx'> </div><div class='del'>-		if ((i &amp; 1) &amp;&amp; mate) {</div><div class='del'>-			hwif-&gt;mate = mate;</div><div class='del'>-			mate-&gt;mate = hwif;</div><div class='del'>-		}</div><div class='add'>+			mate = (i &amp; 1) ? NULL : hwif;</div><div class='ctx'> </div><div class='del'>-		mate = (i &amp; 1) ? NULL : hwif;</div><div class='add'>+			ide_init_port(hwif, i &amp; 1, d);</div><div class='add'>+			ide_port_cable_detect(hwif);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		ide_init_port(hwif, i &amp; 1, d);</div><div class='del'>-		ide_port_cable_detect(hwif);</div><div class='ctx'> 		ide_port_init_devices(hwif);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; MAX_HWIFS; i++) {</div><div class='add'>+	for (i = 0; i &lt; MAX_HOST_PORTS; i++) {</div><div class='ctx'> 		hwif = host-&gt;ports[i];</div><div class='ctx'> </div><div class='ctx'> 		if (hwif == NULL)</div><div class='hunk'>@@ -1672,7 +1662,7 @@ int ide_host_register(struct ide_host *host, const struct ide_port_info *d,</div><div class='ctx'> 			ide_port_tune_devices(hwif);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; MAX_HWIFS; i++) {</div><div class='add'>+	for (i = 0; i &lt; MAX_HOST_PORTS; i++) {</div><div class='ctx'> 		hwif = host-&gt;ports[i];</div><div class='ctx'> </div><div class='ctx'> 		if (hwif == NULL)</div><div class='hunk'>@@ -1685,10 +1675,13 @@ int ide_host_register(struct ide_host *host, const struct ide_port_info *d,</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		j++;</div><div class='del'>-</div><div class='ctx'> 		if (hwif-&gt;present)</div><div class='del'>-			ide_port_setup_devices(hwif);</div><div class='add'>+			if (ide_port_setup_devices(hwif) == 0) {</div><div class='add'>+				hwif-&gt;present = 0;</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+		j++;</div><div class='ctx'> </div><div class='ctx'> 		ide_acpi_init(hwif);</div><div class='ctx'> </div><div class='hunk'>@@ -1696,7 +1689,7 @@ int ide_host_register(struct ide_host *host, const struct ide_port_info *d,</div><div class='ctx'> 			ide_acpi_port_init_devices(hwif);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; MAX_HWIFS; i++) {</div><div class='add'>+	for (i = 0; i &lt; MAX_HOST_PORTS; i++) {</div><div class='ctx'> 		hwif = host-&gt;ports[i];</div><div class='ctx'> </div><div class='ctx'> 		if (hwif == NULL)</div><div class='hunk'>@@ -1709,7 +1702,7 @@ int ide_host_register(struct ide_host *host, const struct ide_port_info *d,</div><div class='ctx'> 			hwif_register_devices(hwif);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; MAX_HWIFS; i++) {</div><div class='add'>+	for (i = 0; i &lt; MAX_HOST_PORTS; i++) {</div><div class='ctx'> 		hwif = host-&gt;ports[i];</div><div class='ctx'> </div><div class='ctx'> 		if (hwif == NULL)</div><div class='hunk'>@@ -1754,7 +1747,7 @@ void ide_host_free(struct ide_host *host)</div><div class='ctx'> 	ide_hwif_t *hwif;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; MAX_HWIFS; i++) {</div><div class='add'>+	for (i = 0; i &lt; MAX_HOST_PORTS; i++) {</div><div class='ctx'> 		hwif = host-&gt;ports[i];</div><div class='ctx'> </div><div class='ctx'> 		if (hwif == NULL)</div><div class='hunk'>@@ -1772,7 +1765,7 @@ void ide_host_remove(struct ide_host *host)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; MAX_HWIFS; i++) {</div><div class='add'>+	for (i = 0; i &lt; MAX_HOST_PORTS; i++) {</div><div class='ctx'> 		if (host-&gt;ports[i])</div><div class='ctx'> 			ide_unregister(host-&gt;ports[i]);</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/ide/ide-proc.c b/drivers/ide/ide-proc.c<br/>index f66c9c3f6fc6..b26926487cc0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/ide-proc.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ide/ide-proc.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/ide-proc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/ide-proc.c</a></div><div class='hunk'>@@ -12,14 +12,6 @@</div><div class='ctx'>  * "settings" files.  e.g.    "cat /proc/ide0/hda/settings"</div><div class='ctx'>  * To write a new value "val" into a specific setting "name", use:</div><div class='ctx'>  *   echo "name:val" &gt;/proc/ide/ide0/hda/settings</div><div class='del'>- *</div><div class='del'>- * Also useful, "cat /proc/ide0/hda/[identify, smart_values,</div><div class='del'>- * smart_thresholds, capabilities]" will issue an IDENTIFY /</div><div class='del'>- * PACKET_IDENTIFY / SMART_READ_VALUES / SMART_READ_THRESHOLDS /</div><div class='del'>- * SENSE CAPABILITIES command to /dev/hda, and then dump out the</div><div class='del'>- * returned data as 256 16-bit words.  The "hdparm" utility will</div><div class='del'>- * be updated someday soon to use this mechanism.</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -31,7 +23,6 @@</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/ctype.h&gt;</div><div class='del'>-#include &lt;linux/hdreg.h&gt;</div><div class='ctx'> #include &lt;linux/ide.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -109,13 +100,14 @@ static int proc_ide_read_identify</div><div class='ctx'> </div><div class='ctx'> 		err = taskfile_lib_get_identify(drive, page);</div><div class='ctx'> 		if (!err) {</div><div class='del'>-			char *out = ((char *)page) + (SECTOR_WORDS * 4);</div><div class='add'>+			char *out = (char *)page + SECTOR_SIZE;</div><div class='add'>+</div><div class='ctx'> 			page = out;</div><div class='ctx'> 			do {</div><div class='ctx'> 				out += sprintf(out, "%04x%c",</div><div class='ctx'> 					le16_to_cpup(val), (++i &amp; 7) ? ' ' : '\n');</div><div class='ctx'> 				val += 1;</div><div class='del'>-			} while (i &lt; (SECTOR_WORDS * 2));</div><div class='add'>+			} while (i &lt; SECTOR_SIZE / 2);</div><div class='ctx'> 			len = out - page;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -123,140 +115,25 @@ static int proc_ide_read_identify</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *	__ide_add_setting	-	add an ide setting option</div><div class='del'>- *	@drive: drive to use</div><div class='del'>- *	@name: setting name</div><div class='del'>- *	@rw: true if the function is read write</div><div class='del'>- *	@data_type: type of data</div><div class='del'>- *	@min: range minimum</div><div class='del'>- *	@max: range maximum</div><div class='del'>- *	@mul_factor: multiplication scale</div><div class='del'>- *	@div_factor: divison scale</div><div class='del'>- *	@data: private data field</div><div class='del'>- *	@set: setting</div><div class='del'>- *	@auto_remove: setting auto removal flag</div><div class='del'>- *</div><div class='del'>- *	Removes the setting named from the device if it is present.</div><div class='del'>- *	The function takes the settings_lock to protect against</div><div class='del'>- *	parallel changes. This function must not be called from IRQ</div><div class='del'>- *	context. Returns 0 on success or -1 on failure.</div><div class='del'>- *</div><div class='del'>- *	BUGS: This code is seriously over-engineered. There is also</div><div class='del'>- *	magic about how the driver specific features are setup. If</div><div class='del'>- *	a driver is attached we assume the driver settings are auto</div><div class='del'>- *	remove.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int __ide_add_setting(ide_drive_t *drive, const char *name, int rw, int data_type, int min, int max, int mul_factor, int div_factor, void *data, ide_procset_t *set, int auto_remove)</div><div class='del'>-{</div><div class='del'>-	ide_settings_t **p = (ide_settings_t **) &amp;drive-&gt;settings, *setting = NULL;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;ide_setting_mtx);</div><div class='del'>-	while ((*p) &amp;&amp; strcmp((*p)-&gt;name, name) &lt; 0)</div><div class='del'>-		p = &amp;((*p)-&gt;next);</div><div class='del'>-	if ((setting = kzalloc(sizeof(*setting), GFP_KERNEL)) == NULL)</div><div class='del'>-		goto abort;</div><div class='del'>-	if ((setting-&gt;name = kmalloc(strlen(name) + 1, GFP_KERNEL)) == NULL)</div><div class='del'>-		goto abort;</div><div class='del'>-	strcpy(setting-&gt;name, name);</div><div class='del'>-	setting-&gt;rw = rw;</div><div class='del'>-	setting-&gt;data_type = data_type;</div><div class='del'>-	setting-&gt;min = min;</div><div class='del'>-	setting-&gt;max = max;</div><div class='del'>-	setting-&gt;mul_factor = mul_factor;</div><div class='del'>-	setting-&gt;div_factor = div_factor;</div><div class='del'>-	setting-&gt;data = data;</div><div class='del'>-	setting-&gt;set = set;</div><div class='del'>-</div><div class='del'>-	setting-&gt;next = *p;</div><div class='del'>-	if (auto_remove)</div><div class='del'>-		setting-&gt;auto_remove = 1;</div><div class='del'>-	*p = setting;</div><div class='del'>-	mutex_unlock(&amp;ide_setting_mtx);</div><div class='del'>-	return 0;</div><div class='del'>-abort:</div><div class='del'>-	mutex_unlock(&amp;ide_setting_mtx);</div><div class='del'>-	kfree(setting);</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int ide_add_setting(ide_drive_t *drive, const char *name, int rw, int data_type, int min, int max, int mul_factor, int div_factor, void *data, ide_procset_t *set)</div><div class='del'>-{</div><div class='del'>-	return __ide_add_setting(drive, name, rw, data_type, min, max, mul_factor, div_factor, data, set, 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(ide_add_setting);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	__ide_remove_setting	-	remove an ide setting option</div><div class='del'>- *	@drive: drive to use</div><div class='del'>- *	@name: setting name</div><div class='del'>- *</div><div class='del'>- *	Removes the setting named from the device if it is present.</div><div class='del'>- *	The caller must hold the setting semaphore.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void __ide_remove_setting(ide_drive_t *drive, char *name)</div><div class='del'>-{</div><div class='del'>-	ide_settings_t **p, *setting;</div><div class='del'>-</div><div class='del'>-	p = (ide_settings_t **) &amp;drive-&gt;settings;</div><div class='del'>-</div><div class='del'>-	while ((*p) &amp;&amp; strcmp((*p)-&gt;name, name))</div><div class='del'>-		p = &amp;((*p)-&gt;next);</div><div class='del'>-	setting = (*p);</div><div class='del'>-	if (setting == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	(*p) = setting-&gt;next;</div><div class='del'>-</div><div class='del'>-	kfree(setting-&gt;name);</div><div class='del'>-	kfree(setting);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	auto_remove_settings	-	remove driver specific settings</div><div class='del'>- *	@drive: drive</div><div class='del'>- *</div><div class='del'>- *	Automatically remove all the driver specific settings for this</div><div class='del'>- *	drive. This function may not be called from IRQ context. The</div><div class='del'>- *	caller must hold ide_setting_mtx.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void auto_remove_settings(ide_drive_t *drive)</div><div class='del'>-{</div><div class='del'>-	ide_settings_t *setting;</div><div class='del'>-repeat:</div><div class='del'>-	setting = drive-&gt;settings;</div><div class='del'>-	while (setting) {</div><div class='del'>-		if (setting-&gt;auto_remove) {</div><div class='del'>-			__ide_remove_setting(drive, setting-&gt;name);</div><div class='del'>-			goto repeat;</div><div class='del'>-		}</div><div class='del'>-		setting = setting-&gt;next;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	ide_find_setting_by_name	-	find a drive specific setting</div><div class='del'>- *	@drive: drive to scan</div><div class='add'>+ *	ide_find_setting	-	find a specific setting</div><div class='add'>+ *	@st: setting table pointer</div><div class='ctx'>  *	@name: setting name</div><div class='ctx'>  *</div><div class='del'>- *	Scan's the device setting table for a matching entry and returns</div><div class='add'>+ *	Scan's the setting table for a matching entry and returns</div><div class='ctx'>  *	this or NULL if no entry is found. The caller must hold the</div><div class='ctx'>  *	setting semaphore</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static ide_settings_t *ide_find_setting_by_name(ide_drive_t *drive, char *name)</div><div class='add'>+static</div><div class='add'>+const struct ide_proc_devset *ide_find_setting(const struct ide_proc_devset *st,</div><div class='add'>+					       char *name)</div><div class='ctx'> {</div><div class='del'>-	ide_settings_t *setting = drive-&gt;settings;</div><div class='del'>-</div><div class='del'>-	while (setting) {</div><div class='del'>-		if (strcmp(setting-&gt;name, name) == 0)</div><div class='add'>+	while (st-&gt;name) {</div><div class='add'>+		if (strcmp(st-&gt;name, name) == 0)</div><div class='ctx'> 			break;</div><div class='del'>-		setting = setting-&gt;next;</div><div class='add'>+		st++;</div><div class='ctx'> 	}</div><div class='del'>-	return setting;</div><div class='add'>+	return st-&gt;name ? st : NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -272,26 +149,20 @@ static ide_settings_t *ide_find_setting_by_name(ide_drive_t *drive, char *name)</div><div class='ctx'>  *	be told apart</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static int ide_read_setting(ide_drive_t *drive, ide_settings_t *setting)</div><div class='add'>+static int ide_read_setting(ide_drive_t *drive,</div><div class='add'>+			    const struct ide_proc_devset *setting)</div><div class='ctx'> {</div><div class='del'>-	int		val = -EINVAL;</div><div class='del'>-	unsigned long	flags;</div><div class='add'>+	const struct ide_devset *ds = setting-&gt;setting;</div><div class='add'>+	int val = -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (ds-&gt;get) {</div><div class='add'>+		unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	if ((setting-&gt;rw &amp; SETTING_READ)) {</div><div class='ctx'> 		spin_lock_irqsave(&amp;ide_lock, flags);</div><div class='del'>-		switch (setting-&gt;data_type) {</div><div class='del'>-		case TYPE_BYTE:</div><div class='del'>-			val = *((u8 *) setting-&gt;data);</div><div class='del'>-			break;</div><div class='del'>-		case TYPE_SHORT:</div><div class='del'>-			val = *((u16 *) setting-&gt;data);</div><div class='del'>-			break;</div><div class='del'>-		case TYPE_INT:</div><div class='del'>-			val = *((u32 *) setting-&gt;data);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='add'>+		val = ds-&gt;get(drive);</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;ide_lock, flags);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	return val;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -313,33 +184,23 @@ static int ide_read_setting(ide_drive_t *drive, ide_settings_t *setting)</div><div class='ctx'>  *	The current scheme of polling is kludgy, though safe enough.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static int ide_write_setting(ide_drive_t *drive, ide_settings_t *setting, int val)</div><div class='add'>+static int ide_write_setting(ide_drive_t *drive,</div><div class='add'>+			     const struct ide_proc_devset *setting, int val)</div><div class='ctx'> {</div><div class='add'>+	const struct ide_devset *ds = setting-&gt;setting;</div><div class='add'>+</div><div class='ctx'> 	if (!capable(CAP_SYS_ADMIN))</div><div class='ctx'> 		return -EACCES;</div><div class='del'>-	if (setting-&gt;set)</div><div class='del'>-		return setting-&gt;set(drive, val);</div><div class='del'>-	if (!(setting-&gt;rw &amp; SETTING_WRITE))</div><div class='add'>+	if (!ds-&gt;set)</div><div class='ctx'> 		return -EPERM;</div><div class='del'>-	if (val &lt; setting-&gt;min || val &gt; setting-&gt;max)</div><div class='add'>+	if ((ds-&gt;flags &amp; DS_SYNC)</div><div class='add'>+	    &amp;&amp; (val &lt; setting-&gt;min || val &gt; setting-&gt;max))</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	if (ide_spin_wait_hwgroup(drive))</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	switch (setting-&gt;data_type) {</div><div class='del'>-	case TYPE_BYTE:</div><div class='del'>-		*((u8 *) setting-&gt;data) = val;</div><div class='del'>-		break;</div><div class='del'>-	case TYPE_SHORT:</div><div class='del'>-		*((u16 *) setting-&gt;data) = val;</div><div class='del'>-		break;</div><div class='del'>-	case TYPE_INT:</div><div class='del'>-		*((u32 *) setting-&gt;data) = val;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irq(&amp;ide_lock);</div><div class='del'>-	return 0;</div><div class='add'>+	return ide_devset_execute(drive, ds, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+ide_devset_get(xfer_rate, current_speed);</div><div class='add'>+</div><div class='ctx'> static int set_xfer_rate (ide_drive_t *drive, int arg)</div><div class='ctx'> {</div><div class='ctx'> 	ide_task_t task;</div><div class='hunk'>@@ -349,7 +210,7 @@ static int set_xfer_rate (ide_drive_t *drive, int arg)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;task, 0, sizeof(task));</div><div class='del'>-	task.tf.command = WIN_SETFEATURES;</div><div class='add'>+	task.tf.command = ATA_CMD_SET_FEATURES;</div><div class='ctx'> 	task.tf.feature = SETFEATURES_XFER;</div><div class='ctx'> 	task.tf.nsect   = (u8)arg;</div><div class='ctx'> 	task.tf_flags = IDE_TFLAG_OUT_FEATURE | IDE_TFLAG_OUT_NSECT |</div><div class='hunk'>@@ -364,29 +225,23 @@ static int set_xfer_rate (ide_drive_t *drive, int arg)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- *	ide_add_generic_settings	-	generic ide settings</div><div class='del'>- *	@drive: drive being configured</div><div class='del'>- *</div><div class='del'>- *	Add the generic parts of the system settings to the /proc files.</div><div class='del'>- *	The caller must not be holding the ide_setting_mtx.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-void ide_add_generic_settings (ide_drive_t *drive)</div><div class='del'>-{</div><div class='del'>-/*</div><div class='del'>- *			  drive		setting name		read/write access				data type	min	max				mul_factor	div_factor	data pointer			set function</div><div class='del'>- */</div><div class='del'>-	__ide_add_setting(drive,	"io_32bit",		drive-&gt;no_io_32bit ? SETTING_READ : SETTING_RW,	TYPE_BYTE,	0,	1 + (SUPPORT_VLB_SYNC &lt;&lt; 1),	1,		1,		&amp;drive-&gt;io_32bit,		set_io_32bit,	0);</div><div class='del'>-	__ide_add_setting(drive,	"keepsettings",		SETTING_RW,					TYPE_BYTE,	0,	1,				1,		1,		&amp;drive-&gt;keep_settings,		NULL,		0);</div><div class='del'>-	__ide_add_setting(drive,	"nice1",		SETTING_RW,					TYPE_BYTE,	0,	1,				1,		1,		&amp;drive-&gt;nice1,			NULL,		0);</div><div class='del'>-	__ide_add_setting(drive,	"pio_mode",		SETTING_WRITE,					TYPE_BYTE,	0,	255,				1,		1,		NULL,				set_pio_mode,	0);</div><div class='del'>-	__ide_add_setting(drive,	"unmaskirq",		drive-&gt;no_unmask ? SETTING_READ : SETTING_RW,	TYPE_BYTE,	0,	1,				1,		1,		&amp;drive-&gt;unmask,			NULL,		0);</div><div class='del'>-	__ide_add_setting(drive,	"using_dma",		SETTING_RW,					TYPE_BYTE,	0,	1,				1,		1,		&amp;drive-&gt;using_dma,		set_using_dma,	0);</div><div class='del'>-	__ide_add_setting(drive,	"init_speed",		SETTING_RW,					TYPE_BYTE,	0,	70,				1,		1,		&amp;drive-&gt;init_speed,		NULL,		0);</div><div class='del'>-	__ide_add_setting(drive,	"current_speed",	SETTING_RW,					TYPE_BYTE,	0,	70,				1,		1,		&amp;drive-&gt;current_speed,		set_xfer_rate,	0);</div><div class='del'>-	__ide_add_setting(drive,	"number",		SETTING_RW,					TYPE_BYTE,	0,	3,				1,		1,		&amp;drive-&gt;dn,			NULL,		0);</div><div class='del'>-}</div><div class='add'>+ide_devset_rw(current_speed, xfer_rate);</div><div class='add'>+ide_devset_rw_field(init_speed, init_speed);</div><div class='add'>+ide_devset_rw_flag(nice1, IDE_DFLAG_NICE1);</div><div class='add'>+ide_devset_rw_field(number, dn);</div><div class='add'>+</div><div class='add'>+static const struct ide_proc_devset ide_generic_settings[] = {</div><div class='add'>+	IDE_PROC_DEVSET(current_speed, 0, 70),</div><div class='add'>+	IDE_PROC_DEVSET(init_speed, 0, 70),</div><div class='add'>+	IDE_PROC_DEVSET(io_32bit,  0, 1 + (SUPPORT_VLB_SYNC &lt;&lt; 1)),</div><div class='add'>+	IDE_PROC_DEVSET(keepsettings, 0, 1),</div><div class='add'>+	IDE_PROC_DEVSET(nice1, 0, 1),</div><div class='add'>+	IDE_PROC_DEVSET(number, 0, 3),</div><div class='add'>+	IDE_PROC_DEVSET(pio_mode, 0, 255),</div><div class='add'>+	IDE_PROC_DEVSET(unmaskirq, 0, 1),</div><div class='add'>+	IDE_PROC_DEVSET(using_dma, 0, 1),</div><div class='add'>+	{ 0 },</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> static void proc_ide_settings_warn(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -403,19 +258,32 @@ static void proc_ide_settings_warn(void)</div><div class='ctx'> static int proc_ide_read_settings</div><div class='ctx'> 	(char *page, char **start, off_t off, int count, int *eof, void *data)</div><div class='ctx'> {</div><div class='add'>+	const struct ide_proc_devset *setting, *g, *d;</div><div class='add'>+	const struct ide_devset *ds;</div><div class='ctx'> 	ide_drive_t	*drive = (ide_drive_t *) data;</div><div class='del'>-	ide_settings_t	*setting = (ide_settings_t *) drive-&gt;settings;</div><div class='ctx'> 	char		*out = page;</div><div class='ctx'> 	int		len, rc, mul_factor, div_factor;</div><div class='ctx'> </div><div class='ctx'> 	proc_ide_settings_warn();</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;ide_setting_mtx);</div><div class='add'>+	g = ide_generic_settings;</div><div class='add'>+	d = drive-&gt;settings;</div><div class='ctx'> 	out += sprintf(out, "name\t\t\tvalue\t\tmin\t\tmax\t\tmode\n");</div><div class='ctx'> 	out += sprintf(out, "----\t\t\t-----\t\t---\t\t---\t\t----\n");</div><div class='del'>-	while (setting) {</div><div class='del'>-		mul_factor = setting-&gt;mul_factor;</div><div class='del'>-		div_factor = setting-&gt;div_factor;</div><div class='add'>+	while (g-&gt;name || (d &amp;&amp; d-&gt;name)) {</div><div class='add'>+		/* read settings in the alphabetical order */</div><div class='add'>+		if (g-&gt;name &amp;&amp; d &amp;&amp; d-&gt;name) {</div><div class='add'>+			if (strcmp(d-&gt;name, g-&gt;name) &lt; 0)</div><div class='add'>+				setting = d++;</div><div class='add'>+			else</div><div class='add'>+				setting = g++;</div><div class='add'>+		} else if (d &amp;&amp; d-&gt;name) {</div><div class='add'>+			setting = d++;</div><div class='add'>+		} else</div><div class='add'>+			setting = g++;</div><div class='add'>+		mul_factor = setting-&gt;mulf ? setting-&gt;mulf(drive) : 1;</div><div class='add'>+		div_factor = setting-&gt;divf ? setting-&gt;divf(drive) : 1;</div><div class='ctx'> 		out += sprintf(out, "%-24s", setting-&gt;name);</div><div class='ctx'> 		rc = ide_read_setting(drive, setting);</div><div class='ctx'> 		if (rc &gt;= 0)</div><div class='hunk'>@@ -423,12 +291,12 @@ static int proc_ide_read_settings</div><div class='ctx'> 		else</div><div class='ctx'> 			out += sprintf(out, "%-16s", "write-only");</div><div class='ctx'> 		out += sprintf(out, "%-16d%-16d", (setting-&gt;min * mul_factor + div_factor - 1) / div_factor, setting-&gt;max * mul_factor / div_factor);</div><div class='del'>-		if (setting-&gt;rw &amp; SETTING_READ)</div><div class='add'>+		ds = setting-&gt;setting;</div><div class='add'>+		if (ds-&gt;get)</div><div class='ctx'> 			out += sprintf(out, "r");</div><div class='del'>-		if (setting-&gt;rw &amp; SETTING_WRITE)</div><div class='add'>+		if (ds-&gt;set)</div><div class='ctx'> 			out += sprintf(out, "w");</div><div class='ctx'> 		out += sprintf(out, "\n");</div><div class='del'>-		setting = setting-&gt;next;</div><div class='ctx'> 	}</div><div class='ctx'> 	len = out - page;</div><div class='ctx'> 	mutex_unlock(&amp;ide_setting_mtx);</div><div class='hunk'>@@ -442,9 +310,10 @@ static int proc_ide_write_settings(struct file *file, const char __user *buffer,</div><div class='ctx'> {</div><div class='ctx'> 	ide_drive_t	*drive = (ide_drive_t *) data;</div><div class='ctx'> 	char		name[MAX_LEN + 1];</div><div class='del'>-	int		for_real = 0;</div><div class='add'>+	int		for_real = 0, mul_factor, div_factor;</div><div class='ctx'> 	unsigned long	n;</div><div class='del'>-	ide_settings_t	*setting;</div><div class='add'>+</div><div class='add'>+	const struct ide_proc_devset *setting;</div><div class='ctx'> 	char *buf, *s;</div><div class='ctx'> </div><div class='ctx'> 	if (!capable(CAP_SYS_ADMIN))</div><div class='hunk'>@@ -512,13 +381,21 @@ static int proc_ide_write_settings(struct file *file, const char __user *buffer,</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			mutex_lock(&amp;ide_setting_mtx);</div><div class='del'>-			setting = ide_find_setting_by_name(drive, name);</div><div class='add'>+			/* generic settings first, then driver specific ones */</div><div class='add'>+			setting = ide_find_setting(ide_generic_settings, name);</div><div class='ctx'> 			if (!setting) {</div><div class='del'>-				mutex_unlock(&amp;ide_setting_mtx);</div><div class='del'>-				goto parse_error;</div><div class='add'>+				if (drive-&gt;settings)</div><div class='add'>+					setting = ide_find_setting(drive-&gt;settings, name);</div><div class='add'>+				if (!setting) {</div><div class='add'>+					mutex_unlock(&amp;ide_setting_mtx);</div><div class='add'>+					goto parse_error;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+			if (for_real) {</div><div class='add'>+				mul_factor = setting-&gt;mulf ? setting-&gt;mulf(drive) : 1;</div><div class='add'>+				div_factor = setting-&gt;divf ? setting-&gt;divf(drive) : 1;</div><div class='add'>+				ide_write_setting(drive, setting, val * div_factor / mul_factor);</div><div class='ctx'> 			}</div><div class='del'>-			if (for_real)</div><div class='del'>-				ide_write_setting(drive, setting, val * setting-&gt;div_factor / setting-&gt;mul_factor);</div><div class='ctx'> 			mutex_unlock(&amp;ide_setting_mtx);</div><div class='ctx'> 		}</div><div class='ctx'> 	} while (!for_real++);</div><div class='hunk'>@@ -561,11 +438,10 @@ static int proc_ide_read_dmodel</div><div class='ctx'> 	(char *page, char **start, off_t off, int count, int *eof, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	ide_drive_t	*drive = (ide_drive_t *) data;</div><div class='del'>-	struct hd_driveid *id = drive-&gt;id;</div><div class='add'>+	char		*m = (char *)&amp;drive-&gt;id[ATA_ID_PROD];</div><div class='ctx'> 	int		len;</div><div class='ctx'> </div><div class='del'>-	len = sprintf(page, "%.40s\n",</div><div class='del'>-		(id &amp;&amp; id-&gt;model[0]) ? (char *)id-&gt;model : "(none)");</div><div class='add'>+	len = sprintf(page, "%.40s\n", m[0] ? m : "(none)");</div><div class='ctx'> 	PROC_IDE_READ_RETURN(page, start, off, count, eof, len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -690,6 +566,10 @@ static void ide_remove_proc_entries(struct proc_dir_entry *dir, ide_proc_entry_t</div><div class='ctx'> </div><div class='ctx'> void ide_proc_register_driver(ide_drive_t *drive, ide_driver_t *driver)</div><div class='ctx'> {</div><div class='add'>+	mutex_lock(&amp;ide_setting_mtx);</div><div class='add'>+	drive-&gt;settings = driver-&gt;settings;</div><div class='add'>+	mutex_unlock(&amp;ide_setting_mtx);</div><div class='add'>+</div><div class='ctx'> 	ide_add_proc_entries(drive-&gt;proc, driver-&gt;proc, drive);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -726,7 +606,7 @@ void ide_proc_unregister_driver(ide_drive_t *drive, ide_driver_t *driver)</div><div class='ctx'> 	 * OTOH both ide_{read,write}_setting are only ever used under</div><div class='ctx'> 	 * ide_setting_mtx.</div><div class='ctx'> 	 */</div><div class='del'>-	auto_remove_settings(drive);</div><div class='add'>+	drive-&gt;settings = NULL;</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;ide_lock, flags);</div><div class='ctx'> 	mutex_unlock(&amp;ide_setting_mtx);</div><div class='ctx'> }</div><div class='hunk'>@@ -742,9 +622,7 @@ void ide_proc_port_register_devices(ide_hwif_t *hwif)</div><div class='ctx'> 	for (d = 0; d &lt; MAX_DRIVES; d++) {</div><div class='ctx'> 		ide_drive_t *drive = &amp;hwif-&gt;drives[d];</div><div class='ctx'> </div><div class='del'>-		if (!drive-&gt;present)</div><div class='del'>-			continue;</div><div class='del'>-		if (drive-&gt;proc)</div><div class='add'>+		if ((drive-&gt;dev_flags &amp; IDE_DFLAG_PRESENT) == 0 || drive-&gt;proc)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		drive-&gt;proc = proc_mkdir(drive-&gt;name, parent);</div><div class='head'>diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c<br/>index 3833189144ed..d879c7797cde 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/ide-tape.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ide/ide-tape.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/ide-tape.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/ide-tape.c</a></div><div class='hunk'>@@ -15,6 +15,8 @@</div><div class='ctx'>  * Documentation/ide/ChangeLog.ide-tape.1995-2002</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#define DRV_NAME "ide-tape"</div><div class='add'>+</div><div class='ctx'> #define IDETAPE_VERSION "1.20"</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -54,8 +56,6 @@ enum {</div><div class='ctx'> 	DBG_CHRDEV =		(1 &lt;&lt; 2),</div><div class='ctx'> 	/* all remaining procedures */</div><div class='ctx'> 	DBG_PROCS =		(1 &lt;&lt; 3),</div><div class='del'>-	/* buffer alloc info (pc_stack &amp; rq_stack) */</div><div class='del'>-	DBG_PCRQ_STACK =	(1 &lt;&lt; 4),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* define to see debug info */</div><div class='hunk'>@@ -81,26 +81,6 @@ enum {</div><div class='ctx'> #define IDETAPE_MAX_PC_RETRIES		3</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * With each packet command, we allocate a buffer of IDETAPE_PC_BUFFER_SIZE</div><div class='del'>- * bytes. This is used for several packet commands (Not for READ/WRITE commands)</div><div class='del'>- */</div><div class='del'>-#define IDETAPE_PC_BUFFER_SIZE		256</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	In various places in the driver, we need to allocate storage</div><div class='del'>- *	for packet commands and requests, which will remain valid while</div><div class='del'>- *	we leave the driver to wait for an interrupt or a timeout event.</div><div class='del'>- */</div><div class='del'>-#define IDETAPE_PC_STACK		(10 + IDETAPE_MAX_PC_RETRIES)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Some drives (for example, Seagate STT3401A Travan) require a very long</div><div class='del'>- * timeout, because they don't return an interrupt or clear their busy bit</div><div class='del'>- * until after the command completes (even retension commands).</div><div class='del'>- */</div><div class='del'>-#define IDETAPE_WAIT_CMD		(900*HZ)</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * The following parameter is used to select the point in the internal tape fifo</div><div class='ctx'>  * in which we will start to refill the buffer. Decreasing the following</div><div class='ctx'>  * parameter will improve the system's latency and interactive response, while</div><div class='hunk'>@@ -172,20 +152,6 @@ struct idetape_bh {</div><div class='ctx'> #define IDETAPE_LU_RETENSION_MASK	2</div><div class='ctx'> #define IDETAPE_LU_EOT_MASK		4</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Special requests for our block device strategy routine.</div><div class='del'>- *</div><div class='del'>- * In order to service a character device command, we add special requests to</div><div class='del'>- * the tail of our block device request queue and wait for their completion.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	REQ_IDETAPE_PC1		= (1 &lt;&lt; 0), /* packet command (first stage) */</div><div class='del'>-	REQ_IDETAPE_PC2		= (1 &lt;&lt; 1), /* packet command (second stage) */</div><div class='del'>-	REQ_IDETAPE_READ	= (1 &lt;&lt; 2),</div><div class='del'>-	REQ_IDETAPE_WRITE	= (1 &lt;&lt; 3),</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /* Error codes returned in rq-&gt;errors to the higher part of the driver. */</div><div class='ctx'> #define IDETAPE_ERROR_GENERAL		101</div><div class='ctx'> #define IDETAPE_ERROR_FILEMARK		102</div><div class='hunk'>@@ -206,31 +172,15 @@ typedef struct ide_tape_obj {</div><div class='ctx'> 	struct kref	kref;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 *	Since a typical character device operation requires more</div><div class='del'>-	 *	than one packet command, we provide here enough memory</div><div class='del'>-	 *	for the maximum of interconnected packet commands.</div><div class='del'>-	 *	The packet commands are stored in the circular array pc_stack.</div><div class='del'>-	 *	pc_stack_index points to the last used entry, and warps around</div><div class='del'>-	 *	to the start when we get to the last array entry.</div><div class='del'>-	 *</div><div class='del'>-	 *	pc points to the current processed packet command.</div><div class='del'>-	 *</div><div class='ctx'> 	 *	failed_pc points to the last failed packet command, or contains</div><div class='ctx'> 	 *	NULL if we do not need to retry any packet command. This is</div><div class='ctx'> 	 *	required since an additional packet command is needed before the</div><div class='ctx'> 	 *	retry, to get detailed information on what went wrong.</div><div class='ctx'> 	 */</div><div class='del'>-	/* Current packet command */</div><div class='del'>-	struct ide_atapi_pc *pc;</div><div class='ctx'> 	/* Last failed packet command */</div><div class='ctx'> 	struct ide_atapi_pc *failed_pc;</div><div class='del'>-	/* Packet command stack */</div><div class='del'>-	struct ide_atapi_pc pc_stack[IDETAPE_PC_STACK];</div><div class='del'>-	/* Next free packet command storage space */</div><div class='del'>-	int pc_stack_index;</div><div class='del'>-	struct request rq_stack[IDETAPE_PC_STACK];</div><div class='del'>-	/* We implement a circular array */</div><div class='del'>-	int rq_stack_index;</div><div class='add'>+	/* used by REQ_IDETAPE_{READ,WRITE} requests */</div><div class='add'>+	struct ide_atapi_pc queued_pc;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * DSC polling variables.</div><div class='hunk'>@@ -317,11 +267,6 @@ static DEFINE_MUTEX(idetape_ref_mutex);</div><div class='ctx'> </div><div class='ctx'> static struct class *idetape_sysfs_class;</div><div class='ctx'> </div><div class='del'>-#define to_ide_tape(obj) container_of(obj, struct ide_tape_obj, kref)</div><div class='del'>-</div><div class='del'>-#define ide_tape_g(disk) \</div><div class='del'>-	container_of((disk)-&gt;private_data, struct ide_tape_obj, driver)</div><div class='del'>-</div><div class='ctx'> static void ide_tape_release(struct kref *);</div><div class='ctx'> </div><div class='ctx'> static struct ide_tape_obj *ide_tape_get(struct gendisk *disk)</div><div class='hunk'>@@ -329,7 +274,7 @@ static struct ide_tape_obj *ide_tape_get(struct gendisk *disk)</div><div class='ctx'> 	struct ide_tape_obj *tape = NULL;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;idetape_ref_mutex);</div><div class='del'>-	tape = ide_tape_g(disk);</div><div class='add'>+	tape = ide_drv_g(disk, ide_tape_obj);</div><div class='ctx'> 	if (tape) {</div><div class='ctx'> 		if (ide_device_get(tape-&gt;drive))</div><div class='ctx'> 			tape = NULL;</div><div class='hunk'>@@ -356,8 +301,6 @@ static void ide_tape_put(struct ide_tape_obj *tape)</div><div class='ctx'>  */</div><div class='ctx'> static struct ide_tape_obj *idetape_devs[MAX_HWIFS * MAX_DRIVES];</div><div class='ctx'> </div><div class='del'>-#define ide_tape_f(file) ((file)-&gt;private_data)</div><div class='del'>-</div><div class='ctx'> static struct ide_tape_obj *ide_tape_chrdev_get(unsigned int i)</div><div class='ctx'> {</div><div class='ctx'> 	struct ide_tape_obj *tape = NULL;</div><div class='hunk'>@@ -451,47 +394,6 @@ static void idetape_update_buffers(ide_drive_t *drive, struct ide_atapi_pc *pc)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- *	idetape_next_pc_storage returns a pointer to a place in which we can</div><div class='del'>- *	safely store a packet command, even though we intend to leave the</div><div class='del'>- *	driver. A storage space for a maximum of IDETAPE_PC_STACK packet</div><div class='del'>- *	commands is allocated at initialization time.</div><div class='del'>- */</div><div class='del'>-static struct ide_atapi_pc *idetape_next_pc_storage(ide_drive_t *drive)</div><div class='del'>-{</div><div class='del'>-	idetape_tape_t *tape = drive-&gt;driver_data;</div><div class='del'>-</div><div class='del'>-	debug_log(DBG_PCRQ_STACK, "pc_stack_index=%d\n", tape-&gt;pc_stack_index);</div><div class='del'>-</div><div class='del'>-	if (tape-&gt;pc_stack_index == IDETAPE_PC_STACK)</div><div class='del'>-		tape-&gt;pc_stack_index = 0;</div><div class='del'>-	return (&amp;tape-&gt;pc_stack[tape-&gt;pc_stack_index++]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	idetape_next_rq_storage is used along with idetape_next_pc_storage.</div><div class='del'>- *	Since we queue packet commands in the request queue, we need to</div><div class='del'>- *	allocate a request, along with the allocation of a packet command.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/**************************************************************</div><div class='del'>- *                                                            *</div><div class='del'>- *  This should get fixed to use kmalloc(.., GFP_ATOMIC)      *</div><div class='del'>- *  followed later on by kfree().   -ml                       *</div><div class='del'>- *                                                            *</div><div class='del'>- **************************************************************/</div><div class='del'>-</div><div class='del'>-static struct request *idetape_next_rq_storage(ide_drive_t *drive)</div><div class='del'>-{</div><div class='del'>-	idetape_tape_t *tape = drive-&gt;driver_data;</div><div class='del'>-</div><div class='del'>-	debug_log(DBG_PCRQ_STACK, "rq_stack_index=%d\n", tape-&gt;rq_stack_index);</div><div class='del'>-</div><div class='del'>-	if (tape-&gt;rq_stack_index == IDETAPE_PC_STACK)</div><div class='del'>-		tape-&gt;rq_stack_index = 0;</div><div class='del'>-	return (&amp;tape-&gt;rq_stack[tape-&gt;rq_stack_index++]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * called on each failed packet command retry to analyze the request sense. We</div><div class='ctx'>  * currently do not utilize this information.</div><div class='ctx'>  */</div><div class='hunk'>@@ -606,14 +508,19 @@ static int idetape_end_request(ide_drive_t *drive, int uptodate, int nr_sects)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ide_tape_callback(ide_drive_t *drive)</div><div class='add'>+static void ide_tape_handle_dsc(ide_drive_t *);</div><div class='add'>+</div><div class='add'>+static void ide_tape_callback(ide_drive_t *drive, int dsc)</div><div class='ctx'> {</div><div class='ctx'> 	idetape_tape_t *tape = drive-&gt;driver_data;</div><div class='del'>-	struct ide_atapi_pc *pc = tape-&gt;pc;</div><div class='add'>+	struct ide_atapi_pc *pc = drive-&gt;pc;</div><div class='ctx'> 	int uptodate = pc-&gt;error ? 0 : 1;</div><div class='ctx'> </div><div class='ctx'> 	debug_log(DBG_PROCS, "Enter %s\n", __func__);</div><div class='ctx'> </div><div class='add'>+	if (dsc)</div><div class='add'>+		ide_tape_handle_dsc(drive);</div><div class='add'>+</div><div class='ctx'> 	if (tape-&gt;failed_pc == pc)</div><div class='ctx'> 		tape-&gt;failed_pc = NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -642,7 +549,7 @@ static void ide_tape_callback(ide_drive_t *drive)</div><div class='ctx'> 		if (pc-&gt;error)</div><div class='ctx'> 			uptodate = pc-&gt;error;</div><div class='ctx'> 	} else if (pc-&gt;c[0] == READ_POSITION &amp;&amp; uptodate) {</div><div class='del'>-		u8 *readpos = tape-&gt;pc-&gt;buf;</div><div class='add'>+		u8 *readpos = pc-&gt;buf;</div><div class='ctx'> </div><div class='ctx'> 		debug_log(DBG_SENSE, "BOP - %s\n",</div><div class='ctx'> 				(readpos[0] &amp; 0x80) ? "Yes" : "No");</div><div class='hunk'>@@ -667,79 +574,6 @@ static void ide_tape_callback(ide_drive_t *drive)</div><div class='ctx'> 	idetape_end_request(drive, uptodate, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void idetape_init_pc(struct ide_atapi_pc *pc)</div><div class='del'>-{</div><div class='del'>-	memset(pc-&gt;c, 0, 12);</div><div class='del'>-	pc-&gt;retries = 0;</div><div class='del'>-	pc-&gt;flags = 0;</div><div class='del'>-	pc-&gt;req_xfer = 0;</div><div class='del'>-	pc-&gt;buf = pc-&gt;pc_buf;</div><div class='del'>-	pc-&gt;buf_size = IDETAPE_PC_BUFFER_SIZE;</div><div class='del'>-	pc-&gt;bh = NULL;</div><div class='del'>-	pc-&gt;b_data = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void idetape_create_request_sense_cmd(struct ide_atapi_pc *pc)</div><div class='del'>-{</div><div class='del'>-	idetape_init_pc(pc);</div><div class='del'>-	pc-&gt;c[0] = REQUEST_SENSE;</div><div class='del'>-	pc-&gt;c[4] = 20;</div><div class='del'>-	pc-&gt;req_xfer = 20;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void idetape_init_rq(struct request *rq, u8 cmd)</div><div class='del'>-{</div><div class='del'>-	blk_rq_init(NULL, rq);</div><div class='del'>-	rq-&gt;cmd_type = REQ_TYPE_SPECIAL;</div><div class='del'>-	rq-&gt;cmd[13] = cmd;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Generate a new packet command request in front of the request queue, before</div><div class='del'>- * the current request, so that it will be processed immediately, on the next</div><div class='del'>- * pass through the driver. The function below is called from the request</div><div class='del'>- * handling part of the driver (the "bottom" part). Safe storage for the request</div><div class='del'>- * should be allocated with ide_tape_next_{pc,rq}_storage() prior to that.</div><div class='del'>- *</div><div class='del'>- * Memory for those requests is pre-allocated at initialization time, and is</div><div class='del'>- * limited to IDETAPE_PC_STACK requests. We assume that we have enough space for</div><div class='del'>- * the maximum possible number of inter-dependent packet commands.</div><div class='del'>- *</div><div class='del'>- * The higher level of the driver - The ioctl handler and the character device</div><div class='del'>- * handling functions should queue request to the lower level part and wait for</div><div class='del'>- * their completion using idetape_queue_pc_tail or idetape_queue_rw_tail.</div><div class='del'>- */</div><div class='del'>-static void idetape_queue_pc_head(ide_drive_t *drive, struct ide_atapi_pc *pc,</div><div class='del'>-				  struct request *rq)</div><div class='del'>-{</div><div class='del'>-	struct ide_tape_obj *tape = drive-&gt;driver_data;</div><div class='del'>-</div><div class='del'>-	idetape_init_rq(rq, REQ_IDETAPE_PC1);</div><div class='del'>-	rq-&gt;cmd_flags |= REQ_PREEMPT;</div><div class='del'>-	rq-&gt;buffer = (char *) pc;</div><div class='del'>-	rq-&gt;rq_disk = tape-&gt;disk;</div><div class='del'>-	memcpy(rq-&gt;cmd, pc-&gt;c, 12);</div><div class='del'>-	ide_do_drive_cmd(drive, rq);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	idetape_retry_pc is called when an error was detected during the</div><div class='del'>- *	last packet command. We queue a request sense packet command in</div><div class='del'>- *	the head of the request list.</div><div class='del'>- */</div><div class='del'>-static void idetape_retry_pc(ide_drive_t *drive)</div><div class='del'>-{</div><div class='del'>-	struct ide_atapi_pc *pc;</div><div class='del'>-	struct request *rq;</div><div class='del'>-</div><div class='del'>-	(void)ide_read_error(drive);</div><div class='del'>-	pc = idetape_next_pc_storage(drive);</div><div class='del'>-	rq = idetape_next_rq_storage(drive);</div><div class='del'>-	idetape_create_request_sense_cmd(pc);</div><div class='del'>-	set_bit(IDE_AFLAG_IGNORE_DSC, &amp;drive-&gt;atapi_flags);</div><div class='del'>-	idetape_queue_pc_head(drive, pc, rq);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Postpone the current request so that ide.c will be able to service requests</div><div class='ctx'>  * from another device on the same hwgroup while we are polling for DSC.</div><div class='hunk'>@@ -766,44 +600,30 @@ static void ide_tape_handle_dsc(ide_drive_t *drive)</div><div class='ctx'> 	idetape_postpone_request(drive);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ide_tape_io_buffers(ide_drive_t *drive, struct ide_atapi_pc *pc,</div><div class='add'>+static int ide_tape_io_buffers(ide_drive_t *drive, struct ide_atapi_pc *pc,</div><div class='ctx'> 				unsigned int bcount, int write)</div><div class='ctx'> {</div><div class='ctx'> 	if (write)</div><div class='ctx'> 		idetape_output_buffers(drive, pc, bcount);</div><div class='ctx'> 	else</div><div class='ctx'> 		idetape_input_buffers(drive, pc, bcount);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This is the usual interrupt handler which will be called during a packet</div><div class='del'>- * command. We will transfer some of the data (as requested by the drive) and</div><div class='del'>- * will re-point interrupt handler to us. When data transfer is finished, we</div><div class='del'>- * will act according to the algorithm described before</div><div class='del'>- * idetape_issue_pc.</div><div class='del'>- */</div><div class='del'>-static ide_startstop_t idetape_pc_intr(ide_drive_t *drive)</div><div class='del'>-{</div><div class='del'>-	idetape_tape_t *tape = drive-&gt;driver_data;</div><div class='ctx'> </div><div class='del'>-	return ide_pc_intr(drive, tape-&gt;pc, idetape_pc_intr, IDETAPE_WAIT_CMD,</div><div class='del'>-			   NULL, idetape_update_buffers, idetape_retry_pc,</div><div class='del'>-			   ide_tape_handle_dsc, ide_tape_io_buffers);</div><div class='add'>+	return bcount;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Packet Command Interface</div><div class='ctx'>  *</div><div class='del'>- * The current Packet Command is available in tape-&gt;pc, and will not change</div><div class='add'>+ * The current Packet Command is available in drive-&gt;pc, and will not change</div><div class='ctx'>  * until we finish handling it. Each packet command is associated with a</div><div class='ctx'>  * callback function that will be called when the command is finished.</div><div class='ctx'>  *</div><div class='ctx'>  * The handling will be done in three stages:</div><div class='ctx'>  *</div><div class='ctx'>  * 1. idetape_issue_pc will send the packet command to the drive, and will set</div><div class='del'>- * the interrupt handler to idetape_pc_intr.</div><div class='add'>+ * the interrupt handler to ide_pc_intr.</div><div class='ctx'>  *</div><div class='del'>- * 2. On each interrupt, idetape_pc_intr will be called. This step will be</div><div class='add'>+ * 2. On each interrupt, ide_pc_intr will be called. This step will be</div><div class='ctx'>  * repeated until the device signals us that no more interrupts will be issued.</div><div class='ctx'>  *</div><div class='ctx'>  * 3. ATAPI Tape media access commands have immediate status with a delayed</div><div class='hunk'>@@ -827,20 +647,13 @@ static ide_startstop_t idetape_pc_intr(ide_drive_t *drive)</div><div class='ctx'>  * again, the callback function will be called and then we will handle the next</div><div class='ctx'>  * request.</div><div class='ctx'>  */</div><div class='del'>-static ide_startstop_t idetape_transfer_pc(ide_drive_t *drive)</div><div class='del'>-{</div><div class='del'>-	idetape_tape_t *tape = drive-&gt;driver_data;</div><div class='del'>-</div><div class='del'>-	return ide_transfer_pc(drive, tape-&gt;pc, idetape_pc_intr,</div><div class='del'>-			       IDETAPE_WAIT_CMD, NULL);</div><div class='del'>-}</div><div class='ctx'> </div><div class='ctx'> static ide_startstop_t idetape_issue_pc(ide_drive_t *drive,</div><div class='ctx'> 		struct ide_atapi_pc *pc)</div><div class='ctx'> {</div><div class='ctx'> 	idetape_tape_t *tape = drive-&gt;driver_data;</div><div class='ctx'> </div><div class='del'>-	if (tape-&gt;pc-&gt;c[0] == REQUEST_SENSE &amp;&amp;</div><div class='add'>+	if (drive-&gt;pc-&gt;c[0] == REQUEST_SENSE &amp;&amp;</div><div class='ctx'> 	    pc-&gt;c[0] == REQUEST_SENSE) {</div><div class='ctx'> 		printk(KERN_ERR "ide-tape: possible ide-tape.c bug - "</div><div class='ctx'> 			"Two request sense in serial were issued\n");</div><div class='hunk'>@@ -848,8 +661,9 @@ static ide_startstop_t idetape_issue_pc(ide_drive_t *drive,</div><div class='ctx'> </div><div class='ctx'> 	if (tape-&gt;failed_pc == NULL &amp;&amp; pc-&gt;c[0] != REQUEST_SENSE)</div><div class='ctx'> 		tape-&gt;failed_pc = pc;</div><div class='add'>+</div><div class='ctx'> 	/* Set the current packet command */</div><div class='del'>-	tape-&gt;pc = pc;</div><div class='add'>+	drive-&gt;pc = pc;</div><div class='ctx'> </div><div class='ctx'> 	if (pc-&gt;retries &gt; IDETAPE_MAX_PC_RETRIES ||</div><div class='ctx'> 		(pc-&gt;flags &amp; PC_FLAG_ABORT)) {</div><div class='hunk'>@@ -873,21 +687,20 @@ static ide_startstop_t idetape_issue_pc(ide_drive_t *drive,</div><div class='ctx'> 			pc-&gt;error = IDETAPE_ERROR_GENERAL;</div><div class='ctx'> 		}</div><div class='ctx'> 		tape-&gt;failed_pc = NULL;</div><div class='del'>-		drive-&gt;pc_callback(drive);</div><div class='add'>+		drive-&gt;pc_callback(drive, 0);</div><div class='ctx'> 		return ide_stopped;</div><div class='ctx'> 	}</div><div class='ctx'> 	debug_log(DBG_SENSE, "Retry #%d, cmd = %02X\n", pc-&gt;retries, pc-&gt;c[0]);</div><div class='ctx'> </div><div class='ctx'> 	pc-&gt;retries++;</div><div class='ctx'> </div><div class='del'>-	return ide_issue_pc(drive, pc, idetape_transfer_pc,</div><div class='del'>-			    IDETAPE_WAIT_CMD, NULL);</div><div class='add'>+	return ide_issue_pc(drive, WAIT_TAPE_CMD, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* A mode sense command is used to "sense" tape parameters. */</div><div class='ctx'> static void idetape_create_mode_sense_cmd(struct ide_atapi_pc *pc, u8 page_code)</div><div class='ctx'> {</div><div class='del'>-	idetape_init_pc(pc);</div><div class='add'>+	ide_init_pc(pc);</div><div class='ctx'> 	pc-&gt;c[0] = MODE_SENSE;</div><div class='ctx'> 	if (page_code != IDETAPE_BLOCK_DESCRIPTOR)</div><div class='ctx'> 		/* DBD = 1 - Don't return block descriptors */</div><div class='hunk'>@@ -915,19 +728,19 @@ static ide_startstop_t idetape_media_access_finished(ide_drive_t *drive)</div><div class='ctx'> {</div><div class='ctx'> 	ide_hwif_t *hwif = drive-&gt;hwif;</div><div class='ctx'> 	idetape_tape_t *tape = drive-&gt;driver_data;</div><div class='del'>-	struct ide_atapi_pc *pc = tape-&gt;pc;</div><div class='add'>+	struct ide_atapi_pc *pc = drive-&gt;pc;</div><div class='ctx'> 	u8 stat;</div><div class='ctx'> </div><div class='ctx'> 	stat = hwif-&gt;tp_ops-&gt;read_status(hwif);</div><div class='ctx'> </div><div class='del'>-	if (stat &amp; SEEK_STAT) {</div><div class='del'>-		if (stat &amp; ERR_STAT) {</div><div class='add'>+	if (stat &amp; ATA_DSC) {</div><div class='add'>+		if (stat &amp; ATA_ERR) {</div><div class='ctx'> 			/* Error detected */</div><div class='ctx'> 			if (pc-&gt;c[0] != TEST_UNIT_READY)</div><div class='ctx'> 				printk(KERN_ERR "ide-tape: %s: I/O error, ",</div><div class='ctx'> 						tape-&gt;name);</div><div class='ctx'> 			/* Retry operation */</div><div class='del'>-			idetape_retry_pc(drive);</div><div class='add'>+			ide_retry_pc(drive, tape-&gt;disk);</div><div class='ctx'> 			return ide_stopped;</div><div class='ctx'> 		}</div><div class='ctx'> 		pc-&gt;error = 0;</div><div class='hunk'>@@ -935,7 +748,7 @@ static ide_startstop_t idetape_media_access_finished(ide_drive_t *drive)</div><div class='ctx'> 		pc-&gt;error = IDETAPE_ERROR_GENERAL;</div><div class='ctx'> 		tape-&gt;failed_pc = NULL;</div><div class='ctx'> 	}</div><div class='del'>-	drive-&gt;pc_callback(drive);</div><div class='add'>+	drive-&gt;pc_callback(drive, 0);</div><div class='ctx'> 	return ide_stopped;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -946,7 +759,7 @@ static void ide_tape_create_rw_cmd(idetape_tape_t *tape,</div><div class='ctx'> 	struct idetape_bh *bh = (struct idetape_bh *)rq-&gt;special;</div><div class='ctx'> 	unsigned int length = rq-&gt;current_nr_sectors;</div><div class='ctx'> </div><div class='del'>-	idetape_init_pc(pc);</div><div class='add'>+	ide_init_pc(pc);</div><div class='ctx'> 	put_unaligned(cpu_to_be32(length), (unsigned int *) &amp;pc-&gt;c[1]);</div><div class='ctx'> 	pc-&gt;c[1] = 1;</div><div class='ctx'> 	pc-&gt;bh = bh;</div><div class='hunk'>@@ -978,9 +791,10 @@ static ide_startstop_t idetape_do_request(ide_drive_t *drive,</div><div class='ctx'> 	struct request *postponed_rq = tape-&gt;postponed_rq;</div><div class='ctx'> 	u8 stat;</div><div class='ctx'> </div><div class='del'>-	debug_log(DBG_SENSE, "sector: %ld, nr_sectors: %ld,"</div><div class='del'>-			" current_nr_sectors: %d\n",</div><div class='del'>-			rq-&gt;sector, rq-&gt;nr_sectors, rq-&gt;current_nr_sectors);</div><div class='add'>+	debug_log(DBG_SENSE, "sector: %llu, nr_sectors: %lu,"</div><div class='add'>+			" current_nr_sectors: %u\n",</div><div class='add'>+			(unsigned long long)rq-&gt;sector, rq-&gt;nr_sectors,</div><div class='add'>+			rq-&gt;current_nr_sectors);</div><div class='ctx'> </div><div class='ctx'> 	if (!blk_special_request(rq)) {</div><div class='ctx'> 		/* We do not support buffer cache originated requests. */</div><div class='hunk'>@@ -991,7 +805,7 @@ static ide_startstop_t idetape_do_request(ide_drive_t *drive,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Retry a failed packet command */</div><div class='del'>-	if (tape-&gt;failed_pc &amp;&amp; tape-&gt;pc-&gt;c[0] == REQUEST_SENSE) {</div><div class='add'>+	if (tape-&gt;failed_pc &amp;&amp; drive-&gt;pc-&gt;c[0] == REQUEST_SENSE) {</div><div class='ctx'> 		pc = tape-&gt;failed_pc;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1012,16 +826,17 @@ static ide_startstop_t idetape_do_request(ide_drive_t *drive,</div><div class='ctx'> 	 */</div><div class='ctx'> 	stat = hwif-&gt;tp_ops-&gt;read_status(hwif);</div><div class='ctx'> </div><div class='del'>-	if (!drive-&gt;dsc_overlap &amp;&amp; !(rq-&gt;cmd[13] &amp; REQ_IDETAPE_PC2))</div><div class='add'>+	if ((drive-&gt;dev_flags &amp; IDE_DFLAG_DSC_OVERLAP) == 0 &amp;&amp;</div><div class='add'>+	    (rq-&gt;cmd[13] &amp; REQ_IDETAPE_PC2) == 0)</div><div class='ctx'> 		set_bit(IDE_AFLAG_IGNORE_DSC, &amp;drive-&gt;atapi_flags);</div><div class='ctx'> </div><div class='del'>-	if (drive-&gt;post_reset == 1) {</div><div class='add'>+	if (drive-&gt;dev_flags &amp; IDE_DFLAG_POST_RESET) {</div><div class='ctx'> 		set_bit(IDE_AFLAG_IGNORE_DSC, &amp;drive-&gt;atapi_flags);</div><div class='del'>-		drive-&gt;post_reset = 0;</div><div class='add'>+		drive-&gt;dev_flags &amp;= ~IDE_DFLAG_POST_RESET;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!test_and_clear_bit(IDE_AFLAG_IGNORE_DSC, &amp;drive-&gt;atapi_flags) &amp;&amp;</div><div class='del'>-	    (stat &amp; SEEK_STAT) == 0) {</div><div class='add'>+	    (stat &amp; ATA_DSC) == 0) {</div><div class='ctx'> 		if (postponed_rq == NULL) {</div><div class='ctx'> 			tape-&gt;dsc_polling_start = jiffies;</div><div class='ctx'> 			tape-&gt;dsc_poll_freq = tape-&gt;best_dsc_rw_freq;</div><div class='hunk'>@@ -1043,12 +858,12 @@ static ide_startstop_t idetape_do_request(ide_drive_t *drive,</div><div class='ctx'> 		return ide_stopped;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (rq-&gt;cmd[13] &amp; REQ_IDETAPE_READ) {</div><div class='del'>-		pc = idetape_next_pc_storage(drive);</div><div class='add'>+		pc = &amp;tape-&gt;queued_pc;</div><div class='ctx'> 		ide_tape_create_rw_cmd(tape, pc, rq, READ_6);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (rq-&gt;cmd[13] &amp; REQ_IDETAPE_WRITE) {</div><div class='del'>-		pc = idetape_next_pc_storage(drive);</div><div class='add'>+		pc = &amp;tape-&gt;queued_pc;</div><div class='ctx'> 		ide_tape_create_rw_cmd(tape, pc, rq, WRITE_6);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1235,77 +1050,30 @@ static void idetape_init_merge_buffer(idetape_tape_t *tape)</div><div class='ctx'> static void idetape_create_write_filemark_cmd(ide_drive_t *drive,</div><div class='ctx'> 		struct ide_atapi_pc *pc, int write_filemark)</div><div class='ctx'> {</div><div class='del'>-	idetape_init_pc(pc);</div><div class='add'>+	ide_init_pc(pc);</div><div class='ctx'> 	pc-&gt;c[0] = WRITE_FILEMARKS;</div><div class='ctx'> 	pc-&gt;c[4] = write_filemark;</div><div class='ctx'> 	pc-&gt;flags |= PC_FLAG_WAIT_FOR_DSC;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void idetape_create_test_unit_ready_cmd(struct ide_atapi_pc *pc)</div><div class='del'>-{</div><div class='del'>-	idetape_init_pc(pc);</div><div class='del'>-	pc-&gt;c[0] = TEST_UNIT_READY;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * We add a special packet command request to the tail of the request queue, and</div><div class='del'>- * wait for it to be serviced. This is not to be called from within the request</div><div class='del'>- * handling part of the driver! We allocate here data on the stack and it is</div><div class='del'>- * valid until the request is finished. This is not the case for the bottom part</div><div class='del'>- * of the driver, where we are always leaving the functions to wait for an</div><div class='del'>- * interrupt or a timer event.</div><div class='del'>- *</div><div class='del'>- * From the bottom part of the driver, we should allocate safe memory using</div><div class='del'>- * idetape_next_pc_storage() and ide_tape_next_rq_storage(), and add the request</div><div class='del'>- * to the request list without waiting for it to be serviced! In that case, we</div><div class='del'>- * usually use idetape_queue_pc_head().</div><div class='del'>- */</div><div class='del'>-static int idetape_queue_pc_tail(ide_drive_t *drive, struct ide_atapi_pc *pc)</div><div class='del'>-{</div><div class='del'>-	struct ide_tape_obj *tape = drive-&gt;driver_data;</div><div class='del'>-	struct request *rq;</div><div class='del'>-	int error;</div><div class='del'>-</div><div class='del'>-	rq = blk_get_request(drive-&gt;queue, READ, __GFP_WAIT);</div><div class='del'>-	rq-&gt;cmd_type = REQ_TYPE_SPECIAL;</div><div class='del'>-	rq-&gt;cmd[13] = REQ_IDETAPE_PC1;</div><div class='del'>-	rq-&gt;buffer = (char *)pc;</div><div class='del'>-	memcpy(rq-&gt;cmd, pc-&gt;c, 12);</div><div class='del'>-	error = blk_execute_rq(drive-&gt;queue, tape-&gt;disk, rq, 0);</div><div class='del'>-	blk_put_request(rq);</div><div class='del'>-	return error;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void idetape_create_load_unload_cmd(ide_drive_t *drive,</div><div class='del'>-		struct ide_atapi_pc *pc, int cmd)</div><div class='del'>-{</div><div class='del'>-	idetape_init_pc(pc);</div><div class='del'>-	pc-&gt;c[0] = START_STOP;</div><div class='del'>-	pc-&gt;c[4] = cmd;</div><div class='del'>-	pc-&gt;flags |= PC_FLAG_WAIT_FOR_DSC;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int idetape_wait_ready(ide_drive_t *drive, unsigned long timeout)</div><div class='ctx'> {</div><div class='ctx'> 	idetape_tape_t *tape = drive-&gt;driver_data;</div><div class='del'>-	struct ide_atapi_pc pc;</div><div class='add'>+	struct gendisk *disk = tape-&gt;disk;</div><div class='ctx'> 	int load_attempted = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Wait for the tape to become ready */</div><div class='ctx'> 	set_bit(IDE_AFLAG_MEDIUM_PRESENT, &amp;drive-&gt;atapi_flags);</div><div class='ctx'> 	timeout += jiffies;</div><div class='ctx'> 	while (time_before(jiffies, timeout)) {</div><div class='del'>-		idetape_create_test_unit_ready_cmd(&amp;pc);</div><div class='del'>-		if (!idetape_queue_pc_tail(drive, &amp;pc))</div><div class='add'>+		if (ide_do_test_unit_ready(drive, disk) == 0)</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		if ((tape-&gt;sense_key == 2 &amp;&amp; tape-&gt;asc == 4 &amp;&amp; tape-&gt;ascq == 2)</div><div class='ctx'> 		    || (tape-&gt;asc == 0x3A)) {</div><div class='ctx'> 			/* no media */</div><div class='ctx'> 			if (load_attempted)</div><div class='ctx'> 				return -ENOMEDIUM;</div><div class='del'>-			idetape_create_load_unload_cmd(drive, &amp;pc,</div><div class='del'>-							IDETAPE_LU_LOAD_MASK);</div><div class='del'>-			idetape_queue_pc_tail(drive, &amp;pc);</div><div class='add'>+			ide_do_start_stop(drive, disk, IDETAPE_LU_LOAD_MASK);</div><div class='ctx'> 			load_attempted = 1;</div><div class='ctx'> 		/* not about to be ready */</div><div class='ctx'> 		} else if (!(tape-&gt;sense_key == 2 &amp;&amp; tape-&gt;asc == 4 &amp;&amp;</div><div class='hunk'>@@ -1318,11 +1086,12 @@ static int idetape_wait_ready(ide_drive_t *drive, unsigned long timeout)</div><div class='ctx'> </div><div class='ctx'> static int idetape_flush_tape_buffers(ide_drive_t *drive)</div><div class='ctx'> {</div><div class='add'>+	struct ide_tape_obj *tape = drive-&gt;driver_data;</div><div class='ctx'> 	struct ide_atapi_pc pc;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	idetape_create_write_filemark_cmd(drive, &amp;pc, 0);</div><div class='del'>-	rc = idetape_queue_pc_tail(drive, &amp;pc);</div><div class='add'>+	rc = ide_queue_pc_tail(drive, tape-&gt;disk, &amp;pc);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return rc;</div><div class='ctx'> 	idetape_wait_ready(drive, 60 * 5 * HZ);</div><div class='hunk'>@@ -1331,7 +1100,7 @@ static int idetape_flush_tape_buffers(ide_drive_t *drive)</div><div class='ctx'> </div><div class='ctx'> static void idetape_create_read_position_cmd(struct ide_atapi_pc *pc)</div><div class='ctx'> {</div><div class='del'>-	idetape_init_pc(pc);</div><div class='add'>+	ide_init_pc(pc);</div><div class='ctx'> 	pc-&gt;c[0] = READ_POSITION;</div><div class='ctx'> 	pc-&gt;req_xfer = 20;</div><div class='ctx'> }</div><div class='hunk'>@@ -1345,7 +1114,7 @@ static int idetape_read_position(ide_drive_t *drive)</div><div class='ctx'> 	debug_log(DBG_PROCS, "Enter %s\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	idetape_create_read_position_cmd(&amp;pc);</div><div class='del'>-	if (idetape_queue_pc_tail(drive, &amp;pc))</div><div class='add'>+	if (ide_queue_pc_tail(drive, tape-&gt;disk, &amp;pc))</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	position = tape-&gt;first_frame;</div><div class='ctx'> 	return position;</div><div class='hunk'>@@ -1355,7 +1124,7 @@ static void idetape_create_locate_cmd(ide_drive_t *drive,</div><div class='ctx'> 		struct ide_atapi_pc *pc,</div><div class='ctx'> 		unsigned int block, u8 partition, int skip)</div><div class='ctx'> {</div><div class='del'>-	idetape_init_pc(pc);</div><div class='add'>+	ide_init_pc(pc);</div><div class='ctx'> 	pc-&gt;c[0] = POSITION_TO_ELEMENT;</div><div class='ctx'> 	pc-&gt;c[1] = 2;</div><div class='ctx'> 	put_unaligned(cpu_to_be32(block), (unsigned int *) &amp;pc-&gt;c[3]);</div><div class='hunk'>@@ -1363,21 +1132,6 @@ static void idetape_create_locate_cmd(ide_drive_t *drive,</div><div class='ctx'> 	pc-&gt;flags |= PC_FLAG_WAIT_FOR_DSC;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int idetape_create_prevent_cmd(ide_drive_t *drive,</div><div class='del'>-		struct ide_atapi_pc *pc, int prevent)</div><div class='del'>-{</div><div class='del'>-	idetape_tape_t *tape = drive-&gt;driver_data;</div><div class='del'>-</div><div class='del'>-	/* device supports locking according to capabilities page */</div><div class='del'>-	if (!(tape-&gt;caps[6] &amp; 0x01))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	idetape_init_pc(pc);</div><div class='del'>-	pc-&gt;c[0] = ALLOW_MEDIUM_REMOVAL;</div><div class='del'>-	pc-&gt;c[4] = prevent;</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void __ide_tape_discard_merge_buffer(ide_drive_t *drive)</div><div class='ctx'> {</div><div class='ctx'> 	idetape_tape_t *tape = drive-&gt;driver_data;</div><div class='hunk'>@@ -1405,6 +1159,7 @@ static int idetape_position_tape(ide_drive_t *drive, unsigned int block,</div><div class='ctx'> 		u8 partition, int skip)</div><div class='ctx'> {</div><div class='ctx'> 	idetape_tape_t *tape = drive-&gt;driver_data;</div><div class='add'>+	struct gendisk *disk = tape-&gt;disk;</div><div class='ctx'> 	int retval;</div><div class='ctx'> 	struct ide_atapi_pc pc;</div><div class='ctx'> </div><div class='hunk'>@@ -1412,12 +1167,12 @@ static int idetape_position_tape(ide_drive_t *drive, unsigned int block,</div><div class='ctx'> 		__ide_tape_discard_merge_buffer(drive);</div><div class='ctx'> 	idetape_wait_ready(drive, 60 * 5 * HZ);</div><div class='ctx'> 	idetape_create_locate_cmd(drive, &amp;pc, block, partition, skip);</div><div class='del'>-	retval = idetape_queue_pc_tail(drive, &amp;pc);</div><div class='add'>+	retval = ide_queue_pc_tail(drive, disk, &amp;pc);</div><div class='ctx'> 	if (retval)</div><div class='ctx'> 		return (retval);</div><div class='ctx'> </div><div class='ctx'> 	idetape_create_read_position_cmd(&amp;pc);</div><div class='del'>-	return (idetape_queue_pc_tail(drive, &amp;pc));</div><div class='add'>+	return ide_queue_pc_tail(drive, disk, &amp;pc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ide_tape_discard_merge_buffer(ide_drive_t *drive,</div><div class='hunk'>@@ -1477,7 +1232,7 @@ static int idetape_queue_rw_tail(ide_drive_t *drive, int cmd, int blocks,</div><div class='ctx'> </div><div class='ctx'> static void idetape_create_inquiry_cmd(struct ide_atapi_pc *pc)</div><div class='ctx'> {</div><div class='del'>-	idetape_init_pc(pc);</div><div class='add'>+	ide_init_pc(pc);</div><div class='ctx'> 	pc-&gt;c[0] = INQUIRY;</div><div class='ctx'> 	pc-&gt;c[4] = 254;</div><div class='ctx'> 	pc-&gt;req_xfer = 254;</div><div class='hunk'>@@ -1486,14 +1241,14 @@ static void idetape_create_inquiry_cmd(struct ide_atapi_pc *pc)</div><div class='ctx'> static void idetape_create_rewind_cmd(ide_drive_t *drive,</div><div class='ctx'> 		struct ide_atapi_pc *pc)</div><div class='ctx'> {</div><div class='del'>-	idetape_init_pc(pc);</div><div class='add'>+	ide_init_pc(pc);</div><div class='ctx'> 	pc-&gt;c[0] = REZERO_UNIT;</div><div class='ctx'> 	pc-&gt;flags |= PC_FLAG_WAIT_FOR_DSC;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void idetape_create_erase_cmd(struct ide_atapi_pc *pc)</div><div class='ctx'> {</div><div class='del'>-	idetape_init_pc(pc);</div><div class='add'>+	ide_init_pc(pc);</div><div class='ctx'> 	pc-&gt;c[0] = ERASE;</div><div class='ctx'> 	pc-&gt;c[1] = 1;</div><div class='ctx'> 	pc-&gt;flags |= PC_FLAG_WAIT_FOR_DSC;</div><div class='hunk'>@@ -1501,7 +1256,7 @@ static void idetape_create_erase_cmd(struct ide_atapi_pc *pc)</div><div class='ctx'> </div><div class='ctx'> static void idetape_create_space_cmd(struct ide_atapi_pc *pc, int count, u8 cmd)</div><div class='ctx'> {</div><div class='del'>-	idetape_init_pc(pc);</div><div class='add'>+	ide_init_pc(pc);</div><div class='ctx'> 	pc-&gt;c[0] = SPACE;</div><div class='ctx'> 	put_unaligned(cpu_to_be32(count), (unsigned int *) &amp;pc-&gt;c[1]);</div><div class='ctx'> 	pc-&gt;c[1] = cmd;</div><div class='hunk'>@@ -1600,7 +1355,7 @@ static int idetape_init_read(ide_drive_t *drive)</div><div class='ctx'> 		 * No point in issuing this if DSC overlap isn't supported, some</div><div class='ctx'> 		 * drives (Seagate STT3401A) will return an error.</div><div class='ctx'> 		 */</div><div class='del'>-		if (drive-&gt;dsc_overlap) {</div><div class='add'>+		if (drive-&gt;dev_flags &amp; IDE_DFLAG_DSC_OVERLAP) {</div><div class='ctx'> 			bytes_read = idetape_queue_rw_tail(drive,</div><div class='ctx'> 							REQ_IDETAPE_READ, 0,</div><div class='ctx'> 							tape-&gt;merge_bh);</div><div class='hunk'>@@ -1664,20 +1419,20 @@ static void idetape_pad_zeros(ide_drive_t *drive, int bcount)</div><div class='ctx'>  */</div><div class='ctx'> static int idetape_rewind_tape(ide_drive_t *drive)</div><div class='ctx'> {</div><div class='add'>+	struct ide_tape_obj *tape = drive-&gt;driver_data;</div><div class='add'>+	struct gendisk *disk = tape-&gt;disk;</div><div class='ctx'> 	int retval;</div><div class='ctx'> 	struct ide_atapi_pc pc;</div><div class='del'>-	idetape_tape_t *tape;</div><div class='del'>-	tape = drive-&gt;driver_data;</div><div class='ctx'> </div><div class='ctx'> 	debug_log(DBG_SENSE, "Enter %s\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	idetape_create_rewind_cmd(drive, &amp;pc);</div><div class='del'>-	retval = idetape_queue_pc_tail(drive, &amp;pc);</div><div class='add'>+	retval = ide_queue_pc_tail(drive, disk, &amp;pc);</div><div class='ctx'> 	if (retval)</div><div class='ctx'> 		return retval;</div><div class='ctx'> </div><div class='ctx'> 	idetape_create_read_position_cmd(&amp;pc);</div><div class='del'>-	retval = idetape_queue_pc_tail(drive, &amp;pc);</div><div class='add'>+	retval = ide_queue_pc_tail(drive, disk, &amp;pc);</div><div class='ctx'> 	if (retval)</div><div class='ctx'> 		return retval;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1720,6 +1475,7 @@ static int idetape_space_over_filemarks(ide_drive_t *drive, short mt_op,</div><div class='ctx'> 					int mt_count)</div><div class='ctx'> {</div><div class='ctx'> 	idetape_tape_t *tape = drive-&gt;driver_data;</div><div class='add'>+	struct gendisk *disk = tape-&gt;disk;</div><div class='ctx'> 	struct ide_atapi_pc pc;</div><div class='ctx'> 	int retval, count = 0;</div><div class='ctx'> 	int sprev = !!(tape-&gt;caps[4] &amp; 0x20);</div><div class='hunk'>@@ -1744,7 +1500,7 @@ static int idetape_space_over_filemarks(ide_drive_t *drive, short mt_op,</div><div class='ctx'> 	case MTBSF:</div><div class='ctx'> 		idetape_create_space_cmd(&amp;pc, mt_count - count,</div><div class='ctx'> 					 IDETAPE_SPACE_OVER_FILEMARK);</div><div class='del'>-		return idetape_queue_pc_tail(drive, &amp;pc);</div><div class='add'>+		return ide_queue_pc_tail(drive, disk, &amp;pc);</div><div class='ctx'> 	case MTFSFM:</div><div class='ctx'> 	case MTBSFM:</div><div class='ctx'> 		if (!sprev)</div><div class='hunk'>@@ -1780,7 +1536,7 @@ static int idetape_space_over_filemarks(ide_drive_t *drive, short mt_op,</div><div class='ctx'> static ssize_t idetape_chrdev_read(struct file *file, char __user *buf,</div><div class='ctx'> 				   size_t count, loff_t *ppos)</div><div class='ctx'> {</div><div class='del'>-	struct ide_tape_obj *tape = ide_tape_f(file);</div><div class='add'>+	struct ide_tape_obj *tape = file-&gt;private_data;</div><div class='ctx'> 	ide_drive_t *drive = tape-&gt;drive;</div><div class='ctx'> 	ssize_t bytes_read, temp, actually_read = 0, rc;</div><div class='ctx'> 	ssize_t ret = 0;</div><div class='hunk'>@@ -1842,7 +1598,7 @@ finish:</div><div class='ctx'> static ssize_t idetape_chrdev_write(struct file *file, const char __user *buf,</div><div class='ctx'> 				     size_t count, loff_t *ppos)</div><div class='ctx'> {</div><div class='del'>-	struct ide_tape_obj *tape = ide_tape_f(file);</div><div class='add'>+	struct ide_tape_obj *tape = file-&gt;private_data;</div><div class='ctx'> 	ide_drive_t *drive = tape-&gt;drive;</div><div class='ctx'> 	ssize_t actually_written = 0;</div><div class='ctx'> 	ssize_t ret = 0;</div><div class='hunk'>@@ -1875,7 +1631,7 @@ static ssize_t idetape_chrdev_write(struct file *file, const char __user *buf,</div><div class='ctx'> 		 * point in issuing this if DSC overlap isn't supported, some</div><div class='ctx'> 		 * drives (Seagate STT3401A) will return an error.</div><div class='ctx'> 		 */</div><div class='del'>-		if (drive-&gt;dsc_overlap) {</div><div class='add'>+		if (drive-&gt;dev_flags &amp; IDE_DFLAG_DSC_OVERLAP) {</div><div class='ctx'> 			ssize_t retval = idetape_queue_rw_tail(drive,</div><div class='ctx'> 							REQ_IDETAPE_WRITE, 0,</div><div class='ctx'> 							tape-&gt;merge_bh);</div><div class='hunk'>@@ -1933,11 +1689,12 @@ static ssize_t idetape_chrdev_write(struct file *file, const char __user *buf,</div><div class='ctx'> </div><div class='ctx'> static int idetape_write_filemark(ide_drive_t *drive)</div><div class='ctx'> {</div><div class='add'>+	struct ide_tape_obj *tape = drive-&gt;driver_data;</div><div class='ctx'> 	struct ide_atapi_pc pc;</div><div class='ctx'> </div><div class='ctx'> 	/* Write a filemark */</div><div class='ctx'> 	idetape_create_write_filemark_cmd(drive, &amp;pc, 1);</div><div class='del'>-	if (idetape_queue_pc_tail(drive, &amp;pc)) {</div><div class='add'>+	if (ide_queue_pc_tail(drive, tape-&gt;disk, &amp;pc)) {</div><div class='ctx'> 		printk(KERN_ERR "ide-tape: Couldn't write a filemark\n");</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1960,6 +1717,7 @@ static int idetape_write_filemark(ide_drive_t *drive)</div><div class='ctx'> static int idetape_mtioctop(ide_drive_t *drive, short mt_op, int mt_count)</div><div class='ctx'> {</div><div class='ctx'> 	idetape_tape_t *tape = drive-&gt;driver_data;</div><div class='add'>+	struct gendisk *disk = tape-&gt;disk;</div><div class='ctx'> 	struct ide_atapi_pc pc;</div><div class='ctx'> 	int i, retval;</div><div class='ctx'> </div><div class='hunk'>@@ -1996,9 +1754,7 @@ static int idetape_mtioctop(ide_drive_t *drive, short mt_op, int mt_count)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	case MTLOAD:</div><div class='ctx'> 		ide_tape_discard_merge_buffer(drive, 0);</div><div class='del'>-		idetape_create_load_unload_cmd(drive, &amp;pc,</div><div class='del'>-					       IDETAPE_LU_LOAD_MASK);</div><div class='del'>-		return idetape_queue_pc_tail(drive, &amp;pc);</div><div class='add'>+		return ide_do_start_stop(drive, disk, IDETAPE_LU_LOAD_MASK);</div><div class='ctx'> 	case MTUNLOAD:</div><div class='ctx'> 	case MTOFFL:</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -2006,14 +1762,11 @@ static int idetape_mtioctop(ide_drive_t *drive, short mt_op, int mt_count)</div><div class='ctx'> 		 * attempting to eject.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (tape-&gt;door_locked) {</div><div class='del'>-			if (idetape_create_prevent_cmd(drive, &amp;pc, 0))</div><div class='del'>-				if (!idetape_queue_pc_tail(drive, &amp;pc))</div><div class='del'>-					tape-&gt;door_locked = DOOR_UNLOCKED;</div><div class='add'>+			if (!ide_set_media_lock(drive, disk, 0))</div><div class='add'>+				tape-&gt;door_locked = DOOR_UNLOCKED;</div><div class='ctx'> 		}</div><div class='ctx'> 		ide_tape_discard_merge_buffer(drive, 0);</div><div class='del'>-		idetape_create_load_unload_cmd(drive, &amp;pc,</div><div class='del'>-					      !IDETAPE_LU_LOAD_MASK);</div><div class='del'>-		retval = idetape_queue_pc_tail(drive, &amp;pc);</div><div class='add'>+		retval = ide_do_start_stop(drive, disk, !IDETAPE_LU_LOAD_MASK);</div><div class='ctx'> 		if (!retval)</div><div class='ctx'> 			clear_bit(IDE_AFLAG_MEDIUM_PRESENT, &amp;drive-&gt;atapi_flags);</div><div class='ctx'> 		return retval;</div><div class='hunk'>@@ -2022,16 +1775,15 @@ static int idetape_mtioctop(ide_drive_t *drive, short mt_op, int mt_count)</div><div class='ctx'> 		return idetape_flush_tape_buffers(drive);</div><div class='ctx'> 	case MTRETEN:</div><div class='ctx'> 		ide_tape_discard_merge_buffer(drive, 0);</div><div class='del'>-		idetape_create_load_unload_cmd(drive, &amp;pc,</div><div class='add'>+		return ide_do_start_stop(drive, disk,</div><div class='ctx'> 			IDETAPE_LU_RETENSION_MASK | IDETAPE_LU_LOAD_MASK);</div><div class='del'>-		return idetape_queue_pc_tail(drive, &amp;pc);</div><div class='ctx'> 	case MTEOM:</div><div class='ctx'> 		idetape_create_space_cmd(&amp;pc, 0, IDETAPE_SPACE_TO_EOD);</div><div class='del'>-		return idetape_queue_pc_tail(drive, &amp;pc);</div><div class='add'>+		return ide_queue_pc_tail(drive, disk, &amp;pc);</div><div class='ctx'> 	case MTERASE:</div><div class='ctx'> 		(void)idetape_rewind_tape(drive);</div><div class='ctx'> 		idetape_create_erase_cmd(&amp;pc);</div><div class='del'>-		return idetape_queue_pc_tail(drive, &amp;pc);</div><div class='add'>+		return ide_queue_pc_tail(drive, disk, &amp;pc);</div><div class='ctx'> 	case MTSETBLK:</div><div class='ctx'> 		if (mt_count) {</div><div class='ctx'> 			if (mt_count &lt; tape-&gt;blk_size ||</div><div class='hunk'>@@ -2052,17 +1804,13 @@ static int idetape_mtioctop(ide_drive_t *drive, short mt_op, int mt_count)</div><div class='ctx'> 	case MTFSR:</div><div class='ctx'> 	case MTBSR:</div><div class='ctx'> 	case MTLOCK:</div><div class='del'>-		if (!idetape_create_prevent_cmd(drive, &amp;pc, 1))</div><div class='del'>-			return 0;</div><div class='del'>-		retval = idetape_queue_pc_tail(drive, &amp;pc);</div><div class='add'>+		retval = ide_set_media_lock(drive, disk, 1);</div><div class='ctx'> 		if (retval)</div><div class='ctx'> 			return retval;</div><div class='ctx'> 		tape-&gt;door_locked = DOOR_EXPLICITLY_LOCKED;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	case MTUNLOCK:</div><div class='del'>-		if (!idetape_create_prevent_cmd(drive, &amp;pc, 0))</div><div class='del'>-			return 0;</div><div class='del'>-		retval = idetape_queue_pc_tail(drive, &amp;pc);</div><div class='add'>+		retval = ide_set_media_lock(drive, disk, 0);</div><div class='ctx'> 		if (retval)</div><div class='ctx'> 			return retval;</div><div class='ctx'> 		tape-&gt;door_locked = DOOR_UNLOCKED;</div><div class='hunk'>@@ -2082,7 +1830,7 @@ static int idetape_mtioctop(ide_drive_t *drive, short mt_op, int mt_count)</div><div class='ctx'> static int idetape_chrdev_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 				unsigned int cmd, unsigned long arg)</div><div class='ctx'> {</div><div class='del'>-	struct ide_tape_obj *tape = ide_tape_f(file);</div><div class='add'>+	struct ide_tape_obj *tape = file-&gt;private_data;</div><div class='ctx'> 	ide_drive_t *drive = tape-&gt;drive;</div><div class='ctx'> 	struct mtop mtop;</div><div class='ctx'> 	struct mtget mtget;</div><div class='hunk'>@@ -2144,7 +1892,7 @@ static void ide_tape_get_bsize_from_bdesc(ide_drive_t *drive)</div><div class='ctx'> 	struct ide_atapi_pc pc;</div><div class='ctx'> </div><div class='ctx'> 	idetape_create_mode_sense_cmd(&amp;pc, IDETAPE_BLOCK_DESCRIPTOR);</div><div class='del'>-	if (idetape_queue_pc_tail(drive, &amp;pc)) {</div><div class='add'>+	if (ide_queue_pc_tail(drive, tape-&gt;disk, &amp;pc)) {</div><div class='ctx'> 		printk(KERN_ERR "ide-tape: Can't get block descriptor\n");</div><div class='ctx'> 		if (tape-&gt;blk_size == 0) {</div><div class='ctx'> 			printk(KERN_WARNING "ide-tape: Cannot deal with zero "</div><div class='hunk'>@@ -2164,7 +1912,6 @@ static int idetape_chrdev_open(struct inode *inode, struct file *filp)</div><div class='ctx'> 	unsigned int minor = iminor(inode), i = minor &amp; ~0xc0;</div><div class='ctx'> 	ide_drive_t *drive;</div><div class='ctx'> 	idetape_tape_t *tape;</div><div class='del'>-	struct ide_atapi_pc pc;</div><div class='ctx'> 	int retval;</div><div class='ctx'> </div><div class='ctx'> 	if (i &gt;= MAX_HWIFS * MAX_DRIVES)</div><div class='hunk'>@@ -2227,11 +1974,9 @@ static int idetape_chrdev_open(struct inode *inode, struct file *filp)</div><div class='ctx'> </div><div class='ctx'> 	/* Lock the tape drive door so user can't eject. */</div><div class='ctx'> 	if (tape-&gt;chrdev_dir == IDETAPE_DIR_NONE) {</div><div class='del'>-		if (idetape_create_prevent_cmd(drive, &amp;pc, 1)) {</div><div class='del'>-			if (!idetape_queue_pc_tail(drive, &amp;pc)) {</div><div class='del'>-				if (tape-&gt;door_locked != DOOR_EXPLICITLY_LOCKED)</div><div class='del'>-					tape-&gt;door_locked = DOOR_LOCKED;</div><div class='del'>-			}</div><div class='add'>+		if (!ide_set_media_lock(drive, tape-&gt;disk, 1)) {</div><div class='add'>+			if (tape-&gt;door_locked != DOOR_EXPLICITLY_LOCKED)</div><div class='add'>+				tape-&gt;door_locked = DOOR_LOCKED;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	unlock_kernel();</div><div class='hunk'>@@ -2262,9 +2007,8 @@ static void idetape_write_release(ide_drive_t *drive, unsigned int minor)</div><div class='ctx'> </div><div class='ctx'> static int idetape_chrdev_release(struct inode *inode, struct file *filp)</div><div class='ctx'> {</div><div class='del'>-	struct ide_tape_obj *tape = ide_tape_f(filp);</div><div class='add'>+	struct ide_tape_obj *tape = filp-&gt;private_data;</div><div class='ctx'> 	ide_drive_t *drive = tape-&gt;drive;</div><div class='del'>-	struct ide_atapi_pc pc;</div><div class='ctx'> 	unsigned int minor = iminor(inode);</div><div class='ctx'> </div><div class='ctx'> 	lock_kernel();</div><div class='hunk'>@@ -2283,10 +2027,8 @@ static int idetape_chrdev_release(struct inode *inode, struct file *filp)</div><div class='ctx'> 		(void) idetape_rewind_tape(drive);</div><div class='ctx'> 	if (tape-&gt;chrdev_dir == IDETAPE_DIR_NONE) {</div><div class='ctx'> 		if (tape-&gt;door_locked == DOOR_LOCKED) {</div><div class='del'>-			if (idetape_create_prevent_cmd(drive, &amp;pc, 0)) {</div><div class='del'>-				if (!idetape_queue_pc_tail(drive, &amp;pc))</div><div class='del'>-					tape-&gt;door_locked = DOOR_UNLOCKED;</div><div class='del'>-			}</div><div class='add'>+			if (!ide_set_media_lock(drive, tape-&gt;disk, 0))</div><div class='add'>+				tape-&gt;door_locked = DOOR_UNLOCKED;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	clear_bit(IDE_AFLAG_BUSY, &amp;drive-&gt;atapi_flags);</div><div class='hunk'>@@ -2295,45 +2037,6 @@ static int idetape_chrdev_release(struct inode *inode, struct file *filp)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * check the contents of the ATAPI IDENTIFY command results. We return:</div><div class='del'>- *</div><div class='del'>- * 1 - If the tape can be supported by us, based on the information we have so</div><div class='del'>- * far.</div><div class='del'>- *</div><div class='del'>- * 0 - If this tape driver is not currently supported by us.</div><div class='del'>- */</div><div class='del'>-static int idetape_identify_device(ide_drive_t *drive)</div><div class='del'>-{</div><div class='del'>-	u8 gcw[2], protocol, device_type, removable, packet_size;</div><div class='del'>-</div><div class='del'>-	if (drive-&gt;id_read == 0)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	*((unsigned short *) &amp;gcw) = drive-&gt;id-&gt;config;</div><div class='del'>-</div><div class='del'>-	protocol	=   (gcw[1] &amp; 0xC0) &gt;&gt; 6;</div><div class='del'>-	device_type	=    gcw[1] &amp; 0x1F;</div><div class='del'>-	removable	= !!(gcw[0] &amp; 0x80);</div><div class='del'>-	packet_size	=    gcw[0] &amp; 0x3;</div><div class='del'>-</div><div class='del'>-	/* Check that we can support this device */</div><div class='del'>-	if (protocol != 2)</div><div class='del'>-		printk(KERN_ERR "ide-tape: Protocol (0x%02x) is not ATAPI\n",</div><div class='del'>-				protocol);</div><div class='del'>-	else if (device_type != 1)</div><div class='del'>-		printk(KERN_ERR "ide-tape: Device type (0x%02x) is not set "</div><div class='del'>-				"to tape\n", device_type);</div><div class='del'>-	else if (!removable)</div><div class='del'>-		printk(KERN_ERR "ide-tape: The removable flag is not set\n");</div><div class='del'>-	else if (packet_size != 0) {</div><div class='del'>-		printk(KERN_ERR "ide-tape: Packet size (0x%02x) is not 12"</div><div class='del'>-				" bytes\n", packet_size);</div><div class='del'>-	} else</div><div class='del'>-		return 1;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void idetape_get_inquiry_results(ide_drive_t *drive)</div><div class='ctx'> {</div><div class='ctx'> 	idetape_tape_t *tape = drive-&gt;driver_data;</div><div class='hunk'>@@ -2341,7 +2044,7 @@ static void idetape_get_inquiry_results(ide_drive_t *drive)</div><div class='ctx'> 	char fw_rev[4], vendor_id[8], product_id[16];</div><div class='ctx'> </div><div class='ctx'> 	idetape_create_inquiry_cmd(&amp;pc);</div><div class='del'>-	if (idetape_queue_pc_tail(drive, &amp;pc)) {</div><div class='add'>+	if (ide_queue_pc_tail(drive, tape-&gt;disk, &amp;pc)) {</div><div class='ctx'> 		printk(KERN_ERR "ide-tape: %s: can't get INQUIRY results\n",</div><div class='ctx'> 				tape-&gt;name);</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -2370,7 +2073,7 @@ static void idetape_get_mode_sense_results(ide_drive_t *drive)</div><div class='ctx'> 	u8 speed, max_speed;</div><div class='ctx'> </div><div class='ctx'> 	idetape_create_mode_sense_cmd(&amp;pc, IDETAPE_CAPABILITIES_PAGE);</div><div class='del'>-	if (idetape_queue_pc_tail(drive, &amp;pc)) {</div><div class='add'>+	if (ide_queue_pc_tail(drive, tape-&gt;disk, &amp;pc)) {</div><div class='ctx'> 		printk(KERN_ERR "ide-tape: Can't get tape parameters - assuming"</div><div class='ctx'> 				" some default values\n");</div><div class='ctx'> 		tape-&gt;blk_size = 512;</div><div class='hunk'>@@ -2402,6 +2105,11 @@ static void idetape_get_mode_sense_results(ide_drive_t *drive)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	memcpy(&amp;tape-&gt;caps, caps, 20);</div><div class='add'>+</div><div class='add'>+	/* device lacks locking support according to capabilities page */</div><div class='add'>+	if ((caps[6] &amp; 1) == 0)</div><div class='add'>+		drive-&gt;atapi_flags |= IDE_AFLAG_NO_DOORLOCK;</div><div class='add'>+</div><div class='ctx'> 	if (caps[7] &amp; 0x02)</div><div class='ctx'> 		tape-&gt;blk_size = 512;</div><div class='ctx'> 	else if (caps[7] &amp; 0x04)</div><div class='hunk'>@@ -2409,28 +2117,56 @@ static void idetape_get_mode_sense_results(ide_drive_t *drive)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_IDE_PROC_FS</div><div class='del'>-static void idetape_add_settings(ide_drive_t *drive)</div><div class='del'>-{</div><div class='del'>-	idetape_tape_t *tape = drive-&gt;driver_data;</div><div class='del'>-</div><div class='del'>-	ide_add_setting(drive, "buffer", SETTING_READ, TYPE_SHORT, 0, 0xffff,</div><div class='del'>-			1, 2, (u16 *)&amp;tape-&gt;caps[16], NULL);</div><div class='del'>-	ide_add_setting(drive, "speed", SETTING_READ, TYPE_SHORT, 0, 0xffff,</div><div class='del'>-			1, 1, (u16 *)&amp;tape-&gt;caps[14], NULL);</div><div class='del'>-	ide_add_setting(drive, "buffer_size", SETTING_READ, TYPE_INT, 0, 0xffff,</div><div class='del'>-			1, 1024, &amp;tape-&gt;buffer_size, NULL);</div><div class='del'>-	ide_add_setting(drive, "tdsc", SETTING_RW, TYPE_INT, IDETAPE_DSC_RW_MIN,</div><div class='del'>-			IDETAPE_DSC_RW_MAX, 1000, HZ, &amp;tape-&gt;best_dsc_rw_freq,</div><div class='del'>-			NULL);</div><div class='del'>-	ide_add_setting(drive, "dsc_overlap", SETTING_RW, TYPE_BYTE, 0, 1, 1,</div><div class='del'>-			1, &amp;drive-&gt;dsc_overlap, NULL);</div><div class='del'>-	ide_add_setting(drive, "avg_speed", SETTING_READ, TYPE_INT, 0, 0xffff,</div><div class='del'>-			1, 1, &amp;tape-&gt;avg_speed, NULL);</div><div class='del'>-	ide_add_setting(drive, "debug_mask", SETTING_RW, TYPE_INT, 0, 0xffff, 1,</div><div class='del'>-			1, &amp;tape-&gt;debug_mask, NULL);</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-static inline void idetape_add_settings(ide_drive_t *drive) { ; }</div><div class='add'>+#define ide_tape_devset_get(name, field) \</div><div class='add'>+static int get_##name(ide_drive_t *drive) \</div><div class='add'>+{ \</div><div class='add'>+	idetape_tape_t *tape = drive-&gt;driver_data; \</div><div class='add'>+	return tape-&gt;field; \</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define ide_tape_devset_set(name, field) \</div><div class='add'>+static int set_##name(ide_drive_t *drive, int arg) \</div><div class='add'>+{ \</div><div class='add'>+	idetape_tape_t *tape = drive-&gt;driver_data; \</div><div class='add'>+	tape-&gt;field = arg; \</div><div class='add'>+	return 0; \</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define ide_tape_devset_rw_field(_name, _field) \</div><div class='add'>+ide_tape_devset_get(_name, _field) \</div><div class='add'>+ide_tape_devset_set(_name, _field) \</div><div class='add'>+IDE_DEVSET(_name, DS_SYNC, get_##_name, set_##_name)</div><div class='add'>+</div><div class='add'>+#define ide_tape_devset_r_field(_name, _field) \</div><div class='add'>+ide_tape_devset_get(_name, _field) \</div><div class='add'>+IDE_DEVSET(_name, 0, get_##_name, NULL)</div><div class='add'>+</div><div class='add'>+static int mulf_tdsc(ide_drive_t *drive)	{ return 1000; }</div><div class='add'>+static int divf_tdsc(ide_drive_t *drive)	{ return   HZ; }</div><div class='add'>+static int divf_buffer(ide_drive_t *drive)	{ return    2; }</div><div class='add'>+static int divf_buffer_size(ide_drive_t *drive)	{ return 1024; }</div><div class='add'>+</div><div class='add'>+ide_devset_rw_flag(dsc_overlap, IDE_DFLAG_DSC_OVERLAP);</div><div class='add'>+</div><div class='add'>+ide_tape_devset_rw_field(debug_mask, debug_mask);</div><div class='add'>+ide_tape_devset_rw_field(tdsc, best_dsc_rw_freq);</div><div class='add'>+</div><div class='add'>+ide_tape_devset_r_field(avg_speed, avg_speed);</div><div class='add'>+ide_tape_devset_r_field(speed, caps[14]);</div><div class='add'>+ide_tape_devset_r_field(buffer, caps[16]);</div><div class='add'>+ide_tape_devset_r_field(buffer_size, buffer_size);</div><div class='add'>+</div><div class='add'>+static const struct ide_proc_devset idetape_settings[] = {</div><div class='add'>+	__IDE_PROC_DEVSET(avg_speed,	0, 0xffff, NULL, NULL),</div><div class='add'>+	__IDE_PROC_DEVSET(buffer,	0, 0xffff, NULL, divf_buffer),</div><div class='add'>+	__IDE_PROC_DEVSET(buffer_size,	0, 0xffff, NULL, divf_buffer_size),</div><div class='add'>+	__IDE_PROC_DEVSET(debug_mask,	0, 0xffff, NULL, NULL),</div><div class='add'>+	__IDE_PROC_DEVSET(dsc_overlap,	0,      1, NULL, NULL),</div><div class='add'>+	__IDE_PROC_DEVSET(speed,	0, 0xffff, NULL, NULL),</div><div class='add'>+	__IDE_PROC_DEVSET(tdsc,		IDETAPE_DSC_RW_MIN, IDETAPE_DSC_RW_MAX,</div><div class='add'>+					mulf_tdsc, divf_tdsc),</div><div class='add'>+	{ 0 },</div><div class='add'>+};</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -2449,32 +2185,31 @@ static void idetape_setup(ide_drive_t *drive, idetape_tape_t *tape, int minor)</div><div class='ctx'> 	unsigned long t;</div><div class='ctx'> 	int speed;</div><div class='ctx'> 	int buffer_size;</div><div class='del'>-	u8 gcw[2];</div><div class='ctx'> 	u16 *ctl = (u16 *)&amp;tape-&gt;caps[12];</div><div class='ctx'> </div><div class='del'>-	drive-&gt;pc_callback = ide_tape_callback;</div><div class='add'>+	drive-&gt;pc_callback	 = ide_tape_callback;</div><div class='add'>+	drive-&gt;pc_update_buffers = idetape_update_buffers;</div><div class='add'>+	drive-&gt;pc_io_buffers	 = ide_tape_io_buffers;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;tape-&gt;lock);</div><div class='del'>-	drive-&gt;dsc_overlap = 1;</div><div class='add'>+</div><div class='add'>+	drive-&gt;dev_flags |= IDE_DFLAG_DSC_OVERLAP;</div><div class='add'>+</div><div class='ctx'> 	if (drive-&gt;hwif-&gt;host_flags &amp; IDE_HFLAG_NO_DSC) {</div><div class='ctx'> 		printk(KERN_INFO "ide-tape: %s: disabling DSC overlap\n",</div><div class='ctx'> 				 tape-&gt;name);</div><div class='del'>-		drive-&gt;dsc_overlap = 0;</div><div class='add'>+		drive-&gt;dev_flags &amp;= ~IDE_DFLAG_DSC_OVERLAP;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	/* Seagate Travan drives do not support DSC overlap. */</div><div class='del'>-	if (strstr(drive-&gt;id-&gt;model, "Seagate STT3401"))</div><div class='del'>-		drive-&gt;dsc_overlap = 0;</div><div class='add'>+	if (strstr((char *)&amp;drive-&gt;id[ATA_ID_PROD], "Seagate STT3401"))</div><div class='add'>+		drive-&gt;dev_flags &amp;= ~IDE_DFLAG_DSC_OVERLAP;</div><div class='add'>+</div><div class='ctx'> 	tape-&gt;minor = minor;</div><div class='ctx'> 	tape-&gt;name[0] = 'h';</div><div class='ctx'> 	tape-&gt;name[1] = 't';</div><div class='ctx'> 	tape-&gt;name[2] = '0' + minor;</div><div class='ctx'> 	tape-&gt;chrdev_dir = IDETAPE_DIR_NONE;</div><div class='del'>-	tape-&gt;pc = tape-&gt;pc_stack;</div><div class='del'>-	*((unsigned short *) &amp;gcw) = drive-&gt;id-&gt;config;</div><div class='del'>-</div><div class='del'>-	/* Command packet DRQ type */</div><div class='del'>-	if (((gcw[0] &amp; 0x60) &gt;&gt; 5) == 1)</div><div class='del'>-		set_bit(IDE_AFLAG_DRQ_INTERRUPT, &amp;drive-&gt;atapi_flags);</div><div class='ctx'> </div><div class='ctx'> 	idetape_get_inquiry_results(drive);</div><div class='ctx'> 	idetape_get_mode_sense_results(drive);</div><div class='hunk'>@@ -2510,9 +2245,9 @@ static void idetape_setup(ide_drive_t *drive, idetape_tape_t *tape, int minor)</div><div class='ctx'> 		(*(u16 *)&amp;tape-&gt;caps[16] * 512) / tape-&gt;buffer_size,</div><div class='ctx'> 		tape-&gt;buffer_size / 1024,</div><div class='ctx'> 		tape-&gt;best_dsc_rw_freq * 1000 / HZ,</div><div class='del'>-		drive-&gt;using_dma ? ", DMA":"");</div><div class='add'>+		(drive-&gt;dev_flags &amp; IDE_DFLAG_USING_DMA) ? ", DMA" : "");</div><div class='ctx'> </div><div class='del'>-	idetape_add_settings(drive);</div><div class='add'>+	ide_proc_register_driver(drive, tape-&gt;driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ide_tape_remove(ide_drive_t *drive)</div><div class='hunk'>@@ -2528,13 +2263,13 @@ static void ide_tape_remove(ide_drive_t *drive)</div><div class='ctx'> </div><div class='ctx'> static void ide_tape_release(struct kref *kref)</div><div class='ctx'> {</div><div class='del'>-	struct ide_tape_obj *tape = to_ide_tape(kref);</div><div class='add'>+	struct ide_tape_obj *tape = to_ide_drv(kref, ide_tape_obj);</div><div class='ctx'> 	ide_drive_t *drive = tape-&gt;drive;</div><div class='ctx'> 	struct gendisk *g = tape-&gt;disk;</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(tape-&gt;merge_bh_size);</div><div class='ctx'> </div><div class='del'>-	drive-&gt;dsc_overlap = 0;</div><div class='add'>+	drive-&gt;dev_flags &amp;= ~IDE_DFLAG_DSC_OVERLAP;</div><div class='ctx'> 	drive-&gt;driver_data = NULL;</div><div class='ctx'> 	device_destroy(idetape_sysfs_class, MKDEV(IDETAPE_MAJOR, tape-&gt;minor));</div><div class='ctx'> 	device_destroy(idetape_sysfs_class,</div><div class='hunk'>@@ -2576,13 +2311,12 @@ static ide_driver_t idetape_driver = {</div><div class='ctx'> 	.probe			= ide_tape_probe,</div><div class='ctx'> 	.remove			= ide_tape_remove,</div><div class='ctx'> 	.version		= IDETAPE_VERSION,</div><div class='del'>-	.media			= ide_tape,</div><div class='del'>-	.supports_dsc_overlap 	= 1,</div><div class='ctx'> 	.do_request		= idetape_do_request,</div><div class='ctx'> 	.end_request		= idetape_end_request,</div><div class='ctx'> 	.error			= __ide_error,</div><div class='ctx'> #ifdef CONFIG_IDE_PROC_FS</div><div class='ctx'> 	.proc			= idetape_proc,</div><div class='add'>+	.settings		= idetape_settings,</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2611,7 +2345,7 @@ static int idetape_open(struct inode *inode, struct file *filp)</div><div class='ctx'> static int idetape_release(struct inode *inode, struct file *filp)</div><div class='ctx'> {</div><div class='ctx'> 	struct gendisk *disk = inode-&gt;i_bdev-&gt;bd_disk;</div><div class='del'>-	struct ide_tape_obj *tape = ide_tape_g(disk);</div><div class='add'>+	struct ide_tape_obj *tape = ide_drv_g(disk, ide_tape_obj);</div><div class='ctx'> </div><div class='ctx'> 	ide_tape_put(tape);</div><div class='ctx'> </div><div class='hunk'>@@ -2622,7 +2356,7 @@ static int idetape_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 			unsigned int cmd, unsigned long arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct block_device *bdev = inode-&gt;i_bdev;</div><div class='del'>-	struct ide_tape_obj *tape = ide_tape_g(bdev-&gt;bd_disk);</div><div class='add'>+	struct ide_tape_obj *tape = ide_drv_g(bdev-&gt;bd_disk, ide_tape_obj);</div><div class='ctx'> 	ide_drive_t *drive = tape-&gt;drive;</div><div class='ctx'> 	int err = generic_ide_ioctl(drive, file, bdev, cmd, arg);</div><div class='ctx'> 	if (err == -EINVAL)</div><div class='hunk'>@@ -2645,11 +2379,12 @@ static int ide_tape_probe(ide_drive_t *drive)</div><div class='ctx'> </div><div class='ctx'> 	if (!strstr("ide-tape", drive-&gt;driver_req))</div><div class='ctx'> 		goto failed;</div><div class='del'>-	if (!drive-&gt;present)</div><div class='del'>-		goto failed;</div><div class='add'>+</div><div class='ctx'> 	if (drive-&gt;media != ide_tape)</div><div class='ctx'> 		goto failed;</div><div class='del'>-	if (!idetape_identify_device(drive)) {</div><div class='add'>+</div><div class='add'>+	if ((drive-&gt;dev_flags &amp; IDE_DFLAG_ID_READ) &amp;&amp;</div><div class='add'>+	    ide_check_atapi_device(drive, DRV_NAME) == 0) {</div><div class='ctx'> 		printk(KERN_ERR "ide-tape: %s: not supported by this version of"</div><div class='ctx'> 				" the driver\n", drive-&gt;name);</div><div class='ctx'> 		goto failed;</div><div class='hunk'>@@ -2667,8 +2402,6 @@ static int ide_tape_probe(ide_drive_t *drive)</div><div class='ctx'> </div><div class='ctx'> 	ide_init_disk(g, drive);</div><div class='ctx'> </div><div class='del'>-	ide_proc_register_driver(drive, &amp;idetape_driver);</div><div class='del'>-</div><div class='ctx'> 	kref_init(&amp;tape-&gt;kref);</div><div class='ctx'> </div><div class='ctx'> 	tape-&gt;drive = drive;</div><div class='hunk'>@@ -2687,12 +2420,11 @@ static int ide_tape_probe(ide_drive_t *drive)</div><div class='ctx'> </div><div class='ctx'> 	idetape_setup(drive, tape, minor);</div><div class='ctx'> </div><div class='del'>-	device_create_drvdata(idetape_sysfs_class, &amp;drive-&gt;gendev,</div><div class='del'>-			      MKDEV(IDETAPE_MAJOR, minor), NULL,</div><div class='del'>-			      "%s", tape-&gt;name);</div><div class='del'>-	device_create_drvdata(idetape_sysfs_class, &amp;drive-&gt;gendev,</div><div class='del'>-			      MKDEV(IDETAPE_MAJOR, minor + 128), NULL,</div><div class='del'>-			      "n%s", tape-&gt;name);</div><div class='add'>+	device_create(idetape_sysfs_class, &amp;drive-&gt;gendev,</div><div class='add'>+		      MKDEV(IDETAPE_MAJOR, minor), NULL, "%s", tape-&gt;name);</div><div class='add'>+	device_create(idetape_sysfs_class, &amp;drive-&gt;gendev,</div><div class='add'>+		      MKDEV(IDETAPE_MAJOR, minor + 128), NULL,</div><div class='add'>+		      "n%s", tape-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	g-&gt;fops = &amp;idetape_block_ops;</div><div class='ctx'> 	ide_register_region(g);</div><div class='head'>diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c<br/>index 7fb6f1c86272..bf4fb9d8d176 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/ide-taskfile.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ide/ide-taskfile.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/ide-taskfile.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/ide-taskfile.c</a></div><div class='hunk'>@@ -44,18 +44,15 @@ int taskfile_lib_get_identify (ide_drive_t *drive, u8 *buf)</div><div class='ctx'> 	memset(&amp;args, 0, sizeof(ide_task_t));</div><div class='ctx'> 	args.tf.nsect = 0x01;</div><div class='ctx'> 	if (drive-&gt;media == ide_disk)</div><div class='del'>-		args.tf.command = WIN_IDENTIFY;</div><div class='add'>+		args.tf.command = ATA_CMD_ID_ATA;</div><div class='ctx'> 	else</div><div class='del'>-		args.tf.command = WIN_PIDENTIFY;</div><div class='add'>+		args.tf.command = ATA_CMD_ID_ATAPI;</div><div class='ctx'> 	args.tf_flags	= IDE_TFLAG_TF | IDE_TFLAG_DEVICE;</div><div class='ctx'> 	args.data_phase	= TASKFILE_IN;</div><div class='ctx'> 	return ide_raw_taskfile(drive, &amp;args, buf, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ide_startstop_t task_no_data_intr(ide_drive_t *);</div><div class='del'>-static ide_startstop_t set_geometry_intr(ide_drive_t *);</div><div class='del'>-static ide_startstop_t recal_intr(ide_drive_t *);</div><div class='del'>-static ide_startstop_t set_multmode_intr(ide_drive_t *);</div><div class='ctx'> static ide_startstop_t pre_task_out_intr(ide_drive_t *, struct request *);</div><div class='ctx'> static ide_startstop_t task_in_intr(ide_drive_t *);</div><div class='ctx'> </div><div class='hunk'>@@ -79,6 +76,8 @@ ide_startstop_t do_rw_taskfile (ide_drive_t *drive, ide_task_t *task)</div><div class='ctx'> 	if (task-&gt;tf_flags &amp; IDE_TFLAG_FLAGGED)</div><div class='ctx'> 		task-&gt;tf_flags |= IDE_TFLAG_FLAGGED_SET_IN_FLAGS;</div><div class='ctx'> </div><div class='add'>+	memcpy(&amp;hwif-&gt;task, task, sizeof(*task));</div><div class='add'>+</div><div class='ctx'> 	if ((task-&gt;tf_flags &amp; IDE_TFLAG_DMA_PIO_FALLBACK) == 0) {</div><div class='ctx'> 		ide_tf_dump(drive-&gt;name, tf);</div><div class='ctx'> 		tp_ops-&gt;set_irq(hwif, 1);</div><div class='hunk'>@@ -99,19 +98,12 @@ ide_startstop_t do_rw_taskfile (ide_drive_t *drive, ide_task_t *task)</div><div class='ctx'> 	case TASKFILE_NO_DATA:</div><div class='ctx'> 		if (handler == NULL)</div><div class='ctx'> 			handler = task_no_data_intr;</div><div class='del'>-		/* WIN_{SPECIFY,RESTORE,SETMULT} use custom handlers */</div><div class='del'>-		if (task-&gt;tf_flags &amp; IDE_TFLAG_CUSTOM_HANDLER) {</div><div class='del'>-			switch (tf-&gt;command) {</div><div class='del'>-			case WIN_SPECIFY: handler = set_geometry_intr;	break;</div><div class='del'>-			case WIN_RESTORE: handler = recal_intr;		break;</div><div class='del'>-			case WIN_SETMULT: handler = set_multmode_intr;	break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='ctx'> 		ide_execute_command(drive, tf-&gt;command, handler,</div><div class='ctx'> 				    WAIT_WORSTCASE, NULL);</div><div class='ctx'> 		return ide_started;</div><div class='ctx'> 	default:</div><div class='del'>-		if (drive-&gt;using_dma == 0 || dma_ops-&gt;dma_setup(drive))</div><div class='add'>+		if ((drive-&gt;dev_flags &amp; IDE_DFLAG_USING_DMA) == 0 ||</div><div class='add'>+		    dma_ops-&gt;dma_setup(drive))</div><div class='ctx'> 			return ide_stopped;</div><div class='ctx'> 		dma_ops-&gt;dma_exec_cmd(drive, tf-&gt;command);</div><div class='ctx'> 		dma_ops-&gt;dma_start(drive);</div><div class='hunk'>@@ -121,88 +113,56 @@ ide_startstop_t do_rw_taskfile (ide_drive_t *drive, ide_task_t *task)</div><div class='ctx'> EXPORT_SYMBOL_GPL(do_rw_taskfile);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * set_multmode_intr() is invoked on completion of a WIN_SETMULT cmd.</div><div class='del'>- */</div><div class='del'>-static ide_startstop_t set_multmode_intr(ide_drive_t *drive)</div><div class='del'>-{</div><div class='del'>-	ide_hwif_t *hwif = drive-&gt;hwif;</div><div class='del'>-	u8 stat;</div><div class='del'>-</div><div class='del'>-	local_irq_enable_in_hardirq();</div><div class='del'>-	stat = hwif-&gt;tp_ops-&gt;read_status(hwif);</div><div class='del'>-</div><div class='del'>-	if (OK_STAT(stat, READY_STAT, BAD_STAT))</div><div class='del'>-		drive-&gt;mult_count = drive-&gt;mult_req;</div><div class='del'>-	else {</div><div class='del'>-		drive-&gt;mult_req = drive-&gt;mult_count = 0;</div><div class='del'>-		drive-&gt;special.b.recalibrate = 1;</div><div class='del'>-		(void) ide_dump_status(drive, "set_multmode", stat);</div><div class='del'>-	}</div><div class='del'>-	return ide_stopped;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * set_geometry_intr() is invoked on completion of a WIN_SPECIFY cmd.</div><div class='add'>+ * Handler for commands without a data phase</div><div class='ctx'>  */</div><div class='del'>-static ide_startstop_t set_geometry_intr(ide_drive_t *drive)</div><div class='add'>+static ide_startstop_t task_no_data_intr(ide_drive_t *drive)</div><div class='ctx'> {</div><div class='ctx'> 	ide_hwif_t *hwif = drive-&gt;hwif;</div><div class='del'>-	int retries = 5;</div><div class='add'>+	ide_task_t *task = &amp;hwif-&gt;task;</div><div class='add'>+	struct ide_taskfile *tf = &amp;task-&gt;tf;</div><div class='add'>+	int custom = (task-&gt;tf_flags &amp; IDE_TFLAG_CUSTOM_HANDLER) ? 1 : 0;</div><div class='add'>+	int retries = (custom &amp;&amp; tf-&gt;command == ATA_CMD_INIT_DEV_PARAMS) ? 5 : 1;</div><div class='ctx'> 	u8 stat;</div><div class='ctx'> </div><div class='ctx'> 	local_irq_enable_in_hardirq();</div><div class='ctx'> </div><div class='ctx'> 	while (1) {</div><div class='ctx'> 		stat = hwif-&gt;tp_ops-&gt;read_status(hwif);</div><div class='del'>-		if ((stat &amp; BUSY_STAT) == 0 || retries-- == 0)</div><div class='add'>+		if ((stat &amp; ATA_BUSY) == 0 || retries-- == 0)</div><div class='ctx'> 			break;</div><div class='ctx'> 		udelay(10);</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	if (OK_STAT(stat, READY_STAT, BAD_STAT))</div><div class='del'>-		return ide_stopped;</div><div class='del'>-</div><div class='del'>-	if (stat &amp; (ERR_STAT|DRQ_STAT))</div><div class='del'>-		return ide_error(drive, "set_geometry_intr", stat);</div><div class='del'>-</div><div class='del'>-	ide_set_handler(drive, &amp;set_geometry_intr, WAIT_WORSTCASE, NULL);</div><div class='del'>-	return ide_started;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * recal_intr() is invoked on completion of a WIN_RESTORE (recalibrate) cmd.</div><div class='del'>- */</div><div class='del'>-static ide_startstop_t recal_intr(ide_drive_t *drive)</div><div class='del'>-{</div><div class='del'>-	ide_hwif_t *hwif = drive-&gt;hwif;</div><div class='del'>-	u8 stat;</div><div class='del'>-</div><div class='del'>-	local_irq_enable_in_hardirq();</div><div class='del'>-	stat = hwif-&gt;tp_ops-&gt;read_status(hwif);</div><div class='del'>-</div><div class='del'>-	if (!OK_STAT(stat, READY_STAT, BAD_STAT))</div><div class='del'>-		return ide_error(drive, "recal_intr", stat);</div><div class='del'>-	return ide_stopped;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Handler for commands without a data phase</div><div class='del'>- */</div><div class='del'>-static ide_startstop_t task_no_data_intr(ide_drive_t *drive)</div><div class='del'>-{</div><div class='del'>-	ide_hwif_t *hwif = drive-&gt;hwif;</div><div class='del'>-	ide_task_t *args = hwif-&gt;hwgroup-&gt;rq-&gt;special;</div><div class='del'>-	u8 stat;</div><div class='del'>-</div><div class='del'>-	local_irq_enable_in_hardirq();</div><div class='del'>-	stat = hwif-&gt;tp_ops-&gt;read_status(hwif);</div><div class='del'>-</div><div class='del'>-	if (!OK_STAT(stat, READY_STAT, BAD_STAT))</div><div class='add'>+	if (!OK_STAT(stat, ATA_DRDY, BAD_STAT)) {</div><div class='add'>+		if (custom &amp;&amp; tf-&gt;command == ATA_CMD_SET_MULTI) {</div><div class='add'>+			drive-&gt;mult_req = drive-&gt;mult_count = 0;</div><div class='add'>+			drive-&gt;special.b.recalibrate = 1;</div><div class='add'>+			(void)ide_dump_status(drive, __func__, stat);</div><div class='add'>+			return ide_stopped;</div><div class='add'>+		} else if (custom &amp;&amp; tf-&gt;command == ATA_CMD_INIT_DEV_PARAMS) {</div><div class='add'>+			if ((stat &amp; (ATA_ERR | ATA_DRQ)) == 0) {</div><div class='add'>+				ide_set_handler(drive, &amp;task_no_data_intr,</div><div class='add'>+						WAIT_WORSTCASE, NULL);</div><div class='add'>+				return ide_started;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> 		return ide_error(drive, "task_no_data_intr", stat);</div><div class='ctx'> 		/* calls ide_end_drive_cmd */</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (args)</div><div class='add'>+	if (!custom)</div><div class='ctx'> 		ide_end_drive_cmd(drive, stat, ide_read_error(drive));</div><div class='add'>+	else if (tf-&gt;command == ATA_CMD_IDLEIMMEDIATE) {</div><div class='add'>+		hwif-&gt;tp_ops-&gt;tf_read(drive, task);</div><div class='add'>+		if (tf-&gt;lbal != 0xc4) {</div><div class='add'>+			printk(KERN_ERR "%s: head unload failed!\n",</div><div class='add'>+			       drive-&gt;name);</div><div class='add'>+			ide_tf_dump(drive-&gt;name, tf);</div><div class='add'>+		} else</div><div class='add'>+			drive-&gt;dev_flags |= IDE_DFLAG_PARKED;</div><div class='add'>+		ide_end_drive_cmd(drive, stat, ide_read_error(drive));</div><div class='add'>+	} else if (tf-&gt;command == ATA_CMD_SET_MULTI)</div><div class='add'>+		drive-&gt;mult_count = drive-&gt;mult_req;</div><div class='ctx'> </div><div class='ctx'> 	return ide_stopped;</div><div class='ctx'> }</div><div class='hunk'>@@ -220,13 +180,13 @@ static u8 wait_drive_not_busy(ide_drive_t *drive)</div><div class='ctx'> 	for (retries = 0; retries &lt; 1000; retries++) {</div><div class='ctx'> 		stat = hwif-&gt;tp_ops-&gt;read_status(hwif);</div><div class='ctx'> </div><div class='del'>-		if (stat &amp; BUSY_STAT)</div><div class='add'>+		if (stat &amp; ATA_BUSY)</div><div class='ctx'> 			udelay(10);</div><div class='ctx'> 		else</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (stat &amp; BUSY_STAT)</div><div class='add'>+	if (stat &amp; ATA_BUSY)</div><div class='ctx'> 		printk(KERN_ERR "%s: drive still BUSY!\n", drive-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	return stat;</div><div class='hunk'>@@ -385,7 +345,7 @@ void task_end_request(ide_drive_t *drive, struct request *rq, u8 stat)</div><div class='ctx'> static ide_startstop_t task_in_unexpected(ide_drive_t *drive, struct request *rq, u8 stat)</div><div class='ctx'> {</div><div class='ctx'> 	/* Command all done? */</div><div class='del'>-	if (OK_STAT(stat, READY_STAT, BUSY_STAT)) {</div><div class='add'>+	if (OK_STAT(stat, ATA_DRDY, ATA_BUSY)) {</div><div class='ctx'> 		task_end_request(drive, rq, stat);</div><div class='ctx'> 		return ide_stopped;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -405,11 +365,11 @@ static ide_startstop_t task_in_intr(ide_drive_t *drive)</div><div class='ctx'> 	u8 stat = hwif-&gt;tp_ops-&gt;read_status(hwif);</div><div class='ctx'> </div><div class='ctx'> 	/* Error? */</div><div class='del'>-	if (stat &amp; ERR_STAT)</div><div class='add'>+	if (stat &amp; ATA_ERR)</div><div class='ctx'> 		return task_error(drive, rq, __func__, stat);</div><div class='ctx'> </div><div class='ctx'> 	/* Didn't want any data? Odd. */</div><div class='del'>-	if (!(stat &amp; DRQ_STAT))</div><div class='add'>+	if ((stat &amp; ATA_DRQ) == 0)</div><div class='ctx'> 		return task_in_unexpected(drive, rq, stat);</div><div class='ctx'> </div><div class='ctx'> 	ide_pio_datablock(drive, rq, 0);</div><div class='hunk'>@@ -442,7 +402,7 @@ static ide_startstop_t task_out_intr (ide_drive_t *drive)</div><div class='ctx'> 		return task_error(drive, rq, __func__, stat);</div><div class='ctx'> </div><div class='ctx'> 	/* Deal with unexpected ATA data phase. */</div><div class='del'>-	if (((stat &amp; DRQ_STAT) == 0) ^ !hwif-&gt;nleft)</div><div class='add'>+	if (((stat &amp; ATA_DRQ) == 0) ^ !hwif-&gt;nleft)</div><div class='ctx'> 		return task_error(drive, rq, __func__, stat);</div><div class='ctx'> </div><div class='ctx'> 	if (!hwif-&gt;nleft) {</div><div class='hunk'>@@ -461,16 +421,15 @@ static ide_startstop_t pre_task_out_intr(ide_drive_t *drive, struct request *rq)</div><div class='ctx'> {</div><div class='ctx'> 	ide_startstop_t startstop;</div><div class='ctx'> </div><div class='del'>-	if (ide_wait_stat(&amp;startstop, drive, DRQ_STAT,</div><div class='add'>+	if (ide_wait_stat(&amp;startstop, drive, ATA_DRQ,</div><div class='ctx'> 			  drive-&gt;bad_wstat, WAIT_DRQ)) {</div><div class='ctx'> 		printk(KERN_ERR "%s: no DRQ after issuing %sWRITE%s\n",</div><div class='del'>-				drive-&gt;name,</div><div class='del'>-				drive-&gt;hwif-&gt;data_phase ? "MULT" : "",</div><div class='del'>-				drive-&gt;addressing ? "_EXT" : "");</div><div class='add'>+			drive-&gt;name, drive-&gt;hwif-&gt;data_phase ? "MULT" : "",</div><div class='add'>+			(drive-&gt;dev_flags &amp; IDE_DFLAG_LBA48) ? "_EXT" : "");</div><div class='ctx'> 		return startstop;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!drive-&gt;unmask)</div><div class='add'>+	if ((drive-&gt;dev_flags &amp; IDE_DFLAG_UNMASK) == 0)</div><div class='ctx'> 		local_irq_disable();</div><div class='ctx'> </div><div class='ctx'> 	ide_set_handler(drive, &amp;task_out_intr, WAIT_WORSTCASE, NULL);</div><div class='hunk'>@@ -586,7 +545,7 @@ int ide_taskfile_ioctl (ide_drive_t *drive, unsigned int cmd, unsigned long arg)</div><div class='ctx'> </div><div class='ctx'> 	args.tf_flags = IDE_TFLAG_IO_16BIT | IDE_TFLAG_DEVICE |</div><div class='ctx'> 			IDE_TFLAG_IN_TF;</div><div class='del'>-	if (drive-&gt;addressing == 1)</div><div class='add'>+	if (drive-&gt;dev_flags &amp; IDE_DFLAG_LBA48)</div><div class='ctx'> 		args.tf_flags |= (IDE_TFLAG_LBA48 | IDE_TFLAG_IN_HOB);</div><div class='ctx'> </div><div class='ctx'> 	if (req_task-&gt;out_flags.all) {</div><div class='hunk'>@@ -689,7 +648,7 @@ int ide_taskfile_ioctl (ide_drive_t *drive, unsigned int cmd, unsigned long arg)</div><div class='ctx'> 	if ((args.tf_flags &amp; IDE_TFLAG_FLAGGED_SET_IN_FLAGS) &amp;&amp;</div><div class='ctx'> 	    req_task-&gt;in_flags.all == 0) {</div><div class='ctx'> 		req_task-&gt;in_flags.all = IDE_TASKFILE_STD_IN_FLAGS;</div><div class='del'>-		if (drive-&gt;addressing == 1)</div><div class='add'>+		if (drive-&gt;dev_flags &amp; IDE_DFLAG_LBA48)</div><div class='ctx'> 			req_task-&gt;in_flags.all |= (IDE_HOB_STD_IN_FLAGS &lt;&lt; 8);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -721,110 +680,3 @@ abort:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='del'>-</div><div class='del'>-int ide_cmd_ioctl (ide_drive_t *drive, unsigned int cmd, unsigned long arg)</div><div class='del'>-{</div><div class='del'>-	u8 *buf = NULL;</div><div class='del'>-	int bufsize = 0, err = 0;</div><div class='del'>-	u8 args[4], xfer_rate = 0;</div><div class='del'>-	ide_task_t tfargs;</div><div class='del'>-	struct ide_taskfile *tf = &amp;tfargs.tf;</div><div class='del'>-	struct hd_driveid *id = drive-&gt;id;</div><div class='del'>-</div><div class='del'>-	if (NULL == (void *) arg) {</div><div class='del'>-		struct request *rq;</div><div class='del'>-</div><div class='del'>-		rq = blk_get_request(drive-&gt;queue, READ, __GFP_WAIT);</div><div class='del'>-		rq-&gt;cmd_type = REQ_TYPE_ATA_TASKFILE;</div><div class='del'>-		err = blk_execute_rq(drive-&gt;queue, NULL, rq, 0);</div><div class='del'>-		blk_put_request(rq);</div><div class='del'>-</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (copy_from_user(args, (void __user *)arg, 4))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	memset(&amp;tfargs, 0, sizeof(ide_task_t));</div><div class='del'>-	tf-&gt;feature = args[2];</div><div class='del'>-	if (args[0] == WIN_SMART) {</div><div class='del'>-		tf-&gt;nsect = args[3];</div><div class='del'>-		tf-&gt;lbal  = args[1];</div><div class='del'>-		tf-&gt;lbam  = 0x4f;</div><div class='del'>-		tf-&gt;lbah  = 0xc2;</div><div class='del'>-		tfargs.tf_flags = IDE_TFLAG_OUT_TF | IDE_TFLAG_IN_NSECT;</div><div class='del'>-	} else {</div><div class='del'>-		tf-&gt;nsect = args[1];</div><div class='del'>-		tfargs.tf_flags = IDE_TFLAG_OUT_FEATURE |</div><div class='del'>-				  IDE_TFLAG_OUT_NSECT | IDE_TFLAG_IN_NSECT;</div><div class='del'>-	}</div><div class='del'>-	tf-&gt;command = args[0];</div><div class='del'>-	tfargs.data_phase = args[3] ? TASKFILE_IN : TASKFILE_NO_DATA;</div><div class='del'>-</div><div class='del'>-	if (args[3]) {</div><div class='del'>-		tfargs.tf_flags |= IDE_TFLAG_IO_16BIT;</div><div class='del'>-		bufsize = SECTOR_WORDS * 4 * args[3];</div><div class='del'>-		buf = kzalloc(bufsize, GFP_KERNEL);</div><div class='del'>-		if (buf == NULL)</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (tf-&gt;command == WIN_SETFEATURES &amp;&amp;</div><div class='del'>-	    tf-&gt;feature == SETFEATURES_XFER &amp;&amp;</div><div class='del'>-	    tf-&gt;nsect &gt;= XFER_SW_DMA_0 &amp;&amp;</div><div class='del'>-	    (id-&gt;dma_ultra || id-&gt;dma_mword || id-&gt;dma_1word)) {</div><div class='del'>-		xfer_rate = args[1];</div><div class='del'>-		if (tf-&gt;nsect &gt; XFER_UDMA_2 &amp;&amp; !eighty_ninty_three(drive)) {</div><div class='del'>-			printk(KERN_WARNING "%s: UDMA speeds &gt;UDMA33 cannot "</div><div class='del'>-					    "be set\n", drive-&gt;name);</div><div class='del'>-			goto abort;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = ide_raw_taskfile(drive, &amp;tfargs, buf, args[3]);</div><div class='del'>-</div><div class='del'>-	args[0] = tf-&gt;status;</div><div class='del'>-	args[1] = tf-&gt;error;</div><div class='del'>-	args[2] = tf-&gt;nsect;</div><div class='del'>-</div><div class='del'>-	if (!err &amp;&amp; xfer_rate) {</div><div class='del'>-		/* active-retuning-calls future */</div><div class='del'>-		ide_set_xfer_rate(drive, xfer_rate);</div><div class='del'>-		ide_driveid_update(drive);</div><div class='del'>-	}</div><div class='del'>-abort:</div><div class='del'>-	if (copy_to_user((void __user *)arg, &amp;args, 4))</div><div class='del'>-		err = -EFAULT;</div><div class='del'>-	if (buf) {</div><div class='del'>-		if (copy_to_user((void __user *)(arg + 4), buf, bufsize))</div><div class='del'>-			err = -EFAULT;</div><div class='del'>-		kfree(buf);</div><div class='del'>-	}</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int ide_task_ioctl (ide_drive_t *drive, unsigned int cmd, unsigned long arg)</div><div class='del'>-{</div><div class='del'>-	void __user *p = (void __user *)arg;</div><div class='del'>-	int err = 0;</div><div class='del'>-	u8 args[7];</div><div class='del'>-	ide_task_t task;</div><div class='del'>-</div><div class='del'>-	if (copy_from_user(args, p, 7))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	memset(&amp;task, 0, sizeof(task));</div><div class='del'>-	memcpy(&amp;task.tf_array[7], &amp;args[1], 6);</div><div class='del'>-	task.tf.command = args[0];</div><div class='del'>-	task.tf_flags = IDE_TFLAG_TF | IDE_TFLAG_DEVICE;</div><div class='del'>-</div><div class='del'>-	err = ide_no_data_taskfile(drive, &amp;task);</div><div class='del'>-</div><div class='del'>-	args[0] = task.tf.command;</div><div class='del'>-	memcpy(&amp;args[1], &amp;task.tf_array[7], 6);</div><div class='del'>-</div><div class='del'>-	if (copy_to_user(p, args, 7))</div><div class='del'>-		err = -EFAULT;</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/ide/ide-timings.c b/drivers/ide/ide-timings.c<br/>index 8c2f8327f487..81f527af8fae 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/ide-timings.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ide/ide-timings.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/ide-timings.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/ide-timings.c</a></div><div class='hunk'>@@ -22,7 +22,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/hdreg.h&gt;</div><div class='ctx'> #include &lt;linux/ide.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -78,15 +77,15 @@ EXPORT_SYMBOL_GPL(ide_timing_find_mode);</div><div class='ctx'> </div><div class='ctx'> u16 ide_pio_cycle_time(ide_drive_t *drive, u8 pio)</div><div class='ctx'> {</div><div class='del'>-	struct hd_driveid *id = drive-&gt;id;</div><div class='add'>+	u16 *id = drive-&gt;id;</div><div class='ctx'> 	struct ide_timing *t = ide_timing_find_mode(XFER_PIO_0 + pio);</div><div class='ctx'> 	u16 cycle = 0;</div><div class='ctx'> </div><div class='del'>-	if (id-&gt;field_valid &amp; 2) {</div><div class='del'>-		if (id-&gt;capability &amp; 8)</div><div class='del'>-			cycle = id-&gt;eide_pio_iordy;</div><div class='add'>+	if (id[ATA_ID_FIELD_VALID] &amp; 2) {</div><div class='add'>+		if (ata_id_has_iordy(drive-&gt;id))</div><div class='add'>+			cycle = id[ATA_ID_EIDE_PIO_IORDY];</div><div class='ctx'> 		else</div><div class='del'>-			cycle = id-&gt;eide_pio;</div><div class='add'>+			cycle = id[ATA_ID_EIDE_PIO];</div><div class='ctx'> </div><div class='ctx'> 		/* conservative "downgrade" for all pre-ATA2 drives */</div><div class='ctx'> 		if (pio &lt; 3 &amp;&amp; cycle &lt; t-&gt;cycle)</div><div class='hunk'>@@ -138,7 +137,7 @@ EXPORT_SYMBOL_GPL(ide_timing_merge);</div><div class='ctx'> int ide_timing_compute(ide_drive_t *drive, u8 speed,</div><div class='ctx'> 		       struct ide_timing *t, int T, int UT)</div><div class='ctx'> {</div><div class='del'>-	struct hd_driveid *id = drive-&gt;id;</div><div class='add'>+	u16 *id = drive-&gt;id;</div><div class='ctx'> 	struct ide_timing *s, p;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -157,16 +156,15 @@ int ide_timing_compute(ide_drive_t *drive, u8 speed,</div><div class='ctx'> 	 * If the drive is an EIDE drive, it can tell us it needs extended</div><div class='ctx'> 	 * PIO/MWDMA cycle timing.</div><div class='ctx'> 	 */</div><div class='del'>-	if (id &amp;&amp; id-&gt;field_valid &amp; 2) {	/* EIDE drive */</div><div class='del'>-</div><div class='add'>+	if (id[ATA_ID_FIELD_VALID] &amp; 2) {	/* EIDE drive */</div><div class='ctx'> 		memset(&amp;p, 0, sizeof(p));</div><div class='ctx'> </div><div class='ctx'> 		if (speed &lt;= XFER_PIO_2)</div><div class='del'>-			p.cycle = p.cyc8b = id-&gt;eide_pio;</div><div class='add'>+			p.cycle = p.cyc8b = id[ATA_ID_EIDE_PIO];</div><div class='ctx'> 		else if (speed &lt;= XFER_PIO_5)</div><div class='del'>-			p.cycle = p.cyc8b = id-&gt;eide_pio_iordy;</div><div class='add'>+			p.cycle = p.cyc8b = id[ATA_ID_EIDE_PIO_IORDY];</div><div class='ctx'> 		else if (speed &gt;= XFER_MW_DMA_0 &amp;&amp; speed &lt;= XFER_MW_DMA_2)</div><div class='del'>-			p.cycle = id-&gt;eide_dma_min;</div><div class='add'>+			p.cycle = id[ATA_ID_EIDE_DMA_MIN];</div><div class='ctx'> </div><div class='ctx'> 		ide_timing_merge(&amp;p, t, t, IDE_TIMING_CYCLE | IDE_TIMING_CYC8B);</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c<br/>index 772451600e4d..04f8f13cb9d7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/ide.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ide/ide.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/ide.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/ide.c</a></div><div class='hunk'>@@ -44,8 +44,6 @@</div><div class='ctx'>  *  inspiration from lots of linux users, esp.  hamish@zot.apana.org.au</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define _IDE_C			/* Tell ide.h it's really us */</div><div class='del'>-</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='hunk'>@@ -58,6 +56,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/ide.h&gt;</div><div class='add'>+#include &lt;linux/hdreg.h&gt;</div><div class='ctx'> #include &lt;linux/completion.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -97,8 +96,6 @@ void ide_init_port_data(ide_hwif_t *hwif, unsigned int index)</div><div class='ctx'> 	hwif-&gt;name[2]	= 'e';</div><div class='ctx'> 	hwif-&gt;name[3]	= '0' + index;</div><div class='ctx'> </div><div class='del'>-	hwif-&gt;bus_state	= BUSSTATE_ON;</div><div class='del'>-</div><div class='ctx'> 	init_completion(&amp;hwif-&gt;gendev_rel_comp);</div><div class='ctx'> </div><div class='ctx'> 	hwif-&gt;tp_ops = &amp;default_tp_ops;</div><div class='hunk'>@@ -117,9 +114,9 @@ static void ide_port_init_devices_data(ide_hwif_t *hwif)</div><div class='ctx'> 		memset(drive, 0, sizeof(*drive));</div><div class='ctx'> </div><div class='ctx'> 		drive-&gt;media			= ide_disk;</div><div class='del'>-		drive-&gt;select.all		= (unit&lt;&lt;4)|0xa0;</div><div class='add'>+		drive-&gt;select			= (unit &lt;&lt; 4) | ATA_DEVICE_OBS;</div><div class='ctx'> 		drive-&gt;hwif			= hwif;</div><div class='del'>-		drive-&gt;ready_stat		= READY_STAT;</div><div class='add'>+		drive-&gt;ready_stat		= ATA_DRDY;</div><div class='ctx'> 		drive-&gt;bad_wstat		= BAD_W_STAT;</div><div class='ctx'> 		drive-&gt;special.b.recalibrate	= 1;</div><div class='ctx'> 		drive-&gt;special.b.set_geometry	= 1;</div><div class='hunk'>@@ -141,7 +138,7 @@ static void __ide_port_unregister_devices(ide_hwif_t *hwif)</div><div class='ctx'> 	for (i = 0; i &lt; MAX_DRIVES; i++) {</div><div class='ctx'> 		ide_drive_t *drive = &amp;hwif-&gt;drives[i];</div><div class='ctx'> </div><div class='del'>-		if (drive-&gt;present) {</div><div class='add'>+		if (drive-&gt;dev_flags &amp; IDE_DFLAG_PRESENT) {</div><div class='ctx'> 			spin_unlock_irq(&amp;ide_lock);</div><div class='ctx'> 			device_unregister(&amp;drive-&gt;gendev);</div><div class='ctx'> 			wait_for_completion(&amp;drive-&gt;gendev_rel_comp);</div><div class='hunk'>@@ -230,8 +227,7 @@ void ide_unregister(ide_hwif_t *hwif)</div><div class='ctx'> 	kfree(hwif-&gt;sg_table);</div><div class='ctx'> 	unregister_blkdev(hwif-&gt;major, hwif-&gt;name);</div><div class='ctx'> </div><div class='del'>-	if (hwif-&gt;dma_base)</div><div class='del'>-		ide_release_dma_engine(hwif);</div><div class='add'>+	ide_release_dma_engine(hwif);</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;ide_cfg_mtx);</div><div class='ctx'> }</div><div class='hunk'>@@ -253,96 +249,52 @@ void ide_init_port_hw(ide_hwif_t *hwif, hw_regs_t *hw)</div><div class='ctx'> </div><div class='ctx'> DEFINE_MUTEX(ide_setting_mtx);</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL_GPL(ide_setting_mtx);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	ide_spin_wait_hwgroup	-	wait for group</div><div class='del'>- *	@drive: drive in the group</div><div class='del'>- *</div><div class='del'>- *	Wait for an IDE device group to go non busy and then return</div><div class='del'>- *	holding the ide_lock which guards the hwgroup-&gt;busy status</div><div class='del'>- *	and right to use it.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-int ide_spin_wait_hwgroup (ide_drive_t *drive)</div><div class='del'>-{</div><div class='del'>-	ide_hwgroup_t *hwgroup = HWGROUP(drive);</div><div class='del'>-	unsigned long timeout = jiffies + (3 * HZ);</div><div class='del'>-</div><div class='del'>-	spin_lock_irq(&amp;ide_lock);</div><div class='add'>+ide_devset_get(io_32bit, io_32bit);</div><div class='ctx'> </div><div class='del'>-	while (hwgroup-&gt;busy) {</div><div class='del'>-		unsigned long lflags;</div><div class='del'>-		spin_unlock_irq(&amp;ide_lock);</div><div class='del'>-		local_irq_set(lflags);</div><div class='del'>-		if (time_after(jiffies, timeout)) {</div><div class='del'>-			local_irq_restore(lflags);</div><div class='del'>-			printk(KERN_ERR "%s: channel busy\n", drive-&gt;name);</div><div class='del'>-			return -EBUSY;</div><div class='del'>-		}</div><div class='del'>-		local_irq_restore(lflags);</div><div class='del'>-		spin_lock_irq(&amp;ide_lock);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(ide_spin_wait_hwgroup);</div><div class='del'>-</div><div class='del'>-int set_io_32bit(ide_drive_t *drive, int arg)</div><div class='add'>+static int set_io_32bit(ide_drive_t *drive, int arg)</div><div class='ctx'> {</div><div class='del'>-	if (drive-&gt;no_io_32bit)</div><div class='add'>+	if (drive-&gt;dev_flags &amp; IDE_DFLAG_NO_IO_32BIT)</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> </div><div class='ctx'> 	if (arg &lt; 0 || arg &gt; 1 + (SUPPORT_VLB_SYNC &lt;&lt; 1))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (ide_spin_wait_hwgroup(drive))</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='ctx'> 	drive-&gt;io_32bit = arg;</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irq(&amp;ide_lock);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+ide_devset_get_flag(ksettings, IDE_DFLAG_KEEP_SETTINGS);</div><div class='add'>+</div><div class='ctx'> static int set_ksettings(ide_drive_t *drive, int arg)</div><div class='ctx'> {</div><div class='ctx'> 	if (arg &lt; 0 || arg &gt; 1)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (ide_spin_wait_hwgroup(drive))</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	drive-&gt;keep_settings = arg;</div><div class='del'>-	spin_unlock_irq(&amp;ide_lock);</div><div class='add'>+	if (arg)</div><div class='add'>+		drive-&gt;dev_flags |= IDE_DFLAG_KEEP_SETTINGS;</div><div class='add'>+	else</div><div class='add'>+		drive-&gt;dev_flags &amp;= ~IDE_DFLAG_KEEP_SETTINGS;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int set_using_dma(ide_drive_t *drive, int arg)</div><div class='add'>+ide_devset_get_flag(using_dma, IDE_DFLAG_USING_DMA);</div><div class='add'>+</div><div class='add'>+static int set_using_dma(ide_drive_t *drive, int arg)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_BLK_DEV_IDEDMA</div><div class='del'>-	ide_hwif_t *hwif = drive-&gt;hwif;</div><div class='ctx'> 	int err = -EPERM;</div><div class='ctx'> </div><div class='ctx'> 	if (arg &lt; 0 || arg &gt; 1)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (!drive-&gt;id || !(drive-&gt;id-&gt;capability &amp; 1))</div><div class='add'>+	if (ata_id_has_dma(drive-&gt;id) == 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	if (hwif-&gt;dma_ops == NULL)</div><div class='add'>+	if (drive-&gt;hwif-&gt;dma_ops == NULL)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	err = -EBUSY;</div><div class='del'>-	if (ide_spin_wait_hwgroup(drive))</div><div class='del'>-		goto out;</div><div class='del'>-	/*</div><div class='del'>-	 * set -&gt;busy flag, unlock and let it ride</div><div class='del'>-	 */</div><div class='del'>-	hwif-&gt;hwgroup-&gt;busy = 1;</div><div class='del'>-	spin_unlock_irq(&amp;ide_lock);</div><div class='del'>-</div><div class='ctx'> 	err = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (arg) {</div><div class='hunk'>@@ -351,12 +303,6 @@ int set_using_dma(ide_drive_t *drive, int arg)</div><div class='ctx'> 	} else</div><div class='ctx'> 		ide_dma_off(drive);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * lock, clear -&gt;busy flag and unlock before leaving</div><div class='del'>-	 */</div><div class='del'>-	spin_lock_irq(&amp;ide_lock);</div><div class='del'>-	hwif-&gt;hwgroup-&gt;busy = 0;</div><div class='del'>-	spin_unlock_irq(&amp;ide_lock);</div><div class='ctx'> out:</div><div class='ctx'> 	return err;</div><div class='ctx'> #else</div><div class='hunk'>@@ -367,9 +313,32 @@ out:</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int set_pio_mode(ide_drive_t *drive, int arg)</div><div class='add'>+/*</div><div class='add'>+ * handle HDIO_SET_PIO_MODE ioctl abusers here, eventually it will go away</div><div class='add'>+ */</div><div class='add'>+static int set_pio_mode_abuse(ide_hwif_t *hwif, u8 req_pio)</div><div class='add'>+{</div><div class='add'>+	switch (req_pio) {</div><div class='add'>+	case 202:</div><div class='add'>+	case 201:</div><div class='add'>+	case 200:</div><div class='add'>+	case 102:</div><div class='add'>+	case 101:</div><div class='add'>+	case 100:</div><div class='add'>+		return (hwif-&gt;host_flags &amp; IDE_HFLAG_ABUSE_DMA_MODES) ? 1 : 0;</div><div class='add'>+	case 9:</div><div class='add'>+	case 8:</div><div class='add'>+		return (hwif-&gt;host_flags &amp; IDE_HFLAG_ABUSE_PREFETCH) ? 1 : 0;</div><div class='add'>+	case 7:</div><div class='add'>+	case 6:</div><div class='add'>+		return (hwif-&gt;host_flags &amp; IDE_HFLAG_ABUSE_FAST_DEVSEL) ? 1 : 0;</div><div class='add'>+	default:</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int set_pio_mode(ide_drive_t *drive, int arg)</div><div class='ctx'> {</div><div class='del'>-	struct request *rq;</div><div class='ctx'> 	ide_hwif_t *hwif = drive-&gt;hwif;</div><div class='ctx'> 	const struct ide_port_ops *port_ops = hwif-&gt;port_ops;</div><div class='ctx'> </div><div class='hunk'>@@ -380,48 +349,65 @@ int set_pio_mode(ide_drive_t *drive, int arg)</div><div class='ctx'> 	    (hwif-&gt;host_flags &amp; IDE_HFLAG_NO_SET_MODE))</div><div class='ctx'> 		return -ENOSYS;</div><div class='ctx'> </div><div class='del'>-	if (drive-&gt;special.b.set_tune)</div><div class='del'>-		return -EBUSY;</div><div class='add'>+	if (set_pio_mode_abuse(drive-&gt;hwif, arg)) {</div><div class='add'>+		if (arg == 8 || arg == 9) {</div><div class='add'>+			unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	rq = blk_get_request(drive-&gt;queue, READ, __GFP_WAIT);</div><div class='del'>-	rq-&gt;cmd_type = REQ_TYPE_ATA_TASKFILE;</div><div class='add'>+			/* take lock for IDE_DFLAG_[NO_]UNMASK/[NO_]IO_32BIT */</div><div class='add'>+			spin_lock_irqsave(&amp;ide_lock, flags);</div><div class='add'>+			port_ops-&gt;set_pio_mode(drive, arg);</div><div class='add'>+			spin_unlock_irqrestore(&amp;ide_lock, flags);</div><div class='add'>+		} else</div><div class='add'>+			port_ops-&gt;set_pio_mode(drive, arg);</div><div class='add'>+	} else {</div><div class='add'>+		int keep_dma = !!(drive-&gt;dev_flags &amp; IDE_DFLAG_USING_DMA);</div><div class='ctx'> </div><div class='del'>-	drive-&gt;tune_req = (u8) arg;</div><div class='del'>-	drive-&gt;special.b.set_tune = 1;</div><div class='add'>+		ide_set_pio(drive, arg);</div><div class='ctx'> </div><div class='del'>-	blk_execute_rq(drive-&gt;queue, NULL, rq, 0);</div><div class='del'>-	blk_put_request(rq);</div><div class='add'>+		if (hwif-&gt;host_flags &amp; IDE_HFLAG_SET_PIO_MODE_KEEP_DMA) {</div><div class='add'>+			if (keep_dma)</div><div class='add'>+				ide_dma_on(drive);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+ide_devset_get_flag(unmaskirq, IDE_DFLAG_UNMASK);</div><div class='add'>+</div><div class='ctx'> static int set_unmaskirq(ide_drive_t *drive, int arg)</div><div class='ctx'> {</div><div class='del'>-	if (drive-&gt;no_unmask)</div><div class='add'>+	if (drive-&gt;dev_flags &amp; IDE_DFLAG_NO_UNMASK)</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> </div><div class='ctx'> 	if (arg &lt; 0 || arg &gt; 1)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (ide_spin_wait_hwgroup(drive))</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	drive-&gt;unmask = arg;</div><div class='del'>-	spin_unlock_irq(&amp;ide_lock);</div><div class='add'>+	if (arg)</div><div class='add'>+		drive-&gt;dev_flags |= IDE_DFLAG_UNMASK;</div><div class='add'>+	else</div><div class='add'>+		drive-&gt;dev_flags &amp;= ~IDE_DFLAG_UNMASK;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+ide_ext_devset_rw_sync(io_32bit, io_32bit);</div><div class='add'>+ide_ext_devset_rw_sync(keepsettings, ksettings);</div><div class='add'>+ide_ext_devset_rw_sync(unmaskirq, unmaskirq);</div><div class='add'>+ide_ext_devset_rw_sync(using_dma, using_dma);</div><div class='add'>+__IDE_DEVSET(pio_mode, DS_SYNC, NULL, set_pio_mode);</div><div class='add'>+</div><div class='ctx'> static int generic_ide_suspend(struct device *dev, pm_message_t mesg)</div><div class='ctx'> {</div><div class='del'>-	ide_drive_t *drive = dev-&gt;driver_data;</div><div class='add'>+	ide_drive_t *drive = dev-&gt;driver_data, *pair = ide_get_pair_dev(drive);</div><div class='ctx'> 	ide_hwif_t *hwif = HWIF(drive);</div><div class='ctx'> 	struct request *rq;</div><div class='ctx'> 	struct request_pm_state rqpm;</div><div class='ctx'> 	ide_task_t args;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	/* Call ACPI _GTM only once */</div><div class='del'>-	if (!(drive-&gt;dn % 2))</div><div class='add'>+	/* call ACPI _GTM only once */</div><div class='add'>+	if ((drive-&gt;dn &amp; 1) == 0 || pair == NULL)</div><div class='ctx'> 		ide_acpi_get_timing(hwif);</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;rqpm, 0, sizeof(rqpm));</div><div class='hunk'>@@ -430,33 +416,32 @@ static int generic_ide_suspend(struct device *dev, pm_message_t mesg)</div><div class='ctx'> 	rq-&gt;cmd_type = REQ_TYPE_PM_SUSPEND;</div><div class='ctx'> 	rq-&gt;special = &amp;args;</div><div class='ctx'> 	rq-&gt;data = &amp;rqpm;</div><div class='del'>-	rqpm.pm_step = ide_pm_state_start_suspend;</div><div class='add'>+	rqpm.pm_step = IDE_PM_START_SUSPEND;</div><div class='ctx'> 	if (mesg.event == PM_EVENT_PRETHAW)</div><div class='ctx'> 		mesg.event = PM_EVENT_FREEZE;</div><div class='ctx'> 	rqpm.pm_state = mesg.event;</div><div class='ctx'> </div><div class='ctx'> 	ret = blk_execute_rq(drive-&gt;queue, NULL, rq, 0);</div><div class='ctx'> 	blk_put_request(rq);</div><div class='del'>-	/* only call ACPI _PS3 after both drivers are suspended */</div><div class='del'>-	if (!ret &amp;&amp; (((drive-&gt;dn % 2) &amp;&amp; hwif-&gt;drives[0].present</div><div class='del'>-		 &amp;&amp; hwif-&gt;drives[1].present)</div><div class='del'>-		 || !hwif-&gt;drives[0].present</div><div class='del'>-		 || !hwif-&gt;drives[1].present))</div><div class='add'>+</div><div class='add'>+	/* call ACPI _PS3 only after both devices are suspended */</div><div class='add'>+	if (ret == 0 &amp;&amp; ((drive-&gt;dn &amp; 1) || pair == NULL))</div><div class='ctx'> 		ide_acpi_set_state(hwif, 0);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int generic_ide_resume(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	ide_drive_t *drive = dev-&gt;driver_data;</div><div class='add'>+	ide_drive_t *drive = dev-&gt;driver_data, *pair = ide_get_pair_dev(drive);</div><div class='ctx'> 	ide_hwif_t *hwif = HWIF(drive);</div><div class='ctx'> 	struct request *rq;</div><div class='ctx'> 	struct request_pm_state rqpm;</div><div class='ctx'> 	ide_task_t args;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	/* Call ACPI _STM only once */</div><div class='del'>-	if (!(drive-&gt;dn % 2)) {</div><div class='add'>+	/* call ACPI _PS0 / _STM only once */</div><div class='add'>+	if ((drive-&gt;dn &amp; 1) == 0 || pair == NULL) {</div><div class='ctx'> 		ide_acpi_set_state(hwif, 1);</div><div class='ctx'> 		ide_acpi_push_timing(hwif);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -470,7 +455,7 @@ static int generic_ide_resume(struct device *dev)</div><div class='ctx'> 	rq-&gt;cmd_flags |= REQ_PREEMPT;</div><div class='ctx'> 	rq-&gt;special = &amp;args;</div><div class='ctx'> 	rq-&gt;data = &amp;rqpm;</div><div class='del'>-	rqpm.pm_step = ide_pm_state_start_resume;</div><div class='add'>+	rqpm.pm_step = IDE_PM_START_RESUME;</div><div class='ctx'> 	rqpm.pm_state = PM_EVENT_ON;</div><div class='ctx'> </div><div class='ctx'> 	err = blk_execute_rq(drive-&gt;queue, NULL, rq, 1);</div><div class='hunk'>@@ -486,138 +471,6 @@ static int generic_ide_resume(struct device *dev)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int generic_drive_reset(ide_drive_t *drive)</div><div class='del'>-{</div><div class='del'>-	struct request *rq;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	rq = blk_get_request(drive-&gt;queue, READ, __GFP_WAIT);</div><div class='del'>-	rq-&gt;cmd_type = REQ_TYPE_SPECIAL;</div><div class='del'>-	rq-&gt;cmd_len = 1;</div><div class='del'>-	rq-&gt;cmd[0] = REQ_DRIVE_RESET;</div><div class='del'>-	rq-&gt;cmd_flags |= REQ_SOFTBARRIER;</div><div class='del'>-	if (blk_execute_rq(drive-&gt;queue, NULL, rq, 1))</div><div class='del'>-		ret = rq-&gt;errors;</div><div class='del'>-	blk_put_request(rq);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int generic_ide_ioctl(ide_drive_t *drive, struct file *file, struct block_device *bdev,</div><div class='del'>-			unsigned int cmd, unsigned long arg)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	ide_driver_t *drv;</div><div class='del'>-	void __user *p = (void __user *)arg;</div><div class='del'>-	int err = 0, (*setfunc)(ide_drive_t *, int);</div><div class='del'>-	u8 *val;</div><div class='del'>-</div><div class='del'>-	switch (cmd) {</div><div class='del'>-	case HDIO_GET_32BIT:	    val = &amp;drive-&gt;io_32bit;	 goto read_val;</div><div class='del'>-	case HDIO_GET_KEEPSETTINGS: val = &amp;drive-&gt;keep_settings; goto read_val;</div><div class='del'>-	case HDIO_GET_UNMASKINTR:   val = &amp;drive-&gt;unmask;	 goto read_val;</div><div class='del'>-	case HDIO_GET_DMA:	    val = &amp;drive-&gt;using_dma;	 goto read_val;</div><div class='del'>-	case HDIO_SET_32BIT:	    setfunc = set_io_32bit;	 goto set_val;</div><div class='del'>-	case HDIO_SET_KEEPSETTINGS: setfunc = set_ksettings;	 goto set_val;</div><div class='del'>-	case HDIO_SET_PIO_MODE:	    setfunc = set_pio_mode;	 goto set_val;</div><div class='del'>-	case HDIO_SET_UNMASKINTR:   setfunc = set_unmaskirq;	 goto set_val;</div><div class='del'>-	case HDIO_SET_DMA:	    setfunc = set_using_dma;	 goto set_val;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (cmd) {</div><div class='del'>-		case HDIO_OBSOLETE_IDENTITY:</div><div class='del'>-		case HDIO_GET_IDENTITY:</div><div class='del'>-			if (bdev != bdev-&gt;bd_contains)</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			if (drive-&gt;id_read == 0)</div><div class='del'>-				return -ENOMSG;</div><div class='del'>-			if (copy_to_user(p, drive-&gt;id, (cmd == HDIO_GET_IDENTITY) ? sizeof(*drive-&gt;id) : 142))</div><div class='del'>-				return -EFAULT;</div><div class='del'>-			return 0;</div><div class='del'>-</div><div class='del'>-		case HDIO_GET_NICE:</div><div class='del'>-			return put_user(drive-&gt;dsc_overlap	&lt;&lt;	IDE_NICE_DSC_OVERLAP	|</div><div class='del'>-					drive-&gt;atapi_overlap	&lt;&lt;	IDE_NICE_ATAPI_OVERLAP	|</div><div class='del'>-					drive-&gt;nice1 &lt;&lt; IDE_NICE_1,</div><div class='del'>-					(long __user *) arg);</div><div class='del'>-#ifdef CONFIG_IDE_TASK_IOCTL</div><div class='del'>-		case HDIO_DRIVE_TASKFILE:</div><div class='del'>-		        if (!capable(CAP_SYS_ADMIN) || !capable(CAP_SYS_RAWIO))</div><div class='del'>-				return -EACCES;</div><div class='del'>-			switch(drive-&gt;media) {</div><div class='del'>-				case ide_disk:</div><div class='del'>-					return ide_taskfile_ioctl(drive, cmd, arg);</div><div class='del'>-				default:</div><div class='del'>-					return -ENOMSG;</div><div class='del'>-			}</div><div class='del'>-#endif /* CONFIG_IDE_TASK_IOCTL */</div><div class='del'>-</div><div class='del'>-		case HDIO_DRIVE_CMD:</div><div class='del'>-			if (!capable(CAP_SYS_RAWIO))</div><div class='del'>-				return -EACCES;</div><div class='del'>-			return ide_cmd_ioctl(drive, cmd, arg);</div><div class='del'>-</div><div class='del'>-		case HDIO_DRIVE_TASK:</div><div class='del'>-			if (!capable(CAP_SYS_RAWIO))</div><div class='del'>-				return -EACCES;</div><div class='del'>-			return ide_task_ioctl(drive, cmd, arg);</div><div class='del'>-		case HDIO_SET_NICE:</div><div class='del'>-			if (!capable(CAP_SYS_ADMIN)) return -EACCES;</div><div class='del'>-			if (arg != (arg &amp; ((1 &lt;&lt; IDE_NICE_DSC_OVERLAP) | (1 &lt;&lt; IDE_NICE_1))))</div><div class='del'>-				return -EPERM;</div><div class='del'>-			drive-&gt;dsc_overlap = (arg &gt;&gt; IDE_NICE_DSC_OVERLAP) &amp; 1;</div><div class='del'>-			drv = *(ide_driver_t **)bdev-&gt;bd_disk-&gt;private_data;</div><div class='del'>-			if (drive-&gt;dsc_overlap &amp;&amp; !drv-&gt;supports_dsc_overlap) {</div><div class='del'>-				drive-&gt;dsc_overlap = 0;</div><div class='del'>-				return -EPERM;</div><div class='del'>-			}</div><div class='del'>-			drive-&gt;nice1 = (arg &gt;&gt; IDE_NICE_1) &amp; 1;</div><div class='del'>-			return 0;</div><div class='del'>-		case HDIO_DRIVE_RESET:</div><div class='del'>-			if (!capable(CAP_SYS_ADMIN))</div><div class='del'>-				return -EACCES;</div><div class='del'>-</div><div class='del'>-			return generic_drive_reset(drive);</div><div class='del'>-</div><div class='del'>-		case HDIO_GET_BUSSTATE:</div><div class='del'>-			if (!capable(CAP_SYS_ADMIN))</div><div class='del'>-				return -EACCES;</div><div class='del'>-			if (put_user(HWIF(drive)-&gt;bus_state, (long __user *)arg))</div><div class='del'>-				return -EFAULT;</div><div class='del'>-			return 0;</div><div class='del'>-</div><div class='del'>-		case HDIO_SET_BUSSTATE:</div><div class='del'>-			if (!capable(CAP_SYS_ADMIN))</div><div class='del'>-				return -EACCES;</div><div class='del'>-			return -EOPNOTSUPP;</div><div class='del'>-		default:</div><div class='del'>-			return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-read_val:</div><div class='del'>-	mutex_lock(&amp;ide_setting_mtx);</div><div class='del'>-	spin_lock_irqsave(&amp;ide_lock, flags);</div><div class='del'>-	err = *val;</div><div class='del'>-	spin_unlock_irqrestore(&amp;ide_lock, flags);</div><div class='del'>-	mutex_unlock(&amp;ide_setting_mtx);</div><div class='del'>-	return err &gt;= 0 ? put_user(err, (long __user *)arg) : err;</div><div class='del'>-</div><div class='del'>-set_val:</div><div class='del'>-	if (bdev != bdev-&gt;bd_contains)</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-	else {</div><div class='del'>-		if (!capable(CAP_SYS_ADMIN))</div><div class='del'>-			err = -EACCES;</div><div class='del'>-		else {</div><div class='del'>-			mutex_lock(&amp;ide_setting_mtx);</div><div class='del'>-			err = setfunc(drive, arg);</div><div class='del'>-			mutex_unlock(&amp;ide_setting_mtx);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(generic_ide_ioctl);</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * ide_device_get	-	get an additional reference to a ide_drive_t</div><div class='ctx'>  * @drive:	device to get a reference to</div><div class='hunk'>@@ -710,21 +563,21 @@ static ssize_t model_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 			  char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	ide_drive_t *drive = to_ide_device(dev);</div><div class='del'>-	return sprintf(buf, "%s\n", drive-&gt;id-&gt;model);</div><div class='add'>+	return sprintf(buf, "%s\n", (char *)&amp;drive-&gt;id[ATA_ID_PROD]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t firmware_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 			     char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	ide_drive_t *drive = to_ide_device(dev);</div><div class='del'>-	return sprintf(buf, "%s\n", drive-&gt;id-&gt;fw_rev);</div><div class='add'>+	return sprintf(buf, "%s\n", (char *)&amp;drive-&gt;id[ATA_ID_FW_REV]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t serial_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 			   char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	ide_drive_t *drive = to_ide_device(dev);</div><div class='del'>-	return sprintf(buf, "%s\n", drive-&gt;id-&gt;serial_no);</div><div class='add'>+	return sprintf(buf, "%s\n", (char *)&amp;drive-&gt;id[ATA_ID_SERNO]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct device_attribute ide_dev_attrs[] = {</div><div class='hunk'>@@ -734,6 +587,7 @@ static struct device_attribute ide_dev_attrs[] = {</div><div class='ctx'> 	__ATTR_RO(model),</div><div class='ctx'> 	__ATTR_RO(firmware),</div><div class='ctx'> 	__ATTR(serial, 0400, serial_show, NULL),</div><div class='add'>+	__ATTR(unload_heads, 0644, ide_park_show, ide_park_store),</div><div class='ctx'> 	__ATTR_NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -841,7 +695,7 @@ MODULE_PARM_DESC(noprobe, "skip probing for a device");</div><div class='ctx'> static unsigned int ide_nowerr;</div><div class='ctx'> </div><div class='ctx'> module_param_call(nowerr, ide_set_dev_param_mask, NULL, &amp;ide_nowerr, 0);</div><div class='del'>-MODULE_PARM_DESC(nowerr, "ignore the WRERR_STAT bit for a device");</div><div class='add'>+MODULE_PARM_DESC(nowerr, "ignore the ATA_DF bit for a device");</div><div class='ctx'> </div><div class='ctx'> static unsigned int ide_cdroms;</div><div class='ctx'> </div><div class='hunk'>@@ -888,31 +742,31 @@ static int ide_set_disk_chs(const char *str, struct kernel_param *kp)</div><div class='ctx'> module_param_call(chs, ide_set_disk_chs, NULL, NULL, 0);</div><div class='ctx'> MODULE_PARM_DESC(chs, "force device as a disk (using CHS)");</div><div class='ctx'> </div><div class='del'>-static void ide_dev_apply_params(ide_drive_t *drive)</div><div class='add'>+static void ide_dev_apply_params(ide_drive_t *drive, u8 unit)</div><div class='ctx'> {</div><div class='del'>-	int i = drive-&gt;hwif-&gt;index * MAX_DRIVES + drive-&gt;select.b.unit;</div><div class='add'>+	int i = drive-&gt;hwif-&gt;index * MAX_DRIVES + unit;</div><div class='ctx'> </div><div class='ctx'> 	if (ide_nodma &amp; (1 &lt;&lt; i)) {</div><div class='ctx'> 		printk(KERN_INFO "ide: disallowing DMA for %s\n", drive-&gt;name);</div><div class='del'>-		drive-&gt;nodma = 1;</div><div class='add'>+		drive-&gt;dev_flags |= IDE_DFLAG_NODMA;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (ide_noflush &amp; (1 &lt;&lt; i)) {</div><div class='ctx'> 		printk(KERN_INFO "ide: disabling flush requests for %s\n",</div><div class='ctx'> 				 drive-&gt;name);</div><div class='del'>-		drive-&gt;noflush = 1;</div><div class='add'>+		drive-&gt;dev_flags |= IDE_DFLAG_NOFLUSH;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (ide_noprobe &amp; (1 &lt;&lt; i)) {</div><div class='ctx'> 		printk(KERN_INFO "ide: skipping probe for %s\n", drive-&gt;name);</div><div class='del'>-		drive-&gt;noprobe = 1;</div><div class='add'>+		drive-&gt;dev_flags |= IDE_DFLAG_NOPROBE;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (ide_nowerr &amp; (1 &lt;&lt; i)) {</div><div class='del'>-		printk(KERN_INFO "ide: ignoring the WRERR_STAT bit for %s\n",</div><div class='add'>+		printk(KERN_INFO "ide: ignoring the ATA_DF bit for %s\n",</div><div class='ctx'> 				 drive-&gt;name);</div><div class='ctx'> 		drive-&gt;bad_wstat = BAD_R_STAT;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (ide_cdroms &amp; (1 &lt;&lt; i)) {</div><div class='ctx'> 		printk(KERN_INFO "ide: forcing %s as a CD-ROM\n", drive-&gt;name);</div><div class='del'>-		drive-&gt;present = 1;</div><div class='add'>+		drive-&gt;dev_flags |= IDE_DFLAG_PRESENT;</div><div class='ctx'> 		drive-&gt;media = ide_cdrom;</div><div class='ctx'> 		/* an ATAPI device ignores DRDY */</div><div class='ctx'> 		drive-&gt;ready_stat = 0;</div><div class='hunk'>@@ -921,13 +775,14 @@ static void ide_dev_apply_params(ide_drive_t *drive)</div><div class='ctx'> 		drive-&gt;cyl  = drive-&gt;bios_cyl  = ide_disks_chs[i].cyl;</div><div class='ctx'> 		drive-&gt;head = drive-&gt;bios_head = ide_disks_chs[i].head;</div><div class='ctx'> 		drive-&gt;sect = drive-&gt;bios_sect = ide_disks_chs[i].sect;</div><div class='del'>-		drive-&gt;forced_geom = 1;</div><div class='add'>+</div><div class='ctx'> 		printk(KERN_INFO "ide: forcing %s as a disk (%d/%d/%d)\n",</div><div class='ctx'> 				 drive-&gt;name,</div><div class='ctx'> 				 drive-&gt;cyl, drive-&gt;head, drive-&gt;sect);</div><div class='del'>-		drive-&gt;present = 1;</div><div class='add'>+</div><div class='add'>+		drive-&gt;dev_flags |= IDE_DFLAG_FORCED_GEOM | IDE_DFLAG_PRESENT;</div><div class='ctx'> 		drive-&gt;media = ide_disk;</div><div class='del'>-		drive-&gt;ready_stat = READY_STAT;</div><div class='add'>+		drive-&gt;ready_stat = ATA_DRDY;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -965,7 +820,7 @@ void ide_port_apply_params(ide_hwif_t *hwif)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; MAX_DRIVES; i++)</div><div class='del'>-		ide_dev_apply_params(&amp;hwif-&gt;drives[i]);</div><div class='add'>+		ide_dev_apply_params(&amp;hwif-&gt;drives[i], i);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/drivers/ide/legacy/ali14xx.c b/drivers/ide/legacy/ali14xx.c<br/>index 4ec19737f3c5..90da1f953ed0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/legacy/ali14xx.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ide/legacy/ali14xx.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/legacy/ali14xx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/legacy/ali14xx.c</a></div><div class='hunk'>@@ -43,7 +43,6 @@</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='del'>-#include &lt;linux/hdreg.h&gt;</div><div class='ctx'> #include &lt;linux/ide.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -132,7 +131,7 @@ static void ali14xx_set_pio_mode(ide_drive_t *drive, const u8 pio)</div><div class='ctx'> 		drive-&gt;name, pio, time1, time2, param1, param2, param3, param4);</div><div class='ctx'> </div><div class='ctx'> 	/* stuff timing parameters into controller registers */</div><div class='del'>-	driveNum = (HWIF(drive)-&gt;index &lt;&lt; 1) + drive-&gt;select.b.unit;</div><div class='add'>+	driveNum = (drive-&gt;hwif-&gt;index &lt;&lt; 1) + (drive-&gt;dn &amp; 1);</div><div class='ctx'> 	spin_lock_irqsave(&amp;ali14xx_lock, flags);</div><div class='ctx'> 	outb_p(regOn, basePort);</div><div class='ctx'> 	outReg(param1, regTab[driveNum].reg1);</div><div class='head'>diff --git a/drivers/ide/legacy/buddha.c b/drivers/ide/legacy/buddha.c<br/>index 7c2afa97f417..c5a3c9ef6a5d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/legacy/buddha.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ide/legacy/buddha.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/legacy/buddha.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/legacy/buddha.c</a></div><div class='hunk'>@@ -20,7 +20,6 @@</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='del'>-#include &lt;linux/hdreg.h&gt;</div><div class='ctx'> #include &lt;linux/zorro.h&gt;</div><div class='ctx'> #include &lt;linux/ide.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/drivers/ide/legacy/dtc2278.c b/drivers/ide/legacy/dtc2278.c<br/>index af791a02a120..689b2e493413 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/legacy/dtc2278.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ide/legacy/dtc2278.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/legacy/dtc2278.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/legacy/dtc2278.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='del'>-#include &lt;linux/hdreg.h&gt;</div><div class='ctx'> #include &lt;linux/ide.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/ide/legacy/falconide.c b/drivers/ide/legacy/falconide.c<br/>index 724f95073d80..39d500d84b07 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/legacy/falconide.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ide/legacy/falconide.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/legacy/falconide.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/legacy/falconide.c</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='del'>-#include &lt;linux/hdreg.h&gt;</div><div class='ctx'> #include &lt;linux/ide.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/ide/legacy/gayle.c b/drivers/ide/legacy/gayle.c<br/>index 51ba085d7aa8..691506886561 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/legacy/gayle.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ide/legacy/gayle.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/legacy/gayle.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/legacy/gayle.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='del'>-#include &lt;linux/hdreg.h&gt;</div><div class='ctx'> #include &lt;linux/ide.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/zorro.h&gt;</div><div class='head'>diff --git a/drivers/ide/legacy/ht6560b.c b/drivers/ide/legacy/ht6560b.c<br/>index 98f7c95e39ed..c7e5c2246b79 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/legacy/ht6560b.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ide/legacy/ht6560b.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/legacy/ht6560b.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/legacy/ht6560b.c</a></div><div class='hunk'>@@ -24,7 +24,6 @@</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='del'>-#include &lt;linux/hdreg.h&gt;</div><div class='ctx'> #include &lt;linux/ide.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -121,7 +120,8 @@ static void ht6560b_selectproc (ide_drive_t *drive)</div><div class='ctx'> 	 * Need to enforce prefetch sometimes because otherwise</div><div class='ctx'> 	 * it'll hang (hard).</div><div class='ctx'> 	 */</div><div class='del'>-	if (drive-&gt;media != ide_disk || !drive-&gt;present)</div><div class='add'>+	if (drive-&gt;media != ide_disk ||</div><div class='add'>+	    (drive-&gt;dev_flags &amp; IDE_DFLAG_PRESENT) == 0)</div><div class='ctx'> 		select |= HT_PREFETCH_MODE;</div><div class='ctx'> </div><div class='ctx'> 	if (select != current_select || timing != current_timing) {</div><div class='hunk'>@@ -250,11 +250,11 @@ static void ht_set_prefetch(ide_drive_t *drive, u8 state)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (state) {</div><div class='ctx'> 		drive-&gt;drive_data |= t;   /* enable prefetch mode */</div><div class='del'>-		drive-&gt;no_unmask = 1;</div><div class='del'>-		drive-&gt;unmask = 0;</div><div class='add'>+		drive-&gt;dev_flags |= IDE_DFLAG_NO_UNMASK;</div><div class='add'>+		drive-&gt;dev_flags &amp;= ~IDE_DFLAG_UNMASK;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		drive-&gt;drive_data &amp;= ~t;  /* disable prefetch mode */</div><div class='del'>-		drive-&gt;no_unmask = 0;</div><div class='add'>+		drive-&gt;dev_flags &amp;= ~IDE_DFLAG_NO_UNMASK;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;ht6560b_lock, flags);</div><div class='head'>diff --git a/drivers/ide/legacy/ide-4drives.c b/drivers/ide/legacy/ide-4drives.c<br/>index c76d55de6996..9e85b1ec9607 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/legacy/ide-4drives.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ide/legacy/ide-4drives.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/legacy/ide-4drives.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/legacy/ide-4drives.c</a></div><div class='hunk'>@@ -14,7 +14,7 @@ MODULE_PARM_DESC(probe, "probe for generic IDE chipset with 4 drives/port");</div><div class='ctx'> static void ide_4drives_init_dev(ide_drive_t *drive)</div><div class='ctx'> {</div><div class='ctx'> 	if (drive-&gt;hwif-&gt;channel)</div><div class='del'>-		drive-&gt;select.all ^= 0x20;</div><div class='add'>+		drive-&gt;select ^= 0x20;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct ide_port_ops ide_4drives_port_ops = {</div><div class='head'>diff --git a/drivers/ide/legacy/ide-cs.c b/drivers/ide/legacy/ide-cs.c<br/>index 21bfac137844..cb199c815b53 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/legacy/ide-cs.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ide/legacy/ide-cs.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/legacy/ide-cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/legacy/ide-cs.c</a></div><div class='hunk'>@@ -38,7 +38,6 @@</div><div class='ctx'> #include &lt;linux/timer.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/ide.h&gt;</div><div class='del'>-#include &lt;linux/hdreg.h&gt;</div><div class='ctx'> #include &lt;linux/major.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='hunk'>@@ -220,103 +219,91 @@ out_release:</div><div class='ctx'> #define CS_CHECK(fn, ret) \</div><div class='ctx'> do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)</div><div class='ctx'> </div><div class='add'>+struct pcmcia_config_check {</div><div class='add'>+	unsigned long ctl_base;</div><div class='add'>+	int skip_vcc;</div><div class='add'>+	int is_kme;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int pcmcia_check_one_config(struct pcmcia_device *pdev,</div><div class='add'>+				   cistpl_cftable_entry_t *cfg,</div><div class='add'>+				   cistpl_cftable_entry_t *dflt,</div><div class='add'>+				   unsigned int vcc,</div><div class='add'>+				   void *priv_data)</div><div class='add'>+{</div><div class='add'>+	struct pcmcia_config_check *stk = priv_data;</div><div class='add'>+</div><div class='add'>+	/* Check for matching Vcc, unless we're desperate */</div><div class='add'>+	if (!stk-&gt;skip_vcc) {</div><div class='add'>+		if (cfg-&gt;vcc.present &amp; (1 &lt;&lt; CISTPL_POWER_VNOM)) {</div><div class='add'>+			if (vcc != cfg-&gt;vcc.param[CISTPL_POWER_VNOM] / 10000)</div><div class='add'>+				return -ENODEV;</div><div class='add'>+		} else if (dflt-&gt;vcc.present &amp; (1 &lt;&lt; CISTPL_POWER_VNOM)) {</div><div class='add'>+			if (vcc != dflt-&gt;vcc.param[CISTPL_POWER_VNOM] / 10000)</div><div class='add'>+				return -ENODEV;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cfg-&gt;vpp1.present &amp; (1 &lt;&lt; CISTPL_POWER_VNOM))</div><div class='add'>+		pdev-&gt;conf.Vpp = cfg-&gt;vpp1.param[CISTPL_POWER_VNOM] / 10000;</div><div class='add'>+	else if (dflt-&gt;vpp1.present &amp; (1 &lt;&lt; CISTPL_POWER_VNOM))</div><div class='add'>+		pdev-&gt;conf.Vpp = dflt-&gt;vpp1.param[CISTPL_POWER_VNOM] / 10000;</div><div class='add'>+</div><div class='add'>+	if ((cfg-&gt;io.nwin &gt; 0) || (dflt-&gt;io.nwin &gt; 0)) {</div><div class='add'>+		cistpl_io_t *io = (cfg-&gt;io.nwin) ? &amp;cfg-&gt;io : &amp;dflt-&gt;io;</div><div class='add'>+		pdev-&gt;conf.ConfigIndex = cfg-&gt;index;</div><div class='add'>+		pdev-&gt;io.BasePort1 = io-&gt;win[0].base;</div><div class='add'>+		pdev-&gt;io.IOAddrLines = io-&gt;flags &amp; CISTPL_IO_LINES_MASK;</div><div class='add'>+		if (!(io-&gt;flags &amp; CISTPL_IO_16BIT))</div><div class='add'>+			pdev-&gt;io.Attributes1 = IO_DATA_PATH_WIDTH_8;</div><div class='add'>+		if (io-&gt;nwin == 2) {</div><div class='add'>+			pdev-&gt;io.NumPorts1 = 8;</div><div class='add'>+			pdev-&gt;io.BasePort2 = io-&gt;win[1].base;</div><div class='add'>+			pdev-&gt;io.NumPorts2 = (stk-&gt;is_kme) ? 2 : 1;</div><div class='add'>+			if (pcmcia_request_io(pdev, &amp;pdev-&gt;io) != 0)</div><div class='add'>+				return -ENODEV;</div><div class='add'>+			stk-&gt;ctl_base = pdev-&gt;io.BasePort2;</div><div class='add'>+		} else if ((io-&gt;nwin == 1) &amp;&amp; (io-&gt;win[0].len &gt;= 16)) {</div><div class='add'>+			pdev-&gt;io.NumPorts1 = io-&gt;win[0].len;</div><div class='add'>+			pdev-&gt;io.NumPorts2 = 0;</div><div class='add'>+			if (pcmcia_request_io(pdev, &amp;pdev-&gt;io) != 0)</div><div class='add'>+				return -ENODEV;</div><div class='add'>+			stk-&gt;ctl_base = pdev-&gt;io.BasePort1 + 0x0e;</div><div class='add'>+		} else</div><div class='add'>+			return -ENODEV;</div><div class='add'>+		/* If we've got this far, we're done */</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ide_config(struct pcmcia_device *link)</div><div class='ctx'> {</div><div class='ctx'>     ide_info_t *info = link-&gt;priv;</div><div class='del'>-    tuple_t tuple;</div><div class='del'>-    struct {</div><div class='del'>-	u_short		buf[128];</div><div class='del'>-	cisparse_t	parse;</div><div class='del'>-	config_info_t	conf;</div><div class='del'>-	cistpl_cftable_entry_t dflt;</div><div class='del'>-    } *stk = NULL;</div><div class='del'>-    cistpl_cftable_entry_t *cfg;</div><div class='del'>-    int pass, last_ret = 0, last_fn = 0, is_kme = 0;</div><div class='add'>+    struct pcmcia_config_check *stk = NULL;</div><div class='add'>+    int last_ret = 0, last_fn = 0, is_kme = 0;</div><div class='ctx'>     unsigned long io_base, ctl_base;</div><div class='ctx'>     struct ide_host *host;</div><div class='ctx'> </div><div class='ctx'>     DEBUG(0, "ide_config(0x%p)\n", link);</div><div class='ctx'> </div><div class='del'>-    stk = kzalloc(sizeof(*stk), GFP_KERNEL);</div><div class='del'>-    if (!stk) goto err_mem;</div><div class='del'>-    cfg = &amp;stk-&gt;parse.cftable_entry;</div><div class='del'>-</div><div class='del'>-    tuple.TupleData = (cisdata_t *)&amp;stk-&gt;buf;</div><div class='del'>-    tuple.TupleOffset = 0;</div><div class='del'>-    tuple.TupleDataMax = 255;</div><div class='del'>-    tuple.Attributes = 0;</div><div class='del'>-</div><div class='ctx'>     is_kme = ((link-&gt;manf_id == MANFID_KME) &amp;&amp;</div><div class='ctx'> 	      ((link-&gt;card_id == PRODID_KME_KXLC005_A) ||</div><div class='ctx'> 	       (link-&gt;card_id == PRODID_KME_KXLC005_B)));</div><div class='ctx'> </div><div class='del'>-    /* Not sure if this is right... look up the current Vcc */</div><div class='del'>-    CS_CHECK(GetConfigurationInfo, pcmcia_get_configuration_info(link, &amp;stk-&gt;conf));</div><div class='del'>-</div><div class='del'>-    pass = io_base = ctl_base = 0;</div><div class='del'>-    tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;</div><div class='del'>-    tuple.Attributes = 0;</div><div class='del'>-    CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &amp;tuple));</div><div class='del'>-    while (1) {</div><div class='del'>-    	if (pcmcia_get_tuple_data(link, &amp;tuple) != 0) goto next_entry;</div><div class='del'>-	if (pcmcia_parse_tuple(link, &amp;tuple, &amp;stk-&gt;parse) != 0) goto next_entry;</div><div class='del'>-</div><div class='del'>-	/* Check for matching Vcc, unless we're desperate */</div><div class='del'>-	if (!pass) {</div><div class='del'>-	    if (cfg-&gt;vcc.present &amp; (1 &lt;&lt; CISTPL_POWER_VNOM)) {</div><div class='del'>-		if (stk-&gt;conf.Vcc != cfg-&gt;vcc.param[CISTPL_POWER_VNOM] / 10000)</div><div class='del'>-		    goto next_entry;</div><div class='del'>-	    } else if (stk-&gt;dflt.vcc.present &amp; (1 &lt;&lt; CISTPL_POWER_VNOM)) {</div><div class='del'>-		if (stk-&gt;conf.Vcc != stk-&gt;dflt.vcc.param[CISTPL_POWER_VNOM] / 10000)</div><div class='del'>-		    goto next_entry;</div><div class='del'>-	    }</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (cfg-&gt;vpp1.present &amp; (1 &lt;&lt; CISTPL_POWER_VNOM))</div><div class='del'>-	    link-&gt;conf.Vpp =</div><div class='del'>-		cfg-&gt;vpp1.param[CISTPL_POWER_VNOM] / 10000;</div><div class='del'>-	else if (stk-&gt;dflt.vpp1.present &amp; (1 &lt;&lt; CISTPL_POWER_VNOM))</div><div class='del'>-	    link-&gt;conf.Vpp =</div><div class='del'>-		stk-&gt;dflt.vpp1.param[CISTPL_POWER_VNOM] / 10000;</div><div class='del'>-</div><div class='del'>-	if ((cfg-&gt;io.nwin &gt; 0) || (stk-&gt;dflt.io.nwin &gt; 0)) {</div><div class='del'>-	    cistpl_io_t *io = (cfg-&gt;io.nwin) ? &amp;cfg-&gt;io : &amp;stk-&gt;dflt.io;</div><div class='del'>-	    link-&gt;conf.ConfigIndex = cfg-&gt;index;</div><div class='del'>-	    link-&gt;io.BasePort1 = io-&gt;win[0].base;</div><div class='del'>-	    link-&gt;io.IOAddrLines = io-&gt;flags &amp; CISTPL_IO_LINES_MASK;</div><div class='del'>-	    if (!(io-&gt;flags &amp; CISTPL_IO_16BIT))</div><div class='del'>-		link-&gt;io.Attributes1 = IO_DATA_PATH_WIDTH_8;</div><div class='del'>-	    if (io-&gt;nwin == 2) {</div><div class='del'>-		link-&gt;io.NumPorts1 = 8;</div><div class='del'>-		link-&gt;io.BasePort2 = io-&gt;win[1].base;</div><div class='del'>-		link-&gt;io.NumPorts2 = (is_kme) ? 2 : 1;</div><div class='del'>-		if (pcmcia_request_io(link, &amp;link-&gt;io) != 0)</div><div class='del'>-			goto next_entry;</div><div class='del'>-		io_base = link-&gt;io.BasePort1;</div><div class='del'>-		ctl_base = link-&gt;io.BasePort2;</div><div class='del'>-	    } else if ((io-&gt;nwin == 1) &amp;&amp; (io-&gt;win[0].len &gt;= 16)) {</div><div class='del'>-		link-&gt;io.NumPorts1 = io-&gt;win[0].len;</div><div class='del'>-		link-&gt;io.NumPorts2 = 0;</div><div class='del'>-		if (pcmcia_request_io(link, &amp;link-&gt;io) != 0)</div><div class='del'>-			goto next_entry;</div><div class='del'>-		io_base = link-&gt;io.BasePort1;</div><div class='del'>-		ctl_base = link-&gt;io.BasePort1 + 0x0e;</div><div class='del'>-	    } else goto next_entry;</div><div class='del'>-	    /* If we've got this far, we're done */</div><div class='del'>-	    break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-    next_entry:</div><div class='del'>-	if (cfg-&gt;flags &amp; CISTPL_CFTABLE_DEFAULT)</div><div class='del'>-	    memcpy(&amp;stk-&gt;dflt, cfg, sizeof(stk-&gt;dflt));</div><div class='del'>-	if (pass) {</div><div class='del'>-	    CS_CHECK(GetNextTuple, pcmcia_get_next_tuple(link, &amp;tuple));</div><div class='del'>-	} else if (pcmcia_get_next_tuple(link, &amp;tuple) != 0) {</div><div class='del'>-	    CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &amp;tuple));</div><div class='del'>-	    memset(&amp;stk-&gt;dflt, 0, sizeof(stk-&gt;dflt));</div><div class='del'>-	    pass++;</div><div class='del'>-	}</div><div class='add'>+    stk = kzalloc(sizeof(*stk), GFP_KERNEL);</div><div class='add'>+    if (!stk)</div><div class='add'>+	    goto err_mem;</div><div class='add'>+    stk-&gt;is_kme = is_kme;</div><div class='add'>+    stk-&gt;skip_vcc = io_base = ctl_base = 0;</div><div class='add'>+</div><div class='add'>+    if (pcmcia_loop_config(link, pcmcia_check_one_config, stk)) {</div><div class='add'>+	    stk-&gt;skip_vcc = 1;</div><div class='add'>+	    if (pcmcia_loop_config(link, pcmcia_check_one_config, stk))</div><div class='add'>+		    goto failed; /* No suitable config found */</div><div class='ctx'>     }</div><div class='add'>+    io_base = link-&gt;io.BasePort1;</div><div class='add'>+    ctl_base = stk-&gt;ctl_base;</div><div class='ctx'> </div><div class='ctx'>     CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &amp;link-&gt;irq));</div><div class='ctx'>     CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &amp;link-&gt;conf));</div><div class='hunk'>@@ -404,8 +391,10 @@ static struct pcmcia_device_id ide_ids[] = {</div><div class='ctx'> 	PCMCIA_DEVICE_MANF_CARD(0x000a, 0x0000),	/* I-O Data CFA */</div><div class='ctx'> 	PCMCIA_DEVICE_MANF_CARD(0x001c, 0x0001),	/* Mitsubishi CFA */</div><div class='ctx'> 	PCMCIA_DEVICE_MANF_CARD(0x0032, 0x0704),</div><div class='add'>+	PCMCIA_DEVICE_MANF_CARD(0x0032, 0x2904),</div><div class='ctx'> 	PCMCIA_DEVICE_MANF_CARD(0x0045, 0x0401),	/* SanDisk CFA */</div><div class='ctx'> 	PCMCIA_DEVICE_MANF_CARD(0x004f, 0x0000),	/* Kingston */</div><div class='add'>+	PCMCIA_DEVICE_MANF_CARD(0x0097, 0x1620), 	/* TI emulated */</div><div class='ctx'> 	PCMCIA_DEVICE_MANF_CARD(0x0098, 0x0000),	/* Toshiba */</div><div class='ctx'> 	PCMCIA_DEVICE_MANF_CARD(0x00a4, 0x002d),</div><div class='ctx'> 	PCMCIA_DEVICE_MANF_CARD(0x00ce, 0x0000),	/* Samsung */</div><div class='head'>diff --git a/drivers/ide/legacy/macide.c b/drivers/ide/legacy/macide.c<br/>index a0bb167980e7..43f97cc1d30e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/legacy/macide.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ide/legacy/macide.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/legacy/macide.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/legacy/macide.c</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='del'>-#include &lt;linux/hdreg.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/ide.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/ide/legacy/q40ide.c b/drivers/ide/legacy/q40ide.c<br/>index 4abd8fc78197..4af4a8ce4cdf 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/legacy/q40ide.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ide/legacy/q40ide.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/legacy/q40ide.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/legacy/q40ide.c</a></div><div class='hunk'>@@ -14,8 +14,6 @@</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='del'>-#include &lt;linux/hdreg.h&gt;</div><div class='del'>-</div><div class='ctx'> #include &lt;linux/ide.h&gt;</div><div class='ctx'> </div><div class='ctx'>     /*</div><div class='head'>diff --git a/drivers/ide/legacy/qd65xx.c b/drivers/ide/legacy/qd65xx.c<br/>index 2338f344ea24..bc27c7aba936 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/legacy/qd65xx.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ide/legacy/qd65xx.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/legacy/qd65xx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/legacy/qd65xx.c</a></div><div class='hunk'>@@ -27,7 +27,6 @@</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='del'>-#include &lt;linux/hdreg.h&gt;</div><div class='ctx'> #include &lt;linux/ide.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='hunk'>@@ -151,12 +150,14 @@ static int qd_find_disk_type (ide_drive_t *drive,</div><div class='ctx'> 		int *active_time, int *recovery_time)</div><div class='ctx'> {</div><div class='ctx'> 	struct qd65xx_timing_s *p;</div><div class='del'>-	char model[40];</div><div class='add'>+	char *m = (char *)&amp;drive-&gt;id[ATA_ID_PROD];</div><div class='add'>+	char model[ATA_ID_PROD_LEN];</div><div class='ctx'> </div><div class='del'>-	if (!*drive-&gt;id-&gt;model) return 0;</div><div class='add'>+	if (*m == 0)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-	strncpy(model,drive-&gt;id-&gt;model,40);</div><div class='del'>-	ide_fixstring(model,40,1); /* byte-swap */</div><div class='add'>+	strncpy(model, m, ATA_ID_PROD_LEN);</div><div class='add'>+	ide_fixstring(model, ATA_ID_PROD_LEN, 1); /* byte-swap */</div><div class='ctx'> </div><div class='ctx'> 	for (p = qd65xx_timing ; p-&gt;offset != -1 ; p++) {</div><div class='ctx'> 		if (!strncmp(p-&gt;model, model+p-&gt;offset, 4)) {</div><div class='hunk'>@@ -185,20 +186,20 @@ static void qd_set_timing (ide_drive_t *drive, u8 timing)</div><div class='ctx'> </div><div class='ctx'> static void qd6500_set_pio_mode(ide_drive_t *drive, const u8 pio)</div><div class='ctx'> {</div><div class='add'>+	u16 *id = drive-&gt;id;</div><div class='ctx'> 	int active_time   = 175;</div><div class='ctx'> 	int recovery_time = 415; /* worst case values from the dos driver */</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * FIXME: use "pio" value</div><div class='ctx'> 	 */</div><div class='del'>-	if (drive-&gt;id &amp;&amp; !qd_find_disk_type(drive, &amp;active_time, &amp;recovery_time)</div><div class='del'>-		&amp;&amp; drive-&gt;id-&gt;tPIO &amp;&amp; (drive-&gt;id-&gt;field_valid &amp; 0x02)</div><div class='del'>-		&amp;&amp; drive-&gt;id-&gt;eide_pio &gt;= 240) {</div><div class='del'>-</div><div class='add'>+	if (!qd_find_disk_type(drive, &amp;active_time, &amp;recovery_time) &amp;&amp;</div><div class='add'>+	    (id[ATA_ID_OLD_PIO_MODES] &amp; 0xff) &amp;&amp; (id[ATA_ID_FIELD_VALID] &amp; 2) &amp;&amp;</div><div class='add'>+	    id[ATA_ID_EIDE_PIO] &gt;= 240) {</div><div class='ctx'> 		printk(KERN_INFO "%s: PIO mode%d\n", drive-&gt;name,</div><div class='del'>-				drive-&gt;id-&gt;tPIO);</div><div class='add'>+			id[ATA_ID_OLD_PIO_MODES] &amp; 0xff);</div><div class='ctx'> 		active_time = 110;</div><div class='del'>-		recovery_time = drive-&gt;id-&gt;eide_pio - 120;</div><div class='add'>+		recovery_time = drive-&gt;id[ATA_ID_EIDE_PIO] - 120;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	qd_set_timing(drive, qd6500_compute_timing(HWIF(drive), active_time, recovery_time));</div><div class='hunk'>@@ -304,7 +305,7 @@ static void __init qd6580_init_dev(ide_drive_t *drive)</div><div class='ctx'> 	} else</div><div class='ctx'> 		t2 = t1 = hwif-&gt;channel ? QD6580_DEF_DATA2 : QD6580_DEF_DATA;</div><div class='ctx'> </div><div class='del'>-	drive-&gt;drive_data = drive-&gt;select.b.unit ? t2 : t1;</div><div class='add'>+	drive-&gt;drive_data = (drive-&gt;dn &amp; 1) ? t2 : t1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct ide_port_ops qd6500_port_ops = {</div><div class='head'>diff --git a/drivers/ide/legacy/umc8672.c b/drivers/ide/legacy/umc8672.c<br/>index b54a14a57755..1da076e0c917 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/legacy/umc8672.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ide/legacy/umc8672.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/legacy/umc8672.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/legacy/umc8672.c</a></div><div class='hunk'>@@ -45,7 +45,6 @@</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='del'>-#include &lt;linux/hdreg.h&gt;</div><div class='ctx'> #include &lt;linux/ide.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/ide/mips/au1xxx-ide.c b/drivers/ide/mips/au1xxx-ide.c<br/>index 11b7f61aae40..0ec8fd1e4dcb 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/mips/au1xxx-ide.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ide/mips/au1xxx-ide.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/mips/au1xxx-ide.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/mips/au1xxx-ide.c</a></div><div class='hunk'>@@ -322,11 +322,7 @@ static int auide_dma_setup(ide_drive_t *drive)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int auide_dma_test_irq(ide_drive_t *drive)</div><div class='del'>-{	</div><div class='del'>-	if (drive-&gt;waiting_for_dma == 0)</div><div class='del'>-		printk(KERN_WARNING "%s: ide_dma_test_irq \</div><div class='del'>-                                     called while not waiting\n", drive-&gt;name);</div><div class='del'>-</div><div class='add'>+{</div><div class='ctx'> 	/* If dbdma didn't execute the STOP command yet, the</div><div class='ctx'> 	 * active bit is still set</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -344,11 +340,6 @@ static void auide_dma_host_set(ide_drive_t *drive, int on)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void auide_dma_lost_irq(ide_drive_t *drive)</div><div class='del'>-{</div><div class='del'>-	printk(KERN_ERR "%s: IRQ lost\n", drive-&gt;name);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void auide_ddma_tx_callback(int irq, void *param)</div><div class='ctx'> {</div><div class='ctx'> 	_auide_hwif *ahwif = (_auide_hwif*)param;</div><div class='hunk'>@@ -375,18 +366,6 @@ static void auide_init_dbdma_dev(dbdev_tab_t *dev, u32 dev_id, u32 tsize, u32 de</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA</div><div class='del'>-static void auide_dma_timeout(ide_drive_t *drive)</div><div class='del'>-{</div><div class='del'>-	ide_hwif_t *hwif = HWIF(drive);</div><div class='del'>-</div><div class='del'>-	printk(KERN_ERR "%s: DMA timeout occurred: ", drive-&gt;name);</div><div class='del'>-</div><div class='del'>-	if (auide_dma_test_irq(drive))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	auide_dma_end(drive);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static const struct ide_dma_ops au1xxx_dma_ops = {</div><div class='ctx'> 	.dma_host_set		= auide_dma_host_set,</div><div class='ctx'> 	.dma_setup		= auide_dma_setup,</div><div class='hunk'>@@ -394,8 +373,8 @@ static const struct ide_dma_ops au1xxx_dma_ops = {</div><div class='ctx'> 	.dma_start		= auide_dma_start,</div><div class='ctx'> 	.dma_end		= auide_dma_end,</div><div class='ctx'> 	.dma_test_irq		= auide_dma_test_irq,</div><div class='del'>-	.dma_lost_irq		= auide_dma_lost_irq,</div><div class='del'>-	.dma_timeout		= auide_dma_timeout,</div><div class='add'>+	.dma_lost_irq		= ide_dma_lost_irq,</div><div class='add'>+	.dma_timeout		= ide_dma_timeout,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int auide_ddma_init(ide_hwif_t *hwif, const struct ide_port_info *d)</div><div class='hunk'>@@ -448,10 +427,9 @@ static int auide_ddma_init(ide_hwif_t *hwif, const struct ide_port_info *d)</div><div class='ctx'> 							     NUM_DESCRIPTORS);</div><div class='ctx'> 	auide-&gt;rx_desc_head = (void*)au1xxx_dbdma_ring_alloc(auide-&gt;rx_chan,</div><div class='ctx'> 							     NUM_DESCRIPTORS);</div><div class='del'>- </div><div class='del'>-	hwif-&gt;dmatable_cpu = dma_alloc_coherent(hwif-&gt;dev,</div><div class='del'>-						PRD_ENTRIES * PRD_BYTES,        /* 1 Page */</div><div class='del'>-						&amp;hwif-&gt;dmatable_dma, GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	/* FIXME: check return value */</div><div class='add'>+	(void)ide_allocate_dma_engine(hwif);</div><div class='ctx'> 	</div><div class='ctx'> 	au1xxx_dbdma_start( auide-&gt;tx_chan );</div><div class='ctx'> 	au1xxx_dbdma_start( auide-&gt;rx_chan );</div><div class='head'>diff --git a/drivers/ide/pci/aec62xx.c b/drivers/ide/pci/aec62xx.c<br/>index 3187215e8f89..4142c698e0d3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/pci/aec62xx.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ide/pci/aec62xx.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/pci/aec62xx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/pci/aec62xx.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/hdreg.h&gt;</div><div class='ctx'> #include &lt;linux/ide.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -116,7 +115,7 @@ static void aec6260_set_mode(ide_drive_t *drive, const u8 speed)</div><div class='ctx'> 	struct pci_dev *dev	= to_pci_dev(hwif-&gt;dev);</div><div class='ctx'> 	struct ide_host *host	= pci_get_drvdata(dev);</div><div class='ctx'> 	struct chipset_bus_clock_list_entry *bus_clock = host-&gt;host_priv;</div><div class='del'>-	u8 unit		= (drive-&gt;select.b.unit &amp; 0x01);</div><div class='add'>+	u8 unit			= drive-&gt;dn &amp; 1;</div><div class='ctx'> 	u8 tmp1 = 0, tmp2 = 0;</div><div class='ctx'> 	u8 ultra = 0, drive_conf = 0, ultra_conf = 0;</div><div class='ctx'> 	unsigned long flags;</div><div class='hunk'>@@ -140,7 +139,7 @@ static void aec_set_pio_mode(ide_drive_t *drive, const u8 pio)</div><div class='ctx'> 	drive-&gt;hwif-&gt;port_ops-&gt;set_dma_mode(drive, pio + XFER_PIO_0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned int __devinit init_chipset_aec62xx(struct pci_dev *dev)</div><div class='add'>+static unsigned int init_chipset_aec62xx(struct pci_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	/* These are necessary to get AEC6280 Macintosh cards to work */</div><div class='ctx'> 	if ((dev-&gt;device == PCI_DEVICE_ID_ARTOP_ATP865) ||</div><div class='hunk'>@@ -303,21 +302,23 @@ static const struct pci_device_id aec62xx_pci_tbl[] = {</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, aec62xx_pci_tbl);</div><div class='ctx'> </div><div class='del'>-static struct pci_driver driver = {</div><div class='add'>+static struct pci_driver aec62xx_pci_driver = {</div><div class='ctx'> 	.name		= "AEC62xx_IDE",</div><div class='ctx'> 	.id_table	= aec62xx_pci_tbl,</div><div class='ctx'> 	.probe		= aec62xx_init_one,</div><div class='ctx'> 	.remove		= __devexit_p(aec62xx_remove),</div><div class='add'>+	.suspend	= ide_pci_suspend,</div><div class='add'>+	.resume		= ide_pci_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init aec62xx_ide_init(void)</div><div class='ctx'> {</div><div class='del'>-	return ide_pci_register_driver(&amp;driver);</div><div class='add'>+	return ide_pci_register_driver(&amp;aec62xx_pci_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit aec62xx_ide_exit(void)</div><div class='ctx'> {</div><div class='del'>-	pci_unregister_driver(&amp;driver);</div><div class='add'>+	pci_unregister_driver(&amp;aec62xx_pci_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(aec62xx_ide_init);</div><div class='head'>diff --git a/drivers/ide/pci/alim15x3.c b/drivers/ide/pci/alim15x3.c<br/>index d647526af557..daf9dce39e52 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/pci/alim15x3.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ide/pci/alim15x3.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/pci/alim15x3.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/pci/alim15x3.c</a></div><div class='hunk'>@@ -31,7 +31,6 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/hdreg.h&gt;</div><div class='ctx'> #include &lt;linux/ide.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/dmi.h&gt;</div><div class='hunk'>@@ -78,8 +77,7 @@ static void ali_set_pio_mode(ide_drive_t *drive, const u8 pio)</div><div class='ctx'> 	int bus_speed = ide_pci_clk ? ide_pci_clk : 33;</div><div class='ctx'> 	int port = hwif-&gt;channel ? 0x5c : 0x58;</div><div class='ctx'> 	int portFIFO = hwif-&gt;channel ? 0x55 : 0x54;</div><div class='del'>-	u8 cd_dma_fifo = 0;</div><div class='del'>-	int unit = drive-&gt;select.b.unit &amp; 1;</div><div class='add'>+	u8 cd_dma_fifo = 0, unit = drive-&gt;dn &amp; 1;</div><div class='ctx'> </div><div class='ctx'> 	if ((s_clc = (s_time * bus_speed + 999) / 1000) &gt;= 8)</div><div class='ctx'> 		s_clc = 0;</div><div class='hunk'>@@ -113,7 +111,7 @@ static void ali_set_pio_mode(ide_drive_t *drive, const u8 pio)</div><div class='ctx'> 	}</div><div class='ctx'> 	</div><div class='ctx'> 	pci_write_config_byte(dev, port, s_clc);</div><div class='del'>-	pci_write_config_byte(dev, port+drive-&gt;select.b.unit+2, (a_clc &lt;&lt; 4) | r_clc);</div><div class='add'>+	pci_write_config_byte(dev, port + unit + 2, (a_clc &lt;&lt; 4) | r_clc);</div><div class='ctx'> 	local_irq_restore(flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -134,8 +132,8 @@ static u8 ali_udma_filter(ide_drive_t *drive)</div><div class='ctx'> 	if (m5229_revision &gt; 0x20 &amp;&amp; m5229_revision &lt; 0xC2) {</div><div class='ctx'> 		if (drive-&gt;media != ide_disk)</div><div class='ctx'> 			return 0;</div><div class='del'>-		if (chip_is_1543c_e &amp;&amp; strstr(drive-&gt;id-&gt;model, "WDC ") &amp;&amp;</div><div class='del'>-		    wdc_udma == 0)</div><div class='add'>+		if (wdc_udma == 0 &amp;&amp; chip_is_1543c_e &amp;&amp;</div><div class='add'>+		    strstr((char *)&amp;drive-&gt;id[ATA_ID_PROD], "WDC "))</div><div class='ctx'> 			return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -155,7 +153,7 @@ static void ali_set_dma_mode(ide_drive_t *drive, const u8 speed)</div><div class='ctx'> 	ide_hwif_t *hwif	= HWIF(drive);</div><div class='ctx'> 	struct pci_dev *dev	= to_pci_dev(hwif-&gt;dev);</div><div class='ctx'> 	u8 speed1		= speed;</div><div class='del'>-	u8 unit			= (drive-&gt;select.b.unit &amp; 0x01);</div><div class='add'>+	u8 unit			= drive-&gt;dn &amp; 1;</div><div class='ctx'> 	u8 tmpbyte		= 0x00;</div><div class='ctx'> 	int m5229_udma		= (hwif-&gt;channel) ? 0x57 : 0x56;</div><div class='ctx'> </div><div class='hunk'>@@ -214,7 +212,7 @@ static int ali15x3_dma_setup(ide_drive_t *drive)</div><div class='ctx'>  *	appropriate also sets up the 1533 southbridge.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static unsigned int __devinit init_chipset_ali15x3(struct pci_dev *dev)</div><div class='add'>+static unsigned int init_chipset_ali15x3(struct pci_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	u8 tmpbyte;</div><div class='hunk'>@@ -509,7 +507,7 @@ static const struct ide_dma_ops ali_dma_ops = {</div><div class='ctx'> 	.dma_setup		= ali15x3_dma_setup,</div><div class='ctx'> 	.dma_exec_cmd		= ide_dma_exec_cmd,</div><div class='ctx'> 	.dma_start		= ide_dma_start,</div><div class='del'>-	.dma_end		= __ide_dma_end,</div><div class='add'>+	.dma_end		= ide_dma_end,</div><div class='ctx'> 	.dma_test_irq		= ide_dma_test_irq,</div><div class='ctx'> 	.dma_lost_irq		= ide_dma_lost_irq,</div><div class='ctx'> 	.dma_timeout		= ide_dma_timeout,</div><div class='hunk'>@@ -577,21 +575,23 @@ static const struct pci_device_id alim15x3_pci_tbl[] = {</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, alim15x3_pci_tbl);</div><div class='ctx'> </div><div class='del'>-static struct pci_driver driver = {</div><div class='add'>+static struct pci_driver alim15x3_pci_driver = {</div><div class='ctx'> 	.name		= "ALI15x3_IDE",</div><div class='ctx'> 	.id_table	= alim15x3_pci_tbl,</div><div class='ctx'> 	.probe		= alim15x3_init_one,</div><div class='ctx'> 	.remove		= ide_pci_remove,</div><div class='add'>+	.suspend	= ide_pci_suspend,</div><div class='add'>+	.resume		= ide_pci_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init ali15x3_ide_init(void)</div><div class='ctx'> {</div><div class='del'>-	return ide_pci_register_driver(&amp;driver);</div><div class='add'>+	return ide_pci_register_driver(&amp;alim15x3_pci_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit ali15x3_ide_exit(void)</div><div class='ctx'> {</div><div class='del'>-	return pci_unregister_driver(&amp;driver);</div><div class='add'>+	return pci_unregister_driver(&amp;alim15x3_pci_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(ali15x3_ide_init);</div><div class='head'>diff --git a/drivers/ide/pci/amd74xx.c b/drivers/ide/pci/amd74xx.c<br/>index 1e66a960a96a..81ec73134eda 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/pci/amd74xx.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ide/pci/amd74xx.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/pci/amd74xx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/pci/amd74xx.c</a></div><div class='hunk'>@@ -92,7 +92,7 @@ static void amd_set_drive(ide_drive_t *drive, const u8 speed)</div><div class='ctx'> </div><div class='ctx'> 	ide_timing_compute(drive, speed, &amp;t, T, UT);</div><div class='ctx'> </div><div class='del'>-	if (peer-&gt;present) {</div><div class='add'>+	if (peer-&gt;dev_flags &amp; IDE_DFLAG_PRESENT) {</div><div class='ctx'> 		ide_timing_compute(peer, peer-&gt;current_speed, &amp;p, T, UT);</div><div class='ctx'> 		ide_timing_merge(&amp;p, &amp;t, &amp;t, IDE_TIMING_8BIT);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -112,13 +112,13 @@ static void amd_set_pio_mode(ide_drive_t *drive, const u8 pio)</div><div class='ctx'> 	amd_set_drive(drive, XFER_PIO_0 + pio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devinit amd7409_cable_detect(struct pci_dev *dev)</div><div class='add'>+static void amd7409_cable_detect(struct pci_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	/* no host side cable detection */</div><div class='ctx'> 	amd_80w = 0x03;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devinit amd7411_cable_detect(struct pci_dev *dev)</div><div class='add'>+static void amd7411_cable_detect(struct pci_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	u32 u = 0;</div><div class='hunk'>@@ -140,7 +140,7 @@ static void __devinit amd7411_cable_detect(struct pci_dev *dev)</div><div class='ctx'>  * The initialization callback.  Initialize drive independent registers.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static unsigned int __devinit init_chipset_amd74xx(struct pci_dev *dev)</div><div class='add'>+static unsigned int init_chipset_amd74xx(struct pci_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	u8 t = 0, offset = amd_offset(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -319,21 +319,23 @@ static const struct pci_device_id amd74xx_pci_tbl[] = {</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, amd74xx_pci_tbl);</div><div class='ctx'> </div><div class='del'>-static struct pci_driver driver = {</div><div class='add'>+static struct pci_driver amd74xx_pci_driver = {</div><div class='ctx'> 	.name		= "AMD_IDE",</div><div class='ctx'> 	.id_table	= amd74xx_pci_tbl,</div><div class='ctx'> 	.probe		= amd74xx_probe,</div><div class='ctx'> 	.remove		= ide_pci_remove,</div><div class='add'>+	.suspend	= ide_pci_suspend,</div><div class='add'>+	.resume		= ide_pci_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init amd74xx_ide_init(void)</div><div class='ctx'> {</div><div class='del'>-	return ide_pci_register_driver(&amp;driver);</div><div class='add'>+	return ide_pci_register_driver(&amp;amd74xx_pci_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit amd74xx_ide_exit(void)</div><div class='ctx'> {</div><div class='del'>-	pci_unregister_driver(&amp;driver);</div><div class='add'>+	pci_unregister_driver(&amp;amd74xx_pci_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(amd74xx_ide_init);</div><div class='head'>diff --git a/drivers/ide/pci/atiixp.c b/drivers/ide/pci/atiixp.c<br/>index 41f6cb6c163a..b2735d28f5cc 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/pci/atiixp.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ide/pci/atiixp.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/pci/atiixp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/pci/atiixp.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/hdreg.h&gt;</div><div class='ctx'> #include &lt;linux/ide.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -183,21 +182,23 @@ static const struct pci_device_id atiixp_pci_tbl[] = {</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, atiixp_pci_tbl);</div><div class='ctx'> </div><div class='del'>-static struct pci_driver driver = {</div><div class='add'>+static struct pci_driver atiixp_pci_driver = {</div><div class='ctx'> 	.name		= "ATIIXP_IDE",</div><div class='ctx'> 	.id_table	= atiixp_pci_tbl,</div><div class='ctx'> 	.probe		= atiixp_init_one,</div><div class='ctx'> 	.remove		= ide_pci_remove,</div><div class='add'>+	.suspend	= ide_pci_suspend,</div><div class='add'>+	.resume		= ide_pci_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init atiixp_ide_init(void)</div><div class='ctx'> {</div><div class='del'>-	return ide_pci_register_driver(&amp;driver);</div><div class='add'>+	return ide_pci_register_driver(&amp;atiixp_pci_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit atiixp_ide_exit(void)</div><div class='ctx'> {</div><div class='del'>-	pci_unregister_driver(&amp;driver);</div><div class='add'>+	pci_unregister_driver(&amp;atiixp_pci_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(atiixp_ide_init);</div><div class='head'>diff --git a/drivers/ide/pci/cmd640.c b/drivers/ide/pci/cmd640.c<br/>index e6c62006ca1a..e4306647d00d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/pci/cmd640.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ide/pci/cmd640.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/pci/cmd640.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/pci/cmd640.c</a></div><div class='hunk'>@@ -103,7 +103,6 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/hdreg.h&gt;</div><div class='ctx'> #include &lt;linux/ide.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -375,6 +374,21 @@ static void cmd640_dump_regs(void)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+static void __set_prefetch_mode(ide_drive_t *drive, int mode)</div><div class='add'>+{</div><div class='add'>+	if (mode) {	/* want prefetch on? */</div><div class='add'>+#if CMD640_PREFETCH_MASKS</div><div class='add'>+		drive-&gt;dev_flags |= IDE_DFLAG_NO_UNMASK;</div><div class='add'>+		drive-&gt;dev_flags &amp;= ~IDE_DFLAG_UNMASK;</div><div class='add'>+#endif</div><div class='add'>+		drive-&gt;dev_flags &amp;= ~IDE_DFLAG_NO_IO_32BIT;</div><div class='add'>+	} else {</div><div class='add'>+		drive-&gt;dev_flags &amp;= ~IDE_DFLAG_NO_UNMASK;</div><div class='add'>+		drive-&gt;dev_flags |= IDE_DFLAG_NO_IO_32BIT;</div><div class='add'>+		drive-&gt;io_32bit = 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #ifndef CONFIG_BLK_DEV_CMD640_ENHANCED</div><div class='ctx'> /*</div><div class='ctx'>  * Check whether prefetch is on for a drive,</div><div class='hunk'>@@ -384,19 +398,10 @@ static void __init check_prefetch(ide_drive_t *drive, unsigned int index)</div><div class='ctx'> {</div><div class='ctx'> 	u8 b = get_cmd640_reg(prefetch_regs[index]);</div><div class='ctx'> </div><div class='del'>-	if (b &amp; prefetch_masks[index]) {	/* is prefetch off? */</div><div class='del'>-		drive-&gt;no_unmask = 0;</div><div class='del'>-		drive-&gt;no_io_32bit = 1;</div><div class='del'>-		drive-&gt;io_32bit = 0;</div><div class='del'>-	} else {</div><div class='del'>-#if CMD640_PREFETCH_MASKS</div><div class='del'>-		drive-&gt;no_unmask = 1;</div><div class='del'>-		drive-&gt;unmask = 0;</div><div class='del'>-#endif</div><div class='del'>-		drive-&gt;no_io_32bit = 0;</div><div class='del'>-	}</div><div class='add'>+	__set_prefetch_mode(drive, (b &amp; prefetch_masks[index]) ? 0 : 1);</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Sets prefetch mode for a drive.</div><div class='ctx'>  */</div><div class='hunk'>@@ -408,19 +413,11 @@ static void set_prefetch_mode(ide_drive_t *drive, unsigned int index, int mode)</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;cmd640_lock, flags);</div><div class='ctx'> 	b = __get_cmd640_reg(reg);</div><div class='del'>-	if (mode) {	/* want prefetch on? */</div><div class='del'>-#if CMD640_PREFETCH_MASKS</div><div class='del'>-		drive-&gt;no_unmask = 1;</div><div class='del'>-		drive-&gt;unmask = 0;</div><div class='del'>-#endif</div><div class='del'>-		drive-&gt;no_io_32bit = 0;</div><div class='add'>+	__set_prefetch_mode(drive, mode);</div><div class='add'>+	if (mode)</div><div class='ctx'> 		b &amp;= ~prefetch_masks[index];	/* enable prefetch */</div><div class='del'>-	} else {</div><div class='del'>-		drive-&gt;no_unmask = 0;</div><div class='del'>-		drive-&gt;no_io_32bit = 1;</div><div class='del'>-		drive-&gt;io_32bit = 0;</div><div class='add'>+	else</div><div class='ctx'> 		b |= prefetch_masks[index];	/* disable prefetch */</div><div class='del'>-	}</div><div class='ctx'> 	__put_cmd640_reg(reg, b);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;cmd640_lock, flags);</div><div class='ctx'> }</div><div class='hunk'>@@ -471,10 +468,10 @@ static void program_drive_counts(ide_drive_t *drive, unsigned int index)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (index &gt; 1) {</div><div class='ctx'> 		ide_hwif_t *hwif = drive-&gt;hwif;</div><div class='del'>-		ide_drive_t *peer = &amp;hwif-&gt;drives[!drive-&gt;select.b.unit];</div><div class='add'>+		ide_drive_t *peer = &amp;hwif-&gt;drives[!(drive-&gt;dn &amp; 1)];</div><div class='ctx'> 		unsigned int mate = index ^ 1;</div><div class='ctx'> </div><div class='del'>-		if (peer-&gt;present) {</div><div class='add'>+		if (peer-&gt;dev_flags &amp; IDE_DFLAG_PRESENT) {</div><div class='ctx'> 			if (setup_count &lt; setup_counts[mate])</div><div class='ctx'> 				setup_count = setup_counts[mate];</div><div class='ctx'> 			if (active_count &lt; active_counts[mate])</div><div class='hunk'>@@ -610,7 +607,7 @@ static void cmd640_set_pio_mode(ide_drive_t *drive, const u8 pio)</div><div class='ctx'> </div><div class='ctx'> static void cmd640_init_dev(ide_drive_t *drive)</div><div class='ctx'> {</div><div class='del'>-	unsigned int i = drive-&gt;hwif-&gt;channel * 2 + drive-&gt;select.b.unit;</div><div class='add'>+	unsigned int i = drive-&gt;hwif-&gt;channel * 2 + (drive-&gt;dn &amp; 1);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_BLK_DEV_CMD640_ENHANCED</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -629,7 +626,7 @@ static void cmd640_init_dev(ide_drive_t *drive)</div><div class='ctx'> 	 */</div><div class='ctx'> 	check_prefetch(drive, i);</div><div class='ctx'> 	printk(KERN_INFO DRV_NAME ": drive%d timings/prefetch(%s) preserved\n",</div><div class='del'>-				  i, drive-&gt;no_io_32bit ? "off" : "on");</div><div class='add'>+		i, (drive-&gt;dev_flags &amp; IDE_DFLAG_NO_IO_32BIT) ? "off" : "on");</div><div class='ctx'> #endif /* CONFIG_BLK_DEV_CMD640_ENHANCED */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/ide/pci/cmd64x.c b/drivers/ide/pci/cmd64x.c<br/>index e064398e03b4..935385c77e06 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/pci/cmd64x.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ide/pci/cmd64x.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/pci/cmd64x.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/pci/cmd64x.c</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/hdreg.h&gt;</div><div class='ctx'> #include &lt;linux/ide.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -229,7 +228,7 @@ static int cmd648_dma_end(ide_drive_t *drive)</div><div class='ctx'> {</div><div class='ctx'> 	ide_hwif_t *hwif	= HWIF(drive);</div><div class='ctx'> 	unsigned long base	= hwif-&gt;dma_base - (hwif-&gt;channel * 8);</div><div class='del'>-	int err			= __ide_dma_end(drive);</div><div class='add'>+	int err			= ide_dma_end(drive);</div><div class='ctx'> 	u8  irq_mask		= hwif-&gt;channel ? MRDMODE_INTR_CH1 :</div><div class='ctx'> 						  MRDMODE_INTR_CH0;</div><div class='ctx'> 	u8  mrdmode		= inb(base + 1);</div><div class='hunk'>@@ -249,7 +248,7 @@ static int cmd64x_dma_end(ide_drive_t *drive)</div><div class='ctx'> 	u8  irq_mask		= hwif-&gt;channel ? ARTTIM23_INTR_CH1 :</div><div class='ctx'> 						  CFR_INTR_CH0;</div><div class='ctx'> 	u8  irq_stat		= 0;</div><div class='del'>-	int err			= __ide_dma_end(drive);</div><div class='add'>+	int err			= ide_dma_end(drive);</div><div class='ctx'> </div><div class='ctx'> 	(void) pci_read_config_byte(dev, irq_reg, &amp;irq_stat);</div><div class='ctx'> 	/* clear the interrupt bit */</div><div class='hunk'>@@ -332,7 +331,7 @@ static int cmd646_1_dma_end(ide_drive_t *drive)</div><div class='ctx'> 	return (dma_stat &amp; 7) != 4;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned int __devinit init_chipset_cmd64x(struct pci_dev *dev)</div><div class='add'>+static unsigned int init_chipset_cmd64x(struct pci_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	u8 mrdmode = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -506,21 +505,23 @@ static const struct pci_device_id cmd64x_pci_tbl[] = {</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, cmd64x_pci_tbl);</div><div class='ctx'> </div><div class='del'>-static struct pci_driver driver = {</div><div class='add'>+static struct pci_driver cmd64x_pci_driver = {</div><div class='ctx'> 	.name		= "CMD64x_IDE",</div><div class='ctx'> 	.id_table	= cmd64x_pci_tbl,</div><div class='ctx'> 	.probe		= cmd64x_init_one,</div><div class='ctx'> 	.remove		= ide_pci_remove,</div><div class='add'>+	.suspend	= ide_pci_suspend,</div><div class='add'>+	.resume		= ide_pci_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init cmd64x_ide_init(void)</div><div class='ctx'> {</div><div class='del'>-	return ide_pci_register_driver(&amp;driver);</div><div class='add'>+	return ide_pci_register_driver(&amp;cmd64x_pci_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit cmd64x_ide_exit(void)</div><div class='ctx'> {</div><div class='del'>-	pci_unregister_driver(&amp;driver);</div><div class='add'>+	pci_unregister_driver(&amp;cmd64x_pci_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(cmd64x_ide_init);</div><div class='head'>diff --git a/drivers/ide/pci/cs5520.c b/drivers/ide/pci/cs5520.c<br/>index 151844fcbb07..5efb467f8fa0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/pci/cs5520.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ide/pci/cs5520.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/pci/cs5520.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/pci/cs5520.c</a></div><div class='hunk'>@@ -35,7 +35,6 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/hdreg.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/ide.h&gt;</div><div class='hunk'>@@ -146,15 +145,17 @@ static const struct pci_device_id cs5520_pci_tbl[] = {</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, cs5520_pci_tbl);</div><div class='ctx'> </div><div class='del'>-static struct pci_driver driver = {</div><div class='add'>+static struct pci_driver cs5520_pci_driver = {</div><div class='ctx'> 	.name		= "Cyrix_IDE",</div><div class='ctx'> 	.id_table	= cs5520_pci_tbl,</div><div class='ctx'> 	.probe		= cs5520_init_one,</div><div class='add'>+	.suspend	= ide_pci_suspend,</div><div class='add'>+	.resume		= ide_pci_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init cs5520_ide_init(void)</div><div class='ctx'> {</div><div class='del'>-	return ide_pci_register_driver(&amp;driver);</div><div class='add'>+	return ide_pci_register_driver(&amp;cs5520_pci_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(cs5520_ide_init);</div><div class='head'>diff --git a/drivers/ide/pci/cs5530.c b/drivers/ide/pci/cs5530.c<br/>index f235db8c678b..53f079cc00af 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/pci/cs5530.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ide/pci/cs5530.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/pci/cs5530.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/pci/cs5530.c</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/hdreg.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/ide.h&gt;</div><div class='hunk'>@@ -81,17 +80,19 @@ static void cs5530_set_pio_mode(ide_drive_t *drive, const u8 pio)</div><div class='ctx'> static u8 cs5530_udma_filter(ide_drive_t *drive)</div><div class='ctx'> {</div><div class='ctx'> 	ide_hwif_t *hwif = drive-&gt;hwif;</div><div class='del'>-	ide_drive_t *mate = &amp;hwif-&gt;drives[(drive-&gt;dn &amp; 1) ^ 1];</div><div class='del'>-	struct hd_driveid *mateid = mate-&gt;id;</div><div class='add'>+	ide_drive_t *mate = ide_get_pair_dev(drive);</div><div class='add'>+	u16 *mateid = mate-&gt;id;</div><div class='ctx'> 	u8 mask = hwif-&gt;ultra_mask;</div><div class='ctx'> </div><div class='del'>-	if (mate-&gt;present == 0)</div><div class='add'>+	if (mate == NULL)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	if ((mateid-&gt;capability &amp; 1) &amp;&amp; __ide_dma_bad_drive(mate) == 0) {</div><div class='del'>-		if ((mateid-&gt;field_valid &amp; 4) &amp;&amp; (mateid-&gt;dma_ultra &amp; 7))</div><div class='add'>+	if (ata_id_has_dma(mateid) &amp;&amp; __ide_dma_bad_drive(mate) == 0) {</div><div class='add'>+		if ((mateid[ATA_ID_FIELD_VALID] &amp; 4) &amp;&amp;</div><div class='add'>+		    (mateid[ATA_ID_UDMA_MODES] &amp; 7))</div><div class='ctx'> 			goto out;</div><div class='del'>-		if ((mateid-&gt;field_valid &amp; 2) &amp;&amp; (mateid-&gt;dma_mword &amp; 7))</div><div class='add'>+		if ((mateid[ATA_ID_FIELD_VALID] &amp; 2) &amp;&amp;</div><div class='add'>+		    (mateid[ATA_ID_MWDMA_MODES] &amp; 7))</div><div class='ctx'> 			mask = 0;</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='hunk'>@@ -133,7 +134,7 @@ static void cs5530_set_dma_mode(ide_drive_t *drive, const u8 mode)</div><div class='ctx'>  *	Initialize the cs5530 bridge for reliable IDE DMA operation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static unsigned int __devinit init_chipset_cs5530(struct pci_dev *dev)</div><div class='add'>+static unsigned int init_chipset_cs5530(struct pci_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev *master_0 = NULL, *cs5530_0 = NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -266,21 +267,23 @@ static const struct pci_device_id cs5530_pci_tbl[] = {</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, cs5530_pci_tbl);</div><div class='ctx'> </div><div class='del'>-static struct pci_driver driver = {</div><div class='add'>+static struct pci_driver cs5530_pci_driver = {</div><div class='ctx'> 	.name		= "CS5530 IDE",</div><div class='ctx'> 	.id_table	= cs5530_pci_tbl,</div><div class='ctx'> 	.probe		= cs5530_init_one,</div><div class='ctx'> 	.remove		= ide_pci_remove,</div><div class='add'>+	.suspend	= ide_pci_suspend,</div><div class='add'>+	.resume		= ide_pci_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init cs5530_ide_init(void)</div><div class='ctx'> {</div><div class='del'>-	return ide_pci_register_driver(&amp;driver);</div><div class='add'>+	return ide_pci_register_driver(&amp;cs5530_pci_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit cs5530_ide_exit(void)</div><div class='ctx'> {</div><div class='del'>-	pci_unregister_driver(&amp;driver);</div><div class='add'>+	pci_unregister_driver(&amp;cs5530_pci_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(cs5530_ide_init);</div><div class='head'>diff --git a/drivers/ide/pci/cs5535.c b/drivers/ide/pci/cs5535.c<br/>index dd3dc23af995..983d957a0189 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/pci/cs5535.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ide/pci/cs5535.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/pci/cs5535.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/pci/cs5535.c</a></div><div class='hunk'>@@ -76,16 +76,16 @@ static unsigned int cs5535_udma_timings[5] =</div><div class='ctx'> static void cs5535_set_speed(ide_drive_t *drive, const u8 speed)</div><div class='ctx'> {</div><div class='ctx'> 	u32 reg = 0, dummy;</div><div class='del'>-	int unit = drive-&gt;select.b.unit;</div><div class='add'>+	u8 unit = drive-&gt;dn &amp; 1;</div><div class='ctx'> </div><div class='ctx'> 	/* Set the PIO timings */</div><div class='ctx'> 	if (speed &lt; XFER_SW_DMA_0) {</div><div class='del'>-		ide_drive_t *pair = ide_get_paired_drive(drive);</div><div class='add'>+		ide_drive_t *pair = ide_get_pair_dev(drive);</div><div class='ctx'> 		u8 cmd, pioa;</div><div class='ctx'> </div><div class='ctx'> 		cmd = pioa = speed - XFER_PIO_0;</div><div class='ctx'> </div><div class='del'>-		if (pair-&gt;present) {</div><div class='add'>+		if (pair) {</div><div class='ctx'> 			u8 piob = ide_get_best_pio_mode(pair, 255, 4);</div><div class='ctx'> </div><div class='ctx'> 			if (piob &lt; cmd)</div><div class='hunk'>@@ -192,21 +192,23 @@ static const struct pci_device_id cs5535_pci_tbl[] = {</div><div class='ctx'> </div><div class='ctx'> MODULE_DEVICE_TABLE(pci, cs5535_pci_tbl);</div><div class='ctx'> </div><div class='del'>-static struct pci_driver driver = {</div><div class='del'>-	.name       = "CS5535_IDE",</div><div class='del'>-	.id_table   = cs5535_pci_tbl,</div><div class='del'>-	.probe      = cs5535_init_one,</div><div class='del'>-	.remove     = ide_pci_remove,</div><div class='add'>+static struct pci_driver cs5535_pci_driver = {</div><div class='add'>+	.name		= "CS5535_IDE",</div><div class='add'>+	.id_table	= cs5535_pci_tbl,</div><div class='add'>+	.probe		= cs5535_init_one,</div><div class='add'>+	.remove		= ide_pci_remove,</div><div class='add'>+	.suspend	= ide_pci_suspend,</div><div class='add'>+	.resume		= ide_pci_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init cs5535_ide_init(void)</div><div class='ctx'> {</div><div class='del'>-	return ide_pci_register_driver(&amp;driver);</div><div class='add'>+	return ide_pci_register_driver(&amp;cs5535_pci_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit cs5535_ide_exit(void)</div><div class='ctx'> {</div><div class='del'>-	pci_unregister_driver(&amp;driver);</div><div class='add'>+	pci_unregister_driver(&amp;cs5535_pci_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(cs5535_ide_init);</div><div class='head'>diff --git a/drivers/ide/pci/cy82c693.c b/drivers/ide/pci/cy82c693.c<br/>index e6d8ee88d56d..5297f07d2933 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/pci/cy82c693.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ide/pci/cy82c693.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/pci/cy82c693.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/pci/cy82c693.c</a></div><div class='hunk'>@@ -50,18 +50,11 @@</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME "cy82c693"</div><div class='ctx'> </div><div class='del'>-/* the current version */</div><div class='del'>-#define CY82_VERSION	"CY82C693U driver v0.34 99-13-12 Andreas S. Krebs (akrebs@altavista.net)"</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  *	The following are used to debug the driver.</div><div class='ctx'>  */</div><div class='del'>-#define CY82C693_DEBUG_LOGS	0</div><div class='ctx'> #define CY82C693_DEBUG_INFO	0</div><div class='ctx'> </div><div class='del'>-/* define CY82C693_SETDMA_CLOCK to set DMA Controller Clock Speed to ATCLK */</div><div class='del'>-#undef CY82C693_SETDMA_CLOCK</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  *	NOTE: the value for busmaster timeout is tricky and I got it by</div><div class='ctx'>  *	trial and error!  By using a to low value will cause DMA timeouts</div><div class='hunk'>@@ -89,7 +82,6 @@</div><div class='ctx'> #define CY82_INDEX_PORT		0x22</div><div class='ctx'> #define CY82_DATA_PORT		0x23</div><div class='ctx'> </div><div class='del'>-#define CY82_INDEX_CTRLREG1	0x01</div><div class='ctx'> #define CY82_INDEX_CHANNEL0	0x30</div><div class='ctx'> #define CY82_INDEX_CHANNEL1	0x31</div><div class='ctx'> #define CY82_INDEX_TIMEOUT	0x32</div><div class='hunk'>@@ -179,17 +171,6 @@ static void cy82c693_set_dma_mode(ide_drive_t *drive, const u8 mode)</div><div class='ctx'> </div><div class='ctx'> 	index = hwif-&gt;channel ? CY82_INDEX_CHANNEL1 : CY82_INDEX_CHANNEL0;</div><div class='ctx'> </div><div class='del'>-#if CY82C693_DEBUG_LOGS</div><div class='del'>-	/* for debug let's show the previous values */</div><div class='del'>-</div><div class='del'>-	outb(index, CY82_INDEX_PORT);</div><div class='del'>-	data = inb(CY82_DATA_PORT);</div><div class='del'>-</div><div class='del'>-	printk(KERN_INFO "%s (ch=%d, dev=%d): DMA mode is %d (single=%d)\n",</div><div class='del'>-		drive-&gt;name, HWIF(drive)-&gt;channel, drive-&gt;select.b.unit,</div><div class='del'>-		(data&amp;0x3), ((data&gt;&gt;2)&amp;1));</div><div class='del'>-#endif /* CY82C693_DEBUG_LOGS */</div><div class='del'>-</div><div class='ctx'> 	data = (mode &amp; 3) | (single &lt;&lt; 2);</div><div class='ctx'> </div><div class='ctx'> 	outb(index, CY82_INDEX_PORT);</div><div class='hunk'>@@ -197,8 +178,7 @@ static void cy82c693_set_dma_mode(ide_drive_t *drive, const u8 mode)</div><div class='ctx'> </div><div class='ctx'> #if CY82C693_DEBUG_INFO</div><div class='ctx'> 	printk(KERN_INFO "%s (ch=%d, dev=%d): set DMA mode to %d (single=%d)\n",</div><div class='del'>-		drive-&gt;name, HWIF(drive)-&gt;channel, drive-&gt;select.b.unit,</div><div class='del'>-		mode &amp; 3, single);</div><div class='add'>+		drive-&gt;name, hwif-&gt;channel, drive-&gt;dn &amp; 1, mode &amp; 3, single);</div><div class='ctx'> #endif /* CY82C693_DEBUG_INFO */</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -239,50 +219,11 @@ static void cy82c693_set_pio_mode(ide_drive_t *drive, const u8 pio)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-#if CY82C693_DEBUG_LOGS</div><div class='del'>-	/* for debug let's show the register values */</div><div class='del'>-</div><div class='del'>-	if (drive-&gt;select.b.unit == 0) {</div><div class='del'>-		/*</div><div class='del'>-		 * get master drive registers</div><div class='del'>-		 * address setup control register</div><div class='del'>-		 * is 32 bit !!!</div><div class='del'>-		 */</div><div class='del'>-		pci_read_config_dword(dev, CY82_IDE_ADDRSETUP, &amp;addrCtrl);</div><div class='del'>-		addrCtrl &amp;= 0x0F;</div><div class='del'>-</div><div class='del'>-		/* now let's get the remaining registers */</div><div class='del'>-		pci_read_config_byte(dev, CY82_IDE_MASTER_IOR, &amp;pclk.time_16r);</div><div class='del'>-		pci_read_config_byte(dev, CY82_IDE_MASTER_IOW, &amp;pclk.time_16w);</div><div class='del'>-		pci_read_config_byte(dev, CY82_IDE_MASTER_8BIT, &amp;pclk.time_8);</div><div class='del'>-	} else {</div><div class='del'>-		/*</div><div class='del'>-		 * set slave drive registers</div><div class='del'>-		 * address setup control register</div><div class='del'>-		 * is 32 bit !!!</div><div class='del'>-		 */</div><div class='del'>-		pci_read_config_dword(dev, CY82_IDE_ADDRSETUP, &amp;addrCtrl);</div><div class='del'>-</div><div class='del'>-		addrCtrl &amp;= 0xF0;</div><div class='del'>-		addrCtrl &gt;&gt;= 4;</div><div class='del'>-</div><div class='del'>-		/* now let's get the remaining registers */</div><div class='del'>-		pci_read_config_byte(dev, CY82_IDE_SLAVE_IOR, &amp;pclk.time_16r);</div><div class='del'>-		pci_read_config_byte(dev, CY82_IDE_SLAVE_IOW, &amp;pclk.time_16w);</div><div class='del'>-		pci_read_config_byte(dev, CY82_IDE_SLAVE_8BIT, &amp;pclk.time_8);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printk(KERN_INFO "%s (ch=%d, dev=%d): PIO timing is "</div><div class='del'>-		"(addr=0x%X, ior=0x%X, iow=0x%X, 8bit=0x%X)\n",</div><div class='del'>-		drive-&gt;name, hwif-&gt;channel, drive-&gt;select.b.unit,</div><div class='del'>-		addrCtrl, pclk.time_16r, pclk.time_16w, pclk.time_8);</div><div class='del'>-#endif /* CY82C693_DEBUG_LOGS */</div><div class='del'>-</div><div class='ctx'> 	/* let's calc the values for this PIO mode */</div><div class='ctx'> 	compute_clocks(pio, &amp;pclk);</div><div class='ctx'> </div><div class='ctx'> 	/* now let's write  the clocks registers */</div><div class='del'>-	if (drive-&gt;select.b.unit == 0) {</div><div class='add'>+	if ((drive-&gt;dn &amp; 1) == 0) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * set master drive</div><div class='ctx'> 		 * address setup control register</div><div class='hunk'>@@ -324,63 +265,11 @@ static void cy82c693_set_pio_mode(ide_drive_t *drive, const u8 pio)</div><div class='ctx'> #if CY82C693_DEBUG_INFO</div><div class='ctx'> 	printk(KERN_INFO "%s (ch=%d, dev=%d): set PIO timing to "</div><div class='ctx'> 		"(addr=0x%X, ior=0x%X, iow=0x%X, 8bit=0x%X)\n",</div><div class='del'>-		drive-&gt;name, hwif-&gt;channel, drive-&gt;select.b.unit,</div><div class='add'>+		drive-&gt;name, hwif-&gt;channel, drive-&gt;dn &amp; 1,</div><div class='ctx'> 		addrCtrl, pclk.time_16r, pclk.time_16w, pclk.time_8);</div><div class='ctx'> #endif /* CY82C693_DEBUG_INFO */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * this function is called during init and is used to setup the cy82c693 chip</div><div class='del'>- */</div><div class='del'>-static unsigned int __devinit init_chipset_cy82c693(struct pci_dev *dev)</div><div class='del'>-{</div><div class='del'>-	if (PCI_FUNC(dev-&gt;devfn) != 1)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-#ifdef CY82C693_SETDMA_CLOCK</div><div class='del'>-	u8 data = 0;</div><div class='del'>-#endif /* CY82C693_SETDMA_CLOCK */</div><div class='del'>-</div><div class='del'>-	/* write info about this verion of the driver */</div><div class='del'>-	printk(KERN_INFO CY82_VERSION "\n");</div><div class='del'>-</div><div class='del'>-#ifdef CY82C693_SETDMA_CLOCK</div><div class='del'>-       /* okay let's set the DMA clock speed */</div><div class='del'>-</div><div class='del'>-	outb(CY82_INDEX_CTRLREG1, CY82_INDEX_PORT);</div><div class='del'>-	data = inb(CY82_DATA_PORT);</div><div class='del'>-</div><div class='del'>-#if CY82C693_DEBUG_INFO</div><div class='del'>-	printk(KERN_INFO DRV_NAME ": Peripheral Configuration Register: 0x%X\n",</div><div class='del'>-		data);</div><div class='del'>-#endif /* CY82C693_DEBUG_INFO */</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * for some reason sometimes the DMA controller</div><div class='del'>-	 * speed is set to ATCLK/2 ???? - we fix this here</div><div class='del'>-	 *</div><div class='del'>-	 * note: i don't know what causes this strange behaviour,</div><div class='del'>-	 *       but even changing the dma speed doesn't solve it :-(</div><div class='del'>-	 *       the ide performance is still only half the normal speed</div><div class='del'>-	 *</div><div class='del'>-	 *       if anybody knows what goes wrong with my machine, please</div><div class='del'>-	 *       let me know - ASK</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	data |= 0x03;</div><div class='del'>-</div><div class='del'>-	outb(CY82_INDEX_CTRLREG1, CY82_INDEX_PORT);</div><div class='del'>-	outb(data, CY82_DATA_PORT);</div><div class='del'>-</div><div class='del'>-#if CY82C693_DEBUG_INFO</div><div class='del'>-	printk(KERN_INFO ": New Peripheral Configuration Register: 0x%X\n",</div><div class='del'>-		data);</div><div class='del'>-#endif /* CY82C693_DEBUG_INFO */</div><div class='del'>-</div><div class='del'>-#endif /* CY82C693_SETDMA_CLOCK */</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void __devinit init_iops_cy82c693(ide_hwif_t *hwif)</div><div class='ctx'> {</div><div class='ctx'> 	static ide_hwif_t *primary;</div><div class='hunk'>@@ -401,7 +290,6 @@ static const struct ide_port_ops cy82c693_port_ops = {</div><div class='ctx'> </div><div class='ctx'> static const struct ide_port_info cy82c693_chipset __devinitdata = {</div><div class='ctx'> 	.name		= DRV_NAME,</div><div class='del'>-	.init_chipset	= init_chipset_cy82c693,</div><div class='ctx'> 	.init_iops	= init_iops_cy82c693,</div><div class='ctx'> 	.port_ops	= &amp;cy82c693_port_ops,</div><div class='ctx'> 	.chipset	= ide_cy82c693,</div><div class='hunk'>@@ -443,21 +331,23 @@ static const struct pci_device_id cy82c693_pci_tbl[] = {</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, cy82c693_pci_tbl);</div><div class='ctx'> </div><div class='del'>-static struct pci_driver driver = {</div><div class='add'>+static struct pci_driver cy82c693_pci_driver = {</div><div class='ctx'> 	.name		= "Cypress_IDE",</div><div class='ctx'> 	.id_table	= cy82c693_pci_tbl,</div><div class='ctx'> 	.probe		= cy82c693_init_one,</div><div class='ctx'> 	.remove		= __devexit_p(cy82c693_remove),</div><div class='add'>+	.suspend	= ide_pci_suspend,</div><div class='add'>+	.resume		= ide_pci_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init cy82c693_ide_init(void)</div><div class='ctx'> {</div><div class='del'>-	return ide_pci_register_driver(&amp;driver);</div><div class='add'>+	return ide_pci_register_driver(&amp;cy82c693_pci_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit cy82c693_ide_exit(void)</div><div class='ctx'> {</div><div class='del'>-	pci_unregister_driver(&amp;driver);</div><div class='add'>+	pci_unregister_driver(&amp;cy82c693_pci_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(cy82c693_ide_init);</div><div class='head'>diff --git a/drivers/ide/pci/delkin_cb.c b/drivers/ide/pci/delkin_cb.c<br/>index f84bfb4f600f..8689a706f537 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/pci/delkin_cb.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ide/pci/delkin_cb.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/pci/delkin_cb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/pci/delkin_cb.c</a></div><div class='hunk'>@@ -19,7 +19,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/hdreg.h&gt;</div><div class='ctx'> #include &lt;linux/ide.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='hunk'>@@ -118,7 +117,7 @@ static struct pci_device_id delkin_cb_pci_tbl[] __devinitdata = {</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, delkin_cb_pci_tbl);</div><div class='ctx'> </div><div class='del'>-static struct pci_driver driver = {</div><div class='add'>+static struct pci_driver delkin_cb_pci_driver = {</div><div class='ctx'> 	.name		= "Delkin-ASKA-Workbit Cardbus IDE",</div><div class='ctx'> 	.id_table	= delkin_cb_pci_tbl,</div><div class='ctx'> 	.probe		= delkin_cb_probe,</div><div class='hunk'>@@ -127,12 +126,12 @@ static struct pci_driver driver = {</div><div class='ctx'> </div><div class='ctx'> static int __init delkin_cb_init(void)</div><div class='ctx'> {</div><div class='del'>-	return pci_register_driver(&amp;driver);</div><div class='add'>+	return pci_register_driver(&amp;delkin_cb_pci_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit delkin_cb_exit(void)</div><div class='ctx'> {</div><div class='del'>-	pci_unregister_driver(&amp;driver);</div><div class='add'>+	pci_unregister_driver(&amp;delkin_cb_pci_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(delkin_cb_init);</div><div class='head'>diff --git a/drivers/ide/pci/generic.c b/drivers/ide/pci/generic.c<br/>index b07d4f4273b3..474f96a7c076 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/pci/generic.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ide/pci/generic.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/pci/generic.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/pci/generic.c</a></div><div class='hunk'>@@ -22,7 +22,6 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/hdreg.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/ide.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -167,21 +166,23 @@ static const struct pci_device_id generic_pci_tbl[] = {</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, generic_pci_tbl);</div><div class='ctx'> </div><div class='del'>-static struct pci_driver driver = {</div><div class='add'>+static struct pci_driver generic_pci_driver = {</div><div class='ctx'> 	.name		= "PCI_IDE",</div><div class='ctx'> 	.id_table	= generic_pci_tbl,</div><div class='ctx'> 	.probe		= generic_init_one,</div><div class='ctx'> 	.remove		= ide_pci_remove,</div><div class='add'>+	.suspend	= ide_pci_suspend,</div><div class='add'>+	.resume		= ide_pci_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init generic_ide_init(void)</div><div class='ctx'> {</div><div class='del'>-	return ide_pci_register_driver(&amp;driver);</div><div class='add'>+	return ide_pci_register_driver(&amp;generic_pci_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit generic_ide_exit(void)</div><div class='ctx'> {</div><div class='del'>-	pci_unregister_driver(&amp;driver);</div><div class='add'>+	pci_unregister_driver(&amp;generic_pci_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(generic_ide_init);</div><div class='head'>diff --git a/drivers/ide/pci/hpt34x.c b/drivers/ide/pci/hpt34x.c<br/>index 6009b0b9655d..fb1a3aa57f07 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/pci/hpt34x.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ide/pci/hpt34x.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/pci/hpt34x.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/pci/hpt34x.c</a></div><div class='hunk'>@@ -27,7 +27,6 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='del'>-#include &lt;linux/hdreg.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -79,7 +78,7 @@ static void hpt34x_set_pio_mode(ide_drive_t *drive, const u8 pio)</div><div class='ctx'>  */</div><div class='ctx'> #define	HPT34X_PCI_INIT_REG		0x80</div><div class='ctx'> </div><div class='del'>-static unsigned int __devinit init_chipset_hpt34x(struct pci_dev *dev)</div><div class='add'>+static unsigned int init_chipset_hpt34x(struct pci_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int i = 0;</div><div class='ctx'> 	unsigned long hpt34xIoBase = pci_resource_start(dev, 4);</div><div class='hunk'>@@ -167,21 +166,23 @@ static const struct pci_device_id hpt34x_pci_tbl[] = {</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, hpt34x_pci_tbl);</div><div class='ctx'> </div><div class='del'>-static struct pci_driver driver = {</div><div class='add'>+static struct pci_driver hpt34x_pci_driver = {</div><div class='ctx'> 	.name		= "HPT34x_IDE",</div><div class='ctx'> 	.id_table	= hpt34x_pci_tbl,</div><div class='ctx'> 	.probe		= hpt34x_init_one,</div><div class='ctx'> 	.remove		= ide_pci_remove,</div><div class='add'>+	.suspend	= ide_pci_suspend,</div><div class='add'>+	.resume		= ide_pci_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init hpt34x_ide_init(void)</div><div class='ctx'> {</div><div class='del'>-	return ide_pci_register_driver(&amp;driver);</div><div class='add'>+	return ide_pci_register_driver(&amp;hpt34x_pci_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit hpt34x_ide_exit(void)</div><div class='ctx'> {</div><div class='del'>-	pci_unregister_driver(&amp;driver);</div><div class='add'>+	pci_unregister_driver(&amp;hpt34x_pci_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(hpt34x_ide_init);</div><div class='head'>diff --git a/drivers/ide/pci/hpt366.c b/drivers/ide/pci/hpt366.c<br/>index c37ab1743819..9cf171cb9376 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/pci/hpt366.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ide/pci/hpt366.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/pci/hpt366.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/pci/hpt366.c</a></div><div class='hunk'>@@ -122,7 +122,6 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='del'>-#include &lt;linux/hdreg.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -605,10 +604,10 @@ static const struct hpt_info hpt371n __devinitdata = {</div><div class='ctx'> </div><div class='ctx'> static int check_in_drive_list(ide_drive_t *drive, const char **list)</div><div class='ctx'> {</div><div class='del'>-	struct hd_driveid *id = drive-&gt;id;</div><div class='add'>+	char *m = (char *)&amp;drive-&gt;id[ATA_ID_PROD];</div><div class='ctx'> </div><div class='ctx'> 	while (*list)</div><div class='del'>-		if (!strcmp(*list++,id-&gt;model))</div><div class='add'>+		if (!strcmp(*list++, m))</div><div class='ctx'> 			return 1;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -655,7 +654,7 @@ static u8 hpt3xx_udma_filter(ide_drive_t *drive)</div><div class='ctx'> 	case HPT372A:</div><div class='ctx'> 	case HPT372N:</div><div class='ctx'> 	case HPT374 :</div><div class='del'>-		if (ide_dev_is_sata(drive-&gt;id))</div><div class='add'>+		if (ata_id_is_sata(drive-&gt;id))</div><div class='ctx'> 			mask &amp;= ~0x0e;</div><div class='ctx'> 		/* Fall thru */</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -675,7 +674,7 @@ static u8 hpt3xx_mdma_filter(ide_drive_t *drive)</div><div class='ctx'> 	case HPT372A:</div><div class='ctx'> 	case HPT372N:</div><div class='ctx'> 	case HPT374 :</div><div class='del'>-		if (ide_dev_is_sata(drive-&gt;id))</div><div class='add'>+		if (ata_id_is_sata(drive-&gt;id))</div><div class='ctx'> 			return 0x00;</div><div class='ctx'> 		/* Fall thru */</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -731,11 +730,11 @@ static void hpt3xx_set_pio_mode(ide_drive_t *drive, const u8 pio)</div><div class='ctx'> </div><div class='ctx'> static void hpt3xx_quirkproc(ide_drive_t *drive)</div><div class='ctx'> {</div><div class='del'>-	struct hd_driveid *id	= drive-&gt;id;</div><div class='add'>+	char *m			= (char *)&amp;drive-&gt;id[ATA_ID_PROD];</div><div class='ctx'> 	const  char **list	= quirk_drives;</div><div class='ctx'> </div><div class='ctx'> 	while (*list)</div><div class='del'>-		if (strstr(id-&gt;model, *list++)) {</div><div class='add'>+		if (strstr(m, *list++)) {</div><div class='ctx'> 			drive-&gt;quirk_list = 1;</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -836,7 +835,7 @@ static int hpt370_dma_end(ide_drive_t *drive)</div><div class='ctx'> 		if (dma_stat &amp; 0x01)</div><div class='ctx'> 			hpt370_irq_timeout(drive);</div><div class='ctx'> 	}</div><div class='del'>-	return __ide_dma_end(drive);</div><div class='add'>+	return ide_dma_end(drive);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void hpt370_dma_timeout(ide_drive_t *drive)</div><div class='hunk'>@@ -864,9 +863,6 @@ static int hpt374_dma_test_irq(ide_drive_t *drive)</div><div class='ctx'> 	if (dma_stat &amp; 4)</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='del'>-	if (!drive-&gt;waiting_for_dma)</div><div class='del'>-		printk(KERN_WARNING "%s: (%s) called while not waiting\n",</div><div class='del'>-				drive-&gt;name, __func__);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -881,7 +877,7 @@ static int hpt374_dma_end(ide_drive_t *drive)</div><div class='ctx'> 	pci_read_config_byte(dev, mcr_addr, &amp;mcr);</div><div class='ctx'> 	if (bwsr &amp; mask)</div><div class='ctx'> 		pci_write_config_byte(dev, mcr_addr, mcr | 0x30);</div><div class='del'>-	return __ide_dma_end(drive);</div><div class='add'>+	return ide_dma_end(drive);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -944,7 +940,7 @@ static void hpt3xxn_rw_disk(ide_drive_t *drive, struct request *rq)</div><div class='ctx'>  *	Perform a calibration cycle on the DPLL.</div><div class='ctx'>  *	Returns 1 if this succeeds</div><div class='ctx'>  */</div><div class='del'>-static int __devinit hpt37x_calibrate_dpll(struct pci_dev *dev, u16 f_low, u16 f_high)</div><div class='add'>+static int hpt37x_calibrate_dpll(struct pci_dev *dev, u16 f_low, u16 f_high)</div><div class='ctx'> {</div><div class='ctx'> 	u32 dpll = (f_high &lt;&lt; 16) | f_low | 0x100;</div><div class='ctx'> 	u8  scr2;</div><div class='hunk'>@@ -972,7 +968,37 @@ static int __devinit hpt37x_calibrate_dpll(struct pci_dev *dev, u16 f_low, u16 f</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned int __devinit init_chipset_hpt366(struct pci_dev *dev)</div><div class='add'>+static void hpt3xx_disable_fast_irq(struct pci_dev *dev, u8 mcr_addr)</div><div class='add'>+{</div><div class='add'>+	struct ide_host *host	= pci_get_drvdata(dev);</div><div class='add'>+	struct hpt_info *info	= host-&gt;host_priv + (&amp;dev-&gt;dev == host-&gt;dev[1]);</div><div class='add'>+	u8  chip_type		= info-&gt;chip_type;</div><div class='add'>+	u8  new_mcr, old_mcr	= 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Disable the "fast interrupt" prediction.  Don't hold off</div><div class='add'>+	 * on interrupts. (== 0x01 despite what the docs say)</div><div class='add'>+	 */</div><div class='add'>+	pci_read_config_byte(dev, mcr_addr + 1, &amp;old_mcr);</div><div class='add'>+</div><div class='add'>+	if (chip_type &gt;= HPT374)</div><div class='add'>+		new_mcr = old_mcr &amp; ~0x07;</div><div class='add'>+	else if (chip_type &gt;= HPT370) {</div><div class='add'>+		new_mcr = old_mcr;</div><div class='add'>+		new_mcr &amp;= ~0x02;</div><div class='add'>+#ifdef HPT_DELAY_INTERRUPT</div><div class='add'>+		new_mcr &amp;= ~0x01;</div><div class='add'>+#else</div><div class='add'>+		new_mcr |=  0x01;</div><div class='add'>+#endif</div><div class='add'>+	} else					/* HPT366 and HPT368  */</div><div class='add'>+		new_mcr = old_mcr &amp; ~0x80;</div><div class='add'>+</div><div class='add'>+	if (new_mcr != old_mcr)</div><div class='add'>+		pci_write_config_byte(dev, mcr_addr + 1, new_mcr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int init_chipset_hpt366(struct pci_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long io_base	= pci_resource_start(dev, 4);</div><div class='ctx'> 	struct hpt_info *info	= hpt3xx_get_info(&amp;dev-&gt;dev);</div><div class='hunk'>@@ -1209,9 +1235,11 @@ static unsigned int __devinit init_chipset_hpt366(struct pci_dev *dev)</div><div class='ctx'> 	 * NOTE: This register is only writeable via I/O space.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (chip_type == HPT371N &amp;&amp; clock == ATA_CLOCK_66MHZ)</div><div class='del'>-</div><div class='ctx'> 		outb(inb(io_base + 0x9c) | 0x04, io_base + 0x9c);</div><div class='ctx'> </div><div class='add'>+	hpt3xx_disable_fast_irq(dev, 0x50);</div><div class='add'>+	hpt3xx_disable_fast_irq(dev, 0x54);</div><div class='add'>+</div><div class='ctx'> 	return dev-&gt;irq;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1265,7 +1293,6 @@ static void __devinit init_hwif_hpt366(ide_hwif_t *hwif)</div><div class='ctx'> 	struct hpt_info *info	= hpt3xx_get_info(hwif-&gt;dev);</div><div class='ctx'> 	int serialize		= HPT_SERIALIZE_IO;</div><div class='ctx'> 	u8  chip_type		= info-&gt;chip_type;</div><div class='del'>-	u8  new_mcr, old_mcr	= 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Cache the channel's MISC. control registers' offset */</div><div class='ctx'> 	hwif-&gt;select_data	= hwif-&gt;channel ? 0x54 : 0x50;</div><div class='hunk'>@@ -1288,29 +1315,6 @@ static void __devinit init_hwif_hpt366(ide_hwif_t *hwif)</div><div class='ctx'> 	/* Serialize access to this device if needed */</div><div class='ctx'> 	if (serialize &amp;&amp; hwif-&gt;mate)</div><div class='ctx'> 		hwif-&gt;serialized = hwif-&gt;mate-&gt;serialized = 1;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Disable the "fast interrupt" prediction.  Don't hold off</div><div class='del'>-	 * on interrupts. (== 0x01 despite what the docs say)</div><div class='del'>-	 */</div><div class='del'>-	pci_read_config_byte(dev, hwif-&gt;select_data + 1, &amp;old_mcr);</div><div class='del'>-</div><div class='del'>-	if (info-&gt;chip_type &gt;= HPT374)</div><div class='del'>-		new_mcr = old_mcr &amp; ~0x07;</div><div class='del'>-	else if (info-&gt;chip_type &gt;= HPT370) {</div><div class='del'>-		new_mcr = old_mcr;</div><div class='del'>-		new_mcr &amp;= ~0x02;</div><div class='del'>-</div><div class='del'>-#ifdef HPT_DELAY_INTERRUPT</div><div class='del'>-		new_mcr &amp;= ~0x01;</div><div class='del'>-#else</div><div class='del'>-		new_mcr |=  0x01;</div><div class='del'>-#endif</div><div class='del'>-	} else					/* HPT366 and HPT368  */</div><div class='del'>-		new_mcr = old_mcr &amp; ~0x80;</div><div class='del'>-</div><div class='del'>-	if (new_mcr != old_mcr)</div><div class='del'>-		pci_write_config_byte(dev, hwif-&gt;select_data + 1, new_mcr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __devinit init_dma_hpt366(ide_hwif_t *hwif,</div><div class='hunk'>@@ -1449,7 +1453,7 @@ static const struct ide_dma_ops hpt36x_dma_ops = {</div><div class='ctx'> 	.dma_setup		= ide_dma_setup,</div><div class='ctx'> 	.dma_exec_cmd		= ide_dma_exec_cmd,</div><div class='ctx'> 	.dma_start		= ide_dma_start,</div><div class='del'>-	.dma_end		= __ide_dma_end,</div><div class='add'>+	.dma_end		= ide_dma_end,</div><div class='ctx'> 	.dma_test_irq		= ide_dma_test_irq,</div><div class='ctx'> 	.dma_lost_irq		= hpt366_dma_lost_irq,</div><div class='ctx'> 	.dma_timeout		= ide_dma_timeout,</div><div class='hunk'>@@ -1615,21 +1619,23 @@ static const struct pci_device_id hpt366_pci_tbl[] __devinitconst = {</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, hpt366_pci_tbl);</div><div class='ctx'> </div><div class='del'>-static struct pci_driver driver = {</div><div class='add'>+static struct pci_driver hpt366_pci_driver = {</div><div class='ctx'> 	.name		= "HPT366_IDE",</div><div class='ctx'> 	.id_table	= hpt366_pci_tbl,</div><div class='ctx'> 	.probe		= hpt366_init_one,</div><div class='ctx'> 	.remove		= __devexit_p(hpt366_remove),</div><div class='add'>+	.suspend	= ide_pci_suspend,</div><div class='add'>+	.resume		= ide_pci_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init hpt366_ide_init(void)</div><div class='ctx'> {</div><div class='del'>-	return ide_pci_register_driver(&amp;driver);</div><div class='add'>+	return ide_pci_register_driver(&amp;hpt366_pci_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit hpt366_ide_exit(void)</div><div class='ctx'> {</div><div class='del'>-	pci_unregister_driver(&amp;driver);</div><div class='add'>+	pci_unregister_driver(&amp;hpt366_pci_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(hpt366_ide_init);</div><div class='head'>diff --git a/drivers/ide/pci/it8213.c b/drivers/ide/pci/it8213.c<br/>index 652e47dd7e89..7c2feeb3c5ec 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/pci/it8213.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ide/pci/it8213.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/pci/it8213.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/pci/it8213.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/hdreg.h&gt;</div><div class='ctx'> #include &lt;linux/ide.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -190,21 +189,23 @@ static const struct pci_device_id it8213_pci_tbl[] = {</div><div class='ctx'> </div><div class='ctx'> MODULE_DEVICE_TABLE(pci, it8213_pci_tbl);</div><div class='ctx'> </div><div class='del'>-static struct pci_driver driver = {</div><div class='add'>+static struct pci_driver it8213_pci_driver = {</div><div class='ctx'> 	.name		= "ITE8213_IDE",</div><div class='ctx'> 	.id_table	= it8213_pci_tbl,</div><div class='ctx'> 	.probe		= it8213_init_one,</div><div class='ctx'> 	.remove		= ide_pci_remove,</div><div class='add'>+	.suspend	= ide_pci_suspend,</div><div class='add'>+	.resume		= ide_pci_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init it8213_ide_init(void)</div><div class='ctx'> {</div><div class='del'>-	return ide_pci_register_driver(&amp;driver);</div><div class='add'>+	return ide_pci_register_driver(&amp;it8213_pci_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit it8213_ide_exit(void)</div><div class='ctx'> {</div><div class='del'>-	pci_unregister_driver(&amp;driver);</div><div class='add'>+	pci_unregister_driver(&amp;it8213_pci_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(it8213_ide_init);</div><div class='head'>diff --git a/drivers/ide/pci/it821x.c b/drivers/ide/pci/it821x.c<br/>index 4a1508a707cc..995e18bb3139 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/pci/it821x.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ide/pci/it821x.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/pci/it821x.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/pci/it821x.c</a></div><div class='hunk'>@@ -63,7 +63,6 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/hdreg.h&gt;</div><div class='ctx'> #include &lt;linux/ide.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -139,8 +138,7 @@ static void it821x_program_udma(ide_drive_t *drive, u16 timing)</div><div class='ctx'> 	struct pci_dev *dev = to_pci_dev(hwif-&gt;dev);</div><div class='ctx'> 	struct it821x_dev *itdev = ide_get_hwifdata(hwif);</div><div class='ctx'> 	int channel = hwif-&gt;channel;</div><div class='del'>-	int unit = drive-&gt;select.b.unit;</div><div class='del'>-	u8 conf;</div><div class='add'>+	u8 unit = drive-&gt;dn &amp; 1, conf;</div><div class='ctx'> </div><div class='ctx'> 	/* Program UDMA timing bits */</div><div class='ctx'> 	if(itdev-&gt;clock_mode == ATA_66)</div><div class='hunk'>@@ -169,13 +167,11 @@ static void it821x_clock_strategy(ide_drive_t *drive)</div><div class='ctx'> 	ide_hwif_t *hwif = drive-&gt;hwif;</div><div class='ctx'> 	struct pci_dev *dev = to_pci_dev(hwif-&gt;dev);</div><div class='ctx'> 	struct it821x_dev *itdev = ide_get_hwifdata(hwif);</div><div class='add'>+	ide_drive_t *pair;</div><div class='add'>+	int clock, altclock, sel = 0;</div><div class='add'>+	u8 unit = drive-&gt;dn &amp; 1, v;</div><div class='ctx'> </div><div class='del'>-	u8 unit = drive-&gt;select.b.unit;</div><div class='del'>-	ide_drive_t *pair = &amp;hwif-&gt;drives[1-unit];</div><div class='del'>-</div><div class='del'>-	int clock, altclock;</div><div class='del'>-	u8 v;</div><div class='del'>-	int sel = 0;</div><div class='add'>+	pair = &amp;hwif-&gt;drives[1 - unit];</div><div class='ctx'> </div><div class='ctx'> 	if(itdev-&gt;want[0][0] &gt; itdev-&gt;want[1][0]) {</div><div class='ctx'> 		clock = itdev-&gt;want[0][1];</div><div class='hunk'>@@ -241,16 +237,17 @@ static void it821x_clock_strategy(ide_drive_t *drive)</div><div class='ctx'> </div><div class='ctx'> static void it821x_set_pio_mode(ide_drive_t *drive, const u8 pio)</div><div class='ctx'> {</div><div class='del'>-	ide_hwif_t *hwif	= drive-&gt;hwif;</div><div class='add'>+	ide_hwif_t *hwif = drive-&gt;hwif;</div><div class='ctx'> 	struct it821x_dev *itdev = ide_get_hwifdata(hwif);</div><div class='del'>-	int unit = drive-&gt;select.b.unit;</div><div class='del'>-	ide_drive_t *pair = &amp;hwif-&gt;drives[1 - unit];</div><div class='del'>-	u8 set_pio = pio;</div><div class='add'>+	ide_drive_t *pair;</div><div class='add'>+	u8 unit = drive-&gt;dn &amp; 1, set_pio = pio;</div><div class='ctx'> </div><div class='ctx'> 	/* Spec says 89 ref driver uses 88 */</div><div class='ctx'> 	static u16 pio_timings[]= { 0xAA88, 0xA382, 0xA181, 0x3332, 0x3121 };</div><div class='ctx'> 	static u8 pio_want[]    = { ATA_66, ATA_66, ATA_66, ATA_66, ATA_ANY };</div><div class='ctx'> </div><div class='add'>+	pair = &amp;hwif-&gt;drives[1 - unit];</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Compute the best PIO mode we can for a given device. We must</div><div class='ctx'> 	 * pick a speed that does not cause problems with the other device</div><div class='hunk'>@@ -287,9 +284,7 @@ static void it821x_tune_mwdma (ide_drive_t *drive, byte mode_wanted)</div><div class='ctx'> 	ide_hwif_t *hwif = drive-&gt;hwif;</div><div class='ctx'> 	struct pci_dev *dev = to_pci_dev(hwif-&gt;dev);</div><div class='ctx'> 	struct it821x_dev *itdev = (void *)ide_get_hwifdata(hwif);</div><div class='del'>-	int unit = drive-&gt;select.b.unit;</div><div class='del'>-	int channel = hwif-&gt;channel;</div><div class='del'>-	u8 conf;</div><div class='add'>+	u8 unit = drive-&gt;dn &amp; 1, channel = hwif-&gt;channel, conf;</div><div class='ctx'> </div><div class='ctx'> 	static u16 dma[]	= { 0x8866, 0x3222, 0x3121 };</div><div class='ctx'> 	static u8 mwdma_want[]	= { ATA_ANY, ATA_66, ATA_ANY };</div><div class='hunk'>@@ -326,9 +321,7 @@ static void it821x_tune_udma (ide_drive_t *drive, byte mode_wanted)</div><div class='ctx'> 	ide_hwif_t *hwif = drive-&gt;hwif;</div><div class='ctx'> 	struct pci_dev *dev = to_pci_dev(hwif-&gt;dev);</div><div class='ctx'> 	struct it821x_dev *itdev = ide_get_hwifdata(hwif);</div><div class='del'>-	int unit = drive-&gt;select.b.unit;</div><div class='del'>-	int channel = hwif-&gt;channel;</div><div class='del'>-	u8 conf;</div><div class='add'>+	u8 unit = drive-&gt;dn &amp; 1, channel = hwif-&gt;channel, conf;</div><div class='ctx'> </div><div class='ctx'> 	static u16 udma[]	= { 0x4433, 0x4231, 0x3121, 0x2121, 0x1111, 0x2211, 0x1111 };</div><div class='ctx'> 	static u8 udma_want[]	= { ATA_ANY, ATA_50, ATA_ANY, ATA_66, ATA_66, ATA_50, ATA_66 };</div><div class='hunk'>@@ -370,7 +363,8 @@ static void it821x_dma_start(ide_drive_t *drive)</div><div class='ctx'> {</div><div class='ctx'> 	ide_hwif_t *hwif = drive-&gt;hwif;</div><div class='ctx'> 	struct it821x_dev *itdev = ide_get_hwifdata(hwif);</div><div class='del'>-	int unit = drive-&gt;select.b.unit;</div><div class='add'>+	u8 unit = drive-&gt;dn &amp; 1;</div><div class='add'>+</div><div class='ctx'> 	if(itdev-&gt;mwdma[unit] != MWDMA_OFF)</div><div class='ctx'> 		it821x_program(drive, itdev-&gt;mwdma[unit]);</div><div class='ctx'> 	else if(itdev-&gt;udma[unit] != UDMA_OFF &amp;&amp; itdev-&gt;timing10)</div><div class='hunk'>@@ -390,9 +384,10 @@ static void it821x_dma_start(ide_drive_t *drive)</div><div class='ctx'> static int it821x_dma_end(ide_drive_t *drive)</div><div class='ctx'> {</div><div class='ctx'> 	ide_hwif_t *hwif = drive-&gt;hwif;</div><div class='del'>-	int unit = drive-&gt;select.b.unit;</div><div class='ctx'> 	struct it821x_dev *itdev = ide_get_hwifdata(hwif);</div><div class='del'>-	int ret = __ide_dma_end(drive);</div><div class='add'>+	int ret = ide_dma_end(drive);</div><div class='add'>+	u8 unit = drive-&gt;dn &amp; 1;</div><div class='add'>+</div><div class='ctx'> 	if(itdev-&gt;mwdma[unit] != MWDMA_OFF)</div><div class='ctx'> 		it821x_program(drive, itdev-&gt;pio[unit]);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -446,8 +441,7 @@ static u8 it821x_cable_detect(ide_hwif_t *hwif)</div><div class='ctx'> static void it821x_quirkproc(ide_drive_t *drive)</div><div class='ctx'> {</div><div class='ctx'> 	struct it821x_dev *itdev = ide_get_hwifdata(drive-&gt;hwif);</div><div class='del'>-	struct hd_driveid *id = drive-&gt;id;</div><div class='del'>-	u16 *idbits = (u16 *)drive-&gt;id;</div><div class='add'>+	u16 *id = drive-&gt;id;</div><div class='ctx'> </div><div class='ctx'> 	if (!itdev-&gt;smart) {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -456,7 +450,7 @@ static void it821x_quirkproc(ide_drive_t *drive)</div><div class='ctx'> 		 *	IRQ mask as we may well be in PIO (eg rev 0x10)</div><div class='ctx'> 		 *	for now and we know unmasking is safe on this chipset.</div><div class='ctx'> 		 */</div><div class='del'>-		drive-&gt;unmask = 1;</div><div class='add'>+		drive-&gt;dev_flags |= IDE_DFLAG_UNMASK;</div><div class='ctx'> 	} else {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 *	Perform fixups on smart mode. We need to "lose" some</div><div class='hunk'>@@ -466,36 +460,36 @@ static void it821x_quirkproc(ide_drive_t *drive)</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 		/* Check for RAID v native */</div><div class='del'>-		if(strstr(id-&gt;model, "Integrated Technology Express")) {</div><div class='add'>+		if (strstr((char *)&amp;id[ATA_ID_PROD],</div><div class='add'>+			   "Integrated Technology Express")) {</div><div class='ctx'> 			/* In raid mode the ident block is slightly buggy</div><div class='ctx'> 			   We need to set the bits so that the IDE layer knows</div><div class='ctx'> 			   LBA28. LBA48 and DMA ar valid */</div><div class='del'>-			id-&gt;capability |= 3;		/* LBA28, DMA */</div><div class='del'>-			id-&gt;command_set_2 |= 0x0400;	/* LBA48 valid */</div><div class='del'>-			id-&gt;cfs_enable_2 |= 0x0400;	/* LBA48 on */</div><div class='add'>+			id[ATA_ID_CAPABILITY]    |= (3 &lt;&lt; 8); /* LBA28, DMA */</div><div class='add'>+			id[ATA_ID_COMMAND_SET_2] |= 0x0400;   /* LBA48 valid */</div><div class='add'>+			id[ATA_ID_CFS_ENABLE_2]  |= 0x0400;   /* LBA48 on */</div><div class='ctx'> 			/* Reporting logic */</div><div class='ctx'> 			printk(KERN_INFO "%s: IT8212 %sRAID %d volume",</div><div class='del'>-				drive-&gt;name,</div><div class='del'>-				idbits[147] ? "Bootable ":"",</div><div class='del'>-				idbits[129]);</div><div class='del'>-				if(idbits[129] != 1)</div><div class='del'>-					printk("(%dK stripe)", idbits[146]);</div><div class='del'>-				printk(".\n");</div><div class='add'>+				drive-&gt;name, id[147] ? "Bootable " : "",</div><div class='add'>+				id[ATA_ID_CSFO]);</div><div class='add'>+			if (id[ATA_ID_CSFO] != 1)</div><div class='add'>+				printk(KERN_CONT "(%dK stripe)", id[146]);</div><div class='add'>+			printk(KERN_CONT ".\n");</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* Non RAID volume. Fixups to stop the core code</div><div class='ctx'> 			   doing unsupported things */</div><div class='del'>-			id-&gt;field_valid &amp;= 3;</div><div class='del'>-			id-&gt;queue_depth = 0;</div><div class='del'>-			id-&gt;command_set_1 = 0;</div><div class='del'>-			id-&gt;command_set_2 &amp;= 0xC400;</div><div class='del'>-			id-&gt;cfsse &amp;= 0xC000;</div><div class='del'>-			id-&gt;cfs_enable_1 = 0;</div><div class='del'>-			id-&gt;cfs_enable_2 &amp;= 0xC400;</div><div class='del'>-			id-&gt;csf_default &amp;= 0xC000;</div><div class='del'>-			id-&gt;word127 = 0;</div><div class='del'>-			id-&gt;dlf = 0;</div><div class='del'>-			id-&gt;csfo = 0;</div><div class='del'>-			id-&gt;cfa_power = 0;</div><div class='add'>+			id[ATA_ID_FIELD_VALID]	 &amp;= 3;</div><div class='add'>+			id[ATA_ID_QUEUE_DEPTH]	  = 0;</div><div class='add'>+			id[ATA_ID_COMMAND_SET_1]  = 0;</div><div class='add'>+			id[ATA_ID_COMMAND_SET_2] &amp;= 0xC400;</div><div class='add'>+			id[ATA_ID_CFSSE]	 &amp;= 0xC000;</div><div class='add'>+			id[ATA_ID_CFS_ENABLE_1]	  = 0;</div><div class='add'>+			id[ATA_ID_CFS_ENABLE_2]	 &amp;= 0xC400;</div><div class='add'>+			id[ATA_ID_CSF_DEFAULT]	 &amp;= 0xC000;</div><div class='add'>+			id[127]			  = 0;</div><div class='add'>+			id[ATA_ID_DLF]		  = 0;</div><div class='add'>+			id[ATA_ID_CSFO]		  = 0;</div><div class='add'>+			id[ATA_ID_CFA_POWER]	  = 0;</div><div class='ctx'> 			printk(KERN_INFO "%s: Performing identify fixups.\n",</div><div class='ctx'> 				drive-&gt;name);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -505,8 +499,8 @@ static void it821x_quirkproc(ide_drive_t *drive)</div><div class='ctx'> 		 * IDE core that DMA is supported (it821x hardware</div><div class='ctx'> 		 * takes care of DMA mode programming).</div><div class='ctx'> 		 */</div><div class='del'>-		if (id-&gt;capability &amp; 1) {</div><div class='del'>-			id-&gt;dma_mword |= 0x0101;</div><div class='add'>+		if (ata_id_has_dma(id)) {</div><div class='add'>+			id[ATA_ID_MWDMA_MODES] |= 0x0101;</div><div class='ctx'> 			drive-&gt;current_speed = XFER_MW_DMA_0;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -588,7 +582,7 @@ static void __devinit init_hwif_it821x(ide_hwif_t *hwif)</div><div class='ctx'> 	hwif-&gt;mwdma_mask = ATA_MWDMA2;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devinit it8212_disable_raid(struct pci_dev *dev)</div><div class='add'>+static void it8212_disable_raid(struct pci_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	/* Reset local CPU, and set BIOS not ready */</div><div class='ctx'> 	pci_write_config_byte(dev, 0x5E, 0x01);</div><div class='hunk'>@@ -605,7 +599,7 @@ static void __devinit it8212_disable_raid(struct pci_dev *dev)</div><div class='ctx'> 	pci_write_config_byte(dev, PCI_LATENCY_TIMER, 0x20);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned int __devinit init_chipset_it821x(struct pci_dev *dev)</div><div class='add'>+static unsigned int init_chipset_it821x(struct pci_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	u8 conf;</div><div class='ctx'> 	static char *mode[2] = { "pass through", "smart" };</div><div class='hunk'>@@ -682,21 +676,23 @@ static const struct pci_device_id it821x_pci_tbl[] = {</div><div class='ctx'> </div><div class='ctx'> MODULE_DEVICE_TABLE(pci, it821x_pci_tbl);</div><div class='ctx'> </div><div class='del'>-static struct pci_driver driver = {</div><div class='add'>+static struct pci_driver it821x_pci_driver = {</div><div class='ctx'> 	.name		= "ITE821x IDE",</div><div class='ctx'> 	.id_table	= it821x_pci_tbl,</div><div class='ctx'> 	.probe		= it821x_init_one,</div><div class='ctx'> 	.remove		= __devexit_p(it821x_remove),</div><div class='add'>+	.suspend	= ide_pci_suspend,</div><div class='add'>+	.resume		= ide_pci_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init it821x_ide_init(void)</div><div class='ctx'> {</div><div class='del'>-	return ide_pci_register_driver(&amp;driver);</div><div class='add'>+	return ide_pci_register_driver(&amp;it821x_pci_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit it821x_ide_exit(void)</div><div class='ctx'> {</div><div class='del'>-	pci_unregister_driver(&amp;driver);</div><div class='add'>+	pci_unregister_driver(&amp;it821x_pci_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(it821x_ide_init);</div><div class='head'>diff --git a/drivers/ide/pci/jmicron.c b/drivers/ide/pci/jmicron.c<br/>index bb9d09d8f196..9a68433cf46d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/pci/jmicron.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ide/pci/jmicron.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/pci/jmicron.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/pci/jmicron.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/hdreg.h&gt;</div><div class='ctx'> #include &lt;linux/ide.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -150,21 +149,23 @@ static struct pci_device_id jmicron_pci_tbl[] = {</div><div class='ctx'> </div><div class='ctx'> MODULE_DEVICE_TABLE(pci, jmicron_pci_tbl);</div><div class='ctx'> </div><div class='del'>-static struct pci_driver driver = {</div><div class='add'>+static struct pci_driver jmicron_pci_driver = {</div><div class='ctx'> 	.name		= "JMicron IDE",</div><div class='ctx'> 	.id_table	= jmicron_pci_tbl,</div><div class='ctx'> 	.probe		= jmicron_init_one,</div><div class='ctx'> 	.remove		= ide_pci_remove,</div><div class='add'>+	.suspend	= ide_pci_suspend,</div><div class='add'>+	.resume		= ide_pci_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init jmicron_ide_init(void)</div><div class='ctx'> {</div><div class='del'>-	return ide_pci_register_driver(&amp;driver);</div><div class='add'>+	return ide_pci_register_driver(&amp;jmicron_pci_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit jmicron_ide_exit(void)</div><div class='ctx'> {</div><div class='del'>-	pci_unregister_driver(&amp;driver);</div><div class='add'>+	pci_unregister_driver(&amp;jmicron_pci_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(jmicron_ide_init);</div><div class='head'>diff --git a/drivers/ide/pci/ns87415.c b/drivers/ide/pci/ns87415.c<br/>index ffefcd15196c..13789060f407 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/pci/ns87415.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ide/pci/ns87415.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/pci/ns87415.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/pci/ns87415.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/hdreg.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/ide.h&gt;</div><div class='hunk'>@@ -138,7 +137,7 @@ static void __devinit superio_init_iops(struct hwif_s *hwif)</div><div class='ctx'> static unsigned int ns87415_count = 0, ns87415_control[MAX_HWIFS] = { 0 };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * This routine either enables/disables (according to drive-&gt;present)</div><div class='add'>+ * This routine either enables/disables (according to IDE_DFLAG_PRESENT)</div><div class='ctx'>  * the IRQ associated with the port (HWIF(drive)),</div><div class='ctx'>  * and selects either PIO or DMA handshaking for the next I/O operation.</div><div class='ctx'>  */</div><div class='hunk'>@@ -154,11 +153,15 @@ static void ns87415_prepare_drive (ide_drive_t *drive, unsigned int use_dma)</div><div class='ctx'> </div><div class='ctx'> 	/* Adjust IRQ enable bit */</div><div class='ctx'> 	bit = 1 &lt;&lt; (8 + hwif-&gt;channel);</div><div class='del'>-	new = drive-&gt;present ? (new &amp; ~bit) : (new | bit);</div><div class='add'>+</div><div class='add'>+	if (drive-&gt;dev_flags &amp; IDE_DFLAG_PRESENT)</div><div class='add'>+		new &amp;= ~bit;</div><div class='add'>+	else</div><div class='add'>+		new |= bit;</div><div class='ctx'> </div><div class='ctx'> 	/* Select PIO or DMA, DMA may only be selected for one drive/channel. */</div><div class='del'>-	bit   = 1 &lt;&lt; (20 + drive-&gt;select.b.unit       + (hwif-&gt;channel &lt;&lt; 1));</div><div class='del'>-	other = 1 &lt;&lt; (20 + (1 - drive-&gt;select.b.unit) + (hwif-&gt;channel &lt;&lt; 1));</div><div class='add'>+	bit   = 1 &lt;&lt; (20 + (drive-&gt;dn &amp; 1) + (hwif-&gt;channel &lt;&lt; 1));</div><div class='add'>+	other = 1 &lt;&lt; (20 + (1 - (drive-&gt;dn &amp; 1)) + (hwif-&gt;channel &lt;&lt; 1));</div><div class='ctx'> 	new = use_dma ? ((new &amp; ~other) | bit) : (new &amp; ~bit);</div><div class='ctx'> </div><div class='ctx'> 	if (new != *old) {</div><div class='hunk'>@@ -188,7 +191,8 @@ static void ns87415_prepare_drive (ide_drive_t *drive, unsigned int use_dma)</div><div class='ctx'> </div><div class='ctx'> static void ns87415_selectproc (ide_drive_t *drive)</div><div class='ctx'> {</div><div class='del'>-	ns87415_prepare_drive (drive, drive-&gt;using_dma);</div><div class='add'>+	ns87415_prepare_drive(drive,</div><div class='add'>+			      !!(drive-&gt;dev_flags &amp; IDE_DFLAG_USING_DMA));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ns87415_dma_end(ide_drive_t *drive)</div><div class='hunk'>@@ -274,9 +278,9 @@ static void __devinit init_hwif_ns87415 (ide_hwif_t *hwif)</div><div class='ctx'> 		do {</div><div class='ctx'> 			udelay(50);</div><div class='ctx'> 			stat = hwif-&gt;tp_ops-&gt;read_status(hwif);</div><div class='del'>-                	if (stat == 0xff)</div><div class='del'>-                        	break;</div><div class='del'>-        	} while ((stat &amp; BUSY_STAT) &amp;&amp; --timeout);</div><div class='add'>+			if (stat == 0xff)</div><div class='add'>+				break;</div><div class='add'>+		} while ((stat &amp; ATA_BUSY) &amp;&amp; --timeout);</div><div class='ctx'> #endif</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -335,21 +339,23 @@ static const struct pci_device_id ns87415_pci_tbl[] = {</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, ns87415_pci_tbl);</div><div class='ctx'> </div><div class='del'>-static struct pci_driver driver = {</div><div class='add'>+static struct pci_driver ns87415_pci_driver = {</div><div class='ctx'> 	.name		= "NS87415_IDE",</div><div class='ctx'> 	.id_table	= ns87415_pci_tbl,</div><div class='ctx'> 	.probe		= ns87415_init_one,</div><div class='ctx'> 	.remove		= ide_pci_remove,</div><div class='add'>+	.suspend	= ide_pci_suspend,</div><div class='add'>+	.resume		= ide_pci_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init ns87415_ide_init(void)</div><div class='ctx'> {</div><div class='del'>-	return ide_pci_register_driver(&amp;driver);</div><div class='add'>+	return ide_pci_register_driver(&amp;ns87415_pci_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit ns87415_ide_exit(void)</div><div class='ctx'> {</div><div class='del'>-	pci_unregister_driver(&amp;driver);</div><div class='add'>+	pci_unregister_driver(&amp;ns87415_pci_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(ns87415_ide_init);</div><div class='head'>diff --git a/drivers/ide/pci/opti621.c b/drivers/ide/pci/opti621.c<br/>index e28e672ddafc..6048eda3cd61 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/pci/opti621.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ide/pci/opti621.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/pci/opti621.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/pci/opti621.c</a></div><div class='hunk'>@@ -85,7 +85,6 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/hdreg.h&gt;</div><div class='ctx'> #include &lt;linux/ide.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='hunk'>@@ -137,7 +136,7 @@ static u8 read_reg(int reg)</div><div class='ctx'> static void opti621_set_pio_mode(ide_drive_t *drive, const u8 pio)</div><div class='ctx'> {</div><div class='ctx'> 	ide_hwif_t *hwif = drive-&gt;hwif;</div><div class='del'>-	ide_drive_t *pair = ide_get_paired_drive(drive);</div><div class='add'>+	ide_drive_t *pair = ide_get_pair_dev(drive);</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	u8 tim, misc, addr_pio = pio, clk;</div><div class='ctx'> </div><div class='hunk'>@@ -153,7 +152,7 @@ static void opti621_set_pio_mode(ide_drive_t *drive, const u8 pio)</div><div class='ctx'> </div><div class='ctx'> 	drive-&gt;drive_data = XFER_PIO_0 + pio;</div><div class='ctx'> </div><div class='del'>-	if (pair-&gt;present) {</div><div class='add'>+	if (pair) {</div><div class='ctx'> 		if (pair-&gt;drive_data &amp;&amp; pair-&gt;drive_data &lt; drive-&gt;drive_data)</div><div class='ctx'> 			addr_pio = pair-&gt;drive_data - XFER_PIO_0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -180,7 +179,7 @@ static void opti621_set_pio_mode(ide_drive_t *drive, const u8 pio)</div><div class='ctx'> 	misc = addr_timings[clk][addr_pio];</div><div class='ctx'> </div><div class='ctx'> 	/* select Index-0/1 for Register-A/B */</div><div class='del'>-	write_reg(drive-&gt;select.b.unit, MISC_REG);</div><div class='add'>+	write_reg(drive-&gt;dn &amp; 1, MISC_REG);</div><div class='ctx'> 	/* set read cycle timings */</div><div class='ctx'> 	write_reg(tim, READ_REG);</div><div class='ctx'> 	/* set write cycle timings */</div><div class='hunk'>@@ -221,21 +220,23 @@ static const struct pci_device_id opti621_pci_tbl[] = {</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, opti621_pci_tbl);</div><div class='ctx'> </div><div class='del'>-static struct pci_driver driver = {</div><div class='add'>+static struct pci_driver opti621_pci_driver = {</div><div class='ctx'> 	.name		= "Opti621_IDE",</div><div class='ctx'> 	.id_table	= opti621_pci_tbl,</div><div class='ctx'> 	.probe		= opti621_init_one,</div><div class='ctx'> 	.remove		= ide_pci_remove,</div><div class='add'>+	.suspend	= ide_pci_suspend,</div><div class='add'>+	.resume		= ide_pci_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init opti621_ide_init(void)</div><div class='ctx'> {</div><div class='del'>-	return ide_pci_register_driver(&amp;driver);</div><div class='add'>+	return ide_pci_register_driver(&amp;opti621_pci_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit opti621_ide_exit(void)</div><div class='ctx'> {</div><div class='del'>-	pci_unregister_driver(&amp;driver);</div><div class='add'>+	pci_unregister_driver(&amp;opti621_pci_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(opti621_ide_init);</div><div class='head'>diff --git a/drivers/ide/pci/pdc202xx_new.c b/drivers/ide/pci/pdc202xx_new.c<br/>index d477da6b5858..211ae46e3e0c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/pci/pdc202xx_new.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ide/pci/pdc202xx_new.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/pci/pdc202xx_new.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/pci/pdc202xx_new.c</a></div><div class='hunk'>@@ -19,7 +19,6 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/hdreg.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/ide.h&gt;</div><div class='hunk'>@@ -203,10 +202,10 @@ static u8 pdcnew_cable_detect(ide_hwif_t *hwif)</div><div class='ctx'> </div><div class='ctx'> static void pdcnew_quirkproc(ide_drive_t *drive)</div><div class='ctx'> {</div><div class='del'>-	const char **list, *model = drive-&gt;id-&gt;model;</div><div class='add'>+	const char **list, *m = (char *)&amp;drive-&gt;id[ATA_ID_PROD];</div><div class='ctx'> </div><div class='ctx'> 	for (list = pdc_quirk_drives; *list != NULL; list++)</div><div class='del'>-		if (strstr(model, *list) != NULL) {</div><div class='add'>+		if (strstr(m, *list) != NULL) {</div><div class='ctx'> 			drive-&gt;quirk_list = 2;</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -227,7 +226,7 @@ static void pdcnew_reset(ide_drive_t *drive)</div><div class='ctx'>  * read_counter - Read the byte count registers</div><div class='ctx'>  * @dma_base: for the port address</div><div class='ctx'>  */</div><div class='del'>-static long __devinit read_counter(u32 dma_base)</div><div class='add'>+static long read_counter(u32 dma_base)</div><div class='ctx'> {</div><div class='ctx'> 	u32  pri_dma_base = dma_base, sec_dma_base = dma_base + 0x08;</div><div class='ctx'> 	u8   cnt0, cnt1, cnt2, cnt3;</div><div class='hunk'>@@ -267,7 +266,7 @@ static long __devinit read_counter(u32 dma_base)</div><div class='ctx'>  * @dma_base: for the port address</div><div class='ctx'>  * E.g. 16949000 on 33 MHz PCI bus, i.e. half of the PCI clock.</div><div class='ctx'>  */</div><div class='del'>-static long __devinit detect_pll_input_clock(unsigned long dma_base)</div><div class='add'>+static long detect_pll_input_clock(unsigned long dma_base)</div><div class='ctx'> {</div><div class='ctx'> 	struct timeval start_time, end_time;</div><div class='ctx'> 	long start_count, end_count;</div><div class='hunk'>@@ -310,7 +309,7 @@ static long __devinit detect_pll_input_clock(unsigned long dma_base)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PPC_PMAC</div><div class='del'>-static void __devinit apple_kiwi_init(struct pci_dev *pdev)</div><div class='add'>+static void apple_kiwi_init(struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct device_node *np = pci_device_to_OF_node(pdev);</div><div class='ctx'> 	u8 conf;</div><div class='hunk'>@@ -326,7 +325,7 @@ static void __devinit apple_kiwi_init(struct pci_dev *pdev)</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_PPC_PMAC */</div><div class='ctx'> </div><div class='del'>-static unsigned int __devinit init_chipset_pdcnew(struct pci_dev *dev)</div><div class='add'>+static unsigned int init_chipset_pdcnew(struct pci_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	const char *name = DRV_NAME;</div><div class='ctx'> 	unsigned long dma_base = pci_resource_start(dev, 4);</div><div class='hunk'>@@ -562,21 +561,23 @@ static const struct pci_device_id pdc202new_pci_tbl[] = {</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, pdc202new_pci_tbl);</div><div class='ctx'> </div><div class='del'>-static struct pci_driver driver = {</div><div class='add'>+static struct pci_driver pdc202new_pci_driver = {</div><div class='ctx'> 	.name		= "Promise_IDE",</div><div class='ctx'> 	.id_table	= pdc202new_pci_tbl,</div><div class='ctx'> 	.probe		= pdc202new_init_one,</div><div class='ctx'> 	.remove		= __devexit_p(pdc202new_remove),</div><div class='add'>+	.suspend	= ide_pci_suspend,</div><div class='add'>+	.resume		= ide_pci_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init pdc202new_ide_init(void)</div><div class='ctx'> {</div><div class='del'>-	return ide_pci_register_driver(&amp;driver);</div><div class='add'>+	return ide_pci_register_driver(&amp;pdc202new_pci_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit pdc202new_ide_exit(void)</div><div class='ctx'> {</div><div class='del'>-	pci_unregister_driver(&amp;driver);</div><div class='add'>+	pci_unregister_driver(&amp;pdc202new_pci_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(pdc202new_ide_init);</div><div class='head'>diff --git a/drivers/ide/pci/pdc202xx_old.c b/drivers/ide/pci/pdc202xx_old.c<br/>index de9a27400462..799557c25eef 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/pci/pdc202xx_old.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ide/pci/pdc202xx_old.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/pci/pdc202xx_old.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/pci/pdc202xx_old.c</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='del'>-#include &lt;linux/hdreg.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/ide.h&gt;</div><div class='hunk'>@@ -86,7 +85,7 @@ static void pdc202xx_set_mode(ide_drive_t *drive, const u8 speed)</div><div class='ctx'> 		 * Prefetch_EN / IORDY_EN / PA[3:0] bits of register A</div><div class='ctx'> 		 */</div><div class='ctx'> 		AP &amp;= ~0x3f;</div><div class='del'>-		if (drive-&gt;id-&gt;capability &amp; 4)</div><div class='add'>+		if (ata_id_iordy_disable(drive-&gt;id))</div><div class='ctx'> 			AP |= 0x20;	/* set IORDY_EN bit */</div><div class='ctx'> 		if (drive-&gt;media == ide_disk)</div><div class='ctx'> 			AP |= 0x10;	/* set Prefetch_EN bit */</div><div class='hunk'>@@ -154,10 +153,10 @@ static void pdc_old_disable_66MHz_clock(ide_hwif_t *hwif)</div><div class='ctx'> </div><div class='ctx'> static void pdc202xx_quirkproc(ide_drive_t *drive)</div><div class='ctx'> {</div><div class='del'>-	const char **list, *model = drive-&gt;id-&gt;model;</div><div class='add'>+	const char **list, *m = (char *)&amp;drive-&gt;id[ATA_ID_PROD];</div><div class='ctx'> </div><div class='ctx'> 	for (list = pdc_quirk_drives; *list != NULL; list++)</div><div class='del'>-		if (strstr(model, *list) != NULL) {</div><div class='add'>+		if (strstr(m, *list) != NULL) {</div><div class='ctx'> 			drive-&gt;quirk_list = 2;</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -169,7 +168,7 @@ static void pdc202xx_dma_start(ide_drive_t *drive)</div><div class='ctx'> {</div><div class='ctx'> 	if (drive-&gt;current_speed &gt; XFER_UDMA_2)</div><div class='ctx'> 		pdc_old_enable_66MHz_clock(drive-&gt;hwif);</div><div class='del'>-	if (drive-&gt;media != ide_disk || drive-&gt;addressing == 1) {</div><div class='add'>+	if (drive-&gt;media != ide_disk || (drive-&gt;dev_flags &amp; IDE_DFLAG_LBA48)) {</div><div class='ctx'> 		struct request *rq	= HWGROUP(drive)-&gt;rq;</div><div class='ctx'> 		ide_hwif_t *hwif	= HWIF(drive);</div><div class='ctx'> 		unsigned long high_16	= hwif-&gt;extra_base - 16;</div><div class='hunk'>@@ -189,7 +188,7 @@ static void pdc202xx_dma_start(ide_drive_t *drive)</div><div class='ctx'> </div><div class='ctx'> static int pdc202xx_dma_end(ide_drive_t *drive)</div><div class='ctx'> {</div><div class='del'>-	if (drive-&gt;media != ide_disk || drive-&gt;addressing == 1) {</div><div class='add'>+	if (drive-&gt;media != ide_disk || (drive-&gt;dev_flags &amp; IDE_DFLAG_LBA48)) {</div><div class='ctx'> 		ide_hwif_t *hwif	= HWIF(drive);</div><div class='ctx'> 		unsigned long high_16	= hwif-&gt;extra_base - 16;</div><div class='ctx'> 		unsigned long atapi_reg	= high_16 + (hwif-&gt;channel ? 0x24 : 0x20);</div><div class='hunk'>@@ -201,7 +200,7 @@ static int pdc202xx_dma_end(ide_drive_t *drive)</div><div class='ctx'> 	}</div><div class='ctx'> 	if (drive-&gt;current_speed &gt; XFER_UDMA_2)</div><div class='ctx'> 		pdc_old_disable_66MHz_clock(drive-&gt;hwif);</div><div class='del'>-	return __ide_dma_end(drive);</div><div class='add'>+	return ide_dma_end(drive);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int pdc202xx_dma_test_irq(ide_drive_t *drive)</div><div class='hunk'>@@ -265,7 +264,7 @@ static void pdc202xx_dma_timeout(ide_drive_t *drive)</div><div class='ctx'> 	ide_dma_timeout(drive);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned int __devinit init_chipset_pdc202xx(struct pci_dev *dev)</div><div class='add'>+static unsigned int init_chipset_pdc202xx(struct pci_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long dmabase = pci_resource_start(dev, 4);</div><div class='ctx'> 	u8 udma_speed_flag = 0, primary_mode = 0, secondary_mode = 0;</div><div class='hunk'>@@ -334,7 +333,7 @@ static const struct ide_dma_ops pdc20246_dma_ops = {</div><div class='ctx'> 	.dma_setup		= ide_dma_setup,</div><div class='ctx'> 	.dma_exec_cmd		= ide_dma_exec_cmd,</div><div class='ctx'> 	.dma_start		= ide_dma_start,</div><div class='del'>-	.dma_end		= __ide_dma_end,</div><div class='add'>+	.dma_end		= ide_dma_end,</div><div class='ctx'> 	.dma_test_irq		= pdc202xx_dma_test_irq,</div><div class='ctx'> 	.dma_lost_irq		= pdc202xx_dma_lost_irq,</div><div class='ctx'> 	.dma_timeout		= pdc202xx_dma_timeout,</div><div class='hunk'>@@ -427,21 +426,23 @@ static const struct pci_device_id pdc202xx_pci_tbl[] = {</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, pdc202xx_pci_tbl);</div><div class='ctx'> </div><div class='del'>-static struct pci_driver driver = {</div><div class='add'>+static struct pci_driver pdc202xx_pci_driver = {</div><div class='ctx'> 	.name		= "Promise_Old_IDE",</div><div class='ctx'> 	.id_table	= pdc202xx_pci_tbl,</div><div class='ctx'> 	.probe		= pdc202xx_init_one,</div><div class='ctx'> 	.remove		= ide_pci_remove,</div><div class='add'>+	.suspend	= ide_pci_suspend,</div><div class='add'>+	.resume		= ide_pci_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init pdc202xx_ide_init(void)</div><div class='ctx'> {</div><div class='del'>-	return ide_pci_register_driver(&amp;driver);</div><div class='add'>+	return ide_pci_register_driver(&amp;pdc202xx_pci_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit pdc202xx_ide_exit(void)</div><div class='ctx'> {</div><div class='del'>-	pci_unregister_driver(&amp;driver);</div><div class='add'>+	pci_unregister_driver(&amp;pdc202xx_pci_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(pdc202xx_ide_init);</div><div class='head'>diff --git a/drivers/ide/pci/piix.c b/drivers/ide/pci/piix.c<br/>index 30cfc815fe31..d63f9fdca76b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/pci/piix.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ide/pci/piix.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/pci/piix.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/pci/piix.c</a></div><div class='hunk'>@@ -48,7 +48,6 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/hdreg.h&gt;</div><div class='ctx'> #include &lt;linux/ide.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -205,7 +204,7 @@ static void piix_set_dma_mode(ide_drive_t *drive, const u8 speed)</div><div class='ctx'>  *	out to be nice and simple.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static unsigned int __devinit init_chipset_ich(struct pci_dev *dev)</div><div class='add'>+static unsigned int init_chipset_ich(struct pci_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	u32 extra = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -216,17 +215,26 @@ static unsigned int __devinit init_chipset_ich(struct pci_dev *dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *	piix_dma_clear_irq	-	clear BMDMA status</div><div class='del'>- *	@drive: IDE drive to clear</div><div class='add'>+ *	ich_clear_irq	-	clear BMDMA status</div><div class='add'>+ *	@drive: IDE drive</div><div class='ctx'>  *</div><div class='del'>- *	Called from ide_intr() for PIO interrupts</div><div class='del'>- *	to clear BMDMA status as needed by ICHx</div><div class='add'>+ *	ICHx contollers set DMA INTR no matter DMA or PIO.</div><div class='add'>+ *	BMDMA status might need to be cleared even for</div><div class='add'>+ *	PIO interrupts to prevent spurious/lost IRQ.</div><div class='ctx'>  */</div><div class='del'>-static void piix_dma_clear_irq(ide_drive_t *drive)</div><div class='add'>+static void ich_clear_irq(ide_drive_t *drive)</div><div class='ctx'> {</div><div class='ctx'> 	ide_hwif_t *hwif = HWIF(drive);</div><div class='ctx'> 	u8 dma_stat;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * ide_dma_end() needs BMDMA status for error checking.</div><div class='add'>+	 * So, skip clearing BMDMA status here and leave it</div><div class='add'>+	 * to ide_dma_end() if this is DMA interrupt.</div><div class='add'>+	 */</div><div class='add'>+	if (drive-&gt;waiting_for_dma || hwif-&gt;dma_base == 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	/* clear the INTR &amp; ERROR bits */</div><div class='ctx'> 	dma_stat = inb(hwif-&gt;dma_base + ATA_DMA_STATUS);</div><div class='ctx'> 	/* Should we force the bit as well ? */</div><div class='hunk'>@@ -250,6 +258,7 @@ static const struct ich_laptop ich_laptop[] = {</div><div class='ctx'> 	{ 0x27DF, 0x1025, 0x0110 },	/* ICH7 on Acer 3682WLMi */</div><div class='ctx'> 	{ 0x27DF, 0x1043, 0x1267 },	/* ICH7 on Asus W5F */</div><div class='ctx'> 	{ 0x27DF, 0x103C, 0x30A1 },	/* ICH7 on HP Compaq nc2400 */</div><div class='add'>+	{ 0x27DF, 0x1071, 0xD221 },	/* ICH7 on Hercules EC-900 */</div><div class='ctx'> 	{ 0x24CA, 0x1025, 0x0061 },	/* ICH4 on Acer Aspire 2023WLMi */</div><div class='ctx'> 	{ 0x2653, 0x1043, 0x82D8 },	/* ICH6M on Asus Eee 701 */</div><div class='ctx'> 	/* end marker */</div><div class='hunk'>@@ -294,21 +303,19 @@ static void __devinit init_hwif_piix(ide_hwif_t *hwif)</div><div class='ctx'> 		hwif-&gt;ultra_mask = hwif-&gt;mwdma_mask = hwif-&gt;swdma_mask = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devinit init_hwif_ich(ide_hwif_t *hwif)</div><div class='del'>-{</div><div class='del'>-	init_hwif_piix(hwif);</div><div class='del'>-</div><div class='del'>-	/* ICHx need to clear the BMDMA status for all interrupts */</div><div class='del'>-	if (hwif-&gt;dma_base)</div><div class='del'>-		hwif-&gt;ide_dma_clear_irq = &amp;piix_dma_clear_irq;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static const struct ide_port_ops piix_port_ops = {</div><div class='ctx'> 	.set_pio_mode		= piix_set_pio_mode,</div><div class='ctx'> 	.set_dma_mode		= piix_set_dma_mode,</div><div class='ctx'> 	.cable_detect		= piix_cable_detect,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct ide_port_ops ich_port_ops = {</div><div class='add'>+	.set_pio_mode		= piix_set_pio_mode,</div><div class='add'>+	.set_dma_mode		= piix_set_dma_mode,</div><div class='add'>+	.clear_irq		= ich_clear_irq,</div><div class='add'>+	.cable_detect		= piix_cable_detect,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #ifndef CONFIG_IA64</div><div class='ctx'>  #define IDE_HFLAGS_PIIX IDE_HFLAG_LEGACY_IRQS</div><div class='ctx'> #else</div><div class='hunk'>@@ -332,9 +339,9 @@ static const struct ide_port_ops piix_port_ops = {</div><div class='ctx'> 	{ \</div><div class='ctx'> 		.name		= DRV_NAME, \</div><div class='ctx'> 		.init_chipset	= init_chipset_ich, \</div><div class='del'>-		.init_hwif	= init_hwif_ich, \</div><div class='add'>+		.init_hwif	= init_hwif_piix, \</div><div class='ctx'> 		.enablebits	= {{0x41,0x80,0x80}, {0x43,0x80,0x80}}, \</div><div class='del'>-		.port_ops	= &amp;piix_port_ops, \</div><div class='add'>+		.port_ops	= &amp;ich_port_ops, \</div><div class='ctx'> 		.host_flags	= IDE_HFLAGS_PIIX, \</div><div class='ctx'> 		.pio_mask	= ATA_PIO4, \</div><div class='ctx'> 		.swdma_mask	= ATA_SWDMA2_ONLY, \</div><div class='hunk'>@@ -445,22 +452,24 @@ static const struct pci_device_id piix_pci_tbl[] = {</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, piix_pci_tbl);</div><div class='ctx'> </div><div class='del'>-static struct pci_driver driver = {</div><div class='add'>+static struct pci_driver piix_pci_driver = {</div><div class='ctx'> 	.name		= "PIIX_IDE",</div><div class='ctx'> 	.id_table	= piix_pci_tbl,</div><div class='ctx'> 	.probe		= piix_init_one,</div><div class='ctx'> 	.remove		= ide_pci_remove,</div><div class='add'>+	.suspend	= ide_pci_suspend,</div><div class='add'>+	.resume		= ide_pci_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init piix_ide_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	piix_check_450nx();</div><div class='del'>-	return ide_pci_register_driver(&amp;driver);</div><div class='add'>+	return ide_pci_register_driver(&amp;piix_pci_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit piix_ide_exit(void)</div><div class='ctx'> {</div><div class='del'>-	pci_unregister_driver(&amp;driver);</div><div class='add'>+	pci_unregister_driver(&amp;piix_pci_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(piix_ide_init);</div><div class='head'>diff --git a/drivers/ide/pci/rz1000.c b/drivers/ide/pci/rz1000.c<br/>index 8d11ee838a2a..7daf0135cbac 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/pci/rz1000.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ide/pci/rz1000.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/pci/rz1000.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/pci/rz1000.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/hdreg.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/ide.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -60,7 +59,7 @@ static const struct pci_device_id rz1000_pci_tbl[] = {</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, rz1000_pci_tbl);</div><div class='ctx'> </div><div class='del'>-static struct pci_driver driver = {</div><div class='add'>+static struct pci_driver rz1000_pci_driver = {</div><div class='ctx'> 	.name		= "RZ1000_IDE",</div><div class='ctx'> 	.id_table	= rz1000_pci_tbl,</div><div class='ctx'> 	.probe		= rz1000_init_one,</div><div class='hunk'>@@ -69,12 +68,12 @@ static struct pci_driver driver = {</div><div class='ctx'> </div><div class='ctx'> static int __init rz1000_ide_init(void)</div><div class='ctx'> {</div><div class='del'>-	return ide_pci_register_driver(&amp;driver);</div><div class='add'>+	return ide_pci_register_driver(&amp;rz1000_pci_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit rz1000_ide_exit(void)</div><div class='ctx'> {</div><div class='del'>-	pci_unregister_driver(&amp;driver);</div><div class='add'>+	pci_unregister_driver(&amp;rz1000_pci_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(rz1000_ide_init);</div><div class='head'>diff --git a/drivers/ide/pci/sc1200.c b/drivers/ide/pci/sc1200.c<br/>index 8efaed16fea3..f1a8758e3a99 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/pci/sc1200.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ide/pci/sc1200.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/pci/sc1200.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/pci/sc1200.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/hdreg.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/ide.h&gt;</div><div class='hunk'>@@ -104,17 +103,19 @@ static void sc1200_tunepio(ide_drive_t *drive, u8 pio)</div><div class='ctx'> static u8 sc1200_udma_filter(ide_drive_t *drive)</div><div class='ctx'> {</div><div class='ctx'> 	ide_hwif_t *hwif = drive-&gt;hwif;</div><div class='del'>-	ide_drive_t *mate = &amp;hwif-&gt;drives[(drive-&gt;dn &amp; 1) ^ 1];</div><div class='del'>-	struct hd_driveid *mateid = mate-&gt;id;</div><div class='add'>+	ide_drive_t *mate = ide_get_pair_dev(drive);</div><div class='add'>+	u16 *mateid = mate-&gt;id;</div><div class='ctx'> 	u8 mask = hwif-&gt;ultra_mask;</div><div class='ctx'> </div><div class='del'>-	if (mate-&gt;present == 0)</div><div class='add'>+	if (mate == NULL)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	if ((mateid-&gt;capability &amp; 1) &amp;&amp; __ide_dma_bad_drive(mate) == 0) {</div><div class='del'>-		if ((mateid-&gt;field_valid &amp; 4) &amp;&amp; (mateid-&gt;dma_ultra &amp; 7))</div><div class='add'>+	if (ata_id_has_dma(mateid) &amp;&amp; __ide_dma_bad_drive(mate) == 0) {</div><div class='add'>+		if ((mateid[ATA_ID_FIELD_VALID] &amp; 4) &amp;&amp;</div><div class='add'>+		    (mateid[ATA_ID_UDMA_MODES] &amp; 7))</div><div class='ctx'> 			goto out;</div><div class='del'>-		if ((mateid-&gt;field_valid &amp; 2) &amp;&amp; (mateid-&gt;dma_mword &amp; 7))</div><div class='add'>+		if ((mateid[ATA_ID_FIELD_VALID] &amp; 2) &amp;&amp;</div><div class='add'>+		    (mateid[ATA_ID_MWDMA_MODES] &amp; 7))</div><div class='ctx'> 			mask = 0;</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='hunk'>@@ -125,7 +126,6 @@ static void sc1200_set_dma_mode(ide_drive_t *drive, const u8 mode)</div><div class='ctx'> {</div><div class='ctx'> 	ide_hwif_t		*hwif = HWIF(drive);</div><div class='ctx'> 	struct pci_dev		*dev = to_pci_dev(hwif-&gt;dev);</div><div class='del'>-	int			unit = drive-&gt;select.b.unit;</div><div class='ctx'> 	unsigned int		reg, timings;</div><div class='ctx'> 	unsigned short		pci_clock;</div><div class='ctx'> 	unsigned int		basereg = hwif-&gt;channel ? 0x50 : 0x40;</div><div class='hunk'>@@ -154,7 +154,7 @@ static void sc1200_set_dma_mode(ide_drive_t *drive, const u8 mode)</div><div class='ctx'> 	else</div><div class='ctx'> 		timings = mwdma_timing[pci_clock][mode - XFER_MW_DMA_0];</div><div class='ctx'> </div><div class='del'>-	if (unit == 0) {			/* are we configuring drive0? */</div><div class='add'>+	if ((drive-&gt;dn &amp; 1) == 0) {</div><div class='ctx'> 		pci_read_config_dword(dev, basereg + 4, &amp;reg);</div><div class='ctx'> 		timings |= reg &amp; 0x80000000;	/* preserve PIO format bit */</div><div class='ctx'> 		pci_write_config_dword(dev, basereg + 4, timings);</div><div class='hunk'>@@ -215,7 +215,8 @@ static void sc1200_set_pio_mode(ide_drive_t *drive, const u8 pio)</div><div class='ctx'> 	if (mode != -1) {</div><div class='ctx'> 		printk("SC1200: %s: changing (U)DMA mode\n", drive-&gt;name);</div><div class='ctx'> 		ide_dma_off_quietly(drive);</div><div class='del'>-		if (ide_set_dma_mode(drive, mode) == 0 &amp;&amp; drive-&gt;using_dma)</div><div class='add'>+		if (ide_set_dma_mode(drive, mode) == 0 &amp;&amp;</div><div class='add'>+		    (drive-&gt;dev_flags &amp; IDE_DFLAG_USING_DMA))</div><div class='ctx'> 			hwif-&gt;dma_ops-&gt;dma_host_set(drive, 1);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -327,7 +328,7 @@ static const struct pci_device_id sc1200_pci_tbl[] = {</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, sc1200_pci_tbl);</div><div class='ctx'> </div><div class='del'>-static struct pci_driver driver = {</div><div class='add'>+static struct pci_driver sc1200_pci_driver = {</div><div class='ctx'> 	.name		= "SC1200_IDE",</div><div class='ctx'> 	.id_table	= sc1200_pci_tbl,</div><div class='ctx'> 	.probe		= sc1200_init_one,</div><div class='hunk'>@@ -340,12 +341,12 @@ static struct pci_driver driver = {</div><div class='ctx'> </div><div class='ctx'> static int __init sc1200_ide_init(void)</div><div class='ctx'> {</div><div class='del'>-	return ide_pci_register_driver(&amp;driver);</div><div class='add'>+	return ide_pci_register_driver(&amp;sc1200_pci_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit sc1200_ide_exit(void)</div><div class='ctx'> {</div><div class='del'>-	pci_unregister_driver(&amp;driver);</div><div class='add'>+	pci_unregister_driver(&amp;sc1200_pci_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(sc1200_ide_init);</div><div class='head'>diff --git a/drivers/ide/pci/scc_pata.c b/drivers/ide/pci/scc_pata.c<br/>index 44cccd1e086a..9ce1d8059921 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/pci/scc_pata.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ide/pci/scc_pata.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/pci/scc_pata.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/pci/scc_pata.c</a></div><div class='hunk'>@@ -26,7 +26,6 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/hdreg.h&gt;</div><div class='ctx'> #include &lt;linux/ide.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -292,7 +291,7 @@ static void scc_set_dma_mode(ide_drive_t *drive, const u8 speed)</div><div class='ctx'> static void scc_dma_host_set(ide_drive_t *drive, int on)</div><div class='ctx'> {</div><div class='ctx'> 	ide_hwif_t *hwif = drive-&gt;hwif;</div><div class='del'>-	u8 unit = (drive-&gt;select.b.unit &amp; 0x01);</div><div class='add'>+	u8 unit = drive-&gt;dn &amp; 1;</div><div class='ctx'> 	u8 dma_stat = scc_ide_inb(hwif-&gt;dma_base + 4);</div><div class='ctx'> </div><div class='ctx'> 	if (on)</div><div class='hunk'>@@ -354,7 +353,6 @@ static void scc_dma_start(ide_drive_t *drive)</div><div class='ctx'> </div><div class='ctx'> 	/* start DMA */</div><div class='ctx'> 	scc_ide_outb(dma_cmd | 1, hwif-&gt;dma_base);</div><div class='del'>-	hwif-&gt;dma = 1;</div><div class='ctx'> 	wmb();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -375,7 +373,6 @@ static int __scc_dma_end(ide_drive_t *drive)</div><div class='ctx'> 	/* purge DMA mappings */</div><div class='ctx'> 	ide_destroy_dmatable(drive);</div><div class='ctx'> 	/* verify good DMA status */</div><div class='del'>-	hwif-&gt;dma = 0;</div><div class='ctx'> 	wmb();</div><div class='ctx'> 	return (dma_stat &amp; 7) != 4 ? (0x10 | dma_stat) : 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -400,7 +397,7 @@ static int scc_dma_end(ide_drive_t *drive)</div><div class='ctx'> 	/* errata A308 workaround: Step5 (check data loss) */</div><div class='ctx'> 	/* We don't check non ide_disk because it is limited to UDMA4 */</div><div class='ctx'> 	if (!(in_be32((void __iomem *)hwif-&gt;io_ports.ctl_addr)</div><div class='del'>-	      &amp; ERR_STAT) &amp;&amp;</div><div class='add'>+	      &amp; ATA_ERR) &amp;&amp;</div><div class='ctx'> 	    drive-&gt;media == ide_disk &amp;&amp; drive-&gt;current_speed &gt; XFER_UDMA_4) {</div><div class='ctx'> 		reg = in_be32((void __iomem *)intsts_port);</div><div class='ctx'> 		if (!(reg &amp; INTSTS_ACTEINT)) {</div><div class='hunk'>@@ -504,7 +501,7 @@ static int scc_dma_test_irq(ide_drive_t *drive)</div><div class='ctx'> </div><div class='ctx'> 	/* SCC errata A252,A308 workaround: Step4 */</div><div class='ctx'> 	if ((in_be32((void __iomem *)hwif-&gt;io_ports.ctl_addr)</div><div class='del'>-	     &amp; ERR_STAT) &amp;&amp;</div><div class='add'>+	     &amp; ATA_ERR) &amp;&amp;</div><div class='ctx'> 	    (int_stat &amp; INTSTS_INTRQ))</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='hunk'>@@ -512,9 +509,6 @@ static int scc_dma_test_irq(ide_drive_t *drive)</div><div class='ctx'> 	if (int_stat &amp; INTSTS_IOIRQS)</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='del'>-	if (!drive-&gt;waiting_for_dma)</div><div class='del'>-		printk(KERN_WARNING "%s: (%s) called while not waiting\n",</div><div class='del'>-			drive-&gt;name, __func__);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -711,7 +705,7 @@ static void scc_tf_load(ide_drive_t *drive, ide_task_t *task)</div><div class='ctx'> 		scc_ide_outb(tf-&gt;lbah, io_ports-&gt;lbah_addr);</div><div class='ctx'> </div><div class='ctx'> 	if (task-&gt;tf_flags &amp; IDE_TFLAG_OUT_DEVICE)</div><div class='del'>-		scc_ide_outb((tf-&gt;device &amp; HIHI) | drive-&gt;select.all,</div><div class='add'>+		scc_ide_outb((tf-&gt;device &amp; HIHI) | drive-&gt;select,</div><div class='ctx'> 			     io_ports-&gt;device_addr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -827,6 +821,12 @@ static void __devinit init_iops_scc(ide_hwif_t *hwif)</div><div class='ctx'> 	init_mmio_iops_scc(hwif);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int __devinit scc_init_dma(ide_hwif_t *hwif,</div><div class='add'>+				  const struct ide_port_info *d)</div><div class='add'>+{</div><div class='add'>+	return ide_allocate_dma_engine(hwif);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static u8 scc_cable_detect(ide_hwif_t *hwif)</div><div class='ctx'> {</div><div class='ctx'> 	return ATA_CBL_PATA80;</div><div class='hunk'>@@ -891,6 +891,7 @@ static const struct ide_dma_ops scc_dma_ops = {</div><div class='ctx'>   {							\</div><div class='ctx'>       .name		= name_str,			\</div><div class='ctx'>       .init_iops	= init_iops_scc,		\</div><div class='add'>+      .init_dma		= scc_init_dma,			\</div><div class='ctx'>       .init_hwif	= init_hwif_scc,		\</div><div class='ctx'>       .tp_ops		= &amp;scc_tp_ops,		\</div><div class='ctx'>       .port_ops		= &amp;scc_port_ops,		\</div><div class='hunk'>@@ -928,13 +929,6 @@ static void __devexit scc_remove(struct pci_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct scc_ports *ports = pci_get_drvdata(dev);</div><div class='ctx'> 	struct ide_host *host = ports-&gt;host;</div><div class='del'>-	ide_hwif_t *hwif = host-&gt;ports[0];</div><div class='del'>-</div><div class='del'>-	if (hwif-&gt;dmatable_cpu) {</div><div class='del'>-		pci_free_consistent(dev, PRD_ENTRIES * PRD_BYTES,</div><div class='del'>-				    hwif-&gt;dmatable_cpu, hwif-&gt;dmatable_dma);</div><div class='del'>-		hwif-&gt;dmatable_cpu = NULL;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	ide_host_remove(host);</div><div class='ctx'> </div><div class='hunk'>@@ -950,7 +944,7 @@ static const struct pci_device_id scc_pci_tbl[] = {</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, scc_pci_tbl);</div><div class='ctx'> </div><div class='del'>-static struct pci_driver driver = {</div><div class='add'>+static struct pci_driver scc_pci_driver = {</div><div class='ctx'> 	.name = "SCC IDE",</div><div class='ctx'> 	.id_table = scc_pci_tbl,</div><div class='ctx'> 	.probe = scc_init_one,</div><div class='hunk'>@@ -959,14 +953,14 @@ static struct pci_driver driver = {</div><div class='ctx'> </div><div class='ctx'> static int scc_ide_init(void)</div><div class='ctx'> {</div><div class='del'>-	return ide_pci_register_driver(&amp;driver);</div><div class='add'>+	return ide_pci_register_driver(&amp;scc_pci_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(scc_ide_init);</div><div class='ctx'> /* -- No exit code?</div><div class='ctx'> static void scc_ide_exit(void)</div><div class='ctx'> {</div><div class='del'>-	ide_pci_unregister_driver(&amp;driver);</div><div class='add'>+	ide_pci_unregister_driver(&amp;scc_pci_driver);</div><div class='ctx'> }</div><div class='ctx'> module_exit(scc_ide_exit);</div><div class='ctx'>  */</div><div class='head'>diff --git a/drivers/ide/pci/serverworks.c b/drivers/ide/pci/serverworks.c<br/>index c3bdc6e51a48..437bc919dafd 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/pci/serverworks.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ide/pci/serverworks.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/pci/serverworks.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/pci/serverworks.c</a></div><div class='hunk'>@@ -32,7 +32,6 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/hdreg.h&gt;</div><div class='ctx'> #include &lt;linux/ide.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -57,8 +56,10 @@ static struct pci_dev *isa_dev;</div><div class='ctx'> </div><div class='ctx'> static int check_in_drive_lists (ide_drive_t *drive, const char **list)</div><div class='ctx'> {</div><div class='add'>+	char *m = (char *)&amp;drive-&gt;id[ATA_ID_PROD];</div><div class='add'>+</div><div class='ctx'> 	while (*list)</div><div class='del'>-		if (!strcmp(*list++, drive-&gt;id-&gt;model))</div><div class='add'>+		if (!strcmp(*list++, m))</div><div class='ctx'> 			return 1;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -152,7 +153,7 @@ static void svwks_set_dma_mode(ide_drive_t *drive, const u8 speed)</div><div class='ctx'> </div><div class='ctx'> 	ide_hwif_t *hwif	= HWIF(drive);</div><div class='ctx'> 	struct pci_dev *dev	= to_pci_dev(hwif-&gt;dev);</div><div class='del'>-	u8 unit			= (drive-&gt;select.b.unit &amp; 0x01);</div><div class='add'>+	u8 unit			= drive-&gt;dn &amp; 1;</div><div class='ctx'> </div><div class='ctx'> 	u8 ultra_enable	 = 0, ultra_timing = 0, dma_timing = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -174,7 +175,7 @@ static void svwks_set_dma_mode(ide_drive_t *drive, const u8 speed)</div><div class='ctx'> 	pci_write_config_byte(dev, 0x54, ultra_enable);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned int __devinit init_chipset_svwks(struct pci_dev *dev)</div><div class='add'>+static unsigned int init_chipset_svwks(struct pci_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int reg;</div><div class='ctx'> 	u8 btr;</div><div class='hunk'>@@ -442,21 +443,23 @@ static const struct pci_device_id svwks_pci_tbl[] = {</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, svwks_pci_tbl);</div><div class='ctx'> </div><div class='del'>-static struct pci_driver driver = {</div><div class='add'>+static struct pci_driver svwks_pci_driver = {</div><div class='ctx'> 	.name		= "Serverworks_IDE",</div><div class='ctx'> 	.id_table	= svwks_pci_tbl,</div><div class='ctx'> 	.probe		= svwks_init_one,</div><div class='ctx'> 	.remove		= ide_pci_remove,</div><div class='add'>+	.suspend	= ide_pci_suspend,</div><div class='add'>+	.resume		= ide_pci_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init svwks_ide_init(void)</div><div class='ctx'> {</div><div class='del'>-	return ide_pci_register_driver(&amp;driver);</div><div class='add'>+	return ide_pci_register_driver(&amp;svwks_pci_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit svwks_ide_exit(void)</div><div class='ctx'> {</div><div class='del'>-	pci_unregister_driver(&amp;driver);</div><div class='add'>+	pci_unregister_driver(&amp;svwks_pci_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(svwks_ide_init);</div><div class='head'>diff --git a/drivers/ide/pci/sgiioc4.c b/drivers/ide/pci/sgiioc4.c<br/>index 681306c9d79b..dd634541ce36 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/pci/sgiioc4.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ide/pci/sgiioc4.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/pci/sgiioc4.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/pci/sgiioc4.c</a></div><div class='hunk'>@@ -1,5 +1,6 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2003-2006 Silicon Graphics, Inc.  All Rights Reserved.</div><div class='add'>+ * Copyright (C) 2008 MontaVista Software, Inc.</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify it</div><div class='ctx'>  * under the terms of version 2 of the GNU General Public License</div><div class='hunk'>@@ -22,7 +23,6 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/hdreg.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='hunk'>@@ -151,7 +151,7 @@ sgiioc4_clearirq(ide_drive_t * drive)</div><div class='ctx'> 		int count = 0;</div><div class='ctx'> </div><div class='ctx'> 		stat = sgiioc4_read_status(hwif);</div><div class='del'>-		while ((stat &amp; 0x80) &amp;&amp; (count++ &lt; 100)) {</div><div class='add'>+		while ((stat &amp; ATA_BUSY) &amp;&amp; (count++ &lt; 100)) {</div><div class='ctx'> 			udelay(1);</div><div class='ctx'> 			stat = sgiioc4_read_status(hwif);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -311,7 +311,7 @@ static u8 sgiioc4_read_status(ide_hwif_t *hwif)</div><div class='ctx'> 	u8 reg = (u8) readb((void __iomem *) port);</div><div class='ctx'> </div><div class='ctx'> 	if ((port &amp; 0xFFF) == 0x11C) {	/* Status register of IOC4 */</div><div class='del'>-		if (reg &amp; 0x51) {	/* Not busy...check for interrupt */</div><div class='add'>+		if (!(reg &amp; ATA_BUSY)) { /* Not busy... check for interrupt */</div><div class='ctx'> 			unsigned long other_ir = port - 0x110;</div><div class='ctx'> 			unsigned int intr_reg = (u32) readl((void __iomem *) other_ir);</div><div class='ctx'> </div><div class='hunk'>@@ -339,35 +339,31 @@ ide_dma_sgiioc4(ide_hwif_t *hwif, const struct ide_port_info *d)</div><div class='ctx'> 	if (dma_base == 0)</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "%s: BM-DMA at 0x%04lx-0x%04lx\n", hwif-&gt;name,</div><div class='del'>-	       dma_base, dma_base + num_ports - 1);</div><div class='add'>+	printk(KERN_INFO "    %s: MMIO-DMA\n", hwif-&gt;name);</div><div class='ctx'> </div><div class='del'>-	if (!request_mem_region(dma_base, num_ports, hwif-&gt;name)) {</div><div class='del'>-		printk(KERN_ERR</div><div class='del'>-		       "%s(%s) -- ERROR, Addresses 0x%p to 0x%p "</div><div class='del'>-		       "ALREADY in use\n",</div><div class='del'>-		       __func__, hwif-&gt;name, (void *) dma_base,</div><div class='del'>-		       (void *) dma_base + num_ports - 1);</div><div class='add'>+	if (request_mem_region(dma_base, num_ports, hwif-&gt;name) == NULL) {</div><div class='add'>+		printk(KERN_ERR "%s(%s) -- ERROR: addresses 0x%08lx to 0x%08lx "</div><div class='add'>+		       "already in use\n", __func__, hwif-&gt;name,</div><div class='add'>+		       dma_base, dma_base + num_ports - 1);</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	virt_dma_base = ioremap(dma_base, num_ports);</div><div class='ctx'> 	if (virt_dma_base == NULL) {</div><div class='del'>-		printk(KERN_ERR</div><div class='del'>-		       "%s(%s) -- ERROR, Unable to map addresses 0x%lx to 0x%lx\n",</div><div class='del'>-		       __func__, hwif-&gt;name, dma_base, dma_base + num_ports - 1);</div><div class='add'>+		printk(KERN_ERR "%s(%s) -- ERROR: unable to map addresses "</div><div class='add'>+		       "0x%lx to 0x%lx\n", __func__, hwif-&gt;name,</div><div class='add'>+		       dma_base, dma_base + num_ports - 1);</div><div class='ctx'> 		goto dma_remap_failure;</div><div class='ctx'> 	}</div><div class='ctx'> 	hwif-&gt;dma_base = (unsigned long) virt_dma_base;</div><div class='ctx'> </div><div class='del'>-	hwif-&gt;dmatable_cpu = pci_alloc_consistent(dev,</div><div class='del'>-					  IOC4_PRD_ENTRIES * IOC4_PRD_BYTES,</div><div class='del'>-					  &amp;hwif-&gt;dmatable_dma);</div><div class='add'>+	hwif-&gt;sg_max_nents = IOC4_PRD_ENTRIES;</div><div class='ctx'> </div><div class='del'>-	if (!hwif-&gt;dmatable_cpu)</div><div class='del'>-		goto dma_pci_alloc_failure;</div><div class='add'>+	hwif-&gt;prd_max_nents = IOC4_PRD_ENTRIES;</div><div class='add'>+	hwif-&gt;prd_ent_size = IOC4_PRD_BYTES;</div><div class='ctx'> </div><div class='del'>-	hwif-&gt;sg_max_nents = IOC4_PRD_ENTRIES;</div><div class='add'>+	if (ide_allocate_dma_engine(hwif))</div><div class='add'>+		goto dma_pci_alloc_failure;</div><div class='ctx'> </div><div class='ctx'> 	pad = pci_alloc_consistent(dev, IOC4_IDE_CACHELINE_SIZE,</div><div class='ctx'> 				   (dma_addr_t *)&amp;hwif-&gt;extra_base);</div><div class='hunk'>@@ -376,13 +372,11 @@ ide_dma_sgiioc4(ide_hwif_t *hwif, const struct ide_port_info *d)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pci_free_consistent(dev, IOC4_PRD_ENTRIES * IOC4_PRD_BYTES,</div><div class='del'>-			    hwif-&gt;dmatable_cpu, hwif-&gt;dmatable_dma);</div><div class='del'>-	printk(KERN_INFO</div><div class='del'>-	       "%s() -- Error! Unable to allocate DMA Maps for drive %s\n",</div><div class='add'>+	ide_release_dma_engine(hwif);</div><div class='add'>+</div><div class='add'>+	printk(KERN_ERR "%s(%s) -- ERROR: Unable to allocate DMA maps\n",</div><div class='ctx'> 	       __func__, hwif-&gt;name);</div><div class='del'>-	printk(KERN_INFO</div><div class='del'>-	       "Changing from DMA to PIO mode for Drive %s\n", hwif-&gt;name);</div><div class='add'>+	printk(KERN_INFO "%s: changing from DMA to PIO mode", hwif-&gt;name);</div><div class='ctx'> </div><div class='ctx'> dma_pci_alloc_failure:</div><div class='ctx'> 	iounmap(virt_dma_base);</div><div class='hunk'>@@ -618,14 +612,12 @@ sgiioc4_ide_setup_pci_device(struct pci_dev *dev)</div><div class='ctx'> 	irqport = (unsigned long) virt_base + IOC4_INTR_OFFSET;</div><div class='ctx'> </div><div class='ctx'> 	cmd_phys_base = bar0 + IOC4_CMD_OFFSET;</div><div class='del'>-	if (!request_mem_region(cmd_phys_base, IOC4_CMD_CTL_BLK_SIZE,</div><div class='del'>-	    DRV_NAME)) {</div><div class='del'>-		printk(KERN_ERR</div><div class='del'>-			"%s %s: -- ERROR, Addresses "</div><div class='del'>-			"0x%p to 0x%p ALREADY in use\n",</div><div class='del'>-		       DRV_NAME, pci_name(dev), (void *)cmd_phys_base,</div><div class='del'>-		       (void *) cmd_phys_base + IOC4_CMD_CTL_BLK_SIZE);</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	if (request_mem_region(cmd_phys_base, IOC4_CMD_CTL_BLK_SIZE,</div><div class='add'>+			       DRV_NAME) == NULL) {</div><div class='add'>+		printk(KERN_ERR "%s %s -- ERROR: addresses 0x%08lx to 0x%08lx "</div><div class='add'>+		       "already in use\n", DRV_NAME, pci_name(dev),</div><div class='add'>+		       cmd_phys_base, cmd_phys_base + IOC4_CMD_CTL_BLK_SIZE);</div><div class='add'>+		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize the IO registers */</div><div class='head'>diff --git a/drivers/ide/pci/siimage.c b/drivers/ide/pci/siimage.c<br/>index db2b88a369ab..eb4faf92c571 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/pci/siimage.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ide/pci/siimage.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/pci/siimage.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/pci/siimage.c</a></div><div class='hunk'>@@ -39,7 +39,6 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/hdreg.h&gt;</div><div class='ctx'> #include &lt;linux/ide.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='hunk'>@@ -117,13 +116,14 @@ static inline unsigned long siimage_seldev(ide_drive_t *drive, int r)</div><div class='ctx'> {</div><div class='ctx'> 	ide_hwif_t *hwif	= HWIF(drive);</div><div class='ctx'> 	unsigned long base	= (unsigned long)hwif-&gt;hwif_data;</div><div class='add'>+	u8 unit			= drive-&gt;dn &amp; 1;</div><div class='ctx'> </div><div class='ctx'> 	base += 0xA0 + r;</div><div class='ctx'> 	if (hwif-&gt;host_flags &amp; IDE_HFLAG_MMIO)</div><div class='ctx'> 		base += hwif-&gt;channel &lt;&lt; 6;</div><div class='ctx'> 	else</div><div class='ctx'> 		base += hwif-&gt;channel &lt;&lt; 4;</div><div class='del'>-	base |= drive-&gt;select.b.unit &lt;&lt; drive-&gt;select.b.unit;</div><div class='add'>+	base |= unit &lt;&lt; unit;</div><div class='ctx'> 	return base;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -223,7 +223,9 @@ static u8 sil_pata_udma_filter(ide_drive_t *drive)</div><div class='ctx'> </div><div class='ctx'> static u8 sil_sata_udma_filter(ide_drive_t *drive)</div><div class='ctx'> {</div><div class='del'>-	return strstr(drive-&gt;id-&gt;model, "Maxtor") ? ATA_UDMA5 : ATA_UDMA6;</div><div class='add'>+	char *m = (char *)&amp;drive-&gt;id[ATA_ID_PROD];</div><div class='add'>+</div><div class='add'>+	return strstr(m, "Maxtor") ? ATA_UDMA5 : ATA_UDMA6;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -243,7 +245,7 @@ static void sil_set_pio_mode(ide_drive_t *drive, u8 pio)</div><div class='ctx'> </div><div class='ctx'> 	ide_hwif_t *hwif	= HWIF(drive);</div><div class='ctx'> 	struct pci_dev *dev	= to_pci_dev(hwif-&gt;dev);</div><div class='del'>-	ide_drive_t *pair	= ide_get_paired_drive(drive);</div><div class='add'>+	ide_drive_t *pair	= ide_get_pair_dev(drive);</div><div class='ctx'> 	u32 speedt		= 0;</div><div class='ctx'> 	u16 speedp		= 0;</div><div class='ctx'> 	unsigned long addr	= siimage_seldev(drive, 0x04);</div><div class='hunk'>@@ -254,10 +256,10 @@ static void sil_set_pio_mode(ide_drive_t *drive, u8 pio)</div><div class='ctx'> 	u8 addr_mask		= hwif-&gt;channel ? (mmio ? 0xF4 : 0x84)</div><div class='ctx'> 						: (mmio ? 0xB4 : 0x80);</div><div class='ctx'> 	u8 mode			= 0;</div><div class='del'>-	u8 unit			= drive-&gt;select.b.unit;</div><div class='add'>+	u8 unit			= drive-&gt;dn &amp; 1;</div><div class='ctx'> </div><div class='ctx'> 	/* trim *taskfile* PIO to the slowest of the master/slave */</div><div class='del'>-	if (pair-&gt;present) {</div><div class='add'>+	if (pair) {</div><div class='ctx'> 		u8 pair_pio = ide_get_best_pio_mode(pair, 255, 4);</div><div class='ctx'> </div><div class='ctx'> 		if (pair_pio &lt; tf_pio)</div><div class='hunk'>@@ -300,9 +302,9 @@ static void sil_set_dma_mode(ide_drive_t *drive, const u8 speed)</div><div class='ctx'> </div><div class='ctx'> 	ide_hwif_t *hwif	= HWIF(drive);</div><div class='ctx'> 	struct pci_dev *dev	= to_pci_dev(hwif-&gt;dev);</div><div class='del'>-	u16 ultra = 0, multi	= 0;</div><div class='del'>-	u8 mode = 0, unit	= drive-&gt;select.b.unit;</div><div class='ctx'> 	unsigned long base	= (unsigned long)hwif-&gt;hwif_data;</div><div class='add'>+	u16 ultra = 0, multi	= 0;</div><div class='add'>+	u8 mode = 0, unit	= drive-&gt;dn &amp; 1;</div><div class='ctx'> 	u8 mmio			= (hwif-&gt;host_flags &amp; IDE_HFLAG_MMIO) ? 1 : 0;</div><div class='ctx'> 	u8 scsc = 0, addr_mask	= hwif-&gt;channel ? (mmio ? 0xF4 : 0x84)</div><div class='ctx'> 						: (mmio ? 0xB4 : 0x80);</div><div class='hunk'>@@ -462,7 +464,7 @@ static void sil_sata_pre_reset(ide_drive_t *drive)</div><div class='ctx'>  *	to 133 MHz clocking if the system isn't already set up to do it.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static unsigned int __devinit init_chipset_siimage(struct pci_dev *dev)</div><div class='add'>+static unsigned int init_chipset_siimage(struct pci_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ide_host *host = pci_get_drvdata(dev);</div><div class='ctx'> 	void __iomem *ioaddr = host-&gt;host_priv;</div><div class='hunk'>@@ -616,8 +618,8 @@ static void __devinit init_mmio_iops_siimage(ide_hwif_t *hwif)</div><div class='ctx'> </div><div class='ctx'> static int is_dev_seagate_sata(ide_drive_t *drive)</div><div class='ctx'> {</div><div class='del'>-	const char *s	= &amp;drive-&gt;id-&gt;model[0];</div><div class='del'>-	unsigned len	= strnlen(s, sizeof(drive-&gt;id-&gt;model));</div><div class='add'>+	const char *s	= (const char *)&amp;drive-&gt;id[ATA_ID_PROD];</div><div class='add'>+	unsigned len	= strnlen(s, ATA_ID_PROD_LEN);</div><div class='ctx'> </div><div class='ctx'> 	if ((len &gt; 4) &amp;&amp; (!memcmp(s, "ST", 2)))</div><div class='ctx'> 		if ((!memcmp(s + len - 2, "AS", 2)) ||</div><div class='hunk'>@@ -711,7 +713,7 @@ static const struct ide_dma_ops sil_dma_ops = {</div><div class='ctx'> 	.dma_setup		= ide_dma_setup,</div><div class='ctx'> 	.dma_exec_cmd		= ide_dma_exec_cmd,</div><div class='ctx'> 	.dma_start		= ide_dma_start,</div><div class='del'>-	.dma_end		= __ide_dma_end,</div><div class='add'>+	.dma_end		= ide_dma_end,</div><div class='ctx'> 	.dma_test_irq		= siimage_dma_test_irq,</div><div class='ctx'> 	.dma_timeout		= ide_dma_timeout,</div><div class='ctx'> 	.dma_lost_irq		= ide_dma_lost_irq,</div><div class='hunk'>@@ -828,21 +830,23 @@ static const struct pci_device_id siimage_pci_tbl[] = {</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, siimage_pci_tbl);</div><div class='ctx'> </div><div class='del'>-static struct pci_driver driver = {</div><div class='add'>+static struct pci_driver siimage_pci_driver = {</div><div class='ctx'> 	.name		= "SiI_IDE",</div><div class='ctx'> 	.id_table	= siimage_pci_tbl,</div><div class='ctx'> 	.probe		= siimage_init_one,</div><div class='ctx'> 	.remove		= __devexit_p(siimage_remove),</div><div class='add'>+	.suspend	= ide_pci_suspend,</div><div class='add'>+	.resume		= ide_pci_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init siimage_ide_init(void)</div><div class='ctx'> {</div><div class='del'>-	return ide_pci_register_driver(&amp;driver);</div><div class='add'>+	return ide_pci_register_driver(&amp;siimage_pci_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit siimage_ide_exit(void)</div><div class='ctx'> {</div><div class='del'>-	pci_unregister_driver(&amp;driver);</div><div class='add'>+	pci_unregister_driver(&amp;siimage_pci_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(siimage_ide_init);</div><div class='head'>diff --git a/drivers/ide/pci/sis5513.c b/drivers/ide/pci/sis5513.c<br/>index 5efe21d6ef97..ad32e18c5ba3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/pci/sis5513.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ide/pci/sis5513.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/pci/sis5513.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/pci/sis5513.c</a></div><div class='hunk'>@@ -47,7 +47,6 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/hdreg.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/ide.h&gt;</div><div class='hunk'>@@ -448,7 +447,7 @@ static int __devinit sis_find_family(struct pci_dev *dev)</div><div class='ctx'> 	return chipset_family;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned int __devinit init_chipset_sis5513(struct pci_dev *dev)</div><div class='add'>+static unsigned int init_chipset_sis5513(struct pci_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	/* Make general config ops here</div><div class='ctx'> 	   1/ tell IDE channels to operate in Compatibility mode only</div><div class='hunk'>@@ -606,21 +605,23 @@ static const struct pci_device_id sis5513_pci_tbl[] = {</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, sis5513_pci_tbl);</div><div class='ctx'> </div><div class='del'>-static struct pci_driver driver = {</div><div class='add'>+static struct pci_driver sis5513_pci_driver = {</div><div class='ctx'> 	.name		= "SIS_IDE",</div><div class='ctx'> 	.id_table	= sis5513_pci_tbl,</div><div class='ctx'> 	.probe		= sis5513_init_one,</div><div class='ctx'> 	.remove		= __devexit_p(sis5513_remove),</div><div class='add'>+	.suspend	= ide_pci_suspend,</div><div class='add'>+	.resume		= ide_pci_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init sis5513_ide_init(void)</div><div class='ctx'> {</div><div class='del'>-	return ide_pci_register_driver(&amp;driver);</div><div class='add'>+	return ide_pci_register_driver(&amp;sis5513_pci_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit sis5513_ide_exit(void)</div><div class='ctx'> {</div><div class='del'>-	pci_unregister_driver(&amp;driver);</div><div class='add'>+	pci_unregister_driver(&amp;sis5513_pci_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(sis5513_ide_init);</div><div class='head'>diff --git a/drivers/ide/pci/sl82c105.c b/drivers/ide/pci/sl82c105.c<br/>index 73905bcc08fb..84dc33602ff8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/pci/sl82c105.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ide/pci/sl82c105.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/pci/sl82c105.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/pci/sl82c105.c</a></div><div class='hunk'>@@ -17,7 +17,6 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/hdreg.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/ide.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -62,7 +61,7 @@ static unsigned int get_pio_timings(ide_drive_t *drive, u8 pio)</div><div class='ctx'> 	if (cmd_off == 0)</div><div class='ctx'> 		cmd_off = 1;</div><div class='ctx'> </div><div class='del'>-	if (pio &gt; 2 || ide_dev_has_iordy(drive-&gt;id))</div><div class='add'>+	if (pio &gt; 2 || ata_id_has_iordy(drive-&gt;id))</div><div class='ctx'> 		iordy = 0x40;</div><div class='ctx'> </div><div class='ctx'> 	return (cmd_on - 1) &lt;&lt; 8 | (cmd_off - 1) | iordy;</div><div class='hunk'>@@ -208,7 +207,7 @@ static int sl82c105_dma_end(ide_drive_t *drive)</div><div class='ctx'> </div><div class='ctx'> 	DBG(("%s(drive:%s)\n", __func__, drive-&gt;name));</div><div class='ctx'> </div><div class='del'>-	ret = __ide_dma_end(drive);</div><div class='add'>+	ret = ide_dma_end(drive);</div><div class='ctx'> </div><div class='ctx'> 	pci_write_config_word(dev, reg, drive-&gt;drive_data);</div><div class='ctx'> </div><div class='hunk'>@@ -272,7 +271,7 @@ static u8 sl82c105_bridge_revision(struct pci_dev *dev)</div><div class='ctx'>  * channel 0 here at least, but channel 1 has to be enabled by</div><div class='ctx'>  * firmware or arch code. We still set both to 16 bits mode.</div><div class='ctx'>  */</div><div class='del'>-static unsigned int __devinit init_chipset_sl82c105(struct pci_dev *dev)</div><div class='add'>+static unsigned int init_chipset_sl82c105(struct pci_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	u32 val;</div><div class='ctx'> </div><div class='hunk'>@@ -346,21 +345,23 @@ static const struct pci_device_id sl82c105_pci_tbl[] = {</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, sl82c105_pci_tbl);</div><div class='ctx'> </div><div class='del'>-static struct pci_driver driver = {</div><div class='add'>+static struct pci_driver sl82c105_pci_driver = {</div><div class='ctx'> 	.name		= "W82C105_IDE",</div><div class='ctx'> 	.id_table	= sl82c105_pci_tbl,</div><div class='ctx'> 	.probe		= sl82c105_init_one,</div><div class='ctx'> 	.remove		= ide_pci_remove,</div><div class='add'>+	.suspend	= ide_pci_suspend,</div><div class='add'>+	.resume		= ide_pci_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init sl82c105_ide_init(void)</div><div class='ctx'> {</div><div class='del'>-	return ide_pci_register_driver(&amp;driver);</div><div class='add'>+	return ide_pci_register_driver(&amp;sl82c105_pci_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit sl82c105_ide_exit(void)</div><div class='ctx'> {</div><div class='del'>-	pci_unregister_driver(&amp;driver);</div><div class='add'>+	pci_unregister_driver(&amp;sl82c105_pci_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(sl82c105_ide_init);</div><div class='head'>diff --git a/drivers/ide/pci/slc90e66.c b/drivers/ide/pci/slc90e66.c<br/>index 866d6c65e3a0..0f759e4ed779 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/pci/slc90e66.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ide/pci/slc90e66.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/pci/slc90e66.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/pci/slc90e66.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/hdreg.h&gt;</div><div class='ctx'> #include &lt;linux/ide.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -155,21 +154,23 @@ static const struct pci_device_id slc90e66_pci_tbl[] = {</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, slc90e66_pci_tbl);</div><div class='ctx'> </div><div class='del'>-static struct pci_driver driver = {</div><div class='add'>+static struct pci_driver slc90e66_pci_driver = {</div><div class='ctx'> 	.name		= "SLC90e66_IDE",</div><div class='ctx'> 	.id_table	= slc90e66_pci_tbl,</div><div class='ctx'> 	.probe		= slc90e66_init_one,</div><div class='ctx'> 	.remove		= ide_pci_remove,</div><div class='add'>+	.suspend	= ide_pci_suspend,</div><div class='add'>+	.resume		= ide_pci_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init slc90e66_ide_init(void)</div><div class='ctx'> {</div><div class='del'>-	return ide_pci_register_driver(&amp;driver);</div><div class='add'>+	return ide_pci_register_driver(&amp;slc90e66_pci_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit slc90e66_ide_exit(void)</div><div class='ctx'> {</div><div class='del'>-	pci_unregister_driver(&amp;driver);</div><div class='add'>+	pci_unregister_driver(&amp;slc90e66_pci_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(slc90e66_ide_init);</div><div class='head'>diff --git a/drivers/ide/pci/tc86c001.c b/drivers/ide/pci/tc86c001.c<br/>index 927277c54ec9..93e2cce4b296 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/pci/tc86c001.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ide/pci/tc86c001.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/pci/tc86c001.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/pci/tc86c001.c</a></div><div class='hunk'>@@ -186,7 +186,7 @@ static const struct ide_dma_ops tc86c001_dma_ops = {</div><div class='ctx'> 	.dma_setup		= ide_dma_setup,</div><div class='ctx'> 	.dma_exec_cmd		= ide_dma_exec_cmd,</div><div class='ctx'> 	.dma_start		= tc86c001_dma_start,</div><div class='del'>-	.dma_end		= __ide_dma_end,</div><div class='add'>+	.dma_end		= ide_dma_end,</div><div class='ctx'> 	.dma_test_irq		= ide_dma_test_irq,</div><div class='ctx'> 	.dma_lost_irq		= ide_dma_lost_irq,</div><div class='ctx'> 	.dma_timeout		= ide_dma_timeout,</div><div class='hunk'>@@ -245,7 +245,7 @@ static const struct pci_device_id tc86c001_pci_tbl[] = {</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, tc86c001_pci_tbl);</div><div class='ctx'> </div><div class='del'>-static struct pci_driver driver = {</div><div class='add'>+static struct pci_driver tc86c001_pci_driver = {</div><div class='ctx'> 	.name		= "TC86C001",</div><div class='ctx'> 	.id_table	= tc86c001_pci_tbl,</div><div class='ctx'> 	.probe		= tc86c001_init_one,</div><div class='hunk'>@@ -254,12 +254,12 @@ static struct pci_driver driver = {</div><div class='ctx'> </div><div class='ctx'> static int __init tc86c001_ide_init(void)</div><div class='ctx'> {</div><div class='del'>-	return ide_pci_register_driver(&amp;driver);</div><div class='add'>+	return ide_pci_register_driver(&amp;tc86c001_pci_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit tc86c001_ide_exit(void)</div><div class='ctx'> {</div><div class='del'>-	pci_unregister_driver(&amp;driver);</div><div class='add'>+	pci_unregister_driver(&amp;tc86c001_pci_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(tc86c001_ide_init);</div><div class='head'>diff --git a/drivers/ide/pci/triflex.c b/drivers/ide/pci/triflex.c<br/>index b77ec35151b3..b6ff40336aa9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/pci/triflex.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ide/pci/triflex.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/pci/triflex.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/pci/triflex.c</a></div><div class='hunk'>@@ -28,7 +28,6 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/hdreg.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/ide.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -39,13 +38,12 @@ static void triflex_set_mode(ide_drive_t *drive, const u8 speed)</div><div class='ctx'> {</div><div class='ctx'> 	ide_hwif_t *hwif = HWIF(drive);</div><div class='ctx'> 	struct pci_dev *dev = to_pci_dev(hwif-&gt;dev);</div><div class='del'>-	u8 channel_offset = hwif-&gt;channel ? 0x74 : 0x70;</div><div class='del'>-	u16 timing = 0;</div><div class='ctx'> 	u32 triflex_timings = 0;</div><div class='del'>-	u8 unit = (drive-&gt;select.b.unit &amp; 0x01);</div><div class='del'>-	</div><div class='add'>+	u16 timing = 0;</div><div class='add'>+	u8 channel_offset = hwif-&gt;channel ? 0x74 : 0x70, unit = drive-&gt;dn &amp; 1;</div><div class='add'>+</div><div class='ctx'> 	pci_read_config_dword(dev, channel_offset, &amp;triflex_timings);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	switch(speed) {</div><div class='ctx'> 		case XFER_MW_DMA_2:</div><div class='ctx'> 			timing = 0x0103; </div><div class='hunk'>@@ -115,21 +113,23 @@ static const struct pci_device_id triflex_pci_tbl[] = {</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, triflex_pci_tbl);</div><div class='ctx'> </div><div class='del'>-static struct pci_driver driver = {</div><div class='add'>+static struct pci_driver triflex_pci_driver = {</div><div class='ctx'> 	.name		= "TRIFLEX_IDE",</div><div class='ctx'> 	.id_table	= triflex_pci_tbl,</div><div class='ctx'> 	.probe		= triflex_init_one,</div><div class='ctx'> 	.remove		= ide_pci_remove,</div><div class='add'>+	.suspend	= ide_pci_suspend,</div><div class='add'>+	.resume		= ide_pci_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init triflex_ide_init(void)</div><div class='ctx'> {</div><div class='del'>-	return ide_pci_register_driver(&amp;driver);</div><div class='add'>+	return ide_pci_register_driver(&amp;triflex_pci_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit triflex_ide_exit(void)</div><div class='ctx'> {</div><div class='del'>-	pci_unregister_driver(&amp;driver);</div><div class='add'>+	pci_unregister_driver(&amp;triflex_pci_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(triflex_ide_init);</div><div class='head'>diff --git a/drivers/ide/pci/trm290.c b/drivers/ide/pci/trm290.c<br/>index fd28b49977fd..75ea61526566 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/pci/trm290.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ide/pci/trm290.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/pci/trm290.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/pci/trm290.c</a></div><div class='hunk'>@@ -135,7 +135,6 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/hdreg.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/ide.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -162,7 +161,7 @@ static void trm290_prepare_drive (ide_drive_t *drive, unsigned int use_dma)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* enable IRQ if not probing */</div><div class='del'>-	if (drive-&gt;present) {</div><div class='add'>+	if (drive-&gt;dev_flags &amp; IDE_DFLAG_PRESENT) {</div><div class='ctx'> 		reg = inw(hwif-&gt;config_data + 3);</div><div class='ctx'> 		reg &amp;= 0x13;</div><div class='ctx'> 		reg &amp;= ~(1 &lt;&lt; hwif-&gt;channel);</div><div class='hunk'>@@ -174,7 +173,7 @@ static void trm290_prepare_drive (ide_drive_t *drive, unsigned int use_dma)</div><div class='ctx'> </div><div class='ctx'> static void trm290_selectproc (ide_drive_t *drive)</div><div class='ctx'> {</div><div class='del'>-	trm290_prepare_drive(drive, drive-&gt;using_dma);</div><div class='add'>+	trm290_prepare_drive(drive, !!(drive-&gt;dev_flags &amp; IDE_DFLAG_USING_DMA));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void trm290_dma_exec_cmd(ide_drive_t *drive, u8 command)</div><div class='hunk'>@@ -351,7 +350,7 @@ static const struct pci_device_id trm290_pci_tbl[] = {</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, trm290_pci_tbl);</div><div class='ctx'> </div><div class='del'>-static struct pci_driver driver = {</div><div class='add'>+static struct pci_driver trm290_pci_driver = {</div><div class='ctx'> 	.name		= "TRM290_IDE",</div><div class='ctx'> 	.id_table	= trm290_pci_tbl,</div><div class='ctx'> 	.probe		= trm290_init_one,</div><div class='hunk'>@@ -360,12 +359,12 @@ static struct pci_driver driver = {</div><div class='ctx'> </div><div class='ctx'> static int __init trm290_ide_init(void)</div><div class='ctx'> {</div><div class='del'>-	return ide_pci_register_driver(&amp;driver);</div><div class='add'>+	return ide_pci_register_driver(&amp;trm290_pci_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit trm290_ide_exit(void)</div><div class='ctx'> {</div><div class='del'>-	pci_unregister_driver(&amp;driver);</div><div class='add'>+	pci_unregister_driver(&amp;trm290_pci_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(trm290_ide_init);</div><div class='head'>diff --git a/drivers/ide/pci/via82cxxx.c b/drivers/ide/pci/via82cxxx.c<br/>index 94fb9ab3223f..2a812d3207e9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/pci/via82cxxx.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ide/pci/via82cxxx.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/pci/via82cxxx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/pci/via82cxxx.c</a></div><div class='hunk'>@@ -154,7 +154,7 @@ static void via_set_speed(ide_hwif_t *hwif, u8 dn, struct ide_timing *timing)</div><div class='ctx'> static void via_set_drive(ide_drive_t *drive, const u8 speed)</div><div class='ctx'> {</div><div class='ctx'> 	ide_hwif_t *hwif = drive-&gt;hwif;</div><div class='del'>-	ide_drive_t *peer = hwif-&gt;drives + (~drive-&gt;dn &amp; 1);</div><div class='add'>+	ide_drive_t *peer = ide_get_pair_dev(drive);</div><div class='ctx'> 	struct pci_dev *dev = to_pci_dev(hwif-&gt;dev);</div><div class='ctx'> 	struct ide_host *host = pci_get_drvdata(dev);</div><div class='ctx'> 	struct via82cxxx_dev *vdev = host-&gt;host_priv;</div><div class='hunk'>@@ -173,7 +173,7 @@ static void via_set_drive(ide_drive_t *drive, const u8 speed)</div><div class='ctx'> </div><div class='ctx'> 	ide_timing_compute(drive, speed, &amp;t, T, UT);</div><div class='ctx'> </div><div class='del'>-	if (peer-&gt;present) {</div><div class='add'>+	if (peer) {</div><div class='ctx'> 		ide_timing_compute(peer, peer-&gt;current_speed, &amp;p, T, UT);</div><div class='ctx'> 		ide_timing_merge(&amp;p, &amp;t, &amp;t, IDE_TIMING_8BIT);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -215,7 +215,7 @@ static struct via_isa_bridge *via_config_find(struct pci_dev **isa)</div><div class='ctx'> /*</div><div class='ctx'>  * Check and handle 80-wire cable presence</div><div class='ctx'>  */</div><div class='del'>-static void __devinit via_cable_detect(struct via82cxxx_dev *vdev, u32 u)</div><div class='add'>+static void via_cable_detect(struct via82cxxx_dev *vdev, u32 u)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -267,7 +267,7 @@ static void __devinit via_cable_detect(struct via82cxxx_dev *vdev, u32 u)</div><div class='ctx'>  *	and initialize its drive independent registers.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static unsigned int __devinit init_chipset_via82cxxx(struct pci_dev *dev)</div><div class='add'>+static unsigned int init_chipset_via82cxxx(struct pci_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ide_host *host = pci_get_drvdata(dev);</div><div class='ctx'> 	struct via82cxxx_dev *vdev = host-&gt;host_priv;</div><div class='hunk'>@@ -487,21 +487,23 @@ static const struct pci_device_id via_pci_tbl[] = {</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, via_pci_tbl);</div><div class='ctx'> </div><div class='del'>-static struct pci_driver driver = {</div><div class='add'>+static struct pci_driver via_pci_driver = {</div><div class='ctx'> 	.name 		= "VIA_IDE",</div><div class='ctx'> 	.id_table 	= via_pci_tbl,</div><div class='ctx'> 	.probe 		= via_init_one,</div><div class='ctx'> 	.remove		= __devexit_p(via_remove),</div><div class='add'>+	.suspend	= ide_pci_suspend,</div><div class='add'>+	.resume		= ide_pci_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init via_ide_init(void)</div><div class='ctx'> {</div><div class='del'>-	return ide_pci_register_driver(&amp;driver);</div><div class='add'>+	return ide_pci_register_driver(&amp;via_pci_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit via_ide_exit(void)</div><div class='ctx'> {</div><div class='del'>-	pci_unregister_driver(&amp;driver);</div><div class='add'>+	pci_unregister_driver(&amp;via_pci_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(via_ide_init);</div><div class='head'>diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c<br/>index fa2be26272d5..2e19d6298536 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/ppc/pmac.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ide/ppc/pmac.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/ppc/pmac.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/ppc/pmac.c</a></div><div class='hunk'>@@ -430,10 +430,7 @@ pmac_ide_selectproc(ide_drive_t *drive)</div><div class='ctx'> 	pmac_ide_hwif_t *pmif =</div><div class='ctx'> 		(pmac_ide_hwif_t *)dev_get_drvdata(hwif-&gt;gendev.parent);</div><div class='ctx'> </div><div class='del'>-	if (pmif == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (drive-&gt;select.b.unit &amp; 0x01)</div><div class='add'>+	if (drive-&gt;dn &amp; 1)</div><div class='ctx'> 		writel(pmif-&gt;timings[1], PMAC_IDE_REG(IDE_TIMING_CONFIG));</div><div class='ctx'> 	else</div><div class='ctx'> 		writel(pmif-&gt;timings[0], PMAC_IDE_REG(IDE_TIMING_CONFIG));</div><div class='hunk'>@@ -452,10 +449,7 @@ pmac_ide_kauai_selectproc(ide_drive_t *drive)</div><div class='ctx'> 	pmac_ide_hwif_t *pmif =</div><div class='ctx'> 		(pmac_ide_hwif_t *)dev_get_drvdata(hwif-&gt;gendev.parent);</div><div class='ctx'> </div><div class='del'>-	if (pmif == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (drive-&gt;select.b.unit &amp; 0x01) {</div><div class='add'>+	if (drive-&gt;dn &amp; 1) {</div><div class='ctx'> 		writel(pmif-&gt;timings[1], PMAC_IDE_REG(IDE_KAUAI_PIO_CONFIG));</div><div class='ctx'> 		writel(pmif-&gt;timings[3], PMAC_IDE_REG(IDE_KAUAI_ULTRA_CONFIG));</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -475,9 +469,6 @@ pmac_ide_do_update_timings(ide_drive_t *drive)</div><div class='ctx'> 	pmac_ide_hwif_t *pmif =</div><div class='ctx'> 		(pmac_ide_hwif_t *)dev_get_drvdata(hwif-&gt;gendev.parent);</div><div class='ctx'> </div><div class='del'>-	if (pmif == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='ctx'> 	if (pmif-&gt;kind == controller_sh_ata6 ||</div><div class='ctx'> 	    pmif-&gt;kind == controller_un_ata6 ||</div><div class='ctx'> 	    pmif-&gt;kind == controller_k2_ata6)</div><div class='hunk'>@@ -524,11 +515,8 @@ pmac_ide_set_pio_mode(ide_drive_t *drive, const u8 pio)</div><div class='ctx'> 	unsigned accessTime, recTime;</div><div class='ctx'> 	unsigned int cycle_time;</div><div class='ctx'> </div><div class='del'>-	if (pmif == NULL)</div><div class='del'>-		return;</div><div class='del'>-		</div><div class='ctx'> 	/* which drive is it ? */</div><div class='del'>-	timings = &amp;pmif-&gt;timings[drive-&gt;select.b.unit &amp; 0x01];</div><div class='add'>+	timings = &amp;pmif-&gt;timings[drive-&gt;dn &amp; 1];</div><div class='ctx'> 	t = *timings;</div><div class='ctx'> </div><div class='ctx'> 	cycle_time = ide_pio_cycle_time(drive, pio);</div><div class='hunk'>@@ -669,9 +657,9 @@ static void</div><div class='ctx'> set_timings_mdma(ide_drive_t *drive, int intf_type, u32 *timings, u32 *timings2,</div><div class='ctx'> 		 	u8 speed)</div><div class='ctx'> {</div><div class='add'>+	u16 *id = drive-&gt;id;</div><div class='ctx'> 	int cycleTime, accessTime = 0, recTime = 0;</div><div class='ctx'> 	unsigned accessTicks, recTicks;</div><div class='del'>-	struct hd_driveid *id = drive-&gt;id;</div><div class='ctx'> 	struct mdma_timings_t* tm = NULL;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -686,8 +674,8 @@ set_timings_mdma(ide_drive_t *drive, int intf_type, u32 *timings, u32 *timings2,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Check if drive provides explicit DMA cycle time */</div><div class='del'>-	if ((id-&gt;field_valid &amp; 2) &amp;&amp; id-&gt;eide_dma_time)</div><div class='del'>-		cycleTime = max_t(int, id-&gt;eide_dma_time, cycleTime);</div><div class='add'>+	if ((id[ATA_ID_FIELD_VALID] &amp; 2) &amp;&amp; id[ATA_ID_EIDE_DMA_TIME])</div><div class='add'>+		cycleTime = max_t(int, id[ATA_ID_EIDE_DMA_TIME], cycleTime);</div><div class='ctx'> </div><div class='ctx'> 	/* OHare limits according to some old Apple sources */	</div><div class='ctx'> 	if ((intf_type == controller_ohare) &amp;&amp; (cycleTime &lt; 150))</div><div class='hunk'>@@ -805,9 +793,9 @@ static void pmac_ide_set_dma_mode(ide_drive_t *drive, const u8 speed)</div><div class='ctx'> 	ide_hwif_t *hwif = drive-&gt;hwif;</div><div class='ctx'> 	pmac_ide_hwif_t *pmif =</div><div class='ctx'> 		(pmac_ide_hwif_t *)dev_get_drvdata(hwif-&gt;gendev.parent);</div><div class='del'>-	int unit = (drive-&gt;select.b.unit &amp; 0x01);</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	u32 *timings, *timings2, tl[2];</div><div class='add'>+	u8 unit = drive-&gt;dn &amp; 1;</div><div class='ctx'> </div><div class='ctx'> 	timings = &amp;pmif-&gt;timings[unit];</div><div class='ctx'> 	timings2 = &amp;pmif-&gt;timings[unit+2];</div><div class='hunk'>@@ -966,11 +954,11 @@ static void pmac_ide_init_dev(ide_drive_t *drive)</div><div class='ctx'> 	if (pmif-&gt;mediabay) {</div><div class='ctx'> #ifdef CONFIG_PMAC_MEDIABAY</div><div class='ctx'> 		if (check_media_bay_by_base(pmif-&gt;regbase, MB_CD) == 0) {</div><div class='del'>-			drive-&gt;noprobe = 0;</div><div class='add'>+			drive-&gt;dev_flags &amp;= ~IDE_DFLAG_NOPROBE;</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> #endif</div><div class='del'>-		drive-&gt;noprobe = 1;</div><div class='add'>+		drive-&gt;dev_flags |= IDE_DFLAG_NOPROBE;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1535,18 +1523,6 @@ use_pio_instead:</div><div class='ctx'> 	return 0; /* revert to PIO for this request */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Teardown mappings after DMA has completed.  */</div><div class='del'>-static void</div><div class='del'>-pmac_ide_destroy_dmatable (ide_drive_t *drive)</div><div class='del'>-{</div><div class='del'>-	ide_hwif_t *hwif = drive-&gt;hwif;</div><div class='del'>-</div><div class='del'>-	if (hwif-&gt;sg_nents) {</div><div class='del'>-		ide_destroy_dmatable(drive);</div><div class='del'>-		hwif-&gt;sg_nents = 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Prepare a DMA transfer. We build the DMA table, adjust the timings for</div><div class='ctx'>  * a read on KeyLargo ATA/66 and mark us as waiting for DMA completion</div><div class='hunk'>@@ -1558,12 +1534,7 @@ pmac_ide_dma_setup(ide_drive_t *drive)</div><div class='ctx'> 	pmac_ide_hwif_t *pmif =</div><div class='ctx'> 		(pmac_ide_hwif_t *)dev_get_drvdata(hwif-&gt;gendev.parent);</div><div class='ctx'> 	struct request *rq = HWGROUP(drive)-&gt;rq;</div><div class='del'>-	u8 unit = (drive-&gt;select.b.unit &amp; 0x01);</div><div class='del'>-	u8 ata4;</div><div class='del'>-</div><div class='del'>-	if (pmif == NULL)</div><div class='del'>-		return 1;</div><div class='del'>-	ata4 = (pmif-&gt;kind == controller_kl_ata4);	</div><div class='add'>+	u8 unit = drive-&gt;dn &amp; 1, ata4 = (pmif-&gt;kind == controller_kl_ata4);</div><div class='ctx'> </div><div class='ctx'> 	if (!pmac_ide_build_dmatable(drive, rq)) {</div><div class='ctx'> 		ide_map_sg(drive, rq);</div><div class='hunk'>@@ -1617,17 +1588,15 @@ pmac_ide_dma_end (ide_drive_t *drive)</div><div class='ctx'> 	ide_hwif_t *hwif = drive-&gt;hwif;</div><div class='ctx'> 	pmac_ide_hwif_t *pmif =</div><div class='ctx'> 		(pmac_ide_hwif_t *)dev_get_drvdata(hwif-&gt;gendev.parent);</div><div class='del'>-	volatile struct dbdma_regs __iomem *dma;</div><div class='add'>+	volatile struct dbdma_regs __iomem *dma = pmif-&gt;dma_regs;</div><div class='ctx'> 	u32 dstat;</div><div class='del'>-	</div><div class='del'>-	if (pmif == NULL)</div><div class='del'>-		return 0;</div><div class='del'>-	dma = pmif-&gt;dma_regs;</div><div class='ctx'> </div><div class='ctx'> 	drive-&gt;waiting_for_dma = 0;</div><div class='ctx'> 	dstat = readl(&amp;dma-&gt;status);</div><div class='ctx'> 	writel(((RUN|WAKE|DEAD) &lt;&lt; 16), &amp;dma-&gt;control);</div><div class='del'>-	pmac_ide_destroy_dmatable(drive);</div><div class='add'>+</div><div class='add'>+	ide_destroy_dmatable(drive);</div><div class='add'>+</div><div class='ctx'> 	/* verify good dma status. we don't check for ACTIVE beeing 0. We should...</div><div class='ctx'> 	 * in theory, but with ATAPI decices doing buffer underruns, that would</div><div class='ctx'> 	 * cause us to disable DMA, which isn't what we want</div><div class='hunk'>@@ -1647,13 +1616,9 @@ pmac_ide_dma_test_irq (ide_drive_t *drive)</div><div class='ctx'> 	ide_hwif_t *hwif = drive-&gt;hwif;</div><div class='ctx'> 	pmac_ide_hwif_t *pmif =</div><div class='ctx'> 		(pmac_ide_hwif_t *)dev_get_drvdata(hwif-&gt;gendev.parent);</div><div class='del'>-	volatile struct dbdma_regs __iomem *dma;</div><div class='add'>+	volatile struct dbdma_regs __iomem *dma = pmif-&gt;dma_regs;</div><div class='ctx'> 	unsigned long status, timeout;</div><div class='ctx'> </div><div class='del'>-	if (pmif == NULL)</div><div class='del'>-		return 0;</div><div class='del'>-	dma = pmif-&gt;dma_regs;</div><div class='del'>-</div><div class='ctx'> 	/* We have to things to deal with here:</div><div class='ctx'> 	 * </div><div class='ctx'> 	 * - The dbdma won't stop if the command was started</div><div class='hunk'>@@ -1672,9 +1637,6 @@ pmac_ide_dma_test_irq (ide_drive_t *drive)</div><div class='ctx'> 	status = readl(&amp;dma-&gt;status);</div><div class='ctx'> 	if (!(status &amp; ACTIVE))</div><div class='ctx'> 		return 1;</div><div class='del'>-	if (!drive-&gt;waiting_for_dma)</div><div class='del'>-		printk(KERN_WARNING "ide%d, ide_dma_test_irq \</div><div class='del'>-			called while not waiting\n", HWIF(drive)-&gt;index);</div><div class='ctx'> </div><div class='ctx'> 	/* If dbdma didn't execute the STOP command yet, the</div><div class='ctx'> 	 * active bit is still set. We consider that we aren't</div><div class='hunk'>@@ -1709,14 +1671,9 @@ pmac_ide_dma_lost_irq (ide_drive_t *drive)</div><div class='ctx'> 	ide_hwif_t *hwif = drive-&gt;hwif;</div><div class='ctx'> 	pmac_ide_hwif_t *pmif =</div><div class='ctx'> 		(pmac_ide_hwif_t *)dev_get_drvdata(hwif-&gt;gendev.parent);</div><div class='del'>-	volatile struct dbdma_regs __iomem *dma;</div><div class='del'>-	unsigned long status;</div><div class='del'>-</div><div class='del'>-	if (pmif == NULL)</div><div class='del'>-		return;</div><div class='del'>-	dma = pmif-&gt;dma_regs;</div><div class='add'>+	volatile struct dbdma_regs __iomem *dma = pmif-&gt;dma_regs;</div><div class='add'>+	unsigned long status = readl(&amp;dma-&gt;status);</div><div class='ctx'> </div><div class='del'>-	status = readl(&amp;dma-&gt;status);</div><div class='ctx'> 	printk(KERN_ERR "ide-pmac lost interrupt, dma status: %lx\n", status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/ide/setup-pci.c b/drivers/ide/setup-pci.c<br/>index a8e9e8a69a52..9f1f9163a136 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/setup-pci.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ide/setup-pci.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ide/setup-pci.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ide/setup-pci.c</a></div><div class='hunk'>@@ -659,3 +659,36 @@ void ide_pci_remove(struct pci_dev *dev)</div><div class='ctx'> 	pci_disable_device(dev);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(ide_pci_remove);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+int ide_pci_suspend(struct pci_dev *dev, pm_message_t state)</div><div class='add'>+{</div><div class='add'>+	pci_save_state(dev);</div><div class='add'>+	pci_disable_device(dev);</div><div class='add'>+	pci_set_power_state(dev, pci_choose_state(dev, state));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(ide_pci_suspend);</div><div class='add'>+</div><div class='add'>+int ide_pci_resume(struct pci_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct ide_host *host = pci_get_drvdata(dev);</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	pci_set_power_state(dev, PCI_D0);</div><div class='add'>+</div><div class='add'>+	rc = pci_enable_device(dev);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	pci_restore_state(dev);</div><div class='add'>+	pci_set_master(dev);</div><div class='add'>+</div><div class='add'>+	if (host-&gt;init_chipset)</div><div class='add'>+		host-&gt;init_chipset(dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(ide_pci_resume);</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/ieee1394/csr1212.c b/drivers/ieee1394/csr1212.c<br/>index 9f95337139e3..5e38a68b8af2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ieee1394/csr1212.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ieee1394/csr1212.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ieee1394/csr1212.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ieee1394/csr1212.c</a></div><div class='hunk'>@@ -84,7 +84,7 @@ static const u8 csr1212_key_id_type_map[0x30] = {</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #define quads_to_bytes(_q) ((_q) * sizeof(u32))</div><div class='del'>-#define bytes_to_quads(_b) (((_b) + sizeof(u32) - 1) / sizeof(u32))</div><div class='add'>+#define bytes_to_quads(_b) DIV_ROUND_UP(_b, sizeof(u32))</div><div class='ctx'> </div><div class='ctx'> static void free_keyval(struct csr1212_keyval *kv)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/ieee1394/dv1394.c b/drivers/ieee1394/dv1394.c<br/>index b6eb2cf25914..2f83543a9dfc 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ieee1394/dv1394.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ieee1394/dv1394.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ieee1394/dv1394.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ieee1394/dv1394.c</a></div><div class='hunk'>@@ -918,7 +918,7 @@ static int do_dv1394_init(struct video_card *video, struct dv1394_init *init)</div><div class='ctx'> 		/* default SYT offset is 3 cycles */</div><div class='ctx'> 		init-&gt;syt_offset = 3;</div><div class='ctx'> </div><div class='del'>-	if ( (init-&gt;channel &gt; 63) || (init-&gt;channel &lt; 0) )</div><div class='add'>+	if (init-&gt;channel &gt; 63)</div><div class='ctx'> 		init-&gt;channel = 63;</div><div class='ctx'> </div><div class='ctx'> 	chan_mask = (u64)1 &lt;&lt; init-&gt;channel;</div><div class='hunk'>@@ -2296,10 +2296,10 @@ static void dv1394_add_host(struct hpsb_host *host)</div><div class='ctx'> </div><div class='ctx'> 	ohci = (struct ti_ohci *)host-&gt;hostdata;</div><div class='ctx'> </div><div class='del'>-	device_create_drvdata(hpsb_protocol_class, NULL,</div><div class='del'>-			      MKDEV(IEEE1394_MAJOR,</div><div class='del'>-				    IEEE1394_MINOR_BLOCK_DV1394 * 16 + (id&lt;&lt;2)), NULL,</div><div class='del'>-			      "dv1394-%d", id);</div><div class='add'>+	device_create(hpsb_protocol_class, NULL,</div><div class='add'>+		      MKDEV(IEEE1394_MAJOR,</div><div class='add'>+			    IEEE1394_MINOR_BLOCK_DV1394 * 16 + (id&lt;&lt;2)),</div><div class='add'>+		      NULL, "dv1394-%d", id);</div><div class='ctx'> </div><div class='ctx'> 	dv1394_init(ohci, DV1394_NTSC, MODE_RECEIVE);</div><div class='ctx'> 	dv1394_init(ohci, DV1394_NTSC, MODE_TRANSMIT);</div><div class='head'>diff --git a/drivers/ieee1394/eth1394.c b/drivers/ieee1394/eth1394.c<br/>index b166b3575fa6..20128692b339 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ieee1394/eth1394.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ieee1394/eth1394.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ieee1394/eth1394.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ieee1394/eth1394.c</a></div><div class='hunk'>@@ -1361,7 +1361,7 @@ static unsigned int ether1394_encapsulate_prep(unsigned int max_payload,</div><div class='ctx'> 		hdr-&gt;ff.dgl = dgl;</div><div class='ctx'> 		adj_max_payload = max_payload - hdr_type_len[ETH1394_HDR_LF_FF];</div><div class='ctx'> 	}</div><div class='del'>-	return (dg_size + adj_max_payload - 1) / adj_max_payload;</div><div class='add'>+	return DIV_ROUND_UP(dg_size, adj_max_payload);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static unsigned int ether1394_encapsulate(struct sk_buff *skb,</div><div class='head'>diff --git a/drivers/ieee1394/nodemgr.c b/drivers/ieee1394/nodemgr.c<br/>index 16240a789650..2376b729e876 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ieee1394/nodemgr.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ieee1394/nodemgr.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ieee1394/nodemgr.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ieee1394/nodemgr.c</a></div><div class='hunk'>@@ -154,9 +154,6 @@ struct host_info {</div><div class='ctx'> </div><div class='ctx'> static int nodemgr_bus_match(struct device * dev, struct device_driver * drv);</div><div class='ctx'> static int nodemgr_uevent(struct device *dev, struct kobj_uevent_env *env);</div><div class='del'>-static void nodemgr_resume_ne(struct node_entry *ne);</div><div class='del'>-static void nodemgr_remove_ne(struct node_entry *ne);</div><div class='del'>-static struct node_entry *find_entry_by_guid(u64 guid);</div><div class='ctx'> </div><div class='ctx'> struct bus_type ieee1394_bus_type = {</div><div class='ctx'> 	.name		= "ieee1394",</div><div class='hunk'>@@ -385,27 +382,6 @@ static ssize_t fw_get_ignore_driver(struct device *dev, struct device_attribute</div><div class='ctx'> static DEVICE_ATTR(ignore_driver, S_IWUSR | S_IRUGO, fw_get_ignore_driver, fw_set_ignore_driver);</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static ssize_t fw_set_destroy_node(struct bus_type *bus, const char *buf, size_t count)</div><div class='del'>-{</div><div class='del'>-	struct node_entry *ne;</div><div class='del'>-	u64 guid = (u64)simple_strtoull(buf, NULL, 16);</div><div class='del'>-</div><div class='del'>-	ne = find_entry_by_guid(guid);</div><div class='del'>-</div><div class='del'>-	if (ne == NULL || !ne-&gt;in_limbo)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	nodemgr_remove_ne(ne);</div><div class='del'>-</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-static ssize_t fw_get_destroy_node(struct bus_type *bus, char *buf)</div><div class='del'>-{</div><div class='del'>-	return sprintf(buf, "You can destroy in_limbo nodes by writing their GUID to this file\n");</div><div class='del'>-}</div><div class='del'>-static BUS_ATTR(destroy_node, S_IWUSR | S_IRUGO, fw_get_destroy_node, fw_set_destroy_node);</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> static ssize_t fw_set_rescan(struct bus_type *bus, const char *buf,</div><div class='ctx'> 			     size_t count)</div><div class='ctx'> {</div><div class='hunk'>@@ -442,7 +418,6 @@ static BUS_ATTR(ignore_drivers, S_IWUSR | S_IRUGO, fw_get_ignore_drivers, fw_set</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> struct bus_attribute *const fw_bus_attrs[] = {</div><div class='del'>-	&amp;bus_attr_destroy_node,</div><div class='ctx'> 	&amp;bus_attr_rescan,</div><div class='ctx'> 	&amp;bus_attr_ignore_drivers,</div><div class='ctx'> 	NULL</div><div class='hunk'>@@ -734,10 +709,10 @@ static int nodemgr_bus_match(struct device * dev, struct device_driver * drv)</div><div class='ctx'> </div><div class='ctx'> static DEFINE_MUTEX(nodemgr_serialize_remove_uds);</div><div class='ctx'> </div><div class='del'>-static int __match_ne(struct device *dev, void *data)</div><div class='add'>+static int match_ne(struct device *dev, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct unit_directory *ud;</div><div class='del'>-	struct node_entry *ne = (struct node_entry *)data;</div><div class='add'>+	struct node_entry *ne = data;</div><div class='ctx'> </div><div class='ctx'> 	ud = container_of(dev, struct unit_directory, unit_dev);</div><div class='ctx'> 	return ud-&gt;ne == ne;</div><div class='hunk'>@@ -754,8 +729,7 @@ static void nodemgr_remove_uds(struct node_entry *ne)</div><div class='ctx'> 	 */</div><div class='ctx'> 	mutex_lock(&amp;nodemgr_serialize_remove_uds);</div><div class='ctx'> 	for (;;) {</div><div class='del'>-		dev = class_find_device(&amp;nodemgr_ud_class, NULL, ne,</div><div class='del'>-					__match_ne);</div><div class='add'>+		dev = class_find_device(&amp;nodemgr_ud_class, NULL, ne, match_ne);</div><div class='ctx'> 		if (!dev)</div><div class='ctx'> 			break;</div><div class='ctx'> 		ud = container_of(dev, struct unit_directory, unit_dev);</div><div class='hunk'>@@ -785,7 +759,7 @@ static void nodemgr_remove_ne(struct node_entry *ne)</div><div class='ctx'> 	put_device(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __nodemgr_remove_host_dev(struct device *dev, void *data)</div><div class='add'>+static int remove_host_dev(struct device *dev, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	if (dev-&gt;bus == &amp;ieee1394_bus_type)</div><div class='ctx'> 		nodemgr_remove_ne(container_of(dev, struct node_entry,</div><div class='hunk'>@@ -795,7 +769,7 @@ static int __nodemgr_remove_host_dev(struct device *dev, void *data)</div><div class='ctx'> </div><div class='ctx'> static void nodemgr_remove_host_dev(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	WARN_ON(device_for_each_child(dev, NULL, __nodemgr_remove_host_dev));</div><div class='add'>+	device_for_each_child(dev, NULL, remove_host_dev);</div><div class='ctx'> 	sysfs_remove_link(&amp;dev-&gt;kobj, "irm_id");</div><div class='ctx'> 	sysfs_remove_link(&amp;dev-&gt;kobj, "busmgr_id");</div><div class='ctx'> 	sysfs_remove_link(&amp;dev-&gt;kobj, "host_id");</div><div class='hunk'>@@ -830,11 +804,10 @@ static void nodemgr_update_bus_options(struct node_entry *ne)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static struct node_entry *nodemgr_create_node(octlet_t guid, struct csr1212_csr *csr,</div><div class='del'>-					      struct host_info *hi, nodeid_t nodeid,</div><div class='del'>-					      unsigned int generation)</div><div class='add'>+static struct node_entry *nodemgr_create_node(octlet_t guid,</div><div class='add'>+				struct csr1212_csr *csr, struct hpsb_host *host,</div><div class='add'>+				nodeid_t nodeid, unsigned int generation)</div><div class='ctx'> {</div><div class='del'>-	struct hpsb_host *host = hi-&gt;host;</div><div class='ctx'> 	struct node_entry *ne;</div><div class='ctx'> </div><div class='ctx'> 	ne = kzalloc(sizeof(*ne), GFP_KERNEL);</div><div class='hunk'>@@ -888,10 +861,10 @@ fail_alloc:</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __match_ne_guid(struct device *dev, void *data)</div><div class='add'>+static int match_ne_guid(struct device *dev, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct node_entry *ne;</div><div class='del'>-	u64 *guid = (u64 *)data;</div><div class='add'>+	u64 *guid = data;</div><div class='ctx'> </div><div class='ctx'> 	ne = container_of(dev, struct node_entry, node_dev);</div><div class='ctx'> 	return ne-&gt;guid == *guid;</div><div class='hunk'>@@ -902,8 +875,7 @@ static struct node_entry *find_entry_by_guid(u64 guid)</div><div class='ctx'> 	struct device *dev;</div><div class='ctx'> 	struct node_entry *ne;</div><div class='ctx'> </div><div class='del'>-	dev = class_find_device(&amp;nodemgr_ne_class, NULL, &amp;guid,</div><div class='del'>-				__match_ne_guid);</div><div class='add'>+	dev = class_find_device(&amp;nodemgr_ne_class, NULL, &amp;guid, match_ne_guid);</div><div class='ctx'> 	if (!dev)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	ne = container_of(dev, struct node_entry, node_dev);</div><div class='hunk'>@@ -912,21 +884,21 @@ static struct node_entry *find_entry_by_guid(u64 guid)</div><div class='ctx'> 	return ne;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct match_nodeid_param {</div><div class='add'>+struct match_nodeid_parameter {</div><div class='ctx'> 	struct hpsb_host *host;</div><div class='ctx'> 	nodeid_t nodeid;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __match_ne_nodeid(struct device *dev, void *data)</div><div class='add'>+static int match_ne_nodeid(struct device *dev, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	int found = 0;</div><div class='ctx'> 	struct node_entry *ne;</div><div class='del'>-	struct match_nodeid_param *param = (struct match_nodeid_param *)data;</div><div class='add'>+	struct match_nodeid_parameter *p = data;</div><div class='ctx'> </div><div class='ctx'> 	if (!dev)</div><div class='ctx'> 		goto ret;</div><div class='ctx'> 	ne = container_of(dev, struct node_entry, node_dev);</div><div class='del'>-	if (ne-&gt;host == param-&gt;host &amp;&amp; ne-&gt;nodeid == param-&gt;nodeid)</div><div class='add'>+	if (ne-&gt;host == p-&gt;host &amp;&amp; ne-&gt;nodeid == p-&gt;nodeid)</div><div class='ctx'> 		found = 1;</div><div class='ctx'> ret:</div><div class='ctx'> 	return found;</div><div class='hunk'>@@ -937,13 +909,12 @@ static struct node_entry *find_entry_by_nodeid(struct hpsb_host *host,</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev;</div><div class='ctx'> 	struct node_entry *ne;</div><div class='del'>-	struct match_nodeid_param param;</div><div class='add'>+	struct match_nodeid_parameter p;</div><div class='ctx'> </div><div class='del'>-	param.host = host;</div><div class='del'>-	param.nodeid = nodeid;</div><div class='add'>+	p.host = host;</div><div class='add'>+	p.nodeid = nodeid;</div><div class='ctx'> </div><div class='del'>-	dev = class_find_device(&amp;nodemgr_ne_class, NULL, &amp;param,</div><div class='del'>-				__match_ne_nodeid);</div><div class='add'>+	dev = class_find_device(&amp;nodemgr_ne_class, NULL, &amp;p, match_ne_nodeid);</div><div class='ctx'> 	if (!dev)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	ne = container_of(dev, struct node_entry, node_dev);</div><div class='hunk'>@@ -990,7 +961,7 @@ fail_devreg:</div><div class='ctx'>  * immediate unit directories looking for software_id and</div><div class='ctx'>  * software_version entries, in order to get driver autoloading working. */</div><div class='ctx'> static struct unit_directory *nodemgr_process_unit_directory</div><div class='del'>-	(struct host_info *hi, struct node_entry *ne, struct csr1212_keyval *ud_kv,</div><div class='add'>+	(struct node_entry *ne, struct csr1212_keyval *ud_kv,</div><div class='ctx'> 	 unsigned int *id, struct unit_directory *parent)</div><div class='ctx'> {</div><div class='ctx'> 	struct unit_directory *ud;</div><div class='hunk'>@@ -1083,7 +1054,7 @@ static struct unit_directory *nodemgr_process_unit_directory</div><div class='ctx'> 					nodemgr_register_device(ne, ud, &amp;ne-&gt;device);</div><div class='ctx'> 				</div><div class='ctx'> 				/* process the child unit */</div><div class='del'>-				ud_child = nodemgr_process_unit_directory(hi, ne, kv, id, ud);</div><div class='add'>+				ud_child = nodemgr_process_unit_directory(ne, kv, id, ud);</div><div class='ctx'> </div><div class='ctx'> 				if (ud_child == NULL)</div><div class='ctx'> 					break;</div><div class='hunk'>@@ -1137,7 +1108,7 @@ unit_directory_error:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static void nodemgr_process_root_directory(struct host_info *hi, struct node_entry *ne)</div><div class='add'>+static void nodemgr_process_root_directory(struct node_entry *ne)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int ud_id = 0;</div><div class='ctx'> 	struct csr1212_dentry *dentry;</div><div class='hunk'>@@ -1157,7 +1128,7 @@ static void nodemgr_process_root_directory(struct host_info *hi, struct node_ent</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case CSR1212_KV_ID_UNIT:</div><div class='del'>-			nodemgr_process_unit_directory(hi, ne, kv, &amp;ud_id, NULL);</div><div class='add'>+			nodemgr_process_unit_directory(ne, kv, &amp;ud_id, NULL);</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case CSR1212_KV_ID_DESCRIPTOR:</div><div class='hunk'>@@ -1273,8 +1244,7 @@ void hpsb_unregister_protocol(struct hpsb_protocol_driver *driver)</div><div class='ctx'>  * the to take whatever actions required.</div><div class='ctx'>  */</div><div class='ctx'> static void nodemgr_update_node(struct node_entry *ne, struct csr1212_csr *csr,</div><div class='del'>-				struct host_info *hi, nodeid_t nodeid,</div><div class='del'>-				unsigned int generation)</div><div class='add'>+				nodeid_t nodeid, unsigned int generation)</div><div class='ctx'> {</div><div class='ctx'> 	if (ne-&gt;nodeid != nodeid) {</div><div class='ctx'> 		HPSB_DEBUG("Node changed: " NODE_BUS_FMT " -&gt; " NODE_BUS_FMT,</div><div class='hunk'>@@ -1305,19 +1275,23 @@ static void nodemgr_update_node(struct node_entry *ne, struct csr1212_csr *csr,</div><div class='ctx'> 		csr1212_destroy_csr(csr);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (ne-&gt;in_limbo)</div><div class='del'>-		nodemgr_resume_ne(ne);</div><div class='del'>-</div><div class='ctx'> 	/* Mark the node current */</div><div class='ctx'> 	ne-&gt;generation = generation;</div><div class='del'>-}</div><div class='ctx'> </div><div class='add'>+	if (ne-&gt;in_limbo) {</div><div class='add'>+		device_remove_file(&amp;ne-&gt;device, &amp;dev_attr_ne_in_limbo);</div><div class='add'>+		ne-&gt;in_limbo = false;</div><div class='ctx'> </div><div class='add'>+		HPSB_DEBUG("Node reactivated: "</div><div class='add'>+			   "ID:BUS[" NODE_BUS_FMT "]  GUID[%016Lx]",</div><div class='add'>+			   NODE_BUS_ARGS(ne-&gt;host, ne-&gt;nodeid),</div><div class='add'>+			   (unsigned long long)ne-&gt;guid);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-static void nodemgr_node_scan_one(struct host_info *hi,</div><div class='add'>+static void nodemgr_node_scan_one(struct hpsb_host *host,</div><div class='ctx'> 				  nodeid_t nodeid, int generation)</div><div class='ctx'> {</div><div class='del'>-	struct hpsb_host *host = hi-&gt;host;</div><div class='ctx'> 	struct node_entry *ne;</div><div class='ctx'> 	octlet_t guid;</div><div class='ctx'> 	struct csr1212_csr *csr;</div><div class='hunk'>@@ -1373,16 +1347,15 @@ static void nodemgr_node_scan_one(struct host_info *hi,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!ne)</div><div class='del'>-		nodemgr_create_node(guid, csr, hi, nodeid, generation);</div><div class='add'>+		nodemgr_create_node(guid, csr, host, nodeid, generation);</div><div class='ctx'> 	else</div><div class='del'>-		nodemgr_update_node(ne, csr, hi, nodeid, generation);</div><div class='add'>+		nodemgr_update_node(ne, csr, nodeid, generation);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static void nodemgr_node_scan(struct host_info *hi, int generation)</div><div class='add'>+static void nodemgr_node_scan(struct hpsb_host *host, int generation)</div><div class='ctx'> {</div><div class='ctx'> 	int count;</div><div class='del'>-	struct hpsb_host *host = hi-&gt;host;</div><div class='ctx'> 	struct selfid *sid = (struct selfid *)host-&gt;topology_map;</div><div class='ctx'> 	nodeid_t nodeid = LOCAL_BUS;</div><div class='ctx'> </div><div class='hunk'>@@ -1395,89 +1368,26 @@ static void nodemgr_node_scan(struct host_info *hi, int generation)</div><div class='ctx'> 			nodeid++;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='del'>-		nodemgr_node_scan_one(hi, nodeid++, generation);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __nodemgr_driver_suspend(struct device *dev, void *data)</div><div class='del'>-{</div><div class='del'>-	struct unit_directory *ud;</div><div class='del'>-	struct device_driver *drv;</div><div class='del'>-	struct node_entry *ne = (struct node_entry *)data;</div><div class='del'>-	int error;</div><div class='del'>-</div><div class='del'>-	ud = container_of(dev, struct unit_directory, unit_dev);</div><div class='del'>-	if (ud-&gt;ne == ne) {</div><div class='del'>-		drv = get_driver(ud-&gt;device.driver);</div><div class='del'>-		if (drv) {</div><div class='del'>-			error = 1; /* release if suspend is not implemented */</div><div class='del'>-			if (drv-&gt;suspend) {</div><div class='del'>-				down(&amp;ud-&gt;device.sem);</div><div class='del'>-				error = drv-&gt;suspend(&amp;ud-&gt;device, PMSG_SUSPEND);</div><div class='del'>-				up(&amp;ud-&gt;device.sem);</div><div class='del'>-			}</div><div class='del'>-			if (error)</div><div class='del'>-				device_release_driver(&amp;ud-&gt;device);</div><div class='del'>-			put_driver(drv);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __nodemgr_driver_resume(struct device *dev, void *data)</div><div class='del'>-{</div><div class='del'>-	struct unit_directory *ud;</div><div class='del'>-	struct device_driver *drv;</div><div class='del'>-	struct node_entry *ne = (struct node_entry *)data;</div><div class='del'>-</div><div class='del'>-	ud = container_of(dev, struct unit_directory, unit_dev);</div><div class='del'>-	if (ud-&gt;ne == ne) {</div><div class='del'>-		drv = get_driver(ud-&gt;device.driver);</div><div class='del'>-		if (drv) {</div><div class='del'>-			if (drv-&gt;resume) {</div><div class='del'>-				down(&amp;ud-&gt;device.sem);</div><div class='del'>-				drv-&gt;resume(&amp;ud-&gt;device);</div><div class='del'>-				up(&amp;ud-&gt;device.sem);</div><div class='del'>-			}</div><div class='del'>-			put_driver(drv);</div><div class='del'>-		}</div><div class='add'>+		nodemgr_node_scan_one(host, nodeid++, generation);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void nodemgr_suspend_ne(struct node_entry *ne)</div><div class='add'>+static void nodemgr_pause_ne(struct node_entry *ne)</div><div class='ctx'> {</div><div class='del'>-	HPSB_DEBUG("Node suspended: ID:BUS[" NODE_BUS_FMT "]  GUID[%016Lx]",</div><div class='add'>+	HPSB_DEBUG("Node paused: ID:BUS[" NODE_BUS_FMT "]  GUID[%016Lx]",</div><div class='ctx'> 		   NODE_BUS_ARGS(ne-&gt;host, ne-&gt;nodeid),</div><div class='ctx'> 		   (unsigned long long)ne-&gt;guid);</div><div class='ctx'> </div><div class='del'>-	ne-&gt;in_limbo = 1;</div><div class='add'>+	ne-&gt;in_limbo = true;</div><div class='ctx'> 	WARN_ON(device_create_file(&amp;ne-&gt;device, &amp;dev_attr_ne_in_limbo));</div><div class='del'>-</div><div class='del'>-	class_for_each_device(&amp;nodemgr_ud_class, NULL, ne,</div><div class='del'>-			      __nodemgr_driver_suspend);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void nodemgr_resume_ne(struct node_entry *ne)</div><div class='del'>-{</div><div class='del'>-	ne-&gt;in_limbo = 0;</div><div class='del'>-	device_remove_file(&amp;ne-&gt;device, &amp;dev_attr_ne_in_limbo);</div><div class='del'>-</div><div class='del'>-	class_for_each_device(&amp;nodemgr_ud_class, NULL, ne,</div><div class='del'>-			      __nodemgr_driver_resume);</div><div class='del'>-	HPSB_DEBUG("Node resumed: ID:BUS[" NODE_BUS_FMT "]  GUID[%016Lx]",</div><div class='del'>-		   NODE_BUS_ARGS(ne-&gt;host, ne-&gt;nodeid), (unsigned long long)ne-&gt;guid);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __nodemgr_update_pdrv(struct device *dev, void *data)</div><div class='add'>+static int update_pdrv(struct device *dev, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct unit_directory *ud;</div><div class='ctx'> 	struct device_driver *drv;</div><div class='ctx'> 	struct hpsb_protocol_driver *pdrv;</div><div class='del'>-	struct node_entry *ne = (struct node_entry *)data;</div><div class='add'>+	struct node_entry *ne = data;</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='ctx'> 	ud = container_of(dev, struct unit_directory, unit_dev);</div><div class='hunk'>@@ -1503,11 +1413,9 @@ static int __nodemgr_update_pdrv(struct device *dev, void *data)</div><div class='ctx'> </div><div class='ctx'> static void nodemgr_update_pdrv(struct node_entry *ne)</div><div class='ctx'> {</div><div class='del'>-	class_for_each_device(&amp;nodemgr_ud_class, NULL, ne,</div><div class='del'>-			      __nodemgr_update_pdrv);</div><div class='add'>+	class_for_each_device(&amp;nodemgr_ud_class, NULL, ne, update_pdrv);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /* Write the BROADCAST_CHANNEL as per IEEE1394a 8.3.2.3.11 and 8.4.2.3.  This</div><div class='ctx'>  * seems like an optional service but in the end it is practically mandatory</div><div class='ctx'>  * as a consequence of these clauses.</div><div class='hunk'>@@ -1535,11 +1443,12 @@ static void nodemgr_irm_write_bc(struct node_entry *ne, int generation)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static void nodemgr_probe_ne(struct host_info *hi, struct node_entry *ne, int generation)</div><div class='add'>+static void nodemgr_probe_ne(struct hpsb_host *host, struct node_entry *ne,</div><div class='add'>+			     int generation)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev;</div><div class='ctx'> </div><div class='del'>-	if (ne-&gt;host != hi-&gt;host || ne-&gt;in_limbo)</div><div class='add'>+	if (ne-&gt;host != host || ne-&gt;in_limbo)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	dev = get_device(&amp;ne-&gt;device);</div><div class='hunk'>@@ -1554,40 +1463,40 @@ static void nodemgr_probe_ne(struct host_info *hi, struct node_entry *ne, int ge</div><div class='ctx'> 	 * down to the drivers. Otherwise, this is a dead node and we</div><div class='ctx'> 	 * suspend it. */</div><div class='ctx'> 	if (ne-&gt;needs_probe)</div><div class='del'>-		nodemgr_process_root_directory(hi, ne);</div><div class='add'>+		nodemgr_process_root_directory(ne);</div><div class='ctx'> 	else if (ne-&gt;generation == generation)</div><div class='ctx'> 		nodemgr_update_pdrv(ne);</div><div class='ctx'> 	else</div><div class='del'>-		nodemgr_suspend_ne(ne);</div><div class='add'>+		nodemgr_pause_ne(ne);</div><div class='ctx'> </div><div class='ctx'> 	put_device(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct probe_param {</div><div class='del'>-	struct host_info *hi;</div><div class='add'>+struct node_probe_parameter {</div><div class='add'>+	struct hpsb_host *host;</div><div class='ctx'> 	int generation;</div><div class='ctx'> 	bool probe_now;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int node_probe(struct device *dev, void *data)</div><div class='ctx'> {</div><div class='del'>-	struct probe_param *p = data;</div><div class='add'>+	struct node_probe_parameter *p = data;</div><div class='ctx'> 	struct node_entry *ne;</div><div class='ctx'> </div><div class='del'>-	if (p-&gt;generation != get_hpsb_generation(p-&gt;hi-&gt;host))</div><div class='add'>+	if (p-&gt;generation != get_hpsb_generation(p-&gt;host))</div><div class='ctx'> 		return -EAGAIN;</div><div class='ctx'> </div><div class='ctx'> 	ne = container_of(dev, struct node_entry, node_dev);</div><div class='ctx'> 	if (ne-&gt;needs_probe == p-&gt;probe_now)</div><div class='del'>-		nodemgr_probe_ne(p-&gt;hi, ne, p-&gt;generation);</div><div class='add'>+		nodemgr_probe_ne(p-&gt;host, ne, p-&gt;generation);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void nodemgr_node_probe(struct host_info *hi, int generation)</div><div class='add'>+static int nodemgr_node_probe(struct hpsb_host *host, int generation)</div><div class='ctx'> {</div><div class='del'>-	struct probe_param p;</div><div class='add'>+	struct node_probe_parameter p;</div><div class='ctx'> </div><div class='del'>-	p.hi = hi;</div><div class='add'>+	p.host = host;</div><div class='ctx'> 	p.generation = generation;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Do some processing of the nodes we've probed. This pulls them</div><div class='hunk'>@@ -1604,11 +1513,11 @@ static void nodemgr_node_probe(struct host_info *hi, int generation)</div><div class='ctx'> 	 */</div><div class='ctx'> 	p.probe_now = false;</div><div class='ctx'> 	if (class_for_each_device(&amp;nodemgr_ne_class, NULL, &amp;p, node_probe) != 0)</div><div class='del'>-		return;</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	p.probe_now = true;</div><div class='ctx'> 	if (class_for_each_device(&amp;nodemgr_ne_class, NULL, &amp;p, node_probe) != 0)</div><div class='del'>-		return;</div><div class='add'>+		return 0;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Now let's tell the bus to rescan our devices. This may seem</div><div class='ctx'> 	 * like overhead, but the driver-model core will only scan a</div><div class='hunk'>@@ -1620,6 +1529,27 @@ static void nodemgr_node_probe(struct host_info *hi, int generation)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (bus_rescan_devices(&amp;ieee1394_bus_type) != 0)</div><div class='ctx'> 		HPSB_DEBUG("bus_rescan_devices had an error");</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int remove_nodes_in_limbo(struct device *dev, void *data)</div><div class='add'>+{</div><div class='add'>+	struct node_entry *ne;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;bus != &amp;ieee1394_bus_type)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ne = container_of(dev, struct node_entry, device);</div><div class='add'>+	if (ne-&gt;in_limbo)</div><div class='add'>+		nodemgr_remove_ne(ne);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nodemgr_remove_nodes_in_limbo(struct hpsb_host *host)</div><div class='add'>+{</div><div class='add'>+	device_for_each_child(&amp;host-&gt;device, NULL, remove_nodes_in_limbo);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int nodemgr_send_resume_packet(struct hpsb_host *host)</div><div class='hunk'>@@ -1730,10 +1660,9 @@ static int nodemgr_check_irm_capability(struct hpsb_host *host, int cycles)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int nodemgr_host_thread(void *__hi)</div><div class='add'>+static int nodemgr_host_thread(void *data)</div><div class='ctx'> {</div><div class='del'>-	struct host_info *hi = (struct host_info *)__hi;</div><div class='del'>-	struct hpsb_host *host = hi-&gt;host;</div><div class='add'>+	struct hpsb_host *host = data;</div><div class='ctx'> 	unsigned int g, generation = 0;</div><div class='ctx'> 	int i, reset_cycles = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1787,36 +1716,48 @@ static int nodemgr_host_thread(void *__hi)</div><div class='ctx'> 		 * entries. This does not do the sysfs stuff, since that</div><div class='ctx'> 		 * would trigger uevents and such, which is a bad idea at</div><div class='ctx'> 		 * this point. */</div><div class='del'>-		nodemgr_node_scan(hi, generation);</div><div class='add'>+		nodemgr_node_scan(host, generation);</div><div class='ctx'> </div><div class='ctx'> 		/* This actually does the full probe, with sysfs</div><div class='ctx'> 		 * registration. */</div><div class='del'>-		nodemgr_node_probe(hi, generation);</div><div class='add'>+		if (!nodemgr_node_probe(host, generation))</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='ctx'> 		/* Update some of our sysfs symlinks */</div><div class='ctx'> 		nodemgr_update_host_dev_links(host);</div><div class='add'>+</div><div class='add'>+		/* Sleep 3 seconds */</div><div class='add'>+		for (i = 3000/200; i; i--) {</div><div class='add'>+			msleep_interruptible(200);</div><div class='add'>+			if (kthread_should_stop())</div><div class='add'>+				goto exit;</div><div class='add'>+</div><div class='add'>+			if (generation != get_hpsb_generation(host))</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+		/* Remove nodes which are gone, unless a bus reset happened */</div><div class='add'>+		if (!i)</div><div class='add'>+			nodemgr_remove_nodes_in_limbo(host);</div><div class='ctx'> 	}</div><div class='ctx'> exit:</div><div class='ctx'> 	HPSB_VERBOSE("NodeMgr: Exiting thread");</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct host_iter_param {</div><div class='add'>+struct per_host_parameter {</div><div class='ctx'> 	void *data;</div><div class='ctx'> 	int (*cb)(struct hpsb_host *, void *);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __nodemgr_for_each_host(struct device *dev, void *data)</div><div class='add'>+static int per_host(struct device *dev, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpsb_host *host;</div><div class='del'>-	struct host_iter_param *hip = (struct host_iter_param *)data;</div><div class='del'>-	int error = 0;</div><div class='add'>+	struct per_host_parameter *p = data;</div><div class='ctx'> </div><div class='ctx'> 	host = container_of(dev, struct hpsb_host, host_dev);</div><div class='del'>-	error = hip-&gt;cb(host, hip-&gt;data);</div><div class='del'>-</div><div class='del'>-	return error;</div><div class='add'>+	return p-&gt;cb(host, p-&gt;data);</div><div class='ctx'> }</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * nodemgr_for_each_host - call a function for each IEEE 1394 host</div><div class='ctx'>  * @data: an address to supply to the callback</div><div class='hunk'>@@ -1831,15 +1772,11 @@ static int __nodemgr_for_each_host(struct device *dev, void *data)</div><div class='ctx'>  */</div><div class='ctx'> int nodemgr_for_each_host(void *data, int (*cb)(struct hpsb_host *, void *))</div><div class='ctx'> {</div><div class='del'>-	struct host_iter_param hip;</div><div class='del'>-	int error;</div><div class='del'>-</div><div class='del'>-	hip.cb = cb;</div><div class='del'>-	hip.data = data;</div><div class='del'>-	error = class_for_each_device(&amp;hpsb_host_class, NULL, &amp;hip,</div><div class='del'>-				      __nodemgr_for_each_host);</div><div class='add'>+	struct per_host_parameter p;</div><div class='ctx'> </div><div class='del'>-	return error;</div><div class='add'>+	p.cb = cb;</div><div class='add'>+	p.data = data;</div><div class='add'>+	return class_for_each_device(&amp;hpsb_host_class, NULL, &amp;p, per_host);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* The following two convenience functions use a struct node_entry</div><div class='hunk'>@@ -1893,7 +1830,7 @@ static void nodemgr_add_host(struct hpsb_host *host)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	hi-&gt;host = host;</div><div class='del'>-	hi-&gt;thread = kthread_run(nodemgr_host_thread, hi, "knodemgrd_%d",</div><div class='add'>+	hi-&gt;thread = kthread_run(nodemgr_host_thread, host, "knodemgrd_%d",</div><div class='ctx'> 				 host-&gt;id);</div><div class='ctx'> 	if (IS_ERR(hi-&gt;thread)) {</div><div class='ctx'> 		HPSB_ERR("NodeMgr: cannot start thread for host %d", host-&gt;id);</div><div class='head'>diff --git a/drivers/ieee1394/nodemgr.h b/drivers/ieee1394/nodemgr.h<br/>index 6eb26465a84c..4f287a3561ba 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ieee1394/nodemgr.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ieee1394/nodemgr.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ieee1394/nodemgr.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ieee1394/nodemgr.h</a></div><div class='hunk'>@@ -110,7 +110,7 @@ struct node_entry {</div><div class='ctx'> 	struct device node_dev;</div><div class='ctx'> </div><div class='ctx'> 	/* Means this node is not attached anymore */</div><div class='del'>-	int in_limbo;</div><div class='add'>+	bool in_limbo;</div><div class='ctx'> </div><div class='ctx'> 	struct csr1212_csr *csr;</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/ieee1394/raw1394-private.h b/drivers/ieee1394/raw1394-private.h<br/>index a06aaad5b448..7a225a405987 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ieee1394/raw1394-private.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ieee1394/raw1394-private.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ieee1394/raw1394-private.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ieee1394/raw1394-private.h</a></div><div class='hunk'>@@ -22,6 +22,7 @@ enum raw1394_iso_state { RAW1394_ISO_INACTIVE = 0,</div><div class='ctx'> struct file_info {</div><div class='ctx'>         struct list_head list;</div><div class='ctx'> </div><div class='add'>+	struct mutex state_mutex;</div><div class='ctx'>         enum { opened, initialized, connected } state;</div><div class='ctx'>         unsigned int protocol_version;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/ieee1394/raw1394.c b/drivers/ieee1394/raw1394.c<br/>index 6fa9e4a21840..9f19ac492106 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ieee1394/raw1394.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ieee1394/raw1394.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ieee1394/raw1394.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ieee1394/raw1394.c</a></div><div class='hunk'>@@ -34,6 +34,7 @@</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/poll.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='hunk'>@@ -2267,6 +2268,8 @@ static ssize_t raw1394_write(struct file *file, const char __user * buffer,</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	mutex_lock(&amp;fi-&gt;state_mutex);</div><div class='add'>+</div><div class='ctx'> 	switch (fi-&gt;state) {</div><div class='ctx'> 	case opened:</div><div class='ctx'> 		retval = state_opened(fi, req);</div><div class='hunk'>@@ -2281,6 +2284,8 @@ static ssize_t raw1394_write(struct file *file, const char __user * buffer,</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	mutex_unlock(&amp;fi-&gt;state_mutex);</div><div class='add'>+</div><div class='ctx'> 	if (retval &lt; 0) {</div><div class='ctx'> 		free_pending_request(req);</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -2541,109 +2546,120 @@ static int raw1394_read_cycle_timer(struct file_info *fi, void __user * uaddr)</div><div class='ctx'> static int raw1394_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='ctx'> {</div><div class='ctx'> 	struct file_info *fi = file-&gt;private_data;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;fi-&gt;state_mutex);</div><div class='ctx'> </div><div class='ctx'> 	if (fi-&gt;iso_state == RAW1394_ISO_INACTIVE)</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+	else</div><div class='add'>+		ret = dma_region_mmap(&amp;fi-&gt;iso_handle-&gt;data_buf, file, vma);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;fi-&gt;state_mutex);</div><div class='ctx'> </div><div class='del'>-	return dma_region_mmap(&amp;fi-&gt;iso_handle-&gt;data_buf, file, vma);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* ioctl is only used for rawiso operations */</div><div class='del'>-static long do_raw1394_ioctl(struct file *file, unsigned int cmd,</div><div class='del'>-							unsigned long arg)</div><div class='add'>+static long raw1394_ioctl_inactive(struct file_info *fi, unsigned int cmd,</div><div class='add'>+				   void __user *argp)</div><div class='add'>+{</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case RAW1394_IOC_ISO_XMIT_INIT:</div><div class='add'>+		return raw1394_iso_xmit_init(fi, argp);</div><div class='add'>+	case RAW1394_IOC_ISO_RECV_INIT:</div><div class='add'>+		return raw1394_iso_recv_init(fi, argp);</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long raw1394_ioctl_recv(struct file_info *fi, unsigned int cmd,</div><div class='add'>+			       unsigned long arg)</div><div class='ctx'> {</div><div class='del'>-	struct file_info *fi = file-&gt;private_data;</div><div class='ctx'> 	void __user *argp = (void __user *)arg;</div><div class='ctx'> </div><div class='del'>-	switch (fi-&gt;iso_state) {</div><div class='del'>-	case RAW1394_ISO_INACTIVE:</div><div class='del'>-		switch (cmd) {</div><div class='del'>-		case RAW1394_IOC_ISO_XMIT_INIT:</div><div class='del'>-			return raw1394_iso_xmit_init(fi, argp);</div><div class='del'>-		case RAW1394_IOC_ISO_RECV_INIT:</div><div class='del'>-			return raw1394_iso_recv_init(fi, argp);</div><div class='del'>-		default:</div><div class='del'>-			break;</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case RAW1394_IOC_ISO_RECV_START:{</div><div class='add'>+			int args[3];</div><div class='add'>+</div><div class='add'>+			if (copy_from_user(&amp;args[0], argp, sizeof(args)))</div><div class='add'>+				return -EFAULT;</div><div class='add'>+			return hpsb_iso_recv_start(fi-&gt;iso_handle,</div><div class='add'>+						   args[0], args[1], args[2]);</div><div class='ctx'> 		}</div><div class='del'>-		break;</div><div class='del'>-	case RAW1394_ISO_RECV:</div><div class='del'>-		switch (cmd) {</div><div class='del'>-		case RAW1394_IOC_ISO_RECV_START:{</div><div class='del'>-				/* copy args from user-space */</div><div class='del'>-				int args[3];</div><div class='del'>-				if (copy_from_user</div><div class='del'>-				    (&amp;args[0], argp, sizeof(args)))</div><div class='del'>-					return -EFAULT;</div><div class='del'>-				return hpsb_iso_recv_start(fi-&gt;iso_handle,</div><div class='del'>-							   args[0], args[1],</div><div class='del'>-							   args[2]);</div><div class='del'>-			}</div><div class='del'>-		case RAW1394_IOC_ISO_XMIT_RECV_STOP:</div><div class='del'>-			hpsb_iso_stop(fi-&gt;iso_handle);</div><div class='del'>-			return 0;</div><div class='del'>-		case RAW1394_IOC_ISO_RECV_LISTEN_CHANNEL:</div><div class='del'>-			return hpsb_iso_recv_listen_channel(fi-&gt;iso_handle,</div><div class='del'>-							    arg);</div><div class='del'>-		case RAW1394_IOC_ISO_RECV_UNLISTEN_CHANNEL:</div><div class='del'>-			return hpsb_iso_recv_unlisten_channel(fi-&gt;iso_handle,</div><div class='del'>-							      arg);</div><div class='del'>-		case RAW1394_IOC_ISO_RECV_SET_CHANNEL_MASK:{</div><div class='del'>-				/* copy the u64 from user-space */</div><div class='del'>-				u64 mask;</div><div class='del'>-				if (copy_from_user(&amp;mask, argp, sizeof(mask)))</div><div class='del'>-					return -EFAULT;</div><div class='del'>-				return hpsb_iso_recv_set_channel_mask(fi-&gt;</div><div class='del'>-								      iso_handle,</div><div class='del'>-								      mask);</div><div class='del'>-			}</div><div class='del'>-		case RAW1394_IOC_ISO_GET_STATUS:</div><div class='del'>-			return raw1394_iso_get_status(fi, argp);</div><div class='del'>-		case RAW1394_IOC_ISO_RECV_PACKETS:</div><div class='del'>-			return raw1394_iso_recv_packets(fi, argp);</div><div class='del'>-		case RAW1394_IOC_ISO_RECV_RELEASE_PACKETS:</div><div class='del'>-			return hpsb_iso_recv_release_packets(fi-&gt;iso_handle,</div><div class='del'>-							     arg);</div><div class='del'>-		case RAW1394_IOC_ISO_RECV_FLUSH:</div><div class='del'>-			return hpsb_iso_recv_flush(fi-&gt;iso_handle);</div><div class='del'>-		case RAW1394_IOC_ISO_SHUTDOWN:</div><div class='del'>-			raw1394_iso_shutdown(fi);</div><div class='del'>-			return 0;</div><div class='del'>-		case RAW1394_IOC_ISO_QUEUE_ACTIVITY:</div><div class='del'>-			queue_rawiso_event(fi);</div><div class='del'>-			return 0;</div><div class='add'>+	case RAW1394_IOC_ISO_XMIT_RECV_STOP:</div><div class='add'>+		hpsb_iso_stop(fi-&gt;iso_handle);</div><div class='add'>+		return 0;</div><div class='add'>+	case RAW1394_IOC_ISO_RECV_LISTEN_CHANNEL:</div><div class='add'>+		return hpsb_iso_recv_listen_channel(fi-&gt;iso_handle, arg);</div><div class='add'>+	case RAW1394_IOC_ISO_RECV_UNLISTEN_CHANNEL:</div><div class='add'>+		return hpsb_iso_recv_unlisten_channel(fi-&gt;iso_handle, arg);</div><div class='add'>+	case RAW1394_IOC_ISO_RECV_SET_CHANNEL_MASK:{</div><div class='add'>+			u64 mask;</div><div class='add'>+</div><div class='add'>+			if (copy_from_user(&amp;mask, argp, sizeof(mask)))</div><div class='add'>+				return -EFAULT;</div><div class='add'>+			return hpsb_iso_recv_set_channel_mask(fi-&gt;iso_handle,</div><div class='add'>+							      mask);</div><div class='ctx'> 		}</div><div class='del'>-		break;</div><div class='del'>-	case RAW1394_ISO_XMIT:</div><div class='del'>-		switch (cmd) {</div><div class='del'>-		case RAW1394_IOC_ISO_XMIT_START:{</div><div class='del'>-				/* copy two ints from user-space */</div><div class='del'>-				int args[2];</div><div class='del'>-				if (copy_from_user</div><div class='del'>-				    (&amp;args[0], argp, sizeof(args)))</div><div class='del'>-					return -EFAULT;</div><div class='del'>-				return hpsb_iso_xmit_start(fi-&gt;iso_handle,</div><div class='del'>-							   args[0], args[1]);</div><div class='del'>-			}</div><div class='del'>-		case RAW1394_IOC_ISO_XMIT_SYNC:</div><div class='del'>-			return hpsb_iso_xmit_sync(fi-&gt;iso_handle);</div><div class='del'>-		case RAW1394_IOC_ISO_XMIT_RECV_STOP:</div><div class='del'>-			hpsb_iso_stop(fi-&gt;iso_handle);</div><div class='del'>-			return 0;</div><div class='del'>-		case RAW1394_IOC_ISO_GET_STATUS:</div><div class='del'>-			return raw1394_iso_get_status(fi, argp);</div><div class='del'>-		case RAW1394_IOC_ISO_XMIT_PACKETS:</div><div class='del'>-			return raw1394_iso_send_packets(fi, argp);</div><div class='del'>-		case RAW1394_IOC_ISO_SHUTDOWN:</div><div class='del'>-			raw1394_iso_shutdown(fi);</div><div class='del'>-			return 0;</div><div class='del'>-		case RAW1394_IOC_ISO_QUEUE_ACTIVITY:</div><div class='del'>-			queue_rawiso_event(fi);</div><div class='del'>-			return 0;</div><div class='add'>+	case RAW1394_IOC_ISO_GET_STATUS:</div><div class='add'>+		return raw1394_iso_get_status(fi, argp);</div><div class='add'>+	case RAW1394_IOC_ISO_RECV_PACKETS:</div><div class='add'>+		return raw1394_iso_recv_packets(fi, argp);</div><div class='add'>+	case RAW1394_IOC_ISO_RECV_RELEASE_PACKETS:</div><div class='add'>+		return hpsb_iso_recv_release_packets(fi-&gt;iso_handle, arg);</div><div class='add'>+	case RAW1394_IOC_ISO_RECV_FLUSH:</div><div class='add'>+		return hpsb_iso_recv_flush(fi-&gt;iso_handle);</div><div class='add'>+	case RAW1394_IOC_ISO_SHUTDOWN:</div><div class='add'>+		raw1394_iso_shutdown(fi);</div><div class='add'>+		return 0;</div><div class='add'>+	case RAW1394_IOC_ISO_QUEUE_ACTIVITY:</div><div class='add'>+		queue_rawiso_event(fi);</div><div class='add'>+		return 0;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long raw1394_ioctl_xmit(struct file_info *fi, unsigned int cmd,</div><div class='add'>+			       void __user *argp)</div><div class='add'>+{</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case RAW1394_IOC_ISO_XMIT_START:{</div><div class='add'>+			int args[2];</div><div class='add'>+</div><div class='add'>+			if (copy_from_user(&amp;args[0], argp, sizeof(args)))</div><div class='add'>+				return -EFAULT;</div><div class='add'>+			return hpsb_iso_xmit_start(fi-&gt;iso_handle,</div><div class='add'>+						   args[0], args[1]);</div><div class='ctx'> 		}</div><div class='del'>-		break;</div><div class='add'>+	case RAW1394_IOC_ISO_XMIT_SYNC:</div><div class='add'>+		return hpsb_iso_xmit_sync(fi-&gt;iso_handle);</div><div class='add'>+	case RAW1394_IOC_ISO_XMIT_RECV_STOP:</div><div class='add'>+		hpsb_iso_stop(fi-&gt;iso_handle);</div><div class='add'>+		return 0;</div><div class='add'>+	case RAW1394_IOC_ISO_GET_STATUS:</div><div class='add'>+		return raw1394_iso_get_status(fi, argp);</div><div class='add'>+	case RAW1394_IOC_ISO_XMIT_PACKETS:</div><div class='add'>+		return raw1394_iso_send_packets(fi, argp);</div><div class='add'>+	case RAW1394_IOC_ISO_SHUTDOWN:</div><div class='add'>+		raw1394_iso_shutdown(fi);</div><div class='add'>+		return 0;</div><div class='add'>+	case RAW1394_IOC_ISO_QUEUE_ACTIVITY:</div><div class='add'>+		queue_rawiso_event(fi);</div><div class='add'>+		return 0;</div><div class='ctx'> 	default:</div><div class='del'>-		break;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* ioctl is only used for rawiso operations */</div><div class='add'>+static long raw1394_ioctl(struct file *file, unsigned int cmd,</div><div class='add'>+			  unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	struct file_info *fi = file-&gt;private_data;</div><div class='add'>+	void __user *argp = (void __user *)arg;</div><div class='add'>+	long ret;</div><div class='ctx'> </div><div class='ctx'> 	/* state-independent commands */</div><div class='ctx'> 	switch(cmd) {</div><div class='hunk'>@@ -2653,16 +2669,25 @@ static long do_raw1394_ioctl(struct file *file, unsigned int cmd,</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return -EINVAL;</div><div class='del'>-}</div><div class='add'>+	mutex_lock(&amp;fi-&gt;state_mutex);</div><div class='add'>+</div><div class='add'>+	switch (fi-&gt;iso_state) {</div><div class='add'>+	case RAW1394_ISO_INACTIVE:</div><div class='add'>+		ret = raw1394_ioctl_inactive(fi, cmd, argp);</div><div class='add'>+		break;</div><div class='add'>+	case RAW1394_ISO_RECV:</div><div class='add'>+		ret = raw1394_ioctl_recv(fi, cmd, arg);</div><div class='add'>+		break;</div><div class='add'>+	case RAW1394_ISO_XMIT:</div><div class='add'>+		ret = raw1394_ioctl_xmit(fi, cmd, argp);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;fi-&gt;state_mutex);</div><div class='ctx'> </div><div class='del'>-static long raw1394_ioctl(struct file *file, unsigned int cmd,</div><div class='del'>-							unsigned long arg)</div><div class='del'>-{</div><div class='del'>-	long ret;</div><div class='del'>-	lock_kernel();</div><div class='del'>-	ret = do_raw1394_ioctl(file, cmd, arg);</div><div class='del'>-	unlock_kernel();</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2700,7 +2725,7 @@ static long raw1394_iso_xmit_recv_packets32(struct file *file, unsigned int cmd,</div><div class='ctx'> 	    !copy_from_user(&amp;infos32, &amp;arg-&gt;infos, sizeof infos32)) {</div><div class='ctx'> 		infos = compat_ptr(infos32);</div><div class='ctx'> 		if (!copy_to_user(&amp;dst-&gt;infos, &amp;infos, sizeof infos))</div><div class='del'>-			err = do_raw1394_ioctl(file, cmd, (unsigned long)dst);</div><div class='add'>+			err = raw1394_ioctl(file, cmd, (unsigned long)dst);</div><div class='ctx'> 	}</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -2724,7 +2749,6 @@ static long raw1394_compat_ioctl(struct file *file,</div><div class='ctx'> 	void __user *argp = (void __user *)arg;</div><div class='ctx'> 	long err;</div><div class='ctx'> </div><div class='del'>-	lock_kernel();</div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	/* These requests have same format as long as 'int' has same size. */</div><div class='ctx'> 	case RAW1394_IOC_ISO_RECV_INIT:</div><div class='hunk'>@@ -2741,7 +2765,7 @@ static long raw1394_compat_ioctl(struct file *file,</div><div class='ctx'> 	case RAW1394_IOC_ISO_GET_STATUS:</div><div class='ctx'> 	case RAW1394_IOC_ISO_SHUTDOWN:</div><div class='ctx'> 	case RAW1394_IOC_ISO_QUEUE_ACTIVITY:</div><div class='del'>-		err = do_raw1394_ioctl(file, cmd, arg);</div><div class='add'>+		err = raw1394_ioctl(file, cmd, arg);</div><div class='ctx'> 		break;</div><div class='ctx'> 	/* These request have different format. */</div><div class='ctx'> 	case RAW1394_IOC_ISO_RECV_PACKETS32:</div><div class='hunk'>@@ -2757,7 +2781,6 @@ static long raw1394_compat_ioctl(struct file *file,</div><div class='ctx'> 		err = -EINVAL;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	unlock_kernel();</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -2791,6 +2814,7 @@ static int raw1394_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	fi-&gt;notification = (u8) RAW1394_NOTIFY_ON;	/* busreset notification */</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;fi-&gt;list);</div><div class='add'>+	mutex_init(&amp;fi-&gt;state_mutex);</div><div class='ctx'> 	fi-&gt;state = opened;</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;fi-&gt;req_pending);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;fi-&gt;req_complete);</div><div class='hunk'>@@ -3010,10 +3034,10 @@ static int __init init_raw1394(void)</div><div class='ctx'> 	hpsb_register_highlevel(&amp;raw1394_highlevel);</div><div class='ctx'> </div><div class='ctx'> 	if (IS_ERR</div><div class='del'>-	    (device_create_drvdata(</div><div class='del'>-	      hpsb_protocol_class, NULL,</div><div class='del'>-	      MKDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_RAW1394 * 16),</div><div class='del'>-	      NULL, RAW1394_DEVICE_NAME))) {</div><div class='add'>+	    (device_create(hpsb_protocol_class, NULL,</div><div class='add'>+			   MKDEV(IEEE1394_MAJOR,</div><div class='add'>+				 IEEE1394_MINOR_BLOCK_RAW1394 * 16),</div><div class='add'>+			   NULL, RAW1394_DEVICE_NAME))) {</div><div class='ctx'> 		ret = -EFAULT;</div><div class='ctx'> 		goto out_unreg;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c<br/>index 1d6ad3435537..c52f6e6e8af2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ieee1394/sbp2.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ieee1394/sbp2.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ieee1394/sbp2.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ieee1394/sbp2.c</a></div><div class='hunk'>@@ -526,26 +526,41 @@ static void sbp2util_write_doorbell(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> static int sbp2util_create_command_orb_pool(struct sbp2_lu *lu)</div><div class='ctx'> {</div><div class='del'>-	struct sbp2_fwhost_info *hi = lu-&gt;hi;</div><div class='ctx'> 	struct sbp2_command_info *cmd;</div><div class='add'>+	struct device *dmadev = lu-&gt;hi-&gt;host-&gt;device.parent;</div><div class='ctx'> 	int i, orbs = sbp2_serialize_io ? 2 : SBP2_MAX_CMDS;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; orbs; i++) {</div><div class='ctx'> 		cmd = kzalloc(sizeof(*cmd), GFP_KERNEL);</div><div class='ctx'> 		if (!cmd)</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		cmd-&gt;command_orb_dma = dma_map_single(hi-&gt;host-&gt;device.parent,</div><div class='del'>-						&amp;cmd-&gt;command_orb,</div><div class='del'>-						sizeof(struct sbp2_command_orb),</div><div class='del'>-						DMA_TO_DEVICE);</div><div class='del'>-		cmd-&gt;sge_dma = dma_map_single(hi-&gt;host-&gt;device.parent,</div><div class='del'>-					&amp;cmd-&gt;scatter_gather_element,</div><div class='del'>-					sizeof(cmd-&gt;scatter_gather_element),</div><div class='del'>-					DMA_TO_DEVICE);</div><div class='add'>+			goto failed_alloc;</div><div class='add'>+</div><div class='add'>+		cmd-&gt;command_orb_dma =</div><div class='add'>+		    dma_map_single(dmadev, &amp;cmd-&gt;command_orb,</div><div class='add'>+				   sizeof(struct sbp2_command_orb),</div><div class='add'>+				   DMA_TO_DEVICE);</div><div class='add'>+		if (dma_mapping_error(dmadev, cmd-&gt;command_orb_dma))</div><div class='add'>+			goto failed_orb;</div><div class='add'>+</div><div class='add'>+		cmd-&gt;sge_dma =</div><div class='add'>+		    dma_map_single(dmadev, &amp;cmd-&gt;scatter_gather_element,</div><div class='add'>+				   sizeof(cmd-&gt;scatter_gather_element),</div><div class='add'>+				   DMA_TO_DEVICE);</div><div class='add'>+		if (dma_mapping_error(dmadev, cmd-&gt;sge_dma))</div><div class='add'>+			goto failed_sge;</div><div class='add'>+</div><div class='ctx'> 		INIT_LIST_HEAD(&amp;cmd-&gt;list);</div><div class='ctx'> 		list_add_tail(&amp;cmd-&gt;list, &amp;lu-&gt;cmd_orb_completed);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+failed_sge:</div><div class='add'>+	dma_unmap_single(dmadev, cmd-&gt;command_orb_dma,</div><div class='add'>+			 sizeof(struct sbp2_command_orb), DMA_TO_DEVICE);</div><div class='add'>+failed_orb:</div><div class='add'>+	kfree(cmd);</div><div class='add'>+failed_alloc:</div><div class='add'>+	return -ENOMEM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sbp2util_remove_command_orb_pool(struct sbp2_lu *lu,</div><div class='hunk'>@@ -641,24 +656,11 @@ static struct sbp2_command_info *sbp2util_allocate_command_orb(</div><div class='ctx'> static void sbp2util_mark_command_completed(struct sbp2_lu *lu,</div><div class='ctx'> 					    struct sbp2_command_info *cmd)</div><div class='ctx'> {</div><div class='del'>-	struct hpsb_host *host = lu-&gt;ud-&gt;ne-&gt;host;</div><div class='del'>-</div><div class='del'>-	if (cmd-&gt;cmd_dma) {</div><div class='del'>-		if (cmd-&gt;dma_type == CMD_DMA_SINGLE)</div><div class='del'>-			dma_unmap_single(host-&gt;device.parent, cmd-&gt;cmd_dma,</div><div class='del'>-					 cmd-&gt;dma_size, cmd-&gt;dma_dir);</div><div class='del'>-		else if (cmd-&gt;dma_type == CMD_DMA_PAGE)</div><div class='del'>-			dma_unmap_page(host-&gt;device.parent, cmd-&gt;cmd_dma,</div><div class='del'>-				       cmd-&gt;dma_size, cmd-&gt;dma_dir);</div><div class='del'>-		/* XXX: Check for CMD_DMA_NONE bug */</div><div class='del'>-		cmd-&gt;dma_type = CMD_DMA_NONE;</div><div class='del'>-		cmd-&gt;cmd_dma = 0;</div><div class='del'>-	}</div><div class='del'>-	if (cmd-&gt;sge_buffer) {</div><div class='del'>-		dma_unmap_sg(host-&gt;device.parent, cmd-&gt;sge_buffer,</div><div class='del'>-			     cmd-&gt;dma_size, cmd-&gt;dma_dir);</div><div class='del'>-		cmd-&gt;sge_buffer = NULL;</div><div class='del'>-	}</div><div class='add'>+	if (scsi_sg_count(cmd-&gt;Current_SCpnt))</div><div class='add'>+		dma_unmap_sg(lu-&gt;ud-&gt;ne-&gt;host-&gt;device.parent,</div><div class='add'>+			     scsi_sglist(cmd-&gt;Current_SCpnt),</div><div class='add'>+			     scsi_sg_count(cmd-&gt;Current_SCpnt),</div><div class='add'>+			     cmd-&gt;Current_SCpnt-&gt;sc_data_direction);</div><div class='ctx'> 	list_move_tail(&amp;cmd-&gt;list, &amp;lu-&gt;cmd_orb_completed);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -823,6 +825,10 @@ static struct sbp2_lu *sbp2_alloc_device(struct unit_directory *ud)</div><div class='ctx'> #endif</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (dma_get_max_seg_size(hi-&gt;host-&gt;device.parent) &gt; SBP2_MAX_SEG_SIZE)</div><div class='add'>+		BUG_ON(dma_set_max_seg_size(hi-&gt;host-&gt;device.parent,</div><div class='add'>+					    SBP2_MAX_SEG_SIZE));</div><div class='add'>+</div><div class='ctx'> 	/* Prevent unloading of the 1394 host */</div><div class='ctx'> 	if (!try_module_get(hi-&gt;host-&gt;driver-&gt;owner)) {</div><div class='ctx'> 		SBP2_ERR("failed to get a reference on 1394 host driver");</div><div class='hunk'>@@ -1494,84 +1500,65 @@ static int sbp2_agent_reset(struct sbp2_lu *lu, int wait)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void sbp2_prep_command_orb_sg(struct sbp2_command_orb *orb,</div><div class='del'>-				     struct sbp2_fwhost_info *hi,</div><div class='del'>-				     struct sbp2_command_info *cmd,</div><div class='del'>-				     unsigned int scsi_use_sg,</div><div class='del'>-				     struct scatterlist *sg,</div><div class='del'>-				     u32 orb_direction,</div><div class='del'>-				     enum dma_data_direction dma_dir)</div><div class='add'>+static int sbp2_prep_command_orb_sg(struct sbp2_command_orb *orb,</div><div class='add'>+				    struct sbp2_fwhost_info *hi,</div><div class='add'>+				    struct sbp2_command_info *cmd,</div><div class='add'>+				    unsigned int sg_count,</div><div class='add'>+				    struct scatterlist *sg,</div><div class='add'>+				    u32 orb_direction,</div><div class='add'>+				    enum dma_data_direction dma_dir)</div><div class='ctx'> {</div><div class='del'>-	cmd-&gt;dma_dir = dma_dir;</div><div class='add'>+	struct device *dmadev = hi-&gt;host-&gt;device.parent;</div><div class='add'>+	struct sbp2_unrestricted_page_table *pt;</div><div class='add'>+	int i, n;</div><div class='add'>+</div><div class='add'>+	n = dma_map_sg(dmadev, sg, sg_count, dma_dir);</div><div class='add'>+	if (n == 0)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='ctx'> 	orb-&gt;data_descriptor_hi = ORB_SET_NODE_ID(hi-&gt;host-&gt;node_id);</div><div class='ctx'> 	orb-&gt;misc |= ORB_SET_DIRECTION(orb_direction);</div><div class='ctx'> </div><div class='ctx'> 	/* special case if only one element (and less than 64KB in size) */</div><div class='del'>-	if (scsi_use_sg == 1 &amp;&amp; sg-&gt;length &lt;= SBP2_MAX_SG_ELEMENT_LENGTH) {</div><div class='del'>-</div><div class='del'>-		cmd-&gt;dma_size = sg-&gt;length;</div><div class='del'>-		cmd-&gt;dma_type = CMD_DMA_PAGE;</div><div class='del'>-		cmd-&gt;cmd_dma = dma_map_page(hi-&gt;host-&gt;device.parent,</div><div class='del'>-					    sg_page(sg), sg-&gt;offset,</div><div class='del'>-					    cmd-&gt;dma_size, cmd-&gt;dma_dir);</div><div class='del'>-</div><div class='del'>-		orb-&gt;data_descriptor_lo = cmd-&gt;cmd_dma;</div><div class='del'>-		orb-&gt;misc |= ORB_SET_DATA_SIZE(cmd-&gt;dma_size);</div><div class='del'>-</div><div class='add'>+	if (n == 1) {</div><div class='add'>+		orb-&gt;misc |= ORB_SET_DATA_SIZE(sg_dma_len(sg));</div><div class='add'>+		orb-&gt;data_descriptor_lo = sg_dma_address(sg);</div><div class='ctx'> 	} else {</div><div class='del'>-		struct sbp2_unrestricted_page_table *sg_element =</div><div class='del'>-						&amp;cmd-&gt;scatter_gather_element[0];</div><div class='del'>-		u32 sg_count, sg_len;</div><div class='del'>-		dma_addr_t sg_addr;</div><div class='del'>-		int i, count = dma_map_sg(hi-&gt;host-&gt;device.parent, sg,</div><div class='del'>-					  scsi_use_sg, dma_dir);</div><div class='del'>-</div><div class='del'>-		cmd-&gt;dma_size = scsi_use_sg;</div><div class='del'>-		cmd-&gt;sge_buffer = sg;</div><div class='del'>-</div><div class='del'>-		/* use page tables (s/g) */</div><div class='del'>-		orb-&gt;misc |= ORB_SET_PAGE_TABLE_PRESENT(0x1);</div><div class='del'>-		orb-&gt;data_descriptor_lo = cmd-&gt;sge_dma;</div><div class='add'>+		pt = &amp;cmd-&gt;scatter_gather_element[0];</div><div class='ctx'> </div><div class='del'>-		/* loop through and fill out our SBP-2 page tables</div><div class='del'>-		 * (and split up anything too large) */</div><div class='del'>-		for (i = 0, sg_count = 0; i &lt; count; i++, sg = sg_next(sg)) {</div><div class='del'>-			sg_len = sg_dma_len(sg);</div><div class='del'>-			sg_addr = sg_dma_address(sg);</div><div class='del'>-			while (sg_len) {</div><div class='del'>-				sg_element[sg_count].segment_base_lo = sg_addr;</div><div class='del'>-				if (sg_len &gt; SBP2_MAX_SG_ELEMENT_LENGTH) {</div><div class='del'>-					sg_element[sg_count].length_segment_base_hi =</div><div class='del'>-						PAGE_TABLE_SET_SEGMENT_LENGTH(SBP2_MAX_SG_ELEMENT_LENGTH);</div><div class='del'>-					sg_addr += SBP2_MAX_SG_ELEMENT_LENGTH;</div><div class='del'>-					sg_len -= SBP2_MAX_SG_ELEMENT_LENGTH;</div><div class='del'>-				} else {</div><div class='del'>-					sg_element[sg_count].length_segment_base_hi =</div><div class='del'>-						PAGE_TABLE_SET_SEGMENT_LENGTH(sg_len);</div><div class='del'>-					sg_len = 0;</div><div class='del'>-				}</div><div class='del'>-				sg_count++;</div><div class='del'>-			}</div><div class='add'>+		dma_sync_single_for_cpu(dmadev, cmd-&gt;sge_dma,</div><div class='add'>+					sizeof(cmd-&gt;scatter_gather_element),</div><div class='add'>+					DMA_TO_DEVICE);</div><div class='add'>+</div><div class='add'>+		for_each_sg(sg, sg, n, i) {</div><div class='add'>+			pt[i].high = cpu_to_be32(sg_dma_len(sg) &lt;&lt; 16);</div><div class='add'>+			pt[i].low = cpu_to_be32(sg_dma_address(sg));</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		orb-&gt;misc |= ORB_SET_DATA_SIZE(sg_count);</div><div class='add'>+		orb-&gt;misc |= ORB_SET_PAGE_TABLE_PRESENT(0x1) |</div><div class='add'>+			     ORB_SET_DATA_SIZE(n);</div><div class='add'>+		orb-&gt;data_descriptor_lo = cmd-&gt;sge_dma;</div><div class='ctx'> </div><div class='del'>-		sbp2util_cpu_to_be32_buffer(sg_element,</div><div class='del'>-				(sizeof(struct sbp2_unrestricted_page_table)) *</div><div class='del'>-				sg_count);</div><div class='add'>+		dma_sync_single_for_device(dmadev, cmd-&gt;sge_dma,</div><div class='add'>+					   sizeof(cmd-&gt;scatter_gather_element),</div><div class='add'>+					   DMA_TO_DEVICE);</div><div class='ctx'> 	}</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void sbp2_create_command_orb(struct sbp2_lu *lu,</div><div class='del'>-				    struct sbp2_command_info *cmd,</div><div class='del'>-				    struct scsi_cmnd *SCpnt)</div><div class='add'>+static int sbp2_create_command_orb(struct sbp2_lu *lu,</div><div class='add'>+				   struct sbp2_command_info *cmd,</div><div class='add'>+				   struct scsi_cmnd *SCpnt)</div><div class='ctx'> {</div><div class='del'>-	struct sbp2_fwhost_info *hi = lu-&gt;hi;</div><div class='add'>+	struct device *dmadev = lu-&gt;hi-&gt;host-&gt;device.parent;</div><div class='ctx'> 	struct sbp2_command_orb *orb = &amp;cmd-&gt;command_orb;</div><div class='del'>-	u32 orb_direction;</div><div class='ctx'> 	unsigned int scsi_request_bufflen = scsi_bufflen(SCpnt);</div><div class='ctx'> 	enum dma_data_direction dma_dir = SCpnt-&gt;sc_data_direction;</div><div class='add'>+	u32 orb_direction;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='add'>+	dma_sync_single_for_cpu(dmadev, cmd-&gt;command_orb_dma,</div><div class='add'>+				sizeof(struct sbp2_command_orb), DMA_TO_DEVICE);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Set-up our command ORB.</div><div class='ctx'> 	 *</div><div class='hunk'>@@ -1602,15 +1589,21 @@ static void sbp2_create_command_orb(struct sbp2_lu *lu,</div><div class='ctx'> 		orb-&gt;data_descriptor_hi = 0x0;</div><div class='ctx'> 		orb-&gt;data_descriptor_lo = 0x0;</div><div class='ctx'> 		orb-&gt;misc |= ORB_SET_DIRECTION(1);</div><div class='del'>-	} else</div><div class='del'>-		sbp2_prep_command_orb_sg(orb, hi, cmd, scsi_sg_count(SCpnt),</div><div class='del'>-					 scsi_sglist(SCpnt),</div><div class='del'>-					 orb_direction, dma_dir);</div><div class='del'>-</div><div class='add'>+		ret = 0;</div><div class='add'>+	} else {</div><div class='add'>+		ret = sbp2_prep_command_orb_sg(orb, lu-&gt;hi, cmd,</div><div class='add'>+					       scsi_sg_count(SCpnt),</div><div class='add'>+					       scsi_sglist(SCpnt),</div><div class='add'>+					       orb_direction, dma_dir);</div><div class='add'>+	}</div><div class='ctx'> 	sbp2util_cpu_to_be32_buffer(orb, sizeof(*orb));</div><div class='ctx'> </div><div class='ctx'> 	memset(orb-&gt;cdb, 0, sizeof(orb-&gt;cdb));</div><div class='ctx'> 	memcpy(orb-&gt;cdb, SCpnt-&gt;cmnd, SCpnt-&gt;cmd_len);</div><div class='add'>+</div><div class='add'>+	dma_sync_single_for_device(dmadev, cmd-&gt;command_orb_dma,</div><div class='add'>+			sizeof(struct sbp2_command_orb), DMA_TO_DEVICE);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sbp2_link_orb_command(struct sbp2_lu *lu,</div><div class='hunk'>@@ -1624,14 +1617,6 @@ static void sbp2_link_orb_command(struct sbp2_lu *lu,</div><div class='ctx'> 	size_t length;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	dma_sync_single_for_device(hi-&gt;host-&gt;device.parent,</div><div class='del'>-				   cmd-&gt;command_orb_dma,</div><div class='del'>-				   sizeof(struct sbp2_command_orb),</div><div class='del'>-				   DMA_TO_DEVICE);</div><div class='del'>-	dma_sync_single_for_device(hi-&gt;host-&gt;device.parent, cmd-&gt;sge_dma,</div><div class='del'>-				   sizeof(cmd-&gt;scatter_gather_element),</div><div class='del'>-				   DMA_TO_DEVICE);</div><div class='del'>-</div><div class='ctx'> 	/* check to see if there are any previous orbs to use */</div><div class='ctx'> 	spin_lock_irqsave(&amp;lu-&gt;cmd_orb_lock, flags);</div><div class='ctx'> 	last_orb = lu-&gt;last_orb;</div><div class='hunk'>@@ -1699,9 +1684,10 @@ static int sbp2_send_command(struct sbp2_lu *lu, struct scsi_cmnd *SCpnt,</div><div class='ctx'> 	if (!cmd)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='del'>-	sbp2_create_command_orb(lu, cmd, SCpnt);</div><div class='del'>-	sbp2_link_orb_command(lu, cmd);</div><div class='add'>+	if (sbp2_create_command_orb(lu, cmd, SCpnt))</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='add'>+	sbp2_link_orb_command(lu, cmd);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1789,13 +1775,6 @@ static int sbp2_handle_status_write(struct hpsb_host *host, int nodeid,</div><div class='ctx'> 	else</div><div class='ctx'> 		cmd = sbp2util_find_command_for_orb(lu, sb-&gt;ORB_offset_lo);</div><div class='ctx'> 	if (cmd) {</div><div class='del'>-		dma_sync_single_for_cpu(hi-&gt;host-&gt;device.parent,</div><div class='del'>-					cmd-&gt;command_orb_dma,</div><div class='del'>-					sizeof(struct sbp2_command_orb),</div><div class='del'>-					DMA_TO_DEVICE);</div><div class='del'>-		dma_sync_single_for_cpu(hi-&gt;host-&gt;device.parent, cmd-&gt;sge_dma,</div><div class='del'>-					sizeof(cmd-&gt;scatter_gather_element),</div><div class='del'>-					DMA_TO_DEVICE);</div><div class='ctx'> 		/* Grab SCSI command pointers and check status. */</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * FIXME: If the src field in the status is 1, the ORB DMA must</div><div class='hunk'>@@ -1912,7 +1891,6 @@ done:</div><div class='ctx'> </div><div class='ctx'> static void sbp2scsi_complete_all_commands(struct sbp2_lu *lu, u32 status)</div><div class='ctx'> {</div><div class='del'>-	struct sbp2_fwhost_info *hi = lu-&gt;hi;</div><div class='ctx'> 	struct list_head *lh;</div><div class='ctx'> 	struct sbp2_command_info *cmd;</div><div class='ctx'> 	unsigned long flags;</div><div class='hunk'>@@ -1921,13 +1899,6 @@ static void sbp2scsi_complete_all_commands(struct sbp2_lu *lu, u32 status)</div><div class='ctx'> 	while (!list_empty(&amp;lu-&gt;cmd_orb_inuse)) {</div><div class='ctx'> 		lh = lu-&gt;cmd_orb_inuse.next;</div><div class='ctx'> 		cmd = list_entry(lh, struct sbp2_command_info, list);</div><div class='del'>-		dma_sync_single_for_cpu(hi-&gt;host-&gt;device.parent,</div><div class='del'>-				        cmd-&gt;command_orb_dma,</div><div class='del'>-					sizeof(struct sbp2_command_orb),</div><div class='del'>-					DMA_TO_DEVICE);</div><div class='del'>-		dma_sync_single_for_cpu(hi-&gt;host-&gt;device.parent, cmd-&gt;sge_dma,</div><div class='del'>-					sizeof(cmd-&gt;scatter_gather_element),</div><div class='del'>-					DMA_TO_DEVICE);</div><div class='ctx'> 		sbp2util_mark_command_completed(lu, cmd);</div><div class='ctx'> 		if (cmd-&gt;Current_SCpnt) {</div><div class='ctx'> 			cmd-&gt;Current_SCpnt-&gt;result = status &lt;&lt; 16;</div><div class='hunk'>@@ -2033,6 +2004,8 @@ static int sbp2scsi_slave_configure(struct scsi_device *sdev)</div><div class='ctx'> 		sdev-&gt;start_stop_pwr_cond = 1;</div><div class='ctx'> 	if (lu-&gt;workarounds &amp; SBP2_WORKAROUND_128K_MAX_TRANS)</div><div class='ctx'> 		blk_queue_max_sectors(sdev-&gt;request_queue, 128 * 1024 / 512);</div><div class='add'>+</div><div class='add'>+	blk_queue_max_segment_size(sdev-&gt;request_queue, SBP2_MAX_SEG_SIZE);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2049,7 +2022,6 @@ static void sbp2scsi_slave_destroy(struct scsi_device *sdev)</div><div class='ctx'> static int sbp2scsi_abort(struct scsi_cmnd *SCpnt)</div><div class='ctx'> {</div><div class='ctx'> 	struct sbp2_lu *lu = (struct sbp2_lu *)SCpnt-&gt;device-&gt;host-&gt;hostdata[0];</div><div class='del'>-	struct sbp2_fwhost_info *hi = lu-&gt;hi;</div><div class='ctx'> 	struct sbp2_command_info *cmd;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='hunk'>@@ -2063,14 +2035,6 @@ static int sbp2scsi_abort(struct scsi_cmnd *SCpnt)</div><div class='ctx'> 		spin_lock_irqsave(&amp;lu-&gt;cmd_orb_lock, flags);</div><div class='ctx'> 		cmd = sbp2util_find_command_for_SCpnt(lu, SCpnt);</div><div class='ctx'> 		if (cmd) {</div><div class='del'>-			dma_sync_single_for_cpu(hi-&gt;host-&gt;device.parent,</div><div class='del'>-					cmd-&gt;command_orb_dma,</div><div class='del'>-					sizeof(struct sbp2_command_orb),</div><div class='del'>-					DMA_TO_DEVICE);</div><div class='del'>-			dma_sync_single_for_cpu(hi-&gt;host-&gt;device.parent,</div><div class='del'>-					cmd-&gt;sge_dma,</div><div class='del'>-					sizeof(cmd-&gt;scatter_gather_element),</div><div class='del'>-					DMA_TO_DEVICE);</div><div class='ctx'> 			sbp2util_mark_command_completed(lu, cmd);</div><div class='ctx'> 			if (cmd-&gt;Current_SCpnt) {</div><div class='ctx'> 				cmd-&gt;Current_SCpnt-&gt;result = DID_ABORT &lt;&lt; 16;</div><div class='head'>diff --git a/drivers/ieee1394/sbp2.h b/drivers/ieee1394/sbp2.h<br/>index 875428bc8d29..c5036f1cc5b0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ieee1394/sbp2.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ieee1394/sbp2.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ieee1394/sbp2.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ieee1394/sbp2.h</a></div><div class='hunk'>@@ -139,13 +139,10 @@ struct sbp2_logout_orb {</div><div class='ctx'> 	u32 status_fifo_lo;</div><div class='ctx'> } __attribute__((packed));</div><div class='ctx'> </div><div class='del'>-#define PAGE_TABLE_SET_SEGMENT_BASE_HI(v)	((v) &amp; 0xffff)</div><div class='del'>-#define PAGE_TABLE_SET_SEGMENT_LENGTH(v)	(((v) &amp; 0xffff) &lt;&lt; 16)</div><div class='del'>-</div><div class='ctx'> struct sbp2_unrestricted_page_table {</div><div class='del'>-	u32 length_segment_base_hi;</div><div class='del'>-	u32 segment_base_lo;</div><div class='del'>-} __attribute__((packed));</div><div class='add'>+	__be32 high;</div><div class='add'>+	__be32 low;</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> #define RESP_STATUS_REQUEST_COMPLETE		0x0</div><div class='ctx'> #define RESP_STATUS_TRANSPORT_FAILURE		0x1</div><div class='hunk'>@@ -216,15 +213,18 @@ struct sbp2_status_block {</div><div class='ctx'> #define SBP2_UNIT_SPEC_ID_ENTRY			0x0000609e</div><div class='ctx'> #define SBP2_SW_VERSION_ENTRY			0x00010483</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /*</div><div class='del'>- * SCSI specific definitions</div><div class='add'>+ * The default maximum s/g segment size of a FireWire controller is</div><div class='add'>+ * usually 0x10000, but SBP-2 only allows 0xffff. Since buffers have to</div><div class='add'>+ * be quadlet-aligned, we set the length limit to 0xffff &amp; ~3.</div><div class='ctx'>  */</div><div class='add'>+#define SBP2_MAX_SEG_SIZE			0xfffc</div><div class='ctx'> </div><div class='del'>-#define SBP2_MAX_SG_ELEMENT_LENGTH		0xf000</div><div class='del'>-/* There is no real limitation of the queue depth (i.e. length of the linked</div><div class='add'>+/*</div><div class='add'>+ * There is no real limitation of the queue depth (i.e. length of the linked</div><div class='ctx'>  * list of command ORBs) at the target. The chosen depth is merely an</div><div class='del'>- * implementation detail of the sbp2 driver. */</div><div class='add'>+ * implementation detail of the sbp2 driver.</div><div class='add'>+ */</div><div class='ctx'> #define SBP2_MAX_CMDS				8</div><div class='ctx'> </div><div class='ctx'> #define SBP2_SCSI_STATUS_GOOD			0x0</div><div class='hunk'>@@ -240,12 +240,6 @@ struct sbp2_status_block {</div><div class='ctx'>  * Representations of commands and devices</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-enum sbp2_dma_types {</div><div class='del'>-	CMD_DMA_NONE,</div><div class='del'>-	CMD_DMA_PAGE,</div><div class='del'>-	CMD_DMA_SINGLE</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /* Per SCSI command */</div><div class='ctx'> struct sbp2_command_info {</div><div class='ctx'> 	struct list_head list;</div><div class='hunk'>@@ -258,11 +252,6 @@ struct sbp2_command_info {</div><div class='ctx'> 	struct sbp2_unrestricted_page_table</div><div class='ctx'> 		scatter_gather_element[SG_ALL] __attribute__((aligned(8)));</div><div class='ctx'> 	dma_addr_t sge_dma;</div><div class='del'>-	void *sge_buffer;</div><div class='del'>-	dma_addr_t cmd_dma;</div><div class='del'>-	enum sbp2_dma_types dma_type;</div><div class='del'>-	unsigned long dma_size;</div><div class='del'>-	enum dma_data_direction dma_dir;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Per FireWire host */</div><div class='head'>diff --git a/drivers/ieee1394/video1394.c b/drivers/ieee1394/video1394.c<br/>index 25db6e67fa4e..679a918a5cc7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ieee1394/video1394.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ieee1394/video1394.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ieee1394/video1394.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ieee1394/video1394.c</a></div><div class='hunk'>@@ -893,7 +893,7 @@ static long video1394_ioctl(struct file *file,</div><div class='ctx'> 		if (unlikely(d == NULL))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> </div><div class='del'>-		if (unlikely((v.buffer&lt;0) || (v.buffer&gt;=d-&gt;num_desc - 1))) {</div><div class='add'>+		if (unlikely(v.buffer &gt;= d-&gt;num_desc - 1)) {</div><div class='ctx'> 			PRINT(KERN_ERR, ohci-&gt;host-&gt;id,</div><div class='ctx'> 			      "Buffer %d out of range",v.buffer);</div><div class='ctx'> 			return -EINVAL;</div><div class='hunk'>@@ -959,7 +959,7 @@ static long video1394_ioctl(struct file *file,</div><div class='ctx'> 		if (unlikely(d == NULL))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> </div><div class='del'>-		if (unlikely((v.buffer&lt;0) || (v.buffer&gt;d-&gt;num_desc - 1))) {</div><div class='add'>+		if (unlikely(v.buffer &gt; d-&gt;num_desc - 1)) {</div><div class='ctx'> 			PRINT(KERN_ERR, ohci-&gt;host-&gt;id,</div><div class='ctx'> 			      "Buffer %d out of range",v.buffer);</div><div class='ctx'> 			return -EINVAL;</div><div class='hunk'>@@ -1030,7 +1030,7 @@ static long video1394_ioctl(struct file *file,</div><div class='ctx'> 		d = find_ctx(&amp;ctx-&gt;context_list, OHCI_ISO_TRANSMIT, v.channel);</div><div class='ctx'> 		if (d == NULL) return -EFAULT;</div><div class='ctx'> </div><div class='del'>-		if ((v.buffer&lt;0) || (v.buffer&gt;=d-&gt;num_desc - 1)) {</div><div class='add'>+		if (v.buffer &gt;= d-&gt;num_desc - 1) {</div><div class='ctx'> 			PRINT(KERN_ERR, ohci-&gt;host-&gt;id,</div><div class='ctx'> 			      "Buffer %d out of range",v.buffer);</div><div class='ctx'> 			return -EINVAL;</div><div class='hunk'>@@ -1137,7 +1137,7 @@ static long video1394_ioctl(struct file *file,</div><div class='ctx'> 		d = find_ctx(&amp;ctx-&gt;context_list, OHCI_ISO_TRANSMIT, v.channel);</div><div class='ctx'> 		if (d == NULL) return -EFAULT;</div><div class='ctx'> </div><div class='del'>-		if ((v.buffer&lt;0) || (v.buffer&gt;=d-&gt;num_desc-1)) {</div><div class='add'>+		if (v.buffer &gt;= d-&gt;num_desc - 1) {</div><div class='ctx'> 			PRINT(KERN_ERR, ohci-&gt;host-&gt;id,</div><div class='ctx'> 			      "Buffer %d out of range",v.buffer);</div><div class='ctx'> 			return -EINVAL;</div><div class='hunk'>@@ -1341,9 +1341,8 @@ static void video1394_add_host (struct hpsb_host *host)</div><div class='ctx'> 	hpsb_set_hostinfo_key(&amp;video1394_highlevel, host, ohci-&gt;host-&gt;id);</div><div class='ctx'> </div><div class='ctx'> 	minor = IEEE1394_MINOR_BLOCK_VIDEO1394 * 16 + ohci-&gt;host-&gt;id;</div><div class='del'>-	device_create_drvdata(hpsb_protocol_class, NULL,</div><div class='del'>-			      MKDEV(IEEE1394_MAJOR, minor), NULL,</div><div class='del'>-			      "%s-%d", VIDEO1394_DRIVER_NAME, ohci-&gt;host-&gt;id);</div><div class='add'>+	device_create(hpsb_protocol_class, NULL, MKDEV(IEEE1394_MAJOR, minor),</div><div class='add'>+		      NULL, "%s-%d", VIDEO1394_DRIVER_NAME, ohci-&gt;host-&gt;id);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c<br/>index 922d35f4fc08..a78d35aecee3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/infiniband/core/cm.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/infiniband/core/cm.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/infiniband/core/cm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/infiniband/core/cm.c</a></div><div class='hunk'>@@ -3691,9 +3691,9 @@ static void cm_add_one(struct ib_device *ib_device)</div><div class='ctx'> 	cm_dev-&gt;ib_device = ib_device;</div><div class='ctx'> 	cm_get_ack_delay(cm_dev);</div><div class='ctx'> </div><div class='del'>-	cm_dev-&gt;device = device_create_drvdata(&amp;cm_class, &amp;ib_device-&gt;dev,</div><div class='del'>-					       MKDEV(0, 0), NULL,</div><div class='del'>-					       "%s", ib_device-&gt;name);</div><div class='add'>+	cm_dev-&gt;device = device_create(&amp;cm_class, &amp;ib_device-&gt;dev,</div><div class='add'>+				       MKDEV(0, 0), NULL,</div><div class='add'>+				       "%s", ib_device-&gt;name);</div><div class='ctx'> 	if (!cm_dev-&gt;device) {</div><div class='ctx'> 		kfree(cm_dev);</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -3748,6 +3748,7 @@ error1:</div><div class='ctx'> 		cm_remove_port_fs(port);</div><div class='ctx'> 	}</div><div class='ctx'> 	device_unregister(cm_dev-&gt;device);</div><div class='add'>+	kfree(cm_dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void cm_remove_one(struct ib_device *ib_device)</div><div class='hunk'>@@ -3776,6 +3777,7 @@ static void cm_remove_one(struct ib_device *ib_device)</div><div class='ctx'> 		cm_remove_port_fs(port);</div><div class='ctx'> 	}</div><div class='ctx'> 	device_unregister(cm_dev-&gt;device);</div><div class='add'>+	kfree(cm_dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init ib_cm_init(void)</div><div class='head'>diff --git a/drivers/infiniband/core/mad.c b/drivers/infiniband/core/mad.c<br/>index 1adf2efd3cb3..49c45feccd5b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/infiniband/core/mad.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/infiniband/core/mad.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/infiniband/core/mad.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/infiniband/core/mad.c</a></div><div class='hunk'>@@ -1697,9 +1697,8 @@ static inline int rcv_has_same_gid(struct ib_mad_agent_private *mad_agent_priv,</div><div class='ctx'> 	u8 port_num = mad_agent_priv-&gt;agent.port_num;</div><div class='ctx'> 	u8 lmc;</div><div class='ctx'> </div><div class='del'>-	send_resp = ((struct ib_mad *)(wr-&gt;send_buf.mad))-&gt;</div><div class='del'>-		     mad_hdr.method &amp; IB_MGMT_METHOD_RESP;</div><div class='del'>-	rcv_resp = rwc-&gt;recv_buf.mad-&gt;mad_hdr.method &amp; IB_MGMT_METHOD_RESP;</div><div class='add'>+	send_resp = ib_response_mad((struct ib_mad *)wr-&gt;send_buf.mad);</div><div class='add'>+	rcv_resp = ib_response_mad(rwc-&gt;recv_buf.mad);</div><div class='ctx'> </div><div class='ctx'> 	if (send_resp == rcv_resp)</div><div class='ctx'> 		/* both requests, or both responses. GIDs different */</div><div class='head'>diff --git a/drivers/infiniband/core/user_mad.c b/drivers/infiniband/core/user_mad.c<br/>index 268a2d23b7c9..8c46f2257098 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/infiniband/core/user_mad.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/infiniband/core/user_mad.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/infiniband/core/user_mad.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/infiniband/core/user_mad.c</a></div><div class='hunk'>@@ -1016,9 +1016,9 @@ static int ib_umad_init_port(struct ib_device *device, int port_num,</div><div class='ctx'> 	if (cdev_add(port-&gt;cdev, base_dev + port-&gt;dev_num, 1))</div><div class='ctx'> 		goto err_cdev;</div><div class='ctx'> </div><div class='del'>-	port-&gt;dev = device_create_drvdata(umad_class, device-&gt;dma_device,</div><div class='del'>-					  port-&gt;cdev-&gt;dev, port,</div><div class='del'>-					  "umad%d", port-&gt;dev_num);</div><div class='add'>+	port-&gt;dev = device_create(umad_class, device-&gt;dma_device,</div><div class='add'>+				  port-&gt;cdev-&gt;dev, port,</div><div class='add'>+				  "umad%d", port-&gt;dev_num);</div><div class='ctx'> 	if (IS_ERR(port-&gt;dev))</div><div class='ctx'> 		goto err_cdev;</div><div class='ctx'> </div><div class='hunk'>@@ -1036,9 +1036,9 @@ static int ib_umad_init_port(struct ib_device *device, int port_num,</div><div class='ctx'> 	if (cdev_add(port-&gt;sm_cdev, base_dev + port-&gt;dev_num + IB_UMAD_MAX_PORTS, 1))</div><div class='ctx'> 		goto err_sm_cdev;</div><div class='ctx'> </div><div class='del'>-	port-&gt;sm_dev = device_create_drvdata(umad_class, device-&gt;dma_device,</div><div class='del'>-					     port-&gt;sm_cdev-&gt;dev, port,</div><div class='del'>-					     "issm%d", port-&gt;dev_num);</div><div class='add'>+	port-&gt;sm_dev = device_create(umad_class, device-&gt;dma_device,</div><div class='add'>+				     port-&gt;sm_cdev-&gt;dev, port,</div><div class='add'>+				     "issm%d", port-&gt;dev_num);</div><div class='ctx'> 	if (IS_ERR(port-&gt;sm_dev))</div><div class='ctx'> 		goto err_sm_cdev;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/infiniband/core/uverbs_main.c b/drivers/infiniband/core/uverbs_main.c<br/>index aeee856c4060..d85af1b67027 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/infiniband/core/uverbs_main.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/infiniband/core/uverbs_main.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/infiniband/core/uverbs_main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/infiniband/core/uverbs_main.c</a></div><div class='hunk'>@@ -764,12 +764,9 @@ static void ib_uverbs_add_one(struct ib_device *device)</div><div class='ctx'> 	if (cdev_add(uverbs_dev-&gt;cdev, IB_UVERBS_BASE_DEV + uverbs_dev-&gt;devnum, 1))</div><div class='ctx'> 		goto err_cdev;</div><div class='ctx'> </div><div class='del'>-	uverbs_dev-&gt;dev = device_create_drvdata(uverbs_class,</div><div class='del'>-						device-&gt;dma_device,</div><div class='del'>-						uverbs_dev-&gt;cdev-&gt;dev,</div><div class='del'>-						uverbs_dev,</div><div class='del'>-						"uverbs%d",</div><div class='del'>-						uverbs_dev-&gt;devnum);</div><div class='add'>+	uverbs_dev-&gt;dev = device_create(uverbs_class, device-&gt;dma_device,</div><div class='add'>+					uverbs_dev-&gt;cdev-&gt;dev, uverbs_dev,</div><div class='add'>+					"uverbs%d", uverbs_dev-&gt;devnum);</div><div class='ctx'> 	if (IS_ERR(uverbs_dev-&gt;dev))</div><div class='ctx'> 		goto err_cdev;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/infiniband/hw/amso1100/c2_provider.c b/drivers/infiniband/hw/amso1100/c2_provider.c<br/>index 2acf9b62cf99..69580e282af0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/infiniband/hw/amso1100/c2_provider.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/infiniband/hw/amso1100/c2_provider.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/infiniband/hw/amso1100/c2_provider.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/infiniband/hw/amso1100/c2_provider.c</a></div><div class='hunk'>@@ -272,7 +272,6 @@ static struct ib_qp *c2_create_qp(struct ib_pd *pd,</div><div class='ctx'> 		pr_debug("%s: Invalid QP type: %d\n", __func__,</div><div class='ctx'> 			init_attr-&gt;qp_type);</div><div class='ctx'> 		return ERR_PTR(-EINVAL);</div><div class='del'>-		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (err) {</div><div class='head'>diff --git a/drivers/infiniband/hw/cxgb3/iwch_provider.c b/drivers/infiniband/hw/cxgb3/iwch_provider.c<br/>index eb778bfd6f66..ecff98043589 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/infiniband/hw/cxgb3/iwch_provider.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/infiniband/hw/cxgb3/iwch_provider.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/infiniband/hw/cxgb3/iwch_provider.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/infiniband/hw/cxgb3/iwch_provider.c</a></div><div class='hunk'>@@ -1155,13 +1155,11 @@ static int iwch_query_port(struct ib_device *ibdev,</div><div class='ctx'> 			   u8 port, struct ib_port_attr *props)</div><div class='ctx'> {</div><div class='ctx'> 	PDBG("%s ibdev %p\n", __func__, ibdev);</div><div class='add'>+</div><div class='add'>+	memset(props, 0, sizeof(struct ib_port_attr));</div><div class='ctx'> 	props-&gt;max_mtu = IB_MTU_4096;</div><div class='del'>-	props-&gt;lid = 0;</div><div class='del'>-	props-&gt;lmc = 0;</div><div class='del'>-	props-&gt;sm_lid = 0;</div><div class='del'>-	props-&gt;sm_sl = 0;</div><div class='add'>+	props-&gt;active_mtu = IB_MTU_2048;</div><div class='ctx'> 	props-&gt;state = IB_PORT_ACTIVE;</div><div class='del'>-	props-&gt;phys_state = 0;</div><div class='ctx'> 	props-&gt;port_cap_flags =</div><div class='ctx'> 	    IB_PORT_CM_SUP |</div><div class='ctx'> 	    IB_PORT_SNMP_TUNNEL_SUP |</div><div class='hunk'>@@ -1170,7 +1168,6 @@ static int iwch_query_port(struct ib_device *ibdev,</div><div class='ctx'> 	    IB_PORT_VENDOR_CLASS_SUP | IB_PORT_BOOT_MGMT_SUP;</div><div class='ctx'> 	props-&gt;gid_tbl_len = 1;</div><div class='ctx'> 	props-&gt;pkey_tbl_len = 1;</div><div class='del'>-	props-&gt;qkey_viol_cntr = 0;</div><div class='ctx'> 	props-&gt;active_width = 2;</div><div class='ctx'> 	props-&gt;active_speed = 2;</div><div class='ctx'> 	props-&gt;max_msg_sz = -1;</div><div class='head'>diff --git a/drivers/infiniband/hw/ehca/ehca_classes.h b/drivers/infiniband/hw/ehca/ehca_classes.h<br/>index 1ab919f836a8..5d7b7855afb9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/infiniband/hw/ehca/ehca_classes.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/infiniband/hw/ehca/ehca_classes.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/infiniband/hw/ehca/ehca_classes.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/infiniband/hw/ehca/ehca_classes.h</a></div><div class='hunk'>@@ -164,6 +164,13 @@ struct ehca_qmap_entry {</div><div class='ctx'> 	u16 reported;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct ehca_queue_map {</div><div class='add'>+	struct ehca_qmap_entry *map;</div><div class='add'>+	unsigned int entries;</div><div class='add'>+	unsigned int tail;</div><div class='add'>+	unsigned int left_to_poll;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct ehca_qp {</div><div class='ctx'> 	union {</div><div class='ctx'> 		struct ib_qp ib_qp;</div><div class='hunk'>@@ -173,8 +180,9 @@ struct ehca_qp {</div><div class='ctx'> 	enum ehca_ext_qp_type ext_type;</div><div class='ctx'> 	enum ib_qp_state state;</div><div class='ctx'> 	struct ipz_queue ipz_squeue;</div><div class='del'>-	struct ehca_qmap_entry *sq_map;</div><div class='add'>+	struct ehca_queue_map sq_map;</div><div class='ctx'> 	struct ipz_queue ipz_rqueue;</div><div class='add'>+	struct ehca_queue_map rq_map;</div><div class='ctx'> 	struct h_galpas galpas;</div><div class='ctx'> 	u32 qkey;</div><div class='ctx'> 	u32 real_qp_num;</div><div class='hunk'>@@ -204,6 +212,8 @@ struct ehca_qp {</div><div class='ctx'> 	atomic_t nr_events; /* events seen */</div><div class='ctx'> 	wait_queue_head_t wait_completion;</div><div class='ctx'> 	int mig_armed;</div><div class='add'>+	struct list_head sq_err_node;</div><div class='add'>+	struct list_head rq_err_node;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define IS_SRQ(qp) (qp-&gt;ext_type == EQPT_SRQ)</div><div class='hunk'>@@ -233,6 +243,8 @@ struct ehca_cq {</div><div class='ctx'> 	/* mmap counter for resources mapped into user space */</div><div class='ctx'> 	u32 mm_count_queue;</div><div class='ctx'> 	u32 mm_count_galpa;</div><div class='add'>+	struct list_head sqp_err_list;</div><div class='add'>+	struct list_head rqp_err_list;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum ehca_mr_flag {</div><div class='head'>diff --git a/drivers/infiniband/hw/ehca/ehca_cq.c b/drivers/infiniband/hw/ehca/ehca_cq.c<br/>index 5540b276a33c..33647a95eb9a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/infiniband/hw/ehca/ehca_cq.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/infiniband/hw/ehca/ehca_cq.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/infiniband/hw/ehca/ehca_cq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/infiniband/hw/ehca/ehca_cq.c</a></div><div class='hunk'>@@ -276,6 +276,9 @@ struct ib_cq *ehca_create_cq(struct ib_device *device, int cqe, int comp_vector,</div><div class='ctx'> 	for (i = 0; i &lt; QP_HASHTAB_LEN; i++)</div><div class='ctx'> 		INIT_HLIST_HEAD(&amp;my_cq-&gt;qp_hashtab[i]);</div><div class='ctx'> </div><div class='add'>+	INIT_LIST_HEAD(&amp;my_cq-&gt;sqp_err_list);</div><div class='add'>+	INIT_LIST_HEAD(&amp;my_cq-&gt;rqp_err_list);</div><div class='add'>+</div><div class='ctx'> 	if (context) {</div><div class='ctx'> 		struct ipz_queue *ipz_queue = &amp;my_cq-&gt;ipz_queue;</div><div class='ctx'> 		struct ehca_create_cq_resp resp;</div><div class='head'>diff --git a/drivers/infiniband/hw/ehca/ehca_iverbs.h b/drivers/infiniband/hw/ehca/ehca_iverbs.h<br/>index a8a2ea585d2f..8f7f282ead65 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/infiniband/hw/ehca/ehca_iverbs.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/infiniband/hw/ehca/ehca_iverbs.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/infiniband/hw/ehca/ehca_iverbs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/infiniband/hw/ehca/ehca_iverbs.h</a></div><div class='hunk'>@@ -197,6 +197,8 @@ void ehca_poll_eqs(unsigned long data);</div><div class='ctx'> int ehca_calc_ipd(struct ehca_shca *shca, int port,</div><div class='ctx'> 		  enum ib_rate path_rate, u32 *ipd);</div><div class='ctx'> </div><div class='add'>+void ehca_add_to_err_list(struct ehca_qp *qp, int on_sq);</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_PPC_64K_PAGES</div><div class='ctx'> void *ehca_alloc_fw_ctrlblock(gfp_t flags);</div><div class='ctx'> void ehca_free_fw_ctrlblock(void *ptr);</div><div class='head'>diff --git a/drivers/infiniband/hw/ehca/ehca_qp.c b/drivers/infiniband/hw/ehca/ehca_qp.c<br/>index b6bcee036734..4dbe2870e014 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/infiniband/hw/ehca/ehca_qp.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/infiniband/hw/ehca/ehca_qp.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/infiniband/hw/ehca/ehca_qp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/infiniband/hw/ehca/ehca_qp.c</a></div><div class='hunk'>@@ -396,6 +396,50 @@ static void ehca_determine_small_queue(struct ehca_alloc_queue_parms *queue,</div><div class='ctx'> 	queue-&gt;is_small = (queue-&gt;page_size != 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* needs to be called with cq-&gt;spinlock held */</div><div class='add'>+void ehca_add_to_err_list(struct ehca_qp *qp, int on_sq)</div><div class='add'>+{</div><div class='add'>+	struct list_head *list, *node;</div><div class='add'>+</div><div class='add'>+	/* TODO: support low latency QPs */</div><div class='add'>+	if (qp-&gt;ext_type == EQPT_LLQP)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (on_sq) {</div><div class='add'>+		list = &amp;qp-&gt;send_cq-&gt;sqp_err_list;</div><div class='add'>+		node = &amp;qp-&gt;sq_err_node;</div><div class='add'>+	} else {</div><div class='add'>+		list = &amp;qp-&gt;recv_cq-&gt;rqp_err_list;</div><div class='add'>+		node = &amp;qp-&gt;rq_err_node;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (list_empty(node))</div><div class='add'>+		list_add_tail(node, list);</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void del_from_err_list(struct ehca_cq *cq, struct list_head *node)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;cq-&gt;spinlock, flags);</div><div class='add'>+</div><div class='add'>+	if (!list_empty(node))</div><div class='add'>+		list_del_init(node);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;cq-&gt;spinlock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void reset_queue_map(struct ehca_queue_map *qmap)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	qmap-&gt;tail = 0;</div><div class='add'>+	for (i = 0; i &lt; qmap-&gt;entries; i++)</div><div class='add'>+		qmap-&gt;map[i].reported = 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Create an ib_qp struct that is either a QP or an SRQ, depending on</div><div class='ctx'>  * the value of the is_srq parameter. If init_attr and srq_init_attr share</div><div class='hunk'>@@ -407,12 +451,11 @@ static struct ehca_qp *internal_create_qp(</div><div class='ctx'> 	struct ib_srq_init_attr *srq_init_attr,</div><div class='ctx'> 	struct ib_udata *udata, int is_srq)</div><div class='ctx'> {</div><div class='del'>-	struct ehca_qp *my_qp;</div><div class='add'>+	struct ehca_qp *my_qp, *my_srq = NULL;</div><div class='ctx'> 	struct ehca_pd *my_pd = container_of(pd, struct ehca_pd, ib_pd);</div><div class='ctx'> 	struct ehca_shca *shca = container_of(pd-&gt;device, struct ehca_shca,</div><div class='ctx'> 					      ib_device);</div><div class='ctx'> 	struct ib_ucontext *context = NULL;</div><div class='del'>-	u32 nr_qes;</div><div class='ctx'> 	u64 h_ret;</div><div class='ctx'> 	int is_llqp = 0, has_srq = 0;</div><div class='ctx'> 	int qp_type, max_send_sge, max_recv_sge, ret;</div><div class='hunk'>@@ -457,8 +500,7 @@ static struct ehca_qp *internal_create_qp(</div><div class='ctx'> </div><div class='ctx'> 	/* handle SRQ base QPs */</div><div class='ctx'> 	if (init_attr-&gt;srq) {</div><div class='del'>-		struct ehca_qp *my_srq =</div><div class='del'>-			container_of(init_attr-&gt;srq, struct ehca_qp, ib_srq);</div><div class='add'>+		my_srq = container_of(init_attr-&gt;srq, struct ehca_qp, ib_srq);</div><div class='ctx'> </div><div class='ctx'> 		has_srq = 1;</div><div class='ctx'> 		parms.ext_type = EQPT_SRQBASE;</div><div class='hunk'>@@ -716,15 +758,19 @@ static struct ehca_qp *internal_create_qp(</div><div class='ctx'> 				 "and pages ret=%i", ret);</div><div class='ctx'> 			goto create_qp_exit2;</div><div class='ctx'> 		}</div><div class='del'>-		nr_qes = my_qp-&gt;ipz_squeue.queue_length /</div><div class='add'>+</div><div class='add'>+		my_qp-&gt;sq_map.entries = my_qp-&gt;ipz_squeue.queue_length /</div><div class='ctx'> 			 my_qp-&gt;ipz_squeue.qe_size;</div><div class='del'>-		my_qp-&gt;sq_map = vmalloc(nr_qes *</div><div class='add'>+		my_qp-&gt;sq_map.map = vmalloc(my_qp-&gt;sq_map.entries *</div><div class='ctx'> 					sizeof(struct ehca_qmap_entry));</div><div class='del'>-		if (!my_qp-&gt;sq_map) {</div><div class='add'>+		if (!my_qp-&gt;sq_map.map) {</div><div class='ctx'> 			ehca_err(pd-&gt;device, "Couldn't allocate squeue "</div><div class='ctx'> 				 "map ret=%i", ret);</div><div class='ctx'> 			goto create_qp_exit3;</div><div class='ctx'> 		}</div><div class='add'>+		INIT_LIST_HEAD(&amp;my_qp-&gt;sq_err_node);</div><div class='add'>+		/* to avoid the generation of bogus flush CQEs */</div><div class='add'>+		reset_queue_map(&amp;my_qp-&gt;sq_map);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (HAS_RQ(my_qp)) {</div><div class='hunk'>@@ -736,6 +782,25 @@ static struct ehca_qp *internal_create_qp(</div><div class='ctx'> 				 "and pages ret=%i", ret);</div><div class='ctx'> 			goto create_qp_exit4;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		my_qp-&gt;rq_map.entries = my_qp-&gt;ipz_rqueue.queue_length /</div><div class='add'>+			my_qp-&gt;ipz_rqueue.qe_size;</div><div class='add'>+		my_qp-&gt;rq_map.map = vmalloc(my_qp-&gt;rq_map.entries *</div><div class='add'>+				sizeof(struct ehca_qmap_entry));</div><div class='add'>+		if (!my_qp-&gt;rq_map.map) {</div><div class='add'>+			ehca_err(pd-&gt;device, "Couldn't allocate squeue "</div><div class='add'>+					"map ret=%i", ret);</div><div class='add'>+			goto create_qp_exit5;</div><div class='add'>+		}</div><div class='add'>+		INIT_LIST_HEAD(&amp;my_qp-&gt;rq_err_node);</div><div class='add'>+		/* to avoid the generation of bogus flush CQEs */</div><div class='add'>+		reset_queue_map(&amp;my_qp-&gt;rq_map);</div><div class='add'>+	} else if (init_attr-&gt;srq) {</div><div class='add'>+		/* this is a base QP, use the queue map of the SRQ */</div><div class='add'>+		my_qp-&gt;rq_map = my_srq-&gt;rq_map;</div><div class='add'>+		INIT_LIST_HEAD(&amp;my_qp-&gt;rq_err_node);</div><div class='add'>+</div><div class='add'>+		my_qp-&gt;ipz_rqueue = my_srq-&gt;ipz_rqueue;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (is_srq) {</div><div class='hunk'>@@ -799,7 +864,7 @@ static struct ehca_qp *internal_create_qp(</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			ehca_err(pd-&gt;device,</div><div class='ctx'> 				 "Couldn't assign qp to send_cq ret=%i", ret);</div><div class='del'>-			goto create_qp_exit6;</div><div class='add'>+			goto create_qp_exit7;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -825,25 +890,29 @@ static struct ehca_qp *internal_create_qp(</div><div class='ctx'> 		if (ib_copy_to_udata(udata, &amp;resp, sizeof resp)) {</div><div class='ctx'> 			ehca_err(pd-&gt;device, "Copy to udata failed");</div><div class='ctx'> 			ret = -EINVAL;</div><div class='del'>-			goto create_qp_exit7;</div><div class='add'>+			goto create_qp_exit8;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return my_qp;</div><div class='ctx'> </div><div class='del'>-create_qp_exit7:</div><div class='add'>+create_qp_exit8:</div><div class='ctx'> 	ehca_cq_unassign_qp(my_qp-&gt;send_cq, my_qp-&gt;real_qp_num);</div><div class='ctx'> </div><div class='del'>-create_qp_exit6:</div><div class='add'>+create_qp_exit7:</div><div class='ctx'> 	kfree(my_qp-&gt;mod_qp_parm);</div><div class='ctx'> </div><div class='add'>+create_qp_exit6:</div><div class='add'>+	if (HAS_RQ(my_qp))</div><div class='add'>+		vfree(my_qp-&gt;rq_map.map);</div><div class='add'>+</div><div class='ctx'> create_qp_exit5:</div><div class='ctx'> 	if (HAS_RQ(my_qp))</div><div class='ctx'> 		ipz_queue_dtor(my_pd, &amp;my_qp-&gt;ipz_rqueue);</div><div class='ctx'> </div><div class='ctx'> create_qp_exit4:</div><div class='ctx'> 	if (HAS_SQ(my_qp))</div><div class='del'>-		vfree(my_qp-&gt;sq_map);</div><div class='add'>+		vfree(my_qp-&gt;sq_map.map);</div><div class='ctx'> </div><div class='ctx'> create_qp_exit3:</div><div class='ctx'> 	if (HAS_SQ(my_qp))</div><div class='hunk'>@@ -1035,6 +1104,101 @@ static int prepare_sqe_rts(struct ehca_qp *my_qp, struct ehca_shca *shca,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int calc_left_cqes(u64 wqe_p, struct ipz_queue *ipz_queue,</div><div class='add'>+			  struct ehca_queue_map *qmap)</div><div class='add'>+{</div><div class='add'>+	void *wqe_v;</div><div class='add'>+	u64 q_ofs;</div><div class='add'>+	u32 wqe_idx;</div><div class='add'>+</div><div class='add'>+	/* convert real to abs address */</div><div class='add'>+	wqe_p = wqe_p &amp; (~(1UL &lt;&lt; 63));</div><div class='add'>+</div><div class='add'>+	wqe_v = abs_to_virt(wqe_p);</div><div class='add'>+</div><div class='add'>+	if (ipz_queue_abs_to_offset(ipz_queue, wqe_p, &amp;q_ofs)) {</div><div class='add'>+		ehca_gen_err("Invalid offset for calculating left cqes "</div><div class='add'>+				"wqe_p=%#lx wqe_v=%p\n", wqe_p, wqe_v);</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	wqe_idx = q_ofs / ipz_queue-&gt;qe_size;</div><div class='add'>+	if (wqe_idx &lt; qmap-&gt;tail)</div><div class='add'>+		qmap-&gt;left_to_poll = (qmap-&gt;entries - qmap-&gt;tail) + wqe_idx;</div><div class='add'>+	else</div><div class='add'>+		qmap-&gt;left_to_poll = wqe_idx - qmap-&gt;tail;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int check_for_left_cqes(struct ehca_qp *my_qp, struct ehca_shca *shca)</div><div class='add'>+{</div><div class='add'>+	u64 h_ret;</div><div class='add'>+	void *send_wqe_p, *recv_wqe_p;</div><div class='add'>+	int ret;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int qp_num = my_qp-&gt;ib_qp.qp_num;</div><div class='add'>+</div><div class='add'>+	/* this hcall is not supported on base QPs */</div><div class='add'>+	if (my_qp-&gt;ext_type != EQPT_SRQBASE) {</div><div class='add'>+		/* get send and receive wqe pointer */</div><div class='add'>+		h_ret = hipz_h_disable_and_get_wqe(shca-&gt;ipz_hca_handle,</div><div class='add'>+				my_qp-&gt;ipz_qp_handle, &amp;my_qp-&gt;pf,</div><div class='add'>+				&amp;send_wqe_p, &amp;recv_wqe_p, 4);</div><div class='add'>+		if (h_ret != H_SUCCESS) {</div><div class='add'>+			ehca_err(&amp;shca-&gt;ib_device, "disable_and_get_wqe() "</div><div class='add'>+				 "failed ehca_qp=%p qp_num=%x h_ret=%li",</div><div class='add'>+				 my_qp, qp_num, h_ret);</div><div class='add'>+			return ehca2ib_return_code(h_ret);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * acquire lock to ensure that nobody is polling the cq which</div><div class='add'>+		 * could mean that the qmap-&gt;tail pointer is in an</div><div class='add'>+		 * inconsistent state.</div><div class='add'>+		 */</div><div class='add'>+		spin_lock_irqsave(&amp;my_qp-&gt;send_cq-&gt;spinlock, flags);</div><div class='add'>+		ret = calc_left_cqes((u64)send_wqe_p, &amp;my_qp-&gt;ipz_squeue,</div><div class='add'>+				&amp;my_qp-&gt;sq_map);</div><div class='add'>+		spin_unlock_irqrestore(&amp;my_qp-&gt;send_cq-&gt;spinlock, flags);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+		spin_lock_irqsave(&amp;my_qp-&gt;recv_cq-&gt;spinlock, flags);</div><div class='add'>+		ret = calc_left_cqes((u64)recv_wqe_p, &amp;my_qp-&gt;ipz_rqueue,</div><div class='add'>+				&amp;my_qp-&gt;rq_map);</div><div class='add'>+		spin_unlock_irqrestore(&amp;my_qp-&gt;recv_cq-&gt;spinlock, flags);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	} else {</div><div class='add'>+		spin_lock_irqsave(&amp;my_qp-&gt;send_cq-&gt;spinlock, flags);</div><div class='add'>+		my_qp-&gt;sq_map.left_to_poll = 0;</div><div class='add'>+		spin_unlock_irqrestore(&amp;my_qp-&gt;send_cq-&gt;spinlock, flags);</div><div class='add'>+</div><div class='add'>+		spin_lock_irqsave(&amp;my_qp-&gt;recv_cq-&gt;spinlock, flags);</div><div class='add'>+		my_qp-&gt;rq_map.left_to_poll = 0;</div><div class='add'>+		spin_unlock_irqrestore(&amp;my_qp-&gt;recv_cq-&gt;spinlock, flags);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* this assures flush cqes being generated only for pending wqes */</div><div class='add'>+	if ((my_qp-&gt;sq_map.left_to_poll == 0) &amp;&amp;</div><div class='add'>+				(my_qp-&gt;rq_map.left_to_poll == 0)) {</div><div class='add'>+		spin_lock_irqsave(&amp;my_qp-&gt;send_cq-&gt;spinlock, flags);</div><div class='add'>+		ehca_add_to_err_list(my_qp, 1);</div><div class='add'>+		spin_unlock_irqrestore(&amp;my_qp-&gt;send_cq-&gt;spinlock, flags);</div><div class='add'>+</div><div class='add'>+		if (HAS_RQ(my_qp)) {</div><div class='add'>+			spin_lock_irqsave(&amp;my_qp-&gt;recv_cq-&gt;spinlock, flags);</div><div class='add'>+			ehca_add_to_err_list(my_qp, 0);</div><div class='add'>+			spin_unlock_irqrestore(&amp;my_qp-&gt;recv_cq-&gt;spinlock,</div><div class='add'>+					flags);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * internal_modify_qp with circumvention to handle aqp0 properly</div><div class='ctx'>  * smi_reset2init indicates if this is an internal reset-to-init-call for</div><div class='hunk'>@@ -1539,10 +1703,27 @@ static int internal_modify_qp(struct ib_qp *ibqp,</div><div class='ctx'> 			goto modify_qp_exit2;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+	if ((qp_new_state == IB_QPS_ERR) &amp;&amp; (qp_cur_state != IB_QPS_ERR)) {</div><div class='add'>+		ret = check_for_left_cqes(my_qp, shca);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto modify_qp_exit2;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (statetrans == IB_QPST_ANY2RESET) {</div><div class='ctx'> 		ipz_qeit_reset(&amp;my_qp-&gt;ipz_rqueue);</div><div class='ctx'> 		ipz_qeit_reset(&amp;my_qp-&gt;ipz_squeue);</div><div class='add'>+</div><div class='add'>+		if (qp_cur_state == IB_QPS_ERR) {</div><div class='add'>+			del_from_err_list(my_qp-&gt;send_cq, &amp;my_qp-&gt;sq_err_node);</div><div class='add'>+</div><div class='add'>+			if (HAS_RQ(my_qp))</div><div class='add'>+				del_from_err_list(my_qp-&gt;recv_cq,</div><div class='add'>+						  &amp;my_qp-&gt;rq_err_node);</div><div class='add'>+		}</div><div class='add'>+		reset_queue_map(&amp;my_qp-&gt;sq_map);</div><div class='add'>+</div><div class='add'>+		if (HAS_RQ(my_qp))</div><div class='add'>+			reset_queue_map(&amp;my_qp-&gt;rq_map);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (attr_mask &amp; IB_QP_QKEY)</div><div class='hunk'>@@ -1958,6 +2139,16 @@ static int internal_destroy_qp(struct ib_device *dev, struct ehca_qp *my_qp,</div><div class='ctx'> 	idr_remove(&amp;ehca_qp_idr, my_qp-&gt;token);</div><div class='ctx'> 	write_unlock_irqrestore(&amp;ehca_qp_idr_lock, flags);</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * SRQs will never get into an error list and do not have a recv_cq,</div><div class='add'>+	 * so we need to skip them here.</div><div class='add'>+	 */</div><div class='add'>+	if (HAS_RQ(my_qp) &amp;&amp; !IS_SRQ(my_qp))</div><div class='add'>+		del_from_err_list(my_qp-&gt;recv_cq, &amp;my_qp-&gt;rq_err_node);</div><div class='add'>+</div><div class='add'>+	if (HAS_SQ(my_qp))</div><div class='add'>+		del_from_err_list(my_qp-&gt;send_cq, &amp;my_qp-&gt;sq_err_node);</div><div class='add'>+</div><div class='ctx'> 	/* now wait until all pending events have completed */</div><div class='ctx'> 	wait_event(my_qp-&gt;wait_completion, !atomic_read(&amp;my_qp-&gt;nr_events));</div><div class='ctx'> </div><div class='hunk'>@@ -1983,7 +2174,7 @@ static int internal_destroy_qp(struct ib_device *dev, struct ehca_qp *my_qp,</div><div class='ctx'> 	if (qp_type == IB_QPT_GSI) {</div><div class='ctx'> 		struct ib_event event;</div><div class='ctx'> 		ehca_info(dev, "device %s: port %x is inactive.",</div><div class='del'>-			  shca-&gt;ib_device.name, port_num);</div><div class='add'>+				shca-&gt;ib_device.name, port_num);</div><div class='ctx'> 		event.device = &amp;shca-&gt;ib_device;</div><div class='ctx'> 		event.event = IB_EVENT_PORT_ERR;</div><div class='ctx'> 		event.element.port_num = port_num;</div><div class='hunk'>@@ -1991,11 +2182,15 @@ static int internal_destroy_qp(struct ib_device *dev, struct ehca_qp *my_qp,</div><div class='ctx'> 		ib_dispatch_event(&amp;event);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (HAS_RQ(my_qp))</div><div class='add'>+	if (HAS_RQ(my_qp)) {</div><div class='ctx'> 		ipz_queue_dtor(my_pd, &amp;my_qp-&gt;ipz_rqueue);</div><div class='add'>+</div><div class='add'>+		vfree(my_qp-&gt;rq_map.map);</div><div class='add'>+	}</div><div class='ctx'> 	if (HAS_SQ(my_qp)) {</div><div class='ctx'> 		ipz_queue_dtor(my_pd, &amp;my_qp-&gt;ipz_squeue);</div><div class='del'>-		vfree(my_qp-&gt;sq_map);</div><div class='add'>+</div><div class='add'>+		vfree(my_qp-&gt;sq_map.map);</div><div class='ctx'> 	}</div><div class='ctx'> 	kmem_cache_free(qp_cache, my_qp);</div><div class='ctx'> 	atomic_dec(&amp;shca-&gt;num_qps);</div><div class='head'>diff --git a/drivers/infiniband/hw/ehca/ehca_reqs.c b/drivers/infiniband/hw/ehca/ehca_reqs.c<br/>index 4426d82fe798..64928079eafa 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/infiniband/hw/ehca/ehca_reqs.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/infiniband/hw/ehca/ehca_reqs.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/infiniband/hw/ehca/ehca_reqs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/infiniband/hw/ehca/ehca_reqs.c</a></div><div class='hunk'>@@ -53,9 +53,25 @@</div><div class='ctx'> /* in RC traffic, insert an empty RDMA READ every this many packets */</div><div class='ctx'> #define ACK_CIRC_THRESHOLD 2000000</div><div class='ctx'> </div><div class='add'>+static u64 replace_wr_id(u64 wr_id, u16 idx)</div><div class='add'>+{</div><div class='add'>+	u64 ret;</div><div class='add'>+</div><div class='add'>+	ret = wr_id &amp; ~QMAP_IDX_MASK;</div><div class='add'>+	ret |= idx &amp; QMAP_IDX_MASK;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 get_app_wr_id(u64 wr_id)</div><div class='add'>+{</div><div class='add'>+	return wr_id &amp; QMAP_IDX_MASK;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline int ehca_write_rwqe(struct ipz_queue *ipz_rqueue,</div><div class='ctx'> 				  struct ehca_wqe *wqe_p,</div><div class='del'>-				  struct ib_recv_wr *recv_wr)</div><div class='add'>+				  struct ib_recv_wr *recv_wr,</div><div class='add'>+				  u32 rq_map_idx)</div><div class='ctx'> {</div><div class='ctx'> 	u8 cnt_ds;</div><div class='ctx'> 	if (unlikely((recv_wr-&gt;num_sge &lt; 0) ||</div><div class='hunk'>@@ -69,7 +85,7 @@ static inline int ehca_write_rwqe(struct ipz_queue *ipz_rqueue,</div><div class='ctx'> 	/* clear wqe header until sglist */</div><div class='ctx'> 	memset(wqe_p, 0, offsetof(struct ehca_wqe, u.ud_av.sg_list));</div><div class='ctx'> </div><div class='del'>-	wqe_p-&gt;work_request_id = recv_wr-&gt;wr_id;</div><div class='add'>+	wqe_p-&gt;work_request_id = replace_wr_id(recv_wr-&gt;wr_id, rq_map_idx);</div><div class='ctx'> 	wqe_p-&gt;nr_of_data_seg = recv_wr-&gt;num_sge;</div><div class='ctx'> </div><div class='ctx'> 	for (cnt_ds = 0; cnt_ds &lt; recv_wr-&gt;num_sge; cnt_ds++) {</div><div class='hunk'>@@ -146,6 +162,7 @@ static inline int ehca_write_swqe(struct ehca_qp *qp,</div><div class='ctx'> 	u64 dma_length;</div><div class='ctx'> 	struct ehca_av *my_av;</div><div class='ctx'> 	u32 remote_qkey = send_wr-&gt;wr.ud.remote_qkey;</div><div class='add'>+	struct ehca_qmap_entry *qmap_entry = &amp;qp-&gt;sq_map.map[sq_map_idx];</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely((send_wr-&gt;num_sge &lt; 0) ||</div><div class='ctx'> 		     (send_wr-&gt;num_sge &gt; qp-&gt;ipz_squeue.act_nr_of_sg))) {</div><div class='hunk'>@@ -158,11 +175,10 @@ static inline int ehca_write_swqe(struct ehca_qp *qp,</div><div class='ctx'> 	/* clear wqe header until sglist */</div><div class='ctx'> 	memset(wqe_p, 0, offsetof(struct ehca_wqe, u.ud_av.sg_list));</div><div class='ctx'> </div><div class='del'>-	wqe_p-&gt;work_request_id = send_wr-&gt;wr_id &amp; ~QMAP_IDX_MASK;</div><div class='del'>-	wqe_p-&gt;work_request_id |= sq_map_idx &amp; QMAP_IDX_MASK;</div><div class='add'>+	wqe_p-&gt;work_request_id = replace_wr_id(send_wr-&gt;wr_id, sq_map_idx);</div><div class='ctx'> </div><div class='del'>-	qp-&gt;sq_map[sq_map_idx].app_wr_id = send_wr-&gt;wr_id &amp; QMAP_IDX_MASK;</div><div class='del'>-	qp-&gt;sq_map[sq_map_idx].reported = 0;</div><div class='add'>+	qmap_entry-&gt;app_wr_id = get_app_wr_id(send_wr-&gt;wr_id);</div><div class='add'>+	qmap_entry-&gt;reported = 0;</div><div class='ctx'> </div><div class='ctx'> 	switch (send_wr-&gt;opcode) {</div><div class='ctx'> 	case IB_WR_SEND:</div><div class='hunk'>@@ -496,7 +512,9 @@ static int internal_post_recv(struct ehca_qp *my_qp,</div><div class='ctx'> 	struct ehca_wqe *wqe_p;</div><div class='ctx'> 	int wqe_cnt = 0;</div><div class='ctx'> 	int ret = 0;</div><div class='add'>+	u32 rq_map_idx;</div><div class='ctx'> 	unsigned long flags;</div><div class='add'>+	struct ehca_qmap_entry *qmap_entry;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(!HAS_RQ(my_qp))) {</div><div class='ctx'> 		ehca_err(dev, "QP has no RQ  ehca_qp=%p qp_num=%x ext_type=%d",</div><div class='hunk'>@@ -524,8 +542,15 @@ static int internal_post_recv(struct ehca_qp *my_qp,</div><div class='ctx'> 			}</div><div class='ctx'> 			goto post_recv_exit0;</div><div class='ctx'> 		}</div><div class='add'>+		/*</div><div class='add'>+		 * Get the index of the WQE in the recv queue. The same index</div><div class='add'>+		 * is used for writing into the rq_map.</div><div class='add'>+		 */</div><div class='add'>+		rq_map_idx = start_offset / my_qp-&gt;ipz_rqueue.qe_size;</div><div class='add'>+</div><div class='ctx'> 		/* write a RECV WQE into the QUEUE */</div><div class='del'>-		ret = ehca_write_rwqe(&amp;my_qp-&gt;ipz_rqueue, wqe_p, cur_recv_wr);</div><div class='add'>+		ret = ehca_write_rwqe(&amp;my_qp-&gt;ipz_rqueue, wqe_p, cur_recv_wr,</div><div class='add'>+				rq_map_idx);</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * if something failed,</div><div class='ctx'> 		 * reset the free entry pointer to the start value</div><div class='hunk'>@@ -540,6 +565,11 @@ static int internal_post_recv(struct ehca_qp *my_qp,</div><div class='ctx'> 			}</div><div class='ctx'> 			goto post_recv_exit0;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		qmap_entry = &amp;my_qp-&gt;rq_map.map[rq_map_idx];</div><div class='add'>+		qmap_entry-&gt;app_wr_id = get_app_wr_id(cur_recv_wr-&gt;wr_id);</div><div class='add'>+		qmap_entry-&gt;reported = 0;</div><div class='add'>+</div><div class='ctx'> 		wqe_cnt++;</div><div class='ctx'> 	} /* eof for cur_recv_wr */</div><div class='ctx'> </div><div class='hunk'>@@ -596,10 +626,12 @@ static const u8 ib_wc_opcode[255] = {</div><div class='ctx'> /* internal function to poll one entry of cq */</div><div class='ctx'> static inline int ehca_poll_cq_one(struct ib_cq *cq, struct ib_wc *wc)</div><div class='ctx'> {</div><div class='del'>-	int ret = 0;</div><div class='add'>+	int ret = 0, qmap_tail_idx;</div><div class='ctx'> 	struct ehca_cq *my_cq = container_of(cq, struct ehca_cq, ib_cq);</div><div class='ctx'> 	struct ehca_cqe *cqe;</div><div class='ctx'> 	struct ehca_qp *my_qp;</div><div class='add'>+	struct ehca_qmap_entry *qmap_entry;</div><div class='add'>+	struct ehca_queue_map *qmap;</div><div class='ctx'> 	int cqe_count = 0, is_error;</div><div class='ctx'> </div><div class='ctx'> repoll:</div><div class='hunk'>@@ -674,27 +706,52 @@ repoll:</div><div class='ctx'> 		goto repoll;</div><div class='ctx'> 	wc-&gt;qp = &amp;my_qp-&gt;ib_qp;</div><div class='ctx'> </div><div class='del'>-	if (!(cqe-&gt;w_completion_flags &amp; WC_SEND_RECEIVE_BIT)) {</div><div class='del'>-		struct ehca_qmap_entry *qmap_entry;</div><div class='add'>+	if (is_error) {</div><div class='ctx'> 		/*</div><div class='del'>-		 * We got a send completion and need to restore the original</div><div class='del'>-		 * wr_id.</div><div class='add'>+		 * set left_to_poll to 0 because in error state, we will not</div><div class='add'>+		 * get any additional CQEs</div><div class='ctx'> 		 */</div><div class='del'>-		qmap_entry = &amp;my_qp-&gt;sq_map[cqe-&gt;work_request_id &amp;</div><div class='del'>-					    QMAP_IDX_MASK];</div><div class='add'>+		ehca_add_to_err_list(my_qp, 1);</div><div class='add'>+		my_qp-&gt;sq_map.left_to_poll = 0;</div><div class='ctx'> </div><div class='del'>-		if (qmap_entry-&gt;reported) {</div><div class='del'>-			ehca_warn(cq-&gt;device, "Double cqe on qp_num=%#x",</div><div class='del'>-				  my_qp-&gt;real_qp_num);</div><div class='del'>-			/* found a double cqe, discard it and read next one */</div><div class='del'>-			goto repoll;</div><div class='del'>-		}</div><div class='del'>-		wc-&gt;wr_id = cqe-&gt;work_request_id &amp; ~QMAP_IDX_MASK;</div><div class='del'>-		wc-&gt;wr_id |= qmap_entry-&gt;app_wr_id;</div><div class='del'>-		qmap_entry-&gt;reported = 1;</div><div class='del'>-	} else</div><div class='add'>+		if (HAS_RQ(my_qp))</div><div class='add'>+			ehca_add_to_err_list(my_qp, 0);</div><div class='add'>+		my_qp-&gt;rq_map.left_to_poll = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	qmap_tail_idx = get_app_wr_id(cqe-&gt;work_request_id);</div><div class='add'>+	if (!(cqe-&gt;w_completion_flags &amp; WC_SEND_RECEIVE_BIT))</div><div class='add'>+		/* We got a send completion. */</div><div class='add'>+		qmap = &amp;my_qp-&gt;sq_map;</div><div class='add'>+	else</div><div class='ctx'> 		/* We got a receive completion. */</div><div class='del'>-		wc-&gt;wr_id = cqe-&gt;work_request_id;</div><div class='add'>+		qmap = &amp;my_qp-&gt;rq_map;</div><div class='add'>+</div><div class='add'>+	qmap_entry = &amp;qmap-&gt;map[qmap_tail_idx];</div><div class='add'>+	if (qmap_entry-&gt;reported) {</div><div class='add'>+		ehca_warn(cq-&gt;device, "Double cqe on qp_num=%#x",</div><div class='add'>+				my_qp-&gt;real_qp_num);</div><div class='add'>+		/* found a double cqe, discard it and read next one */</div><div class='add'>+		goto repoll;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	wc-&gt;wr_id = replace_wr_id(cqe-&gt;work_request_id, qmap_entry-&gt;app_wr_id);</div><div class='add'>+	qmap_entry-&gt;reported = 1;</div><div class='add'>+</div><div class='add'>+	/* this is a proper completion, we need to advance the tail pointer */</div><div class='add'>+	if (++qmap-&gt;tail == qmap-&gt;entries)</div><div class='add'>+		qmap-&gt;tail = 0;</div><div class='add'>+</div><div class='add'>+	/* if left_to_poll is decremented to 0, add the QP to the error list */</div><div class='add'>+	if (qmap-&gt;left_to_poll &gt; 0) {</div><div class='add'>+		qmap-&gt;left_to_poll--;</div><div class='add'>+		if ((my_qp-&gt;sq_map.left_to_poll == 0) &amp;&amp;</div><div class='add'>+				(my_qp-&gt;rq_map.left_to_poll == 0)) {</div><div class='add'>+			ehca_add_to_err_list(my_qp, 1);</div><div class='add'>+			if (HAS_RQ(my_qp))</div><div class='add'>+				ehca_add_to_err_list(my_qp, 0);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* eval ib_wc_opcode */</div><div class='ctx'> 	wc-&gt;opcode = ib_wc_opcode[cqe-&gt;optype]-1;</div><div class='hunk'>@@ -733,13 +790,88 @@ poll_cq_one_exit0:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int generate_flush_cqes(struct ehca_qp *my_qp, struct ib_cq *cq,</div><div class='add'>+			       struct ib_wc *wc, int num_entries,</div><div class='add'>+			       struct ipz_queue *ipz_queue, int on_sq)</div><div class='add'>+{</div><div class='add'>+	int nr = 0;</div><div class='add'>+	struct ehca_wqe *wqe;</div><div class='add'>+	u64 offset;</div><div class='add'>+	struct ehca_queue_map *qmap;</div><div class='add'>+	struct ehca_qmap_entry *qmap_entry;</div><div class='add'>+</div><div class='add'>+	if (on_sq)</div><div class='add'>+		qmap = &amp;my_qp-&gt;sq_map;</div><div class='add'>+	else</div><div class='add'>+		qmap = &amp;my_qp-&gt;rq_map;</div><div class='add'>+</div><div class='add'>+	qmap_entry = &amp;qmap-&gt;map[qmap-&gt;tail];</div><div class='add'>+</div><div class='add'>+	while ((nr &lt; num_entries) &amp;&amp; (qmap_entry-&gt;reported == 0)) {</div><div class='add'>+		/* generate flush CQE */</div><div class='add'>+		memset(wc, 0, sizeof(*wc));</div><div class='add'>+</div><div class='add'>+		offset = qmap-&gt;tail * ipz_queue-&gt;qe_size;</div><div class='add'>+		wqe = (struct ehca_wqe *)ipz_qeit_calc(ipz_queue, offset);</div><div class='add'>+		if (!wqe) {</div><div class='add'>+			ehca_err(cq-&gt;device, "Invalid wqe offset=%#lx on "</div><div class='add'>+				 "qp_num=%#x", offset, my_qp-&gt;real_qp_num);</div><div class='add'>+			return nr;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		wc-&gt;wr_id = replace_wr_id(wqe-&gt;work_request_id,</div><div class='add'>+					  qmap_entry-&gt;app_wr_id);</div><div class='add'>+</div><div class='add'>+		if (on_sq) {</div><div class='add'>+			switch (wqe-&gt;optype) {</div><div class='add'>+			case WQE_OPTYPE_SEND:</div><div class='add'>+				wc-&gt;opcode = IB_WC_SEND;</div><div class='add'>+				break;</div><div class='add'>+			case WQE_OPTYPE_RDMAWRITE:</div><div class='add'>+				wc-&gt;opcode = IB_WC_RDMA_WRITE;</div><div class='add'>+				break;</div><div class='add'>+			case WQE_OPTYPE_RDMAREAD:</div><div class='add'>+				wc-&gt;opcode = IB_WC_RDMA_READ;</div><div class='add'>+				break;</div><div class='add'>+			default:</div><div class='add'>+				ehca_err(cq-&gt;device, "Invalid optype=%x",</div><div class='add'>+						wqe-&gt;optype);</div><div class='add'>+				return nr;</div><div class='add'>+			}</div><div class='add'>+		} else</div><div class='add'>+			wc-&gt;opcode = IB_WC_RECV;</div><div class='add'>+</div><div class='add'>+		if (wqe-&gt;wr_flag &amp; WQE_WRFLAG_IMM_DATA_PRESENT) {</div><div class='add'>+			wc-&gt;ex.imm_data = wqe-&gt;immediate_data;</div><div class='add'>+			wc-&gt;wc_flags |= IB_WC_WITH_IMM;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		wc-&gt;status = IB_WC_WR_FLUSH_ERR;</div><div class='add'>+</div><div class='add'>+		wc-&gt;qp = &amp;my_qp-&gt;ib_qp;</div><div class='add'>+</div><div class='add'>+		/* mark as reported and advance tail pointer */</div><div class='add'>+		qmap_entry-&gt;reported = 1;</div><div class='add'>+		if (++qmap-&gt;tail == qmap-&gt;entries)</div><div class='add'>+			qmap-&gt;tail = 0;</div><div class='add'>+		qmap_entry = &amp;qmap-&gt;map[qmap-&gt;tail];</div><div class='add'>+</div><div class='add'>+		wc++; nr++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return nr;</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int ehca_poll_cq(struct ib_cq *cq, int num_entries, struct ib_wc *wc)</div><div class='ctx'> {</div><div class='ctx'> 	struct ehca_cq *my_cq = container_of(cq, struct ehca_cq, ib_cq);</div><div class='ctx'> 	int nr;</div><div class='add'>+	struct ehca_qp *err_qp;</div><div class='ctx'> 	struct ib_wc *current_wc = wc;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	unsigned long flags;</div><div class='add'>+	int entries_left = num_entries;</div><div class='ctx'> </div><div class='ctx'> 	if (num_entries &lt; 1) {</div><div class='ctx'> 		ehca_err(cq-&gt;device, "Invalid num_entries=%d ehca_cq=%p "</div><div class='hunk'>@@ -749,15 +881,40 @@ int ehca_poll_cq(struct ib_cq *cq, int num_entries, struct ib_wc *wc)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;my_cq-&gt;spinlock, flags);</div><div class='del'>-	for (nr = 0; nr &lt; num_entries; nr++) {</div><div class='add'>+</div><div class='add'>+	/* generate flush cqes for send queues */</div><div class='add'>+	list_for_each_entry(err_qp, &amp;my_cq-&gt;sqp_err_list, sq_err_node) {</div><div class='add'>+		nr = generate_flush_cqes(err_qp, cq, current_wc, entries_left,</div><div class='add'>+				&amp;err_qp-&gt;ipz_squeue, 1);</div><div class='add'>+		entries_left -= nr;</div><div class='add'>+		current_wc += nr;</div><div class='add'>+</div><div class='add'>+		if (entries_left == 0)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* generate flush cqes for receive queues */</div><div class='add'>+	list_for_each_entry(err_qp, &amp;my_cq-&gt;rqp_err_list, rq_err_node) {</div><div class='add'>+		nr = generate_flush_cqes(err_qp, cq, current_wc, entries_left,</div><div class='add'>+				&amp;err_qp-&gt;ipz_rqueue, 0);</div><div class='add'>+		entries_left -= nr;</div><div class='add'>+		current_wc += nr;</div><div class='add'>+</div><div class='add'>+		if (entries_left == 0)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (nr = 0; nr &lt; entries_left; nr++) {</div><div class='ctx'> 		ret = ehca_poll_cq_one(cq, current_wc);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			break;</div><div class='ctx'> 		current_wc++;</div><div class='ctx'> 	} /* eof for nr */</div><div class='add'>+	entries_left -= nr;</div><div class='add'>+</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;my_cq-&gt;spinlock, flags);</div><div class='ctx'> 	if (ret == -EAGAIN  || !ret)</div><div class='del'>-		ret = nr;</div><div class='add'>+		ret = num_entries - entries_left;</div><div class='ctx'> </div><div class='ctx'> poll_cq_exit0:</div><div class='ctx'> 	return ret;</div><div class='head'>diff --git a/drivers/infiniband/hw/ipath/ipath_file_ops.c b/drivers/infiniband/hw/ipath/ipath_file_ops.c<br/>index 56c0eda3c077..1af1f3a907c6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/infiniband/hw/ipath/ipath_file_ops.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/infiniband/hw/ipath/ipath_file_ops.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/infiniband/hw/ipath/ipath_file_ops.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/infiniband/hw/ipath/ipath_file_ops.c</a></div><div class='hunk'>@@ -2455,7 +2455,7 @@ static int init_cdev(int minor, char *name, const struct file_operations *fops,</div><div class='ctx'> 		goto err_cdev;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	device = device_create_drvdata(ipath_class, NULL, dev, NULL, name);</div><div class='add'>+	device = device_create(ipath_class, NULL, dev, NULL, name);</div><div class='ctx'> </div><div class='ctx'> 	if (IS_ERR(device)) {</div><div class='ctx'> 		ret = PTR_ERR(device);</div><div class='head'>diff --git a/drivers/infiniband/hw/ipath/ipath_rc.c b/drivers/infiniband/hw/ipath/ipath_rc.c<br/>index 97710522624d..7b93cda1a4bd 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/infiniband/hw/ipath/ipath_rc.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/infiniband/hw/ipath/ipath_rc.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/infiniband/hw/ipath/ipath_rc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/infiniband/hw/ipath/ipath_rc.c</a></div><div class='hunk'>@@ -675,7 +675,8 @@ static void send_rc_ack(struct ipath_qp *qp)</div><div class='ctx'> 	hdr.lrh[0] = cpu_to_be16(lrh0);</div><div class='ctx'> 	hdr.lrh[1] = cpu_to_be16(qp-&gt;remote_ah_attr.dlid);</div><div class='ctx'> 	hdr.lrh[2] = cpu_to_be16(hwords + SIZE_OF_CRC);</div><div class='del'>-	hdr.lrh[3] = cpu_to_be16(dd-&gt;ipath_lid);</div><div class='add'>+	hdr.lrh[3] = cpu_to_be16(dd-&gt;ipath_lid |</div><div class='add'>+				 qp-&gt;remote_ah_attr.src_path_bits);</div><div class='ctx'> 	ohdr-&gt;bth[0] = cpu_to_be32(bth0);</div><div class='ctx'> 	ohdr-&gt;bth[1] = cpu_to_be32(qp-&gt;remote_qpn);</div><div class='ctx'> 	ohdr-&gt;bth[2] = cpu_to_be32(qp-&gt;r_ack_psn &amp; IPATH_PSN_MASK);</div><div class='head'>diff --git a/drivers/infiniband/hw/ipath/ipath_ruc.c b/drivers/infiniband/hw/ipath/ipath_ruc.c<br/>index af051f757663..fc0f6d9e6030 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/infiniband/hw/ipath/ipath_ruc.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/infiniband/hw/ipath/ipath_ruc.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/infiniband/hw/ipath/ipath_ruc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/infiniband/hw/ipath/ipath_ruc.c</a></div><div class='hunk'>@@ -618,7 +618,8 @@ void ipath_make_ruc_header(struct ipath_ibdev *dev, struct ipath_qp *qp,</div><div class='ctx'> 	qp-&gt;s_hdr.lrh[0] = cpu_to_be16(lrh0);</div><div class='ctx'> 	qp-&gt;s_hdr.lrh[1] = cpu_to_be16(qp-&gt;remote_ah_attr.dlid);</div><div class='ctx'> 	qp-&gt;s_hdr.lrh[2] = cpu_to_be16(qp-&gt;s_hdrwords + nwords + SIZE_OF_CRC);</div><div class='del'>-	qp-&gt;s_hdr.lrh[3] = cpu_to_be16(dev-&gt;dd-&gt;ipath_lid);</div><div class='add'>+	qp-&gt;s_hdr.lrh[3] = cpu_to_be16(dev-&gt;dd-&gt;ipath_lid |</div><div class='add'>+				       qp-&gt;remote_ah_attr.src_path_bits);</div><div class='ctx'> 	bth0 |= ipath_get_pkey(dev-&gt;dd, qp-&gt;s_pkey_index);</div><div class='ctx'> 	bth0 |= extra_bytes &lt;&lt; 20;</div><div class='ctx'> 	ohdr-&gt;bth[0] = cpu_to_be32(bth0 | (1 &lt;&lt; 22));</div><div class='head'>diff --git a/drivers/infiniband/hw/ipath/ipath_verbs.c b/drivers/infiniband/hw/ipath/ipath_verbs.c<br/>index b766e40e9ebf..eabc4247860b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/infiniband/hw/ipath/ipath_verbs.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/infiniband/hw/ipath/ipath_verbs.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/infiniband/hw/ipath/ipath_verbs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/infiniband/hw/ipath/ipath_verbs.c</a></div><div class='hunk'>@@ -340,9 +340,16 @@ static int ipath_post_one_send(struct ipath_qp *qp, struct ib_send_wr *wr)</div><div class='ctx'> 	int acc;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	unsigned long flags;</div><div class='add'>+	struct ipath_devdata *dd = to_idev(qp-&gt;ibqp.device)-&gt;dd;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;qp-&gt;s_lock, flags);</div><div class='ctx'> </div><div class='add'>+	if (qp-&gt;ibqp.qp_type != IB_QPT_SMI &amp;&amp;</div><div class='add'>+	    !(dd-&gt;ipath_flags &amp; IPATH_LINKACTIVE)) {</div><div class='add'>+		ret = -ENETDOWN;</div><div class='add'>+		goto bail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Check that state is OK to post send. */</div><div class='ctx'> 	if (unlikely(!(ib_ipath_state_ops[qp-&gt;state] &amp; IPATH_POST_SEND_OK)))</div><div class='ctx'> 		goto bail_inval;</div><div class='head'>diff --git a/drivers/infiniband/hw/mlx4/qp.c b/drivers/infiniband/hw/mlx4/qp.c<br/>index 9559248f265b..baa01deb2436 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/infiniband/hw/mlx4/qp.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/infiniband/hw/mlx4/qp.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/infiniband/hw/mlx4/qp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/infiniband/hw/mlx4/qp.c</a></div><div class='hunk'>@@ -1058,6 +1058,9 @@ static int __mlx4_ib_modify_qp(struct ib_qp *ibqp,</div><div class='ctx'> 	else</div><div class='ctx'> 		sqd_event = 0;</div><div class='ctx'> </div><div class='add'>+	if (!ibqp-&gt;uobject &amp;&amp; cur_state == IB_QPS_RESET &amp;&amp; new_state == IB_QPS_INIT)</div><div class='add'>+		context-&gt;rlkey |= (1 &lt;&lt; 4);</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Before passing a kernel QP to the HW, make sure that the</div><div class='ctx'> 	 * ownership bits of the send queue are set and the SQ</div><div class='head'>diff --git a/drivers/infiniband/hw/mthca/mthca_catas.c b/drivers/infiniband/hw/mthca/mthca_catas.c<br/>index cc440f90000b..65ad359fdf16 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/infiniband/hw/mthca/mthca_catas.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/infiniband/hw/mthca/mthca_catas.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/infiniband/hw/mthca/mthca_catas.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/infiniband/hw/mthca/mthca_catas.c</a></div><div class='hunk'>@@ -149,18 +149,10 @@ void mthca_start_catas_poll(struct mthca_dev *dev)</div><div class='ctx'> 		((pci_resource_len(dev-&gt;pdev, 0) - 1) &amp;</div><div class='ctx'> 		 dev-&gt;catas_err.addr);</div><div class='ctx'> </div><div class='del'>-	if (!request_mem_region(addr, dev-&gt;catas_err.size * 4,</div><div class='del'>-				DRV_NAME)) {</div><div class='del'>-		mthca_warn(dev, "couldn't request catastrophic error region "</div><div class='del'>-			   "at 0x%lx/0x%x\n", addr, dev-&gt;catas_err.size * 4);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	dev-&gt;catas_err.map = ioremap(addr, dev-&gt;catas_err.size * 4);</div><div class='ctx'> 	if (!dev-&gt;catas_err.map) {</div><div class='ctx'> 		mthca_warn(dev, "couldn't map catastrophic error region "</div><div class='ctx'> 			   "at 0x%lx/0x%x\n", addr, dev-&gt;catas_err.size * 4);</div><div class='del'>-		release_mem_region(addr, dev-&gt;catas_err.size * 4);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -175,13 +167,8 @@ void mthca_stop_catas_poll(struct mthca_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	del_timer_sync(&amp;dev-&gt;catas_err.timer);</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;catas_err.map) {</div><div class='add'>+	if (dev-&gt;catas_err.map)</div><div class='ctx'> 		iounmap(dev-&gt;catas_err.map);</div><div class='del'>-		release_mem_region(pci_resource_start(dev-&gt;pdev, 0) +</div><div class='del'>-				   ((pci_resource_len(dev-&gt;pdev, 0) - 1) &amp;</div><div class='del'>-				    dev-&gt;catas_err.addr),</div><div class='del'>-				   dev-&gt;catas_err.size * 4);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irq(&amp;catas_lock);</div><div class='ctx'> 	list_del(&amp;dev-&gt;catas_err.list);</div><div class='head'>diff --git a/drivers/infiniband/hw/mthca/mthca_eq.c b/drivers/infiniband/hw/mthca/mthca_eq.c<br/>index cc6858f0b65b..28f0e0c40d7d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/infiniband/hw/mthca/mthca_eq.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/infiniband/hw/mthca/mthca_eq.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/infiniband/hw/mthca/mthca_eq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/infiniband/hw/mthca/mthca_eq.c</a></div><div class='hunk'>@@ -652,27 +652,13 @@ static int mthca_map_reg(struct mthca_dev *dev,</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long base = pci_resource_start(dev-&gt;pdev, 0);</div><div class='ctx'> </div><div class='del'>-	if (!request_mem_region(base + offset, size, DRV_NAME))</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='ctx'> 	*map = ioremap(base + offset, size);</div><div class='del'>-	if (!*map) {</div><div class='del'>-		release_mem_region(base + offset, size);</div><div class='add'>+	if (!*map)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mthca_unmap_reg(struct mthca_dev *dev, unsigned long offset,</div><div class='del'>-			    unsigned long size, void __iomem *map)</div><div class='del'>-{</div><div class='del'>-	unsigned long base = pci_resource_start(dev-&gt;pdev, 0);</div><div class='del'>-</div><div class='del'>-	release_mem_region(base + offset, size);</div><div class='del'>-	iounmap(map);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int mthca_map_eq_regs(struct mthca_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	if (mthca_is_memfree(dev)) {</div><div class='hunk'>@@ -699,9 +685,7 @@ static int mthca_map_eq_regs(struct mthca_dev *dev)</div><div class='ctx'> 					dev-&gt;fw.arbel.eq_arm_base) + 4, 4,</div><div class='ctx'> 				  &amp;dev-&gt;eq_regs.arbel.eq_arm)) {</div><div class='ctx'> 			mthca_err(dev, "Couldn't map EQ arm register, aborting.\n");</div><div class='del'>-			mthca_unmap_reg(dev, (pci_resource_len(dev-&gt;pdev, 0) - 1) &amp;</div><div class='del'>-					dev-&gt;fw.arbel.clr_int_base, MTHCA_CLR_INT_SIZE,</div><div class='del'>-					dev-&gt;clr_base);</div><div class='add'>+			iounmap(dev-&gt;clr_base);</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -710,12 +694,8 @@ static int mthca_map_eq_regs(struct mthca_dev *dev)</div><div class='ctx'> 				  MTHCA_EQ_SET_CI_SIZE,</div><div class='ctx'> 				  &amp;dev-&gt;eq_regs.arbel.eq_set_ci_base)) {</div><div class='ctx'> 			mthca_err(dev, "Couldn't map EQ CI register, aborting.\n");</div><div class='del'>-			mthca_unmap_reg(dev, ((pci_resource_len(dev-&gt;pdev, 0) - 1) &amp;</div><div class='del'>-					      dev-&gt;fw.arbel.eq_arm_base) + 4, 4,</div><div class='del'>-					dev-&gt;eq_regs.arbel.eq_arm);</div><div class='del'>-			mthca_unmap_reg(dev, (pci_resource_len(dev-&gt;pdev, 0) - 1) &amp;</div><div class='del'>-					dev-&gt;fw.arbel.clr_int_base, MTHCA_CLR_INT_SIZE,</div><div class='del'>-					dev-&gt;clr_base);</div><div class='add'>+			iounmap(dev-&gt;eq_regs.arbel.eq_arm);</div><div class='add'>+			iounmap(dev-&gt;clr_base);</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -731,8 +711,7 @@ static int mthca_map_eq_regs(struct mthca_dev *dev)</div><div class='ctx'> 				  &amp;dev-&gt;eq_regs.tavor.ecr_base)) {</div><div class='ctx'> 			mthca_err(dev, "Couldn't map ecr register, "</div><div class='ctx'> 				  "aborting.\n");</div><div class='del'>-			mthca_unmap_reg(dev, MTHCA_CLR_INT_BASE, MTHCA_CLR_INT_SIZE,</div><div class='del'>-					dev-&gt;clr_base);</div><div class='add'>+			iounmap(dev-&gt;clr_base);</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -744,22 +723,12 @@ static int mthca_map_eq_regs(struct mthca_dev *dev)</div><div class='ctx'> static void mthca_unmap_eq_regs(struct mthca_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	if (mthca_is_memfree(dev)) {</div><div class='del'>-		mthca_unmap_reg(dev, (pci_resource_len(dev-&gt;pdev, 0) - 1) &amp;</div><div class='del'>-				dev-&gt;fw.arbel.eq_set_ci_base,</div><div class='del'>-				MTHCA_EQ_SET_CI_SIZE,</div><div class='del'>-				dev-&gt;eq_regs.arbel.eq_set_ci_base);</div><div class='del'>-		mthca_unmap_reg(dev, ((pci_resource_len(dev-&gt;pdev, 0) - 1) &amp;</div><div class='del'>-				      dev-&gt;fw.arbel.eq_arm_base) + 4, 4,</div><div class='del'>-				dev-&gt;eq_regs.arbel.eq_arm);</div><div class='del'>-		mthca_unmap_reg(dev, (pci_resource_len(dev-&gt;pdev, 0) - 1) &amp;</div><div class='del'>-				dev-&gt;fw.arbel.clr_int_base, MTHCA_CLR_INT_SIZE,</div><div class='del'>-				dev-&gt;clr_base);</div><div class='add'>+		iounmap(dev-&gt;eq_regs.arbel.eq_set_ci_base);</div><div class='add'>+		iounmap(dev-&gt;eq_regs.arbel.eq_arm);</div><div class='add'>+		iounmap(dev-&gt;clr_base);</div><div class='ctx'> 	} else {</div><div class='del'>-		mthca_unmap_reg(dev, MTHCA_ECR_BASE,</div><div class='del'>-				MTHCA_ECR_SIZE + MTHCA_ECR_CLR_SIZE,</div><div class='del'>-				dev-&gt;eq_regs.tavor.ecr_base);</div><div class='del'>-		mthca_unmap_reg(dev, MTHCA_CLR_INT_BASE, MTHCA_CLR_INT_SIZE,</div><div class='del'>-				dev-&gt;clr_base);</div><div class='add'>+		iounmap(dev-&gt;eq_regs.tavor.ecr_base);</div><div class='add'>+		iounmap(dev-&gt;clr_base);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/infiniband/hw/mthca/mthca_main.c b/drivers/infiniband/hw/mthca/mthca_main.c<br/>index fb9f91b60f30..52f60f4eea00 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/infiniband/hw/mthca/mthca_main.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/infiniband/hw/mthca/mthca_main.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/infiniband/hw/mthca/mthca_main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/infiniband/hw/mthca/mthca_main.c</a></div><div class='hunk'>@@ -921,58 +921,6 @@ err_uar_table_free:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mthca_request_regions(struct pci_dev *pdev, int ddr_hidden)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We can't just use pci_request_regions() because the MSI-X</div><div class='del'>-	 * table is right in the middle of the first BAR.  If we did</div><div class='del'>-	 * pci_request_region and grab all of the first BAR, then</div><div class='del'>-	 * setting up MSI-X would fail, since the PCI core wants to do</div><div class='del'>-	 * request_mem_region on the MSI-X vector table.</div><div class='del'>-	 *</div><div class='del'>-	 * So just request what we need right now, and request any</div><div class='del'>-	 * other regions we need when setting up EQs.</div><div class='del'>-	 */</div><div class='del'>-	if (!request_mem_region(pci_resource_start(pdev, 0) + MTHCA_HCR_BASE,</div><div class='del'>-				MTHCA_HCR_SIZE, DRV_NAME))</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='del'>-	err = pci_request_region(pdev, 2, DRV_NAME);</div><div class='del'>-	if (err)</div><div class='del'>-		goto err_bar2_failed;</div><div class='del'>-</div><div class='del'>-	if (!ddr_hidden) {</div><div class='del'>-		err = pci_request_region(pdev, 4, DRV_NAME);</div><div class='del'>-		if (err)</div><div class='del'>-			goto err_bar4_failed;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-err_bar4_failed:</div><div class='del'>-	pci_release_region(pdev, 2);</div><div class='del'>-</div><div class='del'>-err_bar2_failed:</div><div class='del'>-	release_mem_region(pci_resource_start(pdev, 0) + MTHCA_HCR_BASE,</div><div class='del'>-			   MTHCA_HCR_SIZE);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mthca_release_regions(struct pci_dev *pdev,</div><div class='del'>-				  int ddr_hidden)</div><div class='del'>-{</div><div class='del'>-	if (!ddr_hidden)</div><div class='del'>-		pci_release_region(pdev, 4);</div><div class='del'>-</div><div class='del'>-	pci_release_region(pdev, 2);</div><div class='del'>-</div><div class='del'>-	release_mem_region(pci_resource_start(pdev, 0) + MTHCA_HCR_BASE,</div><div class='del'>-			   MTHCA_HCR_SIZE);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int mthca_enable_msi_x(struct mthca_dev *mdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct msix_entry entries[3];</div><div class='hunk'>@@ -1059,7 +1007,7 @@ static int __mthca_init_one(struct pci_dev *pdev, int hca_type)</div><div class='ctx'> 	if (!(pci_resource_flags(pdev, 4) &amp; IORESOURCE_MEM))</div><div class='ctx'> 		ddr_hidden = 1;</div><div class='ctx'> </div><div class='del'>-	err = mthca_request_regions(pdev, ddr_hidden);</div><div class='add'>+	err = pci_request_regions(pdev, DRV_NAME);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "Cannot obtain PCI resources, "</div><div class='ctx'> 			"aborting.\n");</div><div class='hunk'>@@ -1196,7 +1144,7 @@ err_free_dev:</div><div class='ctx'> 	ib_dealloc_device(&amp;mdev-&gt;ib_dev);</div><div class='ctx'> </div><div class='ctx'> err_free_res:</div><div class='del'>-	mthca_release_regions(pdev, ddr_hidden);</div><div class='add'>+	pci_release_regions(pdev);</div><div class='ctx'> </div><div class='ctx'> err_disable_pdev:</div><div class='ctx'> 	pci_disable_device(pdev);</div><div class='hunk'>@@ -1240,8 +1188,7 @@ static void __mthca_remove_one(struct pci_dev *pdev)</div><div class='ctx'> 			pci_disable_msix(pdev);</div><div class='ctx'> </div><div class='ctx'> 		ib_dealloc_device(&amp;mdev-&gt;ib_dev);</div><div class='del'>-		mthca_release_regions(pdev, mdev-&gt;mthca_flags &amp;</div><div class='del'>-				      MTHCA_FLAG_DDR_HIDDEN);</div><div class='add'>+		pci_release_regions(pdev);</div><div class='ctx'> 		pci_disable_device(pdev);</div><div class='ctx'> 		pci_set_drvdata(pdev, NULL);</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/infiniband/hw/nes/nes.c b/drivers/infiniband/hw/nes/nes.c<br/>index b0cab64e5e3d..a2b04d62b1a4 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/infiniband/hw/nes/nes.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/infiniband/hw/nes/nes.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/infiniband/hw/nes/nes.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/infiniband/hw/nes/nes.c</a></div><div class='hunk'>@@ -70,27 +70,31 @@ int interrupt_mod_interval = 0;</div><div class='ctx'> </div><div class='ctx'> /* Interoperability */</div><div class='ctx'> int mpa_version = 1;</div><div class='del'>-module_param(mpa_version, int, 0);</div><div class='add'>+module_param(mpa_version, int, 0644);</div><div class='ctx'> MODULE_PARM_DESC(mpa_version, "MPA version to be used int MPA Req/Resp (0 or 1)");</div><div class='ctx'> </div><div class='ctx'> /* Interoperability */</div><div class='ctx'> int disable_mpa_crc = 0;</div><div class='del'>-module_param(disable_mpa_crc, int, 0);</div><div class='add'>+module_param(disable_mpa_crc, int, 0644);</div><div class='ctx'> MODULE_PARM_DESC(disable_mpa_crc, "Disable checking of MPA CRC");</div><div class='ctx'> </div><div class='ctx'> unsigned int send_first = 0;</div><div class='del'>-module_param(send_first, int, 0);</div><div class='add'>+module_param(send_first, int, 0644);</div><div class='ctx'> MODULE_PARM_DESC(send_first, "Send RDMA Message First on Active Connection");</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> unsigned int nes_drv_opt = 0;</div><div class='del'>-module_param(nes_drv_opt, int, 0);</div><div class='add'>+module_param(nes_drv_opt, int, 0644);</div><div class='ctx'> MODULE_PARM_DESC(nes_drv_opt, "Driver option parameters");</div><div class='ctx'> </div><div class='ctx'> unsigned int nes_debug_level = 0;</div><div class='ctx'> module_param_named(debug_level, nes_debug_level, uint, 0644);</div><div class='ctx'> MODULE_PARM_DESC(debug_level, "Enable debug output level");</div><div class='ctx'> </div><div class='add'>+unsigned int wqm_quanta = 0x10000;</div><div class='add'>+module_param(wqm_quanta, int, 0644);</div><div class='add'>+MODULE_PARM_DESC(wqm_quanta, "WQM quanta");</div><div class='add'>+</div><div class='ctx'> LIST_HEAD(nes_adapter_list);</div><div class='ctx'> static LIST_HEAD(nes_dev_list);</div><div class='ctx'> </div><div class='hunk'>@@ -557,12 +561,32 @@ static int __devinit nes_probe(struct pci_dev *pcidev, const struct pci_device_i</div><div class='ctx'> 		goto bail5;</div><div class='ctx'> 	}</div><div class='ctx'> 	nesdev-&gt;nesadapter-&gt;et_rx_coalesce_usecs_irq = interrupt_mod_interval;</div><div class='add'>+	nesdev-&gt;nesadapter-&gt;wqm_quanta = wqm_quanta;</div><div class='ctx'> </div><div class='ctx'> 	/* nesdev-&gt;base_doorbell_index =</div><div class='ctx'> 			nesdev-&gt;nesadapter-&gt;pd_config_base[PCI_FUNC(nesdev-&gt;pcidev-&gt;devfn)]; */</div><div class='ctx'> 	nesdev-&gt;base_doorbell_index = 1;</div><div class='ctx'> 	nesdev-&gt;doorbell_start = nesdev-&gt;nesadapter-&gt;doorbell_start;</div><div class='del'>-	nesdev-&gt;mac_index = PCI_FUNC(nesdev-&gt;pcidev-&gt;devfn) % nesdev-&gt;nesadapter-&gt;port_count;</div><div class='add'>+	if (nesdev-&gt;nesadapter-&gt;phy_type[0] == NES_PHY_TYPE_PUMA_1G) {</div><div class='add'>+		switch (PCI_FUNC(nesdev-&gt;pcidev-&gt;devfn) %</div><div class='add'>+			nesdev-&gt;nesadapter-&gt;port_count) {</div><div class='add'>+		case 1:</div><div class='add'>+			nesdev-&gt;mac_index = 2;</div><div class='add'>+			break;</div><div class='add'>+		case 2:</div><div class='add'>+			nesdev-&gt;mac_index = 1;</div><div class='add'>+			break;</div><div class='add'>+		case 3:</div><div class='add'>+			nesdev-&gt;mac_index = 3;</div><div class='add'>+			break;</div><div class='add'>+		case 0:</div><div class='add'>+		default:</div><div class='add'>+			nesdev-&gt;mac_index = 0;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		nesdev-&gt;mac_index = PCI_FUNC(nesdev-&gt;pcidev-&gt;devfn) %</div><div class='add'>+						nesdev-&gt;nesadapter-&gt;port_count;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	tasklet_init(&amp;nesdev-&gt;dpc_tasklet, nes_dpc, (unsigned long)nesdev);</div><div class='ctx'> </div><div class='hunk'>@@ -581,7 +605,7 @@ static int __devinit nes_probe(struct pci_dev *pcidev, const struct pci_device_i</div><div class='ctx'> 	nesdev-&gt;int_req = (0x101 &lt;&lt; PCI_FUNC(nesdev-&gt;pcidev-&gt;devfn)) |</div><div class='ctx'> 			(1 &lt;&lt; (PCI_FUNC(nesdev-&gt;pcidev-&gt;devfn)+16));</div><div class='ctx'> 	if (PCI_FUNC(nesdev-&gt;pcidev-&gt;devfn) &lt; 4) {</div><div class='del'>-		nesdev-&gt;int_req |= (1 &lt;&lt; (PCI_FUNC(nesdev-&gt;pcidev-&gt;devfn)+24));</div><div class='add'>+		nesdev-&gt;int_req |= (1 &lt;&lt; (PCI_FUNC(nesdev-&gt;mac_index)+24));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* TODO: This really should be the first driver to load, not function 0 */</div><div class='hunk'>@@ -772,14 +796,14 @@ static ssize_t nes_show_adapter(struct device_driver *ddp, char *buf)</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(nesdev, &amp;nes_dev_list, list) {</div><div class='ctx'> 		if (i == ee_flsh_adapter) {</div><div class='del'>-			devfn      = nesdev-&gt;nesadapter-&gt;devfn;</div><div class='del'>-			bus_number = nesdev-&gt;nesadapter-&gt;bus_number;</div><div class='add'>+			devfn = nesdev-&gt;pcidev-&gt;devfn;</div><div class='add'>+			bus_number = nesdev-&gt;pcidev-&gt;bus-&gt;number;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		i++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return snprintf(buf, PAGE_SIZE, "%x:%x", bus_number, devfn);</div><div class='add'>+	return snprintf(buf, PAGE_SIZE, "%x:%x\n", bus_number, devfn);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t nes_store_adapter(struct device_driver *ddp,</div><div class='hunk'>@@ -1050,6 +1074,55 @@ static ssize_t nes_store_idx_data(struct device_driver *ddp,</div><div class='ctx'> 	return strnlen(buf, count);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * nes_show_wqm_quanta</div><div class='add'>+ */</div><div class='add'>+static ssize_t nes_show_wqm_quanta(struct device_driver *ddp, char *buf)</div><div class='add'>+{</div><div class='add'>+	u32 wqm_quanta_value = 0xdead;</div><div class='add'>+	u32 i = 0;</div><div class='add'>+	struct nes_device *nesdev;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(nesdev, &amp;nes_dev_list, list) {</div><div class='add'>+		if (i == ee_flsh_adapter) {</div><div class='add'>+			wqm_quanta_value = nesdev-&gt;nesadapter-&gt;wqm_quanta;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		i++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return  snprintf(buf, PAGE_SIZE, "0x%X\n", wqm_quanta);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * nes_store_wqm_quanta</div><div class='add'>+ */</div><div class='add'>+static ssize_t nes_store_wqm_quanta(struct device_driver *ddp,</div><div class='add'>+					const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	unsigned long wqm_quanta_value;</div><div class='add'>+	u32 wqm_config1;</div><div class='add'>+	u32 i = 0;</div><div class='add'>+	struct nes_device *nesdev;</div><div class='add'>+</div><div class='add'>+	strict_strtoul(buf, 0, &amp;wqm_quanta_value);</div><div class='add'>+	list_for_each_entry(nesdev, &amp;nes_dev_list, list) {</div><div class='add'>+		if (i == ee_flsh_adapter) {</div><div class='add'>+			nesdev-&gt;nesadapter-&gt;wqm_quanta = wqm_quanta_value;</div><div class='add'>+			wqm_config1 = nes_read_indexed(nesdev,</div><div class='add'>+						NES_IDX_WQM_CONFIG1);</div><div class='add'>+			nes_write_indexed(nesdev, NES_IDX_WQM_CONFIG1,</div><div class='add'>+					((wqm_quanta_value &lt;&lt; 1) |</div><div class='add'>+					(wqm_config1 &amp; 0x00000001)));</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		i++;</div><div class='add'>+	}</div><div class='add'>+	return strnlen(buf, count);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static DRIVER_ATTR(adapter, S_IRUSR | S_IWUSR,</div><div class='ctx'> 		   nes_show_adapter, nes_store_adapter);</div><div class='ctx'> static DRIVER_ATTR(eeprom_cmd, S_IRUSR | S_IWUSR,</div><div class='hunk'>@@ -1068,6 +1141,8 @@ static DRIVER_ATTR(idx_addr, S_IRUSR | S_IWUSR,</div><div class='ctx'> 		   nes_show_idx_addr, nes_store_idx_addr);</div><div class='ctx'> static DRIVER_ATTR(idx_data, S_IRUSR | S_IWUSR,</div><div class='ctx'> 		   nes_show_idx_data, nes_store_idx_data);</div><div class='add'>+static DRIVER_ATTR(wqm_quanta, S_IRUSR | S_IWUSR,</div><div class='add'>+		   nes_show_wqm_quanta, nes_store_wqm_quanta);</div><div class='ctx'> </div><div class='ctx'> static int nes_create_driver_sysfs(struct pci_driver *drv)</div><div class='ctx'> {</div><div class='hunk'>@@ -1081,6 +1156,7 @@ static int nes_create_driver_sysfs(struct pci_driver *drv)</div><div class='ctx'> 	error |= driver_create_file(&amp;drv-&gt;driver, &amp;driver_attr_nonidx_data);</div><div class='ctx'> 	error |= driver_create_file(&amp;drv-&gt;driver, &amp;driver_attr_idx_addr);</div><div class='ctx'> 	error |= driver_create_file(&amp;drv-&gt;driver, &amp;driver_attr_idx_data);</div><div class='add'>+	error |= driver_create_file(&amp;drv-&gt;driver, &amp;driver_attr_wqm_quanta);</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1095,6 +1171,7 @@ static void nes_remove_driver_sysfs(struct pci_driver *drv)</div><div class='ctx'> 	driver_remove_file(&amp;drv-&gt;driver, &amp;driver_attr_nonidx_data);</div><div class='ctx'> 	driver_remove_file(&amp;drv-&gt;driver, &amp;driver_attr_idx_addr);</div><div class='ctx'> 	driver_remove_file(&amp;drv-&gt;driver, &amp;driver_attr_idx_data);</div><div class='add'>+	driver_remove_file(&amp;drv-&gt;driver, &amp;driver_attr_wqm_quanta);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/drivers/infiniband/hw/nes/nes.h b/drivers/infiniband/hw/nes/nes.h<br/>index 8eb7ae96974d..1595dc7bba9d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/infiniband/hw/nes/nes.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/infiniband/hw/nes/nes.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/infiniband/hw/nes/nes.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/infiniband/hw/nes/nes.h</a></div><div class='hunk'>@@ -169,7 +169,7 @@ extern int disable_mpa_crc;</div><div class='ctx'> extern unsigned int send_first;</div><div class='ctx'> extern unsigned int nes_drv_opt;</div><div class='ctx'> extern unsigned int nes_debug_level;</div><div class='del'>-</div><div class='add'>+extern unsigned int wqm_quanta;</div><div class='ctx'> extern struct list_head nes_adapter_list;</div><div class='ctx'> </div><div class='ctx'> extern atomic_t cm_connects;</div><div class='head'>diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c<br/>index 499d3cf83e1f..2caf9da81ad5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/infiniband/hw/nes/nes_cm.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/infiniband/hw/nes/nes_cm.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/infiniband/hw/nes/nes_cm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/infiniband/hw/nes/nes_cm.c</a></div><div class='hunk'>@@ -52,7 +52,7 @@</div><div class='ctx'> #include &lt;linux/random.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/threads.h&gt;</div><div class='del'>-</div><div class='add'>+#include &lt;net/arp.h&gt;</div><div class='ctx'> #include &lt;net/neighbour.h&gt;</div><div class='ctx'> #include &lt;net/route.h&gt;</div><div class='ctx'> #include &lt;net/ip_fib.h&gt;</div><div class='hunk'>@@ -1019,23 +1019,43 @@ static inline int mini_cm_accelerated(struct nes_cm_core *cm_core,</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * nes_addr_send_arp</div><div class='add'>+ * nes_addr_resolve_neigh</div><div class='ctx'>  */</div><div class='del'>-static void nes_addr_send_arp(u32 dst_ip)</div><div class='add'>+static int nes_addr_resolve_neigh(struct nes_vnic *nesvnic, u32 dst_ip)</div><div class='ctx'> {</div><div class='ctx'> 	struct rtable *rt;</div><div class='ctx'> 	struct flowi fl;</div><div class='add'>+	struct neighbour *neigh;</div><div class='add'>+	int rc = -1;</div><div class='add'>+	DECLARE_MAC_BUF(mac);</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;fl, 0, sizeof fl);</div><div class='ctx'> 	fl.nl_u.ip4_u.daddr = htonl(dst_ip);</div><div class='ctx'> 	if (ip_route_output_key(&amp;init_net, &amp;rt, &amp;fl)) {</div><div class='ctx'> 		printk("%s: ip_route_output_key failed for 0x%08X\n",</div><div class='ctx'> 				__func__, dst_ip);</div><div class='del'>-		return;</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	neigh = neigh_lookup(&amp;arp_tbl, &amp;rt-&gt;rt_gateway, nesvnic-&gt;netdev);</div><div class='add'>+	if (neigh) {</div><div class='add'>+		if (neigh-&gt;nud_state &amp; NUD_VALID) {</div><div class='add'>+			nes_debug(NES_DBG_CM, "Neighbor MAC address for 0x%08X"</div><div class='add'>+				  " is %s, Gateway is 0x%08X \n", dst_ip,</div><div class='add'>+				  print_mac(mac, neigh-&gt;ha), ntohl(rt-&gt;rt_gateway));</div><div class='add'>+			nes_manage_arp_cache(nesvnic-&gt;netdev, neigh-&gt;ha,</div><div class='add'>+					     dst_ip, NES_ARP_ADD);</div><div class='add'>+			rc = nes_arp_table(nesvnic-&gt;nesdev, dst_ip, NULL,</div><div class='add'>+					   NES_ARP_RESOLVE);</div><div class='add'>+		}</div><div class='add'>+		neigh_release(neigh);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	neigh_event_send(rt-&gt;u.dst.neighbour, NULL);</div><div class='add'>+	if ((neigh == NULL) || (!(neigh-&gt;nud_state &amp; NUD_VALID)))</div><div class='add'>+		neigh_event_send(rt-&gt;u.dst.neighbour, NULL);</div><div class='add'>+</div><div class='ctx'> 	ip_rt_put(rt);</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -1108,9 +1128,11 @@ static struct nes_cm_node *make_cm_node(struct nes_cm_core *cm_core,</div><div class='ctx'> 	/* get the mac addr for the remote node */</div><div class='ctx'> 	arpindex = nes_arp_table(nesdev, cm_node-&gt;rem_addr, NULL, NES_ARP_RESOLVE);</div><div class='ctx'> 	if (arpindex &lt; 0) {</div><div class='del'>-		kfree(cm_node);</div><div class='del'>-		nes_addr_send_arp(cm_info-&gt;rem_addr);</div><div class='del'>-		return NULL;</div><div class='add'>+		arpindex = nes_addr_resolve_neigh(nesvnic, cm_info-&gt;rem_addr);</div><div class='add'>+		if (arpindex &lt; 0) {</div><div class='add'>+			kfree(cm_node);</div><div class='add'>+			return NULL;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* copy the mac addr to node context */</div><div class='hunk'>@@ -1826,7 +1848,7 @@ static struct nes_cm_listener *mini_cm_listen(struct nes_cm_core *cm_core,</div><div class='ctx'> /**</div><div class='ctx'>  * mini_cm_connect - make a connection node with params</div><div class='ctx'>  */</div><div class='del'>-struct nes_cm_node *mini_cm_connect(struct nes_cm_core *cm_core,</div><div class='add'>+static struct nes_cm_node *mini_cm_connect(struct nes_cm_core *cm_core,</div><div class='ctx'> 	struct nes_vnic *nesvnic, u16 private_data_len,</div><div class='ctx'> 	void *private_data, struct nes_cm_info *cm_info)</div><div class='ctx'> {</div><div class='hunk'>@@ -2007,7 +2029,6 @@ static int mini_cm_close(struct nes_cm_core *cm_core, struct nes_cm_node *cm_nod</div><div class='ctx'> 		ret = rem_ref_cm_node(cm_core, cm_node);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	cm_node-&gt;cm_id = NULL;</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/infiniband/hw/nes/nes_hw.c b/drivers/infiniband/hw/nes/nes_hw.c<br/>index 1513d4066f1b..7c49cc882d75 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/infiniband/hw/nes/nes_hw.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/infiniband/hw/nes/nes_hw.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/infiniband/hw/nes/nes_hw.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/infiniband/hw/nes/nes_hw.c</a></div><div class='hunk'>@@ -55,18 +55,19 @@ u32 int_mod_cq_depth_24;</div><div class='ctx'> u32 int_mod_cq_depth_16;</div><div class='ctx'> u32 int_mod_cq_depth_4;</div><div class='ctx'> u32 int_mod_cq_depth_1;</div><div class='del'>-</div><div class='add'>+static const u8 nes_max_critical_error_count = 100;</div><div class='ctx'> #include "nes_cm.h"</div><div class='ctx'> </div><div class='ctx'> static void nes_cqp_ce_handler(struct nes_device *nesdev, struct nes_hw_cq *cq);</div><div class='ctx'> static void nes_init_csr_ne020(struct nes_device *nesdev, u8 hw_rev, u8 port_count);</div><div class='ctx'> static int nes_init_serdes(struct nes_device *nesdev, u8 hw_rev, u8 port_count,</div><div class='del'>-			   u8 OneG_Mode);</div><div class='add'>+				struct nes_adapter *nesadapter, u8  OneG_Mode);</div><div class='ctx'> static void nes_nic_napi_ce_handler(struct nes_device *nesdev, struct nes_hw_nic_cq *cq);</div><div class='ctx'> static void nes_process_aeq(struct nes_device *nesdev, struct nes_hw_aeq *aeq);</div><div class='ctx'> static void nes_process_ceq(struct nes_device *nesdev, struct nes_hw_ceq *ceq);</div><div class='ctx'> static void nes_process_iwarp_aeqe(struct nes_device *nesdev,</div><div class='ctx'> 				   struct nes_hw_aeqe *aeqe);</div><div class='add'>+static void process_critical_error(struct nes_device *nesdev);</div><div class='ctx'> static void nes_process_mac_intr(struct nes_device *nesdev, u32 mac_number);</div><div class='ctx'> static unsigned int nes_reset_adapter_ne020(struct nes_device *nesdev, u8 *OneG_Mode);</div><div class='ctx'> </div><div class='hunk'>@@ -222,11 +223,10 @@ static void nes_nic_tune_timer(struct nes_device *nesdev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* boundary checking */</div><div class='del'>-	if (shared_timer-&gt;timer_in_use &gt; NES_NIC_FAST_TIMER_HIGH)</div><div class='del'>-		shared_timer-&gt;timer_in_use = NES_NIC_FAST_TIMER_HIGH;</div><div class='del'>-	else if (shared_timer-&gt;timer_in_use &lt; NES_NIC_FAST_TIMER_LOW) {</div><div class='del'>-		shared_timer-&gt;timer_in_use = NES_NIC_FAST_TIMER_LOW;</div><div class='del'>-	}</div><div class='add'>+	if (shared_timer-&gt;timer_in_use &gt; shared_timer-&gt;threshold_high)</div><div class='add'>+		shared_timer-&gt;timer_in_use = shared_timer-&gt;threshold_high;</div><div class='add'>+	else if (shared_timer-&gt;timer_in_use &lt; shared_timer-&gt;threshold_low)</div><div class='add'>+		shared_timer-&gt;timer_in_use = shared_timer-&gt;threshold_low;</div><div class='ctx'> </div><div class='ctx'> 	nesdev-&gt;currcq_count = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -292,9 +292,6 @@ struct nes_adapter *nes_init_adapter(struct nes_device *nesdev, u8 hw_rev) {</div><div class='ctx'> </div><div class='ctx'> 	if ((port_count = nes_reset_adapter_ne020(nesdev, &amp;OneG_Mode)) == 0)</div><div class='ctx'> 		return NULL;</div><div class='del'>-	if (nes_init_serdes(nesdev, hw_rev, port_count, OneG_Mode))</div><div class='del'>-		return NULL;</div><div class='del'>-	nes_init_csr_ne020(nesdev, hw_rev, port_count);</div><div class='ctx'> </div><div class='ctx'> 	max_qp = nes_read_indexed(nesdev, NES_IDX_QP_CTX_SIZE);</div><div class='ctx'> 	nes_debug(NES_DBG_INIT, "QP_CTX_SIZE=%u\n", max_qp);</div><div class='hunk'>@@ -353,6 +350,22 @@ struct nes_adapter *nes_init_adapter(struct nes_device *nesdev, u8 hw_rev) {</div><div class='ctx'> 	nes_debug(NES_DBG_INIT, "Allocating new nesadapter @ %p, size = %u (actual size = %u).\n",</div><div class='ctx'> 			nesadapter, (u32)sizeof(struct nes_adapter), adapter_size);</div><div class='ctx'> </div><div class='add'>+	if (nes_read_eeprom_values(nesdev, nesadapter)) {</div><div class='add'>+		printk(KERN_ERR PFX "Unable to read EEPROM data.\n");</div><div class='add'>+		kfree(nesadapter);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (nes_init_serdes(nesdev, hw_rev, port_count, nesadapter,</div><div class='add'>+							OneG_Mode)) {</div><div class='add'>+		kfree(nesadapter);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+	nes_init_csr_ne020(nesdev, hw_rev, port_count);</div><div class='add'>+</div><div class='add'>+	memset(nesadapter-&gt;pft_mcast_map, 255,</div><div class='add'>+	       sizeof nesadapter-&gt;pft_mcast_map);</div><div class='add'>+</div><div class='ctx'> 	/* populate the new nesadapter */</div><div class='ctx'> 	nesadapter-&gt;devfn = nesdev-&gt;pcidev-&gt;devfn;</div><div class='ctx'> 	nesadapter-&gt;bus_number = nesdev-&gt;pcidev-&gt;bus-&gt;number;</div><div class='hunk'>@@ -468,20 +481,25 @@ struct nes_adapter *nes_init_adapter(struct nes_device *nesdev, u8 hw_rev) {</div><div class='ctx'> </div><div class='ctx'> 	/* setup port configuration */</div><div class='ctx'> 	if (nesadapter-&gt;port_count == 1) {</div><div class='del'>-		u32temp = 0x00000000;</div><div class='add'>+		nesadapter-&gt;log_port = 0x00000000;</div><div class='ctx'> 		if (nes_drv_opt &amp; NES_DRV_OPT_DUAL_LOGICAL_PORT)</div><div class='ctx'> 			nes_write_indexed(nesdev, NES_IDX_TX_POOL_SIZE, 0x00000002);</div><div class='ctx'> 		else</div><div class='ctx'> 			nes_write_indexed(nesdev, NES_IDX_TX_POOL_SIZE, 0x00000003);</div><div class='ctx'> 	} else {</div><div class='del'>-		if (nesadapter-&gt;port_count == 2)</div><div class='del'>-			u32temp = 0x00000044;</div><div class='del'>-		else</div><div class='del'>-			u32temp = 0x000000e4;</div><div class='add'>+		if (nesadapter-&gt;phy_type[0] == NES_PHY_TYPE_PUMA_1G) {</div><div class='add'>+			nesadapter-&gt;log_port = 0x000000D8;</div><div class='add'>+		} else {</div><div class='add'>+			if (nesadapter-&gt;port_count == 2)</div><div class='add'>+				nesadapter-&gt;log_port = 0x00000044;</div><div class='add'>+			else</div><div class='add'>+				nesadapter-&gt;log_port = 0x000000e4;</div><div class='add'>+		}</div><div class='ctx'> 		nes_write_indexed(nesdev, NES_IDX_TX_POOL_SIZE, 0x00000003);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	nes_write_indexed(nesdev, NES_IDX_NIC_LOGPORT_TO_PHYPORT, u32temp);</div><div class='add'>+	nes_write_indexed(nesdev, NES_IDX_NIC_LOGPORT_TO_PHYPORT,</div><div class='add'>+						nesadapter-&gt;log_port);</div><div class='ctx'> 	nes_debug(NES_DBG_INIT, "Probe time, LOG2PHY=%u\n",</div><div class='ctx'> 			nes_read_indexed(nesdev, NES_IDX_NIC_LOGPORT_TO_PHYPORT));</div><div class='ctx'> </div><div class='hunk'>@@ -706,23 +724,43 @@ static unsigned int nes_reset_adapter_ne020(struct nes_device *nesdev, u8 *OneG_</div><div class='ctx'>  * nes_init_serdes</div><div class='ctx'>  */</div><div class='ctx'> static int nes_init_serdes(struct nes_device *nesdev, u8 hw_rev, u8 port_count,</div><div class='del'>-			   u8 OneG_Mode)</div><div class='add'>+				struct nes_adapter *nesadapter, u8  OneG_Mode)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	u32 u32temp;</div><div class='add'>+	u32 serdes_common_control;</div><div class='ctx'> </div><div class='ctx'> 	if (hw_rev != NE020_REV) {</div><div class='ctx'> 		/* init serdes 0 */</div><div class='ctx'> </div><div class='ctx'> 		nes_write_indexed(nesdev, NES_IDX_ETH_SERDES_CDR_CONTROL0, 0x000000FF);</div><div class='del'>-		if (!OneG_Mode)</div><div class='add'>+		if (nesadapter-&gt;phy_type[0] == NES_PHY_TYPE_PUMA_1G) {</div><div class='add'>+			serdes_common_control = nes_read_indexed(nesdev,</div><div class='add'>+					NES_IDX_ETH_SERDES_COMMON_CONTROL0);</div><div class='add'>+			serdes_common_control |= 0x000000100;</div><div class='add'>+			nes_write_indexed(nesdev,</div><div class='add'>+					NES_IDX_ETH_SERDES_COMMON_CONTROL0,</div><div class='add'>+					serdes_common_control);</div><div class='add'>+		} else if (!OneG_Mode) {</div><div class='ctx'> 			nes_write_indexed(nesdev, NES_IDX_ETH_SERDES_TX_HIGHZ_LANE_MODE0, 0x11110000);</div><div class='del'>-		if (port_count &gt; 1) {</div><div class='add'>+		}</div><div class='add'>+		if (((port_count &gt; 1) &amp;&amp;</div><div class='add'>+			(nesadapter-&gt;phy_type[0] != NES_PHY_TYPE_PUMA_1G)) ||</div><div class='add'>+			((port_count &gt; 2) &amp;&amp;</div><div class='add'>+			(nesadapter-&gt;phy_type[0] == NES_PHY_TYPE_PUMA_1G))) {</div><div class='ctx'> 			/* init serdes 1 */</div><div class='ctx'> 			nes_write_indexed(nesdev, NES_IDX_ETH_SERDES_CDR_CONTROL1, 0x000000FF);</div><div class='del'>-			if (!OneG_Mode)</div><div class='add'>+			if (nesadapter-&gt;phy_type[0] == NES_PHY_TYPE_PUMA_1G) {</div><div class='add'>+				serdes_common_control = nes_read_indexed(nesdev,</div><div class='add'>+					NES_IDX_ETH_SERDES_COMMON_CONTROL1);</div><div class='add'>+				serdes_common_control |= 0x000000100;</div><div class='add'>+				nes_write_indexed(nesdev,</div><div class='add'>+					NES_IDX_ETH_SERDES_COMMON_CONTROL1,</div><div class='add'>+					serdes_common_control);</div><div class='add'>+			} else if (!OneG_Mode) {</div><div class='ctx'> 				nes_write_indexed(nesdev, NES_IDX_ETH_SERDES_TX_HIGHZ_LANE_MODE1, 0x11110000);</div><div class='ctx'> 			}</div><div class='add'>+		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* init serdes 0 */</div><div class='ctx'> 		nes_write_indexed(nesdev, NES_IDX_ETH_SERDES_COMMON_CONTROL0, 0x00000008);</div><div class='hunk'>@@ -826,7 +864,8 @@ static void nes_init_csr_ne020(struct nes_device *nesdev, u8 hw_rev, u8 port_cou</div><div class='ctx'> </div><div class='ctx'> 	nes_write_indexed(nesdev, 0x00005000, 0x00018000);</div><div class='ctx'> 	/* nes_write_indexed(nesdev, 0x00005000, 0x00010000); */</div><div class='del'>-	nes_write_indexed(nesdev, 0x00005004, 0x00020001);</div><div class='add'>+	nes_write_indexed(nesdev, NES_IDX_WQM_CONFIG1, (wqm_quanta &lt;&lt; 1) |</div><div class='add'>+							 0x00000001);</div><div class='ctx'> 	nes_write_indexed(nesdev, 0x00005008, 0x1F1F1F1F);</div><div class='ctx'> 	nes_write_indexed(nesdev, 0x00005010, 0x1F1F1F1F);</div><div class='ctx'> 	nes_write_indexed(nesdev, 0x00005018, 0x1F1F1F1F);</div><div class='hunk'>@@ -1226,6 +1265,7 @@ int nes_init_phy(struct nes_device *nesdev)</div><div class='ctx'> 		if (nesadapter-&gt;phy_type[mac_index] == NES_PHY_TYPE_1G) {</div><div class='ctx'> 			printk(PFX "%s: Programming mdc config for 1G\n", __func__);</div><div class='ctx'> 			tx_config = nes_read_indexed(nesdev, NES_IDX_MAC_TX_CONFIG);</div><div class='add'>+			tx_config &amp;= 0xFFFFFFE3;</div><div class='ctx'> 			tx_config |= 0x04;</div><div class='ctx'> 			nes_write_indexed(nesdev, NES_IDX_MAC_TX_CONFIG, tx_config);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1291,7 +1331,8 @@ int nes_init_phy(struct nes_device *nesdev)</div><div class='ctx'> 		    (nesadapter-&gt;phy_type[mac_index] == NES_PHY_TYPE_ARGUS)) {</div><div class='ctx'> 			/* setup 10G MDIO operation */</div><div class='ctx'> 			tx_config = nes_read_indexed(nesdev, NES_IDX_MAC_TX_CONFIG);</div><div class='del'>-			tx_config |= 0x14;</div><div class='add'>+			tx_config &amp;= 0xFFFFFFE3;</div><div class='add'>+			tx_config |= 0x15;</div><div class='ctx'> 			nes_write_indexed(nesdev, NES_IDX_MAC_TX_CONFIG, tx_config);</div><div class='ctx'> 		}</div><div class='ctx'> 		if ((nesadapter-&gt;phy_type[mac_index] == NES_PHY_TYPE_ARGUS)) {</div><div class='hunk'>@@ -1315,7 +1356,7 @@ int nes_init_phy(struct nes_device *nesdev)</div><div class='ctx'> 				nes_write_10G_phy_reg(nesdev, nesadapter-&gt;phy_index[mac_index], 0x1, 0xc319, 0x0008);</div><div class='ctx'> 				nes_write_10G_phy_reg(nesdev, nesadapter-&gt;phy_index[mac_index], 0x1, 0xc31a, 0x0098);</div><div class='ctx'> 				nes_write_10G_phy_reg(nesdev, nesadapter-&gt;phy_index[mac_index], 0x3, 0x0026, 0x0E00);</div><div class='del'>-				nes_write_10G_phy_reg(nesdev, nesadapter-&gt;phy_index[mac_index], 0x3, 0x0027, 0x0000);</div><div class='add'>+				nes_write_10G_phy_reg(nesdev, nesadapter-&gt;phy_index[mac_index], 0x3, 0x0027, 0x0001);</div><div class='ctx'> 				nes_write_10G_phy_reg(nesdev, nesadapter-&gt;phy_index[mac_index], 0x3, 0x0028, 0xA528);</div><div class='ctx'> </div><div class='ctx'> 				/*</div><div class='hunk'>@@ -1759,9 +1800,14 @@ int nes_init_nic_qp(struct nes_device *nesdev, struct net_device *netdev)</div><div class='ctx'>  */</div><div class='ctx'> void nes_destroy_nic_qp(struct nes_vnic *nesvnic)</div><div class='ctx'> {</div><div class='add'>+	u64 u64temp;</div><div class='add'>+	dma_addr_t bus_address;</div><div class='ctx'> 	struct nes_device *nesdev = nesvnic-&gt;nesdev;</div><div class='ctx'> 	struct nes_hw_cqp_wqe *cqp_wqe;</div><div class='add'>+	struct nes_hw_nic_sq_wqe *nic_sqe;</div><div class='ctx'> 	struct nes_hw_nic_rq_wqe *nic_rqe;</div><div class='add'>+	__le16 *wqe_fragment_length;</div><div class='add'>+	u16  wqe_fragment_index;</div><div class='ctx'> 	u64 wqe_frag;</div><div class='ctx'> 	u32 cqp_head;</div><div class='ctx'> 	unsigned long flags;</div><div class='hunk'>@@ -1770,14 +1816,69 @@ void nes_destroy_nic_qp(struct nes_vnic *nesvnic)</div><div class='ctx'> 	/* Free remaining NIC receive buffers */</div><div class='ctx'> 	while (nesvnic-&gt;nic.rq_head != nesvnic-&gt;nic.rq_tail) {</div><div class='ctx'> 		nic_rqe   = &amp;nesvnic-&gt;nic.rq_vbase[nesvnic-&gt;nic.rq_tail];</div><div class='del'>-		wqe_frag  = (u64)le32_to_cpu(nic_rqe-&gt;wqe_words[NES_NIC_RQ_WQE_FRAG0_LOW_IDX]);</div><div class='del'>-		wqe_frag |= ((u64)le32_to_cpu(nic_rqe-&gt;wqe_words[NES_NIC_RQ_WQE_FRAG0_HIGH_IDX])) &lt;&lt; 32;</div><div class='add'>+		wqe_frag  = (u64)le32_to_cpu(</div><div class='add'>+			nic_rqe-&gt;wqe_words[NES_NIC_RQ_WQE_FRAG0_LOW_IDX]);</div><div class='add'>+		wqe_frag |= ((u64)le32_to_cpu(</div><div class='add'>+			nic_rqe-&gt;wqe_words[NES_NIC_RQ_WQE_FRAG0_HIGH_IDX]))&lt;&lt;32;</div><div class='ctx'> 		pci_unmap_single(nesdev-&gt;pcidev, (dma_addr_t)wqe_frag,</div><div class='ctx'> 				nesvnic-&gt;max_frame_size, PCI_DMA_FROMDEVICE);</div><div class='ctx'> 		dev_kfree_skb(nesvnic-&gt;nic.rx_skb[nesvnic-&gt;nic.rq_tail++]);</div><div class='ctx'> 		nesvnic-&gt;nic.rq_tail &amp;= (nesvnic-&gt;nic.rq_size - 1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Free remaining NIC transmit buffers */</div><div class='add'>+	while (nesvnic-&gt;nic.sq_head != nesvnic-&gt;nic.sq_tail) {</div><div class='add'>+		nic_sqe = &amp;nesvnic-&gt;nic.sq_vbase[nesvnic-&gt;nic.sq_tail];</div><div class='add'>+		wqe_fragment_index = 1;</div><div class='add'>+		wqe_fragment_length = (__le16 *)</div><div class='add'>+			&amp;nic_sqe-&gt;wqe_words[NES_NIC_SQ_WQE_LENGTH_0_TAG_IDX];</div><div class='add'>+		/* bump past the vlan tag */</div><div class='add'>+		wqe_fragment_length++;</div><div class='add'>+		if (le16_to_cpu(wqe_fragment_length[wqe_fragment_index]) != 0) {</div><div class='add'>+			u64temp = (u64)le32_to_cpu(</div><div class='add'>+				nic_sqe-&gt;wqe_words[NES_NIC_SQ_WQE_FRAG0_LOW_IDX+</div><div class='add'>+				wqe_fragment_index*2]);</div><div class='add'>+			u64temp += ((u64)le32_to_cpu(</div><div class='add'>+				nic_sqe-&gt;wqe_words[NES_NIC_SQ_WQE_FRAG0_HIGH_IDX</div><div class='add'>+				+ wqe_fragment_index*2]))&lt;&lt;32;</div><div class='add'>+			bus_address = (dma_addr_t)u64temp;</div><div class='add'>+			if (test_and_clear_bit(nesvnic-&gt;nic.sq_tail,</div><div class='add'>+					nesvnic-&gt;nic.first_frag_overflow)) {</div><div class='add'>+				pci_unmap_single(nesdev-&gt;pcidev,</div><div class='add'>+						bus_address,</div><div class='add'>+						le16_to_cpu(wqe_fragment_length[</div><div class='add'>+							wqe_fragment_index++]),</div><div class='add'>+						PCI_DMA_TODEVICE);</div><div class='add'>+			}</div><div class='add'>+			for (; wqe_fragment_index &lt; 5; wqe_fragment_index++) {</div><div class='add'>+				if (wqe_fragment_length[wqe_fragment_index]) {</div><div class='add'>+					u64temp = le32_to_cpu(</div><div class='add'>+						nic_sqe-&gt;wqe_words[</div><div class='add'>+						NES_NIC_SQ_WQE_FRAG0_LOW_IDX+</div><div class='add'>+						wqe_fragment_index*2]);</div><div class='add'>+					u64temp += ((u64)le32_to_cpu(</div><div class='add'>+						nic_sqe-&gt;wqe_words[</div><div class='add'>+						NES_NIC_SQ_WQE_FRAG0_HIGH_IDX+</div><div class='add'>+						wqe_fragment_index*2]))&lt;&lt;32;</div><div class='add'>+					bus_address = (dma_addr_t)u64temp;</div><div class='add'>+					pci_unmap_page(nesdev-&gt;pcidev,</div><div class='add'>+							bus_address,</div><div class='add'>+							le16_to_cpu(</div><div class='add'>+							wqe_fragment_length[</div><div class='add'>+							wqe_fragment_index]),</div><div class='add'>+							PCI_DMA_TODEVICE);</div><div class='add'>+				} else</div><div class='add'>+					break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if (nesvnic-&gt;nic.tx_skb[nesvnic-&gt;nic.sq_tail])</div><div class='add'>+			dev_kfree_skb(</div><div class='add'>+				nesvnic-&gt;nic.tx_skb[nesvnic-&gt;nic.sq_tail]);</div><div class='add'>+</div><div class='add'>+		nesvnic-&gt;nic.sq_tail = (++nesvnic-&gt;nic.sq_tail)</div><div class='add'>+					&amp; (nesvnic-&gt;nic.sq_size - 1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	spin_lock_irqsave(&amp;nesdev-&gt;cqp.lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	/* Destroy NIC QP */</div><div class='hunk'>@@ -1894,7 +1995,30 @@ int nes_napi_isr(struct nes_device *nesdev)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='add'>+static void process_critical_error(struct nes_device *nesdev)</div><div class='add'>+{</div><div class='add'>+	u32 debug_error;</div><div class='add'>+	u32 nes_idx_debug_error_masks0 = 0;</div><div class='add'>+	u16 error_module = 0;</div><div class='add'>+</div><div class='add'>+	debug_error = nes_read_indexed(nesdev, NES_IDX_DEBUG_ERROR_CONTROL_STATUS);</div><div class='add'>+	printk(KERN_ERR PFX "Critical Error reported by device!!! 0x%02X\n",</div><div class='add'>+			(u16)debug_error);</div><div class='add'>+	nes_write_indexed(nesdev, NES_IDX_DEBUG_ERROR_CONTROL_STATUS,</div><div class='add'>+			0x01010000 | (debug_error &amp; 0x0000ffff));</div><div class='add'>+	if (crit_err_count++ &gt; 10)</div><div class='add'>+		nes_write_indexed(nesdev, NES_IDX_DEBUG_ERROR_MASKS1, 1 &lt;&lt; 0x17);</div><div class='add'>+	error_module = (u16) (debug_error &amp; 0x1F00) &gt;&gt; 8;</div><div class='add'>+	if (++nesdev-&gt;nesadapter-&gt;crit_error_count[error_module-1] &gt;=</div><div class='add'>+			nes_max_critical_error_count) {</div><div class='add'>+		printk(KERN_ERR PFX "Masking off critical error for module "</div><div class='add'>+			"0x%02X\n", (u16)error_module);</div><div class='add'>+		nes_idx_debug_error_masks0 = nes_read_indexed(nesdev,</div><div class='add'>+			NES_IDX_DEBUG_ERROR_MASKS0);</div><div class='add'>+		nes_write_indexed(nesdev, NES_IDX_DEBUG_ERROR_MASKS0,</div><div class='add'>+			nes_idx_debug_error_masks0 | (1 &lt;&lt; error_module));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='ctx'> /**</div><div class='ctx'>  * nes_dpc</div><div class='ctx'>  */</div><div class='hunk'>@@ -1909,7 +2033,6 @@ void nes_dpc(unsigned long param)</div><div class='ctx'> 	u32 timer_stat;</div><div class='ctx'> 	u32 temp_int_stat;</div><div class='ctx'> 	u32 intf_int_stat;</div><div class='del'>-	u32 debug_error;</div><div class='ctx'> 	u32 processed_intf_int = 0;</div><div class='ctx'> 	u16 processed_timer_int = 0;</div><div class='ctx'> 	u16 completion_ints = 0;</div><div class='hunk'>@@ -1987,14 +2110,7 @@ void nes_dpc(unsigned long param)</div><div class='ctx'> 				intf_int_stat = nes_read32(nesdev-&gt;regs+NES_INTF_INT_STAT);</div><div class='ctx'> 				intf_int_stat &amp;= nesdev-&gt;intf_int_req;</div><div class='ctx'> 				if (NES_INTF_INT_CRITERR &amp; intf_int_stat) {</div><div class='del'>-					debug_error = nes_read_indexed(nesdev, NES_IDX_DEBUG_ERROR_CONTROL_STATUS);</div><div class='del'>-					printk(KERN_ERR PFX "Critical Error reported by device!!! 0x%02X\n",</div><div class='del'>-							(u16)debug_error);</div><div class='del'>-					nes_write_indexed(nesdev, NES_IDX_DEBUG_ERROR_CONTROL_STATUS,</div><div class='del'>-							0x01010000 | (debug_error &amp; 0x0000ffff));</div><div class='del'>-					/* BUG(); */</div><div class='del'>-					if (crit_err_count++ &gt; 10)</div><div class='del'>-						nes_write_indexed(nesdev, NES_IDX_DEBUG_ERROR_MASKS1, 1 &lt;&lt; 0x17);</div><div class='add'>+					process_critical_error(nesdev);</div><div class='ctx'> 				}</div><div class='ctx'> 				if (NES_INTF_INT_PCIERR &amp; intf_int_stat) {</div><div class='ctx'> 					printk(KERN_ERR PFX "PCI Error reported by device!!!\n");</div><div class='hunk'>@@ -2258,7 +2374,8 @@ static void nes_process_mac_intr(struct nes_device *nesdev, u32 mac_number)</div><div class='ctx'> 			spin_unlock_irqrestore(&amp;nesadapter-&gt;phy_lock, flags);</div><div class='ctx'> 		}</div><div class='ctx'> 		/* read the PHY interrupt status register */</div><div class='del'>-		if (nesadapter-&gt;OneG_Mode) {</div><div class='add'>+		if ((nesadapter-&gt;OneG_Mode) &amp;&amp;</div><div class='add'>+		(nesadapter-&gt;phy_type[mac_index] != NES_PHY_TYPE_PUMA_1G)) {</div><div class='ctx'> 			do {</div><div class='ctx'> 				nes_read_1G_phy_reg(nesdev, 0x1a,</div><div class='ctx'> 						nesadapter-&gt;phy_index[mac_index], &amp;phy_data);</div><div class='hunk'>@@ -3077,6 +3194,22 @@ static void nes_process_iwarp_aeqe(struct nes_device *nesdev,</div><div class='ctx'> 			nes_cm_disconn(nesqp);</div><div class='ctx'> 			break;</div><div class='ctx'> 			/* TODO: additional AEs need to be here */</div><div class='add'>+		case NES_AEQE_AEID_AMP_BOUNDS_VIOLATION:</div><div class='add'>+			nesqp = *((struct nes_qp **)&amp;context);</div><div class='add'>+			spin_lock_irqsave(&amp;nesqp-&gt;lock, flags);</div><div class='add'>+			nesqp-&gt;hw_iwarp_state = iwarp_state;</div><div class='add'>+			nesqp-&gt;hw_tcp_state = tcp_state;</div><div class='add'>+			nesqp-&gt;last_aeq = async_event_id;</div><div class='add'>+			spin_unlock_irqrestore(&amp;nesqp-&gt;lock, flags);</div><div class='add'>+			if (nesqp-&gt;ibqp.event_handler) {</div><div class='add'>+				ibevent.device = nesqp-&gt;ibqp.device;</div><div class='add'>+				ibevent.element.qp = &amp;nesqp-&gt;ibqp;</div><div class='add'>+				ibevent.event = IB_EVENT_QP_ACCESS_ERR;</div><div class='add'>+				nesqp-&gt;ibqp.event_handler(&amp;ibevent,</div><div class='add'>+						nesqp-&gt;ibqp.qp_context);</div><div class='add'>+			}</div><div class='add'>+			nes_cm_disconn(nesqp);</div><div class='add'>+			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			nes_debug(NES_DBG_AEQ, "Processing an iWARP related AE for QP, misc = 0x%04X\n",</div><div class='ctx'> 					async_event_id);</div><div class='head'>diff --git a/drivers/infiniband/hw/nes/nes_hw.h b/drivers/infiniband/hw/nes/nes_hw.h<br/>index 7b81e0ae0076..610b9d859597 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/infiniband/hw/nes/nes_hw.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/infiniband/hw/nes/nes_hw.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/infiniband/hw/nes/nes_hw.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/infiniband/hw/nes/nes_hw.h</a></div><div class='hunk'>@@ -156,6 +156,7 @@ enum indexed_regs {</div><div class='ctx'> 	NES_IDX_ENDNODE0_NSTAT_TX_OCTETS_HI = 0x7004,</div><div class='ctx'> 	NES_IDX_ENDNODE0_NSTAT_TX_FRAMES_LO = 0x7008,</div><div class='ctx'> 	NES_IDX_ENDNODE0_NSTAT_TX_FRAMES_HI = 0x700c,</div><div class='add'>+	NES_IDX_WQM_CONFIG1 = 0x5004,</div><div class='ctx'> 	NES_IDX_CM_CONFIG = 0x5100,</div><div class='ctx'> 	NES_IDX_NIC_LOGPORT_TO_PHYPORT = 0x6000,</div><div class='ctx'> 	NES_IDX_NIC_PHYPORT_TO_USW = 0x6008,</div><div class='hunk'>@@ -967,6 +968,7 @@ struct nes_arp_entry {</div><div class='ctx'> #define DEFAULT_JUMBO_NES_QL_TARGET 40</div><div class='ctx'> #define DEFAULT_JUMBO_NES_QL_HIGH   128</div><div class='ctx'> #define NES_NIC_CQ_DOWNWARD_TREND   16</div><div class='add'>+#define NES_PFT_SIZE		    48</div><div class='ctx'> </div><div class='ctx'> struct nes_hw_tune_timer {</div><div class='ctx'>     /* u16 cq_count; */</div><div class='hunk'>@@ -1079,6 +1081,7 @@ struct nes_adapter {</div><div class='ctx'> 	u32 et_rx_max_coalesced_frames_high;</div><div class='ctx'> 	u32 et_rate_sample_interval;</div><div class='ctx'> 	u32 timer_int_limit;</div><div class='add'>+	u32 wqm_quanta;</div><div class='ctx'> </div><div class='ctx'> 	/* Adapter base MAC address */</div><div class='ctx'> 	u32 mac_addr_low;</div><div class='hunk'>@@ -1094,12 +1097,14 @@ struct nes_adapter {</div><div class='ctx'> 	u16 pd_config_base[4];</div><div class='ctx'> </div><div class='ctx'> 	u16 link_interrupt_count[4];</div><div class='add'>+	u8 crit_error_count[32];</div><div class='ctx'> </div><div class='ctx'> 	/* the phy index for each port */</div><div class='ctx'> 	u8  phy_index[4];</div><div class='ctx'> 	u8  mac_sw_state[4];</div><div class='ctx'> 	u8  mac_link_down[4];</div><div class='ctx'> 	u8  phy_type[4];</div><div class='add'>+	u8  log_port;</div><div class='ctx'> </div><div class='ctx'> 	/* PCI information */</div><div class='ctx'> 	unsigned int  devfn;</div><div class='hunk'>@@ -1113,6 +1118,7 @@ struct nes_adapter {</div><div class='ctx'> 	u8            virtwq;</div><div class='ctx'> 	u8            et_use_adaptive_rx_coalesce;</div><div class='ctx'> 	u8            adapter_fcn_count;</div><div class='add'>+	u8 pft_mcast_map[NES_PFT_SIZE];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct nes_pbl {</div><div class='head'>diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c<br/>index 1b0938c87774..730358637bb6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/infiniband/hw/nes/nes_nic.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/infiniband/hw/nes/nes_nic.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/infiniband/hw/nes/nes_nic.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/infiniband/hw/nes/nes_nic.c</a></div><div class='hunk'>@@ -91,6 +91,7 @@ static struct nic_qp_map *nic_qp_mapping_per_function[] = {</div><div class='ctx'> static const u32 default_msg = NETIF_MSG_DRV | NETIF_MSG_PROBE | NETIF_MSG_LINK</div><div class='ctx'> 		| NETIF_MSG_IFUP | NETIF_MSG_IFDOWN;</div><div class='ctx'> static int debug = -1;</div><div class='add'>+static int nics_per_function = 1;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * nes_netdev_poll</div><div class='hunk'>@@ -201,7 +202,8 @@ static int nes_netdev_open(struct net_device *netdev)</div><div class='ctx'> 		nes_debug(NES_DBG_NETDEV, "i=%d, perfect filter table index= %d, PERF FILTER LOW"</div><div class='ctx'> 				" (Addr:%08X) = %08X, HIGH = %08X.\n",</div><div class='ctx'> 				i, nesvnic-&gt;qp_nic_index[i],</div><div class='del'>-				NES_IDX_PERFECT_FILTER_LOW+((nesvnic-&gt;perfect_filter_index + i) * 8),</div><div class='add'>+				NES_IDX_PERFECT_FILTER_LOW+</div><div class='add'>+					(nesvnic-&gt;qp_nic_index[i] * 8),</div><div class='ctx'> 				macaddr_low,</div><div class='ctx'> 				(u32)macaddr_high | NES_MAC_ADDR_VALID |</div><div class='ctx'> 				((((u32)nesvnic-&gt;nic_index) &lt;&lt; 16)));</div><div class='hunk'>@@ -272,14 +274,18 @@ static int nes_netdev_stop(struct net_device *netdev)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (first_nesvnic-&gt;netdev_open == 0)</div><div class='add'>+	if ((first_nesvnic-&gt;netdev_open == 1) &amp;&amp; (first_nesvnic != nesvnic)  &amp;&amp;</div><div class='add'>+		(PCI_FUNC(first_nesvnic-&gt;nesdev-&gt;pcidev-&gt;devfn) !=</div><div class='add'>+		PCI_FUNC(nesvnic-&gt;nesdev-&gt;pcidev-&gt;devfn))) {</div><div class='add'>+			nes_write_indexed(nesdev, NES_IDX_MAC_INT_MASK+</div><div class='add'>+				(0x200*nesdev-&gt;mac_index), 0xffffffff);</div><div class='add'>+			nes_write_indexed(first_nesvnic-&gt;nesdev,</div><div class='add'>+				NES_IDX_MAC_INT_MASK+</div><div class='add'>+				(0x200*first_nesvnic-&gt;nesdev-&gt;mac_index),</div><div class='add'>+			~(NES_MAC_INT_LINK_STAT_CHG | NES_MAC_INT_XGMII_EXT |</div><div class='add'>+			NES_MAC_INT_TX_UNDERFLOW | NES_MAC_INT_TX_ERROR));</div><div class='add'>+	} else {</div><div class='ctx'> 		nes_write_indexed(nesdev, NES_IDX_MAC_INT_MASK+(0x200*nesdev-&gt;mac_index), 0xffffffff);</div><div class='del'>-	else if ((first_nesvnic != nesvnic) &amp;&amp;</div><div class='del'>-		 (PCI_FUNC(first_nesvnic-&gt;nesdev-&gt;pcidev-&gt;devfn) != PCI_FUNC(nesvnic-&gt;nesdev-&gt;pcidev-&gt;devfn))) {</div><div class='del'>-		nes_write_indexed(nesdev, NES_IDX_MAC_INT_MASK + (0x200 * nesdev-&gt;mac_index), 0xffffffff);</div><div class='del'>-		nes_write_indexed(first_nesvnic-&gt;nesdev, NES_IDX_MAC_INT_MASK + (0x200 * first_nesvnic-&gt;nesdev-&gt;mac_index),</div><div class='del'>-				~(NES_MAC_INT_LINK_STAT_CHG | NES_MAC_INT_XGMII_EXT |</div><div class='del'>-				NES_MAC_INT_TX_UNDERFLOW | NES_MAC_INT_TX_ERROR));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	nic_active_mask = ~((u32)(1 &lt;&lt; nesvnic-&gt;nic_index));</div><div class='hunk'>@@ -437,7 +443,7 @@ static int nes_netdev_start_xmit(struct sk_buff *skb, struct net_device *netdev)</div><div class='ctx'> 	struct nes_hw_nic_sq_wqe *nic_sqe;</div><div class='ctx'> 	struct tcphdr *tcph;</div><div class='ctx'> 	/* struct udphdr *udph; */</div><div class='del'>-#define NES_MAX_TSO_FRAGS 18</div><div class='add'>+#define NES_MAX_TSO_FRAGS MAX_SKB_FRAGS</div><div class='ctx'> 	/* 64K segment plus overflow on each side */</div><div class='ctx'> 	dma_addr_t tso_bus_address[NES_MAX_TSO_FRAGS];</div><div class='ctx'> 	dma_addr_t bus_address;</div><div class='hunk'>@@ -605,6 +611,8 @@ tso_sq_no_longer_full:</div><div class='ctx'> 					wqe_fragment_length[wqe_fragment_index] = 0;</div><div class='ctx'> 					set_wqe_64bit_value(nic_sqe-&gt;wqe_words, NES_NIC_SQ_WQE_FRAG1_LOW_IDX,</div><div class='ctx'> 									bus_address);</div><div class='add'>+					tso_wqe_length += skb_headlen(skb) -</div><div class='add'>+							original_first_length;</div><div class='ctx'> 				}</div><div class='ctx'> 				while (wqe_fragment_index &lt; 5) {</div><div class='ctx'> 					wqe_fragment_length[wqe_fragment_index] =</div><div class='hunk'>@@ -827,6 +835,7 @@ static void nes_netdev_set_multicast_list(struct net_device *netdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct nes_vnic *nesvnic = netdev_priv(netdev);</div><div class='ctx'> 	struct nes_device *nesdev = nesvnic-&gt;nesdev;</div><div class='add'>+	struct nes_adapter *nesadapter = nesvnic-&gt;nesdev-&gt;nesadapter;</div><div class='ctx'> 	struct dev_mc_list *multicast_addr;</div><div class='ctx'> 	u32 nic_active_bit;</div><div class='ctx'> 	u32 nic_active;</div><div class='hunk'>@@ -836,7 +845,12 @@ static void nes_netdev_set_multicast_list(struct net_device *netdev)</div><div class='ctx'> 	u8 mc_all_on = 0;</div><div class='ctx'> 	u8 mc_index;</div><div class='ctx'> 	int mc_nic_index = -1;</div><div class='add'>+	u8 pft_entries_preallocated = max(nesadapter-&gt;adapter_fcn_count *</div><div class='add'>+					nics_per_function, 4);</div><div class='add'>+	u8 max_pft_entries_avaiable = NES_PFT_SIZE - pft_entries_preallocated;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> </div><div class='add'>+	spin_lock_irqsave(&amp;nesadapter-&gt;resource_lock, flags);</div><div class='ctx'> 	nic_active_bit = 1 &lt;&lt; nesvnic-&gt;nic_index;</div><div class='ctx'> </div><div class='ctx'> 	if (netdev-&gt;flags &amp; IFF_PROMISC) {</div><div class='hunk'>@@ -847,7 +861,7 @@ static void nes_netdev_set_multicast_list(struct net_device *netdev)</div><div class='ctx'> 		nic_active |= nic_active_bit;</div><div class='ctx'> 		nes_write_indexed(nesdev, NES_IDX_NIC_UNICAST_ALL, nic_active);</div><div class='ctx'> 		mc_all_on = 1;</div><div class='del'>-	} else if ((netdev-&gt;flags &amp; IFF_ALLMULTI) || (netdev-&gt;mc_count &gt; NES_MULTICAST_PF_MAX) ||</div><div class='add'>+	} else if ((netdev-&gt;flags &amp; IFF_ALLMULTI) ||</div><div class='ctx'> 			   (nesvnic-&gt;nic_index &gt; 3)) {</div><div class='ctx'> 		nic_active = nes_read_indexed(nesdev, NES_IDX_NIC_MULTICAST_ALL);</div><div class='ctx'> 		nic_active |= nic_active_bit;</div><div class='hunk'>@@ -866,17 +880,34 @@ static void nes_netdev_set_multicast_list(struct net_device *netdev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	nes_debug(NES_DBG_NIC_RX, "Number of MC entries = %d, Promiscous = %d, All Multicast = %d.\n",</div><div class='del'>-			  netdev-&gt;mc_count, (netdev-&gt;flags &amp; IFF_PROMISC)?1:0,</div><div class='del'>-			  (netdev-&gt;flags &amp; IFF_ALLMULTI)?1:0);</div><div class='add'>+		  netdev-&gt;mc_count, !!(netdev-&gt;flags &amp; IFF_PROMISC),</div><div class='add'>+		  !!(netdev-&gt;flags &amp; IFF_ALLMULTI));</div><div class='ctx'> 	if (!mc_all_on) {</div><div class='ctx'> 		multicast_addr = netdev-&gt;mc_list;</div><div class='del'>-		perfect_filter_register_address = NES_IDX_PERFECT_FILTER_LOW + 0x80;</div><div class='del'>-		perfect_filter_register_address += nesvnic-&gt;nic_index*0x40;</div><div class='del'>-		for (mc_index=0; mc_index &lt; NES_MULTICAST_PF_MAX; mc_index++) {</div><div class='del'>-			while (multicast_addr &amp;&amp; nesvnic-&gt;mcrq_mcast_filter &amp;&amp; ((mc_nic_index = nesvnic-&gt;mcrq_mcast_filter(nesvnic, multicast_addr-&gt;dmi_addr)) == 0))</div><div class='add'>+		perfect_filter_register_address = NES_IDX_PERFECT_FILTER_LOW +</div><div class='add'>+						pft_entries_preallocated * 0x8;</div><div class='add'>+		for (mc_index = 0; mc_index &lt; max_pft_entries_avaiable;</div><div class='add'>+		mc_index++) {</div><div class='add'>+			while (multicast_addr &amp;&amp; nesvnic-&gt;mcrq_mcast_filter &amp;&amp;</div><div class='add'>+			((mc_nic_index = nesvnic-&gt;mcrq_mcast_filter(nesvnic,</div><div class='add'>+					multicast_addr-&gt;dmi_addr)) == 0)) {</div><div class='ctx'> 				multicast_addr = multicast_addr-&gt;next;</div><div class='add'>+			}</div><div class='ctx'> 			if (mc_nic_index &lt; 0)</div><div class='ctx'> 				mc_nic_index = nesvnic-&gt;nic_index;</div><div class='add'>+			while (nesadapter-&gt;pft_mcast_map[mc_index] &lt; 16 &amp;&amp;</div><div class='add'>+				nesadapter-&gt;pft_mcast_map[mc_index] !=</div><div class='add'>+					nesvnic-&gt;nic_index &amp;&amp;</div><div class='add'>+					mc_index &lt; max_pft_entries_avaiable) {</div><div class='add'>+						nes_debug(NES_DBG_NIC_RX,</div><div class='add'>+					"mc_index=%d skipping nic_index=%d,\</div><div class='add'>+					used for=%d \n", mc_index,</div><div class='add'>+					nesvnic-&gt;nic_index,</div><div class='add'>+					nesadapter-&gt;pft_mcast_map[mc_index]);</div><div class='add'>+				mc_index++;</div><div class='add'>+			}</div><div class='add'>+			if (mc_index &gt;= max_pft_entries_avaiable)</div><div class='add'>+				break;</div><div class='ctx'> 			if (multicast_addr) {</div><div class='ctx'> 				DECLARE_MAC_BUF(mac);</div><div class='ctx'> 				nes_debug(NES_DBG_NIC_RX, "Assigning MC Address %s to register 0x%04X nic_idx=%d\n",</div><div class='hunk'>@@ -897,15 +928,33 @@ static void nes_netdev_set_multicast_list(struct net_device *netdev)</div><div class='ctx'> 						(u32)macaddr_high | NES_MAC_ADDR_VALID |</div><div class='ctx'> 						((((u32)(1&lt;&lt;mc_nic_index)) &lt;&lt; 16)));</div><div class='ctx'> 				multicast_addr = multicast_addr-&gt;next;</div><div class='add'>+				nesadapter-&gt;pft_mcast_map[mc_index] =</div><div class='add'>+							nesvnic-&gt;nic_index;</div><div class='ctx'> 			} else {</div><div class='ctx'> 				nes_debug(NES_DBG_NIC_RX, "Clearing MC Address at register 0x%04X\n",</div><div class='ctx'> 						  perfect_filter_register_address+(mc_index * 8));</div><div class='ctx'> 				nes_write_indexed(nesdev,</div><div class='ctx'> 						perfect_filter_register_address+4+(mc_index * 8),</div><div class='ctx'> 						0);</div><div class='add'>+				nesadapter-&gt;pft_mcast_map[mc_index] = 255;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='add'>+		/* PFT is not large enough */</div><div class='add'>+		if (multicast_addr &amp;&amp; multicast_addr-&gt;next) {</div><div class='add'>+			nic_active = nes_read_indexed(nesdev,</div><div class='add'>+						NES_IDX_NIC_MULTICAST_ALL);</div><div class='add'>+			nic_active |= nic_active_bit;</div><div class='add'>+			nes_write_indexed(nesdev, NES_IDX_NIC_MULTICAST_ALL,</div><div class='add'>+								nic_active);</div><div class='add'>+			nic_active = nes_read_indexed(nesdev,</div><div class='add'>+						NES_IDX_NIC_UNICAST_ALL);</div><div class='add'>+			nic_active &amp;= ~nic_active_bit;</div><div class='add'>+			nes_write_indexed(nesdev, NES_IDX_NIC_UNICAST_ALL,</div><div class='add'>+								nic_active);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;nesadapter-&gt;resource_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -918,6 +967,10 @@ static int nes_netdev_change_mtu(struct net_device *netdev, int new_mtu)</div><div class='ctx'> 	struct nes_device *nesdev = nesvnic-&gt;nesdev;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	u8 jumbomode = 0;</div><div class='add'>+	u32 nic_active;</div><div class='add'>+	u32 nic_active_bit;</div><div class='add'>+	u32 uc_all_active;</div><div class='add'>+	u32 mc_all_active;</div><div class='ctx'> </div><div class='ctx'> 	if ((new_mtu &lt; ETH_ZLEN) || (new_mtu &gt; max_mtu))</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -931,8 +984,24 @@ static int nes_netdev_change_mtu(struct net_device *netdev, int new_mtu)</div><div class='ctx'> 	nes_nic_init_timer_defaults(nesdev, jumbomode);</div><div class='ctx'> </div><div class='ctx'> 	if (netif_running(netdev)) {</div><div class='add'>+		nic_active_bit = 1 &lt;&lt; nesvnic-&gt;nic_index;</div><div class='add'>+		mc_all_active = nes_read_indexed(nesdev,</div><div class='add'>+				NES_IDX_NIC_MULTICAST_ALL) &amp; nic_active_bit;</div><div class='add'>+		uc_all_active = nes_read_indexed(nesdev,</div><div class='add'>+				NES_IDX_NIC_UNICAST_ALL)  &amp; nic_active_bit;</div><div class='add'>+</div><div class='ctx'> 		nes_netdev_stop(netdev);</div><div class='ctx'> 		nes_netdev_open(netdev);</div><div class='add'>+</div><div class='add'>+		nic_active = nes_read_indexed(nesdev,</div><div class='add'>+					NES_IDX_NIC_MULTICAST_ALL);</div><div class='add'>+		nic_active |= mc_all_active;</div><div class='add'>+		nes_write_indexed(nesdev, NES_IDX_NIC_MULTICAST_ALL,</div><div class='add'>+							nic_active);</div><div class='add'>+</div><div class='add'>+		nic_active = nes_read_indexed(nesdev, NES_IDX_NIC_UNICAST_ALL);</div><div class='add'>+		nic_active |= uc_all_active;</div><div class='add'>+		nes_write_indexed(nesdev, NES_IDX_NIC_UNICAST_ALL, nic_active);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -1208,10 +1277,12 @@ static void nes_netdev_get_drvinfo(struct net_device *netdev,</div><div class='ctx'> 		struct ethtool_drvinfo *drvinfo)</div><div class='ctx'> {</div><div class='ctx'> 	struct nes_vnic *nesvnic = netdev_priv(netdev);</div><div class='add'>+	struct nes_adapter *nesadapter = nesvnic-&gt;nesdev-&gt;nesadapter;</div><div class='ctx'> </div><div class='ctx'> 	strcpy(drvinfo-&gt;driver, DRV_NAME);</div><div class='ctx'> 	strcpy(drvinfo-&gt;bus_info, pci_name(nesvnic-&gt;nesdev-&gt;pcidev));</div><div class='del'>-	strcpy(drvinfo-&gt;fw_version, "TBD");</div><div class='add'>+	sprintf(drvinfo-&gt;fw_version, "%u.%u", nesadapter-&gt;firmware_version&gt;&gt;16,</div><div class='add'>+				nesadapter-&gt;firmware_version &amp; 0x000000ff);</div><div class='ctx'> 	strcpy(drvinfo-&gt;version, DRV_VERSION);</div><div class='ctx'> 	drvinfo-&gt;n_stats = nes_netdev_get_stats_count(netdev);</div><div class='ctx'> 	drvinfo-&gt;testinfo_len = 0;</div><div class='hunk'>@@ -1587,7 +1658,9 @@ struct net_device *nes_netdev_init(struct nes_device *nesdev,</div><div class='ctx'> 			nesvnic, (unsigned long)netdev-&gt;features, nesvnic-&gt;nic.qp_id,</div><div class='ctx'> 			nesvnic-&gt;nic_index, nesvnic-&gt;logical_port,  nesdev-&gt;mac_index);</div><div class='ctx'> </div><div class='del'>-	if (nesvnic-&gt;nesdev-&gt;nesadapter-&gt;port_count == 1) {</div><div class='add'>+	if (nesvnic-&gt;nesdev-&gt;nesadapter-&gt;port_count == 1 &amp;&amp;</div><div class='add'>+		nesvnic-&gt;nesdev-&gt;nesadapter-&gt;adapter_fcn_count == 1) {</div><div class='add'>+</div><div class='ctx'> 		nesvnic-&gt;qp_nic_index[0] = nesvnic-&gt;nic_index;</div><div class='ctx'> 		nesvnic-&gt;qp_nic_index[1] = nesvnic-&gt;nic_index + 1;</div><div class='ctx'> 		if (nes_drv_opt &amp; NES_DRV_OPT_DUAL_LOGICAL_PORT) {</div><div class='hunk'>@@ -1598,11 +1671,14 @@ struct net_device *nes_netdev_init(struct nes_device *nesdev,</div><div class='ctx'> 			nesvnic-&gt;qp_nic_index[3] = nesvnic-&gt;nic_index + 3;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		if (nesvnic-&gt;nesdev-&gt;nesadapter-&gt;port_count == 2) {</div><div class='del'>-			nesvnic-&gt;qp_nic_index[0] = nesvnic-&gt;nic_index;</div><div class='del'>-			nesvnic-&gt;qp_nic_index[1] = nesvnic-&gt;nic_index + 2;</div><div class='del'>-			nesvnic-&gt;qp_nic_index[2] = 0xf;</div><div class='del'>-			nesvnic-&gt;qp_nic_index[3] = 0xf;</div><div class='add'>+		if (nesvnic-&gt;nesdev-&gt;nesadapter-&gt;port_count == 2 ||</div><div class='add'>+			(nesvnic-&gt;nesdev-&gt;nesadapter-&gt;port_count == 1 &amp;&amp;</div><div class='add'>+			nesvnic-&gt;nesdev-&gt;nesadapter-&gt;adapter_fcn_count == 2)) {</div><div class='add'>+				nesvnic-&gt;qp_nic_index[0] = nesvnic-&gt;nic_index;</div><div class='add'>+				nesvnic-&gt;qp_nic_index[1] = nesvnic-&gt;nic_index</div><div class='add'>+									+ 2;</div><div class='add'>+				nesvnic-&gt;qp_nic_index[2] = 0xf;</div><div class='add'>+				nesvnic-&gt;qp_nic_index[3] = 0xf;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			nesvnic-&gt;qp_nic_index[0] = nesvnic-&gt;nic_index;</div><div class='ctx'> 			nesvnic-&gt;qp_nic_index[1] = 0xf;</div><div class='head'>diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c<br/>index d79942e84979..932e56fcf774 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/infiniband/hw/nes/nes_verbs.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/infiniband/hw/nes/nes_verbs.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/infiniband/hw/nes/nes_verbs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/infiniband/hw/nes/nes_verbs.c</a></div><div class='hunk'>@@ -1467,7 +1467,6 @@ static struct ib_qp *nes_create_qp(struct ib_pd *ibpd,</div><div class='ctx'> 		default:</div><div class='ctx'> 			nes_debug(NES_DBG_QP, "Invalid QP type: %d\n", init_attr-&gt;qp_type);</div><div class='ctx'> 			return ERR_PTR(-EINVAL);</div><div class='del'>-			break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* update the QP table */</div><div class='hunk'>@@ -2498,7 +2497,6 @@ static struct ib_mr *nes_reg_user_mr(struct ib_pd *pd, u64 start, u64 length,</div><div class='ctx'> 			nes_debug(NES_DBG_MR, "Leaving, ibmr=%p", ibmr);</div><div class='ctx'> </div><div class='ctx'> 			return ibmr;</div><div class='del'>-			break;</div><div class='ctx'> 		case IWNES_MEMREG_TYPE_QP:</div><div class='ctx'> 		case IWNES_MEMREG_TYPE_CQ:</div><div class='ctx'> 			nespbl = kzalloc(sizeof(*nespbl), GFP_KERNEL);</div><div class='hunk'>@@ -2572,7 +2570,6 @@ static struct ib_mr *nes_reg_user_mr(struct ib_pd *pd, u64 start, u64 length,</div><div class='ctx'> 			nesmr-&gt;ibmr.lkey = -1;</div><div class='ctx'> 			nesmr-&gt;mode = req.reg_type;</div><div class='ctx'> 			return &amp;nesmr-&gt;ibmr;</div><div class='del'>-			break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return ERR_PTR(-ENOSYS);</div><div class='head'>diff --git a/drivers/infiniband/ulp/ipoib/ipoib.h b/drivers/infiniband/ulp/ipoib/ipoib.h<br/>index 05eb41b8ab63..68ba5c3482e4 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/infiniband/ulp/ipoib/ipoib.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/infiniband/ulp/ipoib/ipoib.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/infiniband/ulp/ipoib/ipoib.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/infiniband/ulp/ipoib/ipoib.h</a></div><div class='hunk'>@@ -268,10 +268,9 @@ struct ipoib_lro {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Device private locking: tx_lock protects members used in TX fast</div><div class='del'>- * path (and we use LLTX so upper layers don't do extra locking).</div><div class='del'>- * lock protects everything else.  lock nests inside of tx_lock (ie</div><div class='del'>- * tx_lock must be acquired first if needed).</div><div class='add'>+ * Device private locking: network stack tx_lock protects members used</div><div class='add'>+ * in TX fast path, lock protects everything else.  lock nests inside</div><div class='add'>+ * of tx_lock (ie tx_lock must be acquired first if needed).</div><div class='ctx'>  */</div><div class='ctx'> struct ipoib_dev_priv {</div><div class='ctx'> 	spinlock_t lock;</div><div class='hunk'>@@ -320,7 +319,6 @@ struct ipoib_dev_priv {</div><div class='ctx'> </div><div class='ctx'> 	struct ipoib_rx_buf *rx_ring;</div><div class='ctx'> </div><div class='del'>-	spinlock_t	     tx_lock;</div><div class='ctx'> 	struct ipoib_tx_buf *tx_ring;</div><div class='ctx'> 	unsigned	     tx_head;</div><div class='ctx'> 	unsigned	     tx_tail;</div><div class='head'>diff --git a/drivers/infiniband/ulp/ipoib/ipoib_cm.c b/drivers/infiniband/ulp/ipoib/ipoib_cm.c<br/>index 341ffedafed6..7b14c2c39500 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/infiniband/ulp/ipoib/ipoib_cm.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/infiniband/ulp/ipoib/ipoib_cm.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/infiniband/ulp/ipoib/ipoib_cm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/infiniband/ulp/ipoib/ipoib_cm.c</a></div><div class='hunk'>@@ -786,7 +786,8 @@ void ipoib_cm_handle_tx_wc(struct net_device *dev, struct ib_wc *wc)</div><div class='ctx'> </div><div class='ctx'> 	dev_kfree_skb_any(tx_req-&gt;skb);</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;tx_lock, flags);</div><div class='add'>+	netif_tx_lock(dev);</div><div class='add'>+</div><div class='ctx'> 	++tx-&gt;tx_tail;</div><div class='ctx'> 	if (unlikely(--priv-&gt;tx_outstanding == ipoib_sendq_size &gt;&gt; 1) &amp;&amp;</div><div class='ctx'> 	    netif_queue_stopped(dev) &amp;&amp;</div><div class='hunk'>@@ -801,7 +802,7 @@ void ipoib_cm_handle_tx_wc(struct net_device *dev, struct ib_wc *wc)</div><div class='ctx'> 			   "(status=%d, wrid=%d vend_err %x)\n",</div><div class='ctx'> 			   wc-&gt;status, wr_id, wc-&gt;vendor_err);</div><div class='ctx'> </div><div class='del'>-		spin_lock(&amp;priv-&gt;lock);</div><div class='add'>+		spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='ctx'> 		neigh = tx-&gt;neigh;</div><div class='ctx'> </div><div class='ctx'> 		if (neigh) {</div><div class='hunk'>@@ -821,10 +822,10 @@ void ipoib_cm_handle_tx_wc(struct net_device *dev, struct ib_wc *wc)</div><div class='ctx'> </div><div class='ctx'> 		clear_bit(IPOIB_FLAG_OPER_UP, &amp;tx-&gt;flags);</div><div class='ctx'> </div><div class='del'>-		spin_unlock(&amp;priv-&gt;lock);</div><div class='add'>+		spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;tx_lock, flags);</div><div class='add'>+	netif_tx_unlock(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ipoib_cm_dev_open(struct net_device *dev)</div><div class='hunk'>@@ -1149,7 +1150,6 @@ static void ipoib_cm_tx_destroy(struct ipoib_cm_tx *p)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipoib_dev_priv *priv = netdev_priv(p-&gt;dev);</div><div class='ctx'> 	struct ipoib_cm_tx_buf *tx_req;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	unsigned long begin;</div><div class='ctx'> </div><div class='ctx'> 	ipoib_dbg(priv, "Destroy active connection 0x%x head 0x%x tail 0x%x\n",</div><div class='hunk'>@@ -1180,12 +1180,12 @@ timeout:</div><div class='ctx'> 				    DMA_TO_DEVICE);</div><div class='ctx'> 		dev_kfree_skb_any(tx_req-&gt;skb);</div><div class='ctx'> 		++p-&gt;tx_tail;</div><div class='del'>-		spin_lock_irqsave(&amp;priv-&gt;tx_lock, flags);</div><div class='add'>+		netif_tx_lock_bh(p-&gt;dev);</div><div class='ctx'> 		if (unlikely(--priv-&gt;tx_outstanding == ipoib_sendq_size &gt;&gt; 1) &amp;&amp;</div><div class='ctx'> 		    netif_queue_stopped(p-&gt;dev) &amp;&amp;</div><div class='ctx'> 		    test_bit(IPOIB_FLAG_ADMIN_UP, &amp;priv-&gt;flags))</div><div class='ctx'> 			netif_wake_queue(p-&gt;dev);</div><div class='del'>-		spin_unlock_irqrestore(&amp;priv-&gt;tx_lock, flags);</div><div class='add'>+		netif_tx_unlock_bh(p-&gt;dev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (p-&gt;qp)</div><div class='hunk'>@@ -1202,6 +1202,7 @@ static int ipoib_cm_tx_handler(struct ib_cm_id *cm_id,</div><div class='ctx'> 	struct ipoib_dev_priv *priv = netdev_priv(tx-&gt;dev);</div><div class='ctx'> 	struct net_device *dev = priv-&gt;dev;</div><div class='ctx'> 	struct ipoib_neigh *neigh;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	switch (event-&gt;event) {</div><div class='hunk'>@@ -1220,8 +1221,8 @@ static int ipoib_cm_tx_handler(struct ib_cm_id *cm_id,</div><div class='ctx'> 	case IB_CM_REJ_RECEIVED:</div><div class='ctx'> 	case IB_CM_TIMEWAIT_EXIT:</div><div class='ctx'> 		ipoib_dbg(priv, "CM error %d.\n", event-&gt;event);</div><div class='del'>-		spin_lock_irq(&amp;priv-&gt;tx_lock);</div><div class='del'>-		spin_lock(&amp;priv-&gt;lock);</div><div class='add'>+		netif_tx_lock_bh(dev);</div><div class='add'>+		spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='ctx'> 		neigh = tx-&gt;neigh;</div><div class='ctx'> </div><div class='ctx'> 		if (neigh) {</div><div class='hunk'>@@ -1239,8 +1240,8 @@ static int ipoib_cm_tx_handler(struct ib_cm_id *cm_id,</div><div class='ctx'> 			queue_work(ipoib_workqueue, &amp;priv-&gt;cm.reap_task);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		spin_unlock(&amp;priv-&gt;lock);</div><div class='del'>-		spin_unlock_irq(&amp;priv-&gt;tx_lock);</div><div class='add'>+		spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='add'>+		netif_tx_unlock_bh(dev);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1294,19 +1295,24 @@ static void ipoib_cm_tx_start(struct work_struct *work)</div><div class='ctx'> 	struct ib_sa_path_rec pathrec;</div><div class='ctx'> 	u32 qpn;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;tx_lock, flags);</div><div class='del'>-	spin_lock(&amp;priv-&gt;lock);</div><div class='add'>+	netif_tx_lock_bh(dev);</div><div class='add'>+	spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='add'>+</div><div class='ctx'> 	while (!list_empty(&amp;priv-&gt;cm.start_list)) {</div><div class='ctx'> 		p = list_entry(priv-&gt;cm.start_list.next, typeof(*p), list);</div><div class='ctx'> 		list_del_init(&amp;p-&gt;list);</div><div class='ctx'> 		neigh = p-&gt;neigh;</div><div class='ctx'> 		qpn = IPOIB_QPN(neigh-&gt;neighbour-&gt;ha);</div><div class='ctx'> 		memcpy(&amp;pathrec, &amp;p-&gt;path-&gt;pathrec, sizeof pathrec);</div><div class='del'>-		spin_unlock(&amp;priv-&gt;lock);</div><div class='del'>-		spin_unlock_irqrestore(&amp;priv-&gt;tx_lock, flags);</div><div class='add'>+</div><div class='add'>+		spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='add'>+		netif_tx_unlock_bh(dev);</div><div class='add'>+</div><div class='ctx'> 		ret = ipoib_cm_tx_init(p, qpn, &amp;pathrec);</div><div class='del'>-		spin_lock_irqsave(&amp;priv-&gt;tx_lock, flags);</div><div class='del'>-		spin_lock(&amp;priv-&gt;lock);</div><div class='add'>+</div><div class='add'>+		netif_tx_lock_bh(dev);</div><div class='add'>+		spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='add'>+</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			neigh = p-&gt;neigh;</div><div class='ctx'> 			if (neigh) {</div><div class='hunk'>@@ -1320,44 +1326,52 @@ static void ipoib_cm_tx_start(struct work_struct *work)</div><div class='ctx'> 			kfree(p);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;priv-&gt;lock);</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;tx_lock, flags);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='add'>+	netif_tx_unlock_bh(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ipoib_cm_tx_reap(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipoib_dev_priv *priv = container_of(work, struct ipoib_dev_priv,</div><div class='ctx'> 						   cm.reap_task);</div><div class='add'>+	struct net_device *dev = priv-&gt;dev;</div><div class='ctx'> 	struct ipoib_cm_tx *p;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	netif_tx_lock_bh(dev);</div><div class='add'>+	spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;priv-&gt;tx_lock);</div><div class='del'>-	spin_lock(&amp;priv-&gt;lock);</div><div class='ctx'> 	while (!list_empty(&amp;priv-&gt;cm.reap_list)) {</div><div class='ctx'> 		p = list_entry(priv-&gt;cm.reap_list.next, typeof(*p), list);</div><div class='ctx'> 		list_del(&amp;p-&gt;list);</div><div class='del'>-		spin_unlock(&amp;priv-&gt;lock);</div><div class='del'>-		spin_unlock_irq(&amp;priv-&gt;tx_lock);</div><div class='add'>+		spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='add'>+		netif_tx_unlock_bh(dev);</div><div class='ctx'> 		ipoib_cm_tx_destroy(p);</div><div class='del'>-		spin_lock_irq(&amp;priv-&gt;tx_lock);</div><div class='del'>-		spin_lock(&amp;priv-&gt;lock);</div><div class='add'>+		netif_tx_lock_bh(dev);</div><div class='add'>+		spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;priv-&gt;lock);</div><div class='del'>-	spin_unlock_irq(&amp;priv-&gt;tx_lock);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='add'>+	netif_tx_unlock_bh(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ipoib_cm_skb_reap(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipoib_dev_priv *priv = container_of(work, struct ipoib_dev_priv,</div><div class='ctx'> 						   cm.skb_task);</div><div class='add'>+	struct net_device *dev = priv-&gt;dev;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='del'>-</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> 	unsigned mtu = priv-&gt;mcast_mtu;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;priv-&gt;tx_lock);</div><div class='del'>-	spin_lock(&amp;priv-&gt;lock);</div><div class='add'>+	netif_tx_lock_bh(dev);</div><div class='add'>+	spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='add'>+</div><div class='ctx'> 	while ((skb = skb_dequeue(&amp;priv-&gt;cm.skb_queue))) {</div><div class='del'>-		spin_unlock(&amp;priv-&gt;lock);</div><div class='del'>-		spin_unlock_irq(&amp;priv-&gt;tx_lock);</div><div class='add'>+		spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='add'>+		netif_tx_unlock_bh(dev);</div><div class='add'>+</div><div class='ctx'> 		if (skb-&gt;protocol == htons(ETH_P_IP))</div><div class='ctx'> 			icmp_send(skb, ICMP_DEST_UNREACH, ICMP_FRAG_NEEDED, htonl(mtu));</div><div class='ctx'> #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)</div><div class='hunk'>@@ -1365,11 +1379,13 @@ static void ipoib_cm_skb_reap(struct work_struct *work)</div><div class='ctx'> 			icmpv6_send(skb, ICMPV6_PKT_TOOBIG, 0, mtu, priv-&gt;dev);</div><div class='ctx'> #endif</div><div class='ctx'> 		dev_kfree_skb_any(skb);</div><div class='del'>-		spin_lock_irq(&amp;priv-&gt;tx_lock);</div><div class='del'>-		spin_lock(&amp;priv-&gt;lock);</div><div class='add'>+</div><div class='add'>+		netif_tx_lock_bh(dev);</div><div class='add'>+		spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;priv-&gt;lock);</div><div class='del'>-	spin_unlock_irq(&amp;priv-&gt;tx_lock);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='add'>+	netif_tx_unlock_bh(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void ipoib_cm_skb_too_long(struct net_device *dev, struct sk_buff *skb,</div><div class='head'>diff --git a/drivers/infiniband/ulp/ipoib/ipoib_ib.c b/drivers/infiniband/ulp/ipoib/ipoib_ib.c<br/>index 66cafa20c246..0e748aeeae99 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/infiniband/ulp/ipoib/ipoib_ib.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/infiniband/ulp/ipoib/ipoib_ib.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/infiniband/ulp/ipoib/ipoib_ib.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/infiniband/ulp/ipoib/ipoib_ib.c</a></div><div class='hunk'>@@ -468,21 +468,22 @@ void ipoib_ib_completion(struct ib_cq *cq, void *dev_ptr)</div><div class='ctx'> static void drain_tx_cq(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipoib_dev_priv *priv = netdev_priv(dev);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;tx_lock, flags);</div><div class='add'>+	netif_tx_lock(dev);</div><div class='ctx'> 	while (poll_tx(priv))</div><div class='ctx'> 		; /* nothing */</div><div class='ctx'> </div><div class='ctx'> 	if (netif_queue_stopped(dev))</div><div class='ctx'> 		mod_timer(&amp;priv-&gt;poll_timer, jiffies + 1);</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;tx_lock, flags);</div><div class='add'>+	netif_tx_unlock(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void ipoib_send_comp_handler(struct ib_cq *cq, void *dev_ptr)</div><div class='ctx'> {</div><div class='del'>-	drain_tx_cq((struct net_device *)dev_ptr);</div><div class='add'>+	struct ipoib_dev_priv *priv = netdev_priv(dev_ptr);</div><div class='add'>+</div><div class='add'>+	mod_timer(&amp;priv-&gt;poll_timer, jiffies);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int post_send(struct ipoib_dev_priv *priv,</div><div class='hunk'>@@ -614,17 +615,20 @@ static void __ipoib_reap_ah(struct net_device *dev)</div><div class='ctx'> 	struct ipoib_dev_priv *priv = netdev_priv(dev);</div><div class='ctx'> 	struct ipoib_ah *ah, *tah;</div><div class='ctx'> 	LIST_HEAD(remove_list);</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	netif_tx_lock_bh(dev);</div><div class='add'>+	spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;priv-&gt;tx_lock);</div><div class='del'>-	spin_lock(&amp;priv-&gt;lock);</div><div class='ctx'> 	list_for_each_entry_safe(ah, tah, &amp;priv-&gt;dead_ahs, list)</div><div class='ctx'> 		if ((int) priv-&gt;tx_tail - (int) ah-&gt;last_send &gt;= 0) {</div><div class='ctx'> 			list_del(&amp;ah-&gt;list);</div><div class='ctx'> 			ib_destroy_ah(ah-&gt;ah);</div><div class='ctx'> 			kfree(ah);</div><div class='ctx'> 		}</div><div class='del'>-	spin_unlock(&amp;priv-&gt;lock);</div><div class='del'>-	spin_unlock_irq(&amp;priv-&gt;tx_lock);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='add'>+	netif_tx_unlock_bh(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void ipoib_reap_ah(struct work_struct *work)</div><div class='hunk'>@@ -761,6 +765,14 @@ void ipoib_drain_cq(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipoib_dev_priv *priv = netdev_priv(dev);</div><div class='ctx'> 	int i, n;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We call completion handling routines that expect to be</div><div class='add'>+	 * called from the BH-disabled NAPI poll context, so disable</div><div class='add'>+	 * BHs here too.</div><div class='add'>+	 */</div><div class='add'>+	local_bh_disable();</div><div class='add'>+</div><div class='ctx'> 	do {</div><div class='ctx'> 		n = ib_poll_cq(priv-&gt;recv_cq, IPOIB_NUM_WC, priv-&gt;ibwc);</div><div class='ctx'> 		for (i = 0; i &lt; n; ++i) {</div><div class='hunk'>@@ -784,6 +796,8 @@ void ipoib_drain_cq(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	while (poll_tx(priv))</div><div class='ctx'> 		; /* nothing */</div><div class='add'>+</div><div class='add'>+	local_bh_enable();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ipoib_ib_dev_stop(struct net_device *dev, int flush)</div><div class='head'>diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c<br/>index e9ca3cb57d52..c0ee514396df 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/infiniband/ulp/ipoib/ipoib_main.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/infiniband/ulp/ipoib/ipoib_main.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/infiniband/ulp/ipoib/ipoib_main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/infiniband/ulp/ipoib/ipoib_main.c</a></div><div class='hunk'>@@ -373,9 +373,10 @@ void ipoib_flush_paths(struct net_device *dev)</div><div class='ctx'> 	struct ipoib_dev_priv *priv = netdev_priv(dev);</div><div class='ctx'> 	struct ipoib_path *path, *tp;</div><div class='ctx'> 	LIST_HEAD(remove_list);</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;priv-&gt;tx_lock);</div><div class='del'>-	spin_lock(&amp;priv-&gt;lock);</div><div class='add'>+	netif_tx_lock_bh(dev);</div><div class='add'>+	spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	list_splice_init(&amp;priv-&gt;path_list, &amp;remove_list);</div><div class='ctx'> </div><div class='hunk'>@@ -385,15 +386,16 @@ void ipoib_flush_paths(struct net_device *dev)</div><div class='ctx'> 	list_for_each_entry_safe(path, tp, &amp;remove_list, list) {</div><div class='ctx'> 		if (path-&gt;query)</div><div class='ctx'> 			ib_sa_cancel_query(path-&gt;query_id, path-&gt;query);</div><div class='del'>-		spin_unlock(&amp;priv-&gt;lock);</div><div class='del'>-		spin_unlock_irq(&amp;priv-&gt;tx_lock);</div><div class='add'>+		spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='add'>+		netif_tx_unlock_bh(dev);</div><div class='ctx'> 		wait_for_completion(&amp;path-&gt;done);</div><div class='ctx'> 		path_free(dev, path);</div><div class='del'>-		spin_lock_irq(&amp;priv-&gt;tx_lock);</div><div class='del'>-		spin_lock(&amp;priv-&gt;lock);</div><div class='add'>+		netif_tx_lock_bh(dev);</div><div class='add'>+		spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;priv-&gt;lock);</div><div class='del'>-	spin_unlock_irq(&amp;priv-&gt;tx_lock);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='add'>+	netif_tx_unlock_bh(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void path_rec_completion(int status,</div><div class='hunk'>@@ -555,6 +557,7 @@ static void neigh_add_path(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	struct ipoib_dev_priv *priv = netdev_priv(dev);</div><div class='ctx'> 	struct ipoib_path *path;</div><div class='ctx'> 	struct ipoib_neigh *neigh;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	neigh = ipoib_neigh_alloc(skb-&gt;dst-&gt;neighbour, skb-&gt;dev);</div><div class='ctx'> 	if (!neigh) {</div><div class='hunk'>@@ -563,11 +566,7 @@ static void neigh_add_path(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * We can only be called from ipoib_start_xmit, so we're</div><div class='del'>-	 * inside tx_lock -- no need to save/restore flags.</div><div class='del'>-	 */</div><div class='del'>-	spin_lock(&amp;priv-&gt;lock);</div><div class='add'>+	spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	path = __path_find(dev, skb-&gt;dst-&gt;neighbour-&gt;ha + 4);</div><div class='ctx'> 	if (!path) {</div><div class='hunk'>@@ -614,7 +613,7 @@ static void neigh_add_path(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 		__skb_queue_tail(&amp;neigh-&gt;queue, skb);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_unlock(&amp;priv-&gt;lock);</div><div class='add'>+	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='ctx'> 	return;</div><div class='ctx'> </div><div class='ctx'> err_list:</div><div class='hunk'>@@ -626,7 +625,7 @@ err_drop:</div><div class='ctx'> 	++dev-&gt;stats.tx_dropped;</div><div class='ctx'> 	dev_kfree_skb_any(skb);</div><div class='ctx'> </div><div class='del'>-	spin_unlock(&amp;priv-&gt;lock);</div><div class='add'>+	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ipoib_path_lookup(struct sk_buff *skb, struct net_device *dev)</div><div class='hunk'>@@ -650,12 +649,9 @@ static void unicast_arp_send(struct sk_buff *skb, struct net_device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct ipoib_dev_priv *priv = netdev_priv(dev);</div><div class='ctx'> 	struct ipoib_path *path;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * We can only be called from ipoib_start_xmit, so we're</div><div class='del'>-	 * inside tx_lock -- no need to save/restore flags.</div><div class='del'>-	 */</div><div class='del'>-	spin_lock(&amp;priv-&gt;lock);</div><div class='add'>+	spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	path = __path_find(dev, phdr-&gt;hwaddr + 4);</div><div class='ctx'> 	if (!path || !path-&gt;valid) {</div><div class='hunk'>@@ -667,7 +663,7 @@ static void unicast_arp_send(struct sk_buff *skb, struct net_device *dev,</div><div class='ctx'> 			__skb_queue_tail(&amp;path-&gt;queue, skb);</div><div class='ctx'> </div><div class='ctx'> 			if (path_rec_start(dev, path)) {</div><div class='del'>-				spin_unlock(&amp;priv-&gt;lock);</div><div class='add'>+				spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='ctx'> 				path_free(dev, path);</div><div class='ctx'> 				return;</div><div class='ctx'> 			} else</div><div class='hunk'>@@ -677,7 +673,7 @@ static void unicast_arp_send(struct sk_buff *skb, struct net_device *dev,</div><div class='ctx'> 			dev_kfree_skb_any(skb);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		spin_unlock(&amp;priv-&gt;lock);</div><div class='add'>+		spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -696,7 +692,7 @@ static void unicast_arp_send(struct sk_buff *skb, struct net_device *dev,</div><div class='ctx'> 		dev_kfree_skb_any(skb);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_unlock(&amp;priv-&gt;lock);</div><div class='add'>+	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ipoib_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='hunk'>@@ -705,13 +701,10 @@ static int ipoib_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	struct ipoib_neigh *neigh;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(!spin_trylock_irqsave(&amp;priv-&gt;tx_lock, flags)))</div><div class='del'>-		return NETDEV_TX_LOCKED;</div><div class='del'>-</div><div class='ctx'> 	if (likely(skb-&gt;dst &amp;&amp; skb-&gt;dst-&gt;neighbour)) {</div><div class='ctx'> 		if (unlikely(!*to_ipoib_neigh(skb-&gt;dst-&gt;neighbour))) {</div><div class='ctx'> 			ipoib_path_lookup(skb, dev);</div><div class='del'>-			goto out;</div><div class='add'>+			return NETDEV_TX_OK;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		neigh = *to_ipoib_neigh(skb-&gt;dst-&gt;neighbour);</div><div class='hunk'>@@ -721,7 +714,7 @@ static int ipoib_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 					    skb-&gt;dst-&gt;neighbour-&gt;ha + 4,</div><div class='ctx'> 					    sizeof(union ib_gid))) ||</div><div class='ctx'> 					 (neigh-&gt;dev != dev))) {</div><div class='del'>-				spin_lock(&amp;priv-&gt;lock);</div><div class='add'>+				spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='ctx'> 				/*</div><div class='ctx'> 				 * It's safe to call ipoib_put_ah() inside</div><div class='ctx'> 				 * priv-&gt;lock here, because we know that</div><div class='hunk'>@@ -732,25 +725,25 @@ static int ipoib_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 				ipoib_put_ah(neigh-&gt;ah);</div><div class='ctx'> 				list_del(&amp;neigh-&gt;list);</div><div class='ctx'> 				ipoib_neigh_free(dev, neigh);</div><div class='del'>-				spin_unlock(&amp;priv-&gt;lock);</div><div class='add'>+				spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='ctx'> 				ipoib_path_lookup(skb, dev);</div><div class='del'>-				goto out;</div><div class='add'>+				return NETDEV_TX_OK;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 		if (ipoib_cm_get(neigh)) {</div><div class='ctx'> 			if (ipoib_cm_up(neigh)) {</div><div class='ctx'> 				ipoib_cm_send(dev, skb, ipoib_cm_get(neigh));</div><div class='del'>-				goto out;</div><div class='add'>+				return NETDEV_TX_OK;</div><div class='ctx'> 			}</div><div class='ctx'> 		} else if (neigh-&gt;ah) {</div><div class='ctx'> 			ipoib_send(dev, skb, neigh-&gt;ah, IPOIB_QPN(skb-&gt;dst-&gt;neighbour-&gt;ha));</div><div class='del'>-			goto out;</div><div class='add'>+			return NETDEV_TX_OK;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (skb_queue_len(&amp;neigh-&gt;queue) &lt; IPOIB_MAX_PATH_REC_QUEUE) {</div><div class='del'>-			spin_lock(&amp;priv-&gt;lock);</div><div class='add'>+			spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='ctx'> 			__skb_queue_tail(&amp;neigh-&gt;queue, skb);</div><div class='del'>-			spin_unlock(&amp;priv-&gt;lock);</div><div class='add'>+			spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			++dev-&gt;stats.tx_dropped;</div><div class='ctx'> 			dev_kfree_skb_any(skb);</div><div class='hunk'>@@ -779,16 +772,13 @@ static int ipoib_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 					   IPOIB_GID_RAW_ARG(phdr-&gt;hwaddr + 4));</div><div class='ctx'> 				dev_kfree_skb_any(skb);</div><div class='ctx'> 				++dev-&gt;stats.tx_dropped;</div><div class='del'>-				goto out;</div><div class='add'>+				return NETDEV_TX_OK;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			unicast_arp_send(skb, dev, phdr);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;tx_lock, flags);</div><div class='del'>-</div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1052,7 +1042,6 @@ static void ipoib_setup(struct net_device *dev)</div><div class='ctx'> 	dev-&gt;type		 = ARPHRD_INFINIBAND;</div><div class='ctx'> 	dev-&gt;tx_queue_len	 = ipoib_sendq_size * 2;</div><div class='ctx'> 	dev-&gt;features		 = (NETIF_F_VLAN_CHALLENGED	|</div><div class='del'>-				    NETIF_F_LLTX		|</div><div class='ctx'> 				    NETIF_F_HIGHDMA);</div><div class='ctx'> </div><div class='ctx'> 	memcpy(dev-&gt;broadcast, ipv4_bcast_addr, INFINIBAND_ALEN);</div><div class='hunk'>@@ -1064,7 +1053,6 @@ static void ipoib_setup(struct net_device *dev)</div><div class='ctx'> 	ipoib_lro_setup(priv);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;priv-&gt;lock);</div><div class='del'>-	spin_lock_init(&amp;priv-&gt;tx_lock);</div><div class='ctx'> </div><div class='ctx'> 	mutex_init(&amp;priv-&gt;vlan_mutex);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c<br/>index aae28620a6e5..d9d1223c3fd5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/infiniband/ulp/ipoib/ipoib_multicast.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/infiniband/ulp/ipoib/ipoib_multicast.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/infiniband/ulp/ipoib/ipoib_multicast.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/infiniband/ulp/ipoib/ipoib_multicast.c</a></div><div class='hunk'>@@ -69,14 +69,13 @@ static void ipoib_mcast_free(struct ipoib_mcast *mcast)</div><div class='ctx'> 	struct net_device *dev = mcast-&gt;dev;</div><div class='ctx'> 	struct ipoib_dev_priv *priv = netdev_priv(dev);</div><div class='ctx'> 	struct ipoib_neigh *neigh, *tmp;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int tx_dropped = 0;</div><div class='ctx'> </div><div class='ctx'> 	ipoib_dbg_mcast(netdev_priv(dev),</div><div class='ctx'> 			"deleting multicast group " IPOIB_GID_FMT "\n",</div><div class='ctx'> 			IPOIB_GID_ARG(mcast-&gt;mcmember.mgid));</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='add'>+	spin_lock_irq(&amp;priv-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry_safe(neigh, tmp, &amp;mcast-&gt;neigh_list, list) {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -90,7 +89,7 @@ static void ipoib_mcast_free(struct ipoib_mcast *mcast)</div><div class='ctx'> 		ipoib_neigh_free(dev, neigh);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='add'>+	spin_unlock_irq(&amp;priv-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	if (mcast-&gt;ah)</div><div class='ctx'> 		ipoib_put_ah(mcast-&gt;ah);</div><div class='hunk'>@@ -100,9 +99,9 @@ static void ipoib_mcast_free(struct ipoib_mcast *mcast)</div><div class='ctx'> 		dev_kfree_skb_any(skb_dequeue(&amp;mcast-&gt;pkt_queue));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;tx_lock, flags);</div><div class='add'>+	netif_tx_lock_bh(dev);</div><div class='ctx'> 	dev-&gt;stats.tx_dropped += tx_dropped;</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;tx_lock, flags);</div><div class='add'>+	netif_tx_unlock_bh(dev);</div><div class='ctx'> </div><div class='ctx'> 	kfree(mcast);</div><div class='ctx'> }</div><div class='hunk'>@@ -259,10 +258,10 @@ static int ipoib_mcast_join_finish(struct ipoib_mcast *mcast,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* actually send any queued packets */</div><div class='del'>-	spin_lock_irq(&amp;priv-&gt;tx_lock);</div><div class='add'>+	netif_tx_lock_bh(dev);</div><div class='ctx'> 	while (!skb_queue_empty(&amp;mcast-&gt;pkt_queue)) {</div><div class='ctx'> 		struct sk_buff *skb = skb_dequeue(&amp;mcast-&gt;pkt_queue);</div><div class='del'>-		spin_unlock_irq(&amp;priv-&gt;tx_lock);</div><div class='add'>+		netif_tx_unlock_bh(dev);</div><div class='ctx'> </div><div class='ctx'> 		skb-&gt;dev = dev;</div><div class='ctx'> </div><div class='hunk'>@@ -273,9 +272,9 @@ static int ipoib_mcast_join_finish(struct ipoib_mcast *mcast,</div><div class='ctx'> </div><div class='ctx'> 		if (dev_queue_xmit(skb))</div><div class='ctx'> 			ipoib_warn(priv, "dev_queue_xmit failed to requeue packet\n");</div><div class='del'>-		spin_lock_irq(&amp;priv-&gt;tx_lock);</div><div class='add'>+		netif_tx_lock_bh(dev);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irq(&amp;priv-&gt;tx_lock);</div><div class='add'>+	netif_tx_unlock_bh(dev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -286,7 +285,6 @@ ipoib_mcast_sendonly_join_complete(int status,</div><div class='ctx'> {</div><div class='ctx'> 	struct ipoib_mcast *mcast = multicast-&gt;context;</div><div class='ctx'> 	struct net_device *dev = mcast-&gt;dev;</div><div class='del'>-	struct ipoib_dev_priv *priv = netdev_priv(dev);</div><div class='ctx'> </div><div class='ctx'> 	/* We trap for port events ourselves. */</div><div class='ctx'> 	if (status == -ENETRESET)</div><div class='hunk'>@@ -302,12 +300,12 @@ ipoib_mcast_sendonly_join_complete(int status,</div><div class='ctx'> 					IPOIB_GID_ARG(mcast-&gt;mcmember.mgid), status);</div><div class='ctx'> </div><div class='ctx'> 		/* Flush out any queued packets */</div><div class='del'>-		spin_lock_irq(&amp;priv-&gt;tx_lock);</div><div class='add'>+		netif_tx_lock_bh(dev);</div><div class='ctx'> 		while (!skb_queue_empty(&amp;mcast-&gt;pkt_queue)) {</div><div class='ctx'> 			++dev-&gt;stats.tx_dropped;</div><div class='ctx'> 			dev_kfree_skb_any(skb_dequeue(&amp;mcast-&gt;pkt_queue));</div><div class='ctx'> 		}</div><div class='del'>-		spin_unlock_irq(&amp;priv-&gt;tx_lock);</div><div class='add'>+		netif_tx_unlock_bh(dev);</div><div class='ctx'> </div><div class='ctx'> 		/* Clear the busy flag so we try again */</div><div class='ctx'> 		status = test_and_clear_bit(IPOIB_MCAST_FLAG_BUSY,</div><div class='hunk'>@@ -662,12 +660,9 @@ void ipoib_mcast_send(struct net_device *dev, void *mgid, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipoib_dev_priv *priv = netdev_priv(dev);</div><div class='ctx'> 	struct ipoib_mcast *mcast;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * We can only be called from ipoib_start_xmit, so we're</div><div class='del'>-	 * inside tx_lock -- no need to save/restore flags.</div><div class='del'>-	 */</div><div class='del'>-	spin_lock(&amp;priv-&gt;lock);</div><div class='add'>+	spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	if (!test_bit(IPOIB_FLAG_OPER_UP, &amp;priv-&gt;flags)		||</div><div class='ctx'> 	    !priv-&gt;broadcast					||</div><div class='hunk'>@@ -738,7 +733,7 @@ out:</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> unlock:</div><div class='del'>-	spin_unlock(&amp;priv-&gt;lock);</div><div class='add'>+	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void ipoib_mcast_dev_flush(struct net_device *dev)</div><div class='head'>diff --git a/drivers/infiniband/ulp/iser/iscsi_iser.c b/drivers/infiniband/ulp/iser/iscsi_iser.c<br/>index 5a1cf2580e16..1e5b6446231d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/infiniband/ulp/iser/iscsi_iser.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/infiniband/ulp/iser/iscsi_iser.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/infiniband/ulp/iser/iscsi_iser.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/infiniband/ulp/iser/iscsi_iser.c</a></div><div class='hunk'>@@ -378,6 +378,7 @@ static void iscsi_iser_session_destroy(struct iscsi_cls_session *cls_session)</div><div class='ctx'> {</div><div class='ctx'> 	struct Scsi_Host *shost = iscsi_session_to_shost(cls_session);</div><div class='ctx'> </div><div class='add'>+	iscsi_session_teardown(cls_session);</div><div class='ctx'> 	iscsi_host_remove(shost);</div><div class='ctx'> 	iscsi_host_free(shost);</div><div class='ctx'> }</div><div class='hunk'>@@ -597,7 +598,7 @@ static struct scsi_host_template iscsi_iser_sht = {</div><div class='ctx'> 	.cmd_per_lun            = ISCSI_MAX_CMD_PER_LUN,</div><div class='ctx'> 	.eh_abort_handler       = iscsi_eh_abort,</div><div class='ctx'> 	.eh_device_reset_handler= iscsi_eh_device_reset,</div><div class='del'>-	.eh_host_reset_handler	= iscsi_eh_host_reset,</div><div class='add'>+	.eh_target_reset_handler= iscsi_eh_target_reset,</div><div class='ctx'> 	.use_clustering         = DISABLE_CLUSTERING,</div><div class='ctx'> 	.proc_name              = "iscsi_iser",</div><div class='ctx'> 	.this_id                = -1,</div><div class='head'>diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c<br/>index ed7c5f72cb8b..5b8b533f2908 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/infiniband/ulp/srp/ib_srp.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/infiniband/ulp/srp/ib_srp.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/infiniband/ulp/srp/ib_srp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/infiniband/ulp/srp/ib_srp.c</a></div><div class='hunk'>@@ -1683,7 +1683,7 @@ enum {</div><div class='ctx'> 				   SRP_OPT_SERVICE_ID),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static match_table_t srp_opt_tokens = {</div><div class='add'>+static const match_table_t srp_opt_tokens = {</div><div class='ctx'> 	{ SRP_OPT_ID_EXT,		"id_ext=%s" 		},</div><div class='ctx'> 	{ SRP_OPT_IOC_GUID,		"ioc_guid=%s" 		},</div><div class='ctx'> 	{ SRP_OPT_DGID,			"dgid=%s" 		},</div><div class='head'>diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c<br/>index 078e4eed0894..2880eaae157a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/gameport/gameport.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/input/gameport/gameport.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/gameport/gameport.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/gameport/gameport.c</a></div><div class='hunk'>@@ -231,6 +231,7 @@ static void gameport_find_driver(struct gameport *gameport)</div><div class='ctx'> enum gameport_event_type {</div><div class='ctx'> 	GAMEPORT_REGISTER_PORT,</div><div class='ctx'> 	GAMEPORT_REGISTER_DRIVER,</div><div class='add'>+	GAMEPORT_ATTACH_DRIVER,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct gameport_event {</div><div class='hunk'>@@ -245,11 +246,12 @@ static LIST_HEAD(gameport_event_list);</div><div class='ctx'> static DECLARE_WAIT_QUEUE_HEAD(gameport_wait);</div><div class='ctx'> static struct task_struct *gameport_task;</div><div class='ctx'> </div><div class='del'>-static void gameport_queue_event(void *object, struct module *owner,</div><div class='del'>-			      enum gameport_event_type event_type)</div><div class='add'>+static int gameport_queue_event(void *object, struct module *owner,</div><div class='add'>+				enum gameport_event_type event_type)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	struct gameport_event *event;</div><div class='add'>+	int retval = 0;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;gameport_event_lock, flags);</div><div class='ctx'> </div><div class='hunk'>@@ -268,24 +270,34 @@ static void gameport_queue_event(void *object, struct module *owner,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((event = kmalloc(sizeof(struct gameport_event), GFP_ATOMIC))) {</div><div class='del'>-		if (!try_module_get(owner)) {</div><div class='del'>-			printk(KERN_WARNING "gameport: Can't get module reference, dropping event %d\n", event_type);</div><div class='del'>-			kfree(event);</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		event-&gt;type = event_type;</div><div class='del'>-		event-&gt;object = object;</div><div class='del'>-		event-&gt;owner = owner;</div><div class='add'>+	event = kmalloc(sizeof(struct gameport_event), GFP_ATOMIC);</div><div class='add'>+	if (!event) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+			"gameport: Not enough memory to queue event %d\n",</div><div class='add'>+			event_type);</div><div class='add'>+		retval = -ENOMEM;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		list_add_tail(&amp;event-&gt;node, &amp;gameport_event_list);</div><div class='del'>-		wake_up(&amp;gameport_wait);</div><div class='del'>-	} else {</div><div class='del'>-		printk(KERN_ERR "gameport: Not enough memory to queue event %d\n", event_type);</div><div class='add'>+	if (!try_module_get(owner)) {</div><div class='add'>+		printk(KERN_WARNING</div><div class='add'>+			"gameport: Can't get module reference, dropping event %d\n",</div><div class='add'>+			event_type);</div><div class='add'>+		kfree(event);</div><div class='add'>+		retval = -EINVAL;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	event-&gt;type = event_type;</div><div class='add'>+	event-&gt;object = object;</div><div class='add'>+	event-&gt;owner = owner;</div><div class='add'>+</div><div class='add'>+	list_add_tail(&amp;event-&gt;node, &amp;gameport_event_list);</div><div class='add'>+	wake_up(&amp;gameport_wait);</div><div class='add'>+</div><div class='ctx'> out:</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;gameport_event_lock, flags);</div><div class='add'>+	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void gameport_free_event(struct gameport_event *event)</div><div class='hunk'>@@ -378,9 +390,10 @@ static void gameport_handle_event(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Remove all events that have been submitted for a given gameport port.</div><div class='add'>+ * Remove all events that have been submitted for a given object,</div><div class='add'>+ * be it a gameport port or a driver.</div><div class='ctx'>  */</div><div class='del'>-static void gameport_remove_pending_events(struct gameport *gameport)</div><div class='add'>+static void gameport_remove_pending_events(void *object)</div><div class='ctx'> {</div><div class='ctx'> 	struct list_head *node, *next;</div><div class='ctx'> 	struct gameport_event *event;</div><div class='hunk'>@@ -390,7 +403,7 @@ static void gameport_remove_pending_events(struct gameport *gameport)</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_safe(node, next, &amp;gameport_event_list) {</div><div class='ctx'> 		event = list_entry(node, struct gameport_event, node);</div><div class='del'>-		if (event-&gt;object == gameport) {</div><div class='add'>+		if (event-&gt;object == object) {</div><div class='ctx'> 			list_del_init(node);</div><div class='ctx'> 			gameport_free_event(event);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -705,10 +718,40 @@ static void gameport_add_driver(struct gameport_driver *drv)</div><div class='ctx'> 			drv-&gt;driver.name, error);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __gameport_register_driver(struct gameport_driver *drv, struct module *owner)</div><div class='add'>+int __gameport_register_driver(struct gameport_driver *drv, struct module *owner,</div><div class='add'>+				const char *mod_name)</div><div class='ctx'> {</div><div class='add'>+	int error;</div><div class='add'>+</div><div class='ctx'> 	drv-&gt;driver.bus = &amp;gameport_bus;</div><div class='del'>-	gameport_queue_event(drv, owner, GAMEPORT_REGISTER_DRIVER);</div><div class='add'>+	drv-&gt;driver.owner = owner;</div><div class='add'>+	drv-&gt;driver.mod_name = mod_name;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Temporarily disable automatic binding because probing</div><div class='add'>+	 * takes long time and we are better off doing it in kgameportd</div><div class='add'>+	 */</div><div class='add'>+	drv-&gt;ignore = 1;</div><div class='add'>+</div><div class='add'>+	error = driver_register(&amp;drv-&gt;driver);</div><div class='add'>+	if (error) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+			"gameport: driver_register() failed for %s, error: %d\n",</div><div class='add'>+			drv-&gt;driver.name, error);</div><div class='add'>+		return error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Reset ignore flag and let kgameportd bind the driver to free ports</div><div class='add'>+	 */</div><div class='add'>+	drv-&gt;ignore = 0;</div><div class='add'>+	error = gameport_queue_event(drv, NULL, GAMEPORT_ATTACH_DRIVER);</div><div class='add'>+	if (error) {</div><div class='add'>+		driver_unregister(&amp;drv-&gt;driver);</div><div class='add'>+		return error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void gameport_unregister_driver(struct gameport_driver *drv)</div><div class='hunk'>@@ -716,7 +759,9 @@ void gameport_unregister_driver(struct gameport_driver *drv)</div><div class='ctx'> 	struct gameport *gameport;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;gameport_mutex);</div><div class='add'>+</div><div class='ctx'> 	drv-&gt;ignore = 1;	/* so gameport_find_driver ignores it */</div><div class='add'>+	gameport_remove_pending_events(drv);</div><div class='ctx'> </div><div class='ctx'> start_over:</div><div class='ctx'> 	list_for_each_entry(gameport, &amp;gameport_list, node) {</div><div class='hunk'>@@ -729,6 +774,7 @@ start_over:</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	driver_unregister(&amp;drv-&gt;driver);</div><div class='add'>+</div><div class='ctx'> 	mutex_unlock(&amp;gameport_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/input/joystick/a3d.c b/drivers/input/joystick/a3d.c<br/>index 92498d470b1f..6489f4010c4f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/joystick/a3d.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/input/joystick/a3d.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/joystick/a3d.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/joystick/a3d.c</a></div><div class='hunk'>@@ -414,8 +414,7 @@ static struct gameport_driver a3d_drv = {</div><div class='ctx'> </div><div class='ctx'> static int __init a3d_init(void)</div><div class='ctx'> {</div><div class='del'>-	gameport_register_driver(&amp;a3d_drv);</div><div class='del'>-	return 0;</div><div class='add'>+	return gameport_register_driver(&amp;a3d_drv);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit a3d_exit(void)</div><div class='head'>diff --git a/drivers/input/joystick/adi.c b/drivers/input/joystick/adi.c<br/>index d1ca8a14950f..89c4c084d4ad 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/joystick/adi.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/input/joystick/adi.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/joystick/adi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/joystick/adi.c</a></div><div class='hunk'>@@ -572,8 +572,7 @@ static struct gameport_driver adi_drv = {</div><div class='ctx'> </div><div class='ctx'> static int __init adi_init(void)</div><div class='ctx'> {</div><div class='del'>-	gameport_register_driver(&amp;adi_drv);</div><div class='del'>-	return 0;</div><div class='add'>+	return gameport_register_driver(&amp;adi_drv);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit adi_exit(void)</div><div class='head'>diff --git a/drivers/input/joystick/analog.c b/drivers/input/joystick/analog.c<br/>index 708c5ae13b24..356b3a25efa2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/joystick/analog.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/input/joystick/analog.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/joystick/analog.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/joystick/analog.c</a></div><div class='hunk'>@@ -761,9 +761,7 @@ static struct gameport_driver analog_drv = {</div><div class='ctx'> static int __init analog_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	analog_parse_options();</div><div class='del'>-	gameport_register_driver(&amp;analog_drv);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	return gameport_register_driver(&amp;analog_drv);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit analog_exit(void)</div><div class='head'>diff --git a/drivers/input/joystick/cobra.c b/drivers/input/joystick/cobra.c<br/>index 639b975a8ed7..3497b87c3d05 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/joystick/cobra.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/input/joystick/cobra.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/joystick/cobra.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/joystick/cobra.c</a></div><div class='hunk'>@@ -263,8 +263,7 @@ static struct gameport_driver cobra_drv = {</div><div class='ctx'> </div><div class='ctx'> static int __init cobra_init(void)</div><div class='ctx'> {</div><div class='del'>-	gameport_register_driver(&amp;cobra_drv);</div><div class='del'>-	return 0;</div><div class='add'>+	return gameport_register_driver(&amp;cobra_drv);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit cobra_exit(void)</div><div class='head'>diff --git a/drivers/input/joystick/gf2k.c b/drivers/input/joystick/gf2k.c<br/>index cb6eef1f2d99..67c207f5b1a1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/joystick/gf2k.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/input/joystick/gf2k.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/joystick/gf2k.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/joystick/gf2k.c</a></div><div class='hunk'>@@ -375,8 +375,7 @@ static struct gameport_driver gf2k_drv = {</div><div class='ctx'> </div><div class='ctx'> static int __init gf2k_init(void)</div><div class='ctx'> {</div><div class='del'>-	gameport_register_driver(&amp;gf2k_drv);</div><div class='del'>-	return 0;</div><div class='add'>+	return gameport_register_driver(&amp;gf2k_drv);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit gf2k_exit(void)</div><div class='head'>diff --git a/drivers/input/joystick/grip.c b/drivers/input/joystick/grip.c<br/>index 684e07cfccc8..fc55899ba6c5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/joystick/grip.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/input/joystick/grip.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/joystick/grip.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/joystick/grip.c</a></div><div class='hunk'>@@ -426,8 +426,7 @@ static struct gameport_driver grip_drv = {</div><div class='ctx'> </div><div class='ctx'> static int __init grip_init(void)</div><div class='ctx'> {</div><div class='del'>-	gameport_register_driver(&amp;grip_drv);</div><div class='del'>-	return 0;</div><div class='add'>+	return gameport_register_driver(&amp;grip_drv);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit grip_exit(void)</div><div class='head'>diff --git a/drivers/input/joystick/grip_mp.c b/drivers/input/joystick/grip_mp.c<br/>index 8279481b16e7..2d47baf47769 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/joystick/grip_mp.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/input/joystick/grip_mp.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/joystick/grip_mp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/joystick/grip_mp.c</a></div><div class='hunk'>@@ -689,8 +689,7 @@ static struct gameport_driver grip_drv = {</div><div class='ctx'> </div><div class='ctx'> static int __init grip_init(void)</div><div class='ctx'> {</div><div class='del'>-	gameport_register_driver(&amp;grip_drv);</div><div class='del'>-	return 0;</div><div class='add'>+	return gameport_register_driver(&amp;grip_drv);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit grip_exit(void)</div><div class='head'>diff --git a/drivers/input/joystick/guillemot.c b/drivers/input/joystick/guillemot.c<br/>index 25ec3fad9f27..4058d4b272fe 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/joystick/guillemot.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/input/joystick/guillemot.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/joystick/guillemot.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/joystick/guillemot.c</a></div><div class='hunk'>@@ -283,8 +283,7 @@ static struct gameport_driver guillemot_drv = {</div><div class='ctx'> </div><div class='ctx'> static int __init guillemot_init(void)</div><div class='ctx'> {</div><div class='del'>-	gameport_register_driver(&amp;guillemot_drv);</div><div class='del'>-	return 0;</div><div class='add'>+	return gameport_register_driver(&amp;guillemot_drv);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit guillemot_exit(void)</div><div class='head'>diff --git a/drivers/input/joystick/iforce/iforce-ff.c b/drivers/input/joystick/iforce/iforce-ff.c<br/>index 7839b7b6fa96..0de9a0943a9e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/joystick/iforce/iforce-ff.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/input/joystick/iforce/iforce-ff.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/joystick/iforce/iforce-ff.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/joystick/iforce/iforce-ff.c</a></div><div class='hunk'>@@ -197,13 +197,16 @@ static unsigned char find_button(struct iforce *iforce, signed short button)</div><div class='ctx'>  * Analyse the changes in an effect, and tell if we need to send an condition</div><div class='ctx'>  * parameter packet</div><div class='ctx'>  */</div><div class='del'>-static int need_condition_modifier(struct ff_effect *old, struct ff_effect *new)</div><div class='add'>+static int need_condition_modifier(struct iforce *iforce,</div><div class='add'>+				   struct ff_effect *old,</div><div class='add'>+				   struct ff_effect *new)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (new-&gt;type != FF_SPRING &amp;&amp; new-&gt;type != FF_FRICTION) {</div><div class='del'>-		warn("bad effect type in need_condition_modifier");</div><div class='add'>+		dev_warn(&amp;iforce-&gt;dev-&gt;dev, "bad effect type in %s\n",</div><div class='add'>+			 __func__);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -222,10 +225,13 @@ static int need_condition_modifier(struct ff_effect *old, struct ff_effect *new)</div><div class='ctx'>  * Analyse the changes in an effect, and tell if we need to send a magnitude</div><div class='ctx'>  * parameter packet</div><div class='ctx'>  */</div><div class='del'>-static int need_magnitude_modifier(struct ff_effect *old, struct ff_effect *effect)</div><div class='add'>+static int need_magnitude_modifier(struct iforce *iforce,</div><div class='add'>+				   struct ff_effect *old,</div><div class='add'>+				   struct ff_effect *effect)</div><div class='ctx'> {</div><div class='ctx'> 	if (effect-&gt;type != FF_CONSTANT) {</div><div class='del'>-		warn("bad effect type in need_envelope_modifier");</div><div class='add'>+		dev_warn(&amp;iforce-&gt;dev-&gt;dev, "bad effect type in %s\n",</div><div class='add'>+			 __func__);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -236,7 +242,8 @@ static int need_magnitude_modifier(struct ff_effect *old, struct ff_effect *effe</div><div class='ctx'>  * Analyse the changes in an effect, and tell if we need to send an envelope</div><div class='ctx'>  * parameter packet</div><div class='ctx'>  */</div><div class='del'>-static int need_envelope_modifier(struct ff_effect *old, struct ff_effect *effect)</div><div class='add'>+static int need_envelope_modifier(struct iforce *iforce, struct ff_effect *old,</div><div class='add'>+				  struct ff_effect *effect)</div><div class='ctx'> {</div><div class='ctx'> 	switch (effect-&gt;type) {</div><div class='ctx'> 	case FF_CONSTANT:</div><div class='hunk'>@@ -256,7 +263,8 @@ static int need_envelope_modifier(struct ff_effect *old, struct ff_effect *effec</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='del'>-		warn("bad effect type in need_envelope_modifier");</div><div class='add'>+		dev_warn(&amp;iforce-&gt;dev-&gt;dev, "bad effect type in %s\n",</div><div class='add'>+			 __func__);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -266,10 +274,12 @@ static int need_envelope_modifier(struct ff_effect *old, struct ff_effect *effec</div><div class='ctx'>  * Analyse the changes in an effect, and tell if we need to send a periodic</div><div class='ctx'>  * parameter effect</div><div class='ctx'>  */</div><div class='del'>-static int need_period_modifier(struct ff_effect *old, struct ff_effect *new)</div><div class='add'>+static int need_period_modifier(struct iforce *iforce, struct ff_effect *old,</div><div class='add'>+				struct ff_effect *new)</div><div class='ctx'> {</div><div class='ctx'> 	if (new-&gt;type != FF_PERIODIC) {</div><div class='del'>-		warn("bad effect type in need_period_modifier");</div><div class='add'>+		dev_warn(&amp;iforce-&gt;dev-&gt;dev, "bad effect type in %s\n",</div><div class='add'>+			 __func__);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	return (old-&gt;u.periodic.period != new-&gt;u.periodic.period</div><div class='hunk'>@@ -355,7 +365,7 @@ int iforce_upload_periodic(struct iforce *iforce, struct ff_effect *effect, stru</div><div class='ctx'> 	int param2_err = 1;</div><div class='ctx'> 	int core_err = 0;</div><div class='ctx'> </div><div class='del'>-	if (!old || need_period_modifier(old, effect)) {</div><div class='add'>+	if (!old || need_period_modifier(iforce, old, effect)) {</div><div class='ctx'> 		param1_err = make_period_modifier(iforce, mod1_chunk,</div><div class='ctx'> 			old != NULL,</div><div class='ctx'> 			effect-&gt;u.periodic.magnitude, effect-&gt;u.periodic.offset,</div><div class='hunk'>@@ -365,7 +375,7 @@ int iforce_upload_periodic(struct iforce *iforce, struct ff_effect *effect, stru</div><div class='ctx'> 		set_bit(FF_MOD1_IS_USED, core_effect-&gt;flags);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!old || need_envelope_modifier(old, effect)) {</div><div class='add'>+	if (!old || need_envelope_modifier(iforce, old, effect)) {</div><div class='ctx'> 		param2_err = make_envelope_modifier(iforce, mod2_chunk,</div><div class='ctx'> 			old !=NULL,</div><div class='ctx'> 			effect-&gt;u.periodic.envelope.attack_length,</div><div class='hunk'>@@ -425,7 +435,7 @@ int iforce_upload_constant(struct iforce *iforce, struct ff_effect *effect, stru</div><div class='ctx'> 	int param2_err = 1;</div><div class='ctx'> 	int core_err = 0;</div><div class='ctx'> </div><div class='del'>-	if (!old || need_magnitude_modifier(old, effect)) {</div><div class='add'>+	if (!old || need_magnitude_modifier(iforce, old, effect)) {</div><div class='ctx'> 		param1_err = make_magnitude_modifier(iforce, mod1_chunk,</div><div class='ctx'> 			old != NULL,</div><div class='ctx'> 			effect-&gt;u.constant.level);</div><div class='hunk'>@@ -434,7 +444,7 @@ int iforce_upload_constant(struct iforce *iforce, struct ff_effect *effect, stru</div><div class='ctx'> 		set_bit(FF_MOD1_IS_USED, core_effect-&gt;flags);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!old || need_envelope_modifier(old, effect)) {</div><div class='add'>+	if (!old || need_envelope_modifier(iforce, old, effect)) {</div><div class='ctx'> 		param2_err = make_envelope_modifier(iforce, mod2_chunk,</div><div class='ctx'> 			old != NULL,</div><div class='ctx'> 			effect-&gt;u.constant.envelope.attack_length,</div><div class='hunk'>@@ -487,7 +497,7 @@ int iforce_upload_condition(struct iforce *iforce, struct ff_effect *effect, str</div><div class='ctx'> 		default: return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!old || need_condition_modifier(old, effect)) {</div><div class='add'>+	if (!old || need_condition_modifier(iforce, old, effect)) {</div><div class='ctx'> 		param_err = make_condition_modifier(iforce, mod1_chunk,</div><div class='ctx'> 			old != NULL,</div><div class='ctx'> 			effect-&gt;u.condition[0].right_saturation,</div><div class='head'>diff --git a/drivers/input/joystick/iforce/iforce-main.c b/drivers/input/joystick/iforce/iforce-main.c<br/>index 61ee6e38739d..baabf8302645 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/joystick/iforce/iforce-main.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/input/joystick/iforce/iforce-main.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/joystick/iforce/iforce-main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/joystick/iforce/iforce-main.c</a></div><div class='hunk'>@@ -218,7 +218,9 @@ static void iforce_release(struct input_dev *dev)</div><div class='ctx'> 		/* Check: no effects should be present in memory */</div><div class='ctx'> 		for (i = 0; i &lt; dev-&gt;ff-&gt;max_effects; i++) {</div><div class='ctx'> 			if (test_bit(FF_CORE_IS_USED, iforce-&gt;core_effects[i].flags)) {</div><div class='del'>-				warn("iforce_release: Device still owns effects");</div><div class='add'>+				dev_warn(&amp;dev-&gt;dev,</div><div class='add'>+					"%s: Device still owns effects\n",</div><div class='add'>+					__func__);</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -335,26 +337,26 @@ int iforce_init_device(struct iforce *iforce)</div><div class='ctx'> 	if (!iforce_get_id_packet(iforce, "M"))</div><div class='ctx'> 		input_dev-&gt;id.vendor = (iforce-&gt;edata[2] &lt;&lt; 8) | iforce-&gt;edata[1];</div><div class='ctx'> 	else</div><div class='del'>-		warn("Device does not respond to id packet M");</div><div class='add'>+		dev_warn(&amp;iforce-&gt;dev-&gt;dev, "Device does not respond to id packet M\n");</div><div class='ctx'> </div><div class='ctx'> 	if (!iforce_get_id_packet(iforce, "P"))</div><div class='ctx'> 		input_dev-&gt;id.product = (iforce-&gt;edata[2] &lt;&lt; 8) | iforce-&gt;edata[1];</div><div class='ctx'> 	else</div><div class='del'>-		warn("Device does not respond to id packet P");</div><div class='add'>+		dev_warn(&amp;iforce-&gt;dev-&gt;dev, "Device does not respond to id packet P\n");</div><div class='ctx'> </div><div class='ctx'> 	if (!iforce_get_id_packet(iforce, "B"))</div><div class='ctx'> 		iforce-&gt;device_memory.end = (iforce-&gt;edata[2] &lt;&lt; 8) | iforce-&gt;edata[1];</div><div class='ctx'> 	else</div><div class='del'>-		warn("Device does not respond to id packet B");</div><div class='add'>+		dev_warn(&amp;iforce-&gt;dev-&gt;dev, "Device does not respond to id packet B\n");</div><div class='ctx'> </div><div class='ctx'> 	if (!iforce_get_id_packet(iforce, "N"))</div><div class='ctx'> 		ff_effects = iforce-&gt;edata[1];</div><div class='ctx'> 	else</div><div class='del'>-		warn("Device does not respond to id packet N");</div><div class='add'>+		dev_warn(&amp;iforce-&gt;dev-&gt;dev, "Device does not respond to id packet N\n");</div><div class='ctx'> </div><div class='ctx'> 	/* Check if the device can store more effects than the driver can really handle */</div><div class='ctx'> 	if (ff_effects &gt; IFORCE_EFFECTS_MAX) {</div><div class='del'>-		warn("Limiting number of effects to %d (device reports %d)",</div><div class='add'>+		dev_warn(&amp;iforce-&gt;dev-&gt;dev, "Limiting number of effects to %d (device reports %d)\n",</div><div class='ctx'> 		       IFORCE_EFFECTS_MAX, ff_effects);</div><div class='ctx'> 		ff_effects = IFORCE_EFFECTS_MAX;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/input/joystick/iforce/iforce-packets.c b/drivers/input/joystick/iforce/iforce-packets.c<br/>index 015b50aa76fc..a17b50016009 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/joystick/iforce/iforce-packets.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/input/joystick/iforce/iforce-packets.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/joystick/iforce/iforce-packets.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/joystick/iforce/iforce-packets.c</a></div><div class='hunk'>@@ -65,7 +65,8 @@ int iforce_send_packet(struct iforce *iforce, u16 cmd, unsigned char* data)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 	if (CIRC_SPACE(head, tail, XMIT_SIZE) &lt; n+2) {</div><div class='del'>-		warn("not enough space in xmit buffer to send new packet");</div><div class='add'>+		dev_warn(&amp;iforce-&gt;dev-&gt;dev,</div><div class='add'>+			 "not enough space in xmit buffer to send new packet\n");</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;iforce-&gt;xmit_lock, flags);</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -148,7 +149,7 @@ static int mark_core_as_ready(struct iforce *iforce, unsigned short addr)</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	warn("unused effect %04x updated !!!", addr);</div><div class='add'>+	dev_warn(&amp;iforce-&gt;dev-&gt;dev, "unused effect %04x updated !!!\n", addr);</div><div class='ctx'> 	return -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -159,7 +160,8 @@ void iforce_process_packet(struct iforce *iforce, u16 cmd, unsigned char *data)</div><div class='ctx'> 	static int being_used = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (being_used)</div><div class='del'>-		warn("re-entrant call to iforce_process %d", being_used);</div><div class='add'>+		dev_warn(&amp;iforce-&gt;dev-&gt;dev,</div><div class='add'>+			 "re-entrant call to iforce_process %d\n", being_used);</div><div class='ctx'> 	being_used++;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_JOYSTICK_IFORCE_232</div><div class='head'>diff --git a/drivers/input/joystick/iforce/iforce-usb.c b/drivers/input/joystick/iforce/iforce-usb.c<br/>index 851cc4087c2f..f83185aeb511 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/joystick/iforce/iforce-usb.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/input/joystick/iforce/iforce-usb.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/joystick/iforce/iforce-usb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/joystick/iforce/iforce-usb.c</a></div><div class='hunk'>@@ -64,7 +64,7 @@ void iforce_usb_xmit(struct iforce *iforce)</div><div class='ctx'> </div><div class='ctx'> 	if ( (n=usb_submit_urb(iforce-&gt;out, GFP_ATOMIC)) ) {</div><div class='ctx'> 		clear_bit(IFORCE_XMIT_RUNNING, iforce-&gt;xmit_flags);</div><div class='del'>-		warn("usb_submit_urb failed %d\n", n);</div><div class='add'>+		dev_warn(&amp;iforce-&gt;dev-&gt;dev, "usb_submit_urb failed %d\n", n);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* The IFORCE_XMIT_RUNNING bit is not cleared here. That's intended.</div><div class='head'>diff --git a/drivers/input/joystick/interact.c b/drivers/input/joystick/interact.c<br/>index 8c3290b68205..2478289aeeea 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/joystick/interact.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/input/joystick/interact.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/joystick/interact.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/joystick/interact.c</a></div><div class='hunk'>@@ -317,8 +317,7 @@ static struct gameport_driver interact_drv = {</div><div class='ctx'> </div><div class='ctx'> static int __init interact_init(void)</div><div class='ctx'> {</div><div class='del'>-	gameport_register_driver(&amp;interact_drv);</div><div class='del'>-	return 0;</div><div class='add'>+	return gameport_register_driver(&amp;interact_drv);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit interact_exit(void)</div><div class='head'>diff --git a/drivers/input/joystick/joydump.c b/drivers/input/joystick/joydump.c<br/>index 2a1b82c8b31c..cd894a0564a2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/joystick/joydump.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/input/joystick/joydump.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/joystick/joydump.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/joystick/joydump.c</a></div><div class='hunk'>@@ -161,8 +161,7 @@ static struct gameport_driver joydump_drv = {</div><div class='ctx'> </div><div class='ctx'> static int __init joydump_init(void)</div><div class='ctx'> {</div><div class='del'>-	gameport_register_driver(&amp;joydump_drv);</div><div class='del'>-	return 0;</div><div class='add'>+	return gameport_register_driver(&amp;joydump_drv);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit joydump_exit(void)</div><div class='head'>diff --git a/drivers/input/joystick/sidewinder.c b/drivers/input/joystick/sidewinder.c<br/>index 7b4865fdee54..ca13a6bec33e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/joystick/sidewinder.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/input/joystick/sidewinder.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/joystick/sidewinder.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/joystick/sidewinder.c</a></div><div class='hunk'>@@ -818,8 +818,7 @@ static struct gameport_driver sw_drv = {</div><div class='ctx'> </div><div class='ctx'> static int __init sw_init(void)</div><div class='ctx'> {</div><div class='del'>-	gameport_register_driver(&amp;sw_drv);</div><div class='del'>-	return 0;</div><div class='add'>+	return gameport_register_driver(&amp;sw_drv);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit sw_exit(void)</div><div class='head'>diff --git a/drivers/input/joystick/tmdc.c b/drivers/input/joystick/tmdc.c<br/>index 60c37bcb938d..d6c609807115 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/joystick/tmdc.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/input/joystick/tmdc.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/joystick/tmdc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/joystick/tmdc.c</a></div><div class='hunk'>@@ -438,8 +438,7 @@ static struct gameport_driver tmdc_drv = {</div><div class='ctx'> </div><div class='ctx'> static int __init tmdc_init(void)</div><div class='ctx'> {</div><div class='del'>-	gameport_register_driver(&amp;tmdc_drv);</div><div class='del'>-	return 0;</div><div class='add'>+	return gameport_register_driver(&amp;tmdc_drv);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit tmdc_exit(void)</div><div class='head'>diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c<br/>index 6791be81eb29..b868b8d5fbb3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/joystick/xpad.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/input/joystick/xpad.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/joystick/xpad.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/joystick/xpad.c</a></div><div class='hunk'>@@ -455,10 +455,10 @@ static void xpad_bulk_out(struct urb *urb)</div><div class='ctx'> 	case -ENOENT:</div><div class='ctx'> 	case -ESHUTDOWN:</div><div class='ctx'> 		/* this urb is terminated, clean up */</div><div class='del'>-		dbg("%s - urb shutting down with status: %d", __FUNCTION__, urb-&gt;status);</div><div class='add'>+		dbg("%s - urb shutting down with status: %d", __func__, urb-&gt;status);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		dbg("%s - nonzero urb status received: %d", __FUNCTION__, urb-&gt;status);</div><div class='add'>+		dbg("%s - nonzero urb status received: %d", __func__, urb-&gt;status);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -911,7 +911,7 @@ static int __init usb_xpad_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int result = usb_register(&amp;xpad_driver);</div><div class='ctx'> 	if (result == 0)</div><div class='del'>-		info(DRIVER_DESC);</div><div class='add'>+		printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_DESC "\n");</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c<br/>index b1ce10f50bcf..22016ca15351 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/keyboard/atkbd.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/input/keyboard/atkbd.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/keyboard/atkbd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/keyboard/atkbd.c</a></div><div class='hunk'>@@ -834,10 +834,10 @@ static void atkbd_disconnect(struct serio *serio)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Most special keys (Fn+F?) on Dell Latitudes do not generate release</div><div class='add'>+ * Most special keys (Fn+F?) on Dell laptops do not generate release</div><div class='ctx'>  * events so we have to do it ourselves.</div><div class='ctx'>  */</div><div class='del'>-static void atkbd_latitude_keymap_fixup(struct atkbd *atkbd)</div><div class='add'>+static void atkbd_dell_laptop_keymap_fixup(struct atkbd *atkbd)</div><div class='ctx'> {</div><div class='ctx'> 	const unsigned int forced_release_keys[] = {</div><div class='ctx'> 		0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8f, 0x93,</div><div class='hunk'>@@ -1207,15 +1207,13 @@ static ssize_t atkbd_set_extra(struct atkbd *atkbd, const char *buf, size_t coun</div><div class='ctx'> {</div><div class='ctx'> 	struct input_dev *old_dev, *new_dev;</div><div class='ctx'> 	unsigned long value;</div><div class='del'>-	char *rest;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	unsigned char old_extra, old_set;</div><div class='ctx'> </div><div class='ctx'> 	if (!atkbd-&gt;write)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='del'>-	value = simple_strtoul(buf, &amp;rest, 10);</div><div class='del'>-	if (*rest || value &gt; 1)</div><div class='add'>+	if (strict_strtoul(buf, 10, &amp;value) || value &gt; 1)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (atkbd-&gt;extra != value) {</div><div class='hunk'>@@ -1264,12 +1262,10 @@ static ssize_t atkbd_set_scroll(struct atkbd *atkbd, const char *buf, size_t cou</div><div class='ctx'> {</div><div class='ctx'> 	struct input_dev *old_dev, *new_dev;</div><div class='ctx'> 	unsigned long value;</div><div class='del'>-	char *rest;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	unsigned char old_scroll;</div><div class='ctx'> </div><div class='del'>-	value = simple_strtoul(buf, &amp;rest, 10);</div><div class='del'>-	if (*rest || value &gt; 1)</div><div class='add'>+	if (strict_strtoul(buf, 10, &amp;value) || value &gt; 1)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (atkbd-&gt;scroll != value) {</div><div class='hunk'>@@ -1310,15 +1306,13 @@ static ssize_t atkbd_set_set(struct atkbd *atkbd, const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct input_dev *old_dev, *new_dev;</div><div class='ctx'> 	unsigned long value;</div><div class='del'>-	char *rest;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	unsigned char old_set, old_extra;</div><div class='ctx'> </div><div class='ctx'> 	if (!atkbd-&gt;write)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='del'>-	value = simple_strtoul(buf, &amp;rest, 10);</div><div class='del'>-	if (*rest || (value != 2 &amp;&amp; value != 3))</div><div class='add'>+	if (strict_strtoul(buf, 10, &amp;value) || (value != 2 &amp;&amp; value != 3))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (atkbd-&gt;set != value) {</div><div class='hunk'>@@ -1361,15 +1355,13 @@ static ssize_t atkbd_set_softrepeat(struct atkbd *atkbd, const char *buf, size_t</div><div class='ctx'> {</div><div class='ctx'> 	struct input_dev *old_dev, *new_dev;</div><div class='ctx'> 	unsigned long value;</div><div class='del'>-	char *rest;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	unsigned char old_softrepeat, old_softraw;</div><div class='ctx'> </div><div class='ctx'> 	if (!atkbd-&gt;write)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='del'>-	value = simple_strtoul(buf, &amp;rest, 10);</div><div class='del'>-	if (*rest || value &gt; 1)</div><div class='add'>+	if (strict_strtoul(buf, 10, &amp;value) || value &gt; 1)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (atkbd-&gt;softrepeat != value) {</div><div class='hunk'>@@ -1413,12 +1405,10 @@ static ssize_t atkbd_set_softraw(struct atkbd *atkbd, const char *buf, size_t co</div><div class='ctx'> {</div><div class='ctx'> 	struct input_dev *old_dev, *new_dev;</div><div class='ctx'> 	unsigned long value;</div><div class='del'>-	char *rest;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	unsigned char old_softraw;</div><div class='ctx'> </div><div class='del'>-	value = simple_strtoul(buf, &amp;rest, 10);</div><div class='del'>-	if (*rest || value &gt; 1)</div><div class='add'>+	if (strict_strtoul(buf, 10, &amp;value) || value &gt; 1)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (atkbd-&gt;softraw != value) {</div><div class='hunk'>@@ -1461,13 +1451,13 @@ static int __init atkbd_setup_fixup(const struct dmi_system_id *id)</div><div class='ctx'> </div><div class='ctx'> static struct dmi_system_id atkbd_dmi_quirk_table[] __initdata = {</div><div class='ctx'> 	{</div><div class='del'>-		.ident = "Dell Latitude series",</div><div class='add'>+		.ident = "Dell Laptop",</div><div class='ctx'> 		.matches = {</div><div class='ctx'> 			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),</div><div class='del'>-			DMI_MATCH(DMI_PRODUCT_NAME, "Latitude"),</div><div class='add'>+			DMI_MATCH(DMI_CHASSIS_TYPE, "8"), /* Portable */</div><div class='ctx'> 		},</div><div class='ctx'> 		.callback = atkbd_setup_fixup,</div><div class='del'>-		.driver_data = atkbd_latitude_keymap_fixup,</div><div class='add'>+		.driver_data = atkbd_dell_laptop_keymap_fixup,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.ident = "HP 2133",</div><div class='head'>diff --git a/drivers/input/keyboard/bf54x-keys.c b/drivers/input/keyboard/bf54x-keys.c<br/>index e348cfccc17a..19284016e0f4 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/keyboard/bf54x-keys.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/input/keyboard/bf54x-keys.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/keyboard/bf54x-keys.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/keyboard/bf54x-keys.c</a></div><div class='hunk'>@@ -8,7 +8,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  *</div><div class='ctx'>  * Modified:</div><div class='del'>- *               Copyright 2007 Analog Devices Inc.</div><div class='add'>+ *               Copyright 2007-2008 Analog Devices Inc.</div><div class='ctx'>  *</div><div class='ctx'>  * Bugs:         Enter bugs at http://blackfin.uclinux.org/</div><div class='ctx'>  *</div><div class='hunk'>@@ -81,6 +81,9 @@ struct bf54x_kpad {</div><div class='ctx'> 	unsigned short *keycode;</div><div class='ctx'> 	struct timer_list timer;</div><div class='ctx'> 	unsigned int keyup_test_jiffies;</div><div class='add'>+	unsigned short kpad_msel;</div><div class='add'>+	unsigned short kpad_prescale;</div><div class='add'>+	unsigned short kpad_ctl;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline int bfin_kpad_find_key(struct bf54x_kpad *bf54x_kpad,</div><div class='hunk'>@@ -360,6 +363,10 @@ static int bfin_kpad_suspend(struct platform_device *pdev, pm_message_t state)</div><div class='ctx'> {</div><div class='ctx'> 	struct bf54x_kpad *bf54x_kpad = platform_get_drvdata(pdev);</div><div class='ctx'> </div><div class='add'>+	bf54x_kpad-&gt;kpad_msel = bfin_read_KPAD_MSEL();</div><div class='add'>+	bf54x_kpad-&gt;kpad_prescale = bfin_read_KPAD_PRESCALE();</div><div class='add'>+	bf54x_kpad-&gt;kpad_ctl = bfin_read_KPAD_CTL();</div><div class='add'>+</div><div class='ctx'> 	if (device_may_wakeup(&amp;pdev-&gt;dev))</div><div class='ctx'> 		enable_irq_wake(bf54x_kpad-&gt;irq);</div><div class='ctx'> </div><div class='hunk'>@@ -370,6 +377,10 @@ static int bfin_kpad_resume(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct bf54x_kpad *bf54x_kpad = platform_get_drvdata(pdev);</div><div class='ctx'> </div><div class='add'>+	bfin_write_KPAD_MSEL(bf54x_kpad-&gt;kpad_msel);</div><div class='add'>+	bfin_write_KPAD_PRESCALE(bf54x_kpad-&gt;kpad_prescale);</div><div class='add'>+	bfin_write_KPAD_CTL(bf54x_kpad-&gt;kpad_ctl);</div><div class='add'>+</div><div class='ctx'> 	if (device_may_wakeup(&amp;pdev-&gt;dev))</div><div class='ctx'> 		disable_irq_wake(bf54x_kpad-&gt;irq);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/input/keyboard/corgikbd.c b/drivers/input/keyboard/corgikbd.c<br/>index 134e67bf6a90..c8ed065ea0cb 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/keyboard/corgikbd.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/input/keyboard/corgikbd.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/keyboard/corgikbd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/keyboard/corgikbd.c</a></div><div class='hunk'>@@ -80,9 +80,9 @@ struct corgikbd {</div><div class='ctx'> #define KB_ACTIVATE_DELAY	10</div><div class='ctx'> </div><div class='ctx'> /* Helper functions for reading the keyboard matrix</div><div class='del'>- * Note: We should really be using pxa_gpio_mode to alter GPDR but it</div><div class='del'>- *       requires a function call per GPIO bit which is excessive</div><div class='del'>- *       when we need to access 12 bits at once multiple times.</div><div class='add'>+ * Note: We should really be using the generic gpio functions to alter</div><div class='add'>+ *       GPDR but it requires a function call per GPIO bit which is</div><div class='add'>+ *       excessive when we need to access 12 bits at once, multiple times.</div><div class='ctx'>  * These functions must be called within local_irq_save()/local_irq_restore()</div><div class='ctx'>  * or similar.</div><div class='ctx'>  */</div><div class='head'>diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c<br/>index ec96b369dd7a..05f3f43582c2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/keyboard/gpio_keys.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/input/keyboard/gpio_keys.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/keyboard/gpio_keys.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/keyboard/gpio_keys.c</a></div><div class='hunk'>@@ -36,9 +36,10 @@ struct gpio_keys_drvdata {</div><div class='ctx'> 	struct gpio_button_data data[0];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void gpio_keys_report_event(struct gpio_keys_button *button,</div><div class='del'>-				   struct input_dev *input)</div><div class='add'>+static void gpio_keys_report_event(struct gpio_button_data *bdata)</div><div class='ctx'> {</div><div class='add'>+	struct gpio_keys_button *button = bdata-&gt;button;</div><div class='add'>+	struct input_dev *input = bdata-&gt;input;</div><div class='ctx'> 	unsigned int type = button-&gt;type ?: EV_KEY;</div><div class='ctx'> 	int state = (gpio_get_value(button-&gt;gpio) ? 1 : 0) ^ button-&gt;active_low;</div><div class='ctx'> </div><div class='hunk'>@@ -50,34 +51,23 @@ static void gpio_check_button(unsigned long _data)</div><div class='ctx'> {</div><div class='ctx'> 	struct gpio_button_data *data = (struct gpio_button_data *)_data;</div><div class='ctx'> </div><div class='del'>-	gpio_keys_report_event(data-&gt;button, data-&gt;input);</div><div class='add'>+	gpio_keys_report_event(data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static irqreturn_t gpio_keys_isr(int irq, void *dev_id)</div><div class='ctx'> {</div><div class='del'>-	struct platform_device *pdev = dev_id;</div><div class='del'>-	struct gpio_keys_platform_data *pdata = pdev-&gt;dev.platform_data;</div><div class='del'>-	struct gpio_keys_drvdata *ddata = platform_get_drvdata(pdev);</div><div class='del'>-	int i;</div><div class='add'>+	struct gpio_button_data *bdata = dev_id;</div><div class='add'>+	struct gpio_keys_button *button = bdata-&gt;button;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; pdata-&gt;nbuttons; i++) {</div><div class='del'>-		struct gpio_keys_button *button = &amp;pdata-&gt;buttons[i];</div><div class='add'>+	BUG_ON(irq != gpio_to_irq(button-&gt;gpio));</div><div class='ctx'> </div><div class='del'>-		if (irq == gpio_to_irq(button-&gt;gpio)) {</div><div class='del'>-			struct gpio_button_data *bdata = &amp;ddata-&gt;data[i];</div><div class='del'>-</div><div class='del'>-			if (button-&gt;debounce_interval)</div><div class='del'>-				mod_timer(&amp;bdata-&gt;timer,</div><div class='del'>-					  jiffies +</div><div class='del'>-					  msecs_to_jiffies(button-&gt;debounce_interval));</div><div class='del'>-			else</div><div class='del'>-				gpio_keys_report_event(button, bdata-&gt;input);</div><div class='del'>-</div><div class='del'>-			return IRQ_HANDLED;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	if (button-&gt;debounce_interval)</div><div class='add'>+		mod_timer(&amp;bdata-&gt;timer,</div><div class='add'>+			jiffies + msecs_to_jiffies(button-&gt;debounce_interval));</div><div class='add'>+	else</div><div class='add'>+		gpio_keys_report_event(bdata);</div><div class='ctx'> </div><div class='del'>-	return IRQ_NONE;</div><div class='add'>+	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __devinit gpio_keys_probe(struct platform_device *pdev)</div><div class='hunk'>@@ -151,7 +141,7 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev)</div><div class='ctx'> 				    IRQF_SAMPLE_RANDOM | IRQF_TRIGGER_RISING |</div><div class='ctx'> 					IRQF_TRIGGER_FALLING,</div><div class='ctx'> 				    button-&gt;desc ? button-&gt;desc : "gpio_keys",</div><div class='del'>-				    pdev);</div><div class='add'>+				    bdata);</div><div class='ctx'> 		if (error) {</div><div class='ctx'> 			pr_err("gpio-keys: Unable to claim irq %d; error %d\n",</div><div class='ctx'> 				irq, error);</div><div class='hunk'>@@ -178,7 +168,7 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'>  fail2:</div><div class='ctx'> 	while (--i &gt;= 0) {</div><div class='del'>-		free_irq(gpio_to_irq(pdata-&gt;buttons[i].gpio), pdev);</div><div class='add'>+		free_irq(gpio_to_irq(pdata-&gt;buttons[i].gpio), &amp;ddata-&gt;data[i]);</div><div class='ctx'> 		if (pdata-&gt;buttons[i].debounce_interval)</div><div class='ctx'> 			del_timer_sync(&amp;ddata-&gt;data[i].timer);</div><div class='ctx'> 		gpio_free(pdata-&gt;buttons[i].gpio);</div><div class='hunk'>@@ -203,7 +193,7 @@ static int __devexit gpio_keys_remove(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; pdata-&gt;nbuttons; i++) {</div><div class='ctx'> 		int irq = gpio_to_irq(pdata-&gt;buttons[i].gpio);</div><div class='del'>-		free_irq(irq, pdev);</div><div class='add'>+		free_irq(irq, &amp;ddata-&gt;data[i]);</div><div class='ctx'> 		if (pdata-&gt;buttons[i].debounce_interval)</div><div class='ctx'> 			del_timer_sync(&amp;ddata-&gt;data[i].timer);</div><div class='ctx'> 		gpio_free(pdata-&gt;buttons[i].gpio);</div><div class='head'>diff --git a/drivers/input/keyboard/omap-keypad.c b/drivers/input/keyboard/omap-keypad.c<br/>index dcea87a0bc56..69e674ecf19a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/keyboard/omap-keypad.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/input/keyboard/omap-keypad.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/keyboard/omap-keypad.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/keyboard/omap-keypad.c</a></div><div class='hunk'>@@ -62,7 +62,7 @@ struct omap_kp {</div><div class='ctx'> 	unsigned int debounce;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-DECLARE_TASKLET_DISABLED(kp_tasklet, omap_kp_tasklet, 0);</div><div class='add'>+static DECLARE_TASKLET_DISABLED(kp_tasklet, omap_kp_tasklet, 0);</div><div class='ctx'> </div><div class='ctx'> static int *keymap;</div><div class='ctx'> static unsigned int *row_gpios;</div><div class='hunk'>@@ -72,12 +72,9 @@ static unsigned int *col_gpios;</div><div class='ctx'> static void set_col_gpio_val(struct omap_kp *omap_kp, u8 value)</div><div class='ctx'> {</div><div class='ctx'> 	int col;</div><div class='del'>-	for (col = 0; col &lt; omap_kp-&gt;cols; col++) {</div><div class='del'>-		if (value &amp; (1 &lt;&lt; col))</div><div class='del'>-			omap_set_gpio_dataout(col_gpios[col], 1);</div><div class='del'>-		else</div><div class='del'>-			omap_set_gpio_dataout(col_gpios[col], 0);</div><div class='del'>-	}</div><div class='add'>+</div><div class='add'>+	for (col = 0; col &lt; omap_kp-&gt;cols; col++)</div><div class='add'>+		gpio_set_value(col_gpios[col], value &amp; (1 &lt;&lt; col));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u8 get_row_gpio_val(struct omap_kp *omap_kp)</div><div class='hunk'>@@ -86,7 +83,7 @@ static u8 get_row_gpio_val(struct omap_kp *omap_kp)</div><div class='ctx'> 	u8 value = 0;</div><div class='ctx'> </div><div class='ctx'> 	for (row = 0; row &lt; omap_kp-&gt;rows; row++) {</div><div class='del'>-		if (omap_get_gpio_datain(row_gpios[row]))</div><div class='add'>+		if (gpio_get_value(row_gpios[row]))</div><div class='ctx'> 			value |= (1 &lt;&lt; row);</div><div class='ctx'> 	}</div><div class='ctx'> 	return value;</div><div class='hunk'>@@ -333,23 +330,23 @@ static int __init omap_kp_probe(struct platform_device *pdev)</div><div class='ctx'> 	if (cpu_is_omap24xx()) {</div><div class='ctx'> 		/* Cols: outputs */</div><div class='ctx'> 		for (col_idx = 0; col_idx &lt; omap_kp-&gt;cols; col_idx++) {</div><div class='del'>-			if (omap_request_gpio(col_gpios[col_idx]) &lt; 0) {</div><div class='add'>+			if (gpio_request(col_gpios[col_idx], "omap_kp_col") &lt; 0) {</div><div class='ctx'> 				printk(KERN_ERR "Failed to request"</div><div class='ctx'> 				       "GPIO%d for keypad\n",</div><div class='ctx'> 				       col_gpios[col_idx]);</div><div class='ctx'> 				goto err1;</div><div class='ctx'> 			}</div><div class='del'>-			omap_set_gpio_direction(col_gpios[col_idx], 0);</div><div class='add'>+			gpio_direction_output(col_gpios[col_idx], 0);</div><div class='ctx'> 		}</div><div class='ctx'> 		/* Rows: inputs */</div><div class='ctx'> 		for (row_idx = 0; row_idx &lt; omap_kp-&gt;rows; row_idx++) {</div><div class='del'>-			if (omap_request_gpio(row_gpios[row_idx]) &lt; 0) {</div><div class='add'>+			if (gpio_request(row_gpios[row_idx], "omap_kp_row") &lt; 0) {</div><div class='ctx'> 				printk(KERN_ERR "Failed to request"</div><div class='ctx'> 				       "GPIO%d for keypad\n",</div><div class='ctx'> 				       row_gpios[row_idx]);</div><div class='ctx'> 				goto err2;</div><div class='ctx'> 			}</div><div class='del'>-			omap_set_gpio_direction(row_gpios[row_idx], 1);</div><div class='add'>+			gpio_direction_input(row_gpios[row_idx]);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		col_idx = 0;</div><div class='hunk'>@@ -418,10 +415,10 @@ err3:</div><div class='ctx'> 	device_remove_file(&amp;pdev-&gt;dev, &amp;dev_attr_enable);</div><div class='ctx'> err2:</div><div class='ctx'> 	for (i = row_idx - 1; i &gt;=0; i--)</div><div class='del'>-		omap_free_gpio(row_gpios[i]);</div><div class='add'>+		gpio_free(row_gpios[i]);</div><div class='ctx'> err1:</div><div class='ctx'> 	for (i = col_idx - 1; i &gt;=0; i--)</div><div class='del'>-		omap_free_gpio(col_gpios[i]);</div><div class='add'>+		gpio_free(col_gpios[i]);</div><div class='ctx'> </div><div class='ctx'> 	kfree(omap_kp);</div><div class='ctx'> 	input_free_device(input_dev);</div><div class='hunk'>@@ -438,9 +435,9 @@ static int omap_kp_remove(struct platform_device *pdev)</div><div class='ctx'> 	if (cpu_is_omap24xx()) {</div><div class='ctx'> 		int i;</div><div class='ctx'> 		for (i = 0; i &lt; omap_kp-&gt;cols; i++)</div><div class='del'>-			omap_free_gpio(col_gpios[i]);</div><div class='add'>+			gpio_free(col_gpios[i]);</div><div class='ctx'> 		for (i = 0; i &lt; omap_kp-&gt;rows; i++) {</div><div class='del'>-			omap_free_gpio(row_gpios[i]);</div><div class='add'>+			gpio_free(row_gpios[i]);</div><div class='ctx'> 			free_irq(OMAP_GPIO_IRQ(row_gpios[i]), 0);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='head'>diff --git a/drivers/input/keyboard/spitzkbd.c b/drivers/input/keyboard/spitzkbd.c<br/>index de67b8e0a799..c48b76a46a58 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/keyboard/spitzkbd.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/input/keyboard/spitzkbd.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/keyboard/spitzkbd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/keyboard/spitzkbd.c</a></div><div class='hunk'>@@ -101,9 +101,9 @@ struct spitzkbd {</div><div class='ctx'> #define KB_ACTIVATE_DELAY	10</div><div class='ctx'> </div><div class='ctx'> /* Helper functions for reading the keyboard matrix</div><div class='del'>- * Note: We should really be using pxa_gpio_mode to alter GPDR but it</div><div class='del'>- *       requires a function call per GPIO bit which is excessive</div><div class='del'>- *       when we need to access 11 bits at once, multiple times.</div><div class='add'>+ * Note: We should really be using the generic gpio functions to alter</div><div class='add'>+ *       GPDR but it requires a function call per GPIO bit which is</div><div class='add'>+ *       excessive when we need to access 11 bits at once, multiple times.</div><div class='ctx'>  * These functions must be called within local_irq_save()/local_irq_restore()</div><div class='ctx'>  * or similar.</div><div class='ctx'>  */</div><div class='head'>diff --git a/drivers/input/keyboard/tosakbd.c b/drivers/input/keyboard/tosakbd.c<br/>index 44cb50af3ce9..677276b12020 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/keyboard/tosakbd.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/input/keyboard/tosakbd.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/keyboard/tosakbd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/keyboard/tosakbd.c</a></div><div class='hunk'>@@ -59,9 +59,9 @@ struct tosakbd {</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* Helper functions for reading the keyboard matrix</div><div class='del'>- * Note: We should really be using pxa_gpio_mode to alter GPDR but it</div><div class='del'>- *       requires a function call per GPIO bit which is excessive</div><div class='del'>- *       when we need to access 12 bits at once, multiple times.</div><div class='add'>+ * Note: We should really be using the generic gpio functions to alter</div><div class='add'>+ *       GPDR but it requires a function call per GPIO bit which is</div><div class='add'>+ *       excessive when we need to access 12 bits at once, multiple times.</div><div class='ctx'>  * These functions must be called within local_irq_save()/local_irq_restore()</div><div class='ctx'>  * or similar.</div><div class='ctx'>  */</div><div class='head'>diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig<br/>index e99b7882f382..199055db5082 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/misc/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/input/misc/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/misc/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/misc/Kconfig</a></div><div class='hunk'>@@ -180,6 +180,19 @@ config INPUT_YEALINK</div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module will be</div><div class='ctx'> 	  called yealink.</div><div class='ctx'> </div><div class='add'>+config INPUT_CM109</div><div class='add'>+	tristate "C-Media CM109 USB I/O Controller"</div><div class='add'>+	depends on EXPERIMENTAL</div><div class='add'>+	depends on USB_ARCH_HAS_HCD</div><div class='add'>+	select USB</div><div class='add'>+	help</div><div class='add'>+	  Say Y here if you want to enable keyboard and buzzer functions of the</div><div class='add'>+	  C-Media CM109 usb phones. The audio part is enabled by the generic</div><div class='add'>+	  usb sound driver, so you might want to enable that as well.</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here: the module will be</div><div class='add'>+	  called cm109.</div><div class='add'>+</div><div class='ctx'> config INPUT_UINPUT</div><div class='ctx'> 	tristate "User level driver support"</div><div class='ctx'> 	help</div><div class='head'>diff --git a/drivers/input/misc/Makefile b/drivers/input/misc/Makefile<br/>index f48009b52226..d7db2aeb8a98 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/misc/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/input/misc/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/misc/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/misc/Makefile</a></div><div class='hunk'>@@ -16,6 +16,7 @@ obj-$(CONFIG_INPUT_ATI_REMOTE2)		+= ati_remote2.o</div><div class='ctx'> obj-$(CONFIG_INPUT_KEYSPAN_REMOTE)	+= keyspan_remote.o</div><div class='ctx'> obj-$(CONFIG_INPUT_POWERMATE)		+= powermate.o</div><div class='ctx'> obj-$(CONFIG_INPUT_YEALINK)		+= yealink.o</div><div class='add'>+obj-$(CONFIG_INPUT_CM109)		+= cm109.o</div><div class='ctx'> obj-$(CONFIG_HP_SDC_RTC)		+= hp_sdc_rtc.o</div><div class='ctx'> obj-$(CONFIG_INPUT_UINPUT)		+= uinput.o</div><div class='ctx'> obj-$(CONFIG_INPUT_APANEL)		+= apanel.o</div><div class='head'>diff --git a/drivers/input/misc/ati_remote.c b/drivers/input/misc/ati_remote.c<br/>index debfc1af9d95..e290fde35e74 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/misc/ati_remote.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/input/misc/ati_remote.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/misc/ati_remote.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/misc/ati_remote.c</a></div><div class='hunk'>@@ -285,7 +285,6 @@ static const struct {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Local function prototypes */</div><div class='del'>-static void ati_remote_dump		(unsigned char *data, unsigned int actual_length);</div><div class='ctx'> static int ati_remote_open		(struct input_dev *inputdev);</div><div class='ctx'> static void ati_remote_close		(struct input_dev *inputdev);</div><div class='ctx'> static int ati_remote_sendpacket	(struct ati_remote *ati_remote, u16 cmd, unsigned char *data);</div><div class='hunk'>@@ -307,15 +306,16 @@ static struct usb_driver ati_remote_driver = {</div><div class='ctx'> /*</div><div class='ctx'>  *	ati_remote_dump_input</div><div class='ctx'>  */</div><div class='del'>-static void ati_remote_dump(unsigned char *data, unsigned int len)</div><div class='add'>+static void ati_remote_dump(struct device *dev, unsigned char *data,</div><div class='add'>+			    unsigned int len)</div><div class='ctx'> {</div><div class='ctx'> 	if ((len == 1) &amp;&amp; (data[0] != (unsigned char)0xff) &amp;&amp; (data[0] != 0x00))</div><div class='del'>-		warn("Weird byte 0x%02x", data[0]);</div><div class='add'>+		dev_warn(dev, "Weird byte 0x%02x\n", data[0]);</div><div class='ctx'> 	else if (len == 4)</div><div class='del'>-		warn("Weird key %02x %02x %02x %02x",</div><div class='add'>+		dev_warn(dev, "Weird key %02x %02x %02x %02x\n",</div><div class='ctx'> 		     data[0], data[1], data[2], data[3]);</div><div class='ctx'> 	else</div><div class='del'>-		warn("Weird data, len=%d %02x %02x %02x %02x %02x %02x ...",</div><div class='add'>+		dev_warn(dev, "Weird data, len=%d %02x %02x %02x %02x %02x %02x ...\n",</div><div class='ctx'> 		     len, data[0], data[1], data[2], data[3], data[4], data[5]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -470,7 +470,7 @@ static void ati_remote_input_report(struct urb *urb)</div><div class='ctx'> 	/* Deal with strange looking inputs */</div><div class='ctx'> 	if ( (urb-&gt;actual_length != 4) || (data[0] != 0x14) ||</div><div class='ctx'> 		((data[3] &amp; 0x0f) != 0x00) ) {</div><div class='del'>-		ati_remote_dump(data, urb-&gt;actual_length);</div><div class='add'>+		ati_remote_dump(&amp;urb-&gt;dev-&gt;dev, data, urb-&gt;actual_length);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -814,7 +814,7 @@ static void ati_remote_disconnect(struct usb_interface *interface)</div><div class='ctx'> 	ati_remote = usb_get_intfdata(interface);</div><div class='ctx'> 	usb_set_intfdata(interface, NULL);</div><div class='ctx'> 	if (!ati_remote) {</div><div class='del'>-		warn("%s - null device?\n", __func__);</div><div class='add'>+		dev_warn(&amp;interface-&gt;dev, "%s - null device?\n", __func__);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -834,9 +834,11 @@ static int __init ati_remote_init(void)</div><div class='ctx'> </div><div class='ctx'> 	result = usb_register(&amp;ati_remote_driver);</div><div class='ctx'> 	if (result)</div><div class='del'>-		err("usb_register error #%d\n", result);</div><div class='add'>+		printk(KERN_ERR KBUILD_MODNAME</div><div class='add'>+		       ": usb_register error #%d\n", result);</div><div class='ctx'> 	else</div><div class='del'>-		info("Registered USB driver " DRIVER_DESC " v. " DRIVER_VERSION);</div><div class='add'>+		printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"</div><div class='add'>+		       DRIVER_DESC "\n");</div><div class='ctx'> </div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/input/misc/ati_remote2.c b/drivers/input/misc/ati_remote2.c<br/>index a7fabafbd94c..3c9988dc0e9f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/misc/ati_remote2.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/input/misc/ati_remote2.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/misc/ati_remote2.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/misc/ati_remote2.c</a></div><div class='hunk'>@@ -1,8 +1,8 @@</div><div class='ctx'> /*</div><div class='ctx'>  * ati_remote2 - ATI/Philips USB RF remote driver</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2005 Ville Syrjala &lt;syrjala@sci.fi&gt;</div><div class='del'>- * Copyright (C) 2007 Peter Stokes &lt;linux@dadeos.freeserve.co.uk&gt;</div><div class='add'>+ * Copyright (C) 2005-2008 Ville Syrjala &lt;syrjala@sci.fi&gt;</div><div class='add'>+ * Copyright (C) 2007-2008 Peter Stokes &lt;linux@dadeos.co.uk&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of the GNU General Public License version 2</div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> #include &lt;linux/usb/input.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define DRIVER_DESC    "ATI/Philips USB RF remote driver"</div><div class='del'>-#define DRIVER_VERSION "0.2"</div><div class='add'>+#define DRIVER_VERSION "0.3"</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION(DRIVER_DESC);</div><div class='ctx'> MODULE_VERSION(DRIVER_VERSION);</div><div class='hunk'>@@ -27,7 +27,7 @@ MODULE_LICENSE("GPL");</div><div class='ctx'>  * A remote's "channel" may be altered by pressing and holding the "PC" button for</div><div class='ctx'>  * approximately 3 seconds, after which the button will slowly flash the count of the</div><div class='ctx'>  * currently configured "channel", using the numeric keypad enter a number between 1 and</div><div class='del'>- * 16 and then the "PC" button again, the button will slowly flash the count of the</div><div class='add'>+ * 16 and then press the "PC" button again, the button will slowly flash the count of the</div><div class='ctx'>  * newly configured "channel".</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -45,9 +45,25 @@ static struct usb_device_id ati_remote2_id_table[] = {</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(usb, ati_remote2_id_table);</div><div class='ctx'> </div><div class='del'>-static struct {</div><div class='del'>-	int hw_code;</div><div class='del'>-	int key_code;</div><div class='add'>+static DEFINE_MUTEX(ati_remote2_mutex);</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	ATI_REMOTE2_OPENED = 0x1,</div><div class='add'>+	ATI_REMOTE2_SUSPENDED = 0x2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	ATI_REMOTE2_AUX1,</div><div class='add'>+	ATI_REMOTE2_AUX2,</div><div class='add'>+	ATI_REMOTE2_AUX3,</div><div class='add'>+	ATI_REMOTE2_AUX4,</div><div class='add'>+	ATI_REMOTE2_PC,</div><div class='add'>+	ATI_REMOTE2_MODES,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct {</div><div class='add'>+	u8  hw_code;</div><div class='add'>+	u16 keycode;</div><div class='ctx'> } ati_remote2_key_table[] = {</div><div class='ctx'> 	{ 0x00, KEY_0 },</div><div class='ctx'> 	{ 0x01, KEY_1 },</div><div class='hunk'>@@ -73,6 +89,7 @@ static struct {</div><div class='ctx'> 	{ 0x37, KEY_RECORD },</div><div class='ctx'> 	{ 0x38, KEY_DVD },</div><div class='ctx'> 	{ 0x39, KEY_TV },</div><div class='add'>+	{ 0x3f, KEY_PROG1 }, /* AUX1-AUX4 and PC */</div><div class='ctx'> 	{ 0x54, KEY_MENU },</div><div class='ctx'> 	{ 0x58, KEY_UP },</div><div class='ctx'> 	{ 0x59, KEY_DOWN },</div><div class='hunk'>@@ -91,15 +108,9 @@ static struct {</div><div class='ctx'> 	{ 0xa9, BTN_LEFT },</div><div class='ctx'> 	{ 0xaa, BTN_RIGHT },</div><div class='ctx'> 	{ 0xbe, KEY_QUESTION },</div><div class='del'>-	{ 0xd5, KEY_FRONT },</div><div class='ctx'> 	{ 0xd0, KEY_EDIT },</div><div class='add'>+	{ 0xd5, KEY_FRONT },</div><div class='ctx'> 	{ 0xf9, KEY_INFO },</div><div class='del'>-	{ (0x00 &lt;&lt; 8) | 0x3f, KEY_PROG1 },</div><div class='del'>-	{ (0x01 &lt;&lt; 8) | 0x3f, KEY_PROG2 },</div><div class='del'>-	{ (0x02 &lt;&lt; 8) | 0x3f, KEY_PROG3 },</div><div class='del'>-	{ (0x03 &lt;&lt; 8) | 0x3f, KEY_PROG4 },</div><div class='del'>-	{ (0x04 &lt;&lt; 8) | 0x3f, KEY_PC },</div><div class='del'>-	{ 0, KEY_RESERVED }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ati_remote2 {</div><div class='hunk'>@@ -117,46 +128,106 @@ struct ati_remote2 {</div><div class='ctx'> </div><div class='ctx'> 	char name[64];</div><div class='ctx'> 	char phys[64];</div><div class='add'>+</div><div class='add'>+	/* Each mode (AUX1-AUX4 and PC) can have an independent keymap. */</div><div class='add'>+	u16 keycode[ATI_REMOTE2_MODES][ARRAY_SIZE(ati_remote2_key_table)];</div><div class='add'>+</div><div class='add'>+	unsigned int flags;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int ati_remote2_probe(struct usb_interface *interface, const struct usb_device_id *id);</div><div class='ctx'> static void ati_remote2_disconnect(struct usb_interface *interface);</div><div class='add'>+static int ati_remote2_suspend(struct usb_interface *interface, pm_message_t message);</div><div class='add'>+static int ati_remote2_resume(struct usb_interface *interface);</div><div class='ctx'> </div><div class='ctx'> static struct usb_driver ati_remote2_driver = {</div><div class='ctx'> 	.name       = "ati_remote2",</div><div class='ctx'> 	.probe      = ati_remote2_probe,</div><div class='ctx'> 	.disconnect = ati_remote2_disconnect,</div><div class='ctx'> 	.id_table   = ati_remote2_id_table,</div><div class='add'>+	.suspend    = ati_remote2_suspend,</div><div class='add'>+	.resume     = ati_remote2_resume,</div><div class='add'>+	.supports_autosuspend = 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int ati_remote2_open(struct input_dev *idev)</div><div class='add'>+static int ati_remote2_submit_urbs(struct ati_remote2 *ar2)</div><div class='ctx'> {</div><div class='del'>-	struct ati_remote2 *ar2 = input_get_drvdata(idev);</div><div class='ctx'> 	int r;</div><div class='ctx'> </div><div class='ctx'> 	r = usb_submit_urb(ar2-&gt;urb[0], GFP_KERNEL);</div><div class='ctx'> 	if (r) {</div><div class='ctx'> 		dev_err(&amp;ar2-&gt;intf[0]-&gt;dev,</div><div class='del'>-			"%s: usb_submit_urb() = %d\n", __func__, r);</div><div class='add'>+			"%s(): usb_submit_urb() = %d\n", __func__, r);</div><div class='ctx'> 		return r;</div><div class='ctx'> 	}</div><div class='ctx'> 	r = usb_submit_urb(ar2-&gt;urb[1], GFP_KERNEL);</div><div class='ctx'> 	if (r) {</div><div class='ctx'> 		usb_kill_urb(ar2-&gt;urb[0]);</div><div class='ctx'> 		dev_err(&amp;ar2-&gt;intf[1]-&gt;dev,</div><div class='del'>-			"%s: usb_submit_urb() = %d\n", __func__, r);</div><div class='add'>+			"%s(): usb_submit_urb() = %d\n", __func__, r);</div><div class='ctx'> 		return r;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void ati_remote2_kill_urbs(struct ati_remote2 *ar2)</div><div class='add'>+{</div><div class='add'>+	usb_kill_urb(ar2-&gt;urb[1]);</div><div class='add'>+	usb_kill_urb(ar2-&gt;urb[0]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ati_remote2_open(struct input_dev *idev)</div><div class='add'>+{</div><div class='add'>+	struct ati_remote2 *ar2 = input_get_drvdata(idev);</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	dev_dbg(&amp;ar2-&gt;intf[0]-&gt;dev, "%s()\n", __func__);</div><div class='add'>+</div><div class='add'>+	r = usb_autopm_get_interface(ar2-&gt;intf[0]);</div><div class='add'>+	if (r) {</div><div class='add'>+		dev_err(&amp;ar2-&gt;intf[0]-&gt;dev,</div><div class='add'>+			"%s(): usb_autopm_get_interface() = %d\n", __func__, r);</div><div class='add'>+		goto fail1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ati_remote2_mutex);</div><div class='add'>+</div><div class='add'>+	if (!(ar2-&gt;flags &amp; ATI_REMOTE2_SUSPENDED)) {</div><div class='add'>+		r = ati_remote2_submit_urbs(ar2);</div><div class='add'>+		if (r)</div><div class='add'>+			goto fail2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ar2-&gt;flags |= ATI_REMOTE2_OPENED;</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;ati_remote2_mutex);</div><div class='add'>+</div><div class='add'>+	usb_autopm_put_interface(ar2-&gt;intf[0]);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+ fail2:</div><div class='add'>+	mutex_unlock(&amp;ati_remote2_mutex);</div><div class='add'>+	usb_autopm_put_interface(ar2-&gt;intf[0]);</div><div class='add'>+ fail1:</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void ati_remote2_close(struct input_dev *idev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ati_remote2 *ar2 = input_get_drvdata(idev);</div><div class='ctx'> </div><div class='del'>-	usb_kill_urb(ar2-&gt;urb[0]);</div><div class='del'>-	usb_kill_urb(ar2-&gt;urb[1]);</div><div class='add'>+	dev_dbg(&amp;ar2-&gt;intf[0]-&gt;dev, "%s()\n", __func__);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ati_remote2_mutex);</div><div class='add'>+</div><div class='add'>+	if (!(ar2-&gt;flags &amp; ATI_REMOTE2_SUSPENDED))</div><div class='add'>+		ati_remote2_kill_urbs(ar2);</div><div class='add'>+</div><div class='add'>+	ar2-&gt;flags &amp;= ~ATI_REMOTE2_OPENED;</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;ati_remote2_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ati_remote2_input_mouse(struct ati_remote2 *ar2)</div><div class='hunk'>@@ -172,7 +243,7 @@ static void ati_remote2_input_mouse(struct ati_remote2 *ar2)</div><div class='ctx'> </div><div class='ctx'> 	mode = data[0] &amp; 0x0F;</div><div class='ctx'> </div><div class='del'>-	if (mode &gt; 4) {</div><div class='add'>+	if (mode &gt; ATI_REMOTE2_PC) {</div><div class='ctx'> 		dev_err(&amp;ar2-&gt;intf[0]-&gt;dev,</div><div class='ctx'> 			"Unknown mode byte (%02x %02x %02x %02x)\n",</div><div class='ctx'> 			data[3], data[2], data[1], data[0]);</div><div class='hunk'>@@ -191,7 +262,7 @@ static int ati_remote2_lookup(unsigned int hw_code)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; ati_remote2_key_table[i].key_code != KEY_RESERVED; i++)</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(ati_remote2_key_table); i++)</div><div class='ctx'> 		if (ati_remote2_key_table[i].hw_code == hw_code)</div><div class='ctx'> 			return i;</div><div class='ctx'> </div><div class='hunk'>@@ -211,7 +282,7 @@ static void ati_remote2_input_key(struct ati_remote2 *ar2)</div><div class='ctx'> </div><div class='ctx'> 	mode = data[0] &amp; 0x0F;</div><div class='ctx'> </div><div class='del'>-	if (mode &gt; 4) {</div><div class='add'>+	if (mode &gt; ATI_REMOTE2_PC) {</div><div class='ctx'> 		dev_err(&amp;ar2-&gt;intf[1]-&gt;dev,</div><div class='ctx'> 			"Unknown mode byte (%02x %02x %02x %02x)\n",</div><div class='ctx'> 			data[3], data[2], data[1], data[0]);</div><div class='hunk'>@@ -219,10 +290,6 @@ static void ati_remote2_input_key(struct ati_remote2 *ar2)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	hw_code = data[2];</div><div class='del'>-	/*</div><div class='del'>-	 * Mode keys (AUX1-AUX4, PC) all generate the same code byte.</div><div class='del'>-	 * Use the mode byte to figure out which one was pressed.</div><div class='del'>-	 */</div><div class='ctx'> 	if (hw_code == 0x3f) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * For some incomprehensible reason the mouse pad generates</div><div class='hunk'>@@ -236,8 +303,6 @@ static void ati_remote2_input_key(struct ati_remote2 *ar2)</div><div class='ctx'> </div><div class='ctx'> 		if (data[1] == 0)</div><div class='ctx'> 			ar2-&gt;mode = mode;</div><div class='del'>-</div><div class='del'>-		hw_code |= mode &lt;&lt; 8;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!((1 &lt;&lt; mode) &amp; mode_mask))</div><div class='hunk'>@@ -260,8 +325,8 @@ static void ati_remote2_input_key(struct ati_remote2 *ar2)</div><div class='ctx'> 	case 2:	/* repeat */</div><div class='ctx'> </div><div class='ctx'> 		/* No repeat for mouse buttons. */</div><div class='del'>-		if (ati_remote2_key_table[index].key_code == BTN_LEFT ||</div><div class='del'>-		    ati_remote2_key_table[index].key_code == BTN_RIGHT)</div><div class='add'>+		if (ar2-&gt;keycode[mode][index] == BTN_LEFT ||</div><div class='add'>+		    ar2-&gt;keycode[mode][index] == BTN_RIGHT)</div><div class='ctx'> 			return;</div><div class='ctx'> </div><div class='ctx'> 		if (!time_after_eq(jiffies, ar2-&gt;jiffies))</div><div class='hunk'>@@ -276,7 +341,7 @@ static void ati_remote2_input_key(struct ati_remote2 *ar2)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	input_event(idev, EV_KEY, ati_remote2_key_table[index].key_code, data[1]);</div><div class='add'>+	input_event(idev, EV_KEY, ar2-&gt;keycode[mode][index], data[1]);</div><div class='ctx'> 	input_sync(idev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -287,6 +352,7 @@ static void ati_remote2_complete_mouse(struct urb *urb)</div><div class='ctx'> </div><div class='ctx'> 	switch (urb-&gt;status) {</div><div class='ctx'> 	case 0:</div><div class='add'>+		usb_mark_last_busy(ar2-&gt;udev);</div><div class='ctx'> 		ati_remote2_input_mouse(ar2);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case -ENOENT:</div><div class='hunk'>@@ -297,6 +363,7 @@ static void ati_remote2_complete_mouse(struct urb *urb)</div><div class='ctx'> 			"%s(): urb status = %d\n", __func__, urb-&gt;status);</div><div class='ctx'> 		return;</div><div class='ctx'> 	default:</div><div class='add'>+		usb_mark_last_busy(ar2-&gt;udev);</div><div class='ctx'> 		dev_err(&amp;ar2-&gt;intf[0]-&gt;dev,</div><div class='ctx'> 			"%s(): urb status = %d\n", __func__, urb-&gt;status);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -314,6 +381,7 @@ static void ati_remote2_complete_key(struct urb *urb)</div><div class='ctx'> </div><div class='ctx'> 	switch (urb-&gt;status) {</div><div class='ctx'> 	case 0:</div><div class='add'>+		usb_mark_last_busy(ar2-&gt;udev);</div><div class='ctx'> 		ati_remote2_input_key(ar2);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case -ENOENT:</div><div class='hunk'>@@ -324,6 +392,7 @@ static void ati_remote2_complete_key(struct urb *urb)</div><div class='ctx'> 			"%s(): urb status = %d\n", __func__, urb-&gt;status);</div><div class='ctx'> 		return;</div><div class='ctx'> 	default:</div><div class='add'>+		usb_mark_last_busy(ar2-&gt;udev);</div><div class='ctx'> 		dev_err(&amp;ar2-&gt;intf[1]-&gt;dev,</div><div class='ctx'> 			"%s(): urb status = %d\n", __func__, urb-&gt;status);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -334,10 +403,60 @@ static void ati_remote2_complete_key(struct urb *urb)</div><div class='ctx'> 			"%s(): usb_submit_urb() = %d\n", __func__, r);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int ati_remote2_getkeycode(struct input_dev *idev,</div><div class='add'>+				  int scancode, int *keycode)</div><div class='add'>+{</div><div class='add'>+	struct ati_remote2 *ar2 = input_get_drvdata(idev);</div><div class='add'>+	int index, mode;</div><div class='add'>+</div><div class='add'>+	mode = scancode &gt;&gt; 8;</div><div class='add'>+	if (mode &gt; ATI_REMOTE2_PC || !((1 &lt;&lt; mode) &amp; mode_mask))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	index = ati_remote2_lookup(scancode &amp; 0xFF);</div><div class='add'>+	if (index &lt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	*keycode = ar2-&gt;keycode[mode][index];</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ati_remote2_setkeycode(struct input_dev *idev, int scancode, int keycode)</div><div class='add'>+{</div><div class='add'>+	struct ati_remote2 *ar2 = input_get_drvdata(idev);</div><div class='add'>+	int index, mode, old_keycode;</div><div class='add'>+</div><div class='add'>+	mode = scancode &gt;&gt; 8;</div><div class='add'>+	if (mode &gt; ATI_REMOTE2_PC || !((1 &lt;&lt; mode) &amp; mode_mask))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	index = ati_remote2_lookup(scancode &amp; 0xFF);</div><div class='add'>+	if (index &lt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (keycode &lt; KEY_RESERVED || keycode &gt; KEY_MAX)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	old_keycode = ar2-&gt;keycode[mode][index];</div><div class='add'>+	ar2-&gt;keycode[mode][index] = keycode;</div><div class='add'>+	set_bit(keycode, idev-&gt;keybit);</div><div class='add'>+</div><div class='add'>+	for (mode = 0; mode &lt; ATI_REMOTE2_MODES; mode++) {</div><div class='add'>+		for (index = 0; index &lt; ARRAY_SIZE(ati_remote2_key_table); index++) {</div><div class='add'>+			if (ar2-&gt;keycode[mode][index] == old_keycode)</div><div class='add'>+				return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	clear_bit(old_keycode, idev-&gt;keybit);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ati_remote2_input_init(struct ati_remote2 *ar2)</div><div class='ctx'> {</div><div class='ctx'> 	struct input_dev *idev;</div><div class='del'>-	int i, retval;</div><div class='add'>+	int index, mode, retval;</div><div class='ctx'> </div><div class='ctx'> 	idev = input_allocate_device();</div><div class='ctx'> 	if (!idev)</div><div class='hunk'>@@ -350,8 +469,26 @@ static int ati_remote2_input_init(struct ati_remote2 *ar2)</div><div class='ctx'> 	idev-&gt;keybit[BIT_WORD(BTN_MOUSE)] = BIT_MASK(BTN_LEFT) |</div><div class='ctx'> 		BIT_MASK(BTN_RIGHT);</div><div class='ctx'> 	idev-&gt;relbit[0] = BIT_MASK(REL_X) | BIT_MASK(REL_Y);</div><div class='del'>-	for (i = 0; ati_remote2_key_table[i].key_code != KEY_RESERVED; i++)</div><div class='del'>-		set_bit(ati_remote2_key_table[i].key_code, idev-&gt;keybit);</div><div class='add'>+</div><div class='add'>+	for (mode = 0; mode &lt; ATI_REMOTE2_MODES; mode++) {</div><div class='add'>+		for (index = 0; index &lt; ARRAY_SIZE(ati_remote2_key_table); index++) {</div><div class='add'>+			ar2-&gt;keycode[mode][index] = ati_remote2_key_table[index].keycode;</div><div class='add'>+			set_bit(ar2-&gt;keycode[mode][index], idev-&gt;keybit);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* AUX1-AUX4 and PC generate the same scancode. */</div><div class='add'>+	index = ati_remote2_lookup(0x3f);</div><div class='add'>+	ar2-&gt;keycode[ATI_REMOTE2_AUX1][index] = KEY_PROG1;</div><div class='add'>+	ar2-&gt;keycode[ATI_REMOTE2_AUX2][index] = KEY_PROG2;</div><div class='add'>+	ar2-&gt;keycode[ATI_REMOTE2_AUX3][index] = KEY_PROG3;</div><div class='add'>+	ar2-&gt;keycode[ATI_REMOTE2_AUX4][index] = KEY_PROG4;</div><div class='add'>+	ar2-&gt;keycode[ATI_REMOTE2_PC][index] = KEY_PC;</div><div class='add'>+	set_bit(KEY_PROG1, idev-&gt;keybit);</div><div class='add'>+	set_bit(KEY_PROG2, idev-&gt;keybit);</div><div class='add'>+	set_bit(KEY_PROG3, idev-&gt;keybit);</div><div class='add'>+	set_bit(KEY_PROG4, idev-&gt;keybit);</div><div class='add'>+	set_bit(KEY_PC, idev-&gt;keybit);</div><div class='ctx'> </div><div class='ctx'> 	idev-&gt;rep[REP_DELAY]  = 250;</div><div class='ctx'> 	idev-&gt;rep[REP_PERIOD] = 33;</div><div class='hunk'>@@ -359,6 +496,9 @@ static int ati_remote2_input_init(struct ati_remote2 *ar2)</div><div class='ctx'> 	idev-&gt;open = ati_remote2_open;</div><div class='ctx'> 	idev-&gt;close = ati_remote2_close;</div><div class='ctx'> </div><div class='add'>+	idev-&gt;getkeycode = ati_remote2_getkeycode;</div><div class='add'>+	idev-&gt;setkeycode = ati_remote2_setkeycode;</div><div class='add'>+</div><div class='ctx'> 	idev-&gt;name = ar2-&gt;name;</div><div class='ctx'> 	idev-&gt;phys = ar2-&gt;phys;</div><div class='ctx'> </div><div class='hunk'>@@ -490,6 +630,8 @@ static int ati_remote2_probe(struct usb_interface *interface, const struct usb_d</div><div class='ctx'> </div><div class='ctx'> 	usb_set_intfdata(interface, ar2);</div><div class='ctx'> </div><div class='add'>+	interface-&gt;needs_remote_wakeup = 1;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'>  fail2:</div><div class='hunk'>@@ -522,6 +664,57 @@ static void ati_remote2_disconnect(struct usb_interface *interface)</div><div class='ctx'> 	kfree(ar2);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int ati_remote2_suspend(struct usb_interface *interface,</div><div class='add'>+			       pm_message_t message)</div><div class='add'>+{</div><div class='add'>+	struct ati_remote2 *ar2;</div><div class='add'>+	struct usb_host_interface *alt = interface-&gt;cur_altsetting;</div><div class='add'>+</div><div class='add'>+	if (alt-&gt;desc.bInterfaceNumber)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ar2 = usb_get_intfdata(interface);</div><div class='add'>+</div><div class='add'>+	dev_dbg(&amp;ar2-&gt;intf[0]-&gt;dev, "%s()\n", __func__);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ati_remote2_mutex);</div><div class='add'>+</div><div class='add'>+	if (ar2-&gt;flags &amp; ATI_REMOTE2_OPENED)</div><div class='add'>+		ati_remote2_kill_urbs(ar2);</div><div class='add'>+</div><div class='add'>+	ar2-&gt;flags |= ATI_REMOTE2_SUSPENDED;</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;ati_remote2_mutex);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ati_remote2_resume(struct usb_interface *interface)</div><div class='add'>+{</div><div class='add'>+	struct ati_remote2 *ar2;</div><div class='add'>+	struct usb_host_interface *alt = interface-&gt;cur_altsetting;</div><div class='add'>+	int r = 0;</div><div class='add'>+</div><div class='add'>+	if (alt-&gt;desc.bInterfaceNumber)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ar2 = usb_get_intfdata(interface);</div><div class='add'>+</div><div class='add'>+	dev_dbg(&amp;ar2-&gt;intf[0]-&gt;dev, "%s()\n", __func__);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ati_remote2_mutex);</div><div class='add'>+</div><div class='add'>+	if (ar2-&gt;flags &amp; ATI_REMOTE2_OPENED)</div><div class='add'>+		r = ati_remote2_submit_urbs(ar2);</div><div class='add'>+</div><div class='add'>+	if (!r)</div><div class='add'>+		ar2-&gt;flags &amp;= ~ATI_REMOTE2_SUSPENDED;</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;ati_remote2_mutex);</div><div class='add'>+</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int __init ati_remote2_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int r;</div><div class='head'>diff --git a/drivers/input/misc/cm109.c b/drivers/input/misc/cm109.c<br/>new file mode 100644<br/>index 000000000000..bce160f4349b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/misc/cm109.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/misc/cm109.c</a></div><div class='hunk'>@@ -0,0 +1,882 @@</div><div class='add'>+/*</div><div class='add'>+ * Driver for the VoIP USB phones with CM109 chipsets.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2007 - 2008 Alfred E. Heggestad &lt;aeh@db.org&gt;</div><div class='add'>+ *</div><div class='add'>+ *	This program is free software; you can redistribute it and/or</div><div class='add'>+ *	modify it under the terms of the GNU General Public License as</div><div class='add'>+ *	published by the Free Software Foundation, version 2.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *   Tested devices:</div><div class='add'>+ *	- Komunikate KIP1000</div><div class='add'>+ *	- Genius G-talk</div><div class='add'>+ *	- Allied-Telesis Corega USBPH01</div><div class='add'>+ *	- ...</div><div class='add'>+ *</div><div class='add'>+ * This driver is based on the yealink.c driver</div><div class='add'>+ *</div><div class='add'>+ * Thanks to:</div><div class='add'>+ *   - Authors of yealink.c</div><div class='add'>+ *   - Thomas Reitmayr</div><div class='add'>+ *   - Oliver Neukum for good review comments and code</div><div class='add'>+ *   - Shaun Jackman &lt;sjackman@gmail.com&gt; for Genius G-talk keymap</div><div class='add'>+ *   - Dmitry Torokhov for valuable input and review</div><div class='add'>+ *</div><div class='add'>+ * Todo:</div><div class='add'>+ *   - Read/write EEPROM</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/rwsem.h&gt;</div><div class='add'>+#include &lt;linux/usb/input.h&gt;</div><div class='add'>+</div><div class='add'>+#define DRIVER_VERSION "20080805"</div><div class='add'>+#define DRIVER_AUTHOR  "Alfred E. Heggestad"</div><div class='add'>+#define DRIVER_DESC    "CM109 phone driver"</div><div class='add'>+</div><div class='add'>+static char *phone = "kip1000";</div><div class='add'>+module_param(phone, charp, S_IRUSR);</div><div class='add'>+MODULE_PARM_DESC(phone, "Phone name {kip1000, gtalk, usbph01}");</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	/* HID Registers */</div><div class='add'>+	HID_IR0 = 0x00, /* Record/Playback-mute button, Volume up/down  */</div><div class='add'>+	HID_IR1 = 0x01, /* GPI, generic registers or EEPROM_DATA0       */</div><div class='add'>+	HID_IR2 = 0x02, /* Generic registers or EEPROM_DATA1            */</div><div class='add'>+	HID_IR3 = 0x03, /* Generic registers or EEPROM_CTRL             */</div><div class='add'>+	HID_OR0 = 0x00, /* Mapping control, buzzer, SPDIF (offset 0x04) */</div><div class='add'>+	HID_OR1 = 0x01, /* GPO - General Purpose Output                 */</div><div class='add'>+	HID_OR2 = 0x02, /* Set GPIO to input/output mode                */</div><div class='add'>+	HID_OR3 = 0x03, /* SPDIF status channel or EEPROM_CTRL          */</div><div class='add'>+</div><div class='add'>+	/* HID_IR0 */</div><div class='add'>+	RECORD_MUTE   = 1 &lt;&lt; 3,</div><div class='add'>+	PLAYBACK_MUTE = 1 &lt;&lt; 2,</div><div class='add'>+	VOLUME_DOWN   = 1 &lt;&lt; 1,</div><div class='add'>+	VOLUME_UP     = 1 &lt;&lt; 0,</div><div class='add'>+</div><div class='add'>+	/* HID_OR0 */</div><div class='add'>+	/* bits 7-6</div><div class='add'>+	   0: HID_OR1-2 are used for GPO; HID_OR0, 3 are used for buzzer</div><div class='add'>+	      and SPDIF</div><div class='add'>+	   1: HID_OR0-3 are used as generic HID registers</div><div class='add'>+	   2: Values written to HID_OR0-3 are also mapped to MCU_CTRL,</div><div class='add'>+	      EEPROM_DATA0-1, EEPROM_CTRL (see Note)</div><div class='add'>+	   3: Reserved</div><div class='add'>+	 */</div><div class='add'>+	HID_OR_GPO_BUZ_SPDIF   = 0 &lt;&lt; 6,</div><div class='add'>+	HID_OR_GENERIC_HID_REG = 1 &lt;&lt; 6,</div><div class='add'>+	HID_OR_MAP_MCU_EEPROM  = 2 &lt;&lt; 6,</div><div class='add'>+</div><div class='add'>+	BUZZER_ON = 1 &lt;&lt; 5,</div><div class='add'>+</div><div class='add'>+	/* up to 256 normal keys, up to 16 special keys */</div><div class='add'>+	KEYMAP_SIZE = 256 + 16,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* CM109 protocol packet */</div><div class='add'>+struct cm109_ctl_packet {</div><div class='add'>+	u8 byte[4];</div><div class='add'>+} __attribute__ ((packed));</div><div class='add'>+</div><div class='add'>+enum { USB_PKT_LEN = sizeof(struct cm109_ctl_packet) };</div><div class='add'>+</div><div class='add'>+/* CM109 device structure */</div><div class='add'>+struct cm109_dev {</div><div class='add'>+	struct input_dev *idev;	 /* input device */</div><div class='add'>+	struct usb_device *udev; /* usb device */</div><div class='add'>+	struct usb_interface *intf;</div><div class='add'>+</div><div class='add'>+	/* irq input channel */</div><div class='add'>+	struct cm109_ctl_packet *irq_data;</div><div class='add'>+	dma_addr_t irq_dma;</div><div class='add'>+	struct urb *urb_irq;</div><div class='add'>+</div><div class='add'>+	/* control output channel */</div><div class='add'>+	struct cm109_ctl_packet *ctl_data;</div><div class='add'>+	dma_addr_t ctl_dma;</div><div class='add'>+	struct usb_ctrlrequest *ctl_req;</div><div class='add'>+	dma_addr_t ctl_req_dma;</div><div class='add'>+	struct urb *urb_ctl;</div><div class='add'>+	/*</div><div class='add'>+	 * The 3 bitfields below are protected by ctl_submit_lock.</div><div class='add'>+	 * They have to be separate since they are accessed from IRQ</div><div class='add'>+	 * context.</div><div class='add'>+	 */</div><div class='add'>+	unsigned irq_urb_pending:1;	/* irq_urb is in flight */</div><div class='add'>+	unsigned ctl_urb_pending:1;	/* ctl_urb is in flight */</div><div class='add'>+	unsigned buzzer_pending:1;	/* need to issue buzz command */</div><div class='add'>+	spinlock_t ctl_submit_lock;</div><div class='add'>+</div><div class='add'>+	unsigned char buzzer_state;	/* on/off */</div><div class='add'>+</div><div class='add'>+	/* flags */</div><div class='add'>+	unsigned open:1;</div><div class='add'>+	unsigned resetting:1;</div><div class='add'>+	unsigned shutdown:1;</div><div class='add'>+</div><div class='add'>+	/* This mutex protects writes to the above flags */</div><div class='add'>+	struct mutex pm_mutex;</div><div class='add'>+</div><div class='add'>+	unsigned short keymap[KEYMAP_SIZE];</div><div class='add'>+</div><div class='add'>+	char phys[64];		/* physical device path */</div><div class='add'>+	int key_code;		/* last reported key */</div><div class='add'>+	int keybit;		/* 0=new scan  1,2,4,8=scan columns  */</div><div class='add'>+	u8 gpi;			/* Cached value of GPI (high nibble) */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/******************************************************************************</div><div class='add'>+ * CM109 key interface</div><div class='add'>+ *****************************************************************************/</div><div class='add'>+</div><div class='add'>+static unsigned short special_keymap(int code)</div><div class='add'>+{</div><div class='add'>+	if (code &gt; 0xff) {</div><div class='add'>+		switch (code - 0xff) {</div><div class='add'>+		case RECORD_MUTE:	return KEY_MUTE;</div><div class='add'>+		case PLAYBACK_MUTE:	return KEY_MUTE;</div><div class='add'>+		case VOLUME_DOWN:	return KEY_VOLUMEDOWN;</div><div class='add'>+		case VOLUME_UP:		return KEY_VOLUMEUP;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return KEY_RESERVED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Map device buttons to internal key events.</div><div class='add'>+ *</div><div class='add'>+ * The "up" and "down" keys, are symbolised by arrows on the button.</div><div class='add'>+ * The "pickup" and "hangup" keys are symbolised by a green and red phone</div><div class='add'>+ * on the button.</div><div class='add'>+</div><div class='add'>+ Komunikate KIP1000 Keyboard Matrix</div><div class='add'>+</div><div class='add'>+     -&gt; -- 1 -- 2 -- 3  --&gt; GPI pin 4 (0x10)</div><div class='add'>+      |    |    |    |</div><div class='add'>+     &lt;- -- 4 -- 5 -- 6  --&gt; GPI pin 5 (0x20)</div><div class='add'>+      |    |    |    |</div><div class='add'>+     END - 7 -- 8 -- 9  --&gt; GPI pin 6 (0x40)</div><div class='add'>+      |    |    |    |</div><div class='add'>+     OK -- * -- 0 -- #  --&gt; GPI pin 7 (0x80)</div><div class='add'>+      |    |    |    |</div><div class='add'>+</div><div class='add'>+     /|\  /|\  /|\  /|\</div><div class='add'>+      |    |    |    |</div><div class='add'>+GPO</div><div class='add'>+pin:  3    2    1    0</div><div class='add'>+     0x8  0x4  0x2  0x1</div><div class='add'>+</div><div class='add'>+ */</div><div class='add'>+static unsigned short keymap_kip1000(int scancode)</div><div class='add'>+{</div><div class='add'>+	switch (scancode) {				/* phone key:   */</div><div class='add'>+	case 0x82: return KEY_NUMERIC_0;		/*   0          */</div><div class='add'>+	case 0x14: return KEY_NUMERIC_1;		/*   1          */</div><div class='add'>+	case 0x12: return KEY_NUMERIC_2;		/*   2          */</div><div class='add'>+	case 0x11: return KEY_NUMERIC_3;		/*   3          */</div><div class='add'>+	case 0x24: return KEY_NUMERIC_4;		/*   4          */</div><div class='add'>+	case 0x22: return KEY_NUMERIC_5;		/*   5          */</div><div class='add'>+	case 0x21: return KEY_NUMERIC_6;		/*   6          */</div><div class='add'>+	case 0x44: return KEY_NUMERIC_7;		/*   7          */</div><div class='add'>+	case 0x42: return KEY_NUMERIC_8;		/*   8          */</div><div class='add'>+	case 0x41: return KEY_NUMERIC_9;		/*   9          */</div><div class='add'>+	case 0x81: return KEY_NUMERIC_POUND;		/*   #          */</div><div class='add'>+	case 0x84: return KEY_NUMERIC_STAR;		/*   *          */</div><div class='add'>+	case 0x88: return KEY_ENTER;			/*   pickup     */</div><div class='add'>+	case 0x48: return KEY_ESC;			/*   hangup     */</div><div class='add'>+	case 0x28: return KEY_LEFT;			/*   IN         */</div><div class='add'>+	case 0x18: return KEY_RIGHT;			/*   OUT        */</div><div class='add'>+	default:   return special_keymap(scancode);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+  Contributed by Shaun Jackman &lt;sjackman@gmail.com&gt;</div><div class='add'>+</div><div class='add'>+  Genius G-Talk keyboard matrix</div><div class='add'>+     0 1 2 3</div><div class='add'>+  4: 0 4 8 Talk</div><div class='add'>+  5: 1 5 9 End</div><div class='add'>+  6: 2 6 # Up</div><div class='add'>+  7: 3 7 * Down</div><div class='add'>+*/</div><div class='add'>+static unsigned short keymap_gtalk(int scancode)</div><div class='add'>+{</div><div class='add'>+	switch (scancode) {</div><div class='add'>+	case 0x11: return KEY_NUMERIC_0;</div><div class='add'>+	case 0x21: return KEY_NUMERIC_1;</div><div class='add'>+	case 0x41: return KEY_NUMERIC_2;</div><div class='add'>+	case 0x81: return KEY_NUMERIC_3;</div><div class='add'>+	case 0x12: return KEY_NUMERIC_4;</div><div class='add'>+	case 0x22: return KEY_NUMERIC_5;</div><div class='add'>+	case 0x42: return KEY_NUMERIC_6;</div><div class='add'>+	case 0x82: return KEY_NUMERIC_7;</div><div class='add'>+	case 0x14: return KEY_NUMERIC_8;</div><div class='add'>+	case 0x24: return KEY_NUMERIC_9;</div><div class='add'>+	case 0x44: return KEY_NUMERIC_POUND;	/* # */</div><div class='add'>+	case 0x84: return KEY_NUMERIC_STAR;	/* * */</div><div class='add'>+	case 0x18: return KEY_ENTER;		/* Talk (green handset) */</div><div class='add'>+	case 0x28: return KEY_ESC;		/* End (red handset) */</div><div class='add'>+	case 0x48: return KEY_UP;		/* Menu up (rocker switch) */</div><div class='add'>+	case 0x88: return KEY_DOWN;		/* Menu down (rocker switch) */</div><div class='add'>+	default:   return special_keymap(scancode);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Keymap for Allied-Telesis Corega USBPH01</div><div class='add'>+ * http://www.alliedtelesis-corega.com/2/1344/1437/1360/chprd.html</div><div class='add'>+ *</div><div class='add'>+ * Contributed by july@nat.bg</div><div class='add'>+ */</div><div class='add'>+static unsigned short keymap_usbph01(int scancode)</div><div class='add'>+{</div><div class='add'>+	switch (scancode) {</div><div class='add'>+	case 0x11: return KEY_NUMERIC_0;		/*   0          */</div><div class='add'>+	case 0x21: return KEY_NUMERIC_1;		/*   1          */</div><div class='add'>+	case 0x41: return KEY_NUMERIC_2;		/*   2          */</div><div class='add'>+	case 0x81: return KEY_NUMERIC_3;		/*   3          */</div><div class='add'>+	case 0x12: return KEY_NUMERIC_4;		/*   4          */</div><div class='add'>+	case 0x22: return KEY_NUMERIC_5;		/*   5          */</div><div class='add'>+	case 0x42: return KEY_NUMERIC_6;		/*   6          */</div><div class='add'>+	case 0x82: return KEY_NUMERIC_7;		/*   7          */</div><div class='add'>+	case 0x14: return KEY_NUMERIC_8;		/*   8          */</div><div class='add'>+	case 0x24: return KEY_NUMERIC_9;		/*   9          */</div><div class='add'>+	case 0x44: return KEY_NUMERIC_POUND;		/*   #          */</div><div class='add'>+	case 0x84: return KEY_NUMERIC_STAR;		/*   *          */</div><div class='add'>+	case 0x18: return KEY_ENTER;			/*   pickup     */</div><div class='add'>+	case 0x28: return KEY_ESC;			/*   hangup     */</div><div class='add'>+	case 0x48: return KEY_LEFT;			/*   IN         */</div><div class='add'>+	case 0x88: return KEY_RIGHT;			/*   OUT        */</div><div class='add'>+	default:   return special_keymap(scancode);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned short (*keymap)(int) = keymap_kip1000;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Completes a request by converting the data into events for the</div><div class='add'>+ * input subsystem.</div><div class='add'>+ */</div><div class='add'>+static void report_key(struct cm109_dev *dev, int key)</div><div class='add'>+{</div><div class='add'>+	struct input_dev *idev = dev-&gt;idev;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;key_code &gt;= 0) {</div><div class='add'>+		/* old key up */</div><div class='add'>+		input_report_key(idev, dev-&gt;key_code, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev-&gt;key_code = key;</div><div class='add'>+	if (key &gt;= 0) {</div><div class='add'>+		/* new valid key */</div><div class='add'>+		input_report_key(idev, key, 1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	input_sync(idev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/******************************************************************************</div><div class='add'>+ * CM109 usb communication interface</div><div class='add'>+ *****************************************************************************/</div><div class='add'>+</div><div class='add'>+static void cm109_submit_buzz_toggle(struct cm109_dev *dev)</div><div class='add'>+{</div><div class='add'>+	int error;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;buzzer_state)</div><div class='add'>+		dev-&gt;ctl_data-&gt;byte[HID_OR0] |= BUZZER_ON;</div><div class='add'>+	else</div><div class='add'>+		dev-&gt;ctl_data-&gt;byte[HID_OR0] &amp;= ~BUZZER_ON;</div><div class='add'>+</div><div class='add'>+	error = usb_submit_urb(dev-&gt;urb_ctl, GFP_ATOMIC);</div><div class='add'>+	if (error)</div><div class='add'>+		err("%s: usb_submit_urb (urb_ctl) failed %d", __func__, error);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * IRQ handler</div><div class='add'>+ */</div><div class='add'>+static void cm109_urb_irq_callback(struct urb *urb)</div><div class='add'>+{</div><div class='add'>+	struct cm109_dev *dev = urb-&gt;context;</div><div class='add'>+	const int status = urb-&gt;status;</div><div class='add'>+	int error;</div><div class='add'>+</div><div class='add'>+	dev_dbg(&amp;urb-&gt;dev-&gt;dev, "### URB IRQ: [0x%02x 0x%02x 0x%02x 0x%02x] keybit=0x%02x\n",</div><div class='add'>+	     dev-&gt;irq_data-&gt;byte[0],</div><div class='add'>+	     dev-&gt;irq_data-&gt;byte[1],</div><div class='add'>+	     dev-&gt;irq_data-&gt;byte[2],</div><div class='add'>+	     dev-&gt;irq_data-&gt;byte[3],</div><div class='add'>+	     dev-&gt;keybit);</div><div class='add'>+</div><div class='add'>+	if (status) {</div><div class='add'>+		if (status == -ESHUTDOWN)</div><div class='add'>+			return;</div><div class='add'>+		err("%s: urb status %d", __func__, status);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Special keys */</div><div class='add'>+	if (dev-&gt;irq_data-&gt;byte[HID_IR0] &amp; 0x0f) {</div><div class='add'>+		const int code = (dev-&gt;irq_data-&gt;byte[HID_IR0] &amp; 0x0f);</div><div class='add'>+		report_key(dev, dev-&gt;keymap[0xff + code]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Scan key column */</div><div class='add'>+	if (dev-&gt;keybit == 0xf) {</div><div class='add'>+</div><div class='add'>+		/* Any changes ? */</div><div class='add'>+		if ((dev-&gt;gpi &amp; 0xf0) == (dev-&gt;irq_data-&gt;byte[HID_IR1] &amp; 0xf0))</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		dev-&gt;gpi = dev-&gt;irq_data-&gt;byte[HID_IR1] &amp; 0xf0;</div><div class='add'>+		dev-&gt;keybit = 0x1;</div><div class='add'>+	} else {</div><div class='add'>+		report_key(dev, dev-&gt;keymap[dev-&gt;irq_data-&gt;byte[HID_IR1]]);</div><div class='add'>+</div><div class='add'>+		dev-&gt;keybit &lt;&lt;= 1;</div><div class='add'>+		if (dev-&gt;keybit &gt; 0x8)</div><div class='add'>+			dev-&gt;keybit = 0xf;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+ out:</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;dev-&gt;ctl_submit_lock);</div><div class='add'>+</div><div class='add'>+	dev-&gt;irq_urb_pending = 0;</div><div class='add'>+</div><div class='add'>+	if (likely(!dev-&gt;shutdown)) {</div><div class='add'>+</div><div class='add'>+		if (dev-&gt;buzzer_state)</div><div class='add'>+			dev-&gt;ctl_data-&gt;byte[HID_OR0] |= BUZZER_ON;</div><div class='add'>+		else</div><div class='add'>+			dev-&gt;ctl_data-&gt;byte[HID_OR0] &amp;= ~BUZZER_ON;</div><div class='add'>+</div><div class='add'>+		dev-&gt;ctl_data-&gt;byte[HID_OR1] = dev-&gt;keybit;</div><div class='add'>+		dev-&gt;ctl_data-&gt;byte[HID_OR2] = dev-&gt;keybit;</div><div class='add'>+</div><div class='add'>+		dev-&gt;buzzer_pending = 0;</div><div class='add'>+		dev-&gt;ctl_urb_pending = 1;</div><div class='add'>+</div><div class='add'>+		error = usb_submit_urb(dev-&gt;urb_ctl, GFP_ATOMIC);</div><div class='add'>+		if (error)</div><div class='add'>+			err("%s: usb_submit_urb (urb_ctl) failed %d",</div><div class='add'>+				__func__, error);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;dev-&gt;ctl_submit_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cm109_urb_ctl_callback(struct urb *urb)</div><div class='add'>+{</div><div class='add'>+	struct cm109_dev *dev = urb-&gt;context;</div><div class='add'>+	const int status = urb-&gt;status;</div><div class='add'>+	int error;</div><div class='add'>+</div><div class='add'>+	dev_dbg(&amp;urb-&gt;dev-&gt;dev, "### URB CTL: [0x%02x 0x%02x 0x%02x 0x%02x]\n",</div><div class='add'>+	     dev-&gt;ctl_data-&gt;byte[0],</div><div class='add'>+	     dev-&gt;ctl_data-&gt;byte[1],</div><div class='add'>+	     dev-&gt;ctl_data-&gt;byte[2],</div><div class='add'>+	     dev-&gt;ctl_data-&gt;byte[3]);</div><div class='add'>+</div><div class='add'>+	if (status)</div><div class='add'>+		err("%s: urb status %d", __func__, status);</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;dev-&gt;ctl_submit_lock);</div><div class='add'>+</div><div class='add'>+	dev-&gt;ctl_urb_pending = 0;</div><div class='add'>+</div><div class='add'>+	if (likely(!dev-&gt;shutdown)) {</div><div class='add'>+</div><div class='add'>+		if (dev-&gt;buzzer_pending) {</div><div class='add'>+			dev-&gt;buzzer_pending = 0;</div><div class='add'>+			dev-&gt;ctl_urb_pending = 1;</div><div class='add'>+			cm109_submit_buzz_toggle(dev);</div><div class='add'>+		} else if (likely(!dev-&gt;irq_urb_pending)) {</div><div class='add'>+			/* ask for key data */</div><div class='add'>+			dev-&gt;irq_urb_pending = 1;</div><div class='add'>+			error = usb_submit_urb(dev-&gt;urb_irq, GFP_ATOMIC);</div><div class='add'>+			if (error)</div><div class='add'>+				err("%s: usb_submit_urb (urb_irq) failed %d",</div><div class='add'>+					__func__, error);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;dev-&gt;ctl_submit_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cm109_toggle_buzzer_async(struct cm109_dev *dev)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;dev-&gt;ctl_submit_lock, flags);</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;ctl_urb_pending) {</div><div class='add'>+		/* URB completion will resubmit */</div><div class='add'>+		dev-&gt;buzzer_pending = 1;</div><div class='add'>+	} else {</div><div class='add'>+		dev-&gt;ctl_urb_pending = 1;</div><div class='add'>+		cm109_submit_buzz_toggle(dev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;dev-&gt;ctl_submit_lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cm109_toggle_buzzer_sync(struct cm109_dev *dev, int on)</div><div class='add'>+{</div><div class='add'>+	int error;</div><div class='add'>+</div><div class='add'>+	if (on)</div><div class='add'>+		dev-&gt;ctl_data-&gt;byte[HID_OR0] |= BUZZER_ON;</div><div class='add'>+	else</div><div class='add'>+		dev-&gt;ctl_data-&gt;byte[HID_OR0] &amp;= ~BUZZER_ON;</div><div class='add'>+</div><div class='add'>+	error = usb_control_msg(dev-&gt;udev,</div><div class='add'>+				usb_sndctrlpipe(dev-&gt;udev, 0),</div><div class='add'>+				dev-&gt;ctl_req-&gt;bRequest,</div><div class='add'>+				dev-&gt;ctl_req-&gt;bRequestType,</div><div class='add'>+				le16_to_cpu(dev-&gt;ctl_req-&gt;wValue),</div><div class='add'>+				le16_to_cpu(dev-&gt;ctl_req-&gt;wIndex),</div><div class='add'>+				dev-&gt;ctl_data,</div><div class='add'>+				USB_PKT_LEN, USB_CTRL_SET_TIMEOUT);</div><div class='add'>+	if (error &amp;&amp; error != EINTR)</div><div class='add'>+		err("%s: usb_control_msg() failed %d", __func__, error);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cm109_stop_traffic(struct cm109_dev *dev)</div><div class='add'>+{</div><div class='add'>+	dev-&gt;shutdown = 1;</div><div class='add'>+	/*</div><div class='add'>+	 * Make sure other CPUs see this</div><div class='add'>+	 */</div><div class='add'>+	smp_wmb();</div><div class='add'>+</div><div class='add'>+	usb_kill_urb(dev-&gt;urb_ctl);</div><div class='add'>+	usb_kill_urb(dev-&gt;urb_irq);</div><div class='add'>+</div><div class='add'>+	cm109_toggle_buzzer_sync(dev, 0);</div><div class='add'>+</div><div class='add'>+	dev-&gt;shutdown = 0;</div><div class='add'>+	smp_wmb();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cm109_restore_state(struct cm109_dev *dev)</div><div class='add'>+{</div><div class='add'>+	if (dev-&gt;open) {</div><div class='add'>+		/*</div><div class='add'>+		 * Restore buzzer state.</div><div class='add'>+		 * This will also kick regular URB submission</div><div class='add'>+		 */</div><div class='add'>+		cm109_toggle_buzzer_async(dev);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/******************************************************************************</div><div class='add'>+ * input event interface</div><div class='add'>+ *****************************************************************************/</div><div class='add'>+</div><div class='add'>+static int cm109_input_open(struct input_dev *idev)</div><div class='add'>+{</div><div class='add'>+	struct cm109_dev *dev = input_get_drvdata(idev);</div><div class='add'>+	int error;</div><div class='add'>+</div><div class='add'>+	error = usb_autopm_get_interface(dev-&gt;intf);</div><div class='add'>+	if (error &lt; 0) {</div><div class='add'>+		err("%s - cannot autoresume, result %d",</div><div class='add'>+		    __func__, error);</div><div class='add'>+		return error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;pm_mutex);</div><div class='add'>+</div><div class='add'>+	dev-&gt;buzzer_state = 0;</div><div class='add'>+	dev-&gt;key_code = -1;	/* no keys pressed */</div><div class='add'>+	dev-&gt;keybit = 0xf;</div><div class='add'>+</div><div class='add'>+	/* issue INIT */</div><div class='add'>+	dev-&gt;ctl_data-&gt;byte[HID_OR0] = HID_OR_GPO_BUZ_SPDIF;</div><div class='add'>+	dev-&gt;ctl_data-&gt;byte[HID_OR1] = dev-&gt;keybit;</div><div class='add'>+	dev-&gt;ctl_data-&gt;byte[HID_OR2] = dev-&gt;keybit;</div><div class='add'>+	dev-&gt;ctl_data-&gt;byte[HID_OR3] = 0x00;</div><div class='add'>+</div><div class='add'>+	error = usb_submit_urb(dev-&gt;urb_ctl, GFP_KERNEL);</div><div class='add'>+	if (error)</div><div class='add'>+		err("%s: usb_submit_urb (urb_ctl) failed %d", __func__, error);</div><div class='add'>+	else</div><div class='add'>+		dev-&gt;open = 1;</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;pm_mutex);</div><div class='add'>+</div><div class='add'>+	if (error)</div><div class='add'>+		usb_autopm_put_interface(dev-&gt;intf);</div><div class='add'>+</div><div class='add'>+	return error;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cm109_input_close(struct input_dev *idev)</div><div class='add'>+{</div><div class='add'>+	struct cm109_dev *dev = input_get_drvdata(idev);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;pm_mutex);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Once we are here event delivery is stopped so we</div><div class='add'>+	 * don't need to worry about someone starting buzzer</div><div class='add'>+	 * again</div><div class='add'>+	 */</div><div class='add'>+	cm109_stop_traffic(dev);</div><div class='add'>+	dev-&gt;open = 0;</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;pm_mutex);</div><div class='add'>+</div><div class='add'>+	usb_autopm_put_interface(dev-&gt;intf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cm109_input_ev(struct input_dev *idev, unsigned int type,</div><div class='add'>+			  unsigned int code, int value)</div><div class='add'>+{</div><div class='add'>+	struct cm109_dev *dev = input_get_drvdata(idev);</div><div class='add'>+</div><div class='add'>+	dev_dbg(&amp;dev-&gt;udev-&gt;dev,</div><div class='add'>+		"input_ev: type=%u code=%u value=%d\n", type, code, value);</div><div class='add'>+</div><div class='add'>+	if (type != EV_SND)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	switch (code) {</div><div class='add'>+	case SND_TONE:</div><div class='add'>+	case SND_BELL:</div><div class='add'>+		dev-&gt;buzzer_state = !!value;</div><div class='add'>+		if (!dev-&gt;resetting)</div><div class='add'>+			cm109_toggle_buzzer_async(dev);</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/******************************************************************************</div><div class='add'>+ * Linux interface and usb initialisation</div><div class='add'>+ *****************************************************************************/</div><div class='add'>+</div><div class='add'>+struct driver_info {</div><div class='add'>+	char *name;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct driver_info info_cm109 = {</div><div class='add'>+	.name = "CM109 USB driver",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	VENDOR_ID        = 0x0d8c, /* C-Media Electronics */</div><div class='add'>+	PRODUCT_ID_CM109 = 0x000e, /* CM109 defines range 0x0008 - 0x000f */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* table of devices that work with this driver */</div><div class='add'>+static const struct usb_device_id cm109_usb_table[] = {</div><div class='add'>+	{</div><div class='add'>+		.match_flags = USB_DEVICE_ID_MATCH_DEVICE |</div><div class='add'>+				USB_DEVICE_ID_MATCH_INT_INFO,</div><div class='add'>+		.idVendor = VENDOR_ID,</div><div class='add'>+		.idProduct = PRODUCT_ID_CM109,</div><div class='add'>+		.bInterfaceClass = USB_CLASS_HID,</div><div class='add'>+		.bInterfaceSubClass = 0,</div><div class='add'>+		.bInterfaceProtocol = 0,</div><div class='add'>+		.driver_info = (kernel_ulong_t) &amp;info_cm109</div><div class='add'>+	},</div><div class='add'>+	/* you can add more devices here with product ID 0x0008 - 0x000f */</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void cm109_usb_cleanup(struct cm109_dev *dev)</div><div class='add'>+{</div><div class='add'>+	if (dev-&gt;ctl_req)</div><div class='add'>+		usb_buffer_free(dev-&gt;udev, sizeof(*(dev-&gt;ctl_req)),</div><div class='add'>+				dev-&gt;ctl_req, dev-&gt;ctl_req_dma);</div><div class='add'>+	if (dev-&gt;ctl_data)</div><div class='add'>+		usb_buffer_free(dev-&gt;udev, USB_PKT_LEN,</div><div class='add'>+				dev-&gt;ctl_data, dev-&gt;ctl_dma);</div><div class='add'>+	if (dev-&gt;irq_data)</div><div class='add'>+		usb_buffer_free(dev-&gt;udev, USB_PKT_LEN,</div><div class='add'>+				dev-&gt;irq_data, dev-&gt;irq_dma);</div><div class='add'>+</div><div class='add'>+	usb_free_urb(dev-&gt;urb_irq);	/* parameter validation in core/urb */</div><div class='add'>+	usb_free_urb(dev-&gt;urb_ctl);	/* parameter validation in core/urb */</div><div class='add'>+	kfree(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cm109_usb_disconnect(struct usb_interface *interface)</div><div class='add'>+{</div><div class='add'>+	struct cm109_dev *dev = usb_get_intfdata(interface);</div><div class='add'>+</div><div class='add'>+	usb_set_intfdata(interface, NULL);</div><div class='add'>+	input_unregister_device(dev-&gt;idev);</div><div class='add'>+	cm109_usb_cleanup(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cm109_usb_probe(struct usb_interface *intf,</div><div class='add'>+			   const struct usb_device_id *id)</div><div class='add'>+{</div><div class='add'>+	struct usb_device *udev = interface_to_usbdev(intf);</div><div class='add'>+	struct driver_info *nfo = (struct driver_info *)id-&gt;driver_info;</div><div class='add'>+	struct usb_host_interface *interface;</div><div class='add'>+	struct usb_endpoint_descriptor *endpoint;</div><div class='add'>+	struct cm109_dev *dev;</div><div class='add'>+	struct input_dev *input_dev = NULL;</div><div class='add'>+	int ret, pipe, i;</div><div class='add'>+	int error = -ENOMEM;</div><div class='add'>+</div><div class='add'>+	interface = intf-&gt;cur_altsetting;</div><div class='add'>+	endpoint = &amp;interface-&gt;endpoint[0].desc;</div><div class='add'>+</div><div class='add'>+	if (!usb_endpoint_is_int_in(endpoint))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	dev = kzalloc(sizeof(*dev), GFP_KERNEL);</div><div class='add'>+	if (!dev)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;dev-&gt;ctl_submit_lock);</div><div class='add'>+	mutex_init(&amp;dev-&gt;pm_mutex);</div><div class='add'>+</div><div class='add'>+	dev-&gt;udev = udev;</div><div class='add'>+	dev-&gt;intf = intf;</div><div class='add'>+</div><div class='add'>+	dev-&gt;idev = input_dev = input_allocate_device();</div><div class='add'>+	if (!input_dev)</div><div class='add'>+		goto err_out;</div><div class='add'>+</div><div class='add'>+	/* allocate usb buffers */</div><div class='add'>+	dev-&gt;irq_data = usb_buffer_alloc(udev, USB_PKT_LEN,</div><div class='add'>+					 GFP_KERNEL, &amp;dev-&gt;irq_dma);</div><div class='add'>+	if (!dev-&gt;irq_data)</div><div class='add'>+		goto err_out;</div><div class='add'>+</div><div class='add'>+	dev-&gt;ctl_data = usb_buffer_alloc(udev, USB_PKT_LEN,</div><div class='add'>+					 GFP_KERNEL, &amp;dev-&gt;ctl_dma);</div><div class='add'>+	if (!dev-&gt;ctl_data)</div><div class='add'>+		goto err_out;</div><div class='add'>+</div><div class='add'>+	dev-&gt;ctl_req = usb_buffer_alloc(udev, sizeof(*(dev-&gt;ctl_req)),</div><div class='add'>+					GFP_KERNEL, &amp;dev-&gt;ctl_req_dma);</div><div class='add'>+	if (!dev-&gt;ctl_req)</div><div class='add'>+		goto err_out;</div><div class='add'>+</div><div class='add'>+	/* allocate urb structures */</div><div class='add'>+	dev-&gt;urb_irq = usb_alloc_urb(0, GFP_KERNEL);</div><div class='add'>+	if (!dev-&gt;urb_irq)</div><div class='add'>+		goto err_out;</div><div class='add'>+</div><div class='add'>+	dev-&gt;urb_ctl = usb_alloc_urb(0, GFP_KERNEL);</div><div class='add'>+	if (!dev-&gt;urb_ctl)</div><div class='add'>+		goto err_out;</div><div class='add'>+</div><div class='add'>+	/* get a handle to the interrupt data pipe */</div><div class='add'>+	pipe = usb_rcvintpipe(udev, endpoint-&gt;bEndpointAddress);</div><div class='add'>+	ret = usb_maxpacket(udev, pipe, usb_pipeout(pipe));</div><div class='add'>+	if (ret != USB_PKT_LEN)</div><div class='add'>+		err("invalid payload size %d, expected %d", ret, USB_PKT_LEN);</div><div class='add'>+</div><div class='add'>+	/* initialise irq urb */</div><div class='add'>+	usb_fill_int_urb(dev-&gt;urb_irq, udev, pipe, dev-&gt;irq_data,</div><div class='add'>+			 USB_PKT_LEN,</div><div class='add'>+			 cm109_urb_irq_callback, dev, endpoint-&gt;bInterval);</div><div class='add'>+	dev-&gt;urb_irq-&gt;transfer_dma = dev-&gt;irq_dma;</div><div class='add'>+	dev-&gt;urb_irq-&gt;transfer_flags |= URB_NO_TRANSFER_DMA_MAP;</div><div class='add'>+	dev-&gt;urb_irq-&gt;dev = udev;</div><div class='add'>+</div><div class='add'>+	/* initialise ctl urb */</div><div class='add'>+	dev-&gt;ctl_req-&gt;bRequestType = USB_TYPE_CLASS | USB_RECIP_INTERFACE |</div><div class='add'>+					USB_DIR_OUT;</div><div class='add'>+	dev-&gt;ctl_req-&gt;bRequest = USB_REQ_SET_CONFIGURATION;</div><div class='add'>+	dev-&gt;ctl_req-&gt;wValue = cpu_to_le16(0x200);</div><div class='add'>+	dev-&gt;ctl_req-&gt;wIndex = cpu_to_le16(interface-&gt;desc.bInterfaceNumber);</div><div class='add'>+	dev-&gt;ctl_req-&gt;wLength = cpu_to_le16(USB_PKT_LEN);</div><div class='add'>+</div><div class='add'>+	usb_fill_control_urb(dev-&gt;urb_ctl, udev, usb_sndctrlpipe(udev, 0),</div><div class='add'>+			     (void *)dev-&gt;ctl_req, dev-&gt;ctl_data, USB_PKT_LEN,</div><div class='add'>+			     cm109_urb_ctl_callback, dev);</div><div class='add'>+	dev-&gt;urb_ctl-&gt;setup_dma = dev-&gt;ctl_req_dma;</div><div class='add'>+	dev-&gt;urb_ctl-&gt;transfer_dma = dev-&gt;ctl_dma;</div><div class='add'>+	dev-&gt;urb_ctl-&gt;transfer_flags |= URB_NO_SETUP_DMA_MAP |</div><div class='add'>+					URB_NO_TRANSFER_DMA_MAP;</div><div class='add'>+	dev-&gt;urb_ctl-&gt;dev = udev;</div><div class='add'>+</div><div class='add'>+	/* find out the physical bus location */</div><div class='add'>+	usb_make_path(udev, dev-&gt;phys, sizeof(dev-&gt;phys));</div><div class='add'>+	strlcat(dev-&gt;phys, "/input0", sizeof(dev-&gt;phys));</div><div class='add'>+</div><div class='add'>+	/* register settings for the input device */</div><div class='add'>+	input_dev-&gt;name = nfo-&gt;name;</div><div class='add'>+	input_dev-&gt;phys = dev-&gt;phys;</div><div class='add'>+	usb_to_input_id(udev, &amp;input_dev-&gt;id);</div><div class='add'>+	input_dev-&gt;dev.parent = &amp;intf-&gt;dev;</div><div class='add'>+</div><div class='add'>+	input_set_drvdata(input_dev, dev);</div><div class='add'>+	input_dev-&gt;open = cm109_input_open;</div><div class='add'>+	input_dev-&gt;close = cm109_input_close;</div><div class='add'>+	input_dev-&gt;event = cm109_input_ev;</div><div class='add'>+</div><div class='add'>+	input_dev-&gt;keycode = dev-&gt;keymap;</div><div class='add'>+	input_dev-&gt;keycodesize = sizeof(unsigned char);</div><div class='add'>+	input_dev-&gt;keycodemax = ARRAY_SIZE(dev-&gt;keymap);</div><div class='add'>+</div><div class='add'>+	input_dev-&gt;evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_SND);</div><div class='add'>+	input_dev-&gt;sndbit[0] = BIT_MASK(SND_BELL) | BIT_MASK(SND_TONE);</div><div class='add'>+</div><div class='add'>+	/* register available key events */</div><div class='add'>+	for (i = 0; i &lt; KEYMAP_SIZE; i++) {</div><div class='add'>+		unsigned short k = keymap(i);</div><div class='add'>+		dev-&gt;keymap[i] = k;</div><div class='add'>+		__set_bit(k, input_dev-&gt;keybit);</div><div class='add'>+	}</div><div class='add'>+	__clear_bit(KEY_RESERVED, input_dev-&gt;keybit);</div><div class='add'>+</div><div class='add'>+	error = input_register_device(dev-&gt;idev);</div><div class='add'>+	if (error)</div><div class='add'>+		goto err_out;</div><div class='add'>+</div><div class='add'>+	usb_set_intfdata(intf, dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+ err_out:</div><div class='add'>+	input_free_device(input_dev);</div><div class='add'>+	cm109_usb_cleanup(dev);</div><div class='add'>+	return error;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cm109_usb_suspend(struct usb_interface *intf, pm_message_t message)</div><div class='add'>+{</div><div class='add'>+	struct cm109_dev *dev = usb_get_intfdata(intf);</div><div class='add'>+</div><div class='add'>+	dev_info(&amp;intf-&gt;dev, "cm109: usb_suspend (event=%d)\n", message.event);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;pm_mutex);</div><div class='add'>+	cm109_stop_traffic(dev);</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;pm_mutex);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cm109_usb_resume(struct usb_interface *intf)</div><div class='add'>+{</div><div class='add'>+	struct cm109_dev *dev = usb_get_intfdata(intf);</div><div class='add'>+</div><div class='add'>+	dev_info(&amp;intf-&gt;dev, "cm109: usb_resume\n");</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;pm_mutex);</div><div class='add'>+	cm109_restore_state(dev);</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;pm_mutex);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cm109_usb_pre_reset(struct usb_interface *intf)</div><div class='add'>+{</div><div class='add'>+	struct cm109_dev *dev = usb_get_intfdata(intf);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;pm_mutex);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Make sure input events don't try to toggle buzzer</div><div class='add'>+	 * while we are resetting</div><div class='add'>+	 */</div><div class='add'>+	dev-&gt;resetting = 1;</div><div class='add'>+	smp_wmb();</div><div class='add'>+</div><div class='add'>+	cm109_stop_traffic(dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cm109_usb_post_reset(struct usb_interface *intf)</div><div class='add'>+{</div><div class='add'>+	struct cm109_dev *dev = usb_get_intfdata(intf);</div><div class='add'>+</div><div class='add'>+	dev-&gt;resetting = 0;</div><div class='add'>+	smp_wmb();</div><div class='add'>+</div><div class='add'>+	cm109_restore_state(dev);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;pm_mutex);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct usb_driver cm109_driver = {</div><div class='add'>+	.name		= "cm109",</div><div class='add'>+	.probe		= cm109_usb_probe,</div><div class='add'>+	.disconnect	= cm109_usb_disconnect,</div><div class='add'>+	.suspend	= cm109_usb_suspend,</div><div class='add'>+	.resume		= cm109_usb_resume,</div><div class='add'>+	.reset_resume	= cm109_usb_resume,</div><div class='add'>+	.pre_reset	= cm109_usb_pre_reset,</div><div class='add'>+	.post_reset	= cm109_usb_post_reset,</div><div class='add'>+	.id_table	= cm109_usb_table,</div><div class='add'>+	.supports_autosuspend = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init cm109_select_keymap(void)</div><div class='add'>+{</div><div class='add'>+	/* Load the phone keymap */</div><div class='add'>+	if (!strcasecmp(phone, "kip1000")) {</div><div class='add'>+		keymap = keymap_kip1000;</div><div class='add'>+		printk(KERN_INFO KBUILD_MODNAME ": "</div><div class='add'>+			"Keymap for Komunikate KIP1000 phone loaded\n");</div><div class='add'>+	} else if (!strcasecmp(phone, "gtalk")) {</div><div class='add'>+		keymap = keymap_gtalk;</div><div class='add'>+		printk(KERN_INFO KBUILD_MODNAME ": "</div><div class='add'>+			"Keymap for Genius G-talk phone loaded\n");</div><div class='add'>+	} else if (!strcasecmp(phone, "usbph01")) {</div><div class='add'>+		keymap = keymap_usbph01;</div><div class='add'>+		printk(KERN_INFO KBUILD_MODNAME ": "</div><div class='add'>+			"Keymap for Allied-Telesis Corega USBPH01 phone loaded\n");</div><div class='add'>+	} else {</div><div class='add'>+		printk(KERN_ERR KBUILD_MODNAME ": "</div><div class='add'>+			"Unsupported phone: %s\n", phone);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init cm109_init(void)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = cm109_select_keymap();</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = usb_register(&amp;cm109_driver);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO KBUILD_MODNAME ": "</div><div class='add'>+		DRIVER_DESC ": " DRIVER_VERSION " (C) " DRIVER_AUTHOR "\n");</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit cm109_exit(void)</div><div class='add'>+{</div><div class='add'>+	usb_deregister(&amp;cm109_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(cm109_init);</div><div class='add'>+module_exit(cm109_exit);</div><div class='add'>+</div><div class='add'>+MODULE_DEVICE_TABLE(usb, cm109_usb_table);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR(DRIVER_AUTHOR);</div><div class='add'>+MODULE_DESCRIPTION(DRIVER_DESC);</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/input/misc/hp_sdc_rtc.c b/drivers/input/misc/hp_sdc_rtc.c<br/>index daa9d4220331..82ec6b1b6467 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/misc/hp_sdc_rtc.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/input/misc/hp_sdc_rtc.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/misc/hp_sdc_rtc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/misc/hp_sdc_rtc.c</a></div><div class='hunk'>@@ -458,35 +458,35 @@ static int hp_sdc_rtc_proc_output (char *buf)</div><div class='ctx'> 		p += sprintf(p, "i8042 rtc\t: READ FAILED!\n");</div><div class='ctx'> 	} else {</div><div class='ctx'> 		p += sprintf(p, "i8042 rtc\t: %ld.%02d seconds\n", </div><div class='del'>-			     tv.tv_sec, tv.tv_usec/1000);</div><div class='add'>+			     tv.tv_sec, (int)tv.tv_usec/1000);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (hp_sdc_rtc_read_fhs(&amp;tv)) {</div><div class='ctx'> 		p += sprintf(p, "handshake\t: READ FAILED!\n");</div><div class='ctx'> 	} else {</div><div class='ctx'>         	p += sprintf(p, "handshake\t: %ld.%02d seconds\n", </div><div class='del'>-			     tv.tv_sec, tv.tv_usec/1000);</div><div class='add'>+			     tv.tv_sec, (int)tv.tv_usec/1000);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (hp_sdc_rtc_read_mt(&amp;tv)) {</div><div class='ctx'> 		p += sprintf(p, "alarm\t\t: READ FAILED!\n");</div><div class='ctx'> 	} else {</div><div class='ctx'> 		p += sprintf(p, "alarm\t\t: %ld.%02d seconds\n", </div><div class='del'>-			     tv.tv_sec, tv.tv_usec/1000);</div><div class='add'>+			     tv.tv_sec, (int)tv.tv_usec/1000);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (hp_sdc_rtc_read_dt(&amp;tv)) {</div><div class='ctx'> 		p += sprintf(p, "delay\t\t: READ FAILED!\n");</div><div class='ctx'> 	} else {</div><div class='ctx'> 		p += sprintf(p, "delay\t\t: %ld.%02d seconds\n", </div><div class='del'>-			     tv.tv_sec, tv.tv_usec/1000);</div><div class='add'>+			     tv.tv_sec, (int)tv.tv_usec/1000);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (hp_sdc_rtc_read_ct(&amp;tv)) {</div><div class='ctx'> 		p += sprintf(p, "periodic\t: READ FAILED!\n");</div><div class='ctx'> 	} else {</div><div class='ctx'> 		p += sprintf(p, "periodic\t: %ld.%02d seconds\n", </div><div class='del'>-			     tv.tv_sec, tv.tv_usec/1000);</div><div class='add'>+			     tv.tv_sec, (int)tv.tv_usec/1000);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'>         p += sprintf(p,</div><div class='head'>diff --git a/drivers/input/misc/sparcspkr.c b/drivers/input/misc/sparcspkr.c<br/>index d8765cc93d27..c4f42311fdec 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/misc/sparcspkr.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/input/misc/sparcspkr.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/misc/sparcspkr.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/misc/sparcspkr.c</a></div><div class='hunk'>@@ -249,7 +249,7 @@ static int bbc_remove(struct of_device *op)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct of_device_id bbc_beep_match[] = {</div><div class='add'>+static const struct of_device_id bbc_beep_match[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.name = "beep",</div><div class='ctx'> 		.compatible = "SUNW,bbc-beep",</div><div class='hunk'>@@ -328,7 +328,7 @@ static int grover_remove(struct of_device *op)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct of_device_id grover_beep_match[] = {</div><div class='add'>+static const struct of_device_id grover_beep_match[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.name = "beep",</div><div class='ctx'> 		.compatible = "SUNW,smbus-beep",</div><div class='head'>diff --git a/drivers/input/misc/wistron_btns.c b/drivers/input/misc/wistron_btns.c<br/>index fe268be3293b..7c8957dd22c0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/misc/wistron_btns.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/input/misc/wistron_btns.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/misc/wistron_btns.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/misc/wistron_btns.c</a></div><div class='hunk'>@@ -277,6 +277,16 @@ static struct key_entry keymap_fs_amilo_pro_v2000[] __initdata = {</div><div class='ctx'> 	{ KE_END,  0 }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct key_entry keymap_fs_amilo_pro_v3505[] __initdata = {</div><div class='add'>+	{ KE_KEY,       0x01, {KEY_HELP} },          /* Fn+F1 */</div><div class='add'>+	{ KE_KEY,       0x06, {KEY_DISPLAYTOGGLE} }, /* Fn+F4 */</div><div class='add'>+	{ KE_BLUETOOTH, 0x30 },                      /* Fn+F10 */</div><div class='add'>+	{ KE_KEY,       0x31, {KEY_MAIL} },          /* mail button */</div><div class='add'>+	{ KE_KEY,       0x36, {KEY_WWW} },           /* www button */</div><div class='add'>+	{ KE_WIFI,      0x78 },                      /* satelite dish button */</div><div class='add'>+	{ KE_END,       0 }</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct key_entry keymap_fujitsu_n3510[] __initdata = {</div><div class='ctx'> 	{ KE_KEY, 0x11, {KEY_PROG1} },</div><div class='ctx'> 	{ KE_KEY, 0x12, {KEY_PROG2} },</div><div class='hunk'>@@ -618,6 +628,15 @@ static struct dmi_system_id dmi_ids[] __initdata = {</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.callback = dmi_matched,</div><div class='add'>+		.ident = "Fujitsu-Siemens Amilo Pro Edition V3505",</div><div class='add'>+		.matches = {</div><div class='add'>+			DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),</div><div class='add'>+			DMI_MATCH(DMI_PRODUCT_NAME, "AMILO Pro Edition V3505"),</div><div class='add'>+		},</div><div class='add'>+		.driver_data = keymap_fs_amilo_pro_v3505</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.callback = dmi_matched,</div><div class='ctx'> 		.ident = "Fujitsu-Siemens Amilo M7400",</div><div class='ctx'> 		.matches = {</div><div class='ctx'> 			DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),</div><div class='head'>diff --git a/drivers/input/misc/yealink.c b/drivers/input/misc/yealink.c<br/>index facefd3dba29..93a22ac0f88c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/misc/yealink.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/input/misc/yealink.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/misc/yealink.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/misc/yealink.c</a></div><div class='hunk'>@@ -52,8 +52,8 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/rwsem.h&gt;</div><div class='ctx'> #include &lt;linux/usb/input.h&gt;</div><div class='add'>+#include &lt;linux/map_to_7segment.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "map_to_7segment.h"</div><div class='ctx'> #include "yealink.h"</div><div class='ctx'> </div><div class='ctx'> #define DRIVER_VERSION "yld-20051230"</div><div class='hunk'>@@ -999,7 +999,8 @@ static int __init yealink_dev_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = usb_register(&amp;yealink_driver);</div><div class='ctx'> 	if (ret == 0)</div><div class='del'>-		info(DRIVER_DESC ":" DRIVER_VERSION);</div><div class='add'>+		printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"</div><div class='add'>+		       DRIVER_DESC "\n");</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/input/mouse/Kconfig b/drivers/input/mouse/Kconfig<br/>index f996546fc443..f488b6852baf 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/mouse/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/input/mouse/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/mouse/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/mouse/Kconfig</a></div><div class='hunk'>@@ -96,6 +96,16 @@ config MOUSE_PS2_TOUCHKIT</div><div class='ctx'> </div><div class='ctx'> 	  If unsure, say N.</div><div class='ctx'> </div><div class='add'>+config MOUSE_PS2_OLPC</div><div class='add'>+	bool "OLPC PS/2 mouse protocol extension"</div><div class='add'>+	depends on MOUSE_PS2 &amp;&amp; OLPC</div><div class='add'>+	help</div><div class='add'>+	  Say Y here if you have an OLPC XO-1 laptop (with built-in</div><div class='add'>+	  PS/2 touchpad/tablet device).  The manufacturer calls the</div><div class='add'>+	  touchpad an HGPK.</div><div class='add'>+</div><div class='add'>+	  If unsure, say N.</div><div class='add'>+</div><div class='ctx'> config MOUSE_SERIAL</div><div class='ctx'> 	tristate "Serial mouse"</div><div class='ctx'> 	select SERIO</div><div class='head'>diff --git a/drivers/input/mouse/Makefile b/drivers/input/mouse/Makefile<br/>index d4d202516090..8e6e69097801 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/mouse/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/input/mouse/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/mouse/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/mouse/Makefile</a></div><div class='hunk'>@@ -21,6 +21,7 @@ obj-$(CONFIG_MOUSE_GPIO)	+= gpio_mouse.o</div><div class='ctx'> psmouse-objs := psmouse-base.o synaptics.o</div><div class='ctx'> </div><div class='ctx'> psmouse-$(CONFIG_MOUSE_PS2_ALPS)	+= alps.o</div><div class='add'>+psmouse-$(CONFIG_MOUSE_PS2_OLPC)	+= hgpk.o</div><div class='ctx'> psmouse-$(CONFIG_MOUSE_PS2_LOGIPS2PP)	+= logips2pp.o</div><div class='ctx'> psmouse-$(CONFIG_MOUSE_PS2_LIFEBOOK)	+= lifebook.o</div><div class='ctx'> psmouse-$(CONFIG_MOUSE_PS2_TRACKPOINT)	+= trackpoint.o</div><div class='head'>diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c<br/>index 385e32bcf6a6..cbedf957cc58 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/mouse/alps.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/input/mouse/alps.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/mouse/alps.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/mouse/alps.c</a></div><div class='hunk'>@@ -54,6 +54,7 @@ static const struct alps_model_info alps_model_data[] = {</div><div class='ctx'> 	{ { 0x20, 0x02, 0x0e },	0xf8, 0xf8, ALPS_PASS | ALPS_DUALPOINT }, /* XXX */</div><div class='ctx'> 	{ { 0x22, 0x02, 0x0a },	0xf8, 0xf8, ALPS_PASS | ALPS_DUALPOINT },</div><div class='ctx'> 	{ { 0x22, 0x02, 0x14 }, 0xff, 0xff, ALPS_PASS | ALPS_DUALPOINT }, /* Dell Latitude D600 */</div><div class='add'>+	{ { 0x62, 0x02, 0x14 }, 0xcf, 0xcf, ALPS_PASS | ALPS_DUALPOINT }, /* Dell Latitude E6500 */</div><div class='ctx'> 	{ { 0x73, 0x02, 0x50 }, 0xcf, 0xcf, ALPS_FW_BK_1 } /* Dell Vostro 1400 */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/input/mouse/appletouch.c b/drivers/input/mouse/appletouch.c<br/>index 1f41ae94f26b..079816e6b23b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/mouse/appletouch.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/input/mouse/appletouch.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/mouse/appletouch.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/mouse/appletouch.c</a></div><div class='hunk'>@@ -136,12 +136,28 @@ MODULE_DEVICE_TABLE(usb, atp_table);</div><div class='ctx'> #define ATP_GEYSER_MODE_REQUEST_INDEX		0</div><div class='ctx'> #define ATP_GEYSER_MODE_VENDOR_VALUE		0x04</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * enum atp_status_bits - status bit meanings</div><div class='add'>+ *</div><div class='add'>+ * These constants represent the meaning of the status bits.</div><div class='add'>+ * (only Geyser 3/4)</div><div class='add'>+ *</div><div class='add'>+ * @ATP_STATUS_BUTTON: The button was pressed</div><div class='add'>+ * @ATP_STATUS_BASE_UPDATE: Update of the base values (untouched pad)</div><div class='add'>+ * @ATP_STATUS_FROM_RESET: Reset previously performed</div><div class='add'>+ */</div><div class='add'>+enum atp_status_bits {</div><div class='add'>+	ATP_STATUS_BUTTON	= BIT(0),</div><div class='add'>+	ATP_STATUS_BASE_UPDATE	= BIT(2),</div><div class='add'>+	ATP_STATUS_FROM_RESET	= BIT(4),</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* Structure to hold all of our device specific stuff */</div><div class='ctx'> struct atp {</div><div class='ctx'> 	char			phys[64];</div><div class='ctx'> 	struct usb_device	*udev;		/* usb device */</div><div class='ctx'> 	struct urb		*urb;		/* usb request block */</div><div class='del'>-	signed char		*data;		/* transferred data */</div><div class='add'>+	u8			*data;		/* transferred data */</div><div class='ctx'> 	struct input_dev	*input;		/* input dev */</div><div class='ctx'> 	enum atp_touchpad_type	type;		/* type of touchpad */</div><div class='ctx'> 	bool			open;</div><div class='hunk'>@@ -251,8 +267,6 @@ static void atp_reinit(struct work_struct *work)</div><div class='ctx'> 	int retval;</div><div class='ctx'> </div><div class='ctx'> 	dprintk("appletouch: putting appletouch to sleep (reinit)\n");</div><div class='del'>-	dev-&gt;idlecount = 0;</div><div class='del'>-</div><div class='ctx'> 	atp_geyser_init(udev);</div><div class='ctx'> </div><div class='ctx'> 	retval = usb_submit_urb(dev-&gt;urb, GFP_ATOMIC);</div><div class='hunk'>@@ -327,11 +341,14 @@ static inline void atp_report_fingers(struct input_dev *input, int fingers)</div><div class='ctx'> 	input_report_key(input, BTN_TOOL_TRIPLETAP, fingers &gt; 2);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void atp_complete(struct urb *urb)</div><div class='add'>+/* Check URB status and for correct length of data package */</div><div class='add'>+</div><div class='add'>+#define ATP_URB_STATUS_SUCCESS		0</div><div class='add'>+#define ATP_URB_STATUS_ERROR		1</div><div class='add'>+#define ATP_URB_STATUS_ERROR_FATAL	2</div><div class='add'>+</div><div class='add'>+static int atp_status_check(struct urb *urb)</div><div class='ctx'> {</div><div class='del'>-	int x, y, x_z, y_z, x_f, y_f;</div><div class='del'>-	int retval, i, j;</div><div class='del'>-	int key;</div><div class='ctx'> 	struct atp *dev = urb-&gt;context;</div><div class='ctx'> </div><div class='ctx'> 	switch (urb-&gt;status) {</div><div class='hunk'>@@ -351,11 +368,12 @@ static void atp_complete(struct urb *urb)</div><div class='ctx'> 		/* This urb is terminated, clean up */</div><div class='ctx'> 		dbg("atp_complete: urb shutting down with status: %d",</div><div class='ctx'> 		    urb-&gt;status);</div><div class='del'>-		return;</div><div class='add'>+		return ATP_URB_STATUS_ERROR_FATAL;</div><div class='add'>+</div><div class='ctx'> 	default:</div><div class='ctx'> 		dbg("atp_complete: nonzero urb status received: %d",</div><div class='ctx'> 		    urb-&gt;status);</div><div class='del'>-		goto exit;</div><div class='add'>+		return ATP_URB_STATUS_ERROR;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* drop incomplete datasets */</div><div class='hunk'>@@ -363,30 +381,33 @@ static void atp_complete(struct urb *urb)</div><div class='ctx'> 		dprintk("appletouch: incomplete data package"</div><div class='ctx'> 			" (first byte: %d, length: %d).\n",</div><div class='ctx'> 			dev-&gt;data[0], dev-&gt;urb-&gt;actual_length);</div><div class='del'>-		goto exit;</div><div class='add'>+		return ATP_URB_STATUS_ERROR;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* reorder the sensors values */</div><div class='del'>-	if (dev-&gt;type == ATP_GEYSER3 || dev-&gt;type == ATP_GEYSER4) {</div><div class='del'>-		memset(dev-&gt;xy_cur, 0, sizeof(dev-&gt;xy_cur));</div><div class='add'>+	return ATP_URB_STATUS_SUCCESS;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * The values are laid out like this:</div><div class='del'>-		 * -, Y1, Y2, -, Y3, Y4, -, ..., -, X1, X2, -, X3, X4, ...</div><div class='del'>-		 * '-' is an unused value.</div><div class='del'>-		 */</div><div class='add'>+/*</div><div class='add'>+ * USB interrupt callback functions</div><div class='add'>+ */</div><div class='ctx'> </div><div class='del'>-		/* read X values */</div><div class='del'>-		for (i = 0, j = 19; i &lt; 20; i += 2, j += 3) {</div><div class='del'>-			dev-&gt;xy_cur[i] = dev-&gt;data[j + 1];</div><div class='del'>-			dev-&gt;xy_cur[i + 1] = dev-&gt;data[j + 2];</div><div class='del'>-		}</div><div class='del'>-		/* read Y values */</div><div class='del'>-		for (i = 0, j = 1; i &lt; 9; i += 2, j += 3) {</div><div class='del'>-			dev-&gt;xy_cur[ATP_XSENSORS + i] = dev-&gt;data[j + 1];</div><div class='del'>-			dev-&gt;xy_cur[ATP_XSENSORS + i + 1] = dev-&gt;data[j + 2];</div><div class='del'>-		}</div><div class='del'>-	} else if (dev-&gt;type == ATP_GEYSER2) {</div><div class='add'>+/* Interrupt function for older touchpads: FOUNTAIN/GEYSER1/GEYSER2 */</div><div class='add'>+</div><div class='add'>+static void atp_complete_geyser_1_2(struct urb *urb)</div><div class='add'>+{</div><div class='add'>+	int x, y, x_z, y_z, x_f, y_f;</div><div class='add'>+	int retval, i, j;</div><div class='add'>+	int key;</div><div class='add'>+	struct atp *dev = urb-&gt;context;</div><div class='add'>+	int status = atp_status_check(urb);</div><div class='add'>+</div><div class='add'>+	if (status == ATP_URB_STATUS_ERROR_FATAL)</div><div class='add'>+		return;</div><div class='add'>+	else if (status == ATP_URB_STATUS_ERROR)</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	/* reorder the sensors values */</div><div class='add'>+	if (dev-&gt;type == ATP_GEYSER2) {</div><div class='ctx'> 		memset(dev-&gt;xy_cur, 0, sizeof(dev-&gt;xy_cur));</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='hunk'>@@ -427,34 +448,40 @@ static void atp_complete(struct urb *urb)</div><div class='ctx'> 		/* first sample */</div><div class='ctx'> 		dev-&gt;valid = true;</div><div class='ctx'> 		dev-&gt;x_old = dev-&gt;y_old = -1;</div><div class='add'>+</div><div class='add'>+		/* Store first sample */</div><div class='ctx'> 		memcpy(dev-&gt;xy_old, dev-&gt;xy_cur, sizeof(dev-&gt;xy_old));</div><div class='ctx'> </div><div class='del'>-		if (dev-&gt;size_detect_done ||</div><div class='del'>-		    dev-&gt;type == ATP_GEYSER3) /* No 17" Macbooks (yet) */</div><div class='del'>-			goto exit;</div><div class='add'>+		/* Perform size detection, if not done already */</div><div class='add'>+		if (!dev-&gt;size_detect_done) {</div><div class='add'>+</div><div class='add'>+			/* 17" Powerbooks have extra X sensors */</div><div class='add'>+			for (i = (dev-&gt;type == ATP_GEYSER2 ? 15 : 16);</div><div class='add'>+			     i &lt; ATP_XSENSORS; i++) {</div><div class='add'>+				if (!dev-&gt;xy_cur[i])</div><div class='add'>+					continue;</div><div class='add'>+</div><div class='add'>+				printk(KERN_INFO</div><div class='add'>+					"appletouch: 17\" model detected.\n");</div><div class='add'>+</div><div class='add'>+				if (dev-&gt;type == ATP_GEYSER2)</div><div class='add'>+					input_set_abs_params(dev-&gt;input, ABS_X,</div><div class='add'>+							     0,</div><div class='add'>+							     (20 - 1) *</div><div class='add'>+							     ATP_XFACT - 1,</div><div class='add'>+							     ATP_FUZZ, 0);</div><div class='add'>+				else</div><div class='add'>+					input_set_abs_params(dev-&gt;input, ABS_X,</div><div class='add'>+							     0,</div><div class='add'>+							     (26 - 1) *</div><div class='add'>+							     ATP_XFACT - 1,</div><div class='add'>+							     ATP_FUZZ, 0);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='ctx'> </div><div class='del'>-		/* 17" Powerbooks have extra X sensors */</div><div class='del'>-		for (i = (dev-&gt;type == ATP_GEYSER2 ? 15 : 16);</div><div class='del'>-		     i &lt; ATP_XSENSORS; i++) {</div><div class='del'>-			if (!dev-&gt;xy_cur[i])</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			printk(KERN_INFO "appletouch: 17\" model detected.\n");</div><div class='del'>-			if (dev-&gt;type == ATP_GEYSER2)</div><div class='del'>-				input_set_abs_params(dev-&gt;input, ABS_X, 0,</div><div class='del'>-						     (20 - 1) *</div><div class='del'>-						     ATP_XFACT - 1,</div><div class='del'>-						     ATP_FUZZ, 0);</div><div class='del'>-			else</div><div class='del'>-				input_set_abs_params(dev-&gt;input, ABS_X, 0,</div><div class='del'>-						     (ATP_XSENSORS - 1) *</div><div class='del'>-						     ATP_XFACT - 1,</div><div class='del'>-						     ATP_FUZZ, 0);</div><div class='del'>-			break;</div><div class='add'>+			dev-&gt;size_detect_done = 1;</div><div class='add'>+			goto exit;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		dev-&gt;size_detect_done = 1;</div><div class='del'>-		goto exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ATP_XSENSORS + ATP_YSENSORS; i++) {</div><div class='hunk'>@@ -475,7 +502,118 @@ static void atp_complete(struct urb *urb)</div><div class='ctx'> 			      ATP_XFACT, &amp;x_z, &amp;x_f);</div><div class='ctx'> 	y = atp_calculate_abs(dev-&gt;xy_acc + ATP_XSENSORS, ATP_YSENSORS,</div><div class='ctx'> 			      ATP_YFACT, &amp;y_z, &amp;y_f);</div><div class='del'>-	key = dev-&gt;data[dev-&gt;datalen - 1] &amp; 1;</div><div class='add'>+	key = dev-&gt;data[dev-&gt;datalen - 1] &amp; ATP_STATUS_BUTTON;</div><div class='add'>+</div><div class='add'>+	if (x &amp;&amp; y) {</div><div class='add'>+		if (dev-&gt;x_old != -1) {</div><div class='add'>+			x = (dev-&gt;x_old * 3 + x) &gt;&gt; 2;</div><div class='add'>+			y = (dev-&gt;y_old * 3 + y) &gt;&gt; 2;</div><div class='add'>+			dev-&gt;x_old = x;</div><div class='add'>+			dev-&gt;y_old = y;</div><div class='add'>+</div><div class='add'>+			if (debug &gt; 1)</div><div class='add'>+				printk(KERN_DEBUG "appletouch: "</div><div class='add'>+					"X: %3d Y: %3d Xz: %3d Yz: %3d\n",</div><div class='add'>+					x, y, x_z, y_z);</div><div class='add'>+</div><div class='add'>+			input_report_key(dev-&gt;input, BTN_TOUCH, 1);</div><div class='add'>+			input_report_abs(dev-&gt;input, ABS_X, x);</div><div class='add'>+			input_report_abs(dev-&gt;input, ABS_Y, y);</div><div class='add'>+			input_report_abs(dev-&gt;input, ABS_PRESSURE,</div><div class='add'>+					 min(ATP_PRESSURE, x_z + y_z));</div><div class='add'>+			atp_report_fingers(dev-&gt;input, max(x_f, y_f));</div><div class='add'>+		}</div><div class='add'>+		dev-&gt;x_old = x;</div><div class='add'>+		dev-&gt;y_old = y;</div><div class='add'>+</div><div class='add'>+	} else if (!x &amp;&amp; !y) {</div><div class='add'>+</div><div class='add'>+		dev-&gt;x_old = dev-&gt;y_old = -1;</div><div class='add'>+		input_report_key(dev-&gt;input, BTN_TOUCH, 0);</div><div class='add'>+		input_report_abs(dev-&gt;input, ABS_PRESSURE, 0);</div><div class='add'>+		atp_report_fingers(dev-&gt;input, 0);</div><div class='add'>+</div><div class='add'>+		/* reset the accumulator on release */</div><div class='add'>+		memset(dev-&gt;xy_acc, 0, sizeof(dev-&gt;xy_acc));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	input_report_key(dev-&gt;input, BTN_LEFT, key);</div><div class='add'>+	input_sync(dev-&gt;input);</div><div class='add'>+</div><div class='add'>+ exit:</div><div class='add'>+	retval = usb_submit_urb(dev-&gt;urb, GFP_ATOMIC);</div><div class='add'>+	if (retval)</div><div class='add'>+		err("atp_complete: usb_submit_urb failed with result %d",</div><div class='add'>+		    retval);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Interrupt function for older touchpads: GEYSER3/GEYSER4 */</div><div class='add'>+</div><div class='add'>+static void atp_complete_geyser_3_4(struct urb *urb)</div><div class='add'>+{</div><div class='add'>+	int x, y, x_z, y_z, x_f, y_f;</div><div class='add'>+	int retval, i, j;</div><div class='add'>+	int key;</div><div class='add'>+	struct atp *dev = urb-&gt;context;</div><div class='add'>+	int status = atp_status_check(urb);</div><div class='add'>+</div><div class='add'>+	if (status == ATP_URB_STATUS_ERROR_FATAL)</div><div class='add'>+		return;</div><div class='add'>+	else if (status == ATP_URB_STATUS_ERROR)</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	/* Reorder the sensors values:</div><div class='add'>+	 *</div><div class='add'>+	 * The values are laid out like this:</div><div class='add'>+	 * -, Y1, Y2, -, Y3, Y4, -, ..., -, X1, X2, -, X3, X4, ...</div><div class='add'>+	 * '-' is an unused value.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* read X values */</div><div class='add'>+	for (i = 0, j = 19; i &lt; 20; i += 2, j += 3) {</div><div class='add'>+		dev-&gt;xy_cur[i] = dev-&gt;data[j + 1];</div><div class='add'>+		dev-&gt;xy_cur[i + 1] = dev-&gt;data[j + 2];</div><div class='add'>+	}</div><div class='add'>+	/* read Y values */</div><div class='add'>+	for (i = 0, j = 1; i &lt; 9; i += 2, j += 3) {</div><div class='add'>+		dev-&gt;xy_cur[ATP_XSENSORS + i] = dev-&gt;data[j + 1];</div><div class='add'>+		dev-&gt;xy_cur[ATP_XSENSORS + i + 1] = dev-&gt;data[j + 2];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dbg_dump("sample", dev-&gt;xy_cur);</div><div class='add'>+</div><div class='add'>+	/* Just update the base values (i.e. touchpad in untouched state) */</div><div class='add'>+	if (dev-&gt;data[dev-&gt;datalen - 1] &amp; ATP_STATUS_BASE_UPDATE) {</div><div class='add'>+</div><div class='add'>+		dprintk(KERN_DEBUG "appletouch: updated base values\n");</div><div class='add'>+</div><div class='add'>+		memcpy(dev-&gt;xy_old, dev-&gt;xy_cur, sizeof(dev-&gt;xy_old));</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ATP_XSENSORS + ATP_YSENSORS; i++) {</div><div class='add'>+		/* calculate the change */</div><div class='add'>+		dev-&gt;xy_acc[i] = dev-&gt;xy_cur[i] - dev-&gt;xy_old[i];</div><div class='add'>+</div><div class='add'>+		/* this is a round-robin value, so couple with that */</div><div class='add'>+		if (dev-&gt;xy_acc[i] &gt; 127)</div><div class='add'>+			dev-&gt;xy_acc[i] -= 256;</div><div class='add'>+</div><div class='add'>+		if (dev-&gt;xy_acc[i] &lt; -127)</div><div class='add'>+			dev-&gt;xy_acc[i] += 256;</div><div class='add'>+</div><div class='add'>+		/* prevent down drifting */</div><div class='add'>+		if (dev-&gt;xy_acc[i] &lt; 0)</div><div class='add'>+			dev-&gt;xy_acc[i] = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dbg_dump("accumulator", dev-&gt;xy_acc);</div><div class='add'>+</div><div class='add'>+	x = atp_calculate_abs(dev-&gt;xy_acc, ATP_XSENSORS,</div><div class='add'>+			      ATP_XFACT, &amp;x_z, &amp;x_f);</div><div class='add'>+	y = atp_calculate_abs(dev-&gt;xy_acc + ATP_XSENSORS, ATP_YSENSORS,</div><div class='add'>+			      ATP_YFACT, &amp;y_z, &amp;y_f);</div><div class='add'>+	key = dev-&gt;data[dev-&gt;datalen - 1] &amp; ATP_STATUS_BUTTON;</div><div class='ctx'> </div><div class='ctx'> 	if (x &amp;&amp; y) {</div><div class='ctx'> 		if (dev-&gt;x_old != -1) {</div><div class='hunk'>@@ -514,28 +652,27 @@ static void atp_complete(struct urb *urb)</div><div class='ctx'> 	input_sync(dev-&gt;input);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Many Geysers will continue to send packets continually after</div><div class='add'>+	 * Geysers 3/4 will continue to send packets continually after</div><div class='ctx'> 	 * the first touch unless reinitialised. Do so if it's been</div><div class='ctx'> 	 * idle for a while in order to avoid waking the kernel up</div><div class='del'>-	 * several hundred times a second. Re-initialization does not</div><div class='del'>-	 * work on Fountain touchpads.</div><div class='add'>+	 * several hundred times a second.</div><div class='ctx'> 	 */</div><div class='del'>-	if (dev-&gt;type != ATP_FOUNTAIN) {</div><div class='del'>-		/*</div><div class='del'>-		 * Button must not be pressed when entering suspend,</div><div class='del'>-		 * otherwise we will never release the button.</div><div class='del'>-		 */</div><div class='del'>-		if (!x &amp;&amp; !y &amp;&amp; !key) {</div><div class='del'>-			dev-&gt;idlecount++;</div><div class='del'>-			if (dev-&gt;idlecount == 10) {</div><div class='del'>-				dev-&gt;valid = false;</div><div class='del'>-				schedule_work(&amp;dev-&gt;work);</div><div class='del'>-				/* Don't resubmit urb here, wait for reinit */</div><div class='del'>-				return;</div><div class='del'>-			}</div><div class='del'>-		} else</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Button must not be pressed when entering suspend,</div><div class='add'>+	 * otherwise we will never release the button.</div><div class='add'>+	 */</div><div class='add'>+	if (!x &amp;&amp; !y &amp;&amp; !key) {</div><div class='add'>+		dev-&gt;idlecount++;</div><div class='add'>+		if (dev-&gt;idlecount == 10) {</div><div class='add'>+			dev-&gt;x_old = dev-&gt;y_old = -1;</div><div class='ctx'> 			dev-&gt;idlecount = 0;</div><div class='del'>-	}</div><div class='add'>+			schedule_work(&amp;dev-&gt;work);</div><div class='add'>+			/* Don't resubmit urb here, wait for reinit */</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	} else</div><div class='add'>+		dev-&gt;idlecount = 0;</div><div class='ctx'> </div><div class='ctx'>  exit:</div><div class='ctx'> 	retval = usb_submit_urb(dev-&gt;urb, GFP_ATOMIC);</div><div class='hunk'>@@ -632,9 +769,19 @@ static int atp_probe(struct usb_interface *iface,</div><div class='ctx'> 	if (!dev-&gt;data)</div><div class='ctx'> 		goto err_free_urb;</div><div class='ctx'> </div><div class='del'>-	usb_fill_int_urb(dev-&gt;urb, udev,</div><div class='del'>-			 usb_rcvintpipe(udev, int_in_endpointAddr),</div><div class='del'>-			 dev-&gt;data, dev-&gt;datalen, atp_complete, dev, 1);</div><div class='add'>+	/* Select the USB complete (callback) function */</div><div class='add'>+	if (dev-&gt;type == ATP_FOUNTAIN ||</div><div class='add'>+	    dev-&gt;type == ATP_GEYSER1 ||</div><div class='add'>+	    dev-&gt;type == ATP_GEYSER2)</div><div class='add'>+		usb_fill_int_urb(dev-&gt;urb, udev,</div><div class='add'>+				 usb_rcvintpipe(udev, int_in_endpointAddr),</div><div class='add'>+				 dev-&gt;data, dev-&gt;datalen,</div><div class='add'>+				 atp_complete_geyser_1_2, dev, 1);</div><div class='add'>+	else</div><div class='add'>+		usb_fill_int_urb(dev-&gt;urb, udev,</div><div class='add'>+				 usb_rcvintpipe(udev, int_in_endpointAddr),</div><div class='add'>+				 dev-&gt;data, dev-&gt;datalen,</div><div class='add'>+				 atp_complete_geyser_3_4, dev, 1);</div><div class='ctx'> </div><div class='ctx'> 	error = atp_handle_geyser(dev);</div><div class='ctx'> 	if (error)</div><div class='hunk'>@@ -751,8 +898,6 @@ static int atp_suspend(struct usb_interface *iface, pm_message_t message)</div><div class='ctx'> 	struct atp *dev = usb_get_intfdata(iface);</div><div class='ctx'> </div><div class='ctx'> 	usb_kill_urb(dev-&gt;urb);</div><div class='del'>-	dev-&gt;valid = false;</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/input/mouse/hgpk.c b/drivers/input/mouse/hgpk.c<br/>new file mode 100644<br/>index 000000000000..e82d34201e97<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/mouse/hgpk.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/mouse/hgpk.c</a></div><div class='hunk'>@@ -0,0 +1,477 @@</div><div class='add'>+/*</div><div class='add'>+ * OLPC HGPK (XO-1) touchpad PS/2 mouse driver</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2006-2008 One Laptop Per Child</div><div class='add'>+ * Authors:</div><div class='add'>+ *   Zephaniah E. Hull</div><div class='add'>+ *   Andres Salomon &lt;dilinger@debian.org&gt;</div><div class='add'>+ *</div><div class='add'>+ * This driver is partly based on the ALPS driver, which is:</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2003 Neil Brown &lt;neilb@cse.unsw.edu.au&gt;</div><div class='add'>+ * Copyright (c) 2003-2005 Peter Osterlund &lt;petero2@telia.com&gt;</div><div class='add'>+ * Copyright (c) 2004 Dmitry Torokhov &lt;dtor@mail.ru&gt;</div><div class='add'>+ * Copyright (c) 2005 Vojtech Pavlik &lt;vojtech@suse.cz&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The spec from ALPS is available from</div><div class='add'>+ * &lt;http://wiki.laptop.org/go/Touch_Pad/Tablet&gt;.  It refers to this</div><div class='add'>+ * device as HGPK (Hybrid GS, PT, and Keymatrix).</div><div class='add'>+ *</div><div class='add'>+ * The earliest versions of the device had simultaneous reporting; that</div><div class='add'>+ * was removed.  After that, the device used the Advanced Mode GS/PT streaming</div><div class='add'>+ * stuff.  That turned out to be too buggy to support, so we've finally</div><div class='add'>+ * switched to Mouse Mode (which utilizes only the center 1/3 of the touchpad).</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define DEBUG</div><div class='add'>+#include &lt;linux/input.h&gt;</div><div class='add'>+#include &lt;linux/serio.h&gt;</div><div class='add'>+#include &lt;linux/libps2.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;asm/olpc.h&gt;</div><div class='add'>+</div><div class='add'>+#include "psmouse.h"</div><div class='add'>+#include "hgpk.h"</div><div class='add'>+</div><div class='add'>+static int tpdebug;</div><div class='add'>+module_param(tpdebug, int, 0644);</div><div class='add'>+MODULE_PARM_DESC(tpdebug, "enable debugging, dumping packets to KERN_DEBUG.");</div><div class='add'>+</div><div class='add'>+static int recalib_delta = 100;</div><div class='add'>+module_param(recalib_delta, int, 0644);</div><div class='add'>+MODULE_PARM_DESC(recalib_delta,</div><div class='add'>+	"packets containing a delta this large will cause a recalibration.");</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * When the touchpad gets ultra-sensitive, one can keep their finger 1/2"</div><div class='add'>+ * above the pad and still have it send packets.  This causes a jump cursor</div><div class='add'>+ * when one places their finger on the pad.  We can probably detect the</div><div class='add'>+ * jump as we see a large deltas (&gt;= 100px).  In mouse mode, I've been</div><div class='add'>+ * unable to even come close to 100px deltas during normal usage, so I think</div><div class='add'>+ * this threshold is safe.  If a large delta occurs, trigger a recalibration.</div><div class='add'>+ */</div><div class='add'>+static void hgpk_jumpy_hack(struct psmouse *psmouse, int x, int y)</div><div class='add'>+{</div><div class='add'>+	struct hgpk_data *priv = psmouse-&gt;private;</div><div class='add'>+</div><div class='add'>+	if (abs(x) &gt; recalib_delta || abs(y) &gt; recalib_delta) {</div><div class='add'>+		hgpk_err(psmouse, "&gt;%dpx jump detected (%d,%d)\n",</div><div class='add'>+				recalib_delta, x, y);</div><div class='add'>+		/* My car gets forty rods to the hogshead and that's the</div><div class='add'>+		 * way I likes it! */</div><div class='add'>+		psmouse_queue_work(psmouse, &amp;priv-&gt;recalib_wq,</div><div class='add'>+				msecs_to_jiffies(1000));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * We have no idea why this particular hardware bug occurs.  The touchpad</div><div class='add'>+ * will randomly start spewing packets without anything touching the</div><div class='add'>+ * pad.  This wouldn't necessarily be bad, but it's indicative of a</div><div class='add'>+ * severely miscalibrated pad; attempting to use the touchpad while it's</div><div class='add'>+ * spewing means the cursor will jump all over the place, and act "drunk".</div><div class='add'>+ *</div><div class='add'>+ * The packets that are spewed tend to all have deltas between -2 and 2, and</div><div class='add'>+ * the cursor will move around without really going very far.  It will</div><div class='add'>+ * tend to end up in the same location; if we tally up the changes over</div><div class='add'>+ * 100 packets, we end up w/ a final delta of close to 0.  This happens</div><div class='add'>+ * pretty regularly when the touchpad is spewing, and is pretty hard to</div><div class='add'>+ * manually trigger (at least for *my* fingers).  So, it makes a perfect</div><div class='add'>+ * scheme for detecting spews.</div><div class='add'>+ */</div><div class='add'>+static void hgpk_spewing_hack(struct psmouse *psmouse,</div><div class='add'>+			      int l, int r, int x, int y)</div><div class='add'>+{</div><div class='add'>+	struct hgpk_data *priv = psmouse-&gt;private;</div><div class='add'>+</div><div class='add'>+	/* ignore button press packets; many in a row could trigger</div><div class='add'>+	 * a false-positive! */</div><div class='add'>+	if (l || r)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	priv-&gt;x_tally += x;</div><div class='add'>+	priv-&gt;y_tally += y;</div><div class='add'>+</div><div class='add'>+	if (++priv-&gt;count &gt; 100) {</div><div class='add'>+		if (abs(priv-&gt;x_tally) &lt; 3 &amp;&amp; abs(priv-&gt;y_tally) &lt; 3) {</div><div class='add'>+			hgpk_dbg(psmouse, "packet spew detected (%d,%d)\n",</div><div class='add'>+				 priv-&gt;x_tally, priv-&gt;y_tally);</div><div class='add'>+			psmouse_queue_work(psmouse, &amp;priv-&gt;recalib_wq,</div><div class='add'>+					   msecs_to_jiffies(1000));</div><div class='add'>+		}</div><div class='add'>+		/* reset every 100 packets */</div><div class='add'>+		priv-&gt;count = 0;</div><div class='add'>+		priv-&gt;x_tally = 0;</div><div class='add'>+		priv-&gt;y_tally = 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * HGPK Mouse Mode format (standard mouse format, sans middle button)</div><div class='add'>+ *</div><div class='add'>+ * byte 0:	y-over	x-over	y-neg	x-neg	1	0	swr	swl</div><div class='add'>+ * byte 1:	x7	x6	x5	x4	x3	x2	x1	x0</div><div class='add'>+ * byte 2:	y7	y6	y5	y4	y3	y2	y1	y0</div><div class='add'>+ *</div><div class='add'>+ * swr/swl are the left/right buttons.</div><div class='add'>+ * x-neg/y-neg are the x and y delta negative bits</div><div class='add'>+ * x-over/y-over are the x and y overflow bits</div><div class='add'>+ */</div><div class='add'>+static int hgpk_validate_byte(unsigned char *packet)</div><div class='add'>+{</div><div class='add'>+	return (packet[0] &amp; 0x0C) == 0x08;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hgpk_process_packet(struct psmouse *psmouse)</div><div class='add'>+{</div><div class='add'>+	struct input_dev *dev = psmouse-&gt;dev;</div><div class='add'>+	unsigned char *packet = psmouse-&gt;packet;</div><div class='add'>+	int x, y, left, right;</div><div class='add'>+</div><div class='add'>+	left = packet[0] &amp; 1;</div><div class='add'>+	right = (packet[0] &gt;&gt; 1) &amp; 1;</div><div class='add'>+</div><div class='add'>+	x = packet[1] - ((packet[0] &lt;&lt; 4) &amp; 0x100);</div><div class='add'>+	y = ((packet[0] &lt;&lt; 3) &amp; 0x100) - packet[2];</div><div class='add'>+</div><div class='add'>+	hgpk_jumpy_hack(psmouse, x, y);</div><div class='add'>+	hgpk_spewing_hack(psmouse, left, right, x, y);</div><div class='add'>+</div><div class='add'>+	if (tpdebug)</div><div class='add'>+		hgpk_dbg(psmouse, "l=%d r=%d x=%d y=%d\n", left, right, x, y);</div><div class='add'>+</div><div class='add'>+	input_report_key(dev, BTN_LEFT, left);</div><div class='add'>+	input_report_key(dev, BTN_RIGHT, right);</div><div class='add'>+</div><div class='add'>+	input_report_rel(dev, REL_X, x);</div><div class='add'>+	input_report_rel(dev, REL_Y, y);</div><div class='add'>+</div><div class='add'>+	input_sync(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static psmouse_ret_t hgpk_process_byte(struct psmouse *psmouse)</div><div class='add'>+{</div><div class='add'>+	struct hgpk_data *priv = psmouse-&gt;private;</div><div class='add'>+</div><div class='add'>+	if (hgpk_validate_byte(psmouse-&gt;packet)) {</div><div class='add'>+		hgpk_dbg(psmouse, "%s: (%d) %02x %02x %02x\n",</div><div class='add'>+				__func__, psmouse-&gt;pktcnt, psmouse-&gt;packet[0],</div><div class='add'>+				psmouse-&gt;packet[1], psmouse-&gt;packet[2]);</div><div class='add'>+		return PSMOUSE_BAD_DATA;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (psmouse-&gt;pktcnt &gt;= psmouse-&gt;pktsize) {</div><div class='add'>+		hgpk_process_packet(psmouse);</div><div class='add'>+		return PSMOUSE_FULL_PACKET;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;recalib_window) {</div><div class='add'>+		if (time_before(jiffies, priv-&gt;recalib_window)) {</div><div class='add'>+			/*</div><div class='add'>+			 * ugh, got a packet inside our recalibration</div><div class='add'>+			 * window, schedule another recalibration.</div><div class='add'>+			 */</div><div class='add'>+			hgpk_dbg(psmouse,</div><div class='add'>+				 "packet inside calibration window, "</div><div class='add'>+				 "queueing another recalibration\n");</div><div class='add'>+			psmouse_queue_work(psmouse, &amp;priv-&gt;recalib_wq,</div><div class='add'>+					msecs_to_jiffies(1000));</div><div class='add'>+		}</div><div class='add'>+		priv-&gt;recalib_window = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return PSMOUSE_GOOD_DATA;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hgpk_force_recalibrate(struct psmouse *psmouse)</div><div class='add'>+{</div><div class='add'>+	struct ps2dev *ps2dev = &amp;psmouse-&gt;ps2dev;</div><div class='add'>+	struct hgpk_data *priv = psmouse-&gt;private;</div><div class='add'>+</div><div class='add'>+	/* C-series touchpads added the recalibrate command */</div><div class='add'>+	if (psmouse-&gt;model &lt; HGPK_MODEL_C)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* we don't want to race with the irq handler, nor with resyncs */</div><div class='add'>+	psmouse_set_state(psmouse, PSMOUSE_INITIALIZING);</div><div class='add'>+</div><div class='add'>+	/* start by resetting the device */</div><div class='add'>+	psmouse_reset(psmouse);</div><div class='add'>+</div><div class='add'>+	/* send the recalibrate request */</div><div class='add'>+	if (ps2_command(ps2dev, NULL, 0xf5) ||</div><div class='add'>+	    ps2_command(ps2dev, NULL, 0xf5) ||</div><div class='add'>+	    ps2_command(ps2dev, NULL, 0xe6) ||</div><div class='add'>+	    ps2_command(ps2dev, NULL, 0xf5)) {</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* according to ALPS, 150mS is required for recalibration */</div><div class='add'>+	msleep(150);</div><div class='add'>+</div><div class='add'>+	/* XXX: If a finger is down during this delay, recalibration will</div><div class='add'>+	 * detect capacitance incorrectly.  This is a hardware bug, and</div><div class='add'>+	 * we don't have a good way to deal with it.  The 2s window stuff</div><div class='add'>+	 * (below) is our best option for now.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	if (ps2_command(ps2dev, NULL, PSMOUSE_CMD_ENABLE))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	psmouse_set_state(psmouse, PSMOUSE_ACTIVATED);</div><div class='add'>+</div><div class='add'>+	/* After we recalibrate, we shouldn't get any packets for 2s.  If</div><div class='add'>+	 * we do, it's likely that someone's finger was on the touchpad.</div><div class='add'>+	 * If someone's finger *was* on the touchpad, it's probably</div><div class='add'>+	 * miscalibrated.  So, we should schedule another recalibration</div><div class='add'>+	 */</div><div class='add'>+	priv-&gt;recalib_window = jiffies +  msecs_to_jiffies(2000);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This kills power to the touchpad; according to ALPS, current consumption</div><div class='add'>+ * goes down to 50uA after running this.  To turn power back on, we drive</div><div class='add'>+ * MS-DAT low.</div><div class='add'>+ */</div><div class='add'>+static int hgpk_toggle_power(struct psmouse *psmouse, int enable)</div><div class='add'>+{</div><div class='add'>+	struct ps2dev *ps2dev = &amp;psmouse-&gt;ps2dev;</div><div class='add'>+	int timeo;</div><div class='add'>+</div><div class='add'>+	/* Added on D-series touchpads */</div><div class='add'>+	if (psmouse-&gt;model &lt; HGPK_MODEL_D)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (enable) {</div><div class='add'>+		psmouse_set_state(psmouse, PSMOUSE_INITIALIZING);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Sending a byte will drive MS-DAT low; this will wake up</div><div class='add'>+		 * the controller.  Once we get an ACK back from it, it</div><div class='add'>+		 * means we can continue with the touchpad re-init.  ALPS</div><div class='add'>+		 * tells us that 1s should be long enough, so set that as</div><div class='add'>+		 * the upper bound.</div><div class='add'>+		 */</div><div class='add'>+		for (timeo = 20; timeo &gt; 0; timeo--) {</div><div class='add'>+			if (!ps2_sendbyte(&amp;psmouse-&gt;ps2dev,</div><div class='add'>+					PSMOUSE_CMD_DISABLE, 20))</div><div class='add'>+				break;</div><div class='add'>+			msleep(50);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		psmouse_reset(psmouse);</div><div class='add'>+</div><div class='add'>+		/* should be all set, enable the touchpad */</div><div class='add'>+		ps2_command(&amp;psmouse-&gt;ps2dev, NULL, PSMOUSE_CMD_ENABLE);</div><div class='add'>+		psmouse_set_state(psmouse, PSMOUSE_ACTIVATED);</div><div class='add'>+</div><div class='add'>+	} else {</div><div class='add'>+		hgpk_dbg(psmouse, "Powering off touchpad.\n");</div><div class='add'>+		psmouse_set_state(psmouse, PSMOUSE_IGNORE);</div><div class='add'>+</div><div class='add'>+		if (ps2_command(ps2dev, NULL, 0xec) ||</div><div class='add'>+		    ps2_command(ps2dev, NULL, 0xec) ||</div><div class='add'>+		    ps2_command(ps2dev, NULL, 0xea)) {</div><div class='add'>+			return -1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* probably won't see an ACK, the touchpad will be off */</div><div class='add'>+		ps2_sendbyte(&amp;psmouse-&gt;ps2dev, 0xec, 20);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hgpk_poll(struct psmouse *psmouse)</div><div class='add'>+{</div><div class='add'>+	/* We can't poll, so always return failure. */</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hgpk_reconnect(struct psmouse *psmouse)</div><div class='add'>+{</div><div class='add'>+	/* During suspend/resume the ps2 rails remain powered.  We don't want</div><div class='add'>+	 * to do a reset because it's flush data out of buffers; however,</div><div class='add'>+	 * earlier prototypes (B1) had some brokenness that required a reset. */</div><div class='add'>+	if (olpc_board_at_least(olpc_board(0xb2)))</div><div class='add'>+		if (psmouse-&gt;ps2dev.serio-&gt;dev.power.power_state.event !=</div><div class='add'>+				PM_EVENT_ON)</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+	psmouse_reset(psmouse);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t hgpk_show_powered(struct psmouse *psmouse, void *data, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct hgpk_data *priv = psmouse-&gt;private;</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "%d\n", priv-&gt;powered);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t hgpk_set_powered(struct psmouse *psmouse, void *data,</div><div class='add'>+				const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct hgpk_data *priv = psmouse-&gt;private;</div><div class='add'>+	unsigned long value;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = strict_strtoul(buf, 10, &amp;value);</div><div class='add'>+	if (err || value &gt; 1)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (value != priv-&gt;powered) {</div><div class='add'>+		/*</div><div class='add'>+		 * hgpk_toggle_power will deal w/ state so</div><div class='add'>+		 * we're not racing w/ irq</div><div class='add'>+		 */</div><div class='add'>+		err = hgpk_toggle_power(psmouse, value);</div><div class='add'>+		if (!err)</div><div class='add'>+			priv-&gt;powered = value;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err ? err : count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__PSMOUSE_DEFINE_ATTR(powered, S_IWUSR | S_IRUGO, NULL,</div><div class='add'>+		      hgpk_show_powered, hgpk_set_powered, 0);</div><div class='add'>+</div><div class='add'>+static void hgpk_disconnect(struct psmouse *psmouse)</div><div class='add'>+{</div><div class='add'>+	struct hgpk_data *priv = psmouse-&gt;private;</div><div class='add'>+</div><div class='add'>+	device_remove_file(&amp;psmouse-&gt;ps2dev.serio-&gt;dev,</div><div class='add'>+			   &amp;psmouse_attr_powered.dattr);</div><div class='add'>+	psmouse_reset(psmouse);</div><div class='add'>+	kfree(priv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hgpk_recalib_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct delayed_work *w = container_of(work, struct delayed_work, work);</div><div class='add'>+	struct hgpk_data *priv = container_of(w, struct hgpk_data, recalib_wq);</div><div class='add'>+	struct psmouse *psmouse = priv-&gt;psmouse;</div><div class='add'>+</div><div class='add'>+	hgpk_dbg(psmouse, "recalibrating touchpad..\n");</div><div class='add'>+</div><div class='add'>+	if (hgpk_force_recalibrate(psmouse))</div><div class='add'>+		hgpk_err(psmouse, "recalibration failed!\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hgpk_register(struct psmouse *psmouse)</div><div class='add'>+{</div><div class='add'>+	struct input_dev *dev = psmouse-&gt;dev;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* unset the things that psmouse-base sets which we don't have */</div><div class='add'>+	__clear_bit(BTN_MIDDLE, dev-&gt;keybit);</div><div class='add'>+</div><div class='add'>+	/* set the things we do have */</div><div class='add'>+	__set_bit(EV_KEY, dev-&gt;evbit);</div><div class='add'>+	__set_bit(EV_REL, dev-&gt;evbit);</div><div class='add'>+</div><div class='add'>+	__set_bit(REL_X, dev-&gt;relbit);</div><div class='add'>+	__set_bit(REL_Y, dev-&gt;relbit);</div><div class='add'>+</div><div class='add'>+	__set_bit(BTN_LEFT, dev-&gt;keybit);</div><div class='add'>+	__set_bit(BTN_RIGHT, dev-&gt;keybit);</div><div class='add'>+</div><div class='add'>+	/* register handlers */</div><div class='add'>+	psmouse-&gt;protocol_handler = hgpk_process_byte;</div><div class='add'>+	psmouse-&gt;poll = hgpk_poll;</div><div class='add'>+	psmouse-&gt;disconnect = hgpk_disconnect;</div><div class='add'>+	psmouse-&gt;reconnect = hgpk_reconnect;</div><div class='add'>+	psmouse-&gt;pktsize = 3;</div><div class='add'>+</div><div class='add'>+	/* Disable the idle resync. */</div><div class='add'>+	psmouse-&gt;resync_time = 0;</div><div class='add'>+	/* Reset after a lot of bad bytes. */</div><div class='add'>+	psmouse-&gt;resetafter = 1024;</div><div class='add'>+</div><div class='add'>+	err = device_create_file(&amp;psmouse-&gt;ps2dev.serio-&gt;dev,</div><div class='add'>+				 &amp;psmouse_attr_powered.dattr);</div><div class='add'>+	if (err)</div><div class='add'>+		hgpk_err(psmouse, "Failed to create sysfs attribute\n");</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hgpk_init(struct psmouse *psmouse)</div><div class='add'>+{</div><div class='add'>+	struct hgpk_data *priv;</div><div class='add'>+	int err = -ENOMEM;</div><div class='add'>+</div><div class='add'>+	priv = kzalloc(sizeof(struct hgpk_data), GFP_KERNEL);</div><div class='add'>+	if (!priv)</div><div class='add'>+		goto alloc_fail;</div><div class='add'>+</div><div class='add'>+	psmouse-&gt;private = priv;</div><div class='add'>+	priv-&gt;psmouse = psmouse;</div><div class='add'>+	priv-&gt;powered = 1;</div><div class='add'>+	INIT_DELAYED_WORK(&amp;priv-&gt;recalib_wq, hgpk_recalib_work);</div><div class='add'>+</div><div class='add'>+	err = psmouse_reset(psmouse);</div><div class='add'>+	if (err)</div><div class='add'>+		goto init_fail;</div><div class='add'>+</div><div class='add'>+	err = hgpk_register(psmouse);</div><div class='add'>+	if (err)</div><div class='add'>+		goto init_fail;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+init_fail:</div><div class='add'>+	kfree(priv);</div><div class='add'>+alloc_fail:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum hgpk_model_t hgpk_get_model(struct psmouse *psmouse)</div><div class='add'>+{</div><div class='add'>+	struct ps2dev *ps2dev = &amp;psmouse-&gt;ps2dev;</div><div class='add'>+	unsigned char param[3];</div><div class='add'>+</div><div class='add'>+	/* E7, E7, E7, E9 gets us a 3 byte identifier */</div><div class='add'>+	if (ps2_command(ps2dev,  NULL, PSMOUSE_CMD_SETSCALE21) ||</div><div class='add'>+	    ps2_command(ps2dev,  NULL, PSMOUSE_CMD_SETSCALE21) ||</div><div class='add'>+	    ps2_command(ps2dev,  NULL, PSMOUSE_CMD_SETSCALE21) ||</div><div class='add'>+	    ps2_command(ps2dev, param, PSMOUSE_CMD_GETINFO)) {</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hgpk_dbg(psmouse, "ID: %02x %02x %02x", param[0], param[1], param[2]);</div><div class='add'>+</div><div class='add'>+	/* HGPK signature: 0x67, 0x00, 0x&lt;model&gt; */</div><div class='add'>+	if (param[0] != 0x67 || param[1] != 0x00)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	hgpk_info(psmouse, "OLPC touchpad revision 0x%x\n", param[2]);</div><div class='add'>+</div><div class='add'>+	return param[2];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hgpk_detect(struct psmouse *psmouse, int set_properties)</div><div class='add'>+{</div><div class='add'>+	int version;</div><div class='add'>+</div><div class='add'>+	version = hgpk_get_model(psmouse);</div><div class='add'>+	if (version &lt; 0)</div><div class='add'>+		return version;</div><div class='add'>+</div><div class='add'>+	if (set_properties) {</div><div class='add'>+		psmouse-&gt;vendor = "ALPS";</div><div class='add'>+		psmouse-&gt;name = "HGPK";</div><div class='add'>+		psmouse-&gt;model = version;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/input/mouse/hgpk.h b/drivers/input/mouse/hgpk.h<br/>new file mode 100644<br/>index 000000000000..a4b2a96f5f54<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/mouse/hgpk.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/mouse/hgpk.h</a></div><div class='hunk'>@@ -0,0 +1,49 @@</div><div class='add'>+/*</div><div class='add'>+ * OLPC HGPK (XO-1) touchpad PS/2 mouse driver</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _HGPK_H</div><div class='add'>+#define _HGPK_H</div><div class='add'>+</div><div class='add'>+enum hgpk_model_t {</div><div class='add'>+	HGPK_MODEL_PREA = 0x0a,	/* pre-B1s */</div><div class='add'>+	HGPK_MODEL_A = 0x14,	/* found on B1s, PT disabled in hardware */</div><div class='add'>+	HGPK_MODEL_B = 0x28,	/* B2s, has capacitance issues */</div><div class='add'>+	HGPK_MODEL_C = 0x3c,</div><div class='add'>+	HGPK_MODEL_D = 0x50,	/* C1, mass production */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hgpk_data {</div><div class='add'>+	struct psmouse *psmouse;</div><div class='add'>+	int powered;</div><div class='add'>+	int count, x_tally, y_tally;	/* hardware workaround stuff */</div><div class='add'>+	unsigned long recalib_window;</div><div class='add'>+	struct delayed_work recalib_wq;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define hgpk_dbg(psmouse, format, arg...)		\</div><div class='add'>+	dev_dbg(&amp;(psmouse)-&gt;ps2dev.serio-&gt;dev, format, ## arg)</div><div class='add'>+#define hgpk_err(psmouse, format, arg...)		\</div><div class='add'>+	dev_err(&amp;(psmouse)-&gt;ps2dev.serio-&gt;dev, format, ## arg)</div><div class='add'>+#define hgpk_info(psmouse, format, arg...)		\</div><div class='add'>+	dev_info(&amp;(psmouse)-&gt;ps2dev.serio-&gt;dev, format, ## arg)</div><div class='add'>+#define hgpk_warn(psmouse, format, arg...)		\</div><div class='add'>+	dev_warn(&amp;(psmouse)-&gt;ps2dev.serio-&gt;dev, format, ## arg)</div><div class='add'>+#define hgpk_notice(psmouse, format, arg...)		\</div><div class='add'>+	dev_notice(&amp;(psmouse)-&gt;ps2dev.serio-&gt;dev, format, ## arg)</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_MOUSE_PS2_OLPC</div><div class='add'>+int hgpk_detect(struct psmouse *psmouse, int set_properties);</div><div class='add'>+int hgpk_init(struct psmouse *psmouse);</div><div class='add'>+#else</div><div class='add'>+static inline int hgpk_detect(struct psmouse *psmouse, int set_properties)</div><div class='add'>+{</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+static inline int hgpk_init(struct psmouse *psmouse)</div><div class='add'>+{</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/input/mouse/logips2pp.c b/drivers/input/mouse/logips2pp.c<br/>index 0c5660d28caa..390f1dbb98a4 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/mouse/logips2pp.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/input/mouse/logips2pp.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/mouse/logips2pp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/mouse/logips2pp.c</a></div><div class='hunk'>@@ -157,10 +157,8 @@ static ssize_t ps2pp_attr_show_smartscroll(struct psmouse *psmouse, void *data,</div><div class='ctx'> static ssize_t ps2pp_attr_set_smartscroll(struct psmouse *psmouse, void *data, const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long value;</div><div class='del'>-	char *rest;</div><div class='ctx'> </div><div class='del'>-	value = simple_strtoul(buf, &amp;rest, 10);</div><div class='del'>-	if (*rest || value &gt; 1)</div><div class='add'>+	if (strict_strtoul(buf, 10, &amp;value) || value &gt; 1)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	ps2pp_set_smartscroll(psmouse, value);</div><div class='head'>diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c<br/>index f5a6be1d3c46..126e977e199e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/mouse/psmouse-base.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/input/mouse/psmouse-base.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/mouse/psmouse-base.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/mouse/psmouse-base.c</a></div><div class='hunk'>@@ -25,6 +25,7 @@</div><div class='ctx'> #include "synaptics.h"</div><div class='ctx'> #include "logips2pp.h"</div><div class='ctx'> #include "alps.h"</div><div class='add'>+#include "hgpk.h"</div><div class='ctx'> #include "lifebook.h"</div><div class='ctx'> #include "trackpoint.h"</div><div class='ctx'> #include "touchkit_ps2.h"</div><div class='hunk'>@@ -201,6 +202,12 @@ static psmouse_ret_t psmouse_process_byte(struct psmouse *psmouse)</div><div class='ctx'> 	return PSMOUSE_FULL_PACKET;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void psmouse_queue_work(struct psmouse *psmouse, struct delayed_work *work,</div><div class='add'>+		unsigned long delay)</div><div class='add'>+{</div><div class='add'>+	queue_delayed_work(kpsmoused_wq, work, delay);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * __psmouse_set_state() sets new psmouse state and resets all flags.</div><div class='ctx'>  */</div><div class='hunk'>@@ -220,7 +227,7 @@ static inline void __psmouse_set_state(struct psmouse *psmouse, enum psmouse_sta</div><div class='ctx'>  * is not a concern.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static void psmouse_set_state(struct psmouse *psmouse, enum psmouse_state new_state)</div><div class='add'>+void psmouse_set_state(struct psmouse *psmouse, enum psmouse_state new_state)</div><div class='ctx'> {</div><div class='ctx'> 	serio_pause_rx(psmouse-&gt;ps2dev.serio);</div><div class='ctx'> 	__psmouse_set_state(psmouse, new_state);</div><div class='hunk'>@@ -305,7 +312,7 @@ static irqreturn_t psmouse_interrupt(struct serio *serio,</div><div class='ctx'> 		       psmouse-&gt;name, psmouse-&gt;phys, psmouse-&gt;pktcnt);</div><div class='ctx'> 		psmouse-&gt;badbyte = psmouse-&gt;packet[0];</div><div class='ctx'> 		__psmouse_set_state(psmouse, PSMOUSE_RESYNCING);</div><div class='del'>-		queue_work(kpsmoused_wq, &amp;psmouse-&gt;resync_work);</div><div class='add'>+		psmouse_queue_work(psmouse, &amp;psmouse-&gt;resync_work, 0);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -342,7 +349,7 @@ static irqreturn_t psmouse_interrupt(struct serio *serio,</div><div class='ctx'> 	    time_after(jiffies, psmouse-&gt;last + psmouse-&gt;resync_time * HZ)) {</div><div class='ctx'> 		psmouse-&gt;badbyte = psmouse-&gt;packet[0];</div><div class='ctx'> 		__psmouse_set_state(psmouse, PSMOUSE_RESYNCING);</div><div class='del'>-		queue_work(kpsmoused_wq, &amp;psmouse-&gt;resync_work);</div><div class='add'>+		psmouse_queue_work(psmouse, &amp;psmouse-&gt;resync_work, 0);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -630,8 +637,20 @@ static int psmouse_extensions(struct psmouse *psmouse,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (max_proto &gt; PSMOUSE_IMEX) {</div><div class='add'>+/*</div><div class='add'>+ * Try OLPC HGPK touchpad.</div><div class='add'>+ */</div><div class='add'>+	if (max_proto &gt; PSMOUSE_IMEX &amp;&amp;</div><div class='add'>+			hgpk_detect(psmouse, set_properties) == 0) {</div><div class='add'>+		if (!set_properties || hgpk_init(psmouse) == 0)</div><div class='add'>+			return PSMOUSE_HGPK;</div><div class='add'>+/*</div><div class='add'>+ * Init failed, try basic relative protocols</div><div class='add'>+ */</div><div class='add'>+		max_proto = PSMOUSE_IMEX;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	if (max_proto &gt; PSMOUSE_IMEX) {</div><div class='ctx'> 		if (genius_detect(psmouse, set_properties) == 0)</div><div class='ctx'> 			return PSMOUSE_GENPS;</div><div class='ctx'> </div><div class='hunk'>@@ -762,6 +781,14 @@ static const struct psmouse_protocol psmouse_protocols[] = {</div><div class='ctx'> 		.detect		= touchkit_ps2_detect,</div><div class='ctx'> 	},</div><div class='ctx'> #endif</div><div class='add'>+#ifdef CONFIG_MOUSE_PS2_OLPC</div><div class='add'>+	{</div><div class='add'>+		.type		= PSMOUSE_HGPK,</div><div class='add'>+		.name		= "OLPC HGPK",</div><div class='add'>+		.alias		= "hgpk",</div><div class='add'>+		.detect		= hgpk_detect,</div><div class='add'>+	},</div><div class='add'>+#endif</div><div class='ctx'> 	{</div><div class='ctx'> 		.type		= PSMOUSE_CORTRON,</div><div class='ctx'> 		.name		= "CortronPS/2",</div><div class='hunk'>@@ -935,7 +962,7 @@ static int psmouse_poll(struct psmouse *psmouse)</div><div class='ctx'> static void psmouse_resync(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	struct psmouse *parent = NULL, *psmouse =</div><div class='del'>-		container_of(work, struct psmouse, resync_work);</div><div class='add'>+		container_of(work, struct psmouse, resync_work.work);</div><div class='ctx'> 	struct serio *serio = psmouse-&gt;ps2dev.serio;</div><div class='ctx'> 	psmouse_ret_t rc = PSMOUSE_GOOD_DATA;</div><div class='ctx'> 	int failed = 0, enabled = 0;</div><div class='hunk'>@@ -1194,7 +1221,7 @@ static int psmouse_connect(struct serio *serio, struct serio_driver *drv)</div><div class='ctx'> 		goto err_free;</div><div class='ctx'> </div><div class='ctx'> 	ps2_init(&amp;psmouse-&gt;ps2dev, serio);</div><div class='del'>-	INIT_WORK(&amp;psmouse-&gt;resync_work, psmouse_resync);</div><div class='add'>+	INIT_DELAYED_WORK(&amp;psmouse-&gt;resync_work, psmouse_resync);</div><div class='ctx'> 	psmouse-&gt;dev = input_dev;</div><div class='ctx'> 	snprintf(psmouse-&gt;phys, sizeof(psmouse-&gt;phys), "%s/input0", serio-&gt;phys);</div><div class='ctx'> </div><div class='hunk'>@@ -1395,25 +1422,29 @@ ssize_t psmouse_attr_set_helper(struct device *dev, struct device_attribute *dev</div><div class='ctx'> </div><div class='ctx'> 	psmouse = serio_get_drvdata(serio);</div><div class='ctx'> </div><div class='del'>-	if (psmouse-&gt;state == PSMOUSE_IGNORE) {</div><div class='del'>-		retval = -ENODEV;</div><div class='del'>-		goto out_unlock;</div><div class='del'>-	}</div><div class='add'>+	if (attr-&gt;protect) {</div><div class='add'>+		if (psmouse-&gt;state == PSMOUSE_IGNORE) {</div><div class='add'>+			retval = -ENODEV;</div><div class='add'>+			goto out_unlock;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	if (serio-&gt;parent &amp;&amp; serio-&gt;id.type == SERIO_PS_PSTHRU) {</div><div class='del'>-		parent = serio_get_drvdata(serio-&gt;parent);</div><div class='del'>-		psmouse_deactivate(parent);</div><div class='del'>-	}</div><div class='add'>+		if (serio-&gt;parent &amp;&amp; serio-&gt;id.type == SERIO_PS_PSTHRU) {</div><div class='add'>+			parent = serio_get_drvdata(serio-&gt;parent);</div><div class='add'>+			psmouse_deactivate(parent);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	psmouse_deactivate(psmouse);</div><div class='add'>+		psmouse_deactivate(psmouse);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	retval = attr-&gt;set(psmouse, attr-&gt;data, buf, count);</div><div class='ctx'> </div><div class='del'>-	if (retval != -ENODEV)</div><div class='del'>-		psmouse_activate(psmouse);</div><div class='add'>+	if (attr-&gt;protect) {</div><div class='add'>+		if (retval != -ENODEV)</div><div class='add'>+			psmouse_activate(psmouse);</div><div class='ctx'> </div><div class='del'>-	if (parent)</div><div class='del'>-		psmouse_activate(parent);</div><div class='add'>+		if (parent)</div><div class='add'>+			psmouse_activate(parent);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'>  out_unlock:</div><div class='ctx'> 	mutex_unlock(&amp;psmouse_mutex);</div><div class='hunk'>@@ -1433,10 +1464,8 @@ static ssize_t psmouse_set_int_attr(struct psmouse *psmouse, void *offset, const</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int *field = (unsigned int *)((char *)psmouse + (size_t)offset);</div><div class='ctx'> 	unsigned long value;</div><div class='del'>-	char *rest;</div><div class='ctx'> </div><div class='del'>-	value = simple_strtoul(buf, &amp;rest, 10);</div><div class='del'>-	if (*rest)</div><div class='add'>+	if (strict_strtoul(buf, 10, &amp;value))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if ((unsigned int)value != value)</div><div class='hunk'>@@ -1549,10 +1578,8 @@ static ssize_t psmouse_attr_set_protocol(struct psmouse *psmouse, void *data, co</div><div class='ctx'> static ssize_t psmouse_attr_set_rate(struct psmouse *psmouse, void *data, const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long value;</div><div class='del'>-	char *rest;</div><div class='ctx'> </div><div class='del'>-	value = simple_strtoul(buf, &amp;rest, 10);</div><div class='del'>-	if (*rest)</div><div class='add'>+	if (strict_strtoul(buf, 10, &amp;value))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	psmouse-&gt;set_rate(psmouse, value);</div><div class='hunk'>@@ -1562,10 +1589,8 @@ static ssize_t psmouse_attr_set_rate(struct psmouse *psmouse, void *data, const</div><div class='ctx'> static ssize_t psmouse_attr_set_resolution(struct psmouse *psmouse, void *data, const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long value;</div><div class='del'>-	char *rest;</div><div class='ctx'> </div><div class='del'>-	value = simple_strtoul(buf, &amp;rest, 10);</div><div class='del'>-	if (*rest)</div><div class='add'>+	if (strict_strtoul(buf, 10, &amp;value))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	psmouse-&gt;set_resolution(psmouse, value);</div><div class='head'>diff --git a/drivers/input/mouse/psmouse.h b/drivers/input/mouse/psmouse.h<br/>index 1317bdd8cc7c..8b608a1cdd12 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/mouse/psmouse.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/input/mouse/psmouse.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/mouse/psmouse.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/mouse/psmouse.h</a></div><div class='hunk'>@@ -39,7 +39,7 @@ struct psmouse {</div><div class='ctx'> 	void *private;</div><div class='ctx'> 	struct input_dev *dev;</div><div class='ctx'> 	struct ps2dev ps2dev;</div><div class='del'>-	struct work_struct resync_work;</div><div class='add'>+	struct delayed_work resync_work;</div><div class='ctx'> 	char *vendor;</div><div class='ctx'> 	char *name;</div><div class='ctx'> 	unsigned char packet[8];</div><div class='hunk'>@@ -89,20 +89,24 @@ enum psmouse_type {</div><div class='ctx'> 	PSMOUSE_TRACKPOINT,</div><div class='ctx'> 	PSMOUSE_TOUCHKIT_PS2,</div><div class='ctx'> 	PSMOUSE_CORTRON,</div><div class='add'>+	PSMOUSE_HGPK,</div><div class='ctx'> 	PSMOUSE_AUTO		/* This one should always be last */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+void psmouse_queue_work(struct psmouse *psmouse, struct delayed_work *work,</div><div class='add'>+		unsigned long delay);</div><div class='ctx'> int psmouse_sliced_command(struct psmouse *psmouse, unsigned char command);</div><div class='ctx'> int psmouse_reset(struct psmouse *psmouse);</div><div class='add'>+void psmouse_set_state(struct psmouse *psmouse, enum psmouse_state new_state);</div><div class='ctx'> void psmouse_set_resolution(struct psmouse *psmouse, unsigned int resolution);</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> struct psmouse_attribute {</div><div class='ctx'> 	struct device_attribute dattr;</div><div class='ctx'> 	void *data;</div><div class='ctx'> 	ssize_t (*show)(struct psmouse *psmouse, void *data, char *buf);</div><div class='ctx'> 	ssize_t (*set)(struct psmouse *psmouse, void *data,</div><div class='ctx'> 			const char *buf, size_t count);</div><div class='add'>+	int protect;</div><div class='ctx'> };</div><div class='ctx'> #define to_psmouse_attr(a)	container_of((a), struct psmouse_attribute, dattr)</div><div class='ctx'> </div><div class='hunk'>@@ -111,7 +115,7 @@ ssize_t psmouse_attr_show_helper(struct device *dev, struct device_attribute *at</div><div class='ctx'> ssize_t psmouse_attr_set_helper(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 				const char *buf, size_t count);</div><div class='ctx'> </div><div class='del'>-#define PSMOUSE_DEFINE_ATTR(_name, _mode, _data, _show, _set)			\</div><div class='add'>+#define __PSMOUSE_DEFINE_ATTR(_name, _mode, _data, _show, _set, _protect)	\</div><div class='ctx'> static ssize_t _show(struct psmouse *, void *data, char *);			\</div><div class='ctx'> static ssize_t _set(struct psmouse *, void *data, const char *, size_t);	\</div><div class='ctx'> static struct psmouse_attribute psmouse_attr_##_name = {			\</div><div class='hunk'>@@ -126,6 +130,10 @@ static struct psmouse_attribute psmouse_attr_##_name = {			\</div><div class='ctx'> 	.data	= _data,							\</div><div class='ctx'> 	.show	= _show,							\</div><div class='ctx'> 	.set	= _set,								\</div><div class='add'>+	.protect = _protect,							\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define PSMOUSE_DEFINE_ATTR(_name, _mode, _data, _show, _set)	\</div><div class='add'>+		__PSMOUSE_DEFINE_ATTR(_name, _mode, _data, _show, _set, 1)</div><div class='add'>+</div><div class='ctx'> #endif /* _PSMOUSE_H */</div><div class='head'>diff --git a/drivers/input/mouse/trackpoint.c b/drivers/input/mouse/trackpoint.c<br/>index 26b845fc186a..e68c814c4361 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/mouse/trackpoint.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/input/mouse/trackpoint.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/mouse/trackpoint.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/mouse/trackpoint.c</a></div><div class='hunk'>@@ -89,10 +89,8 @@ static ssize_t trackpoint_set_int_attr(struct psmouse *psmouse, void *data,</div><div class='ctx'> 	struct trackpoint_attr_data *attr = data;</div><div class='ctx'> 	unsigned char *field = (unsigned char *)((char *)tp + attr-&gt;field_offset);</div><div class='ctx'> 	unsigned long value;</div><div class='del'>-	char *rest;</div><div class='ctx'> </div><div class='del'>-	value = simple_strtoul(buf, &amp;rest, 10);</div><div class='del'>-	if (*rest || value &gt; 255)</div><div class='add'>+	if (strict_strtoul(buf, 10, &amp;value) || value &gt; 255)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	*field = value;</div><div class='hunk'>@@ -117,10 +115,8 @@ static ssize_t trackpoint_set_bit_attr(struct psmouse *psmouse, void *data,</div><div class='ctx'> 	struct trackpoint_attr_data *attr = data;</div><div class='ctx'> 	unsigned char *field = (unsigned char *)((char *)tp + attr-&gt;field_offset);</div><div class='ctx'> 	unsigned long value;</div><div class='del'>-	char *rest;</div><div class='ctx'> </div><div class='del'>-	value = simple_strtoul(buf, &amp;rest, 10);</div><div class='del'>-	if (*rest || value &gt; 1)</div><div class='add'>+	if (strict_strtoul(buf, 10, &amp;value) || value &gt; 1)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (attr-&gt;inverted)</div><div class='head'>diff --git a/drivers/input/serio/hp_sdc.c b/drivers/input/serio/hp_sdc.c<br/>index 0d395979b2d1..bfe49243f38b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/serio/hp_sdc.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/input/serio/hp_sdc.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/serio/hp_sdc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/serio/hp_sdc.c</a></div><div class='hunk'>@@ -323,7 +323,7 @@ static void hp_sdc_tasklet(unsigned long foo)</div><div class='ctx'> 			 * it back to the application. and be less verbose.</div><div class='ctx'> 			 */</div><div class='ctx'> 			printk(KERN_WARNING PREFIX "read timeout (%ius)!\n",</div><div class='del'>-			       tv.tv_usec - hp_sdc.rtv.tv_usec);</div><div class='add'>+			       (int)(tv.tv_usec - hp_sdc.rtv.tv_usec));</div><div class='ctx'> 			curr-&gt;idx += hp_sdc.rqty;</div><div class='ctx'> 			hp_sdc.rqty = 0;</div><div class='ctx'> 			tmp = curr-&gt;seq[curr-&gt;actidx];</div><div class='head'>diff --git a/drivers/input/serio/i8042-io.h b/drivers/input/serio/i8042-io.h<br/>index f451c7351a9d..847f4aad7ed5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/serio/i8042-io.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/input/serio/i8042-io.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/serio/i8042-io.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/serio/i8042-io.h</a></div><div class='hunk'>@@ -67,7 +67,7 @@ static inline int i8042_platform_init(void)</div><div class='ctx'>  * On some platforms touching the i8042 data register region can do really</div><div class='ctx'>  * bad things. Because of this the region is always reserved on such boxes.</div><div class='ctx'>  */</div><div class='del'>-#if defined(CONFIG_PPC_MERGE)</div><div class='add'>+#if defined(CONFIG_PPC)</div><div class='ctx'> 	if (check_legacy_ioport(I8042_DATA_REG))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/input/serio/i8042-sparcio.h b/drivers/input/serio/i8042-sparcio.h<br/>index 692a79ec2a22..5071af2c0604 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/serio/i8042-sparcio.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/input/serio/i8042-sparcio.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/serio/i8042-sparcio.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/serio/i8042-sparcio.h</a></div><div class='hunk'>@@ -87,7 +87,7 @@ static int __devexit sparc_i8042_remove(struct of_device *op)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct of_device_id sparc_i8042_match[] = {</div><div class='add'>+static const struct of_device_id sparc_i8042_match[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.name = "8042",</div><div class='ctx'> 	},</div><div class='head'>diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h<br/>index 5aafe24984c5..a321aea2c7b5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/serio/i8042-x86ia64io.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/input/serio/i8042-x86ia64io.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/serio/i8042-x86ia64io.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/serio/i8042-x86ia64io.h</a></div><div class='hunk'>@@ -322,6 +322,13 @@ static struct dmi_system_id __initdata i8042_dmi_nomux_table[] = {</div><div class='ctx'> 			DMI_MATCH(DMI_PRODUCT_NAME, "N34AS6"),</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='add'>+	{</div><div class='add'>+		.ident = "IBM 2656",</div><div class='add'>+		.matches = {</div><div class='add'>+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),</div><div class='add'>+			DMI_MATCH(DMI_PRODUCT_NAME, "2656"),</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='ctx'> 	{ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/input/serio/serio_raw.c b/drivers/input/serio/serio_raw.c<br/>index c9397c8ee97e..470770c09260 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/serio/serio_raw.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/input/serio/serio_raw.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/serio/serio_raw.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/serio/serio_raw.c</a></div><div class='hunk'>@@ -373,6 +373,12 @@ static struct serio_device_id serio_raw_serio_ids[] = {</div><div class='ctx'> 		.id	= SERIO_ANY,</div><div class='ctx'> 		.extra	= SERIO_ANY,</div><div class='ctx'> 	},</div><div class='add'>+	{</div><div class='add'>+		.type	= SERIO_8042_XL,</div><div class='add'>+		.proto	= SERIO_ANY,</div><div class='add'>+		.id	= SERIO_ANY,</div><div class='add'>+		.extra	= SERIO_ANY,</div><div class='add'>+	},</div><div class='ctx'> 	{ 0 }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/input/tablet/acecad.c b/drivers/input/tablet/acecad.c<br/>index 570e0e83ac46..670c61c5a516 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/tablet/acecad.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/input/tablet/acecad.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/tablet/acecad.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/tablet/acecad.c</a></div><div class='hunk'>@@ -280,7 +280,8 @@ static int __init usb_acecad_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int result = usb_register(&amp;usb_acecad_driver);</div><div class='ctx'> 	if (result == 0)</div><div class='del'>-		info(DRIVER_VERSION ":" DRIVER_DESC);</div><div class='add'>+		printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"</div><div class='add'>+		       DRIVER_DESC "\n");</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/input/tablet/aiptek.c b/drivers/input/tablet/aiptek.c<br/>index 8f037a1d44a6..7d005a3616d7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/tablet/aiptek.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/input/tablet/aiptek.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/tablet/aiptek.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/tablet/aiptek.c</a></div><div class='hunk'>@@ -1202,16 +1202,22 @@ static ssize_t</div><div class='ctx'> store_tabletXtilt(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct aiptek *aiptek = dev_get_drvdata(dev);</div><div class='del'>-	int x;</div><div class='add'>+	long x;</div><div class='add'>+</div><div class='add'>+	if (strict_strtol(buf, 10, &amp;x)) {</div><div class='add'>+		size_t len = buf[count - 1] == '\n' ? count - 1 : count;</div><div class='add'>+</div><div class='add'>+		if (strncmp(buf, "disable", len))</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (strcmp(buf, "disable") == 0) {</div><div class='ctx'> 		aiptek-&gt;newSetting.xTilt = AIPTEK_TILT_DISABLE;</div><div class='ctx'> 	} else {</div><div class='del'>-		x = (int)simple_strtol(buf, NULL, 10);</div><div class='del'>-		if (x &gt;= AIPTEK_TILT_MIN &amp;&amp; x &lt;= AIPTEK_TILT_MAX) {</div><div class='del'>-			aiptek-&gt;newSetting.xTilt = x;</div><div class='del'>-		}</div><div class='add'>+		if (x &lt; AIPTEK_TILT_MIN || x &gt; AIPTEK_TILT_MAX)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		aiptek-&gt;newSetting.xTilt = x;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1238,16 +1244,22 @@ static ssize_t</div><div class='ctx'> store_tabletYtilt(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct aiptek *aiptek = dev_get_drvdata(dev);</div><div class='del'>-	int y;</div><div class='add'>+	long y;</div><div class='add'>+</div><div class='add'>+	if (strict_strtol(buf, 10, &amp;y)) {</div><div class='add'>+		size_t len = buf[count - 1] == '\n' ? count - 1 : count;</div><div class='add'>+</div><div class='add'>+		if (strncmp(buf, "disable", len))</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (strcmp(buf, "disable") == 0) {</div><div class='ctx'> 		aiptek-&gt;newSetting.yTilt = AIPTEK_TILT_DISABLE;</div><div class='ctx'> 	} else {</div><div class='del'>-		y = (int)simple_strtol(buf, NULL, 10);</div><div class='del'>-		if (y &gt;= AIPTEK_TILT_MIN &amp;&amp; y &lt;= AIPTEK_TILT_MAX) {</div><div class='del'>-			aiptek-&gt;newSetting.yTilt = y;</div><div class='del'>-		}</div><div class='add'>+		if (y &lt; AIPTEK_TILT_MIN || y &gt; AIPTEK_TILT_MAX)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		aiptek-&gt;newSetting.yTilt = y;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1269,8 +1281,12 @@ static ssize_t</div><div class='ctx'> store_tabletJitterDelay(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct aiptek *aiptek = dev_get_drvdata(dev);</div><div class='add'>+	long j;</div><div class='add'>+</div><div class='add'>+	if (strict_strtol(buf, 10, &amp;j))</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	aiptek-&gt;newSetting.jitterDelay = (int)simple_strtol(buf, NULL, 10);</div><div class='add'>+	aiptek-&gt;newSetting.jitterDelay = (int)j;</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1294,8 +1310,12 @@ static ssize_t</div><div class='ctx'> store_tabletProgrammableDelay(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct aiptek *aiptek = dev_get_drvdata(dev);</div><div class='add'>+	long d;</div><div class='ctx'> </div><div class='del'>-	aiptek-&gt;newSetting.programmableDelay = (int)simple_strtol(buf, NULL, 10);</div><div class='add'>+	if (strict_strtol(buf, 10, &amp;d))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	aiptek-&gt;newSetting.programmableDelay = (int)d;</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1541,8 +1561,11 @@ static ssize_t</div><div class='ctx'> store_tabletWheel(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct aiptek *aiptek = dev_get_drvdata(dev);</div><div class='add'>+	long w;</div><div class='add'>+</div><div class='add'>+	if (strict_strtol(buf, 10, &amp;w)) return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	aiptek-&gt;newSetting.wheel = (int)simple_strtol(buf, NULL, 10);</div><div class='add'>+	aiptek-&gt;newSetting.wheel = (int)w;</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1683,20 +1706,21 @@ aiptek_probe(struct usb_interface *intf, const struct usb_device_id *id)</div><div class='ctx'> 	aiptek = kzalloc(sizeof(struct aiptek), GFP_KERNEL);</div><div class='ctx'> 	inputdev = input_allocate_device();</div><div class='ctx'> 	if (!aiptek || !inputdev) {</div><div class='del'>-		warn("aiptek: cannot allocate memory or input device");</div><div class='add'>+		dev_warn(&amp;intf-&gt;dev,</div><div class='add'>+			 "cannot allocate memory or input device\n");</div><div class='ctx'> 		goto fail1;</div><div class='ctx'>         }</div><div class='ctx'> </div><div class='ctx'> 	aiptek-&gt;data = usb_buffer_alloc(usbdev, AIPTEK_PACKET_LENGTH,</div><div class='ctx'> 					GFP_ATOMIC, &amp;aiptek-&gt;data_dma);</div><div class='ctx'>         if (!aiptek-&gt;data) {</div><div class='del'>-		warn("aiptek: cannot allocate usb buffer");</div><div class='add'>+		dev_warn(&amp;intf-&gt;dev, "cannot allocate usb buffer\n");</div><div class='ctx'> 		goto fail1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	aiptek-&gt;urb = usb_alloc_urb(0, GFP_KERNEL);</div><div class='ctx'> 	if (!aiptek-&gt;urb) {</div><div class='del'>-	        warn("aiptek: cannot allocate urb");</div><div class='add'>+	        dev_warn(&amp;intf-&gt;dev, "cannot allocate urb\n");</div><div class='ctx'> 		goto fail2;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1820,8 +1844,9 @@ aiptek_probe(struct usb_interface *intf, const struct usb_device_id *id)</div><div class='ctx'> 		aiptek-&gt;curSetting.programmableDelay = speeds[i];</div><div class='ctx'> 		(void)aiptek_program_tablet(aiptek);</div><div class='ctx'> 		if (aiptek-&gt;inputdev-&gt;absmax[ABS_X] &gt; 0) {</div><div class='del'>-			info("input: Aiptek using %d ms programming speed\n",</div><div class='del'>-			     aiptek-&gt;curSetting.programmableDelay);</div><div class='add'>+			dev_info(&amp;intf-&gt;dev,</div><div class='add'>+				 "Aiptek using %d ms programming speed\n",</div><div class='add'>+				 aiptek-&gt;curSetting.programmableDelay);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1829,7 +1854,8 @@ aiptek_probe(struct usb_interface *intf, const struct usb_device_id *id)</div><div class='ctx'> 	/* Murphy says that some day someone will have a tablet that fails the</div><div class='ctx'> 	   above test. That's you, Frederic Rodrigo */</div><div class='ctx'> 	if (i == ARRAY_SIZE(speeds)) {</div><div class='del'>-		info("input: Aiptek tried all speeds, no sane response");</div><div class='add'>+		dev_info(&amp;intf-&gt;dev,</div><div class='add'>+			 "Aiptek tried all speeds, no sane response\n");</div><div class='ctx'> 		goto fail2;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1841,7 +1867,8 @@ aiptek_probe(struct usb_interface *intf, const struct usb_device_id *id)</div><div class='ctx'> 	 */</div><div class='ctx'> 	err = sysfs_create_group(&amp;intf-&gt;dev.kobj, &amp;aiptek_attribute_group);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		warn("aiptek: cannot create sysfs group err: %d", err);</div><div class='add'>+		dev_warn(&amp;intf-&gt;dev, "cannot create sysfs group err: %d\n",</div><div class='add'>+			 err);</div><div class='ctx'> 		goto fail3;</div><div class='ctx'>         }</div><div class='ctx'> </div><div class='hunk'>@@ -1849,7 +1876,8 @@ aiptek_probe(struct usb_interface *intf, const struct usb_device_id *id)</div><div class='ctx'> 	 */</div><div class='ctx'> 	err = input_register_device(aiptek-&gt;inputdev);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		warn("aiptek: input_register_device returned err: %d", err);</div><div class='add'>+		dev_warn(&amp;intf-&gt;dev,</div><div class='add'>+			 "input_register_device returned err: %d\n", err);</div><div class='ctx'> 		goto fail4;</div><div class='ctx'>         }</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1899,8 +1927,9 @@ static int __init aiptek_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int result = usb_register(&amp;aiptek_driver);</div><div class='ctx'> 	if (result == 0) {</div><div class='del'>-		info(DRIVER_VERSION ": " DRIVER_AUTHOR);</div><div class='del'>-		info(DRIVER_DESC);</div><div class='add'>+		printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"</div><div class='add'>+		       DRIVER_DESC "\n");</div><div class='add'>+		printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_AUTHOR "\n");</div><div class='ctx'> 	}</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/input/tablet/gtco.c b/drivers/input/tablet/gtco.c<br/>index 7df0228e836e..5524e01dbb1a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/tablet/gtco.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/input/tablet/gtco.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/tablet/gtco.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/tablet/gtco.c</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'> </div><div class='ctx'> GTCO digitizer USB driver</div><div class='ctx'> </div><div class='del'>-Use the err(), dbg() and info() macros from usb.h for system logging</div><div class='add'>+Use the err() and dbg() macros from usb.h for system logging</div><div class='ctx'> </div><div class='ctx'> TO CHECK:  Is pressure done right on report 5?</div><div class='ctx'> </div><div class='hunk'>@@ -1010,7 +1010,7 @@ static void gtco_disconnect(struct usb_interface *interface)</div><div class='ctx'> 		kfree(gtco);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	info("gtco driver disconnected");</div><div class='add'>+	dev_info(&amp;interface-&gt;dev, "gtco driver disconnected\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*   STANDARD MODULE LOAD ROUTINES  */</div><div class='head'>diff --git a/drivers/input/tablet/kbtab.c b/drivers/input/tablet/kbtab.c<br/>index d89112fa6e6b..6682b17bf844 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/tablet/kbtab.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/input/tablet/kbtab.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/tablet/kbtab.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/tablet/kbtab.c</a></div><div class='hunk'>@@ -215,7 +215,8 @@ static int __init kbtab_init(void)</div><div class='ctx'> 	retval = usb_register(&amp;kbtab_driver);</div><div class='ctx'> 	if (retval)</div><div class='ctx'> 		goto out;</div><div class='del'>-	info(DRIVER_VERSION ":" DRIVER_DESC);</div><div class='add'>+	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"</div><div class='add'>+	       DRIVER_DESC "\n");</div><div class='ctx'> out:</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/input/tablet/wacom_sys.c b/drivers/input/tablet/wacom_sys.c<br/>index 5fbc463baf5a..09e227aa0d49 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/tablet/wacom_sys.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/input/tablet/wacom_sys.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/tablet/wacom_sys.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/tablet/wacom_sys.c</a></div><div class='hunk'>@@ -385,7 +385,8 @@ static int __init wacom_init(void)</div><div class='ctx'> 	wacom_driver.id_table = get_device_table();</div><div class='ctx'> 	result = usb_register(&amp;wacom_driver);</div><div class='ctx'> 	if (result == 0)</div><div class='del'>-		info(DRIVER_VERSION ":" DRIVER_DESC);</div><div class='add'>+		printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"</div><div class='add'>+		       DRIVER_DESC "\n");</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig<br/>index 25287e80e236..6e1e8c624f9e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/touchscreen/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/input/touchscreen/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/touchscreen/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/touchscreen/Kconfig</a></div><div class='hunk'>@@ -220,6 +220,7 @@ config TOUCHSCREEN_ATMEL_TSADCC</div><div class='ctx'> config TOUCHSCREEN_UCB1400</div><div class='ctx'> 	tristate "Philips UCB1400 touchscreen"</div><div class='ctx'> 	select AC97_BUS</div><div class='add'>+	depends on UCB1400_CORE</div><div class='ctx'> 	help</div><div class='ctx'> 	  This enables support for the Philips UCB1400 touchscreen interface.</div><div class='ctx'> 	  The UCB1400 is an AC97 audio codec.  The touchscreen interface</div><div class='head'>diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c<br/>index ce6f48c695f5..b9b7fc6ff1eb 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/touchscreen/ads7846.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/input/touchscreen/ads7846.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/touchscreen/ads7846.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/touchscreen/ads7846.c</a></div><div class='hunk'>@@ -24,6 +24,7 @@</div><div class='ctx'> #include &lt;linux/input.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/gpio.h&gt;</div><div class='ctx'> #include &lt;linux/spi/spi.h&gt;</div><div class='ctx'> #include &lt;linux/spi/ads7846.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='hunk'>@@ -68,6 +69,17 @@ struct ts_event {</div><div class='ctx'> 	int	ignore;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * We allocate this separately to avoid cache line sharing issues when</div><div class='add'>+ * driver is used with DMA-based SPI controllers (like atmel_spi) on</div><div class='add'>+ * systems where main memory is not DMA-coherent (most non-x86 boards).</div><div class='add'>+ */</div><div class='add'>+struct ads7846_packet {</div><div class='add'>+	u8			read_x, read_y, read_z1, read_z2, pwrdown;</div><div class='add'>+	u16			dummy;		/* for the pwrdown read */</div><div class='add'>+	struct ts_event		tc;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct ads7846 {</div><div class='ctx'> 	struct input_dev	*input;</div><div class='ctx'> 	char			phys[32];</div><div class='hunk'>@@ -85,9 +97,7 @@ struct ads7846 {</div><div class='ctx'> 	u16			x_plate_ohms;</div><div class='ctx'> 	u16			pressure_max;</div><div class='ctx'> </div><div class='del'>-	u8			read_x, read_y, read_z1, read_z2, pwrdown;</div><div class='del'>-	u16			dummy;		/* for the pwrdown read */</div><div class='del'>-	struct ts_event		tc;</div><div class='add'>+	struct ads7846_packet	*packet;</div><div class='ctx'> </div><div class='ctx'> 	struct spi_transfer	xfer[18];</div><div class='ctx'> 	struct spi_message	msg[5];</div><div class='hunk'>@@ -116,6 +126,7 @@ struct ads7846 {</div><div class='ctx'> 	void			*filter_data;</div><div class='ctx'> 	void			(*filter_cleanup)(void *data);</div><div class='ctx'> 	int			(*get_pendown_state)(void);</div><div class='add'>+	int			gpio_pendown;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* leave chip selected when we're done, for quicker re-select? */</div><div class='hunk'>@@ -461,10 +472,11 @@ static ssize_t ads7846_disable_store(struct device *dev,</div><div class='ctx'> 				     const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct ads7846 *ts = dev_get_drvdata(dev);</div><div class='del'>-	char *endp;</div><div class='del'>-	int i;</div><div class='add'>+	long i;</div><div class='add'>+</div><div class='add'>+	if (strict_strtoul(buf, 10, &amp;i))</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	i = simple_strtoul(buf, &amp;endp, 10);</div><div class='ctx'> 	spin_lock_irq(&amp;ts-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	if (i)</div><div class='hunk'>@@ -491,6 +503,14 @@ static struct attribute_group ads784x_attr_group = {</div><div class='ctx'> </div><div class='ctx'> /*--------------------------------------------------------------------------*/</div><div class='ctx'> </div><div class='add'>+static int get_pendown_state(struct ads7846 *ts)</div><div class='add'>+{</div><div class='add'>+	if (ts-&gt;get_pendown_state)</div><div class='add'>+		return ts-&gt;get_pendown_state();</div><div class='add'>+</div><div class='add'>+	return !gpio_get_value(ts-&gt;gpio_pendown);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * PENIRQ only kicks the timer.  The timer only reissues the SPI transfer,</div><div class='ctx'>  * to retrieve touchscreen status.</div><div class='hunk'>@@ -502,16 +522,17 @@ static struct attribute_group ads784x_attr_group = {</div><div class='ctx'> static void ads7846_rx(void *ads)</div><div class='ctx'> {</div><div class='ctx'> 	struct ads7846		*ts = ads;</div><div class='add'>+	struct ads7846_packet	*packet = ts-&gt;packet;</div><div class='ctx'> 	unsigned		Rt;</div><div class='ctx'> 	u16			x, y, z1, z2;</div><div class='ctx'> </div><div class='ctx'> 	/* ads7846_rx_val() did in-place conversion (including byteswap) from</div><div class='ctx'> 	 * on-the-wire format as part of debouncing to get stable readings.</div><div class='ctx'> 	 */</div><div class='del'>-	x = ts-&gt;tc.x;</div><div class='del'>-	y = ts-&gt;tc.y;</div><div class='del'>-	z1 = ts-&gt;tc.z1;</div><div class='del'>-	z2 = ts-&gt;tc.z2;</div><div class='add'>+	x = packet-&gt;tc.x;</div><div class='add'>+	y = packet-&gt;tc.y;</div><div class='add'>+	z1 = packet-&gt;tc.z1;</div><div class='add'>+	z2 = packet-&gt;tc.z2;</div><div class='ctx'> </div><div class='ctx'> 	/* range filtering */</div><div class='ctx'> 	if (x == MAX_12BIT)</div><div class='hunk'>@@ -535,10 +556,10 @@ static void ads7846_rx(void *ads)</div><div class='ctx'> 	 * the maximum. Don't report it to user space, repeat at least</div><div class='ctx'> 	 * once more the measurement</div><div class='ctx'> 	 */</div><div class='del'>-	if (ts-&gt;tc.ignore || Rt &gt; ts-&gt;pressure_max) {</div><div class='add'>+	if (packet-&gt;tc.ignore || Rt &gt; ts-&gt;pressure_max) {</div><div class='ctx'> #ifdef VERBOSE</div><div class='ctx'> 		pr_debug("%s: ignored %d pressure %d\n",</div><div class='del'>-			ts-&gt;spi-&gt;dev.bus_id, ts-&gt;tc.ignore, Rt);</div><div class='add'>+			ts-&gt;spi-&gt;dev.bus_id, packet-&gt;tc.ignore, Rt);</div><div class='ctx'> #endif</div><div class='ctx'> 		hrtimer_start(&amp;ts-&gt;timer, ktime_set(0, TS_POLL_PERIOD),</div><div class='ctx'> 			      HRTIMER_MODE_REL);</div><div class='hunk'>@@ -550,7 +571,7 @@ static void ads7846_rx(void *ads)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (ts-&gt;penirq_recheck_delay_usecs) {</div><div class='ctx'> 		udelay(ts-&gt;penirq_recheck_delay_usecs);</div><div class='del'>-		if (!ts-&gt;get_pendown_state())</div><div class='add'>+		if (!get_pendown_state(ts))</div><div class='ctx'> 			Rt = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -631,6 +652,7 @@ static int ads7846_no_filter(void *ads, int data_idx, int *val)</div><div class='ctx'> static void ads7846_rx_val(void *ads)</div><div class='ctx'> {</div><div class='ctx'> 	struct ads7846 *ts = ads;</div><div class='add'>+	struct ads7846_packet *packet = ts-&gt;packet;</div><div class='ctx'> 	struct spi_message *m;</div><div class='ctx'> 	struct spi_transfer *t;</div><div class='ctx'> 	int val;</div><div class='hunk'>@@ -650,7 +672,7 @@ static void ads7846_rx_val(void *ads)</div><div class='ctx'> 	case ADS7846_FILTER_REPEAT:</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ADS7846_FILTER_IGNORE:</div><div class='del'>-		ts-&gt;tc.ignore = 1;</div><div class='add'>+		packet-&gt;tc.ignore = 1;</div><div class='ctx'> 		/* Last message will contain ads7846_rx() as the</div><div class='ctx'> 		 * completion function.</div><div class='ctx'> 		 */</div><div class='hunk'>@@ -658,7 +680,7 @@ static void ads7846_rx_val(void *ads)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ADS7846_FILTER_OK:</div><div class='ctx'> 		*(u16 *)t-&gt;rx_buf = val;</div><div class='del'>-		ts-&gt;tc.ignore = 0;</div><div class='add'>+		packet-&gt;tc.ignore = 0;</div><div class='ctx'> 		m = &amp;ts-&gt;msg[++ts-&gt;msg_idx];</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -677,7 +699,7 @@ static enum hrtimer_restart ads7846_timer(struct hrtimer *handle)</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irq(&amp;ts-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	if (unlikely(!ts-&gt;get_pendown_state() ||</div><div class='add'>+	if (unlikely(!get_pendown_state(ts) ||</div><div class='ctx'> 		     device_suspended(&amp;ts-&gt;spi-&gt;dev))) {</div><div class='ctx'> 		if (ts-&gt;pendown) {</div><div class='ctx'> 			struct input_dev *input = ts-&gt;input;</div><div class='hunk'>@@ -716,7 +738,7 @@ static irqreturn_t ads7846_irq(int irq, void *handle)</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;ts-&gt;lock, flags);</div><div class='del'>-	if (likely(ts-&gt;get_pendown_state())) {</div><div class='add'>+	if (likely(get_pendown_state(ts))) {</div><div class='ctx'> 		if (!ts-&gt;irq_disabled) {</div><div class='ctx'> 			/* The ARM do_simple_IRQ() dispatcher doesn't act</div><div class='ctx'> 			 * like the other dispatchers:  it will report IRQs</div><div class='hunk'>@@ -763,7 +785,6 @@ static void ads7846_disable(struct ads7846 *ts)</div><div class='ctx'> 	/* we know the chip's in lowpower mode since we always</div><div class='ctx'> 	 * leave it that way after every request</div><div class='ctx'> 	 */</div><div class='del'>-</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Must be called with ts-&gt;lock held */</div><div class='hunk'>@@ -806,9 +827,40 @@ static int ads7846_resume(struct spi_device *spi)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int __devinit setup_pendown(struct spi_device *spi, struct ads7846 *ts)</div><div class='add'>+{</div><div class='add'>+	struct ads7846_platform_data *pdata = spi-&gt;dev.platform_data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* REVISIT when the irq can be triggered active-low, or if for some</div><div class='add'>+	 * reason the touchscreen isn't hooked up, we don't need to access</div><div class='add'>+	 * the pendown state.</div><div class='add'>+	 */</div><div class='add'>+	if (!pdata-&gt;get_pendown_state &amp;&amp; !gpio_is_valid(pdata-&gt;gpio_pendown)) {</div><div class='add'>+		dev_err(&amp;spi-&gt;dev, "no get_pendown_state nor gpio_pendown?\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pdata-&gt;get_pendown_state) {</div><div class='add'>+		ts-&gt;get_pendown_state = pdata-&gt;get_pendown_state;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = gpio_request(pdata-&gt;gpio_pendown, "ads7846_pendown");</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(&amp;spi-&gt;dev, "failed to request pendown GPIO%d\n",</div><div class='add'>+				pdata-&gt;gpio_pendown);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ts-&gt;gpio_pendown = pdata-&gt;gpio_pendown;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int __devinit ads7846_probe(struct spi_device *spi)</div><div class='ctx'> {</div><div class='ctx'> 	struct ads7846			*ts;</div><div class='add'>+	struct ads7846_packet		*packet;</div><div class='ctx'> 	struct input_dev		*input_dev;</div><div class='ctx'> 	struct ads7846_platform_data	*pdata = spi-&gt;dev.platform_data;</div><div class='ctx'> 	struct spi_message		*m;</div><div class='hunk'>@@ -833,15 +885,6 @@ static int __devinit ads7846_probe(struct spi_device *spi)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* REVISIT when the irq can be triggered active-low, or if for some</div><div class='del'>-	 * reason the touchscreen isn't hooked up, we don't need to access</div><div class='del'>-	 * the pendown state.</div><div class='del'>-	 */</div><div class='del'>-	if (pdata-&gt;get_pendown_state == NULL) {</div><div class='del'>-		dev_dbg(&amp;spi-&gt;dev, "no get_pendown_state function?\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* We'd set TX wordsize 8 bits and RX wordsize to 13 bits ... except</div><div class='ctx'> 	 * that even if the hardware can do that, the SPI controller driver</div><div class='ctx'> 	 * may not.  So we stick to very-portable 8 bit words, both RX and TX.</div><div class='hunk'>@@ -853,14 +896,16 @@ static int __devinit ads7846_probe(struct spi_device *spi)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	ts = kzalloc(sizeof(struct ads7846), GFP_KERNEL);</div><div class='add'>+	packet = kzalloc(sizeof(struct ads7846_packet), GFP_KERNEL);</div><div class='ctx'> 	input_dev = input_allocate_device();</div><div class='del'>-	if (!ts || !input_dev) {</div><div class='add'>+	if (!ts || !packet || !input_dev) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto err_free_mem;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dev_set_drvdata(&amp;spi-&gt;dev, ts);</div><div class='ctx'> </div><div class='add'>+	ts-&gt;packet = packet;</div><div class='ctx'> 	ts-&gt;spi = spi;</div><div class='ctx'> 	ts-&gt;input = input_dev;</div><div class='ctx'> 	ts-&gt;vref_mv = pdata-&gt;vref_mv;</div><div class='hunk'>@@ -893,7 +938,10 @@ static int __devinit ads7846_probe(struct spi_device *spi)</div><div class='ctx'> 		ts-&gt;filter_data = ts;</div><div class='ctx'> 	} else</div><div class='ctx'> 		ts-&gt;filter = ads7846_no_filter;</div><div class='del'>-	ts-&gt;get_pendown_state = pdata-&gt;get_pendown_state;</div><div class='add'>+</div><div class='add'>+	err = setup_pendown(spi, ts);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_cleanup_filter;</div><div class='ctx'> </div><div class='ctx'> 	if (pdata-&gt;penirq_recheck_delay_usecs)</div><div class='ctx'> 		ts-&gt;penirq_recheck_delay_usecs =</div><div class='hunk'>@@ -929,13 +977,13 @@ static int __devinit ads7846_probe(struct spi_device *spi)</div><div class='ctx'> 	spi_message_init(m);</div><div class='ctx'> </div><div class='ctx'> 	/* y- still on; turn on only y+ (and ADC) */</div><div class='del'>-	ts-&gt;read_y = READ_Y(vref);</div><div class='del'>-	x-&gt;tx_buf = &amp;ts-&gt;read_y;</div><div class='add'>+	packet-&gt;read_y = READ_Y(vref);</div><div class='add'>+	x-&gt;tx_buf = &amp;packet-&gt;read_y;</div><div class='ctx'> 	x-&gt;len = 1;</div><div class='ctx'> 	spi_message_add_tail(x, m);</div><div class='ctx'> </div><div class='ctx'> 	x++;</div><div class='del'>-	x-&gt;rx_buf = &amp;ts-&gt;tc.y;</div><div class='add'>+	x-&gt;rx_buf = &amp;packet-&gt;tc.y;</div><div class='ctx'> 	x-&gt;len = 2;</div><div class='ctx'> 	spi_message_add_tail(x, m);</div><div class='ctx'> </div><div class='hunk'>@@ -947,12 +995,12 @@ static int __devinit ads7846_probe(struct spi_device *spi)</div><div class='ctx'> 		x-&gt;delay_usecs = pdata-&gt;settle_delay_usecs;</div><div class='ctx'> </div><div class='ctx'> 		x++;</div><div class='del'>-		x-&gt;tx_buf = &amp;ts-&gt;read_y;</div><div class='add'>+		x-&gt;tx_buf = &amp;packet-&gt;read_y;</div><div class='ctx'> 		x-&gt;len = 1;</div><div class='ctx'> 		spi_message_add_tail(x, m);</div><div class='ctx'> </div><div class='ctx'> 		x++;</div><div class='del'>-		x-&gt;rx_buf = &amp;ts-&gt;tc.y;</div><div class='add'>+		x-&gt;rx_buf = &amp;packet-&gt;tc.y;</div><div class='ctx'> 		x-&gt;len = 2;</div><div class='ctx'> 		spi_message_add_tail(x, m);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -965,13 +1013,13 @@ static int __devinit ads7846_probe(struct spi_device *spi)</div><div class='ctx'> </div><div class='ctx'> 	/* turn y- off, x+ on, then leave in lowpower */</div><div class='ctx'> 	x++;</div><div class='del'>-	ts-&gt;read_x = READ_X(vref);</div><div class='del'>-	x-&gt;tx_buf = &amp;ts-&gt;read_x;</div><div class='add'>+	packet-&gt;read_x = READ_X(vref);</div><div class='add'>+	x-&gt;tx_buf = &amp;packet-&gt;read_x;</div><div class='ctx'> 	x-&gt;len = 1;</div><div class='ctx'> 	spi_message_add_tail(x, m);</div><div class='ctx'> </div><div class='ctx'> 	x++;</div><div class='del'>-	x-&gt;rx_buf = &amp;ts-&gt;tc.x;</div><div class='add'>+	x-&gt;rx_buf = &amp;packet-&gt;tc.x;</div><div class='ctx'> 	x-&gt;len = 2;</div><div class='ctx'> 	spi_message_add_tail(x, m);</div><div class='ctx'> </div><div class='hunk'>@@ -980,12 +1028,12 @@ static int __devinit ads7846_probe(struct spi_device *spi)</div><div class='ctx'> 		x-&gt;delay_usecs = pdata-&gt;settle_delay_usecs;</div><div class='ctx'> </div><div class='ctx'> 		x++;</div><div class='del'>-		x-&gt;tx_buf = &amp;ts-&gt;read_x;</div><div class='add'>+		x-&gt;tx_buf = &amp;packet-&gt;read_x;</div><div class='ctx'> 		x-&gt;len = 1;</div><div class='ctx'> 		spi_message_add_tail(x, m);</div><div class='ctx'> </div><div class='ctx'> 		x++;</div><div class='del'>-		x-&gt;rx_buf = &amp;ts-&gt;tc.x;</div><div class='add'>+		x-&gt;rx_buf = &amp;packet-&gt;tc.x;</div><div class='ctx'> 		x-&gt;len = 2;</div><div class='ctx'> 		spi_message_add_tail(x, m);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -999,13 +1047,13 @@ static int __devinit ads7846_probe(struct spi_device *spi)</div><div class='ctx'> 		spi_message_init(m);</div><div class='ctx'> </div><div class='ctx'> 		x++;</div><div class='del'>-		ts-&gt;read_z1 = READ_Z1(vref);</div><div class='del'>-		x-&gt;tx_buf = &amp;ts-&gt;read_z1;</div><div class='add'>+		packet-&gt;read_z1 = READ_Z1(vref);</div><div class='add'>+		x-&gt;tx_buf = &amp;packet-&gt;read_z1;</div><div class='ctx'> 		x-&gt;len = 1;</div><div class='ctx'> 		spi_message_add_tail(x, m);</div><div class='ctx'> </div><div class='ctx'> 		x++;</div><div class='del'>-		x-&gt;rx_buf = &amp;ts-&gt;tc.z1;</div><div class='add'>+		x-&gt;rx_buf = &amp;packet-&gt;tc.z1;</div><div class='ctx'> 		x-&gt;len = 2;</div><div class='ctx'> 		spi_message_add_tail(x, m);</div><div class='ctx'> </div><div class='hunk'>@@ -1014,12 +1062,12 @@ static int __devinit ads7846_probe(struct spi_device *spi)</div><div class='ctx'> 			x-&gt;delay_usecs = pdata-&gt;settle_delay_usecs;</div><div class='ctx'> </div><div class='ctx'> 			x++;</div><div class='del'>-			x-&gt;tx_buf = &amp;ts-&gt;read_z1;</div><div class='add'>+			x-&gt;tx_buf = &amp;packet-&gt;read_z1;</div><div class='ctx'> 			x-&gt;len = 1;</div><div class='ctx'> 			spi_message_add_tail(x, m);</div><div class='ctx'> </div><div class='ctx'> 			x++;</div><div class='del'>-			x-&gt;rx_buf = &amp;ts-&gt;tc.z1;</div><div class='add'>+			x-&gt;rx_buf = &amp;packet-&gt;tc.z1;</div><div class='ctx'> 			x-&gt;len = 2;</div><div class='ctx'> 			spi_message_add_tail(x, m);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1031,13 +1079,13 @@ static int __devinit ads7846_probe(struct spi_device *spi)</div><div class='ctx'> 		spi_message_init(m);</div><div class='ctx'> </div><div class='ctx'> 		x++;</div><div class='del'>-		ts-&gt;read_z2 = READ_Z2(vref);</div><div class='del'>-		x-&gt;tx_buf = &amp;ts-&gt;read_z2;</div><div class='add'>+		packet-&gt;read_z2 = READ_Z2(vref);</div><div class='add'>+		x-&gt;tx_buf = &amp;packet-&gt;read_z2;</div><div class='ctx'> 		x-&gt;len = 1;</div><div class='ctx'> 		spi_message_add_tail(x, m);</div><div class='ctx'> </div><div class='ctx'> 		x++;</div><div class='del'>-		x-&gt;rx_buf = &amp;ts-&gt;tc.z2;</div><div class='add'>+		x-&gt;rx_buf = &amp;packet-&gt;tc.z2;</div><div class='ctx'> 		x-&gt;len = 2;</div><div class='ctx'> 		spi_message_add_tail(x, m);</div><div class='ctx'> </div><div class='hunk'>@@ -1046,12 +1094,12 @@ static int __devinit ads7846_probe(struct spi_device *spi)</div><div class='ctx'> 			x-&gt;delay_usecs = pdata-&gt;settle_delay_usecs;</div><div class='ctx'> </div><div class='ctx'> 			x++;</div><div class='del'>-			x-&gt;tx_buf = &amp;ts-&gt;read_z2;</div><div class='add'>+			x-&gt;tx_buf = &amp;packet-&gt;read_z2;</div><div class='ctx'> 			x-&gt;len = 1;</div><div class='ctx'> 			spi_message_add_tail(x, m);</div><div class='ctx'> </div><div class='ctx'> 			x++;</div><div class='del'>-			x-&gt;rx_buf = &amp;ts-&gt;tc.z2;</div><div class='add'>+			x-&gt;rx_buf = &amp;packet-&gt;tc.z2;</div><div class='ctx'> 			x-&gt;len = 2;</div><div class='ctx'> 			spi_message_add_tail(x, m);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1065,13 +1113,13 @@ static int __devinit ads7846_probe(struct spi_device *spi)</div><div class='ctx'> 	spi_message_init(m);</div><div class='ctx'> </div><div class='ctx'> 	x++;</div><div class='del'>-	ts-&gt;pwrdown = PWRDOWN;</div><div class='del'>-	x-&gt;tx_buf = &amp;ts-&gt;pwrdown;</div><div class='add'>+	packet-&gt;pwrdown = PWRDOWN;</div><div class='add'>+	x-&gt;tx_buf = &amp;packet-&gt;pwrdown;</div><div class='ctx'> 	x-&gt;len = 1;</div><div class='ctx'> 	spi_message_add_tail(x, m);</div><div class='ctx'> </div><div class='ctx'> 	x++;</div><div class='del'>-	x-&gt;rx_buf = &amp;ts-&gt;dummy;</div><div class='add'>+	x-&gt;rx_buf = &amp;packet-&gt;dummy;</div><div class='ctx'> 	x-&gt;len = 2;</div><div class='ctx'> 	CS_CHANGE(*x);</div><div class='ctx'> 	spi_message_add_tail(x, m);</div><div class='hunk'>@@ -1085,7 +1133,7 @@ static int __devinit ads7846_probe(struct spi_device *spi)</div><div class='ctx'> 			spi-&gt;dev.driver-&gt;name, ts)) {</div><div class='ctx'> 		dev_dbg(&amp;spi-&gt;dev, "irq %d busy?\n", spi-&gt;irq);</div><div class='ctx'> 		err = -EBUSY;</div><div class='del'>-		goto err_cleanup_filter;</div><div class='add'>+		goto err_free_gpio;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = ads784x_hwmon_register(spi, ts);</div><div class='hunk'>@@ -1116,11 +1164,15 @@ static int __devinit ads7846_probe(struct spi_device *spi)</div><div class='ctx'> 	ads784x_hwmon_unregister(spi, ts);</div><div class='ctx'>  err_free_irq:</div><div class='ctx'> 	free_irq(spi-&gt;irq, ts);</div><div class='add'>+ err_free_gpio:</div><div class='add'>+	if (ts-&gt;gpio_pendown != -1)</div><div class='add'>+		gpio_free(ts-&gt;gpio_pendown);</div><div class='ctx'>  err_cleanup_filter:</div><div class='ctx'> 	if (ts-&gt;filter_cleanup)</div><div class='ctx'> 		ts-&gt;filter_cleanup(ts-&gt;filter_data);</div><div class='ctx'>  err_free_mem:</div><div class='ctx'> 	input_free_device(input_dev);</div><div class='add'>+	kfree(packet);</div><div class='ctx'> 	kfree(ts);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -1140,9 +1192,13 @@ static int __devexit ads7846_remove(struct spi_device *spi)</div><div class='ctx'> 	/* suspend left the IRQ disabled */</div><div class='ctx'> 	enable_irq(ts-&gt;spi-&gt;irq);</div><div class='ctx'> </div><div class='add'>+	if (ts-&gt;gpio_pendown != -1)</div><div class='add'>+		gpio_free(ts-&gt;gpio_pendown);</div><div class='add'>+</div><div class='ctx'> 	if (ts-&gt;filter_cleanup)</div><div class='ctx'> 		ts-&gt;filter_cleanup(ts-&gt;filter_data);</div><div class='ctx'> </div><div class='add'>+	kfree(ts-&gt;packet);</div><div class='ctx'> 	kfree(ts);</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(&amp;spi-&gt;dev, "unregistered touchscreen\n");</div><div class='head'>diff --git a/drivers/input/touchscreen/atmel_tsadcc.c b/drivers/input/touchscreen/atmel_tsadcc.c<br/>index eee126b19e8b..a89a6a8f05e6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/touchscreen/atmel_tsadcc.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/input/touchscreen/atmel_tsadcc.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/touchscreen/atmel_tsadcc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/touchscreen/atmel_tsadcc.c</a></div><div class='hunk'>@@ -91,6 +91,9 @@ struct atmel_tsadcc {</div><div class='ctx'> 	char			phys[32];</div><div class='ctx'> 	struct clk		*clk;</div><div class='ctx'> 	int			irq;</div><div class='add'>+	unsigned int		prev_absx;</div><div class='add'>+	unsigned int		prev_absy;</div><div class='add'>+	unsigned char		bufferedmeasure;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void __iomem		*tsc_base;</div><div class='hunk'>@@ -100,10 +103,9 @@ static void __iomem		*tsc_base;</div><div class='ctx'> </div><div class='ctx'> static irqreturn_t atmel_tsadcc_interrupt(int irq, void *dev)</div><div class='ctx'> {</div><div class='del'>-	struct input_dev *input_dev = ((struct atmel_tsadcc *)dev)-&gt;input;</div><div class='add'>+	struct atmel_tsadcc	*ts_dev = (struct atmel_tsadcc *)dev;</div><div class='add'>+	struct input_dev	*input_dev = ts_dev-&gt;input;</div><div class='ctx'> </div><div class='del'>-	unsigned int absx;</div><div class='del'>-	unsigned int absy;</div><div class='ctx'> 	unsigned int status;</div><div class='ctx'> 	unsigned int reg;</div><div class='ctx'> </div><div class='hunk'>@@ -121,6 +123,7 @@ static irqreturn_t atmel_tsadcc_interrupt(int irq, void *dev)</div><div class='ctx'> 		atmel_tsadcc_write(ATMEL_TSADCC_IER, ATMEL_TSADCC_PENCNT);</div><div class='ctx'> </div><div class='ctx'> 		input_report_key(input_dev, BTN_TOUCH, 0);</div><div class='add'>+		ts_dev-&gt;bufferedmeasure = 0;</div><div class='ctx'> 		input_sync(input_dev);</div><div class='ctx'> </div><div class='ctx'> 	} else if (status &amp; ATMEL_TSADCC_PENCNT) {</div><div class='hunk'>@@ -138,16 +141,23 @@ static irqreturn_t atmel_tsadcc_interrupt(int irq, void *dev)</div><div class='ctx'> 	} else if (status &amp; ATMEL_TSADCC_EOC(3)) {</div><div class='ctx'> 		/* Conversion finished */</div><div class='ctx'> </div><div class='del'>-		absx = atmel_tsadcc_read(ATMEL_TSADCC_CDR3) &lt;&lt; 10;</div><div class='del'>-		absx /= atmel_tsadcc_read(ATMEL_TSADCC_CDR2);</div><div class='del'>-</div><div class='del'>-		absy = atmel_tsadcc_read(ATMEL_TSADCC_CDR1) &lt;&lt; 10;</div><div class='del'>-		absy /= atmel_tsadcc_read(ATMEL_TSADCC_CDR0);</div><div class='del'>-</div><div class='del'>-		input_report_abs(input_dev, ABS_X, absx);</div><div class='del'>-		input_report_abs(input_dev, ABS_Y, absy);</div><div class='del'>-		input_report_key(input_dev, BTN_TOUCH, 1);</div><div class='del'>-		input_sync(input_dev);</div><div class='add'>+		if (ts_dev-&gt;bufferedmeasure) {</div><div class='add'>+			/* Last measurement is always discarded, since it can</div><div class='add'>+			 * be erroneous.</div><div class='add'>+			 * Always report previous measurement */</div><div class='add'>+			input_report_abs(input_dev, ABS_X, ts_dev-&gt;prev_absx);</div><div class='add'>+			input_report_abs(input_dev, ABS_Y, ts_dev-&gt;prev_absy);</div><div class='add'>+			input_report_key(input_dev, BTN_TOUCH, 1);</div><div class='add'>+			input_sync(input_dev);</div><div class='add'>+		} else</div><div class='add'>+			ts_dev-&gt;bufferedmeasure = 1;</div><div class='add'>+</div><div class='add'>+		/* Now make new measurement */</div><div class='add'>+		ts_dev-&gt;prev_absx = atmel_tsadcc_read(ATMEL_TSADCC_CDR3) &lt;&lt; 10;</div><div class='add'>+		ts_dev-&gt;prev_absx /= atmel_tsadcc_read(ATMEL_TSADCC_CDR2);</div><div class='add'>+</div><div class='add'>+		ts_dev-&gt;prev_absy = atmel_tsadcc_read(ATMEL_TSADCC_CDR1) &lt;&lt; 10;</div><div class='add'>+		ts_dev-&gt;prev_absy /= atmel_tsadcc_read(ATMEL_TSADCC_CDR0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='hunk'>@@ -223,6 +233,7 @@ static int __devinit atmel_tsadcc_probe(struct platform_device *pdev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ts_dev-&gt;input = input_dev;</div><div class='add'>+	ts_dev-&gt;bufferedmeasure = 0;</div><div class='ctx'> </div><div class='ctx'> 	snprintf(ts_dev-&gt;phys, sizeof(ts_dev-&gt;phys),</div><div class='ctx'> 		 "%s/input0", pdev-&gt;dev.bus_id);</div><div class='head'>diff --git a/drivers/input/touchscreen/mainstone-wm97xx.c b/drivers/input/touchscreen/mainstone-wm97xx.c<br/>index 37a555f37306..ba648750a8d9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/touchscreen/mainstone-wm97xx.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/input/touchscreen/mainstone-wm97xx.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/touchscreen/mainstone-wm97xx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/touchscreen/mainstone-wm97xx.c</a></div><div class='hunk'>@@ -3,8 +3,7 @@</div><div class='ctx'>  *                         Wolfson WM97xx AC97 Codecs.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2004, 2007 Wolfson Microelectronics PLC.</div><div class='del'>- * Author: Liam Girdwood</div><div class='del'>- *         liam.girdwood@wolfsonmicro.com or linux@wolfsonmicro.com</div><div class='add'>+ * Author: Liam Girdwood &lt;lrg@slimlogic.co.uk&gt;</div><div class='ctx'>  * Parts Copyright : Ian Molton &lt;spyro@f2s.com&gt;</div><div class='ctx'>  *                   Andrew Zabolotny &lt;zap@homelink.ru&gt;</div><div class='ctx'>  *</div><div class='hunk'>@@ -296,6 +295,6 @@ module_init(mainstone_wm97xx_init);</div><div class='ctx'> module_exit(mainstone_wm97xx_exit);</div><div class='ctx'> </div><div class='ctx'> /* Module information */</div><div class='del'>-MODULE_AUTHOR("Liam Girdwood &lt;liam.girdwood@wolfsonmicro.com&gt;");</div><div class='add'>+MODULE_AUTHOR("Liam Girdwood &lt;lrg@slimlogic.co.uk&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("wm97xx continuous touch driver for mainstone");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/input/touchscreen/ucb1400_ts.c b/drivers/input/touchscreen/ucb1400_ts.c<br/>index bce018e45bce..54986627def0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/touchscreen/ucb1400_ts.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/input/touchscreen/ucb1400_ts.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/touchscreen/ucb1400_ts.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/touchscreen/ucb1400_ts.c</a></div><div class='hunk'>@@ -5,6 +5,10 @@</div><div class='ctx'>  *  Created:	September 25, 2006</div><div class='ctx'>  *  Copyright:	MontaVista Software, Inc.</div><div class='ctx'>  *</div><div class='add'>+ * Spliting done by: Marek Vasut &lt;marek.vasut@gmail.com&gt;</div><div class='add'>+ * If something doesnt work and it worked before spliting, e-mail me,</div><div class='add'>+ * dont bother Nicolas please ;-)</div><div class='add'>+ *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of the GNU General Public License version 2 as</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='hunk'>@@ -25,124 +29,16 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/kthread.h&gt;</div><div class='ctx'> #include &lt;linux/freezer.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;sound/core.h&gt;</div><div class='del'>-#include &lt;sound/ac97_codec.h&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Interesting UCB1400 AC-link registers</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define UCB_IE_RIS		0x5e</div><div class='del'>-#define UCB_IE_FAL		0x60</div><div class='del'>-#define UCB_IE_STATUS		0x62</div><div class='del'>-#define UCB_IE_CLEAR		0x62</div><div class='del'>-#define UCB_IE_ADC		(1 &lt;&lt; 11)</div><div class='del'>-#define UCB_IE_TSPX		(1 &lt;&lt; 12)</div><div class='del'>-</div><div class='del'>-#define UCB_TS_CR		0x64</div><div class='del'>-#define UCB_TS_CR_TSMX_POW	(1 &lt;&lt; 0)</div><div class='del'>-#define UCB_TS_CR_TSPX_POW	(1 &lt;&lt; 1)</div><div class='del'>-#define UCB_TS_CR_TSMY_POW	(1 &lt;&lt; 2)</div><div class='del'>-#define UCB_TS_CR_TSPY_POW	(1 &lt;&lt; 3)</div><div class='del'>-#define UCB_TS_CR_TSMX_GND	(1 &lt;&lt; 4)</div><div class='del'>-#define UCB_TS_CR_TSPX_GND	(1 &lt;&lt; 5)</div><div class='del'>-#define UCB_TS_CR_TSMY_GND	(1 &lt;&lt; 6)</div><div class='del'>-#define UCB_TS_CR_TSPY_GND	(1 &lt;&lt; 7)</div><div class='del'>-#define UCB_TS_CR_MODE_INT	(0 &lt;&lt; 8)</div><div class='del'>-#define UCB_TS_CR_MODE_PRES	(1 &lt;&lt; 8)</div><div class='del'>-#define UCB_TS_CR_MODE_POS	(2 &lt;&lt; 8)</div><div class='del'>-#define UCB_TS_CR_BIAS_ENA	(1 &lt;&lt; 11)</div><div class='del'>-#define UCB_TS_CR_TSPX_LOW	(1 &lt;&lt; 12)</div><div class='del'>-#define UCB_TS_CR_TSMX_LOW	(1 &lt;&lt; 13)</div><div class='del'>-</div><div class='del'>-#define UCB_ADC_CR		0x66</div><div class='del'>-#define UCB_ADC_SYNC_ENA	(1 &lt;&lt; 0)</div><div class='del'>-#define UCB_ADC_VREFBYP_CON	(1 &lt;&lt; 1)</div><div class='del'>-#define UCB_ADC_INP_TSPX	(0 &lt;&lt; 2)</div><div class='del'>-#define UCB_ADC_INP_TSMX	(1 &lt;&lt; 2)</div><div class='del'>-#define UCB_ADC_INP_TSPY	(2 &lt;&lt; 2)</div><div class='del'>-#define UCB_ADC_INP_TSMY	(3 &lt;&lt; 2)</div><div class='del'>-#define UCB_ADC_INP_AD0		(4 &lt;&lt; 2)</div><div class='del'>-#define UCB_ADC_INP_AD1		(5 &lt;&lt; 2)</div><div class='del'>-#define UCB_ADC_INP_AD2		(6 &lt;&lt; 2)</div><div class='del'>-#define UCB_ADC_INP_AD3		(7 &lt;&lt; 2)</div><div class='del'>-#define UCB_ADC_EXT_REF		(1 &lt;&lt; 5)</div><div class='del'>-#define UCB_ADC_START		(1 &lt;&lt; 7)</div><div class='del'>-#define UCB_ADC_ENA		(1 &lt;&lt; 15)</div><div class='del'>-</div><div class='del'>-#define UCB_ADC_DATA		0x68</div><div class='del'>-#define UCB_ADC_DAT_VALID	(1 &lt;&lt; 15)</div><div class='del'>-#define UCB_ADC_DAT_VALUE(x)	((x) &amp; 0x3ff)</div><div class='del'>-</div><div class='del'>-#define UCB_ID			0x7e</div><div class='del'>-#define UCB_ID_1400             0x4304</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-struct ucb1400 {</div><div class='del'>-	struct snd_ac97		*ac97;</div><div class='del'>-	struct input_dev	*ts_idev;</div><div class='del'>-</div><div class='del'>-	int			irq;</div><div class='del'>-</div><div class='del'>-	wait_queue_head_t	ts_wait;</div><div class='del'>-	struct task_struct	*ts_task;</div><div class='del'>-</div><div class='del'>-	unsigned int		irq_pending;	/* not bit field shared */</div><div class='del'>-	unsigned int		ts_restart:1;</div><div class='del'>-	unsigned int		adcsync:1;</div><div class='del'>-};</div><div class='add'>+#include &lt;linux/ucb1400.h&gt;</div><div class='ctx'> </div><div class='ctx'> static int adcsync;</div><div class='ctx'> static int ts_delay = 55; /* us */</div><div class='ctx'> static int ts_delay_pressure;	/* us */</div><div class='ctx'> </div><div class='del'>-static inline u16 ucb1400_reg_read(struct ucb1400 *ucb, u16 reg)</div><div class='del'>-{</div><div class='del'>-	return ucb-&gt;ac97-&gt;bus-&gt;ops-&gt;read(ucb-&gt;ac97, reg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void ucb1400_reg_write(struct ucb1400 *ucb, u16 reg, u16 val)</div><div class='del'>-{</div><div class='del'>-	ucb-&gt;ac97-&gt;bus-&gt;ops-&gt;write(ucb-&gt;ac97, reg, val);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void ucb1400_adc_enable(struct ucb1400 *ucb)</div><div class='del'>-{</div><div class='del'>-	ucb1400_reg_write(ucb, UCB_ADC_CR, UCB_ADC_ENA);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned int ucb1400_adc_read(struct ucb1400 *ucb, u16 adc_channel)</div><div class='del'>-{</div><div class='del'>-	unsigned int val;</div><div class='del'>-</div><div class='del'>-	if (ucb-&gt;adcsync)</div><div class='del'>-		adc_channel |= UCB_ADC_SYNC_ENA;</div><div class='del'>-</div><div class='del'>-	ucb1400_reg_write(ucb, UCB_ADC_CR, UCB_ADC_ENA | adc_channel);</div><div class='del'>-	ucb1400_reg_write(ucb, UCB_ADC_CR, UCB_ADC_ENA | adc_channel | UCB_ADC_START);</div><div class='del'>-</div><div class='del'>-	for (;;) {</div><div class='del'>-		val = ucb1400_reg_read(ucb, UCB_ADC_DATA);</div><div class='del'>-		if (val &amp; UCB_ADC_DAT_VALID)</div><div class='del'>-			break;</div><div class='del'>-		/* yield to other processes */</div><div class='del'>-		schedule_timeout_uninterruptible(1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return UCB_ADC_DAT_VALUE(val);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void ucb1400_adc_disable(struct ucb1400 *ucb)</div><div class='del'>-{</div><div class='del'>-	ucb1400_reg_write(ucb, UCB_ADC_CR, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* Switch to interrupt mode. */</div><div class='del'>-static inline void ucb1400_ts_mode_int(struct ucb1400 *ucb)</div><div class='add'>+static inline void ucb1400_ts_mode_int(struct snd_ac97 *ac97)</div><div class='ctx'> {</div><div class='del'>-	ucb1400_reg_write(ucb, UCB_TS_CR,</div><div class='add'>+	ucb1400_reg_write(ac97, UCB_TS_CR,</div><div class='ctx'> 			UCB_TS_CR_TSMX_POW | UCB_TS_CR_TSPX_POW |</div><div class='ctx'> 			UCB_TS_CR_TSMY_GND | UCB_TS_CR_TSPY_GND |</div><div class='ctx'> 			UCB_TS_CR_MODE_INT);</div><div class='hunk'>@@ -152,14 +48,14 @@ static inline void ucb1400_ts_mode_int(struct ucb1400 *ucb)</div><div class='ctx'>  * Switch to pressure mode, and read pressure.  We don't need to wait</div><div class='ctx'>  * here, since both plates are being driven.</div><div class='ctx'>  */</div><div class='del'>-static inline unsigned int ucb1400_ts_read_pressure(struct ucb1400 *ucb)</div><div class='add'>+static inline unsigned int ucb1400_ts_read_pressure(struct ucb1400_ts *ucb)</div><div class='ctx'> {</div><div class='del'>-	ucb1400_reg_write(ucb, UCB_TS_CR,</div><div class='add'>+	ucb1400_reg_write(ucb-&gt;ac97, UCB_TS_CR,</div><div class='ctx'> 			UCB_TS_CR_TSMX_POW | UCB_TS_CR_TSPX_POW |</div><div class='ctx'> 			UCB_TS_CR_TSMY_GND | UCB_TS_CR_TSPY_GND |</div><div class='ctx'> 			UCB_TS_CR_MODE_PRES | UCB_TS_CR_BIAS_ENA);</div><div class='ctx'> 	udelay(ts_delay_pressure);</div><div class='del'>-	return ucb1400_adc_read(ucb, UCB_ADC_INP_TSPY);</div><div class='add'>+	return ucb1400_adc_read(ucb-&gt;ac97, UCB_ADC_INP_TSPY, adcsync);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -168,21 +64,21 @@ static inline unsigned int ucb1400_ts_read_pressure(struct ucb1400 *ucb)</div><div class='ctx'>  * gives a faster response time.  Even so, we need to wait about 55us</div><div class='ctx'>  * for things to stabilise.</div><div class='ctx'>  */</div><div class='del'>-static inline unsigned int ucb1400_ts_read_xpos(struct ucb1400 *ucb)</div><div class='add'>+static inline unsigned int ucb1400_ts_read_xpos(struct ucb1400_ts *ucb)</div><div class='ctx'> {</div><div class='del'>-	ucb1400_reg_write(ucb, UCB_TS_CR,</div><div class='add'>+	ucb1400_reg_write(ucb-&gt;ac97, UCB_TS_CR,</div><div class='ctx'> 			UCB_TS_CR_TSMX_GND | UCB_TS_CR_TSPX_POW |</div><div class='ctx'> 			UCB_TS_CR_MODE_PRES | UCB_TS_CR_BIAS_ENA);</div><div class='del'>-	ucb1400_reg_write(ucb, UCB_TS_CR,</div><div class='add'>+	ucb1400_reg_write(ucb-&gt;ac97, UCB_TS_CR,</div><div class='ctx'> 			UCB_TS_CR_TSMX_GND | UCB_TS_CR_TSPX_POW |</div><div class='ctx'> 			UCB_TS_CR_MODE_PRES | UCB_TS_CR_BIAS_ENA);</div><div class='del'>-	ucb1400_reg_write(ucb, UCB_TS_CR,</div><div class='add'>+	ucb1400_reg_write(ucb-&gt;ac97, UCB_TS_CR,</div><div class='ctx'> 			UCB_TS_CR_TSMX_GND | UCB_TS_CR_TSPX_POW |</div><div class='ctx'> 			UCB_TS_CR_MODE_POS | UCB_TS_CR_BIAS_ENA);</div><div class='ctx'> </div><div class='ctx'> 	udelay(ts_delay);</div><div class='ctx'> </div><div class='del'>-	return ucb1400_adc_read(ucb, UCB_ADC_INP_TSPY);</div><div class='add'>+	return ucb1400_adc_read(ucb-&gt;ac97, UCB_ADC_INP_TSPY, adcsync);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -191,63 +87,63 @@ static inline unsigned int ucb1400_ts_read_xpos(struct ucb1400 *ucb)</div><div class='ctx'>  * gives a faster response time.  Even so, we need to wait about 55us</div><div class='ctx'>  * for things to stabilise.</div><div class='ctx'>  */</div><div class='del'>-static inline unsigned int ucb1400_ts_read_ypos(struct ucb1400 *ucb)</div><div class='add'>+static inline unsigned int ucb1400_ts_read_ypos(struct ucb1400_ts *ucb)</div><div class='ctx'> {</div><div class='del'>-	ucb1400_reg_write(ucb, UCB_TS_CR,</div><div class='add'>+	ucb1400_reg_write(ucb-&gt;ac97, UCB_TS_CR,</div><div class='ctx'> 			UCB_TS_CR_TSMY_GND | UCB_TS_CR_TSPY_POW |</div><div class='ctx'> 			UCB_TS_CR_MODE_PRES | UCB_TS_CR_BIAS_ENA);</div><div class='del'>-	ucb1400_reg_write(ucb, UCB_TS_CR,</div><div class='add'>+	ucb1400_reg_write(ucb-&gt;ac97, UCB_TS_CR,</div><div class='ctx'> 			UCB_TS_CR_TSMY_GND | UCB_TS_CR_TSPY_POW |</div><div class='ctx'> 			UCB_TS_CR_MODE_PRES | UCB_TS_CR_BIAS_ENA);</div><div class='del'>-	ucb1400_reg_write(ucb, UCB_TS_CR,</div><div class='add'>+	ucb1400_reg_write(ucb-&gt;ac97, UCB_TS_CR,</div><div class='ctx'> 			UCB_TS_CR_TSMY_GND | UCB_TS_CR_TSPY_POW |</div><div class='ctx'> 			UCB_TS_CR_MODE_POS | UCB_TS_CR_BIAS_ENA);</div><div class='ctx'> </div><div class='ctx'> 	udelay(ts_delay);</div><div class='ctx'> </div><div class='del'>-	return ucb1400_adc_read(ucb, UCB_ADC_INP_TSPX);</div><div class='add'>+	return ucb1400_adc_read(ucb-&gt;ac97, UCB_ADC_INP_TSPX, adcsync);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Switch to X plate resistance mode.  Set MX to ground, PX to</div><div class='ctx'>  * supply.  Measure current.</div><div class='ctx'>  */</div><div class='del'>-static inline unsigned int ucb1400_ts_read_xres(struct ucb1400 *ucb)</div><div class='add'>+static inline unsigned int ucb1400_ts_read_xres(struct ucb1400_ts *ucb)</div><div class='ctx'> {</div><div class='del'>-	ucb1400_reg_write(ucb, UCB_TS_CR,</div><div class='add'>+	ucb1400_reg_write(ucb-&gt;ac97, UCB_TS_CR,</div><div class='ctx'> 			UCB_TS_CR_TSMX_GND | UCB_TS_CR_TSPX_POW |</div><div class='ctx'> 			UCB_TS_CR_MODE_PRES | UCB_TS_CR_BIAS_ENA);</div><div class='del'>-	return ucb1400_adc_read(ucb, 0);</div><div class='add'>+	return ucb1400_adc_read(ucb-&gt;ac97, 0, adcsync);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Switch to Y plate resistance mode.  Set MY to ground, PY to</div><div class='ctx'>  * supply.  Measure current.</div><div class='ctx'>  */</div><div class='del'>-static inline unsigned int ucb1400_ts_read_yres(struct ucb1400 *ucb)</div><div class='add'>+static inline unsigned int ucb1400_ts_read_yres(struct ucb1400_ts *ucb)</div><div class='ctx'> {</div><div class='del'>-	ucb1400_reg_write(ucb, UCB_TS_CR,</div><div class='add'>+	ucb1400_reg_write(ucb-&gt;ac97, UCB_TS_CR,</div><div class='ctx'> 			UCB_TS_CR_TSMY_GND | UCB_TS_CR_TSPY_POW |</div><div class='ctx'> 			UCB_TS_CR_MODE_PRES | UCB_TS_CR_BIAS_ENA);</div><div class='del'>-	return ucb1400_adc_read(ucb, 0);</div><div class='add'>+	return ucb1400_adc_read(ucb-&gt;ac97, 0, adcsync);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int ucb1400_ts_pen_down(struct ucb1400 *ucb)</div><div class='add'>+static inline int ucb1400_ts_pen_down(struct snd_ac97 *ac97)</div><div class='ctx'> {</div><div class='del'>-	unsigned short val = ucb1400_reg_read(ucb, UCB_TS_CR);</div><div class='del'>-	return (val &amp; (UCB_TS_CR_TSPX_LOW | UCB_TS_CR_TSMX_LOW));</div><div class='add'>+	unsigned short val = ucb1400_reg_read(ac97, UCB_TS_CR);</div><div class='add'>+	return val &amp; (UCB_TS_CR_TSPX_LOW | UCB_TS_CR_TSMX_LOW);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void ucb1400_ts_irq_enable(struct ucb1400 *ucb)</div><div class='add'>+static inline void ucb1400_ts_irq_enable(struct snd_ac97 *ac97)</div><div class='ctx'> {</div><div class='del'>-	ucb1400_reg_write(ucb, UCB_IE_CLEAR, UCB_IE_TSPX);</div><div class='del'>-	ucb1400_reg_write(ucb, UCB_IE_CLEAR, 0);</div><div class='del'>-	ucb1400_reg_write(ucb, UCB_IE_FAL, UCB_IE_TSPX);</div><div class='add'>+	ucb1400_reg_write(ac97, UCB_IE_CLEAR, UCB_IE_TSPX);</div><div class='add'>+	ucb1400_reg_write(ac97, UCB_IE_CLEAR, 0);</div><div class='add'>+	ucb1400_reg_write(ac97, UCB_IE_FAL, UCB_IE_TSPX);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void ucb1400_ts_irq_disable(struct ucb1400 *ucb)</div><div class='add'>+static inline void ucb1400_ts_irq_disable(struct snd_ac97 *ac97)</div><div class='ctx'> {</div><div class='del'>-	ucb1400_reg_write(ucb, UCB_IE_FAL, 0);</div><div class='add'>+	ucb1400_reg_write(ac97, UCB_IE_FAL, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ucb1400_ts_evt_add(struct input_dev *idev, u16 pressure, u16 x, u16 y)</div><div class='hunk'>@@ -264,25 +160,24 @@ static void ucb1400_ts_event_release(struct input_dev *idev)</div><div class='ctx'> 	input_sync(idev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ucb1400_handle_pending_irq(struct ucb1400 *ucb)</div><div class='add'>+static void ucb1400_handle_pending_irq(struct ucb1400_ts *ucb)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int isr;</div><div class='ctx'> </div><div class='del'>-	isr = ucb1400_reg_read(ucb, UCB_IE_STATUS);</div><div class='del'>-	ucb1400_reg_write(ucb, UCB_IE_CLEAR, isr);</div><div class='del'>-	ucb1400_reg_write(ucb, UCB_IE_CLEAR, 0);</div><div class='add'>+	isr = ucb1400_reg_read(ucb-&gt;ac97, UCB_IE_STATUS);</div><div class='add'>+	ucb1400_reg_write(ucb-&gt;ac97, UCB_IE_CLEAR, isr);</div><div class='add'>+	ucb1400_reg_write(ucb-&gt;ac97, UCB_IE_CLEAR, 0);</div><div class='ctx'> </div><div class='del'>-	if (isr &amp; UCB_IE_TSPX)</div><div class='del'>-		ucb1400_ts_irq_disable(ucb);</div><div class='del'>-	else</div><div class='add'>+	if (isr &amp; UCB_IE_TSPX) {</div><div class='add'>+		ucb1400_ts_irq_disable(ucb-&gt;ac97);</div><div class='add'>+		enable_irq(ucb-&gt;irq);</div><div class='add'>+	} else</div><div class='ctx'> 		printk(KERN_ERR "ucb1400: unexpected IE_STATUS = %#x\n", isr);</div><div class='del'>-</div><div class='del'>-	enable_irq(ucb-&gt;irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ucb1400_ts_thread(void *_ucb)</div><div class='ctx'> {</div><div class='del'>-	struct ucb1400 *ucb = _ucb;</div><div class='add'>+	struct ucb1400_ts *ucb = _ucb;</div><div class='ctx'> 	struct task_struct *tsk = current;</div><div class='ctx'> 	int valid = 0;</div><div class='ctx'> 	struct sched_param param = { .sched_priority = 1 };</div><div class='hunk'>@@ -301,19 +196,19 @@ static int ucb1400_ts_thread(void *_ucb)</div><div class='ctx'> 			ucb1400_handle_pending_irq(ucb);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		ucb1400_adc_enable(ucb);</div><div class='add'>+		ucb1400_adc_enable(ucb-&gt;ac97);</div><div class='ctx'> 		x = ucb1400_ts_read_xpos(ucb);</div><div class='ctx'> 		y = ucb1400_ts_read_ypos(ucb);</div><div class='ctx'> 		p = ucb1400_ts_read_pressure(ucb);</div><div class='del'>-		ucb1400_adc_disable(ucb);</div><div class='add'>+		ucb1400_adc_disable(ucb-&gt;ac97);</div><div class='ctx'> </div><div class='ctx'> 		/* Switch back to interrupt mode. */</div><div class='del'>-		ucb1400_ts_mode_int(ucb);</div><div class='add'>+		ucb1400_ts_mode_int(ucb-&gt;ac97);</div><div class='ctx'> </div><div class='ctx'> 		msleep(10);</div><div class='ctx'> </div><div class='del'>-		if (ucb1400_ts_pen_down(ucb)) {</div><div class='del'>-			ucb1400_ts_irq_enable(ucb);</div><div class='add'>+		if (ucb1400_ts_pen_down(ucb-&gt;ac97)) {</div><div class='add'>+			ucb1400_ts_irq_enable(ucb-&gt;ac97);</div><div class='ctx'> </div><div class='ctx'> 			/*</div><div class='ctx'> 			 * If we spat out a valid sample set last time,</div><div class='hunk'>@@ -332,8 +227,8 @@ static int ucb1400_ts_thread(void *_ucb)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		wait_event_freezable_timeout(ucb-&gt;ts_wait,</div><div class='del'>-			ucb-&gt;irq_pending || ucb-&gt;ts_restart || kthread_should_stop(),</div><div class='del'>-			timeout);</div><div class='add'>+			ucb-&gt;irq_pending || ucb-&gt;ts_restart ||</div><div class='add'>+			kthread_should_stop(), timeout);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Send the "pen off" if we are stopping with the pen still active */</div><div class='hunk'>@@ -356,7 +251,7 @@ static int ucb1400_ts_thread(void *_ucb)</div><div class='ctx'>  */</div><div class='ctx'> static irqreturn_t ucb1400_hard_irq(int irqnr, void *devid)</div><div class='ctx'> {</div><div class='del'>-	struct ucb1400 *ucb = devid;</div><div class='add'>+	struct ucb1400_ts *ucb = devid;</div><div class='ctx'> </div><div class='ctx'> 	if (irqnr == ucb-&gt;irq) {</div><div class='ctx'> 		disable_irq(ucb-&gt;irq);</div><div class='hunk'>@@ -369,7 +264,7 @@ static irqreturn_t ucb1400_hard_irq(int irqnr, void *devid)</div><div class='ctx'> </div><div class='ctx'> static int ucb1400_ts_open(struct input_dev *idev)</div><div class='ctx'> {</div><div class='del'>-	struct ucb1400 *ucb = input_get_drvdata(idev);</div><div class='add'>+	struct ucb1400_ts *ucb = input_get_drvdata(idev);</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(ucb-&gt;ts_task);</div><div class='hunk'>@@ -385,34 +280,14 @@ static int ucb1400_ts_open(struct input_dev *idev)</div><div class='ctx'> </div><div class='ctx'> static void ucb1400_ts_close(struct input_dev *idev)</div><div class='ctx'> {</div><div class='del'>-	struct ucb1400 *ucb = input_get_drvdata(idev);</div><div class='add'>+	struct ucb1400_ts *ucb = input_get_drvdata(idev);</div><div class='ctx'> </div><div class='ctx'> 	if (ucb-&gt;ts_task)</div><div class='ctx'> 		kthread_stop(ucb-&gt;ts_task);</div><div class='ctx'> </div><div class='del'>-	ucb1400_ts_irq_disable(ucb);</div><div class='del'>-	ucb1400_reg_write(ucb, UCB_TS_CR, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-static int ucb1400_ts_resume(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	struct ucb1400 *ucb = dev_get_drvdata(dev);</div><div class='del'>-</div><div class='del'>-	if (ucb-&gt;ts_task) {</div><div class='del'>-		/*</div><div class='del'>-		 * Restart the TS thread to ensure the</div><div class='del'>-		 * TS interrupt mode is set up again</div><div class='del'>-		 * after sleep.</div><div class='del'>-		 */</div><div class='del'>-		ucb-&gt;ts_restart = 1;</div><div class='del'>-		wake_up(&amp;ucb-&gt;ts_wait);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='add'>+	ucb1400_ts_irq_disable(ucb-&gt;ac97);</div><div class='add'>+	ucb1400_reg_write(ucb-&gt;ac97, UCB_TS_CR, 0);</div><div class='ctx'> }</div><div class='del'>-#else</div><div class='del'>-#define ucb1400_ts_resume NULL</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> #ifndef NO_IRQ</div><div class='ctx'> #define NO_IRQ	0</div><div class='hunk'>@@ -422,25 +297,26 @@ static int ucb1400_ts_resume(struct device *dev)</div><div class='ctx'>  * Try to probe our interrupt, rather than relying on lots of</div><div class='ctx'>  * hard-coded machine dependencies.</div><div class='ctx'>  */</div><div class='del'>-static int ucb1400_detect_irq(struct ucb1400 *ucb)</div><div class='add'>+static int ucb1400_ts_detect_irq(struct ucb1400_ts *ucb)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long mask, timeout;</div><div class='ctx'> </div><div class='ctx'> 	mask = probe_irq_on();</div><div class='ctx'> </div><div class='ctx'> 	/* Enable the ADC interrupt. */</div><div class='del'>-	ucb1400_reg_write(ucb, UCB_IE_RIS, UCB_IE_ADC);</div><div class='del'>-	ucb1400_reg_write(ucb, UCB_IE_FAL, UCB_IE_ADC);</div><div class='del'>-	ucb1400_reg_write(ucb, UCB_IE_CLEAR, 0xffff);</div><div class='del'>-	ucb1400_reg_write(ucb, UCB_IE_CLEAR, 0);</div><div class='add'>+	ucb1400_reg_write(ucb-&gt;ac97, UCB_IE_RIS, UCB_IE_ADC);</div><div class='add'>+	ucb1400_reg_write(ucb-&gt;ac97, UCB_IE_FAL, UCB_IE_ADC);</div><div class='add'>+	ucb1400_reg_write(ucb-&gt;ac97, UCB_IE_CLEAR, 0xffff);</div><div class='add'>+	ucb1400_reg_write(ucb-&gt;ac97, UCB_IE_CLEAR, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* Cause an ADC interrupt. */</div><div class='del'>-	ucb1400_reg_write(ucb, UCB_ADC_CR, UCB_ADC_ENA);</div><div class='del'>-	ucb1400_reg_write(ucb, UCB_ADC_CR, UCB_ADC_ENA | UCB_ADC_START);</div><div class='add'>+	ucb1400_reg_write(ucb-&gt;ac97, UCB_ADC_CR, UCB_ADC_ENA);</div><div class='add'>+	ucb1400_reg_write(ucb-&gt;ac97, UCB_ADC_CR, UCB_ADC_ENA | UCB_ADC_START);</div><div class='ctx'> </div><div class='ctx'> 	/* Wait for the conversion to complete. */</div><div class='ctx'> 	timeout = jiffies + HZ/2;</div><div class='del'>-	while (!(ucb1400_reg_read(ucb, UCB_ADC_DATA) &amp; UCB_ADC_DAT_VALID)) {</div><div class='add'>+	while (!(ucb1400_reg_read(ucb-&gt;ac97, UCB_ADC_DATA) &amp;</div><div class='add'>+						UCB_ADC_DAT_VALID)) {</div><div class='ctx'> 		cpu_relax();</div><div class='ctx'> 		if (time_after(jiffies, timeout)) {</div><div class='ctx'> 			printk(KERN_ERR "ucb1400: timed out in IRQ probe\n");</div><div class='hunk'>@@ -448,13 +324,13 @@ static int ucb1400_detect_irq(struct ucb1400 *ucb)</div><div class='ctx'> 			return -ENODEV;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	ucb1400_reg_write(ucb, UCB_ADC_CR, 0);</div><div class='add'>+	ucb1400_reg_write(ucb-&gt;ac97, UCB_ADC_CR, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* Disable and clear interrupt. */</div><div class='del'>-	ucb1400_reg_write(ucb, UCB_IE_RIS, 0);</div><div class='del'>-	ucb1400_reg_write(ucb, UCB_IE_FAL, 0);</div><div class='del'>-	ucb1400_reg_write(ucb, UCB_IE_CLEAR, 0xffff);</div><div class='del'>-	ucb1400_reg_write(ucb, UCB_IE_CLEAR, 0);</div><div class='add'>+	ucb1400_reg_write(ucb-&gt;ac97, UCB_IE_RIS, 0);</div><div class='add'>+	ucb1400_reg_write(ucb-&gt;ac97, UCB_IE_FAL, 0);</div><div class='add'>+	ucb1400_reg_write(ucb-&gt;ac97, UCB_IE_CLEAR, 0xffff);</div><div class='add'>+	ucb1400_reg_write(ucb-&gt;ac97, UCB_IE_CLEAR, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* Read triggered interrupt. */</div><div class='ctx'> 	ucb-&gt;irq = probe_irq_off(mask);</div><div class='hunk'>@@ -464,36 +340,25 @@ static int ucb1400_detect_irq(struct ucb1400 *ucb)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ucb1400_ts_probe(struct device *dev)</div><div class='add'>+static int ucb1400_ts_probe(struct platform_device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct ucb1400 *ucb;</div><div class='del'>-	struct input_dev *idev;</div><div class='del'>-	int error, id, x_res, y_res;</div><div class='add'>+	int error, x_res, y_res;</div><div class='add'>+	struct ucb1400_ts *ucb = dev-&gt;dev.platform_data;</div><div class='ctx'> </div><div class='del'>-	ucb = kzalloc(sizeof(struct ucb1400), GFP_KERNEL);</div><div class='del'>-	idev = input_allocate_device();</div><div class='del'>-	if (!ucb || !idev) {</div><div class='add'>+	ucb-&gt;ts_idev = input_allocate_device();</div><div class='add'>+	if (!ucb-&gt;ts_idev) {</div><div class='ctx'> 		error = -ENOMEM;</div><div class='del'>-		goto err_free_devs;</div><div class='add'>+		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ucb-&gt;ts_idev = idev;</div><div class='del'>-	ucb-&gt;adcsync = adcsync;</div><div class='del'>-	ucb-&gt;ac97 = to_ac97_t(dev);</div><div class='del'>-	init_waitqueue_head(&amp;ucb-&gt;ts_wait);</div><div class='del'>-</div><div class='del'>-	id = ucb1400_reg_read(ucb, UCB_ID);</div><div class='del'>-	if (id != UCB_ID_1400) {</div><div class='del'>-		error = -ENODEV;</div><div class='del'>-		goto err_free_devs;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	error = ucb1400_detect_irq(ucb);</div><div class='add'>+	error = ucb1400_ts_detect_irq(ucb);</div><div class='ctx'> 	if (error) {</div><div class='ctx'> 		printk(KERN_ERR "UCB1400: IRQ probe failed\n");</div><div class='ctx'> 		goto err_free_devs;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	init_waitqueue_head(&amp;ucb-&gt;ts_wait);</div><div class='add'>+</div><div class='ctx'> 	error = request_irq(ucb-&gt;irq, ucb1400_hard_irq, IRQF_TRIGGER_RISING,</div><div class='ctx'> 				"UCB1400", ucb);</div><div class='ctx'> 	if (error) {</div><div class='hunk'>@@ -503,80 +368,101 @@ static int ucb1400_ts_probe(struct device *dev)</div><div class='ctx'> 	}</div><div class='ctx'> 	printk(KERN_DEBUG "UCB1400: found IRQ %d\n", ucb-&gt;irq);</div><div class='ctx'> </div><div class='del'>-	input_set_drvdata(idev, ucb);</div><div class='add'>+	input_set_drvdata(ucb-&gt;ts_idev, ucb);</div><div class='ctx'> </div><div class='del'>-	idev-&gt;dev.parent	= dev;</div><div class='del'>-	idev-&gt;name		= "UCB1400 touchscreen interface";</div><div class='del'>-	idev-&gt;id.vendor		= ucb1400_reg_read(ucb, AC97_VENDOR_ID1);</div><div class='del'>-	idev-&gt;id.product	= id;</div><div class='del'>-	idev-&gt;open		= ucb1400_ts_open;</div><div class='del'>-	idev-&gt;close		= ucb1400_ts_close;</div><div class='del'>-	idev-&gt;evbit[0]		= BIT_MASK(EV_ABS);</div><div class='add'>+	ucb-&gt;ts_idev-&gt;dev.parent	= &amp;dev-&gt;dev;</div><div class='add'>+	ucb-&gt;ts_idev-&gt;name		= "UCB1400 touchscreen interface";</div><div class='add'>+	ucb-&gt;ts_idev-&gt;id.vendor		= ucb1400_reg_read(ucb-&gt;ac97,</div><div class='add'>+						AC97_VENDOR_ID1);</div><div class='add'>+	ucb-&gt;ts_idev-&gt;id.product	= ucb-&gt;id;</div><div class='add'>+	ucb-&gt;ts_idev-&gt;open		= ucb1400_ts_open;</div><div class='add'>+	ucb-&gt;ts_idev-&gt;close		= ucb1400_ts_close;</div><div class='add'>+	ucb-&gt;ts_idev-&gt;evbit[0]		= BIT_MASK(EV_ABS);</div><div class='ctx'> </div><div class='del'>-	ucb1400_adc_enable(ucb);</div><div class='add'>+	ucb1400_adc_enable(ucb-&gt;ac97);</div><div class='ctx'> 	x_res = ucb1400_ts_read_xres(ucb);</div><div class='ctx'> 	y_res = ucb1400_ts_read_yres(ucb);</div><div class='del'>-	ucb1400_adc_disable(ucb);</div><div class='add'>+	ucb1400_adc_disable(ucb-&gt;ac97);</div><div class='ctx'> 	printk(KERN_DEBUG "UCB1400: x/y = %d/%d\n", x_res, y_res);</div><div class='ctx'> </div><div class='del'>-	input_set_abs_params(idev, ABS_X, 0, x_res, 0, 0);</div><div class='del'>-	input_set_abs_params(idev, ABS_Y, 0, y_res, 0, 0);</div><div class='del'>-	input_set_abs_params(idev, ABS_PRESSURE, 0, 0, 0, 0);</div><div class='add'>+	input_set_abs_params(ucb-&gt;ts_idev, ABS_X, 0, x_res, 0, 0);</div><div class='add'>+	input_set_abs_params(ucb-&gt;ts_idev, ABS_Y, 0, y_res, 0, 0);</div><div class='add'>+	input_set_abs_params(ucb-&gt;ts_idev, ABS_PRESSURE, 0, 0, 0, 0);</div><div class='ctx'> </div><div class='del'>-	error = input_register_device(idev);</div><div class='add'>+	error = input_register_device(ucb-&gt;ts_idev);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto err_free_irq;</div><div class='ctx'> </div><div class='del'>-	dev_set_drvdata(dev, ucb);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>- err_free_irq:</div><div class='add'>+err_free_irq:</div><div class='ctx'> 	free_irq(ucb-&gt;irq, ucb);</div><div class='del'>- err_free_devs:</div><div class='del'>-	input_free_device(idev);</div><div class='del'>-	kfree(ucb);</div><div class='add'>+err_free_devs:</div><div class='add'>+	input_free_device(ucb-&gt;ts_idev);</div><div class='add'>+err:</div><div class='ctx'> 	return error;</div><div class='add'>+</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ucb1400_ts_remove(struct device *dev)</div><div class='add'>+static int ucb1400_ts_remove(struct platform_device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct ucb1400 *ucb = dev_get_drvdata(dev);</div><div class='add'>+	struct ucb1400_ts *ucb = dev-&gt;dev.platform_data;</div><div class='ctx'> </div><div class='ctx'> 	free_irq(ucb-&gt;irq, ucb);</div><div class='ctx'> 	input_unregister_device(ucb-&gt;ts_idev);</div><div class='del'>-	dev_set_drvdata(dev, NULL);</div><div class='del'>-	kfree(ucb);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct device_driver ucb1400_ts_driver = {</div><div class='del'>-	.name		= "ucb1400_ts",</div><div class='del'>-	.owner		= THIS_MODULE,</div><div class='del'>-	.bus		= &amp;ac97_bus_type,</div><div class='del'>-	.probe		= ucb1400_ts_probe,</div><div class='del'>-	.remove		= ucb1400_ts_remove,</div><div class='del'>-	.resume		= ucb1400_ts_resume,</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+static int ucb1400_ts_resume(struct platform_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct ucb1400_ts *ucb = platform_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	if (ucb-&gt;ts_task) {</div><div class='add'>+		/*</div><div class='add'>+		 * Restart the TS thread to ensure the</div><div class='add'>+		 * TS interrupt mode is set up again</div><div class='add'>+		 * after sleep.</div><div class='add'>+		 */</div><div class='add'>+		ucb-&gt;ts_restart = 1;</div><div class='add'>+		wake_up(&amp;ucb-&gt;ts_wait);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+#define ucb1400_ts_resume NULL</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static struct platform_driver ucb1400_ts_driver = {</div><div class='add'>+	.probe	= ucb1400_ts_probe,</div><div class='add'>+	.remove	= ucb1400_ts_remove,</div><div class='add'>+	.resume	= ucb1400_ts_resume,</div><div class='add'>+	.driver	= {</div><div class='add'>+		.name	= "ucb1400_ts",</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init ucb1400_ts_init(void)</div><div class='ctx'> {</div><div class='del'>-	return driver_register(&amp;ucb1400_ts_driver);</div><div class='add'>+	return platform_driver_register(&amp;ucb1400_ts_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit ucb1400_ts_exit(void)</div><div class='ctx'> {</div><div class='del'>-	driver_unregister(&amp;ucb1400_ts_driver);</div><div class='add'>+	platform_driver_unregister(&amp;ucb1400_ts_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_param(adcsync, bool, 0444);</div><div class='ctx'> MODULE_PARM_DESC(adcsync, "Synchronize touch readings with ADCSYNC pin.");</div><div class='ctx'> </div><div class='ctx'> module_param(ts_delay, int, 0444);</div><div class='del'>-MODULE_PARM_DESC(ts_delay, "Delay between panel setup and position read. Default = 55us.");</div><div class='add'>+MODULE_PARM_DESC(ts_delay, "Delay between panel setup and"</div><div class='add'>+			    " position read. Default = 55us.");</div><div class='ctx'> </div><div class='ctx'> module_param(ts_delay_pressure, int, 0444);</div><div class='ctx'> MODULE_PARM_DESC(ts_delay_pressure,</div><div class='del'>-		  "delay between panel setup and pressure read.  Default = 0us.");</div><div class='add'>+		"delay between panel setup and pressure read."</div><div class='add'>+		"  Default = 0us.");</div><div class='ctx'> </div><div class='ctx'> module_init(ucb1400_ts_init);</div><div class='ctx'> module_exit(ucb1400_ts_exit);</div><div class='head'>diff --git a/drivers/input/touchscreen/wm9705.c b/drivers/input/touchscreen/wm9705.c<br/>index 372efbc694ff..6b5be742c27d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/touchscreen/wm9705.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/input/touchscreen/wm9705.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/touchscreen/wm9705.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/touchscreen/wm9705.c</a></div><div class='hunk'>@@ -2,8 +2,7 @@</div><div class='ctx'>  * wm9705.c  --  Codec driver for Wolfson WM9705 AC97 Codec.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2003, 2004, 2005, 2006, 2007 Wolfson Microelectronics PLC.</div><div class='del'>- * Author: Liam Girdwood</div><div class='del'>- *         liam.girdwood@wolfsonmicro.com or linux@wolfsonmicro.com</div><div class='add'>+ * Author: Liam Girdwood &lt;lrg@slimlogic.co.uk&gt;</div><div class='ctx'>  * Parts Copyright : Ian Molton &lt;spyro@f2s.com&gt;</div><div class='ctx'>  *                   Andrew Zabolotny &lt;zap@homelink.ru&gt;</div><div class='ctx'>  *                   Russell King &lt;rmk@arm.linux.org.uk&gt;</div><div class='hunk'>@@ -347,6 +346,6 @@ struct wm97xx_codec_drv wm9705_codec = {</div><div class='ctx'> EXPORT_SYMBOL_GPL(wm9705_codec);</div><div class='ctx'> </div><div class='ctx'> /* Module information */</div><div class='del'>-MODULE_AUTHOR("Liam Girdwood &lt;liam.girdwood@wolfsonmicro.com&gt;");</div><div class='add'>+MODULE_AUTHOR("Liam Girdwood &lt;lrg@slimlogic.co.uk&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("WM9705 Touch Screen Driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/input/touchscreen/wm9712.c b/drivers/input/touchscreen/wm9712.c<br/>index c8bb1e7335fc..7490b05c3566 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/touchscreen/wm9712.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/input/touchscreen/wm9712.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/touchscreen/wm9712.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/touchscreen/wm9712.c</a></div><div class='hunk'>@@ -2,8 +2,7 @@</div><div class='ctx'>  * wm9712.c  --  Codec driver for Wolfson WM9712 AC97 Codecs.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2003, 2004, 2005, 2006, 2007 Wolfson Microelectronics PLC.</div><div class='del'>- * Author: Liam Girdwood</div><div class='del'>- *         liam.girdwood@wolfsonmicro.com or linux@wolfsonmicro.com</div><div class='add'>+ * Author: Liam Girdwood &lt;lrg@slimlogic.co.uk&gt;</div><div class='ctx'>  * Parts Copyright : Ian Molton &lt;spyro@f2s.com&gt;</div><div class='ctx'>  *                   Andrew Zabolotny &lt;zap@homelink.ru&gt;</div><div class='ctx'>  *                   Russell King &lt;rmk@arm.linux.org.uk&gt;</div><div class='hunk'>@@ -462,6 +461,6 @@ struct wm97xx_codec_drv wm9712_codec = {</div><div class='ctx'> EXPORT_SYMBOL_GPL(wm9712_codec);</div><div class='ctx'> </div><div class='ctx'> /* Module information */</div><div class='del'>-MODULE_AUTHOR("Liam Girdwood &lt;liam.girdwood@wolfsonmicro.com&gt;");</div><div class='add'>+MODULE_AUTHOR("Liam Girdwood &lt;lrg@slimlogic.co.uk&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("WM9712 Touch Screen Driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/input/touchscreen/wm9713.c b/drivers/input/touchscreen/wm9713.c<br/>index 781ee83547e6..238b5132712e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/touchscreen/wm9713.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/input/touchscreen/wm9713.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/touchscreen/wm9713.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/touchscreen/wm9713.c</a></div><div class='hunk'>@@ -2,8 +2,7 @@</div><div class='ctx'>  * wm9713.c  --  Codec touch driver for Wolfson WM9713 AC97 Codec.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2003, 2004, 2005, 2006, 2007, 2008 Wolfson Microelectronics PLC.</div><div class='del'>- * Author: Liam Girdwood</div><div class='del'>- *         liam.girdwood@wolfsonmicro.com or linux@wolfsonmicro.com</div><div class='add'>+ * Author: Liam Girdwood &lt;lrg@slimlogic.co.uk&gt;</div><div class='ctx'>  * Parts Copyright : Ian Molton &lt;spyro@f2s.com&gt;</div><div class='ctx'>  *                   Andrew Zabolotny &lt;zap@homelink.ru&gt;</div><div class='ctx'>  *                   Russell King &lt;rmk@arm.linux.org.uk&gt;</div><div class='hunk'>@@ -476,6 +475,6 @@ struct wm97xx_codec_drv wm9713_codec = {</div><div class='ctx'> EXPORT_SYMBOL_GPL(wm9713_codec);</div><div class='ctx'> </div><div class='ctx'> /* Module information */</div><div class='del'>-MODULE_AUTHOR("Liam Girdwood &lt;liam.girdwood@wolfsonmicro.com&gt;");</div><div class='add'>+MODULE_AUTHOR("Liam Girdwood &lt;lrg@slimlogic.co.uk&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("WM9713 Touch Screen Driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/input/touchscreen/wm97xx-core.c b/drivers/input/touchscreen/wm97xx-core.c<br/>index d589ab0e3adc..d15aa11d7056 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/touchscreen/wm97xx-core.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/input/touchscreen/wm97xx-core.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/touchscreen/wm97xx-core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/touchscreen/wm97xx-core.c</a></div><div class='hunk'>@@ -3,8 +3,7 @@</div><div class='ctx'>  *                    and WM9713 AC97 Codecs.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2003, 2004, 2005, 2006, 2007, 2008 Wolfson Microelectronics PLC.</div><div class='del'>- * Author: Liam Girdwood</div><div class='del'>- *         liam.girdwood@wolfsonmicro.com or linux@wolfsonmicro.com</div><div class='add'>+ * Author: Liam Girdwood &lt;lrg@slimlogic.co.uk&gt;</div><div class='ctx'>  * Parts Copyright : Ian Molton &lt;spyro@f2s.com&gt;</div><div class='ctx'>  *                   Andrew Zabolotny &lt;zap@homelink.ru&gt;</div><div class='ctx'>  *                   Russell King &lt;rmk@arm.linux.org.uk&gt;</div><div class='hunk'>@@ -824,6 +823,6 @@ module_init(wm97xx_init);</div><div class='ctx'> module_exit(wm97xx_exit);</div><div class='ctx'> </div><div class='ctx'> /* Module information */</div><div class='del'>-MODULE_AUTHOR("Liam Girdwood &lt;liam.girdwood@wolfsonmicro.com&gt;");</div><div class='add'>+MODULE_AUTHOR("Liam Girdwood &lt;lrg@slimlogic.co.uk&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("WM97xx Core - Touch Screen / AUX ADC / GPIO Driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/input/xen-kbdfront.c b/drivers/input/xen-kbdfront.c<br/>index 9ce3b3baf3a2..3ab6362f043c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/xen-kbdfront.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/input/xen-kbdfront.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/input/xen-kbdfront.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/input/xen-kbdfront.c</a></div><div class='hunk'>@@ -335,11 +335,11 @@ static struct xenbus_driver xenkbd = {</div><div class='ctx'> </div><div class='ctx'> static int __init xenkbd_init(void)</div><div class='ctx'> {</div><div class='del'>-	if (!is_running_on_xen())</div><div class='add'>+	if (!xen_domain())</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	/* Nothing to do if running in dom0. */</div><div class='del'>-	if (is_initial_xendomain())</div><div class='add'>+	if (xen_initial_domain())</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	return xenbus_register_frontend(&amp;xenkbd);</div><div class='head'>diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c<br/>index 871b0cbca5e4..1b5bf87c4cf4 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/isdn/capi/capi.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/isdn/capi/capi.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/isdn/capi/capi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/isdn/capi/capi.c</a></div><div class='hunk'>@@ -1231,7 +1231,7 @@ static int capinc_tty_ioctl(struct tty_struct *tty, struct file * file,</div><div class='ctx'> 	int error = 0;</div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	default:</div><div class='del'>-		error = n_tty_ioctl (tty, file, cmd, arg);</div><div class='add'>+		error = n_tty_ioctl_helper(tty, file, cmd, arg);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	return error;</div><div class='hunk'>@@ -1553,8 +1553,7 @@ static int __init capi_init(void)</div><div class='ctx'> 		return PTR_ERR(capi_class);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	device_create_drvdata(capi_class, NULL, MKDEV(capi_major, 0), NULL,</div><div class='del'>-			      "capi");</div><div class='add'>+	device_create(capi_class, NULL, MKDEV(capi_major, 0), NULL, "capi");</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ISDN_CAPI_MIDDLEWARE</div><div class='ctx'> 	if (capinc_tty_init() &lt; 0) {</div><div class='head'>diff --git a/drivers/isdn/capi/kcapi.c b/drivers/isdn/capi/kcapi.c<br/>index 75726ea0fbbd..5360c4fd4739 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/isdn/capi/kcapi.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/isdn/capi/kcapi.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/isdn/capi/kcapi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/isdn/capi/kcapi.c</a></div><div class='hunk'>@@ -828,15 +828,18 @@ static int old_capi_manufacturer(unsigned int cmd, void __user *data)</div><div class='ctx'> 			return -ESRCH;</div><div class='ctx'> 		if (card-&gt;load_firmware == NULL) {</div><div class='ctx'> 			printk(KERN_DEBUG "kcapi: load: no load function\n");</div><div class='add'>+			capi_ctr_put(card);</div><div class='ctx'> 			return -ESRCH;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (ldef.t4file.len &lt;= 0) {</div><div class='ctx'> 			printk(KERN_DEBUG "kcapi: load: invalid parameter: length of t4file is %d ?\n", ldef.t4file.len);</div><div class='add'>+			capi_ctr_put(card);</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (ldef.t4file.data == NULL) {</div><div class='ctx'> 			printk(KERN_DEBUG "kcapi: load: invalid parameter: dataptr is 0\n");</div><div class='add'>+			capi_ctr_put(card);</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -849,6 +852,7 @@ static int old_capi_manufacturer(unsigned int cmd, void __user *data)</div><div class='ctx'> </div><div class='ctx'> 		if (card-&gt;cardstate != CARD_DETECTED) {</div><div class='ctx'> 			printk(KERN_INFO "kcapi: load: contr=%d not in detect state\n", ldef.contr);</div><div class='add'>+			capi_ctr_put(card);</div><div class='ctx'> 			return -EBUSY;</div><div class='ctx'> 		}</div><div class='ctx'> 		card-&gt;cardstate = CARD_LOADING;</div><div class='head'>diff --git a/drivers/isdn/gigaset/ser-gigaset.c b/drivers/isdn/gigaset/ser-gigaset.c<br/>index 5e89fa177816..07052ed2a0c5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/isdn/gigaset/ser-gigaset.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/isdn/gigaset/ser-gigaset.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/isdn/gigaset/ser-gigaset.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/isdn/gigaset/ser-gigaset.c</a></div><div class='hunk'>@@ -571,6 +571,7 @@ gigaset_tty_close(struct tty_struct *tty)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* prevent other callers from entering ldisc methods */</div><div class='add'>+	/* FIXME: should use the tty state flags */</div><div class='ctx'> 	tty-&gt;disc_data = NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (!cs-&gt;hw.ser)</div><div class='hunk'>@@ -642,10 +643,11 @@ gigaset_tty_ioctl(struct tty_struct *tty, struct file *file,</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='del'>-	case TCGETS:</div><div class='del'>-	case TCGETA:</div><div class='del'>-		/* pass through to underlying serial device */</div><div class='del'>-		rc = n_tty_ioctl(tty, file, cmd, arg);</div><div class='add'>+</div><div class='add'>+	case FIONREAD:</div><div class='add'>+		/* unused, always return zero */</div><div class='add'>+		val = 0;</div><div class='add'>+		rc = put_user(val, p);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case TCFLSH:</div><div class='hunk'>@@ -659,20 +661,13 @@ gigaset_tty_ioctl(struct tty_struct *tty, struct file *file,</div><div class='ctx'> 			flush_send_queue(cs);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		/* flush the serial port's buffer */</div><div class='del'>-		rc = n_tty_ioctl(tty, file, cmd, arg);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case FIONREAD:</div><div class='del'>-		/* unused, always return zero */</div><div class='del'>-		val = 0;</div><div class='del'>-		rc = put_user(val, p);</div><div class='del'>-		break;</div><div class='add'>+		/* Pass through */</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='del'>-		rc = -ENOIOCTLCMD;</div><div class='add'>+		/* pass through to underlying serial device */</div><div class='add'>+		rc = n_tty_ioctl_helper(tty, file, cmd, arg);</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> 	cs_put(cs);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='hunk'>@@ -680,6 +675,8 @@ gigaset_tty_ioctl(struct tty_struct *tty, struct file *file,</div><div class='ctx'> /*</div><div class='ctx'>  * Poll on the tty.</div><div class='ctx'>  * Unused, always return zero.</div><div class='add'>+ *</div><div class='add'>+ * FIXME: should probably return an exception - especially on hangup</div><div class='ctx'>  */</div><div class='ctx'> static unsigned int</div><div class='ctx'> gigaset_tty_poll(struct tty_struct *tty, struct file *file, poll_table *wait)</div><div class='head'>diff --git a/drivers/isdn/hardware/avm/avm_cs.c b/drivers/isdn/hardware/avm/avm_cs.c<br/>index a5b941c327f7..c72565520e41 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/isdn/hardware/avm/avm_cs.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/isdn/hardware/avm/avm_cs.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/isdn/hardware/avm/avm_cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/isdn/hardware/avm/avm_cs.c</a></div><div class='hunk'>@@ -154,83 +154,50 @@ static void avmcs_detach(struct pcmcia_device *link)</div><div class='ctx'>     </div><div class='ctx'> ======================================================================*/</div><div class='ctx'> </div><div class='del'>-static int get_tuple(struct pcmcia_device *handle, tuple_t *tuple,</div><div class='del'>-		     cisparse_t *parse)</div><div class='add'>+static int avmcs_configcheck(struct pcmcia_device *p_dev,</div><div class='add'>+			     cistpl_cftable_entry_t *cf,</div><div class='add'>+			     cistpl_cftable_entry_t *dflt,</div><div class='add'>+			     unsigned int vcc,</div><div class='add'>+			     void *priv_data)</div><div class='ctx'> {</div><div class='del'>-    int i = pcmcia_get_tuple_data(handle, tuple);</div><div class='del'>-    if (i != CS_SUCCESS) return i;</div><div class='del'>-    return pcmcia_parse_tuple(handle, tuple, parse);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int first_tuple(struct pcmcia_device *handle, tuple_t *tuple,</div><div class='del'>-		     cisparse_t *parse)</div><div class='del'>-{</div><div class='del'>-    int i = pcmcia_get_first_tuple(handle, tuple);</div><div class='del'>-    if (i != CS_SUCCESS) return i;</div><div class='del'>-    return get_tuple(handle, tuple, parse);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int next_tuple(struct pcmcia_device *handle, tuple_t *tuple,</div><div class='del'>-		     cisparse_t *parse)</div><div class='del'>-{</div><div class='del'>-    int i = pcmcia_get_next_tuple(handle, tuple);</div><div class='del'>-    if (i != CS_SUCCESS) return i;</div><div class='del'>-    return get_tuple(handle, tuple, parse);</div><div class='add'>+	if (cf-&gt;io.nwin &lt;= 0)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	p_dev-&gt;io.BasePort1 = cf-&gt;io.win[0].base;</div><div class='add'>+	p_dev-&gt;io.NumPorts1 = cf-&gt;io.win[0].len;</div><div class='add'>+	p_dev-&gt;io.NumPorts2 = 0;</div><div class='add'>+	printk(KERN_INFO "avm_cs: testing i/o %#x-%#x\n",</div><div class='add'>+	       p_dev-&gt;io.BasePort1,</div><div class='add'>+	       p_dev-&gt;io.BasePort1+p_dev-&gt;io.NumPorts1-1);</div><div class='add'>+	return pcmcia_request_io(p_dev, &amp;p_dev-&gt;io);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int avmcs_config(struct pcmcia_device *link)</div><div class='ctx'> {</div><div class='del'>-    tuple_t tuple;</div><div class='del'>-    cisparse_t parse;</div><div class='del'>-    cistpl_cftable_entry_t *cf = &amp;parse.cftable_entry;</div><div class='ctx'>     local_info_t *dev;</div><div class='ctx'>     int i;</div><div class='del'>-    u_char buf[64];</div><div class='ctx'>     char devname[128];</div><div class='ctx'>     int cardtype;</div><div class='ctx'>     int (*addcard)(unsigned int port, unsigned irq);</div><div class='ctx'> </div><div class='ctx'>     dev = link-&gt;priv;</div><div class='ctx'> </div><div class='del'>-    do {</div><div class='del'>-	devname[0] = 0;</div><div class='del'>-	if (link-&gt;prod_id[1])</div><div class='del'>-		strlcpy(devname, link-&gt;prod_id[1], sizeof(devname));</div><div class='add'>+    devname[0] = 0;</div><div class='add'>+    if (link-&gt;prod_id[1])</div><div class='add'>+	    strlcpy(devname, link-&gt;prod_id[1], sizeof(devname));</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-         * find IO port</div><div class='del'>-         */</div><div class='del'>-	tuple.TupleData = (cisdata_t *)buf;</div><div class='del'>-	tuple.TupleOffset = 0; tuple.TupleDataMax = 255;</div><div class='del'>-	tuple.Attributes = 0;</div><div class='del'>-	tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;</div><div class='del'>-	i = first_tuple(link, &amp;tuple, &amp;parse);</div><div class='del'>-	while (i == CS_SUCCESS) {</div><div class='del'>-	    if (cf-&gt;io.nwin &gt; 0) {</div><div class='del'>-		link-&gt;conf.ConfigIndex = cf-&gt;index;</div><div class='del'>-		link-&gt;io.BasePort1 = cf-&gt;io.win[0].base;</div><div class='del'>-		link-&gt;io.NumPorts1 = cf-&gt;io.win[0].len;</div><div class='del'>-		link-&gt;io.NumPorts2 = 0;</div><div class='del'>-                printk(KERN_INFO "avm_cs: testing i/o %#x-%#x\n",</div><div class='del'>-			link-&gt;io.BasePort1,</div><div class='del'>-		        link-&gt;io.BasePort1+link-&gt;io.NumPorts1-1);</div><div class='del'>-		i = pcmcia_request_io(link, &amp;link-&gt;io);</div><div class='del'>-		if (i == CS_SUCCESS) goto found_port;</div><div class='del'>-	    }</div><div class='del'>-	    i = next_tuple(link, &amp;tuple, &amp;parse);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-found_port:</div><div class='del'>-	if (i != CS_SUCCESS) {</div><div class='del'>-	    cs_error(link, RequestIO, i);</div><div class='del'>-	    break;</div><div class='del'>-	}</div><div class='add'>+    /*</div><div class='add'>+     * find IO port</div><div class='add'>+     */</div><div class='add'>+    if (pcmcia_loop_config(link, avmcs_configcheck, NULL))</div><div class='add'>+	    return -ENODEV;</div><div class='ctx'> </div><div class='add'>+    do {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * allocate an interrupt line</div><div class='ctx'> 	 */</div><div class='ctx'> 	i = pcmcia_request_irq(link, &amp;link-&gt;irq);</div><div class='del'>-	if (i != CS_SUCCESS) {</div><div class='add'>+	if (i != 0) {</div><div class='ctx'> 	    cs_error(link, RequestIRQ, i);</div><div class='ctx'> 	    /* undo */</div><div class='ctx'> 	    pcmcia_disable_device(link);</div><div class='hunk'>@@ -241,7 +208,7 @@ found_port:</div><div class='ctx'>          * configure the PCMCIA socket</div><div class='ctx'> 	  */</div><div class='ctx'> 	i = pcmcia_request_configuration(link, &amp;link-&gt;conf);</div><div class='del'>-	if (i != CS_SUCCESS) {</div><div class='add'>+	if (i != 0) {</div><div class='ctx'> 	    cs_error(link, RequestConfiguration, i);</div><div class='ctx'> 	    pcmcia_disable_device(link);</div><div class='ctx'> 	    break;</div><div class='head'>diff --git a/drivers/isdn/hardware/mISDN/hfc_pci.h b/drivers/isdn/hardware/mISDN/hfc_pci.h<br/>index fd2c9be6d849..5783d22a18fe 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/isdn/hardware/mISDN/hfc_pci.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/isdn/hardware/mISDN/hfc_pci.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/isdn/hardware/mISDN/hfc_pci.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/isdn/hardware/mISDN/hfc_pci.h</a></div><div class='hunk'>@@ -183,8 +183,8 @@</div><div class='ctx'> #define D_FREG_MASK  0xF</div><div class='ctx'> </div><div class='ctx'> struct zt {</div><div class='del'>-	unsigned short z1;  /* Z1 pointer 16 Bit */</div><div class='del'>-	unsigned short z2;  /* Z2 pointer 16 Bit */</div><div class='add'>+	__le16 z1;  /* Z1 pointer 16 Bit */</div><div class='add'>+	__le16 z2;  /* Z2 pointer 16 Bit */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct dfifo {</div><div class='head'>diff --git a/drivers/isdn/hardware/mISDN/hfcpci.c b/drivers/isdn/hardware/mISDN/hfcpci.c<br/>index 9cf5edbb1a9b..cd8302af40eb 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/isdn/hardware/mISDN/hfcpci.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/isdn/hardware/mISDN/hfcpci.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/isdn/hardware/mISDN/hfcpci.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/isdn/hardware/mISDN/hfcpci.c</a></div><div class='hunk'>@@ -43,7 +43,7 @@ MODULE_LICENSE("GPL");</div><div class='ctx'> module_param(debug, uint, 0);</div><div class='ctx'> </div><div class='ctx'> static LIST_HEAD(HFClist);</div><div class='del'>-DEFINE_RWLOCK(HFClock);</div><div class='add'>+static DEFINE_RWLOCK(HFClock);</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='ctx'> 	HFC_CCD_2BD0,</div><div class='hunk'>@@ -88,7 +88,7 @@ struct hfcPCI_hw {</div><div class='ctx'> 	unsigned char		bswapped;</div><div class='ctx'> 	unsigned char		protocol;</div><div class='ctx'> 	int			nt_timer;</div><div class='del'>-	unsigned char		*pci_io; /* start of PCI IO memory */</div><div class='add'>+	unsigned char __iomem 	*pci_io; /* start of PCI IO memory */</div><div class='ctx'> 	dma_addr_t		dmahandle;</div><div class='ctx'> 	void			*fifos; /* FIFO memory */</div><div class='ctx'> 	int			last_bfifo_cnt[2];</div><div class='hunk'>@@ -153,7 +153,7 @@ release_io_hfcpci(struct hfc_pci *hc)</div><div class='ctx'> 	pci_write_config_word(hc-&gt;pdev, PCI_COMMAND, 0);</div><div class='ctx'> 	del_timer(&amp;hc-&gt;hw.timer);</div><div class='ctx'> 	pci_free_consistent(hc-&gt;pdev, 0x8000, hc-&gt;hw.fifos, hc-&gt;hw.dmahandle);</div><div class='del'>-	iounmap((void *)hc-&gt;hw.pci_io);</div><div class='add'>+	iounmap(hc-&gt;hw.pci_io);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -366,8 +366,7 @@ static void hfcpci_clear_fifo_tx(struct hfc_pci *hc, int fifo)</div><div class='ctx'> 	bzt-&gt;f2 = MAX_B_FRAMES;</div><div class='ctx'> 	bzt-&gt;f1 = bzt-&gt;f2;	/* init F pointers to remain constant */</div><div class='ctx'> 	bzt-&gt;za[MAX_B_FRAMES].z1 = cpu_to_le16(B_FIFO_SIZE + B_SUB_VAL - 1);</div><div class='del'>-	bzt-&gt;za[MAX_B_FRAMES].z2 = cpu_to_le16(</div><div class='del'>-	    le16_to_cpu(bzt-&gt;za[MAX_B_FRAMES].z1 - 1));</div><div class='add'>+	bzt-&gt;za[MAX_B_FRAMES].z2 = cpu_to_le16(B_FIFO_SIZE + B_SUB_VAL - 2);</div><div class='ctx'> 	if (fifo_state)</div><div class='ctx'> 		hc-&gt;hw.fifo_en |= fifo_state;</div><div class='ctx'> 	Write_hfc(hc, HFCPCI_FIFO_EN, hc-&gt;hw.fifo_en);</div><div class='hunk'>@@ -482,7 +481,7 @@ receive_dmsg(struct hfc_pci *hc)</div><div class='ctx'> 			df-&gt;f2 = ((df-&gt;f2 + 1) &amp; MAX_D_FRAMES) |</div><div class='ctx'> 			    (MAX_D_FRAMES + 1);	/* next buffer */</div><div class='ctx'> 			df-&gt;za[df-&gt;f2 &amp; D_FREG_MASK].z2 =</div><div class='del'>-			    cpu_to_le16((zp-&gt;z2 + rcnt) &amp; (D_FIFO_SIZE - 1));</div><div class='add'>+			    cpu_to_le16((le16_to_cpu(zp-&gt;z2) + rcnt) &amp; (D_FIFO_SIZE - 1));</div><div class='ctx'> 		} else {</div><div class='ctx'> 			dch-&gt;rx_skb = mI_alloc_skb(rcnt - 3, GFP_ATOMIC);</div><div class='ctx'> 			if (!dch-&gt;rx_skb) {</div><div class='hunk'>@@ -523,10 +522,10 @@ receive_dmsg(struct hfc_pci *hc)</div><div class='ctx'> /*</div><div class='ctx'>  * check for transparent receive data and read max one threshold size if avail</div><div class='ctx'>  */</div><div class='del'>-int</div><div class='add'>+static int</div><div class='ctx'> hfcpci_empty_fifo_trans(struct bchannel *bch, struct bzfifo *bz, u_char *bdata)</div><div class='ctx'> {</div><div class='del'>-	unsigned short	*z1r, *z2r;</div><div class='add'>+	 __le16 *z1r, *z2r;</div><div class='ctx'> 	int		new_z2, fcnt, maxlen;</div><div class='ctx'> 	u_char		*ptr, *ptr1;</div><div class='ctx'> </div><div class='hunk'>@@ -576,7 +575,7 @@ hfcpci_empty_fifo_trans(struct bchannel *bch, struct bzfifo *bz, u_char *bdata)</div><div class='ctx'> /*</div><div class='ctx'>  * B-channel main receive routine</div><div class='ctx'>  */</div><div class='del'>-void</div><div class='add'>+static void</div><div class='ctx'> main_rec_hfcpci(struct bchannel *bch)</div><div class='ctx'> {</div><div class='ctx'> 	struct hfc_pci	*hc = bch-&gt;hw;</div><div class='hunk'>@@ -724,7 +723,7 @@ hfcpci_fill_fifo(struct bchannel *bch)</div><div class='ctx'> 	struct bzfifo	*bz;</div><div class='ctx'> 	u_char		*bdata;</div><div class='ctx'> 	u_char		new_f1, *src, *dst;</div><div class='del'>-	unsigned short	*z1t, *z2t;</div><div class='add'>+	__le16 *z1t, *z2t;</div><div class='ctx'> </div><div class='ctx'> 	if ((bch-&gt;debug &amp; DEBUG_HW_BCHANNEL) &amp;&amp; !(bch-&gt;debug &amp; DEBUG_HW_BFIFO))</div><div class='ctx'> 		printk(KERN_DEBUG "%s\n", __func__);</div><div class='hunk'>@@ -1679,7 +1678,7 @@ hfcpci_l2l1B(struct mISDNchannel *ch, struct sk_buff *skb)</div><div class='ctx'>  * called for card init message</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-void</div><div class='add'>+static void</div><div class='ctx'> inithfcpci(struct hfc_pci *hc)</div><div class='ctx'> {</div><div class='ctx'> 	printk(KERN_DEBUG "inithfcpci: entered\n");</div><div class='hunk'>@@ -1966,7 +1965,7 @@ setup_hw(struct hfc_pci *hc)</div><div class='ctx'> 		printk(KERN_WARNING "HFC-PCI: No IRQ for PCI card found\n");</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='del'>-	hc-&gt;hw.pci_io = (char *)(ulong)hc-&gt;pdev-&gt;resource[1].start;</div><div class='add'>+	hc-&gt;hw.pci_io = (char __iomem *)(unsigned long)hc-&gt;pdev-&gt;resource[1].start;</div><div class='ctx'> </div><div class='ctx'> 	if (!hc-&gt;hw.pci_io) {</div><div class='ctx'> 		printk(KERN_WARNING "HFC-PCI: No IO-Mem for PCI card found\n");</div><div class='head'>diff --git a/drivers/isdn/hisax/avma1_cs.c b/drivers/isdn/hisax/avma1_cs.c<br/>index fc6cc2c065b8..23560c897ec3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/isdn/hisax/avma1_cs.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/isdn/hisax/avma1_cs.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/isdn/hisax/avma1_cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/isdn/hisax/avma1_cs.c</a></div><div class='hunk'>@@ -174,38 +174,29 @@ static void avma1cs_detach(struct pcmcia_device *link)</div><div class='ctx'>     </div><div class='ctx'> ======================================================================*/</div><div class='ctx'> </div><div class='del'>-static int get_tuple(struct pcmcia_device *handle, tuple_t *tuple,</div><div class='del'>-		     cisparse_t *parse)</div><div class='add'>+static int avma1cs_configcheck(struct pcmcia_device *p_dev,</div><div class='add'>+			       cistpl_cftable_entry_t *cf,</div><div class='add'>+			       cistpl_cftable_entry_t *dflt,</div><div class='add'>+			       unsigned int vcc,</div><div class='add'>+			       void *priv_data)</div><div class='ctx'> {</div><div class='del'>-    int i = pcmcia_get_tuple_data(handle, tuple);</div><div class='del'>-    if (i != CS_SUCCESS) return i;</div><div class='del'>-    return pcmcia_parse_tuple(handle, tuple, parse);</div><div class='add'>+	if (cf-&gt;io.nwin &lt;= 0)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	p_dev-&gt;io.BasePort1 = cf-&gt;io.win[0].base;</div><div class='add'>+	p_dev-&gt;io.NumPorts1 = cf-&gt;io.win[0].len;</div><div class='add'>+	p_dev-&gt;io.NumPorts2 = 0;</div><div class='add'>+	printk(KERN_INFO "avma1_cs: testing i/o %#x-%#x\n",</div><div class='add'>+	       p_dev-&gt;io.BasePort1,</div><div class='add'>+	       p_dev-&gt;io.BasePort1+p_dev-&gt;io.NumPorts1-1);</div><div class='add'>+	return pcmcia_request_io(p_dev, &amp;p_dev-&gt;io);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int first_tuple(struct pcmcia_device *handle, tuple_t *tuple,</div><div class='del'>-		     cisparse_t *parse)</div><div class='del'>-{</div><div class='del'>-    int i = pcmcia_get_first_tuple(handle, tuple);</div><div class='del'>-    if (i != CS_SUCCESS) return i;</div><div class='del'>-    return get_tuple(handle, tuple, parse);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int next_tuple(struct pcmcia_device *handle, tuple_t *tuple,</div><div class='del'>-		     cisparse_t *parse)</div><div class='del'>-{</div><div class='del'>-    int i = pcmcia_get_next_tuple(handle, tuple);</div><div class='del'>-    if (i != CS_SUCCESS) return i;</div><div class='del'>-    return get_tuple(handle, tuple, parse);</div><div class='del'>-}</div><div class='ctx'> </div><div class='ctx'> static int avma1cs_config(struct pcmcia_device *link)</div><div class='ctx'> {</div><div class='del'>-    tuple_t tuple;</div><div class='del'>-    cisparse_t parse;</div><div class='del'>-    cistpl_cftable_entry_t *cf = &amp;parse.cftable_entry;</div><div class='ctx'>     local_info_t *dev;</div><div class='ctx'>     int i;</div><div class='del'>-    u_char buf[64];</div><div class='ctx'>     char devname[128];</div><div class='ctx'>     IsdnCard_t	icard;</div><div class='ctx'>     int busy = 0;</div><div class='hunk'>@@ -214,45 +205,19 @@ static int avma1cs_config(struct pcmcia_device *link)</div><div class='ctx'> </div><div class='ctx'>     DEBUG(0, "avma1cs_config(0x%p)\n", link);</div><div class='ctx'> </div><div class='del'>-    do {</div><div class='del'>-	devname[0] = 0;</div><div class='del'>-	if (link-&gt;prod_id[1])</div><div class='del'>-		strlcpy(devname, link-&gt;prod_id[1], sizeof(devname));</div><div class='add'>+    devname[0] = 0;</div><div class='add'>+    if (link-&gt;prod_id[1])</div><div class='add'>+	    strlcpy(devname, link-&gt;prod_id[1], sizeof(devname));</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-         * find IO port</div><div class='del'>-         */</div><div class='del'>-	tuple.TupleData = (cisdata_t *)buf;</div><div class='del'>-	tuple.TupleOffset = 0; tuple.TupleDataMax = 255;</div><div class='del'>-	tuple.Attributes = 0;</div><div class='del'>-	tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;</div><div class='del'>-	i = first_tuple(link, &amp;tuple, &amp;parse);</div><div class='del'>-	while (i == CS_SUCCESS) {</div><div class='del'>-	    if (cf-&gt;io.nwin &gt; 0) {</div><div class='del'>-		link-&gt;conf.ConfigIndex = cf-&gt;index;</div><div class='del'>-		link-&gt;io.BasePort1 = cf-&gt;io.win[0].base;</div><div class='del'>-		link-&gt;io.NumPorts1 = cf-&gt;io.win[0].len;</div><div class='del'>-		link-&gt;io.NumPorts2 = 0;</div><div class='del'>-		printk(KERN_INFO "avma1_cs: testing i/o %#x-%#x\n",</div><div class='del'>-			link-&gt;io.BasePort1,</div><div class='del'>-			link-&gt;io.BasePort1+link-&gt;io.NumPorts1 - 1);</div><div class='del'>-		i = pcmcia_request_io(link, &amp;link-&gt;io);</div><div class='del'>-		if (i == CS_SUCCESS) goto found_port;</div><div class='del'>-	    }</div><div class='del'>-	    i = next_tuple(link, &amp;tuple, &amp;parse);</div><div class='del'>-	}</div><div class='add'>+    if (pcmcia_loop_config(link, avma1cs_configcheck, NULL))</div><div class='add'>+	    return -ENODEV;</div><div class='ctx'> </div><div class='del'>-found_port:</div><div class='del'>-	if (i != CS_SUCCESS) {</div><div class='del'>-	    cs_error(link, RequestIO, i);</div><div class='del'>-	    break;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='add'>+    do {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * allocate an interrupt line</div><div class='ctx'> 	 */</div><div class='ctx'> 	i = pcmcia_request_irq(link, &amp;link-&gt;irq);</div><div class='del'>-	if (i != CS_SUCCESS) {</div><div class='add'>+	if (i != 0) {</div><div class='ctx'> 	    cs_error(link, RequestIRQ, i);</div><div class='ctx'> 	    /* undo */</div><div class='ctx'> 	    pcmcia_disable_device(link);</div><div class='hunk'>@@ -263,7 +228,7 @@ found_port:</div><div class='ctx'> 	 * configure the PCMCIA socket</div><div class='ctx'> 	 */</div><div class='ctx'> 	i = pcmcia_request_configuration(link, &amp;link-&gt;conf);</div><div class='del'>-	if (i != CS_SUCCESS) {</div><div class='add'>+	if (i != 0) {</div><div class='ctx'> 	    cs_error(link, RequestConfiguration, i);</div><div class='ctx'> 	    pcmcia_disable_device(link);</div><div class='ctx'> 	    break;</div><div class='head'>diff --git a/drivers/isdn/hisax/elsa_cs.c b/drivers/isdn/hisax/elsa_cs.c<br/>index db7e64424afe..f4d0fe29bcf8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/isdn/hisax/elsa_cs.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/isdn/hisax/elsa_cs.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/isdn/hisax/elsa_cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/isdn/hisax/elsa_cs.c</a></div><div class='hunk'>@@ -203,82 +203,55 @@ static void elsa_cs_detach(struct pcmcia_device *link)</div><div class='ctx'>     device available to the system.</div><div class='ctx'> </div><div class='ctx'> ======================================================================*/</div><div class='del'>-static int get_tuple(struct pcmcia_device *handle, tuple_t *tuple,</div><div class='del'>-                     cisparse_t *parse)</div><div class='del'>-{</div><div class='del'>-    int i = pcmcia_get_tuple_data(handle, tuple);</div><div class='del'>-    if (i != CS_SUCCESS) return i;</div><div class='del'>-    return pcmcia_parse_tuple(handle, tuple, parse);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int first_tuple(struct pcmcia_device *handle, tuple_t *tuple,</div><div class='del'>-                     cisparse_t *parse)</div><div class='del'>-{</div><div class='del'>-    int i = pcmcia_get_first_tuple(handle, tuple);</div><div class='del'>-    if (i != CS_SUCCESS) return i;</div><div class='del'>-    return get_tuple(handle, tuple, parse);</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-static int next_tuple(struct pcmcia_device *handle, tuple_t *tuple,</div><div class='del'>-                     cisparse_t *parse)</div><div class='add'>+static int elsa_cs_configcheck(struct pcmcia_device *p_dev,</div><div class='add'>+			       cistpl_cftable_entry_t *cf,</div><div class='add'>+			       cistpl_cftable_entry_t *dflt,</div><div class='add'>+			       unsigned int vcc,</div><div class='add'>+			       void *priv_data)</div><div class='ctx'> {</div><div class='del'>-    int i = pcmcia_get_next_tuple(handle, tuple);</div><div class='del'>-    if (i != CS_SUCCESS) return i;</div><div class='del'>-    return get_tuple(handle, tuple, parse);</div><div class='add'>+	int j;</div><div class='add'>+</div><div class='add'>+	if ((cf-&gt;io.nwin &gt; 0) &amp;&amp; cf-&gt;io.win[0].base) {</div><div class='add'>+		printk(KERN_INFO "(elsa_cs: looks like the 96 model)\n");</div><div class='add'>+		p_dev-&gt;io.BasePort1 = cf-&gt;io.win[0].base;</div><div class='add'>+		if (!pcmcia_request_io(p_dev, &amp;p_dev-&gt;io))</div><div class='add'>+			return 0;</div><div class='add'>+	} else {</div><div class='add'>+		printk(KERN_INFO "(elsa_cs: looks like the 97 model)\n");</div><div class='add'>+		for (j = 0x2f0; j &gt; 0x100; j -= 0x10) {</div><div class='add'>+			p_dev-&gt;io.BasePort1 = j;</div><div class='add'>+			if (!pcmcia_request_io(p_dev, &amp;p_dev-&gt;io))</div><div class='add'>+				return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int elsa_cs_config(struct pcmcia_device *link)</div><div class='ctx'> {</div><div class='del'>-    tuple_t tuple;</div><div class='del'>-    cisparse_t parse;</div><div class='ctx'>     local_info_t *dev;</div><div class='del'>-    int i, j, last_fn;</div><div class='del'>-    u_short buf[128];</div><div class='del'>-    cistpl_cftable_entry_t *cf = &amp;parse.cftable_entry;</div><div class='add'>+    int i, last_fn;</div><div class='ctx'>     IsdnCard_t icard;</div><div class='ctx'> </div><div class='ctx'>     DEBUG(0, "elsa_config(0x%p)\n", link);</div><div class='ctx'>     dev = link-&gt;priv;</div><div class='ctx'> </div><div class='del'>-    tuple.TupleData = (cisdata_t *)buf;</div><div class='del'>-    tuple.TupleOffset = 0; tuple.TupleDataMax = 255;</div><div class='del'>-    tuple.Attributes = 0;</div><div class='del'>-    tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;</div><div class='del'>-    i = first_tuple(link, &amp;tuple, &amp;parse);</div><div class='del'>-    while (i == CS_SUCCESS) {</div><div class='del'>-        if ( (cf-&gt;io.nwin &gt; 0) &amp;&amp; cf-&gt;io.win[0].base) {</div><div class='del'>-            printk(KERN_INFO "(elsa_cs: looks like the 96 model)\n");</div><div class='del'>-            link-&gt;conf.ConfigIndex = cf-&gt;index;</div><div class='del'>-            link-&gt;io.BasePort1 = cf-&gt;io.win[0].base;</div><div class='del'>-            i = pcmcia_request_io(link, &amp;link-&gt;io);</div><div class='del'>-            if (i == CS_SUCCESS) break;</div><div class='del'>-        } else {</div><div class='del'>-          printk(KERN_INFO "(elsa_cs: looks like the 97 model)\n");</div><div class='del'>-          link-&gt;conf.ConfigIndex = cf-&gt;index;</div><div class='del'>-          for (i = 0, j = 0x2f0; j &gt; 0x100; j -= 0x10) {</div><div class='del'>-            link-&gt;io.BasePort1 = j;</div><div class='del'>-            i = pcmcia_request_io(link, &amp;link-&gt;io);</div><div class='del'>-            if (i == CS_SUCCESS) break;</div><div class='del'>-          }</div><div class='del'>-          break;</div><div class='del'>-        }</div><div class='del'>-        i = next_tuple(link, &amp;tuple, &amp;parse);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    if (i != CS_SUCCESS) {</div><div class='add'>+    i = pcmcia_loop_config(link, elsa_cs_configcheck, NULL);</div><div class='add'>+    if (i != 0) {</div><div class='ctx'> 	last_fn = RequestIO;</div><div class='ctx'> 	goto cs_failed;</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     i = pcmcia_request_irq(link, &amp;link-&gt;irq);</div><div class='del'>-    if (i != CS_SUCCESS) {</div><div class='add'>+    if (i != 0) {</div><div class='ctx'>         link-&gt;irq.AssignedIRQ = 0;</div><div class='ctx'> 	last_fn = RequestIRQ;</div><div class='ctx'>         goto cs_failed;</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     i = pcmcia_request_configuration(link, &amp;link-&gt;conf);</div><div class='del'>-    if (i != CS_SUCCESS) {</div><div class='add'>+    if (i != 0) {</div><div class='ctx'>       last_fn = RequestConfiguration;</div><div class='ctx'>       goto cs_failed;</div><div class='ctx'>     }</div><div class='head'>diff --git a/drivers/isdn/hisax/sedlbauer_cs.c b/drivers/isdn/hisax/sedlbauer_cs.c<br/>index 439cb530def8..9a3c9f5e4fe8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/isdn/hisax/sedlbauer_cs.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/isdn/hisax/sedlbauer_cs.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/isdn/hisax/sedlbauer_cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/isdn/hisax/sedlbauer_cs.c</a></div><div class='hunk'>@@ -217,101 +217,61 @@ static void sedlbauer_detach(struct pcmcia_device *link)</div><div class='ctx'> #define CS_CHECK(fn, ret) \</div><div class='ctx'> do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)</div><div class='ctx'> </div><div class='del'>-static int sedlbauer_config(struct pcmcia_device *link)</div><div class='add'>+static int sedlbauer_config_check(struct pcmcia_device *p_dev,</div><div class='add'>+				  cistpl_cftable_entry_t *cfg,</div><div class='add'>+				  cistpl_cftable_entry_t *dflt,</div><div class='add'>+				  unsigned int vcc,</div><div class='add'>+				  void *priv_data)</div><div class='ctx'> {</div><div class='del'>-    local_info_t *dev = link-&gt;priv;</div><div class='del'>-    tuple_t tuple;</div><div class='del'>-    cisparse_t parse;</div><div class='del'>-    int last_fn, last_ret;</div><div class='del'>-    u8 buf[64];</div><div class='del'>-    config_info_t conf;</div><div class='del'>-    win_req_t req;</div><div class='del'>-    memreq_t map;</div><div class='del'>-    IsdnCard_t  icard;</div><div class='del'>-</div><div class='del'>-    DEBUG(0, "sedlbauer_config(0x%p)\n", link);</div><div class='del'>-</div><div class='del'>-    tuple.Attributes = 0;</div><div class='del'>-    tuple.TupleData = buf;</div><div class='del'>-    tuple.TupleDataMax = sizeof(buf);</div><div class='del'>-    tuple.TupleOffset = 0;</div><div class='add'>+	win_req_t *req = priv_data;</div><div class='ctx'> </div><div class='del'>-    CS_CHECK(GetConfigurationInfo, pcmcia_get_configuration_info(link, &amp;conf));</div><div class='add'>+	if (cfg-&gt;index == 0)</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-    /*</div><div class='del'>-      In this loop, we scan the CIS for configuration table entries,</div><div class='del'>-      each of which describes a valid card configuration, including</div><div class='del'>-      voltage, IO window, memory window, and interrupt settings.</div><div class='del'>-</div><div class='del'>-      We make no assumptions about the card to be configured: we use</div><div class='del'>-      just the information available in the CIS.  In an ideal world,</div><div class='del'>-      this would work for any PCMCIA card, but it requires a complete</div><div class='del'>-      and accurate CIS.  In practice, a driver usually "knows" most of</div><div class='del'>-      these things without consulting the CIS, and most client drivers</div><div class='del'>-      will only use the CIS to fill in implementation-defined details.</div><div class='del'>-    */</div><div class='del'>-    tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;</div><div class='del'>-    CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &amp;tuple));</div><div class='del'>-    while (1) {</div><div class='del'>-	cistpl_cftable_entry_t dflt = { 0 };</div><div class='del'>-	cistpl_cftable_entry_t *cfg = &amp;(parse.cftable_entry);</div><div class='del'>-	if (pcmcia_get_tuple_data(link, &amp;tuple) != 0 ||</div><div class='del'>-		pcmcia_parse_tuple(link, &amp;tuple, &amp;parse) != 0)</div><div class='del'>-	    goto next_entry;</div><div class='del'>-</div><div class='del'>-	if (cfg-&gt;flags &amp; CISTPL_CFTABLE_DEFAULT) dflt = *cfg;</div><div class='del'>-	if (cfg-&gt;index == 0) goto next_entry;</div><div class='del'>-	link-&gt;conf.ConfigIndex = cfg-&gt;index;</div><div class='del'>-	</div><div class='ctx'> 	/* Does this card need audio output? */</div><div class='ctx'> 	if (cfg-&gt;flags &amp; CISTPL_CFTABLE_AUDIO) {</div><div class='del'>-	    link-&gt;conf.Attributes |= CONF_ENABLE_SPKR;</div><div class='del'>-	    link-&gt;conf.Status = CCSR_AUDIO_ENA;</div><div class='add'>+		p_dev-&gt;conf.Attributes |= CONF_ENABLE_SPKR;</div><div class='add'>+		p_dev-&gt;conf.Status = CCSR_AUDIO_ENA;</div><div class='ctx'> 	}</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	/* Use power settings for Vcc and Vpp if present */</div><div class='ctx'> 	/*  Note that the CIS values need to be rescaled */</div><div class='ctx'> 	if (cfg-&gt;vcc.present &amp; (1&lt;&lt;CISTPL_POWER_VNOM)) {</div><div class='del'>-	    if (conf.Vcc != cfg-&gt;vcc.param[CISTPL_POWER_VNOM]/10000)</div><div class='del'>-		goto next_entry;</div><div class='del'>-	} else if (dflt.vcc.present &amp; (1&lt;&lt;CISTPL_POWER_VNOM)) {</div><div class='del'>-	    if (conf.Vcc != dflt.vcc.param[CISTPL_POWER_VNOM]/10000)</div><div class='del'>-		goto next_entry;</div><div class='add'>+		if (vcc != cfg-&gt;vcc.param[CISTPL_POWER_VNOM]/10000)</div><div class='add'>+			return -ENODEV;</div><div class='add'>+	} else if (dflt-&gt;vcc.present &amp; (1&lt;&lt;CISTPL_POWER_VNOM)) {</div><div class='add'>+		if (vcc != dflt-&gt;vcc.param[CISTPL_POWER_VNOM]/10000)</div><div class='add'>+			return -ENODEV;</div><div class='ctx'> 	}</div><div class='del'>-	    </div><div class='add'>+</div><div class='ctx'> 	if (cfg-&gt;vpp1.present &amp; (1&lt;&lt;CISTPL_POWER_VNOM))</div><div class='del'>-	    link-&gt;conf.Vpp =</div><div class='del'>-		cfg-&gt;vpp1.param[CISTPL_POWER_VNOM]/10000;</div><div class='del'>-	else if (dflt.vpp1.present &amp; (1&lt;&lt;CISTPL_POWER_VNOM))</div><div class='del'>-	    link-&gt;conf.Vpp =</div><div class='del'>-		dflt.vpp1.param[CISTPL_POWER_VNOM]/10000;</div><div class='del'>-	</div><div class='add'>+		p_dev-&gt;conf.Vpp = cfg-&gt;vpp1.param[CISTPL_POWER_VNOM]/10000;</div><div class='add'>+	else if (dflt-&gt;vpp1.present &amp; (1&lt;&lt;CISTPL_POWER_VNOM))</div><div class='add'>+		p_dev-&gt;conf.Vpp = dflt-&gt;vpp1.param[CISTPL_POWER_VNOM]/10000;</div><div class='add'>+</div><div class='ctx'> 	/* Do we need to allocate an interrupt? */</div><div class='del'>-	if (cfg-&gt;irq.IRQInfo1 || dflt.irq.IRQInfo1)</div><div class='del'>-	    link-&gt;conf.Attributes |= CONF_ENABLE_IRQ;</div><div class='del'>-	</div><div class='add'>+	if (cfg-&gt;irq.IRQInfo1 || dflt-&gt;irq.IRQInfo1)</div><div class='add'>+		p_dev-&gt;conf.Attributes |= CONF_ENABLE_IRQ;</div><div class='add'>+</div><div class='ctx'> 	/* IO window settings */</div><div class='del'>-	link-&gt;io.NumPorts1 = link-&gt;io.NumPorts2 = 0;</div><div class='del'>-	if ((cfg-&gt;io.nwin &gt; 0) || (dflt.io.nwin &gt; 0)) {</div><div class='del'>-	    cistpl_io_t *io = (cfg-&gt;io.nwin) ? &amp;cfg-&gt;io : &amp;dflt.io;</div><div class='del'>-	    link-&gt;io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;</div><div class='del'>-	    if (!(io-&gt;flags &amp; CISTPL_IO_8BIT))</div><div class='del'>-		link-&gt;io.Attributes1 = IO_DATA_PATH_WIDTH_16;</div><div class='del'>-	    if (!(io-&gt;flags &amp; CISTPL_IO_16BIT))</div><div class='del'>-		link-&gt;io.Attributes1 = IO_DATA_PATH_WIDTH_8;</div><div class='del'>-/* new in dummy.cs 2001/01/28 MN </div><div class='del'>-            link-&gt;io.IOAddrLines = io-&gt;flags &amp; CISTPL_IO_LINES_MASK;</div><div class='del'>-*/</div><div class='del'>-	    link-&gt;io.BasePort1 = io-&gt;win[0].base;</div><div class='del'>-	    link-&gt;io.NumPorts1 = io-&gt;win[0].len;</div><div class='del'>-	    if (io-&gt;nwin &gt; 1) {</div><div class='del'>-		link-&gt;io.Attributes2 = link-&gt;io.Attributes1;</div><div class='del'>-		link-&gt;io.BasePort2 = io-&gt;win[1].base;</div><div class='del'>-		link-&gt;io.NumPorts2 = io-&gt;win[1].len;</div><div class='del'>-	    }</div><div class='del'>-	    /* This reserves IO space but doesn't actually enable it */</div><div class='del'>-	    if (pcmcia_request_io(link, &amp;link-&gt;io) != 0)</div><div class='del'>-		goto next_entry;</div><div class='add'>+	p_dev-&gt;io.NumPorts1 = p_dev-&gt;io.NumPorts2 = 0;</div><div class='add'>+	if ((cfg-&gt;io.nwin &gt; 0) || (dflt-&gt;io.nwin &gt; 0)) {</div><div class='add'>+		cistpl_io_t *io = (cfg-&gt;io.nwin) ? &amp;cfg-&gt;io : &amp;dflt-&gt;io;</div><div class='add'>+		p_dev-&gt;io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;</div><div class='add'>+		if (!(io-&gt;flags &amp; CISTPL_IO_8BIT))</div><div class='add'>+			p_dev-&gt;io.Attributes1 = IO_DATA_PATH_WIDTH_16;</div><div class='add'>+		if (!(io-&gt;flags &amp; CISTPL_IO_16BIT))</div><div class='add'>+			p_dev-&gt;io.Attributes1 = IO_DATA_PATH_WIDTH_8;</div><div class='add'>+		p_dev-&gt;io.BasePort1 = io-&gt;win[0].base;</div><div class='add'>+		p_dev-&gt;io.NumPorts1 = io-&gt;win[0].len;</div><div class='add'>+		if (io-&gt;nwin &gt; 1) {</div><div class='add'>+			p_dev-&gt;io.Attributes2 = p_dev-&gt;io.Attributes1;</div><div class='add'>+			p_dev-&gt;io.BasePort2 = io-&gt;win[1].base;</div><div class='add'>+			p_dev-&gt;io.NumPorts2 = io-&gt;win[1].len;</div><div class='add'>+		}</div><div class='add'>+		/* This reserves IO space but doesn't actually enable it */</div><div class='add'>+		if (pcmcia_request_io(p_dev, &amp;p_dev-&gt;io) != 0)</div><div class='add'>+			return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -325,30 +285,54 @@ static int sedlbauer_config(struct pcmcia_device *link)</div><div class='ctx'> 	  needs to be mapped to virtual space with ioremap() before it</div><div class='ctx'> 	  is used.</div><div class='ctx'> 	*/</div><div class='del'>-	if ((cfg-&gt;mem.nwin &gt; 0) || (dflt.mem.nwin &gt; 0)) {</div><div class='del'>-	    cistpl_mem_t *mem =</div><div class='del'>-		(cfg-&gt;mem.nwin) ? &amp;cfg-&gt;mem : &amp;dflt.mem;</div><div class='del'>-	    req.Attributes = WIN_DATA_WIDTH_16|WIN_MEMORY_TYPE_CM;</div><div class='del'>-	    req.Attributes |= WIN_ENABLE;</div><div class='del'>-	    req.Base = mem-&gt;win[0].host_addr;</div><div class='del'>-	    req.Size = mem-&gt;win[0].len;</div><div class='del'>-/* new in dummy.cs 2001/01/28 MN </div><div class='del'>-            if (req.Size &lt; 0x1000)</div><div class='del'>-                req.Size = 0x1000;</div><div class='del'>-*/</div><div class='del'>-	    req.AccessSpeed = 0;</div><div class='del'>-	    if (pcmcia_request_window(&amp;link, &amp;req, &amp;link-&gt;win) != 0)</div><div class='del'>-		goto next_entry;</div><div class='del'>-	    map.Page = 0; map.CardOffset = mem-&gt;win[0].card_addr;</div><div class='del'>-	    if (pcmcia_map_mem_page(link-&gt;win, &amp;map) != 0)</div><div class='del'>-		goto next_entry;</div><div class='add'>+	if ((cfg-&gt;mem.nwin &gt; 0) || (dflt-&gt;mem.nwin &gt; 0)) {</div><div class='add'>+		cistpl_mem_t *mem = (cfg-&gt;mem.nwin) ? &amp;cfg-&gt;mem : &amp;dflt-&gt;mem;</div><div class='add'>+		memreq_t map;</div><div class='add'>+		req-&gt;Attributes = WIN_DATA_WIDTH_16|WIN_MEMORY_TYPE_CM;</div><div class='add'>+		req-&gt;Attributes |= WIN_ENABLE;</div><div class='add'>+		req-&gt;Base = mem-&gt;win[0].host_addr;</div><div class='add'>+		req-&gt;Size = mem-&gt;win[0].len;</div><div class='add'>+		req-&gt;AccessSpeed = 0;</div><div class='add'>+		if (pcmcia_request_window(&amp;p_dev, req, &amp;p_dev-&gt;win) != 0)</div><div class='add'>+			return -ENODEV;</div><div class='add'>+		map.Page = 0;</div><div class='add'>+		map.CardOffset = mem-&gt;win[0].card_addr;</div><div class='add'>+		if (pcmcia_map_mem_page(p_dev-&gt;win, &amp;map) != 0)</div><div class='add'>+			return -ENODEV;</div><div class='ctx'> 	}</div><div class='del'>-	/* If we got this far, we're cool! */</div><div class='del'>-	break;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-    next_entry:</div><div class='del'>-	CS_CHECK(GetNextTuple, pcmcia_get_next_tuple(link, &amp;tuple));</div><div class='del'>-    }</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int sedlbauer_config(struct pcmcia_device *link)</div><div class='add'>+{</div><div class='add'>+    local_info_t *dev = link-&gt;priv;</div><div class='add'>+    win_req_t *req;</div><div class='add'>+    int last_fn, last_ret;</div><div class='add'>+    IsdnCard_t  icard;</div><div class='add'>+</div><div class='add'>+    DEBUG(0, "sedlbauer_config(0x%p)\n", link);</div><div class='add'>+</div><div class='add'>+    req = kzalloc(sizeof(win_req_t), GFP_KERNEL);</div><div class='add'>+    if (!req)</div><div class='add'>+	    return -ENOMEM;</div><div class='add'>+</div><div class='add'>+    /*</div><div class='add'>+      In this loop, we scan the CIS for configuration table entries,</div><div class='add'>+      each of which describes a valid card configuration, including</div><div class='add'>+      voltage, IO window, memory window, and interrupt settings.</div><div class='add'>+</div><div class='add'>+      We make no assumptions about the card to be configured: we use</div><div class='add'>+      just the information available in the CIS.  In an ideal world,</div><div class='add'>+      this would work for any PCMCIA card, but it requires a complete</div><div class='add'>+      and accurate CIS.  In practice, a driver usually "knows" most of</div><div class='add'>+      these things without consulting the CIS, and most client drivers</div><div class='add'>+      will only use the CIS to fill in implementation-defined details.</div><div class='add'>+    */</div><div class='add'>+    last_ret = pcmcia_loop_config(link, sedlbauer_config_check, req);</div><div class='add'>+    if (last_ret)</div><div class='add'>+	    goto failed;</div><div class='ctx'> </div><div class='ctx'>     /*</div><div class='ctx'>        Allocate an interrupt line.  Note that this does not assign a</div><div class='hunk'>@@ -387,8 +371,8 @@ static int sedlbauer_config(struct pcmcia_device *link)</div><div class='ctx'> 	printk(" &amp; 0x%04x-0x%04x", link-&gt;io.BasePort2,</div><div class='ctx'> 	       link-&gt;io.BasePort2+link-&gt;io.NumPorts2-1);</div><div class='ctx'>     if (link-&gt;win)</div><div class='del'>-	printk(", mem 0x%06lx-0x%06lx", req.Base,</div><div class='del'>-	       req.Base+req.Size-1);</div><div class='add'>+	printk(", mem 0x%06lx-0x%06lx", req-&gt;Base,</div><div class='add'>+	       req-&gt;Base+req-&gt;Size-1);</div><div class='ctx'>     printk("\n");</div><div class='ctx'> </div><div class='ctx'>     icard.para[0] = link-&gt;irq.AssignedIRQ;</div><div class='hunk'>@@ -409,6 +393,7 @@ static int sedlbauer_config(struct pcmcia_device *link)</div><div class='ctx'> </div><div class='ctx'> cs_failed:</div><div class='ctx'>     cs_error(link, last_fn, last_ret);</div><div class='add'>+failed:</div><div class='ctx'>     sedlbauer_release(link);</div><div class='ctx'>     return -ENODEV;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/isdn/hisax/teles_cs.c b/drivers/isdn/hisax/teles_cs.c<br/>index ab4bd455450e..623d111544d4 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/isdn/hisax/teles_cs.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/isdn/hisax/teles_cs.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/isdn/hisax/teles_cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/isdn/hisax/teles_cs.c</a></div><div class='hunk'>@@ -193,82 +193,55 @@ static void teles_detach(struct pcmcia_device *link)</div><div class='ctx'>     device available to the system.</div><div class='ctx'> </div><div class='ctx'> ======================================================================*/</div><div class='del'>-static int get_tuple(struct pcmcia_device *handle, tuple_t *tuple,</div><div class='del'>-                     cisparse_t *parse)</div><div class='del'>-{</div><div class='del'>-    int i = pcmcia_get_tuple_data(handle, tuple);</div><div class='del'>-    if (i != CS_SUCCESS) return i;</div><div class='del'>-    return pcmcia_parse_tuple(handle, tuple, parse);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int first_tuple(struct pcmcia_device *handle, tuple_t *tuple,</div><div class='del'>-                     cisparse_t *parse)</div><div class='del'>-{</div><div class='del'>-    int i = pcmcia_get_first_tuple(handle, tuple);</div><div class='del'>-    if (i != CS_SUCCESS) return i;</div><div class='del'>-    return get_tuple(handle, tuple, parse);</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-static int next_tuple(struct pcmcia_device *handle, tuple_t *tuple,</div><div class='del'>-                     cisparse_t *parse)</div><div class='add'>+static int teles_cs_configcheck(struct pcmcia_device *p_dev,</div><div class='add'>+				cistpl_cftable_entry_t *cf,</div><div class='add'>+				cistpl_cftable_entry_t *dflt,</div><div class='add'>+				unsigned int vcc,</div><div class='add'>+				void *priv_data)</div><div class='ctx'> {</div><div class='del'>-    int i = pcmcia_get_next_tuple(handle, tuple);</div><div class='del'>-    if (i != CS_SUCCESS) return i;</div><div class='del'>-    return get_tuple(handle, tuple, parse);</div><div class='add'>+	int j;</div><div class='add'>+</div><div class='add'>+	if ((cf-&gt;io.nwin &gt; 0) &amp;&amp; cf-&gt;io.win[0].base) {</div><div class='add'>+		printk(KERN_INFO "(teles_cs: looks like the 96 model)\n");</div><div class='add'>+		p_dev-&gt;io.BasePort1 = cf-&gt;io.win[0].base;</div><div class='add'>+		if (!pcmcia_request_io(p_dev, &amp;p_dev-&gt;io))</div><div class='add'>+			return 0;</div><div class='add'>+	} else {</div><div class='add'>+		printk(KERN_INFO "(teles_cs: looks like the 97 model)\n");</div><div class='add'>+		for (j = 0x2f0; j &gt; 0x100; j -= 0x10) {</div><div class='add'>+			p_dev-&gt;io.BasePort1 = j;</div><div class='add'>+			if (!pcmcia_request_io(p_dev, &amp;p_dev-&gt;io))</div><div class='add'>+				return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int teles_cs_config(struct pcmcia_device *link)</div><div class='ctx'> {</div><div class='del'>-    tuple_t tuple;</div><div class='del'>-    cisparse_t parse;</div><div class='ctx'>     local_info_t *dev;</div><div class='del'>-    int i, j, last_fn;</div><div class='del'>-    u_short buf[128];</div><div class='del'>-    cistpl_cftable_entry_t *cf = &amp;parse.cftable_entry;</div><div class='add'>+    int i, last_fn;</div><div class='ctx'>     IsdnCard_t icard;</div><div class='ctx'> </div><div class='ctx'>     DEBUG(0, "teles_config(0x%p)\n", link);</div><div class='ctx'>     dev = link-&gt;priv;</div><div class='ctx'> </div><div class='del'>-    tuple.TupleData = (cisdata_t *)buf;</div><div class='del'>-    tuple.TupleOffset = 0; tuple.TupleDataMax = 255;</div><div class='del'>-    tuple.Attributes = 0;</div><div class='del'>-    tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;</div><div class='del'>-    i = first_tuple(link, &amp;tuple, &amp;parse);</div><div class='del'>-    while (i == CS_SUCCESS) {</div><div class='del'>-        if ( (cf-&gt;io.nwin &gt; 0) &amp;&amp; cf-&gt;io.win[0].base) {</div><div class='del'>-            printk(KERN_INFO "(teles_cs: looks like the 96 model)\n");</div><div class='del'>-            link-&gt;conf.ConfigIndex = cf-&gt;index;</div><div class='del'>-            link-&gt;io.BasePort1 = cf-&gt;io.win[0].base;</div><div class='del'>-            i = pcmcia_request_io(link, &amp;link-&gt;io);</div><div class='del'>-            if (i == CS_SUCCESS) break;</div><div class='del'>-        } else {</div><div class='del'>-          printk(KERN_INFO "(teles_cs: looks like the 97 model)\n");</div><div class='del'>-          link-&gt;conf.ConfigIndex = cf-&gt;index;</div><div class='del'>-          for (i = 0, j = 0x2f0; j &gt; 0x100; j -= 0x10) {</div><div class='del'>-            link-&gt;io.BasePort1 = j;</div><div class='del'>-            i = pcmcia_request_io(link, &amp;link-&gt;io);</div><div class='del'>-            if (i == CS_SUCCESS) break;</div><div class='del'>-          }</div><div class='del'>-          break;</div><div class='del'>-        }</div><div class='del'>-        i = next_tuple(link, &amp;tuple, &amp;parse);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    if (i != CS_SUCCESS) {</div><div class='add'>+    i = pcmcia_loop_config(link, teles_cs_configcheck, NULL);</div><div class='add'>+    if (i != 0) {</div><div class='ctx'> 	last_fn = RequestIO;</div><div class='ctx'> 	goto cs_failed;</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     i = pcmcia_request_irq(link, &amp;link-&gt;irq);</div><div class='del'>-    if (i != CS_SUCCESS) {</div><div class='add'>+    if (i != 0) {</div><div class='ctx'>         link-&gt;irq.AssignedIRQ = 0;</div><div class='ctx'> 	last_fn = RequestIRQ;</div><div class='ctx'>         goto cs_failed;</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     i = pcmcia_request_configuration(link, &amp;link-&gt;conf);</div><div class='del'>-    if (i != CS_SUCCESS) {</div><div class='add'>+    if (i != 0) {</div><div class='ctx'>       last_fn = RequestConfiguration;</div><div class='ctx'>       goto cs_failed;</div><div class='ctx'>     }</div><div class='head'>diff --git a/drivers/isdn/i4l/isdn_ppp.c b/drivers/isdn/i4l/isdn_ppp.c<br/>index 127cfdad68e7..77c280ef2eb6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/isdn/i4l/isdn_ppp.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/isdn/i4l/isdn_ppp.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/isdn/i4l/isdn_ppp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/isdn/i4l/isdn_ppp.c</a></div><div class='hunk'>@@ -1533,8 +1533,10 @@ static int isdn_ppp_mp_bundle_array_init(void)</div><div class='ctx'> 	int sz = ISDN_MAX_CHANNELS*sizeof(ippp_bundle);</div><div class='ctx'> 	if( (isdn_ppp_bundle_arr = kzalloc(sz, GFP_KERNEL)) == NULL )</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	for( i = 0; i &lt; ISDN_MAX_CHANNELS; i++ )</div><div class='add'>+	for (i = 0; i &lt; ISDN_MAX_CHANNELS; i++) {</div><div class='ctx'> 		spin_lock_init(&amp;isdn_ppp_bundle_arr[i].lock);</div><div class='add'>+		skb_queue_head_init(&amp;isdn_ppp_bundle_arr[i].frags);</div><div class='add'>+	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1567,7 +1569,7 @@ static int isdn_ppp_mp_init( isdn_net_local * lp, ippp_bundle * add_to )</div><div class='ctx'> 		if ((lp-&gt;netdev-&gt;pb = isdn_ppp_mp_bundle_alloc()) == NULL)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		lp-&gt;next = lp-&gt;last = lp;	/* nobody else in a queue */</div><div class='del'>-		lp-&gt;netdev-&gt;pb-&gt;frags = NULL;</div><div class='add'>+		skb_queue_head_init(&amp;lp-&gt;netdev-&gt;pb-&gt;frags);</div><div class='ctx'> 		lp-&gt;netdev-&gt;pb-&gt;frames = 0;</div><div class='ctx'> 		lp-&gt;netdev-&gt;pb-&gt;seq = UINT_MAX;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1579,28 +1581,29 @@ static int isdn_ppp_mp_init( isdn_net_local * lp, ippp_bundle * add_to )</div><div class='ctx'> </div><div class='ctx'> static u32 isdn_ppp_mp_get_seq( int short_seq, </div><div class='ctx'> 					struct sk_buff * skb, u32 last_seq );</div><div class='del'>-static struct sk_buff * isdn_ppp_mp_discard( ippp_bundle * mp,</div><div class='del'>-			struct sk_buff * from, struct sk_buff * to );</div><div class='del'>-static void isdn_ppp_mp_reassembly( isdn_net_dev * net_dev, isdn_net_local * lp,</div><div class='del'>-				struct sk_buff * from, struct sk_buff * to );</div><div class='del'>-static void isdn_ppp_mp_free_skb( ippp_bundle * mp, struct sk_buff * skb );</div><div class='add'>+static void isdn_ppp_mp_discard(ippp_bundle *mp, struct sk_buff *from,</div><div class='add'>+				struct sk_buff *to);</div><div class='add'>+static void isdn_ppp_mp_reassembly(isdn_net_dev *net_dev, isdn_net_local *lp,</div><div class='add'>+				   struct sk_buff *from, struct sk_buff *to,</div><div class='add'>+				   u32 lastseq);</div><div class='add'>+static void isdn_ppp_mp_free_skb(ippp_bundle *mp, struct sk_buff *skb);</div><div class='ctx'> static void isdn_ppp_mp_print_recv_pkt( int slot, struct sk_buff * skb );</div><div class='ctx'> </div><div class='ctx'> static void isdn_ppp_mp_receive(isdn_net_dev * net_dev, isdn_net_local * lp, </div><div class='del'>-							struct sk_buff *skb)</div><div class='add'>+				struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct ippp_struct *is;</div><div class='del'>-	isdn_net_local * lpq;</div><div class='del'>-	ippp_bundle * mp;</div><div class='del'>-	isdn_mppp_stats * stats;</div><div class='del'>-	struct sk_buff * newfrag, * frag, * start, *nextf;</div><div class='add'>+	struct sk_buff *newfrag, *frag, *start, *nextf;</div><div class='ctx'> 	u32 newseq, minseq, thisseq;</div><div class='add'>+	isdn_mppp_stats *stats;</div><div class='add'>+	struct ippp_struct *is;</div><div class='ctx'> 	unsigned long flags;</div><div class='add'>+	isdn_net_local *lpq;</div><div class='add'>+	ippp_bundle *mp;</div><div class='ctx'> 	int slot;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;net_dev-&gt;pb-&gt;lock, flags);</div><div class='del'>-    	mp = net_dev-&gt;pb;</div><div class='del'>-        stats = &amp;mp-&gt;stats;</div><div class='add'>+	mp = net_dev-&gt;pb;</div><div class='add'>+	stats = &amp;mp-&gt;stats;</div><div class='ctx'> 	slot = lp-&gt;ppp_slot;</div><div class='ctx'> 	if (slot &lt; 0 || slot &gt;= ISDN_MAX_CHANNELS) {</div><div class='ctx'> 		printk(KERN_ERR "%s: lp-&gt;ppp_slot(%d)\n",</div><div class='hunk'>@@ -1611,20 +1614,19 @@ static void isdn_ppp_mp_receive(isdn_net_dev * net_dev, isdn_net_local * lp,</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	is = ippp_table[slot];</div><div class='del'>-    	if( ++mp-&gt;frames &gt; stats-&gt;max_queue_len )</div><div class='add'>+	if (++mp-&gt;frames &gt; stats-&gt;max_queue_len)</div><div class='ctx'> 		stats-&gt;max_queue_len = mp-&gt;frames;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	if (is-&gt;debug &amp; 0x8)</div><div class='ctx'> 		isdn_ppp_mp_print_recv_pkt(lp-&gt;ppp_slot, skb);</div><div class='ctx'> </div><div class='del'>-	newseq = isdn_ppp_mp_get_seq(is-&gt;mpppcfg &amp; SC_IN_SHORT_SEQ, </div><div class='del'>-						skb, is-&gt;last_link_seqno);</div><div class='del'>-</div><div class='add'>+	newseq = isdn_ppp_mp_get_seq(is-&gt;mpppcfg &amp; SC_IN_SHORT_SEQ,</div><div class='add'>+				     skb, is-&gt;last_link_seqno);</div><div class='ctx'> </div><div class='ctx'> 	/* if this packet seq # is less than last already processed one,</div><div class='ctx'> 	 * toss it right away, but check for sequence start case first </div><div class='ctx'> 	 */</div><div class='del'>-	if( mp-&gt;seq &gt; MP_LONGSEQ_MAX &amp;&amp; (newseq &amp; MP_LONGSEQ_MAXBIT) ) {</div><div class='add'>+	if (mp-&gt;seq &gt; MP_LONGSEQ_MAX &amp;&amp; (newseq &amp; MP_LONGSEQ_MAXBIT)) {</div><div class='ctx'> 		mp-&gt;seq = newseq;	/* the first packet: required for</div><div class='ctx'> 					 * rfc1990 non-compliant clients --</div><div class='ctx'> 					 * prevents constant packet toss */</div><div class='hunk'>@@ -1634,7 +1636,7 @@ static void isdn_ppp_mp_receive(isdn_net_dev * net_dev, isdn_net_local * lp,</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;mp-&gt;lock, flags);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	/* find the minimum received sequence number over all links */</div><div class='ctx'> 	is-&gt;last_link_seqno = minseq = newseq;</div><div class='ctx'> 	for (lpq = net_dev-&gt;queue;;) {</div><div class='hunk'>@@ -1655,22 +1657,31 @@ static void isdn_ppp_mp_receive(isdn_net_dev * net_dev, isdn_net_local * lp,</div><div class='ctx'> 					 * packets */</div><div class='ctx'> 	newfrag = skb;</div><div class='ctx'> </div><div class='del'>-  	/* if this new fragment is before the first one, then enqueue it now. */</div><div class='del'>-  	if ((frag = mp-&gt;frags) == NULL || MP_LT(newseq, MP_SEQ(frag))) {</div><div class='del'>-		newfrag-&gt;next = frag;</div><div class='del'>-    		mp-&gt;frags = frag = newfrag;</div><div class='del'>-    		newfrag = NULL;</div><div class='del'>-  	}</div><div class='add'>+	/* Insert new fragment into the proper sequence slot.  */</div><div class='add'>+	skb_queue_walk(&amp;mp-&gt;frags, frag) {</div><div class='add'>+		if (MP_SEQ(frag) == newseq) {</div><div class='add'>+			isdn_ppp_mp_free_skb(mp, newfrag);</div><div class='add'>+			newfrag = NULL;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		if (MP_LT(newseq, MP_SEQ(frag))) {</div><div class='add'>+			__skb_queue_before(&amp;mp-&gt;frags, frag, newfrag);</div><div class='add'>+			newfrag = NULL;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (newfrag)</div><div class='add'>+		__skb_queue_tail(&amp;mp-&gt;frags, newfrag);</div><div class='ctx'> </div><div class='del'>-  	start = MP_FLAGS(frag) &amp; MP_BEGIN_FRAG &amp;&amp;</div><div class='del'>-				MP_SEQ(frag) == mp-&gt;seq ? frag : NULL;</div><div class='add'>+	frag = skb_peek(&amp;mp-&gt;frags);</div><div class='add'>+	start = ((MP_FLAGS(frag) &amp; MP_BEGIN_FRAG) &amp;&amp;</div><div class='add'>+		 (MP_SEQ(frag) == mp-&gt;seq)) ? frag : NULL;</div><div class='add'>+	if (!start)</div><div class='add'>+		goto check_overflow;</div><div class='ctx'> </div><div class='del'>-	/* </div><div class='del'>-	 * main fragment traversing loop</div><div class='add'>+	/* main fragment traversing loop</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * try to accomplish several tasks:</div><div class='del'>-	 * - insert new fragment into the proper sequence slot (once that's done</div><div class='del'>-	 *   newfrag will be set to NULL)</div><div class='ctx'> 	 * - reassemble any complete fragment sequence (non-null 'start'</div><div class='ctx'> 	 *   indicates there is a continguous sequence present)</div><div class='ctx'> 	 * - discard any incomplete sequences that are below minseq -- due</div><div class='hunk'>@@ -1679,71 +1690,46 @@ static void isdn_ppp_mp_receive(isdn_net_dev * net_dev, isdn_net_local * lp,</div><div class='ctx'> 	 *   come to complete such sequence and it should be discarded</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * loop completes when we accomplished the following tasks:</div><div class='del'>-	 * - new fragment is inserted in the proper sequence ('newfrag' is </div><div class='del'>-	 *   set to NULL)</div><div class='ctx'> 	 * - we hit a gap in the sequence, so no reassembly/processing is </div><div class='ctx'> 	 *   possible ('start' would be set to NULL)</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * algorithm for this code is derived from code in the book</div><div class='ctx'> 	 * 'PPP Design And Debugging' by James Carlson (Addison-Wesley)</div><div class='ctx'> 	 */</div><div class='del'>-  	while (start != NULL || newfrag != NULL) {</div><div class='del'>-</div><div class='del'>-    		thisseq = MP_SEQ(frag);</div><div class='del'>-    		nextf = frag-&gt;next;</div><div class='del'>-</div><div class='del'>-    		/* drop any duplicate fragments */</div><div class='del'>-    		if (newfrag != NULL &amp;&amp; thisseq == newseq) {</div><div class='del'>-      			isdn_ppp_mp_free_skb(mp, newfrag);</div><div class='del'>-      			newfrag = NULL;</div><div class='del'>-    		}</div><div class='del'>-</div><div class='del'>-    		/* insert new fragment before next element if possible. */</div><div class='del'>-    		if (newfrag != NULL &amp;&amp; (nextf == NULL || </div><div class='del'>-						MP_LT(newseq, MP_SEQ(nextf)))) {</div><div class='del'>-      			newfrag-&gt;next = nextf;</div><div class='del'>-      			frag-&gt;next = nextf = newfrag;</div><div class='del'>-      			newfrag = NULL;</div><div class='del'>-    		}</div><div class='del'>-</div><div class='del'>-    		if (start != NULL) {</div><div class='del'>-	    		/* check for misplaced start */</div><div class='del'>-      			if (start != frag &amp;&amp; (MP_FLAGS(frag) &amp; MP_BEGIN_FRAG)) {</div><div class='del'>-				printk(KERN_WARNING"isdn_mppp(seq %d): new "</div><div class='del'>-				      "BEGIN flag with no prior END", thisseq);</div><div class='del'>-				stats-&gt;seqerrs++;</div><div class='del'>-				stats-&gt;frame_drops++;</div><div class='del'>-				start = isdn_ppp_mp_discard(mp, start,frag);</div><div class='del'>-				nextf = frag-&gt;next;</div><div class='del'>-      			}</div><div class='del'>-    		} else if (MP_LE(thisseq, minseq)) {		</div><div class='del'>-      			if (MP_FLAGS(frag) &amp; MP_BEGIN_FRAG)</div><div class='add'>+	skb_queue_walk_safe(&amp;mp-&gt;frags, frag, nextf) {</div><div class='add'>+		thisseq = MP_SEQ(frag);</div><div class='add'>+</div><div class='add'>+		/* check for misplaced start */</div><div class='add'>+		if (start != frag &amp;&amp; (MP_FLAGS(frag) &amp; MP_BEGIN_FRAG)) {</div><div class='add'>+			printk(KERN_WARNING"isdn_mppp(seq %d): new "</div><div class='add'>+			       "BEGIN flag with no prior END", thisseq);</div><div class='add'>+			stats-&gt;seqerrs++;</div><div class='add'>+			stats-&gt;frame_drops++;</div><div class='add'>+			isdn_ppp_mp_discard(mp, start, frag);</div><div class='add'>+			start = frag;</div><div class='add'>+		} else if (MP_LE(thisseq, minseq)) {		</div><div class='add'>+			if (MP_FLAGS(frag) &amp; MP_BEGIN_FRAG)</div><div class='ctx'> 				start = frag;</div><div class='del'>-      			else {</div><div class='add'>+			else {</div><div class='ctx'> 				if (MP_FLAGS(frag) &amp; MP_END_FRAG)</div><div class='del'>-	  				stats-&gt;frame_drops++;</div><div class='del'>-				if( mp-&gt;frags == frag )</div><div class='del'>-					mp-&gt;frags = nextf;	</div><div class='add'>+					stats-&gt;frame_drops++;</div><div class='add'>+				__skb_unlink(skb, &amp;mp-&gt;frags);</div><div class='ctx'> 				isdn_ppp_mp_free_skb(mp, frag);</div><div class='del'>-				frag = nextf;</div><div class='ctx'> 				continue;</div><div class='del'>-      			}</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='del'>-		</div><div class='del'>-		/* if start is non-null and we have end fragment, then</div><div class='del'>-		 * we have full reassembly sequence -- reassemble </div><div class='del'>-		 * and process packet now</div><div class='add'>+</div><div class='add'>+		/* if we have end fragment, then we have full reassembly</div><div class='add'>+		 * sequence -- reassemble and process packet now</div><div class='ctx'> 		 */</div><div class='del'>-    		if (start != NULL &amp;&amp; (MP_FLAGS(frag) &amp; MP_END_FRAG)) {</div><div class='del'>-      			minseq = mp-&gt;seq = (thisseq+1) &amp; MP_LONGSEQ_MASK;</div><div class='del'>-      			/* Reassemble the packet then dispatch it */</div><div class='del'>-			isdn_ppp_mp_reassembly(net_dev, lp, start, nextf);</div><div class='del'>-      </div><div class='del'>-      			start = NULL;</div><div class='del'>-      			frag = NULL;</div><div class='add'>+		if (MP_FLAGS(frag) &amp; MP_END_FRAG) {</div><div class='add'>+			minseq = mp-&gt;seq = (thisseq+1) &amp; MP_LONGSEQ_MASK;</div><div class='add'>+			/* Reassemble the packet then dispatch it */</div><div class='add'>+			isdn_ppp_mp_reassembly(net_dev, lp, start, frag, thisseq);</div><div class='ctx'> </div><div class='del'>-      			mp-&gt;frags = nextf;</div><div class='del'>-    		}</div><div class='add'>+			start = NULL;</div><div class='add'>+			frag = NULL;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		/* check if need to update start pointer: if we just</div><div class='ctx'> 		 * reassembled the packet and sequence is contiguous</div><div class='hunk'>@@ -1754,26 +1740,25 @@ static void isdn_ppp_mp_receive(isdn_net_dev * net_dev, isdn_net_local * lp,</div><div class='ctx'> 		 * below low watermark and set start to the next frag or</div><div class='ctx'> 		 * clear start ptr.</div><div class='ctx'> 		 */ </div><div class='del'>-    		if (nextf != NULL &amp;&amp; </div><div class='add'>+		if (nextf != (struct sk_buff *)&amp;mp-&gt;frags &amp;&amp; </div><div class='ctx'> 		    ((thisseq+1) &amp; MP_LONGSEQ_MASK) == MP_SEQ(nextf)) {</div><div class='del'>-      			/* if we just reassembled and the next one is here, </div><div class='del'>-			 * then start another reassembly. */</div><div class='del'>-</div><div class='del'>-      			if (frag == NULL) {</div><div class='add'>+			/* if we just reassembled and the next one is here, </div><div class='add'>+			 * then start another reassembly.</div><div class='add'>+			 */</div><div class='add'>+			if (frag == NULL) {</div><div class='ctx'> 				if (MP_FLAGS(nextf) &amp; MP_BEGIN_FRAG)</div><div class='del'>-	  				start = nextf;</div><div class='del'>-				else</div><div class='del'>-				{</div><div class='del'>-	  				printk(KERN_WARNING"isdn_mppp(seq %d):"</div><div class='del'>-						" END flag with no following "</div><div class='del'>-						"BEGIN", thisseq);</div><div class='add'>+					start = nextf;</div><div class='add'>+				else {</div><div class='add'>+					printk(KERN_WARNING"isdn_mppp(seq %d):"</div><div class='add'>+					       " END flag with no following "</div><div class='add'>+					       "BEGIN", thisseq);</div><div class='ctx'> 					stats-&gt;seqerrs++;</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='del'>-</div><div class='del'>-    		} else {</div><div class='del'>-			if ( nextf != NULL &amp;&amp; frag != NULL &amp;&amp;</div><div class='del'>-						MP_LT(thisseq, minseq)) {</div><div class='add'>+		} else {</div><div class='add'>+			if (nextf != (struct sk_buff *)&amp;mp-&gt;frags &amp;&amp;</div><div class='add'>+			    frag != NULL &amp;&amp;</div><div class='add'>+			    MP_LT(thisseq, minseq)) {</div><div class='ctx'> 				/* we've got a break in the sequence</div><div class='ctx'> 				 * and we not at the end yet</div><div class='ctx'> 				 * and we did not just reassembled</div><div class='hunk'>@@ -1782,41 +1767,39 @@ static void isdn_ppp_mp_receive(isdn_net_dev * net_dev, isdn_net_local * lp,</div><div class='ctx'> 			 	 * discard all the frames below low watermark </div><div class='ctx'> 				 * and start over */</div><div class='ctx'> 				stats-&gt;frame_drops++;</div><div class='del'>-				mp-&gt;frags = isdn_ppp_mp_discard(mp,start,nextf);</div><div class='add'>+				isdn_ppp_mp_discard(mp, start, nextf);</div><div class='ctx'> 			}</div><div class='ctx'> 			/* break in the sequence, no reassembly */</div><div class='del'>-      			start = NULL;</div><div class='del'>-    		}</div><div class='del'>-	  			</div><div class='del'>-    		frag = nextf;</div><div class='del'>-  	}	/* while -- main loop */</div><div class='del'>-	</div><div class='del'>-  	if (mp-&gt;frags == NULL)</div><div class='del'>-    		mp-&gt;frags = frag;</div><div class='del'>-		</div><div class='add'>+			start = NULL;</div><div class='add'>+		}</div><div class='add'>+		if (!start)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+check_overflow:</div><div class='ctx'> 	/* rather straighforward way to deal with (not very) possible </div><div class='del'>-	 * queue overflow */</div><div class='add'>+	 * queue overflow</div><div class='add'>+	 */</div><div class='ctx'> 	if (mp-&gt;frames &gt; MP_MAX_QUEUE_LEN) {</div><div class='ctx'> 		stats-&gt;overflows++;</div><div class='del'>-		while (mp-&gt;frames &gt; MP_MAX_QUEUE_LEN) {</div><div class='del'>-			frag = mp-&gt;frags-&gt;next;</div><div class='del'>-			isdn_ppp_mp_free_skb(mp, mp-&gt;frags);</div><div class='del'>-			mp-&gt;frags = frag;</div><div class='add'>+		skb_queue_walk_safe(&amp;mp-&gt;frags, frag, nextf) {</div><div class='add'>+			if (mp-&gt;frames &lt;= MP_MAX_QUEUE_LEN)</div><div class='add'>+				break;</div><div class='add'>+			__skb_unlink(frag, &amp;mp-&gt;frags);</div><div class='add'>+			isdn_ppp_mp_free_skb(mp, frag);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;mp-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void isdn_ppp_mp_cleanup( isdn_net_local * lp )</div><div class='add'>+static void isdn_ppp_mp_cleanup(isdn_net_local *lp)</div><div class='ctx'> {</div><div class='del'>-	struct sk_buff * frag = lp-&gt;netdev-&gt;pb-&gt;frags;</div><div class='del'>-	struct sk_buff * nextfrag;</div><div class='del'>-    	while( frag ) {</div><div class='del'>-		nextfrag = frag-&gt;next;</div><div class='del'>-		isdn_ppp_mp_free_skb(lp-&gt;netdev-&gt;pb, frag);</div><div class='del'>-		frag = nextfrag;</div><div class='del'>-	}</div><div class='del'>-	lp-&gt;netdev-&gt;pb-&gt;frags = NULL;</div><div class='add'>+	struct sk_buff *skb, *tmp;</div><div class='add'>+</div><div class='add'>+	skb_queue_walk_safe(&amp;lp-&gt;netdev-&gt;pb-&gt;frags, skb, tmp) {</div><div class='add'>+		__skb_unlink(skb, &amp;lp-&gt;netdev-&gt;pb-&gt;frags);</div><div class='add'>+		isdn_ppp_mp_free_skb(lp-&gt;netdev-&gt;pb, skb);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u32 isdn_ppp_mp_get_seq( int short_seq, </div><div class='hunk'>@@ -1853,72 +1836,115 @@ static u32 isdn_ppp_mp_get_seq( int short_seq,</div><div class='ctx'> 	return seq;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct sk_buff * isdn_ppp_mp_discard( ippp_bundle * mp,</div><div class='del'>-			struct sk_buff * from, struct sk_buff * to )</div><div class='add'>+static void isdn_ppp_mp_discard(ippp_bundle *mp, struct sk_buff *from,</div><div class='add'>+				struct sk_buff *to)</div><div class='ctx'> {</div><div class='del'>-	if( from )</div><div class='del'>-		while (from != to) {</div><div class='del'>-	  		struct sk_buff * next = from-&gt;next;</div><div class='del'>-			isdn_ppp_mp_free_skb(mp, from);</div><div class='del'>-	  		from = next;</div><div class='add'>+	if (from) {</div><div class='add'>+		struct sk_buff *skb, *tmp;</div><div class='add'>+		int freeing = 0;</div><div class='add'>+</div><div class='add'>+		skb_queue_walk_safe(&amp;mp-&gt;frags, skb, tmp) {</div><div class='add'>+			if (skb == to)</div><div class='add'>+				break;</div><div class='add'>+			if (skb == from)</div><div class='add'>+				freeing = 1;</div><div class='add'>+			if (!freeing)</div><div class='add'>+				continue;</div><div class='add'>+			__skb_unlink(skb, &amp;mp-&gt;frags);</div><div class='add'>+			isdn_ppp_mp_free_skb(mp, skb);</div><div class='ctx'> 		}</div><div class='del'>-	return from;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void isdn_ppp_mp_reassembly( isdn_net_dev * net_dev, isdn_net_local * lp,</div><div class='del'>-				struct sk_buff * from, struct sk_buff * to )</div><div class='add'>+static unsigned int calc_tot_len(struct sk_buff_head *queue,</div><div class='add'>+				 struct sk_buff *from, struct sk_buff *to)</div><div class='ctx'> {</div><div class='del'>-	ippp_bundle * mp = net_dev-&gt;pb;</div><div class='del'>-	int proto;</div><div class='del'>-	struct sk_buff * skb;</div><div class='add'>+	unsigned int tot_len = 0;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int found_start = 0;</div><div class='add'>+</div><div class='add'>+	skb_queue_walk(queue, skb) {</div><div class='add'>+		if (skb == from)</div><div class='add'>+			found_start = 1;</div><div class='add'>+		if (!found_start)</div><div class='add'>+			continue;</div><div class='add'>+		tot_len += skb-&gt;len - MP_HEADER_LEN;</div><div class='add'>+		if (skb == to)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	return tot_len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Reassemble packet using fragments in the reassembly queue from</div><div class='add'>+ * 'from' until 'to', inclusive.</div><div class='add'>+ */</div><div class='add'>+static void isdn_ppp_mp_reassembly(isdn_net_dev *net_dev, isdn_net_local *lp,</div><div class='add'>+				   struct sk_buff *from, struct sk_buff *to,</div><div class='add'>+				   u32 lastseq)</div><div class='add'>+{</div><div class='add'>+	ippp_bundle *mp = net_dev-&gt;pb;</div><div class='ctx'> 	unsigned int tot_len;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int proto;</div><div class='ctx'> </div><div class='ctx'> 	if (lp-&gt;ppp_slot &lt; 0 || lp-&gt;ppp_slot &gt;= ISDN_MAX_CHANNELS) {</div><div class='ctx'> 		printk(KERN_ERR "%s: lp-&gt;ppp_slot(%d) out of range\n",</div><div class='ctx'> 			__func__, lp-&gt;ppp_slot);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='del'>-	if( MP_FLAGS(from) == (MP_BEGIN_FRAG | MP_END_FRAG) ) {</div><div class='del'>-		if( ippp_table[lp-&gt;ppp_slot]-&gt;debug &amp; 0x40 )</div><div class='add'>+</div><div class='add'>+	tot_len = calc_tot_len(&amp;mp-&gt;frags, from, to);</div><div class='add'>+</div><div class='add'>+	if (MP_FLAGS(from) == (MP_BEGIN_FRAG | MP_END_FRAG)) {</div><div class='add'>+		if (ippp_table[lp-&gt;ppp_slot]-&gt;debug &amp; 0x40)</div><div class='ctx'> 			printk(KERN_DEBUG "isdn_mppp: reassembly: frame %d, "</div><div class='del'>-					"len %d\n", MP_SEQ(from), from-&gt;len );</div><div class='add'>+			       "len %d\n", MP_SEQ(from), from-&gt;len);</div><div class='ctx'> 		skb = from;</div><div class='ctx'> 		skb_pull(skb, MP_HEADER_LEN);</div><div class='add'>+		__skb_unlink(skb, &amp;mp-&gt;frags);</div><div class='ctx'> 		mp-&gt;frames--;	</div><div class='ctx'> 	} else {</div><div class='del'>-		struct sk_buff * frag;</div><div class='del'>-		int n;</div><div class='add'>+		struct sk_buff *walk, *tmp;</div><div class='add'>+		int found_start = 0;</div><div class='ctx'> </div><div class='del'>-		for(tot_len=n=0, frag=from; frag != to; frag=frag-&gt;next, n++)</div><div class='del'>-			tot_len += frag-&gt;len - MP_HEADER_LEN;</div><div class='del'>-</div><div class='del'>-		if( ippp_table[lp-&gt;ppp_slot]-&gt;debug &amp; 0x40 )</div><div class='add'>+		if (ippp_table[lp-&gt;ppp_slot]-&gt;debug &amp; 0x40)</div><div class='ctx'> 			printk(KERN_DEBUG"isdn_mppp: reassembling frames %d "</div><div class='del'>-				"to %d, len %d\n", MP_SEQ(from), </div><div class='del'>-				(MP_SEQ(from)+n-1) &amp; MP_LONGSEQ_MASK, tot_len );</div><div class='del'>-		if( (skb = dev_alloc_skb(tot_len)) == NULL ) {</div><div class='add'>+			       "to %d, len %d\n", MP_SEQ(from), lastseq,</div><div class='add'>+			       tot_len);</div><div class='add'>+</div><div class='add'>+		skb = dev_alloc_skb(tot_len);</div><div class='add'>+		if (!skb)</div><div class='ctx'> 			printk(KERN_ERR "isdn_mppp: cannot allocate sk buff "</div><div class='del'>-					"of size %d\n", tot_len);</div><div class='del'>-			isdn_ppp_mp_discard(mp, from, to);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='add'>+			       "of size %d\n", tot_len);</div><div class='add'>+</div><div class='add'>+		found_start = 0;</div><div class='add'>+		skb_queue_walk_safe(&amp;mp-&gt;frags, walk, tmp) {</div><div class='add'>+			if (walk == from)</div><div class='add'>+				found_start = 1;</div><div class='add'>+			if (!found_start)</div><div class='add'>+				continue;</div><div class='ctx'> </div><div class='del'>-		while( from != to ) {</div><div class='del'>-			unsigned int len = from-&gt;len - MP_HEADER_LEN;</div><div class='add'>+			if (skb) {</div><div class='add'>+				unsigned int len = walk-&gt;len - MP_HEADER_LEN;</div><div class='add'>+				skb_copy_from_linear_data_offset(walk, MP_HEADER_LEN,</div><div class='add'>+								 skb_put(skb, len),</div><div class='add'>+								 len);</div><div class='add'>+			}</div><div class='add'>+			__skb_unlink(walk, &amp;mp-&gt;frags);</div><div class='add'>+			isdn_ppp_mp_free_skb(mp, walk);</div><div class='ctx'> </div><div class='del'>-			skb_copy_from_linear_data_offset(from, MP_HEADER_LEN,</div><div class='del'>-							 skb_put(skb,len),</div><div class='del'>-							 len);</div><div class='del'>-			frag = from-&gt;next;</div><div class='del'>-			isdn_ppp_mp_free_skb(mp, from);</div><div class='del'>-			from = frag; </div><div class='add'>+			if (walk == to)</div><div class='add'>+				break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+	if (!skb)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'>    	proto = isdn_ppp_strip_proto(skb);</div><div class='ctx'> 	isdn_ppp_push_higher(net_dev, lp, skb, proto);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void isdn_ppp_mp_free_skb(ippp_bundle * mp, struct sk_buff * skb)</div><div class='add'>+static void isdn_ppp_mp_free_skb(ippp_bundle *mp, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	dev_kfree_skb(skb);</div><div class='ctx'> 	mp-&gt;frames--;</div><div class='head'>diff --git a/drivers/isdn/mISDN/dsp_cmx.c b/drivers/isdn/mISDN/dsp_cmx.c<br/>index e92b1ba4b45e..c2f51cc50760 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/isdn/mISDN/dsp_cmx.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/isdn/mISDN/dsp_cmx.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/isdn/mISDN/dsp_cmx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/isdn/mISDN/dsp_cmx.c</a></div><div class='hunk'>@@ -452,10 +452,10 @@ one_member:</div><div class='ctx'> 			if (finddsp-&gt;features.pcm_id == dsp-&gt;features.pcm_id) {</div><div class='ctx'> 				if (finddsp-&gt;pcm_slot_rx &gt;= 0 &amp;&amp;</div><div class='ctx'> 				    finddsp-&gt;pcm_slot_rx &lt; sizeof(freeslots))</div><div class='del'>-					freeslots[finddsp-&gt;pcm_slot_tx] = 0;</div><div class='add'>+					freeslots[finddsp-&gt;pcm_slot_rx] = 0;</div><div class='ctx'> 				if (finddsp-&gt;pcm_slot_tx &gt;= 0 &amp;&amp;</div><div class='ctx'> 				    finddsp-&gt;pcm_slot_tx &lt; sizeof(freeslots))</div><div class='del'>-					freeslots[finddsp-&gt;pcm_slot_rx] = 0;</div><div class='add'>+					freeslots[finddsp-&gt;pcm_slot_tx] = 0;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		i = 0;</div><div class='head'>diff --git a/drivers/isdn/mISDN/timerdev.c b/drivers/isdn/mISDN/timerdev.c<br/>index b5fabc7019d8..875fabe16e36 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/isdn/mISDN/timerdev.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/isdn/mISDN/timerdev.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/isdn/mISDN/timerdev.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/isdn/mISDN/timerdev.c</a></div><div class='hunk'>@@ -61,7 +61,7 @@ mISDN_open(struct inode *ino, struct file *filep)</div><div class='ctx'> 	init_waitqueue_head(&amp;dev-&gt;wait);</div><div class='ctx'> 	filep-&gt;private_data = dev;</div><div class='ctx'> 	__module_get(THIS_MODULE);</div><div class='del'>-	return 0;</div><div class='add'>+	return nonseekable_open(ino, filep);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -124,18 +124,6 @@ mISDN_read(struct file *filep, char *buf, size_t count, loff_t *off)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static loff_t</div><div class='del'>-mISDN_llseek(struct file *filep, loff_t offset, int orig)</div><div class='del'>-{</div><div class='del'>-	return -ESPIPE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t</div><div class='del'>-mISDN_write(struct file *filep, const char *buf, size_t count, loff_t *off)</div><div class='del'>-{</div><div class='del'>-	return -EOPNOTSUPP;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static unsigned int</div><div class='ctx'> mISDN_poll(struct file *filep, poll_table *wait)</div><div class='ctx'> {</div><div class='hunk'>@@ -157,8 +145,9 @@ mISDN_poll(struct file *filep, poll_table *wait)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-dev_expire_timer(struct mISDNtimer *timer)</div><div class='add'>+dev_expire_timer(unsigned long data)</div><div class='ctx'> {</div><div class='add'>+	struct mISDNtimer *timer = (void *)data;</div><div class='ctx'> 	u_long			flags;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;timer-&gt;dev-&gt;lock, flags);</div><div class='hunk'>@@ -191,7 +180,7 @@ misdn_add_timer(struct mISDNtimerdev *dev, int timeout)</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;dev-&gt;lock, flags);</div><div class='ctx'> 		timer-&gt;dev = dev;</div><div class='ctx'> 		timer-&gt;tl.data = (long)timer;</div><div class='del'>-		timer-&gt;tl.function = (void *) dev_expire_timer;</div><div class='add'>+		timer-&gt;tl.function = dev_expire_timer;</div><div class='ctx'> 		init_timer(&amp;timer-&gt;tl);</div><div class='ctx'> 		timer-&gt;tl.expires = jiffies + ((HZ * (u_long)timeout) / 1000);</div><div class='ctx'> 		add_timer(&amp;timer-&gt;tl);</div><div class='hunk'>@@ -211,6 +200,9 @@ misdn_del_timer(struct mISDNtimerdev *dev, int id)</div><div class='ctx'> 	list_for_each_entry(timer, &amp;dev-&gt;pending, list) {</div><div class='ctx'> 		if (timer-&gt;id == id) {</div><div class='ctx'> 			list_del_init(&amp;timer-&gt;list);</div><div class='add'>+			/* RED-PEN AK: race -- timer can be still running on</div><div class='add'>+			 * other CPU. Needs reference count I think</div><div class='add'>+			 */</div><div class='ctx'> 			del_timer(&amp;timer-&gt;tl);</div><div class='ctx'> 			ret = timer-&gt;id;</div><div class='ctx'> 			kfree(timer);</div><div class='hunk'>@@ -268,9 +260,7 @@ mISDN_ioctl(struct inode *inode, struct file *filep, unsigned int cmd,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct file_operations mISDN_fops = {</div><div class='del'>-	.llseek		= mISDN_llseek,</div><div class='ctx'> 	.read		= mISDN_read,</div><div class='del'>-	.write		= mISDN_write,</div><div class='ctx'> 	.poll		= mISDN_poll,</div><div class='ctx'> 	.ioctl		= mISDN_ioctl,</div><div class='ctx'> 	.open		= mISDN_open,</div><div class='head'>diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig<br/>index 9556262dda5a..e3e40427e00e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/leds/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/leds/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/leds/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/leds/Kconfig</a></div><div class='hunk'>@@ -24,13 +24,6 @@ config LEDS_ATMEL_PWM</div><div class='ctx'> 	  This option enables support for LEDs driven using outputs</div><div class='ctx'> 	  of the dedicated PWM controller found on newer Atmel SOCs.</div><div class='ctx'> </div><div class='del'>-config LEDS_CORGI</div><div class='del'>-	tristate "LED Support for the Sharp SL-C7x0 series"</div><div class='del'>-	depends on LEDS_CLASS &amp;&amp; PXA_SHARP_C7xx</div><div class='del'>-	help</div><div class='del'>-	  This option enables support for the LEDs on Sharp Zaurus</div><div class='del'>-	  SL-C7x0 series (C700, C750, C760, C860).</div><div class='del'>-</div><div class='ctx'> config LEDS_LOCOMO</div><div class='ctx'> 	tristate "LED Support for Locomo device"</div><div class='ctx'> 	depends on LEDS_CLASS &amp;&amp; SHARP_LOCOMO</div><div class='hunk'>@@ -38,13 +31,6 @@ config LEDS_LOCOMO</div><div class='ctx'> 	  This option enables support for the LEDs on Sharp Locomo.</div><div class='ctx'> 	  Zaurus models SL-5500 and SL-5600.</div><div class='ctx'> </div><div class='del'>-config LEDS_SPITZ</div><div class='del'>-	tristate "LED Support for the Sharp SL-Cxx00 series"</div><div class='del'>-	depends on LEDS_CLASS &amp;&amp; PXA_SHARP_Cxx00</div><div class='del'>-	help</div><div class='del'>-	  This option enables support for the LEDs on Sharp Zaurus</div><div class='del'>-	  SL-Cxx00 series (C1000, C3000, C3100).</div><div class='del'>-</div><div class='ctx'> config LEDS_S3C24XX</div><div class='ctx'> 	tristate "LED Support for Samsung S3C24XX GPIO LEDs"</div><div class='ctx'> 	depends on LEDS_CLASS &amp;&amp; ARCH_S3C2410</div><div class='hunk'>@@ -96,6 +82,14 @@ config LEDS_COBALT_RAQ</div><div class='ctx'> 	help</div><div class='ctx'> 	  This option enables support for the Cobalt Raq series LEDs.</div><div class='ctx'> </div><div class='add'>+config LEDS_SUNFIRE</div><div class='add'>+	tristate "LED support for SunFire servers."</div><div class='add'>+	depends on LEDS_CLASS &amp;&amp; SPARC64</div><div class='add'>+	select LEDS_TRIGGERS</div><div class='add'>+	help</div><div class='add'>+	  This option enables support for the Left, Middle, and Right</div><div class='add'>+	  LEDs on the I/O and CPU boards of SunFire UltraSPARC servers.</div><div class='add'>+</div><div class='ctx'> config LEDS_HP6XX</div><div class='ctx'> 	tristate "LED Support for the HP Jornada 6xx"</div><div class='ctx'> 	depends on LEDS_CLASS &amp;&amp; SH_HP6XX</div><div class='head'>diff --git a/drivers/leds/Makefile b/drivers/leds/Makefile<br/>index ff7982b44565..eb186c351a1c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/leds/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/leds/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/leds/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/leds/Makefile</a></div><div class='hunk'>@@ -6,9 +6,7 @@ obj-$(CONFIG_LEDS_TRIGGERS)		+= led-triggers.o</div><div class='ctx'> </div><div class='ctx'> # LED Platform Drivers</div><div class='ctx'> obj-$(CONFIG_LEDS_ATMEL_PWM)		+= leds-atmel-pwm.o</div><div class='del'>-obj-$(CONFIG_LEDS_CORGI)		+= leds-corgi.o</div><div class='ctx'> obj-$(CONFIG_LEDS_LOCOMO)		+= leds-locomo.o</div><div class='del'>-obj-$(CONFIG_LEDS_SPITZ)		+= leds-spitz.o</div><div class='ctx'> obj-$(CONFIG_LEDS_S3C24XX)		+= leds-s3c24xx.o</div><div class='ctx'> obj-$(CONFIG_LEDS_AMS_DELTA)		+= leds-ams-delta.o</div><div class='ctx'> obj-$(CONFIG_LEDS_NET48XX)		+= leds-net48xx.o</div><div class='hunk'>@@ -16,6 +14,7 @@ obj-$(CONFIG_LEDS_WRAP)			+= leds-wrap.o</div><div class='ctx'> obj-$(CONFIG_LEDS_H1940)		+= leds-h1940.o</div><div class='ctx'> obj-$(CONFIG_LEDS_COBALT_QUBE)		+= leds-cobalt-qube.o</div><div class='ctx'> obj-$(CONFIG_LEDS_COBALT_RAQ)		+= leds-cobalt-raq.o</div><div class='add'>+obj-$(CONFIG_LEDS_SUNFIRE)		+= leds-sunfire.o</div><div class='ctx'> obj-$(CONFIG_LEDS_PCA9532)		+= leds-pca9532.o</div><div class='ctx'> obj-$(CONFIG_LEDS_GPIO)			+= leds-gpio.o</div><div class='ctx'> obj-$(CONFIG_LEDS_CM_X270)              += leds-cm-x270.o</div><div class='head'>diff --git a/drivers/leds/led-class.c b/drivers/leds/led-class.c<br/>index 559a40861c39..ee74ee7b2acc 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/leds/led-class.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/leds/led-class.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/leds/led-class.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/leds/led-class.c</a></div><div class='hunk'>@@ -103,8 +103,8 @@ int led_classdev_register(struct device *parent, struct led_classdev *led_cdev)</div><div class='ctx'> {</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	led_cdev-&gt;dev = device_create_drvdata(leds_class, parent, 0, led_cdev,</div><div class='del'>-					      "%s", led_cdev-&gt;name);</div><div class='add'>+	led_cdev-&gt;dev = device_create(leds_class, parent, 0, led_cdev,</div><div class='add'>+				      "%s", led_cdev-&gt;name);</div><div class='ctx'> 	if (IS_ERR(led_cdev-&gt;dev))</div><div class='ctx'> 		return PTR_ERR(led_cdev-&gt;dev);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/leds/leds-corgi.c b/drivers/leds/leds-corgi.c<br/>deleted file mode 100644<br/>index bc2dcd89f635..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/leds/leds-corgi.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/leds/leds-corgi.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,124 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * LED Triggers Core</div><div class='del'>- *</div><div class='del'>- * Copyright 2005-2006 Openedhand Ltd.</div><div class='del'>- *</div><div class='del'>- * Author: Richard Purdie &lt;rpurdie@openedhand.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/leds.h&gt;</div><div class='del'>-#include &lt;mach/corgi.h&gt;</div><div class='del'>-#include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;mach/pxa-regs.h&gt;</div><div class='del'>-#include &lt;asm/hardware/scoop.h&gt;</div><div class='del'>-</div><div class='del'>-static void corgiled_amber_set(struct led_classdev *led_cdev,</div><div class='del'>-			       enum led_brightness value)</div><div class='del'>-{</div><div class='del'>-	if (value)</div><div class='del'>-		GPSR0 = GPIO_bit(CORGI_GPIO_LED_ORANGE);</div><div class='del'>-	else</div><div class='del'>-		GPCR0 = GPIO_bit(CORGI_GPIO_LED_ORANGE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void corgiled_green_set(struct led_classdev *led_cdev,</div><div class='del'>-			       enum led_brightness value)</div><div class='del'>-{</div><div class='del'>-	if (value)</div><div class='del'>-		set_scoop_gpio(&amp;corgiscoop_device.dev, CORGI_SCP_LED_GREEN);</div><div class='del'>-	else</div><div class='del'>-		reset_scoop_gpio(&amp;corgiscoop_device.dev, CORGI_SCP_LED_GREEN);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct led_classdev corgi_amber_led = {</div><div class='del'>-	.name			= "corgi:amber:charge",</div><div class='del'>-	.default_trigger	= "sharpsl-charge",</div><div class='del'>-	.brightness_set		= corgiled_amber_set,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct led_classdev corgi_green_led = {</div><div class='del'>-	.name			= "corgi:green:mail",</div><div class='del'>-	.default_trigger	= "nand-disk",</div><div class='del'>-	.brightness_set		= corgiled_green_set,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-static int corgiled_suspend(struct platform_device *dev, pm_message_t state)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_LEDS_TRIGGERS</div><div class='del'>-	if (corgi_amber_led.trigger &amp;&amp;</div><div class='del'>-	    strcmp(corgi_amber_led.trigger-&gt;name, "sharpsl-charge"))</div><div class='del'>-#endif</div><div class='del'>-		led_classdev_suspend(&amp;corgi_amber_led);</div><div class='del'>-	led_classdev_suspend(&amp;corgi_green_led);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int corgiled_resume(struct platform_device *dev)</div><div class='del'>-{</div><div class='del'>-	led_classdev_resume(&amp;corgi_amber_led);</div><div class='del'>-	led_classdev_resume(&amp;corgi_green_led);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static int corgiled_probe(struct platform_device *pdev)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = led_classdev_register(&amp;pdev-&gt;dev, &amp;corgi_amber_led);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	ret = led_classdev_register(&amp;pdev-&gt;dev, &amp;corgi_green_led);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		led_classdev_unregister(&amp;corgi_amber_led);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int corgiled_remove(struct platform_device *pdev)</div><div class='del'>-{</div><div class='del'>-	led_classdev_unregister(&amp;corgi_amber_led);</div><div class='del'>-	led_classdev_unregister(&amp;corgi_green_led);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct platform_driver corgiled_driver = {</div><div class='del'>-	.probe		= corgiled_probe,</div><div class='del'>-	.remove		= corgiled_remove,</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-	.suspend	= corgiled_suspend,</div><div class='del'>-	.resume		= corgiled_resume,</div><div class='del'>-#endif</div><div class='del'>-	.driver		= {</div><div class='del'>-		.name		= "corgi-led",</div><div class='del'>-		.owner		= THIS_MODULE,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init corgiled_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;corgiled_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit corgiled_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;corgiled_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(corgiled_init);</div><div class='del'>-module_exit(corgiled_exit);</div><div class='del'>-</div><div class='del'>-MODULE_AUTHOR("Richard Purdie &lt;rpurdie@openedhand.com&gt;");</div><div class='del'>-MODULE_DESCRIPTION("Corgi LED driver");</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_ALIAS("platform:corgi-led");</div><div class='head'>diff --git a/drivers/leds/leds-spitz.c b/drivers/leds/leds-spitz.c<br/>deleted file mode 100644<br/>index 178831c64bfb..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/leds/leds-spitz.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/leds/leds-spitz.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,131 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * LED Triggers Core</div><div class='del'>- *</div><div class='del'>- * Copyright 2005-2006 Openedhand Ltd.</div><div class='del'>- *</div><div class='del'>- * Author: Richard Purdie &lt;rpurdie@openedhand.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/leds.h&gt;</div><div class='del'>-#include &lt;asm/hardware/scoop.h&gt;</div><div class='del'>-#include &lt;asm/mach-types.h&gt;</div><div class='del'>-#include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;mach/pxa-regs.h&gt;</div><div class='del'>-#include &lt;mach/spitz.h&gt;</div><div class='del'>-</div><div class='del'>-static void spitzled_amber_set(struct led_classdev *led_cdev,</div><div class='del'>-			       enum led_brightness value)</div><div class='del'>-{</div><div class='del'>-	if (value)</div><div class='del'>-		set_scoop_gpio(&amp;spitzscoop_device.dev, SPITZ_SCP_LED_ORANGE);</div><div class='del'>-	else</div><div class='del'>-		reset_scoop_gpio(&amp;spitzscoop_device.dev, SPITZ_SCP_LED_ORANGE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void spitzled_green_set(struct led_classdev *led_cdev,</div><div class='del'>-			       enum led_brightness value)</div><div class='del'>-{</div><div class='del'>-	if (value)</div><div class='del'>-		set_scoop_gpio(&amp;spitzscoop_device.dev, SPITZ_SCP_LED_GREEN);</div><div class='del'>-	else</div><div class='del'>-		reset_scoop_gpio(&amp;spitzscoop_device.dev, SPITZ_SCP_LED_GREEN);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct led_classdev spitz_amber_led = {</div><div class='del'>-	.name			= "spitz:amber:charge",</div><div class='del'>-	.default_trigger	= "sharpsl-charge",</div><div class='del'>-	.brightness_set		= spitzled_amber_set,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct led_classdev spitz_green_led = {</div><div class='del'>-	.name			= "spitz:green:hddactivity",</div><div class='del'>-	.default_trigger	= "ide-disk",</div><div class='del'>-	.brightness_set		= spitzled_green_set,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-static int spitzled_suspend(struct platform_device *dev, pm_message_t state)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_LEDS_TRIGGERS</div><div class='del'>-	if (spitz_amber_led.trigger &amp;&amp;</div><div class='del'>-	    strcmp(spitz_amber_led.trigger-&gt;name, "sharpsl-charge"))</div><div class='del'>-#endif</div><div class='del'>-		led_classdev_suspend(&amp;spitz_amber_led);</div><div class='del'>-	led_classdev_suspend(&amp;spitz_green_led);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int spitzled_resume(struct platform_device *dev)</div><div class='del'>-{</div><div class='del'>-	led_classdev_resume(&amp;spitz_amber_led);</div><div class='del'>-	led_classdev_resume(&amp;spitz_green_led);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static int spitzled_probe(struct platform_device *pdev)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (machine_is_akita()) {</div><div class='del'>-		spitz_green_led.name = "spitz:green:mail";</div><div class='del'>-		spitz_green_led.default_trigger = "nand-disk";</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = led_classdev_register(&amp;pdev-&gt;dev, &amp;spitz_amber_led);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	ret = led_classdev_register(&amp;pdev-&gt;dev, &amp;spitz_green_led);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		led_classdev_unregister(&amp;spitz_amber_led);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int spitzled_remove(struct platform_device *pdev)</div><div class='del'>-{</div><div class='del'>-	led_classdev_unregister(&amp;spitz_amber_led);</div><div class='del'>-	led_classdev_unregister(&amp;spitz_green_led);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct platform_driver spitzled_driver = {</div><div class='del'>-	.probe		= spitzled_probe,</div><div class='del'>-	.remove		= spitzled_remove,</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-	.suspend	= spitzled_suspend,</div><div class='del'>-	.resume		= spitzled_resume,</div><div class='del'>-#endif</div><div class='del'>-	.driver		= {</div><div class='del'>-		.name		= "spitz-led",</div><div class='del'>-		.owner		= THIS_MODULE,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init spitzled_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;spitzled_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit spitzled_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;spitzled_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(spitzled_init);</div><div class='del'>-module_exit(spitzled_exit);</div><div class='del'>-</div><div class='del'>-MODULE_AUTHOR("Richard Purdie &lt;rpurdie@openedhand.com&gt;");</div><div class='del'>-MODULE_DESCRIPTION("Spitz LED driver");</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_ALIAS("platform:spitz-led");</div><div class='head'>diff --git a/drivers/leds/leds-sunfire.c b/drivers/leds/leds-sunfire.c<br/>new file mode 100644<br/>index 000000000000..6b008f0c3f62<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/leds/leds-sunfire.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/leds/leds-sunfire.c</a></div><div class='hunk'>@@ -0,0 +1,273 @@</div><div class='add'>+/* leds-sunfire.c: SUNW,Ultra-Enterprise LED driver.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2008 David S. Miller &lt;davem@davemloft.net&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/leds.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/fhc.h&gt;</div><div class='add'>+#include &lt;asm/upa.h&gt;</div><div class='add'>+</div><div class='add'>+#define DRIVER_NAME	"leds-sunfire"</div><div class='add'>+#define PFX		DRIVER_NAME ": "</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("David S. Miller (davem@davemloft.net)");</div><div class='add'>+MODULE_DESCRIPTION("Sun Fire LED driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='add'>+struct sunfire_led {</div><div class='add'>+	struct led_classdev	led_cdev;</div><div class='add'>+	void __iomem		*reg;</div><div class='add'>+};</div><div class='add'>+#define	to_sunfire_led(d) container_of(d, struct sunfire_led, led_cdev)</div><div class='add'>+</div><div class='add'>+static void __clockboard_set(struct led_classdev *led_cdev,</div><div class='add'>+			     enum led_brightness led_val, u8 bit)</div><div class='add'>+{</div><div class='add'>+	struct sunfire_led *p = to_sunfire_led(led_cdev);</div><div class='add'>+	u8 reg = upa_readb(p-&gt;reg);</div><div class='add'>+</div><div class='add'>+	switch (bit) {</div><div class='add'>+	case CLOCK_CTRL_LLED:</div><div class='add'>+		if (led_val)</div><div class='add'>+			reg &amp;= ~bit;</div><div class='add'>+		else</div><div class='add'>+			reg |= bit;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		if (led_val)</div><div class='add'>+			reg |= bit;</div><div class='add'>+		else</div><div class='add'>+			reg &amp;= ~bit;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	upa_writeb(reg, p-&gt;reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void clockboard_left_set(struct led_classdev *led_cdev,</div><div class='add'>+				enum led_brightness led_val)</div><div class='add'>+{</div><div class='add'>+	__clockboard_set(led_cdev, led_val, CLOCK_CTRL_LLED);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void clockboard_middle_set(struct led_classdev *led_cdev,</div><div class='add'>+				  enum led_brightness led_val)</div><div class='add'>+{</div><div class='add'>+	__clockboard_set(led_cdev, led_val, CLOCK_CTRL_MLED);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void clockboard_right_set(struct led_classdev *led_cdev,</div><div class='add'>+				 enum led_brightness led_val)</div><div class='add'>+{</div><div class='add'>+	__clockboard_set(led_cdev, led_val, CLOCK_CTRL_RLED);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __fhc_set(struct led_classdev *led_cdev,</div><div class='add'>+			     enum led_brightness led_val, u32 bit)</div><div class='add'>+{</div><div class='add'>+	struct sunfire_led *p = to_sunfire_led(led_cdev);</div><div class='add'>+	u32 reg = upa_readl(p-&gt;reg);</div><div class='add'>+</div><div class='add'>+	switch (bit) {</div><div class='add'>+	case FHC_CONTROL_LLED:</div><div class='add'>+		if (led_val)</div><div class='add'>+			reg &amp;= ~bit;</div><div class='add'>+		else</div><div class='add'>+			reg |= bit;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		if (led_val)</div><div class='add'>+			reg |= bit;</div><div class='add'>+		else</div><div class='add'>+			reg &amp;= ~bit;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	upa_writel(reg, p-&gt;reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void fhc_left_set(struct led_classdev *led_cdev,</div><div class='add'>+			 enum led_brightness led_val)</div><div class='add'>+{</div><div class='add'>+	__fhc_set(led_cdev, led_val, FHC_CONTROL_LLED);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void fhc_middle_set(struct led_classdev *led_cdev,</div><div class='add'>+			   enum led_brightness led_val)</div><div class='add'>+{</div><div class='add'>+	__fhc_set(led_cdev, led_val, FHC_CONTROL_MLED);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void fhc_right_set(struct led_classdev *led_cdev,</div><div class='add'>+			  enum led_brightness led_val)</div><div class='add'>+{</div><div class='add'>+	__fhc_set(led_cdev, led_val, FHC_CONTROL_RLED);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+typedef void (*set_handler)(struct led_classdev *, enum led_brightness);</div><div class='add'>+struct led_type {</div><div class='add'>+	const char	*name;</div><div class='add'>+	set_handler	handler;</div><div class='add'>+	const char	*default_trigger;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define NUM_LEDS_PER_BOARD	3</div><div class='add'>+struct sunfire_drvdata {</div><div class='add'>+	struct sunfire_led	leds[NUM_LEDS_PER_BOARD];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __devinit sunfire_led_generic_probe(struct platform_device *pdev,</div><div class='add'>+					       struct led_type *types)</div><div class='add'>+{</div><div class='add'>+	struct sunfire_drvdata *p;</div><div class='add'>+	int i, err = -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (pdev-&gt;num_resources != 1) {</div><div class='add'>+		printk(KERN_ERR PFX "Wrong number of resources %d, should be 1\n",</div><div class='add'>+		       pdev-&gt;num_resources);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	p = kzalloc(sizeof(*p), GFP_KERNEL);</div><div class='add'>+	if (!p) {</div><div class='add'>+		printk(KERN_ERR PFX "Could not allocate struct sunfire_drvdata\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; NUM_LEDS_PER_BOARD; i++) {</div><div class='add'>+		struct led_classdev *lp = &amp;p-&gt;leds[i].led_cdev;</div><div class='add'>+</div><div class='add'>+		p-&gt;leds[i].reg = (void __iomem *) pdev-&gt;resource[0].start;</div><div class='add'>+		lp-&gt;name = types[i].name;</div><div class='add'>+		lp-&gt;brightness = LED_FULL;</div><div class='add'>+		lp-&gt;brightness_set = types[i].handler;</div><div class='add'>+		lp-&gt;default_trigger = types[i].default_trigger;</div><div class='add'>+</div><div class='add'>+		err = led_classdev_register(&amp;pdev-&gt;dev, lp);</div><div class='add'>+		if (err) {</div><div class='add'>+			printk(KERN_ERR PFX "Could not register %s LED\n",</div><div class='add'>+			       lp-&gt;name);</div><div class='add'>+			goto out_unregister_led_cdevs;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(&amp;pdev-&gt;dev, p);</div><div class='add'>+</div><div class='add'>+	err = 0;</div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='add'>+</div><div class='add'>+out_unregister_led_cdevs:</div><div class='add'>+	for (i--; i &gt;= 0; i--)</div><div class='add'>+		led_classdev_unregister(&amp;p-&gt;leds[i].led_cdev);</div><div class='add'>+	goto out;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devexit sunfire_led_generic_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct sunfire_drvdata *p = dev_get_drvdata(&amp;pdev-&gt;dev);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; NUM_LEDS_PER_BOARD; i++)</div><div class='add'>+		led_classdev_unregister(&amp;p-&gt;leds[i].led_cdev);</div><div class='add'>+</div><div class='add'>+	kfree(p);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct led_type clockboard_led_types[NUM_LEDS_PER_BOARD] = {</div><div class='add'>+	{</div><div class='add'>+		.name		= "clockboard-left",</div><div class='add'>+		.handler	= clockboard_left_set,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name		= "clockboard-middle",</div><div class='add'>+		.handler	= clockboard_middle_set,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name		= "clockboard-right",</div><div class='add'>+		.handler	= clockboard_right_set,</div><div class='add'>+		.default_trigger= "heartbeat",</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __devinit sunfire_clockboard_led_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	return sunfire_led_generic_probe(pdev, clockboard_led_types);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct led_type fhc_led_types[NUM_LEDS_PER_BOARD] = {</div><div class='add'>+	{</div><div class='add'>+		.name		= "fhc-left",</div><div class='add'>+		.handler	= fhc_left_set,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name		= "fhc-middle",</div><div class='add'>+		.handler	= fhc_middle_set,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name		= "fhc-right",</div><div class='add'>+		.handler	= fhc_right_set,</div><div class='add'>+		.default_trigger= "heartbeat",</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __devinit sunfire_fhc_led_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	return sunfire_led_generic_probe(pdev, fhc_led_types);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+MODULE_ALIAS("platform:sunfire-clockboard-leds");</div><div class='add'>+MODULE_ALIAS("platform:sunfire-fhc-leds");</div><div class='add'>+</div><div class='add'>+static struct platform_driver sunfire_clockboard_led_driver = {</div><div class='add'>+	.probe		= sunfire_clockboard_led_probe,</div><div class='add'>+	.remove		= __devexit_p(sunfire_led_generic_remove),</div><div class='add'>+	.driver		= {</div><div class='add'>+		.name	= "sunfire-clockboard-leds",</div><div class='add'>+		.owner	= THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_driver sunfire_fhc_led_driver = {</div><div class='add'>+	.probe		= sunfire_fhc_led_probe,</div><div class='add'>+	.remove		= __devexit_p(sunfire_led_generic_remove),</div><div class='add'>+	.driver		= {</div><div class='add'>+		.name	= "sunfire-fhc-leds",</div><div class='add'>+		.owner	= THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init sunfire_leds_init(void)</div><div class='add'>+{</div><div class='add'>+	int err = platform_driver_register(&amp;sunfire_clockboard_led_driver);</div><div class='add'>+</div><div class='add'>+	if (err) {</div><div class='add'>+		printk(KERN_ERR PFX "Could not register clock board LED driver\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = platform_driver_register(&amp;sunfire_fhc_led_driver);</div><div class='add'>+	if (err) {</div><div class='add'>+		printk(KERN_ERR PFX "Could not register FHC LED driver\n");</div><div class='add'>+		platform_driver_unregister(&amp;sunfire_clockboard_led_driver);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit sunfire_leds_exit(void)</div><div class='add'>+{</div><div class='add'>+	platform_driver_unregister(&amp;sunfire_clockboard_led_driver);</div><div class='add'>+	platform_driver_unregister(&amp;sunfire_fhc_led_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(sunfire_leds_init);</div><div class='add'>+module_exit(sunfire_leds_exit);</div><div class='head'>diff --git a/drivers/macintosh/adb.c b/drivers/macintosh/adb.c<br/>index cae52485208a..23741cec45e3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/macintosh/adb.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/macintosh/adb.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/macintosh/adb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/macintosh/adb.c</a></div><div class='hunk'>@@ -862,8 +862,7 @@ adbdev_init(void)</div><div class='ctx'> 	adb_dev_class = class_create(THIS_MODULE, "adb");</div><div class='ctx'> 	if (IS_ERR(adb_dev_class))</div><div class='ctx'> 		return;</div><div class='del'>-	device_create_drvdata(adb_dev_class, NULL, MKDEV(ADB_MAJOR, 0), NULL,</div><div class='del'>-			      "adb");</div><div class='add'>+	device_create(adb_dev_class, NULL, MKDEV(ADB_MAJOR, 0), NULL, "adb");</div><div class='ctx'> </div><div class='ctx'> 	platform_device_register(&amp;adb_pfdev);</div><div class='ctx'> 	platform_driver_probe(&amp;adb_pfdrv, adb_dummy_probe);</div><div class='head'>diff --git a/drivers/md/Kconfig b/drivers/md/Kconfig<br/>index 07d92c11b5d8..2281b5098e95 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/md/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/md/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/md/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/md/Kconfig</a></div><div class='hunk'>@@ -30,6 +30,20 @@ config BLK_DEV_MD</div><div class='ctx'> </div><div class='ctx'> 	  If unsure, say N.</div><div class='ctx'> </div><div class='add'>+config MD_AUTODETECT</div><div class='add'>+	bool "Autodetect RAID arrays during kernel boot"</div><div class='add'>+	depends on BLK_DEV_MD=y</div><div class='add'>+	default y</div><div class='add'>+	---help---</div><div class='add'>+	  If you say Y here, then the kernel will try to autodetect raid</div><div class='add'>+	  arrays as part of its boot process. </div><div class='add'>+</div><div class='add'>+	  If you don't use raid and say Y, this autodetection can cause </div><div class='add'>+	  a several-second delay in the boot time due to various</div><div class='add'>+	  synchronisation steps that are part of this step.</div><div class='add'>+</div><div class='add'>+	  If unsure, say Y.</div><div class='add'>+</div><div class='ctx'> config MD_LINEAR</div><div class='ctx'> 	tristate "Linear (append) mode"</div><div class='ctx'> 	depends on BLK_DEV_MD</div><div class='head'>diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c<br/>index 13956437bc81..682ef9e6acd3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/md/dm-crypt.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/md/dm-crypt.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/md/dm-crypt.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/md/dm-crypt.c</a></div><div class='hunk'>@@ -333,7 +333,6 @@ static void crypt_convert_init(struct crypt_config *cc,</div><div class='ctx'> 	ctx-&gt;idx_out = bio_out ? bio_out-&gt;bi_idx : 0;</div><div class='ctx'> 	ctx-&gt;sector = sector + cc-&gt;iv_offset;</div><div class='ctx'> 	init_completion(&amp;ctx-&gt;restart);</div><div class='del'>-	atomic_set(&amp;ctx-&gt;pending, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int crypt_convert_block(struct crypt_config *cc,</div><div class='hunk'>@@ -408,6 +407,8 @@ static int crypt_convert(struct crypt_config *cc,</div><div class='ctx'> {</div><div class='ctx'> 	int r;</div><div class='ctx'> </div><div class='add'>+	atomic_set(&amp;ctx-&gt;pending, 1);</div><div class='add'>+</div><div class='ctx'> 	while(ctx-&gt;idx_in &lt; ctx-&gt;bio_in-&gt;bi_vcnt &amp;&amp;</div><div class='ctx'> 	      ctx-&gt;idx_out &lt; ctx-&gt;bio_out-&gt;bi_vcnt) {</div><div class='ctx'> </div><div class='hunk'>@@ -456,9 +457,11 @@ static void dm_crypt_bio_destructor(struct bio *bio)</div><div class='ctx'> /*</div><div class='ctx'>  * Generate a new unfragmented bio with the given size</div><div class='ctx'>  * This should never violate the device limitations</div><div class='del'>- * May return a smaller bio when running out of pages</div><div class='add'>+ * May return a smaller bio when running out of pages, indicated by</div><div class='add'>+ * *out_of_pages set to 1.</div><div class='ctx'>  */</div><div class='del'>-static struct bio *crypt_alloc_buffer(struct dm_crypt_io *io, unsigned size)</div><div class='add'>+static struct bio *crypt_alloc_buffer(struct dm_crypt_io *io, unsigned size,</div><div class='add'>+				      unsigned *out_of_pages)</div><div class='ctx'> {</div><div class='ctx'> 	struct crypt_config *cc = io-&gt;target-&gt;private;</div><div class='ctx'> 	struct bio *clone;</div><div class='hunk'>@@ -472,11 +475,14 @@ static struct bio *crypt_alloc_buffer(struct dm_crypt_io *io, unsigned size)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	clone_init(io, clone);</div><div class='add'>+	*out_of_pages = 0;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; nr_iovecs; i++) {</div><div class='ctx'> 		page = mempool_alloc(cc-&gt;page_pool, gfp_mask);</div><div class='del'>-		if (!page)</div><div class='add'>+		if (!page) {</div><div class='add'>+			*out_of_pages = 1;</div><div class='ctx'> 			break;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * if additional pages cannot be allocated without waiting,</div><div class='hunk'>@@ -517,6 +523,27 @@ static void crypt_free_buffer_pages(struct crypt_config *cc, struct bio *clone)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct dm_crypt_io *crypt_io_alloc(struct dm_target *ti,</div><div class='add'>+					  struct bio *bio, sector_t sector)</div><div class='add'>+{</div><div class='add'>+	struct crypt_config *cc = ti-&gt;private;</div><div class='add'>+	struct dm_crypt_io *io;</div><div class='add'>+</div><div class='add'>+	io = mempool_alloc(cc-&gt;io_pool, GFP_NOIO);</div><div class='add'>+	io-&gt;target = ti;</div><div class='add'>+	io-&gt;base_bio = bio;</div><div class='add'>+	io-&gt;sector = sector;</div><div class='add'>+	io-&gt;error = 0;</div><div class='add'>+	atomic_set(&amp;io-&gt;pending, 0);</div><div class='add'>+</div><div class='add'>+	return io;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void crypt_inc_pending(struct dm_crypt_io *io)</div><div class='add'>+{</div><div class='add'>+	atomic_inc(&amp;io-&gt;pending);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * One of the bios was finished. Check for completion of</div><div class='ctx'>  * the whole request and correctly clean up the buffer.</div><div class='hunk'>@@ -591,7 +618,7 @@ static void kcryptd_io_read(struct dm_crypt_io *io)</div><div class='ctx'> 	struct bio *base_bio = io-&gt;base_bio;</div><div class='ctx'> 	struct bio *clone;</div><div class='ctx'> </div><div class='del'>-	atomic_inc(&amp;io-&gt;pending);</div><div class='add'>+	crypt_inc_pending(io);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The block layer might modify the bvec array, so always</div><div class='hunk'>@@ -653,6 +680,7 @@ static void kcryptd_crypt_write_io_submit(struct dm_crypt_io *io,</div><div class='ctx'> 		crypt_free_buffer_pages(cc, clone);</div><div class='ctx'> 		bio_put(clone);</div><div class='ctx'> 		io-&gt;error = -EIO;</div><div class='add'>+		crypt_dec_pending(io);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -664,28 +692,34 @@ static void kcryptd_crypt_write_io_submit(struct dm_crypt_io *io,</div><div class='ctx'> </div><div class='ctx'> 	if (async)</div><div class='ctx'> 		kcryptd_queue_io(io);</div><div class='del'>-	else {</div><div class='del'>-		atomic_inc(&amp;io-&gt;pending);</div><div class='add'>+	else</div><div class='ctx'> 		generic_make_request(clone);</div><div class='del'>-	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void kcryptd_crypt_write_convert_loop(struct dm_crypt_io *io)</div><div class='add'>+static void kcryptd_crypt_write_convert(struct dm_crypt_io *io)</div><div class='ctx'> {</div><div class='ctx'> 	struct crypt_config *cc = io-&gt;target-&gt;private;</div><div class='ctx'> 	struct bio *clone;</div><div class='add'>+	int crypt_finished;</div><div class='add'>+	unsigned out_of_pages = 0;</div><div class='ctx'> 	unsigned remaining = io-&gt;base_bio-&gt;bi_size;</div><div class='ctx'> 	int r;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='add'>+	 * Prevent io from disappearing until this function completes.</div><div class='add'>+	 */</div><div class='add'>+	crypt_inc_pending(io);</div><div class='add'>+	crypt_convert_init(cc, &amp;io-&gt;ctx, NULL, io-&gt;base_bio, io-&gt;sector);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='ctx'> 	 * The allocated buffers can be smaller than the whole bio,</div><div class='ctx'> 	 * so repeat the whole process until all the data can be handled.</div><div class='ctx'> 	 */</div><div class='ctx'> 	while (remaining) {</div><div class='del'>-		clone = crypt_alloc_buffer(io, remaining);</div><div class='add'>+		clone = crypt_alloc_buffer(io, remaining, &amp;out_of_pages);</div><div class='ctx'> 		if (unlikely(!clone)) {</div><div class='ctx'> 			io-&gt;error = -ENOMEM;</div><div class='del'>-			return;</div><div class='add'>+			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		io-&gt;ctx.bio_out = clone;</div><div class='hunk'>@@ -693,37 +727,32 @@ static void kcryptd_crypt_write_convert_loop(struct dm_crypt_io *io)</div><div class='ctx'> </div><div class='ctx'> 		remaining -= clone-&gt;bi_size;</div><div class='ctx'> </div><div class='add'>+		crypt_inc_pending(io);</div><div class='ctx'> 		r = crypt_convert(cc, &amp;io-&gt;ctx);</div><div class='add'>+		crypt_finished = atomic_dec_and_test(&amp;io-&gt;ctx.pending);</div><div class='ctx'> </div><div class='del'>-		if (atomic_dec_and_test(&amp;io-&gt;ctx.pending)) {</div><div class='del'>-			/* processed, no running async crypto  */</div><div class='add'>+		/* Encryption was already finished, submit io now */</div><div class='add'>+		if (crypt_finished) {</div><div class='ctx'> 			kcryptd_crypt_write_io_submit(io, r, 0);</div><div class='del'>-			if (unlikely(r &lt; 0))</div><div class='del'>-				return;</div><div class='del'>-		} else</div><div class='del'>-			atomic_inc(&amp;io-&gt;pending);</div><div class='ctx'> </div><div class='del'>-		/* out of memory -&gt; run queues */</div><div class='del'>-		if (unlikely(remaining)) {</div><div class='del'>-			/* wait for async crypto then reinitialize pending */</div><div class='del'>-			wait_event(cc-&gt;writeq, !atomic_read(&amp;io-&gt;ctx.pending));</div><div class='del'>-			atomic_set(&amp;io-&gt;ctx.pending, 1);</div><div class='del'>-			congestion_wait(WRITE, HZ/100);</div><div class='add'>+			/*</div><div class='add'>+			 * If there was an error, do not try next fragments.</div><div class='add'>+			 * For async, error is processed in async handler.</div><div class='add'>+			 */</div><div class='add'>+			if (unlikely(r &lt; 0))</div><div class='add'>+				break;</div><div class='ctx'> 		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-static void kcryptd_crypt_write_convert(struct dm_crypt_io *io)</div><div class='del'>-{</div><div class='del'>-	struct crypt_config *cc = io-&gt;target-&gt;private;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Prevent io from disappearing until this function completes.</div><div class='del'>-	 */</div><div class='del'>-	atomic_inc(&amp;io-&gt;pending);</div><div class='add'>+		/*</div><div class='add'>+		 * Out of memory -&gt; run queues</div><div class='add'>+		 * But don't wait if split was due to the io size restriction</div><div class='add'>+		 */</div><div class='add'>+		if (unlikely(out_of_pages))</div><div class='add'>+			congestion_wait(WRITE, HZ/100);</div><div class='ctx'> </div><div class='del'>-	crypt_convert_init(cc, &amp;io-&gt;ctx, NULL, io-&gt;base_bio, io-&gt;sector);</div><div class='del'>-	kcryptd_crypt_write_convert_loop(io);</div><div class='add'>+		if (unlikely(remaining))</div><div class='add'>+			wait_event(cc-&gt;writeq, !atomic_read(&amp;io-&gt;ctx.pending));</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	crypt_dec_pending(io);</div><div class='ctx'> }</div><div class='hunk'>@@ -741,7 +770,7 @@ static void kcryptd_crypt_read_convert(struct dm_crypt_io *io)</div><div class='ctx'> 	struct crypt_config *cc = io-&gt;target-&gt;private;</div><div class='ctx'> 	int r = 0;</div><div class='ctx'> </div><div class='del'>-	atomic_inc(&amp;io-&gt;pending);</div><div class='add'>+	crypt_inc_pending(io);</div><div class='ctx'> </div><div class='ctx'> 	crypt_convert_init(cc, &amp;io-&gt;ctx, io-&gt;base_bio, io-&gt;base_bio,</div><div class='ctx'> 			   io-&gt;sector);</div><div class='hunk'>@@ -1108,15 +1137,9 @@ static void crypt_dtr(struct dm_target *ti)</div><div class='ctx'> static int crypt_map(struct dm_target *ti, struct bio *bio,</div><div class='ctx'> 		     union map_info *map_context)</div><div class='ctx'> {</div><div class='del'>-	struct crypt_config *cc = ti-&gt;private;</div><div class='ctx'> 	struct dm_crypt_io *io;</div><div class='ctx'> </div><div class='del'>-	io = mempool_alloc(cc-&gt;io_pool, GFP_NOIO);</div><div class='del'>-	io-&gt;target = ti;</div><div class='del'>-	io-&gt;base_bio = bio;</div><div class='del'>-	io-&gt;sector = bio-&gt;bi_sector - ti-&gt;begin;</div><div class='del'>-	io-&gt;error = 0;</div><div class='del'>-	atomic_set(&amp;io-&gt;pending, 0);</div><div class='add'>+	io = crypt_io_alloc(ti, bio, bio-&gt;bi_sector - ti-&gt;begin);</div><div class='ctx'> </div><div class='ctx'> 	if (bio_data_dir(io-&gt;base_bio) == READ)</div><div class='ctx'> 		kcryptd_queue_io(io);</div><div class='head'>diff --git a/drivers/md/dm-exception-store.c b/drivers/md/dm-exception-store.c<br/>index 41f408068a7c..769ab677f8e0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/md/dm-exception-store.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/md/dm-exception-store.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/md/dm-exception-store.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/md/dm-exception-store.c</a></div><div class='hunk'>@@ -108,12 +108,12 @@ struct pstore {</div><div class='ctx'> 	 * Used to keep track of which metadata area the data in</div><div class='ctx'> 	 * 'chunk' refers to.</div><div class='ctx'> 	 */</div><div class='del'>-	uint32_t current_area;</div><div class='add'>+	chunk_t current_area;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The next free chunk for an exception.</div><div class='ctx'> 	 */</div><div class='del'>-	uint32_t next_free;</div><div class='add'>+	chunk_t next_free;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The index of next free exception in the current</div><div class='hunk'>@@ -175,7 +175,7 @@ static void do_metadata(struct work_struct *work)</div><div class='ctx'> /*</div><div class='ctx'>  * Read or write a chunk aligned and sized block of data from a device.</div><div class='ctx'>  */</div><div class='del'>-static int chunk_io(struct pstore *ps, uint32_t chunk, int rw, int metadata)</div><div class='add'>+static int chunk_io(struct pstore *ps, chunk_t chunk, int rw, int metadata)</div><div class='ctx'> {</div><div class='ctx'> 	struct dm_io_region where = {</div><div class='ctx'> 		.bdev = ps-&gt;snap-&gt;cow-&gt;bdev,</div><div class='hunk'>@@ -209,16 +209,23 @@ static int chunk_io(struct pstore *ps, uint32_t chunk, int rw, int metadata)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Convert a metadata area index to a chunk index.</div><div class='add'>+ */</div><div class='add'>+static chunk_t area_location(struct pstore *ps, chunk_t area)</div><div class='add'>+{</div><div class='add'>+	return 1 + ((ps-&gt;exceptions_per_area + 1) * area);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Read or write a metadata area.  Remembering to skip the first</div><div class='ctx'>  * chunk which holds the header.</div><div class='ctx'>  */</div><div class='del'>-static int area_io(struct pstore *ps, uint32_t area, int rw)</div><div class='add'>+static int area_io(struct pstore *ps, chunk_t area, int rw)</div><div class='ctx'> {</div><div class='ctx'> 	int r;</div><div class='del'>-	uint32_t chunk;</div><div class='add'>+	chunk_t chunk;</div><div class='ctx'> </div><div class='del'>-	/* convert a metadata area index to a chunk index */</div><div class='del'>-	chunk = 1 + ((ps-&gt;exceptions_per_area + 1) * area);</div><div class='add'>+	chunk = area_location(ps, area);</div><div class='ctx'> </div><div class='ctx'> 	r = chunk_io(ps, chunk, rw, 0);</div><div class='ctx'> 	if (r)</div><div class='hunk'>@@ -228,7 +235,7 @@ static int area_io(struct pstore *ps, uint32_t area, int rw)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int zero_area(struct pstore *ps, uint32_t area)</div><div class='add'>+static int zero_area(struct pstore *ps, chunk_t area)</div><div class='ctx'> {</div><div class='ctx'> 	memset(ps-&gt;area, 0, ps-&gt;snap-&gt;chunk_size &lt;&lt; SECTOR_SHIFT);</div><div class='ctx'> 	return area_io(ps, area, WRITE);</div><div class='hunk'>@@ -404,7 +411,7 @@ static int insert_exceptions(struct pstore *ps, int *full)</div><div class='ctx'> </div><div class='ctx'> static int read_exceptions(struct pstore *ps)</div><div class='ctx'> {</div><div class='del'>-	uint32_t area;</div><div class='add'>+	chunk_t area;</div><div class='ctx'> 	int r, full = 1;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -517,6 +524,7 @@ static int persistent_prepare(struct exception_store *store,</div><div class='ctx'> {</div><div class='ctx'> 	struct pstore *ps = get_info(store);</div><div class='ctx'> 	uint32_t stride;</div><div class='add'>+	chunk_t next_free;</div><div class='ctx'> 	sector_t size = get_dev_size(store-&gt;snap-&gt;cow-&gt;bdev);</div><div class='ctx'> </div><div class='ctx'> 	/* Is there enough room ? */</div><div class='hunk'>@@ -530,7 +538,8 @@ static int persistent_prepare(struct exception_store *store,</div><div class='ctx'> 	 * into account the location of the metadata chunks.</div><div class='ctx'> 	 */</div><div class='ctx'> 	stride = (ps-&gt;exceptions_per_area + 1);</div><div class='del'>-	if ((++ps-&gt;next_free % stride) == 1)</div><div class='add'>+	next_free = ++ps-&gt;next_free;</div><div class='add'>+	if (sector_div(next_free, stride) == 1)</div><div class='ctx'> 		ps-&gt;next_free++;</div><div class='ctx'> </div><div class='ctx'> 	atomic_inc(&amp;ps-&gt;pending_count);</div><div class='head'>diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c<br/>index b262c0042de3..dca401dc70a0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/md/dm-ioctl.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/md/dm-ioctl.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/md/dm-ioctl.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/md/dm-ioctl.c</a></div><div class='hunk'>@@ -426,7 +426,7 @@ static int list_devices(struct dm_ioctl *param, size_t param_size)</div><div class='ctx'> 				old_nl-&gt;next = (uint32_t) ((void *) nl -</div><div class='ctx'> 							   (void *) old_nl);</div><div class='ctx'> 			disk = dm_disk(hc-&gt;md);</div><div class='del'>-			nl-&gt;dev = huge_encode_dev(MKDEV(disk-&gt;major, disk-&gt;first_minor));</div><div class='add'>+			nl-&gt;dev = huge_encode_dev(disk_devt(disk));</div><div class='ctx'> 			nl-&gt;next = 0;</div><div class='ctx'> 			strcpy(nl-&gt;name, hc-&gt;name);</div><div class='ctx'> </div><div class='hunk'>@@ -539,7 +539,7 @@ static int __dev_status(struct mapped_device *md, struct dm_ioctl *param)</div><div class='ctx'> 	if (dm_suspended(md))</div><div class='ctx'> 		param-&gt;flags |= DM_SUSPEND_FLAG;</div><div class='ctx'> </div><div class='del'>-	param-&gt;dev = huge_encode_dev(MKDEV(disk-&gt;major, disk-&gt;first_minor));</div><div class='add'>+	param-&gt;dev = huge_encode_dev(disk_devt(disk));</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Yes, this will be out of date by the time it gets back</div><div class='hunk'>@@ -548,7 +548,7 @@ static int __dev_status(struct mapped_device *md, struct dm_ioctl *param)</div><div class='ctx'> 	 */</div><div class='ctx'> 	param-&gt;open_count = dm_open_count(md);</div><div class='ctx'> </div><div class='del'>-	if (disk-&gt;policy)</div><div class='add'>+	if (get_disk_ro(disk))</div><div class='ctx'> 		param-&gt;flags |= DM_READONLY_FLAG;</div><div class='ctx'> </div><div class='ctx'> 	param-&gt;event_nr = dm_get_event_nr(md);</div><div class='hunk'>@@ -1131,7 +1131,7 @@ static void retrieve_deps(struct dm_table *table,</div><div class='ctx'> 	unsigned int count = 0;</div><div class='ctx'> 	struct list_head *tmp;</div><div class='ctx'> 	size_t len, needed;</div><div class='del'>-	struct dm_dev *dd;</div><div class='add'>+	struct dm_dev_internal *dd;</div><div class='ctx'> 	struct dm_target_deps *deps;</div><div class='ctx'> </div><div class='ctx'> 	deps = get_result_buffer(param, param_size, &amp;len);</div><div class='hunk'>@@ -1157,7 +1157,7 @@ static void retrieve_deps(struct dm_table *table,</div><div class='ctx'> 	deps-&gt;count = count;</div><div class='ctx'> 	count = 0;</div><div class='ctx'> 	list_for_each_entry (dd, dm_table_get_devices(table), list)</div><div class='del'>-		deps-&gt;dev[count++] = huge_encode_dev(dd-&gt;bdev-&gt;bd_dev);</div><div class='add'>+		deps-&gt;dev[count++] = huge_encode_dev(dd-&gt;dm_dev.bdev-&gt;bd_dev);</div><div class='ctx'> </div><div class='ctx'> 	param-&gt;data_size = param-&gt;data_start + needed;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/md/dm-mpath.c b/drivers/md/dm-mpath.c<br/>index c2fcf28b4c70..9bf3460c5540 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/md/dm-mpath.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/md/dm-mpath.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/md/dm-mpath.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/md/dm-mpath.c</a></div><div class='hunk'>@@ -30,9 +30,11 @@ struct pgpath {</div><div class='ctx'> 	struct list_head list;</div><div class='ctx'> </div><div class='ctx'> 	struct priority_group *pg;	/* Owning PG */</div><div class='add'>+	unsigned is_active;		/* Path status */</div><div class='ctx'> 	unsigned fail_count;		/* Cumulative failure count */</div><div class='ctx'> </div><div class='ctx'> 	struct dm_path path;</div><div class='add'>+	struct work_struct deactivate_path;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define path_to_pgpath(__pgp) container_of((__pgp), struct pgpath, path)</div><div class='hunk'>@@ -112,6 +114,7 @@ static struct workqueue_struct *kmultipathd, *kmpath_handlerd;</div><div class='ctx'> static void process_queued_ios(struct work_struct *work);</div><div class='ctx'> static void trigger_event(struct work_struct *work);</div><div class='ctx'> static void activate_path(struct work_struct *work);</div><div class='add'>+static void deactivate_path(struct work_struct *work);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*-----------------------------------------------</div><div class='hunk'>@@ -122,8 +125,10 @@ static struct pgpath *alloc_pgpath(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct pgpath *pgpath = kzalloc(sizeof(*pgpath), GFP_KERNEL);</div><div class='ctx'> </div><div class='del'>-	if (pgpath)</div><div class='del'>-		pgpath-&gt;path.is_active = 1;</div><div class='add'>+	if (pgpath) {</div><div class='add'>+		pgpath-&gt;is_active = 1;</div><div class='add'>+		INIT_WORK(&amp;pgpath-&gt;deactivate_path, deactivate_path);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return pgpath;</div><div class='ctx'> }</div><div class='hunk'>@@ -133,6 +138,14 @@ static void free_pgpath(struct pgpath *pgpath)</div><div class='ctx'> 	kfree(pgpath);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void deactivate_path(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct pgpath *pgpath =</div><div class='add'>+		container_of(work, struct pgpath, deactivate_path);</div><div class='add'>+</div><div class='add'>+	blk_abort_queue(pgpath-&gt;path.dev-&gt;bdev-&gt;bd_disk-&gt;queue);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct priority_group *alloc_priority_group(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct priority_group *pg;</div><div class='hunk'>@@ -563,12 +576,12 @@ static struct pgpath *parse_path(struct arg_set *as, struct path_selector *ps,</div><div class='ctx'> 	/* we need at least a path arg */</div><div class='ctx'> 	if (as-&gt;argc &lt; 1) {</div><div class='ctx'> 		ti-&gt;error = "no device given";</div><div class='del'>-		return NULL;</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	p = alloc_pgpath();</div><div class='ctx'> 	if (!p)</div><div class='del'>-		return NULL;</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='ctx'> 	r = dm_get_device(ti, shift(as), ti-&gt;begin, ti-&gt;len,</div><div class='ctx'> 			  dm_table_get_mode(ti-&gt;table), &amp;p-&gt;path.dev);</div><div class='hunk'>@@ -596,7 +609,7 @@ static struct pgpath *parse_path(struct arg_set *as, struct path_selector *ps,</div><div class='ctx'> </div><div class='ctx'>  bad:</div><div class='ctx'> 	free_pgpath(p);</div><div class='del'>-	return NULL;</div><div class='add'>+	return ERR_PTR(r);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct priority_group *parse_priority_group(struct arg_set *as,</div><div class='hunk'>@@ -614,14 +627,14 @@ static struct priority_group *parse_priority_group(struct arg_set *as,</div><div class='ctx'> </div><div class='ctx'> 	if (as-&gt;argc &lt; 2) {</div><div class='ctx'> 		as-&gt;argc = 0;</div><div class='del'>-		ti-&gt;error = "not enough priority group aruments";</div><div class='del'>-		return NULL;</div><div class='add'>+		ti-&gt;error = "not enough priority group arguments";</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	pg = alloc_priority_group();</div><div class='ctx'> 	if (!pg) {</div><div class='ctx'> 		ti-&gt;error = "couldn't allocate priority group";</div><div class='del'>-		return NULL;</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='ctx'> 	}</div><div class='ctx'> 	pg-&gt;m = m;</div><div class='ctx'> </div><div class='hunk'>@@ -654,8 +667,10 @@ static struct priority_group *parse_priority_group(struct arg_set *as,</div><div class='ctx'> 		path_args.argv = as-&gt;argv;</div><div class='ctx'> </div><div class='ctx'> 		pgpath = parse_path(&amp;path_args, &amp;pg-&gt;ps, ti);</div><div class='del'>-		if (!pgpath)</div><div class='add'>+		if (IS_ERR(pgpath)) {</div><div class='add'>+			r = PTR_ERR(pgpath);</div><div class='ctx'> 			goto bad;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		pgpath-&gt;pg = pg;</div><div class='ctx'> 		list_add_tail(&amp;pgpath-&gt;list, &amp;pg-&gt;pgpaths);</div><div class='hunk'>@@ -666,7 +681,7 @@ static struct priority_group *parse_priority_group(struct arg_set *as,</div><div class='ctx'> </div><div class='ctx'>  bad:</div><div class='ctx'> 	free_priority_group(pg, ti);</div><div class='del'>-	return NULL;</div><div class='add'>+	return ERR_PTR(r);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int parse_hw_handler(struct arg_set *as, struct multipath *m)</div><div class='hunk'>@@ -785,8 +800,8 @@ static int multipath_ctr(struct dm_target *ti, unsigned int argc,</div><div class='ctx'> 		struct priority_group *pg;</div><div class='ctx'> </div><div class='ctx'> 		pg = parse_priority_group(&amp;as, m);</div><div class='del'>-		if (!pg) {</div><div class='del'>-			r = -EINVAL;</div><div class='add'>+		if (IS_ERR(pg)) {</div><div class='add'>+			r = PTR_ERR(pg);</div><div class='ctx'> 			goto bad;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -834,7 +849,7 @@ static int multipath_map(struct dm_target *ti, struct bio *bio,</div><div class='ctx'> 	dm_bio_record(&amp;mpio-&gt;details, bio);</div><div class='ctx'> </div><div class='ctx'> 	map_context-&gt;ptr = mpio;</div><div class='del'>-	bio-&gt;bi_rw |= (1 &lt;&lt; BIO_RW_FAILFAST);</div><div class='add'>+	bio-&gt;bi_rw |= (1 &lt;&lt; BIO_RW_FAILFAST_TRANSPORT);</div><div class='ctx'> 	r = map_io(m, bio, mpio, 0);</div><div class='ctx'> 	if (r &lt; 0 || r == DM_MAPIO_REQUEUE)</div><div class='ctx'> 		mempool_free(mpio, m-&gt;mpio_pool);</div><div class='hunk'>@@ -852,13 +867,13 @@ static int fail_path(struct pgpath *pgpath)</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;m-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-	if (!pgpath-&gt;path.is_active)</div><div class='add'>+	if (!pgpath-&gt;is_active)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	DMWARN("Failing path %s.", pgpath-&gt;path.dev-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	pgpath-&gt;pg-&gt;ps.type-&gt;fail_path(&amp;pgpath-&gt;pg-&gt;ps, &amp;pgpath-&gt;path);</div><div class='del'>-	pgpath-&gt;path.is_active = 0;</div><div class='add'>+	pgpath-&gt;is_active = 0;</div><div class='ctx'> 	pgpath-&gt;fail_count++;</div><div class='ctx'> </div><div class='ctx'> 	m-&gt;nr_valid_paths--;</div><div class='hunk'>@@ -870,6 +885,7 @@ static int fail_path(struct pgpath *pgpath)</div><div class='ctx'> 		      pgpath-&gt;path.dev-&gt;name, m-&gt;nr_valid_paths);</div><div class='ctx'> </div><div class='ctx'> 	queue_work(kmultipathd, &amp;m-&gt;trigger_event);</div><div class='add'>+	queue_work(kmultipathd, &amp;pgpath-&gt;deactivate_path);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;m-&gt;lock, flags);</div><div class='hunk'>@@ -888,7 +904,7 @@ static int reinstate_path(struct pgpath *pgpath)</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;m-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-	if (pgpath-&gt;path.is_active)</div><div class='add'>+	if (pgpath-&gt;is_active)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	if (!pgpath-&gt;pg-&gt;ps.type-&gt;reinstate_path) {</div><div class='hunk'>@@ -902,7 +918,7 @@ static int reinstate_path(struct pgpath *pgpath)</div><div class='ctx'> 	if (r)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	pgpath-&gt;path.is_active = 1;</div><div class='add'>+	pgpath-&gt;is_active = 1;</div><div class='ctx'> </div><div class='ctx'> 	m-&gt;current_pgpath = NULL;</div><div class='ctx'> 	if (!m-&gt;nr_valid_paths++ &amp;&amp; m-&gt;queue_size)</div><div class='hunk'>@@ -1290,7 +1306,7 @@ static int multipath_status(struct dm_target *ti, status_type_t type,</div><div class='ctx'> </div><div class='ctx'> 			list_for_each_entry(p, &amp;pg-&gt;pgpaths, list) {</div><div class='ctx'> 				DMEMIT("%s %s %u ", p-&gt;path.dev-&gt;name,</div><div class='del'>-				       p-&gt;path.is_active ? "A" : "F",</div><div class='add'>+				       p-&gt;is_active ? "A" : "F",</div><div class='ctx'> 				       p-&gt;fail_count);</div><div class='ctx'> 				if (pg-&gt;ps.type-&gt;status)</div><div class='ctx'> 					sz += pg-&gt;ps.type-&gt;status(&amp;pg-&gt;ps,</div><div class='head'>diff --git a/drivers/md/dm-mpath.h b/drivers/md/dm-mpath.h<br/>index c198b856a452..e230f7196259 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/md/dm-mpath.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/md/dm-mpath.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/md/dm-mpath.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/md/dm-mpath.h</a></div><div class='hunk'>@@ -13,8 +13,6 @@ struct dm_dev;</div><div class='ctx'> </div><div class='ctx'> struct dm_path {</div><div class='ctx'> 	struct dm_dev *dev;	/* Read-only */</div><div class='del'>-	unsigned is_active;	/* Read-only */</div><div class='del'>-</div><div class='ctx'> 	void *pscontext;	/* For path-selector use */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c<br/>index ff05fe893083..29913e42c4ab 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/md/dm-raid1.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/md/dm-raid1.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/md/dm-raid1.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/md/dm-raid1.c</a></div><div class='hunk'>@@ -842,7 +842,9 @@ static int recover(struct mirror_set *ms, struct region *reg)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* hand to kcopyd */</div><div class='del'>-	set_bit(DM_KCOPYD_IGNORE_ERROR, &amp;flags);</div><div class='add'>+	if (!errors_handled(ms))</div><div class='add'>+		set_bit(DM_KCOPYD_IGNORE_ERROR, &amp;flags);</div><div class='add'>+</div><div class='ctx'> 	r = dm_kcopyd_copy(ms-&gt;kcopyd_client, &amp;from, ms-&gt;nr_mirrors - 1, to,</div><div class='ctx'> 			   flags, recovery_complete, reg);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/md/dm-stripe.c b/drivers/md/dm-stripe.c<br/>index 4de90ab3968b..b745d8ac625b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/md/dm-stripe.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/md/dm-stripe.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/md/dm-stripe.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/md/dm-stripe.c</a></div><div class='hunk'>@@ -284,8 +284,8 @@ static int stripe_end_io(struct dm_target *ti, struct bio *bio,</div><div class='ctx'> </div><div class='ctx'> 	memset(major_minor, 0, sizeof(major_minor));</div><div class='ctx'> 	sprintf(major_minor, "%d:%d",</div><div class='del'>-		bio-&gt;bi_bdev-&gt;bd_disk-&gt;major,</div><div class='del'>-		bio-&gt;bi_bdev-&gt;bd_disk-&gt;first_minor);</div><div class='add'>+		MAJOR(disk_devt(bio-&gt;bi_bdev-&gt;bd_disk)),</div><div class='add'>+		MINOR(disk_devt(bio-&gt;bi_bdev-&gt;bd_disk)));</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Test to see which stripe drive triggered the event</div><div class='head'>diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c<br/>index 61f441409234..a740a6950f59 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/md/dm-table.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/md/dm-table.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/md/dm-table.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/md/dm-table.c</a></div><div class='hunk'>@@ -250,7 +250,8 @@ static void free_devices(struct list_head *devices)</div><div class='ctx'> 	struct list_head *tmp, *next;</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_safe(tmp, next, devices) {</div><div class='del'>-		struct dm_dev *dd = list_entry(tmp, struct dm_dev, list);</div><div class='add'>+		struct dm_dev_internal *dd =</div><div class='add'>+		    list_entry(tmp, struct dm_dev_internal, list);</div><div class='ctx'> 		kfree(dd);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -327,12 +328,12 @@ static int lookup_device(const char *path, dev_t *dev)</div><div class='ctx'> /*</div><div class='ctx'>  * See if we've already got a device in the list.</div><div class='ctx'>  */</div><div class='del'>-static struct dm_dev *find_device(struct list_head *l, dev_t dev)</div><div class='add'>+static struct dm_dev_internal *find_device(struct list_head *l, dev_t dev)</div><div class='ctx'> {</div><div class='del'>-	struct dm_dev *dd;</div><div class='add'>+	struct dm_dev_internal *dd;</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry (dd, l, list)</div><div class='del'>-		if (dd-&gt;bdev-&gt;bd_dev == dev)</div><div class='add'>+		if (dd-&gt;dm_dev.bdev-&gt;bd_dev == dev)</div><div class='ctx'> 			return dd;</div><div class='ctx'> </div><div class='ctx'> 	return NULL;</div><div class='hunk'>@@ -341,45 +342,47 @@ static struct dm_dev *find_device(struct list_head *l, dev_t dev)</div><div class='ctx'> /*</div><div class='ctx'>  * Open a device so we can use it as a map destination.</div><div class='ctx'>  */</div><div class='del'>-static int open_dev(struct dm_dev *d, dev_t dev, struct mapped_device *md)</div><div class='add'>+static int open_dev(struct dm_dev_internal *d, dev_t dev,</div><div class='add'>+		    struct mapped_device *md)</div><div class='ctx'> {</div><div class='ctx'> 	static char *_claim_ptr = "I belong to device-mapper";</div><div class='ctx'> 	struct block_device *bdev;</div><div class='ctx'> </div><div class='ctx'> 	int r;</div><div class='ctx'> </div><div class='del'>-	BUG_ON(d-&gt;bdev);</div><div class='add'>+	BUG_ON(d-&gt;dm_dev.bdev);</div><div class='ctx'> </div><div class='del'>-	bdev = open_by_devnum(dev, d-&gt;mode);</div><div class='add'>+	bdev = open_by_devnum(dev, d-&gt;dm_dev.mode);</div><div class='ctx'> 	if (IS_ERR(bdev))</div><div class='ctx'> 		return PTR_ERR(bdev);</div><div class='ctx'> 	r = bd_claim_by_disk(bdev, _claim_ptr, dm_disk(md));</div><div class='ctx'> 	if (r)</div><div class='ctx'> 		blkdev_put(bdev);</div><div class='ctx'> 	else</div><div class='del'>-		d-&gt;bdev = bdev;</div><div class='add'>+		d-&gt;dm_dev.bdev = bdev;</div><div class='ctx'> 	return r;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Close a device that we've been using.</div><div class='ctx'>  */</div><div class='del'>-static void close_dev(struct dm_dev *d, struct mapped_device *md)</div><div class='add'>+static void close_dev(struct dm_dev_internal *d, struct mapped_device *md)</div><div class='ctx'> {</div><div class='del'>-	if (!d-&gt;bdev)</div><div class='add'>+	if (!d-&gt;dm_dev.bdev)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	bd_release_from_disk(d-&gt;bdev, dm_disk(md));</div><div class='del'>-	blkdev_put(d-&gt;bdev);</div><div class='del'>-	d-&gt;bdev = NULL;</div><div class='add'>+	bd_release_from_disk(d-&gt;dm_dev.bdev, dm_disk(md));</div><div class='add'>+	blkdev_put(d-&gt;dm_dev.bdev);</div><div class='add'>+	d-&gt;dm_dev.bdev = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * If possible, this checks an area of a destination device is valid.</div><div class='ctx'>  */</div><div class='del'>-static int check_device_area(struct dm_dev *dd, sector_t start, sector_t len)</div><div class='add'>+static int check_device_area(struct dm_dev_internal *dd, sector_t start,</div><div class='add'>+			     sector_t len)</div><div class='ctx'> {</div><div class='del'>-	sector_t dev_size = dd-&gt;bdev-&gt;bd_inode-&gt;i_size &gt;&gt; SECTOR_SHIFT;</div><div class='add'>+	sector_t dev_size = dd-&gt;dm_dev.bdev-&gt;bd_inode-&gt;i_size &gt;&gt; SECTOR_SHIFT;</div><div class='ctx'> </div><div class='ctx'> 	if (!dev_size)</div><div class='ctx'> 		return 1;</div><div class='hunk'>@@ -392,16 +395,17 @@ static int check_device_area(struct dm_dev *dd, sector_t start, sector_t len)</div><div class='ctx'>  * careful to leave things as they were if we fail to reopen the</div><div class='ctx'>  * device.</div><div class='ctx'>  */</div><div class='del'>-static int upgrade_mode(struct dm_dev *dd, int new_mode, struct mapped_device *md)</div><div class='add'>+static int upgrade_mode(struct dm_dev_internal *dd, int new_mode,</div><div class='add'>+			struct mapped_device *md)</div><div class='ctx'> {</div><div class='ctx'> 	int r;</div><div class='del'>-	struct dm_dev dd_copy;</div><div class='del'>-	dev_t dev = dd-&gt;bdev-&gt;bd_dev;</div><div class='add'>+	struct dm_dev_internal dd_copy;</div><div class='add'>+	dev_t dev = dd-&gt;dm_dev.bdev-&gt;bd_dev;</div><div class='ctx'> </div><div class='ctx'> 	dd_copy = *dd;</div><div class='ctx'> </div><div class='del'>-	dd-&gt;mode |= new_mode;</div><div class='del'>-	dd-&gt;bdev = NULL;</div><div class='add'>+	dd-&gt;dm_dev.mode |= new_mode;</div><div class='add'>+	dd-&gt;dm_dev.bdev = NULL;</div><div class='ctx'> 	r = open_dev(dd, dev, md);</div><div class='ctx'> 	if (!r)</div><div class='ctx'> 		close_dev(&amp;dd_copy, md);</div><div class='hunk'>@@ -421,7 +425,7 @@ static int __table_get_device(struct dm_table *t, struct dm_target *ti,</div><div class='ctx'> {</div><div class='ctx'> 	int r;</div><div class='ctx'> 	dev_t uninitialized_var(dev);</div><div class='del'>-	struct dm_dev *dd;</div><div class='add'>+	struct dm_dev_internal *dd;</div><div class='ctx'> 	unsigned int major, minor;</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(!t);</div><div class='hunk'>@@ -443,20 +447,20 @@ static int __table_get_device(struct dm_table *t, struct dm_target *ti,</div><div class='ctx'> 		if (!dd)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-		dd-&gt;mode = mode;</div><div class='del'>-		dd-&gt;bdev = NULL;</div><div class='add'>+		dd-&gt;dm_dev.mode = mode;</div><div class='add'>+		dd-&gt;dm_dev.bdev = NULL;</div><div class='ctx'> </div><div class='ctx'> 		if ((r = open_dev(dd, dev, t-&gt;md))) {</div><div class='ctx'> 			kfree(dd);</div><div class='ctx'> 			return r;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		format_dev_t(dd-&gt;name, dev);</div><div class='add'>+		format_dev_t(dd-&gt;dm_dev.name, dev);</div><div class='ctx'> </div><div class='ctx'> 		atomic_set(&amp;dd-&gt;count, 0);</div><div class='ctx'> 		list_add(&amp;dd-&gt;list, &amp;t-&gt;devices);</div><div class='ctx'> </div><div class='del'>-	} else if (dd-&gt;mode != (mode | dd-&gt;mode)) {</div><div class='add'>+	} else if (dd-&gt;dm_dev.mode != (mode | dd-&gt;dm_dev.mode)) {</div><div class='ctx'> 		r = upgrade_mode(dd, mode, t-&gt;md);</div><div class='ctx'> 		if (r)</div><div class='ctx'> 			return r;</div><div class='hunk'>@@ -465,11 +469,11 @@ static int __table_get_device(struct dm_table *t, struct dm_target *ti,</div><div class='ctx'> </div><div class='ctx'> 	if (!check_device_area(dd, start, len)) {</div><div class='ctx'> 		DMWARN("device %s too small for target", path);</div><div class='del'>-		dm_put_device(ti, dd);</div><div class='add'>+		dm_put_device(ti, &amp;dd-&gt;dm_dev);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	*result = dd;</div><div class='add'>+	*result = &amp;dd-&gt;dm_dev;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -478,6 +482,13 @@ void dm_set_device_limits(struct dm_target *ti, struct block_device *bdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct request_queue *q = bdev_get_queue(bdev);</div><div class='ctx'> 	struct io_restrictions *rs = &amp;ti-&gt;limits;</div><div class='add'>+	char b[BDEVNAME_SIZE];</div><div class='add'>+</div><div class='add'>+	if (unlikely(!q)) {</div><div class='add'>+		DMWARN("%s: Cannot set limits for nonexistent device %s",</div><div class='add'>+		       dm_device_name(ti-&gt;table-&gt;md), bdevname(bdev, b));</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Combine the device limits low.</div><div class='hunk'>@@ -540,8 +551,11 @@ int dm_get_device(struct dm_target *ti, const char *path, sector_t start,</div><div class='ctx'> /*</div><div class='ctx'>  * Decrement a devices use count and remove it if necessary.</div><div class='ctx'>  */</div><div class='del'>-void dm_put_device(struct dm_target *ti, struct dm_dev *dd)</div><div class='add'>+void dm_put_device(struct dm_target *ti, struct dm_dev *d)</div><div class='ctx'> {</div><div class='add'>+	struct dm_dev_internal *dd = container_of(d, struct dm_dev_internal,</div><div class='add'>+						  dm_dev);</div><div class='add'>+</div><div class='ctx'> 	if (atomic_dec_and_test(&amp;dd-&gt;count)) {</div><div class='ctx'> 		close_dev(dd, ti-&gt;table-&gt;md);</div><div class='ctx'> 		list_del(&amp;dd-&gt;list);</div><div class='hunk'>@@ -937,13 +951,20 @@ int dm_table_resume_targets(struct dm_table *t)</div><div class='ctx'> </div><div class='ctx'> int dm_table_any_congested(struct dm_table *t, int bdi_bits)</div><div class='ctx'> {</div><div class='del'>-	struct dm_dev *dd;</div><div class='add'>+	struct dm_dev_internal *dd;</div><div class='ctx'> 	struct list_head *devices = dm_table_get_devices(t);</div><div class='ctx'> 	int r = 0;</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(dd, devices, list) {</div><div class='del'>-		struct request_queue *q = bdev_get_queue(dd-&gt;bdev);</div><div class='del'>-		r |= bdi_congested(&amp;q-&gt;backing_dev_info, bdi_bits);</div><div class='add'>+		struct request_queue *q = bdev_get_queue(dd-&gt;dm_dev.bdev);</div><div class='add'>+		char b[BDEVNAME_SIZE];</div><div class='add'>+</div><div class='add'>+		if (likely(q))</div><div class='add'>+			r |= bdi_congested(&amp;q-&gt;backing_dev_info, bdi_bits);</div><div class='add'>+		else</div><div class='add'>+			DMWARN_LIMIT("%s: any_congested: nonexistent device %s",</div><div class='add'>+				     dm_device_name(t-&gt;md),</div><div class='add'>+				     bdevname(dd-&gt;dm_dev.bdev, b));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return r;</div><div class='hunk'>@@ -951,13 +972,19 @@ int dm_table_any_congested(struct dm_table *t, int bdi_bits)</div><div class='ctx'> </div><div class='ctx'> void dm_table_unplug_all(struct dm_table *t)</div><div class='ctx'> {</div><div class='del'>-	struct dm_dev *dd;</div><div class='add'>+	struct dm_dev_internal *dd;</div><div class='ctx'> 	struct list_head *devices = dm_table_get_devices(t);</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(dd, devices, list) {</div><div class='del'>-		struct request_queue *q = bdev_get_queue(dd-&gt;bdev);</div><div class='del'>-</div><div class='del'>-		blk_unplug(q);</div><div class='add'>+		struct request_queue *q = bdev_get_queue(dd-&gt;dm_dev.bdev);</div><div class='add'>+		char b[BDEVNAME_SIZE];</div><div class='add'>+</div><div class='add'>+		if (likely(q))</div><div class='add'>+			blk_unplug(q);</div><div class='add'>+		else</div><div class='add'>+			DMWARN_LIMIT("%s: Cannot unplug nonexistent device %s",</div><div class='add'>+				     dm_device_name(t-&gt;md),</div><div class='add'>+				     bdevname(dd-&gt;dm_dev.bdev, b));</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/md/dm.c b/drivers/md/dm.c<br/>index ace998ce59f6..327de03a5bdf 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/md/dm.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/md/dm.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/md/dm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/md/dm.c</a></div><div class='hunk'>@@ -377,13 +377,14 @@ static void free_tio(struct mapped_device *md, struct dm_target_io *tio)</div><div class='ctx'> static void start_io_acct(struct dm_io *io)</div><div class='ctx'> {</div><div class='ctx'> 	struct mapped_device *md = io-&gt;md;</div><div class='add'>+	int cpu;</div><div class='ctx'> </div><div class='ctx'> 	io-&gt;start_time = jiffies;</div><div class='ctx'> </div><div class='del'>-	preempt_disable();</div><div class='del'>-	disk_round_stats(dm_disk(md));</div><div class='del'>-	preempt_enable();</div><div class='del'>-	dm_disk(md)-&gt;in_flight = atomic_inc_return(&amp;md-&gt;pending);</div><div class='add'>+	cpu = part_stat_lock();</div><div class='add'>+	part_round_stats(cpu, &amp;dm_disk(md)-&gt;part0);</div><div class='add'>+	part_stat_unlock();</div><div class='add'>+	dm_disk(md)-&gt;part0.in_flight = atomic_inc_return(&amp;md-&gt;pending);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int end_io_acct(struct dm_io *io)</div><div class='hunk'>@@ -391,15 +392,16 @@ static int end_io_acct(struct dm_io *io)</div><div class='ctx'> 	struct mapped_device *md = io-&gt;md;</div><div class='ctx'> 	struct bio *bio = io-&gt;bio;</div><div class='ctx'> 	unsigned long duration = jiffies - io-&gt;start_time;</div><div class='del'>-	int pending;</div><div class='add'>+	int pending, cpu;</div><div class='ctx'> 	int rw = bio_data_dir(bio);</div><div class='ctx'> </div><div class='del'>-	preempt_disable();</div><div class='del'>-	disk_round_stats(dm_disk(md));</div><div class='del'>-	preempt_enable();</div><div class='del'>-	dm_disk(md)-&gt;in_flight = pending = atomic_dec_return(&amp;md-&gt;pending);</div><div class='add'>+	cpu = part_stat_lock();</div><div class='add'>+	part_round_stats(cpu, &amp;dm_disk(md)-&gt;part0);</div><div class='add'>+	part_stat_add(cpu, &amp;dm_disk(md)-&gt;part0, ticks[rw], duration);</div><div class='add'>+	part_stat_unlock();</div><div class='ctx'> </div><div class='del'>-	disk_stat_add(dm_disk(md), ticks[rw], duration);</div><div class='add'>+	dm_disk(md)-&gt;part0.in_flight = pending =</div><div class='add'>+		atomic_dec_return(&amp;md-&gt;pending);</div><div class='ctx'> </div><div class='ctx'> 	return !pending;</div><div class='ctx'> }</div><div class='hunk'>@@ -885,6 +887,7 @@ static int dm_request(struct request_queue *q, struct bio *bio)</div><div class='ctx'> 	int r = -EIO;</div><div class='ctx'> 	int rw = bio_data_dir(bio);</div><div class='ctx'> 	struct mapped_device *md = q-&gt;queuedata;</div><div class='add'>+	int cpu;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * There is no use in forwarding any barrier request since we can't</div><div class='hunk'>@@ -897,8 +900,10 @@ static int dm_request(struct request_queue *q, struct bio *bio)</div><div class='ctx'> </div><div class='ctx'> 	down_read(&amp;md-&gt;io_lock);</div><div class='ctx'> </div><div class='del'>-	disk_stat_inc(dm_disk(md), ios[rw]);</div><div class='del'>-	disk_stat_add(dm_disk(md), sectors[rw], bio_sectors(bio));</div><div class='add'>+	cpu = part_stat_lock();</div><div class='add'>+	part_stat_inc(cpu, &amp;dm_disk(md)-&gt;part0, ios[rw]);</div><div class='add'>+	part_stat_add(cpu, &amp;dm_disk(md)-&gt;part0, sectors[rw], bio_sectors(bio));</div><div class='add'>+	part_stat_unlock();</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If we're suspended we have to queue</div><div class='hunk'>@@ -1146,7 +1151,7 @@ static void unlock_fs(struct mapped_device *md);</div><div class='ctx'> </div><div class='ctx'> static void free_dev(struct mapped_device *md)</div><div class='ctx'> {</div><div class='del'>-	int minor = md-&gt;disk-&gt;first_minor;</div><div class='add'>+	int minor = MINOR(disk_devt(md-&gt;disk));</div><div class='ctx'> </div><div class='ctx'> 	if (md-&gt;suspended_bdev) {</div><div class='ctx'> 		unlock_fs(md);</div><div class='hunk'>@@ -1182,7 +1187,7 @@ static void event_callback(void *context)</div><div class='ctx'> 	list_splice_init(&amp;md-&gt;uevent_list, &amp;uevents);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;md-&gt;uevent_lock, flags);</div><div class='ctx'> </div><div class='del'>-	dm_send_uevents(&amp;uevents, &amp;md-&gt;disk-&gt;dev.kobj);</div><div class='add'>+	dm_send_uevents(&amp;uevents, &amp;disk_to_dev(md-&gt;disk)-&gt;kobj);</div><div class='ctx'> </div><div class='ctx'> 	atomic_inc(&amp;md-&gt;event_nr);</div><div class='ctx'> 	wake_up(&amp;md-&gt;eventq);</div><div class='hunk'>@@ -1267,7 +1272,7 @@ static struct mapped_device *dm_find_md(dev_t dev)</div><div class='ctx'> </div><div class='ctx'> 	md = idr_find(&amp;_minor_idr, minor);</div><div class='ctx'> 	if (md &amp;&amp; (md == MINOR_ALLOCED ||</div><div class='del'>-		   (dm_disk(md)-&gt;first_minor != minor) ||</div><div class='add'>+		   (MINOR(disk_devt(dm_disk(md))) != minor) ||</div><div class='ctx'> 		   test_bit(DMF_FREEING, &amp;md-&gt;flags))) {</div><div class='ctx'> 		md = NULL;</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -1318,7 +1323,8 @@ void dm_put(struct mapped_device *md)</div><div class='ctx'> </div><div class='ctx'> 	if (atomic_dec_and_lock(&amp;md-&gt;holders, &amp;_minor_lock)) {</div><div class='ctx'> 		map = dm_get_table(md);</div><div class='del'>-		idr_replace(&amp;_minor_idr, MINOR_ALLOCED, dm_disk(md)-&gt;first_minor);</div><div class='add'>+		idr_replace(&amp;_minor_idr, MINOR_ALLOCED,</div><div class='add'>+			    MINOR(disk_devt(dm_disk(md))));</div><div class='ctx'> 		set_bit(DMF_FREEING, &amp;md-&gt;flags);</div><div class='ctx'> 		spin_unlock(&amp;_minor_lock);</div><div class='ctx'> 		if (!dm_suspended(md)) {</div><div class='hunk'>@@ -1638,7 +1644,7 @@ out:</div><div class='ctx'>  *---------------------------------------------------------------*/</div><div class='ctx'> void dm_kobject_uevent(struct mapped_device *md)</div><div class='ctx'> {</div><div class='del'>-	kobject_uevent(&amp;md-&gt;disk-&gt;dev.kobj, KOBJ_CHANGE);</div><div class='add'>+	kobject_uevent(&amp;disk_to_dev(md-&gt;disk)-&gt;kobj, KOBJ_CHANGE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> uint32_t dm_next_uevent_seq(struct mapped_device *md)</div><div class='head'>diff --git a/drivers/md/dm.h b/drivers/md/dm.h<br/>index 1e59a0b0a78a..cd189da2b2fa 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/md/dm.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/md/dm.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/md/dm.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/md/dm.h</a></div><div class='hunk'>@@ -25,13 +25,10 @@</div><div class='ctx'> /*</div><div class='ctx'>  * List of devices that a metadevice uses and should open/close.</div><div class='ctx'>  */</div><div class='del'>-struct dm_dev {</div><div class='add'>+struct dm_dev_internal {</div><div class='ctx'> 	struct list_head list;</div><div class='del'>-</div><div class='ctx'> 	atomic_t count;</div><div class='del'>-	int mode;</div><div class='del'>-	struct block_device *bdev;</div><div class='del'>-	char name[16];</div><div class='add'>+	struct dm_dev dm_dev;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct dm_table;</div><div class='hunk'>@@ -49,7 +46,6 @@ void dm_table_presuspend_targets(struct dm_table *t);</div><div class='ctx'> void dm_table_postsuspend_targets(struct dm_table *t);</div><div class='ctx'> int dm_table_resume_targets(struct dm_table *t);</div><div class='ctx'> int dm_table_any_congested(struct dm_table *t, int bdi_bits);</div><div class='del'>-void dm_table_unplug_all(struct dm_table *t);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * To check the return value from dm_table_find_target().</div><div class='hunk'>@@ -93,8 +89,6 @@ void dm_linear_exit(void);</div><div class='ctx'> int dm_stripe_init(void);</div><div class='ctx'> void dm_stripe_exit(void);</div><div class='ctx'> </div><div class='del'>-void *dm_vcalloc(unsigned long nmemb, unsigned long elem_size);</div><div class='del'>-union map_info *dm_get_mapinfo(struct bio *bio);</div><div class='ctx'> int dm_open_count(struct mapped_device *md);</div><div class='ctx'> int dm_lock_for_deletion(struct mapped_device *md);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/md/faulty.c b/drivers/md/faulty.c<br/>index 268547dbfbd3..f26c1f9a475b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/md/faulty.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/md/faulty.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/md/faulty.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/md/faulty.c</a></div><div class='hunk'>@@ -287,6 +287,8 @@ static int run(mddev_t *mddev)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	conf_t *conf = kmalloc(sizeof(*conf), GFP_KERNEL);</div><div class='add'>+	if (!conf)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	for (i=0; i&lt;Modes; i++) {</div><div class='ctx'> 		atomic_set(&amp;conf-&gt;counters[i], 0);</div><div class='head'>diff --git a/drivers/md/linear.c b/drivers/md/linear.c<br/>index b1eebf88c209..190147c79e79 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/md/linear.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/md/linear.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/md/linear.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/md/linear.c</a></div><div class='hunk'>@@ -16,16 +16,8 @@</div><div class='ctx'>    Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  </div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;linux/raid/md.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/raid/linear.h&gt;</div><div class='ctx'> </div><div class='del'>-#define MAJOR_NR MD_MAJOR</div><div class='del'>-#define MD_DRIVER</div><div class='del'>-#define MD_PERSONALITY</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * find which device holds a particular offset </div><div class='ctx'>  */</div><div class='hunk'>@@ -33,16 +25,15 @@ static inline dev_info_t *which_dev(mddev_t *mddev, sector_t sector)</div><div class='ctx'> {</div><div class='ctx'> 	dev_info_t *hash;</div><div class='ctx'> 	linear_conf_t *conf = mddev_to_conf(mddev);</div><div class='del'>-	sector_t block = sector &gt;&gt; 1;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * sector_div(a,b) returns the remainer and sets a to a/b</div><div class='ctx'> 	 */</div><div class='del'>-	block &gt;&gt;= conf-&gt;preshift;</div><div class='del'>-	(void)sector_div(block, conf-&gt;hash_spacing);</div><div class='del'>-	hash = conf-&gt;hash_table[block];</div><div class='add'>+	sector &gt;&gt;= conf-&gt;sector_shift;</div><div class='add'>+	(void)sector_div(sector, conf-&gt;spacing);</div><div class='add'>+	hash = conf-&gt;hash_table[sector];</div><div class='ctx'> </div><div class='del'>-	while ((sector&gt;&gt;1) &gt;= (hash-&gt;size + hash-&gt;offset))</div><div class='add'>+	while (sector &gt;= hash-&gt;num_sectors + hash-&gt;start_sector)</div><div class='ctx'> 		hash++;</div><div class='ctx'> 	return hash;</div><div class='ctx'> }</div><div class='hunk'>@@ -65,7 +56,7 @@ static int linear_mergeable_bvec(struct request_queue *q,</div><div class='ctx'> 	sector_t sector = bvm-&gt;bi_sector + get_start_sect(bvm-&gt;bi_bdev);</div><div class='ctx'> </div><div class='ctx'> 	dev0 = which_dev(mddev, sector);</div><div class='del'>-	maxsectors = (dev0-&gt;size &lt;&lt; 1) - (sector - (dev0-&gt;offset&lt;&lt;1));</div><div class='add'>+	maxsectors = dev0-&gt;num_sectors - (sector - dev0-&gt;start_sector);</div><div class='ctx'> </div><div class='ctx'> 	if (maxsectors &lt; bio_sectors)</div><div class='ctx'> 		maxsectors = 0;</div><div class='hunk'>@@ -112,8 +103,8 @@ static linear_conf_t *linear_conf(mddev_t *mddev, int raid_disks)</div><div class='ctx'> 	dev_info_t **table;</div><div class='ctx'> 	mdk_rdev_t *rdev;</div><div class='ctx'> 	int i, nb_zone, cnt;</div><div class='del'>-	sector_t min_spacing;</div><div class='del'>-	sector_t curr_offset;</div><div class='add'>+	sector_t min_sectors;</div><div class='add'>+	sector_t curr_sector;</div><div class='ctx'> 	struct list_head *tmp;</div><div class='ctx'> </div><div class='ctx'> 	conf = kzalloc (sizeof (*conf) + raid_disks*sizeof(dev_info_t),</div><div class='hunk'>@@ -145,7 +136,7 @@ static linear_conf_t *linear_conf(mddev_t *mddev, int raid_disks)</div><div class='ctx'> 		    mddev-&gt;queue-&gt;max_sectors &gt; (PAGE_SIZE&gt;&gt;9))</div><div class='ctx'> 			blk_queue_max_sectors(mddev-&gt;queue, PAGE_SIZE&gt;&gt;9);</div><div class='ctx'> </div><div class='del'>-		disk-&gt;size = rdev-&gt;size;</div><div class='add'>+		disk-&gt;num_sectors = rdev-&gt;size * 2;</div><div class='ctx'> 		conf-&gt;array_sectors += rdev-&gt;size * 2;</div><div class='ctx'> </div><div class='ctx'> 		cnt++;</div><div class='hunk'>@@ -155,34 +146,34 @@ static linear_conf_t *linear_conf(mddev_t *mddev, int raid_disks)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	min_spacing = conf-&gt;array_sectors / 2;</div><div class='del'>-	sector_div(min_spacing, PAGE_SIZE/sizeof(struct dev_info *));</div><div class='add'>+	min_sectors = conf-&gt;array_sectors;</div><div class='add'>+	sector_div(min_sectors, PAGE_SIZE/sizeof(struct dev_info *));</div><div class='ctx'> </div><div class='del'>-	/* min_spacing is the minimum spacing that will fit the hash</div><div class='add'>+	/* min_sectors is the minimum spacing that will fit the hash</div><div class='ctx'> 	 * table in one PAGE.  This may be much smaller than needed.</div><div class='ctx'> 	 * We find the smallest non-terminal set of consecutive devices</div><div class='del'>-	 * that is larger than min_spacing as use the size of that as</div><div class='add'>+	 * that is larger than min_sectors and use the size of that as</div><div class='ctx'> 	 * the actual spacing</div><div class='ctx'> 	 */</div><div class='del'>-	conf-&gt;hash_spacing = conf-&gt;array_sectors / 2;</div><div class='add'>+	conf-&gt;spacing = conf-&gt;array_sectors;</div><div class='ctx'> 	for (i=0; i &lt; cnt-1 ; i++) {</div><div class='del'>-		sector_t sz = 0;</div><div class='add'>+		sector_t tmp = 0;</div><div class='ctx'> 		int j;</div><div class='del'>-		for (j = i; j &lt; cnt - 1 &amp;&amp; sz &lt; min_spacing; j++)</div><div class='del'>-			sz += conf-&gt;disks[j].size;</div><div class='del'>-		if (sz &gt;= min_spacing &amp;&amp; sz &lt; conf-&gt;hash_spacing)</div><div class='del'>-			conf-&gt;hash_spacing = sz;</div><div class='add'>+		for (j = i; j &lt; cnt - 1 &amp;&amp; tmp &lt; min_sectors; j++)</div><div class='add'>+			tmp += conf-&gt;disks[j].num_sectors;</div><div class='add'>+		if (tmp &gt;= min_sectors &amp;&amp; tmp &lt; conf-&gt;spacing)</div><div class='add'>+			conf-&gt;spacing = tmp;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* hash_spacing may be too large for sector_div to work with,</div><div class='add'>+	/* spacing may be too large for sector_div to work with,</div><div class='ctx'> 	 * so we might need to pre-shift</div><div class='ctx'> 	 */</div><div class='del'>-	conf-&gt;preshift = 0;</div><div class='add'>+	conf-&gt;sector_shift = 0;</div><div class='ctx'> 	if (sizeof(sector_t) &gt; sizeof(u32)) {</div><div class='del'>-		sector_t space = conf-&gt;hash_spacing;</div><div class='add'>+		sector_t space = conf-&gt;spacing;</div><div class='ctx'> 		while (space &gt; (sector_t)(~(u32)0)) {</div><div class='ctx'> 			space &gt;&gt;= 1;</div><div class='del'>-			conf-&gt;preshift++;</div><div class='add'>+			conf-&gt;sector_shift++;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -194,9 +185,9 @@ static linear_conf_t *linear_conf(mddev_t *mddev, int raid_disks)</div><div class='ctx'> 		unsigned round;</div><div class='ctx'> 		unsigned long base;</div><div class='ctx'> </div><div class='del'>-		sz = conf-&gt;array_sectors &gt;&gt; (conf-&gt;preshift + 1);</div><div class='add'>+		sz = conf-&gt;array_sectors &gt;&gt; conf-&gt;sector_shift;</div><div class='ctx'> 		sz += 1; /* force round-up */</div><div class='del'>-		base = conf-&gt;hash_spacing &gt;&gt; conf-&gt;preshift;</div><div class='add'>+		base = conf-&gt;spacing &gt;&gt; conf-&gt;sector_shift;</div><div class='ctx'> 		round = sector_div(sz, base);</div><div class='ctx'> 		nb_zone = sz + (round ? 1 : 0);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -211,32 +202,31 @@ static linear_conf_t *linear_conf(mddev_t *mddev, int raid_disks)</div><div class='ctx'> 	 * Here we generate the linear hash table</div><div class='ctx'> 	 * First calculate the device offsets.</div><div class='ctx'> 	 */</div><div class='del'>-	conf-&gt;disks[0].offset = 0;</div><div class='add'>+	conf-&gt;disks[0].start_sector = 0;</div><div class='ctx'> 	for (i = 1; i &lt; raid_disks; i++)</div><div class='del'>-		conf-&gt;disks[i].offset =</div><div class='del'>-			conf-&gt;disks[i-1].offset +</div><div class='del'>-			conf-&gt;disks[i-1].size;</div><div class='add'>+		conf-&gt;disks[i].start_sector =</div><div class='add'>+			conf-&gt;disks[i-1].start_sector +</div><div class='add'>+			conf-&gt;disks[i-1].num_sectors;</div><div class='ctx'> </div><div class='ctx'> 	table = conf-&gt;hash_table;</div><div class='del'>-	curr_offset = 0;</div><div class='ctx'> 	i = 0;</div><div class='del'>-	for (curr_offset = 0;</div><div class='del'>-	     curr_offset &lt; conf-&gt;array_sectors / 2;</div><div class='del'>-	     curr_offset += conf-&gt;hash_spacing) {</div><div class='add'>+	for (curr_sector = 0;</div><div class='add'>+	     curr_sector &lt; conf-&gt;array_sectors;</div><div class='add'>+	     curr_sector += conf-&gt;spacing) {</div><div class='ctx'> </div><div class='ctx'> 		while (i &lt; raid_disks-1 &amp;&amp;</div><div class='del'>-		       curr_offset &gt;= conf-&gt;disks[i+1].offset)</div><div class='add'>+		       curr_sector &gt;= conf-&gt;disks[i+1].start_sector)</div><div class='ctx'> 			i++;</div><div class='ctx'> </div><div class='ctx'> 		*table ++ = conf-&gt;disks + i;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (conf-&gt;preshift) {</div><div class='del'>-		conf-&gt;hash_spacing &gt;&gt;= conf-&gt;preshift;</div><div class='del'>-		/* round hash_spacing up so that when we divide by it,</div><div class='add'>+	if (conf-&gt;sector_shift) {</div><div class='add'>+		conf-&gt;spacing &gt;&gt;= conf-&gt;sector_shift;</div><div class='add'>+		/* round spacing up so that when we divide by it,</div><div class='ctx'> 		 * we err on the side of "too-low", which is safest.</div><div class='ctx'> 		 */</div><div class='del'>-		conf-&gt;hash_spacing++;</div><div class='add'>+		conf-&gt;spacing++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(table - conf-&gt;hash_table &gt; nb_zone);</div><div class='hunk'>@@ -317,40 +307,47 @@ static int linear_make_request (struct request_queue *q, struct bio *bio)</div><div class='ctx'> 	const int rw = bio_data_dir(bio);</div><div class='ctx'> 	mddev_t *mddev = q-&gt;queuedata;</div><div class='ctx'> 	dev_info_t *tmp_dev;</div><div class='del'>-	sector_t block;</div><div class='add'>+	int cpu;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(bio_barrier(bio))) {</div><div class='ctx'> 		bio_endio(bio, -EOPNOTSUPP);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	disk_stat_inc(mddev-&gt;gendisk, ios[rw]);</div><div class='del'>-	disk_stat_add(mddev-&gt;gendisk, sectors[rw], bio_sectors(bio));</div><div class='add'>+	cpu = part_stat_lock();</div><div class='add'>+	part_stat_inc(cpu, &amp;mddev-&gt;gendisk-&gt;part0, ios[rw]);</div><div class='add'>+	part_stat_add(cpu, &amp;mddev-&gt;gendisk-&gt;part0, sectors[rw],</div><div class='add'>+		      bio_sectors(bio));</div><div class='add'>+	part_stat_unlock();</div><div class='ctx'> </div><div class='ctx'> 	tmp_dev = which_dev(mddev, bio-&gt;bi_sector);</div><div class='del'>-	block = bio-&gt;bi_sector &gt;&gt; 1;</div><div class='ctx'>     </div><div class='del'>-	if (unlikely(block &gt;= (tmp_dev-&gt;size + tmp_dev-&gt;offset)</div><div class='del'>-		     || block &lt; tmp_dev-&gt;offset)) {</div><div class='add'>+	if (unlikely(bio-&gt;bi_sector &gt;= (tmp_dev-&gt;num_sectors +</div><div class='add'>+					tmp_dev-&gt;start_sector)</div><div class='add'>+		     || (bio-&gt;bi_sector &lt;</div><div class='add'>+			 tmp_dev-&gt;start_sector))) {</div><div class='ctx'> 		char b[BDEVNAME_SIZE];</div><div class='ctx'> </div><div class='del'>-		printk("linear_make_request: Block %llu out of bounds on "</div><div class='del'>-			"dev %s size %llu offset %llu\n",</div><div class='del'>-			(unsigned long long)block,</div><div class='add'>+		printk("linear_make_request: Sector %llu out of bounds on "</div><div class='add'>+			"dev %s: %llu sectors, offset %llu\n",</div><div class='add'>+			(unsigned long long)bio-&gt;bi_sector,</div><div class='ctx'> 			bdevname(tmp_dev-&gt;rdev-&gt;bdev, b),</div><div class='del'>-			(unsigned long long)tmp_dev-&gt;size,</div><div class='del'>-		        (unsigned long long)tmp_dev-&gt;offset);</div><div class='add'>+			(unsigned long long)tmp_dev-&gt;num_sectors,</div><div class='add'>+			(unsigned long long)tmp_dev-&gt;start_sector);</div><div class='ctx'> 		bio_io_error(bio);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (unlikely(bio-&gt;bi_sector + (bio-&gt;bi_size &gt;&gt; 9) &gt;</div><div class='del'>-		     (tmp_dev-&gt;offset + tmp_dev-&gt;size)&lt;&lt;1)) {</div><div class='add'>+		     tmp_dev-&gt;start_sector + tmp_dev-&gt;num_sectors)) {</div><div class='ctx'> 		/* This bio crosses a device boundary, so we have to</div><div class='ctx'> 		 * split it.</div><div class='ctx'> 		 */</div><div class='ctx'> 		struct bio_pair *bp;</div><div class='del'>-		bp = bio_split(bio, bio_split_pool,</div><div class='del'>-			       ((tmp_dev-&gt;offset + tmp_dev-&gt;size)&lt;&lt;1) - bio-&gt;bi_sector);</div><div class='add'>+</div><div class='add'>+		bp = bio_split(bio,</div><div class='add'>+			       tmp_dev-&gt;start_sector + tmp_dev-&gt;num_sectors</div><div class='add'>+			       - bio-&gt;bi_sector);</div><div class='add'>+</div><div class='ctx'> 		if (linear_make_request(q, &amp;bp-&gt;bio1))</div><div class='ctx'> 			generic_make_request(&amp;bp-&gt;bio1);</div><div class='ctx'> 		if (linear_make_request(q, &amp;bp-&gt;bio2))</div><div class='hunk'>@@ -360,7 +357,8 @@ static int linear_make_request (struct request_queue *q, struct bio *bio)</div><div class='ctx'> 	}</div><div class='ctx'> 		    </div><div class='ctx'> 	bio-&gt;bi_bdev = tmp_dev-&gt;rdev-&gt;bdev;</div><div class='del'>-	bio-&gt;bi_sector = bio-&gt;bi_sector - (tmp_dev-&gt;offset &lt;&lt; 1) + tmp_dev-&gt;rdev-&gt;data_offset;</div><div class='add'>+	bio-&gt;bi_sector = bio-&gt;bi_sector - tmp_dev-&gt;start_sector</div><div class='add'>+		+ tmp_dev-&gt;rdev-&gt;data_offset;</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='hunk'>@@ -368,29 +366,6 @@ static int linear_make_request (struct request_queue *q, struct bio *bio)</div><div class='ctx'> static void linear_status (struct seq_file *seq, mddev_t *mddev)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='del'>-#undef MD_DEBUG</div><div class='del'>-#ifdef MD_DEBUG</div><div class='del'>-	int j;</div><div class='del'>-	linear_conf_t *conf = mddev_to_conf(mddev);</div><div class='del'>-	sector_t s = 0;</div><div class='del'>-  </div><div class='del'>-	seq_printf(seq, "      ");</div><div class='del'>-	for (j = 0; j &lt; mddev-&gt;raid_disks; j++)</div><div class='del'>-	{</div><div class='del'>-		char b[BDEVNAME_SIZE];</div><div class='del'>-		s += conf-&gt;smallest_size;</div><div class='del'>-		seq_printf(seq, "[%s",</div><div class='del'>-			   bdevname(conf-&gt;hash_table[j][0].rdev-&gt;bdev,b));</div><div class='del'>-</div><div class='del'>-		while (s &gt; conf-&gt;hash_table[j][0].offset +</div><div class='del'>-		           conf-&gt;hash_table[j][0].size)</div><div class='del'>-			seq_printf(seq, "/%s] ",</div><div class='del'>-				   bdevname(conf-&gt;hash_table[j][1].rdev-&gt;bdev,b));</div><div class='del'>-		else</div><div class='del'>-			seq_printf(seq, "] ");</div><div class='del'>-	}</div><div class='del'>-	seq_printf(seq, "\n");</div><div class='del'>-#endif</div><div class='ctx'> 	seq_printf(seq, " %dk rounding", mddev-&gt;chunk_size/1024);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/md/md.c b/drivers/md/md.c<br/>index deeac4b44173..aaa3d465de4e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/md/md.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/md/md.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/md/md.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/md/md.c</a></div><div class='hunk'>@@ -32,31 +32,21 @@</div><div class='ctx'>    Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/kthread.h&gt;</div><div class='del'>-#include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;linux/raid/md.h&gt;</div><div class='ctx'> #include &lt;linux/raid/bitmap.h&gt;</div><div class='ctx'> #include &lt;linux/sysctl.h&gt;</div><div class='ctx'> #include &lt;linux/buffer_head.h&gt; /* for invalidate_bdev */</div><div class='ctx'> #include &lt;linux/poll.h&gt;</div><div class='del'>-#include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/ctype.h&gt;</div><div class='del'>-#include &lt;linux/freezer.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-</div><div class='add'>+#include &lt;linux/hdreg.h&gt;</div><div class='add'>+#include &lt;linux/proc_fs.h&gt;</div><div class='add'>+#include &lt;linux/random.h&gt;</div><div class='add'>+#include &lt;linux/reboot.h&gt;</div><div class='ctx'> #include &lt;linux/file.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_KMOD</div><div class='del'>-#include &lt;linux/kmod.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define MAJOR_NR MD_MAJOR</div><div class='del'>-#define MD_DRIVER</div><div class='ctx'> </div><div class='ctx'> /* 63 partitions with the alternate major number (mdp) */</div><div class='ctx'> #define MdpMinorShift 6</div><div class='hunk'>@@ -66,7 +56,7 @@</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #ifndef MODULE</div><div class='del'>-static void autostart_arrays (int part);</div><div class='add'>+static void autostart_arrays(int part);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static LIST_HEAD(pers_list);</div><div class='hunk'>@@ -212,7 +202,7 @@ static DEFINE_SPINLOCK(all_mddevs_lock);</div><div class='ctx'> 		)</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int md_fail_request (struct request_queue *q, struct bio *bio)</div><div class='add'>+static int md_fail_request(struct request_queue *q, struct bio *bio)</div><div class='ctx'> {</div><div class='ctx'> 	bio_io_error(bio);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1464,10 +1454,7 @@ static int bind_rdev_to_array(mdk_rdev_t * rdev, mddev_t * mddev)</div><div class='ctx'> 	if ((err = kobject_add(&amp;rdev-&gt;kobj, &amp;mddev-&gt;kobj, "dev-%s", b)))</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='del'>-	if (rdev-&gt;bdev-&gt;bd_part)</div><div class='del'>-		ko = &amp;rdev-&gt;bdev-&gt;bd_part-&gt;dev.kobj;</div><div class='del'>-	else</div><div class='del'>-		ko = &amp;rdev-&gt;bdev-&gt;bd_disk-&gt;dev.kobj;</div><div class='add'>+	ko = &amp;part_to_dev(rdev-&gt;bdev-&gt;bd_part)-&gt;kobj;</div><div class='ctx'> 	if ((err = sysfs_create_link(&amp;rdev-&gt;kobj, ko, "block"))) {</div><div class='ctx'> 		kobject_del(&amp;rdev-&gt;kobj);</div><div class='ctx'> 		goto fail;</div><div class='hunk'>@@ -2109,8 +2096,6 @@ rdev_size_store(mdk_rdev_t *rdev, const char *buf, size_t len)</div><div class='ctx'> </div><div class='ctx'> 	if (strict_strtoull(buf, 10, &amp;size) &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	if (size &lt; my_mddev-&gt;size)</div><div class='del'>-		return -EINVAL;</div><div class='ctx'> 	if (my_mddev-&gt;pers &amp;&amp; rdev-&gt;raid_disk &gt;= 0) {</div><div class='ctx'> 		if (my_mddev-&gt;persistent) {</div><div class='ctx'> 			size = super_types[my_mddev-&gt;major_version].</div><div class='hunk'>@@ -2121,9 +2106,9 @@ rdev_size_store(mdk_rdev_t *rdev, const char *buf, size_t len)</div><div class='ctx'> 			size = (rdev-&gt;bdev-&gt;bd_inode-&gt;i_size &gt;&gt; 10);</div><div class='ctx'> 			size -= rdev-&gt;data_offset/2;</div><div class='ctx'> 		}</div><div class='del'>-		if (size &lt; my_mddev-&gt;size)</div><div class='del'>-			return -EINVAL; /* component must fit device */</div><div class='ctx'> 	}</div><div class='add'>+	if (size &lt; my_mddev-&gt;size)</div><div class='add'>+		return -EINVAL; /* component must fit device */</div><div class='ctx'> </div><div class='ctx'> 	rdev-&gt;size = size;</div><div class='ctx'> 	if (size &gt; oldsize &amp;&amp; my_mddev-&gt;external) {</div><div class='hunk'>@@ -2409,12 +2394,11 @@ safe_delay_store(mddev_t *mddev, const char *cbuf, size_t len)</div><div class='ctx'> 	int i;</div><div class='ctx'> 	unsigned long msec;</div><div class='ctx'> 	char buf[30];</div><div class='del'>-	char *e;</div><div class='add'>+</div><div class='ctx'> 	/* remove a period, and count digits after it */</div><div class='ctx'> 	if (len &gt;= sizeof(buf))</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	strlcpy(buf, cbuf, len);</div><div class='del'>-	buf[len] = 0;</div><div class='add'>+	strlcpy(buf, cbuf, sizeof(buf));</div><div class='ctx'> 	for (i=0; i&lt;len; i++) {</div><div class='ctx'> 		if (dot) {</div><div class='ctx'> 			if (isdigit(buf[i])) {</div><div class='hunk'>@@ -2427,8 +2411,7 @@ safe_delay_store(mddev_t *mddev, const char *cbuf, size_t len)</div><div class='ctx'> 			buf[i] = 0;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	msec = simple_strtoul(buf, &amp;e, 10);</div><div class='del'>-	if (e == buf || (*e &amp;&amp; *e != '\n'))</div><div class='add'>+	if (strict_strtoul(buf, 10, &amp;msec) &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	msec = (msec * 1000) / scale;</div><div class='ctx'> 	if (msec == 0)</div><div class='hunk'>@@ -2730,9 +2713,9 @@ array_state_store(mddev_t *mddev, const char *buf, size_t len)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case read_auto:</div><div class='ctx'> 		if (mddev-&gt;pers) {</div><div class='del'>-			if (mddev-&gt;ro != 1)</div><div class='add'>+			if (mddev-&gt;ro == 0)</div><div class='ctx'> 				err = do_md_stop(mddev, 1, 0);</div><div class='del'>-			else</div><div class='add'>+			else if (mddev-&gt;ro == 1)</div><div class='ctx'> 				err = restart_array(mddev);</div><div class='ctx'> 			if (err == 0) {</div><div class='ctx'> 				mddev-&gt;ro = 2;</div><div class='hunk'>@@ -2948,7 +2931,13 @@ metadata_store(mddev_t *mddev, const char *buf, size_t len)</div><div class='ctx'> {</div><div class='ctx'> 	int major, minor;</div><div class='ctx'> 	char *e;</div><div class='del'>-	if (!list_empty(&amp;mddev-&gt;disks))</div><div class='add'>+	/* Changing the details of 'external' metadata is</div><div class='add'>+	 * always permitted.  Otherwise there must be</div><div class='add'>+	 * no devices attached to the array.</div><div class='add'>+	 */</div><div class='add'>+	if (mddev-&gt;external &amp;&amp; strncmp(buf, "external:", 9) == 0)</div><div class='add'>+		;</div><div class='add'>+	else if (!list_empty(&amp;mddev-&gt;disks))</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='ctx'> 	if (cmd_match(buf, "none")) {</div><div class='hunk'>@@ -3470,8 +3459,8 @@ static struct kobject *md_probe(dev_t dev, int *part, void *data)</div><div class='ctx'> 	disk-&gt;queue = mddev-&gt;queue;</div><div class='ctx'> 	add_disk(disk);</div><div class='ctx'> 	mddev-&gt;gendisk = disk;</div><div class='del'>-	error = kobject_init_and_add(&amp;mddev-&gt;kobj, &amp;md_ktype, &amp;disk-&gt;dev.kobj,</div><div class='del'>-				     "%s", "md");</div><div class='add'>+	error = kobject_init_and_add(&amp;mddev-&gt;kobj, &amp;md_ktype,</div><div class='add'>+				     &amp;disk_to_dev(disk)-&gt;kobj, "%s", "md");</div><div class='ctx'> 	mutex_unlock(&amp;disks_mutex);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		printk(KERN_WARNING "md: cannot register %s/md - name in use\n",</div><div class='hunk'>@@ -3530,17 +3519,12 @@ static int do_md_run(mddev_t * mddev)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> 		/*</div><div class='del'>-		 * chunk-size has to be a power of 2 and multiples of PAGE_SIZE</div><div class='add'>+		 * chunk-size has to be a power of 2</div><div class='ctx'> 		 */</div><div class='ctx'> 		if ( (1 &lt;&lt; ffz(~chunk_size)) != chunk_size) {</div><div class='ctx'> 			printk(KERN_ERR "chunk_size of %d not valid\n", chunk_size);</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='del'>-		if (chunk_size &lt; PAGE_SIZE) {</div><div class='del'>-			printk(KERN_ERR "too small chunk_size: %d &lt; %ld\n",</div><div class='del'>-				chunk_size, PAGE_SIZE);</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='ctx'> </div><div class='ctx'> 		/* devices must have minimum size of one chunk */</div><div class='ctx'> 		rdev_for_each(rdev, tmp, mddev) {</div><div class='hunk'>@@ -3558,12 +3542,10 @@ static int do_md_run(mddev_t * mddev)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_KMOD</div><div class='ctx'> 	if (mddev-&gt;level != LEVEL_NONE)</div><div class='ctx'> 		request_module("md-level-%d", mddev-&gt;level);</div><div class='ctx'> 	else if (mddev-&gt;clevel[0])</div><div class='ctx'> 		request_module("md-%s", mddev-&gt;clevel);</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Drop all container device buffers, from now on</div><div class='hunk'>@@ -3761,7 +3743,7 @@ static int do_md_run(mddev_t * mddev)</div><div class='ctx'> 	sysfs_notify(&amp;mddev-&gt;kobj, NULL, "array_state");</div><div class='ctx'> 	sysfs_notify(&amp;mddev-&gt;kobj, NULL, "sync_action");</div><div class='ctx'> 	sysfs_notify(&amp;mddev-&gt;kobj, NULL, "degraded");</div><div class='del'>-	kobject_uevent(&amp;mddev-&gt;gendisk-&gt;dev.kobj, KOBJ_CHANGE);</div><div class='add'>+	kobject_uevent(&amp;disk_to_dev(mddev-&gt;gendisk)-&gt;kobj, KOBJ_CHANGE);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3974,10 +3956,10 @@ static void autorun_array(mddev_t *mddev)</div><div class='ctx'> 	}</div><div class='ctx'> 	printk("\n");</div><div class='ctx'> </div><div class='del'>-	err = do_md_run (mddev);</div><div class='add'>+	err = do_md_run(mddev);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		printk(KERN_WARNING "md: do_md_run() returned %d\n", err);</div><div class='del'>-		do_md_stop (mddev, 0, 0);</div><div class='add'>+		do_md_stop(mddev, 0, 0);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4336,7 +4318,7 @@ static int add_new_disk(mddev_t * mddev, mdu_disk_info_t *info)</div><div class='ctx'> </div><div class='ctx'> 	if (!(info-&gt;state &amp; (1&lt;&lt;MD_DISK_FAULTY))) {</div><div class='ctx'> 		int err;</div><div class='del'>-		rdev = md_import_device (dev, -1, 0);</div><div class='add'>+		rdev = md_import_device(dev, -1, 0);</div><div class='ctx'> 		if (IS_ERR(rdev)) {</div><div class='ctx'> 			printk(KERN_WARNING </div><div class='ctx'> 				"md: error, md_import_device() returned %ld\n",</div><div class='hunk'>@@ -4418,7 +4400,7 @@ static int hot_add_disk(mddev_t * mddev, dev_t dev)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rdev = md_import_device (dev, -1, 0);</div><div class='add'>+	rdev = md_import_device(dev, -1, 0);</div><div class='ctx'> 	if (IS_ERR(rdev)) {</div><div class='ctx'> 		printk(KERN_WARNING </div><div class='ctx'> 			"md: error, md_import_device() returned %ld\n",</div><div class='hunk'>@@ -4937,11 +4919,11 @@ static int md_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 			goto done_unlock;</div><div class='ctx'> </div><div class='ctx'> 		case STOP_ARRAY:</div><div class='del'>-			err = do_md_stop (mddev, 0, 1);</div><div class='add'>+			err = do_md_stop(mddev, 0, 1);</div><div class='ctx'> 			goto done_unlock;</div><div class='ctx'> </div><div class='ctx'> 		case STOP_ARRAY_RO:</div><div class='del'>-			err = do_md_stop (mddev, 1, 1);</div><div class='add'>+			err = do_md_stop(mddev, 1, 1);</div><div class='ctx'> 			goto done_unlock;</div><div class='ctx'> </div><div class='ctx'> 	}</div><div class='hunk'>@@ -4990,7 +4972,7 @@ static int md_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 			goto done_unlock;</div><div class='ctx'> </div><div class='ctx'> 		case RUN_ARRAY:</div><div class='del'>-			err = do_md_run (mddev);</div><div class='add'>+			err = do_md_run(mddev);</div><div class='ctx'> 			goto done_unlock;</div><div class='ctx'> </div><div class='ctx'> 		case SET_BITMAP_FILE:</div><div class='hunk'>@@ -5428,11 +5410,11 @@ static int md_seq_show(struct seq_file *seq, void *v)</div><div class='ctx'> 			seq_printf(seq, " super non-persistent");</div><div class='ctx'> </div><div class='ctx'> 		if (mddev-&gt;pers) {</div><div class='del'>-			mddev-&gt;pers-&gt;status (seq, mddev);</div><div class='add'>+			mddev-&gt;pers-&gt;status(seq, mddev);</div><div class='ctx'> 	 		seq_printf(seq, "\n      ");</div><div class='ctx'> 			if (mddev-&gt;pers-&gt;sync_request) {</div><div class='ctx'> 				if (mddev-&gt;curr_resync &gt; 2) {</div><div class='del'>-					status_resync (seq, mddev);</div><div class='add'>+					status_resync(seq, mddev);</div><div class='ctx'> 					seq_printf(seq, "\n      ");</div><div class='ctx'> 				} else if (mddev-&gt;curr_resync == 1 || mddev-&gt;curr_resync == 2)</div><div class='ctx'> 					seq_printf(seq, "\tresync=DELAYED\n      ");</div><div class='hunk'>@@ -5549,8 +5531,8 @@ static int is_mddev_idle(mddev_t *mddev)</div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	rdev_for_each_rcu(rdev, mddev) {</div><div class='ctx'> 		struct gendisk *disk = rdev-&gt;bdev-&gt;bd_contains-&gt;bd_disk;</div><div class='del'>-		curr_events = disk_stat_read(disk, sectors[0]) + </div><div class='del'>-				disk_stat_read(disk, sectors[1]) - </div><div class='add'>+		curr_events = part_stat_read(&amp;disk-&gt;part0, sectors[0]) +</div><div class='add'>+				part_stat_read(&amp;disk-&gt;part0, sectors[1]) -</div><div class='ctx'> 				atomic_read(&amp;disk-&gt;sync_io);</div><div class='ctx'> 		/* sync IO will cause sync_io to increase before the disk_stats</div><div class='ctx'> 		 * as sync_io is counted when a request starts, and</div><div class='hunk'>@@ -6263,7 +6245,7 @@ static int md_notify_reboot(struct notifier_block *this,</div><div class='ctx'> 				 * appears to still be in use.  Hence</div><div class='ctx'> 				 * the '100'.</div><div class='ctx'> 				 */</div><div class='del'>-				do_md_stop (mddev, 1, 100);</div><div class='add'>+				do_md_stop(mddev, 1, 100);</div><div class='ctx'> 				mddev_unlock(mddev);</div><div class='ctx'> 			}</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -6307,7 +6289,7 @@ static int __init md_init(void)</div><div class='ctx'> 	raid_table_header = register_sysctl_table(raid_root_table);</div><div class='ctx'> </div><div class='ctx'> 	md_geninit();</div><div class='del'>-	return (0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/drivers/md/multipath.c b/drivers/md/multipath.c<br/>index c4779ccba1c3..d4ac47d11279 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/md/multipath.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/md/multipath.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/md/multipath.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/md/multipath.c</a></div><div class='hunk'>@@ -19,16 +19,7 @@</div><div class='ctx'>  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/raid/multipath.h&gt;</div><div class='del'>-#include &lt;linux/buffer_head.h&gt;</div><div class='del'>-#include &lt;asm/atomic.h&gt;</div><div class='del'>-</div><div class='del'>-#define MAJOR_NR MD_MAJOR</div><div class='del'>-#define MD_DRIVER</div><div class='del'>-#define MD_PERSONALITY</div><div class='ctx'> </div><div class='ctx'> #define MAX_WORK_PER_DISK 128</div><div class='ctx'> </div><div class='hunk'>@@ -147,6 +138,7 @@ static int multipath_make_request (struct request_queue *q, struct bio * bio)</div><div class='ctx'> 	struct multipath_bh * mp_bh;</div><div class='ctx'> 	struct multipath_info *multipath;</div><div class='ctx'> 	const int rw = bio_data_dir(bio);</div><div class='add'>+	int cpu;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(bio_barrier(bio))) {</div><div class='ctx'> 		bio_endio(bio, -EOPNOTSUPP);</div><div class='hunk'>@@ -158,8 +150,11 @@ static int multipath_make_request (struct request_queue *q, struct bio * bio)</div><div class='ctx'> 	mp_bh-&gt;master_bio = bio;</div><div class='ctx'> 	mp_bh-&gt;mddev = mddev;</div><div class='ctx'> </div><div class='del'>-	disk_stat_inc(mddev-&gt;gendisk, ios[rw]);</div><div class='del'>-	disk_stat_add(mddev-&gt;gendisk, sectors[rw], bio_sectors(bio));</div><div class='add'>+	cpu = part_stat_lock();</div><div class='add'>+	part_stat_inc(cpu, &amp;mddev-&gt;gendisk-&gt;part0, ios[rw]);</div><div class='add'>+	part_stat_add(cpu, &amp;mddev-&gt;gendisk-&gt;part0, sectors[rw],</div><div class='add'>+		      bio_sectors(bio));</div><div class='add'>+	part_stat_unlock();</div><div class='ctx'> </div><div class='ctx'> 	mp_bh-&gt;path = multipath_map(conf);</div><div class='ctx'> 	if (mp_bh-&gt;path &lt; 0) {</div><div class='hunk'>@@ -172,7 +167,7 @@ static int multipath_make_request (struct request_queue *q, struct bio * bio)</div><div class='ctx'> 	mp_bh-&gt;bio = *bio;</div><div class='ctx'> 	mp_bh-&gt;bio.bi_sector += multipath-&gt;rdev-&gt;data_offset;</div><div class='ctx'> 	mp_bh-&gt;bio.bi_bdev = multipath-&gt;rdev-&gt;bdev;</div><div class='del'>-	mp_bh-&gt;bio.bi_rw |= (1 &lt;&lt; BIO_RW_FAILFAST);</div><div class='add'>+	mp_bh-&gt;bio.bi_rw |= (1 &lt;&lt; BIO_RW_FAILFAST_TRANSPORT);</div><div class='ctx'> 	mp_bh-&gt;bio.bi_end_io = multipath_end_request;</div><div class='ctx'> 	mp_bh-&gt;bio.bi_private = mp_bh;</div><div class='ctx'> 	generic_make_request(&amp;mp_bh-&gt;bio);</div><div class='hunk'>@@ -398,7 +393,7 @@ static void multipathd (mddev_t *mddev)</div><div class='ctx'> 			*bio = *(mp_bh-&gt;master_bio);</div><div class='ctx'> 			bio-&gt;bi_sector += conf-&gt;multipaths[mp_bh-&gt;path].rdev-&gt;data_offset;</div><div class='ctx'> 			bio-&gt;bi_bdev = conf-&gt;multipaths[mp_bh-&gt;path].rdev-&gt;bdev;</div><div class='del'>-			bio-&gt;bi_rw |= (1 &lt;&lt; BIO_RW_FAILFAST);</div><div class='add'>+			bio-&gt;bi_rw |= (1 &lt;&lt; BIO_RW_FAILFAST_TRANSPORT);</div><div class='ctx'> 			bio-&gt;bi_end_io = multipath_end_request;</div><div class='ctx'> 			bio-&gt;bi_private = mp_bh;</div><div class='ctx'> 			generic_make_request(bio);</div><div class='head'>diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c<br/>index 183610635661..8ac6488ad0dc 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/md/raid0.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/md/raid0.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/md/raid0.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/md/raid0.c</a></div><div class='hunk'>@@ -18,13 +18,8 @@</div><div class='ctx'>    Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  </div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/raid/raid0.h&gt;</div><div class='ctx'> </div><div class='del'>-#define MAJOR_NR MD_MAJOR</div><div class='del'>-#define MD_DRIVER</div><div class='del'>-#define MD_PERSONALITY</div><div class='del'>-</div><div class='ctx'> static void raid0_unplug(struct request_queue *q)</div><div class='ctx'> {</div><div class='ctx'> 	mddev_t *mddev = q-&gt;queuedata;</div><div class='hunk'>@@ -399,14 +394,18 @@ static int raid0_make_request (struct request_queue *q, struct bio *bio)</div><div class='ctx'> 	sector_t chunk;</div><div class='ctx'> 	sector_t block, rsect;</div><div class='ctx'> 	const int rw = bio_data_dir(bio);</div><div class='add'>+	int cpu;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(bio_barrier(bio))) {</div><div class='ctx'> 		bio_endio(bio, -EOPNOTSUPP);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	disk_stat_inc(mddev-&gt;gendisk, ios[rw]);</div><div class='del'>-	disk_stat_add(mddev-&gt;gendisk, sectors[rw], bio_sectors(bio));</div><div class='add'>+	cpu = part_stat_lock();</div><div class='add'>+	part_stat_inc(cpu, &amp;mddev-&gt;gendisk-&gt;part0, ios[rw]);</div><div class='add'>+	part_stat_add(cpu, &amp;mddev-&gt;gendisk-&gt;part0, sectors[rw],</div><div class='add'>+		      bio_sectors(bio));</div><div class='add'>+	part_stat_unlock();</div><div class='ctx'> </div><div class='ctx'> 	chunk_size = mddev-&gt;chunk_size &gt;&gt; 10;</div><div class='ctx'> 	chunk_sects = mddev-&gt;chunk_size &gt;&gt; 9;</div><div class='hunk'>@@ -423,7 +422,7 @@ static int raid0_make_request (struct request_queue *q, struct bio *bio)</div><div class='ctx'> 		/* This is a one page bio that upper layers</div><div class='ctx'> 		 * refuse to split for us, so we need to split it.</div><div class='ctx'> 		 */</div><div class='del'>-		bp = bio_split(bio, bio_split_pool, chunk_sects - (bio-&gt;bi_sector &amp; (chunk_sects - 1)) );</div><div class='add'>+		bp = bio_split(bio, chunk_sects - (bio-&gt;bi_sector &amp; (chunk_sects - 1)));</div><div class='ctx'> 		if (raid0_make_request(q, &amp;bp-&gt;bio1))</div><div class='ctx'> 			generic_make_request(&amp;bp-&gt;bio1);</div><div class='ctx'> 		if (raid0_make_request(q, &amp;bp-&gt;bio2))</div><div class='head'>diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c<br/>index 03a5ab705c20..9c788e2489b1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/md/raid1.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/md/raid1.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/md/raid1.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/md/raid1.c</a></div><div class='hunk'>@@ -32,6 +32,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "dm-bio-list.h"</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/raid/raid1.h&gt;</div><div class='ctx'> #include &lt;linux/raid/bitmap.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -779,7 +780,7 @@ static int make_request(struct request_queue *q, struct bio * bio)</div><div class='ctx'> 	struct page **behind_pages = NULL;</div><div class='ctx'> 	const int rw = bio_data_dir(bio);</div><div class='ctx'> 	const int do_sync = bio_sync(bio);</div><div class='del'>-	int do_barriers;</div><div class='add'>+	int cpu, do_barriers;</div><div class='ctx'> 	mdk_rdev_t *blocked_rdev;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -804,8 +805,11 @@ static int make_request(struct request_queue *q, struct bio * bio)</div><div class='ctx'> </div><div class='ctx'> 	bitmap = mddev-&gt;bitmap;</div><div class='ctx'> </div><div class='del'>-	disk_stat_inc(mddev-&gt;gendisk, ios[rw]);</div><div class='del'>-	disk_stat_add(mddev-&gt;gendisk, sectors[rw], bio_sectors(bio));</div><div class='add'>+	cpu = part_stat_lock();</div><div class='add'>+	part_stat_inc(cpu, &amp;mddev-&gt;gendisk-&gt;part0, ios[rw]);</div><div class='add'>+	part_stat_add(cpu, &amp;mddev-&gt;gendisk-&gt;part0, sectors[rw],</div><div class='add'>+		      bio_sectors(bio));</div><div class='add'>+	part_stat_unlock();</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * make_request() can abort the operation when READA is being</div><div class='hunk'>@@ -1302,9 +1306,6 @@ static void sync_request_write(mddev_t *mddev, r1bio_t *r1_bio)</div><div class='ctx'> 					sbio-&gt;bi_size = r1_bio-&gt;sectors &lt;&lt; 9;</div><div class='ctx'> 					sbio-&gt;bi_idx = 0;</div><div class='ctx'> 					sbio-&gt;bi_phys_segments = 0;</div><div class='del'>-					sbio-&gt;bi_hw_segments = 0;</div><div class='del'>-					sbio-&gt;bi_hw_front_size = 0;</div><div class='del'>-					sbio-&gt;bi_hw_back_size = 0;</div><div class='ctx'> 					sbio-&gt;bi_flags &amp;= ~(BIO_POOL_MASK - 1);</div><div class='ctx'> 					sbio-&gt;bi_flags |= 1 &lt;&lt; BIO_UPTODATE;</div><div class='ctx'> 					sbio-&gt;bi_next = NULL;</div><div class='hunk'>@@ -1790,7 +1791,6 @@ static sector_t sync_request(mddev_t *mddev, sector_t sector_nr, int *skipped, i</div><div class='ctx'> 		bio-&gt;bi_vcnt = 0;</div><div class='ctx'> 		bio-&gt;bi_idx = 0;</div><div class='ctx'> 		bio-&gt;bi_phys_segments = 0;</div><div class='del'>-		bio-&gt;bi_hw_segments = 0;</div><div class='ctx'> 		bio-&gt;bi_size = 0;</div><div class='ctx'> 		bio-&gt;bi_end_io = NULL;</div><div class='ctx'> 		bio-&gt;bi_private = NULL;</div><div class='head'>diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c<br/>index e34cd0e62473..da5129a24b18 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/md/raid10.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/md/raid10.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/md/raid10.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/md/raid10.c</a></div><div class='hunk'>@@ -19,6 +19,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "dm-bio-list.h"</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/raid/raid10.h&gt;</div><div class='ctx'> #include &lt;linux/raid/bitmap.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -789,6 +790,7 @@ static int make_request(struct request_queue *q, struct bio * bio)</div><div class='ctx'> 	mirror_info_t *mirror;</div><div class='ctx'> 	r10bio_t *r10_bio;</div><div class='ctx'> 	struct bio *read_bio;</div><div class='add'>+	int cpu;</div><div class='ctx'> 	int i;</div><div class='ctx'> 	int chunk_sects = conf-&gt;chunk_mask + 1;</div><div class='ctx'> 	const int rw = bio_data_dir(bio);</div><div class='hunk'>@@ -816,7 +818,7 @@ static int make_request(struct request_queue *q, struct bio * bio)</div><div class='ctx'> 		/* This is a one page bio that upper layers</div><div class='ctx'> 		 * refuse to split for us, so we need to split it.</div><div class='ctx'> 		 */</div><div class='del'>-		bp = bio_split(bio, bio_split_pool,</div><div class='add'>+		bp = bio_split(bio,</div><div class='ctx'> 			       chunk_sects - (bio-&gt;bi_sector &amp; (chunk_sects - 1)) );</div><div class='ctx'> 		if (make_request(q, &amp;bp-&gt;bio1))</div><div class='ctx'> 			generic_make_request(&amp;bp-&gt;bio1);</div><div class='hunk'>@@ -843,8 +845,11 @@ static int make_request(struct request_queue *q, struct bio * bio)</div><div class='ctx'> 	 */</div><div class='ctx'> 	wait_barrier(conf);</div><div class='ctx'> </div><div class='del'>-	disk_stat_inc(mddev-&gt;gendisk, ios[rw]);</div><div class='del'>-	disk_stat_add(mddev-&gt;gendisk, sectors[rw], bio_sectors(bio));</div><div class='add'>+	cpu = part_stat_lock();</div><div class='add'>+	part_stat_inc(cpu, &amp;mddev-&gt;gendisk-&gt;part0, ios[rw]);</div><div class='add'>+	part_stat_add(cpu, &amp;mddev-&gt;gendisk-&gt;part0, sectors[rw],</div><div class='add'>+		      bio_sectors(bio));</div><div class='add'>+	part_stat_unlock();</div><div class='ctx'> </div><div class='ctx'> 	r10_bio = mempool_alloc(conf-&gt;r10bio_pool, GFP_NOIO);</div><div class='ctx'> </div><div class='hunk'>@@ -1345,9 +1350,6 @@ static void sync_request_write(mddev_t *mddev, r10bio_t *r10_bio)</div><div class='ctx'> 		tbio-&gt;bi_size = r10_bio-&gt;sectors &lt;&lt; 9;</div><div class='ctx'> 		tbio-&gt;bi_idx = 0;</div><div class='ctx'> 		tbio-&gt;bi_phys_segments = 0;</div><div class='del'>-		tbio-&gt;bi_hw_segments = 0;</div><div class='del'>-		tbio-&gt;bi_hw_front_size = 0;</div><div class='del'>-		tbio-&gt;bi_hw_back_size = 0;</div><div class='ctx'> 		tbio-&gt;bi_flags &amp;= ~(BIO_POOL_MASK - 1);</div><div class='ctx'> 		tbio-&gt;bi_flags |= 1 &lt;&lt; BIO_UPTODATE;</div><div class='ctx'> 		tbio-&gt;bi_next = NULL;</div><div class='hunk'>@@ -1947,7 +1949,6 @@ static sector_t sync_request(mddev_t *mddev, sector_t sector_nr, int *skipped, i</div><div class='ctx'> 		bio-&gt;bi_vcnt = 0;</div><div class='ctx'> 		bio-&gt;bi_idx = 0;</div><div class='ctx'> 		bio-&gt;bi_phys_segments = 0;</div><div class='del'>-		bio-&gt;bi_hw_segments = 0;</div><div class='ctx'> 		bio-&gt;bi_size = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2028,8 +2029,9 @@ static int run(mddev_t *mddev)</div><div class='ctx'> 	int nc, fc, fo;</div><div class='ctx'> 	sector_t stride, size;</div><div class='ctx'> </div><div class='del'>-	if (mddev-&gt;chunk_size == 0) {</div><div class='del'>-		printk(KERN_ERR "md/raid10: non-zero chunk size required.\n");</div><div class='add'>+	if (mddev-&gt;chunk_size &lt; PAGE_SIZE) {</div><div class='add'>+		printk(KERN_ERR "md/raid10: chunk size must be "</div><div class='add'>+		       "at least PAGE_SIZE(%ld).\n", PAGE_SIZE);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c<br/>index 224de022e7c5..a36a7435edf5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/md/raid5.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/md/raid5.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/md/raid5.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/md/raid5.c</a></div><div class='hunk'>@@ -43,12 +43,7 @@</div><div class='ctx'>  * miss any bits.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/highmem.h&gt;</div><div class='del'>-#include &lt;linux/bitops.h&gt;</div><div class='ctx'> #include &lt;linux/kthread.h&gt;</div><div class='del'>-#include &lt;asm/atomic.h&gt;</div><div class='ctx'> #include "raid6.h"</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/raid/bitmap.h&gt;</div><div class='hunk'>@@ -101,6 +96,40 @@</div><div class='ctx'> const char raid6_empty_zero_page[PAGE_SIZE] __attribute__((aligned(256)));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * We maintain a biased count of active stripes in the bottom 16 bits of</div><div class='add'>+ * bi_phys_segments, and a count of processed stripes in the upper 16 bits</div><div class='add'>+ */</div><div class='add'>+static inline int raid5_bi_phys_segments(struct bio *bio)</div><div class='add'>+{</div><div class='add'>+	return bio-&gt;bi_phys_segments &amp; 0xffff;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int raid5_bi_hw_segments(struct bio *bio)</div><div class='add'>+{</div><div class='add'>+	return (bio-&gt;bi_phys_segments &gt;&gt; 16) &amp; 0xffff;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int raid5_dec_bi_phys_segments(struct bio *bio)</div><div class='add'>+{</div><div class='add'>+	--bio-&gt;bi_phys_segments;</div><div class='add'>+	return raid5_bi_phys_segments(bio);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int raid5_dec_bi_hw_segments(struct bio *bio)</div><div class='add'>+{</div><div class='add'>+	unsigned short val = raid5_bi_hw_segments(bio);</div><div class='add'>+</div><div class='add'>+	--val;</div><div class='add'>+	bio-&gt;bi_phys_segments = (val &lt;&lt; 16) | raid5_bi_phys_segments(bio);</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void raid5_set_bi_hw_segments(struct bio *bio, unsigned int cnt)</div><div class='add'>+{</div><div class='add'>+	bio-&gt;bi_phys_segments = raid5_bi_phys_segments(bio) || (cnt &lt;&lt; 16);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline int raid6_next_disk(int disk, int raid_disks)</div><div class='ctx'> {</div><div class='ctx'> 	disk++;</div><div class='hunk'>@@ -241,7 +270,7 @@ static int grow_buffers(struct stripe_head *sh, int num)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void raid5_build_block (struct stripe_head *sh, int i);</div><div class='add'>+static void raid5_build_block(struct stripe_head *sh, int i);</div><div class='ctx'> </div><div class='ctx'> static void init_stripe(struct stripe_head *sh, sector_t sector, int pd_idx, int disks)</div><div class='ctx'> {</div><div class='hunk'>@@ -507,7 +536,7 @@ static void ops_complete_biofill(void *stripe_head_ref)</div><div class='ctx'> 			while (rbi &amp;&amp; rbi-&gt;bi_sector &lt;</div><div class='ctx'> 				dev-&gt;sector + STRIPE_SECTORS) {</div><div class='ctx'> 				rbi2 = r5_next_bio(rbi, dev-&gt;sector);</div><div class='del'>-				if (--rbi-&gt;bi_phys_segments == 0) {</div><div class='add'>+				if (!raid5_dec_bi_phys_segments(rbi)) {</div><div class='ctx'> 					rbi-&gt;bi_next = return_bi;</div><div class='ctx'> 					return_bi = rbi;</div><div class='ctx'> 				}</div><div class='hunk'>@@ -1117,7 +1146,7 @@ static void raid5_end_read_request(struct bio * bi, int error)</div><div class='ctx'> 	release_stripe(sh);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void raid5_end_write_request (struct bio *bi, int error)</div><div class='add'>+static void raid5_end_write_request(struct bio *bi, int error)</div><div class='ctx'> {</div><div class='ctx'>  	struct stripe_head *sh = bi-&gt;bi_private;</div><div class='ctx'> 	raid5_conf_t *conf = sh-&gt;raid_conf;</div><div class='hunk'>@@ -1149,7 +1178,7 @@ static void raid5_end_write_request (struct bio *bi, int error)</div><div class='ctx'> </div><div class='ctx'> static sector_t compute_blocknr(struct stripe_head *sh, int i);</div><div class='ctx'> 	</div><div class='del'>-static void raid5_build_block (struct stripe_head *sh, int i)</div><div class='add'>+static void raid5_build_block(struct stripe_head *sh, int i)</div><div class='ctx'> {</div><div class='ctx'> 	struct r5dev *dev = &amp;sh-&gt;dev[i];</div><div class='ctx'> </div><div class='hunk'>@@ -1187,10 +1216,10 @@ static void error(mddev_t *mddev, mdk_rdev_t *rdev)</div><div class='ctx'> 			set_bit(MD_RECOVERY_INTR, &amp;mddev-&gt;recovery);</div><div class='ctx'> 		}</div><div class='ctx'> 		set_bit(Faulty, &amp;rdev-&gt;flags);</div><div class='del'>-		printk (KERN_ALERT</div><div class='del'>-			"raid5: Disk failure on %s, disabling device.\n"</div><div class='del'>-			"raid5: Operation continuing on %d devices.\n",</div><div class='del'>-			bdevname(rdev-&gt;bdev,b), conf-&gt;raid_disks - mddev-&gt;degraded);</div><div class='add'>+		printk(KERN_ALERT</div><div class='add'>+		       "raid5: Disk failure on %s, disabling device.\n"</div><div class='add'>+		       "raid5: Operation continuing on %d devices.\n",</div><div class='add'>+		       bdevname(rdev-&gt;bdev,b), conf-&gt;raid_disks - mddev-&gt;degraded);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1286,8 +1315,8 @@ static sector_t raid5_compute_sector(sector_t r_sector, unsigned int raid_disks,</div><div class='ctx'> 			*dd_idx = (*pd_idx + 2 + *dd_idx) % raid_disks;</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='del'>-			printk (KERN_CRIT "raid6: unsupported algorithm %d\n",</div><div class='del'>-				conf-&gt;algorithm);</div><div class='add'>+			printk(KERN_CRIT "raid6: unsupported algorithm %d\n",</div><div class='add'>+			       conf-&gt;algorithm);</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1362,8 +1391,8 @@ static sector_t compute_blocknr(struct stripe_head *sh, int i)</div><div class='ctx'> 			}</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='del'>-			printk (KERN_CRIT "raid6: unsupported algorithm %d\n",</div><div class='del'>-				conf-&gt;algorithm);</div><div class='add'>+			printk(KERN_CRIT "raid6: unsupported algorithm %d\n",</div><div class='add'>+			       conf-&gt;algorithm);</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1371,7 +1400,7 @@ static sector_t compute_blocknr(struct stripe_head *sh, int i)</div><div class='ctx'> 	chunk_number = stripe * data_disks + i;</div><div class='ctx'> 	r_sector = (sector_t)chunk_number * sectors_per_chunk + chunk_offset;</div><div class='ctx'> </div><div class='del'>-	check = raid5_compute_sector (r_sector, raid_disks, data_disks, &amp;dummy1, &amp;dummy2, conf);</div><div class='add'>+	check = raid5_compute_sector(r_sector, raid_disks, data_disks, &amp;dummy1, &amp;dummy2, conf);</div><div class='ctx'> 	if (check != sh-&gt;sector || dummy1 != dd_idx || dummy2 != sh-&gt;pd_idx) {</div><div class='ctx'> 		printk(KERN_ERR "compute_blocknr: map not correct\n");</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -1725,7 +1754,7 @@ static int add_stripe_bio(struct stripe_head *sh, struct bio *bi, int dd_idx, in</div><div class='ctx'> 	if (*bip)</div><div class='ctx'> 		bi-&gt;bi_next = *bip;</div><div class='ctx'> 	*bip = bi;</div><div class='del'>-	bi-&gt;bi_phys_segments ++;</div><div class='add'>+	bi-&gt;bi_phys_segments++;</div><div class='ctx'> 	spin_unlock_irq(&amp;conf-&gt;device_lock);</div><div class='ctx'> 	spin_unlock(&amp;sh-&gt;lock);</div><div class='ctx'> </div><div class='hunk'>@@ -1819,7 +1848,7 @@ handle_failed_stripe(raid5_conf_t *conf, struct stripe_head *sh,</div><div class='ctx'> 			sh-&gt;dev[i].sector + STRIPE_SECTORS) {</div><div class='ctx'> 			struct bio *nextbi = r5_next_bio(bi, sh-&gt;dev[i].sector);</div><div class='ctx'> 			clear_bit(BIO_UPTODATE, &amp;bi-&gt;bi_flags);</div><div class='del'>-			if (--bi-&gt;bi_phys_segments == 0) {</div><div class='add'>+			if (!raid5_dec_bi_phys_segments(bi)) {</div><div class='ctx'> 				md_write_end(conf-&gt;mddev);</div><div class='ctx'> 				bi-&gt;bi_next = *return_bi;</div><div class='ctx'> 				*return_bi = bi;</div><div class='hunk'>@@ -1834,7 +1863,7 @@ handle_failed_stripe(raid5_conf_t *conf, struct stripe_head *sh,</div><div class='ctx'> 		       sh-&gt;dev[i].sector + STRIPE_SECTORS) {</div><div class='ctx'> 			struct bio *bi2 = r5_next_bio(bi, sh-&gt;dev[i].sector);</div><div class='ctx'> 			clear_bit(BIO_UPTODATE, &amp;bi-&gt;bi_flags);</div><div class='del'>-			if (--bi-&gt;bi_phys_segments == 0) {</div><div class='add'>+			if (!raid5_dec_bi_phys_segments(bi)) {</div><div class='ctx'> 				md_write_end(conf-&gt;mddev);</div><div class='ctx'> 				bi-&gt;bi_next = *return_bi;</div><div class='ctx'> 				*return_bi = bi;</div><div class='hunk'>@@ -1858,7 +1887,7 @@ handle_failed_stripe(raid5_conf_t *conf, struct stripe_head *sh,</div><div class='ctx'> 				struct bio *nextbi =</div><div class='ctx'> 					r5_next_bio(bi, sh-&gt;dev[i].sector);</div><div class='ctx'> 				clear_bit(BIO_UPTODATE, &amp;bi-&gt;bi_flags);</div><div class='del'>-				if (--bi-&gt;bi_phys_segments == 0) {</div><div class='add'>+				if (!raid5_dec_bi_phys_segments(bi)) {</div><div class='ctx'> 					bi-&gt;bi_next = *return_bi;</div><div class='ctx'> 					*return_bi = bi;</div><div class='ctx'> 				}</div><div class='hunk'>@@ -2033,7 +2062,7 @@ static void handle_stripe_clean_event(raid5_conf_t *conf,</div><div class='ctx'> 				while (wbi &amp;&amp; wbi-&gt;bi_sector &lt;</div><div class='ctx'> 					dev-&gt;sector + STRIPE_SECTORS) {</div><div class='ctx'> 					wbi2 = r5_next_bio(wbi, dev-&gt;sector);</div><div class='del'>-					if (--wbi-&gt;bi_phys_segments == 0) {</div><div class='add'>+					if (!raid5_dec_bi_phys_segments(wbi)) {</div><div class='ctx'> 						md_write_end(conf-&gt;mddev);</div><div class='ctx'> 						wbi-&gt;bi_next = *return_bi;</div><div class='ctx'> 						*return_bi = wbi;</div><div class='hunk'>@@ -2814,7 +2843,7 @@ static bool handle_stripe6(struct stripe_head *sh, struct page *tmp_page)</div><div class='ctx'> 				copy_data(0, rbi, dev-&gt;page, dev-&gt;sector);</div><div class='ctx'> 				rbi2 = r5_next_bio(rbi, dev-&gt;sector);</div><div class='ctx'> 				spin_lock_irq(&amp;conf-&gt;device_lock);</div><div class='del'>-				if (--rbi-&gt;bi_phys_segments == 0) {</div><div class='add'>+				if (!raid5_dec_bi_phys_segments(rbi)) {</div><div class='ctx'> 					rbi-&gt;bi_next = return_bi;</div><div class='ctx'> 					return_bi = rbi;</div><div class='ctx'> 				}</div><div class='hunk'>@@ -3155,8 +3184,11 @@ static struct bio *remove_bio_from_retry(raid5_conf_t *conf)</div><div class='ctx'> 	if(bi) {</div><div class='ctx'> 		conf-&gt;retry_read_aligned_list = bi-&gt;bi_next;</div><div class='ctx'> 		bi-&gt;bi_next = NULL;</div><div class='add'>+		/*</div><div class='add'>+		 * this sets the active strip count to 1 and the processed</div><div class='add'>+		 * strip count to zero (upper 8 bits)</div><div class='add'>+		 */</div><div class='ctx'> 		bi-&gt;bi_phys_segments = 1; /* biased count of active stripes */</div><div class='del'>-		bi-&gt;bi_hw_segments = 0; /* count of processed stripes */</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return bi;</div><div class='hunk'>@@ -3206,8 +3238,7 @@ static int bio_fits_rdev(struct bio *bi)</div><div class='ctx'> 	if ((bi-&gt;bi_size&gt;&gt;9) &gt; q-&gt;max_sectors)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	blk_recount_segments(q, bi);</div><div class='del'>-	if (bi-&gt;bi_phys_segments &gt; q-&gt;max_phys_segments ||</div><div class='del'>-	    bi-&gt;bi_hw_segments &gt; q-&gt;max_hw_segments)</div><div class='add'>+	if (bi-&gt;bi_phys_segments &gt; q-&gt;max_phys_segments)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (q-&gt;merge_bvec_fn)</div><div class='hunk'>@@ -3351,7 +3382,7 @@ static int make_request(struct request_queue *q, struct bio * bi)</div><div class='ctx'> 	sector_t logical_sector, last_sector;</div><div class='ctx'> 	struct stripe_head *sh;</div><div class='ctx'> 	const int rw = bio_data_dir(bi);</div><div class='del'>-	int remaining;</div><div class='add'>+	int cpu, remaining;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(bio_barrier(bi))) {</div><div class='ctx'> 		bio_endio(bi, -EOPNOTSUPP);</div><div class='hunk'>@@ -3360,8 +3391,11 @@ static int make_request(struct request_queue *q, struct bio * bi)</div><div class='ctx'> </div><div class='ctx'> 	md_write_start(mddev, bi);</div><div class='ctx'> </div><div class='del'>-	disk_stat_inc(mddev-&gt;gendisk, ios[rw]);</div><div class='del'>-	disk_stat_add(mddev-&gt;gendisk, sectors[rw], bio_sectors(bi));</div><div class='add'>+	cpu = part_stat_lock();</div><div class='add'>+	part_stat_inc(cpu, &amp;mddev-&gt;gendisk-&gt;part0, ios[rw]);</div><div class='add'>+	part_stat_add(cpu, &amp;mddev-&gt;gendisk-&gt;part0, sectors[rw],</div><div class='add'>+		      bio_sectors(bi));</div><div class='add'>+	part_stat_unlock();</div><div class='ctx'> </div><div class='ctx'> 	if (rw == READ &amp;&amp;</div><div class='ctx'> 	     mddev-&gt;reshape_position == MaxSector &amp;&amp;</div><div class='hunk'>@@ -3468,7 +3502,7 @@ static int make_request(struct request_queue *q, struct bio * bi)</div><div class='ctx'> 			</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_lock_irq(&amp;conf-&gt;device_lock);</div><div class='del'>-	remaining = --bi-&gt;bi_phys_segments;</div><div class='add'>+	remaining = raid5_dec_bi_phys_segments(bi);</div><div class='ctx'> 	spin_unlock_irq(&amp;conf-&gt;device_lock);</div><div class='ctx'> 	if (remaining == 0) {</div><div class='ctx'> </div><div class='hunk'>@@ -3752,7 +3786,7 @@ static int  retry_aligned_read(raid5_conf_t *conf, struct bio *raid_bio)</div><div class='ctx'> 		     sector += STRIPE_SECTORS,</div><div class='ctx'> 		     scnt++) {</div><div class='ctx'> </div><div class='del'>-		if (scnt &lt; raid_bio-&gt;bi_hw_segments)</div><div class='add'>+		if (scnt &lt; raid5_bi_hw_segments(raid_bio))</div><div class='ctx'> 			/* already done this stripe */</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='hunk'>@@ -3760,7 +3794,7 @@ static int  retry_aligned_read(raid5_conf_t *conf, struct bio *raid_bio)</div><div class='ctx'> </div><div class='ctx'> 		if (!sh) {</div><div class='ctx'> 			/* failed to get a stripe - must wait */</div><div class='del'>-			raid_bio-&gt;bi_hw_segments = scnt;</div><div class='add'>+			raid5_set_bi_hw_segments(raid_bio, scnt);</div><div class='ctx'> 			conf-&gt;retry_read_aligned = raid_bio;</div><div class='ctx'> 			return handled;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -3768,7 +3802,7 @@ static int  retry_aligned_read(raid5_conf_t *conf, struct bio *raid_bio)</div><div class='ctx'> 		set_bit(R5_ReadError, &amp;sh-&gt;dev[dd_idx].flags);</div><div class='ctx'> 		if (!add_stripe_bio(sh, raid_bio, dd_idx, 0)) {</div><div class='ctx'> 			release_stripe(sh);</div><div class='del'>-			raid_bio-&gt;bi_hw_segments = scnt;</div><div class='add'>+			raid5_set_bi_hw_segments(raid_bio, scnt);</div><div class='ctx'> 			conf-&gt;retry_read_aligned = raid_bio;</div><div class='ctx'> 			return handled;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -3778,7 +3812,7 @@ static int  retry_aligned_read(raid5_conf_t *conf, struct bio *raid_bio)</div><div class='ctx'> 		handled++;</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_lock_irq(&amp;conf-&gt;device_lock);</div><div class='del'>-	remaining = --raid_bio-&gt;bi_phys_segments;</div><div class='add'>+	remaining = raid5_dec_bi_phys_segments(raid_bio);</div><div class='ctx'> 	spin_unlock_irq(&amp;conf-&gt;device_lock);</div><div class='ctx'> 	if (remaining == 0)</div><div class='ctx'> 		bio_endio(raid_bio, 0);</div><div class='hunk'>@@ -3973,6 +4007,13 @@ static int run(mddev_t *mddev)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (mddev-&gt;chunk_size &lt; PAGE_SIZE) {</div><div class='add'>+		printk(KERN_ERR "md/raid5: chunk_size must be at least "</div><div class='add'>+		       "PAGE_SIZE but %d &lt; %ld\n",</div><div class='add'>+		       mddev-&gt;chunk_size, PAGE_SIZE);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (mddev-&gt;reshape_position != MaxSector) {</div><div class='ctx'> 		/* Check that we can continue the reshape.</div><div class='ctx'> 		 * Currently only disks can change, it must</div><div class='hunk'>@@ -4250,7 +4291,7 @@ static int stop(mddev_t *mddev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='del'>-static void print_sh (struct seq_file *seq, struct stripe_head *sh)</div><div class='add'>+static void print_sh(struct seq_file *seq, struct stripe_head *sh)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -4266,7 +4307,7 @@ static void print_sh (struct seq_file *seq, struct stripe_head *sh)</div><div class='ctx'> 	seq_printf(seq, "\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void printall (struct seq_file *seq, raid5_conf_t *conf)</div><div class='add'>+static void printall(struct seq_file *seq, raid5_conf_t *conf)</div><div class='ctx'> {</div><div class='ctx'> 	struct stripe_head *sh;</div><div class='ctx'> 	struct hlist_node *hn;</div><div class='hunk'>@@ -4284,7 +4325,7 @@ static void printall (struct seq_file *seq, raid5_conf_t *conf)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static void status (struct seq_file *seq, mddev_t *mddev)</div><div class='add'>+static void status(struct seq_file *seq, mddev_t *mddev)</div><div class='ctx'> {</div><div class='ctx'> 	raid5_conf_t *conf = (raid5_conf_t *) mddev-&gt;private;</div><div class='ctx'> 	int i;</div><div class='head'>diff --git a/drivers/md/raid6.h b/drivers/md/raid6.h<br/>index 31cbee71365f..98dcde88470e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/md/raid6.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/md/raid6.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/md/raid6.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/md/raid6.h</a></div><div class='hunk'>@@ -18,15 +18,6 @@</div><div class='ctx'> /* Set to 1 to use kernel-wide empty_zero_page */</div><div class='ctx'> #define RAID6_USE_EMPTY_ZERO_PAGE 0</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/stddef.h&gt;</div><div class='del'>-#include &lt;linux/compiler.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/mempool.h&gt;</div><div class='del'>-#include &lt;linux/list.h&gt;</div><div class='del'>-#include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> #include &lt;linux/raid/md.h&gt;</div><div class='ctx'> #include &lt;linux/raid/raid5.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/common/ir-keymaps.c b/drivers/media/common/ir-keymaps.c<br/>index 8fa91f846d59..4952aeb5dd80 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/common/ir-keymaps.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/common/ir-keymaps.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/common/ir-keymaps.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/common/ir-keymaps.c</a></div><div class='hunk'>@@ -103,6 +103,56 @@ IR_KEYTAB_TYPE ir_codes_avermedia_dvbt[IR_KEYTAB_SIZE] = {</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL_GPL(ir_codes_avermedia_dvbt);</div><div class='ctx'> </div><div class='add'>+/* Mauro Carvalho Chehab &lt;mchehab@infradead.org&gt; */</div><div class='add'>+IR_KEYTAB_TYPE ir_codes_avermedia_m135a[IR_KEYTAB_SIZE] = {</div><div class='add'>+	[0x00] = KEY_POWER2,</div><div class='add'>+	[0x2e] = KEY_DOT,		/* '.' */</div><div class='add'>+	[0x01] = KEY_MODE,		/* TV/FM */</div><div class='add'>+</div><div class='add'>+	[0x05] = KEY_1,</div><div class='add'>+	[0x06] = KEY_2,</div><div class='add'>+	[0x07] = KEY_3,</div><div class='add'>+	[0x09] = KEY_4,</div><div class='add'>+	[0x0a] = KEY_5,</div><div class='add'>+	[0x0b] = KEY_6,</div><div class='add'>+	[0x0d] = KEY_7,</div><div class='add'>+	[0x0e] = KEY_8,</div><div class='add'>+	[0x0f] = KEY_9,</div><div class='add'>+	[0x11] = KEY_0,</div><div class='add'>+</div><div class='add'>+	[0x13] = KEY_RIGHT,		/* -&gt; */</div><div class='add'>+	[0x12] = KEY_LEFT,		/* &lt;- */</div><div class='add'>+</div><div class='add'>+	[0x17] = KEY_SLEEP,		/* Capturar Imagem */</div><div class='add'>+	[0x10] = KEY_SHUFFLE,		/* Amostra */</div><div class='add'>+</div><div class='add'>+	/* FIXME: The keys bellow aren't ok */</div><div class='add'>+</div><div class='add'>+	[0x43] = KEY_CHANNELUP,</div><div class='add'>+	[0x42] = KEY_CHANNELDOWN,</div><div class='add'>+	[0x1f] = KEY_VOLUMEUP,</div><div class='add'>+	[0x1e] = KEY_VOLUMEDOWN,</div><div class='add'>+	[0x0c] = KEY_ENTER,</div><div class='add'>+</div><div class='add'>+	[0x14] = KEY_MUTE,</div><div class='add'>+	[0x08] = KEY_AUDIO,</div><div class='add'>+</div><div class='add'>+	[0x03] = KEY_TEXT,</div><div class='add'>+	[0x04] = KEY_EPG,</div><div class='add'>+	[0x2b] = KEY_TV2,		/* TV2 */</div><div class='add'>+</div><div class='add'>+	[0x1d] = KEY_RED,</div><div class='add'>+	[0x1c] = KEY_YELLOW,</div><div class='add'>+	[0x41] = KEY_GREEN,</div><div class='add'>+	[0x40] = KEY_BLUE,</div><div class='add'>+</div><div class='add'>+	[0x1a] = KEY_PLAYPAUSE,</div><div class='add'>+	[0x19] = KEY_RECORD,</div><div class='add'>+	[0x18] = KEY_PLAY,</div><div class='add'>+	[0x1b] = KEY_STOP,</div><div class='add'>+};</div><div class='add'>+EXPORT_SYMBOL_GPL(ir_codes_avermedia_m135a);</div><div class='add'>+</div><div class='ctx'> /* Attila Kondoros &lt;attila.kondoros@chello.hu&gt; */</div><div class='ctx'> IR_KEYTAB_TYPE ir_codes_apac_viewcomp[IR_KEYTAB_SIZE] = {</div><div class='ctx'> </div><div class='hunk'>@@ -467,7 +517,8 @@ EXPORT_SYMBOL_GPL(ir_codes_adstech_dvb_t_pci);</div><div class='ctx'> </div><div class='ctx'> /* ---------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='del'>-/* MSI TV@nywhere remote */</div><div class='add'>+/* MSI TV@nywhere MASTER remote */</div><div class='add'>+</div><div class='ctx'> IR_KEYTAB_TYPE ir_codes_msi_tvanywhere[IR_KEYTAB_SIZE] = {</div><div class='ctx'> 	/* Keys 0 to 9 */</div><div class='ctx'> 	[ 0x00 ] = KEY_0,</div><div class='hunk'>@@ -501,6 +552,95 @@ EXPORT_SYMBOL_GPL(ir_codes_msi_tvanywhere);</div><div class='ctx'> </div><div class='ctx'> /* ---------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+  Keycodes for remote on the MSI TV@nywhere Plus. The controller IC on the card</div><div class='add'>+  is marked "KS003". The controller is I2C at address 0x30, but does not seem</div><div class='add'>+  to respond to probes until a read is performed from a valid device.</div><div class='add'>+  I don't know why...</div><div class='add'>+</div><div class='add'>+  Note: This remote may be of similar or identical design to the</div><div class='add'>+  Pixelview remote (?).  The raw codes and duplicate button codes</div><div class='add'>+  appear to be the same.</div><div class='add'>+</div><div class='add'>+  Henry Wong &lt;henry@stuffedcow.net&gt;</div><div class='add'>+  Some changes to formatting and keycodes by Mark Schultz &lt;n9xmj@yahoo.com&gt;</div><div class='add'>+</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+IR_KEYTAB_TYPE ir_codes_msi_tvanywhere_plus[IR_KEYTAB_SIZE] = {</div><div class='add'>+</div><div class='add'>+/*  ---- Remote Button Layout ----</div><div class='add'>+</div><div class='add'>+    POWER   SOURCE  SCAN    MUTE</div><div class='add'>+    TV/FM   1       2       3</div><div class='add'>+    |&gt;      4       5       6</div><div class='add'>+    &lt;|      7       8       9</div><div class='add'>+    ^^UP    0       +       RECALL</div><div class='add'>+    vvDN    RECORD  STOP    PLAY</div><div class='add'>+</div><div class='add'>+	MINIMIZE          ZOOM</div><div class='add'>+</div><div class='add'>+		  CH+</div><div class='add'>+      VOL-                   VOL+</div><div class='add'>+		  CH-</div><div class='add'>+</div><div class='add'>+	SNAPSHOT           MTS</div><div class='add'>+</div><div class='add'>+     &lt;&lt;      FUNC    &gt;&gt;     RESET</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+	[0x01] = KEY_KP1,             /* 1 */</div><div class='add'>+	[0x0b] = KEY_KP2,             /* 2 */</div><div class='add'>+	[0x1b] = KEY_KP3,             /* 3 */</div><div class='add'>+	[0x05] = KEY_KP4,             /* 4 */</div><div class='add'>+	[0x09] = KEY_KP5,             /* 5 */</div><div class='add'>+	[0x15] = KEY_KP6,             /* 6 */</div><div class='add'>+	[0x06] = KEY_KP7,             /* 7 */</div><div class='add'>+	[0x0a] = KEY_KP8,             /* 8 */</div><div class='add'>+	[0x12] = KEY_KP9,             /* 9 */</div><div class='add'>+	[0x02] = KEY_KP0,             /* 0 */</div><div class='add'>+	[0x10] = KEY_KPPLUS,          /* + */</div><div class='add'>+	[0x13] = KEY_AGAIN,           /* Recall */</div><div class='add'>+</div><div class='add'>+	[0x1e] = KEY_POWER,           /* Power */</div><div class='add'>+	[0x07] = KEY_TUNER,           /* Source */</div><div class='add'>+	[0x1c] = KEY_SEARCH,          /* Scan */</div><div class='add'>+	[0x18] = KEY_MUTE,            /* Mute */</div><div class='add'>+</div><div class='add'>+	[0x03] = KEY_RADIO,           /* TV/FM */</div><div class='add'>+	/* The next four keys are duplicates that appear to send the</div><div class='add'>+	   same IR code as Ch+, Ch-, &gt;&gt;, and &lt;&lt; .  The raw code assigned</div><div class='add'>+	   to them is the actual code + 0x20 - they will never be</div><div class='add'>+	   detected as such unless some way is discovered to distinguish</div><div class='add'>+	   these buttons from those that have the same code. */</div><div class='add'>+	[0x3f] = KEY_RIGHT,           /* |&gt; and Ch+ */</div><div class='add'>+	[0x37] = KEY_LEFT,            /* &lt;| and Ch- */</div><div class='add'>+	[0x2c] = KEY_UP,              /* ^^Up and &gt;&gt; */</div><div class='add'>+	[0x24] = KEY_DOWN,            /* vvDn and &lt;&lt; */</div><div class='add'>+</div><div class='add'>+	[0x00] = KEY_RECORD,          /* Record */</div><div class='add'>+	[0x08] = KEY_STOP,            /* Stop */</div><div class='add'>+	[0x11] = KEY_PLAY,            /* Play */</div><div class='add'>+</div><div class='add'>+	[0x0f] = KEY_CLOSE,           /* Minimize */</div><div class='add'>+	[0x19] = KEY_ZOOM,            /* Zoom */</div><div class='add'>+	[0x1a] = KEY_SHUFFLE,         /* Snapshot */</div><div class='add'>+	[0x0d] = KEY_LANGUAGE,        /* MTS */</div><div class='add'>+</div><div class='add'>+	[0x14] = KEY_VOLUMEDOWN,      /* Vol- */</div><div class='add'>+	[0x16] = KEY_VOLUMEUP,        /* Vol+ */</div><div class='add'>+	[0x17] = KEY_CHANNELDOWN,     /* Ch- */</div><div class='add'>+	[0x1f] = KEY_CHANNELUP,       /* Ch+ */</div><div class='add'>+</div><div class='add'>+	[0x04] = KEY_REWIND,          /* &lt;&lt; */</div><div class='add'>+	[0x0e] = KEY_MENU,            /* Function */</div><div class='add'>+	[0x0c] = KEY_FASTFORWARD,     /* &gt;&gt; */</div><div class='add'>+	[0x1d] = KEY_RESTART,         /* Reset */</div><div class='add'>+};</div><div class='add'>+EXPORT_SYMBOL_GPL(ir_codes_msi_tvanywhere_plus);</div><div class='add'>+</div><div class='add'>+/* ---------------------------------------------------------------------- */</div><div class='add'>+</div><div class='ctx'> /* Cinergy 1400 DVB-T */</div><div class='ctx'> IR_KEYTAB_TYPE ir_codes_cinergy_1400[IR_KEYTAB_SIZE] = {</div><div class='ctx'> 	[ 0x01 ] = KEY_POWER,</div><div class='hunk'>@@ -1792,12 +1932,61 @@ IR_KEYTAB_TYPE ir_codes_encore_enltv[IR_KEYTAB_SIZE] = {</div><div class='ctx'> 	[ 0x41 ] = KEY_GREEN,		/* AP2 */</div><div class='ctx'> 	[ 0x47 ] = KEY_YELLOW,		/* AP3 */</div><div class='ctx'> 	[ 0x57 ] = KEY_BLUE,		/* AP4 */</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> };</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL_GPL(ir_codes_encore_enltv);</div><div class='ctx'> </div><div class='add'>+/* Encore ENLTV2-FM  - silver plastic - "Wand Media" written at the botton</div><div class='add'>+    Mauro Carvalho Chehab &lt;mchehab@infradead.org&gt; */</div><div class='add'>+IR_KEYTAB_TYPE ir_codes_encore_enltv2[IR_KEYTAB_SIZE] = {</div><div class='add'>+	[0x4c] = KEY_POWER2,</div><div class='add'>+	[0x4a] = KEY_TUNER,</div><div class='add'>+	[0x40] = KEY_1,</div><div class='add'>+	[0x60] = KEY_2,</div><div class='add'>+	[0x50] = KEY_3,</div><div class='add'>+	[0x70] = KEY_4,</div><div class='add'>+	[0x48] = KEY_5,</div><div class='add'>+	[0x68] = KEY_6,</div><div class='add'>+	[0x58] = KEY_7,</div><div class='add'>+	[0x78] = KEY_8,</div><div class='add'>+	[0x44] = KEY_9,</div><div class='add'>+	[0x54] = KEY_0,</div><div class='add'>+</div><div class='add'>+	[0x64] = KEY_LAST,		/* +100 */</div><div class='add'>+	[0x4e] = KEY_AGAIN,		/* Recall */</div><div class='add'>+</div><div class='add'>+	[0x6c] = KEY_SWITCHVIDEOMODE,	/* Video Source */</div><div class='add'>+	[0x5e] = KEY_MENU,</div><div class='add'>+	[0x56] = KEY_SCREEN,</div><div class='add'>+	[0x7a] = KEY_SETUP,</div><div class='add'>+</div><div class='add'>+	[0x46] = KEY_MUTE,</div><div class='add'>+	[0x5c] = KEY_MODE,		/* Stereo */</div><div class='add'>+	[0x74] = KEY_INFO,</div><div class='add'>+	[0x7c] = KEY_CLEAR,</div><div class='add'>+</div><div class='add'>+	[0x55] = KEY_UP,</div><div class='add'>+	[0x49] = KEY_DOWN,</div><div class='add'>+	[0x7e] = KEY_LEFT,</div><div class='add'>+	[0x59] = KEY_RIGHT,</div><div class='add'>+	[0x6a] = KEY_ENTER,</div><div class='add'>+</div><div class='add'>+	[0x42] = KEY_VOLUMEUP,</div><div class='add'>+	[0x62] = KEY_VOLUMEDOWN,</div><div class='add'>+	[0x52] = KEY_CHANNELUP,</div><div class='add'>+	[0x72] = KEY_CHANNELDOWN,</div><div class='add'>+</div><div class='add'>+	[0x41] = KEY_RECORD,</div><div class='add'>+	[0x51] = KEY_SHUFFLE,	/* Snapshot */</div><div class='add'>+	[0x75] = KEY_TIME,	/* Timeshift */</div><div class='add'>+	[0x71] = KEY_TV2,	/* PIP */</div><div class='add'>+</div><div class='add'>+	[0x45] = KEY_REWIND,</div><div class='add'>+	[0x6f] = KEY_PAUSE,</div><div class='add'>+	[0x7d] = KEY_FORWARD,</div><div class='add'>+	[0x79] = KEY_STOP,</div><div class='add'>+};</div><div class='add'>+EXPORT_SYMBOL_GPL(ir_codes_encore_enltv2);</div><div class='add'>+</div><div class='ctx'> /* for the Technotrend 1500 bundled remotes (grey and black): */</div><div class='ctx'> IR_KEYTAB_TYPE ir_codes_tt_1500[IR_KEYTAB_SIZE] = {</div><div class='ctx'> 	[ 0x01 ] = KEY_POWER,</div><div class='hunk'>@@ -2239,3 +2428,86 @@ IR_KEYTAB_TYPE ir_codes_avermedia_a16d[IR_KEYTAB_SIZE] = {</div><div class='ctx'> 	[0x2a] = KEY_MENU,</div><div class='ctx'> };</div><div class='ctx'> EXPORT_SYMBOL_GPL(ir_codes_avermedia_a16d);</div><div class='add'>+</div><div class='add'>+/* Encore ENLTV-FM v5.3</div><div class='add'>+   Mauro Carvalho Chehab &lt;mchehab@infradead.org&gt;</div><div class='add'>+ */</div><div class='add'>+IR_KEYTAB_TYPE ir_codes_encore_enltv_fm53[IR_KEYTAB_SIZE] = {</div><div class='add'>+	[0x10] = KEY_POWER2,</div><div class='add'>+	[0x06] = KEY_MUTE,</div><div class='add'>+</div><div class='add'>+	[0x09] = KEY_1,</div><div class='add'>+	[0x1d] = KEY_2,</div><div class='add'>+	[0x1f] = KEY_3,</div><div class='add'>+	[0x19] = KEY_4,</div><div class='add'>+	[0x1b] = KEY_5,</div><div class='add'>+	[0x11] = KEY_6,</div><div class='add'>+	[0x17] = KEY_7,</div><div class='add'>+	[0x12] = KEY_8,</div><div class='add'>+	[0x16] = KEY_9,</div><div class='add'>+	[0x48] = KEY_0,</div><div class='add'>+</div><div class='add'>+	[0x04] = KEY_LIST,		/* -/-- */</div><div class='add'>+	[0x40] = KEY_LAST,		/* recall */</div><div class='add'>+</div><div class='add'>+	[0x02] = KEY_MODE,		/* TV/AV */</div><div class='add'>+	[0x05] = KEY_SHUFFLE,		/* SNAPSHOT */</div><div class='add'>+</div><div class='add'>+	[0x4c] = KEY_CHANNELUP,		/* UP */</div><div class='add'>+	[0x00] = KEY_CHANNELDOWN,	/* DOWN */</div><div class='add'>+	[0x0d] = KEY_VOLUMEUP,		/* RIGHT */</div><div class='add'>+	[0x15] = KEY_VOLUMEDOWN,	/* LEFT */</div><div class='add'>+	[0x49] = KEY_ENTER,		/* OK */</div><div class='add'>+</div><div class='add'>+	[0x54] = KEY_RECORD,</div><div class='add'>+	[0x4d] = KEY_PLAY,		/* pause */</div><div class='add'>+</div><div class='add'>+	[0x1e] = KEY_UP,		/* video setting */</div><div class='add'>+	[0x0e] = KEY_RIGHT,		/* &lt;- */</div><div class='add'>+	[0x1a] = KEY_LEFT,		/* -&gt; */</div><div class='add'>+</div><div class='add'>+	[0x0a] = KEY_DOWN,		/* video default */</div><div class='add'>+	[0x0c] = KEY_ZOOM,		/* hide pannel */</div><div class='add'>+	[0x47] = KEY_SLEEP,		/* shutdown */</div><div class='add'>+};</div><div class='add'>+EXPORT_SYMBOL_GPL(ir_codes_encore_enltv_fm53);</div><div class='add'>+</div><div class='add'>+/* Zogis Real Audio 220 - 32 keys IR */</div><div class='add'>+IR_KEYTAB_TYPE ir_codes_real_audio_220_32_keys[IR_KEYTAB_SIZE] = {</div><div class='add'>+	[0x1c] = KEY_RADIO,</div><div class='add'>+	[0x12] = KEY_POWER2,</div><div class='add'>+</div><div class='add'>+	[0x01] = KEY_1,</div><div class='add'>+	[0x02] = KEY_2,</div><div class='add'>+	[0x03] = KEY_3,</div><div class='add'>+	[0x04] = KEY_4,</div><div class='add'>+	[0x05] = KEY_5,</div><div class='add'>+	[0x06] = KEY_6,</div><div class='add'>+	[0x07] = KEY_7,</div><div class='add'>+	[0x08] = KEY_8,</div><div class='add'>+	[0x09] = KEY_9,</div><div class='add'>+	[0x00] = KEY_0,</div><div class='add'>+</div><div class='add'>+	[0x0c] = KEY_VOLUMEUP,</div><div class='add'>+	[0x18] = KEY_VOLUMEDOWN,</div><div class='add'>+	[0x0b] = KEY_CHANNELUP,</div><div class='add'>+	[0x15] = KEY_CHANNELDOWN,</div><div class='add'>+	[0x16] = KEY_ENTER,</div><div class='add'>+</div><div class='add'>+	[0x11] = KEY_LIST,		/* Source */</div><div class='add'>+	[0x0d] = KEY_AUDIO,		/* stereo */</div><div class='add'>+</div><div class='add'>+	[0x0f] = KEY_PREVIOUS,		/* Prev */</div><div class='add'>+	[0x1b] = KEY_PAUSE,		/* Timeshift */</div><div class='add'>+	[0x1a] = KEY_NEXT,		/* Next */</div><div class='add'>+</div><div class='add'>+	[0x0e] = KEY_STOP,</div><div class='add'>+	[0x1f] = KEY_PLAY,</div><div class='add'>+	[0x1e] = KEY_PLAYPAUSE,		/* Pause */</div><div class='add'>+</div><div class='add'>+	[0x1d] = KEY_RECORD,</div><div class='add'>+	[0x13] = KEY_MUTE,</div><div class='add'>+	[0x19] = KEY_SHUFFLE,		/* Snapshot */</div><div class='add'>+</div><div class='add'>+};</div><div class='add'>+EXPORT_SYMBOL_GPL(ir_codes_real_audio_220_32_keys);</div><div class='head'>diff --git a/drivers/media/common/saa7146_core.c b/drivers/media/common/saa7146_core.c<br/>index d01965e96927..d599d360da3f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/common/saa7146_core.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/common/saa7146_core.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/common/saa7146_core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/common/saa7146_core.c</a></div><div class='hunk'>@@ -234,7 +234,7 @@ void saa7146_pgtable_free(struct pci_dev *pci, struct saa7146_pgtable *pt)</div><div class='ctx'> int saa7146_pgtable_alloc(struct pci_dev *pci, struct saa7146_pgtable *pt)</div><div class='ctx'> {</div><div class='ctx'> 	__le32       *cpu;</div><div class='del'>-	dma_addr_t   dma_addr;</div><div class='add'>+	dma_addr_t   dma_addr = 0;</div><div class='ctx'> </div><div class='ctx'> 	cpu = pci_alloc_consistent(pci, PAGE_SIZE, &amp;dma_addr);</div><div class='ctx'> 	if (NULL == cpu) {</div><div class='head'>diff --git a/drivers/media/common/saa7146_fops.c b/drivers/media/common/saa7146_fops.c<br/>index cf6a817d5059..5b34c134aa25 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/common/saa7146_fops.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/common/saa7146_fops.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/common/saa7146_fops.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/common/saa7146_fops.c</a></div><div class='hunk'>@@ -533,7 +533,7 @@ int saa7146_register_device(struct video_device **vid, struct saa7146_dev* dev,</div><div class='ctx'> 	memcpy(vfd, &amp;device_template, sizeof(struct video_device));</div><div class='ctx'> 	strlcpy(vfd-&gt;name, name, sizeof(vfd-&gt;name));</div><div class='ctx'> 	vfd-&gt;release = video_device_release;</div><div class='del'>-	vfd-&gt;priv = dev;</div><div class='add'>+	video_set_drvdata(vfd, dev);</div><div class='ctx'> </div><div class='ctx'> 	// fixme: -1 should be an insmod parameter *for the extension* (like "video_nr");</div><div class='ctx'> 	if (video_register_device(vfd, type, -1) &lt; 0) {</div><div class='head'>diff --git a/drivers/media/common/tuners/mt2060.c b/drivers/media/common/tuners/mt2060.c<br/>index 1305b0e63ce5..12206d75dd4e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/common/tuners/mt2060.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/common/tuners/mt2060.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/common/tuners/mt2060.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/common/tuners/mt2060.c</a></div><div class='hunk'>@@ -170,6 +170,9 @@ static int mt2060_set_params(struct dvb_frontend *fe, struct dvb_frontend_parame</div><div class='ctx'> 	b[0] = REG_LO1B1;</div><div class='ctx'> 	b[1] = 0xFF;</div><div class='ctx'> </div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1); /* open i2c_gate */</div><div class='add'>+</div><div class='ctx'> 	mt2060_writeregs(priv,b,2);</div><div class='ctx'> </div><div class='ctx'> 	freq = params-&gt;frequency / 1000; // Hz -&gt; kHz</div><div class='hunk'>@@ -233,6 +236,9 @@ static int mt2060_set_params(struct dvb_frontend *fe, struct dvb_frontend_parame</div><div class='ctx'> 		i++;</div><div class='ctx'> 	} while (i&lt;10);</div><div class='ctx'> </div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 0); /* close i2c_gate */</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -296,13 +302,35 @@ static int mt2060_get_bandwidth(struct dvb_frontend *fe, u32 *bandwidth)</div><div class='ctx'> static int mt2060_init(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt2060_priv *priv = fe-&gt;tuner_priv;</div><div class='del'>-	return mt2060_writereg(priv, REG_VGAG, (priv-&gt;cfg-&gt;clock_out &lt;&lt; 6) | 0x33);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1); /* open i2c_gate */</div><div class='add'>+</div><div class='add'>+	ret = mt2060_writereg(priv, REG_VGAG,</div><div class='add'>+			      (priv-&gt;cfg-&gt;clock_out &lt;&lt; 6) | 0x33);</div><div class='add'>+</div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 0); /* close i2c_gate */</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mt2060_sleep(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt2060_priv *priv = fe-&gt;tuner_priv;</div><div class='del'>-	return mt2060_writereg(priv, REG_VGAG, (priv-&gt;cfg-&gt;clock_out &lt;&lt; 6) | 0x30);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1); /* open i2c_gate */</div><div class='add'>+</div><div class='add'>+	ret = mt2060_writereg(priv, REG_VGAG,</div><div class='add'>+			      (priv-&gt;cfg-&gt;clock_out &lt;&lt; 6) | 0x30);</div><div class='add'>+</div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 0); /* close i2c_gate */</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mt2060_release(struct dvb_frontend *fe)</div><div class='hunk'>@@ -344,6 +372,9 @@ struct dvb_frontend * mt2060_attach(struct dvb_frontend *fe, struct i2c_adapter</div><div class='ctx'> 	priv-&gt;i2c      = i2c;</div><div class='ctx'> 	priv-&gt;if1_freq = if1;</div><div class='ctx'> </div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1); /* open i2c_gate */</div><div class='add'>+</div><div class='ctx'> 	if (mt2060_readreg(priv,REG_PART_REV,&amp;id) != 0) {</div><div class='ctx'> 		kfree(priv);</div><div class='ctx'> 		return NULL;</div><div class='hunk'>@@ -360,6 +391,9 @@ struct dvb_frontend * mt2060_attach(struct dvb_frontend *fe, struct i2c_adapter</div><div class='ctx'> </div><div class='ctx'> 	mt2060_calibrate(priv);</div><div class='ctx'> </div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 0); /* close i2c_gate */</div><div class='add'>+</div><div class='ctx'> 	return fe;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(mt2060_attach);</div><div class='head'>diff --git a/drivers/media/common/tuners/mxl5005s.c b/drivers/media/common/tuners/mxl5005s.c<br/>index 227642b044ae..a8878244bb3c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/common/tuners/mxl5005s.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/common/tuners/mxl5005s.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/common/tuners/mxl5005s.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/common/tuners/mxl5005s.c</a></div><div class='hunk'>@@ -3481,7 +3481,9 @@ static u16 MXL_ControlWrite_Group(struct dvb_frontend *fe, u16 controlNum,</div><div class='ctx'> 					}</div><div class='ctx'> 					ctrlVal = 0;</div><div class='ctx'> 					for (k = 0; k &lt; state-&gt;MXL_Ctrl[i].size; k++)</div><div class='del'>-						ctrlVal += state-&gt;MXL_Ctrl[i].val[k] * (1 &lt;&lt; k);</div><div class='add'>+						ctrlVal += state-&gt;</div><div class='add'>+							MXL_Ctrl[i].val[k] *</div><div class='add'>+							(1 &lt;&lt; k);</div><div class='ctx'> 				} else</div><div class='ctx'> 					return -1;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -3581,7 +3583,7 @@ static void MXL_RegWriteBit(struct dvb_frontend *fe, u8 address, u8 bit,</div><div class='ctx'> </div><div class='ctx'> static u32 MXL_Ceiling(u32 value, u32 resolution)</div><div class='ctx'> {</div><div class='del'>-	return (value/resolution + (value % resolution &gt; 0 ? 1 : 0));</div><div class='add'>+	return value / resolution + (value % resolution &gt; 0 ? 1 : 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Retrieve the Initialzation Registers */</div><div class='hunk'>@@ -3910,7 +3912,10 @@ static int mxl5005s_writeregs(struct dvb_frontend *fe, u8 *addrtable,</div><div class='ctx'> </div><div class='ctx'> static int mxl5005s_init(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct mxl5005s_state *state = fe-&gt;tuner_priv;</div><div class='add'>+</div><div class='ctx'> 	dprintk(1, "%s()\n", __func__);</div><div class='add'>+	state-&gt;current_mode = MXL_QAM;</div><div class='ctx'> 	return mxl5005s_reconfigure(fe, MXL_QAM, MXL5005S_BANDWIDTH_6MHZ);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4092,7 +4097,6 @@ struct dvb_frontend *mxl5005s_attach(struct dvb_frontend *fe,</div><div class='ctx'> 	state-&gt;frontend = fe;</div><div class='ctx'> 	state-&gt;config = config;</div><div class='ctx'> 	state-&gt;i2c = i2c;</div><div class='del'>-	state-&gt;current_mode = MXL_QAM;</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_INFO "MXL5005S: Attached at address 0x%02x\n",</div><div class='ctx'> 		config-&gt;i2c_address);</div><div class='head'>diff --git a/drivers/media/common/tuners/mxl5007t.c b/drivers/media/common/tuners/mxl5007t.c<br/>index cb25e43502fe..64379f2bf237 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/common/tuners/mxl5007t.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/common/tuners/mxl5007t.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/common/tuners/mxl5007t.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/common/tuners/mxl5007t.c</a></div><div class='hunk'>@@ -979,7 +979,6 @@ struct dvb_frontend *mxl5007t_attach(struct dvb_frontend *fe,</div><div class='ctx'> 	switch (instance) {</div><div class='ctx'> 	case 0:</div><div class='ctx'> 		goto fail;</div><div class='del'>-		break;</div><div class='ctx'> 	case 1:</div><div class='ctx'> 		/* new tuner instance */</div><div class='ctx'> 		state-&gt;config = cfg;</div><div class='head'>diff --git a/drivers/media/common/tuners/tda18271-fe.c b/drivers/media/common/tuners/tda18271-fe.c<br/>index 93063c6fbbf6..1b48b5d0bf1e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/common/tuners/tda18271-fe.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/common/tuners/tda18271-fe.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/common/tuners/tda18271-fe.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/common/tuners/tda18271-fe.c</a></div><div class='hunk'>@@ -1155,7 +1155,6 @@ struct dvb_frontend *tda18271_attach(struct dvb_frontend *fe, u8 addr,</div><div class='ctx'> 	switch (instance) {</div><div class='ctx'> 	case 0:</div><div class='ctx'> 		goto fail;</div><div class='del'>-		break;</div><div class='ctx'> 	case 1:</div><div class='ctx'> 		/* new tuner instance */</div><div class='ctx'> 		priv-&gt;gate = (cfg) ? cfg-&gt;gate : TDA18271_GATE_AUTO;</div><div class='head'>diff --git a/drivers/media/common/tuners/tda827x.c b/drivers/media/common/tuners/tda827x.c<br/>index 8555d9cf9051..4a74f65e759a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/common/tuners/tda827x.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/common/tuners/tda827x.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/common/tuners/tda827x.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/common/tuners/tda827x.c</a></div><div class='hunk'>@@ -447,17 +447,19 @@ static void tda827xa_lna_gain(struct dvb_frontend *fe, int high,</div><div class='ctx'> 			else</div><div class='ctx'> 				arg = 0;</div><div class='ctx'> 		}</div><div class='del'>-		if (priv-&gt;cfg-&gt;tuner_callback)</div><div class='del'>-			priv-&gt;cfg-&gt;tuner_callback(priv-&gt;i2c_adap-&gt;algo_data,</div><div class='del'>-								gp_func, arg);</div><div class='add'>+		if (fe-&gt;callback)</div><div class='add'>+			fe-&gt;callback(priv-&gt;i2c_adap-&gt;algo_data,</div><div class='add'>+				     DVB_FRONTEND_COMPONENT_TUNER,</div><div class='add'>+				     gp_func, arg);</div><div class='ctx'> 		buf[1] = high ? 0 : 1;</div><div class='ctx'> 		if (priv-&gt;cfg-&gt;config == 2)</div><div class='ctx'> 			buf[1] = high ? 1 : 0;</div><div class='ctx'> 		i2c_transfer(priv-&gt;i2c_adap, &amp;msg, 1);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 3: /* switch with GPIO of saa713x */</div><div class='del'>-		if (priv-&gt;cfg-&gt;tuner_callback)</div><div class='del'>-			priv-&gt;cfg-&gt;tuner_callback(priv-&gt;i2c_adap-&gt;algo_data, 0, high);</div><div class='add'>+		if (fe-&gt;callback)</div><div class='add'>+			fe-&gt;callback(priv-&gt;i2c_adap-&gt;algo_data,</div><div class='add'>+				     DVB_FRONTEND_COMPONENT_TUNER, 0, high);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/media/common/tuners/tda827x.h b/drivers/media/common/tuners/tda827x.h<br/>index 7850a9a1dc8f..7d72ce0a0c2d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/common/tuners/tda827x.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/common/tuners/tda827x.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/common/tuners/tda827x.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/common/tuners/tda827x.h</a></div><div class='hunk'>@@ -36,7 +36,6 @@ struct tda827x_config</div><div class='ctx'> 	/* interface to tda829x driver */</div><div class='ctx'> 	unsigned int config;</div><div class='ctx'> 	int 	     switch_addr;</div><div class='del'>-	int (*tuner_callback) (void *dev, int command, int arg);</div><div class='ctx'> </div><div class='ctx'> 	void (*agcf)(struct dvb_frontend *fe);</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/media/common/tuners/tda8290.c b/drivers/media/common/tuners/tda8290.c<br/>index 91204d3f282d..c112bdd4e0f0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/common/tuners/tda8290.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/common/tuners/tda8290.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/common/tuners/tda8290.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/common/tuners/tda8290.c</a></div><div class='hunk'>@@ -672,10 +672,8 @@ struct dvb_frontend *tda829x_attach(struct dvb_frontend *fe,</div><div class='ctx'> 	priv-&gt;i2c_props.addr     = i2c_addr;</div><div class='ctx'> 	priv-&gt;i2c_props.adap     = i2c_adap;</div><div class='ctx'> 	priv-&gt;i2c_props.name     = "tda829x";</div><div class='del'>-	if (cfg) {</div><div class='add'>+	if (cfg)</div><div class='ctx'> 		priv-&gt;cfg.config         = cfg-&gt;lna_cfg;</div><div class='del'>-		priv-&gt;cfg.tuner_callback = cfg-&gt;tuner_callback;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	if (tda8290_probe(&amp;priv-&gt;i2c_props) == 0) {</div><div class='ctx'> 		priv-&gt;ver = TDA8290;</div><div class='head'>diff --git a/drivers/media/common/tuners/tda8290.h b/drivers/media/common/tuners/tda8290.h<br/>index aa074f3f0c07..7e288b26fcc3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/common/tuners/tda8290.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/common/tuners/tda8290.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/common/tuners/tda8290.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/common/tuners/tda8290.h</a></div><div class='hunk'>@@ -22,7 +22,6 @@</div><div class='ctx'> </div><div class='ctx'> struct tda829x_config {</div><div class='ctx'> 	unsigned int lna_cfg;</div><div class='del'>-	int (*tuner_callback) (void *dev, int command, int arg);</div><div class='ctx'> </div><div class='ctx'> 	unsigned int probe_tuner:1;</div><div class='ctx'> #define TDA829X_PROBE_TUNER 0</div><div class='head'>diff --git a/drivers/media/common/tuners/tda9887.c b/drivers/media/common/tuners/tda9887.c<br/>index 72abf0b73486..ff1788cc5d48 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/common/tuners/tda9887.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/common/tuners/tda9887.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/common/tuners/tda9887.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/common/tuners/tda9887.c</a></div><div class='hunk'>@@ -686,7 +686,6 @@ struct dvb_frontend *tda9887_attach(struct dvb_frontend *fe,</div><div class='ctx'> 	case 0:</div><div class='ctx'> 		mutex_unlock(&amp;tda9887_list_mutex);</div><div class='ctx'> 		return NULL;</div><div class='del'>-		break;</div><div class='ctx'> 	case 1:</div><div class='ctx'> 		fe-&gt;analog_demod_priv = priv;</div><div class='ctx'> 		priv-&gt;mode = T_STANDBY;</div><div class='head'>diff --git a/drivers/media/common/tuners/tuner-simple.c b/drivers/media/common/tuners/tuner-simple.c<br/>index aa773a658a2a..fb3f3b3adaba 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/common/tuners/tuner-simple.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/common/tuners/tuner-simple.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/common/tuners/tuner-simple.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/common/tuners/tuner-simple.c</a></div><div class='hunk'>@@ -142,6 +142,7 @@ static inline int tuner_stereo(const int type, const int status)</div><div class='ctx'> 	case TUNER_PHILIPS_FM1236_MK3:</div><div class='ctx'> 	case TUNER_PHILIPS_FM1256_IH3:</div><div class='ctx'> 	case TUNER_LG_NTSC_TAPE:</div><div class='add'>+	case TUNER_TCL_MF02GIP_5N:</div><div class='ctx'> 		return ((status &amp; TUNER_SIGNAL) == TUNER_STEREO_MK3);</div><div class='ctx'> 	default:</div><div class='ctx'> 		return status &amp; TUNER_STEREO;</div><div class='hunk'>@@ -492,8 +493,10 @@ static int simple_radio_bandswitch(struct dvb_frontend *fe, u8 *buffer)</div><div class='ctx'> 	case TUNER_PHILIPS_FM1216ME_MK3:</div><div class='ctx'> 	case TUNER_PHILIPS_FM1236_MK3:</div><div class='ctx'> 	case TUNER_PHILIPS_FMD1216ME_MK3:</div><div class='add'>+	case TUNER_PHILIPS_FMD1216MEX_MK3:</div><div class='ctx'> 	case TUNER_LG_NTSC_TAPE:</div><div class='ctx'> 	case TUNER_PHILIPS_FM1256_IH3:</div><div class='add'>+	case TUNER_TCL_MF02GIP_5N:</div><div class='ctx'> 		buffer[3] = 0x19;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case TUNER_TNF_5335MF:</div><div class='hunk'>@@ -765,6 +768,7 @@ static void simple_set_dvb(struct dvb_frontend *fe, u8 *buf,</div><div class='ctx'> </div><div class='ctx'> 	switch (priv-&gt;type) {</div><div class='ctx'> 	case TUNER_PHILIPS_FMD1216ME_MK3:</div><div class='add'>+	case TUNER_PHILIPS_FMD1216MEX_MK3:</div><div class='ctx'> 		if (params-&gt;u.ofdm.bandwidth == BANDWIDTH_8_MHZ &amp;&amp;</div><div class='ctx'> 		    params-&gt;frequency &gt;= 158870000)</div><div class='ctx'> 			buf[3] |= 0x08;</div><div class='hunk'>@@ -1038,7 +1042,6 @@ struct dvb_frontend *simple_tuner_attach(struct dvb_frontend *fe,</div><div class='ctx'> 	case 0:</div><div class='ctx'> 		mutex_unlock(&amp;tuner_simple_list_mutex);</div><div class='ctx'> 		return NULL;</div><div class='del'>-		break;</div><div class='ctx'> 	case 1:</div><div class='ctx'> 		fe-&gt;tuner_priv = priv;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/common/tuners/tuner-types.c b/drivers/media/common/tuners/tuner-types.c<br/>index 10dddca8b5d1..7c0bc064c008 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/common/tuners/tuner-types.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/common/tuners/tuner-types.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/common/tuners/tuner-types.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/common/tuners/tuner-types.c</a></div><div class='hunk'>@@ -946,7 +946,7 @@ static struct tuner_params tuner_tena_9533_di_params[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* ------------ TUNER_PHILIPS_FMD1216ME_MK3 - Philips PAL ------------ */</div><div class='add'>+/* ------------ TUNER_PHILIPS_FMD1216ME(X)_MK3 - Philips PAL ------------ */</div><div class='ctx'> </div><div class='ctx'> static struct tuner_range tuner_philips_fmd1216me_mk3_pal_ranges[] = {</div><div class='ctx'> 	{ 16 * 160.00 /*MHz*/, 0x86, 0x51, },</div><div class='hunk'>@@ -984,6 +984,27 @@ static struct tuner_params tuner_philips_fmd1216me_mk3_params[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct tuner_params tuner_philips_fmd1216mex_mk3_params[] = {</div><div class='add'>+	{</div><div class='add'>+		.type   = TUNER_PARAM_TYPE_PAL,</div><div class='add'>+		.ranges = tuner_philips_fmd1216me_mk3_pal_ranges,</div><div class='add'>+		.count  = ARRAY_SIZE(tuner_philips_fmd1216me_mk3_pal_ranges),</div><div class='add'>+		.has_tda9887 = 1,</div><div class='add'>+		.port1_active = 1,</div><div class='add'>+		.port2_active = 1,</div><div class='add'>+		.port2_fm_high_sensitivity = 1,</div><div class='add'>+		.port2_invert_for_secam_lc = 1,</div><div class='add'>+		.port1_set_for_fm_mono = 1,</div><div class='add'>+		.radio_if = 1,</div><div class='add'>+		.fm_gain_normal = 1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.type   = TUNER_PARAM_TYPE_DIGITAL,</div><div class='add'>+		.ranges = tuner_philips_fmd1216me_mk3_dvb_ranges,</div><div class='add'>+		.count  = ARRAY_SIZE(tuner_philips_fmd1216me_mk3_dvb_ranges),</div><div class='add'>+		.iffreq = 16 * 36.125, /*MHz*/</div><div class='add'>+	},</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> /* ------ TUNER_LG_TDVS_H06XF - LG INNOTEK / INFINEON ATSC ----- */</div><div class='ctx'> </div><div class='hunk'>@@ -1216,6 +1237,23 @@ static struct tuner_params tuner_samsung_tcpg_6121p30a_params[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* ------------ TUNER_TCL_MF02GIP-5N-E - TCL MF02GIP-5N ------------ */</div><div class='add'>+</div><div class='add'>+static struct tuner_range tuner_tcl_mf02gip_5n_ntsc_ranges[] = {</div><div class='add'>+	{ 16 * 172.00 /*MHz*/, 0x8e, 0x01, },</div><div class='add'>+	{ 16 * 448.00 /*MHz*/, 0x8e, 0x02, },</div><div class='add'>+	{ 16 * 999.99        , 0x8e, 0x04, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct tuner_params tuner_tcl_mf02gip_5n_params[] = {</div><div class='add'>+	{</div><div class='add'>+		.type   = TUNER_PARAM_TYPE_NTSC,</div><div class='add'>+		.ranges = tuner_tcl_mf02gip_5n_ntsc_ranges,</div><div class='add'>+		.count  = ARRAY_SIZE(tuner_tcl_mf02gip_5n_ntsc_ranges),</div><div class='add'>+		.cb_first_if_lower_freq = 1,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* --------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='ctx'> struct tunertype tuners[] = {</div><div class='hunk'>@@ -1641,6 +1679,21 @@ struct tunertype tuners[] = {</div><div class='ctx'> 		.name   = "Xceive 5000 tuner",</div><div class='ctx'> 		/* see xc5000.c for details */</div><div class='ctx'> 	},</div><div class='add'>+	[TUNER_TCL_MF02GIP_5N] = { /* TCL tuner MF02GIP-5N-E */</div><div class='add'>+		.name   = "TCL tuner MF02GIP-5N-E",</div><div class='add'>+		.params = tuner_tcl_mf02gip_5n_params,</div><div class='add'>+		.count  = ARRAY_SIZE(tuner_tcl_mf02gip_5n_params),</div><div class='add'>+	},</div><div class='add'>+	[TUNER_PHILIPS_FMD1216MEX_MK3] = { /* Philips PAL */</div><div class='add'>+		.name   = "Philips FMD1216MEX MK3 Hybrid Tuner",</div><div class='add'>+		.params = tuner_philips_fmd1216mex_mk3_params,</div><div class='add'>+		.count  = ARRAY_SIZE(tuner_philips_fmd1216mex_mk3_params),</div><div class='add'>+		.min = 16 *  50.87,</div><div class='add'>+		.max = 16 * 858.00,</div><div class='add'>+		.stepsize = 166667,</div><div class='add'>+		.initdata = tua603x_agc112,</div><div class='add'>+		.sleepdata = (u8[]){ 4, 0x9c, 0x60, 0x85, 0x54 },</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> EXPORT_SYMBOL(tuners);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/common/tuners/tuner-xc2028.c b/drivers/media/common/tuners/tuner-xc2028.c<br/>index 4dd1d2421cc5..b65e6803e6c6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/common/tuners/tuner-xc2028.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/common/tuners/tuner-xc2028.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/common/tuners/tuner-xc2028.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/common/tuners/tuner-xc2028.c</a></div><div class='hunk'>@@ -71,9 +71,6 @@ struct firmware_properties {</div><div class='ctx'> struct xc2028_data {</div><div class='ctx'> 	struct list_head        hybrid_tuner_instance_list;</div><div class='ctx'> 	struct tuner_i2c_props  i2c_props;</div><div class='del'>-	int                     (*tuner_callback) (void *dev,</div><div class='del'>-						   int command, int arg);</div><div class='del'>-	void			*video_dev;</div><div class='ctx'> 	__u32			frequency;</div><div class='ctx'> </div><div class='ctx'> 	struct firmware_description *firm;</div><div class='hunk'>@@ -492,6 +489,23 @@ ret:</div><div class='ctx'> 	return i;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int do_tuner_callback(struct dvb_frontend *fe, int cmd, int arg)</div><div class='add'>+{</div><div class='add'>+	struct xc2028_data *priv = fe-&gt;tuner_priv;</div><div class='add'>+</div><div class='add'>+	/* analog side (tuner-core) uses i2c_adap-&gt;algo_data.</div><div class='add'>+	 * digital side is not guaranteed to have algo_data defined.</div><div class='add'>+	 *</div><div class='add'>+	 * digital side will always have fe-&gt;dvb defined.</div><div class='add'>+	 * analog side (tuner-core) doesn't (yet) define fe-&gt;dvb.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	return (!fe-&gt;callback) ? -EINVAL :</div><div class='add'>+		fe-&gt;callback(((fe-&gt;dvb) &amp;&amp; (fe-&gt;dvb-&gt;priv)) ?</div><div class='add'>+				fe-&gt;dvb-&gt;priv : priv-&gt;i2c_props.adap-&gt;algo_data,</div><div class='add'>+			     DVB_FRONTEND_COMPONENT_TUNER, cmd, arg);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int load_firmware(struct dvb_frontend *fe, unsigned int type,</div><div class='ctx'> 			 v4l2_std_id *id)</div><div class='ctx'> {</div><div class='hunk'>@@ -530,8 +544,7 @@ static int load_firmware(struct dvb_frontend *fe, unsigned int type,</div><div class='ctx'> </div><div class='ctx'> 		if (!size) {</div><div class='ctx'> 			/* Special callback command received */</div><div class='del'>-			rc = priv-&gt;tuner_callback(priv-&gt;video_dev,</div><div class='del'>-						  XC2028_TUNER_RESET, 0);</div><div class='add'>+			rc = do_tuner_callback(fe, XC2028_TUNER_RESET, 0);</div><div class='ctx'> 			if (rc &lt; 0) {</div><div class='ctx'> 				tuner_err("Error at RESET code %d\n",</div><div class='ctx'> 					   (*p) &amp; 0x7f);</div><div class='hunk'>@@ -542,8 +555,7 @@ static int load_firmware(struct dvb_frontend *fe, unsigned int type,</div><div class='ctx'> 		if (size &gt;= 0xff00) {</div><div class='ctx'> 			switch (size) {</div><div class='ctx'> 			case 0xff00:</div><div class='del'>-				rc = priv-&gt;tuner_callback(priv-&gt;video_dev,</div><div class='del'>-							XC2028_RESET_CLK, 0);</div><div class='add'>+				rc = do_tuner_callback(fe, XC2028_RESET_CLK, 0);</div><div class='ctx'> 				if (rc &lt; 0) {</div><div class='ctx'> 					tuner_err("Error at RESET code %d\n",</div><div class='ctx'> 						  (*p) &amp; 0x7f);</div><div class='hunk'>@@ -715,8 +727,7 @@ retry:</div><div class='ctx'> 	memset(&amp;priv-&gt;cur_fw, 0, sizeof(priv-&gt;cur_fw));</div><div class='ctx'> </div><div class='ctx'> 	/* Reset is needed before loading firmware */</div><div class='del'>-	rc = priv-&gt;tuner_callback(priv-&gt;video_dev,</div><div class='del'>-				  XC2028_TUNER_RESET, 0);</div><div class='add'>+	rc = do_tuner_callback(fe, XC2028_TUNER_RESET, 0);</div><div class='ctx'> 	if (rc &lt; 0)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='hunk'>@@ -933,7 +944,7 @@ static int generic_set_freq(struct dvb_frontend *fe, u32 freq /* in HZ */,</div><div class='ctx'> 	   The reset CLK is needed only with tm6000.</div><div class='ctx'> 	   Driver should work fine even if this fails.</div><div class='ctx'> 	 */</div><div class='del'>-	priv-&gt;tuner_callback(priv-&gt;video_dev, XC2028_RESET_CLK, 1);</div><div class='add'>+	do_tuner_callback(fe, XC2028_RESET_CLK, 1);</div><div class='ctx'> </div><div class='ctx'> 	msleep(10);</div><div class='ctx'> </div><div class='hunk'>@@ -1002,11 +1013,6 @@ static int xc2028_set_params(struct dvb_frontend *fe,</div><div class='ctx'> </div><div class='ctx'> 	tuner_dbg("%s called\n", __func__);</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;ctrl.d2633)</div><div class='del'>-		type |= D2633;</div><div class='del'>-	else</div><div class='del'>-		type |= D2620;</div><div class='del'>-</div><div class='ctx'> 	switch(fe-&gt;ops.info.type) {</div><div class='ctx'> 	case FE_OFDM:</div><div class='ctx'> 		bw = p-&gt;u.ofdm.bandwidth;</div><div class='hunk'>@@ -1021,10 +1027,8 @@ static int xc2028_set_params(struct dvb_frontend *fe,</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FE_ATSC:</div><div class='ctx'> 		bw = BANDWIDTH_6_MHZ;</div><div class='del'>-		/* The only ATSC firmware (at least on v2.7) is D2633,</div><div class='del'>-		   so overrides ctrl-&gt;d2633 */</div><div class='del'>-		type |= ATSC| D2633;</div><div class='del'>-		type &amp;= ~D2620;</div><div class='add'>+		/* The only ATSC firmware (at least on v2.7) is D2633 */</div><div class='add'>+		type |= ATSC | D2633;</div><div class='ctx'> 		break;</div><div class='ctx'> 	/* DVB-S is not supported */</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -1057,6 +1061,28 @@ static int xc2028_set_params(struct dvb_frontend *fe,</div><div class='ctx'> 		tuner_err("error: bandwidth not supported.\n");</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	  Selects between D2633 or D2620 firmware.</div><div class='add'>+	  It doesn't make sense for ATSC, since it should be D2633 on all cases</div><div class='add'>+	 */</div><div class='add'>+	if (fe-&gt;ops.info.type != FE_ATSC) {</div><div class='add'>+		switch (priv-&gt;ctrl.type) {</div><div class='add'>+		case XC2028_D2633:</div><div class='add'>+			type |= D2633;</div><div class='add'>+			break;</div><div class='add'>+		case XC2028_D2620:</div><div class='add'>+			type |= D2620;</div><div class='add'>+			break;</div><div class='add'>+		case XC2028_AUTO:</div><div class='add'>+		default:</div><div class='add'>+			/* Zarlink seems to need D2633 */</div><div class='add'>+			if (priv-&gt;ctrl.demod == XC3028_FE_ZARLINK456)</div><div class='add'>+				type |= D2633;</div><div class='add'>+			else</div><div class='add'>+				type |= D2620;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* All S-code tables need a 200kHz shift */</div><div class='ctx'> 	if (priv-&gt;ctrl.demod)</div><div class='ctx'> 		demod = priv-&gt;ctrl.demod + 200;</div><div class='hunk'>@@ -1177,20 +1203,10 @@ struct dvb_frontend *xc2028_attach(struct dvb_frontend *fe,</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 1:</div><div class='ctx'> 		/* new tuner instance */</div><div class='del'>-		priv-&gt;tuner_callback = cfg-&gt;callback;</div><div class='ctx'> 		priv-&gt;ctrl.max_len = 13;</div><div class='ctx'> </div><div class='ctx'> 		mutex_init(&amp;priv-&gt;lock);</div><div class='ctx'> </div><div class='del'>-		/* analog side (tuner-core) uses i2c_adap-&gt;algo_data.</div><div class='del'>-		 * digital side is not guaranteed to have algo_data defined.</div><div class='del'>-		 *</div><div class='del'>-		 * digital side will always have fe-&gt;dvb defined.</div><div class='del'>-		 * analog side (tuner-core) doesn't (yet) define fe-&gt;dvb.</div><div class='del'>-		 */</div><div class='del'>-		priv-&gt;video_dev = ((fe-&gt;dvb) &amp;&amp; (fe-&gt;dvb-&gt;priv)) ?</div><div class='del'>-				   fe-&gt;dvb-&gt;priv : cfg-&gt;i2c_adap-&gt;algo_data;</div><div class='del'>-</div><div class='ctx'> 		fe-&gt;tuner_priv = priv;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 2:</div><div class='head'>diff --git a/drivers/media/common/tuners/tuner-xc2028.h b/drivers/media/common/tuners/tuner-xc2028.h<br/>index 2c5b6282b569..19de7928a74e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/common/tuners/tuner-xc2028.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/common/tuners/tuner-xc2028.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/common/tuners/tuner-xc2028.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/common/tuners/tuner-xc2028.h</a></div><div class='hunk'>@@ -24,24 +24,28 @@</div><div class='ctx'> #define	XC3028_FE_ZARLINK456	4560</div><div class='ctx'> #define	XC3028_FE_CHINA		5200</div><div class='ctx'> </div><div class='add'>+enum firmware_type {</div><div class='add'>+	XC2028_AUTO = 0,        /* By default, auto-detects */</div><div class='add'>+	XC2028_D2633,</div><div class='add'>+	XC2028_D2620,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct xc2028_ctrl {</div><div class='ctx'> 	char			*fname;</div><div class='ctx'> 	int			max_len;</div><div class='ctx'> 	unsigned int		scode_table;</div><div class='ctx'> 	unsigned int		mts   :1;</div><div class='del'>-	unsigned int		d2633 :1;</div><div class='ctx'> 	unsigned int		input1:1;</div><div class='ctx'> 	unsigned int		vhfbw7:1;</div><div class='ctx'> 	unsigned int		uhfbw8:1;</div><div class='ctx'> 	unsigned int		demod;</div><div class='add'>+	enum firmware_type	type:2;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct xc2028_config {</div><div class='ctx'> 	struct i2c_adapter *i2c_adap;</div><div class='ctx'> 	u8 		   i2c_addr;</div><div class='del'>-	void               *video_dev;</div><div class='ctx'> 	struct xc2028_ctrl *ctrl;</div><div class='del'>-	int                (*callback) (void *dev, int command, int arg);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* xc2028 commands for callback */</div><div class='head'>diff --git a/drivers/media/common/tuners/xc5000.c b/drivers/media/common/tuners/xc5000.c<br/>index dcddfa803a75..e12d13e0cbe9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/common/tuners/xc5000.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/common/tuners/xc5000.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/common/tuners/xc5000.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/common/tuners/xc5000.c</a></div><div class='hunk'>@@ -30,7 +30,7 @@</div><div class='ctx'> #include "dvb_frontend.h"</div><div class='ctx'> </div><div class='ctx'> #include "xc5000.h"</div><div class='del'>-#include "xc5000_priv.h"</div><div class='add'>+#include "tuner-i2c.h"</div><div class='ctx'> </div><div class='ctx'> static int debug;</div><div class='ctx'> module_param(debug, int, 0644);</div><div class='hunk'>@@ -40,12 +40,26 @@ static int xc5000_load_fw_on_attach;</div><div class='ctx'> module_param_named(init_fw, xc5000_load_fw_on_attach, int, 0644);</div><div class='ctx'> MODULE_PARM_DESC(init_fw, "Load firmware during driver initialization.");</div><div class='ctx'> </div><div class='del'>-#define dprintk(level,fmt, arg...) if (debug &gt;= level) \</div><div class='add'>+static DEFINE_MUTEX(xc5000_list_mutex);</div><div class='add'>+static LIST_HEAD(hybrid_tuner_instance_list);</div><div class='add'>+</div><div class='add'>+#define dprintk(level, fmt, arg...) if (debug &gt;= level) \</div><div class='ctx'> 	printk(KERN_INFO "%s: " fmt, "xc5000", ## arg)</div><div class='ctx'> </div><div class='ctx'> #define XC5000_DEFAULT_FIRMWARE "dvb-fe-xc5000-1.1.fw"</div><div class='ctx'> #define XC5000_DEFAULT_FIRMWARE_SIZE 12332</div><div class='ctx'> </div><div class='add'>+struct xc5000_priv {</div><div class='add'>+	struct tuner_i2c_props i2c_props;</div><div class='add'>+	struct list_head hybrid_tuner_instance_list;</div><div class='add'>+</div><div class='add'>+	u32 if_khz;</div><div class='add'>+	u32 freq_hz;</div><div class='add'>+	u32 bandwidth;</div><div class='add'>+	u8  video_standard;</div><div class='add'>+	u8  rf_mode;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* Misc Defines */</div><div class='ctx'> #define MAX_TV_STANDARD			23</div><div class='ctx'> #define XC_MAX_I2C_WRITE_LENGTH		64</div><div class='hunk'>@@ -124,11 +138,11 @@ MODULE_PARM_DESC(init_fw, "Load firmware during driver initialization.");</div><div class='ctx'>    immediately the length of the following transaction.</div><div class='ctx'> </div><div class='ctx'> */</div><div class='del'>-typedef struct {</div><div class='add'>+struct XC_TV_STANDARD {</div><div class='ctx'> 	char *Name;</div><div class='ctx'> 	u16 AudioMode;</div><div class='ctx'> 	u16 VideoMode;</div><div class='del'>-} XC_TV_STANDARD;</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> /* Tuner standards */</div><div class='ctx'> #define MN_NTSC_PAL_BTSC	0</div><div class='hunk'>@@ -155,7 +169,7 @@ typedef struct {</div><div class='ctx'> #define FM_Radio_INPUT2 	21</div><div class='ctx'> #define FM_Radio_INPUT1 	22</div><div class='ctx'> </div><div class='del'>-static XC_TV_STANDARD XC5000_Standard[MAX_TV_STANDARD] = {</div><div class='add'>+static struct XC_TV_STANDARD XC5000_Standard[MAX_TV_STANDARD] = {</div><div class='ctx'> 	{"M/N-NTSC/PAL-BTSC", 0x0400, 0x8020},</div><div class='ctx'> 	{"M/N-NTSC/PAL-A2",   0x0600, 0x8020},</div><div class='ctx'> 	{"M/N-NTSC/PAL-EIAJ", 0x0440, 0x8020},</div><div class='hunk'>@@ -169,7 +183,7 @@ static XC_TV_STANDARD XC5000_Standard[MAX_TV_STANDARD] = {</div><div class='ctx'> 	{"D/K-PAL-NICAM",     0x0E80, 0x8009},</div><div class='ctx'> 	{"D/K-PAL-MONO",      0x1478, 0x8009},</div><div class='ctx'> 	{"D/K-SECAM-A2 DK1",  0x1200, 0x8009},</div><div class='del'>-	{"D/K-SECAM-A2 L/DK3",0x0E00, 0x8009},</div><div class='add'>+	{"D/K-SECAM-A2 L/DK3", 0x0E00, 0x8009},</div><div class='ctx'> 	{"D/K-SECAM-A2 MONO", 0x1478, 0x8009},</div><div class='ctx'> 	{"L-SECAM-NICAM",     0x8E82, 0x0009},</div><div class='ctx'> 	{"L'-SECAM-NICAM",    0x8E82, 0x4009},</div><div class='hunk'>@@ -216,9 +230,12 @@ static void xc5000_TunerReset(struct dvb_frontend *fe)</div><div class='ctx'> </div><div class='ctx'> 	dprintk(1, "%s()\n", __func__);</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;cfg-&gt;tuner_callback) {</div><div class='del'>-		ret = priv-&gt;cfg-&gt;tuner_callback(priv-&gt;devptr,</div><div class='del'>-						XC5000_TUNER_RESET, 0);</div><div class='add'>+	if (fe-&gt;callback) {</div><div class='add'>+		ret = fe-&gt;callback(((fe-&gt;dvb) &amp;&amp; (fe-&gt;dvb-&gt;priv)) ?</div><div class='add'>+					   fe-&gt;dvb-&gt;priv :</div><div class='add'>+					   priv-&gt;i2c_props.adap-&gt;algo_data,</div><div class='add'>+					   DVB_FRONTEND_COMPONENT_TUNER,</div><div class='add'>+					   XC5000_TUNER_RESET, 0);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			printk(KERN_ERR "xc5000: reset failed\n");</div><div class='ctx'> 	} else</div><div class='hunk'>@@ -290,9 +307,10 @@ static int xc_load_i2c_sequence(struct dvb_frontend *fe, const u8 *i2c_sequence)</div><div class='ctx'> 	unsigned int len, pos, index;</div><div class='ctx'> 	u8 buf[XC_MAX_I2C_WRITE_LENGTH];</div><div class='ctx'> </div><div class='del'>-	index=0;</div><div class='del'>-	while ((i2c_sequence[index]!=0xFF) || (i2c_sequence[index+1]!=0xFF)) {</div><div class='del'>-		len = i2c_sequence[index]* 256 + i2c_sequence[index+1];</div><div class='add'>+	index = 0;</div><div class='add'>+	while ((i2c_sequence[index] != 0xFF) ||</div><div class='add'>+		(i2c_sequence[index + 1] != 0xFF)) {</div><div class='add'>+		len = i2c_sequence[index] * 256 + i2c_sequence[index+1];</div><div class='ctx'> 		if (len == 0x0000) {</div><div class='ctx'> 			/* RESET command */</div><div class='ctx'> 			result = xc_reset(fe);</div><div class='hunk'>@@ -312,15 +330,17 @@ static int xc_load_i2c_sequence(struct dvb_frontend *fe, const u8 *i2c_sequence)</div><div class='ctx'> 			buf[1] = i2c_sequence[index + 1];</div><div class='ctx'> 			pos = 2;</div><div class='ctx'> 			while (pos &lt; len) {</div><div class='del'>-				if ((len - pos) &gt; XC_MAX_I2C_WRITE_LENGTH - 2) {</div><div class='del'>-					nbytes_to_send = XC_MAX_I2C_WRITE_LENGTH;</div><div class='del'>-				} else {</div><div class='add'>+				if ((len - pos) &gt; XC_MAX_I2C_WRITE_LENGTH - 2)</div><div class='add'>+					nbytes_to_send =</div><div class='add'>+						XC_MAX_I2C_WRITE_LENGTH;</div><div class='add'>+				else</div><div class='ctx'> 					nbytes_to_send = (len - pos + 2);</div><div class='add'>+				for (i = 2; i &lt; nbytes_to_send; i++) {</div><div class='add'>+					buf[i] = i2c_sequence[index + pos +</div><div class='add'>+						i - 2];</div><div class='ctx'> 				}</div><div class='del'>-				for (i=2; i&lt;nbytes_to_send; i++) {</div><div class='del'>-					buf[i] = i2c_sequence[index + pos + i - 2];</div><div class='del'>-				}</div><div class='del'>-				result = xc_send_i2c_data(priv, buf, nbytes_to_send);</div><div class='add'>+				result = xc_send_i2c_data(priv, buf,</div><div class='add'>+					nbytes_to_send);</div><div class='ctx'> </div><div class='ctx'> 				if (result != XC_RESULT_SUCCESS)</div><div class='ctx'> 					return result;</div><div class='hunk'>@@ -369,8 +389,7 @@ static int xc_SetSignalSource(struct xc5000_priv *priv, u16 rf_mode)</div><div class='ctx'> 	dprintk(1, "%s(%d) Source = %s\n", __func__, rf_mode,</div><div class='ctx'> 		rf_mode == XC_RF_MODE_AIR ? "ANTENNA" : "CABLE");</div><div class='ctx'> </div><div class='del'>-	if ((rf_mode != XC_RF_MODE_AIR) &amp;&amp; (rf_mode != XC_RF_MODE_CABLE))</div><div class='del'>-	{</div><div class='add'>+	if ((rf_mode != XC_RF_MODE_AIR) &amp;&amp; (rf_mode != XC_RF_MODE_CABLE)) {</div><div class='ctx'> 		rf_mode = XC_RF_MODE_CABLE;</div><div class='ctx'> 		printk(KERN_ERR</div><div class='ctx'> 			"%s(), Invalid mode, defaulting to CABLE",</div><div class='hunk'>@@ -509,13 +528,13 @@ static int xc5000_readreg(struct xc5000_priv *priv, u16 reg, u16 *val)</div><div class='ctx'> 	u8 buf[2] = { reg &gt;&gt; 8, reg &amp; 0xff };</div><div class='ctx'> 	u8 bval[2] = { 0, 0 };</div><div class='ctx'> 	struct i2c_msg msg[2] = {</div><div class='del'>-		{ .addr = priv-&gt;cfg-&gt;i2c_address,</div><div class='add'>+		{ .addr = priv-&gt;i2c_props.addr,</div><div class='ctx'> 			.flags = 0, .buf = &amp;buf[0], .len = 2 },</div><div class='del'>-		{ .addr = priv-&gt;cfg-&gt;i2c_address,</div><div class='add'>+		{ .addr = priv-&gt;i2c_props.addr,</div><div class='ctx'> 			.flags = I2C_M_RD, .buf = &amp;bval[0], .len = 2 },</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	if (i2c_transfer(priv-&gt;i2c, msg, 2) != 2) {</div><div class='add'>+	if (i2c_transfer(priv-&gt;i2c_props.adap, msg, 2) != 2) {</div><div class='ctx'> 		printk(KERN_WARNING "xc5000: I2C read failed\n");</div><div class='ctx'> 		return -EREMOTEIO;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -526,10 +545,10 @@ static int xc5000_readreg(struct xc5000_priv *priv, u16 reg, u16 *val)</div><div class='ctx'> </div><div class='ctx'> static int xc5000_writeregs(struct xc5000_priv *priv, u8 *buf, u8 len)</div><div class='ctx'> {</div><div class='del'>-	struct i2c_msg msg = { .addr = priv-&gt;cfg-&gt;i2c_address,</div><div class='add'>+	struct i2c_msg msg = { .addr = priv-&gt;i2c_props.addr,</div><div class='ctx'> 		.flags = 0, .buf = buf, .len = len };</div><div class='ctx'> </div><div class='del'>-	if (i2c_transfer(priv-&gt;i2c, &amp;msg, 1) != 1) {</div><div class='add'>+	if (i2c_transfer(priv-&gt;i2c_props.adap, &amp;msg, 1) != 1) {</div><div class='ctx'> 		printk(KERN_ERR "xc5000: I2C write failed (len=%i)\n",</div><div class='ctx'> 			(int)len);</div><div class='ctx'> 		return -EREMOTEIO;</div><div class='hunk'>@@ -539,17 +558,17 @@ static int xc5000_writeregs(struct xc5000_priv *priv, u8 *buf, u8 len)</div><div class='ctx'> </div><div class='ctx'> static int xc5000_readregs(struct xc5000_priv *priv, u8 *buf, u8 len)</div><div class='ctx'> {</div><div class='del'>-	struct i2c_msg msg = { .addr = priv-&gt;cfg-&gt;i2c_address,</div><div class='add'>+	struct i2c_msg msg = { .addr = priv-&gt;i2c_props.addr,</div><div class='ctx'> 		.flags = I2C_M_RD, .buf = buf, .len = len };</div><div class='ctx'> </div><div class='del'>-	if (i2c_transfer(priv-&gt;i2c, &amp;msg, 1) != 1) {</div><div class='del'>-		printk(KERN_ERR "xc5000 I2C read failed (len=%i)\n",(int)len);</div><div class='add'>+	if (i2c_transfer(priv-&gt;i2c_props.adap, &amp;msg, 1) != 1) {</div><div class='add'>+		printk(KERN_ERR "xc5000 I2C read failed (len=%i)\n", (int)len);</div><div class='ctx'> 		return -EREMOTEIO;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int xc5000_fwupload(struct dvb_frontend* fe)</div><div class='add'>+static int xc5000_fwupload(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct xc5000_priv *priv = fe-&gt;tuner_priv;</div><div class='ctx'> 	const struct firmware *fw;</div><div class='hunk'>@@ -559,7 +578,8 @@ static int xc5000_fwupload(struct dvb_frontend* fe)</div><div class='ctx'> 	printk(KERN_INFO "xc5000: waiting for firmware upload (%s)...\n",</div><div class='ctx'> 		XC5000_DEFAULT_FIRMWARE);</div><div class='ctx'> </div><div class='del'>-	ret = request_firmware(&amp;fw, XC5000_DEFAULT_FIRMWARE, &amp;priv-&gt;i2c-&gt;dev);</div><div class='add'>+	ret = request_firmware(&amp;fw, XC5000_DEFAULT_FIRMWARE,</div><div class='add'>+		&amp;priv-&gt;i2c_props.adap-&gt;dev);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		printk(KERN_ERR "xc5000: Upload failed. (file not found?)\n");</div><div class='ctx'> 		ret = XC_RESULT_RESET_FAILURE;</div><div class='hunk'>@@ -575,7 +595,7 @@ static int xc5000_fwupload(struct dvb_frontend* fe)</div><div class='ctx'> 		ret = XC_RESULT_RESET_FAILURE;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		printk(KERN_INFO "xc5000: firmware upload\n");</div><div class='del'>-		ret = xc_load_i2c_sequence(fe,  fw-&gt;data );</div><div class='add'>+		ret = xc_load_i2c_sequence(fe,  fw-&gt;data);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='hunk'>@@ -634,7 +654,7 @@ static int xc5000_set_params(struct dvb_frontend *fe,</div><div class='ctx'> </div><div class='ctx'> 	dprintk(1, "%s() frequency=%d (Hz)\n", __func__, params-&gt;frequency);</div><div class='ctx'> </div><div class='del'>-	switch(params-&gt;u.vsb.modulation) {</div><div class='add'>+	switch (params-&gt;u.vsb.modulation) {</div><div class='ctx'> 	case VSB_8:</div><div class='ctx'> 	case VSB_16:</div><div class='ctx'> 		dprintk(1, "%s() VSB modulation\n", __func__);</div><div class='hunk'>@@ -675,10 +695,10 @@ static int xc5000_set_params(struct dvb_frontend *fe,</div><div class='ctx'> 		return -EREMOTEIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = xc_set_IF_frequency(priv, priv-&gt;cfg-&gt;if_khz);</div><div class='add'>+	ret = xc_set_IF_frequency(priv, priv-&gt;if_khz);</div><div class='ctx'> 	if (ret != XC_RESULT_SUCCESS) {</div><div class='ctx'> 		printk(KERN_ERR "xc5000: xc_Set_IF_frequency(%d) failed\n",</div><div class='del'>-			priv-&gt;cfg-&gt;if_khz);</div><div class='add'>+		       priv-&gt;if_khz);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -731,42 +751,42 @@ static int xc5000_set_analog_params(struct dvb_frontend *fe,</div><div class='ctx'> 	/* FIX ME: Some video standards may have several possible audio</div><div class='ctx'> 		   standards. We simply default to one of them here.</div><div class='ctx'> 	 */</div><div class='del'>-	if(params-&gt;std &amp; V4L2_STD_MN) {</div><div class='add'>+	if (params-&gt;std &amp; V4L2_STD_MN) {</div><div class='ctx'> 		/* default to BTSC audio standard */</div><div class='ctx'> 		priv-&gt;video_standard = MN_NTSC_PAL_BTSC;</div><div class='ctx'> 		goto tune_channel;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if(params-&gt;std &amp; V4L2_STD_PAL_BG) {</div><div class='add'>+	if (params-&gt;std &amp; V4L2_STD_PAL_BG) {</div><div class='ctx'> 		/* default to NICAM audio standard */</div><div class='ctx'> 		priv-&gt;video_standard = BG_PAL_NICAM;</div><div class='ctx'> 		goto tune_channel;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if(params-&gt;std &amp; V4L2_STD_PAL_I) {</div><div class='add'>+	if (params-&gt;std &amp; V4L2_STD_PAL_I) {</div><div class='ctx'> 		/* default to NICAM audio standard */</div><div class='ctx'> 		priv-&gt;video_standard = I_PAL_NICAM;</div><div class='ctx'> 		goto tune_channel;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if(params-&gt;std &amp; V4L2_STD_PAL_DK) {</div><div class='add'>+	if (params-&gt;std &amp; V4L2_STD_PAL_DK) {</div><div class='ctx'> 		/* default to NICAM audio standard */</div><div class='ctx'> 		priv-&gt;video_standard = DK_PAL_NICAM;</div><div class='ctx'> 		goto tune_channel;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if(params-&gt;std &amp; V4L2_STD_SECAM_DK) {</div><div class='add'>+	if (params-&gt;std &amp; V4L2_STD_SECAM_DK) {</div><div class='ctx'> 		/* default to A2 DK1 audio standard */</div><div class='ctx'> 		priv-&gt;video_standard = DK_SECAM_A2DK1;</div><div class='ctx'> 		goto tune_channel;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if(params-&gt;std &amp; V4L2_STD_SECAM_L) {</div><div class='add'>+	if (params-&gt;std &amp; V4L2_STD_SECAM_L) {</div><div class='ctx'> 		priv-&gt;video_standard = L_SECAM_NICAM;</div><div class='ctx'> 		goto tune_channel;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if(params-&gt;std &amp; V4L2_STD_SECAM_LC) {</div><div class='add'>+	if (params-&gt;std &amp; V4L2_STD_SECAM_LC) {</div><div class='ctx'> 		priv-&gt;video_standard = LC_SECAM_NICAM;</div><div class='ctx'> 		goto tune_channel;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -774,7 +794,7 @@ static int xc5000_set_analog_params(struct dvb_frontend *fe,</div><div class='ctx'> tune_channel:</div><div class='ctx'> 	ret = xc_SetSignalSource(priv, priv-&gt;rf_mode);</div><div class='ctx'> 	if (ret != XC_RESULT_SUCCESS) {</div><div class='del'>-	printk(KERN_ERR</div><div class='add'>+		printk(KERN_ERR</div><div class='ctx'> 			"xc5000: xc_SetSignalSource(%d) failed\n",</div><div class='ctx'> 			priv-&gt;rf_mode);</div><div class='ctx'> 		return -EREMOTEIO;</div><div class='hunk'>@@ -846,7 +866,7 @@ static int xc_load_fw_and_init_tuner(struct dvb_frontend *fe)</div><div class='ctx'> 	 * I2C transactions until calibration is complete.  This way we</div><div class='ctx'> 	 * don't have to rely on clock stretching working.</div><div class='ctx'> 	 */</div><div class='del'>-	xc_wait( 100 );</div><div class='add'>+	xc_wait(100);</div><div class='ctx'> </div><div class='ctx'> 	/* Default to "CABLE" mode */</div><div class='ctx'> 	ret |= xc_write_reg(priv, XREG_SIGNALSOURCE, XC_RF_MODE_CABLE);</div><div class='hunk'>@@ -868,15 +888,13 @@ static int xc5000_sleep(struct dvb_frontend *fe)</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	ret = xc_shutdown(priv);</div><div class='del'>-	if(ret != XC_RESULT_SUCCESS) {</div><div class='add'>+	if (ret != XC_RESULT_SUCCESS) {</div><div class='ctx'> 		printk(KERN_ERR</div><div class='ctx'> 			"xc5000: %s() unable to shutdown tuner\n",</div><div class='ctx'> 			__func__);</div><div class='ctx'> 		return -EREMOTEIO;</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='add'>+	} else</div><div class='ctx'> 		return XC_RESULT_SUCCESS;</div><div class='del'>-	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int xc5000_init(struct dvb_frontend *fe)</div><div class='hunk'>@@ -897,9 +915,19 @@ static int xc5000_init(struct dvb_frontend *fe)</div><div class='ctx'> </div><div class='ctx'> static int xc5000_release(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct xc5000_priv *priv = fe-&gt;tuner_priv;</div><div class='add'>+</div><div class='ctx'> 	dprintk(1, "%s()\n", __func__);</div><div class='del'>-	kfree(fe-&gt;tuner_priv);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;xc5000_list_mutex);</div><div class='add'>+</div><div class='add'>+	if (priv)</div><div class='add'>+		hybrid_tuner_release_state(priv);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;xc5000_list_mutex);</div><div class='add'>+</div><div class='ctx'> 	fe-&gt;tuner_priv = NULL;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -924,31 +952,45 @@ static const struct dvb_tuner_ops xc5000_tuner_ops = {</div><div class='ctx'> </div><div class='ctx'> struct dvb_frontend *xc5000_attach(struct dvb_frontend *fe,</div><div class='ctx'> 				   struct i2c_adapter *i2c,</div><div class='del'>-				   struct xc5000_config *cfg, void *devptr)</div><div class='add'>+				   struct xc5000_config *cfg)</div><div class='ctx'> {</div><div class='ctx'> 	struct xc5000_priv *priv = NULL;</div><div class='add'>+	int instance;</div><div class='ctx'> 	u16 id = 0;</div><div class='ctx'> </div><div class='del'>-	dprintk(1, "%s()\n", __func__);</div><div class='add'>+	dprintk(1, "%s(%d-%04x)\n", __func__,</div><div class='add'>+		i2c ? i2c_adapter_id(i2c) : -1,</div><div class='add'>+		cfg ? cfg-&gt;i2c_address : -1);</div><div class='ctx'> </div><div class='del'>-	priv = kzalloc(sizeof(struct xc5000_priv), GFP_KERNEL);</div><div class='del'>-	if (priv == NULL)</div><div class='del'>-		return NULL;</div><div class='add'>+	mutex_lock(&amp;xc5000_list_mutex);</div><div class='ctx'> </div><div class='del'>-	priv-&gt;cfg = cfg;</div><div class='del'>-	priv-&gt;bandwidth = BANDWIDTH_6_MHZ;</div><div class='del'>-	priv-&gt;i2c = i2c;</div><div class='del'>-	priv-&gt;devptr = devptr;</div><div class='add'>+	instance = hybrid_tuner_request_state(struct xc5000_priv, priv,</div><div class='add'>+					      hybrid_tuner_instance_list,</div><div class='add'>+					      i2c, cfg-&gt;i2c_address, "xc5000");</div><div class='add'>+	switch (instance) {</div><div class='add'>+	case 0:</div><div class='add'>+		goto fail;</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		/* new tuner instance */</div><div class='add'>+		priv-&gt;bandwidth = BANDWIDTH_6_MHZ;</div><div class='add'>+		priv-&gt;if_khz = cfg-&gt;if_khz;</div><div class='add'>+</div><div class='add'>+		fe-&gt;tuner_priv = priv;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		/* existing tuner instance */</div><div class='add'>+		fe-&gt;tuner_priv = priv;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Check if firmware has been loaded. It is possible that another</div><div class='ctx'> 	   instance of the driver has loaded the firmware.</div><div class='ctx'> 	 */</div><div class='del'>-	if (xc5000_readreg(priv, XREG_PRODUCT_ID, &amp;id) != 0) {</div><div class='del'>-		kfree(priv);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='add'>+	if (xc5000_readreg(priv, XREG_PRODUCT_ID, &amp;id) != 0)</div><div class='add'>+		goto fail;</div><div class='ctx'> </div><div class='del'>-	switch(id) {</div><div class='add'>+	switch (id) {</div><div class='ctx'> 	case XC_PRODUCT_ID_FW_LOADED:</div><div class='ctx'> 		printk(KERN_INFO</div><div class='ctx'> 			"xc5000: Successfully identified at address 0x%02x\n",</div><div class='hunk'>@@ -967,19 +1009,23 @@ struct dvb_frontend *xc5000_attach(struct dvb_frontend *fe,</div><div class='ctx'> 		printk(KERN_ERR</div><div class='ctx'> 			"xc5000: Device not found at addr 0x%02x (0x%x)\n",</div><div class='ctx'> 			cfg-&gt;i2c_address, id);</div><div class='del'>-		kfree(priv);</div><div class='del'>-		return NULL;</div><div class='add'>+		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	mutex_unlock(&amp;xc5000_list_mutex);</div><div class='add'>+</div><div class='ctx'> 	memcpy(&amp;fe-&gt;ops.tuner_ops, &amp;xc5000_tuner_ops,</div><div class='ctx'> 		sizeof(struct dvb_tuner_ops));</div><div class='ctx'> </div><div class='del'>-	fe-&gt;tuner_priv = priv;</div><div class='del'>-</div><div class='ctx'> 	if (xc5000_load_fw_on_attach)</div><div class='ctx'> 		xc5000_init(fe);</div><div class='ctx'> </div><div class='ctx'> 	return fe;</div><div class='add'>+fail:</div><div class='add'>+	mutex_unlock(&amp;xc5000_list_mutex);</div><div class='add'>+</div><div class='add'>+	xc5000_release(fe);</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(xc5000_attach);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/common/tuners/xc5000.h b/drivers/media/common/tuners/xc5000.h<br/>index 5389f740945a..f4c146698a00 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/common/tuners/xc5000.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/common/tuners/xc5000.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/common/tuners/xc5000.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/common/tuners/xc5000.h</a></div><div class='hunk'>@@ -30,8 +30,6 @@ struct i2c_adapter;</div><div class='ctx'> struct xc5000_config {</div><div class='ctx'> 	u8   i2c_address;</div><div class='ctx'> 	u32  if_khz;</div><div class='del'>-</div><div class='del'>-	int  (*tuner_callback) (void *priv, int command, int arg);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* xc5000 callback command */</div><div class='hunk'>@@ -47,19 +45,17 @@ struct xc5000_config {</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_MEDIA_TUNER_XC5000) || \</div><div class='ctx'>     (defined(CONFIG_MEDIA_TUNER_XC5000_MODULE) &amp;&amp; defined(MODULE))</div><div class='del'>-extern struct dvb_frontend* xc5000_attach(struct dvb_frontend *fe,</div><div class='add'>+extern struct dvb_frontend *xc5000_attach(struct dvb_frontend *fe,</div><div class='ctx'> 					  struct i2c_adapter *i2c,</div><div class='del'>-					  struct xc5000_config *cfg,</div><div class='del'>-					  void *devptr);</div><div class='add'>+					  struct xc5000_config *cfg);</div><div class='ctx'> #else</div><div class='del'>-static inline struct dvb_frontend* xc5000_attach(struct dvb_frontend *fe,</div><div class='add'>+static inline struct dvb_frontend *xc5000_attach(struct dvb_frontend *fe,</div><div class='ctx'> 						 struct i2c_adapter *i2c,</div><div class='del'>-						 struct xc5000_config *cfg,</div><div class='del'>-						 void *devptr)</div><div class='add'>+						 struct xc5000_config *cfg)</div><div class='ctx'> {</div><div class='ctx'> 	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='del'>-#endif // CONFIG_MEDIA_TUNER_XC5000</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='del'>-#endif // __XC5000_H__</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/media/common/tuners/xc5000_priv.h b/drivers/media/common/tuners/xc5000_priv.h<br/>deleted file mode 100644<br/>index b2a0074c99c9..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/common/tuners/xc5000_priv.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/common/tuners/xc5000_priv.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,37 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Driver for Xceive XC5000 "QAM/8VSB single chip tuner"</div><div class='del'>- *</div><div class='del'>- *  Copyright (c) 2007 Steven Toth &lt;stoth@linuxtv.org&gt;</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License as published by</div><div class='del'>- *  the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *  (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *</div><div class='del'>- *  GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef XC5000_PRIV_H</div><div class='del'>-#define XC5000_PRIV_H</div><div class='del'>-</div><div class='del'>-struct xc5000_priv {</div><div class='del'>-	struct xc5000_config *cfg;</div><div class='del'>-	struct i2c_adapter   *i2c;</div><div class='del'>-</div><div class='del'>-	u32 freq_hz;</div><div class='del'>-	u32 bandwidth;</div><div class='del'>-	u8  video_standard;</div><div class='del'>-	u8  rf_mode;</div><div class='del'>-</div><div class='del'>-	void *devptr;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/drivers/media/dvb/Kconfig b/drivers/media/dvb/Kconfig<br/>index 8bc1445bd33b..0bcd852576d6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/dvb/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/Kconfig</a></div><div class='hunk'>@@ -20,7 +20,6 @@ comment "Supported USB Adapters"</div><div class='ctx'> source "drivers/media/dvb/dvb-usb/Kconfig"</div><div class='ctx'> source "drivers/media/dvb/ttusb-budget/Kconfig"</div><div class='ctx'> source "drivers/media/dvb/ttusb-dec/Kconfig"</div><div class='del'>-source "drivers/media/dvb/cinergyT2/Kconfig"</div><div class='ctx'> source "drivers/media/dvb/siano/Kconfig"</div><div class='ctx'> </div><div class='ctx'> comment "Supported FlexCopII (B2C2) Adapters"</div><div class='hunk'>@@ -35,6 +34,10 @@ comment "Supported Pluto2 Adapters"</div><div class='ctx'> 	depends on DVB_CORE &amp;&amp; PCI &amp;&amp; I2C</div><div class='ctx'> source "drivers/media/dvb/pluto2/Kconfig"</div><div class='ctx'> </div><div class='add'>+comment "Supported SDMC DM1105 Adapters"</div><div class='add'>+	depends on DVB_CORE &amp;&amp; PCI &amp;&amp; I2C</div><div class='add'>+source "drivers/media/dvb/dm1105/Kconfig"</div><div class='add'>+</div><div class='ctx'> comment "Supported DVB Frontends"</div><div class='ctx'> 	depends on DVB_CORE</div><div class='ctx'> source "drivers/media/dvb/frontends/Kconfig"</div><div class='head'>diff --git a/drivers/media/dvb/Makefile b/drivers/media/dvb/Makefile<br/>index d6ba4d195201..f91e9eb15e52 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/dvb/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/Makefile</a></div><div class='hunk'>@@ -2,4 +2,4 @@</div><div class='ctx'> # Makefile for the kernel multimedia device drivers.</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-obj-y        := dvb-core/ frontends/ ttpci/ ttusb-dec/ ttusb-budget/ b2c2/ bt8xx/ cinergyT2/ dvb-usb/ pluto2/ siano/</div><div class='add'>+obj-y        := dvb-core/ frontends/ ttpci/ ttusb-dec/ ttusb-budget/ b2c2/ bt8xx/ dvb-usb/ pluto2/ siano/ dm1105/</div><div class='head'>diff --git a/drivers/media/dvb/b2c2/flexcop-dma.c b/drivers/media/dvb/b2c2/flexcop-dma.c<br/>index a91ed28f03a4..26f0011a5078 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/b2c2/flexcop-dma.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/dvb/b2c2/flexcop-dma.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/b2c2/flexcop-dma.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/b2c2/flexcop-dma.c</a></div><div class='hunk'>@@ -10,7 +10,7 @@</div><div class='ctx'> int flexcop_dma_allocate(struct pci_dev *pdev, struct flexcop_dma *dma, u32 size)</div><div class='ctx'> {</div><div class='ctx'> 	u8 *tcpu;</div><div class='del'>-	dma_addr_t tdma;</div><div class='add'>+	dma_addr_t tdma = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (size % 2) {</div><div class='ctx'> 		err("dma buffersize has to be even.");</div><div class='head'>diff --git a/drivers/media/dvb/bt8xx/dvb-bt8xx.c b/drivers/media/dvb/bt8xx/dvb-bt8xx.c<br/>index 6afbfbbef0ce..48762a2b9e42 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/bt8xx/dvb-bt8xx.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/dvb/bt8xx/dvb-bt8xx.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/bt8xx/dvb-bt8xx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/bt8xx/dvb-bt8xx.c</a></div><div class='hunk'>@@ -702,7 +702,7 @@ static void frontend_init(struct dvb_bt8xx_card *card, u32 type)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (card-&gt;fe == NULL)</div><div class='del'>-		printk("dvb-bt8xx: A frontend driver was not found for device %04x/%04x subsystem %04x/%04x\n",</div><div class='add'>+		printk("dvb-bt8xx: A frontend driver was not found for device [%04x:%04x] subsystem [%04x:%04x]\n",</div><div class='ctx'> 		       card-&gt;bt-&gt;dev-&gt;vendor,</div><div class='ctx'> 		       card-&gt;bt-&gt;dev-&gt;device,</div><div class='ctx'> 		       card-&gt;bt-&gt;dev-&gt;subsystem_vendor,</div><div class='head'>diff --git a/drivers/media/dvb/cinergyT2/Kconfig b/drivers/media/dvb/cinergyT2/Kconfig<br/>deleted file mode 100644<br/>index c03513b2ccae..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/cinergyT2/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/dvb/cinergyT2/Kconfig</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,85 +0,0 @@</div><div class='del'>-config DVB_CINERGYT2</div><div class='del'>-	tristate "Terratec CinergyT2/qanu USB2 DVB-T receiver"</div><div class='del'>-	depends on DVB_CORE &amp;&amp; USB &amp;&amp; INPUT</div><div class='del'>-	help</div><div class='del'>-	  Support for "TerraTec CinergyT2" USB2.0 Highspeed DVB Receivers</div><div class='del'>-</div><div class='del'>-	  Say Y if you own such a device and want to use it.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-config DVB_CINERGYT2_TUNING</div><div class='del'>-	bool "sophisticated fine-tuning for CinergyT2 cards"</div><div class='del'>-	depends on DVB_CINERGYT2</div><div class='del'>-	help</div><div class='del'>-	  Here you can fine-tune some parameters of the CinergyT2 driver.</div><div class='del'>-</div><div class='del'>-	  Normally you don't need to touch this, but in exotic setups you</div><div class='del'>-	  may fine-tune your setup and adjust e.g. DMA buffer sizes for</div><div class='del'>-	  a particular application.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-config DVB_CINERGYT2_STREAM_URB_COUNT</div><div class='del'>-	int "Number of queued USB Request Blocks for Highspeed Stream Transfers"</div><div class='del'>-	depends on DVB_CINERGYT2_TUNING</div><div class='del'>-	default "32"</div><div class='del'>-	help</div><div class='del'>-	  USB Request Blocks for Highspeed Stream transfers are scheduled in</div><div class='del'>-	  a queue for the Host Controller.</div><div class='del'>-</div><div class='del'>-	  Usually the default value is a safe choice.</div><div class='del'>-</div><div class='del'>-	  You may increase this number if you are using this device in a</div><div class='del'>-	  Server Environment with many high-traffic USB Highspeed devices</div><div class='del'>-	  sharing the same USB bus.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-config DVB_CINERGYT2_STREAM_BUF_SIZE</div><div class='del'>-	int "Size of URB Stream Buffers for Highspeed Transfers"</div><div class='del'>-	depends on DVB_CINERGYT2_TUNING</div><div class='del'>-	default "512"</div><div class='del'>-	help</div><div class='del'>-	  Should be a multiple of native buffer size of 512 bytes.</div><div class='del'>-	  Default value is a safe choice.</div><div class='del'>-</div><div class='del'>-	  You may increase this number if you are using this device in a</div><div class='del'>-	  Server Environment with many high-traffic USB Highspeed devices</div><div class='del'>-	  sharing the same USB bus.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-config DVB_CINERGYT2_QUERY_INTERVAL</div><div class='del'>-	int "Status update interval [milliseconds]"</div><div class='del'>-	depends on DVB_CINERGYT2_TUNING</div><div class='del'>-	default "250"</div><div class='del'>-	help</div><div class='del'>-	  This is the interval for status readouts from the demodulator.</div><div class='del'>-	  You may try lower values if you need more responsive signal quality</div><div class='del'>-	  measurements.</div><div class='del'>-</div><div class='del'>-	  Please keep in mind that these updates cause traffic on the tuner</div><div class='del'>-	  control bus and thus may or may not affect reception sensitivity.</div><div class='del'>-</div><div class='del'>-	  The default value should be a safe choice for common applications.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-config DVB_CINERGYT2_ENABLE_RC_INPUT_DEVICE</div><div class='del'>-	bool "Register the onboard IR Remote Control Receiver as Input Device"</div><div class='del'>-	depends on DVB_CINERGYT2_TUNING</div><div class='del'>-	default y</div><div class='del'>-	help</div><div class='del'>-	  Enable this option if you want to use the onboard Infrared Remote</div><div class='del'>-	  Control Receiver as Linux-Input device.</div><div class='del'>-</div><div class='del'>-	  Right now only the keycode table for the default Remote Control</div><div class='del'>-	  delivered with the device is supported, please see the driver</div><div class='del'>-	  source code to find out how to add support for other controls.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-config DVB_CINERGYT2_RC_QUERY_INTERVAL</div><div class='del'>-	int "Infrared Remote Controller update interval [milliseconds]"</div><div class='del'>-	depends on DVB_CINERGYT2_TUNING &amp;&amp; DVB_CINERGYT2_ENABLE_RC_INPUT_DEVICE</div><div class='del'>-	default "50"</div><div class='del'>-	help</div><div class='del'>-	  If you have a very fast-repeating remote control you can try lower</div><div class='del'>-	  values, for normal consumer receivers the default value should be</div><div class='del'>-	  a safe choice.</div><div class='del'>-</div><div class='head'>diff --git a/drivers/media/dvb/cinergyT2/Makefile b/drivers/media/dvb/cinergyT2/Makefile<br/>deleted file mode 100644<br/>index d762d8cb0cf1..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/cinergyT2/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/dvb/cinergyT2/Makefile</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,3 +0,0 @@</div><div class='del'>-obj-$(CONFIG_DVB_CINERGYT2) += cinergyT2.o</div><div class='del'>-</div><div class='del'>-EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core/</div><div class='head'>diff --git a/drivers/media/dvb/cinergyT2/cinergyT2.c b/drivers/media/dvb/cinergyT2/cinergyT2.c<br/>deleted file mode 100644<br/>index a824f3719f81..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/cinergyT2/cinergyT2.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/dvb/cinergyT2/cinergyT2.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1105 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * TerraTec Cinergy T²/qanu USB2 DVB-T adapter.</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2004 Daniel Mack &lt;daniel@qanu.de&gt; and</div><div class='del'>- *		    Holger Waechtler &lt;holger@qanu.de&gt;</div><div class='del'>- *</div><div class='del'>- *  Protocol Spec published on http://qanu.de/specs/terratec_cinergyT2.pdf</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/usb.h&gt;</div><div class='del'>-#include &lt;linux/input.h&gt;</div><div class='del'>-#include &lt;linux/dvb/frontend.h&gt;</div><div class='del'>-#include &lt;linux/mutex.h&gt;</div><div class='del'>-#include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-</div><div class='del'>-#include "dmxdev.h"</div><div class='del'>-#include "dvb_demux.h"</div><div class='del'>-#include "dvb_net.h"</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_DVB_CINERGYT2_TUNING</div><div class='del'>-	#define STREAM_URB_COUNT (CONFIG_DVB_CINERGYT2_STREAM_URB_COUNT)</div><div class='del'>-	#define STREAM_BUF_SIZE (CONFIG_DVB_CINERGYT2_STREAM_BUF_SIZE)</div><div class='del'>-	#define QUERY_INTERVAL (CONFIG_DVB_CINERGYT2_QUERY_INTERVAL)</div><div class='del'>-	#ifdef CONFIG_DVB_CINERGYT2_ENABLE_RC_INPUT_DEVICE</div><div class='del'>-		#define RC_QUERY_INTERVAL (CONFIG_DVB_CINERGYT2_RC_QUERY_INTERVAL)</div><div class='del'>-		#define ENABLE_RC (1)</div><div class='del'>-	#endif</div><div class='del'>-#else</div><div class='del'>-	#define STREAM_URB_COUNT (32)</div><div class='del'>-	#define STREAM_BUF_SIZE (512)	/* bytes */</div><div class='del'>-	#define ENABLE_RC (1)</div><div class='del'>-	#define RC_QUERY_INTERVAL (50)	/* milliseconds */</div><div class='del'>-	#define QUERY_INTERVAL (333)	/* milliseconds */</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define DRIVER_NAME "TerraTec/qanu USB2.0 Highspeed DVB-T Receiver"</div><div class='del'>-</div><div class='del'>-static int debug;</div><div class='del'>-module_param_named(debug, debug, int, 0644);</div><div class='del'>-MODULE_PARM_DESC(debug, "Turn on/off debugging (default:off).");</div><div class='del'>-</div><div class='del'>-DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);</div><div class='del'>-</div><div class='del'>-#define dprintk(level, args...)						\</div><div class='del'>-do {									\</div><div class='del'>-	if ((debug &amp; level)) {						\</div><div class='del'>-		printk("%s: %s(): ", KBUILD_MODNAME,			\</div><div class='del'>-		       __func__);					\</div><div class='del'>-		printk(args); }						\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-enum cinergyt2_ep1_cmd {</div><div class='del'>-	CINERGYT2_EP1_PID_TABLE_RESET		= 0x01,</div><div class='del'>-	CINERGYT2_EP1_PID_SETUP			= 0x02,</div><div class='del'>-	CINERGYT2_EP1_CONTROL_STREAM_TRANSFER	= 0x03,</div><div class='del'>-	CINERGYT2_EP1_SET_TUNER_PARAMETERS	= 0x04,</div><div class='del'>-	CINERGYT2_EP1_GET_TUNER_STATUS		= 0x05,</div><div class='del'>-	CINERGYT2_EP1_START_SCAN		= 0x06,</div><div class='del'>-	CINERGYT2_EP1_CONTINUE_SCAN		= 0x07,</div><div class='del'>-	CINERGYT2_EP1_GET_RC_EVENTS		= 0x08,</div><div class='del'>-	CINERGYT2_EP1_SLEEP_MODE		= 0x09</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct dvbt_set_parameters_msg {</div><div class='del'>-	uint8_t cmd;</div><div class='del'>-	__le32 freq;</div><div class='del'>-	uint8_t bandwidth;</div><div class='del'>-	__le16 tps;</div><div class='del'>-	uint8_t flags;</div><div class='del'>-} __attribute__((packed));</div><div class='del'>-</div><div class='del'>-struct dvbt_get_status_msg {</div><div class='del'>-	__le32 freq;</div><div class='del'>-	uint8_t bandwidth;</div><div class='del'>-	__le16 tps;</div><div class='del'>-	uint8_t flags;</div><div class='del'>-	__le16 gain;</div><div class='del'>-	uint8_t snr;</div><div class='del'>-	__le32 viterbi_error_rate;</div><div class='del'>-	__le32 rs_error_rate;</div><div class='del'>-	__le32 uncorrected_block_count;</div><div class='del'>-	uint8_t lock_bits;</div><div class='del'>-	uint8_t prev_lock_bits;</div><div class='del'>-} __attribute__((packed));</div><div class='del'>-</div><div class='del'>-static struct dvb_frontend_info cinergyt2_fe_info = {</div><div class='del'>-	.name = DRIVER_NAME,</div><div class='del'>-	.type = FE_OFDM,</div><div class='del'>-	.frequency_min = 174000000,</div><div class='del'>-	.frequency_max = 862000000,</div><div class='del'>-	.frequency_stepsize = 166667,</div><div class='del'>-	.caps = FE_CAN_INVERSION_AUTO | FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 |</div><div class='del'>-		FE_CAN_FEC_3_4 | FE_CAN_FEC_5_6 | FE_CAN_FEC_7_8 |</div><div class='del'>-		FE_CAN_FEC_AUTO |</div><div class='del'>-		FE_CAN_QPSK | FE_CAN_QAM_16 | FE_CAN_QAM_64 | FE_CAN_QAM_AUTO |</div><div class='del'>-		FE_CAN_TRANSMISSION_MODE_AUTO | FE_CAN_GUARD_INTERVAL_AUTO |</div><div class='del'>-		FE_CAN_HIERARCHY_AUTO | FE_CAN_RECOVER | FE_CAN_MUTE_TS</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct cinergyt2 {</div><div class='del'>-	struct dvb_demux demux;</div><div class='del'>-	struct usb_device *udev;</div><div class='del'>-	struct mutex sem;</div><div class='del'>-	struct mutex wq_sem;</div><div class='del'>-	struct dvb_adapter adapter;</div><div class='del'>-	struct dvb_device *fedev;</div><div class='del'>-	struct dmxdev dmxdev;</div><div class='del'>-	struct dvb_net dvbnet;</div><div class='del'>-</div><div class='del'>-	int streaming;</div><div class='del'>-	int sleeping;</div><div class='del'>-</div><div class='del'>-	struct dvbt_set_parameters_msg param;</div><div class='del'>-	struct dvbt_get_status_msg status;</div><div class='del'>-	struct delayed_work query_work;</div><div class='del'>-</div><div class='del'>-	wait_queue_head_t poll_wq;</div><div class='del'>-	int pending_fe_events;</div><div class='del'>-	int disconnect_pending;</div><div class='del'>-	unsigned int uncorrected_block_count;</div><div class='del'>-	atomic_t inuse;</div><div class='del'>-</div><div class='del'>-	void *streambuf;</div><div class='del'>-	dma_addr_t streambuf_dmahandle;</div><div class='del'>-	struct urb *stream_urb [STREAM_URB_COUNT];</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_RC</div><div class='del'>-	struct input_dev *rc_input_dev;</div><div class='del'>-	char phys[64];</div><div class='del'>-	struct delayed_work rc_query_work;</div><div class='del'>-	int rc_input_event;</div><div class='del'>-	__le32 rc_last_code;</div><div class='del'>-	unsigned long last_event_jiffies;</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	CINERGYT2_RC_EVENT_TYPE_NONE = 0x00,</div><div class='del'>-	CINERGYT2_RC_EVENT_TYPE_NEC  = 0x01,</div><div class='del'>-	CINERGYT2_RC_EVENT_TYPE_RC5  = 0x02</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct cinergyt2_rc_event {</div><div class='del'>-	char type;</div><div class='del'>-	__le32 value;</div><div class='del'>-} __attribute__((packed));</div><div class='del'>-</div><div class='del'>-static const uint32_t rc_keys[] = {</div><div class='del'>-	CINERGYT2_RC_EVENT_TYPE_NEC,	0xfe01eb04,	KEY_POWER,</div><div class='del'>-	CINERGYT2_RC_EVENT_TYPE_NEC,	0xfd02eb04,	KEY_1,</div><div class='del'>-	CINERGYT2_RC_EVENT_TYPE_NEC,	0xfc03eb04,	KEY_2,</div><div class='del'>-	CINERGYT2_RC_EVENT_TYPE_NEC,	0xfb04eb04,	KEY_3,</div><div class='del'>-	CINERGYT2_RC_EVENT_TYPE_NEC,	0xfa05eb04,	KEY_4,</div><div class='del'>-	CINERGYT2_RC_EVENT_TYPE_NEC,	0xf906eb04,	KEY_5,</div><div class='del'>-	CINERGYT2_RC_EVENT_TYPE_NEC,	0xf807eb04,	KEY_6,</div><div class='del'>-	CINERGYT2_RC_EVENT_TYPE_NEC,	0xf708eb04,	KEY_7,</div><div class='del'>-	CINERGYT2_RC_EVENT_TYPE_NEC,	0xf609eb04,	KEY_8,</div><div class='del'>-	CINERGYT2_RC_EVENT_TYPE_NEC,	0xf50aeb04,	KEY_9,</div><div class='del'>-	CINERGYT2_RC_EVENT_TYPE_NEC,	0xf30ceb04,	KEY_0,</div><div class='del'>-	CINERGYT2_RC_EVENT_TYPE_NEC,	0xf40beb04,	KEY_VIDEO,</div><div class='del'>-	CINERGYT2_RC_EVENT_TYPE_NEC,	0xf20deb04,	KEY_REFRESH,</div><div class='del'>-	CINERGYT2_RC_EVENT_TYPE_NEC,	0xf10eeb04,	KEY_SELECT,</div><div class='del'>-	CINERGYT2_RC_EVENT_TYPE_NEC,	0xf00feb04,	KEY_EPG,</div><div class='del'>-	CINERGYT2_RC_EVENT_TYPE_NEC,	0xef10eb04,	KEY_UP,</div><div class='del'>-	CINERGYT2_RC_EVENT_TYPE_NEC,	0xeb14eb04,	KEY_DOWN,</div><div class='del'>-	CINERGYT2_RC_EVENT_TYPE_NEC,	0xee11eb04,	KEY_LEFT,</div><div class='del'>-	CINERGYT2_RC_EVENT_TYPE_NEC,	0xec13eb04,	KEY_RIGHT,</div><div class='del'>-	CINERGYT2_RC_EVENT_TYPE_NEC,	0xed12eb04,	KEY_OK,</div><div class='del'>-	CINERGYT2_RC_EVENT_TYPE_NEC,	0xea15eb04,	KEY_TEXT,</div><div class='del'>-	CINERGYT2_RC_EVENT_TYPE_NEC,	0xe916eb04,	KEY_INFO,</div><div class='del'>-	CINERGYT2_RC_EVENT_TYPE_NEC,	0xe817eb04,	KEY_RED,</div><div class='del'>-	CINERGYT2_RC_EVENT_TYPE_NEC,	0xe718eb04,	KEY_GREEN,</div><div class='del'>-	CINERGYT2_RC_EVENT_TYPE_NEC,	0xe619eb04,	KEY_YELLOW,</div><div class='del'>-	CINERGYT2_RC_EVENT_TYPE_NEC,	0xe51aeb04,	KEY_BLUE,</div><div class='del'>-	CINERGYT2_RC_EVENT_TYPE_NEC,	0xe31ceb04,	KEY_VOLUMEUP,</div><div class='del'>-	CINERGYT2_RC_EVENT_TYPE_NEC,	0xe11eeb04,	KEY_VOLUMEDOWN,</div><div class='del'>-	CINERGYT2_RC_EVENT_TYPE_NEC,	0xe21deb04,	KEY_MUTE,</div><div class='del'>-	CINERGYT2_RC_EVENT_TYPE_NEC,	0xe41beb04,	KEY_CHANNELUP,</div><div class='del'>-	CINERGYT2_RC_EVENT_TYPE_NEC,	0xe01feb04,	KEY_CHANNELDOWN,</div><div class='del'>-	CINERGYT2_RC_EVENT_TYPE_NEC,	0xbf40eb04,	KEY_PAUSE,</div><div class='del'>-	CINERGYT2_RC_EVENT_TYPE_NEC,	0xb34ceb04,	KEY_PLAY,</div><div class='del'>-	CINERGYT2_RC_EVENT_TYPE_NEC,	0xa758eb04,	KEY_RECORD,</div><div class='del'>-	CINERGYT2_RC_EVENT_TYPE_NEC,	0xab54eb04,	KEY_PREVIOUS,</div><div class='del'>-	CINERGYT2_RC_EVENT_TYPE_NEC,	0xb748eb04,	KEY_STOP,</div><div class='del'>-	CINERGYT2_RC_EVENT_TYPE_NEC,	0xa35ceb04,	KEY_NEXT</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int cinergyt2_command (struct cinergyt2 *cinergyt2,</div><div class='del'>-			      char *send_buf, int send_buf_len,</div><div class='del'>-			      char *recv_buf, int recv_buf_len)</div><div class='del'>-{</div><div class='del'>-	int actual_len;</div><div class='del'>-	char dummy;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = usb_bulk_msg(cinergyt2-&gt;udev, usb_sndbulkpipe(cinergyt2-&gt;udev, 1),</div><div class='del'>-			   send_buf, send_buf_len, &amp;actual_len, 1000);</div><div class='del'>-</div><div class='del'>-	if (ret)</div><div class='del'>-		dprintk(1, "usb_bulk_msg (send) failed, err %i\n", ret);</div><div class='del'>-</div><div class='del'>-	if (!recv_buf)</div><div class='del'>-		recv_buf = &amp;dummy;</div><div class='del'>-</div><div class='del'>-	ret = usb_bulk_msg(cinergyt2-&gt;udev, usb_rcvbulkpipe(cinergyt2-&gt;udev, 1),</div><div class='del'>-			   recv_buf, recv_buf_len, &amp;actual_len, 1000);</div><div class='del'>-</div><div class='del'>-	if (ret)</div><div class='del'>-		dprintk(1, "usb_bulk_msg (read) failed, err %i\n", ret);</div><div class='del'>-</div><div class='del'>-	return ret ? ret : actual_len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void cinergyt2_control_stream_transfer (struct cinergyt2 *cinergyt2, int enable)</div><div class='del'>-{</div><div class='del'>-	char buf [] = { CINERGYT2_EP1_CONTROL_STREAM_TRANSFER, enable ? 1 : 0 };</div><div class='del'>-	cinergyt2_command(cinergyt2, buf, sizeof(buf), NULL, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void cinergyt2_sleep (struct cinergyt2 *cinergyt2, int sleep)</div><div class='del'>-{</div><div class='del'>-	char buf [] = { CINERGYT2_EP1_SLEEP_MODE, sleep ? 1 : 0 };</div><div class='del'>-	cinergyt2_command(cinergyt2, buf, sizeof(buf), NULL, 0);</div><div class='del'>-	cinergyt2-&gt;sleeping = sleep;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void cinergyt2_stream_irq (struct urb *urb);</div><div class='del'>-</div><div class='del'>-static int cinergyt2_submit_stream_urb (struct cinergyt2 *cinergyt2, struct urb *urb)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	usb_fill_bulk_urb(urb,</div><div class='del'>-			  cinergyt2-&gt;udev,</div><div class='del'>-			  usb_rcvbulkpipe(cinergyt2-&gt;udev, 0x2),</div><div class='del'>-			  urb-&gt;transfer_buffer,</div><div class='del'>-			  STREAM_BUF_SIZE,</div><div class='del'>-			  cinergyt2_stream_irq,</div><div class='del'>-			  cinergyt2);</div><div class='del'>-</div><div class='del'>-	if ((err = usb_submit_urb(urb, GFP_ATOMIC)))</div><div class='del'>-		dprintk(1, "urb submission failed (err = %i)!\n", err);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void cinergyt2_stream_irq (struct urb *urb)</div><div class='del'>-{</div><div class='del'>-	struct cinergyt2 *cinergyt2 = urb-&gt;context;</div><div class='del'>-</div><div class='del'>-	if (urb-&gt;actual_length &gt; 0)</div><div class='del'>-		dvb_dmx_swfilter(&amp;cinergyt2-&gt;demux,</div><div class='del'>-				 urb-&gt;transfer_buffer, urb-&gt;actual_length);</div><div class='del'>-</div><div class='del'>-	if (cinergyt2-&gt;streaming)</div><div class='del'>-		cinergyt2_submit_stream_urb(cinergyt2, urb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void cinergyt2_free_stream_urbs (struct cinergyt2 *cinergyt2)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i=0; i&lt;STREAM_URB_COUNT; i++)</div><div class='del'>-		usb_free_urb(cinergyt2-&gt;stream_urb[i]);</div><div class='del'>-</div><div class='del'>-	usb_buffer_free(cinergyt2-&gt;udev, STREAM_URB_COUNT*STREAM_BUF_SIZE,</div><div class='del'>-			    cinergyt2-&gt;streambuf, cinergyt2-&gt;streambuf_dmahandle);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cinergyt2_alloc_stream_urbs (struct cinergyt2 *cinergyt2)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	cinergyt2-&gt;streambuf = usb_buffer_alloc(cinergyt2-&gt;udev, STREAM_URB_COUNT*STREAM_BUF_SIZE,</div><div class='del'>-					      GFP_KERNEL, &amp;cinergyt2-&gt;streambuf_dmahandle);</div><div class='del'>-	if (!cinergyt2-&gt;streambuf) {</div><div class='del'>-		dprintk(1, "failed to alloc consistent stream memory area, bailing out!\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memset(cinergyt2-&gt;streambuf, 0, STREAM_URB_COUNT*STREAM_BUF_SIZE);</div><div class='del'>-</div><div class='del'>-	for (i=0; i&lt;STREAM_URB_COUNT; i++) {</div><div class='del'>-		struct urb *urb;</div><div class='del'>-</div><div class='del'>-		if (!(urb = usb_alloc_urb(0, GFP_ATOMIC))) {</div><div class='del'>-			dprintk(1, "failed to alloc consistent stream urbs, bailing out!\n");</div><div class='del'>-			cinergyt2_free_stream_urbs(cinergyt2);</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		urb-&gt;transfer_buffer = cinergyt2-&gt;streambuf + i * STREAM_BUF_SIZE;</div><div class='del'>-		urb-&gt;transfer_buffer_length = STREAM_BUF_SIZE;</div><div class='del'>-</div><div class='del'>-		cinergyt2-&gt;stream_urb[i] = urb;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void cinergyt2_stop_stream_xfer (struct cinergyt2 *cinergyt2)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	cinergyt2_control_stream_transfer(cinergyt2, 0);</div><div class='del'>-</div><div class='del'>-	for (i=0; i&lt;STREAM_URB_COUNT; i++)</div><div class='del'>-		usb_kill_urb(cinergyt2-&gt;stream_urb[i]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cinergyt2_start_stream_xfer (struct cinergyt2 *cinergyt2)</div><div class='del'>-{</div><div class='del'>-	int i, err;</div><div class='del'>-</div><div class='del'>-	for (i=0; i&lt;STREAM_URB_COUNT; i++) {</div><div class='del'>-		if ((err = cinergyt2_submit_stream_urb(cinergyt2, cinergyt2-&gt;stream_urb[i]))) {</div><div class='del'>-			cinergyt2_stop_stream_xfer(cinergyt2);</div><div class='del'>-			dprintk(1, "failed urb submission (%i: err = %i)!\n", i, err);</div><div class='del'>-			return err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cinergyt2_control_stream_transfer(cinergyt2, 1);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cinergyt2_start_feed(struct dvb_demux_feed *dvbdmxfeed)</div><div class='del'>-{</div><div class='del'>-	struct dvb_demux *demux = dvbdmxfeed-&gt;demux;</div><div class='del'>-	struct cinergyt2 *cinergyt2 = demux-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (cinergyt2-&gt;disconnect_pending)</div><div class='del'>-		return -EAGAIN;</div><div class='del'>-	if (mutex_lock_interruptible(&amp;cinergyt2-&gt;sem))</div><div class='del'>-		return -ERESTARTSYS;</div><div class='del'>-</div><div class='del'>-	if (cinergyt2-&gt;streaming == 0)</div><div class='del'>-		cinergyt2_start_stream_xfer(cinergyt2);</div><div class='del'>-</div><div class='del'>-	cinergyt2-&gt;streaming++;</div><div class='del'>-	mutex_unlock(&amp;cinergyt2-&gt;sem);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cinergyt2_stop_feed(struct dvb_demux_feed *dvbdmxfeed)</div><div class='del'>-{</div><div class='del'>-	struct dvb_demux *demux = dvbdmxfeed-&gt;demux;</div><div class='del'>-	struct cinergyt2 *cinergyt2 = demux-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (cinergyt2-&gt;disconnect_pending)</div><div class='del'>-		return -EAGAIN;</div><div class='del'>-	if (mutex_lock_interruptible(&amp;cinergyt2-&gt;sem))</div><div class='del'>-		return -ERESTARTSYS;</div><div class='del'>-</div><div class='del'>-	if (--cinergyt2-&gt;streaming == 0)</div><div class='del'>-		cinergyt2_stop_stream_xfer(cinergyt2);</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;cinergyt2-&gt;sem);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *  convert linux-dvb frontend parameter set into TPS.</div><div class='del'>- *  See ETSI ETS-300744, section 4.6.2, table 9 for details.</div><div class='del'>- *</div><div class='del'>- *  This function is probably reusable and may better get placed in a support</div><div class='del'>- *  library.</div><div class='del'>- *</div><div class='del'>- *  We replace errornous fields by default TPS fields (the ones with value 0).</div><div class='del'>- */</div><div class='del'>-static uint16_t compute_tps (struct dvb_frontend_parameters *p)</div><div class='del'>-{</div><div class='del'>-	struct dvb_ofdm_parameters *op = &amp;p-&gt;u.ofdm;</div><div class='del'>-	uint16_t tps = 0;</div><div class='del'>-</div><div class='del'>-	switch (op-&gt;code_rate_HP) {</div><div class='del'>-		case FEC_2_3:</div><div class='del'>-			tps |= (1 &lt;&lt; 7);</div><div class='del'>-			break;</div><div class='del'>-		case FEC_3_4:</div><div class='del'>-			tps |= (2 &lt;&lt; 7);</div><div class='del'>-			break;</div><div class='del'>-		case FEC_5_6:</div><div class='del'>-			tps |= (3 &lt;&lt; 7);</div><div class='del'>-			break;</div><div class='del'>-		case FEC_7_8:</div><div class='del'>-			tps |= (4 &lt;&lt; 7);</div><div class='del'>-			break;</div><div class='del'>-		case FEC_1_2:</div><div class='del'>-		case FEC_AUTO:</div><div class='del'>-		default:</div><div class='del'>-			/* tps |= (0 &lt;&lt; 7) */;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (op-&gt;code_rate_LP) {</div><div class='del'>-		case FEC_2_3:</div><div class='del'>-			tps |= (1 &lt;&lt; 4);</div><div class='del'>-			break;</div><div class='del'>-		case FEC_3_4:</div><div class='del'>-			tps |= (2 &lt;&lt; 4);</div><div class='del'>-			break;</div><div class='del'>-		case FEC_5_6:</div><div class='del'>-			tps |= (3 &lt;&lt; 4);</div><div class='del'>-			break;</div><div class='del'>-		case FEC_7_8:</div><div class='del'>-			tps |= (4 &lt;&lt; 4);</div><div class='del'>-			break;</div><div class='del'>-		case FEC_1_2:</div><div class='del'>-		case FEC_AUTO:</div><div class='del'>-		default:</div><div class='del'>-			/* tps |= (0 &lt;&lt; 4) */;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (op-&gt;constellation) {</div><div class='del'>-		case QAM_16:</div><div class='del'>-			tps |= (1 &lt;&lt; 13);</div><div class='del'>-			break;</div><div class='del'>-		case QAM_64:</div><div class='del'>-			tps |= (2 &lt;&lt; 13);</div><div class='del'>-			break;</div><div class='del'>-		case QPSK:</div><div class='del'>-		default:</div><div class='del'>-			/* tps |= (0 &lt;&lt; 13) */;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (op-&gt;transmission_mode) {</div><div class='del'>-		case TRANSMISSION_MODE_8K:</div><div class='del'>-			tps |= (1 &lt;&lt; 0);</div><div class='del'>-			break;</div><div class='del'>-		case TRANSMISSION_MODE_2K:</div><div class='del'>-		default:</div><div class='del'>-			/* tps |= (0 &lt;&lt; 0) */;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (op-&gt;guard_interval) {</div><div class='del'>-		case GUARD_INTERVAL_1_16:</div><div class='del'>-			tps |= (1 &lt;&lt; 2);</div><div class='del'>-			break;</div><div class='del'>-		case GUARD_INTERVAL_1_8:</div><div class='del'>-			tps |= (2 &lt;&lt; 2);</div><div class='del'>-			break;</div><div class='del'>-		case GUARD_INTERVAL_1_4:</div><div class='del'>-			tps |= (3 &lt;&lt; 2);</div><div class='del'>-			break;</div><div class='del'>-		case GUARD_INTERVAL_1_32:</div><div class='del'>-		default:</div><div class='del'>-			/* tps |= (0 &lt;&lt; 2) */;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (op-&gt;hierarchy_information) {</div><div class='del'>-		case HIERARCHY_1:</div><div class='del'>-			tps |= (1 &lt;&lt; 10);</div><div class='del'>-			break;</div><div class='del'>-		case HIERARCHY_2:</div><div class='del'>-			tps |= (2 &lt;&lt; 10);</div><div class='del'>-			break;</div><div class='del'>-		case HIERARCHY_4:</div><div class='del'>-			tps |= (3 &lt;&lt; 10);</div><div class='del'>-			break;</div><div class='del'>-		case HIERARCHY_NONE:</div><div class='del'>-		default:</div><div class='del'>-			/* tps |= (0 &lt;&lt; 10) */;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return tps;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cinergyt2_open (struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	struct dvb_device *dvbdev = file-&gt;private_data;</div><div class='del'>-	struct cinergyt2 *cinergyt2 = dvbdev-&gt;priv;</div><div class='del'>-	int err = -EAGAIN;</div><div class='del'>-</div><div class='del'>-	if (cinergyt2-&gt;disconnect_pending)</div><div class='del'>-		goto out;</div><div class='del'>-	err = mutex_lock_interruptible(&amp;cinergyt2-&gt;wq_sem);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	err = mutex_lock_interruptible(&amp;cinergyt2-&gt;sem);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out_unlock1;</div><div class='del'>-</div><div class='del'>-	if ((err = dvb_generic_open(inode, file)))</div><div class='del'>-		goto out_unlock2;</div><div class='del'>-</div><div class='del'>-	if ((file-&gt;f_flags &amp; O_ACCMODE) != O_RDONLY) {</div><div class='del'>-		cinergyt2_sleep(cinergyt2, 0);</div><div class='del'>-		schedule_delayed_work(&amp;cinergyt2-&gt;query_work, HZ/2);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	atomic_inc(&amp;cinergyt2-&gt;inuse);</div><div class='del'>-</div><div class='del'>-out_unlock2:</div><div class='del'>-	mutex_unlock(&amp;cinergyt2-&gt;sem);</div><div class='del'>-out_unlock1:</div><div class='del'>-	mutex_unlock(&amp;cinergyt2-&gt;wq_sem);</div><div class='del'>-out:</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void cinergyt2_unregister(struct cinergyt2 *cinergyt2)</div><div class='del'>-{</div><div class='del'>-	dvb_net_release(&amp;cinergyt2-&gt;dvbnet);</div><div class='del'>-	dvb_dmxdev_release(&amp;cinergyt2-&gt;dmxdev);</div><div class='del'>-	dvb_dmx_release(&amp;cinergyt2-&gt;demux);</div><div class='del'>-	dvb_unregister_device(cinergyt2-&gt;fedev);</div><div class='del'>-	dvb_unregister_adapter(&amp;cinergyt2-&gt;adapter);</div><div class='del'>-</div><div class='del'>-	cinergyt2_free_stream_urbs(cinergyt2);</div><div class='del'>-	kfree(cinergyt2);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cinergyt2_release (struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	struct dvb_device *dvbdev = file-&gt;private_data;</div><div class='del'>-	struct cinergyt2 *cinergyt2 = dvbdev-&gt;priv;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;cinergyt2-&gt;wq_sem);</div><div class='del'>-</div><div class='del'>-	if (!cinergyt2-&gt;disconnect_pending &amp;&amp; (file-&gt;f_flags &amp; O_ACCMODE) != O_RDONLY) {</div><div class='del'>-		cancel_rearming_delayed_work(&amp;cinergyt2-&gt;query_work);</div><div class='del'>-</div><div class='del'>-		mutex_lock(&amp;cinergyt2-&gt;sem);</div><div class='del'>-		cinergyt2_sleep(cinergyt2, 1);</div><div class='del'>-		mutex_unlock(&amp;cinergyt2-&gt;sem);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;cinergyt2-&gt;wq_sem);</div><div class='del'>-</div><div class='del'>-	if (atomic_dec_and_test(&amp;cinergyt2-&gt;inuse) &amp;&amp; cinergyt2-&gt;disconnect_pending) {</div><div class='del'>-		warn("delayed unregister in release");</div><div class='del'>-		cinergyt2_unregister(cinergyt2);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return dvb_generic_release(inode, file);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned int cinergyt2_poll (struct file *file, struct poll_table_struct *wait)</div><div class='del'>-{</div><div class='del'>-	struct dvb_device *dvbdev = file-&gt;private_data;</div><div class='del'>-	struct cinergyt2 *cinergyt2 = dvbdev-&gt;priv;</div><div class='del'>-	unsigned int mask = 0;</div><div class='del'>-</div><div class='del'>-	if (cinergyt2-&gt;disconnect_pending)</div><div class='del'>-		return -EAGAIN;</div><div class='del'>-	if (mutex_lock_interruptible(&amp;cinergyt2-&gt;sem))</div><div class='del'>-		return -ERESTARTSYS;</div><div class='del'>-</div><div class='del'>-	poll_wait(file, &amp;cinergyt2-&gt;poll_wq, wait);</div><div class='del'>-</div><div class='del'>-	if (cinergyt2-&gt;pending_fe_events != 0)</div><div class='del'>-		mask |= (POLLIN | POLLRDNORM | POLLPRI);</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;cinergyt2-&gt;sem);</div><div class='del'>-</div><div class='del'>-	return mask;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int cinergyt2_ioctl (struct inode *inode, struct file *file,</div><div class='del'>-		     unsigned cmd, unsigned long arg)</div><div class='del'>-{</div><div class='del'>-	struct dvb_device *dvbdev = file-&gt;private_data;</div><div class='del'>-	struct cinergyt2 *cinergyt2 = dvbdev-&gt;priv;</div><div class='del'>-	struct dvbt_get_status_msg *stat = &amp;cinergyt2-&gt;status;</div><div class='del'>-	fe_status_t status = 0;</div><div class='del'>-</div><div class='del'>-	switch (cmd) {</div><div class='del'>-	case FE_GET_INFO:</div><div class='del'>-		return copy_to_user((void __user*) arg, &amp;cinergyt2_fe_info,</div><div class='del'>-				    sizeof(struct dvb_frontend_info));</div><div class='del'>-</div><div class='del'>-	case FE_READ_STATUS:</div><div class='del'>-		if (0xffff - le16_to_cpu(stat-&gt;gain) &gt; 30)</div><div class='del'>-			status |= FE_HAS_SIGNAL;</div><div class='del'>-		if (stat-&gt;lock_bits &amp; (1 &lt;&lt; 6))</div><div class='del'>-			status |= FE_HAS_LOCK;</div><div class='del'>-		if (stat-&gt;lock_bits &amp; (1 &lt;&lt; 5))</div><div class='del'>-			status |= FE_HAS_SYNC;</div><div class='del'>-		if (stat-&gt;lock_bits &amp; (1 &lt;&lt; 4))</div><div class='del'>-			status |= FE_HAS_CARRIER;</div><div class='del'>-		if (stat-&gt;lock_bits &amp; (1 &lt;&lt; 1))</div><div class='del'>-			status |= FE_HAS_VITERBI;</div><div class='del'>-</div><div class='del'>-		return copy_to_user((void  __user*) arg, &amp;status, sizeof(status));</div><div class='del'>-</div><div class='del'>-	case FE_READ_BER:</div><div class='del'>-		return put_user(le32_to_cpu(stat-&gt;viterbi_error_rate),</div><div class='del'>-				(__u32 __user *) arg);</div><div class='del'>-</div><div class='del'>-	case FE_READ_SIGNAL_STRENGTH:</div><div class='del'>-		return put_user(0xffff - le16_to_cpu(stat-&gt;gain),</div><div class='del'>-				(__u16 __user *) arg);</div><div class='del'>-</div><div class='del'>-	case FE_READ_SNR:</div><div class='del'>-		return put_user((stat-&gt;snr &lt;&lt; 8) | stat-&gt;snr,</div><div class='del'>-				(__u16 __user *) arg);</div><div class='del'>-</div><div class='del'>-	case FE_READ_UNCORRECTED_BLOCKS:</div><div class='del'>-	{</div><div class='del'>-		uint32_t unc_count;</div><div class='del'>-</div><div class='del'>-		if (mutex_lock_interruptible(&amp;cinergyt2-&gt;sem))</div><div class='del'>-			return -ERESTARTSYS;</div><div class='del'>-		unc_count = cinergyt2-&gt;uncorrected_block_count;</div><div class='del'>-		cinergyt2-&gt;uncorrected_block_count = 0;</div><div class='del'>-		mutex_unlock(&amp;cinergyt2-&gt;sem);</div><div class='del'>-</div><div class='del'>-		/* UNC are already converted to host byte order... */</div><div class='del'>-		return put_user(unc_count,(__u32 __user *) arg);</div><div class='del'>-	}</div><div class='del'>-	case FE_SET_FRONTEND:</div><div class='del'>-	{</div><div class='del'>-		struct dvbt_set_parameters_msg *param = &amp;cinergyt2-&gt;param;</div><div class='del'>-		struct dvb_frontend_parameters p;</div><div class='del'>-		int err;</div><div class='del'>-</div><div class='del'>-		if ((file-&gt;f_flags &amp; O_ACCMODE) == O_RDONLY)</div><div class='del'>-			return -EPERM;</div><div class='del'>-</div><div class='del'>-		if (copy_from_user(&amp;p, (void  __user*) arg, sizeof(p)))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-</div><div class='del'>-		if (cinergyt2-&gt;disconnect_pending)</div><div class='del'>-			return -EAGAIN;</div><div class='del'>-		if (mutex_lock_interruptible(&amp;cinergyt2-&gt;sem))</div><div class='del'>-			return -ERESTARTSYS;</div><div class='del'>-</div><div class='del'>-		param-&gt;cmd = CINERGYT2_EP1_SET_TUNER_PARAMETERS;</div><div class='del'>-		param-&gt;tps = cpu_to_le16(compute_tps(&amp;p));</div><div class='del'>-		param-&gt;freq = cpu_to_le32(p.frequency / 1000);</div><div class='del'>-		param-&gt;bandwidth = 8 - p.u.ofdm.bandwidth - BANDWIDTH_8_MHZ;</div><div class='del'>-</div><div class='del'>-		stat-&gt;lock_bits = 0;</div><div class='del'>-		cinergyt2-&gt;pending_fe_events++;</div><div class='del'>-		wake_up_interruptible(&amp;cinergyt2-&gt;poll_wq);</div><div class='del'>-</div><div class='del'>-		err = cinergyt2_command(cinergyt2,</div><div class='del'>-					(char *) param, sizeof(*param),</div><div class='del'>-					NULL, 0);</div><div class='del'>-</div><div class='del'>-		mutex_unlock(&amp;cinergyt2-&gt;sem);</div><div class='del'>-</div><div class='del'>-		return (err &lt; 0) ? err : 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	case FE_GET_FRONTEND:</div><div class='del'>-		/**</div><div class='del'>-		 *  trivial to implement (see struct dvbt_get_status_msg).</div><div class='del'>-		 *  equivalent to FE_READ ioctls, but needs</div><div class='del'>-		 *  TPS -&gt; linux-dvb parameter set conversion. Feel free</div><div class='del'>-		 *  to implement this and send us a patch if you need this</div><div class='del'>-		 *  functionality.</div><div class='del'>-		 */</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case FE_GET_EVENT:</div><div class='del'>-	{</div><div class='del'>-		/**</div><div class='del'>-		 *  for now we only fill the status field. the parameters</div><div class='del'>-		 *  are trivial to fill as soon FE_GET_FRONTEND is done.</div><div class='del'>-		 */</div><div class='del'>-		struct dvb_frontend_event __user *e = (void __user *) arg;</div><div class='del'>-		if (cinergyt2-&gt;pending_fe_events == 0) {</div><div class='del'>-			if (file-&gt;f_flags &amp; O_NONBLOCK)</div><div class='del'>-				return -EWOULDBLOCK;</div><div class='del'>-			wait_event_interruptible(cinergyt2-&gt;poll_wq,</div><div class='del'>-						 cinergyt2-&gt;pending_fe_events &gt; 0);</div><div class='del'>-		}</div><div class='del'>-		cinergyt2-&gt;pending_fe_events = 0;</div><div class='del'>-		return cinergyt2_ioctl(inode, file, FE_READ_STATUS,</div><div class='del'>-					(unsigned long) &amp;e-&gt;status);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return -EINVAL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cinergyt2_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='del'>-{</div><div class='del'>-	struct dvb_device *dvbdev = file-&gt;private_data;</div><div class='del'>-	struct cinergyt2 *cinergyt2 = dvbdev-&gt;priv;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	lock_kernel();</div><div class='del'>-</div><div class='del'>-	if (vma-&gt;vm_flags &amp; (VM_WRITE | VM_EXEC)) {</div><div class='del'>-		ret = -EPERM;</div><div class='del'>-		goto bailout;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (vma-&gt;vm_end &gt; vma-&gt;vm_start + STREAM_URB_COUNT * STREAM_BUF_SIZE) {</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto bailout;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	vma-&gt;vm_flags |= (VM_IO | VM_DONTCOPY);</div><div class='del'>-	vma-&gt;vm_file = file;</div><div class='del'>-</div><div class='del'>-	ret = remap_pfn_range(vma, vma-&gt;vm_start,</div><div class='del'>-			      virt_to_phys(cinergyt2-&gt;streambuf) &gt;&gt; PAGE_SHIFT,</div><div class='del'>-			      vma-&gt;vm_end - vma-&gt;vm_start,</div><div class='del'>-			      vma-&gt;vm_page_prot) ? -EAGAIN : 0;</div><div class='del'>-bailout:</div><div class='del'>-	unlock_kernel();</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct file_operations cinergyt2_fops = {</div><div class='del'>-	.owner          = THIS_MODULE,</div><div class='del'>-	.ioctl		= cinergyt2_ioctl,</div><div class='del'>-	.poll           = cinergyt2_poll,</div><div class='del'>-	.open           = cinergyt2_open,</div><div class='del'>-	.release        = cinergyt2_release,</div><div class='del'>-	.mmap		= cinergyt2_mmap</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct dvb_device cinergyt2_fe_template = {</div><div class='del'>-	.users = ~0,</div><div class='del'>-	.writers = 1,</div><div class='del'>-	.readers = (~0)-1,</div><div class='del'>-	.fops = &amp;cinergyt2_fops</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_RC</div><div class='del'>-</div><div class='del'>-static void cinergyt2_query_rc (struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct cinergyt2 *cinergyt2 =</div><div class='del'>-		container_of(work, struct cinergyt2, rc_query_work.work);</div><div class='del'>-	char buf[1] = { CINERGYT2_EP1_GET_RC_EVENTS };</div><div class='del'>-	struct cinergyt2_rc_event rc_events[12];</div><div class='del'>-	int n, len, i;</div><div class='del'>-</div><div class='del'>-	if (cinergyt2-&gt;disconnect_pending || mutex_lock_interruptible(&amp;cinergyt2-&gt;sem))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	len = cinergyt2_command(cinergyt2, buf, sizeof(buf),</div><div class='del'>-				(char *) rc_events, sizeof(rc_events));</div><div class='del'>-	if (len &lt; 0)</div><div class='del'>-		goto out;</div><div class='del'>-	if (len == 0) {</div><div class='del'>-		if (time_after(jiffies, cinergyt2-&gt;last_event_jiffies +</div><div class='del'>-			       msecs_to_jiffies(150))) {</div><div class='del'>-			/* stop key repeat */</div><div class='del'>-			if (cinergyt2-&gt;rc_input_event != KEY_MAX) {</div><div class='del'>-				dprintk(1, "rc_input_event=%d Up\n", cinergyt2-&gt;rc_input_event);</div><div class='del'>-				input_report_key(cinergyt2-&gt;rc_input_dev,</div><div class='del'>-						 cinergyt2-&gt;rc_input_event, 0);</div><div class='del'>-				input_sync(cinergyt2-&gt;rc_input_dev);</div><div class='del'>-				cinergyt2-&gt;rc_input_event = KEY_MAX;</div><div class='del'>-			}</div><div class='del'>-			cinergyt2-&gt;rc_last_code = cpu_to_le32(~0);</div><div class='del'>-		}</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-	cinergyt2-&gt;last_event_jiffies = jiffies;</div><div class='del'>-</div><div class='del'>-	for (n = 0; n &lt; (len / sizeof(rc_events[0])); n++) {</div><div class='del'>-		dprintk(1, "rc_events[%d].value = %x, type=%x\n",</div><div class='del'>-			n, le32_to_cpu(rc_events[n].value), rc_events[n].type);</div><div class='del'>-</div><div class='del'>-		if (rc_events[n].type == CINERGYT2_RC_EVENT_TYPE_NEC &amp;&amp;</div><div class='del'>-		    rc_events[n].value == cpu_to_le32(~0)) {</div><div class='del'>-			/* keyrepeat bit -&gt; just repeat last rc_input_event */</div><div class='del'>-		} else {</div><div class='del'>-			cinergyt2-&gt;rc_input_event = KEY_MAX;</div><div class='del'>-			for (i = 0; i &lt; ARRAY_SIZE(rc_keys); i += 3) {</div><div class='del'>-				if (rc_keys[i + 0] == rc_events[n].type &amp;&amp;</div><div class='del'>-				    rc_keys[i + 1] == le32_to_cpu(rc_events[n].value)) {</div><div class='del'>-					cinergyt2-&gt;rc_input_event = rc_keys[i + 2];</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (cinergyt2-&gt;rc_input_event != KEY_MAX) {</div><div class='del'>-			if (rc_events[n].value == cinergyt2-&gt;rc_last_code &amp;&amp;</div><div class='del'>-			    cinergyt2-&gt;rc_last_code != cpu_to_le32(~0)) {</div><div class='del'>-				/* emit a key-up so the double event is recognized */</div><div class='del'>-				dprintk(1, "rc_input_event=%d UP\n", cinergyt2-&gt;rc_input_event);</div><div class='del'>-				input_report_key(cinergyt2-&gt;rc_input_dev,</div><div class='del'>-						 cinergyt2-&gt;rc_input_event, 0);</div><div class='del'>-			}</div><div class='del'>-			dprintk(1, "rc_input_event=%d\n", cinergyt2-&gt;rc_input_event);</div><div class='del'>-			input_report_key(cinergyt2-&gt;rc_input_dev,</div><div class='del'>-					 cinergyt2-&gt;rc_input_event, 1);</div><div class='del'>-			input_sync(cinergyt2-&gt;rc_input_dev);</div><div class='del'>-			cinergyt2-&gt;rc_last_code = rc_events[n].value;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	schedule_delayed_work(&amp;cinergyt2-&gt;rc_query_work,</div><div class='del'>-			      msecs_to_jiffies(RC_QUERY_INTERVAL));</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;cinergyt2-&gt;sem);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cinergyt2_register_rc(struct cinergyt2 *cinergyt2)</div><div class='del'>-{</div><div class='del'>-	struct input_dev *input_dev;</div><div class='del'>-	int i;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	input_dev = input_allocate_device();</div><div class='del'>-	if (!input_dev)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	usb_make_path(cinergyt2-&gt;udev, cinergyt2-&gt;phys, sizeof(cinergyt2-&gt;phys));</div><div class='del'>-	strlcat(cinergyt2-&gt;phys, "/input0", sizeof(cinergyt2-&gt;phys));</div><div class='del'>-	cinergyt2-&gt;rc_input_event = KEY_MAX;</div><div class='del'>-	cinergyt2-&gt;rc_last_code = cpu_to_le32(~0);</div><div class='del'>-	INIT_DELAYED_WORK(&amp;cinergyt2-&gt;rc_query_work, cinergyt2_query_rc);</div><div class='del'>-</div><div class='del'>-	input_dev-&gt;name = DRIVER_NAME " remote control";</div><div class='del'>-	input_dev-&gt;phys = cinergyt2-&gt;phys;</div><div class='del'>-	input_dev-&gt;evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REP);</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(rc_keys); i += 3)</div><div class='del'>-		set_bit(rc_keys[i + 2], input_dev-&gt;keybit);</div><div class='del'>-	input_dev-&gt;keycodesize = 0;</div><div class='del'>-	input_dev-&gt;keycodemax = 0;</div><div class='del'>-	input_dev-&gt;id.bustype = BUS_USB;</div><div class='del'>-	input_dev-&gt;id.vendor = le16_to_cpu(cinergyt2-&gt;udev-&gt;descriptor.idVendor);</div><div class='del'>-	input_dev-&gt;id.product = le16_to_cpu(cinergyt2-&gt;udev-&gt;descriptor.idProduct);</div><div class='del'>-	input_dev-&gt;id.version = 1;</div><div class='del'>-	input_dev-&gt;dev.parent = &amp;cinergyt2-&gt;udev-&gt;dev;</div><div class='del'>-</div><div class='del'>-	err = input_register_device(input_dev);</div><div class='del'>-	if (err) {</div><div class='del'>-		input_free_device(input_dev);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cinergyt2-&gt;rc_input_dev = input_dev;</div><div class='del'>-	schedule_delayed_work(&amp;cinergyt2-&gt;rc_query_work, HZ/2);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void cinergyt2_unregister_rc(struct cinergyt2 *cinergyt2)</div><div class='del'>-{</div><div class='del'>-	cancel_rearming_delayed_work(&amp;cinergyt2-&gt;rc_query_work);</div><div class='del'>-	input_unregister_device(cinergyt2-&gt;rc_input_dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void cinergyt2_suspend_rc(struct cinergyt2 *cinergyt2)</div><div class='del'>-{</div><div class='del'>-	cancel_rearming_delayed_work(&amp;cinergyt2-&gt;rc_query_work);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void cinergyt2_resume_rc(struct cinergyt2 *cinergyt2)</div><div class='del'>-{</div><div class='del'>-	schedule_delayed_work(&amp;cinergyt2-&gt;rc_query_work, HZ/2);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-</div><div class='del'>-static inline int cinergyt2_register_rc(struct cinergyt2 *cinergyt2) { return 0; }</div><div class='del'>-static inline void cinergyt2_unregister_rc(struct cinergyt2 *cinergyt2) { }</div><div class='del'>-static inline void cinergyt2_suspend_rc(struct cinergyt2 *cinergyt2) { }</div><div class='del'>-static inline void cinergyt2_resume_rc(struct cinergyt2 *cinergyt2) { }</div><div class='del'>-</div><div class='del'>-#endif /* ENABLE_RC */</div><div class='del'>-</div><div class='del'>-static void cinergyt2_query (struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct cinergyt2 *cinergyt2 =</div><div class='del'>-		container_of(work, struct cinergyt2, query_work.work);</div><div class='del'>-	char cmd [] = { CINERGYT2_EP1_GET_TUNER_STATUS };</div><div class='del'>-	struct dvbt_get_status_msg *s = &amp;cinergyt2-&gt;status;</div><div class='del'>-	uint8_t lock_bits;</div><div class='del'>-</div><div class='del'>-	if (cinergyt2-&gt;disconnect_pending || mutex_lock_interruptible(&amp;cinergyt2-&gt;sem))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	lock_bits = s-&gt;lock_bits;</div><div class='del'>-</div><div class='del'>-	cinergyt2_command(cinergyt2, cmd, sizeof(cmd), (char *) s, sizeof(*s));</div><div class='del'>-</div><div class='del'>-	cinergyt2-&gt;uncorrected_block_count +=</div><div class='del'>-		le32_to_cpu(s-&gt;uncorrected_block_count);</div><div class='del'>-</div><div class='del'>-	if (lock_bits != s-&gt;lock_bits) {</div><div class='del'>-		wake_up_interruptible(&amp;cinergyt2-&gt;poll_wq);</div><div class='del'>-		cinergyt2-&gt;pending_fe_events++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	schedule_delayed_work(&amp;cinergyt2-&gt;query_work,</div><div class='del'>-			      msecs_to_jiffies(QUERY_INTERVAL));</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;cinergyt2-&gt;sem);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cinergyt2_probe (struct usb_interface *intf,</div><div class='del'>-		  const struct usb_device_id *id)</div><div class='del'>-{</div><div class='del'>-	struct cinergyt2 *cinergyt2;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (!(cinergyt2 = kzalloc (sizeof(struct cinergyt2), GFP_KERNEL))) {</div><div class='del'>-		dprintk(1, "out of memory?!?\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	usb_set_intfdata (intf, (void *) cinergyt2);</div><div class='del'>-</div><div class='del'>-	mutex_init(&amp;cinergyt2-&gt;sem);</div><div class='del'>-	mutex_init(&amp;cinergyt2-&gt;wq_sem);</div><div class='del'>-	init_waitqueue_head (&amp;cinergyt2-&gt;poll_wq);</div><div class='del'>-	INIT_DELAYED_WORK(&amp;cinergyt2-&gt;query_work, cinergyt2_query);</div><div class='del'>-</div><div class='del'>-	cinergyt2-&gt;udev = interface_to_usbdev(intf);</div><div class='del'>-	cinergyt2-&gt;param.cmd = CINERGYT2_EP1_SET_TUNER_PARAMETERS;</div><div class='del'>-</div><div class='del'>-	if (cinergyt2_alloc_stream_urbs (cinergyt2) &lt; 0) {</div><div class='del'>-		dprintk(1, "unable to allocate stream urbs\n");</div><div class='del'>-		kfree(cinergyt2);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = dvb_register_adapter(&amp;cinergyt2-&gt;adapter, DRIVER_NAME,</div><div class='del'>-				   THIS_MODULE, &amp;cinergyt2-&gt;udev-&gt;dev,</div><div class='del'>-				   adapter_nr);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		kfree(cinergyt2);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cinergyt2-&gt;demux.priv = cinergyt2;</div><div class='del'>-	cinergyt2-&gt;demux.filternum = 256;</div><div class='del'>-	cinergyt2-&gt;demux.feednum = 256;</div><div class='del'>-	cinergyt2-&gt;demux.start_feed = cinergyt2_start_feed;</div><div class='del'>-	cinergyt2-&gt;demux.stop_feed = cinergyt2_stop_feed;</div><div class='del'>-	cinergyt2-&gt;demux.dmx.capabilities = DMX_TS_FILTERING |</div><div class='del'>-					    DMX_SECTION_FILTERING |</div><div class='del'>-					    DMX_MEMORY_BASED_FILTERING;</div><div class='del'>-</div><div class='del'>-	if ((err = dvb_dmx_init(&amp;cinergyt2-&gt;demux)) &lt; 0) {</div><div class='del'>-		dprintk(1, "dvb_dmx_init() failed (err = %d)\n", err);</div><div class='del'>-		goto bailout;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cinergyt2-&gt;dmxdev.filternum = cinergyt2-&gt;demux.filternum;</div><div class='del'>-	cinergyt2-&gt;dmxdev.demux = &amp;cinergyt2-&gt;demux.dmx;</div><div class='del'>-	cinergyt2-&gt;dmxdev.capabilities = 0;</div><div class='del'>-</div><div class='del'>-	if ((err = dvb_dmxdev_init(&amp;cinergyt2-&gt;dmxdev, &amp;cinergyt2-&gt;adapter)) &lt; 0) {</div><div class='del'>-		dprintk(1, "dvb_dmxdev_init() failed (err = %d)\n", err);</div><div class='del'>-		goto bailout;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (dvb_net_init(&amp;cinergyt2-&gt;adapter, &amp;cinergyt2-&gt;dvbnet, &amp;cinergyt2-&gt;demux.dmx))</div><div class='del'>-		dprintk(1, "dvb_net_init() failed!\n");</div><div class='del'>-</div><div class='del'>-	dvb_register_device(&amp;cinergyt2-&gt;adapter, &amp;cinergyt2-&gt;fedev,</div><div class='del'>-			    &amp;cinergyt2_fe_template, cinergyt2,</div><div class='del'>-			    DVB_DEVICE_FRONTEND);</div><div class='del'>-</div><div class='del'>-	err = cinergyt2_register_rc(cinergyt2);</div><div class='del'>-	if (err)</div><div class='del'>-		goto bailout;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-bailout:</div><div class='del'>-	dvb_net_release(&amp;cinergyt2-&gt;dvbnet);</div><div class='del'>-	dvb_dmxdev_release(&amp;cinergyt2-&gt;dmxdev);</div><div class='del'>-	dvb_dmx_release(&amp;cinergyt2-&gt;demux);</div><div class='del'>-	dvb_unregister_adapter(&amp;cinergyt2-&gt;adapter);</div><div class='del'>-	cinergyt2_free_stream_urbs(cinergyt2);</div><div class='del'>-	kfree(cinergyt2);</div><div class='del'>-	return -ENOMEM;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void cinergyt2_disconnect (struct usb_interface *intf)</div><div class='del'>-{</div><div class='del'>-	struct cinergyt2 *cinergyt2 = usb_get_intfdata (intf);</div><div class='del'>-</div><div class='del'>-	cinergyt2_unregister_rc(cinergyt2);</div><div class='del'>-	cancel_rearming_delayed_work(&amp;cinergyt2-&gt;query_work);</div><div class='del'>-	wake_up_interruptible(&amp;cinergyt2-&gt;poll_wq);</div><div class='del'>-</div><div class='del'>-	cinergyt2-&gt;demux.dmx.close(&amp;cinergyt2-&gt;demux.dmx);</div><div class='del'>-	cinergyt2-&gt;disconnect_pending = 1;</div><div class='del'>-</div><div class='del'>-	if (!atomic_read(&amp;cinergyt2-&gt;inuse))</div><div class='del'>-		cinergyt2_unregister(cinergyt2);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cinergyt2_suspend (struct usb_interface *intf, pm_message_t state)</div><div class='del'>-{</div><div class='del'>-	struct cinergyt2 *cinergyt2 = usb_get_intfdata (intf);</div><div class='del'>-</div><div class='del'>-	if (cinergyt2-&gt;disconnect_pending)</div><div class='del'>-		return -EAGAIN;</div><div class='del'>-	if (mutex_lock_interruptible(&amp;cinergyt2-&gt;wq_sem))</div><div class='del'>-		return -ERESTARTSYS;</div><div class='del'>-</div><div class='del'>-	cinergyt2_suspend_rc(cinergyt2);</div><div class='del'>-	cancel_rearming_delayed_work(&amp;cinergyt2-&gt;query_work);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;cinergyt2-&gt;sem);</div><div class='del'>-	if (cinergyt2-&gt;streaming)</div><div class='del'>-		cinergyt2_stop_stream_xfer(cinergyt2);</div><div class='del'>-	cinergyt2_sleep(cinergyt2, 1);</div><div class='del'>-	mutex_unlock(&amp;cinergyt2-&gt;sem);</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;cinergyt2-&gt;wq_sem);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cinergyt2_resume (struct usb_interface *intf)</div><div class='del'>-{</div><div class='del'>-	struct cinergyt2 *cinergyt2 = usb_get_intfdata (intf);</div><div class='del'>-	struct dvbt_set_parameters_msg *param = &amp;cinergyt2-&gt;param;</div><div class='del'>-	int err = -EAGAIN;</div><div class='del'>-</div><div class='del'>-	if (cinergyt2-&gt;disconnect_pending)</div><div class='del'>-		goto out;</div><div class='del'>-	err = mutex_lock_interruptible(&amp;cinergyt2-&gt;wq_sem);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	err = mutex_lock_interruptible(&amp;cinergyt2-&gt;sem);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out_unlock1;</div><div class='del'>-</div><div class='del'>-	if (!cinergyt2-&gt;sleeping) {</div><div class='del'>-		cinergyt2_sleep(cinergyt2, 0);</div><div class='del'>-		cinergyt2_command(cinergyt2, (char *) param, sizeof(*param), NULL, 0);</div><div class='del'>-		if (cinergyt2-&gt;streaming)</div><div class='del'>-			cinergyt2_start_stream_xfer(cinergyt2);</div><div class='del'>-		schedule_delayed_work(&amp;cinergyt2-&gt;query_work, HZ/2);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cinergyt2_resume_rc(cinergyt2);</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;cinergyt2-&gt;sem);</div><div class='del'>-out_unlock1:</div><div class='del'>-	mutex_unlock(&amp;cinergyt2-&gt;wq_sem);</div><div class='del'>-out:</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct usb_device_id cinergyt2_table [] __devinitdata = {</div><div class='del'>-	{ USB_DEVICE(0x0ccd, 0x0038) },</div><div class='del'>-	{ 0 }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-MODULE_DEVICE_TABLE(usb, cinergyt2_table);</div><div class='del'>-</div><div class='del'>-static struct usb_driver cinergyt2_driver = {</div><div class='del'>-	.name	= "cinergyT2",</div><div class='del'>-	.probe	= cinergyt2_probe,</div><div class='del'>-	.disconnect	= cinergyt2_disconnect,</div><div class='del'>-	.suspend	= cinergyt2_suspend,</div><div class='del'>-	.resume		= cinergyt2_resume,</div><div class='del'>-	.id_table	= cinergyt2_table</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init cinergyt2_init (void)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if ((err = usb_register(&amp;cinergyt2_driver)) &lt; 0)</div><div class='del'>-		dprintk(1, "usb_register() failed! (err %i)\n", err);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit cinergyt2_exit (void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;cinergyt2_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init (cinergyt2_init);</div><div class='del'>-module_exit (cinergyt2_exit);</div><div class='del'>-</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_AUTHOR("Holger Waechtler, Daniel Mack");</div><div class='head'>diff --git a/drivers/media/dvb/dm1105/Kconfig b/drivers/media/dvb/dm1105/Kconfig<br/>new file mode 100644<br/>index 000000000000..1332301ef3ae<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/dm1105/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/dm1105/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,18 @@</div><div class='add'>+config DVB_DM1105</div><div class='add'>+	tristate "SDMC DM1105 based PCI cards"</div><div class='add'>+	depends on DVB_CORE &amp;&amp; PCI &amp;&amp; I2C</div><div class='add'>+	select DVB_PLL if !DVB_FE_CUSTOMISE</div><div class='add'>+	select DVB_STV0299 if !DVB_FE_CUSTOMISE</div><div class='add'>+	select DVB_STV0288 if !DVB_FE_CUSTOMISE</div><div class='add'>+	select DVB_STB6000 if !DVB_FE_CUSTOMISE</div><div class='add'>+	select DVB_CX24116 if !DVB_FE_CUSTOMISE</div><div class='add'>+	select DVB_SI21XX if !DVB_FE_CUSTOMISE</div><div class='add'>+	help</div><div class='add'>+	  Support for cards based on the SDMC DM1105 PCI chip like</div><div class='add'>+	  DvbWorld 2002</div><div class='add'>+</div><div class='add'>+	  Since these cards have no MPEG decoder onboard, they transmit</div><div class='add'>+	  only compressed MPEG data over the PCI bus, so you need</div><div class='add'>+	  an external software decoder to watch TV on your computer.</div><div class='add'>+</div><div class='add'>+	  Say Y or M if you own such a device and want to use it.</div><div class='head'>diff --git a/drivers/media/dvb/dm1105/Makefile b/drivers/media/dvb/dm1105/Makefile<br/>new file mode 100644<br/>index 000000000000..8ac28b0546af<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/dm1105/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/dm1105/Makefile</a></div><div class='hunk'>@@ -0,0 +1,3 @@</div><div class='add'>+obj-$(CONFIG_DVB_DM1105) += dm1105.o</div><div class='add'>+</div><div class='add'>+EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends</div><div class='head'>diff --git a/drivers/media/dvb/dm1105/dm1105.c b/drivers/media/dvb/dm1105/dm1105.c<br/>new file mode 100644<br/>index 000000000000..14e627ef6465<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/dm1105/dm1105.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/dm1105/dm1105.c</a></div><div class='hunk'>@@ -0,0 +1,923 @@</div><div class='add'>+/*</div><div class='add'>+ * dm1105.c - driver for DVB cards based on SDMC DM1105 PCI chip</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2008 Igor M. Liplianin &lt;liplianin@me.by&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/version.h&gt;</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/proc_fs.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/input.h&gt;</div><div class='add'>+#include &lt;media/ir-common.h&gt;</div><div class='add'>+</div><div class='add'>+#include "demux.h"</div><div class='add'>+#include "dmxdev.h"</div><div class='add'>+#include "dvb_demux.h"</div><div class='add'>+#include "dvb_frontend.h"</div><div class='add'>+#include "dvb_net.h"</div><div class='add'>+#include "dvbdev.h"</div><div class='add'>+#include "dvb-pll.h"</div><div class='add'>+</div><div class='add'>+#include "stv0299.h"</div><div class='add'>+#include "stv0288.h"</div><div class='add'>+#include "stb6000.h"</div><div class='add'>+#include "si21xx.h"</div><div class='add'>+#include "cx24116.h"</div><div class='add'>+#include "z0194a.h"</div><div class='add'>+</div><div class='add'>+/* ----------------------------------------------- */</div><div class='add'>+/*</div><div class='add'>+ * PCI ID's</div><div class='add'>+ */</div><div class='add'>+#ifndef PCI_VENDOR_ID_TRIGEM</div><div class='add'>+#define PCI_VENDOR_ID_TRIGEM	0x109f</div><div class='add'>+#endif</div><div class='add'>+#ifndef PCI_DEVICE_ID_DM1105</div><div class='add'>+#define PCI_DEVICE_ID_DM1105	0x036f</div><div class='add'>+#endif</div><div class='add'>+#ifndef PCI_DEVICE_ID_DW2002</div><div class='add'>+#define PCI_DEVICE_ID_DW2002	0x2002</div><div class='add'>+#endif</div><div class='add'>+#ifndef PCI_DEVICE_ID_DW2004</div><div class='add'>+#define PCI_DEVICE_ID_DW2004	0x2004</div><div class='add'>+#endif</div><div class='add'>+/* ----------------------------------------------- */</div><div class='add'>+/* sdmc dm1105 registers */</div><div class='add'>+</div><div class='add'>+/* TS Control */</div><div class='add'>+#define DM1105_TSCTR				0x00</div><div class='add'>+#define DM1105_DTALENTH				0x04</div><div class='add'>+</div><div class='add'>+/* GPIO Interface */</div><div class='add'>+#define DM1105_GPIOVAL				0x08</div><div class='add'>+#define DM1105_GPIOCTR				0x0c</div><div class='add'>+</div><div class='add'>+/* PID serial number */</div><div class='add'>+#define DM1105_PIDN				0x10</div><div class='add'>+</div><div class='add'>+/* Odd-even secret key select */</div><div class='add'>+#define DM1105_CWSEL				0x14</div><div class='add'>+</div><div class='add'>+/* Host Command Interface */</div><div class='add'>+#define DM1105_HOST_CTR				0x18</div><div class='add'>+#define DM1105_HOST_AD				0x1c</div><div class='add'>+</div><div class='add'>+/* PCI Interface */</div><div class='add'>+#define DM1105_CR				0x30</div><div class='add'>+#define DM1105_RST				0x34</div><div class='add'>+#define DM1105_STADR				0x38</div><div class='add'>+#define DM1105_RLEN				0x3c</div><div class='add'>+#define DM1105_WRP				0x40</div><div class='add'>+#define DM1105_INTCNT				0x44</div><div class='add'>+#define DM1105_INTMAK				0x48</div><div class='add'>+#define DM1105_INTSTS				0x4c</div><div class='add'>+</div><div class='add'>+/* CW Value */</div><div class='add'>+#define DM1105_ODD				0x50</div><div class='add'>+#define DM1105_EVEN				0x58</div><div class='add'>+</div><div class='add'>+/* PID Value */</div><div class='add'>+#define DM1105_PID				0x60</div><div class='add'>+</div><div class='add'>+/* IR Control */</div><div class='add'>+#define DM1105_IRCTR				0x64</div><div class='add'>+#define DM1105_IRMODE				0x68</div><div class='add'>+#define DM1105_SYSTEMCODE			0x6c</div><div class='add'>+#define DM1105_IRCODE				0x70</div><div class='add'>+</div><div class='add'>+/* Unknown Values */</div><div class='add'>+#define DM1105_ENCRYPT				0x74</div><div class='add'>+#define DM1105_VER				0x7c</div><div class='add'>+</div><div class='add'>+/* I2C Interface */</div><div class='add'>+#define DM1105_I2CCTR				0x80</div><div class='add'>+#define DM1105_I2CSTS				0x81</div><div class='add'>+#define DM1105_I2CDAT				0x82</div><div class='add'>+#define DM1105_I2C_RA				0x83</div><div class='add'>+/* ----------------------------------------------- */</div><div class='add'>+/* Interrupt Mask Bits */</div><div class='add'>+</div><div class='add'>+#define INTMAK_TSIRQM				0x01</div><div class='add'>+#define INTMAK_HIRQM				0x04</div><div class='add'>+#define INTMAK_IRM				0x08</div><div class='add'>+#define INTMAK_ALLMASK				(INTMAK_TSIRQM | \</div><div class='add'>+						INTMAK_HIRQM | \</div><div class='add'>+						INTMAK_IRM)</div><div class='add'>+#define INTMAK_NONEMASK				0x00</div><div class='add'>+</div><div class='add'>+/* Interrupt Status Bits */</div><div class='add'>+#define INTSTS_TSIRQ				0x01</div><div class='add'>+#define INTSTS_HIRQ				0x04</div><div class='add'>+#define INTSTS_IR				0x08</div><div class='add'>+</div><div class='add'>+/* IR Control Bits */</div><div class='add'>+#define DM1105_IR_EN				0x01</div><div class='add'>+#define DM1105_SYS_CHK				0x02</div><div class='add'>+#define DM1105_REP_FLG				0x08</div><div class='add'>+</div><div class='add'>+/* EEPROM addr */</div><div class='add'>+#define IIC_24C01_addr				0xa0</div><div class='add'>+/* Max board count */</div><div class='add'>+#define DM1105_MAX				0x04</div><div class='add'>+</div><div class='add'>+#define DRIVER_NAME				"dm1105"</div><div class='add'>+</div><div class='add'>+#define DM1105_DMA_PACKETS			47</div><div class='add'>+#define DM1105_DMA_PACKET_LENGTH		(128*4)</div><div class='add'>+#define DM1105_DMA_BYTES			(128 * 4 * DM1105_DMA_PACKETS)</div><div class='add'>+</div><div class='add'>+/* GPIO's for LNB power control */</div><div class='add'>+#define DM1105_LNB_MASK				0x00000000</div><div class='add'>+#define DM1105_LNB_13V				0x00010100</div><div class='add'>+#define DM1105_LNB_18V				0x00000100</div><div class='add'>+</div><div class='add'>+static int ir_debug;</div><div class='add'>+module_param(ir_debug, int, 0644);</div><div class='add'>+MODULE_PARM_DESC(ir_debug, "enable debugging information for IR decoding");</div><div class='add'>+</div><div class='add'>+DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);</div><div class='add'>+</div><div class='add'>+static u16 ir_codes_dm1105_nec[128] = {</div><div class='add'>+	[0x0a] = KEY_Q,		/*power*/</div><div class='add'>+	[0x0c] = KEY_M,		/*mute*/</div><div class='add'>+	[0x11] = KEY_1,</div><div class='add'>+	[0x12] = KEY_2,</div><div class='add'>+	[0x13] = KEY_3,</div><div class='add'>+	[0x14] = KEY_4,</div><div class='add'>+	[0x15] = KEY_5,</div><div class='add'>+	[0x16] = KEY_6,</div><div class='add'>+	[0x17] = KEY_7,</div><div class='add'>+	[0x18] = KEY_8,</div><div class='add'>+	[0x19] = KEY_9,</div><div class='add'>+	[0x10] = KEY_0,</div><div class='add'>+	[0x1c] = KEY_PAGEUP,	/*ch+*/</div><div class='add'>+	[0x0f] = KEY_PAGEDOWN,	/*ch-*/</div><div class='add'>+	[0x1a] = KEY_O,		/*vol+*/</div><div class='add'>+	[0x0e] = KEY_Z,		/*vol-*/</div><div class='add'>+	[0x04] = KEY_R,		/*rec*/</div><div class='add'>+	[0x09] = KEY_D,		/*fav*/</div><div class='add'>+	[0x08] = KEY_BACKSPACE,	/*rewind*/</div><div class='add'>+	[0x07] = KEY_A,		/*fast*/</div><div class='add'>+	[0x0b] = KEY_P,		/*pause*/</div><div class='add'>+	[0x02] = KEY_ESC,	/*cancel*/</div><div class='add'>+	[0x03] = KEY_G,		/*tab*/</div><div class='add'>+	[0x00] = KEY_UP,	/*up*/</div><div class='add'>+	[0x1f] = KEY_ENTER,	/*ok*/</div><div class='add'>+	[0x01] = KEY_DOWN,	/*down*/</div><div class='add'>+	[0x05] = KEY_C,		/*cap*/</div><div class='add'>+	[0x06] = KEY_S,		/*stop*/</div><div class='add'>+	[0x40] = KEY_F,		/*full*/</div><div class='add'>+	[0x1e] = KEY_W,		/*tvmode*/</div><div class='add'>+	[0x1b] = KEY_B,		/*recall*/</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* infrared remote control */</div><div class='add'>+struct infrared {</div><div class='add'>+	u16	key_map[128];</div><div class='add'>+	struct input_dev	*input_dev;</div><div class='add'>+	char			input_phys[32];</div><div class='add'>+	struct tasklet_struct	ir_tasklet;</div><div class='add'>+	u32			ir_command;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dm1105dvb {</div><div class='add'>+	/* pci */</div><div class='add'>+	struct pci_dev *pdev;</div><div class='add'>+	u8 __iomem *io_mem;</div><div class='add'>+</div><div class='add'>+	/* ir */</div><div class='add'>+	struct infrared ir;</div><div class='add'>+</div><div class='add'>+	/* dvb */</div><div class='add'>+	struct dmx_frontend hw_frontend;</div><div class='add'>+	struct dmx_frontend mem_frontend;</div><div class='add'>+	struct dmxdev dmxdev;</div><div class='add'>+	struct dvb_adapter dvb_adapter;</div><div class='add'>+	struct dvb_demux demux;</div><div class='add'>+	struct dvb_frontend *fe;</div><div class='add'>+	struct dvb_net dvbnet;</div><div class='add'>+	unsigned int full_ts_users;</div><div class='add'>+</div><div class='add'>+	/* i2c */</div><div class='add'>+	struct i2c_adapter i2c_adap;</div><div class='add'>+</div><div class='add'>+	/* dma */</div><div class='add'>+	dma_addr_t dma_addr;</div><div class='add'>+	unsigned char *ts_buf;</div><div class='add'>+	u32 wrp;</div><div class='add'>+	u32 buffer_size;</div><div class='add'>+	unsigned int	PacketErrorCount;</div><div class='add'>+	unsigned int dmarst;</div><div class='add'>+	spinlock_t lock;</div><div class='add'>+</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define dm_io_mem(reg)	((unsigned long)(&amp;dm1105dvb-&gt;io_mem[reg]))</div><div class='add'>+</div><div class='add'>+static struct dm1105dvb *dm1105dvb_local;</div><div class='add'>+</div><div class='add'>+static int dm1105_i2c_xfer(struct i2c_adapter *i2c_adap,</div><div class='add'>+			    struct i2c_msg *msgs, int num)</div><div class='add'>+{</div><div class='add'>+	struct dm1105dvb *dm1105dvb ;</div><div class='add'>+</div><div class='add'>+	int addr, rc, i, j, k, len, byte, data;</div><div class='add'>+	u8 status;</div><div class='add'>+</div><div class='add'>+	dm1105dvb = i2c_adap-&gt;algo_data;</div><div class='add'>+	for (i = 0; i &lt; num; i++) {</div><div class='add'>+		outb(0x00, dm_io_mem(DM1105_I2CCTR));</div><div class='add'>+		if (msgs[i].flags &amp; I2C_M_RD) {</div><div class='add'>+			/* read bytes */</div><div class='add'>+			addr  = msgs[i].addr &lt;&lt; 1;</div><div class='add'>+			addr |= 1;</div><div class='add'>+			outb(addr, dm_io_mem(DM1105_I2CDAT));</div><div class='add'>+			for (byte = 0; byte &lt; msgs[i].len; byte++)</div><div class='add'>+				outb(0, dm_io_mem(DM1105_I2CDAT + byte + 1));</div><div class='add'>+</div><div class='add'>+			outb(0x81 + msgs[i].len, dm_io_mem(DM1105_I2CCTR));</div><div class='add'>+			for (j = 0; j &lt; 55; j++) {</div><div class='add'>+				mdelay(10);</div><div class='add'>+				status = inb(dm_io_mem(DM1105_I2CSTS));</div><div class='add'>+				if ((status &amp; 0xc0) == 0x40)</div><div class='add'>+					break;</div><div class='add'>+			}</div><div class='add'>+			if (j &gt;= 55)</div><div class='add'>+				return -1;</div><div class='add'>+</div><div class='add'>+			for (byte = 0; byte &lt; msgs[i].len; byte++) {</div><div class='add'>+				rc = inb(dm_io_mem(DM1105_I2CDAT + byte + 1));</div><div class='add'>+				if (rc &lt; 0)</div><div class='add'>+					goto err;</div><div class='add'>+				msgs[i].buf[byte] = rc;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			if ((msgs[i].buf[0] == 0xf7) &amp;&amp; (msgs[i].addr == 0x55)) {</div><div class='add'>+				/* prepaired for cx24116 firmware */</div><div class='add'>+				/* Write in small blocks */</div><div class='add'>+				len = msgs[i].len - 1;</div><div class='add'>+				k = 1;</div><div class='add'>+				do {</div><div class='add'>+					outb(msgs[i].addr &lt;&lt; 1, dm_io_mem(DM1105_I2CDAT));</div><div class='add'>+					outb(0xf7, dm_io_mem(DM1105_I2CDAT + 1));</div><div class='add'>+					for (byte = 0; byte &lt; (len &gt; 48 ? 48 : len); byte++) {</div><div class='add'>+						data = msgs[i].buf[k+byte];</div><div class='add'>+						outb(data, dm_io_mem(DM1105_I2CDAT + byte + 2));</div><div class='add'>+					}</div><div class='add'>+					outb(0x82 + (len &gt; 48 ? 48 : len), dm_io_mem(DM1105_I2CCTR));</div><div class='add'>+					for (j = 0; j &lt; 25; j++) {</div><div class='add'>+						mdelay(10);</div><div class='add'>+						status = inb(dm_io_mem(DM1105_I2CSTS));</div><div class='add'>+						if ((status &amp; 0xc0) == 0x40)</div><div class='add'>+							break;</div><div class='add'>+					}</div><div class='add'>+</div><div class='add'>+					if (j &gt;= 25)</div><div class='add'>+						return -1;</div><div class='add'>+</div><div class='add'>+					k += 48;</div><div class='add'>+					len -= 48;</div><div class='add'>+				} while (len &gt; 0);</div><div class='add'>+			} else {</div><div class='add'>+				/* write bytes */</div><div class='add'>+				outb(msgs[i].addr&lt;&lt;1, dm_io_mem(DM1105_I2CDAT));</div><div class='add'>+				for (byte = 0; byte &lt; msgs[i].len; byte++) {</div><div class='add'>+					data = msgs[i].buf[byte];</div><div class='add'>+					outb(data, dm_io_mem(DM1105_I2CDAT + byte + 1));</div><div class='add'>+				}</div><div class='add'>+				outb(0x81 + msgs[i].len, dm_io_mem(DM1105_I2CCTR));</div><div class='add'>+				for (j = 0; j &lt; 25; j++) {</div><div class='add'>+					mdelay(10);</div><div class='add'>+					status = inb(dm_io_mem(DM1105_I2CSTS));</div><div class='add'>+					if ((status &amp; 0xc0) == 0x40)</div><div class='add'>+						break;</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+				if (j &gt;= 25)</div><div class='add'>+					return -1;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return num;</div><div class='add'>+ err:</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 functionality(struct i2c_adapter *adap)</div><div class='add'>+{</div><div class='add'>+	return I2C_FUNC_I2C;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct i2c_algorithm dm1105_algo = {</div><div class='add'>+	.master_xfer   = dm1105_i2c_xfer,</div><div class='add'>+	.functionality = functionality,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline struct dm1105dvb *feed_to_dm1105dvb(struct dvb_demux_feed *feed)</div><div class='add'>+{</div><div class='add'>+	return container_of(feed-&gt;demux, struct dm1105dvb, demux);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct dm1105dvb *frontend_to_dm1105dvb(struct dvb_frontend *fe)</div><div class='add'>+{</div><div class='add'>+	return container_of(fe-&gt;dvb, struct dm1105dvb, dvb_adapter);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dm1105dvb_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage)</div><div class='add'>+{</div><div class='add'>+	struct dm1105dvb *dm1105dvb = frontend_to_dm1105dvb(fe);</div><div class='add'>+</div><div class='add'>+		if (voltage == SEC_VOLTAGE_18) {</div><div class='add'>+			outl(DM1105_LNB_MASK, dm_io_mem(DM1105_GPIOCTR));</div><div class='add'>+			outl(DM1105_LNB_18V, dm_io_mem(DM1105_GPIOVAL));</div><div class='add'>+		} else	{</div><div class='add'>+		/*LNB ON-13V by default!*/</div><div class='add'>+			outl(DM1105_LNB_MASK, dm_io_mem(DM1105_GPIOCTR));</div><div class='add'>+			outl(DM1105_LNB_13V, dm_io_mem(DM1105_GPIOVAL));</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dm1105dvb_set_dma_addr(struct dm1105dvb *dm1105dvb)</div><div class='add'>+{</div><div class='add'>+	outl(cpu_to_le32(dm1105dvb-&gt;dma_addr), dm_io_mem(DM1105_STADR));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devinit dm1105dvb_dma_map(struct dm1105dvb *dm1105dvb)</div><div class='add'>+{</div><div class='add'>+	dm1105dvb-&gt;ts_buf = pci_alloc_consistent(dm1105dvb-&gt;pdev, 6*DM1105_DMA_BYTES, &amp;dm1105dvb-&gt;dma_addr);</div><div class='add'>+</div><div class='add'>+	return pci_dma_mapping_error(dm1105dvb-&gt;pdev, dm1105dvb-&gt;dma_addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dm1105dvb_dma_unmap(struct dm1105dvb *dm1105dvb)</div><div class='add'>+{</div><div class='add'>+	pci_free_consistent(dm1105dvb-&gt;pdev, 6*DM1105_DMA_BYTES, dm1105dvb-&gt;ts_buf, dm1105dvb-&gt;dma_addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __devinit dm1105dvb_enable_irqs(struct dm1105dvb *dm1105dvb)</div><div class='add'>+{</div><div class='add'>+	outb(INTMAK_ALLMASK, dm_io_mem(DM1105_INTMAK));</div><div class='add'>+	outb(1, dm_io_mem(DM1105_CR));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dm1105dvb_disable_irqs(struct dm1105dvb *dm1105dvb)</div><div class='add'>+{</div><div class='add'>+	outb(INTMAK_IRM, dm_io_mem(DM1105_INTMAK));</div><div class='add'>+	outb(0, dm_io_mem(DM1105_CR));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dm1105dvb_start_feed(struct dvb_demux_feed *f)</div><div class='add'>+{</div><div class='add'>+	struct dm1105dvb *dm1105dvb = feed_to_dm1105dvb(f);</div><div class='add'>+</div><div class='add'>+	if (dm1105dvb-&gt;full_ts_users++ == 0)</div><div class='add'>+		dm1105dvb_enable_irqs(dm1105dvb);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dm1105dvb_stop_feed(struct dvb_demux_feed *f)</div><div class='add'>+{</div><div class='add'>+	struct dm1105dvb *dm1105dvb = feed_to_dm1105dvb(f);</div><div class='add'>+</div><div class='add'>+	if (--dm1105dvb-&gt;full_ts_users == 0)</div><div class='add'>+		dm1105dvb_disable_irqs(dm1105dvb);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* ir tasklet */</div><div class='add'>+static void dm1105_emit_key(unsigned long parm)</div><div class='add'>+{</div><div class='add'>+	struct infrared *ir = (struct infrared *) parm;</div><div class='add'>+	u32 ircom = ir-&gt;ir_command;</div><div class='add'>+	u8 data;</div><div class='add'>+	u16 keycode;</div><div class='add'>+</div><div class='add'>+	data = (ircom &gt;&gt; 8) &amp; 0x7f;</div><div class='add'>+</div><div class='add'>+	input_event(ir-&gt;input_dev, EV_MSC, MSC_RAW, (0x0000f8 &lt;&lt; 16) | data);</div><div class='add'>+	input_event(ir-&gt;input_dev, EV_MSC, MSC_SCAN, data);</div><div class='add'>+	keycode = ir-&gt;key_map[data];</div><div class='add'>+</div><div class='add'>+	if (!keycode)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	input_event(ir-&gt;input_dev, EV_KEY, keycode, 1);</div><div class='add'>+	input_sync(ir-&gt;input_dev);</div><div class='add'>+	input_event(ir-&gt;input_dev, EV_KEY, keycode, 0);</div><div class='add'>+	input_sync(ir-&gt;input_dev);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t dm1105dvb_irq(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	struct dm1105dvb *dm1105dvb = dev_id;</div><div class='add'>+	unsigned int piece;</div><div class='add'>+	unsigned int nbpackets;</div><div class='add'>+	u32 command;</div><div class='add'>+	u32 nextwrp;</div><div class='add'>+	u32 oldwrp;</div><div class='add'>+</div><div class='add'>+	/* Read-Write INSTS Ack's Interrupt for DM1105 chip 16.03.2008 */</div><div class='add'>+	unsigned int intsts = inb(dm_io_mem(DM1105_INTSTS));</div><div class='add'>+	outb(intsts, dm_io_mem(DM1105_INTSTS));</div><div class='add'>+</div><div class='add'>+	switch (intsts) {</div><div class='add'>+	case INTSTS_TSIRQ:</div><div class='add'>+	case (INTSTS_TSIRQ | INTSTS_IR):</div><div class='add'>+		nextwrp = inl(dm_io_mem(DM1105_WRP)) -</div><div class='add'>+			inl(dm_io_mem(DM1105_STADR)) ;</div><div class='add'>+		oldwrp = dm1105dvb-&gt;wrp;</div><div class='add'>+		spin_lock(&amp;dm1105dvb-&gt;lock);</div><div class='add'>+		if (!((dm1105dvb-&gt;ts_buf[oldwrp] == 0x47) &amp;&amp;</div><div class='add'>+				(dm1105dvb-&gt;ts_buf[oldwrp + 188] == 0x47) &amp;&amp;</div><div class='add'>+				(dm1105dvb-&gt;ts_buf[oldwrp + 188 * 2] == 0x47))) {</div><div class='add'>+			dm1105dvb-&gt;PacketErrorCount++;</div><div class='add'>+			/* bad packet found */</div><div class='add'>+			if ((dm1105dvb-&gt;PacketErrorCount &gt;= 2) &amp;&amp;</div><div class='add'>+					(dm1105dvb-&gt;dmarst == 0)) {</div><div class='add'>+				outb(1, dm_io_mem(DM1105_RST));</div><div class='add'>+				dm1105dvb-&gt;wrp = 0;</div><div class='add'>+				dm1105dvb-&gt;PacketErrorCount = 0;</div><div class='add'>+				dm1105dvb-&gt;dmarst = 0;</div><div class='add'>+				spin_unlock(&amp;dm1105dvb-&gt;lock);</div><div class='add'>+				return IRQ_HANDLED;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if (nextwrp &lt; oldwrp) {</div><div class='add'>+			piece = dm1105dvb-&gt;buffer_size - oldwrp;</div><div class='add'>+			memcpy(dm1105dvb-&gt;ts_buf + dm1105dvb-&gt;buffer_size, dm1105dvb-&gt;ts_buf, nextwrp);</div><div class='add'>+			nbpackets = (piece + nextwrp)/188;</div><div class='add'>+		} else	{</div><div class='add'>+			nbpackets = (nextwrp - oldwrp)/188;</div><div class='add'>+		}</div><div class='add'>+		dvb_dmx_swfilter_packets(&amp;dm1105dvb-&gt;demux, &amp;dm1105dvb-&gt;ts_buf[oldwrp], nbpackets);</div><div class='add'>+		dm1105dvb-&gt;wrp = nextwrp;</div><div class='add'>+		spin_unlock(&amp;dm1105dvb-&gt;lock);</div><div class='add'>+		break;</div><div class='add'>+	case INTSTS_IR:</div><div class='add'>+		command = inl(dm_io_mem(DM1105_IRCODE));</div><div class='add'>+		if (ir_debug)</div><div class='add'>+			printk("dm1105: received byte 0x%04x\n", command);</div><div class='add'>+</div><div class='add'>+		dm1105dvb-&gt;ir.ir_command = command;</div><div class='add'>+		tasklet_schedule(&amp;dm1105dvb-&gt;ir.ir_tasklet);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* register with input layer */</div><div class='add'>+static void input_register_keys(struct infrared *ir)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	memset(ir-&gt;input_dev-&gt;keybit, 0, sizeof(ir-&gt;input_dev-&gt;keybit));</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(ir-&gt;key_map); i++)</div><div class='add'>+			set_bit(ir-&gt;key_map[i], ir-&gt;input_dev-&gt;keybit);</div><div class='add'>+</div><div class='add'>+	ir-&gt;input_dev-&gt;keycode = ir-&gt;key_map;</div><div class='add'>+	ir-&gt;input_dev-&gt;keycodesize = sizeof(ir-&gt;key_map[0]);</div><div class='add'>+	ir-&gt;input_dev-&gt;keycodemax = ARRAY_SIZE(ir-&gt;key_map);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int __devinit dm1105_ir_init(struct dm1105dvb *dm1105)</div><div class='add'>+{</div><div class='add'>+	struct input_dev *input_dev;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	dm1105dvb_local = dm1105;</div><div class='add'>+</div><div class='add'>+	input_dev = input_allocate_device();</div><div class='add'>+	if (!input_dev)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	dm1105-&gt;ir.input_dev = input_dev;</div><div class='add'>+	snprintf(dm1105-&gt;ir.input_phys, sizeof(dm1105-&gt;ir.input_phys),</div><div class='add'>+		"pci-%s/ir0", pci_name(dm1105-&gt;pdev));</div><div class='add'>+</div><div class='add'>+	input_dev-&gt;evbit[0] = BIT(EV_KEY);</div><div class='add'>+	input_dev-&gt;name = "DVB on-card IR receiver";</div><div class='add'>+</div><div class='add'>+	input_dev-&gt;phys = dm1105-&gt;ir.input_phys;</div><div class='add'>+	input_dev-&gt;id.bustype = BUS_PCI;</div><div class='add'>+	input_dev-&gt;id.version = 2;</div><div class='add'>+	if (dm1105-&gt;pdev-&gt;subsystem_vendor) {</div><div class='add'>+		input_dev-&gt;id.vendor = dm1105-&gt;pdev-&gt;subsystem_vendor;</div><div class='add'>+		input_dev-&gt;id.product = dm1105-&gt;pdev-&gt;subsystem_device;</div><div class='add'>+	} else {</div><div class='add'>+		input_dev-&gt;id.vendor = dm1105-&gt;pdev-&gt;vendor;</div><div class='add'>+		input_dev-&gt;id.product = dm1105-&gt;pdev-&gt;device;</div><div class='add'>+	}</div><div class='add'>+	input_dev-&gt;dev.parent = &amp;dm1105-&gt;pdev-&gt;dev;</div><div class='add'>+	/* initial keymap */</div><div class='add'>+	memcpy(dm1105-&gt;ir.key_map, ir_codes_dm1105_nec, sizeof dm1105-&gt;ir.key_map);</div><div class='add'>+	input_register_keys(&amp;dm1105-&gt;ir);</div><div class='add'>+	err = input_register_device(input_dev);</div><div class='add'>+	if (err) {</div><div class='add'>+		input_free_device(input_dev);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tasklet_init(&amp;dm1105-&gt;ir.ir_tasklet, dm1105_emit_key, (unsigned long) &amp;dm1105-&gt;ir);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+void __devexit dm1105_ir_exit(struct dm1105dvb *dm1105)</div><div class='add'>+{</div><div class='add'>+	tasklet_kill(&amp;dm1105-&gt;ir.ir_tasklet);</div><div class='add'>+	input_unregister_device(dm1105-&gt;ir.input_dev);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devinit dm1105dvb_hw_init(struct dm1105dvb *dm1105dvb)</div><div class='add'>+{</div><div class='add'>+	dm1105dvb_disable_irqs(dm1105dvb);</div><div class='add'>+</div><div class='add'>+	outb(0, dm_io_mem(DM1105_HOST_CTR));</div><div class='add'>+</div><div class='add'>+	/*DATALEN 188,*/</div><div class='add'>+	outb(188, dm_io_mem(DM1105_DTALENTH));</div><div class='add'>+	/*TS_STRT TS_VALP MSBFIRST TS_MODE ALPAS TSPES*/</div><div class='add'>+	outw(0xc10a, dm_io_mem(DM1105_TSCTR));</div><div class='add'>+</div><div class='add'>+	/* map DMA and set address */</div><div class='add'>+	dm1105dvb_dma_map(dm1105dvb);</div><div class='add'>+	dm1105dvb_set_dma_addr(dm1105dvb);</div><div class='add'>+	/* big buffer */</div><div class='add'>+	outl(5*DM1105_DMA_BYTES, dm_io_mem(DM1105_RLEN));</div><div class='add'>+	outb(47, dm_io_mem(DM1105_INTCNT));</div><div class='add'>+</div><div class='add'>+	/* IR NEC mode enable */</div><div class='add'>+	outb((DM1105_IR_EN | DM1105_SYS_CHK), dm_io_mem(DM1105_IRCTR));</div><div class='add'>+	outb(0, dm_io_mem(DM1105_IRMODE));</div><div class='add'>+	outw(0, dm_io_mem(DM1105_SYSTEMCODE));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dm1105dvb_hw_exit(struct dm1105dvb *dm1105dvb)</div><div class='add'>+{</div><div class='add'>+	dm1105dvb_disable_irqs(dm1105dvb);</div><div class='add'>+</div><div class='add'>+	/* IR disable */</div><div class='add'>+	outb(0, dm_io_mem(DM1105_IRCTR));</div><div class='add'>+	outb(INTMAK_NONEMASK, dm_io_mem(DM1105_INTMAK));</div><div class='add'>+</div><div class='add'>+	dm1105dvb_dma_unmap(dm1105dvb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct stv0299_config sharp_z0194a_config = {</div><div class='add'>+	.demod_address = 0x68,</div><div class='add'>+	.inittab = sharp_z0194a_inittab,</div><div class='add'>+	.mclk = 88000000UL,</div><div class='add'>+	.invert = 1,</div><div class='add'>+	.skip_reinit = 0,</div><div class='add'>+	.lock_output = STV0299_LOCKOUTPUT_1,</div><div class='add'>+	.volt13_op0_op1 = STV0299_VOLT13_OP1,</div><div class='add'>+	.min_delay_ms = 100,</div><div class='add'>+	.set_symbol_rate = sharp_z0194a_set_symbol_rate,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct stv0288_config earda_config = {</div><div class='add'>+	.demod_address = 0x68,</div><div class='add'>+	.min_delay_ms = 100,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct si21xx_config serit_config = {</div><div class='add'>+	.demod_address = 0x68,</div><div class='add'>+	.min_delay_ms = 100,</div><div class='add'>+</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct cx24116_config serit_sp2633_config = {</div><div class='add'>+	.demod_address = 0x55,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __devinit frontend_init(struct dm1105dvb *dm1105dvb)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	switch (dm1105dvb-&gt;pdev-&gt;subsystem_device) {</div><div class='add'>+	case PCI_DEVICE_ID_DW2002:</div><div class='add'>+		dm1105dvb-&gt;fe = dvb_attach(</div><div class='add'>+			stv0299_attach, &amp;sharp_z0194a_config,</div><div class='add'>+			&amp;dm1105dvb-&gt;i2c_adap);</div><div class='add'>+</div><div class='add'>+		if (dm1105dvb-&gt;fe) {</div><div class='add'>+			dm1105dvb-&gt;fe-&gt;ops.set_voltage =</div><div class='add'>+							dm1105dvb_set_voltage;</div><div class='add'>+			dvb_attach(dvb_pll_attach, dm1105dvb-&gt;fe, 0x60,</div><div class='add'>+					&amp;dm1105dvb-&gt;i2c_adap, DVB_PLL_OPERA1);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!dm1105dvb-&gt;fe) {</div><div class='add'>+			dm1105dvb-&gt;fe = dvb_attach(</div><div class='add'>+				stv0288_attach, &amp;earda_config,</div><div class='add'>+				&amp;dm1105dvb-&gt;i2c_adap);</div><div class='add'>+			if (dm1105dvb-&gt;fe) {</div><div class='add'>+				dm1105dvb-&gt;fe-&gt;ops.set_voltage =</div><div class='add'>+							dm1105dvb_set_voltage;</div><div class='add'>+				dvb_attach(stb6000_attach, dm1105dvb-&gt;fe, 0x61,</div><div class='add'>+						&amp;dm1105dvb-&gt;i2c_adap);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!dm1105dvb-&gt;fe) {</div><div class='add'>+			dm1105dvb-&gt;fe = dvb_attach(</div><div class='add'>+				si21xx_attach, &amp;serit_config,</div><div class='add'>+				&amp;dm1105dvb-&gt;i2c_adap);</div><div class='add'>+			if (dm1105dvb-&gt;fe)</div><div class='add'>+				dm1105dvb-&gt;fe-&gt;ops.set_voltage =</div><div class='add'>+							dm1105dvb_set_voltage;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case PCI_DEVICE_ID_DW2004:</div><div class='add'>+		dm1105dvb-&gt;fe = dvb_attach(</div><div class='add'>+			cx24116_attach, &amp;serit_sp2633_config,</div><div class='add'>+			&amp;dm1105dvb-&gt;i2c_adap);</div><div class='add'>+		if (dm1105dvb-&gt;fe)</div><div class='add'>+			dm1105dvb-&gt;fe-&gt;ops.set_voltage = dm1105dvb_set_voltage;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!dm1105dvb-&gt;fe) {</div><div class='add'>+		dev_err(&amp;dm1105dvb-&gt;pdev-&gt;dev, "could not attach frontend\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = dvb_register_frontend(&amp;dm1105dvb-&gt;dvb_adapter, dm1105dvb-&gt;fe);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		if (dm1105dvb-&gt;fe-&gt;ops.release)</div><div class='add'>+			dm1105dvb-&gt;fe-&gt;ops.release(dm1105dvb-&gt;fe);</div><div class='add'>+		dm1105dvb-&gt;fe = NULL;</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __devinit dm1105dvb_read_mac(struct dm1105dvb *dm1105dvb, u8 *mac)</div><div class='add'>+{</div><div class='add'>+	static u8 command[1] = { 0x28 };</div><div class='add'>+</div><div class='add'>+	struct i2c_msg msg[] = {</div><div class='add'>+		{ .addr = IIC_24C01_addr &gt;&gt; 1, .flags = 0,</div><div class='add'>+				.buf = command, .len = 1 },</div><div class='add'>+		{ .addr = IIC_24C01_addr &gt;&gt; 1, .flags = I2C_M_RD,</div><div class='add'>+				.buf = mac, .len = 6 },</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	dm1105_i2c_xfer(&amp;dm1105dvb-&gt;i2c_adap, msg , 2);</div><div class='add'>+	dev_info(&amp;dm1105dvb-&gt;pdev-&gt;dev, "MAC %02x:%02x:%02x:%02x:%02x:%02x\n",</div><div class='add'>+			mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devinit dm1105_probe(struct pci_dev *pdev,</div><div class='add'>+				  const struct pci_device_id *ent)</div><div class='add'>+{</div><div class='add'>+	struct dm1105dvb *dm1105dvb;</div><div class='add'>+	struct dvb_adapter *dvb_adapter;</div><div class='add'>+	struct dvb_demux *dvbdemux;</div><div class='add'>+	struct dmx_demux *dmx;</div><div class='add'>+	int ret = -ENOMEM;</div><div class='add'>+</div><div class='add'>+	dm1105dvb = kzalloc(sizeof(struct dm1105dvb), GFP_KERNEL);</div><div class='add'>+	if (!dm1105dvb)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	dm1105dvb-&gt;pdev = pdev;</div><div class='add'>+	dm1105dvb-&gt;buffer_size = 5 * DM1105_DMA_BYTES;</div><div class='add'>+	dm1105dvb-&gt;PacketErrorCount = 0;</div><div class='add'>+	dm1105dvb-&gt;dmarst = 0;</div><div class='add'>+</div><div class='add'>+	ret = pci_enable_device(pdev);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err_kfree;</div><div class='add'>+</div><div class='add'>+	ret = pci_set_dma_mask(pdev, DMA_32BIT_MASK);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err_pci_disable_device;</div><div class='add'>+</div><div class='add'>+	pci_set_master(pdev);</div><div class='add'>+</div><div class='add'>+	ret = pci_request_regions(pdev, DRIVER_NAME);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err_pci_disable_device;</div><div class='add'>+</div><div class='add'>+	dm1105dvb-&gt;io_mem = pci_iomap(pdev, 0, pci_resource_len(pdev, 0));</div><div class='add'>+	if (!dm1105dvb-&gt;io_mem) {</div><div class='add'>+		ret = -EIO;</div><div class='add'>+		goto err_pci_release_regions;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;dm1105dvb-&gt;lock);</div><div class='add'>+	pci_set_drvdata(pdev, dm1105dvb);</div><div class='add'>+</div><div class='add'>+	ret = request_irq(pdev-&gt;irq, dm1105dvb_irq, IRQF_SHARED, DRIVER_NAME, dm1105dvb);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err_pci_iounmap;</div><div class='add'>+</div><div class='add'>+	ret = dm1105dvb_hw_init(dm1105dvb);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err_free_irq;</div><div class='add'>+</div><div class='add'>+	/* i2c */</div><div class='add'>+	i2c_set_adapdata(&amp;dm1105dvb-&gt;i2c_adap, dm1105dvb);</div><div class='add'>+	strcpy(dm1105dvb-&gt;i2c_adap.name, DRIVER_NAME);</div><div class='add'>+	dm1105dvb-&gt;i2c_adap.owner = THIS_MODULE;</div><div class='add'>+	dm1105dvb-&gt;i2c_adap.class = I2C_CLASS_TV_DIGITAL;</div><div class='add'>+	dm1105dvb-&gt;i2c_adap.dev.parent = &amp;pdev-&gt;dev;</div><div class='add'>+	dm1105dvb-&gt;i2c_adap.algo = &amp;dm1105_algo;</div><div class='add'>+	dm1105dvb-&gt;i2c_adap.algo_data = dm1105dvb;</div><div class='add'>+	ret = i2c_add_adapter(&amp;dm1105dvb-&gt;i2c_adap);</div><div class='add'>+</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err_dm1105dvb_hw_exit;</div><div class='add'>+</div><div class='add'>+	/* dvb */</div><div class='add'>+	ret = dvb_register_adapter(&amp;dm1105dvb-&gt;dvb_adapter, DRIVER_NAME,</div><div class='add'>+					THIS_MODULE, &amp;pdev-&gt;dev, adapter_nr);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err_i2c_del_adapter;</div><div class='add'>+</div><div class='add'>+	dvb_adapter = &amp;dm1105dvb-&gt;dvb_adapter;</div><div class='add'>+</div><div class='add'>+	dm1105dvb_read_mac(dm1105dvb, dvb_adapter-&gt;proposed_mac);</div><div class='add'>+</div><div class='add'>+	dvbdemux = &amp;dm1105dvb-&gt;demux;</div><div class='add'>+	dvbdemux-&gt;filternum = 256;</div><div class='add'>+	dvbdemux-&gt;feednum = 256;</div><div class='add'>+	dvbdemux-&gt;start_feed = dm1105dvb_start_feed;</div><div class='add'>+	dvbdemux-&gt;stop_feed = dm1105dvb_stop_feed;</div><div class='add'>+	dvbdemux-&gt;dmx.capabilities = (DMX_TS_FILTERING |</div><div class='add'>+			DMX_SECTION_FILTERING | DMX_MEMORY_BASED_FILTERING);</div><div class='add'>+	ret = dvb_dmx_init(dvbdemux);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err_dvb_unregister_adapter;</div><div class='add'>+</div><div class='add'>+	dmx = &amp;dvbdemux-&gt;dmx;</div><div class='add'>+	dm1105dvb-&gt;dmxdev.filternum = 256;</div><div class='add'>+	dm1105dvb-&gt;dmxdev.demux = dmx;</div><div class='add'>+	dm1105dvb-&gt;dmxdev.capabilities = 0;</div><div class='add'>+</div><div class='add'>+	ret = dvb_dmxdev_init(&amp;dm1105dvb-&gt;dmxdev, dvb_adapter);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err_dvb_dmx_release;</div><div class='add'>+</div><div class='add'>+	dm1105dvb-&gt;hw_frontend.source = DMX_FRONTEND_0;</div><div class='add'>+</div><div class='add'>+	ret = dmx-&gt;add_frontend(dmx, &amp;dm1105dvb-&gt;hw_frontend);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err_dvb_dmxdev_release;</div><div class='add'>+</div><div class='add'>+	dm1105dvb-&gt;mem_frontend.source = DMX_MEMORY_FE;</div><div class='add'>+</div><div class='add'>+	ret = dmx-&gt;add_frontend(dmx, &amp;dm1105dvb-&gt;mem_frontend);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err_remove_hw_frontend;</div><div class='add'>+</div><div class='add'>+	ret = dmx-&gt;connect_frontend(dmx, &amp;dm1105dvb-&gt;hw_frontend);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err_remove_mem_frontend;</div><div class='add'>+</div><div class='add'>+	ret = frontend_init(dm1105dvb);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err_disconnect_frontend;</div><div class='add'>+</div><div class='add'>+	dvb_net_init(dvb_adapter, &amp;dm1105dvb-&gt;dvbnet, dmx);</div><div class='add'>+	dm1105_ir_init(dm1105dvb);</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='add'>+</div><div class='add'>+err_disconnect_frontend:</div><div class='add'>+	dmx-&gt;disconnect_frontend(dmx);</div><div class='add'>+err_remove_mem_frontend:</div><div class='add'>+	dmx-&gt;remove_frontend(dmx, &amp;dm1105dvb-&gt;mem_frontend);</div><div class='add'>+err_remove_hw_frontend:</div><div class='add'>+	dmx-&gt;remove_frontend(dmx, &amp;dm1105dvb-&gt;hw_frontend);</div><div class='add'>+err_dvb_dmxdev_release:</div><div class='add'>+	dvb_dmxdev_release(&amp;dm1105dvb-&gt;dmxdev);</div><div class='add'>+err_dvb_dmx_release:</div><div class='add'>+	dvb_dmx_release(dvbdemux);</div><div class='add'>+err_dvb_unregister_adapter:</div><div class='add'>+	dvb_unregister_adapter(dvb_adapter);</div><div class='add'>+err_i2c_del_adapter:</div><div class='add'>+	i2c_del_adapter(&amp;dm1105dvb-&gt;i2c_adap);</div><div class='add'>+err_dm1105dvb_hw_exit:</div><div class='add'>+	dm1105dvb_hw_exit(dm1105dvb);</div><div class='add'>+err_free_irq:</div><div class='add'>+	free_irq(pdev-&gt;irq, dm1105dvb);</div><div class='add'>+err_pci_iounmap:</div><div class='add'>+	pci_iounmap(pdev, dm1105dvb-&gt;io_mem);</div><div class='add'>+err_pci_release_regions:</div><div class='add'>+	pci_release_regions(pdev);</div><div class='add'>+err_pci_disable_device:</div><div class='add'>+	pci_disable_device(pdev);</div><div class='add'>+err_kfree:</div><div class='add'>+	pci_set_drvdata(pdev, NULL);</div><div class='add'>+	kfree(dm1105dvb);</div><div class='add'>+	goto out;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __devexit dm1105_remove(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct dm1105dvb *dm1105dvb = pci_get_drvdata(pdev);</div><div class='add'>+	struct dvb_adapter *dvb_adapter = &amp;dm1105dvb-&gt;dvb_adapter;</div><div class='add'>+	struct dvb_demux *dvbdemux = &amp;dm1105dvb-&gt;demux;</div><div class='add'>+	struct dmx_demux *dmx = &amp;dvbdemux-&gt;dmx;</div><div class='add'>+</div><div class='add'>+	dm1105_ir_exit(dm1105dvb);</div><div class='add'>+	dmx-&gt;close(dmx);</div><div class='add'>+	dvb_net_release(&amp;dm1105dvb-&gt;dvbnet);</div><div class='add'>+	if (dm1105dvb-&gt;fe)</div><div class='add'>+		dvb_unregister_frontend(dm1105dvb-&gt;fe);</div><div class='add'>+</div><div class='add'>+	dmx-&gt;disconnect_frontend(dmx);</div><div class='add'>+	dmx-&gt;remove_frontend(dmx, &amp;dm1105dvb-&gt;mem_frontend);</div><div class='add'>+	dmx-&gt;remove_frontend(dmx, &amp;dm1105dvb-&gt;hw_frontend);</div><div class='add'>+	dvb_dmxdev_release(&amp;dm1105dvb-&gt;dmxdev);</div><div class='add'>+	dvb_dmx_release(dvbdemux);</div><div class='add'>+	dvb_unregister_adapter(dvb_adapter);</div><div class='add'>+	if (&amp;dm1105dvb-&gt;i2c_adap)</div><div class='add'>+		i2c_del_adapter(&amp;dm1105dvb-&gt;i2c_adap);</div><div class='add'>+</div><div class='add'>+	dm1105dvb_hw_exit(dm1105dvb);</div><div class='add'>+	synchronize_irq(pdev-&gt;irq);</div><div class='add'>+	free_irq(pdev-&gt;irq, dm1105dvb);</div><div class='add'>+	pci_iounmap(pdev, dm1105dvb-&gt;io_mem);</div><div class='add'>+	pci_release_regions(pdev);</div><div class='add'>+	pci_disable_device(pdev);</div><div class='add'>+	pci_set_drvdata(pdev, NULL);</div><div class='add'>+	kfree(dm1105dvb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct pci_device_id dm1105_id_table[] __devinitdata = {</div><div class='add'>+	{</div><div class='add'>+		.vendor = PCI_VENDOR_ID_TRIGEM,</div><div class='add'>+		.device = PCI_DEVICE_ID_DM1105,</div><div class='add'>+		.subvendor = PCI_ANY_ID,</div><div class='add'>+		.subdevice = PCI_DEVICE_ID_DW2002,</div><div class='add'>+	}, {</div><div class='add'>+		.vendor = PCI_VENDOR_ID_TRIGEM,</div><div class='add'>+		.device = PCI_DEVICE_ID_DM1105,</div><div class='add'>+		.subvendor = PCI_ANY_ID,</div><div class='add'>+		.subdevice = PCI_DEVICE_ID_DW2004,</div><div class='add'>+	}, {</div><div class='add'>+		/* empty */</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_DEVICE_TABLE(pci, dm1105_id_table);</div><div class='add'>+</div><div class='add'>+static struct pci_driver dm1105_driver = {</div><div class='add'>+	.name = DRIVER_NAME,</div><div class='add'>+	.id_table = dm1105_id_table,</div><div class='add'>+	.probe = dm1105_probe,</div><div class='add'>+	.remove = __devexit_p(dm1105_remove),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init dm1105_init(void)</div><div class='add'>+{</div><div class='add'>+	return pci_register_driver(&amp;dm1105_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit dm1105_exit(void)</div><div class='add'>+{</div><div class='add'>+	pci_unregister_driver(&amp;dm1105_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(dm1105_init);</div><div class='add'>+module_exit(dm1105_exit);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Igor M. Liplianin &lt;liplianin@me.by&gt;");</div><div class='add'>+MODULE_DESCRIPTION("SDMC DM1105 DVB driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.c b/drivers/media/dvb/dvb-core/dvb_frontend.c<br/>index 3526e3ee9487..5689d1f1d444 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/dvb-core/dvb_frontend.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/dvb/dvb-core/dvb_frontend.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/dvb-core/dvb_frontend.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/dvb-core/dvb_frontend.c</a></div><div class='hunk'>@@ -40,12 +40,14 @@</div><div class='ctx'> </div><div class='ctx'> #include "dvb_frontend.h"</div><div class='ctx'> #include "dvbdev.h"</div><div class='add'>+#include &lt;linux/dvb/version.h&gt;</div><div class='ctx'> </div><div class='ctx'> static int dvb_frontend_debug;</div><div class='ctx'> static int dvb_shutdown_timeout;</div><div class='ctx'> static int dvb_force_auto_inversion;</div><div class='ctx'> static int dvb_override_tune_delay;</div><div class='ctx'> static int dvb_powerdown_on_sleep = 1;</div><div class='add'>+static int dvb_mfe_wait_time = 5;</div><div class='ctx'> </div><div class='ctx'> module_param_named(frontend_debug, dvb_frontend_debug, int, 0644);</div><div class='ctx'> MODULE_PARM_DESC(frontend_debug, "Turn on/off frontend core debugging (default:off).");</div><div class='hunk'>@@ -57,6 +59,8 @@ module_param(dvb_override_tune_delay, int, 0644);</div><div class='ctx'> MODULE_PARM_DESC(dvb_override_tune_delay, "0: normal (default), &gt;0 =&gt; delay in milliseconds to wait for lock after a tune attempt");</div><div class='ctx'> module_param(dvb_powerdown_on_sleep, int, 0644);</div><div class='ctx'> MODULE_PARM_DESC(dvb_powerdown_on_sleep, "0: do not power down, 1: turn LNB voltage off on sleep (default)");</div><div class='add'>+module_param(dvb_mfe_wait_time, int, 0644);</div><div class='add'>+MODULE_PARM_DESC(dvb_mfe_wait_time, "Wait up to &lt;mfe_wait_time&gt; seconds on open() for multi-frontend to become available (default:5 seconds)");</div><div class='ctx'> </div><div class='ctx'> #define dprintk if (dvb_frontend_debug) printk</div><div class='ctx'> </div><div class='hunk'>@@ -211,8 +215,9 @@ static int dvb_frontend_get_event(struct dvb_frontend *fe,</div><div class='ctx'> </div><div class='ctx'> static void dvb_frontend_init(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='del'>-	dprintk ("DVB: initialising frontend %i (%s)...\n",</div><div class='add'>+	dprintk ("DVB: initialising adapter %i frontend %i (%s)...\n",</div><div class='ctx'> 		 fe-&gt;dvb-&gt;num,</div><div class='add'>+		 fe-&gt;id,</div><div class='ctx'> 		 fe-&gt;ops.info.name);</div><div class='ctx'> </div><div class='ctx'> 	if (fe-&gt;ops.init)</div><div class='hunk'>@@ -685,7 +690,7 @@ static int dvb_frontend_start(struct dvb_frontend *fe)</div><div class='ctx'> 	mb();</div><div class='ctx'> </div><div class='ctx'> 	fe_thread = kthread_run(dvb_frontend_thread, fe,</div><div class='del'>-		"kdvb-fe-%i", fe-&gt;dvb-&gt;num);</div><div class='add'>+		"kdvb-ad-%i-fe-%i", fe-&gt;dvb-&gt;num,fe-&gt;id);</div><div class='ctx'> 	if (IS_ERR(fe_thread)) {</div><div class='ctx'> 		ret = PTR_ERR(fe_thread);</div><div class='ctx'> 		printk("dvb_frontend_start: failed to start kthread (%d)\n", ret);</div><div class='hunk'>@@ -709,8 +714,8 @@ static void dvb_frontend_get_frequeny_limits(struct dvb_frontend *fe,</div><div class='ctx'> 		*freq_max = min(fe-&gt;ops.info.frequency_max, fe-&gt;ops.tuner_ops.info.frequency_max);</div><div class='ctx'> </div><div class='ctx'> 	if (*freq_min == 0 || *freq_max == 0)</div><div class='del'>-		printk(KERN_WARNING "DVB: frontend %u frequency limits undefined - fix the driver\n",</div><div class='del'>-		       fe-&gt;dvb-&gt;num);</div><div class='add'>+		printk(KERN_WARNING "DVB: adapter %i frontend %u frequency limits undefined - fix the driver\n",</div><div class='add'>+		       fe-&gt;dvb-&gt;num,fe-&gt;id);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int dvb_frontend_check_parameters(struct dvb_frontend *fe,</div><div class='hunk'>@@ -723,8 +728,8 @@ static int dvb_frontend_check_parameters(struct dvb_frontend *fe,</div><div class='ctx'> 	dvb_frontend_get_frequeny_limits(fe, &amp;freq_min, &amp;freq_max);</div><div class='ctx'> 	if ((freq_min &amp;&amp; parms-&gt;frequency &lt; freq_min) ||</div><div class='ctx'> 	    (freq_max &amp;&amp; parms-&gt;frequency &gt; freq_max)) {</div><div class='del'>-		printk(KERN_WARNING "DVB: frontend %u frequency %u out of range (%u..%u)\n",</div><div class='del'>-		       fe-&gt;dvb-&gt;num, parms-&gt;frequency, freq_min, freq_max);</div><div class='add'>+		printk(KERN_WARNING "DVB: adapter %i frontend %i frequency %u out of range (%u..%u)\n",</div><div class='add'>+		       fe-&gt;dvb-&gt;num, fe-&gt;id, parms-&gt;frequency, freq_min, freq_max);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -734,8 +739,8 @@ static int dvb_frontend_check_parameters(struct dvb_frontend *fe,</div><div class='ctx'> 		     parms-&gt;u.qpsk.symbol_rate &lt; fe-&gt;ops.info.symbol_rate_min) ||</div><div class='ctx'> 		    (fe-&gt;ops.info.symbol_rate_max &amp;&amp;</div><div class='ctx'> 		     parms-&gt;u.qpsk.symbol_rate &gt; fe-&gt;ops.info.symbol_rate_max)) {</div><div class='del'>-			printk(KERN_WARNING "DVB: frontend %u symbol rate %u out of range (%u..%u)\n",</div><div class='del'>-			       fe-&gt;dvb-&gt;num, parms-&gt;u.qpsk.symbol_rate,</div><div class='add'>+			printk(KERN_WARNING "DVB: adapter %i frontend %i symbol rate %u out of range (%u..%u)\n",</div><div class='add'>+			       fe-&gt;dvb-&gt;num, fe-&gt;id, parms-&gt;u.qpsk.symbol_rate,</div><div class='ctx'> 			       fe-&gt;ops.info.symbol_rate_min, fe-&gt;ops.info.symbol_rate_max);</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -745,8 +750,8 @@ static int dvb_frontend_check_parameters(struct dvb_frontend *fe,</div><div class='ctx'> 		     parms-&gt;u.qam.symbol_rate &lt; fe-&gt;ops.info.symbol_rate_min) ||</div><div class='ctx'> 		    (fe-&gt;ops.info.symbol_rate_max &amp;&amp;</div><div class='ctx'> 		     parms-&gt;u.qam.symbol_rate &gt; fe-&gt;ops.info.symbol_rate_max)) {</div><div class='del'>-			printk(KERN_WARNING "DVB: frontend %u symbol rate %u out of range (%u..%u)\n",</div><div class='del'>-			       fe-&gt;dvb-&gt;num, parms-&gt;u.qam.symbol_rate,</div><div class='add'>+			printk(KERN_WARNING "DVB: adapter %i frontend %i symbol rate %u out of range (%u..%u)\n",</div><div class='add'>+			       fe-&gt;dvb-&gt;num, fe-&gt;id, parms-&gt;u.qam.symbol_rate,</div><div class='ctx'> 			       fe-&gt;ops.info.symbol_rate_min, fe-&gt;ops.info.symbol_rate_max);</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -755,6 +760,529 @@ static int dvb_frontend_check_parameters(struct dvb_frontend *fe,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct dtv_cmds_h dtv_cmds[] = {</div><div class='add'>+	[DTV_TUNE] = {</div><div class='add'>+		.name	= "DTV_TUNE",</div><div class='add'>+		.cmd	= DTV_TUNE,</div><div class='add'>+		.set	= 1,</div><div class='add'>+	},</div><div class='add'>+	[DTV_CLEAR] = {</div><div class='add'>+		.name	= "DTV_CLEAR",</div><div class='add'>+		.cmd	= DTV_CLEAR,</div><div class='add'>+		.set	= 1,</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	/* Set */</div><div class='add'>+	[DTV_FREQUENCY] = {</div><div class='add'>+		.name	= "DTV_FREQUENCY",</div><div class='add'>+		.cmd	= DTV_FREQUENCY,</div><div class='add'>+		.set	= 1,</div><div class='add'>+	},</div><div class='add'>+	[DTV_BANDWIDTH_HZ] = {</div><div class='add'>+		.name	= "DTV_BANDWIDTH_HZ",</div><div class='add'>+		.cmd	= DTV_BANDWIDTH_HZ,</div><div class='add'>+		.set	= 1,</div><div class='add'>+	},</div><div class='add'>+	[DTV_MODULATION] = {</div><div class='add'>+		.name	= "DTV_MODULATION",</div><div class='add'>+		.cmd	= DTV_MODULATION,</div><div class='add'>+		.set	= 1,</div><div class='add'>+	},</div><div class='add'>+	[DTV_INVERSION] = {</div><div class='add'>+		.name	= "DTV_INVERSION",</div><div class='add'>+		.cmd	= DTV_INVERSION,</div><div class='add'>+		.set	= 1,</div><div class='add'>+	},</div><div class='add'>+	[DTV_DISEQC_MASTER] = {</div><div class='add'>+		.name	= "DTV_DISEQC_MASTER",</div><div class='add'>+		.cmd	= DTV_DISEQC_MASTER,</div><div class='add'>+		.set	= 1,</div><div class='add'>+		.buffer	= 1,</div><div class='add'>+	},</div><div class='add'>+	[DTV_SYMBOL_RATE] = {</div><div class='add'>+		.name	= "DTV_SYMBOL_RATE",</div><div class='add'>+		.cmd	= DTV_SYMBOL_RATE,</div><div class='add'>+		.set	= 1,</div><div class='add'>+	},</div><div class='add'>+	[DTV_INNER_FEC] = {</div><div class='add'>+		.name	= "DTV_INNER_FEC",</div><div class='add'>+		.cmd	= DTV_INNER_FEC,</div><div class='add'>+		.set	= 1,</div><div class='add'>+	},</div><div class='add'>+	[DTV_VOLTAGE] = {</div><div class='add'>+		.name	= "DTV_VOLTAGE",</div><div class='add'>+		.cmd	= DTV_VOLTAGE,</div><div class='add'>+		.set	= 1,</div><div class='add'>+	},</div><div class='add'>+	[DTV_TONE] = {</div><div class='add'>+		.name	= "DTV_TONE",</div><div class='add'>+		.cmd	= DTV_TONE,</div><div class='add'>+		.set	= 1,</div><div class='add'>+	},</div><div class='add'>+	[DTV_PILOT] = {</div><div class='add'>+		.name	= "DTV_PILOT",</div><div class='add'>+		.cmd	= DTV_PILOT,</div><div class='add'>+		.set	= 1,</div><div class='add'>+	},</div><div class='add'>+	[DTV_ROLLOFF] = {</div><div class='add'>+		.name	= "DTV_ROLLOFF",</div><div class='add'>+		.cmd	= DTV_ROLLOFF,</div><div class='add'>+		.set	= 1,</div><div class='add'>+	},</div><div class='add'>+	[DTV_DELIVERY_SYSTEM] = {</div><div class='add'>+		.name	= "DTV_DELIVERY_SYSTEM",</div><div class='add'>+		.cmd	= DTV_DELIVERY_SYSTEM,</div><div class='add'>+		.set	= 1,</div><div class='add'>+	},</div><div class='add'>+	[DTV_HIERARCHY] = {</div><div class='add'>+		.name	= "DTV_HIERARCHY",</div><div class='add'>+		.cmd	= DTV_HIERARCHY,</div><div class='add'>+		.set	= 1,</div><div class='add'>+	},</div><div class='add'>+	[DTV_CODE_RATE_HP] = {</div><div class='add'>+		.name	= "DTV_CODE_RATE_HP",</div><div class='add'>+		.cmd	= DTV_CODE_RATE_HP,</div><div class='add'>+		.set	= 1,</div><div class='add'>+	},</div><div class='add'>+	[DTV_CODE_RATE_LP] = {</div><div class='add'>+		.name	= "DTV_CODE_RATE_LP",</div><div class='add'>+		.cmd	= DTV_CODE_RATE_LP,</div><div class='add'>+		.set	= 1,</div><div class='add'>+	},</div><div class='add'>+	[DTV_GUARD_INTERVAL] = {</div><div class='add'>+		.name	= "DTV_GUARD_INTERVAL",</div><div class='add'>+		.cmd	= DTV_GUARD_INTERVAL,</div><div class='add'>+		.set	= 1,</div><div class='add'>+	},</div><div class='add'>+	[DTV_TRANSMISSION_MODE] = {</div><div class='add'>+		.name	= "DTV_TRANSMISSION_MODE",</div><div class='add'>+		.cmd	= DTV_TRANSMISSION_MODE,</div><div class='add'>+		.set	= 1,</div><div class='add'>+	},</div><div class='add'>+	/* Get */</div><div class='add'>+	[DTV_DISEQC_SLAVE_REPLY] = {</div><div class='add'>+		.name	= "DTV_DISEQC_SLAVE_REPLY",</div><div class='add'>+		.cmd	= DTV_DISEQC_SLAVE_REPLY,</div><div class='add'>+		.set	= 0,</div><div class='add'>+		.buffer	= 1,</div><div class='add'>+	},</div><div class='add'>+	[DTV_API_VERSION] = {</div><div class='add'>+		.name	= "DTV_API_VERSION",</div><div class='add'>+		.cmd	= DTV_API_VERSION,</div><div class='add'>+		.set	= 0,</div><div class='add'>+	},</div><div class='add'>+	[DTV_CODE_RATE_HP] = {</div><div class='add'>+		.name	= "DTV_CODE_RATE_HP",</div><div class='add'>+		.cmd	= DTV_CODE_RATE_HP,</div><div class='add'>+		.set	= 0,</div><div class='add'>+	},</div><div class='add'>+	[DTV_CODE_RATE_LP] = {</div><div class='add'>+		.name	= "DTV_CODE_RATE_LP",</div><div class='add'>+		.cmd	= DTV_CODE_RATE_LP,</div><div class='add'>+		.set	= 0,</div><div class='add'>+	},</div><div class='add'>+	[DTV_GUARD_INTERVAL] = {</div><div class='add'>+		.name	= "DTV_GUARD_INTERVAL",</div><div class='add'>+		.cmd	= DTV_GUARD_INTERVAL,</div><div class='add'>+		.set	= 0,</div><div class='add'>+	},</div><div class='add'>+	[DTV_TRANSMISSION_MODE] = {</div><div class='add'>+		.name	= "DTV_TRANSMISSION_MODE",</div><div class='add'>+		.cmd	= DTV_TRANSMISSION_MODE,</div><div class='add'>+		.set	= 0,</div><div class='add'>+	},</div><div class='add'>+	[DTV_HIERARCHY] = {</div><div class='add'>+		.name	= "DTV_HIERARCHY",</div><div class='add'>+		.cmd	= DTV_HIERARCHY,</div><div class='add'>+		.set	= 0,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void dtv_property_dump(struct dtv_property *tvp)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (tvp-&gt;cmd &lt;= 0 || tvp-&gt;cmd &gt; DTV_MAX_COMMAND) {</div><div class='add'>+		printk(KERN_WARNING "%s: tvp.cmd = 0x%08x undefined\n",</div><div class='add'>+			__func__, tvp-&gt;cmd);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dprintk("%s() tvp.cmd    = 0x%08x (%s)\n"</div><div class='add'>+		,__func__</div><div class='add'>+		,tvp-&gt;cmd</div><div class='add'>+		,dtv_cmds[ tvp-&gt;cmd ].name);</div><div class='add'>+</div><div class='add'>+	if(dtv_cmds[ tvp-&gt;cmd ].buffer) {</div><div class='add'>+</div><div class='add'>+		dprintk("%s() tvp.u.buffer.len = 0x%02x\n"</div><div class='add'>+			,__func__</div><div class='add'>+			,tvp-&gt;u.buffer.len);</div><div class='add'>+</div><div class='add'>+		for(i = 0; i &lt; tvp-&gt;u.buffer.len; i++)</div><div class='add'>+			dprintk("%s() tvp.u.buffer.data[0x%02x] = 0x%02x\n"</div><div class='add'>+				,__func__</div><div class='add'>+				,i</div><div class='add'>+				,tvp-&gt;u.buffer.data[i]);</div><div class='add'>+</div><div class='add'>+	} else</div><div class='add'>+		dprintk("%s() tvp.u.data = 0x%08x\n", __func__, tvp-&gt;u.data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int is_legacy_delivery_system(fe_delivery_system_t s)</div><div class='add'>+{</div><div class='add'>+	if((s == SYS_UNDEFINED) || (s == SYS_DVBC_ANNEX_AC) ||</div><div class='add'>+		(s == SYS_DVBC_ANNEX_B) || (s == SYS_DVBT) || (s == SYS_DVBS))</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Synchronise the legacy tuning parameters into the cache, so that demodulator</div><div class='add'>+ * drivers can use a single set_frontend tuning function, regardless of whether</div><div class='add'>+ * it's being used for the legacy or new API, reducing code and complexity.</div><div class='add'>+ */</div><div class='add'>+void dtv_property_cache_sync(struct dvb_frontend *fe, struct dvb_frontend_parameters *p)</div><div class='add'>+{</div><div class='add'>+	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='add'>+</div><div class='add'>+	c-&gt;frequency = p-&gt;frequency;</div><div class='add'>+	c-&gt;inversion = p-&gt;inversion;</div><div class='add'>+</div><div class='add'>+	switch (fe-&gt;ops.info.type) {</div><div class='add'>+	case FE_QPSK:</div><div class='add'>+		c-&gt;modulation = QPSK;   /* implied for DVB-S in legacy API */</div><div class='add'>+		c-&gt;rolloff = ROLLOFF_35;/* implied for DVB-S */</div><div class='add'>+		c-&gt;symbol_rate = p-&gt;u.qpsk.symbol_rate;</div><div class='add'>+		c-&gt;fec_inner = p-&gt;u.qpsk.fec_inner;</div><div class='add'>+		c-&gt;delivery_system = SYS_DVBS;</div><div class='add'>+		break;</div><div class='add'>+	case FE_QAM:</div><div class='add'>+		c-&gt;symbol_rate = p-&gt;u.qam.symbol_rate;</div><div class='add'>+		c-&gt;fec_inner = p-&gt;u.qam.fec_inner;</div><div class='add'>+		c-&gt;modulation = p-&gt;u.qam.modulation;</div><div class='add'>+		c-&gt;delivery_system = SYS_DVBC_ANNEX_AC;</div><div class='add'>+		break;</div><div class='add'>+	case FE_OFDM:</div><div class='add'>+		if (p-&gt;u.ofdm.bandwidth == BANDWIDTH_6_MHZ)</div><div class='add'>+			c-&gt;bandwidth_hz = 6000000;</div><div class='add'>+		else if (p-&gt;u.ofdm.bandwidth == BANDWIDTH_7_MHZ)</div><div class='add'>+			c-&gt;bandwidth_hz = 7000000;</div><div class='add'>+		else if (p-&gt;u.ofdm.bandwidth == BANDWIDTH_8_MHZ)</div><div class='add'>+			c-&gt;bandwidth_hz = 8000000;</div><div class='add'>+		else</div><div class='add'>+			/* Including BANDWIDTH_AUTO */</div><div class='add'>+			c-&gt;bandwidth_hz = 0;</div><div class='add'>+		c-&gt;code_rate_HP = p-&gt;u.ofdm.code_rate_HP;</div><div class='add'>+		c-&gt;code_rate_LP = p-&gt;u.ofdm.code_rate_LP;</div><div class='add'>+		c-&gt;modulation = p-&gt;u.ofdm.constellation;</div><div class='add'>+		c-&gt;transmission_mode = p-&gt;u.ofdm.transmission_mode;</div><div class='add'>+		c-&gt;guard_interval = p-&gt;u.ofdm.guard_interval;</div><div class='add'>+		c-&gt;hierarchy = p-&gt;u.ofdm.hierarchy_information;</div><div class='add'>+		c-&gt;delivery_system = SYS_DVBT;</div><div class='add'>+		break;</div><div class='add'>+	case FE_ATSC:</div><div class='add'>+		c-&gt;modulation = p-&gt;u.vsb.modulation;</div><div class='add'>+		if ((c-&gt;modulation == VSB_8) || (c-&gt;modulation == VSB_16))</div><div class='add'>+			c-&gt;delivery_system = SYS_ATSC;</div><div class='add'>+		else</div><div class='add'>+			c-&gt;delivery_system = SYS_DVBC_ANNEX_B;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Ensure the cached values are set correctly in the frontend</div><div class='add'>+ * legacy tuning structures, for the advanced tuning API.</div><div class='add'>+ */</div><div class='add'>+void dtv_property_legacy_params_sync(struct dvb_frontend *fe)</div><div class='add'>+{</div><div class='add'>+	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='add'>+	struct dvb_frontend_private *fepriv = fe-&gt;frontend_priv;</div><div class='add'>+	struct dvb_frontend_parameters *p = &amp;fepriv-&gt;parameters;</div><div class='add'>+</div><div class='add'>+	p-&gt;frequency = c-&gt;frequency;</div><div class='add'>+	p-&gt;inversion = c-&gt;inversion;</div><div class='add'>+</div><div class='add'>+	switch (fe-&gt;ops.info.type) {</div><div class='add'>+	case FE_QPSK:</div><div class='add'>+		dprintk("%s() Preparing QPSK req\n", __func__);</div><div class='add'>+		p-&gt;u.qpsk.symbol_rate = c-&gt;symbol_rate;</div><div class='add'>+		p-&gt;u.qpsk.fec_inner = c-&gt;fec_inner;</div><div class='add'>+		c-&gt;delivery_system = SYS_DVBS;</div><div class='add'>+		break;</div><div class='add'>+	case FE_QAM:</div><div class='add'>+		dprintk("%s() Preparing QAM req\n", __func__);</div><div class='add'>+		p-&gt;u.qam.symbol_rate = c-&gt;symbol_rate;</div><div class='add'>+		p-&gt;u.qam.fec_inner = c-&gt;fec_inner;</div><div class='add'>+		p-&gt;u.qam.modulation = c-&gt;modulation;</div><div class='add'>+		c-&gt;delivery_system = SYS_DVBC_ANNEX_AC;</div><div class='add'>+		break;</div><div class='add'>+	case FE_OFDM:</div><div class='add'>+		dprintk("%s() Preparing OFDM req\n", __func__);</div><div class='add'>+		if (c-&gt;bandwidth_hz == 6000000)</div><div class='add'>+			p-&gt;u.ofdm.bandwidth = BANDWIDTH_6_MHZ;</div><div class='add'>+		else if (c-&gt;bandwidth_hz == 7000000)</div><div class='add'>+			p-&gt;u.ofdm.bandwidth = BANDWIDTH_7_MHZ;</div><div class='add'>+		else if (c-&gt;bandwidth_hz == 8000000)</div><div class='add'>+			p-&gt;u.ofdm.bandwidth = BANDWIDTH_8_MHZ;</div><div class='add'>+		else</div><div class='add'>+			p-&gt;u.ofdm.bandwidth = BANDWIDTH_AUTO;</div><div class='add'>+		p-&gt;u.ofdm.code_rate_HP = c-&gt;code_rate_HP;</div><div class='add'>+		p-&gt;u.ofdm.code_rate_LP = c-&gt;code_rate_LP;</div><div class='add'>+		p-&gt;u.ofdm.constellation = c-&gt;modulation;</div><div class='add'>+		p-&gt;u.ofdm.transmission_mode = c-&gt;transmission_mode;</div><div class='add'>+		p-&gt;u.ofdm.guard_interval = c-&gt;guard_interval;</div><div class='add'>+		p-&gt;u.ofdm.hierarchy_information = c-&gt;hierarchy;</div><div class='add'>+		c-&gt;delivery_system = SYS_DVBT;</div><div class='add'>+		break;</div><div class='add'>+	case FE_ATSC:</div><div class='add'>+		dprintk("%s() Preparing VSB req\n", __func__);</div><div class='add'>+		p-&gt;u.vsb.modulation = c-&gt;modulation;</div><div class='add'>+		if ((c-&gt;modulation == VSB_8) || (c-&gt;modulation == VSB_16))</div><div class='add'>+			c-&gt;delivery_system = SYS_ATSC;</div><div class='add'>+		else</div><div class='add'>+			c-&gt;delivery_system = SYS_DVBC_ANNEX_B;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Ensure the cached values are set correctly in the frontend</div><div class='add'>+ * legacy tuning structures, for the legacy tuning API.</div><div class='add'>+ */</div><div class='add'>+void dtv_property_adv_params_sync(struct dvb_frontend *fe)</div><div class='add'>+{</div><div class='add'>+	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='add'>+	struct dvb_frontend_private *fepriv = fe-&gt;frontend_priv;</div><div class='add'>+	struct dvb_frontend_parameters *p = &amp;fepriv-&gt;parameters;</div><div class='add'>+</div><div class='add'>+	p-&gt;frequency = c-&gt;frequency;</div><div class='add'>+	p-&gt;inversion = c-&gt;inversion;</div><div class='add'>+</div><div class='add'>+	switch(c-&gt;modulation) {</div><div class='add'>+	case PSK_8:</div><div class='add'>+	case APSK_16:</div><div class='add'>+	case APSK_32:</div><div class='add'>+	case QPSK:</div><div class='add'>+		p-&gt;u.qpsk.symbol_rate = c-&gt;symbol_rate;</div><div class='add'>+		p-&gt;u.qpsk.fec_inner = c-&gt;fec_inner;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if(c-&gt;delivery_system == SYS_ISDBT) {</div><div class='add'>+		/* Fake out a generic DVB-T request so we pass validation in the ioctl */</div><div class='add'>+		p-&gt;frequency = c-&gt;frequency;</div><div class='add'>+		p-&gt;inversion = INVERSION_AUTO;</div><div class='add'>+		p-&gt;u.ofdm.constellation = QAM_AUTO;</div><div class='add'>+		p-&gt;u.ofdm.code_rate_HP = FEC_AUTO;</div><div class='add'>+		p-&gt;u.ofdm.code_rate_LP = FEC_AUTO;</div><div class='add'>+		p-&gt;u.ofdm.bandwidth = BANDWIDTH_AUTO;</div><div class='add'>+		p-&gt;u.ofdm.transmission_mode = TRANSMISSION_MODE_AUTO;</div><div class='add'>+		p-&gt;u.ofdm.guard_interval = GUARD_INTERVAL_AUTO;</div><div class='add'>+		p-&gt;u.ofdm.hierarchy_information = HIERARCHY_AUTO;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void dtv_property_cache_submit(struct dvb_frontend *fe)</div><div class='add'>+{</div><div class='add'>+	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='add'>+</div><div class='add'>+	/* For legacy delivery systems we don't need the delivery_system to</div><div class='add'>+	 * be specified, but we populate the older structures from the cache</div><div class='add'>+	 * so we can call set_frontend on older drivers.</div><div class='add'>+	 */</div><div class='add'>+	if(is_legacy_delivery_system(c-&gt;delivery_system)) {</div><div class='add'>+</div><div class='add'>+		dprintk("%s() legacy, modulation = %d\n", __func__, c-&gt;modulation);</div><div class='add'>+		dtv_property_legacy_params_sync(fe);</div><div class='add'>+</div><div class='add'>+	} else {</div><div class='add'>+		dprintk("%s() adv, modulation = %d\n", __func__, c-&gt;modulation);</div><div class='add'>+</div><div class='add'>+		/* For advanced delivery systems / modulation types ...</div><div class='add'>+		 * we seed the lecacy dvb_frontend_parameters structure</div><div class='add'>+		 * so that the sanity checking code later in the IOCTL processing</div><div class='add'>+		 * can validate our basic frequency ranges, symbolrates, modulation</div><div class='add'>+		 * etc.</div><div class='add'>+		 */</div><div class='add'>+		dtv_property_adv_params_sync(fe);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dvb_frontend_ioctl_legacy(struct inode *inode, struct file *file,</div><div class='add'>+			unsigned int cmd, void *parg);</div><div class='add'>+static int dvb_frontend_ioctl_properties(struct inode *inode, struct file *file,</div><div class='add'>+			unsigned int cmd, void *parg);</div><div class='add'>+</div><div class='add'>+int dtv_property_process_get(struct dvb_frontend *fe, struct dtv_property *tvp,</div><div class='add'>+	struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	int r = 0;</div><div class='add'>+</div><div class='add'>+	dtv_property_dump(tvp);</div><div class='add'>+</div><div class='add'>+	/* Allow the frontend to validate incoming properties */</div><div class='add'>+	if (fe-&gt;ops.get_property)</div><div class='add'>+		r = fe-&gt;ops.get_property(fe, tvp);</div><div class='add'>+</div><div class='add'>+	if (r &lt; 0)</div><div class='add'>+		return r;</div><div class='add'>+</div><div class='add'>+	switch(tvp-&gt;cmd) {</div><div class='add'>+	case DTV_FREQUENCY:</div><div class='add'>+		tvp-&gt;u.data = fe-&gt;dtv_property_cache.frequency;</div><div class='add'>+		break;</div><div class='add'>+	case DTV_MODULATION:</div><div class='add'>+		tvp-&gt;u.data = fe-&gt;dtv_property_cache.modulation;</div><div class='add'>+		break;</div><div class='add'>+	case DTV_BANDWIDTH_HZ:</div><div class='add'>+		tvp-&gt;u.data = fe-&gt;dtv_property_cache.bandwidth_hz;</div><div class='add'>+		break;</div><div class='add'>+	case DTV_INVERSION:</div><div class='add'>+		tvp-&gt;u.data = fe-&gt;dtv_property_cache.inversion;</div><div class='add'>+		break;</div><div class='add'>+	case DTV_SYMBOL_RATE:</div><div class='add'>+		tvp-&gt;u.data = fe-&gt;dtv_property_cache.symbol_rate;</div><div class='add'>+		break;</div><div class='add'>+	case DTV_INNER_FEC:</div><div class='add'>+		tvp-&gt;u.data = fe-&gt;dtv_property_cache.fec_inner;</div><div class='add'>+		break;</div><div class='add'>+	case DTV_PILOT:</div><div class='add'>+		tvp-&gt;u.data = fe-&gt;dtv_property_cache.pilot;</div><div class='add'>+		break;</div><div class='add'>+	case DTV_ROLLOFF:</div><div class='add'>+		tvp-&gt;u.data = fe-&gt;dtv_property_cache.rolloff;</div><div class='add'>+		break;</div><div class='add'>+	case DTV_DELIVERY_SYSTEM:</div><div class='add'>+		tvp-&gt;u.data = fe-&gt;dtv_property_cache.delivery_system;</div><div class='add'>+		break;</div><div class='add'>+	case DTV_VOLTAGE:</div><div class='add'>+		tvp-&gt;u.data = fe-&gt;dtv_property_cache.voltage;</div><div class='add'>+		break;</div><div class='add'>+	case DTV_TONE:</div><div class='add'>+		tvp-&gt;u.data = fe-&gt;dtv_property_cache.sectone;</div><div class='add'>+		break;</div><div class='add'>+	case DTV_API_VERSION:</div><div class='add'>+		tvp-&gt;u.data = (DVB_API_VERSION &lt;&lt; 8) | DVB_API_VERSION_MINOR;</div><div class='add'>+		break;</div><div class='add'>+	case DTV_CODE_RATE_HP:</div><div class='add'>+		tvp-&gt;u.data = fe-&gt;dtv_property_cache.code_rate_HP;</div><div class='add'>+		break;</div><div class='add'>+	case DTV_CODE_RATE_LP:</div><div class='add'>+		tvp-&gt;u.data = fe-&gt;dtv_property_cache.code_rate_LP;</div><div class='add'>+		break;</div><div class='add'>+	case DTV_GUARD_INTERVAL:</div><div class='add'>+		tvp-&gt;u.data = fe-&gt;dtv_property_cache.guard_interval;</div><div class='add'>+		break;</div><div class='add'>+	case DTV_TRANSMISSION_MODE:</div><div class='add'>+		tvp-&gt;u.data = fe-&gt;dtv_property_cache.transmission_mode;</div><div class='add'>+		break;</div><div class='add'>+	case DTV_HIERARCHY:</div><div class='add'>+		tvp-&gt;u.data = fe-&gt;dtv_property_cache.hierarchy;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		r = -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int dtv_property_process_set(struct dvb_frontend *fe, struct dtv_property *tvp,</div><div class='add'>+	struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	int r = 0;</div><div class='add'>+	struct dvb_frontend_private *fepriv = fe-&gt;frontend_priv;</div><div class='add'>+	dtv_property_dump(tvp);</div><div class='add'>+</div><div class='add'>+	/* Allow the frontend to validate incoming properties */</div><div class='add'>+	if (fe-&gt;ops.set_property)</div><div class='add'>+		r = fe-&gt;ops.set_property(fe, tvp);</div><div class='add'>+</div><div class='add'>+	if (r &lt; 0)</div><div class='add'>+		return r;</div><div class='add'>+</div><div class='add'>+	switch(tvp-&gt;cmd) {</div><div class='add'>+	case DTV_CLEAR:</div><div class='add'>+		/* Reset a cache of data specific to the frontend here. This does</div><div class='add'>+		 * not effect hardware.</div><div class='add'>+		 */</div><div class='add'>+		dprintk("%s() Flushing property cache\n", __func__);</div><div class='add'>+		memset(&amp;fe-&gt;dtv_property_cache, 0, sizeof(struct dtv_frontend_properties));</div><div class='add'>+		fe-&gt;dtv_property_cache.state = tvp-&gt;cmd;</div><div class='add'>+		fe-&gt;dtv_property_cache.delivery_system = SYS_UNDEFINED;</div><div class='add'>+		break;</div><div class='add'>+	case DTV_TUNE:</div><div class='add'>+		/* interpret the cache of data, build either a traditional frontend</div><div class='add'>+		 * tunerequest so we can pass validation in the FE_SET_FRONTEND</div><div class='add'>+		 * ioctl.</div><div class='add'>+		 */</div><div class='add'>+		fe-&gt;dtv_property_cache.state = tvp-&gt;cmd;</div><div class='add'>+		dprintk("%s() Finalised property cache\n", __func__);</div><div class='add'>+		dtv_property_cache_submit(fe);</div><div class='add'>+</div><div class='add'>+		r |= dvb_frontend_ioctl_legacy(inode, file, FE_SET_FRONTEND,</div><div class='add'>+			&amp;fepriv-&gt;parameters);</div><div class='add'>+		break;</div><div class='add'>+	case DTV_FREQUENCY:</div><div class='add'>+		fe-&gt;dtv_property_cache.frequency = tvp-&gt;u.data;</div><div class='add'>+		break;</div><div class='add'>+	case DTV_MODULATION:</div><div class='add'>+		fe-&gt;dtv_property_cache.modulation = tvp-&gt;u.data;</div><div class='add'>+		break;</div><div class='add'>+	case DTV_BANDWIDTH_HZ:</div><div class='add'>+		fe-&gt;dtv_property_cache.bandwidth_hz = tvp-&gt;u.data;</div><div class='add'>+		break;</div><div class='add'>+	case DTV_INVERSION:</div><div class='add'>+		fe-&gt;dtv_property_cache.inversion = tvp-&gt;u.data;</div><div class='add'>+		break;</div><div class='add'>+	case DTV_SYMBOL_RATE:</div><div class='add'>+		fe-&gt;dtv_property_cache.symbol_rate = tvp-&gt;u.data;</div><div class='add'>+		break;</div><div class='add'>+	case DTV_INNER_FEC:</div><div class='add'>+		fe-&gt;dtv_property_cache.fec_inner = tvp-&gt;u.data;</div><div class='add'>+		break;</div><div class='add'>+	case DTV_PILOT:</div><div class='add'>+		fe-&gt;dtv_property_cache.pilot = tvp-&gt;u.data;</div><div class='add'>+		break;</div><div class='add'>+	case DTV_ROLLOFF:</div><div class='add'>+		fe-&gt;dtv_property_cache.rolloff = tvp-&gt;u.data;</div><div class='add'>+		break;</div><div class='add'>+	case DTV_DELIVERY_SYSTEM:</div><div class='add'>+		fe-&gt;dtv_property_cache.delivery_system = tvp-&gt;u.data;</div><div class='add'>+		break;</div><div class='add'>+	case DTV_VOLTAGE:</div><div class='add'>+		fe-&gt;dtv_property_cache.voltage = tvp-&gt;u.data;</div><div class='add'>+		r = dvb_frontend_ioctl_legacy(inode, file, FE_SET_VOLTAGE,</div><div class='add'>+			(void *)fe-&gt;dtv_property_cache.voltage);</div><div class='add'>+		break;</div><div class='add'>+	case DTV_TONE:</div><div class='add'>+		fe-&gt;dtv_property_cache.sectone = tvp-&gt;u.data;</div><div class='add'>+		r = dvb_frontend_ioctl_legacy(inode, file, FE_SET_TONE,</div><div class='add'>+			(void *)fe-&gt;dtv_property_cache.sectone);</div><div class='add'>+		break;</div><div class='add'>+	case DTV_CODE_RATE_HP:</div><div class='add'>+		fe-&gt;dtv_property_cache.code_rate_HP = tvp-&gt;u.data;</div><div class='add'>+		break;</div><div class='add'>+	case DTV_CODE_RATE_LP:</div><div class='add'>+		fe-&gt;dtv_property_cache.code_rate_LP = tvp-&gt;u.data;</div><div class='add'>+		break;</div><div class='add'>+	case DTV_GUARD_INTERVAL:</div><div class='add'>+		fe-&gt;dtv_property_cache.guard_interval = tvp-&gt;u.data;</div><div class='add'>+		break;</div><div class='add'>+	case DTV_TRANSMISSION_MODE:</div><div class='add'>+		fe-&gt;dtv_property_cache.transmission_mode = tvp-&gt;u.data;</div><div class='add'>+		break;</div><div class='add'>+	case DTV_HIERARCHY:</div><div class='add'>+		fe-&gt;dtv_property_cache.hierarchy = tvp-&gt;u.data;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		r = -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int dvb_frontend_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 			unsigned int cmd, void *parg)</div><div class='ctx'> {</div><div class='hunk'>@@ -776,6 +1304,112 @@ static int dvb_frontend_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 	if (down_interruptible (&amp;fepriv-&gt;sem))</div><div class='ctx'> 		return -ERESTARTSYS;</div><div class='ctx'> </div><div class='add'>+	if ((cmd == FE_SET_PROPERTY) || (cmd == FE_GET_PROPERTY))</div><div class='add'>+		err = dvb_frontend_ioctl_properties(inode, file, cmd, parg);</div><div class='add'>+	else {</div><div class='add'>+		fe-&gt;dtv_property_cache.state = DTV_UNDEFINED;</div><div class='add'>+		err = dvb_frontend_ioctl_legacy(inode, file, cmd, parg);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	up(&amp;fepriv-&gt;sem);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dvb_frontend_ioctl_properties(struct inode *inode, struct file *file,</div><div class='add'>+			unsigned int cmd, void *parg)</div><div class='add'>+{</div><div class='add'>+	struct dvb_device *dvbdev = file-&gt;private_data;</div><div class='add'>+	struct dvb_frontend *fe = dvbdev-&gt;priv;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	struct dtv_properties *tvps = NULL;</div><div class='add'>+	struct dtv_property *tvp = NULL;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	dprintk("%s\n", __func__);</div><div class='add'>+</div><div class='add'>+	if(cmd == FE_SET_PROPERTY) {</div><div class='add'>+		tvps = (struct dtv_properties __user *)parg;</div><div class='add'>+</div><div class='add'>+		dprintk("%s() properties.num = %d\n", __func__, tvps-&gt;num);</div><div class='add'>+		dprintk("%s() properties.props = %p\n", __func__, tvps-&gt;props);</div><div class='add'>+</div><div class='add'>+		/* Put an arbitrary limit on the number of messages that can</div><div class='add'>+		 * be sent at once */</div><div class='add'>+		if ((tvps-&gt;num == 0) || (tvps-&gt;num &gt; DTV_IOCTL_MAX_MSGS))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		tvp = (struct dtv_property *) kmalloc(tvps-&gt;num *</div><div class='add'>+			sizeof(struct dtv_property), GFP_KERNEL);</div><div class='add'>+		if (!tvp) {</div><div class='add'>+			err = -ENOMEM;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (copy_from_user(tvp, tvps-&gt;props, tvps-&gt;num * sizeof(struct dtv_property))) {</div><div class='add'>+			err = -EFAULT;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; tvps-&gt;num; i++) {</div><div class='add'>+			(tvp + i)-&gt;result = dtv_property_process_set(fe, tvp + i, inode, file);</div><div class='add'>+			err |= (tvp + i)-&gt;result;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if(fe-&gt;dtv_property_cache.state == DTV_TUNE)</div><div class='add'>+			dprintk("%s() Property cache is full, tuning\n", __func__);</div><div class='add'>+</div><div class='add'>+	} else</div><div class='add'>+	if(cmd == FE_GET_PROPERTY) {</div><div class='add'>+</div><div class='add'>+		tvps = (struct dtv_properties __user *)parg;</div><div class='add'>+</div><div class='add'>+		dprintk("%s() properties.num = %d\n", __func__, tvps-&gt;num);</div><div class='add'>+		dprintk("%s() properties.props = %p\n", __func__, tvps-&gt;props);</div><div class='add'>+</div><div class='add'>+		/* Put an arbitrary limit on the number of messages that can</div><div class='add'>+		 * be sent at once */</div><div class='add'>+		if ((tvps-&gt;num == 0) || (tvps-&gt;num &gt; DTV_IOCTL_MAX_MSGS))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		tvp = (struct dtv_property *) kmalloc(tvps-&gt;num *</div><div class='add'>+			sizeof(struct dtv_property), GFP_KERNEL);</div><div class='add'>+		if (!tvp) {</div><div class='add'>+			err = -ENOMEM;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (copy_from_user(tvp, tvps-&gt;props, tvps-&gt;num * sizeof(struct dtv_property))) {</div><div class='add'>+			err = -EFAULT;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; tvps-&gt;num; i++) {</div><div class='add'>+			(tvp + i)-&gt;result = dtv_property_process_get(fe, tvp + i, inode, file);</div><div class='add'>+			err |= (tvp + i)-&gt;result;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (copy_to_user(tvps-&gt;props, tvp, tvps-&gt;num * sizeof(struct dtv_property))) {</div><div class='add'>+			err = -EFAULT;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	} else</div><div class='add'>+		err = -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	kfree(tvp);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dvb_frontend_ioctl_legacy(struct inode *inode, struct file *file,</div><div class='add'>+			unsigned int cmd, void *parg)</div><div class='add'>+{</div><div class='add'>+	struct dvb_device *dvbdev = file-&gt;private_data;</div><div class='add'>+	struct dvb_frontend *fe = dvbdev-&gt;priv;</div><div class='add'>+	struct dvb_frontend_private *fepriv = fe-&gt;frontend_priv;</div><div class='add'>+	int err = -EOPNOTSUPP;</div><div class='add'>+</div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case FE_GET_INFO: {</div><div class='ctx'> 		struct dvb_frontend_info* info = parg;</div><div class='hunk'>@@ -942,13 +1576,21 @@ static int dvb_frontend_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 	case FE_SET_FRONTEND: {</div><div class='ctx'> 		struct dvb_frontend_tune_settings fetunesettings;</div><div class='ctx'> </div><div class='del'>-		if (dvb_frontend_check_parameters(fe, parg) &lt; 0) {</div><div class='del'>-			err = -EINVAL;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='add'>+		if(fe-&gt;dtv_property_cache.state == DTV_TUNE) {</div><div class='add'>+			if (dvb_frontend_check_parameters(fe, &amp;fepriv-&gt;parameters) &lt; 0) {</div><div class='add'>+				err = -EINVAL;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			if (dvb_frontend_check_parameters(fe, parg) &lt; 0) {</div><div class='add'>+				err = -EINVAL;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='ctx'> </div><div class='del'>-		memcpy (&amp;fepriv-&gt;parameters, parg,</div><div class='del'>-			sizeof (struct dvb_frontend_parameters));</div><div class='add'>+			memcpy (&amp;fepriv-&gt;parameters, parg,</div><div class='add'>+				sizeof (struct dvb_frontend_parameters));</div><div class='add'>+			dtv_property_cache_sync(fe, &amp;fepriv-&gt;parameters);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		memset(&amp;fetunesettings, 0, sizeof(struct dvb_frontend_tune_settings));</div><div class='ctx'> 		memcpy(&amp;fetunesettings.parameters, parg,</div><div class='hunk'>@@ -1027,10 +1669,10 @@ static int dvb_frontend_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 		break;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	up (&amp;fepriv-&gt;sem);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> static unsigned int dvb_frontend_poll(struct file *file, struct poll_table_struct *wait)</div><div class='ctx'> {</div><div class='ctx'> 	struct dvb_device *dvbdev = file-&gt;private_data;</div><div class='hunk'>@@ -1052,13 +1694,53 @@ static int dvb_frontend_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	struct dvb_device *dvbdev = file-&gt;private_data;</div><div class='ctx'> 	struct dvb_frontend *fe = dvbdev-&gt;priv;</div><div class='ctx'> 	struct dvb_frontend_private *fepriv = fe-&gt;frontend_priv;</div><div class='add'>+	struct dvb_adapter *adapter = fe-&gt;dvb;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	dprintk ("%s\n", __func__);</div><div class='ctx'> </div><div class='add'>+	if (adapter-&gt;mfe_shared) {</div><div class='add'>+		mutex_lock (&amp;adapter-&gt;mfe_lock);</div><div class='add'>+</div><div class='add'>+		if (adapter-&gt;mfe_dvbdev == NULL)</div><div class='add'>+			adapter-&gt;mfe_dvbdev = dvbdev;</div><div class='add'>+</div><div class='add'>+		else if (adapter-&gt;mfe_dvbdev != dvbdev) {</div><div class='add'>+			struct dvb_device</div><div class='add'>+				*mfedev = adapter-&gt;mfe_dvbdev;</div><div class='add'>+			struct dvb_frontend</div><div class='add'>+				*mfe = mfedev-&gt;priv;</div><div class='add'>+			struct dvb_frontend_private</div><div class='add'>+				*mfepriv = mfe-&gt;frontend_priv;</div><div class='add'>+			int mferetry = (dvb_mfe_wait_time &lt;&lt; 1);</div><div class='add'>+</div><div class='add'>+			mutex_unlock (&amp;adapter-&gt;mfe_lock);</div><div class='add'>+			while (mferetry-- &amp;&amp; (mfedev-&gt;users != -1 ||</div><div class='add'>+					mfepriv-&gt;thread != NULL)) {</div><div class='add'>+				if(msleep_interruptible(500)) {</div><div class='add'>+					if(signal_pending(current))</div><div class='add'>+						return -EINTR;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			mutex_lock (&amp;adapter-&gt;mfe_lock);</div><div class='add'>+			if(adapter-&gt;mfe_dvbdev != dvbdev) {</div><div class='add'>+				mfedev = adapter-&gt;mfe_dvbdev;</div><div class='add'>+				mfe = mfedev-&gt;priv;</div><div class='add'>+				mfepriv = mfe-&gt;frontend_priv;</div><div class='add'>+				if (mfedev-&gt;users != -1 ||</div><div class='add'>+						mfepriv-&gt;thread != NULL) {</div><div class='add'>+					mutex_unlock (&amp;adapter-&gt;mfe_lock);</div><div class='add'>+					return -EBUSY;</div><div class='add'>+				}</div><div class='add'>+				adapter-&gt;mfe_dvbdev = dvbdev;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (dvbdev-&gt;users == -1 &amp;&amp; fe-&gt;ops.ts_bus_ctrl) {</div><div class='ctx'> 		if ((ret = fe-&gt;ops.ts_bus_ctrl(fe, 1)) &lt; 0)</div><div class='del'>-			return ret;</div><div class='add'>+			goto err0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if ((ret = dvb_generic_open (inode, file)) &lt; 0)</div><div class='hunk'>@@ -1078,6 +1760,8 @@ static int dvb_frontend_open(struct inode *inode, struct file *file)</div><div class='ctx'> 		fepriv-&gt;events.eventr = fepriv-&gt;events.eventw = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (adapter-&gt;mfe_shared)</div><div class='add'>+		mutex_unlock (&amp;adapter-&gt;mfe_lock);</div><div class='ctx'> 	return ret;</div><div class='ctx'> </div><div class='ctx'> err2:</div><div class='hunk'>@@ -1085,6 +1769,9 @@ err2:</div><div class='ctx'> err1:</div><div class='ctx'> 	if (dvbdev-&gt;users == -1 &amp;&amp; fe-&gt;ops.ts_bus_ctrl)</div><div class='ctx'> 		fe-&gt;ops.ts_bus_ctrl(fe, 0);</div><div class='add'>+err0:</div><div class='add'>+	if (adapter-&gt;mfe_shared)</div><div class='add'>+		mutex_unlock (&amp;adapter-&gt;mfe_lock);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1154,8 +1841,9 @@ int dvb_register_frontend(struct dvb_adapter* dvb,</div><div class='ctx'> 	fe-&gt;dvb = dvb;</div><div class='ctx'> 	fepriv-&gt;inversion = INVERSION_OFF;</div><div class='ctx'> </div><div class='del'>-	printk ("DVB: registering frontend %i (%s)...\n",</div><div class='add'>+	printk ("DVB: registering adapter %i frontend %i (%s)...\n",</div><div class='ctx'> 		fe-&gt;dvb-&gt;num,</div><div class='add'>+		fe-&gt;id,</div><div class='ctx'> 		fe-&gt;ops.info.name);</div><div class='ctx'> </div><div class='ctx'> 	dvb_register_device (fe-&gt;dvb, &amp;fepriv-&gt;dvbdev, &amp;dvbdev_template,</div><div class='head'>diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.h b/drivers/media/dvb/dvb-core/dvb_frontend.h<br/>index aa4133f0bd19..db4a63b0a32e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/dvb-core/dvb_frontend.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/dvb/dvb-core/dvb_frontend.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/dvb-core/dvb_frontend.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/dvb-core/dvb_frontend.h</a></div><div class='hunk'>@@ -169,6 +169,9 @@ struct dvb_frontend_ops {</div><div class='ctx'> </div><div class='ctx'> 	struct dvb_tuner_ops tuner_ops;</div><div class='ctx'> 	struct analog_demod_ops analog_ops;</div><div class='add'>+</div><div class='add'>+	int (*set_property)(struct dvb_frontend* fe, struct dtv_property* tvp);</div><div class='add'>+	int (*get_property)(struct dvb_frontend* fe, struct dtv_property* tvp);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define MAX_EVENT 8</div><div class='hunk'>@@ -182,6 +185,32 @@ struct dvb_fe_events {</div><div class='ctx'> 	struct mutex		  mtx;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct dtv_frontend_properties {</div><div class='add'>+</div><div class='add'>+	/* Cache State */</div><div class='add'>+	u32			state;</div><div class='add'>+</div><div class='add'>+	u32			frequency;</div><div class='add'>+	fe_modulation_t		modulation;</div><div class='add'>+</div><div class='add'>+	fe_sec_voltage_t	voltage;</div><div class='add'>+	fe_sec_tone_mode_t	sectone;</div><div class='add'>+	fe_spectral_inversion_t	inversion;</div><div class='add'>+	fe_code_rate_t		fec_inner;</div><div class='add'>+	fe_transmit_mode_t	transmission_mode;</div><div class='add'>+	u32			bandwidth_hz;	/* 0 = AUTO */</div><div class='add'>+	fe_guard_interval_t	guard_interval;</div><div class='add'>+	fe_hierarchy_t		hierarchy;</div><div class='add'>+	u32			symbol_rate;</div><div class='add'>+	fe_code_rate_t		code_rate_HP;</div><div class='add'>+	fe_code_rate_t		code_rate_LP;</div><div class='add'>+</div><div class='add'>+	fe_pilot_t		pilot;</div><div class='add'>+	fe_rolloff_t		rolloff;</div><div class='add'>+</div><div class='add'>+	fe_delivery_system_t	delivery_system;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct dvb_frontend {</div><div class='ctx'> 	struct dvb_frontend_ops ops;</div><div class='ctx'> 	struct dvb_adapter *dvb;</div><div class='hunk'>@@ -190,6 +219,10 @@ struct dvb_frontend {</div><div class='ctx'> 	void *frontend_priv;</div><div class='ctx'> 	void *sec_priv;</div><div class='ctx'> 	void *analog_demod_priv;</div><div class='add'>+	struct dtv_frontend_properties dtv_property_cache;</div><div class='add'>+#define DVB_FRONTEND_COMPONENT_TUNER 0</div><div class='add'>+	int (*callback)(void *adapter_priv, int component, int cmd, int arg);</div><div class='add'>+	int id;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern int dvb_register_frontend(struct dvb_adapter *dvb,</div><div class='head'>diff --git a/drivers/media/dvb/dvb-core/dvbdev.c b/drivers/media/dvb/dvb-core/dvbdev.c<br/>index e7132770a3bf..a113744a56cc 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/dvb-core/dvbdev.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/dvb/dvb-core/dvbdev.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/dvb-core/dvbdev.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/dvb-core/dvbdev.c</a></div><div class='hunk'>@@ -233,7 +233,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;dvbdev_register_lock);</div><div class='ctx'> </div><div class='del'>-	clsdev = device_create_drvdata(dvb_class, adap-&gt;device,</div><div class='add'>+	clsdev = device_create(dvb_class, adap-&gt;device,</div><div class='ctx'> 			       MKDEV(DVB_MAJOR, nums2minor(adap-&gt;num, type, id)),</div><div class='ctx'> 			       NULL, "dvb%d.%s%d", adap-&gt;num, dnames[type], id);</div><div class='ctx'> 	if (IS_ERR(clsdev)) {</div><div class='hunk'>@@ -326,6 +326,9 @@ int dvb_register_adapter(struct dvb_adapter *adap, const char *name,</div><div class='ctx'> 	adap-&gt;name = name;</div><div class='ctx'> 	adap-&gt;module = module;</div><div class='ctx'> 	adap-&gt;device = device;</div><div class='add'>+	adap-&gt;mfe_shared = 0;</div><div class='add'>+	adap-&gt;mfe_dvbdev = NULL;</div><div class='add'>+	mutex_init (&amp;adap-&gt;mfe_lock);</div><div class='ctx'> </div><div class='ctx'> 	list_add_tail (&amp;adap-&gt;list_head, &amp;dvb_adapter_list);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/dvb/dvb-core/dvbdev.h b/drivers/media/dvb/dvb-core/dvbdev.h<br/>index 89d12dc477a7..574e336bac35 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/dvb-core/dvbdev.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/dvb/dvb-core/dvbdev.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/dvb-core/dvbdev.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/dvb-core/dvbdev.h</a></div><div class='hunk'>@@ -62,6 +62,10 @@ struct dvb_adapter {</div><div class='ctx'> 	struct device *device;</div><div class='ctx'> </div><div class='ctx'> 	struct module *module;</div><div class='add'>+</div><div class='add'>+	int mfe_shared;			/* indicates mutually exclusive frontends */</div><div class='add'>+	struct dvb_device *mfe_dvbdev;	/* frontend device in use */</div><div class='add'>+	struct mutex mfe_lock;		/* access lock for thread creation */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/Kconfig b/drivers/media/dvb/dvb-usb/Kconfig<br/>index e84152b7576d..3c13bcfa6385 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/dvb-usb/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/dvb/dvb-usb/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/dvb-usb/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/dvb-usb/Kconfig</a></div><div class='hunk'>@@ -72,9 +72,11 @@ config DVB_USB_DIB0700</div><div class='ctx'> 	select DVB_DIB7000P</div><div class='ctx'> 	select DVB_DIB7000M</div><div class='ctx'> 	select DVB_DIB3000MC</div><div class='add'>+	select DVB_S5H1411 if !DVB_FE_CUSTOMISE</div><div class='ctx'> 	select MEDIA_TUNER_MT2060 if !DVB_FE_CUSTOMISE</div><div class='ctx'> 	select MEDIA_TUNER_MT2266 if !DVB_FE_CUSTOMISE</div><div class='ctx'> 	select MEDIA_TUNER_XC2028 if !DVB_FE_CUSTOMISE</div><div class='add'>+	select MEDIA_TUNER_XC5000 if !DVB_FE_CUSTOMIZE</div><div class='ctx'> 	select DVB_TUNER_DIB0070</div><div class='ctx'> 	help</div><div class='ctx'> 	  Support for USB2.0/1.1 DVB receivers based on the DiB0700 USB bridge. The</div><div class='hunk'>@@ -108,6 +110,8 @@ config DVB_USB_CXUSB</div><div class='ctx'> 	select MEDIA_TUNER_SIMPLE if !DVB_FE_CUSTOMISE</div><div class='ctx'> 	select MEDIA_TUNER_XC2028 if !DVB_FE_CUSTOMISE</div><div class='ctx'> 	select MEDIA_TUNER_MXL5005S if !DVB_FE_CUSTOMISE</div><div class='add'>+	select DVB_DIB7000P if !DVB_FE_CUSTOMISE</div><div class='add'>+	select DVB_TUNER_DIB0070 if !DVB_FE_CUSTOMISE</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say Y here to support the Conexant USB2.0 hybrid reference design.</div><div class='ctx'> 	  Currently, only DVB and ATSC modes are supported, analog mode</div><div class='hunk'>@@ -245,12 +249,25 @@ config DVB_USB_AF9005_REMOTE</div><div class='ctx'> 	  Afatech AF9005 based receiver.</div><div class='ctx'> </div><div class='ctx'> config DVB_USB_DW2102</div><div class='del'>-	tristate "DvbWorld 2102 DVB-S USB2.0 receiver"</div><div class='add'>+	tristate "DvbWorld DVB-S/S2 USB2.0 support"</div><div class='ctx'> 	depends on DVB_USB</div><div class='del'>-	select DVB_STV0299 if !DVB_FE_CUSTOMISE</div><div class='ctx'> 	select DVB_PLL if !DVB_FE_CUSTOMISE</div><div class='add'>+	select DVB_STV0299 if !DVB_FE_CUSTOMISE</div><div class='add'>+	select DVB_STV0288 if !DVB_FE_CUSTOMISE</div><div class='add'>+	select DVB_STB6000 if !DVB_FE_CUSTOMISE</div><div class='add'>+	select DVB_CX24116 if !DVB_FE_CUSTOMISE</div><div class='add'>+	select DVB_SI21XX if !DVB_FE_CUSTOMISE</div><div class='ctx'> 	help</div><div class='del'>-	   Say Y here to support the DvbWorld 2102 DVB-S USB2.0 receiver.</div><div class='add'>+	  Say Y here to support the DvbWorld DVB-S/S2 USB2.0 receivers</div><div class='add'>+	  and the TeVii S650.</div><div class='add'>+</div><div class='add'>+config 	DVB_USB_CINERGY_T2</div><div class='add'>+	tristate "Terratec CinergyT2/qanu USB 2.0 DVB-T receiver"</div><div class='add'>+	depends on DVB_USB</div><div class='add'>+	help</div><div class='add'>+	  Support for "TerraTec CinergyT2" USB2.0 Highspeed DVB Receivers</div><div class='add'>+</div><div class='add'>+	  Say Y if you own such a device and want to use it.</div><div class='ctx'> </div><div class='ctx'> config DVB_USB_ANYSEE</div><div class='ctx'> 	tristate "Anysee DVB-T/C USB2.0 support"</div><div class='hunk'>@@ -262,3 +279,22 @@ config DVB_USB_ANYSEE</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say Y here to support the Anysee E30, Anysee E30 Plus or</div><div class='ctx'> 	  Anysee E30 C Plus DVB USB2.0 receiver.</div><div class='add'>+</div><div class='add'>+config DVB_USB_DTV5100</div><div class='add'>+	tristate "AME DTV-5100 USB2.0 DVB-T support"</div><div class='add'>+	depends on DVB_USB</div><div class='add'>+	select MEDIA_TUNER_QT1010 if !DVB_FE_CUSTOMISE</div><div class='add'>+	help</div><div class='add'>+	  Say Y here to support the AME DTV-5100 USB2.0 DVB-T receiver.</div><div class='add'>+</div><div class='add'>+config DVB_USB_AF9015</div><div class='add'>+	tristate "Afatech AF9015 DVB-T USB2.0 support"</div><div class='add'>+	depends on DVB_USB &amp;&amp; EXPERIMENTAL</div><div class='add'>+	select DVB_AF9013</div><div class='add'>+	select DVB_PLL              if !DVB_FE_CUSTOMISE</div><div class='add'>+	select MEDIA_TUNER_MT2060   if !DVB_FE_CUSTOMISE</div><div class='add'>+	select MEDIA_TUNER_QT1010   if !DVB_FE_CUSTOMISE</div><div class='add'>+	select MEDIA_TUNER_TDA18271 if !DVB_FE_CUSTOMISE</div><div class='add'>+	select MEDIA_TUNER_MXL5005S if !DVB_FE_CUSTOMISE</div><div class='add'>+	help</div><div class='add'>+	  Say Y here to support the Afatech AF9015 based DVB-T USB2.0 receiver</div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/Makefile b/drivers/media/dvb/dvb-usb/Makefile<br/>index e206f1ea0027..3122b7cc2c23 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/dvb-usb/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/dvb/dvb-usb/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/dvb-usb/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/dvb-usb/Makefile</a></div><div class='hunk'>@@ -67,6 +67,16 @@ obj-$(CONFIG_DVB_USB_ANYSEE) += dvb-usb-anysee.o</div><div class='ctx'> dvb-usb-dw2102-objs = dw2102.o</div><div class='ctx'> obj-$(CONFIG_DVB_USB_DW2102) += dvb-usb-dw2102.o</div><div class='ctx'> </div><div class='add'>+dvb-usb-dtv5100-objs = dtv5100.o</div><div class='add'>+obj-$(CONFIG_DVB_USB_DTV5100) += dvb-usb-dtv5100.o</div><div class='add'>+</div><div class='add'>+dvb-usb-af9015-objs = af9015.o</div><div class='add'>+obj-$(CONFIG_DVB_USB_AF9015) += dvb-usb-af9015.o</div><div class='add'>+</div><div class='add'>+dvb-usb-cinergyT2-objs = cinergyT2-core.o cinergyT2-fe.o</div><div class='add'>+obj-$(CONFIG_DVB_USB_CINERGY_T2) += dvb-usb-cinergyT2.o</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/</div><div class='ctx'> # due to tuner-xc3028</div><div class='ctx'> EXTRA_CFLAGS += -Idrivers/media/common/tuners</div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/af9005-remote.c b/drivers/media/dvb/dvb-usb/af9005-remote.c<br/>index ff00c0e8f4a1..7c596f926764 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/dvb-usb/af9005-remote.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/dvb/dvb-usb/af9005-remote.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/dvb-usb/af9005-remote.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/dvb-usb/af9005-remote.c</a></div><div class='hunk'>@@ -25,7 +25,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #include "af9005.h"</div><div class='ctx'> /* debug */</div><div class='del'>-int dvb_usb_af9005_remote_debug;</div><div class='add'>+static int dvb_usb_af9005_remote_debug;</div><div class='ctx'> module_param_named(debug, dvb_usb_af9005_remote_debug, int, 0644);</div><div class='ctx'> MODULE_PARM_DESC(debug,</div><div class='ctx'> 		 "enable (1) or disable (0) debug messages."</div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/af9005-script.h b/drivers/media/dvb/dvb-usb/af9005-script.h<br/>index 6eeaae51b1ca..4d69045426dd 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/dvb-usb/af9005-script.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/dvb/dvb-usb/af9005-script.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/dvb-usb/af9005-script.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/dvb-usb/af9005-script.h</a></div><div class='hunk'>@@ -14,7 +14,7 @@ typedef struct {</div><div class='ctx'> 	u8 val;</div><div class='ctx'> } RegDesc;</div><div class='ctx'> </div><div class='del'>-RegDesc script[] = {</div><div class='add'>+static RegDesc script[] = {</div><div class='ctx'> 	{0xa180, 0x0, 0x8, 0xa},</div><div class='ctx'> 	{0xa181, 0x0, 0x8, 0xd7},</div><div class='ctx'> 	{0xa182, 0x0, 0x8, 0xa3},</div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/af9005.c b/drivers/media/dvb/dvb-usb/af9005.c<br/>index cfe71feefcad..ca5a0a4d2a47 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/dvb-usb/af9005.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/dvb/dvb-usb/af9005.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/dvb-usb/af9005.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/dvb-usb/af9005.c</a></div><div class='hunk'>@@ -35,17 +35,17 @@ module_param_named(led, dvb_usb_af9005_led, bool, 0644);</div><div class='ctx'> MODULE_PARM_DESC(led, "enable led (default: 1).");</div><div class='ctx'> </div><div class='ctx'> /* eeprom dump */</div><div class='del'>-int dvb_usb_af9005_dump_eeprom = 0;</div><div class='add'>+static int dvb_usb_af9005_dump_eeprom;</div><div class='ctx'> module_param_named(dump_eeprom, dvb_usb_af9005_dump_eeprom, int, 0);</div><div class='ctx'> MODULE_PARM_DESC(dump_eeprom, "dump contents of the eeprom.");</div><div class='ctx'> </div><div class='ctx'> DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);</div><div class='ctx'> </div><div class='ctx'> /* remote control decoder */</div><div class='del'>-int (*rc_decode) (struct dvb_usb_device * d, u8 * data, int len, u32 * event,</div><div class='del'>-		  int *state);</div><div class='del'>-void *rc_keys;</div><div class='del'>-int *rc_keys_size;</div><div class='add'>+static int (*rc_decode) (struct dvb_usb_device *d, u8 *data, int len,</div><div class='add'>+		u32 *event, int *state);</div><div class='add'>+static void *rc_keys;</div><div class='add'>+static int *rc_keys_size;</div><div class='ctx'> </div><div class='ctx'> u8 regmask[8] = { 0x01, 0x03, 0x07, 0x0f, 0x1f, 0x3f, 0x7f, 0xff };</div><div class='ctx'> </div><div class='hunk'>@@ -54,8 +54,8 @@ struct af9005_device_state {</div><div class='ctx'> 	int led_state;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int af9005_usb_generic_rw(struct dvb_usb_device *d, u8 * wbuf, u16 wlen,</div><div class='del'>-			  u8 * rbuf, u16 rlen, int delay_ms)</div><div class='add'>+static int af9005_usb_generic_rw(struct dvb_usb_device *d, u8 *wbuf, u16 wlen,</div><div class='add'>+			  u8 *rbuf, u16 rlen, int delay_ms)</div><div class='ctx'> {</div><div class='ctx'> 	int actlen, ret = -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -98,12 +98,7 @@ int af9005_usb_generic_rw(struct dvb_usb_device *d, u8 * wbuf, u16 wlen,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int af9005_usb_generic_write(struct dvb_usb_device *d, u8 * buf, u16 len)</div><div class='del'>-{</div><div class='del'>-	return af9005_usb_generic_rw(d, buf, len, NULL, 0, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int af9005_generic_read_write(struct dvb_usb_device *d, u16 reg,</div><div class='add'>+static int af9005_generic_read_write(struct dvb_usb_device *d, u16 reg,</div><div class='ctx'> 			      int readwrite, int type, u8 * values, int len)</div><div class='ctx'> {</div><div class='ctx'> 	struct af9005_device_state *st = d-&gt;priv;</div><div class='hunk'>@@ -765,7 +760,7 @@ static int af9005_boot_packet(struct usb_device *udev, int type, u8 * reply)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int af9005_download_firmware(struct usb_device *udev, const struct firmware *fw)</div><div class='add'>+static int af9005_download_firmware(struct usb_device *udev, const struct firmware *fw)</div><div class='ctx'> {</div><div class='ctx'> 	int i, packets, ret, act_len;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/af9015.c b/drivers/media/dvb/dvb-usb/af9015.c<br/>new file mode 100644<br/>index 000000000000..cb0829c038ce<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/dvb-usb/af9015.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/dvb-usb/af9015.c</a></div><div class='hunk'>@@ -0,0 +1,1474 @@</div><div class='add'>+/*</div><div class='add'>+ * DVB USB Linux driver for Afatech AF9015 DVB-T USB2.0 receiver</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2007 Antti Palosaari &lt;crope@iki.fi&gt;</div><div class='add'>+ *</div><div class='add'>+ * Thanks to Afatech who kindly provided information.</div><div class='add'>+ *</div><div class='add'>+ *    This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *    it under the terms of the GNU General Public License as published by</div><div class='add'>+ *    the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ *    (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *    This program is distributed in the hope that it will be useful,</div><div class='add'>+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *    GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *    You should have received a copy of the GNU General Public License</div><div class='add'>+ *    along with this program; if not, write to the Free Software</div><div class='add'>+ *    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "af9015.h"</div><div class='add'>+#include "af9013.h"</div><div class='add'>+#include "mt2060.h"</div><div class='add'>+#include "qt1010.h"</div><div class='add'>+#include "tda18271.h"</div><div class='add'>+#include "mxl5005s.h"</div><div class='add'>+#if 0</div><div class='add'>+#include "mc44s80x.h"</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+int dvb_usb_af9015_debug;</div><div class='add'>+module_param_named(debug, dvb_usb_af9015_debug, int, 0644);</div><div class='add'>+MODULE_PARM_DESC(debug, "set debugging level" DVB_USB_DEBUG_STATUS);</div><div class='add'>+int dvb_usb_af9015_remote;</div><div class='add'>+module_param_named(remote, dvb_usb_af9015_remote, int, 0644);</div><div class='add'>+MODULE_PARM_DESC(remote, "select remote");</div><div class='add'>+int dvb_usb_af9015_dual_mode;</div><div class='add'>+module_param_named(dual_mode, dvb_usb_af9015_dual_mode, int, 0644);</div><div class='add'>+MODULE_PARM_DESC(dual_mode, "enable dual mode");</div><div class='add'>+DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);</div><div class='add'>+</div><div class='add'>+static DEFINE_MUTEX(af9015_usb_mutex);</div><div class='add'>+</div><div class='add'>+static struct af9015_config af9015_config;</div><div class='add'>+static struct dvb_usb_device_properties af9015_properties[2];</div><div class='add'>+int af9015_properties_count = ARRAY_SIZE(af9015_properties);</div><div class='add'>+</div><div class='add'>+static struct af9013_config af9015_af9013_config[] = {</div><div class='add'>+	{</div><div class='add'>+		.demod_address = AF9015_I2C_DEMOD,</div><div class='add'>+		.output_mode = AF9013_OUTPUT_MODE_USB,</div><div class='add'>+		.api_version = { 0, 1, 9, 0 },</div><div class='add'>+		.gpio[0] = AF9013_GPIO_HI,</div><div class='add'>+		.gpio[3] = AF9013_GPIO_TUNER_ON,</div><div class='add'>+</div><div class='add'>+	}, {</div><div class='add'>+		.output_mode = AF9013_OUTPUT_MODE_SERIAL,</div><div class='add'>+		.api_version = { 0, 1, 9, 0 },</div><div class='add'>+		.gpio[0] = AF9013_GPIO_TUNER_ON,</div><div class='add'>+		.gpio[1] = AF9013_GPIO_LO,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int af9015_rw_udev(struct usb_device *udev, struct req_t *req)</div><div class='add'>+{</div><div class='add'>+	int act_len, ret;</div><div class='add'>+	u8 buf[64];</div><div class='add'>+	u8 write = 1;</div><div class='add'>+	u8 msg_len = 8;</div><div class='add'>+	static u8 seq; /* packet sequence number */</div><div class='add'>+</div><div class='add'>+	if (mutex_lock_interruptible(&amp;af9015_usb_mutex) &lt; 0)</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+</div><div class='add'>+	buf[0] = req-&gt;cmd;</div><div class='add'>+	buf[1] = seq++;</div><div class='add'>+	buf[2] = req-&gt;i2c_addr;</div><div class='add'>+	buf[3] = req-&gt;addr &gt;&gt; 8;</div><div class='add'>+	buf[4] = req-&gt;addr &amp; 0xff;</div><div class='add'>+	buf[5] = req-&gt;mbox;</div><div class='add'>+	buf[6] = req-&gt;addr_len;</div><div class='add'>+	buf[7] = req-&gt;data_len;</div><div class='add'>+</div><div class='add'>+	switch (req-&gt;cmd) {</div><div class='add'>+	case GET_CONFIG:</div><div class='add'>+	case BOOT:</div><div class='add'>+	case READ_MEMORY:</div><div class='add'>+	case RECONNECT_USB:</div><div class='add'>+	case GET_IR_CODE:</div><div class='add'>+		write = 0;</div><div class='add'>+		break;</div><div class='add'>+	case READ_I2C:</div><div class='add'>+		write = 0;</div><div class='add'>+		buf[2] |= 0x01; /* set I2C direction */</div><div class='add'>+	case WRITE_I2C:</div><div class='add'>+		buf[0] = READ_WRITE_I2C;</div><div class='add'>+		break;</div><div class='add'>+	case WRITE_MEMORY:</div><div class='add'>+		if (((req-&gt;addr &amp; 0xff00) == 0xff00) ||</div><div class='add'>+		    ((req-&gt;addr &amp; 0xae00) == 0xae00))</div><div class='add'>+			buf[0] = WRITE_VIRTUAL_MEMORY;</div><div class='add'>+	case WRITE_VIRTUAL_MEMORY:</div><div class='add'>+	case COPY_FIRMWARE:</div><div class='add'>+	case DOWNLOAD_FIRMWARE:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		err("unknown command:%d", req-&gt;cmd);</div><div class='add'>+		ret = -1;</div><div class='add'>+		goto error_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* write requested */</div><div class='add'>+	if (write) {</div><div class='add'>+		memcpy(&amp;buf[8], req-&gt;data, req-&gt;data_len);</div><div class='add'>+		msg_len += req-&gt;data_len;</div><div class='add'>+	}</div><div class='add'>+	deb_xfer("&gt;&gt;&gt; ");</div><div class='add'>+	debug_dump(buf, msg_len, deb_xfer);</div><div class='add'>+</div><div class='add'>+	/* send req */</div><div class='add'>+	ret = usb_bulk_msg(udev, usb_sndbulkpipe(udev, 0x02), buf, msg_len,</div><div class='add'>+	&amp;act_len, AF9015_USB_TIMEOUT);</div><div class='add'>+	if (ret)</div><div class='add'>+		err("bulk message failed:%d (%d/%d)", ret, msg_len, act_len);</div><div class='add'>+	else</div><div class='add'>+		if (act_len != msg_len)</div><div class='add'>+			ret = -1; /* all data is not send */</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error_unlock;</div><div class='add'>+</div><div class='add'>+	/* no ack for those packets */</div><div class='add'>+	if (req-&gt;cmd == DOWNLOAD_FIRMWARE || req-&gt;cmd == RECONNECT_USB)</div><div class='add'>+		goto exit_unlock;</div><div class='add'>+</div><div class='add'>+	/* receive ack and data if read req */</div><div class='add'>+	msg_len = 1 + 1 + req-&gt;data_len;  /* seq + status + data len */</div><div class='add'>+	ret = usb_bulk_msg(udev, usb_rcvbulkpipe(udev, 0x81), buf, msg_len,</div><div class='add'>+			   &amp;act_len, AF9015_USB_TIMEOUT);</div><div class='add'>+	if (ret) {</div><div class='add'>+		err("recv bulk message failed:%d", ret);</div><div class='add'>+		ret = -1;</div><div class='add'>+		goto error_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	deb_xfer("&lt;&lt;&lt; ");</div><div class='add'>+	debug_dump(buf, act_len, deb_xfer);</div><div class='add'>+</div><div class='add'>+	/* remote controller query status is 1 if remote code is not received */</div><div class='add'>+	if (req-&gt;cmd == GET_IR_CODE &amp;&amp; buf[1] == 1) {</div><div class='add'>+		buf[1] = 0; /* clear command "error" status */</div><div class='add'>+		memset(&amp;buf[2], 0, req-&gt;data_len);</div><div class='add'>+		buf[3] = 1; /* no remote code received mark */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* check status */</div><div class='add'>+	if (buf[1]) {</div><div class='add'>+		err("command failed:%d", buf[1]);</div><div class='add'>+		ret = -1;</div><div class='add'>+		goto error_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* read request, copy returned data to return buf */</div><div class='add'>+	if (!write)</div><div class='add'>+		memcpy(req-&gt;data, &amp;buf[2], req-&gt;data_len);</div><div class='add'>+</div><div class='add'>+error_unlock:</div><div class='add'>+exit_unlock:</div><div class='add'>+	mutex_unlock(&amp;af9015_usb_mutex);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int af9015_ctrl_msg(struct dvb_usb_device *d, struct req_t *req)</div><div class='add'>+{</div><div class='add'>+	return af9015_rw_udev(d-&gt;udev, req);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int af9015_write_regs(struct dvb_usb_device *d, u16 addr, u8 *val,</div><div class='add'>+	u8 len)</div><div class='add'>+{</div><div class='add'>+	struct req_t req = {WRITE_MEMORY, AF9015_I2C_DEMOD, addr, 0, 0, len,</div><div class='add'>+		val};</div><div class='add'>+	return af9015_ctrl_msg(d, &amp;req);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int af9015_write_reg(struct dvb_usb_device *d, u16 addr, u8 val)</div><div class='add'>+{</div><div class='add'>+	return af9015_write_regs(d, addr, &amp;val, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int af9015_read_reg(struct dvb_usb_device *d, u16 addr, u8 *val)</div><div class='add'>+{</div><div class='add'>+	struct req_t req = {READ_MEMORY, AF9015_I2C_DEMOD, addr, 0, 0, 1, val};</div><div class='add'>+	return af9015_ctrl_msg(d, &amp;req);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int af9015_write_reg_i2c(struct dvb_usb_device *d, u8 addr, u16 reg,</div><div class='add'>+	u8 val)</div><div class='add'>+{</div><div class='add'>+	struct req_t req = {WRITE_I2C, addr, reg, 1, 1, 1, &amp;val};</div><div class='add'>+</div><div class='add'>+	if (addr == af9015_af9013_config[0].demod_address ||</div><div class='add'>+	    addr == af9015_af9013_config[1].demod_address)</div><div class='add'>+		req.addr_len = 3;</div><div class='add'>+</div><div class='add'>+	return af9015_ctrl_msg(d, &amp;req);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int af9015_read_reg_i2c(struct dvb_usb_device *d, u8 addr, u16 reg,</div><div class='add'>+	u8 *val)</div><div class='add'>+{</div><div class='add'>+	struct req_t req = {READ_I2C, addr, reg, 0, 1, 1, val};</div><div class='add'>+</div><div class='add'>+	if (addr == af9015_af9013_config[0].demod_address ||</div><div class='add'>+	    addr == af9015_af9013_config[1].demod_address)</div><div class='add'>+		req.addr_len = 3;</div><div class='add'>+</div><div class='add'>+	return af9015_ctrl_msg(d, &amp;req);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int af9015_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[],</div><div class='add'>+	int num)</div><div class='add'>+{</div><div class='add'>+	struct dvb_usb_device *d = i2c_get_adapdata(adap);</div><div class='add'>+	int ret = 0, i = 0;</div><div class='add'>+	u16 addr;</div><div class='add'>+	u8 mbox, addr_len;</div><div class='add'>+	struct req_t req;</div><div class='add'>+</div><div class='add'>+/* TODO: implement bus lock</div><div class='add'>+</div><div class='add'>+The bus lock is needed because there is two tuners both using same I2C-address.</div><div class='add'>+Due to that the only way to select correct tuner is use demodulator I2C-gate.</div><div class='add'>+</div><div class='add'>+................................................</div><div class='add'>+. AF9015 includes integrated AF9013 demodulator.</div><div class='add'>+. ____________                   ____________  .                ____________</div><div class='add'>+.|     uC     |                 |   demod    | .               |    tuner   |</div><div class='add'>+.|------------|                 |------------| .               |------------|</div><div class='add'>+.|   AF9015   |                 |  AF9013/5  | .               |   MXL5003  |</div><div class='add'>+.|            |--+----I2C-------|-----/ -----|-.-----I2C-------|            |</div><div class='add'>+.|            |  |              | addr 0x38  | .               |  addr 0xc6 |</div><div class='add'>+.|____________|  |              |____________| .               |____________|</div><div class='add'>+.................|..............................</div><div class='add'>+		 |               ____________                   ____________</div><div class='add'>+		 |              |   demod    |                 |    tuner   |</div><div class='add'>+		 |              |------------|                 |------------|</div><div class='add'>+		 |              |   AF9013   |                 |   MXL5003  |</div><div class='add'>+		 +----I2C-------|-----/ -----|-------I2C-------|            |</div><div class='add'>+				| addr 0x3a  |                 |  addr 0xc6 |</div><div class='add'>+				|____________|                 |____________|</div><div class='add'>+*/</div><div class='add'>+	if (mutex_lock_interruptible(&amp;d-&gt;i2c_mutex) &lt; 0)</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+</div><div class='add'>+	while (i &lt; num) {</div><div class='add'>+		if (msg[i].addr == af9015_af9013_config[0].demod_address ||</div><div class='add'>+		    msg[i].addr == af9015_af9013_config[1].demod_address) {</div><div class='add'>+			addr = msg[i].buf[0] &lt;&lt; 8;</div><div class='add'>+			addr += msg[i].buf[1];</div><div class='add'>+			mbox = msg[i].buf[2];</div><div class='add'>+			addr_len = 3;</div><div class='add'>+		} else {</div><div class='add'>+			addr = msg[i].buf[0];</div><div class='add'>+			addr_len = 1;</div><div class='add'>+			mbox = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (num &gt; i + 1 &amp;&amp; (msg[i+1].flags &amp; I2C_M_RD)) {</div><div class='add'>+			if (msg[i].addr ==</div><div class='add'>+				af9015_af9013_config[0].demod_address)</div><div class='add'>+				req.cmd = READ_MEMORY;</div><div class='add'>+			else</div><div class='add'>+				req.cmd = READ_I2C;</div><div class='add'>+			req.i2c_addr = msg[i].addr;</div><div class='add'>+			req.addr = addr;</div><div class='add'>+			req.mbox = mbox;</div><div class='add'>+			req.addr_len = addr_len;</div><div class='add'>+			req.data_len = msg[i+1].len;</div><div class='add'>+			req.data = &amp;msg[i+1].buf[0];</div><div class='add'>+			ret = af9015_ctrl_msg(d, &amp;req);</div><div class='add'>+			i += 2;</div><div class='add'>+		} else {</div><div class='add'>+			if (msg[i].addr ==</div><div class='add'>+				af9015_af9013_config[0].demod_address)</div><div class='add'>+				req.cmd = WRITE_MEMORY;</div><div class='add'>+			else</div><div class='add'>+				req.cmd = WRITE_I2C;</div><div class='add'>+			req.i2c_addr = msg[i].addr;</div><div class='add'>+			req.addr = addr;</div><div class='add'>+			req.mbox = mbox;</div><div class='add'>+			req.addr_len = addr_len;</div><div class='add'>+			req.data_len = msg[i].len-addr_len;</div><div class='add'>+			req.data = &amp;msg[i].buf[addr_len];</div><div class='add'>+			ret = af9015_ctrl_msg(d, &amp;req);</div><div class='add'>+			i += 1;</div><div class='add'>+		}</div><div class='add'>+		if (ret)</div><div class='add'>+			goto error;</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+	ret = i;</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	mutex_unlock(&amp;d-&gt;i2c_mutex);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 af9015_i2c_func(struct i2c_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	return I2C_FUNC_I2C;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct i2c_algorithm af9015_i2c_algo = {</div><div class='add'>+	.master_xfer = af9015_i2c_xfer,</div><div class='add'>+	.functionality = af9015_i2c_func,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int af9015_do_reg_bit(struct dvb_usb_device *d, u16 addr, u8 bit, u8 op)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u8 val, mask = 0x01;</div><div class='add'>+</div><div class='add'>+	ret = af9015_read_reg(d, addr, &amp;val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	mask &lt;&lt;= bit;</div><div class='add'>+	if (op) {</div><div class='add'>+		/* set bit */</div><div class='add'>+		val |= mask;</div><div class='add'>+	} else {</div><div class='add'>+		/* clear bit */</div><div class='add'>+		mask ^= 0xff;</div><div class='add'>+		val &amp;= mask;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return af9015_write_reg(d, addr, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int af9015_set_reg_bit(struct dvb_usb_device *d, u16 addr, u8 bit)</div><div class='add'>+{</div><div class='add'>+	return af9015_do_reg_bit(d, addr, bit, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int af9015_clear_reg_bit(struct dvb_usb_device *d, u16 addr, u8 bit)</div><div class='add'>+{</div><div class='add'>+	return af9015_do_reg_bit(d, addr, bit, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int af9015_init_endpoint(struct dvb_usb_device *d)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u16 frame_size;</div><div class='add'>+	u8  packet_size;</div><div class='add'>+	deb_info("%s: USB speed:%d\n", __func__, d-&gt;udev-&gt;speed);</div><div class='add'>+</div><div class='add'>+#define TS_PACKET_SIZE            188</div><div class='add'>+</div><div class='add'>+#define TS_USB20_PACKET_COUNT     348</div><div class='add'>+#define TS_USB20_FRAME_SIZE       (TS_PACKET_SIZE*TS_USB20_PACKET_COUNT)</div><div class='add'>+</div><div class='add'>+#define TS_USB11_PACKET_COUNT      21</div><div class='add'>+#define TS_USB11_FRAME_SIZE       (TS_PACKET_SIZE*TS_USB11_PACKET_COUNT)</div><div class='add'>+</div><div class='add'>+#define TS_USB20_MAX_PACKET_SIZE  512</div><div class='add'>+#define TS_USB11_MAX_PACKET_SIZE   64</div><div class='add'>+</div><div class='add'>+	if (d-&gt;udev-&gt;speed == USB_SPEED_FULL) {</div><div class='add'>+		frame_size = TS_USB11_FRAME_SIZE/4;</div><div class='add'>+		packet_size = TS_USB11_MAX_PACKET_SIZE/4;</div><div class='add'>+	} else {</div><div class='add'>+		frame_size = TS_USB20_FRAME_SIZE/4;</div><div class='add'>+		packet_size = TS_USB20_MAX_PACKET_SIZE/4;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = af9015_set_reg_bit(d, 0xd507, 2); /* assert EP4 reset */</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+	ret = af9015_set_reg_bit(d, 0xd50b, 1); /* assert EP5 reset */</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+	ret = af9015_clear_reg_bit(d, 0xdd11, 5); /* disable EP4 */</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+	ret = af9015_clear_reg_bit(d, 0xdd11, 6); /* disable EP5 */</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+	ret = af9015_set_reg_bit(d, 0xdd11, 5); /* enable EP4 */</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+	if (af9015_config.dual_mode) {</div><div class='add'>+		ret = af9015_set_reg_bit(d, 0xdd11, 6); /* enable EP5 */</div><div class='add'>+		if (ret)</div><div class='add'>+			goto error;</div><div class='add'>+	}</div><div class='add'>+	ret = af9015_clear_reg_bit(d, 0xdd13, 5); /* disable EP4 NAK */</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+	if (af9015_config.dual_mode) {</div><div class='add'>+		ret = af9015_clear_reg_bit(d, 0xdd13, 6); /* disable EP5 NAK */</div><div class='add'>+		if (ret)</div><div class='add'>+			goto error;</div><div class='add'>+	}</div><div class='add'>+	/* EP4 xfer length */</div><div class='add'>+	ret = af9015_write_reg(d, 0xdd88, frame_size &amp; 0xff);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+	ret = af9015_write_reg(d, 0xdd89, frame_size &gt;&gt; 8);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+	/* EP5 xfer length */</div><div class='add'>+	ret = af9015_write_reg(d, 0xdd8a, frame_size &amp; 0xff);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+	ret = af9015_write_reg(d, 0xdd8b, frame_size &gt;&gt; 8);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+	ret = af9015_write_reg(d, 0xdd0c, packet_size); /* EP4 packet size */</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+	ret = af9015_write_reg(d, 0xdd0d, packet_size); /* EP5 packet size */</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+	ret = af9015_clear_reg_bit(d, 0xd507, 2); /* negate EP4 reset */</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+	if (af9015_config.dual_mode) {</div><div class='add'>+		ret = af9015_clear_reg_bit(d, 0xd50b, 1); /* negate EP5 reset */</div><div class='add'>+		if (ret)</div><div class='add'>+			goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* enable / disable mp2if2 */</div><div class='add'>+	if (af9015_config.dual_mode)</div><div class='add'>+		ret = af9015_set_reg_bit(d, 0xd50b, 0);</div><div class='add'>+	else</div><div class='add'>+		ret = af9015_clear_reg_bit(d, 0xd50b, 0);</div><div class='add'>+error:</div><div class='add'>+	if (ret)</div><div class='add'>+		err("endpoint init failed:%d", ret);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int af9015_copy_firmware(struct dvb_usb_device *d)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u8 fw_params[4];</div><div class='add'>+	u8 val, i;</div><div class='add'>+	struct req_t req = {COPY_FIRMWARE, 0, 0x5100, 0, 0, sizeof(fw_params),</div><div class='add'>+		fw_params };</div><div class='add'>+	deb_info("%s:\n", __func__);</div><div class='add'>+</div><div class='add'>+	fw_params[0] = af9015_config.firmware_size &gt;&gt; 8;</div><div class='add'>+	fw_params[1] = af9015_config.firmware_size &amp; 0xff;</div><div class='add'>+	fw_params[2] = af9015_config.firmware_checksum &gt;&gt; 8;</div><div class='add'>+	fw_params[3] = af9015_config.firmware_checksum &amp; 0xff;</div><div class='add'>+</div><div class='add'>+	/* wait 2nd demodulator ready */</div><div class='add'>+	msleep(100);</div><div class='add'>+</div><div class='add'>+	ret = af9015_read_reg_i2c(d, 0x3a, 0x98be, &amp;val);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+	else</div><div class='add'>+		deb_info("%s: firmware status:%02x\n", __func__, val);</div><div class='add'>+</div><div class='add'>+	if (val == 0x0c) /* fw is running, no need for download */</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	/* set I2C master clock to fast (to speed up firmware copy) */</div><div class='add'>+	ret = af9015_write_reg(d, 0xd416, 0x04); /* 0x04 * 400ns */</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	msleep(50);</div><div class='add'>+</div><div class='add'>+	/* copy firmware */</div><div class='add'>+	ret = af9015_ctrl_msg(d, &amp;req);</div><div class='add'>+	if (ret)</div><div class='add'>+		err("firmware copy cmd failed:%d", ret);</div><div class='add'>+	deb_info("%s: firmware copy done\n", __func__);</div><div class='add'>+</div><div class='add'>+	/* set I2C master clock back to normal */</div><div class='add'>+	ret = af9015_write_reg(d, 0xd416, 0x14); /* 0x14 * 400ns */</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	/* request boot firmware */</div><div class='add'>+	ret = af9015_write_reg_i2c(d, af9015_af9013_config[1].demod_address,</div><div class='add'>+		0xe205, 1);</div><div class='add'>+	deb_info("%s: firmware boot cmd status:%d\n", __func__, ret);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 15; i++) {</div><div class='add'>+		msleep(100);</div><div class='add'>+</div><div class='add'>+		/* check firmware status */</div><div class='add'>+		ret = af9015_read_reg_i2c(d,</div><div class='add'>+			af9015_af9013_config[1].demod_address, 0x98be, &amp;val);</div><div class='add'>+		deb_info("%s: firmware status cmd status:%d fw status:%02x\n",</div><div class='add'>+			__func__, ret, val);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto error;</div><div class='add'>+</div><div class='add'>+		if (val == 0x0c || val == 0x04) /* success or fail */</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (val == 0x04) {</div><div class='add'>+		err("firmware did not run");</div><div class='add'>+		ret = -1;</div><div class='add'>+	} else if (val != 0x0c) {</div><div class='add'>+		err("firmware boot timeout");</div><div class='add'>+		ret = -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+exit:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* dump eeprom */</div><div class='add'>+static int af9015_eeprom_dump(struct dvb_usb_device *d)</div><div class='add'>+{</div><div class='add'>+	char buf[52], buf2[4];</div><div class='add'>+	u8 reg, val;</div><div class='add'>+</div><div class='add'>+	for (reg = 0; ; reg++) {</div><div class='add'>+		if (reg % 16 == 0) {</div><div class='add'>+			if (reg)</div><div class='add'>+				deb_info("%s\n", buf);</div><div class='add'>+			sprintf(buf, "%02x: ", reg);</div><div class='add'>+		}</div><div class='add'>+		if (af9015_read_reg_i2c(d, AF9015_I2C_EEPROM, reg, &amp;val) == 0)</div><div class='add'>+			sprintf(buf2, "%02x ", val);</div><div class='add'>+		else</div><div class='add'>+			strcpy(buf2, "-- ");</div><div class='add'>+		strcat(buf, buf2);</div><div class='add'>+		if (reg == 0xff)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	deb_info("%s\n", buf);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int af9015_download_ir_table(struct dvb_usb_device *d)</div><div class='add'>+{</div><div class='add'>+	int i, packets = 0, ret;</div><div class='add'>+	u16 addr = 0x9a56; /* ir-table start address */</div><div class='add'>+	struct req_t req = {WRITE_MEMORY, 0, 0, 0, 0, 1, NULL};</div><div class='add'>+	u8 *data = NULL;</div><div class='add'>+	deb_info("%s:\n", __func__);</div><div class='add'>+</div><div class='add'>+	data = af9015_config.ir_table;</div><div class='add'>+	packets = af9015_config.ir_table_size;</div><div class='add'>+</div><div class='add'>+	/* no remote */</div><div class='add'>+	if (!packets)</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	/* load remote ir-table */</div><div class='add'>+	for (i = 0; i &lt; packets; i++) {</div><div class='add'>+		req.addr = addr + i;</div><div class='add'>+		req.data = &amp;data[i];</div><div class='add'>+		ret = af9015_ctrl_msg(d, &amp;req);</div><div class='add'>+		if (ret) {</div><div class='add'>+			err("ir-table download failed at packet %d with " \</div><div class='add'>+				"code %d", i, ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int af9015_init(struct dvb_usb_device *d)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	deb_info("%s:\n", __func__);</div><div class='add'>+</div><div class='add'>+	ret = af9015_init_endpoint(d);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	ret = af9015_download_ir_table(d);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int af9015_pid_filter_ctrl(struct dvb_usb_adapter *adap, int onoff)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	deb_info("%s: onoff:%d\n", __func__, onoff);</div><div class='add'>+</div><div class='add'>+	if (onoff)</div><div class='add'>+		ret = af9015_set_reg_bit(adap-&gt;dev, 0xd503, 0);</div><div class='add'>+	else</div><div class='add'>+		ret = af9015_clear_reg_bit(adap-&gt;dev, 0xd503, 0);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int af9015_pid_filter(struct dvb_usb_adapter *adap, int index, u16 pid,</div><div class='add'>+	int onoff)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u8 idx;</div><div class='add'>+</div><div class='add'>+	deb_info("%s: set pid filter, index %d, pid %x, onoff %d\n",</div><div class='add'>+		__func__, index, pid, onoff);</div><div class='add'>+</div><div class='add'>+	ret = af9015_write_reg(adap-&gt;dev, 0xd505, (pid &amp; 0xff));</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	ret = af9015_write_reg(adap-&gt;dev, 0xd506, (pid &gt;&gt; 8));</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	idx = ((index &amp; 0x1f) | (1 &lt;&lt; 5));</div><div class='add'>+	ret = af9015_write_reg(adap-&gt;dev, 0xd504, idx);</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int af9015_download_firmware(struct usb_device *udev,</div><div class='add'>+	const struct firmware *fw)</div><div class='add'>+{</div><div class='add'>+	int i, len, packets, remainder, ret;</div><div class='add'>+	struct req_t req = {DOWNLOAD_FIRMWARE, 0, 0, 0, 0, 0, NULL};</div><div class='add'>+	u16 addr = 0x5100; /* firmware start address */</div><div class='add'>+	u16 checksum = 0;</div><div class='add'>+</div><div class='add'>+	deb_info("%s:\n", __func__);</div><div class='add'>+</div><div class='add'>+	/* calc checksum */</div><div class='add'>+	for (i = 0; i &lt; fw-&gt;size; i++)</div><div class='add'>+		checksum += fw-&gt;data[i];</div><div class='add'>+</div><div class='add'>+	af9015_config.firmware_size = fw-&gt;size;</div><div class='add'>+	af9015_config.firmware_checksum = checksum;</div><div class='add'>+</div><div class='add'>+	#define FW_PACKET_MAX_DATA  55</div><div class='add'>+</div><div class='add'>+	packets = fw-&gt;size / FW_PACKET_MAX_DATA;</div><div class='add'>+	remainder = fw-&gt;size % FW_PACKET_MAX_DATA;</div><div class='add'>+	len = FW_PACKET_MAX_DATA;</div><div class='add'>+	for (i = 0; i &lt;= packets; i++) {</div><div class='add'>+		if (i == packets)  /* set size of the last packet */</div><div class='add'>+			len = remainder;</div><div class='add'>+</div><div class='add'>+		req.data_len = len;</div><div class='add'>+		req.data = (u8 *)(fw-&gt;data + i * FW_PACKET_MAX_DATA);</div><div class='add'>+		req.addr = addr;</div><div class='add'>+		addr += FW_PACKET_MAX_DATA;</div><div class='add'>+</div><div class='add'>+		ret = af9015_rw_udev(udev, &amp;req);</div><div class='add'>+		if (ret) {</div><div class='add'>+			err("firmware download failed at packet %d with " \</div><div class='add'>+				"code %d", i, ret);</div><div class='add'>+			goto error;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* firmware loaded, request boot */</div><div class='add'>+	req.cmd = BOOT;</div><div class='add'>+	ret = af9015_rw_udev(udev, &amp;req);</div><div class='add'>+	if (ret) {</div><div class='add'>+		err("firmware boot failed:%d", ret);</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* firmware is running, reconnect device in the usb bus */</div><div class='add'>+	req.cmd = RECONNECT_USB;</div><div class='add'>+	ret = af9015_rw_udev(udev, &amp;req);</div><div class='add'>+	if (ret)</div><div class='add'>+		err("reconnect failed: %d", ret);</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int af9015_read_config(struct usb_device *udev)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u8 val, i, offset = 0;</div><div class='add'>+	struct req_t req = {READ_I2C, AF9015_I2C_EEPROM, 0, 0, 1, 1, &amp;val};</div><div class='add'>+	char manufacturer[10];</div><div class='add'>+</div><div class='add'>+	/* IR remote controller */</div><div class='add'>+	req.addr = AF9015_EEPROM_IR_MODE;</div><div class='add'>+	ret = af9015_rw_udev(udev, &amp;req);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+	deb_info("%s: IR mode:%d\n", __func__, val);</div><div class='add'>+	for (i = 0; i &lt; af9015_properties_count; i++) {</div><div class='add'>+		if (val == AF9015_IR_MODE_DISABLED || val == 0x04) {</div><div class='add'>+			af9015_properties[i].rc_key_map = NULL;</div><div class='add'>+			af9015_properties[i].rc_key_map_size  = 0;</div><div class='add'>+		} else if (dvb_usb_af9015_remote) {</div><div class='add'>+			/* load remote defined as module param */</div><div class='add'>+			switch (dvb_usb_af9015_remote) {</div><div class='add'>+			case AF9015_REMOTE_A_LINK_DTU_M:</div><div class='add'>+				af9015_properties[i].rc_key_map =</div><div class='add'>+				  af9015_rc_keys_a_link;</div><div class='add'>+				af9015_properties[i].rc_key_map_size =</div><div class='add'>+				  ARRAY_SIZE(af9015_rc_keys_a_link);</div><div class='add'>+				af9015_config.ir_table = af9015_ir_table_a_link;</div><div class='add'>+				af9015_config.ir_table_size =</div><div class='add'>+				  ARRAY_SIZE(af9015_ir_table_a_link);</div><div class='add'>+				break;</div><div class='add'>+			case AF9015_REMOTE_MSI_DIGIVOX_MINI_II_V3:</div><div class='add'>+				af9015_properties[i].rc_key_map =</div><div class='add'>+				  af9015_rc_keys_msi;</div><div class='add'>+				af9015_properties[i].rc_key_map_size =</div><div class='add'>+				  ARRAY_SIZE(af9015_rc_keys_msi);</div><div class='add'>+				af9015_config.ir_table = af9015_ir_table_msi;</div><div class='add'>+				af9015_config.ir_table_size =</div><div class='add'>+				  ARRAY_SIZE(af9015_ir_table_msi);</div><div class='add'>+				break;</div><div class='add'>+			case AF9015_REMOTE_MYGICTV_U718:</div><div class='add'>+				af9015_properties[i].rc_key_map =</div><div class='add'>+				  af9015_rc_keys_mygictv;</div><div class='add'>+				af9015_properties[i].rc_key_map_size =</div><div class='add'>+				  ARRAY_SIZE(af9015_rc_keys_mygictv);</div><div class='add'>+				af9015_config.ir_table =</div><div class='add'>+				  af9015_ir_table_mygictv;</div><div class='add'>+				af9015_config.ir_table_size =</div><div class='add'>+				  ARRAY_SIZE(af9015_ir_table_mygictv);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			switch (udev-&gt;descriptor.idVendor) {</div><div class='add'>+			case USB_VID_LEADTEK:</div><div class='add'>+				af9015_properties[i].rc_key_map =</div><div class='add'>+				  af9015_rc_keys_leadtek;</div><div class='add'>+				af9015_properties[i].rc_key_map_size =</div><div class='add'>+				  ARRAY_SIZE(af9015_rc_keys_leadtek);</div><div class='add'>+				af9015_config.ir_table =</div><div class='add'>+				  af9015_ir_table_leadtek;</div><div class='add'>+				af9015_config.ir_table_size =</div><div class='add'>+				  ARRAY_SIZE(af9015_ir_table_leadtek);</div><div class='add'>+				break;</div><div class='add'>+			case USB_VID_VISIONPLUS:</div><div class='add'>+				if (udev-&gt;descriptor.idProduct ==</div><div class='add'>+				USB_PID_AZUREWAVE_AD_TU700) {</div><div class='add'>+					af9015_properties[i].rc_key_map =</div><div class='add'>+					  af9015_rc_keys_twinhan;</div><div class='add'>+					af9015_properties[i].rc_key_map_size =</div><div class='add'>+					  ARRAY_SIZE(af9015_rc_keys_twinhan);</div><div class='add'>+					af9015_config.ir_table =</div><div class='add'>+					  af9015_ir_table_twinhan;</div><div class='add'>+					af9015_config.ir_table_size =</div><div class='add'>+					  ARRAY_SIZE(af9015_ir_table_twinhan);</div><div class='add'>+				}</div><div class='add'>+				break;</div><div class='add'>+			case USB_VID_KWORLD_2:</div><div class='add'>+				/* TODO: use correct rc keys */</div><div class='add'>+				af9015_properties[i].rc_key_map =</div><div class='add'>+				  af9015_rc_keys_twinhan;</div><div class='add'>+				af9015_properties[i].rc_key_map_size =</div><div class='add'>+				  ARRAY_SIZE(af9015_rc_keys_twinhan);</div><div class='add'>+				af9015_config.ir_table = af9015_ir_table_kworld;</div><div class='add'>+				af9015_config.ir_table_size =</div><div class='add'>+				  ARRAY_SIZE(af9015_ir_table_kworld);</div><div class='add'>+				break;</div><div class='add'>+			/* Check USB manufacturer and product strings and try</div><div class='add'>+			   to determine correct remote in case of chip vendor</div><div class='add'>+			   reference IDs are used. */</div><div class='add'>+			case USB_VID_AFATECH:</div><div class='add'>+				memset(manufacturer, 0, sizeof(manufacturer));</div><div class='add'>+				usb_string(udev, udev-&gt;descriptor.iManufacturer,</div><div class='add'>+					manufacturer, sizeof(manufacturer));</div><div class='add'>+				if (!strcmp("Geniatech", manufacturer)) {</div><div class='add'>+					/* iManufacturer 1 Geniatech</div><div class='add'>+					   iProduct      2 AF9015 */</div><div class='add'>+					af9015_properties[i].rc_key_map =</div><div class='add'>+					  af9015_rc_keys_mygictv;</div><div class='add'>+					af9015_properties[i].rc_key_map_size =</div><div class='add'>+					  ARRAY_SIZE(af9015_rc_keys_mygictv);</div><div class='add'>+					af9015_config.ir_table =</div><div class='add'>+					  af9015_ir_table_mygictv;</div><div class='add'>+					af9015_config.ir_table_size =</div><div class='add'>+					  ARRAY_SIZE(af9015_ir_table_mygictv);</div><div class='add'>+				} else if (!strcmp("MSI", manufacturer)) {</div><div class='add'>+					/* iManufacturer 1 MSI</div><div class='add'>+					   iProduct      2 MSI K-VOX */</div><div class='add'>+					af9015_properties[i].rc_key_map =</div><div class='add'>+					  af9015_rc_keys_msi;</div><div class='add'>+					af9015_properties[i].rc_key_map_size =</div><div class='add'>+					  ARRAY_SIZE(af9015_rc_keys_msi);</div><div class='add'>+					af9015_config.ir_table =</div><div class='add'>+					  af9015_ir_table_msi;</div><div class='add'>+					af9015_config.ir_table_size =</div><div class='add'>+					  ARRAY_SIZE(af9015_ir_table_msi);</div><div class='add'>+				}</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* TS mode - one or two receivers */</div><div class='add'>+	req.addr = AF9015_EEPROM_TS_MODE;</div><div class='add'>+	ret = af9015_rw_udev(udev, &amp;req);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+	af9015_config.dual_mode = val;</div><div class='add'>+	deb_info("%s: TS mode:%d\n", __func__, af9015_config.dual_mode);</div><div class='add'>+	/* disable dual mode by default because it is buggy */</div><div class='add'>+	if (!dvb_usb_af9015_dual_mode)</div><div class='add'>+		af9015_config.dual_mode = 0;</div><div class='add'>+</div><div class='add'>+	/* set buffer size according to USB port speed */</div><div class='add'>+	for (i = 0; i &lt; af9015_properties_count; i++) {</div><div class='add'>+		/* USB1.1 set smaller buffersize and disable 2nd adapter */</div><div class='add'>+		if (udev-&gt;speed == USB_SPEED_FULL) {</div><div class='add'>+			af9015_properties[i].adapter-&gt;stream.u.bulk.buffersize =</div><div class='add'>+				TS_USB11_MAX_PACKET_SIZE;</div><div class='add'>+			/* disable 2nd adapter because we don't have</div><div class='add'>+			   PID-filters */</div><div class='add'>+			af9015_config.dual_mode = 0;</div><div class='add'>+		} else {</div><div class='add'>+			af9015_properties[i].adapter-&gt;stream.u.bulk.buffersize =</div><div class='add'>+				TS_USB20_MAX_PACKET_SIZE;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (af9015_config.dual_mode) {</div><div class='add'>+		/* read 2nd demodulator I2C address */</div><div class='add'>+		req.addr = AF9015_EEPROM_DEMOD2_I2C;</div><div class='add'>+		ret = af9015_rw_udev(udev, &amp;req);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto error;</div><div class='add'>+		af9015_af9013_config[1].demod_address = val;</div><div class='add'>+</div><div class='add'>+		/* enable 2nd adapter */</div><div class='add'>+		for (i = 0; i &lt; af9015_properties_count; i++)</div><div class='add'>+			af9015_properties[i].num_adapters = 2;</div><div class='add'>+</div><div class='add'>+	} else {</div><div class='add'>+		 /* disable 2nd adapter */</div><div class='add'>+		for (i = 0; i &lt; af9015_properties_count; i++)</div><div class='add'>+			af9015_properties[i].num_adapters = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; af9015_properties[0].num_adapters; i++) {</div><div class='add'>+		if (i == 1)</div><div class='add'>+			offset = AF9015_EEPROM_OFFSET;</div><div class='add'>+		/* xtal */</div><div class='add'>+		req.addr = AF9015_EEPROM_XTAL_TYPE1 + offset;</div><div class='add'>+		ret = af9015_rw_udev(udev, &amp;req);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto error;</div><div class='add'>+		switch (val) {</div><div class='add'>+		case 0:</div><div class='add'>+			af9015_af9013_config[i].adc_clock = 28800;</div><div class='add'>+			break;</div><div class='add'>+		case 1:</div><div class='add'>+			af9015_af9013_config[i].adc_clock = 20480;</div><div class='add'>+			break;</div><div class='add'>+		case 2:</div><div class='add'>+			af9015_af9013_config[i].adc_clock = 28000;</div><div class='add'>+			break;</div><div class='add'>+		case 3:</div><div class='add'>+			af9015_af9013_config[i].adc_clock = 25000;</div><div class='add'>+			break;</div><div class='add'>+		};</div><div class='add'>+		deb_info("%s: [%d] xtal:%d set adc_clock:%d\n", __func__, i,</div><div class='add'>+			val, af9015_af9013_config[i].adc_clock);</div><div class='add'>+</div><div class='add'>+		/* tuner IF */</div><div class='add'>+		req.addr = AF9015_EEPROM_IF1H + offset;</div><div class='add'>+		ret = af9015_rw_udev(udev, &amp;req);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto error;</div><div class='add'>+		af9015_af9013_config[i].tuner_if = val &lt;&lt; 8;</div><div class='add'>+		req.addr = AF9015_EEPROM_IF1L + offset;</div><div class='add'>+		ret = af9015_rw_udev(udev, &amp;req);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto error;</div><div class='add'>+		af9015_af9013_config[i].tuner_if += val;</div><div class='add'>+		deb_info("%s: [%d] IF1:%d\n", __func__, i,</div><div class='add'>+			af9015_af9013_config[0].tuner_if);</div><div class='add'>+</div><div class='add'>+		/* MT2060 IF1 */</div><div class='add'>+		req.addr = AF9015_EEPROM_MT2060_IF1H  + offset;</div><div class='add'>+		ret = af9015_rw_udev(udev, &amp;req);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto error;</div><div class='add'>+		af9015_config.mt2060_if1[i] = val &lt;&lt; 8;</div><div class='add'>+		req.addr = AF9015_EEPROM_MT2060_IF1L + offset;</div><div class='add'>+		ret = af9015_rw_udev(udev, &amp;req);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto error;</div><div class='add'>+		af9015_config.mt2060_if1[i] += val;</div><div class='add'>+		deb_info("%s: [%d] MT2060 IF1:%d\n", __func__, i,</div><div class='add'>+			af9015_config.mt2060_if1[i]);</div><div class='add'>+</div><div class='add'>+		/* tuner */</div><div class='add'>+		req.addr =  AF9015_EEPROM_TUNER_ID1 + offset;</div><div class='add'>+		ret = af9015_rw_udev(udev, &amp;req);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto error;</div><div class='add'>+		switch (val) {</div><div class='add'>+		case AF9013_TUNER_ENV77H11D5:</div><div class='add'>+		case AF9013_TUNER_MT2060:</div><div class='add'>+		case AF9013_TUNER_MC44S803:</div><div class='add'>+		case AF9013_TUNER_QT1010:</div><div class='add'>+		case AF9013_TUNER_UNKNOWN:</div><div class='add'>+		case AF9013_TUNER_MT2060_2:</div><div class='add'>+		case AF9013_TUNER_TDA18271:</div><div class='add'>+		case AF9013_TUNER_QT1010A:</div><div class='add'>+			af9015_af9013_config[i].rf_spec_inv = 1;</div><div class='add'>+			break;</div><div class='add'>+		case AF9013_TUNER_MXL5003D:</div><div class='add'>+		case AF9013_TUNER_MXL5005D:</div><div class='add'>+		case AF9013_TUNER_MXL5005R:</div><div class='add'>+			af9015_af9013_config[i].rf_spec_inv = 0;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			warn("tuner id:%d not supported, please report!", val);</div><div class='add'>+			return -ENODEV;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		af9015_af9013_config[i].tuner = val;</div><div class='add'>+		deb_info("%s: [%d] tuner id:%d\n", __func__, i, val);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	if (ret)</div><div class='add'>+		err("eeprom read failed:%d", ret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int af9015_identify_state(struct usb_device *udev,</div><div class='add'>+				 struct dvb_usb_device_properties *props,</div><div class='add'>+				 struct dvb_usb_device_description **desc,</div><div class='add'>+				 int *cold)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u8 reply;</div><div class='add'>+	struct req_t req = {GET_CONFIG, 0, 0, 0, 0, 1, &amp;reply};</div><div class='add'>+</div><div class='add'>+	ret = af9015_rw_udev(udev, &amp;req);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	deb_info("%s: reply:%02x\n", __func__, reply);</div><div class='add'>+	if (reply == 0x02)</div><div class='add'>+		*cold = 0;</div><div class='add'>+	else</div><div class='add'>+		*cold = 1;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int af9015_rc_query(struct dvb_usb_device *d, u32 *event, int *state)</div><div class='add'>+{</div><div class='add'>+	u8 buf[8];</div><div class='add'>+	struct req_t req = {GET_IR_CODE, 0, 0, 0, 0, sizeof(buf), buf};</div><div class='add'>+	struct dvb_usb_rc_key *keymap = d-&gt;props.rc_key_map;</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	memset(buf, 0, sizeof(buf));</div><div class='add'>+</div><div class='add'>+	ret = af9015_ctrl_msg(d, &amp;req);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	*event = 0;</div><div class='add'>+	*state = REMOTE_NO_KEY_PRESSED;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; d-&gt;props.rc_key_map_size; i++) {</div><div class='add'>+		if (!buf[1] &amp;&amp; keymap[i].custom == buf[0] &amp;&amp;</div><div class='add'>+		    keymap[i].data == buf[2]) {</div><div class='add'>+			*event = keymap[i].event;</div><div class='add'>+			*state = REMOTE_KEY_PRESSED;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (!buf[1])</div><div class='add'>+		deb_rc("%s: %02x %02x %02x %02x %02x %02x %02x %02x\n",</div><div class='add'>+			__func__, buf[0], buf[1], buf[2], buf[3], buf[4],</div><div class='add'>+			buf[5], buf[6], buf[7]);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* init 2nd I2C adapter */</div><div class='add'>+int af9015_i2c_init(struct dvb_usb_device *d)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct af9015_state *state = d-&gt;priv;</div><div class='add'>+	deb_info("%s:\n", __func__);</div><div class='add'>+</div><div class='add'>+	strncpy(state-&gt;i2c_adap.name, d-&gt;desc-&gt;name,</div><div class='add'>+		sizeof(state-&gt;i2c_adap.name));</div><div class='add'>+#ifdef I2C_ADAP_CLASS_TV_DIGITAL</div><div class='add'>+	state-&gt;i2c_adap.class = I2C_ADAP_CLASS_TV_DIGITAL,</div><div class='add'>+#else</div><div class='add'>+	state-&gt;i2c_adap.class = I2C_CLASS_TV_DIGITAL,</div><div class='add'>+#endif</div><div class='add'>+	state-&gt;i2c_adap.algo      = d-&gt;props.i2c_algo;</div><div class='add'>+	state-&gt;i2c_adap.algo_data = NULL;</div><div class='add'>+	state-&gt;i2c_adap.dev.parent = &amp;d-&gt;udev-&gt;dev;</div><div class='add'>+</div><div class='add'>+	i2c_set_adapdata(&amp;state-&gt;i2c_adap, d);</div><div class='add'>+</div><div class='add'>+	ret = i2c_add_adapter(&amp;state-&gt;i2c_adap);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		err("could not add i2c adapter");</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int af9015_af9013_frontend_attach(struct dvb_usb_adapter *adap)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct af9015_state *state = adap-&gt;dev-&gt;priv;</div><div class='add'>+	struct i2c_adapter *i2c_adap;</div><div class='add'>+</div><div class='add'>+	if (adap-&gt;id == 0) {</div><div class='add'>+		/* select I2C adapter */</div><div class='add'>+		i2c_adap = &amp;adap-&gt;dev-&gt;i2c_adap;</div><div class='add'>+</div><div class='add'>+		deb_info("%s: init I2C\n", __func__);</div><div class='add'>+		ret = af9015_i2c_init(adap-&gt;dev);</div><div class='add'>+</div><div class='add'>+		/* dump eeprom (debug) */</div><div class='add'>+		ret = af9015_eeprom_dump(adap-&gt;dev);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	} else {</div><div class='add'>+		/* select I2C adapter */</div><div class='add'>+		i2c_adap = &amp;state-&gt;i2c_adap;</div><div class='add'>+</div><div class='add'>+		/* copy firmware to 2nd demodulator */</div><div class='add'>+		if (af9015_config.dual_mode) {</div><div class='add'>+			ret = af9015_copy_firmware(adap-&gt;dev);</div><div class='add'>+			if (ret) {</div><div class='add'>+				err("firmware copy to 2nd frontend " \</div><div class='add'>+					"failed, will disable it");</div><div class='add'>+				af9015_config.dual_mode = 0;</div><div class='add'>+				return -ENODEV;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			return -ENODEV;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* attach demodulator */</div><div class='add'>+	adap-&gt;fe = dvb_attach(af9013_attach, &amp;af9015_af9013_config[adap-&gt;id],</div><div class='add'>+		i2c_adap);</div><div class='add'>+</div><div class='add'>+	return adap-&gt;fe == NULL ? -ENODEV : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct mt2060_config af9015_mt2060_config = {</div><div class='add'>+	.i2c_address = 0xc0,</div><div class='add'>+	.clock_out = 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct qt1010_config af9015_qt1010_config = {</div><div class='add'>+	.i2c_address = 0xc4,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct tda18271_config af9015_tda18271_config = {</div><div class='add'>+	.gate = TDA18271_GATE_DIGITAL,</div><div class='add'>+	.small_i2c = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct mxl5005s_config af9015_mxl5003_config = {</div><div class='add'>+	.i2c_address     = 0xc6,</div><div class='add'>+	.if_freq         = IF_FREQ_4570000HZ,</div><div class='add'>+	.xtal_freq       = CRYSTAL_FREQ_16000000HZ,</div><div class='add'>+	.agc_mode        = MXL_SINGLE_AGC,</div><div class='add'>+	.tracking_filter = MXL_TF_DEFAULT,</div><div class='add'>+	.rssi_enable     = MXL_RSSI_ENABLE,</div><div class='add'>+	.cap_select      = MXL_CAP_SEL_ENABLE,</div><div class='add'>+	.div_out         = MXL_DIV_OUT_4,</div><div class='add'>+	.clock_out       = MXL_CLOCK_OUT_DISABLE,</div><div class='add'>+	.output_load     = MXL5005S_IF_OUTPUT_LOAD_200_OHM,</div><div class='add'>+	.top		 = MXL5005S_TOP_25P2,</div><div class='add'>+	.mod_mode        = MXL_DIGITAL_MODE,</div><div class='add'>+	.if_mode         = MXL_ZERO_IF,</div><div class='add'>+	.AgcMasterByte   = 0x00,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct mxl5005s_config af9015_mxl5005_config = {</div><div class='add'>+	.i2c_address     = 0xc6,</div><div class='add'>+	.if_freq         = IF_FREQ_4570000HZ,</div><div class='add'>+	.xtal_freq       = CRYSTAL_FREQ_16000000HZ,</div><div class='add'>+	.agc_mode        = MXL_SINGLE_AGC,</div><div class='add'>+	.tracking_filter = MXL_TF_OFF,</div><div class='add'>+	.rssi_enable     = MXL_RSSI_ENABLE,</div><div class='add'>+	.cap_select      = MXL_CAP_SEL_ENABLE,</div><div class='add'>+	.div_out         = MXL_DIV_OUT_4,</div><div class='add'>+	.clock_out       = MXL_CLOCK_OUT_DISABLE,</div><div class='add'>+	.output_load     = MXL5005S_IF_OUTPUT_LOAD_200_OHM,</div><div class='add'>+	.top		 = MXL5005S_TOP_25P2,</div><div class='add'>+	.mod_mode        = MXL_DIGITAL_MODE,</div><div class='add'>+	.if_mode         = MXL_ZERO_IF,</div><div class='add'>+	.AgcMasterByte   = 0x00,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int af9015_tuner_attach(struct dvb_usb_adapter *adap)</div><div class='add'>+{</div><div class='add'>+	struct af9015_state *state = adap-&gt;dev-&gt;priv;</div><div class='add'>+	struct i2c_adapter *i2c_adap;</div><div class='add'>+	int ret;</div><div class='add'>+	deb_info("%s: \n", __func__);</div><div class='add'>+</div><div class='add'>+	/* select I2C adapter */</div><div class='add'>+	if (adap-&gt;id == 0)</div><div class='add'>+		i2c_adap = &amp;adap-&gt;dev-&gt;i2c_adap;</div><div class='add'>+	else</div><div class='add'>+		i2c_adap = &amp;state-&gt;i2c_adap;</div><div class='add'>+</div><div class='add'>+	switch (af9015_af9013_config[adap-&gt;id].tuner) {</div><div class='add'>+	case AF9013_TUNER_MT2060:</div><div class='add'>+	case AF9013_TUNER_MT2060_2:</div><div class='add'>+		ret = dvb_attach(mt2060_attach, adap-&gt;fe, i2c_adap,</div><div class='add'>+			&amp;af9015_mt2060_config,</div><div class='add'>+			af9015_config.mt2060_if1[adap-&gt;id])</div><div class='add'>+			== NULL ? -ENODEV : 0;</div><div class='add'>+		break;</div><div class='add'>+	case AF9013_TUNER_QT1010:</div><div class='add'>+	case AF9013_TUNER_QT1010A:</div><div class='add'>+		ret = dvb_attach(qt1010_attach, adap-&gt;fe, i2c_adap,</div><div class='add'>+			&amp;af9015_qt1010_config) == NULL ? -ENODEV : 0;</div><div class='add'>+		break;</div><div class='add'>+	case AF9013_TUNER_TDA18271:</div><div class='add'>+		ret = dvb_attach(tda18271_attach, adap-&gt;fe, 0xc0, i2c_adap,</div><div class='add'>+			&amp;af9015_tda18271_config) == NULL ? -ENODEV : 0;</div><div class='add'>+		break;</div><div class='add'>+	case AF9013_TUNER_MXL5003D:</div><div class='add'>+		ret = dvb_attach(mxl5005s_attach, adap-&gt;fe, i2c_adap,</div><div class='add'>+			&amp;af9015_mxl5003_config) == NULL ? -ENODEV : 0;</div><div class='add'>+		break;</div><div class='add'>+	case AF9013_TUNER_MXL5005D:</div><div class='add'>+	case AF9013_TUNER_MXL5005R:</div><div class='add'>+		ret = dvb_attach(mxl5005s_attach, adap-&gt;fe, i2c_adap,</div><div class='add'>+			&amp;af9015_mxl5005_config) == NULL ? -ENODEV : 0;</div><div class='add'>+		break;</div><div class='add'>+	case AF9013_TUNER_ENV77H11D5:</div><div class='add'>+		ret = dvb_attach(dvb_pll_attach, adap-&gt;fe, 0xc0, i2c_adap,</div><div class='add'>+			DVB_PLL_TDA665X) == NULL ? -ENODEV : 0;</div><div class='add'>+		break;</div><div class='add'>+	case AF9013_TUNER_MC44S803:</div><div class='add'>+#if 0</div><div class='add'>+		ret = dvb_attach(mc44s80x_attach, adap-&gt;fe, i2c_adap)</div><div class='add'>+			== NULL ? -ENODEV : 0;</div><div class='add'>+#else</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		info("Freescale MC44S803 tuner found but no driver for that" \</div><div class='add'>+			"tuner. Look at the Linuxtv.org for tuner driver" \</div><div class='add'>+			"status.");</div><div class='add'>+#endif</div><div class='add'>+		break;</div><div class='add'>+	case AF9013_TUNER_UNKNOWN:</div><div class='add'>+	default:</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		err("Unknown tuner id:%d",</div><div class='add'>+			af9015_af9013_config[adap-&gt;id].tuner);</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct usb_device_id af9015_usb_table[] = {</div><div class='add'>+/*  0 */{USB_DEVICE(USB_VID_AFATECH,   USB_PID_AFATECH_AF9015_9015)},</div><div class='add'>+	{USB_DEVICE(USB_VID_AFATECH,   USB_PID_AFATECH_AF9015_9016)},</div><div class='add'>+	{USB_DEVICE(USB_VID_LEADTEK,   USB_PID_WINFAST_DTV_DONGLE_GOLD)},</div><div class='add'>+	{USB_DEVICE(USB_VID_PINNACLE,  USB_PID_PINNACLE_PCTV71E)},</div><div class='add'>+	{USB_DEVICE(USB_VID_KWORLD_2,  USB_PID_KWORLD_399U)},</div><div class='add'>+/*  5 */{USB_DEVICE(USB_VID_VISIONPLUS,</div><div class='add'>+		USB_PID_TINYTWIN)},</div><div class='add'>+	{USB_DEVICE(USB_VID_VISIONPLUS,</div><div class='add'>+		USB_PID_AZUREWAVE_AD_TU700)},</div><div class='add'>+	{USB_DEVICE(USB_VID_TERRATEC,  USB_PID_TERRATEC_CINERGY_T_USB_XE_REV2)},</div><div class='add'>+	{USB_DEVICE(USB_VID_KWORLD_2,  USB_PID_KWORLD_PC160_2T)},</div><div class='add'>+	{USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_VOLAR_X)},</div><div class='add'>+/* 10 */{USB_DEVICE(USB_VID_XTENSIONS, USB_PID_XTENSIONS_XD_380)},</div><div class='add'>+	{USB_DEVICE(USB_VID_MSI_2,     USB_PID_MSI_DIGIVOX_DUO)},</div><div class='add'>+	{USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_VOLAR_X_2)},</div><div class='add'>+	{USB_DEVICE(USB_VID_TELESTAR,  USB_PID_TELESTAR_STARSTICK_2)},</div><div class='add'>+	{USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_A309)},</div><div class='add'>+/* 15 */{USB_DEVICE(USB_VID_MSI_2,     USB_PID_MSI_DIGI_VOX_MINI_III)},</div><div class='add'>+	{0},</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(usb, af9015_usb_table);</div><div class='add'>+</div><div class='add'>+static struct dvb_usb_device_properties af9015_properties[] = {</div><div class='add'>+	{</div><div class='add'>+		.caps = DVB_USB_IS_AN_I2C_ADAPTER,</div><div class='add'>+</div><div class='add'>+		.usb_ctrl = DEVICE_SPECIFIC,</div><div class='add'>+		.download_firmware = af9015_download_firmware,</div><div class='add'>+		.firmware = "dvb-usb-af9015.fw",</div><div class='add'>+</div><div class='add'>+		.size_of_priv = sizeof(struct af9015_state), \</div><div class='add'>+</div><div class='add'>+		.num_adapters = 2,</div><div class='add'>+		.adapter = {</div><div class='add'>+			{</div><div class='add'>+				.caps = DVB_USB_ADAP_HAS_PID_FILTER |</div><div class='add'>+				DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF,</div><div class='add'>+</div><div class='add'>+				.pid_filter_count = 32,</div><div class='add'>+				.pid_filter       = af9015_pid_filter,</div><div class='add'>+				.pid_filter_ctrl  = af9015_pid_filter_ctrl,</div><div class='add'>+</div><div class='add'>+				.frontend_attach =</div><div class='add'>+					af9015_af9013_frontend_attach,</div><div class='add'>+				.tuner_attach    = af9015_tuner_attach,</div><div class='add'>+				.stream = {</div><div class='add'>+					.type = USB_BULK,</div><div class='add'>+					.count = 6,</div><div class='add'>+					.endpoint = 0x84,</div><div class='add'>+				},</div><div class='add'>+			},</div><div class='add'>+			{</div><div class='add'>+				.frontend_attach =</div><div class='add'>+					af9015_af9013_frontend_attach,</div><div class='add'>+				.tuner_attach    = af9015_tuner_attach,</div><div class='add'>+				.stream = {</div><div class='add'>+					.type = USB_BULK,</div><div class='add'>+					.count = 6,</div><div class='add'>+					.endpoint = 0x85,</div><div class='add'>+				},</div><div class='add'>+			}</div><div class='add'>+		},</div><div class='add'>+</div><div class='add'>+		.identify_state = af9015_identify_state,</div><div class='add'>+</div><div class='add'>+		.rc_query         = af9015_rc_query,</div><div class='add'>+		.rc_interval      = 150,</div><div class='add'>+</div><div class='add'>+		.i2c_algo = &amp;af9015_i2c_algo,</div><div class='add'>+</div><div class='add'>+		.num_device_descs = 9,</div><div class='add'>+		.devices = {</div><div class='add'>+			{</div><div class='add'>+				.name = "Afatech AF9015 DVB-T USB2.0 stick",</div><div class='add'>+				.cold_ids = {&amp;af9015_usb_table[0],</div><div class='add'>+					     &amp;af9015_usb_table[1], NULL},</div><div class='add'>+				.warm_ids = {NULL},</div><div class='add'>+			},</div><div class='add'>+			{</div><div class='add'>+				.name = "Leadtek WinFast DTV Dongle Gold",</div><div class='add'>+				.cold_ids = {&amp;af9015_usb_table[2], NULL},</div><div class='add'>+				.warm_ids = {NULL},</div><div class='add'>+			},</div><div class='add'>+			{</div><div class='add'>+				.name = "Pinnacle PCTV 71e",</div><div class='add'>+				.cold_ids = {&amp;af9015_usb_table[3], NULL},</div><div class='add'>+				.warm_ids = {NULL},</div><div class='add'>+			},</div><div class='add'>+			{</div><div class='add'>+				.name = "KWorld PlusTV Dual DVB-T Stick " \</div><div class='add'>+					"(DVB-T 399U)",</div><div class='add'>+				.cold_ids = {&amp;af9015_usb_table[4], NULL},</div><div class='add'>+				.warm_ids = {NULL},</div><div class='add'>+			},</div><div class='add'>+			{</div><div class='add'>+				.name = "DigitalNow TinyTwin DVB-T Receiver",</div><div class='add'>+				.cold_ids = {&amp;af9015_usb_table[5], NULL},</div><div class='add'>+				.warm_ids = {NULL},</div><div class='add'>+			},</div><div class='add'>+			{</div><div class='add'>+				.name = "TwinHan AzureWave AD-TU700(704J)",</div><div class='add'>+				.cold_ids = {&amp;af9015_usb_table[6], NULL},</div><div class='add'>+				.warm_ids = {NULL},</div><div class='add'>+			},</div><div class='add'>+			{</div><div class='add'>+				.name = "TerraTec Cinergy T USB XE",</div><div class='add'>+				.cold_ids = {&amp;af9015_usb_table[7], NULL},</div><div class='add'>+				.warm_ids = {NULL},</div><div class='add'>+			},</div><div class='add'>+			{</div><div class='add'>+				.name = "KWorld PlusTV Dual DVB-T PCI " \</div><div class='add'>+					"(DVB-T PC160-2T)",</div><div class='add'>+				.cold_ids = {&amp;af9015_usb_table[8], NULL},</div><div class='add'>+				.warm_ids = {NULL},</div><div class='add'>+			},</div><div class='add'>+			{</div><div class='add'>+				.name = "AVerMedia AVerTV DVB-T Volar X",</div><div class='add'>+				.cold_ids = {&amp;af9015_usb_table[9], NULL},</div><div class='add'>+				.warm_ids = {NULL},</div><div class='add'>+			},</div><div class='add'>+		}</div><div class='add'>+	}, {</div><div class='add'>+		.caps = DVB_USB_IS_AN_I2C_ADAPTER,</div><div class='add'>+</div><div class='add'>+		.usb_ctrl = DEVICE_SPECIFIC,</div><div class='add'>+		.download_firmware = af9015_download_firmware,</div><div class='add'>+		.firmware = "dvb-usb-af9015.fw",</div><div class='add'>+</div><div class='add'>+		.size_of_priv = sizeof(struct af9015_state), \</div><div class='add'>+</div><div class='add'>+		.num_adapters = 2,</div><div class='add'>+		.adapter = {</div><div class='add'>+			{</div><div class='add'>+				.caps = DVB_USB_ADAP_HAS_PID_FILTER |</div><div class='add'>+				DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF,</div><div class='add'>+</div><div class='add'>+				.pid_filter_count = 32,</div><div class='add'>+				.pid_filter       = af9015_pid_filter,</div><div class='add'>+				.pid_filter_ctrl  = af9015_pid_filter_ctrl,</div><div class='add'>+</div><div class='add'>+				.frontend_attach =</div><div class='add'>+					af9015_af9013_frontend_attach,</div><div class='add'>+				.tuner_attach    = af9015_tuner_attach,</div><div class='add'>+				.stream = {</div><div class='add'>+					.type = USB_BULK,</div><div class='add'>+					.count = 6,</div><div class='add'>+					.endpoint = 0x84,</div><div class='add'>+				},</div><div class='add'>+			},</div><div class='add'>+			{</div><div class='add'>+				.frontend_attach =</div><div class='add'>+					af9015_af9013_frontend_attach,</div><div class='add'>+				.tuner_attach    = af9015_tuner_attach,</div><div class='add'>+				.stream = {</div><div class='add'>+					.type = USB_BULK,</div><div class='add'>+					.count = 6,</div><div class='add'>+					.endpoint = 0x85,</div><div class='add'>+				},</div><div class='add'>+			}</div><div class='add'>+		},</div><div class='add'>+</div><div class='add'>+		.identify_state = af9015_identify_state,</div><div class='add'>+</div><div class='add'>+		.rc_query         = af9015_rc_query,</div><div class='add'>+		.rc_interval      = 150,</div><div class='add'>+</div><div class='add'>+		.i2c_algo = &amp;af9015_i2c_algo,</div><div class='add'>+</div><div class='add'>+		.num_device_descs = 6,</div><div class='add'>+		.devices = {</div><div class='add'>+			{</div><div class='add'>+				.name = "Xtensions XD-380",</div><div class='add'>+				.cold_ids = {&amp;af9015_usb_table[10], NULL},</div><div class='add'>+				.warm_ids = {NULL},</div><div class='add'>+			},</div><div class='add'>+			{</div><div class='add'>+				.name = "MSI DIGIVOX Duo",</div><div class='add'>+				.cold_ids = {&amp;af9015_usb_table[11], NULL},</div><div class='add'>+				.warm_ids = {NULL},</div><div class='add'>+			},</div><div class='add'>+			{</div><div class='add'>+				.name = "Fujitsu-Siemens Slim Mobile USB DVB-T",</div><div class='add'>+				.cold_ids = {&amp;af9015_usb_table[12], NULL},</div><div class='add'>+				.warm_ids = {NULL},</div><div class='add'>+			},</div><div class='add'>+			{</div><div class='add'>+				.name = "Telestar Starstick 2",</div><div class='add'>+				.cold_ids = {&amp;af9015_usb_table[13], NULL},</div><div class='add'>+				.warm_ids = {NULL},</div><div class='add'>+			},</div><div class='add'>+			{</div><div class='add'>+				.name = "AVerMedia A309",</div><div class='add'>+				.cold_ids = {&amp;af9015_usb_table[14], NULL},</div><div class='add'>+				.warm_ids = {NULL},</div><div class='add'>+			},</div><div class='add'>+			{</div><div class='add'>+				.name = "MSI Digi VOX mini III",</div><div class='add'>+				.cold_ids = {&amp;af9015_usb_table[15], NULL},</div><div class='add'>+				.warm_ids = {NULL},</div><div class='add'>+			},</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int af9015_usb_probe(struct usb_interface *intf,</div><div class='add'>+			    const struct usb_device_id *id)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+	struct dvb_usb_device *d = NULL;</div><div class='add'>+	struct usb_device *udev = interface_to_usbdev(intf);</div><div class='add'>+	u8 i;</div><div class='add'>+</div><div class='add'>+	deb_info("%s: interface:%d\n", __func__,</div><div class='add'>+		intf-&gt;cur_altsetting-&gt;desc.bInterfaceNumber);</div><div class='add'>+</div><div class='add'>+	/* interface 0 is used by DVB-T receiver and</div><div class='add'>+	   interface 1 is for remote controller (HID) */</div><div class='add'>+	if (intf-&gt;cur_altsetting-&gt;desc.bInterfaceNumber == 0) {</div><div class='add'>+		ret = af9015_read_config(udev);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; af9015_properties_count; i++) {</div><div class='add'>+			ret = dvb_usb_device_init(intf, &amp;af9015_properties[i],</div><div class='add'>+				THIS_MODULE, &amp;d, adapter_nr);</div><div class='add'>+			if (!ret)</div><div class='add'>+				break;</div><div class='add'>+			if (ret != -ENODEV)</div><div class='add'>+				return ret;</div><div class='add'>+		}</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		if (d)</div><div class='add'>+			ret = af9015_init(d);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void af9015_i2c_exit(struct dvb_usb_device *d)</div><div class='add'>+{</div><div class='add'>+	struct af9015_state *state = d-&gt;priv;</div><div class='add'>+	deb_info("%s: \n", __func__);</div><div class='add'>+</div><div class='add'>+	/* remove 2nd I2C adapter */</div><div class='add'>+	if (d-&gt;state &amp; DVB_USB_STATE_I2C)</div><div class='add'>+		i2c_del_adapter(&amp;state-&gt;i2c_adap);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void af9015_usb_device_exit(struct usb_interface *intf)</div><div class='add'>+{</div><div class='add'>+	struct dvb_usb_device *d = usb_get_intfdata(intf);</div><div class='add'>+	deb_info("%s: \n", __func__);</div><div class='add'>+</div><div class='add'>+	/* remove 2nd I2C adapter */</div><div class='add'>+	if (d != NULL &amp;&amp; d-&gt;desc != NULL)</div><div class='add'>+		af9015_i2c_exit(d);</div><div class='add'>+</div><div class='add'>+	dvb_usb_device_exit(intf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* usb specific object needed to register this driver with the usb subsystem */</div><div class='add'>+static struct usb_driver af9015_usb_driver = {</div><div class='add'>+	.name = "dvb_usb_af9015",</div><div class='add'>+	.probe = af9015_usb_probe,</div><div class='add'>+	.disconnect = af9015_usb_device_exit,</div><div class='add'>+	.id_table = af9015_usb_table,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* module stuff */</div><div class='add'>+static int __init af9015_usb_module_init(void)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	ret = usb_register(&amp;af9015_usb_driver);</div><div class='add'>+	if (ret)</div><div class='add'>+		err("module init failed:%d", ret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit af9015_usb_module_exit(void)</div><div class='add'>+{</div><div class='add'>+	/* deregister this driver from the USB subsystem */</div><div class='add'>+	usb_deregister(&amp;af9015_usb_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(af9015_usb_module_init);</div><div class='add'>+module_exit(af9015_usb_module_exit);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Antti Palosaari &lt;crope@iki.fi&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Driver for Afatech AF9015 DVB-T");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/af9015.h b/drivers/media/dvb/dvb-usb/af9015.h<br/>new file mode 100644<br/>index 000000000000..882e8a4b3681<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/dvb-usb/af9015.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/dvb-usb/af9015.h</a></div><div class='hunk'>@@ -0,0 +1,524 @@</div><div class='add'>+/*</div><div class='add'>+ * DVB USB Linux driver for Afatech AF9015 DVB-T USB2.0 receiver</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2007 Antti Palosaari &lt;crope@iki.fi&gt;</div><div class='add'>+ *</div><div class='add'>+ * Thanks to Afatech who kindly provided information.</div><div class='add'>+ *</div><div class='add'>+ *    This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *    it under the terms of the GNU General Public License as published by</div><div class='add'>+ *    the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ *    (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *    This program is distributed in the hope that it will be useful,</div><div class='add'>+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *    GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *    You should have received a copy of the GNU General Public License</div><div class='add'>+ *    along with this program; if not, write to the Free Software</div><div class='add'>+ *    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DVB_USB_AF9015_H_</div><div class='add'>+#define _DVB_USB_AF9015_H_</div><div class='add'>+</div><div class='add'>+#define DVB_USB_LOG_PREFIX "af9015"</div><div class='add'>+#include "dvb-usb.h"</div><div class='add'>+</div><div class='add'>+extern int dvb_usb_af9015_debug;</div><div class='add'>+#define deb_info(args...) dprintk(dvb_usb_af9015_debug, 0x01, args)</div><div class='add'>+#define deb_rc(args...)   dprintk(dvb_usb_af9015_debug, 0x02, args)</div><div class='add'>+#define deb_xfer(args...) dprintk(dvb_usb_af9015_debug, 0x04, args)</div><div class='add'>+#define deb_reg(args...)  dprintk(dvb_usb_af9015_debug, 0x08, args)</div><div class='add'>+#define deb_i2c(args...)  dprintk(dvb_usb_af9015_debug, 0x10, args)</div><div class='add'>+#define deb_fw(args...)   dprintk(dvb_usb_af9015_debug, 0x20, args)</div><div class='add'>+</div><div class='add'>+#define AF9015_I2C_EEPROM  0xa0</div><div class='add'>+#define AF9015_I2C_DEMOD   0x38</div><div class='add'>+#define AF9015_USB_TIMEOUT 2000</div><div class='add'>+</div><div class='add'>+/* EEPROM locations */</div><div class='add'>+#define AF9015_EEPROM_IR_MODE        0x18</div><div class='add'>+#define AF9015_EEPROM_IR_REMOTE_TYPE 0x34</div><div class='add'>+#define AF9015_EEPROM_TS_MODE        0x31</div><div class='add'>+#define AF9015_EEPROM_DEMOD2_I2C     0x32</div><div class='add'>+</div><div class='add'>+#define AF9015_EEPROM_SAW_BW1        0x35</div><div class='add'>+#define AF9015_EEPROM_XTAL_TYPE1     0x36</div><div class='add'>+#define AF9015_EEPROM_SPEC_INV1      0x37</div><div class='add'>+#define AF9015_EEPROM_IF1L           0x38</div><div class='add'>+#define AF9015_EEPROM_IF1H           0x39</div><div class='add'>+#define AF9015_EEPROM_MT2060_IF1L    0x3a</div><div class='add'>+#define AF9015_EEPROM_MT2060_IF1H    0x3b</div><div class='add'>+#define AF9015_EEPROM_TUNER_ID1      0x3c</div><div class='add'>+</div><div class='add'>+#define AF9015_EEPROM_SAW_BW2        0x45</div><div class='add'>+#define AF9015_EEPROM_XTAL_TYPE2     0x46</div><div class='add'>+#define AF9015_EEPROM_SPEC_INV2      0x47</div><div class='add'>+#define AF9015_EEPROM_IF2L           0x48</div><div class='add'>+#define AF9015_EEPROM_IF2H           0x49</div><div class='add'>+#define AF9015_EEPROM_MT2060_IF2L    0x4a</div><div class='add'>+#define AF9015_EEPROM_MT2060_IF2H    0x4b</div><div class='add'>+#define AF9015_EEPROM_TUNER_ID2      0x4c</div><div class='add'>+</div><div class='add'>+#define AF9015_EEPROM_OFFSET (AF9015_EEPROM_SAW_BW2 - AF9015_EEPROM_SAW_BW1)</div><div class='add'>+</div><div class='add'>+#define AF9015_GPIO_ON (1 &lt;&lt; 0)</div><div class='add'>+#define AF9015_GPIO_EN (1 &lt;&lt; 1)</div><div class='add'>+#define AF9015_GPIO_O  (1 &lt;&lt; 2)</div><div class='add'>+#define AF9015_GPIO_I  (1 &lt;&lt; 3)</div><div class='add'>+</div><div class='add'>+#define AF9015_GPIO_TUNER_ON  (AF9015_GPIO_ON|AF9015_GPIO_EN)</div><div class='add'>+#define AF9015_GPIO_TUNER_OFF (AF9015_GPIO_ON|AF9015_GPIO_EN|AF9015_GPIO_O)</div><div class='add'>+</div><div class='add'>+struct req_t {</div><div class='add'>+	u8  cmd;       /* [0] */</div><div class='add'>+	/*  seq */     /* [1] */</div><div class='add'>+	u8  i2c_addr;  /* [2] */</div><div class='add'>+	u16 addr;      /* [3|4] */</div><div class='add'>+	u8  mbox;      /* [5] */</div><div class='add'>+	u8  addr_len;  /* [6] */</div><div class='add'>+	u8  data_len;  /* [7] */</div><div class='add'>+	u8  *data;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum af9015_cmd {</div><div class='add'>+	GET_CONFIG           = 0x10,</div><div class='add'>+	DOWNLOAD_FIRMWARE    = 0x11,</div><div class='add'>+	BOOT                 = 0x13,</div><div class='add'>+	READ_MEMORY          = 0x20,</div><div class='add'>+	WRITE_MEMORY         = 0x21,</div><div class='add'>+	READ_WRITE_I2C       = 0x22,</div><div class='add'>+	COPY_FIRMWARE        = 0x23,</div><div class='add'>+	RECONNECT_USB        = 0x5a,</div><div class='add'>+	WRITE_VIRTUAL_MEMORY = 0x26,</div><div class='add'>+	GET_IR_CODE          = 0x27,</div><div class='add'>+	READ_I2C,</div><div class='add'>+	WRITE_I2C,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum af9015_ir_mode {</div><div class='add'>+	AF9015_IR_MODE_DISABLED = 0,</div><div class='add'>+	AF9015_IR_MODE_HID,</div><div class='add'>+	AF9015_IR_MODE_RLC,</div><div class='add'>+	AF9015_IR_MODE_RC6,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct af9015_state {</div><div class='add'>+	struct i2c_adapter i2c_adap; /* I2C adapter for 2nd FE */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct af9015_config {</div><div class='add'>+	u8  dual_mode:1;</div><div class='add'>+	u16 mt2060_if1[2];</div><div class='add'>+	u16 firmware_size;</div><div class='add'>+	u16 firmware_checksum;</div><div class='add'>+	u8  *ir_table;</div><div class='add'>+	u16 ir_table_size;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum af9015_remote {</div><div class='add'>+	AF9015_REMOTE_NONE                    = 0,</div><div class='add'>+	AF9015_REMOTE_A_LINK_DTU_M,</div><div class='add'>+	AF9015_REMOTE_MSI_DIGIVOX_MINI_II_V3,</div><div class='add'>+	AF9015_REMOTE_MYGICTV_U718,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Leadtek WinFast DTV Dongle Gold */</div><div class='add'>+static struct dvb_usb_rc_key af9015_rc_keys_leadtek[] = {</div><div class='add'>+	{ 0x00, 0x1e, KEY_1 },</div><div class='add'>+	{ 0x00, 0x1f, KEY_2 },</div><div class='add'>+	{ 0x00, 0x20, KEY_3 },</div><div class='add'>+	{ 0x00, 0x21, KEY_4 },</div><div class='add'>+	{ 0x00, 0x22, KEY_5 },</div><div class='add'>+	{ 0x00, 0x23, KEY_6 },</div><div class='add'>+	{ 0x00, 0x24, KEY_7 },</div><div class='add'>+	{ 0x00, 0x25, KEY_8 },</div><div class='add'>+	{ 0x00, 0x26, KEY_9 },</div><div class='add'>+	{ 0x00, 0x27, KEY_0 },</div><div class='add'>+	{ 0x00, 0x28, KEY_ENTER },</div><div class='add'>+	{ 0x00, 0x4f, KEY_VOLUMEUP },</div><div class='add'>+	{ 0x00, 0x50, KEY_VOLUMEDOWN },</div><div class='add'>+	{ 0x00, 0x51, KEY_CHANNELDOWN },</div><div class='add'>+	{ 0x00, 0x52, KEY_CHANNELUP },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u8 af9015_ir_table_leadtek[] = {</div><div class='add'>+	0x03, 0xfc, 0x00, 0xff, 0x1a, 0x01, 0x00,</div><div class='add'>+	0x03, 0xfc, 0x56, 0xa9, 0x00, 0x00, 0x00,</div><div class='add'>+	0x03, 0xfc, 0x4b, 0xb4, 0x00, 0x00, 0x00,</div><div class='add'>+	0x03, 0xfc, 0x4c, 0xb3, 0xb2, 0x04, 0x00,</div><div class='add'>+	0x03, 0xfc, 0x4d, 0xb2, 0x00, 0x00, 0x00,</div><div class='add'>+	0x03, 0xfc, 0x4e, 0xb1, 0x00, 0x00, 0x00,</div><div class='add'>+	0x03, 0xfc, 0x1f, 0xe0, 0x3d, 0x00, 0x00,</div><div class='add'>+	0x03, 0xfc, 0x40, 0xbf, 0x13, 0x01, 0x00,</div><div class='add'>+	0x03, 0xfc, 0x14, 0xeb, 0x10, 0x00, 0x00,</div><div class='add'>+	0x03, 0xfc, 0x49, 0xb6, 0x05, 0x01, 0x00,</div><div class='add'>+	0x03, 0xfc, 0x50, 0xaf, 0x29, 0x00, 0x00,</div><div class='add'>+	0x03, 0xfc, 0x0c, 0xf3, 0x52, 0x00, 0x00,</div><div class='add'>+	0x03, 0xfc, 0x03, 0xfc, 0x09, 0x00, 0x00,</div><div class='add'>+	0x03, 0xfc, 0x08, 0xf7, 0x50, 0x00, 0x00,</div><div class='add'>+	0x03, 0xfc, 0x13, 0xec, 0x28, 0x00, 0x00,</div><div class='add'>+	0x03, 0xfc, 0x04, 0xfb, 0x4f, 0x00, 0x00,</div><div class='add'>+	0x03, 0xfc, 0x4f, 0xb0, 0x0f, 0x01, 0x00,</div><div class='add'>+	0x03, 0xfc, 0x10, 0xef, 0x51, 0x00, 0x00,</div><div class='add'>+	0x03, 0xfc, 0x51, 0xae, 0x3f, 0x00, 0x00,</div><div class='add'>+	0x03, 0xfc, 0x42, 0xbd, 0x13, 0x00, 0x00,</div><div class='add'>+	0x03, 0xfc, 0x43, 0xbc, 0x00, 0x00, 0x00,</div><div class='add'>+	0x03, 0xfc, 0x44, 0xbb, 0x11, 0x00, 0x00,</div><div class='add'>+	0x03, 0xfc, 0x52, 0xad, 0x19, 0x00, 0x00,</div><div class='add'>+	0x03, 0xfc, 0x54, 0xab, 0x05, 0x00, 0x00,</div><div class='add'>+	0x03, 0xfc, 0x46, 0xb9, 0x29, 0x00, 0x00,</div><div class='add'>+	0x03, 0xfc, 0x55, 0xaa, 0x2b, 0x00, 0x00,</div><div class='add'>+	0x03, 0xfc, 0x53, 0xac, 0x41, 0x00, 0x00,</div><div class='add'>+	0x03, 0xfc, 0x05, 0xfa, 0x1e, 0x00, 0x00,</div><div class='add'>+	0x03, 0xfc, 0x06, 0xf9, 0x1f, 0x00, 0x00,</div><div class='add'>+	0x03, 0xfc, 0x07, 0xf8, 0x20, 0x00, 0x00,</div><div class='add'>+	0x03, 0xfc, 0x1e, 0xe1, 0x19, 0x00, 0x00,</div><div class='add'>+	0x03, 0xfc, 0x09, 0xf6, 0x21, 0x00, 0x00,</div><div class='add'>+	0x03, 0xfc, 0x0a, 0xf5, 0x22, 0x00, 0x00,</div><div class='add'>+	0x03, 0xfc, 0x0b, 0xf4, 0x23, 0x00, 0x00,</div><div class='add'>+	0x03, 0xfc, 0x1b, 0xe4, 0x16, 0x00, 0x00,</div><div class='add'>+	0x03, 0xfc, 0x0d, 0xf2, 0x24, 0x00, 0x00,</div><div class='add'>+	0x03, 0xfc, 0x0e, 0xf1, 0x25, 0x00, 0x00,</div><div class='add'>+	0x03, 0xfc, 0x0f, 0xf0, 0x26, 0x00, 0x00,</div><div class='add'>+	0x03, 0xfc, 0x16, 0xe9, 0x28, 0x00, 0x00,</div><div class='add'>+	0x03, 0xfc, 0x41, 0xbe, 0x37, 0x00, 0x00,</div><div class='add'>+	0x03, 0xfc, 0x12, 0xed, 0x27, 0x00, 0x00,</div><div class='add'>+	0x03, 0xfc, 0x11, 0xee, 0x2a, 0x00, 0x00,</div><div class='add'>+	0x03, 0xfc, 0x48, 0xb7, 0x2c, 0x00, 0x00,</div><div class='add'>+	0x03, 0xfc, 0x4a, 0xb5, 0x3c, 0x00, 0x00,</div><div class='add'>+	0x03, 0xfc, 0x47, 0xb8, 0x15, 0x01, 0x00,</div><div class='add'>+	0x03, 0xfc, 0x45, 0xba, 0x0b, 0x01, 0x00,</div><div class='add'>+	0x03, 0xfc, 0x5e, 0xa1, 0x43, 0x00, 0x00,</div><div class='add'>+	0x03, 0xfc, 0x5a, 0xa5, 0x42, 0x00, 0x00,</div><div class='add'>+	0x03, 0xfc, 0x5b, 0xa4, 0x4b, 0x00, 0x00,</div><div class='add'>+	0x03, 0xfc, 0x5f, 0xa0, 0x4e, 0x00, 0x00,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* TwinHan AzureWave AD-TU700(704J) */</div><div class='add'>+static struct dvb_usb_rc_key af9015_rc_keys_twinhan[] = {</div><div class='add'>+	{ 0x05, 0x3f, KEY_POWER },</div><div class='add'>+	{ 0x00, 0x19, KEY_FAVORITES },    /* Favorite List */</div><div class='add'>+	{ 0x00, 0x04, KEY_TEXT },         /* Teletext */</div><div class='add'>+	{ 0x00, 0x0e, KEY_POWER },</div><div class='add'>+	{ 0x00, 0x0e, KEY_INFO },         /* Preview */</div><div class='add'>+	{ 0x00, 0x08, KEY_EPG },          /* Info/EPG */</div><div class='add'>+	{ 0x00, 0x0f, KEY_LIST },         /* Record List */</div><div class='add'>+	{ 0x00, 0x1e, KEY_1 },</div><div class='add'>+	{ 0x00, 0x1f, KEY_2 },</div><div class='add'>+	{ 0x00, 0x20, KEY_3 },</div><div class='add'>+	{ 0x00, 0x21, KEY_4 },</div><div class='add'>+	{ 0x00, 0x22, KEY_5 },</div><div class='add'>+	{ 0x00, 0x23, KEY_6 },</div><div class='add'>+	{ 0x00, 0x24, KEY_7 },</div><div class='add'>+	{ 0x00, 0x25, KEY_8 },</div><div class='add'>+	{ 0x00, 0x26, KEY_9 },</div><div class='add'>+	{ 0x00, 0x27, KEY_0 },</div><div class='add'>+	{ 0x00, 0x29, KEY_CANCEL },       /* Cancel */</div><div class='add'>+	{ 0x00, 0x4c, KEY_CLEAR },        /* Clear */</div><div class='add'>+	{ 0x00, 0x2a, KEY_BACK },         /* Back */</div><div class='add'>+	{ 0x00, 0x2b, KEY_TAB },          /* Tab */</div><div class='add'>+	{ 0x00, 0x52, KEY_UP },           /* up arrow */</div><div class='add'>+	{ 0x00, 0x51, KEY_DOWN },         /* down arrow */</div><div class='add'>+	{ 0x00, 0x4f, KEY_RIGHT },        /* right arrow */</div><div class='add'>+	{ 0x00, 0x50, KEY_LEFT },         /* left arrow */</div><div class='add'>+	{ 0x00, 0x28, KEY_ENTER },        /* Enter / ok */</div><div class='add'>+	{ 0x02, 0x52, KEY_VOLUMEUP },</div><div class='add'>+	{ 0x02, 0x51, KEY_VOLUMEDOWN },</div><div class='add'>+	{ 0x00, 0x4e, KEY_CHANNELDOWN },</div><div class='add'>+	{ 0x00, 0x4b, KEY_CHANNELUP },</div><div class='add'>+	{ 0x00, 0x4a, KEY_RECORD },</div><div class='add'>+	{ 0x01, 0x11, KEY_PLAY },</div><div class='add'>+	{ 0x00, 0x17, KEY_PAUSE },</div><div class='add'>+	{ 0x00, 0x0c, KEY_REWIND },       /* FR &lt;&lt; */</div><div class='add'>+	{ 0x00, 0x11, KEY_FASTFORWARD },  /* FF &gt;&gt; */</div><div class='add'>+	{ 0x01, 0x15, KEY_PREVIOUS },     /* Replay */</div><div class='add'>+	{ 0x01, 0x0e, KEY_NEXT },         /* Skip */</div><div class='add'>+	{ 0x00, 0x13, KEY_CAMERA },       /* Capture */</div><div class='add'>+	{ 0x01, 0x0f, KEY_LANGUAGE },     /* SAP */</div><div class='add'>+	{ 0x01, 0x13, KEY_TV2 },          /* PIP */</div><div class='add'>+	{ 0x00, 0x1d, KEY_ZOOM },         /* Full Screen */</div><div class='add'>+	{ 0x01, 0x17, KEY_SUBTITLE },     /* Subtitle / CC */</div><div class='add'>+	{ 0x00, 0x10, KEY_MUTE },</div><div class='add'>+	{ 0x01, 0x19, KEY_AUDIO },        /* L/R */ /* TODO better event */</div><div class='add'>+	{ 0x01, 0x16, KEY_SLEEP },        /* Hibernate */</div><div class='add'>+	{ 0x01, 0x16, KEY_SWITCHVIDEOMODE },</div><div class='add'>+					  /* A/V */ /* TODO does not work */</div><div class='add'>+	{ 0x00, 0x06, KEY_AGAIN },        /* Recall */</div><div class='add'>+	{ 0x01, 0x16, KEY_KPPLUS },       /* Zoom+ */ /* TODO does not work */</div><div class='add'>+	{ 0x01, 0x16, KEY_KPMINUS },      /* Zoom- */ /* TODO does not work */</div><div class='add'>+	{ 0x02, 0x15, KEY_RED },</div><div class='add'>+	{ 0x02, 0x0a, KEY_GREEN },</div><div class='add'>+	{ 0x02, 0x1c, KEY_YELLOW },</div><div class='add'>+	{ 0x02, 0x05, KEY_BLUE },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u8 af9015_ir_table_twinhan[] = {</div><div class='add'>+	0x00, 0xff, 0x16, 0xe9, 0x3f, 0x05, 0x00,</div><div class='add'>+	0x00, 0xff, 0x07, 0xf8, 0x16, 0x01, 0x00,</div><div class='add'>+	0x00, 0xff, 0x14, 0xeb, 0x11, 0x01, 0x00,</div><div class='add'>+	0x00, 0xff, 0x1a, 0xe5, 0x4d, 0x00, 0x00,</div><div class='add'>+	0x00, 0xff, 0x4c, 0xb3, 0x17, 0x00, 0x00,</div><div class='add'>+	0x00, 0xff, 0x12, 0xed, 0x11, 0x00, 0x00,</div><div class='add'>+	0x00, 0xff, 0x40, 0xbf, 0x0c, 0x00, 0x00,</div><div class='add'>+	0x00, 0xff, 0x11, 0xee, 0x4a, 0x00, 0x00,</div><div class='add'>+	0x00, 0xff, 0x54, 0xab, 0x13, 0x00, 0x00,</div><div class='add'>+	0x00, 0xff, 0x41, 0xbe, 0x15, 0x01, 0x00,</div><div class='add'>+	0x00, 0xff, 0x42, 0xbd, 0x0e, 0x01, 0x00,</div><div class='add'>+	0x00, 0xff, 0x43, 0xbc, 0x17, 0x01, 0x00,</div><div class='add'>+	0x00, 0xff, 0x50, 0xaf, 0x0f, 0x01, 0x00,</div><div class='add'>+	0x00, 0xff, 0x4d, 0xb2, 0x1d, 0x00, 0x00,</div><div class='add'>+	0x00, 0xff, 0x47, 0xb8, 0x13, 0x01, 0x00,</div><div class='add'>+	0x00, 0xff, 0x05, 0xfa, 0x4b, 0x00, 0x00,</div><div class='add'>+	0x00, 0xff, 0x02, 0xfd, 0x4e, 0x00, 0x00,</div><div class='add'>+	0x00, 0xff, 0x0e, 0xf1, 0x06, 0x00, 0x00,</div><div class='add'>+	0x00, 0xff, 0x1e, 0xe1, 0x52, 0x02, 0x00,</div><div class='add'>+	0x00, 0xff, 0x0a, 0xf5, 0x51, 0x02, 0x00,</div><div class='add'>+	0x00, 0xff, 0x10, 0xef, 0x10, 0x00, 0x00,</div><div class='add'>+	0x00, 0xff, 0x49, 0xb6, 0x19, 0x01, 0x00,</div><div class='add'>+	0x00, 0xff, 0x15, 0xea, 0x27, 0x00, 0x00,</div><div class='add'>+	0x00, 0xff, 0x03, 0xfc, 0x1e, 0x00, 0x00,</div><div class='add'>+	0x00, 0xff, 0x01, 0xfe, 0x1f, 0x00, 0x00,</div><div class='add'>+	0x00, 0xff, 0x06, 0xf9, 0x20, 0x00, 0x00,</div><div class='add'>+	0x00, 0xff, 0x09, 0xf6, 0x21, 0x00, 0x00,</div><div class='add'>+	0x00, 0xff, 0x1d, 0xe2, 0x22, 0x00, 0x00,</div><div class='add'>+	0x00, 0xff, 0x1f, 0xe0, 0x23, 0x00, 0x00,</div><div class='add'>+	0x00, 0xff, 0x0d, 0xf2, 0x24, 0x00, 0x00,</div><div class='add'>+	0x00, 0xff, 0x19, 0xe6, 0x25, 0x00, 0x00,</div><div class='add'>+	0x00, 0xff, 0x1b, 0xe4, 0x26, 0x00, 0x00,</div><div class='add'>+	0x00, 0xff, 0x00, 0xff, 0x2b, 0x00, 0x00,</div><div class='add'>+	0x00, 0xff, 0x4a, 0xb5, 0x4c, 0x00, 0x00,</div><div class='add'>+	0x00, 0xff, 0x4b, 0xb4, 0x52, 0x00, 0x00,</div><div class='add'>+	0x00, 0xff, 0x51, 0xae, 0x51, 0x00, 0x00,</div><div class='add'>+	0x00, 0xff, 0x52, 0xad, 0x4f, 0x00, 0x00,</div><div class='add'>+	0x00, 0xff, 0x4e, 0xb1, 0x50, 0x00, 0x00,</div><div class='add'>+	0x00, 0xff, 0x0c, 0xf3, 0x29, 0x00, 0x00,</div><div class='add'>+	0x00, 0xff, 0x4f, 0xb0, 0x28, 0x00, 0x00,</div><div class='add'>+	0x00, 0xff, 0x13, 0xec, 0x2a, 0x00, 0x00,</div><div class='add'>+	0x00, 0xff, 0x17, 0xe8, 0x19, 0x00, 0x00,</div><div class='add'>+	0x00, 0xff, 0x04, 0xfb, 0x0f, 0x00, 0x00,</div><div class='add'>+	0x00, 0xff, 0x48, 0xb7, 0x0e, 0x00, 0x00,</div><div class='add'>+	0x00, 0xff, 0x0f, 0xf0, 0x04, 0x00, 0x00,</div><div class='add'>+	0x00, 0xff, 0x1c, 0xe3, 0x08, 0x00, 0x00,</div><div class='add'>+	0x00, 0xff, 0x18, 0xe7, 0x15, 0x02, 0x00,</div><div class='add'>+	0x00, 0xff, 0x53, 0xac, 0x0a, 0x02, 0x00,</div><div class='add'>+	0x00, 0xff, 0x5e, 0xa1, 0x1c, 0x02, 0x00,</div><div class='add'>+	0x00, 0xff, 0x5f, 0xa0, 0x05, 0x02, 0x00,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* A-Link DTU(m) */</div><div class='add'>+static struct dvb_usb_rc_key af9015_rc_keys_a_link[] = {</div><div class='add'>+	{ 0x00, 0x1e, KEY_1 },</div><div class='add'>+	{ 0x00, 0x1f, KEY_2 },</div><div class='add'>+	{ 0x00, 0x20, KEY_3 },</div><div class='add'>+	{ 0x00, 0x21, KEY_4 },</div><div class='add'>+	{ 0x00, 0x22, KEY_5 },</div><div class='add'>+	{ 0x00, 0x23, KEY_6 },</div><div class='add'>+	{ 0x00, 0x24, KEY_7 },</div><div class='add'>+	{ 0x00, 0x25, KEY_8 },</div><div class='add'>+	{ 0x00, 0x26, KEY_9 },</div><div class='add'>+	{ 0x00, 0x27, KEY_0 },</div><div class='add'>+	{ 0x00, 0x2e, KEY_CHANNELUP },</div><div class='add'>+	{ 0x00, 0x2d, KEY_CHANNELDOWN },</div><div class='add'>+	{ 0x04, 0x28, KEY_ZOOM },</div><div class='add'>+	{ 0x00, 0x41, KEY_MUTE },</div><div class='add'>+	{ 0x00, 0x42, KEY_VOLUMEDOWN },</div><div class='add'>+	{ 0x00, 0x43, KEY_VOLUMEUP },</div><div class='add'>+	{ 0x00, 0x44, KEY_GOTO },         /* jump */</div><div class='add'>+	{ 0x05, 0x45, KEY_POWER },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u8 af9015_ir_table_a_link[] = {</div><div class='add'>+	0x08, 0xf7, 0x12, 0xed, 0x45, 0x05, 0x00, /* power */</div><div class='add'>+	0x08, 0xf7, 0x1a, 0xe5, 0x41, 0x00, 0x00, /* mute */</div><div class='add'>+	0x08, 0xf7, 0x01, 0xfe, 0x1e, 0x00, 0x00, /* 1 */</div><div class='add'>+	0x08, 0xf7, 0x1c, 0xe3, 0x21, 0x00, 0x00, /* 4 */</div><div class='add'>+	0x08, 0xf7, 0x03, 0xfc, 0x24, 0x00, 0x00, /* 7 */</div><div class='add'>+	0x08, 0xf7, 0x05, 0xfa, 0x28, 0x04, 0x00, /* zoom */</div><div class='add'>+	0x08, 0xf7, 0x00, 0xff, 0x43, 0x00, 0x00, /* volume up */</div><div class='add'>+	0x08, 0xf7, 0x16, 0xe9, 0x42, 0x00, 0x00, /* volume down */</div><div class='add'>+	0x08, 0xf7, 0x0f, 0xf0, 0x1f, 0x00, 0x00, /* 2 */</div><div class='add'>+	0x08, 0xf7, 0x0d, 0xf2, 0x22, 0x00, 0x00, /* 5 */</div><div class='add'>+	0x08, 0xf7, 0x1b, 0xe4, 0x25, 0x00, 0x00, /* 8 */</div><div class='add'>+	0x08, 0xf7, 0x06, 0xf9, 0x27, 0x00, 0x00, /* 0 */</div><div class='add'>+	0x08, 0xf7, 0x14, 0xeb, 0x2e, 0x00, 0x00, /* channel up */</div><div class='add'>+	0x08, 0xf7, 0x1d, 0xe2, 0x2d, 0x00, 0x00, /* channel down */</div><div class='add'>+	0x08, 0xf7, 0x02, 0xfd, 0x20, 0x00, 0x00, /* 3 */</div><div class='add'>+	0x08, 0xf7, 0x18, 0xe7, 0x23, 0x00, 0x00, /* 6 */</div><div class='add'>+	0x08, 0xf7, 0x04, 0xfb, 0x26, 0x00, 0x00, /* 9 */</div><div class='add'>+	0x08, 0xf7, 0x07, 0xf8, 0x44, 0x00, 0x00, /* jump */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* MSI DIGIVOX mini II V3.0 */</div><div class='add'>+static struct dvb_usb_rc_key af9015_rc_keys_msi[] = {</div><div class='add'>+	{ 0x00, 0x1e, KEY_1 },</div><div class='add'>+	{ 0x00, 0x1f, KEY_2 },</div><div class='add'>+	{ 0x00, 0x20, KEY_3 },</div><div class='add'>+	{ 0x00, 0x21, KEY_4 },</div><div class='add'>+	{ 0x00, 0x22, KEY_5 },</div><div class='add'>+	{ 0x00, 0x23, KEY_6 },</div><div class='add'>+	{ 0x00, 0x24, KEY_7 },</div><div class='add'>+	{ 0x00, 0x25, KEY_8 },</div><div class='add'>+	{ 0x00, 0x26, KEY_9 },</div><div class='add'>+	{ 0x00, 0x27, KEY_0 },</div><div class='add'>+	{ 0x03, 0x0f, KEY_CHANNELUP },</div><div class='add'>+	{ 0x03, 0x0e, KEY_CHANNELDOWN },</div><div class='add'>+	{ 0x00, 0x42, KEY_VOLUMEDOWN },</div><div class='add'>+	{ 0x00, 0x43, KEY_VOLUMEUP },</div><div class='add'>+	{ 0x05, 0x45, KEY_POWER },</div><div class='add'>+	{ 0x00, 0x52, KEY_UP },           /* up */</div><div class='add'>+	{ 0x00, 0x51, KEY_DOWN },         /* down */</div><div class='add'>+	{ 0x00, 0x28, KEY_ENTER },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u8 af9015_ir_table_msi[] = {</div><div class='add'>+	0x03, 0xfc, 0x17, 0xe8, 0x45, 0x05, 0x00, /* power */</div><div class='add'>+	0x03, 0xfc, 0x0d, 0xf2, 0x51, 0x00, 0x00, /* down */</div><div class='add'>+	0x03, 0xfc, 0x03, 0xfc, 0x52, 0x00, 0x00, /* up */</div><div class='add'>+	0x03, 0xfc, 0x1a, 0xe5, 0x1e, 0x00, 0x00, /* 1 */</div><div class='add'>+	0x03, 0xfc, 0x02, 0xfd, 0x1f, 0x00, 0x00, /* 2 */</div><div class='add'>+	0x03, 0xfc, 0x04, 0xfb, 0x20, 0x00, 0x00, /* 3 */</div><div class='add'>+	0x03, 0xfc, 0x1c, 0xe3, 0x21, 0x00, 0x00, /* 4 */</div><div class='add'>+	0x03, 0xfc, 0x08, 0xf7, 0x22, 0x00, 0x00, /* 5 */</div><div class='add'>+	0x03, 0xfc, 0x1d, 0xe2, 0x23, 0x00, 0x00, /* 6 */</div><div class='add'>+	0x03, 0xfc, 0x11, 0xee, 0x24, 0x00, 0x00, /* 7 */</div><div class='add'>+	0x03, 0xfc, 0x0b, 0xf4, 0x25, 0x00, 0x00, /* 8 */</div><div class='add'>+	0x03, 0xfc, 0x10, 0xef, 0x26, 0x00, 0x00, /* 9 */</div><div class='add'>+	0x03, 0xfc, 0x09, 0xf6, 0x27, 0x00, 0x00, /* 0 */</div><div class='add'>+	0x03, 0xfc, 0x14, 0xeb, 0x43, 0x00, 0x00, /* volume up */</div><div class='add'>+	0x03, 0xfc, 0x1f, 0xe0, 0x42, 0x00, 0x00, /* volume down */</div><div class='add'>+	0x03, 0xfc, 0x15, 0xea, 0x0f, 0x03, 0x00, /* channel up */</div><div class='add'>+	0x03, 0xfc, 0x05, 0xfa, 0x0e, 0x03, 0x00, /* channel down */</div><div class='add'>+	0x03, 0xfc, 0x16, 0xe9, 0x28, 0x00, 0x00, /* enter */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* MYGICTV U718 */</div><div class='add'>+static struct dvb_usb_rc_key af9015_rc_keys_mygictv[] = {</div><div class='add'>+	{ 0x00, 0x3d, KEY_SWITCHVIDEOMODE },</div><div class='add'>+					  /* TV / AV */</div><div class='add'>+	{ 0x05, 0x45, KEY_POWER },</div><div class='add'>+	{ 0x00, 0x1e, KEY_1 },</div><div class='add'>+	{ 0x00, 0x1f, KEY_2 },</div><div class='add'>+	{ 0x00, 0x20, KEY_3 },</div><div class='add'>+	{ 0x00, 0x21, KEY_4 },</div><div class='add'>+	{ 0x00, 0x22, KEY_5 },</div><div class='add'>+	{ 0x00, 0x23, KEY_6 },</div><div class='add'>+	{ 0x00, 0x24, KEY_7 },</div><div class='add'>+	{ 0x00, 0x25, KEY_8 },</div><div class='add'>+	{ 0x00, 0x26, KEY_9 },</div><div class='add'>+	{ 0x00, 0x27, KEY_0 },</div><div class='add'>+	{ 0x00, 0x41, KEY_MUTE },</div><div class='add'>+	{ 0x00, 0x2a, KEY_ESC },          /* Esc */</div><div class='add'>+	{ 0x00, 0x2e, KEY_CHANNELUP },</div><div class='add'>+	{ 0x00, 0x2d, KEY_CHANNELDOWN },</div><div class='add'>+	{ 0x00, 0x42, KEY_VOLUMEDOWN },</div><div class='add'>+	{ 0x00, 0x43, KEY_VOLUMEUP },</div><div class='add'>+	{ 0x00, 0x52, KEY_UP },           /* up arrow */</div><div class='add'>+	{ 0x00, 0x51, KEY_DOWN },         /* down arrow */</div><div class='add'>+	{ 0x00, 0x4f, KEY_RIGHT },        /* right arrow */</div><div class='add'>+	{ 0x00, 0x50, KEY_LEFT },         /* left arrow */</div><div class='add'>+	{ 0x00, 0x28, KEY_ENTER },        /* ok */</div><div class='add'>+	{ 0x01, 0x15, KEY_RECORD },</div><div class='add'>+	{ 0x03, 0x13, KEY_PLAY },</div><div class='add'>+	{ 0x01, 0x13, KEY_PAUSE },</div><div class='add'>+	{ 0x01, 0x16, KEY_STOP },</div><div class='add'>+	{ 0x03, 0x07, KEY_REWIND },       /* FR &lt;&lt; */</div><div class='add'>+	{ 0x03, 0x09, KEY_FASTFORWARD },  /* FF &gt;&gt; */</div><div class='add'>+	{ 0x00, 0x3b, KEY_TIME },         /* TimeShift */</div><div class='add'>+	{ 0x00, 0x3e, KEY_CAMERA },       /* Snapshot */</div><div class='add'>+	{ 0x03, 0x16, KEY_CYCLEWINDOWS }, /* yellow, min / max */</div><div class='add'>+	{ 0x00, 0x00, KEY_ZOOM },         /* 'select' (?) */</div><div class='add'>+	{ 0x03, 0x16, KEY_SHUFFLE },      /* Shuffle */</div><div class='add'>+	{ 0x03, 0x45, KEY_POWER },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u8 af9015_ir_table_mygictv[] = {</div><div class='add'>+	0x02, 0xbd, 0x0c, 0xf3, 0x3d, 0x00, 0x00, /* TV / AV */</div><div class='add'>+	0x02, 0xbd, 0x14, 0xeb, 0x45, 0x05, 0x00, /* power */</div><div class='add'>+	0x02, 0xbd, 0x00, 0xff, 0x1e, 0x00, 0x00, /* 1 */</div><div class='add'>+	0x02, 0xbd, 0x01, 0xfe, 0x1f, 0x00, 0x00, /* 2 */</div><div class='add'>+	0x02, 0xbd, 0x02, 0xfd, 0x20, 0x00, 0x00, /* 3 */</div><div class='add'>+	0x02, 0xbd, 0x03, 0xfc, 0x21, 0x00, 0x00, /* 4 */</div><div class='add'>+	0x02, 0xbd, 0x04, 0xfb, 0x22, 0x00, 0x00, /* 5 */</div><div class='add'>+	0x02, 0xbd, 0x05, 0xfa, 0x23, 0x00, 0x00, /* 6 */</div><div class='add'>+	0x02, 0xbd, 0x06, 0xf9, 0x24, 0x00, 0x00, /* 7 */</div><div class='add'>+	0x02, 0xbd, 0x07, 0xf8, 0x25, 0x00, 0x00, /* 8 */</div><div class='add'>+	0x02, 0xbd, 0x08, 0xf7, 0x26, 0x00, 0x00, /* 9 */</div><div class='add'>+	0x02, 0xbd, 0x09, 0xf6, 0x27, 0x00, 0x00, /* 0 */</div><div class='add'>+	0x02, 0xbd, 0x0a, 0xf5, 0x41, 0x00, 0x00, /* mute */</div><div class='add'>+	0x02, 0xbd, 0x1c, 0xe3, 0x2a, 0x00, 0x00, /* esc */</div><div class='add'>+	0x02, 0xbd, 0x1f, 0xe0, 0x43, 0x00, 0x00, /* volume up */</div><div class='add'>+	0x02, 0xbd, 0x12, 0xed, 0x52, 0x00, 0x00, /* up arrow */</div><div class='add'>+	0x02, 0xbd, 0x11, 0xee, 0x50, 0x00, 0x00, /* left arrow */</div><div class='add'>+	0x02, 0xbd, 0x15, 0xea, 0x28, 0x00, 0x00, /* ok */</div><div class='add'>+	0x02, 0xbd, 0x10, 0xef, 0x4f, 0x00, 0x00, /* right arrow */</div><div class='add'>+	0x02, 0xbd, 0x13, 0xec, 0x51, 0x00, 0x00, /* down arrow */</div><div class='add'>+	0x02, 0xbd, 0x0e, 0xf1, 0x42, 0x00, 0x00, /* volume down */</div><div class='add'>+	0x02, 0xbd, 0x19, 0xe6, 0x15, 0x01, 0x00, /* record */</div><div class='add'>+	0x02, 0xbd, 0x1e, 0xe1, 0x13, 0x03, 0x00, /* play */</div><div class='add'>+	0x02, 0xbd, 0x16, 0xe9, 0x16, 0x01, 0x00, /* stop */</div><div class='add'>+	0x02, 0xbd, 0x0b, 0xf4, 0x28, 0x04, 0x00, /* yellow, min / max */</div><div class='add'>+	0x02, 0xbd, 0x0f, 0xf0, 0x3b, 0x00, 0x00, /* time shift */</div><div class='add'>+	0x02, 0xbd, 0x18, 0xe7, 0x2e, 0x00, 0x00, /* channel up */</div><div class='add'>+	0x02, 0xbd, 0x1a, 0xe5, 0x2d, 0x00, 0x00, /* channel down */</div><div class='add'>+	0x02, 0xbd, 0x17, 0xe8, 0x3e, 0x00, 0x00, /* snapshot */</div><div class='add'>+	0x02, 0xbd, 0x40, 0xbf, 0x13, 0x01, 0x00, /* pause */</div><div class='add'>+	0x02, 0xbd, 0x41, 0xbe, 0x09, 0x03, 0x00, /* FF &gt;&gt; */</div><div class='add'>+	0x02, 0xbd, 0x42, 0xbd, 0x07, 0x03, 0x00, /* FR &lt;&lt; */</div><div class='add'>+	0x02, 0xbd, 0x43, 0xbc, 0x00, 0x00, 0x00, /* 'select' (?) */</div><div class='add'>+	0x02, 0xbd, 0x44, 0xbb, 0x16, 0x03, 0x00, /* shuffle */</div><div class='add'>+	0x02, 0xbd, 0x45, 0xba, 0x45, 0x03, 0x00, /* power */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* KWorld PlusTV Dual DVB-T Stick (DVB-T 399U) */</div><div class='add'>+static u8 af9015_ir_table_kworld[] = {</div><div class='add'>+	0x86, 0x6b, 0x0c, 0xf3, 0x2e, 0x07, 0x00,</div><div class='add'>+	0x86, 0x6b, 0x16, 0xe9, 0x2d, 0x07, 0x00,</div><div class='add'>+	0x86, 0x6b, 0x1d, 0xe2, 0x37, 0x07, 0x00,</div><div class='add'>+	0x86, 0x6b, 0x00, 0xff, 0x1e, 0x07, 0x00,</div><div class='add'>+	0x86, 0x6b, 0x01, 0xfe, 0x1f, 0x07, 0x00,</div><div class='add'>+	0x86, 0x6b, 0x02, 0xfd, 0x20, 0x07, 0x00,</div><div class='add'>+	0x86, 0x6b, 0x03, 0xfc, 0x21, 0x07, 0x00,</div><div class='add'>+	0x86, 0x6b, 0x04, 0xfb, 0x22, 0x07, 0x00,</div><div class='add'>+	0x86, 0x6b, 0x05, 0xfa, 0x23, 0x07, 0x00,</div><div class='add'>+	0x86, 0x6b, 0x06, 0xf9, 0x24, 0x07, 0x00,</div><div class='add'>+	0x86, 0x6b, 0x07, 0xf8, 0x25, 0x07, 0x00,</div><div class='add'>+	0x86, 0x6b, 0x08, 0xf7, 0x26, 0x07, 0x00,</div><div class='add'>+	0x86, 0x6b, 0x09, 0xf6, 0x4d, 0x07, 0x00,</div><div class='add'>+	0x86, 0x6b, 0x0a, 0xf5, 0x4e, 0x07, 0x00,</div><div class='add'>+	0x86, 0x6b, 0x14, 0xeb, 0x4f, 0x07, 0x00,</div><div class='add'>+	0x86, 0x6b, 0x1e, 0xe1, 0x50, 0x07, 0x00,</div><div class='add'>+	0x86, 0x6b, 0x17, 0xe8, 0x52, 0x07, 0x00,</div><div class='add'>+	0x86, 0x6b, 0x1f, 0xe0, 0x51, 0x07, 0x00,</div><div class='add'>+	0x86, 0x6b, 0x0e, 0xf1, 0x0b, 0x07, 0x00,</div><div class='add'>+	0x86, 0x6b, 0x20, 0xdf, 0x0c, 0x07, 0x00,</div><div class='add'>+	0x86, 0x6b, 0x42, 0xbd, 0x0d, 0x07, 0x00,</div><div class='add'>+	0x86, 0x6b, 0x0b, 0xf4, 0x0e, 0x07, 0x00,</div><div class='add'>+	0x86, 0x6b, 0x43, 0xbc, 0x0f, 0x07, 0x00,</div><div class='add'>+	0x86, 0x6b, 0x10, 0xef, 0x10, 0x07, 0x00,</div><div class='add'>+	0x86, 0x6b, 0x21, 0xde, 0x11, 0x07, 0x00,</div><div class='add'>+	0x86, 0x6b, 0x13, 0xec, 0x12, 0x07, 0x00,</div><div class='add'>+	0x86, 0x6b, 0x11, 0xee, 0x13, 0x07, 0x00,</div><div class='add'>+	0x86, 0x6b, 0x12, 0xed, 0x14, 0x07, 0x00,</div><div class='add'>+	0x86, 0x6b, 0x19, 0xe6, 0x15, 0x07, 0x00,</div><div class='add'>+	0x86, 0x6b, 0x1a, 0xe5, 0x16, 0x07, 0x00,</div><div class='add'>+	0x86, 0x6b, 0x1b, 0xe4, 0x17, 0x07, 0x00,</div><div class='add'>+	0x86, 0x6b, 0x4b, 0xb4, 0x18, 0x07, 0x00,</div><div class='add'>+	0x86, 0x6b, 0x40, 0xbf, 0x19, 0x07, 0x00,</div><div class='add'>+	0x86, 0x6b, 0x44, 0xbb, 0x1a, 0x07, 0x00,</div><div class='add'>+	0x86, 0x6b, 0x41, 0xbe, 0x1b, 0x07, 0x00,</div><div class='add'>+	0x86, 0x6b, 0x22, 0xdd, 0x1c, 0x07, 0x00,</div><div class='add'>+	0x86, 0x6b, 0x15, 0xea, 0x1d, 0x07, 0x00,</div><div class='add'>+	0x86, 0x6b, 0x0f, 0xf0, 0x3f, 0x07, 0x00,</div><div class='add'>+	0x86, 0x6b, 0x1c, 0xe3, 0x40, 0x07, 0x00,</div><div class='add'>+	0x86, 0x6b, 0x4a, 0xb5, 0x41, 0x07, 0x00,</div><div class='add'>+	0x86, 0x6b, 0x48, 0xb7, 0x42, 0x07, 0x00,</div><div class='add'>+	0x86, 0x6b, 0x49, 0xb6, 0x43, 0x07, 0x00,</div><div class='add'>+	0x86, 0x6b, 0x18, 0xe7, 0x44, 0x07, 0x00,</div><div class='add'>+	0x86, 0x6b, 0x23, 0xdc, 0x45, 0x07, 0x00,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/anysee.c b/drivers/media/dvb/dvb-usb/anysee.c<br/>index 2f408d2e1ef3..c786359fba03 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/dvb-usb/anysee.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/dvb/dvb-usb/anysee.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/dvb-usb/anysee.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/dvb-usb/anysee.c</a></div><div class='hunk'>@@ -41,6 +41,9 @@</div><div class='ctx'> static int dvb_usb_anysee_debug;</div><div class='ctx'> module_param_named(debug, dvb_usb_anysee_debug, int, 0644);</div><div class='ctx'> MODULE_PARM_DESC(debug, "set debugging level" DVB_USB_DEBUG_STATUS);</div><div class='add'>+int dvb_usb_anysee_delsys;</div><div class='add'>+module_param_named(delsys, dvb_usb_anysee_delsys, int, 0644);</div><div class='add'>+MODULE_PARM_DESC(delsys, "select delivery mode (0=DVB-C, 1=DVB-T)");</div><div class='ctx'> DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);</div><div class='ctx'> </div><div class='ctx'> static struct mutex anysee_usb_mutex;</div><div class='hunk'>@@ -178,14 +181,14 @@ static int anysee_master_xfer(struct i2c_adapter *adap, struct i2c_msg *msg,</div><div class='ctx'> 			inc = 1;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (ret)</div><div class='del'>-			return ret;</div><div class='add'>+			break;</div><div class='ctx'> </div><div class='ctx'> 		i += inc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;d-&gt;i2c_mutex);</div><div class='ctx'> </div><div class='del'>-	return i;</div><div class='add'>+	return ret ? ret : i;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u32 anysee_i2c_func(struct i2c_adapter *adapter)</div><div class='hunk'>@@ -272,9 +275,11 @@ static int anysee_frontend_attach(struct dvb_usb_adapter *adap)</div><div class='ctx'> 	      model      demod     hw  firmware</div><div class='ctx'> 	   1. E30        MT352     02  0.2.1</div><div class='ctx'> 	   2. E30        ZL10353   02  0.2.1</div><div class='del'>-	   3. E30 Plus   ZL10353   06  0.1.0</div><div class='del'>-	   4. E30C Plus  TDA10023  0a  0.1.0    rev 0.2</div><div class='del'>-	   4. E30C Plus  TDA10023  0f  0.1.2    rev 0.4</div><div class='add'>+	   3. E30 Combo  ZL10353   0f  0.1.2    DVB-T/C combo</div><div class='add'>+	   4. E30 Plus   ZL10353   06  0.1.0</div><div class='add'>+	   5. E30C Plus  TDA10023  0a  0.1.0    rev 0.2</div><div class='add'>+	      E30C Plus  TDA10023  0f  0.1.2    rev 0.4</div><div class='add'>+	      E30 Combo  TDA10023  0f  0.1.2    DVB-T/C combo</div><div class='ctx'> 	*/</div><div class='ctx'> </div><div class='ctx'> 	/* Zarlink MT352 DVB-T demod inside of Samsung DNOS404ZH102A NIM */</div><div class='hunk'>@@ -293,6 +298,21 @@ static int anysee_frontend_attach(struct dvb_usb_adapter *adap)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* for E30 Combo Plus DVB-T demodulator */</div><div class='add'>+	if (dvb_usb_anysee_delsys) {</div><div class='add'>+		ret = anysee_write_reg(adap-&gt;dev, 0xb0, 0x01);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		/* Zarlink ZL10353 DVB-T demod */</div><div class='add'>+		adap-&gt;fe = dvb_attach(zl10353_attach, &amp;anysee_zl10353_config,</div><div class='add'>+				      &amp;adap-&gt;dev-&gt;i2c_adap);</div><div class='add'>+		if (adap-&gt;fe != NULL) {</div><div class='add'>+			state-&gt;tuner = DVB_PLL_SAMSUNG_DTOS403IH102A;</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* connect demod on IO port D for TDA10023 &amp; ZL10353 */</div><div class='ctx'> 	ret = anysee_write_reg(adap-&gt;dev, 0xb0, 0x25);</div><div class='ctx'> 	if (ret)</div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/cinergyT2-core.c b/drivers/media/dvb/dvb-usb/cinergyT2-core.c<br/>new file mode 100644<br/>index 000000000000..3ac9f74e9fbf<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/dvb-usb/cinergyT2-core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/dvb-usb/cinergyT2-core.c</a></div><div class='hunk'>@@ -0,0 +1,268 @@</div><div class='add'>+/*</div><div class='add'>+ * TerraTec Cinergy T2/qanu USB2 DVB-T adapter.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2007 Tomi Orava (tomimo@ncircle.nullnet.fi)</div><div class='add'>+ *</div><div class='add'>+ * Based on the dvb-usb-framework code and the</div><div class='add'>+ * original Terratec Cinergy T2 driver by:</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2004 Daniel Mack &lt;daniel@qanu.de&gt; and</div><div class='add'>+ *		    Holger Waechtler &lt;holger@qanu.de&gt;</div><div class='add'>+ *</div><div class='add'>+ *  Protocol Spec published on http://qanu.de/specs/terratec_cinergyT2.pdf</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "cinergyT2.h"</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* debug */</div><div class='add'>+int dvb_usb_cinergyt2_debug;</div><div class='add'>+int disable_remote;</div><div class='add'>+</div><div class='add'>+module_param_named(debug, dvb_usb_cinergyt2_debug, int, 0644);</div><div class='add'>+MODULE_PARM_DESC(debug, "set debugging level (1=info, xfer=2, rc=4 "</div><div class='add'>+		"(or-able)).");</div><div class='add'>+</div><div class='add'>+DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);</div><div class='add'>+</div><div class='add'>+struct cinergyt2_state {</div><div class='add'>+	u8 rc_counter;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* We are missing a release hook with usb_device data */</div><div class='add'>+struct dvb_usb_device *cinergyt2_usb_device;</div><div class='add'>+</div><div class='add'>+static struct dvb_usb_device_properties cinergyt2_properties;</div><div class='add'>+</div><div class='add'>+static int cinergyt2_streaming_ctrl(struct dvb_usb_adapter *adap, int enable)</div><div class='add'>+{</div><div class='add'>+	char buf[] = { CINERGYT2_EP1_CONTROL_STREAM_TRANSFER, enable ? 1 : 0 };</div><div class='add'>+	char result[64];</div><div class='add'>+	return dvb_usb_generic_rw(adap-&gt;dev, buf, sizeof(buf), result,</div><div class='add'>+				sizeof(result), 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cinergyt2_power_ctrl(struct dvb_usb_device *d, int enable)</div><div class='add'>+{</div><div class='add'>+	char buf[] = { CINERGYT2_EP1_SLEEP_MODE, enable ? 0 : 1 };</div><div class='add'>+	char state[3];</div><div class='add'>+	return dvb_usb_generic_rw(d, buf, sizeof(buf), state, sizeof(state), 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cinergyt2_frontend_attach(struct dvb_usb_adapter *adap)</div><div class='add'>+{</div><div class='add'>+	char query[] = { CINERGYT2_EP1_GET_FIRMWARE_VERSION };</div><div class='add'>+	char state[3];</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	adap-&gt;fe = cinergyt2_fe_attach(adap-&gt;dev);</div><div class='add'>+</div><div class='add'>+	ret = dvb_usb_generic_rw(adap-&gt;dev, query, sizeof(query), state,</div><div class='add'>+				sizeof(state), 0);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		deb_rc("cinergyt2_power_ctrl() Failed to retrieve sleep "</div><div class='add'>+			"state info\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Copy this pointer as we are gonna need it in the release phase */</div><div class='add'>+	cinergyt2_usb_device = adap-&gt;dev;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct dvb_usb_rc_key cinergyt2_rc_keys[] = {</div><div class='add'>+	{ 0x04,	0x01,	KEY_POWER },</div><div class='add'>+	{ 0x04,	0x02,	KEY_1 },</div><div class='add'>+	{ 0x04,	0x03,	KEY_2 },</div><div class='add'>+	{ 0x04,	0x04,	KEY_3 },</div><div class='add'>+	{ 0x04,	0x05,	KEY_4 },</div><div class='add'>+	{ 0x04,	0x06,	KEY_5 },</div><div class='add'>+	{ 0x04,	0x07,	KEY_6 },</div><div class='add'>+	{ 0x04,	0x08,	KEY_7 },</div><div class='add'>+	{ 0x04,	0x09,	KEY_8 },</div><div class='add'>+	{ 0x04,	0x0a,	KEY_9 },</div><div class='add'>+	{ 0x04,	0x0c,	KEY_0 },</div><div class='add'>+	{ 0x04,	0x0b,	KEY_VIDEO },</div><div class='add'>+	{ 0x04,	0x0d,	KEY_REFRESH },</div><div class='add'>+	{ 0x04,	0x0e,	KEY_SELECT },</div><div class='add'>+	{ 0x04,	0x0f,	KEY_EPG },</div><div class='add'>+	{ 0x04,	0x10,	KEY_UP },</div><div class='add'>+	{ 0x04,	0x14,	KEY_DOWN },</div><div class='add'>+	{ 0x04,	0x11,	KEY_LEFT },</div><div class='add'>+	{ 0x04,	0x13,	KEY_RIGHT },</div><div class='add'>+	{ 0x04,	0x12,	KEY_OK },</div><div class='add'>+	{ 0x04,	0x15,	KEY_TEXT },</div><div class='add'>+	{ 0x04,	0x16,	KEY_INFO },</div><div class='add'>+	{ 0x04,	0x17,	KEY_RED },</div><div class='add'>+	{ 0x04,	0x18,	KEY_GREEN },</div><div class='add'>+	{ 0x04,	0x19,	KEY_YELLOW },</div><div class='add'>+	{ 0x04,	0x1a,	KEY_BLUE },</div><div class='add'>+	{ 0x04,	0x1c,	KEY_VOLUMEUP },</div><div class='add'>+	{ 0x04,	0x1e,	KEY_VOLUMEDOWN },</div><div class='add'>+	{ 0x04,	0x1d,	KEY_MUTE },</div><div class='add'>+	{ 0x04,	0x1b,	KEY_CHANNELUP },</div><div class='add'>+	{ 0x04,	0x1f,	KEY_CHANNELDOWN },</div><div class='add'>+	{ 0x04,	0x40,	KEY_PAUSE },</div><div class='add'>+	{ 0x04,	0x4c,	KEY_PLAY },</div><div class='add'>+	{ 0x04,	0x58,	KEY_RECORD },</div><div class='add'>+	{ 0x04,	0x54,	KEY_PREVIOUS },</div><div class='add'>+	{ 0x04,	0x48,	KEY_STOP },</div><div class='add'>+	{ 0x04,	0x5c,	KEY_NEXT }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Number of keypresses to ignore before detect repeating */</div><div class='add'>+#define RC_REPEAT_DELAY 3</div><div class='add'>+</div><div class='add'>+static int repeatable_keys[] = {</div><div class='add'>+	KEY_UP,</div><div class='add'>+	KEY_DOWN,</div><div class='add'>+	KEY_LEFT,</div><div class='add'>+	KEY_RIGHT,</div><div class='add'>+	KEY_VOLUMEUP,</div><div class='add'>+	KEY_VOLUMEDOWN,</div><div class='add'>+	KEY_CHANNELUP,</div><div class='add'>+	KEY_CHANNELDOWN</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int cinergyt2_rc_query(struct dvb_usb_device *d, u32 *event, int *state)</div><div class='add'>+{</div><div class='add'>+	struct cinergyt2_state *st = d-&gt;priv;</div><div class='add'>+	u8 key[5] = {0, 0, 0, 0, 0}, cmd = CINERGYT2_EP1_GET_RC_EVENTS;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	*state = REMOTE_NO_KEY_PRESSED;</div><div class='add'>+</div><div class='add'>+	dvb_usb_generic_rw(d, &amp;cmd, 1, key, sizeof(key), 0);</div><div class='add'>+	if (key[4] == 0xff) {</div><div class='add'>+		/* key repeat */</div><div class='add'>+		st-&gt;rc_counter++;</div><div class='add'>+		if (st-&gt;rc_counter &gt; RC_REPEAT_DELAY) {</div><div class='add'>+			for (i = 0; i &lt; ARRAY_SIZE(repeatable_keys); i++) {</div><div class='add'>+				if (d-&gt;last_event == repeatable_keys[i]) {</div><div class='add'>+					*state = REMOTE_KEY_REPEAT;</div><div class='add'>+					*event = d-&gt;last_event;</div><div class='add'>+					deb_rc("repeat key, event %x\n",</div><div class='add'>+						   *event);</div><div class='add'>+					return 0;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+			deb_rc("repeated key (non repeatable)\n");</div><div class='add'>+		}</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* hack to pass checksum on the custom field */</div><div class='add'>+	key[2] = ~key[1];</div><div class='add'>+	dvb_usb_nec_rc_key_to_event(d, key, event, state);</div><div class='add'>+	if (key[0] != 0) {</div><div class='add'>+		if (*event != d-&gt;last_event)</div><div class='add'>+			st-&gt;rc_counter = 0;</div><div class='add'>+</div><div class='add'>+		deb_rc("key: %x %x %x %x %x\n",</div><div class='add'>+		       key[0], key[1], key[2], key[3], key[4]);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cinergyt2_usb_probe(struct usb_interface *intf,</div><div class='add'>+				const struct usb_device_id *id)</div><div class='add'>+{</div><div class='add'>+	return dvb_usb_device_init(intf, &amp;cinergyt2_properties,</div><div class='add'>+					THIS_MODULE, NULL, adapter_nr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static struct usb_device_id cinergyt2_usb_table[] = {</div><div class='add'>+	{ USB_DEVICE(USB_VID_TERRATEC, 0x0038) },</div><div class='add'>+	{ 0 }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_DEVICE_TABLE(usb, cinergyt2_usb_table);</div><div class='add'>+</div><div class='add'>+static struct dvb_usb_device_properties cinergyt2_properties = {</div><div class='add'>+	.size_of_priv = sizeof(struct cinergyt2_state),</div><div class='add'>+	.num_adapters = 1,</div><div class='add'>+	.adapter = {</div><div class='add'>+		{</div><div class='add'>+			.streaming_ctrl   = cinergyt2_streaming_ctrl,</div><div class='add'>+			.frontend_attach  = cinergyt2_frontend_attach,</div><div class='add'>+</div><div class='add'>+			/* parameter for the MPEG2-data transfer */</div><div class='add'>+			.stream = {</div><div class='add'>+				.type = USB_BULK,</div><div class='add'>+				.count = 5,</div><div class='add'>+				.endpoint = 0x02,</div><div class='add'>+				.u = {</div><div class='add'>+					.bulk = {</div><div class='add'>+						.buffersize = 512,</div><div class='add'>+					}</div><div class='add'>+				}</div><div class='add'>+			},</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	.power_ctrl       = cinergyt2_power_ctrl,</div><div class='add'>+</div><div class='add'>+	.rc_interval      = 50,</div><div class='add'>+	.rc_key_map       = cinergyt2_rc_keys,</div><div class='add'>+	.rc_key_map_size  = ARRAY_SIZE(cinergyt2_rc_keys),</div><div class='add'>+	.rc_query         = cinergyt2_rc_query,</div><div class='add'>+</div><div class='add'>+	.generic_bulk_ctrl_endpoint = 1,</div><div class='add'>+</div><div class='add'>+	.num_device_descs = 1,</div><div class='add'>+	.devices = {</div><div class='add'>+		{ .name = "TerraTec/qanu USB2.0 Highspeed DVB-T Receiver",</div><div class='add'>+		  .cold_ids = {NULL},</div><div class='add'>+		  .warm_ids = { &amp;cinergyt2_usb_table[0], NULL },</div><div class='add'>+		},</div><div class='add'>+		{ NULL },</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static struct usb_driver cinergyt2_driver = {</div><div class='add'>+	.name		= "cinergyT2",</div><div class='add'>+	.probe		= cinergyt2_usb_probe,</div><div class='add'>+	.disconnect	= dvb_usb_device_exit,</div><div class='add'>+	.id_table	= cinergyt2_usb_table</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init cinergyt2_usb_init(void)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = usb_register(&amp;cinergyt2_driver);</div><div class='add'>+	if (err) {</div><div class='add'>+		err("usb_register() failed! (err %i)\n", err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit cinergyt2_usb_exit(void)</div><div class='add'>+{</div><div class='add'>+	usb_deregister(&amp;cinergyt2_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(cinergyt2_usb_init);</div><div class='add'>+module_exit(cinergyt2_usb_exit);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("Terratec Cinergy T2 DVB-T driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_AUTHOR("Tomi Orava");</div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/cinergyT2-fe.c b/drivers/media/dvb/dvb-usb/cinergyT2-fe.c<br/>new file mode 100644<br/>index 000000000000..649f25cca49e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/dvb-usb/cinergyT2-fe.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/dvb-usb/cinergyT2-fe.c</a></div><div class='hunk'>@@ -0,0 +1,351 @@</div><div class='add'>+/*</div><div class='add'>+ * TerraTec Cinergy T2/qanu USB2 DVB-T adapter.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2007 Tomi Orava (tomimo@ncircle.nullnet.fi)</div><div class='add'>+ *</div><div class='add'>+ * Based on the dvb-usb-framework code and the</div><div class='add'>+ * original Terratec Cinergy T2 driver by:</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2004 Daniel Mack &lt;daniel@qanu.de&gt; and</div><div class='add'>+ *                  Holger Waechtler &lt;holger@qanu.de&gt;</div><div class='add'>+ *</div><div class='add'>+ *  Protocol Spec published on http://qanu.de/specs/terratec_cinergyT2.pdf</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "cinergyT2.h"</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *  convert linux-dvb frontend parameter set into TPS.</div><div class='add'>+ *  See ETSI ETS-300744, section 4.6.2, table 9 for details.</div><div class='add'>+ *</div><div class='add'>+ *  This function is probably reusable and may better get placed in a support</div><div class='add'>+ *  library.</div><div class='add'>+ *</div><div class='add'>+ *  We replace errornous fields by default TPS fields (the ones with value 0).</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static uint16_t compute_tps(struct dvb_frontend_parameters *p)</div><div class='add'>+{</div><div class='add'>+	struct dvb_ofdm_parameters *op = &amp;p-&gt;u.ofdm;</div><div class='add'>+	uint16_t tps = 0;</div><div class='add'>+</div><div class='add'>+	switch (op-&gt;code_rate_HP) {</div><div class='add'>+	case FEC_2_3:</div><div class='add'>+		tps |= (1 &lt;&lt; 7);</div><div class='add'>+		break;</div><div class='add'>+	case FEC_3_4:</div><div class='add'>+		tps |= (2 &lt;&lt; 7);</div><div class='add'>+		break;</div><div class='add'>+	case FEC_5_6:</div><div class='add'>+		tps |= (3 &lt;&lt; 7);</div><div class='add'>+		break;</div><div class='add'>+	case FEC_7_8:</div><div class='add'>+		tps |= (4 &lt;&lt; 7);</div><div class='add'>+		break;</div><div class='add'>+	case FEC_1_2:</div><div class='add'>+	case FEC_AUTO:</div><div class='add'>+	default:</div><div class='add'>+		/* tps |= (0 &lt;&lt; 7) */;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (op-&gt;code_rate_LP) {</div><div class='add'>+	case FEC_2_3:</div><div class='add'>+		tps |= (1 &lt;&lt; 4);</div><div class='add'>+		break;</div><div class='add'>+	case FEC_3_4:</div><div class='add'>+		tps |= (2 &lt;&lt; 4);</div><div class='add'>+		break;</div><div class='add'>+	case FEC_5_6:</div><div class='add'>+		tps |= (3 &lt;&lt; 4);</div><div class='add'>+		break;</div><div class='add'>+	case FEC_7_8:</div><div class='add'>+		tps |= (4 &lt;&lt; 4);</div><div class='add'>+		break;</div><div class='add'>+	case FEC_1_2:</div><div class='add'>+	case FEC_AUTO:</div><div class='add'>+	default:</div><div class='add'>+		/* tps |= (0 &lt;&lt; 4) */;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (op-&gt;constellation) {</div><div class='add'>+	case QAM_16:</div><div class='add'>+		tps |= (1 &lt;&lt; 13);</div><div class='add'>+		break;</div><div class='add'>+	case QAM_64:</div><div class='add'>+		tps |= (2 &lt;&lt; 13);</div><div class='add'>+		break;</div><div class='add'>+	case QPSK:</div><div class='add'>+	default:</div><div class='add'>+		/* tps |= (0 &lt;&lt; 13) */;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (op-&gt;transmission_mode) {</div><div class='add'>+	case TRANSMISSION_MODE_8K:</div><div class='add'>+		tps |= (1 &lt;&lt; 0);</div><div class='add'>+		break;</div><div class='add'>+	case TRANSMISSION_MODE_2K:</div><div class='add'>+	default:</div><div class='add'>+		/* tps |= (0 &lt;&lt; 0) */;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (op-&gt;guard_interval) {</div><div class='add'>+	case GUARD_INTERVAL_1_16:</div><div class='add'>+		tps |= (1 &lt;&lt; 2);</div><div class='add'>+		break;</div><div class='add'>+	case GUARD_INTERVAL_1_8:</div><div class='add'>+		tps |= (2 &lt;&lt; 2);</div><div class='add'>+		break;</div><div class='add'>+	case GUARD_INTERVAL_1_4:</div><div class='add'>+		tps |= (3 &lt;&lt; 2);</div><div class='add'>+		break;</div><div class='add'>+	case GUARD_INTERVAL_1_32:</div><div class='add'>+	default:</div><div class='add'>+		/* tps |= (0 &lt;&lt; 2) */;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (op-&gt;hierarchy_information) {</div><div class='add'>+	case HIERARCHY_1:</div><div class='add'>+		tps |= (1 &lt;&lt; 10);</div><div class='add'>+		break;</div><div class='add'>+	case HIERARCHY_2:</div><div class='add'>+		tps |= (2 &lt;&lt; 10);</div><div class='add'>+		break;</div><div class='add'>+	case HIERARCHY_4:</div><div class='add'>+		tps |= (3 &lt;&lt; 10);</div><div class='add'>+		break;</div><div class='add'>+	case HIERARCHY_NONE:</div><div class='add'>+	default:</div><div class='add'>+		/* tps |= (0 &lt;&lt; 10) */;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return tps;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct cinergyt2_fe_state {</div><div class='add'>+	struct dvb_frontend fe;</div><div class='add'>+	struct dvb_usb_device *d;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int cinergyt2_fe_read_status(struct dvb_frontend *fe,</div><div class='add'>+					fe_status_t *status)</div><div class='add'>+{</div><div class='add'>+	struct cinergyt2_fe_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	struct dvbt_get_status_msg result;</div><div class='add'>+	u8 cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = dvb_usb_generic_rw(state-&gt;d, cmd, sizeof(cmd), (u8 *)&amp;result,</div><div class='add'>+			sizeof(result), 0);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	*status = 0;</div><div class='add'>+</div><div class='add'>+	if (0xffff - le16_to_cpu(result.gain) &gt; 30)</div><div class='add'>+		*status |= FE_HAS_SIGNAL;</div><div class='add'>+	if (result.lock_bits &amp; (1 &lt;&lt; 6))</div><div class='add'>+		*status |= FE_HAS_LOCK;</div><div class='add'>+	if (result.lock_bits &amp; (1 &lt;&lt; 5))</div><div class='add'>+		*status |= FE_HAS_SYNC;</div><div class='add'>+	if (result.lock_bits &amp; (1 &lt;&lt; 4))</div><div class='add'>+		*status |= FE_HAS_CARRIER;</div><div class='add'>+	if (result.lock_bits &amp; (1 &lt;&lt; 1))</div><div class='add'>+		*status |= FE_HAS_VITERBI;</div><div class='add'>+</div><div class='add'>+	if ((*status &amp; (FE_HAS_CARRIER | FE_HAS_VITERBI | FE_HAS_SYNC)) !=</div><div class='add'>+			(FE_HAS_CARRIER | FE_HAS_VITERBI | FE_HAS_SYNC))</div><div class='add'>+		*status &amp;= ~FE_HAS_LOCK;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cinergyt2_fe_read_ber(struct dvb_frontend *fe, u32 *ber)</div><div class='add'>+{</div><div class='add'>+	struct cinergyt2_fe_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	struct dvbt_get_status_msg status;</div><div class='add'>+	char cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = dvb_usb_generic_rw(state-&gt;d, cmd, sizeof(cmd), (char *)&amp;status,</div><div class='add'>+				sizeof(status), 0);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	*ber = le32_to_cpu(status.viterbi_error_rate);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cinergyt2_fe_read_unc_blocks(struct dvb_frontend *fe, u32 *unc)</div><div class='add'>+{</div><div class='add'>+	struct cinergyt2_fe_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	struct dvbt_get_status_msg status;</div><div class='add'>+	u8 cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = dvb_usb_generic_rw(state-&gt;d, cmd, sizeof(cmd), (u8 *)&amp;status,</div><div class='add'>+				sizeof(status), 0);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		err("cinergyt2_fe_read_unc_blocks() Failed! (Error=%d)\n",</div><div class='add'>+			ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+	*unc = le32_to_cpu(status.uncorrected_block_count);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cinergyt2_fe_read_signal_strength(struct dvb_frontend *fe,</div><div class='add'>+						u16 *strength)</div><div class='add'>+{</div><div class='add'>+	struct cinergyt2_fe_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	struct dvbt_get_status_msg status;</div><div class='add'>+	char cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = dvb_usb_generic_rw(state-&gt;d, cmd, sizeof(cmd), (char *)&amp;status,</div><div class='add'>+				sizeof(status), 0);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		err("cinergyt2_fe_read_signal_strength() Failed!"</div><div class='add'>+			" (Error=%d)\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+	*strength = (0xffff - le16_to_cpu(status.gain));</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cinergyt2_fe_read_snr(struct dvb_frontend *fe, u16 *snr)</div><div class='add'>+{</div><div class='add'>+	struct cinergyt2_fe_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	struct dvbt_get_status_msg status;</div><div class='add'>+	char cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = dvb_usb_generic_rw(state-&gt;d, cmd, sizeof(cmd), (char *)&amp;status,</div><div class='add'>+				sizeof(status), 0);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		err("cinergyt2_fe_read_snr() Failed! (Error=%d)\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+	*snr = (status.snr &lt;&lt; 8) | status.snr;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cinergyt2_fe_init(struct dvb_frontend *fe)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cinergyt2_fe_sleep(struct dvb_frontend *fe)</div><div class='add'>+{</div><div class='add'>+	deb_info("cinergyt2_fe_sleep() Called\n");</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cinergyt2_fe_get_tune_settings(struct dvb_frontend *fe,</div><div class='add'>+				struct dvb_frontend_tune_settings *tune)</div><div class='add'>+{</div><div class='add'>+	tune-&gt;min_delay_ms = 800;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cinergyt2_fe_set_frontend(struct dvb_frontend *fe,</div><div class='add'>+				  struct dvb_frontend_parameters *fep)</div><div class='add'>+{</div><div class='add'>+	struct cinergyt2_fe_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	struct dvbt_set_parameters_msg param;</div><div class='add'>+	char result[2];</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	param.cmd = CINERGYT2_EP1_SET_TUNER_PARAMETERS;</div><div class='add'>+	param.tps = cpu_to_le16(compute_tps(fep));</div><div class='add'>+	param.freq = cpu_to_le32(fep-&gt;frequency / 1000);</div><div class='add'>+	param.bandwidth = 8 - fep-&gt;u.ofdm.bandwidth - BANDWIDTH_8_MHZ;</div><div class='add'>+</div><div class='add'>+	err = dvb_usb_generic_rw(state-&gt;d,</div><div class='add'>+			(char *)&amp;param, sizeof(param),</div><div class='add'>+			result, sizeof(result), 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		err("cinergyt2_fe_set_frontend() Failed! err=%d\n", err);</div><div class='add'>+</div><div class='add'>+	return (err &lt; 0) ? err : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cinergyt2_fe_get_frontend(struct dvb_frontend *fe,</div><div class='add'>+				  struct dvb_frontend_parameters *fep)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cinergyt2_fe_release(struct dvb_frontend *fe)</div><div class='add'>+{</div><div class='add'>+	struct cinergyt2_fe_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	if (state != NULL)</div><div class='add'>+		kfree(state);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct dvb_frontend_ops cinergyt2_fe_ops;</div><div class='add'>+</div><div class='add'>+struct dvb_frontend *cinergyt2_fe_attach(struct dvb_usb_device *d)</div><div class='add'>+{</div><div class='add'>+	struct cinergyt2_fe_state *s = kzalloc(sizeof(</div><div class='add'>+					struct cinergyt2_fe_state), GFP_KERNEL);</div><div class='add'>+	if (s == NULL)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	s-&gt;d = d;</div><div class='add'>+	memcpy(&amp;s-&gt;fe.ops, &amp;cinergyt2_fe_ops, sizeof(struct dvb_frontend_ops));</div><div class='add'>+	s-&gt;fe.demodulator_priv = s;</div><div class='add'>+	return &amp;s-&gt;fe;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static struct dvb_frontend_ops cinergyt2_fe_ops = {</div><div class='add'>+	.info = {</div><div class='add'>+		.name			= DRIVER_NAME,</div><div class='add'>+		.type			= FE_OFDM,</div><div class='add'>+		.frequency_min		= 174000000,</div><div class='add'>+		.frequency_max		= 862000000,</div><div class='add'>+		.frequency_stepsize	= 166667,</div><div class='add'>+		.caps = FE_CAN_INVERSION_AUTO | FE_CAN_FEC_1_2</div><div class='add'>+			| FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4</div><div class='add'>+			| FE_CAN_FEC_5_6 | FE_CAN_FEC_7_8</div><div class='add'>+			| FE_CAN_FEC_AUTO | FE_CAN_QPSK</div><div class='add'>+			| FE_CAN_QAM_16 | FE_CAN_QAM_64</div><div class='add'>+			| FE_CAN_QAM_AUTO</div><div class='add'>+			| FE_CAN_TRANSMISSION_MODE_AUTO</div><div class='add'>+			| FE_CAN_GUARD_INTERVAL_AUTO</div><div class='add'>+			| FE_CAN_HIERARCHY_AUTO</div><div class='add'>+			| FE_CAN_RECOVER</div><div class='add'>+			| FE_CAN_MUTE_TS</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	.release		= cinergyt2_fe_release,</div><div class='add'>+</div><div class='add'>+	.init			= cinergyt2_fe_init,</div><div class='add'>+	.sleep			= cinergyt2_fe_sleep,</div><div class='add'>+</div><div class='add'>+	.set_frontend		= cinergyt2_fe_set_frontend,</div><div class='add'>+	.get_frontend		= cinergyt2_fe_get_frontend,</div><div class='add'>+	.get_tune_settings	= cinergyt2_fe_get_tune_settings,</div><div class='add'>+</div><div class='add'>+	.read_status		= cinergyt2_fe_read_status,</div><div class='add'>+	.read_ber		= cinergyt2_fe_read_ber,</div><div class='add'>+	.read_signal_strength	= cinergyt2_fe_read_signal_strength,</div><div class='add'>+	.read_snr		= cinergyt2_fe_read_snr,</div><div class='add'>+	.read_ucblocks		= cinergyt2_fe_read_unc_blocks,</div><div class='add'>+};</div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/cinergyT2.h b/drivers/media/dvb/dvb-usb/cinergyT2.h<br/>new file mode 100644<br/>index 000000000000..11d79eb384c8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/dvb-usb/cinergyT2.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/dvb-usb/cinergyT2.h</a></div><div class='hunk'>@@ -0,0 +1,95 @@</div><div class='add'>+/*</div><div class='add'>+ * TerraTec Cinergy T2/qanu USB2 DVB-T adapter.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2007 Tomi Orava (tomimo@ncircle.nullnet.fi)</div><div class='add'>+ *</div><div class='add'>+ * Based on the dvb-usb-framework code and the</div><div class='add'>+ * original Terratec Cinergy T2 driver by:</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2004 Daniel Mack &lt;daniel@qanu.de&gt; and</div><div class='add'>+ *                  Holger Waechtler &lt;holger@qanu.de&gt;</div><div class='add'>+ *</div><div class='add'>+ *  Protocol Spec published on http://qanu.de/specs/terratec_cinergyT2.pdf</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License,  or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not,  write to the Free Software</div><div class='add'>+ * Foundation,  Inc.,  675 Mass Ave,  Cambridge,  MA 02139,  USA.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DVB_USB_CINERGYT2_H_</div><div class='add'>+#define _DVB_USB_CINERGYT2_H_</div><div class='add'>+</div><div class='add'>+#include &lt;linux/usb/input.h&gt;</div><div class='add'>+</div><div class='add'>+#define DVB_USB_LOG_PREFIX "cinergyT2"</div><div class='add'>+#include "dvb-usb.h"</div><div class='add'>+</div><div class='add'>+#define DRIVER_NAME "TerraTec/qanu USB2.0 Highspeed DVB-T Receiver"</div><div class='add'>+</div><div class='add'>+extern int dvb_usb_cinergyt2_debug;</div><div class='add'>+</div><div class='add'>+#define deb_info(args...)  dprintk(dvb_usb_cinergyt2_debug,  0x001, args)</div><div class='add'>+#define deb_xfer(args...)  dprintk(dvb_usb_cinergyt2_debug,  0x002, args)</div><div class='add'>+#define deb_pll(args...)   dprintk(dvb_usb_cinergyt2_debug,  0x004, args)</div><div class='add'>+#define deb_ts(args...)    dprintk(dvb_usb_cinergyt2_debug,  0x008, args)</div><div class='add'>+#define deb_err(args...)   dprintk(dvb_usb_cinergyt2_debug,  0x010, args)</div><div class='add'>+#define deb_rc(args...)    dprintk(dvb_usb_cinergyt2_debug,  0x020, args)</div><div class='add'>+#define deb_fw(args...)    dprintk(dvb_usb_cinergyt2_debug,  0x040, args)</div><div class='add'>+#define deb_mem(args...)   dprintk(dvb_usb_cinergyt2_debug,  0x080, args)</div><div class='add'>+#define deb_uxfer(args...) dprintk(dvb_usb_cinergyt2_debug,  0x100, args)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+enum cinergyt2_ep1_cmd {</div><div class='add'>+	CINERGYT2_EP1_PID_TABLE_RESET		= 0x01,</div><div class='add'>+	CINERGYT2_EP1_PID_SETUP			= 0x02,</div><div class='add'>+	CINERGYT2_EP1_CONTROL_STREAM_TRANSFER	= 0x03,</div><div class='add'>+	CINERGYT2_EP1_SET_TUNER_PARAMETERS	= 0x04,</div><div class='add'>+	CINERGYT2_EP1_GET_TUNER_STATUS		= 0x05,</div><div class='add'>+	CINERGYT2_EP1_START_SCAN		= 0x06,</div><div class='add'>+	CINERGYT2_EP1_CONTINUE_SCAN		= 0x07,</div><div class='add'>+	CINERGYT2_EP1_GET_RC_EVENTS		= 0x08,</div><div class='add'>+	CINERGYT2_EP1_SLEEP_MODE		= 0x09,</div><div class='add'>+	CINERGYT2_EP1_GET_FIRMWARE_VERSION	= 0x0A</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+struct dvbt_get_status_msg {</div><div class='add'>+	uint32_t freq;</div><div class='add'>+	uint8_t bandwidth;</div><div class='add'>+	uint16_t tps;</div><div class='add'>+	uint8_t flags;</div><div class='add'>+	uint16_t gain;</div><div class='add'>+	uint8_t snr;</div><div class='add'>+	uint32_t viterbi_error_rate;</div><div class='add'>+	uint32_t rs_error_rate;</div><div class='add'>+	uint32_t uncorrected_block_count;</div><div class='add'>+	uint8_t lock_bits;</div><div class='add'>+	uint8_t prev_lock_bits;</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+struct dvbt_set_parameters_msg {</div><div class='add'>+	uint8_t cmd;</div><div class='add'>+	uint32_t freq;</div><div class='add'>+	uint8_t bandwidth;</div><div class='add'>+	uint16_t tps;</div><div class='add'>+	uint8_t flags;</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+extern struct dvb_frontend *cinergyt2_fe_attach(struct dvb_usb_device *d);</div><div class='add'>+</div><div class='add'>+#endif /* _DVB_USB_CINERGYT2_H_ */</div><div class='add'>+</div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/cxusb.c b/drivers/media/dvb/dvb-usb/cxusb.c<br/>index 563400277a42..406d7fba369d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/dvb-usb/cxusb.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/dvb/dvb-usb/cxusb.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/dvb-usb/cxusb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/dvb-usb/cxusb.c</a></div><div class='hunk'>@@ -36,6 +36,9 @@</div><div class='ctx'> #include "tuner-xc2028.h"</div><div class='ctx'> #include "tuner-simple.h"</div><div class='ctx'> #include "mxl5005s.h"</div><div class='add'>+#include "dib7000p.h"</div><div class='add'>+#include "dib0070.h"</div><div class='add'>+#include "lgs8gl5.h"</div><div class='ctx'> </div><div class='ctx'> /* debug */</div><div class='ctx'> static int dvb_usb_cxusb_debug;</div><div class='hunk'>@@ -109,6 +112,25 @@ static void cxusb_nano2_led(struct dvb_usb_device *d, int onoff)</div><div class='ctx'> 	cxusb_bluebird_gpio_rw(d, 0x40, onoff ? 0 : 0x40);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int cxusb_d680_dmb_gpio_tuner(struct dvb_usb_device *d,</div><div class='add'>+		u8 addr, int onoff)</div><div class='add'>+{</div><div class='add'>+	u8  o[2] = {addr, onoff};</div><div class='add'>+	u8  i;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = cxusb_ctrl_msg(d, CMD_GPIO_WRITE, o, 2, &amp;i, 1);</div><div class='add'>+</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		return rc;</div><div class='add'>+	if (i == 0x01)</div><div class='add'>+		return 0;</div><div class='add'>+	else {</div><div class='add'>+		deb_info("gpio_write failed.\n");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* I2C */</div><div class='ctx'> static int cxusb_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[],</div><div class='ctx'> 			  int num)</div><div class='hunk'>@@ -262,6 +284,20 @@ static int cxusb_nano2_power_ctrl(struct dvb_usb_device *d, int onoff)</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int cxusb_d680_dmb_power_ctrl(struct dvb_usb_device *d, int onoff)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u8  b;</div><div class='add'>+	ret = cxusb_power_ctrl(d, onoff);</div><div class='add'>+	if (!onoff)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	msleep(128);</div><div class='add'>+	cxusb_ctrl_msg(d, CMD_DIGITAL, NULL, 0, &amp;b, 1);</div><div class='add'>+	msleep(100);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int cxusb_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff)</div><div class='ctx'> {</div><div class='ctx'> 	u8 buf[2] = { 0x03, 0x00 };</div><div class='hunk'>@@ -283,6 +319,67 @@ static int cxusb_aver_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void cxusb_d680_dmb_drain_message(struct dvb_usb_device *d)</div><div class='add'>+{</div><div class='add'>+	int       ep = d-&gt;props.generic_bulk_ctrl_endpoint;</div><div class='add'>+	const int timeout = 100;</div><div class='add'>+	const int junk_len = 32;</div><div class='add'>+	u8        *junk;</div><div class='add'>+	int       rd_count;</div><div class='add'>+</div><div class='add'>+	/* Discard remaining data in video pipe */</div><div class='add'>+	junk = kmalloc(junk_len, GFP_KERNEL);</div><div class='add'>+	if (!junk)</div><div class='add'>+		return;</div><div class='add'>+	while (1) {</div><div class='add'>+		if (usb_bulk_msg(d-&gt;udev,</div><div class='add'>+			usb_rcvbulkpipe(d-&gt;udev, ep),</div><div class='add'>+			junk, junk_len, &amp;rd_count, timeout) &lt; 0)</div><div class='add'>+			break;</div><div class='add'>+		if (!rd_count)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	kfree(junk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cxusb_d680_dmb_drain_video(struct dvb_usb_device *d)</div><div class='add'>+{</div><div class='add'>+	struct usb_data_stream_properties *p = &amp;d-&gt;props.adapter[0].stream;</div><div class='add'>+	const int timeout = 100;</div><div class='add'>+	const int junk_len = p-&gt;u.bulk.buffersize;</div><div class='add'>+	u8        *junk;</div><div class='add'>+	int       rd_count;</div><div class='add'>+</div><div class='add'>+	/* Discard remaining data in video pipe */</div><div class='add'>+	junk = kmalloc(junk_len, GFP_KERNEL);</div><div class='add'>+	if (!junk)</div><div class='add'>+		return;</div><div class='add'>+	while (1) {</div><div class='add'>+		if (usb_bulk_msg(d-&gt;udev,</div><div class='add'>+			usb_rcvbulkpipe(d-&gt;udev, p-&gt;endpoint),</div><div class='add'>+			junk, junk_len, &amp;rd_count, timeout) &lt; 0)</div><div class='add'>+			break;</div><div class='add'>+		if (!rd_count)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	kfree(junk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cxusb_d680_dmb_streaming_ctrl(</div><div class='add'>+		struct dvb_usb_adapter *adap, int onoff)</div><div class='add'>+{</div><div class='add'>+	if (onoff) {</div><div class='add'>+		u8 buf[2] = { 0x03, 0x00 };</div><div class='add'>+		cxusb_d680_dmb_drain_video(adap-&gt;dev);</div><div class='add'>+		return cxusb_ctrl_msg(adap-&gt;dev, CMD_STREAMING_ON,</div><div class='add'>+			buf, sizeof(buf), NULL, 0);</div><div class='add'>+	} else {</div><div class='add'>+		int ret = cxusb_ctrl_msg(adap-&gt;dev,</div><div class='add'>+			CMD_STREAMING_OFF, NULL, 0, NULL, 0);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int cxusb_rc_query(struct dvb_usb_device *d, u32 *event, int *state)</div><div class='ctx'> {</div><div class='ctx'> 	struct dvb_usb_rc_key *keymap = d-&gt;props.rc_key_map;</div><div class='hunk'>@@ -335,6 +432,32 @@ static int cxusb_bluebird2_rc_query(struct dvb_usb_device *d, u32 *event,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int cxusb_d680_dmb_rc_query(struct dvb_usb_device *d, u32 *event,</div><div class='add'>+		int *state)</div><div class='add'>+{</div><div class='add'>+	struct dvb_usb_rc_key *keymap = d-&gt;props.rc_key_map;</div><div class='add'>+	u8 ircode[2];</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	*event = 0;</div><div class='add'>+	*state = REMOTE_NO_KEY_PRESSED;</div><div class='add'>+</div><div class='add'>+	if (cxusb_ctrl_msg(d, 0x10, NULL, 0, ircode, 2) &lt; 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; d-&gt;props.rc_key_map_size; i++) {</div><div class='add'>+		if (keymap[i].custom == ircode[0] &amp;&amp;</div><div class='add'>+		    keymap[i].data == ircode[1]) {</div><div class='add'>+			*event = keymap[i].event;</div><div class='add'>+			*state = REMOTE_KEY_PRESSED;</div><div class='add'>+</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct dvb_usb_rc_key dvico_mce_rc_keys[] = {</div><div class='ctx'> 	{ 0xfe, 0x02, KEY_TV },</div><div class='ctx'> 	{ 0xfe, 0x0e, KEY_MP3 },</div><div class='hunk'>@@ -422,6 +545,44 @@ static struct dvb_usb_rc_key dvico_portable_rc_keys[] = {</div><div class='ctx'> 	{ 0xfc, 0x00, KEY_UNKNOWN },    /* HD */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct dvb_usb_rc_key d680_dmb_rc_keys[] = {</div><div class='add'>+	{ 0x00, 0x38, KEY_UNKNOWN },	/* TV/AV */</div><div class='add'>+	{ 0x08, 0x0c, KEY_ZOOM },</div><div class='add'>+	{ 0x08, 0x00, KEY_0 },</div><div class='add'>+	{ 0x00, 0x01, KEY_1 },</div><div class='add'>+	{ 0x08, 0x02, KEY_2 },</div><div class='add'>+	{ 0x00, 0x03, KEY_3 },</div><div class='add'>+	{ 0x08, 0x04, KEY_4 },</div><div class='add'>+	{ 0x00, 0x05, KEY_5 },</div><div class='add'>+	{ 0x08, 0x06, KEY_6 },</div><div class='add'>+	{ 0x00, 0x07, KEY_7 },</div><div class='add'>+	{ 0x08, 0x08, KEY_8 },</div><div class='add'>+	{ 0x00, 0x09, KEY_9 },</div><div class='add'>+	{ 0x00, 0x0a, KEY_MUTE },</div><div class='add'>+	{ 0x08, 0x29, KEY_BACK },</div><div class='add'>+	{ 0x00, 0x12, KEY_CHANNELUP },</div><div class='add'>+	{ 0x08, 0x13, KEY_CHANNELDOWN },</div><div class='add'>+	{ 0x00, 0x2b, KEY_VOLUMEUP },</div><div class='add'>+	{ 0x08, 0x2c, KEY_VOLUMEDOWN },</div><div class='add'>+	{ 0x00, 0x20, KEY_UP },</div><div class='add'>+	{ 0x08, 0x21, KEY_DOWN },</div><div class='add'>+	{ 0x00, 0x11, KEY_LEFT },</div><div class='add'>+	{ 0x08, 0x10, KEY_RIGHT },</div><div class='add'>+	{ 0x00, 0x0d, KEY_OK },</div><div class='add'>+	{ 0x08, 0x1f, KEY_RECORD },</div><div class='add'>+	{ 0x00, 0x17, KEY_PLAYPAUSE },</div><div class='add'>+	{ 0x08, 0x16, KEY_PLAYPAUSE },</div><div class='add'>+	{ 0x00, 0x0b, KEY_STOP },</div><div class='add'>+	{ 0x08, 0x27, KEY_FASTFORWARD },</div><div class='add'>+	{ 0x00, 0x26, KEY_REWIND },</div><div class='add'>+	{ 0x08, 0x1e, KEY_UNKNOWN },    /* Time Shift */</div><div class='add'>+	{ 0x00, 0x0e, KEY_UNKNOWN },    /* Snapshot */</div><div class='add'>+	{ 0x08, 0x2d, KEY_UNKNOWN },    /* Mouse Cursor */</div><div class='add'>+	{ 0x00, 0x0f, KEY_UNKNOWN },    /* Minimize/Maximize */</div><div class='add'>+	{ 0x08, 0x14, KEY_UNKNOWN },    /* Shuffle */</div><div class='add'>+	{ 0x00, 0x25, KEY_POWER },</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int cxusb_dee1601_demod_init(struct dvb_frontend* fe)</div><div class='ctx'> {</div><div class='ctx'> 	static u8 clock_config []  = { CLOCK_CTL,  0x38, 0x28 };</div><div class='hunk'>@@ -527,6 +688,24 @@ static struct mxl5005s_config aver_a868r_tuner = {</div><div class='ctx'> 	.AgcMasterByte   = 0x00,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* FIXME: needs tweaking */</div><div class='add'>+static struct mxl5005s_config d680_dmb_tuner = {</div><div class='add'>+	.i2c_address     = 0x63,</div><div class='add'>+	.if_freq         = 36125000UL,</div><div class='add'>+	.xtal_freq       = CRYSTAL_FREQ_16000000HZ,</div><div class='add'>+	.agc_mode        = MXL_SINGLE_AGC,</div><div class='add'>+	.tracking_filter = MXL_TF_C,</div><div class='add'>+	.rssi_enable     = MXL_RSSI_ENABLE,</div><div class='add'>+	.cap_select      = MXL_CAP_SEL_ENABLE,</div><div class='add'>+	.div_out         = MXL_DIV_OUT_4,</div><div class='add'>+	.clock_out       = MXL_CLOCK_OUT_DISABLE,</div><div class='add'>+	.output_load     = MXL5005S_IF_OUTPUT_LOAD_200_OHM,</div><div class='add'>+	.top		 = MXL5005S_TOP_25P2,</div><div class='add'>+	.mod_mode        = MXL_DIGITAL_MODE,</div><div class='add'>+	.if_mode         = MXL_ZERO_IF,</div><div class='add'>+	.AgcMasterByte   = 0x00,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* Callbacks for DVB USB */</div><div class='ctx'> static int cxusb_fmd1216me_tuner_attach(struct dvb_usb_adapter *adap)</div><div class='ctx'> {</div><div class='hunk'>@@ -563,7 +742,8 @@ static int cxusb_lgh064f_tuner_attach(struct dvb_usb_adapter *adap)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dvico_bluebird_xc2028_callback(void *ptr, int command, int arg)</div><div class='add'>+static int dvico_bluebird_xc2028_callback(void *ptr, int component,</div><div class='add'>+					  int command, int arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct dvb_usb_adapter *adap = ptr;</div><div class='ctx'> 	struct dvb_usb_device *d = adap-&gt;dev;</div><div class='hunk'>@@ -591,14 +771,16 @@ static int cxusb_dvico_xc3028_tuner_attach(struct dvb_usb_adapter *adap)</div><div class='ctx'> 	struct xc2028_config	  cfg = {</div><div class='ctx'> 		.i2c_adap  = &amp;adap-&gt;dev-&gt;i2c_adap,</div><div class='ctx'> 		.i2c_addr  = 0x61,</div><div class='del'>-		.callback  = dvico_bluebird_xc2028_callback,</div><div class='ctx'> 	};</div><div class='ctx'> 	static struct xc2028_ctrl ctl = {</div><div class='del'>-		.fname       = "xc3028-v27.fw",</div><div class='add'>+		.fname       = XC2028_DEFAULT_FIRMWARE,</div><div class='ctx'> 		.max_len     = 64,</div><div class='ctx'> 		.demod       = XC3028_FE_ZARLINK456,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	/* FIXME: generalize &amp; move to common area */</div><div class='add'>+	adap-&gt;fe-&gt;callback = dvico_bluebird_xc2028_callback;</div><div class='add'>+</div><div class='ctx'> 	fe = dvb_attach(xc2028_attach, adap-&gt;fe, &amp;cfg);</div><div class='ctx'> 	if (fe == NULL || fe-&gt;ops.tuner_ops.set_config == NULL)</div><div class='ctx'> 		return -EIO;</div><div class='hunk'>@@ -615,6 +797,14 @@ static int cxusb_mxl5003s_tuner_attach(struct dvb_usb_adapter *adap)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int cxusb_d680_dmb_tuner_attach(struct dvb_usb_adapter *adap)</div><div class='add'>+{</div><div class='add'>+	struct dvb_frontend *fe;</div><div class='add'>+	fe = dvb_attach(mxl5005s_attach, adap-&gt;fe,</div><div class='add'>+			&amp;adap-&gt;dev-&gt;i2c_adap, &amp;d680_dmb_tuner);</div><div class='add'>+	return (fe == NULL) ? -EIO : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int cxusb_cx22702_frontend_attach(struct dvb_usb_adapter *adap)</div><div class='ctx'> {</div><div class='ctx'> 	u8 b;</div><div class='hunk'>@@ -726,6 +916,159 @@ no_IR:</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct dibx000_agc_config dib7070_agc_config = {</div><div class='add'>+	.band_caps = BAND_UHF | BAND_VHF | BAND_LBAND | BAND_SBAND,</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * P_agc_use_sd_mod1=0, P_agc_use_sd_mod2=0, P_agc_freq_pwm_div=5,</div><div class='add'>+	 * P_agc_inv_pwm1=0, P_agc_inv_pwm2=0, P_agc_inh_dc_rv_est=0,</div><div class='add'>+	 * P_agc_time_est=3, P_agc_freeze=0, P_agc_nb_est=5, P_agc_write=0</div><div class='add'>+	 */</div><div class='add'>+	.setup = (0 &lt;&lt; 15) | (0 &lt;&lt; 14) | (5 &lt;&lt; 11) | (0 &lt;&lt; 10) | (0 &lt;&lt; 9) |</div><div class='add'>+		 (0 &lt;&lt; 8) | (3 &lt;&lt; 5) | (0 &lt;&lt; 4) | (5 &lt;&lt; 1) | (0 &lt;&lt; 0),</div><div class='add'>+	.inv_gain = 600,</div><div class='add'>+	.time_stabiliz = 10,</div><div class='add'>+	.alpha_level = 0,</div><div class='add'>+	.thlock = 118,</div><div class='add'>+	.wbd_inv = 0,</div><div class='add'>+	.wbd_ref = 3530,</div><div class='add'>+	.wbd_sel = 1,</div><div class='add'>+	.wbd_alpha = 5,</div><div class='add'>+	.agc1_max = 65535,</div><div class='add'>+	.agc1_min = 0,</div><div class='add'>+	.agc2_max = 65535,</div><div class='add'>+	.agc2_min = 0,</div><div class='add'>+	.agc1_pt1 = 0,</div><div class='add'>+	.agc1_pt2 = 40,</div><div class='add'>+	.agc1_pt3 = 183,</div><div class='add'>+	.agc1_slope1 = 206,</div><div class='add'>+	.agc1_slope2 = 255,</div><div class='add'>+	.agc2_pt1 = 72,</div><div class='add'>+	.agc2_pt2 = 152,</div><div class='add'>+	.agc2_slope1 = 88,</div><div class='add'>+	.agc2_slope2 = 90,</div><div class='add'>+	.alpha_mant = 17,</div><div class='add'>+	.alpha_exp = 27,</div><div class='add'>+	.beta_mant = 23,</div><div class='add'>+	.beta_exp = 51,</div><div class='add'>+	.perform_agc_softsplit = 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct dibx000_bandwidth_config dib7070_bw_config_12_mhz = {</div><div class='add'>+	.internal = 60000,</div><div class='add'>+	.sampling = 15000,</div><div class='add'>+	.pll_prediv = 1,</div><div class='add'>+	.pll_ratio = 20,</div><div class='add'>+	.pll_range = 3,</div><div class='add'>+	.pll_reset = 1,</div><div class='add'>+	.pll_bypass = 0,</div><div class='add'>+	.enable_refdiv = 0,</div><div class='add'>+	.bypclk_div = 0,</div><div class='add'>+	.IO_CLK_en_core = 1,</div><div class='add'>+	.ADClkSrc = 1,</div><div class='add'>+	.modulo = 2,</div><div class='add'>+	/* refsel, sel, freq_15k */</div><div class='add'>+	.sad_cfg = (3 &lt;&lt; 14) | (1 &lt;&lt; 12) | (524 &lt;&lt; 0),</div><div class='add'>+	.ifreq = (0 &lt;&lt; 25) | 0,</div><div class='add'>+	.timf = 20452225,</div><div class='add'>+	.xtal_hz = 12000000,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct dib7000p_config cxusb_dualdig4_rev2_config = {</div><div class='add'>+	.output_mode = OUTMODE_MPEG2_PAR_GATED_CLK,</div><div class='add'>+	.output_mpeg2_in_188_bytes = 1,</div><div class='add'>+</div><div class='add'>+	.agc_config_count = 1,</div><div class='add'>+	.agc = &amp;dib7070_agc_config,</div><div class='add'>+	.bw  = &amp;dib7070_bw_config_12_mhz,</div><div class='add'>+	.tuner_is_baseband = 1,</div><div class='add'>+	.spur_protect = 1,</div><div class='add'>+</div><div class='add'>+	.gpio_dir = 0xfcef,</div><div class='add'>+	.gpio_val = 0x0110,</div><div class='add'>+</div><div class='add'>+	.gpio_pwm_pos = DIB7000P_GPIO_DEFAULT_PWM_POS,</div><div class='add'>+</div><div class='add'>+	.hostbus_diversity = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int cxusb_dualdig4_rev2_frontend_attach(struct dvb_usb_adapter *adap)</div><div class='add'>+{</div><div class='add'>+	if (usb_set_interface(adap-&gt;dev-&gt;udev, 0, 1) &lt; 0)</div><div class='add'>+		err("set interface failed");</div><div class='add'>+</div><div class='add'>+	cxusb_ctrl_msg(adap-&gt;dev, CMD_DIGITAL, NULL, 0, NULL, 0);</div><div class='add'>+</div><div class='add'>+	cxusb_bluebird_gpio_pulse(adap-&gt;dev, 0x02, 1);</div><div class='add'>+</div><div class='add'>+	dib7000p_i2c_enumeration(&amp;adap-&gt;dev-&gt;i2c_adap, 1, 18,</div><div class='add'>+				 &amp;cxusb_dualdig4_rev2_config);</div><div class='add'>+</div><div class='add'>+	adap-&gt;fe = dvb_attach(dib7000p_attach, &amp;adap-&gt;dev-&gt;i2c_adap, 0x80,</div><div class='add'>+			      &amp;cxusb_dualdig4_rev2_config);</div><div class='add'>+	if (adap-&gt;fe == NULL)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dib7070_tuner_reset(struct dvb_frontend *fe, int onoff)</div><div class='add'>+{</div><div class='add'>+	return dib7000p_set_gpio(fe, 8, 0, !onoff);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dib7070_tuner_sleep(struct dvb_frontend *fe, int onoff)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct dib0070_config dib7070p_dib0070_config = {</div><div class='add'>+	.i2c_address = DEFAULT_DIB0070_I2C_ADDRESS,</div><div class='add'>+	.reset = dib7070_tuner_reset,</div><div class='add'>+	.sleep = dib7070_tuner_sleep,</div><div class='add'>+	.clock_khz = 12000,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dib0700_adapter_state {</div><div class='add'>+	int (*set_param_save) (struct dvb_frontend *,</div><div class='add'>+			       struct dvb_frontend_parameters *);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int dib7070_set_param_override(struct dvb_frontend *fe,</div><div class='add'>+				      struct dvb_frontend_parameters *fep)</div><div class='add'>+{</div><div class='add'>+	struct dvb_usb_adapter *adap = fe-&gt;dvb-&gt;priv;</div><div class='add'>+	struct dib0700_adapter_state *state = adap-&gt;priv;</div><div class='add'>+</div><div class='add'>+	u16 offset;</div><div class='add'>+	u8 band = BAND_OF_FREQUENCY(fep-&gt;frequency/1000);</div><div class='add'>+	switch (band) {</div><div class='add'>+	case BAND_VHF: offset = 950; break;</div><div class='add'>+	default:</div><div class='add'>+	case BAND_UHF: offset = 550; break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dib7000p_set_wbd_ref(fe, offset + dib0070_wbd_offset(fe));</div><div class='add'>+</div><div class='add'>+	return state-&gt;set_param_save(fe, fep);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cxusb_dualdig4_rev2_tuner_attach(struct dvb_usb_adapter *adap)</div><div class='add'>+{</div><div class='add'>+	struct dib0700_adapter_state *st = adap-&gt;priv;</div><div class='add'>+	struct i2c_adapter *tun_i2c =</div><div class='add'>+		dib7000p_get_i2c_master(adap-&gt;fe,</div><div class='add'>+					DIBX000_I2C_INTERFACE_TUNER, 1);</div><div class='add'>+</div><div class='add'>+	if (dvb_attach(dib0070_attach, adap-&gt;fe, tun_i2c,</div><div class='add'>+	    &amp;dib7070p_dib0070_config) == NULL)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	st-&gt;set_param_save = adap-&gt;fe-&gt;ops.tuner_ops.set_params;</div><div class='add'>+	adap-&gt;fe-&gt;ops.tuner_ops.set_params = dib7070_set_param_override;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int cxusb_nano2_frontend_attach(struct dvb_usb_adapter *adap)</div><div class='ctx'> {</div><div class='ctx'> 	if (usb_set_interface(adap-&gt;dev-&gt;udev, 0, 1) &lt; 0)</div><div class='hunk'>@@ -751,6 +1094,54 @@ static int cxusb_nano2_frontend_attach(struct dvb_usb_adapter *adap)</div><div class='ctx'> 	return -EIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct lgs8gl5_config lgs8gl5_cfg = {</div><div class='add'>+	.demod_address = 0x19,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int cxusb_d680_dmb_frontend_attach(struct dvb_usb_adapter *adap)</div><div class='add'>+{</div><div class='add'>+	struct dvb_usb_device *d = adap-&gt;dev;</div><div class='add'>+	int n;</div><div class='add'>+</div><div class='add'>+	/* Select required USB configuration */</div><div class='add'>+	if (usb_set_interface(d-&gt;udev, 0, 0) &lt; 0)</div><div class='add'>+		err("set interface failed");</div><div class='add'>+</div><div class='add'>+	/* Unblock all USB pipes */</div><div class='add'>+	usb_clear_halt(d-&gt;udev,</div><div class='add'>+		usb_sndbulkpipe(d-&gt;udev, d-&gt;props.generic_bulk_ctrl_endpoint));</div><div class='add'>+	usb_clear_halt(d-&gt;udev,</div><div class='add'>+		usb_rcvbulkpipe(d-&gt;udev, d-&gt;props.generic_bulk_ctrl_endpoint));</div><div class='add'>+	usb_clear_halt(d-&gt;udev,</div><div class='add'>+		usb_rcvbulkpipe(d-&gt;udev, d-&gt;props.adapter[0].stream.endpoint));</div><div class='add'>+</div><div class='add'>+	/* Drain USB pipes to avoid hang after reboot */</div><div class='add'>+	for (n = 0;  n &lt; 5;  n++) {</div><div class='add'>+		cxusb_d680_dmb_drain_message(d);</div><div class='add'>+		cxusb_d680_dmb_drain_video(d);</div><div class='add'>+		msleep(200);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Reset the tuner */</div><div class='add'>+	if (cxusb_d680_dmb_gpio_tuner(d, 0x07, 0) &lt; 0) {</div><div class='add'>+		err("clear tuner gpio failed");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+	msleep(100);</div><div class='add'>+	if (cxusb_d680_dmb_gpio_tuner(d, 0x07, 1) &lt; 0) {</div><div class='add'>+		err("set tuner gpio failed");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+	msleep(100);</div><div class='add'>+</div><div class='add'>+	/* Attach frontend */</div><div class='add'>+	adap-&gt;fe = dvb_attach(lgs8gl5_attach, &amp;lgs8gl5_cfg, &amp;d-&gt;i2c_adap);</div><div class='add'>+	if (adap-&gt;fe == NULL)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * DViCO has shipped two devices with the same USB ID, but only one of them</div><div class='ctx'>  * needs a firmware download.  Check the device class details to see if they</div><div class='hunk'>@@ -826,9 +1217,11 @@ static struct dvb_usb_device_properties cxusb_bluebird_dee1601_properties;</div><div class='ctx'> static struct dvb_usb_device_properties cxusb_bluebird_lgz201_properties;</div><div class='ctx'> static struct dvb_usb_device_properties cxusb_bluebird_dtt7579_properties;</div><div class='ctx'> static struct dvb_usb_device_properties cxusb_bluebird_dualdig4_properties;</div><div class='add'>+static struct dvb_usb_device_properties cxusb_bluebird_dualdig4_rev2_properties;</div><div class='ctx'> static struct dvb_usb_device_properties cxusb_bluebird_nano2_properties;</div><div class='ctx'> static struct dvb_usb_device_properties cxusb_bluebird_nano2_needsfirmware_properties;</div><div class='ctx'> static struct dvb_usb_device_properties cxusb_aver_a868r_properties;</div><div class='add'>+static struct dvb_usb_device_properties cxusb_d680_dmb_properties;</div><div class='ctx'> </div><div class='ctx'> static int cxusb_probe(struct usb_interface *intf,</div><div class='ctx'> 		       const struct usb_device_id *id)</div><div class='hunk'>@@ -852,6 +1245,11 @@ static int cxusb_probe(struct usb_interface *intf,</div><div class='ctx'> 				     THIS_MODULE, NULL, adapter_nr) ||</div><div class='ctx'> 	    0 == dvb_usb_device_init(intf, &amp;cxusb_aver_a868r_properties,</div><div class='ctx'> 				     THIS_MODULE, NULL, adapter_nr) ||</div><div class='add'>+	    0 == dvb_usb_device_init(intf,</div><div class='add'>+				     &amp;cxusb_bluebird_dualdig4_rev2_properties,</div><div class='add'>+				     THIS_MODULE, NULL, adapter_nr) ||</div><div class='add'>+	    0 == dvb_usb_device_init(intf, &amp;cxusb_d680_dmb_properties,</div><div class='add'>+				     THIS_MODULE, NULL, adapter_nr) ||</div><div class='ctx'> 	    0)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -876,6 +1274,8 @@ static struct usb_device_id cxusb_table [] = {</div><div class='ctx'> 	{ USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_DVB_T_NANO_2) },</div><div class='ctx'> 	{ USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_DVB_T_NANO_2_NFW_WARM) },</div><div class='ctx'> 	{ USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_VOLAR_A868R) },</div><div class='add'>+	{ USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_DUAL_4_REV_2) },</div><div class='add'>+	{ USB_DEVICE(USB_VID_CONEXANT, USB_PID_CONEXANT_D680_DMB) },</div><div class='ctx'> 	{}		/* Terminating entry */</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE (usb, cxusb_table);</div><div class='hunk'>@@ -1321,6 +1721,104 @@ static struct dvb_usb_device_properties cxusb_aver_a868r_properties = {</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static</div><div class='add'>+struct dvb_usb_device_properties cxusb_bluebird_dualdig4_rev2_properties = {</div><div class='add'>+	.caps = DVB_USB_IS_AN_I2C_ADAPTER,</div><div class='add'>+</div><div class='add'>+	.usb_ctrl         = CYPRESS_FX2,</div><div class='add'>+</div><div class='add'>+	.size_of_priv     = sizeof(struct cxusb_state),</div><div class='add'>+</div><div class='add'>+	.num_adapters = 1,</div><div class='add'>+	.adapter = {</div><div class='add'>+		{</div><div class='add'>+			.streaming_ctrl  = cxusb_streaming_ctrl,</div><div class='add'>+			.frontend_attach = cxusb_dualdig4_rev2_frontend_attach,</div><div class='add'>+			.tuner_attach    = cxusb_dualdig4_rev2_tuner_attach,</div><div class='add'>+			.size_of_priv    = sizeof(struct dib0700_adapter_state),</div><div class='add'>+			/* parameter for the MPEG2-data transfer */</div><div class='add'>+			.stream = {</div><div class='add'>+				.type = USB_BULK,</div><div class='add'>+				.count = 7,</div><div class='add'>+				.endpoint = 0x02,</div><div class='add'>+				.u = {</div><div class='add'>+					.bulk = {</div><div class='add'>+						.buffersize = 4096,</div><div class='add'>+					}</div><div class='add'>+				}</div><div class='add'>+			},</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	.power_ctrl       = cxusb_bluebird_power_ctrl,</div><div class='add'>+</div><div class='add'>+	.i2c_algo         = &amp;cxusb_i2c_algo,</div><div class='add'>+</div><div class='add'>+	.generic_bulk_ctrl_endpoint = 0x01,</div><div class='add'>+</div><div class='add'>+	.rc_interval      = 100,</div><div class='add'>+	.rc_key_map       = dvico_mce_rc_keys,</div><div class='add'>+	.rc_key_map_size  = ARRAY_SIZE(dvico_mce_rc_keys),</div><div class='add'>+	.rc_query         = cxusb_rc_query,</div><div class='add'>+</div><div class='add'>+	.num_device_descs = 1,</div><div class='add'>+	.devices = {</div><div class='add'>+		{   "DViCO FusionHDTV DVB-T Dual Digital 4 (rev 2)",</div><div class='add'>+			{ NULL },</div><div class='add'>+			{ &amp;cxusb_table[17], NULL },</div><div class='add'>+		},</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct dvb_usb_device_properties cxusb_d680_dmb_properties = {</div><div class='add'>+	.caps = DVB_USB_IS_AN_I2C_ADAPTER,</div><div class='add'>+</div><div class='add'>+	.usb_ctrl         = CYPRESS_FX2,</div><div class='add'>+</div><div class='add'>+	.size_of_priv     = sizeof(struct cxusb_state),</div><div class='add'>+</div><div class='add'>+	.num_adapters = 1,</div><div class='add'>+	.adapter = {</div><div class='add'>+		{</div><div class='add'>+			.streaming_ctrl   = cxusb_d680_dmb_streaming_ctrl,</div><div class='add'>+			.frontend_attach  = cxusb_d680_dmb_frontend_attach,</div><div class='add'>+			.tuner_attach     = cxusb_d680_dmb_tuner_attach,</div><div class='add'>+</div><div class='add'>+			/* parameter for the MPEG2-data transfer */</div><div class='add'>+			.stream = {</div><div class='add'>+				.type = USB_BULK,</div><div class='add'>+				.count = 5,</div><div class='add'>+				.endpoint = 0x02,</div><div class='add'>+				.u = {</div><div class='add'>+					.bulk = {</div><div class='add'>+						.buffersize = 8192,</div><div class='add'>+					}</div><div class='add'>+				}</div><div class='add'>+			},</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	.power_ctrl       = cxusb_d680_dmb_power_ctrl,</div><div class='add'>+</div><div class='add'>+	.i2c_algo         = &amp;cxusb_i2c_algo,</div><div class='add'>+</div><div class='add'>+	.generic_bulk_ctrl_endpoint = 0x01,</div><div class='add'>+</div><div class='add'>+	.rc_interval      = 100,</div><div class='add'>+	.rc_key_map       = d680_dmb_rc_keys,</div><div class='add'>+	.rc_key_map_size  = ARRAY_SIZE(d680_dmb_rc_keys),</div><div class='add'>+	.rc_query         = cxusb_d680_dmb_rc_query,</div><div class='add'>+</div><div class='add'>+	.num_device_descs = 1,</div><div class='add'>+	.devices = {</div><div class='add'>+		{</div><div class='add'>+			"Conexant DMB-TH Stick",</div><div class='add'>+			{ NULL },</div><div class='add'>+			{ &amp;cxusb_table[18], NULL },</div><div class='add'>+		},</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct usb_driver cxusb_driver = {</div><div class='ctx'> 	.name		= "dvb_usb_cxusb",</div><div class='ctx'> 	.probe		= cxusb_probe,</div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/dib0700.h b/drivers/media/dvb/dvb-usb/dib0700.h<br/>index 66d4dc6ba46f..739193943c17 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/dvb-usb/dib0700.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/dvb/dvb-usb/dib0700.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/dvb-usb/dib0700.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/dvb-usb/dib0700.h</a></div><div class='hunk'>@@ -31,6 +31,8 @@ extern int dvb_usb_dib0700_debug;</div><div class='ctx'> 	// 2 Byte: MPEG2 mode:  4MSB(1 = Master Mode, 0 = Slave Mode) 4LSB(Channel 1 = bit0, Channel 2 = bit1)</div><div class='ctx'> 	// 2 Byte: Analog mode: 4MSB(0 = 625 lines, 1 = 525 lines)    4LSB(     "                "           )</div><div class='ctx'> #define REQUEST_SET_RC       0x11</div><div class='add'>+#define REQUEST_NEW_I2C_READ 0x12</div><div class='add'>+#define REQUEST_NEW_I2C_WRITE 0x13</div><div class='ctx'> #define REQUEST_GET_VERSION  0x15</div><div class='ctx'> </div><div class='ctx'> struct dib0700_state {</div><div class='hunk'>@@ -39,6 +41,8 @@ struct dib0700_state {</div><div class='ctx'> 	u8 rc_toggle;</div><div class='ctx'> 	u8 rc_counter;</div><div class='ctx'> 	u8 is_dib7000pc;</div><div class='add'>+	u8 fw_use_new_i2c_api;</div><div class='add'>+	u8 disable_streaming_master_mode;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern int dib0700_set_gpio(struct dvb_usb_device *, enum dib07x0_gpios gpio, u8 gpio_dir, u8 gpio_val);</div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/dib0700_core.c b/drivers/media/dvb/dvb-usb/dib0700_core.c<br/>index 595a04696c87..dd53cee3896d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/dvb-usb/dib0700_core.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/dvb/dvb-usb/dib0700_core.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/dvb-usb/dib0700_core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/dvb-usb/dib0700_core.c</a></div><div class='hunk'>@@ -82,9 +82,98 @@ int dib0700_set_gpio(struct dvb_usb_device *d, enum dib07x0_gpios gpio, u8 gpio_</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * I2C master xfer function</div><div class='add'>+ * I2C master xfer function (supported in 1.20 firmware)</div><div class='ctx'>  */</div><div class='del'>-static int dib0700_i2c_xfer(struct i2c_adapter *adap,struct i2c_msg *msg,int num)</div><div class='add'>+static int dib0700_i2c_xfer_new(struct i2c_adapter *adap, struct i2c_msg *msg,</div><div class='add'>+				int num)</div><div class='add'>+{</div><div class='add'>+	/* The new i2c firmware messages are more reliable and in particular</div><div class='add'>+	   properly support i2c read calls not preceded by a write */</div><div class='add'>+</div><div class='add'>+	struct dvb_usb_device *d = i2c_get_adapdata(adap);</div><div class='add'>+	uint8_t bus_mode = 1;  /* 0=eeprom bus, 1=frontend bus */</div><div class='add'>+	uint8_t gen_mode = 0; /* 0=master i2c, 1=gpio i2c */</div><div class='add'>+	uint8_t en_start = 0;</div><div class='add'>+	uint8_t en_stop = 0;</div><div class='add'>+	uint8_t buf[255]; /* TBV: malloc ? */</div><div class='add'>+	int result, i;</div><div class='add'>+</div><div class='add'>+	/* Ensure nobody else hits the i2c bus while we're sending our</div><div class='add'>+	   sequence of messages, (such as the remote control thread) */</div><div class='add'>+	if (mutex_lock_interruptible(&amp;d-&gt;i2c_mutex) &lt; 0)</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num; i++) {</div><div class='add'>+		if (i == 0) {</div><div class='add'>+			/* First message in the transaction */</div><div class='add'>+			en_start = 1;</div><div class='add'>+		} else if (!(msg[i].flags &amp; I2C_M_NOSTART)) {</div><div class='add'>+			/* Device supports repeated-start */</div><div class='add'>+			en_start = 1;</div><div class='add'>+		} else {</div><div class='add'>+			/* Not the first packet and device doesn't support</div><div class='add'>+			   repeated start */</div><div class='add'>+			en_start = 0;</div><div class='add'>+		}</div><div class='add'>+		if (i == (num - 1)) {</div><div class='add'>+			/* Last message in the transaction */</div><div class='add'>+			en_stop = 1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (msg[i].flags &amp; I2C_M_RD) {</div><div class='add'>+			/* Read request */</div><div class='add'>+			u16 index, value;</div><div class='add'>+			uint8_t i2c_dest;</div><div class='add'>+</div><div class='add'>+			i2c_dest = (msg[i].addr &lt;&lt; 1);</div><div class='add'>+			value = ((en_start &lt;&lt; 7) | (en_stop &lt;&lt; 6) |</div><div class='add'>+				 (msg[i].len &amp; 0x3F)) &lt;&lt; 8 | i2c_dest;</div><div class='add'>+			/* I2C ctrl + FE bus; */</div><div class='add'>+			index = ((gen_mode&lt;&lt;6)&amp;0xC0) | ((bus_mode&lt;&lt;4)&amp;0x30);</div><div class='add'>+</div><div class='add'>+			result = usb_control_msg(d-&gt;udev,</div><div class='add'>+						 usb_rcvctrlpipe(d-&gt;udev, 0),</div><div class='add'>+						 REQUEST_NEW_I2C_READ,</div><div class='add'>+						 USB_TYPE_VENDOR | USB_DIR_IN,</div><div class='add'>+						 value, index, msg[i].buf,</div><div class='add'>+						 msg[i].len,</div><div class='add'>+						 USB_CTRL_GET_TIMEOUT);</div><div class='add'>+			if (result &lt; 0) {</div><div class='add'>+				err("i2c read error (status = %d)\n", result);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			/* Write request */</div><div class='add'>+			buf[0] = REQUEST_NEW_I2C_WRITE;</div><div class='add'>+			buf[1] = (msg[i].addr &lt;&lt; 1);</div><div class='add'>+			buf[2] = (en_start &lt;&lt; 7) | (en_stop &lt;&lt; 6) |</div><div class='add'>+				(msg[i].len &amp; 0x3F);</div><div class='add'>+			/* I2C ctrl + FE bus; */</div><div class='add'>+			buf[3] = ((gen_mode&lt;&lt;6)&amp;0xC0) | ((bus_mode&lt;&lt;4)&amp;0x30);</div><div class='add'>+			/* The Actual i2c payload */</div><div class='add'>+			memcpy(&amp;buf[4], msg[i].buf, msg[i].len);</div><div class='add'>+</div><div class='add'>+			result = usb_control_msg(d-&gt;udev,</div><div class='add'>+						 usb_sndctrlpipe(d-&gt;udev, 0),</div><div class='add'>+						 REQUEST_NEW_I2C_WRITE,</div><div class='add'>+						 USB_TYPE_VENDOR | USB_DIR_OUT,</div><div class='add'>+						 0, 0, buf, msg[i].len + 4,</div><div class='add'>+						 USB_CTRL_GET_TIMEOUT);</div><div class='add'>+			if (result &lt; 0) {</div><div class='add'>+				err("i2c write error (status = %d)\n", result);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;d-&gt;i2c_mutex);</div><div class='add'>+	return i;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * I2C master xfer function (pre-1.20 firmware)</div><div class='add'>+ */</div><div class='add'>+static int dib0700_i2c_xfer_legacy(struct i2c_adapter *adap,</div><div class='add'>+				   struct i2c_msg *msg, int num)</div><div class='ctx'> {</div><div class='ctx'> 	struct dvb_usb_device *d = i2c_get_adapdata(adap);</div><div class='ctx'> 	int i,len;</div><div class='hunk'>@@ -124,6 +213,21 @@ static int dib0700_i2c_xfer(struct i2c_adapter *adap,struct i2c_msg *msg,int num</div><div class='ctx'> 	return i;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int dib0700_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msg,</div><div class='add'>+			    int num)</div><div class='add'>+{</div><div class='add'>+	struct dvb_usb_device *d = i2c_get_adapdata(adap);</div><div class='add'>+	struct dib0700_state *st = d-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (st-&gt;fw_use_new_i2c_api == 1) {</div><div class='add'>+		/* User running at least fw 1.20 */</div><div class='add'>+		return dib0700_i2c_xfer_new(adap, msg, num);</div><div class='add'>+	} else {</div><div class='add'>+		/* Use legacy calls */</div><div class='add'>+		return dib0700_i2c_xfer_legacy(adap, msg, num);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static u32 dib0700_i2c_func(struct i2c_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	return I2C_FUNC_I2C;</div><div class='hunk'>@@ -246,7 +350,12 @@ int dib0700_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff)</div><div class='ctx'> </div><div class='ctx'> 	b[0] = REQUEST_ENABLE_VIDEO;</div><div class='ctx'> 	b[1] = (onoff &lt;&lt; 4) | 0x00; /* this bit gives a kind of command, rather than enabling something or not */</div><div class='del'>-	b[2] = (0x01 &lt;&lt; 4); /* Master mode */</div><div class='add'>+</div><div class='add'>+	if (st-&gt;disable_streaming_master_mode == 1)</div><div class='add'>+		b[2] = 0x00;</div><div class='add'>+	else</div><div class='add'>+		b[2] = (0x01 &lt;&lt; 4); /* Master mode */</div><div class='add'>+</div><div class='ctx'> 	b[3] = 0x00;</div><div class='ctx'> </div><div class='ctx'> 	deb_info("modifying (%d) streaming state for %d\n", onoff, adap-&gt;id);</div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/dib0700_devices.c b/drivers/media/dvb/dvb-usb/dib0700_devices.c<br/>index 6c0e5c5f4362..0cfccc24b190 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/dvb-usb/dib0700_devices.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/dvb/dvb-usb/dib0700_devices.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/dvb-usb/dib0700_devices.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/dvb-usb/dib0700_devices.c</a></div><div class='hunk'>@@ -14,6 +14,8 @@</div><div class='ctx'> #include "mt2060.h"</div><div class='ctx'> #include "mt2266.h"</div><div class='ctx'> #include "tuner-xc2028.h"</div><div class='add'>+#include "xc5000.h"</div><div class='add'>+#include "s5h1411.h"</div><div class='ctx'> #include "dib0070.h"</div><div class='ctx'> </div><div class='ctx'> static int force_lna_activation;</div><div class='hunk'>@@ -366,7 +368,8 @@ static struct dib7000p_config stk7700ph_dib7700_xc3028_config = {</div><div class='ctx'> 	.gpio_pwm_pos = DIB7000P_GPIO_DEFAULT_PWM_POS,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int stk7700ph_xc3028_callback(void *ptr, int command, int arg)</div><div class='add'>+static int stk7700ph_xc3028_callback(void *ptr, int component,</div><div class='add'>+				     int command, int arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct dvb_usb_adapter *adap = ptr;</div><div class='ctx'> </div><div class='hunk'>@@ -394,7 +397,6 @@ static struct xc2028_ctrl stk7700ph_xc3028_ctrl = {</div><div class='ctx'> </div><div class='ctx'> static struct xc2028_config stk7700ph_xc3028_config = {</div><div class='ctx'> 	.i2c_addr = 0x61,</div><div class='del'>-	.callback = stk7700ph_xc3028_callback,</div><div class='ctx'> 	.ctrl = &amp;stk7700ph_xc3028_ctrl,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -435,7 +437,9 @@ static int stk7700ph_tuner_attach(struct dvb_usb_adapter *adap)</div><div class='ctx'> 		DIBX000_I2C_INTERFACE_TUNER, 1);</div><div class='ctx'> </div><div class='ctx'> 	stk7700ph_xc3028_config.i2c_adap = tun_i2c;</div><div class='del'>-	stk7700ph_xc3028_config.video_dev = adap;</div><div class='add'>+</div><div class='add'>+	/* FIXME: generalize &amp; move to common area */</div><div class='add'>+	adap-&gt;fe-&gt;callback = stk7700ph_xc3028_callback;</div><div class='ctx'> </div><div class='ctx'> 	return dvb_attach(xc2028_attach, adap-&gt;fe, &amp;stk7700ph_xc3028_config)</div><div class='ctx'> 		== NULL ? -ENODEV : 0;</div><div class='hunk'>@@ -677,6 +681,43 @@ static struct dvb_usb_rc_key dib0700_rc_keys[] = {</div><div class='ctx'> 	{ 0x01, 0x7d, KEY_VOLUMEDOWN },</div><div class='ctx'> 	{ 0x02, 0x42, KEY_CHANNELUP },</div><div class='ctx'> 	{ 0x00, 0x7d, KEY_CHANNELDOWN },</div><div class='add'>+</div><div class='add'>+	/* Key codes for Nova-TD "credit card" remote control. */</div><div class='add'>+	{ 0x1d, 0x00, KEY_0 },</div><div class='add'>+	{ 0x1d, 0x01, KEY_1 },</div><div class='add'>+	{ 0x1d, 0x02, KEY_2 },</div><div class='add'>+	{ 0x1d, 0x03, KEY_3 },</div><div class='add'>+	{ 0x1d, 0x04, KEY_4 },</div><div class='add'>+	{ 0x1d, 0x05, KEY_5 },</div><div class='add'>+	{ 0x1d, 0x06, KEY_6 },</div><div class='add'>+	{ 0x1d, 0x07, KEY_7 },</div><div class='add'>+	{ 0x1d, 0x08, KEY_8 },</div><div class='add'>+	{ 0x1d, 0x09, KEY_9 },</div><div class='add'>+	{ 0x1d, 0x0a, KEY_TEXT },</div><div class='add'>+	{ 0x1d, 0x0d, KEY_MENU },</div><div class='add'>+	{ 0x1d, 0x0f, KEY_MUTE },</div><div class='add'>+	{ 0x1d, 0x10, KEY_VOLUMEUP },</div><div class='add'>+	{ 0x1d, 0x11, KEY_VOLUMEDOWN },</div><div class='add'>+	{ 0x1d, 0x12, KEY_CHANNEL },</div><div class='add'>+	{ 0x1d, 0x14, KEY_UP },</div><div class='add'>+	{ 0x1d, 0x15, KEY_DOWN },</div><div class='add'>+	{ 0x1d, 0x16, KEY_LEFT },</div><div class='add'>+	{ 0x1d, 0x17, KEY_RIGHT },</div><div class='add'>+	{ 0x1d, 0x1c, KEY_TV },</div><div class='add'>+	{ 0x1d, 0x1e, KEY_NEXT },</div><div class='add'>+	{ 0x1d, 0x1f, KEY_BACK },</div><div class='add'>+	{ 0x1d, 0x20, KEY_CHANNELUP },</div><div class='add'>+	{ 0x1d, 0x21, KEY_CHANNELDOWN },</div><div class='add'>+	{ 0x1d, 0x24, KEY_LAST },</div><div class='add'>+	{ 0x1d, 0x25, KEY_OK },</div><div class='add'>+	{ 0x1d, 0x30, KEY_PAUSE },</div><div class='add'>+	{ 0x1d, 0x32, KEY_REWIND },</div><div class='add'>+	{ 0x1d, 0x34, KEY_FASTFORWARD },</div><div class='add'>+	{ 0x1d, 0x35, KEY_PLAY },</div><div class='add'>+	{ 0x1d, 0x36, KEY_STOP },</div><div class='add'>+	{ 0x1d, 0x37, KEY_RECORD },</div><div class='add'>+	{ 0x1d, 0x3b, KEY_GOTO },</div><div class='add'>+	{ 0x1d, 0x3d, KEY_POWER },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* STK7700P: Hauppauge Nova-T Stick, AVerMedia Volar */</div><div class='hunk'>@@ -1078,6 +1119,97 @@ static int stk7070pd_frontend_attach1(struct dvb_usb_adapter *adap)</div><div class='ctx'> 	return adap-&gt;fe == NULL ? -ENODEV : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* S5H1411 */</div><div class='add'>+static struct s5h1411_config pinnacle_801e_config = {</div><div class='add'>+	.output_mode   = S5H1411_PARALLEL_OUTPUT,</div><div class='add'>+	.gpio          = S5H1411_GPIO_OFF,</div><div class='add'>+	.mpeg_timing   = S5H1411_MPEGTIMING_NONCONTINOUS_NONINVERTING_CLOCK,</div><div class='add'>+	.qam_if        = S5H1411_IF_44000,</div><div class='add'>+	.vsb_if        = S5H1411_IF_44000,</div><div class='add'>+	.inversion     = S5H1411_INVERSION_OFF,</div><div class='add'>+	.status_mode   = S5H1411_DEMODLOCKING</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Pinnacle PCTV HD Pro 801e GPIOs map:</div><div class='add'>+   GPIO0  - currently unknown</div><div class='add'>+   GPIO1  - xc5000 tuner reset</div><div class='add'>+   GPIO2  - CX25843 sleep</div><div class='add'>+   GPIO3  - currently unknown</div><div class='add'>+   GPIO4  - currently unknown</div><div class='add'>+   GPIO6  - currently unknown</div><div class='add'>+   GPIO7  - currently unknown</div><div class='add'>+   GPIO9  - currently unknown</div><div class='add'>+   GPIO10 - CX25843 reset</div><div class='add'>+ */</div><div class='add'>+static int s5h1411_frontend_attach(struct dvb_usb_adapter *adap)</div><div class='add'>+{</div><div class='add'>+	struct dib0700_state *st = adap-&gt;dev-&gt;priv;</div><div class='add'>+</div><div class='add'>+	/* Make use of the new i2c functions from FW 1.20 */</div><div class='add'>+	st-&gt;fw_use_new_i2c_api = 1;</div><div class='add'>+</div><div class='add'>+	/* The s5h1411 requires the dib0700 to not be in master mode */</div><div class='add'>+	st-&gt;disable_streaming_master_mode = 1;</div><div class='add'>+</div><div class='add'>+	/* All msleep values taken from Windows USB trace */</div><div class='add'>+	dib0700_set_gpio(adap-&gt;dev, GPIO0, GPIO_OUT, 0);</div><div class='add'>+	dib0700_set_gpio(adap-&gt;dev, GPIO3, GPIO_OUT, 0);</div><div class='add'>+	dib0700_set_gpio(adap-&gt;dev, GPIO6, GPIO_OUT, 1);</div><div class='add'>+	msleep(400);</div><div class='add'>+	dib0700_set_gpio(adap-&gt;dev, GPIO10, GPIO_OUT, 0);</div><div class='add'>+	msleep(60);</div><div class='add'>+	dib0700_set_gpio(adap-&gt;dev, GPIO10, GPIO_OUT, 1);</div><div class='add'>+	msleep(30);</div><div class='add'>+	dib0700_set_gpio(adap-&gt;dev, GPIO0, GPIO_OUT, 1);</div><div class='add'>+	dib0700_set_gpio(adap-&gt;dev, GPIO9, GPIO_OUT, 1);</div><div class='add'>+	dib0700_set_gpio(adap-&gt;dev, GPIO4, GPIO_OUT, 1);</div><div class='add'>+	dib0700_set_gpio(adap-&gt;dev, GPIO7, GPIO_OUT, 1);</div><div class='add'>+	dib0700_set_gpio(adap-&gt;dev, GPIO2, GPIO_OUT, 0);</div><div class='add'>+	msleep(30);</div><div class='add'>+</div><div class='add'>+	/* Put the CX25843 to sleep for now since we're in digital mode */</div><div class='add'>+	dib0700_set_gpio(adap-&gt;dev, GPIO2, GPIO_OUT, 1);</div><div class='add'>+</div><div class='add'>+	/* GPIOs are initialized, do the attach */</div><div class='add'>+	adap-&gt;fe = dvb_attach(s5h1411_attach, &amp;pinnacle_801e_config,</div><div class='add'>+			      &amp;adap-&gt;dev-&gt;i2c_adap);</div><div class='add'>+	return adap-&gt;fe == NULL ? -ENODEV : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dib0700_xc5000_tuner_callback(void *priv, int component,</div><div class='add'>+					 int command, int arg)</div><div class='add'>+{</div><div class='add'>+	struct dvb_usb_adapter *adap = priv;</div><div class='add'>+</div><div class='add'>+	if (command == XC5000_TUNER_RESET) {</div><div class='add'>+		/* Reset the tuner */</div><div class='add'>+		dib0700_set_gpio(adap-&gt;dev, GPIO1, GPIO_OUT, 0);</div><div class='add'>+		msleep(330); /* from Windows USB trace */</div><div class='add'>+		dib0700_set_gpio(adap-&gt;dev, GPIO1, GPIO_OUT, 1);</div><div class='add'>+		msleep(330); /* from Windows USB trace */</div><div class='add'>+	} else {</div><div class='add'>+		err("xc5000: unknown tuner callback command: %d\n", command);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct xc5000_config s5h1411_xc5000_tunerconfig = {</div><div class='add'>+	.i2c_address      = 0x64,</div><div class='add'>+	.if_khz           = 5380,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int xc5000_tuner_attach(struct dvb_usb_adapter *adap)</div><div class='add'>+{</div><div class='add'>+	/* FIXME: generalize &amp; move to common area */</div><div class='add'>+	adap-&gt;fe-&gt;callback = dib0700_xc5000_tuner_callback;</div><div class='add'>+</div><div class='add'>+	return dvb_attach(xc5000_attach, adap-&gt;fe, &amp;adap-&gt;dev-&gt;i2c_adap,</div><div class='add'>+			  &amp;s5h1411_xc5000_tunerconfig)</div><div class='add'>+		== NULL ? -ENODEV : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* DVB-USB and USB stuff follows */</div><div class='ctx'> struct usb_device_id dib0700_usb_id_table[] = {</div><div class='ctx'> /* 0 */	{ USB_DEVICE(USB_VID_DIBCOM,    USB_PID_DIBCOM_STK7700P) },</div><div class='hunk'>@@ -1119,6 +1251,11 @@ struct usb_device_id dib0700_usb_id_table[] = {</div><div class='ctx'> 	{ USB_DEVICE(USB_VID_LEADTEK,   USB_PID_WINFAST_DTV_DONGLE_STK7700P_2) },</div><div class='ctx'> /* 35 */{ USB_DEVICE(USB_VID_HAUPPAUGE, USB_PID_HAUPPAUGE_NOVA_TD_STICK_52009) },</div><div class='ctx'> 	{ USB_DEVICE(USB_VID_HAUPPAUGE, USB_PID_HAUPPAUGE_NOVA_T_500_3) },</div><div class='add'>+	{ USB_DEVICE(USB_VID_GIGABYTE,  USB_PID_GIGABYTE_U8000) },</div><div class='add'>+	{ USB_DEVICE(USB_VID_YUAN,      USB_PID_YUAN_STK7700PH) },</div><div class='add'>+	{ USB_DEVICE(USB_VID_ASUS,	USB_PID_ASUS_U3000H) },</div><div class='add'>+/* 40 */{ USB_DEVICE(USB_VID_PINNACLE,  USB_PID_PINNACLE_PCTV801E) },</div><div class='add'>+	{ USB_DEVICE(USB_VID_PINNACLE,  USB_PID_PINNACLE_PCTV801E_SE) },</div><div class='ctx'> 	{ 0 }		/* Terminating entry */</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(usb, dib0700_usb_id_table);</div><div class='hunk'>@@ -1126,7 +1263,7 @@ MODULE_DEVICE_TABLE(usb, dib0700_usb_id_table);</div><div class='ctx'> #define DIB0700_DEFAULT_DEVICE_PROPERTIES \</div><div class='ctx'> 	.caps              = DVB_USB_IS_AN_I2C_ADAPTER, \</div><div class='ctx'> 	.usb_ctrl          = DEVICE_SPECIFIC, \</div><div class='del'>-	.firmware          = "dvb-usb-dib0700-1.10.fw", \</div><div class='add'>+	.firmware          = "dvb-usb-dib0700-1.20.fw", \</div><div class='ctx'> 	.download_firmware = dib0700_download_firmware, \</div><div class='ctx'> 	.no_reconnect      = 1, \</div><div class='ctx'> 	.size_of_priv      = sizeof(struct dib0700_state), \</div><div class='hunk'>@@ -1293,7 +1430,12 @@ struct dvb_usb_device_properties dib0700_devices[] = {</div><div class='ctx'> 				{ &amp;dib0700_usb_id_table[31], NULL },</div><div class='ctx'> 				{ NULL },</div><div class='ctx'> 			}</div><div class='del'>-		}</div><div class='add'>+		},</div><div class='add'>+</div><div class='add'>+		.rc_interval      = DEFAULT_RC_INTERVAL,</div><div class='add'>+		.rc_key_map       = dib0700_rc_keys,</div><div class='add'>+		.rc_key_map_size  = ARRAY_SIZE(dib0700_rc_keys),</div><div class='add'>+		.rc_query         = dib0700_rc_query</div><div class='ctx'> 	}, { DIB0700_DEFAULT_DEVICE_PROPERTIES,</div><div class='ctx'> </div><div class='ctx'> 		.num_adapters = 1,</div><div class='hunk'>@@ -1408,7 +1550,7 @@ struct dvb_usb_device_properties dib0700_devices[] = {</div><div class='ctx'> 			},</div><div class='ctx'> 		},</div><div class='ctx'> </div><div class='del'>-		.num_device_descs = 3,</div><div class='add'>+		.num_device_descs = 5,</div><div class='ctx'> 		.devices = {</div><div class='ctx'> 			{   "Terratec Cinergy HT USB XE",</div><div class='ctx'> 				{ &amp;dib0700_usb_id_table[27], NULL },</div><div class='hunk'>@@ -1422,6 +1564,47 @@ struct dvb_usb_device_properties dib0700_devices[] = {</div><div class='ctx'> 				{ &amp;dib0700_usb_id_table[32], NULL },</div><div class='ctx'> 				{ NULL },</div><div class='ctx'> 			},</div><div class='add'>+			{   "Gigabyte U8000-RH",</div><div class='add'>+				{ &amp;dib0700_usb_id_table[37], NULL },</div><div class='add'>+				{ NULL },</div><div class='add'>+			},</div><div class='add'>+			{   "YUAN High-Tech STK7700PH",</div><div class='add'>+				{ &amp;dib0700_usb_id_table[38], NULL },</div><div class='add'>+				{ NULL },</div><div class='add'>+			},</div><div class='add'>+			{   "Asus My Cinema-U3000Hybrid",</div><div class='add'>+				{ &amp;dib0700_usb_id_table[39], NULL },</div><div class='add'>+				{ NULL },</div><div class='add'>+			},</div><div class='add'>+		},</div><div class='add'>+		.rc_interval      = DEFAULT_RC_INTERVAL,</div><div class='add'>+		.rc_key_map       = dib0700_rc_keys,</div><div class='add'>+		.rc_key_map_size  = ARRAY_SIZE(dib0700_rc_keys),</div><div class='add'>+		.rc_query         = dib0700_rc_query</div><div class='add'>+	}, { DIB0700_DEFAULT_DEVICE_PROPERTIES,</div><div class='add'>+		.num_adapters = 1,</div><div class='add'>+		.adapter = {</div><div class='add'>+			{</div><div class='add'>+				.frontend_attach  = s5h1411_frontend_attach,</div><div class='add'>+				.tuner_attach     = xc5000_tuner_attach,</div><div class='add'>+</div><div class='add'>+				DIB0700_DEFAULT_STREAMING_CONFIG(0x02),</div><div class='add'>+</div><div class='add'>+				.size_of_priv = sizeof(struct</div><div class='add'>+						dib0700_adapter_state),</div><div class='add'>+			},</div><div class='add'>+		},</div><div class='add'>+</div><div class='add'>+		.num_device_descs = 2,</div><div class='add'>+		.devices = {</div><div class='add'>+			{   "Pinnacle PCTV HD Pro USB Stick",</div><div class='add'>+				{ &amp;dib0700_usb_id_table[40], NULL },</div><div class='add'>+				{ NULL },</div><div class='add'>+			},</div><div class='add'>+			{   "Pinnacle PCTV HD USB Stick",</div><div class='add'>+				{ &amp;dib0700_usb_id_table[41], NULL },</div><div class='add'>+				{ NULL },</div><div class='add'>+			},</div><div class='ctx'> 		},</div><div class='ctx'> 		.rc_interval      = DEFAULT_RC_INTERVAL,</div><div class='ctx'> 		.rc_key_map       = dib0700_rc_keys,</div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/dtv5100.c b/drivers/media/dvb/dvb-usb/dtv5100.c<br/>new file mode 100644<br/>index 000000000000..078ce92ca436<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/dvb-usb/dtv5100.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/dvb-usb/dtv5100.c</a></div><div class='hunk'>@@ -0,0 +1,240 @@</div><div class='add'>+/*</div><div class='add'>+ * DVB USB Linux driver for AME DTV-5100 USB2.0 DVB-T</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2008  Antoine Jacquet &lt;royale@zerezo.com&gt;</div><div class='add'>+ * http://royale.zerezo.com/dtv5100/</div><div class='add'>+ *</div><div class='add'>+ * Inspired by gl861.c and au6610.c drivers</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "dtv5100.h"</div><div class='add'>+#include "zl10353.h"</div><div class='add'>+#include "qt1010.h"</div><div class='add'>+</div><div class='add'>+/* debug */</div><div class='add'>+static int dvb_usb_dtv5100_debug;</div><div class='add'>+module_param_named(debug, dvb_usb_dtv5100_debug, int, 0644);</div><div class='add'>+MODULE_PARM_DESC(debug, "set debugging level" DVB_USB_DEBUG_STATUS);</div><div class='add'>+DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);</div><div class='add'>+</div><div class='add'>+static int dtv5100_i2c_msg(struct dvb_usb_device *d, u8 addr,</div><div class='add'>+			   u8 *wbuf, u16 wlen, u8 *rbuf, u16 rlen)</div><div class='add'>+{</div><div class='add'>+	u8 request;</div><div class='add'>+	u8 type;</div><div class='add'>+	u16 value;</div><div class='add'>+	u16 index;</div><div class='add'>+</div><div class='add'>+	switch (wlen) {</div><div class='add'>+	case 1:</div><div class='add'>+		/* write { reg }, read { value } */</div><div class='add'>+		request = (addr == DTV5100_DEMOD_ADDR ? DTV5100_DEMOD_READ :</div><div class='add'>+							DTV5100_TUNER_READ);</div><div class='add'>+		type = USB_TYPE_VENDOR | USB_DIR_IN;</div><div class='add'>+		value = 0;</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		/* write { reg, value } */</div><div class='add'>+		request = (addr == DTV5100_DEMOD_ADDR ? DTV5100_DEMOD_WRITE :</div><div class='add'>+							DTV5100_TUNER_WRITE);</div><div class='add'>+		type = USB_TYPE_VENDOR | USB_DIR_OUT;</div><div class='add'>+		value = wbuf[1];</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		warn("wlen = %x, aborting.", wlen);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	index = (addr &lt;&lt; 8) + wbuf[0];</div><div class='add'>+</div><div class='add'>+	msleep(1); /* avoid I2C errors */</div><div class='add'>+	return usb_control_msg(d-&gt;udev, usb_rcvctrlpipe(d-&gt;udev, 0), request,</div><div class='add'>+			       type, value, index, rbuf, rlen,</div><div class='add'>+			       DTV5100_USB_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* I2C */</div><div class='add'>+static int dtv5100_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[],</div><div class='add'>+			    int num)</div><div class='add'>+{</div><div class='add'>+	struct dvb_usb_device *d = i2c_get_adapdata(adap);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (num &gt; 2)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (mutex_lock_interruptible(&amp;d-&gt;i2c_mutex) &lt; 0)</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num; i++) {</div><div class='add'>+		/* write/read request */</div><div class='add'>+		if (i+1 &lt; num &amp;&amp; (msg[i+1].flags &amp; I2C_M_RD)) {</div><div class='add'>+			if (dtv5100_i2c_msg(d, msg[i].addr, msg[i].buf,</div><div class='add'>+					    msg[i].len, msg[i+1].buf,</div><div class='add'>+					    msg[i+1].len) &lt; 0)</div><div class='add'>+				break;</div><div class='add'>+			i++;</div><div class='add'>+		} else if (dtv5100_i2c_msg(d, msg[i].addr, msg[i].buf,</div><div class='add'>+					   msg[i].len, NULL, 0) &lt; 0)</div><div class='add'>+				break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;d-&gt;i2c_mutex);</div><div class='add'>+	return i;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 dtv5100_i2c_func(struct i2c_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	return I2C_FUNC_I2C;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct i2c_algorithm dtv5100_i2c_algo = {</div><div class='add'>+	.master_xfer   = dtv5100_i2c_xfer,</div><div class='add'>+	.functionality = dtv5100_i2c_func,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Callbacks for DVB USB */</div><div class='add'>+static struct zl10353_config dtv5100_zl10353_config = {</div><div class='add'>+	.demod_address = DTV5100_DEMOD_ADDR,</div><div class='add'>+	.no_tuner = 1,</div><div class='add'>+	.parallel_ts = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int dtv5100_frontend_attach(struct dvb_usb_adapter *adap)</div><div class='add'>+{</div><div class='add'>+	adap-&gt;fe = dvb_attach(zl10353_attach, &amp;dtv5100_zl10353_config,</div><div class='add'>+			      &amp;adap-&gt;dev-&gt;i2c_adap);</div><div class='add'>+	if (adap-&gt;fe == NULL)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	/* disable i2c gate, or it won't work... is this safe? */</div><div class='add'>+	adap-&gt;fe-&gt;ops.i2c_gate_ctrl = NULL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct qt1010_config dtv5100_qt1010_config = {</div><div class='add'>+	.i2c_address = DTV5100_TUNER_ADDR</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int dtv5100_tuner_attach(struct dvb_usb_adapter *adap)</div><div class='add'>+{</div><div class='add'>+	return dvb_attach(qt1010_attach,</div><div class='add'>+			  adap-&gt;fe, &amp;adap-&gt;dev-&gt;i2c_adap,</div><div class='add'>+			  &amp;dtv5100_qt1010_config) == NULL ? -ENODEV : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* DVB USB Driver stuff */</div><div class='add'>+static struct dvb_usb_device_properties dtv5100_properties;</div><div class='add'>+</div><div class='add'>+static int dtv5100_probe(struct usb_interface *intf,</div><div class='add'>+			 const struct usb_device_id *id)</div><div class='add'>+{</div><div class='add'>+	int i, ret;</div><div class='add'>+	struct usb_device *udev = interface_to_usbdev(intf);</div><div class='add'>+</div><div class='add'>+	/* initialize non qt1010/zl10353 part? */</div><div class='add'>+	for (i = 0; dtv5100_init[i].request; i++) {</div><div class='add'>+		ret = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),</div><div class='add'>+				      dtv5100_init[i].request,</div><div class='add'>+				      USB_TYPE_VENDOR | USB_DIR_OUT,</div><div class='add'>+				      dtv5100_init[i].value,</div><div class='add'>+				      dtv5100_init[i].index, NULL, 0,</div><div class='add'>+				      DTV5100_USB_TIMEOUT);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = dvb_usb_device_init(intf, &amp;dtv5100_properties,</div><div class='add'>+				  THIS_MODULE, NULL, adapter_nr);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct usb_device_id dtv5100_table[] = {</div><div class='add'>+	{ USB_DEVICE(0x06be, 0xa232) },</div><div class='add'>+	{ }		/* Terminating entry */</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(usb, dtv5100_table);</div><div class='add'>+</div><div class='add'>+static struct dvb_usb_device_properties dtv5100_properties = {</div><div class='add'>+	.caps = DVB_USB_IS_AN_I2C_ADAPTER,</div><div class='add'>+	.usb_ctrl = DEVICE_SPECIFIC,</div><div class='add'>+</div><div class='add'>+	.size_of_priv = 0,</div><div class='add'>+</div><div class='add'>+	.num_adapters = 1,</div><div class='add'>+	.adapter = {{</div><div class='add'>+		.frontend_attach = dtv5100_frontend_attach,</div><div class='add'>+		.tuner_attach    = dtv5100_tuner_attach,</div><div class='add'>+</div><div class='add'>+		.stream = {</div><div class='add'>+			.type = USB_BULK,</div><div class='add'>+			.count = 8,</div><div class='add'>+			.endpoint = 0x82,</div><div class='add'>+			.u = {</div><div class='add'>+				.bulk = {</div><div class='add'>+					.buffersize = 4096,</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		},</div><div class='add'>+	} },</div><div class='add'>+</div><div class='add'>+	.i2c_algo = &amp;dtv5100_i2c_algo,</div><div class='add'>+</div><div class='add'>+	.num_device_descs = 1,</div><div class='add'>+	.devices = {</div><div class='add'>+		{</div><div class='add'>+			.name = "AME DTV-5100 USB2.0 DVB-T",</div><div class='add'>+			.cold_ids = { NULL },</div><div class='add'>+			.warm_ids = { &amp;dtv5100_table[0], NULL },</div><div class='add'>+		},</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct usb_driver dtv5100_driver = {</div><div class='add'>+	.name		= "dvb_usb_dtv5100",</div><div class='add'>+	.probe		= dtv5100_probe,</div><div class='add'>+	.disconnect	= dvb_usb_device_exit,</div><div class='add'>+	.id_table	= dtv5100_table,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* module stuff */</div><div class='add'>+static int __init dtv5100_module_init(void)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = usb_register(&amp;dtv5100_driver);</div><div class='add'>+	if (ret)</div><div class='add'>+		err("usb_register failed. Error number %d", ret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit dtv5100_module_exit(void)</div><div class='add'>+{</div><div class='add'>+	/* deregister this driver from the USB subsystem */</div><div class='add'>+	usb_deregister(&amp;dtv5100_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(dtv5100_module_init);</div><div class='add'>+module_exit(dtv5100_module_exit);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR(DRIVER_AUTHOR);</div><div class='add'>+MODULE_DESCRIPTION(DRIVER_DESC);</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/dtv5100.h b/drivers/media/dvb/dvb-usb/dtv5100.h<br/>new file mode 100644<br/>index 000000000000..93e96e04a82a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/dvb-usb/dtv5100.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/dvb-usb/dtv5100.h</a></div><div class='hunk'>@@ -0,0 +1,51 @@</div><div class='add'>+/*</div><div class='add'>+ * DVB USB Linux driver for AME DTV-5100 USB2.0 DVB-T</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2008  Antoine Jacquet &lt;royale@zerezo.com&gt;</div><div class='add'>+ * http://royale.zerezo.com/dtv5100/</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DVB_USB_DTV5100_H_</div><div class='add'>+#define _DVB_USB_DTV5100_H_</div><div class='add'>+</div><div class='add'>+#define DVB_USB_LOG_PREFIX "dtv5100"</div><div class='add'>+#include "dvb-usb.h"</div><div class='add'>+</div><div class='add'>+#define DTV5100_USB_TIMEOUT 500</div><div class='add'>+</div><div class='add'>+#define DTV5100_DEMOD_ADDR	0x00</div><div class='add'>+#define DTV5100_DEMOD_WRITE	0xc0</div><div class='add'>+#define DTV5100_DEMOD_READ	0xc1</div><div class='add'>+</div><div class='add'>+#define DTV5100_TUNER_ADDR	0xc4</div><div class='add'>+#define DTV5100_TUNER_WRITE	0xc7</div><div class='add'>+#define DTV5100_TUNER_READ	0xc8</div><div class='add'>+</div><div class='add'>+#define DRIVER_AUTHOR "Antoine Jacquet, http://royale.zerezo.com/"</div><div class='add'>+#define DRIVER_DESC "AME DTV-5100 USB2.0 DVB-T"</div><div class='add'>+</div><div class='add'>+static struct {</div><div class='add'>+	u8 request;</div><div class='add'>+	u8 value;</div><div class='add'>+	u16 index;</div><div class='add'>+} dtv5100_init[] = {</div><div class='add'>+	{ 0x000000c5, 0x00000000, 0x00000001 },</div><div class='add'>+	{ 0x000000c5, 0x00000001, 0x00000001 },</div><div class='add'>+	{ }		/* Terminating entry */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h<br/>index 03dfb9f2fe30..7380b94b3b36 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/dvb-usb/dvb-usb-ids.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/dvb/dvb-usb/dvb-usb-ids.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/dvb-usb/dvb-usb-ids.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/dvb-usb/dvb-usb-ids.h</a></div><div class='hunk'>@@ -22,6 +22,7 @@</div><div class='ctx'> #define USB_VID_AVERMEDIA			0x07ca</div><div class='ctx'> #define USB_VID_COMPRO				0x185b</div><div class='ctx'> #define USB_VID_COMPRO_UNK			0x145f</div><div class='add'>+#define USB_VID_CONEXANT			0x0572</div><div class='ctx'> #define USB_VID_CYPRESS				0x04b4</div><div class='ctx'> #define USB_VID_DIBCOM				0x10b8</div><div class='ctx'> #define USB_VID_DPOSH				0x1498</div><div class='hunk'>@@ -33,16 +34,19 @@</div><div class='ctx'> #define USB_VID_HAUPPAUGE			0x2040</div><div class='ctx'> #define USB_VID_HYPER_PALTEK			0x1025</div><div class='ctx'> #define USB_VID_KWORLD				0xeb2a</div><div class='add'>+#define USB_VID_KWORLD_2			0x1b80</div><div class='ctx'> #define USB_VID_KYE				0x0458</div><div class='ctx'> #define USB_VID_LEADTEK				0x0413</div><div class='ctx'> #define USB_VID_LITEON				0x04ca</div><div class='ctx'> #define USB_VID_MEDION				0x1660</div><div class='ctx'> #define USB_VID_MIGLIA				0x18f3</div><div class='ctx'> #define USB_VID_MSI				0x0db0</div><div class='add'>+#define USB_VID_MSI_2				0x1462</div><div class='ctx'> #define USB_VID_OPERA1				0x695c</div><div class='ctx'> #define USB_VID_PINNACLE			0x2304</div><div class='ctx'> #define USB_VID_TECHNOTREND			0x0b48</div><div class='ctx'> #define USB_VID_TERRATEC			0x0ccd</div><div class='add'>+#define USB_VID_TELESTAR			0x10b9</div><div class='ctx'> #define USB_VID_VISIONPLUS			0x13d3</div><div class='ctx'> #define USB_VID_TWINHAN				0x1822</div><div class='ctx'> #define USB_VID_ULTIMA_ELECTRONIC		0x05d8</div><div class='hunk'>@@ -50,15 +54,18 @@</div><div class='ctx'> #define USB_VID_WIDEVIEW			0x14aa</div><div class='ctx'> #define USB_VID_GIGABYTE			0x1044</div><div class='ctx'> #define USB_VID_YUAN				0x1164</div><div class='del'>-</div><div class='add'>+#define USB_VID_XTENSIONS			0x1ae7</div><div class='ctx'> </div><div class='ctx'> /* Product IDs */</div><div class='ctx'> #define USB_PID_ADSTECH_USB2_COLD			0xa333</div><div class='ctx'> #define USB_PID_ADSTECH_USB2_WARM			0xa334</div><div class='ctx'> #define USB_PID_AFATECH_AF9005				0x9020</div><div class='add'>+#define USB_PID_AFATECH_AF9015_9015			0x9015</div><div class='add'>+#define USB_PID_AFATECH_AF9015_9016			0x9016</div><div class='ctx'> #define USB_VID_ALINK_DTU				0xf170</div><div class='ctx'> #define USB_PID_ANSONIC_DVBT_USB			0x6000</div><div class='ctx'> #define USB_PID_ANYSEE					0x861f</div><div class='add'>+#define USB_PID_AZUREWAVE_AD_TU700			0x3237</div><div class='ctx'> #define USB_PID_AVERMEDIA_DVBT_USB_COLD			0x0001</div><div class='ctx'> #define USB_PID_AVERMEDIA_DVBT_USB_WARM			0x0002</div><div class='ctx'> #define USB_PID_AVERMEDIA_DVBT_USB2_COLD		0xa800</div><div class='hunk'>@@ -69,6 +76,7 @@</div><div class='ctx'> #define USB_PID_COMPRO_DVBU2000_UNK_WARM		0x010d</div><div class='ctx'> #define USB_PID_COMPRO_VIDEOMATE_U500			0x1e78</div><div class='ctx'> #define USB_PID_COMPRO_VIDEOMATE_U500_PC		0x1e80</div><div class='add'>+#define USB_PID_CONEXANT_D680_DMB			0x86d6</div><div class='ctx'> #define USB_PID_DIBCOM_HOOK_DEFAULT			0x0064</div><div class='ctx'> #define USB_PID_DIBCOM_HOOK_DEFAULT_REENUM		0x0065</div><div class='ctx'> #define USB_PID_DIBCOM_MOD3000_COLD			0x0bb8</div><div class='hunk'>@@ -87,9 +95,12 @@</div><div class='ctx'> #define USB_PID_UNIWILL_STK7700P			0x6003</div><div class='ctx'> #define USB_PID_GRANDTEC_DVBT_USB_COLD			0x0fa0</div><div class='ctx'> #define USB_PID_GRANDTEC_DVBT_USB_WARM			0x0fa1</div><div class='add'>+#define USB_PID_KWORLD_399U				0xe399</div><div class='add'>+#define USB_PID_KWORLD_PC160_2T				0xc160</div><div class='ctx'> #define USB_PID_KWORLD_VSTREAM_COLD			0x17de</div><div class='ctx'> #define USB_PID_KWORLD_VSTREAM_WARM			0x17df</div><div class='ctx'> #define USB_PID_TERRATEC_CINERGY_T_USB_XE		0x0055</div><div class='add'>+#define USB_PID_TERRATEC_CINERGY_T_USB_XE_REV2		0x0069</div><div class='ctx'> #define USB_PID_TWINHAN_VP7041_COLD			0x3201</div><div class='ctx'> #define USB_PID_TWINHAN_VP7041_WARM			0x3202</div><div class='ctx'> #define USB_PID_TWINHAN_VP7020_COLD			0x3203</div><div class='hunk'>@@ -98,6 +109,7 @@</div><div class='ctx'> #define USB_PID_TWINHAN_VP7045_WARM			0x3206</div><div class='ctx'> #define USB_PID_TWINHAN_VP7021_COLD			0x3207</div><div class='ctx'> #define USB_PID_TWINHAN_VP7021_WARM			0x3208</div><div class='add'>+#define USB_PID_TINYTWIN				0x3226</div><div class='ctx'> #define USB_PID_DNTV_TINYUSB2_COLD			0x3223</div><div class='ctx'> #define USB_PID_DNTV_TINYUSB2_WARM			0x3224</div><div class='ctx'> #define USB_PID_ULTIMA_TVBOX_COLD			0x8105</div><div class='hunk'>@@ -144,6 +156,9 @@</div><div class='ctx'> #define USB_PID_AVERMEDIA_HYBRID_ULTRA_USB_M039R	0x0039</div><div class='ctx'> #define USB_PID_AVERMEDIA_HYBRID_ULTRA_USB_M039R_ATSC	0x1039</div><div class='ctx'> #define USB_PID_AVERMEDIA_HYBRID_ULTRA_USB_M039R_DVBT	0x2039</div><div class='add'>+#define USB_PID_AVERMEDIA_VOLAR_X			0xa815</div><div class='add'>+#define USB_PID_AVERMEDIA_VOLAR_X_2			0x8150</div><div class='add'>+#define USB_PID_AVERMEDIA_A309				0xa309</div><div class='ctx'> #define USB_PID_TECHNOTREND_CONNECT_S2400               0x3006</div><div class='ctx'> #define USB_PID_TERRATEC_CINERGY_DT_XS_DIVERSITY	0x005a</div><div class='ctx'> #define USB_PID_TERRATEC_CINERGY_HT_USB_XE		0x0058</div><div class='hunk'>@@ -153,8 +168,11 @@</div><div class='ctx'> #define USB_PID_PINNACLE_PCTV2000E			0x022c</div><div class='ctx'> #define USB_PID_PINNACLE_PCTV_DVB_T_FLASH		0x0228</div><div class='ctx'> #define USB_PID_PINNACLE_PCTV_DUAL_DIVERSITY_DVB_T	0x0229</div><div class='add'>+#define USB_PID_PINNACLE_PCTV71E			0x022b</div><div class='ctx'> #define USB_PID_PINNACLE_PCTV72E			0x0236</div><div class='ctx'> #define USB_PID_PINNACLE_PCTV73E			0x0237</div><div class='add'>+#define USB_PID_PINNACLE_PCTV801E			0x023a</div><div class='add'>+#define USB_PID_PINNACLE_PCTV801E_SE			0x023b</div><div class='ctx'> #define USB_PID_PCTV_200E				0x020e</div><div class='ctx'> #define USB_PID_PCTV_400E				0x020f</div><div class='ctx'> #define USB_PID_PCTV_450E				0x0222</div><div class='hunk'>@@ -171,6 +189,7 @@</div><div class='ctx'> #define USB_PID_DVICO_BLUEBIRD_DUAL_2_COLD		0xdb58</div><div class='ctx'> #define USB_PID_DVICO_BLUEBIRD_DUAL_2_WARM		0xdb59</div><div class='ctx'> #define USB_PID_DVICO_BLUEBIRD_DUAL_4			0xdb78</div><div class='add'>+#define USB_PID_DVICO_BLUEBIRD_DUAL_4_REV_2		0xdb98</div><div class='ctx'> #define USB_PID_DVICO_BLUEBIRD_DVB_T_NANO_2		0xdb70</div><div class='ctx'> #define USB_PID_DVICO_BLUEBIRD_DVB_T_NANO_2_NFW_WARM	0xdb71</div><div class='ctx'> #define USB_PID_DIGITALNOW_BLUEBIRD_DUAL_1_COLD		0xdb54</div><div class='hunk'>@@ -190,6 +209,7 @@</div><div class='ctx'> #define USB_PID_WINFAST_DTV_DONGLE_WARM			0x6026</div><div class='ctx'> #define USB_PID_WINFAST_DTV_DONGLE_STK7700P		0x6f00</div><div class='ctx'> #define USB_PID_WINFAST_DTV_DONGLE_STK7700P_2		0x6f01</div><div class='add'>+#define USB_PID_WINFAST_DTV_DONGLE_GOLD			0x6029</div><div class='ctx'> #define USB_PID_GENPIX_8PSK_REV_1_COLD			0x0200</div><div class='ctx'> #define USB_PID_GENPIX_8PSK_REV_1_WARM			0x0201</div><div class='ctx'> #define USB_PID_GENPIX_8PSK_REV_2			0x0202</div><div class='hunk'>@@ -197,14 +217,21 @@</div><div class='ctx'> #define USB_PID_GENPIX_SKYWALKER_CW3K			0x0204</div><div class='ctx'> #define USB_PID_SIGMATEK_DVB_110			0x6610</div><div class='ctx'> #define USB_PID_MSI_DIGI_VOX_MINI_II			0x1513</div><div class='add'>+#define USB_PID_MSI_DIGIVOX_DUO				0x8801</div><div class='ctx'> #define USB_PID_OPERA1_COLD				0x2830</div><div class='ctx'> #define USB_PID_OPERA1_WARM				0x3829</div><div class='ctx'> #define USB_PID_LIFEVIEW_TV_WALKER_TWIN_COLD		0x0514</div><div class='ctx'> #define USB_PID_LIFEVIEW_TV_WALKER_TWIN_WARM		0x0513</div><div class='ctx'> #define USB_PID_GIGABYTE_U7000				0x7001</div><div class='add'>+#define USB_PID_GIGABYTE_U8000				0x7002</div><div class='ctx'> #define USB_PID_ASUS_U3000				0x171f</div><div class='add'>+#define USB_PID_ASUS_U3000H				0x1736</div><div class='ctx'> #define USB_PID_ASUS_U3100				0x173f</div><div class='ctx'> #define USB_PID_YUAN_EC372S				0x1edc</div><div class='add'>+#define USB_PID_YUAN_STK7700PH				0x1f08</div><div class='ctx'> #define USB_PID_DW2102					0x2102</div><div class='add'>+#define USB_PID_XTENSIONS_XD_380			0x0381</div><div class='add'>+#define USB_PID_TELESTAR_STARSTICK_2			0x8000</div><div class='add'>+#define USB_PID_MSI_DIGI_VOX_MINI_III                   0x8807</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/dw2102.c b/drivers/media/dvb/dvb-usb/dw2102.c<br/>index a4d898b44e55..6286fbbe7fb5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/dvb-usb/dw2102.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/dvb/dvb-usb/dw2102.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/dvb-usb/dw2102.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/dvb-usb/dw2102.c</a></div><div class='hunk'>@@ -1,4 +1,5 @@</div><div class='del'>-/* DVB USB framework compliant Linux driver for the DVBWorld DVB-S 2102 Card</div><div class='add'>+/* DVB USB framework compliant Linux driver for the</div><div class='add'>+*	DVBWorld DVB-S 2101, 2102, DVB-S2 2104 Card</div><div class='ctx'> *</div><div class='ctx'> * Copyright (C) 2008 Igor M. Liplianin (liplianin@me.by)</div><div class='ctx'> *</div><div class='hunk'>@@ -10,62 +11,74 @@</div><div class='ctx'> */</div><div class='ctx'> #include &lt;linux/version.h&gt;</div><div class='ctx'> #include "dw2102.h"</div><div class='add'>+#include "si21xx.h"</div><div class='ctx'> #include "stv0299.h"</div><div class='ctx'> #include "z0194a.h"</div><div class='add'>+#include "stv0288.h"</div><div class='add'>+#include "stb6000.h"</div><div class='add'>+#include "eds1547.h"</div><div class='add'>+#include "cx24116.h"</div><div class='ctx'> </div><div class='ctx'> #ifndef USB_PID_DW2102</div><div class='ctx'> #define USB_PID_DW2102 0x2102</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#define DW2102_READ_MSG 0</div><div class='del'>-#define DW2102_WRITE_MSG 1</div><div class='add'>+#ifndef USB_PID_DW2104</div><div class='add'>+#define USB_PID_DW2104 0x2104</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define DW210X_READ_MSG 0</div><div class='add'>+#define DW210X_WRITE_MSG 1</div><div class='ctx'> </div><div class='ctx'> #define REG_1F_SYMBOLRATE_BYTE0 0x1f</div><div class='ctx'> #define REG_20_SYMBOLRATE_BYTE1 0x20</div><div class='ctx'> #define REG_21_SYMBOLRATE_BYTE2 0x21</div><div class='del'>-</div><div class='add'>+/* on my own*/</div><div class='ctx'> #define DW2102_VOLTAGE_CTRL (0x1800)</div><div class='ctx'> #define DW2102_RC_QUERY (0x1a00)</div><div class='ctx'> </div><div class='del'>-struct dw2102_state {</div><div class='add'>+struct dw210x_state {</div><div class='ctx'> 	u32 last_key_pressed;</div><div class='ctx'> };</div><div class='del'>-struct dw2102_rc_keys {</div><div class='add'>+struct dw210x_rc_keys {</div><div class='ctx'> 	u32 keycode;</div><div class='ctx'> 	u32 event;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* debug */</div><div class='add'>+static int dvb_usb_dw2102_debug;</div><div class='add'>+module_param_named(debug, dvb_usb_dw2102_debug, int, 0644);</div><div class='add'>+MODULE_PARM_DESC(debug, "set debugging level (1=info 2=xfer (or-able))." DVB_USB_DEBUG_STATUS);</div><div class='add'>+</div><div class='ctx'> DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);</div><div class='ctx'> </div><div class='del'>-static int dw2102_op_rw(struct usb_device *dev, u8 request, u16 value,</div><div class='del'>-		u8 *data, u16 len, int flags)</div><div class='add'>+static int dw210x_op_rw(struct usb_device *dev, u8 request, u16 value,</div><div class='add'>+			u16 index, u8 * data, u16 len, int flags)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	u8 u8buf[len];</div><div class='ctx'> </div><div class='del'>-	unsigned int pipe = (flags == DW2102_READ_MSG) ?</div><div class='del'>-		usb_rcvctrlpipe(dev, 0) : usb_sndctrlpipe(dev, 0);</div><div class='del'>-	u8 request_type = (flags == DW2102_READ_MSG) ? USB_DIR_IN : USB_DIR_OUT;</div><div class='add'>+	unsigned int pipe = (flags == DW210X_READ_MSG) ?</div><div class='add'>+				usb_rcvctrlpipe(dev, 0) : usb_sndctrlpipe(dev, 0);</div><div class='add'>+	u8 request_type = (flags == DW210X_READ_MSG) ? USB_DIR_IN : USB_DIR_OUT;</div><div class='ctx'> </div><div class='del'>-	if (flags == DW2102_WRITE_MSG)</div><div class='add'>+	if (flags == DW210X_WRITE_MSG)</div><div class='ctx'> 		memcpy(u8buf, data, len);</div><div class='del'>-	ret = usb_control_msg(dev, pipe, request,</div><div class='del'>-		request_type | USB_TYPE_VENDOR, value, 0 , u8buf, len, 2000);</div><div class='add'>+	ret = usb_control_msg(dev, pipe, request, request_type | USB_TYPE_VENDOR,</div><div class='add'>+				value, index , u8buf, len, 2000);</div><div class='ctx'> </div><div class='del'>-	if (flags == DW2102_READ_MSG)</div><div class='add'>+	if (flags == DW210X_READ_MSG)</div><div class='ctx'> 		memcpy(data, u8buf, len);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* I2C */</div><div class='del'>-</div><div class='ctx'> static int dw2102_i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[],</div><div class='ctx'> 		int num)</div><div class='ctx'> {</div><div class='ctx'> struct dvb_usb_device *d = i2c_get_adapdata(adap);</div><div class='ctx'> 	int i = 0, ret = 0;</div><div class='ctx'> 	u8 buf6[] = {0x2c, 0x05, 0xc0, 0, 0, 0, 0};</div><div class='del'>-	u8 request;</div><div class='ctx'> 	u16 value;</div><div class='ctx'> </div><div class='ctx'> 	if (!d)</div><div class='hunk'>@@ -76,14 +89,12 @@ struct dvb_usb_device *d = i2c_get_adapdata(adap);</div><div class='ctx'> 	switch (num) {</div><div class='ctx'> 	case 2:</div><div class='ctx'> 		/* read stv0299 register */</div><div class='del'>-		request = 0xb5;</div><div class='ctx'> 		value = msg[0].buf[0];/* register */</div><div class='ctx'> 		for (i = 0; i &lt; msg[1].len; i++) {</div><div class='ctx'> 			value = value + i;</div><div class='del'>-			ret = dw2102_op_rw(d-&gt;udev, 0xb5,</div><div class='del'>-				value, buf6, 2, DW2102_READ_MSG);</div><div class='add'>+			ret = dw210x_op_rw(d-&gt;udev, 0xb5, value, 0,</div><div class='add'>+					buf6, 2, DW210X_READ_MSG);</div><div class='ctx'> 			msg[1].buf[i] = buf6[0];</div><div class='del'>-</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 1:</div><div class='hunk'>@@ -93,8 +104,8 @@ struct dvb_usb_device *d = i2c_get_adapdata(adap);</div><div class='ctx'> 			buf6[0] = 0x2a;</div><div class='ctx'> 			buf6[1] = msg[0].buf[0];</div><div class='ctx'> 			buf6[2] = msg[0].buf[1];</div><div class='del'>-			ret = dw2102_op_rw(d-&gt;udev, 0xb2,</div><div class='del'>-				0, buf6, 3, DW2102_WRITE_MSG);</div><div class='add'>+			ret = dw210x_op_rw(d-&gt;udev, 0xb2, 0, 0,</div><div class='add'>+					buf6, 3, DW210X_WRITE_MSG);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 0x60:</div><div class='ctx'> 			if (msg[0].flags == 0) {</div><div class='hunk'>@@ -106,28 +117,156 @@ struct dvb_usb_device *d = i2c_get_adapdata(adap);</div><div class='ctx'> 				buf6[4] = msg[0].buf[1];</div><div class='ctx'> 				buf6[5] = msg[0].buf[2];</div><div class='ctx'> 				buf6[6] = msg[0].buf[3];</div><div class='del'>-				ret = dw2102_op_rw(d-&gt;udev, 0xb2,</div><div class='del'>-				0, buf6, 7, DW2102_WRITE_MSG);</div><div class='add'>+				ret = dw210x_op_rw(d-&gt;udev, 0xb2, 0, 0,</div><div class='add'>+						buf6, 7, DW210X_WRITE_MSG);</div><div class='ctx'> 			} else {</div><div class='del'>-			/* write to tuner pll */</div><div class='del'>-				ret = dw2102_op_rw(d-&gt;udev, 0xb5,</div><div class='del'>-				0, buf6, 1, DW2102_READ_MSG);</div><div class='add'>+			/* read from tuner */</div><div class='add'>+				ret = dw210x_op_rw(d-&gt;udev, 0xb5, 0, 0,</div><div class='add'>+						buf6, 1, DW210X_READ_MSG);</div><div class='ctx'> 				msg[0].buf[0] = buf6[0];</div><div class='ctx'> 			}</div><div class='ctx'> 			break;</div><div class='ctx'> 		case (DW2102_RC_QUERY):</div><div class='del'>-			ret  = dw2102_op_rw(d-&gt;udev, 0xb8,</div><div class='del'>-				0, buf6, 2, DW2102_READ_MSG);</div><div class='add'>+			ret  = dw210x_op_rw(d-&gt;udev, 0xb8, 0, 0,</div><div class='add'>+					buf6, 2, DW210X_READ_MSG);</div><div class='ctx'> 			msg[0].buf[0] = buf6[0];</div><div class='ctx'> 			msg[0].buf[1] = buf6[1];</div><div class='ctx'> 			break;</div><div class='ctx'> 		case (DW2102_VOLTAGE_CTRL):</div><div class='ctx'> 			buf6[0] = 0x30;</div><div class='ctx'> 			buf6[1] = msg[0].buf[0];</div><div class='del'>-			ret = dw2102_op_rw(d-&gt;udev, 0xb2,</div><div class='del'>-				0, buf6, 2, DW2102_WRITE_MSG);</div><div class='add'>+			ret = dw210x_op_rw(d-&gt;udev, 0xb2, 0, 0,</div><div class='add'>+					buf6, 2, DW210X_WRITE_MSG);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;d-&gt;i2c_mutex);</div><div class='add'>+	return num;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dw2102_serit_i2c_transfer(struct i2c_adapter *adap,</div><div class='add'>+						struct i2c_msg msg[], int num)</div><div class='add'>+{</div><div class='add'>+	struct dvb_usb_device *d = i2c_get_adapdata(adap);</div><div class='add'>+	int ret = 0;</div><div class='add'>+	u8 buf6[] = {0, 0, 0, 0, 0, 0, 0};</div><div class='add'>+</div><div class='add'>+	if (!d)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	if (mutex_lock_interruptible(&amp;d-&gt;i2c_mutex) &lt; 0)</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+</div><div class='add'>+	switch (num) {</div><div class='add'>+	case 2:</div><div class='add'>+		/* read si2109 register by number */</div><div class='add'>+		buf6[0] = 0xd0;</div><div class='add'>+		buf6[1] = msg[0].len;</div><div class='add'>+		buf6[2] = msg[0].buf[0];</div><div class='add'>+		ret = dw210x_op_rw(d-&gt;udev, 0xc2, 0, 0,</div><div class='add'>+				buf6, msg[0].len + 2, DW210X_WRITE_MSG);</div><div class='add'>+		/* read si2109 register */</div><div class='add'>+		ret = dw210x_op_rw(d-&gt;udev, 0xc3, 0xd0, 0,</div><div class='add'>+				buf6, msg[1].len + 2, DW210X_READ_MSG);</div><div class='add'>+		memcpy(msg[1].buf, buf6 + 2, msg[1].len);</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		switch (msg[0].addr) {</div><div class='add'>+		case 0x68:</div><div class='add'>+			/* write to si2109 register */</div><div class='add'>+			buf6[0] = 0xd0;</div><div class='add'>+			buf6[1] = msg[0].len;</div><div class='add'>+			memcpy(buf6 + 2, msg[0].buf, msg[0].len);</div><div class='add'>+			ret = dw210x_op_rw(d-&gt;udev, 0xc2, 0, 0, buf6,</div><div class='add'>+					msg[0].len + 2, DW210X_WRITE_MSG);</div><div class='add'>+			break;</div><div class='add'>+		case(DW2102_RC_QUERY):</div><div class='add'>+			ret  = dw210x_op_rw(d-&gt;udev, 0xb8, 0, 0,</div><div class='add'>+					buf6, 2, DW210X_READ_MSG);</div><div class='add'>+			msg[0].buf[0] = buf6[0];</div><div class='add'>+			msg[0].buf[1] = buf6[1];</div><div class='add'>+			break;</div><div class='add'>+		case(DW2102_VOLTAGE_CTRL):</div><div class='add'>+			buf6[0] = 0x30;</div><div class='add'>+			buf6[1] = msg[0].buf[0];</div><div class='add'>+			ret = dw210x_op_rw(d-&gt;udev, 0xb2, 0, 0,</div><div class='add'>+					buf6, 2, DW210X_WRITE_MSG);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;d-&gt;i2c_mutex);</div><div class='add'>+	return num;</div><div class='add'>+}</div><div class='add'>+static int dw2102_earda_i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[], int num)</div><div class='add'>+{</div><div class='add'>+	struct dvb_usb_device *d = i2c_get_adapdata(adap);</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (!d)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	if (mutex_lock_interruptible(&amp;d-&gt;i2c_mutex) &lt; 0)</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+</div><div class='add'>+	switch (num) {</div><div class='add'>+	case 2: {</div><div class='add'>+		/* read */</div><div class='add'>+		/* first write first register number */</div><div class='add'>+		u8 ibuf [msg[1].len + 2], obuf[3];</div><div class='add'>+		obuf[0] = 0xd0;</div><div class='add'>+		obuf[1] = msg[0].len;</div><div class='add'>+		obuf[2] = msg[0].buf[0];</div><div class='add'>+		ret = dw210x_op_rw(d-&gt;udev, 0xc2, 0, 0,</div><div class='add'>+				obuf, msg[0].len + 2, DW210X_WRITE_MSG);</div><div class='add'>+		/* second read registers */</div><div class='add'>+		ret = dw210x_op_rw(d-&gt;udev, 0xc3, 0xd1 , 0,</div><div class='add'>+				ibuf, msg[1].len + 2, DW210X_READ_MSG);</div><div class='add'>+		memcpy(msg[1].buf, ibuf + 2, msg[1].len);</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case 1:</div><div class='add'>+		switch (msg[0].addr) {</div><div class='add'>+		case 0x68: {</div><div class='add'>+			/* write to register */</div><div class='add'>+			u8 obuf[msg[0].len + 2];</div><div class='add'>+			obuf[0] = 0xd0;</div><div class='add'>+			obuf[1] = msg[0].len;</div><div class='add'>+			memcpy(obuf + 2, msg[0].buf, msg[0].len);</div><div class='add'>+			ret = dw210x_op_rw(d-&gt;udev, 0xc2, 0, 0,</div><div class='add'>+					obuf, msg[0].len + 2, DW210X_WRITE_MSG);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		case 0x61: {</div><div class='add'>+			/* write to tuner */</div><div class='add'>+			u8 obuf[msg[0].len + 2];</div><div class='add'>+			obuf[0] = 0xc2;</div><div class='add'>+			obuf[1] = msg[0].len;</div><div class='add'>+			memcpy(obuf + 2, msg[0].buf, msg[0].len);</div><div class='add'>+			ret = dw210x_op_rw(d-&gt;udev, 0xc2, 0, 0,</div><div class='add'>+					obuf, msg[0].len + 2, DW210X_WRITE_MSG);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='add'>+		case(DW2102_RC_QUERY): {</div><div class='add'>+			u8 ibuf[2];</div><div class='add'>+			ret  = dw210x_op_rw(d-&gt;udev, 0xb8, 0, 0,</div><div class='add'>+					ibuf, 2, DW210X_READ_MSG);</div><div class='add'>+			memcpy(msg[0].buf, ibuf , 2);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		case(DW2102_VOLTAGE_CTRL): {</div><div class='add'>+			u8 obuf[2];</div><div class='add'>+			obuf[0] = 0x30;</div><div class='add'>+			obuf[1] = msg[0].buf[0];</div><div class='add'>+			ret = dw210x_op_rw(d-&gt;udev, 0xb2, 0, 0,</div><div class='add'>+					obuf, 2, DW210X_WRITE_MSG);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -136,17 +275,137 @@ struct dvb_usb_device *d = i2c_get_adapdata(adap);</div><div class='ctx'> 	return num;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 dw2102_i2c_func(struct i2c_adapter *adapter)</div><div class='add'>+static int dw2104_i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[], int num)</div><div class='add'>+{</div><div class='add'>+	struct dvb_usb_device *d = i2c_get_adapdata(adap);</div><div class='add'>+	int ret = 0;</div><div class='add'>+	int len, i;</div><div class='add'>+</div><div class='add'>+	if (!d)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	if (mutex_lock_interruptible(&amp;d-&gt;i2c_mutex) &lt; 0)</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+</div><div class='add'>+	switch (num) {</div><div class='add'>+	case 2: {</div><div class='add'>+		/* read */</div><div class='add'>+		/* first write first register number */</div><div class='add'>+		u8 ibuf [msg[1].len + 2], obuf[3];</div><div class='add'>+		obuf[0] = 0xaa;</div><div class='add'>+		obuf[1] = msg[0].len;</div><div class='add'>+		obuf[2] = msg[0].buf[0];</div><div class='add'>+		ret = dw210x_op_rw(d-&gt;udev, 0xc2, 0, 0,</div><div class='add'>+				obuf, msg[0].len + 2, DW210X_WRITE_MSG);</div><div class='add'>+		/* second read registers */</div><div class='add'>+		ret = dw210x_op_rw(d-&gt;udev, 0xc3, 0xab , 0,</div><div class='add'>+				ibuf, msg[1].len + 2, DW210X_READ_MSG);</div><div class='add'>+		memcpy(msg[1].buf, ibuf + 2, msg[1].len);</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case 1:</div><div class='add'>+		switch (msg[0].addr) {</div><div class='add'>+		case 0x55: {</div><div class='add'>+			if (msg[0].buf[0] == 0xf7) {</div><div class='add'>+				/* firmware */</div><div class='add'>+				/* Write in small blocks */</div><div class='add'>+				u8 obuf[19];</div><div class='add'>+				obuf[0] = 0xaa;</div><div class='add'>+				obuf[1] = 0x11;</div><div class='add'>+				obuf[2] = 0xf7;</div><div class='add'>+				len = msg[0].len - 1;</div><div class='add'>+				i = 1;</div><div class='add'>+				do {</div><div class='add'>+					memcpy(obuf + 3, msg[0].buf + i, (len &gt; 16 ? 16 : len));</div><div class='add'>+					ret = dw210x_op_rw(d-&gt;udev, 0xc2, 0, 0,</div><div class='add'>+						obuf, (len &gt; 16 ? 16 : len) + 3, DW210X_WRITE_MSG);</div><div class='add'>+					i += 16;</div><div class='add'>+					len -= 16;</div><div class='add'>+				} while (len &gt; 0);</div><div class='add'>+			} else {</div><div class='add'>+				/* write to register */</div><div class='add'>+				u8 obuf[msg[0].len + 2];</div><div class='add'>+				obuf[0] = 0xaa;</div><div class='add'>+				obuf[1] = msg[0].len;</div><div class='add'>+				memcpy(obuf + 2, msg[0].buf, msg[0].len);</div><div class='add'>+				ret = dw210x_op_rw(d-&gt;udev, 0xc2, 0, 0,</div><div class='add'>+						obuf, msg[0].len + 2, DW210X_WRITE_MSG);</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		case(DW2102_RC_QUERY): {</div><div class='add'>+			u8 ibuf[2];</div><div class='add'>+			ret  = dw210x_op_rw(d-&gt;udev, 0xb8, 0, 0,</div><div class='add'>+					ibuf, 2, DW210X_READ_MSG);</div><div class='add'>+			memcpy(msg[0].buf, ibuf , 2);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		case(DW2102_VOLTAGE_CTRL): {</div><div class='add'>+			u8 obuf[2];</div><div class='add'>+			obuf[0] = 0x30;</div><div class='add'>+			obuf[1] = msg[0].buf[0];</div><div class='add'>+			ret = dw210x_op_rw(d-&gt;udev, 0xb2, 0, 0,</div><div class='add'>+					obuf, 2, DW210X_WRITE_MSG);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;d-&gt;i2c_mutex);</div><div class='add'>+	return num;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 dw210x_i2c_func(struct i2c_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	return I2C_FUNC_I2C;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct i2c_algorithm dw2102_i2c_algo = {</div><div class='ctx'> 	.master_xfer = dw2102_i2c_transfer,</div><div class='del'>-	.functionality = dw2102_i2c_func,</div><div class='add'>+	.functionality = dw210x_i2c_func,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct i2c_algorithm dw2102_serit_i2c_algo = {</div><div class='add'>+	.master_xfer = dw2102_serit_i2c_transfer,</div><div class='add'>+	.functionality = dw210x_i2c_func,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct i2c_algorithm dw2102_earda_i2c_algo = {</div><div class='add'>+	.master_xfer = dw2102_earda_i2c_transfer,</div><div class='add'>+	.functionality = dw210x_i2c_func,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int dw2102_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage)</div><div class='add'>+static struct i2c_algorithm dw2104_i2c_algo = {</div><div class='add'>+	.master_xfer = dw2104_i2c_transfer,</div><div class='add'>+	.functionality = dw210x_i2c_func,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int dw210x_read_mac_address(struct dvb_usb_device *d, u8 mac[6])</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	u8 ibuf[] = {0, 0};</div><div class='add'>+	u8 eeprom[256], eepromline[16];</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 256; i++) {</div><div class='add'>+		if (dw210x_op_rw(d-&gt;udev, 0xb6, 0xa0 , i, ibuf, 2, DW210X_READ_MSG) &lt; 0) {</div><div class='add'>+			err("read eeprom failed.");</div><div class='add'>+			return -1;</div><div class='add'>+		} else {</div><div class='add'>+			eepromline[i%16] = ibuf[0];</div><div class='add'>+			eeprom[i] = ibuf[0];</div><div class='add'>+		}</div><div class='add'>+		if ((i % 16) == 15) {</div><div class='add'>+			deb_xfer("%02x: ", i - 15);</div><div class='add'>+			debug_dump(eepromline, 16, deb_xfer);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	memcpy(mac, eeprom + 8, 6);</div><div class='add'>+	return 0;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int dw210x_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage)</div><div class='ctx'> {</div><div class='ctx'> 	static u8 command_13v[1] = {0x00};</div><div class='ctx'> 	static u8 command_18v[1] = {0x01};</div><div class='hunk'>@@ -163,18 +422,78 @@ static int dw2102_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dw2102_frontend_attach(struct dvb_usb_adapter *d)</div><div class='add'>+static struct stv0299_config sharp_z0194a_config = {</div><div class='add'>+	.demod_address = 0x68,</div><div class='add'>+	.inittab = sharp_z0194a_inittab,</div><div class='add'>+	.mclk = 88000000UL,</div><div class='add'>+	.invert = 1,</div><div class='add'>+	.skip_reinit = 0,</div><div class='add'>+	.lock_output = STV0299_LOCKOUTPUT_1,</div><div class='add'>+	.volt13_op0_op1 = STV0299_VOLT13_OP1,</div><div class='add'>+	.min_delay_ms = 100,</div><div class='add'>+	.set_symbol_rate = sharp_z0194a_set_symbol_rate,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct cx24116_config dw2104_config = {</div><div class='add'>+	.demod_address = 0x55,</div><div class='add'>+	.mpg_clk_pos_pol = 0x01,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct si21xx_config serit_sp1511lhb_config = {</div><div class='add'>+	.demod_address = 0x68,</div><div class='add'>+	.min_delay_ms = 100,</div><div class='add'>+</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int dw2104_frontend_attach(struct dvb_usb_adapter *d)</div><div class='ctx'> {</div><div class='del'>-	d-&gt;fe = dvb_attach(stv0299_attach, &amp;sharp_z0194a_config,</div><div class='del'>-		&amp;d-&gt;dev-&gt;i2c_adap);</div><div class='del'>-	if (d-&gt;fe != NULL) {</div><div class='del'>-		d-&gt;fe-&gt;ops.set_voltage = dw2102_set_voltage;</div><div class='del'>-		info("Attached stv0299!\n");</div><div class='add'>+	if ((d-&gt;fe = dvb_attach(cx24116_attach, &amp;dw2104_config,</div><div class='add'>+			&amp;d-&gt;dev-&gt;i2c_adap)) != NULL) {</div><div class='add'>+		d-&gt;fe-&gt;ops.set_voltage = dw210x_set_voltage;</div><div class='add'>+		info("Attached cx24116!\n");</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	return -EIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct dvb_usb_device_properties dw2102_properties;</div><div class='add'>+</div><div class='add'>+static int dw2102_frontend_attach(struct dvb_usb_adapter *d)</div><div class='add'>+{</div><div class='add'>+	if (dw2102_properties.i2c_algo == &amp;dw2102_serit_i2c_algo) {</div><div class='add'>+		/*dw2102_properties.adapter-&gt;tuner_attach = NULL;*/</div><div class='add'>+		d-&gt;fe = dvb_attach(si21xx_attach, &amp;serit_sp1511lhb_config,</div><div class='add'>+					&amp;d-&gt;dev-&gt;i2c_adap);</div><div class='add'>+		if (d-&gt;fe != NULL) {</div><div class='add'>+			d-&gt;fe-&gt;ops.set_voltage = dw210x_set_voltage;</div><div class='add'>+			info("Attached si21xx!\n");</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (dw2102_properties.i2c_algo == &amp;dw2102_earda_i2c_algo) {</div><div class='add'>+		/*dw2102_properties.adapter-&gt;tuner_attach = dw2102_tuner_attach;*/</div><div class='add'>+		d-&gt;fe = dvb_attach(stv0288_attach, &amp;earda_config,</div><div class='add'>+					&amp;d-&gt;dev-&gt;i2c_adap);</div><div class='add'>+		if (d-&gt;fe != NULL) {</div><div class='add'>+			d-&gt;fe-&gt;ops.set_voltage = dw210x_set_voltage;</div><div class='add'>+			info("Attached stv0288!\n");</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dw2102_properties.i2c_algo == &amp;dw2102_i2c_algo) {</div><div class='add'>+		/*dw2102_properties.adapter-&gt;tuner_attach = dw2102_tuner_attach;*/</div><div class='add'>+		d-&gt;fe = dvb_attach(stv0299_attach, &amp;sharp_z0194a_config,</div><div class='add'>+					&amp;d-&gt;dev-&gt;i2c_adap);</div><div class='add'>+		if (d-&gt;fe != NULL) {</div><div class='add'>+			d-&gt;fe-&gt;ops.set_voltage = dw210x_set_voltage;</div><div class='add'>+			info("Attached stv0299!\n");</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return -EIO;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int dw2102_tuner_attach(struct dvb_usb_adapter *adap)</div><div class='ctx'> {</div><div class='ctx'> 	dvb_attach(dvb_pll_attach, adap-&gt;fe, 0x60,</div><div class='hunk'>@@ -182,7 +501,15 @@ static int dw2102_tuner_attach(struct dvb_usb_adapter *adap)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct dvb_usb_rc_key dw2102_rc_keys[] = {</div><div class='add'>+static int dw2102_earda_tuner_attach(struct dvb_usb_adapter *adap)</div><div class='add'>+{</div><div class='add'>+	dvb_attach(stb6000_attach, adap-&gt;fe, 0x61,</div><div class='add'>+		&amp;adap-&gt;dev-&gt;i2c_adap);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct dvb_usb_rc_key dw210x_rc_keys[] = {</div><div class='ctx'> 	{ 0xf8,	0x0a, KEY_Q },		/*power*/</div><div class='ctx'> 	{ 0xf8,	0x0c, KEY_M },		/*mute*/</div><div class='ctx'> 	{ 0xf8,	0x11, KEY_1 },</div><div class='hunk'>@@ -221,7 +548,7 @@ static struct dvb_usb_rc_key dw2102_rc_keys[] = {</div><div class='ctx'> </div><div class='ctx'> static int dw2102_rc_query(struct dvb_usb_device *d, u32 *event, int *state)</div><div class='ctx'> {</div><div class='del'>-	struct dw2102_state *st = d-&gt;priv;</div><div class='add'>+	struct dw210x_state *st = d-&gt;priv;</div><div class='ctx'> 	u8 key[2];</div><div class='ctx'> 	struct i2c_msg msg[] = {</div><div class='ctx'> 		{.addr = DW2102_RC_QUERY, .flags = I2C_M_RD, .buf = key,</div><div class='hunk'>@@ -231,12 +558,12 @@ static int dw2102_rc_query(struct dvb_usb_device *d, u32 *event, int *state)</div><div class='ctx'> </div><div class='ctx'> 	*state = REMOTE_NO_KEY_PRESSED;</div><div class='ctx'> 	if (dw2102_i2c_transfer(&amp;d-&gt;i2c_adap, msg, 1) == 1) {</div><div class='del'>-		for (i = 0; i &lt; ARRAY_SIZE(dw2102_rc_keys); i++) {</div><div class='del'>-			if (dw2102_rc_keys[i].data == msg[0].buf[0]) {</div><div class='add'>+		for (i = 0; i &lt; ARRAY_SIZE(dw210x_rc_keys); i++) {</div><div class='add'>+			if (dw210x_rc_keys[i].data == msg[0].buf[0]) {</div><div class='ctx'> 				*state = REMOTE_KEY_PRESSED;</div><div class='del'>-				*event = dw2102_rc_keys[i].event;</div><div class='add'>+				*event = dw210x_rc_keys[i].event;</div><div class='ctx'> 				st-&gt;last_key_pressed =</div><div class='del'>-					dw2102_rc_keys[i].event;</div><div class='add'>+					dw210x_rc_keys[i].event;</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> 		st-&gt;last_key_pressed = 0;</div><div class='hunk'>@@ -249,6 +576,8 @@ static int dw2102_rc_query(struct dvb_usb_device *d, u32 *event, int *state)</div><div class='ctx'> static struct usb_device_id dw2102_table[] = {</div><div class='ctx'> 	{USB_DEVICE(USB_VID_CYPRESS, USB_PID_DW2102)},</div><div class='ctx'> 	{USB_DEVICE(USB_VID_CYPRESS, 0x2101)},</div><div class='add'>+	{USB_DEVICE(USB_VID_CYPRESS, 0x2104)},</div><div class='add'>+	{USB_DEVICE(0x9022, 0xd650)},</div><div class='ctx'> 	{ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -260,7 +589,7 @@ static int dw2102_load_firmware(struct usb_device *dev,</div><div class='ctx'> 	u8 *b, *p;</div><div class='ctx'> 	int ret = 0, i;</div><div class='ctx'> 	u8 reset;</div><div class='del'>-	u8 reset16 [] = {0, 0, 0, 0, 0, 0, 0};</div><div class='add'>+	u8 reset16[] = {0, 0, 0, 0, 0, 0, 0};</div><div class='ctx'> 	const struct firmware *fw;</div><div class='ctx'> 	const char *filename = "dvb-usb-dw2101.fw";</div><div class='ctx'> 	switch (dev-&gt;descriptor.idProduct) {</div><div class='hunk'>@@ -273,25 +602,23 @@ static int dw2102_load_firmware(struct usb_device *dev,</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='del'>-	case USB_PID_DW2102:</div><div class='add'>+	default:</div><div class='ctx'> 		fw = frmwr;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	info("start downloading DW2102 firmware");</div><div class='add'>+	info("start downloading DW210X firmware");</div><div class='ctx'> 	p = kmalloc(fw-&gt;size, GFP_KERNEL);</div><div class='ctx'> 	reset = 1;</div><div class='ctx'> 	/*stop the CPU*/</div><div class='del'>-	dw2102_op_rw(dev, 0xa0, 0x7f92, &amp;reset, 1, DW2102_WRITE_MSG);</div><div class='del'>-	dw2102_op_rw(dev, 0xa0, 0xe600, &amp;reset, 1, DW2102_WRITE_MSG);</div><div class='add'>+	dw210x_op_rw(dev, 0xa0, 0x7f92, 0, &amp;reset, 1, DW210X_WRITE_MSG);</div><div class='add'>+	dw210x_op_rw(dev, 0xa0, 0xe600, 0, &amp;reset, 1, DW210X_WRITE_MSG);</div><div class='ctx'> </div><div class='ctx'> 	if (p != NULL) {</div><div class='ctx'> 		memcpy(p, fw-&gt;data, fw-&gt;size);</div><div class='ctx'> 		for (i = 0; i &lt; fw-&gt;size; i += 0x40) {</div><div class='ctx'> 			b = (u8 *) p + i;</div><div class='del'>-			if (dw2102_op_rw</div><div class='del'>-				(dev, 0xa0, i, b , 0x40,</div><div class='del'>-					DW2102_WRITE_MSG) != 0x40</div><div class='del'>-				) {</div><div class='add'>+			if (dw210x_op_rw(dev, 0xa0, i, 0, b , 0x40,</div><div class='add'>+					DW210X_WRITE_MSG) != 0x40) {</div><div class='ctx'> 				err("error while transferring firmware");</div><div class='ctx'> 				ret = -EINVAL;</div><div class='ctx'> 				break;</div><div class='hunk'>@@ -299,43 +626,66 @@ static int dw2102_load_firmware(struct usb_device *dev,</div><div class='ctx'> 		}</div><div class='ctx'> 		/* restart the CPU */</div><div class='ctx'> 		reset = 0;</div><div class='del'>-		if (ret || dw2102_op_rw</div><div class='del'>-			(dev, 0xa0, 0x7f92, &amp;reset, 1,</div><div class='del'>-			DW2102_WRITE_MSG) != 1) {</div><div class='add'>+		if (ret || dw210x_op_rw(dev, 0xa0, 0x7f92, 0, &amp;reset, 1,</div><div class='add'>+					DW210X_WRITE_MSG) != 1) {</div><div class='ctx'> 			err("could not restart the USB controller CPU.");</div><div class='ctx'> 			ret = -EINVAL;</div><div class='ctx'> 		}</div><div class='del'>-		if (ret || dw2102_op_rw</div><div class='del'>-			(dev, 0xa0, 0xe600, &amp;reset, 1,</div><div class='del'>-			DW2102_WRITE_MSG) != 1) {</div><div class='add'>+		if (ret || dw210x_op_rw(dev, 0xa0, 0xe600, 0, &amp;reset, 1,</div><div class='add'>+					DW210X_WRITE_MSG) != 1) {</div><div class='ctx'> 			err("could not restart the USB controller CPU.");</div><div class='ctx'> 			ret = -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> 		/* init registers */</div><div class='ctx'> 		switch (dev-&gt;descriptor.idProduct) {</div><div class='del'>-		case USB_PID_DW2102:</div><div class='del'>-			dw2102_op_rw</div><div class='del'>-				(dev, 0xbf, 0x0040, &amp;reset, 0,</div><div class='del'>-				DW2102_WRITE_MSG);</div><div class='del'>-			dw2102_op_rw</div><div class='del'>-				(dev, 0xb9, 0x0000, &amp;reset16[0], 2,</div><div class='del'>-				DW2102_READ_MSG);</div><div class='add'>+		case USB_PID_DW2104:</div><div class='add'>+		case 0xd650:</div><div class='add'>+			reset = 1;</div><div class='add'>+			dw210x_op_rw(dev, 0xc4, 0x0000, 0, &amp;reset, 1,</div><div class='add'>+					DW210X_WRITE_MSG);</div><div class='add'>+			reset = 0;</div><div class='add'>+			dw210x_op_rw(dev, 0xbf, 0x0040, 0, &amp;reset, 0,</div><div class='add'>+					DW210X_WRITE_MSG);</div><div class='ctx'> 			break;</div><div class='add'>+		case USB_PID_DW2102:</div><div class='add'>+			dw210x_op_rw(dev, 0xbf, 0x0040, 0, &amp;reset, 0,</div><div class='add'>+					DW210X_WRITE_MSG);</div><div class='add'>+			dw210x_op_rw(dev, 0xb9, 0x0000, 0, &amp;reset16[0], 2,</div><div class='add'>+					DW210X_READ_MSG);</div><div class='add'>+			/* check STV0299 frontend  */</div><div class='add'>+			dw210x_op_rw(dev, 0xb5, 0, 0, &amp;reset16[0], 2,</div><div class='add'>+					DW210X_READ_MSG);</div><div class='add'>+			if (reset16[0] == 0xa1) {</div><div class='add'>+				dw2102_properties.i2c_algo = &amp;dw2102_i2c_algo;</div><div class='add'>+				dw2102_properties.adapter-&gt;tuner_attach = &amp;dw2102_tuner_attach;</div><div class='add'>+				break;</div><div class='add'>+			} else {</div><div class='add'>+				/* check STV0288 frontend  */</div><div class='add'>+				reset16[0] = 0xd0;</div><div class='add'>+				reset16[1] = 1;</div><div class='add'>+				reset16[2] = 0;</div><div class='add'>+				dw210x_op_rw(dev, 0xc2, 0, 0, &amp;reset16[0], 3,</div><div class='add'>+						DW210X_WRITE_MSG);</div><div class='add'>+				dw210x_op_rw(dev, 0xc3, 0xd1, 0, &amp;reset16[0], 3,</div><div class='add'>+						DW210X_READ_MSG);</div><div class='add'>+				if (reset16[2] == 0x11) {</div><div class='add'>+					dw2102_properties.i2c_algo = &amp;dw2102_earda_i2c_algo;</div><div class='add'>+					dw2102_properties.adapter-&gt;tuner_attach = &amp;dw2102_earda_tuner_attach;</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='ctx'> 		case 0x2101:</div><div class='del'>-			dw2102_op_rw</div><div class='del'>-				(dev, 0xbc, 0x0030, &amp;reset16[0], 2,</div><div class='del'>-				DW2102_READ_MSG);</div><div class='del'>-			dw2102_op_rw</div><div class='del'>-				(dev, 0xba, 0x0000, &amp;reset16[0], 7,</div><div class='del'>-				DW2102_READ_MSG);</div><div class='del'>-			dw2102_op_rw</div><div class='del'>-				(dev, 0xba, 0x0000, &amp;reset16[0], 7,</div><div class='del'>-				DW2102_READ_MSG);</div><div class='del'>-			dw2102_op_rw</div><div class='del'>-				(dev, 0xb9, 0x0000, &amp;reset16[0], 2,</div><div class='del'>-				DW2102_READ_MSG);</div><div class='add'>+			dw210x_op_rw(dev, 0xbc, 0x0030, 0, &amp;reset16[0], 2,</div><div class='add'>+					DW210X_READ_MSG);</div><div class='add'>+			dw210x_op_rw(dev, 0xba, 0x0000, 0, &amp;reset16[0], 7,</div><div class='add'>+					DW210X_READ_MSG);</div><div class='add'>+			dw210x_op_rw(dev, 0xba, 0x0000, 0, &amp;reset16[0], 7,</div><div class='add'>+					DW210X_READ_MSG);</div><div class='add'>+			dw210x_op_rw(dev, 0xb9, 0x0000, 0, &amp;reset16[0], 2,</div><div class='add'>+					DW210X_READ_MSG);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='add'>+		msleep(100);</div><div class='ctx'> 		kfree(p);</div><div class='ctx'> 	}</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -345,12 +695,12 @@ static struct dvb_usb_device_properties dw2102_properties = {</div><div class='ctx'> 	.caps = DVB_USB_IS_AN_I2C_ADAPTER,</div><div class='ctx'> 	.usb_ctrl = DEVICE_SPECIFIC,</div><div class='ctx'> 	.firmware = "dvb-usb-dw2102.fw",</div><div class='del'>-	.size_of_priv = sizeof(struct dw2102_state),</div><div class='add'>+	.size_of_priv = sizeof(struct dw210x_state),</div><div class='ctx'> 	.no_reconnect = 1,</div><div class='ctx'> </div><div class='del'>-	.i2c_algo = &amp;dw2102_i2c_algo,</div><div class='del'>-	.rc_key_map = dw2102_rc_keys,</div><div class='del'>-	.rc_key_map_size = ARRAY_SIZE(dw2102_rc_keys),</div><div class='add'>+	.i2c_algo = &amp;dw2102_serit_i2c_algo,</div><div class='add'>+	.rc_key_map = dw210x_rc_keys,</div><div class='add'>+	.rc_key_map_size = ARRAY_SIZE(dw210x_rc_keys),</div><div class='ctx'> 	.rc_interval = 150,</div><div class='ctx'> 	.rc_query = dw2102_rc_query,</div><div class='ctx'> </div><div class='hunk'>@@ -358,11 +708,12 @@ static struct dvb_usb_device_properties dw2102_properties = {</div><div class='ctx'> 	/* parameter for the MPEG2-data transfer */</div><div class='ctx'> 	.num_adapters = 1,</div><div class='ctx'> 	.download_firmware = dw2102_load_firmware,</div><div class='del'>-	.adapter = {</div><div class='add'>+	.read_mac_address = dw210x_read_mac_address,</div><div class='add'>+		.adapter = {</div><div class='ctx'> 		{</div><div class='ctx'> 			.frontend_attach = dw2102_frontend_attach,</div><div class='ctx'> 			.streaming_ctrl = NULL,</div><div class='del'>-			.tuner_attach = dw2102_tuner_attach,</div><div class='add'>+			.tuner_attach = NULL,</div><div class='ctx'> 			.stream = {</div><div class='ctx'> 				.type = USB_BULK,</div><div class='ctx'> 				.count = 8,</div><div class='hunk'>@@ -388,11 +739,64 @@ static struct dvb_usb_device_properties dw2102_properties = {</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct dvb_usb_device_properties dw2104_properties = {</div><div class='add'>+	.caps = DVB_USB_IS_AN_I2C_ADAPTER,</div><div class='add'>+	.usb_ctrl = DEVICE_SPECIFIC,</div><div class='add'>+	.firmware = "dvb-usb-dw2104.fw",</div><div class='add'>+	.size_of_priv = sizeof(struct dw210x_state),</div><div class='add'>+	.no_reconnect = 1,</div><div class='add'>+</div><div class='add'>+	.i2c_algo = &amp;dw2104_i2c_algo,</div><div class='add'>+	.rc_key_map = dw210x_rc_keys,</div><div class='add'>+	.rc_key_map_size = ARRAY_SIZE(dw210x_rc_keys),</div><div class='add'>+	.rc_interval = 150,</div><div class='add'>+	.rc_query = dw2102_rc_query,</div><div class='add'>+</div><div class='add'>+	.generic_bulk_ctrl_endpoint = 0x81,</div><div class='add'>+	/* parameter for the MPEG2-data transfer */</div><div class='add'>+	.num_adapters = 1,</div><div class='add'>+	.download_firmware = dw2102_load_firmware,</div><div class='add'>+	.read_mac_address = dw210x_read_mac_address,</div><div class='add'>+	.adapter = {</div><div class='add'>+		{</div><div class='add'>+			.frontend_attach = dw2104_frontend_attach,</div><div class='add'>+			.streaming_ctrl = NULL,</div><div class='add'>+			/*.tuner_attach = dw2104_tuner_attach,*/</div><div class='add'>+			.stream = {</div><div class='add'>+				.type = USB_BULK,</div><div class='add'>+				.count = 8,</div><div class='add'>+				.endpoint = 0x82,</div><div class='add'>+				.u = {</div><div class='add'>+					.bulk = {</div><div class='add'>+						.buffersize = 4096,</div><div class='add'>+					}</div><div class='add'>+				}</div><div class='add'>+			},</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	.num_device_descs = 2,</div><div class='add'>+	.devices = {</div><div class='add'>+		{ "DVBWorld DW2104 USB2.0",</div><div class='add'>+			{&amp;dw2102_table[2], NULL},</div><div class='add'>+			{NULL},</div><div class='add'>+		},</div><div class='add'>+		{ "TeVii S650 USB2.0",</div><div class='add'>+			{&amp;dw2102_table[3], NULL},</div><div class='add'>+			{NULL},</div><div class='add'>+		},</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int dw2102_probe(struct usb_interface *intf,</div><div class='ctx'> 		const struct usb_device_id *id)</div><div class='ctx'> {</div><div class='del'>-	return dvb_usb_device_init(intf, &amp;dw2102_properties,</div><div class='del'>-		THIS_MODULE, NULL, adapter_nr);</div><div class='add'>+	if (0 == dvb_usb_device_init(intf, &amp;dw2102_properties,</div><div class='add'>+			THIS_MODULE, NULL, adapter_nr) ||</div><div class='add'>+	    0 == dvb_usb_device_init(intf, &amp;dw2104_properties,</div><div class='add'>+			THIS_MODULE, NULL, adapter_nr)) {</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct usb_driver dw2102_driver = {</div><div class='hunk'>@@ -420,6 +824,6 @@ module_init(dw2102_module_init);</div><div class='ctx'> module_exit(dw2102_module_exit);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Igor M. Liplianin (c) liplianin@me.by");</div><div class='del'>-MODULE_DESCRIPTION("Driver for DVBWorld DVB-S 2101 2102 USB2.0 device");</div><div class='add'>+MODULE_DESCRIPTION("Driver for DVBWorld DVB-S 2101, 2102, DVB-S2 2104 USB2.0 device");</div><div class='ctx'> MODULE_VERSION("0.1");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/dw2102.h b/drivers/media/dvb/dvb-usb/dw2102.h<br/>index 7a310f906837..e3370734e95a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/dvb-usb/dw2102.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/dvb/dvb-usb/dw2102.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/dvb-usb/dw2102.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/dvb-usb/dw2102.h</a></div><div class='hunk'>@@ -4,6 +4,5 @@</div><div class='ctx'> #define DVB_USB_LOG_PREFIX "dw2102"</div><div class='ctx'> #include "dvb-usb.h"</div><div class='ctx'> </div><div class='del'>-extern int dvb_usb_dw2102_debug;</div><div class='ctx'> #define deb_xfer(args...) dprintk(dvb_usb_dw2102_debug, 0x02, args)</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/media/dvb/frontends/Kconfig b/drivers/media/dvb/frontends/Kconfig<br/>index 7dbb4a223c99..96b93e21a84b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/frontends/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/dvb/frontends/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/frontends/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/Kconfig</a></div><div class='hunk'>@@ -43,6 +43,20 @@ config DVB_S5H1420</div><div class='ctx'> 	help</div><div class='ctx'> 	  A DVB-S tuner module. Say Y when you want to support this frontend.</div><div class='ctx'> </div><div class='add'>+config DVB_STV0288</div><div class='add'>+	tristate "ST STV0288 based"</div><div class='add'>+	depends on DVB_CORE &amp;&amp; I2C</div><div class='add'>+	default m if DVB_FE_CUSTOMISE</div><div class='add'>+	help</div><div class='add'>+	  A DVB-S tuner module. Say Y when you want to support this frontend.</div><div class='add'>+</div><div class='add'>+config DVB_STB6000</div><div class='add'>+	tristate "ST STB6000 silicon tuner"</div><div class='add'>+	depends on DVB_CORE &amp;&amp; I2C</div><div class='add'>+	default m if DVB_FE_CUSTOMISE</div><div class='add'>+	  help</div><div class='add'>+	  A DVB-S silicon tuner module. Say Y when you want to support this tuner.</div><div class='add'>+</div><div class='ctx'> config DVB_STV0299</div><div class='ctx'> 	tristate "ST STV0299 based"</div><div class='ctx'> 	depends on DVB_CORE &amp;&amp; I2C</div><div class='hunk'>@@ -92,6 +106,20 @@ config DVB_TUA6100</div><div class='ctx'> 	help</div><div class='ctx'> 	  A DVB-S PLL chip.</div><div class='ctx'> </div><div class='add'>+config DVB_CX24116</div><div class='add'>+	tristate "Conexant CX24116 based"</div><div class='add'>+	depends on DVB_CORE &amp;&amp; I2C</div><div class='add'>+	default m if DVB_FE_CUSTOMISE</div><div class='add'>+	help</div><div class='add'>+	  A DVB-S/S2 tuner module. Say Y when you want to support this frontend.</div><div class='add'>+</div><div class='add'>+config DVB_SI21XX</div><div class='add'>+	tristate "Silicon Labs SI21XX based"</div><div class='add'>+	depends on DVB_CORE &amp;&amp; I2C</div><div class='add'>+	default m if DVB_FE_CUSTOMISE</div><div class='add'>+	help</div><div class='add'>+	  A DVB-S tuner module. Say Y when you want to support this frontend.</div><div class='add'>+</div><div class='ctx'> comment "DVB-T (terrestrial) frontends"</div><div class='ctx'> 	depends on DVB_CORE</div><div class='ctx'> </div><div class='hunk'>@@ -385,4 +413,23 @@ config DVB_ISL6421</div><div class='ctx'> 	help</div><div class='ctx'> 	  An SEC control chip.</div><div class='ctx'> </div><div class='add'>+config DVB_LGS8GL5</div><div class='add'>+	tristate "Silicon Legend LGS-8GL5 demodulator (OFDM)"</div><div class='add'>+	depends on DVB_CORE &amp;&amp; I2C</div><div class='add'>+	default m if DVB_FE_CUSTOMISE</div><div class='add'>+	help</div><div class='add'>+	  A DMB-TH tuner module. Say Y when you want to support this frontend.</div><div class='add'>+</div><div class='add'>+comment "Tools to develop new frontends"</div><div class='add'>+</div><div class='add'>+config DVB_DUMMY_FE</div><div class='add'>+	tristate "Dummy frontend driver"</div><div class='add'>+	default n</div><div class='add'>+</div><div class='add'>+config DVB_AF9013</div><div class='add'>+	tristate "Afatech AF9013 demodulator"</div><div class='add'>+	depends on DVB_CORE &amp;&amp; I2C</div><div class='add'>+	default m if DVB_FE_CUSTOMISE</div><div class='add'>+	help</div><div class='add'>+	  Say Y when you want to support this frontend.</div><div class='ctx'> endmenu</div><div class='head'>diff --git a/drivers/media/dvb/frontends/Makefile b/drivers/media/dvb/frontends/Makefile<br/>index 028da55611c0..aba79f4a63a7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/frontends/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/dvb/frontends/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/frontends/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/Makefile</a></div><div class='hunk'>@@ -48,3 +48,10 @@ obj-$(CONFIG_DVB_TUNER_ITD1000) += itd1000.o</div><div class='ctx'> obj-$(CONFIG_DVB_AU8522) += au8522.o</div><div class='ctx'> obj-$(CONFIG_DVB_TDA10048) += tda10048.o</div><div class='ctx'> obj-$(CONFIG_DVB_S5H1411) += s5h1411.o</div><div class='add'>+obj-$(CONFIG_DVB_LGS8GL5) += lgs8gl5.o</div><div class='add'>+obj-$(CONFIG_DVB_DUMMY_FE) += dvb_dummy_fe.o</div><div class='add'>+obj-$(CONFIG_DVB_AF9013) += af9013.o</div><div class='add'>+obj-$(CONFIG_DVB_CX24116) += cx24116.o</div><div class='add'>+obj-$(CONFIG_DVB_SI21XX) += si21xx.o</div><div class='add'>+obj-$(CONFIG_DVB_STV0288) += stv0288.o</div><div class='add'>+obj-$(CONFIG_DVB_STB6000) += stb6000.o</div><div class='head'>diff --git a/drivers/media/dvb/frontends/af9013.c b/drivers/media/dvb/frontends/af9013.c<br/>new file mode 100644<br/>index 000000000000..21c1060cf10e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/frontends/af9013.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/af9013.c</a></div><div class='hunk'>@@ -0,0 +1,1685 @@</div><div class='add'>+/*</div><div class='add'>+ * DVB USB Linux driver for Afatech AF9015 DVB-T USB2.0 receiver</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2007 Antti Palosaari &lt;crope@iki.fi&gt;</div><div class='add'>+ *</div><div class='add'>+ * Thanks to Afatech who kindly provided information.</div><div class='add'>+ *</div><div class='add'>+ *    This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *    it under the terms of the GNU General Public License as published by</div><div class='add'>+ *    the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ *    (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *    This program is distributed in the hope that it will be useful,</div><div class='add'>+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *    GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *    You should have received a copy of the GNU General Public License</div><div class='add'>+ *    along with this program; if not, write to the Free Software</div><div class='add'>+ *    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/firmware.h&gt;</div><div class='add'>+</div><div class='add'>+#include "dvb_frontend.h"</div><div class='add'>+#include "af9013_priv.h"</div><div class='add'>+#include "af9013.h"</div><div class='add'>+</div><div class='add'>+int af9013_debug;</div><div class='add'>+</div><div class='add'>+struct af9013_state {</div><div class='add'>+	struct i2c_adapter *i2c;</div><div class='add'>+	struct dvb_frontend frontend;</div><div class='add'>+</div><div class='add'>+	struct af9013_config config;</div><div class='add'>+</div><div class='add'>+	u16 signal_strength;</div><div class='add'>+	u32 ber;</div><div class='add'>+	u32 ucblocks;</div><div class='add'>+	u16 snr;</div><div class='add'>+	u32 frequency;</div><div class='add'>+	unsigned long next_statistics_check;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u8 regmask[8] = { 0x01, 0x03, 0x07, 0x0f, 0x1f, 0x3f, 0x7f, 0xff };</div><div class='add'>+</div><div class='add'>+static int af9013_write_regs(struct af9013_state *state, u8 mbox, u16 reg,</div><div class='add'>+	u8 *val, u8 len)</div><div class='add'>+{</div><div class='add'>+	u8 buf[3+len];</div><div class='add'>+	struct i2c_msg msg = {</div><div class='add'>+		.addr = state-&gt;config.demod_address,</div><div class='add'>+		.flags = 0,</div><div class='add'>+		.len = sizeof(buf),</div><div class='add'>+		.buf = buf };</div><div class='add'>+</div><div class='add'>+	buf[0] = reg &gt;&gt; 8;</div><div class='add'>+	buf[1] = reg &amp; 0xff;</div><div class='add'>+	buf[2] = mbox;</div><div class='add'>+	memcpy(&amp;buf[3], val, len);</div><div class='add'>+</div><div class='add'>+	if (i2c_transfer(state-&gt;i2c, &amp;msg, 1) != 1) {</div><div class='add'>+		warn("I2C write failed reg:%04x len:%d", reg, len);</div><div class='add'>+		return -EREMOTEIO;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int af9013_write_ofdm_regs(struct af9013_state *state, u16 reg, u8 *val,</div><div class='add'>+	u8 len)</div><div class='add'>+{</div><div class='add'>+	u8 mbox = (1 &lt;&lt; 0)|(1 &lt;&lt; 1)|((len - 1) &lt;&lt; 2)|(0 &lt;&lt; 6)|(0 &lt;&lt; 7);</div><div class='add'>+	return af9013_write_regs(state, mbox, reg, val, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int af9013_write_ofsm_regs(struct af9013_state *state, u16 reg, u8 *val,</div><div class='add'>+	u8 len)</div><div class='add'>+{</div><div class='add'>+	u8 mbox = (1 &lt;&lt; 0)|(1 &lt;&lt; 1)|((len - 1) &lt;&lt; 2)|(1 &lt;&lt; 6)|(1 &lt;&lt; 7);</div><div class='add'>+	return af9013_write_regs(state, mbox, reg, val, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* write single register */</div><div class='add'>+static int af9013_write_reg(struct af9013_state *state, u16 reg, u8 val)</div><div class='add'>+{</div><div class='add'>+	return af9013_write_ofdm_regs(state, reg, &amp;val, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* read single register */</div><div class='add'>+static int af9013_read_reg(struct af9013_state *state, u16 reg, u8 *val)</div><div class='add'>+{</div><div class='add'>+	u8 obuf[3] = { reg &gt;&gt; 8, reg &amp; 0xff, 0 };</div><div class='add'>+	u8 ibuf[1];</div><div class='add'>+	struct i2c_msg msg[2] = {</div><div class='add'>+		{</div><div class='add'>+			.addr = state-&gt;config.demod_address,</div><div class='add'>+			.flags = 0,</div><div class='add'>+			.len = sizeof(obuf),</div><div class='add'>+			.buf = obuf</div><div class='add'>+		}, {</div><div class='add'>+			.addr = state-&gt;config.demod_address,</div><div class='add'>+			.flags = I2C_M_RD,</div><div class='add'>+			.len = sizeof(ibuf),</div><div class='add'>+			.buf = ibuf</div><div class='add'>+		}</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (i2c_transfer(state-&gt;i2c, msg, 2) != 2) {</div><div class='add'>+		warn("I2C read failed reg:%04x", reg);</div><div class='add'>+		return -EREMOTEIO;</div><div class='add'>+	}</div><div class='add'>+	*val = ibuf[0];</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int af9013_write_reg_bits(struct af9013_state *state, u16 reg, u8 pos,</div><div class='add'>+	u8 len, u8 val)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u8 tmp, mask;</div><div class='add'>+</div><div class='add'>+	ret = af9013_read_reg(state, reg, &amp;tmp);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	mask = regmask[len - 1] &lt;&lt; pos;</div><div class='add'>+	tmp = (tmp &amp; ~mask) | ((val &lt;&lt; pos) &amp; mask);</div><div class='add'>+</div><div class='add'>+	return af9013_write_reg(state, reg, tmp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int af9013_read_reg_bits(struct af9013_state *state, u16 reg, u8 pos,</div><div class='add'>+	u8 len, u8 *val)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u8 tmp;</div><div class='add'>+</div><div class='add'>+	ret = af9013_read_reg(state, reg, &amp;tmp);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	*val = (tmp &gt;&gt; pos) &amp; regmask[len - 1];</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int af9013_set_gpio(struct af9013_state *state, u8 gpio, u8 gpioval)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u8 pos;</div><div class='add'>+	u16 addr;</div><div class='add'>+	deb_info("%s: gpio:%d gpioval:%02x\n", __func__, gpio, gpioval);</div><div class='add'>+</div><div class='add'>+/* GPIO0 &amp; GPIO1 0xd735</div><div class='add'>+   GPIO2 &amp; GPIO3 0xd736 */</div><div class='add'>+</div><div class='add'>+	switch (gpio) {</div><div class='add'>+	case 0:</div><div class='add'>+	case 1:</div><div class='add'>+		addr = 0xd735;</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+	case 3:</div><div class='add'>+		addr = 0xd736;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		err("invalid gpio:%d\n", gpio);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto error;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	switch (gpio) {</div><div class='add'>+	case 0:</div><div class='add'>+	case 2:</div><div class='add'>+		pos = 0;</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+	case 3:</div><div class='add'>+	default:</div><div class='add'>+		pos = 4;</div><div class='add'>+		break;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ret = af9013_write_reg_bits(state, addr, pos, 4, gpioval);</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 af913_div(u32 a, u32 b, u32 x)</div><div class='add'>+{</div><div class='add'>+	u32 r = 0, c = 0, i;</div><div class='add'>+	deb_info("%s: a:%d b:%d x:%d\n", __func__, a, b, x);</div><div class='add'>+</div><div class='add'>+	if (a &gt; b) {</div><div class='add'>+		c = a / b;</div><div class='add'>+		a = a - c * b;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; x; i++) {</div><div class='add'>+		if (a &gt;= b) {</div><div class='add'>+			r += 1;</div><div class='add'>+			a -= b;</div><div class='add'>+		}</div><div class='add'>+		a &lt;&lt;= 1;</div><div class='add'>+		r &lt;&lt;= 1;</div><div class='add'>+	}</div><div class='add'>+	r = (c &lt;&lt; (u32)x) + r;</div><div class='add'>+</div><div class='add'>+	deb_info("%s: a:%d b:%d x:%d r:%d r:%x\n", __func__, a, b, x, r, r);</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int af9013_set_coeff(struct af9013_state *state, fe_bandwidth_t bw)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+	u8 i = 0;</div><div class='add'>+	u8 buf[24];</div><div class='add'>+	u32 ns_coeff1_2048nu;</div><div class='add'>+	u32 ns_coeff1_8191nu;</div><div class='add'>+	u32 ns_coeff1_8192nu;</div><div class='add'>+	u32 ns_coeff1_8193nu;</div><div class='add'>+	u32 ns_coeff2_2k;</div><div class='add'>+	u32 ns_coeff2_8k;</div><div class='add'>+</div><div class='add'>+	deb_info("%s: adc_clock:%d bw:%d\n", __func__,</div><div class='add'>+		state-&gt;config.adc_clock, bw);</div><div class='add'>+</div><div class='add'>+	switch (state-&gt;config.adc_clock) {</div><div class='add'>+	case 28800: /* 28.800 MHz */</div><div class='add'>+		switch (bw) {</div><div class='add'>+		case BANDWIDTH_6_MHZ:</div><div class='add'>+			ns_coeff1_2048nu = 0x01e79e7a;</div><div class='add'>+			ns_coeff1_8191nu = 0x0079eb6e;</div><div class='add'>+			ns_coeff1_8192nu = 0x0079e79e;</div><div class='add'>+			ns_coeff1_8193nu = 0x0079e3cf;</div><div class='add'>+			ns_coeff2_2k     = 0x00f3cf3d;</div><div class='add'>+			ns_coeff2_8k     = 0x003cf3cf;</div><div class='add'>+			break;</div><div class='add'>+		case BANDWIDTH_7_MHZ:</div><div class='add'>+			ns_coeff1_2048nu = 0x0238e38e;</div><div class='add'>+			ns_coeff1_8191nu = 0x008e3d55;</div><div class='add'>+			ns_coeff1_8192nu = 0x008e38e4;</div><div class='add'>+			ns_coeff1_8193nu = 0x008e3472;</div><div class='add'>+			ns_coeff2_2k     = 0x011c71c7;</div><div class='add'>+			ns_coeff2_8k     = 0x00471c72;</div><div class='add'>+			break;</div><div class='add'>+		case BANDWIDTH_8_MHZ:</div><div class='add'>+			ns_coeff1_2048nu = 0x028a28a3;</div><div class='add'>+			ns_coeff1_8191nu = 0x00a28f3d;</div><div class='add'>+			ns_coeff1_8192nu = 0x00a28a29;</div><div class='add'>+			ns_coeff1_8193nu = 0x00a28514;</div><div class='add'>+			ns_coeff2_2k     = 0x01451451;</div><div class='add'>+			ns_coeff2_8k     = 0x00514514;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case 20480: /* 20.480 MHz */</div><div class='add'>+		switch (bw) {</div><div class='add'>+		case BANDWIDTH_6_MHZ:</div><div class='add'>+			ns_coeff1_2048nu = 0x02adb6dc;</div><div class='add'>+			ns_coeff1_8191nu = 0x00ab7313;</div><div class='add'>+			ns_coeff1_8192nu = 0x00ab6db7;</div><div class='add'>+			ns_coeff1_8193nu = 0x00ab685c;</div><div class='add'>+			ns_coeff2_2k     = 0x0156db6e;</div><div class='add'>+			ns_coeff2_8k     = 0x0055b6dc;</div><div class='add'>+			break;</div><div class='add'>+		case BANDWIDTH_7_MHZ:</div><div class='add'>+			ns_coeff1_2048nu = 0x03200001;</div><div class='add'>+			ns_coeff1_8191nu = 0x00c80640;</div><div class='add'>+			ns_coeff1_8192nu = 0x00c80000;</div><div class='add'>+			ns_coeff1_8193nu = 0x00c7f9c0;</div><div class='add'>+			ns_coeff2_2k     = 0x01900000;</div><div class='add'>+			ns_coeff2_8k     = 0x00640000;</div><div class='add'>+			break;</div><div class='add'>+		case BANDWIDTH_8_MHZ:</div><div class='add'>+			ns_coeff1_2048nu = 0x03924926;</div><div class='add'>+			ns_coeff1_8191nu = 0x00e4996e;</div><div class='add'>+			ns_coeff1_8192nu = 0x00e49249;</div><div class='add'>+			ns_coeff1_8193nu = 0x00e48b25;</div><div class='add'>+			ns_coeff2_2k     = 0x01c92493;</div><div class='add'>+			ns_coeff2_8k     = 0x00724925;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case 28000: /* 28.000 MHz */</div><div class='add'>+		switch (bw) {</div><div class='add'>+		case BANDWIDTH_6_MHZ:</div><div class='add'>+			ns_coeff1_2048nu = 0x01f58d10;</div><div class='add'>+			ns_coeff1_8191nu = 0x007d672f;</div><div class='add'>+			ns_coeff1_8192nu = 0x007d6344;</div><div class='add'>+			ns_coeff1_8193nu = 0x007d5f59;</div><div class='add'>+			ns_coeff2_2k     = 0x00fac688;</div><div class='add'>+			ns_coeff2_8k     = 0x003eb1a2;</div><div class='add'>+			break;</div><div class='add'>+		case BANDWIDTH_7_MHZ:</div><div class='add'>+			ns_coeff1_2048nu = 0x02492492;</div><div class='add'>+			ns_coeff1_8191nu = 0x00924db7;</div><div class='add'>+			ns_coeff1_8192nu = 0x00924925;</div><div class='add'>+			ns_coeff1_8193nu = 0x00924492;</div><div class='add'>+			ns_coeff2_2k     = 0x01249249;</div><div class='add'>+			ns_coeff2_8k     = 0x00492492;</div><div class='add'>+			break;</div><div class='add'>+		case BANDWIDTH_8_MHZ:</div><div class='add'>+			ns_coeff1_2048nu = 0x029cbc15;</div><div class='add'>+			ns_coeff1_8191nu = 0x00a7343f;</div><div class='add'>+			ns_coeff1_8192nu = 0x00a72f05;</div><div class='add'>+			ns_coeff1_8193nu = 0x00a729cc;</div><div class='add'>+			ns_coeff2_2k     = 0x014e5e0a;</div><div class='add'>+			ns_coeff2_8k     = 0x00539783;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case 25000: /* 25.000 MHz */</div><div class='add'>+		switch (bw) {</div><div class='add'>+		case BANDWIDTH_6_MHZ:</div><div class='add'>+			ns_coeff1_2048nu = 0x0231bcb5;</div><div class='add'>+			ns_coeff1_8191nu = 0x008c7391;</div><div class='add'>+			ns_coeff1_8192nu = 0x008c6f2d;</div><div class='add'>+			ns_coeff1_8193nu = 0x008c6aca;</div><div class='add'>+			ns_coeff2_2k     = 0x0118de5b;</div><div class='add'>+			ns_coeff2_8k     = 0x00463797;</div><div class='add'>+			break;</div><div class='add'>+		case BANDWIDTH_7_MHZ:</div><div class='add'>+			ns_coeff1_2048nu = 0x028f5c29;</div><div class='add'>+			ns_coeff1_8191nu = 0x00a3dc29;</div><div class='add'>+			ns_coeff1_8192nu = 0x00a3d70a;</div><div class='add'>+			ns_coeff1_8193nu = 0x00a3d1ec;</div><div class='add'>+			ns_coeff2_2k     = 0x0147ae14;</div><div class='add'>+			ns_coeff2_8k     = 0x0051eb85;</div><div class='add'>+			break;</div><div class='add'>+		case BANDWIDTH_8_MHZ:</div><div class='add'>+			ns_coeff1_2048nu = 0x02ecfb9d;</div><div class='add'>+			ns_coeff1_8191nu = 0x00bb44c1;</div><div class='add'>+			ns_coeff1_8192nu = 0x00bb3ee7;</div><div class='add'>+			ns_coeff1_8193nu = 0x00bb390d;</div><div class='add'>+			ns_coeff2_2k     = 0x01767dce;</div><div class='add'>+			ns_coeff2_8k     = 0x005d9f74;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		err("invalid xtal");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (ret) {</div><div class='add'>+		err("invalid bandwidth");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	buf[i++] = (u8) ((ns_coeff1_2048nu &amp; 0x03000000) &gt;&gt; 24);</div><div class='add'>+	buf[i++] = (u8) ((ns_coeff1_2048nu &amp; 0x00ff0000) &gt;&gt; 16);</div><div class='add'>+	buf[i++] = (u8) ((ns_coeff1_2048nu &amp; 0x0000ff00) &gt;&gt; 8);</div><div class='add'>+	buf[i++] = (u8) ((ns_coeff1_2048nu &amp; 0x000000ff));</div><div class='add'>+	buf[i++] = (u8) ((ns_coeff2_2k     &amp; 0x01c00000) &gt;&gt; 22);</div><div class='add'>+	buf[i++] = (u8) ((ns_coeff2_2k     &amp; 0x003fc000) &gt;&gt; 14);</div><div class='add'>+	buf[i++] = (u8) ((ns_coeff2_2k     &amp; 0x00003fc0) &gt;&gt; 6);</div><div class='add'>+	buf[i++] = (u8) ((ns_coeff2_2k     &amp; 0x0000003f));</div><div class='add'>+	buf[i++] = (u8) ((ns_coeff1_8191nu &amp; 0x03000000) &gt;&gt; 24);</div><div class='add'>+	buf[i++] = (u8) ((ns_coeff1_8191nu &amp; 0x00ffc000) &gt;&gt; 16);</div><div class='add'>+	buf[i++] = (u8) ((ns_coeff1_8191nu &amp; 0x0000ff00) &gt;&gt; 8);</div><div class='add'>+	buf[i++] = (u8) ((ns_coeff1_8191nu &amp; 0x000000ff));</div><div class='add'>+	buf[i++] = (u8) ((ns_coeff1_8192nu &amp; 0x03000000) &gt;&gt; 24);</div><div class='add'>+	buf[i++] = (u8) ((ns_coeff1_8192nu &amp; 0x00ffc000) &gt;&gt; 16);</div><div class='add'>+	buf[i++] = (u8) ((ns_coeff1_8192nu &amp; 0x0000ff00) &gt;&gt; 8);</div><div class='add'>+	buf[i++] = (u8) ((ns_coeff1_8192nu &amp; 0x000000ff));</div><div class='add'>+	buf[i++] = (u8) ((ns_coeff1_8193nu &amp; 0x03000000) &gt;&gt; 24);</div><div class='add'>+	buf[i++] = (u8) ((ns_coeff1_8193nu &amp; 0x00ffc000) &gt;&gt; 16);</div><div class='add'>+	buf[i++] = (u8) ((ns_coeff1_8193nu &amp; 0x0000ff00) &gt;&gt; 8);</div><div class='add'>+	buf[i++] = (u8) ((ns_coeff1_8193nu &amp; 0x000000ff));</div><div class='add'>+	buf[i++] = (u8) ((ns_coeff2_8k     &amp; 0x01c00000) &gt;&gt; 22);</div><div class='add'>+	buf[i++] = (u8) ((ns_coeff2_8k     &amp; 0x003fc000) &gt;&gt; 14);</div><div class='add'>+	buf[i++] = (u8) ((ns_coeff2_8k     &amp; 0x00003fc0) &gt;&gt; 6);</div><div class='add'>+	buf[i++] = (u8) ((ns_coeff2_8k     &amp; 0x0000003f));</div><div class='add'>+</div><div class='add'>+	deb_info("%s: coeff:", __func__);</div><div class='add'>+	debug_dump(buf, sizeof(buf), deb_info);</div><div class='add'>+</div><div class='add'>+	/* program */</div><div class='add'>+	for (i = 0; i &lt; sizeof(buf); i++) {</div><div class='add'>+		ret = af9013_write_reg(state, 0xae00 + i, buf[i]);</div><div class='add'>+		if (ret)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int af9013_set_adc_ctrl(struct af9013_state *state)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u8 buf[3], tmp, i;</div><div class='add'>+	u32 adc_cw;</div><div class='add'>+</div><div class='add'>+	deb_info("%s: adc_clock:%d\n", __func__, state-&gt;config.adc_clock);</div><div class='add'>+</div><div class='add'>+	/* adc frequency type */</div><div class='add'>+	switch (state-&gt;config.adc_clock) {</div><div class='add'>+	case 28800: /* 28.800 MHz */</div><div class='add'>+		tmp = 0;</div><div class='add'>+		break;</div><div class='add'>+	case 20480: /* 20.480 MHz */</div><div class='add'>+		tmp = 1;</div><div class='add'>+		break;</div><div class='add'>+	case 28000: /* 28.000 MHz */</div><div class='add'>+		tmp = 2;</div><div class='add'>+		break;</div><div class='add'>+	case 25000: /* 25.000 MHz */</div><div class='add'>+		tmp = 3;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		err("invalid xtal");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	adc_cw = af913_div(state-&gt;config.adc_clock*1000, 1000000ul, 19ul);</div><div class='add'>+</div><div class='add'>+	buf[0] = (u8) ((adc_cw &amp; 0x000000ff));</div><div class='add'>+	buf[1] = (u8) ((adc_cw &amp; 0x0000ff00) &gt;&gt; 8);</div><div class='add'>+	buf[2] = (u8) ((adc_cw &amp; 0x00ff0000) &gt;&gt; 16);</div><div class='add'>+</div><div class='add'>+	deb_info("%s: adc_cw:", __func__);</div><div class='add'>+	debug_dump(buf, sizeof(buf), deb_info);</div><div class='add'>+</div><div class='add'>+	/* program */</div><div class='add'>+	for (i = 0; i &lt; sizeof(buf); i++) {</div><div class='add'>+		ret = af9013_write_reg(state, 0xd180 + i, buf[i]);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto error;</div><div class='add'>+	}</div><div class='add'>+	ret = af9013_write_reg_bits(state, 0x9bd2, 0, 4, tmp);</div><div class='add'>+error:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int af9013_set_freq_ctrl(struct af9013_state *state, fe_bandwidth_t bw)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u16 addr;</div><div class='add'>+	u8 buf[3], i, j;</div><div class='add'>+	u32 adc_freq, freq_cw;</div><div class='add'>+	s8 bfs_spec_inv;</div><div class='add'>+	int if_sample_freq;</div><div class='add'>+</div><div class='add'>+	for (j = 0; j &lt; 3; j++) {</div><div class='add'>+		if (j == 0) {</div><div class='add'>+			addr = 0xd140; /* fcw normal */</div><div class='add'>+			bfs_spec_inv = state-&gt;config.rf_spec_inv ? -1 : 1;</div><div class='add'>+		} else if (j == 1) {</div><div class='add'>+			addr = 0x9be7; /* fcw dummy ram */</div><div class='add'>+			bfs_spec_inv = state-&gt;config.rf_spec_inv ? -1 : 1;</div><div class='add'>+		} else {</div><div class='add'>+			addr = 0x9bea; /* fcw inverted */</div><div class='add'>+			bfs_spec_inv = state-&gt;config.rf_spec_inv ? 1 : -1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		adc_freq       = state-&gt;config.adc_clock * 1000;</div><div class='add'>+		if_sample_freq = state-&gt;config.tuner_if * 1000;</div><div class='add'>+</div><div class='add'>+		/* TDA18271 uses different sampling freq for every bw */</div><div class='add'>+		if (state-&gt;config.tuner == AF9013_TUNER_TDA18271) {</div><div class='add'>+			switch (bw) {</div><div class='add'>+			case BANDWIDTH_6_MHZ:</div><div class='add'>+				if_sample_freq = 3300000; /* 3.3 MHz */</div><div class='add'>+				break;</div><div class='add'>+			case BANDWIDTH_7_MHZ:</div><div class='add'>+				if_sample_freq = 3800000; /* 3.8 MHz */</div><div class='add'>+				break;</div><div class='add'>+			case BANDWIDTH_8_MHZ:</div><div class='add'>+			default:</div><div class='add'>+				if_sample_freq = 4300000; /* 4.3 MHz */</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		while (if_sample_freq &gt; (adc_freq / 2))</div><div class='add'>+			if_sample_freq = if_sample_freq - adc_freq;</div><div class='add'>+</div><div class='add'>+		if (if_sample_freq &gt;= 0)</div><div class='add'>+			bfs_spec_inv = bfs_spec_inv * (-1);</div><div class='add'>+		else</div><div class='add'>+			if_sample_freq = if_sample_freq * (-1);</div><div class='add'>+</div><div class='add'>+		freq_cw = af913_div(if_sample_freq, adc_freq, 23ul);</div><div class='add'>+</div><div class='add'>+		if (bfs_spec_inv == -1)</div><div class='add'>+			freq_cw = 0x00800000 - freq_cw;</div><div class='add'>+</div><div class='add'>+		buf[0] = (u8) ((freq_cw &amp; 0x000000ff));</div><div class='add'>+		buf[1] = (u8) ((freq_cw &amp; 0x0000ff00) &gt;&gt; 8);</div><div class='add'>+		buf[2] = (u8) ((freq_cw &amp; 0x007f0000) &gt;&gt; 16);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+		deb_info("%s: freq_cw:", __func__);</div><div class='add'>+		debug_dump(buf, sizeof(buf), deb_info);</div><div class='add'>+</div><div class='add'>+		/* program */</div><div class='add'>+		for (i = 0; i &lt; sizeof(buf); i++) {</div><div class='add'>+			ret = af9013_write_reg(state, addr++, buf[i]);</div><div class='add'>+			if (ret)</div><div class='add'>+				goto error;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+error:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int af9013_set_ofdm_params(struct af9013_state *state,</div><div class='add'>+	struct dvb_ofdm_parameters *params, u8 *auto_mode)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u8 i, buf[3] = {0, 0, 0};</div><div class='add'>+	*auto_mode = 0; /* set if parameters are requested to auto set */</div><div class='add'>+</div><div class='add'>+	switch (params-&gt;transmission_mode) {</div><div class='add'>+	case TRANSMISSION_MODE_AUTO:</div><div class='add'>+		*auto_mode = 1;</div><div class='add'>+	case TRANSMISSION_MODE_2K:</div><div class='add'>+		break;</div><div class='add'>+	case TRANSMISSION_MODE_8K:</div><div class='add'>+		buf[0] |= (1 &lt;&lt; 0);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (params-&gt;guard_interval) {</div><div class='add'>+	case GUARD_INTERVAL_AUTO:</div><div class='add'>+		*auto_mode = 1;</div><div class='add'>+	case GUARD_INTERVAL_1_32:</div><div class='add'>+		break;</div><div class='add'>+	case GUARD_INTERVAL_1_16:</div><div class='add'>+		buf[0] |= (1 &lt;&lt; 2);</div><div class='add'>+		break;</div><div class='add'>+	case GUARD_INTERVAL_1_8:</div><div class='add'>+		buf[0] |= (2 &lt;&lt; 2);</div><div class='add'>+		break;</div><div class='add'>+	case GUARD_INTERVAL_1_4:</div><div class='add'>+		buf[0] |= (3 &lt;&lt; 2);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (params-&gt;hierarchy_information) {</div><div class='add'>+	case HIERARCHY_AUTO:</div><div class='add'>+		*auto_mode = 1;</div><div class='add'>+	case HIERARCHY_NONE:</div><div class='add'>+		break;</div><div class='add'>+	case HIERARCHY_1:</div><div class='add'>+		buf[0] |= (1 &lt;&lt; 4);</div><div class='add'>+		break;</div><div class='add'>+	case HIERARCHY_2:</div><div class='add'>+		buf[0] |= (2 &lt;&lt; 4);</div><div class='add'>+		break;</div><div class='add'>+	case HIERARCHY_4:</div><div class='add'>+		buf[0] |= (3 &lt;&lt; 4);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	switch (params-&gt;constellation) {</div><div class='add'>+	case QAM_AUTO:</div><div class='add'>+		*auto_mode = 1;</div><div class='add'>+	case QPSK:</div><div class='add'>+		break;</div><div class='add'>+	case QAM_16:</div><div class='add'>+		buf[1] |= (1 &lt;&lt; 6);</div><div class='add'>+		break;</div><div class='add'>+	case QAM_64:</div><div class='add'>+		buf[1] |= (2 &lt;&lt; 6);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Use HP. How and which case we can switch to LP? */</div><div class='add'>+	buf[1] |= (1 &lt;&lt; 4);</div><div class='add'>+</div><div class='add'>+	switch (params-&gt;code_rate_HP) {</div><div class='add'>+	case FEC_AUTO:</div><div class='add'>+		*auto_mode = 1;</div><div class='add'>+	case FEC_1_2:</div><div class='add'>+		break;</div><div class='add'>+	case FEC_2_3:</div><div class='add'>+		buf[2] |= (1 &lt;&lt; 0);</div><div class='add'>+		break;</div><div class='add'>+	case FEC_3_4:</div><div class='add'>+		buf[2] |= (2 &lt;&lt; 0);</div><div class='add'>+		break;</div><div class='add'>+	case FEC_5_6:</div><div class='add'>+		buf[2] |= (3 &lt;&lt; 0);</div><div class='add'>+		break;</div><div class='add'>+	case FEC_7_8:</div><div class='add'>+		buf[2] |= (4 &lt;&lt; 0);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (params-&gt;code_rate_LP) {</div><div class='add'>+	case FEC_AUTO:</div><div class='add'>+	/* if HIERARCHY_NONE and FEC_NONE then LP FEC is set to FEC_AUTO</div><div class='add'>+	   by dvb_frontend.c for compatibility */</div><div class='add'>+		if (params-&gt;hierarchy_information != HIERARCHY_NONE)</div><div class='add'>+			*auto_mode = 1;</div><div class='add'>+	case FEC_1_2:</div><div class='add'>+		break;</div><div class='add'>+	case FEC_2_3:</div><div class='add'>+		buf[2] |= (1 &lt;&lt; 3);</div><div class='add'>+		break;</div><div class='add'>+	case FEC_3_4:</div><div class='add'>+		buf[2] |= (2 &lt;&lt; 3);</div><div class='add'>+		break;</div><div class='add'>+	case FEC_5_6:</div><div class='add'>+		buf[2] |= (3 &lt;&lt; 3);</div><div class='add'>+		break;</div><div class='add'>+	case FEC_7_8:</div><div class='add'>+		buf[2] |= (4 &lt;&lt; 3);</div><div class='add'>+		break;</div><div class='add'>+	case FEC_NONE:</div><div class='add'>+		if (params-&gt;hierarchy_information == HIERARCHY_AUTO)</div><div class='add'>+			break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (params-&gt;bandwidth) {</div><div class='add'>+	case BANDWIDTH_6_MHZ:</div><div class='add'>+		break;</div><div class='add'>+	case BANDWIDTH_7_MHZ:</div><div class='add'>+		buf[1] |= (1 &lt;&lt; 2);</div><div class='add'>+		break;</div><div class='add'>+	case BANDWIDTH_8_MHZ:</div><div class='add'>+		buf[1] |= (2 &lt;&lt; 2);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* program */</div><div class='add'>+	for (i = 0; i &lt; sizeof(buf); i++) {</div><div class='add'>+		ret = af9013_write_reg(state, 0xd3c0 + i, buf[i]);</div><div class='add'>+		if (ret)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int af9013_reset(struct af9013_state *state, u8 sleep)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u8 tmp, i;</div><div class='add'>+	deb_info("%s\n", __func__);</div><div class='add'>+</div><div class='add'>+	/* enable OFDM reset */</div><div class='add'>+	ret = af9013_write_reg_bits(state, 0xd417, 4, 1, 1);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	/* start reset mechanism */</div><div class='add'>+	ret = af9013_write_reg(state, 0xaeff, 1);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	/* reset is done when bit 1 is set */</div><div class='add'>+	for (i = 0; i &lt; 150; i++) {</div><div class='add'>+		ret = af9013_read_reg_bits(state, 0xd417, 1, 1, &amp;tmp);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto error;</div><div class='add'>+		if (tmp)</div><div class='add'>+			break; /* reset done */</div><div class='add'>+		msleep(10);</div><div class='add'>+	}</div><div class='add'>+	if (!tmp)</div><div class='add'>+		return -ETIMEDOUT;</div><div class='add'>+</div><div class='add'>+	/* don't clear reset when going to sleep */</div><div class='add'>+	if (!sleep) {</div><div class='add'>+		/* clear OFDM reset */</div><div class='add'>+		ret = af9013_write_reg_bits(state, 0xd417, 1, 1, 0);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto error;</div><div class='add'>+</div><div class='add'>+		/* disable OFDM reset */</div><div class='add'>+		ret = af9013_write_reg_bits(state, 0xd417, 4, 1, 0);</div><div class='add'>+	}</div><div class='add'>+error:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int af9013_power_ctrl(struct af9013_state *state, u8 onoff)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	deb_info("%s: onoff:%d\n", __func__, onoff);</div><div class='add'>+</div><div class='add'>+	if (onoff) {</div><div class='add'>+		/* power on */</div><div class='add'>+		ret = af9013_write_reg_bits(state, 0xd73a, 3, 1, 0);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto error;</div><div class='add'>+		ret = af9013_write_reg_bits(state, 0xd417, 1, 1, 0);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto error;</div><div class='add'>+		ret = af9013_write_reg_bits(state, 0xd417, 4, 1, 0);</div><div class='add'>+	} else {</div><div class='add'>+		/* power off */</div><div class='add'>+		ret = af9013_reset(state, 1);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto error;</div><div class='add'>+		ret = af9013_write_reg_bits(state, 0xd73a, 3, 1, 1);</div><div class='add'>+	}</div><div class='add'>+error:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int af9013_lock_led(struct af9013_state *state, u8 onoff)</div><div class='add'>+{</div><div class='add'>+	deb_info("%s: onoff:%d\n", __func__, onoff);</div><div class='add'>+</div><div class='add'>+	return af9013_write_reg_bits(state, 0xd730, 0, 1, onoff);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int af9013_set_frontend(struct dvb_frontend *fe,</div><div class='add'>+	struct dvb_frontend_parameters *params)</div><div class='add'>+{</div><div class='add'>+	struct af9013_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	int ret;</div><div class='add'>+	u8 auto_mode; /* auto set TPS */</div><div class='add'>+</div><div class='add'>+	deb_info("%s: freq:%d bw:%d\n", __func__, params-&gt;frequency,</div><div class='add'>+		params-&gt;u.ofdm.bandwidth);</div><div class='add'>+</div><div class='add'>+	state-&gt;frequency = params-&gt;frequency;</div><div class='add'>+</div><div class='add'>+	/* program CFOE coefficients */</div><div class='add'>+	ret = af9013_set_coeff(state, params-&gt;u.ofdm.bandwidth);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	/* program frequency control */</div><div class='add'>+	ret = af9013_set_freq_ctrl(state, params-&gt;u.ofdm.bandwidth);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	/* clear TPS lock flag (inverted flag) */</div><div class='add'>+	ret = af9013_write_reg_bits(state, 0xd330, 3, 1, 1);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	/* clear MPEG2 lock flag */</div><div class='add'>+	ret = af9013_write_reg_bits(state, 0xd507, 6, 1, 0);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	/* empty channel function */</div><div class='add'>+	ret = af9013_write_reg_bits(state, 0x9bfe, 0, 1, 0);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	/* empty DVB-T channel function */</div><div class='add'>+	ret = af9013_write_reg_bits(state, 0x9bc2, 0, 1, 0);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	/* program tuner */</div><div class='add'>+	if (fe-&gt;ops.tuner_ops.set_params)</div><div class='add'>+		fe-&gt;ops.tuner_ops.set_params(fe, params);</div><div class='add'>+</div><div class='add'>+	/* program TPS and bandwidth, check if auto mode needed */</div><div class='add'>+	ret = af9013_set_ofdm_params(state, &amp;params-&gt;u.ofdm, &amp;auto_mode);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	if (auto_mode) {</div><div class='add'>+		/* clear easy mode flag */</div><div class='add'>+		ret = af9013_write_reg(state, 0xaefd, 0);</div><div class='add'>+		deb_info("%s: auto TPS\n", __func__);</div><div class='add'>+	} else {</div><div class='add'>+		/* set easy mode flag */</div><div class='add'>+		ret = af9013_write_reg(state, 0xaefd, 1);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto error;</div><div class='add'>+		ret = af9013_write_reg(state, 0xaefe, 0);</div><div class='add'>+		deb_info("%s: manual TPS\n", __func__);</div><div class='add'>+	}</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	/* everything is set, lets try to receive channel - OFSM GO! */</div><div class='add'>+	ret = af9013_write_reg(state, 0xffff, 0);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int af9013_get_frontend(struct dvb_frontend *fe,</div><div class='add'>+	struct dvb_frontend_parameters *p)</div><div class='add'>+{</div><div class='add'>+	struct af9013_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	int ret;</div><div class='add'>+	u8 i, buf[3];</div><div class='add'>+	deb_info("%s\n", __func__);</div><div class='add'>+</div><div class='add'>+	/* read TPS registers */</div><div class='add'>+	for (i = 0; i &lt; 3; i++) {</div><div class='add'>+		ret = af9013_read_reg(state, 0xd3c0 + i, &amp;buf[i]);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch ((buf[1] &gt;&gt; 6) &amp; 3) {</div><div class='add'>+	case 0:</div><div class='add'>+		p-&gt;u.ofdm.constellation = QPSK;</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		p-&gt;u.ofdm.constellation = QAM_16;</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		p-&gt;u.ofdm.constellation = QAM_64;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch ((buf[0] &gt;&gt; 0) &amp; 3) {</div><div class='add'>+	case 0:</div><div class='add'>+		p-&gt;u.ofdm.transmission_mode = TRANSMISSION_MODE_2K;</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		p-&gt;u.ofdm.transmission_mode = TRANSMISSION_MODE_8K;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch ((buf[0] &gt;&gt; 2) &amp; 3) {</div><div class='add'>+	case 0:</div><div class='add'>+		p-&gt;u.ofdm.guard_interval = GUARD_INTERVAL_1_32;</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		p-&gt;u.ofdm.guard_interval = GUARD_INTERVAL_1_16;</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		p-&gt;u.ofdm.guard_interval = GUARD_INTERVAL_1_8;</div><div class='add'>+		break;</div><div class='add'>+	case 3:</div><div class='add'>+		p-&gt;u.ofdm.guard_interval = GUARD_INTERVAL_1_4;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch ((buf[0] &gt;&gt; 4) &amp; 7) {</div><div class='add'>+	case 0:</div><div class='add'>+		p-&gt;u.ofdm.hierarchy_information = HIERARCHY_NONE;</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		p-&gt;u.ofdm.hierarchy_information = HIERARCHY_1;</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		p-&gt;u.ofdm.hierarchy_information = HIERARCHY_2;</div><div class='add'>+		break;</div><div class='add'>+	case 3:</div><div class='add'>+		p-&gt;u.ofdm.hierarchy_information = HIERARCHY_4;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch ((buf[2] &gt;&gt; 0) &amp; 7) {</div><div class='add'>+	case 0:</div><div class='add'>+		p-&gt;u.ofdm.code_rate_HP = FEC_1_2;</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		p-&gt;u.ofdm.code_rate_HP = FEC_2_3;</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		p-&gt;u.ofdm.code_rate_HP = FEC_3_4;</div><div class='add'>+		break;</div><div class='add'>+	case 3:</div><div class='add'>+		p-&gt;u.ofdm.code_rate_HP = FEC_5_6;</div><div class='add'>+		break;</div><div class='add'>+	case 4:</div><div class='add'>+		p-&gt;u.ofdm.code_rate_HP = FEC_7_8;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch ((buf[2] &gt;&gt; 3) &amp; 7) {</div><div class='add'>+	case 0:</div><div class='add'>+		p-&gt;u.ofdm.code_rate_LP = FEC_1_2;</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		p-&gt;u.ofdm.code_rate_LP = FEC_2_3;</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		p-&gt;u.ofdm.code_rate_LP = FEC_3_4;</div><div class='add'>+		break;</div><div class='add'>+	case 3:</div><div class='add'>+		p-&gt;u.ofdm.code_rate_LP = FEC_5_6;</div><div class='add'>+		break;</div><div class='add'>+	case 4:</div><div class='add'>+		p-&gt;u.ofdm.code_rate_LP = FEC_7_8;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch ((buf[1] &gt;&gt; 2) &amp; 3) {</div><div class='add'>+	case 0:</div><div class='add'>+		p-&gt;u.ofdm.bandwidth = BANDWIDTH_6_MHZ;</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		p-&gt;u.ofdm.bandwidth = BANDWIDTH_7_MHZ;</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		p-&gt;u.ofdm.bandwidth = BANDWIDTH_8_MHZ;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	p-&gt;inversion = INVERSION_AUTO;</div><div class='add'>+	p-&gt;frequency = state-&gt;frequency;</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int af9013_update_ber_unc(struct dvb_frontend *fe)</div><div class='add'>+{</div><div class='add'>+	struct af9013_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	int ret;</div><div class='add'>+	u8 buf[3], i;</div><div class='add'>+	u32 error_bit_count = 0;</div><div class='add'>+	u32 total_bit_count = 0;</div><div class='add'>+	u32 abort_packet_count = 0;</div><div class='add'>+</div><div class='add'>+	state-&gt;ber = 0;</div><div class='add'>+</div><div class='add'>+	/* check if error bit count is ready */</div><div class='add'>+	ret = af9013_read_reg_bits(state, 0xd391, 4, 1, &amp;buf[0]);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+	if (!buf[0])</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	/* get RSD packet abort count */</div><div class='add'>+	for (i = 0; i &lt; 2; i++) {</div><div class='add'>+		ret = af9013_read_reg(state, 0xd38a + i, &amp;buf[i]);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto error;</div><div class='add'>+	}</div><div class='add'>+	abort_packet_count = (buf[1] &lt;&lt; 8) + buf[0];</div><div class='add'>+</div><div class='add'>+	/* get error bit count */</div><div class='add'>+	for (i = 0; i &lt; 3; i++) {</div><div class='add'>+		ret = af9013_read_reg(state, 0xd387 + i, &amp;buf[i]);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto error;</div><div class='add'>+	}</div><div class='add'>+	error_bit_count = (buf[2] &lt;&lt; 16) + (buf[1] &lt;&lt; 8) + buf[0];</div><div class='add'>+	error_bit_count = error_bit_count - abort_packet_count * 8 * 8;</div><div class='add'>+</div><div class='add'>+	/* get used RSD counting period (10000 RSD packets used) */</div><div class='add'>+	for (i = 0; i &lt; 2; i++) {</div><div class='add'>+		ret = af9013_read_reg(state, 0xd385 + i, &amp;buf[i]);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto error;</div><div class='add'>+	}</div><div class='add'>+	total_bit_count = (buf[1] &lt;&lt; 8) + buf[0];</div><div class='add'>+	total_bit_count = total_bit_count - abort_packet_count;</div><div class='add'>+	total_bit_count = total_bit_count * 204 * 8;</div><div class='add'>+</div><div class='add'>+	if (total_bit_count)</div><div class='add'>+		state-&gt;ber = error_bit_count * 1000000000 / total_bit_count;</div><div class='add'>+</div><div class='add'>+	state-&gt;ucblocks += abort_packet_count;</div><div class='add'>+</div><div class='add'>+	deb_info("%s: err bits:%d total bits:%d abort count:%d\n", __func__,</div><div class='add'>+		error_bit_count, total_bit_count, abort_packet_count);</div><div class='add'>+</div><div class='add'>+	/* set BER counting range */</div><div class='add'>+	ret = af9013_write_reg(state, 0xd385, 10000 &amp; 0xff);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+	ret = af9013_write_reg(state, 0xd386, 10000 &gt;&gt; 8);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+	/* reset and start BER counter */</div><div class='add'>+	ret = af9013_write_reg_bits(state, 0xd391, 4, 1, 1);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+error:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int af9013_update_snr(struct dvb_frontend *fe)</div><div class='add'>+{</div><div class='add'>+	struct af9013_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	int ret;</div><div class='add'>+	u8 buf[3], i, len;</div><div class='add'>+	u32 quant = 0;</div><div class='add'>+	struct snr_table *snr_table;</div><div class='add'>+</div><div class='add'>+	/* check if quantizer ready (for snr) */</div><div class='add'>+	ret = af9013_read_reg_bits(state, 0xd2e1, 3, 1, &amp;buf[0]);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+	if (buf[0]) {</div><div class='add'>+		/* quantizer ready - read it */</div><div class='add'>+		for (i = 0; i &lt; 3; i++) {</div><div class='add'>+			ret = af9013_read_reg(state, 0xd2e3 + i, &amp;buf[i]);</div><div class='add'>+			if (ret)</div><div class='add'>+				goto error;</div><div class='add'>+		}</div><div class='add'>+		quant = (buf[2] &lt;&lt; 16) + (buf[1] &lt;&lt; 8) + buf[0];</div><div class='add'>+</div><div class='add'>+		/* read current constellation */</div><div class='add'>+		ret = af9013_read_reg(state, 0xd3c1, &amp;buf[0]);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto error;</div><div class='add'>+</div><div class='add'>+		switch ((buf[0] &gt;&gt; 6) &amp; 3) {</div><div class='add'>+		case 0:</div><div class='add'>+			len = ARRAY_SIZE(qpsk_snr_table);</div><div class='add'>+			snr_table = qpsk_snr_table;</div><div class='add'>+			break;</div><div class='add'>+		case 1:</div><div class='add'>+			len = ARRAY_SIZE(qam16_snr_table);</div><div class='add'>+			snr_table = qam16_snr_table;</div><div class='add'>+			break;</div><div class='add'>+		case 2:</div><div class='add'>+			len = ARRAY_SIZE(qam64_snr_table);</div><div class='add'>+			snr_table = qam64_snr_table;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			len = 0;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (len) {</div><div class='add'>+			for (i = 0; i &lt; len; i++) {</div><div class='add'>+				if (quant &lt; snr_table[i].val) {</div><div class='add'>+					state-&gt;snr = snr_table[i].snr * 10;</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* set quantizer super frame count */</div><div class='add'>+		ret = af9013_write_reg(state, 0xd2e2, 1);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto error;</div><div class='add'>+</div><div class='add'>+		/* check quantizer availability */</div><div class='add'>+		for (i = 0; i &lt; 10; i++) {</div><div class='add'>+			msleep(10);</div><div class='add'>+			ret = af9013_read_reg_bits(state, 0xd2e6, 0, 1,</div><div class='add'>+				&amp;buf[0]);</div><div class='add'>+			if (ret)</div><div class='add'>+				goto error;</div><div class='add'>+			if (!buf[0])</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* reset quantizer */</div><div class='add'>+		ret = af9013_write_reg_bits(state, 0xd2e1, 3, 1, 1);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int af9013_update_signal_strength(struct dvb_frontend *fe)</div><div class='add'>+{</div><div class='add'>+	struct af9013_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	int ret;</div><div class='add'>+	u8 tmp0;</div><div class='add'>+	u8 rf_gain, rf_50, rf_80, if_gain, if_50, if_80;</div><div class='add'>+	int signal_strength;</div><div class='add'>+</div><div class='add'>+	deb_info("%s\n", __func__);</div><div class='add'>+</div><div class='add'>+	state-&gt;signal_strength = 0;</div><div class='add'>+</div><div class='add'>+	ret = af9013_read_reg_bits(state, 0x9bee, 0, 1, &amp;tmp0);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+	if (tmp0) {</div><div class='add'>+		ret = af9013_read_reg(state, 0x9bbd, &amp;rf_50);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto error;</div><div class='add'>+		ret = af9013_read_reg(state, 0x9bd0, &amp;rf_80);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto error;</div><div class='add'>+		ret = af9013_read_reg(state, 0x9be2, &amp;if_50);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto error;</div><div class='add'>+		ret = af9013_read_reg(state, 0x9be4, &amp;if_80);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto error;</div><div class='add'>+		ret = af9013_read_reg(state, 0xd07c, &amp;rf_gain);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto error;</div><div class='add'>+		ret = af9013_read_reg(state, 0xd07d, &amp;if_gain);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto error;</div><div class='add'>+		signal_strength = (0xffff / (9 * (rf_50 + if_50) - \</div><div class='add'>+			11 * (rf_80 + if_80))) * (10 * (rf_gain + if_gain) - \</div><div class='add'>+			11 * (rf_80 + if_80));</div><div class='add'>+		if (signal_strength &lt; 0)</div><div class='add'>+			signal_strength = 0;</div><div class='add'>+		else if (signal_strength &gt; 0xffff)</div><div class='add'>+			signal_strength = 0xffff;</div><div class='add'>+</div><div class='add'>+		state-&gt;signal_strength = signal_strength;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int af9013_update_statistics(struct dvb_frontend *fe)</div><div class='add'>+{</div><div class='add'>+	struct af9013_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (time_before(jiffies, state-&gt;next_statistics_check))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* set minimum statistic update interval */</div><div class='add'>+	state-&gt;next_statistics_check = jiffies + msecs_to_jiffies(1200);</div><div class='add'>+</div><div class='add'>+	ret = af9013_update_signal_strength(fe);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+	ret = af9013_update_snr(fe);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+	ret = af9013_update_ber_unc(fe);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int af9013_get_tune_settings(struct dvb_frontend *fe,</div><div class='add'>+	struct dvb_frontend_tune_settings *fesettings)</div><div class='add'>+{</div><div class='add'>+	fesettings-&gt;min_delay_ms = 800;</div><div class='add'>+	fesettings-&gt;step_size = 0;</div><div class='add'>+	fesettings-&gt;max_drift = 0;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int af9013_read_status(struct dvb_frontend *fe, fe_status_t *status)</div><div class='add'>+{</div><div class='add'>+	struct af9013_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	u8 tmp;</div><div class='add'>+	*status = 0;</div><div class='add'>+</div><div class='add'>+	/* TPS lock */</div><div class='add'>+	ret = af9013_read_reg_bits(state, 0xd330, 3, 1, &amp;tmp);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+	if (tmp)</div><div class='add'>+		*status |= FE_HAS_VITERBI | FE_HAS_CARRIER | FE_HAS_SIGNAL;</div><div class='add'>+</div><div class='add'>+	/* MPEG2 lock */</div><div class='add'>+	ret = af9013_read_reg_bits(state, 0xd507, 6, 1, &amp;tmp);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+	if (tmp)</div><div class='add'>+		*status |= FE_HAS_SYNC | FE_HAS_LOCK;</div><div class='add'>+</div><div class='add'>+	if (!*status &amp; FE_HAS_SIGNAL) {</div><div class='add'>+		/* AGC lock */</div><div class='add'>+		ret = af9013_read_reg_bits(state, 0xd1a0, 6, 1, &amp;tmp);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto error;</div><div class='add'>+		if (tmp)</div><div class='add'>+			*status |= FE_HAS_SIGNAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!*status &amp; FE_HAS_CARRIER) {</div><div class='add'>+		/* CFO lock */</div><div class='add'>+		ret = af9013_read_reg_bits(state, 0xd333, 7, 1, &amp;tmp);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto error;</div><div class='add'>+		if (tmp)</div><div class='add'>+			*status |= FE_HAS_CARRIER;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!*status &amp; FE_HAS_CARRIER) {</div><div class='add'>+		/* SFOE lock */</div><div class='add'>+		ret = af9013_read_reg_bits(state, 0xd334, 6, 1, &amp;tmp);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto error;</div><div class='add'>+		if (tmp)</div><div class='add'>+			*status |= FE_HAS_CARRIER;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = af9013_update_statistics(fe);</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int af9013_read_ber(struct dvb_frontend *fe, u32 *ber)</div><div class='add'>+{</div><div class='add'>+	struct af9013_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	int ret;</div><div class='add'>+	ret = af9013_update_statistics(fe);</div><div class='add'>+	*ber = state-&gt;ber;</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int af9013_read_signal_strength(struct dvb_frontend *fe, u16 *strength)</div><div class='add'>+{</div><div class='add'>+	struct af9013_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	int ret;</div><div class='add'>+	ret = af9013_update_statistics(fe);</div><div class='add'>+	*strength = state-&gt;signal_strength;</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int af9013_read_snr(struct dvb_frontend *fe, u16 *snr)</div><div class='add'>+{</div><div class='add'>+	struct af9013_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	int ret;</div><div class='add'>+	ret = af9013_update_statistics(fe);</div><div class='add'>+	*snr = state-&gt;snr;</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int af9013_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks)</div><div class='add'>+{</div><div class='add'>+	struct af9013_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	int ret;</div><div class='add'>+	ret = af9013_update_statistics(fe);</div><div class='add'>+	*ucblocks = state-&gt;ucblocks;</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int af9013_sleep(struct dvb_frontend *fe)</div><div class='add'>+{</div><div class='add'>+	struct af9013_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	int ret;</div><div class='add'>+	deb_info("%s\n", __func__);</div><div class='add'>+</div><div class='add'>+	ret = af9013_lock_led(state, 0);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	ret = af9013_power_ctrl(state, 0);</div><div class='add'>+error:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int af9013_init(struct dvb_frontend *fe)</div><div class='add'>+{</div><div class='add'>+	struct af9013_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	int ret, i, len;</div><div class='add'>+	u8 tmp0, tmp1;</div><div class='add'>+	struct regdesc *init;</div><div class='add'>+	deb_info("%s\n", __func__);</div><div class='add'>+</div><div class='add'>+	/* reset OFDM */</div><div class='add'>+	ret = af9013_reset(state, 0);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	/* power on */</div><div class='add'>+	ret = af9013_power_ctrl(state, 1);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	/* enable ADC */</div><div class='add'>+	ret = af9013_write_reg(state, 0xd73a, 0xa4);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	/* write API version to firmware */</div><div class='add'>+	for (i = 0; i &lt; sizeof(state-&gt;config.api_version); i++) {</div><div class='add'>+		ret = af9013_write_reg(state, 0x9bf2 + i,</div><div class='add'>+			state-&gt;config.api_version[i]);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* program ADC control */</div><div class='add'>+	ret = af9013_set_adc_ctrl(state);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	/* set I2C master clock */</div><div class='add'>+	ret = af9013_write_reg(state, 0xd416, 0x14);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	/* set 16 embx */</div><div class='add'>+	ret = af9013_write_reg_bits(state, 0xd700, 1, 1, 1);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	/* set no trigger */</div><div class='add'>+	ret = af9013_write_reg_bits(state, 0xd700, 2, 1, 0);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	/* set read-update bit for constellation */</div><div class='add'>+	ret = af9013_write_reg_bits(state, 0xd371, 1, 1, 1);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	/* enable FEC monitor */</div><div class='add'>+	ret = af9013_write_reg_bits(state, 0xd392, 1, 1, 1);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	/* load OFSM settings */</div><div class='add'>+	deb_info("%s: load ofsm settings\n", __func__);</div><div class='add'>+	len = ARRAY_SIZE(ofsm_init);</div><div class='add'>+	init = ofsm_init;</div><div class='add'>+	for (i = 0; i &lt; len; i++) {</div><div class='add'>+		ret = af9013_write_reg_bits(state, init[i].addr, init[i].pos,</div><div class='add'>+			init[i].len, init[i].val);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* load tuner specific settings */</div><div class='add'>+	deb_info("%s: load tuner specific settings\n", __func__);</div><div class='add'>+	switch (state-&gt;config.tuner) {</div><div class='add'>+	case AF9013_TUNER_MXL5003D:</div><div class='add'>+		len = ARRAY_SIZE(tuner_init_mxl5003d);</div><div class='add'>+		init = tuner_init_mxl5003d;</div><div class='add'>+		break;</div><div class='add'>+	case AF9013_TUNER_MXL5005D:</div><div class='add'>+	case AF9013_TUNER_MXL5005R:</div><div class='add'>+		len = ARRAY_SIZE(tuner_init_mxl5005);</div><div class='add'>+		init = tuner_init_mxl5005;</div><div class='add'>+		break;</div><div class='add'>+	case AF9013_TUNER_ENV77H11D5:</div><div class='add'>+		len = ARRAY_SIZE(tuner_init_env77h11d5);</div><div class='add'>+		init = tuner_init_env77h11d5;</div><div class='add'>+		break;</div><div class='add'>+	case AF9013_TUNER_MT2060:</div><div class='add'>+		len = ARRAY_SIZE(tuner_init_mt2060);</div><div class='add'>+		init = tuner_init_mt2060;</div><div class='add'>+		break;</div><div class='add'>+	case AF9013_TUNER_MC44S803:</div><div class='add'>+		len = ARRAY_SIZE(tuner_init_mc44s803);</div><div class='add'>+		init = tuner_init_mc44s803;</div><div class='add'>+		break;</div><div class='add'>+	case AF9013_TUNER_QT1010:</div><div class='add'>+	case AF9013_TUNER_QT1010A:</div><div class='add'>+		len = ARRAY_SIZE(tuner_init_qt1010);</div><div class='add'>+		init = tuner_init_qt1010;</div><div class='add'>+		break;</div><div class='add'>+	case AF9013_TUNER_MT2060_2:</div><div class='add'>+		len = ARRAY_SIZE(tuner_init_mt2060_2);</div><div class='add'>+		init = tuner_init_mt2060_2;</div><div class='add'>+		break;</div><div class='add'>+	case AF9013_TUNER_TDA18271:</div><div class='add'>+		len = ARRAY_SIZE(tuner_init_tda18271);</div><div class='add'>+		init = tuner_init_tda18271;</div><div class='add'>+		break;</div><div class='add'>+	case AF9013_TUNER_UNKNOWN:</div><div class='add'>+	default:</div><div class='add'>+		len = ARRAY_SIZE(tuner_init_unknown);</div><div class='add'>+		init = tuner_init_unknown;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; len; i++) {</div><div class='add'>+		ret = af9013_write_reg_bits(state, init[i].addr, init[i].pos,</div><div class='add'>+			init[i].len, init[i].val);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* set TS mode */</div><div class='add'>+	deb_info("%s: setting ts mode\n", __func__);</div><div class='add'>+	tmp0 = 0; /* parallel mode */</div><div class='add'>+	tmp1 = 0; /* serial mode */</div><div class='add'>+	switch (state-&gt;config.output_mode) {</div><div class='add'>+	case AF9013_OUTPUT_MODE_PARALLEL:</div><div class='add'>+		tmp0 = 1;</div><div class='add'>+		break;</div><div class='add'>+	case AF9013_OUTPUT_MODE_SERIAL:</div><div class='add'>+		tmp1 = 1;</div><div class='add'>+		break;</div><div class='add'>+	case AF9013_OUTPUT_MODE_USB:</div><div class='add'>+		/* usb mode for AF9015 */</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	ret = af9013_write_reg_bits(state, 0xd500, 1, 1, tmp0); /* parallel */</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+	ret = af9013_write_reg_bits(state, 0xd500, 2, 1, tmp1); /* serial */</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	/* enable lock led */</div><div class='add'>+	ret = af9013_lock_led(state, 1);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct dvb_frontend_ops af9013_ops;</div><div class='add'>+</div><div class='add'>+static int af9013_download_firmware(struct af9013_state *state)</div><div class='add'>+{</div><div class='add'>+	int i, len, packets, remainder, ret;</div><div class='add'>+	const struct firmware *fw;</div><div class='add'>+	u16 addr = 0x5100; /* firmware start address */</div><div class='add'>+	u16 checksum = 0;</div><div class='add'>+	u8 val;</div><div class='add'>+	u8 fw_params[4];</div><div class='add'>+	u8 *data;</div><div class='add'>+	u8 *fw_file = AF9013_DEFAULT_FIRMWARE;</div><div class='add'>+</div><div class='add'>+	msleep(100);</div><div class='add'>+	/* check whether firmware is already running */</div><div class='add'>+	ret = af9013_read_reg(state, 0x98be, &amp;val);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+	else</div><div class='add'>+		deb_info("%s: firmware status:%02x\n", __func__, val);</div><div class='add'>+</div><div class='add'>+	if (val == 0x0c) /* fw is running, no need for download */</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	info("found a '%s' in cold state, will try to load a firmware",</div><div class='add'>+		af9013_ops.info.name);</div><div class='add'>+</div><div class='add'>+	/* request the firmware, this will block and timeout */</div><div class='add'>+	ret = request_firmware(&amp;fw, fw_file,  &amp;state-&gt;i2c-&gt;dev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		err("did not find the firmware file. (%s) "</div><div class='add'>+			"Please see linux/Documentation/dvb/ for more details" \</div><div class='add'>+			" on firmware-problems. (%d)",</div><div class='add'>+			fw_file, ret);</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	info("downloading firmware from file '%s'", fw_file);</div><div class='add'>+</div><div class='add'>+	/* calc checksum */</div><div class='add'>+	for (i = 0; i &lt; fw-&gt;size; i++)</div><div class='add'>+		checksum += fw-&gt;data[i];</div><div class='add'>+</div><div class='add'>+	fw_params[0] = checksum &gt;&gt; 8;</div><div class='add'>+	fw_params[1] = checksum &amp; 0xff;</div><div class='add'>+	fw_params[2] = fw-&gt;size &gt;&gt; 8;</div><div class='add'>+	fw_params[3] = fw-&gt;size &amp; 0xff;</div><div class='add'>+</div><div class='add'>+	/* write fw checksum &amp; size */</div><div class='add'>+	ret = af9013_write_ofsm_regs(state, 0x50fc,</div><div class='add'>+		fw_params, sizeof(fw_params));</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error_release;</div><div class='add'>+</div><div class='add'>+	#define FW_PACKET_MAX_DATA  16</div><div class='add'>+</div><div class='add'>+	packets = fw-&gt;size / FW_PACKET_MAX_DATA;</div><div class='add'>+	remainder = fw-&gt;size % FW_PACKET_MAX_DATA;</div><div class='add'>+	len = FW_PACKET_MAX_DATA;</div><div class='add'>+	for (i = 0; i &lt;= packets; i++) {</div><div class='add'>+		if (i == packets)  /* set size of the last packet */</div><div class='add'>+			len = remainder;</div><div class='add'>+</div><div class='add'>+		data = (u8 *)(fw-&gt;data + i * FW_PACKET_MAX_DATA);</div><div class='add'>+		ret = af9013_write_ofsm_regs(state, addr, data, len);</div><div class='add'>+		addr += FW_PACKET_MAX_DATA;</div><div class='add'>+</div><div class='add'>+		if (ret) {</div><div class='add'>+			err("firmware download failed at %d with %d", i, ret);</div><div class='add'>+			goto error_release;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* request boot firmware */</div><div class='add'>+	ret = af9013_write_reg(state, 0xe205, 1);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error_release;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 15; i++) {</div><div class='add'>+		msleep(100);</div><div class='add'>+</div><div class='add'>+		/* check firmware status */</div><div class='add'>+		ret = af9013_read_reg(state, 0x98be, &amp;val);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto error_release;</div><div class='add'>+</div><div class='add'>+		deb_info("%s: firmware status:%02x\n", __func__, val);</div><div class='add'>+</div><div class='add'>+		if (val == 0x0c || val == 0x04) /* success or fail */</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (val == 0x04) {</div><div class='add'>+		err("firmware did not run");</div><div class='add'>+		ret = -1;</div><div class='add'>+	} else if (val != 0x0c) {</div><div class='add'>+		err("firmware boot timeout");</div><div class='add'>+		ret = -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+error_release:</div><div class='add'>+	release_firmware(fw);</div><div class='add'>+error:</div><div class='add'>+exit:</div><div class='add'>+	if (!ret)</div><div class='add'>+		info("found a '%s' in warm state.", af9013_ops.info.name);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int af9013_i2c_gate_ctrl(struct dvb_frontend *fe, int enable)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct af9013_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	deb_info("%s: enable:%d\n", __func__, enable);</div><div class='add'>+</div><div class='add'>+	if (state-&gt;config.output_mode == AF9013_OUTPUT_MODE_USB)</div><div class='add'>+		ret = af9013_write_reg_bits(state, 0xd417, 3, 1, enable);</div><div class='add'>+	else</div><div class='add'>+		ret = af9013_write_reg_bits(state, 0xd607, 2, 1, enable);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void af9013_release(struct dvb_frontend *fe)</div><div class='add'>+{</div><div class='add'>+	struct af9013_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	kfree(state);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct dvb_frontend_ops af9013_ops;</div><div class='add'>+</div><div class='add'>+struct dvb_frontend *af9013_attach(const struct af9013_config *config,</div><div class='add'>+	struct i2c_adapter *i2c)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct af9013_state *state = NULL;</div><div class='add'>+	u8 buf[3], i;</div><div class='add'>+</div><div class='add'>+	/* allocate memory for the internal state */</div><div class='add'>+	state = kzalloc(sizeof(struct af9013_state), GFP_KERNEL);</div><div class='add'>+	if (state == NULL)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	/* setup the state */</div><div class='add'>+	state-&gt;i2c = i2c;</div><div class='add'>+	memcpy(&amp;state-&gt;config, config, sizeof(struct af9013_config));</div><div class='add'>+</div><div class='add'>+	/* chip version */</div><div class='add'>+	ret = af9013_read_reg_bits(state, 0xd733, 4, 4, &amp;buf[2]);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	/* ROM version */</div><div class='add'>+	for (i = 0; i &lt; 2; i++) {</div><div class='add'>+		ret = af9013_read_reg(state, 0x116b + i, &amp;buf[i]);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto error;</div><div class='add'>+	}</div><div class='add'>+	deb_info("%s: chip version:%d ROM version:%d.%d\n", __func__,</div><div class='add'>+		buf[2], buf[0], buf[1]);</div><div class='add'>+</div><div class='add'>+	/* download firmware */</div><div class='add'>+	if (state-&gt;config.output_mode != AF9013_OUTPUT_MODE_USB) {</div><div class='add'>+		ret = af9013_download_firmware(state);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* firmware version */</div><div class='add'>+	for (i = 0; i &lt; 3; i++) {</div><div class='add'>+		ret = af9013_read_reg(state, 0x5103 + i, &amp;buf[i]);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto error;</div><div class='add'>+	}</div><div class='add'>+	info("firmware version:%d.%d.%d", buf[0], buf[1], buf[2]);</div><div class='add'>+</div><div class='add'>+	/* settings for mp2if */</div><div class='add'>+	if (state-&gt;config.output_mode == AF9013_OUTPUT_MODE_USB) {</div><div class='add'>+		/* AF9015 split PSB to 1.5k + 0.5k */</div><div class='add'>+		ret = af9013_write_reg_bits(state, 0xd50b, 2, 1, 1);</div><div class='add'>+	} else {</div><div class='add'>+		/* AF9013 change the output bit to data7 */</div><div class='add'>+		ret = af9013_write_reg_bits(state, 0xd500, 3, 1, 1);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto error;</div><div class='add'>+		/* AF9013 set mpeg to full speed */</div><div class='add'>+		ret = af9013_write_reg_bits(state, 0xd502, 4, 1, 1);</div><div class='add'>+	}</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+	ret = af9013_write_reg_bits(state, 0xd520, 4, 1, 1);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	/* set GPIOs */</div><div class='add'>+	for (i = 0; i &lt; sizeof(state-&gt;config.gpio); i++) {</div><div class='add'>+		ret = af9013_set_gpio(state, i, state-&gt;config.gpio[i]);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* create dvb_frontend */</div><div class='add'>+	memcpy(&amp;state-&gt;frontend.ops, &amp;af9013_ops,</div><div class='add'>+		sizeof(struct dvb_frontend_ops));</div><div class='add'>+	state-&gt;frontend.demodulator_priv = state;</div><div class='add'>+</div><div class='add'>+	return &amp;state-&gt;frontend;</div><div class='add'>+error:</div><div class='add'>+	kfree(state);</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(af9013_attach);</div><div class='add'>+</div><div class='add'>+static struct dvb_frontend_ops af9013_ops = {</div><div class='add'>+	.info = {</div><div class='add'>+		.name = "Afatech AF9013 DVB-T",</div><div class='add'>+		.type = FE_OFDM,</div><div class='add'>+		.frequency_min = 174000000,</div><div class='add'>+		.frequency_max = 862000000,</div><div class='add'>+		.frequency_stepsize = 250000,</div><div class='add'>+		.frequency_tolerance = 0,</div><div class='add'>+		.caps =</div><div class='add'>+			FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |</div><div class='add'>+			FE_CAN_FEC_5_6 | FE_CAN_FEC_7_8 | FE_CAN_FEC_AUTO |</div><div class='add'>+			FE_CAN_QPSK | FE_CAN_QAM_16 |</div><div class='add'>+			FE_CAN_QAM_64 | FE_CAN_QAM_AUTO |</div><div class='add'>+			FE_CAN_TRANSMISSION_MODE_AUTO |</div><div class='add'>+			FE_CAN_GUARD_INTERVAL_AUTO |</div><div class='add'>+			FE_CAN_HIERARCHY_AUTO |</div><div class='add'>+			FE_CAN_RECOVER |</div><div class='add'>+			FE_CAN_MUTE_TS</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	.release = af9013_release,</div><div class='add'>+	.init = af9013_init,</div><div class='add'>+	.sleep = af9013_sleep,</div><div class='add'>+	.i2c_gate_ctrl = af9013_i2c_gate_ctrl,</div><div class='add'>+</div><div class='add'>+	.set_frontend = af9013_set_frontend,</div><div class='add'>+	.get_frontend = af9013_get_frontend,</div><div class='add'>+</div><div class='add'>+	.get_tune_settings = af9013_get_tune_settings,</div><div class='add'>+</div><div class='add'>+	.read_status = af9013_read_status,</div><div class='add'>+	.read_ber = af9013_read_ber,</div><div class='add'>+	.read_signal_strength = af9013_read_signal_strength,</div><div class='add'>+	.read_snr = af9013_read_snr,</div><div class='add'>+	.read_ucblocks = af9013_read_ucblocks,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_param_named(debug, af9013_debug, int, 0644);</div><div class='add'>+MODULE_PARM_DESC(debug, "Turn on/off frontend debugging (default:off).");</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Antti Palosaari &lt;crope@iki.fi&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Afatech AF9013 DVB-T demodulator driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/media/dvb/frontends/af9013.h b/drivers/media/dvb/frontends/af9013.h<br/>new file mode 100644<br/>index 000000000000..28b90c91c766<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/frontends/af9013.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/af9013.h</a></div><div class='hunk'>@@ -0,0 +1,107 @@</div><div class='add'>+/*</div><div class='add'>+ * DVB USB Linux driver for Afatech AF9015 DVB-T USB2.0 receiver</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2007 Antti Palosaari &lt;crope@iki.fi&gt;</div><div class='add'>+ *</div><div class='add'>+ * Thanks to Afatech who kindly provided information.</div><div class='add'>+ *</div><div class='add'>+ *    This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *    it under the terms of the GNU General Public License as published by</div><div class='add'>+ *    the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ *    (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *    This program is distributed in the hope that it will be useful,</div><div class='add'>+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *    GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *    You should have received a copy of the GNU General Public License</div><div class='add'>+ *    along with this program; if not, write to the Free Software</div><div class='add'>+ *    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _AF9013_H_</div><div class='add'>+#define _AF9013_H_</div><div class='add'>+</div><div class='add'>+#include &lt;linux/dvb/frontend.h&gt;</div><div class='add'>+</div><div class='add'>+enum af9013_ts_mode {</div><div class='add'>+	AF9013_OUTPUT_MODE_PARALLEL,</div><div class='add'>+	AF9013_OUTPUT_MODE_SERIAL,</div><div class='add'>+	AF9013_OUTPUT_MODE_USB, /* only for AF9015 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum af9013_tuner {</div><div class='add'>+	AF9013_TUNER_MXL5003D   =   3, /* MaxLinear */</div><div class='add'>+	AF9013_TUNER_MXL5005D   =  13, /* MaxLinear */</div><div class='add'>+	AF9013_TUNER_MXL5005R   =  30, /* MaxLinear */</div><div class='add'>+	AF9013_TUNER_ENV77H11D5 = 129, /* Panasonic */</div><div class='add'>+	AF9013_TUNER_MT2060     = 130, /* Microtune */</div><div class='add'>+	AF9013_TUNER_MC44S803   = 133, /* Freescale */</div><div class='add'>+	AF9013_TUNER_QT1010     = 134, /* Quantek */</div><div class='add'>+	AF9013_TUNER_UNKNOWN    = 140, /* for can tuners ? */</div><div class='add'>+	AF9013_TUNER_MT2060_2   = 147, /* Microtune */</div><div class='add'>+	AF9013_TUNER_TDA18271   = 156, /* NXP */</div><div class='add'>+	AF9013_TUNER_QT1010A    = 162, /* Quantek */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* AF9013/5 GPIOs (mostly guessed)</div><div class='add'>+   demod#1-gpio#0 - set demod#2 i2c-addr for dual devices</div><div class='add'>+   demod#1-gpio#1 - xtal setting (?)</div><div class='add'>+   demod#1-gpio#3 - tuner#1</div><div class='add'>+   demod#2-gpio#0 - tuner#2</div><div class='add'>+   demod#2-gpio#1 - xtal setting (?)</div><div class='add'>+*/</div><div class='add'>+#define AF9013_GPIO_ON (1 &lt;&lt; 0)</div><div class='add'>+#define AF9013_GPIO_EN (1 &lt;&lt; 1)</div><div class='add'>+#define AF9013_GPIO_O  (1 &lt;&lt; 2)</div><div class='add'>+#define AF9013_GPIO_I  (1 &lt;&lt; 3)</div><div class='add'>+</div><div class='add'>+#define AF9013_GPIO_LO (AF9013_GPIO_ON|AF9013_GPIO_EN)</div><div class='add'>+#define AF9013_GPIO_HI (AF9013_GPIO_ON|AF9013_GPIO_EN|AF9013_GPIO_O)</div><div class='add'>+</div><div class='add'>+#define AF9013_GPIO_TUNER_ON  (AF9013_GPIO_ON|AF9013_GPIO_EN)</div><div class='add'>+#define AF9013_GPIO_TUNER_OFF (AF9013_GPIO_ON|AF9013_GPIO_EN|AF9013_GPIO_O)</div><div class='add'>+</div><div class='add'>+struct af9013_config {</div><div class='add'>+	/* demodulator's I2C address */</div><div class='add'>+	u8 demod_address;</div><div class='add'>+</div><div class='add'>+	/* frequencies in kHz */</div><div class='add'>+	u32 adc_clock;</div><div class='add'>+</div><div class='add'>+	/* tuner ID */</div><div class='add'>+	u8 tuner;</div><div class='add'>+</div><div class='add'>+	/* tuner IF */</div><div class='add'>+	u16 tuner_if;</div><div class='add'>+</div><div class='add'>+	/* TS data output mode */</div><div class='add'>+	u8 output_mode:2;</div><div class='add'>+</div><div class='add'>+	/* RF spectrum inversion */</div><div class='add'>+	u8 rf_spec_inv:1;</div><div class='add'>+</div><div class='add'>+	/* API version */</div><div class='add'>+	u8 api_version[4];</div><div class='add'>+</div><div class='add'>+	/* GPIOs */</div><div class='add'>+	u8 gpio[4];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_DVB_AF9013) || \</div><div class='add'>+	(defined(CONFIG_DVB_AF9013_MODULE) &amp;&amp; defined(MODULE))</div><div class='add'>+extern struct dvb_frontend *af9013_attach(const struct af9013_config *config,</div><div class='add'>+	struct i2c_adapter *i2c);</div><div class='add'>+#else</div><div class='add'>+static inline struct dvb_frontend *af9013_attach(</div><div class='add'>+const struct af9013_config *config, struct i2c_adapter *i2c)</div><div class='add'>+{</div><div class='add'>+	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_DVB_AF9013 */</div><div class='add'>+</div><div class='add'>+#endif /* _AF9013_H_ */</div><div class='head'>diff --git a/drivers/media/dvb/frontends/af9013_priv.h b/drivers/media/dvb/frontends/af9013_priv.h<br/>new file mode 100644<br/>index 000000000000..163e251d0b73<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/frontends/af9013_priv.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/af9013_priv.h</a></div><div class='hunk'>@@ -0,0 +1,869 @@</div><div class='add'>+/*</div><div class='add'>+ * DVB USB Linux driver for Afatech AF9015 DVB-T USB2.0 receiver</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2007 Antti Palosaari &lt;crope@iki.fi&gt;</div><div class='add'>+ *</div><div class='add'>+ * Thanks to Afatech who kindly provided information.</div><div class='add'>+ *</div><div class='add'>+ *    This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *    it under the terms of the GNU General Public License as published by</div><div class='add'>+ *    the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ *    (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *    This program is distributed in the hope that it will be useful,</div><div class='add'>+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *    GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *    You should have received a copy of the GNU General Public License</div><div class='add'>+ *    along with this program; if not, write to the Free Software</div><div class='add'>+ *    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _AF9013_PRIV_</div><div class='add'>+#define _AF9013_PRIV_</div><div class='add'>+</div><div class='add'>+#define LOG_PREFIX "af9013"</div><div class='add'>+extern int af9013_debug;</div><div class='add'>+</div><div class='add'>+#define dprintk(var, level, args...) \</div><div class='add'>+	    do { if ((var &amp; level)) printk(args); } while (0)</div><div class='add'>+</div><div class='add'>+#define debug_dump(b, l, func) {\</div><div class='add'>+	int loop_; \</div><div class='add'>+	for (loop_ = 0; loop_ &lt; l; loop_++) \</div><div class='add'>+		func("%02x ", b[loop_]); \</div><div class='add'>+	func("\n");\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define deb_info(args...) dprintk(af9013_debug, 0x01, args)</div><div class='add'>+</div><div class='add'>+#undef err</div><div class='add'>+#define err(f, arg...)  printk(KERN_ERR     LOG_PREFIX": " f "\n" , ## arg)</div><div class='add'>+#undef info</div><div class='add'>+#define info(f, arg...) printk(KERN_INFO    LOG_PREFIX": " f "\n" , ## arg)</div><div class='add'>+#undef warn</div><div class='add'>+#define warn(f, arg...) printk(KERN_WARNING LOG_PREFIX": " f "\n" , ## arg)</div><div class='add'>+</div><div class='add'>+#define AF9013_DEFAULT_FIRMWARE     "dvb-fe-af9013.fw"</div><div class='add'>+</div><div class='add'>+struct regdesc {</div><div class='add'>+	u16 addr;</div><div class='add'>+	u8  pos:4;</div><div class='add'>+	u8  len:4;</div><div class='add'>+	u8  val;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct snr_table {</div><div class='add'>+	u32 val;</div><div class='add'>+	u8 snr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* QPSK SNR lookup table */</div><div class='add'>+static struct snr_table qpsk_snr_table[] = {</div><div class='add'>+	{ 0x0b4771,  0 },</div><div class='add'>+	{ 0x0c1aed,  1 },</div><div class='add'>+	{ 0x0d0d27,  2 },</div><div class='add'>+	{ 0x0e4d19,  3 },</div><div class='add'>+	{ 0x0e5da8,  4 },</div><div class='add'>+	{ 0x107097,  5 },</div><div class='add'>+	{ 0x116975,  6 },</div><div class='add'>+	{ 0x1252d9,  7 },</div><div class='add'>+	{ 0x131fa4,  8 },</div><div class='add'>+	{ 0x13d5e1,  9 },</div><div class='add'>+	{ 0x148e53, 10 },</div><div class='add'>+	{ 0x15358b, 11 },</div><div class='add'>+	{ 0x15dd29, 12 },</div><div class='add'>+	{ 0x168112, 13 },</div><div class='add'>+	{ 0x170b61, 14 },</div><div class='add'>+	{ 0xffffff, 15 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* QAM16 SNR lookup table */</div><div class='add'>+static struct snr_table qam16_snr_table[] = {</div><div class='add'>+	{ 0x05eb62,  5 },</div><div class='add'>+	{ 0x05fecf,  6 },</div><div class='add'>+	{ 0x060b80,  7 },</div><div class='add'>+	{ 0x062501,  8 },</div><div class='add'>+	{ 0x064865,  9 },</div><div class='add'>+	{ 0x069604, 10 },</div><div class='add'>+	{ 0x06f356, 11 },</div><div class='add'>+	{ 0x07706a, 12 },</div><div class='add'>+	{ 0x0804d3, 13 },</div><div class='add'>+	{ 0x089d1a, 14 },</div><div class='add'>+	{ 0x093e3d, 15 },</div><div class='add'>+	{ 0x09e35d, 16 },</div><div class='add'>+	{ 0x0a7c3c, 17 },</div><div class='add'>+	{ 0x0afaf8, 18 },</div><div class='add'>+	{ 0x0b719d, 19 },</div><div class='add'>+	{ 0xffffff, 20 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* QAM64 SNR lookup table */</div><div class='add'>+static struct snr_table qam64_snr_table[] = {</div><div class='add'>+	{ 0x03109b, 12 },</div><div class='add'>+	{ 0x0310d4, 13 },</div><div class='add'>+	{ 0x031920, 14 },</div><div class='add'>+	{ 0x0322d0, 15 },</div><div class='add'>+	{ 0x0339fc, 16 },</div><div class='add'>+	{ 0x0364a1, 17 },</div><div class='add'>+	{ 0x038bcc, 18 },</div><div class='add'>+	{ 0x03c7d3, 19 },</div><div class='add'>+	{ 0x0408cc, 20 },</div><div class='add'>+	{ 0x043bed, 21 },</div><div class='add'>+	{ 0x048061, 22 },</div><div class='add'>+	{ 0x04be95, 23 },</div><div class='add'>+	{ 0x04fa7d, 24 },</div><div class='add'>+	{ 0x052405, 25 },</div><div class='add'>+	{ 0x05570d, 26 },</div><div class='add'>+	{ 0xffffff, 27 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct regdesc ofsm_init[] = {</div><div class='add'>+	{ 0xd73a, 0, 8, 0xa1 },</div><div class='add'>+	{ 0xd73b, 0, 8, 0x1f },</div><div class='add'>+	{ 0xd73c, 4, 4, 0x0a },</div><div class='add'>+	{ 0xd732, 3, 1, 0x00 },</div><div class='add'>+	{ 0xd731, 4, 2, 0x03 },</div><div class='add'>+	{ 0xd73d, 7, 1, 0x01 },</div><div class='add'>+	{ 0xd740, 0, 1, 0x00 },</div><div class='add'>+	{ 0xd740, 1, 1, 0x00 },</div><div class='add'>+	{ 0xd740, 2, 1, 0x00 },</div><div class='add'>+	{ 0xd740, 3, 1, 0x01 },</div><div class='add'>+	{ 0xd3c1, 4, 1, 0x01 },</div><div class='add'>+	{ 0xd3a2, 0, 8, 0x00 },</div><div class='add'>+	{ 0xd3a3, 0, 8, 0x04 },</div><div class='add'>+	{ 0xd305, 0, 8, 0x32 },</div><div class='add'>+	{ 0xd306, 0, 8, 0x10 },</div><div class='add'>+	{ 0xd304, 0, 8, 0x04 },</div><div class='add'>+	{ 0x9112, 0, 1, 0x01 },</div><div class='add'>+	{ 0x911d, 0, 1, 0x01 },</div><div class='add'>+	{ 0x911a, 0, 1, 0x01 },</div><div class='add'>+	{ 0x911b, 0, 1, 0x01 },</div><div class='add'>+	{ 0x9bce, 0, 4, 0x02 },</div><div class='add'>+	{ 0x9116, 0, 1, 0x01 },</div><div class='add'>+	{ 0x9bd1, 0, 1, 0x01 },</div><div class='add'>+	{ 0xd2e0, 0, 8, 0xd0 },</div><div class='add'>+	{ 0xd2e9, 0, 4, 0x0d },</div><div class='add'>+	{ 0xd38c, 0, 8, 0xfc },</div><div class='add'>+	{ 0xd38d, 0, 8, 0x00 },</div><div class='add'>+	{ 0xd38e, 0, 8, 0x7e },</div><div class='add'>+	{ 0xd38f, 0, 8, 0x00 },</div><div class='add'>+	{ 0xd390, 0, 8, 0x2f },</div><div class='add'>+	{ 0xd145, 4, 1, 0x01 },</div><div class='add'>+	{ 0xd1a9, 4, 1, 0x01 },</div><div class='add'>+	{ 0xd158, 5, 3, 0x01 },</div><div class='add'>+	{ 0xd159, 0, 6, 0x06 },</div><div class='add'>+	{ 0xd167, 0, 8, 0x00 },</div><div class='add'>+	{ 0xd168, 0, 4, 0x07 },</div><div class='add'>+	{ 0xd1c3, 5, 3, 0x00 },</div><div class='add'>+	{ 0xd1c4, 0, 6, 0x00 },</div><div class='add'>+	{ 0xd1c5, 0, 7, 0x10 },</div><div class='add'>+	{ 0xd1c6, 0, 3, 0x02 },</div><div class='add'>+	{ 0xd080, 2, 5, 0x03 },</div><div class='add'>+	{ 0xd081, 4, 4, 0x09 },</div><div class='add'>+	{ 0xd098, 4, 4, 0x0f },</div><div class='add'>+	{ 0xd098, 0, 4, 0x03 },</div><div class='add'>+	{ 0xdbc0, 3, 1, 0x01 },</div><div class='add'>+	{ 0xdbc0, 4, 1, 0x01 },</div><div class='add'>+	{ 0xdbc7, 0, 8, 0x08 },</div><div class='add'>+	{ 0xdbc8, 4, 4, 0x00 },</div><div class='add'>+	{ 0xdbc9, 0, 5, 0x01 },</div><div class='add'>+	{ 0xd280, 0, 8, 0xe0 },</div><div class='add'>+	{ 0xd281, 0, 8, 0xff },</div><div class='add'>+	{ 0xd282, 0, 8, 0xff },</div><div class='add'>+	{ 0xd283, 0, 8, 0xc3 },</div><div class='add'>+	{ 0xd284, 0, 8, 0xff },</div><div class='add'>+	{ 0xd285, 0, 4, 0x01 },</div><div class='add'>+	{ 0xd0f0, 0, 7, 0x1a },</div><div class='add'>+	{ 0xd0f1, 4, 1, 0x01 },</div><div class='add'>+	{ 0xd0f2, 0, 8, 0x0c },</div><div class='add'>+	{ 0xd103, 0, 4, 0x08 },</div><div class='add'>+	{ 0xd0f8, 0, 7, 0x20 },</div><div class='add'>+	{ 0xd111, 5, 1, 0x00 },</div><div class='add'>+	{ 0xd111, 6, 1, 0x00 },</div><div class='add'>+	{ 0x910b, 0, 8, 0x0a },</div><div class='add'>+	{ 0x9115, 0, 8, 0x02 },</div><div class='add'>+	{ 0x910c, 0, 8, 0x02 },</div><div class='add'>+	{ 0x910d, 0, 8, 0x08 },</div><div class='add'>+	{ 0x910e, 0, 8, 0x0a },</div><div class='add'>+	{ 0x9bf6, 0, 8, 0x06 },</div><div class='add'>+	{ 0x9bf8, 0, 8, 0x02 },</div><div class='add'>+	{ 0x9bf7, 0, 8, 0x05 },</div><div class='add'>+	{ 0x9bf9, 0, 8, 0x0f },</div><div class='add'>+	{ 0x9bfc, 0, 8, 0x13 },</div><div class='add'>+	{ 0x9bd3, 0, 8, 0xff },</div><div class='add'>+	{ 0x9bbe, 0, 1, 0x01 },</div><div class='add'>+	{ 0x9bcc, 0, 1, 0x01 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Panasonic ENV77H11D5 tuner init</div><div class='add'>+   AF9013_TUNER_ENV77H11D5 = 129 */</div><div class='add'>+static struct regdesc tuner_init_env77h11d5[] = {</div><div class='add'>+	{ 0x9bd5, 0, 8, 0x01 },</div><div class='add'>+	{ 0x9bd6, 0, 8, 0x03 },</div><div class='add'>+	{ 0x9bbe, 0, 8, 0x01 },</div><div class='add'>+	{ 0xd1a0, 1, 1, 0x01 },</div><div class='add'>+	{ 0xd000, 0, 1, 0x01 },</div><div class='add'>+	{ 0xd000, 1, 1, 0x00 },</div><div class='add'>+	{ 0xd001, 1, 1, 0x01 },</div><div class='add'>+	{ 0xd001, 0, 1, 0x00 },</div><div class='add'>+	{ 0xd001, 5, 1, 0x00 },</div><div class='add'>+	{ 0xd002, 0, 5, 0x19 },</div><div class='add'>+	{ 0xd003, 0, 5, 0x1a },</div><div class='add'>+	{ 0xd004, 0, 5, 0x19 },</div><div class='add'>+	{ 0xd005, 0, 5, 0x1a },</div><div class='add'>+	{ 0xd00e, 0, 5, 0x10 },</div><div class='add'>+	{ 0xd00f, 0, 3, 0x04 },</div><div class='add'>+	{ 0xd00f, 3, 3, 0x05 },</div><div class='add'>+	{ 0xd010, 0, 3, 0x04 },</div><div class='add'>+	{ 0xd010, 3, 3, 0x05 },</div><div class='add'>+	{ 0xd016, 4, 4, 0x03 },</div><div class='add'>+	{ 0xd01f, 0, 6, 0x0a },</div><div class='add'>+	{ 0xd020, 0, 6, 0x0a },</div><div class='add'>+	{ 0x9bda, 0, 8, 0x00 },</div><div class='add'>+	{ 0x9be3, 0, 8, 0x00 },</div><div class='add'>+	{ 0xd015, 0, 8, 0x50 },</div><div class='add'>+	{ 0xd016, 0, 1, 0x00 },</div><div class='add'>+	{ 0xd044, 0, 8, 0x46 },</div><div class='add'>+	{ 0xd045, 0, 1, 0x00 },</div><div class='add'>+	{ 0xd008, 0, 8, 0xdf },</div><div class='add'>+	{ 0xd009, 0, 2, 0x02 },</div><div class='add'>+	{ 0xd006, 0, 8, 0x44 },</div><div class='add'>+	{ 0xd007, 0, 2, 0x01 },</div><div class='add'>+	{ 0xd00c, 0, 8, 0xeb },</div><div class='add'>+	{ 0xd00d, 0, 2, 0x02 },</div><div class='add'>+	{ 0xd00a, 0, 8, 0xf4 },</div><div class='add'>+	{ 0xd00b, 0, 2, 0x01 },</div><div class='add'>+	{ 0x9bba, 0, 8, 0xf9 },</div><div class='add'>+	{ 0x9bc3, 0, 8, 0xdf },</div><div class='add'>+	{ 0x9bc4, 0, 8, 0x02 },</div><div class='add'>+	{ 0x9bc5, 0, 8, 0xeb },</div><div class='add'>+	{ 0x9bc6, 0, 8, 0x02 },</div><div class='add'>+	{ 0x9bc9, 0, 8, 0x52 },</div><div class='add'>+	{ 0xd011, 0, 8, 0x3c },</div><div class='add'>+	{ 0xd012, 0, 2, 0x01 },</div><div class='add'>+	{ 0xd013, 0, 8, 0xf7 },</div><div class='add'>+	{ 0xd014, 0, 2, 0x02 },</div><div class='add'>+	{ 0xd040, 0, 8, 0x0b },</div><div class='add'>+	{ 0xd041, 0, 2, 0x02 },</div><div class='add'>+	{ 0xd042, 0, 8, 0x4d },</div><div class='add'>+	{ 0xd043, 0, 2, 0x00 },</div><div class='add'>+	{ 0xd045, 1, 1, 0x00 },</div><div class='add'>+	{ 0x9bcf, 0, 1, 0x01 },</div><div class='add'>+	{ 0xd045, 2, 1, 0x01 },</div><div class='add'>+	{ 0xd04f, 0, 8, 0x9a },</div><div class='add'>+	{ 0xd050, 0, 1, 0x01 },</div><div class='add'>+	{ 0xd051, 0, 8, 0x5a },</div><div class='add'>+	{ 0xd052, 0, 1, 0x01 },</div><div class='add'>+	{ 0xd053, 0, 8, 0x50 },</div><div class='add'>+	{ 0xd054, 0, 8, 0x46 },</div><div class='add'>+	{ 0x9bd7, 0, 8, 0x0a },</div><div class='add'>+	{ 0x9bd8, 0, 8, 0x14 },</div><div class='add'>+	{ 0x9bd9, 0, 8, 0x08 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Microtune MT2060 tuner init</div><div class='add'>+   AF9013_TUNER_MT2060     = 130 */</div><div class='add'>+static struct regdesc tuner_init_mt2060[] = {</div><div class='add'>+	{ 0x9bd5, 0, 8, 0x01 },</div><div class='add'>+	{ 0x9bd6, 0, 8, 0x07 },</div><div class='add'>+	{ 0xd1a0, 1, 1, 0x01 },</div><div class='add'>+	{ 0xd000, 0, 1, 0x01 },</div><div class='add'>+	{ 0xd000, 1, 1, 0x00 },</div><div class='add'>+	{ 0xd001, 1, 1, 0x01 },</div><div class='add'>+	{ 0xd001, 0, 1, 0x00 },</div><div class='add'>+	{ 0xd001, 5, 1, 0x00 },</div><div class='add'>+	{ 0xd002, 0, 5, 0x19 },</div><div class='add'>+	{ 0xd003, 0, 5, 0x1a },</div><div class='add'>+	{ 0xd004, 0, 5, 0x19 },</div><div class='add'>+	{ 0xd005, 0, 5, 0x1a },</div><div class='add'>+	{ 0xd00e, 0, 5, 0x10 },</div><div class='add'>+	{ 0xd00f, 0, 3, 0x04 },</div><div class='add'>+	{ 0xd00f, 3, 3, 0x05 },</div><div class='add'>+	{ 0xd010, 0, 3, 0x04 },</div><div class='add'>+	{ 0xd010, 3, 3, 0x05 },</div><div class='add'>+	{ 0xd016, 4, 4, 0x03 },</div><div class='add'>+	{ 0xd01f, 0, 6, 0x0a },</div><div class='add'>+	{ 0xd020, 0, 6, 0x0a },</div><div class='add'>+	{ 0x9bda, 0, 8, 0x00 },</div><div class='add'>+	{ 0x9be3, 0, 8, 0x00 },</div><div class='add'>+	{ 0x9bbe, 0, 1, 0x00 },</div><div class='add'>+	{ 0x9bcc, 0, 1, 0x00 },</div><div class='add'>+	{ 0x9bb9, 0, 8, 0x75 },</div><div class='add'>+	{ 0x9bcd, 0, 8, 0x24 },</div><div class='add'>+	{ 0x9bff, 0, 8, 0x30 },</div><div class='add'>+	{ 0xd015, 0, 8, 0x46 },</div><div class='add'>+	{ 0xd016, 0, 1, 0x00 },</div><div class='add'>+	{ 0xd044, 0, 8, 0x46 },</div><div class='add'>+	{ 0xd045, 0, 1, 0x00 },</div><div class='add'>+	{ 0xd008, 0, 8, 0x0f },</div><div class='add'>+	{ 0xd009, 0, 2, 0x02 },</div><div class='add'>+	{ 0xd006, 0, 8, 0x32 },</div><div class='add'>+	{ 0xd007, 0, 2, 0x01 },</div><div class='add'>+	{ 0xd00c, 0, 8, 0x36 },</div><div class='add'>+	{ 0xd00d, 0, 2, 0x03 },</div><div class='add'>+	{ 0xd00a, 0, 8, 0x35 },</div><div class='add'>+	{ 0xd00b, 0, 2, 0x01 },</div><div class='add'>+	{ 0x9bc7, 0, 8, 0x07 },</div><div class='add'>+	{ 0x9bc8, 0, 8, 0x90 },</div><div class='add'>+	{ 0x9bc3, 0, 8, 0x0f },</div><div class='add'>+	{ 0x9bc4, 0, 8, 0x02 },</div><div class='add'>+	{ 0x9bc5, 0, 8, 0x36 },</div><div class='add'>+	{ 0x9bc6, 0, 8, 0x03 },</div><div class='add'>+	{ 0x9bba, 0, 8, 0xc9 },</div><div class='add'>+	{ 0x9bc9, 0, 8, 0x79 },</div><div class='add'>+	{ 0xd011, 0, 8, 0x10 },</div><div class='add'>+	{ 0xd012, 0, 2, 0x01 },</div><div class='add'>+	{ 0xd013, 0, 8, 0x45 },</div><div class='add'>+	{ 0xd014, 0, 2, 0x03 },</div><div class='add'>+	{ 0xd040, 0, 8, 0x98 },</div><div class='add'>+	{ 0xd041, 0, 2, 0x00 },</div><div class='add'>+	{ 0xd042, 0, 8, 0xcf },</div><div class='add'>+	{ 0xd043, 0, 2, 0x03 },</div><div class='add'>+	{ 0xd045, 1, 1, 0x00 },</div><div class='add'>+	{ 0x9bcf, 0, 1, 0x01 },</div><div class='add'>+	{ 0xd045, 2, 1, 0x01 },</div><div class='add'>+	{ 0xd04f, 0, 8, 0x9a },</div><div class='add'>+	{ 0xd050, 0, 1, 0x01 },</div><div class='add'>+	{ 0xd051, 0, 8, 0x5a },</div><div class='add'>+	{ 0xd052, 0, 1, 0x01 },</div><div class='add'>+	{ 0xd053, 0, 8, 0x50 },</div><div class='add'>+	{ 0xd054, 0, 8, 0x46 },</div><div class='add'>+	{ 0x9bd7, 0, 8, 0x0a },</div><div class='add'>+	{ 0x9bd8, 0, 8, 0x14 },</div><div class='add'>+	{ 0x9bd9, 0, 8, 0x08 },</div><div class='add'>+	{ 0x9bd0, 0, 8, 0xcc },</div><div class='add'>+	{ 0x9be4, 0, 8, 0xa0 },</div><div class='add'>+	{ 0x9bbd, 0, 8, 0x8e },</div><div class='add'>+	{ 0x9be2, 0, 8, 0x4d },</div><div class='add'>+	{ 0x9bee, 0, 1, 0x01 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Microtune MT2060 tuner init</div><div class='add'>+   AF9013_TUNER_MT2060_2   = 147 */</div><div class='add'>+static struct regdesc tuner_init_mt2060_2[] = {</div><div class='add'>+	{ 0x9bd5, 0, 8, 0x01 },</div><div class='add'>+	{ 0x9bd6, 0, 8, 0x06 },</div><div class='add'>+	{ 0x9bbe, 0, 8, 0x01 },</div><div class='add'>+	{ 0xd1a0, 1, 1, 0x01 },</div><div class='add'>+	{ 0xd000, 0, 1, 0x01 },</div><div class='add'>+	{ 0xd000, 1, 1, 0x00 },</div><div class='add'>+	{ 0xd001, 1, 1, 0x01 },</div><div class='add'>+	{ 0xd001, 0, 1, 0x00 },</div><div class='add'>+	{ 0xd001, 5, 1, 0x00 },</div><div class='add'>+	{ 0xd002, 0, 5, 0x19 },</div><div class='add'>+	{ 0xd003, 0, 5, 0x1a },</div><div class='add'>+	{ 0xd004, 0, 5, 0x19 },</div><div class='add'>+	{ 0xd005, 0, 5, 0x1a },</div><div class='add'>+	{ 0xd00e, 0, 5, 0x10 },</div><div class='add'>+	{ 0xd00f, 0, 3, 0x04 },</div><div class='add'>+	{ 0xd00f, 3, 3, 0x05 },</div><div class='add'>+	{ 0xd010, 0, 3, 0x04 },</div><div class='add'>+	{ 0xd010, 3, 3, 0x05 },</div><div class='add'>+	{ 0xd016, 4, 4, 0x03 },</div><div class='add'>+	{ 0xd01f, 0, 6, 0x0a },</div><div class='add'>+	{ 0xd020, 0, 6, 0x0a },</div><div class='add'>+	{ 0xd015, 0, 8, 0x46 },</div><div class='add'>+	{ 0xd016, 0, 1, 0x00 },</div><div class='add'>+	{ 0xd044, 0, 8, 0x46 },</div><div class='add'>+	{ 0xd045, 0, 1, 0x00 },</div><div class='add'>+	{ 0xd008, 0, 8, 0x0f },</div><div class='add'>+	{ 0xd009, 0, 2, 0x02 },</div><div class='add'>+	{ 0xd006, 0, 8, 0x32 },</div><div class='add'>+	{ 0xd007, 0, 2, 0x01 },</div><div class='add'>+	{ 0xd00c, 0, 8, 0x36 },</div><div class='add'>+	{ 0xd00d, 0, 2, 0x03 },</div><div class='add'>+	{ 0xd00a, 0, 8, 0x35 },</div><div class='add'>+	{ 0xd00b, 0, 2, 0x01 },</div><div class='add'>+	{ 0x9bc7, 0, 8, 0x07 },</div><div class='add'>+	{ 0x9bc8, 0, 8, 0x90 },</div><div class='add'>+	{ 0x9bc3, 0, 8, 0x0f },</div><div class='add'>+	{ 0x9bc4, 0, 8, 0x02 },</div><div class='add'>+	{ 0x9bc5, 0, 8, 0x36 },</div><div class='add'>+	{ 0x9bc6, 0, 8, 0x03 },</div><div class='add'>+	{ 0x9bba, 0, 8, 0xc9 },</div><div class='add'>+	{ 0x9bc9, 0, 8, 0x79 },</div><div class='add'>+	{ 0xd011, 0, 8, 0x10 },</div><div class='add'>+	{ 0xd012, 0, 2, 0x01 },</div><div class='add'>+	{ 0xd013, 0, 8, 0x45 },</div><div class='add'>+	{ 0xd014, 0, 2, 0x03 },</div><div class='add'>+	{ 0xd040, 0, 8, 0x98 },</div><div class='add'>+	{ 0xd041, 0, 2, 0x00 },</div><div class='add'>+	{ 0xd042, 0, 8, 0xcf },</div><div class='add'>+	{ 0xd043, 0, 2, 0x03 },</div><div class='add'>+	{ 0xd045, 1, 1, 0x00 },</div><div class='add'>+	{ 0x9bcf, 0, 8, 0x01 },</div><div class='add'>+	{ 0xd045, 2, 1, 0x01 },</div><div class='add'>+	{ 0xd04f, 0, 8, 0x9a },</div><div class='add'>+	{ 0xd050, 0, 1, 0x01 },</div><div class='add'>+	{ 0xd051, 0, 8, 0x5a },</div><div class='add'>+	{ 0xd052, 0, 1, 0x01 },</div><div class='add'>+	{ 0xd053, 0, 8, 0x96 },</div><div class='add'>+	{ 0xd054, 0, 8, 0x46 },</div><div class='add'>+	{ 0xd045, 7, 1, 0x00 },</div><div class='add'>+	{ 0x9bd7, 0, 8, 0x0a },</div><div class='add'>+	{ 0x9bd8, 0, 8, 0x14 },</div><div class='add'>+	{ 0x9bd9, 0, 8, 0x08 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* MaxLinear MXL5003 tuner init</div><div class='add'>+   AF9013_TUNER_MXL5003D   =   3 */</div><div class='add'>+static struct regdesc tuner_init_mxl5003d[] = {</div><div class='add'>+	{ 0x9bd5, 0, 8, 0x01 },</div><div class='add'>+	{ 0x9bd6, 0, 8, 0x09 },</div><div class='add'>+	{ 0xd1a0, 1, 1, 0x01 },</div><div class='add'>+	{ 0xd000, 0, 1, 0x01 },</div><div class='add'>+	{ 0xd000, 1, 1, 0x00 },</div><div class='add'>+	{ 0xd001, 1, 1, 0x01 },</div><div class='add'>+	{ 0xd001, 0, 1, 0x00 },</div><div class='add'>+	{ 0xd001, 5, 1, 0x00 },</div><div class='add'>+	{ 0xd002, 0, 5, 0x19 },</div><div class='add'>+	{ 0xd003, 0, 5, 0x1a },</div><div class='add'>+	{ 0xd004, 0, 5, 0x19 },</div><div class='add'>+	{ 0xd005, 0, 5, 0x1a },</div><div class='add'>+	{ 0xd00e, 0, 5, 0x10 },</div><div class='add'>+	{ 0xd00f, 0, 3, 0x04 },</div><div class='add'>+	{ 0xd00f, 3, 3, 0x05 },</div><div class='add'>+	{ 0xd010, 0, 3, 0x04 },</div><div class='add'>+	{ 0xd010, 3, 3, 0x05 },</div><div class='add'>+	{ 0xd016, 4, 4, 0x03 },</div><div class='add'>+	{ 0xd01f, 0, 6, 0x0a },</div><div class='add'>+	{ 0xd020, 0, 6, 0x0a },</div><div class='add'>+	{ 0x9bda, 0, 8, 0x00 },</div><div class='add'>+	{ 0x9be3, 0, 8, 0x00 },</div><div class='add'>+	{ 0x9bfc, 0, 8, 0x0f },</div><div class='add'>+	{ 0x9bf6, 0, 8, 0x01 },</div><div class='add'>+	{ 0x9bbe, 0, 1, 0x01 },</div><div class='add'>+	{ 0xd015, 0, 8, 0x33 },</div><div class='add'>+	{ 0xd016, 0, 1, 0x00 },</div><div class='add'>+	{ 0xd044, 0, 8, 0x40 },</div><div class='add'>+	{ 0xd045, 0, 1, 0x00 },</div><div class='add'>+	{ 0xd008, 0, 8, 0x0f },</div><div class='add'>+	{ 0xd009, 0, 2, 0x02 },</div><div class='add'>+	{ 0xd006, 0, 8, 0x6c },</div><div class='add'>+	{ 0xd007, 0, 2, 0x00 },</div><div class='add'>+	{ 0xd00c, 0, 8, 0x3d },</div><div class='add'>+	{ 0xd00d, 0, 2, 0x00 },</div><div class='add'>+	{ 0xd00a, 0, 8, 0x45 },</div><div class='add'>+	{ 0xd00b, 0, 2, 0x01 },</div><div class='add'>+	{ 0x9bc7, 0, 8, 0x07 },</div><div class='add'>+	{ 0x9bc8, 0, 8, 0x52 },</div><div class='add'>+	{ 0x9bc3, 0, 8, 0x0f },</div><div class='add'>+	{ 0x9bc4, 0, 8, 0x02 },</div><div class='add'>+	{ 0x9bc5, 0, 8, 0x3d },</div><div class='add'>+	{ 0x9bc6, 0, 8, 0x00 },</div><div class='add'>+	{ 0x9bba, 0, 8, 0xa2 },</div><div class='add'>+	{ 0x9bc9, 0, 8, 0xa0 },</div><div class='add'>+	{ 0xd011, 0, 8, 0x56 },</div><div class='add'>+	{ 0xd012, 0, 2, 0x00 },</div><div class='add'>+	{ 0xd013, 0, 8, 0x50 },</div><div class='add'>+	{ 0xd014, 0, 2, 0x00 },</div><div class='add'>+	{ 0xd040, 0, 8, 0x56 },</div><div class='add'>+	{ 0xd041, 0, 2, 0x00 },</div><div class='add'>+	{ 0xd042, 0, 8, 0x50 },</div><div class='add'>+	{ 0xd043, 0, 2, 0x00 },</div><div class='add'>+	{ 0xd045, 1, 1, 0x00 },</div><div class='add'>+	{ 0x9bcf, 0, 8, 0x01 },</div><div class='add'>+	{ 0xd045, 2, 1, 0x01 },</div><div class='add'>+	{ 0xd04f, 0, 8, 0x9a },</div><div class='add'>+	{ 0xd050, 0, 1, 0x01 },</div><div class='add'>+	{ 0xd051, 0, 8, 0x5a },</div><div class='add'>+	{ 0xd052, 0, 1, 0x01 },</div><div class='add'>+	{ 0xd053, 0, 8, 0x50 },</div><div class='add'>+	{ 0xd054, 0, 8, 0x46 },</div><div class='add'>+	{ 0x9bd7, 0, 8, 0x0a },</div><div class='add'>+	{ 0x9bd8, 0, 8, 0x14 },</div><div class='add'>+	{ 0x9bd9, 0, 8, 0x08 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* MaxLinear MXL5005 tuner init</div><div class='add'>+   AF9013_TUNER_MXL5005D   =  13</div><div class='add'>+   AF9013_TUNER_MXL5005R   =  30 */</div><div class='add'>+static struct regdesc tuner_init_mxl5005[] = {</div><div class='add'>+	{ 0x9bd5, 0, 8, 0x01 },</div><div class='add'>+	{ 0x9bd6, 0, 8, 0x07 },</div><div class='add'>+	{ 0xd1a0, 1, 1, 0x01 },</div><div class='add'>+	{ 0xd000, 0, 1, 0x01 },</div><div class='add'>+	{ 0xd000, 1, 1, 0x00 },</div><div class='add'>+	{ 0xd001, 1, 1, 0x01 },</div><div class='add'>+	{ 0xd001, 0, 1, 0x00 },</div><div class='add'>+	{ 0xd001, 5, 1, 0x00 },</div><div class='add'>+	{ 0xd002, 0, 5, 0x19 },</div><div class='add'>+	{ 0xd003, 0, 5, 0x1a },</div><div class='add'>+	{ 0xd004, 0, 5, 0x19 },</div><div class='add'>+	{ 0xd005, 0, 5, 0x1a },</div><div class='add'>+	{ 0xd00e, 0, 5, 0x10 },</div><div class='add'>+	{ 0xd00f, 0, 3, 0x04 },</div><div class='add'>+	{ 0xd00f, 3, 3, 0x05 },</div><div class='add'>+	{ 0xd010, 0, 3, 0x04 },</div><div class='add'>+	{ 0xd010, 3, 3, 0x05 },</div><div class='add'>+	{ 0xd016, 4, 4, 0x03 },</div><div class='add'>+	{ 0xd01f, 0, 6, 0x0a },</div><div class='add'>+	{ 0xd020, 0, 6, 0x0a },</div><div class='add'>+	{ 0x9bda, 0, 8, 0x01 },</div><div class='add'>+	{ 0x9be3, 0, 8, 0x01 },</div><div class='add'>+	{ 0x9bbe, 0, 1, 0x01 },</div><div class='add'>+	{ 0x9bcc, 0, 1, 0x01 },</div><div class='add'>+	{ 0x9bb9, 0, 8, 0x00 },</div><div class='add'>+	{ 0x9bcd, 0, 8, 0x28 },</div><div class='add'>+	{ 0x9bff, 0, 8, 0x24 },</div><div class='add'>+	{ 0xd015, 0, 8, 0x40 },</div><div class='add'>+	{ 0xd016, 0, 1, 0x00 },</div><div class='add'>+	{ 0xd044, 0, 8, 0x40 },</div><div class='add'>+	{ 0xd045, 0, 1, 0x00 },</div><div class='add'>+	{ 0xd008, 0, 8, 0x0f },</div><div class='add'>+	{ 0xd009, 0, 2, 0x02 },</div><div class='add'>+	{ 0xd006, 0, 8, 0x73 },</div><div class='add'>+	{ 0xd007, 0, 2, 0x01 },</div><div class='add'>+	{ 0xd00c, 0, 8, 0xfa },</div><div class='add'>+	{ 0xd00d, 0, 2, 0x01 },</div><div class='add'>+	{ 0xd00a, 0, 8, 0xff },</div><div class='add'>+	{ 0xd00b, 0, 2, 0x01 },</div><div class='add'>+	{ 0x9bc7, 0, 8, 0x23 },</div><div class='add'>+	{ 0x9bc8, 0, 8, 0x55 },</div><div class='add'>+	{ 0x9bc3, 0, 8, 0x01 },</div><div class='add'>+	{ 0x9bc4, 0, 8, 0x02 },</div><div class='add'>+	{ 0x9bc5, 0, 8, 0xfa },</div><div class='add'>+	{ 0x9bc6, 0, 8, 0x01 },</div><div class='add'>+	{ 0x9bba, 0, 8, 0xff },</div><div class='add'>+	{ 0x9bc9, 0, 8, 0xff },</div><div class='add'>+	{ 0x9bd3, 0, 8, 0x95 },</div><div class='add'>+	{ 0xd011, 0, 8, 0x70 },</div><div class='add'>+	{ 0xd012, 0, 2, 0x01 },</div><div class='add'>+	{ 0xd013, 0, 8, 0xfb },</div><div class='add'>+	{ 0xd014, 0, 2, 0x01 },</div><div class='add'>+	{ 0xd040, 0, 8, 0x70 },</div><div class='add'>+	{ 0xd041, 0, 2, 0x01 },</div><div class='add'>+	{ 0xd042, 0, 8, 0xfb },</div><div class='add'>+	{ 0xd043, 0, 2, 0x01 },</div><div class='add'>+	{ 0xd045, 1, 1, 0x00 },</div><div class='add'>+	{ 0x9bcf, 0, 1, 0x01 },</div><div class='add'>+	{ 0xd045, 2, 1, 0x01 },</div><div class='add'>+	{ 0xd04f, 0, 8, 0x9a },</div><div class='add'>+	{ 0xd050, 0, 1, 0x01 },</div><div class='add'>+	{ 0xd051, 0, 8, 0x5a },</div><div class='add'>+	{ 0xd052, 0, 1, 0x01 },</div><div class='add'>+	{ 0xd053, 0, 8, 0x50 },</div><div class='add'>+	{ 0xd054, 0, 8, 0x46 },</div><div class='add'>+	{ 0x9bd7, 0, 8, 0x0a },</div><div class='add'>+	{ 0x9bd8, 0, 8, 0x14 },</div><div class='add'>+	{ 0x9bd9, 0, 8, 0x08 },</div><div class='add'>+	{ 0x9bd0, 0, 8, 0x93 },</div><div class='add'>+	{ 0x9be4, 0, 8, 0xfe },</div><div class='add'>+	{ 0x9bbd, 0, 8, 0x63 },</div><div class='add'>+	{ 0x9be2, 0, 8, 0xfe },</div><div class='add'>+	{ 0x9bee, 0, 1, 0x01 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Quantek QT1010 tuner init</div><div class='add'>+   AF9013_TUNER_QT1010     = 134</div><div class='add'>+   AF9013_TUNER_QT1010A    = 162 */</div><div class='add'>+static struct regdesc tuner_init_qt1010[] = {</div><div class='add'>+	{ 0x9bd5, 0, 8, 0x01 },</div><div class='add'>+	{ 0x9bd6, 0, 8, 0x09 },</div><div class='add'>+	{ 0xd1a0, 1, 1, 0x01 },</div><div class='add'>+	{ 0xd000, 0, 1, 0x01 },</div><div class='add'>+	{ 0xd000, 1, 1, 0x00 },</div><div class='add'>+	{ 0xd001, 1, 1, 0x01 },</div><div class='add'>+	{ 0xd001, 0, 1, 0x00 },</div><div class='add'>+	{ 0xd001, 5, 1, 0x00 },</div><div class='add'>+	{ 0xd002, 0, 5, 0x19 },</div><div class='add'>+	{ 0xd003, 0, 5, 0x1a },</div><div class='add'>+	{ 0xd004, 0, 5, 0x19 },</div><div class='add'>+	{ 0xd005, 0, 5, 0x1a },</div><div class='add'>+	{ 0xd00e, 0, 5, 0x10 },</div><div class='add'>+	{ 0xd00f, 0, 3, 0x04 },</div><div class='add'>+	{ 0xd00f, 3, 3, 0x05 },</div><div class='add'>+	{ 0xd010, 0, 3, 0x04 },</div><div class='add'>+	{ 0xd010, 3, 3, 0x05 },</div><div class='add'>+	{ 0xd016, 4, 4, 0x03 },</div><div class='add'>+	{ 0xd01f, 0, 6, 0x0a },</div><div class='add'>+	{ 0xd020, 0, 6, 0x0a },</div><div class='add'>+	{ 0x9bda, 0, 8, 0x01 },</div><div class='add'>+	{ 0x9be3, 0, 8, 0x01 },</div><div class='add'>+	{ 0xd015, 0, 8, 0x46 },</div><div class='add'>+	{ 0xd016, 0, 1, 0x00 },</div><div class='add'>+	{ 0xd044, 0, 8, 0x46 },</div><div class='add'>+	{ 0xd045, 0, 1, 0x00 },</div><div class='add'>+	{ 0x9bbe, 0, 1, 0x01 },</div><div class='add'>+	{ 0x9bcc, 0, 1, 0x01 },</div><div class='add'>+	{ 0x9bb9, 0, 8, 0x00 },</div><div class='add'>+	{ 0x9bcd, 0, 8, 0x28 },</div><div class='add'>+	{ 0x9bff, 0, 8, 0x20 },</div><div class='add'>+	{ 0xd008, 0, 8, 0x0f },</div><div class='add'>+	{ 0xd009, 0, 2, 0x02 },</div><div class='add'>+	{ 0xd006, 0, 8, 0x99 },</div><div class='add'>+	{ 0xd007, 0, 2, 0x01 },</div><div class='add'>+	{ 0xd00c, 0, 8, 0x0f },</div><div class='add'>+	{ 0xd00d, 0, 2, 0x02 },</div><div class='add'>+	{ 0xd00a, 0, 8, 0x50 },</div><div class='add'>+	{ 0xd00b, 0, 2, 0x01 },</div><div class='add'>+	{ 0x9bc7, 0, 8, 0x00 },</div><div class='add'>+	{ 0x9bc8, 0, 8, 0x00 },</div><div class='add'>+	{ 0x9bc3, 0, 8, 0x0f },</div><div class='add'>+	{ 0x9bc4, 0, 8, 0x02 },</div><div class='add'>+	{ 0x9bc5, 0, 8, 0x0f },</div><div class='add'>+	{ 0x9bc6, 0, 8, 0x02 },</div><div class='add'>+	{ 0x9bba, 0, 8, 0xc5 },</div><div class='add'>+	{ 0x9bc9, 0, 8, 0xff },</div><div class='add'>+	{ 0xd011, 0, 8, 0x58 },</div><div class='add'>+	{ 0xd012, 0, 2, 0x02 },</div><div class='add'>+	{ 0xd013, 0, 8, 0x89 },</div><div class='add'>+	{ 0xd014, 0, 2, 0x01 },</div><div class='add'>+	{ 0xd040, 0, 8, 0x58 },</div><div class='add'>+	{ 0xd041, 0, 2, 0x02 },</div><div class='add'>+	{ 0xd042, 0, 8, 0x89 },</div><div class='add'>+	{ 0xd043, 0, 2, 0x01 },</div><div class='add'>+	{ 0xd045, 1, 1, 0x00 },</div><div class='add'>+	{ 0x9bcf, 0, 1, 0x01 },</div><div class='add'>+	{ 0xd045, 2, 1, 0x01 },</div><div class='add'>+	{ 0xd04f, 0, 8, 0x9a },</div><div class='add'>+	{ 0xd050, 0, 1, 0x01 },</div><div class='add'>+	{ 0xd051, 0, 8, 0x5a },</div><div class='add'>+	{ 0xd052, 0, 1, 0x01 },</div><div class='add'>+	{ 0xd053, 0, 8, 0x50 },</div><div class='add'>+	{ 0xd054, 0, 8, 0x46 },</div><div class='add'>+	{ 0x9bd7, 0, 8, 0x0a },</div><div class='add'>+	{ 0x9bd8, 0, 8, 0x14 },</div><div class='add'>+	{ 0x9bd9, 0, 8, 0x08 },</div><div class='add'>+	{ 0x9bd0, 0, 8, 0xcd },</div><div class='add'>+	{ 0x9be4, 0, 8, 0xbb },</div><div class='add'>+	{ 0x9bbd, 0, 8, 0x93 },</div><div class='add'>+	{ 0x9be2, 0, 8, 0x80 },</div><div class='add'>+	{ 0x9bee, 0, 1, 0x01 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Freescale MC44S803 tuner init</div><div class='add'>+   AF9013_TUNER_MC44S803   = 133 */</div><div class='add'>+static struct regdesc tuner_init_mc44s803[] = {</div><div class='add'>+	{ 0x9bd5, 0, 8, 0x01 },</div><div class='add'>+	{ 0x9bd6, 0, 8, 0x06 },</div><div class='add'>+	{ 0xd1a0, 1, 1, 0x01 },</div><div class='add'>+	{ 0xd000, 0, 1, 0x01 },</div><div class='add'>+	{ 0xd000, 1, 1, 0x00 },</div><div class='add'>+	{ 0xd001, 1, 1, 0x01 },</div><div class='add'>+	{ 0xd001, 0, 1, 0x00 },</div><div class='add'>+	{ 0xd001, 5, 1, 0x00 },</div><div class='add'>+	{ 0xd002, 0, 5, 0x19 },</div><div class='add'>+	{ 0xd003, 0, 5, 0x1a },</div><div class='add'>+	{ 0xd004, 0, 5, 0x19 },</div><div class='add'>+	{ 0xd005, 0, 5, 0x1a },</div><div class='add'>+	{ 0xd00e, 0, 5, 0x10 },</div><div class='add'>+	{ 0xd00f, 0, 3, 0x04 },</div><div class='add'>+	{ 0xd00f, 3, 3, 0x05 },</div><div class='add'>+	{ 0xd010, 0, 3, 0x04 },</div><div class='add'>+	{ 0xd010, 3, 3, 0x05 },</div><div class='add'>+	{ 0xd016, 4, 4, 0x03 },</div><div class='add'>+	{ 0xd01f, 0, 6, 0x0a },</div><div class='add'>+	{ 0xd020, 0, 6, 0x0a },</div><div class='add'>+	{ 0x9bda, 0, 8, 0x00 },</div><div class='add'>+	{ 0x9be3, 0, 8, 0x00 },</div><div class='add'>+	{ 0x9bf6, 0, 8, 0x01 },</div><div class='add'>+	{ 0x9bf8, 0, 8, 0x02 },</div><div class='add'>+	{ 0x9bf9, 0, 8, 0x02 },</div><div class='add'>+	{ 0x9bfc, 0, 8, 0x1f },</div><div class='add'>+	{ 0x9bbe, 0, 1, 0x01 },</div><div class='add'>+	{ 0x9bcc, 0, 1, 0x01 },</div><div class='add'>+	{ 0x9bb9, 0, 8, 0x00 },</div><div class='add'>+	{ 0x9bcd, 0, 8, 0x24 },</div><div class='add'>+	{ 0x9bff, 0, 8, 0x24 },</div><div class='add'>+	{ 0xd015, 0, 8, 0x46 },</div><div class='add'>+	{ 0xd016, 0, 1, 0x00 },</div><div class='add'>+	{ 0xd044, 0, 8, 0x46 },</div><div class='add'>+	{ 0xd045, 0, 1, 0x00 },</div><div class='add'>+	{ 0xd008, 0, 8, 0x01 },</div><div class='add'>+	{ 0xd009, 0, 2, 0x02 },</div><div class='add'>+	{ 0xd006, 0, 8, 0x7b },</div><div class='add'>+	{ 0xd007, 0, 2, 0x00 },</div><div class='add'>+	{ 0xd00c, 0, 8, 0x7c },</div><div class='add'>+	{ 0xd00d, 0, 2, 0x02 },</div><div class='add'>+	{ 0xd00a, 0, 8, 0xfe },</div><div class='add'>+	{ 0xd00b, 0, 2, 0x01 },</div><div class='add'>+	{ 0x9bc7, 0, 8, 0x08 },</div><div class='add'>+	{ 0x9bc8, 0, 8, 0x9a },</div><div class='add'>+	{ 0x9bc3, 0, 8, 0x01 },</div><div class='add'>+	{ 0x9bc4, 0, 8, 0x02 },</div><div class='add'>+	{ 0x9bc5, 0, 8, 0x7c },</div><div class='add'>+	{ 0x9bc6, 0, 8, 0x02 },</div><div class='add'>+	{ 0x9bba, 0, 8, 0xfc },</div><div class='add'>+	{ 0x9bc9, 0, 8, 0xaa },</div><div class='add'>+	{ 0xd011, 0, 8, 0x6b },</div><div class='add'>+	{ 0xd012, 0, 2, 0x00 },</div><div class='add'>+	{ 0xd013, 0, 8, 0x88 },</div><div class='add'>+	{ 0xd014, 0, 2, 0x02 },</div><div class='add'>+	{ 0xd040, 0, 8, 0x6b },</div><div class='add'>+	{ 0xd041, 0, 2, 0x00 },</div><div class='add'>+	{ 0xd042, 0, 8, 0x7c },</div><div class='add'>+	{ 0xd043, 0, 2, 0x02 },</div><div class='add'>+	{ 0xd045, 1, 1, 0x00 },</div><div class='add'>+	{ 0x9bcf, 0, 1, 0x01 },</div><div class='add'>+	{ 0xd045, 2, 1, 0x01 },</div><div class='add'>+	{ 0xd04f, 0, 8, 0x9a },</div><div class='add'>+	{ 0xd050, 0, 1, 0x01 },</div><div class='add'>+	{ 0xd051, 0, 8, 0x5a },</div><div class='add'>+	{ 0xd052, 0, 1, 0x01 },</div><div class='add'>+	{ 0xd053, 0, 8, 0x50 },</div><div class='add'>+	{ 0xd054, 0, 8, 0x46 },</div><div class='add'>+	{ 0x9bd7, 0, 8, 0x0a },</div><div class='add'>+	{ 0x9bd8, 0, 8, 0x14 },</div><div class='add'>+	{ 0x9bd9, 0, 8, 0x08 },</div><div class='add'>+	{ 0x9bd0, 0, 8, 0x9e },</div><div class='add'>+	{ 0x9be4, 0, 8, 0xff },</div><div class='add'>+	{ 0x9bbd, 0, 8, 0x9e },</div><div class='add'>+	{ 0x9be2, 0, 8, 0x25 },</div><div class='add'>+	{ 0x9bee, 0, 1, 0x01 },</div><div class='add'>+	{ 0xd73b, 3, 1, 0x00 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* unknown, probably for tin can tuner, tuner init</div><div class='add'>+   AF9013_TUNER_UNKNOWN   = 140 */</div><div class='add'>+static struct regdesc tuner_init_unknown[] = {</div><div class='add'>+	{ 0x9bd5, 0, 8, 0x01 },</div><div class='add'>+	{ 0x9bd6, 0, 8, 0x02 },</div><div class='add'>+	{ 0xd1a0, 1, 1, 0x01 },</div><div class='add'>+	{ 0xd000, 0, 1, 0x01 },</div><div class='add'>+	{ 0xd000, 1, 1, 0x00 },</div><div class='add'>+	{ 0xd001, 1, 1, 0x01 },</div><div class='add'>+	{ 0xd001, 0, 1, 0x00 },</div><div class='add'>+	{ 0xd001, 5, 1, 0x00 },</div><div class='add'>+	{ 0xd002, 0, 5, 0x19 },</div><div class='add'>+	{ 0xd003, 0, 5, 0x1a },</div><div class='add'>+	{ 0xd004, 0, 5, 0x19 },</div><div class='add'>+	{ 0xd005, 0, 5, 0x1a },</div><div class='add'>+	{ 0xd00e, 0, 5, 0x10 },</div><div class='add'>+	{ 0xd00f, 0, 3, 0x04 },</div><div class='add'>+	{ 0xd00f, 3, 3, 0x05 },</div><div class='add'>+	{ 0xd010, 0, 3, 0x04 },</div><div class='add'>+	{ 0xd010, 3, 3, 0x05 },</div><div class='add'>+	{ 0xd016, 4, 4, 0x03 },</div><div class='add'>+	{ 0xd01f, 0, 6, 0x0a },</div><div class='add'>+	{ 0xd020, 0, 6, 0x0a },</div><div class='add'>+	{ 0x9bda, 0, 8, 0x01 },</div><div class='add'>+	{ 0x9be3, 0, 8, 0x01 },</div><div class='add'>+	{ 0xd1a0, 1, 1, 0x00 },</div><div class='add'>+	{ 0x9bbe, 0, 1, 0x01 },</div><div class='add'>+	{ 0x9bcc, 0, 1, 0x01 },</div><div class='add'>+	{ 0x9bb9, 0, 8, 0x00 },</div><div class='add'>+	{ 0x9bcd, 0, 8, 0x18 },</div><div class='add'>+	{ 0x9bff, 0, 8, 0x2c },</div><div class='add'>+	{ 0xd015, 0, 8, 0x46 },</div><div class='add'>+	{ 0xd016, 0, 1, 0x00 },</div><div class='add'>+	{ 0xd044, 0, 8, 0x46 },</div><div class='add'>+	{ 0xd045, 0, 1, 0x00 },</div><div class='add'>+	{ 0xd008, 0, 8, 0xdf },</div><div class='add'>+	{ 0xd009, 0, 2, 0x02 },</div><div class='add'>+	{ 0xd006, 0, 8, 0x44 },</div><div class='add'>+	{ 0xd007, 0, 2, 0x01 },</div><div class='add'>+	{ 0xd00c, 0, 8, 0x00 },</div><div class='add'>+	{ 0xd00d, 0, 2, 0x02 },</div><div class='add'>+	{ 0xd00a, 0, 8, 0xf6 },</div><div class='add'>+	{ 0xd00b, 0, 2, 0x01 },</div><div class='add'>+	{ 0x9bba, 0, 8, 0xf9 },</div><div class='add'>+	{ 0x9bc8, 0, 8, 0xaa },</div><div class='add'>+	{ 0x9bc3, 0, 8, 0xdf },</div><div class='add'>+	{ 0x9bc4, 0, 8, 0x02 },</div><div class='add'>+	{ 0x9bc5, 0, 8, 0x00 },</div><div class='add'>+	{ 0x9bc6, 0, 8, 0x02 },</div><div class='add'>+	{ 0x9bc9, 0, 8, 0xf0 },</div><div class='add'>+	{ 0xd011, 0, 8, 0x3c },</div><div class='add'>+	{ 0xd012, 0, 2, 0x01 },</div><div class='add'>+	{ 0xd013, 0, 8, 0xf7 },</div><div class='add'>+	{ 0xd014, 0, 2, 0x02 },</div><div class='add'>+	{ 0xd040, 0, 8, 0x0b },</div><div class='add'>+	{ 0xd041, 0, 2, 0x02 },</div><div class='add'>+	{ 0xd042, 0, 8, 0x4d },</div><div class='add'>+	{ 0xd043, 0, 2, 0x00 },</div><div class='add'>+	{ 0xd045, 1, 1, 0x00 },</div><div class='add'>+	{ 0x9bcf, 0, 1, 0x01 },</div><div class='add'>+	{ 0xd045, 2, 1, 0x01 },</div><div class='add'>+	{ 0xd04f, 0, 8, 0x9a },</div><div class='add'>+	{ 0xd050, 0, 1, 0x01 },</div><div class='add'>+	{ 0xd051, 0, 8, 0x5a },</div><div class='add'>+	{ 0xd052, 0, 1, 0x01 },</div><div class='add'>+	{ 0xd053, 0, 8, 0x50 },</div><div class='add'>+	{ 0xd054, 0, 8, 0x46 },</div><div class='add'>+	{ 0x9bd7, 0, 8, 0x0a },</div><div class='add'>+	{ 0x9bd8, 0, 8, 0x14 },</div><div class='add'>+	{ 0x9bd9, 0, 8, 0x08 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* NXP TDA18271 tuner init</div><div class='add'>+   AF9013_TUNER_TDA18271   = 156 */</div><div class='add'>+static struct regdesc tuner_init_tda18271[] = {</div><div class='add'>+	{ 0x9bd5, 0, 8, 0x01 },</div><div class='add'>+	{ 0x9bd6, 0, 8, 0x04 },</div><div class='add'>+	{ 0xd1a0, 1, 1, 0x01 },</div><div class='add'>+	{ 0xd000, 0, 1, 0x01 },</div><div class='add'>+	{ 0xd000, 1, 1, 0x00 },</div><div class='add'>+	{ 0xd001, 1, 1, 0x01 },</div><div class='add'>+	{ 0xd001, 0, 1, 0x00 },</div><div class='add'>+	{ 0xd001, 5, 1, 0x00 },</div><div class='add'>+	{ 0xd002, 0, 5, 0x19 },</div><div class='add'>+	{ 0xd003, 0, 5, 0x1a },</div><div class='add'>+	{ 0xd004, 0, 5, 0x19 },</div><div class='add'>+	{ 0xd005, 0, 5, 0x1a },</div><div class='add'>+	{ 0xd00e, 0, 5, 0x10 },</div><div class='add'>+	{ 0xd00f, 0, 3, 0x04 },</div><div class='add'>+	{ 0xd00f, 3, 3, 0x05 },</div><div class='add'>+	{ 0xd010, 0, 3, 0x04 },</div><div class='add'>+	{ 0xd010, 3, 3, 0x05 },</div><div class='add'>+	{ 0xd016, 4, 4, 0x03 },</div><div class='add'>+	{ 0xd01f, 0, 6, 0x0a },</div><div class='add'>+	{ 0xd020, 0, 6, 0x0a },</div><div class='add'>+	{ 0x9bda, 0, 8, 0x01 },</div><div class='add'>+	{ 0x9be3, 0, 8, 0x01 },</div><div class='add'>+	{ 0xd1a0, 1, 1, 0x00 },</div><div class='add'>+	{ 0x9bbe, 0, 1, 0x01 },</div><div class='add'>+	{ 0x9bcc, 0, 1, 0x01 },</div><div class='add'>+	{ 0x9bb9, 0, 8, 0x00 },</div><div class='add'>+	{ 0x9bcd, 0, 8, 0x18 },</div><div class='add'>+	{ 0x9bff, 0, 8, 0x2c },</div><div class='add'>+	{ 0xd015, 0, 8, 0x46 },</div><div class='add'>+	{ 0xd016, 0, 1, 0x00 },</div><div class='add'>+	{ 0xd044, 0, 8, 0x46 },</div><div class='add'>+	{ 0xd045, 0, 1, 0x00 },</div><div class='add'>+	{ 0xd008, 0, 8, 0xdf },</div><div class='add'>+	{ 0xd009, 0, 2, 0x02 },</div><div class='add'>+	{ 0xd006, 0, 8, 0x44 },</div><div class='add'>+	{ 0xd007, 0, 2, 0x01 },</div><div class='add'>+	{ 0xd00c, 0, 8, 0x00 },</div><div class='add'>+	{ 0xd00d, 0, 2, 0x02 },</div><div class='add'>+	{ 0xd00a, 0, 8, 0xf6 },</div><div class='add'>+	{ 0xd00b, 0, 2, 0x01 },</div><div class='add'>+	{ 0x9bba, 0, 8, 0xf9 },</div><div class='add'>+	{ 0x9bc8, 0, 8, 0xaa },</div><div class='add'>+	{ 0x9bc3, 0, 8, 0xdf },</div><div class='add'>+	{ 0x9bc4, 0, 8, 0x02 },</div><div class='add'>+	{ 0x9bc5, 0, 8, 0x00 },</div><div class='add'>+	{ 0x9bc6, 0, 8, 0x02 },</div><div class='add'>+	{ 0x9bc9, 0, 8, 0xf0 },</div><div class='add'>+	{ 0xd011, 0, 8, 0x3c },</div><div class='add'>+	{ 0xd012, 0, 2, 0x01 },</div><div class='add'>+	{ 0xd013, 0, 8, 0xf7 },</div><div class='add'>+	{ 0xd014, 0, 2, 0x02 },</div><div class='add'>+	{ 0xd040, 0, 8, 0x0b },</div><div class='add'>+	{ 0xd041, 0, 2, 0x02 },</div><div class='add'>+	{ 0xd042, 0, 8, 0x4d },</div><div class='add'>+	{ 0xd043, 0, 2, 0x00 },</div><div class='add'>+	{ 0xd045, 1, 1, 0x00 },</div><div class='add'>+	{ 0x9bcf, 0, 1, 0x01 },</div><div class='add'>+	{ 0xd045, 2, 1, 0x01 },</div><div class='add'>+	{ 0xd04f, 0, 8, 0x9a },</div><div class='add'>+	{ 0xd050, 0, 1, 0x01 },</div><div class='add'>+	{ 0xd051, 0, 8, 0x5a },</div><div class='add'>+	{ 0xd052, 0, 1, 0x01 },</div><div class='add'>+	{ 0xd053, 0, 8, 0x50 },</div><div class='add'>+	{ 0xd054, 0, 8, 0x46 },</div><div class='add'>+	{ 0x9bd7, 0, 8, 0x0a },</div><div class='add'>+	{ 0x9bd8, 0, 8, 0x14 },</div><div class='add'>+	{ 0x9bd9, 0, 8, 0x08 },</div><div class='add'>+	{ 0x9bd0, 0, 8, 0xa8 },</div><div class='add'>+	{ 0x9be4, 0, 8, 0x7f },</div><div class='add'>+	{ 0x9bbd, 0, 8, 0xa8 },</div><div class='add'>+	{ 0x9be2, 0, 8, 0x20 },</div><div class='add'>+	{ 0x9bee, 0, 1, 0x01 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif /* _AF9013_PRIV_ */</div><div class='head'>diff --git a/drivers/media/dvb/frontends/au8522.c b/drivers/media/dvb/frontends/au8522.c<br/>index 0b82cc2a1e16..eabf9a68e7ec 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/frontends/au8522.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/dvb/frontends/au8522.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/frontends/au8522.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/au8522.c</a></div><div class='hunk'>@@ -40,6 +40,8 @@ struct au8522_state {</div><div class='ctx'> 	u32 current_frequency;</div><div class='ctx'> 	fe_modulation_t current_modulation;</div><div class='ctx'> </div><div class='add'>+	u32 fe_status;</div><div class='add'>+	unsigned int led_state;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int debug;</div><div class='hunk'>@@ -538,11 +540,98 @@ static int au8522_init(struct dvb_frontend *fe)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int au8522_led_gpio_enable(struct au8522_state *state, int onoff)</div><div class='add'>+{</div><div class='add'>+	struct au8522_led_config *led_config = state-&gt;config-&gt;led_cfg;</div><div class='add'>+	u8 val;</div><div class='add'>+</div><div class='add'>+	/* bail out if we cant control an LED */</div><div class='add'>+	if (!led_config || !led_config-&gt;gpio_output ||</div><div class='add'>+	    !led_config-&gt;gpio_output_enable || !led_config-&gt;gpio_output_disable)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	val = au8522_readreg(state, 0x4000 |</div><div class='add'>+			     (led_config-&gt;gpio_output &amp; ~0xc000));</div><div class='add'>+	if (onoff) {</div><div class='add'>+		/* enable GPIO output */</div><div class='add'>+		val &amp;= ~((led_config-&gt;gpio_output_enable &gt;&gt; 8) &amp; 0xff);</div><div class='add'>+		val |=  (led_config-&gt;gpio_output_enable &amp; 0xff);</div><div class='add'>+	} else {</div><div class='add'>+		/* disable GPIO output */</div><div class='add'>+		val &amp;= ~((led_config-&gt;gpio_output_disable &gt;&gt; 8) &amp; 0xff);</div><div class='add'>+		val |=  (led_config-&gt;gpio_output_disable &amp; 0xff);</div><div class='add'>+	}</div><div class='add'>+	return au8522_writereg(state, 0x8000 |</div><div class='add'>+			       (led_config-&gt;gpio_output &amp; ~0xc000), val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* led = 0 | off</div><div class='add'>+ * led = 1 | signal ok</div><div class='add'>+ * led = 2 | signal strong</div><div class='add'>+ * led &lt; 0 | only light led if leds are currently off</div><div class='add'>+ */</div><div class='add'>+static int au8522_led_ctrl(struct au8522_state *state, int led)</div><div class='add'>+{</div><div class='add'>+	struct au8522_led_config *led_config = state-&gt;config-&gt;led_cfg;</div><div class='add'>+	int i, ret = 0;</div><div class='add'>+</div><div class='add'>+	/* bail out if we cant control an LED */</div><div class='add'>+	if (!led_config || !led_config-&gt;gpio_leds ||</div><div class='add'>+	    !led_config-&gt;num_led_states || !led_config-&gt;led_states)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (led &lt; 0) {</div><div class='add'>+		/* if LED is already lit, then leave it as-is */</div><div class='add'>+		if (state-&gt;led_state)</div><div class='add'>+			return 0;</div><div class='add'>+		else</div><div class='add'>+			led *= -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* toggle LED if changing state */</div><div class='add'>+	if (state-&gt;led_state != led) {</div><div class='add'>+		u8 val;</div><div class='add'>+</div><div class='add'>+		dprintk("%s: %d\n", __func__, led);</div><div class='add'>+</div><div class='add'>+		au8522_led_gpio_enable(state, 1);</div><div class='add'>+</div><div class='add'>+		val = au8522_readreg(state, 0x4000 |</div><div class='add'>+				     (led_config-&gt;gpio_leds &amp; ~0xc000));</div><div class='add'>+</div><div class='add'>+		/* start with all leds off */</div><div class='add'>+		for (i = 0; i &lt; led_config-&gt;num_led_states; i++)</div><div class='add'>+			val &amp;= ~led_config-&gt;led_states[i];</div><div class='add'>+</div><div class='add'>+		/* set selected LED state */</div><div class='add'>+		if (led &lt; led_config-&gt;num_led_states)</div><div class='add'>+			val |= led_config-&gt;led_states[led];</div><div class='add'>+		else if (led_config-&gt;num_led_states)</div><div class='add'>+			val |=</div><div class='add'>+			led_config-&gt;led_states[led_config-&gt;num_led_states - 1];</div><div class='add'>+</div><div class='add'>+		ret = au8522_writereg(state, 0x8000 |</div><div class='add'>+				      (led_config-&gt;gpio_leds &amp; ~0xc000), val);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		state-&gt;led_state = led;</div><div class='add'>+</div><div class='add'>+		if (led == 0)</div><div class='add'>+			au8522_led_gpio_enable(state, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int au8522_sleep(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct au8522_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	dprintk("%s()\n", __func__);</div><div class='ctx'> </div><div class='add'>+	/* turn off led */</div><div class='add'>+	au8522_led_ctrl(state, 0);</div><div class='add'>+</div><div class='ctx'> 	state-&gt;current_frequency = 0;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -592,12 +681,53 @@ static int au8522_read_status(struct dvb_frontend *fe, fe_status_t *status)</div><div class='ctx'> 			*status |= FE_HAS_CARRIER | FE_HAS_SIGNAL;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='add'>+	state-&gt;fe_status = *status;</div><div class='add'>+</div><div class='add'>+	if (*status &amp; FE_HAS_LOCK)</div><div class='add'>+		/* turn on LED, if it isn't on already */</div><div class='add'>+		au8522_led_ctrl(state, -1);</div><div class='add'>+	else</div><div class='add'>+		/* turn off LED */</div><div class='add'>+		au8522_led_ctrl(state, 0);</div><div class='ctx'> </div><div class='ctx'> 	dprintk("%s() status 0x%08x\n", __func__, *status);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int au8522_led_status(struct au8522_state *state, const u16 *snr)</div><div class='add'>+{</div><div class='add'>+	struct au8522_led_config *led_config = state-&gt;config-&gt;led_cfg;</div><div class='add'>+	int led;</div><div class='add'>+	u16 strong;</div><div class='add'>+</div><div class='add'>+	/* bail out if we cant control an LED */</div><div class='add'>+	if (!led_config)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (0 == (state-&gt;fe_status &amp; FE_HAS_LOCK))</div><div class='add'>+		return au8522_led_ctrl(state, 0);</div><div class='add'>+	else if (state-&gt;current_modulation == QAM_256)</div><div class='add'>+		strong = led_config-&gt;qam256_strong;</div><div class='add'>+	else if (state-&gt;current_modulation == QAM_64)</div><div class='add'>+		strong = led_config-&gt;qam64_strong;</div><div class='add'>+	else /* (state-&gt;current_modulation == VSB_8) */</div><div class='add'>+		strong = led_config-&gt;vsb8_strong;</div><div class='add'>+</div><div class='add'>+	if (*snr &gt;= strong)</div><div class='add'>+		led = 2;</div><div class='add'>+	else</div><div class='add'>+		led = 1;</div><div class='add'>+</div><div class='add'>+	if ((state-&gt;led_state) &amp;&amp;</div><div class='add'>+	    (((strong &lt; *snr) ? (*snr - strong) : (strong - *snr)) &lt;= 10))</div><div class='add'>+		/* snr didn't change enough to bother</div><div class='add'>+		 * changing the color of the led */</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return au8522_led_ctrl(state, led);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int au8522_read_snr(struct dvb_frontend *fe, u16 *snr)</div><div class='ctx'> {</div><div class='ctx'> 	struct au8522_state *state = fe-&gt;demodulator_priv;</div><div class='hunk'>@@ -621,6 +751,9 @@ static int au8522_read_snr(struct dvb_frontend *fe, u16 *snr)</div><div class='ctx'> 					    au8522_readreg(state, 0x4311),</div><div class='ctx'> 					    snr);</div><div class='ctx'> </div><div class='add'>+	if (state-&gt;config-&gt;led_cfg)</div><div class='add'>+		au8522_led_status(state, snr);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/dvb/frontends/au8522.h b/drivers/media/dvb/frontends/au8522.h<br/>index 595915ade8c3..7b94f554a093 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/frontends/au8522.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/dvb/frontends/au8522.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/frontends/au8522.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/au8522.h</a></div><div class='hunk'>@@ -30,6 +30,21 @@ enum au8522_if_freq {</div><div class='ctx'> 	AU8522_IF_3_25MHZ,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct au8522_led_config {</div><div class='add'>+	u16 vsb8_strong;</div><div class='add'>+	u16 qam64_strong;</div><div class='add'>+	u16 qam256_strong;</div><div class='add'>+</div><div class='add'>+	u16 gpio_output;</div><div class='add'>+	/* unset hi bits, set low bits */</div><div class='add'>+	u16 gpio_output_enable;</div><div class='add'>+	u16 gpio_output_disable;</div><div class='add'>+</div><div class='add'>+	u16 gpio_leds;</div><div class='add'>+	u8 *led_states;</div><div class='add'>+	unsigned int num_led_states;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct au8522_config {</div><div class='ctx'> 	/* the demodulator's i2c address */</div><div class='ctx'> 	u8 demod_address;</div><div class='hunk'>@@ -39,6 +54,8 @@ struct au8522_config {</div><div class='ctx'> #define AU8522_DEMODLOCKING 1</div><div class='ctx'> 	u8 status_mode;</div><div class='ctx'> </div><div class='add'>+	struct au8522_led_config *led_cfg;</div><div class='add'>+</div><div class='ctx'> 	enum au8522_if_freq vsb_if;</div><div class='ctx'> 	enum au8522_if_freq qam_if;</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/media/dvb/frontends/cx22702.c b/drivers/media/dvb/frontends/cx22702.c<br/>index 9430e03dba6c..5d1abe34bddb 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/frontends/cx22702.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/dvb/frontends/cx22702.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/frontends/cx22702.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/cx22702.c</a></div><div class='hunk'>@@ -34,13 +34,12 @@</div><div class='ctx'> #include "dvb_frontend.h"</div><div class='ctx'> #include "cx22702.h"</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> struct cx22702_state {</div><div class='ctx'> </div><div class='del'>-	struct i2c_adapter* i2c;</div><div class='add'>+	struct i2c_adapter *i2c;</div><div class='ctx'> </div><div class='ctx'> 	/* configuration settings */</div><div class='del'>-	const struct cx22702_config* config;</div><div class='add'>+	const struct cx22702_config *config;</div><div class='ctx'> </div><div class='ctx'> 	struct dvb_frontend frontend;</div><div class='ctx'> </div><div class='hunk'>@@ -49,10 +48,13 @@ struct cx22702_state {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int debug;</div><div class='add'>+module_param(debug, int, 0644);</div><div class='add'>+MODULE_PARM_DESC(debug, "Enable verbose debug messages");</div><div class='add'>+</div><div class='ctx'> #define dprintk	if (debug) printk</div><div class='ctx'> </div><div class='ctx'> /* Register values to initialise the demod */</div><div class='del'>-static u8 init_tab [] = {</div><div class='add'>+static u8 init_tab[] = {</div><div class='ctx'> 	0x00, 0x00, /* Stop aquisition */</div><div class='ctx'> 	0x0B, 0x06,</div><div class='ctx'> 	0x09, 0x01,</div><div class='hunk'>@@ -80,65 +82,67 @@ static u8 init_tab [] = {</div><div class='ctx'> 	0xfd, 0x00,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int cx22702_writereg (struct cx22702_state* state, u8 reg, u8 data)</div><div class='add'>+static int cx22702_writereg(struct cx22702_state *state, u8 reg, u8 data)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	u8 buf [] = { reg, data };</div><div class='del'>-	struct i2c_msg msg = { .addr = state-&gt;config-&gt;demod_address, .flags = 0, .buf = buf, .len = 2 };</div><div class='add'>+	u8 buf[] = { reg, data };</div><div class='add'>+	struct i2c_msg msg = {</div><div class='add'>+		.addr = state-&gt;config-&gt;demod_address, .flags = 0,</div><div class='add'>+			.buf = buf, .len = 2 };</div><div class='ctx'> </div><div class='ctx'> 	ret = i2c_transfer(state-&gt;i2c, &amp;msg, 1);</div><div class='ctx'> </div><div class='ctx'> 	if (ret != 1)</div><div class='del'>-		printk("%s: writereg error (reg == 0x%02x, val == 0x%02x, ret == %i)\n",</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+			"%s: error (reg == 0x%02x, val == 0x%02x, ret == %i)\n",</div><div class='ctx'> 			__func__, reg, data, ret);</div><div class='ctx'> </div><div class='ctx'> 	return (ret != 1) ? -1 : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u8 cx22702_readreg (struct cx22702_state* state, u8 reg)</div><div class='add'>+static u8 cx22702_readreg(struct cx22702_state *state, u8 reg)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	u8 b0 [] = { reg };</div><div class='del'>-	u8 b1 [] = { 0 };</div><div class='add'>+	u8 b0[] = { reg };</div><div class='add'>+	u8 b1[] = { 0 };</div><div class='ctx'> </div><div class='del'>-	struct i2c_msg msg [] = {</div><div class='del'>-		{ .addr = state-&gt;config-&gt;demod_address, .flags = 0, .buf = b0, .len = 1 },</div><div class='del'>-		{ .addr = state-&gt;config-&gt;demod_address, .flags = I2C_M_RD, .buf = b1, .len = 1 } };</div><div class='add'>+	struct i2c_msg msg[] = {</div><div class='add'>+		{ .addr = state-&gt;config-&gt;demod_address, .flags = 0,</div><div class='add'>+			.buf = b0, .len = 1 },</div><div class='add'>+		{ .addr = state-&gt;config-&gt;demod_address, .flags = I2C_M_RD,</div><div class='add'>+			.buf = b1, .len = 1 } };</div><div class='ctx'> </div><div class='ctx'> 	ret = i2c_transfer(state-&gt;i2c, msg, 2);</div><div class='ctx'> </div><div class='ctx'> 	if (ret != 2)</div><div class='del'>-		printk("%s: readreg error (ret == %i)\n", __func__, ret);</div><div class='add'>+		printk(KERN_ERR "%s: readreg error (ret == %i)\n",</div><div class='add'>+			__func__, ret);</div><div class='ctx'> </div><div class='ctx'> 	return b1[0];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cx22702_set_inversion (struct cx22702_state *state, int inversion)</div><div class='add'>+static int cx22702_set_inversion(struct cx22702_state *state, int inversion)</div><div class='ctx'> {</div><div class='ctx'> 	u8 val;</div><div class='ctx'> </div><div class='ctx'> 	switch (inversion) {</div><div class='del'>-</div><div class='del'>-		case INVERSION_AUTO:</div><div class='del'>-			return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-		case INVERSION_ON:</div><div class='del'>-			val = cx22702_readreg (state, 0x0C);</div><div class='del'>-			return cx22702_writereg (state, 0x0C, val | 0x01);</div><div class='del'>-</div><div class='del'>-		case INVERSION_OFF:</div><div class='del'>-			val = cx22702_readreg (state, 0x0C);</div><div class='del'>-			return cx22702_writereg (state, 0x0C, val &amp; 0xfe);</div><div class='del'>-</div><div class='del'>-		default:</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='add'>+	case INVERSION_AUTO:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	case INVERSION_ON:</div><div class='add'>+		val = cx22702_readreg(state, 0x0C);</div><div class='add'>+		return cx22702_writereg(state, 0x0C, val | 0x01);</div><div class='add'>+	case INVERSION_OFF:</div><div class='add'>+		val = cx22702_readreg(state, 0x0C);</div><div class='add'>+		return cx22702_writereg(state, 0x0C, val &amp; 0xfe);</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Retrieve the demod settings */</div><div class='del'>-static int cx22702_get_tps (struct cx22702_state *state, struct dvb_ofdm_parameters *p)</div><div class='add'>+static int cx22702_get_tps(struct cx22702_state *state,</div><div class='add'>+	struct dvb_ofdm_parameters *p)</div><div class='ctx'> {</div><div class='ctx'> 	u8 val;</div><div class='ctx'> </div><div class='hunk'>@@ -146,180 +150,281 @@ static int cx22702_get_tps (struct cx22702_state *state, struct dvb_ofdm_paramet</div><div class='ctx'> 	if (!(cx22702_readreg(state, 0x0A) &amp; 0x20))</div><div class='ctx'> 		return -EAGAIN;</div><div class='ctx'> </div><div class='del'>-	val = cx22702_readreg (state, 0x01);</div><div class='del'>-	switch( (val&amp;0x18)&gt;&gt;3) {</div><div class='del'>-		case 0: p-&gt;constellation =   QPSK; break;</div><div class='del'>-		case 1: p-&gt;constellation = QAM_16; break;</div><div class='del'>-		case 2: p-&gt;constellation = QAM_64; break;</div><div class='add'>+	val = cx22702_readreg(state, 0x01);</div><div class='add'>+	switch ((val &amp; 0x18) &gt;&gt; 3) {</div><div class='add'>+	case 0:</div><div class='add'>+		p-&gt;constellation = QPSK;</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		p-&gt;constellation = QAM_16;</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		p-&gt;constellation = QAM_64;</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='del'>-	switch( val&amp;0x07 ) {</div><div class='del'>-		case 0: p-&gt;hierarchy_information = HIERARCHY_NONE; break;</div><div class='del'>-		case 1: p-&gt;hierarchy_information =    HIERARCHY_1; break;</div><div class='del'>-		case 2: p-&gt;hierarchy_information =    HIERARCHY_2; break;</div><div class='del'>-		case 3: p-&gt;hierarchy_information =    HIERARCHY_4; break;</div><div class='add'>+	switch (val &amp; 0x07) {</div><div class='add'>+	case 0:</div><div class='add'>+		p-&gt;hierarchy_information = HIERARCHY_NONE;</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		p-&gt;hierarchy_information = HIERARCHY_1;</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		p-&gt;hierarchy_information = HIERARCHY_2;</div><div class='add'>+		break;</div><div class='add'>+	case 3:</div><div class='add'>+		p-&gt;hierarchy_information = HIERARCHY_4;</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-	val = cx22702_readreg (state, 0x02);</div><div class='del'>-	switch( (val&amp;0x38)&gt;&gt;3 ) {</div><div class='del'>-		case 0: p-&gt;code_rate_HP = FEC_1_2; break;</div><div class='del'>-		case 1: p-&gt;code_rate_HP = FEC_2_3; break;</div><div class='del'>-		case 2: p-&gt;code_rate_HP = FEC_3_4; break;</div><div class='del'>-		case 3: p-&gt;code_rate_HP = FEC_5_6; break;</div><div class='del'>-		case 4: p-&gt;code_rate_HP = FEC_7_8; break;</div><div class='add'>+	val = cx22702_readreg(state, 0x02);</div><div class='add'>+	switch ((val &amp; 0x38) &gt;&gt; 3) {</div><div class='add'>+	case 0:</div><div class='add'>+		p-&gt;code_rate_HP = FEC_1_2;</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		p-&gt;code_rate_HP = FEC_2_3;</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		p-&gt;code_rate_HP = FEC_3_4;</div><div class='add'>+		break;</div><div class='add'>+	case 3:</div><div class='add'>+		p-&gt;code_rate_HP = FEC_5_6;</div><div class='add'>+		break;</div><div class='add'>+	case 4:</div><div class='add'>+		p-&gt;code_rate_HP = FEC_7_8;</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='del'>-	switch( val&amp;0x07 ) {</div><div class='del'>-		case 0: p-&gt;code_rate_LP = FEC_1_2; break;</div><div class='del'>-		case 1: p-&gt;code_rate_LP = FEC_2_3; break;</div><div class='del'>-		case 2: p-&gt;code_rate_LP = FEC_3_4; break;</div><div class='del'>-		case 3: p-&gt;code_rate_LP = FEC_5_6; break;</div><div class='del'>-		case 4: p-&gt;code_rate_LP = FEC_7_8; break;</div><div class='add'>+	switch (val &amp; 0x07) {</div><div class='add'>+	case 0:</div><div class='add'>+		p-&gt;code_rate_LP = FEC_1_2;</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		p-&gt;code_rate_LP = FEC_2_3;</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		p-&gt;code_rate_LP = FEC_3_4;</div><div class='add'>+		break;</div><div class='add'>+	case 3:</div><div class='add'>+		p-&gt;code_rate_LP = FEC_5_6;</div><div class='add'>+		break;</div><div class='add'>+	case 4:</div><div class='add'>+		p-&gt;code_rate_LP = FEC_7_8;</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-	val = cx22702_readreg (state, 0x03);</div><div class='del'>-	switch( (val&amp;0x0c)&gt;&gt;2 ) {</div><div class='del'>-		case 0: p-&gt;guard_interval = GUARD_INTERVAL_1_32; break;</div><div class='del'>-		case 1: p-&gt;guard_interval = GUARD_INTERVAL_1_16; break;</div><div class='del'>-		case 2: p-&gt;guard_interval =  GUARD_INTERVAL_1_8; break;</div><div class='del'>-		case 3: p-&gt;guard_interval =  GUARD_INTERVAL_1_4; break;</div><div class='add'>+	val = cx22702_readreg(state, 0x03);</div><div class='add'>+	switch ((val &amp; 0x0c) &gt;&gt; 2) {</div><div class='add'>+	case 0:</div><div class='add'>+		p-&gt;guard_interval = GUARD_INTERVAL_1_32;</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		p-&gt;guard_interval = GUARD_INTERVAL_1_16;</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		p-&gt;guard_interval = GUARD_INTERVAL_1_8;</div><div class='add'>+		break;</div><div class='add'>+	case 3:</div><div class='add'>+		p-&gt;guard_interval = GUARD_INTERVAL_1_4;</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='del'>-	switch( val&amp;0x03 ) {</div><div class='del'>-		case 0: p-&gt;transmission_mode = TRANSMISSION_MODE_2K; break;</div><div class='del'>-		case 1: p-&gt;transmission_mode = TRANSMISSION_MODE_8K; break;</div><div class='add'>+	switch (val &amp; 0x03) {</div><div class='add'>+	case 0:</div><div class='add'>+		p-&gt;transmission_mode = TRANSMISSION_MODE_2K;</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		p-&gt;transmission_mode = TRANSMISSION_MODE_8K;</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cx22702_i2c_gate_ctrl(struct dvb_frontend* fe, int enable)</div><div class='add'>+static int cx22702_i2c_gate_ctrl(struct dvb_frontend *fe, int enable)</div><div class='ctx'> {</div><div class='del'>-	struct cx22702_state* state = fe-&gt;demodulator_priv;</div><div class='del'>-	dprintk ("%s(%d)\n", __func__, enable);</div><div class='add'>+	struct cx22702_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	dprintk("%s(%d)\n", __func__, enable);</div><div class='ctx'> 	if (enable)</div><div class='del'>-		return cx22702_writereg (state, 0x0D, cx22702_readreg(state, 0x0D) &amp; 0xfe);</div><div class='add'>+		return cx22702_writereg(state, 0x0D,</div><div class='add'>+			cx22702_readreg(state, 0x0D) &amp; 0xfe);</div><div class='ctx'> 	else</div><div class='del'>-		return cx22702_writereg (state, 0x0D, cx22702_readreg(state, 0x0D) | 1);</div><div class='add'>+		return cx22702_writereg(state, 0x0D,</div><div class='add'>+			cx22702_readreg(state, 0x0D) | 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Talk to the demod, set the FEC, GUARD, QAM settings etc */</div><div class='del'>-static int cx22702_set_tps (struct dvb_frontend* fe, struct dvb_frontend_parameters *p)</div><div class='add'>+static int cx22702_set_tps(struct dvb_frontend *fe,</div><div class='add'>+	struct dvb_frontend_parameters *p)</div><div class='ctx'> {</div><div class='ctx'> 	u8 val;</div><div class='del'>-	struct cx22702_state* state = fe-&gt;demodulator_priv;</div><div class='add'>+	struct cx22702_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> </div><div class='ctx'> 	if (fe-&gt;ops.tuner_ops.set_params) {</div><div class='ctx'> 		fe-&gt;ops.tuner_ops.set_params(fe, p);</div><div class='del'>-		if (fe-&gt;ops.i2c_gate_ctrl) fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='add'>+		if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+			fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* set inversion */</div><div class='del'>-	cx22702_set_inversion (state, p-&gt;inversion);</div><div class='add'>+	cx22702_set_inversion(state, p-&gt;inversion);</div><div class='ctx'> </div><div class='ctx'> 	/* set bandwidth */</div><div class='del'>-	switch(p-&gt;u.ofdm.bandwidth) {</div><div class='add'>+	switch (p-&gt;u.ofdm.bandwidth) {</div><div class='ctx'> 	case BANDWIDTH_6_MHZ:</div><div class='del'>-		cx22702_writereg(state, 0x0C, (cx22702_readreg(state, 0x0C) &amp; 0xcf) | 0x20 );</div><div class='add'>+		cx22702_writereg(state, 0x0C,</div><div class='add'>+			(cx22702_readreg(state, 0x0C) &amp; 0xcf) | 0x20);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case BANDWIDTH_7_MHZ:</div><div class='del'>-		cx22702_writereg(state, 0x0C, (cx22702_readreg(state, 0x0C) &amp; 0xcf) | 0x10 );</div><div class='add'>+		cx22702_writereg(state, 0x0C,</div><div class='add'>+			(cx22702_readreg(state, 0x0C) &amp; 0xcf) | 0x10);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case BANDWIDTH_8_MHZ:</div><div class='del'>-		cx22702_writereg(state, 0x0C, cx22702_readreg(state, 0x0C) &amp;0xcf );</div><div class='add'>+		cx22702_writereg(state, 0x0C,</div><div class='add'>+			cx22702_readreg(state, 0x0C) &amp; 0xcf);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		dprintk ("%s: invalid bandwidth\n",__func__);</div><div class='add'>+		dprintk("%s: invalid bandwidth\n", __func__);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-	p-&gt;u.ofdm.code_rate_LP = FEC_AUTO; //temp hack as manual not working</div><div class='add'>+	p-&gt;u.ofdm.code_rate_LP = FEC_AUTO; /* temp hack as manual not working */</div><div class='ctx'> </div><div class='ctx'> 	/* use auto configuration? */</div><div class='del'>-	if((p-&gt;u.ofdm.hierarchy_information==HIERARCHY_AUTO) ||</div><div class='del'>-	   (p-&gt;u.ofdm.constellation==QAM_AUTO) ||</div><div class='del'>-	   (p-&gt;u.ofdm.code_rate_HP==FEC_AUTO) ||</div><div class='del'>-	   (p-&gt;u.ofdm.code_rate_LP==FEC_AUTO) ||</div><div class='del'>-	   (p-&gt;u.ofdm.guard_interval==GUARD_INTERVAL_AUTO) ||</div><div class='del'>-	   (p-&gt;u.ofdm.transmission_mode==TRANSMISSION_MODE_AUTO) ) {</div><div class='add'>+	if ((p-&gt;u.ofdm.hierarchy_information == HIERARCHY_AUTO) ||</div><div class='add'>+	   (p-&gt;u.ofdm.constellation == QAM_AUTO) ||</div><div class='add'>+	   (p-&gt;u.ofdm.code_rate_HP == FEC_AUTO) ||</div><div class='add'>+	   (p-&gt;u.ofdm.code_rate_LP == FEC_AUTO) ||</div><div class='add'>+	   (p-&gt;u.ofdm.guard_interval == GUARD_INTERVAL_AUTO) ||</div><div class='add'>+	   (p-&gt;u.ofdm.transmission_mode == TRANSMISSION_MODE_AUTO)) {</div><div class='ctx'> </div><div class='ctx'> 		/* TPS Source - use hardware driven values */</div><div class='ctx'> 		cx22702_writereg(state, 0x06, 0x10);</div><div class='ctx'> 		cx22702_writereg(state, 0x07, 0x9);</div><div class='ctx'> 		cx22702_writereg(state, 0x08, 0xC1);</div><div class='del'>-		cx22702_writereg(state, 0x0B, cx22702_readreg(state, 0x0B) &amp; 0xfc );</div><div class='del'>-		cx22702_writereg(state, 0x0C, (cx22702_readreg(state, 0x0C) &amp; 0xBF) | 0x40 );</div><div class='add'>+		cx22702_writereg(state, 0x0B, cx22702_readreg(state, 0x0B)</div><div class='add'>+			&amp; 0xfc);</div><div class='add'>+		cx22702_writereg(state, 0x0C,</div><div class='add'>+			(cx22702_readreg(state, 0x0C) &amp; 0xBF) | 0x40);</div><div class='ctx'> 		cx22702_writereg(state, 0x00, 0x01); /* Begin aquisition */</div><div class='del'>-		dprintk("%s: Autodetecting\n",__func__);</div><div class='add'>+		dprintk("%s: Autodetecting\n", __func__);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* manually programmed values */</div><div class='del'>-	val=0;</div><div class='del'>-	switch(p-&gt;u.ofdm.constellation) {</div><div class='del'>-		case   QPSK: val = (val&amp;0xe7); break;</div><div class='del'>-		case QAM_16: val = (val&amp;0xe7)|0x08; break;</div><div class='del'>-		case QAM_64: val = (val&amp;0xe7)|0x10; break;</div><div class='del'>-		default:</div><div class='del'>-			dprintk ("%s: invalid constellation\n",__func__);</div><div class='del'>-			return -EINVAL;</div><div class='add'>+	val = 0;</div><div class='add'>+	switch (p-&gt;u.ofdm.constellation) {</div><div class='add'>+	case QPSK:</div><div class='add'>+		val = (val &amp; 0xe7);</div><div class='add'>+		break;</div><div class='add'>+	case QAM_16:</div><div class='add'>+		val = (val &amp; 0xe7) | 0x08;</div><div class='add'>+		break;</div><div class='add'>+	case QAM_64:</div><div class='add'>+		val = (val &amp; 0xe7) | 0x10;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dprintk("%s: invalid constellation\n", __func__);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	switch(p-&gt;u.ofdm.hierarchy_information) {</div><div class='del'>-		case HIERARCHY_NONE: val = (val&amp;0xf8); break;</div><div class='del'>-		case    HIERARCHY_1: val = (val&amp;0xf8)|1; break;</div><div class='del'>-		case    HIERARCHY_2: val = (val&amp;0xf8)|2; break;</div><div class='del'>-		case    HIERARCHY_4: val = (val&amp;0xf8)|3; break;</div><div class='del'>-		default:</div><div class='del'>-			dprintk ("%s: invalid hierarchy\n",__func__);</div><div class='del'>-			return -EINVAL;</div><div class='add'>+	switch (p-&gt;u.ofdm.hierarchy_information) {</div><div class='add'>+	case HIERARCHY_NONE:</div><div class='add'>+		val = (val &amp; 0xf8);</div><div class='add'>+		break;</div><div class='add'>+	case HIERARCHY_1:</div><div class='add'>+		val = (val &amp; 0xf8) | 1;</div><div class='add'>+		break;</div><div class='add'>+	case HIERARCHY_2:</div><div class='add'>+		val = (val &amp; 0xf8) | 2;</div><div class='add'>+		break;</div><div class='add'>+	case HIERARCHY_4:</div><div class='add'>+		val = (val &amp; 0xf8) | 3;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dprintk("%s: invalid hierarchy\n", __func__);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	cx22702_writereg (state, 0x06, val);</div><div class='del'>-</div><div class='del'>-	val=0;</div><div class='del'>-	switch(p-&gt;u.ofdm.code_rate_HP) {</div><div class='del'>-		case FEC_NONE:</div><div class='del'>-		case FEC_1_2: val = (val&amp;0xc7); break;</div><div class='del'>-		case FEC_2_3: val = (val&amp;0xc7)|0x08; break;</div><div class='del'>-		case FEC_3_4: val = (val&amp;0xc7)|0x10; break;</div><div class='del'>-		case FEC_5_6: val = (val&amp;0xc7)|0x18; break;</div><div class='del'>-		case FEC_7_8: val = (val&amp;0xc7)|0x20; break;</div><div class='del'>-		default:</div><div class='del'>-			dprintk ("%s: invalid code_rate_HP\n",__func__);</div><div class='del'>-			return -EINVAL;</div><div class='add'>+	cx22702_writereg(state, 0x06, val);</div><div class='add'>+</div><div class='add'>+	val = 0;</div><div class='add'>+	switch (p-&gt;u.ofdm.code_rate_HP) {</div><div class='add'>+	case FEC_NONE:</div><div class='add'>+	case FEC_1_2:</div><div class='add'>+		val = (val &amp; 0xc7);</div><div class='add'>+		break;</div><div class='add'>+	case FEC_2_3:</div><div class='add'>+		val = (val &amp; 0xc7) | 0x08;</div><div class='add'>+		break;</div><div class='add'>+	case FEC_3_4:</div><div class='add'>+		val = (val &amp; 0xc7) | 0x10;</div><div class='add'>+		break;</div><div class='add'>+	case FEC_5_6:</div><div class='add'>+		val = (val &amp; 0xc7) | 0x18;</div><div class='add'>+		break;</div><div class='add'>+	case FEC_7_8:</div><div class='add'>+		val = (val &amp; 0xc7) | 0x20;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dprintk("%s: invalid code_rate_HP\n", __func__);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	switch(p-&gt;u.ofdm.code_rate_LP) {</div><div class='del'>-		case FEC_NONE:</div><div class='del'>-		case FEC_1_2: val = (val&amp;0xf8); break;</div><div class='del'>-		case FEC_2_3: val = (val&amp;0xf8)|1; break;</div><div class='del'>-		case FEC_3_4: val = (val&amp;0xf8)|2; break;</div><div class='del'>-		case FEC_5_6: val = (val&amp;0xf8)|3; break;</div><div class='del'>-		case FEC_7_8: val = (val&amp;0xf8)|4; break;</div><div class='del'>-		default:</div><div class='del'>-			dprintk ("%s: invalid code_rate_LP\n",__func__);</div><div class='del'>-			return -EINVAL;</div><div class='add'>+	switch (p-&gt;u.ofdm.code_rate_LP) {</div><div class='add'>+	case FEC_NONE:</div><div class='add'>+	case FEC_1_2:</div><div class='add'>+		val = (val &amp; 0xf8);</div><div class='add'>+		break;</div><div class='add'>+	case FEC_2_3:</div><div class='add'>+		val = (val &amp; 0xf8) | 1;</div><div class='add'>+		break;</div><div class='add'>+	case FEC_3_4:</div><div class='add'>+		val = (val &amp; 0xf8) | 2;</div><div class='add'>+		break;</div><div class='add'>+	case FEC_5_6:</div><div class='add'>+		val = (val &amp; 0xf8) | 3;</div><div class='add'>+		break;</div><div class='add'>+	case FEC_7_8:</div><div class='add'>+		val = (val &amp; 0xf8) | 4;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dprintk("%s: invalid code_rate_LP\n", __func__);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	cx22702_writereg (state, 0x07, val);</div><div class='del'>-</div><div class='del'>-	val=0;</div><div class='del'>-	switch(p-&gt;u.ofdm.guard_interval) {</div><div class='del'>-		case GUARD_INTERVAL_1_32: val = (val&amp;0xf3); break;</div><div class='del'>-		case GUARD_INTERVAL_1_16: val = (val&amp;0xf3)|0x04; break;</div><div class='del'>-		case  GUARD_INTERVAL_1_8: val = (val&amp;0xf3)|0x08; break;</div><div class='del'>-		case  GUARD_INTERVAL_1_4: val = (val&amp;0xf3)|0x0c; break;</div><div class='del'>-		default:</div><div class='del'>-			dprintk ("%s: invalid guard_interval\n",__func__);</div><div class='del'>-			return -EINVAL;</div><div class='add'>+	cx22702_writereg(state, 0x07, val);</div><div class='add'>+</div><div class='add'>+	val = 0;</div><div class='add'>+	switch (p-&gt;u.ofdm.guard_interval) {</div><div class='add'>+	case GUARD_INTERVAL_1_32:</div><div class='add'>+		val = (val &amp; 0xf3);</div><div class='add'>+		break;</div><div class='add'>+	case GUARD_INTERVAL_1_16:</div><div class='add'>+		val = (val &amp; 0xf3) | 0x04;</div><div class='add'>+		break;</div><div class='add'>+	case GUARD_INTERVAL_1_8:</div><div class='add'>+		val = (val &amp; 0xf3) | 0x08;</div><div class='add'>+		break;</div><div class='add'>+	case GUARD_INTERVAL_1_4:</div><div class='add'>+		val = (val &amp; 0xf3) | 0x0c;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dprintk("%s: invalid guard_interval\n", __func__);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	switch(p-&gt;u.ofdm.transmission_mode) {</div><div class='del'>-		case TRANSMISSION_MODE_2K: val = (val&amp;0xfc); break;</div><div class='del'>-		case TRANSMISSION_MODE_8K: val = (val&amp;0xfc)|1; break;</div><div class='del'>-		default:</div><div class='del'>-			dprintk ("%s: invalid transmission_mode\n",__func__);</div><div class='del'>-			return -EINVAL;</div><div class='add'>+	switch (p-&gt;u.ofdm.transmission_mode) {</div><div class='add'>+	case TRANSMISSION_MODE_2K:</div><div class='add'>+		val = (val &amp; 0xfc);</div><div class='add'>+		break;</div><div class='add'>+	case TRANSMISSION_MODE_8K:</div><div class='add'>+		val = (val &amp; 0xfc) | 1;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dprintk("%s: invalid transmission_mode\n", __func__);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	cx22702_writereg(state, 0x08, val);</div><div class='del'>-	cx22702_writereg(state, 0x0B, (cx22702_readreg(state, 0x0B) &amp; 0xfc) | 0x02 );</div><div class='del'>-	cx22702_writereg(state, 0x0C, (cx22702_readreg(state, 0x0C) &amp; 0xBF) | 0x40 );</div><div class='add'>+	cx22702_writereg(state, 0x0B,</div><div class='add'>+		(cx22702_readreg(state, 0x0B) &amp; 0xfc) | 0x02);</div><div class='add'>+	cx22702_writereg(state, 0x0C,</div><div class='add'>+		(cx22702_readreg(state, 0x0C) &amp; 0xBF) | 0x40);</div><div class='ctx'> </div><div class='ctx'> 	/* Begin channel aquisition */</div><div class='ctx'> 	cx22702_writereg(state, 0x00, 0x01);</div><div class='hunk'>@@ -329,109 +434,111 @@ static int cx22702_set_tps (struct dvb_frontend* fe, struct dvb_frontend_paramet</div><div class='ctx'> </div><div class='ctx'> /* Reset the demod hardware and reset all of the configuration registers</div><div class='ctx'>    to a default state. */</div><div class='del'>-static int cx22702_init (struct dvb_frontend* fe)</div><div class='add'>+static int cx22702_init(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='del'>-	struct cx22702_state* state = fe-&gt;demodulator_priv;</div><div class='add'>+	struct cx22702_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> </div><div class='del'>-	cx22702_writereg (state, 0x00, 0x02);</div><div class='add'>+	cx22702_writereg(state, 0x00, 0x02);</div><div class='ctx'> </div><div class='ctx'> 	msleep(10);</div><div class='ctx'> </div><div class='del'>-	for (i=0; i&lt;sizeof(init_tab); i+=2)</div><div class='del'>-		cx22702_writereg (state, init_tab[i], init_tab[i+1]);</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(init_tab); i += 2)</div><div class='add'>+		cx22702_writereg(state, init_tab[i], init_tab[i + 1]);</div><div class='ctx'> </div><div class='del'>-	cx22702_writereg (state, 0xf8, (state-&gt;config-&gt;output_mode &lt;&lt; 1) &amp; 0x02);</div><div class='add'>+	cx22702_writereg(state, 0xf8, (state-&gt;config-&gt;output_mode &lt;&lt; 1)</div><div class='add'>+		&amp; 0x02);</div><div class='ctx'> </div><div class='ctx'> 	cx22702_i2c_gate_ctrl(fe, 0);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cx22702_read_status(struct dvb_frontend* fe, fe_status_t* status)</div><div class='add'>+static int cx22702_read_status(struct dvb_frontend *fe, fe_status_t *status)</div><div class='ctx'> {</div><div class='del'>-	struct cx22702_state* state = fe-&gt;demodulator_priv;</div><div class='add'>+	struct cx22702_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	u8 reg0A;</div><div class='ctx'> 	u8 reg23;</div><div class='ctx'> </div><div class='ctx'> 	*status = 0;</div><div class='ctx'> </div><div class='del'>-	reg0A = cx22702_readreg (state, 0x0A);</div><div class='del'>-	reg23 = cx22702_readreg (state, 0x23);</div><div class='add'>+	reg0A = cx22702_readreg(state, 0x0A);</div><div class='add'>+	reg23 = cx22702_readreg(state, 0x23);</div><div class='ctx'> </div><div class='del'>-	dprintk ("%s: status demod=0x%02x agc=0x%02x\n"</div><div class='del'>-		,__func__,reg0A,reg23);</div><div class='add'>+	dprintk("%s: status demod=0x%02x agc=0x%02x\n"</div><div class='add'>+		, __func__, reg0A, reg23);</div><div class='ctx'> </div><div class='del'>-	if(reg0A &amp; 0x10) {</div><div class='add'>+	if (reg0A &amp; 0x10) {</div><div class='ctx'> 		*status |= FE_HAS_LOCK;</div><div class='ctx'> 		*status |= FE_HAS_VITERBI;</div><div class='ctx'> 		*status |= FE_HAS_SYNC;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if(reg0A &amp; 0x20)</div><div class='add'>+	if (reg0A &amp; 0x20)</div><div class='ctx'> 		*status |= FE_HAS_CARRIER;</div><div class='ctx'> </div><div class='del'>-	if(reg23 &lt; 0xf0)</div><div class='add'>+	if (reg23 &lt; 0xf0)</div><div class='ctx'> 		*status |= FE_HAS_SIGNAL;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cx22702_read_ber(struct dvb_frontend* fe, u32* ber)</div><div class='add'>+static int cx22702_read_ber(struct dvb_frontend *fe, u32 *ber)</div><div class='ctx'> {</div><div class='del'>-	struct cx22702_state* state = fe-&gt;demodulator_priv;</div><div class='add'>+	struct cx22702_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> </div><div class='del'>-	if(cx22702_readreg (state, 0xE4) &amp; 0x02) {</div><div class='add'>+	if (cx22702_readreg(state, 0xE4) &amp; 0x02) {</div><div class='ctx'> 		/* Realtime statistics */</div><div class='del'>-		*ber = (cx22702_readreg (state, 0xDE) &amp; 0x7F) &lt;&lt; 7</div><div class='del'>-			| (cx22702_readreg (state, 0xDF)&amp;0x7F);</div><div class='add'>+		*ber = (cx22702_readreg(state, 0xDE) &amp; 0x7F) &lt;&lt; 7</div><div class='add'>+			| (cx22702_readreg(state, 0xDF) &amp; 0x7F);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* Averagtine statistics */</div><div class='del'>-		*ber = (cx22702_readreg (state, 0xDE) &amp; 0x7F) &lt;&lt; 7</div><div class='del'>-			| cx22702_readreg (state, 0xDF);</div><div class='add'>+		*ber = (cx22702_readreg(state, 0xDE) &amp; 0x7F) &lt;&lt; 7</div><div class='add'>+			| cx22702_readreg(state, 0xDF);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cx22702_read_signal_strength(struct dvb_frontend* fe, u16* signal_strength)</div><div class='add'>+static int cx22702_read_signal_strength(struct dvb_frontend *fe,</div><div class='add'>+	u16 *signal_strength)</div><div class='ctx'> {</div><div class='del'>-	struct cx22702_state* state = fe-&gt;demodulator_priv;</div><div class='add'>+	struct cx22702_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> </div><div class='ctx'> 	u16 rs_ber = 0;</div><div class='del'>-	rs_ber = cx22702_readreg (state, 0x23);</div><div class='add'>+	rs_ber = cx22702_readreg(state, 0x23);</div><div class='ctx'> 	*signal_strength = (rs_ber &lt;&lt; 8) | rs_ber;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cx22702_read_snr(struct dvb_frontend* fe, u16* snr)</div><div class='add'>+static int cx22702_read_snr(struct dvb_frontend *fe, u16 *snr)</div><div class='ctx'> {</div><div class='del'>-	struct cx22702_state* state = fe-&gt;demodulator_priv;</div><div class='add'>+	struct cx22702_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> </div><div class='del'>-	u16 rs_ber=0;</div><div class='del'>-	if(cx22702_readreg (state, 0xE4) &amp; 0x02) {</div><div class='add'>+	u16 rs_ber = 0;</div><div class='add'>+	if (cx22702_readreg(state, 0xE4) &amp; 0x02) {</div><div class='ctx'> 		/* Realtime statistics */</div><div class='del'>-		rs_ber = (cx22702_readreg (state, 0xDE) &amp; 0x7F) &lt;&lt; 7</div><div class='del'>-			| (cx22702_readreg (state, 0xDF)&amp; 0x7F);</div><div class='add'>+		rs_ber = (cx22702_readreg(state, 0xDE) &amp; 0x7F) &lt;&lt; 7</div><div class='add'>+			| (cx22702_readreg(state, 0xDF) &amp; 0x7F);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* Averagine statistics */</div><div class='del'>-		rs_ber = (cx22702_readreg (state, 0xDE) &amp; 0x7F) &lt;&lt; 8</div><div class='del'>-			| cx22702_readreg (state, 0xDF);</div><div class='add'>+		rs_ber = (cx22702_readreg(state, 0xDE) &amp; 0x7F) &lt;&lt; 8</div><div class='add'>+			| cx22702_readreg(state, 0xDF);</div><div class='ctx'> 	}</div><div class='ctx'> 	*snr = ~rs_ber;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cx22702_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)</div><div class='add'>+static int cx22702_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks)</div><div class='ctx'> {</div><div class='del'>-	struct cx22702_state* state = fe-&gt;demodulator_priv;</div><div class='add'>+	struct cx22702_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> </div><div class='ctx'> 	u8 _ucblocks;</div><div class='ctx'> </div><div class='ctx'> 	/* RS Uncorrectable Packet Count then reset */</div><div class='del'>-	_ucblocks = cx22702_readreg (state, 0xE3);</div><div class='add'>+	_ucblocks = cx22702_readreg(state, 0xE3);</div><div class='ctx'> 	if (state-&gt;prevUCBlocks &lt; _ucblocks)</div><div class='ctx'> 		*ucblocks = (_ucblocks - state-&gt;prevUCBlocks);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -441,34 +548,36 @@ static int cx22702_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cx22702_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *p)</div><div class='add'>+static int cx22702_get_frontend(struct dvb_frontend *fe,</div><div class='add'>+	struct dvb_frontend_parameters *p)</div><div class='ctx'> {</div><div class='del'>-	struct cx22702_state* state = fe-&gt;demodulator_priv;</div><div class='add'>+	struct cx22702_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> </div><div class='del'>-	u8 reg0C = cx22702_readreg (state, 0x0C);</div><div class='add'>+	u8 reg0C = cx22702_readreg(state, 0x0C);</div><div class='ctx'> </div><div class='ctx'> 	p-&gt;inversion = reg0C &amp; 0x1 ? INVERSION_ON : INVERSION_OFF;</div><div class='del'>-	return cx22702_get_tps (state, &amp;p-&gt;u.ofdm);</div><div class='add'>+	return cx22702_get_tps(state, &amp;p-&gt;u.ofdm);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cx22702_get_tune_settings(struct dvb_frontend* fe, struct dvb_frontend_tune_settings *tune)</div><div class='add'>+static int cx22702_get_tune_settings(struct dvb_frontend *fe,</div><div class='add'>+	struct dvb_frontend_tune_settings *tune)</div><div class='ctx'> {</div><div class='ctx'> 	tune-&gt;min_delay_ms = 1000;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void cx22702_release(struct dvb_frontend* fe)</div><div class='add'>+static void cx22702_release(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='del'>-	struct cx22702_state* state = fe-&gt;demodulator_priv;</div><div class='add'>+	struct cx22702_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	kfree(state);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops cx22702_ops;</div><div class='ctx'> </div><div class='del'>-struct dvb_frontend* cx22702_attach(const struct cx22702_config* config,</div><div class='del'>-				    struct i2c_adapter* i2c)</div><div class='add'>+struct dvb_frontend *cx22702_attach(const struct cx22702_config *config,</div><div class='add'>+	struct i2c_adapter *i2c)</div><div class='ctx'> {</div><div class='del'>-	struct cx22702_state* state = NULL;</div><div class='add'>+	struct cx22702_state *state = NULL;</div><div class='ctx'> </div><div class='ctx'> 	/* allocate memory for the internal state */</div><div class='ctx'> 	state = kmalloc(sizeof(struct cx22702_state), GFP_KERNEL);</div><div class='hunk'>@@ -485,7 +594,8 @@ struct dvb_frontend* cx22702_attach(const struct cx22702_config* config,</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='ctx'> 	/* create dvb_frontend */</div><div class='del'>-	memcpy(&amp;state-&gt;frontend.ops, &amp;cx22702_ops, sizeof(struct dvb_frontend_ops));</div><div class='add'>+	memcpy(&amp;state-&gt;frontend.ops, &amp;cx22702_ops,</div><div class='add'>+		sizeof(struct dvb_frontend_ops));</div><div class='ctx'> 	state-&gt;frontend.demodulator_priv = state;</div><div class='ctx'> 	return &amp;state-&gt;frontend;</div><div class='ctx'> </div><div class='hunk'>@@ -493,6 +603,7 @@ error:</div><div class='ctx'> 	kfree(state);</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(cx22702_attach);</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops cx22702_ops = {</div><div class='ctx'> </div><div class='hunk'>@@ -525,11 +636,6 @@ static struct dvb_frontend_ops cx22702_ops = {</div><div class='ctx'> 	.read_ucblocks = cx22702_read_ucblocks,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-module_param(debug, int, 0644);</div><div class='del'>-MODULE_PARM_DESC(debug, "Enable verbose debug messages");</div><div class='del'>-</div><div class='ctx'> MODULE_DESCRIPTION("Conexant CX22702 DVB-T Demodulator driver");</div><div class='ctx'> MODULE_AUTHOR("Steven Toth");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(cx22702_attach);</div><div class='head'>diff --git a/drivers/media/dvb/frontends/cx22702.h b/drivers/media/dvb/frontends/cx22702.h<br/>index b1e465c6c2ce..f154e1f428eb 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/frontends/cx22702.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/dvb/frontends/cx22702.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/frontends/cx22702.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/cx22702.h</a></div><div class='hunk'>@@ -30,8 +30,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/dvb/frontend.h&gt;</div><div class='ctx'> </div><div class='del'>-struct cx22702_config</div><div class='del'>-{</div><div class='add'>+struct cx22702_config {</div><div class='ctx'> 	/* the demodulator's i2c address */</div><div class='ctx'> 	u8 demod_address;</div><div class='ctx'> </div><div class='hunk'>@@ -41,16 +40,19 @@ struct cx22702_config</div><div class='ctx'> 	u8 output_mode;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_DVB_CX22702) || (defined(CONFIG_DVB_CX22702_MODULE) &amp;&amp; defined(MODULE))</div><div class='del'>-extern struct dvb_frontend* cx22702_attach(const struct cx22702_config* config,</div><div class='del'>-					   struct i2c_adapter* i2c);</div><div class='add'>+#if defined(CONFIG_DVB_CX22702) || (defined(CONFIG_DVB_CX22702_MODULE) \</div><div class='add'>+	&amp;&amp; defined(MODULE))</div><div class='add'>+extern struct dvb_frontend *cx22702_attach(</div><div class='add'>+	const struct cx22702_config *config,</div><div class='add'>+	struct i2c_adapter *i2c);</div><div class='ctx'> #else</div><div class='del'>-static inline struct dvb_frontend* cx22702_attach(const struct cx22702_config* config,</div><div class='del'>-					   struct i2c_adapter* i2c)</div><div class='add'>+static inline struct dvb_frontend *cx22702_attach(</div><div class='add'>+	const struct cx22702_config *config,</div><div class='add'>+	struct i2c_adapter *i2c)</div><div class='ctx'> {</div><div class='ctx'> 	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='del'>-#endif // CONFIG_DVB_CX22702</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='del'>-#endif // CX22702_H</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/media/dvb/frontends/cx24110.h b/drivers/media/dvb/frontends/cx24110.h<br/>index 1792adb23c4d..fdcceee91f3a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/frontends/cx24110.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/dvb/frontends/cx24110.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/frontends/cx24110.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/cx24110.h</a></div><div class='hunk'>@@ -33,12 +33,17 @@ struct cx24110_config</div><div class='ctx'> 	u8 demod_address;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static inline int cx24110_pll_write(struct dvb_frontend *fe, u32 val) {</div><div class='del'>-	int r = 0;</div><div class='del'>-	u8 buf[] = {(u8) (val&gt;&gt;24), (u8) (val&gt;&gt;16), (u8) (val&gt;&gt;8)};</div><div class='add'>+static inline int cx24110_pll_write(struct dvb_frontend *fe, u32 val)</div><div class='add'>+{</div><div class='add'>+	u8 buf[] = {</div><div class='add'>+		(u8)((val &gt;&gt; 24) &amp; 0xff),</div><div class='add'>+		(u8)((val &gt;&gt; 16) &amp; 0xff),</div><div class='add'>+		(u8)((val &gt;&gt; 8) &amp; 0xff)</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	if (fe-&gt;ops.write)</div><div class='del'>-		r = fe-&gt;ops.write(fe, buf, 3);</div><div class='del'>-	return r;</div><div class='add'>+		return fe-&gt;ops.write(fe, buf, 3);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_DVB_CX24110) || (defined(CONFIG_DVB_CX24110_MODULE) &amp;&amp; defined(MODULE))</div><div class='head'>diff --git a/drivers/media/dvb/frontends/cx24116.c b/drivers/media/dvb/frontends/cx24116.c<br/>new file mode 100644<br/>index 000000000000..b144b308a4dd<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/frontends/cx24116.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/cx24116.c</a></div><div class='hunk'>@@ -0,0 +1,1470 @@</div><div class='add'>+/*</div><div class='add'>+    Conexant cx24116/cx24118 - DVBS/S2 Satellite demod/tuner driver</div><div class='add'>+</div><div class='add'>+    Copyright (C) 2006-2008 Steven Toth &lt;stoth@hauppauge.com&gt;</div><div class='add'>+    Copyright (C) 2006-2007 Georg Acher</div><div class='add'>+    Copyright (C) 2007-2008 Darron Broad</div><div class='add'>+	March 2007</div><div class='add'>+	    Fixed some bugs.</div><div class='add'>+	    Added diseqc support.</div><div class='add'>+	    Added corrected signal strength support.</div><div class='add'>+	August 2007</div><div class='add'>+	    Sync with legacy version.</div><div class='add'>+	    Some clean ups.</div><div class='add'>+    Copyright (C) 2008 Igor Liplianin</div><div class='add'>+	September, 9th 2008</div><div class='add'>+	    Fixed locking on high symbol rates (&gt;30000).</div><div class='add'>+	    Implement MPEG initialization parameter.</div><div class='add'>+</div><div class='add'>+    This program is free software; you can redistribute it and/or modify</div><div class='add'>+    it under the terms of the GNU General Public License as published by</div><div class='add'>+    the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+    (at your option) any later version.</div><div class='add'>+</div><div class='add'>+    This program is distributed in the hope that it will be useful,</div><div class='add'>+    but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+    GNU General Public License for more details.</div><div class='add'>+</div><div class='add'>+    You should have received a copy of the GNU General Public License</div><div class='add'>+    along with this program; if not, write to the Free Software</div><div class='add'>+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/firmware.h&gt;</div><div class='add'>+</div><div class='add'>+#include "dvb_frontend.h"</div><div class='add'>+#include "cx24116.h"</div><div class='add'>+</div><div class='add'>+static int debug;</div><div class='add'>+module_param(debug, int, 0644);</div><div class='add'>+MODULE_PARM_DESC(debug, "Activates frontend debugging (default:0)");</div><div class='add'>+</div><div class='add'>+#define dprintk(args...) \</div><div class='add'>+	do { \</div><div class='add'>+		if (debug) \</div><div class='add'>+			printk(KERN_INFO "cx24116: " args); \</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+#define CX24116_DEFAULT_FIRMWARE "dvb-fe-cx24116.fw"</div><div class='add'>+#define CX24116_SEARCH_RANGE_KHZ 5000</div><div class='add'>+</div><div class='add'>+/* known registers */</div><div class='add'>+#define CX24116_REG_COMMAND (0x00)      /* command args 0x00..0x1e */</div><div class='add'>+#define CX24116_REG_EXECUTE (0x1f)      /* execute command */</div><div class='add'>+#define CX24116_REG_MAILBOX (0x96)      /* FW or multipurpose mailbox? */</div><div class='add'>+#define CX24116_REG_RESET   (0x20)      /* reset status &gt; 0     */</div><div class='add'>+#define CX24116_REG_SIGNAL  (0x9e)      /* signal low           */</div><div class='add'>+#define CX24116_REG_SSTATUS (0x9d)      /* signal high / status */</div><div class='add'>+#define CX24116_REG_QUALITY8 (0xa3)</div><div class='add'>+#define CX24116_REG_QSTATUS (0xbc)</div><div class='add'>+#define CX24116_REG_QUALITY0 (0xd5)</div><div class='add'>+#define CX24116_REG_BER0    (0xc9)</div><div class='add'>+#define CX24116_REG_BER8    (0xc8)</div><div class='add'>+#define CX24116_REG_BER16   (0xc7)</div><div class='add'>+#define CX24116_REG_BER24   (0xc6)</div><div class='add'>+#define CX24116_REG_UCB0    (0xcb)</div><div class='add'>+#define CX24116_REG_UCB8    (0xca)</div><div class='add'>+#define CX24116_REG_CLKDIV  (0xf3)</div><div class='add'>+#define CX24116_REG_RATEDIV (0xf9)</div><div class='add'>+</div><div class='add'>+/* configured fec (not tuned) or actual FEC (tuned) 1=1/2 2=2/3 etc */</div><div class='add'>+#define CX24116_REG_FECSTATUS (0x9c)</div><div class='add'>+</div><div class='add'>+/* FECSTATUS bits */</div><div class='add'>+/* mask to determine configured fec (not tuned) or actual fec (tuned) */</div><div class='add'>+#define CX24116_FEC_FECMASK   (0x1f)</div><div class='add'>+</div><div class='add'>+/* Select DVB-S demodulator, else DVB-S2 */</div><div class='add'>+#define CX24116_FEC_DVBS      (0x20)</div><div class='add'>+#define CX24116_FEC_UNKNOWN   (0x40)    /* Unknown/unused */</div><div class='add'>+</div><div class='add'>+/* Pilot mode requested when tuning else always reset when tuned */</div><div class='add'>+#define CX24116_FEC_PILOT     (0x80)</div><div class='add'>+</div><div class='add'>+/* arg buffer size */</div><div class='add'>+#define CX24116_ARGLEN (0x1e)</div><div class='add'>+</div><div class='add'>+/* rolloff */</div><div class='add'>+#define CX24116_ROLLOFF_020 (0x00)</div><div class='add'>+#define CX24116_ROLLOFF_025 (0x01)</div><div class='add'>+#define CX24116_ROLLOFF_035 (0x02)</div><div class='add'>+</div><div class='add'>+/* pilot bit */</div><div class='add'>+#define CX24116_PILOT_OFF (0x00)</div><div class='add'>+#define CX24116_PILOT_ON (0x40)</div><div class='add'>+</div><div class='add'>+/* signal status */</div><div class='add'>+#define CX24116_HAS_SIGNAL   (0x01)</div><div class='add'>+#define CX24116_HAS_CARRIER  (0x02)</div><div class='add'>+#define CX24116_HAS_VITERBI  (0x04)</div><div class='add'>+#define CX24116_HAS_SYNCLOCK (0x08)</div><div class='add'>+#define CX24116_HAS_UNKNOWN1 (0x10)</div><div class='add'>+#define CX24116_HAS_UNKNOWN2 (0x20)</div><div class='add'>+#define CX24116_STATUS_MASK  (0x3f)</div><div class='add'>+#define CX24116_SIGNAL_MASK  (0xc0)</div><div class='add'>+</div><div class='add'>+#define CX24116_DISEQC_TONEOFF   (0)    /* toneburst never sent */</div><div class='add'>+#define CX24116_DISEQC_TONECACHE (1)    /* toneburst cached     */</div><div class='add'>+#define CX24116_DISEQC_MESGCACHE (2)    /* message cached       */</div><div class='add'>+</div><div class='add'>+/* arg offset for DiSEqC */</div><div class='add'>+#define CX24116_DISEQC_BURST  (1)</div><div class='add'>+#define CX24116_DISEQC_ARG2_2 (2)   /* unknown value=2 */</div><div class='add'>+#define CX24116_DISEQC_ARG3_0 (3)   /* unknown value=0 */</div><div class='add'>+#define CX24116_DISEQC_ARG4_0 (4)   /* unknown value=0 */</div><div class='add'>+#define CX24116_DISEQC_MSGLEN (5)</div><div class='add'>+#define CX24116_DISEQC_MSGOFS (6)</div><div class='add'>+</div><div class='add'>+/* DiSEqC burst */</div><div class='add'>+#define CX24116_DISEQC_MINI_A (0)</div><div class='add'>+#define CX24116_DISEQC_MINI_B (1)</div><div class='add'>+</div><div class='add'>+/* DiSEqC tone burst */</div><div class='add'>+static int toneburst = 1;</div><div class='add'>+module_param(toneburst, int, 0644);</div><div class='add'>+MODULE_PARM_DESC(toneburst, "DiSEqC toneburst 0=OFF, 1=TONE CACHE, "\</div><div class='add'>+	"2=MESSAGE CACHE (default:1)");</div><div class='add'>+</div><div class='add'>+/* SNR measurements */</div><div class='add'>+static int esno_snr;</div><div class='add'>+module_param(esno_snr, int, 0644);</div><div class='add'>+MODULE_PARM_DESC(debug, "SNR return units, 0=PERCENTAGE 0-100, "\</div><div class='add'>+	"1=ESNO(db * 10) (default:0)");</div><div class='add'>+</div><div class='add'>+enum cmds {</div><div class='add'>+	CMD_SET_VCO     = 0x10,</div><div class='add'>+	CMD_TUNEREQUEST = 0x11,</div><div class='add'>+	CMD_MPEGCONFIG  = 0x13,</div><div class='add'>+	CMD_TUNERINIT   = 0x14,</div><div class='add'>+	CMD_BANDWIDTH   = 0x15,</div><div class='add'>+	CMD_GETAGC      = 0x19,</div><div class='add'>+	CMD_LNBCONFIG   = 0x20,</div><div class='add'>+	CMD_LNBSEND     = 0x21, /* Formerly CMD_SEND_DISEQC */</div><div class='add'>+	CMD_SET_TONEPRE = 0x22,</div><div class='add'>+	CMD_SET_TONE    = 0x23,</div><div class='add'>+	CMD_UPDFWVERS   = 0x35,</div><div class='add'>+	CMD_TUNERSLEEP  = 0x36,</div><div class='add'>+	CMD_AGCCONTROL  = 0x3b, /* Unknown */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* The Demod/Tuner can't easily provide these, we cache them */</div><div class='add'>+struct cx24116_tuning {</div><div class='add'>+	u32 frequency;</div><div class='add'>+	u32 symbol_rate;</div><div class='add'>+	fe_spectral_inversion_t inversion;</div><div class='add'>+	fe_code_rate_t fec;</div><div class='add'>+</div><div class='add'>+	fe_modulation_t modulation;</div><div class='add'>+	fe_pilot_t pilot;</div><div class='add'>+	fe_rolloff_t rolloff;</div><div class='add'>+</div><div class='add'>+	/* Demod values */</div><div class='add'>+	u8 fec_val;</div><div class='add'>+	u8 fec_mask;</div><div class='add'>+	u8 inversion_val;</div><div class='add'>+	u8 pilot_val;</div><div class='add'>+	u8 rolloff_val;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Basic commands that are sent to the firmware */</div><div class='add'>+struct cx24116_cmd {</div><div class='add'>+	u8 len;</div><div class='add'>+	u8 args[CX24116_ARGLEN];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct cx24116_state {</div><div class='add'>+	struct i2c_adapter *i2c;</div><div class='add'>+	const struct cx24116_config *config;</div><div class='add'>+</div><div class='add'>+	struct dvb_frontend frontend;</div><div class='add'>+</div><div class='add'>+	struct cx24116_tuning dcur;</div><div class='add'>+	struct cx24116_tuning dnxt;</div><div class='add'>+</div><div class='add'>+	u8 skip_fw_load;</div><div class='add'>+	u8 burst;</div><div class='add'>+	struct cx24116_cmd dsec_cmd;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int cx24116_writereg(struct cx24116_state *state, int reg, int data)</div><div class='add'>+{</div><div class='add'>+	u8 buf[] = { reg, data };</div><div class='add'>+	struct i2c_msg msg = { .addr = state-&gt;config-&gt;demod_address,</div><div class='add'>+		.flags = 0, .buf = buf, .len = 2 };</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (debug &gt; 1)</div><div class='add'>+		printk("cx24116: %s: write reg 0x%02x, value 0x%02x\n",</div><div class='add'>+			__func__, reg, data);</div><div class='add'>+</div><div class='add'>+	err = i2c_transfer(state-&gt;i2c, &amp;msg, 1);</div><div class='add'>+	if (err != 1) {</div><div class='add'>+		printk(KERN_ERR "%s: writereg error(err == %i, reg == 0x%02x,"</div><div class='add'>+			 " value == 0x%02x)\n", __func__, err, reg, data);</div><div class='add'>+		return -EREMOTEIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Bulk byte writes to a single I2C address, for 32k firmware load */</div><div class='add'>+static int cx24116_writeregN(struct cx24116_state *state, int reg,</div><div class='add'>+			     const u8 *data, u16 len)</div><div class='add'>+{</div><div class='add'>+	int ret = -EREMOTEIO;</div><div class='add'>+	struct i2c_msg msg;</div><div class='add'>+	u8 *buf;</div><div class='add'>+</div><div class='add'>+	buf = kmalloc(len + 1, GFP_KERNEL);</div><div class='add'>+	if (buf == NULL) {</div><div class='add'>+		printk("Unable to kmalloc\n");</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*(buf) = reg;</div><div class='add'>+	memcpy(buf + 1, data, len);</div><div class='add'>+</div><div class='add'>+	msg.addr = state-&gt;config-&gt;demod_address;</div><div class='add'>+	msg.flags = 0;</div><div class='add'>+	msg.buf = buf;</div><div class='add'>+	msg.len = len + 1;</div><div class='add'>+</div><div class='add'>+	if (debug &gt; 1)</div><div class='add'>+		printk(KERN_INFO "cx24116: %s:  write regN 0x%02x, len = %d\n",</div><div class='add'>+			__func__, reg, len);</div><div class='add'>+</div><div class='add'>+	ret = i2c_transfer(state-&gt;i2c, &amp;msg, 1);</div><div class='add'>+	if (ret != 1) {</div><div class='add'>+		printk(KERN_ERR "%s: writereg error(err == %i, reg == 0x%02x\n",</div><div class='add'>+			 __func__, ret, reg);</div><div class='add'>+		ret = -EREMOTEIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	kfree(buf);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cx24116_readreg(struct cx24116_state *state, u8 reg)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u8 b0[] = { reg };</div><div class='add'>+	u8 b1[] = { 0 };</div><div class='add'>+	struct i2c_msg msg[] = {</div><div class='add'>+		{ .addr = state-&gt;config-&gt;demod_address, .flags = 0,</div><div class='add'>+			.buf = b0, .len = 1 },</div><div class='add'>+		{ .addr = state-&gt;config-&gt;demod_address, .flags = I2C_M_RD,</div><div class='add'>+			.buf = b1, .len = 1 }</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ret = i2c_transfer(state-&gt;i2c, msg, 2);</div><div class='add'>+</div><div class='add'>+	if (ret != 2) {</div><div class='add'>+		printk(KERN_ERR "%s: reg=0x%x (error=%d)\n",</div><div class='add'>+			__func__, reg, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (debug &gt; 1)</div><div class='add'>+		printk(KERN_INFO "cx24116: read reg 0x%02x, value 0x%02x\n",</div><div class='add'>+			reg, b1[0]);</div><div class='add'>+</div><div class='add'>+	return b1[0];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cx24116_set_inversion(struct cx24116_state *state,</div><div class='add'>+	fe_spectral_inversion_t inversion)</div><div class='add'>+{</div><div class='add'>+	dprintk("%s(%d)\n", __func__, inversion);</div><div class='add'>+</div><div class='add'>+	switch (inversion) {</div><div class='add'>+	case INVERSION_OFF:</div><div class='add'>+		state-&gt;dnxt.inversion_val = 0x00;</div><div class='add'>+		break;</div><div class='add'>+	case INVERSION_ON:</div><div class='add'>+		state-&gt;dnxt.inversion_val = 0x04;</div><div class='add'>+		break;</div><div class='add'>+	case INVERSION_AUTO:</div><div class='add'>+		state-&gt;dnxt.inversion_val = 0x0C;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	state-&gt;dnxt.inversion = inversion;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * modfec (modulation and FEC)</div><div class='add'>+ * ===========================</div><div class='add'>+ *</div><div class='add'>+ * MOD          FEC             mask/val    standard</div><div class='add'>+ * ----         --------        ----------- --------</div><div class='add'>+ * QPSK         FEC_1_2         0x02 0x02+X DVB-S</div><div class='add'>+ * QPSK         FEC_2_3         0x04 0x02+X DVB-S</div><div class='add'>+ * QPSK         FEC_3_4         0x08 0x02+X DVB-S</div><div class='add'>+ * QPSK         FEC_4_5         0x10 0x02+X DVB-S (?)</div><div class='add'>+ * QPSK         FEC_5_6         0x20 0x02+X DVB-S</div><div class='add'>+ * QPSK         FEC_6_7         0x40 0x02+X DVB-S</div><div class='add'>+ * QPSK         FEC_7_8         0x80 0x02+X DVB-S</div><div class='add'>+ * QPSK         FEC_8_9         0x01 0x02+X DVB-S (?) (NOT SUPPORTED?)</div><div class='add'>+ * QPSK         AUTO            0xff 0x02+X DVB-S</div><div class='add'>+ *</div><div class='add'>+ * For DVB-S high byte probably represents FEC</div><div class='add'>+ * and low byte selects the modulator. The high</div><div class='add'>+ * byte is search range mask. Bit 5 may turn</div><div class='add'>+ * on DVB-S and remaining bits represent some</div><div class='add'>+ * kind of calibration (how/what i do not know).</div><div class='add'>+ *</div><div class='add'>+ * Eg.(2/3) szap "Zone Horror"</div><div class='add'>+ *</div><div class='add'>+ * mask/val = 0x04, 0x20</div><div class='add'>+ * status 1f | signal c3c0 | snr a333 | ber 00000098 | unc 0 | FE_HAS_LOCK</div><div class='add'>+ *</div><div class='add'>+ * mask/val = 0x04, 0x30</div><div class='add'>+ * status 1f | signal c3c0 | snr a333 | ber 00000000 | unc 0 | FE_HAS_LOCK</div><div class='add'>+ *</div><div class='add'>+ * After tuning FECSTATUS contains actual FEC</div><div class='add'>+ * in use numbered 1 through to 8 for 1/2 .. 2/3 etc</div><div class='add'>+ *</div><div class='add'>+ * NBC=NOT/NON BACKWARD COMPATIBLE WITH DVB-S (DVB-S2 only)</div><div class='add'>+ *</div><div class='add'>+ * NBC-QPSK     FEC_1_2         0x00, 0x04      DVB-S2</div><div class='add'>+ * NBC-QPSK     FEC_3_5         0x00, 0x05      DVB-S2</div><div class='add'>+ * NBC-QPSK     FEC_2_3         0x00, 0x06      DVB-S2</div><div class='add'>+ * NBC-QPSK     FEC_3_4         0x00, 0x07      DVB-S2</div><div class='add'>+ * NBC-QPSK     FEC_4_5         0x00, 0x08      DVB-S2</div><div class='add'>+ * NBC-QPSK     FEC_5_6         0x00, 0x09      DVB-S2</div><div class='add'>+ * NBC-QPSK     FEC_8_9         0x00, 0x0a      DVB-S2</div><div class='add'>+ * NBC-QPSK     FEC_9_10        0x00, 0x0b      DVB-S2</div><div class='add'>+ *</div><div class='add'>+ * NBC-8PSK     FEC_3_5         0x00, 0x0c      DVB-S2</div><div class='add'>+ * NBC-8PSK     FEC_2_3         0x00, 0x0d      DVB-S2</div><div class='add'>+ * NBC-8PSK     FEC_3_4         0x00, 0x0e      DVB-S2</div><div class='add'>+ * NBC-8PSK     FEC_5_6         0x00, 0x0f      DVB-S2</div><div class='add'>+ * NBC-8PSK     FEC_8_9         0x00, 0x10      DVB-S2</div><div class='add'>+ * NBC-8PSK     FEC_9_10        0x00, 0x11      DVB-S2</div><div class='add'>+ *</div><div class='add'>+ * For DVB-S2 low bytes selects both modulator</div><div class='add'>+ * and FEC. High byte is meaningless here. To</div><div class='add'>+ * set pilot, bit 6 (0x40) is set. When inspecting</div><div class='add'>+ * FECSTATUS bit 7 (0x80) represents the pilot</div><div class='add'>+ * selection whilst not tuned. When tuned, actual FEC</div><div class='add'>+ * in use is found in FECSTATUS as per above. Pilot</div><div class='add'>+ * value is reset.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* A table of modulation, fec and configuration bytes for the demod.</div><div class='add'>+ * Not all S2 mmodulation schemes are support and not all rates with</div><div class='add'>+ * a scheme are support. Especially, no auto detect when in S2 mode.</div><div class='add'>+ */</div><div class='add'>+struct cx24116_modfec {</div><div class='add'>+	fe_delivery_system_t delivery_system;</div><div class='add'>+	fe_modulation_t modulation;</div><div class='add'>+	fe_code_rate_t fec;</div><div class='add'>+	u8 mask;	/* In DVBS mode this is used to autodetect */</div><div class='add'>+	u8 val;		/* Passed to the firmware to indicate mode selection */</div><div class='add'>+} CX24116_MODFEC_MODES[] = {</div><div class='add'>+ /* QPSK. For unknown rates we set hardware to auto detect 0xfe 0x30 */</div><div class='add'>+</div><div class='add'>+ /*mod   fec       mask  val */</div><div class='add'>+ { SYS_DVBS, QPSK, FEC_NONE, 0xfe, 0x30 },</div><div class='add'>+ { SYS_DVBS, QPSK, FEC_1_2,  0x02, 0x2e }, /* 00000010 00101110 */</div><div class='add'>+ { SYS_DVBS, QPSK, FEC_2_3,  0x04, 0x2f }, /* 00000100 00101111 */</div><div class='add'>+ { SYS_DVBS, QPSK, FEC_3_4,  0x08, 0x30 }, /* 00001000 00110000 */</div><div class='add'>+ { SYS_DVBS, QPSK, FEC_4_5,  0xfe, 0x30 }, /* 000?0000 ?        */</div><div class='add'>+ { SYS_DVBS, QPSK, FEC_5_6,  0x20, 0x31 }, /* 00100000 00110001 */</div><div class='add'>+ { SYS_DVBS, QPSK, FEC_6_7,  0xfe, 0x30 }, /* 0?000000 ?        */</div><div class='add'>+ { SYS_DVBS, QPSK, FEC_7_8,  0x80, 0x32 }, /* 10000000 00110010 */</div><div class='add'>+ { SYS_DVBS, QPSK, FEC_8_9,  0xfe, 0x30 }, /* 0000000? ?        */</div><div class='add'>+ { SYS_DVBS, QPSK, FEC_AUTO, 0xfe, 0x30 },</div><div class='add'>+ /* NBC-QPSK */</div><div class='add'>+ { SYS_DVBS2, QPSK, FEC_1_2,  0x00, 0x04 },</div><div class='add'>+ { SYS_DVBS2, QPSK, FEC_3_5,  0x00, 0x05 },</div><div class='add'>+ { SYS_DVBS2, QPSK, FEC_2_3,  0x00, 0x06 },</div><div class='add'>+ { SYS_DVBS2, QPSK, FEC_3_4,  0x00, 0x07 },</div><div class='add'>+ { SYS_DVBS2, QPSK, FEC_4_5,  0x00, 0x08 },</div><div class='add'>+ { SYS_DVBS2, QPSK, FEC_5_6,  0x00, 0x09 },</div><div class='add'>+ { SYS_DVBS2, QPSK, FEC_8_9,  0x00, 0x0a },</div><div class='add'>+ { SYS_DVBS2, QPSK, FEC_9_10, 0x00, 0x0b },</div><div class='add'>+ /* 8PSK */</div><div class='add'>+ { SYS_DVBS2, PSK_8, FEC_3_5,  0x00, 0x0c },</div><div class='add'>+ { SYS_DVBS2, PSK_8, FEC_2_3,  0x00, 0x0d },</div><div class='add'>+ { SYS_DVBS2, PSK_8, FEC_3_4,  0x00, 0x0e },</div><div class='add'>+ { SYS_DVBS2, PSK_8, FEC_5_6,  0x00, 0x0f },</div><div class='add'>+ { SYS_DVBS2, PSK_8, FEC_8_9,  0x00, 0x10 },</div><div class='add'>+ { SYS_DVBS2, PSK_8, FEC_9_10, 0x00, 0x11 },</div><div class='add'>+ /*</div><div class='add'>+  * `val' can be found in the FECSTATUS register when tuning.</div><div class='add'>+  * FECSTATUS will give the actual FEC in use if tuning was successful.</div><div class='add'>+  */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int cx24116_lookup_fecmod(struct cx24116_state *state,</div><div class='add'>+	fe_modulation_t m, fe_code_rate_t f)</div><div class='add'>+{</div><div class='add'>+	int i, ret = -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	dprintk("%s(0x%02x,0x%02x)\n", __func__, m, f);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(CX24116_MODFEC_MODES); i++) {</div><div class='add'>+		if ((m == CX24116_MODFEC_MODES[i].modulation) &amp;&amp;</div><div class='add'>+			(f == CX24116_MODFEC_MODES[i].fec)) {</div><div class='add'>+				ret = i;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cx24116_set_fec(struct cx24116_state *state,</div><div class='add'>+	fe_modulation_t mod, fe_code_rate_t fec)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	dprintk("%s(0x%02x,0x%02x)\n", __func__, mod, fec);</div><div class='add'>+</div><div class='add'>+	ret = cx24116_lookup_fecmod(state, mod, fec);</div><div class='add'>+</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	state-&gt;dnxt.fec = fec;</div><div class='add'>+	state-&gt;dnxt.fec_val = CX24116_MODFEC_MODES[ret].val;</div><div class='add'>+	state-&gt;dnxt.fec_mask = CX24116_MODFEC_MODES[ret].mask;</div><div class='add'>+	dprintk("%s() mask/val = 0x%02x/0x%02x\n", __func__,</div><div class='add'>+		state-&gt;dnxt.fec_mask, state-&gt;dnxt.fec_val);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cx24116_set_symbolrate(struct cx24116_state *state, u32 rate)</div><div class='add'>+{</div><div class='add'>+	dprintk("%s(%d)\n", __func__, rate);</div><div class='add'>+</div><div class='add'>+	/*  check if symbol rate is within limits */</div><div class='add'>+	if ((rate &gt; state-&gt;frontend.ops.info.symbol_rate_max) ||</div><div class='add'>+	    (rate &lt; state-&gt;frontend.ops.info.symbol_rate_min)) {</div><div class='add'>+		dprintk("%s() unsupported symbol_rate = %d\n", __func__, rate);</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	state-&gt;dnxt.symbol_rate = rate;</div><div class='add'>+	dprintk("%s() symbol_rate = %d\n", __func__, rate);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cx24116_load_firmware(struct dvb_frontend *fe,</div><div class='add'>+	const struct firmware *fw);</div><div class='add'>+</div><div class='add'>+static int cx24116_firmware_ondemand(struct dvb_frontend *fe)</div><div class='add'>+{</div><div class='add'>+	struct cx24116_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	const struct firmware *fw;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	dprintk("%s()\n", __func__);</div><div class='add'>+</div><div class='add'>+	if (cx24116_readreg(state, 0x20) &gt; 0) {</div><div class='add'>+</div><div class='add'>+		if (state-&gt;skip_fw_load)</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		/* Load firmware */</div><div class='add'>+		/* request the firmware, this will block until loaded */</div><div class='add'>+		printk(KERN_INFO "%s: Waiting for firmware upload (%s)...\n",</div><div class='add'>+			__func__, CX24116_DEFAULT_FIRMWARE);</div><div class='add'>+		ret = request_firmware(&amp;fw, CX24116_DEFAULT_FIRMWARE,</div><div class='add'>+			&amp;state-&gt;i2c-&gt;dev);</div><div class='add'>+		printk(KERN_INFO "%s: Waiting for firmware upload(2)...\n",</div><div class='add'>+			__func__);</div><div class='add'>+		if (ret) {</div><div class='add'>+			printk(KERN_ERR "%s: No firmware uploaded "</div><div class='add'>+				"(timeout or file not found?)\n", __func__);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Make sure we don't recurse back through here</div><div class='add'>+		 * during loading */</div><div class='add'>+		state-&gt;skip_fw_load = 1;</div><div class='add'>+</div><div class='add'>+		ret = cx24116_load_firmware(fe, fw);</div><div class='add'>+		if (ret)</div><div class='add'>+			printk(KERN_ERR "%s: Writing firmware to device failed\n",</div><div class='add'>+				__func__);</div><div class='add'>+</div><div class='add'>+		release_firmware(fw);</div><div class='add'>+</div><div class='add'>+		printk(KERN_INFO "%s: Firmware upload %s\n", __func__,</div><div class='add'>+			ret == 0 ? "complete" : "failed");</div><div class='add'>+</div><div class='add'>+		/* Ensure firmware is always loaded if required */</div><div class='add'>+		state-&gt;skip_fw_load = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Take a basic firmware command structure, format it</div><div class='add'>+ * and forward it for processing</div><div class='add'>+ */</div><div class='add'>+static int cx24116_cmd_execute(struct dvb_frontend *fe, struct cx24116_cmd *cmd)</div><div class='add'>+{</div><div class='add'>+	struct cx24116_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	dprintk("%s()\n", __func__);</div><div class='add'>+</div><div class='add'>+	/* Load the firmware if required */</div><div class='add'>+	ret = cx24116_firmware_ondemand(fe);</div><div class='add'>+	if (ret != 0) {</div><div class='add'>+		printk(KERN_ERR "%s(): Unable initialise the firmware\n",</div><div class='add'>+			__func__);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Write the command */</div><div class='add'>+	for (i = 0; i &lt; cmd-&gt;len ; i++) {</div><div class='add'>+		dprintk("%s: 0x%02x == 0x%02x\n", __func__, i, cmd-&gt;args[i]);</div><div class='add'>+		cx24116_writereg(state, i, cmd-&gt;args[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Start execution and wait for cmd to terminate */</div><div class='add'>+	cx24116_writereg(state, CX24116_REG_EXECUTE, 0x01);</div><div class='add'>+	while (cx24116_readreg(state, CX24116_REG_EXECUTE)) {</div><div class='add'>+		msleep(10);</div><div class='add'>+		if (i++ &gt; 64) {</div><div class='add'>+			/* Avoid looping forever if the firmware does</div><div class='add'>+				not respond */</div><div class='add'>+			printk(KERN_WARNING "%s() Firmware not responding\n",</div><div class='add'>+				__func__);</div><div class='add'>+			return -EREMOTEIO;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cx24116_load_firmware(struct dvb_frontend *fe,</div><div class='add'>+	const struct firmware *fw)</div><div class='add'>+{</div><div class='add'>+	struct cx24116_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	struct cx24116_cmd cmd;</div><div class='add'>+	int i, ret;</div><div class='add'>+	unsigned char vers[4];</div><div class='add'>+</div><div class='add'>+	dprintk("%s\n", __func__);</div><div class='add'>+	dprintk("Firmware is %zu bytes (%02x %02x .. %02x %02x)\n",</div><div class='add'>+			fw-&gt;size,</div><div class='add'>+			fw-&gt;data[0],</div><div class='add'>+			fw-&gt;data[1],</div><div class='add'>+			fw-&gt;data[fw-&gt;size-2],</div><div class='add'>+			fw-&gt;data[fw-&gt;size-1]);</div><div class='add'>+</div><div class='add'>+	/* Toggle 88x SRST pin to reset demod */</div><div class='add'>+	if (state-&gt;config-&gt;reset_device)</div><div class='add'>+		state-&gt;config-&gt;reset_device(fe);</div><div class='add'>+</div><div class='add'>+	/* Begin the firmware load process */</div><div class='add'>+	/* Prepare the demod, load the firmware, cleanup after load */</div><div class='add'>+</div><div class='add'>+	/* Init PLL */</div><div class='add'>+	cx24116_writereg(state, 0xE5, 0x00);</div><div class='add'>+	cx24116_writereg(state, 0xF1, 0x08);</div><div class='add'>+	cx24116_writereg(state, 0xF2, 0x13);</div><div class='add'>+</div><div class='add'>+	/* Start PLL */</div><div class='add'>+	cx24116_writereg(state, 0xe0, 0x03);</div><div class='add'>+	cx24116_writereg(state, 0xe0, 0x00);</div><div class='add'>+</div><div class='add'>+	/* Unknown */</div><div class='add'>+	cx24116_writereg(state, CX24116_REG_CLKDIV, 0x46);</div><div class='add'>+	cx24116_writereg(state, CX24116_REG_RATEDIV, 0x00);</div><div class='add'>+</div><div class='add'>+	/* Unknown */</div><div class='add'>+	cx24116_writereg(state, 0xF0, 0x03);</div><div class='add'>+	cx24116_writereg(state, 0xF4, 0x81);</div><div class='add'>+	cx24116_writereg(state, 0xF5, 0x00);</div><div class='add'>+	cx24116_writereg(state, 0xF6, 0x00);</div><div class='add'>+</div><div class='add'>+	/* write the entire firmware as one transaction */</div><div class='add'>+	cx24116_writeregN(state, 0xF7, fw-&gt;data, fw-&gt;size);</div><div class='add'>+</div><div class='add'>+	cx24116_writereg(state, 0xF4, 0x10);</div><div class='add'>+	cx24116_writereg(state, 0xF0, 0x00);</div><div class='add'>+	cx24116_writereg(state, 0xF8, 0x06);</div><div class='add'>+</div><div class='add'>+	/* Firmware CMD 10: VCO config */</div><div class='add'>+	cmd.args[0x00] = CMD_SET_VCO;</div><div class='add'>+	cmd.args[0x01] = 0x05;</div><div class='add'>+	cmd.args[0x02] = 0xdc;</div><div class='add'>+	cmd.args[0x03] = 0xda;</div><div class='add'>+	cmd.args[0x04] = 0xae;</div><div class='add'>+	cmd.args[0x05] = 0xaa;</div><div class='add'>+	cmd.args[0x06] = 0x04;</div><div class='add'>+	cmd.args[0x07] = 0x9d;</div><div class='add'>+	cmd.args[0x08] = 0xfc;</div><div class='add'>+	cmd.args[0x09] = 0x06;</div><div class='add'>+	cmd.len = 0x0a;</div><div class='add'>+	ret = cx24116_cmd_execute(fe, &amp;cmd);</div><div class='add'>+	if (ret != 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	cx24116_writereg(state, CX24116_REG_SSTATUS, 0x00);</div><div class='add'>+</div><div class='add'>+	/* Firmware CMD 14: Tuner config */</div><div class='add'>+	cmd.args[0x00] = CMD_TUNERINIT;</div><div class='add'>+	cmd.args[0x01] = 0x00;</div><div class='add'>+	cmd.args[0x02] = 0x00;</div><div class='add'>+	cmd.len = 0x03;</div><div class='add'>+	ret = cx24116_cmd_execute(fe, &amp;cmd);</div><div class='add'>+	if (ret != 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	cx24116_writereg(state, 0xe5, 0x00);</div><div class='add'>+</div><div class='add'>+	/* Firmware CMD 13: MPEG config */</div><div class='add'>+	cmd.args[0x00] = CMD_MPEGCONFIG;</div><div class='add'>+	cmd.args[0x01] = 0x01;</div><div class='add'>+	cmd.args[0x02] = 0x75;</div><div class='add'>+	cmd.args[0x03] = 0x00;</div><div class='add'>+	if (state-&gt;config-&gt;mpg_clk_pos_pol)</div><div class='add'>+		cmd.args[0x04] = state-&gt;config-&gt;mpg_clk_pos_pol;</div><div class='add'>+	else</div><div class='add'>+		cmd.args[0x04] = 0x02;</div><div class='add'>+	cmd.args[0x05] = 0x00;</div><div class='add'>+	cmd.len = 0x06;</div><div class='add'>+	ret = cx24116_cmd_execute(fe, &amp;cmd);</div><div class='add'>+	if (ret != 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Firmware CMD 35: Get firmware version */</div><div class='add'>+	cmd.args[0x00] = CMD_UPDFWVERS;</div><div class='add'>+	cmd.len = 0x02;</div><div class='add'>+	for (i = 0; i &lt; 4; i++) {</div><div class='add'>+		cmd.args[0x01] = i;</div><div class='add'>+		ret = cx24116_cmd_execute(fe, &amp;cmd);</div><div class='add'>+		if (ret != 0)</div><div class='add'>+			return ret;</div><div class='add'>+		vers[i] = cx24116_readreg(state, CX24116_REG_MAILBOX);</div><div class='add'>+	}</div><div class='add'>+	printk(KERN_INFO "%s: FW version %i.%i.%i.%i\n", __func__,</div><div class='add'>+		vers[0], vers[1], vers[2], vers[3]);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cx24116_set_voltage(struct dvb_frontend *fe,</div><div class='add'>+	fe_sec_voltage_t voltage)</div><div class='add'>+{</div><div class='add'>+	/* The isl6421 module will override this function in the fops. */</div><div class='add'>+	dprintk("%s() This should never appear if the isl6421 module "</div><div class='add'>+		"is loaded correctly\n", __func__);</div><div class='add'>+</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cx24116_read_status(struct dvb_frontend *fe, fe_status_t *status)</div><div class='add'>+{</div><div class='add'>+	struct cx24116_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+</div><div class='add'>+	int lock = cx24116_readreg(state, CX24116_REG_SSTATUS);</div><div class='add'>+</div><div class='add'>+	dprintk("%s: status = 0x%02x\n", __func__, lock);</div><div class='add'>+</div><div class='add'>+	*status = 0;</div><div class='add'>+</div><div class='add'>+	if (lock &amp; CX24116_HAS_SIGNAL)</div><div class='add'>+		*status |= FE_HAS_SIGNAL;</div><div class='add'>+	if (lock &amp; CX24116_HAS_CARRIER)</div><div class='add'>+		*status |= FE_HAS_CARRIER;</div><div class='add'>+	if (lock &amp; CX24116_HAS_VITERBI)</div><div class='add'>+		*status |= FE_HAS_VITERBI;</div><div class='add'>+	if (lock &amp; CX24116_HAS_SYNCLOCK)</div><div class='add'>+		*status |= FE_HAS_SYNC | FE_HAS_LOCK;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cx24116_read_ber(struct dvb_frontend *fe, u32 *ber)</div><div class='add'>+{</div><div class='add'>+	struct cx24116_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+</div><div class='add'>+	dprintk("%s()\n", __func__);</div><div class='add'>+</div><div class='add'>+	*ber =  (cx24116_readreg(state, CX24116_REG_BER24) &lt;&lt; 24) |</div><div class='add'>+		(cx24116_readreg(state, CX24116_REG_BER16) &lt;&lt; 16) |</div><div class='add'>+		(cx24116_readreg(state, CX24116_REG_BER8)  &lt;&lt; 8)  |</div><div class='add'>+		 cx24116_readreg(state, CX24116_REG_BER0);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* TODO Determine function and scale appropriately */</div><div class='add'>+static int cx24116_read_signal_strength(struct dvb_frontend *fe,</div><div class='add'>+	u16 *signal_strength)</div><div class='add'>+{</div><div class='add'>+	struct cx24116_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	struct cx24116_cmd cmd;</div><div class='add'>+	int ret;</div><div class='add'>+	u16 sig_reading;</div><div class='add'>+</div><div class='add'>+	dprintk("%s()\n", __func__);</div><div class='add'>+</div><div class='add'>+	/* Firmware CMD 19: Get AGC */</div><div class='add'>+	cmd.args[0x00] = CMD_GETAGC;</div><div class='add'>+	cmd.len = 0x01;</div><div class='add'>+	ret = cx24116_cmd_execute(fe, &amp;cmd);</div><div class='add'>+	if (ret != 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	sig_reading =</div><div class='add'>+		(cx24116_readreg(state,</div><div class='add'>+			CX24116_REG_SSTATUS) &amp; CX24116_SIGNAL_MASK) |</div><div class='add'>+		(cx24116_readreg(state, CX24116_REG_SIGNAL) &lt;&lt; 6);</div><div class='add'>+	*signal_strength = 0 - sig_reading;</div><div class='add'>+</div><div class='add'>+	dprintk("%s: raw / cooked = 0x%04x / 0x%04x\n",</div><div class='add'>+		__func__, sig_reading, *signal_strength);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* SNR (0..100)% = (sig &amp; 0xf0) * 10 + (sig &amp; 0x0f) * 10 / 16 */</div><div class='add'>+static int cx24116_read_snr_pct(struct dvb_frontend *fe, u16 *snr)</div><div class='add'>+{</div><div class='add'>+	struct cx24116_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	u8 snr_reading;</div><div class='add'>+	static const u32 snr_tab[] = { /* 10 x Table (rounded up) */</div><div class='add'>+		0x00000, 0x0199A, 0x03333, 0x04ccD, 0x06667,</div><div class='add'>+		0x08000, 0x0999A, 0x0b333, 0x0cccD, 0x0e667,</div><div class='add'>+		0x10000, 0x1199A, 0x13333, 0x14ccD, 0x16667,</div><div class='add'>+		0x18000 };</div><div class='add'>+</div><div class='add'>+	dprintk("%s()\n", __func__);</div><div class='add'>+</div><div class='add'>+	snr_reading = cx24116_readreg(state, CX24116_REG_QUALITY0);</div><div class='add'>+</div><div class='add'>+	if (snr_reading &gt;= 0xa0 /* 100% */)</div><div class='add'>+		*snr = 0xffff;</div><div class='add'>+	else</div><div class='add'>+		*snr = snr_tab[(snr_reading &amp; 0xf0) &gt;&gt; 4] +</div><div class='add'>+			(snr_tab[(snr_reading &amp; 0x0f)] &gt;&gt; 4);</div><div class='add'>+</div><div class='add'>+	dprintk("%s: raw / cooked = 0x%02x / 0x%04x\n", __func__,</div><div class='add'>+		snr_reading, *snr);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* The reelbox patches show the value in the registers represents</div><div class='add'>+ * ESNO, from 0-&gt;30db (values 0-&gt;300). We provide this value by</div><div class='add'>+ * default.</div><div class='add'>+ */</div><div class='add'>+static int cx24116_read_snr_esno(struct dvb_frontend *fe, u16 *snr)</div><div class='add'>+{</div><div class='add'>+	struct cx24116_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+</div><div class='add'>+	dprintk("%s()\n", __func__);</div><div class='add'>+</div><div class='add'>+	*snr = cx24116_readreg(state, CX24116_REG_QUALITY8) &lt;&lt; 8 |</div><div class='add'>+		cx24116_readreg(state, CX24116_REG_QUALITY0);</div><div class='add'>+</div><div class='add'>+	dprintk("%s: raw 0x%04x\n", __func__, *snr);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cx24116_read_snr(struct dvb_frontend *fe, u16 *snr)</div><div class='add'>+{</div><div class='add'>+	if (esno_snr == 1)</div><div class='add'>+		return cx24116_read_snr_esno(fe, snr);</div><div class='add'>+	else</div><div class='add'>+		return cx24116_read_snr_pct(fe, snr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cx24116_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks)</div><div class='add'>+{</div><div class='add'>+	struct cx24116_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+</div><div class='add'>+	dprintk("%s()\n", __func__);</div><div class='add'>+</div><div class='add'>+	*ucblocks = (cx24116_readreg(state, CX24116_REG_UCB8) &lt;&lt; 8) |</div><div class='add'>+		cx24116_readreg(state, CX24116_REG_UCB0);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Overwrite the current tuning params, we are about to tune */</div><div class='add'>+static void cx24116_clone_params(struct dvb_frontend *fe)</div><div class='add'>+{</div><div class='add'>+	struct cx24116_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	memcpy(&amp;state-&gt;dcur, &amp;state-&gt;dnxt, sizeof(state-&gt;dcur));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Wait for LNB */</div><div class='add'>+static int cx24116_wait_for_lnb(struct dvb_frontend *fe)</div><div class='add'>+{</div><div class='add'>+	struct cx24116_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	dprintk("%s() qstatus = 0x%02x\n", __func__,</div><div class='add'>+		cx24116_readreg(state, CX24116_REG_QSTATUS));</div><div class='add'>+</div><div class='add'>+	/* Wait for up to 300 ms */</div><div class='add'>+	for (i = 0; i &lt; 30 ; i++) {</div><div class='add'>+		if (cx24116_readreg(state, CX24116_REG_QSTATUS) &amp; 0x20)</div><div class='add'>+			return 0;</div><div class='add'>+		msleep(10);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dprintk("%s(): LNB not ready\n", __func__);</div><div class='add'>+</div><div class='add'>+	return -ETIMEDOUT; /* -EBUSY ? */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cx24116_set_tone(struct dvb_frontend *fe,</div><div class='add'>+	fe_sec_tone_mode_t tone)</div><div class='add'>+{</div><div class='add'>+	struct cx24116_cmd cmd;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	dprintk("%s(%d)\n", __func__, tone);</div><div class='add'>+	if ((tone != SEC_TONE_ON) &amp;&amp; (tone != SEC_TONE_OFF)) {</div><div class='add'>+		printk(KERN_ERR "%s: Invalid, tone=%d\n", __func__, tone);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Wait for LNB ready */</div><div class='add'>+	ret = cx24116_wait_for_lnb(fe);</div><div class='add'>+	if (ret != 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Min delay time after DiSEqC send */</div><div class='add'>+	msleep(15); /* XXX determine is FW does this, see send_diseqc/burst */</div><div class='add'>+</div><div class='add'>+	/* This is always done before the tone is set */</div><div class='add'>+	cmd.args[0x00] = CMD_SET_TONEPRE;</div><div class='add'>+	cmd.args[0x01] = 0x00;</div><div class='add'>+	cmd.len = 0x02;</div><div class='add'>+	ret = cx24116_cmd_execute(fe, &amp;cmd);</div><div class='add'>+	if (ret != 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Now we set the tone */</div><div class='add'>+	cmd.args[0x00] = CMD_SET_TONE;</div><div class='add'>+	cmd.args[0x01] = 0x00;</div><div class='add'>+	cmd.args[0x02] = 0x00;</div><div class='add'>+</div><div class='add'>+	switch (tone) {</div><div class='add'>+	case SEC_TONE_ON:</div><div class='add'>+		dprintk("%s: setting tone on\n", __func__);</div><div class='add'>+		cmd.args[0x03] = 0x01;</div><div class='add'>+		break;</div><div class='add'>+	case SEC_TONE_OFF:</div><div class='add'>+		dprintk("%s: setting tone off\n", __func__);</div><div class='add'>+		cmd.args[0x03] = 0x00;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	cmd.len = 0x04;</div><div class='add'>+</div><div class='add'>+	/* Min delay time before DiSEqC send */</div><div class='add'>+	msleep(15); /* XXX determine is FW does this, see send_diseqc/burst */</div><div class='add'>+</div><div class='add'>+	return cx24116_cmd_execute(fe, &amp;cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Initialise DiSEqC */</div><div class='add'>+static int cx24116_diseqc_init(struct dvb_frontend *fe)</div><div class='add'>+{</div><div class='add'>+	struct cx24116_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	struct cx24116_cmd cmd;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Firmware CMD 20: LNB/DiSEqC config */</div><div class='add'>+	cmd.args[0x00] = CMD_LNBCONFIG;</div><div class='add'>+	cmd.args[0x01] = 0x00;</div><div class='add'>+	cmd.args[0x02] = 0x10;</div><div class='add'>+	cmd.args[0x03] = 0x00;</div><div class='add'>+	cmd.args[0x04] = 0x8f;</div><div class='add'>+	cmd.args[0x05] = 0x28;</div><div class='add'>+	cmd.args[0x06] = (toneburst == CX24116_DISEQC_TONEOFF) ? 0x00 : 0x01;</div><div class='add'>+	cmd.args[0x07] = 0x01;</div><div class='add'>+	cmd.len = 0x08;</div><div class='add'>+	ret = cx24116_cmd_execute(fe, &amp;cmd);</div><div class='add'>+	if (ret != 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Prepare a DiSEqC command */</div><div class='add'>+	state-&gt;dsec_cmd.args[0x00] = CMD_LNBSEND;</div><div class='add'>+</div><div class='add'>+	/* DiSEqC burst */</div><div class='add'>+	state-&gt;dsec_cmd.args[CX24116_DISEQC_BURST]  = CX24116_DISEQC_MINI_A;</div><div class='add'>+</div><div class='add'>+	/* Unknown */</div><div class='add'>+	state-&gt;dsec_cmd.args[CX24116_DISEQC_ARG2_2] = 0x02;</div><div class='add'>+	state-&gt;dsec_cmd.args[CX24116_DISEQC_ARG3_0] = 0x00;</div><div class='add'>+	/* Continuation flag? */</div><div class='add'>+	state-&gt;dsec_cmd.args[CX24116_DISEQC_ARG4_0] = 0x00;</div><div class='add'>+</div><div class='add'>+	/* DiSEqC message length */</div><div class='add'>+	state-&gt;dsec_cmd.args[CX24116_DISEQC_MSGLEN] = 0x00;</div><div class='add'>+</div><div class='add'>+	/* Command length */</div><div class='add'>+	state-&gt;dsec_cmd.len = CX24116_DISEQC_MSGOFS;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Send DiSEqC message with derived burst (hack) || previous burst */</div><div class='add'>+static int cx24116_send_diseqc_msg(struct dvb_frontend *fe,</div><div class='add'>+	struct dvb_diseqc_master_cmd *d)</div><div class='add'>+{</div><div class='add'>+	struct cx24116_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	/* Dump DiSEqC message */</div><div class='add'>+	if (debug) {</div><div class='add'>+		printk(KERN_INFO "cx24116: %s(", __func__);</div><div class='add'>+		for (i = 0 ; i &lt; d-&gt;msg_len ;) {</div><div class='add'>+			printk(KERN_INFO "0x%02x", d-&gt;msg[i]);</div><div class='add'>+			if (++i &lt; d-&gt;msg_len)</div><div class='add'>+				printk(KERN_INFO ", ");</div><div class='add'>+		}</div><div class='add'>+		printk(") toneburst=%d\n", toneburst);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Validate length */</div><div class='add'>+	if (d-&gt;msg_len &gt; (CX24116_ARGLEN - CX24116_DISEQC_MSGOFS))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* DiSEqC message */</div><div class='add'>+	for (i = 0; i &lt; d-&gt;msg_len; i++)</div><div class='add'>+		state-&gt;dsec_cmd.args[CX24116_DISEQC_MSGOFS + i] = d-&gt;msg[i];</div><div class='add'>+</div><div class='add'>+	/* DiSEqC message length */</div><div class='add'>+	state-&gt;dsec_cmd.args[CX24116_DISEQC_MSGLEN] = d-&gt;msg_len;</div><div class='add'>+</div><div class='add'>+	/* Command length */</div><div class='add'>+	state-&gt;dsec_cmd.len = CX24116_DISEQC_MSGOFS +</div><div class='add'>+		state-&gt;dsec_cmd.args[CX24116_DISEQC_MSGLEN];</div><div class='add'>+</div><div class='add'>+	/* DiSEqC toneburst */</div><div class='add'>+	if (toneburst == CX24116_DISEQC_MESGCACHE)</div><div class='add'>+		/* Message is cached */</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	else if (toneburst == CX24116_DISEQC_TONEOFF)</div><div class='add'>+		/* Message is sent without burst */</div><div class='add'>+		state-&gt;dsec_cmd.args[CX24116_DISEQC_BURST] = 0;</div><div class='add'>+</div><div class='add'>+	else if (toneburst == CX24116_DISEQC_TONECACHE) {</div><div class='add'>+		/*</div><div class='add'>+		 * Message is sent with derived else cached burst</div><div class='add'>+		 *</div><div class='add'>+		 * WRITE PORT GROUP COMMAND 38</div><div class='add'>+		 *</div><div class='add'>+		 * 0/A/A: E0 10 38 F0..F3</div><div class='add'>+		 * 1/B/B: E0 10 38 F4..F7</div><div class='add'>+		 * 2/C/A: E0 10 38 F8..FB</div><div class='add'>+		 * 3/D/B: E0 10 38 FC..FF</div><div class='add'>+		 *</div><div class='add'>+		 * databyte[3]= 8421:8421</div><div class='add'>+		 *              ABCD:WXYZ</div><div class='add'>+		 *              CLR :SET</div><div class='add'>+		 *</div><div class='add'>+		 *              WX= PORT SELECT 0..3    (X=TONEBURST)</div><div class='add'>+		 *              Y = VOLTAGE             (0=13V, 1=18V)</div><div class='add'>+		 *              Z = BAND                (0=LOW, 1=HIGH(22K))</div><div class='add'>+		 */</div><div class='add'>+		if (d-&gt;msg_len &gt;= 4 &amp;&amp; d-&gt;msg[2] == 0x38)</div><div class='add'>+			state-&gt;dsec_cmd.args[CX24116_DISEQC_BURST] =</div><div class='add'>+				((d-&gt;msg[3] &amp; 4) &gt;&gt; 2);</div><div class='add'>+		if (debug)</div><div class='add'>+			dprintk("%s burst=%d\n", __func__,</div><div class='add'>+				state-&gt;dsec_cmd.args[CX24116_DISEQC_BURST]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Wait for LNB ready */</div><div class='add'>+	ret = cx24116_wait_for_lnb(fe);</div><div class='add'>+	if (ret != 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Wait for voltage/min repeat delay */</div><div class='add'>+	msleep(100);</div><div class='add'>+</div><div class='add'>+	/* Command */</div><div class='add'>+	ret = cx24116_cmd_execute(fe, &amp;state-&gt;dsec_cmd);</div><div class='add'>+	if (ret != 0)</div><div class='add'>+		return ret;</div><div class='add'>+	/*</div><div class='add'>+	 * Wait for send</div><div class='add'>+	 *</div><div class='add'>+	 * Eutelsat spec:</div><div class='add'>+	 * &gt;15ms delay          + (XXX determine if FW does this, see set_tone)</div><div class='add'>+	 *  13.5ms per byte     +</div><div class='add'>+	 * &gt;15ms delay          +</div><div class='add'>+	 *  12.5ms burst        +</div><div class='add'>+	 * &gt;15ms delay            (XXX determine if FW does this, see set_tone)</div><div class='add'>+	 */</div><div class='add'>+	msleep((state-&gt;dsec_cmd.args[CX24116_DISEQC_MSGLEN] &lt;&lt; 4) +</div><div class='add'>+		((toneburst == CX24116_DISEQC_TONEOFF) ? 30 : 60));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Send DiSEqC burst */</div><div class='add'>+static int cx24116_diseqc_send_burst(struct dvb_frontend *fe,</div><div class='add'>+	fe_sec_mini_cmd_t burst)</div><div class='add'>+{</div><div class='add'>+	struct cx24116_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	dprintk("%s(%d) toneburst=%d\n", __func__, burst, toneburst);</div><div class='add'>+</div><div class='add'>+	/* DiSEqC burst */</div><div class='add'>+	if (burst == SEC_MINI_A)</div><div class='add'>+		state-&gt;dsec_cmd.args[CX24116_DISEQC_BURST] =</div><div class='add'>+			CX24116_DISEQC_MINI_A;</div><div class='add'>+	else if (burst == SEC_MINI_B)</div><div class='add'>+		state-&gt;dsec_cmd.args[CX24116_DISEQC_BURST] =</div><div class='add'>+			CX24116_DISEQC_MINI_B;</div><div class='add'>+	else</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* DiSEqC toneburst */</div><div class='add'>+	if (toneburst != CX24116_DISEQC_MESGCACHE)</div><div class='add'>+		/* Burst is cached */</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Burst is to be sent with cached message */</div><div class='add'>+</div><div class='add'>+	/* Wait for LNB ready */</div><div class='add'>+	ret = cx24116_wait_for_lnb(fe);</div><div class='add'>+	if (ret != 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Wait for voltage/min repeat delay */</div><div class='add'>+	msleep(100);</div><div class='add'>+</div><div class='add'>+	/* Command */</div><div class='add'>+	ret = cx24116_cmd_execute(fe, &amp;state-&gt;dsec_cmd);</div><div class='add'>+	if (ret != 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Wait for send</div><div class='add'>+	 *</div><div class='add'>+	 * Eutelsat spec:</div><div class='add'>+	 * &gt;15ms delay          + (XXX determine if FW does this, see set_tone)</div><div class='add'>+	 *  13.5ms per byte     +</div><div class='add'>+	 * &gt;15ms delay          +</div><div class='add'>+	 *  12.5ms burst        +</div><div class='add'>+	 * &gt;15ms delay            (XXX determine if FW does this, see set_tone)</div><div class='add'>+	 */</div><div class='add'>+	msleep((state-&gt;dsec_cmd.args[CX24116_DISEQC_MSGLEN] &lt;&lt; 4) + 60);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cx24116_release(struct dvb_frontend *fe)</div><div class='add'>+{</div><div class='add'>+	struct cx24116_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	dprintk("%s\n", __func__);</div><div class='add'>+	kfree(state);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct dvb_frontend_ops cx24116_ops;</div><div class='add'>+</div><div class='add'>+struct dvb_frontend *cx24116_attach(const struct cx24116_config *config,</div><div class='add'>+	struct i2c_adapter *i2c)</div><div class='add'>+{</div><div class='add'>+	struct cx24116_state *state = NULL;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	dprintk("%s\n", __func__);</div><div class='add'>+</div><div class='add'>+	/* allocate memory for the internal state */</div><div class='add'>+	state = kmalloc(sizeof(struct cx24116_state), GFP_KERNEL);</div><div class='add'>+	if (state == NULL)</div><div class='add'>+		goto error1;</div><div class='add'>+</div><div class='add'>+	/* setup the state */</div><div class='add'>+	memset(state, 0, sizeof(struct cx24116_state));</div><div class='add'>+</div><div class='add'>+	state-&gt;config = config;</div><div class='add'>+	state-&gt;i2c = i2c;</div><div class='add'>+</div><div class='add'>+	/* check if the demod is present */</div><div class='add'>+	ret = (cx24116_readreg(state, 0xFF) &lt;&lt; 8) |</div><div class='add'>+		cx24116_readreg(state, 0xFE);</div><div class='add'>+	if (ret != 0x0501) {</div><div class='add'>+		printk(KERN_INFO "Invalid probe, probably not a CX24116 device\n");</div><div class='add'>+		goto error2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* create dvb_frontend */</div><div class='add'>+	memcpy(&amp;state-&gt;frontend.ops, &amp;cx24116_ops,</div><div class='add'>+		sizeof(struct dvb_frontend_ops));</div><div class='add'>+	state-&gt;frontend.demodulator_priv = state;</div><div class='add'>+	return &amp;state-&gt;frontend;</div><div class='add'>+</div><div class='add'>+error2: kfree(state);</div><div class='add'>+error1: return NULL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(cx24116_attach);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Initialise or wake up device</div><div class='add'>+ *</div><div class='add'>+ * Power config will reset and load initial firmware if required</div><div class='add'>+ */</div><div class='add'>+static int cx24116_initfe(struct dvb_frontend *fe)</div><div class='add'>+{</div><div class='add'>+	struct cx24116_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	struct cx24116_cmd cmd;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	dprintk("%s()\n", __func__);</div><div class='add'>+</div><div class='add'>+	/* Power on */</div><div class='add'>+	cx24116_writereg(state, 0xe0, 0);</div><div class='add'>+	cx24116_writereg(state, 0xe1, 0);</div><div class='add'>+	cx24116_writereg(state, 0xea, 0);</div><div class='add'>+</div><div class='add'>+	/* Firmware CMD 36: Power config */</div><div class='add'>+	cmd.args[0x00] = CMD_TUNERSLEEP;</div><div class='add'>+	cmd.args[0x01] = 0;</div><div class='add'>+	cmd.len = 0x02;</div><div class='add'>+	ret = cx24116_cmd_execute(fe, &amp;cmd);</div><div class='add'>+	if (ret != 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return cx24116_diseqc_init(fe);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Put device to sleep</div><div class='add'>+ */</div><div class='add'>+static int cx24116_sleep(struct dvb_frontend *fe)</div><div class='add'>+{</div><div class='add'>+	struct cx24116_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	struct cx24116_cmd cmd;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	dprintk("%s()\n", __func__);</div><div class='add'>+</div><div class='add'>+	/* Firmware CMD 36: Power config */</div><div class='add'>+	cmd.args[0x00] = CMD_TUNERSLEEP;</div><div class='add'>+	cmd.args[0x01] = 1;</div><div class='add'>+	cmd.len = 0x02;</div><div class='add'>+	ret = cx24116_cmd_execute(fe, &amp;cmd);</div><div class='add'>+	if (ret != 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Power off (Shutdown clocks) */</div><div class='add'>+	cx24116_writereg(state, 0xea, 0xff);</div><div class='add'>+	cx24116_writereg(state, 0xe1, 1);</div><div class='add'>+	cx24116_writereg(state, 0xe0, 1);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cx24116_set_property(struct dvb_frontend *fe,</div><div class='add'>+	struct dtv_property *tvp)</div><div class='add'>+{</div><div class='add'>+	dprintk("%s(..)\n", __func__);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cx24116_get_property(struct dvb_frontend *fe,</div><div class='add'>+	struct dtv_property *tvp)</div><div class='add'>+{</div><div class='add'>+	dprintk("%s(..)\n", __func__);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* dvb-core told us to tune, the tv property cache will be complete,</div><div class='add'>+ * it's safe for is to pull values and use them for tuning purposes.</div><div class='add'>+ */</div><div class='add'>+static int cx24116_set_frontend(struct dvb_frontend *fe,</div><div class='add'>+	struct dvb_frontend_parameters *p)</div><div class='add'>+{</div><div class='add'>+	struct cx24116_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='add'>+	struct cx24116_cmd cmd;</div><div class='add'>+	fe_status_t tunerstat;</div><div class='add'>+	int i, status, ret, retune;</div><div class='add'>+</div><div class='add'>+	dprintk("%s()\n", __func__);</div><div class='add'>+</div><div class='add'>+	switch (c-&gt;delivery_system) {</div><div class='add'>+	case SYS_DVBS:</div><div class='add'>+		dprintk("%s: DVB-S delivery system selected\n", __func__);</div><div class='add'>+</div><div class='add'>+		/* Only QPSK is supported for DVB-S */</div><div class='add'>+		if (c-&gt;modulation != QPSK) {</div><div class='add'>+			dprintk("%s: unsupported modulation selected (%d)\n",</div><div class='add'>+				__func__, c-&gt;modulation);</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Pilot doesn't exist in DVB-S, turn bit off */</div><div class='add'>+		state-&gt;dnxt.pilot_val = CX24116_PILOT_OFF;</div><div class='add'>+		retune = 1;</div><div class='add'>+</div><div class='add'>+		/* DVB-S only supports 0.35 */</div><div class='add'>+		if (c-&gt;rolloff != ROLLOFF_35) {</div><div class='add'>+			dprintk("%s: unsupported rolloff selected (%d)\n",</div><div class='add'>+				__func__, c-&gt;rolloff);</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		}</div><div class='add'>+		state-&gt;dnxt.rolloff_val = CX24116_ROLLOFF_035;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case SYS_DVBS2:</div><div class='add'>+		dprintk("%s: DVB-S2 delivery system selected\n", __func__);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * NBC 8PSK/QPSK with DVB-S is supported for DVB-S2,</div><div class='add'>+		 * but not hardware auto detection</div><div class='add'>+		 */</div><div class='add'>+		if (c-&gt;modulation != PSK_8 &amp;&amp; c-&gt;modulation != QPSK) {</div><div class='add'>+			dprintk("%s: unsupported modulation selected (%d)\n",</div><div class='add'>+				__func__, c-&gt;modulation);</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		switch (c-&gt;pilot) {</div><div class='add'>+		case PILOT_AUTO:	/* Not supported but emulated */</div><div class='add'>+			state-&gt;dnxt.pilot_val = (c-&gt;modulation == QPSK)</div><div class='add'>+				? CX24116_PILOT_OFF : CX24116_PILOT_ON;</div><div class='add'>+			retune = 2;</div><div class='add'>+			break;</div><div class='add'>+		case PILOT_OFF:</div><div class='add'>+			state-&gt;dnxt.pilot_val = CX24116_PILOT_OFF;</div><div class='add'>+			break;</div><div class='add'>+		case PILOT_ON:</div><div class='add'>+			state-&gt;dnxt.pilot_val = CX24116_PILOT_ON;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			dprintk("%s: unsupported pilot mode selected (%d)\n",</div><div class='add'>+				__func__, c-&gt;pilot);</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		switch (c-&gt;rolloff) {</div><div class='add'>+		case ROLLOFF_20:</div><div class='add'>+			state-&gt;dnxt.rolloff_val = CX24116_ROLLOFF_020;</div><div class='add'>+			break;</div><div class='add'>+		case ROLLOFF_25:</div><div class='add'>+			state-&gt;dnxt.rolloff_val = CX24116_ROLLOFF_025;</div><div class='add'>+			break;</div><div class='add'>+		case ROLLOFF_35:</div><div class='add'>+			state-&gt;dnxt.rolloff_val = CX24116_ROLLOFF_035;</div><div class='add'>+			break;</div><div class='add'>+		case ROLLOFF_AUTO:	/* Rolloff must be explicit */</div><div class='add'>+		default:</div><div class='add'>+			dprintk("%s: unsupported rolloff selected (%d)\n",</div><div class='add'>+				__func__, c-&gt;rolloff);</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		dprintk("%s: unsupported delivery system selected (%d)\n",</div><div class='add'>+			__func__, c-&gt;delivery_system);</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+	state-&gt;dnxt.modulation = c-&gt;modulation;</div><div class='add'>+	state-&gt;dnxt.frequency = c-&gt;frequency;</div><div class='add'>+	state-&gt;dnxt.pilot = c-&gt;pilot;</div><div class='add'>+	state-&gt;dnxt.rolloff = c-&gt;rolloff;</div><div class='add'>+</div><div class='add'>+	ret = cx24116_set_inversion(state, c-&gt;inversion);</div><div class='add'>+	if (ret !=  0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* FEC_NONE/AUTO for DVB-S2 is not supported and detected here */</div><div class='add'>+	ret = cx24116_set_fec(state, c-&gt;modulation, c-&gt;fec_inner);</div><div class='add'>+	if (ret !=  0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = cx24116_set_symbolrate(state, c-&gt;symbol_rate);</div><div class='add'>+	if (ret !=  0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* discard the 'current' tuning parameters and prepare to tune */</div><div class='add'>+	cx24116_clone_params(fe);</div><div class='add'>+</div><div class='add'>+	dprintk("%s:   modulation  = %d\n", __func__, state-&gt;dcur.modulation);</div><div class='add'>+	dprintk("%s:   frequency   = %d\n", __func__, state-&gt;dcur.frequency);</div><div class='add'>+	dprintk("%s:   pilot       = %d (val = 0x%02x)\n", __func__,</div><div class='add'>+		state-&gt;dcur.pilot, state-&gt;dcur.pilot_val);</div><div class='add'>+	dprintk("%s:   retune      = %d\n", __func__, retune);</div><div class='add'>+	dprintk("%s:   rolloff     = %d (val = 0x%02x)\n", __func__,</div><div class='add'>+		state-&gt;dcur.rolloff, state-&gt;dcur.rolloff_val);</div><div class='add'>+	dprintk("%s:   symbol_rate = %d\n", __func__, state-&gt;dcur.symbol_rate);</div><div class='add'>+	dprintk("%s:   FEC         = %d (mask/val = 0x%02x/0x%02x)\n", __func__,</div><div class='add'>+		state-&gt;dcur.fec, state-&gt;dcur.fec_mask, state-&gt;dcur.fec_val);</div><div class='add'>+	dprintk("%s:   Inversion   = %d (val = 0x%02x)\n", __func__,</div><div class='add'>+		state-&gt;dcur.inversion, state-&gt;dcur.inversion_val);</div><div class='add'>+</div><div class='add'>+	/* This is also done in advise/acquire on HVR4000 but not on LITE */</div><div class='add'>+	if (state-&gt;config-&gt;set_ts_params)</div><div class='add'>+		state-&gt;config-&gt;set_ts_params(fe, 0);</div><div class='add'>+</div><div class='add'>+	/* Set/Reset B/W */</div><div class='add'>+	cmd.args[0x00] = CMD_BANDWIDTH;</div><div class='add'>+	cmd.args[0x01] = 0x01;</div><div class='add'>+	cmd.len = 0x02;</div><div class='add'>+	ret = cx24116_cmd_execute(fe, &amp;cmd);</div><div class='add'>+	if (ret != 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Prepare a tune request */</div><div class='add'>+	cmd.args[0x00] = CMD_TUNEREQUEST;</div><div class='add'>+</div><div class='add'>+	/* Frequency */</div><div class='add'>+	cmd.args[0x01] = (state-&gt;dcur.frequency &amp; 0xff0000) &gt;&gt; 16;</div><div class='add'>+	cmd.args[0x02] = (state-&gt;dcur.frequency &amp; 0x00ff00) &gt;&gt; 8;</div><div class='add'>+	cmd.args[0x03] = (state-&gt;dcur.frequency &amp; 0x0000ff);</div><div class='add'>+</div><div class='add'>+	/* Symbol Rate */</div><div class='add'>+	cmd.args[0x04] = ((state-&gt;dcur.symbol_rate / 1000) &amp; 0xff00) &gt;&gt; 8;</div><div class='add'>+	cmd.args[0x05] = ((state-&gt;dcur.symbol_rate / 1000) &amp; 0x00ff);</div><div class='add'>+</div><div class='add'>+	/* Automatic Inversion */</div><div class='add'>+	cmd.args[0x06] = state-&gt;dcur.inversion_val;</div><div class='add'>+</div><div class='add'>+	/* Modulation / FEC / Pilot */</div><div class='add'>+	cmd.args[0x07] = state-&gt;dcur.fec_val | state-&gt;dcur.pilot_val;</div><div class='add'>+</div><div class='add'>+	cmd.args[0x08] = CX24116_SEARCH_RANGE_KHZ &gt;&gt; 8;</div><div class='add'>+	cmd.args[0x09] = CX24116_SEARCH_RANGE_KHZ &amp; 0xff;</div><div class='add'>+	cmd.args[0x0a] = 0x00;</div><div class='add'>+	cmd.args[0x0b] = 0x00;</div><div class='add'>+	cmd.args[0x0c] = state-&gt;dcur.rolloff_val;</div><div class='add'>+	cmd.args[0x0d] = state-&gt;dcur.fec_mask;</div><div class='add'>+</div><div class='add'>+	if (state-&gt;dcur.symbol_rate &gt; 30000000) {</div><div class='add'>+		cmd.args[0x0e] = 0x04;</div><div class='add'>+		cmd.args[0x0f] = 0x00;</div><div class='add'>+		cmd.args[0x10] = 0x01;</div><div class='add'>+		cmd.args[0x11] = 0x77;</div><div class='add'>+		cmd.args[0x12] = 0x36;</div><div class='add'>+		cx24116_writereg(state, CX24116_REG_CLKDIV, 0x44);</div><div class='add'>+		cx24116_writereg(state, CX24116_REG_RATEDIV, 0x01);</div><div class='add'>+	} else {</div><div class='add'>+		cmd.args[0x0e] = 0x06;</div><div class='add'>+		cmd.args[0x0f] = 0x00;</div><div class='add'>+		cmd.args[0x10] = 0x00;</div><div class='add'>+		cmd.args[0x11] = 0xFA;</div><div class='add'>+		cmd.args[0x12] = 0x24;</div><div class='add'>+		cx24116_writereg(state, CX24116_REG_CLKDIV, 0x46);</div><div class='add'>+		cx24116_writereg(state, CX24116_REG_RATEDIV, 0x00);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cmd.len = 0x13;</div><div class='add'>+</div><div class='add'>+	/* We need to support pilot and non-pilot tuning in the</div><div class='add'>+	 * driver automatically. This is a workaround for because</div><div class='add'>+	 * the demod does not support autodetect.</div><div class='add'>+	 */</div><div class='add'>+	do {</div><div class='add'>+		/* Reset status register */</div><div class='add'>+		status = cx24116_readreg(state, CX24116_REG_SSTATUS)</div><div class='add'>+			&amp; CX24116_SIGNAL_MASK;</div><div class='add'>+		cx24116_writereg(state, CX24116_REG_SSTATUS, status);</div><div class='add'>+</div><div class='add'>+		/* Tune */</div><div class='add'>+		ret = cx24116_cmd_execute(fe, &amp;cmd);</div><div class='add'>+		if (ret != 0)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Wait for up to 500 ms before retrying</div><div class='add'>+		 *</div><div class='add'>+		 * If we are able to tune then generally it occurs within 100ms.</div><div class='add'>+		 * If it takes longer, try a different toneburst setting.</div><div class='add'>+		 */</div><div class='add'>+		for (i = 0; i &lt; 50 ; i++) {</div><div class='add'>+			cx24116_read_status(fe, &amp;tunerstat);</div><div class='add'>+			status = tunerstat &amp; (FE_HAS_SIGNAL | FE_HAS_SYNC);</div><div class='add'>+			if (status == (FE_HAS_SIGNAL | FE_HAS_SYNC)) {</div><div class='add'>+				dprintk("%s: Tuned\n", __func__);</div><div class='add'>+				goto tuned;</div><div class='add'>+			}</div><div class='add'>+			msleep(10);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		dprintk("%s: Not tuned\n", __func__);</div><div class='add'>+</div><div class='add'>+		/* Toggle pilot bit when in auto-pilot */</div><div class='add'>+		if (state-&gt;dcur.pilot == PILOT_AUTO)</div><div class='add'>+			cmd.args[0x07] ^= CX24116_PILOT_ON;</div><div class='add'>+	} while (--retune);</div><div class='add'>+</div><div class='add'>+tuned:  /* Set/Reset B/W */</div><div class='add'>+	cmd.args[0x00] = CMD_BANDWIDTH;</div><div class='add'>+	cmd.args[0x01] = 0x00;</div><div class='add'>+	cmd.len = 0x02;</div><div class='add'>+	ret = cx24116_cmd_execute(fe, &amp;cmd);</div><div class='add'>+	if (ret != 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct dvb_frontend_ops cx24116_ops = {</div><div class='add'>+</div><div class='add'>+	.info = {</div><div class='add'>+		.name = "Conexant CX24116/CX24118",</div><div class='add'>+		.type = FE_QPSK,</div><div class='add'>+		.frequency_min = 950000,</div><div class='add'>+		.frequency_max = 2150000,</div><div class='add'>+		.frequency_stepsize = 1011, /* kHz for QPSK frontends */</div><div class='add'>+		.frequency_tolerance = 5000,</div><div class='add'>+		.symbol_rate_min = 1000000,</div><div class='add'>+		.symbol_rate_max = 45000000,</div><div class='add'>+		.caps = FE_CAN_INVERSION_AUTO |</div><div class='add'>+			FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |</div><div class='add'>+			FE_CAN_FEC_4_5 | FE_CAN_FEC_5_6 | FE_CAN_FEC_6_7 |</div><div class='add'>+			FE_CAN_FEC_7_8 | FE_CAN_FEC_AUTO |</div><div class='add'>+			FE_CAN_QPSK | FE_CAN_RECOVER</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	.release = cx24116_release,</div><div class='add'>+</div><div class='add'>+	.init = cx24116_initfe,</div><div class='add'>+	.sleep = cx24116_sleep,</div><div class='add'>+	.read_status = cx24116_read_status,</div><div class='add'>+	.read_ber = cx24116_read_ber,</div><div class='add'>+	.read_signal_strength = cx24116_read_signal_strength,</div><div class='add'>+	.read_snr = cx24116_read_snr,</div><div class='add'>+	.read_ucblocks = cx24116_read_ucblocks,</div><div class='add'>+	.set_tone = cx24116_set_tone,</div><div class='add'>+	.set_voltage = cx24116_set_voltage,</div><div class='add'>+	.diseqc_send_master_cmd = cx24116_send_diseqc_msg,</div><div class='add'>+	.diseqc_send_burst = cx24116_diseqc_send_burst,</div><div class='add'>+</div><div class='add'>+	.set_property = cx24116_set_property,</div><div class='add'>+	.get_property = cx24116_get_property,</div><div class='add'>+	.set_frontend = cx24116_set_frontend,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("DVB Frontend module for Conexant cx24116/cx24118 hardware");</div><div class='add'>+MODULE_AUTHOR("Steven Toth");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='head'>diff --git a/drivers/media/dvb/frontends/cx24116.h b/drivers/media/dvb/frontends/cx24116.h<br/>new file mode 100644<br/>index 000000000000..4cb3ddd6c626<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/frontends/cx24116.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/cx24116.h</a></div><div class='hunk'>@@ -0,0 +1,54 @@</div><div class='add'>+/*</div><div class='add'>+    Conexant cx24116/cx24118 - DVBS/S2 Satellite demod/tuner driver</div><div class='add'>+</div><div class='add'>+    Copyright (C) 2006 Steven Toth &lt;stoth@linuxtv.com&gt;</div><div class='add'>+</div><div class='add'>+    This program is free software; you can redistribute it and/or modify</div><div class='add'>+    it under the terms of the GNU General Public License as published by</div><div class='add'>+    the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+    (at your option) any later version.</div><div class='add'>+</div><div class='add'>+    This program is distributed in the hope that it will be useful,</div><div class='add'>+    but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+    GNU General Public License for more details.</div><div class='add'>+</div><div class='add'>+    You should have received a copy of the GNU General Public License</div><div class='add'>+    along with this program; if not, write to the Free Software</div><div class='add'>+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#ifndef CX24116_H</div><div class='add'>+#define CX24116_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/dvb/frontend.h&gt;</div><div class='add'>+</div><div class='add'>+struct cx24116_config {</div><div class='add'>+	/* the demodulator's i2c address */</div><div class='add'>+	u8 demod_address;</div><div class='add'>+</div><div class='add'>+	/* Need to set device param for start_dma */</div><div class='add'>+	int (*set_ts_params)(struct dvb_frontend *fe, int is_punctured);</div><div class='add'>+</div><div class='add'>+	/* Need to reset device during firmware loading */</div><div class='add'>+	int (*reset_device)(struct dvb_frontend *fe);</div><div class='add'>+</div><div class='add'>+	/* Need to set MPEG parameters */</div><div class='add'>+	u8 mpg_clk_pos_pol:0x02;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_DVB_CX24116) || defined(CONFIG_DVB_CX24116_MODULE)</div><div class='add'>+extern struct dvb_frontend *cx24116_attach(</div><div class='add'>+	const struct cx24116_config *config,</div><div class='add'>+	struct i2c_adapter *i2c);</div><div class='add'>+#else</div><div class='add'>+static inline struct dvb_frontend *cx24116_attach(</div><div class='add'>+	const struct cx24116_config *config,</div><div class='add'>+	struct i2c_adapter *i2c)</div><div class='add'>+{</div><div class='add'>+	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif /* CX24116_H */</div><div class='head'>diff --git a/drivers/media/dvb/frontends/cx24123.c b/drivers/media/dvb/frontends/cx24123.c<br/>index 7156157cb34b..1a8c36f76061 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/frontends/cx24123.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/dvb/frontends/cx24123.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/frontends/cx24123.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/cx24123.c</a></div><div class='hunk'>@@ -33,7 +33,13 @@</div><div class='ctx'> #define XTAL 10111000</div><div class='ctx'> </div><div class='ctx'> static int force_band;</div><div class='add'>+module_param(force_band, int, 0644);</div><div class='add'>+MODULE_PARM_DESC(force_band, "Force a specific band select "\</div><div class='add'>+	"(1-9, default:off).");</div><div class='add'>+</div><div class='ctx'> static int debug;</div><div class='add'>+module_param(debug, int, 0644);</div><div class='add'>+MODULE_PARM_DESC(debug, "Activates frontend debugging (default:0)");</div><div class='ctx'> </div><div class='ctx'> #define info(args...) do { printk(KERN_INFO "CX24123: " args); } while (0)</div><div class='ctx'> #define err(args...)  do { printk(KERN_ERR  "CX24123: " args); } while (0)</div><div class='hunk'>@@ -46,10 +52,9 @@ static int debug;</div><div class='ctx'> 		} \</div><div class='ctx'> 	} while (0)</div><div class='ctx'> </div><div class='del'>-struct cx24123_state</div><div class='del'>-{</div><div class='del'>-	struct i2c_adapter* i2c;</div><div class='del'>-	const struct cx24123_config* config;</div><div class='add'>+struct cx24123_state {</div><div class='add'>+	struct i2c_adapter *i2c;</div><div class='add'>+	const struct cx24123_config *config;</div><div class='ctx'> </div><div class='ctx'> 	struct dvb_frontend frontend;</div><div class='ctx'> </div><div class='hunk'>@@ -70,8 +75,7 @@ struct cx24123_state</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Various tuner defaults need to be established for a given symbol rate Sps */</div><div class='del'>-static struct</div><div class='del'>-{</div><div class='add'>+static struct cx24123_AGC_val {</div><div class='ctx'> 	u32 symbolrate_low;</div><div class='ctx'> 	u32 symbolrate_high;</div><div class='ctx'> 	u32 VCAprogdata;</div><div class='hunk'>@@ -109,8 +113,7 @@ static struct</div><div class='ctx'>  * fixme: The bounds on the bands do not match the doc in real life.</div><div class='ctx'>  * fixme: Some of them have been moved, other might need adjustment.</div><div class='ctx'>  */</div><div class='del'>-static struct</div><div class='del'>-{</div><div class='add'>+static struct cx24123_bandselect_val {</div><div class='ctx'> 	u32 freq_low;</div><div class='ctx'> 	u32 freq_high;</div><div class='ctx'> 	u32 VCOdivider;</div><div class='hunk'>@@ -249,7 +252,8 @@ static int cx24123_i2c_writereg(struct cx24123_state *state,</div><div class='ctx'> </div><div class='ctx'> 	/* printk(KERN_DEBUG "wr(%02x): %02x %02x\n", i2c_addr, reg, data); */</div><div class='ctx'> </div><div class='del'>-	if ((err = i2c_transfer(state-&gt;i2c, &amp;msg, 1)) != 1) {</div><div class='add'>+	err = i2c_transfer(state-&gt;i2c, &amp;msg, 1);</div><div class='add'>+	if (err != 1) {</div><div class='ctx'> 		printk("%s: writereg error(err == %i, reg == 0x%02x,"</div><div class='ctx'> 			 " data == 0x%02x)\n", __func__, err, reg, data);</div><div class='ctx'> 		return err;</div><div class='hunk'>@@ -284,7 +288,8 @@ static int cx24123_i2c_readreg(struct cx24123_state *state, u8 i2c_addr, u8 reg)</div><div class='ctx'> #define cx24123_writereg(state, reg, val) \</div><div class='ctx'> 	cx24123_i2c_writereg(state, state-&gt;config-&gt;demod_address, reg, val)</div><div class='ctx'> </div><div class='del'>-static int cx24123_set_inversion(struct cx24123_state* state, fe_spectral_inversion_t inversion)</div><div class='add'>+static int cx24123_set_inversion(struct cx24123_state *state,</div><div class='add'>+	fe_spectral_inversion_t inversion)</div><div class='ctx'> {</div><div class='ctx'> 	u8 nom_reg = cx24123_readreg(state, 0x0e);</div><div class='ctx'> 	u8 auto_reg = cx24123_readreg(state, 0x10);</div><div class='hunk'>@@ -311,7 +316,8 @@ static int cx24123_set_inversion(struct cx24123_state* state, fe_spectral_invers</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cx24123_get_inversion(struct cx24123_state* state, fe_spectral_inversion_t *inversion)</div><div class='add'>+static int cx24123_get_inversion(struct cx24123_state *state,</div><div class='add'>+	fe_spectral_inversion_t *inversion)</div><div class='ctx'> {</div><div class='ctx'> 	u8 val;</div><div class='ctx'> </div><div class='hunk'>@@ -328,18 +334,20 @@ static int cx24123_get_inversion(struct cx24123_state* state, fe_spectral_invers</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cx24123_set_fec(struct cx24123_state* state, fe_code_rate_t fec)</div><div class='add'>+static int cx24123_set_fec(struct cx24123_state *state, fe_code_rate_t fec)</div><div class='ctx'> {</div><div class='ctx'> 	u8 nom_reg = cx24123_readreg(state, 0x0e) &amp; ~0x07;</div><div class='ctx'> </div><div class='del'>-	if ( (fec &lt; FEC_NONE) || (fec &gt; FEC_AUTO) )</div><div class='add'>+	if ((fec &lt; FEC_NONE) || (fec &gt; FEC_AUTO))</div><div class='ctx'> 		fec = FEC_AUTO;</div><div class='ctx'> </div><div class='ctx'> 	/* Set the soft decision threshold */</div><div class='del'>-	if(fec == FEC_1_2)</div><div class='del'>-		cx24123_writereg(state, 0x43, cx24123_readreg(state, 0x43) | 0x01);</div><div class='add'>+	if (fec == FEC_1_2)</div><div class='add'>+		cx24123_writereg(state, 0x43,</div><div class='add'>+			cx24123_readreg(state, 0x43) | 0x01);</div><div class='ctx'> 	else</div><div class='del'>-		cx24123_writereg(state, 0x43, cx24123_readreg(state, 0x43) &amp; ~0x01);</div><div class='add'>+		cx24123_writereg(state, 0x43,</div><div class='add'>+			cx24123_readreg(state, 0x43) &amp; ~0x01);</div><div class='ctx'> </div><div class='ctx'> 	switch (fec) {</div><div class='ctx'> 	case FEC_1_2:</div><div class='hunk'>@@ -388,11 +396,11 @@ static int cx24123_set_fec(struct cx24123_state* state, fe_code_rate_t fec)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cx24123_get_fec(struct cx24123_state* state, fe_code_rate_t *fec)</div><div class='add'>+static int cx24123_get_fec(struct cx24123_state *state, fe_code_rate_t *fec)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = cx24123_readreg (state, 0x1b);</div><div class='add'>+	ret = cx24123_readreg(state, 0x1b);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	ret = ret &amp; 0x07;</div><div class='hunk'>@@ -433,16 +441,16 @@ static u32 cx24123_int_log2(u32 a, u32 b)</div><div class='ctx'> {</div><div class='ctx'> 	u32 exp, nearest = 0;</div><div class='ctx'> 	u32 div = a / b;</div><div class='del'>-	if(a % b &gt;= b / 2) ++div;</div><div class='del'>-	if(div &lt; (1 &lt;&lt; 31))</div><div class='del'>-	{</div><div class='del'>-		for(exp = 1; div &gt; exp; nearest++)</div><div class='add'>+	if (a % b &gt;= b / 2)</div><div class='add'>+		++div;</div><div class='add'>+	if (div &lt; (1 &lt;&lt; 31)) {</div><div class='add'>+		for (exp = 1; div &gt; exp; nearest++)</div><div class='ctx'> 			exp += exp;</div><div class='ctx'> 	}</div><div class='ctx'> 	return nearest;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cx24123_set_symbolrate(struct cx24123_state* state, u32 srate)</div><div class='add'>+static int cx24123_set_symbolrate(struct cx24123_state *state, u32 srate)</div><div class='ctx'> {</div><div class='ctx'> 	u32 tmp, sample_rate, ratio, sample_gain;</div><div class='ctx'> 	u8 pll_mult;</div><div class='hunk'>@@ -498,9 +506,9 @@ static int cx24123_set_symbolrate(struct cx24123_state* state, u32 srate)</div><div class='ctx'> </div><div class='ctx'> 	cx24123_writereg(state, 0x01, pll_mult * 6);</div><div class='ctx'> </div><div class='del'>-	cx24123_writereg(state, 0x08, (ratio &gt;&gt; 16) &amp; 0x3f );</div><div class='del'>-	cx24123_writereg(state, 0x09, (ratio &gt;&gt;  8) &amp; 0xff );</div><div class='del'>-	cx24123_writereg(state, 0x0a, (ratio      ) &amp; 0xff );</div><div class='add'>+	cx24123_writereg(state, 0x08, (ratio &gt;&gt; 16) &amp; 0x3f);</div><div class='add'>+	cx24123_writereg(state, 0x09, (ratio &gt;&gt; 8) &amp; 0xff);</div><div class='add'>+	cx24123_writereg(state, 0x0a, ratio &amp; 0xff);</div><div class='ctx'> </div><div class='ctx'> 	/* also set the demodulator sample gain */</div><div class='ctx'> 	sample_gain = cx24123_int_log2(sample_rate, srate);</div><div class='hunk'>@@ -514,10 +522,12 @@ static int cx24123_set_symbolrate(struct cx24123_state* state, u32 srate)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Based on the required frequency and symbolrate, the tuner AGC has to be configured</div><div class='del'>- * and the correct band selected. Calculate those values</div><div class='add'>+ * Based on the required frequency and symbolrate, the tuner AGC has</div><div class='add'>+ * to be configured and the correct band selected.</div><div class='add'>+ * Calculate those values.</div><div class='ctx'>  */</div><div class='del'>-static int cx24123_pll_calculate(struct dvb_frontend* fe, struct dvb_frontend_parameters *p)</div><div class='add'>+static int cx24123_pll_calculate(struct dvb_frontend *fe,</div><div class='add'>+	struct dvb_frontend_parameters *p)</div><div class='ctx'> {</div><div class='ctx'> 	struct cx24123_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	u32 ndiv = 0, adiv = 0, vco_div = 0;</div><div class='hunk'>@@ -525,6 +535,8 @@ static int cx24123_pll_calculate(struct dvb_frontend* fe, struct dvb_frontend_pa</div><div class='ctx'> 	int pump = 2;</div><div class='ctx'> 	int band = 0;</div><div class='ctx'> 	int num_bands = ARRAY_SIZE(cx24123_bandselect_vals);</div><div class='add'>+	struct cx24123_bandselect_val *bsv = NULL;</div><div class='add'>+	struct cx24123_AGC_val *agcv = NULL;</div><div class='ctx'> </div><div class='ctx'> 	/* Defaults for low freq, low rate */</div><div class='ctx'> 	state-&gt;VCAarg = cx24123_AGC_vals[0].VCAprogdata;</div><div class='hunk'>@@ -532,58 +544,65 @@ static int cx24123_pll_calculate(struct dvb_frontend* fe, struct dvb_frontend_pa</div><div class='ctx'> 	state-&gt;bandselectarg = cx24123_bandselect_vals[0].progdata;</div><div class='ctx'> 	vco_div = cx24123_bandselect_vals[0].VCOdivider;</div><div class='ctx'> </div><div class='del'>-	/* For the given symbol rate, determine the VCA, VGA and FILTUNE programming bits */</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(cx24123_AGC_vals); i++)</div><div class='del'>-	{</div><div class='del'>-		if ((cx24123_AGC_vals[i].symbolrate_low &lt;= p-&gt;u.qpsk.symbol_rate) &amp;&amp;</div><div class='del'>-		    (cx24123_AGC_vals[i].symbolrate_high &gt;= p-&gt;u.qpsk.symbol_rate) ) {</div><div class='del'>-			state-&gt;VCAarg = cx24123_AGC_vals[i].VCAprogdata;</div><div class='del'>-			state-&gt;VGAarg = cx24123_AGC_vals[i].VGAprogdata;</div><div class='del'>-			state-&gt;FILTune = cx24123_AGC_vals[i].FILTune;</div><div class='add'>+	/* For the given symbol rate, determine the VCA, VGA and</div><div class='add'>+	 * FILTUNE programming bits */</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(cx24123_AGC_vals); i++) {</div><div class='add'>+		agcv = &amp;cx24123_AGC_vals[i];</div><div class='add'>+		if ((agcv-&gt;symbolrate_low &lt;= p-&gt;u.qpsk.symbol_rate) &amp;&amp;</div><div class='add'>+		    (agcv-&gt;symbolrate_high &gt;= p-&gt;u.qpsk.symbol_rate)) {</div><div class='add'>+			state-&gt;VCAarg = agcv-&gt;VCAprogdata;</div><div class='add'>+			state-&gt;VGAarg = agcv-&gt;VGAprogdata;</div><div class='add'>+			state-&gt;FILTune = agcv-&gt;FILTune;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* determine the band to use */</div><div class='del'>-	if(force_band &lt; 1 || force_band &gt; num_bands)</div><div class='del'>-	{</div><div class='del'>-		for (i = 0; i &lt; num_bands; i++)</div><div class='del'>-		{</div><div class='del'>-			if ((cx24123_bandselect_vals[i].freq_low &lt;= p-&gt;frequency) &amp;&amp;</div><div class='del'>-			    (cx24123_bandselect_vals[i].freq_high &gt;= p-&gt;frequency) )</div><div class='add'>+	if (force_band &lt; 1 || force_band &gt; num_bands) {</div><div class='add'>+		for (i = 0; i &lt; num_bands; i++) {</div><div class='add'>+			bsv = &amp;cx24123_bandselect_vals[i];</div><div class='add'>+			if ((bsv-&gt;freq_low &lt;= p-&gt;frequency) &amp;&amp;</div><div class='add'>+				(bsv-&gt;freq_high &gt;= p-&gt;frequency))</div><div class='ctx'> 				band = i;</div><div class='ctx'> 		}</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='add'>+	} else</div><div class='ctx'> 		band = force_band - 1;</div><div class='ctx'> </div><div class='ctx'> 	state-&gt;bandselectarg = cx24123_bandselect_vals[band].progdata;</div><div class='ctx'> 	vco_div = cx24123_bandselect_vals[band].VCOdivider;</div><div class='ctx'> </div><div class='ctx'> 	/* determine the charge pump current */</div><div class='del'>-	if ( p-&gt;frequency &lt; (cx24123_bandselect_vals[band].freq_low + cx24123_bandselect_vals[band].freq_high)/2 )</div><div class='add'>+	if (p-&gt;frequency &lt; (cx24123_bandselect_vals[band].freq_low +</div><div class='add'>+		cx24123_bandselect_vals[band].freq_high) / 2)</div><div class='ctx'> 		pump = 0x01;</div><div class='ctx'> 	else</div><div class='ctx'> 		pump = 0x02;</div><div class='ctx'> </div><div class='ctx'> 	/* Determine the N/A dividers for the requested lband freq (in kHz). */</div><div class='del'>-	/* Note: the reference divider R=10, frequency is in KHz, XTAL is in Hz */</div><div class='del'>-	ndiv = ( ((p-&gt;frequency * vco_div * 10) / (2 * XTAL / 1000)) / 32) &amp; 0x1ff;</div><div class='del'>-	adiv = ( ((p-&gt;frequency * vco_div * 10) / (2 * XTAL / 1000)) % 32) &amp; 0x1f;</div><div class='add'>+	/* Note: the reference divider R=10, frequency is in KHz,</div><div class='add'>+	 * XTAL is in Hz */</div><div class='add'>+	ndiv = (((p-&gt;frequency * vco_div * 10) /</div><div class='add'>+		(2 * XTAL / 1000)) / 32) &amp; 0x1ff;</div><div class='add'>+	adiv = (((p-&gt;frequency * vco_div * 10) /</div><div class='add'>+		(2 * XTAL / 1000)) % 32) &amp; 0x1f;</div><div class='ctx'> </div><div class='ctx'> 	if (adiv == 0 &amp;&amp; ndiv &gt; 0)</div><div class='ctx'> 		ndiv--;</div><div class='ctx'> </div><div class='del'>-	/* control bits 11, refdiv 11, charge pump polarity 1, charge pump current, ndiv, adiv */</div><div class='del'>-	state-&gt;pllarg = (3 &lt;&lt; 19) | (3 &lt;&lt; 17) | (1 &lt;&lt; 16) | (pump &lt;&lt; 14) | (ndiv &lt;&lt; 5) | adiv;</div><div class='add'>+	/* control bits 11, refdiv 11, charge pump polarity 1,</div><div class='add'>+	 * charge pump current, ndiv, adiv */</div><div class='add'>+	state-&gt;pllarg = (3 &lt;&lt; 19) | (3 &lt;&lt; 17) | (1 &lt;&lt; 16) |</div><div class='add'>+		(pump &lt;&lt; 14) | (ndiv &lt;&lt; 5) | adiv;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Tuner data is 21 bits long, must be left-aligned in data.</div><div class='del'>- * Tuner cx24109 is written through a dedicated 3wire interface on the demod chip.</div><div class='add'>+ * Tuner cx24109 is written through a dedicated 3wire interface</div><div class='add'>+ * on the demod chip.</div><div class='ctx'>  */</div><div class='del'>-static int cx24123_pll_writereg(struct dvb_frontend* fe, struct dvb_frontend_parameters *p, u32 data)</div><div class='add'>+static int cx24123_pll_writereg(struct dvb_frontend *fe,</div><div class='add'>+	struct dvb_frontend_parameters *p, u32 data)</div><div class='ctx'> {</div><div class='ctx'> 	struct cx24123_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	unsigned long timeout;</div><div class='hunk'>@@ -610,7 +629,7 @@ static int cx24123_pll_writereg(struct dvb_frontend* fe, struct dvb_frontend_par</div><div class='ctx'> </div><div class='ctx'> 	/* send another 8 bytes, wait for the send to be completed */</div><div class='ctx'> 	timeout = jiffies + msecs_to_jiffies(40);</div><div class='del'>-	cx24123_writereg(state, 0x22, (data&gt;&gt;8) &amp; 0xff );</div><div class='add'>+	cx24123_writereg(state, 0x22, (data &gt;&gt; 8) &amp; 0xff);</div><div class='ctx'> 	while ((cx24123_readreg(state, 0x20) &amp; 0x40) == 0) {</div><div class='ctx'> 		if (time_after(jiffies, timeout)) {</div><div class='ctx'> 			err("%s:  demodulator is not responding, "\</div><div class='hunk'>@@ -620,9 +639,10 @@ static int cx24123_pll_writereg(struct dvb_frontend* fe, struct dvb_frontend_par</div><div class='ctx'> 		msleep(10);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* send the lower 5 bits of this byte, padded with 3 LBB, wait for the send to be completed */</div><div class='add'>+	/* send the lower 5 bits of this byte, padded with 3 LBB,</div><div class='add'>+	 * wait for the send to be completed */</div><div class='ctx'> 	timeout = jiffies + msecs_to_jiffies(40);</div><div class='del'>-	cx24123_writereg(state, 0x22, (data) &amp; 0xff );</div><div class='add'>+	cx24123_writereg(state, 0x22, (data) &amp; 0xff);</div><div class='ctx'> 	while ((cx24123_readreg(state, 0x20) &amp; 0x80)) {</div><div class='ctx'> 		if (time_after(jiffies, timeout)) {</div><div class='ctx'> 			err("%s:  demodulator is not responding," \</div><div class='hunk'>@@ -639,7 +659,8 @@ static int cx24123_pll_writereg(struct dvb_frontend* fe, struct dvb_frontend_par</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cx24123_pll_tune(struct dvb_frontend* fe, struct dvb_frontend_parameters *p)</div><div class='add'>+static int cx24123_pll_tune(struct dvb_frontend *fe,</div><div class='add'>+	struct dvb_frontend_parameters *p)</div><div class='ctx'> {</div><div class='ctx'> 	struct cx24123_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	u8 val;</div><div class='hunk'>@@ -690,7 +711,7 @@ static int cx24123_repeater_mode(struct cx24123_state *state, u8 mode, u8 start)</div><div class='ctx'> 	return cx24123_writereg(state, 0x23, r);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cx24123_initfe(struct dvb_frontend* fe)</div><div class='add'>+static int cx24123_initfe(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct cx24123_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -699,19 +720,22 @@ static int cx24123_initfe(struct dvb_frontend* fe)</div><div class='ctx'> </div><div class='ctx'> 	/* Configure the demod to a good set of defaults */</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(cx24123_regdata); i++)</div><div class='del'>-		cx24123_writereg(state, cx24123_regdata[i].reg, cx24123_regdata[i].data);</div><div class='add'>+		cx24123_writereg(state, cx24123_regdata[i].reg,</div><div class='add'>+			cx24123_regdata[i].data);</div><div class='ctx'> </div><div class='ctx'> 	/* Set the LNB polarity */</div><div class='del'>-	if(state-&gt;config-&gt;lnb_polarity)</div><div class='del'>-		cx24123_writereg(state, 0x32, cx24123_readreg(state, 0x32) | 0x02);</div><div class='add'>+	if (state-&gt;config-&gt;lnb_polarity)</div><div class='add'>+		cx24123_writereg(state, 0x32,</div><div class='add'>+			cx24123_readreg(state, 0x32) | 0x02);</div><div class='ctx'> </div><div class='ctx'> 	if (state-&gt;config-&gt;dont_use_pll)</div><div class='del'>-	cx24123_repeater_mode(state, 1, 0);</div><div class='add'>+		cx24123_repeater_mode(state, 1, 0);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cx24123_set_voltage(struct dvb_frontend* fe, fe_sec_voltage_t voltage)</div><div class='add'>+static int cx24123_set_voltage(struct dvb_frontend *fe,</div><div class='add'>+	fe_sec_voltage_t voltage)</div><div class='ctx'> {</div><div class='ctx'> 	struct cx24123_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	u8 val;</div><div class='hunk'>@@ -740,7 +764,7 @@ static void cx24123_wait_for_diseqc(struct cx24123_state *state)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long timeout = jiffies + msecs_to_jiffies(200);</div><div class='ctx'> 	while (!(cx24123_readreg(state, 0x29) &amp; 0x40)) {</div><div class='del'>-		if(time_after(jiffies, timeout)) {</div><div class='add'>+		if (time_after(jiffies, timeout)) {</div><div class='ctx'> 			err("%s: diseqc queue not ready, " \</div><div class='ctx'> 				"command may be lost.\n", __func__);</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -749,7 +773,8 @@ static void cx24123_wait_for_diseqc(struct cx24123_state *state)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cx24123_send_diseqc_msg(struct dvb_frontend* fe, struct dvb_diseqc_master_cmd *cmd)</div><div class='add'>+static int cx24123_send_diseqc_msg(struct dvb_frontend *fe,</div><div class='add'>+	struct dvb_diseqc_master_cmd *cmd)</div><div class='ctx'> {</div><div class='ctx'> 	struct cx24123_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	int i, val, tone;</div><div class='hunk'>@@ -771,20 +796,21 @@ static int cx24123_send_diseqc_msg(struct dvb_frontend* fe, struct dvb_diseqc_ma</div><div class='ctx'> 		cx24123_writereg(state, 0x2C + i, cmd-&gt;msg[i]);</div><div class='ctx'> </div><div class='ctx'> 	val = cx24123_readreg(state, 0x29);</div><div class='del'>-	cx24123_writereg(state, 0x29, ((val &amp; 0x90) | 0x40) | ((cmd-&gt;msg_len-3) &amp; 3));</div><div class='add'>+	cx24123_writereg(state, 0x29, ((val &amp; 0x90) | 0x40) |</div><div class='add'>+		((cmd-&gt;msg_len-3) &amp; 3));</div><div class='ctx'> </div><div class='ctx'> 	/* wait for diseqc message to finish sending */</div><div class='ctx'> 	cx24123_wait_for_diseqc(state);</div><div class='ctx'> </div><div class='ctx'> 	/* restart continuous tone if enabled */</div><div class='del'>-	if (tone &amp; 0x10) {</div><div class='add'>+	if (tone &amp; 0x10)</div><div class='ctx'> 		cx24123_writereg(state, 0x29, tone &amp; ~0x40);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cx24123_diseqc_send_burst(struct dvb_frontend* fe, fe_sec_mini_cmd_t burst)</div><div class='add'>+static int cx24123_diseqc_send_burst(struct dvb_frontend *fe,</div><div class='add'>+	fe_sec_mini_cmd_t burst)</div><div class='ctx'> {</div><div class='ctx'> 	struct cx24123_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	int val, tone;</div><div class='hunk'>@@ -814,13 +840,13 @@ static int cx24123_diseqc_send_burst(struct dvb_frontend* fe, fe_sec_mini_cmd_t</div><div class='ctx'> 	cx24123_writereg(state, 0x2a, cx24123_readreg(state, 0x2a) &amp; 0xfb);</div><div class='ctx'> </div><div class='ctx'> 	/* restart continuous tone if enabled */</div><div class='del'>-	if (tone &amp; 0x10) {</div><div class='add'>+	if (tone &amp; 0x10)</div><div class='ctx'> 		cx24123_writereg(state, 0x29, tone &amp; ~0x40);</div><div class='del'>-	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cx24123_read_status(struct dvb_frontend* fe, fe_status_t* status)</div><div class='add'>+static int cx24123_read_status(struct dvb_frontend *fe, fe_status_t *status)</div><div class='ctx'> {</div><div class='ctx'> 	struct cx24123_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	int sync = cx24123_readreg(state, 0x14);</div><div class='hunk'>@@ -853,8 +879,9 @@ static int cx24123_read_status(struct dvb_frontend* fe, fe_status_t* status)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Configured to return the measurement of errors in blocks, because no UCBLOCKS value</div><div class='del'>- * is available, so this value doubles up to satisfy both measurements</div><div class='add'>+ * Configured to return the measurement of errors in blocks,</div><div class='add'>+ * because no UCBLOCKS value is available, so this value doubles up</div><div class='add'>+ * to satisfy both measurements.</div><div class='ctx'>  */</div><div class='ctx'> static int cx24123_read_ber(struct dvb_frontend *fe, u32 *ber)</div><div class='ctx'> {</div><div class='hunk'>@@ -876,7 +903,8 @@ static int cx24123_read_signal_strength(struct dvb_frontend *fe,</div><div class='ctx'> {</div><div class='ctx'> 	struct cx24123_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> </div><div class='del'>-	*signal_strength = cx24123_readreg(state, 0x3b) &lt;&lt; 8; /* larger = better */</div><div class='add'>+	/* larger = better */</div><div class='add'>+	*signal_strength = cx24123_readreg(state, 0x3b) &lt;&lt; 8;</div><div class='ctx'> </div><div class='ctx'> 	dprintk("Signal strength = %d\n", *signal_strength);</div><div class='ctx'> </div><div class='hunk'>@@ -907,7 +935,7 @@ static int cx24123_set_frontend(struct dvb_frontend *fe,</div><div class='ctx'> 	if (state-&gt;config-&gt;set_ts_params)</div><div class='ctx'> 		state-&gt;config-&gt;set_ts_params(fe, 0);</div><div class='ctx'> </div><div class='del'>-	state-&gt;currentfreq=p-&gt;frequency;</div><div class='add'>+	state-&gt;currentfreq = p-&gt;frequency;</div><div class='ctx'> 	state-&gt;currentsymbolrate = p-&gt;u.qpsk.symbol_rate;</div><div class='ctx'> </div><div class='ctx'> 	cx24123_set_inversion(state, p-&gt;inversion);</div><div class='hunk'>@@ -932,7 +960,8 @@ static int cx24123_set_frontend(struct dvb_frontend *fe,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cx24123_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *p)</div><div class='add'>+static int cx24123_get_frontend(struct dvb_frontend *fe,</div><div class='add'>+	struct dvb_frontend_parameters *p)</div><div class='ctx'> {</div><div class='ctx'> 	struct cx24123_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> </div><div class='hunk'>@@ -952,7 +981,7 @@ static int cx24123_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_par</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cx24123_set_tone(struct dvb_frontend* fe, fe_sec_tone_mode_t tone)</div><div class='add'>+static int cx24123_set_tone(struct dvb_frontend *fe, fe_sec_tone_mode_t tone)</div><div class='ctx'> {</div><div class='ctx'> 	struct cx24123_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	u8 val;</div><div class='hunk'>@@ -977,8 +1006,8 @@ static int cx24123_set_tone(struct dvb_frontend* fe, fe_sec_tone_mode_t tone)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cx24123_tune(struct dvb_frontend* fe,</div><div class='del'>-			struct dvb_frontend_parameters* params,</div><div class='add'>+static int cx24123_tune(struct dvb_frontend *fe,</div><div class='add'>+			struct dvb_frontend_parameters *params,</div><div class='ctx'> 			unsigned int mode_flags,</div><div class='ctx'> 			unsigned int *delay,</div><div class='ctx'> 			fe_status_t *status)</div><div class='hunk'>@@ -997,12 +1026,12 @@ static int cx24123_tune(struct dvb_frontend* fe,</div><div class='ctx'> </div><div class='ctx'> static int cx24123_get_algo(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='del'>-	return 1; //FE_ALGO_HW</div><div class='add'>+	return 1; /* FE_ALGO_HW */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void cx24123_release(struct dvb_frontend* fe)</div><div class='add'>+static void cx24123_release(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='del'>-	struct cx24123_state* state = fe-&gt;demodulator_priv;</div><div class='add'>+	struct cx24123_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	dprintk("\n");</div><div class='ctx'> 	i2c_del_adapter(&amp;state-&gt;tuner_i2c_adapter);</div><div class='ctx'> 	kfree(state);</div><div class='hunk'>@@ -1013,7 +1042,7 @@ static int cx24123_tuner_i2c_tuner_xfer(struct i2c_adapter *i2c_adap,</div><div class='ctx'> {</div><div class='ctx'> 	struct cx24123_state *state = i2c_get_adapdata(i2c_adap);</div><div class='ctx'> 	/* this repeater closes after the first stop */</div><div class='del'>-    cx24123_repeater_mode(state, 1, 1);</div><div class='add'>+	cx24123_repeater_mode(state, 1, 1);</div><div class='ctx'> 	return i2c_transfer(state-&gt;i2c, msg, num);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1037,8 +1066,8 @@ EXPORT_SYMBOL(cx24123_get_tuner_i2c_adapter);</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops cx24123_ops;</div><div class='ctx'> </div><div class='del'>-struct dvb_frontend* cx24123_attach(const struct cx24123_config* config,</div><div class='del'>-				    struct i2c_adapter* i2c)</div><div class='add'>+struct dvb_frontend *cx24123_attach(const struct cx24123_config *config,</div><div class='add'>+				    struct i2c_adapter *i2c)</div><div class='ctx'> {</div><div class='ctx'> 	struct cx24123_state *state =</div><div class='ctx'> 		kzalloc(sizeof(struct cx24123_state), GFP_KERNEL);</div><div class='hunk'>@@ -1057,20 +1086,25 @@ struct dvb_frontend* cx24123_attach(const struct cx24123_config* config,</div><div class='ctx'> 	/* check if the demod is there */</div><div class='ctx'> 	state-&gt;demod_rev = cx24123_readreg(state, 0x00);</div><div class='ctx'> 	switch (state-&gt;demod_rev) {</div><div class='del'>-	case 0xe1: info("detected CX24123C\n"); break;</div><div class='del'>-	case 0xd1: info("detected CX24123\n"); break;</div><div class='add'>+	case 0xe1:</div><div class='add'>+		info("detected CX24123C\n");</div><div class='add'>+		break;</div><div class='add'>+	case 0xd1:</div><div class='add'>+		info("detected CX24123\n");</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		err("wrong demod revision: %x\n", state-&gt;demod_rev);</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* create dvb_frontend */</div><div class='del'>-	memcpy(&amp;state-&gt;frontend.ops, &amp;cx24123_ops, sizeof(struct dvb_frontend_ops));</div><div class='add'>+	memcpy(&amp;state-&gt;frontend.ops, &amp;cx24123_ops,</div><div class='add'>+		sizeof(struct dvb_frontend_ops));</div><div class='ctx'> 	state-&gt;frontend.demodulator_priv = state;</div><div class='ctx'> </div><div class='del'>-    /* create tuner i2c adapter */</div><div class='del'>-    if (config-&gt;dont_use_pll)</div><div class='del'>-	cx24123_repeater_mode(state, 1, 0);</div><div class='add'>+	/* create tuner i2c adapter */</div><div class='add'>+	if (config-&gt;dont_use_pll)</div><div class='add'>+		cx24123_repeater_mode(state, 1, 0);</div><div class='ctx'> </div><div class='ctx'> 	strlcpy(state-&gt;tuner_i2c_adapter.name, "CX24123 tuner I2C bus",</div><div class='ctx'> 		sizeof(state-&gt;tuner_i2c_adapter.name));</div><div class='hunk'>@@ -1079,7 +1113,7 @@ struct dvb_frontend* cx24123_attach(const struct cx24123_config* config,</div><div class='ctx'> 	state-&gt;tuner_i2c_adapter.algo_data = NULL;</div><div class='ctx'> 	i2c_set_adapdata(&amp;state-&gt;tuner_i2c_adapter, state);</div><div class='ctx'> 	if (i2c_add_adapter(&amp;state-&gt;tuner_i2c_adapter) &lt; 0) {</div><div class='del'>-	err("tuner i2c bus could not be initialized\n");</div><div class='add'>+		err("tuner i2c bus could not be initialized\n");</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1090,6 +1124,7 @@ error:</div><div class='ctx'> </div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(cx24123_attach);</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops cx24123_ops = {</div><div class='ctx'> </div><div class='hunk'>@@ -1126,15 +1161,8 @@ static struct dvb_frontend_ops cx24123_ops = {</div><div class='ctx'> 	.get_frontend_algo = cx24123_get_algo,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-module_param(debug, int, 0644);</div><div class='del'>-MODULE_PARM_DESC(debug, "Activates frontend debugging (default:0)");</div><div class='del'>-</div><div class='del'>-module_param(force_band, int, 0644);</div><div class='del'>-MODULE_PARM_DESC(force_band, "Force a specific band select (1-9, default:off).");</div><div class='del'>-</div><div class='ctx'> MODULE_DESCRIPTION("DVB Frontend module for Conexant " \</div><div class='ctx'> 	"CX24123/CX24109/CX24113 hardware");</div><div class='ctx'> MODULE_AUTHOR("Steven Toth");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(cx24123_attach);</div><div class='head'>diff --git a/drivers/media/dvb/frontends/cx24123.h b/drivers/media/dvb/frontends/cx24123.h<br/>index cc6b411d6d20..51ae866e9fed 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/frontends/cx24123.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/dvb/frontends/cx24123.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/frontends/cx24123.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/cx24123.h</a></div><div class='hunk'>@@ -23,13 +23,12 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/dvb/frontend.h&gt;</div><div class='ctx'> </div><div class='del'>-struct cx24123_config</div><div class='del'>-{</div><div class='add'>+struct cx24123_config {</div><div class='ctx'> 	/* the demodulator's i2c address */</div><div class='ctx'> 	u8 demod_address;</div><div class='ctx'> </div><div class='ctx'> 	/* Need to set device param for start_dma */</div><div class='del'>-	int (*set_ts_params)(struct dvb_frontend* fe, int is_punctured);</div><div class='add'>+	int (*set_ts_params)(struct dvb_frontend *fe, int is_punctured);</div><div class='ctx'> </div><div class='ctx'> 	/* 0 = LNB voltage normal, 1 = LNB voltage inverted */</div><div class='ctx'> 	int lnb_polarity;</div><div class='hunk'>@@ -39,7 +38,8 @@ struct cx24123_config</div><div class='ctx'> 	void (*agc_callback) (struct dvb_frontend *);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_DVB_CX24123) || (defined(CONFIG_DVB_CX24123_MODULE) &amp;&amp; defined(MODULE))</div><div class='add'>+#if defined(CONFIG_DVB_CX24123) || (defined(CONFIG_DVB_CX24123_MODULE) \</div><div class='add'>+	&amp;&amp; defined(MODULE))</div><div class='ctx'> extern struct dvb_frontend *cx24123_attach(const struct cx24123_config *config,</div><div class='ctx'> 					   struct i2c_adapter *i2c);</div><div class='ctx'> extern struct i2c_adapter *cx24123_get_tuner_i2c_adapter(struct dvb_frontend *);</div><div class='hunk'>@@ -56,6 +56,6 @@ static struct i2c_adapter *</div><div class='ctx'> 	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='del'>-#endif // CONFIG_DVB_CX24123</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #endif /* CX24123_H */</div><div class='head'>diff --git a/drivers/media/dvb/frontends/dib0070.h b/drivers/media/dvb/frontends/dib0070.h<br/>index 3eedfdf505bc..21f2c5161af4 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/frontends/dib0070.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/dvb/frontends/dib0070.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/frontends/dib0070.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/dib0070.h</a></div><div class='hunk'>@@ -41,6 +41,7 @@ struct dib0070_config {</div><div class='ctx'> extern struct dvb_frontend *dib0070_attach(struct dvb_frontend *fe,</div><div class='ctx'> 					   struct i2c_adapter *i2c,</div><div class='ctx'> 					   struct dib0070_config *cfg);</div><div class='add'>+extern u16 dib0070_wbd_offset(struct dvb_frontend *);</div><div class='ctx'> #else</div><div class='ctx'> static inline struct dvb_frontend *dib0070_attach(struct dvb_frontend *fe,</div><div class='ctx'> 						  struct i2c_adapter *i2c,</div><div class='hunk'>@@ -49,9 +50,14 @@ static inline struct dvb_frontend *dib0070_attach(struct dvb_frontend *fe,</div><div class='ctx'> 	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static inline u16 dib0070_wbd_offset(struct dvb_frontend *fe)</div><div class='add'>+{</div><div class='add'>+	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> extern void dib0070_ctrl_agc_filter(struct dvb_frontend *, uint8_t open);</div><div class='del'>-extern u16 dib0070_wbd_offset(struct dvb_frontend *);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/media/dvb/frontends/dib7000m.c b/drivers/media/dvb/frontends/dib7000m.c<br/>index 5f1375e30dfc..0109720353bd 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/frontends/dib7000m.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/dvb/frontends/dib7000m.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/frontends/dib7000m.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/dib7000m.c</a></div><div class='hunk'>@@ -1284,7 +1284,10 @@ struct i2c_adapter * dib7000m_get_i2c_master(struct dvb_frontend *demod, enum di</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(dib7000m_get_i2c_master);</div><div class='ctx'> </div><div class='del'>-int dib7000m_i2c_enumeration(struct i2c_adapter *i2c, int no_of_demods, u8 default_addr, struct dib7000m_config cfg[])</div><div class='add'>+#if 0</div><div class='add'>+/* used with some prototype boards */</div><div class='add'>+int dib7000m_i2c_enumeration(struct i2c_adapter *i2c, int no_of_demods,</div><div class='add'>+		u8 default_addr, struct dib7000m_config cfg[])</div><div class='ctx'> {</div><div class='ctx'> 	struct dib7000m_state st = { .i2c_adap = i2c };</div><div class='ctx'> 	int k = 0;</div><div class='hunk'>@@ -1329,6 +1332,7 @@ int dib7000m_i2c_enumeration(struct i2c_adapter *i2c, int no_of_demods, u8 defau</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(dib7000m_i2c_enumeration);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops dib7000m_ops;</div><div class='ctx'> struct dvb_frontend * dib7000m_attach(struct i2c_adapter *i2c_adap, u8 i2c_addr, struct dib7000m_config *cfg)</div><div class='head'>diff --git a/drivers/media/dvb/frontends/dib7000p.c b/drivers/media/dvb/frontends/dib7000p.c<br/>index 1a0142e0d741..8217e5b38f47 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/frontends/dib7000p.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/dvb/frontends/dib7000p.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/frontends/dib7000p.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/dib7000p.c</a></div><div class='hunk'>@@ -1333,7 +1333,8 @@ struct dvb_frontend * dib7000p_attach(struct i2c_adapter *i2c_adap, u8 i2c_addr,</div><div class='ctx'> 	/* Ensure the output mode remains at the previous default if it's</div><div class='ctx'> 	 * not specifically set by the caller.</div><div class='ctx'> 	 */</div><div class='del'>-	if (st-&gt;cfg.output_mode != OUTMODE_MPEG2_SERIAL)</div><div class='add'>+	if ((st-&gt;cfg.output_mode != OUTMODE_MPEG2_SERIAL) &amp;&amp;</div><div class='add'>+	    (st-&gt;cfg.output_mode != OUTMODE_MPEG2_PAR_GATED_CLK))</div><div class='ctx'> 		st-&gt;cfg.output_mode = OUTMODE_MPEG2_FIFO;</div><div class='ctx'> </div><div class='ctx'> 	demod                   = &amp;st-&gt;demod;</div><div class='head'>diff --git a/drivers/media/dvb/frontends/dib7000p.h b/drivers/media/dvb/frontends/dib7000p.h<br/>index 07c4d12ed5b7..3e8126857127 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/frontends/dib7000p.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/dvb/frontends/dib7000p.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/frontends/dib7000p.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/dib7000p.h</a></div><div class='hunk'>@@ -41,6 +41,14 @@ struct dib7000p_config {</div><div class='ctx'> extern struct dvb_frontend *dib7000p_attach(struct i2c_adapter *i2c_adap,</div><div class='ctx'> 					    u8 i2c_addr,</div><div class='ctx'> 					    struct dib7000p_config *cfg);</div><div class='add'>+extern struct i2c_adapter *dib7000p_get_i2c_master(struct dvb_frontend *,</div><div class='add'>+						   enum dibx000_i2c_interface,</div><div class='add'>+						   int);</div><div class='add'>+extern int dib7000p_i2c_enumeration(struct i2c_adapter *i2c,</div><div class='add'>+				    int no_of_demods, u8 default_addr,</div><div class='add'>+				    struct dib7000p_config cfg[]);</div><div class='add'>+extern int dib7000p_set_gpio(struct dvb_frontend *, u8 num, u8 dir, u8 val);</div><div class='add'>+extern int dib7000p_set_wbd_ref(struct dvb_frontend *, u16 value);</div><div class='ctx'> #else</div><div class='ctx'> static inline struct dvb_frontend *dib7000p_attach(struct i2c_adapter *i2c_adap,</div><div class='ctx'> 						   u8 i2c_addr,</div><div class='hunk'>@@ -49,13 +57,36 @@ static inline struct dvb_frontend *dib7000p_attach(struct i2c_adapter *i2c_adap,</div><div class='ctx'> 	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='del'>-extern int dib7000p_i2c_enumeration(struct i2c_adapter *i2c, int no_of_demods, u8 default_addr, struct dib7000p_config cfg[]);</div><div class='add'>+static inline</div><div class='add'>+struct i2c_adapter *dib7000p_get_i2c_master(struct dvb_frontend *fe,</div><div class='add'>+					    enum dibx000_i2c_interface i, int x)</div><div class='add'>+{</div><div class='add'>+	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+extern int dib7000p_i2c_enumeration(struct i2c_adapter *i2c,</div><div class='add'>+				    int no_of_demods, u8 default_addr,</div><div class='add'>+				    struct dib7000p_config cfg[])</div><div class='add'>+{</div><div class='add'>+	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+extern int dib7000p_set_gpio(struct dvb_frontend *fe, u8 num, u8 dir, u8 val)</div><div class='add'>+{</div><div class='add'>+	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+extern int dib7000p_set_wbd_ref(struct dvb_frontend *fe, u16 value)</div><div class='add'>+{</div><div class='add'>+	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='del'>-extern struct i2c_adapter * dib7000p_get_i2c_master(struct dvb_frontend *, enum dibx000_i2c_interface, int);</div><div class='ctx'> extern int dib7000pc_detection(struct i2c_adapter *i2c_adap);</div><div class='del'>-extern int dib7000p_set_gpio(struct dvb_frontend *, u8 num, u8 dir, u8 val);</div><div class='del'>-extern int dib7000p_set_wbd_ref(struct dvb_frontend *, u16 value);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/media/dvb/frontends/drx397xD.c b/drivers/media/dvb/frontends/drx397xD.c<br/>index 3cbed874a6f8..b9ca5c8d2dd9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/frontends/drx397xD.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/dvb/frontends/drx397xD.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/frontends/drx397xD.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/drx397xD.c</a></div><div class='hunk'>@@ -38,35 +38,32 @@ static const char mod_name[] = "drx397xD";</div><div class='ctx'> #define F_SET_0D0h	1</div><div class='ctx'> #define F_SET_0D4h	2</div><div class='ctx'> </div><div class='del'>-typedef enum fw_ix {</div><div class='add'>+enum fw_ix {</div><div class='ctx'> #define _FW_ENTRY(a, b)		b</div><div class='ctx'> #include "drx397xD_fw.h"</div><div class='del'>-} fw_ix_t;</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> /* chip specifics */</div><div class='ctx'> struct drx397xD_state {</div><div class='ctx'> 	struct i2c_adapter *i2c;</div><div class='ctx'> 	struct dvb_frontend frontend;</div><div class='ctx'> 	struct drx397xD_config config;</div><div class='del'>-	fw_ix_t chip_rev;</div><div class='add'>+	enum fw_ix chip_rev;</div><div class='ctx'> 	int flags;</div><div class='ctx'> 	u32 bandwidth_parm;	/* internal bandwidth conversions */</div><div class='ctx'> 	u32 f_osc;		/* w90: actual osc frequency [Hz] */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/*******************************************************************************</div><div class='del'>- * Firmware</div><div class='del'>- ******************************************************************************/</div><div class='del'>-</div><div class='add'>+/* Firmware */</div><div class='ctx'> static const char *blob_name[] = {</div><div class='ctx'> #define _BLOB_ENTRY(a, b)		a</div><div class='ctx'> #include "drx397xD_fw.h"</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-typedef enum blob_ix {</div><div class='add'>+enum blob_ix {</div><div class='ctx'> #define _BLOB_ENTRY(a, b)		b</div><div class='ctx'> #include "drx397xD_fw.h"</div><div class='del'>-} blob_ix_t;</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> static struct {</div><div class='ctx'> 	const char *name;</div><div class='hunk'>@@ -85,7 +82,7 @@ static struct {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* use only with writer lock aquired */</div><div class='del'>-static void _drx_release_fw(struct drx397xD_state *s, fw_ix_t ix)</div><div class='add'>+static void _drx_release_fw(struct drx397xD_state *s, enum fw_ix ix)</div><div class='ctx'> {</div><div class='ctx'> 	memset(&amp;fw[ix].data[0], 0, sizeof(fw[0].data));</div><div class='ctx'> 	if (fw[ix].file)</div><div class='hunk'>@@ -94,9 +91,9 @@ static void _drx_release_fw(struct drx397xD_state *s, fw_ix_t ix)</div><div class='ctx'> </div><div class='ctx'> static void drx_release_fw(struct drx397xD_state *s)</div><div class='ctx'> {</div><div class='del'>-	fw_ix_t ix = s-&gt;chip_rev;</div><div class='add'>+	enum fw_ix ix = s-&gt;chip_rev;</div><div class='ctx'> </div><div class='del'>-	pr_debug("%s\n", __FUNCTION__);</div><div class='add'>+	pr_debug("%s\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	write_lock(&amp;fw[ix].lock);</div><div class='ctx'> 	if (fw[ix].refcnt) {</div><div class='hunk'>@@ -107,13 +104,13 @@ static void drx_release_fw(struct drx397xD_state *s)</div><div class='ctx'> 	write_unlock(&amp;fw[ix].lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int drx_load_fw(struct drx397xD_state *s, fw_ix_t ix)</div><div class='add'>+static int drx_load_fw(struct drx397xD_state *s, enum fw_ix ix)</div><div class='ctx'> {</div><div class='ctx'> 	const u8 *data;</div><div class='ctx'> 	size_t size, len;</div><div class='ctx'> 	int i = 0, j, rc = -EINVAL;</div><div class='ctx'> </div><div class='del'>-	pr_debug("%s\n", __FUNCTION__);</div><div class='add'>+	pr_debug("%s\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	if (ix &lt; 0 || ix &gt;= ARRAY_SIZE(fw))</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -175,32 +172,34 @@ static int drx_load_fw(struct drx397xD_state *s, fw_ix_t ix)</div><div class='ctx'> 			goto exit_corrupt;</div><div class='ctx'> 		}</div><div class='ctx'> 	} while (i &lt; size);</div><div class='del'>-      exit_corrupt:</div><div class='add'>+</div><div class='add'>+exit_corrupt:</div><div class='ctx'> 	printk(KERN_ERR "%s: Firmware is corrupt\n", mod_name);</div><div class='del'>-      exit_err:</div><div class='add'>+exit_err:</div><div class='ctx'> 	_drx_release_fw(s, ix);</div><div class='ctx'> 	fw[ix].refcnt--;</div><div class='del'>-      exit_ok:</div><div class='add'>+exit_ok:</div><div class='ctx'> 	fw[ix].refcnt++;</div><div class='ctx'> 	write_unlock(&amp;fw[ix].lock);</div><div class='add'>+</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*******************************************************************************</div><div class='del'>- * i2c bus IO</div><div class='del'>- ******************************************************************************/</div><div class='del'>-</div><div class='del'>-static int write_fw(struct drx397xD_state *s, blob_ix_t ix)</div><div class='add'>+/* i2c bus IO */</div><div class='add'>+static int write_fw(struct drx397xD_state *s, enum blob_ix ix)</div><div class='ctx'> {</div><div class='del'>-	struct i2c_msg msg = {.addr = s-&gt;config.demod_address,.flags = 0 };</div><div class='ctx'> 	const u8 *data;</div><div class='ctx'> 	int len, rc = 0, i = 0;</div><div class='add'>+	struct i2c_msg msg = {</div><div class='add'>+		.addr = s-&gt;config.demod_address,</div><div class='add'>+		.flags = 0</div><div class='add'>+	};</div><div class='ctx'> </div><div class='ctx'> 	if (ix &lt; 0 || ix &gt;= ARRAY_SIZE(blob_name)) {</div><div class='del'>-		pr_debug("%s drx_fw_ix_t out of range\n", __FUNCTION__);</div><div class='add'>+		pr_debug("%s drx_fw_ix_t out of range\n", __func__);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	pr_debug("%s %s\n", __FUNCTION__, blob_name[ix]);</div><div class='add'>+	pr_debug("%s %s\n", __func__, blob_name[ix]);</div><div class='ctx'> </div><div class='ctx'> 	read_lock(&amp;fw[s-&gt;chip_rev].lock);</div><div class='ctx'> 	data = fw[s-&gt;chip_rev].data[ix];</div><div class='hunk'>@@ -229,33 +228,33 @@ static int write_fw(struct drx397xD_state *s, blob_ix_t ix)</div><div class='ctx'> 			goto exit_rc;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-      exit_rc:</div><div class='add'>+exit_rc:</div><div class='ctx'> 	read_unlock(&amp;fw[s-&gt;chip_rev].lock);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Function is not endian safe, use the RD16 wrapper below */</div><div class='del'>-static int _read16(struct drx397xD_state *s, u32 i2c_adr)</div><div class='add'>+static int _read16(struct drx397xD_state *s, __le32 i2c_adr)</div><div class='ctx'> {</div><div class='ctx'> 	int rc;</div><div class='ctx'> 	u8 a[4];</div><div class='del'>-	u16 v;</div><div class='add'>+	__le16 v;</div><div class='ctx'> 	struct i2c_msg msg[2] = {</div><div class='ctx'> 		{</div><div class='del'>-		 .addr = s-&gt;config.demod_address,</div><div class='del'>-		 .flags = 0,</div><div class='del'>-		 .buf = a,</div><div class='del'>-		 .len = sizeof(a)</div><div class='del'>-		 }</div><div class='del'>-		, {</div><div class='del'>-		   .addr = s-&gt;config.demod_address,</div><div class='del'>-		   .flags = I2C_M_RD,</div><div class='del'>-		   .buf = (u8 *) &amp; v,</div><div class='del'>-		   .len = sizeof(v)</div><div class='del'>-		   }</div><div class='add'>+			.addr = s-&gt;config.demod_address,</div><div class='add'>+			.flags = 0,</div><div class='add'>+			.buf = a,</div><div class='add'>+			.len = sizeof(a)</div><div class='add'>+		}, {</div><div class='add'>+			.addr = s-&gt;config.demod_address,</div><div class='add'>+			.flags = I2C_M_RD,</div><div class='add'>+			.buf = (u8 *)&amp;v,</div><div class='add'>+			.len = sizeof(v)</div><div class='add'>+		}</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	*(u32 *) a = i2c_adr;</div><div class='add'>+	*(__le32 *) a = i2c_adr;</div><div class='ctx'> </div><div class='ctx'> 	rc = i2c_transfer(s-&gt;i2c, msg, 2);</div><div class='ctx'> 	if (rc != 2)</div><div class='hunk'>@@ -265,7 +264,7 @@ static int _read16(struct drx397xD_state *s, u32 i2c_adr)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Function is not endian safe, use the WR16.. wrappers below */</div><div class='del'>-static int _write16(struct drx397xD_state *s, u32 i2c_adr, u16 val)</div><div class='add'>+static int _write16(struct drx397xD_state *s, __le32 i2c_adr, __le16 val)</div><div class='ctx'> {</div><div class='ctx'> 	u8 a[6];</div><div class='ctx'> 	int rc;</div><div class='hunk'>@@ -276,28 +275,28 @@ static int _write16(struct drx397xD_state *s, u32 i2c_adr, u16 val)</div><div class='ctx'> 		.len = sizeof(a)</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	*(u32 *) a = i2c_adr;</div><div class='del'>-	*(u16 *) &amp; a[4] = val;</div><div class='add'>+	*(__le32 *)a = i2c_adr;</div><div class='add'>+	*(__le16 *)&amp;a[4] = val;</div><div class='ctx'> </div><div class='ctx'> 	rc = i2c_transfer(s-&gt;i2c, &amp;msg, 1);</div><div class='ctx'> 	if (rc != 1)</div><div class='ctx'> 		return -EIO;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define WR16(ss,adr, val) \</div><div class='add'>+#define WR16(ss, adr, val) \</div><div class='ctx'> 		_write16(ss, I2C_ADR_C0(adr), cpu_to_le16(val))</div><div class='del'>-#define WR16_E0(ss,adr, val) \</div><div class='add'>+#define WR16_E0(ss, adr, val) \</div><div class='ctx'> 		_write16(ss, I2C_ADR_E0(adr), cpu_to_le16(val))</div><div class='del'>-#define RD16(ss,adr) \</div><div class='add'>+#define RD16(ss, adr) \</div><div class='ctx'> 		_read16(ss, I2C_ADR_C0(adr))</div><div class='ctx'> </div><div class='del'>-#define EXIT_RC( cmd )	if ( (rc = (cmd)) &lt; 0) goto exit_rc</div><div class='del'>-</div><div class='del'>-/*******************************************************************************</div><div class='del'>- * Tuner callback</div><div class='del'>- ******************************************************************************/</div><div class='add'>+#define EXIT_RC(cmd)	\</div><div class='add'>+	if ((rc = (cmd)) &lt; 0)	\</div><div class='add'>+		goto exit_rc</div><div class='ctx'> </div><div class='add'>+/* Tuner callback */</div><div class='ctx'> static int PLL_Set(struct drx397xD_state *s,</div><div class='ctx'> 		   struct dvb_frontend_parameters *fep, int *df_tuner)</div><div class='ctx'> {</div><div class='hunk'>@@ -305,7 +304,7 @@ static int PLL_Set(struct drx397xD_state *s,</div><div class='ctx'> 	u32 f_tuner, f = fep-&gt;frequency;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	pr_debug("%s\n", __FUNCTION__);</div><div class='add'>+	pr_debug("%s\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	if ((f &gt; s-&gt;frontend.ops.tuner_ops.info.frequency_max) ||</div><div class='ctx'> 	    (f &lt; s-&gt;frontend.ops.tuner_ops.info.frequency_min))</div><div class='hunk'>@@ -325,28 +324,26 @@ static int PLL_Set(struct drx397xD_state *s,</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='ctx'> 	*df_tuner = f_tuner - f;</div><div class='del'>-	pr_debug("%s requested %d [Hz] tuner %d [Hz]\n", __FUNCTION__, f,</div><div class='add'>+	pr_debug("%s requested %d [Hz] tuner %d [Hz]\n", __func__, f,</div><div class='ctx'> 		 f_tuner);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*******************************************************************************</div><div class='del'>- * Demodulator helper functions</div><div class='del'>- ******************************************************************************/</div><div class='del'>-</div><div class='add'>+/* Demodulator helper functions */</div><div class='ctx'> static int SC_WaitForReady(struct drx397xD_state *s)</div><div class='ctx'> {</div><div class='ctx'> 	int cnt = 1000;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	pr_debug("%s\n", __FUNCTION__);</div><div class='add'>+	pr_debug("%s\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	while (cnt--) {</div><div class='ctx'> 		rc = RD16(s, 0x820043);</div><div class='ctx'> 		if (rc == 0)</div><div class='ctx'> 			return 0;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	return -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -354,13 +351,14 @@ static int SC_SendCommand(struct drx397xD_state *s, int cmd)</div><div class='ctx'> {</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	pr_debug("%s\n", __FUNCTION__);</div><div class='add'>+	pr_debug("%s\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	WR16(s, 0x820043, cmd);</div><div class='ctx'> 	SC_WaitForReady(s);</div><div class='ctx'> 	rc = RD16(s, 0x820042);</div><div class='ctx'> 	if ((rc &amp; 0xffff) == 0xffff)</div><div class='ctx'> 		return -1;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -368,7 +366,7 @@ static int HI_Command(struct drx397xD_state *s, u16 cmd)</div><div class='ctx'> {</div><div class='ctx'> 	int rc, cnt = 1000;</div><div class='ctx'> </div><div class='del'>-	pr_debug("%s\n", __FUNCTION__);</div><div class='add'>+	pr_debug("%s\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	rc = WR16(s, 0x420032, cmd);</div><div class='ctx'> 	if (rc &lt; 0)</div><div class='hunk'>@@ -383,22 +381,24 @@ static int HI_Command(struct drx397xD_state *s, u16 cmd)</div><div class='ctx'> 		if (rc &lt; 0)</div><div class='ctx'> 			return rc;</div><div class='ctx'> 	} while (--cnt);</div><div class='add'>+</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int HI_CfgCommand(struct drx397xD_state *s)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='del'>-	pr_debug("%s\n", __FUNCTION__);</div><div class='add'>+	pr_debug("%s\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	WR16(s, 0x420033, 0x3973);</div><div class='del'>-	WR16(s, 0x420034, s-&gt;config.w50);	// code 4, log 4</div><div class='del'>-	WR16(s, 0x420035, s-&gt;config.w52);	// code 15,  log 9</div><div class='add'>+	WR16(s, 0x420034, s-&gt;config.w50);	/* code 4, log 4 */</div><div class='add'>+	WR16(s, 0x420035, s-&gt;config.w52);	/* code 15,  log 9 */</div><div class='ctx'> 	WR16(s, 0x420036, s-&gt;config.demod_address &lt;&lt; 1);</div><div class='del'>-	WR16(s, 0x420037, s-&gt;config.w56);	// code (set_i2c ??  initX 1 ), log 1</div><div class='del'>-//      WR16(s, 0x420033, 0x3973);</div><div class='add'>+	WR16(s, 0x420037, s-&gt;config.w56);	/* code (set_i2c ??  initX 1 ), log 1 */</div><div class='add'>+	/* WR16(s, 0x420033, 0x3973); */</div><div class='ctx'> 	if ((s-&gt;config.w56 &amp; 8) == 0)</div><div class='ctx'> 		return HI_Command(s, 3);</div><div class='add'>+</div><div class='ctx'> 	return WR16(s, 0x420032, 0x3);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -419,7 +419,7 @@ static int SetCfgIfAgc(struct drx397xD_state *s, struct drx397xD_CfgIfAgc *agc)</div><div class='ctx'> 	u16 w0C = agc-&gt;w0C;</div><div class='ctx'> 	int quot, rem, i, rc = -EINVAL;</div><div class='ctx'> </div><div class='del'>-	pr_debug("%s\n", __FUNCTION__);</div><div class='add'>+	pr_debug("%s\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	if (agc-&gt;w04 &gt; 0x3ff)</div><div class='ctx'> 		goto exit_rc;</div><div class='hunk'>@@ -468,7 +468,7 @@ static int SetCfgIfAgc(struct drx397xD_state *s, struct drx397xD_CfgIfAgc *agc)</div><div class='ctx'> 	i = slowIncrDecLUT_15272[rem / 28];</div><div class='ctx'> 	EXIT_RC(WR16(s, 0x0c2002b, i));</div><div class='ctx'> 	rc = WR16(s, 0x0c2002c, i);</div><div class='del'>-      exit_rc:</div><div class='add'>+exit_rc:</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -478,7 +478,7 @@ static int SetCfgRfAgc(struct drx397xD_state *s, struct drx397xD_CfgRfAgc *agc)</div><div class='ctx'> 	u16 w06 = agc-&gt;w06;</div><div class='ctx'> 	int rc = -1;</div><div class='ctx'> </div><div class='del'>-	pr_debug("%s %d 0x%x 0x%x\n", __FUNCTION__, agc-&gt;d00, w04, w06);</div><div class='add'>+	pr_debug("%s %d 0x%x 0x%x\n", __func__, agc-&gt;d00, w04, w06);</div><div class='ctx'> </div><div class='ctx'> 	if (w04 &gt; 0x3ff)</div><div class='ctx'> 		goto exit_rc;</div><div class='hunk'>@@ -498,7 +498,7 @@ static int SetCfgRfAgc(struct drx397xD_state *s, struct drx397xD_CfgRfAgc *agc)</div><div class='ctx'> 		rc &amp;= ~2;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0:</div><div class='del'>-		// loc_8000659</div><div class='add'>+		/* loc_8000659 */</div><div class='ctx'> 		s-&gt;config.w9C &amp;= ~2;</div><div class='ctx'> 		EXIT_RC(WR16(s, 0x0c20015, s-&gt;config.w9C));</div><div class='ctx'> 		EXIT_RC(RD16(s, 0x0c20010));</div><div class='hunk'>@@ -522,7 +522,8 @@ static int SetCfgRfAgc(struct drx397xD_state *s, struct drx397xD_CfgRfAgc *agc)</div><div class='ctx'> 		rc |= 2;</div><div class='ctx'> 	}</div><div class='ctx'> 	rc = WR16(s, 0x0c20013, rc);</div><div class='del'>-      exit_rc:</div><div class='add'>+</div><div class='add'>+exit_rc:</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -554,7 +555,7 @@ static int CorrectSysClockDeviation(struct drx397xD_state *s)</div><div class='ctx'> 	int lockstat;</div><div class='ctx'> 	u32 clk, clk_limit;</div><div class='ctx'> </div><div class='del'>-	pr_debug("%s\n", __FUNCTION__);</div><div class='add'>+	pr_debug("%s\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	if (s-&gt;config.d5C == 0) {</div><div class='ctx'> 		EXIT_RC(WR16(s, 0x08200e8, 0x010));</div><div class='hunk'>@@ -598,11 +599,12 @@ static int CorrectSysClockDeviation(struct drx397xD_state *s)</div><div class='ctx'> </div><div class='ctx'> 	if (clk - s-&gt;config.f_osc * 1000 + clk_limit &lt;= 2 * clk_limit) {</div><div class='ctx'> 		s-&gt;f_osc = clk;</div><div class='del'>-		pr_debug("%s: osc %d %d [Hz]\n", __FUNCTION__,</div><div class='add'>+		pr_debug("%s: osc %d %d [Hz]\n", __func__,</div><div class='ctx'> 			 s-&gt;config.f_osc * 1000, clk - s-&gt;config.f_osc * 1000);</div><div class='ctx'> 	}</div><div class='ctx'> 	rc = WR16(s, 0x08200e8, 0);</div><div class='del'>-      exit_rc:</div><div class='add'>+</div><div class='add'>+exit_rc:</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -610,7 +612,7 @@ static int ConfigureMPEGOutput(struct drx397xD_state *s, int type)</div><div class='ctx'> {</div><div class='ctx'> 	int rc, si, bp;</div><div class='ctx'> </div><div class='del'>-	pr_debug("%s\n", __FUNCTION__);</div><div class='add'>+	pr_debug("%s\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	si = s-&gt;config.wA0;</div><div class='ctx'> 	if (s-&gt;config.w98 == 0) {</div><div class='hunk'>@@ -620,17 +622,17 @@ static int ConfigureMPEGOutput(struct drx397xD_state *s, int type)</div><div class='ctx'> 		si &amp;= ~1;</div><div class='ctx'> 		bp = 0x200;</div><div class='ctx'> 	}</div><div class='del'>-	if (s-&gt;config.w9A == 0) {</div><div class='add'>+	if (s-&gt;config.w9A == 0)</div><div class='ctx'> 		si |= 0x80;</div><div class='del'>-	} else {</div><div class='add'>+	else</div><div class='ctx'> 		si &amp;= ~0x80;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	EXIT_RC(WR16(s, 0x2150045, 0));</div><div class='ctx'> 	EXIT_RC(WR16(s, 0x2150010, si));</div><div class='ctx'> 	EXIT_RC(WR16(s, 0x2150011, bp));</div><div class='ctx'> 	rc = WR16(s, 0x2150012, (type == 0 ? 0xfff : 0));</div><div class='del'>-      exit_rc:</div><div class='add'>+</div><div class='add'>+exit_rc:</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -646,7 +648,7 @@ static int drx_tune(struct drx397xD_state *s,</div><div class='ctx'> </div><div class='ctx'> 	int rc, df_tuner;</div><div class='ctx'> 	int a, b, c, d;</div><div class='del'>-	pr_debug("%s %d\n", __FUNCTION__, s-&gt;config.d60);</div><div class='add'>+	pr_debug("%s %d\n", __func__, s-&gt;config.d60);</div><div class='ctx'> </div><div class='ctx'> 	if (s-&gt;config.d60 != 2)</div><div class='ctx'> 		goto set_tuner;</div><div class='hunk'>@@ -658,7 +660,7 @@ static int drx_tune(struct drx397xD_state *s,</div><div class='ctx'> 	rc = ConfigureMPEGOutput(s, 0);</div><div class='ctx'> 	if (rc &lt; 0)</div><div class='ctx'> 		goto set_tuner;</div><div class='del'>-      set_tuner:</div><div class='add'>+set_tuner:</div><div class='ctx'> </div><div class='ctx'> 	rc = PLL_Set(s, fep, &amp;df_tuner);</div><div class='ctx'> 	if (rc &lt; 0) {</div><div class='hunk'>@@ -835,16 +837,16 @@ static int drx_tune(struct drx397xD_state *s,</div><div class='ctx'> 		rc = WR16(s, 0x2010012, 0);</div><div class='ctx'> 		if (rc &lt; 0)</div><div class='ctx'> 			goto exit_rc;</div><div class='del'>-		//              QPSK    QAM16   QAM64</div><div class='del'>-		ebx = 0x19f;	//                 62</div><div class='del'>-		ebp = 0x1fb;	//                 15</div><div class='del'>-		v20 = 0x16a;	//  62</div><div class='del'>-		v1E = 0x195;	//         62</div><div class='del'>-		v16 = 0x1bb;	//  15</div><div class='del'>-		v14 = 0x1ef;	//         15</div><div class='del'>-		v12 = 5;	//  16</div><div class='del'>-		v10 = 5;	//         16</div><div class='del'>-		v0E = 5;	//                 16</div><div class='add'>+				/* QPSK    QAM16  QAM64	*/</div><div class='add'>+		ebx = 0x19f;	/*                 62	*/</div><div class='add'>+		ebp = 0x1fb;	/*                 15	*/</div><div class='add'>+		v20 = 0x16a;	/*  62			*/</div><div class='add'>+		v1E = 0x195;	/*         62		*/</div><div class='add'>+		v16 = 0x1bb;	/*  15			*/</div><div class='add'>+		v14 = 0x1ef;	/*         15		*/</div><div class='add'>+		v12 = 5;	/*  16			*/</div><div class='add'>+		v10 = 5;	/*         16		*/</div><div class='add'>+		v0E = 5;	/*                 16	*/</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	switch (fep-&gt;u.ofdm.constellation) {</div><div class='hunk'>@@ -997,17 +999,17 @@ static int drx_tune(struct drx397xD_state *s,</div><div class='ctx'> 	case BANDWIDTH_8_MHZ:	/* 0 */</div><div class='ctx'> 	case BANDWIDTH_AUTO:</div><div class='ctx'> 		rc = WR16(s, 0x0c2003f, 0x32);</div><div class='del'>-		s-&gt;bandwidth_parm = ebx = 0x8b8249;	// 9142857</div><div class='add'>+		s-&gt;bandwidth_parm = ebx = 0x8b8249;</div><div class='ctx'> 		edx = 0;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case BANDWIDTH_7_MHZ:</div><div class='ctx'> 		rc = WR16(s, 0x0c2003f, 0x3b);</div><div class='del'>-		s-&gt;bandwidth_parm = ebx = 0x7a1200;	// 8000000</div><div class='add'>+		s-&gt;bandwidth_parm = ebx = 0x7a1200;</div><div class='ctx'> 		edx = 0x4807;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case BANDWIDTH_6_MHZ:</div><div class='ctx'> 		rc = WR16(s, 0x0c2003f, 0x47);</div><div class='del'>-		s-&gt;bandwidth_parm = ebx = 0x68a1b6;	// 6857142</div><div class='add'>+		s-&gt;bandwidth_parm = ebx = 0x68a1b6;</div><div class='ctx'> 		edx = 0x0f07;</div><div class='ctx'> 		break;</div><div class='ctx'> 	};</div><div class='hunk'>@@ -1060,8 +1062,6 @@ static int drx_tune(struct drx397xD_state *s,</div><div class='ctx'> 	WR16(s, 0x0820040, 1);</div><div class='ctx'> 	SC_SendCommand(s, 1);</div><div class='ctx'> </div><div class='del'>-//      rc = WR16(s, 0x2150000, 1);</div><div class='del'>-//      if (rc &lt; 0) goto exit_rc;</div><div class='ctx'> </div><div class='ctx'> 	rc = WR16(s, 0x2150000, 2);</div><div class='ctx'> 	rc = WR16(s, 0x2150016, a);</div><div class='hunk'>@@ -1069,7 +1069,8 @@ static int drx_tune(struct drx397xD_state *s,</div><div class='ctx'> 	rc = WR16(s, 0x2150036, 0);</div><div class='ctx'> 	rc = WR16(s, 0x2150000, 1);</div><div class='ctx'> 	s-&gt;config.d60 = 2;</div><div class='del'>-      exit_rc:</div><div class='add'>+</div><div class='add'>+exit_rc:</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1082,7 +1083,7 @@ static int drx397x_init(struct dvb_frontend *fe)</div><div class='ctx'> 	struct drx397xD_state *s = fe-&gt;demodulator_priv;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	pr_debug("%s\n", __FUNCTION__);</div><div class='add'>+	pr_debug("%s\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	s-&gt;config.rfagc.d00 = 2;	/* 0x7c */</div><div class='ctx'> 	s-&gt;config.rfagc.w04 = 0;</div><div class='hunk'>@@ -1102,18 +1103,18 @@ static int drx397x_init(struct dvb_frontend *fe)</div><div class='ctx'> </div><div class='ctx'> 	/* HI_CfgCommand */</div><div class='ctx'> 	s-&gt;config.w50 = 4;</div><div class='del'>-	s-&gt;config.w52 = 9;	// 0xf;</div><div class='add'>+	s-&gt;config.w52 = 9;</div><div class='ctx'> </div><div class='del'>-	s-&gt;config.f_if = 42800000;	/* d14: intermediate frequency [Hz]     */</div><div class='del'>-	s-&gt;config.f_osc = 48000;	/* s66 : oscillator frequency [kHz]     */</div><div class='del'>-	s-&gt;config.w92 = 12000;	// 20000;</div><div class='add'>+	s-&gt;config.f_if = 42800000;	/* d14: intermediate frequency [Hz] */</div><div class='add'>+	s-&gt;config.f_osc = 48000;	/* s66 : oscillator frequency [kHz] */</div><div class='add'>+	s-&gt;config.w92 = 12000;</div><div class='ctx'> </div><div class='ctx'> 	s-&gt;config.w9C = 0x000e;</div><div class='ctx'> 	s-&gt;config.w9E = 0x0000;</div><div class='ctx'> </div><div class='ctx'> 	/* ConfigureMPEGOutput params */</div><div class='ctx'> 	s-&gt;config.wA0 = 4;</div><div class='del'>-	s-&gt;config.w98 = 1;	// 0;</div><div class='add'>+	s-&gt;config.w98 = 1;</div><div class='ctx'> 	s-&gt;config.w9A = 1;</div><div class='ctx'> </div><div class='ctx'> 	/* get chip revision */</div><div class='hunk'>@@ -1248,7 +1249,7 @@ static int drx397x_init(struct dvb_frontend *fe)</div><div class='ctx'> 		rc = WR16(s, 0x0c20012, 1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-      write_DRXD_InitFE_1:</div><div class='add'>+write_DRXD_InitFE_1:</div><div class='ctx'> </div><div class='ctx'> 	rc = write_fw(s, DRXD_InitFE_1);</div><div class='ctx'> 	if (rc &lt; 0)</div><div class='hunk'>@@ -1311,7 +1312,8 @@ static int drx397x_init(struct dvb_frontend *fe)</div><div class='ctx'> 	s-&gt;config.d5C = 0;</div><div class='ctx'> 	s-&gt;config.d60 = 1;</div><div class='ctx'> 	s-&gt;config.d48 = 1;</div><div class='del'>-      error:</div><div class='add'>+</div><div class='add'>+error:</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1326,7 +1328,8 @@ static int drx397x_set_frontend(struct dvb_frontend *fe,</div><div class='ctx'> {</div><div class='ctx'> 	struct drx397xD_state *s = fe-&gt;demodulator_priv;</div><div class='ctx'> </div><div class='del'>-	s-&gt;config.s20d24 = 1;	// 0;</div><div class='add'>+	s-&gt;config.s20d24 = 1;</div><div class='add'>+</div><div class='ctx'> 	return drx_tune(s, params);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1337,18 +1340,16 @@ static int drx397x_get_tune_settings(struct dvb_frontend *fe,</div><div class='ctx'> 	fe_tune_settings-&gt;min_delay_ms = 10000;</div><div class='ctx'> 	fe_tune_settings-&gt;step_size = 0;</div><div class='ctx'> 	fe_tune_settings-&gt;max_drift = 0;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int drx397x_read_status(struct dvb_frontend *fe, fe_status_t * status)</div><div class='add'>+static int drx397x_read_status(struct dvb_frontend *fe, fe_status_t *status)</div><div class='ctx'> {</div><div class='ctx'> 	struct drx397xD_state *s = fe-&gt;demodulator_priv;</div><div class='ctx'> 	int lockstat;</div><div class='ctx'> </div><div class='ctx'> 	GetLockStatus(s, &amp;lockstat);</div><div class='del'>-	/* TODO */</div><div class='del'>-//      if (lockstat &amp; 1)</div><div class='del'>-//      CorrectSysClockDeviation(s);</div><div class='ctx'> </div><div class='ctx'> 	*status = 0;</div><div class='ctx'> 	if (lockstat &amp; 2) {</div><div class='hunk'>@@ -1356,9 +1357,8 @@ static int drx397x_read_status(struct dvb_frontend *fe, fe_status_t * status)</div><div class='ctx'> 		ConfigureMPEGOutput(s, 1);</div><div class='ctx'> 		*status = FE_HAS_LOCK | FE_HAS_SYNC | FE_HAS_VITERBI;</div><div class='ctx'> 	}</div><div class='del'>-	if (lockstat &amp; 4) {</div><div class='add'>+	if (lockstat &amp; 4)</div><div class='ctx'> 		*status |= FE_HAS_CARRIER | FE_HAS_SIGNAL;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1366,16 +1366,18 @@ static int drx397x_read_status(struct dvb_frontend *fe, fe_status_t * status)</div><div class='ctx'> static int drx397x_read_ber(struct dvb_frontend *fe, unsigned int *ber)</div><div class='ctx'> {</div><div class='ctx'> 	*ber = 0;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int drx397x_read_snr(struct dvb_frontend *fe, u16 * snr)</div><div class='add'>+static int drx397x_read_snr(struct dvb_frontend *fe, u16 *snr)</div><div class='ctx'> {</div><div class='ctx'> 	*snr = 0;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int drx397x_read_signal_strength(struct dvb_frontend *fe, u16 * strength)</div><div class='add'>+static int drx397x_read_signal_strength(struct dvb_frontend *fe, u16 *strength)</div><div class='ctx'> {</div><div class='ctx'> 	struct drx397xD_state *s = fe-&gt;demodulator_priv;</div><div class='ctx'> 	int rc;</div><div class='hunk'>@@ -1401,6 +1403,7 @@ static int drx397x_read_signal_strength(struct dvb_frontend *fe, u16 * strength)</div><div class='ctx'> 	 * The following does the same but with less rounding errors:</div><div class='ctx'> 	 */</div><div class='ctx'> 	*strength = ~(7720 + (rc * 30744 &gt;&gt; 10));</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1408,6 +1411,7 @@ static int drx397x_read_ucblocks(struct dvb_frontend *fe,</div><div class='ctx'> 				 unsigned int *ucblocks)</div><div class='ctx'> {</div><div class='ctx'> 	*ucblocks = 0;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1436,22 +1440,22 @@ static struct dvb_frontend_ops drx397x_ops = {</div><div class='ctx'> 		 .frequency_max		= 855250000,</div><div class='ctx'> 		 .frequency_stepsize	= 166667,</div><div class='ctx'> 		 .frequency_tolerance	= 0,</div><div class='del'>-		 .caps =					/* 0x0C01B2EAE */</div><div class='del'>-			 FE_CAN_FEC_1_2			|	// = 0x2,</div><div class='del'>-			 FE_CAN_FEC_2_3			|	// = 0x4,</div><div class='del'>-			 FE_CAN_FEC_3_4			|	// = 0x8,</div><div class='del'>-			 FE_CAN_FEC_5_6			|	// = 0x20,</div><div class='del'>-			 FE_CAN_FEC_7_8			|	// = 0x80,</div><div class='del'>-			 FE_CAN_FEC_AUTO		|	// = 0x200,</div><div class='del'>-			 FE_CAN_QPSK			|	// = 0x400,</div><div class='del'>-			 FE_CAN_QAM_16			|	// = 0x800,</div><div class='del'>-			 FE_CAN_QAM_64			|	// = 0x2000,</div><div class='del'>-			 FE_CAN_QAM_AUTO		|	// = 0x10000,</div><div class='del'>-			 FE_CAN_TRANSMISSION_MODE_AUTO	|	// = 0x20000,</div><div class='del'>-			 FE_CAN_GUARD_INTERVAL_AUTO	|	// = 0x80000,</div><div class='del'>-			 FE_CAN_HIERARCHY_AUTO		|	// = 0x100000,</div><div class='del'>-			 FE_CAN_RECOVER			|	// = 0x40000000,</div><div class='del'>-			 FE_CAN_MUTE_TS				// = 0x80000000</div><div class='add'>+		 .caps =				  /* 0x0C01B2EAE */</div><div class='add'>+			 FE_CAN_FEC_1_2			| /* = 0x2, */</div><div class='add'>+			 FE_CAN_FEC_2_3			| /* = 0x4, */</div><div class='add'>+			 FE_CAN_FEC_3_4			| /* = 0x8, */</div><div class='add'>+			 FE_CAN_FEC_5_6			| /* = 0x20, */</div><div class='add'>+			 FE_CAN_FEC_7_8			| /* = 0x80, */</div><div class='add'>+			 FE_CAN_FEC_AUTO		| /* = 0x200, */</div><div class='add'>+			 FE_CAN_QPSK			| /* = 0x400, */</div><div class='add'>+			 FE_CAN_QAM_16			| /* = 0x800, */</div><div class='add'>+			 FE_CAN_QAM_64			| /* = 0x2000, */</div><div class='add'>+			 FE_CAN_QAM_AUTO		| /* = 0x10000, */</div><div class='add'>+			 FE_CAN_TRANSMISSION_MODE_AUTO	| /* = 0x20000, */</div><div class='add'>+			 FE_CAN_GUARD_INTERVAL_AUTO	| /* = 0x80000, */</div><div class='add'>+			 FE_CAN_HIERARCHY_AUTO		| /* = 0x100000, */</div><div class='add'>+			 FE_CAN_RECOVER			| /* = 0x40000000, */</div><div class='add'>+			 FE_CAN_MUTE_TS			  /* = 0x80000000 */</div><div class='ctx'> 	 },</div><div class='ctx'> </div><div class='ctx'> 	.release = drx397x_release,</div><div class='hunk'>@@ -1472,33 +1476,35 @@ static struct dvb_frontend_ops drx397x_ops = {</div><div class='ctx'> struct dvb_frontend *drx397xD_attach(const struct drx397xD_config *config,</div><div class='ctx'> 				     struct i2c_adapter *i2c)</div><div class='ctx'> {</div><div class='del'>-	struct drx397xD_state *s = NULL;</div><div class='add'>+	struct drx397xD_state *state;</div><div class='ctx'> </div><div class='ctx'> 	/* allocate memory for the internal state */</div><div class='del'>-	s = kzalloc(sizeof(struct drx397xD_state), GFP_KERNEL);</div><div class='del'>-	if (s == NULL)</div><div class='add'>+	state = kzalloc(sizeof(struct drx397xD_state), GFP_KERNEL);</div><div class='add'>+	if (!state)</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='ctx'> 	/* setup the state */</div><div class='del'>-	s-&gt;i2c = i2c;</div><div class='del'>-	memcpy(&amp;s-&gt;config, config, sizeof(struct drx397xD_config));</div><div class='add'>+	state-&gt;i2c = i2c;</div><div class='add'>+	memcpy(&amp;state-&gt;config, config, sizeof(struct drx397xD_config));</div><div class='ctx'> </div><div class='ctx'> 	/* check if the demod is there */</div><div class='del'>-	if (RD16(s, 0x2410019) &lt; 0)</div><div class='add'>+	if (RD16(state, 0x2410019) &lt; 0)</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='ctx'> 	/* create dvb_frontend */</div><div class='del'>-	memcpy(&amp;s-&gt;frontend.ops, &amp;drx397x_ops, sizeof(struct dvb_frontend_ops));</div><div class='del'>-	s-&gt;frontend.demodulator_priv = s;</div><div class='add'>+	memcpy(&amp;state-&gt;frontend.ops, &amp;drx397x_ops,</div><div class='add'>+			sizeof(struct dvb_frontend_ops));</div><div class='add'>+	state-&gt;frontend.demodulator_priv = state;</div><div class='add'>+</div><div class='add'>+	return &amp;state-&gt;frontend;</div><div class='add'>+error:</div><div class='add'>+	kfree(state);</div><div class='ctx'> </div><div class='del'>-	return &amp;s-&gt;frontend;</div><div class='del'>-      error:</div><div class='del'>-	kfree(s);</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(drx397xD_attach);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("Micronas DRX397xD DVB-T Frontend");</div><div class='ctx'> MODULE_AUTHOR("Henk Vergonet");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(drx397xD_attach);</div><div class='head'>diff --git a/drivers/media/dvb/frontends/drx397xD.h b/drivers/media/dvb/frontends/drx397xD.h<br/>index ddc7a07971b7..ba05d17290c6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/frontends/drx397xD.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/dvb/frontends/drx397xD.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/frontends/drx397xD.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/drx397xD.h</a></div><div class='hunk'>@@ -28,7 +28,7 @@</div><div class='ctx'> #define DRX_F_OFFSET	36000000</div><div class='ctx'> </div><div class='ctx'> #define I2C_ADR_C0(x) \</div><div class='del'>-(	(u32)cpu_to_le32( \</div><div class='add'>+(	cpu_to_le32( \</div><div class='ctx'> 		(u32)( \</div><div class='ctx'> 			(((u32)(x) &amp; (u32)0x000000ffUL)      ) | \</div><div class='ctx'> 			(((u32)(x) &amp; (u32)0x0000ff00UL) &lt;&lt; 16) | \</div><div class='hunk'>@@ -38,7 +38,7 @@</div><div class='ctx'> )</div><div class='ctx'> </div><div class='ctx'> #define I2C_ADR_E0(x) \</div><div class='del'>-(	(u32)cpu_to_le32( \</div><div class='add'>+(	cpu_to_le32( \</div><div class='ctx'> 		(u32)( \</div><div class='ctx'> 			(((u32)(x) &amp; (u32)0x000000ffUL)      ) | \</div><div class='ctx'> 			(((u32)(x) &amp; (u32)0x0000ff00UL) &lt;&lt; 16) | \</div><div class='hunk'>@@ -122,7 +122,7 @@ extern struct dvb_frontend* drx397xD_attach(const struct drx397xD_config *config</div><div class='ctx'> static inline struct dvb_frontend* drx397xD_attach(const struct drx397xD_config *config,</div><div class='ctx'> 					   struct i2c_adapter *i2c)</div><div class='ctx'> {</div><div class='del'>-	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__);</div><div class='add'>+	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_DVB_DRX397XD */</div><div class='head'>diff --git a/drivers/media/dvb/frontends/dvb_dummy_fe.c b/drivers/media/dvb/frontends/dvb_dummy_fe.c<br/>index fed09dfb2b7c..db8a937cc630 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/frontends/dvb_dummy_fe.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/dvb/frontends/dvb_dummy_fe.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/frontends/dvb_dummy_fe.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/dvb_dummy_fe.c</a></div><div class='hunk'>@@ -75,9 +75,10 @@ static int dvb_dummy_fe_get_frontend(struct dvb_frontend* fe, struct dvb_fronten</div><div class='ctx'> </div><div class='ctx'> static int dvb_dummy_fe_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *p)</div><div class='ctx'> {</div><div class='del'>-	if (fe-&gt;ops-&gt;tuner_ops-&gt;set_params) {</div><div class='del'>-		fe-&gt;ops-&gt;tuner_ops-&gt;set_params(fe, p);</div><div class='del'>-		if (fe-&gt;ops-&gt;i2c_gate_ctrl) fe-&gt;ops-&gt;i2c_gate_ctrl(fe, 0);</div><div class='add'>+	if (fe-&gt;ops.tuner_ops.set_params) {</div><div class='add'>+		fe-&gt;ops.tuner_ops.set_params(fe, p);</div><div class='add'>+		if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+			fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -131,7 +132,7 @@ error:</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops dvb_dummy_fe_qpsk_ops;</div><div class='ctx'> </div><div class='del'>-struct dvb_frontend* dvb_dummy_fe_qpsk_attach()</div><div class='add'>+struct dvb_frontend *dvb_dummy_fe_qpsk_attach(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct dvb_dummy_fe_state* state = NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -151,7 +152,7 @@ error:</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops dvb_dummy_fe_qam_ops;</div><div class='ctx'> </div><div class='del'>-struct dvb_frontend* dvb_dummy_fe_qam_attach()</div><div class='add'>+struct dvb_frontend *dvb_dummy_fe_qam_attach(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct dvb_dummy_fe_state* state = NULL;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/dvb/frontends/eds1547.h b/drivers/media/dvb/frontends/eds1547.h<br/>new file mode 100644<br/>index 000000000000..fa79b7c83dd2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/frontends/eds1547.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/eds1547.h</a></div><div class='hunk'>@@ -0,0 +1,133 @@</div><div class='add'>+/* eds1547.h Earda EDS-1547 tuner support</div><div class='add'>+*</div><div class='add'>+* Copyright (C) 2008 Igor M. Liplianin (liplianin@me.by)</div><div class='add'>+*</div><div class='add'>+*	This program is free software; you can redistribute it and/or modify it</div><div class='add'>+*	under the terms of the GNU General Public License as published by the</div><div class='add'>+*	Free Software Foundation, version 2.</div><div class='add'>+*</div><div class='add'>+* see Documentation/dvb/README.dvb-usb for more information</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#ifndef EDS1547</div><div class='add'>+#define EDS1547</div><div class='add'>+</div><div class='add'>+static u8 stv0288_earda_inittab[] = {</div><div class='add'>+	0x01, 0x57,</div><div class='add'>+	0x02, 0x20,</div><div class='add'>+	0x03, 0x8e,</div><div class='add'>+	0x04, 0x8e,</div><div class='add'>+	0x05, 0x12,</div><div class='add'>+	0x06, 0x00,</div><div class='add'>+	0x07, 0x00,</div><div class='add'>+	0x09, 0x00,</div><div class='add'>+	0x0a, 0x04,</div><div class='add'>+	0x0b, 0x00,</div><div class='add'>+	0x0c, 0x00,</div><div class='add'>+	0x0d, 0x00,</div><div class='add'>+	0x0e, 0xd4,</div><div class='add'>+	0x0f, 0x30,</div><div class='add'>+	0x11, 0x44,</div><div class='add'>+	0x12, 0x03,</div><div class='add'>+	0x13, 0x48,</div><div class='add'>+	0x14, 0x84,</div><div class='add'>+	0x15, 0x45,</div><div class='add'>+	0x16, 0xb7,</div><div class='add'>+	0x17, 0x9c,</div><div class='add'>+	0x18, 0x00,</div><div class='add'>+	0x19, 0xa6,</div><div class='add'>+	0x1a, 0x88,</div><div class='add'>+	0x1b, 0x8f,</div><div class='add'>+	0x1c, 0xf0,</div><div class='add'>+	0x20, 0x0b,</div><div class='add'>+	0x21, 0x54,</div><div class='add'>+	0x22, 0x00,</div><div class='add'>+	0x23, 0x00,</div><div class='add'>+	0x2b, 0xff,</div><div class='add'>+	0x2c, 0xf7,</div><div class='add'>+	0x30, 0x00,</div><div class='add'>+	0x31, 0x1e,</div><div class='add'>+	0x32, 0x14,</div><div class='add'>+	0x33, 0x0f,</div><div class='add'>+	0x34, 0x09,</div><div class='add'>+	0x35, 0x0c,</div><div class='add'>+	0x36, 0x05,</div><div class='add'>+	0x37, 0x2f,</div><div class='add'>+	0x38, 0x16,</div><div class='add'>+	0x39, 0xbd,</div><div class='add'>+	0x3a, 0x00,</div><div class='add'>+	0x3b, 0x13,</div><div class='add'>+	0x3c, 0x11,</div><div class='add'>+	0x3d, 0x30,</div><div class='add'>+	0x40, 0x63,</div><div class='add'>+	0x41, 0x04,</div><div class='add'>+	0x42, 0x60,</div><div class='add'>+	0x43, 0x00,</div><div class='add'>+	0x44, 0x00,</div><div class='add'>+	0x45, 0x00,</div><div class='add'>+	0x46, 0x00,</div><div class='add'>+	0x47, 0x00,</div><div class='add'>+	0x4a, 0x00,</div><div class='add'>+	0x50, 0x10,</div><div class='add'>+	0x51, 0x36,</div><div class='add'>+	0x52, 0x09,</div><div class='add'>+	0x53, 0x94,</div><div class='add'>+	0x54, 0x62,</div><div class='add'>+	0x55, 0x29,</div><div class='add'>+	0x56, 0x64,</div><div class='add'>+	0x57, 0x2b,</div><div class='add'>+	0x58, 0x54,</div><div class='add'>+	0x59, 0x86,</div><div class='add'>+	0x5a, 0x00,</div><div class='add'>+	0x5b, 0x9b,</div><div class='add'>+	0x5c, 0x08,</div><div class='add'>+	0x5d, 0x7f,</div><div class='add'>+	0x5e, 0x00,</div><div class='add'>+	0x5f, 0xff,</div><div class='add'>+	0x70, 0x00,</div><div class='add'>+	0x71, 0x00,</div><div class='add'>+	0x72, 0x00,</div><div class='add'>+	0x74, 0x00,</div><div class='add'>+	0x75, 0x00,</div><div class='add'>+	0x76, 0x00,</div><div class='add'>+	0x81, 0x00,</div><div class='add'>+	0x82, 0x3f,</div><div class='add'>+	0x83, 0x3f,</div><div class='add'>+	0x84, 0x00,</div><div class='add'>+	0x85, 0x00,</div><div class='add'>+	0x88, 0x00,</div><div class='add'>+	0x89, 0x00,</div><div class='add'>+	0x8a, 0x00,</div><div class='add'>+	0x8b, 0x00,</div><div class='add'>+	0x8c, 0x00,</div><div class='add'>+	0x90, 0x00,</div><div class='add'>+	0x91, 0x00,</div><div class='add'>+	0x92, 0x00,</div><div class='add'>+	0x93, 0x00,</div><div class='add'>+	0x94, 0x1c,</div><div class='add'>+	0x97, 0x00,</div><div class='add'>+	0xa0, 0x48,</div><div class='add'>+	0xa1, 0x00,</div><div class='add'>+	0xb0, 0xb8,</div><div class='add'>+	0xb1, 0x3a,</div><div class='add'>+	0xb2, 0x10,</div><div class='add'>+	0xb3, 0x82,</div><div class='add'>+	0xb4, 0x80,</div><div class='add'>+	0xb5, 0x82,</div><div class='add'>+	0xb6, 0x82,</div><div class='add'>+	0xb7, 0x82,</div><div class='add'>+	0xb8, 0x20,</div><div class='add'>+	0xb9, 0x00,</div><div class='add'>+	0xf0, 0x00,</div><div class='add'>+	0xf1, 0x00,</div><div class='add'>+	0xf2, 0xc0,</div><div class='add'>+	0xff,0xff,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct stv0288_config earda_config = {</div><div class='add'>+	.demod_address = 0x68,</div><div class='add'>+	.min_delay_ms = 100,</div><div class='add'>+	.inittab = stv0288_earda_inittab,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/media/dvb/frontends/lgs8gl5.c b/drivers/media/dvb/frontends/lgs8gl5.c<br/>new file mode 100644<br/>index 000000000000..855852fddf22<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/frontends/lgs8gl5.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/lgs8gl5.c</a></div><div class='hunk'>@@ -0,0 +1,454 @@</div><div class='add'>+/*</div><div class='add'>+    Legend Silicon LGS-8GL5 DMB-TH OFDM demodulator driver</div><div class='add'>+</div><div class='add'>+    Copyright (C) 2008 Sirius International (Hong Kong) Limited</div><div class='add'>+	Timothy Lee &lt;timothy.lee@siriushk.com&gt;</div><div class='add'>+</div><div class='add'>+    This program is free software; you can redistribute it and/or modify</div><div class='add'>+    it under the terms of the GNU General Public License as published by</div><div class='add'>+    the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+    (at your option) any later version.</div><div class='add'>+</div><div class='add'>+    This program is distributed in the hope that it will be useful,</div><div class='add'>+    but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+    GNU General Public License for more details.</div><div class='add'>+</div><div class='add'>+    You should have received a copy of the GNU General Public License</div><div class='add'>+    along with this program; if not, write to the Free Software</div><div class='add'>+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='add'>+</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include "dvb_frontend.h"</div><div class='add'>+#include "lgs8gl5.h"</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define REG_RESET		0x02</div><div class='add'>+#define REG_RESET_OFF			0x01</div><div class='add'>+#define REG_03			0x03</div><div class='add'>+#define REG_04			0x04</div><div class='add'>+#define REG_07			0x07</div><div class='add'>+#define REG_09			0x09</div><div class='add'>+#define REG_0A			0x0a</div><div class='add'>+#define REG_0B			0x0b</div><div class='add'>+#define REG_0C			0x0c</div><div class='add'>+#define REG_37			0x37</div><div class='add'>+#define REG_STRENGTH		0x4b</div><div class='add'>+#define REG_STRENGTH_MASK		0x7f</div><div class='add'>+#define REG_STRENGTH_CARRIER		0x80</div><div class='add'>+#define REG_INVERSION		0x7c</div><div class='add'>+#define REG_INVERSION_ON		0x80</div><div class='add'>+#define REG_7D			0x7d</div><div class='add'>+#define REG_7E			0x7e</div><div class='add'>+#define REG_A2			0xa2</div><div class='add'>+#define REG_STATUS		0xa4</div><div class='add'>+#define REG_STATUS_SYNC		0x04</div><div class='add'>+#define REG_STATUS_LOCK		0x01</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+struct lgs8gl5_state {</div><div class='add'>+	struct i2c_adapter *i2c;</div><div class='add'>+	const struct lgs8gl5_config *config;</div><div class='add'>+	struct dvb_frontend frontend;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int debug;</div><div class='add'>+#define dprintk(args...) \</div><div class='add'>+	do { \</div><div class='add'>+		if (debug) \</div><div class='add'>+			printk(KERN_DEBUG "lgs8gl5: " args); \</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Writes into demod's register */</div><div class='add'>+static int</div><div class='add'>+lgs8gl5_write_reg(struct lgs8gl5_state *state, u8 reg, u8 data)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u8 buf[] = {reg, data};</div><div class='add'>+	struct i2c_msg msg = {</div><div class='add'>+		.addr  = state-&gt;config-&gt;demod_address,</div><div class='add'>+		.flags = 0,</div><div class='add'>+		.buf   = buf,</div><div class='add'>+		.len   = 2</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ret = i2c_transfer(state-&gt;i2c, &amp;msg, 1);</div><div class='add'>+	if (ret != 1)</div><div class='add'>+		dprintk("%s: error (reg=0x%02x, val=0x%02x, ret=%i)\n",</div><div class='add'>+			__func__, reg, data, ret);</div><div class='add'>+	return (ret != 1) ? -1 : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Reads from demod's register */</div><div class='add'>+static int</div><div class='add'>+lgs8gl5_read_reg(struct lgs8gl5_state *state, u8 reg)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u8 b0[] = {reg};</div><div class='add'>+	u8 b1[] = {0};</div><div class='add'>+	struct i2c_msg msg[2] = {</div><div class='add'>+		{</div><div class='add'>+			.addr  = state-&gt;config-&gt;demod_address,</div><div class='add'>+			.flags = 0,</div><div class='add'>+			.buf   = b0,</div><div class='add'>+			.len   = 1</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.addr  = state-&gt;config-&gt;demod_address,</div><div class='add'>+			.flags = I2C_M_RD,</div><div class='add'>+			.buf   = b1,</div><div class='add'>+			.len   = 1</div><div class='add'>+		}</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ret = i2c_transfer(state-&gt;i2c, msg, 2);</div><div class='add'>+	if (ret != 2)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	return b1[0];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+lgs8gl5_update_reg(struct lgs8gl5_state *state, u8 reg, u8 data)</div><div class='add'>+{</div><div class='add'>+	lgs8gl5_read_reg(state, reg);</div><div class='add'>+	lgs8gl5_write_reg(state, reg, data);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Writes into alternate device's register */</div><div class='add'>+/* TODO:  Find out what that device is for! */</div><div class='add'>+static int</div><div class='add'>+lgs8gl5_update_alt_reg(struct lgs8gl5_state *state, u8 reg, u8 data)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u8 b0[] = {reg};</div><div class='add'>+	u8 b1[] = {0};</div><div class='add'>+	u8 b2[] = {reg, data};</div><div class='add'>+	struct i2c_msg msg[3] = {</div><div class='add'>+		{</div><div class='add'>+			.addr  = state-&gt;config-&gt;demod_address + 2,</div><div class='add'>+			.flags = 0,</div><div class='add'>+			.buf   = b0,</div><div class='add'>+			.len   = 1</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.addr  = state-&gt;config-&gt;demod_address + 2,</div><div class='add'>+			.flags = I2C_M_RD,</div><div class='add'>+			.buf   = b1,</div><div class='add'>+			.len   = 1</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.addr  = state-&gt;config-&gt;demod_address + 2,</div><div class='add'>+			.flags = 0,</div><div class='add'>+			.buf   = b2,</div><div class='add'>+			.len   = 2</div><div class='add'>+		},</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ret = i2c_transfer(state-&gt;i2c, msg, 3);</div><div class='add'>+	return (ret != 3) ? -1 : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+lgs8gl5_soft_reset(struct lgs8gl5_state *state)</div><div class='add'>+{</div><div class='add'>+	u8 val;</div><div class='add'>+</div><div class='add'>+	dprintk("%s\n", __func__);</div><div class='add'>+</div><div class='add'>+	val = lgs8gl5_read_reg(state, REG_RESET);</div><div class='add'>+	lgs8gl5_write_reg(state, REG_RESET, val &amp; ~REG_RESET_OFF);</div><div class='add'>+	lgs8gl5_write_reg(state, REG_RESET, val | REG_RESET_OFF);</div><div class='add'>+	msleep(5);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Starts demodulation */</div><div class='add'>+static void</div><div class='add'>+lgs8gl5_start_demod(struct lgs8gl5_state *state)</div><div class='add'>+{</div><div class='add'>+	u8  val;</div><div class='add'>+	int n;</div><div class='add'>+</div><div class='add'>+	dprintk("%s\n", __func__);</div><div class='add'>+</div><div class='add'>+	lgs8gl5_update_alt_reg(state, 0xc2, 0x28);</div><div class='add'>+	lgs8gl5_soft_reset(state);</div><div class='add'>+	lgs8gl5_update_reg(state, REG_07, 0x10);</div><div class='add'>+	lgs8gl5_update_reg(state, REG_07, 0x10);</div><div class='add'>+	lgs8gl5_write_reg(state, REG_09, 0x0e);</div><div class='add'>+	lgs8gl5_write_reg(state, REG_0A, 0xe5);</div><div class='add'>+	lgs8gl5_write_reg(state, REG_0B, 0x35);</div><div class='add'>+	lgs8gl5_write_reg(state, REG_0C, 0x30);</div><div class='add'>+</div><div class='add'>+	lgs8gl5_update_reg(state, REG_03, 0x00);</div><div class='add'>+	lgs8gl5_update_reg(state, REG_7E, 0x01);</div><div class='add'>+	lgs8gl5_update_alt_reg(state, 0xc5, 0x00);</div><div class='add'>+	lgs8gl5_update_reg(state, REG_04, 0x02);</div><div class='add'>+	lgs8gl5_update_reg(state, REG_37, 0x01);</div><div class='add'>+	lgs8gl5_soft_reset(state);</div><div class='add'>+</div><div class='add'>+	/* Wait for carrier */</div><div class='add'>+	for (n = 0;  n &lt; 10;  n++) {</div><div class='add'>+		val = lgs8gl5_read_reg(state, REG_STRENGTH);</div><div class='add'>+		dprintk("Wait for carrier[%d] 0x%02X\n", n, val);</div><div class='add'>+		if (val &amp; REG_STRENGTH_CARRIER)</div><div class='add'>+			break;</div><div class='add'>+		msleep(4);</div><div class='add'>+	}</div><div class='add'>+	if (!(val &amp; REG_STRENGTH_CARRIER))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Wait for lock */</div><div class='add'>+	for (n = 0;  n &lt; 20;  n++) {</div><div class='add'>+		val = lgs8gl5_read_reg(state, REG_STATUS);</div><div class='add'>+		dprintk("Wait for lock[%d] 0x%02X\n", n, val);</div><div class='add'>+		if (val &amp; REG_STATUS_LOCK)</div><div class='add'>+			break;</div><div class='add'>+		msleep(12);</div><div class='add'>+	}</div><div class='add'>+	if (!(val &amp; REG_STATUS_LOCK))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	lgs8gl5_write_reg(state, REG_7D, lgs8gl5_read_reg(state, REG_A2));</div><div class='add'>+	lgs8gl5_soft_reset(state);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+lgs8gl5_init(struct dvb_frontend *fe)</div><div class='add'>+{</div><div class='add'>+	struct lgs8gl5_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+</div><div class='add'>+	dprintk("%s\n", __func__);</div><div class='add'>+</div><div class='add'>+	lgs8gl5_update_alt_reg(state, 0xc2, 0x28);</div><div class='add'>+	lgs8gl5_soft_reset(state);</div><div class='add'>+	lgs8gl5_update_reg(state, REG_07, 0x10);</div><div class='add'>+	lgs8gl5_update_reg(state, REG_07, 0x10);</div><div class='add'>+	lgs8gl5_write_reg(state, REG_09, 0x0e);</div><div class='add'>+	lgs8gl5_write_reg(state, REG_0A, 0xe5);</div><div class='add'>+	lgs8gl5_write_reg(state, REG_0B, 0x35);</div><div class='add'>+	lgs8gl5_write_reg(state, REG_0C, 0x30);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+lgs8gl5_read_status(struct dvb_frontend *fe, fe_status_t *status)</div><div class='add'>+{</div><div class='add'>+	struct lgs8gl5_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	u8 level = lgs8gl5_read_reg(state, REG_STRENGTH);</div><div class='add'>+	u8 flags = lgs8gl5_read_reg(state, REG_STATUS);</div><div class='add'>+</div><div class='add'>+	*status = 0;</div><div class='add'>+</div><div class='add'>+	if ((level &amp; REG_STRENGTH_MASK) &gt; 0)</div><div class='add'>+		*status |= FE_HAS_SIGNAL;</div><div class='add'>+	if (level &amp; REG_STRENGTH_CARRIER)</div><div class='add'>+		*status |= FE_HAS_CARRIER;</div><div class='add'>+	if (flags &amp; REG_STATUS_SYNC)</div><div class='add'>+		*status |= FE_HAS_SYNC;</div><div class='add'>+	if (flags &amp; REG_STATUS_LOCK)</div><div class='add'>+		*status |= FE_HAS_LOCK;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+lgs8gl5_read_ber(struct dvb_frontend *fe, u32 *ber)</div><div class='add'>+{</div><div class='add'>+	*ber = 0;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+lgs8gl5_read_signal_strength(struct dvb_frontend *fe, u16 *signal_strength)</div><div class='add'>+{</div><div class='add'>+	struct lgs8gl5_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	u8 level = lgs8gl5_read_reg(state, REG_STRENGTH);</div><div class='add'>+	*signal_strength = (level &amp; REG_STRENGTH_MASK) &lt;&lt; 8;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+lgs8gl5_read_snr(struct dvb_frontend *fe, u16 *snr)</div><div class='add'>+{</div><div class='add'>+	struct lgs8gl5_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	u8 level = lgs8gl5_read_reg(state, REG_STRENGTH);</div><div class='add'>+	*snr = (level &amp; REG_STRENGTH_MASK) &lt;&lt; 8;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+lgs8gl5_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks)</div><div class='add'>+{</div><div class='add'>+	*ucblocks = 0;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+lgs8gl5_set_frontend(struct dvb_frontend *fe,</div><div class='add'>+		struct dvb_frontend_parameters *p)</div><div class='add'>+{</div><div class='add'>+	struct lgs8gl5_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+</div><div class='add'>+	dprintk("%s\n", __func__);</div><div class='add'>+</div><div class='add'>+	if (p-&gt;u.ofdm.bandwidth != BANDWIDTH_8_MHZ)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (fe-&gt;ops.tuner_ops.set_params) {</div><div class='add'>+		fe-&gt;ops.tuner_ops.set_params(fe, p);</div><div class='add'>+		if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+			fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* lgs8gl5_set_inversion(state, p-&gt;inversion); */</div><div class='add'>+</div><div class='add'>+	lgs8gl5_start_demod(state);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+lgs8gl5_get_frontend(struct dvb_frontend *fe,</div><div class='add'>+		struct dvb_frontend_parameters *p)</div><div class='add'>+{</div><div class='add'>+	struct lgs8gl5_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	u8 inv = lgs8gl5_read_reg(state, REG_INVERSION);</div><div class='add'>+	struct dvb_ofdm_parameters *o = &amp;p-&gt;u.ofdm;</div><div class='add'>+</div><div class='add'>+	p-&gt;inversion = (inv &amp; REG_INVERSION_ON) ? INVERSION_ON : INVERSION_OFF;</div><div class='add'>+</div><div class='add'>+	o-&gt;code_rate_HP = FEC_1_2;</div><div class='add'>+	o-&gt;code_rate_LP = FEC_7_8;</div><div class='add'>+	o-&gt;guard_interval = GUARD_INTERVAL_1_32;</div><div class='add'>+	o-&gt;transmission_mode = TRANSMISSION_MODE_2K;</div><div class='add'>+	o-&gt;constellation = QAM_64;</div><div class='add'>+	o-&gt;hierarchy_information = HIERARCHY_NONE;</div><div class='add'>+	o-&gt;bandwidth = BANDWIDTH_8_MHZ;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+lgs8gl5_get_tune_settings(struct dvb_frontend *fe,</div><div class='add'>+		struct dvb_frontend_tune_settings *fesettings)</div><div class='add'>+{</div><div class='add'>+	fesettings-&gt;min_delay_ms = 240;</div><div class='add'>+	fesettings-&gt;step_size    = 0;</div><div class='add'>+	fesettings-&gt;max_drift    = 0;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+lgs8gl5_release(struct dvb_frontend *fe)</div><div class='add'>+{</div><div class='add'>+	struct lgs8gl5_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	kfree(state);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static struct dvb_frontend_ops lgs8gl5_ops;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+struct dvb_frontend*</div><div class='add'>+lgs8gl5_attach(const struct lgs8gl5_config *config, struct i2c_adapter *i2c)</div><div class='add'>+{</div><div class='add'>+	struct lgs8gl5_state *state = NULL;</div><div class='add'>+</div><div class='add'>+	dprintk("%s\n", __func__);</div><div class='add'>+</div><div class='add'>+	/* Allocate memory for the internal state */</div><div class='add'>+	state = kmalloc(sizeof(struct lgs8gl5_state), GFP_KERNEL);</div><div class='add'>+	if (state == NULL)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	/* Setup the state */</div><div class='add'>+	state-&gt;config = config;</div><div class='add'>+	state-&gt;i2c    = i2c;</div><div class='add'>+</div><div class='add'>+	/* Check if the demod is there */</div><div class='add'>+	if (lgs8gl5_read_reg(state, REG_RESET) &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	/* Create dvb_frontend */</div><div class='add'>+	memcpy(&amp;state-&gt;frontend.ops, &amp;lgs8gl5_ops,</div><div class='add'>+		sizeof(struct dvb_frontend_ops));</div><div class='add'>+	state-&gt;frontend.demodulator_priv = state;</div><div class='add'>+	return &amp;state-&gt;frontend;</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	kfree(state);</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(lgs8gl5_attach);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static struct dvb_frontend_ops lgs8gl5_ops = {</div><div class='add'>+	.info = {</div><div class='add'>+		.name			= "Legend Silicon LGS-8GL5 DMB-TH",</div><div class='add'>+		.type			= FE_OFDM,</div><div class='add'>+		.frequency_min		= 474000000,</div><div class='add'>+		.frequency_max		= 858000000,</div><div class='add'>+		.frequency_stepsize	= 10000,</div><div class='add'>+		.frequency_tolerance	= 0,</div><div class='add'>+		.caps = FE_CAN_FEC_AUTO |</div><div class='add'>+			FE_CAN_QPSK | FE_CAN_QAM_16 | FE_CAN_QAM_32 |</div><div class='add'>+			FE_CAN_QAM_64 | FE_CAN_QAM_AUTO |</div><div class='add'>+			FE_CAN_TRANSMISSION_MODE_AUTO |</div><div class='add'>+			FE_CAN_BANDWIDTH_AUTO |</div><div class='add'>+			FE_CAN_GUARD_INTERVAL_AUTO |</div><div class='add'>+			FE_CAN_HIERARCHY_AUTO |</div><div class='add'>+			FE_CAN_RECOVER</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	.release = lgs8gl5_release,</div><div class='add'>+</div><div class='add'>+	.init = lgs8gl5_init,</div><div class='add'>+</div><div class='add'>+	.set_frontend = lgs8gl5_set_frontend,</div><div class='add'>+	.get_frontend = lgs8gl5_get_frontend,</div><div class='add'>+	.get_tune_settings = lgs8gl5_get_tune_settings,</div><div class='add'>+</div><div class='add'>+	.read_status = lgs8gl5_read_status,</div><div class='add'>+	.read_ber = lgs8gl5_read_ber,</div><div class='add'>+	.read_signal_strength = lgs8gl5_read_signal_strength,</div><div class='add'>+	.read_snr = lgs8gl5_read_snr,</div><div class='add'>+	.read_ucblocks = lgs8gl5_read_ucblocks,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+module_param(debug, int, 0644);</div><div class='add'>+MODULE_PARM_DESC(debug, "Turn on/off frontend debugging (default:off).");</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("Legend Silicon LGS-8GL5 DMB-TH Demodulator driver");</div><div class='add'>+MODULE_AUTHOR("Timothy Lee");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/media/dvb/frontends/lgs8gl5.h b/drivers/media/dvb/frontends/lgs8gl5.h<br/>new file mode 100644<br/>index 000000000000..d14176787a7d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/frontends/lgs8gl5.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/lgs8gl5.h</a></div><div class='hunk'>@@ -0,0 +1,45 @@</div><div class='add'>+/*</div><div class='add'>+    Legend Silicon LGS-8GL5 DMB-TH OFDM demodulator driver</div><div class='add'>+</div><div class='add'>+    Copyright (C) 2008 Sirius International (Hong Kong) Limited</div><div class='add'>+	Timothy Lee &lt;timothy.lee@siriushk.com&gt;</div><div class='add'>+</div><div class='add'>+    This program is free software; you can redistribute it and/or modify</div><div class='add'>+    it under the terms of the GNU General Public License as published by</div><div class='add'>+    the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+    (at your option) any later version.</div><div class='add'>+</div><div class='add'>+    This program is distributed in the hope that it will be useful,</div><div class='add'>+    but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+    GNU General Public License for more details.</div><div class='add'>+</div><div class='add'>+    You should have received a copy of the GNU General Public License</div><div class='add'>+    along with this program; if not, write to the Free Software</div><div class='add'>+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='add'>+</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#ifndef LGS8GL5_H</div><div class='add'>+#define LGS8GL5_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/dvb/frontend.h&gt;</div><div class='add'>+</div><div class='add'>+struct lgs8gl5_config {</div><div class='add'>+	/* the demodulator's i2c address */</div><div class='add'>+	u8 demod_address;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_DVB_LGS8GL5) || \</div><div class='add'>+	(defined(CONFIG_DVB_LGS8GL5_MODULE) &amp;&amp; defined(MODULE))</div><div class='add'>+extern struct dvb_frontend *lgs8gl5_attach(</div><div class='add'>+	const struct lgs8gl5_config *config, struct i2c_adapter *i2c);</div><div class='add'>+#else</div><div class='add'>+static inline struct dvb_frontend *lgs8gl5_attach(</div><div class='add'>+	const struct lgs8gl5_config *config, struct i2c_adapter *i2c) {</div><div class='add'>+	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_DVB_LGS8GL5 */</div><div class='add'>+</div><div class='add'>+#endif /* LGS8GL5_H */</div><div class='head'>diff --git a/drivers/media/dvb/frontends/nxt200x.c b/drivers/media/dvb/frontends/nxt200x.c<br/>index af298358e822..a8429ebfa8a2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/frontends/nxt200x.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/dvb/frontends/nxt200x.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/frontends/nxt200x.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/nxt200x.c</a></div><div class='hunk'>@@ -80,7 +80,7 @@ static int i2c_writebytes (struct nxt200x_state* state, u8 addr, u8 *buf, u8 len</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u8 i2c_readbytes (struct nxt200x_state* state, u8 addr, u8* buf, u8 len)</div><div class='add'>+static int i2c_readbytes(struct nxt200x_state *state, u8 addr, u8 *buf, u8 len)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct i2c_msg msg = { .addr = addr, .flags = I2C_M_RD, .buf = buf, .len = len };</div><div class='hunk'>@@ -111,7 +111,7 @@ static int nxt200x_writebytes (struct nxt200x_state* state, u8 reg,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u8 nxt200x_readbytes (struct nxt200x_state* state, u8 reg, u8* buf, u8 len)</div><div class='add'>+static int nxt200x_readbytes(struct nxt200x_state *state, u8 reg, u8 *buf, u8 len)</div><div class='ctx'> {</div><div class='ctx'> 	u8 reg2 [] = { reg };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/dvb/frontends/or51211.c b/drivers/media/dvb/frontends/or51211.c<br/>index 6afe12aaca4e..16cf2fdd5d7d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/frontends/or51211.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/dvb/frontends/or51211.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/frontends/or51211.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/or51211.c</a></div><div class='hunk'>@@ -88,7 +88,7 @@ static int i2c_writebytes (struct or51211_state* state, u8 reg, const u8 *buf,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u8 i2c_readbytes (struct or51211_state* state, u8 reg, u8* buf, int len)</div><div class='add'>+static int i2c_readbytes(struct or51211_state *state, u8 reg, u8 *buf, int len)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct i2c_msg msg;</div><div class='head'>diff --git a/drivers/media/dvb/frontends/s5h1409.c b/drivers/media/dvb/frontends/s5h1409.c<br/>index 7500a1c53e68..cf4d8936bb83 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/frontends/s5h1409.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/dvb/frontends/s5h1409.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/frontends/s5h1409.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/s5h1409.c</a></div><div class='hunk'>@@ -30,10 +30,10 @@</div><div class='ctx'> </div><div class='ctx'> struct s5h1409_state {</div><div class='ctx'> </div><div class='del'>-	struct i2c_adapter* i2c;</div><div class='add'>+	struct i2c_adapter *i2c;</div><div class='ctx'> </div><div class='ctx'> 	/* configuration settings */</div><div class='del'>-	const struct s5h1409_config* config;</div><div class='add'>+	const struct s5h1409_config *config;</div><div class='ctx'> </div><div class='ctx'> 	struct dvb_frontend frontend;</div><div class='ctx'> </div><div class='hunk'>@@ -48,6 +48,9 @@ struct s5h1409_state {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int debug;</div><div class='add'>+module_param(debug, int, 0644);</div><div class='add'>+MODULE_PARM_DESC(debug, "Enable verbose debug messages");</div><div class='add'>+</div><div class='ctx'> #define dprintk	if (debug) printk</div><div class='ctx'> </div><div class='ctx'> /* Register values to initialise the demod, this will set VSB by default */</div><div class='hunk'>@@ -299,10 +302,10 @@ static struct qam256_snr_tab {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* 8 bit registers, 16 bit values */</div><div class='del'>-static int s5h1409_writereg(struct s5h1409_state* state, u8 reg, u16 data)</div><div class='add'>+static int s5h1409_writereg(struct s5h1409_state *state, u8 reg, u16 data)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	u8 buf [] = { reg, data &gt;&gt; 8,  data &amp; 0xff };</div><div class='add'>+	u8 buf[] = { reg, data &gt;&gt; 8,  data &amp; 0xff };</div><div class='ctx'> </div><div class='ctx'> 	struct i2c_msg msg = { .addr = state-&gt;config-&gt;demod_address,</div><div class='ctx'> 			       .flags = 0, .buf = buf, .len = 3 };</div><div class='hunk'>@@ -310,19 +313,19 @@ static int s5h1409_writereg(struct s5h1409_state* state, u8 reg, u16 data)</div><div class='ctx'> 	ret = i2c_transfer(state-&gt;i2c, &amp;msg, 1);</div><div class='ctx'> </div><div class='ctx'> 	if (ret != 1)</div><div class='del'>-		printk("%s: writereg error (reg == 0x%02x, val == 0x%04x, "</div><div class='add'>+		printk(KERN_ERR "%s: error (reg == 0x%02x, val == 0x%04x, "</div><div class='ctx'> 		       "ret == %i)\n", __func__, reg, data, ret);</div><div class='ctx'> </div><div class='ctx'> 	return (ret != 1) ? -1 : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u16 s5h1409_readreg(struct s5h1409_state* state, u8 reg)</div><div class='add'>+static u16 s5h1409_readreg(struct s5h1409_state *state, u8 reg)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	u8 b0 [] = { reg };</div><div class='del'>-	u8 b1 [] = { 0, 0 };</div><div class='add'>+	u8 b0[] = { reg };</div><div class='add'>+	u8 b1[] = { 0, 0 };</div><div class='ctx'> </div><div class='del'>-	struct i2c_msg msg [] = {</div><div class='add'>+	struct i2c_msg msg[] = {</div><div class='ctx'> 		{ .addr = state-&gt;config-&gt;demod_address, .flags = 0,</div><div class='ctx'> 		  .buf = b0, .len = 1 },</div><div class='ctx'> 		{ .addr = state-&gt;config-&gt;demod_address, .flags = I2C_M_RD,</div><div class='hunk'>@@ -335,9 +338,9 @@ static u16 s5h1409_readreg(struct s5h1409_state* state, u8 reg)</div><div class='ctx'> 	return (b1[0] &lt;&lt; 8) | b1[1];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int s5h1409_softreset(struct dvb_frontend* fe)</div><div class='add'>+static int s5h1409_softreset(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='del'>-	struct s5h1409_state* state = fe-&gt;demodulator_priv;</div><div class='add'>+	struct s5h1409_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> </div><div class='ctx'> 	dprintk("%s()\n", __func__);</div><div class='ctx'> </div><div class='hunk'>@@ -349,11 +352,11 @@ static int s5h1409_softreset(struct dvb_frontend* fe)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define S5H1409_VSB_IF_FREQ 5380</div><div class='del'>-#define S5H1409_QAM_IF_FREQ state-&gt;config-&gt;qam_if</div><div class='add'>+#define S5H1409_QAM_IF_FREQ (state-&gt;config-&gt;qam_if)</div><div class='ctx'> </div><div class='del'>-static int s5h1409_set_if_freq(struct dvb_frontend* fe, int KHz)</div><div class='add'>+static int s5h1409_set_if_freq(struct dvb_frontend *fe, int KHz)</div><div class='ctx'> {</div><div class='del'>-	struct s5h1409_state* state = fe-&gt;demodulator_priv;</div><div class='add'>+	struct s5h1409_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> </div><div class='ctx'> 	dprintk("%s(%d KHz)\n", __func__, KHz);</div><div class='ctx'> </div><div class='hunk'>@@ -376,26 +379,26 @@ static int s5h1409_set_if_freq(struct dvb_frontend* fe, int KHz)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int s5h1409_set_spectralinversion(struct dvb_frontend* fe, int inverted)</div><div class='add'>+static int s5h1409_set_spectralinversion(struct dvb_frontend *fe, int inverted)</div><div class='ctx'> {</div><div class='del'>-	struct s5h1409_state* state = fe-&gt;demodulator_priv;</div><div class='add'>+	struct s5h1409_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> </div><div class='ctx'> 	dprintk("%s(%d)\n", __func__, inverted);</div><div class='ctx'> </div><div class='del'>-	if(inverted == 1)</div><div class='add'>+	if (inverted == 1)</div><div class='ctx'> 		return s5h1409_writereg(state, 0x1b, 0x1101); /* Inverted */</div><div class='ctx'> 	else</div><div class='ctx'> 		return s5h1409_writereg(state, 0x1b, 0x0110); /* Normal */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int s5h1409_enable_modulation(struct dvb_frontend* fe,</div><div class='add'>+static int s5h1409_enable_modulation(struct dvb_frontend *fe,</div><div class='ctx'> 				     fe_modulation_t m)</div><div class='ctx'> {</div><div class='del'>-	struct s5h1409_state* state = fe-&gt;demodulator_priv;</div><div class='add'>+	struct s5h1409_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> </div><div class='ctx'> 	dprintk("%s(0x%08x)\n", __func__, m);</div><div class='ctx'> </div><div class='del'>-	switch(m) {</div><div class='add'>+	switch (m) {</div><div class='ctx'> 	case VSB_8:</div><div class='ctx'> 		dprintk("%s() VSB_8\n", __func__);</div><div class='ctx'> 		if (state-&gt;if_freq != S5H1409_VSB_IF_FREQ)</div><div class='hunk'>@@ -422,9 +425,9 @@ static int s5h1409_enable_modulation(struct dvb_frontend* fe,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int s5h1409_i2c_gate_ctrl(struct dvb_frontend* fe, int enable)</div><div class='add'>+static int s5h1409_i2c_gate_ctrl(struct dvb_frontend *fe, int enable)</div><div class='ctx'> {</div><div class='del'>-	struct s5h1409_state* state = fe-&gt;demodulator_priv;</div><div class='add'>+	struct s5h1409_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> </div><div class='ctx'> 	dprintk("%s(%d)\n", __func__, enable);</div><div class='ctx'> </div><div class='hunk'>@@ -434,9 +437,9 @@ static int s5h1409_i2c_gate_ctrl(struct dvb_frontend* fe, int enable)</div><div class='ctx'> 		return s5h1409_writereg(state, 0xf3, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int s5h1409_set_gpio(struct dvb_frontend* fe, int enable)</div><div class='add'>+static int s5h1409_set_gpio(struct dvb_frontend *fe, int enable)</div><div class='ctx'> {</div><div class='del'>-	struct s5h1409_state* state = fe-&gt;demodulator_priv;</div><div class='add'>+	struct s5h1409_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> </div><div class='ctx'> 	dprintk("%s(%d)\n", __func__, enable);</div><div class='ctx'> </div><div class='hunk'>@@ -448,18 +451,18 @@ static int s5h1409_set_gpio(struct dvb_frontend* fe, int enable)</div><div class='ctx'> 			s5h1409_readreg(state, 0xe3) &amp; 0xfeff);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int s5h1409_sleep(struct dvb_frontend* fe, int enable)</div><div class='add'>+static int s5h1409_sleep(struct dvb_frontend *fe, int enable)</div><div class='ctx'> {</div><div class='del'>-	struct s5h1409_state* state = fe-&gt;demodulator_priv;</div><div class='add'>+	struct s5h1409_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> </div><div class='ctx'> 	dprintk("%s(%d)\n", __func__, enable);</div><div class='ctx'> </div><div class='ctx'> 	return s5h1409_writereg(state, 0xf2, enable);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int s5h1409_register_reset(struct dvb_frontend* fe)</div><div class='add'>+static int s5h1409_register_reset(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='del'>-	struct s5h1409_state* state = fe-&gt;demodulator_priv;</div><div class='add'>+	struct s5h1409_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> </div><div class='ctx'> 	dprintk("%s()\n", __func__);</div><div class='ctx'> </div><div class='hunk'>@@ -483,7 +486,7 @@ static void s5h1409_set_qam_amhum_mode(struct dvb_frontend *fe)</div><div class='ctx'> 		reg &amp;= 0xff;</div><div class='ctx'> </div><div class='ctx'> 		s5h1409_writereg(state, 0x96, 0x00c);</div><div class='del'>-		if ((reg &lt; 0x38) || (reg &gt; 0x68) ) {</div><div class='add'>+		if ((reg &lt; 0x38) || (reg &gt; 0x68)) {</div><div class='ctx'> 			s5h1409_writereg(state, 0x93, 0x3332);</div><div class='ctx'> 			s5h1409_writereg(state, 0x9e, 0x2c37);</div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -514,7 +517,7 @@ static void s5h1409_set_qam_interleave_mode(struct dvb_frontend *fe)</div><div class='ctx'> </div><div class='ctx'> 			s5h1409_writereg(state, 0x96, 0x20);</div><div class='ctx'> 			s5h1409_writereg(state, 0xad,</div><div class='del'>-				( ((reg1 &amp; 0xf000) &gt;&gt; 4) | (reg2 &amp; 0xf0ff)) );</div><div class='add'>+				(((reg1 &amp; 0xf000) &gt;&gt; 4) | (reg2 &amp; 0xf0ff)));</div><div class='ctx'> 			s5h1409_writereg(state, 0xab,</div><div class='ctx'> 				s5h1409_readreg(state, 0xab) &amp; 0xeffe);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -529,10 +532,10 @@ static void s5h1409_set_qam_interleave_mode(struct dvb_frontend *fe)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Talk to the demod, set the FEC, GUARD, QAM settings etc */</div><div class='del'>-static int s5h1409_set_frontend (struct dvb_frontend* fe,</div><div class='add'>+static int s5h1409_set_frontend(struct dvb_frontend *fe,</div><div class='ctx'> 				 struct dvb_frontend_parameters *p)</div><div class='ctx'> {</div><div class='del'>-	struct s5h1409_state* state = fe-&gt;demodulator_priv;</div><div class='add'>+	struct s5h1409_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> </div><div class='ctx'> 	dprintk("%s(frequency=%d)\n", __func__, p-&gt;frequency);</div><div class='ctx'> </div><div class='hunk'>@@ -546,9 +549,11 @@ static int s5h1409_set_frontend (struct dvb_frontend* fe,</div><div class='ctx'> 	msleep(100);</div><div class='ctx'> </div><div class='ctx'> 	if (fe-&gt;ops.tuner_ops.set_params) {</div><div class='del'>-		if (fe-&gt;ops.i2c_gate_ctrl) fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='add'>+		if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+			fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='ctx'> 		fe-&gt;ops.tuner_ops.set_params(fe, p);</div><div class='del'>-		if (fe-&gt;ops.i2c_gate_ctrl) fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='add'>+		if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+			fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Optimize the demod for QAM */</div><div class='hunk'>@@ -592,17 +597,17 @@ static int s5h1409_set_mpeg_timing(struct dvb_frontend *fe, int mode)</div><div class='ctx'> </div><div class='ctx'> /* Reset the demod hardware and reset all of the configuration registers</div><div class='ctx'>    to a default state. */</div><div class='del'>-static int s5h1409_init (struct dvb_frontend* fe)</div><div class='add'>+static int s5h1409_init(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	struct s5h1409_state* state = fe-&gt;demodulator_priv;</div><div class='add'>+	struct s5h1409_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	dprintk("%s()\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	s5h1409_sleep(fe, 0);</div><div class='ctx'> 	s5h1409_register_reset(fe);</div><div class='ctx'> </div><div class='del'>-	for (i=0; i &lt; ARRAY_SIZE(init_tab); i++)</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(init_tab); i++)</div><div class='ctx'> 		s5h1409_writereg(state, init_tab[i].reg, init_tab[i].data);</div><div class='ctx'> </div><div class='ctx'> 	/* The datasheet says that after initialisation, VSB is default */</div><div class='hunk'>@@ -627,9 +632,9 @@ static int s5h1409_init (struct dvb_frontend* fe)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int s5h1409_read_status(struct dvb_frontend* fe, fe_status_t* status)</div><div class='add'>+static int s5h1409_read_status(struct dvb_frontend *fe, fe_status_t *status)</div><div class='ctx'> {</div><div class='del'>-	struct s5h1409_state* state = fe-&gt;demodulator_priv;</div><div class='add'>+	struct s5h1409_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	u16 reg;</div><div class='ctx'> 	u32 tuner_status = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -637,12 +642,12 @@ static int s5h1409_read_status(struct dvb_frontend* fe, fe_status_t* status)</div><div class='ctx'> </div><div class='ctx'> 	/* Get the demodulator status */</div><div class='ctx'> 	reg = s5h1409_readreg(state, 0xf1);</div><div class='del'>-	if(reg &amp; 0x1000)</div><div class='add'>+	if (reg &amp; 0x1000)</div><div class='ctx'> 		*status |= FE_HAS_VITERBI;</div><div class='del'>-	if(reg &amp; 0x8000)</div><div class='add'>+	if (reg &amp; 0x8000)</div><div class='ctx'> 		*status |= FE_HAS_LOCK | FE_HAS_SYNC;</div><div class='ctx'> </div><div class='del'>-	switch(state-&gt;config-&gt;status_mode) {</div><div class='add'>+	switch (state-&gt;config-&gt;status_mode) {</div><div class='ctx'> 	case S5H1409_DEMODLOCKING:</div><div class='ctx'> 		if (*status &amp; FE_HAS_VITERBI)</div><div class='ctx'> 			*status |= FE_HAS_CARRIER | FE_HAS_SIGNAL;</div><div class='hunk'>@@ -668,12 +673,12 @@ static int s5h1409_read_status(struct dvb_frontend* fe, fe_status_t* status)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int s5h1409_qam256_lookup_snr(struct dvb_frontend* fe, u16* snr, u16 v)</div><div class='add'>+static int s5h1409_qam256_lookup_snr(struct dvb_frontend *fe, u16 *snr, u16 v)</div><div class='ctx'> {</div><div class='ctx'> 	int i, ret = -EINVAL;</div><div class='ctx'> 	dprintk("%s()\n", __func__);</div><div class='ctx'> </div><div class='del'>-	for (i=0; i &lt; ARRAY_SIZE(qam256_snr_tab); i++) {</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(qam256_snr_tab); i++) {</div><div class='ctx'> 		if (v &lt; qam256_snr_tab[i].val) {</div><div class='ctx'> 			*snr = qam256_snr_tab[i].data;</div><div class='ctx'> 			ret = 0;</div><div class='hunk'>@@ -683,12 +688,12 @@ static int s5h1409_qam256_lookup_snr(struct dvb_frontend* fe, u16* snr, u16 v)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int s5h1409_qam64_lookup_snr(struct dvb_frontend* fe, u16* snr, u16 v)</div><div class='add'>+static int s5h1409_qam64_lookup_snr(struct dvb_frontend *fe, u16 *snr, u16 v)</div><div class='ctx'> {</div><div class='ctx'> 	int i, ret = -EINVAL;</div><div class='ctx'> 	dprintk("%s()\n", __func__);</div><div class='ctx'> </div><div class='del'>-	for (i=0; i &lt; ARRAY_SIZE(qam64_snr_tab); i++) {</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(qam64_snr_tab); i++) {</div><div class='ctx'> 		if (v &lt; qam64_snr_tab[i].val) {</div><div class='ctx'> 			*snr = qam64_snr_tab[i].data;</div><div class='ctx'> 			ret = 0;</div><div class='hunk'>@@ -698,12 +703,12 @@ static int s5h1409_qam64_lookup_snr(struct dvb_frontend* fe, u16* snr, u16 v)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int s5h1409_vsb_lookup_snr(struct dvb_frontend* fe, u16* snr, u16 v)</div><div class='add'>+static int s5h1409_vsb_lookup_snr(struct dvb_frontend *fe, u16 *snr, u16 v)</div><div class='ctx'> {</div><div class='ctx'> 	int i, ret = -EINVAL;</div><div class='ctx'> 	dprintk("%s()\n", __func__);</div><div class='ctx'> </div><div class='del'>-	for (i=0; i &lt; ARRAY_SIZE(vsb_snr_tab); i++) {</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(vsb_snr_tab); i++) {</div><div class='ctx'> 		if (v &gt; vsb_snr_tab[i].val) {</div><div class='ctx'> 			*snr = vsb_snr_tab[i].data;</div><div class='ctx'> 			ret = 0;</div><div class='hunk'>@@ -714,13 +719,13 @@ static int s5h1409_vsb_lookup_snr(struct dvb_frontend* fe, u16* snr, u16 v)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int s5h1409_read_snr(struct dvb_frontend* fe, u16* snr)</div><div class='add'>+static int s5h1409_read_snr(struct dvb_frontend *fe, u16 *snr)</div><div class='ctx'> {</div><div class='del'>-	struct s5h1409_state* state = fe-&gt;demodulator_priv;</div><div class='add'>+	struct s5h1409_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	u16 reg;</div><div class='ctx'> 	dprintk("%s()\n", __func__);</div><div class='ctx'> </div><div class='del'>-	switch(state-&gt;current_modulation) {</div><div class='add'>+	switch (state-&gt;current_modulation) {</div><div class='ctx'> 	case QAM_64:</div><div class='ctx'> 		reg = s5h1409_readreg(state, 0xf0) &amp; 0xff;</div><div class='ctx'> 		return s5h1409_qam64_lookup_snr(fe, snr, reg);</div><div class='hunk'>@@ -737,30 +742,30 @@ static int s5h1409_read_snr(struct dvb_frontend* fe, u16* snr)</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int s5h1409_read_signal_strength(struct dvb_frontend* fe,</div><div class='del'>-					u16* signal_strength)</div><div class='add'>+static int s5h1409_read_signal_strength(struct dvb_frontend *fe,</div><div class='add'>+					u16 *signal_strength)</div><div class='ctx'> {</div><div class='ctx'> 	return s5h1409_read_snr(fe, signal_strength);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int s5h1409_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)</div><div class='add'>+static int s5h1409_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks)</div><div class='ctx'> {</div><div class='del'>-	struct s5h1409_state* state = fe-&gt;demodulator_priv;</div><div class='add'>+	struct s5h1409_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> </div><div class='ctx'> 	*ucblocks = s5h1409_readreg(state, 0xb5);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int s5h1409_read_ber(struct dvb_frontend* fe, u32* ber)</div><div class='add'>+static int s5h1409_read_ber(struct dvb_frontend *fe, u32 *ber)</div><div class='ctx'> {</div><div class='ctx'> 	return s5h1409_read_ucblocks(fe, ber);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int s5h1409_get_frontend(struct dvb_frontend* fe,</div><div class='add'>+static int s5h1409_get_frontend(struct dvb_frontend *fe,</div><div class='ctx'> 				struct dvb_frontend_parameters *p)</div><div class='ctx'> {</div><div class='del'>-	struct s5h1409_state* state = fe-&gt;demodulator_priv;</div><div class='add'>+	struct s5h1409_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> </div><div class='ctx'> 	p-&gt;frequency = state-&gt;current_frequency;</div><div class='ctx'> 	p-&gt;u.vsb.modulation = state-&gt;current_modulation;</div><div class='hunk'>@@ -768,25 +773,25 @@ static int s5h1409_get_frontend(struct dvb_frontend* fe,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int s5h1409_get_tune_settings(struct dvb_frontend* fe,</div><div class='add'>+static int s5h1409_get_tune_settings(struct dvb_frontend *fe,</div><div class='ctx'> 				     struct dvb_frontend_tune_settings *tune)</div><div class='ctx'> {</div><div class='ctx'> 	tune-&gt;min_delay_ms = 1000;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void s5h1409_release(struct dvb_frontend* fe)</div><div class='add'>+static void s5h1409_release(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='del'>-	struct s5h1409_state* state = fe-&gt;demodulator_priv;</div><div class='add'>+	struct s5h1409_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	kfree(state);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops s5h1409_ops;</div><div class='ctx'> </div><div class='del'>-struct dvb_frontend* s5h1409_attach(const struct s5h1409_config* config,</div><div class='del'>-				    struct i2c_adapter* i2c)</div><div class='add'>+struct dvb_frontend *s5h1409_attach(const struct s5h1409_config *config,</div><div class='add'>+				    struct i2c_adapter *i2c)</div><div class='ctx'> {</div><div class='del'>-	struct s5h1409_state* state = NULL;</div><div class='add'>+	struct s5h1409_state *state = NULL;</div><div class='ctx'> 	u16 reg;</div><div class='ctx'> </div><div class='ctx'> 	/* allocate memory for the internal state */</div><div class='hunk'>@@ -825,6 +830,7 @@ error:</div><div class='ctx'> 	kfree(state);</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(s5h1409_attach);</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops s5h1409_ops = {</div><div class='ctx'> </div><div class='hunk'>@@ -850,14 +856,10 @@ static struct dvb_frontend_ops s5h1409_ops = {</div><div class='ctx'> 	.release              = s5h1409_release,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-module_param(debug, int, 0644);</div><div class='del'>-MODULE_PARM_DESC(debug, "Enable verbose debug messages");</div><div class='del'>-</div><div class='ctx'> MODULE_DESCRIPTION("Samsung S5H1409 QAM-B/ATSC Demodulator driver");</div><div class='ctx'> MODULE_AUTHOR("Steven Toth");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(s5h1409_attach);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Local variables:</div><div class='head'>diff --git a/drivers/media/dvb/frontends/s5h1409.h b/drivers/media/dvb/frontends/s5h1409.h<br/>index d1a1d2eb8e11..070d9743e330 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/frontends/s5h1409.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/dvb/frontends/s5h1409.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/frontends/s5h1409.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/s5h1409.h</a></div><div class='hunk'>@@ -24,8 +24,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/dvb/frontend.h&gt;</div><div class='ctx'> </div><div class='del'>-struct s5h1409_config</div><div class='del'>-{</div><div class='add'>+struct s5h1409_config {</div><div class='ctx'> 	/* the demodulator's i2c address */</div><div class='ctx'> 	u8 demod_address;</div><div class='ctx'> </div><div class='hunk'>@@ -60,12 +59,14 @@ struct s5h1409_config</div><div class='ctx'> 	u16 mpeg_timing;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_DVB_S5H1409) || (defined(CONFIG_DVB_S5H1409_MODULE) &amp;&amp; defined(MODULE))</div><div class='del'>-extern struct dvb_frontend* s5h1409_attach(const struct s5h1409_config* config,</div><div class='del'>-					   struct i2c_adapter* i2c);</div><div class='add'>+#if defined(CONFIG_DVB_S5H1409) || (defined(CONFIG_DVB_S5H1409_MODULE) \</div><div class='add'>+	&amp;&amp; defined(MODULE))</div><div class='add'>+extern struct dvb_frontend *s5h1409_attach(const struct s5h1409_config *config,</div><div class='add'>+					   struct i2c_adapter *i2c);</div><div class='ctx'> #else</div><div class='del'>-static inline struct dvb_frontend* s5h1409_attach(const struct s5h1409_config* config,</div><div class='del'>-						  struct i2c_adapter* i2c)</div><div class='add'>+static inline struct dvb_frontend *s5h1409_attach(</div><div class='add'>+	const struct s5h1409_config *config,</div><div class='add'>+	struct i2c_adapter *i2c)</div><div class='ctx'> {</div><div class='ctx'> 	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);</div><div class='ctx'> 	return NULL;</div><div class='head'>diff --git a/drivers/media/dvb/frontends/s5h1411.c b/drivers/media/dvb/frontends/s5h1411.c<br/>index 2da1a3763de9..2febfb5a846b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/frontends/s5h1411.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/dvb/frontends/s5h1411.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/frontends/s5h1411.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/s5h1411.c</a></div><div class='hunk'>@@ -343,7 +343,7 @@ static int s5h1411_writereg(struct s5h1411_state *state,</div><div class='ctx'> 	u8 addr, u8 reg, u16 data)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	u8 buf [] = { reg, data &gt;&gt; 8,  data &amp; 0xff };</div><div class='add'>+	u8 buf[] = { reg, data &gt;&gt; 8,  data &amp; 0xff };</div><div class='ctx'> </div><div class='ctx'> 	struct i2c_msg msg = { .addr = addr, .flags = 0, .buf = buf, .len = 3 };</div><div class='ctx'> </div><div class='hunk'>@@ -359,10 +359,10 @@ static int s5h1411_writereg(struct s5h1411_state *state,</div><div class='ctx'> static u16 s5h1411_readreg(struct s5h1411_state *state, u8 addr, u8 reg)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	u8 b0 [] = { reg };</div><div class='del'>-	u8 b1 [] = { 0, 0 };</div><div class='add'>+	u8 b0[] = { reg };</div><div class='add'>+	u8 b1[] = { 0, 0 };</div><div class='ctx'> </div><div class='del'>-	struct i2c_msg msg [] = {</div><div class='add'>+	struct i2c_msg msg[] = {</div><div class='ctx'> 		{ .addr = addr, .flags = 0, .buf = b0, .len = 1 },</div><div class='ctx'> 		{ .addr = addr, .flags = I2C_M_RD, .buf = b1, .len = 2 } };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/dvb/frontends/si21xx.c b/drivers/media/dvb/frontends/si21xx.c<br/>new file mode 100644<br/>index 000000000000..3ddbe69c45ce<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/frontends/si21xx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/si21xx.c</a></div><div class='hunk'>@@ -0,0 +1,974 @@</div><div class='add'>+/* DVB compliant Linux driver for the DVB-S si2109/2110 demodulator</div><div class='add'>+*</div><div class='add'>+* Copyright (C) 2008 Igor M. Liplianin (liplianin@me.by)</div><div class='add'>+*</div><div class='add'>+*	This program is free software; you can redistribute it and/or modify</div><div class='add'>+*	it under the terms of the GNU General Public License as published by</div><div class='add'>+*	the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+*	(at your option) any later version.</div><div class='add'>+*</div><div class='add'>+*/</div><div class='add'>+#include &lt;linux/version.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/jiffies.h&gt;</div><div class='add'>+#include &lt;asm/div64.h&gt;</div><div class='add'>+</div><div class='add'>+#include "dvb_frontend.h"</div><div class='add'>+#include "si21xx.h"</div><div class='add'>+</div><div class='add'>+#define	REVISION_REG			0x00</div><div class='add'>+#define	SYSTEM_MODE_REG			0x01</div><div class='add'>+#define	TS_CTRL_REG_1			0x02</div><div class='add'>+#define	TS_CTRL_REG_2			0x03</div><div class='add'>+#define	PIN_CTRL_REG_1			0x04</div><div class='add'>+#define	PIN_CTRL_REG_2			0x05</div><div class='add'>+#define	LOCK_STATUS_REG_1		0x0f</div><div class='add'>+#define	LOCK_STATUS_REG_2		0x10</div><div class='add'>+#define	ACQ_STATUS_REG			0x11</div><div class='add'>+#define	ACQ_CTRL_REG_1			0x13</div><div class='add'>+#define	ACQ_CTRL_REG_2			0x14</div><div class='add'>+#define	PLL_DIVISOR_REG			0x15</div><div class='add'>+#define	COARSE_TUNE_REG			0x16</div><div class='add'>+#define	FINE_TUNE_REG_L			0x17</div><div class='add'>+#define	FINE_TUNE_REG_H			0x18</div><div class='add'>+</div><div class='add'>+#define	ANALOG_AGC_POWER_LEVEL_REG	0x28</div><div class='add'>+#define	CFO_ESTIMATOR_CTRL_REG_1	0x29</div><div class='add'>+#define	CFO_ESTIMATOR_CTRL_REG_2	0x2a</div><div class='add'>+#define	CFO_ESTIMATOR_CTRL_REG_3	0x2b</div><div class='add'>+</div><div class='add'>+#define	SYM_RATE_ESTIMATE_REG_L		0x31</div><div class='add'>+#define	SYM_RATE_ESTIMATE_REG_M		0x32</div><div class='add'>+#define	SYM_RATE_ESTIMATE_REG_H		0x33</div><div class='add'>+</div><div class='add'>+#define	CFO_ESTIMATOR_OFFSET_REG_L	0x36</div><div class='add'>+#define	CFO_ESTIMATOR_OFFSET_REG_H	0x37</div><div class='add'>+#define	CFO_ERROR_REG_L			0x38</div><div class='add'>+#define	CFO_ERROR_REG_H			0x39</div><div class='add'>+#define	SYM_RATE_ESTIMATOR_CTRL_REG	0x3a</div><div class='add'>+</div><div class='add'>+#define	SYM_RATE_REG_L			0x3f</div><div class='add'>+#define	SYM_RATE_REG_M			0x40</div><div class='add'>+#define	SYM_RATE_REG_H			0x41</div><div class='add'>+#define	SYM_RATE_ESTIMATOR_MAXIMUM_REG	0x42</div><div class='add'>+#define	SYM_RATE_ESTIMATOR_MINIMUM_REG	0x43</div><div class='add'>+</div><div class='add'>+#define	C_N_ESTIMATOR_CTRL_REG		0x7c</div><div class='add'>+#define	C_N_ESTIMATOR_THRSHLD_REG	0x7d</div><div class='add'>+#define	C_N_ESTIMATOR_LEVEL_REG_L	0x7e</div><div class='add'>+#define	C_N_ESTIMATOR_LEVEL_REG_H	0x7f</div><div class='add'>+</div><div class='add'>+#define	BLIND_SCAN_CTRL_REG		0x80</div><div class='add'>+</div><div class='add'>+#define	LSA_CTRL_REG_1			0x8D</div><div class='add'>+#define	SPCTRM_TILT_CORR_THRSHLD_REG	0x8f</div><div class='add'>+#define	ONE_DB_BNDWDTH_THRSHLD_REG	0x90</div><div class='add'>+#define	TWO_DB_BNDWDTH_THRSHLD_REG	0x91</div><div class='add'>+#define	THREE_DB_BNDWDTH_THRSHLD_REG	0x92</div><div class='add'>+#define	INBAND_POWER_THRSHLD_REG	0x93</div><div class='add'>+#define	REF_NOISE_LVL_MRGN_THRSHLD_REG	0x94</div><div class='add'>+</div><div class='add'>+#define	VIT_SRCH_CTRL_REG_1		0xa0</div><div class='add'>+#define	VIT_SRCH_CTRL_REG_2		0xa1</div><div class='add'>+#define	VIT_SRCH_CTRL_REG_3		0xa2</div><div class='add'>+#define	VIT_SRCH_STATUS_REG		0xa3</div><div class='add'>+#define	VITERBI_BER_COUNT_REG_L		0xab</div><div class='add'>+#define	REED_SOLOMON_CTRL_REG		0xb0</div><div class='add'>+#define	REED_SOLOMON_ERROR_COUNT_REG_L	0xb1</div><div class='add'>+#define	PRBS_CTRL_REG			0xb5</div><div class='add'>+</div><div class='add'>+#define	LNB_CTRL_REG_1			0xc0</div><div class='add'>+#define	LNB_CTRL_REG_2			0xc1</div><div class='add'>+#define	LNB_CTRL_REG_3			0xc2</div><div class='add'>+#define	LNB_CTRL_REG_4			0xc3</div><div class='add'>+#define	LNB_CTRL_STATUS_REG		0xc4</div><div class='add'>+#define	LNB_FIFO_REGS_0			0xc5</div><div class='add'>+#define	LNB_FIFO_REGS_1			0xc6</div><div class='add'>+#define	LNB_FIFO_REGS_2			0xc7</div><div class='add'>+#define	LNB_FIFO_REGS_3			0xc8</div><div class='add'>+#define	LNB_FIFO_REGS_4			0xc9</div><div class='add'>+#define	LNB_FIFO_REGS_5			0xca</div><div class='add'>+#define	LNB_SUPPLY_CTRL_REG_1		0xcb</div><div class='add'>+#define	LNB_SUPPLY_CTRL_REG_2		0xcc</div><div class='add'>+#define	LNB_SUPPLY_CTRL_REG_3		0xcd</div><div class='add'>+#define	LNB_SUPPLY_CTRL_REG_4		0xce</div><div class='add'>+#define	LNB_SUPPLY_STATUS_REG		0xcf</div><div class='add'>+</div><div class='add'>+#define FALSE	0</div><div class='add'>+#define TRUE	1</div><div class='add'>+#define FAIL	-1</div><div class='add'>+#define PASS	0</div><div class='add'>+</div><div class='add'>+#define ALLOWABLE_FS_COUNT	10</div><div class='add'>+#define STATUS_BER		0</div><div class='add'>+#define STATUS_UCBLOCKS		1</div><div class='add'>+</div><div class='add'>+static int debug;</div><div class='add'>+#define dprintk(args...) \</div><div class='add'>+	do { \</div><div class='add'>+		if (debug) \</div><div class='add'>+			printk(KERN_DEBUG "si21xx: " args); \</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	ACTIVE_HIGH,</div><div class='add'>+	ACTIVE_LOW</div><div class='add'>+};</div><div class='add'>+enum {</div><div class='add'>+	BYTE_WIDE,</div><div class='add'>+	BIT_WIDE</div><div class='add'>+};</div><div class='add'>+enum {</div><div class='add'>+	CLK_GAPPED_MODE,</div><div class='add'>+	CLK_CONTINUOUS_MODE</div><div class='add'>+};</div><div class='add'>+enum {</div><div class='add'>+	RISING_EDGE,</div><div class='add'>+	FALLING_EDGE</div><div class='add'>+};</div><div class='add'>+enum {</div><div class='add'>+	MSB_FIRST,</div><div class='add'>+	LSB_FIRST</div><div class='add'>+};</div><div class='add'>+enum {</div><div class='add'>+	SERIAL,</div><div class='add'>+	PARALLEL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct si21xx_state {</div><div class='add'>+	struct i2c_adapter *i2c;</div><div class='add'>+	const struct si21xx_config *config;</div><div class='add'>+	struct dvb_frontend frontend;</div><div class='add'>+	u8 initialised:1;</div><div class='add'>+	int errmode;</div><div class='add'>+	int fs;			/*Sampling rate of the ADC in MHz*/</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*	register default initialization */</div><div class='add'>+static u8 serit_sp1511lhb_inittab[] = {</div><div class='add'>+	0x01, 0x28,	/* set i2c_inc_disable */</div><div class='add'>+	0x20, 0x03,</div><div class='add'>+	0x27, 0x20,</div><div class='add'>+	0xe0, 0x45,</div><div class='add'>+	0xe1, 0x08,</div><div class='add'>+	0xfe, 0x01,</div><div class='add'>+	0x01, 0x28,</div><div class='add'>+	0x89, 0x09,</div><div class='add'>+	0x04, 0x80,</div><div class='add'>+	0x05, 0x01,</div><div class='add'>+	0x06, 0x00,</div><div class='add'>+	0x20, 0x03,</div><div class='add'>+	0x24, 0x88,</div><div class='add'>+	0x29, 0x09,</div><div class='add'>+	0x2a, 0x0f,</div><div class='add'>+	0x2c, 0x10,</div><div class='add'>+	0x2d, 0x19,</div><div class='add'>+	0x2e, 0x08,</div><div class='add'>+	0x2f, 0x10,</div><div class='add'>+	0x30, 0x19,</div><div class='add'>+	0x34, 0x20,</div><div class='add'>+	0x35, 0x03,</div><div class='add'>+	0x45, 0x02,</div><div class='add'>+	0x46, 0x45,</div><div class='add'>+	0x47, 0xd0,</div><div class='add'>+	0x48, 0x00,</div><div class='add'>+	0x49, 0x40,</div><div class='add'>+	0x4a, 0x03,</div><div class='add'>+	0x4c, 0xfd,</div><div class='add'>+	0x4f, 0x2e,</div><div class='add'>+	0x50, 0x2e,</div><div class='add'>+	0x51, 0x10,</div><div class='add'>+	0x52, 0x10,</div><div class='add'>+	0x56, 0x92,</div><div class='add'>+	0x59, 0x00,</div><div class='add'>+	0x5a, 0x2d,</div><div class='add'>+	0x5b, 0x33,</div><div class='add'>+	0x5c, 0x1f,</div><div class='add'>+	0x5f, 0x76,</div><div class='add'>+	0x62, 0xc0,</div><div class='add'>+	0x63, 0xc0,</div><div class='add'>+	0x64, 0xf3,</div><div class='add'>+	0x65, 0xf3,</div><div class='add'>+	0x79, 0x40,</div><div class='add'>+	0x6a, 0x40,</div><div class='add'>+	0x6b, 0x0a,</div><div class='add'>+	0x6c, 0x80,</div><div class='add'>+	0x6d, 0x27,</div><div class='add'>+	0x71, 0x06,</div><div class='add'>+	0x75, 0x60,</div><div class='add'>+	0x78, 0x00,</div><div class='add'>+	0x79, 0xb5,</div><div class='add'>+	0x7c, 0x05,</div><div class='add'>+	0x7d, 0x1a,</div><div class='add'>+	0x87, 0x55,</div><div class='add'>+	0x88, 0x72,</div><div class='add'>+	0x8f, 0x08,</div><div class='add'>+	0x90, 0xe0,</div><div class='add'>+	0x94, 0x40,</div><div class='add'>+	0xa0, 0x3f,</div><div class='add'>+	0xa1, 0xc0,</div><div class='add'>+	0xa4, 0xcc,</div><div class='add'>+	0xa5, 0x66,</div><div class='add'>+	0xa6, 0x66,</div><div class='add'>+	0xa7, 0x7b,</div><div class='add'>+	0xa8, 0x7b,</div><div class='add'>+	0xa9, 0x7b,</div><div class='add'>+	0xaa, 0x9a,</div><div class='add'>+	0xed, 0x04,</div><div class='add'>+	0xad, 0x00,</div><div class='add'>+	0xae, 0x03,</div><div class='add'>+	0xcc, 0xab,</div><div class='add'>+	0x01, 0x08,</div><div class='add'>+	0xff, 0xff</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*	low level read/writes */</div><div class='add'>+static int si21_writeregs(struct si21xx_state *state, u8 reg1,</div><div class='add'>+							u8 *data, int len)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u8 buf[60];/* = { reg1, data };*/</div><div class='add'>+	struct i2c_msg msg = {</div><div class='add'>+				.addr = state-&gt;config-&gt;demod_address,</div><div class='add'>+				.flags = 0,</div><div class='add'>+				.buf = buf,</div><div class='add'>+				.len = len + 1</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	msg.buf[0] =  reg1;</div><div class='add'>+	memcpy(msg.buf + 1, data, len);</div><div class='add'>+</div><div class='add'>+	ret = i2c_transfer(state-&gt;i2c, &amp;msg, 1);</div><div class='add'>+</div><div class='add'>+	if (ret != 1)</div><div class='add'>+		dprintk("%s: writereg error (reg1 == 0x%02x, data == 0x%02x, "</div><div class='add'>+			"ret == %i)\n", __func__, reg1, data[0], ret);</div><div class='add'>+</div><div class='add'>+	return (ret != 1) ? -EREMOTEIO : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int si21_writereg(struct si21xx_state *state, u8 reg, u8 data)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u8 buf[] = { reg, data };</div><div class='add'>+	struct i2c_msg msg = {</div><div class='add'>+				.addr = state-&gt;config-&gt;demod_address,</div><div class='add'>+				.flags = 0,</div><div class='add'>+				.buf = buf,</div><div class='add'>+				.len = 2</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ret = i2c_transfer(state-&gt;i2c, &amp;msg, 1);</div><div class='add'>+</div><div class='add'>+	if (ret != 1)</div><div class='add'>+		dprintk("%s: writereg error (reg == 0x%02x, data == 0x%02x, "</div><div class='add'>+			"ret == %i)\n", __func__, reg, data, ret);</div><div class='add'>+</div><div class='add'>+	return (ret != 1) ? -EREMOTEIO : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int si21_write(struct dvb_frontend *fe, u8 *buf, int len)</div><div class='add'>+{</div><div class='add'>+	struct si21xx_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+</div><div class='add'>+	if (len != 2)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return si21_writereg(state, buf[0], buf[1]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 si21_readreg(struct si21xx_state *state, u8 reg)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u8 b0[] = { reg };</div><div class='add'>+	u8 b1[] = { 0 };</div><div class='add'>+	struct i2c_msg msg[] = {</div><div class='add'>+		{</div><div class='add'>+			.addr = state-&gt;config-&gt;demod_address,</div><div class='add'>+			.flags = 0,</div><div class='add'>+			.buf = b0,</div><div class='add'>+			.len = 1</div><div class='add'>+		}, {</div><div class='add'>+			.addr = state-&gt;config-&gt;demod_address,</div><div class='add'>+			.flags = I2C_M_RD,</div><div class='add'>+			.buf = b1,</div><div class='add'>+			.len = 1</div><div class='add'>+		}</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ret = i2c_transfer(state-&gt;i2c, msg, 2);</div><div class='add'>+</div><div class='add'>+	if (ret != 2)</div><div class='add'>+		dprintk("%s: readreg error (reg == 0x%02x, ret == %i)\n",</div><div class='add'>+			__func__, reg, ret);</div><div class='add'>+</div><div class='add'>+	return b1[0];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int si21_readregs(struct si21xx_state *state, u8 reg1, u8 *b, u8 len)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct i2c_msg msg[] = {</div><div class='add'>+		{</div><div class='add'>+			.addr = state-&gt;config-&gt;demod_address,</div><div class='add'>+			.flags = 0,</div><div class='add'>+			.buf = &amp;reg1,</div><div class='add'>+			.len = 1</div><div class='add'>+		}, {</div><div class='add'>+			.addr = state-&gt;config-&gt;demod_address,</div><div class='add'>+			.flags = I2C_M_RD,</div><div class='add'>+			.buf = b,</div><div class='add'>+			.len = len</div><div class='add'>+		}</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ret = i2c_transfer(state-&gt;i2c, msg, 2);</div><div class='add'>+</div><div class='add'>+	if (ret != 2)</div><div class='add'>+		dprintk("%s: readreg error (ret == %i)\n", __func__, ret);</div><div class='add'>+</div><div class='add'>+	return ret == 2 ? 0 : -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int si21xx_wait_diseqc_idle(struct si21xx_state *state, int timeout)</div><div class='add'>+{</div><div class='add'>+	unsigned long start = jiffies;</div><div class='add'>+</div><div class='add'>+	dprintk("%s\n", __func__);</div><div class='add'>+</div><div class='add'>+	while ((si21_readreg(state, LNB_CTRL_REG_1) &amp; 0x8) == 8) {</div><div class='add'>+		if (jiffies - start &gt; timeout) {</div><div class='add'>+			dprintk("%s: timeout!!\n", __func__);</div><div class='add'>+			return -ETIMEDOUT;</div><div class='add'>+		}</div><div class='add'>+		msleep(10);</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int si21xx_set_symbolrate(struct dvb_frontend *fe, u32 srate)</div><div class='add'>+{</div><div class='add'>+	struct si21xx_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	u32 sym_rate, data_rate;</div><div class='add'>+	int i;</div><div class='add'>+	u8 sym_rate_bytes[3];</div><div class='add'>+</div><div class='add'>+	dprintk("%s : srate = %i\n", __func__ , srate);</div><div class='add'>+</div><div class='add'>+	if ((srate &lt; 1000000) || (srate &gt; 45000000))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	data_rate = srate;</div><div class='add'>+	sym_rate = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 4; ++i) {</div><div class='add'>+		sym_rate /= 100;</div><div class='add'>+		sym_rate = sym_rate + ((data_rate % 100) * 0x800000) /</div><div class='add'>+								state-&gt;fs;</div><div class='add'>+		data_rate /= 100;</div><div class='add'>+	}</div><div class='add'>+	for (i = 0; i &lt; 3; ++i)</div><div class='add'>+		sym_rate_bytes[i] = (u8)((sym_rate &gt;&gt; (i * 8)) &amp; 0xff);</div><div class='add'>+</div><div class='add'>+	si21_writeregs(state, SYM_RATE_REG_L, sym_rate_bytes, 0x03);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int si21xx_send_diseqc_msg(struct dvb_frontend *fe,</div><div class='add'>+					struct dvb_diseqc_master_cmd *m)</div><div class='add'>+{</div><div class='add'>+	struct si21xx_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	u8 lnb_status;</div><div class='add'>+	u8 LNB_CTRL_1;</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	dprintk("%s\n", __func__);</div><div class='add'>+</div><div class='add'>+	status = PASS;</div><div class='add'>+	LNB_CTRL_1 = 0;</div><div class='add'>+</div><div class='add'>+	status |= si21_readregs(state, LNB_CTRL_STATUS_REG, &amp;lnb_status, 0x01);</div><div class='add'>+	status |= si21_readregs(state, LNB_CTRL_REG_1, &amp;lnb_status, 0x01);</div><div class='add'>+</div><div class='add'>+	/*fill the FIFO*/</div><div class='add'>+	status |= si21_writeregs(state, LNB_FIFO_REGS_0, m-&gt;msg, m-&gt;msg_len);</div><div class='add'>+</div><div class='add'>+	LNB_CTRL_1 = (lnb_status &amp; 0x70);</div><div class='add'>+	LNB_CTRL_1 |= m-&gt;msg_len;</div><div class='add'>+</div><div class='add'>+	LNB_CTRL_1 |= 0x80;	/* begin LNB signaling */</div><div class='add'>+</div><div class='add'>+	status |= si21_writeregs(state, LNB_CTRL_REG_1, &amp;LNB_CTRL_1, 0x01);</div><div class='add'>+</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int si21xx_send_diseqc_burst(struct dvb_frontend *fe,</div><div class='add'>+						fe_sec_mini_cmd_t burst)</div><div class='add'>+{</div><div class='add'>+	struct si21xx_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	u8 val;</div><div class='add'>+</div><div class='add'>+	dprintk("%s\n", __func__);</div><div class='add'>+</div><div class='add'>+	if (si21xx_wait_diseqc_idle(state, 100) &lt; 0)</div><div class='add'>+		return -ETIMEDOUT;</div><div class='add'>+</div><div class='add'>+	val = (0x80 | si21_readreg(state, 0xc1));</div><div class='add'>+	if (si21_writereg(state, LNB_CTRL_REG_1,</div><div class='add'>+			burst == SEC_MINI_A ? (val &amp; ~0x10) : (val | 0x10)))</div><div class='add'>+		return -EREMOTEIO;</div><div class='add'>+</div><div class='add'>+	if (si21xx_wait_diseqc_idle(state, 100) &lt; 0)</div><div class='add'>+		return -ETIMEDOUT;</div><div class='add'>+</div><div class='add'>+	if (si21_writereg(state, LNB_CTRL_REG_1, val))</div><div class='add'>+		return -EREMOTEIO;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+/*	30.06.2008 */</div><div class='add'>+static int si21xx_set_tone(struct dvb_frontend *fe, fe_sec_tone_mode_t tone)</div><div class='add'>+{</div><div class='add'>+	struct si21xx_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	u8 val;</div><div class='add'>+</div><div class='add'>+	dprintk("%s\n", __func__);</div><div class='add'>+	val = (0x80 | si21_readreg(state, LNB_CTRL_REG_1));</div><div class='add'>+</div><div class='add'>+	switch (tone) {</div><div class='add'>+	case SEC_TONE_ON:</div><div class='add'>+		return si21_writereg(state, LNB_CTRL_REG_1, val | 0x20);</div><div class='add'>+</div><div class='add'>+	case SEC_TONE_OFF:</div><div class='add'>+		return si21_writereg(state, LNB_CTRL_REG_1, (val &amp; ~0x20));</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int si21xx_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t volt)</div><div class='add'>+{</div><div class='add'>+	struct si21xx_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+</div><div class='add'>+	u8 val;</div><div class='add'>+	dprintk("%s: %s\n", __func__,</div><div class='add'>+		volt == SEC_VOLTAGE_13 ? "SEC_VOLTAGE_13" :</div><div class='add'>+		volt == SEC_VOLTAGE_18 ? "SEC_VOLTAGE_18" : "??");</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	val = (0x80 | si21_readreg(state, LNB_CTRL_REG_1));</div><div class='add'>+</div><div class='add'>+	switch (volt) {</div><div class='add'>+	case SEC_VOLTAGE_18:</div><div class='add'>+		return si21_writereg(state, LNB_CTRL_REG_1, val | 0x40);</div><div class='add'>+		break;</div><div class='add'>+	case SEC_VOLTAGE_13:</div><div class='add'>+		return si21_writereg(state, LNB_CTRL_REG_1, (val &amp; ~0x40));</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	};</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int si21xx_init(struct dvb_frontend *fe)</div><div class='add'>+{</div><div class='add'>+	struct si21xx_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	int i;</div><div class='add'>+	int status = 0;</div><div class='add'>+	u8 reg1;</div><div class='add'>+	u8 val;</div><div class='add'>+	u8 reg2[2];</div><div class='add'>+</div><div class='add'>+	dprintk("%s\n", __func__);</div><div class='add'>+</div><div class='add'>+	for (i = 0; ; i += 2) {</div><div class='add'>+		reg1 = serit_sp1511lhb_inittab[i];</div><div class='add'>+		val = serit_sp1511lhb_inittab[i+1];</div><div class='add'>+		if (reg1 == 0xff &amp;&amp; val == 0xff)</div><div class='add'>+			break;</div><div class='add'>+		si21_writeregs(state, reg1, &amp;val, 1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*DVB QPSK SYSTEM MODE REG*/</div><div class='add'>+	reg1 = 0x08;</div><div class='add'>+	si21_writeregs(state, SYSTEM_MODE_REG, &amp;reg1, 0x01);</div><div class='add'>+</div><div class='add'>+	/*transport stream config*/</div><div class='add'>+	/*</div><div class='add'>+	mode = PARALLEL;</div><div class='add'>+	sdata_form = LSB_FIRST;</div><div class='add'>+	clk_edge = FALLING_EDGE;</div><div class='add'>+	clk_mode = CLK_GAPPED_MODE;</div><div class='add'>+	strt_len = BYTE_WIDE;</div><div class='add'>+	sync_pol = ACTIVE_HIGH;</div><div class='add'>+	val_pol = ACTIVE_HIGH;</div><div class='add'>+	err_pol = ACTIVE_HIGH;</div><div class='add'>+	sclk_rate = 0x00;</div><div class='add'>+	parity = 0x00 ;</div><div class='add'>+	data_delay = 0x00;</div><div class='add'>+	clk_delay = 0x00;</div><div class='add'>+	pclk_smooth = 0x00;</div><div class='add'>+	*/</div><div class='add'>+	reg2[0] =</div><div class='add'>+		PARALLEL + (LSB_FIRST &lt;&lt; 1)</div><div class='add'>+		+ (FALLING_EDGE &lt;&lt; 2) + (CLK_GAPPED_MODE &lt;&lt; 3)</div><div class='add'>+		+ (BYTE_WIDE &lt;&lt; 4) + (ACTIVE_HIGH &lt;&lt; 5)</div><div class='add'>+		+ (ACTIVE_HIGH &lt;&lt; 6) + (ACTIVE_HIGH &lt;&lt; 7);</div><div class='add'>+</div><div class='add'>+	reg2[1] = 0;</div><div class='add'>+	/*	sclk_rate + (parity &lt;&lt; 2)</div><div class='add'>+		+ (data_delay &lt;&lt; 3) + (clk_delay &lt;&lt; 4)</div><div class='add'>+		+ (pclk_smooth &lt;&lt; 5);</div><div class='add'>+	*/</div><div class='add'>+	status |= si21_writeregs(state, TS_CTRL_REG_1, reg2, 0x02);</div><div class='add'>+	if (status != 0)</div><div class='add'>+		dprintk(" %s : TS Set Error\n", __func__);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int si21_read_status(struct dvb_frontend *fe, fe_status_t *status)</div><div class='add'>+{</div><div class='add'>+	struct si21xx_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	u8 regs_read[2];</div><div class='add'>+	u8 reg_read;</div><div class='add'>+	u8 i;</div><div class='add'>+	u8 lock;</div><div class='add'>+	u8 signal = si21_readreg(state, ANALOG_AGC_POWER_LEVEL_REG);</div><div class='add'>+</div><div class='add'>+	si21_readregs(state, LOCK_STATUS_REG_1, regs_read, 0x02);</div><div class='add'>+	reg_read = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 7; ++i)</div><div class='add'>+		reg_read |= ((regs_read[0] &gt;&gt; i) &amp; 0x01) &lt;&lt; (6 - i);</div><div class='add'>+</div><div class='add'>+	lock = ((reg_read &amp; 0x7f) | (regs_read[1] &amp; 0x80));</div><div class='add'>+</div><div class='add'>+	dprintk("%s : FE_READ_STATUS : VSTATUS: 0x%02x\n", __func__, lock);</div><div class='add'>+	*status = 0;</div><div class='add'>+</div><div class='add'>+	if (signal &gt; 10)</div><div class='add'>+		*status |= FE_HAS_SIGNAL;</div><div class='add'>+</div><div class='add'>+	if (lock &amp; 0x2)</div><div class='add'>+		*status |= FE_HAS_CARRIER;</div><div class='add'>+</div><div class='add'>+	if (lock &amp; 0x20)</div><div class='add'>+		*status |= FE_HAS_VITERBI;</div><div class='add'>+</div><div class='add'>+	if (lock &amp; 0x40)</div><div class='add'>+		*status |= FE_HAS_SYNC;</div><div class='add'>+</div><div class='add'>+	if ((lock &amp; 0x7b) == 0x7b)</div><div class='add'>+		*status |= FE_HAS_LOCK;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int si21_read_signal_strength(struct dvb_frontend *fe, u16 *strength)</div><div class='add'>+{</div><div class='add'>+	struct si21xx_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+</div><div class='add'>+	/*status = si21_readreg(state, ANALOG_AGC_POWER_LEVEL_REG,</div><div class='add'>+						(u8*)agclevel, 0x01);*/</div><div class='add'>+</div><div class='add'>+	u16 signal = (3 * si21_readreg(state, 0x27) *</div><div class='add'>+					si21_readreg(state, 0x28));</div><div class='add'>+</div><div class='add'>+	dprintk("%s : AGCPWR: 0x%02x%02x, signal=0x%04x\n", __func__,</div><div class='add'>+		si21_readreg(state, 0x27),</div><div class='add'>+		si21_readreg(state, 0x28), (int) signal);</div><div class='add'>+</div><div class='add'>+	signal  &lt;&lt;= 4;</div><div class='add'>+	*strength = signal;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int si21_read_ber(struct dvb_frontend *fe, u32 *ber)</div><div class='add'>+{</div><div class='add'>+	struct si21xx_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+</div><div class='add'>+	dprintk("%s\n", __func__);</div><div class='add'>+</div><div class='add'>+	if (state-&gt;errmode != STATUS_BER)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	*ber = (si21_readreg(state, 0x1d) &lt;&lt; 8) |</div><div class='add'>+				si21_readreg(state, 0x1e);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int si21_read_snr(struct dvb_frontend *fe, u16 *snr)</div><div class='add'>+{</div><div class='add'>+	struct si21xx_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+</div><div class='add'>+	s32 xsnr = 0xffff - ((si21_readreg(state, 0x24) &lt;&lt; 8) |</div><div class='add'>+					si21_readreg(state, 0x25));</div><div class='add'>+	xsnr = 3 * (xsnr - 0xa100);</div><div class='add'>+	*snr = (xsnr &gt; 0xffff) ? 0xffff : (xsnr &lt; 0) ? 0 : xsnr;</div><div class='add'>+</div><div class='add'>+	dprintk("%s\n", __func__);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int si21_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks)</div><div class='add'>+{</div><div class='add'>+	struct si21xx_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+</div><div class='add'>+	dprintk("%s\n", __func__);</div><div class='add'>+</div><div class='add'>+	if (state-&gt;errmode != STATUS_UCBLOCKS)</div><div class='add'>+		*ucblocks = 0;</div><div class='add'>+	else</div><div class='add'>+		*ucblocks = (si21_readreg(state, 0x1d) &lt;&lt; 8) |</div><div class='add'>+					si21_readreg(state, 0x1e);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*	initiates a channel acquisition sequence</div><div class='add'>+	using the specified symbol rate and code rate */</div><div class='add'>+static int si21xx_setacquire(struct dvb_frontend *fe, int symbrate,</div><div class='add'>+						fe_code_rate_t crate)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	struct si21xx_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	u8 coderates[] = {</div><div class='add'>+				0x0, 0x01, 0x02, 0x04, 0x00,</div><div class='add'>+				0x8, 0x10, 0x20, 0x00, 0x3f</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	u8 coderate_ptr;</div><div class='add'>+	int status;</div><div class='add'>+	u8 start_acq = 0x80;</div><div class='add'>+	u8 reg, regs[3];</div><div class='add'>+</div><div class='add'>+	dprintk("%s\n", __func__);</div><div class='add'>+</div><div class='add'>+	status = PASS;</div><div class='add'>+	coderate_ptr = coderates[crate];</div><div class='add'>+</div><div class='add'>+	si21xx_set_symbolrate(fe, symbrate);</div><div class='add'>+</div><div class='add'>+	/* write code rates to use in the Viterbi search */</div><div class='add'>+	status |= si21_writeregs(state,</div><div class='add'>+				VIT_SRCH_CTRL_REG_1,</div><div class='add'>+				&amp;coderate_ptr, 0x01);</div><div class='add'>+</div><div class='add'>+	/* clear acq_start bit */</div><div class='add'>+	status |= si21_readregs(state, ACQ_CTRL_REG_2, &amp;reg, 0x01);</div><div class='add'>+	reg &amp;= ~start_acq;</div><div class='add'>+	status |= si21_writeregs(state, ACQ_CTRL_REG_2, &amp;reg, 0x01);</div><div class='add'>+</div><div class='add'>+	/* use new Carrier Frequency Offset Estimator (QuickLock) */</div><div class='add'>+	regs[0] = 0xCB;</div><div class='add'>+	regs[1] = 0x40;</div><div class='add'>+	regs[2] = 0xCB;</div><div class='add'>+</div><div class='add'>+	status |= si21_writeregs(state,</div><div class='add'>+				TWO_DB_BNDWDTH_THRSHLD_REG,</div><div class='add'>+				&amp;regs[0], 0x03);</div><div class='add'>+	reg = 0x56;</div><div class='add'>+	status |= si21_writeregs(state,</div><div class='add'>+				LSA_CTRL_REG_1, &amp;reg, 1);</div><div class='add'>+	reg = 0x05;</div><div class='add'>+	status |= si21_writeregs(state,</div><div class='add'>+				BLIND_SCAN_CTRL_REG, &amp;reg, 1);</div><div class='add'>+	/* start automatic acq */</div><div class='add'>+	status |= si21_writeregs(state,</div><div class='add'>+				ACQ_CTRL_REG_2, &amp;start_acq, 0x01);</div><div class='add'>+</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int si21xx_set_property(struct dvb_frontend *fe, struct dtv_property *p)</div><div class='add'>+{</div><div class='add'>+	dprintk("%s(..)\n", __func__);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int si21xx_get_property(struct dvb_frontend *fe, struct dtv_property *p)</div><div class='add'>+{</div><div class='add'>+	dprintk("%s(..)\n", __func__);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int si21xx_set_frontend(struct dvb_frontend *fe,</div><div class='add'>+					struct dvb_frontend_parameters *dfp)</div><div class='add'>+{</div><div class='add'>+	struct si21xx_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='add'>+</div><div class='add'>+	/* freq		Channel carrier frequency in KHz (i.e. 1550000 KHz)</div><div class='add'>+	 datarate	Channel symbol rate in Sps (i.e. 22500000 Sps)*/</div><div class='add'>+</div><div class='add'>+	/* in MHz */</div><div class='add'>+	unsigned char coarse_tune_freq;</div><div class='add'>+	int fine_tune_freq;</div><div class='add'>+	unsigned char sample_rate = 0;</div><div class='add'>+	/* boolean */</div><div class='add'>+	unsigned int inband_interferer_ind;</div><div class='add'>+</div><div class='add'>+	/* INTERMEDIATE VALUES */</div><div class='add'>+	int icoarse_tune_freq; /* MHz */</div><div class='add'>+	int ifine_tune_freq; /* MHz */</div><div class='add'>+	unsigned int band_high;</div><div class='add'>+	unsigned int band_low;</div><div class='add'>+	unsigned int x1;</div><div class='add'>+	unsigned int x2;</div><div class='add'>+	int i;</div><div class='add'>+	unsigned int inband_interferer_div2[ALLOWABLE_FS_COUNT] = {</div><div class='add'>+			FALSE, FALSE, FALSE, FALSE, FALSE,</div><div class='add'>+			FALSE, FALSE, FALSE, FALSE, FALSE</div><div class='add'>+	};</div><div class='add'>+	unsigned int inband_interferer_div4[ALLOWABLE_FS_COUNT] = {</div><div class='add'>+			FALSE, FALSE, FALSE, FALSE, FALSE,</div><div class='add'>+			FALSE, FALSE, FALSE, FALSE, FALSE</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	/* allowable sample rates for ADC in MHz */</div><div class='add'>+	int afs[ALLOWABLE_FS_COUNT] = { 200, 192, 193, 194, 195,</div><div class='add'>+					196, 204, 205, 206, 207</div><div class='add'>+	};</div><div class='add'>+	/* in MHz */</div><div class='add'>+	int if_limit_high;</div><div class='add'>+	int if_limit_low;</div><div class='add'>+	int lnb_lo;</div><div class='add'>+	int lnb_uncertanity;</div><div class='add'>+</div><div class='add'>+	int rf_freq;</div><div class='add'>+	int data_rate;</div><div class='add'>+	unsigned char regs[4];</div><div class='add'>+</div><div class='add'>+	dprintk("%s : FE_SET_FRONTEND\n", __func__);</div><div class='add'>+</div><div class='add'>+	if (c-&gt;delivery_system != SYS_DVBS) {</div><div class='add'>+			dprintk("%s: unsupported delivery system selected (%d)\n",</div><div class='add'>+				__func__, c-&gt;delivery_system);</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ALLOWABLE_FS_COUNT; ++i)</div><div class='add'>+		inband_interferer_div2[i] = inband_interferer_div4[i] = FALSE;</div><div class='add'>+</div><div class='add'>+	if_limit_high = -700000;</div><div class='add'>+	if_limit_low = -100000;</div><div class='add'>+	/* in MHz */</div><div class='add'>+	lnb_lo = 0;</div><div class='add'>+	lnb_uncertanity = 0;</div><div class='add'>+</div><div class='add'>+	rf_freq = 10 * c-&gt;frequency ;</div><div class='add'>+	data_rate = c-&gt;symbol_rate / 100;</div><div class='add'>+</div><div class='add'>+	status = PASS;</div><div class='add'>+</div><div class='add'>+	band_low = (rf_freq - lnb_lo) - ((lnb_uncertanity * 200)</div><div class='add'>+					+ (data_rate * 135)) / 200;</div><div class='add'>+</div><div class='add'>+	band_high = (rf_freq - lnb_lo) + ((lnb_uncertanity * 200)</div><div class='add'>+					+ (data_rate * 135)) / 200;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	icoarse_tune_freq = 100000 *</div><div class='add'>+				(((rf_freq - lnb_lo) -</div><div class='add'>+					(if_limit_low + if_limit_high) / 2)</div><div class='add'>+								/ 100000);</div><div class='add'>+</div><div class='add'>+	ifine_tune_freq = (rf_freq - lnb_lo) - icoarse_tune_freq ;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ALLOWABLE_FS_COUNT; ++i) {</div><div class='add'>+		x1 = ((rf_freq - lnb_lo) / (afs[i] * 2500)) *</div><div class='add'>+					(afs[i] * 2500) + afs[i] * 2500;</div><div class='add'>+</div><div class='add'>+		x2 = ((rf_freq - lnb_lo) / (afs[i] * 2500)) *</div><div class='add'>+							(afs[i] * 2500);</div><div class='add'>+</div><div class='add'>+		if (((band_low &lt; x1) &amp;&amp; (x1 &lt; band_high)) ||</div><div class='add'>+					((band_low &lt; x2) &amp;&amp; (x2 &lt; band_high)))</div><div class='add'>+					inband_interferer_div4[i] = TRUE;</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ALLOWABLE_FS_COUNT; ++i) {</div><div class='add'>+		x1 = ((rf_freq - lnb_lo) / (afs[i] * 5000)) *</div><div class='add'>+					(afs[i] * 5000) + afs[i] * 5000;</div><div class='add'>+</div><div class='add'>+		x2 = ((rf_freq - lnb_lo) / (afs[i] * 5000)) *</div><div class='add'>+					(afs[i] * 5000);</div><div class='add'>+</div><div class='add'>+		if (((band_low &lt; x1) &amp;&amp; (x1 &lt; band_high)) ||</div><div class='add'>+					((band_low &lt; x2) &amp;&amp; (x2 &lt; band_high)))</div><div class='add'>+					inband_interferer_div2[i] = TRUE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	inband_interferer_ind = TRUE;</div><div class='add'>+	for (i = 0; i &lt; ALLOWABLE_FS_COUNT; ++i)</div><div class='add'>+		inband_interferer_ind &amp;= inband_interferer_div2[i] |</div><div class='add'>+						inband_interferer_div4[i];</div><div class='add'>+</div><div class='add'>+	if (inband_interferer_ind) {</div><div class='add'>+		for (i = 0; i &lt; ALLOWABLE_FS_COUNT; ++i) {</div><div class='add'>+			if (inband_interferer_div2[i] == FALSE) {</div><div class='add'>+				sample_rate = (u8) afs[i];</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		for (i = 0; i &lt; ALLOWABLE_FS_COUNT; ++i) {</div><div class='add'>+			if ((inband_interferer_div2[i] |</div><div class='add'>+					inband_interferer_div4[i]) == FALSE) {</div><div class='add'>+				sample_rate = (u8) afs[i];</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (sample_rate &gt; 207 || sample_rate &lt; 192)</div><div class='add'>+		sample_rate = 200;</div><div class='add'>+</div><div class='add'>+	fine_tune_freq = ((0x4000 * (ifine_tune_freq / 10)) /</div><div class='add'>+					((sample_rate) * 1000));</div><div class='add'>+</div><div class='add'>+	coarse_tune_freq = (u8)(icoarse_tune_freq / 100000);</div><div class='add'>+</div><div class='add'>+	regs[0] = sample_rate;</div><div class='add'>+	regs[1] = coarse_tune_freq;</div><div class='add'>+	regs[2] = fine_tune_freq &amp; 0xFF;</div><div class='add'>+	regs[3] = fine_tune_freq &gt;&gt; 8 &amp; 0xFF;</div><div class='add'>+</div><div class='add'>+	status |= si21_writeregs(state, PLL_DIVISOR_REG, &amp;regs[0], 0x04);</div><div class='add'>+</div><div class='add'>+	state-&gt;fs = sample_rate;/*ADC MHz*/</div><div class='add'>+	si21xx_setacquire(fe, c-&gt;symbol_rate, c-&gt;fec_inner);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int si21xx_sleep(struct dvb_frontend *fe)</div><div class='add'>+{</div><div class='add'>+	struct si21xx_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	u8 regdata;</div><div class='add'>+</div><div class='add'>+	dprintk("%s\n", __func__);</div><div class='add'>+</div><div class='add'>+	si21_readregs(state, SYSTEM_MODE_REG, &amp;regdata, 0x01);</div><div class='add'>+	regdata |= 1 &lt;&lt; 6;</div><div class='add'>+	si21_writeregs(state, SYSTEM_MODE_REG, &amp;regdata, 0x01);</div><div class='add'>+	state-&gt;initialised = 0;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void si21xx_release(struct dvb_frontend *fe)</div><div class='add'>+{</div><div class='add'>+	struct si21xx_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+</div><div class='add'>+	dprintk("%s\n", __func__);</div><div class='add'>+</div><div class='add'>+	kfree(state);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct dvb_frontend_ops si21xx_ops = {</div><div class='add'>+</div><div class='add'>+	.info = {</div><div class='add'>+		.name			= "SL SI21XX DVB-S",</div><div class='add'>+		.type			= FE_QPSK,</div><div class='add'>+		.frequency_min		= 950000,</div><div class='add'>+		.frequency_max		= 2150000,</div><div class='add'>+		.frequency_stepsize	= 125,	 /* kHz for QPSK frontends */</div><div class='add'>+		.frequency_tolerance	= 0,</div><div class='add'>+		.symbol_rate_min	= 1000000,</div><div class='add'>+		.symbol_rate_max	= 45000000,</div><div class='add'>+		.symbol_rate_tolerance	= 500,	/* ppm */</div><div class='add'>+		.caps = FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |</div><div class='add'>+		FE_CAN_FEC_5_6 | FE_CAN_FEC_7_8 |</div><div class='add'>+		FE_CAN_QPSK |</div><div class='add'>+		FE_CAN_FEC_AUTO</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	.release = si21xx_release,</div><div class='add'>+	.init = si21xx_init,</div><div class='add'>+	.sleep = si21xx_sleep,</div><div class='add'>+	.write = si21_write,</div><div class='add'>+	.read_status = si21_read_status,</div><div class='add'>+	.read_ber = si21_read_ber,</div><div class='add'>+	.read_signal_strength = si21_read_signal_strength,</div><div class='add'>+	.read_snr = si21_read_snr,</div><div class='add'>+	.read_ucblocks = si21_read_ucblocks,</div><div class='add'>+	.diseqc_send_master_cmd = si21xx_send_diseqc_msg,</div><div class='add'>+	.diseqc_send_burst = si21xx_send_diseqc_burst,</div><div class='add'>+	.set_tone = si21xx_set_tone,</div><div class='add'>+	.set_voltage = si21xx_set_voltage,</div><div class='add'>+</div><div class='add'>+	.set_property = si21xx_set_property,</div><div class='add'>+	.get_property = si21xx_get_property,</div><div class='add'>+	.set_frontend = si21xx_set_frontend,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dvb_frontend *si21xx_attach(const struct si21xx_config *config,</div><div class='add'>+						struct i2c_adapter *i2c)</div><div class='add'>+{</div><div class='add'>+	struct si21xx_state *state = NULL;</div><div class='add'>+	int id;</div><div class='add'>+</div><div class='add'>+	dprintk("%s\n", __func__);</div><div class='add'>+</div><div class='add'>+	/* allocate memory for the internal state */</div><div class='add'>+	state = kmalloc(sizeof(struct si21xx_state), GFP_KERNEL);</div><div class='add'>+	if (state == NULL)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	/* setup the state */</div><div class='add'>+	state-&gt;config = config;</div><div class='add'>+	state-&gt;i2c = i2c;</div><div class='add'>+	state-&gt;initialised = 0;</div><div class='add'>+	state-&gt;errmode = STATUS_BER;</div><div class='add'>+</div><div class='add'>+	/* check if the demod is there */</div><div class='add'>+	id = si21_readreg(state, SYSTEM_MODE_REG);</div><div class='add'>+	si21_writereg(state, SYSTEM_MODE_REG, id | 0x40); /* standby off */</div><div class='add'>+	msleep(200);</div><div class='add'>+	id = si21_readreg(state, 0x00);</div><div class='add'>+</div><div class='add'>+	/* register 0x00 contains:</div><div class='add'>+		0x34 for SI2107</div><div class='add'>+		0x24 for SI2108</div><div class='add'>+		0x14 for SI2109</div><div class='add'>+		0x04 for SI2110</div><div class='add'>+	*/</div><div class='add'>+	if (id != 0x04 &amp;&amp; id != 0x14)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	/* create dvb_frontend */</div><div class='add'>+	memcpy(&amp;state-&gt;frontend.ops, &amp;si21xx_ops,</div><div class='add'>+					sizeof(struct dvb_frontend_ops));</div><div class='add'>+	state-&gt;frontend.demodulator_priv = state;</div><div class='add'>+	return &amp;state-&gt;frontend;</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	kfree(state);</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(si21xx_attach);</div><div class='add'>+</div><div class='add'>+module_param(debug, int, 0644);</div><div class='add'>+MODULE_PARM_DESC(debug, "Turn on/off frontend debugging (default:off).");</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("SL SI21XX DVB Demodulator driver");</div><div class='add'>+MODULE_AUTHOR("Igor M. Liplianin");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/media/dvb/frontends/si21xx.h b/drivers/media/dvb/frontends/si21xx.h<br/>new file mode 100644<br/>index 000000000000..141b5b8a5f63<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/frontends/si21xx.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/si21xx.h</a></div><div class='hunk'>@@ -0,0 +1,37 @@</div><div class='add'>+#ifndef SI21XX_H</div><div class='add'>+#define SI21XX_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/dvb/frontend.h&gt;</div><div class='add'>+#include "dvb_frontend.h"</div><div class='add'>+</div><div class='add'>+struct si21xx_config {</div><div class='add'>+	/* the demodulator's i2c address */</div><div class='add'>+	u8 demod_address;</div><div class='add'>+</div><div class='add'>+	/* minimum delay before retuning */</div><div class='add'>+	int min_delay_ms;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_DVB_SI21XX) || \</div><div class='add'>+		(defined(CONFIG_DVB_SI21XX_MODULE) &amp;&amp; defined(MODULE))</div><div class='add'>+extern struct dvb_frontend *si21xx_attach(const struct si21xx_config *config,</div><div class='add'>+						struct i2c_adapter *i2c);</div><div class='add'>+#else</div><div class='add'>+static inline struct dvb_frontend *si21xx_attach(</div><div class='add'>+		const struct si21xx_config *config, struct i2c_adapter *i2c)</div><div class='add'>+{</div><div class='add'>+	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static inline int si21xx_writeregister(struct dvb_frontend *fe, u8 reg, u8 val)</div><div class='add'>+{</div><div class='add'>+	int r = 0;</div><div class='add'>+	u8 buf[] = {reg, val};</div><div class='add'>+	if (fe-&gt;ops.write)</div><div class='add'>+		r = fe-&gt;ops.write(fe, buf, 2);</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/media/dvb/frontends/sp887x.c b/drivers/media/dvb/frontends/sp887x.c<br/>index 4543609e1816..559509ab4dab 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/frontends/sp887x.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/dvb/frontends/sp887x.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/frontends/sp887x.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/sp887x.c</a></div><div class='hunk'>@@ -337,7 +337,8 @@ static int sp887x_setup_frontend_parameters (struct dvb_frontend* fe,</div><div class='ctx'> 					     struct dvb_frontend_parameters *p)</div><div class='ctx'> {</div><div class='ctx'> 	struct sp887x_state* state = fe-&gt;demodulator_priv;</div><div class='del'>-	int actual_freq, err;</div><div class='add'>+	unsigned actual_freq;</div><div class='add'>+	int err;</div><div class='ctx'> 	u16 val, reg0xc05;</div><div class='ctx'> </div><div class='ctx'> 	if (p-&gt;u.ofdm.bandwidth != BANDWIDTH_8_MHZ &amp;&amp;</div><div class='head'>diff --git a/drivers/media/dvb/frontends/stb6000.c b/drivers/media/dvb/frontends/stb6000.c<br/>new file mode 100644<br/>index 000000000000..0e2cb0df1441<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/frontends/stb6000.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/stb6000.c</a></div><div class='hunk'>@@ -0,0 +1,255 @@</div><div class='add'>+  /*</div><div class='add'>+     Driver for ST STB6000 DVBS Silicon tuner</div><div class='add'>+</div><div class='add'>+     Copyright (C) 2008 Igor M. Liplianin (liplianin@me.by)</div><div class='add'>+</div><div class='add'>+     This program is free software; you can redistribute it and/or modify</div><div class='add'>+     it under the terms of the GNU General Public License as published by</div><div class='add'>+     the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+     (at your option) any later version.</div><div class='add'>+</div><div class='add'>+     This program is distributed in the hope that it will be useful,</div><div class='add'>+     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+</div><div class='add'>+     GNU General Public License for more details.</div><div class='add'>+</div><div class='add'>+     You should have received a copy of the GNU General Public License</div><div class='add'>+     along with this program; if not, write to the Free Software</div><div class='add'>+     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='add'>+</div><div class='add'>+  */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/dvb/frontend.h&gt;</div><div class='add'>+#include &lt;asm/types.h&gt;</div><div class='add'>+</div><div class='add'>+#include "stb6000.h"</div><div class='add'>+</div><div class='add'>+static int debug;</div><div class='add'>+#define dprintk(args...) \</div><div class='add'>+	do { \</div><div class='add'>+		if (debug) \</div><div class='add'>+			printk(KERN_DEBUG "stb6000: " args); \</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+struct stb6000_priv {</div><div class='add'>+	/* i2c details */</div><div class='add'>+	int i2c_address;</div><div class='add'>+	struct i2c_adapter *i2c;</div><div class='add'>+	u32 frequency;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int stb6000_release(struct dvb_frontend *fe)</div><div class='add'>+{</div><div class='add'>+	kfree(fe-&gt;tuner_priv);</div><div class='add'>+	fe-&gt;tuner_priv = NULL;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int stb6000_sleep(struct dvb_frontend *fe)</div><div class='add'>+{</div><div class='add'>+	struct stb6000_priv *priv = fe-&gt;tuner_priv;</div><div class='add'>+	int ret;</div><div class='add'>+	u8 buf[] = { 10, 0 };</div><div class='add'>+	struct i2c_msg msg = {</div><div class='add'>+		.addr = priv-&gt;i2c_address,</div><div class='add'>+		.flags = 0,</div><div class='add'>+		.buf = buf,</div><div class='add'>+		.len = 2</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	dprintk("%s:\n", __func__);</div><div class='add'>+</div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='add'>+</div><div class='add'>+	ret = i2c_transfer(priv-&gt;i2c, &amp;msg, 1);</div><div class='add'>+	if (ret != 1)</div><div class='add'>+		dprintk("%s: i2c error\n", __func__);</div><div class='add'>+</div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='add'>+</div><div class='add'>+	return (ret == 1) ? 0 : ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int stb6000_set_params(struct dvb_frontend *fe,</div><div class='add'>+				struct dvb_frontend_parameters *params)</div><div class='add'>+{</div><div class='add'>+	struct stb6000_priv *priv = fe-&gt;tuner_priv;</div><div class='add'>+	unsigned int n, m;</div><div class='add'>+	int ret;</div><div class='add'>+	u32 freq_mhz;</div><div class='add'>+	int bandwidth;</div><div class='add'>+	u8 buf[12];</div><div class='add'>+	struct i2c_msg msg = {</div><div class='add'>+		.addr = priv-&gt;i2c_address,</div><div class='add'>+		.flags = 0,</div><div class='add'>+		.buf = buf,</div><div class='add'>+		.len = 12</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	dprintk("%s:\n", __func__);</div><div class='add'>+</div><div class='add'>+	freq_mhz = params-&gt;frequency / 1000;</div><div class='add'>+	bandwidth = params-&gt;u.qpsk.symbol_rate / 1000000;</div><div class='add'>+</div><div class='add'>+	if (bandwidth &gt; 31)</div><div class='add'>+		bandwidth = 31;</div><div class='add'>+</div><div class='add'>+	if ((freq_mhz &gt; 949) &amp;&amp; (freq_mhz &lt; 2151)) {</div><div class='add'>+		buf[0] = 0x01;</div><div class='add'>+		buf[1] = 0xac;</div><div class='add'>+		if (freq_mhz &lt; 1950)</div><div class='add'>+			buf[1] = 0xaa;</div><div class='add'>+		if (freq_mhz &lt; 1800)</div><div class='add'>+			buf[1] = 0xa8;</div><div class='add'>+		if (freq_mhz &lt; 1650)</div><div class='add'>+			buf[1] = 0xa6;</div><div class='add'>+		if (freq_mhz &lt; 1530)</div><div class='add'>+			buf[1] = 0xa5;</div><div class='add'>+		if (freq_mhz &lt; 1470)</div><div class='add'>+			buf[1] = 0xa4;</div><div class='add'>+		if (freq_mhz &lt; 1370)</div><div class='add'>+			buf[1] = 0xa2;</div><div class='add'>+		if (freq_mhz &lt; 1300)</div><div class='add'>+			buf[1] = 0xa1;</div><div class='add'>+		if (freq_mhz &lt; 1200)</div><div class='add'>+			buf[1] = 0xa0;</div><div class='add'>+		if (freq_mhz &lt; 1075)</div><div class='add'>+			buf[1] = 0xbc;</div><div class='add'>+		if (freq_mhz &lt; 1000)</div><div class='add'>+			buf[1] = 0xba;</div><div class='add'>+		if (freq_mhz &lt; 1075) {</div><div class='add'>+			n = freq_mhz / 8; /* vco=lo*4 */</div><div class='add'>+			m = 2;</div><div class='add'>+		} else {</div><div class='add'>+			n = freq_mhz / 16; /* vco=lo*2 */</div><div class='add'>+			m = 1;</div><div class='add'>+		}</div><div class='add'>+		buf[2] = n &gt;&gt; 1;</div><div class='add'>+		buf[3] = (unsigned char)(((n &amp; 1) &lt;&lt; 7) |</div><div class='add'>+					(m * freq_mhz - n * 16) | 0x60);</div><div class='add'>+		buf[4] = 0x04;</div><div class='add'>+		buf[5] = 0x0e;</div><div class='add'>+</div><div class='add'>+		buf[6] = (unsigned char)(bandwidth);</div><div class='add'>+</div><div class='add'>+		buf[7] = 0xd8;</div><div class='add'>+		buf[8] = 0xd0;</div><div class='add'>+		buf[9] = 0x50;</div><div class='add'>+		buf[10] = 0xeb;</div><div class='add'>+		buf[11] = 0x4f;</div><div class='add'>+</div><div class='add'>+		if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+			fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='add'>+</div><div class='add'>+		ret = i2c_transfer(priv-&gt;i2c, &amp;msg, 1);</div><div class='add'>+		if (ret != 1)</div><div class='add'>+			dprintk("%s: i2c error\n", __func__);</div><div class='add'>+</div><div class='add'>+		udelay(10);</div><div class='add'>+		if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+			fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='add'>+</div><div class='add'>+		buf[0] = 0x07;</div><div class='add'>+		buf[1] = 0xdf;</div><div class='add'>+		buf[2] = 0xd0;</div><div class='add'>+		buf[3] = 0x50;</div><div class='add'>+		buf[4] = 0xfb;</div><div class='add'>+		msg.len = 5;</div><div class='add'>+</div><div class='add'>+		if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+			fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='add'>+</div><div class='add'>+		ret = i2c_transfer(priv-&gt;i2c, &amp;msg, 1);</div><div class='add'>+		if (ret != 1)</div><div class='add'>+			dprintk("%s: i2c error\n", __func__);</div><div class='add'>+</div><div class='add'>+		udelay(10);</div><div class='add'>+		if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+			fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='add'>+</div><div class='add'>+		priv-&gt;frequency = freq_mhz * 1000;</div><div class='add'>+</div><div class='add'>+		return (ret == 1) ? 0 : ret;</div><div class='add'>+	}</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int stb6000_get_frequency(struct dvb_frontend *fe, u32 *frequency)</div><div class='add'>+{</div><div class='add'>+	struct stb6000_priv *priv = fe-&gt;tuner_priv;</div><div class='add'>+	*frequency = priv-&gt;frequency;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct dvb_tuner_ops stb6000_tuner_ops = {</div><div class='add'>+	.info = {</div><div class='add'>+		.name = "ST STB6000",</div><div class='add'>+		.frequency_min = 950000,</div><div class='add'>+		.frequency_max = 2150000</div><div class='add'>+	},</div><div class='add'>+	.release = stb6000_release,</div><div class='add'>+	.sleep = stb6000_sleep,</div><div class='add'>+	.set_params = stb6000_set_params,</div><div class='add'>+	.get_frequency = stb6000_get_frequency,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dvb_frontend *stb6000_attach(struct dvb_frontend *fe, int addr,</div><div class='add'>+						struct i2c_adapter *i2c)</div><div class='add'>+{</div><div class='add'>+	struct stb6000_priv *priv = NULL;</div><div class='add'>+	u8 b0[] = { 0 };</div><div class='add'>+	u8 b1[] = { 0, 0 };</div><div class='add'>+	struct i2c_msg msg[2] = {</div><div class='add'>+		{</div><div class='add'>+			.addr = addr,</div><div class='add'>+			.flags = 0,</div><div class='add'>+			.buf = b0,</div><div class='add'>+			.len = 0</div><div class='add'>+		}, {</div><div class='add'>+			.addr = addr,</div><div class='add'>+			.flags = I2C_M_RD,</div><div class='add'>+			.buf = b1,</div><div class='add'>+			.len = 2</div><div class='add'>+		}</div><div class='add'>+	};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	dprintk("%s:\n", __func__);</div><div class='add'>+</div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='add'>+</div><div class='add'>+	/* is some i2c device here ? */</div><div class='add'>+	ret = i2c_transfer(i2c, msg, 2);</div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='add'>+</div><div class='add'>+	if (ret != 2)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	priv = kzalloc(sizeof(struct stb6000_priv), GFP_KERNEL);</div><div class='add'>+	if (priv == NULL)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	priv-&gt;i2c_address = addr;</div><div class='add'>+	priv-&gt;i2c = i2c;</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;fe-&gt;ops.tuner_ops, &amp;stb6000_tuner_ops,</div><div class='add'>+				sizeof(struct dvb_tuner_ops));</div><div class='add'>+</div><div class='add'>+	fe-&gt;tuner_priv = priv;</div><div class='add'>+</div><div class='add'>+	return fe;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(stb6000_attach);</div><div class='add'>+</div><div class='add'>+module_param(debug, int, 0644);</div><div class='add'>+MODULE_PARM_DESC(debug, "Turn on/off frontend debugging (default:off).");</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("DVB STB6000 driver");</div><div class='add'>+MODULE_AUTHOR("Igor M. Liplianin &lt;liplianin@me.by&gt;");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/media/dvb/frontends/stb6000.h b/drivers/media/dvb/frontends/stb6000.h<br/>new file mode 100644<br/>index 000000000000..7be479c22d5b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/frontends/stb6000.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/stb6000.h</a></div><div class='hunk'>@@ -0,0 +1,51 @@</div><div class='add'>+  /*</div><div class='add'>+     Driver for ST stb6000 DVBS Silicon tuner</div><div class='add'>+</div><div class='add'>+     Copyright (C) 2008 Igor M. Liplianin (liplianin@me.by)</div><div class='add'>+</div><div class='add'>+     This program is free software; you can redistribute it and/or modify</div><div class='add'>+     it under the terms of the GNU General Public License as published by</div><div class='add'>+     the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+     (at your option) any later version.</div><div class='add'>+</div><div class='add'>+     This program is distributed in the hope that it will be useful,</div><div class='add'>+     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+</div><div class='add'>+     GNU General Public License for more details.</div><div class='add'>+</div><div class='add'>+     You should have received a copy of the GNU General Public License</div><div class='add'>+     along with this program; if not, write to the Free Software</div><div class='add'>+     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='add'>+</div><div class='add'>+  */</div><div class='add'>+</div><div class='add'>+#ifndef __DVB_STB6000_H__</div><div class='add'>+#define __DVB_STB6000_H__</div><div class='add'>+</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include "dvb_frontend.h"</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Attach a stb6000 tuner to the supplied frontend structure.</div><div class='add'>+ *</div><div class='add'>+ * @param fe Frontend to attach to.</div><div class='add'>+ * @param addr i2c address of the tuner.</div><div class='add'>+ * @param i2c i2c adapter to use.</div><div class='add'>+ * @return FE pointer on success, NULL on failure.</div><div class='add'>+ */</div><div class='add'>+#if defined(CONFIG_DVB_STB6000) || (defined(CONFIG_DVB_STB6000_MODULE) \</div><div class='add'>+							&amp;&amp; defined(MODULE))</div><div class='add'>+extern struct dvb_frontend *stb6000_attach(struct dvb_frontend *fe, int addr,</div><div class='add'>+					   struct i2c_adapter *i2c);</div><div class='add'>+#else</div><div class='add'>+static inline struct dvb_frontend *stb6000_attach(struct dvb_frontend *fe,</div><div class='add'>+						  int addr,</div><div class='add'>+						  struct i2c_adapter *i2c)</div><div class='add'>+{</div><div class='add'>+	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_DVB_STB6000 */</div><div class='add'>+</div><div class='add'>+#endif /* __DVB_STB6000_H__ */</div><div class='head'>diff --git a/drivers/media/dvb/frontends/stv0288.c b/drivers/media/dvb/frontends/stv0288.c<br/>new file mode 100644<br/>index 000000000000..ff1194de34c0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/frontends/stv0288.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/stv0288.c</a></div><div class='hunk'>@@ -0,0 +1,618 @@</div><div class='add'>+/*</div><div class='add'>+	Driver for ST STV0288 demodulator</div><div class='add'>+	Copyright (C) 2006 Georg Acher, BayCom GmbH, acher (at) baycom (dot) de</div><div class='add'>+		for Reel Multimedia</div><div class='add'>+	Copyright (C) 2008 TurboSight.com, Bob Liu &lt;bob@turbosight.com&gt;</div><div class='add'>+	Copyright (C) 2008 Igor M. Liplianin &lt;liplianin@me.by&gt;</div><div class='add'>+		Removed stb6000 specific tuner code and revised some</div><div class='add'>+		procedures.</div><div class='add'>+</div><div class='add'>+	This program is free software; you can redistribute it and/or modify</div><div class='add'>+	it under the terms of the GNU General Public License as published by</div><div class='add'>+	the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+	(at your option) any later version.</div><div class='add'>+</div><div class='add'>+	This program is distributed in the hope that it will be useful,</div><div class='add'>+	but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+	GNU General Public License for more details.</div><div class='add'>+</div><div class='add'>+	You should have received a copy of the GNU General Public License</div><div class='add'>+	along with this program; if not, write to the Free Software</div><div class='add'>+	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='add'>+</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/jiffies.h&gt;</div><div class='add'>+#include &lt;asm/div64.h&gt;</div><div class='add'>+</div><div class='add'>+#include "dvb_frontend.h"</div><div class='add'>+#include "stv0288.h"</div><div class='add'>+</div><div class='add'>+struct stv0288_state {</div><div class='add'>+	struct i2c_adapter *i2c;</div><div class='add'>+	const struct stv0288_config *config;</div><div class='add'>+	struct dvb_frontend frontend;</div><div class='add'>+</div><div class='add'>+	u8 initialised:1;</div><div class='add'>+	u32 tuner_frequency;</div><div class='add'>+	u32 symbol_rate;</div><div class='add'>+	fe_code_rate_t fec_inner;</div><div class='add'>+	int errmode;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define STATUS_BER 0</div><div class='add'>+#define STATUS_UCBLOCKS 1</div><div class='add'>+</div><div class='add'>+static int debug;</div><div class='add'>+static int debug_legacy_dish_switch;</div><div class='add'>+#define dprintk(args...) \</div><div class='add'>+	do { \</div><div class='add'>+		if (debug) \</div><div class='add'>+			printk(KERN_DEBUG "stv0288: " args); \</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int stv0288_writeregI(struct stv0288_state *state, u8 reg, u8 data)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u8 buf[] = { reg, data };</div><div class='add'>+	struct i2c_msg msg = {</div><div class='add'>+		.addr = state-&gt;config-&gt;demod_address,</div><div class='add'>+		.flags = 0,</div><div class='add'>+		.buf = buf,</div><div class='add'>+		.len = 2</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ret = i2c_transfer(state-&gt;i2c, &amp;msg, 1);</div><div class='add'>+</div><div class='add'>+	if (ret != 1)</div><div class='add'>+		dprintk("%s: writereg error (reg == 0x%02x, val == 0x%02x, "</div><div class='add'>+			"ret == %i)\n", __func__, reg, data, ret);</div><div class='add'>+</div><div class='add'>+	return (ret != 1) ? -EREMOTEIO : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int stv0288_write(struct dvb_frontend *fe, u8 *buf, int len)</div><div class='add'>+{</div><div class='add'>+	struct stv0288_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+</div><div class='add'>+	if (len != 2)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return stv0288_writeregI(state, buf[0], buf[1]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 stv0288_readreg(struct stv0288_state *state, u8 reg)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u8 b0[] = { reg };</div><div class='add'>+	u8 b1[] = { 0 };</div><div class='add'>+	struct i2c_msg msg[] = {</div><div class='add'>+		{</div><div class='add'>+			.addr = state-&gt;config-&gt;demod_address,</div><div class='add'>+			.flags = 0,</div><div class='add'>+			.buf = b0,</div><div class='add'>+			.len = 1</div><div class='add'>+		}, {</div><div class='add'>+			.addr = state-&gt;config-&gt;demod_address,</div><div class='add'>+			.flags = I2C_M_RD,</div><div class='add'>+			.buf = b1,</div><div class='add'>+			.len = 1</div><div class='add'>+		}</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ret = i2c_transfer(state-&gt;i2c, msg, 2);</div><div class='add'>+</div><div class='add'>+	if (ret != 2)</div><div class='add'>+		dprintk("%s: readreg error (reg == 0x%02x, ret == %i)\n",</div><div class='add'>+				__func__, reg, ret);</div><div class='add'>+</div><div class='add'>+	return b1[0];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int stv0288_set_symbolrate(struct dvb_frontend *fe, u32 srate)</div><div class='add'>+{</div><div class='add'>+	struct stv0288_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	unsigned int temp;</div><div class='add'>+	unsigned char b[3];</div><div class='add'>+</div><div class='add'>+	if ((srate &lt; 1000000) || (srate &gt; 45000000))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	temp = (unsigned int)srate / 1000;</div><div class='add'>+</div><div class='add'>+		temp = temp * 32768;</div><div class='add'>+		temp = temp / 25;</div><div class='add'>+		temp = temp / 125;</div><div class='add'>+		b[0] = (unsigned char)((temp &gt;&gt; 12) &amp; 0xff);</div><div class='add'>+		b[1] = (unsigned char)((temp &gt;&gt; 4) &amp; 0xff);</div><div class='add'>+		b[2] = (unsigned char)((temp &lt;&lt; 4) &amp; 0xf0);</div><div class='add'>+		stv0288_writeregI(state, 0x28, 0x80); /* SFRH */</div><div class='add'>+		stv0288_writeregI(state, 0x29, 0); /* SFRM */</div><div class='add'>+		stv0288_writeregI(state, 0x2a, 0); /* SFRL */</div><div class='add'>+</div><div class='add'>+		stv0288_writeregI(state, 0x28, b[0]);</div><div class='add'>+		stv0288_writeregI(state, 0x29, b[1]);</div><div class='add'>+		stv0288_writeregI(state, 0x2a, b[2]);</div><div class='add'>+		dprintk("stv0288: stv0288_set_symbolrate\n");</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int stv0288_send_diseqc_msg(struct dvb_frontend *fe,</div><div class='add'>+				    struct dvb_diseqc_master_cmd *m)</div><div class='add'>+{</div><div class='add'>+	struct stv0288_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	dprintk("%s\n", __func__);</div><div class='add'>+</div><div class='add'>+	stv0288_writeregI(state, 0x09, 0);</div><div class='add'>+	msleep(30);</div><div class='add'>+	stv0288_writeregI(state, 0x05, 0x16);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; m-&gt;msg_len; i++) {</div><div class='add'>+		if (stv0288_writeregI(state, 0x06, m-&gt;msg[i]))</div><div class='add'>+			return -EREMOTEIO;</div><div class='add'>+		msleep(12);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int stv0288_send_diseqc_burst(struct dvb_frontend *fe,</div><div class='add'>+						fe_sec_mini_cmd_t burst)</div><div class='add'>+{</div><div class='add'>+	struct stv0288_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+</div><div class='add'>+	dprintk("%s\n", __func__);</div><div class='add'>+</div><div class='add'>+	if (stv0288_writeregI(state, 0x05, 0x16))/* burst mode */</div><div class='add'>+		return -EREMOTEIO;</div><div class='add'>+</div><div class='add'>+	if (stv0288_writeregI(state, 0x06, burst == SEC_MINI_A ? 0x00 : 0xff))</div><div class='add'>+		return -EREMOTEIO;</div><div class='add'>+</div><div class='add'>+	if (stv0288_writeregI(state, 0x06, 0x12))</div><div class='add'>+		return -EREMOTEIO;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int stv0288_set_tone(struct dvb_frontend *fe, fe_sec_tone_mode_t tone)</div><div class='add'>+{</div><div class='add'>+	struct stv0288_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+</div><div class='add'>+	switch (tone) {</div><div class='add'>+	case SEC_TONE_ON:</div><div class='add'>+		if (stv0288_writeregI(state, 0x05, 0x10))/* burst mode */</div><div class='add'>+			return -EREMOTEIO;</div><div class='add'>+		return stv0288_writeregI(state, 0x06, 0xff);</div><div class='add'>+</div><div class='add'>+	case SEC_TONE_OFF:</div><div class='add'>+		if (stv0288_writeregI(state, 0x05, 0x13))/* burst mode */</div><div class='add'>+			return -EREMOTEIO;</div><div class='add'>+		return stv0288_writeregI(state, 0x06, 0x00);</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 stv0288_inittab[] = {</div><div class='add'>+	0x01, 0x15,</div><div class='add'>+	0x02, 0x20,</div><div class='add'>+	0x09, 0x0,</div><div class='add'>+	0x0a, 0x4,</div><div class='add'>+	0x0b, 0x0,</div><div class='add'>+	0x0c, 0x0,</div><div class='add'>+	0x0d, 0x0,</div><div class='add'>+	0x0e, 0xd4,</div><div class='add'>+	0x0f, 0x30,</div><div class='add'>+	0x11, 0x80,</div><div class='add'>+	0x12, 0x03,</div><div class='add'>+	0x13, 0x48,</div><div class='add'>+	0x14, 0x84,</div><div class='add'>+	0x15, 0x45,</div><div class='add'>+	0x16, 0xb7,</div><div class='add'>+	0x17, 0x9c,</div><div class='add'>+	0x18, 0x0,</div><div class='add'>+	0x19, 0xa6,</div><div class='add'>+	0x1a, 0x88,</div><div class='add'>+	0x1b, 0x8f,</div><div class='add'>+	0x1c, 0xf0,</div><div class='add'>+	0x20, 0x0b,</div><div class='add'>+	0x21, 0x54,</div><div class='add'>+	0x22, 0x0,</div><div class='add'>+	0x23, 0x0,</div><div class='add'>+	0x2b, 0xff,</div><div class='add'>+	0x2c, 0xf7,</div><div class='add'>+	0x30, 0x0,</div><div class='add'>+	0x31, 0x1e,</div><div class='add'>+	0x32, 0x14,</div><div class='add'>+	0x33, 0x0f,</div><div class='add'>+	0x34, 0x09,</div><div class='add'>+	0x35, 0x0c,</div><div class='add'>+	0x36, 0x05,</div><div class='add'>+	0x37, 0x2f,</div><div class='add'>+	0x38, 0x16,</div><div class='add'>+	0x39, 0xbe,</div><div class='add'>+	0x3a, 0x0,</div><div class='add'>+	0x3b, 0x13,</div><div class='add'>+	0x3c, 0x11,</div><div class='add'>+	0x3d, 0x30,</div><div class='add'>+	0x40, 0x63,</div><div class='add'>+	0x41, 0x04,</div><div class='add'>+	0x42, 0x60,</div><div class='add'>+	0x43, 0x00,</div><div class='add'>+	0x44, 0x00,</div><div class='add'>+	0x45, 0x00,</div><div class='add'>+	0x46, 0x00,</div><div class='add'>+	0x47, 0x00,</div><div class='add'>+	0x4a, 0x00,</div><div class='add'>+	0x50, 0x10,</div><div class='add'>+	0x51, 0x38,</div><div class='add'>+	0x52, 0x21,</div><div class='add'>+	0x58, 0x54,</div><div class='add'>+	0x59, 0x86,</div><div class='add'>+	0x5a, 0x0,</div><div class='add'>+	0x5b, 0x9b,</div><div class='add'>+	0x5c, 0x08,</div><div class='add'>+	0x5d, 0x7f,</div><div class='add'>+	0x5e, 0x0,</div><div class='add'>+	0x5f, 0xff,</div><div class='add'>+	0x70, 0x0,</div><div class='add'>+	0x71, 0x0,</div><div class='add'>+	0x72, 0x0,</div><div class='add'>+	0x74, 0x0,</div><div class='add'>+	0x75, 0x0,</div><div class='add'>+	0x76, 0x0,</div><div class='add'>+	0x81, 0x0,</div><div class='add'>+	0x82, 0x3f,</div><div class='add'>+	0x83, 0x3f,</div><div class='add'>+	0x84, 0x0,</div><div class='add'>+	0x85, 0x0,</div><div class='add'>+	0x88, 0x0,</div><div class='add'>+	0x89, 0x0,</div><div class='add'>+	0x8a, 0x0,</div><div class='add'>+	0x8b, 0x0,</div><div class='add'>+	0x8c, 0x0,</div><div class='add'>+	0x90, 0x0,</div><div class='add'>+	0x91, 0x0,</div><div class='add'>+	0x92, 0x0,</div><div class='add'>+	0x93, 0x0,</div><div class='add'>+	0x94, 0x1c,</div><div class='add'>+	0x97, 0x0,</div><div class='add'>+	0xa0, 0x48,</div><div class='add'>+	0xa1, 0x0,</div><div class='add'>+	0xb0, 0xb8,</div><div class='add'>+	0xb1, 0x3a,</div><div class='add'>+	0xb2, 0x10,</div><div class='add'>+	0xb3, 0x82,</div><div class='add'>+	0xb4, 0x80,</div><div class='add'>+	0xb5, 0x82,</div><div class='add'>+	0xb6, 0x82,</div><div class='add'>+	0xb7, 0x82,</div><div class='add'>+	0xb8, 0x20,</div><div class='add'>+	0xb9, 0x0,</div><div class='add'>+	0xf0, 0x0,</div><div class='add'>+	0xf1, 0x0,</div><div class='add'>+	0xf2, 0xc0,</div><div class='add'>+	0x51, 0x36,</div><div class='add'>+	0x52, 0x09,</div><div class='add'>+	0x53, 0x94,</div><div class='add'>+	0x54, 0x62,</div><div class='add'>+	0x55, 0x29,</div><div class='add'>+	0x56, 0x64,</div><div class='add'>+	0x57, 0x2b,</div><div class='add'>+	0xff, 0xff,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int stv0288_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t volt)</div><div class='add'>+{</div><div class='add'>+	dprintk("%s: %s\n", __func__,</div><div class='add'>+		volt == SEC_VOLTAGE_13 ? "SEC_VOLTAGE_13" :</div><div class='add'>+		volt == SEC_VOLTAGE_18 ? "SEC_VOLTAGE_18" : "??");</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int stv0288_init(struct dvb_frontend *fe)</div><div class='add'>+{</div><div class='add'>+	struct stv0288_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	int i;</div><div class='add'>+	u8 reg;</div><div class='add'>+	u8 val;</div><div class='add'>+</div><div class='add'>+	dprintk("stv0288: init chip\n");</div><div class='add'>+	stv0288_writeregI(state, 0x41, 0x04);</div><div class='add'>+	msleep(50);</div><div class='add'>+</div><div class='add'>+	/* we have default inittab */</div><div class='add'>+	if (state-&gt;config-&gt;inittab == NULL) {</div><div class='add'>+		for (i = 0; !(stv0288_inittab[i] == 0xff &amp;&amp;</div><div class='add'>+				stv0288_inittab[i + 1] == 0xff); i += 2)</div><div class='add'>+			stv0288_writeregI(state, stv0288_inittab[i],</div><div class='add'>+					stv0288_inittab[i + 1]);</div><div class='add'>+	} else {</div><div class='add'>+		for (i = 0; ; i += 2)  {</div><div class='add'>+			reg = state-&gt;config-&gt;inittab[i];</div><div class='add'>+			val = state-&gt;config-&gt;inittab[i+1];</div><div class='add'>+			if (reg == 0xff &amp;&amp; val == 0xff)</div><div class='add'>+				break;</div><div class='add'>+			stv0288_writeregI(state, reg, val);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int stv0288_read_status(struct dvb_frontend *fe, fe_status_t *status)</div><div class='add'>+{</div><div class='add'>+	struct stv0288_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+</div><div class='add'>+	u8 sync = stv0288_readreg(state, 0x24);</div><div class='add'>+	if (sync == 255)</div><div class='add'>+		sync = 0;</div><div class='add'>+</div><div class='add'>+	dprintk("%s : FE_READ_STATUS : VSTATUS: 0x%02x\n", __func__, sync);</div><div class='add'>+</div><div class='add'>+	*status = 0;</div><div class='add'>+</div><div class='add'>+	if ((sync &amp; 0x08) == 0x08) {</div><div class='add'>+		*status |= FE_HAS_LOCK;</div><div class='add'>+		dprintk("stv0288 has locked\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int stv0288_read_ber(struct dvb_frontend *fe, u32 *ber)</div><div class='add'>+{</div><div class='add'>+	struct stv0288_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+</div><div class='add'>+	if (state-&gt;errmode != STATUS_BER)</div><div class='add'>+		return 0;</div><div class='add'>+	*ber = (stv0288_readreg(state, 0x26) &lt;&lt; 8) |</div><div class='add'>+					stv0288_readreg(state, 0x27);</div><div class='add'>+	dprintk("stv0288_read_ber %d\n", *ber);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int stv0288_read_signal_strength(struct dvb_frontend *fe, u16 *strength)</div><div class='add'>+{</div><div class='add'>+	struct stv0288_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+</div><div class='add'>+	s32 signal =  0xffff - ((stv0288_readreg(state, 0x10) &lt;&lt; 8));</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	signal = signal * 5 / 4;</div><div class='add'>+	*strength = (signal &gt; 0xffff) ? 0xffff : (signal &lt; 0) ? 0 : signal;</div><div class='add'>+	dprintk("stv0288_read_signal_strength %d\n", *strength);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+static int stv0288_sleep(struct dvb_frontend *fe)</div><div class='add'>+{</div><div class='add'>+	struct stv0288_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+</div><div class='add'>+	stv0288_writeregI(state, 0x41, 0x84);</div><div class='add'>+	state-&gt;initialised = 0;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+static int stv0288_read_snr(struct dvb_frontend *fe, u16 *snr)</div><div class='add'>+{</div><div class='add'>+	struct stv0288_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+</div><div class='add'>+	s32 xsnr = 0xffff - ((stv0288_readreg(state, 0x2d) &lt;&lt; 8)</div><div class='add'>+			   | stv0288_readreg(state, 0x2e));</div><div class='add'>+	xsnr = 3 * (xsnr - 0xa100);</div><div class='add'>+	*snr = (xsnr &gt; 0xffff) ? 0xffff : (xsnr &lt; 0) ? 0 : xsnr;</div><div class='add'>+	dprintk("stv0288_read_snr %d\n", *snr);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int stv0288_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks)</div><div class='add'>+{</div><div class='add'>+	struct stv0288_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+</div><div class='add'>+	if (state-&gt;errmode != STATUS_BER)</div><div class='add'>+		return 0;</div><div class='add'>+	*ucblocks = (stv0288_readreg(state, 0x26) &lt;&lt; 8) |</div><div class='add'>+					stv0288_readreg(state, 0x27);</div><div class='add'>+	dprintk("stv0288_read_ber %d\n", *ucblocks);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int stv0288_set_property(struct dvb_frontend *fe, struct dtv_property *p)</div><div class='add'>+{</div><div class='add'>+	dprintk("%s(..)\n", __func__);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int stv0288_get_property(struct dvb_frontend *fe, struct dtv_property *p)</div><div class='add'>+{</div><div class='add'>+	dprintk("%s(..)\n", __func__);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int stv0288_set_frontend(struct dvb_frontend *fe,</div><div class='add'>+					struct dvb_frontend_parameters *dfp)</div><div class='add'>+{</div><div class='add'>+	struct stv0288_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='add'>+</div><div class='add'>+	char tm;</div><div class='add'>+	unsigned char tda[3];</div><div class='add'>+</div><div class='add'>+	dprintk("%s : FE_SET_FRONTEND\n", __func__);</div><div class='add'>+</div><div class='add'>+	if (c-&gt;delivery_system != SYS_DVBS) {</div><div class='add'>+			dprintk("%s: unsupported delivery "</div><div class='add'>+				"system selected (%d)\n",</div><div class='add'>+				__func__, c-&gt;delivery_system);</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (state-&gt;config-&gt;set_ts_params)</div><div class='add'>+		state-&gt;config-&gt;set_ts_params(fe, 0);</div><div class='add'>+</div><div class='add'>+	/* only frequency &amp; symbol_rate are used for tuner*/</div><div class='add'>+	dfp-&gt;frequency = c-&gt;frequency;</div><div class='add'>+	dfp-&gt;u.qpsk.symbol_rate = c-&gt;symbol_rate;</div><div class='add'>+	if (fe-&gt;ops.tuner_ops.set_params) {</div><div class='add'>+		fe-&gt;ops.tuner_ops.set_params(fe, dfp);</div><div class='add'>+		if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+			fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	udelay(10);</div><div class='add'>+	stv0288_set_symbolrate(fe, c-&gt;symbol_rate);</div><div class='add'>+	/* Carrier lock control register */</div><div class='add'>+	stv0288_writeregI(state, 0x15, 0xc5);</div><div class='add'>+</div><div class='add'>+	tda[0] = 0x2b; /* CFRM */</div><div class='add'>+	tda[2] = 0x0; /* CFRL */</div><div class='add'>+	for (tm = -6; tm &lt; 7;) {</div><div class='add'>+		/* Viterbi status */</div><div class='add'>+		if (stv0288_readreg(state, 0x24) &amp; 0x80)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		tda[2] += 40;</div><div class='add'>+		if (tda[2] &lt; 40)</div><div class='add'>+			tm++;</div><div class='add'>+		tda[1] = (unsigned char)tm;</div><div class='add'>+		stv0288_writeregI(state, 0x2b, tda[1]);</div><div class='add'>+		stv0288_writeregI(state, 0x2c, tda[2]);</div><div class='add'>+		udelay(30);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	state-&gt;tuner_frequency = c-&gt;frequency;</div><div class='add'>+	state-&gt;fec_inner = FEC_AUTO;</div><div class='add'>+	state-&gt;symbol_rate = c-&gt;symbol_rate;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int stv0288_i2c_gate_ctrl(struct dvb_frontend *fe, int enable)</div><div class='add'>+{</div><div class='add'>+	struct stv0288_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+</div><div class='add'>+	if (enable)</div><div class='add'>+		stv0288_writeregI(state, 0x01, 0xb5);</div><div class='add'>+	else</div><div class='add'>+		stv0288_writeregI(state, 0x01, 0x35);</div><div class='add'>+</div><div class='add'>+	udelay(1);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void stv0288_release(struct dvb_frontend *fe)</div><div class='add'>+{</div><div class='add'>+	struct stv0288_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	kfree(state);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct dvb_frontend_ops stv0288_ops = {</div><div class='add'>+</div><div class='add'>+	.info = {</div><div class='add'>+		.name			= "ST STV0288 DVB-S",</div><div class='add'>+		.type			= FE_QPSK,</div><div class='add'>+		.frequency_min		= 950000,</div><div class='add'>+		.frequency_max		= 2150000,</div><div class='add'>+		.frequency_stepsize	= 1000,	 /* kHz for QPSK frontends */</div><div class='add'>+		.frequency_tolerance	= 0,</div><div class='add'>+		.symbol_rate_min	= 1000000,</div><div class='add'>+		.symbol_rate_max	= 45000000,</div><div class='add'>+		.symbol_rate_tolerance	= 500,	/* ppm */</div><div class='add'>+		.caps = FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |</div><div class='add'>+		      FE_CAN_FEC_5_6 | FE_CAN_FEC_7_8 |</div><div class='add'>+		      FE_CAN_QPSK |</div><div class='add'>+		      FE_CAN_FEC_AUTO</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	.release = stv0288_release,</div><div class='add'>+	.init = stv0288_init,</div><div class='add'>+	.sleep = stv0288_sleep,</div><div class='add'>+	.write = stv0288_write,</div><div class='add'>+	.i2c_gate_ctrl = stv0288_i2c_gate_ctrl,</div><div class='add'>+	.read_status = stv0288_read_status,</div><div class='add'>+	.read_ber = stv0288_read_ber,</div><div class='add'>+	.read_signal_strength = stv0288_read_signal_strength,</div><div class='add'>+	.read_snr = stv0288_read_snr,</div><div class='add'>+	.read_ucblocks = stv0288_read_ucblocks,</div><div class='add'>+	.diseqc_send_master_cmd = stv0288_send_diseqc_msg,</div><div class='add'>+	.diseqc_send_burst = stv0288_send_diseqc_burst,</div><div class='add'>+	.set_tone = stv0288_set_tone,</div><div class='add'>+	.set_voltage = stv0288_set_voltage,</div><div class='add'>+</div><div class='add'>+	.set_property = stv0288_set_property,</div><div class='add'>+	.get_property = stv0288_get_property,</div><div class='add'>+	.set_frontend = stv0288_set_frontend,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dvb_frontend *stv0288_attach(const struct stv0288_config *config,</div><div class='add'>+				    struct i2c_adapter *i2c)</div><div class='add'>+{</div><div class='add'>+	struct stv0288_state *state = NULL;</div><div class='add'>+	int id;</div><div class='add'>+</div><div class='add'>+	/* allocate memory for the internal state */</div><div class='add'>+	state = kmalloc(sizeof(struct stv0288_state), GFP_KERNEL);</div><div class='add'>+	if (state == NULL)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	/* setup the state */</div><div class='add'>+	state-&gt;config = config;</div><div class='add'>+	state-&gt;i2c = i2c;</div><div class='add'>+	state-&gt;initialised = 0;</div><div class='add'>+	state-&gt;tuner_frequency = 0;</div><div class='add'>+	state-&gt;symbol_rate = 0;</div><div class='add'>+	state-&gt;fec_inner = 0;</div><div class='add'>+	state-&gt;errmode = STATUS_BER;</div><div class='add'>+</div><div class='add'>+	stv0288_writeregI(state, 0x41, 0x04);</div><div class='add'>+	msleep(200);</div><div class='add'>+	id = stv0288_readreg(state, 0x00);</div><div class='add'>+	dprintk("stv0288 id %x\n", id);</div><div class='add'>+</div><div class='add'>+	/* register 0x00 contains 0x11 for STV0288  */</div><div class='add'>+	if (id != 0x11)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	/* create dvb_frontend */</div><div class='add'>+	memcpy(&amp;state-&gt;frontend.ops, &amp;stv0288_ops,</div><div class='add'>+			sizeof(struct dvb_frontend_ops));</div><div class='add'>+	state-&gt;frontend.demodulator_priv = state;</div><div class='add'>+	return &amp;state-&gt;frontend;</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	kfree(state);</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(stv0288_attach);</div><div class='add'>+</div><div class='add'>+module_param(debug_legacy_dish_switch, int, 0444);</div><div class='add'>+MODULE_PARM_DESC(debug_legacy_dish_switch,</div><div class='add'>+		"Enable timing analysis for Dish Network legacy switches");</div><div class='add'>+</div><div class='add'>+module_param(debug, int, 0644);</div><div class='add'>+MODULE_PARM_DESC(debug, "Turn on/off frontend debugging (default:off).");</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("ST STV0288 DVB Demodulator driver");</div><div class='add'>+MODULE_AUTHOR("Georg Acher, Bob Liu, Igor liplianin");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='head'>diff --git a/drivers/media/dvb/frontends/stv0288.h b/drivers/media/dvb/frontends/stv0288.h<br/>new file mode 100644<br/>index 000000000000..f2b53db0606d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/frontends/stv0288.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/stv0288.h</a></div><div class='hunk'>@@ -0,0 +1,67 @@</div><div class='add'>+/*</div><div class='add'>+	Driver for ST STV0288 demodulator</div><div class='add'>+</div><div class='add'>+	Copyright (C) 2006 Georg Acher, BayCom GmbH, acher (at) baycom (dot) de</div><div class='add'>+		for Reel Multimedia</div><div class='add'>+	Copyright (C) 2008 TurboSight.com, &lt;bob@turbosight.com&gt;</div><div class='add'>+	Copyright (C) 2008 Igor M. Liplianin &lt;liplianin@me.by&gt;</div><div class='add'>+		Removed stb6000 specific tuner code and revised some</div><div class='add'>+		procedures.</div><div class='add'>+</div><div class='add'>+	This program is free software; you can redistribute it and/or modify</div><div class='add'>+	it under the terms of the GNU General Public License as published by</div><div class='add'>+	the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+	(at your option) any later version.</div><div class='add'>+</div><div class='add'>+	This program is distributed in the hope that it will be useful,</div><div class='add'>+	but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+	GNU General Public License for more details.</div><div class='add'>+</div><div class='add'>+	You should have received a copy of the GNU General Public License</div><div class='add'>+	along with this program; if not, write to the Free Software</div><div class='add'>+	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='add'>+</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#ifndef STV0288_H</div><div class='add'>+#define STV0288_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/dvb/frontend.h&gt;</div><div class='add'>+#include "dvb_frontend.h"</div><div class='add'>+</div><div class='add'>+struct stv0288_config {</div><div class='add'>+	/* the demodulator's i2c address */</div><div class='add'>+	u8 demod_address;</div><div class='add'>+</div><div class='add'>+	u8* inittab;</div><div class='add'>+</div><div class='add'>+	/* minimum delay before retuning */</div><div class='add'>+	int min_delay_ms;</div><div class='add'>+</div><div class='add'>+	int (*set_ts_params)(struct dvb_frontend *fe, int is_punctured);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_DVB_STV0288) || (defined(CONFIG_DVB_STV0288_MODULE) &amp;&amp; \</div><div class='add'>+							defined(MODULE))</div><div class='add'>+extern struct dvb_frontend *stv0288_attach(const struct stv0288_config *config,</div><div class='add'>+					   struct i2c_adapter *i2c);</div><div class='add'>+#else</div><div class='add'>+static inline struct dvb_frontend *stv0288_attach(const struct stv0288_config *config,</div><div class='add'>+					   struct i2c_adapter *i2c)</div><div class='add'>+{</div><div class='add'>+	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_DVB_STV0288 */</div><div class='add'>+</div><div class='add'>+static inline int stv0288_writereg(struct dvb_frontend *fe, u8 reg, u8 val)</div><div class='add'>+{</div><div class='add'>+	int r = 0;</div><div class='add'>+	u8 buf[] = { reg, val };</div><div class='add'>+	if (fe-&gt;ops.write)</div><div class='add'>+		r = fe-&gt;ops.write(fe, buf, 2);</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* STV0288_H */</div><div class='head'>diff --git a/drivers/media/dvb/frontends/stv0299.c b/drivers/media/dvb/frontends/stv0299.c<br/>index 35435bef8e79..6c1cb1973c6e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/frontends/stv0299.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/dvb/frontends/stv0299.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/frontends/stv0299.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/stv0299.c</a></div><div class='hunk'>@@ -559,6 +559,8 @@ static int stv0299_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par</div><div class='ctx'> 	int invval = 0;</div><div class='ctx'> </div><div class='ctx'> 	dprintk ("%s : FE_SET_FRONTEND\n", __func__);</div><div class='add'>+	if (state-&gt;config-&gt;set_ts_params)</div><div class='add'>+		state-&gt;config-&gt;set_ts_params(fe, 0);</div><div class='ctx'> </div><div class='ctx'> 	// set the inversion</div><div class='ctx'> 	if (p-&gt;inversion == INVERSION_OFF) invval = 0;</div><div class='head'>diff --git a/drivers/media/dvb/frontends/stv0299.h b/drivers/media/dvb/frontends/stv0299.h<br/>index 3282f43022f5..0fd96e22b650 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/frontends/stv0299.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/dvb/frontends/stv0299.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/frontends/stv0299.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/stv0299.h</a></div><div class='hunk'>@@ -89,15 +89,18 @@ struct stv0299_config</div><div class='ctx'> 	int min_delay_ms;</div><div class='ctx'> </div><div class='ctx'> 	/* Set the symbol rate */</div><div class='del'>-	int (*set_symbol_rate)(struct dvb_frontend* fe, u32 srate, u32 ratio);</div><div class='add'>+	int (*set_symbol_rate)(struct dvb_frontend *fe, u32 srate, u32 ratio);</div><div class='add'>+</div><div class='add'>+	/* Set device param to start dma */</div><div class='add'>+	int (*set_ts_params)(struct dvb_frontend *fe, int is_punctured);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_DVB_STV0299) || (defined(CONFIG_DVB_STV0299_MODULE) &amp;&amp; defined(MODULE))</div><div class='del'>-extern struct dvb_frontend* stv0299_attach(const struct stv0299_config* config,</div><div class='del'>-					   struct i2c_adapter* i2c);</div><div class='add'>+extern struct dvb_frontend *stv0299_attach(const struct stv0299_config *config,</div><div class='add'>+					   struct i2c_adapter *i2c);</div><div class='ctx'> #else</div><div class='del'>-static inline struct dvb_frontend* stv0299_attach(const struct stv0299_config* config,</div><div class='del'>-					   struct i2c_adapter* i2c)</div><div class='add'>+static inline struct dvb_frontend *stv0299_attach(const struct stv0299_config *config,</div><div class='add'>+					   struct i2c_adapter *i2c)</div><div class='ctx'> {</div><div class='ctx'> 	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);</div><div class='ctx'> 	return NULL;</div><div class='head'>diff --git a/drivers/media/dvb/frontends/tda10048.c b/drivers/media/dvb/frontends/tda10048.c<br/>index 04e7f1cc1403..2a8bbcd44cd0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/frontends/tda10048.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/dvb/frontends/tda10048.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/frontends/tda10048.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/tda10048.c</a></div><div class='hunk'>@@ -195,7 +195,7 @@ static struct init_tab {</div><div class='ctx'> static int tda10048_writereg(struct tda10048_state *state, u8 reg, u8 data)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	u8 buf [] = { reg, data };</div><div class='add'>+	u8 buf[] = { reg, data };</div><div class='ctx'> 	struct i2c_msg msg = {</div><div class='ctx'> 		.addr = state-&gt;config-&gt;demod_address,</div><div class='ctx'> 		.flags = 0, .buf = buf, .len = 2 };</div><div class='hunk'>@@ -213,9 +213,9 @@ static int tda10048_writereg(struct tda10048_state *state, u8 reg, u8 data)</div><div class='ctx'> static u8 tda10048_readreg(struct tda10048_state *state, u8 reg)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	u8 b0 [] = { reg };</div><div class='del'>-	u8 b1 [] = { 0 };</div><div class='del'>-	struct i2c_msg msg [] = {</div><div class='add'>+	u8 b0[] = { reg };</div><div class='add'>+	u8 b1[] = { 0 };</div><div class='add'>+	struct i2c_msg msg[] = {</div><div class='ctx'> 		{ .addr = state-&gt;config-&gt;demod_address,</div><div class='ctx'> 			.flags = 0, .buf = b0, .len = 1 },</div><div class='ctx'> 		{ .addr = state-&gt;config-&gt;demod_address,</div><div class='hunk'>@@ -393,43 +393,89 @@ static int tda10048_get_tps(struct tda10048_state *state,</div><div class='ctx'> </div><div class='ctx'> 	val = tda10048_readreg(state, TDA10048_OUT_CONF2);</div><div class='ctx'> 	switch ((val &amp; 0x60) &gt;&gt; 5) {</div><div class='del'>-	case 0: p-&gt;constellation =   QPSK; break;</div><div class='del'>-	case 1: p-&gt;constellation = QAM_16; break;</div><div class='del'>-	case 2: p-&gt;constellation = QAM_64; break;</div><div class='add'>+	case 0:</div><div class='add'>+		p-&gt;constellation = QPSK;</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		p-&gt;constellation = QAM_16;</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		p-&gt;constellation = QAM_64;</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	switch ((val &amp; 0x18) &gt;&gt; 3) {</div><div class='del'>-	case 0: p-&gt;hierarchy_information = HIERARCHY_NONE; break;</div><div class='del'>-	case 1: p-&gt;hierarchy_information =    HIERARCHY_1; break;</div><div class='del'>-	case 2: p-&gt;hierarchy_information =    HIERARCHY_2; break;</div><div class='del'>-	case 3: p-&gt;hierarchy_information =    HIERARCHY_4; break;</div><div class='add'>+	case 0:</div><div class='add'>+		p-&gt;hierarchy_information = HIERARCHY_NONE;</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		p-&gt;hierarchy_information = HIERARCHY_1;</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		p-&gt;hierarchy_information = HIERARCHY_2;</div><div class='add'>+		break;</div><div class='add'>+	case 3:</div><div class='add'>+		p-&gt;hierarchy_information = HIERARCHY_4;</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	switch (val &amp; 0x07) {</div><div class='del'>-	case 0: p-&gt;code_rate_HP = FEC_1_2; break;</div><div class='del'>-	case 1: p-&gt;code_rate_HP = FEC_2_3; break;</div><div class='del'>-	case 2: p-&gt;code_rate_HP = FEC_3_4; break;</div><div class='del'>-	case 3: p-&gt;code_rate_HP = FEC_5_6; break;</div><div class='del'>-	case 4: p-&gt;code_rate_HP = FEC_7_8; break;</div><div class='add'>+	case 0:</div><div class='add'>+		p-&gt;code_rate_HP = FEC_1_2;</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		p-&gt;code_rate_HP = FEC_2_3;</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		p-&gt;code_rate_HP = FEC_3_4;</div><div class='add'>+		break;</div><div class='add'>+	case 3:</div><div class='add'>+		p-&gt;code_rate_HP = FEC_5_6;</div><div class='add'>+		break;</div><div class='add'>+	case 4:</div><div class='add'>+		p-&gt;code_rate_HP = FEC_7_8;</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	val = tda10048_readreg(state, TDA10048_OUT_CONF3);</div><div class='ctx'> 	switch (val &amp; 0x07) {</div><div class='del'>-	case 0: p-&gt;code_rate_LP = FEC_1_2; break;</div><div class='del'>-	case 1: p-&gt;code_rate_LP = FEC_2_3; break;</div><div class='del'>-	case 2: p-&gt;code_rate_LP = FEC_3_4; break;</div><div class='del'>-	case 3: p-&gt;code_rate_LP = FEC_5_6; break;</div><div class='del'>-	case 4: p-&gt;code_rate_LP = FEC_7_8; break;</div><div class='add'>+	case 0:</div><div class='add'>+		p-&gt;code_rate_LP = FEC_1_2;</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		p-&gt;code_rate_LP = FEC_2_3;</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		p-&gt;code_rate_LP = FEC_3_4;</div><div class='add'>+		break;</div><div class='add'>+	case 3:</div><div class='add'>+		p-&gt;code_rate_LP = FEC_5_6;</div><div class='add'>+		break;</div><div class='add'>+	case 4:</div><div class='add'>+		p-&gt;code_rate_LP = FEC_7_8;</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	val = tda10048_readreg(state, TDA10048_OUT_CONF1);</div><div class='ctx'> 	switch ((val &amp; 0x0c) &gt;&gt; 2) {</div><div class='del'>-	case 0: p-&gt;guard_interval = GUARD_INTERVAL_1_32; break;</div><div class='del'>-	case 1: p-&gt;guard_interval = GUARD_INTERVAL_1_16; break;</div><div class='del'>-	case 2: p-&gt;guard_interval =  GUARD_INTERVAL_1_8; break;</div><div class='del'>-	case 3: p-&gt;guard_interval =  GUARD_INTERVAL_1_4; break;</div><div class='add'>+	case 0:</div><div class='add'>+		p-&gt;guard_interval = GUARD_INTERVAL_1_32;</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		p-&gt;guard_interval = GUARD_INTERVAL_1_16;</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		p-&gt;guard_interval =  GUARD_INTERVAL_1_8;</div><div class='add'>+		break;</div><div class='add'>+	case 3:</div><div class='add'>+		p-&gt;guard_interval =  GUARD_INTERVAL_1_4;</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	switch (val &amp; 0x02) {</div><div class='del'>-	case 0: p-&gt;transmission_mode = TRANSMISSION_MODE_2K; break;</div><div class='del'>-	case 1: p-&gt;transmission_mode = TRANSMISSION_MODE_8K; break;</div><div class='add'>+	case 0:</div><div class='add'>+		p-&gt;transmission_mode = TRANSMISSION_MODE_2K;</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		p-&gt;transmission_mode = TRANSMISSION_MODE_8K;</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/media/dvb/frontends/tdhd1.h b/drivers/media/dvb/frontends/tdhd1.h<br/>new file mode 100644<br/>index 000000000000..51f170678650<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/frontends/tdhd1.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/tdhd1.h</a></div><div class='hunk'>@@ -0,0 +1,73 @@</div><div class='add'>+/*</div><div class='add'>+ * tdhd1.h - ALPS TDHD1-204A tuner support</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2008 Oliver Endriss &lt;o.endriss@gmx.de&gt;</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public License</div><div class='add'>+ * as published by the Free Software Foundation; either version 2</div><div class='add'>+ * of the License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='add'>+ * Or, point your browser to http://www.gnu.org/copyleft/gpl.html</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * The project's page is at http://www.linuxtv.org</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef TDHD1_H</div><div class='add'>+#define TDHD1_H</div><div class='add'>+</div><div class='add'>+#include "tda1004x.h"</div><div class='add'>+</div><div class='add'>+static int alps_tdhd1_204_request_firmware(struct dvb_frontend *fe, const struct firmware **fw, char *name);</div><div class='add'>+</div><div class='add'>+static struct tda1004x_config alps_tdhd1_204a_config = {</div><div class='add'>+	.demod_address = 0x8,</div><div class='add'>+	.invert = 1,</div><div class='add'>+	.invert_oclk = 0,</div><div class='add'>+	.xtal_freq = TDA10046_XTAL_4M,</div><div class='add'>+	.agc_config = TDA10046_AGC_DEFAULT,</div><div class='add'>+	.if_freq = TDA10046_FREQ_3617,</div><div class='add'>+	.request_firmware = alps_tdhd1_204_request_firmware</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int alps_tdhd1_204a_tuner_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)</div><div class='add'>+{</div><div class='add'>+	struct i2c_adapter *i2c = fe-&gt;tuner_priv;</div><div class='add'>+	u8 data[4];</div><div class='add'>+	struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = data, .len = sizeof(data) };</div><div class='add'>+	u32 div;</div><div class='add'>+</div><div class='add'>+	div = (params-&gt;frequency + 36166666) / 166666;</div><div class='add'>+</div><div class='add'>+	data[0] = (div &gt;&gt; 8) &amp; 0x7f;</div><div class='add'>+	data[1] = div &amp; 0xff;</div><div class='add'>+	data[2] = 0x85;</div><div class='add'>+</div><div class='add'>+	if (params-&gt;frequency &gt;= 174000000 &amp;&amp; params-&gt;frequency &lt;= 230000000)</div><div class='add'>+		data[3] = 0x02;</div><div class='add'>+	else if (params-&gt;frequency &gt;= 470000000 &amp;&amp; params-&gt;frequency &lt;= 823000000)</div><div class='add'>+		data[3] = 0x0C;</div><div class='add'>+	else if (params-&gt;frequency &gt; 823000000 &amp;&amp; params-&gt;frequency &lt;= 862000000)</div><div class='add'>+		data[3] = 0x8C;</div><div class='add'>+	else</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='add'>+	if (i2c_transfer(i2c, &amp;msg, 1) != 1)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* TDHD1_H */</div><div class='head'>diff --git a/drivers/media/dvb/frontends/z0194a.h b/drivers/media/dvb/frontends/z0194a.h<br/>index d2876d2e1769..07f3fc0998f6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/frontends/z0194a.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/dvb/frontends/z0194a.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/frontends/z0194a.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/frontends/z0194a.h</a></div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> #ifndef Z0194A</div><div class='ctx'> #define Z0194A</div><div class='ctx'> </div><div class='del'>-static int sharp_z0194a__set_symbol_rate(struct dvb_frontend *fe,</div><div class='add'>+static int sharp_z0194a_set_symbol_rate(struct dvb_frontend *fe,</div><div class='ctx'> 					 u32 srate, u32 ratio)</div><div class='ctx'> {</div><div class='ctx'> 	u8 aclk = 0;</div><div class='hunk'>@@ -40,7 +40,7 @@ static int sharp_z0194a__set_symbol_rate(struct dvb_frontend *fe,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u8 sharp_z0194a__inittab[] = {</div><div class='add'>+static u8 sharp_z0194a_inittab[] = {</div><div class='ctx'> 	0x01, 0x15,</div><div class='ctx'> 	0x02, 0x00,</div><div class='ctx'> 	0x03, 0x00,</div><div class='hunk'>@@ -82,16 +82,4 @@ static u8 sharp_z0194a__inittab[] = {</div><div class='ctx'> 	0xff, 0xff</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct stv0299_config sharp_z0194a_config = {</div><div class='del'>-	.demod_address = 0x68,</div><div class='del'>-	.inittab = sharp_z0194a__inittab,</div><div class='del'>-	.mclk = 88000000UL,</div><div class='del'>-	.invert = 1,</div><div class='del'>-	.skip_reinit = 0,</div><div class='del'>-	.lock_output = STV0299_LOCKOUTPUT_1,</div><div class='del'>-	.volt13_op0_op1 = STV0299_VOLT13_OP1,</div><div class='del'>-	.min_delay_ms = 100,</div><div class='del'>-	.set_symbol_rate = sharp_z0194a__set_symbol_rate,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/media/dvb/siano/sms-cards.c b/drivers/media/dvb/siano/sms-cards.c<br/>index 9da260fe3fd1..6f9b77360440 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/siano/sms-cards.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/dvb/siano/sms-cards.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/siano/sms-cards.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/siano/sms-cards.c</a></div><div class='hunk'>@@ -42,6 +42,10 @@ struct usb_device_id smsusb_id_table[] = {</div><div class='ctx'> 		.driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },</div><div class='ctx'> 	{ USB_DEVICE(0x2040, 0x5510),</div><div class='ctx'> 		.driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },</div><div class='add'>+	{ USB_DEVICE(0x2040, 0x5520),</div><div class='add'>+		.driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },</div><div class='add'>+	{ USB_DEVICE(0x2040, 0x5530),</div><div class='add'>+		.driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },</div><div class='ctx'> 	{ USB_DEVICE(0x2040, 0x5580),</div><div class='ctx'> 		.driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },</div><div class='ctx'> 	{ USB_DEVICE(0x2040, 0x5590),</div><div class='head'>diff --git a/drivers/media/dvb/ttpci/Kconfig b/drivers/media/dvb/ttpci/Kconfig<br/>index 41b5a988b619..867027ceab3e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/ttpci/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/dvb/ttpci/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/ttpci/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/ttpci/Kconfig</a></div><div class='hunk'>@@ -86,6 +86,7 @@ config DVB_BUDGET</div><div class='ctx'> 	select DVB_TDA10086 if !DVB_FE_CUSTOMISE</div><div class='ctx'> 	select DVB_TDA826X if !DVB_FE_CUSTOMISE</div><div class='ctx'> 	select DVB_LNBP21 if !DVB_FE_CUSTOMISE</div><div class='add'>+	select DVB_TDA1004X if !DVB_FE_CUSTOMISE</div><div class='ctx'> 	help</div><div class='ctx'> 	  Support for simple SAA7146 based DVB cards (so called Budget-</div><div class='ctx'> 	  or Nova-PCI cards) without onboard MPEG2 decoder, and without</div><div class='head'>diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/dvb/ttpci/av7110.c<br/>index 0777e8f9544b..c7c770c28988 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/ttpci/av7110.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/dvb/ttpci/av7110.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/ttpci/av7110.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/ttpci/av7110.c</a></div><div class='hunk'>@@ -88,6 +88,7 @@ static int budgetpatch;</div><div class='ctx'> static int wss_cfg_4_3 = 0x4008;</div><div class='ctx'> static int wss_cfg_16_9 = 0x0007;</div><div class='ctx'> static int tv_standard;</div><div class='add'>+static int full_ts;</div><div class='ctx'> </div><div class='ctx'> module_param_named(debug, av7110_debug, int, 0644);</div><div class='ctx'> MODULE_PARM_DESC(debug, "debug level (bitmask, default 0)");</div><div class='hunk'>@@ -106,6 +107,8 @@ module_param(volume, int, 0444);</div><div class='ctx'> MODULE_PARM_DESC(volume, "initial volume: default 255 (range 0-255)");</div><div class='ctx'> module_param(budgetpatch, int, 0444);</div><div class='ctx'> MODULE_PARM_DESC(budgetpatch, "use budget-patch hardware modification: default 0 (0 no, 1 autodetect, 2 always)");</div><div class='add'>+module_param(full_ts, int, 0444);</div><div class='add'>+MODULE_PARM_DESC(full_ts, "enable code for full-ts hardware modification: 0 disable (default), 1 enable");</div><div class='ctx'> module_param(wss_cfg_4_3, int, 0444);</div><div class='ctx'> MODULE_PARM_DESC(wss_cfg_4_3, "WSS 4:3 - default 0x4008 - bit 15: disable, 14: burst mode, 13..0: wss data");</div><div class='ctx'> module_param(wss_cfg_16_9, int, 0444);</div><div class='hunk'>@@ -116,6 +119,8 @@ MODULE_PARM_DESC(tv_standard, "TV standard: 0 PAL (default), 1 NTSC");</div><div class='ctx'> DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);</div><div class='ctx'> </div><div class='ctx'> static void restart_feeds(struct av7110 *av7110);</div><div class='add'>+static int budget_start_feed(struct dvb_demux_feed *feed);</div><div class='add'>+static int budget_stop_feed(struct dvb_demux_feed *feed);</div><div class='ctx'> </div><div class='ctx'> static int av7110_num;</div><div class='ctx'> </div><div class='hunk'>@@ -376,9 +381,9 @@ static inline void start_debi_dma(struct av7110 *av7110, int dir,</div><div class='ctx'> 		irdebi(av7110, DEBISWAB, addr, 0, len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void debiirq(unsigned long data)</div><div class='add'>+static void debiirq(unsigned long cookie)</div><div class='ctx'> {</div><div class='del'>-	struct av7110 *av7110 = (struct av7110 *) data;</div><div class='add'>+	struct av7110 *av7110 = (struct av7110 *)cookie;</div><div class='ctx'> 	int type = av7110-&gt;debitype;</div><div class='ctx'> 	int handle = (type &gt;&gt; 8) &amp; 0x1f;</div><div class='ctx'> 	unsigned int xfer = 0;</div><div class='hunk'>@@ -487,9 +492,9 @@ debi_done:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* irq from av7110 firmware writing the mailbox register in the DPRAM */</div><div class='del'>-static void gpioirq(unsigned long data)</div><div class='add'>+static void gpioirq(unsigned long cookie)</div><div class='ctx'> {</div><div class='del'>-	struct av7110 *av7110 = (struct av7110 *) data;</div><div class='add'>+	struct av7110 *av7110 = (struct av7110 *)cookie;</div><div class='ctx'> 	u32 rxbuf, txbuf;</div><div class='ctx'> 	int len;</div><div class='ctx'> </div><div class='hunk'>@@ -806,6 +811,9 @@ static int StartHWFilter(struct dvb_demux_filter *dvbdmxfilter)</div><div class='ctx'> </div><div class='ctx'> 	dprintk(4, "%p\n", av7110);</div><div class='ctx'> </div><div class='add'>+	if (av7110-&gt;full_ts)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	if (dvbdmxfilter-&gt;type == DMX_TYPE_SEC) {</div><div class='ctx'> 		if (hw_sections) {</div><div class='ctx'> 			buf[4] = (dvbdmxfilter-&gt;filter.filter_value[0] &lt;&lt; 8) |</div><div class='hunk'>@@ -854,6 +862,9 @@ static int StopHWFilter(struct dvb_demux_filter *dvbdmxfilter)</div><div class='ctx'> </div><div class='ctx'> 	dprintk(4, "%p\n", av7110);</div><div class='ctx'> </div><div class='add'>+	if (av7110-&gt;full_ts)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	handle = dvbdmxfilter-&gt;hw_handle;</div><div class='ctx'> 	if (handle &gt;= 32) {</div><div class='ctx'> 		printk("%s tried to stop invalid filter %04x, filter type = %x\n",</div><div class='hunk'>@@ -913,7 +924,7 @@ static int dvb_feed_start_pid(struct dvb_demux_feed *dvbdmxfeed)</div><div class='ctx'> 				return ret;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-	if ((dvbdmxfeed-&gt;ts_type &amp; TS_PACKET)) {</div><div class='add'>+	if ((dvbdmxfeed-&gt;ts_type &amp; TS_PACKET) &amp;&amp; !av7110-&gt;full_ts) {</div><div class='ctx'> 		if (dvbdmxfeed-&gt;pes_type == 0 &amp;&amp; !(dvbdmx-&gt;pids[0] &amp; 0x8000))</div><div class='ctx'> 			ret = av7110_av_start_record(av7110, RP_AUDIO, dvbdmxfeed);</div><div class='ctx'> 		if (dvbdmxfeed-&gt;pes_type == 1 &amp;&amp; !(dvbdmx-&gt;pids[1] &amp; 0x8000))</div><div class='hunk'>@@ -974,7 +985,7 @@ static int av7110_start_feed(struct dvb_demux_feed *feed)</div><div class='ctx'> 	if (!demux-&gt;dmx.frontend)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (feed-&gt;pid &gt; 0x1fff)</div><div class='add'>+	if (!av7110-&gt;full_ts &amp;&amp; feed-&gt;pid &gt; 0x1fff)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (feed-&gt;type == DMX_TYPE_TS) {</div><div class='hunk'>@@ -1003,7 +1014,12 @@ static int av7110_start_feed(struct dvb_demux_feed *feed)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	else if (feed-&gt;type == DMX_TYPE_SEC) {</div><div class='add'>+	if (av7110-&gt;full_ts) {</div><div class='add'>+		budget_start_feed(feed);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (feed-&gt;type == DMX_TYPE_SEC) {</div><div class='ctx'> 		int i;</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; i &lt; demux-&gt;filternum; i++) {</div><div class='hunk'>@@ -1050,7 +1066,12 @@ static int av7110_stop_feed(struct dvb_demux_feed *feed)</div><div class='ctx'> 				ret = StopHWFilter(feed-&gt;filter);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!ret &amp;&amp; feed-&gt;type == DMX_TYPE_SEC) {</div><div class='add'>+	if (av7110-&gt;full_ts) {</div><div class='add'>+		budget_stop_feed(feed);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (feed-&gt;type == DMX_TYPE_SEC) {</div><div class='ctx'> 		for (i = 0; i&lt;demux-&gt;filternum; i++) {</div><div class='ctx'> 			if (demux-&gt;filter[i].state == DMX_STATE_GO &amp;&amp;</div><div class='ctx'> 			    demux-&gt;filter[i].filter.parent == &amp;feed-&gt;feed.sec) {</div><div class='hunk'>@@ -1074,6 +1095,7 @@ static void restart_feeds(struct av7110 *av7110)</div><div class='ctx'> 	struct dvb_demux *dvbdmx = &amp;av7110-&gt;demux;</div><div class='ctx'> 	struct dvb_demux_feed *feed;</div><div class='ctx'> 	int mode;</div><div class='add'>+	int feeding;</div><div class='ctx'> 	int i, j;</div><div class='ctx'> </div><div class='ctx'> 	dprintk(4, "%p\n", av7110);</div><div class='hunk'>@@ -1082,6 +1104,8 @@ static void restart_feeds(struct av7110 *av7110)</div><div class='ctx'> 	av7110-&gt;playing = 0;</div><div class='ctx'> 	av7110-&gt;rec_mode = 0;</div><div class='ctx'> </div><div class='add'>+	feeding = av7110-&gt;feeding1; /* full_ts mod */</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; dvbdmx-&gt;feednum; i++) {</div><div class='ctx'> 		feed = &amp;dvbdmx-&gt;feed[i];</div><div class='ctx'> 		if (feed-&gt;state == DMX_STATE_GO) {</div><div class='hunk'>@@ -1099,6 +1123,8 @@ static void restart_feeds(struct av7110 *av7110)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	av7110-&gt;feeding1 = feeding; /* full_ts mod */</div><div class='add'>+</div><div class='ctx'> 	if (mode)</div><div class='ctx'> 		av7110_av_start_play(av7110, mode);</div><div class='ctx'> }</div><div class='hunk'>@@ -1197,8 +1223,9 @@ static int start_ts_capture(struct av7110 *budget)</div><div class='ctx'> </div><div class='ctx'> 	if (budget-&gt;feeding1)</div><div class='ctx'> 		return ++budget-&gt;feeding1;</div><div class='del'>-	memset(budget-&gt;grabbing, 0x00, TS_HEIGHT * TS_WIDTH);</div><div class='add'>+	memset(budget-&gt;grabbing, 0x00, TS_BUFLEN);</div><div class='ctx'> 	budget-&gt;ttbp = 0;</div><div class='add'>+	SAA7146_ISR_CLEAR(budget-&gt;dev, MASK_10);  /* VPE */</div><div class='ctx'> 	SAA7146_IER_ENABLE(budget-&gt;dev, MASK_10); /* VPE */</div><div class='ctx'> 	saa7146_write(budget-&gt;dev, MC1, (MASK_04 | MASK_20)); /* DMA3 on */</div><div class='ctx'> 	return ++budget-&gt;feeding1;</div><div class='hunk'>@@ -1233,18 +1260,14 @@ static int budget_stop_feed(struct dvb_demux_feed *feed)</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void vpeirq(unsigned long data)</div><div class='add'>+static void vpeirq(unsigned long cookie)</div><div class='ctx'> {</div><div class='del'>-	struct av7110 *budget = (struct av7110 *) data;</div><div class='add'>+	struct av7110 *budget = (struct av7110 *)cookie;</div><div class='ctx'> 	u8 *mem = (u8 *) (budget-&gt;grabbing);</div><div class='ctx'> 	u32 olddma = budget-&gt;ttbp;</div><div class='ctx'> 	u32 newdma = saa7146_read(budget-&gt;dev, PCI_VDP3);</div><div class='add'>+	struct dvb_demux *demux = budget-&gt;full_ts ? &amp;budget-&gt;demux : &amp;budget-&gt;demux1;</div><div class='ctx'> </div><div class='del'>-	if (!budgetpatch) {</div><div class='del'>-		printk("av7110.c: vpeirq() called while budgetpatch disabled!"</div><div class='del'>-		       " check saa7146 IER register\n");</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='ctx'> 	/* nearest lower position divisible by 188 */</div><div class='ctx'> 	newdma -= newdma % 188;</div><div class='ctx'> </div><div class='hunk'>@@ -1268,11 +1291,11 @@ static void vpeirq(unsigned long data)</div><div class='ctx'> </div><div class='ctx'> 	if (newdma &gt; olddma)</div><div class='ctx'> 		/* no wraparound, dump olddma..newdma */</div><div class='del'>-		dvb_dmx_swfilter_packets(&amp;budget-&gt;demux1, mem + olddma, (newdma - olddma) / 188);</div><div class='add'>+		dvb_dmx_swfilter_packets(demux, mem + olddma, (newdma - olddma) / 188);</div><div class='ctx'> 	else {</div><div class='ctx'> 		/* wraparound, dump olddma..buflen and 0..newdma */</div><div class='del'>-		dvb_dmx_swfilter_packets(&amp;budget-&gt;demux1, mem + olddma, (TS_BUFLEN - olddma) / 188);</div><div class='del'>-		dvb_dmx_swfilter_packets(&amp;budget-&gt;demux1, mem, newdma / 188);</div><div class='add'>+		dvb_dmx_swfilter_packets(demux, mem + olddma, (TS_BUFLEN - olddma) / 188);</div><div class='add'>+		dvb_dmx_swfilter_packets(demux, mem, newdma / 188);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1294,8 +1317,8 @@ static int av7110_register(struct av7110 *av7110)</div><div class='ctx'> 	for (i = 0; i &lt; 32; i++)</div><div class='ctx'> 		av7110-&gt;handle2filter[i] = NULL;</div><div class='ctx'> </div><div class='del'>-	dvbdemux-&gt;filternum = 32;</div><div class='del'>-	dvbdemux-&gt;feednum = 32;</div><div class='add'>+	dvbdemux-&gt;filternum = (av7110-&gt;full_ts) ? 256 : 32;</div><div class='add'>+	dvbdemux-&gt;feednum = (av7110-&gt;full_ts) ? 256 : 32;</div><div class='ctx'> 	dvbdemux-&gt;start_feed = av7110_start_feed;</div><div class='ctx'> 	dvbdemux-&gt;stop_feed = av7110_stop_feed;</div><div class='ctx'> 	dvbdemux-&gt;write_to_decoder = av7110_write_to_decoder;</div><div class='hunk'>@@ -1305,7 +1328,7 @@ static int av7110_register(struct av7110 *av7110)</div><div class='ctx'> 	dvb_dmx_init(&amp;av7110-&gt;demux);</div><div class='ctx'> 	av7110-&gt;demux.dmx.get_stc = dvb_get_stc;</div><div class='ctx'> </div><div class='del'>-	av7110-&gt;dmxdev.filternum = 32;</div><div class='add'>+	av7110-&gt;dmxdev.filternum = (av7110-&gt;full_ts) ? 256 : 32;</div><div class='ctx'> 	av7110-&gt;dmxdev.demux = &amp;dvbdemux-&gt;dmx;</div><div class='ctx'> 	av7110-&gt;dmxdev.capabilities = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1422,7 +1445,6 @@ int i2c_writereg(struct av7110 *av7110, u8 id, u8 reg, u8 val)</div><div class='ctx'> 	return i2c_transfer(&amp;av7110-&gt;i2c_adap, &amp;msgs, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#if 0</div><div class='ctx'> u8 i2c_readreg(struct av7110 *av7110, u8 id, u8 reg)</div><div class='ctx'> {</div><div class='ctx'> 	u8 mm1[] = {0x00};</div><div class='hunk'>@@ -1439,7 +1461,6 @@ u8 i2c_readreg(struct av7110 *av7110, u8 id, u8 reg)</div><div class='ctx'> </div><div class='ctx'> 	return mm2[0];</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> /****************************************************************************</div><div class='ctx'>  * INITIALIZATION</div><div class='hunk'>@@ -2256,7 +2277,7 @@ static int frontend_init(struct av7110 *av7110)</div><div class='ctx'> 	if (!av7110-&gt;fe) {</div><div class='ctx'> 		/* FIXME: propagate the failure code from the lower layers */</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='del'>-		printk("dvb-ttpci: A frontend driver was not found for device %04x/%04x subsystem %04x/%04x\n",</div><div class='add'>+		printk("dvb-ttpci: A frontend driver was not found for device [%04x:%04x] subsystem [%04x:%04x]\n",</div><div class='ctx'> 		       av7110-&gt;dev-&gt;pci-&gt;vendor,</div><div class='ctx'> 		       av7110-&gt;dev-&gt;pci-&gt;device,</div><div class='ctx'> 		       av7110-&gt;dev-&gt;pci-&gt;subsystem_vendor,</div><div class='hunk'>@@ -2484,7 +2505,47 @@ static int __devinit av7110_attach(struct saa7146_dev* dev,</div><div class='ctx'> 			       av7110-&gt;dvb_adapter.proposed_mac);</div><div class='ctx'> 	ret = -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	if (budgetpatch) {</div><div class='add'>+	/* full-ts mod? */</div><div class='add'>+	if (full_ts)</div><div class='add'>+		av7110-&gt;full_ts = true;</div><div class='add'>+</div><div class='add'>+	/* check for full-ts flag in eeprom */</div><div class='add'>+	if (i2c_readreg(av7110, 0xaa, 0) == 0x4f &amp;&amp; i2c_readreg(av7110, 0xaa, 1) == 0x45) {</div><div class='add'>+		u8 flags = i2c_readreg(av7110, 0xaa, 2);</div><div class='add'>+		if (flags != 0xff &amp;&amp; (flags &amp; 0x01))</div><div class='add'>+			av7110-&gt;full_ts = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (av7110-&gt;full_ts) {</div><div class='add'>+		printk(KERN_INFO "dvb-ttpci: full-ts mode enabled for saa7146 port B\n");</div><div class='add'>+		spin_lock_init(&amp;av7110-&gt;feedlock1);</div><div class='add'>+		av7110-&gt;grabbing = saa7146_vmalloc_build_pgtable(pdev, length,</div><div class='add'>+								 &amp;av7110-&gt;pt);</div><div class='add'>+		if (!av7110-&gt;grabbing)</div><div class='add'>+			goto err_i2c_del_3;</div><div class='add'>+</div><div class='add'>+		saa7146_write(dev, DD1_STREAM_B, 0x00000000);</div><div class='add'>+		saa7146_write(dev, MC2, (MASK_10 | MASK_26));</div><div class='add'>+</div><div class='add'>+		saa7146_write(dev, DD1_INIT, 0x00000600);</div><div class='add'>+		saa7146_write(dev, MC2, (MASK_09 | MASK_25 | MASK_10 | MASK_26));</div><div class='add'>+</div><div class='add'>+		saa7146_write(dev, BRS_CTRL, 0x60000000);</div><div class='add'>+		saa7146_write(dev, MC2, MASK_08 | MASK_24);</div><div class='add'>+</div><div class='add'>+		/* dma3 */</div><div class='add'>+		saa7146_write(dev, PCI_BT_V1, 0x001c0000 | (saa7146_read(dev, PCI_BT_V1) &amp; ~0x001f0000));</div><div class='add'>+		saa7146_write(dev, BASE_ODD3, 0);</div><div class='add'>+		saa7146_write(dev, BASE_EVEN3, 0);</div><div class='add'>+		saa7146_write(dev, PROT_ADDR3, TS_WIDTH * TS_HEIGHT);</div><div class='add'>+		saa7146_write(dev, PITCH3, TS_WIDTH);</div><div class='add'>+		saa7146_write(dev, BASE_PAGE3, av7110-&gt;pt.dma | ME1 | 0x90);</div><div class='add'>+		saa7146_write(dev, NUM_LINE_BYTE3, (TS_HEIGHT &lt;&lt; 16) | TS_WIDTH);</div><div class='add'>+		saa7146_write(dev, MC2, MASK_04 | MASK_20);</div><div class='add'>+</div><div class='add'>+		tasklet_init(&amp;av7110-&gt;vpe_tasklet, vpeirq, (unsigned long) av7110);</div><div class='add'>+</div><div class='add'>+	} else if (budgetpatch) {</div><div class='ctx'> 		spin_lock_init(&amp;av7110-&gt;feedlock1);</div><div class='ctx'> 		av7110-&gt;grabbing = saa7146_vmalloc_build_pgtable(pdev, length,</div><div class='ctx'> 								 &amp;av7110-&gt;pt);</div><div class='hunk'>@@ -2710,11 +2771,13 @@ static int __devexit av7110_detach(struct saa7146_dev* saa)</div><div class='ctx'> #if defined(CONFIG_INPUT_EVDEV) || defined(CONFIG_INPUT_EVDEV_MODULE)</div><div class='ctx'> 	av7110_ir_exit(av7110);</div><div class='ctx'> #endif</div><div class='del'>-	if (budgetpatch) {</div><div class='del'>-		/* Disable RPS1 */</div><div class='del'>-		saa7146_write(saa, MC1, MASK_29);</div><div class='del'>-		/* VSYNC LOW (inactive) */</div><div class='del'>-		saa7146_setgpio(saa, 3, SAA7146_GPIO_OUTLO);</div><div class='add'>+	if (budgetpatch || av7110-&gt;full_ts) {</div><div class='add'>+		if (budgetpatch) {</div><div class='add'>+			/* Disable RPS1 */</div><div class='add'>+			saa7146_write(saa, MC1, MASK_29);</div><div class='add'>+			/* VSYNC LOW (inactive) */</div><div class='add'>+			saa7146_setgpio(saa, 3, SAA7146_GPIO_OUTLO);</div><div class='add'>+		}</div><div class='ctx'> 		saa7146_write(saa, MC1, MASK_20);	/* DMA3 off */</div><div class='ctx'> 		SAA7146_IER_DISABLE(saa, MASK_10);</div><div class='ctx'> 		SAA7146_ISR_CLEAR(saa, MASK_10);</div><div class='hunk'>@@ -2794,7 +2857,7 @@ static void av7110_irq(struct saa7146_dev* dev, u32 *isr)</div><div class='ctx'> 		tasklet_schedule(&amp;av7110-&gt;gpio_tasklet);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((*isr &amp; MASK_10) &amp;&amp; budgetpatch)</div><div class='add'>+	if (*isr &amp; MASK_10)</div><div class='ctx'> 		tasklet_schedule(&amp;av7110-&gt;vpe_tasklet);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/dvb/ttpci/av7110.h b/drivers/media/dvb/ttpci/av7110.h<br/>index 55f23ddcb994..d85b8512ac30 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/ttpci/av7110.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/dvb/ttpci/av7110.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/ttpci/av7110.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/ttpci/av7110.h</a></div><div class='hunk'>@@ -192,6 +192,7 @@ struct av7110 {</div><div class='ctx'> 	unsigned char           *grabbing;</div><div class='ctx'> 	struct saa7146_pgtable  pt;</div><div class='ctx'> 	struct tasklet_struct   vpe_tasklet;</div><div class='add'>+	bool			full_ts;</div><div class='ctx'> </div><div class='ctx'> 	int			fe_synced;</div><div class='ctx'> 	struct mutex		pid_mutex;</div><div class='head'>diff --git a/drivers/media/dvb/ttpci/av7110_av.c b/drivers/media/dvb/ttpci/av7110_av.c<br/>index 184647ad1c7c..bdc62acf2099 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/ttpci/av7110_av.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/dvb/ttpci/av7110_av.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/ttpci/av7110_av.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/ttpci/av7110_av.c</a></div><div class='hunk'>@@ -788,6 +788,9 @@ int av7110_write_to_decoder(struct dvb_demux_feed *feed, const u8 *buf, size_t l</div><div class='ctx'> </div><div class='ctx'> 	dprintk(2, "av7110:%p, \n", av7110);</div><div class='ctx'> </div><div class='add'>+	if (av7110-&gt;full_ts &amp;&amp; demux-&gt;dmx.frontend-&gt;source != DMX_MEMORY_FE)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	switch (feed-&gt;pes_type) {</div><div class='ctx'> 	case 0:</div><div class='ctx'> 		if (av7110-&gt;audiostate.stream_source == AUDIO_SOURCE_MEMORY)</div><div class='head'>diff --git a/drivers/media/dvb/ttpci/budget-av.c b/drivers/media/dvb/ttpci/budget-av.c<br/>index b7d1f2f18d3a..1032ea77837e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/ttpci/budget-av.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/dvb/ttpci/budget-av.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/ttpci/budget-av.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/ttpci/budget-av.c</a></div><div class='hunk'>@@ -57,6 +57,8 @@</div><div class='ctx'> #define SLOTSTATUS_READY        8</div><div class='ctx'> #define SLOTSTATUS_OCCUPIED     (SLOTSTATUS_PRESENT|SLOTSTATUS_RESET|SLOTSTATUS_READY)</div><div class='ctx'> </div><div class='add'>+DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);</div><div class='add'>+</div><div class='ctx'> struct budget_av {</div><div class='ctx'> 	struct budget budget;</div><div class='ctx'> 	struct video_device *vd;</div><div class='hunk'>@@ -1049,7 +1051,7 @@ static void frontend_init(struct budget_av *budget_av)</div><div class='ctx'> </div><div class='ctx'> 	if (fe == NULL) {</div><div class='ctx'> 		printk(KERN_ERR "budget-av: A frontend driver was not found "</div><div class='del'>-				"for device %04x/%04x subsystem %04x/%04x\n",</div><div class='add'>+				"for device [%04x:%04x] subsystem [%04x:%04x]\n",</div><div class='ctx'> 		       saa-&gt;pci-&gt;vendor,</div><div class='ctx'> 		       saa-&gt;pci-&gt;device,</div><div class='ctx'> 		       saa-&gt;pci-&gt;subsystem_vendor,</div><div class='hunk'>@@ -1127,7 +1129,9 @@ static int budget_av_attach(struct saa7146_dev *dev, struct saa7146_pci_extensio</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;ext_priv = budget_av;</div><div class='ctx'> </div><div class='del'>-	if ((err = ttpci_budget_init(&amp;budget_av-&gt;budget, dev, info, THIS_MODULE))) {</div><div class='add'>+	err = ttpci_budget_init(&amp;budget_av-&gt;budget, dev, info, THIS_MODULE,</div><div class='add'>+				adapter_nr);</div><div class='add'>+	if (err) {</div><div class='ctx'> 		kfree(budget_av);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/media/dvb/ttpci/budget-ci.c b/drivers/media/dvb/ttpci/budget-ci.c<br/>index 060e7c785326..0a5aad45435d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/ttpci/budget-ci.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/dvb/ttpci/budget-ci.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/ttpci/budget-ci.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/ttpci/budget-ci.c</a></div><div class='hunk'>@@ -92,6 +92,8 @@ static int ir_debug;</div><div class='ctx'> module_param(ir_debug, int, 0644);</div><div class='ctx'> MODULE_PARM_DESC(ir_debug, "enable debugging information for IR decoding");</div><div class='ctx'> </div><div class='add'>+DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);</div><div class='add'>+</div><div class='ctx'> struct budget_ci_ir {</div><div class='ctx'> 	struct input_dev *dev;</div><div class='ctx'> 	struct tasklet_struct msp430_irq_tasklet;</div><div class='hunk'>@@ -1153,7 +1155,7 @@ static void frontend_init(struct budget_ci *budget_ci)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (budget_ci-&gt;budget.dvb_frontend == NULL) {</div><div class='del'>-		printk("budget-ci: A frontend driver was not found for device %04x/%04x subsystem %04x/%04x\n",</div><div class='add'>+		printk("budget-ci: A frontend driver was not found for device [%04x:%04x] subsystem [%04x:%04x]\n",</div><div class='ctx'> 		       budget_ci-&gt;budget.dev-&gt;pci-&gt;vendor,</div><div class='ctx'> 		       budget_ci-&gt;budget.dev-&gt;pci-&gt;device,</div><div class='ctx'> 		       budget_ci-&gt;budget.dev-&gt;pci-&gt;subsystem_vendor,</div><div class='hunk'>@@ -1183,7 +1185,8 @@ static int budget_ci_attach(struct saa7146_dev *dev, struct saa7146_pci_extensio</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;ext_priv = budget_ci;</div><div class='ctx'> </div><div class='del'>-	err = ttpci_budget_init(&amp;budget_ci-&gt;budget, dev, info, THIS_MODULE);</div><div class='add'>+	err = ttpci_budget_init(&amp;budget_ci-&gt;budget, dev, info, THIS_MODULE,</div><div class='add'>+				adapter_nr);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out2;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/dvb/ttpci/budget-core.c b/drivers/media/dvb/ttpci/budget-core.c<br/>index 6f4ddb643fee..ba18e56d5f11 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/ttpci/budget-core.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/dvb/ttpci/budget-core.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/ttpci/budget-core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/ttpci/budget-core.c</a></div><div class='hunk'>@@ -57,8 +57,6 @@ module_param_named(bufsize, dma_buffer_size, int, 0444);</div><div class='ctx'> MODULE_PARM_DESC(debug, "Turn on/off budget debugging (default:off).");</div><div class='ctx'> MODULE_PARM_DESC(bufsize, "DMA buffer size in KB, default: 188, min: 188, max: 1410 (Activy: 564)");</div><div class='ctx'> </div><div class='del'>-DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);</div><div class='del'>-</div><div class='ctx'> /****************************************************************************</div><div class='ctx'>  * TT budget / WinTV Nova</div><div class='ctx'>  ****************************************************************************/</div><div class='hunk'>@@ -411,7 +409,7 @@ static void budget_unregister(struct budget *budget)</div><div class='ctx'> </div><div class='ctx'> int ttpci_budget_init(struct budget *budget, struct saa7146_dev *dev,</div><div class='ctx'> 		      struct saa7146_pci_extension_data *info,</div><div class='del'>-		      struct module *owner)</div><div class='add'>+		      struct module *owner, short *adapter_nums)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	struct budget_info *bi = info-&gt;ext_priv;</div><div class='hunk'>@@ -474,7 +472,7 @@ int ttpci_budget_init(struct budget *budget, struct saa7146_dev *dev,</div><div class='ctx'> 	printk("%s: dma buffer size %u\n", budget-&gt;dev-&gt;name, budget-&gt;buffer_size);</div><div class='ctx'> </div><div class='ctx'> 	ret = dvb_register_adapter(&amp;budget-&gt;dvb_adapter, budget-&gt;card-&gt;name,</div><div class='del'>-				   owner, &amp;budget-&gt;dev-&gt;pci-&gt;dev, adapter_nr);</div><div class='add'>+				   owner, &amp;budget-&gt;dev-&gt;pci-&gt;dev, adapter_nums);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/dvb/ttpci/budget-patch.c b/drivers/media/dvb/ttpci/budget-patch.c<br/>index aa5ed4ef19f2..60136688a9a4 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/ttpci/budget-patch.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/dvb/ttpci/budget-patch.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/ttpci/budget-patch.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/ttpci/budget-patch.c</a></div><div class='hunk'>@@ -39,6 +39,8 @@</div><div class='ctx'> </div><div class='ctx'> #include "bsru6.h"</div><div class='ctx'> </div><div class='add'>+DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);</div><div class='add'>+</div><div class='ctx'> #define budget_patch budget</div><div class='ctx'> </div><div class='ctx'> static struct saa7146_extension budget_extension;</div><div class='hunk'>@@ -360,7 +362,7 @@ static void frontend_init(struct budget_patch* budget)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (budget-&gt;dvb_frontend == NULL) {</div><div class='del'>-		printk("dvb-ttpci: A frontend driver was not found for device %04x/%04x subsystem %04x/%04x\n",</div><div class='add'>+		printk("dvb-ttpci: A frontend driver was not found for device [%04x:%04x] subsystem [%04x:%04x]\n",</div><div class='ctx'> 		       budget-&gt;dev-&gt;pci-&gt;vendor,</div><div class='ctx'> 		       budget-&gt;dev-&gt;pci-&gt;device,</div><div class='ctx'> 		       budget-&gt;dev-&gt;pci-&gt;subsystem_vendor,</div><div class='hunk'>@@ -592,8 +594,9 @@ static int budget_patch_attach (struct saa7146_dev* dev, struct saa7146_pci_exte</div><div class='ctx'> </div><div class='ctx'> 	dprintk(2, "budget: %p\n", budget);</div><div class='ctx'> </div><div class='del'>-	if ((err = ttpci_budget_init (budget, dev, info, THIS_MODULE))) {</div><div class='del'>-		kfree (budget);</div><div class='add'>+	err = ttpci_budget_init(budget, dev, info, THIS_MODULE, adapter_nr);</div><div class='add'>+	if (err) {</div><div class='add'>+		kfree(budget);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/dvb/ttpci/budget.c b/drivers/media/dvb/ttpci/budget.c<br/>index f0068996ac07..1638e1d9f538 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/ttpci/budget.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/dvb/ttpci/budget.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/ttpci/budget.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/ttpci/budget.c</a></div><div class='hunk'>@@ -46,11 +46,14 @@</div><div class='ctx'> #include "lnbp21.h"</div><div class='ctx'> #include "bsru6.h"</div><div class='ctx'> #include "bsbe1.h"</div><div class='add'>+#include "tdhd1.h"</div><div class='ctx'> </div><div class='ctx'> static int diseqc_method;</div><div class='ctx'> module_param(diseqc_method, int, 0444);</div><div class='ctx'> MODULE_PARM_DESC(diseqc_method, "Select DiSEqC method for subsystem id 13c2:1003, 0: default, 1: more reliable (for newer revisions only)");</div><div class='ctx'> </div><div class='add'>+DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);</div><div class='add'>+</div><div class='ctx'> static void Set22K (struct budget *budget, int state)</div><div class='ctx'> {</div><div class='ctx'> 	struct saa7146_dev *dev=budget-&gt;dev;</div><div class='hunk'>@@ -390,6 +393,13 @@ static struct stv0299_config alps_bsbe1_config_activy = {</div><div class='ctx'> 	.set_symbol_rate = alps_bsbe1_set_symbol_rate,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static int alps_tdhd1_204_request_firmware(struct dvb_frontend *fe, const struct firmware **fw, char *name)</div><div class='add'>+{</div><div class='add'>+	struct budget *budget = (struct budget *)fe-&gt;dvb-&gt;priv;</div><div class='add'>+</div><div class='add'>+	return request_firmware(fw, name, &amp;budget-&gt;dev-&gt;pci-&gt;dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> static int i2c_readreg(struct i2c_adapter *i2c, u8 adr, u8 reg)</div><div class='ctx'> {</div><div class='hunk'>@@ -511,6 +521,14 @@ static void frontend_init(struct budget *budget)</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='add'>+	case 0x5f60: /* Fujitsu Siemens Activy Budget-T PCI rev AL (tda10046/ALPS TDHD1-204A) */</div><div class='add'>+		budget-&gt;dvb_frontend = dvb_attach(tda10046_attach, &amp;alps_tdhd1_204a_config, &amp;budget-&gt;i2c_adap);</div><div class='add'>+		if (budget-&gt;dvb_frontend) {</div><div class='add'>+			budget-&gt;dvb_frontend-&gt;ops.tuner_ops.set_params = alps_tdhd1_204a_tuner_set_params;</div><div class='add'>+			budget-&gt;dvb_frontend-&gt;tuner_priv = &amp;budget-&gt;i2c_adap;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='ctx'> 	case 0x5f61: /* Fujitsu Siemens Activy Budget-T PCI rev GR (L64781/Grundig 29504-401(tsa5060)) */</div><div class='ctx'> 		budget-&gt;dvb_frontend = dvb_attach(l64781_attach, &amp;grundig_29504_401_config_activy, &amp;budget-&gt;i2c_adap);</div><div class='ctx'> 		if (budget-&gt;dvb_frontend) {</div><div class='hunk'>@@ -550,7 +568,7 @@ static void frontend_init(struct budget *budget)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (budget-&gt;dvb_frontend == NULL) {</div><div class='del'>-		printk("budget: A frontend driver was not found for device %04x/%04x subsystem %04x/%04x\n",</div><div class='add'>+		printk("budget: A frontend driver was not found for device [%04x:%04x] subsystem [%04x:%04x]\n",</div><div class='ctx'> 		       budget-&gt;dev-&gt;pci-&gt;vendor,</div><div class='ctx'> 		       budget-&gt;dev-&gt;pci-&gt;device,</div><div class='ctx'> 		       budget-&gt;dev-&gt;pci-&gt;subsystem_vendor,</div><div class='hunk'>@@ -582,7 +600,8 @@ static int budget_attach (struct saa7146_dev* dev, struct saa7146_pci_extension_</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;ext_priv = budget;</div><div class='ctx'> </div><div class='del'>-	if ((err = ttpci_budget_init (budget, dev, info, THIS_MODULE))) {</div><div class='add'>+	err = ttpci_budget_init(budget, dev, info, THIS_MODULE, adapter_nr);</div><div class='add'>+	if (err) {</div><div class='ctx'> 		printk("==&gt; failed\n");</div><div class='ctx'> 		kfree (budget);</div><div class='ctx'> 		return err;</div><div class='hunk'>@@ -624,6 +643,7 @@ MAKE_BUDGET_INFO(ttbs1401, "TT-Budget-S-1401 PCI", BUDGET_TT);</div><div class='ctx'> MAKE_BUDGET_INFO(fsacs0, "Fujitsu Siemens Activy Budget-S PCI (rev GR/grundig frontend)", BUDGET_FS_ACTIVY);</div><div class='ctx'> MAKE_BUDGET_INFO(fsacs1, "Fujitsu Siemens Activy Budget-S PCI (rev AL/alps frontend)", BUDGET_FS_ACTIVY);</div><div class='ctx'> MAKE_BUDGET_INFO(fsact,	 "Fujitsu Siemens Activy Budget-T PCI (rev GR/Grundig frontend)", BUDGET_FS_ACTIVY);</div><div class='add'>+MAKE_BUDGET_INFO(fsact1, "Fujitsu Siemens Activy Budget-T PCI (rev AL/ALPS TDHD1-204A)", BUDGET_FS_ACTIVY);</div><div class='ctx'> </div><div class='ctx'> static struct pci_device_id pci_tbl[] = {</div><div class='ctx'> 	MAKE_EXTENSION_PCI(ttbs,  0x13c2, 0x1003),</div><div class='hunk'>@@ -634,6 +654,7 @@ static struct pci_device_id pci_tbl[] = {</div><div class='ctx'> 	MAKE_EXTENSION_PCI(ttbs1401, 0x13c2, 0x1018),</div><div class='ctx'> 	MAKE_EXTENSION_PCI(fsacs1,0x1131, 0x4f60),</div><div class='ctx'> 	MAKE_EXTENSION_PCI(fsacs0,0x1131, 0x4f61),</div><div class='add'>+	MAKE_EXTENSION_PCI(fsact1, 0x1131, 0x5f60),</div><div class='ctx'> 	MAKE_EXTENSION_PCI(fsact, 0x1131, 0x5f61),</div><div class='ctx'> 	{</div><div class='ctx'> 		.vendor    = 0,</div><div class='head'>diff --git a/drivers/media/dvb/ttpci/budget.h b/drivers/media/dvb/ttpci/budget.h<br/>index dd450b739bff..86435bf16260 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/ttpci/budget.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/dvb/ttpci/budget.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/ttpci/budget.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/ttpci/budget.h</a></div><div class='hunk'>@@ -109,7 +109,7 @@ static struct saa7146_pci_extension_data x_var = { \</div><div class='ctx'> </div><div class='ctx'> extern int ttpci_budget_init(struct budget *budget, struct saa7146_dev *dev,</div><div class='ctx'> 			     struct saa7146_pci_extension_data *info,</div><div class='del'>-			     struct module *owner);</div><div class='add'>+			     struct module *owner, short *adapter_nums);</div><div class='ctx'> extern void ttpci_budget_init_hooks(struct budget *budget);</div><div class='ctx'> extern int ttpci_budget_deinit(struct budget *budget);</div><div class='ctx'> extern void ttpci_budget_irq10_handler(struct saa7146_dev *dev, u32 * isr);</div><div class='head'>diff --git a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c<br/>index e6c9cd2e3b94..66ab0c6e9783 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c</a></div><div class='hunk'>@@ -1614,7 +1614,7 @@ static void frontend_init(struct ttusb* ttusb)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ttusb-&gt;fe == NULL) {</div><div class='del'>-		printk("dvb-ttusb-budget: A frontend driver was not found for device %04x/%04x\n",</div><div class='add'>+		printk("dvb-ttusb-budget: A frontend driver was not found for device [%04x:%04x]\n",</div><div class='ctx'> 		       le16_to_cpu(ttusb-&gt;dev-&gt;descriptor.idVendor),</div><div class='ctx'> 		       le16_to_cpu(ttusb-&gt;dev-&gt;descriptor.idProduct));</div><div class='ctx'> 	} else {</div><div class='head'>diff --git a/drivers/media/dvb/ttusb-dec/ttusb_dec.c b/drivers/media/dvb/ttusb-dec/ttusb_dec.c<br/>index de5829b863fd..ab33fec8a19f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/ttusb-dec/ttusb_dec.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/dvb/ttusb-dec/ttusb_dec.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/ttusb-dec/ttusb_dec.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/ttusb-dec/ttusb_dec.c</a></div><div class='hunk'>@@ -1665,7 +1665,7 @@ static int ttusb_dec_probe(struct usb_interface *intf,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (dec-&gt;fe == NULL) {</div><div class='del'>-		printk("dvb-ttusb-dec: A frontend driver was not found for device %04x/%04x\n",</div><div class='add'>+		printk("dvb-ttusb-dec: A frontend driver was not found for device [%04x:%04x]\n",</div><div class='ctx'> 		       le16_to_cpu(dec-&gt;udev-&gt;descriptor.idVendor),</div><div class='ctx'> 		       le16_to_cpu(dec-&gt;udev-&gt;descriptor.idProduct));</div><div class='ctx'> 	} else {</div><div class='head'>diff --git a/drivers/media/dvb/ttusb-dec/ttusbdecfe.c b/drivers/media/dvb/ttusb-dec/ttusbdecfe.c<br/>index 443af24097f3..21260aad1e54 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/ttusb-dec/ttusbdecfe.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/dvb/ttusb-dec/ttusbdecfe.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/dvb/ttusb-dec/ttusbdecfe.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/dvb/ttusb-dec/ttusbdecfe.c</a></div><div class='hunk'>@@ -38,7 +38,17 @@ struct ttusbdecfe_state {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int ttusbdecfe_read_status(struct dvb_frontend* fe, fe_status_t* status)</div><div class='add'>+static int ttusbdecfe_dvbs_read_status(struct dvb_frontend *fe,</div><div class='add'>+	fe_status_t *status)</div><div class='add'>+{</div><div class='add'>+	*status = FE_HAS_SIGNAL | FE_HAS_VITERBI |</div><div class='add'>+		FE_HAS_SYNC | FE_HAS_CARRIER | FE_HAS_LOCK;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int ttusbdecfe_dvbt_read_status(struct dvb_frontend *fe,</div><div class='add'>+	fe_status_t *status)</div><div class='ctx'> {</div><div class='ctx'> 	struct ttusbdecfe_state* state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	u8 b[] = { 0x00, 0x00, 0x00, 0x00,</div><div class='hunk'>@@ -251,7 +261,7 @@ static struct dvb_frontend_ops ttusbdecfe_dvbt_ops = {</div><div class='ctx'> </div><div class='ctx'> 	.get_tune_settings = ttusbdecfe_dvbt_get_tune_settings,</div><div class='ctx'> </div><div class='del'>-	.read_status = ttusbdecfe_read_status,</div><div class='add'>+	.read_status = ttusbdecfe_dvbt_read_status,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops ttusbdecfe_dvbs_ops = {</div><div class='hunk'>@@ -273,7 +283,7 @@ static struct dvb_frontend_ops ttusbdecfe_dvbs_ops = {</div><div class='ctx'> </div><div class='ctx'> 	.set_frontend = ttusbdecfe_dvbs_set_frontend,</div><div class='ctx'> </div><div class='del'>-	.read_status = ttusbdecfe_read_status,</div><div class='add'>+	.read_status = ttusbdecfe_dvbs_read_status,</div><div class='ctx'> </div><div class='ctx'> 	.diseqc_send_master_cmd = ttusbdecfe_dvbs_diseqc_send_master_cmd,</div><div class='ctx'> 	.set_voltage = ttusbdecfe_dvbs_set_voltage,</div><div class='head'>diff --git a/drivers/media/radio/Kconfig b/drivers/media/radio/Kconfig<br/>index 1b41b3f77cf9..04cd7c04bdde 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/radio/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/radio/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/radio/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/radio/Kconfig</a></div><div class='hunk'>@@ -359,6 +359,18 @@ config USB_SI470X</div><div class='ctx'> 	  computer's USB port.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='del'>-	  module will be called radio-silabs.</div><div class='add'>+	  module will be called radio-si470x.</div><div class='add'>+</div><div class='add'>+config USB_MR800</div><div class='add'>+	tristate "AverMedia MR 800 USB FM radio support"</div><div class='add'>+	depends on USB &amp;&amp; VIDEO_V4L2</div><div class='add'>+	---help---</div><div class='add'>+	  Say Y here if you want to connect this type of radio to your</div><div class='add'>+	  computer's USB port. Note that the audio is not digital, and</div><div class='add'>+	  you must connect the line out connector to a sound card or a</div><div class='add'>+	  set of speakers.</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here: the</div><div class='add'>+	  module will be called radio-mr800.</div><div class='ctx'> </div><div class='ctx'> endif # RADIO_ADAPTERS</div><div class='head'>diff --git a/drivers/media/radio/Makefile b/drivers/media/radio/Makefile<br/>index 7ca71ab96b43..240ec63cdafc 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/radio/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/radio/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/radio/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/radio/Makefile</a></div><div class='hunk'>@@ -18,5 +18,6 @@ obj-$(CONFIG_RADIO_TRUST) += radio-trust.o</div><div class='ctx'> obj-$(CONFIG_RADIO_MAESTRO) += radio-maestro.o</div><div class='ctx'> obj-$(CONFIG_USB_DSBR) += dsbr100.o</div><div class='ctx'> obj-$(CONFIG_USB_SI470X) += radio-si470x.o</div><div class='add'>+obj-$(CONFIG_USB_MR800) += radio-mr800.o</div><div class='ctx'> </div><div class='ctx'> EXTRA_CFLAGS += -Isound</div><div class='head'>diff --git a/drivers/media/radio/dsbr100.c b/drivers/media/radio/dsbr100.c<br/>index 70c65a745923..78f56944e640 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/radio/dsbr100.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/radio/dsbr100.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/radio/dsbr100.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/radio/dsbr100.c</a></div><div class='hunk'>@@ -274,7 +274,7 @@ static int vidioc_querycap(struct file *file, void *priv,</div><div class='ctx'> static int vidioc_g_tuner(struct file *file, void *priv,</div><div class='ctx'> 				struct v4l2_tuner *v)</div><div class='ctx'> {</div><div class='del'>-	struct dsbr100_device *radio = video_get_drvdata(video_devdata(file));</div><div class='add'>+	struct dsbr100_device *radio = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	if (v-&gt;index &gt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -306,18 +306,18 @@ static int vidioc_s_tuner(struct file *file, void *priv,</div><div class='ctx'> static int vidioc_s_frequency(struct file *file, void *priv,</div><div class='ctx'> 				struct v4l2_frequency *f)</div><div class='ctx'> {</div><div class='del'>-	struct dsbr100_device *radio = video_get_drvdata(video_devdata(file));</div><div class='add'>+	struct dsbr100_device *radio = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	radio-&gt;curfreq = f-&gt;frequency;</div><div class='ctx'> 	if (dsbr100_setfreq(radio, radio-&gt;curfreq)==-1)</div><div class='del'>-		warn("Set frequency failed");</div><div class='add'>+		dev_warn(&amp;radio-&gt;usbdev-&gt;dev, "Set frequency failed\n");</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int vidioc_g_frequency(struct file *file, void *priv,</div><div class='ctx'> 				struct v4l2_frequency *f)</div><div class='ctx'> {</div><div class='del'>-	struct dsbr100_device *radio = video_get_drvdata(video_devdata(file));</div><div class='add'>+	struct dsbr100_device *radio = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	f-&gt;type = V4L2_TUNER_RADIO;</div><div class='ctx'> 	f-&gt;frequency = radio-&gt;curfreq;</div><div class='hunk'>@@ -342,7 +342,7 @@ static int vidioc_queryctrl(struct file *file, void *priv,</div><div class='ctx'> static int vidioc_g_ctrl(struct file *file, void *priv,</div><div class='ctx'> 				struct v4l2_control *ctrl)</div><div class='ctx'> {</div><div class='del'>-	struct dsbr100_device *radio = video_get_drvdata(video_devdata(file));</div><div class='add'>+	struct dsbr100_device *radio = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	switch (ctrl-&gt;id) {</div><div class='ctx'> 	case V4L2_CID_AUDIO_MUTE:</div><div class='hunk'>@@ -355,16 +355,22 @@ static int vidioc_g_ctrl(struct file *file, void *priv,</div><div class='ctx'> static int vidioc_s_ctrl(struct file *file, void *priv,</div><div class='ctx'> 				struct v4l2_control *ctrl)</div><div class='ctx'> {</div><div class='del'>-	struct dsbr100_device *radio = video_get_drvdata(video_devdata(file));</div><div class='add'>+	struct dsbr100_device *radio = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	switch (ctrl-&gt;id) {</div><div class='ctx'> 	case V4L2_CID_AUDIO_MUTE:</div><div class='ctx'> 		if (ctrl-&gt;value) {</div><div class='del'>-			if (dsbr100_stop(radio)==-1)</div><div class='del'>-				warn("Radio did not respond properly");</div><div class='add'>+			if (dsbr100_stop(radio) == -1) {</div><div class='add'>+				dev_warn(&amp;radio-&gt;usbdev-&gt;dev,</div><div class='add'>+					 "Radio did not respond properly\n");</div><div class='add'>+				return -EBUSY;</div><div class='add'>+			}</div><div class='ctx'> 		} else {</div><div class='del'>-			if (dsbr100_start(radio)==-1)</div><div class='del'>-				warn("Radio did not respond properly");</div><div class='add'>+			if (dsbr100_start(radio) == -1) {</div><div class='add'>+				dev_warn(&amp;radio-&gt;usbdev-&gt;dev,</div><div class='add'>+					 "Radio did not respond properly\n");</div><div class='add'>+				return -EBUSY;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -405,23 +411,27 @@ static int vidioc_s_audio(struct file *file, void *priv,</div><div class='ctx'> </div><div class='ctx'> static int usb_dsbr100_open(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='del'>-	struct dsbr100_device *radio=video_get_drvdata(video_devdata(file));</div><div class='add'>+	struct dsbr100_device *radio = video_drvdata(file);</div><div class='ctx'> </div><div class='add'>+	lock_kernel();</div><div class='ctx'> 	radio-&gt;users = 1;</div><div class='ctx'> 	radio-&gt;muted = 1;</div><div class='ctx'> </div><div class='ctx'> 	if (dsbr100_start(radio)&lt;0) {</div><div class='del'>-		warn("Radio did not start up properly");</div><div class='add'>+		dev_warn(&amp;radio-&gt;usbdev-&gt;dev,</div><div class='add'>+			 "Radio did not start up properly\n");</div><div class='ctx'> 		radio-&gt;users = 0;</div><div class='add'>+		unlock_kernel();</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> 	dsbr100_setfreq(radio, radio-&gt;curfreq);</div><div class='add'>+	unlock_kernel();</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int usb_dsbr100_close(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='del'>-	struct dsbr100_device *radio=video_get_drvdata(video_devdata(file));</div><div class='add'>+	struct dsbr100_device *radio = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	if (!radio)</div><div class='ctx'> 		return -ENODEV;</div><div class='hunk'>@@ -494,7 +504,7 @@ static int usb_dsbr100_probe(struct usb_interface *intf,</div><div class='ctx'> 	radio-&gt;curfreq = FREQ_MIN*FREQ_MUL;</div><div class='ctx'> 	video_set_drvdata(radio-&gt;videodev, radio);</div><div class='ctx'> 	if (video_register_device(radio-&gt;videodev, VFL_TYPE_RADIO, radio_nr) &lt; 0) {</div><div class='del'>-		warn("Could not register video device");</div><div class='add'>+		dev_warn(&amp;intf-&gt;dev, "Could not register video device\n");</div><div class='ctx'> 		video_device_release(radio-&gt;videodev);</div><div class='ctx'> 		kfree(radio-&gt;transfer_buffer);</div><div class='ctx'> 		kfree(radio);</div><div class='hunk'>@@ -507,7 +517,8 @@ static int usb_dsbr100_probe(struct usb_interface *intf,</div><div class='ctx'> static int __init dsbr100_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int retval = usb_register(&amp;usb_dsbr100_driver);</div><div class='del'>-	info(DRIVER_VERSION ":" DRIVER_DESC);</div><div class='add'>+	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"</div><div class='add'>+	       DRIVER_DESC "\n");</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/radio/radio-aimslab.c b/drivers/media/radio/radio-aimslab.c<br/>index 1f064f4b32df..9305e958fc66 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/radio/radio-aimslab.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/radio/radio-aimslab.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/radio/radio-aimslab.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/radio/radio-aimslab.c</a></div><div class='hunk'>@@ -51,6 +51,7 @@ static struct mutex lock;</div><div class='ctx'> </div><div class='ctx'> struct rt_device</div><div class='ctx'> {</div><div class='add'>+	unsigned long in_use;</div><div class='ctx'> 	int port;</div><div class='ctx'> 	int curvol;</div><div class='ctx'> 	unsigned long curfreq;</div><div class='hunk'>@@ -245,8 +246,7 @@ static int vidioc_querycap(struct file *file, void  *priv,</div><div class='ctx'> static int vidioc_g_tuner(struct file *file, void *priv,</div><div class='ctx'> 					struct v4l2_tuner *v)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct rt_device *rt = dev-&gt;priv;</div><div class='add'>+	struct rt_device *rt = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	if (v-&gt;index &gt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -273,8 +273,7 @@ static int vidioc_s_tuner(struct file *file, void *priv,</div><div class='ctx'> static int vidioc_s_frequency(struct file *file, void *priv,</div><div class='ctx'> 					struct v4l2_frequency *f)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct rt_device *rt = dev-&gt;priv;</div><div class='add'>+	struct rt_device *rt = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	rt-&gt;curfreq = f-&gt;frequency;</div><div class='ctx'> 	rt_setfreq(rt, rt-&gt;curfreq);</div><div class='hunk'>@@ -284,8 +283,7 @@ static int vidioc_s_frequency(struct file *file, void *priv,</div><div class='ctx'> static int vidioc_g_frequency(struct file *file, void *priv,</div><div class='ctx'> 					struct v4l2_frequency *f)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct rt_device *rt = dev-&gt;priv;</div><div class='add'>+	struct rt_device *rt = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	f-&gt;type = V4L2_TUNER_RADIO;</div><div class='ctx'> 	f-&gt;frequency = rt-&gt;curfreq;</div><div class='hunk'>@@ -310,8 +308,7 @@ static int vidioc_queryctrl(struct file *file, void *priv,</div><div class='ctx'> static int vidioc_g_ctrl(struct file *file, void *priv,</div><div class='ctx'> 					struct v4l2_control *ctrl)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct rt_device *rt = dev-&gt;priv;</div><div class='add'>+	struct rt_device *rt = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	switch (ctrl-&gt;id) {</div><div class='ctx'> 	case V4L2_CID_AUDIO_MUTE:</div><div class='hunk'>@@ -327,8 +324,7 @@ static int vidioc_g_ctrl(struct file *file, void *priv,</div><div class='ctx'> static int vidioc_s_ctrl(struct file *file, void *priv,</div><div class='ctx'> 					struct v4l2_control *ctrl)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct rt_device *rt = dev-&gt;priv;</div><div class='add'>+	struct rt_device *rt = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	switch (ctrl-&gt;id) {</div><div class='ctx'> 	case V4L2_CID_AUDIO_MUTE:</div><div class='hunk'>@@ -378,10 +374,21 @@ static int vidioc_s_audio(struct file *file, void *priv,</div><div class='ctx'> </div><div class='ctx'> static struct rt_device rtrack_unit;</div><div class='ctx'> </div><div class='add'>+static int rtrack_exclusive_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	return test_and_set_bit(0, &amp;rtrack_unit.in_use) ? -EBUSY : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtrack_exclusive_release(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	clear_bit(0, &amp;rtrack_unit.in_use);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct file_operations rtrack_fops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='del'>-	.open           = video_exclusive_open,</div><div class='del'>-	.release        = video_exclusive_release,</div><div class='add'>+	.open           = rtrack_exclusive_open,</div><div class='add'>+	.release        = rtrack_exclusive_release,</div><div class='ctx'> 	.ioctl		= video_ioctl2,</div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='ctx'> 	.compat_ioctl	= v4l_compat_ioctl32,</div><div class='hunk'>@@ -408,6 +415,7 @@ static struct video_device rtrack_radio = {</div><div class='ctx'> 	.name		= "RadioTrack radio",</div><div class='ctx'> 	.fops           = &amp;rtrack_fops,</div><div class='ctx'> 	.ioctl_ops 	= &amp;rtrack_ioctl_ops,</div><div class='add'>+	.release	= video_device_release_empty,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init rtrack_init(void)</div><div class='hunk'>@@ -424,7 +432,7 @@ static int __init rtrack_init(void)</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rtrack_radio.priv=&amp;rtrack_unit;</div><div class='add'>+	video_set_drvdata(&amp;rtrack_radio, &amp;rtrack_unit);</div><div class='ctx'> </div><div class='ctx'> 	if (video_register_device(&amp;rtrack_radio, VFL_TYPE_RADIO, radio_nr) &lt; 0) {</div><div class='ctx'> 		release_region(io, 2);</div><div class='head'>diff --git a/drivers/media/radio/radio-aztech.c b/drivers/media/radio/radio-aztech.c<br/>index 628c689e3ffe..d78489573230 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/radio/radio-aztech.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/radio/radio-aztech.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/radio/radio-aztech.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/radio/radio-aztech.c</a></div><div class='hunk'>@@ -70,6 +70,7 @@ static struct mutex lock;</div><div class='ctx'> </div><div class='ctx'> struct az_device</div><div class='ctx'> {</div><div class='add'>+	unsigned long in_use;</div><div class='ctx'> 	int curvol;</div><div class='ctx'> 	unsigned long curfreq;</div><div class='ctx'> 	int stereo;</div><div class='hunk'>@@ -195,8 +196,7 @@ static int vidioc_querycap (struct file *file, void  *priv,</div><div class='ctx'> static int vidioc_g_tuner (struct file *file, void *priv,</div><div class='ctx'> 				struct v4l2_tuner *v)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct az_device *az = dev-&gt;priv;</div><div class='add'>+	struct az_device *az = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	if (v-&gt;index &gt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -264,8 +264,7 @@ static int vidioc_s_audio (struct file *file, void *priv,</div><div class='ctx'> static int vidioc_s_frequency (struct file *file, void *priv,</div><div class='ctx'> 				struct v4l2_frequency *f)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct az_device *az = dev-&gt;priv;</div><div class='add'>+	struct az_device *az = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	az-&gt;curfreq = f-&gt;frequency;</div><div class='ctx'> 	az_setfreq(az, az-&gt;curfreq);</div><div class='hunk'>@@ -275,8 +274,7 @@ static int vidioc_s_frequency (struct file *file, void *priv,</div><div class='ctx'> static int vidioc_g_frequency (struct file *file, void *priv,</div><div class='ctx'> 				struct v4l2_frequency *f)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct az_device *az = dev-&gt;priv;</div><div class='add'>+	struct az_device *az = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	f-&gt;type = V4L2_TUNER_RADIO;</div><div class='ctx'> 	f-&gt;frequency = az-&gt;curfreq;</div><div class='hunk'>@@ -302,8 +300,7 @@ static int vidioc_queryctrl (struct file *file, void *priv,</div><div class='ctx'> static int vidioc_g_ctrl (struct file *file, void *priv,</div><div class='ctx'> 			    struct v4l2_control *ctrl)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct az_device *az = dev-&gt;priv;</div><div class='add'>+	struct az_device *az = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	switch (ctrl-&gt;id) {</div><div class='ctx'> 		case V4L2_CID_AUDIO_MUTE:</div><div class='hunk'>@@ -322,8 +319,7 @@ static int vidioc_g_ctrl (struct file *file, void *priv,</div><div class='ctx'> static int vidioc_s_ctrl (struct file *file, void *priv,</div><div class='ctx'> 			    struct v4l2_control *ctrl)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct az_device *az = dev-&gt;priv;</div><div class='add'>+	struct az_device *az = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	switch (ctrl-&gt;id) {</div><div class='ctx'> 		case V4L2_CID_AUDIO_MUTE:</div><div class='hunk'>@@ -342,10 +338,21 @@ static int vidioc_s_ctrl (struct file *file, void *priv,</div><div class='ctx'> </div><div class='ctx'> static struct az_device aztech_unit;</div><div class='ctx'> </div><div class='add'>+static int aztech_exclusive_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	return test_and_set_bit(0, &amp;aztech_unit.in_use) ? -EBUSY : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aztech_exclusive_release(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	clear_bit(0, &amp;aztech_unit.in_use);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct file_operations aztech_fops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='del'>-	.open           = video_exclusive_open,</div><div class='del'>-	.release        = video_exclusive_release,</div><div class='add'>+	.open           = aztech_exclusive_open,</div><div class='add'>+	.release        = aztech_exclusive_release,</div><div class='ctx'> 	.ioctl		= video_ioctl2,</div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='ctx'> 	.compat_ioctl	= v4l_compat_ioctl32,</div><div class='hunk'>@@ -369,9 +376,10 @@ static const struct v4l2_ioctl_ops aztech_ioctl_ops = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct video_device aztech_radio = {</div><div class='del'>-	.name		    = "Aztech radio",</div><div class='del'>-	.fops               = &amp;aztech_fops,</div><div class='del'>-	.ioctl_ops 	    = &amp;aztech_ioctl_ops,</div><div class='add'>+	.name		= "Aztech radio",</div><div class='add'>+	.fops           = &amp;aztech_fops,</div><div class='add'>+	.ioctl_ops 	= &amp;aztech_ioctl_ops,</div><div class='add'>+	.release	= video_device_release_empty,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> module_param_named(debug,aztech_radio.debug, int, 0644);</div><div class='hunk'>@@ -392,7 +400,7 @@ static int __init aztech_init(void)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mutex_init(&amp;lock);</div><div class='del'>-	aztech_radio.priv=&amp;aztech_unit;</div><div class='add'>+	video_set_drvdata(&amp;aztech_radio, &amp;aztech_unit);</div><div class='ctx'> </div><div class='ctx'> 	if (video_register_device(&amp;aztech_radio, VFL_TYPE_RADIO, radio_nr) &lt; 0) {</div><div class='ctx'> 		release_region(io,2);</div><div class='head'>diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c<br/>index 04c3698d32e4..0490a1fa999d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/radio/radio-cadet.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/radio/radio-cadet.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/radio/radio-cadet.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/radio/radio-cadet.c</a></div><div class='hunk'>@@ -589,6 +589,7 @@ static struct video_device cadet_radio = {</div><div class='ctx'> 	.name		= "Cadet radio",</div><div class='ctx'> 	.fops           = &amp;cadet_fops,</div><div class='ctx'> 	.ioctl_ops 	= &amp;cadet_ioctl_ops,</div><div class='add'>+	.release	= video_device_release_empty,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PNP</div><div class='head'>diff --git a/drivers/media/radio/radio-gemtek-pci.c b/drivers/media/radio/radio-gemtek-pci.c<br/>index 5cd7f032298d..e15bee6d7cfc 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/radio/radio-gemtek-pci.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/radio/radio-gemtek-pci.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/radio/radio-gemtek-pci.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/radio/radio-gemtek-pci.c</a></div><div class='hunk'>@@ -100,9 +100,8 @@ struct gemtek_pci_card {</div><div class='ctx'> 	u8  mute;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const char rcsid[] = "$Id: radio-gemtek-pci.c,v 1.1 2001/07/23 08:08:16 ted Exp ted $";</div><div class='del'>-</div><div class='ctx'> static int nr_radio = -1;</div><div class='add'>+static unsigned long in_use;</div><div class='ctx'> </div><div class='ctx'> static inline u8 gemtek_pci_out( u16 value, u32 port )</div><div class='ctx'> {</div><div class='hunk'>@@ -205,8 +204,7 @@ static int vidioc_querycap(struct file *file, void *priv,</div><div class='ctx'> static int vidioc_g_tuner(struct file *file, void *priv,</div><div class='ctx'> 					struct v4l2_tuner *v)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct gemtek_pci_card *card = dev-&gt;priv;</div><div class='add'>+	struct gemtek_pci_card *card = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	if (v-&gt;index &gt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -233,8 +231,7 @@ static int vidioc_s_tuner(struct file *file, void *priv,</div><div class='ctx'> static int vidioc_s_frequency(struct file *file, void *priv,</div><div class='ctx'> 					struct v4l2_frequency *f)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct gemtek_pci_card *card = dev-&gt;priv;</div><div class='add'>+	struct gemtek_pci_card *card = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	if ( (f-&gt;frequency &lt; GEMTEK_PCI_RANGE_LOW) ||</div><div class='ctx'> 			(f-&gt;frequency &gt; GEMTEK_PCI_RANGE_HIGH) )</div><div class='hunk'>@@ -248,8 +245,7 @@ static int vidioc_s_frequency(struct file *file, void *priv,</div><div class='ctx'> static int vidioc_g_frequency(struct file *file, void *priv,</div><div class='ctx'> 					struct v4l2_frequency *f)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct gemtek_pci_card *card = dev-&gt;priv;</div><div class='add'>+	struct gemtek_pci_card *card = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	f-&gt;type = V4L2_TUNER_RADIO;</div><div class='ctx'> 	f-&gt;frequency = card-&gt;current_frequency;</div><div class='hunk'>@@ -273,8 +269,7 @@ static int vidioc_queryctrl(struct file *file, void *priv,</div><div class='ctx'> static int vidioc_g_ctrl(struct file *file, void *priv,</div><div class='ctx'> 					struct v4l2_control *ctrl)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct gemtek_pci_card *card = dev-&gt;priv;</div><div class='add'>+	struct gemtek_pci_card *card = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	switch (ctrl-&gt;id) {</div><div class='ctx'> 	case V4L2_CID_AUDIO_MUTE:</div><div class='hunk'>@@ -293,8 +288,7 @@ static int vidioc_g_ctrl(struct file *file, void *priv,</div><div class='ctx'> static int vidioc_s_ctrl(struct file *file, void *priv,</div><div class='ctx'> 					struct v4l2_control *ctrl)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct gemtek_pci_card *card = dev-&gt;priv;</div><div class='add'>+	struct gemtek_pci_card *card = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	switch (ctrl-&gt;id) {</div><div class='ctx'> 	case V4L2_CID_AUDIO_MUTE:</div><div class='hunk'>@@ -364,10 +358,21 @@ MODULE_DEVICE_TABLE( pci, gemtek_pci_id );</div><div class='ctx'> </div><div class='ctx'> static int mx = 1;</div><div class='ctx'> </div><div class='add'>+static int gemtek_pci_exclusive_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	return test_and_set_bit(0, &amp;in_use) ? -EBUSY : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gemtek_pci_exclusive_release(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	clear_bit(0, &amp;in_use);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct file_operations gemtek_pci_fops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='del'>-	.open           = video_exclusive_open,</div><div class='del'>-	.release        = video_exclusive_release,</div><div class='add'>+	.open           = gemtek_pci_exclusive_open,</div><div class='add'>+	.release        = gemtek_pci_exclusive_release,</div><div class='ctx'> 	.ioctl		= video_ioctl2,</div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='ctx'> 	.compat_ioctl	= v4l_compat_ioctl32,</div><div class='hunk'>@@ -391,9 +396,10 @@ static const struct v4l2_ioctl_ops gemtek_pci_ioctl_ops = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct video_device vdev_template = {</div><div class='del'>-	.name          = "Gemtek PCI Radio",</div><div class='del'>-	.fops          = &amp;gemtek_pci_fops,</div><div class='del'>-	.ioctl_ops     = &amp;gemtek_pci_ioctl_ops,</div><div class='add'>+	.name          	= "Gemtek PCI Radio",</div><div class='add'>+	.fops          	= &amp;gemtek_pci_fops,</div><div class='add'>+	.ioctl_ops 	= &amp;gemtek_pci_ioctl_ops,</div><div class='add'>+	.release	= video_device_release_empty,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __devinit gemtek_pci_probe( struct pci_dev *pci_dev, const struct pci_device_id *pci_id )</div><div class='hunk'>@@ -431,7 +437,7 @@ static int __devinit gemtek_pci_probe( struct pci_dev *pci_dev, const struct pci</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	card-&gt;videodev = devradio;</div><div class='del'>-	devradio-&gt;priv = card;</div><div class='add'>+	video_set_drvdata(devradio, card);</div><div class='ctx'> 	gemtek_pci_mute( card );</div><div class='ctx'> </div><div class='ctx'> 	printk( KERN_INFO "Gemtek PCI Radio (rev. %d) found at 0x%04x-0x%04x.\n",</div><div class='head'>diff --git a/drivers/media/radio/radio-gemtek.c b/drivers/media/radio/radio-gemtek.c<br/>index 0a0f956bb308..d131a5d38128 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/radio/radio-gemtek.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/radio/radio-gemtek.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/radio/radio-gemtek.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/radio/radio-gemtek.c</a></div><div class='hunk'>@@ -57,6 +57,7 @@ static int shutdown	= 1;</div><div class='ctx'> static int keepmuted	= 1;</div><div class='ctx'> static int initmute	= 1;</div><div class='ctx'> static int radio_nr	= -1;</div><div class='add'>+static unsigned long in_use;</div><div class='ctx'> </div><div class='ctx'> module_param(io, int, 0444);</div><div class='ctx'> MODULE_PARM_DESC(io, "Force I/O port for the GemTek Radio card if automatic "</div><div class='hunk'>@@ -393,10 +394,21 @@ static struct v4l2_queryctrl radio_qctrl[] = {</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static int gemtek_exclusive_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	return test_and_set_bit(0, &amp;in_use) ? -EBUSY : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gemtek_exclusive_release(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	clear_bit(0, &amp;in_use);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct file_operations gemtek_fops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='del'>-	.open		= video_exclusive_open,</div><div class='del'>-	.release	= video_exclusive_release,</div><div class='add'>+	.open		= gemtek_exclusive_open,</div><div class='add'>+	.release	= gemtek_exclusive_release,</div><div class='ctx'> 	.ioctl		= video_ioctl2,</div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='ctx'> 	.compat_ioctl	= v4l_compat_ioctl32,</div><div class='hunk'>@@ -447,8 +459,7 @@ static int vidioc_s_tuner(struct file *file, void *priv, struct v4l2_tuner *v)</div><div class='ctx'> static int vidioc_s_frequency(struct file *file, void *priv,</div><div class='ctx'> 			      struct v4l2_frequency *f)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct gemtek_device *rt = dev-&gt;priv;</div><div class='add'>+	struct gemtek_device *rt = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	gemtek_setfreq(rt, f-&gt;frequency);</div><div class='ctx'> </div><div class='hunk'>@@ -458,8 +469,7 @@ static int vidioc_s_frequency(struct file *file, void *priv,</div><div class='ctx'> static int vidioc_g_frequency(struct file *file, void *priv,</div><div class='ctx'> 			      struct v4l2_frequency *f)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct gemtek_device *rt = dev-&gt;priv;</div><div class='add'>+	struct gemtek_device *rt = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	f-&gt;type = V4L2_TUNER_RADIO;</div><div class='ctx'> 	f-&gt;frequency = rt-&gt;lastfreq;</div><div class='hunk'>@@ -483,8 +493,7 @@ static int vidioc_queryctrl(struct file *file, void *priv,</div><div class='ctx'> static int vidioc_g_ctrl(struct file *file, void *priv,</div><div class='ctx'> 			 struct v4l2_control *ctrl)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct gemtek_device *rt = dev-&gt;priv;</div><div class='add'>+	struct gemtek_device *rt = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	switch (ctrl-&gt;id) {</div><div class='ctx'> 	case V4L2_CID_AUDIO_MUTE:</div><div class='hunk'>@@ -503,8 +512,7 @@ static int vidioc_g_ctrl(struct file *file, void *priv,</div><div class='ctx'> static int vidioc_s_ctrl(struct file *file, void *priv,</div><div class='ctx'> 			 struct v4l2_control *ctrl)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct gemtek_device *rt = dev-&gt;priv;</div><div class='add'>+	struct gemtek_device *rt = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	switch (ctrl-&gt;id) {</div><div class='ctx'> 	case V4L2_CID_AUDIO_MUTE:</div><div class='hunk'>@@ -569,9 +577,10 @@ static const struct v4l2_ioctl_ops gemtek_ioctl_ops = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct video_device gemtek_radio = {</div><div class='del'>-	.name			= "GemTek Radio card",</div><div class='del'>-	.fops			= &amp;gemtek_fops,</div><div class='del'>-	.ioctl_ops 		= &amp;gemtek_ioctl_ops,</div><div class='add'>+	.name		= "GemTek Radio card",</div><div class='add'>+	.fops		= &amp;gemtek_fops,</div><div class='add'>+	.ioctl_ops 	= &amp;gemtek_ioctl_ops,</div><div class='add'>+	.release	= video_device_release_empty,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -610,7 +619,7 @@ static int __init gemtek_init(void)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	gemtek_radio.priv = &amp;gemtek_unit;</div><div class='add'>+	video_set_drvdata(&amp;gemtek_radio, &amp;gemtek_unit);</div><div class='ctx'> </div><div class='ctx'> 	if (video_register_device(&amp;gemtek_radio, VFL_TYPE_RADIO, radio_nr) &lt; 0) {</div><div class='ctx'> 		release_region(io, 1);</div><div class='head'>diff --git a/drivers/media/radio/radio-maestro.c b/drivers/media/radio/radio-maestro.c<br/>index 9ef0a763eeb7..4bf4d007bcfa 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/radio/radio-maestro.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/radio/radio-maestro.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/radio/radio-maestro.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/radio/radio-maestro.c</a></div><div class='hunk'>@@ -75,7 +75,21 @@ static struct v4l2_queryctrl radio_qctrl[] = {</div><div class='ctx'> static int radio_nr = -1;</div><div class='ctx'> module_param(radio_nr, int, 0);</div><div class='ctx'> </div><div class='add'>+static unsigned long in_use;</div><div class='add'>+</div><div class='ctx'> static int maestro_probe(struct pci_dev *pdev, const struct pci_device_id *ent);</div><div class='add'>+</div><div class='add'>+static int maestro_exclusive_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	return test_and_set_bit(0, &amp;in_use) ? -EBUSY : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int maestro_exclusive_release(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	clear_bit(0, &amp;in_use);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void maestro_remove(struct pci_dev *pdev);</div><div class='ctx'> </div><div class='ctx'> static struct pci_device_id maestro_r_pci_tbl[] = {</div><div class='hunk'>@@ -98,8 +112,8 @@ static struct pci_driver maestro_r_driver = {</div><div class='ctx'> </div><div class='ctx'> static const struct file_operations maestro_fops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='del'>-	.open           = video_exclusive_open,</div><div class='del'>-	.release        = video_exclusive_release,</div><div class='add'>+	.open           = maestro_exclusive_open,</div><div class='add'>+	.release        = maestro_exclusive_release,</div><div class='ctx'> 	.ioctl		= video_ioctl2,</div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='ctx'> 	.compat_ioctl	= v4l_compat_ioctl32,</div><div class='hunk'>@@ -196,8 +210,7 @@ static int vidioc_querycap(struct file *file, void  *priv,</div><div class='ctx'> static int vidioc_g_tuner(struct file *file, void *priv,</div><div class='ctx'> 					struct v4l2_tuner *v)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct radio_device *card = video_get_drvdata(dev);</div><div class='add'>+	struct radio_device *card = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	if (v-&gt;index &gt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -229,8 +242,7 @@ static int vidioc_s_tuner(struct file *file, void *priv,</div><div class='ctx'> static int vidioc_s_frequency(struct file *file, void *priv,</div><div class='ctx'> 					struct v4l2_frequency *f)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct radio_device *card = video_get_drvdata(dev);</div><div class='add'>+	struct radio_device *card = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	if (f-&gt;frequency &lt; FREQ_LO || f-&gt;frequency &gt; FREQ_HI)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -241,8 +253,7 @@ static int vidioc_s_frequency(struct file *file, void *priv,</div><div class='ctx'> static int vidioc_g_frequency(struct file *file, void *priv,</div><div class='ctx'> 					struct v4l2_frequency *f)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct radio_device *card = video_get_drvdata(dev);</div><div class='add'>+	struct radio_device *card = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	f-&gt;type = V4L2_TUNER_RADIO;</div><div class='ctx'> 	f-&gt;frequency = BITS2FREQ(radio_bits_get(card));</div><div class='hunk'>@@ -267,8 +278,7 @@ static int vidioc_queryctrl(struct file *file, void *priv,</div><div class='ctx'> static int vidioc_g_ctrl(struct file *file, void *priv,</div><div class='ctx'> 					struct v4l2_control *ctrl)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct radio_device *card = video_get_drvdata(dev);</div><div class='add'>+	struct radio_device *card = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	switch (ctrl-&gt;id) {</div><div class='ctx'> 	case V4L2_CID_AUDIO_MUTE:</div><div class='hunk'>@@ -281,8 +291,7 @@ static int vidioc_g_ctrl(struct file *file, void *priv,</div><div class='ctx'> static int vidioc_s_ctrl(struct file *file, void *priv,</div><div class='ctx'> 					struct v4l2_control *ctrl)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct radio_device *card = video_get_drvdata(dev);</div><div class='add'>+	struct radio_device *card = video_drvdata(file);</div><div class='ctx'> 	register u16 io = card-&gt;io;</div><div class='ctx'> 	register u16 omask = inw(io + IO_MASK);</div><div class='ctx'> </div><div class='hunk'>@@ -374,6 +383,7 @@ static struct video_device maestro_radio = {</div><div class='ctx'> 	.name           = "Maestro radio",</div><div class='ctx'> 	.fops           = &amp;maestro_fops,</div><div class='ctx'> 	.ioctl_ops 	= &amp;maestro_ioctl_ops,</div><div class='add'>+	.release	= video_device_release,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __devinit maestro_probe(struct pci_dev *pdev,</div><div class='head'>diff --git a/drivers/media/radio/radio-maxiradio.c b/drivers/media/radio/radio-maxiradio.c<br/>index 0cc6fcb041fd..c777a17b00bc 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/radio/radio-maxiradio.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/radio/radio-maxiradio.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/radio/radio-maxiradio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/radio/radio-maxiradio.c</a></div><div class='hunk'>@@ -85,6 +85,7 @@ static const int clk = 1, data = 2, wren = 4, mo_st = 8, power = 16 ;</div><div class='ctx'> static int radio_nr = -1;</div><div class='ctx'> module_param(radio_nr, int, 0);</div><div class='ctx'> </div><div class='add'>+static unsigned long in_use;</div><div class='ctx'> </div><div class='ctx'> #define FREQ_LO		 50*16000</div><div class='ctx'> #define FREQ_HI		150*16000</div><div class='hunk'>@@ -99,10 +100,21 @@ module_param(radio_nr, int, 0);</div><div class='ctx'> #define BITS2FREQ(x)	((x) * FREQ_STEP - FREQ_IF)</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+static int maxiradio_exclusive_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	return test_and_set_bit(0, &amp;in_use) ? -EBUSY : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int maxiradio_exclusive_release(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	clear_bit(0, &amp;in_use);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct file_operations maxiradio_fops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='del'>-	.open           = video_exclusive_open,</div><div class='del'>-	.release        = video_exclusive_release,</div><div class='add'>+	.open           = maxiradio_exclusive_open,</div><div class='add'>+	.release        = maxiradio_exclusive_release,</div><div class='ctx'> 	.ioctl          = video_ioctl2,</div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='ctx'> 	.compat_ioctl	= v4l_compat_ioctl32,</div><div class='hunk'>@@ -219,8 +231,7 @@ static int vidioc_querycap (struct file *file, void  *priv,</div><div class='ctx'> static int vidioc_g_tuner (struct file *file, void *priv,</div><div class='ctx'> 			   struct v4l2_tuner *v)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct radio_device *card=dev-&gt;priv;</div><div class='add'>+	struct radio_device *card = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	if (v-&gt;index &gt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -290,8 +301,7 @@ static int vidioc_s_audio (struct file *file, void *priv,</div><div class='ctx'> static int vidioc_s_frequency (struct file *file, void *priv,</div><div class='ctx'> 			       struct v4l2_frequency *f)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct radio_device *card=dev-&gt;priv;</div><div class='add'>+	struct radio_device *card = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	if (f-&gt;frequency &lt; FREQ_LO || f-&gt;frequency &gt; FREQ_HI) {</div><div class='ctx'> 		dprintk(1, "radio freq (%d.%02d MHz) out of range (%d-%d)\n",</div><div class='hunk'>@@ -312,8 +322,7 @@ static int vidioc_s_frequency (struct file *file, void *priv,</div><div class='ctx'> static int vidioc_g_frequency (struct file *file, void *priv,</div><div class='ctx'> 			       struct v4l2_frequency *f)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct radio_device *card=dev-&gt;priv;</div><div class='add'>+	struct radio_device *card = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	f-&gt;type = V4L2_TUNER_RADIO;</div><div class='ctx'> 	f-&gt;frequency = card-&gt;freq;</div><div class='hunk'>@@ -343,8 +352,7 @@ static int vidioc_queryctrl (struct file *file, void *priv,</div><div class='ctx'> static int vidioc_g_ctrl (struct file *file, void *priv,</div><div class='ctx'> 			    struct v4l2_control *ctrl)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct radio_device *card=dev-&gt;priv;</div><div class='add'>+	struct radio_device *card = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	switch (ctrl-&gt;id) {</div><div class='ctx'> 		case V4L2_CID_AUDIO_MUTE:</div><div class='hunk'>@@ -358,8 +366,7 @@ static int vidioc_g_ctrl (struct file *file, void *priv,</div><div class='ctx'> static int vidioc_s_ctrl (struct file *file, void *priv,</div><div class='ctx'> 			  struct v4l2_control *ctrl)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct radio_device *card=dev-&gt;priv;</div><div class='add'>+	struct radio_device *card = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	switch (ctrl-&gt;id) {</div><div class='ctx'> 		case V4L2_CID_AUDIO_MUTE:</div><div class='hunk'>@@ -390,9 +397,10 @@ static const struct v4l2_ioctl_ops maxiradio_ioctl_ops = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct video_device maxiradio_radio = {</div><div class='del'>-	.name		    = "Maxi Radio FM2000 radio",</div><div class='del'>-	.fops               = &amp;maxiradio_fops,</div><div class='del'>-	.ioctl_ops 	    = &amp;maxiradio_ioctl_ops,</div><div class='add'>+	.name		= "Maxi Radio FM2000 radio",</div><div class='add'>+	.fops           = &amp;maxiradio_fops,</div><div class='add'>+	.ioctl_ops 	= &amp;maxiradio_ioctl_ops,</div><div class='add'>+	.release	= video_device_release_empty,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __devinit maxiradio_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='hunk'>@@ -408,7 +416,7 @@ static int __devinit maxiradio_init_one(struct pci_dev *pdev, const struct pci_d</div><div class='ctx'> </div><div class='ctx'> 	radio_unit.io = pci_resource_start(pdev, 0);</div><div class='ctx'> 	mutex_init(&amp;radio_unit.lock);</div><div class='del'>-	maxiradio_radio.priv = &amp;radio_unit;</div><div class='add'>+	video_set_drvdata(&amp;maxiradio_radio, &amp;radio_unit);</div><div class='ctx'> </div><div class='ctx'> 	if (video_register_device(&amp;maxiradio_radio, VFL_TYPE_RADIO, radio_nr) &lt; 0) {</div><div class='ctx'> 		printk("radio-maxiradio: can't register device!");</div><div class='head'>diff --git a/drivers/media/radio/radio-mr800.c b/drivers/media/radio/radio-mr800.c<br/>new file mode 100644<br/>index 000000000000..a33717c48003<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/radio/radio-mr800.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/radio/radio-mr800.c</a></div><div class='hunk'>@@ -0,0 +1,628 @@</div><div class='add'>+/*</div><div class='add'>+ * A driver for the AverMedia MR 800 USB FM radio. This device plugs</div><div class='add'>+ * into both the USB and an analog audio input, so this thing</div><div class='add'>+ * only deals with initialization and frequency setting, the</div><div class='add'>+ * audio data has to be handled by a sound driver.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2008 Alexey Klimov &lt;klimov.linux@gmail.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Big thanks to authors of dsbr100.c and radio-si470x.c</div><div class='add'>+ *</div><div class='add'>+ * When work was looked pretty good, i discover this:</div><div class='add'>+ * http://av-usbradio.sourceforge.net/index.php</div><div class='add'>+ * http://sourceforge.net/projects/av-usbradio/</div><div class='add'>+ * Latest release of theirs project was in 2005.</div><div class='add'>+ * Probably, this driver could be improved trough using their</div><div class='add'>+ * achievements (specifications given).</div><div class='add'>+ * So, we have smth to begin with.</div><div class='add'>+ *</div><div class='add'>+ * History:</div><div class='add'>+ * Version 0.01:	First working version.</div><div class='add'>+ * 			It's required to blacklist AverMedia USB Radio</div><div class='add'>+ * 			in usbhid/hid-quirks.c</div><div class='add'>+ *</div><div class='add'>+ * Many things to do:</div><div class='add'>+ * 	- Correct power managment of device (suspend &amp; resume)</div><div class='add'>+ * 	- Make x86 independance (little-endian and big-endian stuff)</div><div class='add'>+ * 	- Add code for scanning and smooth tuning</div><div class='add'>+ * 	- Checked and add stereo&amp;mono stuff</div><div class='add'>+ * 	- Add code for sensitivity value</div><div class='add'>+ * 	- Correct mistakes</div><div class='add'>+ * 	- In Japan another FREQ_MIN and FREQ_MAX</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* kernel includes */</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/input.h&gt;</div><div class='add'>+#include &lt;linux/videodev2.h&gt;</div><div class='add'>+#include &lt;media/v4l2-common.h&gt;</div><div class='add'>+#include &lt;media/v4l2-ioctl.h&gt;</div><div class='add'>+#include &lt;linux/usb.h&gt;</div><div class='add'>+#include &lt;linux/version.h&gt;	/* for KERNEL_VERSION MACRO */</div><div class='add'>+</div><div class='add'>+/* driver and module definitions */</div><div class='add'>+#define DRIVER_AUTHOR "Alexey Klimov &lt;klimov.linux@gmail.com&gt;"</div><div class='add'>+#define DRIVER_DESC "AverMedia MR 800 USB FM radio driver"</div><div class='add'>+#define DRIVER_VERSION "0.01"</div><div class='add'>+#define RADIO_VERSION KERNEL_VERSION(0, 0, 1)</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR(DRIVER_AUTHOR);</div><div class='add'>+MODULE_DESCRIPTION(DRIVER_DESC);</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='add'>+#define USB_AMRADIO_VENDOR 0x07ca</div><div class='add'>+#define USB_AMRADIO_PRODUCT 0xb800</div><div class='add'>+</div><div class='add'>+/* Probably USB_TIMEOUT should be modified in module parameter */</div><div class='add'>+#define BUFFER_LENGTH 8</div><div class='add'>+#define USB_TIMEOUT 500</div><div class='add'>+</div><div class='add'>+/* Frequency limits in MHz -- these are European values.  For Japanese</div><div class='add'>+devices, that would be 76 and 91.  */</div><div class='add'>+#define FREQ_MIN  87.5</div><div class='add'>+#define FREQ_MAX 108.0</div><div class='add'>+#define FREQ_MUL 16000</div><div class='add'>+</div><div class='add'>+/* module parameter */</div><div class='add'>+static int radio_nr = -1;</div><div class='add'>+module_param(radio_nr, int, 0);</div><div class='add'>+MODULE_PARM_DESC(radio_nr, "Radio Nr");</div><div class='add'>+</div><div class='add'>+static struct v4l2_queryctrl radio_qctrl[] = {</div><div class='add'>+	{</div><div class='add'>+		.id            = V4L2_CID_AUDIO_MUTE,</div><div class='add'>+		.name          = "Mute",</div><div class='add'>+		.minimum       = 0,</div><div class='add'>+		.maximum       = 1,</div><div class='add'>+		.step	       = 1,</div><div class='add'>+		.default_value = 1,</div><div class='add'>+		.type          = V4L2_CTRL_TYPE_BOOLEAN,</div><div class='add'>+	},</div><div class='add'>+/* HINT: the disabled controls are only here to satify kradio and such apps */</div><div class='add'>+	{	.id		= V4L2_CID_AUDIO_VOLUME,</div><div class='add'>+		.flags		= V4L2_CTRL_FLAG_DISABLED,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.id		= V4L2_CID_AUDIO_BALANCE,</div><div class='add'>+		.flags		= V4L2_CTRL_FLAG_DISABLED,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.id		= V4L2_CID_AUDIO_BASS,</div><div class='add'>+		.flags		= V4L2_CTRL_FLAG_DISABLED,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.id		= V4L2_CID_AUDIO_TREBLE,</div><div class='add'>+		.flags		= V4L2_CTRL_FLAG_DISABLED,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.id		= V4L2_CID_AUDIO_LOUDNESS,</div><div class='add'>+		.flags		= V4L2_CTRL_FLAG_DISABLED,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int usb_amradio_probe(struct usb_interface *intf,</div><div class='add'>+			     const struct usb_device_id *id);</div><div class='add'>+static void usb_amradio_disconnect(struct usb_interface *intf);</div><div class='add'>+static int usb_amradio_open(struct inode *inode, struct file *file);</div><div class='add'>+static int usb_amradio_close(struct inode *inode, struct file *file);</div><div class='add'>+static int usb_amradio_suspend(struct usb_interface *intf,</div><div class='add'>+				pm_message_t message);</div><div class='add'>+static int usb_amradio_resume(struct usb_interface *intf);</div><div class='add'>+</div><div class='add'>+/* Data for one (physical) device */</div><div class='add'>+struct amradio_device {</div><div class='add'>+	/* reference to USB and video device */</div><div class='add'>+	struct usb_device *usbdev;</div><div class='add'>+	struct video_device *videodev;</div><div class='add'>+</div><div class='add'>+	unsigned char *buffer;</div><div class='add'>+	struct mutex lock;	/* buffer locking */</div><div class='add'>+	int curfreq;</div><div class='add'>+	int stereo;</div><div class='add'>+	int users;</div><div class='add'>+	int removed;</div><div class='add'>+	int muted;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* USB Device ID List */</div><div class='add'>+static struct usb_device_id usb_amradio_device_table[] = {</div><div class='add'>+	{USB_DEVICE_AND_INTERFACE_INFO(USB_AMRADIO_VENDOR, USB_AMRADIO_PRODUCT,</div><div class='add'>+							USB_CLASS_HID, 0, 0) },</div><div class='add'>+	{ }						/* Terminating entry */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_DEVICE_TABLE(usb, usb_amradio_device_table);</div><div class='add'>+</div><div class='add'>+/* USB subsystem interface */</div><div class='add'>+static struct usb_driver usb_amradio_driver = {</div><div class='add'>+	.name			= "radio-mr800",</div><div class='add'>+	.probe			= usb_amradio_probe,</div><div class='add'>+	.disconnect		= usb_amradio_disconnect,</div><div class='add'>+	.suspend		= usb_amradio_suspend,</div><div class='add'>+	.resume			= usb_amradio_resume,</div><div class='add'>+	.reset_resume		= usb_amradio_resume,</div><div class='add'>+	.id_table		= usb_amradio_device_table,</div><div class='add'>+	.supports_autosuspend	= 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* switch on radio. Send 8 bytes to device. */</div><div class='add'>+static int amradio_start(struct amradio_device *radio)</div><div class='add'>+{</div><div class='add'>+	int retval;</div><div class='add'>+	int size;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;radio-&gt;lock);</div><div class='add'>+</div><div class='add'>+	radio-&gt;buffer[0] = 0x00;</div><div class='add'>+	radio-&gt;buffer[1] = 0x55;</div><div class='add'>+	radio-&gt;buffer[2] = 0xaa;</div><div class='add'>+	radio-&gt;buffer[3] = 0x00;</div><div class='add'>+	radio-&gt;buffer[4] = 0xab;</div><div class='add'>+	radio-&gt;buffer[5] = 0x00;</div><div class='add'>+	radio-&gt;buffer[6] = 0x00;</div><div class='add'>+	radio-&gt;buffer[7] = 0x00;</div><div class='add'>+</div><div class='add'>+	retval = usb_bulk_msg(radio-&gt;usbdev, usb_sndintpipe(radio-&gt;usbdev, 2),</div><div class='add'>+		(void *) (radio-&gt;buffer), BUFFER_LENGTH, &amp;size, USB_TIMEOUT);</div><div class='add'>+</div><div class='add'>+	if (retval) {</div><div class='add'>+		mutex_unlock(&amp;radio-&gt;lock);</div><div class='add'>+		return retval;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;radio-&gt;lock);</div><div class='add'>+</div><div class='add'>+	radio-&gt;muted = 0;</div><div class='add'>+</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* switch off radio */</div><div class='add'>+static int amradio_stop(struct amradio_device *radio)</div><div class='add'>+{</div><div class='add'>+	int retval;</div><div class='add'>+	int size;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;radio-&gt;lock);</div><div class='add'>+</div><div class='add'>+	radio-&gt;buffer[0] = 0x00;</div><div class='add'>+	radio-&gt;buffer[1] = 0x55;</div><div class='add'>+	radio-&gt;buffer[2] = 0xaa;</div><div class='add'>+	radio-&gt;buffer[3] = 0x00;</div><div class='add'>+	radio-&gt;buffer[4] = 0xab;</div><div class='add'>+	radio-&gt;buffer[5] = 0x01;</div><div class='add'>+	radio-&gt;buffer[6] = 0x00;</div><div class='add'>+	radio-&gt;buffer[7] = 0x00;</div><div class='add'>+</div><div class='add'>+	retval = usb_bulk_msg(radio-&gt;usbdev, usb_sndintpipe(radio-&gt;usbdev, 2),</div><div class='add'>+		(void *) (radio-&gt;buffer), BUFFER_LENGTH, &amp;size, USB_TIMEOUT);</div><div class='add'>+</div><div class='add'>+	if (retval) {</div><div class='add'>+		mutex_unlock(&amp;radio-&gt;lock);</div><div class='add'>+		return retval;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;radio-&gt;lock);</div><div class='add'>+</div><div class='add'>+	radio-&gt;muted = 1;</div><div class='add'>+</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* set a frequency, freq is defined by v4l's TUNER_LOW, i.e. 1/16th kHz */</div><div class='add'>+static int amradio_setfreq(struct amradio_device *radio, int freq)</div><div class='add'>+{</div><div class='add'>+	int retval;</div><div class='add'>+	int size;</div><div class='add'>+	unsigned short freq_send = 0x13 + (freq &gt;&gt; 3) / 25;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;radio-&gt;lock);</div><div class='add'>+</div><div class='add'>+	radio-&gt;buffer[0] = 0x00;</div><div class='add'>+	radio-&gt;buffer[1] = 0x55;</div><div class='add'>+	radio-&gt;buffer[2] = 0xaa;</div><div class='add'>+	radio-&gt;buffer[3] = 0x03;</div><div class='add'>+	radio-&gt;buffer[4] = 0xa4;</div><div class='add'>+	radio-&gt;buffer[5] = 0x00;</div><div class='add'>+	radio-&gt;buffer[6] = 0x00;</div><div class='add'>+	radio-&gt;buffer[7] = 0x08;</div><div class='add'>+</div><div class='add'>+	retval = usb_bulk_msg(radio-&gt;usbdev, usb_sndintpipe(radio-&gt;usbdev, 2),</div><div class='add'>+		(void *) (radio-&gt;buffer), BUFFER_LENGTH, &amp;size, USB_TIMEOUT);</div><div class='add'>+</div><div class='add'>+	if (retval) {</div><div class='add'>+		mutex_unlock(&amp;radio-&gt;lock);</div><div class='add'>+		return retval;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* frequency is calculated from freq_send and placed in first 2 bytes */</div><div class='add'>+	radio-&gt;buffer[0] = (freq_send &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+	radio-&gt;buffer[1] = freq_send &amp; 0xff;</div><div class='add'>+	radio-&gt;buffer[2] = 0x01;</div><div class='add'>+	radio-&gt;buffer[3] = 0x00;</div><div class='add'>+	radio-&gt;buffer[4] = 0x00;</div><div class='add'>+	/* 5 and 6 bytes of buffer already = 0x00 */</div><div class='add'>+	radio-&gt;buffer[7] = 0x00;</div><div class='add'>+</div><div class='add'>+	retval = usb_bulk_msg(radio-&gt;usbdev, usb_sndintpipe(radio-&gt;usbdev, 2),</div><div class='add'>+		(void *) (radio-&gt;buffer), BUFFER_LENGTH, &amp;size, USB_TIMEOUT);</div><div class='add'>+</div><div class='add'>+	if (retval) {</div><div class='add'>+		mutex_unlock(&amp;radio-&gt;lock);</div><div class='add'>+		return retval;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;radio-&gt;lock);</div><div class='add'>+</div><div class='add'>+	radio-&gt;stereo = 0;</div><div class='add'>+</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* USB subsystem interface begins here */</div><div class='add'>+</div><div class='add'>+/* handle unplugging of the device, release data structures</div><div class='add'>+if nothing keeps us from doing it.  If something is still</div><div class='add'>+keeping us busy, the release callback of v4l will take care</div><div class='add'>+of releasing it. */</div><div class='add'>+static void usb_amradio_disconnect(struct usb_interface *intf)</div><div class='add'>+{</div><div class='add'>+	struct amradio_device *radio = usb_get_intfdata(intf);</div><div class='add'>+</div><div class='add'>+	usb_set_intfdata(intf, NULL);</div><div class='add'>+</div><div class='add'>+	if (radio) {</div><div class='add'>+		video_unregister_device(radio-&gt;videodev);</div><div class='add'>+		radio-&gt;videodev = NULL;</div><div class='add'>+		if (radio-&gt;users) {</div><div class='add'>+			kfree(radio-&gt;buffer);</div><div class='add'>+			kfree(radio);</div><div class='add'>+		} else {</div><div class='add'>+			radio-&gt;removed = 1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* vidioc_querycap - query device capabilities */</div><div class='add'>+static int vidioc_querycap(struct file *file, void *priv,</div><div class='add'>+					struct v4l2_capability *v)</div><div class='add'>+{</div><div class='add'>+	strlcpy(v-&gt;driver, "radio-mr800", sizeof(v-&gt;driver));</div><div class='add'>+	strlcpy(v-&gt;card, "AverMedia MR 800 USB FM Radio", sizeof(v-&gt;card));</div><div class='add'>+	sprintf(v-&gt;bus_info, "USB");</div><div class='add'>+	v-&gt;version = RADIO_VERSION;</div><div class='add'>+	v-&gt;capabilities = V4L2_CAP_TUNER;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* vidioc_g_tuner - get tuner attributes */</div><div class='add'>+static int vidioc_g_tuner(struct file *file, void *priv,</div><div class='add'>+				struct v4l2_tuner *v)</div><div class='add'>+{</div><div class='add'>+	struct amradio_device *radio = video_get_drvdata(video_devdata(file));</div><div class='add'>+</div><div class='add'>+	if (v-&gt;index &gt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+/* TODO: Add function which look is signal stereo or not</div><div class='add'>+ * 	amradio_getstat(radio);</div><div class='add'>+ */</div><div class='add'>+	radio-&gt;stereo = -1;</div><div class='add'>+	strcpy(v-&gt;name, "FM");</div><div class='add'>+	v-&gt;type = V4L2_TUNER_RADIO;</div><div class='add'>+	v-&gt;rangelow = FREQ_MIN * FREQ_MUL;</div><div class='add'>+	v-&gt;rangehigh = FREQ_MAX * FREQ_MUL;</div><div class='add'>+	v-&gt;rxsubchans = V4L2_TUNER_SUB_MONO | V4L2_TUNER_SUB_STEREO;</div><div class='add'>+	v-&gt;capability = V4L2_TUNER_CAP_LOW;</div><div class='add'>+	if (radio-&gt;stereo)</div><div class='add'>+		v-&gt;audmode = V4L2_TUNER_MODE_STEREO;</div><div class='add'>+	else</div><div class='add'>+		v-&gt;audmode = V4L2_TUNER_MODE_MONO;</div><div class='add'>+	v-&gt;signal = 0xffff;     /* Can't get the signal strength, sad.. */</div><div class='add'>+	v-&gt;afc = 0; /* Don't know what is this */</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* vidioc_s_tuner - set tuner attributes */</div><div class='add'>+static int vidioc_s_tuner(struct file *file, void *priv,</div><div class='add'>+				struct v4l2_tuner *v)</div><div class='add'>+{</div><div class='add'>+	if (v-&gt;index &gt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* vidioc_s_frequency - set tuner radio frequency */</div><div class='add'>+static int vidioc_s_frequency(struct file *file, void *priv,</div><div class='add'>+				struct v4l2_frequency *f)</div><div class='add'>+{</div><div class='add'>+	struct amradio_device *radio = video_get_drvdata(video_devdata(file));</div><div class='add'>+</div><div class='add'>+	radio-&gt;curfreq = f-&gt;frequency;</div><div class='add'>+	if (amradio_setfreq(radio, radio-&gt;curfreq) &lt; 0)</div><div class='add'>+		warn("Set frequency failed");</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* vidioc_g_frequency - get tuner radio frequency */</div><div class='add'>+static int vidioc_g_frequency(struct file *file, void *priv,</div><div class='add'>+				struct v4l2_frequency *f)</div><div class='add'>+{</div><div class='add'>+	struct amradio_device *radio = video_get_drvdata(video_devdata(file));</div><div class='add'>+</div><div class='add'>+	f-&gt;type = V4L2_TUNER_RADIO;</div><div class='add'>+	f-&gt;frequency = radio-&gt;curfreq;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* vidioc_queryctrl - enumerate control items */</div><div class='add'>+static int vidioc_queryctrl(struct file *file, void *priv,</div><div class='add'>+				struct v4l2_queryctrl *qc)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(radio_qctrl); i++) {</div><div class='add'>+		if (qc-&gt;id &amp;&amp; qc-&gt;id == radio_qctrl[i].id) {</div><div class='add'>+			memcpy(qc, &amp;(radio_qctrl[i]),</div><div class='add'>+						sizeof(*qc));</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* vidioc_g_ctrl - get the value of a control */</div><div class='add'>+static int vidioc_g_ctrl(struct file *file, void *priv,</div><div class='add'>+				struct v4l2_control *ctrl)</div><div class='add'>+{</div><div class='add'>+	struct amradio_device *radio = video_get_drvdata(video_devdata(file));</div><div class='add'>+</div><div class='add'>+	switch (ctrl-&gt;id) {</div><div class='add'>+	case V4L2_CID_AUDIO_MUTE:</div><div class='add'>+		ctrl-&gt;value = radio-&gt;muted;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* vidioc_s_ctrl - set the value of a control */</div><div class='add'>+static int vidioc_s_ctrl(struct file *file, void *priv,</div><div class='add'>+				struct v4l2_control *ctrl)</div><div class='add'>+{</div><div class='add'>+	struct amradio_device *radio = video_get_drvdata(video_devdata(file));</div><div class='add'>+</div><div class='add'>+	switch (ctrl-&gt;id) {</div><div class='add'>+	case V4L2_CID_AUDIO_MUTE:</div><div class='add'>+		if (ctrl-&gt;value) {</div><div class='add'>+			if (amradio_stop(radio) &lt; 0) {</div><div class='add'>+				warn("amradio_stop() failed");</div><div class='add'>+				return -1;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			if (amradio_start(radio) &lt; 0) {</div><div class='add'>+				warn("amradio_start() failed");</div><div class='add'>+				return -1;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* vidioc_g_audio - get audio attributes */</div><div class='add'>+static int vidioc_g_audio(struct file *file, void *priv,</div><div class='add'>+				struct v4l2_audio *a)</div><div class='add'>+{</div><div class='add'>+	if (a-&gt;index &gt; 1)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	strcpy(a-&gt;name, "Radio");</div><div class='add'>+	a-&gt;capability = V4L2_AUDCAP_STEREO;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* vidioc_s_audio - set audio attributes  */</div><div class='add'>+static int vidioc_s_audio(struct file *file, void *priv,</div><div class='add'>+					struct v4l2_audio *a)</div><div class='add'>+{</div><div class='add'>+	if (a-&gt;index != 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* vidioc_g_input - get input */</div><div class='add'>+static int vidioc_g_input(struct file *filp, void *priv, unsigned int *i)</div><div class='add'>+{</div><div class='add'>+	*i = 0;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* vidioc_s_input - set input */</div><div class='add'>+static int vidioc_s_input(struct file *filp, void *priv, unsigned int i)</div><div class='add'>+{</div><div class='add'>+	if (i != 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* open device - amradio_start() and amradio_setfreq() */</div><div class='add'>+static int usb_amradio_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct amradio_device *radio = video_get_drvdata(video_devdata(file));</div><div class='add'>+</div><div class='add'>+	radio-&gt;users = 1;</div><div class='add'>+	radio-&gt;muted = 1;</div><div class='add'>+</div><div class='add'>+	if (amradio_start(radio) &lt; 0) {</div><div class='add'>+		warn("Radio did not start up properly");</div><div class='add'>+		radio-&gt;users = 0;</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+	if (amradio_setfreq(radio, radio-&gt;curfreq) &lt; 0)</div><div class='add'>+		warn("Set frequency failed");</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*close device - free driver structures */</div><div class='add'>+static int usb_amradio_close(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct amradio_device *radio = video_get_drvdata(video_devdata(file));</div><div class='add'>+</div><div class='add'>+	if (!radio)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	radio-&gt;users = 0;</div><div class='add'>+	if (radio-&gt;removed) {</div><div class='add'>+		kfree(radio-&gt;buffer);</div><div class='add'>+		kfree(radio);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Suspend device - stop device. Need to be checked and fixed */</div><div class='add'>+static int usb_amradio_suspend(struct usb_interface *intf, pm_message_t message)</div><div class='add'>+{</div><div class='add'>+	struct amradio_device *radio = usb_get_intfdata(intf);</div><div class='add'>+</div><div class='add'>+	if (amradio_stop(radio) &lt; 0)</div><div class='add'>+		warn("amradio_stop() failed");</div><div class='add'>+</div><div class='add'>+	info("radio-mr800: Going into suspend..");</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Resume device - start device. Need to be checked and fixed */</div><div class='add'>+static int usb_amradio_resume(struct usb_interface *intf)</div><div class='add'>+{</div><div class='add'>+	struct amradio_device *radio = usb_get_intfdata(intf);</div><div class='add'>+</div><div class='add'>+	if (amradio_start(radio) &lt; 0)</div><div class='add'>+		warn("amradio_start() failed");</div><div class='add'>+</div><div class='add'>+	info("radio-mr800: Coming out of suspend..");</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* File system interface */</div><div class='add'>+static const struct file_operations usb_amradio_fops = {</div><div class='add'>+	.owner		= THIS_MODULE,</div><div class='add'>+	.open		= usb_amradio_open,</div><div class='add'>+	.release	= usb_amradio_close,</div><div class='add'>+	.ioctl		= video_ioctl2,</div><div class='add'>+#ifdef CONFIG_COMPAT</div><div class='add'>+	.compat_ioctl	= v4l_compat_ioctl32,</div><div class='add'>+#endif</div><div class='add'>+	.llseek		= no_llseek,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct v4l2_ioctl_ops usb_amradio_ioctl_ops = {</div><div class='add'>+	.vidioc_querycap    = vidioc_querycap,</div><div class='add'>+	.vidioc_g_tuner     = vidioc_g_tuner,</div><div class='add'>+	.vidioc_s_tuner     = vidioc_s_tuner,</div><div class='add'>+	.vidioc_g_frequency = vidioc_g_frequency,</div><div class='add'>+	.vidioc_s_frequency = vidioc_s_frequency,</div><div class='add'>+	.vidioc_queryctrl   = vidioc_queryctrl,</div><div class='add'>+	.vidioc_g_ctrl      = vidioc_g_ctrl,</div><div class='add'>+	.vidioc_s_ctrl      = vidioc_s_ctrl,</div><div class='add'>+	.vidioc_g_audio     = vidioc_g_audio,</div><div class='add'>+	.vidioc_s_audio     = vidioc_s_audio,</div><div class='add'>+	.vidioc_g_input     = vidioc_g_input,</div><div class='add'>+	.vidioc_s_input     = vidioc_s_input,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* V4L2 interface */</div><div class='add'>+static struct video_device amradio_videodev_template = {</div><div class='add'>+	.name		= "AverMedia MR 800 USB FM Radio",</div><div class='add'>+	.fops		= &amp;usb_amradio_fops,</div><div class='add'>+	.ioctl_ops 	= &amp;usb_amradio_ioctl_ops,</div><div class='add'>+	.release	= video_device_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* check if the device is present and register with v4l and</div><div class='add'>+usb if it is */</div><div class='add'>+static int usb_amradio_probe(struct usb_interface *intf,</div><div class='add'>+				const struct usb_device_id *id)</div><div class='add'>+{</div><div class='add'>+	struct amradio_device *radio;</div><div class='add'>+</div><div class='add'>+	radio = kmalloc(sizeof(struct amradio_device), GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (!(radio))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	radio-&gt;buffer = kmalloc(BUFFER_LENGTH, GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (!(radio-&gt;buffer)) {</div><div class='add'>+		kfree(radio);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	radio-&gt;videodev = video_device_alloc();</div><div class='add'>+</div><div class='add'>+	if (!(radio-&gt;videodev)) {</div><div class='add'>+		kfree(radio-&gt;buffer);</div><div class='add'>+		kfree(radio);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(radio-&gt;videodev, &amp;amradio_videodev_template,</div><div class='add'>+		sizeof(amradio_videodev_template));</div><div class='add'>+</div><div class='add'>+	radio-&gt;removed = 0;</div><div class='add'>+	radio-&gt;users = 0;</div><div class='add'>+	radio-&gt;usbdev = interface_to_usbdev(intf);</div><div class='add'>+	radio-&gt;curfreq = 95.16 * FREQ_MUL;</div><div class='add'>+</div><div class='add'>+	mutex_init(&amp;radio-&gt;lock);</div><div class='add'>+</div><div class='add'>+	video_set_drvdata(radio-&gt;videodev, radio);</div><div class='add'>+	if (video_register_device(radio-&gt;videodev, VFL_TYPE_RADIO, radio_nr)) {</div><div class='add'>+		warn("Could not register video device");</div><div class='add'>+		video_device_release(radio-&gt;videodev);</div><div class='add'>+		kfree(radio-&gt;buffer);</div><div class='add'>+		kfree(radio);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	usb_set_intfdata(intf, radio);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init amradio_init(void)</div><div class='add'>+{</div><div class='add'>+	int retval = usb_register(&amp;usb_amradio_driver);</div><div class='add'>+</div><div class='add'>+	info(DRIVER_VERSION " " DRIVER_DESC);</div><div class='add'>+	if (retval)</div><div class='add'>+		err("usb_register failed. Error number %d", retval);</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit amradio_exit(void)</div><div class='add'>+{</div><div class='add'>+	usb_deregister(&amp;usb_amradio_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(amradio_init);</div><div class='add'>+module_exit(amradio_exit);</div><div class='add'>+</div><div class='head'>diff --git a/drivers/media/radio/radio-rtrack2.c b/drivers/media/radio/radio-rtrack2.c<br/>index 6d820e2481e7..a67079777419 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/radio/radio-rtrack2.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/radio/radio-rtrack2.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/radio/radio-rtrack2.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/radio/radio-rtrack2.c</a></div><div class='hunk'>@@ -52,6 +52,7 @@ static spinlock_t lock;</div><div class='ctx'> </div><div class='ctx'> struct rt_device</div><div class='ctx'> {</div><div class='add'>+	unsigned long in_use;</div><div class='ctx'> 	int port;</div><div class='ctx'> 	unsigned long curfreq;</div><div class='ctx'> 	int muted;</div><div class='hunk'>@@ -153,8 +154,7 @@ static int rt_getsigstr(struct rt_device *dev)</div><div class='ctx'> static int vidioc_g_tuner(struct file *file, void *priv,</div><div class='ctx'> 				struct v4l2_tuner *v)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct rt_device *rt = dev-&gt;priv;</div><div class='add'>+	struct rt_device *rt = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	if (v-&gt;index &gt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -173,8 +173,7 @@ static int vidioc_g_tuner(struct file *file, void *priv,</div><div class='ctx'> static int vidioc_s_frequency(struct file *file, void *priv,</div><div class='ctx'> 				struct v4l2_frequency *f)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct rt_device *rt = dev-&gt;priv;</div><div class='add'>+	struct rt_device *rt = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	rt-&gt;curfreq = f-&gt;frequency;</div><div class='ctx'> 	rt_setfreq(rt, rt-&gt;curfreq);</div><div class='hunk'>@@ -184,8 +183,7 @@ static int vidioc_s_frequency(struct file *file, void *priv,</div><div class='ctx'> static int vidioc_g_frequency(struct file *file, void *priv,</div><div class='ctx'> 				struct v4l2_frequency *f)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct rt_device *rt = dev-&gt;priv;</div><div class='add'>+	struct rt_device *rt = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	f-&gt;type = V4L2_TUNER_RADIO;</div><div class='ctx'> 	f-&gt;frequency = rt-&gt;curfreq;</div><div class='hunk'>@@ -210,8 +208,7 @@ static int vidioc_queryctrl(struct file *file, void *priv,</div><div class='ctx'> static int vidioc_g_ctrl(struct file *file, void *priv,</div><div class='ctx'> 				struct v4l2_control *ctrl)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct rt_device *rt = dev-&gt;priv;</div><div class='add'>+	struct rt_device *rt = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	switch (ctrl-&gt;id) {</div><div class='ctx'> 	case V4L2_CID_AUDIO_MUTE:</div><div class='hunk'>@@ -230,8 +227,7 @@ static int vidioc_g_ctrl(struct file *file, void *priv,</div><div class='ctx'> static int vidioc_s_ctrl(struct file *file, void *priv,</div><div class='ctx'> 				struct v4l2_control *ctrl)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct rt_device *rt = dev-&gt;priv;</div><div class='add'>+	struct rt_device *rt = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	switch (ctrl-&gt;id) {</div><div class='ctx'> 	case V4L2_CID_AUDIO_MUTE:</div><div class='hunk'>@@ -284,10 +280,21 @@ static int vidioc_s_audio(struct file *file, void *priv,</div><div class='ctx'> </div><div class='ctx'> static struct rt_device rtrack2_unit;</div><div class='ctx'> </div><div class='add'>+static int rtrack2_exclusive_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	return test_and_set_bit(0, &amp;rtrack2_unit.in_use) ? -EBUSY : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtrack2_exclusive_release(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	clear_bit(0, &amp;rtrack2_unit.in_use);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct file_operations rtrack2_fops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='del'>-	.open           = video_exclusive_open,</div><div class='del'>-	.release        = video_exclusive_release,</div><div class='add'>+	.open           = rtrack2_exclusive_open,</div><div class='add'>+	.release        = rtrack2_exclusive_release,</div><div class='ctx'> 	.ioctl		= video_ioctl2,</div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='ctx'> 	.compat_ioctl	= v4l_compat_ioctl32,</div><div class='hunk'>@@ -314,6 +321,7 @@ static struct video_device rtrack2_radio = {</div><div class='ctx'> 	.name		= "RadioTrack II radio",</div><div class='ctx'> 	.fops           = &amp;rtrack2_fops,</div><div class='ctx'> 	.ioctl_ops 	= &amp;rtrack2_ioctl_ops,</div><div class='add'>+	.release	= video_device_release_empty,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init rtrack2_init(void)</div><div class='hunk'>@@ -329,7 +337,7 @@ static int __init rtrack2_init(void)</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rtrack2_radio.priv=&amp;rtrack2_unit;</div><div class='add'>+	video_set_drvdata(&amp;rtrack2_radio, &amp;rtrack2_unit);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;lock);</div><div class='ctx'> 	if (video_register_device(&amp;rtrack2_radio, VFL_TYPE_RADIO, radio_nr) &lt; 0) {</div><div class='head'>diff --git a/drivers/media/radio/radio-sf16fmi.c b/drivers/media/radio/radio-sf16fmi.c<br/>index 0d478f54a907..329c90bddadd 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/radio/radio-sf16fmi.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/radio/radio-sf16fmi.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/radio/radio-sf16fmi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/radio/radio-sf16fmi.c</a></div><div class='hunk'>@@ -45,6 +45,7 @@ static struct v4l2_queryctrl radio_qctrl[] = {</div><div class='ctx'> </div><div class='ctx'> struct fmi_device</div><div class='ctx'> {</div><div class='add'>+	unsigned long in_use;</div><div class='ctx'> 	int port;</div><div class='ctx'> 	int curvol; /* 1 or 0 */</div><div class='ctx'> 	unsigned long curfreq; /* freq in kHz */</div><div class='hunk'>@@ -146,8 +147,7 @@ static int vidioc_g_tuner(struct file *file, void *priv,</div><div class='ctx'> 					struct v4l2_tuner *v)</div><div class='ctx'> {</div><div class='ctx'> 	int mult;</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct fmi_device *fmi = dev-&gt;priv;</div><div class='add'>+	struct fmi_device *fmi = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	if (v-&gt;index &gt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -175,8 +175,7 @@ static int vidioc_s_tuner(struct file *file, void *priv,</div><div class='ctx'> static int vidioc_s_frequency(struct file *file, void *priv,</div><div class='ctx'> 					struct v4l2_frequency *f)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct fmi_device *fmi = dev-&gt;priv;</div><div class='add'>+	struct fmi_device *fmi = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	if (!(fmi-&gt;flags &amp; V4L2_TUNER_CAP_LOW))</div><div class='ctx'> 		f-&gt;frequency *= 1000;</div><div class='hunk'>@@ -193,8 +192,7 @@ static int vidioc_s_frequency(struct file *file, void *priv,</div><div class='ctx'> static int vidioc_g_frequency(struct file *file, void *priv,</div><div class='ctx'> 					struct v4l2_frequency *f)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct fmi_device *fmi = dev-&gt;priv;</div><div class='add'>+	struct fmi_device *fmi = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	f-&gt;type = V4L2_TUNER_RADIO;</div><div class='ctx'> 	f-&gt;frequency = fmi-&gt;curfreq;</div><div class='hunk'>@@ -221,8 +219,7 @@ static int vidioc_queryctrl(struct file *file, void *priv,</div><div class='ctx'> static int vidioc_g_ctrl(struct file *file, void *priv,</div><div class='ctx'> 					struct v4l2_control *ctrl)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct fmi_device *fmi = dev-&gt;priv;</div><div class='add'>+	struct fmi_device *fmi = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	switch (ctrl-&gt;id) {</div><div class='ctx'> 	case V4L2_CID_AUDIO_MUTE:</div><div class='hunk'>@@ -235,8 +232,7 @@ static int vidioc_g_ctrl(struct file *file, void *priv,</div><div class='ctx'> static int vidioc_s_ctrl(struct file *file, void *priv,</div><div class='ctx'> 					struct v4l2_control *ctrl)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct fmi_device *fmi = dev-&gt;priv;</div><div class='add'>+	struct fmi_device *fmi = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	switch (ctrl-&gt;id) {</div><div class='ctx'> 	case V4L2_CID_AUDIO_MUTE:</div><div class='hunk'>@@ -284,10 +280,21 @@ static int vidioc_s_audio(struct file *file, void *priv,</div><div class='ctx'> </div><div class='ctx'> static struct fmi_device fmi_unit;</div><div class='ctx'> </div><div class='add'>+static int fmi_exclusive_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	return test_and_set_bit(0, &amp;fmi_unit.in_use) ? -EBUSY : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fmi_exclusive_release(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	clear_bit(0, &amp;fmi_unit.in_use);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct file_operations fmi_fops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='del'>-	.open           = video_exclusive_open,</div><div class='del'>-	.release        = video_exclusive_release,</div><div class='add'>+	.open           = fmi_exclusive_open,</div><div class='add'>+	.release        = fmi_exclusive_release,</div><div class='ctx'> 	.ioctl		= video_ioctl2,</div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='ctx'> 	.compat_ioctl	= v4l_compat_ioctl32,</div><div class='hunk'>@@ -314,6 +321,7 @@ static struct video_device fmi_radio = {</div><div class='ctx'> 	.name		= "SF16FMx radio",</div><div class='ctx'> 	.fops           = &amp;fmi_fops,</div><div class='ctx'> 	.ioctl_ops 	= &amp;fmi_ioctl_ops,</div><div class='add'>+	.release	= video_device_release_empty,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* ladis: this is my card. does any other types exist? */</div><div class='hunk'>@@ -373,7 +381,7 @@ static int __init fmi_init(void)</div><div class='ctx'> 	fmi_unit.curvol = 0;</div><div class='ctx'> 	fmi_unit.curfreq = 0;</div><div class='ctx'> 	fmi_unit.flags = V4L2_TUNER_CAP_LOW;</div><div class='del'>-	fmi_radio.priv = &amp;fmi_unit;</div><div class='add'>+	video_set_drvdata(&amp;fmi_radio, &amp;fmi_unit);</div><div class='ctx'> </div><div class='ctx'> 	mutex_init(&amp;lock);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/radio/radio-sf16fmr2.c b/drivers/media/radio/radio-sf16fmr2.c<br/>index 6290553d24be..b1f47c322e02 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/radio/radio-sf16fmr2.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/radio/radio-sf16fmr2.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/radio/radio-sf16fmr2.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/radio/radio-sf16fmr2.c</a></div><div class='hunk'>@@ -64,6 +64,7 @@ static struct v4l2_queryctrl radio_qctrl[] = {</div><div class='ctx'> /* this should be static vars for module size */</div><div class='ctx'> struct fmr2_device</div><div class='ctx'> {</div><div class='add'>+	unsigned long in_use;</div><div class='ctx'> 	int port;</div><div class='ctx'> 	int curvol; /* 0-15 */</div><div class='ctx'> 	int mute;</div><div class='hunk'>@@ -229,8 +230,7 @@ static int vidioc_g_tuner(struct file *file, void *priv,</div><div class='ctx'> 					struct v4l2_tuner *v)</div><div class='ctx'> {</div><div class='ctx'> 	int mult;</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct fmr2_device *fmr2 = dev-&gt;priv;</div><div class='add'>+	struct fmr2_device *fmr2 = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	if (v-&gt;index &gt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -262,8 +262,7 @@ static int vidioc_s_tuner(struct file *file, void *priv,</div><div class='ctx'> static int vidioc_s_frequency(struct file *file, void *priv,</div><div class='ctx'> 					struct v4l2_frequency *f)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct fmr2_device *fmr2 = dev-&gt;priv;</div><div class='add'>+	struct fmr2_device *fmr2 = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	if (!(fmr2-&gt;flags &amp; V4L2_TUNER_CAP_LOW))</div><div class='ctx'> 		f-&gt;frequency *= 1000;</div><div class='hunk'>@@ -286,8 +285,7 @@ static int vidioc_s_frequency(struct file *file, void *priv,</div><div class='ctx'> static int vidioc_g_frequency(struct file *file, void *priv,</div><div class='ctx'> 					struct v4l2_frequency *f)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct fmr2_device *fmr2 = dev-&gt;priv;</div><div class='add'>+	struct fmr2_device *fmr2 = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	f-&gt;type = V4L2_TUNER_RADIO;</div><div class='ctx'> 	f-&gt;frequency = fmr2-&gt;curfreq;</div><div class='hunk'>@@ -313,8 +311,7 @@ static int vidioc_queryctrl(struct file *file, void *priv,</div><div class='ctx'> static int vidioc_g_ctrl(struct file *file, void *priv,</div><div class='ctx'> 					struct v4l2_control *ctrl)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct fmr2_device *fmr2 = dev-&gt;priv;</div><div class='add'>+	struct fmr2_device *fmr2 = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	switch (ctrl-&gt;id) {</div><div class='ctx'> 	case V4L2_CID_AUDIO_MUTE:</div><div class='hunk'>@@ -330,8 +327,7 @@ static int vidioc_g_ctrl(struct file *file, void *priv,</div><div class='ctx'> static int vidioc_s_ctrl(struct file *file, void *priv,</div><div class='ctx'> 					struct v4l2_control *ctrl)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct fmr2_device *fmr2 = dev-&gt;priv;</div><div class='add'>+	struct fmr2_device *fmr2 = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	switch (ctrl-&gt;id) {</div><div class='ctx'> 	case V4L2_CID_AUDIO_MUTE:</div><div class='hunk'>@@ -400,10 +396,21 @@ static int vidioc_s_audio(struct file *file, void *priv,</div><div class='ctx'> </div><div class='ctx'> static struct fmr2_device fmr2_unit;</div><div class='ctx'> </div><div class='add'>+static int fmr2_exclusive_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	return test_and_set_bit(0, &amp;fmr2_unit.in_use) ? -EBUSY : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fmr2_exclusive_release(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	clear_bit(0, &amp;fmr2_unit.in_use);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct file_operations fmr2_fops = {</div><div class='ctx'> 	.owner          = THIS_MODULE,</div><div class='del'>-	.open           = video_exclusive_open,</div><div class='del'>-	.release        = video_exclusive_release,</div><div class='add'>+	.open           = fmr2_exclusive_open,</div><div class='add'>+	.release        = fmr2_exclusive_release,</div><div class='ctx'> 	.ioctl          = video_ioctl2,</div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='ctx'> 	.compat_ioctl	= v4l_compat_ioctl32,</div><div class='hunk'>@@ -430,6 +437,7 @@ static struct video_device fmr2_radio = {</div><div class='ctx'> 	.name		= "SF16FMR2 radio",</div><div class='ctx'> 	.fops		= &amp;fmr2_fops,</div><div class='ctx'> 	.ioctl_ops 	= &amp;fmr2_ioctl_ops,</div><div class='add'>+	.release	= video_device_release_empty,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init fmr2_init(void)</div><div class='hunk'>@@ -441,7 +449,7 @@ static int __init fmr2_init(void)</div><div class='ctx'> 	fmr2_unit.stereo = 1;</div><div class='ctx'> 	fmr2_unit.flags = V4L2_TUNER_CAP_LOW;</div><div class='ctx'> 	fmr2_unit.card_type = 0;</div><div class='del'>-	fmr2_radio.priv = &amp;fmr2_unit;</div><div class='add'>+	video_set_drvdata(&amp;fmr2_radio, &amp;fmr2_unit);</div><div class='ctx'> </div><div class='ctx'> 	mutex_init(&amp;lock);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/radio/radio-si470x.c b/drivers/media/radio/radio-si470x.c<br/>index 16c7ef20265c..5920cd306975 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/radio/radio-si470x.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/radio/radio-si470x.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/radio/radio-si470x.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/radio/radio-si470x.c</a></div><div class='hunk'>@@ -104,6 +104,7 @@</div><div class='ctx'>  *		- hardware frequency seek support</div><div class='ctx'>  *		- afc indication</div><div class='ctx'>  *		- more safety checks, let si470x_get_freq return errno</div><div class='add'>+ *		- vidioc behavior corrected according to v4l2 spec</div><div class='ctx'>  *</div><div class='ctx'>  * ToDo:</div><div class='ctx'>  * - add firmware download/update support</div><div class='hunk'>@@ -141,9 +142,9 @@</div><div class='ctx'> /* USB Device ID List */</div><div class='ctx'> static struct usb_device_id si470x_usb_driver_id_table[] = {</div><div class='ctx'> 	/* Silicon Labs USB FM Radio Reference Design */</div><div class='del'>-	{ USB_DEVICE_AND_INTERFACE_INFO(0x10c4, 0x818a,	USB_CLASS_HID, 0, 0) },</div><div class='add'>+	{ USB_DEVICE_AND_INTERFACE_INFO(0x10c4, 0x818a, USB_CLASS_HID, 0, 0) },</div><div class='ctx'> 	/* ADS/Tech FM Radio Receiver (formerly Instant FM Music) */</div><div class='del'>-	{ USB_DEVICE_AND_INTERFACE_INFO(0x06e1, 0xa155,	USB_CLASS_HID, 0, 0) },</div><div class='add'>+	{ USB_DEVICE_AND_INTERFACE_INFO(0x06e1, 0xa155, USB_CLASS_HID, 0, 0) },</div><div class='ctx'> 	/* Terminating entry */</div><div class='ctx'> 	{ }</div><div class='ctx'> };</div><div class='hunk'>@@ -157,7 +158,7 @@ MODULE_DEVICE_TABLE(usb, si470x_usb_driver_id_table);</div><div class='ctx'> </div><div class='ctx'> /* Radio Nr */</div><div class='ctx'> static int radio_nr = -1;</div><div class='del'>-module_param(radio_nr, int, 0);</div><div class='add'>+module_param(radio_nr, int, 0444);</div><div class='ctx'> MODULE_PARM_DESC(radio_nr, "Radio Nr");</div><div class='ctx'> </div><div class='ctx'> /* Spacing (kHz) */</div><div class='hunk'>@@ -165,42 +166,42 @@ MODULE_PARM_DESC(radio_nr, "Radio Nr");</div><div class='ctx'> /* 1: 100 kHz (Europe, Japan) */</div><div class='ctx'> /* 2:  50 kHz */</div><div class='ctx'> static unsigned short space = 2;</div><div class='del'>-module_param(space, ushort, 0);</div><div class='del'>-MODULE_PARM_DESC(radio_nr, "Spacing: 0=200kHz 1=100kHz *2=50kHz*");</div><div class='add'>+module_param(space, ushort, 0444);</div><div class='add'>+MODULE_PARM_DESC(space, "Spacing: 0=200kHz 1=100kHz *2=50kHz*");</div><div class='ctx'> </div><div class='ctx'> /* Bottom of Band (MHz) */</div><div class='ctx'> /* 0: 87.5 - 108 MHz (USA, Europe)*/</div><div class='ctx'> /* 1: 76   - 108 MHz (Japan wide band) */</div><div class='ctx'> /* 2: 76   -  90 MHz (Japan) */</div><div class='ctx'> static unsigned short band = 1;</div><div class='del'>-module_param(band, ushort, 0);</div><div class='del'>-MODULE_PARM_DESC(radio_nr, "Band: 0=87.5..108MHz *1=76..108MHz* 2=76..90MHz");</div><div class='add'>+module_param(band, ushort, 0444);</div><div class='add'>+MODULE_PARM_DESC(band, "Band: 0=87.5..108MHz *1=76..108MHz* 2=76..90MHz");</div><div class='ctx'> </div><div class='ctx'> /* De-emphasis */</div><div class='ctx'> /* 0: 75 us (USA) */</div><div class='ctx'> /* 1: 50 us (Europe, Australia, Japan) */</div><div class='ctx'> static unsigned short de = 1;</div><div class='del'>-module_param(de, ushort, 0);</div><div class='del'>-MODULE_PARM_DESC(radio_nr, "De-emphasis: 0=75us *1=50us*");</div><div class='add'>+module_param(de, ushort, 0444);</div><div class='add'>+MODULE_PARM_DESC(de, "De-emphasis: 0=75us *1=50us*");</div><div class='ctx'> </div><div class='ctx'> /* USB timeout */</div><div class='ctx'> static unsigned int usb_timeout = 500;</div><div class='del'>-module_param(usb_timeout, uint, 0);</div><div class='add'>+module_param(usb_timeout, uint, 0644);</div><div class='ctx'> MODULE_PARM_DESC(usb_timeout, "USB timeout (ms): *500*");</div><div class='ctx'> </div><div class='ctx'> /* Tune timeout */</div><div class='ctx'> static unsigned int tune_timeout = 3000;</div><div class='del'>-module_param(tune_timeout, uint, 0);</div><div class='add'>+module_param(tune_timeout, uint, 0644);</div><div class='ctx'> MODULE_PARM_DESC(tune_timeout, "Tune timeout: *3000*");</div><div class='ctx'> </div><div class='ctx'> /* Seek timeout */</div><div class='ctx'> static unsigned int seek_timeout = 5000;</div><div class='del'>-module_param(seek_timeout, uint, 0);</div><div class='add'>+module_param(seek_timeout, uint, 0644);</div><div class='ctx'> MODULE_PARM_DESC(seek_timeout, "Seek timeout: *5000*");</div><div class='ctx'> </div><div class='ctx'> /* RDS buffer blocks */</div><div class='ctx'> static unsigned int rds_buf = 100;</div><div class='del'>-module_param(rds_buf, uint, 0);</div><div class='add'>+module_param(rds_buf, uint, 0444);</div><div class='ctx'> MODULE_PARM_DESC(rds_buf, "RDS buffer entries: *100*");</div><div class='ctx'> </div><div class='ctx'> /* RDS maximum block errors */</div><div class='hunk'>@@ -209,7 +210,7 @@ static unsigned short max_rds_errors = 1;</div><div class='ctx'> /* 1 means 1-2  errors requiring correction (used by original USBRadio.exe) */</div><div class='ctx'> /* 2 means 3-5  errors requiring correction */</div><div class='ctx'> /* 3 means   6+ errors or errors in checkword, correction not possible */</div><div class='del'>-module_param(max_rds_errors, ushort, 0);</div><div class='add'>+module_param(max_rds_errors, ushort, 0644);</div><div class='ctx'> MODULE_PARM_DESC(max_rds_errors, "RDS maximum block errors: *1*");</div><div class='ctx'> </div><div class='ctx'> /* RDS poll frequency */</div><div class='hunk'>@@ -218,7 +219,7 @@ static unsigned int rds_poll_time = 40;</div><div class='ctx'> /* 50 is used by radio-cadet */</div><div class='ctx'> /* 75 should be okay */</div><div class='ctx'> /* 80 is the usual RDS receive interval */</div><div class='del'>-module_param(rds_poll_time, uint, 0);</div><div class='add'>+module_param(rds_poll_time, uint, 0644);</div><div class='ctx'> MODULE_PARM_DESC(rds_poll_time, "RDS poll time (ms): *40*");</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -667,23 +668,29 @@ static int si470x_get_freq(struct si470x_device *radio, unsigned int *freq)</div><div class='ctx'> 	int retval;</div><div class='ctx'> </div><div class='ctx'> 	/* Spacing (kHz) */</div><div class='del'>-	switch (space) {</div><div class='add'>+	switch ((radio-&gt;registers[SYSCONFIG2] &amp; SYSCONFIG2_SPACE) &gt;&gt; 4) {</div><div class='ctx'> 	/* 0: 200 kHz (USA, Australia) */</div><div class='del'>-	case 0 : spacing = 0.200 * FREQ_MUL; break;</div><div class='add'>+	case 0:</div><div class='add'>+		spacing = 0.200 * FREQ_MUL; break;</div><div class='ctx'> 	/* 1: 100 kHz (Europe, Japan) */</div><div class='del'>-	case 1 : spacing = 0.100 * FREQ_MUL; break;</div><div class='add'>+	case 1:</div><div class='add'>+		spacing = 0.100 * FREQ_MUL; break;</div><div class='ctx'> 	/* 2:  50 kHz */</div><div class='del'>-	default: spacing = 0.050 * FREQ_MUL; break;</div><div class='add'>+	default:</div><div class='add'>+		spacing = 0.050 * FREQ_MUL; break;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	/* Bottom of Band (MHz) */</div><div class='del'>-	switch (band) {</div><div class='add'>+	switch ((radio-&gt;registers[SYSCONFIG2] &amp; SYSCONFIG2_BAND) &gt;&gt; 6) {</div><div class='ctx'> 	/* 0: 87.5 - 108 MHz (USA, Europe) */</div><div class='del'>-	case 0 : band_bottom = 87.5 * FREQ_MUL; break;</div><div class='add'>+	case 0:</div><div class='add'>+		band_bottom = 87.5 * FREQ_MUL; break;</div><div class='ctx'> 	/* 1: 76   - 108 MHz (Japan wide band) */</div><div class='del'>-	default: band_bottom = 76   * FREQ_MUL; break;</div><div class='add'>+	default:</div><div class='add'>+		band_bottom = 76   * FREQ_MUL; break;</div><div class='ctx'> 	/* 2: 76   -  90 MHz (Japan) */</div><div class='del'>-	case 2 : band_bottom = 76   * FREQ_MUL; break;</div><div class='add'>+	case 2:</div><div class='add'>+		band_bottom = 76   * FREQ_MUL; break;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	/* read channel */</div><div class='hunk'>@@ -706,23 +713,29 @@ static int si470x_set_freq(struct si470x_device *radio, unsigned int freq)</div><div class='ctx'> 	unsigned short chan;</div><div class='ctx'> </div><div class='ctx'> 	/* Spacing (kHz) */</div><div class='del'>-	switch (space) {</div><div class='add'>+	switch ((radio-&gt;registers[SYSCONFIG2] &amp; SYSCONFIG2_SPACE) &gt;&gt; 4) {</div><div class='ctx'> 	/* 0: 200 kHz (USA, Australia) */</div><div class='del'>-	case 0 : spacing = 0.200 * FREQ_MUL; break;</div><div class='add'>+	case 0:</div><div class='add'>+		spacing = 0.200 * FREQ_MUL; break;</div><div class='ctx'> 	/* 1: 100 kHz (Europe, Japan) */</div><div class='del'>-	case 1 : spacing = 0.100 * FREQ_MUL; break;</div><div class='add'>+	case 1:</div><div class='add'>+		spacing = 0.100 * FREQ_MUL; break;</div><div class='ctx'> 	/* 2:  50 kHz */</div><div class='del'>-	default: spacing = 0.050 * FREQ_MUL; break;</div><div class='add'>+	default:</div><div class='add'>+		spacing = 0.050 * FREQ_MUL; break;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	/* Bottom of Band (MHz) */</div><div class='del'>-	switch (band) {</div><div class='add'>+	switch ((radio-&gt;registers[SYSCONFIG2] &amp; SYSCONFIG2_BAND) &gt;&gt; 6) {</div><div class='ctx'> 	/* 0: 87.5 - 108 MHz (USA, Europe) */</div><div class='del'>-	case 0 : band_bottom = 87.5 * FREQ_MUL; break;</div><div class='add'>+	case 0:</div><div class='add'>+		band_bottom = 87.5 * FREQ_MUL; break;</div><div class='ctx'> 	/* 1: 76   - 108 MHz (Japan wide band) */</div><div class='del'>-	default: band_bottom = 76   * FREQ_MUL; break;</div><div class='add'>+	default:</div><div class='add'>+		band_bottom = 76   * FREQ_MUL; break;</div><div class='ctx'> 	/* 2: 76   -  90 MHz (Japan) */</div><div class='del'>-	case 2 : band_bottom = 76   * FREQ_MUL; break;</div><div class='add'>+	case 2:</div><div class='add'>+		band_bottom = 76   * FREQ_MUL; break;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	/* Chan = [ Freq (Mhz) - Bottom of Band (MHz) ] / Spacing (kHz) */</div><div class='hunk'>@@ -986,7 +999,7 @@ static void si470x_work(struct work_struct *work)</div><div class='ctx'> static ssize_t si470x_fops_read(struct file *file, char __user *buf,</div><div class='ctx'> 		size_t count, loff_t *ppos)</div><div class='ctx'> {</div><div class='del'>-	struct si470x_device *radio = video_get_drvdata(video_devdata(file));</div><div class='add'>+	struct si470x_device *radio = video_drvdata(file);</div><div class='ctx'> 	int retval = 0;</div><div class='ctx'> 	unsigned int block_count = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1047,7 +1060,7 @@ done:</div><div class='ctx'> static unsigned int si470x_fops_poll(struct file *file,</div><div class='ctx'> 		struct poll_table_struct *pts)</div><div class='ctx'> {</div><div class='del'>-	struct si470x_device *radio = video_get_drvdata(video_devdata(file));</div><div class='add'>+	struct si470x_device *radio = video_drvdata(file);</div><div class='ctx'> 	int retval = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* switch on rds reception */</div><div class='hunk'>@@ -1071,9 +1084,10 @@ static unsigned int si470x_fops_poll(struct file *file,</div><div class='ctx'>  */</div><div class='ctx'> static int si470x_fops_open(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='del'>-	struct si470x_device *radio = video_get_drvdata(video_devdata(file));</div><div class='add'>+	struct si470x_device *radio = video_drvdata(file);</div><div class='ctx'> 	int retval;</div><div class='ctx'> </div><div class='add'>+	lock_kernel();</div><div class='ctx'> 	radio-&gt;users++;</div><div class='ctx'> </div><div class='ctx'> 	retval = usb_autopm_get_interface(radio-&gt;intf);</div><div class='hunk'>@@ -1090,6 +1104,7 @@ static int si470x_fops_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> done:</div><div class='add'>+	unlock_kernel();</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1099,7 +1114,7 @@ done:</div><div class='ctx'>  */</div><div class='ctx'> static int si470x_fops_release(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='del'>-	struct si470x_device *radio = video_get_drvdata(video_devdata(file));</div><div class='add'>+	struct si470x_device *radio = video_drvdata(file);</div><div class='ctx'> 	int retval = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* safety check */</div><div class='hunk'>@@ -1162,7 +1177,6 @@ static const struct file_operations si470x_fops = {</div><div class='ctx'>  * si470x_v4l2_queryctrl - query control</div><div class='ctx'>  */</div><div class='ctx'> static struct v4l2_queryctrl si470x_v4l2_queryctrl[] = {</div><div class='del'>-/* HINT: the disabled controls are only here to satify kradio and such apps */</div><div class='ctx'> 	{</div><div class='ctx'> 		.id		= V4L2_CID_AUDIO_VOLUME,</div><div class='ctx'> 		.type		= V4L2_CTRL_TYPE_INTEGER,</div><div class='hunk'>@@ -1173,18 +1187,6 @@ static struct v4l2_queryctrl si470x_v4l2_queryctrl[] = {</div><div class='ctx'> 		.default_value	= 15,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='del'>-		.id		= V4L2_CID_AUDIO_BALANCE,</div><div class='del'>-		.flags		= V4L2_CTRL_FLAG_DISABLED,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.id		= V4L2_CID_AUDIO_BASS,</div><div class='del'>-		.flags		= V4L2_CTRL_FLAG_DISABLED,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.id		= V4L2_CID_AUDIO_TREBLE,</div><div class='del'>-		.flags		= V4L2_CTRL_FLAG_DISABLED,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='ctx'> 		.id		= V4L2_CID_AUDIO_MUTE,</div><div class='ctx'> 		.type		= V4L2_CTRL_TYPE_BOOLEAN,</div><div class='ctx'> 		.name		= "Mute",</div><div class='hunk'>@@ -1193,10 +1195,6 @@ static struct v4l2_queryctrl si470x_v4l2_queryctrl[] = {</div><div class='ctx'> 		.step		= 1,</div><div class='ctx'> 		.default_value	= 1,</div><div class='ctx'> 	},</div><div class='del'>-	{</div><div class='del'>-		.id		= V4L2_CID_AUDIO_LOUDNESS,</div><div class='del'>-		.flags		= V4L2_CTRL_FLAG_DISABLED,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -1218,56 +1216,34 @@ static int si470x_vidioc_querycap(struct file *file, void *priv,</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * si470x_vidioc_g_input - get input</div><div class='del'>- */</div><div class='del'>-static int si470x_vidioc_g_input(struct file *file, void *priv,</div><div class='del'>-		unsigned int *i)</div><div class='del'>-{</div><div class='del'>-	*i = 0;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * si470x_vidioc_s_input - set input</div><div class='del'>- */</div><div class='del'>-static int si470x_vidioc_s_input(struct file *file, void *priv, unsigned int i)</div><div class='del'>-{</div><div class='del'>-	int retval = 0;</div><div class='del'>-</div><div class='del'>-	/* safety checks */</div><div class='del'>-	if (i != 0)</div><div class='del'>-		retval = -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (retval &lt; 0)</div><div class='del'>-		printk(KERN_WARNING DRIVER_NAME</div><div class='del'>-			": set input failed with %d\n", retval);</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * si470x_vidioc_queryctrl - enumerate control items</div><div class='ctx'>  */</div><div class='ctx'> static int si470x_vidioc_queryctrl(struct file *file, void *priv,</div><div class='ctx'> 		struct v4l2_queryctrl *qc)</div><div class='ctx'> {</div><div class='del'>-	unsigned char i;</div><div class='add'>+	unsigned char i = 0;</div><div class='ctx'> 	int retval = -EINVAL;</div><div class='ctx'> </div><div class='del'>-	/* safety checks */</div><div class='del'>-	if (!qc-&gt;id)</div><div class='add'>+	/* abort if qc-&gt;id is below V4L2_CID_BASE */</div><div class='add'>+	if (qc-&gt;id &lt; V4L2_CID_BASE)</div><div class='ctx'> 		goto done;</div><div class='ctx'> </div><div class='add'>+	/* search video control */</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(si470x_v4l2_queryctrl); i++) {</div><div class='ctx'> 		if (qc-&gt;id == si470x_v4l2_queryctrl[i].id) {</div><div class='ctx'> 			memcpy(qc, &amp;(si470x_v4l2_queryctrl[i]), sizeof(*qc));</div><div class='del'>-			retval = 0;</div><div class='add'>+			retval = 0; /* found */</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* disable unsupported base controls */</div><div class='add'>+	/* to satisfy kradio and such apps */</div><div class='add'>+	if ((retval == -EINVAL) &amp;&amp; (qc-&gt;id &lt; V4L2_CID_LASTP1)) {</div><div class='add'>+		qc-&gt;flags = V4L2_CTRL_FLAG_DISABLED;</div><div class='add'>+		retval = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> done:</div><div class='ctx'> 	if (retval &lt; 0)</div><div class='ctx'> 		printk(KERN_WARNING DRIVER_NAME</div><div class='hunk'>@@ -1282,7 +1258,7 @@ done:</div><div class='ctx'> static int si470x_vidioc_g_ctrl(struct file *file, void *priv,</div><div class='ctx'> 		struct v4l2_control *ctrl)</div><div class='ctx'> {</div><div class='del'>-	struct si470x_device *radio = video_get_drvdata(video_devdata(file));</div><div class='add'>+	struct si470x_device *radio = video_drvdata(file);</div><div class='ctx'> 	int retval = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* safety checks */</div><div class='hunk'>@@ -1318,7 +1294,7 @@ done:</div><div class='ctx'> static int si470x_vidioc_s_ctrl(struct file *file, void *priv,</div><div class='ctx'> 		struct v4l2_control *ctrl)</div><div class='ctx'> {</div><div class='del'>-	struct si470x_device *radio = video_get_drvdata(video_devdata(file));</div><div class='add'>+	struct si470x_device *radio = video_drvdata(file);</div><div class='ctx'> 	int retval = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* safety checks */</div><div class='hunk'>@@ -1358,44 +1334,13 @@ done:</div><div class='ctx'> static int si470x_vidioc_g_audio(struct file *file, void *priv,</div><div class='ctx'> 		struct v4l2_audio *audio)</div><div class='ctx'> {</div><div class='del'>-	int retval = 0;</div><div class='del'>-</div><div class='del'>-	/* safety checks */</div><div class='del'>-	if (audio-&gt;index != 0) {</div><div class='del'>-		retval = -EINVAL;</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='add'>+	/* driver constants */</div><div class='add'>+	audio-&gt;index = 0;</div><div class='ctx'> 	strcpy(audio-&gt;name, "Radio");</div><div class='ctx'> 	audio-&gt;capability = V4L2_AUDCAP_STEREO;</div><div class='add'>+	audio-&gt;mode = 0;</div><div class='ctx'> </div><div class='del'>-done:</div><div class='del'>-	if (retval &lt; 0)</div><div class='del'>-		printk(KERN_WARNING DRIVER_NAME</div><div class='del'>-			": get audio failed with %d\n", retval);</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * si470x_vidioc_s_audio - set audio attributes</div><div class='del'>- */</div><div class='del'>-static int si470x_vidioc_s_audio(struct file *file, void *priv,</div><div class='del'>-		struct v4l2_audio *audio)</div><div class='del'>-{</div><div class='del'>-	int retval = 0;</div><div class='del'>-</div><div class='del'>-	/* safety checks */</div><div class='del'>-	if (audio-&gt;index != 0) {</div><div class='del'>-		retval = -EINVAL;</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-done:</div><div class='del'>-	if (retval &lt; 0)</div><div class='del'>-		printk(KERN_WARNING DRIVER_NAME</div><div class='del'>-			": set audio failed with %d\n", retval);</div><div class='del'>-	return retval;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -1405,7 +1350,7 @@ done:</div><div class='ctx'> static int si470x_vidioc_g_tuner(struct file *file, void *priv,</div><div class='ctx'> 		struct v4l2_tuner *tuner)</div><div class='ctx'> {</div><div class='del'>-	struct si470x_device *radio = video_get_drvdata(video_devdata(file));</div><div class='add'>+	struct si470x_device *radio = video_drvdata(file);</div><div class='ctx'> 	int retval = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* safety checks */</div><div class='hunk'>@@ -1413,7 +1358,7 @@ static int si470x_vidioc_g_tuner(struct file *file, void *priv,</div><div class='ctx'> 		retval = -EIO;</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='del'>-	if ((tuner-&gt;index != 0) &amp;&amp; (tuner-&gt;type != V4L2_TUNER_RADIO)) {</div><div class='add'>+	if (tuner-&gt;index != 0) {</div><div class='ctx'> 		retval = -EINVAL;</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1422,8 +1367,13 @@ static int si470x_vidioc_g_tuner(struct file *file, void *priv,</div><div class='ctx'> 	if (retval &lt; 0)</div><div class='ctx'> 		goto done;</div><div class='ctx'> </div><div class='add'>+	/* driver constants */</div><div class='ctx'> 	strcpy(tuner-&gt;name, "FM");</div><div class='del'>-	switch (band) {</div><div class='add'>+	tuner-&gt;type = V4L2_TUNER_RADIO;</div><div class='add'>+	tuner-&gt;capability = V4L2_TUNER_CAP_LOW | V4L2_TUNER_CAP_STEREO;</div><div class='add'>+</div><div class='add'>+	/* range limits */</div><div class='add'>+	switch ((radio-&gt;registers[SYSCONFIG2] &amp; SYSCONFIG2_BAND) &gt;&gt; 6) {</div><div class='ctx'> 	/* 0: 87.5 - 108 MHz (USA, Europe, default) */</div><div class='ctx'> 	default:</div><div class='ctx'> 		tuner-&gt;rangelow  =  87.5 * FREQ_MUL;</div><div class='hunk'>@@ -1440,14 +1390,18 @@ static int si470x_vidioc_g_tuner(struct file *file, void *priv,</div><div class='ctx'> 		tuner-&gt;rangehigh =  90   * FREQ_MUL;</div><div class='ctx'> 		break;</div><div class='ctx'> 	};</div><div class='del'>-	tuner-&gt;rxsubchans = V4L2_TUNER_SUB_MONO | V4L2_TUNER_SUB_STEREO;</div><div class='del'>-	tuner-&gt;capability = V4L2_TUNER_CAP_LOW;</div><div class='ctx'> </div><div class='del'>-	/* Stereo indicator == Stereo (instead of Mono) */</div><div class='add'>+	/* stereo indicator == stereo (instead of mono) */</div><div class='ctx'> 	if ((radio-&gt;registers[STATUSRSSI] &amp; STATUSRSSI_ST) == 1)</div><div class='del'>-		tuner-&gt;audmode = V4L2_TUNER_MODE_STEREO;</div><div class='add'>+		tuner-&gt;rxsubchans = V4L2_TUNER_SUB_MONO | V4L2_TUNER_SUB_STEREO;</div><div class='ctx'> 	else</div><div class='add'>+		tuner-&gt;rxsubchans = V4L2_TUNER_SUB_MONO;</div><div class='add'>+</div><div class='add'>+	/* mono/stereo selector */</div><div class='add'>+	if ((radio-&gt;registers[POWERCFG] &amp; POWERCFG_MONO) == 1)</div><div class='ctx'> 		tuner-&gt;audmode = V4L2_TUNER_MODE_MONO;</div><div class='add'>+	else</div><div class='add'>+		tuner-&gt;audmode = V4L2_TUNER_MODE_STEREO;</div><div class='ctx'> </div><div class='ctx'> 	/* min is worst, max is best; signal:0..0xffff; rssi: 0..0xff */</div><div class='ctx'> 	tuner-&gt;signal = (radio-&gt;registers[STATUSRSSI] &amp; STATUSRSSI_RSSI)</div><div class='hunk'>@@ -1471,23 +1425,28 @@ done:</div><div class='ctx'> static int si470x_vidioc_s_tuner(struct file *file, void *priv,</div><div class='ctx'> 		struct v4l2_tuner *tuner)</div><div class='ctx'> {</div><div class='del'>-	struct si470x_device *radio = video_get_drvdata(video_devdata(file));</div><div class='del'>-	int retval = 0;</div><div class='add'>+	struct si470x_device *radio = video_drvdata(file);</div><div class='add'>+	int retval = -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* safety checks */</div><div class='ctx'> 	if (radio-&gt;disconnected) {</div><div class='ctx'> 		retval = -EIO;</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='del'>-	if ((tuner-&gt;index != 0) &amp;&amp; (tuner-&gt;type != V4L2_TUNER_RADIO)) {</div><div class='del'>-		retval = -EINVAL;</div><div class='add'>+	if (tuner-&gt;index != 0)</div><div class='ctx'> 		goto done;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	if (tuner-&gt;audmode == V4L2_TUNER_MODE_MONO)</div><div class='add'>+	/* mono/stereo selector */</div><div class='add'>+	switch (tuner-&gt;audmode) {</div><div class='add'>+	case V4L2_TUNER_MODE_MONO:</div><div class='ctx'> 		radio-&gt;registers[POWERCFG] |= POWERCFG_MONO;  /* force mono */</div><div class='del'>-	else</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_TUNER_MODE_STEREO:</div><div class='ctx'> 		radio-&gt;registers[POWERCFG] &amp;= ~POWERCFG_MONO; /* try stereo */</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	retval = si470x_set_register(radio, POWERCFG);</div><div class='ctx'> </div><div class='hunk'>@@ -1505,7 +1464,7 @@ done:</div><div class='ctx'> static int si470x_vidioc_g_frequency(struct file *file, void *priv,</div><div class='ctx'> 		struct v4l2_frequency *freq)</div><div class='ctx'> {</div><div class='del'>-	struct si470x_device *radio = video_get_drvdata(video_devdata(file));</div><div class='add'>+	struct si470x_device *radio = video_drvdata(file);</div><div class='ctx'> 	int retval = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* safety checks */</div><div class='hunk'>@@ -1513,11 +1472,12 @@ static int si470x_vidioc_g_frequency(struct file *file, void *priv,</div><div class='ctx'> 		retval = -EIO;</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='del'>-	if ((freq-&gt;tuner != 0) &amp;&amp; (freq-&gt;type != V4L2_TUNER_RADIO)) {</div><div class='add'>+	if (freq-&gt;tuner != 0) {</div><div class='ctx'> 		retval = -EINVAL;</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	freq-&gt;type = V4L2_TUNER_RADIO;</div><div class='ctx'> 	retval = si470x_get_freq(radio, &amp;freq-&gt;frequency);</div><div class='ctx'> </div><div class='ctx'> done:</div><div class='hunk'>@@ -1534,7 +1494,7 @@ done:</div><div class='ctx'> static int si470x_vidioc_s_frequency(struct file *file, void *priv,</div><div class='ctx'> 		struct v4l2_frequency *freq)</div><div class='ctx'> {</div><div class='del'>-	struct si470x_device *radio = video_get_drvdata(video_devdata(file));</div><div class='add'>+	struct si470x_device *radio = video_drvdata(file);</div><div class='ctx'> 	int retval = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* safety checks */</div><div class='hunk'>@@ -1542,7 +1502,7 @@ static int si470x_vidioc_s_frequency(struct file *file, void *priv,</div><div class='ctx'> 		retval = -EIO;</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='del'>-	if ((freq-&gt;tuner != 0) &amp;&amp; (freq-&gt;type != V4L2_TUNER_RADIO)) {</div><div class='add'>+	if (freq-&gt;tuner != 0) {</div><div class='ctx'> 		retval = -EINVAL;</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1563,7 +1523,7 @@ done:</div><div class='ctx'> static int si470x_vidioc_s_hw_freq_seek(struct file *file, void *priv,</div><div class='ctx'> 		struct v4l2_hw_freq_seek *seek)</div><div class='ctx'> {</div><div class='del'>-	struct si470x_device *radio = video_get_drvdata(video_devdata(file));</div><div class='add'>+	struct si470x_device *radio = video_drvdata(file);</div><div class='ctx'> 	int retval = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* safety checks */</div><div class='hunk'>@@ -1571,7 +1531,7 @@ static int si470x_vidioc_s_hw_freq_seek(struct file *file, void *priv,</div><div class='ctx'> 		retval = -EIO;</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='del'>-	if ((seek-&gt;tuner != 0) &amp;&amp; (seek-&gt;type != V4L2_TUNER_RADIO)) {</div><div class='add'>+	if (seek-&gt;tuner != 0) {</div><div class='ctx'> 		retval = -EINVAL;</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1586,15 +1546,16 @@ done:</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * si470x_ioctl_ops - video device ioctl operations</div><div class='add'>+ */</div><div class='ctx'> static const struct v4l2_ioctl_ops si470x_ioctl_ops = {</div><div class='ctx'> 	.vidioc_querycap	= si470x_vidioc_querycap,</div><div class='del'>-	.vidioc_g_input		= si470x_vidioc_g_input,</div><div class='del'>-	.vidioc_s_input		= si470x_vidioc_s_input,</div><div class='ctx'> 	.vidioc_queryctrl	= si470x_vidioc_queryctrl,</div><div class='ctx'> 	.vidioc_g_ctrl		= si470x_vidioc_g_ctrl,</div><div class='ctx'> 	.vidioc_s_ctrl		= si470x_vidioc_s_ctrl,</div><div class='ctx'> 	.vidioc_g_audio		= si470x_vidioc_g_audio,</div><div class='del'>-	.vidioc_s_audio		= si470x_vidioc_s_audio,</div><div class='ctx'> 	.vidioc_g_tuner		= si470x_vidioc_g_tuner,</div><div class='ctx'> 	.vidioc_s_tuner		= si470x_vidioc_s_tuner,</div><div class='ctx'> 	.vidioc_g_frequency	= si470x_vidioc_g_frequency,</div><div class='hunk'>@@ -1602,14 +1563,15 @@ static const struct v4l2_ioctl_ops si470x_ioctl_ops = {</div><div class='ctx'> 	.vidioc_s_hw_freq_seek	= si470x_vidioc_s_hw_freq_seek,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> /*</div><div class='del'>- * si470x_viddev_tamples - video device interface</div><div class='add'>+ * si470x_viddev_template - video device interface</div><div class='ctx'>  */</div><div class='ctx'> static struct video_device si470x_viddev_template = {</div><div class='ctx'> 	.fops			= &amp;si470x_fops,</div><div class='del'>-	.ioctl_ops 		= &amp;si470x_ioctl_ops,</div><div class='ctx'> 	.name			= DRIVER_NAME,</div><div class='ctx'> 	.release		= video_device_release,</div><div class='add'>+	.ioctl_ops		= &amp;si470x_ioctl_ops,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/radio/radio-terratec.c b/drivers/media/radio/radio-terratec.c<br/>index 0876fecc5f27..0abb186a9473 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/radio/radio-terratec.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/radio/radio-terratec.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/radio/radio-terratec.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/radio/radio-terratec.c</a></div><div class='hunk'>@@ -79,6 +79,7 @@ static spinlock_t lock;</div><div class='ctx'> </div><div class='ctx'> struct tt_device</div><div class='ctx'> {</div><div class='add'>+	unsigned long in_use;</div><div class='ctx'> 	int port;</div><div class='ctx'> 	int curvol;</div><div class='ctx'> 	unsigned long curfreq;</div><div class='hunk'>@@ -220,8 +221,7 @@ static int vidioc_querycap(struct file *file, void *priv,</div><div class='ctx'> static int vidioc_g_tuner(struct file *file, void *priv,</div><div class='ctx'> 					struct v4l2_tuner *v)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct tt_device *tt = dev-&gt;priv;</div><div class='add'>+	struct tt_device *tt = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	if (v-&gt;index &gt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -248,8 +248,7 @@ static int vidioc_s_tuner(struct file *file, void *priv,</div><div class='ctx'> static int vidioc_s_frequency(struct file *file, void *priv,</div><div class='ctx'> 					struct v4l2_frequency *f)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct tt_device *tt = dev-&gt;priv;</div><div class='add'>+	struct tt_device *tt = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	tt-&gt;curfreq = f-&gt;frequency;</div><div class='ctx'> 	tt_setfreq(tt, tt-&gt;curfreq);</div><div class='hunk'>@@ -259,8 +258,7 @@ static int vidioc_s_frequency(struct file *file, void *priv,</div><div class='ctx'> static int vidioc_g_frequency(struct file *file, void *priv,</div><div class='ctx'> 					struct v4l2_frequency *f)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct tt_device *tt = dev-&gt;priv;</div><div class='add'>+	struct tt_device *tt = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	f-&gt;type = V4L2_TUNER_RADIO;</div><div class='ctx'> 	f-&gt;frequency = tt-&gt;curfreq;</div><div class='hunk'>@@ -285,8 +283,7 @@ static int vidioc_queryctrl(struct file *file, void *priv,</div><div class='ctx'> static int vidioc_g_ctrl(struct file *file, void *priv,</div><div class='ctx'> 					struct v4l2_control *ctrl)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct tt_device *tt = dev-&gt;priv;</div><div class='add'>+	struct tt_device *tt = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	switch (ctrl-&gt;id) {</div><div class='ctx'> 	case V4L2_CID_AUDIO_MUTE:</div><div class='hunk'>@@ -305,8 +302,7 @@ static int vidioc_g_ctrl(struct file *file, void *priv,</div><div class='ctx'> static int vidioc_s_ctrl(struct file *file, void *priv,</div><div class='ctx'> 					struct v4l2_control *ctrl)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct tt_device *tt = dev-&gt;priv;</div><div class='add'>+	struct tt_device *tt = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	switch (ctrl-&gt;id) {</div><div class='ctx'> 	case V4L2_CID_AUDIO_MUTE:</div><div class='hunk'>@@ -356,10 +352,21 @@ static int vidioc_s_audio(struct file *file, void *priv,</div><div class='ctx'> </div><div class='ctx'> static struct tt_device terratec_unit;</div><div class='ctx'> </div><div class='add'>+static int terratec_exclusive_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	return test_and_set_bit(0, &amp;terratec_unit.in_use) ? -EBUSY : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int terratec_exclusive_release(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	clear_bit(0, &amp;terratec_unit.in_use);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct file_operations terratec_fops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='del'>-	.open           = video_exclusive_open,</div><div class='del'>-	.release        = video_exclusive_release,</div><div class='add'>+	.open           = terratec_exclusive_open,</div><div class='add'>+	.release        = terratec_exclusive_release,</div><div class='ctx'> 	.ioctl		= video_ioctl2,</div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='ctx'> 	.compat_ioctl	= v4l_compat_ioctl32,</div><div class='hunk'>@@ -386,6 +393,7 @@ static struct video_device terratec_radio = {</div><div class='ctx'> 	.name		= "TerraTec ActiveRadio",</div><div class='ctx'> 	.fops           = &amp;terratec_fops,</div><div class='ctx'> 	.ioctl_ops 	= &amp;terratec_ioctl_ops,</div><div class='add'>+	.release	= video_device_release_empty,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init terratec_init(void)</div><div class='hunk'>@@ -401,7 +409,7 @@ static int __init terratec_init(void)</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	terratec_radio.priv=&amp;terratec_unit;</div><div class='add'>+	video_set_drvdata(&amp;terratec_radio, &amp;terratec_unit);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;lock);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/radio/radio-trust.c b/drivers/media/radio/radio-trust.c<br/>index 193161956253..e7b111fcd105 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/radio/radio-trust.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/radio/radio-trust.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/radio/radio-trust.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/radio/radio-trust.c</a></div><div class='hunk'>@@ -78,6 +78,7 @@ static __u16 curtreble;</div><div class='ctx'> static unsigned long curfreq;</div><div class='ctx'> static int curstereo;</div><div class='ctx'> static int curmute;</div><div class='add'>+static unsigned long in_use;</div><div class='ctx'> </div><div class='ctx'> /* i2c addresses */</div><div class='ctx'> #define TDA7318_ADDR 0x88</div><div class='hunk'>@@ -336,10 +337,21 @@ static int vidioc_s_audio(struct file *file, void *priv,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int trust_exclusive_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	return test_and_set_bit(0, &amp;in_use) ? -EBUSY : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int trust_exclusive_release(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	clear_bit(0, &amp;in_use);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct file_operations trust_fops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='del'>-	.open           = video_exclusive_open,</div><div class='del'>-	.release        = video_exclusive_release,</div><div class='add'>+	.open           = trust_exclusive_open,</div><div class='add'>+	.release        = trust_exclusive_release,</div><div class='ctx'> 	.ioctl		= video_ioctl2,</div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='ctx'> 	.compat_ioctl	= v4l_compat_ioctl32,</div><div class='hunk'>@@ -366,6 +378,7 @@ static struct video_device trust_radio = {</div><div class='ctx'> 	.name		= "Trust FM Radio",</div><div class='ctx'> 	.fops           = &amp;trust_fops,</div><div class='ctx'> 	.ioctl_ops 	= &amp;trust_ioctl_ops,</div><div class='add'>+	.release	= video_device_release_empty,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init trust_init(void)</div><div class='head'>diff --git a/drivers/media/radio/radio-typhoon.c b/drivers/media/radio/radio-typhoon.c<br/>index f8d62cfea774..952ec35a8415 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/radio/radio-typhoon.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/radio/radio-typhoon.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/radio/radio-typhoon.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/radio/radio-typhoon.c</a></div><div class='hunk'>@@ -79,7 +79,7 @@ static struct v4l2_queryctrl radio_qctrl[] = {</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> struct typhoon_device {</div><div class='del'>-	int users;</div><div class='add'>+	unsigned long in_use;</div><div class='ctx'> 	int iobase;</div><div class='ctx'> 	int curvol;</div><div class='ctx'> 	int muted;</div><div class='hunk'>@@ -223,8 +223,7 @@ static int vidioc_s_tuner(struct file *file, void *priv,</div><div class='ctx'> static int vidioc_s_frequency(struct file *file, void *priv,</div><div class='ctx'> 					struct v4l2_frequency *f)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct typhoon_device *typhoon = dev-&gt;priv;</div><div class='add'>+	struct typhoon_device *typhoon = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	typhoon-&gt;curfreq = f-&gt;frequency;</div><div class='ctx'> 	typhoon_setfreq(typhoon, typhoon-&gt;curfreq);</div><div class='hunk'>@@ -234,8 +233,7 @@ static int vidioc_s_frequency(struct file *file, void *priv,</div><div class='ctx'> static int vidioc_g_frequency(struct file *file, void *priv,</div><div class='ctx'> 					struct v4l2_frequency *f)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct typhoon_device *typhoon = dev-&gt;priv;</div><div class='add'>+	struct typhoon_device *typhoon = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	f-&gt;type = V4L2_TUNER_RADIO;</div><div class='ctx'> 	f-&gt;frequency = typhoon-&gt;curfreq;</div><div class='hunk'>@@ -261,8 +259,7 @@ static int vidioc_queryctrl(struct file *file, void *priv,</div><div class='ctx'> static int vidioc_g_ctrl(struct file *file, void *priv,</div><div class='ctx'> 					struct v4l2_control *ctrl)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct typhoon_device *typhoon = dev-&gt;priv;</div><div class='add'>+	struct typhoon_device *typhoon = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	switch (ctrl-&gt;id) {</div><div class='ctx'> 	case V4L2_CID_AUDIO_MUTE:</div><div class='hunk'>@@ -278,8 +275,7 @@ static int vidioc_g_ctrl(struct file *file, void *priv,</div><div class='ctx'> static int vidioc_s_ctrl (struct file *file, void *priv,</div><div class='ctx'> 					struct v4l2_control *ctrl)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct typhoon_device *typhoon = dev-&gt;priv;</div><div class='add'>+	struct typhoon_device *typhoon = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	switch (ctrl-&gt;id) {</div><div class='ctx'> 	case V4L2_CID_AUDIO_MUTE:</div><div class='hunk'>@@ -334,10 +330,21 @@ static struct typhoon_device typhoon_unit =</div><div class='ctx'> 	.mutefreq	= CONFIG_RADIO_TYPHOON_MUTEFREQ,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static int typhoon_exclusive_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	return test_and_set_bit(0, &amp;typhoon_unit.in_use) ? -EBUSY : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int typhoon_exclusive_release(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	clear_bit(0, &amp;typhoon_unit.in_use);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct file_operations typhoon_fops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='del'>-	.open           = video_exclusive_open,</div><div class='del'>-	.release        = video_exclusive_release,</div><div class='add'>+	.open           = typhoon_exclusive_open,</div><div class='add'>+	.release        = typhoon_exclusive_release,</div><div class='ctx'> 	.ioctl		= video_ioctl2,</div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='ctx'> 	.compat_ioctl	= v4l_compat_ioctl32,</div><div class='hunk'>@@ -364,6 +371,7 @@ static struct video_device typhoon_radio = {</div><div class='ctx'> 	.name		= "Typhoon Radio",</div><div class='ctx'> 	.fops           = &amp;typhoon_fops,</div><div class='ctx'> 	.ioctl_ops 	= &amp;typhoon_ioctl_ops,</div><div class='add'>+	.release	= video_device_release_empty,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_RADIO_TYPHOON_PROC_FS</div><div class='hunk'>@@ -446,9 +454,8 @@ static int __init typhoon_init(void)</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	typhoon_radio.priv = &amp;typhoon_unit;</div><div class='del'>-	if (video_register_device(&amp;typhoon_radio, VFL_TYPE_RADIO, radio_nr) == -1)</div><div class='del'>-	{</div><div class='add'>+	video_set_drvdata(&amp;typhoon_radio, &amp;typhoon_unit);</div><div class='add'>+	if (video_register_device(&amp;typhoon_radio, VFL_TYPE_RADIO, radio_nr) &lt; 0) {</div><div class='ctx'> 		release_region(io, 8);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/media/radio/radio-zoltrix.c b/drivers/media/radio/radio-zoltrix.c<br/>index 51d57ed3b3e1..15b10bad6796 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/radio/radio-zoltrix.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/radio/radio-zoltrix.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/radio/radio-zoltrix.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/radio/radio-zoltrix.c</a></div><div class='hunk'>@@ -69,6 +69,7 @@ static int io = CONFIG_RADIO_ZOLTRIX_PORT;</div><div class='ctx'> static int radio_nr = -1;</div><div class='ctx'> </div><div class='ctx'> struct zol_device {</div><div class='add'>+	unsigned long in_use;</div><div class='ctx'> 	int port;</div><div class='ctx'> 	int curvol;</div><div class='ctx'> 	unsigned long curfreq;</div><div class='hunk'>@@ -122,8 +123,11 @@ static int zol_setfreq(struct zol_device *dev, unsigned long freq)</div><div class='ctx'> 	unsigned int stereo = dev-&gt;stereo;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	if (freq == 0)</div><div class='del'>-		return 1;</div><div class='add'>+	if (freq == 0) {</div><div class='add'>+		printk(KERN_WARNING "zoltrix: received zero freq. Failed to set.\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	m = (freq / 160 - 8800) * 2;</div><div class='ctx'> 	f = (unsigned long long) m + 0x4d1c;</div><div class='ctx'> </div><div class='hunk'>@@ -245,8 +249,7 @@ static int vidioc_querycap(struct file *file, void  *priv,</div><div class='ctx'> static int vidioc_g_tuner(struct file *file, void *priv,</div><div class='ctx'> 					struct v4l2_tuner *v)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct zol_device *zol = dev-&gt;priv;</div><div class='add'>+	struct zol_device *zol = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	if (v-&gt;index &gt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -276,19 +279,20 @@ static int vidioc_s_tuner(struct file *file, void *priv,</div><div class='ctx'> static int vidioc_s_frequency(struct file *file, void *priv,</div><div class='ctx'> 					struct v4l2_frequency *f)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct zol_device *zol = dev-&gt;priv;</div><div class='add'>+	struct zol_device *zol = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	zol-&gt;curfreq = f-&gt;frequency;</div><div class='del'>-	zol_setfreq(zol, zol-&gt;curfreq);</div><div class='add'>+	if (zol_setfreq(zol, zol-&gt;curfreq) != 0) {</div><div class='add'>+		printk(KERN_WARNING "zoltrix: Set frequency failed.\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int vidioc_g_frequency(struct file *file, void *priv,</div><div class='ctx'> 					struct v4l2_frequency *f)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct zol_device *zol = dev-&gt;priv;</div><div class='add'>+	struct zol_device *zol = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	f-&gt;type = V4L2_TUNER_RADIO;</div><div class='ctx'> 	f-&gt;frequency = zol-&gt;curfreq;</div><div class='hunk'>@@ -313,8 +317,7 @@ static int vidioc_queryctrl(struct file *file, void *priv,</div><div class='ctx'> static int vidioc_g_ctrl(struct file *file, void *priv,</div><div class='ctx'> 				struct v4l2_control *ctrl)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct zol_device *zol = dev-&gt;priv;</div><div class='add'>+	struct zol_device *zol = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	switch (ctrl-&gt;id) {</div><div class='ctx'> 	case V4L2_CID_AUDIO_MUTE:</div><div class='hunk'>@@ -330,8 +333,7 @@ static int vidioc_g_ctrl(struct file *file, void *priv,</div><div class='ctx'> static int vidioc_s_ctrl(struct file *file, void *priv,</div><div class='ctx'> 				struct v4l2_control *ctrl)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct zol_device *zol = dev-&gt;priv;</div><div class='add'>+	struct zol_device *zol = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	switch (ctrl-&gt;id) {</div><div class='ctx'> 	case V4L2_CID_AUDIO_MUTE:</div><div class='hunk'>@@ -347,7 +349,10 @@ static int vidioc_s_ctrl(struct file *file, void *priv,</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	zol-&gt;stereo = 1;</div><div class='del'>-	zol_setfreq(zol, zol-&gt;curfreq);</div><div class='add'>+	if (zol_setfreq(zol, zol-&gt;curfreq) != 0) {</div><div class='add'>+		printk(KERN_WARNING "zoltrix: Set frequency failed.\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> #if 0</div><div class='ctx'> /* FIXME: Implement stereo/mono switch on V4L2 */</div><div class='ctx'> 			if (v-&gt;mode &amp; VIDEO_SOUND_STEREO) {</div><div class='hunk'>@@ -396,11 +401,22 @@ static int vidioc_s_audio(struct file *file, void *priv,</div><div class='ctx'> </div><div class='ctx'> static struct zol_device zoltrix_unit;</div><div class='ctx'> </div><div class='add'>+static int zoltrix_exclusive_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	return test_and_set_bit(0, &amp;zoltrix_unit.in_use) ? -EBUSY : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int zoltrix_exclusive_release(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	clear_bit(0, &amp;zoltrix_unit.in_use);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct file_operations zoltrix_fops =</div><div class='ctx'> {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='del'>-	.open           = video_exclusive_open,</div><div class='del'>-	.release        = video_exclusive_release,</div><div class='add'>+	.open           = zoltrix_exclusive_open,</div><div class='add'>+	.release        = zoltrix_exclusive_release,</div><div class='ctx'> 	.ioctl		= video_ioctl2,</div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='ctx'> 	.compat_ioctl	= v4l_compat_ioctl32,</div><div class='hunk'>@@ -427,6 +443,7 @@ static struct video_device zoltrix_radio = {</div><div class='ctx'> 	.name		= "Zoltrix Radio Plus",</div><div class='ctx'> 	.fops           = &amp;zoltrix_fops,</div><div class='ctx'> 	.ioctl_ops 	= &amp;zoltrix_ioctl_ops,</div><div class='add'>+	.release	= video_device_release_empty,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init zoltrix_init(void)</div><div class='hunk'>@@ -440,7 +457,7 @@ static int __init zoltrix_init(void)</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	zoltrix_radio.priv = &amp;zoltrix_unit;</div><div class='add'>+	video_set_drvdata(&amp;zoltrix_radio, &amp;zoltrix_unit);</div><div class='ctx'> 	if (!request_region(io, 2, "zoltrix")) {</div><div class='ctx'> 		printk(KERN_ERR "zoltrix: port 0x%x already in use\n", io);</div><div class='ctx'> 		return -EBUSY;</div><div class='head'>diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig<br/>index 3e9e0dcd217e..47102c2c8250 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/Kconfig</a></div><div class='hunk'>@@ -34,6 +34,7 @@ config VIDEOBUF_DVB</div><div class='ctx'> 	select VIDEOBUF_GEN</div><div class='ctx'> </div><div class='ctx'> config VIDEO_BTCX</div><div class='add'>+	depends on PCI</div><div class='ctx'> 	tristate</div><div class='ctx'> </div><div class='ctx'> config VIDEO_IR</div><div class='hunk'>@@ -71,6 +72,15 @@ config VIDEO_ADV_DEBUG</div><div class='ctx'> 	  V4L devices.</div><div class='ctx'> 	  In doubt, say N.</div><div class='ctx'> </div><div class='add'>+config VIDEO_FIXED_MINOR_RANGES</div><div class='add'>+	bool "Enable old-style fixed minor ranges for video devices"</div><div class='add'>+	default n</div><div class='add'>+	---help---</div><div class='add'>+	  Say Y here to enable the old-style fixed-range minor assignments.</div><div class='add'>+	  Only useful if you rely on the old behavior and use mknod instead of udev.</div><div class='add'>+</div><div class='add'>+	  When in doubt, say N.</div><div class='add'>+</div><div class='ctx'> config VIDEO_HELPER_CHIPS_AUTO</div><div class='ctx'> 	bool "Autoselect pertinent encoders/decoders and other helper chips"</div><div class='ctx'> 	default y</div><div class='hunk'>@@ -578,13 +588,6 @@ config VIDEO_SAA5249</div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='ctx'> 	  module will be called saa5249.</div><div class='ctx'> </div><div class='del'>-config TUNER_3036</div><div class='del'>-	tristate "SAB3036 tuner"</div><div class='del'>-	depends on I2C &amp;&amp; VIDEO_V4L1</div><div class='del'>-	help</div><div class='del'>-	  Say Y here to include support for Philips SAB3036 compatible tuners.</div><div class='del'>-	  If in doubt, say N.</div><div class='del'>-</div><div class='ctx'> config VIDEO_VINO</div><div class='ctx'> 	tristate "SGI Vino Video For Linux (EXPERIMENTAL)"</div><div class='ctx'> 	depends on I2C &amp;&amp; SGI_IP22 &amp;&amp; EXPERIMENTAL &amp;&amp; VIDEO_V4L2</div><div class='hunk'>@@ -602,79 +605,7 @@ config VIDEO_STRADIS</div><div class='ctx'> 	  driver for PCI.  There is a product page at</div><div class='ctx'> 	  &lt;http://www.stradis.com/&gt;.</div><div class='ctx'> </div><div class='del'>-config VIDEO_ZORAN</div><div class='del'>-	tristate "Zoran ZR36057/36067 Video For Linux"</div><div class='del'>-	depends on PCI &amp;&amp; I2C_ALGOBIT &amp;&amp; VIDEO_V4L1 &amp;&amp; VIRT_TO_BUS</div><div class='del'>-	help</div><div class='del'>-	  Say Y for support for MJPEG capture cards based on the Zoran</div><div class='del'>-	  36057/36067 PCI controller chipset. This includes the Iomega</div><div class='del'>-	  Buz, Pinnacle DC10+ and the Linux Media Labs LML33. There is</div><div class='del'>-	  a driver homepage at &lt;http://mjpeg.sf.net/driver-zoran/&gt;. For</div><div class='del'>-	  more information, check &lt;file:Documentation/video4linux/Zoran&gt;.</div><div class='del'>-</div><div class='del'>-	  To compile this driver as a module, choose M here: the</div><div class='del'>-	  module will be called zr36067.</div><div class='del'>-</div><div class='del'>-config VIDEO_ZORAN_DC30</div><div class='del'>-	tristate "Pinnacle/Miro DC30(+) support"</div><div class='del'>-	depends on VIDEO_ZORAN</div><div class='del'>-	select VIDEO_ADV7175 if VIDEO_HELPER_CHIPS_AUTO</div><div class='del'>-	select VIDEO_VPX3220 if VIDEO_HELPER_CHIPS_AUTO</div><div class='del'>-	help</div><div class='del'>-	  Support for the Pinnacle/Miro DC30(+) MJPEG capture/playback</div><div class='del'>-	  card. This also supports really old DC10 cards based on the</div><div class='del'>-	  zr36050 MJPEG codec and zr36016 VFE.</div><div class='del'>-</div><div class='del'>-config VIDEO_ZORAN_ZR36060</div><div class='del'>-	tristate "Zoran ZR36060"</div><div class='del'>-	depends on VIDEO_ZORAN</div><div class='del'>-	help</div><div class='del'>-	  Say Y to support Zoran boards based on 36060 chips.</div><div class='del'>-	  This includes Iomega Buz, Pinnacle DC10, Linux media Labs 33</div><div class='del'>-	  and 33 R10 and AverMedia 6 boards.</div><div class='del'>-</div><div class='del'>-config VIDEO_ZORAN_BUZ</div><div class='del'>-	tristate "Iomega Buz support"</div><div class='del'>-	depends on VIDEO_ZORAN_ZR36060</div><div class='del'>-	select VIDEO_SAA7111 if VIDEO_HELPER_CHIPS_AUTO</div><div class='del'>-	select VIDEO_SAA7185 if VIDEO_HELPER_CHIPS_AUTO</div><div class='del'>-	help</div><div class='del'>-	  Support for the Iomega Buz MJPEG capture/playback card.</div><div class='del'>-</div><div class='del'>-config VIDEO_ZORAN_DC10</div><div class='del'>-	tristate "Pinnacle/Miro DC10(+) support"</div><div class='del'>-	depends on VIDEO_ZORAN_ZR36060</div><div class='del'>-	select VIDEO_SAA7110 if VIDEO_HELPER_CHIPS_AUTO</div><div class='del'>-	select VIDEO_ADV7175 if VIDEO_HELPER_CHIPS_AUTO</div><div class='del'>-	help</div><div class='del'>-	  Support for the Pinnacle/Miro DC10(+) MJPEG capture/playback</div><div class='del'>-	  card.</div><div class='del'>-</div><div class='del'>-config VIDEO_ZORAN_LML33</div><div class='del'>-	tristate "Linux Media Labs LML33 support"</div><div class='del'>-	depends on VIDEO_ZORAN_ZR36060</div><div class='del'>-	select VIDEO_BT819 if VIDEO_HELPER_CHIPS_AUTO</div><div class='del'>-	select VIDEO_BT856 if VIDEO_HELPER_CHIPS_AUTO</div><div class='del'>-	help</div><div class='del'>-	  Support for the Linux Media Labs LML33 MJPEG capture/playback</div><div class='del'>-	  card.</div><div class='del'>-</div><div class='del'>-config VIDEO_ZORAN_LML33R10</div><div class='del'>-	tristate "Linux Media Labs LML33R10 support"</div><div class='del'>-	depends on VIDEO_ZORAN_ZR36060</div><div class='del'>-	select VIDEO_SAA7114 if VIDEO_HELPER_CHIPS_AUTO</div><div class='del'>-	select VIDEO_ADV7170 if VIDEO_HELPER_CHIPS_AUTO</div><div class='del'>-	help</div><div class='del'>-	  support for the Linux Media Labs LML33R10 MJPEG capture/playback</div><div class='del'>-	  card.</div><div class='del'>-</div><div class='del'>-config VIDEO_ZORAN_AVS6EYES</div><div class='del'>-	tristate "AverMedia 6 Eyes support (EXPERIMENTAL)"</div><div class='del'>-	depends on VIDEO_ZORAN_ZR36060 &amp;&amp; EXPERIMENTAL &amp;&amp; VIDEO_V4L1</div><div class='del'>-	select VIDEO_BT856 if VIDEO_HELPER_CHIPS_AUTO</div><div class='del'>-	select VIDEO_KS0127 if VIDEO_HELPER_CHIPS_AUTO</div><div class='del'>-	help</div><div class='del'>-	  Support for the AverMedia 6 Eyes video surveillance card.</div><div class='add'>+source "drivers/media/video/zoran/Kconfig"</div><div class='ctx'> </div><div class='ctx'> config VIDEO_MEYE</div><div class='ctx'> 	tristate "Sony Vaio Picturebook Motion Eye Video For Linux"</div><div class='hunk'>@@ -697,7 +628,7 @@ config VIDEO_MXB</div><div class='ctx'> 	depends on PCI &amp;&amp; VIDEO_V4L1 &amp;&amp; I2C</div><div class='ctx'> 	select VIDEO_SAA7146_VV</div><div class='ctx'> 	select VIDEO_TUNER</div><div class='del'>-	select VIDEO_SAA7111 if VIDEO_HELPER_CHIPS_AUTO</div><div class='add'>+	select VIDEO_SAA7115 if VIDEO_HELPER_CHIPS_AUTO</div><div class='ctx'> 	select VIDEO_TDA9840 if VIDEO_HELPER_CHIPS_AUTO</div><div class='ctx'> 	select VIDEO_TEA6415C if VIDEO_HELPER_CHIPS_AUTO</div><div class='ctx'> 	select VIDEO_TEA6420 if VIDEO_HELPER_CHIPS_AUTO</div><div class='hunk'>@@ -708,21 +639,6 @@ config VIDEO_MXB</div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='ctx'> 	  module will be called mxb.</div><div class='ctx'> </div><div class='del'>-config VIDEO_DPC</div><div class='del'>-	tristate "Philips-Semiconductors 'dpc7146 demonstration board'"</div><div class='del'>-	depends on PCI &amp;&amp; VIDEO_V4L1 &amp;&amp; I2C</div><div class='del'>-	select VIDEO_SAA7146_VV</div><div class='del'>-	select VIDEO_SAA7111 if VIDEO_HELPER_CHIPS_AUTO</div><div class='del'>-	---help---</div><div class='del'>-	  This is a video4linux driver for the 'dpc7146 demonstration</div><div class='del'>-	  board' by Philips-Semiconductors. It's the reference design</div><div class='del'>-	  for SAA7146 bases boards, so if you have some unsupported</div><div class='del'>-	  saa7146 based, analog video card, chances are good that it</div><div class='del'>-	  will work with this skeleton driver.</div><div class='del'>-</div><div class='del'>-	  To compile this driver as a module, choose M here: the</div><div class='del'>-	  module will be called dpc7146.</div><div class='del'>-</div><div class='ctx'> config VIDEO_HEXIUM_ORION</div><div class='ctx'> 	tristate "Hexium HV-PCI6 and Orion frame grabber"</div><div class='ctx'> 	depends on PCI &amp;&amp; VIDEO_V4L2 &amp;&amp; I2C</div><div class='hunk'>@@ -784,6 +700,70 @@ config VIDEO_CAFE_CCIC</div><div class='ctx'> 	  CMOS camera controller.  This is the controller found on first-</div><div class='ctx'> 	  generation OLPC systems.</div><div class='ctx'> </div><div class='add'>+config SOC_CAMERA</div><div class='add'>+	tristate "SoC camera support"</div><div class='add'>+	depends on VIDEO_V4L2 &amp;&amp; HAS_DMA</div><div class='add'>+	select VIDEOBUF_GEN</div><div class='add'>+	help</div><div class='add'>+	  SoC Camera is a common API to several cameras, not connecting</div><div class='add'>+	  over a bus like PCI or USB. For example some i2c camera connected</div><div class='add'>+	  directly to the data bus of an SoC.</div><div class='add'>+</div><div class='add'>+config SOC_CAMERA_MT9M001</div><div class='add'>+	tristate "mt9m001 support"</div><div class='add'>+	depends on SOC_CAMERA &amp;&amp; I2C</div><div class='add'>+	select GPIO_PCA953X if MT9M001_PCA9536_SWITCH</div><div class='add'>+	help</div><div class='add'>+	  This driver supports MT9M001 cameras from Micron, monochrome</div><div class='add'>+	  and colour models.</div><div class='add'>+</div><div class='add'>+config MT9M001_PCA9536_SWITCH</div><div class='add'>+	bool "pca9536 datawidth switch for mt9m001"</div><div class='add'>+	depends on SOC_CAMERA_MT9M001 &amp;&amp; GENERIC_GPIO</div><div class='add'>+	help</div><div class='add'>+	  Select this if your MT9M001 camera uses a PCA9536 I2C GPIO</div><div class='add'>+	  extender to switch between 8 and 10 bit datawidth modes</div><div class='add'>+</div><div class='add'>+config SOC_CAMERA_MT9M111</div><div class='add'>+	tristate "mt9m111 support"</div><div class='add'>+	depends on SOC_CAMERA &amp;&amp; I2C</div><div class='add'>+	help</div><div class='add'>+	  This driver supports MT9M111 cameras from Micron</div><div class='add'>+</div><div class='add'>+config SOC_CAMERA_MT9V022</div><div class='add'>+	tristate "mt9v022 support"</div><div class='add'>+	depends on SOC_CAMERA &amp;&amp; I2C</div><div class='add'>+	select GPIO_PCA953X if MT9V022_PCA9536_SWITCH</div><div class='add'>+	help</div><div class='add'>+	  This driver supports MT9V022 cameras from Micron</div><div class='add'>+</div><div class='add'>+config MT9V022_PCA9536_SWITCH</div><div class='add'>+	bool "pca9536 datawidth switch for mt9v022"</div><div class='add'>+	depends on SOC_CAMERA_MT9V022 &amp;&amp; GENERIC_GPIO</div><div class='add'>+	help</div><div class='add'>+	  Select this if your MT9V022 camera uses a PCA9536 I2C GPIO</div><div class='add'>+	  extender to switch between 8 and 10 bit datawidth modes</div><div class='add'>+</div><div class='add'>+config SOC_CAMERA_PLATFORM</div><div class='add'>+	tristate "platform camera support"</div><div class='add'>+	depends on SOC_CAMERA</div><div class='add'>+	help</div><div class='add'>+	  This is a generic SoC camera platform driver, useful for testing</div><div class='add'>+</div><div class='add'>+config VIDEO_PXA27x</div><div class='add'>+	tristate "PXA27x Quick Capture Interface driver"</div><div class='add'>+	depends on VIDEO_DEV &amp;&amp; PXA27x &amp;&amp; SOC_CAMERA</div><div class='add'>+	select VIDEOBUF_DMA_SG</div><div class='add'>+	---help---</div><div class='add'>+	  This is a v4l2 driver for the PXA27x Quick Capture Interface</div><div class='add'>+</div><div class='add'>+config VIDEO_SH_MOBILE_CEU</div><div class='add'>+	tristate "SuperH Mobile CEU Interface driver"</div><div class='add'>+	depends on VIDEO_DEV &amp;&amp; SOC_CAMERA &amp;&amp; HAS_DMA</div><div class='add'>+	select VIDEOBUF_DMA_CONTIG</div><div class='add'>+	---help---</div><div class='add'>+	  This is a v4l2 driver for the SuperH Mobile CEU Interface</div><div class='add'>+</div><div class='ctx'> #</div><div class='ctx'> # USB Multimedia device configuration</div><div class='ctx'> #</div><div class='hunk'>@@ -822,8 +802,7 @@ config VIDEO_OVCAMCHIP</div><div class='ctx'> </div><div class='ctx'> config USB_W9968CF</div><div class='ctx'> 	tristate "USB W996[87]CF JPEG Dual Mode Camera support"</div><div class='del'>-	depends on VIDEO_V4L1 &amp;&amp; I2C</div><div class='del'>-	select VIDEO_OVCAMCHIP</div><div class='add'>+	depends on VIDEO_V4L1 &amp;&amp; I2C &amp;&amp; VIDEO_OVCAMCHIP</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  Say Y here if you want support for cameras based on OV681 or</div><div class='ctx'> 	  Winbond W9967CF/W9968CF JPEG USB Dual Mode Camera Chips.</div><div class='hunk'>@@ -914,64 +893,4 @@ config USB_S2255</div><div class='ctx'> </div><div class='ctx'> endif # V4L_USB_DRIVERS</div><div class='ctx'> </div><div class='del'>-config SOC_CAMERA</div><div class='del'>-	tristate "SoC camera support"</div><div class='del'>-	depends on VIDEO_V4L2 &amp;&amp; HAS_DMA</div><div class='del'>-	select VIDEOBUF_GEN</div><div class='del'>-	help</div><div class='del'>-	  SoC Camera is a common API to several cameras, not connecting</div><div class='del'>-	  over a bus like PCI or USB. For example some i2c camera connected</div><div class='del'>-	  directly to the data bus of an SoC.</div><div class='del'>-</div><div class='del'>-config SOC_CAMERA_MT9M001</div><div class='del'>-	tristate "mt9m001 support"</div><div class='del'>-	depends on SOC_CAMERA &amp;&amp; I2C</div><div class='del'>-	select GPIO_PCA953X if MT9M001_PCA9536_SWITCH</div><div class='del'>-	help</div><div class='del'>-	  This driver supports MT9M001 cameras from Micron, monochrome</div><div class='del'>-	  and colour models.</div><div class='del'>-</div><div class='del'>-config MT9M001_PCA9536_SWITCH</div><div class='del'>-	bool "pca9536 datawidth switch for mt9m001"</div><div class='del'>-	depends on SOC_CAMERA_MT9M001 &amp;&amp; GENERIC_GPIO</div><div class='del'>-	help</div><div class='del'>-	  Select this if your MT9M001 camera uses a PCA9536 I2C GPIO</div><div class='del'>-	  extender to switch between 8 and 10 bit datawidth modes</div><div class='del'>-</div><div class='del'>-config SOC_CAMERA_MT9V022</div><div class='del'>-	tristate "mt9v022 support"</div><div class='del'>-	depends on SOC_CAMERA &amp;&amp; I2C</div><div class='del'>-	select GPIO_PCA953X if MT9V022_PCA9536_SWITCH</div><div class='del'>-	help</div><div class='del'>-	  This driver supports MT9V022 cameras from Micron</div><div class='del'>-</div><div class='del'>-config MT9V022_PCA9536_SWITCH</div><div class='del'>-	bool "pca9536 datawidth switch for mt9v022"</div><div class='del'>-	depends on SOC_CAMERA_MT9V022 &amp;&amp; GENERIC_GPIO</div><div class='del'>-	help</div><div class='del'>-	  Select this if your MT9V022 camera uses a PCA9536 I2C GPIO</div><div class='del'>-	  extender to switch between 8 and 10 bit datawidth modes</div><div class='del'>-</div><div class='del'>-config SOC_CAMERA_PLATFORM</div><div class='del'>-	tristate "platform camera support"</div><div class='del'>-	depends on SOC_CAMERA</div><div class='del'>-	help</div><div class='del'>-	  This is a generic SoC camera platform driver, useful for testing</div><div class='del'>-</div><div class='del'>-config VIDEO_PXA27x</div><div class='del'>-	tristate "PXA27x Quick Capture Interface driver"</div><div class='del'>-	depends on VIDEO_DEV &amp;&amp; PXA27x</div><div class='del'>-	select SOC_CAMERA</div><div class='del'>-	select VIDEOBUF_DMA_SG</div><div class='del'>-	---help---</div><div class='del'>-	  This is a v4l2 driver for the PXA27x Quick Capture Interface</div><div class='del'>-</div><div class='del'>-config VIDEO_SH_MOBILE_CEU</div><div class='del'>-	tristate "SuperH Mobile CEU Interface driver"</div><div class='del'>-	depends on VIDEO_DEV &amp;&amp; HAS_DMA</div><div class='del'>-	select SOC_CAMERA</div><div class='del'>-	select VIDEOBUF_DMA_CONTIG</div><div class='del'>-	---help---</div><div class='del'>-	  This is a v4l2 driver for the SuperH Mobile CEU Interface</div><div class='del'>-</div><div class='ctx'> endif # VIDEO_CAPTURE_DRIVERS</div><div class='head'>diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile<br/>index ef7c8d3ffb18..16962f3aa157 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/Makefile</a></div><div class='hunk'>@@ -2,8 +2,6 @@</div><div class='ctx'> # Makefile for the video capture/playback device drivers.</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-zr36067-objs	:=	zoran_procfs.o zoran_device.o \</div><div class='del'>-			zoran_driver.o zoran_card.o</div><div class='ctx'> tuner-objs	:=	tuner-core.o</div><div class='ctx'> </div><div class='ctx'> msp3400-objs	:=	msp3400-driver.o msp3400-kthreads.o</div><div class='hunk'>@@ -54,9 +52,7 @@ obj-$(CONFIG_VIDEO_BT856) += bt856.o</div><div class='ctx'> obj-$(CONFIG_VIDEO_BT866) += bt866.o</div><div class='ctx'> obj-$(CONFIG_VIDEO_KS0127) += ks0127.o</div><div class='ctx'> </div><div class='del'>-obj-$(CONFIG_VIDEO_ZORAN) += zr36067.o videocodec.o</div><div class='del'>-obj-$(CONFIG_VIDEO_ZORAN_DC30) += zr36050.o zr36016.o</div><div class='del'>-obj-$(CONFIG_VIDEO_ZORAN_ZR36060) += zr36060.o</div><div class='add'>+obj-$(CONFIG_VIDEO_ZORAN) += zoran/</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_VIDEO_PMS) += pms.o</div><div class='ctx'> obj-$(CONFIG_VIDEO_VINO) += vino.o indycam.o</div><div class='hunk'>@@ -84,8 +80,6 @@ obj-$(CONFIG_VIDEO_CPIA2) += cpia2/</div><div class='ctx'> obj-$(CONFIG_VIDEO_MXB) += mxb.o</div><div class='ctx'> obj-$(CONFIG_VIDEO_HEXIUM_ORION) += hexium_orion.o</div><div class='ctx'> obj-$(CONFIG_VIDEO_HEXIUM_GEMINI) += hexium_gemini.o</div><div class='del'>-obj-$(CONFIG_VIDEO_DPC) += dpc7146.o</div><div class='del'>-obj-$(CONFIG_TUNER_3036) += tuner-3036.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_VIDEOBUF_GEN) += videobuf-core.o</div><div class='ctx'> obj-$(CONFIG_VIDEOBUF_DMA_SG) += videobuf-dma-sg.o</div><div class='hunk'>@@ -137,6 +131,7 @@ obj-$(CONFIG_VIDEO_PXA27x)	+= pxa_camera.o</div><div class='ctx'> obj-$(CONFIG_VIDEO_SH_MOBILE_CEU)	+= sh_mobile_ceu_camera.o</div><div class='ctx'> obj-$(CONFIG_SOC_CAMERA)	+= soc_camera.o</div><div class='ctx'> obj-$(CONFIG_SOC_CAMERA_MT9M001)	+= mt9m001.o</div><div class='add'>+obj-$(CONFIG_SOC_CAMERA_MT9M111)	+= mt9m111.o</div><div class='ctx'> obj-$(CONFIG_SOC_CAMERA_MT9V022)	+= mt9v022.o</div><div class='ctx'> obj-$(CONFIG_SOC_CAMERA_PLATFORM)	+= soc_camera_platform.o</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/adv7170.c b/drivers/media/video/adv7170.c<br/>index f794f2dbfb32..e0eb4f321442 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/adv7170.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/adv7170.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/adv7170.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/adv7170.c</a></div><div class='hunk'>@@ -29,43 +29,24 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/fs.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/major.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/i2c.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/pgtable.h&gt;</div><div class='del'>-#include &lt;asm/page.h&gt;</div><div class='add'>+#include &lt;linux/ioctl.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='del'>-</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/i2c-id.h&gt;</div><div class='ctx'> #include &lt;linux/videodev.h&gt;</div><div class='ctx'> #include &lt;linux/video_encoder.h&gt;</div><div class='add'>+#include &lt;media/v4l2-common.h&gt;</div><div class='add'>+#include &lt;media/v4l2-i2c-drv-legacy.h&gt;</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("Analog Devices ADV7170 video encoder driver");</div><div class='ctx'> MODULE_AUTHOR("Maxim Yevtyushkin");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-#define I2C_NAME(x) (x)-&gt;name</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> static int debug;</div><div class='ctx'> module_param(debug, int, 0);</div><div class='ctx'> MODULE_PARM_DESC(debug, "Debug level (0-1)");</div><div class='ctx'> </div><div class='del'>-#define dprintk(num, format, args...) \</div><div class='del'>-	do { \</div><div class='del'>-		if (debug &gt;= num) \</div><div class='del'>-			printk(format, ##args); \</div><div class='del'>-	} while (0)</div><div class='del'>-</div><div class='ctx'> /* ----------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='ctx'> struct adv7170 {</div><div class='hunk'>@@ -80,21 +61,12 @@ struct adv7170 {</div><div class='ctx'> 	int sat;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define   I2C_ADV7170        0xd4</div><div class='del'>-#define   I2C_ADV7171        0x54</div><div class='del'>-</div><div class='del'>-static char adv7170_name[] = "adv7170";</div><div class='del'>-static char adv7171_name[] = "adv7171";</div><div class='del'>-</div><div class='ctx'> static char *inputs[] = { "pass_through", "play_back" };</div><div class='ctx'> static char *norms[] = { "PAL", "NTSC" };</div><div class='ctx'> </div><div class='ctx'> /* ----------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='del'>-static inline int</div><div class='del'>-adv7170_write (struct i2c_client *client,</div><div class='del'>-	       u8                 reg,</div><div class='del'>-	       u8                 value)</div><div class='add'>+static inline int adv7170_write(struct i2c_client *client, u8 reg, u8 value)</div><div class='ctx'> {</div><div class='ctx'> 	struct adv7170 *encoder = i2c_get_clientdata(client);</div><div class='ctx'> </div><div class='hunk'>@@ -102,17 +74,13 @@ adv7170_write (struct i2c_client *client,</div><div class='ctx'> 	return i2c_smbus_write_byte_data(client, reg, value);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int</div><div class='del'>-adv7170_read (struct i2c_client *client,</div><div class='del'>-	      u8                 reg)</div><div class='add'>+static inline int adv7170_read(struct i2c_client *client, u8 reg)</div><div class='ctx'> {</div><div class='ctx'> 	return i2c_smbus_read_byte_data(client, reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-adv7170_write_block (struct i2c_client *client,</div><div class='del'>-		     const u8          *data,</div><div class='del'>-		     unsigned int       len)</div><div class='add'>+static int adv7170_write_block(struct i2c_client *client,</div><div class='add'>+		     const u8 *data, unsigned int len)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = -1;</div><div class='ctx'> 	u8 reg;</div><div class='hunk'>@@ -133,33 +101,25 @@ adv7170_write_block (struct i2c_client *client,</div><div class='ctx'> 				    encoder-&gt;reg[reg++] = data[1];</div><div class='ctx'> 				len -= 2;</div><div class='ctx'> 				data += 2;</div><div class='del'>-			} while (len &gt;= 2 &amp;&amp; data[0] == reg &amp;&amp;</div><div class='del'>-				 block_len &lt; 32);</div><div class='del'>-			if ((ret = i2c_master_send(client, block_data,</div><div class='del'>-						   block_len)) &lt; 0)</div><div class='add'>+			} while (len &gt;= 2 &amp;&amp; data[0] == reg &amp;&amp; block_len &lt; 32);</div><div class='add'>+			ret = i2c_master_send(client, block_data, block_len);</div><div class='add'>+			if (ret &lt; 0)</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* do some slow I2C emulation kind of thing */</div><div class='ctx'> 		while (len &gt;= 2) {</div><div class='ctx'> 			reg = *data++;</div><div class='del'>-			if ((ret = adv7170_write(client, reg,</div><div class='del'>-						 *data++)) &lt; 0)</div><div class='add'>+			ret = adv7170_write(client, reg, *data++);</div><div class='add'>+			if (ret &lt; 0)</div><div class='ctx'> 				break;</div><div class='ctx'> 			len -= 2;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* ----------------------------------------------------------------------- */</div><div class='del'>-// Output filter:  S-Video  Composite</div><div class='del'>-</div><div class='del'>-#define MR050       0x11	//0x09</div><div class='del'>-#define MR060       0x14	//0x0c</div><div class='del'>-</div><div class='del'>-//---------------------------------------------------------------------------</div><div class='ctx'> </div><div class='ctx'> #define TR0MODE     0x4c</div><div class='ctx'> #define TR0RST	    0x80</div><div class='hunk'>@@ -167,7 +127,6 @@ adv7170_write_block (struct i2c_client *client,</div><div class='ctx'> #define TR1CAPT	    0x00</div><div class='ctx'> #define TR1PLAY	    0x00</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> static const unsigned char init_NTSC[] = {</div><div class='ctx'> 	0x00, 0x10,		// MR0</div><div class='ctx'> 	0x01, 0x20,		// MR1</div><div class='hunk'>@@ -227,15 +186,11 @@ static const unsigned char init_PAL[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-adv7170_command (struct i2c_client *client,</div><div class='del'>-		 unsigned int       cmd,</div><div class='del'>-		 void *             arg)</div><div class='add'>+static int adv7170_command(struct i2c_client *client, unsigned cmd, void *arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct adv7170 *encoder = i2c_get_clientdata(client);</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='del'>-</div><div class='ctx'> 	case 0:</div><div class='ctx'> #if 0</div><div class='ctx'> 		/* This is just for testing!!! */</div><div class='hunk'>@@ -254,18 +209,16 @@ adv7170_command (struct i2c_client *client,</div><div class='ctx'> 			     VIDEO_ENCODER_NTSC;</div><div class='ctx'> 		cap-&gt;inputs = 2;</div><div class='ctx'> 		cap-&gt;outputs = 1;</div><div class='del'>-	}</div><div class='ctx'> 		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	case ENCODER_SET_NORM:</div><div class='ctx'> 	{</div><div class='ctx'> 		int iarg = *(int *) arg;</div><div class='ctx'> </div><div class='del'>-		dprintk(1, KERN_DEBUG "%s_command: set norm %d",</div><div class='del'>-			I2C_NAME(client), iarg);</div><div class='add'>+		v4l_dbg(1, debug, client, "set norm %d\n", iarg);</div><div class='ctx'> </div><div class='ctx'> 		switch (iarg) {</div><div class='del'>-</div><div class='ctx'> 		case VIDEO_MODE_NTSC:</div><div class='ctx'> 			adv7170_write_block(client, init_NTSC,</div><div class='ctx'> 					    sizeof(init_NTSC));</div><div class='hunk'>@@ -285,16 +238,13 @@ adv7170_command (struct i2c_client *client,</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		default:</div><div class='del'>-			dprintk(1, KERN_ERR "%s: illegal norm: %d\n",</div><div class='del'>-			       I2C_NAME(client), iarg);</div><div class='add'>+			v4l_dbg(1, debug, client, "illegal norm: %d\n", iarg);</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-</div><div class='ctx'> 		}</div><div class='del'>-		dprintk(1, KERN_DEBUG "%s: switched to %s\n", I2C_NAME(client),</div><div class='del'>-			norms[iarg]);</div><div class='add'>+		v4l_dbg(1, debug, client, "switched to %s\n", norms[iarg]);</div><div class='ctx'> 		encoder-&gt;norm = iarg;</div><div class='del'>-	}</div><div class='ctx'> 		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	case ENCODER_SET_INPUT:</div><div class='ctx'> 	{</div><div class='hunk'>@@ -304,19 +254,17 @@ adv7170_command (struct i2c_client *client,</div><div class='ctx'> 		 *iarg = 1: input is from ZR36060</div><div class='ctx'> 		 *iarg = 2: color bar */</div><div class='ctx'> </div><div class='del'>-		dprintk(1, KERN_DEBUG "%s_command: set input from %s\n",</div><div class='del'>-			I2C_NAME(client),</div><div class='add'>+		v4l_dbg(1, debug, client, "set input from %s\n",</div><div class='ctx'> 			iarg == 0 ? "decoder" : "ZR36060");</div><div class='ctx'> </div><div class='ctx'> 		switch (iarg) {</div><div class='del'>-</div><div class='ctx'> 		case 0:</div><div class='ctx'> 			adv7170_write(client, 0x01, 0x20);</div><div class='ctx'> 			adv7170_write(client, 0x08, TR1CAPT);	/* TR1 */</div><div class='ctx'> 			adv7170_write(client, 0x02, 0x0e);	// Enable genlock</div><div class='ctx'> 			adv7170_write(client, 0x07, TR0MODE | TR0RST);</div><div class='ctx'> 			adv7170_write(client, 0x07, TR0MODE);</div><div class='del'>-			//udelay(10);</div><div class='add'>+			/* udelay(10); */</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case 1:</div><div class='hunk'>@@ -325,20 +273,17 @@ adv7170_command (struct i2c_client *client,</div><div class='ctx'> 			adv7170_write(client, 0x02, 0x08);</div><div class='ctx'> 			adv7170_write(client, 0x07, TR0MODE | TR0RST);</div><div class='ctx'> 			adv7170_write(client, 0x07, TR0MODE);</div><div class='del'>-			//udelay(10);</div><div class='add'>+			/* udelay(10); */</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		default:</div><div class='del'>-			dprintk(1, KERN_ERR "%s: illegal input: %d\n",</div><div class='del'>-				I2C_NAME(client), iarg);</div><div class='add'>+			v4l_dbg(1, debug, client, "illegal input: %d\n", iarg);</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-</div><div class='ctx'> 		}</div><div class='del'>-		dprintk(1, KERN_DEBUG "%s: switched to %s\n", I2C_NAME(client),</div><div class='del'>-			inputs[iarg]);</div><div class='add'>+		v4l_dbg(1, debug, client, "switched to %s\n", inputs[iarg]);</div><div class='ctx'> 		encoder-&gt;input = iarg;</div><div class='del'>-	}</div><div class='ctx'> 		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	case ENCODER_SET_OUTPUT:</div><div class='ctx'> 	{</div><div class='hunk'>@@ -348,16 +293,16 @@ adv7170_command (struct i2c_client *client,</div><div class='ctx'> 		if (*iarg != 0) {</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='del'>-	}</div><div class='ctx'> 		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	case ENCODER_ENABLE_OUTPUT:</div><div class='ctx'> 	{</div><div class='ctx'> 		int *iarg = arg;</div><div class='ctx'> </div><div class='ctx'> 		encoder-&gt;enable = !!*iarg;</div><div class='del'>-	}</div><div class='ctx'> 		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -368,149 +313,67 @@ adv7170_command (struct i2c_client *client,</div><div class='ctx'> </div><div class='ctx'> /* ----------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Generic i2c probe</div><div class='del'>- * concerning the addresses: i2c wants 7 bit (without the r/w bit), so '&gt;&gt;1'</div><div class='del'>- */</div><div class='del'>-static unsigned short normal_i2c[] =</div><div class='del'>-    { I2C_ADV7170 &gt;&gt; 1, (I2C_ADV7170 &gt;&gt; 1) + 1,</div><div class='del'>-	I2C_ADV7171 &gt;&gt; 1, (I2C_ADV7171 &gt;&gt; 1) + 1,</div><div class='add'>+static unsigned short normal_i2c[] = {</div><div class='add'>+	0xd4 &gt;&gt; 1, 0xd6 &gt;&gt; 1,	/* adv7170 IDs */</div><div class='add'>+	0x54 &gt;&gt; 1, 0x56 &gt;&gt; 1,	/* adv7171 IDs */</div><div class='ctx'> 	I2C_CLIENT_END</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static unsigned short ignore = I2C_CLIENT_END;</div><div class='add'>+I2C_CLIENT_INSMOD;</div><div class='ctx'> </div><div class='del'>-static struct i2c_client_address_data addr_data = {</div><div class='del'>-	.normal_i2c		= normal_i2c,</div><div class='del'>-	.probe			= &amp;ignore,</div><div class='del'>-	.ignore			= &amp;ignore,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct i2c_driver i2c_driver_adv7170;</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-adv7170_detect_client (struct i2c_adapter *adapter,</div><div class='del'>-		       int                 address,</div><div class='del'>-		       int                 kind)</div><div class='add'>+static int adv7170_probe(struct i2c_client *client,</div><div class='add'>+			const struct i2c_device_id *id)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='del'>-	struct i2c_client *client;</div><div class='ctx'> 	struct adv7170 *encoder;</div><div class='del'>-	char *dname;</div><div class='del'>-</div><div class='del'>-	dprintk(1,</div><div class='del'>-		KERN_INFO</div><div class='del'>-		"adv7170.c: detecting adv7170 client on address 0x%x\n",</div><div class='del'>-		address &lt;&lt; 1);</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	/* Check if the adapter supports the needed features */</div><div class='del'>-	if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))</div><div class='del'>-		return 0;</div><div class='add'>+	if (!i2c_check_functionality(client-&gt;adapter, I2C_FUNC_SMBUS_BYTE_DATA))</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);</div><div class='del'>-	if (!client)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	client-&gt;addr = address;</div><div class='del'>-	client-&gt;adapter = adapter;</div><div class='del'>-	client-&gt;driver = &amp;i2c_driver_adv7170;</div><div class='del'>-	if ((client-&gt;addr == I2C_ADV7170 &gt;&gt; 1) ||</div><div class='del'>-	    (client-&gt;addr == (I2C_ADV7170 &gt;&gt; 1) + 1)) {</div><div class='del'>-		dname = adv7170_name;</div><div class='del'>-	} else if ((client-&gt;addr == I2C_ADV7171 &gt;&gt; 1) ||</div><div class='del'>-		   (client-&gt;addr == (I2C_ADV7171 &gt;&gt; 1) + 1)) {</div><div class='del'>-		dname = adv7171_name;</div><div class='del'>-	} else {</div><div class='del'>-		/* We should never get here!!! */</div><div class='del'>-		kfree(client);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	strlcpy(I2C_NAME(client), dname, sizeof(I2C_NAME(client)));</div><div class='add'>+	v4l_info(client, "chip found @ 0x%x (%s)\n",</div><div class='add'>+			client-&gt;addr &lt;&lt; 1, client-&gt;adapter-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	encoder = kzalloc(sizeof(struct adv7170), GFP_KERNEL);</div><div class='del'>-	if (encoder == NULL) {</div><div class='del'>-		kfree(client);</div><div class='add'>+	if (encoder == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	}</div><div class='ctx'> 	encoder-&gt;norm = VIDEO_MODE_NTSC;</div><div class='ctx'> 	encoder-&gt;input = 0;</div><div class='ctx'> 	encoder-&gt;enable = 1;</div><div class='ctx'> 	i2c_set_clientdata(client, encoder);</div><div class='ctx'> </div><div class='del'>-	i = i2c_attach_client(client);</div><div class='del'>-	if (i) {</div><div class='del'>-		kfree(client);</div><div class='del'>-		kfree(encoder);</div><div class='del'>-		return i;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	i = adv7170_write_block(client, init_NTSC, sizeof(init_NTSC));</div><div class='ctx'> 	if (i &gt;= 0) {</div><div class='ctx'> 		i = adv7170_write(client, 0x07, TR0MODE | TR0RST);</div><div class='ctx'> 		i = adv7170_write(client, 0x07, TR0MODE);</div><div class='ctx'> 		i = adv7170_read(client, 0x12);</div><div class='del'>-		dprintk(1, KERN_INFO "%s_attach: rev. %d at 0x%02x\n",</div><div class='del'>-			I2C_NAME(client), i &amp; 1, client-&gt;addr &lt;&lt; 1);</div><div class='del'>-	}</div><div class='del'>-	if (i &lt; 0) {</div><div class='del'>-		dprintk(1, KERN_ERR "%s_attach: init error 0x%x\n",</div><div class='del'>-		       I2C_NAME(client), i);</div><div class='add'>+		v4l_dbg(1, debug, client, "revision %d\n", i &amp; 1);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='add'>+	if (i &lt; 0)</div><div class='add'>+		v4l_dbg(1, debug, client, "init error 0x%x\n", i);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-adv7170_attach_adapter (struct i2c_adapter *adapter)</div><div class='del'>-{</div><div class='del'>-	dprintk(1,</div><div class='del'>-		KERN_INFO</div><div class='del'>-		"adv7170.c: starting probe for adapter %s (0x%x)\n",</div><div class='del'>-		I2C_NAME(adapter), adapter-&gt;id);</div><div class='del'>-	return i2c_probe(adapter, &amp;addr_data, &amp;adv7170_detect_client);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-adv7170_detach_client (struct i2c_client *client)</div><div class='add'>+static int adv7170_remove(struct i2c_client *client)</div><div class='ctx'> {</div><div class='del'>-	struct adv7170 *encoder = i2c_get_clientdata(client);</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = i2c_detach_client(client);</div><div class='del'>-	if (err) {</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	kfree(encoder);</div><div class='del'>-	kfree(client);</div><div class='del'>-</div><div class='add'>+	kfree(i2c_get_clientdata(client));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* ----------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='del'>-static struct i2c_driver i2c_driver_adv7170 = {</div><div class='del'>-	.driver = {</div><div class='del'>-		.name = "adv7170",	/* name */</div><div class='del'>-	},</div><div class='del'>-</div><div class='del'>-	.id = I2C_DRIVERID_ADV7170,</div><div class='add'>+static const struct i2c_device_id adv7170_id[] = {</div><div class='add'>+	{ "adv7170", 0 },</div><div class='add'>+	{ "adv7171", 0 },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(i2c, adv7170_id);</div><div class='ctx'> </div><div class='del'>-	.attach_adapter = adv7170_attach_adapter,</div><div class='del'>-	.detach_client = adv7170_detach_client,</div><div class='add'>+static struct v4l2_i2c_driver_data v4l2_i2c_data = {</div><div class='add'>+	.name = "adv7170",</div><div class='add'>+	.driverid = I2C_DRIVERID_ADV7170,</div><div class='ctx'> 	.command = adv7170_command,</div><div class='add'>+	.probe = adv7170_probe,</div><div class='add'>+	.remove = adv7170_remove,</div><div class='add'>+	.id_table = adv7170_id,</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init</div><div class='del'>-adv7170_init (void)</div><div class='del'>-{</div><div class='del'>-	return i2c_add_driver(&amp;i2c_driver_adv7170);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit</div><div class='del'>-adv7170_exit (void)</div><div class='del'>-{</div><div class='del'>-	i2c_del_driver(&amp;i2c_driver_adv7170);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(adv7170_init);</div><div class='del'>-module_exit(adv7170_exit);</div><div class='head'>diff --git a/drivers/media/video/adv7175.c b/drivers/media/video/adv7175.c<br/>index 8ee07a68f702..6008e84653f1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/adv7175.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/adv7175.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/adv7175.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/adv7175.c</a></div><div class='hunk'>@@ -25,43 +25,24 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/fs.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/major.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/i2c.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/pgtable.h&gt;</div><div class='del'>-#include &lt;asm/page.h&gt;</div><div class='add'>+#include &lt;linux/ioctl.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='del'>-</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/i2c-id.h&gt;</div><div class='ctx'> #include &lt;linux/videodev.h&gt;</div><div class='ctx'> #include &lt;linux/video_encoder.h&gt;</div><div class='add'>+#include &lt;media/v4l2-common.h&gt;</div><div class='add'>+#include &lt;media/v4l2-i2c-drv-legacy.h&gt;</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("Analog Devices ADV7175 video encoder driver");</div><div class='ctx'> MODULE_AUTHOR("Dave Perks");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-#define I2C_NAME(s) (s)-&gt;name</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> static int debug;</div><div class='ctx'> module_param(debug, int, 0);</div><div class='ctx'> MODULE_PARM_DESC(debug, "Debug level (0-1)");</div><div class='ctx'> </div><div class='del'>-#define dprintk(num, format, args...) \</div><div class='del'>-	do { \</div><div class='del'>-		if (debug &gt;= num) \</div><div class='del'>-			printk(format, ##args); \</div><div class='del'>-	} while (0)</div><div class='del'>-</div><div class='ctx'> /* ----------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='ctx'> struct adv7175 {</div><div class='hunk'>@@ -77,33 +58,23 @@ struct adv7175 {</div><div class='ctx'> #define   I2C_ADV7175        0xd4</div><div class='ctx'> #define   I2C_ADV7176        0x54</div><div class='ctx'> </div><div class='del'>-static char adv7175_name[] = "adv7175";</div><div class='del'>-static char adv7176_name[] = "adv7176";</div><div class='del'>-</div><div class='ctx'> static char *inputs[] = { "pass_through", "play_back", "color_bar" };</div><div class='ctx'> static char *norms[] = { "PAL", "NTSC", "SECAM-&gt;PAL (may not work!)" };</div><div class='ctx'> </div><div class='ctx'> /* ----------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='del'>-static inline int</div><div class='del'>-adv7175_write (struct i2c_client *client,</div><div class='del'>-	       u8                 reg,</div><div class='del'>-	       u8                 value)</div><div class='add'>+static inline int adv7175_write(struct i2c_client *client, u8 reg, u8 value)</div><div class='ctx'> {</div><div class='ctx'> 	return i2c_smbus_write_byte_data(client, reg, value);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int</div><div class='del'>-adv7175_read (struct i2c_client *client,</div><div class='del'>-	      u8                 reg)</div><div class='add'>+static inline int adv7175_read(struct i2c_client *client, u8 reg)</div><div class='ctx'> {</div><div class='ctx'> 	return i2c_smbus_read_byte_data(client, reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-adv7175_write_block (struct i2c_client *client,</div><div class='del'>-		     const u8          *data,</div><div class='del'>-		     unsigned int       len)</div><div class='add'>+static int adv7175_write_block(struct i2c_client *client,</div><div class='add'>+		     const u8 *data, unsigned int len)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = -1;</div><div class='ctx'> 	u8 reg;</div><div class='hunk'>@@ -123,18 +94,17 @@ adv7175_write_block (struct i2c_client *client,</div><div class='ctx'> 				reg++;</div><div class='ctx'> 				len -= 2;</div><div class='ctx'> 				data += 2;</div><div class='del'>-			} while (len &gt;= 2 &amp;&amp; data[0] == reg &amp;&amp;</div><div class='del'>-				 block_len &lt; 32);</div><div class='del'>-			if ((ret = i2c_master_send(client, block_data,</div><div class='del'>-						   block_len)) &lt; 0)</div><div class='add'>+			} while (len &gt;= 2 &amp;&amp; data[0] == reg &amp;&amp; block_len &lt; 32);</div><div class='add'>+			ret = i2c_master_send(client, block_data, block_len);</div><div class='add'>+			if (ret &lt; 0)</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* do some slow I2C emulation kind of thing */</div><div class='ctx'> 		while (len &gt;= 2) {</div><div class='ctx'> 			reg = *data++;</div><div class='del'>-			if ((ret = adv7175_write(client, reg,</div><div class='del'>-						 *data++)) &lt; 0)</div><div class='add'>+			ret = adv7175_write(client, reg, *data++);</div><div class='add'>+			if (ret &lt; 0)</div><div class='ctx'> 				break;</div><div class='ctx'> 			len -= 2;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -143,13 +113,11 @@ adv7175_write_block (struct i2c_client *client,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-set_subcarrier_freq (struct i2c_client *client,</div><div class='del'>-		     int                pass_through)</div><div class='add'>+static void set_subcarrier_freq(struct i2c_client *client, int pass_through)</div><div class='ctx'> {</div><div class='ctx'> 	/* for some reason pass_through NTSC needs</div><div class='ctx'> 	 * a different sub-carrier freq to remain stable. */</div><div class='del'>-	if(pass_through)</div><div class='add'>+	if (pass_through)</div><div class='ctx'> 		adv7175_write(client, 0x02, 0x00);</div><div class='ctx'> 	else</div><div class='ctx'> 		adv7175_write(client, 0x02, 0x55);</div><div class='hunk'>@@ -160,12 +128,12 @@ set_subcarrier_freq (struct i2c_client *client,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* ----------------------------------------------------------------------- */</div><div class='del'>-// Output filter:  S-Video  Composite</div><div class='add'>+/* Output filter:  S-Video  Composite */</div><div class='ctx'> </div><div class='del'>-#define MR050       0x11	//0x09</div><div class='del'>-#define MR060       0x14	//0x0c</div><div class='add'>+#define MR050       0x11	/* 0x09 */</div><div class='add'>+#define MR060       0x14	/* 0x0c */</div><div class='ctx'> </div><div class='del'>-//---------------------------------------------------------------------------</div><div class='add'>+/* ----------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='ctx'> #define TR0MODE     0x46</div><div class='ctx'> #define TR0RST	    0x80</div><div class='hunk'>@@ -216,15 +184,11 @@ static const unsigned char init_ntsc[] = {</div><div class='ctx'> 	0x06, 0x1a,		/* subc. phase */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-adv7175_command (struct i2c_client *client,</div><div class='del'>-		 unsigned int       cmd,</div><div class='del'>-		 void              *arg)</div><div class='add'>+static int adv7175_command(struct i2c_client *client, unsigned cmd, void *arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct adv7175 *encoder = i2c_get_clientdata(client);</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='del'>-</div><div class='ctx'> 	case 0:</div><div class='ctx'> 		/* This is just for testing!!! */</div><div class='ctx'> 		adv7175_write_block(client, init_common,</div><div class='hunk'>@@ -242,15 +206,14 @@ adv7175_command (struct i2c_client *client,</div><div class='ctx'> 			     VIDEO_ENCODER_SECAM; /* well, hacky */</div><div class='ctx'> 		cap-&gt;inputs = 2;</div><div class='ctx'> 		cap-&gt;outputs = 1;</div><div class='del'>-	}</div><div class='ctx'> 		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	case ENCODER_SET_NORM:</div><div class='ctx'> 	{</div><div class='ctx'> 		int iarg = *(int *) arg;</div><div class='ctx'> </div><div class='ctx'> 		switch (iarg) {</div><div class='del'>-</div><div class='ctx'> 		case VIDEO_MODE_NTSC:</div><div class='ctx'> 			adv7175_write_block(client, init_ntsc,</div><div class='ctx'> 					    sizeof(init_ntsc));</div><div class='hunk'>@@ -284,16 +247,13 @@ adv7175_command (struct i2c_client *client,</div><div class='ctx'> 			adv7175_write(client, 0x07, TR0MODE);</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='del'>-			dprintk(1, KERN_ERR "%s: illegal norm: %d\n",</div><div class='del'>-				I2C_NAME(client), iarg);</div><div class='add'>+			v4l_dbg(1, debug, client, "illegal norm: %d\n", iarg);</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-</div><div class='ctx'> 		}</div><div class='del'>-		dprintk(1, KERN_INFO "%s: switched to %s\n", I2C_NAME(client),</div><div class='del'>-			norms[iarg]);</div><div class='add'>+		v4l_dbg(1, debug, client, "switched to %s\n", norms[iarg]);</div><div class='ctx'> 		encoder-&gt;norm = iarg;</div><div class='del'>-	}</div><div class='ctx'> 		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	case ENCODER_SET_INPUT:</div><div class='ctx'> 	{</div><div class='hunk'>@@ -304,7 +264,6 @@ adv7175_command (struct i2c_client *client,</div><div class='ctx'> 		 *iarg = 2: color bar */</div><div class='ctx'> </div><div class='ctx'> 		switch (iarg) {</div><div class='del'>-</div><div class='ctx'> 		case 0:</div><div class='ctx'> 			adv7175_write(client, 0x01, 0x00);</div><div class='ctx'> </div><div class='hunk'>@@ -331,7 +290,7 @@ adv7175_command (struct i2c_client *client,</div><div class='ctx'> 			adv7175_write(client, 0x0d, 0x49);</div><div class='ctx'> 			adv7175_write(client, 0x07, TR0MODE | TR0RST);</div><div class='ctx'> 			adv7175_write(client, 0x07, TR0MODE);</div><div class='del'>-			//udelay(10);</div><div class='add'>+			/* udelay(10); */</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case 2:</div><div class='hunk'>@@ -343,39 +302,35 @@ adv7175_command (struct i2c_client *client,</div><div class='ctx'> 			adv7175_write(client, 0x0d, 0x49);</div><div class='ctx'> 			adv7175_write(client, 0x07, TR0MODE | TR0RST);</div><div class='ctx'> 			adv7175_write(client, 0x07, TR0MODE);</div><div class='del'>-			//udelay(10);</div><div class='add'>+			/* udelay(10); */</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		default:</div><div class='del'>-			dprintk(1, KERN_ERR "%s: illegal input: %d\n",</div><div class='del'>-				I2C_NAME(client), iarg);</div><div class='add'>+			v4l_dbg(1, debug, client, "illegal input: %d\n", iarg);</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-</div><div class='ctx'> 		}</div><div class='del'>-		dprintk(1, KERN_INFO "%s: switched to %s\n", I2C_NAME(client),</div><div class='del'>-			inputs[iarg]);</div><div class='add'>+		v4l_dbg(1, debug, client, "switched to %s\n", inputs[iarg]);</div><div class='ctx'> 		encoder-&gt;input = iarg;</div><div class='del'>-	}</div><div class='ctx'> 		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	case ENCODER_SET_OUTPUT:</div><div class='ctx'> 	{</div><div class='ctx'> 		int *iarg = arg;</div><div class='ctx'> </div><div class='ctx'> 		/* not much choice of outputs */</div><div class='del'>-		if (*iarg != 0) {</div><div class='add'>+		if (*iarg != 0)</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='ctx'> 		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	case ENCODER_ENABLE_OUTPUT:</div><div class='ctx'> 	{</div><div class='ctx'> 		int *iarg = arg;</div><div class='ctx'> </div><div class='ctx'> 		encoder-&gt;enable = !!*iarg;</div><div class='del'>-	}</div><div class='ctx'> 		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -390,145 +345,67 @@ adv7175_command (struct i2c_client *client,</div><div class='ctx'>  * Generic i2c probe</div><div class='ctx'>  * concerning the addresses: i2c wants 7 bit (without the r/w bit), so '&gt;&gt;1'</div><div class='ctx'>  */</div><div class='del'>-static unsigned short normal_i2c[] =</div><div class='del'>-    { I2C_ADV7175 &gt;&gt; 1, (I2C_ADV7175 &gt;&gt; 1) + 1,</div><div class='add'>+static unsigned short normal_i2c[] = {</div><div class='add'>+	I2C_ADV7175 &gt;&gt; 1, (I2C_ADV7175 &gt;&gt; 1) + 1,</div><div class='ctx'> 	I2C_ADV7176 &gt;&gt; 1, (I2C_ADV7176 &gt;&gt; 1) + 1,</div><div class='ctx'> 	I2C_CLIENT_END</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static unsigned short ignore = I2C_CLIENT_END;</div><div class='del'>-</div><div class='del'>-static struct i2c_client_address_data addr_data = {</div><div class='del'>-	.normal_i2c		= normal_i2c,</div><div class='del'>-	.probe			= &amp;ignore,</div><div class='del'>-	.ignore			= &amp;ignore,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct i2c_driver i2c_driver_adv7175;</div><div class='add'>+I2C_CLIENT_INSMOD;</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-adv7175_detect_client (struct i2c_adapter *adapter,</div><div class='del'>-		       int                 address,</div><div class='del'>-		       int                 kind)</div><div class='add'>+static int adv7175_probe(struct i2c_client *client,</div><div class='add'>+			const struct i2c_device_id *id)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='del'>-	struct i2c_client *client;</div><div class='ctx'> 	struct adv7175 *encoder;</div><div class='del'>-	char *dname;</div><div class='del'>-</div><div class='del'>-	dprintk(1,</div><div class='del'>-		KERN_INFO</div><div class='del'>-		"adv7175.c: detecting adv7175 client on address 0x%x\n",</div><div class='del'>-		address &lt;&lt; 1);</div><div class='ctx'> </div><div class='ctx'> 	/* Check if the adapter supports the needed features */</div><div class='del'>-	if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))</div><div class='del'>-		return 0;</div><div class='add'>+	if (!i2c_check_functionality(client-&gt;adapter, I2C_FUNC_SMBUS_BYTE_DATA))</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);</div><div class='del'>-	if (!client)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	client-&gt;addr = address;</div><div class='del'>-	client-&gt;adapter = adapter;</div><div class='del'>-	client-&gt;driver = &amp;i2c_driver_adv7175;</div><div class='del'>-	if ((client-&gt;addr == I2C_ADV7175 &gt;&gt; 1) ||</div><div class='del'>-	    (client-&gt;addr == (I2C_ADV7175 &gt;&gt; 1) + 1)) {</div><div class='del'>-		dname = adv7175_name;</div><div class='del'>-	} else if ((client-&gt;addr == I2C_ADV7176 &gt;&gt; 1) ||</div><div class='del'>-		   (client-&gt;addr == (I2C_ADV7176 &gt;&gt; 1) + 1)) {</div><div class='del'>-		dname = adv7176_name;</div><div class='del'>-	} else {</div><div class='del'>-		/* We should never get here!!! */</div><div class='del'>-		kfree(client);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	strlcpy(I2C_NAME(client), dname, sizeof(I2C_NAME(client)));</div><div class='add'>+	v4l_info(client, "chip found @ 0x%x (%s)\n",</div><div class='add'>+			client-&gt;addr &lt;&lt; 1, client-&gt;adapter-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	encoder = kzalloc(sizeof(struct adv7175), GFP_KERNEL);</div><div class='del'>-	if (encoder == NULL) {</div><div class='del'>-		kfree(client);</div><div class='add'>+	if (encoder == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	}</div><div class='ctx'> 	encoder-&gt;norm = VIDEO_MODE_PAL;</div><div class='ctx'> 	encoder-&gt;input = 0;</div><div class='ctx'> 	encoder-&gt;enable = 1;</div><div class='ctx'> 	i2c_set_clientdata(client, encoder);</div><div class='ctx'> </div><div class='del'>-	i = i2c_attach_client(client);</div><div class='del'>-	if (i) {</div><div class='del'>-		kfree(client);</div><div class='del'>-		kfree(encoder);</div><div class='del'>-		return i;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	i = adv7175_write_block(client, init_common, sizeof(init_common));</div><div class='ctx'> 	if (i &gt;= 0) {</div><div class='ctx'> 		i = adv7175_write(client, 0x07, TR0MODE | TR0RST);</div><div class='ctx'> 		i = adv7175_write(client, 0x07, TR0MODE);</div><div class='ctx'> 		i = adv7175_read(client, 0x12);</div><div class='del'>-		dprintk(1, KERN_INFO "%s_attach: rev. %d at 0x%x\n",</div><div class='del'>-			I2C_NAME(client), i &amp; 1, client-&gt;addr &lt;&lt; 1);</div><div class='add'>+		v4l_dbg(1, debug, client, "revision %d\n", i &amp; 1);</div><div class='ctx'> 	}</div><div class='del'>-	if (i &lt; 0) {</div><div class='del'>-		dprintk(1, KERN_ERR "%s_attach: init error 0x%x\n",</div><div class='del'>-			I2C_NAME(client), i);</div><div class='del'>-	}</div><div class='del'>-</div><div class='add'>+	if (i &lt; 0)</div><div class='add'>+		v4l_dbg(1, debug, client, "init error 0x%x\n", i);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-adv7175_attach_adapter (struct i2c_adapter *adapter)</div><div class='del'>-{</div><div class='del'>-	dprintk(1,</div><div class='del'>-		KERN_INFO</div><div class='del'>-		"adv7175.c: starting probe for adapter %s (0x%x)\n",</div><div class='del'>-		I2C_NAME(adapter), adapter-&gt;id);</div><div class='del'>-	return i2c_probe(adapter, &amp;addr_data, &amp;adv7175_detect_client);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-adv7175_detach_client (struct i2c_client *client)</div><div class='add'>+static int adv7175_remove(struct i2c_client *client)</div><div class='ctx'> {</div><div class='del'>-	struct adv7175 *encoder = i2c_get_clientdata(client);</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = i2c_detach_client(client);</div><div class='del'>-	if (err) {</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	kfree(encoder);</div><div class='del'>-	kfree(client);</div><div class='del'>-</div><div class='add'>+	kfree(i2c_get_clientdata(client));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* ----------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='del'>-static struct i2c_driver i2c_driver_adv7175 = {</div><div class='del'>-	.driver = {</div><div class='del'>-		.name = "adv7175",	/* name */</div><div class='del'>-	},</div><div class='del'>-</div><div class='del'>-	.id = I2C_DRIVERID_ADV7175,</div><div class='add'>+static const struct i2c_device_id adv7175_id[] = {</div><div class='add'>+	{ "adv7175", 0 },</div><div class='add'>+	{ "adv7176", 0 },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(i2c, adv7175_id);</div><div class='ctx'> </div><div class='del'>-	.attach_adapter = adv7175_attach_adapter,</div><div class='del'>-	.detach_client = adv7175_detach_client,</div><div class='add'>+static struct v4l2_i2c_driver_data v4l2_i2c_data = {</div><div class='add'>+	.name = "adv7175",</div><div class='add'>+	.driverid = I2C_DRIVERID_ADV7175,</div><div class='ctx'> 	.command = adv7175_command,</div><div class='add'>+	.probe = adv7175_probe,</div><div class='add'>+	.remove = adv7175_remove,</div><div class='add'>+	.id_table = adv7175_id,</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init</div><div class='del'>-adv7175_init (void)</div><div class='del'>-{</div><div class='del'>-	return i2c_add_driver(&amp;i2c_driver_adv7175);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit</div><div class='del'>-adv7175_exit (void)</div><div class='del'>-{</div><div class='del'>-	i2c_del_driver(&amp;i2c_driver_adv7175);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(adv7175_init);</div><div class='del'>-module_exit(adv7175_exit);</div><div class='head'>diff --git a/drivers/media/video/arv.c b/drivers/media/video/arv.c<br/>index 9e436ad3d34b..218754b4906a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/arv.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/arv.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/arv.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/arv.c</a></div><div class='hunk'>@@ -116,6 +116,7 @@ struct ar_device {</div><div class='ctx'> 	int width, height;</div><div class='ctx'> 	int frame_bytes, line_bytes;</div><div class='ctx'> 	wait_queue_head_t wait;</div><div class='add'>+	unsigned long in_use;</div><div class='ctx'> 	struct mutex lock;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -269,7 +270,7 @@ static inline void wait_for_vertical_sync(int exp_line)</div><div class='ctx'> static ssize_t ar_read(struct file *file, char *buf, size_t count, loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	struct video_device *v = video_devdata(file);</div><div class='del'>-	struct ar_device *ar = v-&gt;priv;</div><div class='add'>+	struct ar_device *ar = video_get_drvdata(v);</div><div class='ctx'> 	long ret = ar-&gt;frame_bytes;		/* return read bytes */</div><div class='ctx'> 	unsigned long arvcr1 = 0;</div><div class='ctx'> 	unsigned long flags;</div><div class='hunk'>@@ -399,7 +400,7 @@ static int ar_do_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 		       unsigned int cmd, void *arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct ar_device *ar = dev-&gt;priv;</div><div class='add'>+	struct ar_device *ar = video_get_drvdata(dev);</div><div class='ctx'> </div><div class='ctx'> 	DEBUG(1, "ar_ioctl()\n");</div><div class='ctx'> 	switch(cmd) {</div><div class='hunk'>@@ -625,7 +626,7 @@ static void ar_interrupt(int irq, void *dev)</div><div class='ctx'>  */</div><div class='ctx'> static int ar_initialize(struct video_device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct ar_device *ar = dev-&gt;priv;</div><div class='add'>+	struct ar_device *ar = video_get_drvdata(dev);</div><div class='ctx'> 	unsigned long cr = 0;</div><div class='ctx'> 	int i,found=0;</div><div class='ctx'> </div><div class='hunk'>@@ -732,7 +733,7 @@ static int ar_initialize(struct video_device *dev)</div><div class='ctx'> </div><div class='ctx'> void ar_release(struct video_device *vfd)</div><div class='ctx'> {</div><div class='del'>-	struct ar_device *ar = vfd-&gt;priv;</div><div class='add'>+	struct ar_device *ar = video_get_drvdata(vfd);</div><div class='ctx'> 	mutex_lock(&amp;ar-&gt;lock);</div><div class='ctx'> 	video_device_release(vfd);</div><div class='ctx'> }</div><div class='hunk'>@@ -742,10 +743,23 @@ void ar_release(struct video_device *vfd)</div><div class='ctx'>  * Video4Linux Module functions</div><div class='ctx'>  *</div><div class='ctx'>  ****************************************************************************/</div><div class='add'>+static struct ar_device ardev;</div><div class='add'>+</div><div class='add'>+static int ar_exclusive_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	return test_and_set_bit(0, &amp;ardev.in_use) ? -EBUSY : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ar_exclusive_release(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	clear_bit(0, &amp;ardev.in_use);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct file_operations ar_fops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='del'>-	.open		= video_exclusive_open,</div><div class='del'>-	.release	= video_exclusive_release,</div><div class='add'>+	.open		= ar_exclusive_open,</div><div class='add'>+	.release	= ar_exclusive_release,</div><div class='ctx'> 	.read		= ar_read,</div><div class='ctx'> 	.ioctl		= ar_ioctl,</div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='hunk'>@@ -762,7 +776,6 @@ static struct video_device ar_template = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define ALIGN4(x)	((((int)(x)) &amp; 0x3) == 0)</div><div class='del'>-static struct ar_device ardev;</div><div class='ctx'> </div><div class='ctx'> static int __init ar_init(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -802,7 +815,7 @@ static int __init ar_init(void)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> 	memcpy(ar-&gt;vdev, &amp;ar_template, sizeof(ar_template));</div><div class='del'>-	ar-&gt;vdev-&gt;priv = ar;</div><div class='add'>+	video_set_drvdata(ar-&gt;vdev, ar);</div><div class='ctx'> </div><div class='ctx'> 	if (vga) {</div><div class='ctx'> 		ar-&gt;width 	= AR_WIDTH_VGA;</div><div class='head'>diff --git a/drivers/media/video/au0828/au0828-cards.c b/drivers/media/video/au0828/au0828-cards.c<br/>index ed48908a9034..d60123b413f5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/au0828/au0828-cards.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/au0828/au0828-cards.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/au0828/au0828-cards.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/au0828/au0828-cards.c</a></div><div class='hunk'>@@ -46,7 +46,7 @@ struct au0828_board au0828_boards[] = {</div><div class='ctx'> /* Tuner callback function for au0828 boards. Currently only needed</div><div class='ctx'>  * for HVR1500Q, which has an xc5000 tuner.</div><div class='ctx'>  */</div><div class='del'>-int au0828_tuner_callback(void *priv, int command, int arg)</div><div class='add'>+int au0828_tuner_callback(void *priv, int component, int command, int arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct au0828_dev *dev = priv;</div><div class='ctx'> </div><div class='hunk'>@@ -90,6 +90,7 @@ static void hauppauge_eeprom(struct au0828_dev *dev, u8 *eeprom_data)</div><div class='ctx'> 	case 72221: /* WinTV-HVR950q (OEM, IR, ATSC/QAM and basic analog video */</div><div class='ctx'> 	case 72231: /* WinTV-HVR950q (OEM, IR, ATSC/QAM and basic analog video */</div><div class='ctx'> 	case 72241: /* WinTV-HVR950q (OEM, No IR, ATSC/QAM and basic analog video */</div><div class='add'>+	case 72251: /* WinTV-HVR950q (Retail, IR, ATSC/QAM and basic analog video */</div><div class='ctx'> 	case 72301: /* WinTV-HVR850 (Retail, IR, ATSC and basic analog video */</div><div class='ctx'> 	case 72500: /* WinTV-HVR950q (OEM, No IR, ATSC/QAM */</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -185,7 +186,7 @@ void au0828_gpio_setup(struct au0828_dev *dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* table of devices that work with this driver */</div><div class='del'>-struct usb_device_id au0828_usb_id_table [] = {</div><div class='add'>+struct usb_device_id au0828_usb_id_table[] = {</div><div class='ctx'> 	{ USB_DEVICE(0x2040, 0x7200),</div><div class='ctx'> 		.driver_info = AU0828_BOARD_HAUPPAUGE_HVR950Q },</div><div class='ctx'> 	{ USB_DEVICE(0x2040, 0x7240),</div><div class='hunk'>@@ -198,6 +199,8 @@ struct usb_device_id au0828_usb_id_table [] = {</div><div class='ctx'> 		.driver_info = AU0828_BOARD_HAUPPAUGE_HVR950Q },</div><div class='ctx'> 	{ USB_DEVICE(0x2040, 0x721b),</div><div class='ctx'> 		.driver_info = AU0828_BOARD_HAUPPAUGE_HVR950Q },</div><div class='add'>+	{ USB_DEVICE(0x2040, 0x721e),</div><div class='add'>+		.driver_info = AU0828_BOARD_HAUPPAUGE_HVR950Q },</div><div class='ctx'> 	{ USB_DEVICE(0x2040, 0x721f),</div><div class='ctx'> 		.driver_info = AU0828_BOARD_HAUPPAUGE_HVR950Q },</div><div class='ctx'> 	{ USB_DEVICE(0x2040, 0x7280),</div><div class='head'>diff --git a/drivers/media/video/au0828/au0828-core.c b/drivers/media/video/au0828/au0828-core.c<br/>index d856de9f742f..5765e8656376 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/au0828/au0828-core.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/au0828/au0828-core.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/au0828/au0828-core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/au0828/au0828-core.c</a></div><div class='hunk'>@@ -91,7 +91,8 @@ static int send_control_msg(struct au0828_dev *dev, u16 request, u32 value,</div><div class='ctx'> 		status = usb_control_msg(dev-&gt;usbdev,</div><div class='ctx'> 				usb_sndctrlpipe(dev-&gt;usbdev, 0),</div><div class='ctx'> 				request,</div><div class='del'>-				USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,</div><div class='add'>+				USB_DIR_OUT | USB_TYPE_VENDOR |</div><div class='add'>+					USB_RECIP_DEVICE,</div><div class='ctx'> 				value, index,</div><div class='ctx'> 				cp, size, 1000);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/au0828/au0828-dvb.c b/drivers/media/video/au0828/au0828-dvb.c<br/>index ba94be7e0ac1..a882cf546d0a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/au0828/au0828-dvb.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/au0828/au0828-dvb.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/au0828/au0828-dvb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/au0828/au0828-dvb.c</a></div><div class='hunk'>@@ -36,11 +36,39 @@ DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);</div><div class='ctx'> #define _AU0828_BULKPIPE 0x83</div><div class='ctx'> #define _BULKPIPESIZE 0xe522</div><div class='ctx'> </div><div class='add'>+static u8 hauppauge_hvr950q_led_states[] = {</div><div class='add'>+	0x00, /* off */</div><div class='add'>+	0x02, /* yellow */</div><div class='add'>+	0x04, /* green */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct au8522_led_config hauppauge_hvr950q_led_cfg = {</div><div class='add'>+	.gpio_output = 0x00e0,</div><div class='add'>+	.gpio_output_enable  = 0x6006,</div><div class='add'>+	.gpio_output_disable = 0x0660,</div><div class='add'>+</div><div class='add'>+	.gpio_leds = 0x00e2,</div><div class='add'>+	.led_states  = hauppauge_hvr950q_led_states,</div><div class='add'>+	.num_led_states = sizeof(hauppauge_hvr950q_led_states),</div><div class='add'>+</div><div class='add'>+	.vsb8_strong   = 20 /* dB */ * 10,</div><div class='add'>+	.qam64_strong  = 25 /* dB */ * 10,</div><div class='add'>+	.qam256_strong = 32 /* dB */ * 10,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct au8522_config hauppauge_hvr950q_config = {</div><div class='ctx'> 	.demod_address = 0x8e &gt;&gt; 1,</div><div class='ctx'> 	.status_mode   = AU8522_DEMODLOCKING,</div><div class='ctx'> 	.qam_if        = AU8522_IF_6MHZ,</div><div class='ctx'> 	.vsb_if        = AU8522_IF_6MHZ,</div><div class='add'>+	.led_cfg       = &amp;hauppauge_hvr950q_led_cfg,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct au8522_config fusionhdtv7usb_config = {</div><div class='add'>+	.demod_address = 0x8e &gt;&gt; 1,</div><div class='add'>+	.status_mode   = AU8522_DEMODLOCKING,</div><div class='add'>+	.qam_if        = AU8522_IF_6MHZ,</div><div class='add'>+	.vsb_if        = AU8522_IF_6MHZ,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct au8522_config hauppauge_woodbury_config = {</div><div class='hunk'>@@ -53,7 +81,6 @@ static struct au8522_config hauppauge_woodbury_config = {</div><div class='ctx'> static struct xc5000_config hauppauge_hvr950q_tunerconfig = {</div><div class='ctx'> 	.i2c_address      = 0x61,</div><div class='ctx'> 	.if_khz           = 6000,</div><div class='del'>-	.tuner_callback   = au0828_tuner_callback</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct mxl5007t_config mxl5007t_hvr950q_config = {</div><div class='hunk'>@@ -146,7 +173,8 @@ static int start_urb_transfer(struct au0828_dev *dev)</div><div class='ctx'> 		purb-&gt;status = -EINPROGRESS;</div><div class='ctx'> 		usb_fill_bulk_urb(purb,</div><div class='ctx'> 				  dev-&gt;usbdev,</div><div class='del'>-				  usb_rcvbulkpipe(dev-&gt;usbdev, _AU0828_BULKPIPE),</div><div class='add'>+				  usb_rcvbulkpipe(dev-&gt;usbdev,</div><div class='add'>+					_AU0828_BULKPIPE),</div><div class='ctx'> 				  purb-&gt;transfer_buffer,</div><div class='ctx'> 				  URB_BUFSIZE,</div><div class='ctx'> 				  urb_completion,</div><div class='hunk'>@@ -353,14 +381,12 @@ int au0828_dvb_register(struct au0828_dev *dev)</div><div class='ctx'> 	switch (dev-&gt;board) {</div><div class='ctx'> 	case AU0828_BOARD_HAUPPAUGE_HVR850:</div><div class='ctx'> 	case AU0828_BOARD_HAUPPAUGE_HVR950Q:</div><div class='del'>-	case AU0828_BOARD_DVICO_FUSIONHDTV7:</div><div class='ctx'> 		dvb-&gt;frontend = dvb_attach(au8522_attach,</div><div class='ctx'> 				&amp;hauppauge_hvr950q_config,</div><div class='ctx'> 				&amp;dev-&gt;i2c_adap);</div><div class='ctx'> 		if (dvb-&gt;frontend != NULL)</div><div class='del'>-			dvb_attach(xc5000_attach, dvb-&gt;frontend,</div><div class='del'>-				&amp;dev-&gt;i2c_adap,</div><div class='del'>-				&amp;hauppauge_hvr950q_tunerconfig, dev);</div><div class='add'>+			dvb_attach(xc5000_attach, dvb-&gt;frontend, &amp;dev-&gt;i2c_adap,</div><div class='add'>+				   &amp;hauppauge_hvr950q_tunerconfig);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case AU0828_BOARD_HAUPPAUGE_HVR950Q_MXL:</div><div class='ctx'> 		dvb-&gt;frontend = dvb_attach(au8522_attach,</div><div class='hunk'>@@ -380,6 +406,16 @@ int au0828_dvb_register(struct au0828_dev *dev)</div><div class='ctx'> 				   0x60, &amp;dev-&gt;i2c_adap,</div><div class='ctx'> 				   &amp;hauppauge_woodbury_tunerconfig);</div><div class='ctx'> 		break;</div><div class='add'>+	case AU0828_BOARD_DVICO_FUSIONHDTV7:</div><div class='add'>+		dvb-&gt;frontend = dvb_attach(au8522_attach,</div><div class='add'>+				&amp;fusionhdtv7usb_config,</div><div class='add'>+				&amp;dev-&gt;i2c_adap);</div><div class='add'>+		if (dvb-&gt;frontend != NULL) {</div><div class='add'>+			dvb_attach(xc5000_attach, dvb-&gt;frontend,</div><div class='add'>+				&amp;dev-&gt;i2c_adap,</div><div class='add'>+				&amp;hauppauge_hvr950q_tunerconfig);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		printk(KERN_WARNING "The frontend of your DVB/ATSC card "</div><div class='ctx'> 		       "isn't supported yet\n");</div><div class='hunk'>@@ -390,6 +426,8 @@ int au0828_dvb_register(struct au0828_dev *dev)</div><div class='ctx'> 		       __func__);</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='add'>+	/* define general-purpose callback pointer */</div><div class='add'>+	dvb-&gt;frontend-&gt;callback = au0828_tuner_callback;</div><div class='ctx'> </div><div class='ctx'> 	/* register everything */</div><div class='ctx'> 	ret = dvb_register(dev);</div><div class='head'>diff --git a/drivers/media/video/au0828/au0828.h b/drivers/media/video/au0828/au0828.h<br/>index 4f10ff300135..9d6a1161dc98 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/au0828/au0828.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/au0828/au0828.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/au0828/au0828.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/au0828/au0828.h</a></div><div class='hunk'>@@ -103,7 +103,8 @@ extern int au0828_debug;</div><div class='ctx'> extern struct au0828_board au0828_boards[];</div><div class='ctx'> extern struct usb_device_id au0828_usb_id_table[];</div><div class='ctx'> extern void au0828_gpio_setup(struct au0828_dev *dev);</div><div class='del'>-extern int au0828_tuner_callback(void *priv, int command, int arg);</div><div class='add'>+extern int au0828_tuner_callback(void *priv, int component,</div><div class='add'>+				 int command, int arg);</div><div class='ctx'> extern void au0828_card_setup(struct au0828_dev *dev);</div><div class='ctx'> </div><div class='ctx'> /* ----------------------------------------------------------- */</div><div class='head'>diff --git a/drivers/media/video/bt819.c b/drivers/media/video/bt819.c<br/>index ddd2a7964dec..a07b7b88e5b8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/bt819.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/bt819.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/bt819.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/bt819.c</a></div><div class='hunk'>@@ -29,44 +29,25 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/fs.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/major.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/i2c.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/pgtable.h&gt;</div><div class='del'>-#include &lt;asm/page.h&gt;</div><div class='add'>+#include &lt;linux/ioctl.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='del'>-</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/i2c-id.h&gt;</div><div class='ctx'> #include &lt;linux/videodev.h&gt;</div><div class='ctx'> #include &lt;linux/video_decoder.h&gt;</div><div class='del'>-</div><div class='add'>+#include &lt;media/v4l2-common.h&gt;</div><div class='add'>+#include &lt;media/v4l2-i2c-drv-legacy.h&gt;</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("Brooktree-819 video decoder driver");</div><div class='ctx'> MODULE_AUTHOR("Mike Bernson &amp; Dave Perks");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-#define I2C_NAME(s) (s)-&gt;name</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> static int debug;</div><div class='ctx'> module_param(debug, int, 0);</div><div class='ctx'> MODULE_PARM_DESC(debug, "Debug level (0-1)");</div><div class='ctx'> </div><div class='del'>-#define dprintk(num, format, args...) \</div><div class='del'>-	do { \</div><div class='del'>-		if (debug &gt;= num) \</div><div class='del'>-			printk(format, ##args); \</div><div class='del'>-	} while (0)</div><div class='del'>-</div><div class='ctx'> /* ----------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='ctx'> struct bt819 {</div><div class='hunk'>@@ -97,14 +78,9 @@ static struct timing timing_data[] = {</div><div class='ctx'> 	{858 - 24, 20, 525 - 2, 1, 0x00f8, 0x0000},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define   I2C_BT819        0x8a</div><div class='del'>-</div><div class='ctx'> /* ----------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='del'>-static inline int</div><div class='del'>-bt819_write (struct i2c_client *client,</div><div class='del'>-	     u8                 reg,</div><div class='del'>-	     u8                 value)</div><div class='add'>+static inline int bt819_write(struct i2c_client *client, u8 reg, u8 value)</div><div class='ctx'> {</div><div class='ctx'> 	struct bt819 *decoder = i2c_get_clientdata(client);</div><div class='ctx'> </div><div class='hunk'>@@ -112,24 +88,15 @@ bt819_write (struct i2c_client *client,</div><div class='ctx'> 	return i2c_smbus_write_byte_data(client, reg, value);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int</div><div class='del'>-bt819_setbit (struct i2c_client *client,</div><div class='del'>-	      u8                 reg,</div><div class='del'>-	      u8                 bit,</div><div class='del'>-	      u8                 value)</div><div class='add'>+static inline int bt819_setbit(struct i2c_client *client, u8 reg, u8 bit, u8 value)</div><div class='ctx'> {</div><div class='ctx'> 	struct bt819 *decoder = i2c_get_clientdata(client);</div><div class='ctx'> </div><div class='ctx'> 	return bt819_write(client, reg,</div><div class='del'>-			   (decoder-&gt;</div><div class='del'>-			    reg[reg] &amp; ~(1 &lt;&lt; bit)) |</div><div class='del'>-			    (value ? (1 &lt;&lt; bit) : 0));</div><div class='add'>+		(decoder-&gt;reg[reg] &amp; ~(1 &lt;&lt; bit)) | (value ? (1 &lt;&lt; bit) : 0));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-bt819_write_block (struct i2c_client *client,</div><div class='del'>-		   const u8          *data,</div><div class='del'>-		   unsigned int       len)</div><div class='add'>+static int bt819_write_block(struct i2c_client *client, const u8 *data, unsigned int len)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = -1;</div><div class='ctx'> 	u8 reg;</div><div class='hunk'>@@ -150,10 +117,9 @@ bt819_write_block (struct i2c_client *client,</div><div class='ctx'> 				    decoder-&gt;reg[reg++] = data[1];</div><div class='ctx'> 				len -= 2;</div><div class='ctx'> 				data += 2;</div><div class='del'>-			} while (len &gt;= 2 &amp;&amp; data[0] == reg &amp;&amp;</div><div class='del'>-				 block_len &lt; 32);</div><div class='del'>-			if ((ret = i2c_master_send(client, block_data,</div><div class='del'>-						   block_len)) &lt; 0)</div><div class='add'>+			} while (len &gt;= 2 &amp;&amp; data[0] == reg &amp;&amp; block_len &lt; 32);</div><div class='add'>+			ret = i2c_master_send(client, block_data, block_len);</div><div class='add'>+			if (ret &lt; 0)</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -169,20 +135,17 @@ bt819_write_block (struct i2c_client *client,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int</div><div class='del'>-bt819_read (struct i2c_client *client,</div><div class='del'>-	    u8                 reg)</div><div class='add'>+static inline int bt819_read(struct i2c_client *client, u8 reg)</div><div class='ctx'> {</div><div class='ctx'> 	return i2c_smbus_read_byte_data(client, reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-bt819_init (struct i2c_client *client)</div><div class='add'>+static int bt819_init(struct i2c_client *client)</div><div class='ctx'> {</div><div class='ctx'> 	struct bt819 *decoder = i2c_get_clientdata(client);</div><div class='ctx'> </div><div class='ctx'> 	static unsigned char init[] = {</div><div class='del'>-		//0x1f, 0x00,     /* Reset */</div><div class='add'>+		/*0x1f, 0x00,*/     /* Reset */</div><div class='ctx'> 		0x01, 0x59,	/* 0x01 input format */</div><div class='ctx'> 		0x02, 0x00,	/* 0x02 temporal decimation */</div><div class='ctx'> 		0x03, 0x12,	/* 0x03 Cropping msb */</div><div class='hunk'>@@ -218,12 +181,10 @@ bt819_init (struct i2c_client *client)</div><div class='ctx'> 	struct timing *timing = &amp;timing_data[decoder-&gt;norm];</div><div class='ctx'> </div><div class='ctx'> 	init[0x03 * 2 - 1] =</div><div class='del'>-	    (((timing-&gt;vdelay &gt;&gt; 8) &amp; 0x03) &lt;&lt; 6) | (((timing-&gt;</div><div class='del'>-						       vactive &gt;&gt; 8) &amp;</div><div class='del'>-						      0x03) &lt;&lt; 4) |</div><div class='del'>-	    (((timing-&gt;hdelay &gt;&gt; 8) &amp; 0x03) &lt;&lt; 2) | ((timing-&gt;</div><div class='del'>-						      hactive &gt;&gt; 8) &amp;</div><div class='del'>-						     0x03);</div><div class='add'>+	    (((timing-&gt;vdelay &gt;&gt; 8) &amp; 0x03) &lt;&lt; 6) |</div><div class='add'>+	    (((timing-&gt;vactive &gt;&gt; 8) &amp; 0x03) &lt;&lt; 4) |</div><div class='add'>+	    (((timing-&gt;hdelay &gt;&gt; 8) &amp; 0x03) &lt;&lt; 2) |</div><div class='add'>+	    ((timing-&gt;hactive &gt;&gt; 8) &amp; 0x03);</div><div class='ctx'> 	init[0x04 * 2 - 1] = timing-&gt;vdelay &amp; 0xff;</div><div class='ctx'> 	init[0x05 * 2 - 1] = timing-&gt;vactive &amp; 0xff;</div><div class='ctx'> 	init[0x06 * 2 - 1] = timing-&gt;hdelay &amp; 0xff;</div><div class='hunk'>@@ -238,27 +199,22 @@ bt819_init (struct i2c_client *client)</div><div class='ctx'> </div><div class='ctx'> 	/* init */</div><div class='ctx'> 	return bt819_write_block(client, init, sizeof(init));</div><div class='del'>-</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* ----------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-bt819_command (struct i2c_client *client,</div><div class='del'>-	       unsigned int       cmd,</div><div class='del'>-	       void              *arg)</div><div class='add'>+static int bt819_command(struct i2c_client *client, unsigned cmd, void *arg)</div><div class='ctx'> {</div><div class='ctx'> 	int temp;</div><div class='ctx'> </div><div class='ctx'> 	struct bt819 *decoder = i2c_get_clientdata(client);</div><div class='ctx'> </div><div class='del'>-	if (!decoder-&gt;initialized) {	// First call to bt819_init could be</div><div class='del'>-		bt819_init(client);	// without #FRST = 0</div><div class='add'>+	if (!decoder-&gt;initialized) {	/* First call to bt819_init could be */</div><div class='add'>+		bt819_init(client);	/* without #FRST = 0 */</div><div class='ctx'> 		decoder-&gt;initialized = 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='del'>-</div><div class='ctx'> 	case 0:</div><div class='ctx'> 		/* This is just for testing!!! */</div><div class='ctx'> 		bt819_init(client);</div><div class='hunk'>@@ -274,8 +230,8 @@ bt819_command (struct i2c_client *client,</div><div class='ctx'> 			     VIDEO_DECODER_CCIR;</div><div class='ctx'> 		cap-&gt;inputs = 8;</div><div class='ctx'> 		cap-&gt;outputs = 1;</div><div class='del'>-	}</div><div class='ctx'> 		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	case DECODER_GET_STATUS:</div><div class='ctx'> 	{</div><div class='hunk'>@@ -285,9 +241,9 @@ bt819_command (struct i2c_client *client,</div><div class='ctx'> </div><div class='ctx'> 		status = bt819_read(client, 0x00);</div><div class='ctx'> 		res = 0;</div><div class='del'>-		if ((status &amp; 0x80)) {</div><div class='add'>+		if ((status &amp; 0x80))</div><div class='ctx'> 			res |= DECODER_STATUS_GOOD;</div><div class='del'>-		}</div><div class='add'>+</div><div class='ctx'> 		switch (decoder-&gt;norm) {</div><div class='ctx'> 		case VIDEO_MODE_NTSC:</div><div class='ctx'> 			res |= DECODER_STATUS_NTSC;</div><div class='hunk'>@@ -297,28 +253,25 @@ bt819_command (struct i2c_client *client,</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 		case VIDEO_MODE_AUTO:</div><div class='del'>-			if ((status &amp; 0x10)) {</div><div class='add'>+			if ((status &amp; 0x10))</div><div class='ctx'> 				res |= DECODER_STATUS_PAL;</div><div class='del'>-			} else {</div><div class='add'>+			else</div><div class='ctx'> 				res |= DECODER_STATUS_NTSC;</div><div class='del'>-			}</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		res |= DECODER_STATUS_COLOR;</div><div class='ctx'> 		*iarg = res;</div><div class='ctx'> </div><div class='del'>-		dprintk(1, KERN_INFO "%s: get status %x\n", I2C_NAME(client),</div><div class='del'>-			*iarg);</div><div class='del'>-	}</div><div class='add'>+		v4l_dbg(1, debug, client, "get status %x\n", *iarg);</div><div class='ctx'> 		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	case DECODER_SET_NORM:</div><div class='ctx'> 	{</div><div class='ctx'> 		int *iarg = arg;</div><div class='ctx'> 		struct timing *timing = NULL;</div><div class='ctx'> </div><div class='del'>-		dprintk(1, KERN_INFO "%s: set norm %x\n", I2C_NAME(client),</div><div class='del'>-			*iarg);</div><div class='add'>+		v4l_dbg(1, debug, client, "set norm %x\n", *iarg);</div><div class='ctx'> </div><div class='ctx'> 		switch (*iarg) {</div><div class='ctx'> 		case VIDEO_MODE_NTSC:</div><div class='hunk'>@@ -327,7 +280,7 @@ bt819_command (struct i2c_client *client,</div><div class='ctx'> 			bt819_setbit(client, 0x01, 5, 0);</div><div class='ctx'> 			bt819_write(client, 0x18, 0x68);</div><div class='ctx'> 			bt819_write(client, 0x19, 0x5d);</div><div class='del'>-			//bt819_setbit(client, 0x1a,  5, 1);</div><div class='add'>+			/* bt819_setbit(client, 0x1a,  5, 1); */</div><div class='ctx'> 			timing = &amp;timing_data[VIDEO_MODE_NTSC];</div><div class='ctx'> 			break;</div><div class='ctx'> 		case VIDEO_MODE_PAL:</div><div class='hunk'>@@ -336,7 +289,7 @@ bt819_command (struct i2c_client *client,</div><div class='ctx'> 			bt819_setbit(client, 0x01, 5, 1);</div><div class='ctx'> 			bt819_write(client, 0x18, 0x7f);</div><div class='ctx'> 			bt819_write(client, 0x19, 0x72);</div><div class='del'>-			//bt819_setbit(client, 0x1a,  5, 0);</div><div class='add'>+			/* bt819_setbit(client, 0x1a,  5, 0); */</div><div class='ctx'> 			timing = &amp;timing_data[VIDEO_MODE_PAL];</div><div class='ctx'> 			break;</div><div class='ctx'> 		case VIDEO_MODE_AUTO:</div><div class='hunk'>@@ -344,10 +297,7 @@ bt819_command (struct i2c_client *client,</div><div class='ctx'> 			bt819_setbit(client, 0x01, 1, 0);</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='del'>-			dprintk(1,</div><div class='del'>-				KERN_ERR</div><div class='del'>-				"%s: unsupported norm %d\n",</div><div class='del'>-				I2C_NAME(client), *iarg);</div><div class='add'>+			v4l_dbg(1, debug, client, "unsupported norm %x\n", *iarg);</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -366,19 +316,17 @@ bt819_command (struct i2c_client *client,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		decoder-&gt;norm = *iarg;</div><div class='del'>-	}</div><div class='ctx'> 		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	case DECODER_SET_INPUT:</div><div class='ctx'> 	{</div><div class='ctx'> 		int *iarg = arg;</div><div class='ctx'> </div><div class='del'>-		dprintk(1, KERN_INFO "%s: set input %x\n", I2C_NAME(client),</div><div class='del'>-			*iarg);</div><div class='add'>+		v4l_dbg(1, debug, client, "set input %x\n", *iarg);</div><div class='ctx'> </div><div class='del'>-		if (*iarg &lt; 0 || *iarg &gt; 7) {</div><div class='add'>+		if (*iarg &lt; 0 || *iarg &gt; 7)</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-		}</div><div class='ctx'> </div><div class='ctx'> 		if (decoder-&gt;input != *iarg) {</div><div class='ctx'> 			decoder-&gt;input = *iarg;</div><div class='hunk'>@@ -391,52 +339,42 @@ bt819_command (struct i2c_client *client,</div><div class='ctx'> 				bt819_setbit(client, 0x1a, 1, 0);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-	}</div><div class='ctx'> 		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	case DECODER_SET_OUTPUT:</div><div class='ctx'> 	{</div><div class='ctx'> 		int *iarg = arg;</div><div class='ctx'> </div><div class='del'>-		dprintk(1, KERN_INFO "%s: set output %x\n", I2C_NAME(client),</div><div class='del'>-			*iarg);</div><div class='add'>+		v4l_dbg(1, debug, client, "set output %x\n", *iarg);</div><div class='ctx'> </div><div class='ctx'> 		/* not much choice of outputs */</div><div class='del'>-		if (*iarg != 0) {</div><div class='add'>+		if (*iarg != 0)</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='ctx'> 		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	case DECODER_ENABLE_OUTPUT:</div><div class='ctx'> 	{</div><div class='ctx'> 		int *iarg = arg;</div><div class='ctx'> 		int enable = (*iarg != 0);</div><div class='ctx'> </div><div class='del'>-		dprintk(1, KERN_INFO "%s: enable output %x\n",</div><div class='del'>-			I2C_NAME(client), *iarg);</div><div class='add'>+		v4l_dbg(1, debug, client, "enable output %x\n", *iarg);</div><div class='ctx'> </div><div class='ctx'> 		if (decoder-&gt;enable != enable) {</div><div class='ctx'> 			decoder-&gt;enable = enable;</div><div class='del'>-</div><div class='del'>-			if (decoder-&gt;enable) {</div><div class='del'>-				bt819_setbit(client, 0x16, 7, 0);</div><div class='del'>-			} else {</div><div class='del'>-				bt819_setbit(client, 0x16, 7, 1);</div><div class='del'>-			}</div><div class='add'>+			bt819_setbit(client, 0x16, 7, !enable);</div><div class='ctx'> 		}</div><div class='del'>-	}</div><div class='ctx'> 		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	case DECODER_SET_PICTURE:</div><div class='ctx'> 	{</div><div class='ctx'> 		struct video_picture *pic = arg;</div><div class='ctx'> </div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_INFO</div><div class='del'>-			"%s: set picture brightness %d contrast %d colour %d\n",</div><div class='del'>-			I2C_NAME(client), pic-&gt;brightness, pic-&gt;contrast,</div><div class='del'>-			pic-&gt;colour);</div><div class='add'>+		v4l_dbg(1, debug, client,</div><div class='add'>+			"set picture brightness %d contrast %d colour %d\n",</div><div class='add'>+			pic-&gt;brightness, pic-&gt;contrast, pic-&gt;colour);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 		if (decoder-&gt;bright != pic-&gt;brightness) {</div><div class='hunk'>@@ -474,8 +412,8 @@ bt819_command (struct i2c_client *client,</div><div class='ctx'> 			bt819_write(client, 0x0f,</div><div class='ctx'> 				    128 - (decoder-&gt;hue &gt;&gt; 8));</div><div class='ctx'> 		}</div><div class='del'>-	}</div><div class='ctx'> 		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -486,55 +424,44 @@ bt819_command (struct i2c_client *client,</div><div class='ctx'> </div><div class='ctx'> /* ----------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Generic i2c probe</div><div class='del'>- * concerning the addresses: i2c wants 7 bit (without the r/w bit), so '&gt;&gt;1'</div><div class='del'>- */</div><div class='del'>-static unsigned short normal_i2c[] = {</div><div class='del'>-	I2C_BT819 &gt;&gt; 1,</div><div class='del'>-	I2C_CLIENT_END,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned short ignore = I2C_CLIENT_END;</div><div class='del'>-</div><div class='del'>-static struct i2c_client_address_data addr_data = {</div><div class='del'>-	.normal_i2c		= normal_i2c,</div><div class='del'>-	.probe			= &amp;ignore,</div><div class='del'>-	.ignore			= &amp;ignore,</div><div class='del'>-};</div><div class='add'>+static unsigned short normal_i2c[] = { 0x8a &gt;&gt; 1, I2C_CLIENT_END };</div><div class='ctx'> </div><div class='del'>-static struct i2c_driver i2c_driver_bt819;</div><div class='add'>+I2C_CLIENT_INSMOD;</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-bt819_detect_client (struct i2c_adapter *adapter,</div><div class='del'>-		     int                 address,</div><div class='del'>-		     int                 kind)</div><div class='add'>+static int bt819_probe(struct i2c_client *client,</div><div class='add'>+			const struct i2c_device_id *id)</div><div class='ctx'> {</div><div class='del'>-	int i, id;</div><div class='add'>+	int i, ver;</div><div class='ctx'> 	struct bt819 *decoder;</div><div class='del'>-	struct i2c_client *client;</div><div class='del'>-</div><div class='del'>-	dprintk(1,</div><div class='del'>-		KERN_INFO</div><div class='del'>-		"bt819: detecting bt819 client on address 0x%x\n",</div><div class='del'>-		address &lt;&lt; 1);</div><div class='add'>+	const char *name;</div><div class='ctx'> </div><div class='ctx'> 	/* Check if the adapter supports the needed features */</div><div class='del'>-	if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))</div><div class='del'>-		return 0;</div><div class='add'>+	if (!i2c_check_functionality(client-&gt;adapter, I2C_FUNC_SMBUS_BYTE_DATA))</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);</div><div class='del'>-	if (!client)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	client-&gt;addr = address;</div><div class='del'>-	client-&gt;adapter = adapter;</div><div class='del'>-	client-&gt;driver = &amp;i2c_driver_bt819;</div><div class='add'>+	ver = bt819_read(client, 0x17);</div><div class='add'>+	switch (ver &amp; 0xf0) {</div><div class='add'>+	case 0x70:</div><div class='add'>+		name = "bt819a";</div><div class='add'>+		break;</div><div class='add'>+	case 0x60:</div><div class='add'>+		name = "bt817a";</div><div class='add'>+		break;</div><div class='add'>+	case 0x20:</div><div class='add'>+		name = "bt815a";</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		v4l_dbg(1, debug, client,</div><div class='add'>+			"unknown chip version 0x%02x\n", ver);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	v4l_info(client, "%s found @ 0x%x (%s)\n", name,</div><div class='add'>+			client-&gt;addr &lt;&lt; 1, client-&gt;adapter-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	decoder = kzalloc(sizeof(struct bt819), GFP_KERNEL);</div><div class='del'>-	if (decoder == NULL) {</div><div class='del'>-		kfree(client);</div><div class='add'>+	if (decoder == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	}</div><div class='ctx'> 	decoder-&gt;norm = VIDEO_MODE_NTSC;</div><div class='ctx'> 	decoder-&gt;input = 0;</div><div class='ctx'> 	decoder-&gt;enable = 1;</div><div class='hunk'>@@ -545,97 +472,33 @@ bt819_detect_client (struct i2c_adapter *adapter,</div><div class='ctx'> 	decoder-&gt;initialized = 0;</div><div class='ctx'> 	i2c_set_clientdata(client, decoder);</div><div class='ctx'> </div><div class='del'>-	id = bt819_read(client, 0x17);</div><div class='del'>-	switch (id &amp; 0xf0) {</div><div class='del'>-	case 0x70:</div><div class='del'>-		strlcpy(I2C_NAME(client), "bt819a", sizeof(I2C_NAME(client)));</div><div class='del'>-		break;</div><div class='del'>-	case 0x60:</div><div class='del'>-		strlcpy(I2C_NAME(client), "bt817a", sizeof(I2C_NAME(client)));</div><div class='del'>-		break;</div><div class='del'>-	case 0x20:</div><div class='del'>-		strlcpy(I2C_NAME(client), "bt815a", sizeof(I2C_NAME(client)));</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_ERR</div><div class='del'>-			"bt819: unknown chip version 0x%x (ver 0x%x)\n",</div><div class='del'>-			id &amp; 0xf0, id &amp; 0x0f);</div><div class='del'>-		kfree(decoder);</div><div class='del'>-		kfree(client);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	i = i2c_attach_client(client);</div><div class='del'>-	if (i) {</div><div class='del'>-		kfree(client);</div><div class='del'>-		kfree(decoder);</div><div class='del'>-		return i;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	i = bt819_init(client);</div><div class='del'>-	if (i &lt; 0) {</div><div class='del'>-		dprintk(1, KERN_ERR "%s_attach: init status %d\n",</div><div class='del'>-			I2C_NAME(client), i);</div><div class='del'>-	} else {</div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_INFO</div><div class='del'>-			"%s_attach: chip version 0x%x at address 0x%x\n",</div><div class='del'>-			I2C_NAME(client), id &amp; 0x0f,</div><div class='del'>-			client-&gt;addr &lt;&lt; 1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='add'>+	if (i &lt; 0)</div><div class='add'>+		v4l_dbg(1, debug, client, "init status %d\n", i);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-bt819_attach_adapter (struct i2c_adapter *adapter)</div><div class='del'>-{</div><div class='del'>-	return i2c_probe(adapter, &amp;addr_data, &amp;bt819_detect_client);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-bt819_detach_client (struct i2c_client *client)</div><div class='add'>+static int bt819_remove(struct i2c_client *client)</div><div class='ctx'> {</div><div class='del'>-	struct bt819 *decoder = i2c_get_clientdata(client);</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = i2c_detach_client(client);</div><div class='del'>-	if (err) {</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	kfree(decoder);</div><div class='del'>-	kfree(client);</div><div class='del'>-</div><div class='add'>+	kfree(i2c_get_clientdata(client));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* ----------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='del'>-static struct i2c_driver i2c_driver_bt819 = {</div><div class='del'>-	.driver = {</div><div class='del'>-		.name = "bt819",</div><div class='del'>-	},</div><div class='del'>-</div><div class='del'>-	.id = I2C_DRIVERID_BT819,</div><div class='add'>+static const struct i2c_device_id bt819_id[] = {</div><div class='add'>+	{ "bt819a", 0 },</div><div class='add'>+	{ "bt817a", 0 },</div><div class='add'>+	{ "bt815a", 0 },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(i2c, bt819_id);</div><div class='ctx'> </div><div class='del'>-	.attach_adapter = bt819_attach_adapter,</div><div class='del'>-	.detach_client = bt819_detach_client,</div><div class='add'>+static struct v4l2_i2c_driver_data v4l2_i2c_data = {</div><div class='add'>+	.name = "bt819",</div><div class='add'>+	.driverid = I2C_DRIVERID_BT819,</div><div class='ctx'> 	.command = bt819_command,</div><div class='add'>+	.probe = bt819_probe,</div><div class='add'>+	.remove = bt819_remove,</div><div class='add'>+	.id_table = bt819_id,</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init</div><div class='del'>-bt819_init_module (void)</div><div class='del'>-{</div><div class='del'>-	return i2c_add_driver(&amp;i2c_driver_bt819);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit</div><div class='del'>-bt819_exit (void)</div><div class='del'>-{</div><div class='del'>-	i2c_del_driver(&amp;i2c_driver_bt819);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(bt819_init_module);</div><div class='del'>-module_exit(bt819_exit);</div><div class='head'>diff --git a/drivers/media/video/bt856.c b/drivers/media/video/bt856.c<br/>index 98ee2d8feb34..4213867507f8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/bt856.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/bt856.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/bt856.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/bt856.c</a></div><div class='hunk'>@@ -29,47 +29,28 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/fs.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/major.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/i2c.h&gt;</div><div class='del'>-#include &lt;linux/video_encoder.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/pgtable.h&gt;</div><div class='del'>-#include &lt;asm/page.h&gt;</div><div class='add'>+#include &lt;linux/ioctl.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='del'>-</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/i2c-id.h&gt;</div><div class='ctx'> #include &lt;linux/videodev.h&gt;</div><div class='add'>+#include &lt;linux/video_encoder.h&gt;</div><div class='add'>+#include &lt;media/v4l2-common.h&gt;</div><div class='add'>+#include &lt;media/v4l2-i2c-drv-legacy.h&gt;</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("Brooktree-856A video encoder driver");</div><div class='ctx'> MODULE_AUTHOR("Mike Bernson &amp; Dave Perks");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-#define I2C_NAME(s) (s)-&gt;name</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> static int debug;</div><div class='ctx'> module_param(debug, int, 0);</div><div class='ctx'> MODULE_PARM_DESC(debug, "Debug level (0-1)");</div><div class='ctx'> </div><div class='del'>-#define dprintk(num, format, args...) \</div><div class='del'>-	do { \</div><div class='del'>-		if (debug &gt;= num) \</div><div class='del'>-			printk(format, ##args); \</div><div class='del'>-	} while (0)</div><div class='del'>-</div><div class='ctx'> /* ----------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='del'>-#define REG_OFFSET	0xDA</div><div class='del'>-#define BT856_NR_REG	6</div><div class='add'>+#define BT856_REG_OFFSET	0xDA</div><div class='add'>+#define BT856_NR_REG		6</div><div class='ctx'> </div><div class='ctx'> struct bt856 {</div><div class='ctx'> 	unsigned char reg[BT856_NR_REG];</div><div class='hunk'>@@ -78,61 +59,46 @@ struct bt856 {</div><div class='ctx'> 	int enable;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define   I2C_BT856        0x88</div><div class='del'>-</div><div class='ctx'> /* ----------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='del'>-static inline int</div><div class='del'>-bt856_write (struct i2c_client *client,</div><div class='del'>-	     u8                 reg,</div><div class='del'>-	     u8                 value)</div><div class='add'>+static inline int bt856_write(struct i2c_client *client, u8 reg, u8 value)</div><div class='ctx'> {</div><div class='ctx'> 	struct bt856 *encoder = i2c_get_clientdata(client);</div><div class='ctx'> </div><div class='del'>-	encoder-&gt;reg[reg - REG_OFFSET] = value;</div><div class='add'>+	encoder-&gt;reg[reg - BT856_REG_OFFSET] = value;</div><div class='ctx'> 	return i2c_smbus_write_byte_data(client, reg, value);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int</div><div class='del'>-bt856_setbit (struct i2c_client *client,</div><div class='del'>-	      u8                 reg,</div><div class='del'>-	      u8                 bit,</div><div class='del'>-	      u8                 value)</div><div class='add'>+static inline int bt856_setbit(struct i2c_client *client, u8 reg, u8 bit, u8 value)</div><div class='ctx'> {</div><div class='ctx'> 	struct bt856 *encoder = i2c_get_clientdata(client);</div><div class='ctx'> </div><div class='ctx'> 	return bt856_write(client, reg,</div><div class='del'>-			   (encoder-&gt;</div><div class='del'>-			    reg[reg - REG_OFFSET] &amp; ~(1 &lt;&lt; bit)) |</div><div class='del'>-			    (value ? (1 &lt;&lt; bit) : 0));</div><div class='add'>+		(encoder-&gt;reg[reg - BT856_REG_OFFSET] &amp; ~(1 &lt;&lt; bit)) |</div><div class='add'>+				(value ? (1 &lt;&lt; bit) : 0));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-bt856_dump (struct i2c_client *client)</div><div class='add'>+static void bt856_dump(struct i2c_client *client)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	struct bt856 *encoder = i2c_get_clientdata(client);</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "%s: register dump:", I2C_NAME(client));</div><div class='add'>+	v4l_info(client, "register dump:\n");</div><div class='ctx'> 	for (i = 0; i &lt; BT856_NR_REG; i += 2)</div><div class='del'>-		printk(" %02x", encoder-&gt;reg[i]);</div><div class='del'>-	printk("\n");</div><div class='add'>+		printk(KERN_CONT " %02x", encoder-&gt;reg[i]);</div><div class='add'>+	printk(KERN_CONT "\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* ----------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-bt856_command (struct i2c_client *client,</div><div class='del'>-	       unsigned int       cmd,</div><div class='del'>-	       void              *arg)</div><div class='add'>+static int bt856_command(struct i2c_client *client, unsigned cmd, void *arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct bt856 *encoder = i2c_get_clientdata(client);</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='del'>-</div><div class='ctx'> 	case 0:</div><div class='ctx'> 		/* This is just for testing!!! */</div><div class='del'>-		dprintk(1, KERN_INFO "bt856: init\n");</div><div class='add'>+		v4l_dbg(1, debug, client, "init\n");</div><div class='ctx'> 		bt856_write(client, 0xdc, 0x18);</div><div class='ctx'> 		bt856_write(client, 0xda, 0);</div><div class='ctx'> 		bt856_write(client, 0xde, 0);</div><div class='hunk'>@@ -142,7 +108,6 @@ bt856_command (struct i2c_client *client,</div><div class='ctx'> 		bt856_setbit(client, 0xdc, 4, 1);</div><div class='ctx'> </div><div class='ctx'> 		switch (encoder-&gt;norm) {</div><div class='del'>-</div><div class='ctx'> 		case VIDEO_MODE_NTSC:</div><div class='ctx'> 			bt856_setbit(client, 0xdc, 2, 0);</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -163,26 +128,23 @@ bt856_command (struct i2c_client *client,</div><div class='ctx'> 	{</div><div class='ctx'> 		struct video_encoder_capability *cap = arg;</div><div class='ctx'> </div><div class='del'>-		dprintk(1, KERN_INFO "%s: get capabilities\n",</div><div class='del'>-			I2C_NAME(client));</div><div class='add'>+		v4l_dbg(1, debug, client, "get capabilities\n");</div><div class='ctx'> </div><div class='ctx'> 		cap-&gt;flags = VIDEO_ENCODER_PAL |</div><div class='ctx'> 			     VIDEO_ENCODER_NTSC |</div><div class='ctx'> 			     VIDEO_ENCODER_CCIR;</div><div class='ctx'> 		cap-&gt;inputs = 2;</div><div class='ctx'> 		cap-&gt;outputs = 1;</div><div class='del'>-	}</div><div class='ctx'> 		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	case ENCODER_SET_NORM:</div><div class='ctx'> 	{</div><div class='ctx'> 		int *iarg = arg;</div><div class='ctx'> </div><div class='del'>-		dprintk(1, KERN_INFO "%s: set norm %d\n", I2C_NAME(client),</div><div class='del'>-			*iarg);</div><div class='add'>+		v4l_dbg(1, debug, client, "set norm %d\n", *iarg);</div><div class='ctx'> </div><div class='ctx'> 		switch (*iarg) {</div><div class='del'>-</div><div class='ctx'> 		case VIDEO_MODE_NTSC:</div><div class='ctx'> 			bt856_setbit(client, 0xdc, 2, 0);</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -195,27 +157,23 @@ bt856_command (struct i2c_client *client,</div><div class='ctx'> </div><div class='ctx'> 		default:</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-</div><div class='ctx'> 		}</div><div class='ctx'> 		encoder-&gt;norm = *iarg;</div><div class='ctx'> 		if (debug != 0)</div><div class='ctx'> 			bt856_dump(client);</div><div class='del'>-	}</div><div class='ctx'> 		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	case ENCODER_SET_INPUT:</div><div class='ctx'> 	{</div><div class='ctx'> 		int *iarg = arg;</div><div class='ctx'> </div><div class='del'>-		dprintk(1, KERN_INFO "%s: set input %d\n", I2C_NAME(client),</div><div class='del'>-			*iarg);</div><div class='add'>+		v4l_dbg(1, debug, client, "set input %d\n", *iarg);</div><div class='ctx'> </div><div class='ctx'> 		/* We only have video bus.</div><div class='ctx'> 		 * iarg = 0: input is from bt819</div><div class='ctx'> 		 * iarg = 1: input is from ZR36060 */</div><div class='del'>-</div><div class='ctx'> 		switch (*iarg) {</div><div class='del'>-</div><div class='ctx'> 		case 0:</div><div class='ctx'> 			bt856_setbit(client, 0xde, 4, 0);</div><div class='ctx'> 			bt856_setbit(client, 0xde, 3, 1);</div><div class='hunk'>@@ -234,27 +192,24 @@ bt856_command (struct i2c_client *client,</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (debug != 0)</div><div class='ctx'> 			bt856_dump(client);</div><div class='del'>-	}</div><div class='ctx'> 		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	case ENCODER_SET_OUTPUT:</div><div class='ctx'> 	{</div><div class='ctx'> 		int *iarg = arg;</div><div class='ctx'> </div><div class='del'>-		dprintk(1, KERN_INFO "%s: set output %d\n", I2C_NAME(client),</div><div class='del'>-			*iarg);</div><div class='add'>+		v4l_dbg(1, debug, client, "set output %d\n", *iarg);</div><div class='ctx'> </div><div class='ctx'> 		/* not much choice of outputs */</div><div class='del'>-		if (*iarg != 0) {</div><div class='add'>+		if (*iarg != 0)</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='ctx'> 		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	case ENCODER_ENABLE_OUTPUT:</div><div class='ctx'> 	{</div><div class='hunk'>@@ -262,10 +217,9 @@ bt856_command (struct i2c_client *client,</div><div class='ctx'> </div><div class='ctx'> 		encoder-&gt;enable = !!*iarg;</div><div class='ctx'> </div><div class='del'>-		dprintk(1, KERN_INFO "%s: enable output %d\n",</div><div class='del'>-			I2C_NAME(client), encoder-&gt;enable);</div><div class='del'>-	}</div><div class='add'>+		v4l_dbg(1, debug, client, "enable output %d\n", encoder-&gt;enable);</div><div class='ctx'> 		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -276,64 +230,29 @@ bt856_command (struct i2c_client *client,</div><div class='ctx'> </div><div class='ctx'> /* ----------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Generic i2c probe</div><div class='del'>- * concerning the addresses: i2c wants 7 bit (without the r/w bit), so '&gt;&gt;1'</div><div class='del'>- */</div><div class='del'>-static unsigned short normal_i2c[] = { I2C_BT856 &gt;&gt; 1, I2C_CLIENT_END };</div><div class='del'>-</div><div class='del'>-static unsigned short ignore = I2C_CLIENT_END;</div><div class='del'>-</div><div class='del'>-static struct i2c_client_address_data addr_data = {</div><div class='del'>-	.normal_i2c		= normal_i2c,</div><div class='del'>-	.probe			= &amp;ignore,</div><div class='del'>-	.ignore			= &amp;ignore,</div><div class='del'>-};</div><div class='add'>+static unsigned short normal_i2c[] = { 0x88 &gt;&gt; 1, I2C_CLIENT_END };</div><div class='ctx'> </div><div class='del'>-static struct i2c_driver i2c_driver_bt856;</div><div class='add'>+I2C_CLIENT_INSMOD;</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-bt856_detect_client (struct i2c_adapter *adapter,</div><div class='del'>-		     int                 address,</div><div class='del'>-		     int                 kind)</div><div class='add'>+static int bt856_probe(struct i2c_client *client,</div><div class='add'>+			const struct i2c_device_id *id)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='del'>-	struct i2c_client *client;</div><div class='ctx'> 	struct bt856 *encoder;</div><div class='ctx'> </div><div class='del'>-	dprintk(1,</div><div class='del'>-		KERN_INFO</div><div class='del'>-		"bt856.c: detecting bt856 client on address 0x%x\n",</div><div class='del'>-		address &lt;&lt; 1);</div><div class='del'>-</div><div class='ctx'> 	/* Check if the adapter supports the needed features */</div><div class='del'>-	if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))</div><div class='del'>-		return 0;</div><div class='add'>+	if (!i2c_check_functionality(client-&gt;adapter, I2C_FUNC_SMBUS_BYTE_DATA))</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);</div><div class='del'>-	if (!client)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	client-&gt;addr = address;</div><div class='del'>-	client-&gt;adapter = adapter;</div><div class='del'>-	client-&gt;driver = &amp;i2c_driver_bt856;</div><div class='del'>-	strlcpy(I2C_NAME(client), "bt856", sizeof(I2C_NAME(client)));</div><div class='add'>+	v4l_info(client, "chip found @ 0x%x (%s)\n",</div><div class='add'>+			client-&gt;addr &lt;&lt; 1, client-&gt;adapter-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	encoder = kzalloc(sizeof(struct bt856), GFP_KERNEL);</div><div class='del'>-	if (encoder == NULL) {</div><div class='del'>-		kfree(client);</div><div class='add'>+	if (encoder == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	}</div><div class='ctx'> 	encoder-&gt;norm = VIDEO_MODE_NTSC;</div><div class='ctx'> 	encoder-&gt;enable = 1;</div><div class='ctx'> 	i2c_set_clientdata(client, encoder);</div><div class='ctx'> </div><div class='del'>-	i = i2c_attach_client(client);</div><div class='del'>-	if (i) {</div><div class='del'>-		kfree(client);</div><div class='del'>-		kfree(encoder);</div><div class='del'>-		return i;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	bt856_write(client, 0xdc, 0x18);</div><div class='ctx'> 	bt856_write(client, 0xda, 0);</div><div class='ctx'> 	bt856_write(client, 0xde, 0);</div><div class='hunk'>@@ -359,65 +278,26 @@ bt856_detect_client (struct i2c_adapter *adapter,</div><div class='ctx'> </div><div class='ctx'> 	if (debug != 0)</div><div class='ctx'> 		bt856_dump(client);</div><div class='del'>-</div><div class='del'>-	dprintk(1, KERN_INFO "%s_attach: at address 0x%x\n", I2C_NAME(client),</div><div class='del'>-		client-&gt;addr &lt;&lt; 1);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-bt856_attach_adapter (struct i2c_adapter *adapter)</div><div class='add'>+static int bt856_remove(struct i2c_client *client)</div><div class='ctx'> {</div><div class='del'>-	dprintk(1,</div><div class='del'>-		KERN_INFO</div><div class='del'>-		"bt856.c: starting probe for adapter %s (0x%x)\n",</div><div class='del'>-		I2C_NAME(adapter), adapter-&gt;id);</div><div class='del'>-	return i2c_probe(adapter, &amp;addr_data, &amp;bt856_detect_client);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-bt856_detach_client (struct i2c_client *client)</div><div class='del'>-{</div><div class='del'>-	struct bt856 *encoder = i2c_get_clientdata(client);</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = i2c_detach_client(client);</div><div class='del'>-	if (err) {</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	kfree(encoder);</div><div class='del'>-	kfree(client);</div><div class='del'>-</div><div class='add'>+	kfree(i2c_get_clientdata(client));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* ----------------------------------------------------------------------- */</div><div class='del'>-</div><div class='del'>-static struct i2c_driver i2c_driver_bt856 = {</div><div class='del'>-	.driver = {</div><div class='del'>-		.name = "bt856",</div><div class='del'>-	},</div><div class='del'>-</div><div class='del'>-	.id = I2C_DRIVERID_BT856,</div><div class='add'>+static const struct i2c_device_id bt856_id[] = {</div><div class='add'>+	{ "bt856", 0 },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(i2c, bt856_id);</div><div class='ctx'> </div><div class='del'>-	.attach_adapter = bt856_attach_adapter,</div><div class='del'>-	.detach_client = bt856_detach_client,</div><div class='add'>+static struct v4l2_i2c_driver_data v4l2_i2c_data = {</div><div class='add'>+	.name = "bt856",</div><div class='add'>+	.driverid = I2C_DRIVERID_BT856,</div><div class='ctx'> 	.command = bt856_command,</div><div class='add'>+	.probe = bt856_probe,</div><div class='add'>+	.remove = bt856_remove,</div><div class='add'>+	.id_table = bt856_id,</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init</div><div class='del'>-bt856_init (void)</div><div class='del'>-{</div><div class='del'>-	return i2c_add_driver(&amp;i2c_driver_bt856);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit</div><div class='del'>-bt856_exit (void)</div><div class='del'>-{</div><div class='del'>-	i2c_del_driver(&amp;i2c_driver_bt856);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(bt856_init);</div><div class='del'>-module_exit(bt856_exit);</div><div class='head'>diff --git a/drivers/media/video/bt866.c b/drivers/media/video/bt866.c<br/>index 96b415576f0d..596f9e2376be 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/bt866.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/bt866.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/bt866.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/bt866.c</a></div><div class='hunk'>@@ -29,42 +29,28 @@</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/fs.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/major.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/signal.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/pgtable.h&gt;</div><div class='del'>-#include &lt;asm/page.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/ioctl.h&gt;</div><div class='add'>+#include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='del'>-</div><div class='add'>+#include &lt;linux/i2c-id.h&gt;</div><div class='ctx'> #include &lt;linux/videodev.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='del'>-</div><div class='ctx'> #include &lt;linux/video_encoder.h&gt;</div><div class='add'>+#include &lt;media/v4l2-common.h&gt;</div><div class='add'>+#include &lt;media/v4l2-i2c-drv-legacy.h&gt;</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("Brooktree-866 video encoder driver");</div><div class='add'>+MODULE_AUTHOR("Mike Bernson &amp; Dave Perks");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='del'>-#define	BT866_DEVNAME	"bt866"</div><div class='del'>-#define I2C_BT866	0x88</div><div class='del'>-</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-</div><div class='del'>-#define DEBUG(x)		/* Debug driver */</div><div class='add'>+static int debug;</div><div class='add'>+module_param(debug, int, 0);</div><div class='add'>+MODULE_PARM_DESC(debug, "Debug level (0-1)");</div><div class='ctx'> </div><div class='ctx'> /* ----------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='ctx'> struct bt866 {</div><div class='del'>-	struct i2c_client *i2c;</div><div class='del'>-	int addr;</div><div class='del'>-	unsigned char reg[256];</div><div class='add'>+	u8 reg[256];</div><div class='ctx'> </div><div class='ctx'> 	int norm;</div><div class='ctx'> 	int enable;</div><div class='hunk'>@@ -74,20 +60,45 @@ struct bt866 {</div><div class='ctx'> 	int sat;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int bt866_write(struct bt866 *dev,</div><div class='del'>-			unsigned char subaddr, unsigned char data);</div><div class='add'>+static int bt866_write(struct i2c_client *client, u8 subaddr, u8 data)</div><div class='add'>+{</div><div class='add'>+	struct bt866 *encoder = i2c_get_clientdata(client);</div><div class='add'>+	u8 buffer[2];</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	buffer[0] = subaddr;</div><div class='add'>+	buffer[1] = data;</div><div class='add'>+</div><div class='add'>+	encoder-&gt;reg[subaddr] = data;</div><div class='add'>+</div><div class='add'>+	v4l_dbg(1, debug, client, "write 0x%02x = 0x%02x\n", subaddr, data);</div><div class='add'>+</div><div class='add'>+	for (err = 0; err &lt; 3;) {</div><div class='add'>+		if (i2c_master_send(client, buffer, 2) == 2)</div><div class='add'>+			break;</div><div class='add'>+		err++;</div><div class='add'>+		v4l_warn(client, "error #%d writing to 0x%02x\n",</div><div class='add'>+				err, subaddr);</div><div class='add'>+		schedule_timeout_interruptible(msecs_to_jiffies(100));</div><div class='add'>+	}</div><div class='add'>+	if (err == 3) {</div><div class='add'>+		v4l_warn(client, "giving up\n");</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-static int bt866_do_command(struct bt866 *encoder,</div><div class='del'>-			unsigned int cmd, void *arg)</div><div class='add'>+static int bt866_command(struct i2c_client *client, unsigned cmd, void *arg)</div><div class='ctx'> {</div><div class='add'>+	struct bt866 *encoder = i2c_get_clientdata(client);</div><div class='add'>+</div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case ENCODER_GET_CAPABILITIES:</div><div class='ctx'> 	{</div><div class='ctx'> 		struct video_encoder_capability *cap = arg;</div><div class='ctx'> </div><div class='del'>-		DEBUG(printk</div><div class='del'>-		      (KERN_INFO "%s: get capabilities\n",</div><div class='del'>-		       encoder-&gt;i2c-&gt;name));</div><div class='add'>+		v4l_dbg(1, debug, client, "get capabilities\n");</div><div class='ctx'> </div><div class='ctx'> 		cap-&gt;flags</div><div class='ctx'> 			= VIDEO_ENCODER_PAL</div><div class='hunk'>@@ -95,18 +106,16 @@ static int bt866_do_command(struct bt866 *encoder,</div><div class='ctx'> 			| VIDEO_ENCODER_CCIR;</div><div class='ctx'> 		cap-&gt;inputs = 2;</div><div class='ctx'> 		cap-&gt;outputs = 1;</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='del'>-	break;</div><div class='ctx'> </div><div class='ctx'> 	case ENCODER_SET_NORM:</div><div class='ctx'> 	{</div><div class='ctx'> 		int *iarg = arg;</div><div class='ctx'> </div><div class='del'>-		DEBUG(printk(KERN_INFO "%s: set norm %d\n",</div><div class='del'>-			     encoder-&gt;i2c-&gt;name, *iarg));</div><div class='add'>+		v4l_dbg(1, debug, client, "set norm %d\n", *iarg);</div><div class='ctx'> </div><div class='ctx'> 		switch (*iarg) {</div><div class='del'>-</div><div class='ctx'> 		case VIDEO_MODE_NTSC:</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='hunk'>@@ -115,11 +124,10 @@ static int bt866_do_command(struct bt866 *encoder,</div><div class='ctx'> </div><div class='ctx'> 		default:</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-</div><div class='ctx'> 		}</div><div class='ctx'> 		encoder-&gt;norm = *iarg;</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='del'>-	break;</div><div class='ctx'> </div><div class='ctx'> 	case ENCODER_SET_INPUT:</div><div class='ctx'> 	{</div><div class='hunk'>@@ -155,7 +163,7 @@ static int bt866_do_command(struct bt866 *encoder,</div><div class='ctx'> 		u8 val;</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; i &lt; ARRAY_SIZE(init) / 2; i += 2)</div><div class='del'>-			bt866_write(encoder, init[i], init[i+1]);</div><div class='add'>+			bt866_write(client, init[i], init[i+1]);</div><div class='ctx'> </div><div class='ctx'> 		val = encoder-&gt;reg[0xdc];</div><div class='ctx'> </div><div class='hunk'>@@ -164,17 +172,16 @@ static int bt866_do_command(struct bt866 *encoder,</div><div class='ctx'> 		else</div><div class='ctx'> 			val &amp;= ~0x40; /* !CBSWAP */</div><div class='ctx'> </div><div class='del'>-		bt866_write(encoder, 0xdc, val);</div><div class='add'>+		bt866_write(client, 0xdc, val);</div><div class='ctx'> </div><div class='ctx'> 		val = encoder-&gt;reg[0xcc];</div><div class='ctx'> 		if (*iarg == 2)</div><div class='ctx'> 			val |= 0x01; /* OSDBAR */</div><div class='ctx'> 		else</div><div class='ctx'> 			val &amp;= ~0x01; /* !OSDBAR */</div><div class='del'>-		bt866_write(encoder, 0xcc, val);</div><div class='add'>+		bt866_write(client, 0xcc, val);</div><div class='ctx'> </div><div class='del'>-		DEBUG(printk(KERN_INFO "%s: set input %d\n",</div><div class='del'>-			     encoder-&gt;i2c-&gt;name, *iarg));</div><div class='add'>+		v4l_dbg(1, debug, client, "set input %d\n", *iarg);</div><div class='ctx'> </div><div class='ctx'> 		switch (*iarg) {</div><div class='ctx'> 		case 0:</div><div class='hunk'>@@ -183,48 +190,44 @@ static int bt866_do_command(struct bt866 *encoder,</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-</div><div class='ctx'> 		}</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='del'>-	break;</div><div class='ctx'> </div><div class='ctx'> 	case ENCODER_SET_OUTPUT:</div><div class='ctx'> 	{</div><div class='ctx'> 		int *iarg = arg;</div><div class='ctx'> </div><div class='del'>-		DEBUG(printk(KERN_INFO "%s: set output %d\n",</div><div class='del'>-			     encoder-&gt;i2c-&gt;name, *iarg));</div><div class='add'>+		v4l_dbg(1, debug, client, "set output %d\n", *iarg);</div><div class='ctx'> </div><div class='ctx'> 		/* not much choice of outputs */</div><div class='ctx'> 		if (*iarg != 0)</div><div class='ctx'> 			return -EINVAL;</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='del'>-	break;</div><div class='ctx'> </div><div class='ctx'> 	case ENCODER_ENABLE_OUTPUT:</div><div class='ctx'> 	{</div><div class='ctx'> 		int *iarg = arg;</div><div class='ctx'> 		encoder-&gt;enable = !!*iarg;</div><div class='ctx'> </div><div class='del'>-		DEBUG(printk</div><div class='del'>-		      (KERN_INFO "%s: enable output %d\n",</div><div class='del'>-		       encoder-&gt;i2c-&gt;name, encoder-&gt;enable));</div><div class='add'>+		v4l_dbg(1, debug, client, "enable output %d\n", encoder-&gt;enable);</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='del'>-	break;</div><div class='ctx'> </div><div class='ctx'> 	case 4711:</div><div class='ctx'> 	{</div><div class='ctx'> 		int *iarg = arg;</div><div class='ctx'> 		__u8 val;</div><div class='ctx'> </div><div class='del'>-		printk("bt866: square = %d\n", *iarg);</div><div class='add'>+		v4l_dbg(1, debug, client, "square %d\n", *iarg);</div><div class='ctx'> </div><div class='ctx'> 		val = encoder-&gt;reg[0xdc];</div><div class='ctx'> 		if (*iarg)</div><div class='ctx'> 			val |= 1; /* SQUARE */</div><div class='ctx'> 		else</div><div class='ctx'> 			val &amp;= ~1; /* !SQUARE */</div><div class='del'>-		bt866_write(encoder, 0xdc, val);</div><div class='add'>+		bt866_write(client, 0xdc, val);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -235,141 +238,49 @@ static int bt866_do_command(struct bt866 *encoder,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bt866_write(struct bt866 *encoder,</div><div class='del'>-			unsigned char subaddr, unsigned char data)</div><div class='del'>-{</div><div class='del'>-	unsigned char buffer[2];</div><div class='del'>-	int err;</div><div class='add'>+static unsigned short normal_i2c[] = { 0x88 &gt;&gt; 1, I2C_CLIENT_END };</div><div class='ctx'> </div><div class='del'>-	buffer[0] = subaddr;</div><div class='del'>-	buffer[1] = data;</div><div class='del'>-</div><div class='del'>-	encoder-&gt;reg[subaddr] = data;</div><div class='add'>+I2C_CLIENT_INSMOD;</div><div class='ctx'> </div><div class='del'>-	DEBUG(printk</div><div class='del'>-	      ("%s: write 0x%02X = 0x%02X\n",</div><div class='del'>-	       encoder-&gt;i2c-&gt;name, subaddr, data));</div><div class='del'>-</div><div class='del'>-	for (err = 0; err &lt; 3;) {</div><div class='del'>-		if (i2c_master_send(encoder-&gt;i2c, buffer, 2) == 2)</div><div class='del'>-			break;</div><div class='del'>-		err++;</div><div class='del'>-		printk(KERN_WARNING "%s: I/O error #%d "</div><div class='del'>-		       "(write 0x%02x/0x%02x)\n",</div><div class='del'>-		       encoder-&gt;i2c-&gt;name, err, encoder-&gt;addr, subaddr);</div><div class='del'>-		schedule_timeout_interruptible(msecs_to_jiffies(100));</div><div class='del'>-	}</div><div class='del'>-	if (err == 3) {</div><div class='del'>-		printk(KERN_WARNING "%s: giving up\n",</div><div class='del'>-		       encoder-&gt;i2c-&gt;name);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bt866_attach(struct i2c_adapter *adapter);</div><div class='del'>-static int bt866_detach(struct i2c_client *client);</div><div class='del'>-static int bt866_command(struct i2c_client *client,</div><div class='del'>-			 unsigned int cmd, void *arg);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Addresses to scan */</div><div class='del'>-static unsigned short normal_i2c[]	= {I2C_BT866&gt;&gt;1, I2C_CLIENT_END};</div><div class='del'>-static unsigned short probe[2]		= {I2C_CLIENT_END, I2C_CLIENT_END};</div><div class='del'>-static unsigned short ignore[2]		= {I2C_CLIENT_END, I2C_CLIENT_END};</div><div class='del'>-</div><div class='del'>-static struct i2c_client_address_data addr_data = {</div><div class='del'>-	normal_i2c,</div><div class='del'>-	probe,</div><div class='del'>-	ignore,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct i2c_driver i2c_driver_bt866 = {</div><div class='del'>-	.driver.name = BT866_DEVNAME,</div><div class='del'>-	.id = I2C_DRIVERID_BT866,</div><div class='del'>-	.attach_adapter = bt866_attach,</div><div class='del'>-	.detach_client = bt866_detach,</div><div class='del'>-	.command = bt866_command</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static struct i2c_client bt866_client_tmpl =</div><div class='del'>-{</div><div class='del'>-	.name = "(nil)",</div><div class='del'>-	.addr = 0,</div><div class='del'>-	.adapter = NULL,</div><div class='del'>-	.driver = &amp;i2c_driver_bt866,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int bt866_found_proc(struct i2c_adapter *adapter,</div><div class='del'>-			    int addr, int kind)</div><div class='add'>+static int bt866_probe(struct i2c_client *client,</div><div class='add'>+			const struct i2c_device_id *id)</div><div class='ctx'> {</div><div class='ctx'> 	struct bt866 *encoder;</div><div class='del'>-	struct i2c_client *client;</div><div class='ctx'> </div><div class='del'>-	client = kzalloc(sizeof(*client), GFP_KERNEL);</div><div class='del'>-	if (client == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	memcpy(client, &amp;bt866_client_tmpl, sizeof(*client));</div><div class='add'>+	v4l_info(client, "chip found @ 0x%x (%s)\n",</div><div class='add'>+			client-&gt;addr &lt;&lt; 1, client-&gt;adapter-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	encoder = kzalloc(sizeof(*encoder), GFP_KERNEL);</div><div class='del'>-	if (encoder == NULL) {</div><div class='del'>-		kfree(client);</div><div class='add'>+	if (encoder == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	i2c_set_clientdata(client, encoder);</div><div class='del'>-	client-&gt;adapter = adapter;</div><div class='del'>-	client-&gt;addr = addr;</div><div class='del'>-	sprintf(client-&gt;name, "%s-%02x", BT866_DEVNAME, adapter-&gt;id);</div><div class='del'>-</div><div class='del'>-	encoder-&gt;i2c = client;</div><div class='del'>-	encoder-&gt;addr = addr;</div><div class='del'>-	//encoder-&gt;encoder_type = ENCODER_TYPE_UNKNOWN;</div><div class='del'>-</div><div class='del'>-	/* initialize */</div><div class='del'>-</div><div class='del'>-	i2c_attach_client(client);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bt866_attach(struct i2c_adapter *adapter)</div><div class='del'>-{</div><div class='del'>-	if (adapter-&gt;id == I2C_HW_B_ZR36067)</div><div class='del'>-		return i2c_probe(adapter, &amp;addr_data, bt866_found_proc);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bt866_detach(struct i2c_client *client)</div><div class='del'>-{</div><div class='del'>-	struct bt866 *encoder = i2c_get_clientdata(client);</div><div class='del'>-</div><div class='del'>-	i2c_detach_client(client);</div><div class='del'>-	kfree(encoder);</div><div class='del'>-	kfree(client);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bt866_command(struct i2c_client *client,</div><div class='del'>-			 unsigned int cmd, void *arg)</div><div class='add'>+static int bt866_remove(struct i2c_client *client)</div><div class='ctx'> {</div><div class='del'>-	struct bt866 *encoder = i2c_get_clientdata(client);</div><div class='del'>-	return bt866_do_command(encoder, cmd, arg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __devinit bt866_init(void)</div><div class='del'>-{</div><div class='del'>-	i2c_add_driver(&amp;i2c_driver_bt866);</div><div class='add'>+	kfree(i2c_get_clientdata(client));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devexit bt866_exit(void)</div><div class='add'>+static int bt866_legacy_probe(struct i2c_adapter *adapter)</div><div class='ctx'> {</div><div class='del'>-	i2c_del_driver(&amp;i2c_driver_bt866);</div><div class='add'>+	return adapter-&gt;id == I2C_HW_B_ZR36067;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(bt866_init);</div><div class='del'>-module_exit(bt866_exit);</div><div class='add'>+static const struct i2c_device_id bt866_id[] = {</div><div class='add'>+	{ "bt866", 0 },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(i2c, bt866_id);</div><div class='add'>+</div><div class='add'>+static struct v4l2_i2c_driver_data v4l2_i2c_data = {</div><div class='add'>+	.name = "bt866",</div><div class='add'>+	.driverid = I2C_DRIVERID_BT866,</div><div class='add'>+	.command = bt866_command,</div><div class='add'>+	.probe = bt866_probe,</div><div class='add'>+	.remove = bt866_remove,</div><div class='add'>+	.legacy_probe = bt866_legacy_probe,</div><div class='add'>+	.id_table = bt866_id,</div><div class='add'>+};</div><div class='head'>diff --git a/drivers/media/video/bt8xx/bttv-cards.c b/drivers/media/video/bt8xx/bttv-cards.c<br/>index 6081edc362df..13742b0bbe3e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/bt8xx/bttv-cards.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/bt8xx/bttv-cards.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/bt8xx/bttv-cards.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/bt8xx/bttv-cards.c</a></div><div class='hunk'>@@ -305,7 +305,7 @@ static struct CARD {</div><div class='ctx'> 	{ 0x00261822, BTTV_BOARD_TWINHAN_DST,	"DNTV Live! Mini "},</div><div class='ctx'> 	{ 0xd200dbc0, BTTV_BOARD_DVICO_FUSIONHDTV_2,	"DViCO FusionHDTV 2" },</div><div class='ctx'> 	{ 0x763c008a, BTTV_BOARD_GEOVISION_GV600,	"GeoVision GV-600" },</div><div class='del'>-</div><div class='add'>+	{ 0x18011000, BTTV_BOARD_ENLTV_FM_2,	"Encore ENL TV-FM-2" },</div><div class='ctx'> 	{ 0, -1, NULL }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -3037,6 +3037,31 @@ struct tvcard bttv_tvcards[] = {</div><div class='ctx'> 		.has_radio      = 1,</div><div class='ctx'> 		.has_remote     = 1,</div><div class='ctx'> 	},</div><div class='add'>+	[BTTV_BOARD_ENLTV_FM_2] = {</div><div class='add'>+		/* Encore TV Tuner Pro ENL TV-FM-2</div><div class='add'>+		   Mauro Carvalho Chehab &lt;mchehab@infradead.org */</div><div class='add'>+		.name           = "Encore ENL TV-FM-2",</div><div class='add'>+		.video_inputs   = 3,</div><div class='add'>+		.audio_inputs   = 1,</div><div class='add'>+		.tuner          = 0,</div><div class='add'>+		.svhs           = 2,</div><div class='add'>+		/* bit 6          -&gt; IR disabled</div><div class='add'>+		   bit 18/17 = 00 -&gt; mute</div><div class='add'>+			       01 -&gt; enable external audio input</div><div class='add'>+			       10 -&gt; internal audio input (mono?)</div><div class='add'>+			       11 -&gt; internal audio input</div><div class='add'>+		 */</div><div class='add'>+		.gpiomask       = 0x060040,</div><div class='add'>+		.muxsel         = { 2, 3, 3 },</div><div class='add'>+		.gpiomux        = { 0x60000, 0x60000, 0x20000, 0x20000 },</div><div class='add'>+		.gpiomute 	= 0,</div><div class='add'>+		.tuner_type	= TUNER_TCL_MF02GIP_5N,</div><div class='add'>+		.tuner_addr     = ADDR_UNSET,</div><div class='add'>+		.radio_addr     = ADDR_UNSET,</div><div class='add'>+		.pll            = PLL_28,</div><div class='add'>+		.has_radio      = 1,</div><div class='add'>+		.has_remote     = 1,</div><div class='add'>+	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const unsigned int bttv_num_tvcards = ARRAY_SIZE(bttv_tvcards);</div><div class='head'>diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c<br/>index 933eaef41ead..5858bf5ff41c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/bt8xx/bttv-driver.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/bt8xx/bttv-driver.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/bt8xx/bttv-driver.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/bt8xx/bttv-driver.c</a></div><div class='hunk'>@@ -76,9 +76,9 @@ static unsigned int gbuffers = 8;</div><div class='ctx'> static unsigned int gbufsize = 0x208000;</div><div class='ctx'> static unsigned int reset_crop = 1;</div><div class='ctx'> </div><div class='del'>-static int video_nr = -1;</div><div class='del'>-static int radio_nr = -1;</div><div class='del'>-static int vbi_nr = -1;</div><div class='add'>+static int video_nr[BTTV_MAX] = { [0 ... (BTTV_MAX-1)] = -1 };</div><div class='add'>+static int radio_nr[BTTV_MAX] = { [0 ... (BTTV_MAX-1)] = -1 };</div><div class='add'>+static int vbi_nr[BTTV_MAX] = { [0 ... (BTTV_MAX-1)] = -1 };</div><div class='ctx'> static int debug_latency;</div><div class='ctx'> </div><div class='ctx'> static unsigned int fdsr;</div><div class='hunk'>@@ -108,9 +108,6 @@ module_param(irq_debug,         int, 0644);</div><div class='ctx'> module_param(debug_latency,     int, 0644);</div><div class='ctx'> </div><div class='ctx'> module_param(fdsr,              int, 0444);</div><div class='del'>-module_param(video_nr,          int, 0444);</div><div class='del'>-module_param(radio_nr,          int, 0444);</div><div class='del'>-module_param(vbi_nr,            int, 0444);</div><div class='ctx'> module_param(gbuffers,          int, 0444);</div><div class='ctx'> module_param(gbufsize,          int, 0444);</div><div class='ctx'> module_param(reset_crop,        int, 0444);</div><div class='hunk'>@@ -130,7 +127,10 @@ module_param(uv_ratio,          int, 0444);</div><div class='ctx'> module_param(full_luma_range,   int, 0444);</div><div class='ctx'> module_param(coring,            int, 0444);</div><div class='ctx'> </div><div class='del'>-module_param_array(radio, int, NULL, 0444);</div><div class='add'>+module_param_array(radio,       int, NULL, 0444);</div><div class='add'>+module_param_array(video_nr,    int, NULL, 0444);</div><div class='add'>+module_param_array(radio_nr,    int, NULL, 0444);</div><div class='add'>+module_param_array(vbi_nr,      int, NULL, 0444);</div><div class='ctx'> </div><div class='ctx'> MODULE_PARM_DESC(radio,"The TV card supports radio, default is 0 (no)");</div><div class='ctx'> MODULE_PARM_DESC(bigendian,"byte order of the framebuffer, default is native endian");</div><div class='hunk'>@@ -152,6 +152,9 @@ MODULE_PARM_DESC(irq_iswitch,"switch inputs in irq handler");</div><div class='ctx'> MODULE_PARM_DESC(uv_ratio,"ratio between u and v gains, default is 50");</div><div class='ctx'> MODULE_PARM_DESC(full_luma_range,"use the full luma range, default is 0 (no)");</div><div class='ctx'> MODULE_PARM_DESC(coring,"set the luma coring level, default is 0 (no)");</div><div class='add'>+MODULE_PARM_DESC(video_nr, "video device numbers");</div><div class='add'>+MODULE_PARM_DESC(vbi_nr, "vbi device numbers");</div><div class='add'>+MODULE_PARM_DESC(radio_nr, "radio device numbers");</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("bttv - v4l/v4l2 driver module for bt848/878 based cards");</div><div class='ctx'> MODULE_AUTHOR("Ralph Metzler &amp; Marcus Metzler &amp; Gerd Knorr");</div><div class='hunk'>@@ -1367,7 +1370,7 @@ static void init_irqreg(struct bttv *btv)</div><div class='ctx'> 			(btv-&gt;gpioirq ? BT848_INT_GPINT : 0) |</div><div class='ctx'> 			BT848_INT_SCERR |</div><div class='ctx'> 			(fdsr ? BT848_INT_FDSR : 0) |</div><div class='del'>-			BT848_INT_RISCI|BT848_INT_OCERR|BT848_INT_VPRES|</div><div class='add'>+			BT848_INT_RISCI | BT848_INT_OCERR |</div><div class='ctx'> 			BT848_INT_FMTCHG|BT848_INT_HLOCK|</div><div class='ctx'> 			BT848_INT_I2CDONE,</div><div class='ctx'> 			BT848_INT_MASK);</div><div class='hunk'>@@ -2661,18 +2664,6 @@ static int bttv_querycap(struct file *file, void  *priv,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bttv_enum_fmt_vbi_cap(struct file *file, void  *priv,</div><div class='del'>-				struct v4l2_fmtdesc *f)</div><div class='del'>-{</div><div class='del'>-	if (0 != f-&gt;index)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	f-&gt;pixelformat = V4L2_PIX_FMT_GREY;</div><div class='del'>-	strcpy(f-&gt;description, "vbi data");</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int bttv_enum_fmt_cap_ovr(struct v4l2_fmtdesc *f)</div><div class='ctx'> {</div><div class='ctx'> 	int index = -1, i;</div><div class='hunk'>@@ -3227,6 +3218,7 @@ static int bttv_open(struct inode *inode, struct file *file)</div><div class='ctx'> </div><div class='ctx'> 	dprintk(KERN_DEBUG "bttv: open minor=%d\n",minor);</div><div class='ctx'> </div><div class='add'>+	lock_kernel();</div><div class='ctx'> 	for (i = 0; i &lt; bttv_num; i++) {</div><div class='ctx'> 		if (bttvs[i].video_dev &amp;&amp;</div><div class='ctx'> 		    bttvs[i].video_dev-&gt;minor == minor) {</div><div class='hunk'>@@ -3241,16 +3233,20 @@ static int bttv_open(struct inode *inode, struct file *file)</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	if (NULL == btv)</div><div class='add'>+	if (NULL == btv) {</div><div class='add'>+		unlock_kernel();</div><div class='ctx'> 		return -ENODEV;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	dprintk(KERN_DEBUG "bttv%d: open called (type=%s)\n",</div><div class='ctx'> 		btv-&gt;c.nr,v4l2_type_names[type]);</div><div class='ctx'> </div><div class='ctx'> 	/* allocate per filehandle data */</div><div class='ctx'> 	fh = kmalloc(sizeof(*fh),GFP_KERNEL);</div><div class='del'>-	if (NULL == fh)</div><div class='add'>+	if (NULL == fh) {</div><div class='add'>+		unlock_kernel();</div><div class='ctx'> 		return -ENOMEM;</div><div class='add'>+	}</div><div class='ctx'> 	file-&gt;private_data = fh;</div><div class='ctx'> 	*fh = btv-&gt;init;</div><div class='ctx'> 	fh-&gt;type = type;</div><div class='hunk'>@@ -3270,6 +3266,7 @@ static int bttv_open(struct inode *inode, struct file *file)</div><div class='ctx'> 			    sizeof(struct bttv_buffer),</div><div class='ctx'> 			    fh);</div><div class='ctx'> 	set_tvnorm(btv,btv-&gt;tvnorm);</div><div class='add'>+	set_input(btv, btv-&gt;input, btv-&gt;tvnorm);</div><div class='ctx'> </div><div class='ctx'> 	btv-&gt;users++;</div><div class='ctx'> </div><div class='hunk'>@@ -3290,6 +3287,7 @@ static int bttv_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	bttv_vbi_fmt_reset(&amp;fh-&gt;vbi_fmt, btv-&gt;tvnorm);</div><div class='ctx'> </div><div class='ctx'> 	bttv_field_count(btv);</div><div class='add'>+	unlock_kernel();</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3330,6 +3328,10 @@ static int bttv_release(struct inode *inode, struct file *file)</div><div class='ctx'> </div><div class='ctx'> 	btv-&gt;users--;</div><div class='ctx'> 	bttv_field_count(btv);</div><div class='add'>+</div><div class='add'>+	if (!btv-&gt;users)</div><div class='add'>+		audio_mute(btv, 1);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3367,7 +3369,6 @@ static const struct v4l2_ioctl_ops bttv_ioctl_ops = {</div><div class='ctx'> 	.vidioc_g_fmt_vid_overlay       = bttv_g_fmt_vid_overlay,</div><div class='ctx'> 	.vidioc_try_fmt_vid_overlay     = bttv_try_fmt_vid_overlay,</div><div class='ctx'> 	.vidioc_s_fmt_vid_overlay       = bttv_s_fmt_vid_overlay,</div><div class='del'>-	.vidioc_enum_fmt_vbi_cap        = bttv_enum_fmt_vbi_cap,</div><div class='ctx'> 	.vidioc_g_fmt_vbi_cap           = bttv_g_fmt_vbi_cap,</div><div class='ctx'> 	.vidioc_try_fmt_vbi_cap         = bttv_try_fmt_vbi_cap,</div><div class='ctx'> 	.vidioc_s_fmt_vbi_cap           = bttv_s_fmt_vbi_cap,</div><div class='hunk'>@@ -3430,21 +3431,26 @@ static int radio_open(struct inode *inode, struct file *file)</div><div class='ctx'> </div><div class='ctx'> 	dprintk("bttv: open minor=%d\n",minor);</div><div class='ctx'> </div><div class='add'>+	lock_kernel();</div><div class='ctx'> 	for (i = 0; i &lt; bttv_num; i++) {</div><div class='ctx'> 		if (bttvs[i].radio_dev &amp;&amp; bttvs[i].radio_dev-&gt;minor == minor) {</div><div class='ctx'> 			btv = &amp;bttvs[i];</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	if (NULL == btv)</div><div class='add'>+	if (NULL == btv) {</div><div class='add'>+		unlock_kernel();</div><div class='ctx'> 		return -ENODEV;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	dprintk("bttv%d: open called (radio)\n",btv-&gt;c.nr);</div><div class='ctx'> </div><div class='ctx'> 	/* allocate per filehandle data */</div><div class='ctx'> 	fh = kmalloc(sizeof(*fh), GFP_KERNEL);</div><div class='del'>-	if (NULL == fh)</div><div class='add'>+	if (NULL == fh) {</div><div class='add'>+		unlock_kernel();</div><div class='ctx'> 		return -ENOMEM;</div><div class='add'>+	}</div><div class='ctx'> 	file-&gt;private_data = fh;</div><div class='ctx'> 	*fh = btv-&gt;init;</div><div class='ctx'> 	v4l2_prio_open(&amp;btv-&gt;prio, &amp;fh-&gt;prio);</div><div class='hunk'>@@ -3457,6 +3463,7 @@ static int radio_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	audio_input(btv,TVAUDIO_INPUT_RADIO);</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;btv-&gt;lock);</div><div class='add'>+	unlock_kernel();</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4235,7 +4242,8 @@ static int __devinit bttv_register_video(struct bttv *btv)</div><div class='ctx'> </div><div class='ctx'> 	if (NULL == btv-&gt;video_dev)</div><div class='ctx'> 		goto err;</div><div class='del'>-	if (video_register_device(btv-&gt;video_dev,VFL_TYPE_GRABBER,video_nr)&lt;0)</div><div class='add'>+	if (video_register_device(btv-&gt;video_dev, VFL_TYPE_GRABBER,</div><div class='add'>+				  video_nr[btv-&gt;c.nr]) &lt; 0)</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	printk(KERN_INFO "bttv%d: registered device video%d\n",</div><div class='ctx'> 	       btv-&gt;c.nr,btv-&gt;video_dev-&gt;minor &amp; 0x1f);</div><div class='hunk'>@@ -4251,7 +4259,8 @@ static int __devinit bttv_register_video(struct bttv *btv)</div><div class='ctx'> </div><div class='ctx'> 	if (NULL == btv-&gt;vbi_dev)</div><div class='ctx'> 		goto err;</div><div class='del'>-	if (video_register_device(btv-&gt;vbi_dev,VFL_TYPE_VBI,vbi_nr)&lt;0)</div><div class='add'>+	if (video_register_device(btv-&gt;vbi_dev, VFL_TYPE_VBI,</div><div class='add'>+				  vbi_nr[btv-&gt;c.nr]) &lt; 0)</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	printk(KERN_INFO "bttv%d: registered device vbi%d\n",</div><div class='ctx'> 	       btv-&gt;c.nr,btv-&gt;vbi_dev-&gt;minor &amp; 0x1f);</div><div class='hunk'>@@ -4262,7 +4271,8 @@ static int __devinit bttv_register_video(struct bttv *btv)</div><div class='ctx'> 	btv-&gt;radio_dev = vdev_init(btv, &amp;radio_template, "radio");</div><div class='ctx'> 	if (NULL == btv-&gt;radio_dev)</div><div class='ctx'> 		goto err;</div><div class='del'>-	if (video_register_device(btv-&gt;radio_dev, VFL_TYPE_RADIO,radio_nr)&lt;0)</div><div class='add'>+	if (video_register_device(btv-&gt;radio_dev, VFL_TYPE_RADIO,</div><div class='add'>+				  radio_nr[btv-&gt;c.nr]) &lt; 0)</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	printk(KERN_INFO "bttv%d: registered device radio%d\n",</div><div class='ctx'> 	       btv-&gt;c.nr,btv-&gt;radio_dev-&gt;minor &amp; 0x1f);</div><div class='head'>diff --git a/drivers/media/video/bt8xx/bttv-input.c b/drivers/media/video/bt8xx/bttv-input.c<br/>index a38af98f4cae..2f289d981fe6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/bt8xx/bttv-input.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/bt8xx/bttv-input.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/bt8xx/bttv-input.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/bt8xx/bttv-input.c</a></div><div class='hunk'>@@ -28,8 +28,8 @@</div><div class='ctx'> #include "bttvp.h"</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int debug;</div><div class='del'>-module_param(debug, int, 0644);    /* debug level (0,1,2) */</div><div class='add'>+static int ir_debug;</div><div class='add'>+module_param(ir_debug, int, 0644);</div><div class='ctx'> static int repeat_delay = 500;</div><div class='ctx'> module_param(repeat_delay, int, 0644);</div><div class='ctx'> static int repeat_period = 33;</div><div class='hunk'>@@ -40,6 +40,12 @@ module_param(ir_rc5_remote_gap, int, 0644);</div><div class='ctx'> static int ir_rc5_key_timeout = 200;</div><div class='ctx'> module_param(ir_rc5_key_timeout, int, 0644);</div><div class='ctx'> </div><div class='add'>+#undef dprintk</div><div class='add'>+#define dprintk(arg...) do {	\</div><div class='add'>+	if (ir_debug &gt;= 1)	\</div><div class='add'>+		printk(arg);	\</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='ctx'> #define DEVNAME "bttv-input"</div><div class='ctx'> </div><div class='ctx'> /* ---------------------------------------------------------------------- */</div><div class='hunk'>@@ -79,6 +85,45 @@ static void ir_handle_key(struct bttv *btv)</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void ir_enltv_handle_key(struct bttv *btv)</div><div class='add'>+{</div><div class='add'>+	struct card_ir *ir = btv-&gt;remote;</div><div class='add'>+	u32 gpio, data, keyup;</div><div class='add'>+</div><div class='add'>+	/* read gpio value */</div><div class='add'>+	gpio = bttv_gpio_read(&amp;btv-&gt;c);</div><div class='add'>+</div><div class='add'>+	/* extract data */</div><div class='add'>+	data = ir_extract_bits(gpio, ir-&gt;mask_keycode);</div><div class='add'>+</div><div class='add'>+	/* Check if it is keyup */</div><div class='add'>+	keyup = (gpio &amp; ir-&gt;mask_keyup) ? 1 &lt;&lt; 31 : 0;</div><div class='add'>+</div><div class='add'>+	if ((ir-&gt;last_gpio &amp; 0x7f) != data) {</div><div class='add'>+		dprintk(KERN_INFO DEVNAME ": gpio=0x%x code=%d | %s\n",</div><div class='add'>+			gpio, data,</div><div class='add'>+			(gpio &amp; ir-&gt;mask_keyup) ? " up" : "up/down");</div><div class='add'>+</div><div class='add'>+		ir_input_keydown(ir-&gt;dev, &amp;ir-&gt;ir, data, data);</div><div class='add'>+		if (keyup)</div><div class='add'>+			ir_input_nokey(ir-&gt;dev, &amp;ir-&gt;ir);</div><div class='add'>+	} else {</div><div class='add'>+		if ((ir-&gt;last_gpio &amp; 1 &lt;&lt; 31) == keyup)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		dprintk(KERN_INFO DEVNAME ":(cnt) gpio=0x%x code=%d | %s\n",</div><div class='add'>+			gpio, data,</div><div class='add'>+			(gpio &amp; ir-&gt;mask_keyup) ? " up" : "down");</div><div class='add'>+</div><div class='add'>+		if (keyup)</div><div class='add'>+			ir_input_nokey(ir-&gt;dev, &amp;ir-&gt;ir);</div><div class='add'>+		else</div><div class='add'>+			ir_input_keydown(ir-&gt;dev, &amp;ir-&gt;ir, data, data);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ir-&gt;last_gpio = data | keyup;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void bttv_input_irq(struct bttv *btv)</div><div class='ctx'> {</div><div class='ctx'> 	struct card_ir *ir = btv-&gt;remote;</div><div class='hunk'>@@ -92,7 +137,10 @@ static void bttv_input_timer(unsigned long data)</div><div class='ctx'> 	struct bttv *btv = (struct bttv*)data;</div><div class='ctx'> 	struct card_ir *ir = btv-&gt;remote;</div><div class='ctx'> </div><div class='del'>-	ir_handle_key(btv);</div><div class='add'>+	if (btv-&gt;c.type == BTTV_BOARD_ENLTV_FM_2)</div><div class='add'>+		ir_enltv_handle_key(btv);</div><div class='add'>+	else</div><div class='add'>+		ir_handle_key(btv);</div><div class='ctx'> 	mod_timer(&amp;ir-&gt;timer, jiffies + msecs_to_jiffies(ir-&gt;polling));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -284,6 +332,14 @@ int bttv_input_init(struct bttv *btv)</div><div class='ctx'> 		ir-&gt;mask_keyup   = 0x006000;</div><div class='ctx'> 		ir-&gt;polling      = 50; /* ms */</div><div class='ctx'> 		break;</div><div class='add'>+	case BTTV_BOARD_ENLTV_FM_2:</div><div class='add'>+		ir_codes         = ir_codes_encore_enltv2;</div><div class='add'>+		ir-&gt;mask_keycode = 0x00fd00;</div><div class='add'>+		ir-&gt;mask_keyup   = 0x000080;</div><div class='add'>+		ir-&gt;polling      = 1; /* ms */</div><div class='add'>+		ir-&gt;last_gpio    = ir_extract_bits(bttv_gpio_read(&amp;btv-&gt;c),</div><div class='add'>+						   ir-&gt;mask_keycode);</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (NULL == ir_codes) {</div><div class='ctx'> 		dprintk(KERN_INFO "Ooops: IR config error [card=%d]\n", btv-&gt;c.type);</div><div class='head'>diff --git a/drivers/media/video/bt8xx/bttv.h b/drivers/media/video/bt8xx/bttv.h<br/>index 6d93d16c96e4..46cb90e0985b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/bt8xx/bttv.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/bt8xx/bttv.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/bt8xx/bttv.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/bt8xx/bttv.h</a></div><div class='hunk'>@@ -176,7 +176,7 @@</div><div class='ctx'> #define BTTV_BOARD_TYPHOON_TVTUNERPCI	   0x95</div><div class='ctx'> #define BTTV_BOARD_GEOVISION_GV600	   0x96</div><div class='ctx'> #define BTTV_BOARD_KOZUMI_KTV_01C          0x97</div><div class='del'>-</div><div class='add'>+#define BTTV_BOARD_ENLTV_FM_2		   0x98</div><div class='ctx'> </div><div class='ctx'> /* more card-specific defines */</div><div class='ctx'> #define PT2254_L_CHANNEL 0x10</div><div class='head'>diff --git a/drivers/media/video/btcx-risc.c b/drivers/media/video/btcx-risc.c<br/>index 3324ab38f58c..ac1b2687a20d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/btcx-risc.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/btcx-risc.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/btcx-risc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/btcx-risc.c</a></div><div class='hunk'>@@ -64,7 +64,7 @@ int btcx_riscmem_alloc(struct pci_dev *pci,</div><div class='ctx'> 		       unsigned int size)</div><div class='ctx'> {</div><div class='ctx'> 	__le32 *cpu;</div><div class='del'>-	dma_addr_t dma;</div><div class='add'>+	dma_addr_t dma = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (NULL != risc-&gt;cpu &amp;&amp; risc-&gt;size &lt; size)</div><div class='ctx'> 		btcx_riscmem_free(pci,risc);</div><div class='head'>diff --git a/drivers/media/video/bw-qcam.c b/drivers/media/video/bw-qcam.c<br/>index 6e39e253ce53..ace4ff9ea023 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/bw-qcam.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/bw-qcam.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/bw-qcam.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/bw-qcam.c</a></div><div class='hunk'>@@ -495,7 +495,7 @@ static void qc_set(struct qcam_device *q)</div><div class='ctx'> 		val2 = (((q-&gt;port_mode &amp; QC_MODE_MASK) == QC_BIDIR) ? 24 : 8) *</div><div class='ctx'> 		    q-&gt;transfer_scale;</div><div class='ctx'> 	}</div><div class='del'>-	val = (val + val2 - 1) / val2;</div><div class='add'>+	val = DIV_ROUND_UP(val, val2);</div><div class='ctx'> 	qc_command(q, 0x13);</div><div class='ctx'> 	qc_command(q, val);</div><div class='ctx'> </div><div class='hunk'>@@ -651,7 +651,7 @@ static long qc_capture(struct qcam_device * q, char __user *buf, unsigned long l</div><div class='ctx'> 	transperline = q-&gt;width * q-&gt;bpp;</div><div class='ctx'> 	divisor = (((q-&gt;port_mode &amp; QC_MODE_MASK) == QC_BIDIR) ? 24 : 8) *</div><div class='ctx'> 	    q-&gt;transfer_scale;</div><div class='del'>-	transperline = (transperline + divisor - 1) / divisor;</div><div class='add'>+	transperline = DIV_ROUND_UP(transperline, divisor);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0, yield = yieldlines; i &lt; linestotrans; i++)</div><div class='ctx'> 	{</div><div class='hunk'>@@ -894,10 +894,27 @@ static ssize_t qcam_read(struct file *file, char __user *buf,</div><div class='ctx'> 	return len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int qcam_exclusive_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct video_device *dev = video_devdata(file);</div><div class='add'>+	struct qcam_device *qcam = (struct qcam_device *)dev;</div><div class='add'>+</div><div class='add'>+	return test_and_set_bit(0, &amp;qcam-&gt;in_use) ? -EBUSY : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qcam_exclusive_release(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct video_device *dev = video_devdata(file);</div><div class='add'>+	struct qcam_device *qcam = (struct qcam_device *)dev;</div><div class='add'>+</div><div class='add'>+	clear_bit(0, &amp;qcam-&gt;in_use);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct file_operations qcam_fops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='del'>-	.open           = video_exclusive_open,</div><div class='del'>-	.release        = video_exclusive_release,</div><div class='add'>+	.open           = qcam_exclusive_open,</div><div class='add'>+	.release        = qcam_exclusive_release,</div><div class='ctx'> 	.ioctl          = qcam_ioctl,</div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='ctx'> 	.compat_ioctl	= v4l_compat_ioctl32,</div><div class='hunk'>@@ -909,6 +926,7 @@ static struct video_device qcam_template=</div><div class='ctx'> {</div><div class='ctx'> 	.name		= "Connectix Quickcam",</div><div class='ctx'> 	.fops           = &amp;qcam_fops,</div><div class='add'>+	.release 	= video_device_release_empty,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define MAX_CAMS 4</div><div class='head'>diff --git a/drivers/media/video/bw-qcam.h b/drivers/media/video/bw-qcam.h<br/>index 6701dafbc0da..8a60c5de0935 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/bw-qcam.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/bw-qcam.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/bw-qcam.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/bw-qcam.h</a></div><div class='hunk'>@@ -65,4 +65,5 @@ struct qcam_device {</div><div class='ctx'> 	int top, left;</div><div class='ctx'> 	int status;</div><div class='ctx'> 	unsigned int saved_bits;</div><div class='add'>+	unsigned long in_use;</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/media/video/c-qcam.c b/drivers/media/video/c-qcam.c<br/>index 7f6c6b4bec10..17aa0adb3467 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/c-qcam.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/c-qcam.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/c-qcam.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/c-qcam.c</a></div><div class='hunk'>@@ -51,6 +51,7 @@ struct qcam_device {</div><div class='ctx'> 	int contrast, brightness, whitebal;</div><div class='ctx'> 	int top, left;</div><div class='ctx'> 	unsigned int bidirectional;</div><div class='add'>+	unsigned long in_use;</div><div class='ctx'> 	struct mutex lock;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -687,11 +688,28 @@ static ssize_t qcam_read(struct file *file, char __user *buf,</div><div class='ctx'> 	return len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int qcam_exclusive_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct video_device *dev = video_devdata(file);</div><div class='add'>+	struct qcam_device *qcam = (struct qcam_device *)dev;</div><div class='add'>+</div><div class='add'>+	return test_and_set_bit(0, &amp;qcam-&gt;in_use) ? -EBUSY : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qcam_exclusive_release(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct video_device *dev = video_devdata(file);</div><div class='add'>+	struct qcam_device *qcam = (struct qcam_device *)dev;</div><div class='add'>+</div><div class='add'>+	clear_bit(0, &amp;qcam-&gt;in_use);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* video device template */</div><div class='ctx'> static const struct file_operations qcam_fops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='del'>-	.open           = video_exclusive_open,</div><div class='del'>-	.release        = video_exclusive_release,</div><div class='add'>+	.open           = qcam_exclusive_open,</div><div class='add'>+	.release        = qcam_exclusive_release,</div><div class='ctx'> 	.ioctl          = qcam_ioctl,</div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='ctx'> 	.compat_ioctl	= v4l_compat_ioctl32,</div><div class='hunk'>@@ -704,6 +722,7 @@ static struct video_device qcam_template=</div><div class='ctx'> {</div><div class='ctx'> 	.name		= "Colour QuickCam",</div><div class='ctx'> 	.fops           = &amp;qcam_fops,</div><div class='add'>+	.release 	= video_device_release_empty,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Initialize the QuickCam driver control structure. */</div><div class='head'>diff --git a/drivers/media/video/cafe_ccic.c b/drivers/media/video/cafe_ccic.c<br/>index 5405c30dbb04..fc9497bdd322 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cafe_ccic.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/cafe_ccic.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cafe_ccic.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cafe_ccic.c</a></div><div class='hunk'>@@ -1476,9 +1476,12 @@ static int cafe_v4l_open(struct inode *inode, struct file *filp)</div><div class='ctx'> {</div><div class='ctx'> 	struct cafe_camera *cam;</div><div class='ctx'> </div><div class='add'>+	lock_kernel();</div><div class='ctx'> 	cam = cafe_find_dev(iminor(inode));</div><div class='del'>-	if (cam == NULL)</div><div class='add'>+	if (cam == NULL) {</div><div class='add'>+		unlock_kernel();</div><div class='ctx'> 		return -ENODEV;</div><div class='add'>+	}</div><div class='ctx'> 	filp-&gt;private_data = cam;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;cam-&gt;s_mutex);</div><div class='hunk'>@@ -1490,6 +1493,7 @@ static int cafe_v4l_open(struct inode *inode, struct file *filp)</div><div class='ctx'> 	}</div><div class='ctx'> 	(cam-&gt;users)++;</div><div class='ctx'> 	mutex_unlock(&amp;cam-&gt;s_mutex);</div><div class='add'>+	unlock_kernel();</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2092,15 +2096,8 @@ static int cafe_pci_probe(struct pci_dev *pdev,</div><div class='ctx'> 		const struct pci_device_id *id)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	u16 classword;</div><div class='ctx'> 	struct cafe_camera *cam;</div><div class='del'>-	/*</div><div class='del'>-	 * Make sure we have a camera here - we'll get calls for</div><div class='del'>-	 * the other cafe devices as well.</div><div class='del'>-	 */</div><div class='del'>-	pci_read_config_word(pdev, PCI_CLASS_DEVICE, &amp;classword);</div><div class='del'>-	if (classword != PCI_CLASS_MULTIMEDIA_VIDEO)</div><div class='del'>-		return -ENODEV;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Start putting together one of our big camera structures.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -2288,8 +2285,8 @@ static int cafe_pci_resume(struct pci_dev *pdev)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static struct pci_device_id cafe_ids[] = {</div><div class='del'>-	{ PCI_DEVICE(0x11ab, 0x4100) }, /* Eventual real ID */</div><div class='del'>-	{ PCI_DEVICE(0x11ab, 0x4102) }, /* Really eventual real ID */</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL,</div><div class='add'>+		     PCI_DEVICE_ID_MARVELL_88ALP01_CCIC) },</div><div class='ctx'> 	{ 0, }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/cpia.c b/drivers/media/video/cpia.c<br/>index a661800b0e69..1798b779a25a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cpia.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/cpia.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cpia.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cpia.c</a></div><div class='hunk'>@@ -39,10 +39,6 @@</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_KMOD</div><div class='del'>-#include &lt;linux/kmod.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #include "cpia.h"</div><div class='ctx'> </div><div class='ctx'> static int video_nr = -1;</div><div class='hunk'>@@ -3155,7 +3151,7 @@ static void put_cam(struct cpia_camera_ops* ops)</div><div class='ctx'> static int cpia_open(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='ctx'> 	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct cam_data *cam = dev-&gt;priv;</div><div class='add'>+	struct cam_data *cam = video_get_drvdata(dev);</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (!cam) {</div><div class='hunk'>@@ -3202,7 +3198,7 @@ static int cpia_open(struct inode *inode, struct file *file)</div><div class='ctx'> </div><div class='ctx'> 	/* Set ownership of /proc/cpia/videoX to current user */</div><div class='ctx'> 	if(cam-&gt;proc_entry)</div><div class='del'>-		cam-&gt;proc_entry-&gt;uid = current-&gt;uid;</div><div class='add'>+		cam-&gt;proc_entry-&gt;uid = current_uid();</div><div class='ctx'> </div><div class='ctx'> 	/* set mark for loading first frame uncompressed */</div><div class='ctx'> 	cam-&gt;first_frame = 1;</div><div class='hunk'>@@ -3232,7 +3228,7 @@ static int cpia_open(struct inode *inode, struct file *file)</div><div class='ctx'> static int cpia_close(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='ctx'> 	struct  video_device *dev = file-&gt;private_data;</div><div class='del'>-	struct cam_data *cam = dev-&gt;priv;</div><div class='add'>+	struct cam_data *cam = video_get_drvdata(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (cam-&gt;ops) {</div><div class='ctx'> 		/* Return ownership of /proc/cpia/videoX to root */</div><div class='hunk'>@@ -3284,7 +3280,7 @@ static ssize_t cpia_read(struct file *file, char __user *buf,</div><div class='ctx'> 			 size_t count, loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	struct video_device *dev = file-&gt;private_data;</div><div class='del'>-	struct cam_data *cam = dev-&gt;priv;</div><div class='add'>+	struct cam_data *cam = video_get_drvdata(dev);</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	/* make this _really_ smp and multithread-safe */</div><div class='hunk'>@@ -3341,7 +3337,7 @@ static int cpia_do_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 			 unsigned int ioctlnr, void *arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct video_device *dev = file-&gt;private_data;</div><div class='del'>-	struct cam_data *cam = dev-&gt;priv;</div><div class='add'>+	struct cam_data *cam = video_get_drvdata(dev);</div><div class='ctx'> 	int retval = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!cam || !cam-&gt;ops)</div><div class='hunk'>@@ -3739,7 +3735,7 @@ static int cpia_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='ctx'> 	unsigned long start = vma-&gt;vm_start;</div><div class='ctx'> 	unsigned long size  = vma-&gt;vm_end - vma-&gt;vm_start;</div><div class='ctx'> 	unsigned long page, pos;</div><div class='del'>-	struct cam_data *cam = dev-&gt;priv;</div><div class='add'>+	struct cam_data *cam = video_get_drvdata(dev);</div><div class='ctx'> 	int retval;</div><div class='ctx'> </div><div class='ctx'> 	if (!cam || !cam-&gt;ops)</div><div class='hunk'>@@ -3801,6 +3797,7 @@ static const struct file_operations cpia_fops = {</div><div class='ctx'> static struct video_device cpia_template = {</div><div class='ctx'> 	.name		= "CPiA Camera",</div><div class='ctx'> 	.fops           = &amp;cpia_fops,</div><div class='add'>+	.release 	= video_device_release_empty,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* initialise cam_data structure  */</div><div class='hunk'>@@ -3928,7 +3925,7 @@ static void init_camera_struct(struct cam_data *cam,</div><div class='ctx'> 	cam-&gt;proc_entry = NULL;</div><div class='ctx'> </div><div class='ctx'> 	memcpy(&amp;cam-&gt;vdev, &amp;cpia_template, sizeof(cpia_template));</div><div class='del'>-	cam-&gt;vdev.priv = cam;</div><div class='add'>+	video_set_drvdata(&amp;cam-&gt;vdev, cam);</div><div class='ctx'> </div><div class='ctx'> 	cam-&gt;curframe = 0;</div><div class='ctx'> 	for (i = 0; i &lt; FRAME_NUM; i++) {</div><div class='head'>diff --git a/drivers/media/video/cpia2/cpia2_core.c b/drivers/media/video/cpia2/cpia2_core.c<br/>index af8b9ec8e358..7e791b6923f9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cpia2/cpia2_core.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/cpia2/cpia2_core.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cpia2/cpia2_core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cpia2/cpia2_core.c</a></div><div class='hunk'>@@ -1537,7 +1537,7 @@ static int config_sensor_500(struct camera_data *cam,</div><div class='ctx'>  *</div><div class='ctx'>  *  This sets all user changeable properties to the values in cam-&gt;params.</div><div class='ctx'>  *****************************************************************************/</div><div class='del'>-int set_all_properties(struct camera_data *cam)</div><div class='add'>+static int set_all_properties(struct camera_data *cam)</div><div class='ctx'> {</div><div class='ctx'> 	/**</div><div class='ctx'> 	 * Don't set target_kb here, it will be set later.</div><div class='hunk'>@@ -1588,7 +1588,7 @@ void cpia2_save_camera_state(struct camera_data *cam)</div><div class='ctx'>  *  get_color_params</div><div class='ctx'>  *</div><div class='ctx'>  *****************************************************************************/</div><div class='del'>-void get_color_params(struct camera_data *cam)</div><div class='add'>+static void get_color_params(struct camera_data *cam)</div><div class='ctx'> {</div><div class='ctx'> 	cpia2_do_command(cam, CPIA2_CMD_GET_VP_BRIGHTNESS, TRANSFER_READ, 0);</div><div class='ctx'> 	cpia2_do_command(cam, CPIA2_CMD_GET_VP_SATURATION, TRANSFER_READ, 0);</div><div class='hunk'>@@ -1881,7 +1881,7 @@ void cpia2_set_saturation(struct camera_data *cam, unsigned char value)</div><div class='ctx'>  *  wake_system</div><div class='ctx'>  *</div><div class='ctx'>  *****************************************************************************/</div><div class='del'>-void wake_system(struct camera_data *cam)</div><div class='add'>+static void wake_system(struct camera_data *cam)</div><div class='ctx'> {</div><div class='ctx'> 	cpia2_do_command(cam, CPIA2_CMD_SET_WAKEUP, TRANSFER_WRITE, 0);</div><div class='ctx'> }</div><div class='hunk'>@@ -1892,7 +1892,7 @@ void wake_system(struct camera_data *cam)</div><div class='ctx'>  *</div><div class='ctx'>  *  Valid for STV500 sensor only</div><div class='ctx'>  *****************************************************************************/</div><div class='del'>-void set_lowlight_boost(struct camera_data *cam)</div><div class='add'>+static void set_lowlight_boost(struct camera_data *cam)</div><div class='ctx'> {</div><div class='ctx'> 	struct cpia2_command cmd;</div><div class='ctx'> </div><div class='hunk'>@@ -2169,7 +2169,7 @@ void cpia2_dbg_dump_registers(struct camera_data *cam)</div><div class='ctx'>  *</div><div class='ctx'>  *  Sets all values to the defaults</div><div class='ctx'>  *****************************************************************************/</div><div class='del'>-void reset_camera_struct(struct camera_data *cam)</div><div class='add'>+static void reset_camera_struct(struct camera_data *cam)</div><div class='ctx'> {</div><div class='ctx'> 	/***</div><div class='ctx'> 	 * The following parameter values are the defaults from the register map.</div><div class='head'>diff --git a/drivers/media/video/cpia2/cpia2_usb.c b/drivers/media/video/cpia2/cpia2_usb.c<br/>index a8a199047cbd..73511a542077 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cpia2/cpia2_usb.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/cpia2/cpia2_usb.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cpia2/cpia2_usb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cpia2/cpia2_usb.c</a></div><div class='hunk'>@@ -478,7 +478,7 @@ int cpia2_usb_change_streaming_alternate(struct camera_data *cam,</div><div class='ctx'>  * set_alternate</div><div class='ctx'>  *</div><div class='ctx'>  *****************************************************************************/</div><div class='del'>-int set_alternate(struct camera_data *cam, unsigned int alt)</div><div class='add'>+static int set_alternate(struct camera_data *cam, unsigned int alt)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/cpia2/cpia2_v4l.c b/drivers/media/video/cpia2/cpia2_v4l.c<br/>index eb9f15cd4c45..897e8d1a5c3c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cpia2/cpia2_v4l.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/cpia2/cpia2_v4l.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cpia2/cpia2_v4l.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cpia2/cpia2_v4l.c</a></div><div class='hunk'>@@ -241,8 +241,7 @@ static struct v4l2_queryctrl controls[] = {</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> static int cpia2_open(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct camera_data *cam = video_get_drvdata(dev);</div><div class='add'>+	struct camera_data *cam = video_drvdata(file);</div><div class='ctx'> 	int retval = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!cam) {</div><div class='hunk'>@@ -357,8 +356,7 @@ static int cpia2_close(struct inode *inode, struct file *file)</div><div class='ctx'> static ssize_t cpia2_v4l_read(struct file *file, char __user *buf, size_t count,</div><div class='ctx'> 			      loff_t *off)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct camera_data *cam = video_get_drvdata(dev);</div><div class='add'>+	struct camera_data *cam = video_drvdata(file);</div><div class='ctx'> 	int noblock = file-&gt;f_flags&amp;O_NONBLOCK;</div><div class='ctx'> </div><div class='ctx'> 	struct cpia2_fh *fh = file-&gt;private_data;</div><div class='hunk'>@@ -382,9 +380,7 @@ static ssize_t cpia2_v4l_read(struct file *file, char __user *buf, size_t count,</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> static unsigned int cpia2_v4l_poll(struct file *filp, struct poll_table_struct *wait)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(filp);</div><div class='del'>-	struct camera_data *cam = video_get_drvdata(dev);</div><div class='del'>-</div><div class='add'>+	struct camera_data *cam = video_drvdata(filp);</div><div class='ctx'> 	struct cpia2_fh *fh = filp-&gt;private_data;</div><div class='ctx'> </div><div class='ctx'> 	if(!cam)</div><div class='hunk'>@@ -1579,8 +1575,7 @@ static int ioctl_dqbuf(void *arg,struct camera_data *cam, struct file *file)</div><div class='ctx'> static int cpia2_do_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 			  unsigned int ioctl_nr, void *arg)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct camera_data *cam = video_get_drvdata(dev);</div><div class='add'>+	struct camera_data *cam = video_drvdata(file);</div><div class='ctx'> 	int retval = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!cam)</div><div class='hunk'>@@ -1860,9 +1855,8 @@ static int cpia2_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> static int cpia2_mmap(struct file *file, struct vm_area_struct *area)</div><div class='ctx'> {</div><div class='add'>+	struct camera_data *cam = video_drvdata(file);</div><div class='ctx'> 	int retval;</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct camera_data *cam = video_get_drvdata(dev);</div><div class='ctx'> </div><div class='ctx'> 	/* Priority check */</div><div class='ctx'> 	struct cpia2_fh *fh = file-&gt;private_data;</div><div class='head'>diff --git a/drivers/media/video/cx18/Makefile b/drivers/media/video/cx18/Makefile<br/>index b23d2e26120f..f7bf0edf93f9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx18/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/cx18/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx18/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx18/Makefile</a></div><div class='hunk'>@@ -2,7 +2,7 @@ cx18-objs    := cx18-driver.o cx18-cards.o cx18-i2c.o cx18-firmware.o cx18-gpio.</div><div class='ctx'> 	cx18-queue.o cx18-streams.o cx18-fileops.o cx18-ioctl.o cx18-controls.o \</div><div class='ctx'> 	cx18-mailbox.o cx18-vbi.o cx18-audio.o cx18-video.o cx18-irq.o \</div><div class='ctx'> 	cx18-av-core.o cx18-av-audio.o cx18-av-firmware.o cx18-av-vbi.o cx18-scb.o \</div><div class='del'>-	cx18-dvb.o</div><div class='add'>+	cx18-dvb.o cx18-io.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_VIDEO_CX18) += cx18.o</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/cx18/cx18-audio.c b/drivers/media/video/cx18/cx18-audio.c<br/>index 6d5b94fc7087..57beddf0af4d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx18/cx18-audio.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/cx18/cx18-audio.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx18/cx18-audio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx18/cx18-audio.c</a></div><div class='hunk'>@@ -22,6 +22,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "cx18-driver.h"</div><div class='add'>+#include "cx18-io.h"</div><div class='ctx'> #include "cx18-i2c.h"</div><div class='ctx'> #include "cx18-cards.h"</div><div class='ctx'> #include "cx18-audio.h"</div><div class='hunk'>@@ -60,10 +61,10 @@ int cx18_audio_set_io(struct cx18 *cx)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	val = read_reg(CX18_AUDIO_ENABLE) &amp; ~0x30;</div><div class='add'>+	val = cx18_read_reg(cx, CX18_AUDIO_ENABLE) &amp; ~0x30;</div><div class='ctx'> 	val |= (audio_input &gt; CX18_AV_AUDIO_SERIAL2) ? 0x20 :</div><div class='ctx'> 					(audio_input &lt;&lt; 4);</div><div class='del'>-	write_reg(val | 0xb00, CX18_AUDIO_ENABLE);</div><div class='add'>+	cx18_write_reg(cx, val | 0xb00, CX18_AUDIO_ENABLE);</div><div class='ctx'> 	cx18_vapi(cx, CX18_APU_RESETAI, 1, 0);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/media/video/cx18/cx18-av-core.c b/drivers/media/video/cx18/cx18-av-core.c<br/>index 3b0a2c450605..73f5141a42d1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx18/cx18-av-core.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/cx18/cx18-av-core.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx18/cx18-av-core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx18/cx18-av-core.c</a></div><div class='hunk'>@@ -22,27 +22,35 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "cx18-driver.h"</div><div class='add'>+#include "cx18-io.h"</div><div class='ctx'> </div><div class='ctx'> int cx18_av_write(struct cx18 *cx, u16 addr, u8 value)</div><div class='ctx'> {</div><div class='del'>-	u32 x = readl(cx-&gt;reg_mem + 0xc40000 + (addr &amp; ~3));</div><div class='add'>+	u32 reg = 0xc40000 + (addr &amp; ~3);</div><div class='ctx'> 	u32 mask = 0xff;</div><div class='ctx'> 	int shift = (addr &amp; 3) * 8;</div><div class='add'>+	u32 x = cx18_read_reg(cx, reg);</div><div class='ctx'> </div><div class='ctx'> 	x = (x &amp; ~(mask &lt;&lt; shift)) | ((u32)value &lt;&lt; shift);</div><div class='del'>-	writel(x, cx-&gt;reg_mem + 0xc40000 + (addr &amp; ~3));</div><div class='add'>+	cx18_write_reg(cx, x, reg);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int cx18_av_write4(struct cx18 *cx, u16 addr, u32 value)</div><div class='ctx'> {</div><div class='del'>-	writel(value, cx-&gt;reg_mem + 0xc40000 + addr);</div><div class='add'>+	cx18_write_reg(cx, value, 0xc40000 + addr);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int cx18_av_write4_noretry(struct cx18 *cx, u16 addr, u32 value)</div><div class='add'>+{</div><div class='add'>+	cx18_write_reg_noretry(cx, value, 0xc40000 + addr);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> u8 cx18_av_read(struct cx18 *cx, u16 addr)</div><div class='ctx'> {</div><div class='del'>-	u32 x = readl(cx-&gt;reg_mem + 0xc40000 + (addr &amp; ~3));</div><div class='add'>+	u32 x = cx18_read_reg(cx, 0xc40000 + (addr &amp; ~3));</div><div class='ctx'> 	int shift = (addr &amp; 3) * 8;</div><div class='ctx'> </div><div class='ctx'> 	return (x &gt;&gt; shift) &amp; 0xff;</div><div class='hunk'>@@ -50,7 +58,12 @@ u8 cx18_av_read(struct cx18 *cx, u16 addr)</div><div class='ctx'> </div><div class='ctx'> u32 cx18_av_read4(struct cx18 *cx, u16 addr)</div><div class='ctx'> {</div><div class='del'>-	return readl(cx-&gt;reg_mem + 0xc40000 + addr);</div><div class='add'>+	return cx18_read_reg(cx, 0xc40000 + addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 cx18_av_read4_noretry(struct cx18 *cx, u16 addr)</div><div class='add'>+{</div><div class='add'>+	return cx18_read_reg_noretry(cx, 0xc40000 + addr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int cx18_av_and_or(struct cx18 *cx, u16 addr, unsigned and_mask,</div><div class='head'>diff --git a/drivers/media/video/cx18/cx18-av-core.h b/drivers/media/video/cx18/cx18-av-core.h<br/>index eb61fa1e0965..b67d8df20cc6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx18/cx18-av-core.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/cx18/cx18-av-core.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx18/cx18-av-core.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx18/cx18-av-core.h</a></div><div class='hunk'>@@ -301,8 +301,10 @@ struct cx18_av_state {</div><div class='ctx'> /* cx18_av-core.c 							   */</div><div class='ctx'> int cx18_av_write(struct cx18 *cx, u16 addr, u8 value);</div><div class='ctx'> int cx18_av_write4(struct cx18 *cx, u16 addr, u32 value);</div><div class='add'>+int cx18_av_write4_noretry(struct cx18 *cx, u16 addr, u32 value);</div><div class='ctx'> u8 cx18_av_read(struct cx18 *cx, u16 addr);</div><div class='ctx'> u32 cx18_av_read4(struct cx18 *cx, u16 addr);</div><div class='add'>+u32 cx18_av_read4_noretry(struct cx18 *cx, u16 addr);</div><div class='ctx'> int cx18_av_and_or(struct cx18 *cx, u16 addr, unsigned mask, u8 value);</div><div class='ctx'> int cx18_av_and_or4(struct cx18 *cx, u16 addr, u32 mask, u32 value);</div><div class='ctx'> int cx18_av_cmd(struct cx18 *cx, unsigned int cmd, void *arg);</div><div class='head'>diff --git a/drivers/media/video/cx18/cx18-av-firmware.c b/drivers/media/video/cx18/cx18-av-firmware.c<br/>index e996a4e3123a..522a035b2e8f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx18/cx18-av-firmware.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/cx18/cx18-av-firmware.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx18/cx18-av-firmware.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx18/cx18-av-firmware.c</a></div><div class='hunk'>@@ -20,6 +20,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "cx18-driver.h"</div><div class='add'>+#include "cx18-io.h"</div><div class='ctx'> #include &lt;linux/firmware.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define CX18_AUDIO_ENABLE 0xc72014</div><div class='hunk'>@@ -49,7 +50,7 @@ int cx18_av_loadfw(struct cx18 *cx)</div><div class='ctx'> 		cx18_av_write4(cx, 0x8100, 0x00010000);</div><div class='ctx'> </div><div class='ctx'> 		/* Put the 8051 in reset and enable firmware upload */</div><div class='del'>-		cx18_av_write4(cx, CXADEC_DL_CTL, 0x0F000000);</div><div class='add'>+		cx18_av_write4_noretry(cx, CXADEC_DL_CTL, 0x0F000000);</div><div class='ctx'> </div><div class='ctx'> 		ptr = fw-&gt;data;</div><div class='ctx'> 		size = fw-&gt;size;</div><div class='hunk'>@@ -58,22 +59,28 @@ int cx18_av_loadfw(struct cx18 *cx)</div><div class='ctx'> 			u32 dl_control = 0x0F000000 | i | ((u32)ptr[i] &lt;&lt; 16);</div><div class='ctx'> 			u32 value = 0;</div><div class='ctx'> 			int retries2;</div><div class='add'>+			int unrec_err = 0;</div><div class='ctx'> </div><div class='del'>-			for (retries2 = 0; retries2 &lt; 5; retries2++) {</div><div class='del'>-				cx18_av_write4(cx, CXADEC_DL_CTL, dl_control);</div><div class='add'>+			for (retries2 = 0; retries2 &lt; CX18_MAX_MMIO_RETRIES;</div><div class='add'>+			     retries2++) {</div><div class='add'>+				cx18_av_write4_noretry(cx, CXADEC_DL_CTL,</div><div class='add'>+						       dl_control);</div><div class='ctx'> 				udelay(10);</div><div class='del'>-				value = cx18_av_read4(cx, CXADEC_DL_CTL);</div><div class='add'>+				value = cx18_av_read4_noretry(cx,</div><div class='add'>+							      CXADEC_DL_CTL);</div><div class='ctx'> 				if (value == dl_control)</div><div class='ctx'> 					break;</div><div class='ctx'> 				/* Check if we can correct the byte by changing</div><div class='ctx'> 				   the address.  We can only write the lower</div><div class='ctx'> 				   address byte of the address. */</div><div class='ctx'> 				if ((value &amp; 0x3F00) != (dl_control &amp; 0x3F00)) {</div><div class='del'>-					retries2 = 5;</div><div class='add'>+					unrec_err = 1;</div><div class='ctx'> 					break;</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='del'>-			if (retries2 &gt;= 5)</div><div class='add'>+			cx18_log_write_retries(cx, retries2,</div><div class='add'>+					cx-&gt;reg_mem + 0xc40000 + CXADEC_DL_CTL);</div><div class='add'>+			if (unrec_err || retries2 &gt;= CX18_MAX_MMIO_RETRIES)</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (i == size)</div><div class='hunk'>@@ -119,10 +126,10 @@ int cx18_av_loadfw(struct cx18 *cx)</div><div class='ctx'> 	   have a name in the spec. */</div><div class='ctx'> 	cx18_av_write4(cx, 0x09CC, 1);</div><div class='ctx'> </div><div class='del'>-	v = read_reg(CX18_AUDIO_ENABLE);</div><div class='del'>-	/* If bit 11 is 1 */</div><div class='add'>+	v = cx18_read_reg(cx, CX18_AUDIO_ENABLE);</div><div class='add'>+	/* If bit 11 is 1, clear bit 10 */</div><div class='ctx'> 	if (v &amp; 0x800)</div><div class='del'>-		write_reg(v &amp; 0xFFFFFBFF, CX18_AUDIO_ENABLE); /* Clear bit 10 */</div><div class='add'>+		cx18_write_reg(cx, v &amp; 0xFFFFFBFF, CX18_AUDIO_ENABLE);</div><div class='ctx'> </div><div class='ctx'> 	/* Enable WW auto audio standard detection */</div><div class='ctx'> 	v = cx18_av_read4(cx, CXADEC_STD_DET_CTL);</div><div class='head'>diff --git a/drivers/media/video/cx18/cx18-cards.c b/drivers/media/video/cx18/cx18-cards.c<br/>index 3cb9734ec07b..5efe01ebe9db 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx18/cx18-cards.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/cx18/cx18-cards.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx18/cx18-cards.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx18/cx18-cards.c</a></div><div class='hunk'>@@ -292,12 +292,111 @@ static const struct cx18_card cx18_card_cnxt_raptor_pal = {</div><div class='ctx'> </div><div class='ctx'> /* ------------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='add'>+/* Toshiba Qosmio laptop internal DVB-T/Analog Hybrid Tuner */</div><div class='add'>+</div><div class='add'>+static const struct cx18_card_pci_info cx18_pci_toshiba_qosmio_dvbt[] = {</div><div class='add'>+	{ PCI_DEVICE_ID_CX23418, CX18_PCI_ID_TOSHIBA, 0x0110 },</div><div class='add'>+	{ 0, 0, 0 }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct cx18_card cx18_card_toshiba_qosmio_dvbt = {</div><div class='add'>+	.type = CX18_CARD_TOSHIBA_QOSMIO_DVBT,</div><div class='add'>+	.name = "Toshiba Qosmio DVB-T/Analog",</div><div class='add'>+	.comment = "Experimenters and photos needed for device to work well.\n"</div><div class='add'>+		  "\tTo help, mail the ivtv-devel list (www.ivtvdriver.org).\n",</div><div class='add'>+	.v4l2_capabilities = CX18_CAP_ENCODER,</div><div class='add'>+	.hw_audio_ctrl = CX18_HW_CX23418,</div><div class='add'>+	.hw_all = CX18_HW_TUNER,</div><div class='add'>+	.video_inputs = {</div><div class='add'>+		{ CX18_CARD_INPUT_VID_TUNER,  0, CX18_AV_COMPOSITE6 },</div><div class='add'>+		{ CX18_CARD_INPUT_SVIDEO1,    1,</div><div class='add'>+			CX18_AV_SVIDEO_LUMA3 | CX18_AV_SVIDEO_CHROMA4 },</div><div class='add'>+		{ CX18_CARD_INPUT_COMPOSITE1, 1, CX18_AV_COMPOSITE1 },</div><div class='add'>+	},</div><div class='add'>+	.audio_inputs = {</div><div class='add'>+		{ CX18_CARD_INPUT_AUD_TUNER, CX18_AV_AUDIO5, 	    0 },</div><div class='add'>+		{ CX18_CARD_INPUT_LINE_IN1,  CX18_AV_AUDIO_SERIAL1, 1 },</div><div class='add'>+	},</div><div class='add'>+	.tuners = {</div><div class='add'>+		{ .std = V4L2_STD_ALL, .tuner = TUNER_XC2028 },</div><div class='add'>+	},</div><div class='add'>+	.ddr = {</div><div class='add'>+		.chip_config = 0x202,</div><div class='add'>+		.refresh = 0x3bb,</div><div class='add'>+		.timing1 = 0x33320a63,</div><div class='add'>+		.timing2 = 0x0a,</div><div class='add'>+		.tune_lane = 0,</div><div class='add'>+		.initial_emrs = 0x42,</div><div class='add'>+	},</div><div class='add'>+	.xceive_pin = 15,</div><div class='add'>+	.pci_list = cx18_pci_toshiba_qosmio_dvbt,</div><div class='add'>+	.i2c = &amp;cx18_i2c_std,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* ------------------------------------------------------------------------- */</div><div class='add'>+</div><div class='add'>+/* Leadtek WinFast PVR2100 */</div><div class='add'>+</div><div class='add'>+static const struct cx18_card_pci_info cx18_pci_leadtek_pvr2100[] = {</div><div class='add'>+	{ PCI_DEVICE_ID_CX23418, CX18_PCI_ID_LEADTEK, 0x6f27 },</div><div class='add'>+	{ 0, 0, 0 }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct cx18_card cx18_card_leadtek_pvr2100 = {</div><div class='add'>+	.type = CX18_CARD_LEADTEK_PVR2100,</div><div class='add'>+	.name = "Leadtek WinFast PVR2100",</div><div class='add'>+	.comment = "Experimenters and photos needed for device to work well.\n"</div><div class='add'>+		  "\tTo help, mail the ivtv-devel list (www.ivtvdriver.org).\n",</div><div class='add'>+	.v4l2_capabilities = CX18_CAP_ENCODER,</div><div class='add'>+	.hw_audio_ctrl = CX18_HW_CX23418,</div><div class='add'>+	.hw_muxer = CX18_HW_GPIO,</div><div class='add'>+	.hw_all = CX18_HW_TUNER | CX18_HW_GPIO,</div><div class='add'>+	.video_inputs = {</div><div class='add'>+		{ CX18_CARD_INPUT_VID_TUNER,  0, CX18_AV_COMPOSITE2 },</div><div class='add'>+		{ CX18_CARD_INPUT_SVIDEO1,    1,</div><div class='add'>+			CX18_AV_SVIDEO_LUMA3 | CX18_AV_SVIDEO_CHROMA4 },</div><div class='add'>+		{ CX18_CARD_INPUT_COMPOSITE1, 1, CX18_AV_COMPOSITE7 },</div><div class='add'>+	},</div><div class='add'>+	.audio_inputs = {</div><div class='add'>+		{ CX18_CARD_INPUT_AUD_TUNER, CX18_AV_AUDIO5, 	    0 },</div><div class='add'>+		{ CX18_CARD_INPUT_LINE_IN1,  CX18_AV_AUDIO_SERIAL1, 1 },</div><div class='add'>+	},</div><div class='add'>+	.tuners = {</div><div class='add'>+		/* XC3028 tuner */</div><div class='add'>+		{ .std = V4L2_STD_ALL, .tuner = TUNER_XC2028 },</div><div class='add'>+	},</div><div class='add'>+	.radio_input = { CX18_CARD_INPUT_AUD_TUNER, CX18_AV_AUDIO5, 2 },</div><div class='add'>+	.ddr = {</div><div class='add'>+		/*</div><div class='add'>+		 * Pointer to proper DDR config values provided by</div><div class='add'>+		 * Terry Wu &lt;terrywu at leadtek.com.tw&gt;</div><div class='add'>+		 */</div><div class='add'>+		.chip_config = 0x303,</div><div class='add'>+		.refresh = 0x3bb,</div><div class='add'>+		.timing1 = 0x24220e83,</div><div class='add'>+		.timing2 = 0x1f,</div><div class='add'>+		.tune_lane = 0,</div><div class='add'>+		.initial_emrs = 0x2,</div><div class='add'>+	},</div><div class='add'>+	.gpio_init.initial_value = 0x6,</div><div class='add'>+	.gpio_init.direction = 0x7,</div><div class='add'>+	.gpio_audio_input = { .mask   = 0x7,</div><div class='add'>+			      .tuner  = 0x6, .linein = 0x2, .radio  = 0x2 },</div><div class='add'>+	.xceive_pin = 15,</div><div class='add'>+	.pci_list = cx18_pci_leadtek_pvr2100,</div><div class='add'>+	.i2c = &amp;cx18_i2c_std,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* ------------------------------------------------------------------------- */</div><div class='add'>+</div><div class='ctx'> static const struct cx18_card *cx18_card_list[] = {</div><div class='ctx'> 	&amp;cx18_card_hvr1600_esmt,</div><div class='ctx'> 	&amp;cx18_card_hvr1600_samsung,</div><div class='ctx'> 	&amp;cx18_card_h900,</div><div class='ctx'> 	&amp;cx18_card_mpc718,</div><div class='ctx'> 	&amp;cx18_card_cnxt_raptor_pal,</div><div class='add'>+	&amp;cx18_card_toshiba_qosmio_dvbt,</div><div class='add'>+	&amp;cx18_card_leadtek_pvr2100,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> const struct cx18_card *cx18_get_card(u16 index)</div><div class='head'>diff --git a/drivers/media/video/cx18/cx18-driver.c b/drivers/media/video/cx18/cx18-driver.c<br/>index bd18afebbf86..085121c2b47f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx18/cx18-driver.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/cx18/cx18-driver.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx18/cx18-driver.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx18/cx18-driver.c</a></div><div class='hunk'>@@ -4,6 +4,7 @@</div><div class='ctx'>  *  Derived from ivtv-driver.c</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2007  Hans Verkuil &lt;hverkuil@xs4all.nl&gt;</div><div class='add'>+ *  Copyright (C) 2008  Andy Walls &lt;awalls@radix.net&gt;</div><div class='ctx'>  *</div><div class='ctx'>  *  This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  *  it under the terms of the GNU General Public License as published by</div><div class='hunk'>@@ -22,6 +23,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "cx18-driver.h"</div><div class='add'>+#include "cx18-io.h"</div><div class='ctx'> #include "cx18-version.h"</div><div class='ctx'> #include "cx18-cards.h"</div><div class='ctx'> #include "cx18-i2c.h"</div><div class='hunk'>@@ -73,10 +75,14 @@ static int radio[CX18_MAX_CARDS] = { -1, -1, -1, -1, -1, -1, -1, -1,</div><div class='ctx'> 				     -1, -1, -1, -1, -1, -1, -1, -1,</div><div class='ctx'> 				     -1, -1, -1, -1, -1, -1, -1, -1,</div><div class='ctx'> 				     -1, -1, -1, -1, -1, -1, -1, -1 };</div><div class='del'>-</div><div class='add'>+static int mmio_ndelay[CX18_MAX_CARDS] = { -1, -1, -1, -1, -1, -1, -1, -1,</div><div class='add'>+					   -1, -1, -1, -1, -1, -1, -1, -1,</div><div class='add'>+					   -1, -1, -1, -1, -1, -1, -1, -1,</div><div class='add'>+					   -1, -1, -1, -1, -1, -1, -1, -1 };</div><div class='ctx'> static unsigned cardtype_c = 1;</div><div class='ctx'> static unsigned tuner_c = 1;</div><div class='ctx'> static unsigned radio_c = 1;</div><div class='add'>+static unsigned mmio_ndelay_c = 1;</div><div class='ctx'> static char pal[] = "--";</div><div class='ctx'> static char secam[] = "--";</div><div class='ctx'> static char ntsc[] = "-";</div><div class='hunk'>@@ -90,15 +96,18 @@ static int enc_pcm_buffers = CX18_DEFAULT_ENC_PCM_BUFFERS;</div><div class='ctx'> </div><div class='ctx'> static int cx18_pci_latency = 1;</div><div class='ctx'> </div><div class='add'>+int cx18_retry_mmio = 1;</div><div class='ctx'> int cx18_debug;</div><div class='ctx'> </div><div class='ctx'> module_param_array(tuner, int, &amp;tuner_c, 0644);</div><div class='ctx'> module_param_array(radio, bool, &amp;radio_c, 0644);</div><div class='ctx'> module_param_array(cardtype, int, &amp;cardtype_c, 0644);</div><div class='add'>+module_param_array(mmio_ndelay, int, &amp;mmio_ndelay_c, 0644);</div><div class='ctx'> module_param_string(pal, pal, sizeof(pal), 0644);</div><div class='ctx'> module_param_string(secam, secam, sizeof(secam), 0644);</div><div class='ctx'> module_param_string(ntsc, ntsc, sizeof(ntsc), 0644);</div><div class='ctx'> module_param_named(debug, cx18_debug, int, 0644);</div><div class='add'>+module_param_named(retry_mmio, cx18_retry_mmio, int, 0644);</div><div class='ctx'> module_param(cx18_pci_latency, int, 0644);</div><div class='ctx'> module_param(cx18_first_minor, int, 0644);</div><div class='ctx'> </div><div class='hunk'>@@ -121,6 +130,8 @@ MODULE_PARM_DESC(cardtype,</div><div class='ctx'> 		 "\t\t\t 3 = Compro VideoMate H900\n"</div><div class='ctx'> 		 "\t\t\t 4 = Yuan MPC718\n"</div><div class='ctx'> 		 "\t\t\t 5 = Conexant Raptor PAL/SECAM\n"</div><div class='add'>+		 "\t\t\t 6 = Toshiba Qosmio DVB-T/Analog\n"</div><div class='add'>+		 "\t\t\t 7 = Leadtek WinFast PVR2100\n"</div><div class='ctx'> 		 "\t\t\t 0 = Autodetect (default)\n"</div><div class='ctx'> 		 "\t\t\t-1 = Ignore this card\n\t\t");</div><div class='ctx'> MODULE_PARM_DESC(pal, "Set PAL standard: B, G, H, D, K, I, M, N, Nc, 60");</div><div class='hunk'>@@ -140,6 +151,14 @@ MODULE_PARM_DESC(debug,</div><div class='ctx'> MODULE_PARM_DESC(cx18_pci_latency,</div><div class='ctx'> 		 "Change the PCI latency to 64 if lower: 0 = No, 1 = Yes,\n"</div><div class='ctx'> 		 "\t\t\tDefault: Yes");</div><div class='add'>+MODULE_PARM_DESC(retry_mmio,</div><div class='add'>+		 "Check and retry memory mapped IO accesses\n"</div><div class='add'>+		 "\t\t\tDefault: 1 [Yes]");</div><div class='add'>+MODULE_PARM_DESC(mmio_ndelay,</div><div class='add'>+		 "Delay (ns) for each CX23418 memory mapped IO access.\n"</div><div class='add'>+		 "\t\t\tTry larger values that are close to a multiple of the\n"</div><div class='add'>+		 "\t\t\tPCI clock period, 30.3 ns, if your card doesn't work.\n"</div><div class='add'>+		 "\t\t\tDefault: " __stringify(CX18_DEFAULT_MMIO_NDELAY));</div><div class='ctx'> MODULE_PARM_DESC(enc_mpg_buffers,</div><div class='ctx'> 		 "Encoder MPG Buffers (in MB)\n"</div><div class='ctx'> 		 "\t\t\tDefault: " __stringify(CX18_DEFAULT_ENC_MPG_BUFFERS));</div><div class='hunk'>@@ -156,7 +175,7 @@ MODULE_PARM_DESC(enc_pcm_buffers,</div><div class='ctx'> 		 "Encoder PCM buffers (in MB)\n"</div><div class='ctx'> 		 "\t\t\tDefault: " __stringify(CX18_DEFAULT_ENC_PCM_BUFFERS));</div><div class='ctx'> </div><div class='del'>-MODULE_PARM_DESC(cx18_first_minor, "Set minor assigned to first card");</div><div class='add'>+MODULE_PARM_DESC(cx18_first_minor, "Set kernel number assigned to first card");</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Hans Verkuil");</div><div class='ctx'> MODULE_DESCRIPTION("CX23418 driver");</div><div class='hunk'>@@ -356,6 +375,11 @@ static void cx18_process_options(struct cx18 *cx)</div><div class='ctx'> 	cx-&gt;options.tuner = tuner[cx-&gt;num];</div><div class='ctx'> 	cx-&gt;options.radio = radio[cx-&gt;num];</div><div class='ctx'> </div><div class='add'>+	if (mmio_ndelay[cx-&gt;num] &lt; 0)</div><div class='add'>+		cx-&gt;options.mmio_ndelay = CX18_DEFAULT_MMIO_NDELAY;</div><div class='add'>+	else</div><div class='add'>+		cx-&gt;options.mmio_ndelay = mmio_ndelay[cx-&gt;num];</div><div class='add'>+</div><div class='ctx'> 	cx-&gt;std = cx18_parse_std(cx);</div><div class='ctx'> 	if (cx-&gt;options.cardtype == -1) {</div><div class='ctx'> 		CX18_INFO("Ignore card\n");</div><div class='hunk'>@@ -395,9 +419,9 @@ done:</div><div class='ctx'> </div><div class='ctx'> 	if (cx-&gt;card == NULL) {</div><div class='ctx'> 		cx-&gt;card = cx18_get_card(CX18_CARD_HVR_1600_ESMT);</div><div class='del'>-		CX18_ERR("Unknown card: vendor/device: %04x/%04x\n",</div><div class='add'>+		CX18_ERR("Unknown card: vendor/device: [%04x:%04x]\n",</div><div class='ctx'> 		     cx-&gt;dev-&gt;vendor, cx-&gt;dev-&gt;device);</div><div class='del'>-		CX18_ERR("              subsystem vendor/device: %04x/%04x\n",</div><div class='add'>+		CX18_ERR("              subsystem vendor/device: [%04x:%04x]\n",</div><div class='ctx'> 		     cx-&gt;dev-&gt;subsystem_vendor, cx-&gt;dev-&gt;subsystem_device);</div><div class='ctx'> 		CX18_ERR("Defaulting to %s card\n", cx-&gt;card-&gt;name);</div><div class='ctx'> 		CX18_ERR("Please mail the vendor/device and subsystem vendor/device IDs and what kind of\n");</div><div class='hunk'>@@ -511,9 +535,9 @@ static int cx18_setup_pci(struct cx18 *cx, struct pci_dev *dev,</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Check for bus mastering */</div><div class='add'>+	/* Enable bus mastering and memory mapped IO for the CX23418 */</div><div class='ctx'> 	pci_read_config_word(dev, PCI_COMMAND, &amp;cmd);</div><div class='del'>-	cmd |= PCI_COMMAND_IO | PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER;</div><div class='add'>+	cmd |= PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER;</div><div class='ctx'> 	pci_write_config_word(dev, PCI_COMMAND, cmd);</div><div class='ctx'> </div><div class='ctx'> 	pci_read_config_byte(dev, PCI_CLASS_REVISION, &amp;cx-&gt;card_rev);</div><div class='hunk'>@@ -525,11 +549,6 @@ static int cx18_setup_pci(struct cx18 *cx, struct pci_dev *dev,</div><div class='ctx'> 		pci_write_config_byte(dev, PCI_LATENCY_TIMER, 64);</div><div class='ctx'> 		pci_read_config_byte(dev, PCI_LATENCY_TIMER, &amp;pci_latency);</div><div class='ctx'> 	}</div><div class='del'>-	/* This config space value relates to DMA latencies. The</div><div class='del'>-	   default value 0x8080 is too low however and will lead</div><div class='del'>-	   to DMA errors. 0xffff is the max value which solves</div><div class='del'>-	   these problems. */</div><div class='del'>-	pci_write_config_dword(dev, 0x40, 0xffff);</div><div class='ctx'> </div><div class='ctx'> 	CX18_DEBUG_INFO("cx%d (rev %d) at %02x:%02x.%x, "</div><div class='ctx'> 		   "irq: %d, latency: %d, memory: 0x%lx\n",</div><div class='hunk'>@@ -656,7 +675,7 @@ static int __devinit cx18_probe(struct pci_dev *dev,</div><div class='ctx'> 		goto free_mem;</div><div class='ctx'> 	}</div><div class='ctx'> 	cx-&gt;reg_mem = cx-&gt;enc_mem + CX18_REG_OFFSET;</div><div class='del'>-	devtype = read_reg(0xC72028);</div><div class='add'>+	devtype = cx18_read_reg(cx, 0xC72028);</div><div class='ctx'> 	switch (devtype &amp; 0xff000000) {</div><div class='ctx'> 	case 0xff000000:</div><div class='ctx'> 		CX18_INFO("cx23418 revision %08x (A)\n", devtype);</div><div class='hunk'>@@ -815,6 +834,7 @@ err:</div><div class='ctx'> 	if (retval == 0)</div><div class='ctx'> 		retval = -ENODEV;</div><div class='ctx'> 	CX18_ERR("Error %d on initialization\n", retval);</div><div class='add'>+	cx18_log_statistics(cx);</div><div class='ctx'> </div><div class='ctx'> 	kfree(cx18_cards[cx18_cards_active]);</div><div class='ctx'> 	cx18_cards[cx18_cards_active] = NULL;</div><div class='hunk'>@@ -902,8 +922,8 @@ static void cx18_remove(struct pci_dev *pci_dev)</div><div class='ctx'> 		cx18_stop_all_captures(cx);</div><div class='ctx'> </div><div class='ctx'> 	/* Interrupts */</div><div class='del'>-	sw1_irq_disable(IRQ_CPU_TO_EPU | IRQ_APU_TO_EPU);</div><div class='del'>-	sw2_irq_disable(IRQ_CPU_TO_EPU_ACK | IRQ_APU_TO_EPU_ACK);</div><div class='add'>+	cx18_sw1_irq_disable(cx, IRQ_CPU_TO_EPU | IRQ_APU_TO_EPU);</div><div class='add'>+	cx18_sw2_irq_disable(cx, IRQ_CPU_TO_EPU_ACK | IRQ_APU_TO_EPU_ACK);</div><div class='ctx'> </div><div class='ctx'> 	cx18_halt_firmware(cx);</div><div class='ctx'> </div><div class='hunk'>@@ -919,6 +939,7 @@ static void cx18_remove(struct pci_dev *pci_dev)</div><div class='ctx'> </div><div class='ctx'> 	pci_disable_device(cx-&gt;dev);</div><div class='ctx'> </div><div class='add'>+	cx18_log_statistics(cx);</div><div class='ctx'> 	CX18_INFO("Removed %s, card #%d\n", cx-&gt;card_name, cx-&gt;num);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -938,7 +959,7 @@ static int module_start(void)</div><div class='ctx'> </div><div class='ctx'> 	/* Validate parameters */</div><div class='ctx'> 	if (cx18_first_minor &lt; 0 || cx18_first_minor &gt;= CX18_MAX_CARDS) {</div><div class='del'>-		printk(KERN_ERR "cx18:  Exiting, ivtv_first_minor must be between 0 and %d\n",</div><div class='add'>+		printk(KERN_ERR "cx18:  Exiting, cx18_first_minor must be between 0 and %d\n",</div><div class='ctx'> 		     CX18_MAX_CARDS - 1);</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/media/video/cx18/cx18-driver.h b/drivers/media/video/cx18/cx18-driver.h<br/>index 4801bc7fb5b2..fa8be0731a3f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx18/cx18-driver.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/cx18/cx18-driver.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx18/cx18-driver.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx18/cx18-driver.h</a></div><div class='hunk'>@@ -38,7 +38,6 @@</div><div class='ctx'> #include &lt;linux/i2c-algo-bit.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/unistd.h&gt;</div><div class='del'>-#include &lt;linux/byteorder/swab.h&gt;</div><div class='ctx'> #include &lt;linux/pagemap.h&gt;</div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='hunk'>@@ -64,6 +63,9 @@</div><div class='ctx'> #  error "This driver requires kernel PCI support."</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+/* Default delay to throttle mmio access to the CX23418 */</div><div class='add'>+#define CX18_DEFAULT_MMIO_NDELAY 0 /* 0 ns = 0 PCI clock(s) / 33 MHz */</div><div class='add'>+</div><div class='ctx'> #define CX18_MEM_OFFSET	0x00000000</div><div class='ctx'> #define CX18_MEM_SIZE	0x04000000</div><div class='ctx'> #define CX18_REG_OFFSET	0x02000000</div><div class='hunk'>@@ -77,7 +79,9 @@</div><div class='ctx'> #define CX18_CARD_COMPRO_H900 	      2	/* Compro VideoMate H900 */</div><div class='ctx'> #define CX18_CARD_YUAN_MPC718 	      3	/* Yuan MPC718 */</div><div class='ctx'> #define CX18_CARD_CNXT_RAPTOR_PAL     4	/* Conexant Raptor PAL */</div><div class='del'>-#define CX18_CARD_LAST 		      4</div><div class='add'>+#define CX18_CARD_TOSHIBA_QOSMIO_DVBT 5 /* Toshiba Qosmio Interal DVB-T/Analog*/</div><div class='add'>+#define CX18_CARD_LEADTEK_PVR2100     6 /* Leadtek WinFast PVR2100 */</div><div class='add'>+#define CX18_CARD_LAST 		      6</div><div class='ctx'> </div><div class='ctx'> #define CX18_ENC_STREAM_TYPE_MPG  0</div><div class='ctx'> #define CX18_ENC_STREAM_TYPE_TS   1</div><div class='hunk'>@@ -97,6 +101,8 @@</div><div class='ctx'> #define CX18_PCI_ID_COMPRO 		0x185b</div><div class='ctx'> #define CX18_PCI_ID_YUAN 		0x12ab</div><div class='ctx'> #define CX18_PCI_ID_CONEXANT		0x14f1</div><div class='add'>+#define CX18_PCI_ID_TOSHIBA		0x1179</div><div class='add'>+#define CX18_PCI_ID_LEADTEK		0x107D</div><div class='ctx'> </div><div class='ctx'> /* ======================================================================== */</div><div class='ctx'> /* ========================== START USER SETTABLE DMA VARIABLES =========== */</div><div class='hunk'>@@ -169,6 +175,7 @@</div><div class='ctx'> </div><div class='ctx'> #define CX18_MAX_PGM_INDEX (400)</div><div class='ctx'> </div><div class='add'>+extern int cx18_retry_mmio;	/* enable check &amp; retry of mmio accesses */</div><div class='ctx'> extern int cx18_debug;</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -177,6 +184,7 @@ struct cx18_options {</div><div class='ctx'> 	int cardtype;		/* force card type on load */</div><div class='ctx'> 	int tuner;		/* set tuner on load */</div><div class='ctx'> 	int radio;		/* enable/disable radio */</div><div class='add'>+	unsigned long mmio_ndelay; /* delay in ns after every PCI mmio access */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* per-buffer bit flags */</div><div class='hunk'>@@ -216,8 +224,7 @@ struct cx18_buffer {</div><div class='ctx'> </div><div class='ctx'> struct cx18_queue {</div><div class='ctx'> 	struct list_head list;</div><div class='del'>-	u32 buffers;</div><div class='del'>-	u32 length;</div><div class='add'>+	atomic_t buffers;</div><div class='ctx'> 	u32 bytesused;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -237,6 +244,8 @@ struct cx18_dvb {</div><div class='ctx'> struct cx18;	 /* forward reference */</div><div class='ctx'> struct cx18_scb; /* forward reference */</div><div class='ctx'> </div><div class='add'>+#define CX18_INVALID_TASK_HANDLE 0xffffffff</div><div class='add'>+</div><div class='ctx'> struct cx18_stream {</div><div class='ctx'> 	/* These first four fields are always set, even if the stream</div><div class='ctx'> 	   is not actually created. */</div><div class='hunk'>@@ -259,7 +268,6 @@ struct cx18_stream {</div><div class='ctx'> 	/* Buffer Stats */</div><div class='ctx'> 	u32 buffers;</div><div class='ctx'> 	u32 buf_size;</div><div class='del'>-	u32 buffers_stolen;</div><div class='ctx'> </div><div class='ctx'> 	/* Buffer Queues */</div><div class='ctx'> 	struct cx18_queue q_free;	/* free buffers */</div><div class='hunk'>@@ -341,6 +349,13 @@ struct cx18_i2c_algo_callback_data {</div><div class='ctx'> 	int bus_index;   /* 0 or 1 for the cx23418's 1st or 2nd I2C bus */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define CX18_MAX_MMIO_RETRIES 10</div><div class='add'>+</div><div class='add'>+struct cx18_mmio_stats {</div><div class='add'>+	atomic_t retried_write[CX18_MAX_MMIO_RETRIES+1];</div><div class='add'>+	atomic_t retried_read[CX18_MAX_MMIO_RETRIES+1];</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* Struct to hold info about cx18 cards */</div><div class='ctx'> struct cx18 {</div><div class='ctx'> 	int num;		/* board number, -1 during init! */</div><div class='hunk'>@@ -430,6 +445,9 @@ struct cx18 {</div><div class='ctx'> 	u32 gpio_val;</div><div class='ctx'> 	struct mutex gpio_lock;</div><div class='ctx'> </div><div class='add'>+	/* Statistics */</div><div class='add'>+	struct cx18_mmio_stats mmio_stats;</div><div class='add'>+</div><div class='ctx'> 	/* v4l2 and User settings */</div><div class='ctx'> </div><div class='ctx'> 	/* codec settings */</div><div class='hunk'>@@ -458,47 +476,4 @@ void cx18_read_eeprom(struct cx18 *cx, struct tveeprom *tv);</div><div class='ctx'> /* First-open initialization: load firmware, etc. */</div><div class='ctx'> int cx18_init_on_first_open(struct cx18 *cx);</div><div class='ctx'> </div><div class='del'>-/* This is a PCI post thing, where if the pci register is not read, then</div><div class='del'>-   the write doesn't always take effect right away. By reading back the</div><div class='del'>-   register any pending PCI writes will be performed (in order), and so</div><div class='del'>-   you can be sure that the writes are guaranteed to be done.</div><div class='del'>-</div><div class='del'>-   Rarely needed, only in some timing sensitive cases.</div><div class='del'>-   Apparently if this is not done some motherboards seem</div><div class='del'>-   to kill the firmware and get into the broken state until computer is</div><div class='del'>-   rebooted. */</div><div class='del'>-#define write_sync(val, reg) \</div><div class='del'>-	do { writel(val, reg); readl(reg); } while (0)</div><div class='del'>-</div><div class='del'>-#define read_reg(reg) readl(cx-&gt;reg_mem + (reg))</div><div class='del'>-#define write_reg(val, reg) writel(val, cx-&gt;reg_mem + (reg))</div><div class='del'>-#define write_reg_sync(val, reg) \</div><div class='del'>-	do { write_reg(val, reg); read_reg(reg); } while (0)</div><div class='del'>-</div><div class='del'>-#define read_enc(addr) readl(cx-&gt;enc_mem + (u32)(addr))</div><div class='del'>-#define write_enc(val, addr) writel(val, cx-&gt;enc_mem + (u32)(addr))</div><div class='del'>-#define write_enc_sync(val, addr) \</div><div class='del'>-	do { write_enc(val, addr); read_enc(addr); } while (0)</div><div class='del'>-</div><div class='del'>-#define sw1_irq_enable(val) do { \</div><div class='del'>-	write_reg(val, SW1_INT_STATUS); \</div><div class='del'>-	write_reg(read_reg(SW1_INT_ENABLE_PCI) | (val), SW1_INT_ENABLE_PCI); \</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#define sw1_irq_disable(val) \</div><div class='del'>-	write_reg(read_reg(SW1_INT_ENABLE_PCI) &amp; ~(val), SW1_INT_ENABLE_PCI);</div><div class='del'>-</div><div class='del'>-#define sw2_irq_enable(val) do { \</div><div class='del'>-	write_reg(val, SW2_INT_STATUS); \</div><div class='del'>-	write_reg(read_reg(SW2_INT_ENABLE_PCI) | (val), SW2_INT_ENABLE_PCI); \</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#define sw2_irq_disable(val) \</div><div class='del'>-	write_reg(read_reg(SW2_INT_ENABLE_PCI) &amp; ~(val), SW2_INT_ENABLE_PCI);</div><div class='del'>-</div><div class='del'>-#define setup_page(addr) do { \</div><div class='del'>-    u32 val = read_reg(0xD000F8) &amp; ~0x1f00; \</div><div class='del'>-    write_reg(val | (((addr) &gt;&gt; 17) &amp; 0x1f00), 0xD000F8); \</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='ctx'> #endif /* CX18_DRIVER_H */</div><div class='head'>diff --git a/drivers/media/video/cx18/cx18-dvb.c b/drivers/media/video/cx18/cx18-dvb.c<br/>index 1e420a804fc9..afc694e7bdb2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx18/cx18-dvb.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/cx18/cx18-dvb.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx18/cx18-dvb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx18/cx18-dvb.c</a></div><div class='hunk'>@@ -21,6 +21,7 @@</div><div class='ctx'> </div><div class='ctx'> #include "cx18-version.h"</div><div class='ctx'> #include "cx18-dvb.h"</div><div class='add'>+#include "cx18-io.h"</div><div class='ctx'> #include "cx18-streams.h"</div><div class='ctx'> #include "cx18-cards.h"</div><div class='ctx'> #include "s5h1409.h"</div><div class='hunk'>@@ -87,13 +88,13 @@ static int cx18_dvb_start_feed(struct dvb_demux_feed *feed)</div><div class='ctx'> 	switch (cx-&gt;card-&gt;type) {</div><div class='ctx'> 	case CX18_CARD_HVR_1600_ESMT:</div><div class='ctx'> 	case CX18_CARD_HVR_1600_SAMSUNG:</div><div class='del'>-		v = read_reg(CX18_REG_DMUX_NUM_PORT_0_CONTROL);</div><div class='add'>+		v = cx18_read_reg(cx, CX18_REG_DMUX_NUM_PORT_0_CONTROL);</div><div class='ctx'> 		v |= 0x00400000; /* Serial Mode */</div><div class='ctx'> 		v |= 0x00002000; /* Data Length - Byte */</div><div class='ctx'> 		v |= 0x00010000; /* Error - Polarity */</div><div class='ctx'> 		v |= 0x00020000; /* Error - Passthru */</div><div class='ctx'> 		v |= 0x000c0000; /* Error - Ignore */</div><div class='del'>-		write_reg(v, CX18_REG_DMUX_NUM_PORT_0_CONTROL);</div><div class='add'>+		cx18_write_reg(cx, v, CX18_REG_DMUX_NUM_PORT_0_CONTROL);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='head'>diff --git a/drivers/media/video/cx18/cx18-fileops.c b/drivers/media/video/cx18/cx18-fileops.c<br/>index 1e537fe04a23..5f9089907544 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx18/cx18-fileops.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/cx18/cx18-fileops.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx18/cx18-fileops.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx18/cx18-fileops.c</a></div><div class='hunk'>@@ -132,6 +132,7 @@ static void cx18_dualwatch(struct cx18 *cx)</div><div class='ctx'> 	u16 new_stereo_mode;</div><div class='ctx'> 	const u16 stereo_mask = 0x0300;</div><div class='ctx'> 	const u16 dual = 0x0200;</div><div class='add'>+	u32 h;</div><div class='ctx'> </div><div class='ctx'> 	new_stereo_mode = cx-&gt;params.audio_properties &amp; stereo_mask;</div><div class='ctx'> 	memset(&amp;vt, 0, sizeof(vt));</div><div class='hunk'>@@ -143,13 +144,21 @@ static void cx18_dualwatch(struct cx18 *cx)</div><div class='ctx'> 	if (new_stereo_mode == cx-&gt;dualwatch_stereo_mode)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	new_bitmap = new_stereo_mode | (cx-&gt;params.audio_properties &amp; ~stereo_mask);</div><div class='add'>+	new_bitmap = new_stereo_mode</div><div class='add'>+			| (cx-&gt;params.audio_properties &amp; ~stereo_mask);</div><div class='ctx'> </div><div class='del'>-	CX18_DEBUG_INFO("dualwatch: change stereo flag from 0x%x to 0x%x. new audio_bitmask=0x%ux\n",</div><div class='del'>-			   cx-&gt;dualwatch_stereo_mode, new_stereo_mode, new_bitmap);</div><div class='add'>+	CX18_DEBUG_INFO("dualwatch: change stereo flag from 0x%x to 0x%x. "</div><div class='add'>+			"new audio_bitmask=0x%ux\n",</div><div class='add'>+			cx-&gt;dualwatch_stereo_mode, new_stereo_mode, new_bitmap);</div><div class='ctx'> </div><div class='del'>-	if (cx18_vapi(cx, CX18_CPU_SET_AUDIO_PARAMETERS, 2,</div><div class='del'>-				cx18_find_handle(cx), new_bitmap) == 0) {</div><div class='add'>+	h = cx18_find_handle(cx);</div><div class='add'>+	if (h == CX18_INVALID_TASK_HANDLE) {</div><div class='add'>+		CX18_DEBUG_INFO("dualwatch: can't find valid task handle\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cx18_vapi(cx,</div><div class='add'>+		      CX18_CPU_SET_AUDIO_PARAMETERS, 2, h, new_bitmap) == 0) {</div><div class='ctx'> 		cx-&gt;dualwatch_stereo_mode = new_stereo_mode;</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -223,7 +232,7 @@ static struct cx18_buffer *cx18_get_buffer(struct cx18_stream *s, int non_block,</div><div class='ctx'> 		prepare_to_wait(&amp;s-&gt;waitq, &amp;wait, TASK_INTERRUPTIBLE);</div><div class='ctx'> 		/* New buffers might have become available before we were added</div><div class='ctx'> 		   to the waitqueue */</div><div class='del'>-		if (!s-&gt;q_full.buffers)</div><div class='add'>+		if (!atomic_read(&amp;s-&gt;q_full.buffers))</div><div class='ctx'> 			schedule();</div><div class='ctx'> 		finish_wait(&amp;s-&gt;waitq, &amp;wait);</div><div class='ctx'> 		if (signal_pending(current)) {</div><div class='hunk'>@@ -509,7 +518,7 @@ unsigned int cx18_v4l2_enc_poll(struct file *filp, poll_table *wait)</div><div class='ctx'> 	CX18_DEBUG_HI_FILE("Encoder poll\n");</div><div class='ctx'> 	poll_wait(filp, &amp;s-&gt;waitq, wait);</div><div class='ctx'> </div><div class='del'>-	if (s-&gt;q_full.length || s-&gt;q_io.length)</div><div class='add'>+	if (atomic_read(&amp;s-&gt;q_full.buffers) || atomic_read(&amp;s-&gt;q_io.buffers))</div><div class='ctx'> 		return POLLIN | POLLRDNORM;</div><div class='ctx'> 	if (eof)</div><div class='ctx'> 		return POLLHUP;</div><div class='hunk'>@@ -695,20 +704,28 @@ int cx18_v4l2_open(struct inode *inode, struct file *filp)</div><div class='ctx'> </div><div class='ctx'> void cx18_mute(struct cx18 *cx)</div><div class='ctx'> {</div><div class='del'>-	if (atomic_read(&amp;cx-&gt;ana_capturing))</div><div class='del'>-		cx18_vapi(cx, CX18_CPU_SET_AUDIO_MUTE, 2,</div><div class='del'>-				cx18_find_handle(cx), 1);</div><div class='add'>+	u32 h;</div><div class='add'>+	if (atomic_read(&amp;cx-&gt;ana_capturing)) {</div><div class='add'>+		h = cx18_find_handle(cx);</div><div class='add'>+		if (h != CX18_INVALID_TASK_HANDLE)</div><div class='add'>+			cx18_vapi(cx, CX18_CPU_SET_AUDIO_MUTE, 2, h, 1);</div><div class='add'>+		else</div><div class='add'>+			CX18_ERR("Can't find valid task handle for mute\n");</div><div class='add'>+	}</div><div class='ctx'> 	CX18_DEBUG_INFO("Mute\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void cx18_unmute(struct cx18 *cx)</div><div class='ctx'> {</div><div class='add'>+	u32 h;</div><div class='ctx'> 	if (atomic_read(&amp;cx-&gt;ana_capturing)) {</div><div class='del'>-		cx18_msleep_timeout(100, 0);</div><div class='del'>-		cx18_vapi(cx, CX18_CPU_SET_MISC_PARAMETERS, 2,</div><div class='del'>-				cx18_find_handle(cx), 12);</div><div class='del'>-		cx18_vapi(cx, CX18_CPU_SET_AUDIO_MUTE, 2,</div><div class='del'>-				cx18_find_handle(cx), 0);</div><div class='add'>+		h = cx18_find_handle(cx);</div><div class='add'>+		if (h != CX18_INVALID_TASK_HANDLE) {</div><div class='add'>+			cx18_msleep_timeout(100, 0);</div><div class='add'>+			cx18_vapi(cx, CX18_CPU_SET_MISC_PARAMETERS, 2, h, 12);</div><div class='add'>+			cx18_vapi(cx, CX18_CPU_SET_AUDIO_MUTE, 2, h, 0);</div><div class='add'>+		} else</div><div class='add'>+			CX18_ERR("Can't find valid task handle for unmute\n");</div><div class='ctx'> 	}</div><div class='ctx'> 	CX18_DEBUG_INFO("Unmute\n");</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/media/video/cx18/cx18-firmware.c b/drivers/media/video/cx18/cx18-firmware.c<br/>index 78fadd2ada5d..51534428cd00 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx18/cx18-firmware.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/cx18/cx18-firmware.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx18/cx18-firmware.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx18/cx18-firmware.c</a></div><div class='hunk'>@@ -20,6 +20,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "cx18-driver.h"</div><div class='add'>+#include "cx18-io.h"</div><div class='ctx'> #include "cx18-scb.h"</div><div class='ctx'> #include "cx18-irq.h"</div><div class='ctx'> #include "cx18-firmware.h"</div><div class='hunk'>@@ -113,11 +114,11 @@ static int load_cpu_fw_direct(const char *fn, u8 __iomem *mem, struct cx18 *cx)</div><div class='ctx'> 	src = (const u32 *)fw-&gt;data;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; fw-&gt;size; i += 4096) {</div><div class='del'>-		setup_page(i);</div><div class='add'>+		cx18_setup_page(cx, i);</div><div class='ctx'> 		for (j = i; j &lt; fw-&gt;size &amp;&amp; j &lt; i + 4096; j += 4) {</div><div class='ctx'> 			/* no need for endianness conversion on the ppc */</div><div class='del'>-			__raw_writel(*src, dst);</div><div class='del'>-			if (__raw_readl(dst) != *src) {</div><div class='add'>+			cx18_raw_writel(cx, *src, dst);</div><div class='add'>+			if (cx18_raw_readl(cx, dst) != *src) {</div><div class='ctx'> 				CX18_ERR("Mismatch at offset %x\n", i);</div><div class='ctx'> 				release_firmware(fw);</div><div class='ctx'> 				return -EIO;</div><div class='hunk'>@@ -170,12 +171,15 @@ static int load_apu_fw_direct(const char *fn, u8 __iomem *dst, struct cx18 *cx)</div><div class='ctx'> 		if (offset + seghdr.size &gt; sz)</div><div class='ctx'> 			break;</div><div class='ctx'> 		for (i = 0; i &lt; seghdr.size; i += 4096) {</div><div class='del'>-			setup_page(offset + i);</div><div class='add'>+			cx18_setup_page(cx, offset + i);</div><div class='ctx'> 			for (j = i; j &lt; seghdr.size &amp;&amp; j &lt; i + 4096; j += 4) {</div><div class='ctx'> 				/* no need for endianness conversion on the ppc */</div><div class='del'>-				__raw_writel(src[(offset + j) / 4], dst + seghdr.addr + j);</div><div class='del'>-				if (__raw_readl(dst + seghdr.addr + j) != src[(offset + j) / 4]) {</div><div class='del'>-					CX18_ERR("Mismatch at offset %x\n", offset + j);</div><div class='add'>+				cx18_raw_writel(cx, src[(offset + j) / 4],</div><div class='add'>+						dst + seghdr.addr + j);</div><div class='add'>+				if (cx18_raw_readl(cx, dst + seghdr.addr + j)</div><div class='add'>+				    != src[(offset + j) / 4]) {</div><div class='add'>+					CX18_ERR("Mismatch at offset %x\n",</div><div class='add'>+						 offset + j);</div><div class='ctx'> 					release_firmware(fw);</div><div class='ctx'> 					return -EIO;</div><div class='ctx'> 				}</div><div class='hunk'>@@ -189,43 +193,45 @@ static int load_apu_fw_direct(const char *fn, u8 __iomem *dst, struct cx18 *cx)</div><div class='ctx'> 	size = fw-&gt;size;</div><div class='ctx'> 	release_firmware(fw);</div><div class='ctx'> 	/* Clear bit0 for APU to start from 0 */</div><div class='del'>-	write_reg(read_reg(0xc72030) &amp; ~1, 0xc72030);</div><div class='add'>+	cx18_write_reg(cx, cx18_read_reg(cx, 0xc72030) &amp; ~1, 0xc72030);</div><div class='ctx'> 	return size;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void cx18_halt_firmware(struct cx18 *cx)</div><div class='ctx'> {</div><div class='ctx'> 	CX18_DEBUG_INFO("Preparing for firmware halt.\n");</div><div class='del'>-	write_reg(0x000F000F, CX18_PROC_SOFT_RESET); /* stop the fw */</div><div class='del'>-	write_reg(0x00020002, CX18_ADEC_CONTROL);</div><div class='add'>+	cx18_write_reg(cx, 0x000F000F, CX18_PROC_SOFT_RESET); /* stop the fw */</div><div class='add'>+	cx18_write_reg(cx, 0x00020002, CX18_ADEC_CONTROL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void cx18_init_power(struct cx18 *cx, int lowpwr)</div><div class='ctx'> {</div><div class='ctx'> 	/* power-down Spare and AOM PLLs */</div><div class='ctx'> 	/* power-up fast, slow and mpeg PLLs */</div><div class='del'>-	write_reg(0x00000008, CX18_PLL_POWER_DOWN);</div><div class='add'>+	cx18_write_reg(cx, 0x00000008, CX18_PLL_POWER_DOWN);</div><div class='ctx'> </div><div class='ctx'> 	/* ADEC out of sleep */</div><div class='del'>-	write_reg(0x00020000, CX18_ADEC_CONTROL);</div><div class='add'>+	cx18_write_reg(cx, 0x00020000, CX18_ADEC_CONTROL);</div><div class='ctx'> </div><div class='ctx'> 	/* The fast clock is at 200/245 MHz */</div><div class='del'>-	write_reg(lowpwr ? 0xD : 0x11, CX18_FAST_CLOCK_PLL_INT);</div><div class='del'>-	write_reg(lowpwr ? 0x1EFBF37 : 0x038E3D7, CX18_FAST_CLOCK_PLL_FRAC);</div><div class='add'>+	cx18_write_reg(cx, lowpwr ? 0xD : 0x11, CX18_FAST_CLOCK_PLL_INT);</div><div class='add'>+	cx18_write_reg(cx, lowpwr ? 0x1EFBF37 : 0x038E3D7,</div><div class='add'>+						CX18_FAST_CLOCK_PLL_FRAC);</div><div class='ctx'> </div><div class='del'>-	write_reg(2, CX18_FAST_CLOCK_PLL_POST);</div><div class='del'>-	write_reg(1, CX18_FAST_CLOCK_PLL_PRESCALE);</div><div class='del'>-	write_reg(4, CX18_FAST_CLOCK_PLL_ADJUST_BANDWIDTH);</div><div class='add'>+	cx18_write_reg(cx, 2, CX18_FAST_CLOCK_PLL_POST);</div><div class='add'>+	cx18_write_reg(cx, 1, CX18_FAST_CLOCK_PLL_PRESCALE);</div><div class='add'>+	cx18_write_reg(cx, 4, CX18_FAST_CLOCK_PLL_ADJUST_BANDWIDTH);</div><div class='ctx'> </div><div class='ctx'> 	/* set slow clock to 125/120 MHz */</div><div class='del'>-	write_reg(lowpwr ? 0x11 : 0x10, CX18_SLOW_CLOCK_PLL_INT);</div><div class='del'>-	write_reg(lowpwr ? 0xEBAF05 : 0x18618A8, CX18_SLOW_CLOCK_PLL_FRAC);</div><div class='del'>-	write_reg(4, CX18_SLOW_CLOCK_PLL_POST);</div><div class='add'>+	cx18_write_reg(cx, lowpwr ? 0x11 : 0x10, CX18_SLOW_CLOCK_PLL_INT);</div><div class='add'>+	cx18_write_reg(cx, lowpwr ? 0xEBAF05 : 0x18618A8,</div><div class='add'>+						CX18_SLOW_CLOCK_PLL_FRAC);</div><div class='add'>+	cx18_write_reg(cx, 4, CX18_SLOW_CLOCK_PLL_POST);</div><div class='ctx'> </div><div class='ctx'> 	/* mpeg clock pll 54MHz */</div><div class='del'>-	write_reg(0xF, CX18_MPEG_CLOCK_PLL_INT);</div><div class='del'>-	write_reg(0x2BCFEF, CX18_MPEG_CLOCK_PLL_FRAC);</div><div class='del'>-	write_reg(8, CX18_MPEG_CLOCK_PLL_POST);</div><div class='add'>+	cx18_write_reg(cx, 0xF, CX18_MPEG_CLOCK_PLL_INT);</div><div class='add'>+	cx18_write_reg(cx, 0x2BCFEF, CX18_MPEG_CLOCK_PLL_FRAC);</div><div class='add'>+	cx18_write_reg(cx, 8, CX18_MPEG_CLOCK_PLL_POST);</div><div class='ctx'> </div><div class='ctx'> 	/* Defaults */</div><div class='ctx'> 	/* APU = SC or SC/2 = 125/62.5 */</div><div class='hunk'>@@ -242,81 +248,84 @@ void cx18_init_power(struct cx18 *cx, int lowpwr)</div><div class='ctx'> 	/* VFC = disabled */</div><div class='ctx'> 	/* USB = disabled */</div><div class='ctx'> </div><div class='del'>-	write_reg(lowpwr ? 0xFFFF0020 : 0x00060004, CX18_CLOCK_SELECT1);</div><div class='del'>-	write_reg(lowpwr ? 0xFFFF0004 : 0x00060006, CX18_CLOCK_SELECT2);</div><div class='add'>+	cx18_write_reg(cx, lowpwr ? 0xFFFF0020 : 0x00060004,</div><div class='add'>+							CX18_CLOCK_SELECT1);</div><div class='add'>+	cx18_write_reg(cx, lowpwr ? 0xFFFF0004 : 0x00060006,</div><div class='add'>+							CX18_CLOCK_SELECT2);</div><div class='ctx'> </div><div class='del'>-	write_reg(0xFFFF0002, CX18_HALF_CLOCK_SELECT1);</div><div class='del'>-	write_reg(0xFFFF0104, CX18_HALF_CLOCK_SELECT2);</div><div class='add'>+	cx18_write_reg(cx, 0xFFFF0002, CX18_HALF_CLOCK_SELECT1);</div><div class='add'>+	cx18_write_reg(cx, 0xFFFF0104, CX18_HALF_CLOCK_SELECT2);</div><div class='ctx'> </div><div class='del'>-	write_reg(0xFFFF9026, CX18_CLOCK_ENABLE1);</div><div class='del'>-	write_reg(0xFFFF3105, CX18_CLOCK_ENABLE2);</div><div class='add'>+	cx18_write_reg(cx, 0xFFFF9026, CX18_CLOCK_ENABLE1);</div><div class='add'>+	cx18_write_reg(cx, 0xFFFF3105, CX18_CLOCK_ENABLE2);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void cx18_init_memory(struct cx18 *cx)</div><div class='ctx'> {</div><div class='ctx'> 	cx18_msleep_timeout(10, 0);</div><div class='del'>-	write_reg(0x10000, CX18_DDR_SOFT_RESET);</div><div class='add'>+	cx18_write_reg(cx, 0x10000, CX18_DDR_SOFT_RESET);</div><div class='ctx'> 	cx18_msleep_timeout(10, 0);</div><div class='ctx'> </div><div class='del'>-	write_reg(cx-&gt;card-&gt;ddr.chip_config, CX18_DDR_CHIP_CONFIG);</div><div class='add'>+	cx18_write_reg(cx, cx-&gt;card-&gt;ddr.chip_config, CX18_DDR_CHIP_CONFIG);</div><div class='ctx'> </div><div class='ctx'> 	cx18_msleep_timeout(10, 0);</div><div class='ctx'> </div><div class='del'>-	write_reg(cx-&gt;card-&gt;ddr.refresh, CX18_DDR_REFRESH);</div><div class='del'>-	write_reg(cx-&gt;card-&gt;ddr.timing1, CX18_DDR_TIMING1);</div><div class='del'>-	write_reg(cx-&gt;card-&gt;ddr.timing2, CX18_DDR_TIMING2);</div><div class='add'>+	cx18_write_reg(cx, cx-&gt;card-&gt;ddr.refresh, CX18_DDR_REFRESH);</div><div class='add'>+	cx18_write_reg(cx, cx-&gt;card-&gt;ddr.timing1, CX18_DDR_TIMING1);</div><div class='add'>+	cx18_write_reg(cx, cx-&gt;card-&gt;ddr.timing2, CX18_DDR_TIMING2);</div><div class='ctx'> </div><div class='ctx'> 	cx18_msleep_timeout(10, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize DQS pad time */</div><div class='del'>-	write_reg(cx-&gt;card-&gt;ddr.tune_lane, CX18_DDR_TUNE_LANE);</div><div class='del'>-	write_reg(cx-&gt;card-&gt;ddr.initial_emrs, CX18_DDR_INITIAL_EMRS);</div><div class='add'>+	cx18_write_reg(cx, cx-&gt;card-&gt;ddr.tune_lane, CX18_DDR_TUNE_LANE);</div><div class='add'>+	cx18_write_reg(cx, cx-&gt;card-&gt;ddr.initial_emrs, CX18_DDR_INITIAL_EMRS);</div><div class='ctx'> </div><div class='ctx'> 	cx18_msleep_timeout(10, 0);</div><div class='ctx'> </div><div class='del'>-	write_reg(0x20000, CX18_DDR_SOFT_RESET);</div><div class='add'>+	cx18_write_reg(cx, 0x20000, CX18_DDR_SOFT_RESET);</div><div class='ctx'> 	cx18_msleep_timeout(10, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* use power-down mode when idle */</div><div class='del'>-	write_reg(0x00000010, CX18_DDR_POWER_REG);</div><div class='del'>-</div><div class='del'>-	write_reg(0x10001, CX18_REG_BUS_TIMEOUT_EN);</div><div class='del'>-</div><div class='del'>-	write_reg(0x48, CX18_DDR_MB_PER_ROW_7);</div><div class='del'>-	write_reg(0xE0000, CX18_DDR_BASE_63_ADDR);</div><div class='del'>-</div><div class='del'>-	write_reg(0x00000101, CX18_WMB_CLIENT02);  /* AO */</div><div class='del'>-	write_reg(0x00000101, CX18_WMB_CLIENT09);  /* AI2 */</div><div class='del'>-	write_reg(0x00000101, CX18_WMB_CLIENT05);  /* VIM1 */</div><div class='del'>-	write_reg(0x00000101, CX18_WMB_CLIENT06);  /* AI1 */</div><div class='del'>-	write_reg(0x00000101, CX18_WMB_CLIENT07);  /* 3D comb */</div><div class='del'>-	write_reg(0x00000101, CX18_WMB_CLIENT10);  /* ME */</div><div class='del'>-	write_reg(0x00000101, CX18_WMB_CLIENT12);  /* ENC */</div><div class='del'>-	write_reg(0x00000101, CX18_WMB_CLIENT13);  /* PK */</div><div class='del'>-	write_reg(0x00000101, CX18_WMB_CLIENT11);  /* RC */</div><div class='del'>-	write_reg(0x00000101, CX18_WMB_CLIENT14);  /* AVO */</div><div class='add'>+	cx18_write_reg(cx, 0x00000010, CX18_DDR_POWER_REG);</div><div class='add'>+</div><div class='add'>+	cx18_write_reg(cx, 0x10001, CX18_REG_BUS_TIMEOUT_EN);</div><div class='add'>+</div><div class='add'>+	cx18_write_reg(cx, 0x48, CX18_DDR_MB_PER_ROW_7);</div><div class='add'>+	cx18_write_reg(cx, 0xE0000, CX18_DDR_BASE_63_ADDR);</div><div class='add'>+</div><div class='add'>+	cx18_write_reg(cx, 0x00000101, CX18_WMB_CLIENT02);  /* AO */</div><div class='add'>+	cx18_write_reg(cx, 0x00000101, CX18_WMB_CLIENT09);  /* AI2 */</div><div class='add'>+	cx18_write_reg(cx, 0x00000101, CX18_WMB_CLIENT05);  /* VIM1 */</div><div class='add'>+	cx18_write_reg(cx, 0x00000101, CX18_WMB_CLIENT06);  /* AI1 */</div><div class='add'>+	cx18_write_reg(cx, 0x00000101, CX18_WMB_CLIENT07);  /* 3D comb */</div><div class='add'>+	cx18_write_reg(cx, 0x00000101, CX18_WMB_CLIENT10);  /* ME */</div><div class='add'>+	cx18_write_reg(cx, 0x00000101, CX18_WMB_CLIENT12);  /* ENC */</div><div class='add'>+	cx18_write_reg(cx, 0x00000101, CX18_WMB_CLIENT13);  /* PK */</div><div class='add'>+	cx18_write_reg(cx, 0x00000101, CX18_WMB_CLIENT11);  /* RC */</div><div class='add'>+	cx18_write_reg(cx, 0x00000101, CX18_WMB_CLIENT14);  /* AVO */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int cx18_firmware_init(struct cx18 *cx)</div><div class='ctx'> {</div><div class='ctx'> 	/* Allow chip to control CLKRUN */</div><div class='del'>-	write_reg(0x5, CX18_DSP0_INTERRUPT_MASK);</div><div class='add'>+	cx18_write_reg(cx, 0x5, CX18_DSP0_INTERRUPT_MASK);</div><div class='ctx'> </div><div class='del'>-	write_reg(0x000F000F, CX18_PROC_SOFT_RESET); /* stop the fw */</div><div class='add'>+	cx18_write_reg(cx, 0x000F000F, CX18_PROC_SOFT_RESET); /* stop the fw */</div><div class='ctx'> </div><div class='ctx'> 	cx18_msleep_timeout(1, 0);</div><div class='ctx'> </div><div class='del'>-	sw1_irq_enable(IRQ_CPU_TO_EPU | IRQ_APU_TO_EPU);</div><div class='del'>-	sw2_irq_enable(IRQ_CPU_TO_EPU_ACK | IRQ_APU_TO_EPU_ACK);</div><div class='add'>+	cx18_sw1_irq_enable(cx, IRQ_CPU_TO_EPU | IRQ_APU_TO_EPU);</div><div class='add'>+	cx18_sw2_irq_enable(cx, IRQ_CPU_TO_EPU_ACK | IRQ_APU_TO_EPU_ACK);</div><div class='ctx'> </div><div class='ctx'> 	/* Only if the processor is not running */</div><div class='del'>-	if (read_reg(CX18_PROC_SOFT_RESET) &amp; 8) {</div><div class='add'>+	if (cx18_read_reg(cx, CX18_PROC_SOFT_RESET) &amp; 8) {</div><div class='ctx'> 		int sz = load_apu_fw_direct("v4l-cx23418-apu.fw",</div><div class='ctx'> 			       cx-&gt;enc_mem, cx);</div><div class='ctx'> </div><div class='del'>-		write_enc(0xE51FF004, 0);</div><div class='del'>-		write_enc(0xa00000, 4);  /* todo: not hardcoded */</div><div class='del'>-		write_reg(0x00010000, CX18_PROC_SOFT_RESET); /* Start APU */</div><div class='add'>+		cx18_write_enc(cx, 0xE51FF004, 0);</div><div class='add'>+		cx18_write_enc(cx, 0xa00000, 4);  /* todo: not hardcoded */</div><div class='add'>+		/* Start APU */</div><div class='add'>+		cx18_write_reg(cx, 0x00010000, CX18_PROC_SOFT_RESET);</div><div class='ctx'> 		cx18_msleep_timeout(500, 0);</div><div class='ctx'> </div><div class='ctx'> 		sz = sz &lt;= 0 ? sz : load_cpu_fw_direct("v4l-cx23418-cpu.fw",</div><div class='hunk'>@@ -326,9 +335,10 @@ int cx18_firmware_init(struct cx18 *cx)</div><div class='ctx'> 			int retries = 0;</div><div class='ctx'> </div><div class='ctx'> 			/* start the CPU */</div><div class='del'>-			write_reg(0x00080000, CX18_PROC_SOFT_RESET);</div><div class='add'>+			cx18_write_reg(cx, 0x00080000, CX18_PROC_SOFT_RESET);</div><div class='ctx'> 			while (retries++ &lt; 50) { /* Loop for max 500mS */</div><div class='del'>-				if ((read_reg(CX18_PROC_SOFT_RESET) &amp; 1) == 0)</div><div class='add'>+				if ((cx18_read_reg(cx, CX18_PROC_SOFT_RESET)</div><div class='add'>+				     &amp; 1) == 0)</div><div class='ctx'> 					break;</div><div class='ctx'> 				cx18_msleep_timeout(10, 0);</div><div class='ctx'> 			}</div><div class='hunk'>@@ -342,6 +352,6 @@ int cx18_firmware_init(struct cx18 *cx)</div><div class='ctx'> 			return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* initialize GPIO */</div><div class='del'>-	write_reg(0x14001400, 0xC78110);</div><div class='add'>+	cx18_write_reg(cx, 0x14001400, 0xC78110);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/media/video/cx18/cx18-gpio.c b/drivers/media/video/cx18/cx18-gpio.c<br/>index 3d495dba4983..0e560421989e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx18/cx18-gpio.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/cx18/cx18-gpio.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx18/cx18-gpio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx18/cx18-gpio.c</a></div><div class='hunk'>@@ -22,6 +22,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "cx18-driver.h"</div><div class='add'>+#include "cx18-io.h"</div><div class='ctx'> #include "cx18-cards.h"</div><div class='ctx'> #include "cx18-gpio.h"</div><div class='ctx'> #include "tuner-xc2028.h"</div><div class='hunk'>@@ -49,11 +50,11 @@ static void gpio_write(struct cx18 *cx)</div><div class='ctx'> 	u32 dir = cx-&gt;gpio_dir;</div><div class='ctx'> 	u32 val = cx-&gt;gpio_val;</div><div class='ctx'> </div><div class='del'>-	write_reg((dir &amp; 0xffff) &lt;&lt; 16, CX18_REG_GPIO_DIR1);</div><div class='del'>-	write_reg(((dir &amp; 0xffff) &lt;&lt; 16) | (val &amp; 0xffff),</div><div class='add'>+	cx18_write_reg(cx, (dir &amp; 0xffff) &lt;&lt; 16, CX18_REG_GPIO_DIR1);</div><div class='add'>+	cx18_write_reg(cx, ((dir &amp; 0xffff) &lt;&lt; 16) | (val &amp; 0xffff),</div><div class='ctx'> 			CX18_REG_GPIO_OUT1);</div><div class='del'>-	write_reg(dir &amp; 0xffff0000, CX18_REG_GPIO_DIR2);</div><div class='del'>-	write_reg_sync((dir &amp; 0xffff0000) | ((val &amp; 0xffff0000) &gt;&gt; 16),</div><div class='add'>+	cx18_write_reg(cx, dir &amp; 0xffff0000, CX18_REG_GPIO_DIR2);</div><div class='add'>+	cx18_write_reg_sync(cx, (dir &amp; 0xffff0000) | ((val &amp; 0xffff0000) &gt;&gt; 16),</div><div class='ctx'> 			CX18_REG_GPIO_OUT2);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -141,15 +142,17 @@ void cx18_gpio_init(struct cx18 *cx)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	CX18_DEBUG_INFO("GPIO initial dir: %08x/%08x out: %08x/%08x\n",</div><div class='del'>-		   read_reg(CX18_REG_GPIO_DIR1), read_reg(CX18_REG_GPIO_DIR2),</div><div class='del'>-		   read_reg(CX18_REG_GPIO_OUT1), read_reg(CX18_REG_GPIO_OUT2));</div><div class='add'>+			cx18_read_reg(cx, CX18_REG_GPIO_DIR1),</div><div class='add'>+			cx18_read_reg(cx, CX18_REG_GPIO_DIR2),</div><div class='add'>+			cx18_read_reg(cx, CX18_REG_GPIO_OUT1),</div><div class='add'>+			cx18_read_reg(cx, CX18_REG_GPIO_OUT2));</div><div class='ctx'> </div><div class='ctx'> 	gpio_write(cx);</div><div class='ctx'> 	mutex_unlock(&amp;cx-&gt;gpio_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Xceive tuner reset function */</div><div class='del'>-int cx18_reset_tuner_gpio(void *dev, int cmd, int value)</div><div class='add'>+int cx18_reset_tuner_gpio(void *dev, int component, int cmd, int value)</div><div class='ctx'> {</div><div class='ctx'> 	struct i2c_algo_bit_data *algo = dev;</div><div class='ctx'> 	struct cx18_i2c_algo_callback_data *cb_data = algo-&gt;data;</div><div class='head'>diff --git a/drivers/media/video/cx18/cx18-gpio.h b/drivers/media/video/cx18/cx18-gpio.h<br/>index 22cd7ddf8554..beb7424b9944 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx18/cx18-gpio.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/cx18/cx18-gpio.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx18/cx18-gpio.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx18/cx18-gpio.h</a></div><div class='hunk'>@@ -23,5 +23,5 @@</div><div class='ctx'> void cx18_gpio_init(struct cx18 *cx);</div><div class='ctx'> void cx18_reset_i2c_slaves_gpio(struct cx18 *cx);</div><div class='ctx'> void cx18_reset_ir_gpio(void *data);</div><div class='del'>-int cx18_reset_tuner_gpio(void *dev, int cmd, int value);</div><div class='add'>+int cx18_reset_tuner_gpio(void *dev, int component, int cmd, int value);</div><div class='ctx'> int cx18_gpio(struct cx18 *cx, unsigned int command, void *arg);</div><div class='head'>diff --git a/drivers/media/video/cx18/cx18-i2c.c b/drivers/media/video/cx18/cx18-i2c.c<br/>index 6023ba3bd3a6..aa09e557b195 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx18/cx18-i2c.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/cx18/cx18-i2c.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx18/cx18-i2c.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx18/cx18-i2c.c</a></div><div class='hunk'>@@ -22,13 +22,12 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "cx18-driver.h"</div><div class='add'>+#include "cx18-io.h"</div><div class='ctx'> #include "cx18-cards.h"</div><div class='ctx'> #include "cx18-gpio.h"</div><div class='ctx'> #include "cx18-av-core.h"</div><div class='ctx'> #include "cx18-i2c.h"</div><div class='ctx'> </div><div class='del'>-#include &lt;media/ir-kbd-i2c.h&gt;</div><div class='del'>-</div><div class='ctx'> #define CX18_REG_I2C_1_WR   0xf15000</div><div class='ctx'> #define CX18_REG_I2C_1_RD   0xf15008</div><div class='ctx'> #define CX18_REG_I2C_2_WR   0xf25100</div><div class='hunk'>@@ -158,12 +157,12 @@ static void cx18_setscl(void *data, int state)</div><div class='ctx'> 	struct cx18 *cx = ((struct cx18_i2c_algo_callback_data *)data)-&gt;cx;</div><div class='ctx'> 	int bus_index = ((struct cx18_i2c_algo_callback_data *)data)-&gt;bus_index;</div><div class='ctx'> 	u32 addr = bus_index ? CX18_REG_I2C_2_WR : CX18_REG_I2C_1_WR;</div><div class='del'>-	u32 r = read_reg(addr);</div><div class='add'>+	u32 r = cx18_read_reg(cx, addr);</div><div class='ctx'> </div><div class='ctx'> 	if (state)</div><div class='del'>-		write_reg_sync(r | SETSCL_BIT, addr);</div><div class='add'>+		cx18_write_reg_sync(cx, r | SETSCL_BIT, addr);</div><div class='ctx'> 	else</div><div class='del'>-		write_reg_sync(r &amp; ~SETSCL_BIT, addr);</div><div class='add'>+		cx18_write_reg_sync(cx, r &amp; ~SETSCL_BIT, addr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void cx18_setsda(void *data, int state)</div><div class='hunk'>@@ -171,12 +170,12 @@ static void cx18_setsda(void *data, int state)</div><div class='ctx'> 	struct cx18 *cx = ((struct cx18_i2c_algo_callback_data *)data)-&gt;cx;</div><div class='ctx'> 	int bus_index = ((struct cx18_i2c_algo_callback_data *)data)-&gt;bus_index;</div><div class='ctx'> 	u32 addr = bus_index ? CX18_REG_I2C_2_WR : CX18_REG_I2C_1_WR;</div><div class='del'>-	u32 r = read_reg(addr);</div><div class='add'>+	u32 r = cx18_read_reg(cx, addr);</div><div class='ctx'> </div><div class='ctx'> 	if (state)</div><div class='del'>-		write_reg_sync(r | SETSDL_BIT, addr);</div><div class='add'>+		cx18_write_reg_sync(cx, r | SETSDL_BIT, addr);</div><div class='ctx'> 	else</div><div class='del'>-		write_reg_sync(r &amp; ~SETSDL_BIT, addr);</div><div class='add'>+		cx18_write_reg_sync(cx, r &amp; ~SETSDL_BIT, addr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int cx18_getscl(void *data)</div><div class='hunk'>@@ -185,7 +184,7 @@ static int cx18_getscl(void *data)</div><div class='ctx'> 	int bus_index = ((struct cx18_i2c_algo_callback_data *)data)-&gt;bus_index;</div><div class='ctx'> 	u32 addr = bus_index ? CX18_REG_I2C_2_RD : CX18_REG_I2C_1_RD;</div><div class='ctx'> </div><div class='del'>-	return read_reg(addr) &amp; GETSCL_BIT;</div><div class='add'>+	return cx18_read_reg(cx, addr) &amp; GETSCL_BIT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int cx18_getsda(void *data)</div><div class='hunk'>@@ -194,7 +193,7 @@ static int cx18_getsda(void *data)</div><div class='ctx'> 	int bus_index = ((struct cx18_i2c_algo_callback_data *)data)-&gt;bus_index;</div><div class='ctx'> 	u32 addr = bus_index ? CX18_REG_I2C_2_RD : CX18_REG_I2C_1_RD;</div><div class='ctx'> </div><div class='del'>-	return read_reg(addr) &amp; GETSDL_BIT;</div><div class='add'>+	return cx18_read_reg(cx, addr) &amp; GETSDL_BIT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* template for i2c-bit-algo */</div><div class='hunk'>@@ -394,29 +393,33 @@ int init_cx18_i2c(struct cx18 *cx)</div><div class='ctx'> 		cx-&gt;i2c_adap[i].dev.parent = &amp;cx-&gt;dev-&gt;dev;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (read_reg(CX18_REG_I2C_2_WR) != 0x0003c02f) {</div><div class='add'>+	if (cx18_read_reg(cx, CX18_REG_I2C_2_WR) != 0x0003c02f) {</div><div class='ctx'> 		/* Reset/Unreset I2C hardware block */</div><div class='del'>-		write_reg(0x10000000, 0xc71004); /* Clock select 220MHz */</div><div class='del'>-		write_reg_sync(0x10001000, 0xc71024); /* Clock Enable */</div><div class='add'>+		/* Clock select 220MHz */</div><div class='add'>+		cx18_write_reg(cx, 0x10000000, 0xc71004);</div><div class='add'>+		/* Clock Enable */</div><div class='add'>+		cx18_write_reg_sync(cx, 0x10001000, 0xc71024);</div><div class='ctx'> 	}</div><div class='ctx'> 	/* courtesy of Steven Toth &lt;stoth@hauppauge.com&gt; */</div><div class='del'>-	write_reg_sync(0x00c00000, 0xc7001c);</div><div class='add'>+	cx18_write_reg_sync(cx, 0x00c00000, 0xc7001c);</div><div class='ctx'> 	mdelay(10);</div><div class='del'>-	write_reg_sync(0x00c000c0, 0xc7001c);</div><div class='add'>+	cx18_write_reg_sync(cx, 0x00c000c0, 0xc7001c);</div><div class='ctx'> 	mdelay(10);</div><div class='del'>-	write_reg_sync(0x00c00000, 0xc7001c);</div><div class='add'>+	cx18_write_reg_sync(cx, 0x00c00000, 0xc7001c);</div><div class='ctx'> 	mdelay(10);</div><div class='ctx'> </div><div class='del'>-	write_reg_sync(0x00c00000, 0xc730c8); /* Set to edge-triggered intrs. */</div><div class='del'>-	write_reg_sync(0x00c00000, 0xc730c4); /* Clear any stale intrs */</div><div class='add'>+	/* Set to edge-triggered intrs. */</div><div class='add'>+	cx18_write_reg_sync(cx, 0x00c00000, 0xc730c8);</div><div class='add'>+	/* Clear any stale intrs */</div><div class='add'>+	cx18_write_reg_sync(cx, 0x00c00000, 0xc730c4);</div><div class='ctx'> </div><div class='ctx'> 	/* Hw I2C1 Clock Freq ~100kHz */</div><div class='del'>-	write_reg_sync(0x00021c0f &amp; ~4, CX18_REG_I2C_1_WR);</div><div class='add'>+	cx18_write_reg_sync(cx, 0x00021c0f &amp; ~4, CX18_REG_I2C_1_WR);</div><div class='ctx'> 	cx18_setscl(&amp;cx-&gt;i2c_algo_cb_data[0], 1);</div><div class='ctx'> 	cx18_setsda(&amp;cx-&gt;i2c_algo_cb_data[0], 1);</div><div class='ctx'> </div><div class='ctx'> 	/* Hw I2C2 Clock Freq ~100kHz */</div><div class='del'>-	write_reg_sync(0x00021c0f &amp; ~4, CX18_REG_I2C_2_WR);</div><div class='add'>+	cx18_write_reg_sync(cx, 0x00021c0f &amp; ~4, CX18_REG_I2C_2_WR);</div><div class='ctx'> 	cx18_setscl(&amp;cx-&gt;i2c_algo_cb_data[1], 1);</div><div class='ctx'> 	cx18_setsda(&amp;cx-&gt;i2c_algo_cb_data[1], 1);</div><div class='ctx'> </div><div class='hunk'>@@ -430,8 +433,10 @@ void exit_cx18_i2c(struct cx18 *cx)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	CX18_DEBUG_I2C("i2c exit\n");</div><div class='del'>-	write_reg(read_reg(CX18_REG_I2C_1_WR) | 4, CX18_REG_I2C_1_WR);</div><div class='del'>-	write_reg(read_reg(CX18_REG_I2C_2_WR) | 4, CX18_REG_I2C_2_WR);</div><div class='add'>+	cx18_write_reg(cx, cx18_read_reg(cx, CX18_REG_I2C_1_WR) | 4,</div><div class='add'>+							CX18_REG_I2C_1_WR);</div><div class='add'>+	cx18_write_reg(cx, cx18_read_reg(cx, CX18_REG_I2C_2_WR) | 4,</div><div class='add'>+							CX18_REG_I2C_2_WR);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 2; i++) {</div><div class='ctx'> 		i2c_del_adapter(&amp;cx-&gt;i2c_adap[i]);</div><div class='head'>diff --git a/drivers/media/video/cx18/cx18-io.c b/drivers/media/video/cx18/cx18-io.c<br/>new file mode 100644<br/>index 000000000000..700ab9439c16<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx18/cx18-io.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx18/cx18-io.c</a></div><div class='hunk'>@@ -0,0 +1,254 @@</div><div class='add'>+/*</div><div class='add'>+ *  cx18 driver PCI memory mapped IO access routines</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2007  Hans Verkuil &lt;hverkuil@xs4all.nl&gt;</div><div class='add'>+ *  Copyright (C) 2008  Andy Walls &lt;awalls@radix.net&gt;</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ *  (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA</div><div class='add'>+ *  02111-1307  USA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "cx18-driver.h"</div><div class='add'>+#include "cx18-io.h"</div><div class='add'>+#include "cx18-irq.h"</div><div class='add'>+</div><div class='add'>+void cx18_log_statistics(struct cx18 *cx)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!(cx18_debug &amp; CX18_DBGFLG_INFO))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt;= CX18_MAX_MMIO_RETRIES; i++)</div><div class='add'>+		CX18_DEBUG_INFO("retried_write[%d] = %d\n", i,</div><div class='add'>+				atomic_read(&amp;cx-&gt;mmio_stats.retried_write[i]));</div><div class='add'>+	for (i = 0; i &lt;= CX18_MAX_MMIO_RETRIES; i++)</div><div class='add'>+		CX18_DEBUG_INFO("retried_read[%d] = %d\n", i,</div><div class='add'>+				atomic_read(&amp;cx-&gt;mmio_stats.retried_read[i]));</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void cx18_raw_writel_retry(struct cx18 *cx, u32 val, void __iomem *addr)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	for (i = 0; i &lt; CX18_MAX_MMIO_RETRIES; i++) {</div><div class='add'>+		cx18_raw_writel_noretry(cx, val, addr);</div><div class='add'>+		if (val == cx18_raw_readl_noretry(cx, addr))</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	cx18_log_write_retries(cx, i, addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 cx18_raw_readl_retry(struct cx18 *cx, const void __iomem *addr)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	u32 val;</div><div class='add'>+	for (i = 0; i &lt; CX18_MAX_MMIO_RETRIES; i++) {</div><div class='add'>+		val = cx18_raw_readl_noretry(cx, addr);</div><div class='add'>+		if (val != 0xffffffff) /* PCI bus read error */</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	cx18_log_read_retries(cx, i, addr);</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u16 cx18_raw_readw_retry(struct cx18 *cx, const void __iomem *addr)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	u16 val;</div><div class='add'>+	for (i = 0; i &lt; CX18_MAX_MMIO_RETRIES; i++) {</div><div class='add'>+		val = cx18_raw_readw_noretry(cx, addr);</div><div class='add'>+		if (val != 0xffff) /* PCI bus read error */</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	cx18_log_read_retries(cx, i, addr);</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void cx18_writel_retry(struct cx18 *cx, u32 val, void __iomem *addr)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	for (i = 0; i &lt; CX18_MAX_MMIO_RETRIES; i++) {</div><div class='add'>+		cx18_writel_noretry(cx, val, addr);</div><div class='add'>+		if (val == cx18_readl_noretry(cx, addr))</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	cx18_log_write_retries(cx, i, addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void cx18_writew_retry(struct cx18 *cx, u16 val, void __iomem *addr)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	for (i = 0; i &lt; CX18_MAX_MMIO_RETRIES; i++) {</div><div class='add'>+		cx18_writew_noretry(cx, val, addr);</div><div class='add'>+		if (val == cx18_readw_noretry(cx, addr))</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	cx18_log_write_retries(cx, i, addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void cx18_writeb_retry(struct cx18 *cx, u8 val, void __iomem *addr)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	for (i = 0; i &lt; CX18_MAX_MMIO_RETRIES; i++) {</div><div class='add'>+		cx18_writeb_noretry(cx, val, addr);</div><div class='add'>+		if (val == cx18_readb_noretry(cx, addr))</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	cx18_log_write_retries(cx, i, addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 cx18_readl_retry(struct cx18 *cx, const void __iomem *addr)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	u32 val;</div><div class='add'>+	for (i = 0; i &lt; CX18_MAX_MMIO_RETRIES; i++) {</div><div class='add'>+		val = cx18_readl_noretry(cx, addr);</div><div class='add'>+		if (val != 0xffffffff) /* PCI bus read error */</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	cx18_log_read_retries(cx, i, addr);</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u16 cx18_readw_retry(struct cx18 *cx, const void __iomem *addr)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	u16 val;</div><div class='add'>+	for (i = 0; i &lt; CX18_MAX_MMIO_RETRIES; i++) {</div><div class='add'>+		val = cx18_readw_noretry(cx, addr);</div><div class='add'>+		if (val != 0xffff) /* PCI bus read error */</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	cx18_log_read_retries(cx, i, addr);</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u8 cx18_readb_retry(struct cx18 *cx, const void __iomem *addr)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	u8 val;</div><div class='add'>+	for (i = 0; i &lt; CX18_MAX_MMIO_RETRIES; i++) {</div><div class='add'>+		val = cx18_readb_noretry(cx, addr);</div><div class='add'>+		if (val != 0xff) /* PCI bus read error */</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	cx18_log_read_retries(cx, i, addr);</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void cx18_memcpy_fromio(struct cx18 *cx, void *to,</div><div class='add'>+			const void __iomem *from, unsigned int len)</div><div class='add'>+{</div><div class='add'>+	const u8 __iomem *src = from;</div><div class='add'>+	u8 *dst = to;</div><div class='add'>+</div><div class='add'>+	/* Align reads on the CX23418's addresses */</div><div class='add'>+	if ((len &gt; 0) &amp;&amp; ((unsigned long) src &amp; 1)) {</div><div class='add'>+		*dst = cx18_readb(cx, src);</div><div class='add'>+		len--;</div><div class='add'>+		dst++;</div><div class='add'>+		src++;</div><div class='add'>+	}</div><div class='add'>+	if ((len &gt; 1) &amp;&amp; ((unsigned long) src &amp; 2)) {</div><div class='add'>+		*((u16 *)dst) = cx18_raw_readw(cx, src);</div><div class='add'>+		len -= 2;</div><div class='add'>+		dst += 2;</div><div class='add'>+		src += 2;</div><div class='add'>+	}</div><div class='add'>+	while (len &gt; 3) {</div><div class='add'>+		*((u32 *)dst) = cx18_raw_readl(cx, src);</div><div class='add'>+		len -= 4;</div><div class='add'>+		dst += 4;</div><div class='add'>+		src += 4;</div><div class='add'>+	}</div><div class='add'>+	if (len &gt; 1) {</div><div class='add'>+		*((u16 *)dst) = cx18_raw_readw(cx, src);</div><div class='add'>+		len -= 2;</div><div class='add'>+		dst += 2;</div><div class='add'>+		src += 2;</div><div class='add'>+	}</div><div class='add'>+	if (len &gt; 0)</div><div class='add'>+		*dst = cx18_readb(cx, src);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void cx18_memset_io(struct cx18 *cx, void __iomem *addr, int val, size_t count)</div><div class='add'>+{</div><div class='add'>+	u8 __iomem *dst = addr;</div><div class='add'>+	u16 val2 = val | (val &lt;&lt; 8);</div><div class='add'>+	u32 val4 = val2 | (val2 &lt;&lt; 16);</div><div class='add'>+</div><div class='add'>+	/* Align writes on the CX23418's addresses */</div><div class='add'>+	if ((count &gt; 0) &amp;&amp; ((unsigned long)dst &amp; 1)) {</div><div class='add'>+		cx18_writeb(cx, (u8) val, dst);</div><div class='add'>+		count--;</div><div class='add'>+		dst++;</div><div class='add'>+	}</div><div class='add'>+	if ((count &gt; 1) &amp;&amp; ((unsigned long)dst &amp; 2)) {</div><div class='add'>+		cx18_writew(cx, val2, dst);</div><div class='add'>+		count -= 2;</div><div class='add'>+		dst += 2;</div><div class='add'>+	}</div><div class='add'>+	while (count &gt; 3) {</div><div class='add'>+		cx18_writel(cx, val4, dst);</div><div class='add'>+		count -= 4;</div><div class='add'>+		dst += 4;</div><div class='add'>+	}</div><div class='add'>+	if (count &gt; 1) {</div><div class='add'>+		cx18_writew(cx, val2, dst);</div><div class='add'>+		count -= 2;</div><div class='add'>+		dst += 2;</div><div class='add'>+	}</div><div class='add'>+	if (count &gt; 0)</div><div class='add'>+		cx18_writeb(cx, (u8) val, dst);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void cx18_sw1_irq_enable(struct cx18 *cx, u32 val)</div><div class='add'>+{</div><div class='add'>+	u32 r;</div><div class='add'>+	cx18_write_reg(cx, val, SW1_INT_STATUS);</div><div class='add'>+	r = cx18_read_reg(cx, SW1_INT_ENABLE_PCI);</div><div class='add'>+	cx18_write_reg(cx, r | val, SW1_INT_ENABLE_PCI);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void cx18_sw1_irq_disable(struct cx18 *cx, u32 val)</div><div class='add'>+{</div><div class='add'>+	u32 r;</div><div class='add'>+	r = cx18_read_reg(cx, SW1_INT_ENABLE_PCI);</div><div class='add'>+	cx18_write_reg(cx, r &amp; ~val, SW1_INT_ENABLE_PCI);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void cx18_sw2_irq_enable(struct cx18 *cx, u32 val)</div><div class='add'>+{</div><div class='add'>+	u32 r;</div><div class='add'>+	cx18_write_reg(cx, val, SW2_INT_STATUS);</div><div class='add'>+	r = cx18_read_reg(cx, SW2_INT_ENABLE_PCI);</div><div class='add'>+	cx18_write_reg(cx, r | val, SW2_INT_ENABLE_PCI);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void cx18_sw2_irq_disable(struct cx18 *cx, u32 val)</div><div class='add'>+{</div><div class='add'>+	u32 r;</div><div class='add'>+	r = cx18_read_reg(cx, SW2_INT_ENABLE_PCI);</div><div class='add'>+	cx18_write_reg(cx, r &amp; ~val, SW2_INT_ENABLE_PCI);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void cx18_setup_page(struct cx18 *cx, u32 addr)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+	val = cx18_read_reg(cx, 0xD000F8);</div><div class='add'>+	val = (val &amp; ~0x1f00) | ((addr &gt;&gt; 17) &amp; 0x1f00);</div><div class='add'>+	cx18_write_reg(cx, val, 0xD000F8);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/media/video/cx18/cx18-io.h b/drivers/media/video/cx18/cx18-io.h<br/>new file mode 100644<br/>index 000000000000..197d4fbd9f95<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx18/cx18-io.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx18/cx18-io.h</a></div><div class='hunk'>@@ -0,0 +1,378 @@</div><div class='add'>+/*</div><div class='add'>+ *  cx18 driver PCI memory mapped IO access routines</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2007  Hans Verkuil &lt;hverkuil@xs4all.nl&gt;</div><div class='add'>+ *  Copyright (C) 2008  Andy Walls &lt;awalls@radix.net&gt;</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ *  (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA</div><div class='add'>+ *  02111-1307  USA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef CX18_IO_H</div><div class='add'>+#define CX18_IO_H</div><div class='add'>+</div><div class='add'>+#include "cx18-driver.h"</div><div class='add'>+</div><div class='add'>+static inline void cx18_io_delay(struct cx18 *cx)</div><div class='add'>+{</div><div class='add'>+	if (cx-&gt;options.mmio_ndelay)</div><div class='add'>+		ndelay(cx-&gt;options.mmio_ndelay);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Readback and retry of MMIO access for reliability:</div><div class='add'>+ * The concept was suggested by Steve Toth &lt;stoth@linuxtv.org&gt;.</div><div class='add'>+ * The implmentation is the fault of Andy Walls &lt;awalls@radix.net&gt;.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* Statistics gathering */</div><div class='add'>+static inline</div><div class='add'>+void cx18_log_write_retries(struct cx18 *cx, int i, const void *addr)</div><div class='add'>+{</div><div class='add'>+	if (i &gt; CX18_MAX_MMIO_RETRIES)</div><div class='add'>+		i = CX18_MAX_MMIO_RETRIES;</div><div class='add'>+	atomic_inc(&amp;cx-&gt;mmio_stats.retried_write[i]);</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline</div><div class='add'>+void cx18_log_read_retries(struct cx18 *cx, int i, const void *addr)</div><div class='add'>+{</div><div class='add'>+	if (i &gt; CX18_MAX_MMIO_RETRIES)</div><div class='add'>+		i = CX18_MAX_MMIO_RETRIES;</div><div class='add'>+	atomic_inc(&amp;cx-&gt;mmio_stats.retried_read[i]);</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void cx18_log_statistics(struct cx18 *cx);</div><div class='add'>+</div><div class='add'>+/* Non byteswapping memory mapped IO */</div><div class='add'>+static inline</div><div class='add'>+void cx18_raw_writel_noretry(struct cx18 *cx, u32 val, void __iomem *addr)</div><div class='add'>+{</div><div class='add'>+	__raw_writel(val, addr);</div><div class='add'>+	cx18_io_delay(cx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void cx18_raw_writel_retry(struct cx18 *cx, u32 val, void __iomem *addr);</div><div class='add'>+</div><div class='add'>+static inline void cx18_raw_writel(struct cx18 *cx, u32 val, void __iomem *addr)</div><div class='add'>+{</div><div class='add'>+	if (cx18_retry_mmio)</div><div class='add'>+		cx18_raw_writel_retry(cx, val, addr);</div><div class='add'>+	else</div><div class='add'>+		cx18_raw_writel_noretry(cx, val, addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static inline</div><div class='add'>+u32 cx18_raw_readl_noretry(struct cx18 *cx, const void __iomem *addr)</div><div class='add'>+{</div><div class='add'>+	u32 ret = __raw_readl(addr);</div><div class='add'>+	cx18_io_delay(cx);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 cx18_raw_readl_retry(struct cx18 *cx, const void __iomem *addr);</div><div class='add'>+</div><div class='add'>+static inline u32 cx18_raw_readl(struct cx18 *cx, const void __iomem *addr)</div><div class='add'>+{</div><div class='add'>+	if (cx18_retry_mmio)</div><div class='add'>+		return cx18_raw_readl_retry(cx, addr);</div><div class='add'>+</div><div class='add'>+	return cx18_raw_readl_noretry(cx, addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static inline</div><div class='add'>+u16 cx18_raw_readw_noretry(struct cx18 *cx, const void __iomem *addr)</div><div class='add'>+{</div><div class='add'>+	u16 ret = __raw_readw(addr);</div><div class='add'>+	cx18_io_delay(cx);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u16 cx18_raw_readw_retry(struct cx18 *cx, const void __iomem *addr);</div><div class='add'>+</div><div class='add'>+static inline u16 cx18_raw_readw(struct cx18 *cx, const void __iomem *addr)</div><div class='add'>+{</div><div class='add'>+	if (cx18_retry_mmio)</div><div class='add'>+		return cx18_raw_readw_retry(cx, addr);</div><div class='add'>+</div><div class='add'>+	return cx18_raw_readw_noretry(cx, addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Normal memory mapped IO */</div><div class='add'>+static inline</div><div class='add'>+void cx18_writel_noretry(struct cx18 *cx, u32 val, void __iomem *addr)</div><div class='add'>+{</div><div class='add'>+	writel(val, addr);</div><div class='add'>+	cx18_io_delay(cx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void cx18_writel_retry(struct cx18 *cx, u32 val, void __iomem *addr);</div><div class='add'>+</div><div class='add'>+static inline void cx18_writel(struct cx18 *cx, u32 val, void __iomem *addr)</div><div class='add'>+{</div><div class='add'>+	if (cx18_retry_mmio)</div><div class='add'>+		cx18_writel_retry(cx, val, addr);</div><div class='add'>+	else</div><div class='add'>+		cx18_writel_noretry(cx, val, addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static inline</div><div class='add'>+void cx18_writew_noretry(struct cx18 *cx, u16 val, void __iomem *addr)</div><div class='add'>+{</div><div class='add'>+	writew(val, addr);</div><div class='add'>+	cx18_io_delay(cx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void cx18_writew_retry(struct cx18 *cx, u16 val, void __iomem *addr);</div><div class='add'>+</div><div class='add'>+static inline void cx18_writew(struct cx18 *cx, u16 val, void __iomem *addr)</div><div class='add'>+{</div><div class='add'>+	if (cx18_retry_mmio)</div><div class='add'>+		cx18_writew_retry(cx, val, addr);</div><div class='add'>+	else</div><div class='add'>+		cx18_writew_noretry(cx, val, addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static inline</div><div class='add'>+void cx18_writeb_noretry(struct cx18 *cx, u8 val, void __iomem *addr)</div><div class='add'>+{</div><div class='add'>+	writeb(val, addr);</div><div class='add'>+	cx18_io_delay(cx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void cx18_writeb_retry(struct cx18 *cx, u8 val, void __iomem *addr);</div><div class='add'>+</div><div class='add'>+static inline void cx18_writeb(struct cx18 *cx, u8 val, void __iomem *addr)</div><div class='add'>+{</div><div class='add'>+	if (cx18_retry_mmio)</div><div class='add'>+		cx18_writeb_retry(cx, val, addr);</div><div class='add'>+	else</div><div class='add'>+		cx18_writeb_noretry(cx, val, addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static inline u32 cx18_readl_noretry(struct cx18 *cx, const void __iomem *addr)</div><div class='add'>+{</div><div class='add'>+	u32 ret = readl(addr);</div><div class='add'>+	cx18_io_delay(cx);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 cx18_readl_retry(struct cx18 *cx, const void __iomem *addr);</div><div class='add'>+</div><div class='add'>+static inline u32 cx18_readl(struct cx18 *cx, const void __iomem *addr)</div><div class='add'>+{</div><div class='add'>+	if (cx18_retry_mmio)</div><div class='add'>+		return cx18_readl_retry(cx, addr);</div><div class='add'>+</div><div class='add'>+	return cx18_readl_noretry(cx, addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static inline u16 cx18_readw_noretry(struct cx18 *cx, const void __iomem *addr)</div><div class='add'>+{</div><div class='add'>+	u16 ret = readw(addr);</div><div class='add'>+	cx18_io_delay(cx);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u16 cx18_readw_retry(struct cx18 *cx, const void __iomem *addr);</div><div class='add'>+</div><div class='add'>+static inline u16 cx18_readw(struct cx18 *cx, const void __iomem *addr)</div><div class='add'>+{</div><div class='add'>+	if (cx18_retry_mmio)</div><div class='add'>+		return cx18_readw_retry(cx, addr);</div><div class='add'>+</div><div class='add'>+	return cx18_readw_noretry(cx, addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static inline u8 cx18_readb_noretry(struct cx18 *cx, const void __iomem *addr)</div><div class='add'>+{</div><div class='add'>+	u8 ret = readb(addr);</div><div class='add'>+	cx18_io_delay(cx);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u8 cx18_readb_retry(struct cx18 *cx, const void __iomem *addr);</div><div class='add'>+</div><div class='add'>+static inline u8 cx18_readb(struct cx18 *cx, const void __iomem *addr)</div><div class='add'>+{</div><div class='add'>+	if (cx18_retry_mmio)</div><div class='add'>+		return cx18_readb_retry(cx, addr);</div><div class='add'>+</div><div class='add'>+	return cx18_readb_noretry(cx, addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static inline</div><div class='add'>+u32 cx18_write_sync_noretry(struct cx18 *cx, u32 val, void __iomem *addr)</div><div class='add'>+{</div><div class='add'>+	cx18_writel_noretry(cx, val, addr);</div><div class='add'>+	return cx18_readl_noretry(cx, addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline</div><div class='add'>+u32 cx18_write_sync_retry(struct cx18 *cx, u32 val, void __iomem *addr)</div><div class='add'>+{</div><div class='add'>+	cx18_writel_retry(cx, val, addr);</div><div class='add'>+	return cx18_readl_retry(cx, addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32 cx18_write_sync(struct cx18 *cx, u32 val, void __iomem *addr)</div><div class='add'>+{</div><div class='add'>+	if (cx18_retry_mmio)</div><div class='add'>+		return cx18_write_sync_retry(cx, val, addr);</div><div class='add'>+</div><div class='add'>+	return cx18_write_sync_noretry(cx, val, addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+void cx18_memcpy_fromio(struct cx18 *cx, void *to,</div><div class='add'>+			const void __iomem *from, unsigned int len);</div><div class='add'>+void cx18_memset_io(struct cx18 *cx, void __iomem *addr, int val, size_t count);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Access "register" region of CX23418 memory mapped I/O */</div><div class='add'>+static inline void cx18_write_reg_noretry(struct cx18 *cx, u32 val, u32 reg)</div><div class='add'>+{</div><div class='add'>+	cx18_writel_noretry(cx, val, cx-&gt;reg_mem + reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void cx18_write_reg_retry(struct cx18 *cx, u32 val, u32 reg)</div><div class='add'>+{</div><div class='add'>+	cx18_writel_retry(cx, val, cx-&gt;reg_mem + reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void cx18_write_reg(struct cx18 *cx, u32 val, u32 reg)</div><div class='add'>+{</div><div class='add'>+	if (cx18_retry_mmio)</div><div class='add'>+		cx18_write_reg_retry(cx, val, reg);</div><div class='add'>+	else</div><div class='add'>+		cx18_write_reg_noretry(cx, val, reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static inline u32 cx18_read_reg_noretry(struct cx18 *cx, u32 reg)</div><div class='add'>+{</div><div class='add'>+	return cx18_readl_noretry(cx, cx-&gt;reg_mem + reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32 cx18_read_reg_retry(struct cx18 *cx, u32 reg)</div><div class='add'>+{</div><div class='add'>+	return cx18_readl_retry(cx, cx-&gt;reg_mem + reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32 cx18_read_reg(struct cx18 *cx, u32 reg)</div><div class='add'>+{</div><div class='add'>+	if (cx18_retry_mmio)</div><div class='add'>+		return cx18_read_reg_retry(cx, reg);</div><div class='add'>+</div><div class='add'>+	return cx18_read_reg_noretry(cx, reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static inline u32 cx18_write_reg_sync_noretry(struct cx18 *cx, u32 val, u32 reg)</div><div class='add'>+{</div><div class='add'>+	return cx18_write_sync_noretry(cx, val, cx-&gt;reg_mem + reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32 cx18_write_reg_sync_retry(struct cx18 *cx, u32 val, u32 reg)</div><div class='add'>+{</div><div class='add'>+	return cx18_write_sync_retry(cx, val, cx-&gt;reg_mem + reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32 cx18_write_reg_sync(struct cx18 *cx, u32 val, u32 reg)</div><div class='add'>+{</div><div class='add'>+	if (cx18_retry_mmio)</div><div class='add'>+		return cx18_write_reg_sync_retry(cx, val, reg);</div><div class='add'>+</div><div class='add'>+	return cx18_write_reg_sync_noretry(cx, val, reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Access "encoder memory" region of CX23418 memory mapped I/O */</div><div class='add'>+static inline void cx18_write_enc_noretry(struct cx18 *cx, u32 val, u32 addr)</div><div class='add'>+{</div><div class='add'>+	cx18_writel_noretry(cx, val, cx-&gt;enc_mem + addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void cx18_write_enc_retry(struct cx18 *cx, u32 val, u32 addr)</div><div class='add'>+{</div><div class='add'>+	cx18_writel_retry(cx, val, cx-&gt;enc_mem + addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void cx18_write_enc(struct cx18 *cx, u32 val, u32 addr)</div><div class='add'>+{</div><div class='add'>+	if (cx18_retry_mmio)</div><div class='add'>+		cx18_write_enc_retry(cx, val, addr);</div><div class='add'>+	else</div><div class='add'>+		cx18_write_enc_noretry(cx, val, addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static inline u32 cx18_read_enc_noretry(struct cx18 *cx, u32 addr)</div><div class='add'>+{</div><div class='add'>+	return cx18_readl_noretry(cx, cx-&gt;enc_mem + addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32 cx18_read_enc_retry(struct cx18 *cx, u32 addr)</div><div class='add'>+{</div><div class='add'>+	return cx18_readl_retry(cx, cx-&gt;enc_mem + addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32 cx18_read_enc(struct cx18 *cx, u32 addr)</div><div class='add'>+{</div><div class='add'>+	if (cx18_retry_mmio)</div><div class='add'>+		return cx18_read_enc_retry(cx, addr);</div><div class='add'>+</div><div class='add'>+	return cx18_read_enc_noretry(cx, addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline</div><div class='add'>+u32 cx18_write_enc_sync_noretry(struct cx18 *cx, u32 val, u32 addr)</div><div class='add'>+{</div><div class='add'>+	return cx18_write_sync_noretry(cx, val, cx-&gt;enc_mem + addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline</div><div class='add'>+u32 cx18_write_enc_sync_retry(struct cx18 *cx, u32 val, u32 addr)</div><div class='add'>+{</div><div class='add'>+	return cx18_write_sync_retry(cx, val, cx-&gt;enc_mem + addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline</div><div class='add'>+u32 cx18_write_enc_sync(struct cx18 *cx, u32 val, u32 addr)</div><div class='add'>+{</div><div class='add'>+	if (cx18_retry_mmio)</div><div class='add'>+		return cx18_write_enc_sync_retry(cx, val, addr);</div><div class='add'>+</div><div class='add'>+	return cx18_write_enc_sync_noretry(cx, val, addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void cx18_sw1_irq_enable(struct cx18 *cx, u32 val);</div><div class='add'>+void cx18_sw1_irq_disable(struct cx18 *cx, u32 val);</div><div class='add'>+void cx18_sw2_irq_enable(struct cx18 *cx, u32 val);</div><div class='add'>+void cx18_sw2_irq_disable(struct cx18 *cx, u32 val);</div><div class='add'>+void cx18_setup_page(struct cx18 *cx, u32 addr);</div><div class='add'>+</div><div class='add'>+#endif /* CX18_IO_H */</div><div class='head'>diff --git a/drivers/media/video/cx18/cx18-ioctl.c b/drivers/media/video/cx18/cx18-ioctl.c<br/>index a7f839631d6a..f0ca50f5fdde 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx18/cx18-ioctl.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/cx18/cx18-ioctl.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx18/cx18-ioctl.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx18/cx18-ioctl.c</a></div><div class='hunk'>@@ -22,6 +22,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "cx18-driver.h"</div><div class='add'>+#include "cx18-io.h"</div><div class='ctx'> #include "cx18-version.h"</div><div class='ctx'> #include "cx18-mailbox.h"</div><div class='ctx'> #include "cx18-i2c.h"</div><div class='hunk'>@@ -170,7 +171,6 @@ static int cx18_try_fmt_vid_cap(struct file *file, void *fh,</div><div class='ctx'> {</div><div class='ctx'> 	struct cx18_open_id *id = fh;</div><div class='ctx'> 	struct cx18 *cx = id-&gt;cx;</div><div class='del'>-</div><div class='ctx'> 	int w = fmt-&gt;fmt.pix.width;</div><div class='ctx'> 	int h = fmt-&gt;fmt.pix.height;</div><div class='ctx'> </div><div class='hunk'>@@ -202,8 +202,7 @@ static int cx18_s_fmt_vid_cap(struct file *file, void *fh,</div><div class='ctx'> 	struct cx18_open_id *id = fh;</div><div class='ctx'> 	struct cx18 *cx = id-&gt;cx;</div><div class='ctx'> 	int ret;</div><div class='del'>-	int w = fmt-&gt;fmt.pix.width;</div><div class='del'>-	int h = fmt-&gt;fmt.pix.height;</div><div class='add'>+	int w, h;</div><div class='ctx'> </div><div class='ctx'> 	ret = v4l2_prio_check(&amp;cx-&gt;prio, &amp;id-&gt;prio);</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -212,6 +211,8 @@ static int cx18_s_fmt_vid_cap(struct file *file, void *fh,</div><div class='ctx'> 	ret = cx18_try_fmt_vid_cap(file, fh, fmt);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='add'>+	w = fmt-&gt;fmt.pix.width;</div><div class='add'>+	h = fmt-&gt;fmt.pix.height;</div><div class='ctx'> </div><div class='ctx'> 	if (cx-&gt;params.width == w &amp;&amp; cx-&gt;params.height == h)</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -286,9 +287,9 @@ static int cx18_cxc(struct cx18 *cx, unsigned int cmd, void *arg)</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;cx18_cards_lock, flags);</div><div class='ctx'> 	if (cmd == VIDIOC_DBG_G_REGISTER)</div><div class='del'>-		regs-&gt;val = read_enc(regs-&gt;reg);</div><div class='add'>+		regs-&gt;val = cx18_read_enc(cx, regs-&gt;reg);</div><div class='ctx'> 	else</div><div class='del'>-		write_enc(regs-&gt;val, regs-&gt;reg);</div><div class='add'>+		cx18_write_enc(cx, regs-&gt;val, regs-&gt;reg);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;cx18_cards_lock, flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -345,7 +346,7 @@ static int cx18_querycap(struct file *file, void *fh,</div><div class='ctx'> </div><div class='ctx'> 	strlcpy(vcap-&gt;driver, CX18_DRIVER_NAME, sizeof(vcap-&gt;driver));</div><div class='ctx'> 	strlcpy(vcap-&gt;card, cx-&gt;card_name, sizeof(vcap-&gt;card));</div><div class='del'>-	strlcpy(vcap-&gt;bus_info, pci_name(cx-&gt;dev), sizeof(vcap-&gt;bus_info));</div><div class='add'>+	snprintf(vcap-&gt;bus_info, sizeof(vcap-&gt;bus_info), "PCI:%s", pci_name(cx-&gt;dev));</div><div class='ctx'> 	vcap-&gt;version = CX18_DRIVER_VERSION; 	    /* version */</div><div class='ctx'> 	vcap-&gt;capabilities = cx-&gt;v4l2_cap; 	    /* capabilities */</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -622,6 +623,7 @@ static int cx18_encoder_cmd(struct file *file, void *fh,</div><div class='ctx'> {</div><div class='ctx'> 	struct cx18_open_id *id = fh;</div><div class='ctx'> 	struct cx18 *cx = id-&gt;cx;</div><div class='add'>+	u32 h;</div><div class='ctx'> </div><div class='ctx'> 	switch (enc-&gt;cmd) {</div><div class='ctx'> 	case V4L2_ENC_CMD_START:</div><div class='hunk'>@@ -643,8 +645,14 @@ static int cx18_encoder_cmd(struct file *file, void *fh,</div><div class='ctx'> 			return -EPERM;</div><div class='ctx'> 		if (test_and_set_bit(CX18_F_I_ENC_PAUSED, &amp;cx-&gt;i_flags))</div><div class='ctx'> 			return 0;</div><div class='add'>+		h = cx18_find_handle(cx);</div><div class='add'>+		if (h == CX18_INVALID_TASK_HANDLE) {</div><div class='add'>+			CX18_ERR("Can't find valid task handle for "</div><div class='add'>+				 "V4L2_ENC_CMD_PAUSE\n");</div><div class='add'>+			return -EBADFD;</div><div class='add'>+		}</div><div class='ctx'> 		cx18_mute(cx);</div><div class='del'>-		cx18_vapi(cx, CX18_CPU_CAPTURE_PAUSE, 1, cx18_find_handle(cx));</div><div class='add'>+		cx18_vapi(cx, CX18_CPU_CAPTURE_PAUSE, 1, h);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case V4L2_ENC_CMD_RESUME:</div><div class='hunk'>@@ -654,7 +662,13 @@ static int cx18_encoder_cmd(struct file *file, void *fh,</div><div class='ctx'> 			return -EPERM;</div><div class='ctx'> 		if (!test_and_clear_bit(CX18_F_I_ENC_PAUSED, &amp;cx-&gt;i_flags))</div><div class='ctx'> 			return 0;</div><div class='del'>-		cx18_vapi(cx, CX18_CPU_CAPTURE_RESUME, 1, cx18_find_handle(cx));</div><div class='add'>+		h = cx18_find_handle(cx);</div><div class='add'>+		if (h == CX18_INVALID_TASK_HANDLE) {</div><div class='add'>+			CX18_ERR("Can't find valid task handle for "</div><div class='add'>+				 "V4L2_ENC_CMD_RESUME\n");</div><div class='add'>+			return -EBADFD;</div><div class='add'>+		}</div><div class='add'>+		cx18_vapi(cx, CX18_CPU_CAPTURE_RESUME, 1, h);</div><div class='ctx'> 		cx18_unmute(cx);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='hunk'>@@ -731,12 +745,14 @@ static int cx18_log_status(struct file *file, void *fh)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		CX18_INFO("Stream %s: status 0x%04lx, %d%% of %d KiB (%d buffers) in use\n",</div><div class='ctx'> 			  s-&gt;name, s-&gt;s_flags,</div><div class='del'>-			  (s-&gt;buffers - s-&gt;q_free.buffers) * 100 / s-&gt;buffers,</div><div class='add'>+			  (s-&gt;buffers - atomic_read(&amp;s-&gt;q_free.buffers))</div><div class='add'>+				* 100 / s-&gt;buffers,</div><div class='ctx'> 			  (s-&gt;buffers * s-&gt;buf_size) / 1024, s-&gt;buffers);</div><div class='ctx'> 	}</div><div class='ctx'> 	CX18_INFO("Read MPEG/VBI: %lld/%lld bytes\n",</div><div class='ctx'> 			(long long)cx-&gt;mpg_data_received,</div><div class='ctx'> 			(long long)cx-&gt;vbi_data_inserted);</div><div class='add'>+	cx18_log_statistics(cx);</div><div class='ctx'> 	CX18_INFO("==================  END STATUS CARD #%d  ==================\n", cx-&gt;num);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/media/video/cx18/cx18-irq.c b/drivers/media/video/cx18/cx18-irq.c<br/>index ab218315c84b..360330f5463f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx18/cx18-irq.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/cx18/cx18-irq.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx18/cx18-irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx18/cx18-irq.c</a></div><div class='hunk'>@@ -20,6 +20,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "cx18-driver.h"</div><div class='add'>+#include "cx18-io.h"</div><div class='ctx'> #include "cx18-firmware.h"</div><div class='ctx'> #include "cx18-fileops.h"</div><div class='ctx'> #include "cx18-queue.h"</div><div class='hunk'>@@ -48,8 +49,8 @@ static void epu_dma_done(struct cx18 *cx, struct cx18_mailbox *mb)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (i == CX18_MAX_STREAMS) {</div><div class='del'>-		CX18_WARN("DMA done for unknown handle %d for stream %s\n",</div><div class='del'>-			handle, s-&gt;name);</div><div class='add'>+		CX18_WARN("Got DMA done notification for unknown/inactive"</div><div class='add'>+			  " handle %d\n", handle);</div><div class='ctx'> 		mb-&gt;error = CXERR_NOT_OPEN;</div><div class='ctx'> 		mb-&gt;cmd = 0;</div><div class='ctx'> 		cx18_mb_ack(cx, mb);</div><div class='hunk'>@@ -60,8 +61,8 @@ static void epu_dma_done(struct cx18 *cx, struct cx18_mailbox *mb)</div><div class='ctx'> 	if (mb-&gt;args[2] != 1)</div><div class='ctx'> 		CX18_WARN("Ack struct = %d for %s\n",</div><div class='ctx'> 			mb-&gt;args[2], s-&gt;name);</div><div class='del'>-	id = read_enc(off);</div><div class='del'>-	buf = cx18_queue_get_buf_irq(s, id, read_enc(off + 4));</div><div class='add'>+	id = cx18_read_enc(cx, off);</div><div class='add'>+	buf = cx18_queue_get_buf_irq(s, id, cx18_read_enc(cx, off + 4));</div><div class='ctx'> 	CX18_DEBUG_HI_DMA("DMA DONE for %s (buffer %d)\n", s-&gt;name, id);</div><div class='ctx'> 	if (buf) {</div><div class='ctx'> 		cx18_buf_sync_for_cpu(s, buf);</div><div class='hunk'>@@ -81,7 +82,7 @@ static void epu_dma_done(struct cx18 *cx, struct cx18_mailbox *mb)</div><div class='ctx'> 			set_bit(CX18_F_B_NEED_BUF_SWAP, &amp;buf-&gt;b_flags);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		CX18_WARN("Could not find buf %d for stream %s\n",</div><div class='del'>-				read_enc(off), s-&gt;name);</div><div class='add'>+				cx18_read_enc(cx, off), s-&gt;name);</div><div class='ctx'> 	}</div><div class='ctx'> 	mb-&gt;error = 0;</div><div class='ctx'> 	mb-&gt;cmd = 0;</div><div class='hunk'>@@ -97,8 +98,8 @@ static void epu_debug(struct cx18 *cx, struct cx18_mailbox *mb)</div><div class='ctx'> 	char *p;</div><div class='ctx'> </div><div class='ctx'> 	if (mb-&gt;args[1]) {</div><div class='del'>-		setup_page(mb-&gt;args[1]);</div><div class='del'>-		memcpy_fromio(str, cx-&gt;enc_mem + mb-&gt;args[1], 252);</div><div class='add'>+		cx18_setup_page(cx, mb-&gt;args[1]);</div><div class='add'>+		cx18_memcpy_fromio(cx, str, cx-&gt;enc_mem + mb-&gt;args[1], 252);</div><div class='ctx'> 		str[252] = 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	cx18_mb_ack(cx, mb);</div><div class='hunk'>@@ -113,7 +114,7 @@ static void hpu_cmd(struct cx18 *cx, u32 sw1)</div><div class='ctx'> 	struct cx18_mailbox mb;</div><div class='ctx'> </div><div class='ctx'> 	if (sw1 &amp; IRQ_CPU_TO_EPU) {</div><div class='del'>-		memcpy_fromio(&amp;mb, &amp;cx-&gt;scb-&gt;cpu2epu_mb, sizeof(mb));</div><div class='add'>+		cx18_memcpy_fromio(cx, &amp;mb, &amp;cx-&gt;scb-&gt;cpu2epu_mb, sizeof(mb));</div><div class='ctx'> 		mb.error = 0;</div><div class='ctx'> </div><div class='ctx'> 		switch (mb.cmd) {</div><div class='hunk'>@@ -141,16 +142,16 @@ irqreturn_t cx18_irq_handler(int irq, void *dev_id)</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;cx-&gt;dma_reg_lock);</div><div class='ctx'> </div><div class='del'>-	hw2_mask = read_reg(HW2_INT_MASK5_PCI);</div><div class='del'>-	hw2 = read_reg(HW2_INT_CLR_STATUS) &amp; hw2_mask;</div><div class='del'>-	sw2_mask = read_reg(SW2_INT_ENABLE_PCI) | IRQ_EPU_TO_HPU_ACK;</div><div class='del'>-	sw2 = read_reg(SW2_INT_STATUS) &amp; sw2_mask;</div><div class='del'>-	sw1_mask = read_reg(SW1_INT_ENABLE_PCI) | IRQ_EPU_TO_HPU;</div><div class='del'>-	sw1 = read_reg(SW1_INT_STATUS) &amp; sw1_mask;</div><div class='add'>+	hw2_mask = cx18_read_reg(cx, HW2_INT_MASK5_PCI);</div><div class='add'>+	hw2 = cx18_read_reg(cx, HW2_INT_CLR_STATUS) &amp; hw2_mask;</div><div class='add'>+	sw2_mask = cx18_read_reg(cx, SW2_INT_ENABLE_PCI) | IRQ_EPU_TO_HPU_ACK;</div><div class='add'>+	sw2 = cx18_read_reg(cx, SW2_INT_STATUS) &amp; sw2_mask;</div><div class='add'>+	sw1_mask = cx18_read_reg(cx, SW1_INT_ENABLE_PCI) | IRQ_EPU_TO_HPU;</div><div class='add'>+	sw1 = cx18_read_reg(cx, SW1_INT_STATUS) &amp; sw1_mask;</div><div class='ctx'> </div><div class='del'>-	write_reg(sw2&amp;sw2_mask, SW2_INT_STATUS);</div><div class='del'>-	write_reg(sw1&amp;sw1_mask, SW1_INT_STATUS);</div><div class='del'>-	write_reg(hw2&amp;hw2_mask, HW2_INT_CLR_STATUS);</div><div class='add'>+	cx18_write_reg(cx, sw2&amp;sw2_mask, SW2_INT_STATUS);</div><div class='add'>+	cx18_write_reg(cx, sw1&amp;sw1_mask, SW1_INT_STATUS);</div><div class='add'>+	cx18_write_reg(cx, hw2&amp;hw2_mask, HW2_INT_CLR_STATUS);</div><div class='ctx'> </div><div class='ctx'> 	if (sw1 || sw2 || hw2)</div><div class='ctx'> 		CX18_DEBUG_HI_IRQ("SW1: %x  SW2: %x  HW2: %x\n", sw1, sw2, hw2);</div><div class='hunk'>@@ -161,15 +162,15 @@ irqreturn_t cx18_irq_handler(int irq, void *dev_id)</div><div class='ctx'> 	*/</div><div class='ctx'> </div><div class='ctx'> 	if (sw2) {</div><div class='del'>-		if (sw2 &amp; (readl(&amp;cx-&gt;scb-&gt;cpu2hpu_irq_ack) |</div><div class='del'>-			   readl(&amp;cx-&gt;scb-&gt;cpu2epu_irq_ack)))</div><div class='add'>+		if (sw2 &amp; (cx18_readl(cx, &amp;cx-&gt;scb-&gt;cpu2hpu_irq_ack) |</div><div class='add'>+			   cx18_readl(cx, &amp;cx-&gt;scb-&gt;cpu2epu_irq_ack)))</div><div class='ctx'> 			wake_up(&amp;cx-&gt;mb_cpu_waitq);</div><div class='del'>-		if (sw2 &amp; (readl(&amp;cx-&gt;scb-&gt;apu2hpu_irq_ack) |</div><div class='del'>-			   readl(&amp;cx-&gt;scb-&gt;apu2epu_irq_ack)))</div><div class='add'>+		if (sw2 &amp; (cx18_readl(cx, &amp;cx-&gt;scb-&gt;apu2hpu_irq_ack) |</div><div class='add'>+			   cx18_readl(cx, &amp;cx-&gt;scb-&gt;apu2epu_irq_ack)))</div><div class='ctx'> 			wake_up(&amp;cx-&gt;mb_apu_waitq);</div><div class='del'>-		if (sw2 &amp; readl(&amp;cx-&gt;scb-&gt;epu2hpu_irq_ack))</div><div class='add'>+		if (sw2 &amp; cx18_readl(cx, &amp;cx-&gt;scb-&gt;epu2hpu_irq_ack))</div><div class='ctx'> 			wake_up(&amp;cx-&gt;mb_epu_waitq);</div><div class='del'>-		if (sw2 &amp; readl(&amp;cx-&gt;scb-&gt;hpu2epu_irq_ack))</div><div class='add'>+		if (sw2 &amp; cx18_readl(cx, &amp;cx-&gt;scb-&gt;hpu2epu_irq_ack))</div><div class='ctx'> 			wake_up(&amp;cx-&gt;mb_hpu_waitq);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/cx18/cx18-mailbox.c b/drivers/media/video/cx18/cx18-mailbox.c<br/>index 93177514e846..9d18dd22de76 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx18/cx18-mailbox.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/cx18/cx18-mailbox.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx18/cx18-mailbox.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx18/cx18-mailbox.c</a></div><div class='hunk'>@@ -22,6 +22,7 @@</div><div class='ctx'> #include &lt;stdarg.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "cx18-driver.h"</div><div class='add'>+#include "cx18-io.h"</div><div class='ctx'> #include "cx18-scb.h"</div><div class='ctx'> #include "cx18-irq.h"</div><div class='ctx'> #include "cx18-mailbox.h"</div><div class='hunk'>@@ -82,6 +83,7 @@ static const struct cx18_api_info api_info[] = {</div><div class='ctx'> 	API_ENTRY(CPU, CX18_CPU_DE_SET_MDL_ACK,			0),</div><div class='ctx'> 	API_ENTRY(CPU, CX18_CPU_DE_SET_MDL,			API_FAST),</div><div class='ctx'> 	API_ENTRY(CPU, CX18_APU_RESETAI,			API_FAST),</div><div class='add'>+	API_ENTRY(CPU, CX18_CPU_DE_RELEASE_MDL,			0),</div><div class='ctx'> 	API_ENTRY(0, 0,						0),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -105,20 +107,20 @@ static struct cx18_mailbox __iomem *cx18_mb_is_complete(struct cx18 *cx, int rpu</div><div class='ctx'> 	switch (rpu) {</div><div class='ctx'> 	case APU:</div><div class='ctx'> 		mb = &amp;cx-&gt;scb-&gt;epu2apu_mb;</div><div class='del'>-		*state = readl(&amp;cx-&gt;scb-&gt;apu_state);</div><div class='del'>-		*irq = readl(&amp;cx-&gt;scb-&gt;epu2apu_irq);</div><div class='add'>+		*state = cx18_readl(cx, &amp;cx-&gt;scb-&gt;apu_state);</div><div class='add'>+		*irq = cx18_readl(cx, &amp;cx-&gt;scb-&gt;epu2apu_irq);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case CPU:</div><div class='ctx'> 		mb = &amp;cx-&gt;scb-&gt;epu2cpu_mb;</div><div class='del'>-		*state = readl(&amp;cx-&gt;scb-&gt;cpu_state);</div><div class='del'>-		*irq = readl(&amp;cx-&gt;scb-&gt;epu2cpu_irq);</div><div class='add'>+		*state = cx18_readl(cx, &amp;cx-&gt;scb-&gt;cpu_state);</div><div class='add'>+		*irq = cx18_readl(cx, &amp;cx-&gt;scb-&gt;epu2cpu_irq);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case HPU:</div><div class='ctx'> 		mb = &amp;cx-&gt;scb-&gt;epu2hpu_mb;</div><div class='del'>-		*state = readl(&amp;cx-&gt;scb-&gt;hpu_state);</div><div class='del'>-		*irq = readl(&amp;cx-&gt;scb-&gt;epu2hpu_irq);</div><div class='add'>+		*state = cx18_readl(cx, &amp;cx-&gt;scb-&gt;hpu_state);</div><div class='add'>+		*irq = cx18_readl(cx, &amp;cx-&gt;scb-&gt;epu2hpu_irq);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -126,8 +128,8 @@ static struct cx18_mailbox __iomem *cx18_mb_is_complete(struct cx18 *cx, int rpu</div><div class='ctx'> 		return mb;</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='del'>-		*req = readl(&amp;mb-&gt;request);</div><div class='del'>-		ack = readl(&amp;mb-&gt;ack);</div><div class='add'>+		*req = cx18_readl(cx, &amp;mb-&gt;request);</div><div class='add'>+		ack = cx18_readl(cx, &amp;mb-&gt;ack);</div><div class='ctx'> 		wait_count++;</div><div class='ctx'> 	} while (*req != ack &amp;&amp; wait_count &lt; 600);</div><div class='ctx'> </div><div class='hunk'>@@ -172,9 +174,9 @@ long cx18_mb_ack(struct cx18 *cx, const struct cx18_mailbox *mb)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	setup_page(SCB_OFFSET);</div><div class='del'>-	write_sync(mb-&gt;request, &amp;ack_mb-&gt;ack);</div><div class='del'>-	write_reg(ack_irq, SW2_INT_SET);</div><div class='add'>+	cx18_setup_page(cx, SCB_OFFSET);</div><div class='add'>+	cx18_write_sync(cx, mb-&gt;request, &amp;ack_mb-&gt;ack);</div><div class='add'>+	cx18_write_reg(cx, ack_irq, SW2_INT_SET);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -199,7 +201,7 @@ static int cx18_api_call(struct cx18 *cx, u32 cmd, int args, u32 data[])</div><div class='ctx'> 		CX18_DEBUG_HI_API("%s\n", info-&gt;name);</div><div class='ctx'> 	else</div><div class='ctx'> 		CX18_DEBUG_API("%s\n", info-&gt;name);</div><div class='del'>-	setup_page(SCB_OFFSET);</div><div class='add'>+	cx18_setup_page(cx, SCB_OFFSET);</div><div class='ctx'> 	mb = cx18_mb_is_complete(cx, info-&gt;rpu, &amp;state, &amp;irq, &amp;req);</div><div class='ctx'> </div><div class='ctx'> 	if (mb == NULL) {</div><div class='hunk'>@@ -208,11 +210,11 @@ static int cx18_api_call(struct cx18 *cx, u32 cmd, int args, u32 data[])</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	oldreq = req - 1;</div><div class='del'>-	writel(cmd, &amp;mb-&gt;cmd);</div><div class='add'>+	cx18_writel(cx, cmd, &amp;mb-&gt;cmd);</div><div class='ctx'> 	for (i = 0; i &lt; args; i++)</div><div class='del'>-		writel(data[i], &amp;mb-&gt;args[i]);</div><div class='del'>-	writel(0, &amp;mb-&gt;error);</div><div class='del'>-	writel(req, &amp;mb-&gt;request);</div><div class='add'>+		cx18_writel(cx, data[i], &amp;mb-&gt;args[i]);</div><div class='add'>+	cx18_writel(cx, 0, &amp;mb-&gt;error);</div><div class='add'>+	cx18_writel(cx, req, &amp;mb-&gt;request);</div><div class='ctx'> </div><div class='ctx'> 	switch (info-&gt;rpu) {</div><div class='ctx'> 	case APU: waitq = &amp;cx-&gt;mb_apu_waitq; break;</div><div class='hunk'>@@ -223,9 +225,10 @@ static int cx18_api_call(struct cx18 *cx, u32 cmd, int args, u32 data[])</div><div class='ctx'> 	}</div><div class='ctx'> 	if (info-&gt;flags &amp; API_FAST)</div><div class='ctx'> 		timeout /= 2;</div><div class='del'>-	write_reg(irq, SW1_INT_SET);</div><div class='add'>+	cx18_write_reg(cx, irq, SW1_INT_SET);</div><div class='ctx'> </div><div class='del'>-	while (!sig &amp;&amp; readl(&amp;mb-&gt;ack) != readl(&amp;mb-&gt;request) &amp;&amp; cnt &lt; 660) {</div><div class='add'>+	while (!sig &amp;&amp; cx18_readl(cx, &amp;mb-&gt;ack) != cx18_readl(cx, &amp;mb-&gt;request)</div><div class='add'>+	       &amp;&amp; cnt &lt; 660) {</div><div class='ctx'> 		if (cnt &gt; 200 &amp;&amp; !in_atomic())</div><div class='ctx'> 			sig = cx18_msleep_timeout(10, 1);</div><div class='ctx'> 		cnt++;</div><div class='hunk'>@@ -233,13 +236,13 @@ static int cx18_api_call(struct cx18 *cx, u32 cmd, int args, u32 data[])</div><div class='ctx'> 	if (sig)</div><div class='ctx'> 		return -EINTR;</div><div class='ctx'> 	if (cnt == 660) {</div><div class='del'>-		writel(oldreq, &amp;mb-&gt;request);</div><div class='add'>+		cx18_writel(cx, oldreq, &amp;mb-&gt;request);</div><div class='ctx'> 		CX18_ERR("mb %s failed\n", info-&gt;name);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	for (i = 0; i &lt; MAX_MB_ARGUMENTS; i++)</div><div class='del'>-		data[i] = readl(&amp;mb-&gt;args[i]);</div><div class='del'>-	err = readl(&amp;mb-&gt;error);</div><div class='add'>+		data[i] = cx18_readl(cx, &amp;mb-&gt;args[i]);</div><div class='add'>+	err = cx18_readl(cx, &amp;mb-&gt;error);</div><div class='ctx'> 	if (!in_atomic() &amp;&amp; (info-&gt;flags &amp; API_SLOW))</div><div class='ctx'> 		cx18_msleep_timeout(300, 0);</div><div class='ctx'> 	if (err)</div><div class='head'>diff --git a/drivers/media/video/cx18/cx18-queue.c b/drivers/media/video/cx18/cx18-queue.c<br/>index dbe792ac3001..a33ba04a2686 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx18/cx18-queue.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/cx18/cx18-queue.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx18/cx18-queue.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx18/cx18-queue.c</a></div><div class='hunk'>@@ -37,8 +37,7 @@ void cx18_buf_swap(struct cx18_buffer *buf)</div><div class='ctx'> void cx18_queue_init(struct cx18_queue *q)</div><div class='ctx'> {</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;q-&gt;list);</div><div class='del'>-	q-&gt;buffers = 0;</div><div class='del'>-	q-&gt;length = 0;</div><div class='add'>+	atomic_set(&amp;q-&gt;buffers, 0);</div><div class='ctx'> 	q-&gt;bytesused = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -55,8 +54,7 @@ void cx18_enqueue(struct cx18_stream *s, struct cx18_buffer *buf,</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_lock_irqsave(&amp;s-&gt;qlock, flags);</div><div class='ctx'> 	list_add_tail(&amp;buf-&gt;list, &amp;q-&gt;list);</div><div class='del'>-	q-&gt;buffers++;</div><div class='del'>-	q-&gt;length += s-&gt;buf_size;</div><div class='add'>+	atomic_inc(&amp;q-&gt;buffers);</div><div class='ctx'> 	q-&gt;bytesused += buf-&gt;bytesused - buf-&gt;readpos;</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;s-&gt;qlock, flags);</div><div class='ctx'> }</div><div class='hunk'>@@ -70,8 +68,7 @@ struct cx18_buffer *cx18_dequeue(struct cx18_stream *s, struct cx18_queue *q)</div><div class='ctx'> 	if (!list_empty(&amp;q-&gt;list)) {</div><div class='ctx'> 		buf = list_entry(q-&gt;list.next, struct cx18_buffer, list);</div><div class='ctx'> 		list_del_init(q-&gt;list.next);</div><div class='del'>-		q-&gt;buffers--;</div><div class='del'>-		q-&gt;length -= s-&gt;buf_size;</div><div class='add'>+		atomic_dec(&amp;q-&gt;buffers);</div><div class='ctx'> 		q-&gt;bytesused -= buf-&gt;bytesused - buf-&gt;readpos;</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;s-&gt;qlock, flags);</div><div class='hunk'>@@ -95,10 +92,8 @@ struct cx18_buffer *cx18_queue_get_buf_irq(struct cx18_stream *s, u32 id,</div><div class='ctx'> 		/* the transport buffers are handled differently,</div><div class='ctx'> 		   they are not moved to the full queue */</div><div class='ctx'> 		if (s-&gt;type != CX18_ENC_STREAM_TYPE_TS) {</div><div class='del'>-			s-&gt;q_free.buffers--;</div><div class='del'>-			s-&gt;q_free.length -= s-&gt;buf_size;</div><div class='del'>-			s-&gt;q_full.buffers++;</div><div class='del'>-			s-&gt;q_full.length += s-&gt;buf_size;</div><div class='add'>+			atomic_dec(&amp;s-&gt;q_free.buffers);</div><div class='add'>+			atomic_inc(&amp;s-&gt;q_full.buffers);</div><div class='ctx'> 			s-&gt;q_full.bytesused += buf-&gt;bytesused;</div><div class='ctx'> 			list_move_tail(&amp;buf-&gt;list, &amp;s-&gt;q_full.list);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -124,8 +119,7 @@ static void cx18_queue_flush(struct cx18_stream *s, struct cx18_queue *q)</div><div class='ctx'> 		buf = list_entry(q-&gt;list.next, struct cx18_buffer, list);</div><div class='ctx'> 		list_move_tail(q-&gt;list.next, &amp;s-&gt;q_free.list);</div><div class='ctx'> 		buf-&gt;bytesused = buf-&gt;readpos = buf-&gt;b_flags = 0;</div><div class='del'>-		s-&gt;q_free.buffers++;</div><div class='del'>-		s-&gt;q_free.length += s-&gt;buf_size;</div><div class='add'>+		atomic_inc(&amp;s-&gt;q_free.buffers);</div><div class='ctx'> 	}</div><div class='ctx'> 	cx18_queue_init(q);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;s-&gt;qlock, flags);</div><div class='head'>diff --git a/drivers/media/video/cx18/cx18-scb.c b/drivers/media/video/cx18/cx18-scb.c<br/>index 30bc803e30da..f56d3772aa67 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx18/cx18-scb.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/cx18/cx18-scb.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx18/cx18-scb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx18/cx18-scb.c</a></div><div class='hunk'>@@ -20,102 +20,103 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "cx18-driver.h"</div><div class='add'>+#include "cx18-io.h"</div><div class='ctx'> #include "cx18-scb.h"</div><div class='ctx'> </div><div class='ctx'> void cx18_init_scb(struct cx18 *cx)</div><div class='ctx'> {</div><div class='del'>-	setup_page(SCB_OFFSET);</div><div class='del'>-	memset_io(cx-&gt;scb, 0, 0x10000);</div><div class='add'>+	cx18_setup_page(cx, SCB_OFFSET);</div><div class='add'>+	cx18_memset_io(cx, cx-&gt;scb, 0, 0x10000);</div><div class='ctx'> </div><div class='del'>-	writel(IRQ_APU_TO_CPU,     &amp;cx-&gt;scb-&gt;apu2cpu_irq);</div><div class='del'>-	writel(IRQ_CPU_TO_APU_ACK, &amp;cx-&gt;scb-&gt;cpu2apu_irq_ack);</div><div class='del'>-	writel(IRQ_HPU_TO_CPU,     &amp;cx-&gt;scb-&gt;hpu2cpu_irq);</div><div class='del'>-	writel(IRQ_CPU_TO_HPU_ACK, &amp;cx-&gt;scb-&gt;cpu2hpu_irq_ack);</div><div class='del'>-	writel(IRQ_PPU_TO_CPU,     &amp;cx-&gt;scb-&gt;ppu2cpu_irq);</div><div class='del'>-	writel(IRQ_CPU_TO_PPU_ACK, &amp;cx-&gt;scb-&gt;cpu2ppu_irq_ack);</div><div class='del'>-	writel(IRQ_EPU_TO_CPU,     &amp;cx-&gt;scb-&gt;epu2cpu_irq);</div><div class='del'>-	writel(IRQ_CPU_TO_EPU_ACK, &amp;cx-&gt;scb-&gt;cpu2epu_irq_ack);</div><div class='add'>+	cx18_writel(cx, IRQ_APU_TO_CPU,     &amp;cx-&gt;scb-&gt;apu2cpu_irq);</div><div class='add'>+	cx18_writel(cx, IRQ_CPU_TO_APU_ACK, &amp;cx-&gt;scb-&gt;cpu2apu_irq_ack);</div><div class='add'>+	cx18_writel(cx, IRQ_HPU_TO_CPU,     &amp;cx-&gt;scb-&gt;hpu2cpu_irq);</div><div class='add'>+	cx18_writel(cx, IRQ_CPU_TO_HPU_ACK, &amp;cx-&gt;scb-&gt;cpu2hpu_irq_ack);</div><div class='add'>+	cx18_writel(cx, IRQ_PPU_TO_CPU,     &amp;cx-&gt;scb-&gt;ppu2cpu_irq);</div><div class='add'>+	cx18_writel(cx, IRQ_CPU_TO_PPU_ACK, &amp;cx-&gt;scb-&gt;cpu2ppu_irq_ack);</div><div class='add'>+	cx18_writel(cx, IRQ_EPU_TO_CPU,     &amp;cx-&gt;scb-&gt;epu2cpu_irq);</div><div class='add'>+	cx18_writel(cx, IRQ_CPU_TO_EPU_ACK, &amp;cx-&gt;scb-&gt;cpu2epu_irq_ack);</div><div class='ctx'> </div><div class='del'>-	writel(IRQ_CPU_TO_APU,     &amp;cx-&gt;scb-&gt;cpu2apu_irq);</div><div class='del'>-	writel(IRQ_APU_TO_CPU_ACK, &amp;cx-&gt;scb-&gt;apu2cpu_irq_ack);</div><div class='del'>-	writel(IRQ_HPU_TO_APU,     &amp;cx-&gt;scb-&gt;hpu2apu_irq);</div><div class='del'>-	writel(IRQ_APU_TO_HPU_ACK, &amp;cx-&gt;scb-&gt;apu2hpu_irq_ack);</div><div class='del'>-	writel(IRQ_PPU_TO_APU,     &amp;cx-&gt;scb-&gt;ppu2apu_irq);</div><div class='del'>-	writel(IRQ_APU_TO_PPU_ACK, &amp;cx-&gt;scb-&gt;apu2ppu_irq_ack);</div><div class='del'>-	writel(IRQ_EPU_TO_APU,     &amp;cx-&gt;scb-&gt;epu2apu_irq);</div><div class='del'>-	writel(IRQ_APU_TO_EPU_ACK, &amp;cx-&gt;scb-&gt;apu2epu_irq_ack);</div><div class='add'>+	cx18_writel(cx, IRQ_CPU_TO_APU,     &amp;cx-&gt;scb-&gt;cpu2apu_irq);</div><div class='add'>+	cx18_writel(cx, IRQ_APU_TO_CPU_ACK, &amp;cx-&gt;scb-&gt;apu2cpu_irq_ack);</div><div class='add'>+	cx18_writel(cx, IRQ_HPU_TO_APU,     &amp;cx-&gt;scb-&gt;hpu2apu_irq);</div><div class='add'>+	cx18_writel(cx, IRQ_APU_TO_HPU_ACK, &amp;cx-&gt;scb-&gt;apu2hpu_irq_ack);</div><div class='add'>+	cx18_writel(cx, IRQ_PPU_TO_APU,     &amp;cx-&gt;scb-&gt;ppu2apu_irq);</div><div class='add'>+	cx18_writel(cx, IRQ_APU_TO_PPU_ACK, &amp;cx-&gt;scb-&gt;apu2ppu_irq_ack);</div><div class='add'>+	cx18_writel(cx, IRQ_EPU_TO_APU,     &amp;cx-&gt;scb-&gt;epu2apu_irq);</div><div class='add'>+	cx18_writel(cx, IRQ_APU_TO_EPU_ACK, &amp;cx-&gt;scb-&gt;apu2epu_irq_ack);</div><div class='ctx'> </div><div class='del'>-	writel(IRQ_CPU_TO_HPU,     &amp;cx-&gt;scb-&gt;cpu2hpu_irq);</div><div class='del'>-	writel(IRQ_HPU_TO_CPU_ACK, &amp;cx-&gt;scb-&gt;hpu2cpu_irq_ack);</div><div class='del'>-	writel(IRQ_APU_TO_HPU,     &amp;cx-&gt;scb-&gt;apu2hpu_irq);</div><div class='del'>-	writel(IRQ_HPU_TO_APU_ACK, &amp;cx-&gt;scb-&gt;hpu2apu_irq_ack);</div><div class='del'>-	writel(IRQ_PPU_TO_HPU,     &amp;cx-&gt;scb-&gt;ppu2hpu_irq);</div><div class='del'>-	writel(IRQ_HPU_TO_PPU_ACK, &amp;cx-&gt;scb-&gt;hpu2ppu_irq_ack);</div><div class='del'>-	writel(IRQ_EPU_TO_HPU,     &amp;cx-&gt;scb-&gt;epu2hpu_irq);</div><div class='del'>-	writel(IRQ_HPU_TO_EPU_ACK, &amp;cx-&gt;scb-&gt;hpu2epu_irq_ack);</div><div class='add'>+	cx18_writel(cx, IRQ_CPU_TO_HPU,     &amp;cx-&gt;scb-&gt;cpu2hpu_irq);</div><div class='add'>+	cx18_writel(cx, IRQ_HPU_TO_CPU_ACK, &amp;cx-&gt;scb-&gt;hpu2cpu_irq_ack);</div><div class='add'>+	cx18_writel(cx, IRQ_APU_TO_HPU,     &amp;cx-&gt;scb-&gt;apu2hpu_irq);</div><div class='add'>+	cx18_writel(cx, IRQ_HPU_TO_APU_ACK, &amp;cx-&gt;scb-&gt;hpu2apu_irq_ack);</div><div class='add'>+	cx18_writel(cx, IRQ_PPU_TO_HPU,     &amp;cx-&gt;scb-&gt;ppu2hpu_irq);</div><div class='add'>+	cx18_writel(cx, IRQ_HPU_TO_PPU_ACK, &amp;cx-&gt;scb-&gt;hpu2ppu_irq_ack);</div><div class='add'>+	cx18_writel(cx, IRQ_EPU_TO_HPU,     &amp;cx-&gt;scb-&gt;epu2hpu_irq);</div><div class='add'>+	cx18_writel(cx, IRQ_HPU_TO_EPU_ACK, &amp;cx-&gt;scb-&gt;hpu2epu_irq_ack);</div><div class='ctx'> </div><div class='del'>-	writel(IRQ_CPU_TO_PPU,     &amp;cx-&gt;scb-&gt;cpu2ppu_irq);</div><div class='del'>-	writel(IRQ_PPU_TO_CPU_ACK, &amp;cx-&gt;scb-&gt;ppu2cpu_irq_ack);</div><div class='del'>-	writel(IRQ_APU_TO_PPU,     &amp;cx-&gt;scb-&gt;apu2ppu_irq);</div><div class='del'>-	writel(IRQ_PPU_TO_APU_ACK, &amp;cx-&gt;scb-&gt;ppu2apu_irq_ack);</div><div class='del'>-	writel(IRQ_HPU_TO_PPU,     &amp;cx-&gt;scb-&gt;hpu2ppu_irq);</div><div class='del'>-	writel(IRQ_PPU_TO_HPU_ACK, &amp;cx-&gt;scb-&gt;ppu2hpu_irq_ack);</div><div class='del'>-	writel(IRQ_EPU_TO_PPU,     &amp;cx-&gt;scb-&gt;epu2ppu_irq);</div><div class='del'>-	writel(IRQ_PPU_TO_EPU_ACK, &amp;cx-&gt;scb-&gt;ppu2epu_irq_ack);</div><div class='add'>+	cx18_writel(cx, IRQ_CPU_TO_PPU,     &amp;cx-&gt;scb-&gt;cpu2ppu_irq);</div><div class='add'>+	cx18_writel(cx, IRQ_PPU_TO_CPU_ACK, &amp;cx-&gt;scb-&gt;ppu2cpu_irq_ack);</div><div class='add'>+	cx18_writel(cx, IRQ_APU_TO_PPU,     &amp;cx-&gt;scb-&gt;apu2ppu_irq);</div><div class='add'>+	cx18_writel(cx, IRQ_PPU_TO_APU_ACK, &amp;cx-&gt;scb-&gt;ppu2apu_irq_ack);</div><div class='add'>+	cx18_writel(cx, IRQ_HPU_TO_PPU,     &amp;cx-&gt;scb-&gt;hpu2ppu_irq);</div><div class='add'>+	cx18_writel(cx, IRQ_PPU_TO_HPU_ACK, &amp;cx-&gt;scb-&gt;ppu2hpu_irq_ack);</div><div class='add'>+	cx18_writel(cx, IRQ_EPU_TO_PPU,     &amp;cx-&gt;scb-&gt;epu2ppu_irq);</div><div class='add'>+	cx18_writel(cx, IRQ_PPU_TO_EPU_ACK, &amp;cx-&gt;scb-&gt;ppu2epu_irq_ack);</div><div class='ctx'> </div><div class='del'>-	writel(IRQ_CPU_TO_EPU,     &amp;cx-&gt;scb-&gt;cpu2epu_irq);</div><div class='del'>-	writel(IRQ_EPU_TO_CPU_ACK, &amp;cx-&gt;scb-&gt;epu2cpu_irq_ack);</div><div class='del'>-	writel(IRQ_APU_TO_EPU,     &amp;cx-&gt;scb-&gt;apu2epu_irq);</div><div class='del'>-	writel(IRQ_EPU_TO_APU_ACK, &amp;cx-&gt;scb-&gt;epu2apu_irq_ack);</div><div class='del'>-	writel(IRQ_HPU_TO_EPU,     &amp;cx-&gt;scb-&gt;hpu2epu_irq);</div><div class='del'>-	writel(IRQ_EPU_TO_HPU_ACK, &amp;cx-&gt;scb-&gt;epu2hpu_irq_ack);</div><div class='del'>-	writel(IRQ_PPU_TO_EPU,     &amp;cx-&gt;scb-&gt;ppu2epu_irq);</div><div class='del'>-	writel(IRQ_EPU_TO_PPU_ACK, &amp;cx-&gt;scb-&gt;epu2ppu_irq_ack);</div><div class='add'>+	cx18_writel(cx, IRQ_CPU_TO_EPU,     &amp;cx-&gt;scb-&gt;cpu2epu_irq);</div><div class='add'>+	cx18_writel(cx, IRQ_EPU_TO_CPU_ACK, &amp;cx-&gt;scb-&gt;epu2cpu_irq_ack);</div><div class='add'>+	cx18_writel(cx, IRQ_APU_TO_EPU,     &amp;cx-&gt;scb-&gt;apu2epu_irq);</div><div class='add'>+	cx18_writel(cx, IRQ_EPU_TO_APU_ACK, &amp;cx-&gt;scb-&gt;epu2apu_irq_ack);</div><div class='add'>+	cx18_writel(cx, IRQ_HPU_TO_EPU,     &amp;cx-&gt;scb-&gt;hpu2epu_irq);</div><div class='add'>+	cx18_writel(cx, IRQ_EPU_TO_HPU_ACK, &amp;cx-&gt;scb-&gt;epu2hpu_irq_ack);</div><div class='add'>+	cx18_writel(cx, IRQ_PPU_TO_EPU,     &amp;cx-&gt;scb-&gt;ppu2epu_irq);</div><div class='add'>+	cx18_writel(cx, IRQ_EPU_TO_PPU_ACK, &amp;cx-&gt;scb-&gt;epu2ppu_irq_ack);</div><div class='ctx'> </div><div class='del'>-	writel(SCB_OFFSET + offsetof(struct cx18_scb, apu2cpu_mb),</div><div class='add'>+	cx18_writel(cx, SCB_OFFSET + offsetof(struct cx18_scb, apu2cpu_mb),</div><div class='ctx'> 			&amp;cx-&gt;scb-&gt;apu2cpu_mb_offset);</div><div class='del'>-	writel(SCB_OFFSET + offsetof(struct cx18_scb, hpu2cpu_mb),</div><div class='add'>+	cx18_writel(cx, SCB_OFFSET + offsetof(struct cx18_scb, hpu2cpu_mb),</div><div class='ctx'> 			&amp;cx-&gt;scb-&gt;hpu2cpu_mb_offset);</div><div class='del'>-	writel(SCB_OFFSET + offsetof(struct cx18_scb, ppu2cpu_mb),</div><div class='add'>+	cx18_writel(cx, SCB_OFFSET + offsetof(struct cx18_scb, ppu2cpu_mb),</div><div class='ctx'> 			&amp;cx-&gt;scb-&gt;ppu2cpu_mb_offset);</div><div class='del'>-	writel(SCB_OFFSET + offsetof(struct cx18_scb, epu2cpu_mb),</div><div class='add'>+	cx18_writel(cx, SCB_OFFSET + offsetof(struct cx18_scb, epu2cpu_mb),</div><div class='ctx'> 			&amp;cx-&gt;scb-&gt;epu2cpu_mb_offset);</div><div class='del'>-	writel(SCB_OFFSET + offsetof(struct cx18_scb, cpu2apu_mb),</div><div class='add'>+	cx18_writel(cx, SCB_OFFSET + offsetof(struct cx18_scb, cpu2apu_mb),</div><div class='ctx'> 			&amp;cx-&gt;scb-&gt;cpu2apu_mb_offset);</div><div class='del'>-	writel(SCB_OFFSET + offsetof(struct cx18_scb, hpu2apu_mb),</div><div class='add'>+	cx18_writel(cx, SCB_OFFSET + offsetof(struct cx18_scb, hpu2apu_mb),</div><div class='ctx'> 			&amp;cx-&gt;scb-&gt;hpu2apu_mb_offset);</div><div class='del'>-	writel(SCB_OFFSET + offsetof(struct cx18_scb, ppu2apu_mb),</div><div class='add'>+	cx18_writel(cx, SCB_OFFSET + offsetof(struct cx18_scb, ppu2apu_mb),</div><div class='ctx'> 			&amp;cx-&gt;scb-&gt;ppu2apu_mb_offset);</div><div class='del'>-	writel(SCB_OFFSET + offsetof(struct cx18_scb, epu2apu_mb),</div><div class='add'>+	cx18_writel(cx, SCB_OFFSET + offsetof(struct cx18_scb, epu2apu_mb),</div><div class='ctx'> 			&amp;cx-&gt;scb-&gt;epu2apu_mb_offset);</div><div class='del'>-	writel(SCB_OFFSET + offsetof(struct cx18_scb, cpu2hpu_mb),</div><div class='add'>+	cx18_writel(cx, SCB_OFFSET + offsetof(struct cx18_scb, cpu2hpu_mb),</div><div class='ctx'> 			&amp;cx-&gt;scb-&gt;cpu2hpu_mb_offset);</div><div class='del'>-	writel(SCB_OFFSET + offsetof(struct cx18_scb, apu2hpu_mb),</div><div class='add'>+	cx18_writel(cx, SCB_OFFSET + offsetof(struct cx18_scb, apu2hpu_mb),</div><div class='ctx'> 			&amp;cx-&gt;scb-&gt;apu2hpu_mb_offset);</div><div class='del'>-	writel(SCB_OFFSET + offsetof(struct cx18_scb, ppu2hpu_mb),</div><div class='add'>+	cx18_writel(cx, SCB_OFFSET + offsetof(struct cx18_scb, ppu2hpu_mb),</div><div class='ctx'> 			&amp;cx-&gt;scb-&gt;ppu2hpu_mb_offset);</div><div class='del'>-	writel(SCB_OFFSET + offsetof(struct cx18_scb, epu2hpu_mb),</div><div class='add'>+	cx18_writel(cx, SCB_OFFSET + offsetof(struct cx18_scb, epu2hpu_mb),</div><div class='ctx'> 			&amp;cx-&gt;scb-&gt;epu2hpu_mb_offset);</div><div class='del'>-	writel(SCB_OFFSET + offsetof(struct cx18_scb, cpu2ppu_mb),</div><div class='add'>+	cx18_writel(cx, SCB_OFFSET + offsetof(struct cx18_scb, cpu2ppu_mb),</div><div class='ctx'> 			&amp;cx-&gt;scb-&gt;cpu2ppu_mb_offset);</div><div class='del'>-	writel(SCB_OFFSET + offsetof(struct cx18_scb, apu2ppu_mb),</div><div class='add'>+	cx18_writel(cx, SCB_OFFSET + offsetof(struct cx18_scb, apu2ppu_mb),</div><div class='ctx'> 			&amp;cx-&gt;scb-&gt;apu2ppu_mb_offset);</div><div class='del'>-	writel(SCB_OFFSET + offsetof(struct cx18_scb, hpu2ppu_mb),</div><div class='add'>+	cx18_writel(cx, SCB_OFFSET + offsetof(struct cx18_scb, hpu2ppu_mb),</div><div class='ctx'> 			&amp;cx-&gt;scb-&gt;hpu2ppu_mb_offset);</div><div class='del'>-	writel(SCB_OFFSET + offsetof(struct cx18_scb, epu2ppu_mb),</div><div class='add'>+	cx18_writel(cx, SCB_OFFSET + offsetof(struct cx18_scb, epu2ppu_mb),</div><div class='ctx'> 			&amp;cx-&gt;scb-&gt;epu2ppu_mb_offset);</div><div class='del'>-	writel(SCB_OFFSET + offsetof(struct cx18_scb, cpu2epu_mb),</div><div class='add'>+	cx18_writel(cx, SCB_OFFSET + offsetof(struct cx18_scb, cpu2epu_mb),</div><div class='ctx'> 			&amp;cx-&gt;scb-&gt;cpu2epu_mb_offset);</div><div class='del'>-	writel(SCB_OFFSET + offsetof(struct cx18_scb, apu2epu_mb),</div><div class='add'>+	cx18_writel(cx, SCB_OFFSET + offsetof(struct cx18_scb, apu2epu_mb),</div><div class='ctx'> 			&amp;cx-&gt;scb-&gt;apu2epu_mb_offset);</div><div class='del'>-	writel(SCB_OFFSET + offsetof(struct cx18_scb, hpu2epu_mb),</div><div class='add'>+	cx18_writel(cx, SCB_OFFSET + offsetof(struct cx18_scb, hpu2epu_mb),</div><div class='ctx'> 			&amp;cx-&gt;scb-&gt;hpu2epu_mb_offset);</div><div class='del'>-	writel(SCB_OFFSET + offsetof(struct cx18_scb, ppu2epu_mb),</div><div class='add'>+	cx18_writel(cx, SCB_OFFSET + offsetof(struct cx18_scb, ppu2epu_mb),</div><div class='ctx'> 			&amp;cx-&gt;scb-&gt;ppu2epu_mb_offset);</div><div class='ctx'> </div><div class='del'>-	writel(SCB_OFFSET + offsetof(struct cx18_scb, cpu_state),</div><div class='add'>+	cx18_writel(cx, SCB_OFFSET + offsetof(struct cx18_scb, cpu_state),</div><div class='ctx'> 			&amp;cx-&gt;scb-&gt;ipc_offset);</div><div class='ctx'> </div><div class='del'>-	writel(1, &amp;cx-&gt;scb-&gt;hpu_state);</div><div class='del'>-	writel(1, &amp;cx-&gt;scb-&gt;epu_state);</div><div class='add'>+	cx18_writel(cx, 1, &amp;cx-&gt;scb-&gt;hpu_state);</div><div class='add'>+	cx18_writel(cx, 1, &amp;cx-&gt;scb-&gt;epu_state);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/media/video/cx18/cx18-streams.c b/drivers/media/video/cx18/cx18-streams.c<br/>index 0da57f583bf7..0c8e7542cf60 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx18/cx18-streams.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/cx18/cx18-streams.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx18/cx18-streams.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx18/cx18-streams.c</a></div><div class='hunk'>@@ -22,6 +22,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "cx18-driver.h"</div><div class='add'>+#include "cx18-io.h"</div><div class='ctx'> #include "cx18-fileops.h"</div><div class='ctx'> #include "cx18-mailbox.h"</div><div class='ctx'> #include "cx18-i2c.h"</div><div class='hunk'>@@ -56,7 +57,7 @@ static struct file_operations cx18_v4l2_enc_fops = {</div><div class='ctx'> static struct {</div><div class='ctx'> 	const char *name;</div><div class='ctx'> 	int vfl_type;</div><div class='del'>-	int minor_offset;</div><div class='add'>+	int num_offset;</div><div class='ctx'> 	int dma;</div><div class='ctx'> 	enum v4l2_buf_type buf_type;</div><div class='ctx'> 	struct file_operations *fops;</div><div class='hunk'>@@ -119,7 +120,7 @@ static void cx18_stream_init(struct cx18 *cx, int type)</div><div class='ctx'> 	s-&gt;cx = cx;</div><div class='ctx'> 	s-&gt;type = type;</div><div class='ctx'> 	s-&gt;name = cx18_stream_info[type].name;</div><div class='del'>-	s-&gt;handle = 0xffffffff;</div><div class='add'>+	s-&gt;handle = CX18_INVALID_TASK_HANDLE;</div><div class='ctx'> </div><div class='ctx'> 	s-&gt;dma = cx18_stream_info[type].dma;</div><div class='ctx'> 	s-&gt;buf_size = cx-&gt;stream_buf_size[type];</div><div class='hunk'>@@ -143,8 +144,8 @@ static int cx18_prep_dev(struct cx18 *cx, int type)</div><div class='ctx'> {</div><div class='ctx'> 	struct cx18_stream *s = &amp;cx-&gt;streams[type];</div><div class='ctx'> 	u32 cap = cx-&gt;v4l2_cap;</div><div class='del'>-	int minor_offset = cx18_stream_info[type].minor_offset;</div><div class='del'>-	int minor;</div><div class='add'>+	int num_offset = cx18_stream_info[type].num_offset;</div><div class='add'>+	int num = cx-&gt;num + cx18_first_minor + num_offset;</div><div class='ctx'> </div><div class='ctx'> 	/* These four fields are always initialized. If v4l2dev == NULL, then</div><div class='ctx'> 	   this stream is not in use. In that case no other fields but these</div><div class='hunk'>@@ -163,9 +164,6 @@ static int cx18_prep_dev(struct cx18 *cx, int type)</div><div class='ctx'> 	    !(cap &amp; (V4L2_CAP_VBI_CAPTURE | V4L2_CAP_SLICED_VBI_CAPTURE)))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	/* card number + user defined offset + device offset */</div><div class='del'>-	minor = cx-&gt;num + cx18_first_minor + minor_offset;</div><div class='del'>-</div><div class='ctx'> 	/* User explicitly selected 0 buffers for these streams, so don't</div><div class='ctx'> 	   create them. */</div><div class='ctx'> 	if (cx18_stream_info[type].dma != PCI_DMA_NONE &amp;&amp;</div><div class='hunk'>@@ -176,7 +174,7 @@ static int cx18_prep_dev(struct cx18 *cx, int type)</div><div class='ctx'> </div><div class='ctx'> 	cx18_stream_init(cx, type);</div><div class='ctx'> </div><div class='del'>-	if (minor_offset == -1)</div><div class='add'>+	if (num_offset == -1)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* allocate and initialize the v4l2 video device structure */</div><div class='hunk'>@@ -190,7 +188,7 @@ static int cx18_prep_dev(struct cx18 *cx, int type)</div><div class='ctx'> 	snprintf(s-&gt;v4l2dev-&gt;name, sizeof(s-&gt;v4l2dev-&gt;name), "cx18-%d",</div><div class='ctx'> 			cx-&gt;num);</div><div class='ctx'> </div><div class='del'>-	s-&gt;v4l2dev-&gt;minor = minor;</div><div class='add'>+	s-&gt;v4l2dev-&gt;num = num;</div><div class='ctx'> 	s-&gt;v4l2dev-&gt;parent = &amp;cx-&gt;dev-&gt;dev;</div><div class='ctx'> 	s-&gt;v4l2dev-&gt;fops = cx18_stream_info[type].fops;</div><div class='ctx'> 	s-&gt;v4l2dev-&gt;release = video_device_release;</div><div class='hunk'>@@ -226,7 +224,7 @@ static int cx18_reg_dev(struct cx18 *cx, int type)</div><div class='ctx'> {</div><div class='ctx'> 	struct cx18_stream *s = &amp;cx-&gt;streams[type];</div><div class='ctx'> 	int vfl_type = cx18_stream_info[type].vfl_type;</div><div class='del'>-	int minor;</div><div class='add'>+	int num;</div><div class='ctx'> </div><div class='ctx'> 	/* TODO: Shouldn't this be a VFL_TYPE_TRANSPORT or something?</div><div class='ctx'> 	 * We need a VFL_TYPE_TS defined.</div><div class='hunk'>@@ -244,38 +242,44 @@ static int cx18_reg_dev(struct cx18 *cx, int type)</div><div class='ctx'> 	if (s-&gt;v4l2dev == NULL)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	minor = s-&gt;v4l2dev-&gt;minor;</div><div class='add'>+	num = s-&gt;v4l2dev-&gt;num;</div><div class='add'>+	/* card number + user defined offset + device offset */</div><div class='add'>+	if (type != CX18_ENC_STREAM_TYPE_MPG) {</div><div class='add'>+		struct cx18_stream *s_mpg = &amp;cx-&gt;streams[CX18_ENC_STREAM_TYPE_MPG];</div><div class='add'>+</div><div class='add'>+		if (s_mpg-&gt;v4l2dev)</div><div class='add'>+			num = s_mpg-&gt;v4l2dev-&gt;num + cx18_stream_info[type].num_offset;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Register device. First try the desired minor, then any free one. */</div><div class='del'>-	if (video_register_device(s-&gt;v4l2dev, vfl_type, minor) &amp;&amp;</div><div class='del'>-			video_register_device(s-&gt;v4l2dev, vfl_type, -1)) {</div><div class='del'>-		CX18_ERR("Couldn't register v4l2 device for %s minor %d\n",</div><div class='del'>-			s-&gt;name, minor);</div><div class='add'>+	if (video_register_device(s-&gt;v4l2dev, vfl_type, num)) {</div><div class='add'>+		CX18_ERR("Couldn't register v4l2 device for %s kernel number %d\n",</div><div class='add'>+			s-&gt;name, num);</div><div class='ctx'> 		video_device_release(s-&gt;v4l2dev);</div><div class='ctx'> 		s-&gt;v4l2dev = NULL;</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='del'>-	minor = s-&gt;v4l2dev-&gt;minor;</div><div class='add'>+	num = s-&gt;v4l2dev-&gt;num;</div><div class='ctx'> </div><div class='ctx'> 	switch (vfl_type) {</div><div class='ctx'> 	case VFL_TYPE_GRABBER:</div><div class='ctx'> 		CX18_INFO("Registered device video%d for %s (%d MB)\n",</div><div class='del'>-			minor, s-&gt;name, cx-&gt;options.megabytes[type]);</div><div class='add'>+			num, s-&gt;name, cx-&gt;options.megabytes[type]);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case VFL_TYPE_RADIO:</div><div class='ctx'> 		CX18_INFO("Registered device radio%d for %s\n",</div><div class='del'>-			minor - MINOR_VFL_TYPE_RADIO_MIN, s-&gt;name);</div><div class='add'>+			num, s-&gt;name);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case VFL_TYPE_VBI:</div><div class='ctx'> 		if (cx-&gt;options.megabytes[type])</div><div class='ctx'> 			CX18_INFO("Registered device vbi%d for %s (%d MB)\n",</div><div class='del'>-				minor - MINOR_VFL_TYPE_VBI_MIN,</div><div class='add'>+				num,</div><div class='ctx'> 				s-&gt;name, cx-&gt;options.megabytes[type]);</div><div class='ctx'> 		else</div><div class='ctx'> 			CX18_INFO("Registered device vbi%d for %s\n",</div><div class='del'>-				minor - MINOR_VFL_TYPE_VBI_MIN, s-&gt;name);</div><div class='add'>+				num, s-&gt;name);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -432,7 +436,6 @@ int cx18_start_v4l2_encode_stream(struct cx18_stream *s)</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	s-&gt;buffers_stolen = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* mute/unmute video */</div><div class='ctx'> 	cx18_vapi(cx, CX18_CPU_SET_VIDEO_MUTE, 2,</div><div class='hunk'>@@ -470,7 +473,7 @@ int cx18_start_v4l2_encode_stream(struct cx18_stream *s)</div><div class='ctx'> </div><div class='ctx'> 	if (atomic_read(&amp;cx-&gt;tot_capturing) == 0) {</div><div class='ctx'> 		clear_bit(CX18_F_I_EOS, &amp;cx-&gt;i_flags);</div><div class='del'>-		write_reg(7, CX18_DSP0_INTERRUPT_MASK);</div><div class='add'>+		cx18_write_reg(cx, 7, CX18_DSP0_INTERRUPT_MASK);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	cx18_vapi(cx, CX18_CPU_DE_SET_MDL_ACK, 3, s-&gt;handle,</div><div class='hunk'>@@ -480,8 +483,9 @@ int cx18_start_v4l2_encode_stream(struct cx18_stream *s)</div><div class='ctx'> 	list_for_each(p, &amp;s-&gt;q_free.list) {</div><div class='ctx'> 		struct cx18_buffer *buf = list_entry(p, struct cx18_buffer, list);</div><div class='ctx'> </div><div class='del'>-		writel(buf-&gt;dma_handle, &amp;cx-&gt;scb-&gt;cpu_mdl[buf-&gt;id].paddr);</div><div class='del'>-		writel(s-&gt;buf_size, &amp;cx-&gt;scb-&gt;cpu_mdl[buf-&gt;id].length);</div><div class='add'>+		cx18_writel(cx, buf-&gt;dma_handle,</div><div class='add'>+					&amp;cx-&gt;scb-&gt;cpu_mdl[buf-&gt;id].paddr);</div><div class='add'>+		cx18_writel(cx, s-&gt;buf_size, &amp;cx-&gt;scb-&gt;cpu_mdl[buf-&gt;id].length);</div><div class='ctx'> 		cx18_vapi(cx, CX18_CPU_DE_SET_MDL, 5, s-&gt;handle,</div><div class='ctx'> 			(void __iomem *)&amp;cx-&gt;scb-&gt;cpu_mdl[buf-&gt;id] - cx-&gt;enc_mem,</div><div class='ctx'> 			1, buf-&gt;id, s-&gt;buf_size);</div><div class='hunk'>@@ -489,7 +493,14 @@ int cx18_start_v4l2_encode_stream(struct cx18_stream *s)</div><div class='ctx'> 	/* begin_capture */</div><div class='ctx'> 	if (cx18_vapi(cx, CX18_CPU_CAPTURE_START, 1, s-&gt;handle)) {</div><div class='ctx'> 		CX18_DEBUG_WARN("Error starting capture!\n");</div><div class='add'>+		/* Ensure we're really not capturing before releasing MDLs */</div><div class='add'>+		if (s-&gt;type == CX18_ENC_STREAM_TYPE_MPG)</div><div class='add'>+			cx18_vapi(cx, CX18_CPU_CAPTURE_STOP, 2, s-&gt;handle, 1);</div><div class='add'>+		else</div><div class='add'>+			cx18_vapi(cx, CX18_CPU_CAPTURE_STOP, 1, s-&gt;handle);</div><div class='add'>+		cx18_vapi(cx, CX18_CPU_DE_RELEASE_MDL, 1, s-&gt;handle);</div><div class='ctx'> 		cx18_vapi(cx, CX18_DESTROY_TASK, 1, s-&gt;handle);</div><div class='add'>+		/* FIXME - clean-up DSP0_INT mask, i_flags, s_flags, etc. */</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -541,6 +552,9 @@ int cx18_stop_v4l2_encode_stream(struct cx18_stream *s, int gop_end)</div><div class='ctx'> 		CX18_INFO("ignoring gop_end: not (yet?) supported by the firmware\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Tell the CX23418 it can't use our buffers anymore */</div><div class='add'>+	cx18_vapi(cx, CX18_CPU_DE_RELEASE_MDL, 1, s-&gt;handle);</div><div class='add'>+</div><div class='ctx'> 	if (s-&gt;type != CX18_ENC_STREAM_TYPE_TS)</div><div class='ctx'> 		atomic_dec(&amp;cx-&gt;ana_capturing);</div><div class='ctx'> 	atomic_dec(&amp;cx-&gt;tot_capturing);</div><div class='hunk'>@@ -549,12 +563,12 @@ int cx18_stop_v4l2_encode_stream(struct cx18_stream *s, int gop_end)</div><div class='ctx'> 	clear_bit(CX18_F_S_STREAMING, &amp;s-&gt;s_flags);</div><div class='ctx'> </div><div class='ctx'> 	cx18_vapi(cx, CX18_DESTROY_TASK, 1, s-&gt;handle);</div><div class='del'>-	s-&gt;handle = 0xffffffff;</div><div class='add'>+	s-&gt;handle = CX18_INVALID_TASK_HANDLE;</div><div class='ctx'> </div><div class='ctx'> 	if (atomic_read(&amp;cx-&gt;tot_capturing) &gt; 0)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	write_reg(5, CX18_DSP0_INTERRUPT_MASK);</div><div class='add'>+	cx18_write_reg(cx, 5, CX18_DSP0_INTERRUPT_MASK);</div><div class='ctx'> 	wake_up(&amp;s-&gt;waitq);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -568,8 +582,8 @@ u32 cx18_find_handle(struct cx18 *cx)</div><div class='ctx'> 	for (i = 0; i &lt; CX18_MAX_STREAMS; i++) {</div><div class='ctx'> 		struct cx18_stream *s = &amp;cx-&gt;streams[i];</div><div class='ctx'> </div><div class='del'>-		if (s-&gt;v4l2dev &amp;&amp; s-&gt;handle)</div><div class='add'>+		if (s-&gt;v4l2dev &amp;&amp; (s-&gt;handle != CX18_INVALID_TASK_HANDLE))</div><div class='ctx'> 			return s-&gt;handle;</div><div class='ctx'> 	}</div><div class='del'>-	return 0;</div><div class='add'>+	return CX18_INVALID_TASK_HANDLE;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/media/video/cx18/cx18-version.h b/drivers/media/video/cx18/cx18-version.h<br/>index d5c7a6f968dd..9f6be2d457fb 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx18/cx18-version.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/cx18/cx18-version.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx18/cx18-version.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx18/cx18-version.h</a></div><div class='hunk'>@@ -25,7 +25,7 @@</div><div class='ctx'> #define CX18_DRIVER_NAME "cx18"</div><div class='ctx'> #define CX18_DRIVER_VERSION_MAJOR 1</div><div class='ctx'> #define CX18_DRIVER_VERSION_MINOR 0</div><div class='del'>-#define CX18_DRIVER_VERSION_PATCHLEVEL 0</div><div class='add'>+#define CX18_DRIVER_VERSION_PATCHLEVEL 1</div><div class='ctx'> </div><div class='ctx'> #define CX18_VERSION __stringify(CX18_DRIVER_VERSION_MAJOR) "." __stringify(CX18_DRIVER_VERSION_MINOR) "." __stringify(CX18_DRIVER_VERSION_PATCHLEVEL)</div><div class='ctx'> #define CX18_DRIVER_VERSION KERNEL_VERSION(CX18_DRIVER_VERSION_MAJOR, \</div><div class='head'>diff --git a/drivers/media/video/cx18/cx23418.h b/drivers/media/video/cx18/cx23418.h<br/>index e7ed053059a8..668f968d7761 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx18/cx23418.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/cx18/cx23418.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx18/cx23418.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx18/cx23418.h</a></div><div class='hunk'>@@ -351,7 +351,7 @@</div><div class='ctx'>    Descriptor Lists to the driver</div><div class='ctx'>    IN[0] - Task handle. Handle of the task to start</div><div class='ctx'>    ReturnCode - One of the ERR_DE_... */</div><div class='del'>-/* #define CX18_CPU_DE_ReleaseMDL               (CPU_CMD_MASK_DE | 0x0006) */</div><div class='add'>+#define CX18_CPU_DE_RELEASE_MDL               	(CPU_CMD_MASK_DE | 0x0006)</div><div class='ctx'> </div><div class='ctx'> /* Description: This command signals the cpu that the dat buffer has been</div><div class='ctx'>    consumed and ready for re-use.</div><div class='head'>diff --git a/drivers/media/video/cx2341x.c b/drivers/media/video/cx2341x.c<br/>index 22847a0444f5..cbbe47fb87b7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx2341x.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/cx2341x.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx2341x.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx2341x.c</a></div><div class='hunk'>@@ -508,7 +508,10 @@ int cx2341x_ctrl_query(const struct cx2341x_mpeg_params *params,</div><div class='ctx'> 		/* this setting is read-only for the cx2341x since the</div><div class='ctx'> 		   V4L2_CID_MPEG_STREAM_TYPE really determines the</div><div class='ctx'> 		   MPEG-1/2 setting */</div><div class='del'>-		err = v4l2_ctrl_query_fill_std(qctrl);</div><div class='add'>+		err = v4l2_ctrl_query_fill(qctrl,</div><div class='add'>+					   V4L2_MPEG_VIDEO_ENCODING_MPEG_1,</div><div class='add'>+					   V4L2_MPEG_VIDEO_ENCODING_MPEG_2, 1,</div><div class='add'>+					   V4L2_MPEG_VIDEO_ENCODING_MPEG_2);</div><div class='ctx'> 		if (err == 0)</div><div class='ctx'> 			qctrl-&gt;flags |= V4L2_CTRL_FLAG_READ_ONLY;</div><div class='ctx'> 		return err;</div><div class='head'>diff --git a/drivers/media/video/cx23885/Kconfig b/drivers/media/video/cx23885/Kconfig<br/>index e60bd31b51a3..8c1b7fa47a41 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx23885/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/cx23885/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx23885/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx23885/Kconfig</a></div><div class='hunk'>@@ -15,6 +15,7 @@ config VIDEO_CX23885</div><div class='ctx'> 	select DVB_S5H1409 if !DVB_FE_CUSTOMISE</div><div class='ctx'> 	select DVB_S5H1411 if !DVB_FE_CUSTOMISE</div><div class='ctx'> 	select DVB_LGDT330X if !DVB_FE_CUSTOMISE</div><div class='add'>+	select DVB_ZL10353 if !DVB_FE_CUSTOMISE</div><div class='ctx'> 	select MEDIA_TUNER_XC2028 if !DVB_FE_CUSTOMIZE</div><div class='ctx'> 	select MEDIA_TUNER_TDA8290 if !DVB_FE_CUSTOMIZE</div><div class='ctx'> 	select MEDIA_TUNER_TDA18271 if !DVB_FE_CUSTOMIZE</div><div class='head'>diff --git a/drivers/media/video/cx23885/cx23885-417.c b/drivers/media/video/cx23885/cx23885-417.c<br/>index 7b0e8c01692e..395c11fa47ce 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx23885/cx23885-417.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/cx23885/cx23885-417.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx23885/cx23885-417.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx23885/cx23885-417.c</a></div><div class='hunk'>@@ -36,7 +36,6 @@</div><div class='ctx'> #include &lt;media/cx2341x.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "cx23885.h"</div><div class='del'>-#include "media/cx2341x.h"</div><div class='ctx'> </div><div class='ctx'> #define CX23885_FIRM_IMAGE_SIZE 376836</div><div class='ctx'> #define CX23885_FIRM_IMAGE_NAME "v4l-cx23885-enc.fw"</div><div class='hunk'>@@ -632,7 +631,7 @@ int mc417_memory_read(struct cx23885_dev *dev, u32 address, u32 *value)</div><div class='ctx'> /* ------------------------------------------------------------------ */</div><div class='ctx'> </div><div class='ctx'> /* MPEG encoder API */</div><div class='del'>-char *cmd_to_str(int cmd)</div><div class='add'>+static char *cmd_to_str(int cmd)</div><div class='ctx'> {</div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case CX2341X_ENC_PING_FW:</div><div class='hunk'>@@ -1583,6 +1582,7 @@ static int mpeg_open(struct inode *inode, struct file *file)</div><div class='ctx'> </div><div class='ctx'> 	dprintk(2, "%s()\n", __func__);</div><div class='ctx'> </div><div class='add'>+	lock_kernel();</div><div class='ctx'> 	list_for_each(list, &amp;cx23885_devlist) {</div><div class='ctx'> 		h = list_entry(list, struct cx23885_dev, devlist);</div><div class='ctx'> 		if (h-&gt;v4l_device-&gt;minor == minor) {</div><div class='hunk'>@@ -1591,13 +1591,17 @@ static int mpeg_open(struct inode *inode, struct file *file)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (dev == NULL)</div><div class='add'>+	if (dev == NULL) {</div><div class='add'>+		unlock_kernel();</div><div class='ctx'> 		return -ENODEV;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* allocate + initialize per filehandle data */</div><div class='ctx'> 	fh = kzalloc(sizeof(*fh), GFP_KERNEL);</div><div class='del'>-	if (NULL == fh)</div><div class='add'>+	if (NULL == fh) {</div><div class='add'>+		unlock_kernel();</div><div class='ctx'> 		return -ENOMEM;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	file-&gt;private_data = fh;</div><div class='ctx'> 	fh-&gt;dev      = dev;</div><div class='hunk'>@@ -1608,6 +1612,7 @@ static int mpeg_open(struct inode *inode, struct file *file)</div><div class='ctx'> 			    V4L2_FIELD_INTERLACED,</div><div class='ctx'> 			    sizeof(struct cx23885_buffer),</div><div class='ctx'> 			    fh);</div><div class='add'>+	unlock_kernel();</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/media/video/cx23885/cx23885-cards.c b/drivers/media/video/cx23885/cx23885-cards.c<br/>index c36d3f632104..dac5ccc9ba72 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx23885/cx23885-cards.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/cx23885/cx23885-cards.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx23885/cx23885-cards.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx23885/cx23885-cards.c</a></div><div class='hunk'>@@ -26,6 +26,7 @@</div><div class='ctx'> #include &lt;media/cx25840.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "cx23885.h"</div><div class='add'>+#include "tuner-xc2028.h"</div><div class='ctx'> </div><div class='ctx'> /* ------------------------------------------------------------------ */</div><div class='ctx'> /* board config info                                                  */</div><div class='hunk'>@@ -38,16 +39,16 @@ struct cx23885_board cx23885_boards[] = {</div><div class='ctx'> 		.input          = {{</div><div class='ctx'> 			.type   = CX23885_VMUX_COMPOSITE1,</div><div class='ctx'> 			.vmux   = 0,</div><div class='del'>-		},{</div><div class='add'>+		}, {</div><div class='ctx'> 			.type   = CX23885_VMUX_COMPOSITE2,</div><div class='ctx'> 			.vmux   = 1,</div><div class='del'>-		},{</div><div class='add'>+		}, {</div><div class='ctx'> 			.type   = CX23885_VMUX_COMPOSITE3,</div><div class='ctx'> 			.vmux   = 2,</div><div class='del'>-		},{</div><div class='add'>+		}, {</div><div class='ctx'> 			.type   = CX23885_VMUX_COMPOSITE4,</div><div class='ctx'> 			.vmux   = 3,</div><div class='del'>-		}},</div><div class='add'>+		} },</div><div class='ctx'> 	},</div><div class='ctx'> 	[CX23885_BOARD_HAUPPAUGE_HVR1800lp] = {</div><div class='ctx'> 		.name		= "Hauppauge WinTV-HVR1800lp",</div><div class='hunk'>@@ -56,19 +57,19 @@ struct cx23885_board cx23885_boards[] = {</div><div class='ctx'> 			.type   = CX23885_VMUX_TELEVISION,</div><div class='ctx'> 			.vmux   = 0,</div><div class='ctx'> 			.gpio0  = 0xff00,</div><div class='del'>-		},{</div><div class='add'>+		}, {</div><div class='ctx'> 			.type   = CX23885_VMUX_DEBUG,</div><div class='ctx'> 			.vmux   = 0,</div><div class='ctx'> 			.gpio0  = 0xff01,</div><div class='del'>-		},{</div><div class='add'>+		}, {</div><div class='ctx'> 			.type   = CX23885_VMUX_COMPOSITE1,</div><div class='ctx'> 			.vmux   = 1,</div><div class='ctx'> 			.gpio0  = 0xff02,</div><div class='del'>-		},{</div><div class='add'>+		}, {</div><div class='ctx'> 			.type   = CX23885_VMUX_SVIDEO,</div><div class='ctx'> 			.vmux   = 2,</div><div class='ctx'> 			.gpio0  = 0xff02,</div><div class='del'>-		}},</div><div class='add'>+		} },</div><div class='ctx'> 	},</div><div class='ctx'> 	[CX23885_BOARD_HAUPPAUGE_HVR1800] = {</div><div class='ctx'> 		.name		= "Hauppauge WinTV-HVR1800",</div><div class='hunk'>@@ -83,20 +84,20 @@ struct cx23885_board cx23885_boards[] = {</div><div class='ctx'> 					CX25840_VIN5_CH2 |</div><div class='ctx'> 					CX25840_VIN2_CH1,</div><div class='ctx'> 			.gpio0  = 0,</div><div class='del'>-		},{</div><div class='add'>+		}, {</div><div class='ctx'> 			.type   = CX23885_VMUX_COMPOSITE1,</div><div class='ctx'> 			.vmux   =	CX25840_VIN7_CH3 |</div><div class='ctx'> 					CX25840_VIN4_CH2 |</div><div class='ctx'> 					CX25840_VIN6_CH1,</div><div class='ctx'> 			.gpio0  = 0,</div><div class='del'>-		},{</div><div class='add'>+		}, {</div><div class='ctx'> 			.type   = CX23885_VMUX_SVIDEO,</div><div class='ctx'> 			.vmux   =	CX25840_VIN7_CH3 |</div><div class='ctx'> 					CX25840_VIN4_CH2 |</div><div class='ctx'> 					CX25840_VIN8_CH1 |</div><div class='ctx'> 					CX25840_SVIDEO_ON,</div><div class='ctx'> 			.gpio0  = 0,</div><div class='del'>-		}},</div><div class='add'>+		} },</div><div class='ctx'> 	},</div><div class='ctx'> 	[CX23885_BOARD_HAUPPAUGE_HVR1250] = {</div><div class='ctx'> 		.name		= "Hauppauge WinTV-HVR1250",</div><div class='hunk'>@@ -105,19 +106,19 @@ struct cx23885_board cx23885_boards[] = {</div><div class='ctx'> 			.type   = CX23885_VMUX_TELEVISION,</div><div class='ctx'> 			.vmux   = 0,</div><div class='ctx'> 			.gpio0  = 0xff00,</div><div class='del'>-		},{</div><div class='add'>+		}, {</div><div class='ctx'> 			.type   = CX23885_VMUX_DEBUG,</div><div class='ctx'> 			.vmux   = 0,</div><div class='ctx'> 			.gpio0  = 0xff01,</div><div class='del'>-		},{</div><div class='add'>+		}, {</div><div class='ctx'> 			.type   = CX23885_VMUX_COMPOSITE1,</div><div class='ctx'> 			.vmux   = 1,</div><div class='ctx'> 			.gpio0  = 0xff02,</div><div class='del'>-		},{</div><div class='add'>+		}, {</div><div class='ctx'> 			.type   = CX23885_VMUX_SVIDEO,</div><div class='ctx'> 			.vmux   = 2,</div><div class='ctx'> 			.gpio0  = 0xff02,</div><div class='del'>-		}},</div><div class='add'>+		} },</div><div class='ctx'> 	},</div><div class='ctx'> 	[CX23885_BOARD_DVICO_FUSIONHDTV_5_EXP] = {</div><div class='ctx'> 		.name		= "DViCO FusionHDTV5 Express",</div><div class='hunk'>@@ -148,6 +149,15 @@ struct cx23885_board cx23885_boards[] = {</div><div class='ctx'> 		.portb		= CX23885_MPEG_DVB,</div><div class='ctx'> 		.portc		= CX23885_MPEG_DVB,</div><div class='ctx'> 	},</div><div class='add'>+	[CX23885_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL_EXP] = {</div><div class='add'>+		.name		= "DViCO FusionHDTV DVB-T Dual Express",</div><div class='add'>+		.portb		= CX23885_MPEG_DVB,</div><div class='add'>+		.portc		= CX23885_MPEG_DVB,</div><div class='add'>+	},</div><div class='add'>+	[CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H] = {</div><div class='add'>+		.name		= "Leadtek Winfast PxDVR3200 H",</div><div class='add'>+		.portc		= CX23885_MPEG_DVB,</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> const unsigned int cx23885_bcount = ARRAY_SIZE(cx23885_boards);</div><div class='ctx'> </div><div class='hunk'>@@ -159,43 +169,43 @@ struct cx23885_subid cx23885_subids[] = {</div><div class='ctx'> 		.subvendor = 0x0070,</div><div class='ctx'> 		.subdevice = 0x3400,</div><div class='ctx'> 		.card      = CX23885_BOARD_UNKNOWN,</div><div class='del'>-	},{</div><div class='add'>+	}, {</div><div class='ctx'> 		.subvendor = 0x0070,</div><div class='ctx'> 		.subdevice = 0x7600,</div><div class='ctx'> 		.card      = CX23885_BOARD_HAUPPAUGE_HVR1800lp,</div><div class='del'>-	},{</div><div class='add'>+	}, {</div><div class='ctx'> 		.subvendor = 0x0070,</div><div class='ctx'> 		.subdevice = 0x7800,</div><div class='ctx'> 		.card      = CX23885_BOARD_HAUPPAUGE_HVR1800,</div><div class='del'>-	},{</div><div class='add'>+	}, {</div><div class='ctx'> 		.subvendor = 0x0070,</div><div class='ctx'> 		.subdevice = 0x7801,</div><div class='ctx'> 		.card      = CX23885_BOARD_HAUPPAUGE_HVR1800,</div><div class='del'>-	},{</div><div class='add'>+	}, {</div><div class='ctx'> 		.subvendor = 0x0070,</div><div class='ctx'> 		.subdevice = 0x7809,</div><div class='ctx'> 		.card      = CX23885_BOARD_HAUPPAUGE_HVR1800,</div><div class='del'>-	},{</div><div class='add'>+	}, {</div><div class='ctx'> 		.subvendor = 0x0070,</div><div class='ctx'> 		.subdevice = 0x7911,</div><div class='ctx'> 		.card      = CX23885_BOARD_HAUPPAUGE_HVR1250,</div><div class='del'>-	},{</div><div class='add'>+	}, {</div><div class='ctx'> 		.subvendor = 0x18ac,</div><div class='ctx'> 		.subdevice = 0xd500,</div><div class='ctx'> 		.card      = CX23885_BOARD_DVICO_FUSIONHDTV_5_EXP,</div><div class='del'>-	},{</div><div class='add'>+	}, {</div><div class='ctx'> 		.subvendor = 0x0070,</div><div class='ctx'> 		.subdevice = 0x7790,</div><div class='ctx'> 		.card      = CX23885_BOARD_HAUPPAUGE_HVR1500Q,</div><div class='del'>-	},{</div><div class='add'>+	}, {</div><div class='ctx'> 		.subvendor = 0x0070,</div><div class='ctx'> 		.subdevice = 0x7797,</div><div class='ctx'> 		.card      = CX23885_BOARD_HAUPPAUGE_HVR1500Q,</div><div class='del'>-	},{</div><div class='add'>+	}, {</div><div class='ctx'> 		.subvendor = 0x0070,</div><div class='ctx'> 		.subdevice = 0x7710,</div><div class='ctx'> 		.card      = CX23885_BOARD_HAUPPAUGE_HVR1500,</div><div class='del'>-	},{</div><div class='add'>+	}, {</div><div class='ctx'> 		.subvendor = 0x0070,</div><div class='ctx'> 		.subdevice = 0x7717,</div><div class='ctx'> 		.card      = CX23885_BOARD_HAUPPAUGE_HVR1500,</div><div class='hunk'>@@ -215,10 +225,18 @@ struct cx23885_subid cx23885_subids[] = {</div><div class='ctx'> 		.subvendor = 0x0070,</div><div class='ctx'> 		.subdevice = 0x8010,</div><div class='ctx'> 		.card      = CX23885_BOARD_HAUPPAUGE_HVR1400,</div><div class='del'>-	},{</div><div class='add'>+	}, {</div><div class='ctx'> 		.subvendor = 0x18ac,</div><div class='ctx'> 		.subdevice = 0xd618,</div><div class='ctx'> 		.card      = CX23885_BOARD_DVICO_FUSIONHDTV_7_DUAL_EXP,</div><div class='add'>+	}, {</div><div class='add'>+		.subvendor = 0x18ac,</div><div class='add'>+		.subdevice = 0xdb78,</div><div class='add'>+		.card      = CX23885_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL_EXP,</div><div class='add'>+	}, {</div><div class='add'>+		.subvendor = 0x107d,</div><div class='add'>+		.subdevice = 0x6681,</div><div class='add'>+		.card      = CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> const unsigned int cx23885_idcount = ARRAY_SIZE(cx23885_subids);</div><div class='hunk'>@@ -229,23 +247,25 @@ void cx23885_card_list(struct cx23885_dev *dev)</div><div class='ctx'> </div><div class='ctx'> 	if (0 == dev-&gt;pci-&gt;subsystem_vendor &amp;&amp;</div><div class='ctx'> 	    0 == dev-&gt;pci-&gt;subsystem_device) {</div><div class='del'>-		printk("%s: Your board has no valid PCIe Subsystem ID and thus can't\n"</div><div class='del'>-		       "%s: be autodetected.  Please pass card=&lt;n&gt; insmod option to\n"</div><div class='del'>-		       "%s: workaround that.  Redirect complaints to the vendor of\n"</div><div class='del'>-		       "%s: the TV card.  Best regards,\n"</div><div class='add'>+		printk(KERN_INFO</div><div class='add'>+			"%s: Board has no valid PCIe Subsystem ID and can't\n"</div><div class='add'>+		       "%s: be autodetected. Pass card=&lt;n&gt; insmod option\n"</div><div class='add'>+		       "%s: to workaround that. Redirect complaints to the\n"</div><div class='add'>+		       "%s: vendor of the TV card.  Best regards,\n"</div><div class='ctx'> 		       "%s:         -- tux\n",</div><div class='ctx'> 		       dev-&gt;name, dev-&gt;name, dev-&gt;name, dev-&gt;name, dev-&gt;name);</div><div class='ctx'> 	} else {</div><div class='del'>-		printk("%s: Your board isn't known (yet) to the driver.  You can\n"</div><div class='del'>-		       "%s: try to pick one of the existing card configs via\n"</div><div class='add'>+		printk(KERN_INFO</div><div class='add'>+			"%s: Your board isn't known (yet) to the driver.\n"</div><div class='add'>+		       "%s: Try to pick one of the existing card configs via\n"</div><div class='ctx'> 		       "%s: card=&lt;n&gt; insmod option.  Updating to the latest\n"</div><div class='ctx'> 		       "%s: version might help as well.\n",</div><div class='ctx'> 		       dev-&gt;name, dev-&gt;name, dev-&gt;name, dev-&gt;name);</div><div class='ctx'> 	}</div><div class='del'>-	printk("%s: Here is a list of valid choices for the card=&lt;n&gt; insmod option:\n",</div><div class='add'>+	printk(KERN_INFO "%s: Here is a list of valid choices for the card=&lt;n&gt; insmod option:\n",</div><div class='ctx'> 	       dev-&gt;name);</div><div class='ctx'> 	for (i = 0; i &lt; cx23885_bcount; i++)</div><div class='del'>-		printk("%s:    card=%d -&gt; %s\n",</div><div class='add'>+		printk(KERN_INFO "%s:    card=%d -&gt; %s\n",</div><div class='ctx'> 		       dev-&gt;name, i, cx23885_boards[i].name);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -253,11 +273,11 @@ static void hauppauge_eeprom(struct cx23885_dev *dev, u8 *eeprom_data)</div><div class='ctx'> {</div><div class='ctx'> 	struct tveeprom tv;</div><div class='ctx'> </div><div class='del'>-	tveeprom_hauppauge_analog(&amp;dev-&gt;i2c_bus[0].i2c_client, &amp;tv, eeprom_data);</div><div class='add'>+	tveeprom_hauppauge_analog(&amp;dev-&gt;i2c_bus[0].i2c_client, &amp;tv,</div><div class='add'>+		eeprom_data);</div><div class='ctx'> </div><div class='ctx'> 	/* Make sure we support the board model */</div><div class='del'>-	switch (tv.model)</div><div class='del'>-	{</div><div class='add'>+	switch (tv.model) {</div><div class='ctx'> 	case 71009:</div><div class='ctx'> 		/* WinTV-HVR1200 (PCIe, Retail, full height)</div><div class='ctx'> 		 * DVB-T and basic analog */</div><div class='hunk'>@@ -285,21 +305,51 @@ static void hauppauge_eeprom(struct cx23885_dev *dev, u8 *eeprom_data)</div><div class='ctx'> 	case 71999:</div><div class='ctx'> 		/* WinTV-HVR1200 (PCIe, OEM, full height)</div><div class='ctx'> 		 * DVB-T and basic analog */</div><div class='del'>-	case 76601: /* WinTV-HVR1800lp (PCIe, Retail, No IR, Dual channel ATSC and MPEG2 HW Encoder */</div><div class='del'>-	case 77001: /* WinTV-HVR1500 (Express Card, OEM, No IR, ATSC and Basic analog */</div><div class='del'>-	case 77011: /* WinTV-HVR1500 (Express Card, Retail, No IR, ATSC and Basic analog */</div><div class='del'>-	case 77041: /* WinTV-HVR1500Q (Express Card, OEM, No IR, ATSC/QAM and Basic analog */</div><div class='del'>-	case 77051: /* WinTV-HVR1500Q (Express Card, Retail, No IR, ATSC/QAM and Basic analog */</div><div class='del'>-	case 78011: /* WinTV-HVR1800 (PCIe, Retail, 3.5mm in, IR, No FM, Dual channel ATSC and MPEG2 HW Encoder */</div><div class='del'>-	case 78501: /* WinTV-HVR1800 (PCIe, OEM, RCA in, No IR, FM, Dual channel ATSC and MPEG2 HW Encoder */</div><div class='del'>-	case 78521: /* WinTV-HVR1800 (PCIe, OEM, RCA in, No IR, FM, Dual channel ATSC and MPEG2 HW Encoder */</div><div class='del'>-	case 78531: /* WinTV-HVR1800 (PCIe, OEM, RCA in, No IR, No FM, Dual channel ATSC and MPEG2 HW Encoder */</div><div class='del'>-	case 78631: /* WinTV-HVR1800 (PCIe, OEM, No IR, No FM, Dual channel ATSC and MPEG2 HW Encoder */</div><div class='del'>-	case 79001: /* WinTV-HVR1250 (PCIe, Retail, IR, full height, ATSC and Basic analog */</div><div class='del'>-	case 79101: /* WinTV-HVR1250 (PCIe, Retail, IR, half height, ATSC and Basic analog */</div><div class='del'>-	case 79561: /* WinTV-HVR1250 (PCIe, OEM, No IR, half height, ATSC and Basic analog */</div><div class='del'>-	case 79571: /* WinTV-HVR1250 (PCIe, OEM, No IR, full height, ATSC and Basic analog */</div><div class='del'>-	case 79671: /* WinTV-HVR1250 (PCIe, OEM, No IR, half height, ATSC and Basic analog */</div><div class='add'>+	case 76601:</div><div class='add'>+		/* WinTV-HVR1800lp (PCIe, Retail, No IR, Dual</div><div class='add'>+			channel ATSC and MPEG2 HW Encoder */</div><div class='add'>+	case 77001:</div><div class='add'>+		/* WinTV-HVR1500 (Express Card, OEM, No IR, ATSC</div><div class='add'>+			and Basic analog */</div><div class='add'>+	case 77011:</div><div class='add'>+		/* WinTV-HVR1500 (Express Card, Retail, No IR, ATSC</div><div class='add'>+			and Basic analog */</div><div class='add'>+	case 77041:</div><div class='add'>+		/* WinTV-HVR1500Q (Express Card, OEM, No IR, ATSC/QAM</div><div class='add'>+			and Basic analog */</div><div class='add'>+	case 77051:</div><div class='add'>+		/* WinTV-HVR1500Q (Express Card, Retail, No IR, ATSC/QAM</div><div class='add'>+			and Basic analog */</div><div class='add'>+	case 78011:</div><div class='add'>+		/* WinTV-HVR1800 (PCIe, Retail, 3.5mm in, IR, No FM,</div><div class='add'>+			Dual channel ATSC and MPEG2 HW Encoder */</div><div class='add'>+	case 78501:</div><div class='add'>+		/* WinTV-HVR1800 (PCIe, OEM, RCA in, No IR, FM,</div><div class='add'>+			Dual channel ATSC and MPEG2 HW Encoder */</div><div class='add'>+	case 78521:</div><div class='add'>+		/* WinTV-HVR1800 (PCIe, OEM, RCA in, No IR, FM,</div><div class='add'>+			Dual channel ATSC and MPEG2 HW Encoder */</div><div class='add'>+	case 78531:</div><div class='add'>+		/* WinTV-HVR1800 (PCIe, OEM, RCA in, No IR, No FM,</div><div class='add'>+			Dual channel ATSC and MPEG2 HW Encoder */</div><div class='add'>+	case 78631:</div><div class='add'>+		/* WinTV-HVR1800 (PCIe, OEM, No IR, No FM,</div><div class='add'>+			Dual channel ATSC and MPEG2 HW Encoder */</div><div class='add'>+	case 79001:</div><div class='add'>+		/* WinTV-HVR1250 (PCIe, Retail, IR, full height,</div><div class='add'>+			ATSC and Basic analog */</div><div class='add'>+	case 79101:</div><div class='add'>+		/* WinTV-HVR1250 (PCIe, Retail, IR, half height,</div><div class='add'>+			ATSC and Basic analog */</div><div class='add'>+	case 79561:</div><div class='add'>+		/* WinTV-HVR1250 (PCIe, OEM, No IR, half height,</div><div class='add'>+			ATSC and Basic analog */</div><div class='add'>+	case 79571:</div><div class='add'>+		/* WinTV-HVR1250 (PCIe, OEM, No IR, full height,</div><div class='add'>+		 ATSC and Basic analog */</div><div class='add'>+	case 79671:</div><div class='add'>+		/* WinTV-HVR1250 (PCIe, OEM, No IR, half height,</div><div class='add'>+			ATSC and Basic analog */</div><div class='ctx'> 	case 80019:</div><div class='ctx'> 		/* WinTV-HVR1400 (Express Card, Retail, IR,</div><div class='ctx'> 		 * DVB-T and Basic analog */</div><div class='hunk'>@@ -311,7 +361,8 @@ static void hauppauge_eeprom(struct cx23885_dev *dev, u8 *eeprom_data)</div><div class='ctx'> 		 * DVB-T and MPEG2 HW Encoder */</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		printk("%s: warning: unknown hauppauge model #%d\n", dev-&gt;name, tv.model);</div><div class='add'>+		printk(KERN_WARNING "%s: warning: unknown hauppauge model #%d\n",</div><div class='add'>+			dev-&gt;name, tv.model);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -319,37 +370,37 @@ static void hauppauge_eeprom(struct cx23885_dev *dev, u8 *eeprom_data)</div><div class='ctx'> 			dev-&gt;name, tv.model);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Tuner callback function for cx23885 boards. Currently only needed</div><div class='del'>- * for HVR1500Q, which has an xc5000 tuner.</div><div class='del'>- */</div><div class='del'>-int cx23885_tuner_callback(void *priv, int command, int arg)</div><div class='add'>+int cx23885_tuner_callback(void *priv, int component, int command, int arg)</div><div class='ctx'> {</div><div class='del'>-	struct cx23885_i2c *bus = priv;</div><div class='del'>-	struct cx23885_dev *dev = bus-&gt;dev;</div><div class='add'>+	struct cx23885_tsport *port = priv;</div><div class='add'>+	struct cx23885_dev *dev = port-&gt;dev;</div><div class='ctx'> 	u32 bitmask = 0;</div><div class='ctx'> </div><div class='add'>+	if (command == XC2028_RESET_CLK)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	if (command != 0) {</div><div class='ctx'> 		printk(KERN_ERR "%s(): Unknown command 0x%x.\n",</div><div class='ctx'> 			__func__, command);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	switch(dev-&gt;board) {</div><div class='add'>+	switch (dev-&gt;board) {</div><div class='add'>+	case CX23885_BOARD_HAUPPAUGE_HVR1400:</div><div class='add'>+	case CX23885_BOARD_HAUPPAUGE_HVR1500:</div><div class='ctx'> 	case CX23885_BOARD_HAUPPAUGE_HVR1500Q:</div><div class='del'>-		/* Tuner Reset Command from xc5000 */</div><div class='del'>-		if (command == 0)</div><div class='del'>-			bitmask = 0x04;</div><div class='add'>+	case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H:</div><div class='add'>+		/* Tuner Reset Command */</div><div class='add'>+		bitmask = 0x04;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CX23885_BOARD_DVICO_FUSIONHDTV_7_DUAL_EXP:</div><div class='del'>-		if (command == 0) {</div><div class='del'>-</div><div class='del'>-			/* Two identical tuners on two different i2c buses,</div><div class='del'>-			 * we need to reset the correct gpio. */</div><div class='del'>-			if (bus-&gt;nr == 0)</div><div class='del'>-				bitmask = 0x01;</div><div class='del'>-			else if (bus-&gt;nr == 1)</div><div class='del'>-				bitmask = 0x04;</div><div class='del'>-		}</div><div class='add'>+	case CX23885_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL_EXP:</div><div class='add'>+		/* Two identical tuners on two different i2c buses,</div><div class='add'>+		 * we need to reset the correct gpio. */</div><div class='add'>+		if (port-&gt;nr == 0)</div><div class='add'>+			bitmask = 0x01;</div><div class='add'>+		else if (port-&gt;nr == 1)</div><div class='add'>+			bitmask = 0x04;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -365,7 +416,7 @@ int cx23885_tuner_callback(void *priv, int command, int arg)</div><div class='ctx'> </div><div class='ctx'> void cx23885_gpio_setup(struct cx23885_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	switch(dev-&gt;board) {</div><div class='add'>+	switch (dev-&gt;board) {</div><div class='ctx'> 	case CX23885_BOARD_HAUPPAUGE_HVR1250:</div><div class='ctx'> 		/* GPIO-0 cx24227 demodulator reset */</div><div class='ctx'> 		cx_set(GP0_IO, 0x00010001); /* Bring the part out of reset */</div><div class='hunk'>@@ -465,6 +516,32 @@ void cx23885_gpio_setup(struct cx23885_dev *dev)</div><div class='ctx'> 		mdelay(20);</div><div class='ctx'> 		cx_set(GP0_IO, 0x000f000f);</div><div class='ctx'> 		break;</div><div class='add'>+	case CX23885_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL_EXP:</div><div class='add'>+		/* GPIO-0 portb xc3028 reset */</div><div class='add'>+		/* GPIO-1 portb zl10353 reset */</div><div class='add'>+		/* GPIO-2 portc xc3028 reset */</div><div class='add'>+		/* GPIO-3 portc zl10353 reset */</div><div class='add'>+</div><div class='add'>+		/* Put the parts into reset and back */</div><div class='add'>+		cx_set(GP0_IO, 0x000f0000);</div><div class='add'>+		mdelay(20);</div><div class='add'>+		cx_clear(GP0_IO, 0x0000000f);</div><div class='add'>+		mdelay(20);</div><div class='add'>+		cx_set(GP0_IO, 0x000f000f);</div><div class='add'>+		break;</div><div class='add'>+	case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H:</div><div class='add'>+		/* GPIO-2  xc3028 tuner reset */</div><div class='add'>+</div><div class='add'>+		/* The following GPIO's are on the internal AVCore (cx25840) */</div><div class='add'>+		/* GPIO-?  zl10353 demod reset */</div><div class='add'>+</div><div class='add'>+		/* Put the parts into reset and back */</div><div class='add'>+		cx_set(GP0_IO, 0x00040000);</div><div class='add'>+		mdelay(20);</div><div class='add'>+		cx_clear(GP0_IO, 0x00000004);</div><div class='add'>+		mdelay(20);</div><div class='add'>+		cx_set(GP0_IO, 0x00040004);</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -479,6 +556,9 @@ int cx23885_ir_init(struct cx23885_dev *dev)</div><div class='ctx'> 	case CX23885_BOARD_HAUPPAUGE_HVR1400:</div><div class='ctx'> 		/* FIXME: Implement me */</div><div class='ctx'> 		break;</div><div class='add'>+	case CX23885_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL_EXP:</div><div class='add'>+		request_module("ir-kbd-i2c");</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -516,6 +596,7 @@ void cx23885_card_setup(struct cx23885_dev *dev)</div><div class='ctx'> </div><div class='ctx'> 	switch (dev-&gt;board) {</div><div class='ctx'> 	case CX23885_BOARD_DVICO_FUSIONHDTV_7_DUAL_EXP:</div><div class='add'>+	case CX23885_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL_EXP:</div><div class='ctx'> 		ts2-&gt;gen_ctrl_val  = 0xc; /* Serial bus + punctured clock */</div><div class='ctx'> 		ts2-&gt;ts_clk_en_val = 0x1; /* Enable TS_CLK */</div><div class='ctx'> 		ts2-&gt;src_sel_val   = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO;</div><div class='hunk'>@@ -548,6 +629,7 @@ void cx23885_card_setup(struct cx23885_dev *dev)</div><div class='ctx'> 	case CX23885_BOARD_HAUPPAUGE_HVR1200:</div><div class='ctx'> 	case CX23885_BOARD_HAUPPAUGE_HVR1700:</div><div class='ctx'> 	case CX23885_BOARD_HAUPPAUGE_HVR1400:</div><div class='add'>+	case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H:</div><div class='ctx'> 	default:</div><div class='ctx'> 		ts2-&gt;gen_ctrl_val  = 0xc; /* Serial bus + punctured clock */</div><div class='ctx'> 		ts2-&gt;ts_clk_en_val = 0x1; /* Enable TS_CLK */</div><div class='hunk'>@@ -561,16 +643,10 @@ void cx23885_card_setup(struct cx23885_dev *dev)</div><div class='ctx'> 	case CX23885_BOARD_HAUPPAUGE_HVR1800:</div><div class='ctx'> 	case CX23885_BOARD_HAUPPAUGE_HVR1800lp:</div><div class='ctx'> 	case CX23885_BOARD_HAUPPAUGE_HVR1700:</div><div class='add'>+	case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H:</div><div class='ctx'> 		request_module("cx25840");</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* ------------------------------------------------------------------ */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Local variables:</div><div class='del'>- * c-basic-offset: 8</div><div class='del'>- * End:</div><div class='del'>- * kate: eol "unix"; indent-width 3; remove-trailing-space on; replace-trailing-space-save on; tab-width 8; replace-tabs off; space-indent off; mixed-indent off</div><div class='del'>- */</div><div class='head'>diff --git a/drivers/media/video/cx23885/cx23885-core.c b/drivers/media/video/cx23885/cx23885-core.c<br/>index 25fb09938744..8f6fb2add7de 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx23885/cx23885-core.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/cx23885/cx23885-core.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx23885/cx23885-core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx23885/cx23885-core.c</a></div><div class='hunk'>@@ -37,12 +37,12 @@ MODULE_AUTHOR("Steven Toth &lt;stoth@linuxtv.org&gt;");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='ctx'> static unsigned int debug;</div><div class='del'>-module_param(debug,int,0644);</div><div class='del'>-MODULE_PARM_DESC(debug,"enable debug messages");</div><div class='add'>+module_param(debug, int, 0644);</div><div class='add'>+MODULE_PARM_DESC(debug, "enable debug messages");</div><div class='ctx'> </div><div class='ctx'> static unsigned int card[]  = {[0 ... (CX23885_MAXBOARDS - 1)] = UNSET };</div><div class='ctx'> module_param_array(card,  int, NULL, 0444);</div><div class='del'>-MODULE_PARM_DESC(card,"card type");</div><div class='add'>+MODULE_PARM_DESC(card, "card type");</div><div class='ctx'> </div><div class='ctx'> #define dprintk(level, fmt, arg...)\</div><div class='ctx'> 	do { if (debug &gt;= level)\</div><div class='hunk'>@@ -364,13 +364,12 @@ void cx23885_wakeup(struct cx23885_tsport *port,</div><div class='ctx'> 		list_del(&amp;buf-&gt;vb.queue);</div><div class='ctx'> 		wake_up(&amp;buf-&gt;vb.done);</div><div class='ctx'> 	}</div><div class='del'>-	if (list_empty(&amp;q-&gt;active)) {</div><div class='add'>+	if (list_empty(&amp;q-&gt;active))</div><div class='ctx'> 		del_timer(&amp;q-&gt;timeout);</div><div class='del'>-	} else {</div><div class='add'>+	else</div><div class='ctx'> 		mod_timer(&amp;q-&gt;timeout, jiffies + BUFFER_TIMEOUT);</div><div class='del'>-	}</div><div class='ctx'> 	if (bc != 1)</div><div class='del'>-		printk("%s: %d buffers handled (should be 1)\n",</div><div class='add'>+		printk(KERN_WARNING "%s: %d buffers handled (should be 1)\n",</div><div class='ctx'> 		       __func__, bc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -381,8 +380,7 @@ int cx23885_sram_channel_setup(struct cx23885_dev *dev,</div><div class='ctx'> 	unsigned int i, lines;</div><div class='ctx'> 	u32 cdt;</div><div class='ctx'> </div><div class='del'>-	if (ch-&gt;cmds_start == 0)</div><div class='del'>-	{</div><div class='add'>+	if (ch-&gt;cmds_start == 0) {</div><div class='ctx'> 		dprintk(1, "%s() Erasing channel [%s]\n", __func__,</div><div class='ctx'> 			ch-&gt;name);</div><div class='ctx'> 		cx_write(ch-&gt;ptr1_reg, 0);</div><div class='hunk'>@@ -418,15 +416,15 @@ int cx23885_sram_channel_setup(struct cx23885_dev *dev,</div><div class='ctx'> </div><div class='ctx'> 	/* write CMDS */</div><div class='ctx'> 	if (ch-&gt;jumponly)</div><div class='del'>-		cx_write(ch-&gt;cmds_start +  0, 8);</div><div class='add'>+		cx_write(ch-&gt;cmds_start + 0, 8);</div><div class='ctx'> 	else</div><div class='del'>-		cx_write(ch-&gt;cmds_start +  0, risc);</div><div class='add'>+		cx_write(ch-&gt;cmds_start + 0, risc);</div><div class='ctx'> 	cx_write(ch-&gt;cmds_start +  4, 0); /* 64 bits 63-32 */</div><div class='ctx'> 	cx_write(ch-&gt;cmds_start +  8, cdt);</div><div class='ctx'> 	cx_write(ch-&gt;cmds_start + 12, (lines*16) &gt;&gt; 3);</div><div class='ctx'> 	cx_write(ch-&gt;cmds_start + 16, ch-&gt;ctrl_start);</div><div class='ctx'> 	if (ch-&gt;jumponly)</div><div class='del'>-		cx_write(ch-&gt;cmds_start + 20, 0x80000000 | (64 &gt;&gt; 2) );</div><div class='add'>+		cx_write(ch-&gt;cmds_start + 20, 0x80000000 | (64 &gt;&gt; 2));</div><div class='ctx'> 	else</div><div class='ctx'> 		cx_write(ch-&gt;cmds_start + 20, 64 &gt;&gt; 2);</div><div class='ctx'> 	for (i = 24; i &lt; 80; i += 4)</div><div class='hunk'>@@ -436,9 +434,9 @@ int cx23885_sram_channel_setup(struct cx23885_dev *dev,</div><div class='ctx'> 	cx_write(ch-&gt;ptr1_reg, ch-&gt;fifo_start);</div><div class='ctx'> 	cx_write(ch-&gt;ptr2_reg, cdt);</div><div class='ctx'> 	cx_write(ch-&gt;cnt2_reg, (lines*16) &gt;&gt; 3);</div><div class='del'>-	cx_write(ch-&gt;cnt1_reg, (bpl &gt;&gt; 3) -1);</div><div class='add'>+	cx_write(ch-&gt;cnt1_reg, (bpl &gt;&gt; 3) - 1);</div><div class='ctx'> </div><div class='del'>-	dprintk(2,"[bridge %d] sram setup %s: bpl=%d lines=%d\n",</div><div class='add'>+	dprintk(2, "[bridge %d] sram setup %s: bpl=%d lines=%d\n",</div><div class='ctx'> 		dev-&gt;bridge,</div><div class='ctx'> 		ch-&gt;name,</div><div class='ctx'> 		bpl,</div><div class='hunk'>@@ -469,43 +467,43 @@ void cx23885_sram_channel_dump(struct cx23885_dev *dev,</div><div class='ctx'> 	u32 risc;</div><div class='ctx'> 	unsigned int i, j, n;</div><div class='ctx'> </div><div class='del'>-	printk("%s: %s - dma channel status dump\n",</div><div class='add'>+	printk(KERN_WARNING "%s: %s - dma channel status dump\n",</div><div class='ctx'> 	       dev-&gt;name, ch-&gt;name);</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(name); i++)</div><div class='del'>-		printk("%s:   cmds: %-15s: 0x%08x\n",</div><div class='add'>+		printk(KERN_WARNING "%s:   cmds: %-15s: 0x%08x\n",</div><div class='ctx'> 		       dev-&gt;name, name[i],</div><div class='ctx'> 		       cx_read(ch-&gt;cmds_start + 4*i));</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 4; i++) {</div><div class='ctx'> 		risc = cx_read(ch-&gt;cmds_start + 4 * (i + 14));</div><div class='del'>-		printk("%s:   risc%d: ", dev-&gt;name, i);</div><div class='add'>+		printk(KERN_WARNING "%s:   risc%d: ", dev-&gt;name, i);</div><div class='ctx'> 		cx23885_risc_decode(risc);</div><div class='ctx'> 	}</div><div class='ctx'> 	for (i = 0; i &lt; (64 &gt;&gt; 2); i += n) {</div><div class='ctx'> 		risc = cx_read(ch-&gt;ctrl_start + 4 * i);</div><div class='ctx'> 		/* No consideration for bits 63-32 */</div><div class='ctx'> </div><div class='del'>-		printk("%s:   (0x%08x) iq %x: ", dev-&gt;name,</div><div class='add'>+		printk(KERN_WARNING "%s:   (0x%08x) iq %x: ", dev-&gt;name,</div><div class='ctx'> 		       ch-&gt;ctrl_start + 4 * i, i);</div><div class='ctx'> 		n = cx23885_risc_decode(risc);</div><div class='ctx'> 		for (j = 1; j &lt; n; j++) {</div><div class='ctx'> 			risc = cx_read(ch-&gt;ctrl_start + 4 * (i + j));</div><div class='del'>-			printk("%s:   iq %x: 0x%08x [ arg #%d ]\n",</div><div class='add'>+			printk(KERN_WARNING "%s:   iq %x: 0x%08x [ arg #%d ]\n",</div><div class='ctx'> 			       dev-&gt;name, i+j, risc, j);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	printk("%s: fifo: 0x%08x -&gt; 0x%x\n",</div><div class='add'>+	printk(KERN_WARNING "%s: fifo: 0x%08x -&gt; 0x%x\n",</div><div class='ctx'> 	       dev-&gt;name, ch-&gt;fifo_start, ch-&gt;fifo_start+ch-&gt;fifo_size);</div><div class='del'>-	printk("%s: ctrl: 0x%08x -&gt; 0x%x\n",</div><div class='add'>+	printk(KERN_WARNING "%s: ctrl: 0x%08x -&gt; 0x%x\n",</div><div class='ctx'> 	       dev-&gt;name, ch-&gt;ctrl_start, ch-&gt;ctrl_start + 6*16);</div><div class='del'>-	printk("%s:   ptr1_reg: 0x%08x\n",</div><div class='add'>+	printk(KERN_WARNING "%s:   ptr1_reg: 0x%08x\n",</div><div class='ctx'> 	       dev-&gt;name, cx_read(ch-&gt;ptr1_reg));</div><div class='del'>-	printk("%s:   ptr2_reg: 0x%08x\n",</div><div class='add'>+	printk(KERN_WARNING "%s:   ptr2_reg: 0x%08x\n",</div><div class='ctx'> 	       dev-&gt;name, cx_read(ch-&gt;ptr2_reg));</div><div class='del'>-	printk("%s:   cnt1_reg: 0x%08x\n",</div><div class='add'>+	printk(KERN_WARNING "%s:   cnt1_reg: 0x%08x\n",</div><div class='ctx'> 	       dev-&gt;name, cx_read(ch-&gt;cnt1_reg));</div><div class='del'>-	printk("%s:   cnt2_reg: 0x%08x\n",</div><div class='add'>+	printk(KERN_WARNING "%s:   cnt2_reg: 0x%08x\n",</div><div class='ctx'> 	       dev-&gt;name, cx_read(ch-&gt;cnt2_reg));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -515,13 +513,13 @@ static void cx23885_risc_disasm(struct cx23885_tsport *port,</div><div class='ctx'> 	struct cx23885_dev *dev = port-&gt;dev;</div><div class='ctx'> 	unsigned int i, j, n;</div><div class='ctx'> </div><div class='del'>-	printk("%s: risc disasm: %p [dma=0x%08lx]\n",</div><div class='add'>+	printk(KERN_INFO "%s: risc disasm: %p [dma=0x%08lx]\n",</div><div class='ctx'> 	       dev-&gt;name, risc-&gt;cpu, (unsigned long)risc-&gt;dma);</div><div class='ctx'> 	for (i = 0; i &lt; (risc-&gt;size &gt;&gt; 2); i += n) {</div><div class='del'>-		printk("%s:   %04d: ", dev-&gt;name, i);</div><div class='add'>+		printk(KERN_INFO "%s:   %04d: ", dev-&gt;name, i);</div><div class='ctx'> 		n = cx23885_risc_decode(le32_to_cpu(risc-&gt;cpu[i]));</div><div class='ctx'> 		for (j = 1; j &lt; n; j++)</div><div class='del'>-			printk("%s:   %04d: 0x%08x [ arg #%d ]\n",</div><div class='add'>+			printk(KERN_INFO "%s:   %04d: 0x%08x [ arg #%d ]\n",</div><div class='ctx'> 			       dev-&gt;name, i + j, risc-&gt;cpu[i + j], j);</div><div class='ctx'> 		if (risc-&gt;cpu[i] == cpu_to_le32(RISC_JUMP))</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -600,7 +598,7 @@ static int cx23885_pci_quirks(struct cx23885_dev *dev)</div><div class='ctx'> 	 * when DMA begins if RDR_TLCTL0 bit4 is not cleared. It does not</div><div class='ctx'> 	 * occur on the cx23887 bridge.</div><div class='ctx'> 	 */</div><div class='del'>-	if(dev-&gt;bridge == CX23885_BRIDGE_885)</div><div class='add'>+	if (dev-&gt;bridge == CX23885_BRIDGE_885)</div><div class='ctx'> 		cx_clear(RDR_TLCTL0, 1 &lt;&lt; 4);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -608,13 +606,13 @@ static int cx23885_pci_quirks(struct cx23885_dev *dev)</div><div class='ctx'> </div><div class='ctx'> static int get_resources(struct cx23885_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	if (request_mem_region(pci_resource_start(dev-&gt;pci,0),</div><div class='del'>-			       pci_resource_len(dev-&gt;pci,0),</div><div class='add'>+	if (request_mem_region(pci_resource_start(dev-&gt;pci, 0),</div><div class='add'>+			       pci_resource_len(dev-&gt;pci, 0),</div><div class='ctx'> 			       dev-&gt;name))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_ERR "%s: can't get MMIO memory @ 0x%llx\n",</div><div class='del'>-		dev-&gt;name, (unsigned long long)pci_resource_start(dev-&gt;pci,0));</div><div class='add'>+		dev-&gt;name, (unsigned long long)pci_resource_start(dev-&gt;pci, 0));</div><div class='ctx'> </div><div class='ctx'> 	return -EBUSY;</div><div class='ctx'> }</div><div class='hunk'>@@ -623,7 +621,8 @@ static void cx23885_timeout(unsigned long data);</div><div class='ctx'> int cx23885_risc_stopper(struct pci_dev *pci, struct btcx_riscmem *risc,</div><div class='ctx'> 				u32 reg, u32 mask, u32 value);</div><div class='ctx'> </div><div class='del'>-static int cx23885_init_tsport(struct cx23885_dev *dev, struct cx23885_tsport *port, int portno)</div><div class='add'>+static int cx23885_init_tsport(struct cx23885_dev *dev,</div><div class='add'>+	struct cx23885_tsport *port, int portno)</div><div class='ctx'> {</div><div class='ctx'> 	dprintk(1, "%s(portno=%d)\n", __func__, portno);</div><div class='ctx'> </div><div class='hunk'>@@ -643,7 +642,18 @@ static int cx23885_init_tsport(struct cx23885_dev *dev, struct cx23885_tsport *p</div><div class='ctx'> 	port-&gt;mpegq.timeout.data = (unsigned long)port;</div><div class='ctx'> 	init_timer(&amp;port-&gt;mpegq.timeout);</div><div class='ctx'> </div><div class='del'>-	switch(portno) {</div><div class='add'>+	mutex_init(&amp;port-&gt;frontends.lock);</div><div class='add'>+	INIT_LIST_HEAD(&amp;port-&gt;frontends.felist);</div><div class='add'>+	port-&gt;frontends.active_fe_id = 0;</div><div class='add'>+</div><div class='add'>+	/* This should be hardcoded allow a single frontend</div><div class='add'>+	 * attachment to this tsport, keeping the -dvb.c</div><div class='add'>+	 * code clean and safe.</div><div class='add'>+	 */</div><div class='add'>+	if (!port-&gt;num_frontends)</div><div class='add'>+		port-&gt;num_frontends = 1;</div><div class='add'>+</div><div class='add'>+	switch (portno) {</div><div class='ctx'> 	case 1:</div><div class='ctx'> 		port-&gt;reg_gpcnt          = VID_B_GPCNT;</div><div class='ctx'> 		port-&gt;reg_gpcnt_ctl      = VID_B_GPCNT_CTL;</div><div class='hunk'>@@ -744,13 +754,13 @@ static int cx23885_dev_setup(struct cx23885_dev *dev)</div><div class='ctx'> 	mutex_unlock(&amp;devlist);</div><div class='ctx'> </div><div class='ctx'> 	/* Configure the internal memory */</div><div class='del'>-	if(dev-&gt;pci-&gt;device == 0x8880) {</div><div class='add'>+	if (dev-&gt;pci-&gt;device == 0x8880) {</div><div class='ctx'> 		dev-&gt;bridge = CX23885_BRIDGE_887;</div><div class='ctx'> 		/* Apply a sensible clock frequency for the PCIe bridge */</div><div class='ctx'> 		dev-&gt;clk_freq = 25000000;</div><div class='ctx'> 		dev-&gt;sram_channels = cx23887_sram_channels;</div><div class='ctx'> 	} else</div><div class='del'>-	if(dev-&gt;pci-&gt;device == 0x8852) {</div><div class='add'>+	if (dev-&gt;pci-&gt;device == 0x8852) {</div><div class='ctx'> 		dev-&gt;bridge = CX23885_BRIDGE_885;</div><div class='ctx'> 		/* Apply a sensible clock frequency for the PCIe bridge */</div><div class='ctx'> 		dev-&gt;clk_freq = 28000000;</div><div class='hunk'>@@ -831,8 +841,8 @@ static int cx23885_dev_setup(struct cx23885_dev *dev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* PCIe stuff */</div><div class='del'>-	dev-&gt;lmmio = ioremap(pci_resource_start(dev-&gt;pci,0),</div><div class='del'>-			     pci_resource_len(dev-&gt;pci,0));</div><div class='add'>+	dev-&gt;lmmio = ioremap(pci_resource_start(dev-&gt;pci, 0),</div><div class='add'>+			     pci_resource_len(dev-&gt;pci, 0));</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;bmmio = (u8 __iomem *)dev-&gt;lmmio;</div><div class='ctx'> </div><div class='hunk'>@@ -862,7 +872,7 @@ static int cx23885_dev_setup(struct cx23885_dev *dev)</div><div class='ctx'> 	cx23885_i2c_register(&amp;dev-&gt;i2c_bus[1]);</div><div class='ctx'> 	cx23885_i2c_register(&amp;dev-&gt;i2c_bus[2]);</div><div class='ctx'> 	cx23885_card_setup(dev);</div><div class='del'>-	cx23885_call_i2c_clients (&amp;dev-&gt;i2c_bus[0], TUNER_SET_STANDBY, NULL);</div><div class='add'>+	cx23885_call_i2c_clients(&amp;dev-&gt;i2c_bus[0], TUNER_SET_STANDBY, NULL);</div><div class='ctx'> 	cx23885_ir_init(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (cx23885_boards[dev-&gt;board].porta == CX23885_ANALOG_VIDEO) {</div><div class='hunk'>@@ -908,8 +918,8 @@ static int cx23885_dev_setup(struct cx23885_dev *dev)</div><div class='ctx'> </div><div class='ctx'> static void cx23885_dev_unregister(struct cx23885_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	release_mem_region(pci_resource_start(dev-&gt;pci,0),</div><div class='del'>-			   pci_resource_len(dev-&gt;pci,0));</div><div class='add'>+	release_mem_region(pci_resource_start(dev-&gt;pci, 0),</div><div class='add'>+			   pci_resource_len(dev-&gt;pci, 0));</div><div class='ctx'> </div><div class='ctx'> 	if (!atomic_dec_and_test(&amp;dev-&gt;refcount))</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -936,7 +946,7 @@ static void cx23885_dev_unregister(struct cx23885_dev *dev)</div><div class='ctx'> 	iounmap(dev-&gt;lmmio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static __le32* cx23885_risc_field(__le32 *rp, struct scatterlist *sglist,</div><div class='add'>+static __le32 *cx23885_risc_field(__le32 *rp, struct scatterlist *sglist,</div><div class='ctx'> 			       unsigned int offset, u32 sync_line,</div><div class='ctx'> 			       unsigned int bpl, unsigned int padding,</div><div class='ctx'> 			       unsigned int lines)</div><div class='hunk'>@@ -957,31 +967,31 @@ static __le32* cx23885_risc_field(__le32 *rp, struct scatterlist *sglist,</div><div class='ctx'> 		}</div><div class='ctx'> 		if (bpl &lt;= sg_dma_len(sg)-offset) {</div><div class='ctx'> 			/* fits into current chunk */</div><div class='del'>-			*(rp++)=cpu_to_le32(RISC_WRITE|RISC_SOL|RISC_EOL|bpl);</div><div class='del'>-			*(rp++)=cpu_to_le32(sg_dma_address(sg)+offset);</div><div class='del'>-			*(rp++)=cpu_to_le32(0); /* bits 63-32 */</div><div class='del'>-			offset+=bpl;</div><div class='add'>+			*(rp++) = cpu_to_le32(RISC_WRITE|RISC_SOL|RISC_EOL|bpl);</div><div class='add'>+			*(rp++) = cpu_to_le32(sg_dma_address(sg)+offset);</div><div class='add'>+			*(rp++) = cpu_to_le32(0); /* bits 63-32 */</div><div class='add'>+			offset += bpl;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* scanline needs to be split */</div><div class='ctx'> 			todo = bpl;</div><div class='del'>-			*(rp++)=cpu_to_le32(RISC_WRITE|RISC_SOL|</div><div class='add'>+			*(rp++) = cpu_to_le32(RISC_WRITE|RISC_SOL|</div><div class='ctx'> 					    (sg_dma_len(sg)-offset));</div><div class='del'>-			*(rp++)=cpu_to_le32(sg_dma_address(sg)+offset);</div><div class='del'>-			*(rp++)=cpu_to_le32(0); /* bits 63-32 */</div><div class='add'>+			*(rp++) = cpu_to_le32(sg_dma_address(sg)+offset);</div><div class='add'>+			*(rp++) = cpu_to_le32(0); /* bits 63-32 */</div><div class='ctx'> 			todo -= (sg_dma_len(sg)-offset);</div><div class='ctx'> 			offset = 0;</div><div class='ctx'> 			sg++;</div><div class='ctx'> 			while (todo &gt; sg_dma_len(sg)) {</div><div class='del'>-				*(rp++)=cpu_to_le32(RISC_WRITE|</div><div class='add'>+				*(rp++) = cpu_to_le32(RISC_WRITE|</div><div class='ctx'> 						    sg_dma_len(sg));</div><div class='del'>-				*(rp++)=cpu_to_le32(sg_dma_address(sg));</div><div class='del'>-				*(rp++)=cpu_to_le32(0); /* bits 63-32 */</div><div class='add'>+				*(rp++) = cpu_to_le32(sg_dma_address(sg));</div><div class='add'>+				*(rp++) = cpu_to_le32(0); /* bits 63-32 */</div><div class='ctx'> 				todo -= sg_dma_len(sg);</div><div class='ctx'> 				sg++;</div><div class='ctx'> 			}</div><div class='del'>-			*(rp++)=cpu_to_le32(RISC_WRITE|RISC_EOL|todo);</div><div class='del'>-			*(rp++)=cpu_to_le32(sg_dma_address(sg));</div><div class='del'>-			*(rp++)=cpu_to_le32(0); /* bits 63-32 */</div><div class='add'>+			*(rp++) = cpu_to_le32(RISC_WRITE|RISC_EOL|todo);</div><div class='add'>+			*(rp++) = cpu_to_le32(sg_dma_address(sg));</div><div class='add'>+			*(rp++) = cpu_to_le32(0); /* bits 63-32 */</div><div class='ctx'> 			offset += todo;</div><div class='ctx'> 		}</div><div class='ctx'> 		offset += padding;</div><div class='hunk'>@@ -1010,9 +1020,11 @@ int cx23885_risc_buffer(struct pci_dev *pci, struct btcx_riscmem *risc,</div><div class='ctx'> 	   can cause next bpl to start close to a page border.  First DMA</div><div class='ctx'> 	   region may be smaller than PAGE_SIZE */</div><div class='ctx'> 	/* write and jump need and extra dword */</div><div class='del'>-	instructions  = fields * (1 + ((bpl + padding) * lines) / PAGE_SIZE + lines);</div><div class='add'>+	instructions  = fields * (1 + ((bpl + padding) * lines)</div><div class='add'>+		/ PAGE_SIZE + lines);</div><div class='ctx'> 	instructions += 2;</div><div class='del'>-	if ((rc = btcx_riscmem_alloc(pci,risc,instructions*12)) &lt; 0)</div><div class='add'>+	rc = btcx_riscmem_alloc(pci, risc, instructions*12);</div><div class='add'>+	if (rc &lt; 0)</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='ctx'> 	/* write risc instructions */</div><div class='hunk'>@@ -1026,7 +1038,7 @@ int cx23885_risc_buffer(struct pci_dev *pci, struct btcx_riscmem *risc,</div><div class='ctx'> </div><div class='ctx'> 	/* save pointer to jmp instruction address */</div><div class='ctx'> 	risc-&gt;jmp = rp;</div><div class='del'>-	BUG_ON((risc-&gt;jmp - risc-&gt;cpu + 2) * sizeof (*risc-&gt;cpu) &gt; risc-&gt;size);</div><div class='add'>+	BUG_ON((risc-&gt;jmp - risc-&gt;cpu + 2) * sizeof(*risc-&gt;cpu) &gt; risc-&gt;size);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1048,7 +1060,8 @@ static int cx23885_risc_databuffer(struct pci_dev *pci,</div><div class='ctx'> 	instructions  = 1 + (bpl * lines) / PAGE_SIZE + lines;</div><div class='ctx'> 	instructions += 1;</div><div class='ctx'> </div><div class='del'>-	if ((rc = btcx_riscmem_alloc(pci,risc,instructions*12)) &lt; 0)</div><div class='add'>+	rc = btcx_riscmem_alloc(pci, risc, instructions*12);</div><div class='add'>+	if (rc &lt; 0)</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='ctx'> 	/* write risc instructions */</div><div class='hunk'>@@ -1057,7 +1070,7 @@ static int cx23885_risc_databuffer(struct pci_dev *pci,</div><div class='ctx'> </div><div class='ctx'> 	/* save pointer to jmp instruction address */</div><div class='ctx'> 	risc-&gt;jmp = rp;</div><div class='del'>-	BUG_ON((risc-&gt;jmp - risc-&gt;cpu + 2) * sizeof (*risc-&gt;cpu) &gt; risc-&gt;size);</div><div class='add'>+	BUG_ON((risc-&gt;jmp - risc-&gt;cpu + 2) * sizeof(*risc-&gt;cpu) &gt; risc-&gt;size);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1067,7 +1080,8 @@ int cx23885_risc_stopper(struct pci_dev *pci, struct btcx_riscmem *risc,</div><div class='ctx'> 	__le32 *rp;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	if ((rc = btcx_riscmem_alloc(pci, risc, 4*16)) &lt; 0)</div><div class='add'>+	rc = btcx_riscmem_alloc(pci, risc, 4*16);</div><div class='add'>+	if (rc &lt; 0)</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='ctx'> 	/* write risc instructions */</div><div class='hunk'>@@ -1161,22 +1175,23 @@ static int cx23885_start_dma(struct cx23885_tsport *port,</div><div class='ctx'> </div><div class='ctx'> 	/* setup fifo + format */</div><div class='ctx'> 	cx23885_sram_channel_setup(dev,</div><div class='del'>-				   &amp;dev-&gt;sram_channels[ port-&gt;sram_chno ],</div><div class='add'>+				   &amp;dev-&gt;sram_channels[port-&gt;sram_chno],</div><div class='ctx'> 				   port-&gt;ts_packet_size, buf-&gt;risc.dma);</div><div class='del'>-	if(debug &gt; 5) {</div><div class='del'>-		cx23885_sram_channel_dump(dev, &amp;dev-&gt;sram_channels[ port-&gt;sram_chno ] );</div><div class='add'>+	if (debug &gt; 5) {</div><div class='add'>+		cx23885_sram_channel_dump(dev,</div><div class='add'>+			&amp;dev-&gt;sram_channels[port-&gt;sram_chno]);</div><div class='ctx'> 		cx23885_risc_disasm(port, &amp;buf-&gt;risc);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* write TS length to chip */</div><div class='ctx'> 	cx_write(port-&gt;reg_lngth, buf-&gt;vb.width);</div><div class='ctx'> </div><div class='del'>-	if ( (!(cx23885_boards[dev-&gt;board].portb &amp; CX23885_MPEG_DVB)) &amp;&amp;</div><div class='del'>-		(!(cx23885_boards[dev-&gt;board].portc &amp; CX23885_MPEG_DVB)) ) {</div><div class='del'>-		printk( "%s() Failed. Unsupported value in .portb/c (0x%08x)/(0x%08x)\n",</div><div class='add'>+	if ((!(cx23885_boards[dev-&gt;board].portb &amp; CX23885_MPEG_DVB)) &amp;&amp;</div><div class='add'>+		(!(cx23885_boards[dev-&gt;board].portc &amp; CX23885_MPEG_DVB))) {</div><div class='add'>+		printk("%s() Unsupported .portb/c (0x%08x)/(0x%08x)\n",</div><div class='ctx'> 			__func__,</div><div class='ctx'> 			cx23885_boards[dev-&gt;board].portb,</div><div class='del'>-			cx23885_boards[dev-&gt;board].portc );</div><div class='add'>+			cx23885_boards[dev-&gt;board].portc);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1186,7 +1201,7 @@ static int cx23885_start_dma(struct cx23885_tsport *port,</div><div class='ctx'> 	udelay(100);</div><div class='ctx'> </div><div class='ctx'> 	/* If the port supports SRC SELECT, configure it */</div><div class='del'>-	if(port-&gt;reg_src_sel)</div><div class='add'>+	if (port-&gt;reg_src_sel)</div><div class='ctx'> 		cx_write(port-&gt;reg_src_sel, port-&gt;src_sel_val);</div><div class='ctx'> </div><div class='ctx'> 	cx_write(port-&gt;reg_hw_sop_ctrl, port-&gt;hw_sop_ctrl_val);</div><div class='hunk'>@@ -1195,7 +1210,7 @@ static int cx23885_start_dma(struct cx23885_tsport *port,</div><div class='ctx'> 	cx_write(port-&gt;reg_gen_ctrl, port-&gt;gen_ctrl_val);</div><div class='ctx'> 	udelay(100);</div><div class='ctx'> </div><div class='del'>-	// NOTE: this is 2 (reserved) for portb, does it matter?</div><div class='add'>+	/* NOTE: this is 2 (reserved) for portb, does it matter? */</div><div class='ctx'> 	/* reset counter to zero */</div><div class='ctx'> 	cx_write(port-&gt;reg_gpcnt_ctl, 3);</div><div class='ctx'> 	q-&gt;count = 1;</div><div class='hunk'>@@ -1229,11 +1244,11 @@ static int cx23885_start_dma(struct cx23885_tsport *port,</div><div class='ctx'> 		cx_write(ALT_PIN_OUT_SEL, 0x10100045);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	switch(dev-&gt;bridge) {</div><div class='add'>+	switch (dev-&gt;bridge) {</div><div class='ctx'> 	case CX23885_BRIDGE_885:</div><div class='ctx'> 	case CX23885_BRIDGE_887:</div><div class='ctx'> 		/* enable irqs */</div><div class='del'>-		dprintk(1, "%s() enabling TS int's and DMA\n", __func__ );</div><div class='add'>+		dprintk(1, "%s() enabling TS int's and DMA\n", __func__);</div><div class='ctx'> 		cx_set(port-&gt;reg_ts_int_msk,  port-&gt;ts_int_msk_val);</div><div class='ctx'> 		cx_set(port-&gt;reg_dma_ctl, port-&gt;dma_ctl_val);</div><div class='ctx'> 		cx_set(PCI_INT_MSK, dev-&gt;pci_irqmask | port-&gt;pci_irqmask);</div><div class='hunk'>@@ -1292,8 +1307,7 @@ int cx23885_restart_queue(struct cx23885_tsport *port,</div><div class='ctx'> 	struct cx23885_buffer *buf;</div><div class='ctx'> </div><div class='ctx'> 	dprintk(5, "%s()\n", __func__);</div><div class='del'>-	if (list_empty(&amp;q-&gt;active))</div><div class='del'>-	{</div><div class='add'>+	if (list_empty(&amp;q-&gt;active)) {</div><div class='ctx'> 		struct cx23885_buffer *prev;</div><div class='ctx'> 		prev = NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -1311,7 +1325,7 @@ int cx23885_restart_queue(struct cx23885_tsport *port,</div><div class='ctx'> 				buf-&gt;vb.state = VIDEOBUF_ACTIVE;</div><div class='ctx'> 				buf-&gt;count    = q-&gt;count++;</div><div class='ctx'> 				mod_timer(&amp;q-&gt;timeout, jiffies+BUFFER_TIMEOUT);</div><div class='del'>-				dprintk(5, "[%p/%d] restart_queue - first active\n",</div><div class='add'>+				dprintk(5, "[%p/%d] restart_queue - f/active\n",</div><div class='ctx'> 					buf, buf-&gt;vb.i);</div><div class='ctx'> </div><div class='ctx'> 			} else if (prev-&gt;vb.width  == buf-&gt;vb.width  &amp;&amp;</div><div class='hunk'>@@ -1322,8 +1336,9 @@ int cx23885_restart_queue(struct cx23885_tsport *port,</div><div class='ctx'> 				buf-&gt;vb.state = VIDEOBUF_ACTIVE;</div><div class='ctx'> 				buf-&gt;count    = q-&gt;count++;</div><div class='ctx'> 				prev-&gt;risc.jmp[1] = cpu_to_le32(buf-&gt;risc.dma);</div><div class='del'>-				prev-&gt;risc.jmp[2] = cpu_to_le32(0); /* 64 bit bits 63-32 */</div><div class='del'>-				dprintk(5,"[%p/%d] restart_queue - move to active\n",</div><div class='add'>+				/* 64 bit bits 63-32 */</div><div class='add'>+				prev-&gt;risc.jmp[2] = cpu_to_le32(0);</div><div class='add'>+				dprintk(5, "[%p/%d] restart_queue - m/active\n",</div><div class='ctx'> 					buf, buf-&gt;vb.i);</div><div class='ctx'> 			} else {</div><div class='ctx'> 				return 0;</div><div class='hunk'>@@ -1362,7 +1377,8 @@ int cx23885_buf_prepare(struct videobuf_queue *q, struct cx23885_tsport *port,</div><div class='ctx'> 		buf-&gt;vb.size   = size;</div><div class='ctx'> 		buf-&gt;vb.field  = field /*V4L2_FIELD_TOP*/;</div><div class='ctx'> </div><div class='del'>-		if (0 != (rc = videobuf_iolock(q, &amp;buf-&gt;vb, NULL)))</div><div class='add'>+		rc = videobuf_iolock(q, &amp;buf-&gt;vb, NULL);</div><div class='add'>+		if (0 != rc)</div><div class='ctx'> 			goto fail;</div><div class='ctx'> 		cx23885_risc_databuffer(dev-&gt;pci, &amp;buf-&gt;risc,</div><div class='ctx'> 					videobuf_to_dma(&amp;buf-&gt;vb)-&gt;sglist,</div><div class='hunk'>@@ -1388,7 +1404,7 @@ void cx23885_buf_queue(struct cx23885_tsport *port, struct cx23885_buffer *buf)</div><div class='ctx'> 	buf-&gt;risc.jmp[2] = cpu_to_le32(0); /* bits 63-32 */</div><div class='ctx'> </div><div class='ctx'> 	if (list_empty(&amp;cx88q-&gt;active)) {</div><div class='del'>-		dprintk( 1, "queue is empty - first active\n" );</div><div class='add'>+		dprintk(1, "queue is empty - first active\n");</div><div class='ctx'> 		list_add_tail(&amp;buf-&gt;vb.queue, &amp;cx88q-&gt;active);</div><div class='ctx'> 		cx23885_start_dma(port, cx88q, buf);</div><div class='ctx'> 		buf-&gt;vb.state = VIDEOBUF_ACTIVE;</div><div class='hunk'>@@ -1397,7 +1413,7 @@ void cx23885_buf_queue(struct cx23885_tsport *port, struct cx23885_buffer *buf)</div><div class='ctx'> 		dprintk(1, "[%p/%d] %s - first active\n",</div><div class='ctx'> 			buf, buf-&gt;vb.i, __func__);</div><div class='ctx'> 	} else {</div><div class='del'>-		dprintk( 1, "queue is not empty - append to active\n" );</div><div class='add'>+		dprintk(1, "queue is not empty - append to active\n");</div><div class='ctx'> 		prev = list_entry(cx88q-&gt;active.prev, struct cx23885_buffer,</div><div class='ctx'> 				  vb.queue);</div><div class='ctx'> 		list_add_tail(&amp;buf-&gt;vb.queue, &amp;cx88q-&gt;active);</div><div class='hunk'>@@ -1405,7 +1421,7 @@ void cx23885_buf_queue(struct cx23885_tsport *port, struct cx23885_buffer *buf)</div><div class='ctx'> 		buf-&gt;count    = cx88q-&gt;count++;</div><div class='ctx'> 		prev-&gt;risc.jmp[1] = cpu_to_le32(buf-&gt;risc.dma);</div><div class='ctx'> 		prev-&gt;risc.jmp[2] = cpu_to_le32(0); /* 64 bit bits 63-32 */</div><div class='del'>-		dprintk( 1, "[%p/%d] %s - append to active\n",</div><div class='add'>+		dprintk(1, "[%p/%d] %s - append to active\n",</div><div class='ctx'> 			 buf, buf-&gt;vb.i, __func__);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -1431,7 +1447,7 @@ static void do_cancel_buffers(struct cx23885_tsport *port, char *reason,</div><div class='ctx'> 			buf, buf-&gt;vb.i, reason, (unsigned long)buf-&gt;risc.dma);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (restart) {</div><div class='del'>-		dprintk(1, "restarting queue\n" );</div><div class='add'>+		dprintk(1, "restarting queue\n");</div><div class='ctx'> 		cx23885_restart_queue(port, q);</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;port-&gt;slock, flags);</div><div class='hunk'>@@ -1442,7 +1458,7 @@ void cx23885_cancel_buffers(struct cx23885_tsport *port)</div><div class='ctx'> 	struct cx23885_dev *dev = port-&gt;dev;</div><div class='ctx'> 	struct cx23885_dmaqueue *q = &amp;port-&gt;mpegq;</div><div class='ctx'> </div><div class='del'>-	dprintk(1, "%s()\n", __FUNCTION__);</div><div class='add'>+	dprintk(1, "%s()\n", __func__);</div><div class='ctx'> 	del_timer_sync(&amp;q-&gt;timeout);</div><div class='ctx'> 	cx23885_stop_dma(port);</div><div class='ctx'> 	do_cancel_buffers(port, "cancel", 0);</div><div class='hunk'>@@ -1453,10 +1469,11 @@ static void cx23885_timeout(unsigned long data)</div><div class='ctx'> 	struct cx23885_tsport *port = (struct cx23885_tsport *)data;</div><div class='ctx'> 	struct cx23885_dev *dev = port-&gt;dev;</div><div class='ctx'> </div><div class='del'>-	dprintk(1, "%s()\n",__func__);</div><div class='add'>+	dprintk(1, "%s()\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	if (debug &gt; 5)</div><div class='del'>-		cx23885_sram_channel_dump(dev, &amp;dev-&gt;sram_channels[ port-&gt;sram_chno ]);</div><div class='add'>+		cx23885_sram_channel_dump(dev,</div><div class='add'>+			&amp;dev-&gt;sram_channels[port-&gt;sram_chno]);</div><div class='ctx'> </div><div class='ctx'> 	cx23885_stop_dma(port);</div><div class='ctx'> 	do_cancel_buffers(port, "timeout", 1);</div><div class='hunk'>@@ -1532,16 +1549,23 @@ static int cx23885_irq_ts(struct cx23885_tsport *port, u32 status)</div><div class='ctx'> 	if ((status &amp; VID_BC_MSK_OPC_ERR) ||</div><div class='ctx'> 		(status &amp; VID_BC_MSK_BAD_PKT) ||</div><div class='ctx'> 		(status &amp; VID_BC_MSK_SYNC) ||</div><div class='del'>-		(status &amp; VID_BC_MSK_OF))</div><div class='del'>-	{</div><div class='add'>+		(status &amp; VID_BC_MSK_OF)) {</div><div class='add'>+</div><div class='ctx'> 		if (status &amp; VID_BC_MSK_OPC_ERR)</div><div class='del'>-			dprintk(7, " (VID_BC_MSK_OPC_ERR 0x%08x)\n", VID_BC_MSK_OPC_ERR);</div><div class='add'>+			dprintk(7, " (VID_BC_MSK_OPC_ERR 0x%08x)\n",</div><div class='add'>+				VID_BC_MSK_OPC_ERR);</div><div class='add'>+</div><div class='ctx'> 		if (status &amp; VID_BC_MSK_BAD_PKT)</div><div class='del'>-			dprintk(7, " (VID_BC_MSK_BAD_PKT 0x%08x)\n", VID_BC_MSK_BAD_PKT);</div><div class='add'>+			dprintk(7, " (VID_BC_MSK_BAD_PKT 0x%08x)\n",</div><div class='add'>+				VID_BC_MSK_BAD_PKT);</div><div class='add'>+</div><div class='ctx'> 		if (status &amp; VID_BC_MSK_SYNC)</div><div class='del'>-			dprintk(7, " (VID_BC_MSK_SYNC    0x%08x)\n", VID_BC_MSK_SYNC);</div><div class='add'>+			dprintk(7, " (VID_BC_MSK_SYNC    0x%08x)\n",</div><div class='add'>+				VID_BC_MSK_SYNC);</div><div class='add'>+</div><div class='ctx'> 		if (status &amp; VID_BC_MSK_OF)</div><div class='del'>-			dprintk(7, " (VID_BC_MSK_OF      0x%08x)\n", VID_BC_MSK_OF);</div><div class='add'>+			dprintk(7, " (VID_BC_MSK_OF      0x%08x)\n",</div><div class='add'>+				VID_BC_MSK_OF);</div><div class='ctx'> </div><div class='ctx'> 		printk(KERN_ERR "%s: mpeg risc op code error\n", dev-&gt;name);</div><div class='ctx'> </div><div class='hunk'>@@ -1595,7 +1619,7 @@ static irqreturn_t cx23885_irq(int irq, void *dev_id)</div><div class='ctx'> 	ts2_status = cx_read(VID_C_INT_STAT);</div><div class='ctx'> 	ts2_mask = cx_read(VID_C_INT_MSK);</div><div class='ctx'> </div><div class='del'>-	if ( (pci_status == 0) &amp;&amp; (ts2_status == 0) &amp;&amp; (ts1_status == 0) )</div><div class='add'>+	if ((pci_status == 0) &amp;&amp; (ts2_status == 0) &amp;&amp; (ts1_status == 0))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	vida_count = cx_read(VID_A_GPCNT);</div><div class='hunk'>@@ -1610,38 +1634,56 @@ static irqreturn_t cx23885_irq(int irq, void *dev_id)</div><div class='ctx'> 	dprintk(7, "ts2_status: 0x%08x  ts2_mask: 0x%08x count: 0x%x\n",</div><div class='ctx'> 		ts2_status, ts2_mask, ts2_count);</div><div class='ctx'> </div><div class='del'>-	if ( (pci_status &amp; PCI_MSK_RISC_RD) ||</div><div class='del'>-	     (pci_status &amp; PCI_MSK_RISC_WR) ||</div><div class='del'>-	     (pci_status &amp; PCI_MSK_AL_RD) ||</div><div class='del'>-	     (pci_status &amp; PCI_MSK_AL_WR) ||</div><div class='del'>-	     (pci_status &amp; PCI_MSK_APB_DMA) ||</div><div class='del'>-	     (pci_status &amp; PCI_MSK_VID_C) ||</div><div class='del'>-	     (pci_status &amp; PCI_MSK_VID_B) ||</div><div class='del'>-	     (pci_status &amp; PCI_MSK_VID_A) ||</div><div class='del'>-	     (pci_status &amp; PCI_MSK_AUD_INT) ||</div><div class='del'>-	     (pci_status &amp; PCI_MSK_AUD_EXT) )</div><div class='del'>-	{</div><div class='add'>+	if ((pci_status &amp; PCI_MSK_RISC_RD) ||</div><div class='add'>+	    (pci_status &amp; PCI_MSK_RISC_WR) ||</div><div class='add'>+	    (pci_status &amp; PCI_MSK_AL_RD) ||</div><div class='add'>+	    (pci_status &amp; PCI_MSK_AL_WR) ||</div><div class='add'>+	    (pci_status &amp; PCI_MSK_APB_DMA) ||</div><div class='add'>+	    (pci_status &amp; PCI_MSK_VID_C) ||</div><div class='add'>+	    (pci_status &amp; PCI_MSK_VID_B) ||</div><div class='add'>+	    (pci_status &amp; PCI_MSK_VID_A) ||</div><div class='add'>+	    (pci_status &amp; PCI_MSK_AUD_INT) ||</div><div class='add'>+	    (pci_status &amp; PCI_MSK_AUD_EXT)) {</div><div class='ctx'> </div><div class='ctx'> 		if (pci_status &amp; PCI_MSK_RISC_RD)</div><div class='del'>-			dprintk(7, " (PCI_MSK_RISC_RD   0x%08x)\n", PCI_MSK_RISC_RD);</div><div class='add'>+			dprintk(7, " (PCI_MSK_RISC_RD   0x%08x)\n",</div><div class='add'>+				PCI_MSK_RISC_RD);</div><div class='add'>+</div><div class='ctx'> 		if (pci_status &amp; PCI_MSK_RISC_WR)</div><div class='del'>-			dprintk(7, " (PCI_MSK_RISC_WR   0x%08x)\n", PCI_MSK_RISC_WR);</div><div class='add'>+			dprintk(7, " (PCI_MSK_RISC_WR   0x%08x)\n",</div><div class='add'>+				PCI_MSK_RISC_WR);</div><div class='add'>+</div><div class='ctx'> 		if (pci_status &amp; PCI_MSK_AL_RD)</div><div class='del'>-			dprintk(7, " (PCI_MSK_AL_RD     0x%08x)\n", PCI_MSK_AL_RD);</div><div class='add'>+			dprintk(7, " (PCI_MSK_AL_RD     0x%08x)\n",</div><div class='add'>+				PCI_MSK_AL_RD);</div><div class='add'>+</div><div class='ctx'> 		if (pci_status &amp; PCI_MSK_AL_WR)</div><div class='del'>-			dprintk(7, " (PCI_MSK_AL_WR     0x%08x)\n", PCI_MSK_AL_WR);</div><div class='add'>+			dprintk(7, " (PCI_MSK_AL_WR     0x%08x)\n",</div><div class='add'>+				PCI_MSK_AL_WR);</div><div class='add'>+</div><div class='ctx'> 		if (pci_status &amp; PCI_MSK_APB_DMA)</div><div class='del'>-			dprintk(7, " (PCI_MSK_APB_DMA   0x%08x)\n", PCI_MSK_APB_DMA);</div><div class='add'>+			dprintk(7, " (PCI_MSK_APB_DMA   0x%08x)\n",</div><div class='add'>+				PCI_MSK_APB_DMA);</div><div class='add'>+</div><div class='ctx'> 		if (pci_status &amp; PCI_MSK_VID_C)</div><div class='del'>-			dprintk(7, " (PCI_MSK_VID_C     0x%08x)\n", PCI_MSK_VID_C);</div><div class='add'>+			dprintk(7, " (PCI_MSK_VID_C     0x%08x)\n",</div><div class='add'>+				PCI_MSK_VID_C);</div><div class='add'>+</div><div class='ctx'> 		if (pci_status &amp; PCI_MSK_VID_B)</div><div class='del'>-			dprintk(7, " (PCI_MSK_VID_B     0x%08x)\n", PCI_MSK_VID_B);</div><div class='add'>+			dprintk(7, " (PCI_MSK_VID_B     0x%08x)\n",</div><div class='add'>+				PCI_MSK_VID_B);</div><div class='add'>+</div><div class='ctx'> 		if (pci_status &amp; PCI_MSK_VID_A)</div><div class='del'>-			dprintk(7, " (PCI_MSK_VID_A     0x%08x)\n", PCI_MSK_VID_A);</div><div class='add'>+			dprintk(7, " (PCI_MSK_VID_A     0x%08x)\n",</div><div class='add'>+				PCI_MSK_VID_A);</div><div class='add'>+</div><div class='ctx'> 		if (pci_status &amp; PCI_MSK_AUD_INT)</div><div class='del'>-			dprintk(7, " (PCI_MSK_AUD_INT   0x%08x)\n", PCI_MSK_AUD_INT);</div><div class='add'>+			dprintk(7, " (PCI_MSK_AUD_INT   0x%08x)\n",</div><div class='add'>+				PCI_MSK_AUD_INT);</div><div class='add'>+</div><div class='ctx'> 		if (pci_status &amp; PCI_MSK_AUD_EXT)</div><div class='del'>-			dprintk(7, " (PCI_MSK_AUD_EXT   0x%08x)\n", PCI_MSK_AUD_EXT);</div><div class='add'>+			dprintk(7, " (PCI_MSK_AUD_EXT   0x%08x)\n",</div><div class='add'>+				PCI_MSK_AUD_EXT);</div><div class='ctx'> </div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1753,13 +1795,13 @@ static struct pci_device_id cx23885_pci_tbl[] = {</div><div class='ctx'> 		.device       = 0x8852,</div><div class='ctx'> 		.subvendor    = PCI_ANY_ID,</div><div class='ctx'> 		.subdevice    = PCI_ANY_ID,</div><div class='del'>-	},{</div><div class='add'>+	}, {</div><div class='ctx'> 		/* CX23887 Rev 2 */</div><div class='ctx'> 		.vendor       = 0x14f1,</div><div class='ctx'> 		.device       = 0x8880,</div><div class='ctx'> 		.subvendor    = PCI_ANY_ID,</div><div class='ctx'> 		.subdevice    = PCI_ANY_ID,</div><div class='del'>-	},{</div><div class='add'>+	}, {</div><div class='ctx'> 		/* --- end of list --- */</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='hunk'>@@ -1797,9 +1839,3 @@ module_init(cx23885_init);</div><div class='ctx'> module_exit(cx23885_fini);</div><div class='ctx'> </div><div class='ctx'> /* ----------------------------------------------------------- */</div><div class='del'>-/*</div><div class='del'>- * Local variables:</div><div class='del'>- * c-basic-offset: 8</div><div class='del'>- * End:</div><div class='del'>- * kate: eol "unix"; indent-width 3; remove-trailing-space on; replace-trailing-space-save on; tab-width 8; replace-tabs off; space-indent off; mixed-indent off</div><div class='del'>- */</div><div class='head'>diff --git a/drivers/media/video/cx23885/cx23885-dvb.c b/drivers/media/video/cx23885/cx23885-dvb.c<br/>index 291b9d008da8..e1aac07b3158 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx23885/cx23885-dvb.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/cx23885/cx23885-dvb.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx23885/cx23885-dvb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx23885/cx23885-dvb.c</a></div><div class='hunk'>@@ -42,6 +42,7 @@</div><div class='ctx'> #include "tuner-simple.h"</div><div class='ctx'> #include "dib7000p.h"</div><div class='ctx'> #include "dibx000_common.h"</div><div class='add'>+#include "zl10353.h"</div><div class='ctx'> </div><div class='ctx'> static unsigned int debug;</div><div class='ctx'> </div><div class='hunk'>@@ -77,19 +78,19 @@ static int dvb_buf_prepare(struct videobuf_queue *q,</div><div class='ctx'> 			   struct videobuf_buffer *vb, enum v4l2_field field)</div><div class='ctx'> {</div><div class='ctx'> 	struct cx23885_tsport *port = q-&gt;priv_data;</div><div class='del'>-	return cx23885_buf_prepare(q, port, (struct cx23885_buffer*)vb, field);</div><div class='add'>+	return cx23885_buf_prepare(q, port, (struct cx23885_buffer *)vb, field);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void dvb_buf_queue(struct videobuf_queue *q, struct videobuf_buffer *vb)</div><div class='ctx'> {</div><div class='ctx'> 	struct cx23885_tsport *port = q-&gt;priv_data;</div><div class='del'>-	cx23885_buf_queue(port, (struct cx23885_buffer*)vb);</div><div class='add'>+	cx23885_buf_queue(port, (struct cx23885_buffer *)vb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void dvb_buf_release(struct videobuf_queue *q,</div><div class='ctx'> 			    struct videobuf_buffer *vb)</div><div class='ctx'> {</div><div class='del'>-	cx23885_free_buffer(q, (struct cx23885_buffer*)vb);</div><div class='add'>+	cx23885_free_buffer(q, (struct cx23885_buffer *)vb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct videobuf_queue_ops dvb_qops = {</div><div class='hunk'>@@ -188,13 +189,11 @@ static struct s5h1411_config dvico_s5h1411_config = {</div><div class='ctx'> static struct xc5000_config hauppauge_hvr1500q_tunerconfig = {</div><div class='ctx'> 	.i2c_address      = 0x61,</div><div class='ctx'> 	.if_khz           = 5380,</div><div class='del'>-	.tuner_callback   = cx23885_tuner_callback</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct xc5000_config dvico_xc5000_tunerconfig = {</div><div class='ctx'> 	.i2c_address      = 0x64,</div><div class='ctx'> 	.if_khz           = 5380,</div><div class='del'>-	.tuner_callback   = cx23885_tuner_callback</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct tda829x_config tda829x_no_probe = {</div><div class='hunk'>@@ -303,53 +302,35 @@ static struct dib7000p_config hauppauge_hvr1400_dib7000_config = {</div><div class='ctx'> 	.output_mode = OUTMODE_MPEG2_SERIAL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int cx23885_hvr1500_xc3028_callback(void *ptr, int command, int arg)</div><div class='del'>-{</div><div class='del'>-	struct cx23885_tsport *port = ptr;</div><div class='del'>-	struct cx23885_dev *dev = port-&gt;dev;</div><div class='del'>-</div><div class='del'>-	switch (command) {</div><div class='del'>-	case XC2028_TUNER_RESET:</div><div class='del'>-		/* Send the tuner in then out of reset */</div><div class='del'>-		/* GPIO-2 xc3028 tuner */</div><div class='del'>-		dprintk(1, "%s: XC2028_TUNER_RESET %d\n", __func__, arg);</div><div class='del'>-</div><div class='del'>-		cx_set(GP0_IO, 0x00040000);</div><div class='del'>-		cx_clear(GP0_IO, 0x00000004);</div><div class='del'>-		msleep(5);</div><div class='del'>-</div><div class='del'>-		cx_set(GP0_IO, 0x00040004);</div><div class='del'>-		msleep(5);</div><div class='del'>-		break;</div><div class='del'>-	case XC2028_RESET_CLK:</div><div class='del'>-		dprintk(1, "%s: XC2028_RESET_CLK %d\n", __func__, arg);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		dprintk(1, "%s: unknown command %d, arg %d\n", __func__,</div><div class='del'>-			command, arg);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='add'>+static struct zl10353_config dvico_fusionhdtv_xc3028 = {</div><div class='add'>+	.demod_address = 0x0f,</div><div class='add'>+	.if2           = 45600,</div><div class='add'>+	.no_tuner      = 1,</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> static int dvb_register(struct cx23885_tsport *port)</div><div class='ctx'> {</div><div class='ctx'> 	struct cx23885_dev *dev = port-&gt;dev;</div><div class='ctx'> 	struct cx23885_i2c *i2c_bus = NULL;</div><div class='add'>+	struct videobuf_dvb_frontend *fe0;</div><div class='add'>+</div><div class='add'>+	/* Get the first frontend */</div><div class='add'>+	fe0 = videobuf_dvb_get_frontend(&amp;port-&gt;frontends, 1);</div><div class='add'>+	if (!fe0)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* init struct videobuf_dvb */</div><div class='del'>-	port-&gt;dvb.name = dev-&gt;name;</div><div class='add'>+	fe0-&gt;dvb.name = dev-&gt;name;</div><div class='ctx'> </div><div class='ctx'> 	/* init frontend */</div><div class='ctx'> 	switch (dev-&gt;board) {</div><div class='ctx'> 	case CX23885_BOARD_HAUPPAUGE_HVR1250:</div><div class='ctx'> 		i2c_bus = &amp;dev-&gt;i2c_bus[0];</div><div class='del'>-		port-&gt;dvb.frontend = dvb_attach(s5h1409_attach,</div><div class='add'>+		fe0-&gt;dvb.frontend = dvb_attach(s5h1409_attach,</div><div class='ctx'> 						&amp;hauppauge_generic_config,</div><div class='ctx'> 						&amp;i2c_bus-&gt;i2c_adap);</div><div class='del'>-		if (port-&gt;dvb.frontend != NULL) {</div><div class='del'>-			dvb_attach(mt2131_attach, port-&gt;dvb.frontend,</div><div class='add'>+		if (fe0-&gt;dvb.frontend != NULL) {</div><div class='add'>+			dvb_attach(mt2131_attach, fe0-&gt;dvb.frontend,</div><div class='ctx'> 				   &amp;i2c_bus-&gt;i2c_adap,</div><div class='ctx'> 				   &amp;hauppauge_generic_tunerconfig, 0);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -358,27 +339,27 @@ static int dvb_register(struct cx23885_tsport *port)</div><div class='ctx'> 		i2c_bus = &amp;dev-&gt;i2c_bus[0];</div><div class='ctx'> 		switch (alt_tuner) {</div><div class='ctx'> 		case 1:</div><div class='del'>-			port-&gt;dvb.frontend =</div><div class='add'>+			fe0-&gt;dvb.frontend =</div><div class='ctx'> 				dvb_attach(s5h1409_attach,</div><div class='ctx'> 					   &amp;hauppauge_ezqam_config,</div><div class='ctx'> 					   &amp;i2c_bus-&gt;i2c_adap);</div><div class='del'>-			if (port-&gt;dvb.frontend != NULL) {</div><div class='del'>-				dvb_attach(tda829x_attach, port-&gt;dvb.frontend,</div><div class='add'>+			if (fe0-&gt;dvb.frontend != NULL) {</div><div class='add'>+				dvb_attach(tda829x_attach, fe0-&gt;dvb.frontend,</div><div class='ctx'> 					   &amp;dev-&gt;i2c_bus[1].i2c_adap, 0x42,</div><div class='ctx'> 					   &amp;tda829x_no_probe);</div><div class='del'>-				dvb_attach(tda18271_attach, port-&gt;dvb.frontend,</div><div class='add'>+				dvb_attach(tda18271_attach, fe0-&gt;dvb.frontend,</div><div class='ctx'> 					   0x60, &amp;dev-&gt;i2c_bus[1].i2c_adap,</div><div class='ctx'> 					   &amp;hauppauge_tda18271_config);</div><div class='ctx'> 			}</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 0:</div><div class='ctx'> 		default:</div><div class='del'>-			port-&gt;dvb.frontend =</div><div class='add'>+			fe0-&gt;dvb.frontend =</div><div class='ctx'> 				dvb_attach(s5h1409_attach,</div><div class='ctx'> 					   &amp;hauppauge_generic_config,</div><div class='ctx'> 					   &amp;i2c_bus-&gt;i2c_adap);</div><div class='del'>-			if (port-&gt;dvb.frontend != NULL)</div><div class='del'>-				dvb_attach(mt2131_attach, port-&gt;dvb.frontend,</div><div class='add'>+			if (fe0-&gt;dvb.frontend != NULL)</div><div class='add'>+				dvb_attach(mt2131_attach, fe0-&gt;dvb.frontend,</div><div class='ctx'> 					   &amp;i2c_bus-&gt;i2c_adap,</div><div class='ctx'> 					   &amp;hauppauge_generic_tunerconfig, 0);</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -386,56 +367,55 @@ static int dvb_register(struct cx23885_tsport *port)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CX23885_BOARD_HAUPPAUGE_HVR1800lp:</div><div class='ctx'> 		i2c_bus = &amp;dev-&gt;i2c_bus[0];</div><div class='del'>-		port-&gt;dvb.frontend = dvb_attach(s5h1409_attach,</div><div class='add'>+		fe0-&gt;dvb.frontend = dvb_attach(s5h1409_attach,</div><div class='ctx'> 						&amp;hauppauge_hvr1800lp_config,</div><div class='ctx'> 						&amp;i2c_bus-&gt;i2c_adap);</div><div class='del'>-		if (port-&gt;dvb.frontend != NULL) {</div><div class='del'>-			dvb_attach(mt2131_attach, port-&gt;dvb.frontend,</div><div class='add'>+		if (fe0-&gt;dvb.frontend != NULL) {</div><div class='add'>+			dvb_attach(mt2131_attach, fe0-&gt;dvb.frontend,</div><div class='ctx'> 				   &amp;i2c_bus-&gt;i2c_adap,</div><div class='ctx'> 				   &amp;hauppauge_generic_tunerconfig, 0);</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CX23885_BOARD_DVICO_FUSIONHDTV_5_EXP:</div><div class='ctx'> 		i2c_bus = &amp;dev-&gt;i2c_bus[0];</div><div class='del'>-		port-&gt;dvb.frontend = dvb_attach(lgdt330x_attach,</div><div class='add'>+		fe0-&gt;dvb.frontend = dvb_attach(lgdt330x_attach,</div><div class='ctx'> 						&amp;fusionhdtv_5_express,</div><div class='ctx'> 						&amp;i2c_bus-&gt;i2c_adap);</div><div class='del'>-		if (port-&gt;dvb.frontend != NULL) {</div><div class='del'>-			dvb_attach(simple_tuner_attach, port-&gt;dvb.frontend,</div><div class='add'>+		if (fe0-&gt;dvb.frontend != NULL) {</div><div class='add'>+			dvb_attach(simple_tuner_attach, fe0-&gt;dvb.frontend,</div><div class='ctx'> 				   &amp;i2c_bus-&gt;i2c_adap, 0x61,</div><div class='ctx'> 				   TUNER_LG_TDVS_H06XF);</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CX23885_BOARD_HAUPPAUGE_HVR1500Q:</div><div class='ctx'> 		i2c_bus = &amp;dev-&gt;i2c_bus[1];</div><div class='del'>-		port-&gt;dvb.frontend = dvb_attach(s5h1409_attach,</div><div class='add'>+		fe0-&gt;dvb.frontend = dvb_attach(s5h1409_attach,</div><div class='ctx'> 						&amp;hauppauge_hvr1500q_config,</div><div class='ctx'> 						&amp;dev-&gt;i2c_bus[0].i2c_adap);</div><div class='del'>-		if (port-&gt;dvb.frontend != NULL)</div><div class='del'>-			dvb_attach(xc5000_attach, port-&gt;dvb.frontend,</div><div class='del'>-				&amp;i2c_bus-&gt;i2c_adap,</div><div class='del'>-				&amp;hauppauge_hvr1500q_tunerconfig, i2c_bus);</div><div class='add'>+		if (fe0-&gt;dvb.frontend != NULL)</div><div class='add'>+			dvb_attach(xc5000_attach, fe0-&gt;dvb.frontend,</div><div class='add'>+				   &amp;i2c_bus-&gt;i2c_adap,</div><div class='add'>+				   &amp;hauppauge_hvr1500q_tunerconfig);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CX23885_BOARD_HAUPPAUGE_HVR1500:</div><div class='ctx'> 		i2c_bus = &amp;dev-&gt;i2c_bus[1];</div><div class='del'>-		port-&gt;dvb.frontend = dvb_attach(s5h1409_attach,</div><div class='add'>+		fe0-&gt;dvb.frontend = dvb_attach(s5h1409_attach,</div><div class='ctx'> 						&amp;hauppauge_hvr1500_config,</div><div class='ctx'> 						&amp;dev-&gt;i2c_bus[0].i2c_adap);</div><div class='del'>-		if (port-&gt;dvb.frontend != NULL) {</div><div class='add'>+		if (fe0-&gt;dvb.frontend != NULL) {</div><div class='ctx'> 			struct dvb_frontend *fe;</div><div class='ctx'> 			struct xc2028_config cfg = {</div><div class='ctx'> 				.i2c_adap  = &amp;i2c_bus-&gt;i2c_adap,</div><div class='ctx'> 				.i2c_addr  = 0x61,</div><div class='del'>-				.callback  = cx23885_hvr1500_xc3028_callback,</div><div class='ctx'> 			};</div><div class='ctx'> 			static struct xc2028_ctrl ctl = {</div><div class='del'>-				.fname       = "xc3028-v27.fw",</div><div class='add'>+				.fname       = XC2028_DEFAULT_FIRMWARE,</div><div class='ctx'> 				.max_len     = 64,</div><div class='ctx'> 				.scode_table = XC3028_FE_OREN538,</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			fe = dvb_attach(xc2028_attach,</div><div class='del'>-					port-&gt;dvb.frontend, &amp;cfg);</div><div class='add'>+					fe0-&gt;dvb.frontend, &amp;cfg);</div><div class='ctx'> 			if (fe != NULL &amp;&amp; fe-&gt;ops.tuner_ops.set_config != NULL)</div><div class='ctx'> 				fe-&gt;ops.tuner_ops.set_config(fe, &amp;ctl);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -443,39 +423,40 @@ static int dvb_register(struct cx23885_tsport *port)</div><div class='ctx'> 	case CX23885_BOARD_HAUPPAUGE_HVR1200:</div><div class='ctx'> 	case CX23885_BOARD_HAUPPAUGE_HVR1700:</div><div class='ctx'> 		i2c_bus = &amp;dev-&gt;i2c_bus[0];</div><div class='del'>-		port-&gt;dvb.frontend = dvb_attach(tda10048_attach,</div><div class='add'>+		fe0-&gt;dvb.frontend = dvb_attach(tda10048_attach,</div><div class='ctx'> 			&amp;hauppauge_hvr1200_config,</div><div class='ctx'> 			&amp;i2c_bus-&gt;i2c_adap);</div><div class='del'>-		if (port-&gt;dvb.frontend != NULL) {</div><div class='del'>-			dvb_attach(tda829x_attach, port-&gt;dvb.frontend,</div><div class='add'>+		if (fe0-&gt;dvb.frontend != NULL) {</div><div class='add'>+			dvb_attach(tda829x_attach, fe0-&gt;dvb.frontend,</div><div class='ctx'> 				&amp;dev-&gt;i2c_bus[1].i2c_adap, 0x42,</div><div class='ctx'> 				&amp;tda829x_no_probe);</div><div class='del'>-			dvb_attach(tda18271_attach, port-&gt;dvb.frontend,</div><div class='add'>+			dvb_attach(tda18271_attach, fe0-&gt;dvb.frontend,</div><div class='ctx'> 				0x60, &amp;dev-&gt;i2c_bus[1].i2c_adap,</div><div class='ctx'> 				&amp;hauppauge_hvr1200_tuner_config);</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CX23885_BOARD_HAUPPAUGE_HVR1400:</div><div class='ctx'> 		i2c_bus = &amp;dev-&gt;i2c_bus[0];</div><div class='del'>-		port-&gt;dvb.frontend = dvb_attach(dib7000p_attach,</div><div class='add'>+		fe0-&gt;dvb.frontend = dvb_attach(dib7000p_attach,</div><div class='ctx'> 			&amp;i2c_bus-&gt;i2c_adap,</div><div class='ctx'> 			0x12, &amp;hauppauge_hvr1400_dib7000_config);</div><div class='del'>-		if (port-&gt;dvb.frontend != NULL) {</div><div class='add'>+		if (fe0-&gt;dvb.frontend != NULL) {</div><div class='ctx'> 			struct dvb_frontend *fe;</div><div class='ctx'> 			struct xc2028_config cfg = {</div><div class='ctx'> 				.i2c_adap  = &amp;dev-&gt;i2c_bus[1].i2c_adap,</div><div class='ctx'> 				.i2c_addr  = 0x64,</div><div class='del'>-				.callback  = cx23885_hvr1500_xc3028_callback,</div><div class='ctx'> 			};</div><div class='ctx'> 			static struct xc2028_ctrl ctl = {</div><div class='del'>-				.fname   = "xc3028L-v36.fw",</div><div class='add'>+				.fname   = XC3028L_DEFAULT_FIRMWARE,</div><div class='ctx'> 				.max_len = 64,</div><div class='ctx'> 				.demod   = 5000,</div><div class='del'>-				.d2633   = 1</div><div class='add'>+				/* This is true for all demods with</div><div class='add'>+					v36 firmware? */</div><div class='add'>+				.type    = XC2028_D2633,</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			fe = dvb_attach(xc2028_attach,</div><div class='del'>-					port-&gt;dvb.frontend, &amp;cfg);</div><div class='add'>+					fe0-&gt;dvb.frontend, &amp;cfg);</div><div class='ctx'> 			if (fe != NULL &amp;&amp; fe-&gt;ops.tuner_ops.set_config != NULL)</div><div class='ctx'> 				fe-&gt;ops.tuner_ops.set_config(fe, &amp;ctl);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -483,77 +464,163 @@ static int dvb_register(struct cx23885_tsport *port)</div><div class='ctx'> 	case CX23885_BOARD_DVICO_FUSIONHDTV_7_DUAL_EXP:</div><div class='ctx'> 		i2c_bus = &amp;dev-&gt;i2c_bus[port-&gt;nr - 1];</div><div class='ctx'> </div><div class='del'>-		port-&gt;dvb.frontend = dvb_attach(s5h1409_attach,</div><div class='add'>+		fe0-&gt;dvb.frontend = dvb_attach(s5h1409_attach,</div><div class='ctx'> 						&amp;dvico_s5h1409_config,</div><div class='ctx'> 						&amp;i2c_bus-&gt;i2c_adap);</div><div class='del'>-		if (port-&gt;dvb.frontend == NULL)</div><div class='del'>-			port-&gt;dvb.frontend = dvb_attach(s5h1411_attach,</div><div class='add'>+		if (fe0-&gt;dvb.frontend == NULL)</div><div class='add'>+			fe0-&gt;dvb.frontend = dvb_attach(s5h1411_attach,</div><div class='ctx'> 							&amp;dvico_s5h1411_config,</div><div class='ctx'> 							&amp;i2c_bus-&gt;i2c_adap);</div><div class='del'>-		if (port-&gt;dvb.frontend != NULL)</div><div class='del'>-			dvb_attach(xc5000_attach, port-&gt;dvb.frontend,</div><div class='del'>-				&amp;i2c_bus-&gt;i2c_adap,</div><div class='del'>-				&amp;dvico_xc5000_tunerconfig, i2c_bus);</div><div class='add'>+		if (fe0-&gt;dvb.frontend != NULL)</div><div class='add'>+			dvb_attach(xc5000_attach, fe0-&gt;dvb.frontend,</div><div class='add'>+				   &amp;i2c_bus-&gt;i2c_adap,</div><div class='add'>+				   &amp;dvico_xc5000_tunerconfig);</div><div class='add'>+		break;</div><div class='add'>+	case CX23885_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL_EXP: {</div><div class='add'>+		i2c_bus = &amp;dev-&gt;i2c_bus[port-&gt;nr - 1];</div><div class='add'>+</div><div class='add'>+		fe0-&gt;dvb.frontend = dvb_attach(zl10353_attach,</div><div class='add'>+					       &amp;dvico_fusionhdtv_xc3028,</div><div class='add'>+					       &amp;i2c_bus-&gt;i2c_adap);</div><div class='add'>+		if (fe0-&gt;dvb.frontend != NULL) {</div><div class='add'>+			struct dvb_frontend      *fe;</div><div class='add'>+			struct xc2028_config	  cfg = {</div><div class='add'>+				.i2c_adap  = &amp;i2c_bus-&gt;i2c_adap,</div><div class='add'>+				.i2c_addr  = 0x61,</div><div class='add'>+			};</div><div class='add'>+			static struct xc2028_ctrl ctl = {</div><div class='add'>+				.fname       = XC2028_DEFAULT_FIRMWARE,</div><div class='add'>+				.max_len     = 64,</div><div class='add'>+				.demod       = XC3028_FE_ZARLINK456,</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			fe = dvb_attach(xc2028_attach, fe0-&gt;dvb.frontend,</div><div class='add'>+					&amp;cfg);</div><div class='add'>+			if (fe != NULL &amp;&amp; fe-&gt;ops.tuner_ops.set_config != NULL)</div><div class='add'>+				fe-&gt;ops.tuner_ops.set_config(fe, &amp;ctl);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H:</div><div class='add'>+		i2c_bus = &amp;dev-&gt;i2c_bus[0];</div><div class='add'>+</div><div class='add'>+		fe0-&gt;dvb.frontend = dvb_attach(zl10353_attach,</div><div class='add'>+			&amp;dvico_fusionhdtv_xc3028,</div><div class='add'>+			&amp;i2c_bus-&gt;i2c_adap);</div><div class='add'>+		if (fe0-&gt;dvb.frontend != NULL) {</div><div class='add'>+			struct dvb_frontend      *fe;</div><div class='add'>+			struct xc2028_config	  cfg = {</div><div class='add'>+				.i2c_adap  = &amp;dev-&gt;i2c_bus[1].i2c_adap,</div><div class='add'>+				.i2c_addr  = 0x61,</div><div class='add'>+			};</div><div class='add'>+			static struct xc2028_ctrl ctl = {</div><div class='add'>+				.fname       = XC2028_DEFAULT_FIRMWARE,</div><div class='add'>+				.max_len     = 64,</div><div class='add'>+				.demod       = XC3028_FE_ZARLINK456,</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			fe = dvb_attach(xc2028_attach, fe0-&gt;dvb.frontend,</div><div class='add'>+				&amp;cfg);</div><div class='add'>+			if (fe != NULL &amp;&amp; fe-&gt;ops.tuner_ops.set_config != NULL)</div><div class='add'>+				fe-&gt;ops.tuner_ops.set_config(fe, &amp;ctl);</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		printk("%s: The frontend of your DVB/ATSC card isn't supported yet\n",</div><div class='add'>+		printk(KERN_INFO "%s: The frontend of your DVB/ATSC card "</div><div class='add'>+			" isn't supported yet\n",</div><div class='ctx'> 		       dev-&gt;name);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	if (NULL == port-&gt;dvb.frontend) {</div><div class='del'>-		printk("%s: frontend initialization failed\n", dev-&gt;name);</div><div class='add'>+	if (NULL == fe0-&gt;dvb.frontend) {</div><div class='add'>+		printk(KERN_ERR "%s: frontend initialization failed\n",</div><div class='add'>+			dev-&gt;name);</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='add'>+	/* define general-purpose callback pointer */</div><div class='add'>+	fe0-&gt;dvb.frontend-&gt;callback = cx23885_tuner_callback;</div><div class='ctx'> </div><div class='ctx'> 	/* Put the analog decoder in standby to keep it quiet */</div><div class='ctx'> 	cx23885_call_i2c_clients(i2c_bus, TUNER_SET_STANDBY, NULL);</div><div class='ctx'> </div><div class='del'>-	if (port-&gt;dvb.frontend-&gt;ops.analog_ops.standby)</div><div class='del'>-		port-&gt;dvb.frontend-&gt;ops.analog_ops.standby(port-&gt;dvb.frontend);</div><div class='add'>+	if (fe0-&gt;dvb.frontend-&gt;ops.analog_ops.standby)</div><div class='add'>+		fe0-&gt;dvb.frontend-&gt;ops.analog_ops.standby(fe0-&gt;dvb.frontend);</div><div class='ctx'> </div><div class='ctx'> 	/* register everything */</div><div class='del'>-	return videobuf_dvb_register(&amp;port-&gt;dvb, THIS_MODULE, port,</div><div class='del'>-				     &amp;dev-&gt;pci-&gt;dev, adapter_nr);</div><div class='add'>+	return videobuf_dvb_register_bus(&amp;port-&gt;frontends, THIS_MODULE, port,</div><div class='add'>+		&amp;dev-&gt;pci-&gt;dev, adapter_nr, 0);</div><div class='add'>+</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int cx23885_dvb_register(struct cx23885_tsport *port)</div><div class='ctx'> {</div><div class='add'>+</div><div class='add'>+	struct videobuf_dvb_frontend *fe0;</div><div class='ctx'> 	struct cx23885_dev *dev = port-&gt;dev;</div><div class='del'>-	int err;</div><div class='add'>+	int err, i;</div><div class='add'>+</div><div class='add'>+	/* Here we need to allocate the correct number of frontends,</div><div class='add'>+	 * as reflected in the cards struct. The reality is that currrently</div><div class='add'>+	 * no cx23885 boards support this - yet. But, if we don't modify this</div><div class='add'>+	 * code then the second frontend would never be allocated (later)</div><div class='add'>+	 * and fail with error before the attach in dvb_register().</div><div class='add'>+	 * Without these changes we risk an OOPS later. The changes here</div><div class='add'>+	 * are for safety, and should provide a good foundation for the</div><div class='add'>+	 * future addition of any multi-frontend cx23885 based boards.</div><div class='add'>+	 */</div><div class='add'>+	printk(KERN_INFO "%s() allocating %d frontend(s)\n", __func__,</div><div class='add'>+		port-&gt;num_frontends);</div><div class='add'>+</div><div class='add'>+	for (i = 1; i &lt;= port-&gt;num_frontends; i++) {</div><div class='add'>+		if (videobuf_dvb_alloc_frontend(</div><div class='add'>+			&amp;port-&gt;frontends, i) == NULL) {</div><div class='add'>+			printk(KERN_ERR "%s() failed to alloc\n", __func__);</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		fe0 = videobuf_dvb_get_frontend(&amp;port-&gt;frontends, i);</div><div class='add'>+		if (!fe0)</div><div class='add'>+			err = -EINVAL;</div><div class='ctx'> </div><div class='del'>-	dprintk(1, "%s\n", __func__);</div><div class='del'>-	dprintk(1, " -&gt;being probed by Card=%d Name=%s, PCI %02x:%02x\n",</div><div class='del'>-		dev-&gt;board,</div><div class='del'>-		dev-&gt;name,</div><div class='del'>-		dev-&gt;pci_bus,</div><div class='del'>-		dev-&gt;pci_slot);</div><div class='add'>+		dprintk(1, "%s\n", __func__);</div><div class='add'>+		dprintk(1, " -&gt;probed by Card=%d Name=%s, PCI %02x:%02x\n",</div><div class='add'>+			dev-&gt;board,</div><div class='add'>+			dev-&gt;name,</div><div class='add'>+			dev-&gt;pci_bus,</div><div class='add'>+			dev-&gt;pci_slot);</div><div class='ctx'> </div><div class='del'>-	err = -ENODEV;</div><div class='add'>+		err = -ENODEV;</div><div class='ctx'> </div><div class='del'>-	/* dvb stuff */</div><div class='del'>-	printk("%s: cx23885 based dvb card\n", dev-&gt;name);</div><div class='del'>-	videobuf_queue_sg_init(&amp;port-&gt;dvb.dvbq, &amp;dvb_qops, &amp;dev-&gt;pci-&gt;dev, &amp;port-&gt;slock,</div><div class='add'>+		/* dvb stuff */</div><div class='add'>+		/* We have to init the queue for each frontend on a port. */</div><div class='add'>+		printk(KERN_INFO "%s: cx23885 based dvb card\n", dev-&gt;name);</div><div class='add'>+		videobuf_queue_sg_init(&amp;fe0-&gt;dvb.dvbq, &amp;dvb_qops,</div><div class='add'>+			    &amp;dev-&gt;pci-&gt;dev, &amp;port-&gt;slock,</div><div class='ctx'> 			    V4L2_BUF_TYPE_VIDEO_CAPTURE, V4L2_FIELD_TOP,</div><div class='ctx'> 			    sizeof(struct cx23885_buffer), port);</div><div class='add'>+	}</div><div class='ctx'> 	err = dvb_register(port);</div><div class='ctx'> 	if (err != 0)</div><div class='del'>-		printk("%s() dvb_register failed err = %d\n", __func__, err);</div><div class='add'>+		printk(KERN_ERR "%s() dvb_register failed err = %d\n",</div><div class='add'>+			__func__, err);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int cx23885_dvb_unregister(struct cx23885_tsport *port)</div><div class='ctx'> {</div><div class='del'>-	/* dvb */</div><div class='del'>-	if(port-&gt;dvb.frontend)</div><div class='del'>-		videobuf_dvb_unregister(&amp;port-&gt;dvb);</div><div class='add'>+	struct videobuf_dvb_frontend *fe0;</div><div class='add'>+</div><div class='add'>+	/* FIXME: in an error condition where the we have</div><div class='add'>+	 * an expected number of frontends (attach problem)</div><div class='add'>+	 * then this might not clean up correctly, if 1</div><div class='add'>+	 * is invalid.</div><div class='add'>+	 * This comment only applies to future boards IF they</div><div class='add'>+	 * implement MFE support.</div><div class='add'>+	 */</div><div class='add'>+	fe0 = videobuf_dvb_get_frontend(&amp;port-&gt;frontends, 1);</div><div class='add'>+	if (fe0-&gt;dvb.frontend)</div><div class='add'>+		videobuf_dvb_unregister_bus(&amp;port-&gt;frontends);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Local variables:</div><div class='del'>- * c-basic-offset: 8</div><div class='del'>- * End:</div><div class='del'>- * kate: eol "unix"; indent-width 3; remove-trailing-space on; replace-trailing-space-save on; tab-width 8; replace-tabs off; space-indent off; mixed-indent off</div><div class='del'>-*/</div><div class='head'>diff --git a/drivers/media/video/cx23885/cx23885-i2c.c b/drivers/media/video/cx23885/cx23885-i2c.c<br/>index f98e476e9617..bb7f71a1fcbe 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx23885/cx23885-i2c.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/cx23885/cx23885-i2c.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx23885/cx23885-i2c.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx23885/cx23885-i2c.c</a></div><div class='hunk'>@@ -131,7 +131,7 @@ static int i2c_sendbytes(struct i2c_adapter *i2c_adap,</div><div class='ctx'> 			printk(" &gt;\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (cnt = 1; cnt &lt; msg-&gt;len; cnt++ ) {</div><div class='add'>+	for (cnt = 1; cnt &lt; msg-&gt;len; cnt++) {</div><div class='ctx'> 		/* following bytes */</div><div class='ctx'> 		wdata = msg-&gt;buf[cnt];</div><div class='ctx'> 		ctrl = bus-&gt;i2c_period | (1 &lt;&lt; 12) | (1 &lt;&lt; 2);</div><div class='hunk'>@@ -151,9 +151,9 @@ static int i2c_sendbytes(struct i2c_adapter *i2c_adap,</div><div class='ctx'> 		if (retval == 0)</div><div class='ctx'> 			goto eio;</div><div class='ctx'> 		if (i2c_debug) {</div><div class='del'>-			printk(" %02x", msg-&gt;buf[cnt]);</div><div class='add'>+			dprintk(1, " %02x", msg-&gt;buf[cnt]);</div><div class='ctx'> 			if (!(ctrl &amp; I2C_NOSTOP))</div><div class='del'>-				printk(" &gt;\n");</div><div class='add'>+				dprintk(1, " &gt;\n");</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return msg-&gt;len;</div><div class='hunk'>@@ -162,7 +162,7 @@ static int i2c_sendbytes(struct i2c_adapter *i2c_adap,</div><div class='ctx'> 	retval = -EIO;</div><div class='ctx'>  err:</div><div class='ctx'> 	if (i2c_debug)</div><div class='del'>-		printk(" ERR: %d\n", retval);</div><div class='add'>+		printk(KERN_ERR " ERR: %d\n", retval);</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -194,12 +194,12 @@ static int i2c_readbytes(struct i2c_adapter *i2c_adap,</div><div class='ctx'> </div><div class='ctx'> 	if (i2c_debug) {</div><div class='ctx'> 		if (joined)</div><div class='del'>-			printk(" R");</div><div class='add'>+			dprintk(1, " R");</div><div class='ctx'> 		else</div><div class='del'>-			printk(" &lt;R %02x", (msg-&gt;addr &lt;&lt; 1) + 1);</div><div class='add'>+			dprintk(1, " &lt;R %02x", (msg-&gt;addr &lt;&lt; 1) + 1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for(cnt = 0; cnt &lt; msg-&gt;len; cnt++) {</div><div class='add'>+	for (cnt = 0; cnt &lt; msg-&gt;len; cnt++) {</div><div class='ctx'> </div><div class='ctx'> 		ctrl = bus-&gt;i2c_period | (1 &lt;&lt; 12) | (1 &lt;&lt; 2) | 1;</div><div class='ctx'> </div><div class='hunk'>@@ -216,9 +216,9 @@ static int i2c_readbytes(struct i2c_adapter *i2c_adap,</div><div class='ctx'> 			goto eio;</div><div class='ctx'> 		msg-&gt;buf[cnt] = cx_read(bus-&gt;reg_rdata) &amp; 0xff;</div><div class='ctx'> 		if (i2c_debug) {</div><div class='del'>-			printk(" %02x", msg-&gt;buf[cnt]);</div><div class='add'>+			dprintk(1, " %02x", msg-&gt;buf[cnt]);</div><div class='ctx'> 			if (!(ctrl &amp; I2C_NOSTOP))</div><div class='del'>-				printk(" &gt;\n");</div><div class='add'>+				dprintk(1, " &gt;\n");</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return msg-&gt;len;</div><div class='hunk'>@@ -227,7 +227,7 @@ static int i2c_readbytes(struct i2c_adapter *i2c_adap,</div><div class='ctx'> 	retval = -EIO;</div><div class='ctx'>  err:</div><div class='ctx'> 	if (i2c_debug)</div><div class='del'>-		printk(" ERR: %d\n", retval);</div><div class='add'>+		printk(KERN_ERR " ERR: %d\n", retval);</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -353,17 +353,17 @@ static struct i2c_client cx23885_i2c_client_template = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static char *i2c_devs[128] = {</div><div class='del'>-	[0x10 &gt;&gt; 1]   = "tda10048",</div><div class='del'>-	[0x12 &gt;&gt; 1]   = "dib7000pc",</div><div class='del'>-	[ 0x1c &gt;&gt; 1 ] = "lgdt3303",</div><div class='del'>-	[ 0x86 &gt;&gt; 1 ] = "tda9887",</div><div class='del'>-	[ 0x32 &gt;&gt; 1 ] = "cx24227",</div><div class='del'>-	[ 0x88 &gt;&gt; 1 ] = "cx25837",</div><div class='del'>-	[ 0x84 &gt;&gt; 1 ] = "tda8295",</div><div class='del'>-	[ 0xa0 &gt;&gt; 1 ] = "eeprom",</div><div class='del'>-	[ 0xc0 &gt;&gt; 1 ] = "tuner/mt2131/tda8275",</div><div class='add'>+	[0x10 &gt;&gt; 1] = "tda10048",</div><div class='add'>+	[0x12 &gt;&gt; 1] = "dib7000pc",</div><div class='add'>+	[0x1c &gt;&gt; 1] = "lgdt3303",</div><div class='add'>+	[0x86 &gt;&gt; 1] = "tda9887",</div><div class='add'>+	[0x32 &gt;&gt; 1] = "cx24227",</div><div class='add'>+	[0x88 &gt;&gt; 1] = "cx25837",</div><div class='add'>+	[0x84 &gt;&gt; 1] = "tda8295",</div><div class='add'>+	[0xa0 &gt;&gt; 1] = "eeprom",</div><div class='add'>+	[0xc0 &gt;&gt; 1] = "tuner/mt2131/tda8275",</div><div class='ctx'> 	[0xc2 &gt;&gt; 1] = "tuner/mt2131/tda8275/xc5000/xc3028",</div><div class='del'>-	[0xc8 &gt;&gt; 1]   = "tuner/xc3028L",</div><div class='add'>+	[0xc8 &gt;&gt; 1] = "tuner/xc3028L",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void do_i2c_scan(char *name, struct i2c_client *c)</div><div class='hunk'>@@ -376,7 +376,7 @@ static void do_i2c_scan(char *name, struct i2c_client *c)</div><div class='ctx'> 		rc = i2c_master_recv(c, &amp;buf, 0);</div><div class='ctx'> 		if (rc &lt; 0)</div><div class='ctx'> 			continue;</div><div class='del'>-		printk("%s: i2c scan: found device @ 0x%x  [%s]\n",</div><div class='add'>+		printk(KERN_INFO "%s: i2c scan: found device @ 0x%x  [%s]\n",</div><div class='ctx'> 		       name, i &lt;&lt; 1, i2c_devs[i] ? i2c_devs[i] : "???");</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -408,11 +408,12 @@ int cx23885_i2c_register(struct cx23885_i2c *bus)</div><div class='ctx'> 	bus-&gt;i2c_client.adapter = &amp;bus-&gt;i2c_adap;</div><div class='ctx'> </div><div class='ctx'> 	if (0 == bus-&gt;i2c_rc) {</div><div class='del'>-		printk("%s: i2c bus %d registered\n", dev-&gt;name, bus-&gt;nr);</div><div class='add'>+		dprintk(1, "%s: i2c bus %d registered\n", dev-&gt;name, bus-&gt;nr);</div><div class='ctx'> 		if (i2c_scan)</div><div class='ctx'> 			do_i2c_scan(dev-&gt;name, &amp;bus-&gt;i2c_client);</div><div class='ctx'> 	} else</div><div class='del'>-		printk("%s: i2c bus %d register FAILED\n", dev-&gt;name, bus-&gt;nr);</div><div class='add'>+		printk(KERN_WARNING "%s: i2c bus %d register FAILED\n",</div><div class='add'>+			dev-&gt;name, bus-&gt;nr);</div><div class='ctx'> </div><div class='ctx'> 	return bus-&gt;i2c_rc;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/media/video/cx23885/cx23885-vbi.c b/drivers/media/video/cx23885/cx23885-vbi.c<br/>index 35e61cd112fc..5b297f0323b6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx23885/cx23885-vbi.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/cx23885/cx23885-vbi.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx23885/cx23885-vbi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx23885/cx23885-vbi.c</a></div><div class='hunk'>@@ -85,18 +85,8 @@ static int cx23885_start_vbi_dma(struct cx23885_dev    *dev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int cx23885_stop_vbi_dma(struct cx23885_dev *dev)</div><div class='del'>-{</div><div class='del'>-	/* stop dma */</div><div class='del'>-	cx_clear(VID_A_DMA_CTL, 0x00000022);</div><div class='del'>-</div><div class='del'>-	/* disable irqs */</div><div class='del'>-	cx_clear(PCI_INT_MSK, 0x000001);</div><div class='del'>-	cx_clear(VID_A_INT_MSK, 0x00000022);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-int cx23885_restart_vbi_queue(struct cx23885_dev    *dev,</div><div class='add'>+static int cx23885_restart_vbi_queue(struct cx23885_dev    *dev,</div><div class='ctx'> 			     struct cx23885_dmaqueue *q)</div><div class='ctx'> {</div><div class='ctx'> 	struct cx23885_buffer *buf;</div><div class='head'>diff --git a/drivers/media/video/cx23885/cx23885-video.c b/drivers/media/video/cx23885/cx23885-video.c<br/>index 6047c78d84bf..ab3110d6046c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx23885/cx23885-video.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/cx23885/cx23885-video.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx23885/cx23885-video.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx23885/cx23885-video.c</a></div><div class='hunk'>@@ -244,7 +244,7 @@ static struct cx23885_ctrl cx23885_ctls[] = {</div><div class='ctx'> };</div><div class='ctx'> static const int CX23885_CTLS = ARRAY_SIZE(cx23885_ctls);</div><div class='ctx'> </div><div class='del'>-const u32 cx23885_user_ctrls[] = {</div><div class='add'>+static const u32 cx23885_user_ctrls[] = {</div><div class='ctx'> 	V4L2_CID_USER_CLASS,</div><div class='ctx'> 	V4L2_CID_BRIGHTNESS,</div><div class='ctx'> 	V4L2_CID_CONTRAST,</div><div class='hunk'>@@ -254,14 +254,13 @@ const u32 cx23885_user_ctrls[] = {</div><div class='ctx'> 	V4L2_CID_AUDIO_MUTE,</div><div class='ctx'> 	0</div><div class='ctx'> };</div><div class='del'>-EXPORT_SYMBOL(cx23885_user_ctrls);</div><div class='ctx'> </div><div class='ctx'> static const u32 *ctrl_classes[] = {</div><div class='ctx'> 	cx23885_user_ctrls,</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-void cx23885_video_wakeup(struct cx23885_dev *dev,</div><div class='add'>+static void cx23885_video_wakeup(struct cx23885_dev *dev,</div><div class='ctx'> 		 struct cx23885_dmaqueue *q, u32 count)</div><div class='ctx'> {</div><div class='ctx'> 	struct cx23885_buffer *buf;</div><div class='hunk'>@@ -286,17 +285,16 @@ void cx23885_video_wakeup(struct cx23885_dev *dev,</div><div class='ctx'> 		list_del(&amp;buf-&gt;vb.queue);</div><div class='ctx'> 		wake_up(&amp;buf-&gt;vb.done);</div><div class='ctx'> 	}</div><div class='del'>-	if (list_empty(&amp;q-&gt;active)) {</div><div class='add'>+	if (list_empty(&amp;q-&gt;active))</div><div class='ctx'> 		del_timer(&amp;q-&gt;timeout);</div><div class='del'>-	} else {</div><div class='add'>+	else</div><div class='ctx'> 		mod_timer(&amp;q-&gt;timeout, jiffies+BUFFER_TIMEOUT);</div><div class='del'>-	}</div><div class='ctx'> 	if (bc != 1)</div><div class='ctx'> 		printk(KERN_ERR "%s: %d buffers handled (should be 1)\n",</div><div class='ctx'> 			__func__, bc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int cx23885_set_tvnorm(struct cx23885_dev *dev, v4l2_std_id norm)</div><div class='add'>+static int cx23885_set_tvnorm(struct cx23885_dev *dev, v4l2_std_id norm)</div><div class='ctx'> {</div><div class='ctx'> 	dprintk(1, "%s(norm = 0x%08x) name: [%s]\n",</div><div class='ctx'> 		__func__,</div><div class='hunk'>@@ -314,7 +312,7 @@ int cx23885_set_tvnorm(struct cx23885_dev *dev, v4l2_std_id norm)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct video_device *cx23885_vdev_init(struct cx23885_dev *dev,</div><div class='add'>+static struct video_device *cx23885_vdev_init(struct cx23885_dev *dev,</div><div class='ctx'> 				    struct pci_dev *pci,</div><div class='ctx'> 				    struct video_device *template,</div><div class='ctx'> 				    char *type)</div><div class='hunk'>@@ -334,7 +332,7 @@ struct video_device *cx23885_vdev_init(struct cx23885_dev *dev,</div><div class='ctx'> 	return vfd;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int cx23885_ctrl_query(struct v4l2_queryctrl *qctrl)</div><div class='add'>+static int cx23885_ctrl_query(struct v4l2_queryctrl *qctrl)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -351,7 +349,6 @@ int cx23885_ctrl_query(struct v4l2_queryctrl *qctrl)</div><div class='ctx'> 	*qctrl = cx23885_ctls[i].v;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(cx23885_ctrl_query);</div><div class='ctx'> </div><div class='ctx'> /* ------------------------------------------------------------------- */</div><div class='ctx'> /* resource management                                                 */</div><div class='hunk'>@@ -381,12 +378,12 @@ static int res_get(struct cx23885_dev *dev, struct cx23885_fh *fh,</div><div class='ctx'> </div><div class='ctx'> static int res_check(struct cx23885_fh *fh, unsigned int bit)</div><div class='ctx'> {</div><div class='del'>-	return (fh-&gt;resources &amp; bit);</div><div class='add'>+	return fh-&gt;resources &amp; bit;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int res_locked(struct cx23885_dev *dev, unsigned int bit)</div><div class='ctx'> {</div><div class='del'>-	return (dev-&gt;resources &amp; bit);</div><div class='add'>+	return dev-&gt;resources &amp; bit;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void res_free(struct cx23885_dev *dev, struct cx23885_fh *fh,</div><div class='hunk'>@@ -402,7 +399,7 @@ static void res_free(struct cx23885_dev *dev, struct cx23885_fh *fh,</div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int cx23885_video_mux(struct cx23885_dev *dev, unsigned int input)</div><div class='add'>+static int cx23885_video_mux(struct cx23885_dev *dev, unsigned int input)</div><div class='ctx'> {</div><div class='ctx'> 	struct v4l2_routing route;</div><div class='ctx'> 	memset(&amp;route, 0, sizeof(route));</div><div class='hunk'>@@ -422,10 +419,9 @@ int cx23885_video_mux(struct cx23885_dev *dev, unsigned int input)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(cx23885_video_mux);</div><div class='ctx'> </div><div class='ctx'> /* ------------------------------------------------------------------ */</div><div class='del'>-int cx23885_set_scale(struct cx23885_dev *dev, unsigned int width,</div><div class='add'>+static int cx23885_set_scale(struct cx23885_dev *dev, unsigned int width,</div><div class='ctx'> 	unsigned int height, enum v4l2_field field)</div><div class='ctx'> {</div><div class='ctx'> 	dprintk(1, "%s()\n", __func__);</div><div class='hunk'>@@ -731,6 +727,7 @@ static int video_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	enum v4l2_buf_type type = 0;</div><div class='ctx'> 	int radio = 0;</div><div class='ctx'> </div><div class='add'>+	lock_kernel();</div><div class='ctx'> 	list_for_each(list, &amp;cx23885_devlist) {</div><div class='ctx'> 		h = list_entry(list, struct cx23885_dev, devlist);</div><div class='ctx'> 		if (h-&gt;video_dev-&gt;minor == minor) {</div><div class='hunk'>@@ -748,16 +745,20 @@ static int video_open(struct inode *inode, struct file *file)</div><div class='ctx'> 			dev   = h;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	if (NULL == dev)</div><div class='add'>+	if (NULL == dev) {</div><div class='add'>+		unlock_kernel();</div><div class='ctx'> 		return -ENODEV;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	dprintk(1, "open minor=%d radio=%d type=%s\n",</div><div class='ctx'> 		minor, radio, v4l2_type_names[type]);</div><div class='ctx'> </div><div class='ctx'> 	/* allocate + initialize per filehandle data */</div><div class='ctx'> 	fh = kzalloc(sizeof(*fh), GFP_KERNEL);</div><div class='del'>-	if (NULL == fh)</div><div class='add'>+	if (NULL == fh) {</div><div class='add'>+		unlock_kernel();</div><div class='ctx'> 		return -ENOMEM;</div><div class='add'>+	}</div><div class='ctx'> 	file-&gt;private_data = fh;</div><div class='ctx'> 	fh-&gt;dev      = dev;</div><div class='ctx'> 	fh-&gt;radio    = radio;</div><div class='hunk'>@@ -775,6 +776,7 @@ static int video_open(struct inode *inode, struct file *file)</div><div class='ctx'> </div><div class='ctx'> 	dprintk(1, "post videobuf_queue_init()\n");</div><div class='ctx'> </div><div class='add'>+	unlock_kernel();</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -884,21 +886,21 @@ static int video_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='ctx'> /* ------------------------------------------------------------------ */</div><div class='ctx'> /* VIDEO CTRL IOCTLS                                                  */</div><div class='ctx'> </div><div class='del'>-int cx23885_get_control(struct cx23885_dev *dev, struct v4l2_control *ctl)</div><div class='add'>+static int cx23885_get_control(struct cx23885_dev *dev,</div><div class='add'>+	struct v4l2_control *ctl)</div><div class='ctx'> {</div><div class='ctx'> 	dprintk(1, "%s() calling cx25840(VIDIOC_G_CTRL)\n", __func__);</div><div class='ctx'> 	cx23885_call_i2c_clients(&amp;dev-&gt;i2c_bus[2], VIDIOC_G_CTRL, ctl);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(cx23885_get_control);</div><div class='ctx'> </div><div class='del'>-int cx23885_set_control(struct cx23885_dev *dev, struct v4l2_control *ctl)</div><div class='add'>+static int cx23885_set_control(struct cx23885_dev *dev,</div><div class='add'>+	struct v4l2_control *ctl)</div><div class='ctx'> {</div><div class='ctx'> 	dprintk(1, "%s() calling cx25840(VIDIOC_S_CTRL)"</div><div class='ctx'> 		" (disabled - no action)\n", __func__);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(cx23885_set_control);</div><div class='ctx'> </div><div class='ctx'> static void init_controls(struct cx23885_dev *dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -1072,29 +1074,29 @@ static int vidioc_reqbufs(struct file *file, void *priv,</div><div class='ctx'> 	struct v4l2_requestbuffers *p)</div><div class='ctx'> {</div><div class='ctx'> 	struct cx23885_fh *fh = priv;</div><div class='del'>-	return (videobuf_reqbufs(get_queue(fh), p));</div><div class='add'>+	return videobuf_reqbufs(get_queue(fh), p);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int vidioc_querybuf(struct file *file, void *priv,</div><div class='ctx'> 	struct v4l2_buffer *p)</div><div class='ctx'> {</div><div class='ctx'> 	struct cx23885_fh *fh = priv;</div><div class='del'>-	return (videobuf_querybuf(get_queue(fh), p));</div><div class='add'>+	return videobuf_querybuf(get_queue(fh), p);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int vidioc_qbuf(struct file *file, void *priv,</div><div class='ctx'> 	struct v4l2_buffer *p)</div><div class='ctx'> {</div><div class='ctx'> 	struct cx23885_fh *fh = priv;</div><div class='del'>-	return (videobuf_qbuf(get_queue(fh), p));</div><div class='add'>+	return videobuf_qbuf(get_queue(fh), p);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int vidioc_dqbuf(struct file *file, void *priv,</div><div class='ctx'> 	struct v4l2_buffer *p)</div><div class='ctx'> {</div><div class='ctx'> 	struct cx23885_fh *fh = priv;</div><div class='del'>-	return (videobuf_dqbuf(get_queue(fh), p,</div><div class='del'>-				file-&gt;f_flags &amp; O_NONBLOCK));</div><div class='add'>+	return videobuf_dqbuf(get_queue(fh), p,</div><div class='add'>+				file-&gt;f_flags &amp; O_NONBLOCK);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int vidioc_streamon(struct file *file, void *priv,</div><div class='hunk'>@@ -1146,7 +1148,7 @@ static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id *tvnorms)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int cx23885_enum_input(struct cx23885_dev *dev, struct v4l2_input *i)</div><div class='add'>+static int cx23885_enum_input(struct cx23885_dev *dev, struct v4l2_input *i)</div><div class='ctx'> {</div><div class='ctx'> 	static const char *iname[] = {</div><div class='ctx'> 		[CX23885_VMUX_COMPOSITE1] = "Composite1",</div><div class='hunk'>@@ -1179,7 +1181,6 @@ int cx23885_enum_input(struct cx23885_dev *dev, struct v4l2_input *i)</div><div class='ctx'> 		i-&gt;std = CX23885_NORMS;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(cx23885_enum_input);</div><div class='ctx'> </div><div class='ctx'> static int vidioc_enum_input(struct file *file, void *priv,</div><div class='ctx'> 				struct v4l2_input *i)</div><div class='hunk'>@@ -1288,7 +1289,7 @@ static int vidioc_g_frequency(struct file *file, void *priv,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int cx23885_set_freq(struct cx23885_dev *dev, struct v4l2_frequency *f)</div><div class='add'>+static int cx23885_set_freq(struct cx23885_dev *dev, struct v4l2_frequency *f)</div><div class='ctx'> {</div><div class='ctx'> 	if (unlikely(UNSET == dev-&gt;tuner_type))</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -1307,7 +1308,6 @@ int cx23885_set_freq(struct cx23885_dev *dev, struct v4l2_frequency *f)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(cx23885_set_freq);</div><div class='ctx'> </div><div class='ctx'> static int vidioc_s_frequency(struct file *file, void *priv,</div><div class='ctx'> 				struct v4l2_frequency *f)</div><div class='head'>diff --git a/drivers/media/video/cx23885/cx23885.h b/drivers/media/video/cx23885/cx23885.h<br/>index e23d97c071e0..1d53f54cd943 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx23885/cx23885.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/cx23885/cx23885.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx23885/cx23885.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx23885/cx23885.h</a></div><div class='hunk'>@@ -37,7 +37,7 @@</div><div class='ctx'> #include &lt;linux/version.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> </div><div class='del'>-#define CX23885_VERSION_CODE KERNEL_VERSION(0,0,1)</div><div class='add'>+#define CX23885_VERSION_CODE KERNEL_VERSION(0, 0, 1)</div><div class='ctx'> </div><div class='ctx'> #define UNSET (-1U)</div><div class='ctx'> </div><div class='hunk'>@@ -64,6 +64,8 @@</div><div class='ctx'> #define CX23885_BOARD_HAUPPAUGE_HVR1700        8</div><div class='ctx'> #define CX23885_BOARD_HAUPPAUGE_HVR1400        9</div><div class='ctx'> #define CX23885_BOARD_DVICO_FUSIONHDTV_7_DUAL_EXP 10</div><div class='add'>+#define CX23885_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL_EXP 11</div><div class='add'>+#define CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H 12</div><div class='ctx'> </div><div class='ctx'> /* Currently unsupported by the driver: PAL/H, NTSC/Kr, SECAM B/G/H/LC */</div><div class='ctx'> #define CX23885_NORMS (\</div><div class='hunk'>@@ -223,7 +225,7 @@ struct cx23885_tsport {</div><div class='ctx'> 	int                        nr;</div><div class='ctx'> 	int                        sram_chno;</div><div class='ctx'> </div><div class='del'>-	struct videobuf_dvb        dvb;</div><div class='add'>+	struct videobuf_dvb_frontends frontends;</div><div class='ctx'> </div><div class='ctx'> 	/* dma queues */</div><div class='ctx'> 	struct cx23885_dmaqueue    mpegq;</div><div class='hunk'>@@ -260,6 +262,9 @@ struct cx23885_tsport {</div><div class='ctx'> 	u32                        src_sel_val;</div><div class='ctx'> 	u32                        vld_misc_val;</div><div class='ctx'> 	u32                        hw_sop_ctrl_val;</div><div class='add'>+</div><div class='add'>+	/* Allow a single tsport to have multiple frontends */</div><div class='add'>+	u32                        num_frontends;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct cx23885_dev {</div><div class='hunk'>@@ -365,14 +370,14 @@ struct sram_channel {</div><div class='ctx'> /* ----------------------------------------------------------- */</div><div class='ctx'> </div><div class='ctx'> #define cx_read(reg)             readl(dev-&gt;lmmio + ((reg)&gt;&gt;2))</div><div class='del'>-#define cx_write(reg,value)      writel((value), dev-&gt;lmmio + ((reg)&gt;&gt;2))</div><div class='add'>+#define cx_write(reg, value)     writel((value), dev-&gt;lmmio + ((reg)&gt;&gt;2))</div><div class='ctx'> </div><div class='del'>-#define cx_andor(reg,mask,value) \</div><div class='add'>+#define cx_andor(reg, mask, value) \</div><div class='ctx'>   writel((readl(dev-&gt;lmmio+((reg)&gt;&gt;2)) &amp; ~(mask)) |\</div><div class='ctx'>   ((value) &amp; (mask)), dev-&gt;lmmio+((reg)&gt;&gt;2))</div><div class='ctx'> </div><div class='del'>-#define cx_set(reg,bit)          cx_andor((reg),(bit),(bit))</div><div class='del'>-#define cx_clear(reg,bit)        cx_andor((reg),(bit),0)</div><div class='add'>+#define cx_set(reg, bit)          cx_andor((reg), (bit), (bit))</div><div class='add'>+#define cx_clear(reg, bit)        cx_andor((reg), (bit), 0)</div><div class='ctx'> </div><div class='ctx'> /* ----------------------------------------------------------- */</div><div class='ctx'> /* cx23885-core.c                                              */</div><div class='hunk'>@@ -409,7 +414,8 @@ extern const unsigned int cx23885_bcount;</div><div class='ctx'> extern struct cx23885_subid cx23885_subids[];</div><div class='ctx'> extern const unsigned int cx23885_idcount;</div><div class='ctx'> </div><div class='del'>-extern int cx23885_tuner_callback(void *priv, int command, int arg);</div><div class='add'>+extern int cx23885_tuner_callback(void *priv, int component,</div><div class='add'>+	int command, int arg);</div><div class='ctx'> extern void cx23885_card_list(struct cx23885_dev *dev);</div><div class='ctx'> extern int  cx23885_ir_init(struct cx23885_dev *dev);</div><div class='ctx'> extern void cx23885_gpio_setup(struct cx23885_dev *dev);</div><div class='hunk'>@@ -477,11 +483,3 @@ static inline unsigned int norm_swidth(v4l2_std_id norm)</div><div class='ctx'> {</div><div class='ctx'> 	return (norm &amp; (V4L2_STD_MN &amp; ~V4L2_STD_PAL_Nc)) ? 754 : 922;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Local variables:</div><div class='del'>- * c-basic-offset: 8</div><div class='del'>- * End:</div><div class='del'>- * kate: eol "unix"; indent-width 3; remove-trailing-space on; replace-trailing-space-save on; tab-width 8; replace-tabs off; space-indent off; mixed-indent off</div><div class='del'>- */</div><div class='head'>diff --git a/drivers/media/video/cx25840/cx25840-vbi.c b/drivers/media/video/cx25840/cx25840-vbi.c<br/>index 69f2bbdbb929..58e6ef1c28a0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx25840/cx25840-vbi.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/cx25840/cx25840-vbi.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx25840/cx25840-vbi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx25840/cx25840-vbi.c</a></div><div class='hunk'>@@ -141,10 +141,11 @@ int cx25840_vbi(struct i2c_client *client, unsigned int cmd, void *arg)</div><div class='ctx'> 		u8 lcr[24];</div><div class='ctx'> </div><div class='ctx'> 		fmt = arg;</div><div class='del'>-		if (fmt-&gt;type != V4L2_BUF_TYPE_SLICED_VBI_CAPTURE)</div><div class='add'>+		if (fmt-&gt;type != V4L2_BUF_TYPE_SLICED_VBI_CAPTURE &amp;&amp;</div><div class='add'>+		    fmt-&gt;type != V4L2_BUF_TYPE_VBI_CAPTURE)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		svbi = &amp;fmt-&gt;fmt.sliced;</div><div class='del'>-		if (svbi-&gt;service_set == 0) {</div><div class='add'>+		if (fmt-&gt;type == V4L2_BUF_TYPE_VBI_CAPTURE) {</div><div class='ctx'> 			/* raw VBI */</div><div class='ctx'> 			memset(svbi, 0, sizeof(*svbi));</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/cx88/Kconfig b/drivers/media/video/cx88/Kconfig<br/>index 9dd7bdf659b9..0b9e5fac6239 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx88/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/cx88/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx88/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx88/Kconfig</a></div><div class='hunk'>@@ -58,6 +58,10 @@ config VIDEO_CX88_DVB</div><div class='ctx'> 	select DVB_ISL6421 if !DVB_FE_CUSTOMISE</div><div class='ctx'> 	select MEDIA_TUNER_SIMPLE if !DVB_FE_CUSTOMISE</div><div class='ctx'> 	select DVB_S5H1411 if !DVB_FE_CUSTOMISE</div><div class='add'>+	select DVB_CX24116 if !DVB_FE_CUSTOMISE</div><div class='add'>+	select DVB_STV0299 if !DVB_FE_CUSTOMISE</div><div class='add'>+	select DVB_STV0288 if !DVB_FE_CUSTOMISE</div><div class='add'>+	select DVB_STB6000 if !DVB_FE_CUSTOMISE</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  This adds support for DVB/ATSC cards based on the</div><div class='ctx'> 	  Conexant 2388x chip.</div><div class='head'>diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c<br/>index 9a1374a38ec7..e71369754305 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx88/cx88-blackbird.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/cx88/cx88-blackbird.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx88/cx88-blackbird.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx88/cx88-blackbird.c</a></div><div class='hunk'>@@ -1057,12 +1057,15 @@ static int mpeg_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	struct cx8802_driver *drv = NULL;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='add'>+	lock_kernel();</div><div class='ctx'> 	dev = cx8802_get_device(inode);</div><div class='ctx'> </div><div class='ctx'> 	dprintk( 1, "%s\n", __func__);</div><div class='ctx'> </div><div class='del'>-	if (dev == NULL)</div><div class='add'>+	if (dev == NULL) {</div><div class='add'>+		unlock_kernel();</div><div class='ctx'> 		return -ENODEV;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Make sure we can acquire the hardware */</div><div class='ctx'> 	drv = cx8802_get_driver(dev, CX88_MPEG_BLACKBIRD);</div><div class='hunk'>@@ -1070,6 +1073,7 @@ static int mpeg_open(struct inode *inode, struct file *file)</div><div class='ctx'> 		err = drv-&gt;request_acquire(drv);</div><div class='ctx'> 		if(err != 0) {</div><div class='ctx'> 			dprintk(1,"%s: Unable to acquire hardware, %d\n", __func__, err);</div><div class='add'>+			unlock_kernel();</div><div class='ctx'> 			return err;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1077,6 +1081,7 @@ static int mpeg_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	if (blackbird_initialize_codec(dev) &lt; 0) {</div><div class='ctx'> 		if (drv)</div><div class='ctx'> 			drv-&gt;request_release(drv);</div><div class='add'>+		unlock_kernel();</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	dprintk(1,"open minor=%d\n",minor);</div><div class='hunk'>@@ -1086,6 +1091,7 @@ static int mpeg_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	if (NULL == fh) {</div><div class='ctx'> 		if (drv)</div><div class='ctx'> 			drv-&gt;request_release(drv);</div><div class='add'>+		unlock_kernel();</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> 	file-&gt;private_data = fh;</div><div class='hunk'>@@ -1101,6 +1107,7 @@ static int mpeg_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	/* FIXME: locking against other video device */</div><div class='ctx'> 	cx88_set_scale(dev-&gt;core, dev-&gt;width, dev-&gt;height,</div><div class='ctx'> 			fh-&gt;mpegq.field);</div><div class='add'>+	unlock_kernel();</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c<br/>index de199a206a15..fbc224f46e0e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx88/cx88-cards.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/cx88/cx88-cards.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx88/cx88-cards.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx88/cx88-cards.c</a></div><div class='hunk'>@@ -1270,27 +1270,40 @@ static const struct cx88_board cx88_boards[] = {</div><div class='ctx'> 		.mpeg           = CX88_MPEG_DVB,</div><div class='ctx'> 	},</div><div class='ctx'> 	[CX88_BOARD_HAUPPAUGE_HVR3000] = {</div><div class='del'>-		/* FIXME: Add dvb &amp; radio support */</div><div class='ctx'> 		.name           = "Hauppauge WinTV-HVR3000 TriMode Analog/DVB-S/DVB-T",</div><div class='ctx'> 		.tuner_type     = TUNER_PHILIPS_FMD1216ME_MK3,</div><div class='ctx'> 		.radio_type     = UNSET,</div><div class='ctx'> 		.tuner_addr     = ADDR_UNSET,</div><div class='ctx'> 		.radio_addr     = ADDR_UNSET,</div><div class='ctx'> 		.tda9887_conf   = TDA9887_PRESENT,</div><div class='add'>+		.audio_chip     = V4L2_IDENT_WM8775,</div><div class='ctx'> 		.input          = {{</div><div class='ctx'> 			.type   = CX88_VMUX_TELEVISION,</div><div class='ctx'> 			.vmux   = 0,</div><div class='ctx'> 			.gpio0  = 0x84bf,</div><div class='add'>+			/* 1: TV Audio / FM Mono */</div><div class='add'>+			.audioroute = 1,</div><div class='ctx'> 		},{</div><div class='ctx'> 			.type   = CX88_VMUX_COMPOSITE1,</div><div class='ctx'> 			.vmux   = 1,</div><div class='ctx'> 			.gpio0  = 0x84bf,</div><div class='add'>+			/* 2: Line-In */</div><div class='add'>+			.audioroute = 2,</div><div class='ctx'> 		},{</div><div class='ctx'> 			.type   = CX88_VMUX_SVIDEO,</div><div class='ctx'> 			.vmux   = 2,</div><div class='ctx'> 			.gpio0  = 0x84bf,</div><div class='add'>+			/* 2: Line-In */</div><div class='add'>+			.audioroute = 2,</div><div class='ctx'> 		}},</div><div class='add'>+		.radio = {</div><div class='add'>+			.type   = CX88_RADIO,</div><div class='add'>+			.gpio0	= 0x84bf,</div><div class='add'>+			/* 4: FM Stereo (untested) */</div><div class='add'>+			.audioroute = 8,</div><div class='add'>+		},</div><div class='ctx'> 		.mpeg           = CX88_MPEG_DVB,</div><div class='add'>+		.num_frontends	= 2,</div><div class='ctx'> 	},</div><div class='ctx'> 	[CX88_BOARD_NORWOOD_MICRO] = {</div><div class='ctx'> 		.name           = "Norwood Micro TV Tuner",</div><div class='hunk'>@@ -1349,27 +1362,34 @@ static const struct cx88_board cx88_boards[] = {</div><div class='ctx'> 		.radio_addr	= ADDR_UNSET,</div><div class='ctx'> 		.tda9887_conf   = TDA9887_PRESENT,</div><div class='ctx'> 		.audio_chip     = V4L2_IDENT_WM8775,</div><div class='add'>+		/*</div><div class='add'>+		 * gpio0 as reported by Mike Crash &lt;mike AT mikecrash.com&gt;</div><div class='add'>+		 */</div><div class='ctx'> 		.input		= {{</div><div class='ctx'> 			.type   = CX88_VMUX_TELEVISION,</div><div class='ctx'> 			.vmux   = 0,</div><div class='del'>-			.gpio0	= 0xe780,</div><div class='add'>+			.gpio0	= 0xef88,</div><div class='add'>+			/* 1: TV Audio / FM Mono */</div><div class='ctx'> 			.audioroute = 1,</div><div class='ctx'> 		},{</div><div class='ctx'> 			.type	= CX88_VMUX_COMPOSITE1,</div><div class='ctx'> 			.vmux	= 1,</div><div class='del'>-			.gpio0	= 0xe780,</div><div class='add'>+			.gpio0	= 0xef88,</div><div class='add'>+			/* 2: Line-In */</div><div class='ctx'> 			.audioroute = 2,</div><div class='ctx'> 		},{</div><div class='ctx'> 			.type	= CX88_VMUX_SVIDEO,</div><div class='ctx'> 			.vmux	= 2,</div><div class='del'>-			.gpio0	= 0xe780,</div><div class='add'>+			.gpio0	= 0xef88,</div><div class='add'>+			/* 2: Line-In */</div><div class='ctx'> 			.audioroute = 2,</div><div class='ctx'> 		}},</div><div class='del'>-		/* fixme: Add radio support */</div><div class='ctx'> 		.mpeg           = CX88_MPEG_DVB | CX88_MPEG_BLACKBIRD,</div><div class='ctx'> 		.radio = {</div><div class='ctx'> 			.type   = CX88_RADIO,</div><div class='del'>-			.gpio0	= 0xe780,</div><div class='add'>+			.gpio0	= 0xef88,</div><div class='add'>+			/* 4: FM Stereo (untested) */</div><div class='add'>+			.audioroute = 8,</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='ctx'> 	[CX88_BOARD_ADSTECH_PTV_390] = {</div><div class='hunk'>@@ -1446,15 +1466,26 @@ static const struct cx88_board cx88_boards[] = {</div><div class='ctx'> 		.name           = "Pinnacle Hybrid PCTV",</div><div class='ctx'> 		.tuner_type     = TUNER_XC2028,</div><div class='ctx'> 		.tuner_addr     = 0x61,</div><div class='add'>+		.radio_type     = TUNER_XC2028,</div><div class='add'>+		.radio_addr     = 0x61,</div><div class='ctx'> 		.input          = { {</div><div class='ctx'> 			.type   = CX88_VMUX_TELEVISION,</div><div class='ctx'> 			.vmux   = 0,</div><div class='add'>+			.gpio0  = 0x004ff,</div><div class='add'>+			.gpio1  = 0x010ff,</div><div class='add'>+			.gpio2  = 0x00001,</div><div class='ctx'> 		}, {</div><div class='ctx'> 			.type   = CX88_VMUX_COMPOSITE1,</div><div class='ctx'> 			.vmux   = 1,</div><div class='add'>+			.gpio0  = 0x004fb,</div><div class='add'>+			.gpio1  = 0x010ef,</div><div class='add'>+			.audioroute = 1,</div><div class='ctx'> 		}, {</div><div class='ctx'> 			.type   = CX88_VMUX_SVIDEO,</div><div class='ctx'> 			.vmux   = 2,</div><div class='add'>+			.gpio0  = 0x004fb,</div><div class='add'>+			.gpio1  = 0x010ef,</div><div class='add'>+			.audioroute = 1,</div><div class='ctx'> 		} },</div><div class='ctx'> 		.radio = {</div><div class='ctx'> 			.type   = CX88_RADIO,</div><div class='hunk'>@@ -1462,6 +1493,7 @@ static const struct cx88_board cx88_boards[] = {</div><div class='ctx'> 			.gpio1  = 0x010ff,</div><div class='ctx'> 			.gpio2  = 0x0ff,</div><div class='ctx'> 		},</div><div class='add'>+		.mpeg           = CX88_MPEG_DVB,</div><div class='ctx'> 	},</div><div class='ctx'> 	[CX88_BOARD_WINFAST_TV2000_XP_GLOBAL] = {</div><div class='ctx'> 		.name           = "Winfast TV2000 XP Global",</div><div class='hunk'>@@ -1566,9 +1598,9 @@ static const struct cx88_board cx88_boards[] = {</div><div class='ctx'> 	},</div><div class='ctx'> 	[CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PRO] = {</div><div class='ctx'> 		.name           = "DViCO FusionHDTV DVB-T PRO",</div><div class='del'>-		.tuner_type     = TUNER_ABSENT, /* XXX: Has XC3028 */</div><div class='add'>+		.tuner_type     = TUNER_XC2028,</div><div class='add'>+		.tuner_addr     = 0x61,</div><div class='ctx'> 		.radio_type     = UNSET,</div><div class='del'>-		.tuner_addr     = ADDR_UNSET,</div><div class='ctx'> 		.radio_addr     = ADDR_UNSET,</div><div class='ctx'> 		.input          = { {</div><div class='ctx'> 			.type   = CX88_VMUX_COMPOSITE1,</div><div class='hunk'>@@ -1625,6 +1657,36 @@ static const struct cx88_board cx88_boards[] = {</div><div class='ctx'> 			.gpio2 = 0x0cfb,</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='add'>+	[CX88_BOARD_PROLINK_PV_GLOBAL_XTREME] = {</div><div class='add'>+		.name           = "Prolink Pixelview Global Extreme",</div><div class='add'>+		.tuner_type     = TUNER_XC2028,</div><div class='add'>+		.tuner_addr     = 0x61,</div><div class='add'>+		.input          = { {</div><div class='add'>+			.type   = CX88_VMUX_TELEVISION,</div><div class='add'>+			.vmux   = 0,</div><div class='add'>+			.gpio0 = 0x04fb,</div><div class='add'>+			.gpio1 = 0x04080,</div><div class='add'>+			.gpio2 = 0x0cf7,</div><div class='add'>+		}, {</div><div class='add'>+			.type   = CX88_VMUX_COMPOSITE1,</div><div class='add'>+			.vmux   = 1,</div><div class='add'>+			.gpio0 = 0x04fb,</div><div class='add'>+			.gpio1 = 0x04080,</div><div class='add'>+			.gpio2 = 0x0cfb,</div><div class='add'>+		}, {</div><div class='add'>+			.type   = CX88_VMUX_SVIDEO,</div><div class='add'>+			.vmux   = 2,</div><div class='add'>+			.gpio0 = 0x04fb,</div><div class='add'>+			.gpio1 = 0x04080,</div><div class='add'>+			.gpio2 = 0x0cfb,</div><div class='add'>+		} },</div><div class='add'>+		.radio = {</div><div class='add'>+			.type   = CX88_RADIO,</div><div class='add'>+			.gpio0 = 0x04ff,</div><div class='add'>+			.gpio1 = 0x04080,</div><div class='add'>+			.gpio2 = 0x0cf7,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='ctx'> 	/* Both radio, analog and ATSC work with this board.</div><div class='ctx'> 	   However, for analog to work, s5h1409 gate should be open,</div><div class='ctx'> 	   otherwise, tuner-xc3028 won't be detected.</div><div class='hunk'>@@ -1664,6 +1726,151 @@ static const struct cx88_board cx88_boards[] = {</div><div class='ctx'> 		},</div><div class='ctx'> 		.mpeg           = CX88_MPEG_DVB,</div><div class='ctx'> 	},</div><div class='add'>+	[CX88_BOARD_HAUPPAUGE_HVR4000] = {</div><div class='add'>+		.name           = "Hauppauge WinTV-HVR4000 DVB-S/S2/T/Hybrid",</div><div class='add'>+		.tuner_type     = TUNER_PHILIPS_FMD1216ME_MK3,</div><div class='add'>+		.radio_type     = UNSET,</div><div class='add'>+		.tuner_addr     = ADDR_UNSET,</div><div class='add'>+		.radio_addr     = ADDR_UNSET,</div><div class='add'>+		.tda9887_conf   = TDA9887_PRESENT,</div><div class='add'>+		.audio_chip     = V4L2_IDENT_WM8775,</div><div class='add'>+		/*</div><div class='add'>+		 * GPIO0 (WINTV2000)</div><div class='add'>+		 *</div><div class='add'>+		 * Analogue     SAT     DVB-T</div><div class='add'>+		 * Antenna      0xc4bf  0xc4bb</div><div class='add'>+		 * Composite    0xc4bf  0xc4bb</div><div class='add'>+		 * S-Video      0xc4bf  0xc4bb</div><div class='add'>+		 * Composite1   0xc4ff  0xc4fb</div><div class='add'>+		 * S-Video1     0xc4ff  0xc4fb</div><div class='add'>+		 *</div><div class='add'>+		 * BIT  VALUE   FUNCTION GP{x}_IO</div><div class='add'>+		 * 0    1       I:?</div><div class='add'>+		 * 1    1       I:?</div><div class='add'>+		 * 2    1       O:MPEG PORT 0=DVB-T 1=DVB-S</div><div class='add'>+		 * 3    1       I:?</div><div class='add'>+		 * 4    1       I:?</div><div class='add'>+		 * 5    1       I:?</div><div class='add'>+		 * 6    0       O:INPUT SELECTOR 0=INTERNAL 1=EXPANSION</div><div class='add'>+		 * 7    1       O:DVB-T DEMOD RESET LOW</div><div class='add'>+		 *</div><div class='add'>+		 * BIT  VALUE   FUNCTION GP{x}_OE</div><div class='add'>+		 * 8    0       I</div><div class='add'>+		 * 9    0       I</div><div class='add'>+		 * a    1       O</div><div class='add'>+		 * b    0       I</div><div class='add'>+		 * c    0       I</div><div class='add'>+		 * d    0       I</div><div class='add'>+		 * e    1       O</div><div class='add'>+		 * f    1       O</div><div class='add'>+		 *</div><div class='add'>+		 * WM8775 ADC</div><div class='add'>+		 *</div><div class='add'>+		 * 1: TV Audio / FM Mono</div><div class='add'>+		 * 2: Line-In</div><div class='add'>+		 * 3: Line-In Expansion</div><div class='add'>+		 * 4: FM Stereo</div><div class='add'>+		 */</div><div class='add'>+		.input          = {{</div><div class='add'>+			.type   = CX88_VMUX_TELEVISION,</div><div class='add'>+			.vmux   = 0,</div><div class='add'>+			.gpio0  = 0xc4bf,</div><div class='add'>+			/* 1: TV Audio / FM Mono */</div><div class='add'>+			.audioroute = 1,</div><div class='add'>+		}, {</div><div class='add'>+			.type   = CX88_VMUX_COMPOSITE1,</div><div class='add'>+			.vmux   = 1,</div><div class='add'>+			.gpio0  = 0xc4bf,</div><div class='add'>+			/* 2: Line-In */</div><div class='add'>+			.audioroute = 2,</div><div class='add'>+		}, {</div><div class='add'>+			.type   = CX88_VMUX_SVIDEO,</div><div class='add'>+			.vmux   = 2,</div><div class='add'>+			.gpio0  = 0xc4bf,</div><div class='add'>+			/* 2: Line-In */</div><div class='add'>+			.audioroute = 2,</div><div class='add'>+		} },</div><div class='add'>+		.radio = {</div><div class='add'>+			.type   = CX88_RADIO,</div><div class='add'>+			.gpio0	= 0xc4bf,</div><div class='add'>+			/* 4: FM Stereo */</div><div class='add'>+			.audioroute = 8,</div><div class='add'>+		},</div><div class='add'>+		.mpeg           = CX88_MPEG_DVB,</div><div class='add'>+		.num_frontends	= 2,</div><div class='add'>+	},</div><div class='add'>+	[CX88_BOARD_HAUPPAUGE_HVR4000LITE] = {</div><div class='add'>+		.name           = "Hauppauge WinTV-HVR4000(Lite) DVB-S/S2",</div><div class='add'>+		.tuner_type     = UNSET,</div><div class='add'>+		.radio_type     = UNSET,</div><div class='add'>+		.tuner_addr     = ADDR_UNSET,</div><div class='add'>+		.radio_addr     = ADDR_UNSET,</div><div class='add'>+		.input          = {{</div><div class='add'>+			.type   = CX88_VMUX_DVB,</div><div class='add'>+			.vmux   = 0,</div><div class='add'>+		} },</div><div class='add'>+		.mpeg           = CX88_MPEG_DVB,</div><div class='add'>+	},</div><div class='add'>+	[CX88_BOARD_TEVII_S420] = {</div><div class='add'>+		.name           = "TeVii S420 DVB-S",</div><div class='add'>+		.tuner_type     = UNSET,</div><div class='add'>+		.radio_type     = UNSET,</div><div class='add'>+		.tuner_addr     = ADDR_UNSET,</div><div class='add'>+		.radio_addr     = ADDR_UNSET,</div><div class='add'>+		.input          = {{</div><div class='add'>+			.type   = CX88_VMUX_DVB,</div><div class='add'>+			.vmux   = 0,</div><div class='add'>+		} },</div><div class='add'>+		.mpeg           = CX88_MPEG_DVB,</div><div class='add'>+	},</div><div class='add'>+	[CX88_BOARD_TEVII_S460] = {</div><div class='add'>+		.name           = "TeVii S460 DVB-S/S2",</div><div class='add'>+		.tuner_type     = UNSET,</div><div class='add'>+		.radio_type     = UNSET,</div><div class='add'>+		.tuner_addr     = ADDR_UNSET,</div><div class='add'>+		.radio_addr     = ADDR_UNSET,</div><div class='add'>+		.input          = {{</div><div class='add'>+			.type   = CX88_VMUX_DVB,</div><div class='add'>+			.vmux   = 0,</div><div class='add'>+		} },</div><div class='add'>+		.mpeg           = CX88_MPEG_DVB,</div><div class='add'>+	},</div><div class='add'>+	[CX88_BOARD_OMICOM_SS4_PCI] = {</div><div class='add'>+		.name           = "Omicom SS4 DVB-S/S2 PCI",</div><div class='add'>+		.tuner_type     = UNSET,</div><div class='add'>+		.radio_type     = UNSET,</div><div class='add'>+		.tuner_addr     = ADDR_UNSET,</div><div class='add'>+		.radio_addr     = ADDR_UNSET,</div><div class='add'>+		.input          = {{</div><div class='add'>+			.type   = CX88_VMUX_DVB,</div><div class='add'>+			.vmux   = 0,</div><div class='add'>+		} },</div><div class='add'>+		.mpeg           = CX88_MPEG_DVB,</div><div class='add'>+	},</div><div class='add'>+	[CX88_BOARD_TBS_8920] = {</div><div class='add'>+		.name           = "TBS 8920 DVB-S/S2",</div><div class='add'>+		.tuner_type     = TUNER_ABSENT,</div><div class='add'>+		.radio_type     = UNSET,</div><div class='add'>+		.tuner_addr     = ADDR_UNSET,</div><div class='add'>+		.radio_addr     = ADDR_UNSET,</div><div class='add'>+		.input          = {{</div><div class='add'>+			.type   = CX88_VMUX_DVB,</div><div class='add'>+			.vmux   = 1,</div><div class='add'>+		} },</div><div class='add'>+		.mpeg           = CX88_MPEG_DVB,</div><div class='add'>+	},</div><div class='add'>+	[CX88_BOARD_PROF_7300] = {</div><div class='add'>+		.name           = "PROF 7300 DVB-S/S2",</div><div class='add'>+		.tuner_type     = UNSET,</div><div class='add'>+		.radio_type     = UNSET,</div><div class='add'>+		.tuner_addr     = ADDR_UNSET,</div><div class='add'>+		.radio_addr     = ADDR_UNSET,</div><div class='add'>+		.input          = {{</div><div class='add'>+			.type   = CX88_VMUX_DVB,</div><div class='add'>+			.vmux   = 0,</div><div class='add'>+		} },</div><div class='add'>+		.mpeg           = CX88_MPEG_DVB,</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* ------------------------------------------------------------------ */</div><div class='hunk'>@@ -2010,9 +2217,53 @@ static const struct cx88_subid cx88_subids[] = {</div><div class='ctx'> 		.subdevice = 0x4935,</div><div class='ctx'> 		.card      = CX88_BOARD_PROLINK_PV_8000GT,</div><div class='ctx'> 	}, {</div><div class='add'>+		.subvendor = 0x1554,</div><div class='add'>+		.subdevice = 0x4976,</div><div class='add'>+		.card      = CX88_BOARD_PROLINK_PV_GLOBAL_XTREME,</div><div class='add'>+	}, {</div><div class='ctx'> 		.subvendor = 0x17de,</div><div class='ctx'> 		.subdevice = 0x08c1,</div><div class='ctx'> 		.card      = CX88_BOARD_KWORLD_ATSC_120,</div><div class='add'>+	}, {</div><div class='add'>+		.subvendor = 0x0070,</div><div class='add'>+		.subdevice = 0x6900,</div><div class='add'>+		.card      = CX88_BOARD_HAUPPAUGE_HVR4000,</div><div class='add'>+	}, {</div><div class='add'>+		.subvendor = 0x0070,</div><div class='add'>+		.subdevice = 0x6904,</div><div class='add'>+		.card      = CX88_BOARD_HAUPPAUGE_HVR4000,</div><div class='add'>+	}, {</div><div class='add'>+		.subvendor = 0x0070,</div><div class='add'>+		.subdevice = 0x6902,</div><div class='add'>+		.card      = CX88_BOARD_HAUPPAUGE_HVR4000,</div><div class='add'>+	}, {</div><div class='add'>+		.subvendor = 0x0070,</div><div class='add'>+		.subdevice = 0x6905,</div><div class='add'>+		.card      = CX88_BOARD_HAUPPAUGE_HVR4000LITE,</div><div class='add'>+	}, {</div><div class='add'>+		.subvendor = 0x0070,</div><div class='add'>+		.subdevice = 0x6906,</div><div class='add'>+		.card      = CX88_BOARD_HAUPPAUGE_HVR4000LITE,</div><div class='add'>+	}, {</div><div class='add'>+		.subvendor = 0xd420,</div><div class='add'>+		.subdevice = 0x9022,</div><div class='add'>+		.card      = CX88_BOARD_TEVII_S420,</div><div class='add'>+	}, {</div><div class='add'>+		.subvendor = 0xd460,</div><div class='add'>+		.subdevice = 0x9022,</div><div class='add'>+		.card      = CX88_BOARD_TEVII_S460,</div><div class='add'>+	}, {</div><div class='add'>+		.subvendor = 0xA044,</div><div class='add'>+		.subdevice = 0x2011,</div><div class='add'>+		.card      = CX88_BOARD_OMICOM_SS4_PCI,</div><div class='add'>+	}, {</div><div class='add'>+		.subvendor = 0x8920,</div><div class='add'>+		.subdevice = 0x8888,</div><div class='add'>+		.card      = CX88_BOARD_TBS_8920,</div><div class='add'>+	}, {</div><div class='add'>+		.subvendor = 0xB033,</div><div class='add'>+		.subdevice = 0x3033,</div><div class='add'>+		.card      = CX88_BOARD_PROF_7300,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2065,6 +2316,13 @@ static void hauppauge_eeprom(struct cx88_core *core, u8 *eeprom_data)</div><div class='ctx'> 	case 14669: /* WinTV-HVR3000 (OEM, no IR, no b/panel video - Low profile) */</div><div class='ctx'> 	case 28552: /* WinTV-PVR 'Roslyn' (No IR) */</div><div class='ctx'> 	case 34519: /* WinTV-PCI-FM */</div><div class='add'>+	case 69009:</div><div class='add'>+		/* WinTV-HVR4000 (DVBS/S2/T, Video and IR, back panel inputs) */</div><div class='add'>+	case 69100: /* WinTV-HVR4000LITE (DVBS/S2, IR) */</div><div class='add'>+	case 69500: /* WinTV-HVR4000LITE (DVBS/S2, No IR) */</div><div class='add'>+	case 69559:</div><div class='add'>+		/* WinTV-HVR4000 (DVBS/S2/T, Video no IR, back panel inputs) */</div><div class='add'>+	case 69569: /* WinTV-HVR4000 (DVBS/S2/T, Video no IR) */</div><div class='ctx'> 	case 90002: /* Nova-T-PCI (9002) */</div><div class='ctx'> 	case 92001: /* Nova-S-Plus (Video and IR) */</div><div class='ctx'> 	case 92002: /* Nova-S-Plus (Video and IR) */</div><div class='hunk'>@@ -2149,9 +2407,21 @@ static int cx88_dvico_xc2028_callback(struct cx88_core *core,</div><div class='ctx'> {</div><div class='ctx'> 	switch (command) {</div><div class='ctx'> 	case XC2028_TUNER_RESET:</div><div class='del'>-		cx_write(MO_GP0_IO, 0x101000);</div><div class='del'>-		mdelay(5);</div><div class='del'>-		cx_set(MO_GP0_IO, 0x101010);</div><div class='add'>+		switch (core-&gt;boardnr) {</div><div class='add'>+		case CX88_BOARD_DVICO_FUSIONHDTV_5_PCI_NANO:</div><div class='add'>+			/* GPIO-4 xc3028 tuner */</div><div class='add'>+</div><div class='add'>+			cx_set(MO_GP0_IO, 0x00001000);</div><div class='add'>+			cx_clear(MO_GP0_IO, 0x00000010);</div><div class='add'>+			msleep(100);</div><div class='add'>+			cx_set(MO_GP0_IO, 0x00000010);</div><div class='add'>+			msleep(100);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			cx_write(MO_GP0_IO, 0x101000);</div><div class='add'>+			mdelay(5);</div><div class='add'>+			cx_set(MO_GP0_IO, 0x101010);</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -2258,8 +2528,10 @@ static int cx88_xc2028_tuner_callback(struct cx88_core *core,</div><div class='ctx'> 		return cx88_xc3028_geniatech_tuner_callback(core,</div><div class='ctx'> 							command, arg);</div><div class='ctx'> 	case CX88_BOARD_PROLINK_PV_8000GT:</div><div class='add'>+	case CX88_BOARD_PROLINK_PV_GLOBAL_XTREME:</div><div class='ctx'> 		return cx88_pv_8000gt_callback(core, command, arg);</div><div class='ctx'> 	case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PRO:</div><div class='add'>+	case CX88_BOARD_DVICO_FUSIONHDTV_5_PCI_NANO:</div><div class='ctx'> 		return cx88_dvico_xc2028_callback(core, command, arg);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2327,7 +2599,7 @@ static int cx88_xc5000_tuner_callback(struct cx88_core *core,</div><div class='ctx'> 	return 0; /* Should never be here */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int cx88_tuner_callback(void *priv, int command, int arg)</div><div class='add'>+int cx88_tuner_callback(void *priv, int component, int command, int arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct i2c_algo_bit_data *i2c_algo = priv;</div><div class='ctx'> 	struct cx88_core *core;</div><div class='hunk'>@@ -2344,6 +2616,9 @@ int cx88_tuner_callback(void *priv, int command, int arg)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (component != DVB_FRONTEND_COMPONENT_TUNER)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	switch (core-&gt;board.tuner_type) {</div><div class='ctx'> 		case TUNER_XC2028:</div><div class='ctx'> 			info_printk(core, "Calling XC2028/3028 callback\n");</div><div class='hunk'>@@ -2392,16 +2667,22 @@ static void cx88_card_setup_pre_i2c(struct cx88_core *core)</div><div class='ctx'> {</div><div class='ctx'> 	switch (core-&gt;boardnr) {</div><div class='ctx'> 	case CX88_BOARD_HAUPPAUGE_HVR1300:</div><div class='del'>-		/* Bring the 702 demod up before i2c scanning/attach or devices are hidden */</div><div class='del'>-		/* We leave here with the 702 on the bus */</div><div class='del'>-		cx_write(MO_GP0_IO, 0x0000e780);</div><div class='add'>+		/*</div><div class='add'>+		 * Bring the 702 demod up before i2c scanning/attach or devices are hidden</div><div class='add'>+		 * We leave here with the 702 on the bus</div><div class='add'>+		 *</div><div class='add'>+		 * "reset the IR receiver on GPIO[3]"</div><div class='add'>+		 * Reported by Mike Crash &lt;mike AT mikecrash.com&gt;</div><div class='add'>+		 */</div><div class='add'>+		cx_write(MO_GP0_IO, 0x0000ef88);</div><div class='ctx'> 		udelay(1000);</div><div class='del'>-		cx_clear(MO_GP0_IO, 0x00000080);</div><div class='add'>+		cx_clear(MO_GP0_IO, 0x00000088);</div><div class='ctx'> 		udelay(50);</div><div class='del'>-		cx_set(MO_GP0_IO, 0x00000080); /* 702 out of reset */</div><div class='add'>+		cx_set(MO_GP0_IO, 0x00000088); /* 702 out of reset */</div><div class='ctx'> 		udelay(1000);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='add'>+	case CX88_BOARD_PROLINK_PV_GLOBAL_XTREME:</div><div class='ctx'> 	case CX88_BOARD_PROLINK_PV_8000GT:</div><div class='ctx'> 		cx_write(MO_GP2_IO, 0xcf7);</div><div class='ctx'> 		mdelay(50);</div><div class='hunk'>@@ -2411,10 +2692,21 @@ static void cx88_card_setup_pre_i2c(struct cx88_core *core)</div><div class='ctx'> 		msleep(10);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	 case CX88_BOARD_DVICO_FUSIONHDTV_7_GOLD:</div><div class='add'>+	case CX88_BOARD_DVICO_FUSIONHDTV_7_GOLD:</div><div class='ctx'> 		/* Enable the xc5000 tuner */</div><div class='ctx'> 		cx_set(MO_GP0_IO, 0x00001010);</div><div class='ctx'> 		break;</div><div class='add'>+</div><div class='add'>+	case CX88_BOARD_HAUPPAUGE_HVR3000:</div><div class='add'>+	case CX88_BOARD_HAUPPAUGE_HVR4000:</div><div class='add'>+		/* Init GPIO */</div><div class='add'>+		cx_write(MO_GP0_IO, core-&gt;board.input[0].gpio0);</div><div class='add'>+		udelay(1000);</div><div class='add'>+		cx_clear(MO_GP0_IO, 0x00000080);</div><div class='add'>+		udelay(50);</div><div class='add'>+		cx_set(MO_GP0_IO, 0x00000080); /* 702 out of reset */</div><div class='add'>+		udelay(1000);</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2435,17 +2727,22 @@ void cx88_setup_xc3028(struct cx88_core *core, struct xc2028_ctrl *ctl)</div><div class='ctx'> 			core-&gt;i2c_algo.udelay = 16;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PRO:</div><div class='del'>-		ctl-&gt;scode_table = XC3028_FE_ZARLINK456;</div><div class='add'>+		ctl-&gt;demod = XC3028_FE_ZARLINK456;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CX88_BOARD_KWORLD_ATSC_120:</div><div class='ctx'> 	case CX88_BOARD_DVICO_FUSIONHDTV_5_PCI_NANO:</div><div class='ctx'> 		ctl-&gt;demod = XC3028_FE_OREN538;</div><div class='ctx'> 		break;</div><div class='add'>+	case CX88_BOARD_PROLINK_PV_GLOBAL_XTREME:</div><div class='ctx'> 	case CX88_BOARD_PROLINK_PV_8000GT:</div><div class='ctx'> 		/*</div><div class='del'>-		 * This board uses non-MTS firmware</div><div class='add'>+		 * Those boards uses non-MTS firmware</div><div class='ctx'> 		 */</div><div class='ctx'> 		break;</div><div class='add'>+	case CX88_BOARD_PINNACLE_HYBRID_PCTV:</div><div class='add'>+		ctl-&gt;demod = XC3028_FE_ZARLINK456;</div><div class='add'>+		ctl-&gt;mts = 1;</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		ctl-&gt;demod = XC3028_FE_OREN538;</div><div class='ctx'> 		ctl-&gt;mts = 1;</div><div class='hunk'>@@ -2489,6 +2786,8 @@ static void cx88_card_setup(struct cx88_core *core)</div><div class='ctx'> 	case CX88_BOARD_HAUPPAUGE_HVR1100LP:</div><div class='ctx'> 	case CX88_BOARD_HAUPPAUGE_HVR3000:</div><div class='ctx'> 	case CX88_BOARD_HAUPPAUGE_HVR1300:</div><div class='add'>+	case CX88_BOARD_HAUPPAUGE_HVR4000:</div><div class='add'>+	case CX88_BOARD_HAUPPAUGE_HVR4000LITE:</div><div class='ctx'> 		if (0 == core-&gt;i2c_rc)</div><div class='ctx'> 			hauppauge_eeprom(core, eeprom);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -2570,7 +2869,18 @@ static void cx88_card_setup(struct cx88_core *core)</div><div class='ctx'> 		tea5767_cfg.priv  = &amp;ctl;</div><div class='ctx'> </div><div class='ctx'> 		cx88_call_i2c_clients(core, TUNER_SET_CONFIG, &amp;tea5767_cfg);</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='add'>+	case  CX88_BOARD_TEVII_S420:</div><div class='add'>+	case  CX88_BOARD_TEVII_S460:</div><div class='add'>+	case  CX88_BOARD_OMICOM_SS4_PCI:</div><div class='add'>+	case  CX88_BOARD_TBS_8920:</div><div class='add'>+	case  CX88_BOARD_PROF_7300:</div><div class='add'>+		cx_write(MO_SRST_IO, 0);</div><div class='add'>+		msleep(100);</div><div class='add'>+		cx_write(MO_SRST_IO, 1);</div><div class='add'>+		msleep(100);</div><div class='add'>+		break;</div><div class='ctx'> 	} /*end switch() */</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -2734,10 +3044,14 @@ struct cx88_core *cx88_core_create(struct pci_dev *pci, int nr)</div><div class='ctx'> </div><div class='ctx'> 	memcpy(&amp;core-&gt;board, &amp;cx88_boards[core-&gt;boardnr], sizeof(core-&gt;board));</div><div class='ctx'> </div><div class='del'>-	info_printk(core, "subsystem: %04x:%04x, board: %s [card=%d,%s]\n",</div><div class='add'>+	if (!core-&gt;board.num_frontends)</div><div class='add'>+		core-&gt;board.num_frontends=1;</div><div class='add'>+</div><div class='add'>+	info_printk(core, "subsystem: %04x:%04x, board: %s [card=%d,%s], frontend(s): %d\n",</div><div class='ctx'> 		pci-&gt;subsystem_vendor, pci-&gt;subsystem_device, core-&gt;board.name,</div><div class='ctx'> 		core-&gt;boardnr, card[core-&gt;nr] == core-&gt;boardnr ?</div><div class='del'>-		"insmod option" : "autodetected");</div><div class='add'>+		"insmod option" : "autodetected",</div><div class='add'>+		core-&gt;board.num_frontends);</div><div class='ctx'> </div><div class='ctx'> 	if (tuner[core-&gt;nr] != UNSET)</div><div class='ctx'> 		core-&gt;board.tuner_type = tuner[core-&gt;nr];</div><div class='head'>diff --git a/drivers/media/video/cx88/cx88-core.c b/drivers/media/video/cx88/cx88-core.c<br/>index d656fec59010..60705b08bfe8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx88/cx88-core.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/cx88/cx88-core.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx88/cx88-core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx88/cx88-core.c</a></div><div class='hunk'>@@ -549,7 +549,8 @@ void cx88_wakeup(struct cx88_core *core,</div><div class='ctx'> 		mod_timer(&amp;q-&gt;timeout, jiffies+BUFFER_TIMEOUT);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (bc != 1)</div><div class='del'>-		printk("%s: %d buffers handled (should be 1)\n",__func__,bc);</div><div class='add'>+		dprintk(2, "%s: %d buffers handled (should be 1)\n",</div><div class='add'>+			__func__, bc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void cx88_shutdown(struct cx88_core *core)</div><div class='head'>diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c<br/>index d96173ff1dba..6968ab0181aa 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx88/cx88-dvb.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/cx88/cx88-dvb.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx88/cx88-dvb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx88/cx88-dvb.c</a></div><div class='hunk'>@@ -48,6 +48,11 @@</div><div class='ctx'> #include "tuner-simple.h"</div><div class='ctx'> #include "tda9887.h"</div><div class='ctx'> #include "s5h1411.h"</div><div class='add'>+#include "stv0299.h"</div><div class='add'>+#include "z0194a.h"</div><div class='add'>+#include "stv0288.h"</div><div class='add'>+#include "stb6000.h"</div><div class='add'>+#include "cx24116.h"</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("driver for cx2388x based DVB cards");</div><div class='ctx'> MODULE_AUTHOR("Chris Pascoe &lt;c.pascoe@itee.uq.edu.au&gt;");</div><div class='hunk'>@@ -111,13 +116,23 @@ static int cx88_dvb_bus_ctrl(struct dvb_frontend* fe, int acquire)</div><div class='ctx'> 	struct cx8802_dev *dev= fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	struct cx8802_driver *drv = NULL;</div><div class='ctx'> 	int ret = 0;</div><div class='add'>+	int fe_id;</div><div class='add'>+</div><div class='add'>+	fe_id = videobuf_dvb_find_frontend(&amp;dev-&gt;frontends, fe);</div><div class='add'>+	if (!fe_id) {</div><div class='add'>+		printk(KERN_ERR "%s() No frontend found\n", __func__);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	drv = cx8802_get_driver(dev, CX88_MPEG_DVB);</div><div class='ctx'> 	if (drv) {</div><div class='del'>-		if (acquire)</div><div class='add'>+		if (acquire){</div><div class='add'>+			dev-&gt;frontends.active_fe_id = fe_id;</div><div class='ctx'> 			ret = drv-&gt;request_acquire(drv);</div><div class='del'>-		else</div><div class='add'>+		} else {</div><div class='ctx'> 			ret = drv-&gt;request_release(drv);</div><div class='add'>+			dev-&gt;frontends.active_fe_id = 0;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -375,37 +390,28 @@ static int geniatech_dvbs_set_voltage(struct dvb_frontend *fe,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cx88_pci_nano_callback(void *ptr, int command, int arg)</div><div class='add'>+static int tevii_dvbs_set_voltage(struct dvb_frontend *fe,</div><div class='add'>+				      fe_sec_voltage_t voltage)</div><div class='ctx'> {</div><div class='del'>-	struct cx88_core *core = ptr;</div><div class='del'>-</div><div class='del'>-	switch (command) {</div><div class='del'>-	case XC2028_TUNER_RESET:</div><div class='del'>-		/* Send the tuner in then out of reset */</div><div class='del'>-		dprintk(1, "%s: XC2028_TUNER_RESET %d\n", __func__, arg);</div><div class='del'>-</div><div class='del'>-		switch (core-&gt;boardnr) {</div><div class='del'>-		case CX88_BOARD_DVICO_FUSIONHDTV_5_PCI_NANO:</div><div class='del'>-			/* GPIO-4 xc3028 tuner */</div><div class='del'>-</div><div class='del'>-			cx_set(MO_GP0_IO, 0x00001000);</div><div class='del'>-			cx_clear(MO_GP0_IO, 0x00000010);</div><div class='del'>-			msleep(100);</div><div class='del'>-			cx_set(MO_GP0_IO, 0x00000010);</div><div class='del'>-			msleep(100);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='add'>+	struct cx8802_dev *dev= fe-&gt;dvb-&gt;priv;</div><div class='add'>+	struct cx88_core *core = dev-&gt;core;</div><div class='ctx'> </div><div class='del'>-		break;</div><div class='del'>-	case XC2028_RESET_CLK:</div><div class='del'>-		dprintk(1, "%s: XC2028_RESET_CLK %d\n", __func__, arg);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		dprintk(1, "%s: unknown command %d, arg %d\n", __func__,</div><div class='del'>-			command, arg);</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	switch (voltage) {</div><div class='add'>+		case SEC_VOLTAGE_13:</div><div class='add'>+			printk("LNB Voltage SEC_VOLTAGE_13\n");</div><div class='add'>+			cx_write(MO_GP0_IO, 0x00006040);</div><div class='add'>+			break;</div><div class='add'>+		case SEC_VOLTAGE_18:</div><div class='add'>+			printk("LNB Voltage SEC_VOLTAGE_18\n");</div><div class='add'>+			cx_write(MO_GP0_IO, 0x00006060);</div><div class='add'>+			break;</div><div class='add'>+		case SEC_VOLTAGE_OFF:</div><div class='add'>+		   	printk("LNB Voltage SEC_VOLTAGE_off\n");</div><div class='add'>+			break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (core-&gt;prev_set_voltage)</div><div class='add'>+		return core-&gt;prev_set_voltage(fe, voltage);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -456,7 +462,12 @@ static struct s5h1409_config kworld_atsc_120_config = {</div><div class='ctx'> static struct xc5000_config pinnacle_pctv_hd_800i_tuner_config = {</div><div class='ctx'> 	.i2c_address	= 0x64,</div><div class='ctx'> 	.if_khz		= 5380,</div><div class='del'>-	.tuner_callback	= cx88_tuner_callback,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct zl10353_config cx88_pinnacle_hybrid_pctv = {</div><div class='add'>+	.demod_address = (0x1e &gt;&gt; 1),</div><div class='add'>+	.no_tuner      = 1,</div><div class='add'>+	.if2           = 45600,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct zl10353_config cx88_geniatech_x8000_mt = {</div><div class='hunk'>@@ -477,21 +488,25 @@ static struct s5h1411_config dvico_fusionhdtv7_config = {</div><div class='ctx'> static struct xc5000_config dvico_fusionhdtv7_tuner_config = {</div><div class='ctx'> 	.i2c_address    = 0xc2 &gt;&gt; 1,</div><div class='ctx'> 	.if_khz         = 5380,</div><div class='del'>-	.tuner_callback = cx88_tuner_callback,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int attach_xc3028(u8 addr, struct cx8802_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct dvb_frontend *fe;</div><div class='add'>+	struct videobuf_dvb_frontend *fe0 = NULL;</div><div class='ctx'> 	struct xc2028_ctrl ctl;</div><div class='ctx'> 	struct xc2028_config cfg = {</div><div class='ctx'> 		.i2c_adap  = &amp;dev-&gt;core-&gt;i2c_adap,</div><div class='ctx'> 		.i2c_addr  = addr,</div><div class='ctx'> 		.ctrl      = &amp;ctl,</div><div class='del'>-		.callback  = cx88_tuner_callback,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	if (!dev-&gt;dvb.frontend) {</div><div class='add'>+	/* Get the first frontend */</div><div class='add'>+	fe0 = videobuf_dvb_get_frontend(&amp;dev-&gt;frontends, 1);</div><div class='add'>+	if (!fe0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!fe0-&gt;dvb.frontend) {</div><div class='ctx'> 		printk(KERN_ERR "%s/2: dvb frontend not attached. "</div><div class='ctx'> 				"Can't attach xc3028\n",</div><div class='ctx'> 		       dev-&gt;core-&gt;name);</div><div class='hunk'>@@ -505,10 +520,13 @@ static int attach_xc3028(u8 addr, struct cx8802_dev *dev)</div><div class='ctx'> 	 */</div><div class='ctx'> 	cx88_setup_xc3028(dev-&gt;core, &amp;ctl);</div><div class='ctx'> </div><div class='del'>-	fe = dvb_attach(xc2028_attach, dev-&gt;dvb.frontend, &amp;cfg);</div><div class='add'>+	fe = dvb_attach(xc2028_attach, fe0-&gt;dvb.frontend, &amp;cfg);</div><div class='ctx'> 	if (!fe) {</div><div class='ctx'> 		printk(KERN_ERR "%s/2: xc3028 attach failed\n",</div><div class='ctx'> 		       dev-&gt;core-&gt;name);</div><div class='add'>+		dvb_frontend_detach(fe0-&gt;dvb.frontend);</div><div class='add'>+		dvb_unregister_frontend(fe0-&gt;dvb.frontend);</div><div class='add'>+		fe0-&gt;dvb.frontend = NULL;</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -518,22 +536,84 @@ static int attach_xc3028(u8 addr, struct cx8802_dev *dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int cx24116_set_ts_param(struct dvb_frontend *fe,</div><div class='add'>+	int is_punctured)</div><div class='add'>+{</div><div class='add'>+	struct cx8802_dev *dev = fe-&gt;dvb-&gt;priv;</div><div class='add'>+	dev-&gt;ts_gen_cntrl = 0x2;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cx24116_reset_device(struct dvb_frontend *fe)</div><div class='add'>+{</div><div class='add'>+	struct cx8802_dev *dev = fe-&gt;dvb-&gt;priv;</div><div class='add'>+	struct cx88_core *core = dev-&gt;core;</div><div class='add'>+</div><div class='add'>+	/* Reset the part */</div><div class='add'>+	/* Put the cx24116 into reset */</div><div class='add'>+	cx_write(MO_SRST_IO, 0);</div><div class='add'>+	msleep(10);</div><div class='add'>+	/* Take the cx24116 out of reset */</div><div class='add'>+	cx_write(MO_SRST_IO, 1);</div><div class='add'>+	msleep(10);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct cx24116_config hauppauge_hvr4000_config = {</div><div class='add'>+	.demod_address          = 0x05,</div><div class='add'>+	.set_ts_params          = cx24116_set_ts_param,</div><div class='add'>+	.reset_device           = cx24116_reset_device,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct cx24116_config tevii_s460_config = {</div><div class='add'>+	.demod_address = 0x55,</div><div class='add'>+	.set_ts_params = cx24116_set_ts_param,</div><div class='add'>+	.reset_device  = cx24116_reset_device,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct stv0299_config tevii_tuner_sharp_config = {</div><div class='add'>+	.demod_address = 0x68,</div><div class='add'>+	.inittab = sharp_z0194a_inittab,</div><div class='add'>+	.mclk = 88000000UL,</div><div class='add'>+	.invert = 1,</div><div class='add'>+	.skip_reinit = 0,</div><div class='add'>+	.lock_output = 1,</div><div class='add'>+	.volt13_op0_op1 = STV0299_VOLT13_OP1,</div><div class='add'>+	.min_delay_ms = 100,</div><div class='add'>+	.set_symbol_rate = sharp_z0194a_set_symbol_rate,</div><div class='add'>+	.set_ts_params = cx24116_set_ts_param,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct stv0288_config tevii_tuner_earda_config = {</div><div class='add'>+	.demod_address = 0x68,</div><div class='add'>+	.min_delay_ms = 100,</div><div class='add'>+	.set_ts_params = cx24116_set_ts_param,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int dvb_register(struct cx8802_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct cx88_core *core = dev-&gt;core;</div><div class='add'>+	struct videobuf_dvb_frontend *fe0, *fe1 = NULL;</div><div class='add'>+	int mfe_shared = 0; /* bus not shared by default */</div><div class='ctx'> </div><div class='del'>-	/* init struct videobuf_dvb */</div><div class='del'>-	dev-&gt;dvb.name = core-&gt;name;</div><div class='del'>-	dev-&gt;ts_gen_cntrl = 0x0c;</div><div class='add'>+	/* Get the first frontend */</div><div class='add'>+	fe0 = videobuf_dvb_get_frontend(&amp;dev-&gt;frontends, 1);</div><div class='add'>+	if (!fe0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* multi-frontend gate control is undefined or defaults to fe0 */</div><div class='add'>+	dev-&gt;frontends.gate = 0;</div><div class='ctx'> </div><div class='del'>-	/* init frontend */</div><div class='add'>+	/* init frontend(s) */</div><div class='ctx'> 	switch (core-&gt;boardnr) {</div><div class='ctx'> 	case CX88_BOARD_HAUPPAUGE_DVB_T1:</div><div class='del'>-		dev-&gt;dvb.frontend = dvb_attach(cx22702_attach,</div><div class='add'>+		fe0-&gt;dvb.frontend = dvb_attach(cx22702_attach,</div><div class='ctx'> 					       &amp;connexant_refboard_config,</div><div class='ctx'> 					       &amp;core-&gt;i2c_adap);</div><div class='del'>-		if (dev-&gt;dvb.frontend != NULL) {</div><div class='del'>-			if (!dvb_attach(dvb_pll_attach, dev-&gt;dvb.frontend,</div><div class='add'>+		if (fe0-&gt;dvb.frontend != NULL) {</div><div class='add'>+			if (!dvb_attach(dvb_pll_attach, fe0-&gt;dvb.frontend,</div><div class='ctx'> 					0x61, &amp;core-&gt;i2c_adap,</div><div class='ctx'> 					DVB_PLL_THOMSON_DTT759X))</div><div class='ctx'> 				goto frontend_detach;</div><div class='hunk'>@@ -543,11 +623,11 @@ static int dvb_register(struct cx8802_dev *dev)</div><div class='ctx'> 	case CX88_BOARD_CONEXANT_DVB_T1:</div><div class='ctx'> 	case CX88_BOARD_KWORLD_DVB_T_CX22702:</div><div class='ctx'> 	case CX88_BOARD_WINFAST_DTV1000:</div><div class='del'>-		dev-&gt;dvb.frontend = dvb_attach(cx22702_attach,</div><div class='add'>+		fe0-&gt;dvb.frontend = dvb_attach(cx22702_attach,</div><div class='ctx'> 					       &amp;connexant_refboard_config,</div><div class='ctx'> 					       &amp;core-&gt;i2c_adap);</div><div class='del'>-		if (dev-&gt;dvb.frontend != NULL) {</div><div class='del'>-			if (!dvb_attach(dvb_pll_attach, dev-&gt;dvb.frontend,</div><div class='add'>+		if (fe0-&gt;dvb.frontend != NULL) {</div><div class='add'>+			if (!dvb_attach(dvb_pll_attach, fe0-&gt;dvb.frontend,</div><div class='ctx'> 					0x60, &amp;core-&gt;i2c_adap,</div><div class='ctx'> 					DVB_PLL_THOMSON_DTT7579))</div><div class='ctx'> 				goto frontend_detach;</div><div class='hunk'>@@ -557,33 +637,67 @@ static int dvb_register(struct cx8802_dev *dev)</div><div class='ctx'> 	case CX88_BOARD_HAUPPAUGE_HVR1100:</div><div class='ctx'> 	case CX88_BOARD_HAUPPAUGE_HVR1100LP:</div><div class='ctx'> 	case CX88_BOARD_HAUPPAUGE_HVR1300:</div><div class='del'>-	case CX88_BOARD_HAUPPAUGE_HVR3000:</div><div class='del'>-		dev-&gt;dvb.frontend = dvb_attach(cx22702_attach,</div><div class='add'>+		fe0-&gt;dvb.frontend = dvb_attach(cx22702_attach,</div><div class='ctx'> 					       &amp;hauppauge_hvr_config,</div><div class='ctx'> 					       &amp;core-&gt;i2c_adap);</div><div class='del'>-		if (dev-&gt;dvb.frontend != NULL) {</div><div class='del'>-			if (!dvb_attach(simple_tuner_attach, dev-&gt;dvb.frontend,</div><div class='add'>+		if (fe0-&gt;dvb.frontend != NULL) {</div><div class='add'>+			if (!dvb_attach(simple_tuner_attach, fe0-&gt;dvb.frontend,</div><div class='ctx'> 				   &amp;core-&gt;i2c_adap, 0x61,</div><div class='ctx'> 				   TUNER_PHILIPS_FMD1216ME_MK3))</div><div class='ctx'> 				goto frontend_detach;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='add'>+	case CX88_BOARD_HAUPPAUGE_HVR3000:</div><div class='add'>+		/* DVB-S init */</div><div class='add'>+		fe0-&gt;dvb.frontend = dvb_attach(cx24123_attach,</div><div class='add'>+			       &amp;hauppauge_novas_config,</div><div class='add'>+			       &amp;dev-&gt;core-&gt;i2c_adap);</div><div class='add'>+		if (fe0-&gt;dvb.frontend) {</div><div class='add'>+			if (!dvb_attach(isl6421_attach, fe0-&gt;dvb.frontend,</div><div class='add'>+			&amp;dev-&gt;core-&gt;i2c_adap, 0x08, ISL6421_DCL, 0x00)) {</div><div class='add'>+				dprintk( 1, "%s(): HVR3000 - DVB-S LNB Init: failed\n", __func__);</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			dprintk( 1, "%s(): HVR3000 - DVB-S Init: failed\n", __func__);</div><div class='add'>+		}</div><div class='add'>+		/* DVB-T init */</div><div class='add'>+		fe1 = videobuf_dvb_get_frontend(&amp;dev-&gt;frontends, 2);</div><div class='add'>+		if (fe1) {</div><div class='add'>+			dev-&gt;frontends.gate = 2;</div><div class='add'>+			mfe_shared = 1;</div><div class='add'>+			fe1-&gt;dvb.frontend = dvb_attach(cx22702_attach,</div><div class='add'>+				&amp;hauppauge_hvr_config,</div><div class='add'>+				&amp;dev-&gt;core-&gt;i2c_adap);</div><div class='add'>+			if (fe1-&gt;dvb.frontend) {</div><div class='add'>+				fe1-&gt;dvb.frontend-&gt;id = 1;</div><div class='add'>+				if(!dvb_attach(simple_tuner_attach, fe1-&gt;dvb.frontend,</div><div class='add'>+						&amp;dev-&gt;core-&gt;i2c_adap, 0x61,</div><div class='add'>+						TUNER_PHILIPS_FMD1216ME_MK3)) {</div><div class='add'>+					dprintk( 1, "%s(): HVR3000 - DVB-T misc Init: failed\n", __func__);</div><div class='add'>+				}</div><div class='add'>+			} else {</div><div class='add'>+				dprintk( 1, "%s(): HVR3000 - DVB-T Init: failed\n", __func__);</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			dprintk( 1, "%s(): HVR3000 - DVB-T Init: can't find frontend 2.\n", __func__);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='ctx'> 	case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PLUS:</div><div class='del'>-		dev-&gt;dvb.frontend = dvb_attach(mt352_attach,</div><div class='add'>+		fe0-&gt;dvb.frontend = dvb_attach(mt352_attach,</div><div class='ctx'> 					       &amp;dvico_fusionhdtv,</div><div class='ctx'> 					       &amp;core-&gt;i2c_adap);</div><div class='del'>-		if (dev-&gt;dvb.frontend != NULL) {</div><div class='del'>-			if (!dvb_attach(dvb_pll_attach, dev-&gt;dvb.frontend,</div><div class='add'>+		if (fe0-&gt;dvb.frontend != NULL) {</div><div class='add'>+			if (!dvb_attach(dvb_pll_attach, fe0-&gt;dvb.frontend,</div><div class='ctx'> 					0x60, NULL, DVB_PLL_THOMSON_DTT7579))</div><div class='ctx'> 				goto frontend_detach;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		/* ZL10353 replaces MT352 on later cards */</div><div class='del'>-		dev-&gt;dvb.frontend = dvb_attach(zl10353_attach,</div><div class='add'>+		fe0-&gt;dvb.frontend = dvb_attach(zl10353_attach,</div><div class='ctx'> 					       &amp;dvico_fusionhdtv_plus_v1_1,</div><div class='ctx'> 					       &amp;core-&gt;i2c_adap);</div><div class='del'>-		if (dev-&gt;dvb.frontend != NULL) {</div><div class='del'>-			if (!dvb_attach(dvb_pll_attach, dev-&gt;dvb.frontend,</div><div class='add'>+		if (fe0-&gt;dvb.frontend != NULL) {</div><div class='add'>+			if (!dvb_attach(dvb_pll_attach, fe0-&gt;dvb.frontend,</div><div class='ctx'> 					0x60, NULL, DVB_PLL_THOMSON_DTT7579))</div><div class='ctx'> 				goto frontend_detach;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -591,31 +705,31 @@ static int dvb_register(struct cx8802_dev *dev)</div><div class='ctx'> 	case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL:</div><div class='ctx'> 		/* The tin box says DEE1601, but it seems to be DTT7579</div><div class='ctx'> 		 * compatible, with a slightly different MT352 AGC gain. */</div><div class='del'>-		dev-&gt;dvb.frontend = dvb_attach(mt352_attach,</div><div class='add'>+		fe0-&gt;dvb.frontend = dvb_attach(mt352_attach,</div><div class='ctx'> 					       &amp;dvico_fusionhdtv_dual,</div><div class='ctx'> 					       &amp;core-&gt;i2c_adap);</div><div class='del'>-		if (dev-&gt;dvb.frontend != NULL) {</div><div class='del'>-			if (!dvb_attach(dvb_pll_attach, dev-&gt;dvb.frontend,</div><div class='add'>+		if (fe0-&gt;dvb.frontend != NULL) {</div><div class='add'>+			if (!dvb_attach(dvb_pll_attach, fe0-&gt;dvb.frontend,</div><div class='ctx'> 					0x61, NULL, DVB_PLL_THOMSON_DTT7579))</div><div class='ctx'> 				goto frontend_detach;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		/* ZL10353 replaces MT352 on later cards */</div><div class='del'>-		dev-&gt;dvb.frontend = dvb_attach(zl10353_attach,</div><div class='add'>+		fe0-&gt;dvb.frontend = dvb_attach(zl10353_attach,</div><div class='ctx'> 					       &amp;dvico_fusionhdtv_plus_v1_1,</div><div class='ctx'> 					       &amp;core-&gt;i2c_adap);</div><div class='del'>-		if (dev-&gt;dvb.frontend != NULL) {</div><div class='del'>-			if (!dvb_attach(dvb_pll_attach, dev-&gt;dvb.frontend,</div><div class='add'>+		if (fe0-&gt;dvb.frontend != NULL) {</div><div class='add'>+			if (!dvb_attach(dvb_pll_attach, fe0-&gt;dvb.frontend,</div><div class='ctx'> 					0x61, NULL, DVB_PLL_THOMSON_DTT7579))</div><div class='ctx'> 				goto frontend_detach;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T1:</div><div class='del'>-		dev-&gt;dvb.frontend = dvb_attach(mt352_attach,</div><div class='add'>+		fe0-&gt;dvb.frontend = dvb_attach(mt352_attach,</div><div class='ctx'> 					       &amp;dvico_fusionhdtv,</div><div class='ctx'> 					       &amp;core-&gt;i2c_adap);</div><div class='del'>-		if (dev-&gt;dvb.frontend != NULL) {</div><div class='del'>-			if (!dvb_attach(dvb_pll_attach, dev-&gt;dvb.frontend,</div><div class='add'>+		if (fe0-&gt;dvb.frontend != NULL) {</div><div class='add'>+			if (!dvb_attach(dvb_pll_attach, fe0-&gt;dvb.frontend,</div><div class='ctx'> 					0x61, NULL, DVB_PLL_LG_Z201))</div><div class='ctx'> 				goto frontend_detach;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -623,11 +737,11 @@ static int dvb_register(struct cx8802_dev *dev)</div><div class='ctx'> 	case CX88_BOARD_KWORLD_DVB_T:</div><div class='ctx'> 	case CX88_BOARD_DNTV_LIVE_DVB_T:</div><div class='ctx'> 	case CX88_BOARD_ADSTECH_DVB_T_PCI:</div><div class='del'>-		dev-&gt;dvb.frontend = dvb_attach(mt352_attach,</div><div class='add'>+		fe0-&gt;dvb.frontend = dvb_attach(mt352_attach,</div><div class='ctx'> 					       &amp;dntv_live_dvbt_config,</div><div class='ctx'> 					       &amp;core-&gt;i2c_adap);</div><div class='del'>-		if (dev-&gt;dvb.frontend != NULL) {</div><div class='del'>-			if (!dvb_attach(dvb_pll_attach, dev-&gt;dvb.frontend,</div><div class='add'>+		if (fe0-&gt;dvb.frontend != NULL) {</div><div class='add'>+			if (!dvb_attach(dvb_pll_attach, fe0-&gt;dvb.frontend,</div><div class='ctx'> 					0x61, NULL, DVB_PLL_UNKNOWN_1))</div><div class='ctx'> 				goto frontend_detach;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -635,10 +749,10 @@ static int dvb_register(struct cx8802_dev *dev)</div><div class='ctx'> 	case CX88_BOARD_DNTV_LIVE_DVB_T_PRO:</div><div class='ctx'> #if defined(CONFIG_VIDEO_CX88_VP3054) || (defined(CONFIG_VIDEO_CX88_VP3054_MODULE) &amp;&amp; defined(MODULE))</div><div class='ctx'> 		/* MT352 is on a secondary I2C bus made from some GPIO lines */</div><div class='del'>-		dev-&gt;dvb.frontend = dvb_attach(mt352_attach, &amp;dntv_live_dvbt_pro_config,</div><div class='add'>+		fe0-&gt;dvb.frontend = dvb_attach(mt352_attach, &amp;dntv_live_dvbt_pro_config,</div><div class='ctx'> 					       &amp;dev-&gt;vp3054-&gt;adap);</div><div class='del'>-		if (dev-&gt;dvb.frontend != NULL) {</div><div class='del'>-			if (!dvb_attach(simple_tuner_attach, dev-&gt;dvb.frontend,</div><div class='add'>+		if (fe0-&gt;dvb.frontend != NULL) {</div><div class='add'>+			if (!dvb_attach(simple_tuner_attach, fe0-&gt;dvb.frontend,</div><div class='ctx'> 					&amp;core-&gt;i2c_adap, 0x61,</div><div class='ctx'> 					TUNER_PHILIPS_FMD1216ME_MK3))</div><div class='ctx'> 				goto frontend_detach;</div><div class='hunk'>@@ -649,22 +763,22 @@ static int dvb_register(struct cx8802_dev *dev)</div><div class='ctx'> #endif</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_HYBRID:</div><div class='del'>-		dev-&gt;dvb.frontend = dvb_attach(zl10353_attach,</div><div class='add'>+		fe0-&gt;dvb.frontend = dvb_attach(zl10353_attach,</div><div class='ctx'> 					       &amp;dvico_fusionhdtv_hybrid,</div><div class='ctx'> 					       &amp;core-&gt;i2c_adap);</div><div class='del'>-		if (dev-&gt;dvb.frontend != NULL) {</div><div class='del'>-			if (!dvb_attach(simple_tuner_attach, dev-&gt;dvb.frontend,</div><div class='add'>+		if (fe0-&gt;dvb.frontend != NULL) {</div><div class='add'>+			if (!dvb_attach(simple_tuner_attach, fe0-&gt;dvb.frontend,</div><div class='ctx'> 				   &amp;core-&gt;i2c_adap, 0x61,</div><div class='ctx'> 				   TUNER_THOMSON_FE6600))</div><div class='ctx'> 				goto frontend_detach;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PRO:</div><div class='del'>-		dev-&gt;dvb.frontend = dvb_attach(zl10353_attach,</div><div class='add'>+		fe0-&gt;dvb.frontend = dvb_attach(zl10353_attach,</div><div class='ctx'> 					       &amp;dvico_fusionhdtv_xc3028,</div><div class='ctx'> 					       &amp;core-&gt;i2c_adap);</div><div class='del'>-		if (dev-&gt;dvb.frontend == NULL)</div><div class='del'>-			dev-&gt;dvb.frontend = dvb_attach(mt352_attach,</div><div class='add'>+		if (fe0-&gt;dvb.frontend == NULL)</div><div class='add'>+			fe0-&gt;dvb.frontend = dvb_attach(mt352_attach,</div><div class='ctx'> 						&amp;dvico_fusionhdtv_mt352_xc3028,</div><div class='ctx'> 						&amp;core-&gt;i2c_adap);</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -672,16 +786,16 @@ static int dvb_register(struct cx8802_dev *dev)</div><div class='ctx'> 		 * We must not permit gate_ctrl to be performed, or</div><div class='ctx'> 		 * the xc3028 cannot communicate on the bus.</div><div class='ctx'> 		 */</div><div class='del'>-		if (dev-&gt;dvb.frontend)</div><div class='del'>-			dev-&gt;dvb.frontend-&gt;ops.i2c_gate_ctrl = NULL;</div><div class='add'>+		if (fe0-&gt;dvb.frontend)</div><div class='add'>+			fe0-&gt;dvb.frontend-&gt;ops.i2c_gate_ctrl = NULL;</div><div class='ctx'> 		if (attach_xc3028(0x61, dev) &lt; 0)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CX88_BOARD_PCHDTV_HD3000:</div><div class='del'>-		dev-&gt;dvb.frontend = dvb_attach(or51132_attach, &amp;pchdtv_hd3000,</div><div class='add'>+		fe0-&gt;dvb.frontend = dvb_attach(or51132_attach, &amp;pchdtv_hd3000,</div><div class='ctx'> 					       &amp;core-&gt;i2c_adap);</div><div class='del'>-		if (dev-&gt;dvb.frontend != NULL) {</div><div class='del'>-			if (!dvb_attach(simple_tuner_attach, dev-&gt;dvb.frontend,</div><div class='add'>+		if (fe0-&gt;dvb.frontend != NULL) {</div><div class='add'>+			if (!dvb_attach(simple_tuner_attach, fe0-&gt;dvb.frontend,</div><div class='ctx'> 					&amp;core-&gt;i2c_adap, 0x61,</div><div class='ctx'> 					TUNER_THOMSON_DTT761X))</div><div class='ctx'> 				goto frontend_detach;</div><div class='hunk'>@@ -698,11 +812,11 @@ static int dvb_register(struct cx8802_dev *dev)</div><div class='ctx'> </div><div class='ctx'> 		/* Select RF connector callback */</div><div class='ctx'> 		fusionhdtv_3_gold.pll_rf_set = lgdt330x_pll_rf_set;</div><div class='del'>-		dev-&gt;dvb.frontend = dvb_attach(lgdt330x_attach,</div><div class='add'>+		fe0-&gt;dvb.frontend = dvb_attach(lgdt330x_attach,</div><div class='ctx'> 					       &amp;fusionhdtv_3_gold,</div><div class='ctx'> 					       &amp;core-&gt;i2c_adap);</div><div class='del'>-		if (dev-&gt;dvb.frontend != NULL) {</div><div class='del'>-			if (!dvb_attach(simple_tuner_attach, dev-&gt;dvb.frontend,</div><div class='add'>+		if (fe0-&gt;dvb.frontend != NULL) {</div><div class='add'>+			if (!dvb_attach(simple_tuner_attach, fe0-&gt;dvb.frontend,</div><div class='ctx'> 					&amp;core-&gt;i2c_adap, 0x61,</div><div class='ctx'> 					TUNER_MICROTUNE_4042FI5))</div><div class='ctx'> 				goto frontend_detach;</div><div class='hunk'>@@ -716,11 +830,11 @@ static int dvb_register(struct cx8802_dev *dev)</div><div class='ctx'> 		mdelay(100);</div><div class='ctx'> 		cx_set(MO_GP0_IO, 9);</div><div class='ctx'> 		mdelay(200);</div><div class='del'>-		dev-&gt;dvb.frontend = dvb_attach(lgdt330x_attach,</div><div class='add'>+		fe0-&gt;dvb.frontend = dvb_attach(lgdt330x_attach,</div><div class='ctx'> 					       &amp;fusionhdtv_3_gold,</div><div class='ctx'> 					       &amp;core-&gt;i2c_adap);</div><div class='del'>-		if (dev-&gt;dvb.frontend != NULL) {</div><div class='del'>-			if (!dvb_attach(simple_tuner_attach, dev-&gt;dvb.frontend,</div><div class='add'>+		if (fe0-&gt;dvb.frontend != NULL) {</div><div class='add'>+			if (!dvb_attach(simple_tuner_attach, fe0-&gt;dvb.frontend,</div><div class='ctx'> 					&amp;core-&gt;i2c_adap, 0x61,</div><div class='ctx'> 					TUNER_THOMSON_DTT761X))</div><div class='ctx'> 				goto frontend_detach;</div><div class='hunk'>@@ -734,15 +848,15 @@ static int dvb_register(struct cx8802_dev *dev)</div><div class='ctx'> 		mdelay(100);</div><div class='ctx'> 		cx_set(MO_GP0_IO, 1);</div><div class='ctx'> 		mdelay(200);</div><div class='del'>-		dev-&gt;dvb.frontend = dvb_attach(lgdt330x_attach,</div><div class='add'>+		fe0-&gt;dvb.frontend = dvb_attach(lgdt330x_attach,</div><div class='ctx'> 					       &amp;fusionhdtv_5_gold,</div><div class='ctx'> 					       &amp;core-&gt;i2c_adap);</div><div class='del'>-		if (dev-&gt;dvb.frontend != NULL) {</div><div class='del'>-			if (!dvb_attach(simple_tuner_attach, dev-&gt;dvb.frontend,</div><div class='add'>+		if (fe0-&gt;dvb.frontend != NULL) {</div><div class='add'>+			if (!dvb_attach(simple_tuner_attach, fe0-&gt;dvb.frontend,</div><div class='ctx'> 					&amp;core-&gt;i2c_adap, 0x61,</div><div class='ctx'> 					TUNER_LG_TDVS_H06XF))</div><div class='ctx'> 				goto frontend_detach;</div><div class='del'>-			if (!dvb_attach(tda9887_attach, dev-&gt;dvb.frontend,</div><div class='add'>+			if (!dvb_attach(tda9887_attach, fe0-&gt;dvb.frontend,</div><div class='ctx'> 				   &amp;core-&gt;i2c_adap, 0x43))</div><div class='ctx'> 				goto frontend_detach;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -755,25 +869,25 @@ static int dvb_register(struct cx8802_dev *dev)</div><div class='ctx'> 		mdelay(100);</div><div class='ctx'> 		cx_set(MO_GP0_IO, 1);</div><div class='ctx'> 		mdelay(200);</div><div class='del'>-		dev-&gt;dvb.frontend = dvb_attach(lgdt330x_attach,</div><div class='add'>+		fe0-&gt;dvb.frontend = dvb_attach(lgdt330x_attach,</div><div class='ctx'> 					       &amp;pchdtv_hd5500,</div><div class='ctx'> 					       &amp;core-&gt;i2c_adap);</div><div class='del'>-		if (dev-&gt;dvb.frontend != NULL) {</div><div class='del'>-			if (!dvb_attach(simple_tuner_attach, dev-&gt;dvb.frontend,</div><div class='add'>+		if (fe0-&gt;dvb.frontend != NULL) {</div><div class='add'>+			if (!dvb_attach(simple_tuner_attach, fe0-&gt;dvb.frontend,</div><div class='ctx'> 					&amp;core-&gt;i2c_adap, 0x61,</div><div class='ctx'> 					TUNER_LG_TDVS_H06XF))</div><div class='ctx'> 				goto frontend_detach;</div><div class='del'>-			if (!dvb_attach(tda9887_attach, dev-&gt;dvb.frontend,</div><div class='add'>+			if (!dvb_attach(tda9887_attach, fe0-&gt;dvb.frontend,</div><div class='ctx'> 				   &amp;core-&gt;i2c_adap, 0x43))</div><div class='ctx'> 				goto frontend_detach;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CX88_BOARD_ATI_HDTVWONDER:</div><div class='del'>-		dev-&gt;dvb.frontend = dvb_attach(nxt200x_attach,</div><div class='add'>+		fe0-&gt;dvb.frontend = dvb_attach(nxt200x_attach,</div><div class='ctx'> 					       &amp;ati_hdtvwonder,</div><div class='ctx'> 					       &amp;core-&gt;i2c_adap);</div><div class='del'>-		if (dev-&gt;dvb.frontend != NULL) {</div><div class='del'>-			if (!dvb_attach(simple_tuner_attach, dev-&gt;dvb.frontend,</div><div class='add'>+		if (fe0-&gt;dvb.frontend != NULL) {</div><div class='add'>+			if (!dvb_attach(simple_tuner_attach, fe0-&gt;dvb.frontend,</div><div class='ctx'> 					&amp;core-&gt;i2c_adap, 0x61,</div><div class='ctx'> 					TUNER_PHILIPS_TUV1236D))</div><div class='ctx'> 				goto frontend_detach;</div><div class='hunk'>@@ -781,135 +895,224 @@ static int dvb_register(struct cx8802_dev *dev)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CX88_BOARD_HAUPPAUGE_NOVASPLUS_S1:</div><div class='ctx'> 	case CX88_BOARD_HAUPPAUGE_NOVASE2_S1:</div><div class='del'>-		dev-&gt;dvb.frontend = dvb_attach(cx24123_attach,</div><div class='add'>+		fe0-&gt;dvb.frontend = dvb_attach(cx24123_attach,</div><div class='ctx'> 					       &amp;hauppauge_novas_config,</div><div class='ctx'> 					       &amp;core-&gt;i2c_adap);</div><div class='del'>-		if (dev-&gt;dvb.frontend) {</div><div class='del'>-			if (!dvb_attach(isl6421_attach, dev-&gt;dvb.frontend,</div><div class='del'>-					&amp;core-&gt;i2c_adap, 0x08, 0x00, 0x00))</div><div class='add'>+		if (fe0-&gt;dvb.frontend) {</div><div class='add'>+			if (!dvb_attach(isl6421_attach, fe0-&gt;dvb.frontend,</div><div class='add'>+					&amp;core-&gt;i2c_adap, 0x08, ISL6421_DCL, 0x00))</div><div class='ctx'> 				goto frontend_detach;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CX88_BOARD_KWORLD_DVBS_100:</div><div class='del'>-		dev-&gt;dvb.frontend = dvb_attach(cx24123_attach,</div><div class='add'>+		fe0-&gt;dvb.frontend = dvb_attach(cx24123_attach,</div><div class='ctx'> 					       &amp;kworld_dvbs_100_config,</div><div class='ctx'> 					       &amp;core-&gt;i2c_adap);</div><div class='del'>-		if (dev-&gt;dvb.frontend) {</div><div class='del'>-			core-&gt;prev_set_voltage = dev-&gt;dvb.frontend-&gt;ops.set_voltage;</div><div class='del'>-			dev-&gt;dvb.frontend-&gt;ops.set_voltage = kworld_dvbs_100_set_voltage;</div><div class='add'>+		if (fe0-&gt;dvb.frontend) {</div><div class='add'>+			core-&gt;prev_set_voltage = fe0-&gt;dvb.frontend-&gt;ops.set_voltage;</div><div class='add'>+			fe0-&gt;dvb.frontend-&gt;ops.set_voltage = kworld_dvbs_100_set_voltage;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CX88_BOARD_GENIATECH_DVBS:</div><div class='del'>-		dev-&gt;dvb.frontend = dvb_attach(cx24123_attach,</div><div class='add'>+		fe0-&gt;dvb.frontend = dvb_attach(cx24123_attach,</div><div class='ctx'> 					       &amp;geniatech_dvbs_config,</div><div class='ctx'> 					       &amp;core-&gt;i2c_adap);</div><div class='del'>-		if (dev-&gt;dvb.frontend) {</div><div class='del'>-			core-&gt;prev_set_voltage = dev-&gt;dvb.frontend-&gt;ops.set_voltage;</div><div class='del'>-			dev-&gt;dvb.frontend-&gt;ops.set_voltage = geniatech_dvbs_set_voltage;</div><div class='add'>+		if (fe0-&gt;dvb.frontend) {</div><div class='add'>+			core-&gt;prev_set_voltage = fe0-&gt;dvb.frontend-&gt;ops.set_voltage;</div><div class='add'>+			fe0-&gt;dvb.frontend-&gt;ops.set_voltage = geniatech_dvbs_set_voltage;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CX88_BOARD_PINNACLE_PCTV_HD_800i:</div><div class='del'>-		dev-&gt;dvb.frontend = dvb_attach(s5h1409_attach,</div><div class='add'>+		fe0-&gt;dvb.frontend = dvb_attach(s5h1409_attach,</div><div class='ctx'> 					       &amp;pinnacle_pctv_hd_800i_config,</div><div class='ctx'> 					       &amp;core-&gt;i2c_adap);</div><div class='del'>-		if (dev-&gt;dvb.frontend != NULL) {</div><div class='del'>-			/* tuner_config.video_dev must point to</div><div class='del'>-			 * i2c_adap.algo_data</div><div class='del'>-			 */</div><div class='del'>-			if (!dvb_attach(xc5000_attach, dev-&gt;dvb.frontend,</div><div class='add'>+		if (fe0-&gt;dvb.frontend != NULL) {</div><div class='add'>+			if (!dvb_attach(xc5000_attach, fe0-&gt;dvb.frontend,</div><div class='ctx'> 					&amp;core-&gt;i2c_adap,</div><div class='del'>-					&amp;pinnacle_pctv_hd_800i_tuner_config,</div><div class='del'>-					core-&gt;i2c_adap.algo_data))</div><div class='add'>+					&amp;pinnacle_pctv_hd_800i_tuner_config))</div><div class='ctx'> 				goto frontend_detach;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CX88_BOARD_DVICO_FUSIONHDTV_5_PCI_NANO:</div><div class='del'>-		dev-&gt;dvb.frontend = dvb_attach(s5h1409_attach,</div><div class='add'>+		fe0-&gt;dvb.frontend = dvb_attach(s5h1409_attach,</div><div class='ctx'> 						&amp;dvico_hdtv5_pci_nano_config,</div><div class='ctx'> 						&amp;core-&gt;i2c_adap);</div><div class='del'>-		if (dev-&gt;dvb.frontend != NULL) {</div><div class='add'>+		if (fe0-&gt;dvb.frontend != NULL) {</div><div class='ctx'> 			struct dvb_frontend *fe;</div><div class='ctx'> 			struct xc2028_config cfg = {</div><div class='ctx'> 				.i2c_adap  = &amp;core-&gt;i2c_adap,</div><div class='ctx'> 				.i2c_addr  = 0x61,</div><div class='del'>-				.callback  = cx88_pci_nano_callback,</div><div class='ctx'> 			};</div><div class='ctx'> 			static struct xc2028_ctrl ctl = {</div><div class='del'>-				.fname       = "xc3028-v27.fw",</div><div class='add'>+				.fname       = XC2028_DEFAULT_FIRMWARE,</div><div class='ctx'> 				.max_len     = 64,</div><div class='ctx'> 				.scode_table = XC3028_FE_OREN538,</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			fe = dvb_attach(xc2028_attach,</div><div class='del'>-					dev-&gt;dvb.frontend, &amp;cfg);</div><div class='add'>+					fe0-&gt;dvb.frontend, &amp;cfg);</div><div class='ctx'> 			if (fe != NULL &amp;&amp; fe-&gt;ops.tuner_ops.set_config != NULL)</div><div class='ctx'> 				fe-&gt;ops.tuner_ops.set_config(fe, &amp;ctl);</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	 case CX88_BOARD_PINNACLE_HYBRID_PCTV:</div><div class='del'>-		dev-&gt;dvb.frontend = dvb_attach(zl10353_attach,</div><div class='del'>-					       &amp;cx88_geniatech_x8000_mt,</div><div class='add'>+		fe0-&gt;dvb.frontend = dvb_attach(zl10353_attach,</div><div class='add'>+					       &amp;cx88_pinnacle_hybrid_pctv,</div><div class='ctx'> 					       &amp;core-&gt;i2c_adap);</div><div class='del'>-		if (attach_xc3028(0x61, dev) &lt; 0)</div><div class='del'>-			goto frontend_detach;</div><div class='add'>+		if (fe0-&gt;dvb.frontend) {</div><div class='add'>+			fe0-&gt;dvb.frontend-&gt;ops.i2c_gate_ctrl = NULL;</div><div class='add'>+			if (attach_xc3028(0x61, dev) &lt; 0)</div><div class='add'>+				goto frontend_detach;</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	 case CX88_BOARD_GENIATECH_X8000_MT:</div><div class='ctx'> 		dev-&gt;ts_gen_cntrl = 0x00;</div><div class='ctx'> </div><div class='del'>-		dev-&gt;dvb.frontend = dvb_attach(zl10353_attach,</div><div class='add'>+		fe0-&gt;dvb.frontend = dvb_attach(zl10353_attach,</div><div class='ctx'> 					       &amp;cx88_geniatech_x8000_mt,</div><div class='ctx'> 					       &amp;core-&gt;i2c_adap);</div><div class='ctx'> 		if (attach_xc3028(0x61, dev) &lt; 0)</div><div class='ctx'> 			goto frontend_detach;</div><div class='ctx'> 		break;</div><div class='ctx'> 	 case CX88_BOARD_KWORLD_ATSC_120:</div><div class='del'>-		dev-&gt;dvb.frontend = dvb_attach(s5h1409_attach,</div><div class='add'>+		fe0-&gt;dvb.frontend = dvb_attach(s5h1409_attach,</div><div class='ctx'> 					       &amp;kworld_atsc_120_config,</div><div class='ctx'> 					       &amp;core-&gt;i2c_adap);</div><div class='ctx'> 		if (attach_xc3028(0x61, dev) &lt; 0)</div><div class='ctx'> 			goto frontend_detach;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CX88_BOARD_DVICO_FUSIONHDTV_7_GOLD:</div><div class='del'>-		dev-&gt;dvb.frontend = dvb_attach(s5h1411_attach,</div><div class='add'>+		fe0-&gt;dvb.frontend = dvb_attach(s5h1411_attach,</div><div class='ctx'> 					       &amp;dvico_fusionhdtv7_config,</div><div class='ctx'> 					       &amp;core-&gt;i2c_adap);</div><div class='del'>-		if (dev-&gt;dvb.frontend != NULL) {</div><div class='del'>-			/* tuner_config.video_dev must point to</div><div class='del'>-			 * i2c_adap.algo_data</div><div class='del'>-			 */</div><div class='del'>-			if (!dvb_attach(xc5000_attach, dev-&gt;dvb.frontend,</div><div class='add'>+		if (fe0-&gt;dvb.frontend != NULL) {</div><div class='add'>+			if (!dvb_attach(xc5000_attach, fe0-&gt;dvb.frontend,</div><div class='ctx'> 					&amp;core-&gt;i2c_adap,</div><div class='del'>-					&amp;dvico_fusionhdtv7_tuner_config,</div><div class='del'>-					core-&gt;i2c_adap.algo_data))</div><div class='add'>+					&amp;dvico_fusionhdtv7_tuner_config))</div><div class='ctx'> 				goto frontend_detach;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='add'>+	case CX88_BOARD_HAUPPAUGE_HVR4000:</div><div class='add'>+		/* DVB-S/S2 Init */</div><div class='add'>+		fe0-&gt;dvb.frontend = dvb_attach(cx24116_attach,</div><div class='add'>+			&amp;hauppauge_hvr4000_config,</div><div class='add'>+			&amp;dev-&gt;core-&gt;i2c_adap);</div><div class='add'>+		if (fe0-&gt;dvb.frontend) {</div><div class='add'>+			if(!dvb_attach(isl6421_attach, fe0-&gt;dvb.frontend,</div><div class='add'>+				&amp;dev-&gt;core-&gt;i2c_adap, 0x08, ISL6421_DCL, 0x00)) {</div><div class='add'>+				dprintk( 1, "%s(): HVR4000 - DVB-S LNB Init: failed\n", __func__);</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			dprintk( 1, "%s(): HVR4000 - DVB-S Init: failed\n", __func__);</div><div class='add'>+		}</div><div class='add'>+		/* DVB-T Init */</div><div class='add'>+		fe1 = videobuf_dvb_get_frontend(&amp;dev-&gt;frontends, 2);</div><div class='add'>+		if (fe1) {</div><div class='add'>+			dev-&gt;frontends.gate = 2;</div><div class='add'>+			mfe_shared = 1;</div><div class='add'>+			fe1-&gt;dvb.frontend = dvb_attach(cx22702_attach,</div><div class='add'>+				&amp;hauppauge_hvr_config,</div><div class='add'>+				&amp;dev-&gt;core-&gt;i2c_adap);</div><div class='add'>+			if (fe1-&gt;dvb.frontend) {</div><div class='add'>+				fe1-&gt;dvb.frontend-&gt;id = 1;</div><div class='add'>+				if(!dvb_attach(simple_tuner_attach, fe1-&gt;dvb.frontend,</div><div class='add'>+					&amp;dev-&gt;core-&gt;i2c_adap, 0x61,</div><div class='add'>+					TUNER_PHILIPS_FMD1216ME_MK3)) {</div><div class='add'>+					dprintk( 1, "%s(): HVR4000 - DVB-T misc Init: failed\n", __func__);</div><div class='add'>+				}</div><div class='add'>+			} else {</div><div class='add'>+				dprintk( 1, "%s(): HVR4000 - DVB-T Init: failed\n", __func__);</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			dprintk( 1, "%s(): HVR4000 - DVB-T Init: can't find frontend 2.\n", __func__);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case CX88_BOARD_HAUPPAUGE_HVR4000LITE:</div><div class='add'>+		fe0-&gt;dvb.frontend = dvb_attach(cx24116_attach,</div><div class='add'>+			&amp;hauppauge_hvr4000_config,</div><div class='add'>+			&amp;dev-&gt;core-&gt;i2c_adap);</div><div class='add'>+		if (fe0-&gt;dvb.frontend) {</div><div class='add'>+			dvb_attach(isl6421_attach, fe0-&gt;dvb.frontend,</div><div class='add'>+				&amp;dev-&gt;core-&gt;i2c_adap,</div><div class='add'>+				0x08, ISL6421_DCL, 0x00);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case CX88_BOARD_TEVII_S420:</div><div class='add'>+		fe0-&gt;dvb.frontend = dvb_attach(stv0299_attach,</div><div class='add'>+						&amp;tevii_tuner_sharp_config,</div><div class='add'>+						&amp;core-&gt;i2c_adap);</div><div class='add'>+		if (fe0-&gt;dvb.frontend != NULL) {</div><div class='add'>+			if (!dvb_attach(dvb_pll_attach, fe0-&gt;dvb.frontend, 0x60,</div><div class='add'>+					&amp;core-&gt;i2c_adap, DVB_PLL_OPERA1))</div><div class='add'>+				goto frontend_detach;</div><div class='add'>+			core-&gt;prev_set_voltage = fe0-&gt;dvb.frontend-&gt;ops.set_voltage;</div><div class='add'>+			fe0-&gt;dvb.frontend-&gt;ops.set_voltage = tevii_dvbs_set_voltage;</div><div class='add'>+</div><div class='add'>+		} else {</div><div class='add'>+			fe0-&gt;dvb.frontend = dvb_attach(stv0288_attach,</div><div class='add'>+							    &amp;tevii_tuner_earda_config,</div><div class='add'>+							    &amp;core-&gt;i2c_adap);</div><div class='add'>+				if (fe0-&gt;dvb.frontend != NULL) {</div><div class='add'>+					if (!dvb_attach(stb6000_attach, fe0-&gt;dvb.frontend, 0x61,</div><div class='add'>+						&amp;core-&gt;i2c_adap))</div><div class='add'>+					goto frontend_detach;</div><div class='add'>+				core-&gt;prev_set_voltage = fe0-&gt;dvb.frontend-&gt;ops.set_voltage;</div><div class='add'>+				fe0-&gt;dvb.frontend-&gt;ops.set_voltage = tevii_dvbs_set_voltage;</div><div class='add'>+</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case CX88_BOARD_TEVII_S460:</div><div class='add'>+		fe0-&gt;dvb.frontend = dvb_attach(cx24116_attach,</div><div class='add'>+					       &amp;tevii_s460_config,</div><div class='add'>+					       &amp;core-&gt;i2c_adap);</div><div class='add'>+		if (fe0-&gt;dvb.frontend != NULL) {</div><div class='add'>+			core-&gt;prev_set_voltage = fe0-&gt;dvb.frontend-&gt;ops.set_voltage;</div><div class='add'>+			fe0-&gt;dvb.frontend-&gt;ops.set_voltage = tevii_dvbs_set_voltage;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case CX88_BOARD_OMICOM_SS4_PCI:</div><div class='add'>+	case CX88_BOARD_TBS_8920:</div><div class='add'>+	case CX88_BOARD_PROF_7300:</div><div class='add'>+		fe0-&gt;dvb.frontend = dvb_attach(cx24116_attach,</div><div class='add'>+					       &amp;hauppauge_hvr4000_config,</div><div class='add'>+					       &amp;core-&gt;i2c_adap);</div><div class='add'>+		if (fe0-&gt;dvb.frontend != NULL) {</div><div class='add'>+			core-&gt;prev_set_voltage = fe0-&gt;dvb.frontend-&gt;ops.set_voltage;</div><div class='add'>+			fe0-&gt;dvb.frontend-&gt;ops.set_voltage = tevii_dvbs_set_voltage;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		printk(KERN_ERR "%s/2: The frontend of your DVB/ATSC card isn't supported yet\n",</div><div class='ctx'> 		       core-&gt;name);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	if (NULL == dev-&gt;dvb.frontend) {</div><div class='add'>+</div><div class='add'>+        if ( (NULL == fe0-&gt;dvb.frontend) || (fe1 &amp;&amp; NULL == fe1-&gt;dvb.frontend) ) {</div><div class='ctx'> 		printk(KERN_ERR</div><div class='ctx'> 		       "%s/2: frontend initialization failed\n",</div><div class='ctx'> 		       core-&gt;name);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='add'>+	/* define general-purpose callback pointer */</div><div class='add'>+	fe0-&gt;dvb.frontend-&gt;callback = cx88_tuner_callback;</div><div class='ctx'> </div><div class='ctx'> 	/* Ensure all frontends negotiate bus access */</div><div class='del'>-	dev-&gt;dvb.frontend-&gt;ops.ts_bus_ctrl = cx88_dvb_bus_ctrl;</div><div class='add'>+	fe0-&gt;dvb.frontend-&gt;ops.ts_bus_ctrl = cx88_dvb_bus_ctrl;</div><div class='add'>+	if (fe1)</div><div class='add'>+		fe1-&gt;dvb.frontend-&gt;ops.ts_bus_ctrl = cx88_dvb_bus_ctrl;</div><div class='ctx'> </div><div class='ctx'> 	/* Put the analog decoder in standby to keep it quiet */</div><div class='ctx'> 	cx88_call_i2c_clients(core, TUNER_SET_STANDBY, NULL);</div><div class='ctx'> </div><div class='ctx'> 	/* register everything */</div><div class='del'>-	return videobuf_dvb_register(&amp;dev-&gt;dvb, THIS_MODULE, dev,</div><div class='del'>-				     &amp;dev-&gt;pci-&gt;dev, adapter_nr);</div><div class='add'>+	return videobuf_dvb_register_bus(&amp;dev-&gt;frontends, THIS_MODULE, dev,</div><div class='add'>+		&amp;dev-&gt;pci-&gt;dev, adapter_nr, mfe_shared);</div><div class='ctx'> </div><div class='ctx'> frontend_detach:</div><div class='del'>-	if (dev-&gt;dvb.frontend) {</div><div class='del'>-		dvb_frontend_detach(dev-&gt;dvb.frontend);</div><div class='del'>-		dev-&gt;dvb.frontend = NULL;</div><div class='add'>+	if (fe0-&gt;dvb.frontend) {</div><div class='add'>+		dvb_frontend_detach(fe0-&gt;dvb.frontend);</div><div class='add'>+		fe0-&gt;dvb.frontend = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='hunk'>@@ -933,6 +1136,38 @@ static int cx8802_dvb_advise_acquire(struct cx8802_driver *drv)</div><div class='ctx'> 		cx_clear(MO_GP0_IO, 0x00000004);</div><div class='ctx'> 		udelay(1000);</div><div class='ctx'> 		break;</div><div class='add'>+</div><div class='add'>+	case CX88_BOARD_HAUPPAUGE_HVR3000:</div><div class='add'>+	case CX88_BOARD_HAUPPAUGE_HVR4000:</div><div class='add'>+		if(core-&gt;dvbdev-&gt;frontends.active_fe_id == 1) {</div><div class='add'>+			/* DVB-S/S2 Enabled */</div><div class='add'>+</div><div class='add'>+			/* Toggle reset on cx22702 leaving i2c active */</div><div class='add'>+			cx_write(MO_GP0_IO, (core-&gt;board.input[0].gpio0 &amp; 0x0000ff00) | 0x00000080);</div><div class='add'>+			udelay(1000);</div><div class='add'>+			cx_clear(MO_GP0_IO, 0x00000080);</div><div class='add'>+			udelay(50);</div><div class='add'>+			cx_set(MO_GP0_IO, 0x00000080); /* cx22702 out of reset */</div><div class='add'>+			cx_set(MO_GP0_IO, 0x00000004); /* tri-state the cx22702 pins */</div><div class='add'>+			udelay(1000);</div><div class='add'>+</div><div class='add'>+			cx_write(MO_SRST_IO, 1); /* Take the cx24116/cx24123 out of reset */</div><div class='add'>+			core-&gt;dvbdev-&gt;ts_gen_cntrl = 0x02; /* Parallel IO */</div><div class='add'>+		} else</div><div class='add'>+		if (core-&gt;dvbdev-&gt;frontends.active_fe_id == 2) {</div><div class='add'>+			/* DVB-T Enabled */</div><div class='add'>+</div><div class='add'>+			/* Put the cx24116/cx24123 into reset */</div><div class='add'>+			cx_write(MO_SRST_IO, 0);</div><div class='add'>+</div><div class='add'>+			/* cx22702 out of reset and enable it */</div><div class='add'>+			cx_set(MO_GP0_IO,   0x00000080);</div><div class='add'>+			cx_clear(MO_GP0_IO, 0x00000004);</div><div class='add'>+			core-&gt;dvbdev-&gt;ts_gen_cntrl = 0x0c; /* Serial IO */</div><div class='add'>+			udelay(1000);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='ctx'> 	default:</div><div class='ctx'> 		err = -ENODEV;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -950,6 +1185,9 @@ static int cx8802_dvb_advise_release(struct cx8802_driver *drv)</div><div class='ctx'> 	case CX88_BOARD_HAUPPAUGE_HVR1300:</div><div class='ctx'> 		/* Do Nothing, leave the cx22702 on the bus. */</div><div class='ctx'> 		break;</div><div class='add'>+	case CX88_BOARD_HAUPPAUGE_HVR3000:</div><div class='add'>+	case CX88_BOARD_HAUPPAUGE_HVR4000:</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		err = -ENODEV;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -960,7 +1198,8 @@ static int cx8802_dvb_probe(struct cx8802_driver *drv)</div><div class='ctx'> {</div><div class='ctx'> 	struct cx88_core *core = drv-&gt;core;</div><div class='ctx'> 	struct cx8802_dev *dev = drv-&gt;core-&gt;dvbdev;</div><div class='del'>-	int err;</div><div class='add'>+	int err, i;</div><div class='add'>+	struct videobuf_dvb_frontend *fe;</div><div class='ctx'> </div><div class='ctx'> 	dprintk( 1, "%s\n", __func__);</div><div class='ctx'> 	dprintk( 1, " -&gt;being probed by Card=%d Name=%s, PCI %02x:%02x\n",</div><div class='hunk'>@@ -980,18 +1219,28 @@ static int cx8802_dvb_probe(struct cx8802_driver *drv)</div><div class='ctx'> </div><div class='ctx'> 	/* dvb stuff */</div><div class='ctx'> 	printk(KERN_INFO "%s/2: cx2388x based DVB/ATSC card\n", core-&gt;name);</div><div class='del'>-	videobuf_queue_sg_init(&amp;dev-&gt;dvb.dvbq, &amp;dvb_qops,</div><div class='add'>+	dev-&gt;ts_gen_cntrl = 0x0c;</div><div class='add'>+</div><div class='add'>+	for (i = 1; i &lt;= core-&gt;board.num_frontends; i++) {</div><div class='add'>+		fe = videobuf_dvb_get_frontend(&amp;core-&gt;dvbdev-&gt;frontends, i);</div><div class='add'>+		if (!fe) {</div><div class='add'>+			printk(KERN_ERR "%s() failed to get frontend(%d)\n", __func__, i);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		videobuf_queue_sg_init(&amp;fe-&gt;dvb.dvbq, &amp;dvb_qops,</div><div class='ctx'> 			    &amp;dev-&gt;pci-&gt;dev, &amp;dev-&gt;slock,</div><div class='ctx'> 			    V4L2_BUF_TYPE_VIDEO_CAPTURE,</div><div class='ctx'> 			    V4L2_FIELD_TOP,</div><div class='ctx'> 			    sizeof(struct cx88_buffer),</div><div class='ctx'> 			    dev);</div><div class='add'>+		/* init struct videobuf_dvb */</div><div class='add'>+		fe-&gt;dvb.name = dev-&gt;core-&gt;name;</div><div class='add'>+	}</div><div class='ctx'> 	err = dvb_register(dev);</div><div class='ctx'> 	if (err != 0)</div><div class='ctx'> 		printk(KERN_ERR "%s/2: dvb_register failed (err = %d)\n",</div><div class='ctx'> 		       core-&gt;name, err);</div><div class='del'>-</div><div class='del'>- fail_core:</div><div class='add'>+fail_core:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -999,9 +1248,7 @@ static int cx8802_dvb_remove(struct cx8802_driver *drv)</div><div class='ctx'> {</div><div class='ctx'> 	struct cx8802_dev *dev = drv-&gt;core-&gt;dvbdev;</div><div class='ctx'> </div><div class='del'>-	/* dvb */</div><div class='del'>-	if (dev-&gt;dvb.frontend)</div><div class='del'>-		videobuf_dvb_unregister(&amp;dev-&gt;dvb);</div><div class='add'>+	videobuf_dvb_unregister_bus(&amp;dev-&gt;frontends);</div><div class='ctx'> </div><div class='ctx'> 	vp3054_i2c_remove(dev);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/cx88/cx88-i2c.c b/drivers/media/video/cx88/cx88-i2c.c<br/>index d7406a994f09..01de23007095 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx88/cx88-i2c.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/cx88/cx88-i2c.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx88/cx88-i2c.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx88/cx88-i2c.c</a></div><div class='hunk'>@@ -116,18 +116,25 @@ static int detach_inform(struct i2c_client *client)</div><div class='ctx'> </div><div class='ctx'> void cx88_call_i2c_clients(struct cx88_core *core, unsigned int cmd, void *arg)</div><div class='ctx'> {</div><div class='add'>+	struct videobuf_dvb_frontends *f = &amp;core-&gt;dvbdev-&gt;frontends;</div><div class='add'>+	struct videobuf_dvb_frontend *fe = NULL;</div><div class='ctx'> 	if (0 != core-&gt;i2c_rc)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_VIDEO_CX88_DVB) || defined(CONFIG_VIDEO_CX88_DVB_MODULE)</div><div class='del'>-	if ( (core-&gt;dvbdev) &amp;&amp; (core-&gt;dvbdev-&gt;dvb.frontend) ) {</div><div class='del'>-		if (core-&gt;dvbdev-&gt;dvb.frontend-&gt;ops.i2c_gate_ctrl)</div><div class='del'>-			core-&gt;dvbdev-&gt;dvb.frontend-&gt;ops.i2c_gate_ctrl(core-&gt;dvbdev-&gt;dvb.frontend, 1);</div><div class='add'>+	if (core-&gt;dvbdev &amp;&amp; f) {</div><div class='add'>+		if(f-&gt;gate &lt;= 1) /* undefined or fe0 */</div><div class='add'>+			fe = videobuf_dvb_get_frontend(f, 1);</div><div class='add'>+		else</div><div class='add'>+			fe = videobuf_dvb_get_frontend(f, f-&gt;gate);</div><div class='add'>+</div><div class='add'>+		if (fe &amp;&amp; fe-&gt;dvb.frontend &amp;&amp; fe-&gt;dvb.frontend-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+			fe-&gt;dvb.frontend-&gt;ops.i2c_gate_ctrl(fe-&gt;dvb.frontend, 1);</div><div class='ctx'> </div><div class='ctx'> 		i2c_clients_command(&amp;core-&gt;i2c_adap, cmd, arg);</div><div class='ctx'> </div><div class='del'>-		if (core-&gt;dvbdev-&gt;dvb.frontend-&gt;ops.i2c_gate_ctrl)</div><div class='del'>-			core-&gt;dvbdev-&gt;dvb.frontend-&gt;ops.i2c_gate_ctrl(core-&gt;dvbdev-&gt;dvb.frontend, 0);</div><div class='add'>+		if (fe &amp;&amp; fe-&gt;dvb.frontend &amp;&amp; fe-&gt;dvb.frontend-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+			fe-&gt;dvb.frontend-&gt;ops.i2c_gate_ctrl(fe-&gt;dvb.frontend, 0);</div><div class='ctx'> 	} else</div><div class='ctx'> #endif</div><div class='ctx'> 		i2c_clients_command(&amp;core-&gt;i2c_adap, cmd, arg);</div><div class='hunk'>@@ -201,7 +208,23 @@ int cx88_i2c_init(struct cx88_core *core, struct pci_dev *pci)</div><div class='ctx'> </div><div class='ctx'> 	core-&gt;i2c_rc = i2c_bit_add_bus(&amp;core-&gt;i2c_adap);</div><div class='ctx'> 	if (0 == core-&gt;i2c_rc) {</div><div class='add'>+		static u8 tuner_data[] =</div><div class='add'>+			{ 0x0b, 0xdc, 0x86, 0x52 };</div><div class='add'>+		static struct i2c_msg tuner_msg =</div><div class='add'>+			{ .flags = 0, .addr = 0xc2 &gt;&gt; 1, .buf = tuner_data, .len = 4 };</div><div class='add'>+</div><div class='ctx'> 		dprintk(1, "i2c register ok\n");</div><div class='add'>+		switch( core-&gt;boardnr ) {</div><div class='add'>+			case CX88_BOARD_HAUPPAUGE_HVR1300:</div><div class='add'>+			case CX88_BOARD_HAUPPAUGE_HVR3000:</div><div class='add'>+			case CX88_BOARD_HAUPPAUGE_HVR4000:</div><div class='add'>+				printk("%s: i2c init: enabling analog demod on HVR1300/3000/4000 tuner\n",</div><div class='add'>+					core-&gt;name);</div><div class='add'>+				i2c_transfer(core-&gt;i2c_client.adapter, &amp;tuner_msg, 1);</div><div class='add'>+				break;</div><div class='add'>+			default:</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='ctx'> 		if (i2c_scan)</div><div class='ctx'> 			do_i2c_scan(core-&gt;name,&amp;core-&gt;i2c_client);</div><div class='ctx'> 	} else</div><div class='head'>diff --git a/drivers/media/video/cx88/cx88-input.c b/drivers/media/video/cx88/cx88-input.c<br/>index 53526d997a4e..8683d104de72 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx88/cx88-input.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/cx88/cx88-input.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx88/cx88-input.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx88/cx88-input.c</a></div><div class='hunk'>@@ -224,6 +224,8 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)</div><div class='ctx'> 	case CX88_BOARD_HAUPPAUGE_NOVASPLUS_S1:</div><div class='ctx'> 	case CX88_BOARD_HAUPPAUGE_HVR1100:</div><div class='ctx'> 	case CX88_BOARD_HAUPPAUGE_HVR3000:</div><div class='add'>+	case CX88_BOARD_HAUPPAUGE_HVR4000:</div><div class='add'>+	case CX88_BOARD_HAUPPAUGE_HVR4000LITE:</div><div class='ctx'> 		ir_codes = ir_codes_hauppauge_new;</div><div class='ctx'> 		ir_type = IR_TYPE_RC5;</div><div class='ctx'> 		ir-&gt;sampling = 1;</div><div class='hunk'>@@ -259,6 +261,7 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)</div><div class='ctx'> 		ir-&gt;polling = 1; /* ms */</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CX88_BOARD_PROLINK_PV_8000GT:</div><div class='add'>+	case CX88_BOARD_PROLINK_PV_GLOBAL_XTREME:</div><div class='ctx'> 		ir_codes = ir_codes_pixelview_new;</div><div class='ctx'> 		ir-&gt;gpio_addr = MO_GP1_IO;</div><div class='ctx'> 		ir-&gt;mask_keycode = 0x3f;</div><div class='hunk'>@@ -392,7 +395,7 @@ void cx88_ir_irq(struct cx88_core *core)</div><div class='ctx'> {</div><div class='ctx'> 	struct cx88_IR *ir = core-&gt;ir;</div><div class='ctx'> 	u32 samples, ircode;</div><div class='del'>-	int i;</div><div class='add'>+	int i, start, range, toggle, dev, code;</div><div class='ctx'> </div><div class='ctx'> 	if (NULL == ir)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -461,6 +464,34 @@ void cx88_ir_irq(struct cx88_core *core)</div><div class='ctx'> 	case CX88_BOARD_HAUPPAUGE_NOVASPLUS_S1:</div><div class='ctx'> 	case CX88_BOARD_HAUPPAUGE_HVR1100:</div><div class='ctx'> 	case CX88_BOARD_HAUPPAUGE_HVR3000:</div><div class='add'>+	case CX88_BOARD_HAUPPAUGE_HVR4000:</div><div class='add'>+	case CX88_BOARD_HAUPPAUGE_HVR4000LITE:</div><div class='add'>+		ircode = ir_decode_biphase(ir-&gt;samples, ir-&gt;scount, 5, 7);</div><div class='add'>+		ir_dprintk("biphase decoded: %x\n", ircode);</div><div class='add'>+		/*</div><div class='add'>+		 * RC5 has an extension bit which adds a new range</div><div class='add'>+		 * of available codes, this is detected here. Also</div><div class='add'>+		 * hauppauge remotes (black/silver) always use</div><div class='add'>+		 * specific device ids. If we do not filter the</div><div class='add'>+		 * device ids then messages destined for devices</div><div class='add'>+		 * such as TVs (id=0) will get through to the</div><div class='add'>+		 * device causing mis-fired events.</div><div class='add'>+		 */</div><div class='add'>+		/* split rc5 data block ... */</div><div class='add'>+		start = (ircode &amp; 0x2000) &gt;&gt; 13;</div><div class='add'>+		range = (ircode &amp; 0x1000) &gt;&gt; 12;</div><div class='add'>+		toggle= (ircode &amp; 0x0800) &gt;&gt; 11;</div><div class='add'>+		dev   = (ircode &amp; 0x07c0) &gt;&gt; 6;</div><div class='add'>+		code  = (ircode &amp; 0x003f) | ((range &lt;&lt; 6) ^ 0x0040);</div><div class='add'>+		if( start != 1)</div><div class='add'>+			/* no key pressed */</div><div class='add'>+			break;</div><div class='add'>+		if ( dev != 0x1e &amp;&amp; dev != 0x1f )</div><div class='add'>+			/* not a hauppauge remote */</div><div class='add'>+			break;</div><div class='add'>+		ir_input_keydown(ir-&gt;input, &amp;ir-&gt;ir, code, ircode);</div><div class='add'>+		ir-&gt;release = jiffies + msecs_to_jiffies(120);</div><div class='add'>+		break;</div><div class='ctx'> 	case CX88_BOARD_PINNACLE_PCTV_HD_800i:</div><div class='ctx'> 		ircode = ir_decode_biphase(ir-&gt;samples, ir-&gt;scount, 5, 7);</div><div class='ctx'> 		ir_dprintk("biphase decoded: %x\n", ircode);</div><div class='head'>diff --git a/drivers/media/video/cx88/cx88-mpeg.c b/drivers/media/video/cx88/cx88-mpeg.c<br/>index a6b061c2644a..6df5cf314186 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx88/cx88-mpeg.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/cx88/cx88-mpeg.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx88/cx88-mpeg.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx88/cx88-mpeg.c</a></div><div class='hunk'>@@ -768,7 +768,8 @@ static int __devinit cx8802_probe(struct pci_dev *pci_dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct cx8802_dev *dev;</div><div class='ctx'> 	struct cx88_core  *core;</div><div class='del'>-	int err;</div><div class='add'>+	struct videobuf_dvb_frontend *demod;</div><div class='add'>+	int err,i;</div><div class='ctx'> </div><div class='ctx'> 	/* general setup */</div><div class='ctx'> 	core = cx88_core_get(pci_dev);</div><div class='hunk'>@@ -781,6 +782,11 @@ static int __devinit cx8802_probe(struct pci_dev *pci_dev,</div><div class='ctx'> 	if (!core-&gt;board.mpeg)</div><div class='ctx'> 		goto fail_core;</div><div class='ctx'> </div><div class='add'>+	if (!core-&gt;board.num_frontends) {</div><div class='add'>+		printk(KERN_ERR "%s() .num_frontends should be non-zero, err = %d\n", __func__, err);</div><div class='add'>+		goto fail_core;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	err = -ENOMEM;</div><div class='ctx'> 	dev = kzalloc(sizeof(*dev),GFP_KERNEL);</div><div class='ctx'> 	if (NULL == dev)</div><div class='hunk'>@@ -795,6 +801,20 @@ static int __devinit cx8802_probe(struct pci_dev *pci_dev,</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;dev-&gt;drvlist);</div><div class='ctx'> 	list_add_tail(&amp;dev-&gt;devlist,&amp;cx8802_devlist);</div><div class='ctx'> </div><div class='add'>+	mutex_init(&amp;dev-&gt;frontends.lock);</div><div class='add'>+	INIT_LIST_HEAD(&amp;dev-&gt;frontends.felist);</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "%s() allocating %d frontend(s)\n", __func__, core-&gt;board.num_frontends);</div><div class='add'>+</div><div class='add'>+	for (i = 1; i &lt;= core-&gt;board.num_frontends; i++) {</div><div class='add'>+		demod = videobuf_dvb_alloc_frontend(&amp;dev-&gt;frontends, i);</div><div class='add'>+		if(demod == NULL) {</div><div class='add'>+			printk(KERN_ERR "%s() failed to alloc\n", __func__);</div><div class='add'>+			err = -ENOMEM;</div><div class='add'>+			goto fail_free;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Maintain a reference so cx88-video can query the 8802 device. */</div><div class='ctx'> 	core-&gt;dvbdev = dev;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/cx88/cx88-tvaudio.c b/drivers/media/video/cx88/cx88-tvaudio.c<br/>index 3a1977f41e27..7dd506b987fe 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx88/cx88-tvaudio.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/cx88/cx88-tvaudio.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx88/cx88-tvaudio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx88/cx88-tvaudio.c</a></div><div class='hunk'>@@ -767,6 +767,14 @@ void cx88_set_tvaudio(struct cx88_core *core)</div><div class='ctx'> 	case WW_FM:</div><div class='ctx'> 		set_audio_standard_FM(core, radio_deemphasis);</div><div class='ctx'> 		break;</div><div class='add'>+	case WW_I2SADC:</div><div class='add'>+		set_audio_start(core, 0x01);</div><div class='add'>+		/* Slave/Philips/Autobaud */</div><div class='add'>+		cx_write(AUD_I2SINPUTCNTL, 0);</div><div class='add'>+		/* Switch to "I2S ADC mode" */</div><div class='add'>+		cx_write(AUD_I2SCNTL, 0x1);</div><div class='add'>+		set_audio_finish(core, EN_I2SIN_ENABLE);</div><div class='add'>+		break;</div><div class='ctx'> 	case WW_NONE:</div><div class='ctx'> 	default:</div><div class='ctx'> 		printk("%s/0: unknown tv audio mode [%d]\n",</div><div class='hunk'>@@ -895,6 +903,9 @@ void cx88_set_stereo(struct cx88_core *core, u32 mode, int manual)</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='add'>+	case WW_I2SADC:</div><div class='add'>+		/* DO NOTHING */</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (UNSET != ctl) {</div><div class='head'>diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c<br/>index ef4d56ea0027..3904b73f52ee 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx88/cx88-video.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/cx88/cx88-video.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx88/cx88-video.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx88/cx88-video.c</a></div><div class='hunk'>@@ -426,24 +426,7 @@ int cx88_video_mux(struct cx88_core *core, unsigned int input)</div><div class='ctx'> </div><div class='ctx'> 	/* if there are audioroutes defined, we have an external</div><div class='ctx'> 	   ADC to deal with audio */</div><div class='del'>-</div><div class='ctx'> 	if (INPUT(input).audioroute) {</div><div class='del'>-</div><div class='del'>-		/* cx2388's C-ADC is connected to the tuner only.</div><div class='del'>-		   When used with S-Video, that ADC is busy dealing with</div><div class='del'>-		   chroma, so an external must be used for baseband audio */</div><div class='del'>-</div><div class='del'>-		if (INPUT(input).type != CX88_VMUX_TELEVISION &amp;&amp;</div><div class='del'>-			INPUT(input).type != CX88_RADIO) {</div><div class='del'>-			/* "ADC mode" */</div><div class='del'>-			cx_write(AUD_I2SCNTL, 0x1);</div><div class='del'>-			cx_set(AUD_CTL, EN_I2SIN_ENABLE);</div><div class='del'>-		} else {</div><div class='del'>-			/* Normal mode */</div><div class='del'>-			cx_write(AUD_I2SCNTL, 0x0);</div><div class='del'>-			cx_clear(AUD_CTL, EN_I2SIN_ENABLE);</div><div class='del'>-		}</div><div class='del'>-</div><div class='ctx'> 		/* The wm8775 module has the "2" route hardwired into</div><div class='ctx'> 		   the initialization. Some boards may use different</div><div class='ctx'> 		   routes for different inputs. HVR-1300 surely does */</div><div class='hunk'>@@ -454,9 +437,19 @@ int cx88_video_mux(struct cx88_core *core, unsigned int input)</div><div class='ctx'> 			route.input = INPUT(input).audioroute;</div><div class='ctx'> 			cx88_call_i2c_clients(core,</div><div class='ctx'> 				VIDIOC_INT_S_AUDIO_ROUTING, &amp;route);</div><div class='del'>-</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='add'>+		/* cx2388's C-ADC is connected to the tuner only.</div><div class='add'>+		   When used with S-Video, that ADC is busy dealing with</div><div class='add'>+		   chroma, so an external must be used for baseband audio */</div><div class='add'>+		if (INPUT(input).type != CX88_VMUX_TELEVISION ) {</div><div class='add'>+			/* "I2S ADC mode" */</div><div class='add'>+			core-&gt;tvaudio = WW_I2SADC;</div><div class='add'>+			cx88_set_tvaudio(core);</div><div class='add'>+		} else {</div><div class='add'>+			/* Normal mode */</div><div class='add'>+			cx_write(AUD_I2SCNTL, 0x0);</div><div class='add'>+			cx_clear(AUD_CTL, EN_I2SIN_ENABLE);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -773,6 +766,7 @@ static int video_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	enum v4l2_buf_type type = 0;</div><div class='ctx'> 	int radio = 0;</div><div class='ctx'> </div><div class='add'>+	lock_kernel();</div><div class='ctx'> 	list_for_each_entry(h, &amp;cx8800_devlist, devlist) {</div><div class='ctx'> 		if (h-&gt;video_dev-&gt;minor == minor) {</div><div class='ctx'> 			dev  = h;</div><div class='hunk'>@@ -788,8 +782,10 @@ static int video_open(struct inode *inode, struct file *file)</div><div class='ctx'> 			dev   = h;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	if (NULL == dev)</div><div class='add'>+	if (NULL == dev) {</div><div class='add'>+		unlock_kernel();</div><div class='ctx'> 		return -ENODEV;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	core = dev-&gt;core;</div><div class='ctx'> </div><div class='hunk'>@@ -798,8 +794,10 @@ static int video_open(struct inode *inode, struct file *file)</div><div class='ctx'> </div><div class='ctx'> 	/* allocate + initialize per filehandle data */</div><div class='ctx'> 	fh = kzalloc(sizeof(*fh),GFP_KERNEL);</div><div class='del'>-	if (NULL == fh)</div><div class='add'>+	if (NULL == fh) {</div><div class='add'>+		unlock_kernel();</div><div class='ctx'> 		return -ENOMEM;</div><div class='add'>+	}</div><div class='ctx'> 	file-&gt;private_data = fh;</div><div class='ctx'> 	fh-&gt;dev      = dev;</div><div class='ctx'> 	fh-&gt;radio    = radio;</div><div class='hunk'>@@ -827,11 +825,29 @@ static int video_open(struct inode *inode, struct file *file)</div><div class='ctx'> 		cx_write(MO_GP0_IO, core-&gt;board.radio.gpio0);</div><div class='ctx'> 		cx_write(MO_GP1_IO, core-&gt;board.radio.gpio1);</div><div class='ctx'> 		cx_write(MO_GP2_IO, core-&gt;board.radio.gpio2);</div><div class='del'>-		core-&gt;tvaudio = WW_FM;</div><div class='del'>-		cx88_set_tvaudio(core);</div><div class='del'>-		cx88_set_stereo(core,V4L2_TUNER_MODE_STEREO,1);</div><div class='add'>+		if (core-&gt;board.radio.audioroute) {</div><div class='add'>+			if(core-&gt;board.audio_chip &amp;&amp;</div><div class='add'>+				core-&gt;board.audio_chip == V4L2_IDENT_WM8775) {</div><div class='add'>+				struct v4l2_routing route;</div><div class='add'>+</div><div class='add'>+				route.input = core-&gt;board.radio.audioroute;</div><div class='add'>+				cx88_call_i2c_clients(core,</div><div class='add'>+					VIDIOC_INT_S_AUDIO_ROUTING, &amp;route);</div><div class='add'>+			}</div><div class='add'>+			/* "I2S ADC mode" */</div><div class='add'>+			core-&gt;tvaudio = WW_I2SADC;</div><div class='add'>+			cx88_set_tvaudio(core);</div><div class='add'>+		} else {</div><div class='add'>+			/* FM Mode */</div><div class='add'>+			core-&gt;tvaudio = WW_FM;</div><div class='add'>+			cx88_set_tvaudio(core);</div><div class='add'>+			cx88_set_stereo(core,V4L2_TUNER_MODE_STEREO,1);</div><div class='add'>+		}</div><div class='ctx'> 		cx88_call_i2c_clients(core,AUDC_SET_RADIO,NULL);</div><div class='ctx'> 	}</div><div class='add'>+	unlock_kernel();</div><div class='add'>+</div><div class='add'>+	atomic_inc(&amp;core-&gt;users);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -920,7 +936,8 @@ static int video_release(struct inode *inode, struct file *file)</div><div class='ctx'> 	file-&gt;private_data = NULL;</div><div class='ctx'> 	kfree(fh);</div><div class='ctx'> </div><div class='del'>-	cx88_call_i2c_clients (dev-&gt;core, TUNER_SET_STANDBY, NULL);</div><div class='add'>+	if(atomic_dec_and_test(&amp;dev-&gt;core-&gt;users))</div><div class='add'>+		cx88_call_i2c_clients (dev-&gt;core, TUNER_SET_STANDBY, NULL);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h<br/>index 54fe65094711..76207c2856b7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx88/cx88.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/cx88/cx88.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/cx88/cx88.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/cx88/cx88.h</a></div><div class='hunk'>@@ -221,6 +221,14 @@ extern struct sram_channel cx88_sram_channels[];</div><div class='ctx'> #define CX88_BOARD_DVICO_FUSIONHDTV_7_GOLD 65</div><div class='ctx'> #define CX88_BOARD_PROLINK_PV_8000GT       66</div><div class='ctx'> #define CX88_BOARD_KWORLD_ATSC_120         67</div><div class='add'>+#define CX88_BOARD_HAUPPAUGE_HVR4000       68</div><div class='add'>+#define CX88_BOARD_HAUPPAUGE_HVR4000LITE   69</div><div class='add'>+#define CX88_BOARD_TEVII_S460              70</div><div class='add'>+#define CX88_BOARD_OMICOM_SS4_PCI          71</div><div class='add'>+#define CX88_BOARD_TBS_8920                72</div><div class='add'>+#define CX88_BOARD_TEVII_S420              73</div><div class='add'>+#define CX88_BOARD_PROLINK_PV_GLOBAL_XTREME 74</div><div class='add'>+#define CX88_BOARD_PROF_7300               75</div><div class='ctx'> </div><div class='ctx'> enum cx88_itype {</div><div class='ctx'> 	CX88_VMUX_COMPOSITE1 = 1,</div><div class='hunk'>@@ -239,7 +247,7 @@ struct cx88_input {</div><div class='ctx'> 	enum cx88_itype type;</div><div class='ctx'> 	u32             gpio0, gpio1, gpio2, gpio3;</div><div class='ctx'> 	unsigned int    vmux:2;</div><div class='del'>-	unsigned int    audioroute:2;</div><div class='add'>+	unsigned int    audioroute:4;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct cx88_board {</div><div class='hunk'>@@ -253,6 +261,7 @@ struct cx88_board {</div><div class='ctx'> 	struct cx88_input       radio;</div><div class='ctx'> 	enum cx88_board_type    mpeg;</div><div class='ctx'> 	unsigned int            audio_chip;</div><div class='add'>+	int			num_frontends;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct cx88_subid {</div><div class='hunk'>@@ -342,11 +351,13 @@ struct cx88_core {</div><div class='ctx'> 	struct mutex               lock;</div><div class='ctx'> 	/* various v4l controls */</div><div class='ctx'> 	u32                        freq;</div><div class='add'>+	atomic_t		   users;</div><div class='ctx'> </div><div class='ctx'> 	/* cx88-video needs to access cx8802 for hybrid tuner pll access. */</div><div class='ctx'> 	struct cx8802_dev          *dvbdev;</div><div class='ctx'> 	enum cx88_board_type       active_type_id;</div><div class='ctx'> 	int			   active_ref;</div><div class='add'>+	int			   active_fe_id;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct cx8800_dev;</div><div class='hunk'>@@ -481,7 +492,7 @@ struct cx8802_dev {</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_VIDEO_CX88_DVB) || defined(CONFIG_VIDEO_CX88_DVB_MODULE)</div><div class='ctx'> 	/* for dvb only */</div><div class='del'>-	struct videobuf_dvb        dvb;</div><div class='add'>+	struct videobuf_dvb_frontends frontends;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_VIDEO_CX88_VP3054) || \</div><div class='hunk'>@@ -601,7 +612,7 @@ extern void cx88_call_i2c_clients(struct cx88_core *core,</div><div class='ctx'> /* ----------------------------------------------------------- */</div><div class='ctx'> /* cx88-cards.c                                                */</div><div class='ctx'> </div><div class='del'>-extern int cx88_tuner_callback(void *dev, int command, int arg);</div><div class='add'>+extern int cx88_tuner_callback(void *dev, int component, int command, int arg);</div><div class='ctx'> extern int cx88_get_resources(const struct cx88_core *core,</div><div class='ctx'> 			      struct pci_dev *pci);</div><div class='ctx'> extern struct cx88_core *cx88_core_create(struct pci_dev *pci, int nr);</div><div class='hunk'>@@ -619,6 +630,7 @@ extern void cx88_setup_xc3028(struct cx88_core *core, struct xc2028_ctrl *ctl);</div><div class='ctx'> #define WW_EIAJ		 7</div><div class='ctx'> #define WW_I2SPT	 8</div><div class='ctx'> #define WW_FM		 9</div><div class='add'>+#define WW_I2SADC	 10</div><div class='ctx'> </div><div class='ctx'> void cx88_set_tvaudio(struct cx88_core *core);</div><div class='ctx'> void cx88_newstation(struct cx88_core *core);</div><div class='head'>diff --git a/drivers/media/video/dabusb.c b/drivers/media/video/dabusb.c<br/>index 79faedf58521..298810d5262b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/dabusb.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/dabusb.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/dabusb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/dabusb.c</a></div><div class='hunk'>@@ -192,7 +192,7 @@ static void dabusb_iso_complete (struct urb *purb)</div><div class='ctx'> 					err("dabusb_iso_complete: invalid len %d", len);</div><div class='ctx'> 			}</div><div class='ctx'> 			else</div><div class='del'>-				warn("dabusb_iso_complete: corrupted packet status: %d", purb-&gt;iso_frame_desc[i].status);</div><div class='add'>+				dev_warn(&amp;purb-&gt;dev-&gt;dev, "dabusb_iso_complete: corrupted packet status: %d\n", purb-&gt;iso_frame_desc[i].status);</div><div class='ctx'> 		if (dst != purb-&gt;actual_length)</div><div class='ctx'> 			err("dst!=purb-&gt;actual_length:%d!=%d", dst, purb-&gt;actual_length);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -289,7 +289,7 @@ static int dabusb_bulk (pdabusb_t s, pbulk_transfer_t pb)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if( ret == -EPIPE ) {</div><div class='del'>-		warn("CLEAR_FEATURE request to remove STALL condition.");</div><div class='add'>+		dev_warn(&amp;s-&gt;usbdev-&gt;dev, "CLEAR_FEATURE request to remove STALL condition.\n");</div><div class='ctx'> 		if(usb_clear_halt(s-&gt;usbdev, usb_pipeendpoint(pipe)))</div><div class='ctx'> 			err("request failed");</div><div class='ctx'> 	}</div><div class='hunk'>@@ -866,7 +866,8 @@ static int __init dabusb_init (void)</div><div class='ctx'> </div><div class='ctx'> 	dbg("dabusb_init: driver registered");</div><div class='ctx'> </div><div class='del'>-	info(DRIVER_VERSION ":" DRIVER_DESC);</div><div class='add'>+	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"</div><div class='add'>+	       DRIVER_DESC "\n");</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	return retval;</div><div class='head'>diff --git a/drivers/media/video/dpc7146.c b/drivers/media/video/dpc7146.c<br/>deleted file mode 100644<br/>index 88d6df71d051..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/dpc7146.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/dpc7146.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,408 +0,0 @@</div><div class='del'>-/*</div><div class='del'>-    dpc7146.c - v4l2 driver for the dpc7146 demonstration board</div><div class='del'>-</div><div class='del'>-    Copyright (C) 2000-2003 Michael Hunold &lt;michael@mihu.de&gt;</div><div class='del'>-</div><div class='del'>-    This program is free software; you can redistribute it and/or modify</div><div class='del'>-    it under the terms of the GNU General Public License as published by</div><div class='del'>-    the Free Software Foundation; either version 2 of the License, or</div><div class='del'>-    (at your option) any later version.</div><div class='del'>-</div><div class='del'>-    This program is distributed in the hope that it will be useful,</div><div class='del'>-    but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>-    GNU General Public License for more details.</div><div class='del'>-</div><div class='del'>-    You should have received a copy of the GNU General Public License</div><div class='del'>-    along with this program; if not, write to the Free Software</div><div class='del'>-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-#define DEBUG_VARIABLE debug</div><div class='del'>-</div><div class='del'>-#include &lt;media/saa7146_vv.h&gt;</div><div class='del'>-#include &lt;linux/video_decoder.h&gt;	/* for saa7111a */</div><div class='del'>-</div><div class='del'>-#define I2C_SAA7111A            0x24</div><div class='del'>-</div><div class='del'>-/* All unused bytes are reserverd. */</div><div class='del'>-#define SAA711X_CHIP_VERSION            0x00</div><div class='del'>-#define SAA711X_ANALOG_INPUT_CONTROL_1  0x02</div><div class='del'>-#define SAA711X_ANALOG_INPUT_CONTROL_2  0x03</div><div class='del'>-#define SAA711X_ANALOG_INPUT_CONTROL_3  0x04</div><div class='del'>-#define SAA711X_ANALOG_INPUT_CONTROL_4  0x05</div><div class='del'>-#define SAA711X_HORIZONTAL_SYNC_START   0x06</div><div class='del'>-#define SAA711X_HORIZONTAL_SYNC_STOP    0x07</div><div class='del'>-#define SAA711X_SYNC_CONTROL            0x08</div><div class='del'>-#define SAA711X_LUMINANCE_CONTROL       0x09</div><div class='del'>-#define SAA711X_LUMINANCE_BRIGHTNESS    0x0A</div><div class='del'>-#define SAA711X_LUMINANCE_CONTRAST      0x0B</div><div class='del'>-#define SAA711X_CHROMA_SATURATION       0x0C</div><div class='del'>-#define SAA711X_CHROMA_HUE_CONTROL      0x0D</div><div class='del'>-#define SAA711X_CHROMA_CONTROL          0x0E</div><div class='del'>-#define SAA711X_FORMAT_DELAY_CONTROL    0x10</div><div class='del'>-#define SAA711X_OUTPUT_CONTROL_1        0x11</div><div class='del'>-#define SAA711X_OUTPUT_CONTROL_2        0x12</div><div class='del'>-#define SAA711X_OUTPUT_CONTROL_3        0x13</div><div class='del'>-#define SAA711X_V_GATE_1_START          0x15</div><div class='del'>-#define SAA711X_V_GATE_1_STOP           0x16</div><div class='del'>-#define SAA711X_V_GATE_1_MSB            0x17</div><div class='del'>-#define SAA711X_TEXT_SLICER_STATUS      0x1A</div><div class='del'>-#define SAA711X_DECODED_BYTES_OF_TS_1   0x1B</div><div class='del'>-#define SAA711X_DECODED_BYTES_OF_TS_2   0x1C</div><div class='del'>-#define SAA711X_STATUS_BYTE             0x1F</div><div class='del'>-</div><div class='del'>-#define DPC_BOARD_CAN_DO_VBI(dev)   (dev-&gt;revision != 0)</div><div class='del'>-</div><div class='del'>-static int debug;</div><div class='del'>-module_param(debug, int, 0);</div><div class='del'>-MODULE_PARM_DESC(debug, "debug verbosity");</div><div class='del'>-</div><div class='del'>-static int dpc_num;</div><div class='del'>-</div><div class='del'>-#define DPC_INPUTS	2</div><div class='del'>-static struct v4l2_input dpc_inputs[DPC_INPUTS] = {</div><div class='del'>-	{ 0, "Port A",	V4L2_INPUT_TYPE_CAMERA,	2, 0, V4L2_STD_PAL_BG|V4L2_STD_NTSC_M, 0 },</div><div class='del'>-	{ 1, "Port B",	V4L2_INPUT_TYPE_CAMERA,	2, 0, V4L2_STD_PAL_BG|V4L2_STD_NTSC_M, 0 },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define DPC_AUDIOS	0</div><div class='del'>-</div><div class='del'>-static struct saa7146_extension_ioctls ioctls[] = {</div><div class='del'>-	{ VIDIOC_G_INPUT,	SAA7146_EXCLUSIVE },</div><div class='del'>-	{ VIDIOC_S_INPUT,	SAA7146_EXCLUSIVE },</div><div class='del'>-	{ VIDIOC_ENUMINPUT, 	SAA7146_EXCLUSIVE },</div><div class='del'>-	{ VIDIOC_S_STD,		SAA7146_AFTER },</div><div class='del'>-	{ 0,			0 }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct dpc</div><div class='del'>-{</div><div class='del'>-	struct video_device	*video_dev;</div><div class='del'>-	struct video_device	*vbi_dev;</div><div class='del'>-</div><div class='del'>-	struct i2c_adapter	i2c_adapter;</div><div class='del'>-	struct i2c_client	*saa7111a;</div><div class='del'>-</div><div class='del'>-	int cur_input;	/* current input */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int dpc_check_clients(struct device *dev, void *data)</div><div class='del'>-{</div><div class='del'>-	struct dpc* dpc = data;</div><div class='del'>-	struct i2c_client *client = i2c_verify_client(dev);</div><div class='del'>-</div><div class='del'>-	if( !client )</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if( I2C_SAA7111A == client-&gt;addr )</div><div class='del'>-		dpc-&gt;saa7111a = client;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* fixme: add vbi stuff here */</div><div class='del'>-static int dpc_probe(struct saa7146_dev* dev)</div><div class='del'>-{</div><div class='del'>-	struct dpc* dpc = NULL;</div><div class='del'>-</div><div class='del'>-	dpc = kzalloc(sizeof(struct dpc), GFP_KERNEL);</div><div class='del'>-	if( NULL == dpc ) {</div><div class='del'>-		printk("dpc_v4l2.o: dpc_probe: not enough kernel memory.\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* FIXME: enable i2c-port pins, video-port-pins</div><div class='del'>-	   video port pins should be enabled here ?! */</div><div class='del'>-	saa7146_write(dev, MC1, (MASK_08 | MASK_24 | MASK_10 | MASK_26));</div><div class='del'>-</div><div class='del'>-	dpc-&gt;i2c_adapter = (struct i2c_adapter) {</div><div class='del'>-		.class = I2C_CLASS_TV_ANALOG,</div><div class='del'>-		.name = "dpc7146",</div><div class='del'>-	};</div><div class='del'>-	saa7146_i2c_adapter_prepare(dev, &amp;dpc-&gt;i2c_adapter, SAA7146_I2C_BUS_BIT_RATE_480);</div><div class='del'>-	if(i2c_add_adapter(&amp;dpc-&gt;i2c_adapter) &lt; 0) {</div><div class='del'>-		DEB_S(("cannot register i2c-device. skipping.\n"));</div><div class='del'>-		kfree(dpc);</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* loop through all i2c-devices on the bus and look who is there */</div><div class='del'>-	device_for_each_child(&amp;dpc-&gt;i2c_adapter.dev, dpc, dpc_check_clients);</div><div class='del'>-</div><div class='del'>-	/* check if all devices are present */</div><div class='del'>-	if (!dpc-&gt;saa7111a) {</div><div class='del'>-		DEB_D(("dpc_v4l2.o: dpc_attach failed for this device.\n"));</div><div class='del'>-		i2c_del_adapter(&amp;dpc-&gt;i2c_adapter);</div><div class='del'>-		kfree(dpc);</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* all devices are present, probe was successful */</div><div class='del'>-	DEB_D(("dpc_v4l2.o: dpc_probe succeeded for this device.\n"));</div><div class='del'>-</div><div class='del'>-	/* we store the pointer in our private data field */</div><div class='del'>-	dev-&gt;ext_priv = dpc;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* bring hardware to a sane state. this has to be done, just in case someone</div><div class='del'>-   wants to capture from this device before it has been properly initialized.</div><div class='del'>-   the capture engine would badly fail, because no valid signal arrives on the</div><div class='del'>-   saa7146, thus leading to timeouts and stuff. */</div><div class='del'>-static int dpc_init_done(struct saa7146_dev* dev)</div><div class='del'>-{</div><div class='del'>-	struct dpc* dpc = (struct dpc*)dev-&gt;ext_priv;</div><div class='del'>-</div><div class='del'>-	DEB_D(("dpc_v4l2.o: dpc_init_done called.\n"));</div><div class='del'>-</div><div class='del'>-	/* initialize the helper ics to useful values */</div><div class='del'>-	i2c_smbus_write_byte_data(dpc-&gt;saa7111a, 0x00, 0x11);</div><div class='del'>-</div><div class='del'>-	i2c_smbus_write_byte_data(dpc-&gt;saa7111a, 0x02, 0xc0);</div><div class='del'>-	i2c_smbus_write_byte_data(dpc-&gt;saa7111a, 0x03, 0x30);</div><div class='del'>-	i2c_smbus_write_byte_data(dpc-&gt;saa7111a, 0x04, 0x00);</div><div class='del'>-	i2c_smbus_write_byte_data(dpc-&gt;saa7111a, 0x05, 0x00);</div><div class='del'>-	i2c_smbus_write_byte_data(dpc-&gt;saa7111a, 0x06, 0xde);</div><div class='del'>-	i2c_smbus_write_byte_data(dpc-&gt;saa7111a, 0x07, 0xad);</div><div class='del'>-	i2c_smbus_write_byte_data(dpc-&gt;saa7111a, 0x08, 0xa8);</div><div class='del'>-	i2c_smbus_write_byte_data(dpc-&gt;saa7111a, 0x09, 0x00);</div><div class='del'>-	i2c_smbus_write_byte_data(dpc-&gt;saa7111a, 0x0a, 0x80);</div><div class='del'>-	i2c_smbus_write_byte_data(dpc-&gt;saa7111a, 0x0b, 0x47);</div><div class='del'>-	i2c_smbus_write_byte_data(dpc-&gt;saa7111a, 0x0c, 0x40);</div><div class='del'>-	i2c_smbus_write_byte_data(dpc-&gt;saa7111a, 0x0d, 0x00);</div><div class='del'>-	i2c_smbus_write_byte_data(dpc-&gt;saa7111a, 0x0e, 0x03);</div><div class='del'>-</div><div class='del'>-	i2c_smbus_write_byte_data(dpc-&gt;saa7111a, 0x10, 0xd0);</div><div class='del'>-	i2c_smbus_write_byte_data(dpc-&gt;saa7111a, 0x11, 0x1c);</div><div class='del'>-	i2c_smbus_write_byte_data(dpc-&gt;saa7111a, 0x12, 0xc1);</div><div class='del'>-	i2c_smbus_write_byte_data(dpc-&gt;saa7111a, 0x13, 0x30);</div><div class='del'>-</div><div class='del'>-	i2c_smbus_write_byte_data(dpc-&gt;saa7111a, 0x1f, 0x81);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct saa7146_ext_vv vv_data;</div><div class='del'>-</div><div class='del'>-/* this function only gets called when the probing was successful */</div><div class='del'>-static int dpc_attach(struct saa7146_dev* dev, struct saa7146_pci_extension_data *info)</div><div class='del'>-{</div><div class='del'>-	struct dpc* dpc = (struct dpc*)dev-&gt;ext_priv;</div><div class='del'>-</div><div class='del'>-	DEB_D(("dpc_v4l2.o: dpc_attach called.\n"));</div><div class='del'>-</div><div class='del'>-	/* checking for i2c-devices can be omitted here, because we</div><div class='del'>-	   already did this in "dpc_vl42_probe" */</div><div class='del'>-</div><div class='del'>-	saa7146_vv_init(dev,&amp;vv_data);</div><div class='del'>-	if( 0 != saa7146_register_device(&amp;dpc-&gt;video_dev, dev, "dpc", VFL_TYPE_GRABBER)) {</div><div class='del'>-		ERR(("cannot register capture v4l2 device. skipping.\n"));</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* initialization stuff (vbi) (only for revision &gt; 0 and for extensions which want it)*/</div><div class='del'>-	if( 0 != DPC_BOARD_CAN_DO_VBI(dev)) {</div><div class='del'>-		if( 0 != saa7146_register_device(&amp;dpc-&gt;vbi_dev, dev, "dpc", VFL_TYPE_VBI)) {</div><div class='del'>-			ERR(("cannot register vbi v4l2 device. skipping.\n"));</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	i2c_use_client(dpc-&gt;saa7111a);</div><div class='del'>-</div><div class='del'>-	printk("dpc: found 'dpc7146 demonstration board'-%d.\n",dpc_num);</div><div class='del'>-	dpc_num++;</div><div class='del'>-</div><div class='del'>-	/* the rest */</div><div class='del'>-	dpc-&gt;cur_input = 0;</div><div class='del'>-	dpc_init_done(dev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dpc_detach(struct saa7146_dev* dev)</div><div class='del'>-{</div><div class='del'>-	struct dpc* dpc = (struct dpc*)dev-&gt;ext_priv;</div><div class='del'>-</div><div class='del'>-	DEB_EE(("dev:%p\n",dev));</div><div class='del'>-</div><div class='del'>-	i2c_release_client(dpc-&gt;saa7111a);</div><div class='del'>-</div><div class='del'>-	saa7146_unregister_device(&amp;dpc-&gt;video_dev,dev);</div><div class='del'>-	if( 0 != DPC_BOARD_CAN_DO_VBI(dev)) {</div><div class='del'>-		saa7146_unregister_device(&amp;dpc-&gt;vbi_dev,dev);</div><div class='del'>-	}</div><div class='del'>-	saa7146_vv_release(dev);</div><div class='del'>-</div><div class='del'>-	dpc_num--;</div><div class='del'>-</div><div class='del'>-	i2c_del_adapter(&amp;dpc-&gt;i2c_adapter);</div><div class='del'>-	kfree(dpc);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef axa</div><div class='del'>-int dpc_vbi_bypass(struct saa7146_dev* dev)</div><div class='del'>-{</div><div class='del'>-	struct dpc* dpc = (struct dpc*)dev-&gt;ext_priv;</div><div class='del'>-</div><div class='del'>-	int i = 1;</div><div class='del'>-</div><div class='del'>-	/* switch bypass in saa7111a */</div><div class='del'>-	if ( 0 != dpc-&gt;saa7111a-&gt;driver-&gt;command(dpc-&gt;saa7111a,SAA711X_VBI_BYPASS, &amp;i)) {</div><div class='del'>-		printk("dpc_v4l2.o: VBI_BYPASS: could not address saa7111a.\n");</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static int dpc_ioctl(struct saa7146_fh *fh, unsigned int cmd, void *arg)</div><div class='del'>-{</div><div class='del'>-	struct saa7146_dev *dev = fh-&gt;dev;</div><div class='del'>-	struct dpc* dpc = (struct dpc*)dev-&gt;ext_priv;</div><div class='del'>-/*</div><div class='del'>-	struct saa7146_vv *vv = dev-&gt;vv_data;</div><div class='del'>-*/</div><div class='del'>-	switch(cmd)</div><div class='del'>-	{</div><div class='del'>-	case VIDIOC_ENUMINPUT:</div><div class='del'>-	{</div><div class='del'>-		struct v4l2_input *i = arg;</div><div class='del'>-		DEB_EE(("VIDIOC_ENUMINPUT %d.\n",i-&gt;index));</div><div class='del'>-</div><div class='del'>-		if( i-&gt;index &lt; 0 || i-&gt;index &gt;= DPC_INPUTS) {</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		memcpy(i, &amp;dpc_inputs[i-&gt;index], sizeof(struct v4l2_input));</div><div class='del'>-</div><div class='del'>-		DEB_D(("dpc_v4l2.o: v4l2_ioctl: VIDIOC_ENUMINPUT %d.\n",i-&gt;index));</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	case VIDIOC_G_INPUT:</div><div class='del'>-	{</div><div class='del'>-		int *input = (int *)arg;</div><div class='del'>-		*input = dpc-&gt;cur_input;</div><div class='del'>-</div><div class='del'>-		DEB_D(("dpc_v4l2.o: VIDIOC_G_INPUT: %d\n",*input));</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	case VIDIOC_S_INPUT:</div><div class='del'>-	{</div><div class='del'>-		int	input = *(int *)arg;</div><div class='del'>-</div><div class='del'>-		if (input &lt; 0 || input &gt;= DPC_INPUTS) {</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		dpc-&gt;cur_input = input;</div><div class='del'>-</div><div class='del'>-		/* fixme: switch input here, switch audio, too! */</div><div class='del'>-//		saa7146_set_hps_source_and_sync(dev, input_port_selection[input].hps_source, input_port_selection[input].hps_sync);</div><div class='del'>-		printk("dpc_v4l2.o: VIDIOC_S_INPUT: fixme switch input.\n");</div><div class='del'>-</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	default:</div><div class='del'>-/*</div><div class='del'>-		DEB_D(("dpc_v4l2.o: v4l2_ioctl does not handle this ioctl.\n"));</div><div class='del'>-*/</div><div class='del'>-		return -ENOIOCTLCMD;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int std_callback(struct saa7146_dev* dev, struct saa7146_standard *std)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct saa7146_standard standard[] = {</div><div class='del'>-	{</div><div class='del'>-		.name	= "PAL", 	.id	= V4L2_STD_PAL,</div><div class='del'>-		.v_offset	= 0x17,	.v_field 	= 288,</div><div class='del'>-		.h_offset	= 0x14,	.h_pixels 	= 680,</div><div class='del'>-		.v_max_out	= 576,	.h_max_out	= 768,</div><div class='del'>-	}, {</div><div class='del'>-		.name	= "NTSC", 	.id	= V4L2_STD_NTSC,</div><div class='del'>-		.v_offset	= 0x16,	.v_field 	= 240,</div><div class='del'>-		.h_offset	= 0x06,	.h_pixels 	= 708,</div><div class='del'>-		.v_max_out	= 480,	.h_max_out	= 640,</div><div class='del'>-	}, {</div><div class='del'>-		.name	= "SECAM", 	.id	= V4L2_STD_SECAM,</div><div class='del'>-		.v_offset	= 0x14,	.v_field 	= 288,</div><div class='del'>-		.h_offset	= 0x14,	.h_pixels 	= 720,</div><div class='del'>-		.v_max_out	= 576,	.h_max_out	= 768,</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct saa7146_extension extension;</div><div class='del'>-</div><div class='del'>-static struct saa7146_pci_extension_data dpc = {</div><div class='del'>-	.ext_priv = "Multimedia eXtension Board",</div><div class='del'>-	.ext = &amp;extension,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct pci_device_id pci_tbl[] = {</div><div class='del'>-	{</div><div class='del'>-		.vendor    = PCI_VENDOR_ID_PHILIPS,</div><div class='del'>-		.device	   = PCI_DEVICE_ID_PHILIPS_SAA7146,</div><div class='del'>-		.subvendor = 0x0000,</div><div class='del'>-		.subdevice = 0x0000,</div><div class='del'>-		.driver_data = (unsigned long)&amp;dpc,</div><div class='del'>-	}, {</div><div class='del'>-		.vendor = 0,</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-MODULE_DEVICE_TABLE(pci, pci_tbl);</div><div class='del'>-</div><div class='del'>-static struct saa7146_ext_vv vv_data = {</div><div class='del'>-	.inputs		= DPC_INPUTS,</div><div class='del'>-	.capabilities	= V4L2_CAP_VBI_CAPTURE,</div><div class='del'>-	.stds		= &amp;standard[0],</div><div class='del'>-	.num_stds	= sizeof(standard)/sizeof(struct saa7146_standard),</div><div class='del'>-	.std_callback	= &amp;std_callback,</div><div class='del'>-	.ioctls		= &amp;ioctls[0],</div><div class='del'>-	.ioctl		= dpc_ioctl,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct saa7146_extension extension = {</div><div class='del'>-	.name		= "dpc7146 demonstration board",</div><div class='del'>-	.flags		= SAA7146_USE_I2C_IRQ,</div><div class='del'>-</div><div class='del'>-	.pci_tbl	= &amp;pci_tbl[0],</div><div class='del'>-	.module		= THIS_MODULE,</div><div class='del'>-</div><div class='del'>-	.probe		= dpc_probe,</div><div class='del'>-	.attach		= dpc_attach,</div><div class='del'>-	.detach		= dpc_detach,</div><div class='del'>-</div><div class='del'>-	.irq_mask	= 0,</div><div class='del'>-	.irq_func	= NULL,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init dpc_init_module(void)</div><div class='del'>-{</div><div class='del'>-	if( 0 != saa7146_register_extension(&amp;extension)) {</div><div class='del'>-		DEB_S(("failed to register extension.\n"));</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit dpc_cleanup_module(void)</div><div class='del'>-{</div><div class='del'>-	saa7146_unregister_extension(&amp;extension);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(dpc_init_module);</div><div class='del'>-module_exit(dpc_cleanup_module);</div><div class='del'>-</div><div class='del'>-MODULE_DESCRIPTION("video4linux-2 driver for the 'dpc7146 demonstration board'");</div><div class='del'>-MODULE_AUTHOR("Michael Hunold &lt;michael@mihu.de&gt;");</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c<br/>index de943cf6c169..d65d0572403b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/em28xx/em28xx-cards.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/em28xx/em28xx-cards.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/em28xx/em28xx-cards.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/em28xx/em28xx-cards.c</a></div><div class='hunk'>@@ -1101,7 +1101,7 @@ struct usb_device_id em28xx_id_table [] = {</div><div class='ctx'> 	{ USB_DEVICE(0xeb1a, 0x2820),</div><div class='ctx'> 			.driver_info = EM2820_BOARD_UNKNOWN },</div><div class='ctx'> 	{ USB_DEVICE(0xeb1a, 0x2821),</div><div class='del'>-			.driver_info = EM2820_BOARD_UNKNOWN },</div><div class='add'>+			.driver_info = EM2820_BOARD_PROLINK_PLAYTV_USB2 },</div><div class='ctx'> 	{ USB_DEVICE(0xeb1a, 0x2860),</div><div class='ctx'> 			.driver_info = EM2820_BOARD_UNKNOWN },</div><div class='ctx'> 	{ USB_DEVICE(0xeb1a, 0x2861),</div><div class='hunk'>@@ -1271,7 +1271,7 @@ static struct em28xx_hash_table em28xx_i2c_hash[] = {</div><div class='ctx'> 	{0x1ba50080, EM2860_BOARD_POINTNIX_INTRAORAL_CAMERA, TUNER_ABSENT},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int em28xx_tuner_callback(void *ptr, int command, int arg)</div><div class='add'>+int em28xx_tuner_callback(void *ptr, int component, int command, int arg)</div><div class='ctx'> {</div><div class='ctx'> 	int rc = 0;</div><div class='ctx'> 	struct em28xx *dev = ptr;</div><div class='head'>diff --git a/drivers/media/video/em28xx/em28xx-dvb.c b/drivers/media/video/em28xx/em28xx-dvb.c<br/>index d2b1a1a52689..c99e2383b7ec 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/em28xx/em28xx-dvb.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/em28xx/em28xx-dvb.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/em28xx/em28xx-dvb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/em28xx/em28xx-dvb.c</a></div><div class='hunk'>@@ -249,7 +249,6 @@ static int attach_xc3028(u8 addr, struct em28xx *dev)</div><div class='ctx'> 	memset(&amp;cfg, 0, sizeof(cfg));</div><div class='ctx'> 	cfg.i2c_adap  = &amp;dev-&gt;i2c_adap;</div><div class='ctx'> 	cfg.i2c_addr  = addr;</div><div class='del'>-	cfg.callback  = em28xx_tuner_callback;</div><div class='ctx'> </div><div class='ctx'> 	if (!dev-&gt;dvb-&gt;frontend) {</div><div class='ctx'> 		printk(KERN_ERR "%s/2: dvb frontend not attached. "</div><div class='hunk'>@@ -274,7 +273,7 @@ static int attach_xc3028(u8 addr, struct em28xx *dev)</div><div class='ctx'> </div><div class='ctx'> /* ------------------------------------------------------------------ */</div><div class='ctx'> </div><div class='del'>-int register_dvb(struct em28xx_dvb *dvb,</div><div class='add'>+static int register_dvb(struct em28xx_dvb *dvb,</div><div class='ctx'> 		 struct module *module,</div><div class='ctx'> 		 struct em28xx *dev,</div><div class='ctx'> 		 struct device *device)</div><div class='hunk'>@@ -422,6 +421,8 @@ static int dvb_init(struct em28xx *dev)</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900:</div><div class='add'>+	case EM2880_BOARD_TERRATEC_HYBRID_XS:</div><div class='add'>+	case EM2880_BOARD_KWORLD_DVB_310U:</div><div class='ctx'> 		dvb-&gt;frontend = dvb_attach(zl10353_attach,</div><div class='ctx'> 					   &amp;em28xx_zl10353_with_xc3028,</div><div class='ctx'> 					   &amp;dev-&gt;i2c_adap);</div><div class='hunk'>@@ -443,24 +444,6 @@ static int dvb_init(struct em28xx *dev)</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> #endif</div><div class='del'>-	case EM2880_BOARD_TERRATEC_HYBRID_XS:</div><div class='del'>-		dvb-&gt;frontend = dvb_attach(zl10353_attach,</div><div class='del'>-						&amp;em28xx_zl10353_with_xc3028,</div><div class='del'>-						&amp;dev-&gt;i2c_adap);</div><div class='del'>-		if (attach_xc3028(0x61, dev) &lt; 0) {</div><div class='del'>-			 result = -EINVAL;</div><div class='del'>-			goto out_free;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case EM2880_BOARD_KWORLD_DVB_310U:</div><div class='del'>-		dvb-&gt;frontend = dvb_attach(zl10353_attach,</div><div class='del'>-						&amp;em28xx_zl10353_with_xc3028,</div><div class='del'>-						&amp;dev-&gt;i2c_adap);</div><div class='del'>-		if (attach_xc3028(0x61, dev) &lt; 0) {</div><div class='del'>-			result = -EINVAL;</div><div class='del'>-			goto out_free;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		printk(KERN_ERR "%s/2: The frontend of your DVB/ATSC card"</div><div class='ctx'> 				" isn't supported yet\n",</div><div class='hunk'>@@ -474,6 +457,8 @@ static int dvb_init(struct em28xx *dev)</div><div class='ctx'> 		result = -EINVAL;</div><div class='ctx'> 		goto out_free;</div><div class='ctx'> 	}</div><div class='add'>+	/* define general-purpose callback pointer */</div><div class='add'>+	dvb-&gt;frontend-&gt;callback = em28xx_tuner_callback;</div><div class='ctx'> </div><div class='ctx'> 	/* register everything */</div><div class='ctx'> 	result = register_dvb(dvb, THIS_MODULE, dev, &amp;dev-&gt;udev-&gt;dev);</div><div class='head'>diff --git a/drivers/media/video/em28xx/em28xx-i2c.c b/drivers/media/video/em28xx/em28xx-i2c.c<br/>index 97853384c943..3bab56b997fc 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/em28xx/em28xx-i2c.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/em28xx/em28xx-i2c.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/em28xx/em28xx-i2c.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/em28xx/em28xx-i2c.c</a></div><div class='hunk'>@@ -143,10 +143,11 @@ static int em2800_i2c_check_for_device(struct em28xx *dev, unsigned char addr)</div><div class='ctx'> 	}</div><div class='ctx'> 	for (write_timeout = EM2800_I2C_WRITE_TIMEOUT; write_timeout &gt; 0;</div><div class='ctx'> 	     write_timeout -= 5) {</div><div class='del'>-		unsigned msg = dev-&gt;em28xx_read_reg(dev, 0x5);</div><div class='del'>-		if (msg == 0x94)</div><div class='add'>+		unsigned reg = dev-&gt;em28xx_read_reg(dev, 0x5);</div><div class='add'>+</div><div class='add'>+		if (reg == 0x94)</div><div class='ctx'> 			return -ENODEV;</div><div class='del'>-		else if (msg == 0x84)</div><div class='add'>+		else if (reg == 0x84)</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		msleep(5);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -335,8 +336,11 @@ static int em28xx_i2c_eeprom(struct em28xx *dev, unsigned char *eedata, int len)</div><div class='ctx'> </div><div class='ctx'> 	/* Check if board has eeprom */</div><div class='ctx'> 	err = i2c_master_recv(&amp;dev-&gt;i2c_client, &amp;buf, 0);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return -1;</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		em28xx_errdev("%s: i2c_master_recv failed! err [%d]\n",</div><div class='add'>+			__func__, err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	buf = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -344,7 +348,7 @@ static int em28xx_i2c_eeprom(struct em28xx *dev, unsigned char *eedata, int len)</div><div class='ctx'> 	if (err != 1) {</div><div class='ctx'> 		printk(KERN_INFO "%s: Huh, no eeprom present (err=%d)?\n",</div><div class='ctx'> 		       dev-&gt;name, err);</div><div class='del'>-		return -1;</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	while (size &gt; 0) {</div><div class='ctx'> 		if (size &gt; 16)</div><div class='hunk'>@@ -357,7 +361,7 @@ static int em28xx_i2c_eeprom(struct em28xx *dev, unsigned char *eedata, int len)</div><div class='ctx'> 			printk(KERN_WARNING</div><div class='ctx'> 			       "%s: i2c eeprom read error (err=%d)\n",</div><div class='ctx'> 			       dev-&gt;name, err);</div><div class='del'>-			return -1;</div><div class='add'>+			return err;</div><div class='ctx'> 		}</div><div class='ctx'> 		size -= block;</div><div class='ctx'> 		p += block;</div><div class='hunk'>@@ -585,18 +589,31 @@ void em28xx_i2c_call_clients(struct em28xx *dev, unsigned int cmd, void *arg)</div><div class='ctx'>  */</div><div class='ctx'> int em28xx_i2c_register(struct em28xx *dev)</div><div class='ctx'> {</div><div class='add'>+	int retval;</div><div class='add'>+</div><div class='ctx'> 	BUG_ON(!dev-&gt;em28xx_write_regs || !dev-&gt;em28xx_read_reg);</div><div class='ctx'> 	BUG_ON(!dev-&gt;em28xx_write_regs_req || !dev-&gt;em28xx_read_reg_req);</div><div class='ctx'> 	dev-&gt;i2c_adap = em28xx_adap_template;</div><div class='ctx'> 	dev-&gt;i2c_adap.dev.parent = &amp;dev-&gt;udev-&gt;dev;</div><div class='ctx'> 	strcpy(dev-&gt;i2c_adap.name, dev-&gt;name);</div><div class='ctx'> 	dev-&gt;i2c_adap.algo_data = dev;</div><div class='del'>-	i2c_add_adapter(&amp;dev-&gt;i2c_adap);</div><div class='add'>+</div><div class='add'>+	retval = i2c_add_adapter(&amp;dev-&gt;i2c_adap);</div><div class='add'>+	if (retval &lt; 0) {</div><div class='add'>+		em28xx_errdev("%s: i2c_add_adapter failed! retval [%d]\n",</div><div class='add'>+			__func__, retval);</div><div class='add'>+		return retval;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;i2c_client = em28xx_client_template;</div><div class='ctx'> 	dev-&gt;i2c_client.adapter = &amp;dev-&gt;i2c_adap;</div><div class='ctx'> </div><div class='del'>-	em28xx_i2c_eeprom(dev, dev-&gt;eedata, sizeof(dev-&gt;eedata));</div><div class='add'>+	retval = em28xx_i2c_eeprom(dev, dev-&gt;eedata, sizeof(dev-&gt;eedata));</div><div class='add'>+	if (retval &lt; 0) {</div><div class='add'>+		em28xx_errdev("%s: em28xx_i2_eeprom failed! retval [%d]\n",</div><div class='add'>+			__func__, retval);</div><div class='add'>+		return retval;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (i2c_scan)</div><div class='ctx'> 		em28xx_do_i2c_scan(dev);</div><div class='head'>diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c<br/>index 49ab0629702e..c53649e5315b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/em28xx/em28xx-video.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/em28xx/em28xx-video.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/em28xx/em28xx-video.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/em28xx/em28xx-video.c</a></div><div class='hunk'>@@ -513,10 +513,17 @@ static struct videobuf_queue_ops em28xx_video_qops = {</div><div class='ctx'>  */</div><div class='ctx'> static int em28xx_config(struct em28xx *dev)</div><div class='ctx'> {</div><div class='add'>+	int retval;</div><div class='ctx'> </div><div class='ctx'> 	/* Sets I2C speed to 100 KHz */</div><div class='del'>-	if (!dev-&gt;is_em2800)</div><div class='del'>-		em28xx_write_regs_req(dev, 0x00, 0x06, "\x40", 1);</div><div class='add'>+	if (!dev-&gt;is_em2800) {</div><div class='add'>+		retval = em28xx_write_regs_req(dev, 0x00, 0x06, "\x40", 1);</div><div class='add'>+		if (retval &lt; 0) {</div><div class='add'>+			em28xx_errdev("%s: em28xx_write_regs_req failed! retval [%d]\n",</div><div class='add'>+				__func__, retval);</div><div class='add'>+			return retval;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* enable vbi capturing */</div><div class='ctx'> </div><div class='hunk'>@@ -1512,6 +1519,7 @@ static int em28xx_v4l2_open(struct inode *inode, struct file *filp)</div><div class='ctx'> 	struct em28xx_fh *fh;</div><div class='ctx'> 	enum v4l2_buf_type fh_type = 0;</div><div class='ctx'> </div><div class='add'>+	lock_kernel();</div><div class='ctx'> 	list_for_each_entry(h, &amp;em28xx_devlist, devlist) {</div><div class='ctx'> 		if (h-&gt;vdev-&gt;minor == minor) {</div><div class='ctx'> 			dev  = h;</div><div class='hunk'>@@ -1527,8 +1535,10 @@ static int em28xx_v4l2_open(struct inode *inode, struct file *filp)</div><div class='ctx'> 			dev   = h;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	if (NULL == dev)</div><div class='add'>+	if (NULL == dev) {</div><div class='add'>+		unlock_kernel();</div><div class='ctx'> 		return -ENODEV;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	em28xx_videodbg("open minor=%d type=%s users=%d\n",</div><div class='ctx'> 				minor, v4l2_type_names[fh_type], dev-&gt;users);</div><div class='hunk'>@@ -1537,6 +1547,7 @@ static int em28xx_v4l2_open(struct inode *inode, struct file *filp)</div><div class='ctx'> 	fh = kzalloc(sizeof(struct em28xx_fh), GFP_KERNEL);</div><div class='ctx'> 	if (!fh) {</div><div class='ctx'> 		em28xx_errdev("em28xx-video.c: Out of memory?!\n");</div><div class='add'>+		unlock_kernel();</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;lock);</div><div class='hunk'>@@ -1573,6 +1584,7 @@ static int em28xx_v4l2_open(struct inode *inode, struct file *filp)</div><div class='ctx'> 			sizeof(struct em28xx_buffer), fh);</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;lock);</div><div class='add'>+	unlock_kernel();</div><div class='ctx'> </div><div class='ctx'> 	return errCode;</div><div class='ctx'> }</div><div class='hunk'>@@ -1588,8 +1600,7 @@ static void em28xx_release_resources(struct em28xx *dev)</div><div class='ctx'> 	/*FIXME: I2C IR should be disconnected */</div><div class='ctx'> </div><div class='ctx'> 	em28xx_info("V4L2 devices /dev/video%d and /dev/vbi%d deregistered\n",</div><div class='del'>-				dev-&gt;vdev-&gt;minor-MINOR_VFL_TYPE_GRABBER_MIN,</div><div class='del'>-				dev-&gt;vbi_dev-&gt;minor-MINOR_VFL_TYPE_VBI_MIN);</div><div class='add'>+				dev-&gt;vdev-&gt;num, dev-&gt;vbi_dev-&gt;num);</div><div class='ctx'> 	list_del(&amp;dev-&gt;devlist);</div><div class='ctx'> 	if (dev-&gt;sbutton_input_dev)</div><div class='ctx'> 		em28xx_deregister_snapshot_button(dev);</div><div class='hunk'>@@ -1948,13 +1959,23 @@ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* register i2c bus */</div><div class='del'>-	em28xx_i2c_register(dev);</div><div class='add'>+	errCode = em28xx_i2c_register(dev);</div><div class='add'>+	if (errCode &lt; 0) {</div><div class='add'>+		em28xx_errdev("%s: em28xx_i2c_register - errCode [%d]!\n",</div><div class='add'>+			__func__, errCode);</div><div class='add'>+		return errCode;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Do board specific init and eeprom reading */</div><div class='ctx'> 	em28xx_card_setup(dev);</div><div class='ctx'> </div><div class='ctx'> 	/* Configure audio */</div><div class='del'>-	em28xx_audio_analog_set(dev);</div><div class='add'>+	errCode = em28xx_audio_analog_set(dev);</div><div class='add'>+	if (errCode &lt; 0) {</div><div class='add'>+		em28xx_errdev("%s: em28xx_audio_analog_set - errCode [%d]!\n",</div><div class='add'>+			__func__, errCode);</div><div class='add'>+		return errCode;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* configure the device */</div><div class='ctx'> 	em28xx_config_i2c(dev);</div><div class='hunk'>@@ -1974,6 +1995,11 @@ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev,</div><div class='ctx'> 	dev-&gt;ctl_input = 2;</div><div class='ctx'> </div><div class='ctx'> 	errCode = em28xx_config(dev);</div><div class='add'>+	if (errCode &lt; 0) {</div><div class='add'>+		em28xx_errdev("%s: em28xx_config - errCode [%d]!\n",</div><div class='add'>+			__func__, errCode);</div><div class='add'>+		return errCode;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	list_add_tail(&amp;dev-&gt;devlist, &amp;em28xx_devlist);</div><div class='ctx'> </div><div class='hunk'>@@ -2026,17 +2052,27 @@ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev,</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;has_msp34xx) {</div><div class='ctx'> 		/* Send a reset to other chips via gpio */</div><div class='del'>-		em28xx_write_regs_req(dev, 0x00, 0x08, "\xf7", 1);</div><div class='add'>+		errCode = em28xx_write_regs_req(dev, 0x00, 0x08, "\xf7", 1);</div><div class='add'>+		if (errCode &lt; 0) {</div><div class='add'>+			em28xx_errdev("%s: em28xx_write_regs_req - msp34xx(1) failed! errCode [%d]\n",</div><div class='add'>+				__func__, errCode);</div><div class='add'>+			return errCode;</div><div class='add'>+		}</div><div class='ctx'> 		msleep(3);</div><div class='del'>-		em28xx_write_regs_req(dev, 0x00, 0x08, "\xff", 1);</div><div class='add'>+</div><div class='add'>+		errCode = em28xx_write_regs_req(dev, 0x00, 0x08, "\xff", 1);</div><div class='add'>+		if (errCode &lt; 0) {</div><div class='add'>+			em28xx_errdev("%s: em28xx_write_regs_req - msp34xx(2) failed! errCode [%d]\n",</div><div class='add'>+				__func__, errCode);</div><div class='add'>+			return errCode;</div><div class='add'>+		}</div><div class='ctx'> 		msleep(3);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	video_mux(dev, 0);</div><div class='ctx'> </div><div class='ctx'> 	em28xx_info("V4L2 device registered as /dev/video%d and /dev/vbi%d\n",</div><div class='del'>-				dev-&gt;vdev-&gt;minor-MINOR_VFL_TYPE_GRABBER_MIN,</div><div class='del'>-				dev-&gt;vbi_dev-&gt;minor-MINOR_VFL_TYPE_VBI_MIN);</div><div class='add'>+				dev-&gt;vdev-&gt;num, dev-&gt;vbi_dev-&gt;num);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;em28xx_extension_devlist_lock);</div><div class='ctx'> 	if (!list_empty(&amp;em28xx_extension_devlist)) {</div><div class='hunk'>@@ -2236,7 +2272,7 @@ static void em28xx_usb_disconnect(struct usb_interface *interface)</div><div class='ctx'> 		em28xx_warn</div><div class='ctx'> 		    ("device /dev/video%d is open! Deregistration and memory "</div><div class='ctx'> 		     "deallocation are deferred on close.\n",</div><div class='del'>-				dev-&gt;vdev-&gt;minor-MINOR_VFL_TYPE_GRABBER_MIN);</div><div class='add'>+				dev-&gt;vdev-&gt;num);</div><div class='ctx'> </div><div class='ctx'> 		dev-&gt;state |= DEV_MISCONFIGURED;</div><div class='ctx'> 		em28xx_uninit_isoc(dev);</div><div class='head'>diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h<br/>index 9a3310748685..82781178e0a3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/em28xx/em28xx.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/em28xx/em28xx.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/em28xx/em28xx.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/em28xx/em28xx.h</a></div><div class='hunk'>@@ -411,8 +411,8 @@ struct em28xx {</div><div class='ctx'> 	/* frame properties */</div><div class='ctx'> 	int width;		/* current frame width */</div><div class='ctx'> 	int height;		/* current frame height */</div><div class='del'>-	int hscale;		/* horizontal scale factor (see datasheet) */</div><div class='del'>-	int vscale;		/* vertical scale factor (see datasheet) */</div><div class='add'>+	unsigned hscale;	/* horizontal scale factor (see datasheet) */</div><div class='add'>+	unsigned vscale;	/* vertical scale factor (see datasheet) */</div><div class='ctx'> 	int interlaced;		/* 1=interlace fileds, 0=just top fileds */</div><div class='ctx'> 	unsigned int video_bytesread;	/* Number of bytes read */</div><div class='ctx'> </div><div class='hunk'>@@ -528,7 +528,7 @@ extern struct em28xx_board em28xx_boards[];</div><div class='ctx'> extern struct usb_device_id em28xx_id_table[];</div><div class='ctx'> extern const unsigned int em28xx_bcount;</div><div class='ctx'> void em28xx_set_ir(struct em28xx *dev, struct IR_i2c *ir);</div><div class='del'>-int em28xx_tuner_callback(void *ptr, int command, int arg);</div><div class='add'>+int em28xx_tuner_callback(void *ptr, int component, int command, int arg);</div><div class='ctx'> </div><div class='ctx'> /* Provided by em28xx-input.c */</div><div class='ctx'> /* TODO: Check if the standard get_key handlers on ir-common can be used */</div><div class='head'>diff --git a/drivers/media/video/et61x251/et61x251_core.c b/drivers/media/video/et61x251/et61x251_core.c<br/>index 8db2a05bf9c5..7a85c41b0eea 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/et61x251/et61x251_core.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/et61x251/et61x251_core.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/et61x251/et61x251_core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/et61x251/et61x251_core.c</a></div><div class='hunk'>@@ -1214,7 +1214,7 @@ static int et61x251_open(struct inode* inode, struct file* filp)</div><div class='ctx'> 	if (!down_read_trylock(&amp;et61x251_dev_lock))</div><div class='ctx'> 		return -ERESTARTSYS;</div><div class='ctx'> </div><div class='del'>-	cam = video_get_drvdata(video_devdata(filp));</div><div class='add'>+	cam = video_drvdata(filp);</div><div class='ctx'> </div><div class='ctx'> 	if (wait_for_completion_interruptible(&amp;cam-&gt;probe)) {</div><div class='ctx'> 		up_read(&amp;et61x251_dev_lock);</div><div class='hunk'>@@ -1297,7 +1297,7 @@ static int et61x251_release(struct inode* inode, struct file* filp)</div><div class='ctx'> </div><div class='ctx'> 	down_write(&amp;et61x251_dev_lock);</div><div class='ctx'> </div><div class='del'>-	cam = video_get_drvdata(video_devdata(filp));</div><div class='add'>+	cam = video_drvdata(filp);</div><div class='ctx'> </div><div class='ctx'> 	et61x251_stop_transfer(cam);</div><div class='ctx'> 	et61x251_release_buffers(cam);</div><div class='hunk'>@@ -1318,7 +1318,7 @@ static ssize_t</div><div class='ctx'> et61x251_read(struct file* filp, char __user * buf,</div><div class='ctx'> 	      size_t count, loff_t* f_pos)</div><div class='ctx'> {</div><div class='del'>-	struct et61x251_device* cam = video_get_drvdata(video_devdata(filp));</div><div class='add'>+	struct et61x251_device *cam = video_drvdata(filp);</div><div class='ctx'> 	struct et61x251_frame_t* f, * i;</div><div class='ctx'> 	unsigned long lock_flags;</div><div class='ctx'> 	long timeout;</div><div class='hunk'>@@ -1426,7 +1426,7 @@ exit:</div><div class='ctx'> </div><div class='ctx'> static unsigned int et61x251_poll(struct file *filp, poll_table *wait)</div><div class='ctx'> {</div><div class='del'>-	struct et61x251_device* cam = video_get_drvdata(video_devdata(filp));</div><div class='add'>+	struct et61x251_device *cam = video_drvdata(filp);</div><div class='ctx'> 	struct et61x251_frame_t* f;</div><div class='ctx'> 	unsigned long lock_flags;</div><div class='ctx'> 	unsigned int mask = 0;</div><div class='hunk'>@@ -1502,7 +1502,7 @@ static struct vm_operations_struct et61x251_vm_ops = {</div><div class='ctx'> </div><div class='ctx'> static int et61x251_mmap(struct file* filp, struct vm_area_struct *vma)</div><div class='ctx'> {</div><div class='del'>-	struct et61x251_device* cam = video_get_drvdata(video_devdata(filp));</div><div class='add'>+	struct et61x251_device *cam = video_drvdata(filp);</div><div class='ctx'> 	unsigned long size = vma-&gt;vm_end - vma-&gt;vm_start,</div><div class='ctx'> 		      start = vma-&gt;vm_start;</div><div class='ctx'> 	void *pos;</div><div class='hunk'>@@ -2395,7 +2395,7 @@ et61x251_vidioc_s_parm(struct et61x251_device* cam, void __user * arg)</div><div class='ctx'> static int et61x251_ioctl_v4l2(struct inode* inode, struct file* filp,</div><div class='ctx'> 			       unsigned int cmd, void __user * arg)</div><div class='ctx'> {</div><div class='del'>-	struct et61x251_device* cam = video_get_drvdata(video_devdata(filp));</div><div class='add'>+	struct et61x251_device *cam = video_drvdata(filp);</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> </div><div class='hunk'>@@ -2490,7 +2490,7 @@ static int et61x251_ioctl_v4l2(struct inode* inode, struct file* filp,</div><div class='ctx'> static int et61x251_ioctl(struct inode* inode, struct file* filp,</div><div class='ctx'> 			 unsigned int cmd, unsigned long arg)</div><div class='ctx'> {</div><div class='del'>-	struct et61x251_device* cam = video_get_drvdata(video_devdata(filp));</div><div class='add'>+	struct et61x251_device *cam = video_drvdata(filp);</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (mutex_lock_interruptible(&amp;cam-&gt;fileop_mutex))</div><div class='head'>diff --git a/drivers/media/video/gspca/Kconfig b/drivers/media/video/gspca/Kconfig<br/>index 42b90742b40b..4d0817471c9f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/gspca/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/gspca/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/gspca/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/Kconfig</a></div><div class='hunk'>@@ -1,13 +1,212 @@</div><div class='del'>-config USB_GSPCA</div><div class='del'>-	tristate "USB GSPCA driver"</div><div class='add'>+menuconfig USB_GSPCA</div><div class='add'>+	tristate "GSPCA based webcams"</div><div class='ctx'> 	depends on VIDEO_V4L2</div><div class='add'>+	default m</div><div class='ctx'> 	---help---</div><div class='del'>-	  Say Y here if you want support for various USB webcams.</div><div class='add'>+	Say Y here if you want to enable selecting webcams based</div><div class='add'>+	on the GSPCA framework.</div><div class='ctx'> </div><div class='del'>-	  See &lt;file:Documentation/video4linux/gspca.txt&gt; for more info.</div><div class='add'>+	See &lt;file:Documentation/video4linux/gspca.txt&gt; for more info.</div><div class='ctx'> </div><div class='del'>-	  This driver uses the Video For Linux API. You must say Y or M to</div><div class='del'>-	  "Video For Linux" to use this driver.</div><div class='add'>+	This driver uses the Video For Linux API. You must say Y or M to</div><div class='add'>+	"Video For Linux" to use this driver.</div><div class='ctx'> </div><div class='del'>-	  To compile this driver as modules, choose M here: the</div><div class='del'>-	  modules will be called gspca_xxxx.</div><div class='add'>+	To compile this driver as modules, choose M here: the</div><div class='add'>+	modules will be called gspca_main.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+if USB_GSPCA &amp;&amp; VIDEO_V4L2</div><div class='add'>+</div><div class='add'>+source "drivers/media/video/gspca/m5602/Kconfig"</div><div class='add'>+</div><div class='add'>+config USB_GSPCA_CONEX</div><div class='add'>+	tristate "Conexant Camera Driver"</div><div class='add'>+	depends on VIDEO_V4L2 &amp;&amp; USB_GSPCA</div><div class='add'>+	help</div><div class='add'>+	Say Y here if you want support for cameras based on the Conexant chip.</div><div class='add'>+</div><div class='add'>+	To compile this driver as a module, choose M here: the</div><div class='add'>+	module will be called gspca_conex.</div><div class='add'>+</div><div class='add'>+config USB_GSPCA_ETOMS</div><div class='add'>+	tristate "Etoms USB Camera Driver"</div><div class='add'>+	depends on VIDEO_V4L2 &amp;&amp; USB_GSPCA</div><div class='add'>+	help</div><div class='add'>+	Say Y here if you want support for cameras based on the Etoms chip.</div><div class='add'>+</div><div class='add'>+	To compile this driver as a module, choose M here: the</div><div class='add'>+	module will be called gspca_etoms.</div><div class='add'>+</div><div class='add'>+config USB_GSPCA_FINEPIX</div><div class='add'>+	tristate "Fujifilm FinePix USB V4L2 driver"</div><div class='add'>+	depends on VIDEO_V4L2 &amp;&amp; USB_GSPCA</div><div class='add'>+	help</div><div class='add'>+	Say Y here if you want support for cameras based on the FinePix chip.</div><div class='add'>+</div><div class='add'>+	To compile this driver as a module, choose M here: the</div><div class='add'>+	module will be called gspca_finepix.</div><div class='add'>+</div><div class='add'>+config USB_GSPCA_MARS</div><div class='add'>+	tristate "Mars USB Camera Driver"</div><div class='add'>+	depends on VIDEO_V4L2 &amp;&amp; USB_GSPCA</div><div class='add'>+	help</div><div class='add'>+	Say Y here if you want support for cameras based on the Mars chip.</div><div class='add'>+</div><div class='add'>+	To compile this driver as a module, choose M here: the</div><div class='add'>+	module will be called gspca_mars.</div><div class='add'>+</div><div class='add'>+config USB_GSPCA_OV519</div><div class='add'>+	tristate "OV519 USB Camera Driver"</div><div class='add'>+	depends on VIDEO_V4L2 &amp;&amp; USB_GSPCA</div><div class='add'>+	help</div><div class='add'>+	Say Y here if you want support for cameras based on the OV519 chip.</div><div class='add'>+</div><div class='add'>+	To compile this driver as a module, choose M here: the</div><div class='add'>+	module will be called gspca_ov519.</div><div class='add'>+</div><div class='add'>+config USB_GSPCA_PAC207</div><div class='add'>+	tristate "Pixart PAC207 USB Camera Driver"</div><div class='add'>+	depends on VIDEO_V4L2 &amp;&amp; USB_GSPCA</div><div class='add'>+	help</div><div class='add'>+	Say Y here if you want support for cameras based on the PAC207 chip.</div><div class='add'>+</div><div class='add'>+	To compile this driver as a module, choose M here: the</div><div class='add'>+	module will be called gspca_pac207.</div><div class='add'>+</div><div class='add'>+config USB_GSPCA_PAC7311</div><div class='add'>+	tristate "Pixart PAC7311 USB Camera Driver"</div><div class='add'>+	depends on VIDEO_V4L2 &amp;&amp; USB_GSPCA</div><div class='add'>+	help</div><div class='add'>+	Say Y here if you want support for cameras based on the PAC7311 chip.</div><div class='add'>+</div><div class='add'>+	To compile this driver as a module, choose M here: the</div><div class='add'>+	module will be called gspca_pac7311.</div><div class='add'>+</div><div class='add'>+config USB_GSPCA_SONIXB</div><div class='add'>+	tristate "SN9C102 USB Camera Driver"</div><div class='add'>+	depends on VIDEO_V4L2 &amp;&amp; USB_GSPCA</div><div class='add'>+	help</div><div class='add'>+	Say Y here if you want support for cameras based on the SONIXB chip.</div><div class='add'>+</div><div class='add'>+	To compile this driver as a module, choose M here: the</div><div class='add'>+	module will be called gspca_sonixb.</div><div class='add'>+</div><div class='add'>+config USB_GSPCA_SONIXJ</div><div class='add'>+	tristate "SONIX JPEG USB Camera Driver"</div><div class='add'>+	depends on VIDEO_V4L2 &amp;&amp; USB_GSPCA</div><div class='add'>+	help</div><div class='add'>+	Say Y here if you want support for cameras based on the SONIXJ chip.</div><div class='add'>+</div><div class='add'>+	To compile this driver as a module, choose M here: the</div><div class='add'>+	module will be called gspca_sonixj</div><div class='add'>+</div><div class='add'>+config USB_GSPCA_SPCA500</div><div class='add'>+	tristate "SPCA500 USB Camera Driver"</div><div class='add'>+	depends on VIDEO_V4L2 &amp;&amp; USB_GSPCA</div><div class='add'>+	help</div><div class='add'>+	Say Y here if you want support for cameras based on the SPCA500 chip.</div><div class='add'>+</div><div class='add'>+	To compile this driver as a module, choose M here: the</div><div class='add'>+	module will be called gspca_spca500.</div><div class='add'>+</div><div class='add'>+config USB_GSPCA_SPCA501</div><div class='add'>+	tristate "SPCA501 USB Camera Driver"</div><div class='add'>+	depends on VIDEO_V4L2 &amp;&amp; USB_GSPCA</div><div class='add'>+	help</div><div class='add'>+	Say Y here if you want support for cameras based on the SPCA501 chip.</div><div class='add'>+</div><div class='add'>+	To compile this driver as a module, choose M here: the</div><div class='add'>+	module will be called gspca_spca501.</div><div class='add'>+</div><div class='add'>+config USB_GSPCA_SPCA505</div><div class='add'>+	tristate "SPCA505 USB Camera Driver"</div><div class='add'>+	depends on VIDEO_V4L2 &amp;&amp; USB_GSPCA</div><div class='add'>+	help</div><div class='add'>+	Say Y here if you want support for cameras based on the SPCA505 chip.</div><div class='add'>+</div><div class='add'>+	To compile this driver as a module, choose M here: the</div><div class='add'>+	module will be called gspca_spca505.</div><div class='add'>+</div><div class='add'>+config USB_GSPCA_SPCA506</div><div class='add'>+	tristate "SPCA506 USB Camera Driver"</div><div class='add'>+	depends on VIDEO_V4L2 &amp;&amp; USB_GSPCA</div><div class='add'>+	help</div><div class='add'>+	Say Y here if you want support for cameras based on the SPCA506 chip.</div><div class='add'>+</div><div class='add'>+	To compile this driver as a module, choose M here: the</div><div class='add'>+	module will be called gspca_spca506.</div><div class='add'>+</div><div class='add'>+config USB_GSPCA_SPCA508</div><div class='add'>+	tristate "SPCA508 USB Camera Driver"</div><div class='add'>+	depends on VIDEO_V4L2 &amp;&amp; USB_GSPCA</div><div class='add'>+	help</div><div class='add'>+	Say Y here if you want support for cameras based on the SPCA508 chip.</div><div class='add'>+</div><div class='add'>+	To compile this driver as a module, choose M here: the</div><div class='add'>+	module will be called gspca_spca508.</div><div class='add'>+</div><div class='add'>+config USB_GSPCA_SPCA561</div><div class='add'>+	tristate "SPCA561 USB Camera Driver"</div><div class='add'>+	depends on VIDEO_V4L2 &amp;&amp; USB_GSPCA</div><div class='add'>+	help</div><div class='add'>+	Say Y here if you want support for cameras based on the SPCA561 chip.</div><div class='add'>+</div><div class='add'>+	To compile this driver as a module, choose M here: the</div><div class='add'>+	module will be called gspca_spca561.</div><div class='add'>+</div><div class='add'>+config USB_GSPCA_STK014</div><div class='add'>+	tristate "Syntek DV4000 (STK014) USB Camera Driver"</div><div class='add'>+	depends on VIDEO_V4L2 &amp;&amp; USB_GSPCA</div><div class='add'>+	help</div><div class='add'>+	Say Y here if you want support for cameras based on the STK014 chip.</div><div class='add'>+</div><div class='add'>+	To compile this driver as a module, choose M here: the</div><div class='add'>+	module will be called gspca_stk014.</div><div class='add'>+</div><div class='add'>+config USB_GSPCA_SUNPLUS</div><div class='add'>+	tristate "SUNPLUS USB Camera Driver"</div><div class='add'>+	depends on VIDEO_V4L2 &amp;&amp; USB_GSPCA</div><div class='add'>+	help</div><div class='add'>+	Say Y here if you want support for cameras based on the Sunplus</div><div class='add'>+	SPCA504(abc) SPCA533 SPCA536 chips.</div><div class='add'>+</div><div class='add'>+	To compile this driver as a module, choose M here: the</div><div class='add'>+	module will be called gspca_spca5xx.</div><div class='add'>+</div><div class='add'>+config USB_GSPCA_T613</div><div class='add'>+	tristate "T613 (JPEG Compliance) USB Camera Driver"</div><div class='add'>+	depends on VIDEO_V4L2 &amp;&amp; USB_GSPCA</div><div class='add'>+	help</div><div class='add'>+	Say Y here if you want support for cameras based on the T613 chip.</div><div class='add'>+</div><div class='add'>+	To compile this driver as a module, choose M here: the</div><div class='add'>+	module will be called gspca_t613.</div><div class='add'>+</div><div class='add'>+config USB_GSPCA_TV8532</div><div class='add'>+	tristate "TV8532 USB Camera Driver"</div><div class='add'>+	depends on VIDEO_V4L2 &amp;&amp; USB_GSPCA</div><div class='add'>+	help</div><div class='add'>+	Say Y here if you want support for cameras based on the TV8531 chip.</div><div class='add'>+</div><div class='add'>+	To compile this driver as a module, choose M here: the</div><div class='add'>+	module will be called gspca_tv8532.</div><div class='add'>+</div><div class='add'>+config USB_GSPCA_VC032X</div><div class='add'>+	tristate "VC032X USB Camera Driver"</div><div class='add'>+	depends on VIDEO_V4L2 &amp;&amp; USB_GSPCA</div><div class='add'>+	help</div><div class='add'>+	Say Y here if you want support for cameras based on the VC032X chip.</div><div class='add'>+</div><div class='add'>+	To compile this driver as a module, choose M here: the</div><div class='add'>+	module will be called gspca_vc032x.</div><div class='add'>+</div><div class='add'>+config USB_GSPCA_ZC3XX</div><div class='add'>+	tristate "VC3xx USB Camera Driver"</div><div class='add'>+	depends on VIDEO_V4L2 &amp;&amp; USB_GSPCA</div><div class='add'>+	help</div><div class='add'>+	Say Y here if you want support for cameras based on the ZC3XX chip.</div><div class='add'>+</div><div class='add'>+	To compile this driver as a module, choose M here: the</div><div class='add'>+	module will be called gspca_zc3xx.</div><div class='add'>+</div><div class='add'>+endif</div><div class='head'>diff --git a/drivers/media/video/gspca/Makefile b/drivers/media/video/gspca/Makefile<br/>index e68a8965297a..22734f5a6c32 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/gspca/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/gspca/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/gspca/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/Makefile</a></div><div class='hunk'>@@ -1,29 +1,48 @@</div><div class='del'>-obj-$(CONFIG_USB_GSPCA)	+= gspca_main.o \</div><div class='del'>-	gspca_conex.o gspca_etoms.o gspca_mars.o \</div><div class='del'>-	gspca_ov519.o gspca_pac207.o gspca_pac7311.o \</div><div class='del'>-	gspca_sonixb.o gspca_sonixj.o gspca_spca500.o gspca_spca501.o \</div><div class='del'>-	gspca_spca505.o gspca_spca506.o gspca_spca508.o gspca_spca561.o \</div><div class='del'>-	gspca_sunplus.o gspca_stk014.o gspca_t613.o gspca_tv8532.o \</div><div class='del'>-	gspca_vc032x.o gspca_zc3xx.o</div><div class='add'>+obj-$(CONFIG_USB_GSPCA)		+= gspca_main.o</div><div class='add'>+obj-$(CONFIG_USB_GSPCA_CONEX)	+= gspca_conex.o</div><div class='add'>+obj-$(CONFIG_USB_GSPCA_ETOMS)	+= gspca_etoms.o</div><div class='add'>+obj-$(CONFIG_USB_GSPCA_FINEPIX)	+= gspca_finepix.o</div><div class='add'>+obj-$(CONFIG_USB_GSPCA_MARS)	+= gspca_mars.o</div><div class='add'>+obj-$(CONFIG_USB_GSPCA_OV519)	+= gspca_ov519.o</div><div class='add'>+obj-$(CONFIG_USB_GSPCA_PAC207)	+= gspca_pac207.o</div><div class='add'>+obj-$(CONFIG_USB_GSPCA_PAC7311) += gspca_pac7311.o</div><div class='add'>+obj-$(CONFIG_USB_GSPCA_SONIXB)	+= gspca_sonixb.o</div><div class='add'>+obj-$(CONFIG_USB_GSPCA_SONIXJ)	+= gspca_sonixj.o</div><div class='add'>+obj-$(CONFIG_USB_GSPCA_SPCA500) += gspca_spca500.o</div><div class='add'>+obj-$(CONFIG_USB_GSPCA_SPCA501) += gspca_spca501.o</div><div class='add'>+obj-$(CONFIG_USB_GSPCA_SPCA505) += gspca_spca505.o</div><div class='add'>+obj-$(CONFIG_USB_GSPCA_SPCA506) += gspca_spca506.o</div><div class='add'>+obj-$(CONFIG_USB_GSPCA_SPCA508) += gspca_spca508.o</div><div class='add'>+obj-$(CONFIG_USB_GSPCA_SPCA561) += gspca_spca561.o</div><div class='add'>+obj-$(CONFIG_USB_GSPCA_SUNPLUS) += gspca_sunplus.o</div><div class='add'>+obj-$(CONFIG_USB_GSPCA_STK014)	+= gspca_stk014.o</div><div class='add'>+obj-$(CONFIG_USB_GSPCA_T613)	+= gspca_t613.o</div><div class='add'>+obj-$(CONFIG_USB_GSPCA_TV8532)	+= gspca_tv8532.o</div><div class='add'>+obj-$(CONFIG_USB_GSPCA_VC032X)	+= gspca_vc032x.o</div><div class='add'>+obj-$(CONFIG_USB_GSPCA_ZC3XX)	+= gspca_zc3xx.o</div><div class='add'>+</div><div class='add'>+gspca_main-objs			:= gspca.o</div><div class='add'>+gspca_conex-objs		:= conex.o</div><div class='add'>+gspca_etoms-objs		:= etoms.o</div><div class='add'>+gspca_finepix-objs		:= finepix.o</div><div class='add'>+gspca_mars-objs			:= mars.o</div><div class='add'>+gspca_ov519-objs		:= ov519.o</div><div class='add'>+gspca_pac207-objs		:= pac207.o</div><div class='add'>+gspca_pac7311-objs		:= pac7311.o</div><div class='add'>+gspca_sonixb-objs		:= sonixb.o</div><div class='add'>+gspca_sonixj-objs		:= sonixj.o</div><div class='add'>+gspca_spca500-objs		:= spca500.o</div><div class='add'>+gspca_spca501-objs		:= spca501.o</div><div class='add'>+gspca_spca505-objs		:= spca505.o</div><div class='add'>+gspca_spca506-objs		:= spca506.o</div><div class='add'>+gspca_spca508-objs		:= spca508.o</div><div class='add'>+gspca_spca561-objs		:= spca561.o</div><div class='add'>+gspca_stk014-objs		:= stk014.o</div><div class='add'>+gspca_sunplus-objs		:= sunplus.o</div><div class='add'>+gspca_t613-objs			:= t613.o</div><div class='add'>+gspca_tv8532-objs		:= tv8532.o</div><div class='add'>+gspca_vc032x-objs		:= vc032x.o</div><div class='add'>+gspca_zc3xx-objs		:= zc3xx.o</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_USB_M5602)		+= m5602/</div><div class='ctx'> </div><div class='del'>-gspca_main-objs := gspca.o</div><div class='del'>-gspca_conex-objs := conex.o</div><div class='del'>-gspca_etoms-objs := etoms.o</div><div class='del'>-gspca_mars-objs := mars.o</div><div class='del'>-gspca_ov519-objs := ov519.o</div><div class='del'>-gspca_pac207-objs := pac207.o</div><div class='del'>-gspca_pac7311-objs := pac7311.o</div><div class='del'>-gspca_sonixb-objs := sonixb.o</div><div class='del'>-gspca_sonixj-objs := sonixj.o</div><div class='del'>-gspca_spca500-objs := spca500.o</div><div class='del'>-gspca_spca501-objs := spca501.o</div><div class='del'>-gspca_spca505-objs := spca505.o</div><div class='del'>-gspca_spca506-objs := spca506.o</div><div class='del'>-gspca_spca508-objs := spca508.o</div><div class='del'>-gspca_spca561-objs := spca561.o</div><div class='del'>-gspca_stk014-objs := stk014.o</div><div class='del'>-gspca_sunplus-objs := sunplus.o</div><div class='del'>-gspca_t613-objs := t613.o</div><div class='del'>-gspca_tv8532-objs := tv8532.o</div><div class='del'>-gspca_vc032x-objs := vc032x.o</div><div class='del'>-gspca_zc3xx-objs := zc3xx.o</div><div class='head'>diff --git a/drivers/media/video/gspca/conex.c b/drivers/media/video/gspca/conex.c<br/>index 4d9f4cc255a9..a9d51ba7c57c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/gspca/conex.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/gspca/conex.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/gspca/conex.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/conex.c</a></div><div class='hunk'>@@ -837,12 +837,13 @@ static int sd_init(struct gspca_dev *gspca_dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void sd_start(struct gspca_dev *gspca_dev)</div><div class='add'>+static int sd_start(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='ctx'> 	cx11646_initsize(gspca_dev);</div><div class='ctx'> 	cx11646_fw(gspca_dev);</div><div class='ctx'> 	cx_sensor(gspca_dev);</div><div class='ctx'> 	cx11646_jpeg(gspca_dev);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sd_stop0(struct gspca_dev *gspca_dev)</div><div class='head'>diff --git a/drivers/media/video/gspca/etoms.c b/drivers/media/video/gspca/etoms.c<br/>index 4ff0e386914b..3be30b420a26 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/gspca/etoms.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/gspca/etoms.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/gspca/etoms.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/etoms.c</a></div><div class='hunk'>@@ -691,7 +691,7 @@ static int sd_init(struct gspca_dev *gspca_dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* -- start the camera -- */</div><div class='del'>-static void sd_start(struct gspca_dev *gspca_dev)</div><div class='add'>+static int sd_start(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct sd *sd = (struct sd *) gspca_dev;</div><div class='ctx'> </div><div class='hunk'>@@ -704,6 +704,7 @@ static void sd_start(struct gspca_dev *gspca_dev)</div><div class='ctx'> </div><div class='ctx'> 	reg_w_val(gspca_dev, ET_RESET_ALL, 0x08);</div><div class='ctx'> 	et_video(gspca_dev, 1);		/* video on */</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sd_stopN(struct gspca_dev *gspca_dev)</div><div class='head'>diff --git a/drivers/media/video/gspca/finepix.c b/drivers/media/video/gspca/finepix.c<br/>new file mode 100644<br/>index 000000000000..65d3cbfe6b27<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/gspca/finepix.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/finepix.c</a></div><div class='hunk'>@@ -0,0 +1,466 @@</div><div class='add'>+/*</div><div class='add'>+ * Fujifilm Finepix subdriver</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2008 Frank Zago</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define MODULE_NAME "finepix"</div><div class='add'>+</div><div class='add'>+#include "gspca.h"</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Frank Zago &lt;frank@zago.net&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Fujifilm FinePix USB V4L2 driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='add'>+/* Default timeout, in ms */</div><div class='add'>+#define FPIX_TIMEOUT (HZ / 10)</div><div class='add'>+</div><div class='add'>+/* Maximum transfer size to use. The windows driver reads by chunks of</div><div class='add'>+ * 0x2000 bytes, so do the same. Note: reading more seems to work</div><div class='add'>+ * too. */</div><div class='add'>+#define FPIX_MAX_TRANSFER 0x2000</div><div class='add'>+</div><div class='add'>+/* Structure to hold all of our device specific stuff */</div><div class='add'>+struct usb_fpix {</div><div class='add'>+	struct gspca_dev gspca_dev;	/* !! must be the first item */</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * USB stuff</div><div class='add'>+	 */</div><div class='add'>+	struct usb_ctrlrequest ctrlreq;</div><div class='add'>+	struct urb *control_urb;</div><div class='add'>+	struct timer_list bulk_timer;</div><div class='add'>+</div><div class='add'>+	enum {</div><div class='add'>+		FPIX_NOP,	/* inactive, else streaming */</div><div class='add'>+		FPIX_RESET,	/* must reset */</div><div class='add'>+		FPIX_REQ_FRAME,	/* requesting a frame */</div><div class='add'>+		FPIX_READ_FRAME,	/* reading frame */</div><div class='add'>+	} state;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Driver stuff</div><div class='add'>+	 */</div><div class='add'>+	struct delayed_work wqe;</div><div class='add'>+	struct completion can_close;</div><div class='add'>+	int streaming;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Delay after which claim the next frame. If the delay is too small,</div><div class='add'>+ * the camera will return old frames. On the 4800Z, 20ms is bad, 25ms</div><div class='add'>+ * will fail every 4 or 5 frames, but 30ms is perfect. */</div><div class='add'>+#define NEXT_FRAME_DELAY  (((HZ * 30) + 999) / 1000)</div><div class='add'>+</div><div class='add'>+#define dev_new_state(new_state) {				\</div><div class='add'>+		PDEBUG(D_STREAM, "new state from %d to %d at %s:%d",	\</div><div class='add'>+			dev-&gt;state, new_state, __func__, __LINE__);	\</div><div class='add'>+		dev-&gt;state = new_state;					\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* These cameras only support 320x200. */</div><div class='add'>+static struct v4l2_pix_format fpix_mode[1] = {</div><div class='add'>+	{ 320, 240, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,</div><div class='add'>+		.bytesperline = 320,</div><div class='add'>+		.sizeimage = 320 * 240 * 3 / 8 + 590,</div><div class='add'>+		.colorspace = V4L2_COLORSPACE_SRGB,</div><div class='add'>+		.priv = 0}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Reads part of a frame */</div><div class='add'>+static void read_frame_part(struct usb_fpix *dev)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	PDEBUG(D_STREAM, "read_frame_part");</div><div class='add'>+</div><div class='add'>+	/* Reads part of a frame */</div><div class='add'>+	ret = usb_submit_urb(dev-&gt;gspca_dev.urb[0], GFP_ATOMIC);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_new_state(FPIX_RESET);</div><div class='add'>+		schedule_delayed_work(&amp;dev-&gt;wqe, 1);</div><div class='add'>+		PDEBUG(D_STREAM, "usb_submit_urb failed with %d",</div><div class='add'>+			ret);</div><div class='add'>+	} else {</div><div class='add'>+		/* Sometimes we never get a callback, so use a timer.</div><div class='add'>+		 * Is this masking a bug somewhere else? */</div><div class='add'>+		dev-&gt;bulk_timer.expires = jiffies + msecs_to_jiffies(150);</div><div class='add'>+		add_timer(&amp;dev-&gt;bulk_timer);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Callback for URBs. */</div><div class='add'>+static void urb_callback(struct urb *urb)</div><div class='add'>+{</div><div class='add'>+	struct gspca_dev *gspca_dev = urb-&gt;context;</div><div class='add'>+	struct usb_fpix *dev = (struct usb_fpix *) gspca_dev;</div><div class='add'>+</div><div class='add'>+	PDEBUG(D_PACK,</div><div class='add'>+		"enter urb_callback - status=%d, length=%d",</div><div class='add'>+		urb-&gt;status, urb-&gt;actual_length);</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;state == FPIX_READ_FRAME)</div><div class='add'>+		del_timer(&amp;dev-&gt;bulk_timer);</div><div class='add'>+</div><div class='add'>+	if (urb-&gt;status != 0) {</div><div class='add'>+		/* We kill a stuck urb every 50 frames on average, so don't</div><div class='add'>+		 * display a log message for that. */</div><div class='add'>+		if (urb-&gt;status != -ECONNRESET)</div><div class='add'>+			PDEBUG(D_STREAM, "bad URB status %d", urb-&gt;status);</div><div class='add'>+		dev_new_state(FPIX_RESET);</div><div class='add'>+		schedule_delayed_work(&amp;dev-&gt;wqe, 1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (dev-&gt;state) {</div><div class='add'>+	case FPIX_REQ_FRAME:</div><div class='add'>+		dev_new_state(FPIX_READ_FRAME);</div><div class='add'>+		read_frame_part(dev);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case FPIX_READ_FRAME: {</div><div class='add'>+		unsigned char *data = urb-&gt;transfer_buffer;</div><div class='add'>+		struct gspca_frame *frame;</div><div class='add'>+</div><div class='add'>+		frame = gspca_get_i_frame(&amp;dev-&gt;gspca_dev);</div><div class='add'>+		if (frame == NULL)</div><div class='add'>+			gspca_dev-&gt;last_packet_type = DISCARD_PACKET;</div><div class='add'>+		if (urb-&gt;actual_length &lt; FPIX_MAX_TRANSFER ||</div><div class='add'>+			(data[urb-&gt;actual_length-2] == 0xff &amp;&amp;</div><div class='add'>+				data[urb-&gt;actual_length-1] == 0xd9)) {</div><div class='add'>+</div><div class='add'>+			/* If the result is less than what was asked</div><div class='add'>+			 * for, then it's the end of the</div><div class='add'>+			 * frame. Sometime the jpeg is not complete,</div><div class='add'>+			 * but there's nothing we can do. We also end</div><div class='add'>+			 * here if the the jpeg ends right at the end</div><div class='add'>+			 * of the frame. */</div><div class='add'>+			if (frame)</div><div class='add'>+				gspca_frame_add(gspca_dev, LAST_PACKET,</div><div class='add'>+						frame,</div><div class='add'>+						data, urb-&gt;actual_length);</div><div class='add'>+			dev_new_state(FPIX_REQ_FRAME);</div><div class='add'>+			schedule_delayed_work(&amp;dev-&gt;wqe, NEXT_FRAME_DELAY);</div><div class='add'>+		} else {</div><div class='add'>+</div><div class='add'>+			/* got a partial image */</div><div class='add'>+			if (frame)</div><div class='add'>+				gspca_frame_add(gspca_dev,</div><div class='add'>+						gspca_dev-&gt;last_packet_type</div><div class='add'>+								== LAST_PACKET</div><div class='add'>+						? FIRST_PACKET : INTER_PACKET,</div><div class='add'>+						frame,</div><div class='add'>+					data, urb-&gt;actual_length);</div><div class='add'>+			read_frame_part(dev);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	    }</div><div class='add'>+</div><div class='add'>+	case FPIX_NOP:</div><div class='add'>+	case FPIX_RESET:</div><div class='add'>+		PDEBUG(D_STREAM, "invalid state %d", dev-&gt;state);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Request a new frame */</div><div class='add'>+static void request_frame(struct usb_fpix *dev)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct gspca_dev *gspca_dev = &amp;dev-&gt;gspca_dev;</div><div class='add'>+</div><div class='add'>+	/* Setup command packet */</div><div class='add'>+	memset(gspca_dev-&gt;usb_buf, 0, 12);</div><div class='add'>+	gspca_dev-&gt;usb_buf[0] = 0xd3;</div><div class='add'>+	gspca_dev-&gt;usb_buf[7] = 0x01;</div><div class='add'>+</div><div class='add'>+	/* Request a frame */</div><div class='add'>+	dev-&gt;ctrlreq.bRequestType =</div><div class='add'>+		USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE;</div><div class='add'>+	dev-&gt;ctrlreq.bRequest = USB_REQ_GET_STATUS;</div><div class='add'>+	dev-&gt;ctrlreq.wValue = 0;</div><div class='add'>+	dev-&gt;ctrlreq.wIndex = 0;</div><div class='add'>+	dev-&gt;ctrlreq.wLength = cpu_to_le16(12);</div><div class='add'>+</div><div class='add'>+	usb_fill_control_urb(dev-&gt;control_urb,</div><div class='add'>+			     gspca_dev-&gt;dev,</div><div class='add'>+			     usb_sndctrlpipe(gspca_dev-&gt;dev, 0),</div><div class='add'>+			     (unsigned char *) &amp;dev-&gt;ctrlreq,</div><div class='add'>+			     gspca_dev-&gt;usb_buf,</div><div class='add'>+			     12, urb_callback, gspca_dev);</div><div class='add'>+</div><div class='add'>+	ret = usb_submit_urb(dev-&gt;control_urb, GFP_ATOMIC);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_new_state(FPIX_RESET);</div><div class='add'>+		schedule_delayed_work(&amp;dev-&gt;wqe, 1);</div><div class='add'>+		PDEBUG(D_STREAM, "usb_submit_urb failed with %d", ret);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*--------------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+/* State machine. */</div><div class='add'>+static void fpix_sm(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct usb_fpix *dev = container_of(work, struct usb_fpix, wqe.work);</div><div class='add'>+</div><div class='add'>+	PDEBUG(D_STREAM, "fpix_sm state %d", dev-&gt;state);</div><div class='add'>+</div><div class='add'>+	/* verify that the device wasn't unplugged */</div><div class='add'>+	if (!dev-&gt;gspca_dev.present) {</div><div class='add'>+		PDEBUG(D_STREAM, "device is gone");</div><div class='add'>+		dev_new_state(FPIX_NOP);</div><div class='add'>+		complete(&amp;dev-&gt;can_close);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!dev-&gt;streaming) {</div><div class='add'>+		PDEBUG(D_STREAM, "stopping state machine");</div><div class='add'>+		dev_new_state(FPIX_NOP);</div><div class='add'>+		complete(&amp;dev-&gt;can_close);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (dev-&gt;state) {</div><div class='add'>+	case FPIX_RESET:</div><div class='add'>+		dev_new_state(FPIX_REQ_FRAME);</div><div class='add'>+		schedule_delayed_work(&amp;dev-&gt;wqe, HZ / 10);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case FPIX_REQ_FRAME:</div><div class='add'>+		/* get an image */</div><div class='add'>+		request_frame(dev);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case FPIX_NOP:</div><div class='add'>+	case FPIX_READ_FRAME:</div><div class='add'>+		PDEBUG(D_STREAM, "invalid state %d", dev-&gt;state);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* this function is called at probe time */</div><div class='add'>+static int sd_config(struct gspca_dev *gspca_dev,</div><div class='add'>+		const struct usb_device_id *id)</div><div class='add'>+{</div><div class='add'>+	struct cam *cam = &amp;gspca_dev-&gt;cam;</div><div class='add'>+</div><div class='add'>+	cam-&gt;cam_mode = fpix_mode;</div><div class='add'>+	cam-&gt;nmodes = 1;</div><div class='add'>+	cam-&gt;epaddr = 0x01;	/* todo: correct for all cams? */</div><div class='add'>+	cam-&gt;bulk_size = FPIX_MAX_TRANSFER;</div><div class='add'>+</div><div class='add'>+/*	gspca_dev-&gt;nbalt = 1;	 * use bulk transfer */</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Stop streaming and free the ressources allocated by sd_start. */</div><div class='add'>+static void sd_stopN(struct gspca_dev *gspca_dev)</div><div class='add'>+{</div><div class='add'>+	struct usb_fpix *dev = (struct usb_fpix *) gspca_dev;</div><div class='add'>+</div><div class='add'>+	dev-&gt;streaming = 0;</div><div class='add'>+</div><div class='add'>+	/* Stop the state machine */</div><div class='add'>+	if (dev-&gt;state != FPIX_NOP)</div><div class='add'>+		wait_for_completion(&amp;dev-&gt;can_close);</div><div class='add'>+</div><div class='add'>+	usb_free_urb(dev-&gt;control_urb);</div><div class='add'>+	dev-&gt;control_urb = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Kill an URB that hasn't completed. */</div><div class='add'>+static void timeout_kill(unsigned long data)</div><div class='add'>+{</div><div class='add'>+	struct urb *urb = (struct urb *) data;</div><div class='add'>+</div><div class='add'>+	usb_unlink_urb(urb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* this function is called at probe and resume time */</div><div class='add'>+static int sd_init(struct gspca_dev *gspca_dev)</div><div class='add'>+{</div><div class='add'>+	struct usb_fpix *dev = (struct usb_fpix *) gspca_dev;</div><div class='add'>+</div><div class='add'>+	INIT_DELAYED_WORK(&amp;dev-&gt;wqe, fpix_sm);</div><div class='add'>+</div><div class='add'>+	init_timer(&amp;dev-&gt;bulk_timer);</div><div class='add'>+	dev-&gt;bulk_timer.function = timeout_kill;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sd_start(struct gspca_dev *gspca_dev)</div><div class='add'>+{</div><div class='add'>+	struct usb_fpix *dev = (struct usb_fpix *) gspca_dev;</div><div class='add'>+	int ret;</div><div class='add'>+	int size_ret;</div><div class='add'>+</div><div class='add'>+	/* Reset bulk in endpoint */</div><div class='add'>+	usb_clear_halt(gspca_dev-&gt;dev, gspca_dev-&gt;cam.epaddr);</div><div class='add'>+</div><div class='add'>+	/* Init the device */</div><div class='add'>+	memset(gspca_dev-&gt;usb_buf, 0, 12);</div><div class='add'>+	gspca_dev-&gt;usb_buf[0] = 0xc6;</div><div class='add'>+	gspca_dev-&gt;usb_buf[8] = 0x20;</div><div class='add'>+</div><div class='add'>+	ret = usb_control_msg(gspca_dev-&gt;dev,</div><div class='add'>+			usb_sndctrlpipe(gspca_dev-&gt;dev, 0),</div><div class='add'>+			USB_REQ_GET_STATUS,</div><div class='add'>+			USB_DIR_OUT | USB_TYPE_CLASS |</div><div class='add'>+			USB_RECIP_INTERFACE, 0, 0, gspca_dev-&gt;usb_buf,</div><div class='add'>+			12, FPIX_TIMEOUT);</div><div class='add'>+</div><div class='add'>+	if (ret != 12) {</div><div class='add'>+		PDEBUG(D_STREAM, "usb_control_msg failed (%d)", ret);</div><div class='add'>+		ret = -EIO;</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Read the result of the command. Ignore the result, for it</div><div class='add'>+	 * varies with the device. */</div><div class='add'>+	ret = usb_bulk_msg(gspca_dev-&gt;dev,</div><div class='add'>+			usb_rcvbulkpipe(gspca_dev-&gt;dev,</div><div class='add'>+					gspca_dev-&gt;cam.epaddr),</div><div class='add'>+			gspca_dev-&gt;usb_buf, FPIX_MAX_TRANSFER, &amp;size_ret,</div><div class='add'>+			FPIX_TIMEOUT);</div><div class='add'>+	if (ret != 0) {</div><div class='add'>+		PDEBUG(D_STREAM, "usb_bulk_msg failed (%d)", ret);</div><div class='add'>+		ret = -EIO;</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Request a frame, but don't read it */</div><div class='add'>+	memset(gspca_dev-&gt;usb_buf, 0, 12);</div><div class='add'>+	gspca_dev-&gt;usb_buf[0] = 0xd3;</div><div class='add'>+	gspca_dev-&gt;usb_buf[7] = 0x01;</div><div class='add'>+</div><div class='add'>+	ret = usb_control_msg(gspca_dev-&gt;dev,</div><div class='add'>+			usb_sndctrlpipe(gspca_dev-&gt;dev, 0),</div><div class='add'>+			USB_REQ_GET_STATUS,</div><div class='add'>+			USB_DIR_OUT | USB_TYPE_CLASS |</div><div class='add'>+			USB_RECIP_INTERFACE, 0, 0, gspca_dev-&gt;usb_buf,</div><div class='add'>+			12, FPIX_TIMEOUT);</div><div class='add'>+	if (ret != 12) {</div><div class='add'>+		PDEBUG(D_STREAM, "usb_control_msg failed (%d)", ret);</div><div class='add'>+		ret = -EIO;</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Again, reset bulk in endpoint */</div><div class='add'>+	usb_clear_halt(gspca_dev-&gt;dev, gspca_dev-&gt;cam.epaddr);</div><div class='add'>+</div><div class='add'>+	/* Allocate a control URB */</div><div class='add'>+	dev-&gt;control_urb = usb_alloc_urb(0, GFP_KERNEL);</div><div class='add'>+	if (!dev-&gt;control_urb) {</div><div class='add'>+		PDEBUG(D_STREAM, "No free urbs available");</div><div class='add'>+		ret = -EIO;</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Various initializations. */</div><div class='add'>+	init_completion(&amp;dev-&gt;can_close);</div><div class='add'>+	dev-&gt;bulk_timer.data = (unsigned long)dev-&gt;gspca_dev.urb[0];</div><div class='add'>+	dev-&gt;gspca_dev.urb[0]-&gt;complete = urb_callback;</div><div class='add'>+	dev-&gt;streaming = 1;</div><div class='add'>+</div><div class='add'>+	/* Schedule a frame request. */</div><div class='add'>+	dev_new_state(FPIX_REQ_FRAME);</div><div class='add'>+	schedule_delayed_work(&amp;dev-&gt;wqe, 1);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	/* Free the ressources */</div><div class='add'>+	sd_stopN(gspca_dev);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Table of supported USB devices */</div><div class='add'>+static const __devinitdata struct usb_device_id device_table[] = {</div><div class='add'>+	{USB_DEVICE(0x04cb, 0x0104)},</div><div class='add'>+	{USB_DEVICE(0x04cb, 0x0109)},</div><div class='add'>+	{USB_DEVICE(0x04cb, 0x010b)},</div><div class='add'>+	{USB_DEVICE(0x04cb, 0x010f)},</div><div class='add'>+	{USB_DEVICE(0x04cb, 0x0111)},</div><div class='add'>+	{USB_DEVICE(0x04cb, 0x0113)},</div><div class='add'>+	{USB_DEVICE(0x04cb, 0x0115)},</div><div class='add'>+	{USB_DEVICE(0x04cb, 0x0117)},</div><div class='add'>+	{USB_DEVICE(0x04cb, 0x0119)},</div><div class='add'>+	{USB_DEVICE(0x04cb, 0x011b)},</div><div class='add'>+	{USB_DEVICE(0x04cb, 0x011d)},</div><div class='add'>+	{USB_DEVICE(0x04cb, 0x0121)},</div><div class='add'>+	{USB_DEVICE(0x04cb, 0x0123)},</div><div class='add'>+	{USB_DEVICE(0x04cb, 0x0125)},</div><div class='add'>+	{USB_DEVICE(0x04cb, 0x0127)},</div><div class='add'>+	{USB_DEVICE(0x04cb, 0x0129)},</div><div class='add'>+	{USB_DEVICE(0x04cb, 0x012b)},</div><div class='add'>+	{USB_DEVICE(0x04cb, 0x012d)},</div><div class='add'>+	{USB_DEVICE(0x04cb, 0x012f)},</div><div class='add'>+	{USB_DEVICE(0x04cb, 0x0131)},</div><div class='add'>+	{USB_DEVICE(0x04cb, 0x013b)},</div><div class='add'>+	{USB_DEVICE(0x04cb, 0x013d)},</div><div class='add'>+	{USB_DEVICE(0x04cb, 0x013f)},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_DEVICE_TABLE(usb, device_table);</div><div class='add'>+</div><div class='add'>+/* sub-driver description */</div><div class='add'>+static const struct sd_desc sd_desc = {</div><div class='add'>+	.name = MODULE_NAME,</div><div class='add'>+	.config = sd_config,</div><div class='add'>+	.init = sd_init,</div><div class='add'>+	.start = sd_start,</div><div class='add'>+	.stopN = sd_stopN,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* -- device connect -- */</div><div class='add'>+static int sd_probe(struct usb_interface *intf,</div><div class='add'>+		const struct usb_device_id *id)</div><div class='add'>+{</div><div class='add'>+	return gspca_dev_probe(intf, id,</div><div class='add'>+			&amp;sd_desc,</div><div class='add'>+			sizeof(struct usb_fpix),</div><div class='add'>+			THIS_MODULE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct usb_driver sd_driver = {</div><div class='add'>+	.name = MODULE_NAME,</div><div class='add'>+	.id_table = device_table,</div><div class='add'>+	.probe = sd_probe,</div><div class='add'>+	.disconnect = gspca_disconnect,</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+	.suspend = gspca_suspend,</div><div class='add'>+	.resume = gspca_resume,</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* -- module insert / remove -- */</div><div class='add'>+static int __init sd_mod_init(void)</div><div class='add'>+{</div><div class='add'>+	if (usb_register(&amp;sd_driver) &lt; 0)</div><div class='add'>+		return -1;</div><div class='add'>+	PDEBUG(D_PROBE, "registered");</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+static void __exit sd_mod_exit(void)</div><div class='add'>+{</div><div class='add'>+	usb_deregister(&amp;sd_driver);</div><div class='add'>+	PDEBUG(D_PROBE, "deregistered");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(sd_mod_init);</div><div class='add'>+module_exit(sd_mod_exit);</div><div class='head'>diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c<br/>index ac95c55887df..e48fbfc8ad05 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/gspca/gspca.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/gspca/gspca.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/gspca/gspca.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/gspca.c</a></div><div class='hunk'>@@ -21,6 +21,7 @@</div><div class='ctx'> #define MODULE_NAME "gspca"</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/version.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -29,6 +30,7 @@</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/pagemap.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/kref.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/jiffies.h&gt;</div><div class='hunk'>@@ -43,7 +45,7 @@ MODULE_AUTHOR("Jean-Francois Moine &lt;http://moinejf.free.fr&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("GSPCA USB Camera Driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='del'>-#define DRIVER_VERSION_NUMBER	KERNEL_VERSION(2, 2, 0)</div><div class='add'>+#define DRIVER_VERSION_NUMBER	KERNEL_VERSION(2, 3, 0)</div><div class='ctx'> </div><div class='ctx'> static int video_nr = -1;</div><div class='ctx'> </div><div class='hunk'>@@ -102,6 +104,22 @@ static struct vm_operations_struct gspca_vm_ops = {</div><div class='ctx'> 	.close		= gspca_vm_close,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* get the current input frame buffer */</div><div class='add'>+struct gspca_frame *gspca_get_i_frame(struct gspca_dev *gspca_dev)</div><div class='add'>+{</div><div class='add'>+	struct gspca_frame *frame;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	i = gspca_dev-&gt;fr_i;</div><div class='add'>+	i = gspca_dev-&gt;fr_queue[i];</div><div class='add'>+	frame = &amp;gspca_dev-&gt;frame[i];</div><div class='add'>+	if ((frame-&gt;v4l2_buf.flags &amp; BUF_ALL_FLAGS)</div><div class='add'>+				!= V4L2_BUF_FLAG_QUEUED)</div><div class='add'>+		return NULL;</div><div class='add'>+	return frame;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(gspca_get_i_frame);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * fill a video frame from an URB and resubmit</div><div class='ctx'>  */</div><div class='hunk'>@@ -110,7 +128,7 @@ static void fill_frame(struct gspca_dev *gspca_dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct gspca_frame *frame;</div><div class='ctx'> 	__u8 *data;		/* address of data in the iso message */</div><div class='del'>-	int i, j, len, st;</div><div class='add'>+	int i, len, st;</div><div class='ctx'> 	cam_pkt_op pkt_scan;</div><div class='ctx'> </div><div class='ctx'> 	if (urb-&gt;status != 0) {</div><div class='hunk'>@@ -124,11 +142,8 @@ static void fill_frame(struct gspca_dev *gspca_dev,</div><div class='ctx'> 	for (i = 0; i &lt; urb-&gt;number_of_packets; i++) {</div><div class='ctx'> </div><div class='ctx'> 		/* check the availability of the frame buffer */</div><div class='del'>-		j = gspca_dev-&gt;fr_i;</div><div class='del'>-		j = gspca_dev-&gt;fr_queue[j];</div><div class='del'>-		frame = &amp;gspca_dev-&gt;frame[j];</div><div class='del'>-		if ((frame-&gt;v4l2_buf.flags &amp; BUF_ALL_FLAGS)</div><div class='del'>-					!= V4L2_BUF_FLAG_QUEUED) {</div><div class='add'>+		frame = gspca_get_i_frame(gspca_dev);</div><div class='add'>+		if (!frame) {</div><div class='ctx'> 			gspca_dev-&gt;last_packet_type = DISCARD_PACKET;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -178,6 +193,39 @@ static void isoc_irq(struct urb *urb</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * bulk message interrupt from the USB device</div><div class='add'>+ */</div><div class='add'>+static void bulk_irq(struct urb *urb</div><div class='add'>+)</div><div class='add'>+{</div><div class='add'>+	struct gspca_dev *gspca_dev = (struct gspca_dev *) urb-&gt;context;</div><div class='add'>+	struct gspca_frame *frame;</div><div class='add'>+</div><div class='add'>+	PDEBUG(D_PACK, "bulk irq");</div><div class='add'>+	if (!gspca_dev-&gt;streaming)</div><div class='add'>+		return;</div><div class='add'>+	if (urb-&gt;status != 0 &amp;&amp; urb-&gt;status != -ECONNRESET) {</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+		if (!gspca_dev-&gt;frozen)</div><div class='add'>+#endif</div><div class='add'>+			PDEBUG(D_ERR|D_PACK, "urb status: %d", urb-&gt;status);</div><div class='add'>+		return;		/* disconnection ? */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* check the availability of the frame buffer */</div><div class='add'>+	frame = gspca_get_i_frame(gspca_dev);</div><div class='add'>+	if (!frame) {</div><div class='add'>+		gspca_dev-&gt;last_packet_type = DISCARD_PACKET;</div><div class='add'>+	} else {</div><div class='add'>+		PDEBUG(D_PACK, "packet l:%d", urb-&gt;actual_length);</div><div class='add'>+		gspca_dev-&gt;sd_desc-&gt;pkt_scan(gspca_dev,</div><div class='add'>+					frame,</div><div class='add'>+					urb-&gt;transfer_buffer,</div><div class='add'>+					urb-&gt;actual_length);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * add data to the current frame</div><div class='ctx'>  *</div><div class='ctx'>  * This function is called by the subdrivers at interrupt level.</div><div class='hunk'>@@ -190,7 +238,7 @@ static void isoc_irq(struct urb *urb</div><div class='ctx'>  * On LAST_PACKET, a new frame is returned.</div><div class='ctx'>  */</div><div class='ctx'> struct gspca_frame *gspca_frame_add(struct gspca_dev *gspca_dev,</div><div class='del'>-				    int packet_type,</div><div class='add'>+				    enum gspca_packet_type packet_type,</div><div class='ctx'> 				    struct gspca_frame *frame,</div><div class='ctx'> 				    const __u8 *data,</div><div class='ctx'> 				    int len)</div><div class='hunk'>@@ -232,7 +280,7 @@ struct gspca_frame *gspca_frame_add(struct gspca_dev *gspca_dev,</div><div class='ctx'> 	}</div><div class='ctx'> 	gspca_dev-&gt;last_packet_type = packet_type;</div><div class='ctx'> </div><div class='del'>-	/* if last packet, wake the application and advance in the queue */</div><div class='add'>+	/* if last packet, wake up the application and advance in the queue */</div><div class='ctx'> 	if (packet_type == LAST_PACKET) {</div><div class='ctx'> 		frame-&gt;v4l2_buf.bytesused = frame-&gt;data_end - frame-&gt;data;</div><div class='ctx'> 		frame-&gt;v4l2_buf.flags &amp;= ~V4L2_BUF_FLAG_QUEUED;</div><div class='hunk'>@@ -270,7 +318,6 @@ static void *rvmalloc(unsigned long size)</div><div class='ctx'> 	void *mem;</div><div class='ctx'> 	unsigned long adr;</div><div class='ctx'> </div><div class='del'>-/*	size = PAGE_ALIGN(size);	(already done) */</div><div class='ctx'> 	mem = vmalloc_32(size);</div><div class='ctx'> 	if (mem != NULL) {</div><div class='ctx'> 		adr = (unsigned long) mem;</div><div class='hunk'>@@ -357,7 +404,7 @@ static void destroy_urbs(struct gspca_dev *gspca_dev)</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='ctx'> 	PDEBUG(D_STREAM, "kill transfer");</div><div class='del'>-	for (i = 0; i &lt; MAX_NURBS; ++i) {</div><div class='add'>+	for (i = 0; i &lt; MAX_NURBS; i++) {</div><div class='ctx'> 		urb = gspca_dev-&gt;urb[i];</div><div class='ctx'> 		if (urb == NULL)</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -374,10 +421,11 @@ static void destroy_urbs(struct gspca_dev *gspca_dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * search an input isochronous endpoint in an alternate setting</div><div class='add'>+ * look for an input transfer endpoint in an alternate setting</div><div class='ctx'>  */</div><div class='del'>-static struct usb_host_endpoint *alt_isoc(struct usb_host_interface *alt,</div><div class='del'>-					  __u8 epaddr)</div><div class='add'>+static struct usb_host_endpoint *alt_xfer(struct usb_host_interface *alt,</div><div class='add'>+					  __u8 epaddr,</div><div class='add'>+					  __u8 xfer)</div><div class='ctx'> {</div><div class='ctx'> 	struct usb_host_endpoint *ep;</div><div class='ctx'> 	int i, attr;</div><div class='hunk'>@@ -388,7 +436,7 @@ static struct usb_host_endpoint *alt_isoc(struct usb_host_interface *alt,</div><div class='ctx'> 		if (ep-&gt;desc.bEndpointAddress == epaddr) {</div><div class='ctx'> 			attr = ep-&gt;desc.bmAttributes</div><div class='ctx'> 						&amp; USB_ENDPOINT_XFERTYPE_MASK;</div><div class='del'>-			if (attr == USB_ENDPOINT_XFER_ISOC)</div><div class='add'>+			if (attr == xfer)</div><div class='ctx'> 				return ep;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -397,14 +445,14 @@ static struct usb_host_endpoint *alt_isoc(struct usb_host_interface *alt,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * search an input isochronous endpoint</div><div class='add'>+ * look for an input (isoc or bulk) endpoint</div><div class='ctx'>  *</div><div class='ctx'>  * The endpoint is defined by the subdriver.</div><div class='ctx'>  * Use only the first isoc (some Zoran - 0x0572:0x0001 - have two such ep).</div><div class='ctx'>  * This routine may be called many times when the bandwidth is too small</div><div class='ctx'>  * (the bandwidth is checked on urb submit).</div><div class='ctx'>  */</div><div class='del'>-static struct usb_host_endpoint *get_isoc_ep(struct gspca_dev *gspca_dev)</div><div class='add'>+static struct usb_host_endpoint *get_ep(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct usb_interface *intf;</div><div class='ctx'> 	struct usb_host_endpoint *ep;</div><div class='hunk'>@@ -413,28 +461,41 @@ static struct usb_host_endpoint *get_isoc_ep(struct gspca_dev *gspca_dev)</div><div class='ctx'> 	intf = usb_ifnum_to_if(gspca_dev-&gt;dev, gspca_dev-&gt;iface);</div><div class='ctx'> 	ep = NULL;</div><div class='ctx'> 	i = gspca_dev-&gt;alt;			/* previous alt setting */</div><div class='add'>+</div><div class='add'>+	/* try isoc */</div><div class='ctx'> 	while (--i &gt; 0) {			/* alt 0 is unusable */</div><div class='del'>-		ep = alt_isoc(&amp;intf-&gt;altsetting[i], gspca_dev-&gt;cam.epaddr);</div><div class='add'>+		ep = alt_xfer(&amp;intf-&gt;altsetting[i],</div><div class='add'>+				gspca_dev-&gt;cam.epaddr,</div><div class='add'>+				USB_ENDPOINT_XFER_ISOC);</div><div class='ctx'> 		if (ep)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	/* if no isoc, try bulk */</div><div class='ctx'> 	if (ep == NULL) {</div><div class='del'>-		err("no ISOC endpoint found");</div><div class='del'>-		return NULL;</div><div class='add'>+		ep = alt_xfer(&amp;intf-&gt;altsetting[0],</div><div class='add'>+				gspca_dev-&gt;cam.epaddr,</div><div class='add'>+				USB_ENDPOINT_XFER_BULK);</div><div class='add'>+		if (ep == NULL) {</div><div class='add'>+			err("no transfer endpoint found");</div><div class='add'>+			return NULL;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	PDEBUG(D_STREAM, "use ISOC alt %d ep 0x%02x",</div><div class='add'>+	PDEBUG(D_STREAM, "use alt %d ep 0x%02x",</div><div class='ctx'> 			i, ep-&gt;desc.bEndpointAddress);</div><div class='del'>-	ret = usb_set_interface(gspca_dev-&gt;dev, gspca_dev-&gt;iface, i);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		err("set interface err %d", ret);</div><div class='del'>-		return NULL;</div><div class='add'>+	if (i &gt; 0) {</div><div class='add'>+		ret = usb_set_interface(gspca_dev-&gt;dev, gspca_dev-&gt;iface, i);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			err("set interface err %d", ret);</div><div class='add'>+			return NULL;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	gspca_dev-&gt;alt = i;		/* memorize the current alt setting */</div><div class='ctx'> 	return ep;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * create the isochronous URBs</div><div class='add'>+ * create the URBs for image transfer</div><div class='ctx'>  */</div><div class='ctx'> static int create_urbs(struct gspca_dev *gspca_dev,</div><div class='ctx'> 			struct usb_host_endpoint *ep)</div><div class='hunk'>@@ -445,15 +506,27 @@ static int create_urbs(struct gspca_dev *gspca_dev,</div><div class='ctx'> 	/* calculate the packet size and the number of packets */</div><div class='ctx'> 	psize = le16_to_cpu(ep-&gt;desc.wMaxPacketSize);</div><div class='ctx'> </div><div class='del'>-	/* See paragraph 5.9 / table 5-11 of the usb 2.0 spec. */</div><div class='del'>-	psize = (psize &amp; 0x07ff) * (1 + ((psize &gt;&gt; 11) &amp; 3));</div><div class='del'>-	npkt = ISO_MAX_SIZE / psize;</div><div class='del'>-	if (npkt &gt; ISO_MAX_PKT)</div><div class='del'>-		npkt = ISO_MAX_PKT;</div><div class='del'>-	bsize = psize * npkt;</div><div class='del'>-	PDEBUG(D_STREAM,</div><div class='del'>-		"isoc %d pkts size %d (bsize:%d)", npkt, psize, bsize);</div><div class='del'>-	nurbs = DEF_NURBS;</div><div class='add'>+	if (gspca_dev-&gt;alt != 0) {		/* isoc */</div><div class='add'>+</div><div class='add'>+		/* See paragraph 5.9 / table 5-11 of the usb 2.0 spec. */</div><div class='add'>+		psize = (psize &amp; 0x07ff) * (1 + ((psize &gt;&gt; 11) &amp; 3));</div><div class='add'>+		npkt = ISO_MAX_SIZE / psize;</div><div class='add'>+		if (npkt &gt; ISO_MAX_PKT)</div><div class='add'>+			npkt = ISO_MAX_PKT;</div><div class='add'>+		bsize = psize * npkt;</div><div class='add'>+		PDEBUG(D_STREAM,</div><div class='add'>+			"isoc %d pkts size %d = bsize:%d",</div><div class='add'>+			npkt, psize, bsize);</div><div class='add'>+		nurbs = DEF_NURBS;</div><div class='add'>+	} else {				/* bulk */</div><div class='add'>+		npkt = 0;</div><div class='add'>+		bsize = gspca_dev-&gt;cam.	bulk_size;</div><div class='add'>+		if (bsize == 0)</div><div class='add'>+			bsize = psize;</div><div class='add'>+		PDEBUG(D_STREAM, "bulk bsize:%d", bsize);</div><div class='add'>+		nurbs = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	gspca_dev-&gt;nurbs = nurbs;</div><div class='ctx'> 	for (n = 0; n &lt; nurbs; n++) {</div><div class='ctx'> 		urb = usb_alloc_urb(npkt, GFP_KERNEL);</div><div class='hunk'>@@ -476,17 +549,24 @@ static int create_urbs(struct gspca_dev *gspca_dev,</div><div class='ctx'> 		gspca_dev-&gt;urb[n] = urb;</div><div class='ctx'> 		urb-&gt;dev = gspca_dev-&gt;dev;</div><div class='ctx'> 		urb-&gt;context = gspca_dev;</div><div class='del'>-		urb-&gt;pipe = usb_rcvisocpipe(gspca_dev-&gt;dev,</div><div class='del'>-					    ep-&gt;desc.bEndpointAddress);</div><div class='del'>-		urb-&gt;transfer_flags = URB_ISO_ASAP</div><div class='del'>-					| URB_NO_TRANSFER_DMA_MAP;</div><div class='del'>-		urb-&gt;interval = ep-&gt;desc.bInterval;</div><div class='del'>-		urb-&gt;complete = isoc_irq;</div><div class='del'>-		urb-&gt;number_of_packets = npkt;</div><div class='ctx'> 		urb-&gt;transfer_buffer_length = bsize;</div><div class='del'>-		for (i = 0; i &lt; npkt; i++) {</div><div class='del'>-			urb-&gt;iso_frame_desc[i].length = psize;</div><div class='del'>-			urb-&gt;iso_frame_desc[i].offset = psize * i;</div><div class='add'>+		if (npkt != 0) {		/* ISOC */</div><div class='add'>+			urb-&gt;pipe = usb_rcvisocpipe(gspca_dev-&gt;dev,</div><div class='add'>+						    ep-&gt;desc.bEndpointAddress);</div><div class='add'>+			urb-&gt;transfer_flags = URB_ISO_ASAP</div><div class='add'>+					| URB_NO_TRANSFER_DMA_MAP;</div><div class='add'>+			urb-&gt;interval = ep-&gt;desc.bInterval;</div><div class='add'>+			urb-&gt;complete = isoc_irq;</div><div class='add'>+			urb-&gt;number_of_packets = npkt;</div><div class='add'>+			for (i = 0; i &lt; npkt; i++) {</div><div class='add'>+				urb-&gt;iso_frame_desc[i].length = psize;</div><div class='add'>+				urb-&gt;iso_frame_desc[i].offset = psize * i;</div><div class='add'>+			}</div><div class='add'>+		} else {		/* bulk */</div><div class='add'>+			urb-&gt;pipe = usb_rcvbulkpipe(gspca_dev-&gt;dev,</div><div class='add'>+						ep-&gt;desc.bEndpointAddress),</div><div class='add'>+			urb-&gt;transfer_flags = URB_NO_TRANSFER_DMA_MAP;</div><div class='add'>+			urb-&gt;complete = bulk_irq;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -508,7 +588,7 @@ static int gspca_init_transfer(struct gspca_dev *gspca_dev)</div><div class='ctx'> 	gspca_dev-&gt;alt = gspca_dev-&gt;nbalt;</div><div class='ctx'> 	for (;;) {</div><div class='ctx'> 		PDEBUG(D_STREAM, "init transfer alt %d", gspca_dev-&gt;alt);</div><div class='del'>-		ep = get_isoc_ep(gspca_dev);</div><div class='add'>+		ep = get_ep(gspca_dev);</div><div class='ctx'> 		if (ep == NULL) {</div><div class='ctx'> 			ret = -EIO;</div><div class='ctx'> 			goto out;</div><div class='hunk'>@@ -518,10 +598,18 @@ static int gspca_init_transfer(struct gspca_dev *gspca_dev)</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='ctx'> 		/* start the cam */</div><div class='del'>-		gspca_dev-&gt;sd_desc-&gt;start(gspca_dev);</div><div class='add'>+		ret = gspca_dev-&gt;sd_desc-&gt;start(gspca_dev);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			destroy_urbs(gspca_dev);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='ctx'> 		gspca_dev-&gt;streaming = 1;</div><div class='ctx'> 		atomic_set(&amp;gspca_dev-&gt;nevent, 0);</div><div class='ctx'> </div><div class='add'>+		/* bulk transfers are started by the subdriver */</div><div class='add'>+		if (gspca_dev-&gt;alt == 0)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='ctx'> 		/* submit the URBs */</div><div class='ctx'> 		for (n = 0; n &lt; gspca_dev-&gt;nurbs; n++) {</div><div class='ctx'> 			ret = usb_submit_urb(gspca_dev-&gt;urb[n], GFP_KERNEL);</div><div class='hunk'>@@ -553,7 +641,7 @@ static int gspca_set_alt0(struct gspca_dev *gspca_dev)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Note both the queue and the usb lock should be hold when calling this */</div><div class='add'>+/* Note: both the queue and the usb locks should be held when calling this */</div><div class='ctx'> static void gspca_stream_off(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='ctx'> 	gspca_dev-&gt;streaming = 0;</div><div class='hunk'>@@ -759,6 +847,16 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void gspca_delete(struct kref *kref)</div><div class='add'>+{</div><div class='add'>+	struct gspca_dev *gspca_dev = container_of(kref, struct gspca_dev, kref);</div><div class='add'>+</div><div class='add'>+	PDEBUG(D_STREAM, "device deleted");</div><div class='add'>+</div><div class='add'>+	kfree(gspca_dev-&gt;usb_buf);</div><div class='add'>+	kfree(gspca_dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int dev_open(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='ctx'> 	struct gspca_dev *gspca_dev;</div><div class='hunk'>@@ -778,13 +876,19 @@ static int dev_open(struct inode *inode, struct file *file)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	gspca_dev-&gt;users++;</div><div class='add'>+</div><div class='add'>+	/* one more user */</div><div class='add'>+	kref_get(&amp;gspca_dev-&gt;kref);</div><div class='add'>+</div><div class='ctx'> 	file-&gt;private_data = gspca_dev;</div><div class='ctx'> #ifdef GSPCA_DEBUG</div><div class='ctx'> 	/* activate the v4l2 debug */</div><div class='ctx'> 	if (gspca_debug &amp; D_V4L2)</div><div class='del'>-		gspca_dev-&gt;vdev.debug |= 3;</div><div class='add'>+		gspca_dev-&gt;vdev.debug |= V4L2_DEBUG_IOCTL</div><div class='add'>+					| V4L2_DEBUG_IOCTL_ARG;</div><div class='ctx'> 	else</div><div class='del'>-		gspca_dev-&gt;vdev.debug &amp;= ~3;</div><div class='add'>+		gspca_dev-&gt;vdev.debug &amp;= ~(V4L2_DEBUG_IOCTL</div><div class='add'>+					| V4L2_DEBUG_IOCTL_ARG);</div><div class='ctx'> #endif</div><div class='ctx'> 	ret = 0;</div><div class='ctx'> out:</div><div class='hunk'>@@ -818,7 +922,11 @@ static int dev_close(struct inode *inode, struct file *file)</div><div class='ctx'> 	}</div><div class='ctx'> 	file-&gt;private_data = NULL;</div><div class='ctx'> 	mutex_unlock(&amp;gspca_dev-&gt;queue_lock);</div><div class='add'>+</div><div class='ctx'> 	PDEBUG(D_STREAM, "close done");</div><div class='add'>+</div><div class='add'>+	kref_put(&amp;gspca_dev-&gt;kref, gspca_delete);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -829,7 +937,6 @@ static int vidioc_querycap(struct file *file, void  *priv,</div><div class='ctx'> </div><div class='ctx'> 	memset(cap, 0, sizeof *cap);</div><div class='ctx'> 	strncpy(cap-&gt;driver, gspca_dev-&gt;sd_desc-&gt;name, sizeof cap-&gt;driver);</div><div class='del'>-/*	strncpy(cap-&gt;card, gspca_dev-&gt;cam.dev_name, sizeof cap-&gt;card); */</div><div class='ctx'> 	if (gspca_dev-&gt;dev-&gt;product != NULL) {</div><div class='ctx'> 		strncpy(cap-&gt;card, gspca_dev-&gt;dev-&gt;product,</div><div class='ctx'> 			sizeof cap-&gt;card);</div><div class='hunk'>@@ -1463,7 +1570,6 @@ static int vidioc_qbuf(struct file *file, void *priv,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	frame-&gt;v4l2_buf.flags |= V4L2_BUF_FLAG_QUEUED;</div><div class='del'>-/*	frame-&gt;v4l2_buf.flags &amp;= ~V4L2_BUF_FLAG_DONE; */</div><div class='ctx'> </div><div class='ctx'> 	if (frame-&gt;v4l2_buf.memory == V4L2_MEMORY_USERPTR) {</div><div class='ctx'> 		frame-&gt;v4l2_buf.m.userptr = v4l2_buf-&gt;m.userptr;</div><div class='hunk'>@@ -1610,7 +1716,7 @@ static ssize_t dev_read(struct file *file, char __user *data,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* if the process slept for more than 1 second,</div><div class='del'>-		 * get anewer frame */</div><div class='add'>+		 * get a newer frame */</div><div class='ctx'> 		frame = &amp;gspca_dev-&gt;frame[v4l2_buf.index];</div><div class='ctx'> 		if (--n &lt; 0)</div><div class='ctx'> 			break;			/* avoid infinite loop */</div><div class='hunk'>@@ -1728,21 +1834,21 @@ int gspca_dev_probe(struct usb_interface *intf,</div><div class='ctx'> 	if (dev_size &lt; sizeof *gspca_dev)</div><div class='ctx'> 		dev_size = sizeof *gspca_dev;</div><div class='ctx'> 	gspca_dev = kzalloc(dev_size, GFP_KERNEL);</div><div class='del'>-	if (gspca_dev == NULL) {</div><div class='add'>+	if (!gspca_dev) {</div><div class='ctx'> 		err("couldn't kzalloc gspca struct");</div><div class='del'>-		return -EIO;</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='add'>+	kref_init(&amp;gspca_dev-&gt;kref);</div><div class='ctx'> 	gspca_dev-&gt;usb_buf = kmalloc(USB_BUF_SZ, GFP_KERNEL);</div><div class='ctx'> 	if (!gspca_dev-&gt;usb_buf) {</div><div class='ctx'> 		err("out of memory");</div><div class='del'>-		ret = -EIO;</div><div class='add'>+		ret = -ENOMEM;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	gspca_dev-&gt;dev = dev;</div><div class='ctx'> 	gspca_dev-&gt;iface = interface-&gt;bInterfaceNumber;</div><div class='ctx'> 	gspca_dev-&gt;nbalt = intf-&gt;num_altsetting;</div><div class='ctx'> 	gspca_dev-&gt;sd_desc = sd_desc;</div><div class='del'>-/*	gspca_dev-&gt;users = 0;			(done by kzalloc) */</div><div class='ctx'> 	gspca_dev-&gt;nbufread = 2;</div><div class='ctx'> </div><div class='ctx'> 	/* configure the subdriver and initialize the USB device */</div><div class='hunk'>@@ -1781,8 +1887,7 @@ int gspca_dev_probe(struct usb_interface *intf,</div><div class='ctx'> 	PDEBUG(D_PROBE, "probe ok");</div><div class='ctx'> 	return 0;</div><div class='ctx'> out:</div><div class='del'>-	kfree(gspca_dev-&gt;usb_buf);</div><div class='del'>-	kfree(gspca_dev);</div><div class='add'>+	kref_put(&amp;gspca_dev-&gt;kref, gspca_delete);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(gspca_dev_probe);</div><div class='hunk'>@@ -1797,25 +1902,16 @@ void gspca_disconnect(struct usb_interface *intf)</div><div class='ctx'> {</div><div class='ctx'> 	struct gspca_dev *gspca_dev = usb_get_intfdata(intf);</div><div class='ctx'> </div><div class='del'>-	if (!gspca_dev)</div><div class='del'>-		return;</div><div class='del'>-	gspca_dev-&gt;present = 0;</div><div class='del'>-	mutex_lock(&amp;gspca_dev-&gt;queue_lock);</div><div class='del'>-	mutex_lock(&amp;gspca_dev-&gt;usb_lock);</div><div class='del'>-	gspca_dev-&gt;streaming = 0;</div><div class='del'>-	destroy_urbs(gspca_dev);</div><div class='del'>-	mutex_unlock(&amp;gspca_dev-&gt;usb_lock);</div><div class='del'>-	mutex_unlock(&amp;gspca_dev-&gt;queue_lock);</div><div class='del'>-	while (gspca_dev-&gt;users != 0) {		/* wait until fully closed */</div><div class='del'>-		atomic_inc(&amp;gspca_dev-&gt;nevent);</div><div class='del'>-		wake_up_interruptible(&amp;gspca_dev-&gt;wq);	/* wake processes */</div><div class='del'>-		schedule();</div><div class='del'>-	}</div><div class='add'>+	usb_set_intfdata(intf, NULL);</div><div class='add'>+</div><div class='ctx'> /* We don't want people trying to open up the device */</div><div class='ctx'> 	video_unregister_device(&amp;gspca_dev-&gt;vdev);</div><div class='del'>-/* Free the memory */</div><div class='del'>-	kfree(gspca_dev-&gt;usb_buf);</div><div class='del'>-	kfree(gspca_dev);</div><div class='add'>+</div><div class='add'>+	gspca_dev-&gt;present = 0;</div><div class='add'>+	gspca_dev-&gt;streaming = 0;</div><div class='add'>+</div><div class='add'>+	kref_put(&amp;gspca_dev-&gt;kref, gspca_delete);</div><div class='add'>+</div><div class='ctx'> 	PDEBUG(D_PROBE, "disconnect complete");</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(gspca_disconnect);</div><div class='head'>diff --git a/drivers/media/video/gspca/gspca.h b/drivers/media/video/gspca/gspca.h<br/>index c17625cff9ba..1d9dc90b4791 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/gspca/gspca.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/gspca/gspca.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/gspca/gspca.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/gspca.h</a></div><div class='hunk'>@@ -2,7 +2,6 @@</div><div class='ctx'> #define GSPCAV2_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='ctx'> #include &lt;linux/videodev2.h&gt;</div><div class='hunk'>@@ -49,13 +48,14 @@ extern int gspca_debug;</div><div class='ctx'> 	} while (0)</div><div class='ctx'> </div><div class='ctx'> #define GSPCA_MAX_FRAMES 16	/* maximum number of video frame buffers */</div><div class='del'>-/* ISOC transfers */</div><div class='del'>-#define MAX_NURBS 16		/* max number of URBs */</div><div class='add'>+/* image transfers */</div><div class='add'>+#define MAX_NURBS 4		/* max number of URBs */</div><div class='ctx'> #define ISO_MAX_PKT 32		/* max number of packets in an ISOC transfer */</div><div class='ctx'> #define ISO_MAX_SIZE 0x8000	/* max size of one URB buffer (32 Kb) */</div><div class='ctx'> </div><div class='ctx'> /* device information - set at probe time */</div><div class='ctx'> struct cam {</div><div class='add'>+	int bulk_size;		/* buffer size when image transfer by bulk */</div><div class='ctx'> 	struct v4l2_pix_format *cam_mode;	/* size nmodes */</div><div class='ctx'> 	char nmodes;</div><div class='ctx'> 	__u8 epaddr;</div><div class='hunk'>@@ -93,7 +93,7 @@ struct sd_desc {</div><div class='ctx'> /* mandatory operations */</div><div class='ctx'> 	cam_cf_op config;	/* called on probe */</div><div class='ctx'> 	cam_op init;		/* called on probe and resume */</div><div class='del'>-	cam_v_op start;		/* called on stream on */</div><div class='add'>+	cam_op start;		/* called on stream on */</div><div class='ctx'> 	cam_pkt_op pkt_scan;</div><div class='ctx'> /* optional operations */</div><div class='ctx'> 	cam_v_op stopN;		/* called on stream off - main alt */</div><div class='hunk'>@@ -105,10 +105,12 @@ struct sd_desc {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* packet types when moving from iso buf to frame buf */</div><div class='del'>-#define DISCARD_PACKET	0</div><div class='del'>-#define FIRST_PACKET	1</div><div class='del'>-#define INTER_PACKET	2</div><div class='del'>-#define LAST_PACKET	3</div><div class='add'>+enum gspca_packet_type {</div><div class='add'>+	DISCARD_PACKET,</div><div class='add'>+	FIRST_PACKET,</div><div class='add'>+	INTER_PACKET,</div><div class='add'>+	LAST_PACKET</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> struct gspca_frame {</div><div class='ctx'> 	__u8 *data;			/* frame buffer */</div><div class='hunk'>@@ -121,6 +123,7 @@ struct gspca_dev {</div><div class='ctx'> 	struct video_device vdev;	/* !! must be the first item */</div><div class='ctx'> 	struct file_operations fops;</div><div class='ctx'> 	struct usb_device *dev;</div><div class='add'>+	struct kref kref;</div><div class='ctx'> 	struct file *capt_file;		/* file doing video capture */</div><div class='ctx'> </div><div class='ctx'> 	struct cam cam;				/* device information */</div><div class='hunk'>@@ -173,10 +176,11 @@ int gspca_dev_probe(struct usb_interface *intf,</div><div class='ctx'> 		struct module *module);</div><div class='ctx'> void gspca_disconnect(struct usb_interface *intf);</div><div class='ctx'> struct gspca_frame *gspca_frame_add(struct gspca_dev *gspca_dev,</div><div class='del'>-				    int packet_type,</div><div class='add'>+				    enum gspca_packet_type packet_type,</div><div class='ctx'> 				    struct gspca_frame *frame,</div><div class='ctx'> 				    const __u8 *data,</div><div class='ctx'> 				    int len);</div><div class='add'>+struct gspca_frame *gspca_get_i_frame(struct gspca_dev *gspca_dev);</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> int gspca_suspend(struct usb_interface *intf, pm_message_t message);</div><div class='ctx'> int gspca_resume(struct usb_interface *intf);</div><div class='head'>diff --git a/drivers/media/video/gspca/m5602/Kconfig b/drivers/media/video/gspca/m5602/Kconfig<br/>new file mode 100644<br/>index 000000000000..5a69016ed75f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/gspca/m5602/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/m5602/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,11 @@</div><div class='add'>+config USB_M5602</div><div class='add'>+	tristate "ALi USB m5602 Camera Driver"</div><div class='add'>+	depends on VIDEO_V4L2 &amp;&amp; USB_GSPCA</div><div class='add'>+	help</div><div class='add'>+	  Say Y here if you want support for cameras based on the</div><div class='add'>+	  ALi m5602 connected to various image sensors.</div><div class='add'>+</div><div class='add'>+	  See &lt;file:Documentation/video4linux/m5602.txt&gt; for more info.</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here: the</div><div class='add'>+	  module will be called gspca_m5602.</div><div class='head'>diff --git a/drivers/media/video/gspca/m5602/Makefile b/drivers/media/video/gspca/m5602/Makefile<br/>new file mode 100644<br/>index 000000000000..226ab4fc9d60<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/gspca/m5602/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/m5602/Makefile</a></div><div class='hunk'>@@ -0,0 +1,11 @@</div><div class='add'>+obj-$(CONFIG_USB_M5602) += gspca_m5602.o</div><div class='add'>+</div><div class='add'>+gspca_m5602-objs := m5602_core.o \</div><div class='add'>+		    m5602_ov9650.o \</div><div class='add'>+		    m5602_mt9m111.o \</div><div class='add'>+		    m5602_po1030.o \</div><div class='add'>+		    m5602_s5k83a.o \</div><div class='add'>+		    m5602_s5k4aa.o</div><div class='add'>+</div><div class='add'>+EXTRA_CFLAGS += -Idrivers/media/video/gspca</div><div class='add'>+</div><div class='head'>diff --git a/drivers/media/video/gspca/m5602/m5602_bridge.h b/drivers/media/video/gspca/m5602/m5602_bridge.h<br/>new file mode 100644<br/>index 000000000000..1a37ae4bc82d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/gspca/m5602/m5602_bridge.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/m5602/m5602_bridge.h</a></div><div class='hunk'>@@ -0,0 +1,143 @@</div><div class='add'>+/*</div><div class='add'>+ * USB Driver for ALi m5602 based webcams</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2008 Erik Andrén</div><div class='add'>+ * Copyright (C) 2007 Ilyes Gouta. Based on the m5603x Linux Driver Project.</div><div class='add'>+ * Copyright (C) 2005 m5603x Linux Driver Project &lt;m5602@x3ng.com.br&gt;</div><div class='add'>+ *</div><div class='add'>+ * Portions of code to USB interface and ALi driver software,</div><div class='add'>+ * Copyright (c) 2006 Willem Duinker</div><div class='add'>+ * v4l2 interface modeled after the V4L2 driver</div><div class='add'>+ * for SN9C10x PC Camera Controllers</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public License as</div><div class='add'>+ * published by the Free Software Foundation, version 2.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef M5602_BRIDGE_H_</div><div class='add'>+#define M5602_BRIDGE_H_</div><div class='add'>+</div><div class='add'>+#include "gspca.h"</div><div class='add'>+</div><div class='add'>+#define MODULE_NAME "ALi m5602"</div><div class='add'>+</div><div class='add'>+/*****************************************************************************/</div><div class='add'>+</div><div class='add'>+#define M5602_XB_SENSOR_TYPE 0x00</div><div class='add'>+#define M5602_XB_SENSOR_CTRL 0x01</div><div class='add'>+#define M5602_XB_LINE_OF_FRAME_H 0x02</div><div class='add'>+#define M5602_XB_LINE_OF_FRAME_L 0x03</div><div class='add'>+#define M5602_XB_PIX_OF_LINE_H 0x04</div><div class='add'>+#define M5602_XB_PIX_OF_LINE_L 0x05</div><div class='add'>+#define M5602_XB_VSYNC_PARA 0x06</div><div class='add'>+#define M5602_XB_HSYNC_PARA 0x07</div><div class='add'>+#define M5602_XB_TEST_MODE_1 0x08</div><div class='add'>+#define M5602_XB_TEST_MODE_2 0x09</div><div class='add'>+#define M5602_XB_SIG_INI 0x0a</div><div class='add'>+#define M5602_XB_DS_PARA 0x0e</div><div class='add'>+#define M5602_XB_TRIG_PARA 0x0f</div><div class='add'>+#define M5602_XB_CLK_PD 0x10</div><div class='add'>+#define M5602_XB_MCU_CLK_CTRL 0x12</div><div class='add'>+#define M5602_XB_MCU_CLK_DIV 0x13</div><div class='add'>+#define M5602_XB_SEN_CLK_CTRL 0x14</div><div class='add'>+#define M5602_XB_SEN_CLK_DIV 0x15</div><div class='add'>+#define M5602_XB_AUD_CLK_CTRL 0x16</div><div class='add'>+#define M5602_XB_AUD_CLK_DIV 0x17</div><div class='add'>+#define M5602_XB_DEVCTR1 0x41</div><div class='add'>+#define M5602_XB_EPSETR0 0x42</div><div class='add'>+#define M5602_XB_EPAFCTR 0x47</div><div class='add'>+#define M5602_XB_EPBFCTR 0x49</div><div class='add'>+#define M5602_XB_EPEFCTR 0x4f</div><div class='add'>+#define M5602_XB_TEST_REG 0x53</div><div class='add'>+#define M5602_XB_ALT2SIZE 0x54</div><div class='add'>+#define M5602_XB_ALT3SIZE 0x55</div><div class='add'>+#define M5602_XB_OBSFRAME 0x56</div><div class='add'>+#define M5602_XB_PWR_CTL 0x59</div><div class='add'>+#define M5602_XB_ADC_CTRL 0x60</div><div class='add'>+#define M5602_XB_ADC_DATA 0x61</div><div class='add'>+#define M5602_XB_MISC_CTRL 0x62</div><div class='add'>+#define M5602_XB_SNAPSHOT 0x63</div><div class='add'>+#define M5602_XB_SCRATCH_1 0x64</div><div class='add'>+#define M5602_XB_SCRATCH_2 0x65</div><div class='add'>+#define M5602_XB_SCRATCH_3 0x66</div><div class='add'>+#define M5602_XB_SCRATCH_4 0x67</div><div class='add'>+#define M5602_XB_I2C_CTRL 0x68</div><div class='add'>+#define M5602_XB_I2C_CLK_DIV 0x69</div><div class='add'>+#define M5602_XB_I2C_DEV_ADDR 0x6a</div><div class='add'>+#define M5602_XB_I2C_REG_ADDR 0x6b</div><div class='add'>+#define M5602_XB_I2C_DATA 0x6c</div><div class='add'>+#define M5602_XB_I2C_STATUS 0x6d</div><div class='add'>+#define M5602_XB_GPIO_DAT_H 0x70</div><div class='add'>+#define M5602_XB_GPIO_DAT_L 0x71</div><div class='add'>+#define M5602_XB_GPIO_DIR_H 0x72</div><div class='add'>+#define M5602_XB_GPIO_DIR_L 0x73</div><div class='add'>+#define M5602_XB_GPIO_EN_H 0x74</div><div class='add'>+#define M5602_XB_GPIO_EN_L 0x75</div><div class='add'>+#define M5602_XB_GPIO_DAT 0x76</div><div class='add'>+#define M5602_XB_GPIO_DIR 0x77</div><div class='add'>+#define M5602_XB_MISC_CTL 0x70</div><div class='add'>+</div><div class='add'>+#define I2C_BUSY 0x80</div><div class='add'>+</div><div class='add'>+/*****************************************************************************/</div><div class='add'>+</div><div class='add'>+/* Driver info */</div><div class='add'>+#define DRIVER_AUTHOR "ALi m5602 Linux Driver Project"</div><div class='add'>+#define DRIVER_DESC "ALi m5602 webcam driver"</div><div class='add'>+</div><div class='add'>+#define M5602_ISOC_ENDPOINT_ADDR 0x81</div><div class='add'>+#define M5602_INTR_ENDPOINT_ADDR 0x82</div><div class='add'>+</div><div class='add'>+#define M5602_MAX_FRAMES	32</div><div class='add'>+#define M5602_URBS		2</div><div class='add'>+#define M5602_ISOC_PACKETS	14</div><div class='add'>+</div><div class='add'>+#define M5602_URB_TIMEOUT	msecs_to_jiffies(2 * M5602_ISOC_PACKETS)</div><div class='add'>+#define M5602_URB_MSG_TIMEOUT   5000</div><div class='add'>+#define M5602_FRAME_TIMEOUT	2</div><div class='add'>+</div><div class='add'>+/*****************************************************************************/</div><div class='add'>+</div><div class='add'>+/* A skeleton used for sending messages to the m5602 bridge */</div><div class='add'>+static const unsigned char bridge_urb_skeleton[] = {</div><div class='add'>+	0x13, 0x00, 0x81, 0x00</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* A skeleton used for sending messages to the sensor */</div><div class='add'>+static const unsigned char sensor_urb_skeleton[] = {</div><div class='add'>+	0x23, M5602_XB_GPIO_EN_H, 0x81, 0x06,</div><div class='add'>+	0x23, M5602_XB_MISC_CTRL, 0x81, 0x80,</div><div class='add'>+	0x13, M5602_XB_I2C_DEV_ADDR, 0x81, 0x00,</div><div class='add'>+	0x13, M5602_XB_I2C_REG_ADDR, 0x81, 0x00,</div><div class='add'>+	0x13, M5602_XB_I2C_DATA, 0x81, 0x00,</div><div class='add'>+	0x13, M5602_XB_I2C_CTRL, 0x81, 0x11</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* m5602 device descriptor, currently it just wraps the m5602_camera struct */</div><div class='add'>+struct sd {</div><div class='add'>+	struct gspca_dev gspca_dev;</div><div class='add'>+</div><div class='add'>+	/* The name of the m5602 camera */</div><div class='add'>+	char *name;</div><div class='add'>+</div><div class='add'>+	/* A pointer to the currently connected sensor */</div><div class='add'>+	struct m5602_sensor *sensor;</div><div class='add'>+</div><div class='add'>+	struct sd_desc *desc;</div><div class='add'>+</div><div class='add'>+	/* The current frame's id, used to detect frame boundaries */</div><div class='add'>+	u8 frame_id;</div><div class='add'>+</div><div class='add'>+	/* The current frame count */</div><div class='add'>+	u32 frame_count;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int m5602_read_bridge(</div><div class='add'>+	struct sd *sd, u8 address, u8 *i2c_data);</div><div class='add'>+</div><div class='add'>+int m5602_write_bridge(</div><div class='add'>+	struct sd *sd, u8 address, u8 i2c_data);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/media/video/gspca/m5602/m5602_core.c b/drivers/media/video/gspca/m5602/m5602_core.c<br/>new file mode 100644<br/>index 000000000000..fd6ce384b487<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/gspca/m5602/m5602_core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/m5602/m5602_core.c</a></div><div class='hunk'>@@ -0,0 +1,309 @@</div><div class='add'>+ /*</div><div class='add'>+ * USB Driver for ALi m5602 based webcams</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2008 Erik Andrén</div><div class='add'>+ * Copyright (C) 2007 Ilyes Gouta. Based on the m5603x Linux Driver Project.</div><div class='add'>+ * Copyright (C) 2005 m5603x Linux Driver Project &lt;m5602@x3ng.com.br&gt;</div><div class='add'>+ *</div><div class='add'>+ * Portions of code to USB interface and ALi driver software,</div><div class='add'>+ * Copyright (c) 2006 Willem Duinker</div><div class='add'>+ * v4l2 interface modeled after the V4L2 driver</div><div class='add'>+ * for SN9C10x PC Camera Controllers</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public License as</div><div class='add'>+ * published by the Free Software Foundation, version 2.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "m5602_ov9650.h"</div><div class='add'>+#include "m5602_mt9m111.h"</div><div class='add'>+#include "m5602_po1030.h"</div><div class='add'>+#include "m5602_s5k83a.h"</div><div class='add'>+#include "m5602_s5k4aa.h"</div><div class='add'>+</div><div class='add'>+/* Kernel module parameters */</div><div class='add'>+int force_sensor;</div><div class='add'>+int dump_bridge;</div><div class='add'>+int dump_sensor;</div><div class='add'>+</div><div class='add'>+static const __devinitdata struct usb_device_id m5602_table[] = {</div><div class='add'>+	{USB_DEVICE(0x0402, 0x5602)},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_DEVICE_TABLE(usb, m5602_table);</div><div class='add'>+</div><div class='add'>+/* Reads a byte from the m5602 */</div><div class='add'>+int m5602_read_bridge(struct sd *sd, u8 address, u8 *i2c_data)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	struct usb_device *udev = sd-&gt;gspca_dev.dev;</div><div class='add'>+	__u8 *buf = sd-&gt;gspca_dev.usb_buf;</div><div class='add'>+</div><div class='add'>+	err = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),</div><div class='add'>+			      0x04, 0xc0, 0x14,</div><div class='add'>+			      0x8100 + address, buf,</div><div class='add'>+			      1, M5602_URB_MSG_TIMEOUT);</div><div class='add'>+	*i2c_data = buf[0];</div><div class='add'>+</div><div class='add'>+	PDEBUG(D_CONF, "Reading bridge register 0x%x containing 0x%x",</div><div class='add'>+	       address, *i2c_data);</div><div class='add'>+</div><div class='add'>+	/* usb_control_msg(...) returns the number of bytes sent upon success,</div><div class='add'>+	mask that and return zero upon success instead*/</div><div class='add'>+	return (err &lt; 0) ? err : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Writes a byte to to the m5602 */</div><div class='add'>+int m5602_write_bridge(struct sd *sd, u8 address, u8 i2c_data)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	struct usb_device *udev = sd-&gt;gspca_dev.dev;</div><div class='add'>+	__u8 *buf = sd-&gt;gspca_dev.usb_buf;</div><div class='add'>+</div><div class='add'>+	PDEBUG(D_CONF, "Writing bridge register 0x%x with 0x%x",</div><div class='add'>+	       address, i2c_data);</div><div class='add'>+</div><div class='add'>+	memcpy(buf, bridge_urb_skeleton,</div><div class='add'>+	       sizeof(bridge_urb_skeleton));</div><div class='add'>+	buf[1] = address;</div><div class='add'>+	buf[3] = i2c_data;</div><div class='add'>+</div><div class='add'>+	err = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),</div><div class='add'>+				0x04, 0x40, 0x19,</div><div class='add'>+				0x0000, buf,</div><div class='add'>+				4, M5602_URB_MSG_TIMEOUT);</div><div class='add'>+</div><div class='add'>+	/* usb_control_msg(...) returns the number of bytes sent upon success,</div><div class='add'>+	   mask that and return zero upon success instead */</div><div class='add'>+	return (err &lt; 0) ? err : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Dump all the registers of the m5602 bridge,</div><div class='add'>+   unfortunately this breaks the camera until it's power cycled */</div><div class='add'>+static void m5602_dump_bridge(struct sd *sd)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	for (i = 0; i &lt; 0x80; i++) {</div><div class='add'>+		unsigned char val = 0;</div><div class='add'>+		m5602_read_bridge(sd, i, &amp;val);</div><div class='add'>+		info("ALi m5602 address 0x%x contains 0x%x", i, val);</div><div class='add'>+	}</div><div class='add'>+	info("Warning: The ALi m5602 webcam probably won't work "</div><div class='add'>+		"until it's power cycled");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int m5602_probe_sensor(struct sd *sd)</div><div class='add'>+{</div><div class='add'>+	/* Try the po1030 */</div><div class='add'>+	sd-&gt;sensor = &amp;po1030;</div><div class='add'>+	if (!sd-&gt;sensor-&gt;probe(sd))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Try the mt9m111 sensor */</div><div class='add'>+	sd-&gt;sensor = &amp;mt9m111;</div><div class='add'>+	if (!sd-&gt;sensor-&gt;probe(sd))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Try the s5k4aa */</div><div class='add'>+	sd-&gt;sensor = &amp;s5k4aa;</div><div class='add'>+	if (!sd-&gt;sensor-&gt;probe(sd))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Try the ov9650 */</div><div class='add'>+	sd-&gt;sensor = &amp;ov9650;</div><div class='add'>+	if (!sd-&gt;sensor-&gt;probe(sd))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Try the s5k83a */</div><div class='add'>+	sd-&gt;sensor = &amp;s5k83a;</div><div class='add'>+	if (!sd-&gt;sensor-&gt;probe(sd))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* More sensor probe function goes here */</div><div class='add'>+	info("Failed to find a sensor");</div><div class='add'>+	sd-&gt;sensor = NULL;</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int m5602_configure(struct gspca_dev *gspca_dev,</div><div class='add'>+			   const struct usb_device_id *id);</div><div class='add'>+</div><div class='add'>+static int m5602_init(struct gspca_dev *gspca_dev)</div><div class='add'>+{</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	PDEBUG(D_CONF, "Initializing ALi m5602 webcam");</div><div class='add'>+	/* Run the init sequence */</div><div class='add'>+	err = sd-&gt;sensor-&gt;init(sd);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int m5602_start_transfer(struct gspca_dev *gspca_dev)</div><div class='add'>+{</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+	__u8 *buf = sd-&gt;gspca_dev.usb_buf;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Send start command to the camera */</div><div class='add'>+	const u8 buffer[4] = {0x13, 0xf9, 0x0f, 0x01};</div><div class='add'>+	memcpy(buf, buffer, sizeof(buffer));</div><div class='add'>+	err = usb_control_msg(gspca_dev-&gt;dev,</div><div class='add'>+			      usb_sndctrlpipe(gspca_dev-&gt;dev, 0),</div><div class='add'>+			      0x04, 0x40, 0x19, 0x0000, buf,</div><div class='add'>+			      4, M5602_URB_MSG_TIMEOUT);</div><div class='add'>+</div><div class='add'>+	PDEBUG(D_STREAM, "Transfer started");</div><div class='add'>+	return (err &lt; 0) ? err : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void m5602_urb_complete(struct gspca_dev *gspca_dev,</div><div class='add'>+			struct gspca_frame *frame,</div><div class='add'>+			__u8 *data, int len)</div><div class='add'>+{</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+</div><div class='add'>+	if (len &lt; 6) {</div><div class='add'>+		PDEBUG(D_PACK, "Packet is less than 6 bytes");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Frame delimiter: ff xx xx xx ff ff */</div><div class='add'>+	if (data[0] == 0xff &amp;&amp; data[4] == 0xff &amp;&amp; data[5] == 0xff &amp;&amp;</div><div class='add'>+	    data[2] != sd-&gt;frame_id) {</div><div class='add'>+		PDEBUG(D_FRAM, "Frame delimiter detected");</div><div class='add'>+		sd-&gt;frame_id = data[2];</div><div class='add'>+</div><div class='add'>+		/* Remove the extra fluff appended on each header */</div><div class='add'>+		data += 6;</div><div class='add'>+		len -= 6;</div><div class='add'>+</div><div class='add'>+		/* Complete the last frame (if any) */</div><div class='add'>+		frame = gspca_frame_add(gspca_dev, LAST_PACKET,</div><div class='add'>+					frame, data, 0);</div><div class='add'>+		sd-&gt;frame_count++;</div><div class='add'>+</div><div class='add'>+		/* Create a new frame */</div><div class='add'>+		gspca_frame_add(gspca_dev, FIRST_PACKET, frame, data, len);</div><div class='add'>+</div><div class='add'>+		PDEBUG(D_FRAM, "Starting new frame %d",</div><div class='add'>+		       sd-&gt;frame_count);</div><div class='add'>+</div><div class='add'>+	} else {</div><div class='add'>+		int cur_frame_len = frame-&gt;data_end - frame-&gt;data;</div><div class='add'>+</div><div class='add'>+		/* Remove urb header */</div><div class='add'>+		data += 4;</div><div class='add'>+		len -= 4;</div><div class='add'>+</div><div class='add'>+		if (cur_frame_len + len &lt;= frame-&gt;v4l2_buf.length) {</div><div class='add'>+			PDEBUG(D_FRAM, "Continuing frame %d copying %d bytes",</div><div class='add'>+			       sd-&gt;frame_count, len);</div><div class='add'>+</div><div class='add'>+			gspca_frame_add(gspca_dev, INTER_PACKET, frame,</div><div class='add'>+					data, len);</div><div class='add'>+		} else if (frame-&gt;v4l2_buf.length - cur_frame_len &gt; 0) {</div><div class='add'>+			/* Add the remaining data up to frame size */</div><div class='add'>+			gspca_frame_add(gspca_dev, INTER_PACKET, frame, data,</div><div class='add'>+					frame-&gt;v4l2_buf.length - cur_frame_len);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void m5602_stop_transfer(struct gspca_dev *gspca_dev)</div><div class='add'>+{</div><div class='add'>+	/* Is there are a command to stop a data transfer? */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* sub-driver description, the ctrl and nctrl is filled at probe time */</div><div class='add'>+static struct sd_desc sd_desc = {</div><div class='add'>+	.name		= MODULE_NAME,</div><div class='add'>+	.config		= m5602_configure,</div><div class='add'>+	.init		= m5602_init,</div><div class='add'>+	.start		= m5602_start_transfer,</div><div class='add'>+	.stopN		= m5602_stop_transfer,</div><div class='add'>+	.pkt_scan	= m5602_urb_complete</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* this function is called at probe time */</div><div class='add'>+static int m5602_configure(struct gspca_dev *gspca_dev,</div><div class='add'>+			   const struct usb_device_id *id)</div><div class='add'>+{</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+	struct cam *cam;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	cam = &amp;gspca_dev-&gt;cam;</div><div class='add'>+	cam-&gt;epaddr = M5602_ISOC_ENDPOINT_ADDR;</div><div class='add'>+	sd-&gt;desc = &amp;sd_desc;</div><div class='add'>+</div><div class='add'>+	if (dump_bridge)</div><div class='add'>+		m5602_dump_bridge(sd);</div><div class='add'>+</div><div class='add'>+	/* Probe sensor */</div><div class='add'>+	err = m5602_probe_sensor(sd);</div><div class='add'>+	if (err)</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+fail:</div><div class='add'>+	PDEBUG(D_ERR, "ALi m5602 webcam failed");</div><div class='add'>+	cam-&gt;cam_mode = NULL;</div><div class='add'>+	cam-&gt;nmodes = 0;</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int m5602_probe(struct usb_interface *intf,</div><div class='add'>+		       const struct usb_device_id *id)</div><div class='add'>+{</div><div class='add'>+	return gspca_dev_probe(intf, id, &amp;sd_desc, sizeof(struct sd),</div><div class='add'>+			       THIS_MODULE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct usb_driver sd_driver = {</div><div class='add'>+	.name = MODULE_NAME,</div><div class='add'>+	.id_table = m5602_table,</div><div class='add'>+	.probe = m5602_probe,</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+	.suspend = gspca_suspend,</div><div class='add'>+	.resume = gspca_resume,</div><div class='add'>+#endif</div><div class='add'>+	.disconnect = gspca_disconnect</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* -- module insert / remove -- */</div><div class='add'>+static int __init mod_m5602_init(void)</div><div class='add'>+{</div><div class='add'>+	if (usb_register(&amp;sd_driver) &lt; 0)</div><div class='add'>+		return -1;</div><div class='add'>+	PDEBUG(D_PROBE, "registered");</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+static void __exit mod_m5602_exit(void)</div><div class='add'>+{</div><div class='add'>+	usb_deregister(&amp;sd_driver);</div><div class='add'>+	PDEBUG(D_PROBE, "deregistered");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(mod_m5602_init);</div><div class='add'>+module_exit(mod_m5602_exit);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR(DRIVER_AUTHOR);</div><div class='add'>+MODULE_DESCRIPTION(DRIVER_DESC);</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+module_param(force_sensor, int, S_IRUGO | S_IWUSR);</div><div class='add'>+MODULE_PARM_DESC(force_sensor,</div><div class='add'>+		"force detection of sensor, "</div><div class='add'>+		"1 = OV9650, 2 = S5K83A, 3 = S5K4AA, 4 = MT9M111, 5 = PO1030");</div><div class='add'>+</div><div class='add'>+module_param(dump_bridge, bool, S_IRUGO | S_IWUSR);</div><div class='add'>+MODULE_PARM_DESC(dump_bridge, "Dumps all usb bridge registers at startup");</div><div class='add'>+</div><div class='add'>+module_param(dump_sensor, bool, S_IRUGO | S_IWUSR);</div><div class='add'>+MODULE_PARM_DESC(dump_sensor, "Dumps all usb sensor registers "</div><div class='add'>+		"at startup providing a sensor is found");</div><div class='head'>diff --git a/drivers/media/video/gspca/m5602/m5602_mt9m111.c b/drivers/media/video/gspca/m5602/m5602_mt9m111.c<br/>new file mode 100644<br/>index 000000000000..fb700c2d055a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/gspca/m5602/m5602_mt9m111.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/m5602/m5602_mt9m111.c</a></div><div class='hunk'>@@ -0,0 +1,345 @@</div><div class='add'>+/*</div><div class='add'>+ * Driver for the mt9m111 sensor</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2008 Erik Andrén</div><div class='add'>+ * Copyright (C) 2007 Ilyes Gouta. Based on the m5603x Linux Driver Project.</div><div class='add'>+ * Copyright (C) 2005 m5603x Linux Driver Project &lt;m5602@x3ng.com.br&gt;</div><div class='add'>+ *</div><div class='add'>+ * Portions of code to USB interface and ALi driver software,</div><div class='add'>+ * Copyright (c) 2006 Willem Duinker</div><div class='add'>+ * v4l2 interface modeled after the V4L2 driver</div><div class='add'>+ * for SN9C10x PC Camera Controllers</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public License as</div><div class='add'>+ * published by the Free Software Foundation, version 2.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "m5602_mt9m111.h"</div><div class='add'>+</div><div class='add'>+int mt9m111_probe(struct sd *sd)</div><div class='add'>+{</div><div class='add'>+	u8 data[2] = {0x00, 0x00};</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (force_sensor) {</div><div class='add'>+		if (force_sensor == MT9M111_SENSOR) {</div><div class='add'>+			info("Forcing a %s sensor", mt9m111.name);</div><div class='add'>+			goto sensor_found;</div><div class='add'>+		}</div><div class='add'>+		/* If we want to force another sensor, don't try to probe this</div><div class='add'>+		 * one */</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	info("Probing for a mt9m111 sensor");</div><div class='add'>+</div><div class='add'>+	/* Do the preinit */</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(preinit_mt9m111); i++) {</div><div class='add'>+		if (preinit_mt9m111[i][0] == BRIDGE) {</div><div class='add'>+			m5602_write_bridge(sd,</div><div class='add'>+				preinit_mt9m111[i][1],</div><div class='add'>+				preinit_mt9m111[i][2]);</div><div class='add'>+		} else {</div><div class='add'>+			data[0] = preinit_mt9m111[i][2];</div><div class='add'>+			data[1] = preinit_mt9m111[i][3];</div><div class='add'>+			mt9m111_write_sensor(sd,</div><div class='add'>+				preinit_mt9m111[i][1], data, 2);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (mt9m111_read_sensor(sd, MT9M111_SC_CHIPVER, data, 2))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	if ((data[0] == 0x14) &amp;&amp; (data[1] == 0x3a)) {</div><div class='add'>+		info("Detected a mt9m111 sensor");</div><div class='add'>+		goto sensor_found;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -ENODEV;</div><div class='add'>+</div><div class='add'>+sensor_found:</div><div class='add'>+	sd-&gt;gspca_dev.cam.cam_mode = mt9m111.modes;</div><div class='add'>+	sd-&gt;gspca_dev.cam.nmodes = mt9m111.nmodes;</div><div class='add'>+	sd-&gt;desc-&gt;ctrls = mt9m111.ctrls;</div><div class='add'>+	sd-&gt;desc-&gt;nctrls = mt9m111.nctrls;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt9m111_init(struct sd *sd)</div><div class='add'>+{</div><div class='add'>+	int i, err = 0;</div><div class='add'>+</div><div class='add'>+	/* Init the sensor */</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(init_mt9m111); i++) {</div><div class='add'>+		u8 data[2];</div><div class='add'>+</div><div class='add'>+		if (init_mt9m111[i][0] == BRIDGE) {</div><div class='add'>+			err = m5602_write_bridge(sd,</div><div class='add'>+				init_mt9m111[i][1],</div><div class='add'>+				init_mt9m111[i][2]);</div><div class='add'>+		} else {</div><div class='add'>+			data[0] = init_mt9m111[i][2];</div><div class='add'>+			data[1] = init_mt9m111[i][3];</div><div class='add'>+			err = mt9m111_write_sensor(sd,</div><div class='add'>+				init_mt9m111[i][1], data, 2);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dump_sensor)</div><div class='add'>+		mt9m111_dump_registers(sd);</div><div class='add'>+</div><div class='add'>+	return (err &lt; 0) ? err : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt9m111_power_down(struct sd *sd)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt9m111_get_vflip(struct gspca_dev *gspca_dev, __s32 *val)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	u8 data[2] = {0x00, 0x00};</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+</div><div class='add'>+	err = mt9m111_read_sensor(sd, MT9M111_SC_R_MODE_CONTEXT_B,</div><div class='add'>+				  data, 2);</div><div class='add'>+	*val = data[0] &amp; MT9M111_RMB_MIRROR_ROWS;</div><div class='add'>+	PDEBUG(D_V4L2, "Read vertical flip %d", *val);</div><div class='add'>+</div><div class='add'>+	return (err &lt; 0) ? err : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt9m111_set_vflip(struct gspca_dev *gspca_dev, __s32 val)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	u8 data[2] = {0x00, 0x00};</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+</div><div class='add'>+	PDEBUG(D_V4L2, "Set vertical flip to %d", val);</div><div class='add'>+</div><div class='add'>+	/* Set the correct page map */</div><div class='add'>+	err = mt9m111_write_sensor(sd, MT9M111_PAGE_MAP, data, 2);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = mt9m111_read_sensor(sd, MT9M111_SC_R_MODE_CONTEXT_B, data, 2);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	data[0] = (data[0] &amp; 0xfe) | val;</div><div class='add'>+	err = mt9m111_write_sensor(sd, MT9M111_SC_R_MODE_CONTEXT_B,</div><div class='add'>+				   data, 2);</div><div class='add'>+out:</div><div class='add'>+	return (err &lt; 0) ? err : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt9m111_get_hflip(struct gspca_dev *gspca_dev, __s32 *val)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	u8 data[2] = {0x00, 0x00};</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+</div><div class='add'>+	err = mt9m111_read_sensor(sd, MT9M111_SC_R_MODE_CONTEXT_B,</div><div class='add'>+				  data, 2);</div><div class='add'>+	*val = data[0] &amp; MT9M111_RMB_MIRROR_COLS;</div><div class='add'>+	PDEBUG(D_V4L2, "Read horizontal flip %d", *val);</div><div class='add'>+</div><div class='add'>+	return (err &lt; 0) ? err : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt9m111_set_hflip(struct gspca_dev *gspca_dev, __s32 val)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	u8 data[2] = {0x00, 0x00};</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+</div><div class='add'>+	PDEBUG(D_V4L2, "Set horizontal flip to %d", val);</div><div class='add'>+</div><div class='add'>+	/* Set the correct page map */</div><div class='add'>+	err = mt9m111_write_sensor(sd, MT9M111_PAGE_MAP, data, 2);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = mt9m111_read_sensor(sd, MT9M111_SC_R_MODE_CONTEXT_B, data, 2);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	data[0] = (data[0] &amp; 0xfd) | ((val &lt;&lt; 1) &amp; 0x02);</div><div class='add'>+	err = mt9m111_write_sensor(sd, MT9M111_SC_R_MODE_CONTEXT_B,</div><div class='add'>+					data, 2);</div><div class='add'>+out:</div><div class='add'>+	return (err &lt; 0) ? err : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt9m111_get_gain(struct gspca_dev *gspca_dev, __s32 *val)</div><div class='add'>+{</div><div class='add'>+	int err, tmp;</div><div class='add'>+	u8 data[2] = {0x00, 0x00};</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+</div><div class='add'>+	err = mt9m111_read_sensor(sd, MT9M111_SC_GLOBAL_GAIN, data, 2);</div><div class='add'>+	tmp = ((data[1] &lt;&lt; 8) | data[0]);</div><div class='add'>+</div><div class='add'>+	*val = ((tmp &amp; (1 &lt;&lt; 10)) * 2) |</div><div class='add'>+	      ((tmp &amp; (1 &lt;&lt;  9)) * 2) |</div><div class='add'>+	      ((tmp &amp; (1 &lt;&lt;  8)) * 2) |</div><div class='add'>+	       (tmp &amp; 0x7f);</div><div class='add'>+</div><div class='add'>+	PDEBUG(D_V4L2, "Read gain %d", *val);</div><div class='add'>+</div><div class='add'>+	return (err &lt; 0) ? err : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt9m111_set_gain(struct gspca_dev *gspca_dev, __s32 val)</div><div class='add'>+{</div><div class='add'>+	int err, tmp;</div><div class='add'>+	u8 data[2] = {0x00, 0x00};</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+</div><div class='add'>+	/* Set the correct page map */</div><div class='add'>+	err = mt9m111_write_sensor(sd, MT9M111_PAGE_MAP, data, 2);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (val &gt;= INITIAL_MAX_GAIN * 2 * 2 * 2)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if ((val &gt;= INITIAL_MAX_GAIN * 2 * 2) &amp;&amp;</div><div class='add'>+	    (val &lt; (INITIAL_MAX_GAIN - 1) * 2 * 2 * 2))</div><div class='add'>+		tmp = (1 &lt;&lt; 10) | (val &lt;&lt; 9) |</div><div class='add'>+				(val &lt;&lt; 8) | (val / 8);</div><div class='add'>+	else if ((val &gt;= INITIAL_MAX_GAIN * 2) &amp;&amp;</div><div class='add'>+		 (val &lt;  INITIAL_MAX_GAIN * 2 * 2))</div><div class='add'>+		tmp = (1 &lt;&lt; 9) | (1 &lt;&lt; 8) | (val / 4);</div><div class='add'>+	else if ((val &gt;= INITIAL_MAX_GAIN) &amp;&amp;</div><div class='add'>+		 (val &lt; INITIAL_MAX_GAIN * 2))</div><div class='add'>+		tmp = (1 &lt;&lt; 8) | (val / 2);</div><div class='add'>+	else</div><div class='add'>+		tmp = val;</div><div class='add'>+</div><div class='add'>+	data[1] = (tmp &amp; 0xff00) &gt;&gt; 8;</div><div class='add'>+	data[0] = (tmp &amp; 0xff);</div><div class='add'>+	PDEBUG(D_V4L2, "tmp=%d, data[1]=%d, data[0]=%d", tmp,</div><div class='add'>+	       data[1], data[0]);</div><div class='add'>+</div><div class='add'>+	err = mt9m111_write_sensor(sd, MT9M111_SC_GLOBAL_GAIN,</div><div class='add'>+				   data, 2);</div><div class='add'>+out:</div><div class='add'>+	return (err &lt; 0) ? err : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt9m111_read_sensor(struct sd *sd, const u8 address,</div><div class='add'>+			u8 *i2c_data, const u8 len) {</div><div class='add'>+	int err, i;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		err = m5602_read_bridge(sd, M5602_XB_I2C_STATUS, i2c_data);</div><div class='add'>+	} while ((*i2c_data &amp; I2C_BUSY) &amp;&amp; !err);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = m5602_write_bridge(sd, M5602_XB_I2C_DEV_ADDR,</div><div class='add'>+				 sd-&gt;sensor-&gt;i2c_slave_id);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = m5602_write_bridge(sd, M5602_XB_I2C_REG_ADDR, address);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = m5602_write_bridge(sd, M5602_XB_I2C_CTRL, 0x1a);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; len &amp;&amp; !err; i++) {</div><div class='add'>+		err = m5602_read_bridge(sd, M5602_XB_I2C_DATA, &amp;(i2c_data[i]));</div><div class='add'>+</div><div class='add'>+		PDEBUG(D_CONF, "Reading sensor register "</div><div class='add'>+		       "0x%x contains 0x%x ", address, *i2c_data);</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	return (err &lt; 0) ? err : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt9m111_write_sensor(struct sd *sd, const u8 address,</div><div class='add'>+				u8 *i2c_data, const u8 len)</div><div class='add'>+{</div><div class='add'>+	int err, i;</div><div class='add'>+	u8 *p;</div><div class='add'>+	struct usb_device *udev = sd-&gt;gspca_dev.dev;</div><div class='add'>+	__u8 *buf = sd-&gt;gspca_dev.usb_buf;</div><div class='add'>+</div><div class='add'>+	/* No sensor with a data width larger</div><div class='add'>+	   than 16 bits has yet been seen, nor with 0 :p*/</div><div class='add'>+	if (len &gt; 2 || !len)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	memcpy(buf, sensor_urb_skeleton,</div><div class='add'>+	       sizeof(sensor_urb_skeleton));</div><div class='add'>+</div><div class='add'>+	buf[11] = sd-&gt;sensor-&gt;i2c_slave_id;</div><div class='add'>+	buf[15] = address;</div><div class='add'>+</div><div class='add'>+	p = buf + 16;</div><div class='add'>+</div><div class='add'>+	/* Copy a four byte write sequence for each byte to be written to */</div><div class='add'>+	for (i = 0; i &lt; len; i++) {</div><div class='add'>+		memcpy(p, sensor_urb_skeleton + 16, 4);</div><div class='add'>+		p[3] = i2c_data[i];</div><div class='add'>+		p += 4;</div><div class='add'>+		PDEBUG(D_CONF, "Writing sensor register 0x%x with 0x%x",</div><div class='add'>+		       address, i2c_data[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Copy the tailer */</div><div class='add'>+	memcpy(p, sensor_urb_skeleton + 20, 4);</div><div class='add'>+</div><div class='add'>+	/* Set the total length */</div><div class='add'>+	p[3] = 0x10 + len;</div><div class='add'>+</div><div class='add'>+	err = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),</div><div class='add'>+			      0x04, 0x40, 0x19,</div><div class='add'>+			      0x0000, buf,</div><div class='add'>+			      20 + len * 4, M5602_URB_MSG_TIMEOUT);</div><div class='add'>+</div><div class='add'>+	return (err &lt; 0) ? err : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mt9m111_dump_registers(struct sd *sd)</div><div class='add'>+{</div><div class='add'>+	u8 address, value[2] = {0x00, 0x00};</div><div class='add'>+</div><div class='add'>+	info("Dumping the mt9m111 register state");</div><div class='add'>+</div><div class='add'>+	info("Dumping the mt9m111 sensor core registers");</div><div class='add'>+	value[1] = MT9M111_SENSOR_CORE;</div><div class='add'>+	mt9m111_write_sensor(sd, MT9M111_PAGE_MAP, value, 2);</div><div class='add'>+	for (address = 0; address &lt; 0xff; address++) {</div><div class='add'>+		mt9m111_read_sensor(sd, address, value, 2);</div><div class='add'>+		info("register 0x%x contains 0x%x%x",</div><div class='add'>+		     address, value[0], value[1]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	info("Dumping the mt9m111 color pipeline registers");</div><div class='add'>+	value[1] = MT9M111_COLORPIPE;</div><div class='add'>+	mt9m111_write_sensor(sd, MT9M111_PAGE_MAP, value, 2);</div><div class='add'>+	for (address = 0; address &lt; 0xff; address++) {</div><div class='add'>+		mt9m111_read_sensor(sd, address, value, 2);</div><div class='add'>+		info("register 0x%x contains 0x%x%x",</div><div class='add'>+		     address, value[0], value[1]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	info("Dumping the mt9m111 camera control registers");</div><div class='add'>+	value[1] = MT9M111_CAMERA_CONTROL;</div><div class='add'>+	mt9m111_write_sensor(sd, MT9M111_PAGE_MAP, value, 2);</div><div class='add'>+	for (address = 0; address &lt; 0xff; address++) {</div><div class='add'>+		mt9m111_read_sensor(sd, address, value, 2);</div><div class='add'>+		info("register 0x%x contains 0x%x%x",</div><div class='add'>+		     address, value[0], value[1]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	info("mt9m111 register state dump complete");</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/media/video/gspca/m5602/m5602_mt9m111.h b/drivers/media/video/gspca/m5602/m5602_mt9m111.h<br/>new file mode 100644<br/>index 000000000000..315209d5aeef<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/gspca/m5602/m5602_mt9m111.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/m5602/m5602_mt9m111.h</a></div><div class='hunk'>@@ -0,0 +1,1019 @@</div><div class='add'>+/*</div><div class='add'>+ * Driver for the mt9m111 sensor</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2008 Erik Andrén</div><div class='add'>+ * Copyright (C) 2007 Ilyes Gouta. Based on the m5603x Linux Driver Project.</div><div class='add'>+ * Copyright (C) 2005 m5603x Linux Driver Project &lt;m5602@x3ng.com.br&gt;</div><div class='add'>+ *</div><div class='add'>+ * Portions of code to USB interface and ALi driver software,</div><div class='add'>+ * Copyright (c) 2006 Willem Duinker</div><div class='add'>+ * v4l2 interface modeled after the V4L2 driver</div><div class='add'>+ * for SN9C10x PC Camera Controllers</div><div class='add'>+ *</div><div class='add'>+ * Some defines taken from the mt9m111 sensor driver</div><div class='add'>+ * Copyright (C) 2008, Robert Jarzmik &lt;robert.jarzmik@free.fr&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public License as</div><div class='add'>+ * published by the Free Software Foundation, version 2.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef M5602_MT9M111_H_</div><div class='add'>+#define M5602_MT9M111_H_</div><div class='add'>+</div><div class='add'>+#include "m5602_sensor.h"</div><div class='add'>+</div><div class='add'>+/*****************************************************************************/</div><div class='add'>+</div><div class='add'>+#define MT9M111_SC_CHIPVER			0x00</div><div class='add'>+#define MT9M111_SC_ROWSTART			0x01</div><div class='add'>+#define MT9M111_SC_COLSTART			0x02</div><div class='add'>+#define MT9M111_SC_WINDOW_HEIGHT		0x03</div><div class='add'>+#define MT9M111_SC_WINDOW_WIDTH			0x04</div><div class='add'>+#define MT9M111_SC_HBLANK_CONTEXT_B		0x05</div><div class='add'>+#define MT9M111_SC_VBLANK_CONTEXT_B		0x06</div><div class='add'>+#define MT9M111_SC_HBLANK_CONTEXT_A		0x07</div><div class='add'>+#define MT9M111_SC_VBLANK_CONTEXT_A		0x08</div><div class='add'>+#define MT9M111_SC_SHUTTER_WIDTH		0x09</div><div class='add'>+#define MT9M111_SC_ROW_SPEED			0x0a</div><div class='add'>+</div><div class='add'>+#define MT9M111_SC_EXTRA_DELAY			0x0b</div><div class='add'>+#define MT9M111_SC_SHUTTER_DELAY		0x0c</div><div class='add'>+#define MT9M111_SC_RESET			0x0d</div><div class='add'>+#define MT9M111_SC_R_MODE_CONTEXT_B		0x20</div><div class='add'>+#define MT9M111_SC_R_MODE_CONTEXT_A		0x21</div><div class='add'>+#define MT9M111_SC_FLASH_CONTROL		0x23</div><div class='add'>+#define MT9M111_SC_GREEN_1_GAIN			0x2b</div><div class='add'>+#define MT9M111_SC_BLUE_GAIN			0x2c</div><div class='add'>+#define MT9M111_SC_RED_GAIN			0x2d</div><div class='add'>+#define MT9M111_SC_GREEN_2_GAIN			0x2e</div><div class='add'>+#define MT9M111_SC_GLOBAL_GAIN			0x2f</div><div class='add'>+</div><div class='add'>+#define MT9M111_RMB_MIRROR_ROWS			(1 &lt;&lt; 0)</div><div class='add'>+#define MT9M111_RMB_MIRROR_COLS			(1 &lt;&lt; 1)</div><div class='add'>+</div><div class='add'>+#define MT9M111_CONTEXT_CONTROL			0xc8</div><div class='add'>+#define MT9M111_PAGE_MAP			0xf0</div><div class='add'>+#define MT9M111_BYTEWISE_ADDRESS		0xf1</div><div class='add'>+</div><div class='add'>+#define MT9M111_CP_OPERATING_MODE_CTL		0x06</div><div class='add'>+#define MT9M111_CP_LUMA_OFFSET			0x34</div><div class='add'>+#define MT9M111_CP_LUMA_CLIP			0x35</div><div class='add'>+#define MT9M111_CP_OUTPUT_FORMAT_CTL2_CONTEXT_A 0x3a</div><div class='add'>+#define MT9M111_CP_LENS_CORRECTION_1		0x3b</div><div class='add'>+#define MT9M111_CP_DEFECT_CORR_CONTEXT_A	0x4c</div><div class='add'>+#define MT9M111_CP_DEFECT_CORR_CONTEXT_B	0x4d</div><div class='add'>+#define MT9M111_CP_OUTPUT_FORMAT_CTL2_CONTEXT_B 0x9b</div><div class='add'>+#define MT9M111_CP_GLOBAL_CLK_CONTROL		0xb3</div><div class='add'>+</div><div class='add'>+#define MT9M111_CC_AUTO_EXPOSURE_PARAMETER_18   0x65</div><div class='add'>+#define MT9M111_CC_AWB_PARAMETER_7		0x28</div><div class='add'>+</div><div class='add'>+#define MT9M111_SENSOR_CORE			0x00</div><div class='add'>+#define MT9M111_COLORPIPE			0x01</div><div class='add'>+#define MT9M111_CAMERA_CONTROL			0x02</div><div class='add'>+</div><div class='add'>+#define INITIAL_MAX_GAIN			64</div><div class='add'>+#define DEFAULT_GAIN 				283</div><div class='add'>+</div><div class='add'>+/*****************************************************************************/</div><div class='add'>+</div><div class='add'>+/* Kernel module parameters */</div><div class='add'>+extern int force_sensor;</div><div class='add'>+extern int dump_sensor;</div><div class='add'>+</div><div class='add'>+int mt9m111_probe(struct sd *sd);</div><div class='add'>+int mt9m111_init(struct sd *sd);</div><div class='add'>+int mt9m111_power_down(struct sd *sd);</div><div class='add'>+</div><div class='add'>+int mt9m111_read_sensor(struct sd *sd, const u8 address,</div><div class='add'>+			u8 *i2c_data, const u8 len);</div><div class='add'>+</div><div class='add'>+int mt9m111_write_sensor(struct sd *sd, const u8 address,</div><div class='add'>+			 u8 *i2c_data, const u8 len);</div><div class='add'>+</div><div class='add'>+void mt9m111_dump_registers(struct sd *sd);</div><div class='add'>+</div><div class='add'>+int mt9m111_set_vflip(struct gspca_dev *gspca_dev, __s32 val);</div><div class='add'>+int mt9m111_get_vflip(struct gspca_dev *gspca_dev, __s32 *val);</div><div class='add'>+int mt9m111_get_hflip(struct gspca_dev *gspca_dev, __s32 *val);</div><div class='add'>+int mt9m111_set_hflip(struct gspca_dev *gspca_dev, __s32 val);</div><div class='add'>+int mt9m111_get_gain(struct gspca_dev *gspca_dev, __s32 *val);</div><div class='add'>+int mt9m111_set_gain(struct gspca_dev *gspca_dev, __s32 val);</div><div class='add'>+</div><div class='add'>+static struct m5602_sensor mt9m111 = {</div><div class='add'>+	.name = "MT9M111",</div><div class='add'>+</div><div class='add'>+	.i2c_slave_id = 0xba,</div><div class='add'>+</div><div class='add'>+	.probe = mt9m111_probe,</div><div class='add'>+	.init = mt9m111_init,</div><div class='add'>+	.power_down = mt9m111_power_down,</div><div class='add'>+</div><div class='add'>+	.read_sensor = mt9m111_read_sensor,</div><div class='add'>+	.write_sensor = mt9m111_write_sensor,</div><div class='add'>+</div><div class='add'>+	.nctrls = 3,</div><div class='add'>+	.ctrls = {</div><div class='add'>+	{</div><div class='add'>+		{</div><div class='add'>+			.id		= V4L2_CID_VFLIP,</div><div class='add'>+			.type           = V4L2_CTRL_TYPE_BOOLEAN,</div><div class='add'>+			.name           = "vertical flip",</div><div class='add'>+			.minimum        = 0,</div><div class='add'>+			.maximum        = 1,</div><div class='add'>+			.step           = 1,</div><div class='add'>+			.default_value  = 0</div><div class='add'>+		},</div><div class='add'>+		.set = mt9m111_set_vflip,</div><div class='add'>+		.get = mt9m111_get_vflip</div><div class='add'>+	}, {</div><div class='add'>+		{</div><div class='add'>+			.id             = V4L2_CID_HFLIP,</div><div class='add'>+			.type           = V4L2_CTRL_TYPE_BOOLEAN,</div><div class='add'>+			.name           = "horizontal flip",</div><div class='add'>+			.minimum        = 0,</div><div class='add'>+			.maximum        = 1,</div><div class='add'>+			.step           = 1,</div><div class='add'>+			.default_value  = 0</div><div class='add'>+		},</div><div class='add'>+		.set = mt9m111_set_hflip,</div><div class='add'>+		.get = mt9m111_get_hflip</div><div class='add'>+	}, {</div><div class='add'>+		{</div><div class='add'>+			.id             = V4L2_CID_GAIN,</div><div class='add'>+			.type           = V4L2_CTRL_TYPE_INTEGER,</div><div class='add'>+			.name           = "gain",</div><div class='add'>+			.minimum        = 0,</div><div class='add'>+			.maximum        = (INITIAL_MAX_GAIN - 1) * 2 * 2 * 2,</div><div class='add'>+			.step           = 1,</div><div class='add'>+			.default_value  = DEFAULT_GAIN,</div><div class='add'>+			.flags          = V4L2_CTRL_FLAG_SLIDER</div><div class='add'>+		},</div><div class='add'>+		.set = mt9m111_set_gain,</div><div class='add'>+		.get = mt9m111_get_gain</div><div class='add'>+	}</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	.nmodes = 1,</div><div class='add'>+	.modes = {</div><div class='add'>+	{</div><div class='add'>+		M5602_DEFAULT_FRAME_WIDTH,</div><div class='add'>+		M5602_DEFAULT_FRAME_HEIGHT,</div><div class='add'>+		V4L2_PIX_FMT_SBGGR8,</div><div class='add'>+		V4L2_FIELD_NONE,</div><div class='add'>+		.sizeimage =</div><div class='add'>+			M5602_DEFAULT_FRAME_WIDTH * M5602_DEFAULT_FRAME_HEIGHT,</div><div class='add'>+		.bytesperline = M5602_DEFAULT_FRAME_WIDTH,</div><div class='add'>+		.colorspace = V4L2_COLORSPACE_SRGB,</div><div class='add'>+		.priv = 1</div><div class='add'>+	}</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const unsigned char preinit_mt9m111[][4] =</div><div class='add'>+{</div><div class='add'>+	{BRIDGE, M5602_XB_MCU_CLK_DIV, 0x02, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_MCU_CLK_CTRL, 0xb0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SENSOR_TYPE, 0x0d, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SENSOR_CTRL, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SENSOR_TYPE, 0x09, 0x00},</div><div class='add'>+</div><div class='add'>+	{SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},</div><div class='add'>+	{SENSOR, MT9M111_SC_RESET, 0xff, 0xf7},</div><div class='add'>+</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DIR, 0x05, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DAT, 0x04, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_EN_H, 0x3e, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DIR_H, 0x3e, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DAT_H, 0x02, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_EN_L, 0xff, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DIR_L, 0xff, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DAT_L, 0x00, 0x00},</div><div class='add'>+</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DIR, 0x07, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DAT, 0x0b, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_EN_H, 0x06, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_EN_L, 0x00, 0x00},</div><div class='add'>+</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_CLK_DIV, 0x0a, 0x00}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const unsigned char init_mt9m111[][4] =</div><div class='add'>+{</div><div class='add'>+	{BRIDGE, M5602_XB_MCU_CLK_DIV, 0x02, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_MCU_CLK_CTRL, 0xb0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SENSOR_TYPE, 0x0d, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SENSOR_CTRL, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SENSOR_TYPE, 0x09, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},</div><div class='add'>+</div><div class='add'>+	{SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},</div><div class='add'>+	{SENSOR, MT9M111_SC_RESET, 0xff, 0xff},</div><div class='add'>+	{SENSOR, MT9M111_SC_RESET, 0xff, 0xff},</div><div class='add'>+	{SENSOR, MT9M111_SC_RESET, 0xff, 0xde},</div><div class='add'>+	{SENSOR, MT9M111_SC_RESET, 0xff, 0xff},</div><div class='add'>+	{SENSOR, MT9M111_SC_RESET, 0xff, 0xf7},</div><div class='add'>+	{SENSOR, MT9M111_PAGE_MAP, 0x00, 0x01},</div><div class='add'>+</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_REG_ADDR, 0xb3, 0x00},</div><div class='add'>+</div><div class='add'>+	{SENSOR, MT9M111_CP_GLOBAL_CLK_CONTROL, 0xff, 0xff},</div><div class='add'>+</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DIR, 0x05, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DAT, 0x04, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_EN_H, 0x3e, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DIR_H, 0x3e, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DAT_H, 0x02, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_EN_L, 0xff, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DIR_L, 0xff, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DAT_L, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_DIV, 0x04, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SENSOR_TYPE, 0x09, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DIR, 0x07, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DAT, 0x0b, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_EN_H, 0x06, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_EN_L, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_CLK_DIV, 0x0a, 0x00},</div><div class='add'>+</div><div class='add'>+	{SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},</div><div class='add'>+	{SENSOR, MT9M111_SC_RESET, 0x00, 0x05},</div><div class='add'>+	{SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},</div><div class='add'>+	{SENSOR, MT9M111_SC_RESET, 0x00, 0x29},</div><div class='add'>+	{SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},</div><div class='add'>+	{SENSOR, MT9M111_SC_RESET, 0x00, 0x08},</div><div class='add'>+	{SENSOR, MT9M111_PAGE_MAP, 0x00, 0x01},</div><div class='add'>+	{SENSOR, MT9M111_CP_OPERATING_MODE_CTL, 0x00, 0x10},</div><div class='add'>+	{SENSOR, MT9M111_CP_LENS_CORRECTION_1, 0x04, 0x2a},</div><div class='add'>+	{SENSOR, MT9M111_CP_DEFECT_CORR_CONTEXT_A, 0x00, 0x01},</div><div class='add'>+	{SENSOR, MT9M111_CP_DEFECT_CORR_CONTEXT_B, 0x00, 0x01},</div><div class='add'>+	{SENSOR, MT9M111_CP_LUMA_OFFSET, 0x00, 0x00},</div><div class='add'>+	{SENSOR, MT9M111_CP_LUMA_CLIP, 0xff, 0x00},</div><div class='add'>+	{SENSOR, MT9M111_CP_OUTPUT_FORMAT_CTL2_CONTEXT_A, 0x14, 0x00},</div><div class='add'>+	{SENSOR, MT9M111_CP_OUTPUT_FORMAT_CTL2_CONTEXT_B, 0x14, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_REG_ADDR, 0xcd, 0x00},</div><div class='add'>+</div><div class='add'>+	{SENSOR, 0xcd, 0x00, 0x0e},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_REG_ADDR, 0xd0, 0x00},</div><div class='add'>+	{SENSOR, 0xd0, 0x00, 0x40},</div><div class='add'>+	{SENSOR, MT9M111_PAGE_MAP, 0x00, 0x02},</div><div class='add'>+	{SENSOR, MT9M111_CC_AUTO_EXPOSURE_PARAMETER_18, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_REG_ADDR, 0x28, 0x00},</div><div class='add'>+	{SENSOR, MT9M111_CC_AWB_PARAMETER_7, 0xef, 0x07},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_REG_ADDR, 0x28, 0x00},</div><div class='add'>+	{SENSOR, MT9M111_CC_AWB_PARAMETER_7, 0xef, 0x03},</div><div class='add'>+	{SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_REG_ADDR, 0x33, 0x00},</div><div class='add'>+	{SENSOR, 0x33, 0x03, 0x49},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_REG_ADDR, 0x33, 0x00},</div><div class='add'>+</div><div class='add'>+	{SENSOR, 0x33, 0x03, 0x49},</div><div class='add'>+	{SENSOR, 0x34, 0xc0, 0x19},</div><div class='add'>+	{SENSOR, 0x3f, 0x20, 0x20},</div><div class='add'>+	{SENSOR, 0x40, 0x20, 0x20},</div><div class='add'>+	{SENSOR, 0x5a, 0xc0, 0x0a},</div><div class='add'>+	{SENSOR, 0x70, 0x7b, 0x0a},</div><div class='add'>+	{SENSOR, 0x71, 0xff, 0x00},</div><div class='add'>+	{SENSOR, 0x72, 0x19, 0x0e},</div><div class='add'>+	{SENSOR, 0x73, 0x18, 0x0f},</div><div class='add'>+	{SENSOR, 0x74, 0x57, 0x32},</div><div class='add'>+	{SENSOR, 0x75, 0x56, 0x34},</div><div class='add'>+	{SENSOR, 0x76, 0x73, 0x35},</div><div class='add'>+	{SENSOR, 0x77, 0x30, 0x12},</div><div class='add'>+	{SENSOR, 0x78, 0x79, 0x02},</div><div class='add'>+	{SENSOR, 0x79, 0x75, 0x06},</div><div class='add'>+	{SENSOR, 0x7a, 0x77, 0x0a},</div><div class='add'>+	{SENSOR, 0x7b, 0x78, 0x09},</div><div class='add'>+	{SENSOR, 0x7c, 0x7d, 0x06},</div><div class='add'>+	{SENSOR, 0x7d, 0x31, 0x10},</div><div class='add'>+	{SENSOR, 0x7e, 0x00, 0x7e},</div><div class='add'>+	{SENSOR, 0x80, 0x59, 0x04},</div><div class='add'>+	{SENSOR, 0x81, 0x59, 0x04},</div><div class='add'>+	{SENSOR, 0x82, 0x57, 0x0a},</div><div class='add'>+	{SENSOR, 0x83, 0x58, 0x0b},</div><div class='add'>+	{SENSOR, 0x84, 0x47, 0x0c},</div><div class='add'>+	{SENSOR, 0x85, 0x48, 0x0e},</div><div class='add'>+	{SENSOR, 0x86, 0x5b, 0x02},</div><div class='add'>+	{SENSOR, 0x87, 0x00, 0x5c},</div><div class='add'>+	{SENSOR, MT9M111_CONTEXT_CONTROL, 0x00, 0x08},</div><div class='add'>+	{SENSOR, 0x60, 0x00, 0x80},</div><div class='add'>+	{SENSOR, 0x61, 0x00, 0x00},</div><div class='add'>+	{SENSOR, 0x62, 0x00, 0x00},</div><div class='add'>+	{SENSOR, 0x63, 0x00, 0x00},</div><div class='add'>+	{SENSOR, 0x64, 0x00, 0x00},</div><div class='add'>+</div><div class='add'>+	{SENSOR, MT9M111_SC_ROWSTART, 0x00, 0x0d},</div><div class='add'>+	{SENSOR, MT9M111_SC_COLSTART, 0x00, 0x18},</div><div class='add'>+	{SENSOR, MT9M111_SC_WINDOW_HEIGHT, 0x04, 0x04},</div><div class='add'>+	{SENSOR, MT9M111_SC_WINDOW_WIDTH, 0x05, 0x08},</div><div class='add'>+	{SENSOR, MT9M111_SC_HBLANK_CONTEXT_B, 0x01, 0x38},</div><div class='add'>+	{SENSOR, MT9M111_SC_VBLANK_CONTEXT_B, 0x00, 0x11},</div><div class='add'>+	{SENSOR, MT9M111_SC_HBLANK_CONTEXT_A, 0x01, 0x38},</div><div class='add'>+	{SENSOR, MT9M111_SC_VBLANK_CONTEXT_A, 0x00, 0x11},</div><div class='add'>+	{SENSOR, MT9M111_SC_R_MODE_CONTEXT_B, 0x01, 0x03},</div><div class='add'>+	{SENSOR, MT9M111_SC_R_MODE_CONTEXT_A, 0x01, 0x03},</div><div class='add'>+	{SENSOR, 0x30, 0x04, 0x00},</div><div class='add'>+</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_DIV, 0x06, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SENSOR_TYPE, 0x09, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_LINE_OF_FRAME_H, 0x81, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_PIX_OF_LINE_H, 0x82, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SIG_INI, 0x01, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x04, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x04, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SIG_INI, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SIG_INI, 0x02, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_HSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_HSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_HSYNC_PARA, 0x05, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_HSYNC_PARA, 0x07, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SIG_INI, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xa0, 0x00},</div><div class='add'>+	{SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},</div><div class='add'>+	{SENSOR, MT9M111_SC_SHUTTER_WIDTH, 0x01, 0xf4},</div><div class='add'>+	{SENSOR, MT9M111_SC_GLOBAL_GAIN, 0x00, 0xea},</div><div class='add'>+</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_DIV, 0x06, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SENSOR_TYPE, 0x09, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_LINE_OF_FRAME_H, 0x81, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_PIX_OF_LINE_H, 0x82, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SIG_INI, 0x01, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x04, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x04, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SIG_INI, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SIG_INI, 0x02, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_HSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_HSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_HSYNC_PARA, 0x05, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_HSYNC_PARA, 0x07, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SIG_INI, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},</div><div class='add'>+</div><div class='add'>+	{SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},</div><div class='add'>+	{SENSOR, MT9M111_SC_RESET, 0x00, 0x09},</div><div class='add'>+	{SENSOR, MT9M111_SC_RESET, 0x00, 0x29},</div><div class='add'>+	{SENSOR, MT9M111_SC_RESET, 0x00, 0x08},</div><div class='add'>+	{SENSOR, MT9M111_SC_RESET, 0x00, 0x0c},</div><div class='add'>+	{SENSOR, MT9M111_SC_RESET, 0x00, 0x04},</div><div class='add'>+	{SENSOR, MT9M111_PAGE_MAP, 0x00, 0x01},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_REG_ADDR, 0xb3, 0x00},</div><div class='add'>+	{SENSOR, MT9M111_CP_GLOBAL_CLK_CONTROL, 0x00, 0x03},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DIR, 0x05, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DAT, 0x04, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_EN_H, 0x3e, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DIR_H, 0x3e, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DAT_H, 0x02, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_EN_L, 0xff, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DIR_L, 0xff, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DAT_L, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_DIV, 0x04, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SENSOR_TYPE, 0x09, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DIR, 0x07, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DAT, 0x0b, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_EN_H, 0x06, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_EN_L, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_CLK_DIV, 0x0a, 0x00},</div><div class='add'>+</div><div class='add'>+	{SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},</div><div class='add'>+	{SENSOR, MT9M111_SC_RESET, 0x00, 0x05},</div><div class='add'>+	{SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},</div><div class='add'>+	{SENSOR, MT9M111_SC_RESET, 0x00, 0x29},</div><div class='add'>+	{SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},</div><div class='add'>+	{SENSOR, MT9M111_SC_RESET, 0x00, 0x08},</div><div class='add'>+	{SENSOR, MT9M111_PAGE_MAP, 0x00, 0x01},</div><div class='add'>+	{SENSOR, MT9M111_CP_OPERATING_MODE_CTL, 0x00, 0x10},</div><div class='add'>+	{SENSOR, MT9M111_CP_LENS_CORRECTION_1, 0x04, 0x2a},</div><div class='add'>+	{SENSOR, MT9M111_CP_DEFECT_CORR_CONTEXT_A, 0x00, 0x01},</div><div class='add'>+	{SENSOR, MT9M111_CP_DEFECT_CORR_CONTEXT_B, 0x00, 0x01},</div><div class='add'>+	{SENSOR, MT9M111_CP_LUMA_OFFSET, 0x00, 0x00},</div><div class='add'>+	{SENSOR, MT9M111_CP_LUMA_CLIP, 0xff, 0x00},</div><div class='add'>+	{SENSOR, MT9M111_CP_OUTPUT_FORMAT_CTL2_CONTEXT_A, 0x14, 0x00},</div><div class='add'>+	{SENSOR, MT9M111_CP_OUTPUT_FORMAT_CTL2_CONTEXT_B, 0x14, 0x00},</div><div class='add'>+</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_REG_ADDR, 0xcd, 0x00},</div><div class='add'>+	{SENSOR, 0xcd, 0x00, 0x0e},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_REG_ADDR, 0xd0, 0x00},</div><div class='add'>+	{SENSOR, 0xd0, 0x00, 0x40},</div><div class='add'>+	{SENSOR, MT9M111_PAGE_MAP, 0x00, 0x02},</div><div class='add'>+	{SENSOR, MT9M111_CC_AUTO_EXPOSURE_PARAMETER_18, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_REG_ADDR, 0x28, 0x00},</div><div class='add'>+	{SENSOR, MT9M111_CC_AWB_PARAMETER_7, 0xef, 0x07},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_REG_ADDR, 0x28, 0x00},</div><div class='add'>+	{SENSOR, MT9M111_CC_AWB_PARAMETER_7, 0xef, 0x03},</div><div class='add'>+	{SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_REG_ADDR, 0x33, 0x00},</div><div class='add'>+	{SENSOR, 0x33, 0x03, 0x49},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_REG_ADDR, 0x33, 0x00},</div><div class='add'>+</div><div class='add'>+	{SENSOR, 0x33, 0x03, 0x49},</div><div class='add'>+	{SENSOR, 0x34, 0xc0, 0x19},</div><div class='add'>+	{SENSOR, 0x3f, 0x20, 0x20},</div><div class='add'>+	{SENSOR, 0x40, 0x20, 0x20},</div><div class='add'>+	{SENSOR, 0x5a, 0xc0, 0x0a},</div><div class='add'>+	{SENSOR, 0x70, 0x7b, 0x0a},</div><div class='add'>+	{SENSOR, 0x71, 0xff, 0x00},</div><div class='add'>+	{SENSOR, 0x72, 0x19, 0x0e},</div><div class='add'>+	{SENSOR, 0x73, 0x18, 0x0f},</div><div class='add'>+	{SENSOR, 0x74, 0x57, 0x32},</div><div class='add'>+	{SENSOR, 0x75, 0x56, 0x34},</div><div class='add'>+	{SENSOR, 0x76, 0x73, 0x35},</div><div class='add'>+	{SENSOR, 0x77, 0x30, 0x12},</div><div class='add'>+	{SENSOR, 0x78, 0x79, 0x02},</div><div class='add'>+	{SENSOR, 0x79, 0x75, 0x06},</div><div class='add'>+	{SENSOR, 0x7a, 0x77, 0x0a},</div><div class='add'>+	{SENSOR, 0x7b, 0x78, 0x09},</div><div class='add'>+	{SENSOR, 0x7c, 0x7d, 0x06},</div><div class='add'>+	{SENSOR, 0x7d, 0x31, 0x10},</div><div class='add'>+	{SENSOR, 0x7e, 0x00, 0x7e},</div><div class='add'>+	{SENSOR, 0x80, 0x59, 0x04},</div><div class='add'>+	{SENSOR, 0x81, 0x59, 0x04},</div><div class='add'>+	{SENSOR, 0x82, 0x57, 0x0a},</div><div class='add'>+	{SENSOR, 0x83, 0x58, 0x0b},</div><div class='add'>+	{SENSOR, 0x84, 0x47, 0x0c},</div><div class='add'>+	{SENSOR, 0x85, 0x48, 0x0e},</div><div class='add'>+	{SENSOR, 0x86, 0x5b, 0x02},</div><div class='add'>+	{SENSOR, 0x87, 0x00, 0x5c},</div><div class='add'>+	{SENSOR, MT9M111_CONTEXT_CONTROL, 0x00, 0x08},</div><div class='add'>+	{SENSOR, 0x60, 0x00, 0x80},</div><div class='add'>+	{SENSOR, 0x61, 0x00, 0x00},</div><div class='add'>+	{SENSOR, 0x62, 0x00, 0x00},</div><div class='add'>+	{SENSOR, 0x63, 0x00, 0x00},</div><div class='add'>+	{SENSOR, 0x64, 0x00, 0x00},</div><div class='add'>+</div><div class='add'>+	{SENSOR, MT9M111_SC_ROWSTART, 0x00, 0x0d},</div><div class='add'>+	{SENSOR, MT9M111_SC_COLSTART, 0x00, 0x18},</div><div class='add'>+	{SENSOR, MT9M111_SC_WINDOW_HEIGHT, 0x04, 0x04},</div><div class='add'>+	{SENSOR, MT9M111_SC_WINDOW_WIDTH, 0x05, 0x08},</div><div class='add'>+	{SENSOR, MT9M111_SC_HBLANK_CONTEXT_B, 0x01, 0x38},</div><div class='add'>+	{SENSOR, MT9M111_SC_VBLANK_CONTEXT_B, 0x00, 0x11},</div><div class='add'>+	{SENSOR, MT9M111_SC_HBLANK_CONTEXT_A, 0x01, 0x38},</div><div class='add'>+	{SENSOR, MT9M111_SC_VBLANK_CONTEXT_A, 0x00, 0x11},</div><div class='add'>+	{SENSOR, MT9M111_SC_R_MODE_CONTEXT_B, 0x01, 0x03},</div><div class='add'>+	{SENSOR, MT9M111_SC_R_MODE_CONTEXT_A, 0x01, 0x03},</div><div class='add'>+	{SENSOR, 0x30, 0x04, 0x00},</div><div class='add'>+</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_DIV, 0x06, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SENSOR_TYPE, 0x09, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_LINE_OF_FRAME_H, 0x81, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_PIX_OF_LINE_H, 0x82, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SIG_INI, 0x01, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x04, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x04, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SIG_INI, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SIG_INI, 0x02, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_HSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_HSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_HSYNC_PARA, 0x05, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_HSYNC_PARA, 0x07, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SIG_INI, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xa0, 0x00},</div><div class='add'>+	{SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},</div><div class='add'>+	{SENSOR, MT9M111_SC_SHUTTER_WIDTH, 0x01, 0xf4},</div><div class='add'>+	{SENSOR, MT9M111_SC_GLOBAL_GAIN, 0x00, 0xea},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},</div><div class='add'>+</div><div class='add'>+	{SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},</div><div class='add'>+	{SENSOR, MT9M111_SC_RESET, 0x00, 0x09},</div><div class='add'>+	{SENSOR, MT9M111_SC_RESET, 0x00, 0x29},</div><div class='add'>+	{SENSOR, MT9M111_SC_RESET, 0x00, 0x08},</div><div class='add'>+	{SENSOR, MT9M111_SC_RESET, 0x00, 0x0c},</div><div class='add'>+	{SENSOR, MT9M111_SC_RESET, 0x00, 0x04},</div><div class='add'>+	{SENSOR, MT9M111_PAGE_MAP, 0x00, 0x01},</div><div class='add'>+</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_REG_ADDR, 0xb3, 0x00},</div><div class='add'>+	{SENSOR, MT9M111_CP_GLOBAL_CLK_CONTROL, 0x00, 0x03},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DIR, 0x05, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DAT, 0x04, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_EN_H, 0x3e, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DIR_H, 0x3e, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DAT_H, 0x02, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_EN_L, 0xff, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DIR_L, 0xff, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DAT_L, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_DIV, 0x04, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SENSOR_TYPE, 0x09, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DIR, 0x07, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DAT, 0x0b, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_EN_H, 0x06, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_EN_L, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_CLK_DIV, 0x0a, 0x00},</div><div class='add'>+</div><div class='add'>+	{SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},</div><div class='add'>+	{SENSOR, MT9M111_SC_RESET, 0x00, 0x05},</div><div class='add'>+	{SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},</div><div class='add'>+	{SENSOR, MT9M111_SC_RESET, 0x00, 0x29},</div><div class='add'>+	{SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},</div><div class='add'>+	{SENSOR, MT9M111_SC_RESET, 0x00, 0x08},</div><div class='add'>+	{SENSOR, MT9M111_PAGE_MAP, 0x00, 0x01},</div><div class='add'>+	{SENSOR, MT9M111_CP_OPERATING_MODE_CTL, 0x00, 0x10},</div><div class='add'>+	{SENSOR, MT9M111_CP_LENS_CORRECTION_1, 0x04, 0x2a},</div><div class='add'>+	{SENSOR, MT9M111_CP_DEFECT_CORR_CONTEXT_A, 0x00, 0x01},</div><div class='add'>+	{SENSOR, MT9M111_CP_DEFECT_CORR_CONTEXT_B, 0x00, 0x01},</div><div class='add'>+	{SENSOR, MT9M111_CP_LUMA_OFFSET, 0x00, 0x00},</div><div class='add'>+	{SENSOR, MT9M111_CP_LUMA_CLIP, 0xff, 0x00},</div><div class='add'>+	{SENSOR, MT9M111_CP_OUTPUT_FORMAT_CTL2_CONTEXT_A, 0x14, 0x00},</div><div class='add'>+	{SENSOR, MT9M111_CP_OUTPUT_FORMAT_CTL2_CONTEXT_B, 0x14, 0x00},</div><div class='add'>+</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_REG_ADDR, 0xcd, 0x00},</div><div class='add'>+	{SENSOR, 0xcd, 0x00, 0x0e},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_REG_ADDR, 0xd0, 0x00},</div><div class='add'>+	{SENSOR, 0xd0, 0x00, 0x40},</div><div class='add'>+	{SENSOR, MT9M111_PAGE_MAP, 0x00, 0x02},</div><div class='add'>+	{SENSOR, MT9M111_CC_AUTO_EXPOSURE_PARAMETER_18, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_REG_ADDR, 0x28, 0x00},</div><div class='add'>+	{SENSOR, MT9M111_CC_AWB_PARAMETER_7, 0xef, 0x07},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_REG_ADDR, 0x28, 0x00},</div><div class='add'>+	{SENSOR, MT9M111_CC_AWB_PARAMETER_7, 0xef, 0x03},</div><div class='add'>+	{SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_REG_ADDR, 0x33, 0x00},</div><div class='add'>+	{SENSOR, 0x33, 0x03, 0x49},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_REG_ADDR, 0x33, 0x00},</div><div class='add'>+</div><div class='add'>+	{SENSOR, 0x33, 0x03, 0x49},</div><div class='add'>+	{SENSOR, 0x34, 0xc0, 0x19},</div><div class='add'>+	{SENSOR, 0x3f, 0x20, 0x20},</div><div class='add'>+	{SENSOR, 0x40, 0x20, 0x20},</div><div class='add'>+	{SENSOR, 0x5a, 0xc0, 0x0a},</div><div class='add'>+	{SENSOR, 0x70, 0x7b, 0x0a},</div><div class='add'>+	{SENSOR, 0x71, 0xff, 0x00},</div><div class='add'>+	{SENSOR, 0x72, 0x19, 0x0e},</div><div class='add'>+	{SENSOR, 0x73, 0x18, 0x0f},</div><div class='add'>+	{SENSOR, 0x74, 0x57, 0x32},</div><div class='add'>+	{SENSOR, 0x75, 0x56, 0x34},</div><div class='add'>+	{SENSOR, 0x76, 0x73, 0x35},</div><div class='add'>+	{SENSOR, 0x77, 0x30, 0x12},</div><div class='add'>+	{SENSOR, 0x78, 0x79, 0x02},</div><div class='add'>+	{SENSOR, 0x79, 0x75, 0x06},</div><div class='add'>+	{SENSOR, 0x7a, 0x77, 0x0a},</div><div class='add'>+	{SENSOR, 0x7b, 0x78, 0x09},</div><div class='add'>+	{SENSOR, 0x7c, 0x7d, 0x06},</div><div class='add'>+	{SENSOR, 0x7d, 0x31, 0x10},</div><div class='add'>+	{SENSOR, 0x7e, 0x00, 0x7e},</div><div class='add'>+	{SENSOR, 0x80, 0x59, 0x04},</div><div class='add'>+	{SENSOR, 0x81, 0x59, 0x04},</div><div class='add'>+	{SENSOR, 0x82, 0x57, 0x0a},</div><div class='add'>+	{SENSOR, 0x83, 0x58, 0x0b},</div><div class='add'>+	{SENSOR, 0x84, 0x47, 0x0c},</div><div class='add'>+	{SENSOR, 0x85, 0x48, 0x0e},</div><div class='add'>+	{SENSOR, 0x86, 0x5b, 0x02},</div><div class='add'>+	{SENSOR, 0x87, 0x00, 0x5c},</div><div class='add'>+	{SENSOR, MT9M111_CONTEXT_CONTROL, 0x00, 0x08},</div><div class='add'>+	{SENSOR, 0x60, 0x00, 0x80},</div><div class='add'>+	{SENSOR, 0x61, 0x00, 0x00},</div><div class='add'>+	{SENSOR, 0x62, 0x00, 0x00},</div><div class='add'>+	{SENSOR, 0x63, 0x00, 0x00},</div><div class='add'>+	{SENSOR, 0x64, 0x00, 0x00},</div><div class='add'>+</div><div class='add'>+	{SENSOR, MT9M111_SC_ROWSTART, 0x00, 0x0d},</div><div class='add'>+	{SENSOR, MT9M111_SC_COLSTART, 0x00, 0x18},</div><div class='add'>+	{SENSOR, MT9M111_SC_WINDOW_HEIGHT, 0x04, 0x04},</div><div class='add'>+	{SENSOR, MT9M111_SC_WINDOW_WIDTH, 0x05, 0x08},</div><div class='add'>+	{SENSOR, MT9M111_SC_HBLANK_CONTEXT_B, 0x01, 0x38},</div><div class='add'>+	{SENSOR, MT9M111_SC_VBLANK_CONTEXT_B, 0x00, 0x11},</div><div class='add'>+	{SENSOR, MT9M111_SC_HBLANK_CONTEXT_A, 0x01, 0x38},</div><div class='add'>+	{SENSOR, MT9M111_SC_VBLANK_CONTEXT_A, 0x00, 0x11},</div><div class='add'>+	{SENSOR, MT9M111_SC_R_MODE_CONTEXT_B, 0x01, 0x03},</div><div class='add'>+	{SENSOR, MT9M111_SC_R_MODE_CONTEXT_A, 0x01, 0x03},</div><div class='add'>+	{SENSOR, 0x30, 0x04, 0x00},</div><div class='add'>+</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_DIV, 0x06, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SENSOR_TYPE, 0x09, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_LINE_OF_FRAME_H, 0x81, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_PIX_OF_LINE_H, 0x82, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SIG_INI, 0x01, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x04, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x04, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_HSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_HSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_HSYNC_PARA, 0x05, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_HSYNC_PARA, 0x07, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SIG_INI, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xa0, 0x00},</div><div class='add'>+	{SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},</div><div class='add'>+	{SENSOR, MT9M111_SC_SHUTTER_WIDTH, 0x01, 0xf4},</div><div class='add'>+	{SENSOR, MT9M111_SC_GLOBAL_GAIN, 0x00, 0xea},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},</div><div class='add'>+	{SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_REG_ADDR, 0x0d, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},</div><div class='add'>+	{SENSOR, MT9M111_SC_RESET, 0x00, 0x09},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_REG_ADDR, 0x0d, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},</div><div class='add'>+	{SENSOR, MT9M111_SC_RESET, 0x00, 0x29},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_REG_ADDR, 0x0d, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},</div><div class='add'>+	{SENSOR, MT9M111_SC_RESET, 0x00, 0x08},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_REG_ADDR, 0x0d, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},</div><div class='add'>+	{SENSOR, MT9M111_SC_RESET, 0x00, 0x0c},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_REG_ADDR, 0x0d, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},</div><div class='add'>+	{SENSOR, MT9M111_SC_RESET, 0x00, 0x04},</div><div class='add'>+	{SENSOR, MT9M111_PAGE_MAP, 0x00, 0x01},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_REG_ADDR, 0xb3, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},</div><div class='add'>+	{SENSOR, MT9M111_CP_GLOBAL_CLK_CONTROL, 0x00, 0x03},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DIR, 0x05, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DAT, 0x04, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_EN_H, 0x3e, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DIR_H, 0x3e, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DAT_H, 0x02, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_EN_L, 0xff, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DIR_L, 0xff, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DAT_L, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_DIV, 0x04, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SENSOR_TYPE, 0x09, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DIR, 0x07, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DAT, 0x0b, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_EN_H, 0x06, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_EN_L, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_CLK_DIV, 0x0a, 0x00},</div><div class='add'>+	{SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_REG_ADDR, 0x0d, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},</div><div class='add'>+	{SENSOR, MT9M111_SC_RESET, 0x00, 0x05},</div><div class='add'>+	{SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_REG_ADDR, 0x0d, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},</div><div class='add'>+	{SENSOR, MT9M111_SC_RESET, 0x00, 0x29},</div><div class='add'>+	{SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_REG_ADDR, 0x0d, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},</div><div class='add'>+</div><div class='add'>+	{SENSOR, MT9M111_SC_RESET, 0x00, 0x08},</div><div class='add'>+	{SENSOR, MT9M111_PAGE_MAP, 0x00, 0x01},</div><div class='add'>+	{SENSOR, MT9M111_CP_OPERATING_MODE_CTL, 0x00, 0x10},</div><div class='add'>+	{SENSOR, MT9M111_CP_LENS_CORRECTION_1, 0x04, 0x2a},</div><div class='add'>+	{SENSOR, MT9M111_CP_DEFECT_CORR_CONTEXT_A, 0x00, 0x01},</div><div class='add'>+	{SENSOR, MT9M111_CP_DEFECT_CORR_CONTEXT_B, 0x00, 0x01},</div><div class='add'>+	{SENSOR, MT9M111_CP_LUMA_OFFSET, 0x00, 0x00},</div><div class='add'>+	{SENSOR, MT9M111_CP_LUMA_CLIP, 0xff, 0x00},</div><div class='add'>+	{SENSOR, MT9M111_CP_OUTPUT_FORMAT_CTL2_CONTEXT_A, 0x14, 0x00},</div><div class='add'>+	{SENSOR, MT9M111_CP_OUTPUT_FORMAT_CTL2_CONTEXT_B, 0x14, 0x00},</div><div class='add'>+</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_REG_ADDR, 0xcd, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},</div><div class='add'>+	{SENSOR, 0xcd, 0x00, 0x0e},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_REG_ADDR, 0xd0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},</div><div class='add'>+	{SENSOR, 0xd0, 0x00, 0x40},</div><div class='add'>+	{SENSOR, MT9M111_PAGE_MAP, 0x00, 0x02},</div><div class='add'>+	{SENSOR, MT9M111_CC_AUTO_EXPOSURE_PARAMETER_18, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_REG_ADDR, 0x28, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},</div><div class='add'>+	{SENSOR, MT9M111_CC_AWB_PARAMETER_7, 0xef, 0x07},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_REG_ADDR, 0x28, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},</div><div class='add'>+	{SENSOR, MT9M111_CC_AWB_PARAMETER_7, 0xef, 0x03},</div><div class='add'>+	{SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_REG_ADDR, 0x33, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},</div><div class='add'>+	{SENSOR, 0x33, 0x03, 0x49},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_REG_ADDR, 0x33, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},</div><div class='add'>+</div><div class='add'>+	{SENSOR, 0x33, 0x03, 0x49},</div><div class='add'>+	{SENSOR, 0x34, 0xc0, 0x19},</div><div class='add'>+	{SENSOR, 0x3f, 0x20, 0x20},</div><div class='add'>+	{SENSOR, 0x40, 0x20, 0x20},</div><div class='add'>+	{SENSOR, 0x5a, 0xc0, 0x0a},</div><div class='add'>+	{SENSOR, 0x70, 0x7b, 0x0a},</div><div class='add'>+	{SENSOR, 0x71, 0xff, 0x00},</div><div class='add'>+	{SENSOR, 0x72, 0x19, 0x0e},</div><div class='add'>+	{SENSOR, 0x73, 0x18, 0x0f},</div><div class='add'>+	{SENSOR, 0x74, 0x57, 0x32},</div><div class='add'>+	{SENSOR, 0x75, 0x56, 0x34},</div><div class='add'>+	{SENSOR, 0x76, 0x73, 0x35},</div><div class='add'>+	{SENSOR, 0x77, 0x30, 0x12},</div><div class='add'>+	{SENSOR, 0x78, 0x79, 0x02},</div><div class='add'>+	{SENSOR, 0x79, 0x75, 0x06},</div><div class='add'>+	{SENSOR, 0x7a, 0x77, 0x0a},</div><div class='add'>+	{SENSOR, 0x7b, 0x78, 0x09},</div><div class='add'>+	{SENSOR, 0x7c, 0x7d, 0x06},</div><div class='add'>+	{SENSOR, 0x7d, 0x31, 0x10},</div><div class='add'>+	{SENSOR, 0x7e, 0x00, 0x7e},</div><div class='add'>+	{SENSOR, 0x80, 0x59, 0x04},</div><div class='add'>+	{SENSOR, 0x81, 0x59, 0x04},</div><div class='add'>+	{SENSOR, 0x82, 0x57, 0x0a},</div><div class='add'>+	{SENSOR, 0x83, 0x58, 0x0b},</div><div class='add'>+	{SENSOR, 0x84, 0x47, 0x0c},</div><div class='add'>+	{SENSOR, 0x85, 0x48, 0x0e},</div><div class='add'>+	{SENSOR, 0x86, 0x5b, 0x02},</div><div class='add'>+	{SENSOR, 0x87, 0x00, 0x5c},</div><div class='add'>+	{SENSOR, MT9M111_CONTEXT_CONTROL, 0x00, 0x08},</div><div class='add'>+	{SENSOR, 0x60, 0x00, 0x80},</div><div class='add'>+	{SENSOR, 0x61, 0x00, 0x00},</div><div class='add'>+	{SENSOR, 0x62, 0x00, 0x00},</div><div class='add'>+	{SENSOR, 0x63, 0x00, 0x00},</div><div class='add'>+	{SENSOR, 0x64, 0x00, 0x00},</div><div class='add'>+	{SENSOR, MT9M111_SC_ROWSTART, 0x00, 0x0d},</div><div class='add'>+	{SENSOR, MT9M111_SC_COLSTART, 0x00, 0x12},</div><div class='add'>+	{SENSOR, MT9M111_SC_WINDOW_HEIGHT, 0x04, 0x00},</div><div class='add'>+	{SENSOR, MT9M111_SC_WINDOW_WIDTH, 0x05, 0x10},</div><div class='add'>+	{SENSOR, MT9M111_SC_HBLANK_CONTEXT_B, 0x01, 0x60},</div><div class='add'>+	{SENSOR, MT9M111_SC_VBLANK_CONTEXT_B, 0x00, 0x11},</div><div class='add'>+	{SENSOR, MT9M111_SC_HBLANK_CONTEXT_A, 0x01, 0x60},</div><div class='add'>+	{SENSOR, MT9M111_SC_VBLANK_CONTEXT_A, 0x00, 0x11},</div><div class='add'>+	{SENSOR, MT9M111_SC_R_MODE_CONTEXT_B, 0x01, 0x0f},</div><div class='add'>+	{SENSOR, MT9M111_SC_R_MODE_CONTEXT_A, 0x01, 0x0f},</div><div class='add'>+	{SENSOR, 0x30, 0x04, 0x00},</div><div class='add'>+</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_DIV, 0x06, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SENSOR_TYPE, 0x09, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_LINE_OF_FRAME_H, 0x81, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_PIX_OF_LINE_H, 0x82, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SIG_INI, 0x01, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x01, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0xe3, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SIG_INI, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SIG_INI, 0x02, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_HSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_HSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_HSYNC_PARA, 0x02, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_HSYNC_PARA, 0x87, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SIG_INI, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},</div><div class='add'>+</div><div class='add'>+	{SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},</div><div class='add'>+	{SENSOR, MT9M111_SC_SHUTTER_WIDTH, 0x01, 0x90},</div><div class='add'>+	{SENSOR, MT9M111_SC_GLOBAL_GAIN, 0x00, 0xe6},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},</div><div class='add'>+	{SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_REG_ADDR, 0x0d, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},</div><div class='add'>+	{SENSOR, MT9M111_SC_RESET, 0x00, 0x09},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_REG_ADDR, 0x0d, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},</div><div class='add'>+	{SENSOR, MT9M111_SC_RESET, 0x00, 0x29},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_REG_ADDR, 0x0d, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},</div><div class='add'>+	{SENSOR, MT9M111_SC_RESET, 0x00, 0x08},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_REG_ADDR, 0x0d, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},</div><div class='add'>+	{SENSOR, MT9M111_SC_RESET, 0x00, 0x0c},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_REG_ADDR, 0x0d, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},</div><div class='add'>+	{SENSOR, MT9M111_SC_RESET, 0x00, 0x04},</div><div class='add'>+	{SENSOR, MT9M111_PAGE_MAP, 0x00, 0x01},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_REG_ADDR, 0xb3, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},</div><div class='add'>+	{SENSOR, MT9M111_CP_GLOBAL_CLK_CONTROL, 0x00, 0x03},</div><div class='add'>+</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DIR, 0x05, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DAT, 0x04, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_EN_H, 0x3e, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DIR_H, 0x3e, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DAT_H, 0x02, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_EN_L, 0xff, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DIR_L, 0xff, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DAT_L, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_DIV, 0x04, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SENSOR_TYPE, 0x09, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DIR, 0x07, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DAT, 0x0b, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_EN_H, 0x06, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_EN_L, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_CLK_DIV, 0x0a, 0x00},</div><div class='add'>+	{SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_REG_ADDR, 0x0d, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},</div><div class='add'>+	{SENSOR, MT9M111_SC_RESET, 0x00, 0x05},</div><div class='add'>+	{SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_REG_ADDR, 0x0d, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},</div><div class='add'>+	{SENSOR, MT9M111_SC_RESET, 0x00, 0x29},</div><div class='add'>+	{SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_REG_ADDR, 0x0d, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},</div><div class='add'>+	{SENSOR, MT9M111_SC_RESET, 0x00, 0x08},</div><div class='add'>+	{SENSOR, MT9M111_PAGE_MAP, 0x00, 0x01},</div><div class='add'>+	{SENSOR, MT9M111_CP_OPERATING_MODE_CTL, 0x00, 0x10},</div><div class='add'>+	{SENSOR, MT9M111_CP_LENS_CORRECTION_1, 0x04, 0x2a},</div><div class='add'>+	{SENSOR, MT9M111_CP_DEFECT_CORR_CONTEXT_A, 0x00, 0x01},</div><div class='add'>+	{SENSOR, MT9M111_CP_DEFECT_CORR_CONTEXT_B, 0x00, 0x01},</div><div class='add'>+	{SENSOR, MT9M111_CP_LUMA_OFFSET, 0x00, 0x00},</div><div class='add'>+	{SENSOR, MT9M111_CP_LUMA_CLIP, 0xff, 0x00},</div><div class='add'>+	{SENSOR, MT9M111_CP_OUTPUT_FORMAT_CTL2_CONTEXT_A, 0x14, 0x00},</div><div class='add'>+	{SENSOR, MT9M111_CP_OUTPUT_FORMAT_CTL2_CONTEXT_B, 0x14, 0x00},</div><div class='add'>+</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_REG_ADDR, 0xcd, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},</div><div class='add'>+	{SENSOR, 0xcd, 0x00, 0x0e},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_REG_ADDR, 0xd0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},</div><div class='add'>+	{SENSOR, 0xd0, 0x00, 0x40},</div><div class='add'>+	{SENSOR, MT9M111_PAGE_MAP, 0x00, 0x02},</div><div class='add'>+	{SENSOR, MT9M111_CC_AUTO_EXPOSURE_PARAMETER_18, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_REG_ADDR, 0x28, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},</div><div class='add'>+	{SENSOR, MT9M111_CC_AWB_PARAMETER_7, 0xef, 0x07},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_REG_ADDR, 0x28, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},</div><div class='add'>+	{SENSOR, MT9M111_CC_AWB_PARAMETER_7, 0xef, 0x03},</div><div class='add'>+	{SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},</div><div class='add'>+</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_REG_ADDR, 0x33, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},</div><div class='add'>+	{SENSOR, 0x33, 0x03, 0x49},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_REG_ADDR, 0x33, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},</div><div class='add'>+</div><div class='add'>+	{SENSOR, 0x33, 0x03, 0x49},</div><div class='add'>+	{SENSOR, 0x34, 0xc0, 0x19},</div><div class='add'>+	{SENSOR, 0x3f, 0x20, 0x20},</div><div class='add'>+	{SENSOR, 0x40, 0x20, 0x20},</div><div class='add'>+	{SENSOR, 0x5a, 0xc0, 0x0a},</div><div class='add'>+	{SENSOR, 0x70, 0x7b, 0x0a},</div><div class='add'>+	{SENSOR, 0x71, 0xff, 0x00},</div><div class='add'>+	{SENSOR, 0x72, 0x19, 0x0e},</div><div class='add'>+	{SENSOR, 0x73, 0x18, 0x0f},</div><div class='add'>+	{SENSOR, 0x74, 0x57, 0x32},</div><div class='add'>+	{SENSOR, 0x75, 0x56, 0x34},</div><div class='add'>+	{SENSOR, 0x76, 0x73, 0x35},</div><div class='add'>+	{SENSOR, 0x77, 0x30, 0x12},</div><div class='add'>+	{SENSOR, 0x78, 0x79, 0x02},</div><div class='add'>+	{SENSOR, 0x79, 0x75, 0x06},</div><div class='add'>+	{SENSOR, 0x7a, 0x77, 0x0a},</div><div class='add'>+	{SENSOR, 0x7b, 0x78, 0x09},</div><div class='add'>+	{SENSOR, 0x7c, 0x7d, 0x06},</div><div class='add'>+	{SENSOR, 0x7d, 0x31, 0x10},</div><div class='add'>+	{SENSOR, 0x7e, 0x00, 0x7e},</div><div class='add'>+	{SENSOR, 0x80, 0x59, 0x04},</div><div class='add'>+	{SENSOR, 0x81, 0x59, 0x04},</div><div class='add'>+	{SENSOR, 0x82, 0x57, 0x0a},</div><div class='add'>+	{SENSOR, 0x83, 0x58, 0x0b},</div><div class='add'>+	{SENSOR, 0x84, 0x47, 0x0c},</div><div class='add'>+	{SENSOR, 0x85, 0x48, 0x0e},</div><div class='add'>+	{SENSOR, 0x86, 0x5b, 0x02},</div><div class='add'>+	{SENSOR, 0x87, 0x00, 0x5c},</div><div class='add'>+	{SENSOR, MT9M111_CONTEXT_CONTROL, 0x00, 0x08},</div><div class='add'>+	{SENSOR, 0x60, 0x00, 0x80},</div><div class='add'>+	{SENSOR, 0x61, 0x00, 0x00},</div><div class='add'>+	{SENSOR, 0x62, 0x00, 0x00},</div><div class='add'>+	{SENSOR, 0x63, 0x00, 0x00},</div><div class='add'>+	{SENSOR, 0x64, 0x00, 0x00},</div><div class='add'>+</div><div class='add'>+	{SENSOR, MT9M111_SC_ROWSTART, 0x00, 0x0d},</div><div class='add'>+	{SENSOR, MT9M111_SC_COLSTART, 0x00, 0x12},</div><div class='add'>+	{SENSOR, MT9M111_SC_WINDOW_HEIGHT, 0x04, 0x00},</div><div class='add'>+	{SENSOR, MT9M111_SC_WINDOW_WIDTH, 0x05, 0x10},</div><div class='add'>+	{SENSOR, MT9M111_SC_HBLANK_CONTEXT_B, 0x01, 0x60},</div><div class='add'>+	{SENSOR, MT9M111_SC_VBLANK_CONTEXT_B, 0x00, 0x11},</div><div class='add'>+	{SENSOR, MT9M111_SC_HBLANK_CONTEXT_A, 0x01, 0x60},</div><div class='add'>+	{SENSOR, MT9M111_SC_VBLANK_CONTEXT_A, 0x00, 0x11},</div><div class='add'>+	{SENSOR, MT9M111_SC_R_MODE_CONTEXT_B, 0x01, 0x0f},</div><div class='add'>+	{SENSOR, MT9M111_SC_R_MODE_CONTEXT_A, 0x01, 0x0f},</div><div class='add'>+	{SENSOR, 0x30, 0x04, 0x00},</div><div class='add'>+</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_DIV, 0x06, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SENSOR_TYPE, 0x09, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_LINE_OF_FRAME_H, 0x81, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_PIX_OF_LINE_H, 0x82, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SIG_INI, 0x01, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x01, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0xe0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SIG_INI, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SIG_INI, 0x02, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_HSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_HSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_HSYNC_PARA, 0x02, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_HSYNC_PARA, 0x7f, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SIG_INI, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},</div><div class='add'>+</div><div class='add'>+	{SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},</div><div class='add'>+	/* Set number of blank rows chosen to 400 */</div><div class='add'>+	{SENSOR, MT9M111_SC_SHUTTER_WIDTH, 0x01, 0x90},</div><div class='add'>+	/* Set the global gain to 283 (of 512) */</div><div class='add'>+	{SENSOR, MT9M111_SC_GLOBAL_GAIN, 0x03, 0x63}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/media/video/gspca/m5602/m5602_ov9650.c b/drivers/media/video/gspca/m5602/m5602_ov9650.c<br/>new file mode 100644<br/>index 000000000000..837c7e47661c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/gspca/m5602/m5602_ov9650.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/m5602/m5602_ov9650.c</a></div><div class='hunk'>@@ -0,0 +1,546 @@</div><div class='add'>+/*</div><div class='add'>+ * Driver for the ov9650 sensor</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2008 Erik Andrén</div><div class='add'>+ * Copyright (C) 2007 Ilyes Gouta. Based on the m5603x Linux Driver Project.</div><div class='add'>+ * Copyright (C) 2005 m5603x Linux Driver Project &lt;m5602@x3ng.com.br&gt;</div><div class='add'>+ *</div><div class='add'>+ * Portions of code to USB interface and ALi driver software,</div><div class='add'>+ * Copyright (c) 2006 Willem Duinker</div><div class='add'>+ * v4l2 interface modeled after the V4L2 driver</div><div class='add'>+ * for SN9C10x PC Camera Controllers</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public License as</div><div class='add'>+ * published by the Free Software Foundation, version 2.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "m5602_ov9650.h"</div><div class='add'>+</div><div class='add'>+int ov9650_read_sensor(struct sd *sd, const u8 address,</div><div class='add'>+		      u8 *i2c_data, const u8 len)</div><div class='add'>+{</div><div class='add'>+	int err, i;</div><div class='add'>+</div><div class='add'>+	/* The ov9650 registers have a max depth of one byte */</div><div class='add'>+	if (len &gt; 1 || !len)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		err = m5602_read_bridge(sd, M5602_XB_I2C_STATUS, i2c_data);</div><div class='add'>+	} while ((*i2c_data &amp; I2C_BUSY) &amp;&amp; !err);</div><div class='add'>+</div><div class='add'>+	m5602_write_bridge(sd, M5602_XB_I2C_DEV_ADDR,</div><div class='add'>+			   ov9650.i2c_slave_id);</div><div class='add'>+	m5602_write_bridge(sd, M5602_XB_I2C_REG_ADDR, address);</div><div class='add'>+	m5602_write_bridge(sd, M5602_XB_I2C_CTRL, 0x10 + len);</div><div class='add'>+	m5602_write_bridge(sd, M5602_XB_I2C_CTRL, 0x08);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; len; i++) {</div><div class='add'>+		err = m5602_read_bridge(sd, M5602_XB_I2C_DATA, &amp;(i2c_data[i]));</div><div class='add'>+</div><div class='add'>+		PDEBUG(D_CONF, "Reading sensor register "</div><div class='add'>+				"0x%x containing 0x%x ", address, *i2c_data);</div><div class='add'>+	}</div><div class='add'>+	return (err &lt; 0) ? err : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ov9650_write_sensor(struct sd *sd, const u8 address,</div><div class='add'>+			u8 *i2c_data, const u8 len)</div><div class='add'>+{</div><div class='add'>+	int err, i;</div><div class='add'>+	u8 *p;</div><div class='add'>+	struct usb_device *udev = sd-&gt;gspca_dev.dev;</div><div class='add'>+	__u8 *buf = sd-&gt;gspca_dev.usb_buf;</div><div class='add'>+</div><div class='add'>+	/* The ov9650 only supports one byte writes */</div><div class='add'>+	if (len &gt; 1 || !len)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	memcpy(buf, sensor_urb_skeleton,</div><div class='add'>+	       sizeof(sensor_urb_skeleton));</div><div class='add'>+</div><div class='add'>+	buf[11] = sd-&gt;sensor-&gt;i2c_slave_id;</div><div class='add'>+	buf[15] = address;</div><div class='add'>+</div><div class='add'>+	/* Special case larger sensor writes */</div><div class='add'>+	p = buf + 16;</div><div class='add'>+</div><div class='add'>+	/* Copy a four byte write sequence for each byte to be written to */</div><div class='add'>+	for (i = 0; i &lt; len; i++) {</div><div class='add'>+		memcpy(p, sensor_urb_skeleton + 16, 4);</div><div class='add'>+		p[3] = i2c_data[i];</div><div class='add'>+		p += 4;</div><div class='add'>+		PDEBUG(D_CONF, "Writing sensor register 0x%x with 0x%x",</div><div class='add'>+		       address, i2c_data[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Copy the tailer */</div><div class='add'>+	memcpy(p, sensor_urb_skeleton + 20, 4);</div><div class='add'>+</div><div class='add'>+	/* Set the total length */</div><div class='add'>+	p[3] = 0x10 + len;</div><div class='add'>+</div><div class='add'>+	err = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),</div><div class='add'>+			      0x04, 0x40, 0x19,</div><div class='add'>+			      0x0000, buf,</div><div class='add'>+			      20 + len * 4, M5602_URB_MSG_TIMEOUT);</div><div class='add'>+</div><div class='add'>+	return (err &lt; 0) ? err : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ov9650_probe(struct sd *sd)</div><div class='add'>+{</div><div class='add'>+	u8 prod_id = 0, ver_id = 0, i;</div><div class='add'>+</div><div class='add'>+	if (force_sensor) {</div><div class='add'>+		if (force_sensor == OV9650_SENSOR) {</div><div class='add'>+			info("Forcing an %s sensor", ov9650.name);</div><div class='add'>+			goto sensor_found;</div><div class='add'>+		}</div><div class='add'>+		/* If we want to force another sensor,</div><div class='add'>+		   don't try to probe this one */</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	info("Probing for an ov9650 sensor");</div><div class='add'>+</div><div class='add'>+	/* Run the pre-init to actually probe the unit */</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(preinit_ov9650); i++) {</div><div class='add'>+		u8 data = preinit_ov9650[i][2];</div><div class='add'>+		if (preinit_ov9650[i][0] == SENSOR)</div><div class='add'>+			ov9650_write_sensor(sd,</div><div class='add'>+					    preinit_ov9650[i][1], &amp;data, 1);</div><div class='add'>+		else</div><div class='add'>+			m5602_write_bridge(sd, preinit_ov9650[i][1], data);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ov9650_read_sensor(sd, OV9650_PID, &amp;prod_id, 1))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	if (ov9650_read_sensor(sd, OV9650_VER, &amp;ver_id, 1))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	if ((prod_id == 0x96) &amp;&amp; (ver_id == 0x52)) {</div><div class='add'>+		info("Detected an ov9650 sensor");</div><div class='add'>+		goto sensor_found;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -ENODEV;</div><div class='add'>+</div><div class='add'>+sensor_found:</div><div class='add'>+	sd-&gt;gspca_dev.cam.cam_mode = ov9650.modes;</div><div class='add'>+	sd-&gt;gspca_dev.cam.nmodes = ov9650.nmodes;</div><div class='add'>+	sd-&gt;desc-&gt;ctrls = ov9650.ctrls;</div><div class='add'>+	sd-&gt;desc-&gt;nctrls = ov9650.nctrls;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ov9650_init(struct sd *sd)</div><div class='add'>+{</div><div class='add'>+	int i, err = 0;</div><div class='add'>+	u8 data;</div><div class='add'>+</div><div class='add'>+	if (dump_sensor)</div><div class='add'>+		ov9650_dump_registers(sd);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(init_ov9650) &amp;&amp; !err; i++) {</div><div class='add'>+		data = init_ov9650[i][2];</div><div class='add'>+		if (init_ov9650[i][0] == SENSOR)</div><div class='add'>+			err = ov9650_write_sensor(sd, init_ov9650[i][1],</div><div class='add'>+						  &amp;data, 1);</div><div class='add'>+		else</div><div class='add'>+			err = m5602_write_bridge(sd, init_ov9650[i][1], data);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!err &amp;&amp; dmi_check_system(ov9650_flip_dmi_table)) {</div><div class='add'>+		info("vflip quirk active");</div><div class='add'>+		data = 0x30;</div><div class='add'>+		err = ov9650_write_sensor(sd, OV9650_MVFP, &amp;data, 1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return (err &lt; 0) ? err : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ov9650_power_down(struct sd *sd)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(power_down_ov9650); i++) {</div><div class='add'>+		u8 data = power_down_ov9650[i][2];</div><div class='add'>+		if (power_down_ov9650[i][0] == SENSOR)</div><div class='add'>+			ov9650_write_sensor(sd,</div><div class='add'>+					    power_down_ov9650[i][1], &amp;data, 1);</div><div class='add'>+		else</div><div class='add'>+			m5602_write_bridge(sd, power_down_ov9650[i][1], data);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ov9650_get_exposure(struct gspca_dev *gspca_dev, __s32 *val)</div><div class='add'>+{</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+	u8 i2c_data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = ov9650_read_sensor(sd, OV9650_COM1, &amp;i2c_data, 1);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+	*val = i2c_data &amp; 0x03;</div><div class='add'>+</div><div class='add'>+	err = ov9650_read_sensor(sd, OV9650_AECH, &amp;i2c_data, 1);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+	*val |= (i2c_data &lt;&lt; 2);</div><div class='add'>+</div><div class='add'>+	err = ov9650_read_sensor(sd, OV9650_AECHM, &amp;i2c_data, 1);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+	*val |= (i2c_data &amp; 0x3f) &lt;&lt; 10;</div><div class='add'>+</div><div class='add'>+	PDEBUG(D_V4L2, "Read exposure %d", *val);</div><div class='add'>+out:</div><div class='add'>+	return (err &lt; 0) ? err : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ov9650_set_exposure(struct gspca_dev *gspca_dev, __s32 val)</div><div class='add'>+{</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+	u8 i2c_data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	PDEBUG(D_V4L2, "Set exposure to %d",</div><div class='add'>+	       val &amp; 0xffff);</div><div class='add'>+</div><div class='add'>+	/* The 6 MSBs */</div><div class='add'>+	i2c_data = (val &gt;&gt; 10) &amp; 0x3f;</div><div class='add'>+	err = ov9650_write_sensor(sd, OV9650_AECHM,</div><div class='add'>+				  &amp;i2c_data, 1);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* The 8 middle bits */</div><div class='add'>+	i2c_data = (val &gt;&gt; 2) &amp; 0xff;</div><div class='add'>+	err = ov9650_write_sensor(sd, OV9650_AECH,</div><div class='add'>+				  &amp;i2c_data, 1);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* The 2 LSBs */</div><div class='add'>+	i2c_data = val &amp; 0x03;</div><div class='add'>+	err = ov9650_write_sensor(sd, OV9650_COM1, &amp;i2c_data, 1);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return (err &lt; 0) ? err : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ov9650_get_gain(struct gspca_dev *gspca_dev, __s32 *val)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	u8 i2c_data;</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+</div><div class='add'>+	ov9650_read_sensor(sd, OV9650_VREF, &amp;i2c_data, 1);</div><div class='add'>+	*val = (i2c_data &amp; 0x03) &lt;&lt; 8;</div><div class='add'>+</div><div class='add'>+	err = ov9650_read_sensor(sd, OV9650_GAIN, &amp;i2c_data, 1);</div><div class='add'>+	*val |= i2c_data;</div><div class='add'>+	PDEBUG(D_V4L2, "Read gain %d", *val);</div><div class='add'>+	return (err &lt; 0) ? err : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ov9650_set_gain(struct gspca_dev *gspca_dev, __s32 val)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	u8 i2c_data;</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+</div><div class='add'>+	/* The 2 MSB */</div><div class='add'>+	/* Read the OV9650_VREF register first to avoid</div><div class='add'>+	   corrupting the VREF high and low bits */</div><div class='add'>+	ov9650_read_sensor(sd, OV9650_VREF, &amp;i2c_data, 1);</div><div class='add'>+	/* Mask away all uninteresting bits */</div><div class='add'>+	i2c_data = ((val &amp; 0x0300) &gt;&gt; 2) |</div><div class='add'>+			(i2c_data &amp; 0x3F);</div><div class='add'>+	err = ov9650_write_sensor(sd, OV9650_VREF, &amp;i2c_data, 1);</div><div class='add'>+</div><div class='add'>+	/* The 8 LSBs */</div><div class='add'>+	i2c_data = val &amp; 0xff;</div><div class='add'>+	err = ov9650_write_sensor(sd, OV9650_GAIN, &amp;i2c_data, 1);</div><div class='add'>+	return (err &lt; 0) ? err : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ov9650_get_red_balance(struct gspca_dev *gspca_dev, __s32 *val)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	u8 i2c_data;</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+</div><div class='add'>+	err = ov9650_read_sensor(sd, OV9650_RED, &amp;i2c_data, 1);</div><div class='add'>+	*val = i2c_data;</div><div class='add'>+</div><div class='add'>+	PDEBUG(D_V4L2, "Read red gain %d", *val);</div><div class='add'>+</div><div class='add'>+	return (err &lt; 0) ? err : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ov9650_set_red_balance(struct gspca_dev *gspca_dev, __s32 val)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	u8 i2c_data;</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+</div><div class='add'>+	PDEBUG(D_V4L2, "Set red gain to %d",</div><div class='add'>+			     val &amp; 0xff);</div><div class='add'>+</div><div class='add'>+	i2c_data = val &amp; 0xff;</div><div class='add'>+	err = ov9650_write_sensor(sd, OV9650_RED, &amp;i2c_data, 1);</div><div class='add'>+</div><div class='add'>+	return (err &lt; 0) ? err : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ov9650_get_blue_balance(struct gspca_dev *gspca_dev, __s32 *val)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	u8 i2c_data;</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+</div><div class='add'>+	err = ov9650_read_sensor(sd, OV9650_BLUE, &amp;i2c_data, 1);</div><div class='add'>+	*val = i2c_data;</div><div class='add'>+</div><div class='add'>+	PDEBUG(D_V4L2, "Read blue gain %d", *val);</div><div class='add'>+</div><div class='add'>+	return (err &lt; 0) ? err : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ov9650_set_blue_balance(struct gspca_dev *gspca_dev, __s32 val)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	u8 i2c_data;</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+</div><div class='add'>+	PDEBUG(D_V4L2, "Set blue gain to %d",</div><div class='add'>+	       val &amp; 0xff);</div><div class='add'>+</div><div class='add'>+	i2c_data = val &amp; 0xff;</div><div class='add'>+	err = ov9650_write_sensor(sd, OV9650_BLUE, &amp;i2c_data, 1);</div><div class='add'>+</div><div class='add'>+	return (err &lt; 0) ? err : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ov9650_get_hflip(struct gspca_dev *gspca_dev, __s32 *val)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	u8 i2c_data;</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+</div><div class='add'>+	err = ov9650_read_sensor(sd, OV9650_MVFP, &amp;i2c_data, 1);</div><div class='add'>+	if (dmi_check_system(ov9650_flip_dmi_table))</div><div class='add'>+		*val = ((i2c_data &amp; OV9650_HFLIP) &gt;&gt; 5) ? 0 : 1;</div><div class='add'>+	else</div><div class='add'>+		*val = (i2c_data &amp; OV9650_HFLIP) &gt;&gt; 5;</div><div class='add'>+	PDEBUG(D_V4L2, "Read horizontal flip %d", *val);</div><div class='add'>+</div><div class='add'>+	return (err &lt; 0) ? err : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ov9650_set_hflip(struct gspca_dev *gspca_dev, __s32 val)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	u8 i2c_data;</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+</div><div class='add'>+	PDEBUG(D_V4L2, "Set horizontal flip to %d", val);</div><div class='add'>+	err = ov9650_read_sensor(sd, OV9650_MVFP, &amp;i2c_data, 1);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (dmi_check_system(ov9650_flip_dmi_table))</div><div class='add'>+		i2c_data = ((i2c_data &amp; 0xdf) |</div><div class='add'>+				(((val ? 0 : 1) &amp; 0x01) &lt;&lt; 5));</div><div class='add'>+	else</div><div class='add'>+		i2c_data = ((i2c_data &amp; 0xdf) |</div><div class='add'>+				((val &amp; 0x01) &lt;&lt; 5));</div><div class='add'>+</div><div class='add'>+	err = ov9650_write_sensor(sd, OV9650_MVFP, &amp;i2c_data, 1);</div><div class='add'>+out:</div><div class='add'>+	return (err &lt; 0) ? err : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ov9650_get_vflip(struct gspca_dev *gspca_dev, __s32 *val)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	u8 i2c_data;</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+</div><div class='add'>+	err = ov9650_read_sensor(sd, OV9650_MVFP, &amp;i2c_data, 1);</div><div class='add'>+	if (dmi_check_system(ov9650_flip_dmi_table))</div><div class='add'>+		*val = ((i2c_data &amp; 0x10) &gt;&gt; 4) ? 0 : 1;</div><div class='add'>+	else</div><div class='add'>+		*val = (i2c_data &amp; 0x10) &gt;&gt; 4;</div><div class='add'>+	PDEBUG(D_V4L2, "Read vertical flip %d", *val);</div><div class='add'>+</div><div class='add'>+	return (err &lt; 0) ? err : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ov9650_set_vflip(struct gspca_dev *gspca_dev, __s32 val)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	u8 i2c_data;</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+</div><div class='add'>+	PDEBUG(D_V4L2, "Set vertical flip to %d", val);</div><div class='add'>+	err = ov9650_read_sensor(sd, OV9650_MVFP, &amp;i2c_data, 1);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (dmi_check_system(ov9650_flip_dmi_table))</div><div class='add'>+		i2c_data = ((i2c_data &amp; 0xef) |</div><div class='add'>+				(((val ? 0 : 1) &amp; 0x01) &lt;&lt; 4));</div><div class='add'>+	else</div><div class='add'>+		i2c_data = ((i2c_data &amp; 0xef) |</div><div class='add'>+				((val &amp; 0x01) &lt;&lt; 4));</div><div class='add'>+</div><div class='add'>+	err = ov9650_write_sensor(sd, OV9650_MVFP, &amp;i2c_data, 1);</div><div class='add'>+out:</div><div class='add'>+	return (err &lt; 0) ? err : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ov9650_get_brightness(struct gspca_dev *gspca_dev, __s32 *val)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	u8 i2c_data;</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+</div><div class='add'>+	err = ov9650_read_sensor(sd, OV9650_VREF, &amp;i2c_data, 1);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+	*val = (i2c_data &amp; 0x03) &lt;&lt; 8;</div><div class='add'>+</div><div class='add'>+	err = ov9650_read_sensor(sd, OV9650_GAIN, &amp;i2c_data, 1);</div><div class='add'>+	*val |= i2c_data;</div><div class='add'>+	PDEBUG(D_V4L2, "Read gain %d", *val);</div><div class='add'>+out:</div><div class='add'>+	return (err &lt; 0) ? err : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ov9650_set_brightness(struct gspca_dev *gspca_dev, __s32 val)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	u8 i2c_data;</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+</div><div class='add'>+	PDEBUG(D_V4L2, "Set gain to %d", val &amp; 0x3ff);</div><div class='add'>+</div><div class='add'>+	/* Read the OV9650_VREF register first to avoid</div><div class='add'>+		corrupting the VREF high and low bits */</div><div class='add'>+	err = ov9650_read_sensor(sd, OV9650_VREF, &amp;i2c_data, 1);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* Mask away all uninteresting bits */</div><div class='add'>+	i2c_data = ((val &amp; 0x0300) &gt;&gt; 2) | (i2c_data &amp; 0x3F);</div><div class='add'>+	err = ov9650_write_sensor(sd, OV9650_VREF, &amp;i2c_data, 1);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* The 8 LSBs */</div><div class='add'>+	i2c_data = val &amp; 0xff;</div><div class='add'>+	err = ov9650_write_sensor(sd, OV9650_GAIN, &amp;i2c_data, 1);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return (err &lt; 0) ? err : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ov9650_get_auto_white_balance(struct gspca_dev *gspca_dev, __s32 *val)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	u8 i2c_data;</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+</div><div class='add'>+	err = ov9650_read_sensor(sd, OV9650_COM8, &amp;i2c_data, 1);</div><div class='add'>+	*val = (i2c_data &amp; OV9650_AWB_EN) &gt;&gt; 1;</div><div class='add'>+	PDEBUG(D_V4L2, "Read auto white balance %d", *val);</div><div class='add'>+</div><div class='add'>+	return (err &lt; 0) ? err : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ov9650_set_auto_white_balance(struct gspca_dev *gspca_dev, __s32 val)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	u8 i2c_data;</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+</div><div class='add'>+	PDEBUG(D_V4L2, "Set auto white balance to %d", val);</div><div class='add'>+	err = ov9650_read_sensor(sd, OV9650_COM8, &amp;i2c_data, 1);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	i2c_data = ((i2c_data &amp; 0xfd) | ((val &amp; 0x01) &lt;&lt; 1));</div><div class='add'>+	err = ov9650_write_sensor(sd, OV9650_COM8, &amp;i2c_data, 1);</div><div class='add'>+out:</div><div class='add'>+	return (err &lt; 0) ? err : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ov9650_get_auto_gain(struct gspca_dev *gspca_dev, __s32 *val)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	u8 i2c_data;</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+</div><div class='add'>+	err = ov9650_read_sensor(sd, OV9650_COM8, &amp;i2c_data, 1);</div><div class='add'>+	*val = (i2c_data &amp; OV9650_AGC_EN) &gt;&gt; 2;</div><div class='add'>+	PDEBUG(D_V4L2, "Read auto gain control %d", *val);</div><div class='add'>+</div><div class='add'>+	return (err &lt; 0) ? err : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ov9650_set_auto_gain(struct gspca_dev *gspca_dev, __s32 val)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	u8 i2c_data;</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+</div><div class='add'>+	PDEBUG(D_V4L2, "Set auto gain control to %d", val);</div><div class='add'>+	err = ov9650_read_sensor(sd, OV9650_COM8, &amp;i2c_data, 1);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	i2c_data = ((i2c_data &amp; 0xfb) | ((val &amp; 0x01) &lt;&lt; 2));</div><div class='add'>+	err = ov9650_write_sensor(sd, OV9650_COM8, &amp;i2c_data, 1);</div><div class='add'>+out:</div><div class='add'>+	return (err &lt; 0) ? err : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ov9650_dump_registers(struct sd *sd)</div><div class='add'>+{</div><div class='add'>+	int address;</div><div class='add'>+	info("Dumping the ov9650 register state");</div><div class='add'>+	for (address = 0; address &lt; 0xa9; address++) {</div><div class='add'>+		u8 value;</div><div class='add'>+		ov9650_read_sensor(sd, address, &amp;value, 1);</div><div class='add'>+		info("register 0x%x contains 0x%x",</div><div class='add'>+		     address, value);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	info("ov9650 register state dump complete");</div><div class='add'>+</div><div class='add'>+	info("Probing for which registers that are read/write");</div><div class='add'>+	for (address = 0; address &lt; 0xff; address++) {</div><div class='add'>+		u8 old_value, ctrl_value;</div><div class='add'>+		u8 test_value[2] = {0xff, 0xff};</div><div class='add'>+</div><div class='add'>+		ov9650_read_sensor(sd, address, &amp;old_value, 1);</div><div class='add'>+		ov9650_write_sensor(sd, address, test_value, 1);</div><div class='add'>+		ov9650_read_sensor(sd, address, &amp;ctrl_value, 1);</div><div class='add'>+</div><div class='add'>+		if (ctrl_value == test_value[0])</div><div class='add'>+			info("register 0x%x is writeable", address);</div><div class='add'>+		else</div><div class='add'>+			info("register 0x%x is read only", address);</div><div class='add'>+</div><div class='add'>+		/* Restore original value */</div><div class='add'>+		ov9650_write_sensor(sd, address, &amp;old_value, 1);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/media/video/gspca/m5602/m5602_ov9650.h b/drivers/media/video/gspca/m5602/m5602_ov9650.h<br/>new file mode 100644<br/>index 000000000000..065632f0378e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/gspca/m5602/m5602_ov9650.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/m5602/m5602_ov9650.h</a></div><div class='hunk'>@@ -0,0 +1,502 @@</div><div class='add'>+/*</div><div class='add'>+ * Driver for the ov9650 sensor</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2008 Erik Andrén</div><div class='add'>+ * Copyright (C) 2007 Ilyes Gouta. Based on the m5603x Linux Driver Project.</div><div class='add'>+ * Copyright (C) 2005 m5603x Linux Driver Project &lt;m5602@x3ng.com.br&gt;</div><div class='add'>+ *</div><div class='add'>+ * Portions of code to USB interface and ALi driver software,</div><div class='add'>+ * Copyright (c) 2006 Willem Duinker</div><div class='add'>+ * v4l2 interface modeled after the V4L2 driver</div><div class='add'>+ * for SN9C10x PC Camera Controllers</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public License as</div><div class='add'>+ * published by the Free Software Foundation, version 2.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef M5602_OV9650_H_</div><div class='add'>+#define M5602_OV9650_H_</div><div class='add'>+</div><div class='add'>+#include &lt;linux/dmi.h&gt;</div><div class='add'>+</div><div class='add'>+#include "m5602_sensor.h"</div><div class='add'>+</div><div class='add'>+/*****************************************************************************/</div><div class='add'>+</div><div class='add'>+#define OV9650_GAIN			0x00</div><div class='add'>+#define OV9650_BLUE			0x01</div><div class='add'>+#define OV9650_RED			0x02</div><div class='add'>+#define OV9650_VREF			0x03</div><div class='add'>+#define OV9650_COM1			0x04</div><div class='add'>+#define OV9650_BAVE			0x05</div><div class='add'>+#define OV9650_GEAVE			0x06</div><div class='add'>+#define OV9650_RSVD7			0x07</div><div class='add'>+#define OV9650_PID			0x0a</div><div class='add'>+#define OV9650_VER			0x0b</div><div class='add'>+#define OV9650_COM3			0x0c</div><div class='add'>+#define OV9650_COM5			0x0e</div><div class='add'>+#define OV9650_COM6			0x0f</div><div class='add'>+#define OV9650_AECH			0x10</div><div class='add'>+#define OV9650_CLKRC			0x11</div><div class='add'>+#define OV9650_COM7			0x12</div><div class='add'>+#define OV9650_COM8			0x13</div><div class='add'>+#define OV9650_COM9			0x14</div><div class='add'>+#define OV9650_COM10			0x15</div><div class='add'>+#define OV9650_RSVD16			0x16</div><div class='add'>+#define OV9650_HSTART			0x17</div><div class='add'>+#define OV9650_HSTOP			0x18</div><div class='add'>+#define OV9650_VSTRT			0x19</div><div class='add'>+#define OV9650_VSTOP			0x1a</div><div class='add'>+#define OV9650_PSHFT			0x1b</div><div class='add'>+#define OV9650_MVFP			0x1e</div><div class='add'>+#define OV9650_AEW			0x24</div><div class='add'>+#define OV9650_AEB			0x25</div><div class='add'>+#define OV9650_VPT			0x26</div><div class='add'>+#define OV9650_BBIAS			0x27</div><div class='add'>+#define OV9650_GbBIAS			0x28</div><div class='add'>+#define OV9650_Gr_COM			0x29</div><div class='add'>+#define OV9650_RBIAS			0x2c</div><div class='add'>+#define OV9650_HREF			0x32</div><div class='add'>+#define OV9650_CHLF			0x33</div><div class='add'>+#define OV9650_ARBLM			0x34</div><div class='add'>+#define OV9650_RSVD35			0x35</div><div class='add'>+#define OV9650_RSVD36			0x36</div><div class='add'>+#define OV9650_ADC			0x37</div><div class='add'>+#define OV9650_ACOM38			0x38</div><div class='add'>+#define OV9650_OFON			0x39</div><div class='add'>+#define OV9650_TSLB			0x3a</div><div class='add'>+#define OV9650_COM12			0x3c</div><div class='add'>+#define OV9650_COM13			0x3d</div><div class='add'>+#define OV9650_COM15			0x40</div><div class='add'>+#define OV9650_COM16			0x41</div><div class='add'>+#define OV9650_LCC1			0x62</div><div class='add'>+#define OV9650_LCC2			0x63</div><div class='add'>+#define OV9650_LCC3			0x64</div><div class='add'>+#define OV9650_LCC4			0x65</div><div class='add'>+#define OV9650_LCC5			0x66</div><div class='add'>+#define OV9650_HV			0x69</div><div class='add'>+#define OV9650_DBLV			0x6b</div><div class='add'>+#define OV9650_COM21			0x8b</div><div class='add'>+#define OV9650_COM22			0x8c</div><div class='add'>+#define OV9650_COM24			0x8e</div><div class='add'>+#define OV9650_DBLC1			0x8f</div><div class='add'>+#define OV9650_RSVD94			0x94</div><div class='add'>+#define OV9650_RSVD95			0x95</div><div class='add'>+#define OV9650_RSVD96			0x96</div><div class='add'>+#define OV9650_LCCFB			0x9d</div><div class='add'>+#define OV9650_LCCFR			0x9e</div><div class='add'>+#define OV9650_AECHM			0xa1</div><div class='add'>+#define OV9650_COM26			0xa5</div><div class='add'>+#define OV9650_ACOMA8			0xa8</div><div class='add'>+#define OV9650_ACOMA9			0xa9</div><div class='add'>+</div><div class='add'>+#define OV9650_REGISTER_RESET		(1 &lt;&lt; 7)</div><div class='add'>+#define OV9650_VGA_SELECT		(1 &lt;&lt; 6)</div><div class='add'>+#define OV9650_RGB_SELECT		(1 &lt;&lt; 2)</div><div class='add'>+#define OV9650_RAW_RGB_SELECT		(1 &lt;&lt; 0)</div><div class='add'>+</div><div class='add'>+#define OV9650_FAST_AGC_AEC		(1 &lt;&lt; 7)</div><div class='add'>+#define OV9650_AEC_UNLIM_STEP_SIZE	(1 &lt;&lt; 6)</div><div class='add'>+#define OV9650_BANDING			(1 &lt;&lt; 5)</div><div class='add'>+#define OV9650_AGC_EN			(1 &lt;&lt; 2)</div><div class='add'>+#define OV9650_AWB_EN			(1 &lt;&lt; 1)</div><div class='add'>+#define OV9650_AEC_EN			(1 &lt;&lt; 0)</div><div class='add'>+</div><div class='add'>+#define OV9650_VARIOPIXEL		(1 &lt;&lt; 2)</div><div class='add'>+#define OV9650_SYSTEM_CLK_SEL		(1 &lt;&lt; 7)</div><div class='add'>+#define OV9650_SLAM_MODE 		(1 &lt;&lt; 4)</div><div class='add'>+</div><div class='add'>+#define OV9650_VFLIP			(1 &lt;&lt; 4)</div><div class='add'>+#define OV9650_HFLIP			(1 &lt;&lt; 5)</div><div class='add'>+</div><div class='add'>+#define GAIN_DEFAULT			0x14</div><div class='add'>+#define RED_GAIN_DEFAULT		0x70</div><div class='add'>+#define BLUE_GAIN_DEFAULT		0x20</div><div class='add'>+#define EXPOSURE_DEFAULT		0x5003</div><div class='add'>+</div><div class='add'>+/*****************************************************************************/</div><div class='add'>+</div><div class='add'>+/* Kernel module parameters */</div><div class='add'>+extern int force_sensor;</div><div class='add'>+extern int dump_sensor;</div><div class='add'>+</div><div class='add'>+int ov9650_probe(struct sd *sd);</div><div class='add'>+int ov9650_init(struct sd *sd);</div><div class='add'>+int ov9650_power_down(struct sd *sd);</div><div class='add'>+</div><div class='add'>+int ov9650_read_sensor(struct sd *sd, const u8 address,</div><div class='add'>+		       u8 *i2c_data, const u8 len);</div><div class='add'>+int ov9650_write_sensor(struct sd *sd, const u8 address,</div><div class='add'>+		       u8 *i2c_data, const u8 len);</div><div class='add'>+</div><div class='add'>+void ov9650_dump_registers(struct sd *sd);</div><div class='add'>+</div><div class='add'>+int ov9650_set_exposure(struct gspca_dev *gspca_dev, __s32 val);</div><div class='add'>+int ov9650_get_exposure(struct gspca_dev *gspca_dev, __s32 *val);</div><div class='add'>+int ov9650_get_gain(struct gspca_dev *gspca_dev, __s32 *val);</div><div class='add'>+int ov9650_set_gain(struct gspca_dev *gspca_dev, __s32 val);</div><div class='add'>+int ov9650_get_red_balance(struct gspca_dev *gspca_dev, __s32 *val);</div><div class='add'>+int ov9650_set_red_balance(struct gspca_dev *gspca_dev, __s32 val);</div><div class='add'>+int ov9650_get_blue_balance(struct gspca_dev *gspca_dev, __s32 *val);</div><div class='add'>+int ov9650_set_blue_balance(struct gspca_dev *gspca_dev, __s32 val);</div><div class='add'>+int ov9650_get_hflip(struct gspca_dev *gspca_dev, __s32 *val);</div><div class='add'>+int ov9650_set_hflip(struct gspca_dev *gspca_dev, __s32 val);</div><div class='add'>+int ov9650_get_vflip(struct gspca_dev *gspca_dev, __s32 *val);</div><div class='add'>+int ov9650_set_vflip(struct gspca_dev *gspca_dev, __s32 val);</div><div class='add'>+int ov9650_get_brightness(struct gspca_dev *gspca_dev, __s32 *val);</div><div class='add'>+int ov9650_set_brightness(struct gspca_dev *gspca_dev, __s32 val);</div><div class='add'>+int ov9650_get_auto_white_balance(struct gspca_dev *gspca_dev, __s32 *val);</div><div class='add'>+int ov9650_set_auto_white_balance(struct gspca_dev *gspca_dev, __s32 val);</div><div class='add'>+int ov9650_get_auto_gain(struct gspca_dev *gspca_dev, __s32 *val);</div><div class='add'>+int ov9650_set_auto_gain(struct gspca_dev *gspca_dev, __s32 val);</div><div class='add'>+</div><div class='add'>+static struct m5602_sensor ov9650 = {</div><div class='add'>+	.name = "OV9650",</div><div class='add'>+	.i2c_slave_id = 0x60,</div><div class='add'>+	.probe = ov9650_probe,</div><div class='add'>+	.init = ov9650_init,</div><div class='add'>+	.power_down = ov9650_power_down,</div><div class='add'>+	.read_sensor = ov9650_read_sensor,</div><div class='add'>+	.write_sensor = ov9650_write_sensor,</div><div class='add'>+</div><div class='add'>+	.nctrls = 8,</div><div class='add'>+	.ctrls = {</div><div class='add'>+	{</div><div class='add'>+		{</div><div class='add'>+			.id		= V4L2_CID_EXPOSURE,</div><div class='add'>+			.type		= V4L2_CTRL_TYPE_INTEGER,</div><div class='add'>+			.name		= "exposure",</div><div class='add'>+			.minimum	= 0x00,</div><div class='add'>+			.maximum	= 0xffff,</div><div class='add'>+			.step		= 0x1,</div><div class='add'>+			.default_value 	= EXPOSURE_DEFAULT,</div><div class='add'>+			.flags         	= V4L2_CTRL_FLAG_SLIDER</div><div class='add'>+		},</div><div class='add'>+		.set = ov9650_set_exposure,</div><div class='add'>+		.get = ov9650_get_exposure</div><div class='add'>+	}, {</div><div class='add'>+		{</div><div class='add'>+			.id		= V4L2_CID_GAIN,</div><div class='add'>+			.type		= V4L2_CTRL_TYPE_INTEGER,</div><div class='add'>+			.name		= "gain",</div><div class='add'>+			.minimum	= 0x00,</div><div class='add'>+			.maximum	= 0x3ff,</div><div class='add'>+			.step		= 0x1,</div><div class='add'>+			.default_value	= GAIN_DEFAULT,</div><div class='add'>+			.flags		= V4L2_CTRL_FLAG_SLIDER</div><div class='add'>+		},</div><div class='add'>+		.set = ov9650_set_gain,</div><div class='add'>+		.get = ov9650_get_gain</div><div class='add'>+	}, {</div><div class='add'>+		{</div><div class='add'>+			.type 		= V4L2_CTRL_TYPE_INTEGER,</div><div class='add'>+			.name 		= "red balance",</div><div class='add'>+			.minimum 	= 0x00,</div><div class='add'>+			.maximum 	= 0xff,</div><div class='add'>+			.step 		= 0x1,</div><div class='add'>+			.default_value 	= RED_GAIN_DEFAULT,</div><div class='add'>+			.flags         	= V4L2_CTRL_FLAG_SLIDER</div><div class='add'>+		},</div><div class='add'>+		.set = ov9650_set_red_balance,</div><div class='add'>+		.get = ov9650_get_red_balance</div><div class='add'>+	}, {</div><div class='add'>+		{</div><div class='add'>+			.type 		= V4L2_CTRL_TYPE_INTEGER,</div><div class='add'>+			.name 		= "blue balance",</div><div class='add'>+			.minimum 	= 0x00,</div><div class='add'>+			.maximum 	= 0xff,</div><div class='add'>+			.step 		= 0x1,</div><div class='add'>+			.default_value 	= BLUE_GAIN_DEFAULT,</div><div class='add'>+			.flags         	= V4L2_CTRL_FLAG_SLIDER</div><div class='add'>+		},</div><div class='add'>+		.set = ov9650_set_blue_balance,</div><div class='add'>+		.get = ov9650_get_blue_balance</div><div class='add'>+	}, {</div><div class='add'>+		{</div><div class='add'>+			.id 		= V4L2_CID_HFLIP,</div><div class='add'>+			.type 		= V4L2_CTRL_TYPE_BOOLEAN,</div><div class='add'>+			.name 		= "horizontal flip",</div><div class='add'>+			.minimum 	= 0,</div><div class='add'>+			.maximum 	= 1,</div><div class='add'>+			.step 		= 1,</div><div class='add'>+			.default_value 	= 0</div><div class='add'>+		},</div><div class='add'>+		.set = ov9650_set_hflip,</div><div class='add'>+		.get = ov9650_get_hflip</div><div class='add'>+	}, {</div><div class='add'>+		{</div><div class='add'>+			.id 		= V4L2_CID_VFLIP,</div><div class='add'>+			.type 		= V4L2_CTRL_TYPE_BOOLEAN,</div><div class='add'>+			.name 		= "vertical flip",</div><div class='add'>+			.minimum 	= 0,</div><div class='add'>+			.maximum 	= 1,</div><div class='add'>+			.step 		= 1,</div><div class='add'>+			.default_value 	= 0</div><div class='add'>+		},</div><div class='add'>+		.set = ov9650_set_vflip,</div><div class='add'>+		.get = ov9650_get_vflip</div><div class='add'>+	}, {</div><div class='add'>+		{</div><div class='add'>+			.id 		= V4L2_CID_AUTO_WHITE_BALANCE,</div><div class='add'>+			.type 		= V4L2_CTRL_TYPE_BOOLEAN,</div><div class='add'>+			.name 		= "auto white balance",</div><div class='add'>+			.minimum 	= 0,</div><div class='add'>+			.maximum 	= 1,</div><div class='add'>+			.step 		= 1,</div><div class='add'>+			.default_value 	= 0</div><div class='add'>+		},</div><div class='add'>+		.set = ov9650_set_auto_white_balance,</div><div class='add'>+		.get = ov9650_get_auto_white_balance</div><div class='add'>+	}, {</div><div class='add'>+		{</div><div class='add'>+			.id 		= V4L2_CID_AUTOGAIN,</div><div class='add'>+			.type 		= V4L2_CTRL_TYPE_BOOLEAN,</div><div class='add'>+			.name 		= "auto gain control",</div><div class='add'>+			.minimum 	= 0,</div><div class='add'>+			.maximum 	= 1,</div><div class='add'>+			.step 		= 1,</div><div class='add'>+			.default_value 	= 0</div><div class='add'>+		},</div><div class='add'>+		.set = ov9650_set_auto_gain,</div><div class='add'>+		.get = ov9650_get_auto_gain</div><div class='add'>+	}</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	.nmodes = 1,</div><div class='add'>+	.modes = {</div><div class='add'>+	{</div><div class='add'>+		M5602_DEFAULT_FRAME_WIDTH,</div><div class='add'>+		M5602_DEFAULT_FRAME_HEIGHT,</div><div class='add'>+		V4L2_PIX_FMT_SBGGR8,</div><div class='add'>+		V4L2_FIELD_NONE,</div><div class='add'>+		.sizeimage =</div><div class='add'>+			M5602_DEFAULT_FRAME_WIDTH * M5602_DEFAULT_FRAME_HEIGHT,</div><div class='add'>+		.bytesperline = M5602_DEFAULT_FRAME_WIDTH,</div><div class='add'>+		.colorspace = V4L2_COLORSPACE_SRGB,</div><div class='add'>+		.priv = 1</div><div class='add'>+	}</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const unsigned char preinit_ov9650[][3] =</div><div class='add'>+{</div><div class='add'>+	/* [INITCAM] */</div><div class='add'>+	{BRIDGE, M5602_XB_MCU_CLK_DIV, 0x02},</div><div class='add'>+	{BRIDGE, M5602_XB_MCU_CLK_CTRL, 0xb0},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},</div><div class='add'>+	{BRIDGE, M5602_XB_ADC_CTRL, 0xc0},</div><div class='add'>+	{BRIDGE, M5602_XB_SENSOR_CTRL, 0x00},</div><div class='add'>+</div><div class='add'>+	{BRIDGE, M5602_XB_SENSOR_TYPE, 0x08},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DIR, 0x05},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DAT, 0x04},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_EN_H, 0x06},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DIR_H, 0x06},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DAT_H, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DAT, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_CLK_DIV, 0x0a},</div><div class='add'>+	/* Reset chip */</div><div class='add'>+	{SENSOR, OV9650_COM7, OV9650_REGISTER_RESET},</div><div class='add'>+	/* Enable double clock */</div><div class='add'>+	{SENSOR, OV9650_CLKRC, 0x80},</div><div class='add'>+	/* Do something out of spec with the power */</div><div class='add'>+	{SENSOR, OV9650_OFON, 0x40}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const unsigned char init_ov9650[][3] =</div><div class='add'>+{</div><div class='add'>+	/* [INITCAM] */</div><div class='add'>+	{BRIDGE, M5602_XB_MCU_CLK_DIV, 0x02},</div><div class='add'>+	{BRIDGE, M5602_XB_MCU_CLK_CTRL, 0xb0},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},</div><div class='add'>+	{BRIDGE, M5602_XB_ADC_CTRL, 0xc0},</div><div class='add'>+	{BRIDGE, M5602_XB_SENSOR_CTRL, 0x00},</div><div class='add'>+</div><div class='add'>+	{BRIDGE, M5602_XB_SENSOR_TYPE, 0x08},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DIR, 0x05},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DAT, 0x04},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_EN_H, 0x06},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DIR_H, 0x06},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DAT_H, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DAT, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_CLK_DIV, 0x0a},</div><div class='add'>+	/* Reset chip */</div><div class='add'>+	{SENSOR, OV9650_COM7, OV9650_REGISTER_RESET},</div><div class='add'>+	/* Enable double clock */</div><div class='add'>+	{SENSOR, OV9650_CLKRC, 0x80},</div><div class='add'>+	/* Do something out of spec with the power */</div><div class='add'>+	{SENSOR, OV9650_OFON, 0x40},</div><div class='add'>+</div><div class='add'>+	/* Set QQVGA */</div><div class='add'>+	{SENSOR, OV9650_COM1, 0x20},</div><div class='add'>+	/* Set fast AGC/AEC algorithm with unlimited step size */</div><div class='add'>+	{SENSOR, OV9650_COM8, OV9650_FAST_AGC_AEC |</div><div class='add'>+			      OV9650_AEC_UNLIM_STEP_SIZE |</div><div class='add'>+			      OV9650_AWB_EN | OV9650_AGC_EN},</div><div class='add'>+</div><div class='add'>+	{SENSOR, OV9650_CHLF, 0x10},</div><div class='add'>+	{SENSOR, OV9650_ARBLM, 0xbf},</div><div class='add'>+	{SENSOR, OV9650_ACOM38, 0x81},</div><div class='add'>+	/* Turn off color matrix coefficient double option */</div><div class='add'>+	{SENSOR, OV9650_COM16, 0x00},</div><div class='add'>+		/* Enable color matrix for RGB/YUV, Delay Y channel,</div><div class='add'>+	set output Y/UV delay to 1 */</div><div class='add'>+	{SENSOR, OV9650_COM13, 0x19},</div><div class='add'>+	/* Enable digital BLC, Set output mode to U Y V Y */</div><div class='add'>+	{SENSOR, OV9650_TSLB, 0x0c},</div><div class='add'>+	/* Limit the AGC/AEC stable upper region */</div><div class='add'>+	{SENSOR, OV9650_COM24, 0x00},</div><div class='add'>+	/* Enable HREF and some out of spec things */</div><div class='add'>+	{SENSOR, OV9650_COM12, 0x73},</div><div class='add'>+		/* Set all DBLC offset signs to positive and</div><div class='add'>+	do some out of spec stuff */</div><div class='add'>+	{SENSOR, OV9650_DBLC1, 0xdf},</div><div class='add'>+	{SENSOR, OV9650_COM21, 0x06},</div><div class='add'>+	{SENSOR, OV9650_RSVD35, 0x91},</div><div class='add'>+	/* Necessary, no camera stream without it */</div><div class='add'>+	{SENSOR, OV9650_RSVD16, 0x06},</div><div class='add'>+	{SENSOR, OV9650_RSVD94, 0x99},</div><div class='add'>+	{SENSOR, OV9650_RSVD95, 0x99},</div><div class='add'>+	{SENSOR, OV9650_RSVD96, 0x04},</div><div class='add'>+	/* Enable full range output */</div><div class='add'>+	{SENSOR, OV9650_COM15, 0x0},</div><div class='add'>+		/* Enable HREF at optical black, enable ADBLC bias,</div><div class='add'>+	enable ADBLC, reset timings at format change */</div><div class='add'>+	{SENSOR, OV9650_COM6, 0x4b},</div><div class='add'>+	/* Subtract 32 from the B channel bias */</div><div class='add'>+	{SENSOR, OV9650_BBIAS, 0xa0},</div><div class='add'>+	/* Subtract 32 from the Gb channel bias */</div><div class='add'>+	{SENSOR, OV9650_GbBIAS, 0xa0},</div><div class='add'>+	/* Do not bypass the analog BLC and to some out of spec stuff */</div><div class='add'>+	{SENSOR, OV9650_Gr_COM, 0x00},</div><div class='add'>+	/* Subtract 32 from the R channel bias */</div><div class='add'>+	{SENSOR, OV9650_RBIAS, 0xa0},</div><div class='add'>+	/* Subtract 32 from the R channel bias */</div><div class='add'>+	{SENSOR, OV9650_RBIAS, 0x0},</div><div class='add'>+	{SENSOR, OV9650_COM26, 0x80},</div><div class='add'>+	{SENSOR, OV9650_ACOMA9, 0x98},</div><div class='add'>+	/* Set the AGC/AEC stable region upper limit */</div><div class='add'>+	{SENSOR, OV9650_AEW, 0x68},</div><div class='add'>+	/* Set the AGC/AEC stable region lower limit */</div><div class='add'>+	{SENSOR, OV9650_AEB, 0x5c},</div><div class='add'>+	/* Set the high and low limit nibbles to 3 */</div><div class='add'>+	{SENSOR, OV9650_VPT, 0xc3},</div><div class='add'>+		/* Set the Automatic Gain Ceiling (AGC) to 128x,</div><div class='add'>+	drop VSYNC at frame drop,</div><div class='add'>+	limit exposure timing,</div><div class='add'>+	drop frame when the AEC step is larger than the exposure gap */</div><div class='add'>+	{SENSOR, OV9650_COM9, 0x6e},</div><div class='add'>+	/* Set VSYNC negative, Set RESET to SLHS (slave mode horizontal sync)</div><div class='add'>+	and set PWDN to SLVS (slave mode vertical sync) */</div><div class='add'>+	{SENSOR, OV9650_COM10, 0x42},</div><div class='add'>+	/* Set horizontal column start high to default value */</div><div class='add'>+	{SENSOR, OV9650_HSTART, 0x1a},</div><div class='add'>+	/* Set horizontal column end */</div><div class='add'>+	{SENSOR, OV9650_HSTOP, 0xbf},</div><div class='add'>+	/* Complementing register to the two writes above */</div><div class='add'>+	{SENSOR, OV9650_HREF, 0xb2},</div><div class='add'>+	/* Set vertical row start high bits */</div><div class='add'>+	{SENSOR, OV9650_VSTRT, 0x02},</div><div class='add'>+	/* Set vertical row end low bits */</div><div class='add'>+	{SENSOR, OV9650_VSTOP, 0x7e},</div><div class='add'>+	/* Set complementing vertical frame control */</div><div class='add'>+	{SENSOR, OV9650_VREF, 0x10},</div><div class='add'>+	/* Set raw RGB output format with VGA resolution */</div><div class='add'>+	{SENSOR, OV9650_COM7, OV9650_VGA_SELECT |</div><div class='add'>+			      OV9650_RGB_SELECT |</div><div class='add'>+			      OV9650_RAW_RGB_SELECT},</div><div class='add'>+	{SENSOR, OV9650_ADC, 0x04},</div><div class='add'>+	{SENSOR, OV9650_HV, 0x40},</div><div class='add'>+	/* Enable denoise, and white-pixel erase */</div><div class='add'>+	{SENSOR, OV9650_COM22, 0x23},</div><div class='add'>+</div><div class='add'>+	/* Set the high bits of the exposure value */</div><div class='add'>+	{SENSOR, OV9650_AECH, ((EXPOSURE_DEFAULT &amp; 0xff00) &gt;&gt; 8)},</div><div class='add'>+</div><div class='add'>+	/* Set the low bits of the exposure value */</div><div class='add'>+	{SENSOR, OV9650_COM1, (EXPOSURE_DEFAULT &amp; 0xff)},</div><div class='add'>+	{SENSOR, OV9650_GAIN, GAIN_DEFAULT},</div><div class='add'>+	{SENSOR, OV9650_BLUE, BLUE_GAIN_DEFAULT},</div><div class='add'>+	{SENSOR, OV9650_RED, RED_GAIN_DEFAULT},</div><div class='add'>+</div><div class='add'>+	{SENSOR, OV9650_COM3, OV9650_VARIOPIXEL},</div><div class='add'>+	{SENSOR, OV9650_COM5, OV9650_SYSTEM_CLK_SEL},</div><div class='add'>+</div><div class='add'>+	{BRIDGE, M5602_XB_LINE_OF_FRAME_H, 0x82},</div><div class='add'>+	{BRIDGE, M5602_XB_LINE_OF_FRAME_L, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_PIX_OF_LINE_H, 0x82},</div><div class='add'>+	{BRIDGE, M5602_XB_PIX_OF_LINE_L, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SIG_INI, 0x01},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x09},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x01},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0xe0},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_HSYNC_PARA, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_HSYNC_PARA, 0x5e},</div><div class='add'>+	{BRIDGE, M5602_XB_HSYNC_PARA, 0x02},</div><div class='add'>+	{BRIDGE, M5602_XB_HSYNC_PARA, 0xde}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const unsigned char power_down_ov9650[][3] =</div><div class='add'>+{</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_DIV, 0x04},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},</div><div class='add'>+	{SENSOR, OV9650_COM7, 0x80},</div><div class='add'>+	{SENSOR, OV9650_OFON, 0xf4},</div><div class='add'>+	{SENSOR, OV9650_MVFP, 0x80},</div><div class='add'>+	{SENSOR, OV9650_DBLV, 0x3f},</div><div class='add'>+	{SENSOR, OV9650_RSVD36, 0x49},</div><div class='add'>+	{SENSOR, OV9650_COM7, 0x05},</div><div class='add'>+</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DIR, 0x05},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DAT, 0x04},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_EN_H, 0x06},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_EN_L, 0x06},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DAT_H, 0x02},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_DIV, 0x04},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Vertically and horizontally flips the image if matched, needed for machines</div><div class='add'>+   where the sensor is mounted upside down */</div><div class='add'>+static</div><div class='add'>+    const</div><div class='add'>+	struct dmi_system_id ov9650_flip_dmi_table[] = {</div><div class='add'>+	{</div><div class='add'>+		.ident = "ASUS A6VC",</div><div class='add'>+		.matches = {</div><div class='add'>+			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."),</div><div class='add'>+			DMI_MATCH(DMI_PRODUCT_NAME, "A6VC")</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.ident = "ASUS A6VM",</div><div class='add'>+		.matches = {</div><div class='add'>+			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."),</div><div class='add'>+			DMI_MATCH(DMI_PRODUCT_NAME, "A6VM")</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.ident = "ASUS A6JC",</div><div class='add'>+		.matches = {</div><div class='add'>+			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."),</div><div class='add'>+			DMI_MATCH(DMI_PRODUCT_NAME, "A6JC")</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.ident = "ASUS A6Kt",</div><div class='add'>+		.matches = {</div><div class='add'>+			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."),</div><div class='add'>+			DMI_MATCH(DMI_PRODUCT_NAME, "A6Kt")</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/media/video/gspca/m5602/m5602_po1030.c b/drivers/media/video/gspca/m5602/m5602_po1030.c<br/>new file mode 100644<br/>index 000000000000..d17ac52566e6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/gspca/m5602/m5602_po1030.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/m5602/m5602_po1030.c</a></div><div class='hunk'>@@ -0,0 +1,400 @@</div><div class='add'>+/*</div><div class='add'>+ * Driver for the po1030 sensor</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2008 Erik Andrén</div><div class='add'>+ * Copyright (c) 2007 Ilyes Gouta. Based on the m5603x Linux Driver Project.</div><div class='add'>+ * Copyright (c) 2005 m5603x Linux Driver Project &lt;m5602@x3ng.com.br&gt;</div><div class='add'>+ *</div><div class='add'>+ * Portions of code to USB interface and ALi driver software,</div><div class='add'>+ * Copyright (c) 2006 Willem Duinker</div><div class='add'>+ * v4l2 interface modeled after the V4L2 driver</div><div class='add'>+ * for SN9C10x PC Camera Controllers</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public License as</div><div class='add'>+ * published by the Free Software Foundation, version 2.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "m5602_po1030.h"</div><div class='add'>+</div><div class='add'>+int po1030_probe(struct sd *sd)</div><div class='add'>+{</div><div class='add'>+	u8 prod_id = 0, ver_id = 0, i;</div><div class='add'>+</div><div class='add'>+	if (force_sensor) {</div><div class='add'>+		if (force_sensor == PO1030_SENSOR) {</div><div class='add'>+			info("Forcing a %s sensor", po1030.name);</div><div class='add'>+			goto sensor_found;</div><div class='add'>+		}</div><div class='add'>+		/* If we want to force another sensor, don't try to probe this</div><div class='add'>+		 * one */</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	info("Probing for a po1030 sensor");</div><div class='add'>+</div><div class='add'>+	/* Run the pre-init to actually probe the unit */</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(preinit_po1030); i++) {</div><div class='add'>+		u8 data = preinit_po1030[i][2];</div><div class='add'>+		if (preinit_po1030[i][0] == SENSOR)</div><div class='add'>+			po1030_write_sensor(sd,</div><div class='add'>+				preinit_po1030[i][1], &amp;data, 1);</div><div class='add'>+		else</div><div class='add'>+			m5602_write_bridge(sd, preinit_po1030[i][1], data);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (po1030_read_sensor(sd, 0x3, &amp;prod_id, 1))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	if (po1030_read_sensor(sd, 0x4, &amp;ver_id, 1))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	if ((prod_id == 0x02) &amp;&amp; (ver_id == 0xef)) {</div><div class='add'>+		info("Detected a po1030 sensor");</div><div class='add'>+		goto sensor_found;</div><div class='add'>+	}</div><div class='add'>+	return -ENODEV;</div><div class='add'>+</div><div class='add'>+sensor_found:</div><div class='add'>+	sd-&gt;gspca_dev.cam.cam_mode = po1030.modes;</div><div class='add'>+	sd-&gt;gspca_dev.cam.nmodes = po1030.nmodes;</div><div class='add'>+	sd-&gt;desc-&gt;ctrls = po1030.ctrls;</div><div class='add'>+	sd-&gt;desc-&gt;nctrls = po1030.nctrls;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int po1030_read_sensor(struct sd *sd, const u8 address,</div><div class='add'>+			u8 *i2c_data, const u8 len)</div><div class='add'>+{</div><div class='add'>+	int err, i;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		err = m5602_read_bridge(sd, M5602_XB_I2C_STATUS, i2c_data);</div><div class='add'>+	} while ((*i2c_data &amp; I2C_BUSY) &amp;&amp; !err);</div><div class='add'>+</div><div class='add'>+	m5602_write_bridge(sd, M5602_XB_I2C_DEV_ADDR,</div><div class='add'>+			   sd-&gt;sensor-&gt;i2c_slave_id);</div><div class='add'>+	m5602_write_bridge(sd, M5602_XB_I2C_REG_ADDR, address);</div><div class='add'>+	m5602_write_bridge(sd, M5602_XB_I2C_CTRL, 0x10 + len);</div><div class='add'>+	m5602_write_bridge(sd, M5602_XB_I2C_CTRL, 0x08);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; len; i++) {</div><div class='add'>+		err = m5602_read_bridge(sd, M5602_XB_I2C_DATA, &amp;(i2c_data[i]));</div><div class='add'>+</div><div class='add'>+		PDEBUG(D_CONF, "Reading sensor register "</div><div class='add'>+				"0x%x containing 0x%x ", address, *i2c_data);</div><div class='add'>+	}</div><div class='add'>+	return (err &lt; 0) ? err : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int po1030_write_sensor(struct sd *sd, const u8 address,</div><div class='add'>+			u8 *i2c_data, const u8 len)</div><div class='add'>+{</div><div class='add'>+	int err, i;</div><div class='add'>+	u8 *p;</div><div class='add'>+	struct usb_device *udev = sd-&gt;gspca_dev.dev;</div><div class='add'>+	__u8 *buf = sd-&gt;gspca_dev.usb_buf;</div><div class='add'>+</div><div class='add'>+	/* The po1030 only supports one byte writes */</div><div class='add'>+	if (len &gt; 1 || !len)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	memcpy(buf, sensor_urb_skeleton, sizeof(sensor_urb_skeleton));</div><div class='add'>+</div><div class='add'>+	buf[11] = sd-&gt;sensor-&gt;i2c_slave_id;</div><div class='add'>+	buf[15] = address;</div><div class='add'>+</div><div class='add'>+	p = buf + 16;</div><div class='add'>+</div><div class='add'>+	/* Copy a four byte write sequence for each byte to be written to */</div><div class='add'>+	for (i = 0; i &lt; len; i++) {</div><div class='add'>+		memcpy(p, sensor_urb_skeleton + 16, 4);</div><div class='add'>+		p[3] = i2c_data[i];</div><div class='add'>+		p += 4;</div><div class='add'>+		PDEBUG(D_CONF, "Writing sensor register 0x%x with 0x%x",</div><div class='add'>+		       address, i2c_data[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Copy the footer */</div><div class='add'>+	memcpy(p, sensor_urb_skeleton + 20, 4);</div><div class='add'>+</div><div class='add'>+	/* Set the total length */</div><div class='add'>+	p[3] = 0x10 + len;</div><div class='add'>+</div><div class='add'>+	err = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),</div><div class='add'>+			      0x04, 0x40, 0x19,</div><div class='add'>+			      0x0000, buf,</div><div class='add'>+			      20 + len * 4, M5602_URB_MSG_TIMEOUT);</div><div class='add'>+</div><div class='add'>+	return (err &lt; 0) ? err : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int po1030_init(struct sd *sd)</div><div class='add'>+{</div><div class='add'>+	int i, err = 0;</div><div class='add'>+</div><div class='add'>+	/* Init the sensor */</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(init_po1030); i++) {</div><div class='add'>+		u8 data[2] = {0x00, 0x00};</div><div class='add'>+</div><div class='add'>+		switch (init_po1030[i][0]) {</div><div class='add'>+		case BRIDGE:</div><div class='add'>+			err = m5602_write_bridge(sd,</div><div class='add'>+				init_po1030[i][1],</div><div class='add'>+				init_po1030[i][2]);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case SENSOR:</div><div class='add'>+			data[0] = init_po1030[i][2];</div><div class='add'>+			err = po1030_write_sensor(sd,</div><div class='add'>+				init_po1030[i][1], data, 1);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case SENSOR_LONG:</div><div class='add'>+			data[0] = init_po1030[i][2];</div><div class='add'>+			data[1] = init_po1030[i][3];</div><div class='add'>+			err = po1030_write_sensor(sd,</div><div class='add'>+				init_po1030[i][1], data, 2);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			info("Invalid stream command, exiting init");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dump_sensor)</div><div class='add'>+		po1030_dump_registers(sd);</div><div class='add'>+</div><div class='add'>+	return (err &lt; 0) ? err : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int po1030_get_exposure(struct gspca_dev *gspca_dev, __s32 *val)</div><div class='add'>+{</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+	u8 i2c_data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = po1030_read_sensor(sd, PO1030_REG_INTEGLINES_H,</div><div class='add'>+				 &amp;i2c_data, 1);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+	*val = (i2c_data &lt;&lt; 8);</div><div class='add'>+</div><div class='add'>+	err = po1030_read_sensor(sd, PO1030_REG_INTEGLINES_M,</div><div class='add'>+				 &amp;i2c_data, 1);</div><div class='add'>+	*val |= i2c_data;</div><div class='add'>+</div><div class='add'>+	PDEBUG(D_V4L2, "Exposure read as %d", *val);</div><div class='add'>+out:</div><div class='add'>+	return (err &lt; 0) ? err : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int po1030_set_exposure(struct gspca_dev *gspca_dev, __s32 val)</div><div class='add'>+{</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+	u8 i2c_data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	PDEBUG(D_V4L2, "Set exposure to %d", val &amp; 0xffff);</div><div class='add'>+</div><div class='add'>+	i2c_data = ((val &amp; 0xff00) &gt;&gt; 8);</div><div class='add'>+	PDEBUG(D_V4L2, "Set exposure to high byte to 0x%x",</div><div class='add'>+	       i2c_data);</div><div class='add'>+</div><div class='add'>+	err = po1030_write_sensor(sd, PO1030_REG_INTEGLINES_H,</div><div class='add'>+				  &amp;i2c_data, 1);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	i2c_data = (val &amp; 0xff);</div><div class='add'>+	PDEBUG(D_V4L2, "Set exposure to low byte to 0x%x",</div><div class='add'>+	       i2c_data);</div><div class='add'>+	err = po1030_write_sensor(sd, PO1030_REG_INTEGLINES_M,</div><div class='add'>+				  &amp;i2c_data, 1);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return (err &lt; 0) ? err : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int po1030_get_gain(struct gspca_dev *gspca_dev, __s32 *val)</div><div class='add'>+{</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+	u8 i2c_data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = po1030_read_sensor(sd, PO1030_REG_GLOBALGAIN,</div><div class='add'>+				 &amp;i2c_data, 1);</div><div class='add'>+	*val = i2c_data;</div><div class='add'>+	PDEBUG(D_V4L2, "Read global gain %d", *val);</div><div class='add'>+</div><div class='add'>+	return (err &lt; 0) ? err : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int po1030_get_hflip(struct gspca_dev *gspca_dev, __s32 *val)</div><div class='add'>+{</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+	u8 i2c_data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = po1030_read_sensor(sd, PO1030_REG_CONTROL2,</div><div class='add'>+				 &amp;i2c_data, 1);</div><div class='add'>+</div><div class='add'>+	*val = (i2c_data &gt;&gt; 7) &amp; 0x01 ;</div><div class='add'>+</div><div class='add'>+	PDEBUG(D_V4L2, "Read hflip %d", *val);</div><div class='add'>+</div><div class='add'>+	return (err &lt; 0) ? err : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int po1030_set_hflip(struct gspca_dev *gspca_dev, __s32 val)</div><div class='add'>+{</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+	u8 i2c_data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	PDEBUG(D_V4L2, "Set hflip %d", val);</div><div class='add'>+</div><div class='add'>+	i2c_data = (val &amp; 0x01) &lt;&lt; 7;</div><div class='add'>+</div><div class='add'>+	err = po1030_write_sensor(sd, PO1030_REG_CONTROL2,</div><div class='add'>+				  &amp;i2c_data, 1);</div><div class='add'>+</div><div class='add'>+	return (err &lt; 0) ? err : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int po1030_get_vflip(struct gspca_dev *gspca_dev, __s32 *val)</div><div class='add'>+{</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+	u8 i2c_data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = po1030_read_sensor(sd, PO1030_REG_GLOBALGAIN,</div><div class='add'>+				 &amp;i2c_data, 1);</div><div class='add'>+</div><div class='add'>+	*val = (i2c_data &gt;&gt; 6) &amp; 0x01;</div><div class='add'>+</div><div class='add'>+	PDEBUG(D_V4L2, "Read vflip %d", *val);</div><div class='add'>+</div><div class='add'>+	return (err &lt; 0) ? err : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int po1030_set_vflip(struct gspca_dev *gspca_dev, __s32 val)</div><div class='add'>+{</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+	u8 i2c_data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	PDEBUG(D_V4L2, "Set vflip %d", val);</div><div class='add'>+</div><div class='add'>+	i2c_data = (val &amp; 0x01) &lt;&lt; 6;</div><div class='add'>+</div><div class='add'>+	err = po1030_write_sensor(sd, PO1030_REG_CONTROL2,</div><div class='add'>+				  &amp;i2c_data, 1);</div><div class='add'>+</div><div class='add'>+	return (err &lt; 0) ? err : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int po1030_set_gain(struct gspca_dev *gspca_dev, __s32 val)</div><div class='add'>+{</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+	u8 i2c_data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	i2c_data = val &amp; 0xff;</div><div class='add'>+	PDEBUG(D_V4L2, "Set global gain to %d", i2c_data);</div><div class='add'>+	err = po1030_write_sensor(sd, PO1030_REG_GLOBALGAIN,</div><div class='add'>+				  &amp;i2c_data, 1);</div><div class='add'>+	return (err &lt; 0) ? err : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int po1030_get_red_balance(struct gspca_dev *gspca_dev, __s32 *val)</div><div class='add'>+{</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+	u8 i2c_data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = po1030_read_sensor(sd, PO1030_REG_RED_GAIN,</div><div class='add'>+				 &amp;i2c_data, 1);</div><div class='add'>+	*val = i2c_data;</div><div class='add'>+	PDEBUG(D_V4L2, "Read red gain %d", *val);</div><div class='add'>+	return (err &lt; 0) ? err : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int po1030_set_red_balance(struct gspca_dev *gspca_dev, __s32 val)</div><div class='add'>+{</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+	u8 i2c_data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	i2c_data = val &amp; 0xff;</div><div class='add'>+	PDEBUG(D_V4L2, "Set red gain to %d", i2c_data);</div><div class='add'>+	err = po1030_write_sensor(sd, PO1030_REG_RED_GAIN,</div><div class='add'>+				  &amp;i2c_data, 1);</div><div class='add'>+	return (err &lt; 0) ? err : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int po1030_get_blue_balance(struct gspca_dev *gspca_dev, __s32 *val)</div><div class='add'>+{</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+	u8 i2c_data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = po1030_read_sensor(sd, PO1030_REG_BLUE_GAIN,</div><div class='add'>+				 &amp;i2c_data, 1);</div><div class='add'>+	*val = i2c_data;</div><div class='add'>+	PDEBUG(D_V4L2, "Read blue gain %d", *val);</div><div class='add'>+</div><div class='add'>+	return (err &lt; 0) ? err : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int po1030_set_blue_balance(struct gspca_dev *gspca_dev, __s32 val)</div><div class='add'>+{</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+	u8 i2c_data;</div><div class='add'>+	int err;</div><div class='add'>+	i2c_data = val &amp; 0xff;</div><div class='add'>+	PDEBUG(D_V4L2, "Set blue gain to %d", i2c_data);</div><div class='add'>+	err = po1030_write_sensor(sd, PO1030_REG_BLUE_GAIN,</div><div class='add'>+				  &amp;i2c_data, 1);</div><div class='add'>+</div><div class='add'>+	return (err &lt; 0) ? err : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int po1030_power_down(struct sd *sd)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void po1030_dump_registers(struct sd *sd)</div><div class='add'>+{</div><div class='add'>+	int address;</div><div class='add'>+	u8 value = 0;</div><div class='add'>+</div><div class='add'>+	info("Dumping the po1030 sensor core registers");</div><div class='add'>+	for (address = 0; address &lt; 0x7f; address++) {</div><div class='add'>+		po1030_read_sensor(sd, address, &amp;value, 1);</div><div class='add'>+		info("register 0x%x contains 0x%x",</div><div class='add'>+		     address, value);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	info("po1030 register state dump complete");</div><div class='add'>+</div><div class='add'>+	info("Probing for which registers that are read/write");</div><div class='add'>+	for (address = 0; address &lt; 0xff; address++) {</div><div class='add'>+		u8 old_value, ctrl_value;</div><div class='add'>+		u8 test_value[2] = {0xff, 0xff};</div><div class='add'>+</div><div class='add'>+		po1030_read_sensor(sd, address, &amp;old_value, 1);</div><div class='add'>+		po1030_write_sensor(sd, address, test_value, 1);</div><div class='add'>+		po1030_read_sensor(sd, address, &amp;ctrl_value, 1);</div><div class='add'>+</div><div class='add'>+		if (ctrl_value == test_value[0])</div><div class='add'>+			info("register 0x%x is writeable", address);</div><div class='add'>+		else</div><div class='add'>+			info("register 0x%x is read only", address);</div><div class='add'>+</div><div class='add'>+		/* Restore original value */</div><div class='add'>+		po1030_write_sensor(sd, address, &amp;old_value, 1);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/media/video/gspca/m5602/m5602_po1030.h b/drivers/media/video/gspca/m5602/m5602_po1030.h<br/>new file mode 100644<br/>index 000000000000..a0b75ff61d79<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/gspca/m5602/m5602_po1030.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/m5602/m5602_po1030.h</a></div><div class='hunk'>@@ -0,0 +1,508 @@</div><div class='add'>+/*</div><div class='add'>+ * Driver for the po1030 sensor.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2008 Erik Andrén</div><div class='add'>+ * Copyright (c) 2007 Ilyes Gouta. Based on the m5603x Linux Driver Project.</div><div class='add'>+ * Copyright (c) 2005 m5603x Linux Driver Project &lt;m5602@x3ng.com.br&gt;</div><div class='add'>+ *</div><div class='add'>+ * Portions of code to USB interface and ALi driver software,</div><div class='add'>+ * Copyright (c) 2006 Willem Duinker</div><div class='add'>+ * v4l2 interface modeled after the V4L2 driver</div><div class='add'>+ * for SN9C10x PC Camera Controllers</div><div class='add'>+ *</div><div class='add'>+ * Register defines taken from Pascal Stangs Proxycon Armlib</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public License as</div><div class='add'>+ * published by the Free Software Foundation, version 2.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef M5602_PO1030_H_</div><div class='add'>+#define M5602_PO1030_H_</div><div class='add'>+</div><div class='add'>+#include "m5602_sensor.h"</div><div class='add'>+</div><div class='add'>+/*****************************************************************************/</div><div class='add'>+</div><div class='add'>+#define PO1030_REG_DEVID_H		0x00</div><div class='add'>+#define PO1030_REG_DEVID_L		0x01</div><div class='add'>+#define PO1030_REG_FRAMEWIDTH_H		0x04</div><div class='add'>+#define PO1030_REG_FRAMEWIDTH_L		0x05</div><div class='add'>+#define PO1030_REG_FRAMEHEIGHT_H	0x06</div><div class='add'>+#define PO1030_REG_FRAMEHEIGHT_L	0x07</div><div class='add'>+#define PO1030_REG_WINDOWX_H		0x08</div><div class='add'>+#define PO1030_REG_WINDOWX_L		0x09</div><div class='add'>+#define PO1030_REG_WINDOWY_H		0x0a</div><div class='add'>+#define PO1030_REG_WINDOWY_L		0x0b</div><div class='add'>+#define PO1030_REG_WINDOWWIDTH_H	0x0c</div><div class='add'>+#define PO1030_REG_WINDOWWIDTH_L	0x0d</div><div class='add'>+#define PO1030_REG_WINDOWHEIGHT_H	0x0e</div><div class='add'>+#define PO1030_REG_WINDOWHEIGHT_L	0x0f</div><div class='add'>+</div><div class='add'>+#define PO1030_REG_GLOBALIBIAS		0x12</div><div class='add'>+#define PO1030_REG_PIXELIBIAS		0x13</div><div class='add'>+</div><div class='add'>+#define PO1030_REG_GLOBALGAIN		0x15</div><div class='add'>+#define PO1030_REG_RED_GAIN		0x16</div><div class='add'>+#define PO1030_REG_GREEN_1_GAIN		0x17</div><div class='add'>+#define PO1030_REG_BLUE_GAIN		0x18</div><div class='add'>+#define PO1030_REG_GREEN_2_GAIN		0x19</div><div class='add'>+</div><div class='add'>+#define PO1030_REG_INTEGLINES_H		0x1a</div><div class='add'>+#define PO1030_REG_INTEGLINES_M		0x1b</div><div class='add'>+#define PO1030_REG_INTEGLINES_L		0x1c</div><div class='add'>+</div><div class='add'>+#define PO1030_REG_CONTROL1		0x1d</div><div class='add'>+#define PO1030_REG_CONTROL2		0x1e</div><div class='add'>+#define PO1030_REG_CONTROL3		0x1f</div><div class='add'>+#define PO1030_REG_CONTROL4		0x20</div><div class='add'>+</div><div class='add'>+#define PO1030_REG_PERIOD50_H		0x23</div><div class='add'>+#define PO1030_REG_PERIOD50_L		0x24</div><div class='add'>+#define PO1030_REG_PERIOD60_H		0x25</div><div class='add'>+#define PO1030_REG_PERIOD60_L		0x26</div><div class='add'>+#define PO1030_REG_REGCLK167		0x27</div><div class='add'>+#define PO1030_REG_DELTA50		0x28</div><div class='add'>+#define PO1030_REG_DELTA60		0x29</div><div class='add'>+</div><div class='add'>+#define PO1030_REG_ADCOFFSET		0x2c</div><div class='add'>+</div><div class='add'>+/* Gamma Correction Coeffs */</div><div class='add'>+#define PO1030_REG_GC0			0x2d</div><div class='add'>+#define PO1030_REG_GC1			0x2e</div><div class='add'>+#define PO1030_REG_GC2			0x2f</div><div class='add'>+#define PO1030_REG_GC3			0x30</div><div class='add'>+#define PO1030_REG_GC4			0x31</div><div class='add'>+#define PO1030_REG_GC5			0x32</div><div class='add'>+#define PO1030_REG_GC6			0x33</div><div class='add'>+#define PO1030_REG_GC7			0x34</div><div class='add'>+</div><div class='add'>+/* Color Transform Matrix */</div><div class='add'>+#define PO1030_REG_CT0			0x35</div><div class='add'>+#define PO1030_REG_CT1			0x36</div><div class='add'>+#define PO1030_REG_CT2			0x37</div><div class='add'>+#define PO1030_REG_CT3			0x38</div><div class='add'>+#define PO1030_REG_CT4			0x39</div><div class='add'>+#define PO1030_REG_CT5			0x3a</div><div class='add'>+#define PO1030_REG_CT6			0x3b</div><div class='add'>+#define PO1030_REG_CT7			0x3c</div><div class='add'>+#define PO1030_REG_CT8			0x3d</div><div class='add'>+</div><div class='add'>+#define PO1030_REG_AUTOCTRL1		0x3e</div><div class='add'>+#define PO1030_REG_AUTOCTRL2		0x3f</div><div class='add'>+</div><div class='add'>+#define PO1030_REG_YTARGET		0x40</div><div class='add'>+#define PO1030_REG_GLOBALGAINMIN	0x41</div><div class='add'>+#define PO1030_REG_GLOBALGAINMAX	0x42</div><div class='add'>+</div><div class='add'>+/* Output format control */</div><div class='add'>+#define PO1030_REG_OUTFORMCTRL1		0x5a</div><div class='add'>+#define PO1030_REG_OUTFORMCTRL2		0x5b</div><div class='add'>+#define PO1030_REG_OUTFORMCTRL3		0x5c</div><div class='add'>+#define PO1030_REG_OUTFORMCTRL4		0x5d</div><div class='add'>+#define PO1030_REG_OUTFORMCTRL5		0x5e</div><div class='add'>+</div><div class='add'>+/* Imaging coefficients */</div><div class='add'>+#define PO1030_REG_YBRIGHT		0x73</div><div class='add'>+#define PO1030_REG_YCONTRAST		0x74</div><div class='add'>+#define PO1030_REG_YSATURATION		0x75</div><div class='add'>+</div><div class='add'>+#define PO1030_HFLIP			(1 &lt;&lt; 7)</div><div class='add'>+#define PO1030_VFLIP			(1 &lt;&lt; 6)</div><div class='add'>+</div><div class='add'>+/*****************************************************************************/</div><div class='add'>+</div><div class='add'>+#define PO1030_GLOBAL_GAIN_DEFAULT	0x12</div><div class='add'>+#define PO1030_EXPOSURE_DEFAULT		0x0085</div><div class='add'>+#define PO1030_BLUE_GAIN_DEFAULT 	0x40</div><div class='add'>+#define PO1030_RED_GAIN_DEFAULT 	0x40</div><div class='add'>+</div><div class='add'>+/*****************************************************************************/</div><div class='add'>+</div><div class='add'>+/* Kernel module parameters */</div><div class='add'>+extern int force_sensor;</div><div class='add'>+extern int dump_sensor;</div><div class='add'>+</div><div class='add'>+int po1030_probe(struct sd *sd);</div><div class='add'>+int po1030_init(struct sd *sd);</div><div class='add'>+int po1030_power_down(struct sd *sd);</div><div class='add'>+</div><div class='add'>+void po1030_dump_registers(struct sd *sd);</div><div class='add'>+</div><div class='add'>+int po1030_read_sensor(struct sd *sd, const u8 address,</div><div class='add'>+			      u8 *i2c_data, const u8 len);</div><div class='add'>+int po1030_write_sensor(struct sd *sd, const u8 address,</div><div class='add'>+			       u8 *i2c_data, const u8 len);</div><div class='add'>+</div><div class='add'>+int po1030_get_exposure(struct gspca_dev *gspca_dev, __s32 *val);</div><div class='add'>+int po1030_set_exposure(struct gspca_dev *gspca_dev, __s32 val);</div><div class='add'>+int po1030_get_gain(struct gspca_dev *gspca_dev, __s32 *val);</div><div class='add'>+int po1030_set_gain(struct gspca_dev *gspca_dev, __s32 val);</div><div class='add'>+int po1030_get_red_balance(struct gspca_dev *gspca_dev, __s32 *val);</div><div class='add'>+int po1030_set_red_balance(struct gspca_dev *gspca_dev, __s32 val);</div><div class='add'>+int po1030_get_blue_balance(struct gspca_dev *gspca_dev, __s32 *val);</div><div class='add'>+int po1030_set_blue_balance(struct gspca_dev *gspca_dev, __s32 val);</div><div class='add'>+int po1030_get_hflip(struct gspca_dev *gspca_dev, __s32 *val);</div><div class='add'>+int po1030_set_hflip(struct gspca_dev *gspca_dev, __s32 val);</div><div class='add'>+int po1030_get_vflip(struct gspca_dev *gspca_dev, __s32 *val);</div><div class='add'>+int po1030_set_vflip(struct gspca_dev *gspca_dev, __s32 val);</div><div class='add'>+</div><div class='add'>+static struct m5602_sensor po1030 = {</div><div class='add'>+	.name = "PO1030",</div><div class='add'>+</div><div class='add'>+	.i2c_slave_id = 0xdc,</div><div class='add'>+</div><div class='add'>+	.probe = po1030_probe,</div><div class='add'>+	.init = po1030_init,</div><div class='add'>+	.power_down = po1030_power_down,</div><div class='add'>+</div><div class='add'>+	.nctrls = 6,</div><div class='add'>+	.ctrls = {</div><div class='add'>+	{</div><div class='add'>+		{</div><div class='add'>+			.id 		= V4L2_CID_GAIN,</div><div class='add'>+			.type 		= V4L2_CTRL_TYPE_INTEGER,</div><div class='add'>+			.name 		= "gain",</div><div class='add'>+			.minimum 	= 0x00,</div><div class='add'>+			.maximum 	= 0x4f,</div><div class='add'>+			.step 		= 0x1,</div><div class='add'>+			.default_value 	= PO1030_GLOBAL_GAIN_DEFAULT,</div><div class='add'>+			.flags         	= V4L2_CTRL_FLAG_SLIDER</div><div class='add'>+		},</div><div class='add'>+		.set = po1030_set_gain,</div><div class='add'>+		.get = po1030_get_gain</div><div class='add'>+	}, {</div><div class='add'>+		{</div><div class='add'>+			.id 		= V4L2_CID_EXPOSURE,</div><div class='add'>+			.type 		= V4L2_CTRL_TYPE_INTEGER,</div><div class='add'>+			.name 		= "exposure",</div><div class='add'>+			.minimum 	= 0x00,</div><div class='add'>+			.maximum 	= 0x02ff,</div><div class='add'>+			.step 		= 0x1,</div><div class='add'>+			.default_value 	= PO1030_EXPOSURE_DEFAULT,</div><div class='add'>+			.flags         	= V4L2_CTRL_FLAG_SLIDER</div><div class='add'>+		},</div><div class='add'>+		.set = po1030_set_exposure,</div><div class='add'>+		.get = po1030_get_exposure</div><div class='add'>+	}, {</div><div class='add'>+		{</div><div class='add'>+			.id 		= V4L2_CID_RED_BALANCE,</div><div class='add'>+			.type 		= V4L2_CTRL_TYPE_INTEGER,</div><div class='add'>+			.name 		= "red balance",</div><div class='add'>+			.minimum 	= 0x00,</div><div class='add'>+			.maximum 	= 0xff,</div><div class='add'>+			.step 		= 0x1,</div><div class='add'>+			.default_value 	= PO1030_RED_GAIN_DEFAULT,</div><div class='add'>+			.flags         	= V4L2_CTRL_FLAG_SLIDER</div><div class='add'>+		},</div><div class='add'>+		.set = po1030_set_red_balance,</div><div class='add'>+		.get = po1030_get_red_balance</div><div class='add'>+	}, {</div><div class='add'>+		{</div><div class='add'>+			.id 		= V4L2_CID_BLUE_BALANCE,</div><div class='add'>+			.type 		= V4L2_CTRL_TYPE_INTEGER,</div><div class='add'>+			.name 		= "blue balance",</div><div class='add'>+			.minimum 	= 0x00,</div><div class='add'>+			.maximum 	= 0xff,</div><div class='add'>+			.step 		= 0x1,</div><div class='add'>+			.default_value 	= PO1030_BLUE_GAIN_DEFAULT,</div><div class='add'>+			.flags         	= V4L2_CTRL_FLAG_SLIDER</div><div class='add'>+		},</div><div class='add'>+		.set = po1030_set_blue_balance,</div><div class='add'>+		.get = po1030_get_blue_balance</div><div class='add'>+	}, {</div><div class='add'>+		{</div><div class='add'>+			.id 		= V4L2_CID_HFLIP,</div><div class='add'>+			.type 		= V4L2_CTRL_TYPE_BOOLEAN,</div><div class='add'>+			.name 		= "horizontal flip",</div><div class='add'>+			.minimum 	= 0,</div><div class='add'>+			.maximum 	= 1,</div><div class='add'>+			.step 		= 1,</div><div class='add'>+			.default_value 	= 0,</div><div class='add'>+		},</div><div class='add'>+		.set = po1030_set_hflip,</div><div class='add'>+		.get = po1030_get_hflip</div><div class='add'>+	}, {</div><div class='add'>+		{</div><div class='add'>+			.id 		= V4L2_CID_VFLIP,</div><div class='add'>+			.type 		= V4L2_CTRL_TYPE_BOOLEAN,</div><div class='add'>+			.name 		= "vertical flip",</div><div class='add'>+			.minimum 	= 0,</div><div class='add'>+			.maximum 	= 1,</div><div class='add'>+			.step 		= 1,</div><div class='add'>+			.default_value 	= 0,</div><div class='add'>+		},</div><div class='add'>+		.set = po1030_set_vflip,</div><div class='add'>+		.get = po1030_get_vflip</div><div class='add'>+	}</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	.nmodes = 1,</div><div class='add'>+	.modes = {</div><div class='add'>+	{</div><div class='add'>+		M5602_DEFAULT_FRAME_WIDTH,</div><div class='add'>+		M5602_DEFAULT_FRAME_HEIGHT,</div><div class='add'>+		V4L2_PIX_FMT_SBGGR8,</div><div class='add'>+		V4L2_FIELD_NONE,</div><div class='add'>+		.sizeimage =</div><div class='add'>+			M5602_DEFAULT_FRAME_WIDTH * M5602_DEFAULT_FRAME_HEIGHT,</div><div class='add'>+		.bytesperline = M5602_DEFAULT_FRAME_WIDTH,</div><div class='add'>+		.colorspace = V4L2_COLORSPACE_SRGB,</div><div class='add'>+		.priv = 1</div><div class='add'>+	}</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const unsigned char preinit_po1030[][3] =</div><div class='add'>+{</div><div class='add'>+	{BRIDGE, M5602_XB_MCU_CLK_DIV, 0x02},</div><div class='add'>+	{BRIDGE, M5602_XB_MCU_CLK_CTRL, 0xb0},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},</div><div class='add'>+	{BRIDGE, M5602_XB_ADC_CTRL, 0xc0},</div><div class='add'>+	{BRIDGE, M5602_XB_SENSOR_TYPE, 0x0d},</div><div class='add'>+	{BRIDGE, M5602_XB_SENSOR_CTRL, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_ADC_CTRL, 0xc0},</div><div class='add'>+	{BRIDGE, M5602_XB_SENSOR_TYPE, 0x0c},</div><div class='add'>+</div><div class='add'>+	{SENSOR, PO1030_REG_AUTOCTRL2, 0x24},</div><div class='add'>+</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DIR, 0x05},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DAT, 0x04},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_EN_H, 0x06},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DIR_H, 0x06},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DAT_H, 0x02},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_DIV, 0x04},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_DIV, 0x06},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},</div><div class='add'>+	{BRIDGE, M5602_XB_ADC_CTRL, 0xc0},</div><div class='add'>+	{BRIDGE, M5602_XB_SENSOR_TYPE, 0x0c},</div><div class='add'>+	{BRIDGE, M5602_XB_LINE_OF_FRAME_H, 0x81},</div><div class='add'>+	{BRIDGE, M5602_XB_PIX_OF_LINE_H, 0x82},</div><div class='add'>+	{BRIDGE, M5602_XB_SIG_INI, 0x01},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x02},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x01},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0xec},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SIG_INI, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SIG_INI, 0x02},</div><div class='add'>+	{BRIDGE, M5602_XB_HSYNC_PARA, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_HSYNC_PARA, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_HSYNC_PARA, 0x02},</div><div class='add'>+	{BRIDGE, M5602_XB_HSYNC_PARA, 0x87},</div><div class='add'>+	{BRIDGE, M5602_XB_SIG_INI, 0x00},</div><div class='add'>+</div><div class='add'>+	{SENSOR, PO1030_REG_AUTOCTRL2, 0x24},</div><div class='add'>+</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DIR, 0x05},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DAT, 0x04},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_EN_H, 0x06},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DIR_H, 0x06},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DAT_H, 0x02},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_DIV, 0x04},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},</div><div class='add'>+	{BRIDGE, M5602_XB_ADC_CTRL, 0xc0},</div><div class='add'>+	{BRIDGE, M5602_XB_SENSOR_TYPE, 0x0c},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DIR, 0x05},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DAT, 0x00}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const unsigned char init_po1030[][4] =</div><div class='add'>+{</div><div class='add'>+	{BRIDGE, M5602_XB_MCU_CLK_DIV, 0x02},</div><div class='add'>+	{BRIDGE, M5602_XB_MCU_CLK_CTRL, 0xb0},</div><div class='add'>+	/*sequence 1*/</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},</div><div class='add'>+	{BRIDGE, M5602_XB_ADC_CTRL, 0xc0},</div><div class='add'>+	{BRIDGE, M5602_XB_SENSOR_TYPE, 0x0d},</div><div class='add'>+</div><div class='add'>+	{BRIDGE, M5602_XB_SENSOR_CTRL, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_ADC_CTRL, 0xc0},</div><div class='add'>+	{BRIDGE, M5602_XB_SENSOR_TYPE, 0x0c},</div><div class='add'>+	/*end of sequence 1*/</div><div class='add'>+</div><div class='add'>+	/*sequence 2 (same as stop sequence)*/</div><div class='add'>+	{SENSOR, PO1030_REG_AUTOCTRL2, 0x24},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DIR, 0x05},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DAT, 0x04},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_EN_H, 0x06},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DIR_H, 0x06},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DAT_H, 0x02},</div><div class='add'>+</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_DIV, 0x04},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},</div><div class='add'>+	/*end of sequence 2*/</div><div class='add'>+</div><div class='add'>+	/*sequence 5*/</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_DIV, 0x06},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},</div><div class='add'>+	{BRIDGE, M5602_XB_ADC_CTRL, 0xc0},</div><div class='add'>+	{BRIDGE, M5602_XB_SENSOR_TYPE, 0x0c},</div><div class='add'>+	{BRIDGE, M5602_XB_LINE_OF_FRAME_H, 0x81},</div><div class='add'>+	{BRIDGE, M5602_XB_PIX_OF_LINE_H, 0x82},</div><div class='add'>+	{BRIDGE, M5602_XB_SIG_INI, 0x01},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x02},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x01},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0xec},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SIG_INI, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SIG_INI, 0x02},</div><div class='add'>+	{BRIDGE, M5602_XB_HSYNC_PARA, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_HSYNC_PARA, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_HSYNC_PARA, 0x02},</div><div class='add'>+	{BRIDGE, M5602_XB_HSYNC_PARA, 0x87},</div><div class='add'>+	{BRIDGE, M5602_XB_SIG_INI, 0x00},</div><div class='add'>+	/*end of sequence 5*/</div><div class='add'>+</div><div class='add'>+	/*sequence 2 stop */</div><div class='add'>+	{SENSOR, PO1030_REG_AUTOCTRL2, 0x24},</div><div class='add'>+</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DIR, 0x05},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DAT, 0x04},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_EN_H, 0x06},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DIR_H, 0x06},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DAT_H, 0x02},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_DIV, 0x04},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},</div><div class='add'>+	/*end of sequence 2 stop */</div><div class='add'>+</div><div class='add'>+/* ---------------------------------</div><div class='add'>+ * end of init - begin of start</div><div class='add'>+ * --------------------------------- */</div><div class='add'>+</div><div class='add'>+	/*sequence 3*/</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},</div><div class='add'>+	{BRIDGE, M5602_XB_ADC_CTRL, 0xc0},</div><div class='add'>+	{BRIDGE, M5602_XB_SENSOR_TYPE, 0x0c},</div><div class='add'>+	/*end of sequence 3*/</div><div class='add'>+	/*sequence 4*/</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DIR, 0x05},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DAT, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_EN_H, 0x06},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_EN_L, 0x00},</div><div class='add'>+</div><div class='add'>+	{SENSOR, PO1030_REG_AUTOCTRL2, 0x04},</div><div class='add'>+</div><div class='add'>+	/* Set the width to 751 */</div><div class='add'>+	{SENSOR, PO1030_REG_FRAMEWIDTH_H, 0x02},</div><div class='add'>+	{SENSOR, PO1030_REG_FRAMEWIDTH_L, 0xef},</div><div class='add'>+</div><div class='add'>+	/* Set the height to 540 */</div><div class='add'>+	{SENSOR, PO1030_REG_FRAMEHEIGHT_H, 0x02},</div><div class='add'>+	{SENSOR, PO1030_REG_FRAMEHEIGHT_L, 0x1c},</div><div class='add'>+</div><div class='add'>+	/* Set the x window to 1 */</div><div class='add'>+	{SENSOR, PO1030_REG_WINDOWX_H, 0x00},</div><div class='add'>+	{SENSOR, PO1030_REG_WINDOWX_L, 0x01},</div><div class='add'>+</div><div class='add'>+	/* Set the y window to 1 */</div><div class='add'>+	{SENSOR, PO1030_REG_WINDOWY_H, 0x00},</div><div class='add'>+	{SENSOR, PO1030_REG_WINDOWY_L, 0x01},</div><div class='add'>+</div><div class='add'>+	{SENSOR, PO1030_REG_WINDOWWIDTH_H, 0x02},</div><div class='add'>+	{SENSOR, PO1030_REG_WINDOWWIDTH_L, 0x87},</div><div class='add'>+	{SENSOR, PO1030_REG_WINDOWHEIGHT_H, 0x01},</div><div class='add'>+	{SENSOR, PO1030_REG_WINDOWHEIGHT_L, 0xe3},</div><div class='add'>+</div><div class='add'>+	{SENSOR, PO1030_REG_OUTFORMCTRL2, 0x04},</div><div class='add'>+	{SENSOR, PO1030_REG_OUTFORMCTRL2, 0x04},</div><div class='add'>+	{SENSOR, PO1030_REG_AUTOCTRL1, 0x08},</div><div class='add'>+	{SENSOR, PO1030_REG_CONTROL2, 0x03},</div><div class='add'>+	{SENSOR, 0x21, 0x90},</div><div class='add'>+	{SENSOR, PO1030_REG_YTARGET, 0x60},</div><div class='add'>+	{SENSOR, 0x59, 0x13},</div><div class='add'>+	{SENSOR, PO1030_REG_OUTFORMCTRL1, 0x40},</div><div class='add'>+	{SENSOR, 0x5f, 0x00},</div><div class='add'>+	{SENSOR, 0x60, 0x80},</div><div class='add'>+	{SENSOR, 0x78, 0x14},</div><div class='add'>+	{SENSOR, 0x6f, 0x01},</div><div class='add'>+	{SENSOR, PO1030_REG_CONTROL1, 0x18},</div><div class='add'>+	{SENSOR, PO1030_REG_GLOBALGAINMAX, 0x14},</div><div class='add'>+	{SENSOR, 0x63, 0x38},</div><div class='add'>+	{SENSOR, 0x64, 0x38},</div><div class='add'>+	{SENSOR, PO1030_REG_CONTROL1, 0x58},</div><div class='add'>+	{SENSOR, PO1030_REG_RED_GAIN, 0x30},</div><div class='add'>+	{SENSOR, PO1030_REG_GREEN_1_GAIN, 0x30},</div><div class='add'>+	{SENSOR, PO1030_REG_BLUE_GAIN, 0x30},</div><div class='add'>+	{SENSOR, PO1030_REG_GREEN_2_GAIN, 0x30},</div><div class='add'>+	{SENSOR, PO1030_REG_GC0, 0x10},</div><div class='add'>+	{SENSOR, PO1030_REG_GC1, 0x20},</div><div class='add'>+	{SENSOR, PO1030_REG_GC2, 0x40},</div><div class='add'>+	{SENSOR, PO1030_REG_GC3, 0x60},</div><div class='add'>+	{SENSOR, PO1030_REG_GC4, 0x80},</div><div class='add'>+	{SENSOR, PO1030_REG_GC5, 0xa0},</div><div class='add'>+	{SENSOR, PO1030_REG_GC6, 0xc0},</div><div class='add'>+	{SENSOR, PO1030_REG_GC7, 0xff},</div><div class='add'>+	/*end of sequence 4*/</div><div class='add'>+	/*sequence 5*/</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_DIV, 0x06},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},</div><div class='add'>+	{BRIDGE, M5602_XB_ADC_CTRL, 0xc0},</div><div class='add'>+	{BRIDGE, M5602_XB_SENSOR_TYPE, 0x0c},</div><div class='add'>+	{BRIDGE, M5602_XB_LINE_OF_FRAME_H, 0x81},</div><div class='add'>+	{BRIDGE, M5602_XB_PIX_OF_LINE_H, 0x82},</div><div class='add'>+	{BRIDGE, M5602_XB_SIG_INI, 0x01},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x02},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x01},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0xec},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SIG_INI, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SIG_INI, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_HSYNC_PARA, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_HSYNC_PARA, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_HSYNC_PARA, 0x02},</div><div class='add'>+	{BRIDGE, M5602_XB_HSYNC_PARA, 0x7e},</div><div class='add'>+	{BRIDGE, M5602_XB_SIG_INI, 0x00},</div><div class='add'>+	/*end of sequence 5*/</div><div class='add'>+</div><div class='add'>+	/*sequence 6*/</div><div class='add'>+	/* Changing 40 in f0 the image becomes green in bayer mode and red in</div><div class='add'>+	 * rgb mode */</div><div class='add'>+	{SENSOR, PO1030_REG_RED_GAIN, PO1030_RED_GAIN_DEFAULT},</div><div class='add'>+	/* in changing 40 in f0 the image becomes green in bayer mode and red in</div><div class='add'>+	 * rgb mode */</div><div class='add'>+	{SENSOR, PO1030_REG_BLUE_GAIN, PO1030_BLUE_GAIN_DEFAULT},</div><div class='add'>+</div><div class='add'>+	/* with a very low lighted environment increase the exposure but</div><div class='add'>+	 * decrease the FPS (Frame Per Second) */</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},</div><div class='add'>+</div><div class='add'>+	/* Controls high exposure more than SENSOR_LOW_EXPOSURE, use only in</div><div class='add'>+	 * low lighted environment (f0 is more than ff ?)*/</div><div class='add'>+	{SENSOR, PO1030_REG_INTEGLINES_H, ((PO1030_EXPOSURE_DEFAULT &gt;&gt; 2)</div><div class='add'>+		&amp; 0xff)},</div><div class='add'>+</div><div class='add'>+	/* Controls middle exposure, use only in high lighted environment */</div><div class='add'>+	{SENSOR, PO1030_REG_INTEGLINES_M, PO1030_EXPOSURE_DEFAULT &amp; 0xff},</div><div class='add'>+</div><div class='add'>+	/* Controls clarity (not sure) */</div><div class='add'>+	{SENSOR, PO1030_REG_INTEGLINES_L, 0x00},</div><div class='add'>+	/* Controls gain (the image is more lighted) */</div><div class='add'>+	{SENSOR, PO1030_REG_GLOBALGAIN, PO1030_GLOBAL_GAIN_DEFAULT},</div><div class='add'>+</div><div class='add'>+	/* Sets the width */</div><div class='add'>+	{SENSOR, PO1030_REG_FRAMEWIDTH_H, 0x02},</div><div class='add'>+	{SENSOR, PO1030_REG_FRAMEWIDTH_L, 0xef}</div><div class='add'>+	/*end of sequence 6*/</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/media/video/gspca/m5602/m5602_s5k4aa.c b/drivers/media/video/gspca/m5602/m5602_s5k4aa.c<br/>new file mode 100644<br/>index 000000000000..14b1eac5b812<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/gspca/m5602/m5602_s5k4aa.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/m5602/m5602_s5k4aa.c</a></div><div class='hunk'>@@ -0,0 +1,463 @@</div><div class='add'>+/*</div><div class='add'>+ * Driver for the s5k4aa sensor</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2008 Erik Andrén</div><div class='add'>+ * Copyright (C) 2007 Ilyes Gouta. Based on the m5603x Linux Driver Project.</div><div class='add'>+ * Copyright (C) 2005 m5603x Linux Driver Project &lt;m5602@x3ng.com.br&gt;</div><div class='add'>+ *</div><div class='add'>+ * Portions of code to USB interface and ALi driver software,</div><div class='add'>+ * Copyright (c) 2006 Willem Duinker</div><div class='add'>+ * v4l2 interface modeled after the V4L2 driver</div><div class='add'>+ * for SN9C10x PC Camera Controllers</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public License as</div><div class='add'>+ * published by the Free Software Foundation, version 2.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "m5602_s5k4aa.h"</div><div class='add'>+</div><div class='add'>+int s5k4aa_probe(struct sd *sd)</div><div class='add'>+{</div><div class='add'>+	u8 prod_id[6] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00};</div><div class='add'>+	const u8 expected_prod_id[6] = {0x00, 0x10, 0x00, 0x4b, 0x33, 0x75};</div><div class='add'>+	int i, err = 0;</div><div class='add'>+</div><div class='add'>+	if (force_sensor) {</div><div class='add'>+		if (force_sensor == S5K4AA_SENSOR) {</div><div class='add'>+			info("Forcing a %s sensor", s5k4aa.name);</div><div class='add'>+			goto sensor_found;</div><div class='add'>+		}</div><div class='add'>+		/* If we want to force another sensor, don't try to probe this</div><div class='add'>+		 * one */</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	info("Probing for a s5k4aa sensor");</div><div class='add'>+</div><div class='add'>+	/* Preinit the sensor */</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(preinit_s5k4aa) &amp;&amp; !err; i++) {</div><div class='add'>+		u8 data[2] = {0x00, 0x00};</div><div class='add'>+</div><div class='add'>+		switch (preinit_s5k4aa[i][0]) {</div><div class='add'>+		case BRIDGE:</div><div class='add'>+			err = m5602_write_bridge(sd,</div><div class='add'>+						 preinit_s5k4aa[i][1],</div><div class='add'>+						 preinit_s5k4aa[i][2]);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case SENSOR:</div><div class='add'>+			data[0] = preinit_s5k4aa[i][2];</div><div class='add'>+			err = s5k4aa_write_sensor(sd,</div><div class='add'>+						  preinit_s5k4aa[i][1],</div><div class='add'>+						  data, 1);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case SENSOR_LONG:</div><div class='add'>+			data[0] = preinit_s5k4aa[i][2];</div><div class='add'>+			data[1] = preinit_s5k4aa[i][3];</div><div class='add'>+			err = s5k4aa_write_sensor(sd,</div><div class='add'>+						  preinit_s5k4aa[i][1],</div><div class='add'>+						  data, 2);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			info("Invalid stream command, exiting init");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Test some registers, but we don't know their exact meaning yet */</div><div class='add'>+	if (s5k4aa_read_sensor(sd, 0x00, prod_id, sizeof(prod_id)))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	if (memcmp(prod_id, expected_prod_id, sizeof(prod_id)))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	else</div><div class='add'>+		info("Detected a s5k4aa sensor");</div><div class='add'>+sensor_found:</div><div class='add'>+	sd-&gt;gspca_dev.cam.cam_mode = s5k4aa.modes;</div><div class='add'>+	sd-&gt;gspca_dev.cam.nmodes = s5k4aa.nmodes;</div><div class='add'>+	sd-&gt;desc-&gt;ctrls = s5k4aa.ctrls;</div><div class='add'>+	sd-&gt;desc-&gt;nctrls = s5k4aa.nctrls;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int s5k4aa_read_sensor(struct sd *sd, const u8 address,</div><div class='add'>+		       u8 *i2c_data, const u8 len)</div><div class='add'>+{</div><div class='add'>+	int err, i;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		err = m5602_read_bridge(sd, M5602_XB_I2C_STATUS, i2c_data);</div><div class='add'>+	} while ((*i2c_data &amp; I2C_BUSY) &amp;&amp; !err);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = m5602_write_bridge(sd, M5602_XB_I2C_DEV_ADDR,</div><div class='add'>+				 sd-&gt;sensor-&gt;i2c_slave_id);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = m5602_write_bridge(sd, M5602_XB_I2C_REG_ADDR, address);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = m5602_write_bridge(sd, M5602_XB_I2C_CTRL, 0x18 + len);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		err = m5602_read_bridge(sd, M5602_XB_I2C_STATUS, i2c_data);</div><div class='add'>+	} while ((*i2c_data &amp; I2C_BUSY) &amp;&amp; !err);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	for (i = 0; (i &lt; len) &amp; !err; i++) {</div><div class='add'>+		err = m5602_read_bridge(sd, M5602_XB_I2C_DATA, &amp;(i2c_data[i]));</div><div class='add'>+</div><div class='add'>+		PDEBUG(D_CONF, "Reading sensor register "</div><div class='add'>+				  "0x%x containing 0x%x ", address, *i2c_data);</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	return (err &lt; 0) ? err : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int s5k4aa_write_sensor(struct sd *sd, const u8 address,</div><div class='add'>+			u8 *i2c_data, const u8 len)</div><div class='add'>+{</div><div class='add'>+	int err, i;</div><div class='add'>+	u8 *p;</div><div class='add'>+	struct usb_device *udev = sd-&gt;gspca_dev.dev;</div><div class='add'>+	__u8 *buf = sd-&gt;gspca_dev.usb_buf;</div><div class='add'>+</div><div class='add'>+	/* No sensor with a data width larger than 16 bits has yet been seen */</div><div class='add'>+	if (len &gt; 2 || !len)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	memcpy(buf, sensor_urb_skeleton,</div><div class='add'>+	       sizeof(sensor_urb_skeleton));</div><div class='add'>+</div><div class='add'>+	buf[11] = sd-&gt;sensor-&gt;i2c_slave_id;</div><div class='add'>+	buf[15] = address;</div><div class='add'>+</div><div class='add'>+	/* Special case larger sensor writes */</div><div class='add'>+	p = buf + 16;</div><div class='add'>+</div><div class='add'>+	/* Copy a four byte write sequence for each byte to be written to */</div><div class='add'>+	for (i = 0; i &lt; len; i++) {</div><div class='add'>+		memcpy(p, sensor_urb_skeleton + 16, 4);</div><div class='add'>+		p[3] = i2c_data[i];</div><div class='add'>+		p += 4;</div><div class='add'>+		PDEBUG(D_CONF, "Writing sensor register 0x%x with 0x%x",</div><div class='add'>+		       address, i2c_data[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Copy the tailer */</div><div class='add'>+	memcpy(p, sensor_urb_skeleton + 20, 4);</div><div class='add'>+</div><div class='add'>+	/* Set the total length */</div><div class='add'>+	p[3] = 0x10 + len;</div><div class='add'>+</div><div class='add'>+	err = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),</div><div class='add'>+			      0x04, 0x40, 0x19,</div><div class='add'>+			      0x0000, buf,</div><div class='add'>+			      20 + len * 4, M5602_URB_MSG_TIMEOUT);</div><div class='add'>+</div><div class='add'>+	return (err &lt; 0) ? err : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int s5k4aa_init(struct sd *sd)</div><div class='add'>+{</div><div class='add'>+	int i, err = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(init_s5k4aa) &amp;&amp; !err; i++) {</div><div class='add'>+		u8 data[2] = {0x00, 0x00};</div><div class='add'>+</div><div class='add'>+		switch (init_s5k4aa[i][0]) {</div><div class='add'>+		case BRIDGE:</div><div class='add'>+			err = m5602_write_bridge(sd,</div><div class='add'>+				init_s5k4aa[i][1],</div><div class='add'>+				init_s5k4aa[i][2]);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case SENSOR:</div><div class='add'>+			data[0] = init_s5k4aa[i][2];</div><div class='add'>+			err = s5k4aa_write_sensor(sd,</div><div class='add'>+				init_s5k4aa[i][1], data, 1);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case SENSOR_LONG:</div><div class='add'>+			data[0] = init_s5k4aa[i][2];</div><div class='add'>+			data[1] = init_s5k4aa[i][3];</div><div class='add'>+			err = s5k4aa_write_sensor(sd,</div><div class='add'>+				init_s5k4aa[i][1], data, 2);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			info("Invalid stream command, exiting init");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dump_sensor)</div><div class='add'>+		s5k4aa_dump_registers(sd);</div><div class='add'>+</div><div class='add'>+	if (!err &amp;&amp; dmi_check_system(s5k4aa_vflip_dmi_table)) {</div><div class='add'>+		u8 data = 0x02;</div><div class='add'>+		info("vertical flip quirk active");</div><div class='add'>+		s5k4aa_write_sensor(sd, S5K4AA_PAGE_MAP, &amp;data, 1);</div><div class='add'>+		s5k4aa_read_sensor(sd, S5K4AA_READ_MODE, &amp;data, 1);</div><div class='add'>+		data |= S5K4AA_RM_V_FLIP;</div><div class='add'>+		data &amp;= ~S5K4AA_RM_H_FLIP;</div><div class='add'>+		s5k4aa_write_sensor(sd, S5K4AA_READ_MODE, &amp;data, 1);</div><div class='add'>+</div><div class='add'>+		/* Decrement COLSTART to preserve color order (BGGR) */</div><div class='add'>+		s5k4aa_read_sensor(sd, S5K4AA_COLSTART_LO, &amp;data, 1);</div><div class='add'>+		data--;</div><div class='add'>+		s5k4aa_write_sensor(sd, S5K4AA_COLSTART_LO, &amp;data, 1);</div><div class='add'>+</div><div class='add'>+		/* Increment ROWSTART to preserve color order (BGGR) */</div><div class='add'>+		s5k4aa_read_sensor(sd, S5K4AA_ROWSTART_LO, &amp;data, 1);</div><div class='add'>+		data++;</div><div class='add'>+		s5k4aa_write_sensor(sd, S5K4AA_ROWSTART_LO, &amp;data, 1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return (err &lt; 0) ? err : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int s5k4aa_power_down(struct sd *sd)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int s5k4aa_get_exposure(struct gspca_dev *gspca_dev, __s32 *val)</div><div class='add'>+{</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+	u8 data = S5K4AA_PAGE_MAP_2;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = s5k4aa_write_sensor(sd, S5K4AA_PAGE_MAP, &amp;data, 1);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = s5k4aa_read_sensor(sd, S5K4AA_EXPOSURE_HI, &amp;data, 1);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	*val = data &lt;&lt; 8;</div><div class='add'>+	err = s5k4aa_read_sensor(sd, S5K4AA_EXPOSURE_LO, &amp;data, 1);</div><div class='add'>+	*val |= data;</div><div class='add'>+	PDEBUG(D_V4L2, "Read exposure %d", *val);</div><div class='add'>+out:</div><div class='add'>+	return (err &lt; 0) ? err : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int s5k4aa_set_exposure(struct gspca_dev *gspca_dev, __s32 val)</div><div class='add'>+{</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+	u8 data = S5K4AA_PAGE_MAP_2;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	PDEBUG(D_V4L2, "Set exposure to %d", val);</div><div class='add'>+	err = s5k4aa_write_sensor(sd, S5K4AA_PAGE_MAP, &amp;data, 1);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+	data = (val &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+	err = s5k4aa_write_sensor(sd, S5K4AA_EXPOSURE_HI, &amp;data, 1);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+	data = val &amp; 0xff;</div><div class='add'>+	err = s5k4aa_write_sensor(sd, S5K4AA_EXPOSURE_LO, &amp;data, 1);</div><div class='add'>+out:</div><div class='add'>+	return (err &lt; 0) ? err : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int s5k4aa_get_vflip(struct gspca_dev *gspca_dev, __s32 *val)</div><div class='add'>+{</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+	u8 data = S5K4AA_PAGE_MAP_2;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = s5k4aa_write_sensor(sd, S5K4AA_PAGE_MAP, &amp;data, 1);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = s5k4aa_read_sensor(sd, S5K4AA_PAGE_MAP, &amp;data, 1);</div><div class='add'>+	*val = (data &amp; S5K4AA_RM_V_FLIP) &gt;&gt; 7;</div><div class='add'>+	PDEBUG(D_V4L2, "Read vertical flip %d", *val);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return (err &lt; 0) ? err : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int s5k4aa_set_vflip(struct gspca_dev *gspca_dev, __s32 val)</div><div class='add'>+{</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+	u8 data = S5K4AA_PAGE_MAP_2;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	PDEBUG(D_V4L2, "Set vertical flip to %d", val);</div><div class='add'>+	err = s5k4aa_write_sensor(sd, S5K4AA_PAGE_MAP, &amp;data, 1);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+	err = s5k4aa_write_sensor(sd, S5K4AA_READ_MODE, &amp;data, 1);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+	data = ((data &amp; ~S5K4AA_RM_V_FLIP)</div><div class='add'>+			| ((val &amp; 0x01) &lt;&lt; 7));</div><div class='add'>+	err = s5k4aa_write_sensor(sd, S5K4AA_READ_MODE, &amp;data, 1);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (val) {</div><div class='add'>+		err = s5k4aa_read_sensor(sd, S5K4AA_ROWSTART_LO, &amp;data, 1);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		data++;</div><div class='add'>+		err = s5k4aa_write_sensor(sd, S5K4AA_ROWSTART_LO, &amp;data, 1);</div><div class='add'>+	} else {</div><div class='add'>+		err = s5k4aa_read_sensor(sd, S5K4AA_ROWSTART_LO, &amp;data, 1);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		data--;</div><div class='add'>+		err = s5k4aa_write_sensor(sd, S5K4AA_ROWSTART_LO, &amp;data, 1);</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	return (err &lt; 0) ? err : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int s5k4aa_get_hflip(struct gspca_dev *gspca_dev, __s32 *val)</div><div class='add'>+{</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+	u8 data = S5K4AA_PAGE_MAP_2;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = s5k4aa_write_sensor(sd, S5K4AA_PAGE_MAP, &amp;data, 1);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = s5k4aa_read_sensor(sd, S5K4AA_PAGE_MAP, &amp;data, 1);</div><div class='add'>+	*val = (data &amp; S5K4AA_RM_H_FLIP) &gt;&gt; 6;</div><div class='add'>+	PDEBUG(D_V4L2, "Read horizontal flip %d", *val);</div><div class='add'>+out:</div><div class='add'>+	return (err &lt; 0) ? err : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int s5k4aa_set_hflip(struct gspca_dev *gspca_dev, __s32 val)</div><div class='add'>+{</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+	u8 data = S5K4AA_PAGE_MAP_2;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	PDEBUG(D_V4L2, "Set horizontal flip to %d",</div><div class='add'>+	       val);</div><div class='add'>+	err = s5k4aa_write_sensor(sd, S5K4AA_PAGE_MAP, &amp;data, 1);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+	err = s5k4aa_write_sensor(sd, S5K4AA_READ_MODE, &amp;data, 1);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	data = ((data &amp; ~S5K4AA_RM_H_FLIP) | ((val &amp; 0x01) &lt;&lt; 6));</div><div class='add'>+	err = s5k4aa_write_sensor(sd, S5K4AA_READ_MODE, &amp;data, 1);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (val) {</div><div class='add'>+		err = s5k4aa_read_sensor(sd, S5K4AA_COLSTART_LO, &amp;data, 1);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto out;</div><div class='add'>+		data++;</div><div class='add'>+		err = s5k4aa_write_sensor(sd, S5K4AA_COLSTART_LO, &amp;data, 1);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto out;</div><div class='add'>+	} else {</div><div class='add'>+		err = s5k4aa_read_sensor(sd, S5K4AA_COLSTART_LO, &amp;data, 1);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto out;</div><div class='add'>+		data--;</div><div class='add'>+		err = s5k4aa_write_sensor(sd, S5K4AA_COLSTART_LO, &amp;data, 1);</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	return (err &lt; 0) ? err : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int s5k4aa_get_gain(struct gspca_dev *gspca_dev, __s32 *val)</div><div class='add'>+{</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+	u8 data = S5K4AA_PAGE_MAP_2;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = s5k4aa_write_sensor(sd, S5K4AA_PAGE_MAP, &amp;data, 1);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = s5k4aa_read_sensor(sd, S5K4AA_GAIN_2, &amp;data, 1);</div><div class='add'>+	*val = data;</div><div class='add'>+	PDEBUG(D_V4L2, "Read gain %d", *val);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return (err &lt; 0) ? err : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int s5k4aa_set_gain(struct gspca_dev *gspca_dev, __s32 val)</div><div class='add'>+{</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+	u8 data = S5K4AA_PAGE_MAP_2;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	PDEBUG(D_V4L2, "Set gain to %d", val);</div><div class='add'>+	err = s5k4aa_write_sensor(sd, S5K4AA_PAGE_MAP, &amp;data, 1);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	data = val &amp; 0xff;</div><div class='add'>+	err = s5k4aa_write_sensor(sd, S5K4AA_GAIN_2, &amp;data, 1);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return (err &lt; 0) ? err : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void s5k4aa_dump_registers(struct sd *sd)</div><div class='add'>+{</div><div class='add'>+	int address;</div><div class='add'>+	u8 page, old_page;</div><div class='add'>+	s5k4aa_read_sensor(sd, S5K4AA_PAGE_MAP, &amp;old_page, 1);</div><div class='add'>+	for (page = 0; page &lt; 16; page++) {</div><div class='add'>+		s5k4aa_write_sensor(sd, S5K4AA_PAGE_MAP, &amp;page, 1);</div><div class='add'>+		info("Dumping the s5k4aa register state for page 0x%x", page);</div><div class='add'>+		for (address = 0; address &lt;= 0xff; address++) {</div><div class='add'>+			u8 value = 0;</div><div class='add'>+			s5k4aa_read_sensor(sd, address, &amp;value, 1);</div><div class='add'>+			info("register 0x%x contains 0x%x",</div><div class='add'>+			     address, value);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	info("s5k4aa register state dump complete");</div><div class='add'>+</div><div class='add'>+	for (page = 0; page &lt; 16; page++) {</div><div class='add'>+		s5k4aa_write_sensor(sd, S5K4AA_PAGE_MAP, &amp;page, 1);</div><div class='add'>+		info("Probing for which registers that are "</div><div class='add'>+		     "read/write for page 0x%x", page);</div><div class='add'>+		for (address = 0; address &lt;= 0xff; address++) {</div><div class='add'>+			u8 old_value, ctrl_value, test_value = 0xff;</div><div class='add'>+</div><div class='add'>+			s5k4aa_read_sensor(sd, address, &amp;old_value, 1);</div><div class='add'>+			s5k4aa_write_sensor(sd, address, &amp;test_value, 1);</div><div class='add'>+			s5k4aa_read_sensor(sd, address, &amp;ctrl_value, 1);</div><div class='add'>+</div><div class='add'>+			if (ctrl_value == test_value)</div><div class='add'>+				info("register 0x%x is writeable", address);</div><div class='add'>+			else</div><div class='add'>+				info("register 0x%x is read only", address);</div><div class='add'>+</div><div class='add'>+			/* Restore original value */</div><div class='add'>+			s5k4aa_write_sensor(sd, address, &amp;old_value, 1);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	info("Read/write register probing complete");</div><div class='add'>+	s5k4aa_write_sensor(sd, S5K4AA_PAGE_MAP, &amp;old_page, 1);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/media/video/gspca/m5602/m5602_s5k4aa.h b/drivers/media/video/gspca/m5602/m5602_s5k4aa.h<br/>new file mode 100644<br/>index 000000000000..eaef67655afa<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/gspca/m5602/m5602_s5k4aa.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/m5602/m5602_s5k4aa.h</a></div><div class='hunk'>@@ -0,0 +1,369 @@</div><div class='add'>+/*</div><div class='add'>+ * Driver for the s5k4aa sensor</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2008 Erik Andrén</div><div class='add'>+ * Copyright (C) 2007 Ilyes Gouta. Based on the m5603x Linux Driver Project.</div><div class='add'>+ * Copyright (C) 2005 m5603x Linux Driver Project &lt;m5602@x3ng.com.br&gt;</div><div class='add'>+ *</div><div class='add'>+ * Portions of code to USB interface and ALi driver software,</div><div class='add'>+ * Copyright (c) 2006 Willem Duinker</div><div class='add'>+ * v4l2 interface modeled after the V4L2 driver</div><div class='add'>+ * for SN9C10x PC Camera Controllers</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public License as</div><div class='add'>+ * published by the Free Software Foundation, version 2.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef M5602_S5K4AA_H_</div><div class='add'>+#define M5602_S5K4AA_H_</div><div class='add'>+</div><div class='add'>+#include &lt;linux/dmi.h&gt;</div><div class='add'>+</div><div class='add'>+#include "m5602_sensor.h"</div><div class='add'>+</div><div class='add'>+/*****************************************************************************/</div><div class='add'>+</div><div class='add'>+#define S5K4AA_PAGE_MAP			0xec</div><div class='add'>+</div><div class='add'>+#define S5K4AA_PAGE_MAP_0		0x00</div><div class='add'>+#define S5K4AA_PAGE_MAP_1		0x01</div><div class='add'>+#define S5K4AA_PAGE_MAP_2		0x02</div><div class='add'>+</div><div class='add'>+/* Sensor register definitions for page 0x02 */</div><div class='add'>+#define S5K4AA_READ_MODE		0x03</div><div class='add'>+#define S5K4AA_ROWSTART_HI		0x04</div><div class='add'>+#define S5K4AA_ROWSTART_LO		0x05</div><div class='add'>+#define S5K4AA_COLSTART_HI		0x06</div><div class='add'>+#define S5K4AA_COLSTART_LO		0x07</div><div class='add'>+#define S5K4AA_WINDOW_HEIGHT_HI		0x08</div><div class='add'>+#define S5K4AA_WINDOW_HEIGHT_LO		0x09</div><div class='add'>+#define S5K4AA_WINDOW_WIDTH_HI		0x0a</div><div class='add'>+#define S5K4AA_WINDOW_WIDTH_LO		0x0b</div><div class='add'>+#define S5K4AA_GLOBAL_GAIN__		0x0f /* Only a guess ATM !!! */</div><div class='add'>+#define S5K4AA_H_BLANK_HI__		0x1d /* Only a guess ATM !!! sync lost</div><div class='add'>+						if too low, reduces frame rate</div><div class='add'>+						if too high */</div><div class='add'>+#define S5K4AA_H_BLANK_LO__		0x1e /* Only a guess ATM !!! */</div><div class='add'>+#define S5K4AA_EXPOSURE_HI		0x17</div><div class='add'>+#define S5K4AA_EXPOSURE_LO		0x18</div><div class='add'>+#define S5K4AA_GAIN_1			0x1f /* (digital?) gain : 5 bits */</div><div class='add'>+#define S5K4AA_GAIN_2			0x20 /* (analogue?) gain : 7 bits */</div><div class='add'>+</div><div class='add'>+#define S5K4AA_RM_ROW_SKIP_4X		0x08</div><div class='add'>+#define S5K4AA_RM_ROW_SKIP_2X		0x04</div><div class='add'>+#define S5K4AA_RM_COL_SKIP_4X		0x02</div><div class='add'>+#define S5K4AA_RM_COL_SKIP_2X		0x01</div><div class='add'>+#define S5K4AA_RM_H_FLIP		0x40</div><div class='add'>+#define S5K4AA_RM_V_FLIP		0x80</div><div class='add'>+</div><div class='add'>+/*****************************************************************************/</div><div class='add'>+</div><div class='add'>+/* Kernel module parameters */</div><div class='add'>+extern int force_sensor;</div><div class='add'>+extern int dump_sensor;</div><div class='add'>+</div><div class='add'>+int s5k4aa_probe(struct sd *sd);</div><div class='add'>+int s5k4aa_init(struct sd *sd);</div><div class='add'>+int s5k4aa_power_down(struct sd *sd);</div><div class='add'>+</div><div class='add'>+void s5k4aa_dump_registers(struct sd *sd);</div><div class='add'>+</div><div class='add'>+int s5k4aa_read_sensor(struct sd *sd, const u8 address,</div><div class='add'>+		       u8 *i2c_data, const u8 len);</div><div class='add'>+int s5k4aa_write_sensor(struct sd *sd, const u8 address,</div><div class='add'>+			u8 *i2c_data, const u8 len);</div><div class='add'>+</div><div class='add'>+int s5k4aa_get_exposure(struct gspca_dev *gspca_dev, __s32 *val);</div><div class='add'>+int s5k4aa_set_exposure(struct gspca_dev *gspca_dev, __s32 val);</div><div class='add'>+int s5k4aa_get_vflip(struct gspca_dev *gspca_dev, __s32 *val);</div><div class='add'>+int s5k4aa_set_vflip(struct gspca_dev *gspca_dev, __s32 val);</div><div class='add'>+int s5k4aa_get_hflip(struct gspca_dev *gspca_dev, __s32 *val);</div><div class='add'>+int s5k4aa_set_hflip(struct gspca_dev *gspca_dev, __s32 val);</div><div class='add'>+int s5k4aa_get_gain(struct gspca_dev *gspca_dev, __s32 *val);</div><div class='add'>+int s5k4aa_set_gain(struct gspca_dev *gspca_dev, __s32 val);</div><div class='add'>+</div><div class='add'>+static struct m5602_sensor s5k4aa = {</div><div class='add'>+	.name = "S5K4AA",</div><div class='add'>+	.probe = s5k4aa_probe,</div><div class='add'>+	.init = s5k4aa_init,</div><div class='add'>+	.power_down = s5k4aa_power_down,</div><div class='add'>+	.read_sensor = s5k4aa_read_sensor,</div><div class='add'>+	.write_sensor = s5k4aa_write_sensor,</div><div class='add'>+	.i2c_slave_id = 0x5a,</div><div class='add'>+	.nctrls = 4,</div><div class='add'>+	.ctrls = {</div><div class='add'>+	{</div><div class='add'>+		{</div><div class='add'>+			.id 		= V4L2_CID_VFLIP,</div><div class='add'>+			.type 		= V4L2_CTRL_TYPE_BOOLEAN,</div><div class='add'>+			.name 		= "vertical flip",</div><div class='add'>+			.minimum 	= 0,</div><div class='add'>+			.maximum 	= 1,</div><div class='add'>+			.step 		= 1,</div><div class='add'>+			.default_value 	= 0</div><div class='add'>+		},</div><div class='add'>+		.set = s5k4aa_set_vflip,</div><div class='add'>+		.get = s5k4aa_get_vflip</div><div class='add'>+</div><div class='add'>+	}, {</div><div class='add'>+		{</div><div class='add'>+			.id 		= V4L2_CID_HFLIP,</div><div class='add'>+			.type 		= V4L2_CTRL_TYPE_BOOLEAN,</div><div class='add'>+			.name 		= "horizontal flip",</div><div class='add'>+			.minimum 	= 0,</div><div class='add'>+			.maximum 	= 1,</div><div class='add'>+			.step 		= 1,</div><div class='add'>+			.default_value 	= 0</div><div class='add'>+		},</div><div class='add'>+		.set = s5k4aa_set_hflip,</div><div class='add'>+		.get = s5k4aa_get_hflip</div><div class='add'>+</div><div class='add'>+	}, {</div><div class='add'>+		{</div><div class='add'>+			.id		= V4L2_CID_GAIN,</div><div class='add'>+			.type		= V4L2_CTRL_TYPE_INTEGER,</div><div class='add'>+			.name		= "Gain",</div><div class='add'>+			.minimum	= 0,</div><div class='add'>+			.maximum	= 127,</div><div class='add'>+			.step		= 1,</div><div class='add'>+			.default_value	= 0xa0,</div><div class='add'>+			.flags		= V4L2_CTRL_FLAG_SLIDER</div><div class='add'>+		},</div><div class='add'>+		.set = s5k4aa_set_gain,</div><div class='add'>+		.get = s5k4aa_get_gain</div><div class='add'>+	}, {</div><div class='add'>+		{</div><div class='add'>+			.id		= V4L2_CID_EXPOSURE,</div><div class='add'>+			.type		= V4L2_CTRL_TYPE_INTEGER,</div><div class='add'>+			.name		= "Exposure",</div><div class='add'>+			.minimum	= 13,</div><div class='add'>+			.maximum	= 0xfff,</div><div class='add'>+			.step		= 1,</div><div class='add'>+			.default_value	= 0x100,</div><div class='add'>+			.flags		= V4L2_CTRL_FLAG_SLIDER</div><div class='add'>+		},</div><div class='add'>+		.set = s5k4aa_set_exposure,</div><div class='add'>+		.get = s5k4aa_get_exposure</div><div class='add'>+	}</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	.nmodes = 1,</div><div class='add'>+	.modes = {</div><div class='add'>+	{</div><div class='add'>+		M5602_DEFAULT_FRAME_WIDTH,</div><div class='add'>+		M5602_DEFAULT_FRAME_HEIGHT,</div><div class='add'>+		V4L2_PIX_FMT_SBGGR8,</div><div class='add'>+		V4L2_FIELD_NONE,</div><div class='add'>+		.sizeimage =</div><div class='add'>+			M5602_DEFAULT_FRAME_WIDTH * M5602_DEFAULT_FRAME_HEIGHT,</div><div class='add'>+		.bytesperline = M5602_DEFAULT_FRAME_WIDTH,</div><div class='add'>+		.colorspace = V4L2_COLORSPACE_SRGB,</div><div class='add'>+		.priv = 1</div><div class='add'>+	}</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const unsigned char preinit_s5k4aa[][4] =</div><div class='add'>+{</div><div class='add'>+	{BRIDGE, M5602_XB_MCU_CLK_DIV, 0x02, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_MCU_CLK_CTRL, 0xb0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SENSOR_TYPE, 0x0d, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SENSOR_CTRL, 0x00, 0x00},</div><div class='add'>+</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DIR, 0x1d, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DAT, 0x08, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_DIV, 0xb0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0x80, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_EN_H, 0x3f, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DIR_H, 0x3f, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DAT_H, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DIR, 0x1d, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DAT, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_EN_L, 0xff, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DIR_L, 0xff, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DAT_L, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SENSOR_TYPE, 0x08, 0x00},</div><div class='add'>+</div><div class='add'>+	{BRIDGE, M5602_XB_MCU_CLK_DIV, 0x02, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_MCU_CLK_CTRL, 0xb0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DIR, 0x1d, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DAT, 0x14, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xf0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DIR, 0x1d, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DAT, 0x1c, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_EN_H, 0x06, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DIR_H, 0x06, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DAT_H, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_EN_L, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_CLK_DIV, 0x20, 0x00},</div><div class='add'>+</div><div class='add'>+	{SENSOR, S5K4AA_PAGE_MAP, 0x00, 0x00}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const unsigned char init_s5k4aa[][4] =</div><div class='add'>+{</div><div class='add'>+	{BRIDGE, M5602_XB_MCU_CLK_DIV, 0x02, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_MCU_CLK_CTRL, 0xb0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SENSOR_TYPE, 0x0d, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SENSOR_CTRL, 0x00, 0x00},</div><div class='add'>+</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DIR, 0x1d, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DAT, 0x08, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_DIV, 0xb0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0x80, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_EN_H, 0x3f, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DIR_H, 0x3f, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DAT_H, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DIR, 0x1d, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DAT, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_EN_L, 0xff, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DIR_L, 0xff, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DAT_L, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SENSOR_TYPE, 0x08, 0x00},</div><div class='add'>+</div><div class='add'>+	{BRIDGE, M5602_XB_MCU_CLK_DIV, 0x02, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_MCU_CLK_CTRL, 0xb0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DIR, 0x1d, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DAT, 0x14, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xf0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DIR, 0x1d, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DAT, 0x1c, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_EN_H, 0x06, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DIR_H, 0x06, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DAT_H, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_EN_L, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_CLK_DIV, 0x20, 0x00},</div><div class='add'>+</div><div class='add'>+	{SENSOR, S5K4AA_PAGE_MAP, 0x07, 0x00},</div><div class='add'>+	{SENSOR, 0x36, 0x01, 0x00},</div><div class='add'>+	{SENSOR, S5K4AA_PAGE_MAP, 0x00, 0x00},</div><div class='add'>+	{SENSOR, 0x7b, 0xff, 0x00},</div><div class='add'>+	{SENSOR, S5K4AA_PAGE_MAP, 0x02, 0x00},</div><div class='add'>+	{SENSOR, 0x0c, 0x05, 0x00},</div><div class='add'>+	{SENSOR, 0x02, 0x0e, 0x00},</div><div class='add'>+	{SENSOR, S5K4AA_GAIN_1, 0x0f, 0x00},</div><div class='add'>+	{SENSOR, S5K4AA_GAIN_2, 0x00, 0x00},</div><div class='add'>+	{SENSOR, S5K4AA_GLOBAL_GAIN__, 0x01, 0x00},</div><div class='add'>+	{SENSOR, 0x11, 0x00, 0x00},</div><div class='add'>+	{SENSOR, 0x12, 0x00, 0x00},</div><div class='add'>+	{SENSOR, S5K4AA_PAGE_MAP, 0x02, 0x00},</div><div class='add'>+	{SENSOR, S5K4AA_READ_MODE, 0xa0, 0x00},</div><div class='add'>+	{SENSOR, 0x37, 0x00, 0x00},</div><div class='add'>+	{SENSOR, S5K4AA_ROWSTART_HI, 0x00, 0x00},</div><div class='add'>+	{SENSOR, S5K4AA_ROWSTART_LO, 0x2a, 0x00},</div><div class='add'>+	{SENSOR, S5K4AA_COLSTART_HI, 0x00, 0x00},</div><div class='add'>+	{SENSOR, S5K4AA_COLSTART_LO, 0x0b, 0x00},</div><div class='add'>+	{SENSOR, S5K4AA_WINDOW_HEIGHT_HI, 0x03, 0x00},</div><div class='add'>+	{SENSOR, S5K4AA_WINDOW_HEIGHT_LO, 0xc4, 0x00},</div><div class='add'>+	{SENSOR, S5K4AA_WINDOW_WIDTH_HI, 0x05, 0x00},</div><div class='add'>+	{SENSOR, S5K4AA_WINDOW_WIDTH_LO, 0x08, 0x00},</div><div class='add'>+	{SENSOR, S5K4AA_H_BLANK_HI__, 0x00, 0x00},</div><div class='add'>+	{SENSOR, S5K4AA_H_BLANK_LO__, 0x48, 0x00},</div><div class='add'>+	{SENSOR, S5K4AA_EXPOSURE_HI, 0x00, 0x00},</div><div class='add'>+	{SENSOR, S5K4AA_EXPOSURE_LO, 0x43, 0x00},</div><div class='add'>+	{SENSOR, 0x11, 0x04, 0x00},</div><div class='add'>+	{SENSOR, 0x12, 0xc3, 0x00},</div><div class='add'>+	{SENSOR, S5K4AA_PAGE_MAP, 0x02, 0x00},</div><div class='add'>+</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_DIV, 0x06, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SENSOR_TYPE, 0x08, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_LINE_OF_FRAME_H, 0x81, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_PIX_OF_LINE_H, 0x82, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SIG_INI, 0x01, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	/* VSYNC_PARA, VSYNC_PARA : img height 480 = 0x01e0 */</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x01, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0xe0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SIG_INI, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SIG_INI, 0x02, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_HSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_HSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	/* HSYNC_PARA, HSYNC_PARA : img width 640 = 0x0280 */</div><div class='add'>+	{BRIDGE, M5602_XB_HSYNC_PARA, 0x02, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_HSYNC_PARA, 0x80, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SIG_INI, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xa0, 0x00}, /* 48 MHz */</div><div class='add'>+</div><div class='add'>+	{SENSOR, S5K4AA_PAGE_MAP, 0x02, 0x00},</div><div class='add'>+	{SENSOR, S5K4AA_READ_MODE, S5K4AA_RM_H_FLIP | S5K4AA_RM_ROW_SKIP_2X</div><div class='add'>+		| S5K4AA_RM_COL_SKIP_2X, 0x00},</div><div class='add'>+	/* 0x37 : Fix image stability when light is too bright and improves</div><div class='add'>+	 * image quality in 640x480, but worsens it in 1280x1024 */</div><div class='add'>+	{SENSOR, 0x37, 0x01, 0x00},</div><div class='add'>+	/* ROWSTART_HI, ROWSTART_LO : 10 + (1024-960)/2 = 42 = 0x002a */</div><div class='add'>+	{SENSOR, S5K4AA_ROWSTART_HI, 0x00, 0x00},</div><div class='add'>+	{SENSOR, S5K4AA_ROWSTART_LO, 0x2a, 0x00},</div><div class='add'>+	{SENSOR, S5K4AA_COLSTART_HI, 0x00, 0x00},</div><div class='add'>+	{SENSOR, S5K4AA_COLSTART_LO, 0x0c, 0x00},</div><div class='add'>+	/* window_height_hi, window_height_lo : 960 = 0x03c0 */</div><div class='add'>+	{SENSOR, S5K4AA_WINDOW_HEIGHT_HI, 0x03, 0x00},</div><div class='add'>+	{SENSOR, S5K4AA_WINDOW_HEIGHT_LO, 0xc0, 0x00},</div><div class='add'>+	/* window_width_hi, window_width_lo : 1280 = 0x0500 */</div><div class='add'>+	{SENSOR, S5K4AA_WINDOW_WIDTH_HI, 0x05, 0x00},</div><div class='add'>+	{SENSOR, S5K4AA_WINDOW_WIDTH_LO, 0x00, 0x00},</div><div class='add'>+	{SENSOR, S5K4AA_H_BLANK_HI__, 0x00, 0x00},</div><div class='add'>+	{SENSOR, S5K4AA_H_BLANK_LO__, 0xa8, 0x00}, /* helps to sync... */</div><div class='add'>+	{SENSOR, S5K4AA_EXPOSURE_HI, 0x01, 0x00},</div><div class='add'>+	{SENSOR, S5K4AA_EXPOSURE_LO, 0x00, 0x00},</div><div class='add'>+	{SENSOR, 0x11, 0x04, 0x00},</div><div class='add'>+	{SENSOR, 0x12, 0xc3, 0x00},</div><div class='add'>+	{SENSOR, S5K4AA_PAGE_MAP, 0x02, 0x00},</div><div class='add'>+	{SENSOR, 0x02, 0x0e, 0x00},</div><div class='add'>+	{SENSOR_LONG, S5K4AA_GLOBAL_GAIN__, 0x0f, 0x00},</div><div class='add'>+	{SENSOR, S5K4AA_GAIN_1, 0x0b, 0x00},</div><div class='add'>+	{SENSOR, S5K4AA_GAIN_2, 0xa0, 0x00}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static</div><div class='add'>+    const</div><div class='add'>+	struct dmi_system_id s5k4aa_vflip_dmi_table[] = {</div><div class='add'>+	{</div><div class='add'>+		.ident = "Fujitsu-Siemens Amilo Xa 2528",</div><div class='add'>+		.matches = {</div><div class='add'>+			DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),</div><div class='add'>+			DMI_MATCH(DMI_PRODUCT_NAME, "AMILO Xa 2528")</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.ident = "Fujitsu-Siemens Amilo Xi 2550",</div><div class='add'>+		.matches = {</div><div class='add'>+			DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),</div><div class='add'>+			DMI_MATCH(DMI_PRODUCT_NAME, "AMILO Xi 2550")</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+		{</div><div class='add'>+		.ident = "MSI GX700",</div><div class='add'>+		.matches = {</div><div class='add'>+			DMI_MATCH(DMI_SYS_VENDOR, "Micro-Star International"),</div><div class='add'>+			DMI_MATCH(DMI_PRODUCT_NAME, "GX700"),</div><div class='add'>+			DMI_MATCH(DMI_BIOS_DATE, "07/26/2007")</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/media/video/gspca/m5602/m5602_s5k83a.c b/drivers/media/video/gspca/m5602/m5602_s5k83a.c<br/>new file mode 100644<br/>index 000000000000..8988a728e0b4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/gspca/m5602/m5602_s5k83a.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/m5602/m5602_s5k83a.c</a></div><div class='hunk'>@@ -0,0 +1,423 @@</div><div class='add'>+/*</div><div class='add'>+ * Driver for the s5k83a sensor</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2008 Erik Andrén</div><div class='add'>+ * Copyright (C) 2007 Ilyes Gouta. Based on the m5603x Linux Driver Project.</div><div class='add'>+ * Copyright (C) 2005 m5603x Linux Driver Project &lt;m5602@x3ng.com.br&gt;</div><div class='add'>+ *</div><div class='add'>+ * Portions of code to USB interface and ALi driver software,</div><div class='add'>+ * Copyright (c) 2006 Willem Duinker</div><div class='add'>+ * v4l2 interface modeled after the V4L2 driver</div><div class='add'>+ * for SN9C10x PC Camera Controllers</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public License as</div><div class='add'>+ * published by the Free Software Foundation, version 2.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "m5602_s5k83a.h"</div><div class='add'>+</div><div class='add'>+int s5k83a_probe(struct sd *sd)</div><div class='add'>+{</div><div class='add'>+	u8 prod_id = 0, ver_id = 0;</div><div class='add'>+	int i, err = 0;</div><div class='add'>+</div><div class='add'>+	if (force_sensor) {</div><div class='add'>+		if (force_sensor == S5K83A_SENSOR) {</div><div class='add'>+			info("Forcing a %s sensor", s5k83a.name);</div><div class='add'>+			goto sensor_found;</div><div class='add'>+		}</div><div class='add'>+		/* If we want to force another sensor, don't try to probe this</div><div class='add'>+		 * one */</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	info("Probing for a s5k83a sensor");</div><div class='add'>+</div><div class='add'>+	/* Preinit the sensor */</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(preinit_s5k83a) &amp;&amp; !err; i++) {</div><div class='add'>+		u8 data[2] = {preinit_s5k83a[i][2], preinit_s5k83a[i][3]};</div><div class='add'>+		if (preinit_s5k83a[i][0] == SENSOR)</div><div class='add'>+			err = s5k83a_write_sensor(sd, preinit_s5k83a[i][1],</div><div class='add'>+				data, 2);</div><div class='add'>+		else</div><div class='add'>+			err = m5602_write_bridge(sd, preinit_s5k83a[i][1],</div><div class='add'>+				data[0]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* We don't know what register (if any) that contain the product id</div><div class='add'>+	 * Just pick the first addresses that seem to produce the same results</div><div class='add'>+	 * on multiple machines */</div><div class='add'>+	if (s5k83a_read_sensor(sd, 0x00, &amp;prod_id, 1))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	if (s5k83a_read_sensor(sd, 0x01, &amp;ver_id, 1))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	if ((prod_id == 0xff) || (ver_id == 0xff))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	else</div><div class='add'>+		info("Detected a s5k83a sensor");</div><div class='add'>+</div><div class='add'>+sensor_found:</div><div class='add'>+	sd-&gt;gspca_dev.cam.cam_mode = s5k83a.modes;</div><div class='add'>+	sd-&gt;gspca_dev.cam.nmodes = s5k83a.nmodes;</div><div class='add'>+	sd-&gt;desc-&gt;ctrls = s5k83a.ctrls;</div><div class='add'>+	sd-&gt;desc-&gt;nctrls = s5k83a.nctrls;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int s5k83a_read_sensor(struct sd *sd, const u8 address,</div><div class='add'>+			      u8 *i2c_data, const u8 len)</div><div class='add'>+{</div><div class='add'>+	int err, i;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		err = m5602_read_bridge(sd, M5602_XB_I2C_STATUS, i2c_data);</div><div class='add'>+	} while ((*i2c_data &amp; I2C_BUSY) &amp;&amp; !err);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = m5602_write_bridge(sd, M5602_XB_I2C_DEV_ADDR,</div><div class='add'>+				 sd-&gt;sensor-&gt;i2c_slave_id);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = m5602_write_bridge(sd, M5602_XB_I2C_REG_ADDR, address);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = m5602_write_bridge(sd, M5602_XB_I2C_CTRL, 0x18 + len);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		err = m5602_read_bridge(sd, M5602_XB_I2C_STATUS, i2c_data);</div><div class='add'>+	} while ((*i2c_data &amp; I2C_BUSY) &amp;&amp; !err);</div><div class='add'>+</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+	for (i = 0; i &lt; len &amp;&amp; !len; i++) {</div><div class='add'>+		err = m5602_read_bridge(sd, M5602_XB_I2C_DATA, &amp;(i2c_data[i]));</div><div class='add'>+</div><div class='add'>+		PDEBUG(D_CONF, "Reading sensor register "</div><div class='add'>+				  "0x%x containing 0x%x ", address, *i2c_data);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return (err &lt; 0) ? err : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int s5k83a_write_sensor(struct sd *sd, const u8 address,</div><div class='add'>+			       u8 *i2c_data, const u8 len)</div><div class='add'>+{</div><div class='add'>+	int err, i;</div><div class='add'>+	u8 *p;</div><div class='add'>+	struct usb_device *udev = sd-&gt;gspca_dev.dev;</div><div class='add'>+	__u8 *buf = sd-&gt;gspca_dev.usb_buf;</div><div class='add'>+</div><div class='add'>+	/* No sensor with a data width larger than 16 bits has yet been seen */</div><div class='add'>+	if (len &gt; 2 || !len)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	memcpy(buf, sensor_urb_skeleton,</div><div class='add'>+	       sizeof(sensor_urb_skeleton));</div><div class='add'>+</div><div class='add'>+	buf[11] = sd-&gt;sensor-&gt;i2c_slave_id;</div><div class='add'>+	buf[15] = address;</div><div class='add'>+</div><div class='add'>+	/* Special case larger sensor writes */</div><div class='add'>+	p = buf + 16;</div><div class='add'>+</div><div class='add'>+	/* Copy a four byte write sequence for each byte to be written to */</div><div class='add'>+	for (i = 0; i &lt; len; i++) {</div><div class='add'>+		memcpy(p, sensor_urb_skeleton + 16, 4);</div><div class='add'>+		p[3] = i2c_data[i];</div><div class='add'>+		p += 4;</div><div class='add'>+		PDEBUG(D_CONF, "Writing sensor register 0x%x with 0x%x",</div><div class='add'>+		       address, i2c_data[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Copy the tailer */</div><div class='add'>+	memcpy(p, sensor_urb_skeleton + 20, 4);</div><div class='add'>+</div><div class='add'>+	/* Set the total length */</div><div class='add'>+	p[3] = 0x10 + len;</div><div class='add'>+</div><div class='add'>+	err = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),</div><div class='add'>+			      0x04, 0x40, 0x19,</div><div class='add'>+			      0x0000, buf,</div><div class='add'>+			      20 + len * 4, M5602_URB_MSG_TIMEOUT);</div><div class='add'>+</div><div class='add'>+	return (err &lt; 0) ? err : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int s5k83a_init(struct sd *sd)</div><div class='add'>+{</div><div class='add'>+	int i, err = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(init_s5k83a) &amp;&amp; !err; i++) {</div><div class='add'>+		u8 data[2] = {0x00, 0x00};</div><div class='add'>+</div><div class='add'>+		switch (init_s5k83a[i][0]) {</div><div class='add'>+		case BRIDGE:</div><div class='add'>+			err = m5602_write_bridge(sd,</div><div class='add'>+					init_s5k83a[i][1],</div><div class='add'>+					init_s5k83a[i][2]);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case SENSOR:</div><div class='add'>+			data[0] = init_s5k83a[i][2];</div><div class='add'>+			err = s5k83a_write_sensor(sd,</div><div class='add'>+				init_s5k83a[i][1], data, 1);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case SENSOR_LONG:</div><div class='add'>+			data[0] = init_s5k83a[i][2];</div><div class='add'>+			data[1] = init_s5k83a[i][3];</div><div class='add'>+			err = s5k83a_write_sensor(sd,</div><div class='add'>+				init_s5k83a[i][1], data, 2);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			info("Invalid stream command, exiting init");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dump_sensor)</div><div class='add'>+		s5k83a_dump_registers(sd);</div><div class='add'>+</div><div class='add'>+	return (err &lt; 0) ? err : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int s5k83a_power_down(struct sd *sd)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void s5k83a_dump_registers(struct sd *sd)</div><div class='add'>+{</div><div class='add'>+	int address;</div><div class='add'>+	u8 page, old_page;</div><div class='add'>+	s5k83a_read_sensor(sd, S5K83A_PAGE_MAP, &amp;old_page, 1);</div><div class='add'>+</div><div class='add'>+	for (page = 0; page &lt; 16; page++) {</div><div class='add'>+		s5k83a_write_sensor(sd, S5K83A_PAGE_MAP, &amp;page, 1);</div><div class='add'>+		info("Dumping the s5k83a register state for page 0x%x", page);</div><div class='add'>+		for (address = 0; address &lt;= 0xff; address++) {</div><div class='add'>+			u8 val = 0;</div><div class='add'>+			s5k83a_read_sensor(sd, address, &amp;val, 1);</div><div class='add'>+			info("register 0x%x contains 0x%x",</div><div class='add'>+			     address, val);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	info("s5k83a register state dump complete");</div><div class='add'>+</div><div class='add'>+	for (page = 0; page &lt; 16; page++) {</div><div class='add'>+		s5k83a_write_sensor(sd, S5K83A_PAGE_MAP, &amp;page, 1);</div><div class='add'>+		info("Probing for which registers that are read/write "</div><div class='add'>+		      "for page 0x%x", page);</div><div class='add'>+		for (address = 0; address &lt;= 0xff; address++) {</div><div class='add'>+			u8 old_val, ctrl_val, test_val = 0xff;</div><div class='add'>+</div><div class='add'>+			s5k83a_read_sensor(sd, address, &amp;old_val, 1);</div><div class='add'>+			s5k83a_write_sensor(sd, address, &amp;test_val, 1);</div><div class='add'>+			s5k83a_read_sensor(sd, address, &amp;ctrl_val, 1);</div><div class='add'>+</div><div class='add'>+			if (ctrl_val == test_val)</div><div class='add'>+				info("register 0x%x is writeable", address);</div><div class='add'>+			else</div><div class='add'>+				info("register 0x%x is read only", address);</div><div class='add'>+</div><div class='add'>+			/* Restore original val */</div><div class='add'>+			s5k83a_write_sensor(sd, address, &amp;old_val, 1);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	info("Read/write register probing complete");</div><div class='add'>+	s5k83a_write_sensor(sd, S5K83A_PAGE_MAP, &amp;old_page, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int s5k83a_get_brightness(struct gspca_dev *gspca_dev, __s32 *val)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	u8 data[2];</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+</div><div class='add'>+	err = s5k83a_read_sensor(sd, S5K83A_BRIGHTNESS, data, 2);</div><div class='add'>+	data[1] = data[1] &lt;&lt; 1;</div><div class='add'>+	*val = data[1];</div><div class='add'>+</div><div class='add'>+	return (err &lt; 0) ? err : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int s5k83a_set_brightness(struct gspca_dev *gspca_dev, __s32 val)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	u8 data[2];</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+</div><div class='add'>+	data[0] = 0x00;</div><div class='add'>+	data[1] = 0x20;</div><div class='add'>+	err = s5k83a_write_sensor(sd, 0x14, data, 2);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	data[0] = 0x01;</div><div class='add'>+	data[1] = 0x00;</div><div class='add'>+	err = s5k83a_write_sensor(sd, 0x0d, data, 2);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* FIXME: This is not sane, we need to figure out the composition</div><div class='add'>+		  of these registers */</div><div class='add'>+	data[0] = val &gt;&gt; 3; /* brightness, high 5 bits */</div><div class='add'>+	data[1] = val &gt;&gt; 1; /* brightness, high 7 bits */</div><div class='add'>+	err = s5k83a_write_sensor(sd, S5K83A_BRIGHTNESS, data, 2);</div><div class='add'>+</div><div class='add'>+	return (err &lt; 0) ? err : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int s5k83a_get_whiteness(struct gspca_dev *gspca_dev, __s32 *val)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	u8 data;</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+</div><div class='add'>+	err = s5k83a_read_sensor(sd, S5K83A_WHITENESS, &amp;data, 1);</div><div class='add'>+</div><div class='add'>+	*val = data;</div><div class='add'>+	return (err &lt; 0) ? err : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int s5k83a_set_whiteness(struct gspca_dev *gspca_dev, __s32 val)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	u8 data[1];</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+</div><div class='add'>+	data[0] = val;</div><div class='add'>+	err = s5k83a_write_sensor(sd, S5K83A_WHITENESS, data, 1);</div><div class='add'>+</div><div class='add'>+	return (err &lt; 0) ? err : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int s5k83a_get_gain(struct gspca_dev *gspca_dev, __s32 *val)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	u8 data[2];</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+</div><div class='add'>+	err = s5k83a_read_sensor(sd, S5K83A_GAIN, data, 2);</div><div class='add'>+</div><div class='add'>+	data[1] = data[1] &amp; 0x3f;</div><div class='add'>+	if (data[1] &gt; S5K83A_MAXIMUM_GAIN)</div><div class='add'>+		data[1] = S5K83A_MAXIMUM_GAIN;</div><div class='add'>+</div><div class='add'>+	*val = data[1];</div><div class='add'>+</div><div class='add'>+	return (err &lt; 0) ? err : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int s5k83a_set_gain(struct gspca_dev *gspca_dev, __s32 val)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	u8 data[2];</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+</div><div class='add'>+	data[0] = 0;</div><div class='add'>+	data[1] = val;</div><div class='add'>+	err = s5k83a_write_sensor(sd, S5K83A_GAIN, data, 2);</div><div class='add'>+</div><div class='add'>+	return (err &lt; 0) ? err : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int s5k83a_get_vflip(struct gspca_dev *gspca_dev, __s32 *val)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	u8 data[1];</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+</div><div class='add'>+	data[0] = 0x05;</div><div class='add'>+	err = s5k83a_write_sensor(sd, S5K83A_PAGE_MAP, data, 1);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = s5k83a_read_sensor(sd, S5K83A_FLIP, data, 1);</div><div class='add'>+	*val = (data[0] | 0x40) ? 1 : 0;</div><div class='add'>+</div><div class='add'>+	return (err &lt; 0) ? err : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int s5k83a_set_vflip(struct gspca_dev *gspca_dev, __s32 val)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	u8 data[1];</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+</div><div class='add'>+	data[0] = 0x05;</div><div class='add'>+	err = s5k83a_write_sensor(sd, S5K83A_PAGE_MAP, data, 1);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = s5k83a_read_sensor(sd, S5K83A_FLIP, data, 1);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* set or zero six bit, seven is hflip */</div><div class='add'>+	data[0] = (val) ? (data[0] &amp; 0x80) | 0x40 | S5K83A_FLIP_MASK</div><div class='add'>+			: (data[0] &amp; 0x80) | S5K83A_FLIP_MASK;</div><div class='add'>+	err = s5k83a_write_sensor(sd, S5K83A_FLIP, data, 1);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	data[0] = (val) ? 0x0b : 0x0a;</div><div class='add'>+	err = s5k83a_write_sensor(sd, S5K83A_VFLIP_TUNE, data, 1);</div><div class='add'>+</div><div class='add'>+	return (err &lt; 0) ? err : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int s5k83a_get_hflip(struct gspca_dev *gspca_dev, __s32 *val)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	u8 data[1];</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+</div><div class='add'>+	data[0] = 0x05;</div><div class='add'>+	err = s5k83a_write_sensor(sd, S5K83A_PAGE_MAP, data, 1);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = s5k83a_read_sensor(sd, S5K83A_FLIP, data, 1);</div><div class='add'>+	*val = (data[0] | 0x80) ? 1 : 0;</div><div class='add'>+</div><div class='add'>+	return (err &lt; 0) ? err : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int s5k83a_set_hflip(struct gspca_dev *gspca_dev, __s32 val)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	u8 data[1];</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+</div><div class='add'>+	data[0] = 0x05;</div><div class='add'>+	err = s5k83a_write_sensor(sd, S5K83A_PAGE_MAP, data, 1);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = s5k83a_read_sensor(sd, S5K83A_FLIP, data, 1);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* set or zero seven bit, six is vflip */</div><div class='add'>+	data[0] = (val) ? (data[0] &amp; 0x40) | 0x80 | S5K83A_FLIP_MASK</div><div class='add'>+			: (data[0] &amp; 0x40) | S5K83A_FLIP_MASK;</div><div class='add'>+	err = s5k83a_write_sensor(sd, S5K83A_FLIP, data, 1);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	data[0] = (val) ? 0x0a : 0x0b;</div><div class='add'>+	err = s5k83a_write_sensor(sd, S5K83A_HFLIP_TUNE, data, 1);</div><div class='add'>+</div><div class='add'>+	return (err &lt; 0) ? err : 0;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/media/video/gspca/m5602/m5602_s5k83a.h b/drivers/media/video/gspca/m5602/m5602_s5k83a.h<br/>new file mode 100644<br/>index 000000000000..ee3ee9cfca1d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/gspca/m5602/m5602_s5k83a.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/m5602/m5602_s5k83a.h</a></div><div class='hunk'>@@ -0,0 +1,482 @@</div><div class='add'>+/*</div><div class='add'>+ * Driver for the s5k83a sensor</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2008 Erik Andrén</div><div class='add'>+ * Copyright (C) 2007 Ilyes Gouta. Based on the m5603x Linux Driver Project.</div><div class='add'>+ * Copyright (C) 2005 m5603x Linux Driver Project &lt;m5602@x3ng.com.br&gt;</div><div class='add'>+ *</div><div class='add'>+ * Portions of code to USB interface and ALi driver software,</div><div class='add'>+ * Copyright (c) 2006 Willem Duinker</div><div class='add'>+ * v4l2 interface modeled after the V4L2 driver</div><div class='add'>+ * for SN9C10x PC Camera Controllers</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public License as</div><div class='add'>+ * published by the Free Software Foundation, version 2.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef M5602_S5K83A_H_</div><div class='add'>+#define M5602_S5K83A_H_</div><div class='add'>+</div><div class='add'>+#include "m5602_sensor.h"</div><div class='add'>+</div><div class='add'>+#define S5K83A_FLIP				0x01</div><div class='add'>+#define S5K83A_HFLIP_TUNE		0x03</div><div class='add'>+#define S5K83A_VFLIP_TUNE		0x05</div><div class='add'>+#define S5K83A_WHITENESS		0x0a</div><div class='add'>+#define S5K83A_GAIN				0x18</div><div class='add'>+#define S5K83A_BRIGHTNESS		0x1b</div><div class='add'>+#define S5K83A_PAGE_MAP			0xec</div><div class='add'>+</div><div class='add'>+#define S5K83A_DEFAULT_BRIGHTNESS	0x71</div><div class='add'>+#define S5K83A_DEFAULT_WHITENESS	0x7e</div><div class='add'>+#define S5K83A_DEFAULT_GAIN			0x00</div><div class='add'>+#define S5K83A_MAXIMUM_GAIN			0x3c</div><div class='add'>+#define S5K83A_FLIP_MASK			0x10</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*****************************************************************************/</div><div class='add'>+</div><div class='add'>+/* Kernel module parameters */</div><div class='add'>+extern int force_sensor;</div><div class='add'>+extern int dump_sensor;</div><div class='add'>+</div><div class='add'>+int s5k83a_probe(struct sd *sd);</div><div class='add'>+int s5k83a_init(struct sd *sd);</div><div class='add'>+int s5k83a_power_down(struct sd *sd);</div><div class='add'>+</div><div class='add'>+void s5k83a_dump_registers(struct sd *sd);</div><div class='add'>+</div><div class='add'>+int s5k83a_read_sensor(struct sd *sd, const u8 address,</div><div class='add'>+		       u8 *i2c_data, const u8 len);</div><div class='add'>+int s5k83a_write_sensor(struct sd *sd, const u8 address,</div><div class='add'>+			u8 *i2c_data, const u8 len);</div><div class='add'>+</div><div class='add'>+int s5k83a_set_brightness(struct gspca_dev *gspca_dev, __s32 val);</div><div class='add'>+int s5k83a_get_brightness(struct gspca_dev *gspca_dev, __s32 *val);</div><div class='add'>+int s5k83a_set_whiteness(struct gspca_dev *gspca_dev, __s32 val);</div><div class='add'>+int s5k83a_get_whiteness(struct gspca_dev *gspca_dev, __s32 *val);</div><div class='add'>+int s5k83a_set_gain(struct gspca_dev *gspca_dev, __s32 val);</div><div class='add'>+int s5k83a_get_gain(struct gspca_dev *gspca_dev, __s32 *val);</div><div class='add'>+int s5k83a_get_vflip(struct gspca_dev *gspca_dev, __s32 *val);</div><div class='add'>+int s5k83a_set_vflip(struct gspca_dev *gspca_dev, __s32 val);</div><div class='add'>+int s5k83a_get_hflip(struct gspca_dev *gspca_dev, __s32 *val);</div><div class='add'>+int s5k83a_set_hflip(struct gspca_dev *gspca_dev, __s32 val);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static struct m5602_sensor s5k83a = {</div><div class='add'>+	.name = "S5K83A",</div><div class='add'>+	.probe = s5k83a_probe,</div><div class='add'>+	.init = s5k83a_init,</div><div class='add'>+	.power_down = s5k83a_power_down,</div><div class='add'>+	.read_sensor = s5k83a_read_sensor,</div><div class='add'>+	.write_sensor = s5k83a_write_sensor,</div><div class='add'>+	.i2c_slave_id = 0x5a,</div><div class='add'>+	.nctrls = 5,</div><div class='add'>+	.ctrls = {</div><div class='add'>+	{</div><div class='add'>+		{</div><div class='add'>+			.id = V4L2_CID_BRIGHTNESS,</div><div class='add'>+			.type = V4L2_CTRL_TYPE_INTEGER,</div><div class='add'>+			.name = "brightness",</div><div class='add'>+			.minimum = 0x00,</div><div class='add'>+			.maximum = 0xff,</div><div class='add'>+			.step = 0x01,</div><div class='add'>+			.default_value = S5K83A_DEFAULT_BRIGHTNESS,</div><div class='add'>+			.flags = V4L2_CTRL_FLAG_SLIDER</div><div class='add'>+		},</div><div class='add'>+			.set = s5k83a_set_brightness,</div><div class='add'>+			.get = s5k83a_get_brightness</div><div class='add'>+</div><div class='add'>+	}, {</div><div class='add'>+		{</div><div class='add'>+			.id = V4L2_CID_WHITENESS,</div><div class='add'>+			.type = V4L2_CTRL_TYPE_INTEGER,</div><div class='add'>+			.name = "whiteness",</div><div class='add'>+			.minimum = 0x00,</div><div class='add'>+			.maximum = 0xff,</div><div class='add'>+			.step = 0x01,</div><div class='add'>+			.default_value = S5K83A_DEFAULT_WHITENESS,</div><div class='add'>+			.flags = V4L2_CTRL_FLAG_SLIDER</div><div class='add'>+		},</div><div class='add'>+			.set = s5k83a_set_whiteness,</div><div class='add'>+			.get = s5k83a_get_whiteness,</div><div class='add'>+	}, {</div><div class='add'>+		{</div><div class='add'>+			.id = V4L2_CID_GAIN,</div><div class='add'>+			.type = V4L2_CTRL_TYPE_INTEGER,</div><div class='add'>+			.name = "gain",</div><div class='add'>+			.minimum = 0x00,</div><div class='add'>+			.maximum = S5K83A_MAXIMUM_GAIN,</div><div class='add'>+			.step = 0x01,</div><div class='add'>+			.default_value = S5K83A_DEFAULT_GAIN,</div><div class='add'>+			.flags = V4L2_CTRL_FLAG_SLIDER</div><div class='add'>+		},</div><div class='add'>+			.set = s5k83a_set_gain,</div><div class='add'>+			.get = s5k83a_get_gain</div><div class='add'>+	}, {</div><div class='add'>+		{</div><div class='add'>+			.id         = V4L2_CID_HFLIP,</div><div class='add'>+			.type       = V4L2_CTRL_TYPE_BOOLEAN,</div><div class='add'>+			.name       = "horizontal flip",</div><div class='add'>+			.minimum    = 0,</div><div class='add'>+			.maximum    = 1,</div><div class='add'>+			.step       = 1,</div><div class='add'>+			.default_value  = 0</div><div class='add'>+		},</div><div class='add'>+			.set = s5k83a_set_hflip,</div><div class='add'>+			.get = s5k83a_get_hflip</div><div class='add'>+	}, {</div><div class='add'>+		{</div><div class='add'>+		 .id         = V4L2_CID_VFLIP,</div><div class='add'>+		.type       = V4L2_CTRL_TYPE_BOOLEAN,</div><div class='add'>+		.name       = "vertical flip",</div><div class='add'>+		.minimum    = 0,</div><div class='add'>+		.maximum    = 1,</div><div class='add'>+		.step       = 1,</div><div class='add'>+		.default_value  = 0</div><div class='add'>+		},</div><div class='add'>+		.set = s5k83a_set_vflip,</div><div class='add'>+		.get = s5k83a_get_vflip</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	.nmodes = 1,</div><div class='add'>+	.modes = {</div><div class='add'>+	{</div><div class='add'>+		M5602_DEFAULT_FRAME_WIDTH,</div><div class='add'>+		M5602_DEFAULT_FRAME_HEIGHT,</div><div class='add'>+		V4L2_PIX_FMT_SBGGR8,</div><div class='add'>+		V4L2_FIELD_NONE,</div><div class='add'>+		.sizeimage =</div><div class='add'>+			M5602_DEFAULT_FRAME_WIDTH * M5602_DEFAULT_FRAME_HEIGHT,</div><div class='add'>+		.bytesperline = M5602_DEFAULT_FRAME_WIDTH,</div><div class='add'>+		.colorspace = V4L2_COLORSPACE_SRGB,</div><div class='add'>+		.priv = 1</div><div class='add'>+	}</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const unsigned char preinit_s5k83a[][4] =</div><div class='add'>+{</div><div class='add'>+	{BRIDGE, M5602_XB_MCU_CLK_DIV, 0x02, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_MCU_CLK_CTRL, 0xb0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SENSOR_TYPE, 0x0d, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SENSOR_CTRL, 0x00, 0x00},</div><div class='add'>+</div><div class='add'>+	{BRIDGE, M5602_XB_SIG_INI, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DIR, 0x1d, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DAT, 0x08, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_EN_H, 0x3f, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DIR_H, 0x3f, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DAT_H, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_EN_L, 0xff, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DIR_L, 0xff, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DAT_L, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_DIV, 0xb0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0x80, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SENSOR_TYPE, 0x09, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_MCU_CLK_DIV, 0x02, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_MCU_CLK_CTRL, 0xb0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xf0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DIR, 0x1d, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DAT, 0x1c, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_EN_H, 0x06, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DIR_H, 0x06, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DAT_H, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_EN_L, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_CLK_DIV, 0x20, 0x00},</div><div class='add'>+</div><div class='add'>+	{SENSOR, S5K83A_PAGE_MAP, 0x00, 0x00}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* This could probably be considerably shortened.</div><div class='add'>+   I don't have the hardware to experiment with it, patches welcome</div><div class='add'>+*/</div><div class='add'>+static const unsigned char init_s5k83a[][4] =</div><div class='add'>+{</div><div class='add'>+	{SENSOR, S5K83A_PAGE_MAP, 0x04, 0x00},</div><div class='add'>+	{SENSOR, 0xaf, 0x01, 0x00},</div><div class='add'>+	{SENSOR, S5K83A_PAGE_MAP, 0x00, 0x00},</div><div class='add'>+	{SENSOR, 0x7b, 0xff, 0x00},</div><div class='add'>+	{SENSOR, S5K83A_PAGE_MAP, 0x05, 0x00},</div><div class='add'>+	{SENSOR, 0x01, 0x50, 0x00},</div><div class='add'>+	{SENSOR, 0x12, 0x20, 0x00},</div><div class='add'>+	{SENSOR, 0x17, 0x40, 0x00},</div><div class='add'>+	{SENSOR, S5K83A_BRIGHTNESS, 0x0f, 0x00},</div><div class='add'>+	{SENSOR, 0x1c, 0x00, 0x00},</div><div class='add'>+	{SENSOR, 0x02, 0x70, 0x00},</div><div class='add'>+	{SENSOR, 0x03, 0x0b, 0x00},</div><div class='add'>+	{SENSOR, 0x04, 0xf0, 0x00},</div><div class='add'>+	{SENSOR, 0x05, 0x0b, 0x00},</div><div class='add'>+	{SENSOR, S5K83A_PAGE_MAP, 0x05, 0x00},</div><div class='add'>+</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_DIV, 0x06, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SENSOR_TYPE, 0x09, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_LINE_OF_FRAME_H, 0x81, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_PIX_OF_LINE_H, 0x82, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SIG_INI, 0x01, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x01, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0xe4, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SIG_INI, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SIG_INI, 0x02, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_HSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_HSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_HSYNC_PARA, 0x02, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_HSYNC_PARA, 0x87, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SIG_INI, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},</div><div class='add'>+</div><div class='add'>+	{SENSOR, S5K83A_PAGE_MAP, 0x05, 0x00},</div><div class='add'>+	{SENSOR, 0x06, 0x71, 0x00},</div><div class='add'>+	{SENSOR, 0x07, 0xe8, 0x00},</div><div class='add'>+	{SENSOR, 0x08, 0x02, 0x00},</div><div class='add'>+	{SENSOR, 0x09, 0x88, 0x00},</div><div class='add'>+	{SENSOR, 0x14, 0x00, 0x00},</div><div class='add'>+	{SENSOR, 0x15, 0x20, 0x00},</div><div class='add'>+	{SENSOR, 0x19, 0x00, 0x00},</div><div class='add'>+	{SENSOR, 0x1a, 0x98, 0x00},</div><div class='add'>+	{SENSOR, 0x0f, 0x02, 0x00},</div><div class='add'>+	{SENSOR, 0x10, 0xe5, 0x00},</div><div class='add'>+	{SENSOR, S5K83A_PAGE_MAP, 0x05, 0x00},</div><div class='add'>+	{SENSOR_LONG, 0x14, 0x00, 0x20},</div><div class='add'>+	{SENSOR_LONG, 0x0d, 0x00, 0x7d},</div><div class='add'>+	{SENSOR_LONG, 0x1b, 0x0d, 0x05},</div><div class='add'>+</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_DIV, 0x06, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SENSOR_TYPE, 0x09, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_LINE_OF_FRAME_H, 0x81, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_PIX_OF_LINE_H, 0x82, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SIG_INI, 0x01, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x01, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0xe4, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SIG_INI, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SIG_INI, 0x02, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_HSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_HSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_HSYNC_PARA, 0x02, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_HSYNC_PARA, 0x87, 0x00},</div><div class='add'>+</div><div class='add'>+	{BRIDGE, M5602_XB_SIG_INI, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DIR, 0x1d, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DAT, 0x08, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_EN_H, 0x3f, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DIR_H, 0x3f, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DAT_H, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_EN_L, 0xff, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DIR_L, 0xff, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DAT_L, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_DIV, 0xb0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0x80, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SENSOR_TYPE, 0x09, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_MCU_CLK_DIV, 0x02, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_MCU_CLK_CTRL, 0xb0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xf0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DIR, 0x1d, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DAT, 0x1c, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_EN_H, 0x06, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DIR_H, 0x06, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DAT_H, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_EN_L, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_CLK_DIV, 0x20, 0x00},</div><div class='add'>+</div><div class='add'>+	{SENSOR, S5K83A_PAGE_MAP, 0x04, 0x00},</div><div class='add'>+	{SENSOR, 0xaf, 0x01, 0x00},</div><div class='add'>+	{SENSOR, S5K83A_PAGE_MAP, 0x05, 0x00},</div><div class='add'>+	/* ff ( init value )is very dark) || 71 and f0 better */</div><div class='add'>+	{SENSOR, 0x7b, 0xff, 0x00},</div><div class='add'>+	{SENSOR, S5K83A_PAGE_MAP, 0x05, 0x00},</div><div class='add'>+	{SENSOR, 0x01, 0x50, 0x00},</div><div class='add'>+	{SENSOR, 0x12, 0x20, 0x00},</div><div class='add'>+	{SENSOR, 0x17, 0x40, 0x00},</div><div class='add'>+	{SENSOR, S5K83A_BRIGHTNESS, 0x0f, 0x00},</div><div class='add'>+	{SENSOR, 0x1c, 0x00, 0x00},</div><div class='add'>+	{SENSOR, 0x02, 0x70, 0x00},</div><div class='add'>+	/* some values like 0x10 give a blue-purple image */</div><div class='add'>+	{SENSOR, 0x03, 0x0b, 0x00},</div><div class='add'>+	{SENSOR, 0x04, 0xf0, 0x00},</div><div class='add'>+	{SENSOR, 0x05, 0x0b, 0x00},</div><div class='add'>+	{SENSOR, S5K83A_PAGE_MAP, 0x05, 0x00},</div><div class='add'>+</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_DIV, 0x06, 0x00},</div><div class='add'>+	/* under 80 don't work, highter depend on value */</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},</div><div class='add'>+</div><div class='add'>+	{BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SENSOR_TYPE, 0x09, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_LINE_OF_FRAME_H, 0x81, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_PIX_OF_LINE_H, 0x82, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SIG_INI, 0x01, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x01, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0xe4, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SIG_INI, 0x02, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_HSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_HSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_HSYNC_PARA, 0x02, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_HSYNC_PARA, 0x7f, 0x00},</div><div class='add'>+</div><div class='add'>+	{BRIDGE, M5602_XB_SIG_INI, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},</div><div class='add'>+</div><div class='add'>+	{SENSOR, S5K83A_PAGE_MAP, 0x05, 0x00},</div><div class='add'>+	{SENSOR, 0x06, 0x71, 0x00},</div><div class='add'>+	{SENSOR, 0x07, 0xe8, 0x00},</div><div class='add'>+	{SENSOR, 0x08, 0x02, 0x00},</div><div class='add'>+	{SENSOR, 0x09, 0x88, 0x00},</div><div class='add'>+	{SENSOR, 0x14, 0x00, 0x00},</div><div class='add'>+	{SENSOR, 0x15, 0x20, 0x00},</div><div class='add'>+	{SENSOR, 0x19, 0x00, 0x00},</div><div class='add'>+	{SENSOR, 0x1a, 0x98, 0x00},</div><div class='add'>+	{SENSOR, 0x0f, 0x02, 0x00},</div><div class='add'>+	{SENSOR, 0x10, 0xe5, 0x00},</div><div class='add'>+	{SENSOR, S5K83A_PAGE_MAP, 0x05, 0x00},</div><div class='add'>+	{SENSOR_LONG, 0x14, 0x00, 0x20},</div><div class='add'>+	{SENSOR_LONG, 0x0d, 0x00, 0x7d},</div><div class='add'>+	{SENSOR_LONG, 0x1b, 0x0d, 0x05},</div><div class='add'>+</div><div class='add'>+	/* The following sequence is useless after a clean boot</div><div class='add'>+	   but is necessary after resume from suspend */</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DIR, 0x1d, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DAT, 0x08, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_EN_H, 0x3f, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DIR_H, 0x3f, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DAT_H, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_EN_L, 0xff, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DIR_L, 0xff, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DAT_L, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_DIV, 0xb0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0x80, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SENSOR_TYPE, 0x09, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_MCU_CLK_DIV, 0x02, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_MCU_CLK_CTRL, 0xb0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xf0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DIR, 0x1d, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DAT, 0x1c, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_EN_H, 0x06, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DIR_H, 0x06, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_DAT_H, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_GPIO_EN_L, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_I2C_CLK_DIV, 0x20, 0x00},</div><div class='add'>+</div><div class='add'>+	{SENSOR, S5K83A_PAGE_MAP, 0x04, 0x00},</div><div class='add'>+	{SENSOR, 0xaf, 0x01, 0x00},</div><div class='add'>+	{SENSOR, S5K83A_PAGE_MAP, 0x00, 0x00},</div><div class='add'>+	{SENSOR, 0x7b, 0xff, 0x00},</div><div class='add'>+	{SENSOR, S5K83A_PAGE_MAP, 0x05, 0x00},</div><div class='add'>+	{SENSOR, 0x01, 0x50, 0x00},</div><div class='add'>+	{SENSOR, 0x12, 0x20, 0x00},</div><div class='add'>+	{SENSOR, 0x17, 0x40, 0x00},</div><div class='add'>+	{SENSOR, S5K83A_BRIGHTNESS, 0x0f, 0x00},</div><div class='add'>+	{SENSOR, 0x1c, 0x00, 0x00},</div><div class='add'>+	{SENSOR, 0x02, 0x70, 0x00},</div><div class='add'>+	{SENSOR, 0x03, 0x0b, 0x00},</div><div class='add'>+	{SENSOR, 0x04, 0xf0, 0x00},</div><div class='add'>+	{SENSOR, 0x05, 0x0b, 0x00},</div><div class='add'>+	{SENSOR, S5K83A_PAGE_MAP, 0x05, 0x00},</div><div class='add'>+</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_DIV, 0x06, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SENSOR_TYPE, 0x09, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_LINE_OF_FRAME_H, 0x81, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_PIX_OF_LINE_H, 0x82, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SIG_INI, 0x01, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x01, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0xe4, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SIG_INI, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SIG_INI, 0x02, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_HSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_HSYNC_PARA, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_HSYNC_PARA, 0x02, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_HSYNC_PARA, 0x7f, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SIG_INI, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},</div><div class='add'>+	{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},</div><div class='add'>+</div><div class='add'>+	{SENSOR, S5K83A_PAGE_MAP, 0x05, 0x00},</div><div class='add'>+	{SENSOR, 0x06, 0x71, 0x00},</div><div class='add'>+	{SENSOR, 0x07, 0xe8, 0x00},</div><div class='add'>+	{SENSOR, 0x08, 0x02, 0x00},</div><div class='add'>+	{SENSOR, 0x09, 0x88, 0x00},</div><div class='add'>+	{SENSOR, 0x14, 0x00, 0x00},</div><div class='add'>+	{SENSOR, 0x15, 0x20, 0x00},</div><div class='add'>+	{SENSOR, 0x19, 0x00, 0x00},</div><div class='add'>+	{SENSOR, 0x1a, 0x98, 0x00},</div><div class='add'>+	{SENSOR, 0x0f, 0x02, 0x00},</div><div class='add'>+</div><div class='add'>+	{SENSOR, 0x10, 0xe5, 0x00},</div><div class='add'>+	{SENSOR, S5K83A_PAGE_MAP, 0x05, 0x00},</div><div class='add'>+	{SENSOR_LONG, 0x14, 0x00, 0x20},</div><div class='add'>+	{SENSOR_LONG, 0x0d, 0x00, 0x7d},</div><div class='add'>+	{SENSOR_LONG, 0x1b, 0x0d, 0x05},</div><div class='add'>+</div><div class='add'>+	/* normal colors</div><div class='add'>+	   (this is value after boot, but after tries can be different) */</div><div class='add'>+	{SENSOR, 0x00, 0x06, 0x00},</div><div class='add'>+</div><div class='add'>+	/* set default brightness */</div><div class='add'>+	{SENSOR_LONG, 0x14, 0x00, 0x20},</div><div class='add'>+	{SENSOR_LONG, 0x0d, 0x01, 0x00},</div><div class='add'>+	{SENSOR_LONG, 0x1b, S5K83A_DEFAULT_BRIGHTNESS &gt;&gt; 3,</div><div class='add'>+			    S5K83A_DEFAULT_BRIGHTNESS &gt;&gt; 1},</div><div class='add'>+</div><div class='add'>+	/* set default whiteness */</div><div class='add'>+	{SENSOR, S5K83A_WHITENESS, S5K83A_DEFAULT_WHITENESS, 0x00},</div><div class='add'>+</div><div class='add'>+	/* set default gain */</div><div class='add'>+	{SENSOR_LONG, 0x18, 0x00, S5K83A_DEFAULT_GAIN},</div><div class='add'>+</div><div class='add'>+	/* set default flip */</div><div class='add'>+	{SENSOR, S5K83A_PAGE_MAP, 0x05, 0x00},</div><div class='add'>+	{SENSOR, S5K83A_FLIP, 0x00 | S5K83A_FLIP_MASK, 0x00},</div><div class='add'>+	{SENSOR, S5K83A_HFLIP_TUNE, 0x0b, 0x00},</div><div class='add'>+	{SENSOR, S5K83A_VFLIP_TUNE, 0x0a, 0x00}</div><div class='add'>+</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/media/video/gspca/m5602/m5602_sensor.h b/drivers/media/video/gspca/m5602/m5602_sensor.h<br/>new file mode 100644<br/>index 000000000000..60c9a48e0c02<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/gspca/m5602/m5602_sensor.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/m5602/m5602_sensor.h</a></div><div class='hunk'>@@ -0,0 +1,76 @@</div><div class='add'>+/*</div><div class='add'>+ * USB Driver for ALi m5602 based webcams</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2008 Erik Andrén</div><div class='add'>+ * Copyright (C) 2007 Ilyes Gouta. Based on the m5603x Linux Driver Project.</div><div class='add'>+ * Copyright (C) 2005 m5603x Linux Driver Project &lt;m5602@x3ng.com.br&gt;</div><div class='add'>+ *</div><div class='add'>+ * Portions of code to USB interface and ALi driver software,</div><div class='add'>+ * Copyright (c) 2006 Willem Duinker</div><div class='add'>+ * v4l2 interface modeled after the V4L2 driver</div><div class='add'>+ * for SN9C10x PC Camera Controllers</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public License as</div><div class='add'>+ * published by the Free Software Foundation, version 2.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef M5602_SENSOR_H_</div><div class='add'>+#define M5602_SENSOR_H_</div><div class='add'>+</div><div class='add'>+#include "m5602_bridge.h"</div><div class='add'>+</div><div class='add'>+#define M5602_DEFAULT_FRAME_WIDTH  640</div><div class='add'>+#define M5602_DEFAULT_FRAME_HEIGHT 480</div><div class='add'>+</div><div class='add'>+#define M5602_MAX_CTRLS		(V4L2_CID_LASTP1 - V4L2_CID_BASE + 10)</div><div class='add'>+</div><div class='add'>+/* Enumerates all supported sensors */</div><div class='add'>+enum sensors {</div><div class='add'>+	OV9650_SENSOR	= 1,</div><div class='add'>+	S5K83A_SENSOR	= 2,</div><div class='add'>+	S5K4AA_SENSOR	= 3,</div><div class='add'>+	MT9M111_SENSOR	= 4,</div><div class='add'>+	PO1030_SENSOR	= 5</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Enumerates all possible instruction types */</div><div class='add'>+enum instruction {</div><div class='add'>+	BRIDGE,</div><div class='add'>+	SENSOR,</div><div class='add'>+	SENSOR_LONG</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct m5602_sensor {</div><div class='add'>+	/* Defines the name of a sensor */</div><div class='add'>+	char name[32];</div><div class='add'>+</div><div class='add'>+	/* What i2c address the sensor is connected to */</div><div class='add'>+	u8 i2c_slave_id;</div><div class='add'>+</div><div class='add'>+	/* Probes if the sensor is connected */</div><div class='add'>+	int (*probe)(struct sd *sd);</div><div class='add'>+</div><div class='add'>+	/* Performs a initialization sequence */</div><div class='add'>+	int (*init)(struct sd *sd);</div><div class='add'>+</div><div class='add'>+	/* Performs a power down sequence */</div><div class='add'>+	int (*power_down)(struct sd *sd);</div><div class='add'>+</div><div class='add'>+	/* Reads a sensor register */</div><div class='add'>+	int (*read_sensor)(struct sd *sd, const u8 address,</div><div class='add'>+	      u8 *i2c_data, const u8 len);</div><div class='add'>+</div><div class='add'>+	/* Writes to a sensor register */</div><div class='add'>+	int (*write_sensor)(struct sd *sd, const u8 address,</div><div class='add'>+	      u8 *i2c_data, const u8 len);</div><div class='add'>+</div><div class='add'>+	int nctrls;</div><div class='add'>+	struct ctrl ctrls[M5602_MAX_CTRLS];</div><div class='add'>+</div><div class='add'>+	char nmodes;</div><div class='add'>+	struct v4l2_pix_format modes[];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/media/video/gspca/mars.c b/drivers/media/video/gspca/mars.c<br/>index 4d5db47ba8cb..277ca34a8817 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/gspca/mars.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/gspca/mars.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/gspca/mars.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/mars.c</a></div><div class='hunk'>@@ -134,7 +134,7 @@ static int sd_init(struct gspca_dev *gspca_dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void sd_start(struct gspca_dev *gspca_dev)</div><div class='add'>+static int sd_start(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='ctx'> 	int err_code;</div><div class='ctx'> 	__u8 *data;</div><div class='hunk'>@@ -143,9 +143,10 @@ static void sd_start(struct gspca_dev *gspca_dev)</div><div class='ctx'> 	int intpipe;</div><div class='ctx'> </div><div class='ctx'> 	PDEBUG(D_STREAM, "camera start, iface %d, alt 8", gspca_dev-&gt;iface);</div><div class='del'>-	if (usb_set_interface(gspca_dev-&gt;dev, gspca_dev-&gt;iface, 8) &lt; 0) {</div><div class='add'>+	err_code = usb_set_interface(gspca_dev-&gt;dev, gspca_dev-&gt;iface, 8);</div><div class='add'>+	if (err_code &lt; 0) {</div><div class='ctx'> 		PDEBUG(D_ERR|D_STREAM, "Set packet size: set interface error");</div><div class='del'>-		return;</div><div class='add'>+		return err_code;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	data = gspca_dev-&gt;usb_buf;</div><div class='hunk'>@@ -154,7 +155,7 @@ static void sd_start(struct gspca_dev *gspca_dev)</div><div class='ctx'> </div><div class='ctx'> 	err_code = reg_w(gspca_dev, data[0], 2);</div><div class='ctx'> 	if (err_code &lt; 0)</div><div class='del'>-		return;</div><div class='add'>+		return err_code;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	   Initialize the MR97113 chip register</div><div class='hunk'>@@ -180,14 +181,14 @@ static void sd_start(struct gspca_dev *gspca_dev)</div><div class='ctx'> </div><div class='ctx'> 	err_code = reg_w(gspca_dev, data[0], 11);</div><div class='ctx'> 	if (err_code &lt; 0)</div><div class='del'>-		return;</div><div class='add'>+		return err_code;</div><div class='ctx'> </div><div class='ctx'> 	data[0] = 0x23;		/* address */</div><div class='ctx'> 	data[1] = 0x09;		/* reg 35, append frame header */</div><div class='ctx'> </div><div class='ctx'> 	err_code = reg_w(gspca_dev, data[0], 2);</div><div class='ctx'> 	if (err_code &lt; 0)</div><div class='del'>-		return;</div><div class='add'>+		return err_code;</div><div class='ctx'> </div><div class='ctx'> 	data[0] = 0x3c;		/* address */</div><div class='ctx'> /*	if (gspca_dev-&gt;width == 1280) */</div><div class='hunk'>@@ -198,7 +199,7 @@ static void sd_start(struct gspca_dev *gspca_dev)</div><div class='ctx'> 				 *	(unit: 4KB) 200KB */</div><div class='ctx'> 	err_code = reg_w(gspca_dev, data[0], 2);</div><div class='ctx'> 	if (err_code &lt; 0)</div><div class='del'>-		return;</div><div class='add'>+		return err_code;</div><div class='ctx'> </div><div class='ctx'> 	if (0) {			/* fixed dark-gain */</div><div class='ctx'> 		data[1] = 0;		/* reg 94, Y Gain (1.75) */</div><div class='hunk'>@@ -240,13 +241,13 @@ static void sd_start(struct gspca_dev *gspca_dev)</div><div class='ctx'> </div><div class='ctx'> 	err_code = reg_w(gspca_dev, data[0], 6);</div><div class='ctx'> 	if (err_code &lt; 0)</div><div class='del'>-		return;</div><div class='add'>+		return err_code;</div><div class='ctx'> </div><div class='ctx'> 	data[0] = 0x67;</div><div class='ctx'> 	data[1] = 0x13;		/* reg 103, first pixel B, disable sharpness */</div><div class='ctx'> 	err_code = reg_w(gspca_dev, data[0], 2);</div><div class='ctx'> 	if (err_code &lt; 0)</div><div class='del'>-		return;</div><div class='add'>+		return err_code;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * initialize the value of MI sensor...</div><div class='hunk'>@@ -326,6 +327,7 @@ static void sd_start(struct gspca_dev *gspca_dev)</div><div class='ctx'> 	data[0] = 0x00;</div><div class='ctx'> 	data[1] = 0x4d;		/* ISOC transfering enable... */</div><div class='ctx'> 	reg_w(gspca_dev, data[0], 2);</div><div class='add'>+	return err_code;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sd_stopN(struct gspca_dev *gspca_dev)</div><div class='head'>diff --git a/drivers/media/video/gspca/ov519.c b/drivers/media/video/gspca/ov519.c<br/>index 4df4eec9f7e7..ca671194679e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/gspca/ov519.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/gspca/ov519.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/gspca/ov519.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/ov519.c</a></div><div class='hunk'>@@ -1854,7 +1854,7 @@ static int set_ov_sensor_window(struct sd *sd)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* -- start the camera -- */</div><div class='del'>-static void sd_start(struct gspca_dev *gspca_dev)</div><div class='add'>+static int sd_start(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct sd *sd = (struct sd *) gspca_dev;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -1871,9 +1871,10 @@ static void sd_start(struct gspca_dev *gspca_dev)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	PDEBUG(D_STREAM, "camera started alt: 0x%02x", gspca_dev-&gt;alt);</div><div class='ctx'> 	ov51x_led_control(sd, 1);</div><div class='del'>-	return;</div><div class='add'>+	return 0;</div><div class='ctx'> out:</div><div class='ctx'> 	PDEBUG(D_ERR, "camera start error:%d", ret);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sd_stopN(struct gspca_dev *gspca_dev)</div><div class='head'>diff --git a/drivers/media/video/gspca/pac207.c b/drivers/media/video/gspca/pac207.c<br/>index 83b5f740c947..0b0c573d06da 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/gspca/pac207.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/gspca/pac207.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/gspca/pac207.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/pac207.c</a></div><div class='hunk'>@@ -281,7 +281,7 @@ static int sd_init(struct gspca_dev *gspca_dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* -- start the camera -- */</div><div class='del'>-static void sd_start(struct gspca_dev *gspca_dev)</div><div class='add'>+static int sd_start(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct sd *sd = (struct sd *) gspca_dev;</div><div class='ctx'> 	__u8 mode;</div><div class='hunk'>@@ -323,6 +323,7 @@ static void sd_start(struct gspca_dev *gspca_dev)</div><div class='ctx'> 	sd-&gt;sof_read = 0;</div><div class='ctx'> 	sd-&gt;autogain_ignore_frames = 0;</div><div class='ctx'> 	atomic_set(&amp;sd-&gt;avg_lum, -1);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sd_stopN(struct gspca_dev *gspca_dev)</div><div class='hunk'>@@ -534,6 +535,7 @@ static const __devinitdata struct usb_device_id device_table[] = {</div><div class='ctx'> 	{USB_DEVICE(0x093a, 0x2470)},</div><div class='ctx'> 	{USB_DEVICE(0x093a, 0x2471)},</div><div class='ctx'> 	{USB_DEVICE(0x093a, 0x2472)},</div><div class='add'>+	{USB_DEVICE(0x093a, 0x2476)},</div><div class='ctx'> 	{USB_DEVICE(0x2001, 0xf115)},</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/media/video/gspca/pac7311.c b/drivers/media/video/gspca/pac7311.c<br/>index ba865b7f1ed8..e5ff9a6199ef 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/gspca/pac7311.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/gspca/pac7311.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/gspca/pac7311.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/pac7311.c</a></div><div class='hunk'>@@ -675,7 +675,7 @@ static int sd_init(struct gspca_dev *gspca_dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void sd_start(struct gspca_dev *gspca_dev)</div><div class='add'>+static int sd_start(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct sd *sd = (struct sd *) gspca_dev;</div><div class='ctx'> </div><div class='hunk'>@@ -724,6 +724,7 @@ static void sd_start(struct gspca_dev *gspca_dev)</div><div class='ctx'> 		reg_w(gspca_dev, 0x78, 0x01);</div><div class='ctx'> 	else</div><div class='ctx'> 		reg_w(gspca_dev, 0x78, 0x05);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sd_stopN(struct gspca_dev *gspca_dev)</div><div class='head'>diff --git a/drivers/media/video/gspca/sonixb.c b/drivers/media/video/gspca/sonixb.c<br/>index 12b81ae526b7..6c69bc7778fc 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/gspca/sonixb.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/gspca/sonixb.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/gspca/sonixb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/sonixb.c</a></div><div class='hunk'>@@ -490,7 +490,7 @@ static const __u8 tas5130_sensor_init[][8] = {</div><div class='ctx'> 	{0x30, 0x11, 0x02, 0x20, 0x70, 0x00, 0x00, 0x10},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct sensor_data sensor_data[] = {</div><div class='add'>+static struct sensor_data sensor_data[] = {</div><div class='ctx'> SENS(initHv7131, NULL, hv7131_sensor_init, NULL, NULL, 0, NO_EXPO|NO_FREQ, 0),</div><div class='ctx'> SENS(initOv6650, NULL, ov6650_sensor_init, NULL, NULL, F_GAIN|F_SIF, 0, 0x60),</div><div class='ctx'> SENS(initOv7630, initOv7630_3, ov7630_sensor_init, NULL, ov7630_sensor_init_3,</div><div class='hunk'>@@ -892,7 +892,7 @@ static int sd_init(struct gspca_dev *gspca_dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* -- start the camera -- */</div><div class='del'>-static void sd_start(struct gspca_dev *gspca_dev)</div><div class='add'>+static int sd_start(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct sd *sd = (struct sd *) gspca_dev;</div><div class='ctx'> 	struct cam *cam = &amp;gspca_dev-&gt;cam;</div><div class='hunk'>@@ -976,6 +976,7 @@ static void sd_start(struct gspca_dev *gspca_dev)</div><div class='ctx'> 	sd-&gt;frames_to_drop = 0;</div><div class='ctx'> 	sd-&gt;autogain_ignore_frames = 0;</div><div class='ctx'> 	atomic_set(&amp;sd-&gt;avg_lum, -1);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sd_stopN(struct gspca_dev *gspca_dev)</div><div class='head'>diff --git a/drivers/media/video/gspca/sonixj.c b/drivers/media/video/gspca/sonixj.c<br/>index 572b0f363b64..53cb82d9e7c6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/gspca/sonixj.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/gspca/sonixj.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/gspca/sonixj.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/sonixj.c</a></div><div class='hunk'>@@ -39,6 +39,7 @@ struct sd {</div><div class='ctx'> 	unsigned char contrast;</div><div class='ctx'> 	unsigned char colors;</div><div class='ctx'> 	unsigned char autogain;</div><div class='add'>+	__u8 vflip;			/* ov7630 only */</div><div class='ctx'> </div><div class='ctx'> 	signed char ag_cnt;</div><div class='ctx'> #define AG_CNT_START 13</div><div class='hunk'>@@ -70,6 +71,8 @@ static int sd_setcolors(struct gspca_dev *gspca_dev, __s32 val);</div><div class='ctx'> static int sd_getcolors(struct gspca_dev *gspca_dev, __s32 *val);</div><div class='ctx'> static int sd_setautogain(struct gspca_dev *gspca_dev, __s32 val);</div><div class='ctx'> static int sd_getautogain(struct gspca_dev *gspca_dev, __s32 *val);</div><div class='add'>+static int sd_setvflip(struct gspca_dev *gspca_dev, __s32 val);</div><div class='add'>+static int sd_getvflip(struct gspca_dev *gspca_dev, __s32 *val);</div><div class='ctx'> </div><div class='ctx'> static struct ctrl sd_ctrls[] = {</div><div class='ctx'> 	{</div><div class='hunk'>@@ -131,6 +134,22 @@ static struct ctrl sd_ctrls[] = {</div><div class='ctx'> 	    .set = sd_setautogain,</div><div class='ctx'> 	    .get = sd_getautogain,</div><div class='ctx'> 	},</div><div class='add'>+/* ov7630 only */</div><div class='add'>+#define VFLIP_IDX 4</div><div class='add'>+	{</div><div class='add'>+	    {</div><div class='add'>+		.id      = V4L2_CID_VFLIP,</div><div class='add'>+		.type    = V4L2_CTRL_TYPE_BOOLEAN,</div><div class='add'>+		.name    = "Vflip",</div><div class='add'>+		.minimum = 0,</div><div class='add'>+		.maximum = 1,</div><div class='add'>+		.step    = 1,</div><div class='add'>+#define VFLIP_DEF 1</div><div class='add'>+		.default_value = VFLIP_DEF,</div><div class='add'>+	    },</div><div class='add'>+	    .set = sd_setvflip,</div><div class='add'>+	    .get = sd_getvflip,</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct v4l2_pix_format vga_mode[] = {</div><div class='hunk'>@@ -248,10 +267,12 @@ static const __u8 gamma_def[] = {</div><div class='ctx'> 	0xa6, 0xb2, 0xbf, 0xca, 0xd5, 0xe0, 0xeb, 0xf5, 0xff</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* color matrix and offsets */</div><div class='ctx'> static const __u8 reg84[] = {</div><div class='del'>-	0x14, 0x00, 0x27, 0x00, 0x07, 0x00, 0xe5, 0x0f,</div><div class='del'>-	0xe4, 0x0f, 0x38, 0x00, 0x3e, 0x00, 0xc3, 0x0f,</div><div class='del'>-	0xf7, 0x0f, 0x00, 0x00, 0x00</div><div class='add'>+	0x14, 0x00, 0x27, 0x00, 0x07, 0x00,	/* YR YG YB gains */</div><div class='add'>+	0xe8, 0x0f, 0xda, 0x0f, 0x40, 0x00,	/* UR UG UB */</div><div class='add'>+	0x3e, 0x00, 0xcd, 0x0f, 0xf7, 0x0f,	/* VR VG VB */</div><div class='add'>+	0x00, 0x00, 0x00			/* YUV offsets */</div><div class='ctx'> };</div><div class='ctx'> static const __u8 hv7131r_sensor_init[][8] = {</div><div class='ctx'> 	{0xC1, 0x11, 0x01, 0x08, 0x01, 0x00, 0x00, 0x10},</div><div class='hunk'>@@ -434,7 +455,8 @@ static const __u8 ov7630_sensor_init[][8] = {</div><div class='ctx'> 	{0xa1, 0x21, 0x12, 0x48, 0x00, 0x00, 0x00, 0x10},</div><div class='ctx'> 	{0xa1, 0x21, 0x12, 0x48, 0x00, 0x00, 0x00, 0x10},</div><div class='ctx'> /*fixme: + 0x12, 0x04*/</div><div class='del'>-	{0xa1, 0x21, 0x75, 0x82, 0x00, 0x00, 0x00, 0x10},</div><div class='add'>+/*	{0xa1, 0x21, 0x75, 0x82, 0x00, 0x00, 0x00, 0x10},  * COMN</div><div class='add'>+							 * set by setvflip */</div><div class='ctx'> 	{0xa1, 0x21, 0x10, 0x32, 0x00, 0x00, 0x00, 0x10},</div><div class='ctx'> 	{0xa1, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10},</div><div class='ctx'> 	{0xb1, 0x21, 0x01, 0x80, 0x80, 0x00, 0x00, 0x10},</div><div class='hunk'>@@ -949,6 +971,8 @@ static int sd_config(struct gspca_dev *gspca_dev,</div><div class='ctx'> 		gspca_dev-&gt;ctrl_dis = (1 &lt;&lt; AUTOGAIN_IDX);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='add'>+	if (sd-&gt;sensor != SENSOR_OV7630)</div><div class='add'>+		gspca_dev-&gt;ctrl_dis |= (1 &lt;&lt; VFLIP_IDX);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1080,20 +1104,17 @@ static unsigned int setexposure(struct gspca_dev *gspca_dev,</div><div class='ctx'> static void setbrightcont(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct sd *sd = (struct sd *) gspca_dev;</div><div class='del'>-	unsigned val;</div><div class='add'>+	int val;</div><div class='ctx'> 	__u8 reg84_full[0x15];</div><div class='ctx'> </div><div class='del'>-	memset(reg84_full, 0, sizeof reg84_full);</div><div class='del'>-	val = sd-&gt;contrast * 0x20 / CONTRAST_MAX + 0x10;	/* 10..30 */</div><div class='del'>-	reg84_full[2] = val;</div><div class='del'>-	reg84_full[0] = (val + 1) / 2;</div><div class='del'>-	reg84_full[4] = (val + 1) / 5;</div><div class='del'>-	if (val &gt; BRIGHTNESS_DEF)</div><div class='del'>-		val = (sd-&gt;brightness - BRIGHTNESS_DEF) * 0x20</div><div class='add'>+	memcpy(reg84_full, reg84, sizeof reg84_full);</div><div class='add'>+	val = sd-&gt;contrast * 0x30 / CONTRAST_MAX + 0x10;	/* 10..40 */</div><div class='add'>+	reg84_full[0] = (val + 1) / 2;		/* red */</div><div class='add'>+	reg84_full[2] = val;			/* green */</div><div class='add'>+	reg84_full[4] = (val + 1) / 5;		/* blue */</div><div class='add'>+	val = (sd-&gt;brightness - BRIGHTNESS_DEF) * 0x10</div><div class='ctx'> 			/ BRIGHTNESS_MAX;</div><div class='del'>-	else</div><div class='del'>-		val = 0;</div><div class='del'>-	reg84_full[0x12] = val;			/* 00..1f */</div><div class='add'>+	reg84_full[0x12] = val &amp; 0x1f;		/* 5:0 signed value */</div><div class='ctx'> 	reg_w(gspca_dev, 0x84, reg84_full, sizeof reg84_full);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1172,8 +1193,16 @@ static void setautogain(struct gspca_dev *gspca_dev)</div><div class='ctx'> 		sd-&gt;ag_cnt = -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void setvflip(struct sd *sd)</div><div class='add'>+{</div><div class='add'>+	if (sd-&gt;sensor != SENSOR_OV7630)</div><div class='add'>+		return;</div><div class='add'>+	i2c_w1(&amp;sd-&gt;gspca_dev, 0x75,			/* COMN */</div><div class='add'>+		sd-&gt;vflip ? 0x82 : 0x02);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* -- start the camera -- */</div><div class='del'>-static void sd_start(struct gspca_dev *gspca_dev)</div><div class='add'>+static int sd_start(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct sd *sd = (struct sd *) gspca_dev;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -1263,6 +1292,7 @@ static void sd_start(struct gspca_dev *gspca_dev)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SENSOR_OV7630:</div><div class='ctx'> 		ov7630_InitSensor(gspca_dev);</div><div class='add'>+		setvflip(sd);</div><div class='ctx'> 		reg17 = 0xe2;</div><div class='ctx'> 		reg1 = 0x44;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1320,12 +1350,16 @@ static void sd_start(struct gspca_dev *gspca_dev)</div><div class='ctx'> 		setbrightness(gspca_dev);</div><div class='ctx'> 		setcontrast(gspca_dev);</div><div class='ctx'> 		break;</div><div class='add'>+	case SENSOR_OV7630:</div><div class='add'>+		setvflip(sd);</div><div class='add'>+		/* fall thru */</div><div class='ctx'> 	default:			/* OV76xx */</div><div class='ctx'> 		setbrightcont(gspca_dev);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	setautogain(gspca_dev);</div><div class='ctx'> 	reg_w1(gspca_dev, 0x01, reg1);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sd_stopN(struct gspca_dev *gspca_dev)</div><div class='hunk'>@@ -1546,6 +1580,24 @@ static int sd_getautogain(struct gspca_dev *gspca_dev, __s32 *val)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int sd_setvflip(struct gspca_dev *gspca_dev, __s32 val)</div><div class='add'>+{</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+</div><div class='add'>+	sd-&gt;vflip = val;</div><div class='add'>+	if (gspca_dev-&gt;streaming)</div><div class='add'>+		setvflip(sd);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sd_getvflip(struct gspca_dev *gspca_dev, __s32 *val)</div><div class='add'>+{</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+</div><div class='add'>+	*val = sd-&gt;vflip;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* sub-driver description */</div><div class='ctx'> static const struct sd_desc sd_desc = {</div><div class='ctx'> 	.name = MODULE_NAME,</div><div class='hunk'>@@ -1567,6 +1619,7 @@ static const struct sd_desc sd_desc = {</div><div class='ctx'> static const __devinitdata struct usb_device_id device_table[] = {</div><div class='ctx'> #if !defined CONFIG_USB_SN9C102 &amp;&amp; !defined CONFIG_USB_SN9C102_MODULE</div><div class='ctx'> 	{USB_DEVICE(0x0458, 0x7025), BSI(SN9C120, MI0360, 0x5d)},</div><div class='add'>+	{USB_DEVICE(0x0458, 0x702e), BSI(SN9C120, OV7660, 0x21)},</div><div class='ctx'> 	{USB_DEVICE(0x045e, 0x00f5), BSI(SN9C105, OV7660, 0x21)},</div><div class='ctx'> 	{USB_DEVICE(0x045e, 0x00f7), BSI(SN9C105, OV7660, 0x21)},</div><div class='ctx'> 	{USB_DEVICE(0x0471, 0x0327), BSI(SN9C105, MI0360, 0x5d)},</div><div class='hunk'>@@ -1588,7 +1641,9 @@ static const __devinitdata struct usb_device_id device_table[] = {</div><div class='ctx'> /*	{USB_DEVICE(0x0c45, 0x60fa), BSI(SN9C105, OV7648, 0x??)}, */</div><div class='ctx'> 	{USB_DEVICE(0x0c45, 0x60fb), BSI(SN9C105, OV7660, 0x21)},</div><div class='ctx'> 	{USB_DEVICE(0x0c45, 0x60fc), BSI(SN9C105, HV7131R, 0x11)},</div><div class='del'>-/*	{USB_DEVICE(0x0c45, 0x60fe), BSI(SN9C105, OV7630, 0x??)}, */</div><div class='add'>+#if !defined CONFIG_USB_SN9C102 &amp;&amp; !defined CONFIG_USB_SN9C102_MODULE</div><div class='add'>+	{USB_DEVICE(0x0c45, 0x60fe), BSI(SN9C105, OV7630, 0x21)},</div><div class='add'>+#endif</div><div class='ctx'> /*	{USB_DEVICE(0x0c45, 0x6108), BSI(SN9C120, OM6801, 0x??)}, */</div><div class='ctx'> /*	{USB_DEVICE(0x0c45, 0x6122), BSI(SN9C110, ICM105C, 0x??)}, */</div><div class='ctx'> /*	{USB_DEVICE(0x0c45, 0x6123), BSI(SN9C110, SanyoCCD, 0x??)}, */</div><div class='head'>diff --git a/drivers/media/video/gspca/spca500.c b/drivers/media/video/gspca/spca500.c<br/>index 6e733901fcca..bca106c153fa 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/gspca/spca500.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/gspca/spca500.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/gspca/spca500.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/spca500.c</a></div><div class='hunk'>@@ -660,7 +660,7 @@ static int sd_init(struct gspca_dev *gspca_dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void sd_start(struct gspca_dev *gspca_dev)</div><div class='add'>+static int sd_start(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct sd *sd = (struct sd *) gspca_dev;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -867,6 +867,7 @@ static void sd_start(struct gspca_dev *gspca_dev)</div><div class='ctx'> 		write_vector(gspca_dev, Clicksmart510_defaults);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sd_stopN(struct gspca_dev *gspca_dev)</div><div class='head'>diff --git a/drivers/media/video/gspca/spca501.c b/drivers/media/video/gspca/spca501.c<br/>index e9eb59bae4fb..b742f260c7ca 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/gspca/spca501.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/gspca/spca501.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/gspca/spca501.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/spca501.c</a></div><div class='hunk'>@@ -1980,7 +1980,7 @@ static int sd_init(struct gspca_dev *gspca_dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void sd_start(struct gspca_dev *gspca_dev)</div><div class='add'>+static int sd_start(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct usb_device *dev = gspca_dev-&gt;dev;</div><div class='ctx'> 	int mode;</div><div class='hunk'>@@ -2012,6 +2012,7 @@ static void sd_start(struct gspca_dev *gspca_dev)</div><div class='ctx'> 	setbrightness(gspca_dev);</div><div class='ctx'> 	setcontrast(gspca_dev);</div><div class='ctx'> 	setcolors(gspca_dev);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sd_stopN(struct gspca_dev *gspca_dev)</div><div class='head'>diff --git a/drivers/media/video/gspca/spca505.c b/drivers/media/video/gspca/spca505.c<br/>index f601daf19ebe..b345749213cf 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/gspca/spca505.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/gspca/spca505.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/gspca/spca505.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/spca505.c</a></div><div class='hunk'>@@ -688,7 +688,7 @@ static int sd_init(struct gspca_dev *gspca_dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void sd_start(struct gspca_dev *gspca_dev)</div><div class='add'>+static int sd_start(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct usb_device *dev = gspca_dev-&gt;dev;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -733,6 +733,7 @@ static void sd_start(struct gspca_dev *gspca_dev)</div><div class='ctx'> /*	reg_write(dev, 0x5, 0x0, 0x0); */</div><div class='ctx'> /*	reg_write(dev, 0x5, 0x0, 0x1); */</div><div class='ctx'> /*	reg_write(dev, 0x5, 0x11, 0x2); */</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sd_stopN(struct gspca_dev *gspca_dev)</div><div class='head'>diff --git a/drivers/media/video/gspca/spca506.c b/drivers/media/video/gspca/spca506.c<br/>index 195dce96ef06..645ee9d44d02 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/gspca/spca506.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/gspca/spca506.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/gspca/spca506.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/spca506.c</a></div><div class='hunk'>@@ -422,7 +422,7 @@ static int sd_init(struct gspca_dev *gspca_dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void sd_start(struct gspca_dev *gspca_dev)</div><div class='add'>+static int sd_start(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct usb_device *dev = gspca_dev-&gt;dev;</div><div class='ctx'> 	__u16 norme;</div><div class='hunk'>@@ -549,6 +549,7 @@ static void sd_start(struct gspca_dev *gspca_dev)</div><div class='ctx'> 	PDEBUG(D_STREAM, "webcam started");</div><div class='ctx'> 	spca506_GetNormeInput(gspca_dev, &amp;norme, &amp;channel);</div><div class='ctx'> 	spca506_SetNormeInput(gspca_dev, norme, channel);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sd_stopN(struct gspca_dev *gspca_dev)</div><div class='head'>diff --git a/drivers/media/video/gspca/spca508.c b/drivers/media/video/gspca/spca508.c<br/>index 281ce02103a3..63ec902c895d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/gspca/spca508.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/gspca/spca508.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/gspca/spca508.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/spca508.c</a></div><div class='hunk'>@@ -1528,7 +1528,7 @@ static int sd_init(struct gspca_dev *gspca_dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void sd_start(struct gspca_dev *gspca_dev)</div><div class='add'>+static int sd_start(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='ctx'> 	int mode;</div><div class='ctx'> </div><div class='hunk'>@@ -1546,6 +1546,7 @@ static void sd_start(struct gspca_dev *gspca_dev)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	reg_write(gspca_dev-&gt;dev, 0x8112, 0x10 | 0x20);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sd_stopN(struct gspca_dev *gspca_dev)</div><div class='head'>diff --git a/drivers/media/video/gspca/spca561.c b/drivers/media/video/gspca/spca561.c<br/>index 95fcfcb9e31b..020a03c466c1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/gspca/spca561.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/gspca/spca561.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/gspca/spca561.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/spca561.c</a></div><div class='hunk'>@@ -152,7 +152,7 @@ static void reg_w_val(struct usb_device *dev, __u16 index, __u8 value)</div><div class='ctx'> </div><div class='ctx'> 	ret = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),</div><div class='ctx'> 			      0,		/* request */</div><div class='del'>-			      USB_TYPE_VENDOR | USB_RECIP_DEVICE,</div><div class='add'>+			      USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,</div><div class='ctx'> 			      value, index, NULL, 0, 500);</div><div class='ctx'> 	PDEBUG(D_USBO, "reg write: 0x%02x:0x%02x", index, value);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='hunk'>@@ -699,7 +699,7 @@ static void setautogain(struct gspca_dev *gspca_dev)</div><div class='ctx'> 		sd-&gt;ag_cnt = -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void sd_start_12a(struct gspca_dev *gspca_dev)</div><div class='add'>+static int sd_start_12a(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct usb_device *dev = gspca_dev-&gt;dev;</div><div class='ctx'> 	int Clck = 0x8a; /* lower 0x8X values lead to fps &gt; 30 */</div><div class='hunk'>@@ -725,8 +725,9 @@ static void sd_start_12a(struct gspca_dev *gspca_dev)</div><div class='ctx'> 	setwhite(gspca_dev);</div><div class='ctx'> 	setautogain(gspca_dev);</div><div class='ctx'> 	setexposure(gspca_dev);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='del'>-static void sd_start_72a(struct gspca_dev *gspca_dev)</div><div class='add'>+static int sd_start_72a(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct usb_device *dev = gspca_dev-&gt;dev;</div><div class='ctx'> 	int Clck;</div><div class='hunk'>@@ -750,6 +751,7 @@ static void sd_start_72a(struct gspca_dev *gspca_dev)</div><div class='ctx'> 	reg_w_val(dev, 0x8700, Clck);	/* 0x27 clock */</div><div class='ctx'> 	reg_w_val(dev, 0x8112, 0x10 | 0x20);</div><div class='ctx'> 	setautogain(gspca_dev);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sd_stopN(struct gspca_dev *gspca_dev)</div><div class='hunk'>@@ -1064,7 +1066,7 @@ static struct ctrl sd_ctrls_12a[] = {</div><div class='ctx'> 	    {</div><div class='ctx'> 		.id = V4L2_CID_DO_WHITE_BALANCE,</div><div class='ctx'> 		.type = V4L2_CTRL_TYPE_INTEGER,</div><div class='del'>-		.name = "While Balance",</div><div class='add'>+		.name = "White Balance",</div><div class='ctx'> 		.minimum = WHITE_MIN,</div><div class='ctx'> 		.maximum = WHITE_MAX,</div><div class='ctx'> 		.step = 1,</div><div class='head'>diff --git a/drivers/media/video/gspca/stk014.c b/drivers/media/video/gspca/stk014.c<br/>index 2f2de429e273..d9d64911f22a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/gspca/stk014.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/gspca/stk014.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/gspca/stk014.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/stk014.c</a></div><div class='hunk'>@@ -324,7 +324,7 @@ static int sd_init(struct gspca_dev *gspca_dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* -- start the camera -- */</div><div class='del'>-static void sd_start(struct gspca_dev *gspca_dev)</div><div class='add'>+static int sd_start(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='ctx'> 	int ret, value;</div><div class='ctx'> </div><div class='hunk'>@@ -374,9 +374,10 @@ static void sd_start(struct gspca_dev *gspca_dev)</div><div class='ctx'> 	set_par(gspca_dev, 0x01000000);</div><div class='ctx'> 	set_par(gspca_dev, 0x01000000);</div><div class='ctx'> 	PDEBUG(D_STREAM, "camera started alt: 0x%02x", gspca_dev-&gt;alt);</div><div class='del'>-	return;</div><div class='add'>+	return 0;</div><div class='ctx'> out:</div><div class='ctx'> 	PDEBUG(D_ERR|D_STREAM, "camera start err %d", ret);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sd_stopN(struct gspca_dev *gspca_dev)</div><div class='head'>diff --git a/drivers/media/video/gspca/sunplus.c b/drivers/media/video/gspca/sunplus.c<br/>index 1cfcc6c49558..bd9288665a80 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/gspca/sunplus.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/gspca/sunplus.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/gspca/sunplus.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/sunplus.c</a></div><div class='hunk'>@@ -961,7 +961,7 @@ static int sd_init(struct gspca_dev *gspca_dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void sd_start(struct gspca_dev *gspca_dev)</div><div class='add'>+static int sd_start(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct sd *sd = (struct sd *) gspca_dev;</div><div class='ctx'> 	struct usb_device *dev = gspca_dev-&gt;dev;</div><div class='hunk'>@@ -1042,6 +1042,7 @@ static void sd_start(struct gspca_dev *gspca_dev)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	sp5xx_initContBrigHueRegisters(gspca_dev);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sd_stopN(struct gspca_dev *gspca_dev)</div><div class='head'>diff --git a/drivers/media/video/gspca/t613.c b/drivers/media/video/gspca/t613.c<br/>index f034c748fc7e..eac245d7a756 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/gspca/t613.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/gspca/t613.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/gspca/t613.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/t613.c</a></div><div class='hunk'>@@ -28,8 +28,6 @@</div><div class='ctx'> </div><div class='ctx'> #include "gspca.h"</div><div class='ctx'> </div><div class='del'>-#define MAX_GAMMA 0x10		/* 0 to 15 */</div><div class='del'>-</div><div class='ctx'> #define V4L2_CID_EFFECTS (V4L2_CID_PRIVATE_BASE + 0)</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Leandro Costantino &lt;le_costantino@pixartargentina.com.ar&gt;");</div><div class='hunk'>@@ -49,6 +47,10 @@ struct sd {</div><div class='ctx'> 	unsigned char whitebalance;</div><div class='ctx'> 	unsigned char mirror;</div><div class='ctx'> 	unsigned char effect;</div><div class='add'>+</div><div class='add'>+	__u8 sensor;</div><div class='add'>+#define SENSOR_TAS5130A 0</div><div class='add'>+#define SENSOR_OM6802 1</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* V4L2 controls supported by the driver */</div><div class='hunk'>@@ -83,9 +85,9 @@ static struct ctrl sd_ctrls[] = {</div><div class='ctx'> 	  .type = V4L2_CTRL_TYPE_INTEGER,</div><div class='ctx'> 	  .name = "Brightness",</div><div class='ctx'> 	  .minimum = 0,</div><div class='del'>-	  .maximum = 0x0f,</div><div class='add'>+	  .maximum = 14,</div><div class='ctx'> 	  .step = 1,</div><div class='del'>-	  .default_value = 0x09,</div><div class='add'>+	  .default_value = 8,</div><div class='ctx'> 	  },</div><div class='ctx'> 	 .set = sd_setbrightness,</div><div class='ctx'> 	 .get = sd_getbrightness,</div><div class='hunk'>@@ -118,16 +120,17 @@ static struct ctrl sd_ctrls[] = {</div><div class='ctx'> 	 .set = sd_setcolors,</div><div class='ctx'> 	 .get = sd_getcolors,</div><div class='ctx'> 	 },</div><div class='del'>-#define SD_GAMMA 3</div><div class='add'>+#define GAMMA_MAX 16</div><div class='add'>+#define GAMMA_DEF 10</div><div class='ctx'> 	{</div><div class='ctx'> 	 {</div><div class='ctx'> 	  .id = V4L2_CID_GAMMA,	/* (gamma on win) */</div><div class='ctx'> 	  .type = V4L2_CTRL_TYPE_INTEGER,</div><div class='del'>-	  .name = "Gamma (Untested)",</div><div class='add'>+	  .name = "Gamma",</div><div class='ctx'> 	  .minimum = 0,</div><div class='del'>-	  .maximum = MAX_GAMMA,</div><div class='add'>+	  .maximum = GAMMA_MAX - 1,</div><div class='ctx'> 	  .step = 1,</div><div class='del'>-	  .default_value = 0x09,</div><div class='add'>+	  .default_value = GAMMA_DEF,</div><div class='ctx'> 	  },</div><div class='ctx'> 	 .set = sd_setgamma,</div><div class='ctx'> 	 .get = sd_getgamma,</div><div class='hunk'>@@ -185,7 +188,7 @@ static struct ctrl sd_ctrls[] = {</div><div class='ctx'> 	  .minimum = 0,</div><div class='ctx'> 	  .maximum = 1,</div><div class='ctx'> 	  .step = 1,</div><div class='del'>-	  .default_value = 1,</div><div class='add'>+	  .default_value = 0,</div><div class='ctx'> 	  },</div><div class='ctx'> 	 .set = sd_setwhitebalance,</div><div class='ctx'> 	 .get = sd_getwhitebalance</div><div class='hunk'>@@ -197,7 +200,7 @@ static struct ctrl sd_ctrls[] = {</div><div class='ctx'> 	  .type = V4L2_CTRL_TYPE_INTEGER,</div><div class='ctx'> 	  .name = "Sharpness",</div><div class='ctx'> 	  .minimum = 0,</div><div class='del'>-	  .maximum = MAX_GAMMA,	/* 0 to 16 */</div><div class='add'>+	  .maximum = 15,</div><div class='ctx'> 	  .step = 1,</div><div class='ctx'> 	  .default_value = 0x06,</div><div class='ctx'> 	  },</div><div class='hunk'>@@ -258,7 +261,59 @@ static struct v4l2_pix_format vga_mode_t16[] = {</div><div class='ctx'> 		.priv = 0},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define T16_OFFSET_DATA 631</div><div class='add'>+/* sensor specific data */</div><div class='add'>+struct additional_sensor_data {</div><div class='add'>+	const __u8 data1[20];</div><div class='add'>+	const __u8 data2[18];</div><div class='add'>+	const __u8 data3[18];</div><div class='add'>+	const __u8 data4[4];</div><div class='add'>+	const __u8 data5[6];</div><div class='add'>+	const __u8 stream[4];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const static struct additional_sensor_data sensor_data[] = {</div><div class='add'>+    {				/* TAS5130A */</div><div class='add'>+	.data1 =</div><div class='add'>+		{0xd0, 0xbb, 0xd1, 0x28, 0xd2, 0x10, 0xd3, 0x10,</div><div class='add'>+		 0xd4, 0xbb, 0xd5, 0x28, 0xd6, 0x1e, 0xd7, 0x27,</div><div class='add'>+		 0xd8, 0xc8, 0xd9, 0xfc},</div><div class='add'>+	.data2 =</div><div class='add'>+		{0xe0, 0x60, 0xe1, 0xa8, 0xe2, 0xe0, 0xe3, 0x60,</div><div class='add'>+		 0xe4, 0xa8, 0xe5, 0xe0, 0xe6, 0x60, 0xe7, 0xa8,</div><div class='add'>+		 0xe8, 0xe0},</div><div class='add'>+	.data3 =</div><div class='add'>+		{0xc7, 0x60, 0xc8, 0xa8, 0xc9, 0xe0, 0xca, 0x60,</div><div class='add'>+		 0xcb, 0xa8, 0xcc, 0xe0, 0xcd, 0x60, 0xce, 0xa8,</div><div class='add'>+		 0xcf, 0xe0},</div><div class='add'>+	.data4 =	/* Freq (50/60Hz). Splitted for test purpose */</div><div class='add'>+		{0x66, 0x00, 0xa8, 0xe8},</div><div class='add'>+	.data5 =</div><div class='add'>+		{0x0c, 0x03, 0xab, 0x10, 0x81, 0x20},</div><div class='add'>+	.stream =</div><div class='add'>+		{0x0b, 0x04, 0x0a, 0x40},</div><div class='add'>+    },</div><div class='add'>+    {				/* OM6802 */</div><div class='add'>+	.data1 =</div><div class='add'>+		{0xd0, 0xc2, 0xd1, 0x28, 0xd2, 0x0f, 0xd3, 0x22,</div><div class='add'>+		 0xd4, 0xcd, 0xd5, 0x27, 0xd6, 0x2c, 0xd7, 0x06,</div><div class='add'>+		 0xd8, 0xb3, 0xd9, 0xfc},</div><div class='add'>+	.data2 =</div><div class='add'>+		{0xe0, 0x80, 0xe1, 0xff, 0xe2, 0xff, 0xe3, 0x80,</div><div class='add'>+		 0xe4, 0xff, 0xe5, 0xff, 0xe6, 0x80, 0xe7, 0xff,</div><div class='add'>+		 0xe8, 0xff},</div><div class='add'>+	.data3 =</div><div class='add'>+		{0xc7, 0x80, 0xc8, 0xff, 0xc9, 0xff, 0xca, 0x80,</div><div class='add'>+		 0xcb, 0xff, 0xcc, 0xff, 0xcd, 0x80, 0xce, 0xff,</div><div class='add'>+		 0xcf, 0xff},</div><div class='add'>+	.data4 =	/*Freq (50/60Hz). Splitted for test purpose */</div><div class='add'>+		{0x66, 0xca, 0xa8, 0xf0 },</div><div class='add'>+	.data5 =	/* this could be removed later */</div><div class='add'>+		{0x0c, 0x03, 0xab, 0x13, 0x81, 0x23},</div><div class='add'>+	.stream =</div><div class='add'>+		{0x0b, 0x04, 0x0a, 0x78},</div><div class='add'>+    }</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #define MAX_EFFECTS 7</div><div class='ctx'> /* easily done by soft, this table could be removed,</div><div class='ctx'>  * i keep it here just in case */</div><div class='hunk'>@@ -272,87 +327,87 @@ static const __u8 effects_table[MAX_EFFECTS][6] = {</div><div class='ctx'> 	{0xa8, 0xc8, 0xc6, 0xd2, 0xc0, 0x40},	/* Negative */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const __u8 gamma_table[MAX_GAMMA][34] = {</div><div class='del'>-	{0x90, 0x00, 0x91, 0x3e, 0x92, 0x69, 0x93, 0x85,</div><div class='add'>+static const __u8 gamma_table[GAMMA_MAX][34] = {</div><div class='add'>+	{0x90, 0x00, 0x91, 0x3e, 0x92, 0x69, 0x93, 0x85,	/* 0 */</div><div class='ctx'> 	 0x94, 0x95, 0x95, 0xa1, 0x96, 0xae, 0x97, 0xb9,</div><div class='ctx'> 	 0x98, 0xc2, 0x99, 0xcb, 0x9a, 0xd4, 0x9b, 0xdb,</div><div class='ctx'> 	 0x9c, 0xe3, 0x9d, 0xea, 0x9e, 0xf1, 0x9f, 0xf8,</div><div class='ctx'> 	 0xa0, 0xff},</div><div class='del'>-	{0x90, 0x00, 0x91, 0x33, 0x92, 0x5A, 0x93, 0x75,</div><div class='del'>-	 0x94, 0x85, 0x95, 0x93, 0x96, 0xA1, 0x97, 0xAD,</div><div class='del'>-	 0x98, 0xB7, 0x99, 0xC2, 0x9A, 0xCB, 0x9B, 0xD4,</div><div class='del'>-	 0x9C, 0xDE, 0x9D, 0xE7, 0x9E, 0xF0, 0x9F, 0xF7,</div><div class='add'>+	{0x90, 0x00, 0x91, 0x33, 0x92, 0x5a, 0x93, 0x75,	/* 1 */</div><div class='add'>+	 0x94, 0x85, 0x95, 0x93, 0x96, 0xa1, 0x97, 0xad,</div><div class='add'>+	 0x98, 0xb7, 0x99, 0xc2, 0x9a, 0xcb, 0x9b, 0xd4,</div><div class='add'>+	 0x9c, 0xde, 0x9D, 0xe7, 0x9e, 0xf0, 0x9f, 0xf7,</div><div class='ctx'> 	 0xa0, 0xff},</div><div class='del'>-	{0x90, 0x00, 0x91, 0x2F, 0x92, 0x51, 0x93, 0x6B,</div><div class='del'>-	 0x94, 0x7C, 0x95, 0x8A, 0x96, 0x99, 0x97, 0xA6,</div><div class='del'>-	 0x98, 0xB1, 0x99, 0xBC, 0x9A, 0xC6, 0x9B, 0xD0,</div><div class='del'>-	 0x9C, 0xDB, 0x9D, 0xE4, 0x9E, 0xED, 0x9F, 0xF6,</div><div class='add'>+	{0x90, 0x00, 0x91, 0x2f, 0x92, 0x51, 0x93, 0x6b,	/* 2 */</div><div class='add'>+	 0x94, 0x7c, 0x95, 0x8a, 0x96, 0x99, 0x97, 0xa6,</div><div class='add'>+	 0x98, 0xb1, 0x99, 0xbc, 0x9a, 0xc6, 0x9b, 0xd0,</div><div class='add'>+	 0x9c, 0xdb, 0x9d, 0xe4, 0x9e, 0xed, 0x9f, 0xf6,</div><div class='ctx'> 	 0xa0, 0xff},</div><div class='del'>-	{0x90, 0x00, 0x91, 0x29, 0x92, 0x48, 0x93, 0x60,</div><div class='del'>-	 0x94, 0x72, 0x95, 0x81, 0x96, 0x90, 0x97, 0x9E,</div><div class='del'>-	 0x98, 0xAA, 0x99, 0xB5, 0x9A, 0xBF, 0x9B, 0xCB,</div><div class='del'>-	 0x9C, 0xD6, 0x9D, 0xE1, 0x9E, 0xEB, 0x9F, 0xF5,</div><div class='add'>+	{0x90, 0x00, 0x91, 0x29, 0x92, 0x48, 0x93, 0x60,	/* 3 */</div><div class='add'>+	 0x94, 0x72, 0x95, 0x81, 0x96, 0x90, 0x97, 0x9e,</div><div class='add'>+	 0x98, 0xaa, 0x99, 0xb5, 0x9a, 0xbf, 0x9b, 0xcb,</div><div class='add'>+	 0x9c, 0xd6, 0x9d, 0xe1, 0x9e, 0xeb, 0x9f, 0xf5,</div><div class='ctx'> 	 0xa0, 0xff},</div><div class='del'>-	{0x90, 0x00, 0x91, 0x23, 0x92, 0x3F, 0x93, 0x55,</div><div class='add'>+	{0x90, 0x00, 0x91, 0x23, 0x92, 0x3f, 0x93, 0x55,	/* 4 */</div><div class='ctx'> 	 0x94, 0x68, 0x95, 0x77, 0x96, 0x86, 0x97, 0x95,</div><div class='del'>-	 0x98, 0xA2, 0x99, 0xAD, 0x9A, 0xB9, 0x9B, 0xC6,</div><div class='del'>-	 0x9C, 0xD2, 0x9D, 0xDE, 0x9E, 0xE9, 0x9F, 0xF4,</div><div class='add'>+	 0x98, 0xa2, 0x99, 0xad, 0x9a, 0xb9, 0x9b, 0xc6,</div><div class='add'>+	 0x9c, 0xd2, 0x9d, 0xde, 0x9e, 0xe9, 0x9f, 0xf4,</div><div class='ctx'> 	 0xa0, 0xff},</div><div class='del'>-	{0x90, 0x00, 0x91, 0x1B, 0x92, 0x33, 0x93, 0x48,</div><div class='add'>+	{0x90, 0x00, 0x91, 0x1b, 0x92, 0x33, 0x93, 0x48,	/* 5 */</div><div class='ctx'> 	 0x94, 0x59, 0x95, 0x69, 0x96, 0x79, 0x97, 0x87,</div><div class='del'>-	 0x98, 0x96, 0x99, 0xA3, 0x9A, 0xB1, 0x9B, 0xBE,</div><div class='del'>-	 0x9C, 0xCC, 0x9D, 0xDA, 0x9E, 0xE7, 0x9F, 0xF3,</div><div class='add'>+	 0x98, 0x96, 0x99, 0xa3, 0x9a, 0xb1, 0x9b, 0xbe,</div><div class='add'>+	 0x9c, 0xcc, 0x9d, 0xda, 0x9e, 0xe7, 0x9f, 0xf3,</div><div class='ctx'> 	 0xa0, 0xff},</div><div class='del'>-	{0x90, 0x00, 0x91, 0x02, 0x92, 0x10, 0x93, 0x20,</div><div class='add'>+	{0x90, 0x00, 0x91, 0x02, 0x92, 0x10, 0x93, 0x20,	/* 6 */</div><div class='ctx'> 	 0x94, 0x32, 0x95, 0x40, 0x96, 0x57, 0x97, 0x67,</div><div class='ctx'> 	 0x98, 0x77, 0x99, 0x88, 0x9a, 0x99, 0x9b, 0xaa,</div><div class='ctx'> 	 0x9c, 0xbb, 0x9d, 0xcc, 0x9e, 0xdd, 0x9f, 0xee,</div><div class='ctx'> 	 0xa0, 0xff},</div><div class='del'>-	{0x90, 0x00, 0x91, 0x02, 0x92, 0x14, 0x93, 0x26,</div><div class='del'>-	 0x94, 0x38, 0x95, 0x4A, 0x96, 0x60, 0x97, 0x70,</div><div class='del'>-	 0x98, 0x80, 0x99, 0x90, 0x9A, 0xA0, 0x9B, 0xB0,</div><div class='del'>-	 0x9C, 0xC0, 0x9D, 0xD0, 0x9E, 0xE0, 0x9F, 0xF0,</div><div class='add'>+	{0x90, 0x00, 0x91, 0x02, 0x92, 0x14, 0x93, 0x26,	/* 7 */</div><div class='add'>+	 0x94, 0x38, 0x95, 0x4a, 0x96, 0x60, 0x97, 0x70,</div><div class='add'>+	 0x98, 0x80, 0x99, 0x90, 0x9a, 0xa0, 0x9b, 0xb0,</div><div class='add'>+	 0x9c, 0xc0, 0x9D, 0xd0, 0x9e, 0xe0, 0x9f, 0xf0,</div><div class='ctx'> 	 0xa0, 0xff},</div><div class='del'>-	{0x90, 0x00, 0x91, 0x10, 0x92, 0x22, 0x93, 0x35,</div><div class='del'>-	 0x94, 0x47, 0x95, 0x5A, 0x96, 0x69, 0x97, 0x79,</div><div class='del'>-	 0x98, 0x88, 0x99, 0x97, 0x9A, 0xA7, 0x9B, 0xB6,</div><div class='del'>-	 0x9C, 0xC4, 0x9D, 0xD3, 0x9E, 0xE0, 0x9F, 0xF0,</div><div class='add'>+	{0x90, 0x00, 0x91, 0x10, 0x92, 0x22, 0x93, 0x35,	/* 8 */</div><div class='add'>+	 0x94, 0x47, 0x95, 0x5a, 0x96, 0x69, 0x97, 0x79,</div><div class='add'>+	 0x98, 0x88, 0x99, 0x97, 0x9a, 0xa7, 0x9b, 0xb6,</div><div class='add'>+	 0x9c, 0xc4, 0x9d, 0xd3, 0x9e, 0xe0, 0x9f, 0xf0,</div><div class='ctx'> 	 0xa0, 0xff},</div><div class='del'>-	{0x90, 0x00, 0x91, 0x10, 0x92, 0x26, 0x93, 0x40,</div><div class='add'>+	{0x90, 0x00, 0x91, 0x10, 0x92, 0x26, 0x93, 0x40,	/* 9 */</div><div class='ctx'> 	 0x94, 0x54, 0x95, 0x65, 0x96, 0x75, 0x97, 0x84,</div><div class='ctx'> 	 0x98, 0x93, 0x99, 0xa1, 0x9a, 0xb0, 0x9b, 0xbd,</div><div class='ctx'> 	 0x9c, 0xca, 0x9d, 0xd6, 0x9e, 0xe0, 0x9f, 0xf0,</div><div class='ctx'> 	 0xa0, 0xff},</div><div class='del'>-	{0x90, 0x00, 0x91, 0x18, 0x92, 0x2B, 0x93, 0x44,</div><div class='del'>-	 0x94, 0x60, 0x95, 0x70, 0x96, 0x80, 0x97, 0x8E,</div><div class='del'>-	 0x98, 0x9C, 0x99, 0xAA, 0x9A, 0xB7, 0x9B, 0xC4,</div><div class='del'>-	 0x9C, 0xD0, 0x9D, 0xD8, 0x9E, 0xE2, 0x9F, 0xF0,</div><div class='add'>+	{0x90, 0x00, 0x91, 0x18, 0x92, 0x2b, 0x93, 0x44,	/* 10 */</div><div class='add'>+	 0x94, 0x60, 0x95, 0x70, 0x96, 0x80, 0x97, 0x8e,</div><div class='add'>+	 0x98, 0x9c, 0x99, 0xaa, 0x9a, 0xb7, 0x9b, 0xc4,</div><div class='add'>+	 0x9c, 0xd0, 0x9d, 0xd8, 0x9e, 0xe2, 0x9f, 0xf0,</div><div class='ctx'> 	 0xa0, 0xff},</div><div class='del'>-	{0x90, 0x00, 0x91, 0x1A, 0x92, 0x34, 0x93, 0x52,</div><div class='del'>-	 0x94, 0x66, 0x95, 0x7E, 0x96, 0x8D, 0x97, 0x9B,</div><div class='del'>-	 0x98, 0xA8, 0x99, 0xB4, 0x9A, 0xC0, 0x9B, 0xCB,</div><div class='del'>-	 0x9C, 0xD6, 0x9D, 0xE1, 0x9E, 0xEB, 0x9F, 0xF5,</div><div class='add'>+	{0x90, 0x00, 0x91, 0x1a, 0x92, 0x34, 0x93, 0x52,	/* 11 */</div><div class='add'>+	 0x94, 0x66, 0x95, 0x7e, 0x96, 0x8D, 0x97, 0x9B,</div><div class='add'>+	 0x98, 0xa8, 0x99, 0xb4, 0x9a, 0xc0, 0x9b, 0xcb,</div><div class='add'>+	 0x9c, 0xd6, 0x9d, 0xe1, 0x9e, 0xeb, 0x9f, 0xf5,</div><div class='ctx'> 	 0xa0, 0xff},</div><div class='del'>-	{0x90, 0x00, 0x91, 0x3F, 0x92, 0x5A, 0x93, 0x6E,</div><div class='del'>-	 0x94, 0x7F, 0x95, 0x8E, 0x96, 0x9C, 0x97, 0xA8,</div><div class='del'>-	 0x98, 0xB4, 0x99, 0xBF, 0x9A, 0xC9, 0x9B, 0xD3,</div><div class='del'>-	 0x9C, 0xDC, 0x9D, 0xE5, 0x9E, 0xEE, 0x9F, 0xF6,</div><div class='del'>-	 0xA0, 0xFF},</div><div class='del'>-	{0x90, 0x00, 0x91, 0x54, 0x92, 0x6F, 0x93, 0x83,</div><div class='del'>-	 0x94, 0x93, 0x95, 0xA0, 0x96, 0xAD, 0x97, 0xB7,</div><div class='del'>-	 0x98, 0xC2, 0x99, 0xCB, 0x9A, 0xD4, 0x9B, 0xDC,</div><div class='del'>-	 0x9C, 0xE4, 0x9D, 0xEB, 0x9E, 0xF2, 0x9F, 0xF9,</div><div class='add'>+	{0x90, 0x00, 0x91, 0x3f, 0x92, 0x5a, 0x93, 0x6e,	/* 12 */</div><div class='add'>+	 0x94, 0x7f, 0x95, 0x8e, 0x96, 0x9c, 0x97, 0xa8,</div><div class='add'>+	 0x98, 0xb4, 0x99, 0xbf, 0x9a, 0xc9, 0x9b, 0xd3,</div><div class='add'>+	 0x9c, 0xdc, 0x9d, 0xe5, 0x9e, 0xee, 0x9f, 0xf6,</div><div class='ctx'> 	 0xa0, 0xff},</div><div class='del'>-	{0x90, 0x00, 0x91, 0x6E, 0x92, 0x88, 0x93, 0x9A,</div><div class='del'>-	 0x94, 0xA8, 0x95, 0xB3, 0x96, 0xBD, 0x97, 0xC6,</div><div class='del'>-	 0x98, 0xCF, 0x99, 0xD6, 0x9A, 0xDD, 0x9B, 0xE3,</div><div class='del'>-	 0x9C, 0xE9, 0x9D, 0xEF, 0x9E, 0xF4, 0x9F, 0xFA,</div><div class='add'>+	{0x90, 0x00, 0x91, 0x54, 0x92, 0x6f, 0x93, 0x83,	/* 13 */</div><div class='add'>+	 0x94, 0x93, 0x95, 0xa0, 0x96, 0xad, 0x97, 0xb7,</div><div class='add'>+	 0x98, 0xc2, 0x99, 0xcb, 0x9a, 0xd4, 0x9b, 0xdc,</div><div class='add'>+	 0x9c, 0xe4, 0x9d, 0xeb, 0x9e, 0xf2, 0x9f, 0xf9,</div><div class='ctx'> 	 0xa0, 0xff},</div><div class='del'>-	{0x90, 0x00, 0x91, 0x93, 0x92, 0xA8, 0x93, 0xB7,</div><div class='del'>-	 0x94, 0xC1, 0x95, 0xCA, 0x96, 0xD2, 0x97, 0xD8,</div><div class='del'>-	 0x98, 0xDE, 0x99, 0xE3, 0x9A, 0xE8, 0x9B, 0xED,</div><div class='del'>-	 0x9C, 0xF1, 0x9D, 0xF5, 0x9E, 0xF8, 0x9F, 0xFC,</div><div class='del'>-	 0xA0, 0xFF}</div><div class='add'>+	{0x90, 0x00, 0x91, 0x6e, 0x92, 0x88, 0x93, 0x9a,	/* 14 */</div><div class='add'>+	 0x94, 0xa8, 0x95, 0xb3, 0x96, 0xbd, 0x97, 0xc6,</div><div class='add'>+	 0x98, 0xcf, 0x99, 0xd6, 0x9a, 0xdd, 0x9b, 0xe3,</div><div class='add'>+	 0x9c, 0xe9, 0x9d, 0xef, 0x9e, 0xf4, 0x9f, 0xfa,</div><div class='add'>+	 0xa0, 0xff},</div><div class='add'>+	{0x90, 0x00, 0x91, 0x93, 0x92, 0xa8, 0x93, 0xb7,	/* 15 */</div><div class='add'>+	 0x94, 0xc1, 0x95, 0xca, 0x96, 0xd2, 0x97, 0xd8,</div><div class='add'>+	 0x98, 0xde, 0x99, 0xe3, 0x9a, 0xe8, 0x9b, 0xed,</div><div class='add'>+	 0x9c, 0xf1, 0x9d, 0xf5, 0x9e, 0xf8, 0x9f, 0xfc,</div><div class='add'>+	 0xa0, 0xff}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const __u8 tas5130a_sensor_init[][8] = {</div><div class='hunk'>@@ -363,8 +418,10 @@ static const __u8 tas5130a_sensor_init[][8] = {</div><div class='ctx'> 	{},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static __u8 sensor_reset[] = {0x61, 0x68, 0x62, 0xff, 0x60, 0x07};</div><div class='add'>+</div><div class='ctx'> /* read 1 byte */</div><div class='del'>-static int reg_r_1(struct gspca_dev *gspca_dev,</div><div class='add'>+static int reg_r(struct gspca_dev *gspca_dev,</div><div class='ctx'> 		   __u16 index)</div><div class='ctx'> {</div><div class='ctx'> 	usb_control_msg(gspca_dev-&gt;dev,</div><div class='hunk'>@@ -378,26 +435,26 @@ static int reg_r_1(struct gspca_dev *gspca_dev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void reg_w(struct gspca_dev *gspca_dev,</div><div class='del'>-			__u16 value,</div><div class='del'>-			__u16 index,</div><div class='del'>-			const __u8 *buffer, __u16 len)</div><div class='add'>+		  __u16 index)</div><div class='add'>+{</div><div class='add'>+	usb_control_msg(gspca_dev-&gt;dev,</div><div class='add'>+			usb_sndctrlpipe(gspca_dev-&gt;dev, 0),</div><div class='add'>+			0,</div><div class='add'>+			USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,</div><div class='add'>+			0, index,</div><div class='add'>+			NULL, 0, 500);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void reg_w_buf(struct gspca_dev *gspca_dev,</div><div class='add'>+		  const __u8 *buffer, __u16 len)</div><div class='ctx'> {</div><div class='del'>-	if (buffer == NULL) {</div><div class='del'>-		usb_control_msg(gspca_dev-&gt;dev,</div><div class='del'>-				usb_sndctrlpipe(gspca_dev-&gt;dev, 0),</div><div class='del'>-				0,</div><div class='del'>-			   USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_INTERFACE,</div><div class='del'>-				value, index,</div><div class='del'>-				NULL, 0, 500);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='ctx'> 	if (len &lt;= USB_BUF_SZ) {</div><div class='ctx'> 		memcpy(gspca_dev-&gt;usb_buf, buffer, len);</div><div class='ctx'> 		usb_control_msg(gspca_dev-&gt;dev,</div><div class='ctx'> 				usb_sndctrlpipe(gspca_dev-&gt;dev, 0),</div><div class='ctx'> 				0,</div><div class='del'>-			   USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_INTERFACE,</div><div class='del'>-				value, index,</div><div class='add'>+			   USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,</div><div class='add'>+				0x01, 0,</div><div class='ctx'> 				gspca_dev-&gt;usb_buf, len, 500);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		__u8 *tmpbuf;</div><div class='hunk'>@@ -407,13 +464,72 @@ static void reg_w(struct gspca_dev *gspca_dev,</div><div class='ctx'> 		usb_control_msg(gspca_dev-&gt;dev,</div><div class='ctx'> 				usb_sndctrlpipe(gspca_dev-&gt;dev, 0),</div><div class='ctx'> 				0,</div><div class='del'>-			   USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_INTERFACE,</div><div class='del'>-				value, index,</div><div class='add'>+			   USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,</div><div class='add'>+				0x01, 0,</div><div class='ctx'> 				tmpbuf, len, 500);</div><div class='ctx'> 		kfree(tmpbuf);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Reported as OM6802*/</div><div class='add'>+static void om6802_sensor_init(struct gspca_dev *gspca_dev)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	const __u8 *p;</div><div class='add'>+	__u8 byte;</div><div class='add'>+	__u8 val[6] = {0x62, 0, 0x64, 0, 0x60, 0x05};</div><div class='add'>+	static const __u8 sensor_init[] = {</div><div class='add'>+		0xdf, 0x6d,</div><div class='add'>+		0xdd, 0x18,</div><div class='add'>+		0x5a, 0xe0,</div><div class='add'>+		0x5c, 0x07,</div><div class='add'>+		0x5d, 0xb0,</div><div class='add'>+		0x5e, 0x1e,</div><div class='add'>+		0x60, 0x71,</div><div class='add'>+		0xef, 0x00,</div><div class='add'>+		0xe9, 0x00,</div><div class='add'>+		0xea, 0x00,</div><div class='add'>+		0x90, 0x24,</div><div class='add'>+		0x91, 0xb2,</div><div class='add'>+		0x82, 0x32,</div><div class='add'>+		0xfd, 0x41,</div><div class='add'>+		0x00			/* table end */</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	reg_w_buf(gspca_dev, sensor_reset, sizeof sensor_reset);</div><div class='add'>+	msleep(5);</div><div class='add'>+	i = 4;</div><div class='add'>+	while (--i &lt; 0) {</div><div class='add'>+		byte = reg_r(gspca_dev, 0x0060);</div><div class='add'>+		if (!(byte &amp; 0x01))</div><div class='add'>+			break;</div><div class='add'>+		msleep(100);</div><div class='add'>+	}</div><div class='add'>+	byte = reg_r(gspca_dev, 0x0063);</div><div class='add'>+	if (byte != 0x17) {</div><div class='add'>+		err("Bad sensor reset %02x", byte);</div><div class='add'>+		/* continue? */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	p = sensor_init;</div><div class='add'>+	while (*p != 0) {</div><div class='add'>+		val[1] = *p++;</div><div class='add'>+		val[3] = *p++;</div><div class='add'>+		if (*p == 0)</div><div class='add'>+			reg_w(gspca_dev, 0x3c80);</div><div class='add'>+		reg_w_buf(gspca_dev, val, sizeof val);</div><div class='add'>+		i = 4;</div><div class='add'>+		while (--i &gt;= 0) {</div><div class='add'>+			msleep(15);</div><div class='add'>+			byte = reg_r(gspca_dev, 0x60);</div><div class='add'>+			if (!(byte &amp; 0x01))</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	msleep(15);</div><div class='add'>+	reg_w(gspca_dev, 0x3c80);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* this function is called at probe time */</div><div class='ctx'> static int sd_config(struct gspca_dev *gspca_dev,</div><div class='ctx'> 		     const struct usb_device_id *id)</div><div class='hunk'>@@ -430,7 +546,7 @@ static int sd_config(struct gspca_dev *gspca_dev,</div><div class='ctx'> 	sd-&gt;brightness = sd_ctrls[SD_BRIGHTNESS].qctrl.default_value;</div><div class='ctx'> 	sd-&gt;contrast = sd_ctrls[SD_CONTRAST].qctrl.default_value;</div><div class='ctx'> 	sd-&gt;colors = sd_ctrls[SD_COLOR].qctrl.default_value;</div><div class='del'>-	sd-&gt;gamma = sd_ctrls[SD_GAMMA].qctrl.default_value;</div><div class='add'>+	sd-&gt;gamma = GAMMA_DEF;</div><div class='ctx'> 	sd-&gt;mirror = sd_ctrls[SD_MIRROR].qctrl.default_value;</div><div class='ctx'> 	sd-&gt;freq = sd_ctrls[SD_LIGHTFREQ].qctrl.default_value;</div><div class='ctx'> 	sd-&gt;whitebalance = sd_ctrls[SD_WHITE_BALANCE].qctrl.default_value;</div><div class='hunk'>@@ -439,27 +555,98 @@ static int sd_config(struct gspca_dev *gspca_dev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int init_default_parameters(struct gspca_dev *gspca_dev)</div><div class='add'>+static void setbrightness(struct gspca_dev *gspca_dev)</div><div class='add'>+{</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+	unsigned int brightness;</div><div class='add'>+	__u8 set6[4] = { 0x8f, 0x24, 0xc3, 0x00 };</div><div class='add'>+</div><div class='add'>+	brightness = sd-&gt;brightness;</div><div class='add'>+	if (brightness &lt; 7) {</div><div class='add'>+		set6[1] = 0x26;</div><div class='add'>+		set6[3] = 0x70 - brightness * 0x10;</div><div class='add'>+	} else {</div><div class='add'>+		set6[3] = 0x00 + ((brightness - 7) * 0x10);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	reg_w_buf(gspca_dev, set6, sizeof set6);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void setcontrast(struct gspca_dev *gspca_dev)</div><div class='add'>+{</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+	unsigned int contrast = sd-&gt;contrast;</div><div class='add'>+	__u16 reg_to_write;</div><div class='add'>+</div><div class='add'>+	if (contrast &lt; 7)</div><div class='add'>+		reg_to_write = 0x8ea9 - contrast * 0x200;</div><div class='add'>+	else</div><div class='add'>+		reg_to_write = 0x00a9 + (contrast - 7) * 0x200;</div><div class='add'>+</div><div class='add'>+	reg_w(gspca_dev, reg_to_write);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void setcolors(struct gspca_dev *gspca_dev)</div><div class='add'>+{</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+	__u16 reg_to_write;</div><div class='add'>+</div><div class='add'>+	reg_to_write = 0x80bb + sd-&gt;colors * 0x100;	/* was 0xc0 */</div><div class='add'>+	reg_w(gspca_dev, reg_to_write);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void setgamma(struct gspca_dev *gspca_dev)</div><div class='add'>+{</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+</div><div class='add'>+	PDEBUG(D_CONF, "Gamma: %d", sd-&gt;gamma);</div><div class='add'>+	reg_w_buf(gspca_dev, gamma_table[sd-&gt;gamma], sizeof gamma_table[0]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void setwhitebalance(struct gspca_dev *gspca_dev)</div><div class='add'>+{</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+</div><div class='add'>+	__u8 white_balance[8] =</div><div class='add'>+		{0x87, 0x20, 0x88, 0x20, 0x89, 0x20, 0x80, 0x38};</div><div class='add'>+</div><div class='add'>+	if (sd-&gt;whitebalance)</div><div class='add'>+		white_balance[7] = 0x3c;</div><div class='add'>+</div><div class='add'>+	reg_w_buf(gspca_dev, white_balance, sizeof white_balance);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void setsharpness(struct gspca_dev *gspca_dev)</div><div class='add'>+{</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+	__u16 reg_to_write;</div><div class='add'>+</div><div class='add'>+	reg_to_write = 0x0aa6 + 0x1000 * sd-&gt;sharpness;</div><div class='add'>+</div><div class='add'>+	reg_w(gspca_dev, reg_to_write);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* this function is called at probe and resume time */</div><div class='add'>+static int sd_init(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='ctx'> 	/* some of this registers are not really neded, because</div><div class='ctx'> 	 * they are overriden by setbrigthness, setcontrast, etc,</div><div class='ctx'> 	 * but wont hurt anyway, and can help someone with similar webcam</div><div class='ctx'> 	 * to see the initial parameters.*/</div><div class='del'>-	int i = 0;</div><div class='del'>-	__u8 test_byte;</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+	int i;</div><div class='add'>+	__u8 byte, test_byte;</div><div class='ctx'> </div><div class='ctx'> 	static const __u8 read_indexs[] =</div><div class='ctx'> 		{ 0x06, 0x07, 0x0a, 0x0b, 0x66, 0x80, 0x81, 0x8e, 0x8f, 0xa5,</div><div class='ctx'> 		  0xa6, 0xa8, 0xbb, 0xbc, 0xc6, 0x00, 0x00 };</div><div class='del'>-	static const __u8 n1[6] =</div><div class='add'>+	static const __u8 n1[] =</div><div class='ctx'> 			{0x08, 0x03, 0x09, 0x03, 0x12, 0x04};</div><div class='del'>-	static const __u8 n2[2] =</div><div class='add'>+	static const __u8 n2[] =</div><div class='ctx'> 			{0x08, 0x00};</div><div class='del'>-	static const __u8 nset[6] =</div><div class='del'>-		{ 0x61, 0x68, 0x62, 0xff, 0x60, 0x07 };</div><div class='del'>-	static const __u8 n3[6] =</div><div class='add'>+	static const __u8 n3[] =</div><div class='ctx'> 			{0x61, 0x68, 0x65, 0x0a, 0x60, 0x04};</div><div class='del'>-	static const __u8 n4[0x46] =</div><div class='add'>+	static const __u8 n4[] =</div><div class='ctx'> 		{0x09, 0x01, 0x12, 0x04, 0x66, 0x8a, 0x80, 0x3c,</div><div class='ctx'> 		 0x81, 0x22, 0x84, 0x50, 0x8a, 0x78, 0x8b, 0x68,</div><div class='ctx'> 		 0x8c, 0x88, 0x8e, 0x33, 0x8f, 0x24, 0xaa, 0xb1,</div><div class='hunk'>@@ -469,131 +656,113 @@ static int init_default_parameters(struct gspca_dev *gspca_dev)</div><div class='ctx'> 		 0x65, 0x0a, 0xbb, 0x86, 0xaf, 0x58, 0xb0, 0x68,</div><div class='ctx'> 		 0x87, 0x40, 0x89, 0x2b, 0x8d, 0xff, 0x83, 0x40,</div><div class='ctx'> 		 0xac, 0x84, 0xad, 0x86, 0xaf, 0x46};</div><div class='del'>-	static const __u8 nset4[18] = {</div><div class='del'>-		0xe0, 0x60, 0xe1, 0xa8, 0xe2, 0xe0, 0xe3, 0x60, 0xe4, 0xa8,</div><div class='del'>-		0xe5, 0xe0, 0xe6, 0x60, 0xe7, 0xa8,</div><div class='del'>-		0xe8, 0xe0</div><div class='del'>-	};</div><div class='del'>-	/* ojo puede ser 0xe6 en vez de 0xe9 */</div><div class='del'>-	static const __u8 nset2[20] = {</div><div class='del'>-		0xd0, 0xbb, 0xd1, 0x28, 0xd2, 0x10, 0xd3, 0x10, 0xd4, 0xbb,</div><div class='del'>-		0xd5, 0x28, 0xd6, 0x1e, 0xd7, 0x27,</div><div class='del'>-		0xd8, 0xc8, 0xd9, 0xfc</div><div class='del'>-	};</div><div class='del'>-	static const __u8 missing[8] =</div><div class='del'>-		{ 0x87, 0x20, 0x88, 0x20, 0x89, 0x20, 0x80, 0x38 };</div><div class='del'>-	static const __u8 nset3[18] = {</div><div class='del'>-		0xc7, 0x60, 0xc8, 0xa8, 0xc9, 0xe0, 0xca, 0x60, 0xcb, 0xa8,</div><div class='del'>-		0xcc, 0xe0, 0xcd, 0x60, 0xce, 0xa8,</div><div class='del'>-		0xcf, 0xe0</div><div class='del'>-	};</div><div class='del'>-	static const __u8 nset5[4] =</div><div class='del'>-		{ 0x8f, 0x24, 0xc3, 0x00 };	/* bright */</div><div class='del'>-	static const __u8 nset6[34] = {</div><div class='del'>-		0x90, 0x00, 0x91, 0x1c, 0x92, 0x30, 0x93, 0x43, 0x94, 0x54,</div><div class='del'>-		0x95, 0x65, 0x96, 0x75, 0x97, 0x84,</div><div class='del'>-		0x98, 0x93, 0x99, 0xa1, 0x9a, 0xb0, 0x9b, 0xbd, 0x9c, 0xca,</div><div class='del'>-		0x9d, 0xd8, 0x9e, 0xe5, 0x9f, 0xf2,</div><div class='del'>-		0xa0, 0xff</div><div class='del'>-	};			/* Gamma */</div><div class='del'>-	static const __u8 nset7[4] =</div><div class='del'>-			{ 0x66, 0xca, 0xa8, 0xf8 };	/* 50/60 Hz */</div><div class='ctx'> 	static const __u8 nset9[4] =</div><div class='ctx'> 			{ 0x0b, 0x04, 0x0a, 0x78 };</div><div class='ctx'> 	static const __u8 nset8[6] =</div><div class='ctx'> 			{ 0xa8, 0xf0, 0xc6, 0x88, 0xc0, 0x00 };</div><div class='del'>-	static const __u8 nset10[6] =</div><div class='del'>-			{ 0x0c, 0x03, 0xab, 0x10, 0x81, 0x20 };</div><div class='ctx'> </div><div class='del'>-	reg_w(gspca_dev, 0x01, 0x0000, n1, 0x06);</div><div class='del'>-	reg_w(gspca_dev, 0x01, 0x0000, nset, 0x06);</div><div class='del'>-	reg_r_1(gspca_dev, 0x0063);</div><div class='del'>-	reg_w(gspca_dev, 0x01, 0x0000, n2, 0x02);</div><div class='add'>+	byte = reg_r(gspca_dev, 0x06);</div><div class='add'>+	test_byte = reg_r(gspca_dev, 0x07);</div><div class='add'>+	if (byte == 0x08 &amp;&amp; test_byte == 0x07) {</div><div class='add'>+		PDEBUG(D_CONF, "sensor om6802");</div><div class='add'>+		sd-&gt;sensor = SENSOR_OM6802;</div><div class='add'>+	} else if (byte == 0x08 &amp;&amp; test_byte == 0x01) {</div><div class='add'>+		PDEBUG(D_CONF, "sensor tas5130a");</div><div class='add'>+		sd-&gt;sensor = SENSOR_TAS5130A;</div><div class='add'>+	} else {</div><div class='add'>+		PDEBUG(D_CONF, "unknown sensor %02x %02x", byte, test_byte);</div><div class='add'>+		sd-&gt;sensor = SENSOR_TAS5130A;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	reg_w_buf(gspca_dev, n1, sizeof n1);</div><div class='add'>+	test_byte = 0;</div><div class='add'>+	i = 5;</div><div class='add'>+	while (--i &gt;= 0) {</div><div class='add'>+		reg_w_buf(gspca_dev, sensor_reset, sizeof sensor_reset);</div><div class='add'>+		test_byte = reg_r(gspca_dev, 0x0063);</div><div class='add'>+		msleep(100);</div><div class='add'>+		if (test_byte == 0x17)</div><div class='add'>+			break;		/* OK */</div><div class='add'>+	}</div><div class='add'>+	if (i &lt; 0) {</div><div class='add'>+		err("Bad sensor reset %02x", test_byte);</div><div class='add'>+/*		return -EIO; */</div><div class='add'>+/*fixme: test - continue */</div><div class='add'>+	}</div><div class='add'>+	reg_w_buf(gspca_dev, n2, sizeof n2);</div><div class='add'>+</div><div class='add'>+	i = 0;</div><div class='ctx'> 	while (read_indexs[i] != 0x00) {</div><div class='del'>-		test_byte = reg_r_1(gspca_dev, read_indexs[i]);</div><div class='del'>-		PDEBUG(D_CONF, "Reg 0x%02x =&gt; 0x%02x", read_indexs[i],</div><div class='add'>+		test_byte = reg_r(gspca_dev, read_indexs[i]);</div><div class='add'>+		PDEBUG(D_STREAM, "Reg 0x%02x = 0x%02x", read_indexs[i],</div><div class='ctx'> 		       test_byte);</div><div class='ctx'> 		i++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	reg_w(gspca_dev, 0x01, 0x0000, n3, 0x06);</div><div class='del'>-	reg_w(gspca_dev, 0x01, 0x0000, n4, 0x46);</div><div class='del'>-	reg_r_1(gspca_dev, 0x0080);</div><div class='del'>-	reg_w(gspca_dev, 0x00, 0x2c80, NULL, 0);</div><div class='del'>-	reg_w(gspca_dev, 0x01, 0x0000, nset2, 0x14);</div><div class='del'>-	reg_w(gspca_dev, 0x01, 0x0000, nset3, 0x12);</div><div class='del'>-	reg_w(gspca_dev, 0x01, 0x0000, nset4, 0x12);</div><div class='del'>-	reg_w(gspca_dev, 0x00, 0x3880, NULL, 0);</div><div class='del'>-	reg_w(gspca_dev, 0x00, 0x3880, NULL, 0);</div><div class='del'>-	reg_w(gspca_dev, 0x00, 0x338e, NULL, 0);</div><div class='del'>-	reg_w(gspca_dev, 0x01, 0x0000, nset5, 0x04);</div><div class='del'>-	reg_w(gspca_dev, 0x00, 0x00a9, NULL, 0);</div><div class='del'>-	reg_w(gspca_dev, 0x01, 0x0000, nset6, 0x22);</div><div class='del'>-	reg_w(gspca_dev, 0x00, 0x86bb, NULL, 0);</div><div class='del'>-	reg_w(gspca_dev, 0x00, 0x4aa6, NULL, 0);</div><div class='del'>-</div><div class='del'>-	reg_w(gspca_dev, 0x01, 0x0000, missing, 0x08);</div><div class='del'>-</div><div class='del'>-	reg_w(gspca_dev, 0x00, 0x2087, NULL, 0);</div><div class='del'>-	reg_w(gspca_dev, 0x00, 0x2088, NULL, 0);</div><div class='del'>-	reg_w(gspca_dev, 0x00, 0x2089, NULL, 0);</div><div class='del'>-</div><div class='del'>-	reg_w(gspca_dev, 0x01, 0x0000, nset7, 0x04);</div><div class='del'>-	reg_w(gspca_dev, 0x01, 0x0000, nset10, 0x06);</div><div class='del'>-	reg_w(gspca_dev, 0x01, 0x0000, nset8, 0x06);</div><div class='del'>-	reg_w(gspca_dev, 0x01, 0x0000, nset9, 0x04);</div><div class='del'>-</div><div class='del'>-	reg_w(gspca_dev, 0x00, 0x2880, NULL, 0);</div><div class='del'>-	reg_w(gspca_dev, 0x01, 0x0000, nset2, 0x14);</div><div class='del'>-	reg_w(gspca_dev, 0x01, 0x0000, nset3, 0x12);</div><div class='del'>-	reg_w(gspca_dev, 0x01, 0x0000, nset4, 0x12);</div><div class='add'>+	reg_w_buf(gspca_dev, n3, sizeof n3);</div><div class='add'>+	reg_w_buf(gspca_dev, n4, sizeof n4);</div><div class='add'>+	reg_r(gspca_dev, 0x0080);</div><div class='add'>+	reg_w(gspca_dev, 0x2c80);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='add'>+	reg_w_buf(gspca_dev, sensor_data[sd-&gt;sensor].data1,</div><div class='add'>+			sizeof sensor_data[sd-&gt;sensor].data1);</div><div class='add'>+	reg_w_buf(gspca_dev, sensor_data[sd-&gt;sensor].data3,</div><div class='add'>+			sizeof sensor_data[sd-&gt;sensor].data3);</div><div class='add'>+	reg_w_buf(gspca_dev, sensor_data[sd-&gt;sensor].data2,</div><div class='add'>+			sizeof sensor_data[sd-&gt;sensor].data2);</div><div class='ctx'> </div><div class='del'>-/* this function is called at probe and resume time */</div><div class='del'>-static int sd_init(struct gspca_dev *gspca_dev)</div><div class='del'>-{</div><div class='del'>-	init_default_parameters(gspca_dev);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='add'>+	reg_w(gspca_dev, 0x3880);</div><div class='add'>+	reg_w(gspca_dev, 0x3880);</div><div class='add'>+	reg_w(gspca_dev, 0x338e);</div><div class='ctx'> </div><div class='del'>-static void setbrightness(struct gspca_dev *gspca_dev)</div><div class='del'>-{</div><div class='del'>-	struct sd *sd = (struct sd *) gspca_dev;</div><div class='del'>-	unsigned int brightness;</div><div class='del'>-	__u8 set6[4] = { 0x8f, 0x26, 0xc3, 0x80 };</div><div class='del'>-	brightness = sd-&gt;brightness;</div><div class='add'>+	setbrightness(gspca_dev);</div><div class='add'>+	setcontrast(gspca_dev);</div><div class='add'>+	setgamma(gspca_dev);</div><div class='add'>+	setcolors(gspca_dev);</div><div class='add'>+	setsharpness(gspca_dev);</div><div class='add'>+	setwhitebalance(gspca_dev);</div><div class='ctx'> </div><div class='del'>-	if (brightness &lt; 7) {</div><div class='del'>-		set6[3] = 0x70 - (brightness * 0xa);</div><div class='del'>-	} else {</div><div class='del'>-		set6[1] = 0x24;</div><div class='del'>-		set6[3] = 0x00 + ((brightness - 7) * 0xa);</div><div class='del'>-	}</div><div class='add'>+	reg_w(gspca_dev, 0x2087);	/* tied to white balance? */</div><div class='add'>+	reg_w(gspca_dev, 0x2088);</div><div class='add'>+	reg_w(gspca_dev, 0x2089);</div><div class='ctx'> </div><div class='del'>-	reg_w(gspca_dev, 0x01, 0x0000, set6, 4);</div><div class='add'>+	reg_w_buf(gspca_dev, sensor_data[sd-&gt;sensor].data4,</div><div class='add'>+			sizeof sensor_data[sd-&gt;sensor].data4);</div><div class='add'>+	reg_w_buf(gspca_dev, sensor_data[sd-&gt;sensor].data5,</div><div class='add'>+			sizeof sensor_data[sd-&gt;sensor].data5);</div><div class='add'>+	reg_w_buf(gspca_dev, nset8, sizeof nset8);</div><div class='add'>+	reg_w_buf(gspca_dev, nset9, sizeof nset9);</div><div class='add'>+</div><div class='add'>+	reg_w(gspca_dev, 0x2880);</div><div class='add'>+</div><div class='add'>+	reg_w_buf(gspca_dev, sensor_data[sd-&gt;sensor].data1,</div><div class='add'>+			sizeof sensor_data[sd-&gt;sensor].data1);</div><div class='add'>+	reg_w_buf(gspca_dev, sensor_data[sd-&gt;sensor].data3,</div><div class='add'>+			sizeof sensor_data[sd-&gt;sensor].data3);</div><div class='add'>+	reg_w_buf(gspca_dev, sensor_data[sd-&gt;sensor].data2,</div><div class='add'>+			sizeof sensor_data[sd-&gt;sensor].data2);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void setflip(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct sd *sd = (struct sd *) gspca_dev;</div><div class='del'>-</div><div class='ctx'> 	__u8 flipcmd[8] =</div><div class='del'>-	    { 0x62, 0x07, 0x63, 0x03, 0x64, 0x00, 0x60, 0x09 };</div><div class='add'>+		{0x62, 0x07, 0x63, 0x03, 0x64, 0x00, 0x60, 0x09};</div><div class='ctx'> </div><div class='del'>-	if (sd-&gt;mirror == 1)</div><div class='add'>+	if (sd-&gt;mirror)</div><div class='ctx'> 		flipcmd[3] = 0x01;</div><div class='ctx'> </div><div class='del'>-	reg_w(gspca_dev, 0x01, 0x0000, flipcmd, 8);</div><div class='add'>+	reg_w_buf(gspca_dev, flipcmd, sizeof flipcmd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void seteffect(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct sd *sd = (struct sd *) gspca_dev;</div><div class='ctx'> </div><div class='del'>-	reg_w(gspca_dev, 0x01, 0x0000, effects_table[sd-&gt;effect], 0x06);</div><div class='add'>+	reg_w_buf(gspca_dev, effects_table[sd-&gt;effect],</div><div class='add'>+				sizeof effects_table[0]);</div><div class='ctx'> 	if (sd-&gt;effect == 1 || sd-&gt;effect == 5) {</div><div class='ctx'> 		PDEBUG(D_CONF,</div><div class='ctx'> 		       "This effect have been disabled for webcam \"safety\"");</div><div class='hunk'>@@ -601,22 +770,9 @@ static void seteffect(struct gspca_dev *gspca_dev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (sd-&gt;effect == 1 || sd-&gt;effect == 4)</div><div class='del'>-		reg_w(gspca_dev, 0x00, 0x4aa6, NULL, 0);</div><div class='add'>+		reg_w(gspca_dev, 0x4aa6);</div><div class='ctx'> 	else</div><div class='del'>-		reg_w(gspca_dev, 0x00, 0xfaa6, NULL, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void setwhitebalance(struct gspca_dev *gspca_dev)</div><div class='del'>-{</div><div class='del'>-	struct sd *sd = (struct sd *) gspca_dev;</div><div class='del'>-</div><div class='del'>-	__u8 white_balance[8] =</div><div class='del'>-	    { 0x87, 0x20, 0x88, 0x20, 0x89, 0x20, 0x80, 0x38 };</div><div class='del'>-</div><div class='del'>-	if (sd-&gt;whitebalance == 1)</div><div class='del'>-		white_balance[7] = 0x3c;</div><div class='del'>-</div><div class='del'>-	reg_w(gspca_dev, 0x01, 0x0000, white_balance, 8);</div><div class='add'>+		reg_w(gspca_dev, 0xfaa6);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void setlightfreq(struct gspca_dev *gspca_dev)</div><div class='hunk'>@@ -627,44 +783,143 @@ static void setlightfreq(struct gspca_dev *gspca_dev)</div><div class='ctx'> 	if (sd-&gt;freq == 2)	/* 60hz */</div><div class='ctx'> 		freq[1] = 0x00;</div><div class='ctx'> </div><div class='del'>-	reg_w(gspca_dev, 0x1, 0x0000, freq, 0x4);</div><div class='add'>+	reg_w_buf(gspca_dev, freq, sizeof freq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void setcontrast(struct gspca_dev *gspca_dev)</div><div class='add'>+/* Is this really needed?</div><div class='add'>+ * i added some module parameters for test with some users */</div><div class='add'>+static void poll_sensor(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct sd *sd = (struct sd *) gspca_dev;</div><div class='del'>-	unsigned int contrast = sd-&gt;contrast;</div><div class='del'>-	__u16 reg_to_write = 0x00;</div><div class='del'>-</div><div class='del'>-	if (contrast &lt; 7)</div><div class='del'>-		reg_to_write = 0x8ea9 - (0x200 * contrast);</div><div class='del'>-	else</div><div class='del'>-		reg_to_write = (0x00a9 + ((contrast - 7) * 0x200));</div><div class='del'>-</div><div class='del'>-	reg_w(gspca_dev, 0x00, reg_to_write, NULL, 0);</div><div class='add'>+	static const __u8 poll1[] =</div><div class='add'>+		{0x67, 0x05, 0x68, 0x81, 0x69, 0x80, 0x6a, 0x82,</div><div class='add'>+		 0x6b, 0x68, 0x6c, 0x69, 0x72, 0xd9, 0x73, 0x34,</div><div class='add'>+		 0x74, 0x32, 0x75, 0x92, 0x76, 0x00, 0x09, 0x01,</div><div class='add'>+		 0x60, 0x14};</div><div class='add'>+	static const __u8 poll2[] =</div><div class='add'>+		{0x67, 0x02, 0x68, 0x71, 0x69, 0x72, 0x72, 0xa9,</div><div class='add'>+		 0x73, 0x02, 0x73, 0x02, 0x60, 0x14};</div><div class='add'>+	static const __u8 poll3[] =</div><div class='add'>+		{0x87, 0x3f, 0x88, 0x20, 0x89, 0x2d};</div><div class='add'>+	static const __u8 poll4[] =</div><div class='add'>+		{0xa6, 0x0a, 0xea, 0xcf, 0xbe, 0x26, 0xb1, 0x5f,</div><div class='add'>+		 0xa1, 0xb1, 0xda, 0x6b, 0xdb, 0x98, 0xdf, 0x0c,</div><div class='add'>+		 0xc2, 0x80, 0xc3, 0x10};</div><div class='add'>+</div><div class='add'>+	if (sd-&gt;sensor != SENSOR_TAS5130A) {</div><div class='add'>+		PDEBUG(D_STREAM, "[Sensor requires polling]");</div><div class='add'>+		reg_w_buf(gspca_dev, poll1, sizeof poll1);</div><div class='add'>+		reg_w_buf(gspca_dev, poll2, sizeof poll2);</div><div class='add'>+		reg_w_buf(gspca_dev, poll3, sizeof poll3);</div><div class='add'>+		reg_w_buf(gspca_dev, poll4, sizeof poll4);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void setcolors(struct gspca_dev *gspca_dev)</div><div class='add'>+static int sd_start(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct sd *sd = (struct sd *) gspca_dev;</div><div class='del'>-	__u16 reg_to_write;</div><div class='add'>+	int i, mode;</div><div class='add'>+	__u8 t2[] = { 0x07, 0x00, 0x0d, 0x60, 0x0e, 0x80 };</div><div class='add'>+	static const __u8 t3[] =</div><div class='add'>+		{ 0xb3, 0x07, 0xb4, 0x00, 0xb5, 0x88, 0xb6, 0x02, 0xb7, 0x06,</div><div class='add'>+		  0xb8, 0x00, 0xb9, 0xe7, 0xba, 0x01 };</div><div class='add'>+</div><div class='add'>+	mode = gspca_dev-&gt;cam.cam_mode[(int) gspca_dev-&gt;curr_mode]. priv;</div><div class='add'>+	switch (mode) {</div><div class='add'>+	case 1:		/* 352x288 */</div><div class='add'>+		t2[1] = 0x40;</div><div class='add'>+		break;</div><div class='add'>+	case 2:		/* 320x240 */</div><div class='add'>+		t2[1] = 0x10;</div><div class='add'>+		break;</div><div class='add'>+	case 3:		/* 176x144 */</div><div class='add'>+		t2[1] = 0x50;</div><div class='add'>+		break;</div><div class='add'>+	case 4:		/* 160x120 */</div><div class='add'>+		t2[1] = 0x20;</div><div class='add'>+		break;</div><div class='add'>+	default:	/* 640x480 (0x00) */</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	reg_to_write = 0xc0bb + sd-&gt;colors * 0x100;</div><div class='del'>-	reg_w(gspca_dev, 0x00, reg_to_write, NULL, 0);</div><div class='add'>+	if (sd-&gt;sensor == SENSOR_TAS5130A) {</div><div class='add'>+		i = 0;</div><div class='add'>+		while (tas5130a_sensor_init[i][0] != 0) {</div><div class='add'>+			reg_w_buf(gspca_dev, tas5130a_sensor_init[i],</div><div class='add'>+					 sizeof tas5130a_sensor_init[0]);</div><div class='add'>+			i++;</div><div class='add'>+		}</div><div class='add'>+		reg_w(gspca_dev, 0x3c80);</div><div class='add'>+		/* just in case and to keep sync with logs (for mine) */</div><div class='add'>+		reg_w_buf(gspca_dev, tas5130a_sensor_init[3],</div><div class='add'>+				 sizeof tas5130a_sensor_init[0]);</div><div class='add'>+		reg_w(gspca_dev, 0x3c80);</div><div class='add'>+	} else {</div><div class='add'>+		om6802_sensor_init(gspca_dev);</div><div class='add'>+	}</div><div class='add'>+	reg_w_buf(gspca_dev, sensor_data[sd-&gt;sensor].data4,</div><div class='add'>+			sizeof sensor_data[sd-&gt;sensor].data4);</div><div class='add'>+	reg_r(gspca_dev, 0x0012);</div><div class='add'>+	reg_w_buf(gspca_dev, t2, sizeof t2);</div><div class='add'>+	reg_w_buf(gspca_dev, t3, sizeof t3);</div><div class='add'>+	reg_w(gspca_dev, 0x0013);</div><div class='add'>+	msleep(15);</div><div class='add'>+	reg_w_buf(gspca_dev, sensor_data[sd-&gt;sensor].stream,</div><div class='add'>+			sizeof sensor_data[sd-&gt;sensor].stream);</div><div class='add'>+	poll_sensor(gspca_dev);</div><div class='add'>+</div><div class='add'>+	/* restart on each start, just in case, sometimes regs goes wrong</div><div class='add'>+	 * when using controls from app */</div><div class='add'>+	setbrightness(gspca_dev);</div><div class='add'>+	setcontrast(gspca_dev);</div><div class='add'>+	setcolors(gspca_dev);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void setgamma(struct gspca_dev *gspca_dev)</div><div class='add'>+static void sd_stopN(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+</div><div class='add'>+	reg_w_buf(gspca_dev, sensor_data[sd-&gt;sensor].stream,</div><div class='add'>+			sizeof sensor_data[sd-&gt;sensor].stream);</div><div class='add'>+	msleep(20);</div><div class='add'>+	reg_w_buf(gspca_dev, sensor_data[sd-&gt;sensor].stream,</div><div class='add'>+			sizeof sensor_data[sd-&gt;sensor].stream);</div><div class='add'>+	msleep(20);</div><div class='add'>+	reg_w(gspca_dev, 0x0309);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void setsharpness(struct gspca_dev *gspca_dev)</div><div class='add'>+static void sd_pkt_scan(struct gspca_dev *gspca_dev,</div><div class='add'>+			struct gspca_frame *frame,	/* target */</div><div class='add'>+			__u8 *data,			/* isoc packet */</div><div class='add'>+			int len)			/* iso packet length */</div><div class='ctx'> {</div><div class='del'>-	struct sd *sd = (struct sd *) gspca_dev;</div><div class='del'>-	__u16 reg_to_write;</div><div class='add'>+	static __u8 ffd9[] = { 0xff, 0xd9 };</div><div class='ctx'> </div><div class='del'>-	reg_to_write = 0x0aa6 + 0x1000 * sd-&gt;sharpness;</div><div class='add'>+	if (data[0] == 0x5a) {</div><div class='add'>+		/* Control Packet, after this came the header again,</div><div class='add'>+		 * but extra bytes came in the packet before this,</div><div class='add'>+		 * sometimes an EOF arrives, sometimes not... */</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	data += 2;</div><div class='add'>+	len -= 2;</div><div class='add'>+	if (data[0] == 0xff &amp;&amp; data[1] == 0xd8) {</div><div class='add'>+		/* extra bytes....., could be processed too but would be</div><div class='add'>+		 * a waste of time, right now leave the application and</div><div class='add'>+		 * libjpeg do it for ourserlves.. */</div><div class='add'>+		frame = gspca_frame_add(gspca_dev, LAST_PACKET, frame,</div><div class='add'>+					ffd9, 2);</div><div class='add'>+		gspca_frame_add(gspca_dev, FIRST_PACKET, frame, data, len);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	reg_w(gspca_dev, 0x00, reg_to_write, NULL, 0);</div><div class='add'>+	if (data[len - 2] == 0xff &amp;&amp; data[len - 1] == 0xd9) {</div><div class='add'>+		/* Just in case, i have seen packets with the marker,</div><div class='add'>+		 * other's do not include it... */</div><div class='add'>+		len -= 2;</div><div class='add'>+	}</div><div class='add'>+	gspca_frame_add(gspca_dev, INTER_PACKET, frame, data, len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int sd_setbrightness(struct gspca_dev *gspca_dev, __s32 val)</div><div class='hunk'>@@ -788,6 +1043,7 @@ static int sd_setgamma(struct gspca_dev *gspca_dev, __s32 val)</div><div class='ctx'> static int sd_getgamma(struct gspca_dev *gspca_dev, __s32 *val)</div><div class='ctx'> {</div><div class='ctx'> 	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+</div><div class='ctx'> 	*val = sd-&gt;gamma;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -835,9 +1091,9 @@ static int sd_setlowlight(struct gspca_dev *gspca_dev, __s32 val)</div><div class='ctx'> </div><div class='ctx'> 	sd-&gt;autogain = val;</div><div class='ctx'> 	if (val != 0)</div><div class='del'>-		reg_w(gspca_dev, 0x00, 0xf48e, NULL, 0);</div><div class='add'>+		reg_w(gspca_dev, 0xf48e);</div><div class='ctx'> 	else</div><div class='del'>-		reg_w(gspca_dev, 0x00, 0xb48e, NULL, 0);</div><div class='add'>+		reg_w(gspca_dev, 0xb48e);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -849,99 +1105,6 @@ static int sd_getlowlight(struct gspca_dev *gspca_dev, __s32 *val)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void sd_start(struct gspca_dev *gspca_dev)</div><div class='del'>-{</div><div class='del'>-	int mode;</div><div class='del'>-</div><div class='del'>-	static const __u8 t1[] = { 0x66, 0x00, 0xa8, 0xe8 };</div><div class='del'>-	__u8 t2[] = { 0x07, 0x00, 0x0d, 0x60, 0x0e, 0x80 };</div><div class='del'>-	static const __u8 t3[] =</div><div class='del'>-		{ 0xb3, 0x07, 0xb4, 0x00, 0xb5, 0x88, 0xb6, 0x02, 0xb7, 0x06,</div><div class='del'>-		  0xb8, 0x00, 0xb9, 0xe7, 0xba, 0x01 };</div><div class='del'>-	static const __u8 t4[] = { 0x0b, 0x04, 0x0a, 0x40 };</div><div class='del'>-</div><div class='del'>-	mode = gspca_dev-&gt;cam.cam_mode[(int) gspca_dev-&gt;curr_mode]. priv;</div><div class='del'>-	switch (mode) {</div><div class='del'>-	case 1:		/* 352x288 */</div><div class='del'>-		t2[1] = 0x40;</div><div class='del'>-		break;</div><div class='del'>-	case 2:		/* 320x240 */</div><div class='del'>-		t2[1] = 0x10;</div><div class='del'>-		break;</div><div class='del'>-	case 3:		/* 176x144 */</div><div class='del'>-		t2[1] = 0x50;</div><div class='del'>-		break;</div><div class='del'>-	case 4:		/* 160x120 */</div><div class='del'>-		t2[1] = 0x20;</div><div class='del'>-		break;</div><div class='del'>-	default:	/* 640x480 (0x00) */</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	reg_w(gspca_dev, 0x01, 0x0000, tas5130a_sensor_init[0], 0x8);</div><div class='del'>-	reg_w(gspca_dev, 0x01, 0x0000, tas5130a_sensor_init[1], 0x8);</div><div class='del'>-	reg_w(gspca_dev, 0x01, 0x0000, tas5130a_sensor_init[2], 0x8);</div><div class='del'>-	reg_w(gspca_dev, 0x01, 0x0000, tas5130a_sensor_init[3], 0x8);</div><div class='del'>-	reg_w(gspca_dev, 0x00, 0x3c80, NULL, 0);</div><div class='del'>-		/* just in case and to keep sync with logs  (for mine) */</div><div class='del'>-	reg_w(gspca_dev, 0x01, 0x0000, tas5130a_sensor_init[3], 0x8);</div><div class='del'>-	reg_w(gspca_dev, 0x00, 0x3c80, NULL, 0);</div><div class='del'>-		/* just in case and to keep sync with logs  (for mine) */</div><div class='del'>-	reg_w(gspca_dev, 0x01, 0x0000, t1, 4);</div><div class='del'>-	reg_w(gspca_dev, 0x01, 0x0000, t2, 6);</div><div class='del'>-	reg_r_1(gspca_dev, 0x0012);</div><div class='del'>-	reg_w(gspca_dev, 0x01, 0x0000, t3, 0x10);</div><div class='del'>-	reg_w(gspca_dev, 0x00, 0x0013, NULL, 0);</div><div class='del'>-	reg_w(gspca_dev, 0x01, 0x0000, t4, 0x4);</div><div class='del'>-	/* restart on each start, just in case, sometimes regs goes wrong</div><div class='del'>-	 * when using controls from app */</div><div class='del'>-	setbrightness(gspca_dev);</div><div class='del'>-	setcontrast(gspca_dev);</div><div class='del'>-	setcolors(gspca_dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void sd_pkt_scan(struct gspca_dev *gspca_dev,</div><div class='del'>-			struct gspca_frame *frame,	/* target */</div><div class='del'>-			__u8 *data,			/* isoc packet */</div><div class='del'>-			int len)			/* iso packet length */</div><div class='del'>-{</div><div class='del'>-	int sof = 0;</div><div class='del'>-	static __u8 ffd9[] = { 0xff, 0xd9 };</div><div class='del'>-</div><div class='del'>-	if (data[0] == 0x5a) {</div><div class='del'>-		/* Control Packet, after this came the header again,</div><div class='del'>-		 * but extra bytes came in the packet before this,</div><div class='del'>-		 * sometimes an EOF arrives, sometimes not... */</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (data[len - 1] == 0xff &amp;&amp; data[len] == 0xd9) {</div><div class='del'>-		/* Just in case, i have seen packets with the marker,</div><div class='del'>-		 * other's do not include it... */</div><div class='del'>-		data += 2;</div><div class='del'>-		len -= 4;</div><div class='del'>-	} else if (data[2] == 0xff &amp;&amp; data[3] == 0xd8) {</div><div class='del'>-		sof = 1;</div><div class='del'>-		data += 2;</div><div class='del'>-		len -= 2;</div><div class='del'>-	} else {</div><div class='del'>-		data += 2;</div><div class='del'>-		len -= 2;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (sof) {</div><div class='del'>-		/* extra bytes....., could be processed too but would be</div><div class='del'>-		 * a waste of time, right now leave the application and</div><div class='del'>-		 * libjpeg do it for ourserlves.. */</div><div class='del'>-		frame = gspca_frame_add(gspca_dev, LAST_PACKET, frame,</div><div class='del'>-					ffd9, 2);</div><div class='del'>-		gspca_frame_add(gspca_dev, FIRST_PACKET, frame, data, len);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gspca_frame_add(gspca_dev, INTER_PACKET, frame, data, len);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int sd_querymenu(struct gspca_dev *gspca_dev,</div><div class='ctx'> 			struct v4l2_querymenu *menu)</div><div class='ctx'> {</div><div class='hunk'>@@ -975,6 +1138,7 @@ static const struct sd_desc sd_desc = {</div><div class='ctx'> 	.config = sd_config,</div><div class='ctx'> 	.init = sd_init,</div><div class='ctx'> 	.start = sd_start,</div><div class='add'>+	.stopN = sd_stopN,</div><div class='ctx'> 	.pkt_scan = sd_pkt_scan,</div><div class='ctx'> 	.querymenu = sd_querymenu,</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/media/video/gspca/tv8532.c b/drivers/media/video/gspca/tv8532.c<br/>index 084af05302a0..968a5911704f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/gspca/tv8532.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/gspca/tv8532.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/gspca/tv8532.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/tv8532.c</a></div><div class='hunk'>@@ -390,7 +390,7 @@ static void setbrightness(struct gspca_dev *gspca_dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* -- start the camera -- */</div><div class='del'>-static void sd_start(struct gspca_dev *gspca_dev)</div><div class='add'>+static int sd_start(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='ctx'> 	reg_w_1(gspca_dev, TV8532_AD_SLOPE, 0x32);</div><div class='ctx'> 	reg_w_1(gspca_dev, TV8532_AD_BITCTRL, 0x00);</div><div class='hunk'>@@ -443,6 +443,7 @@ static void sd_start(struct gspca_dev *gspca_dev)</div><div class='ctx'> 	/************************************************/</div><div class='ctx'> 	tv_8532_PollReg(gspca_dev);</div><div class='ctx'> 	reg_w_1(gspca_dev, TV8532_UDP_UPDATE, 0x00);	/* 0x31 */</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sd_stopN(struct gspca_dev *gspca_dev)</div><div class='head'>diff --git a/drivers/media/video/gspca/vc032x.c b/drivers/media/video/gspca/vc032x.c<br/>index bd4c226c9a07..be46d9232540 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/gspca/vc032x.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/gspca/vc032x.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/gspca/vc032x.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/vc032x.c</a></div><div class='hunk'>@@ -80,7 +80,6 @@ static struct ctrl sd_ctrls[] = {</div><div class='ctx'> 		.step    = 1,</div><div class='ctx'> #define FREQ_DEF 1</div><div class='ctx'> 		.default_value = FREQ_DEF,</div><div class='del'>-		.default_value = 1,</div><div class='ctx'> 	    },</div><div class='ctx'> 	    .set = sd_setfreq,</div><div class='ctx'> 	    .get = sd_getfreq,</div><div class='hunk'>@@ -1502,7 +1501,7 @@ static void setlightfreq(struct gspca_dev *gspca_dev)</div><div class='ctx'> 	usb_exchange(gspca_dev, ov7660_freq_tb[sd-&gt;lightfreq]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void sd_start(struct gspca_dev *gspca_dev)</div><div class='add'>+static int sd_start(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct sd *sd = (struct sd *) gspca_dev;</div><div class='ctx'> 	const __u8 *GammaT = NULL;</div><div class='hunk'>@@ -1586,7 +1585,7 @@ static void sd_start(struct gspca_dev *gspca_dev)</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		PDEBUG(D_PROBE, "Damned !! no sensor found Bye");</div><div class='del'>-		return;</div><div class='add'>+		return -EMEDIUMTYPE;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (GammaT &amp;&amp; MatrixT) {</div><div class='ctx'> 		put_tab_to_reg(gspca_dev, GammaT, 17, 0xb84a);</div><div class='hunk'>@@ -1622,6 +1621,7 @@ static void sd_start(struct gspca_dev *gspca_dev)</div><div class='ctx'> 		setautogain(gspca_dev);</div><div class='ctx'> 		setlightfreq(gspca_dev);</div><div class='ctx'> 	}</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sd_stopN(struct gspca_dev *gspca_dev)</div><div class='head'>diff --git a/drivers/media/video/gspca/zc3xx.c b/drivers/media/video/gspca/zc3xx.c<br/>index d61ef727e0c2..d0a4451dc46f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/gspca/zc3xx.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/gspca/zc3xx.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/gspca/zc3xx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/gspca/zc3xx.c</a></div><div class='hunk'>@@ -7178,7 +7178,7 @@ static int sd_init(struct gspca_dev *gspca_dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void sd_start(struct gspca_dev *gspca_dev)</div><div class='add'>+static int sd_start(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct sd *sd = (struct sd *) gspca_dev;</div><div class='ctx'> 	struct usb_device *dev = gspca_dev-&gt;dev;</div><div class='hunk'>@@ -7331,6 +7331,7 @@ static void sd_start(struct gspca_dev *gspca_dev)</div><div class='ctx'> 		reg_w(dev, 0x02, 0x0008);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sd_stop0(struct gspca_dev *gspca_dev)</div><div class='head'>diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c<br/>index a30254bed311..efe849981ab7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/ir-kbd-i2c.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/ir-kbd-i2c.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/ir-kbd-i2c.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/ir-kbd-i2c.c</a></div><div class='hunk'>@@ -12,6 +12,10 @@</div><div class='ctx'>  *      Markus Rechberger &lt;mrechberger@gmail.com&gt;</div><div class='ctx'>  * modified for DViCO Fusion HDTV 5 RT GOLD by</div><div class='ctx'>  *      Chaogui Zhang &lt;czhang1974@gmail.com&gt;</div><div class='add'>+ * modified for MSI TV@nywhere Plus by</div><div class='add'>+ *      Henry Wong &lt;henry@stuffedcow.net&gt;</div><div class='add'>+ *      Mark Schultz &lt;n9xmj@yahoo.com&gt;</div><div class='add'>+ *      Brian Rogers &lt;brian_rogers@comcast.net&gt;</div><div class='ctx'>  *</div><div class='ctx'>  *  This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  *  it under the terms of the GNU General Public License as published by</div><div class='hunk'>@@ -65,7 +69,7 @@ static int get_key_haup_common(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw,</div><div class='ctx'> 			       int size, int offset)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char buf[6];</div><div class='del'>-	int start, range, toggle, dev, code;</div><div class='add'>+	int start, range, toggle, dev, code, ircode;</div><div class='ctx'> </div><div class='ctx'> 	/* poll IR chip */</div><div class='ctx'> 	if (size != i2c_master_recv(&amp;ir-&gt;c,buf,size))</div><div class='hunk'>@@ -85,6 +89,24 @@ static int get_key_haup_common(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw,</div><div class='ctx'> 	if (!start)</div><div class='ctx'> 		/* no key pressed */</div><div class='ctx'> 		return 0;</div><div class='add'>+	/*</div><div class='add'>+	 * Hauppauge remotes (black/silver) always use</div><div class='add'>+	 * specific device ids. If we do not filter the</div><div class='add'>+	 * device ids then messages destined for devices</div><div class='add'>+	 * such as TVs (id=0) will get through causing</div><div class='add'>+	 * mis-fired events.</div><div class='add'>+	 *</div><div class='add'>+	 * We also filter out invalid key presses which</div><div class='add'>+	 * produce annoying debug log entries.</div><div class='add'>+	 */</div><div class='add'>+	ircode= (start &lt;&lt; 12) | (toggle &lt;&lt; 11) | (dev &lt;&lt; 6) | code;</div><div class='add'>+	if ((ircode &amp; 0x1fff)==0x1fff)</div><div class='add'>+		/* invalid key press */</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (dev!=0x1e &amp;&amp; dev!=0x1f)</div><div class='add'>+		/* not a hauppauge remote */</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!range)</div><div class='ctx'> 		code += 64;</div><div class='hunk'>@@ -94,7 +116,7 @@ static int get_key_haup_common(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw,</div><div class='ctx'> </div><div class='ctx'> 	/* return key */</div><div class='ctx'> 	*ir_key = code;</div><div class='del'>-	*ir_raw = (start &lt;&lt; 12) | (toggle &lt;&lt; 11) | (dev &lt;&lt; 6) | code;</div><div class='add'>+	*ir_raw = ircode;</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -224,9 +246,15 @@ static void ir_timer(unsigned long data)</div><div class='ctx'> static void ir_work(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	struct IR_i2c *ir = container_of(work, struct IR_i2c, work);</div><div class='add'>+	int polling_interval = 100;</div><div class='add'>+</div><div class='add'>+	/* MSI TV@nywhere Plus requires more frequent polling</div><div class='add'>+	   otherwise it will miss some keypresses */</div><div class='add'>+	if (ir-&gt;c.adapter-&gt;id == I2C_HW_SAA7134 &amp;&amp; ir-&gt;c.addr == 0x30)</div><div class='add'>+		polling_interval = 50;</div><div class='ctx'> </div><div class='ctx'> 	ir_key_poll(ir);</div><div class='del'>-	mod_timer(&amp;ir-&gt;timer, jiffies + msecs_to_jiffies(100));</div><div class='add'>+	mod_timer(&amp;ir-&gt;timer, jiffies + msecs_to_jiffies(polling_interval));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* ----------------------------------------------------------------------- */</div><div class='hunk'>@@ -465,9 +493,37 @@ static int ir_probe(struct i2c_adapter *adap)</div><div class='ctx'> 			(1 == rc) ? "yes" : "no");</div><div class='ctx'> 		if (1 == rc) {</div><div class='ctx'> 			ir_attach(adap, probe[i], 0, 0);</div><div class='del'>-			break;</div><div class='add'>+			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	/* Special case for MSI TV@nywhere Plus remote */</div><div class='add'>+	if (adap-&gt;id == I2C_HW_SAA7134) {</div><div class='add'>+		u8 temp;</div><div class='add'>+</div><div class='add'>+		/* MSI TV@nywhere Plus controller doesn't seem to</div><div class='add'>+		   respond to probes unless we read something from</div><div class='add'>+		   an existing device. Weird... */</div><div class='add'>+</div><div class='add'>+		msg.addr = 0x50;</div><div class='add'>+		rc = i2c_transfer(adap, &amp;msg, 1);</div><div class='add'>+			dprintk(1, "probe 0x%02x @ %s: %s\n",</div><div class='add'>+			msg.addr, adap-&gt;name,</div><div class='add'>+			(1 == rc) ? "yes" : "no");</div><div class='add'>+</div><div class='add'>+		/* Now do the probe. The controller does not respond</div><div class='add'>+		   to 0-byte reads, so we use a 1-byte read instead. */</div><div class='add'>+		msg.addr = 0x30;</div><div class='add'>+		msg.len = 1;</div><div class='add'>+		msg.buf = &amp;temp;</div><div class='add'>+		rc = i2c_transfer(adap, &amp;msg, 1);</div><div class='add'>+		dprintk(1, "probe 0x%02x @ %s: %s\n",</div><div class='add'>+			msg.addr, adap-&gt;name,</div><div class='add'>+			(1 == rc) ? "yes" : "no");</div><div class='add'>+		if (1 == rc)</div><div class='add'>+			ir_attach(adap, msg.addr, 0, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/ivtv/ivtv-cards.h b/drivers/media/video/ivtv/ivtv-cards.h<br/>index 381af1bceef8..0b8fe85fb697 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/ivtv/ivtv-cards.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/ivtv/ivtv-cards.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/ivtv/ivtv-cards.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/ivtv/ivtv-cards.h</a></div><div class='hunk'>@@ -154,7 +154,7 @@</div><div class='ctx'> #define IVTV_CAP_ENCODER (V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_TUNER | \</div><div class='ctx'> 			  V4L2_CAP_AUDIO | V4L2_CAP_READWRITE | V4L2_CAP_VBI_CAPTURE | \</div><div class='ctx'> 			  V4L2_CAP_SLICED_VBI_CAPTURE)</div><div class='del'>-#define IVTV_CAP_DECODER (V4L2_CAP_VBI_OUTPUT | V4L2_CAP_VIDEO_OUTPUT | \</div><div class='add'>+#define IVTV_CAP_DECODER (V4L2_CAP_VIDEO_OUTPUT | \</div><div class='ctx'> 			  V4L2_CAP_SLICED_VBI_OUTPUT | V4L2_CAP_VIDEO_OUTPUT_OVERLAY)</div><div class='ctx'> </div><div class='ctx'> struct ivtv_card_video_input {</div><div class='head'>diff --git a/drivers/media/video/ivtv/ivtv-driver.c b/drivers/media/video/ivtv/ivtv-driver.c<br/>index 4afc7ea07e86..aeaa13f6cb36 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/ivtv/ivtv-driver.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/ivtv/ivtv-driver.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/ivtv/ivtv-driver.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/ivtv/ivtv-driver.c</a></div><div class='hunk'>@@ -61,14 +61,14 @@</div><div class='ctx'> #include "tuner-xc2028.h"</div><div class='ctx'> </div><div class='ctx'> /* var to keep track of the number of array elements in use */</div><div class='del'>-int ivtv_cards_active = 0;</div><div class='add'>+int ivtv_cards_active;</div><div class='ctx'> </div><div class='ctx'> /* If you have already X v4l cards, then set this to X. This way</div><div class='ctx'>    the device numbers stay matched. Example: you have a WinTV card</div><div class='ctx'>    without radio and a PVR-350 with. Normally this would give a</div><div class='ctx'>    video1 device together with a radio0 device for the PVR. By</div><div class='ctx'>    setting this to 1 you ensure that radio0 is now also radio1. */</div><div class='del'>-int ivtv_first_minor = 0;</div><div class='add'>+int ivtv_first_minor;</div><div class='ctx'> </div><div class='ctx'> /* Master variable for all ivtv info */</div><div class='ctx'> struct ivtv *ivtv_cards[IVTV_MAX_CARDS];</div><div class='hunk'>@@ -251,7 +251,7 @@ MODULE_PARM_DESC(newi2c,</div><div class='ctx'> 		 "\t\t\t-1 is autodetect, 0 is off, 1 is on\n"</div><div class='ctx'> 		 "\t\t\tDefault is autodetect");</div><div class='ctx'> </div><div class='del'>-MODULE_PARM_DESC(ivtv_first_minor, "Set minor assigned to first card");</div><div class='add'>+MODULE_PARM_DESC(ivtv_first_minor, "Set kernel number assigned to first card");</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Kevin Thayer, Chris Kennedy, Hans Verkuil");</div><div class='ctx'> MODULE_DESCRIPTION("CX23415/CX23416 driver");</div><div class='hunk'>@@ -655,9 +655,9 @@ done:</div><div class='ctx'> </div><div class='ctx'> 	if (itv-&gt;card == NULL) {</div><div class='ctx'> 		itv-&gt;card = ivtv_get_card(IVTV_CARD_PVR_150);</div><div class='del'>-		IVTV_ERR("Unknown card: vendor/device: %04x/%04x\n",</div><div class='add'>+		IVTV_ERR("Unknown card: vendor/device: [%04x:%04x]\n",</div><div class='ctx'> 		     itv-&gt;dev-&gt;vendor, itv-&gt;dev-&gt;device);</div><div class='del'>-		IVTV_ERR("              subsystem vendor/device: %04x/%04x\n",</div><div class='add'>+		IVTV_ERR("              subsystem vendor/device: [%04x:%04x]\n",</div><div class='ctx'> 		     itv-&gt;dev-&gt;subsystem_vendor, itv-&gt;dev-&gt;subsystem_device);</div><div class='ctx'> 		IVTV_ERR("              %s based\n", chipname);</div><div class='ctx'> 		IVTV_ERR("Defaulting to %s card\n", itv-&gt;card-&gt;name);</div><div class='hunk'>@@ -720,7 +720,7 @@ static int __devinit ivtv_init_struct1(struct ivtv *itv)</div><div class='ctx'> 	itv-&gt;speed = 1000;</div><div class='ctx'> </div><div class='ctx'> 	/* VBI */</div><div class='del'>-	itv-&gt;vbi.in.type = V4L2_BUF_TYPE_SLICED_VBI_CAPTURE;</div><div class='add'>+	itv-&gt;vbi.in.type = V4L2_BUF_TYPE_VBI_CAPTURE;</div><div class='ctx'> 	itv-&gt;vbi.sliced_in = &amp;itv-&gt;vbi.in.fmt.sliced;</div><div class='ctx'> </div><div class='ctx'> 	/* Init the sg table for osd/yuv output */</div><div class='head'>diff --git a/drivers/media/video/ivtv/ivtv-driver.h b/drivers/media/video/ivtv/ivtv-driver.h<br/>index 2ceb5227637c..bc29436e8a3c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/ivtv/ivtv-driver.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/ivtv/ivtv-driver.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/ivtv/ivtv-driver.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/ivtv/ivtv-driver.h</a></div><div class='hunk'>@@ -49,7 +49,6 @@</div><div class='ctx'> #include &lt;linux/i2c-algo-bit.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/unistd.h&gt;</div><div class='del'>-#include &lt;linux/byteorder/swab.h&gt;</div><div class='ctx'> #include &lt;linux/pagemap.h&gt;</div><div class='ctx'> #include &lt;linux/scatterlist.h&gt;</div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='hunk'>@@ -507,6 +506,8 @@ struct yuv_playback_info</div><div class='ctx'> 	struct v4l2_rect main_rect;</div><div class='ctx'> 	u32 v4l2_src_w;</div><div class='ctx'> 	u32 v4l2_src_h;</div><div class='add'>+</div><div class='add'>+	u8 running; /* Have any frames been displayed */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define IVTV_VBI_FRAMES 32</div><div class='hunk'>@@ -751,6 +752,12 @@ void ivtv_read_eeprom(struct ivtv *itv, struct tveeprom *tv);</div><div class='ctx'> /* First-open initialization: load firmware, init cx25840, etc. */</div><div class='ctx'> int ivtv_init_on_first_open(struct ivtv *itv);</div><div class='ctx'> </div><div class='add'>+/* Test if the current VBI mode is raw (1) or sliced (0) */</div><div class='add'>+static inline int ivtv_raw_vbi(const struct ivtv *itv)</div><div class='add'>+{</div><div class='add'>+	return itv-&gt;vbi.in.type == V4L2_BUF_TYPE_VBI_CAPTURE;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* This is a PCI post thing, where if the pci register is not read, then</div><div class='ctx'>    the write doesn't always take effect right away. By reading back the</div><div class='ctx'>    register any pending PCI writes will be performed (in order), and so</div><div class='head'>diff --git a/drivers/media/video/ivtv/ivtv-fileops.c b/drivers/media/video/ivtv/ivtv-fileops.c<br/>index 7ec5c99f9ad1..1c404e454a36 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/ivtv/ivtv-fileops.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/ivtv/ivtv-fileops.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/ivtv/ivtv-fileops.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/ivtv/ivtv-fileops.c</a></div><div class='hunk'>@@ -39,7 +39,7 @@</div><div class='ctx'>    associated VBI streams are also automatically claimed.</div><div class='ctx'>    Possible error returns: -EBUSY if someone else has claimed</div><div class='ctx'>    the stream or 0 on success. */</div><div class='del'>-int ivtv_claim_stream(struct ivtv_open_id *id, int type)</div><div class='add'>+static int ivtv_claim_stream(struct ivtv_open_id *id, int type)</div><div class='ctx'> {</div><div class='ctx'> 	struct ivtv *itv = id-&gt;itv;</div><div class='ctx'> 	struct ivtv_stream *s = &amp;itv-&gt;streams[type];</div><div class='hunk'>@@ -78,7 +78,7 @@ int ivtv_claim_stream(struct ivtv_open_id *id, int type)</div><div class='ctx'> 	if (type == IVTV_DEC_STREAM_TYPE_MPG) {</div><div class='ctx'> 		vbi_type = IVTV_DEC_STREAM_TYPE_VBI;</div><div class='ctx'> 	} else if (type == IVTV_ENC_STREAM_TYPE_MPG &amp;&amp;</div><div class='del'>-		   itv-&gt;vbi.insert_mpeg &amp;&amp; itv-&gt;vbi.sliced_in-&gt;service_set) {</div><div class='add'>+		   itv-&gt;vbi.insert_mpeg &amp;&amp; !ivtv_raw_vbi(itv)) {</div><div class='ctx'> 		vbi_type = IVTV_ENC_STREAM_TYPE_VBI;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -305,7 +305,7 @@ static size_t ivtv_copy_buf_to_user(struct ivtv_stream *s, struct ivtv_buffer *b</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt; ucount) len = ucount;</div><div class='ctx'> 	if (itv-&gt;vbi.insert_mpeg &amp;&amp; s-&gt;type == IVTV_ENC_STREAM_TYPE_MPG &amp;&amp;</div><div class='del'>-	    itv-&gt;vbi.sliced_in-&gt;service_set &amp;&amp; buf != &amp;itv-&gt;vbi.sliced_mpeg_buf) {</div><div class='add'>+	    !ivtv_raw_vbi(itv) &amp;&amp; buf != &amp;itv-&gt;vbi.sliced_mpeg_buf) {</div><div class='ctx'> 		const char *start = buf-&gt;buf + buf-&gt;readpos;</div><div class='ctx'> 		const char *p = start + 1;</div><div class='ctx'> 		const u8 *q;</div><div class='hunk'>@@ -372,7 +372,7 @@ static ssize_t ivtv_read(struct ivtv_stream *s, char __user *ubuf, size_t tot_co</div><div class='ctx'> 	/* Each VBI buffer is one frame, the v4l2 API says that for VBI the frames should</div><div class='ctx'> 	   arrive one-by-one, so make sure we never output more than one VBI frame at a time */</div><div class='ctx'> 	if (s-&gt;type == IVTV_DEC_STREAM_TYPE_VBI ||</div><div class='del'>-			(s-&gt;type == IVTV_ENC_STREAM_TYPE_VBI &amp;&amp; itv-&gt;vbi.sliced_in-&gt;service_set))</div><div class='add'>+	    (s-&gt;type == IVTV_ENC_STREAM_TYPE_VBI &amp;&amp; !ivtv_raw_vbi(itv)))</div><div class='ctx'> 		single_frame = 1;</div><div class='ctx'> </div><div class='ctx'> 	for (;;) {</div><div class='hunk'>@@ -600,13 +600,14 @@ retry:</div><div class='ctx'> 	since we may get here before the stream has been fully set-up */</div><div class='ctx'> 	if (mode == OUT_YUV &amp;&amp; s-&gt;q_full.length == 0 &amp;&amp; itv-&gt;dma_data_req_size) {</div><div class='ctx'> 		while (count &gt;= itv-&gt;dma_data_req_size) {</div><div class='del'>-			if (!ivtv_yuv_udma_stream_frame (itv, (void __user *)user_buf)) {</div><div class='del'>-				bytes_written += itv-&gt;dma_data_req_size;</div><div class='del'>-				user_buf += itv-&gt;dma_data_req_size;</div><div class='del'>-				count -= itv-&gt;dma_data_req_size;</div><div class='del'>-			} else {</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='add'>+			rc = ivtv_yuv_udma_stream_frame(itv, (void __user *)user_buf);</div><div class='add'>+</div><div class='add'>+			if (rc &lt; 0)</div><div class='add'>+				return rc;</div><div class='add'>+</div><div class='add'>+			bytes_written += itv-&gt;dma_data_req_size;</div><div class='add'>+			user_buf += itv-&gt;dma_data_req_size;</div><div class='add'>+			count -= itv-&gt;dma_data_req_size;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (count == 0) {</div><div class='ctx'> 			IVTV_DEBUG_HI_FILE("Wrote %d bytes to %s (%d)\n", bytes_written, s-&gt;name, s-&gt;q_full.bytesused);</div><div class='head'>diff --git a/drivers/media/video/ivtv/ivtv-fileops.h b/drivers/media/video/ivtv/ivtv-fileops.h<br/>index 2c8d5186c9c3..df81e790147f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/ivtv/ivtv-fileops.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/ivtv/ivtv-fileops.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/ivtv/ivtv-fileops.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/ivtv/ivtv-fileops.h</a></div><div class='hunk'>@@ -38,11 +38,6 @@ void ivtv_unmute(struct ivtv *itv);</div><div class='ctx'> </div><div class='ctx'> /* Utilities */</div><div class='ctx'> </div><div class='del'>-/* Try to claim a stream for the filehandle. Return 0 on success,</div><div class='del'>-   -EBUSY if stream already claimed. Once a stream is claimed, it</div><div class='del'>-   remains claimed until the associated filehandle is closed. */</div><div class='del'>-int ivtv_claim_stream(struct ivtv_open_id *id, int type);</div><div class='del'>-</div><div class='ctx'> /* Release a previously claimed stream. */</div><div class='ctx'> void ivtv_release_stream(struct ivtv_stream *s);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/ivtv/ivtv-gpio.c b/drivers/media/video/ivtv/ivtv-gpio.c<br/>index bc22905ea20f..74a44844ccaf 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/ivtv/ivtv-gpio.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/ivtv/ivtv-gpio.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/ivtv/ivtv-gpio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/ivtv/ivtv-gpio.c</a></div><div class='hunk'>@@ -124,7 +124,7 @@ void ivtv_reset_ir_gpio(struct ivtv *itv)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Xceive tuner reset function */</div><div class='del'>-int ivtv_reset_tuner_gpio(void *dev, int cmd, int value)</div><div class='add'>+int ivtv_reset_tuner_gpio(void *dev, int component, int cmd, int value)</div><div class='ctx'> {</div><div class='ctx'> 	struct i2c_algo_bit_data *algo = dev;</div><div class='ctx'> 	struct ivtv *itv = algo-&gt;data;</div><div class='head'>diff --git a/drivers/media/video/ivtv/ivtv-gpio.h b/drivers/media/video/ivtv/ivtv-gpio.h<br/>index 964a265d91a9..48b6291613a2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/ivtv/ivtv-gpio.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/ivtv/ivtv-gpio.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/ivtv/ivtv-gpio.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/ivtv/ivtv-gpio.h</a></div><div class='hunk'>@@ -24,7 +24,7 @@</div><div class='ctx'> /* GPIO stuff */</div><div class='ctx'> void ivtv_gpio_init(struct ivtv *itv);</div><div class='ctx'> void ivtv_reset_ir_gpio(struct ivtv *itv);</div><div class='del'>-int ivtv_reset_tuner_gpio(void *dev, int cmd, int value);</div><div class='add'>+int ivtv_reset_tuner_gpio(void *dev, int component, int cmd, int value);</div><div class='ctx'> int ivtv_gpio(struct ivtv *itv, unsigned int command, void *arg);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/media/video/ivtv/ivtv-i2c.c b/drivers/media/video/ivtv/ivtv-i2c.c<br/>index af154238fb9a..24700c211d52 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/ivtv/ivtv-i2c.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/ivtv/ivtv-i2c.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/ivtv/ivtv-i2c.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/ivtv/ivtv-i2c.c</a></div><div class='hunk'>@@ -64,8 +64,6 @@</div><div class='ctx'> #include "ivtv-gpio.h"</div><div class='ctx'> #include "ivtv-i2c.h"</div><div class='ctx'> </div><div class='del'>-#include &lt;media/ir-kbd-i2c.h&gt;</div><div class='del'>-</div><div class='ctx'> /* i2c implementation for cx23415/6 chip, ivtv project.</div><div class='ctx'>  * Author: Kevin Thayer (nufan_wfk at yahoo.com)</div><div class='ctx'>  */</div><div class='head'>diff --git a/drivers/media/video/ivtv/ivtv-ioctl.c b/drivers/media/video/ivtv/ivtv-ioctl.c<br/>index 61030309d0ad..208fb54842f2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/ivtv/ivtv-ioctl.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/ivtv/ivtv-ioctl.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/ivtv/ivtv-ioctl.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/ivtv/ivtv-ioctl.c</a></div><div class='hunk'>@@ -101,18 +101,15 @@ void ivtv_expand_service_set(struct v4l2_sliced_vbi_format *fmt, int is_pal)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int check_service_set(struct v4l2_sliced_vbi_format *fmt, int is_pal)</div><div class='add'>+static void check_service_set(struct v4l2_sliced_vbi_format *fmt, int is_pal)</div><div class='ctx'> {</div><div class='ctx'> 	int f, l;</div><div class='del'>-	u16 set = 0;</div><div class='ctx'> </div><div class='ctx'> 	for (f = 0; f &lt; 2; f++) {</div><div class='ctx'> 		for (l = 0; l &lt; 24; l++) {</div><div class='ctx'> 			fmt-&gt;service_lines[f][l] = select_service_from_set(f, l, fmt-&gt;service_lines[f][l], is_pal);</div><div class='del'>-			set |= fmt-&gt;service_lines[f][l];</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	return set != 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> u16 ivtv_get_service_set(struct v4l2_sliced_vbi_format *fmt)</div><div class='hunk'>@@ -474,7 +471,7 @@ static int ivtv_try_fmt_vid_cap(struct file *file, void *fh, struct v4l2_format</div><div class='ctx'> 	int h = fmt-&gt;fmt.pix.height;</div><div class='ctx'> </div><div class='ctx'> 	w = min(w, 720);</div><div class='del'>-	w = max(w, 1);</div><div class='add'>+	w = max(w, 2);</div><div class='ctx'> 	h = min(h, itv-&gt;is_50hz ? 576 : 480);</div><div class='ctx'> 	h = max(h, 2);</div><div class='ctx'> 	ivtv_g_fmt_vid_cap(file, fh, fmt);</div><div class='hunk'>@@ -512,27 +509,34 @@ static int ivtv_try_fmt_sliced_vbi_cap(struct file *file, void *fh, struct v4l2_</div><div class='ctx'> static int ivtv_try_fmt_vid_out(struct file *file, void *fh, struct v4l2_format *fmt)</div><div class='ctx'> {</div><div class='ctx'> 	struct ivtv_open_id *id = fh;</div><div class='del'>-	s32 w, h;</div><div class='del'>-	int field;</div><div class='del'>-	int ret;</div><div class='add'>+	s32 w = fmt-&gt;fmt.pix.width;</div><div class='add'>+	s32 h = fmt-&gt;fmt.pix.height;</div><div class='add'>+	int field = fmt-&gt;fmt.pix.field;</div><div class='add'>+	int ret = ivtv_g_fmt_vid_out(file, fh, fmt);</div><div class='ctx'> </div><div class='del'>-	w = fmt-&gt;fmt.pix.width;</div><div class='del'>-	h = fmt-&gt;fmt.pix.height;</div><div class='del'>-	field = fmt-&gt;fmt.pix.field;</div><div class='del'>-	ret = ivtv_g_fmt_vid_out(file, fh, fmt);</div><div class='add'>+	w = min(w, 720);</div><div class='add'>+	w = max(w, 2);</div><div class='add'>+	/* Why can the height be 576 even when the output is NTSC?</div><div class='add'>+</div><div class='add'>+	   Internally the buffers of the PVR350 are always set to 720x576. The</div><div class='add'>+	   decoded video frame will always be placed in the top left corner of</div><div class='add'>+	   this buffer. For any video which is not 720x576, the buffer will</div><div class='add'>+	   then be cropped to remove the unused right and lower areas, with</div><div class='add'>+	   the remaining image being scaled by the hardware to fit the display</div><div class='add'>+	   area. The video can be scaled both up and down, so a 720x480 video</div><div class='add'>+	   can be displayed full-screen on PAL and a 720x576 video can be</div><div class='add'>+	   displayed without cropping on NTSC.</div><div class='add'>+</div><div class='add'>+	   Note that the scaling only occurs on the video stream, the osd</div><div class='add'>+	   resolution is locked to the broadcast standard and not scaled.</div><div class='add'>+</div><div class='add'>+	   Thanks to Ian Armstrong for this explanation. */</div><div class='add'>+	h = min(h, 576);</div><div class='add'>+	h = max(h, 2);</div><div class='add'>+	if (id-&gt;type == IVTV_DEC_STREAM_TYPE_YUV)</div><div class='add'>+		fmt-&gt;fmt.pix.field = field;</div><div class='ctx'> 	fmt-&gt;fmt.pix.width = w;</div><div class='ctx'> 	fmt-&gt;fmt.pix.height = h;</div><div class='del'>-	if (!ret &amp;&amp; id-&gt;type == IVTV_DEC_STREAM_TYPE_YUV) {</div><div class='del'>-		fmt-&gt;fmt.pix.field = field;</div><div class='del'>-		if (fmt-&gt;fmt.pix.width &lt; 2)</div><div class='del'>-			fmt-&gt;fmt.pix.width = 2;</div><div class='del'>-		if (fmt-&gt;fmt.pix.width &gt; 720)</div><div class='del'>-			fmt-&gt;fmt.pix.width = 720;</div><div class='del'>-		if (fmt-&gt;fmt.pix.height &lt; 2)</div><div class='del'>-			fmt-&gt;fmt.pix.height = 2;</div><div class='del'>-		if (fmt-&gt;fmt.pix.height &gt; 576)</div><div class='del'>-			fmt-&gt;fmt.pix.height = 576;</div><div class='del'>-	}</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -560,9 +564,9 @@ static int ivtv_s_fmt_vid_cap(struct file *file, void *fh, struct v4l2_format *f</div><div class='ctx'> 	struct ivtv_open_id *id = fh;</div><div class='ctx'> 	struct ivtv *itv = id-&gt;itv;</div><div class='ctx'> 	struct cx2341x_mpeg_params *p = &amp;itv-&gt;params;</div><div class='add'>+	int ret = ivtv_try_fmt_vid_cap(file, fh, fmt);</div><div class='ctx'> 	int w = fmt-&gt;fmt.pix.width;</div><div class='ctx'> 	int h = fmt-&gt;fmt.pix.height;</div><div class='del'>-	int ret = ivtv_try_fmt_vid_cap(file, fh, fmt);</div><div class='ctx'> </div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -585,8 +589,11 @@ static int ivtv_s_fmt_vbi_cap(struct file *file, void *fh, struct v4l2_format *f</div><div class='ctx'> {</div><div class='ctx'> 	struct ivtv *itv = ((struct ivtv_open_id *)fh)-&gt;itv;</div><div class='ctx'> </div><div class='add'>+	if (!ivtv_raw_vbi(itv) &amp;&amp; atomic_read(&amp;itv-&gt;capturing) &gt; 0)</div><div class='add'>+		return -EBUSY;</div><div class='ctx'> 	itv-&gt;vbi.sliced_in-&gt;service_set = 0;</div><div class='del'>-	itv-&gt;video_dec_func(itv, VIDIOC_S_FMT, &amp;itv-&gt;vbi.in);</div><div class='add'>+	itv-&gt;vbi.in.type = V4L2_BUF_TYPE_VBI_CAPTURE;</div><div class='add'>+	itv-&gt;video_dec_func(itv, VIDIOC_S_FMT, fmt);</div><div class='ctx'> 	return ivtv_g_fmt_vbi_cap(file, fh, fmt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -600,10 +607,10 @@ static int ivtv_s_fmt_sliced_vbi_cap(struct file *file, void *fh, struct v4l2_fo</div><div class='ctx'> 	if (ret || id-&gt;type == IVTV_DEC_STREAM_TYPE_VBI)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	if (check_service_set(vbifmt, itv-&gt;is_50hz) == 0)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	if (atomic_read(&amp;itv-&gt;capturing) &gt; 0)</div><div class='add'>+	check_service_set(vbifmt, itv-&gt;is_50hz);</div><div class='add'>+	if (ivtv_raw_vbi(itv) &amp;&amp; atomic_read(&amp;itv-&gt;capturing) &gt; 0)</div><div class='ctx'> 		return -EBUSY;</div><div class='add'>+	itv-&gt;vbi.in.type = V4L2_BUF_TYPE_SLICED_VBI_CAPTURE;</div><div class='ctx'> 	itv-&gt;video_dec_func(itv, VIDIOC_S_FMT, fmt);</div><div class='ctx'> 	memcpy(itv-&gt;vbi.sliced_in, vbifmt, sizeof(*itv-&gt;vbi.sliced_in));</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -651,8 +658,6 @@ static int ivtv_s_fmt_vid_out(struct file *file, void *fh, struct v4l2_format *f</div><div class='ctx'> 		itv-&gt;dma_data_req_size =</div><div class='ctx'> 			1080 * ((yi-&gt;v4l2_src_h + 31) &amp; ~31);</div><div class='ctx'> </div><div class='del'>-	/* Force update of yuv registers */</div><div class='del'>-	yi-&gt;yuv_forced_update = 1;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -761,7 +766,7 @@ static int ivtv_querycap(struct file *file, void *fh, struct v4l2_capability *vc</div><div class='ctx'> </div><div class='ctx'> 	strlcpy(vcap-&gt;driver, IVTV_DRIVER_NAME, sizeof(vcap-&gt;driver));</div><div class='ctx'> 	strlcpy(vcap-&gt;card, itv-&gt;card_name, sizeof(vcap-&gt;card));</div><div class='del'>-	strlcpy(vcap-&gt;bus_info, pci_name(itv-&gt;dev), sizeof(vcap-&gt;bus_info));</div><div class='add'>+	snprintf(vcap-&gt;bus_info, sizeof(vcap-&gt;bus_info), "PCI:%s", pci_name(itv-&gt;dev));</div><div class='ctx'> 	vcap-&gt;version = IVTV_DRIVER_VERSION; 	    /* version */</div><div class='ctx'> 	vcap-&gt;capabilities = itv-&gt;v4l2_cap; 	    /* capabilities */</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1370,6 +1375,9 @@ static int ivtv_g_fbuf(struct file *file, void *fh, struct v4l2_framebuffer *fb)</div><div class='ctx'> 	if (itv-&gt;osd_global_alpha_state)</div><div class='ctx'> 		fb-&gt;flags |= V4L2_FBUF_FLAG_GLOBAL_ALPHA;</div><div class='ctx'> </div><div class='add'>+	if (yi-&gt;track_osd)</div><div class='add'>+		fb-&gt;flags |= V4L2_FBUF_FLAG_OVERLAY;</div><div class='add'>+</div><div class='ctx'> 	pixfmt &amp;= 7;</div><div class='ctx'> </div><div class='ctx'> 	/* no local alpha for RGB565 or unknown formats */</div><div class='hunk'>@@ -1389,8 +1397,6 @@ static int ivtv_g_fbuf(struct file *file, void *fh, struct v4l2_framebuffer *fb)</div><div class='ctx'> 		else</div><div class='ctx'> 			fb-&gt;flags |= V4L2_FBUF_FLAG_LOCAL_ALPHA;</div><div class='ctx'> 	}</div><div class='del'>-	if (yi-&gt;track_osd)</div><div class='del'>-		fb-&gt;flags |= V4L2_FBUF_FLAG_OVERLAY;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/media/video/ivtv/ivtv-irq.c b/drivers/media/video/ivtv/ivtv-irq.c<br/>index 34f3ab827858..f5d00ec5da73 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/ivtv/ivtv-irq.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/ivtv/ivtv-irq.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/ivtv/ivtv-irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/ivtv/ivtv-irq.c</a></div><div class='hunk'>@@ -753,7 +753,7 @@ static void ivtv_irq_vsync(struct ivtv *itv)</div><div class='ctx'> 	 */</div><div class='ctx'> 	unsigned int frame = read_reg(0x28c0) &amp; 1;</div><div class='ctx'> 	struct yuv_playback_info *yi = &amp;itv-&gt;yuv_info;</div><div class='del'>-	int last_dma_frame = atomic_read(&amp;itv-&gt;yuv_info.next_dma_frame);</div><div class='add'>+	int last_dma_frame = atomic_read(&amp;yi-&gt;next_dma_frame);</div><div class='ctx'> 	struct yuv_frame_info *f = &amp;yi-&gt;new_frame_info[last_dma_frame];</div><div class='ctx'> </div><div class='ctx'> 	if (0) IVTV_DEBUG_IRQ("DEC VSYNC\n");</div><div class='hunk'>@@ -772,6 +772,7 @@ static void ivtv_irq_vsync(struct ivtv *itv)</div><div class='ctx'> 				next_dma_frame = (next_dma_frame + 1) % IVTV_YUV_BUFFERS;</div><div class='ctx'> 				atomic_set(&amp;yi-&gt;next_dma_frame, next_dma_frame);</div><div class='ctx'> 				yi-&gt;fields_lapsed = -1;</div><div class='add'>+				yi-&gt;running = 1;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -804,9 +805,11 @@ static void ivtv_irq_vsync(struct ivtv *itv)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Check if we need to update the yuv registers */</div><div class='del'>-		if ((yi-&gt;yuv_forced_update || f-&gt;update) &amp;&amp; last_dma_frame != -1) {</div><div class='add'>+		if (yi-&gt;running &amp;&amp; (yi-&gt;yuv_forced_update || f-&gt;update)) {</div><div class='ctx'> 			if (!f-&gt;update) {</div><div class='del'>-				last_dma_frame = (u8)(last_dma_frame - 1) % IVTV_YUV_BUFFERS;</div><div class='add'>+				last_dma_frame =</div><div class='add'>+					(u8)(atomic_read(&amp;yi-&gt;next_dma_frame) -</div><div class='add'>+						 1) % IVTV_YUV_BUFFERS;</div><div class='ctx'> 				f = &amp;yi-&gt;new_frame_info[last_dma_frame];</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/ivtv/ivtv-streams.c b/drivers/media/video/ivtv/ivtv-streams.c<br/>index 730e85d86fc8..5bbf31e39304 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/ivtv/ivtv-streams.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/ivtv/ivtv-streams.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/ivtv/ivtv-streams.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/ivtv/ivtv-streams.c</a></div><div class='hunk'>@@ -75,7 +75,7 @@ static const struct file_operations ivtv_v4l2_dec_fops = {</div><div class='ctx'> static struct {</div><div class='ctx'> 	const char *name;</div><div class='ctx'> 	int vfl_type;</div><div class='del'>-	int minor_offset;</div><div class='add'>+	int num_offset;</div><div class='ctx'> 	int dma, pio;</div><div class='ctx'> 	enum v4l2_buf_type buf_type;</div><div class='ctx'> 	const struct file_operations *fops;</div><div class='hunk'>@@ -171,8 +171,8 @@ static void ivtv_stream_init(struct ivtv *itv, int type)</div><div class='ctx'> static int ivtv_prep_dev(struct ivtv *itv, int type)</div><div class='ctx'> {</div><div class='ctx'> 	struct ivtv_stream *s = &amp;itv-&gt;streams[type];</div><div class='del'>-	int minor_offset = ivtv_stream_info[type].minor_offset;</div><div class='del'>-	int minor;</div><div class='add'>+	int num_offset = ivtv_stream_info[type].num_offset;</div><div class='add'>+	int num = itv-&gt;num + ivtv_first_minor + num_offset;</div><div class='ctx'> </div><div class='ctx'> 	/* These four fields are always initialized. If v4l2dev == NULL, then</div><div class='ctx'> 	   this stream is not in use. In that case no other fields but these</div><div class='hunk'>@@ -188,9 +188,6 @@ static int ivtv_prep_dev(struct ivtv *itv, int type)</div><div class='ctx'> 	if (type &gt;= IVTV_DEC_STREAM_TYPE_MPG &amp;&amp; !(itv-&gt;v4l2_cap &amp; V4L2_CAP_VIDEO_OUTPUT))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	/* card number + user defined offset + device offset */</div><div class='del'>-	minor = itv-&gt;num + ivtv_first_minor + minor_offset;</div><div class='del'>-</div><div class='ctx'> 	/* User explicitly selected 0 buffers for these streams, so don't</div><div class='ctx'> 	   create them. */</div><div class='ctx'> 	if (ivtv_stream_info[type].dma != PCI_DMA_NONE &amp;&amp;</div><div class='hunk'>@@ -211,7 +208,7 @@ static int ivtv_prep_dev(struct ivtv *itv, int type)</div><div class='ctx'> 	snprintf(s-&gt;v4l2dev-&gt;name, sizeof(s-&gt;v4l2dev-&gt;name), "ivtv%d %s",</div><div class='ctx'> 			itv-&gt;num, s-&gt;name);</div><div class='ctx'> </div><div class='del'>-	s-&gt;v4l2dev-&gt;minor = minor;</div><div class='add'>+	s-&gt;v4l2dev-&gt;num = num;</div><div class='ctx'> 	s-&gt;v4l2dev-&gt;parent = &amp;itv-&gt;dev-&gt;dev;</div><div class='ctx'> 	s-&gt;v4l2dev-&gt;fops = ivtv_stream_info[type].fops;</div><div class='ctx'> 	s-&gt;v4l2dev-&gt;release = video_device_release;</div><div class='hunk'>@@ -250,39 +247,46 @@ static int ivtv_reg_dev(struct ivtv *itv, int type)</div><div class='ctx'> {</div><div class='ctx'> 	struct ivtv_stream *s = &amp;itv-&gt;streams[type];</div><div class='ctx'> 	int vfl_type = ivtv_stream_info[type].vfl_type;</div><div class='del'>-	int minor;</div><div class='add'>+	int num;</div><div class='ctx'> </div><div class='ctx'> 	if (s-&gt;v4l2dev == NULL)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	minor = s-&gt;v4l2dev-&gt;minor;</div><div class='add'>+	num = s-&gt;v4l2dev-&gt;num;</div><div class='add'>+	/* card number + user defined offset + device offset */</div><div class='add'>+	if (type != IVTV_ENC_STREAM_TYPE_MPG) {</div><div class='add'>+		struct ivtv_stream *s_mpg = &amp;itv-&gt;streams[IVTV_ENC_STREAM_TYPE_MPG];</div><div class='add'>+</div><div class='add'>+		if (s_mpg-&gt;v4l2dev)</div><div class='add'>+			num = s_mpg-&gt;v4l2dev-&gt;num + ivtv_stream_info[type].num_offset;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Register device. First try the desired minor, then any free one. */</div><div class='del'>-	if (video_register_device(s-&gt;v4l2dev, vfl_type, minor) &amp;&amp;</div><div class='del'>-			video_register_device(s-&gt;v4l2dev, vfl_type, -1)) {</div><div class='del'>-		IVTV_ERR("Couldn't register v4l2 device for %s minor %d\n",</div><div class='del'>-				s-&gt;name, minor);</div><div class='add'>+	if (video_register_device(s-&gt;v4l2dev, vfl_type, num)) {</div><div class='add'>+		IVTV_ERR("Couldn't register v4l2 device for %s kernel number %d\n",</div><div class='add'>+				s-&gt;name, num);</div><div class='ctx'> 		video_device_release(s-&gt;v4l2dev);</div><div class='ctx'> 		s-&gt;v4l2dev = NULL;</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='add'>+	num = s-&gt;v4l2dev-&gt;num;</div><div class='ctx'> </div><div class='ctx'> 	switch (vfl_type) {</div><div class='ctx'> 	case VFL_TYPE_GRABBER:</div><div class='ctx'> 		IVTV_INFO("Registered device video%d for %s (%d kB)\n",</div><div class='del'>-			s-&gt;v4l2dev-&gt;minor, s-&gt;name, itv-&gt;options.kilobytes[type]);</div><div class='add'>+			num, s-&gt;name, itv-&gt;options.kilobytes[type]);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case VFL_TYPE_RADIO:</div><div class='ctx'> 		IVTV_INFO("Registered device radio%d for %s\n",</div><div class='del'>-			s-&gt;v4l2dev-&gt;minor - MINOR_VFL_TYPE_RADIO_MIN, s-&gt;name);</div><div class='add'>+			num, s-&gt;name);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case VFL_TYPE_VBI:</div><div class='ctx'> 		if (itv-&gt;options.kilobytes[type])</div><div class='ctx'> 			IVTV_INFO("Registered device vbi%d for %s (%d kB)\n",</div><div class='del'>-				s-&gt;v4l2dev-&gt;minor - MINOR_VFL_TYPE_VBI_MIN,</div><div class='del'>-				s-&gt;name, itv-&gt;options.kilobytes[type]);</div><div class='add'>+				num, s-&gt;name, itv-&gt;options.kilobytes[type]);</div><div class='ctx'> 		else</div><div class='ctx'> 			IVTV_INFO("Registered device vbi%d for %s\n",</div><div class='del'>-				s-&gt;v4l2dev-&gt;minor - MINOR_VFL_TYPE_VBI_MIN, s-&gt;name);</div><div class='add'>+				num, s-&gt;name);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -330,7 +334,7 @@ void ivtv_streams_cleanup(struct ivtv *itv, int unregister)</div><div class='ctx'> </div><div class='ctx'> static void ivtv_vbi_setup(struct ivtv *itv)</div><div class='ctx'> {</div><div class='del'>-	int raw = itv-&gt;vbi.sliced_in-&gt;service_set == 0;</div><div class='add'>+	int raw = ivtv_raw_vbi(itv);</div><div class='ctx'> 	u32 data[CX2341X_MBOX_MAX_DATA];</div><div class='ctx'> 	int lines;</div><div class='ctx'> 	int i;</div><div class='head'>diff --git a/drivers/media/video/ivtv/ivtv-vbi.c b/drivers/media/video/ivtv/ivtv-vbi.c<br/>index 1ce9deb1104f..4a37a7d2e69d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/ivtv/ivtv-vbi.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/ivtv/ivtv-vbi.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/ivtv/ivtv-vbi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/ivtv/ivtv-vbi.c</a></div><div class='hunk'>@@ -334,7 +334,7 @@ void ivtv_process_vbi_data(struct ivtv *itv, struct ivtv_buffer *buf,</div><div class='ctx'> 	int y;</div><div class='ctx'> </div><div class='ctx'> 	/* Raw VBI data */</div><div class='del'>-	if (streamtype == IVTV_ENC_STREAM_TYPE_VBI &amp;&amp; itv-&gt;vbi.sliced_in-&gt;service_set == 0) {</div><div class='add'>+	if (streamtype == IVTV_ENC_STREAM_TYPE_VBI &amp;&amp; ivtv_raw_vbi(itv)) {</div><div class='ctx'> 		u8 type;</div><div class='ctx'> </div><div class='ctx'> 		ivtv_buf_swap(buf);</div><div class='head'>diff --git a/drivers/media/video/ivtv/ivtv-yuv.c b/drivers/media/video/ivtv/ivtv-yuv.c<br/>index 3092ff1d00a0..ee91107376c7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/ivtv/ivtv-yuv.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/ivtv/ivtv-yuv.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/ivtv/ivtv-yuv.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/ivtv/ivtv-yuv.c</a></div><div class='hunk'>@@ -1147,6 +1147,7 @@ void ivtv_yuv_close(struct ivtv *itv)</div><div class='ctx'> 	IVTV_DEBUG_YUV("ivtv_yuv_close\n");</div><div class='ctx'> 	ivtv_waitq(&amp;itv-&gt;vsync_waitq);</div><div class='ctx'> </div><div class='add'>+	yi-&gt;running = 0;</div><div class='ctx'> 	atomic_set(&amp;yi-&gt;next_dma_frame, -1);</div><div class='ctx'> 	atomic_set(&amp;yi-&gt;next_fill_frame, 0);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/ivtv/ivtvfb.c b/drivers/media/video/ivtv/ivtvfb.c<br/>index bdfda48e56bf..8a4a150b12fb 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/ivtv/ivtvfb.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/ivtv/ivtvfb.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/ivtv/ivtvfb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/ivtv/ivtvfb.c</a></div><div class='hunk'>@@ -275,7 +275,6 @@ static int ivtvfb_prep_dec_dma_to_device(struct ivtv *itv,</div><div class='ctx'> 				  int size_in_bytes)</div><div class='ctx'> {</div><div class='ctx'> 	DEFINE_WAIT(wait);</div><div class='del'>-	int ret = 0;</div><div class='ctx'> 	int got_sig = 0;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;itv-&gt;udma.lock);</div><div class='hunk'>@@ -316,7 +315,7 @@ static int ivtvfb_prep_dec_dma_to_device(struct ivtv *itv,</div><div class='ctx'> 		return -EINTR;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ivtvfb_prep_frame(struct ivtv *itv, int cmd, void __user *source,</div><div class='hunk'>@@ -368,11 +367,12 @@ static int ivtvfb_prep_frame(struct ivtv *itv, int cmd, void __user *source,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t ivtvfb_write(struct fb_info *info, const char __user *buf,</div><div class='del'>-		     size_t count, loff_t *ppos)</div><div class='add'>+						size_t count, loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long p = *ppos;</div><div class='ctx'> 	void *dst;</div><div class='ctx'> 	int err = 0;</div><div class='add'>+	int dma_err;</div><div class='ctx'> 	unsigned long total_size;</div><div class='ctx'> 	struct ivtv *itv = (struct ivtv *) info-&gt;par;</div><div class='ctx'> 	unsigned long dma_offset =</div><div class='hunk'>@@ -399,7 +399,6 @@ static ssize_t ivtvfb_write(struct fb_info *info, const char __user *buf,</div><div class='ctx'> 	if (count + p &gt; total_size) {</div><div class='ctx'> 		if (!err)</div><div class='ctx'> 			err = -ENOSPC;</div><div class='del'>-</div><div class='ctx'> 		count = total_size - p;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -408,39 +407,34 @@ static ssize_t ivtvfb_write(struct fb_info *info, const char __user *buf,</div><div class='ctx'> 	if (info-&gt;fbops-&gt;fb_sync)</div><div class='ctx'> 		info-&gt;fbops-&gt;fb_sync(info);</div><div class='ctx'> </div><div class='del'>-	if (!access_ok(VERIFY_READ, buf, count)) {</div><div class='del'>-		IVTVFB_WARN("Invalid userspace pointer 0x%08lx\n",</div><div class='del'>-			(unsigned long)buf);</div><div class='del'>-		err = -EFAULT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!err) {</div><div class='del'>-		/* If transfer size &gt; threshold and both src/dst</div><div class='del'>-		addresses are aligned, use DMA */</div><div class='del'>-		if (count &gt;= 4096 &amp;&amp;</div><div class='del'>-		    ((unsigned long)buf &amp; 3) == ((unsigned long)dst &amp; 3)) {</div><div class='del'>-			/* Odd address = can't DMA. Align */</div><div class='del'>-			if ((unsigned long)dst &amp; 3) {</div><div class='del'>-				lead = 4 - ((unsigned long)dst &amp; 3);</div><div class='del'>-				memcpy(dst, buf, lead);</div><div class='del'>-				buf += lead;</div><div class='del'>-				dst += lead;</div><div class='del'>-			}</div><div class='del'>-			/* DMA resolution is 32 bits */</div><div class='del'>-			if ((count - lead) &amp; 3)</div><div class='del'>-				tail = (count - lead) &amp; 3;</div><div class='del'>-			/* DMA the data */</div><div class='del'>-			dma_size = count - lead - tail;</div><div class='del'>-			err = ivtvfb_prep_dec_dma_to_device(itv,</div><div class='del'>-			       p + lead + dma_offset, (void *)buf, dma_size);</div><div class='del'>-			dst += dma_size;</div><div class='del'>-			buf += dma_size;</div><div class='del'>-			/* Copy any leftover data */</div><div class='del'>-			if (tail)</div><div class='del'>-				memcpy(dst, buf, tail);</div><div class='del'>-		} else {</div><div class='del'>-			memcpy(dst, buf, count);</div><div class='add'>+	/* If transfer size &gt; threshold and both src/dst</div><div class='add'>+	addresses are aligned, use DMA */</div><div class='add'>+	if (count &gt;= 4096 &amp;&amp;</div><div class='add'>+	    ((unsigned long)buf &amp; 3) == ((unsigned long)dst &amp; 3)) {</div><div class='add'>+		/* Odd address = can't DMA. Align */</div><div class='add'>+		if ((unsigned long)dst &amp; 3) {</div><div class='add'>+			lead = 4 - ((unsigned long)dst &amp; 3);</div><div class='add'>+			if (copy_from_user(dst, buf, lead))</div><div class='add'>+				return -EFAULT;</div><div class='add'>+			buf += lead;</div><div class='add'>+			dst += lead;</div><div class='ctx'> 		}</div><div class='add'>+		/* DMA resolution is 32 bits */</div><div class='add'>+		if ((count - lead) &amp; 3)</div><div class='add'>+			tail = (count - lead) &amp; 3;</div><div class='add'>+		/* DMA the data */</div><div class='add'>+		dma_size = count - lead - tail;</div><div class='add'>+		dma_err = ivtvfb_prep_dec_dma_to_device(itv,</div><div class='add'>+		       p + lead + dma_offset, (void __user *)buf, dma_size);</div><div class='add'>+		if (dma_err)</div><div class='add'>+			return dma_err;</div><div class='add'>+		dst += dma_size;</div><div class='add'>+		buf += dma_size;</div><div class='add'>+		/* Copy any leftover data */</div><div class='add'>+		if (tail &amp;&amp; copy_from_user(dst, buf, tail))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+	} else if (copy_from_user(dst, buf, count)) {</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if  (!err)</div><div class='hunk'>@@ -463,9 +457,12 @@ static int ivtvfb_ioctl(struct fb_info *info, unsigned int cmd, unsigned long ar</div><div class='ctx'> 			vblank.flags = FB_VBLANK_HAVE_COUNT |FB_VBLANK_HAVE_VCOUNT |</div><div class='ctx'> 					FB_VBLANK_HAVE_VSYNC;</div><div class='ctx'> 			trace = read_reg(0x028c0) &gt;&gt; 16;</div><div class='del'>-			if (itv-&gt;is_50hz &amp;&amp; trace &gt; 312) trace -= 312;</div><div class='del'>-			else if (itv-&gt;is_60hz &amp;&amp; trace &gt; 262) trace -= 262;</div><div class='del'>-			if (trace == 1) vblank.flags |= FB_VBLANK_VSYNCING;</div><div class='add'>+			if (itv-&gt;is_50hz &amp;&amp; trace &gt; 312)</div><div class='add'>+				trace -= 312;</div><div class='add'>+			else if (itv-&gt;is_60hz &amp;&amp; trace &gt; 262)</div><div class='add'>+				trace -= 262;</div><div class='add'>+			if (trace == 1)</div><div class='add'>+				vblank.flags |= FB_VBLANK_VSYNCING;</div><div class='ctx'> 			vblank.count = itv-&gt;last_vsync_field;</div><div class='ctx'> 			vblank.vcount = trace;</div><div class='ctx'> 			vblank.hcount = 0;</div><div class='hunk'>@@ -476,7 +473,8 @@ static int ivtvfb_ioctl(struct fb_info *info, unsigned int cmd, unsigned long ar</div><div class='ctx'> </div><div class='ctx'> 		case FBIO_WAITFORVSYNC:</div><div class='ctx'> 			prepare_to_wait(&amp;itv-&gt;vsync_waitq, &amp;wait, TASK_INTERRUPTIBLE);</div><div class='del'>-			if (!schedule_timeout(msecs_to_jiffies(50))) rc = -ETIMEDOUT;</div><div class='add'>+			if (!schedule_timeout(msecs_to_jiffies(50)))</div><div class='add'>+				rc = -ETIMEDOUT;</div><div class='ctx'> 			finish_wait(&amp;itv-&gt;vsync_waitq, &amp;wait);</div><div class='ctx'> 			return rc;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/ks0127.c b/drivers/media/video/ks0127.c<br/>index 2fd4b4a44aa9..bae2d2beb709 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/ks0127.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/ks0127.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/ks0127.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/ks0127.c</a></div><div class='hunk'>@@ -33,27 +33,20 @@</div><div class='ctx'>  * V1.1 Gerard v.d. Horst  Added some debugoutput, reset the video-standard</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#ifndef __KERNEL__</div><div class='del'>-#define __KERNEL__</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/proc_fs.h&gt;</div><div class='del'>-#include "ks0127.h"</div><div class='del'>-</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='ctx'> #include &lt;linux/video_decoder.h&gt;</div><div class='add'>+#include &lt;media/v4l2-common.h&gt;</div><div class='add'>+#include &lt;media/v4l2-i2c-drv-legacy.h&gt;</div><div class='add'>+#include "ks0127.h"</div><div class='ctx'> </div><div class='del'>-#define dprintk     if (debug) printk</div><div class='del'>-</div><div class='del'>-/* i2c identification */</div><div class='del'>-#define I2C_KS0127_ADDON   0xD8</div><div class='del'>-#define I2C_KS0127_ONBOARD 0xDA</div><div class='add'>+MODULE_DESCRIPTION("KS0127 video decoder driver");</div><div class='add'>+MODULE_AUTHOR("Ryan Drake");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='ctx'> #define KS_TYPE_UNKNOWN	0</div><div class='ctx'> #define KS_TYPE_0122S	1</div><div class='hunk'>@@ -204,8 +197,6 @@ struct adjust {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ks0127 {</div><div class='del'>-	struct i2c_client *client;</div><div class='del'>-	unsigned char	addr;</div><div class='ctx'> 	int		format_width;</div><div class='ctx'> 	int		format_height;</div><div class='ctx'> 	int		cap_width;</div><div class='hunk'>@@ -220,16 +211,18 @@ static int debug; /* insmod parameter */</div><div class='ctx'> </div><div class='ctx'> module_param(debug, int, 0);</div><div class='ctx'> MODULE_PARM_DESC(debug, "Debug output");</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='ctx'> static u8 reg_defaults[64];</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> static void init_reg_defaults(void)</div><div class='ctx'> {</div><div class='add'>+	static int initialized;</div><div class='ctx'> 	u8 *table = reg_defaults;</div><div class='ctx'> </div><div class='add'>+	if (initialized)</div><div class='add'>+		return;</div><div class='add'>+	initialized = 1;</div><div class='add'>+</div><div class='ctx'> 	table[KS_CMDA]     = 0x2c;  /* VSE=0, CCIR 601, autodetect standard */</div><div class='ctx'> 	table[KS_CMDB]     = 0x12;  /* VALIGN=0, AGC control and input */</div><div class='ctx'> 	table[KS_CMDC]     = 0x00;  /* Test options */</div><div class='hunk'>@@ -308,50 +301,53 @@ static void init_reg_defaults(void)</div><div class='ctx'>  * An explanation from kayork@mail.utexas.edu:</div><div class='ctx'>  *</div><div class='ctx'>  * During I2C reads, the KS0127 only samples for a stop condition</div><div class='del'>- * during the place where the acknoledge bit should be. Any standard</div><div class='add'>+ * during the place where the acknowledge bit should be. Any standard</div><div class='ctx'>  * I2C implementation (correctly) throws in another clock transition</div><div class='ctx'>  * at the 9th bit, and the KS0127 will not recognize the stop condition</div><div class='ctx'>  * and will continue to clock out data.</div><div class='ctx'>  *</div><div class='ctx'>  * So we have to do the read ourself.  Big deal.</div><div class='del'>-	   workaround in i2c-algo-bit</div><div class='add'>+ *	   workaround in i2c-algo-bit</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static u8 ks0127_read(struct ks0127 *ks, u8 reg)</div><div class='add'>+static u8 ks0127_read(struct i2c_client *c, u8 reg)</div><div class='ctx'> {</div><div class='del'>-	struct i2c_client *c = ks-&gt;client;</div><div class='ctx'> 	char val = 0;</div><div class='ctx'> 	struct i2c_msg msgs[] = {</div><div class='del'>-		{c-&gt;addr, 0, sizeof(reg), &amp;reg},</div><div class='del'>-		{c-&gt;addr, I2C_M_RD | I2C_M_NO_RD_ACK, sizeof(val), &amp;val}};</div><div class='add'>+		{ c-&gt;addr, 0, sizeof(reg), &amp;reg },</div><div class='add'>+		{ c-&gt;addr, I2C_M_RD | I2C_M_NO_RD_ACK, sizeof(val), &amp;val }</div><div class='add'>+	};</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = i2c_transfer(c-&gt;adapter, msgs, ARRAY_SIZE(msgs));</div><div class='ctx'> 	if (ret != ARRAY_SIZE(msgs))</div><div class='del'>-		dprintk("ks0127_write error\n");</div><div class='add'>+		v4l_dbg(1, debug, c, "read error\n");</div><div class='ctx'> </div><div class='ctx'> 	return val;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static void ks0127_write(struct ks0127 *ks, u8 reg, u8 val)</div><div class='add'>+static void ks0127_write(struct i2c_client *c, u8 reg, u8 val)</div><div class='ctx'> {</div><div class='del'>-	char msg[] = {reg, val};</div><div class='add'>+	struct ks0127 *ks = i2c_get_clientdata(c);</div><div class='add'>+	char msg[] = { reg, val };</div><div class='ctx'> </div><div class='del'>-	if (i2c_master_send(ks-&gt;client, msg, sizeof(msg)) != sizeof(msg))</div><div class='del'>-		dprintk("ks0127_write error\n");</div><div class='add'>+	if (i2c_master_send(c, msg, sizeof(msg)) != sizeof(msg))</div><div class='add'>+		v4l_dbg(1, debug, c, "write error\n");</div><div class='ctx'> </div><div class='ctx'> 	ks-&gt;regs[reg] = val;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* generic bit-twiddling */</div><div class='del'>-static void ks0127_and_or(struct ks0127 *ks, u8 reg, u8 and_v, u8 or_v)</div><div class='add'>+static void ks0127_and_or(struct i2c_client *client, u8 reg, u8 and_v, u8 or_v)</div><div class='ctx'> {</div><div class='add'>+	struct ks0127 *ks = i2c_get_clientdata(client);</div><div class='add'>+</div><div class='ctx'> 	u8 val = ks-&gt;regs[reg];</div><div class='ctx'> 	val = (val &amp; and_v) | or_v;</div><div class='del'>-	ks0127_write(ks, reg, val);</div><div class='add'>+	ks0127_write(client, reg, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -359,73 +355,69 @@ static void ks0127_and_or(struct ks0127 *ks, u8 reg, u8 and_v, u8 or_v)</div><div class='ctx'> /****************************************************************************</div><div class='ctx'> * ks0127 private api</div><div class='ctx'> ****************************************************************************/</div><div class='del'>-static void ks0127_reset(struct ks0127* ks)</div><div class='add'>+static void ks0127_reset(struct i2c_client *c)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='add'>+	struct ks0127 *ks = i2c_get_clientdata(c);</div><div class='ctx'> 	u8 *table = reg_defaults;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	ks-&gt;ks_type = KS_TYPE_UNKNOWN;</div><div class='ctx'> </div><div class='del'>-	dprintk("ks0127: reset\n");</div><div class='add'>+	v4l_dbg(1, debug, c, "reset\n");</div><div class='ctx'> 	msleep(1);</div><div class='ctx'> </div><div class='ctx'> 	/* initialize all registers to known values */</div><div class='ctx'> 	/* (except STAT, 0x21, 0x22, TEST and 0x38,0x39) */</div><div class='ctx'> </div><div class='del'>-	for(i = 1; i &lt; 33; i++)</div><div class='del'>-		ks0127_write(ks, i, table[i]);</div><div class='add'>+	for (i = 1; i &lt; 33; i++)</div><div class='add'>+		ks0127_write(c, i, table[i]);</div><div class='ctx'> </div><div class='del'>-	for(i = 35; i &lt; 40; i++)</div><div class='del'>-		ks0127_write(ks, i, table[i]);</div><div class='add'>+	for (i = 35; i &lt; 40; i++)</div><div class='add'>+		ks0127_write(c, i, table[i]);</div><div class='ctx'> </div><div class='del'>-	for(i = 41; i &lt; 56; i++)</div><div class='del'>-		ks0127_write(ks, i, table[i]);</div><div class='add'>+	for (i = 41; i &lt; 56; i++)</div><div class='add'>+		ks0127_write(c, i, table[i]);</div><div class='ctx'> </div><div class='del'>-	for(i = 58; i &lt; 64; i++)</div><div class='del'>-		ks0127_write(ks, i, table[i]);</div><div class='add'>+	for (i = 58; i &lt; 64; i++)</div><div class='add'>+		ks0127_write(c, i, table[i]);</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-	if ((ks0127_read(ks, KS_STAT) &amp; 0x80) == 0) {</div><div class='add'>+	if ((ks0127_read(c, KS_STAT) &amp; 0x80) == 0) {</div><div class='ctx'> 		ks-&gt;ks_type = KS_TYPE_0122S;</div><div class='del'>-		dprintk("ks0127: ks0122s Found\n");</div><div class='add'>+		v4l_dbg(1, debug, c, "ks0122s found\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	switch(ks0127_read(ks, KS_CMDE) &amp; 0x0f) {</div><div class='del'>-</div><div class='add'>+	switch (ks0127_read(c, KS_CMDE) &amp; 0x0f) {</div><div class='ctx'> 	case 0:</div><div class='ctx'> 		ks-&gt;ks_type = KS_TYPE_0127;</div><div class='del'>-		dprintk("ks0127: ks0127 found\n");</div><div class='add'>+		v4l_dbg(1, debug, c, "ks0127 found\n");</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case 9:</div><div class='ctx'> 		ks-&gt;ks_type = KS_TYPE_0127B;</div><div class='del'>-		dprintk("ks0127: ks0127B Revision A found\n");</div><div class='add'>+		v4l_dbg(1, debug, c, "ks0127B Revision A found\n");</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='del'>-		dprintk("ks0127: unknown revision\n");</div><div class='add'>+		v4l_dbg(1, debug, c, "unknown revision\n");</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ks0127_command(struct i2c_client *client,</div><div class='del'>-			  unsigned int cmd, void *arg)</div><div class='add'>+static int ks0127_command(struct i2c_client *c, unsigned cmd, void *arg)</div><div class='ctx'> {</div><div class='del'>-	struct ks0127 *ks = i2c_get_clientdata(client);</div><div class='del'>-</div><div class='del'>-	int		*iarg = (int*)arg;</div><div class='del'>-</div><div class='add'>+	struct ks0127 *ks = i2c_get_clientdata(c);</div><div class='add'>+	int		*iarg = (int *)arg;</div><div class='ctx'> 	int		status;</div><div class='ctx'> </div><div class='ctx'> 	if (!ks)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='del'>-</div><div class='ctx'> 	case DECODER_INIT:</div><div class='del'>-		dprintk("ks0127: command DECODER_INIT\n");</div><div class='del'>-		ks0127_reset(ks);</div><div class='add'>+		v4l_dbg(1, debug, c, "DECODER_INIT\n");</div><div class='add'>+		ks0127_reset(c);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case DECODER_SET_INPUT:</div><div class='hunk'>@@ -436,161 +428,160 @@ static int ks0127_command(struct i2c_client *client,</div><div class='ctx'> 		case KS_INPUT_COMPOSITE_4:</div><div class='ctx'> 		case KS_INPUT_COMPOSITE_5:</div><div class='ctx'> 		case KS_INPUT_COMPOSITE_6:</div><div class='del'>-			dprintk("ks0127: command DECODER_SET_INPUT %d: "</div><div class='del'>-				"Composite\n", *iarg);</div><div class='add'>+			v4l_dbg(1, debug, c,</div><div class='add'>+				"DECODER_SET_INPUT %d: Composite\n", *iarg);</div><div class='ctx'> 			/* autodetect 50/60 Hz */</div><div class='del'>-			ks0127_and_or(ks, KS_CMDA,   0xfc, 0x00);</div><div class='add'>+			ks0127_and_or(c, KS_CMDA,   0xfc, 0x00);</div><div class='ctx'> 			/* VSE=0 */</div><div class='del'>-			ks0127_and_or(ks, KS_CMDA,   ~0x40, 0x00);</div><div class='add'>+			ks0127_and_or(c, KS_CMDA,   ~0x40, 0x00);</div><div class='ctx'> 			/* set input line */</div><div class='del'>-			ks0127_and_or(ks, KS_CMDB,   0xb0, *iarg);</div><div class='add'>+			ks0127_and_or(c, KS_CMDB,   0xb0, *iarg);</div><div class='ctx'> 			/* non-freerunning mode */</div><div class='del'>-			ks0127_and_or(ks, KS_CMDC,   0x70, 0x0a);</div><div class='add'>+			ks0127_and_or(c, KS_CMDC,   0x70, 0x0a);</div><div class='ctx'> 			/* analog input */</div><div class='del'>-			ks0127_and_or(ks, KS_CMDD,   0x03, 0x00);</div><div class='add'>+			ks0127_and_or(c, KS_CMDD,   0x03, 0x00);</div><div class='ctx'> 			/* enable chroma demodulation */</div><div class='del'>-			ks0127_and_or(ks, KS_CTRACK, 0xcf, 0x00);</div><div class='add'>+			ks0127_and_or(c, KS_CTRACK, 0xcf, 0x00);</div><div class='ctx'> 			/* chroma trap, HYBWR=1 */</div><div class='del'>-			ks0127_and_or(ks, KS_LUMA,   0x00,</div><div class='add'>+			ks0127_and_or(c, KS_LUMA,   0x00,</div><div class='ctx'> 				       (reg_defaults[KS_LUMA])|0x0c);</div><div class='ctx'> 			/* scaler fullbw, luma comb off */</div><div class='del'>-			ks0127_and_or(ks, KS_VERTIA, 0x08, 0x81);</div><div class='add'>+			ks0127_and_or(c, KS_VERTIA, 0x08, 0x81);</div><div class='ctx'> 			/* manual chroma comb .25 .5 .25 */</div><div class='del'>-			ks0127_and_or(ks, KS_VERTIC, 0x0f, 0x90);</div><div class='add'>+			ks0127_and_or(c, KS_VERTIC, 0x0f, 0x90);</div><div class='ctx'> </div><div class='ctx'> 			/* chroma path delay */</div><div class='del'>-			ks0127_and_or(ks, KS_CHROMB, 0x0f, 0x90);</div><div class='add'>+			ks0127_and_or(c, KS_CHROMB, 0x0f, 0x90);</div><div class='ctx'> </div><div class='del'>-			ks0127_write(ks, KS_UGAIN, reg_defaults[KS_UGAIN]);</div><div class='del'>-			ks0127_write(ks, KS_VGAIN, reg_defaults[KS_VGAIN]);</div><div class='del'>-			ks0127_write(ks, KS_UVOFFH, reg_defaults[KS_UVOFFH]);</div><div class='del'>-			ks0127_write(ks, KS_UVOFFL, reg_defaults[KS_UVOFFL]);</div><div class='add'>+			ks0127_write(c, KS_UGAIN, reg_defaults[KS_UGAIN]);</div><div class='add'>+			ks0127_write(c, KS_VGAIN, reg_defaults[KS_VGAIN]);</div><div class='add'>+			ks0127_write(c, KS_UVOFFH, reg_defaults[KS_UVOFFH]);</div><div class='add'>+			ks0127_write(c, KS_UVOFFL, reg_defaults[KS_UVOFFL]);</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case KS_INPUT_SVIDEO_1:</div><div class='ctx'> 		case KS_INPUT_SVIDEO_2:</div><div class='ctx'> 		case KS_INPUT_SVIDEO_3:</div><div class='del'>-			dprintk("ks0127: command DECODER_SET_INPUT %d: "</div><div class='del'>-				"S-Video\n", *iarg);</div><div class='add'>+			v4l_dbg(1, debug, c,</div><div class='add'>+				"DECODER_SET_INPUT %d: S-Video\n", *iarg);</div><div class='ctx'> 			/* autodetect 50/60 Hz */</div><div class='del'>-			ks0127_and_or(ks, KS_CMDA,   0xfc, 0x00);</div><div class='add'>+			ks0127_and_or(c, KS_CMDA,   0xfc, 0x00);</div><div class='ctx'> 			/* VSE=0 */</div><div class='del'>-			ks0127_and_or(ks, KS_CMDA,   ~0x40, 0x00);</div><div class='add'>+			ks0127_and_or(c, KS_CMDA,   ~0x40, 0x00);</div><div class='ctx'> 			/* set input line */</div><div class='del'>-			ks0127_and_or(ks, KS_CMDB,   0xb0, *iarg);</div><div class='add'>+			ks0127_and_or(c, KS_CMDB,   0xb0, *iarg);</div><div class='ctx'> 			/* non-freerunning mode */</div><div class='del'>-			ks0127_and_or(ks, KS_CMDC,   0x70, 0x0a);</div><div class='add'>+			ks0127_and_or(c, KS_CMDC,   0x70, 0x0a);</div><div class='ctx'> 			/* analog input */</div><div class='del'>-			ks0127_and_or(ks, KS_CMDD,   0x03, 0x00);</div><div class='add'>+			ks0127_and_or(c, KS_CMDD,   0x03, 0x00);</div><div class='ctx'> 			/* enable chroma demodulation */</div><div class='del'>-			ks0127_and_or(ks, KS_CTRACK, 0xcf, 0x00);</div><div class='del'>-			ks0127_and_or(ks, KS_LUMA, 0x00,</div><div class='add'>+			ks0127_and_or(c, KS_CTRACK, 0xcf, 0x00);</div><div class='add'>+			ks0127_and_or(c, KS_LUMA, 0x00,</div><div class='ctx'> 				       reg_defaults[KS_LUMA]);</div><div class='ctx'> 			/* disable luma comb */</div><div class='del'>-			ks0127_and_or(ks, KS_VERTIA, 0x08,</div><div class='add'>+			ks0127_and_or(c, KS_VERTIA, 0x08,</div><div class='ctx'> 				       (reg_defaults[KS_VERTIA]&amp;0xf0)|0x01);</div><div class='del'>-			ks0127_and_or(ks, KS_VERTIC, 0x0f,</div><div class='add'>+			ks0127_and_or(c, KS_VERTIC, 0x0f,</div><div class='ctx'> 				       reg_defaults[KS_VERTIC]&amp;0xf0);</div><div class='ctx'> </div><div class='del'>-			ks0127_and_or(ks, KS_CHROMB, 0x0f,</div><div class='add'>+			ks0127_and_or(c, KS_CHROMB, 0x0f,</div><div class='ctx'> 				       reg_defaults[KS_CHROMB]&amp;0xf0);</div><div class='ctx'> </div><div class='del'>-			ks0127_write(ks, KS_UGAIN, reg_defaults[KS_UGAIN]);</div><div class='del'>-			ks0127_write(ks, KS_VGAIN, reg_defaults[KS_VGAIN]);</div><div class='del'>-			ks0127_write(ks, KS_UVOFFH, reg_defaults[KS_UVOFFH]);</div><div class='del'>-			ks0127_write(ks, KS_UVOFFL, reg_defaults[KS_UVOFFL]);</div><div class='add'>+			ks0127_write(c, KS_UGAIN, reg_defaults[KS_UGAIN]);</div><div class='add'>+			ks0127_write(c, KS_VGAIN, reg_defaults[KS_VGAIN]);</div><div class='add'>+			ks0127_write(c, KS_UVOFFH, reg_defaults[KS_UVOFFH]);</div><div class='add'>+			ks0127_write(c, KS_UVOFFL, reg_defaults[KS_UVOFFL]);</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case KS_INPUT_YUV656:</div><div class='del'>-			dprintk("ks0127: command DECODER_SET_INPUT 15: "</div><div class='del'>-				"YUV656\n");</div><div class='add'>+			v4l_dbg(1, debug, c,</div><div class='add'>+				"DECODER_SET_INPUT 15: YUV656\n");</div><div class='ctx'> 			if (ks-&gt;norm == VIDEO_MODE_NTSC ||</div><div class='ctx'> 			    ks-&gt;norm == KS_STD_PAL_M)</div><div class='ctx'> 				/* force 60 Hz */</div><div class='del'>-				ks0127_and_or(ks, KS_CMDA,   0xfc, 0x03);</div><div class='add'>+				ks0127_and_or(c, KS_CMDA,   0xfc, 0x03);</div><div class='ctx'> 			else</div><div class='ctx'> 				/* force 50 Hz */</div><div class='del'>-				ks0127_and_or(ks, KS_CMDA,   0xfc, 0x02);</div><div class='add'>+				ks0127_and_or(c, KS_CMDA,   0xfc, 0x02);</div><div class='ctx'> </div><div class='del'>-			ks0127_and_or(ks, KS_CMDA,   0xff, 0x40); /* VSE=1 */</div><div class='add'>+			ks0127_and_or(c, KS_CMDA,   0xff, 0x40); /* VSE=1 */</div><div class='ctx'> 			/* set input line and VALIGN */</div><div class='del'>-			ks0127_and_or(ks, KS_CMDB,   0xb0, (*iarg | 0x40));</div><div class='add'>+			ks0127_and_or(c, KS_CMDB,   0xb0, (*iarg | 0x40));</div><div class='ctx'> 			/* freerunning mode, */</div><div class='ctx'> 			/* TSTGEN = 1 TSTGFR=11 TSTGPH=0 TSTGPK=0  VMEM=1*/</div><div class='del'>-			ks0127_and_or(ks, KS_CMDC,   0x70, 0x87);</div><div class='add'>+			ks0127_and_or(c, KS_CMDC,   0x70, 0x87);</div><div class='ctx'> 			/* digital input, SYNDIR = 0 INPSL=01 CLKDIR=0 EAV=0 */</div><div class='del'>-			ks0127_and_or(ks, KS_CMDD,   0x03, 0x08);</div><div class='add'>+			ks0127_and_or(c, KS_CMDD,   0x03, 0x08);</div><div class='ctx'> 			/* disable chroma demodulation */</div><div class='del'>-			ks0127_and_or(ks, KS_CTRACK, 0xcf, 0x30);</div><div class='add'>+			ks0127_and_or(c, KS_CTRACK, 0xcf, 0x30);</div><div class='ctx'> 			/* HYPK =01 CTRAP = 0 HYBWR=0 PED=1 RGBH=1 UNIT=1 */</div><div class='del'>-			ks0127_and_or(ks, KS_LUMA,   0x00, 0x71);</div><div class='del'>-			ks0127_and_or(ks, KS_VERTIC, 0x0f,</div><div class='add'>+			ks0127_and_or(c, KS_LUMA,   0x00, 0x71);</div><div class='add'>+			ks0127_and_or(c, KS_VERTIC, 0x0f,</div><div class='ctx'> 				       reg_defaults[KS_VERTIC]&amp;0xf0);</div><div class='ctx'> </div><div class='ctx'> 			/* scaler fullbw, luma comb off */</div><div class='del'>-			ks0127_and_or(ks, KS_VERTIA, 0x08, 0x81);</div><div class='add'>+			ks0127_and_or(c, KS_VERTIA, 0x08, 0x81);</div><div class='ctx'> </div><div class='del'>-			ks0127_and_or(ks, KS_CHROMB, 0x0f,</div><div class='add'>+			ks0127_and_or(c, KS_CHROMB, 0x0f,</div><div class='ctx'> 				       reg_defaults[KS_CHROMB]&amp;0xf0);</div><div class='ctx'> </div><div class='del'>-			ks0127_and_or(ks, KS_CON, 0x00, 0x00);</div><div class='del'>-			ks0127_and_or(ks, KS_BRT, 0x00, 32);	/* spec: 34 */</div><div class='add'>+			ks0127_and_or(c, KS_CON, 0x00, 0x00);</div><div class='add'>+			ks0127_and_or(c, KS_BRT, 0x00, 32);	/* spec: 34 */</div><div class='ctx'> 				/* spec: 229 (e5) */</div><div class='del'>-			ks0127_and_or(ks, KS_SAT, 0x00, 0xe8);</div><div class='del'>-			ks0127_and_or(ks, KS_HUE, 0x00, 0);</div><div class='add'>+			ks0127_and_or(c, KS_SAT, 0x00, 0xe8);</div><div class='add'>+			ks0127_and_or(c, KS_HUE, 0x00, 0);</div><div class='ctx'> </div><div class='del'>-			ks0127_and_or(ks, KS_UGAIN, 0x00, 238);</div><div class='del'>-			ks0127_and_or(ks, KS_VGAIN, 0x00, 0x00);</div><div class='add'>+			ks0127_and_or(c, KS_UGAIN, 0x00, 238);</div><div class='add'>+			ks0127_and_or(c, KS_VGAIN, 0x00, 0x00);</div><div class='ctx'> </div><div class='ctx'> 			/*UOFF:0x30, VOFF:0x30, TSTCGN=1 */</div><div class='del'>-			ks0127_and_or(ks, KS_UVOFFH, 0x00, 0x4f);</div><div class='del'>-			ks0127_and_or(ks, KS_UVOFFL, 0x00, 0x00);</div><div class='add'>+			ks0127_and_or(c, KS_UVOFFH, 0x00, 0x4f);</div><div class='add'>+			ks0127_and_or(c, KS_UVOFFL, 0x00, 0x00);</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		default:</div><div class='del'>-			dprintk("ks0127: command DECODER_SET_INPUT: "</div><div class='del'>-				"Unknown input %d\n", *iarg);</div><div class='add'>+			v4l_dbg(1, debug, c,</div><div class='add'>+				"DECODER_SET_INPUT: Unknown input %d\n", *iarg);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* hack: CDMLPF sometimes spontaneously switches on; */</div><div class='ctx'> 		/* force back off */</div><div class='del'>-		ks0127_write(ks, KS_DEMOD, reg_defaults[KS_DEMOD]);</div><div class='add'>+		ks0127_write(c, KS_DEMOD, reg_defaults[KS_DEMOD]);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case DECODER_SET_OUTPUT:</div><div class='ctx'> 		switch(*iarg) {</div><div class='ctx'> 		case KS_OUTPUT_YUV656E:</div><div class='del'>-			dprintk("ks0127: command DECODER_SET_OUTPUT: "</div><div class='del'>-				"OUTPUT_YUV656E (Missing)\n");</div><div class='add'>+			v4l_dbg(1, debug, c,</div><div class='add'>+				"DECODER_SET_OUTPUT: OUTPUT_YUV656E (Missing)\n");</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-			break;</div><div class='ctx'> </div><div class='ctx'> 		case KS_OUTPUT_EXV:</div><div class='del'>-			dprintk("ks0127: command DECODER_SET_OUTPUT: "</div><div class='del'>-				"OUTPUT_EXV\n");</div><div class='del'>-			ks0127_and_or(ks, KS_OFMTA, 0xf0, 0x09);</div><div class='add'>+			v4l_dbg(1, debug, c,</div><div class='add'>+				"DECODER_SET_OUTPUT: OUTPUT_EXV\n");</div><div class='add'>+			ks0127_and_or(c, KS_OFMTA, 0xf0, 0x09);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case DECODER_SET_NORM: //sam This block mixes old and new norm names...</div><div class='add'>+	case DECODER_SET_NORM: /* sam This block mixes old and new norm names... */</div><div class='ctx'> 		/* Set to automatic SECAM/Fsc mode */</div><div class='del'>-		ks0127_and_or(ks, KS_DEMOD, 0xf0, 0x00);</div><div class='add'>+		ks0127_and_or(c, KS_DEMOD, 0xf0, 0x00);</div><div class='ctx'> </div><div class='ctx'> 		ks-&gt;norm = *iarg;</div><div class='del'>-		switch(*iarg)</div><div class='del'>-		{</div><div class='add'>+		switch (*iarg) {</div><div class='ctx'> 		/* this is untested !! */</div><div class='ctx'> 		/* It just detects PAL_N/NTSC_M (no special frequencies) */</div><div class='ctx'> 		/* And you have to set the standard a second time afterwards */</div><div class='ctx'> 		case VIDEO_MODE_AUTO:</div><div class='del'>-			dprintk("ks0127: command DECODER_SET_NORM: AUTO\n");</div><div class='add'>+			v4l_dbg(1, debug, c,</div><div class='add'>+				"DECODER_SET_NORM: AUTO\n");</div><div class='ctx'> </div><div class='ctx'> 			/* The chip determines the format */</div><div class='ctx'> 			/* based on the current field rate */</div><div class='del'>-			ks0127_and_or(ks, KS_CMDA,   0xfc, 0x00);</div><div class='del'>-			ks0127_and_or(ks, KS_CHROMA, 0x9f, 0x20);</div><div class='add'>+			ks0127_and_or(c, KS_CMDA,   0xfc, 0x00);</div><div class='add'>+			ks0127_and_or(c, KS_CHROMA, 0x9f, 0x20);</div><div class='ctx'> 			/* This is wrong for PAL ! As I said, */</div><div class='ctx'> 			/* you need to set the standard once again !! */</div><div class='ctx'> 			ks-&gt;format_height = 240;</div><div class='hunk'>@@ -598,84 +589,86 @@ static int ks0127_command(struct i2c_client *client,</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case VIDEO_MODE_NTSC:</div><div class='del'>-			dprintk("ks0127: command DECODER_SET_NORM: NTSC_M\n");</div><div class='del'>-			ks0127_and_or(ks, KS_CHROMA, 0x9f, 0x20);</div><div class='add'>+			v4l_dbg(1, debug, c,</div><div class='add'>+				"DECODER_SET_NORM: NTSC_M\n");</div><div class='add'>+			ks0127_and_or(c, KS_CHROMA, 0x9f, 0x20);</div><div class='ctx'> 			ks-&gt;format_height = 240;</div><div class='ctx'> 			ks-&gt;format_width = 704;</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case KS_STD_NTSC_N:</div><div class='del'>-			dprintk("ks0127: command KS0127_SET_STANDARD: "</div><div class='del'>-				"NTSC_N (fixme)\n");</div><div class='del'>-			ks0127_and_or(ks, KS_CHROMA, 0x9f, 0x40);</div><div class='add'>+			v4l_dbg(1, debug, c,</div><div class='add'>+				"KS0127_SET_NORM: NTSC_N (fixme)\n");</div><div class='add'>+			ks0127_and_or(c, KS_CHROMA, 0x9f, 0x40);</div><div class='ctx'> 			ks-&gt;format_height = 240;</div><div class='ctx'> 			ks-&gt;format_width = 704;</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case VIDEO_MODE_PAL:</div><div class='del'>-			dprintk("ks0127: command DECODER_SET_NORM: PAL_N\n");</div><div class='del'>-			ks0127_and_or(ks, KS_CHROMA, 0x9f, 0x20);</div><div class='add'>+			v4l_dbg(1, debug, c,</div><div class='add'>+				"DECODER_SET_NORM: PAL_N\n");</div><div class='add'>+			ks0127_and_or(c, KS_CHROMA, 0x9f, 0x20);</div><div class='ctx'> 			ks-&gt;format_height = 290;</div><div class='ctx'> 			ks-&gt;format_width = 704;</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case KS_STD_PAL_M:</div><div class='del'>-			dprintk("ks0127: command KS0127_SET_STANDARD: "</div><div class='del'>-				"PAL_M (fixme)\n");</div><div class='del'>-			ks0127_and_or(ks, KS_CHROMA, 0x9f, 0x40);</div><div class='add'>+			v4l_dbg(1, debug, c,</div><div class='add'>+				"KS0127_SET_NORM: PAL_M (fixme)\n");</div><div class='add'>+			ks0127_and_or(c, KS_CHROMA, 0x9f, 0x40);</div><div class='ctx'> 			ks-&gt;format_height = 290;</div><div class='ctx'> 			ks-&gt;format_width = 704;</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case VIDEO_MODE_SECAM:</div><div class='del'>-			dprintk("ks0127: command KS0127_SET_STANDARD: "</div><div class='del'>-				"SECAM\n");</div><div class='add'>+			v4l_dbg(1, debug, c,</div><div class='add'>+				"KS0127_SET_NORM: SECAM\n");</div><div class='ctx'> 			ks-&gt;format_height = 290;</div><div class='ctx'> 			ks-&gt;format_width = 704;</div><div class='ctx'> </div><div class='ctx'> 			/* set to secam autodetection */</div><div class='del'>-			ks0127_and_or(ks, KS_CHROMA, 0xdf, 0x20);</div><div class='del'>-			ks0127_and_or(ks, KS_DEMOD, 0xf0, 0x00);</div><div class='add'>+			ks0127_and_or(c, KS_CHROMA, 0xdf, 0x20);</div><div class='add'>+			ks0127_and_or(c, KS_DEMOD, 0xf0, 0x00);</div><div class='ctx'> 			schedule_timeout_interruptible(HZ/10+1);</div><div class='ctx'> </div><div class='ctx'> 			/* did it autodetect? */</div><div class='del'>-			if (ks0127_read(ks, KS_DEMOD) &amp; 0x40)</div><div class='add'>+			if (ks0127_read(c, KS_DEMOD) &amp; 0x40)</div><div class='ctx'> 				break;</div><div class='ctx'> </div><div class='ctx'> 			/* force to secam mode */</div><div class='del'>-			ks0127_and_or(ks, KS_DEMOD, 0xf0, 0x0f);</div><div class='add'>+			ks0127_and_or(c, KS_DEMOD, 0xf0, 0x0f);</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		default:</div><div class='del'>-			dprintk("ks0127: command DECODER_SET_NORM: "</div><div class='del'>-				"Unknown norm %d\n", *iarg);</div><div class='add'>+			v4l_dbg(1, debug, c,</div><div class='add'>+				"DECODER_SET_NORM: Unknown norm %d\n", *iarg);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case DECODER_SET_PICTURE:</div><div class='del'>-		dprintk("ks0127: command DECODER_SET_PICTURE "</div><div class='del'>-			"not yet supported (fixme)\n");</div><div class='add'>+		v4l_dbg(1, debug, c,</div><div class='add'>+			"DECODER_SET_PICTURE: not yet supported\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	//sam todo: KS0127_SET_BRIGHTNESS: Merge into DECODER_SET_PICTURE</div><div class='del'>-	//sam todo: KS0127_SET_CONTRAST: Merge into DECODER_SET_PICTURE</div><div class='del'>-	//sam todo: KS0127_SET_HUE: Merge into DECODER_SET_PICTURE?</div><div class='del'>-	//sam todo: KS0127_SET_SATURATION: Merge into DECODER_SET_PICTURE</div><div class='del'>-	//sam todo: KS0127_SET_AGC_MODE:</div><div class='del'>-	//sam todo: KS0127_SET_AGC:</div><div class='del'>-	//sam todo: KS0127_SET_CHROMA_MODE:</div><div class='del'>-	//sam todo: KS0127_SET_PIXCLK_MODE:</div><div class='del'>-	//sam todo: KS0127_SET_GAMMA_MODE:</div><div class='del'>-	//sam todo: KS0127_SET_UGAIN:</div><div class='del'>-	//sam todo: KS0127_SET_VGAIN:</div><div class='del'>-	//sam todo: KS0127_SET_INVALY:</div><div class='del'>-	//sam todo: KS0127_SET_INVALU:</div><div class='del'>-	//sam todo: KS0127_SET_INVALV:</div><div class='del'>-	//sam todo: KS0127_SET_UNUSEY:</div><div class='del'>-	//sam todo: KS0127_SET_UNUSEU:</div><div class='del'>-	//sam todo: KS0127_SET_UNUSEV:</div><div class='del'>-	//sam todo: KS0127_SET_VSALIGN_MODE:</div><div class='add'>+	/* sam todo: KS0127_SET_BRIGHTNESS: Merge into DECODER_SET_PICTURE */</div><div class='add'>+	/* sam todo: KS0127_SET_CONTRAST: Merge into DECODER_SET_PICTURE */</div><div class='add'>+	/* sam todo: KS0127_SET_HUE: Merge into DECODER_SET_PICTURE? */</div><div class='add'>+	/* sam todo: KS0127_SET_SATURATION: Merge into DECODER_SET_PICTURE */</div><div class='add'>+	/* sam todo: KS0127_SET_AGC_MODE: */</div><div class='add'>+	/* sam todo: KS0127_SET_AGC: */</div><div class='add'>+	/* sam todo: KS0127_SET_CHROMA_MODE: */</div><div class='add'>+	/* sam todo: KS0127_SET_PIXCLK_MODE: */</div><div class='add'>+	/* sam todo: KS0127_SET_GAMMA_MODE: */</div><div class='add'>+	/* sam todo: KS0127_SET_UGAIN: */</div><div class='add'>+	/* sam todo: KS0127_SET_VGAIN: */</div><div class='add'>+	/* sam todo: KS0127_SET_INVALY: */</div><div class='add'>+	/* sam todo: KS0127_SET_INVALU: */</div><div class='add'>+	/* sam todo: KS0127_SET_INVALV: */</div><div class='add'>+	/* sam todo: KS0127_SET_UNUSEY: */</div><div class='add'>+	/* sam todo: KS0127_SET_UNUSEU: */</div><div class='add'>+	/* sam todo: KS0127_SET_UNUSEV: */</div><div class='add'>+	/* sam todo: KS0127_SET_VSALIGN_MODE: */</div><div class='ctx'> </div><div class='ctx'> 	case DECODER_ENABLE_OUTPUT:</div><div class='ctx'> 	{</div><div class='hunk'>@@ -684,34 +677,32 @@ static int ks0127_command(struct i2c_client *client,</div><div class='ctx'> 		iarg = arg;</div><div class='ctx'> 		enable = (*iarg != 0);</div><div class='ctx'> 		if (enable) {</div><div class='del'>-			dprintk("ks0127: command "</div><div class='del'>-					"DECODER_ENABLE_OUTPUT on "</div><div class='del'>-					"(%d)\n", enable);</div><div class='add'>+			v4l_dbg(1, debug, c,</div><div class='add'>+				"DECODER_ENABLE_OUTPUT on\n");</div><div class='ctx'> 			/* All output pins on */</div><div class='del'>-			ks0127_and_or(ks, KS_OFMTA, 0xcf, 0x30);</div><div class='add'>+			ks0127_and_or(c, KS_OFMTA, 0xcf, 0x30);</div><div class='ctx'> 			/* Obey the OEN pin */</div><div class='del'>-			ks0127_and_or(ks, KS_CDEM, 0x7f, 0x00);</div><div class='add'>+			ks0127_and_or(c, KS_CDEM, 0x7f, 0x00);</div><div class='ctx'> 		} else {</div><div class='del'>-			dprintk("ks0127: command "</div><div class='del'>-					"DECODER_ENABLE_OUTPUT off "</div><div class='del'>-					"(%d)\n", enable);</div><div class='add'>+			v4l_dbg(1, debug, c,</div><div class='add'>+				"DECODER_ENABLE_OUTPUT off\n");</div><div class='ctx'> 			/* Video output pins off */</div><div class='del'>-			ks0127_and_or(ks, KS_OFMTA, 0xcf, 0x00);</div><div class='add'>+			ks0127_and_or(c, KS_OFMTA, 0xcf, 0x00);</div><div class='ctx'> 			/* Ignore the OEN pin */</div><div class='del'>-			ks0127_and_or(ks, KS_CDEM, 0x7f, 0x80);</div><div class='add'>+			ks0127_and_or(c, KS_CDEM, 0x7f, 0x80);</div><div class='ctx'> 		}</div><div class='del'>-	}</div><div class='ctx'> 		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	//sam todo: KS0127_SET_OUTPUT_MODE:</div><div class='del'>-	//sam todo: KS0127_SET_WIDTH:</div><div class='del'>-	//sam todo: KS0127_SET_HEIGHT:</div><div class='del'>-	//sam todo: KS0127_SET_HSCALE:</div><div class='add'>+	/* sam todo: KS0127_SET_OUTPUT_MODE: */</div><div class='add'>+	/* sam todo: KS0127_SET_WIDTH: */</div><div class='add'>+	/* sam todo: KS0127_SET_HEIGHT: */</div><div class='add'>+	/* sam todo: KS0127_SET_HSCALE: */</div><div class='ctx'> </div><div class='ctx'> 	case DECODER_GET_STATUS:</div><div class='del'>-		dprintk("ks0127: command DECODER_GET_STATUS\n");</div><div class='add'>+		v4l_dbg(1, debug, c, "DECODER_GET_STATUS\n");</div><div class='ctx'> 		*iarg = 0;</div><div class='del'>-		status = ks0127_read(ks, KS_STAT);</div><div class='add'>+		status = ks0127_read(c, KS_STAT);</div><div class='ctx'> 		if (!(status &amp; 0x20))		 /* NOVID not set */</div><div class='ctx'> 			*iarg = (*iarg | DECODER_STATUS_GOOD);</div><div class='ctx'> 		if ((status &amp; 0x01))		      /* CLOCK set */</div><div class='hunk'>@@ -722,124 +713,81 @@ static int ks0127_command(struct i2c_client *client,</div><div class='ctx'> 			*iarg = (*iarg | DECODER_STATUS_NTSC);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	//Catch any unknown command</div><div class='add'>+	/* Catch any unknown command */</div><div class='ctx'> 	default:</div><div class='del'>-		dprintk("ks0127: command unknown: %04X\n", cmd);</div><div class='add'>+		v4l_dbg(1, debug, c, "unknown: 0x%08x\n", cmd);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int ks0127_probe(struct i2c_adapter *adapter);</div><div class='del'>-static int ks0127_detach(struct i2c_client *client);</div><div class='del'>-static int ks0127_command(struct i2c_client *client,</div><div class='del'>-			  unsigned int cmd, void *arg);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> /* Addresses to scan */</div><div class='del'>-static unsigned short normal_i2c[] = {I2C_KS0127_ADDON&gt;&gt;1,</div><div class='del'>-				       I2C_KS0127_ONBOARD&gt;&gt;1, I2C_CLIENT_END};</div><div class='del'>-static unsigned short probe[2] =	{I2C_CLIENT_END, I2C_CLIENT_END};</div><div class='del'>-static unsigned short ignore[2] = 	{I2C_CLIENT_END, I2C_CLIENT_END};</div><div class='del'>-static struct i2c_client_address_data addr_data = {</div><div class='del'>-	normal_i2c,</div><div class='del'>-	probe,</div><div class='del'>-	ignore,</div><div class='del'>-};</div><div class='add'>+#define I2C_KS0127_ADDON   0xD8</div><div class='add'>+#define I2C_KS0127_ONBOARD 0xDA</div><div class='ctx'> </div><div class='del'>-static struct i2c_driver i2c_driver_ks0127 = {</div><div class='del'>-	.driver.name = "ks0127",</div><div class='del'>-	.id             = I2C_DRIVERID_KS0127,</div><div class='del'>-	.attach_adapter = ks0127_probe,</div><div class='del'>-	.detach_client  = ks0127_detach,</div><div class='del'>-	.command        = ks0127_command</div><div class='add'>+static unsigned short normal_i2c[] = {</div><div class='add'>+	I2C_KS0127_ADDON &gt;&gt; 1,</div><div class='add'>+	I2C_KS0127_ONBOARD &gt;&gt; 1,</div><div class='add'>+	I2C_CLIENT_END</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct i2c_client ks0127_client_tmpl =</div><div class='del'>-{</div><div class='del'>-	.name = "(ks0127 unset)",</div><div class='del'>-	.addr = 0,</div><div class='del'>-	.adapter = NULL,</div><div class='del'>-	.driver = &amp;i2c_driver_ks0127,</div><div class='del'>-};</div><div class='add'>+I2C_CLIENT_INSMOD;</div><div class='ctx'> </div><div class='del'>-static int ks0127_found_proc(struct i2c_adapter *adapter, int addr, int kind)</div><div class='add'>+static int ks0127_probe(struct i2c_client *c, const struct i2c_device_id *id)</div><div class='ctx'> {</div><div class='ctx'> 	struct ks0127 *ks;</div><div class='del'>-	struct i2c_client *client;</div><div class='ctx'> </div><div class='del'>-	client = kzalloc(sizeof(*client), GFP_KERNEL);</div><div class='del'>-	if (client == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	memcpy(client, &amp;ks0127_client_tmpl, sizeof(*client));</div><div class='add'>+	v4l_info(c, "%s chip found @ 0x%x (%s)\n",</div><div class='add'>+		c-&gt;addr == (I2C_KS0127_ADDON &gt;&gt; 1) ? "addon" : "on-board",</div><div class='add'>+		c-&gt;addr &lt;&lt; 1, c-&gt;adapter-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	ks = kzalloc(sizeof(*ks), GFP_KERNEL);</div><div class='del'>-	if (ks == NULL) {</div><div class='del'>-		kfree(client);</div><div class='add'>+	if (ks == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	i2c_set_clientdata(client, ks);</div><div class='del'>-	client-&gt;adapter = adapter;</div><div class='del'>-	client-&gt;addr = addr;</div><div class='del'>-	sprintf(client-&gt;name, "ks0127-%02x", adapter-&gt;id);</div><div class='add'>+	i2c_set_clientdata(c, ks);</div><div class='ctx'> </div><div class='del'>-	ks-&gt;client = client;</div><div class='del'>-	ks-&gt;addr = addr;</div><div class='ctx'> 	ks-&gt;ks_type = KS_TYPE_UNKNOWN;</div><div class='ctx'> </div><div class='ctx'> 	/* power up */</div><div class='del'>-	ks0127_write(ks, KS_CMDA, 0x2c);</div><div class='add'>+	init_reg_defaults();</div><div class='add'>+	ks0127_write(c, KS_CMDA, 0x2c);</div><div class='ctx'> 	mdelay(10);</div><div class='ctx'> </div><div class='ctx'> 	/* reset the device */</div><div class='del'>-	ks0127_reset(ks);</div><div class='del'>-	printk(KERN_INFO "ks0127: attach: %s video decoder\n",</div><div class='del'>-	       ks-&gt;addr==(I2C_KS0127_ADDON&gt;&gt;1) ? "addon" : "on-board");</div><div class='del'>-</div><div class='del'>-	i2c_attach_client(client);</div><div class='add'>+	ks0127_reset(c);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static int ks0127_probe(struct i2c_adapter *adapter)</div><div class='add'>+static int ks0127_remove(struct i2c_client *c)</div><div class='ctx'> {</div><div class='del'>-	if (adapter-&gt;id == I2C_HW_B_ZR36067)</div><div class='del'>-		return i2c_probe(adapter, &amp;addr_data, ks0127_found_proc);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ks0127_detach(struct i2c_client *client)</div><div class='del'>-{</div><div class='del'>-	struct ks0127 *ks = i2c_get_clientdata(client);</div><div class='add'>+	struct ks0127 *ks = i2c_get_clientdata(c);</div><div class='ctx'> </div><div class='del'>-	ks0127_write(ks, KS_OFMTA, 0x20); /*tristate*/</div><div class='del'>-	ks0127_write(ks, KS_CMDA, 0x2c | 0x80); /* power down */</div><div class='add'>+	ks0127_write(c, KS_OFMTA, 0x20); /* tristate */</div><div class='add'>+	ks0127_write(c, KS_CMDA, 0x2c | 0x80); /* power down */</div><div class='ctx'> </div><div class='del'>-	i2c_detach_client(client);</div><div class='ctx'> 	kfree(ks);</div><div class='del'>-	kfree(client);</div><div class='del'>-</div><div class='del'>-	dprintk("ks0127: detach\n");</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static int __devinit ks0127_init_module(void)</div><div class='add'>+static int ks0127_legacy_probe(struct i2c_adapter *adapter)</div><div class='ctx'> {</div><div class='del'>-	init_reg_defaults();</div><div class='del'>-	return i2c_add_driver(&amp;i2c_driver_ks0127);</div><div class='add'>+	return adapter-&gt;id == I2C_HW_B_ZR36067;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devexit ks0127_cleanup_module(void)</div><div class='del'>-{</div><div class='del'>-	i2c_del_driver(&amp;i2c_driver_ks0127);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-module_init(ks0127_init_module);</div><div class='del'>-module_exit(ks0127_cleanup_module);</div><div class='add'>+static const struct i2c_device_id ks0127_id[] = {</div><div class='add'>+	{ "ks0127", 0 },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(i2c, ks0127_id);</div><div class='add'>+</div><div class='add'>+static struct v4l2_i2c_driver_data v4l2_i2c_data = {</div><div class='add'>+	.name = "ks0127",</div><div class='add'>+	.driverid = I2C_DRIVERID_KS0127,</div><div class='add'>+	.command = ks0127_command,</div><div class='add'>+	.probe = ks0127_probe,</div><div class='add'>+	.remove = ks0127_remove,</div><div class='add'>+	.legacy_probe = ks0127_legacy_probe,</div><div class='add'>+	.id_table = ks0127_id,</div><div class='add'>+};</div><div class='head'>diff --git a/drivers/media/video/meye.c b/drivers/media/video/meye.c<br/>index a9ef7802eb5f..6418f4a78f2a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/meye.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/meye.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/meye.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/meye.c</a></div><div class='hunk'>@@ -843,17 +843,16 @@ again:</div><div class='ctx'> </div><div class='ctx'> static int meye_open(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='del'>-	int i, err;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-	err = video_exclusive_open(inode, file);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='add'>+	if (test_and_set_bit(0, &amp;meye.in_use))</div><div class='add'>+		return -EBUSY;</div><div class='ctx'> </div><div class='ctx'> 	mchip_hic_stop();</div><div class='ctx'> </div><div class='ctx'> 	if (mchip_dma_alloc()) {</div><div class='ctx'> 		printk(KERN_ERR "meye: mchip framebuffer allocation failed\n");</div><div class='del'>-		video_exclusive_release(inode, file);</div><div class='add'>+		clear_bit(0, &amp;meye.in_use);</div><div class='ctx'> 		return -ENOBUFS;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -868,7 +867,7 @@ static int meye_release(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='ctx'> 	mchip_hic_stop();</div><div class='ctx'> 	mchip_dma_free();</div><div class='del'>-	video_exclusive_release(inode, file);</div><div class='add'>+	clear_bit(0, &amp;meye.in_use);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1774,6 +1773,7 @@ static int __devinit meye_probe(struct pci_dev *pcidev,</div><div class='ctx'> 		goto outnotdev;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ret = -ENOMEM;</div><div class='ctx'> 	meye.mchip_dev = pcidev;</div><div class='ctx'> 	meye.video_dev = video_device_alloc();</div><div class='ctx'> 	if (!meye.video_dev) {</div><div class='hunk'>@@ -1781,7 +1781,6 @@ static int __devinit meye_probe(struct pci_dev *pcidev,</div><div class='ctx'> 		goto outnotdev;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = -ENOMEM;</div><div class='ctx'> 	meye.grab_temp = vmalloc(MCHIP_NB_PAGES_MJPEG * PAGE_SIZE);</div><div class='ctx'> 	if (!meye.grab_temp) {</div><div class='ctx'> 		printk(KERN_ERR "meye: grab buffer allocation failed\n");</div><div class='head'>diff --git a/drivers/media/video/meye.h b/drivers/media/video/meye.h<br/>index d535748df445..5f70a106ba2b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/meye.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/meye.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/meye.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/meye.h</a></div><div class='hunk'>@@ -311,6 +311,7 @@ struct meye {</div><div class='ctx'> 	struct video_device *video_dev;	/* video device parameters */</div><div class='ctx'> 	struct video_picture picture;	/* video picture parameters */</div><div class='ctx'> 	struct meye_params params;	/* additional parameters */</div><div class='add'>+	unsigned long in_use;		/* set to 1 if the device is in use */</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> 	u8 pm_mchip_mode;		/* old mchip mode */</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/media/video/mt9m001.c b/drivers/media/video/mt9m001.c<br/>index 554d2295484e..0c524376b67e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/mt9m001.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/mt9m001.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/mt9m001.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/mt9m001.c</a></div><div class='hunk'>@@ -117,24 +117,51 @@ static int reg_clear(struct soc_camera_device *icd, const u8 reg,</div><div class='ctx'> </div><div class='ctx'> static int mt9m001_init(struct soc_camera_device *icd)</div><div class='ctx'> {</div><div class='add'>+	struct mt9m001 *mt9m001 = container_of(icd, struct mt9m001, icd);</div><div class='add'>+	struct soc_camera_link *icl = mt9m001-&gt;client-&gt;dev.platform_data;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	/* Disable chip, synchronous option update */</div><div class='ctx'> 	dev_dbg(icd-&gt;vdev-&gt;parent, "%s\n", __func__);</div><div class='ctx'> </div><div class='del'>-	ret = reg_write(icd, MT9M001_RESET, 1);</div><div class='del'>-	if (ret &gt;= 0)</div><div class='del'>-		ret = reg_write(icd, MT9M001_RESET, 0);</div><div class='del'>-	if (ret &gt;= 0)</div><div class='add'>+	if (icl-&gt;power) {</div><div class='add'>+		ret = icl-&gt;power(&amp;mt9m001-&gt;client-&gt;dev, 1);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			dev_err(icd-&gt;vdev-&gt;parent,</div><div class='add'>+				"Platform failed to power-on the camera.\n");</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* The camera could have been already on, we reset it additionally */</div><div class='add'>+	if (icl-&gt;reset)</div><div class='add'>+		ret = icl-&gt;reset(&amp;mt9m001-&gt;client-&gt;dev);</div><div class='add'>+	else</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		/* Either no platform reset, or platform reset failed */</div><div class='add'>+		ret = reg_write(icd, MT9M001_RESET, 1);</div><div class='add'>+		if (!ret)</div><div class='add'>+			ret = reg_write(icd, MT9M001_RESET, 0);</div><div class='add'>+	}</div><div class='add'>+	/* Disable chip, synchronous option update */</div><div class='add'>+	if (!ret)</div><div class='ctx'> 		ret = reg_write(icd, MT9M001_OUTPUT_CONTROL, 0);</div><div class='ctx'> </div><div class='del'>-	return ret &gt;= 0 ? 0 : -EIO;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mt9m001_release(struct soc_camera_device *icd)</div><div class='ctx'> {</div><div class='add'>+	struct mt9m001 *mt9m001 = container_of(icd, struct mt9m001, icd);</div><div class='add'>+	struct soc_camera_link *icl = mt9m001-&gt;client-&gt;dev.platform_data;</div><div class='add'>+</div><div class='ctx'> 	/* Disable the chip */</div><div class='ctx'> 	reg_write(icd, MT9M001_OUTPUT_CONTROL, 0);</div><div class='add'>+</div><div class='add'>+	if (icl-&gt;power)</div><div class='add'>+		icl-&gt;power(&amp;mt9m001-&gt;client-&gt;dev, 0);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -267,24 +294,24 @@ static int mt9m001_set_fmt_cap(struct soc_camera_device *icd,</div><div class='ctx'> </div><div class='ctx'> 	/* Blanking and start values - default... */</div><div class='ctx'> 	ret = reg_write(icd, MT9M001_HORIZONTAL_BLANKING, hblank);</div><div class='del'>-	if (ret &gt;= 0)</div><div class='add'>+	if (!ret)</div><div class='ctx'> 		ret = reg_write(icd, MT9M001_VERTICAL_BLANKING, vblank);</div><div class='ctx'> </div><div class='ctx'> 	/* The caller provides a supported format, as verified per</div><div class='ctx'> 	 * call to icd-&gt;try_fmt_cap() */</div><div class='del'>-	if (ret &gt;= 0)</div><div class='add'>+	if (!ret)</div><div class='ctx'> 		ret = reg_write(icd, MT9M001_COLUMN_START, rect-&gt;left);</div><div class='del'>-	if (ret &gt;= 0)</div><div class='add'>+	if (!ret)</div><div class='ctx'> 		ret = reg_write(icd, MT9M001_ROW_START, rect-&gt;top);</div><div class='del'>-	if (ret &gt;= 0)</div><div class='add'>+	if (!ret)</div><div class='ctx'> 		ret = reg_write(icd, MT9M001_WINDOW_WIDTH, rect-&gt;width - 1);</div><div class='del'>-	if (ret &gt;= 0)</div><div class='add'>+	if (!ret)</div><div class='ctx'> 		ret = reg_write(icd, MT9M001_WINDOW_HEIGHT,</div><div class='ctx'> 				rect-&gt;height + icd-&gt;y_skip_top - 1);</div><div class='del'>-	if (ret &gt;= 0 &amp;&amp; mt9m001-&gt;autoexposure) {</div><div class='add'>+	if (!ret &amp;&amp; mt9m001-&gt;autoexposure) {</div><div class='ctx'> 		ret = reg_write(icd, MT9M001_SHUTTER_WIDTH,</div><div class='ctx'> 				rect-&gt;height + icd-&gt;y_skip_top + vblank);</div><div class='del'>-		if (ret &gt;= 0) {</div><div class='add'>+		if (!ret) {</div><div class='ctx'> 			const struct v4l2_queryctrl *qctrl =</div><div class='ctx'> 				soc_camera_find_qctrl(icd-&gt;ops,</div><div class='ctx'> 						      V4L2_CID_EXPOSURE);</div><div class='hunk'>@@ -295,7 +322,7 @@ static int mt9m001_set_fmt_cap(struct soc_camera_device *icd,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return ret &lt; 0 ? ret : 0;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mt9m001_try_fmt_cap(struct soc_camera_device *icd,</div><div class='head'>diff --git a/drivers/media/video/mt9m111.c b/drivers/media/video/mt9m111.c<br/>new file mode 100644<br/>index 000000000000..da0b2d553fd0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/mt9m111.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/mt9m111.c</a></div><div class='hunk'>@@ -0,0 +1,973 @@</div><div class='add'>+/*</div><div class='add'>+ * Driver for MT9M111 CMOS Image Sensor from Micron</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2008, Robert Jarzmik &lt;robert.jarzmik@free.fr&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/videodev2.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/log2.h&gt;</div><div class='add'>+#include &lt;linux/gpio.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;media/v4l2-common.h&gt;</div><div class='add'>+#include &lt;media/v4l2-chip-ident.h&gt;</div><div class='add'>+#include &lt;media/soc_camera.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * mt9m111 i2c address is 0x5d or 0x48 (depending on SAddr pin)</div><div class='add'>+ * The platform has to define i2c_board_info and call i2c_register_board_info()</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* mt9m111: Sensor register addresses */</div><div class='add'>+#define MT9M111_CHIP_VERSION		0x000</div><div class='add'>+#define MT9M111_ROW_START		0x001</div><div class='add'>+#define MT9M111_COLUMN_START		0x002</div><div class='add'>+#define MT9M111_WINDOW_HEIGHT		0x003</div><div class='add'>+#define MT9M111_WINDOW_WIDTH		0x004</div><div class='add'>+#define MT9M111_HORIZONTAL_BLANKING_B	0x005</div><div class='add'>+#define MT9M111_VERTICAL_BLANKING_B	0x006</div><div class='add'>+#define MT9M111_HORIZONTAL_BLANKING_A	0x007</div><div class='add'>+#define MT9M111_VERTICAL_BLANKING_A	0x008</div><div class='add'>+#define MT9M111_SHUTTER_WIDTH		0x009</div><div class='add'>+#define MT9M111_ROW_SPEED		0x00a</div><div class='add'>+#define MT9M111_EXTRA_DELAY		0x00b</div><div class='add'>+#define MT9M111_SHUTTER_DELAY		0x00c</div><div class='add'>+#define MT9M111_RESET			0x00d</div><div class='add'>+#define MT9M111_READ_MODE_B		0x020</div><div class='add'>+#define MT9M111_READ_MODE_A		0x021</div><div class='add'>+#define MT9M111_FLASH_CONTROL		0x023</div><div class='add'>+#define MT9M111_GREEN1_GAIN		0x02b</div><div class='add'>+#define MT9M111_BLUE_GAIN		0x02c</div><div class='add'>+#define MT9M111_RED_GAIN		0x02d</div><div class='add'>+#define MT9M111_GREEN2_GAIN		0x02e</div><div class='add'>+#define MT9M111_GLOBAL_GAIN		0x02f</div><div class='add'>+#define MT9M111_CONTEXT_CONTROL		0x0c8</div><div class='add'>+#define MT9M111_PAGE_MAP		0x0f0</div><div class='add'>+#define MT9M111_BYTE_WISE_ADDR		0x0f1</div><div class='add'>+</div><div class='add'>+#define MT9M111_RESET_SYNC_CHANGES	(1 &lt;&lt; 15)</div><div class='add'>+#define MT9M111_RESET_RESTART_BAD_FRAME	(1 &lt;&lt; 9)</div><div class='add'>+#define MT9M111_RESET_SHOW_BAD_FRAMES	(1 &lt;&lt; 8)</div><div class='add'>+#define MT9M111_RESET_RESET_SOC		(1 &lt;&lt; 5)</div><div class='add'>+#define MT9M111_RESET_OUTPUT_DISABLE	(1 &lt;&lt; 4)</div><div class='add'>+#define MT9M111_RESET_CHIP_ENABLE	(1 &lt;&lt; 3)</div><div class='add'>+#define MT9M111_RESET_ANALOG_STANDBY	(1 &lt;&lt; 2)</div><div class='add'>+#define MT9M111_RESET_RESTART_FRAME	(1 &lt;&lt; 1)</div><div class='add'>+#define MT9M111_RESET_RESET_MODE	(1 &lt;&lt; 0)</div><div class='add'>+</div><div class='add'>+#define MT9M111_RMB_MIRROR_COLS		(1 &lt;&lt; 1)</div><div class='add'>+#define MT9M111_RMB_MIRROR_ROWS		(1 &lt;&lt; 0)</div><div class='add'>+#define MT9M111_CTXT_CTRL_RESTART	(1 &lt;&lt; 15)</div><div class='add'>+#define MT9M111_CTXT_CTRL_DEFECTCOR_B	(1 &lt;&lt; 12)</div><div class='add'>+#define MT9M111_CTXT_CTRL_RESIZE_B	(1 &lt;&lt; 10)</div><div class='add'>+#define MT9M111_CTXT_CTRL_CTRL2_B	(1 &lt;&lt; 9)</div><div class='add'>+#define MT9M111_CTXT_CTRL_GAMMA_B	(1 &lt;&lt; 8)</div><div class='add'>+#define MT9M111_CTXT_CTRL_XENON_EN	(1 &lt;&lt; 7)</div><div class='add'>+#define MT9M111_CTXT_CTRL_READ_MODE_B	(1 &lt;&lt; 3)</div><div class='add'>+#define MT9M111_CTXT_CTRL_LED_FLASH_EN	(1 &lt;&lt; 2)</div><div class='add'>+#define MT9M111_CTXT_CTRL_VBLANK_SEL_B	(1 &lt;&lt; 1)</div><div class='add'>+#define MT9M111_CTXT_CTRL_HBLANK_SEL_B	(1 &lt;&lt; 0)</div><div class='add'>+/*</div><div class='add'>+ * mt9m111: Colorpipe register addresses (0x100..0x1ff)</div><div class='add'>+ */</div><div class='add'>+#define MT9M111_OPER_MODE_CTRL		0x106</div><div class='add'>+#define MT9M111_OUTPUT_FORMAT_CTRL	0x108</div><div class='add'>+#define MT9M111_REDUCER_XZOOM_B		0x1a0</div><div class='add'>+#define MT9M111_REDUCER_XSIZE_B		0x1a1</div><div class='add'>+#define MT9M111_REDUCER_YZOOM_B		0x1a3</div><div class='add'>+#define MT9M111_REDUCER_YSIZE_B		0x1a4</div><div class='add'>+#define MT9M111_REDUCER_XZOOM_A		0x1a6</div><div class='add'>+#define MT9M111_REDUCER_XSIZE_A		0x1a7</div><div class='add'>+#define MT9M111_REDUCER_YZOOM_A		0x1a9</div><div class='add'>+#define MT9M111_REDUCER_YSIZE_A		0x1aa</div><div class='add'>+</div><div class='add'>+#define MT9M111_OUTPUT_FORMAT_CTRL2_A	0x13a</div><div class='add'>+#define MT9M111_OUTPUT_FORMAT_CTRL2_B	0x19b</div><div class='add'>+</div><div class='add'>+#define MT9M111_OPMODE_AUTOEXPO_EN	(1 &lt;&lt; 14)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define MT9M111_OUTFMT_PROCESSED_BAYER	(1 &lt;&lt; 14)</div><div class='add'>+#define MT9M111_OUTFMT_BYPASS_IFP	(1 &lt;&lt; 10)</div><div class='add'>+#define MT9M111_OUTFMT_INV_PIX_CLOCK	(1 &lt;&lt; 9)</div><div class='add'>+#define MT9M111_OUTFMT_RGB		(1 &lt;&lt; 8)</div><div class='add'>+#define MT9M111_OUTFMT_RGB565		(0x0 &lt;&lt; 6)</div><div class='add'>+#define MT9M111_OUTFMT_RGB555		(0x1 &lt;&lt; 6)</div><div class='add'>+#define MT9M111_OUTFMT_RGB444x		(0x2 &lt;&lt; 6)</div><div class='add'>+#define MT9M111_OUTFMT_RGBx444		(0x3 &lt;&lt; 6)</div><div class='add'>+#define MT9M111_OUTFMT_TST_RAMP_OFF	(0x0 &lt;&lt; 4)</div><div class='add'>+#define MT9M111_OUTFMT_TST_RAMP_COL	(0x1 &lt;&lt; 4)</div><div class='add'>+#define MT9M111_OUTFMT_TST_RAMP_ROW	(0x2 &lt;&lt; 4)</div><div class='add'>+#define MT9M111_OUTFMT_TST_RAMP_FRAME	(0x3 &lt;&lt; 4)</div><div class='add'>+#define MT9M111_OUTFMT_SHIFT_3_UP	(1 &lt;&lt; 3)</div><div class='add'>+#define MT9M111_OUTFMT_AVG_CHROMA	(1 &lt;&lt; 2)</div><div class='add'>+#define MT9M111_OUTFMT_SWAP_YCbCr_C_Y	(1 &lt;&lt; 1)</div><div class='add'>+#define MT9M111_OUTFMT_SWAP_RGB_EVEN	(1 &lt;&lt; 1)</div><div class='add'>+#define MT9M111_OUTFMT_SWAP_YCbCr_Cb_Cr	(1 &lt;&lt; 0)</div><div class='add'>+/*</div><div class='add'>+ * mt9m111: Camera control register addresses (0x200..0x2ff not implemented)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define reg_read(reg) mt9m111_reg_read(icd, MT9M111_##reg)</div><div class='add'>+#define reg_write(reg, val) mt9m111_reg_write(icd, MT9M111_##reg, (val))</div><div class='add'>+#define reg_set(reg, val) mt9m111_reg_set(icd, MT9M111_##reg, (val))</div><div class='add'>+#define reg_clear(reg, val) mt9m111_reg_clear(icd, MT9M111_##reg, (val))</div><div class='add'>+</div><div class='add'>+#define MT9M111_MIN_DARK_ROWS	8</div><div class='add'>+#define MT9M111_MIN_DARK_COLS	24</div><div class='add'>+#define MT9M111_MAX_HEIGHT	1024</div><div class='add'>+#define MT9M111_MAX_WIDTH	1280</div><div class='add'>+</div><div class='add'>+#define COL_FMT(_name, _depth, _fourcc, _colorspace) \</div><div class='add'>+	{ .name = _name, .depth = _depth, .fourcc = _fourcc, \</div><div class='add'>+	.colorspace = _colorspace }</div><div class='add'>+#define RGB_FMT(_name, _depth, _fourcc) \</div><div class='add'>+	COL_FMT(_name, _depth, _fourcc, V4L2_COLORSPACE_SRGB)</div><div class='add'>+</div><div class='add'>+static const struct soc_camera_data_format mt9m111_colour_formats[] = {</div><div class='add'>+	COL_FMT("YCrYCb 8 bit", 8, V4L2_PIX_FMT_YUYV, V4L2_COLORSPACE_JPEG),</div><div class='add'>+	RGB_FMT("RGB 565", 16, V4L2_PIX_FMT_RGB565),</div><div class='add'>+	RGB_FMT("RGB 555", 16, V4L2_PIX_FMT_RGB555),</div><div class='add'>+	RGB_FMT("Bayer (sRGB) 10 bit", 10, V4L2_PIX_FMT_SBGGR16),</div><div class='add'>+	RGB_FMT("Bayer (sRGB) 8 bit", 8, V4L2_PIX_FMT_SBGGR8),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum mt9m111_context {</div><div class='add'>+	HIGHPOWER = 0,</div><div class='add'>+	LOWPOWER,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mt9m111 {</div><div class='add'>+	struct i2c_client *client;</div><div class='add'>+	struct soc_camera_device icd;</div><div class='add'>+	int model;	/* V4L2_IDENT_MT9M111* codes from v4l2-chip-ident.h */</div><div class='add'>+	enum mt9m111_context context;</div><div class='add'>+	unsigned int left, top, width, height;</div><div class='add'>+	u32 pixfmt;</div><div class='add'>+	unsigned char autoexposure;</div><div class='add'>+	unsigned char datawidth;</div><div class='add'>+	unsigned int powered:1;</div><div class='add'>+	unsigned int hflip:1;</div><div class='add'>+	unsigned int vflip:1;</div><div class='add'>+	unsigned int swap_rgb_even_odd:1;</div><div class='add'>+	unsigned int swap_rgb_red_blue:1;</div><div class='add'>+	unsigned int swap_yuv_y_chromas:1;</div><div class='add'>+	unsigned int swap_yuv_cb_cr:1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int reg_page_map_set(struct i2c_client *client, const u16 reg)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u16 page;</div><div class='add'>+	static int lastpage = -1;	/* PageMap cache value */</div><div class='add'>+</div><div class='add'>+	page = (reg &gt;&gt; 8);</div><div class='add'>+	if (page == lastpage)</div><div class='add'>+		return 0;</div><div class='add'>+	if (page &gt; 2)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ret = i2c_smbus_write_word_data(client, MT9M111_PAGE_MAP, swab16(page));</div><div class='add'>+	if (!ret)</div><div class='add'>+		lastpage = page;</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt9m111_reg_read(struct soc_camera_device *icd, const u16 reg)</div><div class='add'>+{</div><div class='add'>+	struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);</div><div class='add'>+	struct i2c_client *client = mt9m111-&gt;client;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = reg_page_map_set(client, reg);</div><div class='add'>+	if (!ret)</div><div class='add'>+		ret = swab16(i2c_smbus_read_word_data(client, (reg &amp; 0xff)));</div><div class='add'>+</div><div class='add'>+	dev_dbg(&amp;icd-&gt;dev, "read  reg.%03x -&gt; %04x\n", reg, ret);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt9m111_reg_write(struct soc_camera_device *icd, const u16 reg,</div><div class='add'>+			     const u16 data)</div><div class='add'>+{</div><div class='add'>+	struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);</div><div class='add'>+	struct i2c_client *client = mt9m111-&gt;client;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = reg_page_map_set(client, reg);</div><div class='add'>+	if (!ret)</div><div class='add'>+		ret = i2c_smbus_write_word_data(mt9m111-&gt;client, (reg &amp; 0xff),</div><div class='add'>+						swab16(data));</div><div class='add'>+	dev_dbg(&amp;icd-&gt;dev, "write reg.%03x = %04x -&gt; %d\n", reg, data, ret);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt9m111_reg_set(struct soc_camera_device *icd, const u16 reg,</div><div class='add'>+			   const u16 data)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = mt9m111_reg_read(icd, reg);</div><div class='add'>+	if (ret &gt;= 0)</div><div class='add'>+		ret = mt9m111_reg_write(icd, reg, ret | data);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt9m111_reg_clear(struct soc_camera_device *icd, const u16 reg,</div><div class='add'>+			     const u16 data)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = mt9m111_reg_read(icd, reg);</div><div class='add'>+	return mt9m111_reg_write(icd, reg, ret &amp; ~data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt9m111_set_context(struct soc_camera_device *icd,</div><div class='add'>+			       enum mt9m111_context ctxt)</div><div class='add'>+{</div><div class='add'>+	int valB = MT9M111_CTXT_CTRL_RESTART | MT9M111_CTXT_CTRL_DEFECTCOR_B</div><div class='add'>+		| MT9M111_CTXT_CTRL_RESIZE_B | MT9M111_CTXT_CTRL_CTRL2_B</div><div class='add'>+		| MT9M111_CTXT_CTRL_GAMMA_B | MT9M111_CTXT_CTRL_READ_MODE_B</div><div class='add'>+		| MT9M111_CTXT_CTRL_VBLANK_SEL_B</div><div class='add'>+		| MT9M111_CTXT_CTRL_HBLANK_SEL_B;</div><div class='add'>+	int valA = MT9M111_CTXT_CTRL_RESTART;</div><div class='add'>+</div><div class='add'>+	if (ctxt == HIGHPOWER)</div><div class='add'>+		return reg_write(CONTEXT_CONTROL, valB);</div><div class='add'>+	else</div><div class='add'>+		return reg_write(CONTEXT_CONTROL, valA);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt9m111_setup_rect(struct soc_camera_device *icd)</div><div class='add'>+{</div><div class='add'>+	struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);</div><div class='add'>+	int ret, is_raw_format;</div><div class='add'>+	int width = mt9m111-&gt;width;</div><div class='add'>+	int height = mt9m111-&gt;height;</div><div class='add'>+</div><div class='add'>+	if ((mt9m111-&gt;pixfmt == V4L2_PIX_FMT_SBGGR8)</div><div class='add'>+	    || (mt9m111-&gt;pixfmt == V4L2_PIX_FMT_SBGGR16))</div><div class='add'>+		is_raw_format = 1;</div><div class='add'>+	else</div><div class='add'>+		is_raw_format = 0;</div><div class='add'>+</div><div class='add'>+	ret = reg_write(COLUMN_START, mt9m111-&gt;left);</div><div class='add'>+	if (!ret)</div><div class='add'>+		ret = reg_write(ROW_START, mt9m111-&gt;top);</div><div class='add'>+</div><div class='add'>+	if (is_raw_format) {</div><div class='add'>+		if (!ret)</div><div class='add'>+			ret = reg_write(WINDOW_WIDTH, width);</div><div class='add'>+		if (!ret)</div><div class='add'>+			ret = reg_write(WINDOW_HEIGHT, height);</div><div class='add'>+	} else {</div><div class='add'>+		if (!ret)</div><div class='add'>+			ret = reg_write(REDUCER_XZOOM_B, MT9M111_MAX_WIDTH);</div><div class='add'>+		if (!ret)</div><div class='add'>+			ret = reg_write(REDUCER_YZOOM_B, MT9M111_MAX_HEIGHT);</div><div class='add'>+		if (!ret)</div><div class='add'>+			ret = reg_write(REDUCER_XSIZE_B, width);</div><div class='add'>+		if (!ret)</div><div class='add'>+			ret = reg_write(REDUCER_YSIZE_B, height);</div><div class='add'>+		if (!ret)</div><div class='add'>+			ret = reg_write(REDUCER_XZOOM_A, MT9M111_MAX_WIDTH);</div><div class='add'>+		if (!ret)</div><div class='add'>+			ret = reg_write(REDUCER_YZOOM_A, MT9M111_MAX_HEIGHT);</div><div class='add'>+		if (!ret)</div><div class='add'>+			ret = reg_write(REDUCER_XSIZE_A, width);</div><div class='add'>+		if (!ret)</div><div class='add'>+			ret = reg_write(REDUCER_YSIZE_A, height);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt9m111_setup_pixfmt(struct soc_camera_device *icd, u16 outfmt)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = reg_write(OUTPUT_FORMAT_CTRL2_A, outfmt);</div><div class='add'>+	if (!ret)</div><div class='add'>+		ret = reg_write(OUTPUT_FORMAT_CTRL2_B, outfmt);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt9m111_setfmt_bayer8(struct soc_camera_device *icd)</div><div class='add'>+{</div><div class='add'>+	return mt9m111_setup_pixfmt(icd, MT9M111_OUTFMT_PROCESSED_BAYER);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt9m111_setfmt_bayer10(struct soc_camera_device *icd)</div><div class='add'>+{</div><div class='add'>+	return mt9m111_setup_pixfmt(icd, MT9M111_OUTFMT_BYPASS_IFP);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt9m111_setfmt_rgb565(struct soc_camera_device *icd)</div><div class='add'>+{</div><div class='add'>+	struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);</div><div class='add'>+	int val = 0;</div><div class='add'>+</div><div class='add'>+	if (mt9m111-&gt;swap_rgb_red_blue)</div><div class='add'>+		val |= MT9M111_OUTFMT_SWAP_YCbCr_Cb_Cr;</div><div class='add'>+	if (mt9m111-&gt;swap_rgb_even_odd)</div><div class='add'>+		val |= MT9M111_OUTFMT_SWAP_RGB_EVEN;</div><div class='add'>+	val |= MT9M111_OUTFMT_RGB | MT9M111_OUTFMT_RGB565;</div><div class='add'>+</div><div class='add'>+	return mt9m111_setup_pixfmt(icd, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt9m111_setfmt_rgb555(struct soc_camera_device *icd)</div><div class='add'>+{</div><div class='add'>+	struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);</div><div class='add'>+	int val = 0;</div><div class='add'>+</div><div class='add'>+	if (mt9m111-&gt;swap_rgb_red_blue)</div><div class='add'>+		val |= MT9M111_OUTFMT_SWAP_YCbCr_Cb_Cr;</div><div class='add'>+	if (mt9m111-&gt;swap_rgb_even_odd)</div><div class='add'>+		val |= MT9M111_OUTFMT_SWAP_RGB_EVEN;</div><div class='add'>+	val |= MT9M111_OUTFMT_RGB | MT9M111_OUTFMT_RGB555;</div><div class='add'>+</div><div class='add'>+	return mt9m111_setup_pixfmt(icd, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt9m111_setfmt_yuv(struct soc_camera_device *icd)</div><div class='add'>+{</div><div class='add'>+	struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);</div><div class='add'>+	int val = 0;</div><div class='add'>+</div><div class='add'>+	if (mt9m111-&gt;swap_yuv_cb_cr)</div><div class='add'>+		val |= MT9M111_OUTFMT_SWAP_YCbCr_Cb_Cr;</div><div class='add'>+	if (mt9m111-&gt;swap_yuv_y_chromas)</div><div class='add'>+		val |= MT9M111_OUTFMT_SWAP_YCbCr_C_Y;</div><div class='add'>+</div><div class='add'>+	return mt9m111_setup_pixfmt(icd, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt9m111_enable(struct soc_camera_device *icd)</div><div class='add'>+{</div><div class='add'>+	struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);</div><div class='add'>+	struct soc_camera_link *icl = mt9m111-&gt;client-&gt;dev.platform_data;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (icl-&gt;power) {</div><div class='add'>+		ret = icl-&gt;power(&amp;mt9m111-&gt;client-&gt;dev, 1);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			dev_err(icd-&gt;vdev-&gt;parent,</div><div class='add'>+				"Platform failed to power-on the camera.\n");</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = reg_set(RESET, MT9M111_RESET_CHIP_ENABLE);</div><div class='add'>+	if (!ret)</div><div class='add'>+		mt9m111-&gt;powered = 1;</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt9m111_disable(struct soc_camera_device *icd)</div><div class='add'>+{</div><div class='add'>+	struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);</div><div class='add'>+	struct soc_camera_link *icl = mt9m111-&gt;client-&gt;dev.platform_data;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = reg_clear(RESET, MT9M111_RESET_CHIP_ENABLE);</div><div class='add'>+	if (!ret)</div><div class='add'>+		mt9m111-&gt;powered = 0;</div><div class='add'>+</div><div class='add'>+	if (icl-&gt;power)</div><div class='add'>+		icl-&gt;power(&amp;mt9m111-&gt;client-&gt;dev, 0);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt9m111_reset(struct soc_camera_device *icd)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = reg_set(RESET, MT9M111_RESET_RESET_MODE);</div><div class='add'>+	if (!ret)</div><div class='add'>+		ret = reg_set(RESET, MT9M111_RESET_RESET_SOC);</div><div class='add'>+	if (!ret)</div><div class='add'>+		ret = reg_clear(RESET, MT9M111_RESET_RESET_MODE</div><div class='add'>+				| MT9M111_RESET_RESET_SOC);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt9m111_start_capture(struct soc_camera_device *icd)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt9m111_stop_capture(struct soc_camera_device *icd)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned long mt9m111_query_bus_param(struct soc_camera_device *icd)</div><div class='add'>+{</div><div class='add'>+	return SOCAM_MASTER | SOCAM_PCLK_SAMPLE_RISING |</div><div class='add'>+		SOCAM_HSYNC_ACTIVE_HIGH | SOCAM_VSYNC_ACTIVE_HIGH |</div><div class='add'>+		SOCAM_DATAWIDTH_8;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt9m111_set_bus_param(struct soc_camera_device *icd, unsigned long f)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt9m111_set_pixfmt(struct soc_camera_device *icd, u32 pixfmt)</div><div class='add'>+{</div><div class='add'>+	struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	switch (pixfmt) {</div><div class='add'>+	case V4L2_PIX_FMT_SBGGR8:</div><div class='add'>+		ret = mt9m111_setfmt_bayer8(icd);</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_PIX_FMT_SBGGR16:</div><div class='add'>+		ret = mt9m111_setfmt_bayer10(icd);</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_PIX_FMT_RGB555:</div><div class='add'>+		ret = mt9m111_setfmt_rgb555(icd);</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_PIX_FMT_RGB565:</div><div class='add'>+		ret = mt9m111_setfmt_rgb565(icd);</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_PIX_FMT_YUYV:</div><div class='add'>+		ret = mt9m111_setfmt_yuv(icd);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dev_err(&amp;icd-&gt;dev, "Pixel format not handled : %x\n", pixfmt);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!ret)</div><div class='add'>+		mt9m111-&gt;pixfmt = pixfmt;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt9m111_set_fmt_cap(struct soc_camera_device *icd,</div><div class='add'>+			       __u32 pixfmt, struct v4l2_rect *rect)</div><div class='add'>+{</div><div class='add'>+	struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mt9m111-&gt;left = rect-&gt;left;</div><div class='add'>+	mt9m111-&gt;top = rect-&gt;top;</div><div class='add'>+	mt9m111-&gt;width = rect-&gt;width;</div><div class='add'>+	mt9m111-&gt;height = rect-&gt;height;</div><div class='add'>+</div><div class='add'>+	dev_dbg(&amp;icd-&gt;dev, "%s fmt=%x left=%d, top=%d, width=%d, height=%d\n",</div><div class='add'>+		__func__, pixfmt, mt9m111-&gt;left, mt9m111-&gt;top, mt9m111-&gt;width,</div><div class='add'>+		mt9m111-&gt;height);</div><div class='add'>+</div><div class='add'>+	ret = mt9m111_setup_rect(icd);</div><div class='add'>+	if (!ret)</div><div class='add'>+		ret = mt9m111_set_pixfmt(icd, pixfmt);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt9m111_try_fmt_cap(struct soc_camera_device *icd,</div><div class='add'>+			       struct v4l2_format *f)</div><div class='add'>+{</div><div class='add'>+	if (f-&gt;fmt.pix.height &gt; MT9M111_MAX_HEIGHT)</div><div class='add'>+		f-&gt;fmt.pix.height = MT9M111_MAX_HEIGHT;</div><div class='add'>+	if (f-&gt;fmt.pix.width &gt; MT9M111_MAX_WIDTH)</div><div class='add'>+		f-&gt;fmt.pix.width = MT9M111_MAX_WIDTH;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt9m111_get_chip_id(struct soc_camera_device *icd,</div><div class='add'>+			       struct v4l2_chip_ident *id)</div><div class='add'>+{</div><div class='add'>+	struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);</div><div class='add'>+</div><div class='add'>+	if (id-&gt;match_type != V4L2_CHIP_MATCH_I2C_ADDR)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (id-&gt;match_chip != mt9m111-&gt;client-&gt;addr)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	id-&gt;ident	= mt9m111-&gt;model;</div><div class='add'>+	id-&gt;revision	= 0;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_VIDEO_ADV_DEBUG</div><div class='add'>+static int mt9m111_get_register(struct soc_camera_device *icd,</div><div class='add'>+				struct v4l2_register *reg)</div><div class='add'>+{</div><div class='add'>+	int val;</div><div class='add'>+</div><div class='add'>+	struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);</div><div class='add'>+</div><div class='add'>+	if (reg-&gt;match_type != V4L2_CHIP_MATCH_I2C_ADDR || reg-&gt;reg &gt; 0x2ff)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (reg-&gt;match_chip != mt9m111-&gt;client-&gt;addr)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	val = mt9m111_reg_read(icd, reg-&gt;reg);</div><div class='add'>+	reg-&gt;val = (u64)val;</div><div class='add'>+</div><div class='add'>+	if (reg-&gt;val &gt; 0xffff)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt9m111_set_register(struct soc_camera_device *icd,</div><div class='add'>+				struct v4l2_register *reg)</div><div class='add'>+{</div><div class='add'>+	struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);</div><div class='add'>+</div><div class='add'>+	if (reg-&gt;match_type != V4L2_CHIP_MATCH_I2C_ADDR || reg-&gt;reg &gt; 0x2ff)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (reg-&gt;match_chip != mt9m111-&gt;client-&gt;addr)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	if (mt9m111_reg_write(icd, reg-&gt;reg, reg-&gt;val) &lt; 0)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static const struct v4l2_queryctrl mt9m111_controls[] = {</div><div class='add'>+	{</div><div class='add'>+		.id		= V4L2_CID_VFLIP,</div><div class='add'>+		.type		= V4L2_CTRL_TYPE_BOOLEAN,</div><div class='add'>+		.name		= "Flip Verticaly",</div><div class='add'>+		.minimum	= 0,</div><div class='add'>+		.maximum	= 1,</div><div class='add'>+		.step		= 1,</div><div class='add'>+		.default_value	= 0,</div><div class='add'>+	}, {</div><div class='add'>+		.id		= V4L2_CID_HFLIP,</div><div class='add'>+		.type		= V4L2_CTRL_TYPE_BOOLEAN,</div><div class='add'>+		.name		= "Flip Horizontaly",</div><div class='add'>+		.minimum	= 0,</div><div class='add'>+		.maximum	= 1,</div><div class='add'>+		.step		= 1,</div><div class='add'>+		.default_value	= 0,</div><div class='add'>+	}, {	/* gain = 1/32*val (=&gt;gain=1 if val==32) */</div><div class='add'>+		.id		= V4L2_CID_GAIN,</div><div class='add'>+		.type		= V4L2_CTRL_TYPE_INTEGER,</div><div class='add'>+		.name		= "Gain",</div><div class='add'>+		.minimum	= 0,</div><div class='add'>+		.maximum	= 63 * 2 * 2,</div><div class='add'>+		.step		= 1,</div><div class='add'>+		.default_value	= 32,</div><div class='add'>+		.flags		= V4L2_CTRL_FLAG_SLIDER,</div><div class='add'>+	}, {</div><div class='add'>+		.id		= V4L2_CID_EXPOSURE_AUTO,</div><div class='add'>+		.type		= V4L2_CTRL_TYPE_BOOLEAN,</div><div class='add'>+		.name		= "Auto Exposure",</div><div class='add'>+		.minimum	= 0,</div><div class='add'>+		.maximum	= 1,</div><div class='add'>+		.step		= 1,</div><div class='add'>+		.default_value	= 1,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int mt9m111_video_probe(struct soc_camera_device *);</div><div class='add'>+static void mt9m111_video_remove(struct soc_camera_device *);</div><div class='add'>+static int mt9m111_get_control(struct soc_camera_device *,</div><div class='add'>+			       struct v4l2_control *);</div><div class='add'>+static int mt9m111_set_control(struct soc_camera_device *,</div><div class='add'>+			       struct v4l2_control *);</div><div class='add'>+static int mt9m111_resume(struct soc_camera_device *icd);</div><div class='add'>+static int mt9m111_init(struct soc_camera_device *icd);</div><div class='add'>+static int mt9m111_release(struct soc_camera_device *icd);</div><div class='add'>+</div><div class='add'>+static struct soc_camera_ops mt9m111_ops = {</div><div class='add'>+	.owner			= THIS_MODULE,</div><div class='add'>+	.probe			= mt9m111_video_probe,</div><div class='add'>+	.remove			= mt9m111_video_remove,</div><div class='add'>+	.init			= mt9m111_init,</div><div class='add'>+	.resume			= mt9m111_resume,</div><div class='add'>+	.release		= mt9m111_release,</div><div class='add'>+	.start_capture		= mt9m111_start_capture,</div><div class='add'>+	.stop_capture		= mt9m111_stop_capture,</div><div class='add'>+	.set_fmt_cap		= mt9m111_set_fmt_cap,</div><div class='add'>+	.try_fmt_cap		= mt9m111_try_fmt_cap,</div><div class='add'>+	.query_bus_param	= mt9m111_query_bus_param,</div><div class='add'>+	.set_bus_param		= mt9m111_set_bus_param,</div><div class='add'>+	.controls		= mt9m111_controls,</div><div class='add'>+	.num_controls		= ARRAY_SIZE(mt9m111_controls),</div><div class='add'>+	.get_control		= mt9m111_get_control,</div><div class='add'>+	.set_control		= mt9m111_set_control,</div><div class='add'>+	.get_chip_id		= mt9m111_get_chip_id,</div><div class='add'>+#ifdef CONFIG_VIDEO_ADV_DEBUG</div><div class='add'>+	.get_register		= mt9m111_get_register,</div><div class='add'>+	.set_register		= mt9m111_set_register,</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int mt9m111_set_flip(struct soc_camera_device *icd, int flip, int mask)</div><div class='add'>+{</div><div class='add'>+	struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (mt9m111-&gt;context == HIGHPOWER) {</div><div class='add'>+		if (flip)</div><div class='add'>+			ret = reg_set(READ_MODE_B, mask);</div><div class='add'>+		else</div><div class='add'>+			ret = reg_clear(READ_MODE_B, mask);</div><div class='add'>+	} else {</div><div class='add'>+		if (flip)</div><div class='add'>+			ret = reg_set(READ_MODE_A, mask);</div><div class='add'>+		else</div><div class='add'>+			ret = reg_clear(READ_MODE_A, mask);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt9m111_get_global_gain(struct soc_camera_device *icd)</div><div class='add'>+{</div><div class='add'>+	unsigned int data, gain;</div><div class='add'>+</div><div class='add'>+	data = reg_read(GLOBAL_GAIN);</div><div class='add'>+	if (data &gt;= 0)</div><div class='add'>+		gain = ((data &amp; (1 &lt;&lt; 10)) * 2)</div><div class='add'>+			| ((data &amp; (1 &lt;&lt; 9)) * 2)</div><div class='add'>+			| (data &amp; 0x2f);</div><div class='add'>+	else</div><div class='add'>+		gain = data;</div><div class='add'>+</div><div class='add'>+	return gain;</div><div class='add'>+}</div><div class='add'>+static int mt9m111_set_global_gain(struct soc_camera_device *icd, int gain)</div><div class='add'>+{</div><div class='add'>+	u16 val;</div><div class='add'>+</div><div class='add'>+	if (gain &gt; 63 * 2 * 2)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	icd-&gt;gain = gain;</div><div class='add'>+	if ((gain &gt;= 64 * 2) &amp;&amp; (gain &lt; 63 * 2 * 2))</div><div class='add'>+		val = (1 &lt;&lt; 10) | (1 &lt;&lt; 9) | (gain / 4);</div><div class='add'>+	else if ((gain &gt;= 64) &amp;&amp; (gain &lt; 64 * 2))</div><div class='add'>+		val = (1 &lt;&lt; 9) | (gain / 2);</div><div class='add'>+	else</div><div class='add'>+		val = gain;</div><div class='add'>+</div><div class='add'>+	return reg_write(GLOBAL_GAIN, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt9m111_set_autoexposure(struct soc_camera_device *icd, int on)</div><div class='add'>+{</div><div class='add'>+	struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (on)</div><div class='add'>+		ret = reg_set(OPER_MODE_CTRL, MT9M111_OPMODE_AUTOEXPO_EN);</div><div class='add'>+	else</div><div class='add'>+		ret = reg_clear(OPER_MODE_CTRL, MT9M111_OPMODE_AUTOEXPO_EN);</div><div class='add'>+</div><div class='add'>+	if (!ret)</div><div class='add'>+		mt9m111-&gt;autoexposure = on;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+static int mt9m111_get_control(struct soc_camera_device *icd,</div><div class='add'>+			       struct v4l2_control *ctrl)</div><div class='add'>+{</div><div class='add'>+	struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);</div><div class='add'>+	int data;</div><div class='add'>+</div><div class='add'>+	switch (ctrl-&gt;id) {</div><div class='add'>+	case V4L2_CID_VFLIP:</div><div class='add'>+		if (mt9m111-&gt;context == HIGHPOWER)</div><div class='add'>+			data = reg_read(READ_MODE_B);</div><div class='add'>+		else</div><div class='add'>+			data = reg_read(READ_MODE_A);</div><div class='add'>+</div><div class='add'>+		if (data &lt; 0)</div><div class='add'>+			return -EIO;</div><div class='add'>+		ctrl-&gt;value = !!(data &amp; MT9M111_RMB_MIRROR_ROWS);</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_CID_HFLIP:</div><div class='add'>+		if (mt9m111-&gt;context == HIGHPOWER)</div><div class='add'>+			data = reg_read(READ_MODE_B);</div><div class='add'>+		else</div><div class='add'>+			data = reg_read(READ_MODE_A);</div><div class='add'>+</div><div class='add'>+		if (data &lt; 0)</div><div class='add'>+			return -EIO;</div><div class='add'>+		ctrl-&gt;value = !!(data &amp; MT9M111_RMB_MIRROR_COLS);</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_CID_GAIN:</div><div class='add'>+		data = mt9m111_get_global_gain(icd);</div><div class='add'>+		if (data &lt; 0)</div><div class='add'>+			return data;</div><div class='add'>+		ctrl-&gt;value = data;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_CID_EXPOSURE_AUTO:</div><div class='add'>+		ctrl-&gt;value = mt9m111-&gt;autoexposure;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt9m111_set_control(struct soc_camera_device *icd,</div><div class='add'>+			       struct v4l2_control *ctrl)</div><div class='add'>+{</div><div class='add'>+	struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);</div><div class='add'>+	const struct v4l2_queryctrl *qctrl;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	qctrl = soc_camera_find_qctrl(&amp;mt9m111_ops, ctrl-&gt;id);</div><div class='add'>+</div><div class='add'>+	if (!qctrl)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	switch (ctrl-&gt;id) {</div><div class='add'>+	case V4L2_CID_VFLIP:</div><div class='add'>+		mt9m111-&gt;vflip = ctrl-&gt;value;</div><div class='add'>+		ret = mt9m111_set_flip(icd, ctrl-&gt;value,</div><div class='add'>+					MT9M111_RMB_MIRROR_ROWS);</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_CID_HFLIP:</div><div class='add'>+		mt9m111-&gt;hflip = ctrl-&gt;value;</div><div class='add'>+		ret = mt9m111_set_flip(icd, ctrl-&gt;value,</div><div class='add'>+					MT9M111_RMB_MIRROR_COLS);</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_CID_GAIN:</div><div class='add'>+		ret = mt9m111_set_global_gain(icd, ctrl-&gt;value);</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_CID_EXPOSURE_AUTO:</div><div class='add'>+		ret =  mt9m111_set_autoexposure(icd, ctrl-&gt;value);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt9m111_restore_state(struct soc_camera_device *icd)</div><div class='add'>+{</div><div class='add'>+	struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);</div><div class='add'>+</div><div class='add'>+	mt9m111_set_context(icd, mt9m111-&gt;context);</div><div class='add'>+	mt9m111_set_pixfmt(icd, mt9m111-&gt;pixfmt);</div><div class='add'>+	mt9m111_setup_rect(icd);</div><div class='add'>+	mt9m111_set_flip(icd, mt9m111-&gt;hflip, MT9M111_RMB_MIRROR_COLS);</div><div class='add'>+	mt9m111_set_flip(icd, mt9m111-&gt;vflip, MT9M111_RMB_MIRROR_ROWS);</div><div class='add'>+	mt9m111_set_global_gain(icd, icd-&gt;gain);</div><div class='add'>+	mt9m111_set_autoexposure(icd, mt9m111-&gt;autoexposure);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt9m111_resume(struct soc_camera_device *icd)</div><div class='add'>+{</div><div class='add'>+	struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (mt9m111-&gt;powered) {</div><div class='add'>+		ret = mt9m111_enable(icd);</div><div class='add'>+		if (!ret)</div><div class='add'>+			ret = mt9m111_reset(icd);</div><div class='add'>+		if (!ret)</div><div class='add'>+			ret = mt9m111_restore_state(icd);</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt9m111_init(struct soc_camera_device *icd)</div><div class='add'>+{</div><div class='add'>+	struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mt9m111-&gt;context = HIGHPOWER;</div><div class='add'>+	ret = mt9m111_enable(icd);</div><div class='add'>+	if (!ret)</div><div class='add'>+		ret = mt9m111_reset(icd);</div><div class='add'>+	if (!ret)</div><div class='add'>+		ret = mt9m111_set_context(icd, mt9m111-&gt;context);</div><div class='add'>+	if (!ret)</div><div class='add'>+		ret = mt9m111_set_autoexposure(icd, mt9m111-&gt;autoexposure);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_err(&amp;icd-&gt;dev, "mt9m111 init failed: %d\n", ret);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt9m111_release(struct soc_camera_device *icd)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = mt9m111_disable(icd);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		dev_err(&amp;icd-&gt;dev, "mt9m111 release failed: %d\n", ret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Interface active, can use i2c. If it fails, it can indeed mean, that</div><div class='add'>+ * this wasn't our capture interface, so, we wait for the right one</div><div class='add'>+ */</div><div class='add'>+static int mt9m111_video_probe(struct soc_camera_device *icd)</div><div class='add'>+{</div><div class='add'>+	struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);</div><div class='add'>+	s32 data;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We must have a parent by now. And it cannot be a wrong one.</div><div class='add'>+	 * So this entire test is completely redundant.</div><div class='add'>+	 */</div><div class='add'>+	if (!icd-&gt;dev.parent ||</div><div class='add'>+	    to_soc_camera_host(icd-&gt;dev.parent)-&gt;nr != icd-&gt;iface)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	ret = mt9m111_enable(icd);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto ei2c;</div><div class='add'>+	ret = mt9m111_reset(icd);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto ei2c;</div><div class='add'>+</div><div class='add'>+	data = reg_read(CHIP_VERSION);</div><div class='add'>+</div><div class='add'>+	switch (data) {</div><div class='add'>+	case 0x143a:</div><div class='add'>+		mt9m111-&gt;model = V4L2_IDENT_MT9M111;</div><div class='add'>+		icd-&gt;formats = mt9m111_colour_formats;</div><div class='add'>+		icd-&gt;num_formats = ARRAY_SIZE(mt9m111_colour_formats);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		dev_err(&amp;icd-&gt;dev,</div><div class='add'>+			"No MT9M111 chip detected, register read %x\n", data);</div><div class='add'>+		goto ei2c;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_info(&amp;icd-&gt;dev, "Detected a MT9M111 chip ID 0x143a\n");</div><div class='add'>+</div><div class='add'>+	ret = soc_camera_video_start(icd);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto eisis;</div><div class='add'>+</div><div class='add'>+	mt9m111-&gt;autoexposure = 1;</div><div class='add'>+</div><div class='add'>+	mt9m111-&gt;swap_rgb_even_odd = 1;</div><div class='add'>+	mt9m111-&gt;swap_rgb_red_blue = 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+eisis:</div><div class='add'>+ei2c:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt9m111_video_remove(struct soc_camera_device *icd)</div><div class='add'>+{</div><div class='add'>+	struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);</div><div class='add'>+</div><div class='add'>+	dev_dbg(&amp;icd-&gt;dev, "Video %x removed: %p, %p\n", mt9m111-&gt;client-&gt;addr,</div><div class='add'>+		mt9m111-&gt;icd.dev.parent, mt9m111-&gt;icd.vdev);</div><div class='add'>+	soc_camera_video_stop(&amp;mt9m111-&gt;icd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt9m111_probe(struct i2c_client *client,</div><div class='add'>+			 const struct i2c_device_id *did)</div><div class='add'>+{</div><div class='add'>+	struct mt9m111 *mt9m111;</div><div class='add'>+	struct soc_camera_device *icd;</div><div class='add'>+	struct i2c_adapter *adapter = to_i2c_adapter(client-&gt;dev.parent);</div><div class='add'>+	struct soc_camera_link *icl = client-&gt;dev.platform_data;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!icl) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "MT9M111 driver needs platform data\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_WORD_DATA)) {</div><div class='add'>+		dev_warn(&amp;adapter-&gt;dev,</div><div class='add'>+			 "I2C-Adapter doesn't support I2C_FUNC_SMBUS_WORD\n");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mt9m111 = kzalloc(sizeof(struct mt9m111), GFP_KERNEL);</div><div class='add'>+	if (!mt9m111)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	mt9m111-&gt;client = client;</div><div class='add'>+	i2c_set_clientdata(client, mt9m111);</div><div class='add'>+</div><div class='add'>+	/* Second stage probe - when a capture adapter is there */</div><div class='add'>+	icd 		= &amp;mt9m111-&gt;icd;</div><div class='add'>+	icd-&gt;ops	= &amp;mt9m111_ops;</div><div class='add'>+	icd-&gt;control	= &amp;client-&gt;dev;</div><div class='add'>+	icd-&gt;x_min	= MT9M111_MIN_DARK_COLS;</div><div class='add'>+	icd-&gt;y_min	= MT9M111_MIN_DARK_ROWS;</div><div class='add'>+	icd-&gt;x_current	= icd-&gt;x_min;</div><div class='add'>+	icd-&gt;y_current	= icd-&gt;y_min;</div><div class='add'>+	icd-&gt;width_min	= MT9M111_MIN_DARK_ROWS;</div><div class='add'>+	icd-&gt;width_max	= MT9M111_MAX_WIDTH;</div><div class='add'>+	icd-&gt;height_min	= MT9M111_MIN_DARK_COLS;</div><div class='add'>+	icd-&gt;height_max	= MT9M111_MAX_HEIGHT;</div><div class='add'>+	icd-&gt;y_skip_top	= 0;</div><div class='add'>+	icd-&gt;iface	= icl-&gt;bus_id;</div><div class='add'>+</div><div class='add'>+	ret = soc_camera_device_register(icd);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto eisdr;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+eisdr:</div><div class='add'>+	kfree(mt9m111);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt9m111_remove(struct i2c_client *client)</div><div class='add'>+{</div><div class='add'>+	struct mt9m111 *mt9m111 = i2c_get_clientdata(client);</div><div class='add'>+	soc_camera_device_unregister(&amp;mt9m111-&gt;icd);</div><div class='add'>+	kfree(mt9m111);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct i2c_device_id mt9m111_id[] = {</div><div class='add'>+	{ "mt9m111", 0 },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(i2c, mt9m111_id);</div><div class='add'>+</div><div class='add'>+static struct i2c_driver mt9m111_i2c_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = "mt9m111",</div><div class='add'>+	},</div><div class='add'>+	.probe		= mt9m111_probe,</div><div class='add'>+	.remove		= mt9m111_remove,</div><div class='add'>+	.id_table	= mt9m111_id,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init mt9m111_mod_init(void)</div><div class='add'>+{</div><div class='add'>+	return i2c_add_driver(&amp;mt9m111_i2c_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit mt9m111_mod_exit(void)</div><div class='add'>+{</div><div class='add'>+	i2c_del_driver(&amp;mt9m111_i2c_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(mt9m111_mod_init);</div><div class='add'>+module_exit(mt9m111_mod_exit);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("Micron MT9M111 Camera driver");</div><div class='add'>+MODULE_AUTHOR("Robert Jarzmik");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/media/video/mt9v022.c b/drivers/media/video/mt9v022.c<br/>index 56808cd2f8a9..2584201059d8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/mt9v022.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/mt9v022.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/mt9v022.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/mt9v022.c</a></div><div class='hunk'>@@ -134,34 +134,56 @@ static int reg_clear(struct soc_camera_device *icd, const u8 reg,</div><div class='ctx'> static int mt9v022_init(struct soc_camera_device *icd)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt9v022 *mt9v022 = container_of(icd, struct mt9v022, icd);</div><div class='add'>+	struct soc_camera_link *icl = mt9v022-&gt;client-&gt;dev.platform_data;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	if (icl-&gt;power) {</div><div class='add'>+		ret = icl-&gt;power(&amp;mt9v022-&gt;client-&gt;dev, 1);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			dev_err(icd-&gt;vdev-&gt;parent,</div><div class='add'>+				"Platform failed to power-on the camera.\n");</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The camera could have been already on, we hard-reset it additionally,</div><div class='add'>+	 * if available. Soft reset is done in video_probe().</div><div class='add'>+	 */</div><div class='add'>+	if (icl-&gt;reset)</div><div class='add'>+		icl-&gt;reset(&amp;mt9v022-&gt;client-&gt;dev);</div><div class='add'>+</div><div class='ctx'> 	/* Almost the default mode: master, parallel, simultaneous, and an</div><div class='ctx'> 	 * undocumented bit 0x200, which is present in table 7, but not in 8,</div><div class='ctx'> 	 * plus snapshot mode to disable scan for now */</div><div class='ctx'> 	mt9v022-&gt;chip_control |= 0x10;</div><div class='ctx'> 	ret = reg_write(icd, MT9V022_CHIP_CONTROL, mt9v022-&gt;chip_control);</div><div class='del'>-	if (ret &gt;= 0)</div><div class='del'>-		reg_write(icd, MT9V022_READ_MODE, 0x300);</div><div class='add'>+	if (!ret)</div><div class='add'>+		ret = reg_write(icd, MT9V022_READ_MODE, 0x300);</div><div class='ctx'> </div><div class='ctx'> 	/* All defaults */</div><div class='del'>-	if (ret &gt;= 0)</div><div class='add'>+	if (!ret)</div><div class='ctx'> 		/* AEC, AGC on */</div><div class='ctx'> 		ret = reg_set(icd, MT9V022_AEC_AGC_ENABLE, 0x3);</div><div class='del'>-	if (ret &gt;= 0)</div><div class='add'>+	if (!ret)</div><div class='ctx'> 		ret = reg_write(icd, MT9V022_MAX_TOTAL_SHUTTER_WIDTH, 480);</div><div class='del'>-	if (ret &gt;= 0)</div><div class='add'>+	if (!ret)</div><div class='ctx'> 		/* default - auto */</div><div class='ctx'> 		ret = reg_clear(icd, MT9V022_BLACK_LEVEL_CALIB_CTRL, 1);</div><div class='del'>-	if (ret &gt;= 0)</div><div class='add'>+	if (!ret)</div><div class='ctx'> 		ret = reg_write(icd, MT9V022_DIGITAL_TEST_PATTERN, 0);</div><div class='ctx'> </div><div class='del'>-	return ret &gt;= 0 ? 0 : -EIO;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mt9v022_release(struct soc_camera_device *icd)</div><div class='ctx'> {</div><div class='del'>-	/* Nothing? */</div><div class='add'>+	struct mt9v022 *mt9v022 = container_of(icd, struct mt9v022, icd);</div><div class='add'>+	struct soc_camera_link *icl = mt9v022-&gt;client-&gt;dev.platform_data;</div><div class='add'>+</div><div class='add'>+	if (icl-&gt;power)</div><div class='add'>+		icl-&gt;power(&amp;mt9v022-&gt;client-&gt;dev, 0);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -352,21 +374,21 @@ static int mt9v022_set_fmt_cap(struct soc_camera_device *icd,</div><div class='ctx'> 					rect-&gt;height + icd-&gt;y_skip_top + 43);</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Setup frame format: defaults apart from width and height */</div><div class='del'>-	if (ret &gt;= 0)</div><div class='add'>+	if (!ret)</div><div class='ctx'> 		ret = reg_write(icd, MT9V022_COLUMN_START, rect-&gt;left);</div><div class='del'>-	if (ret &gt;= 0)</div><div class='add'>+	if (!ret)</div><div class='ctx'> 		ret = reg_write(icd, MT9V022_ROW_START, rect-&gt;top);</div><div class='del'>-	if (ret &gt;= 0)</div><div class='add'>+	if (!ret)</div><div class='ctx'> 		/* Default 94, Phytec driver says:</div><div class='ctx'> 		 * "width + horizontal blank &gt;= 660" */</div><div class='ctx'> 		ret = reg_write(icd, MT9V022_HORIZONTAL_BLANKING,</div><div class='ctx'> 				rect-&gt;width &gt; 660 - 43 ? 43 :</div><div class='ctx'> 				660 - rect-&gt;width);</div><div class='del'>-	if (ret &gt;= 0)</div><div class='add'>+	if (!ret)</div><div class='ctx'> 		ret = reg_write(icd, MT9V022_VERTICAL_BLANKING, 45);</div><div class='del'>-	if (ret &gt;= 0)</div><div class='add'>+	if (!ret)</div><div class='ctx'> 		ret = reg_write(icd, MT9V022_WINDOW_WIDTH, rect-&gt;width);</div><div class='del'>-	if (ret &gt;= 0)</div><div class='add'>+	if (!ret)</div><div class='ctx'> 		ret = reg_write(icd, MT9V022_WINDOW_HEIGHT,</div><div class='ctx'> 				rect-&gt;height + icd-&gt;y_skip_top);</div><div class='ctx'> </div><div class='hunk'>@@ -717,7 +739,7 @@ static int mt9v022_video_probe(struct soc_camera_device *icd)</div><div class='ctx'> 			icd-&gt;num_formats = 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (ret &gt;= 0)</div><div class='add'>+	if (!ret)</div><div class='ctx'> 		ret = soc_camera_video_start(icd);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto eisis;</div><div class='head'>diff --git a/drivers/media/video/mxb.c b/drivers/media/video/mxb.c<br/>index 8ef578caba3b..7f130284b5c7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/mxb.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/mxb.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/mxb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/mxb.c</a></div><div class='hunk'>@@ -27,6 +27,7 @@</div><div class='ctx'> #include &lt;media/tuner.h&gt;</div><div class='ctx'> #include &lt;linux/video_decoder.h&gt;</div><div class='ctx'> #include &lt;media/v4l2-common.h&gt;</div><div class='add'>+#include &lt;media/saa7115.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "mxb.h"</div><div class='ctx'> #include "tea6415c.h"</div><div class='hunk'>@@ -122,6 +123,8 @@ static struct saa7146_extension_ioctls ioctls[] = {</div><div class='ctx'> 	{ VIDIOC_S_FREQUENCY, 	SAA7146_EXCLUSIVE },</div><div class='ctx'> 	{ VIDIOC_G_AUDIO, 	SAA7146_EXCLUSIVE },</div><div class='ctx'> 	{ VIDIOC_S_AUDIO, 	SAA7146_EXCLUSIVE },</div><div class='add'>+	{ VIDIOC_DBG_G_REGISTER, 	SAA7146_EXCLUSIVE },</div><div class='add'>+	{ VIDIOC_DBG_S_REGISTER, 	SAA7146_EXCLUSIVE },</div><div class='ctx'> 	{ MXB_S_AUDIO_CD, 	SAA7146_EXCLUSIVE },	/* custom control */</div><div class='ctx'> 	{ MXB_S_AUDIO_LINE, 	SAA7146_EXCLUSIVE },	/* custom control */</div><div class='ctx'> 	{ 0,			0 }</div><div class='hunk'>@@ -134,12 +137,12 @@ struct mxb</div><div class='ctx'> </div><div class='ctx'> 	struct i2c_adapter	i2c_adapter;</div><div class='ctx'> </div><div class='del'>-	struct i2c_client*	saa7111a;</div><div class='del'>-	struct i2c_client*	tda9840;</div><div class='del'>-	struct i2c_client*	tea6415c;</div><div class='del'>-	struct i2c_client*	tuner;</div><div class='del'>-	struct i2c_client*	tea6420_1;</div><div class='del'>-	struct i2c_client*	tea6420_2;</div><div class='add'>+	struct i2c_client	*saa7111a;</div><div class='add'>+	struct i2c_client	*tda9840;</div><div class='add'>+	struct i2c_client	*tea6415c;</div><div class='add'>+	struct i2c_client	*tuner;</div><div class='add'>+	struct i2c_client	*tea6420_1;</div><div class='add'>+	struct i2c_client	*tea6420_2;</div><div class='ctx'> </div><div class='ctx'> 	int	cur_mode;	/* current audio mode (mono, stereo, ...) */</div><div class='ctx'> 	int	cur_input;	/* current input */</div><div class='hunk'>@@ -151,23 +154,23 @@ static struct saa7146_extension extension;</div><div class='ctx'> </div><div class='ctx'> static int mxb_check_clients(struct device *dev, void *data)</div><div class='ctx'> {</div><div class='del'>-	struct mxb* mxb = data;</div><div class='add'>+	struct mxb *mxb = data;</div><div class='ctx'> 	struct i2c_client *client = i2c_verify_client(dev);</div><div class='ctx'> </div><div class='del'>-	if( !client )</div><div class='add'>+	if (!client)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if( I2C_ADDR_TEA6420_1 == client-&gt;addr )</div><div class='add'>+	if (I2C_ADDR_TEA6420_1 == client-&gt;addr)</div><div class='ctx'> 		mxb-&gt;tea6420_1 = client;</div><div class='del'>-	if( I2C_ADDR_TEA6420_2 == client-&gt;addr )</div><div class='add'>+	if (I2C_ADDR_TEA6420_2 == client-&gt;addr)</div><div class='ctx'> 		mxb-&gt;tea6420_2 = client;</div><div class='del'>-	if( I2C_TEA6415C_2 == client-&gt;addr )</div><div class='add'>+	if (I2C_TEA6415C_2 == client-&gt;addr)</div><div class='ctx'> 		mxb-&gt;tea6415c = client;</div><div class='del'>-	if( I2C_ADDR_TDA9840 == client-&gt;addr )</div><div class='add'>+	if (I2C_ADDR_TDA9840 == client-&gt;addr)</div><div class='ctx'> 		mxb-&gt;tda9840 = client;</div><div class='del'>-	if( I2C_SAA7111 == client-&gt;addr )</div><div class='add'>+	if (I2C_SAA7111 == client-&gt;addr)</div><div class='ctx'> 		mxb-&gt;saa7111a = client;</div><div class='del'>-	if( 0x60 == client-&gt;addr )</div><div class='add'>+	if (0x60 == client-&gt;addr)</div><div class='ctx'> 		mxb-&gt;tuner = client;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -178,23 +181,28 @@ static int mxb_probe(struct saa7146_dev* dev)</div><div class='ctx'> 	struct mxb* mxb = NULL;</div><div class='ctx'> 	int result;</div><div class='ctx'> </div><div class='del'>-	if ((result = request_module("saa7111")) &lt; 0) {</div><div class='add'>+	result = request_module("saa7115");</div><div class='add'>+	if (result &lt; 0) {</div><div class='ctx'> 		printk("mxb: saa7111 i2c module not available.\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='del'>-	if ((result = request_module("tea6420")) &lt; 0) {</div><div class='add'>+	result = request_module("tea6420");</div><div class='add'>+	if (result &lt; 0) {</div><div class='ctx'> 		printk("mxb: tea6420 i2c module not available.\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='del'>-	if ((result = request_module("tea6415c")) &lt; 0) {</div><div class='add'>+	result = request_module("tea6415c");</div><div class='add'>+	if (result &lt; 0) {</div><div class='ctx'> 		printk("mxb: tea6415c i2c module not available.\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='del'>-	if ((result = request_module("tda9840")) &lt; 0) {</div><div class='add'>+	result = request_module("tda9840");</div><div class='add'>+	if (result &lt; 0) {</div><div class='ctx'> 		printk("mxb: tda9840 i2c module not available.\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='del'>-	if ((result = request_module("tuner")) &lt; 0) {</div><div class='add'>+	result = request_module("tuner");</div><div class='add'>+	if (result &lt; 0) {</div><div class='ctx'> 		printk("mxb: tuner i2c module not available.\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -207,9 +215,10 @@ static int mxb_probe(struct saa7146_dev* dev)</div><div class='ctx'> </div><div class='ctx'> 	mxb-&gt;i2c_adapter = (struct i2c_adapter) {</div><div class='ctx'> 		.class = I2C_CLASS_TV_ANALOG,</div><div class='del'>-		.name = "mxb",</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	snprintf(mxb-&gt;i2c_adapter.name, sizeof(mxb-&gt;i2c_adapter.name), "mxb%d", mxb_num);</div><div class='add'>+</div><div class='ctx'> 	saa7146_i2c_adapter_prepare(dev, &amp;mxb-&gt;i2c_adapter, SAA7146_I2C_BUS_BIT_RATE_480);</div><div class='ctx'> 	if(i2c_add_adapter(&amp;mxb-&gt;i2c_adapter) &lt; 0) {</div><div class='ctx'> 		DEB_S(("cannot register i2c-device. skipping.\n"));</div><div class='hunk'>@@ -290,38 +299,7 @@ static struct {</div><div class='ctx'> 	{ 9, { 0x1d, 0xed, 0xd0, 0x68, 0x29, 0xb4, 0xe1, 0x00, 0xb8 } },</div><div class='ctx'> 	{ 9, { 0x3d, 0xed, 0xd0, 0x68, 0x29, 0xb4, 0xe1, 0x00, 0xb8 } },</div><div class='ctx'> 	{ 3, { 0x80, 0xb3, 0x0a } },</div><div class='del'>-	{-1, { 0} }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const unsigned char mxb_saa7111_init[] = {</div><div class='del'>-	0x00, 0x00,	  /* 00 - ID byte */</div><div class='del'>-	0x01, 0x00,	  /* 01 - reserved */</div><div class='del'>-</div><div class='del'>-	/*front end */</div><div class='del'>-	0x02, 0xd8,	  /* 02 - FUSE=x, GUDL=x, MODE=x */</div><div class='del'>-	0x03, 0x23,	  /* 03 - HLNRS=0, VBSL=1, WPOFF=0, HOLDG=0, GAFIX=0, GAI1=256, GAI2=256 */</div><div class='del'>-	0x04, 0x00,	  /* 04 - GAI1=256 */</div><div class='del'>-	0x05, 0x00,	  /* 05 - GAI2=256 */</div><div class='del'>-</div><div class='del'>-	/* decoder */</div><div class='del'>-	0x06, 0xf0,	  /* 06 - HSB at  xx(50Hz) /  xx(60Hz) pixels after end of last line */</div><div class='del'>-	0x07, 0x30,	  /* 07 - HSS at  xx(50Hz) /  xx(60Hz) pixels after end of last line */</div><div class='del'>-	0x08, 0xa8,	  /* 08 - AUFD=x, FSEL=x, EXFIL=x, VTRC=x, HPLL=x, VNOI=x */</div><div class='del'>-	0x09, 0x02,	  /* 09 - BYPS=x, PREF=x, BPSS=x, VBLB=x, UPTCV=x, APER=x */</div><div class='del'>-	0x0a, 0x80,	  /* 0a - BRIG=128 */</div><div class='del'>-	0x0b, 0x47,	  /* 0b - CONT=1.109 */</div><div class='del'>-	0x0c, 0x40,	  /* 0c - SATN=1.0 */</div><div class='del'>-	0x0d, 0x00,	  /* 0d - HUE=0 */</div><div class='del'>-	0x0e, 0x01,	  /* 0e - CDTO=0, CSTD=0, DCCF=0, FCTC=0, CHBW=1 */</div><div class='del'>-	0x0f, 0x00,	  /* 0f - reserved */</div><div class='del'>-	0x10, 0xd0,	  /* 10 - OFTS=x, HDEL=x, VRLN=x, YDEL=x */</div><div class='del'>-	0x11, 0x8c,	  /* 11 - GPSW=x, CM99=x, FECO=x, COMPO=x, OEYC=1, OEHV=1, VIPB=0, COLO=0 */</div><div class='del'>-	0x12, 0x80,	  /* 12 - xx output control 2 */</div><div class='del'>-	0x13, 0x30,	  /* 13 - xx output control 3 */</div><div class='del'>-	0x14, 0x00,	  /* 14 - reserved */</div><div class='del'>-	0x15, 0x15,	  /* 15 - VBI */</div><div class='del'>-	0x16, 0x04,	  /* 16 - VBI */</div><div class='del'>-	0x17, 0x00,	  /* 17 - VBI */</div><div class='add'>+	{-1, { 0 } }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* bring hardware to a sane state. this has to be done, just in case someone</div><div class='hunk'>@@ -331,37 +309,28 @@ static const unsigned char mxb_saa7111_init[] = {</div><div class='ctx'> static int mxb_init_done(struct saa7146_dev* dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct mxb* mxb = (struct mxb*)dev-&gt;ext_priv;</div><div class='del'>-	struct video_decoder_init init;</div><div class='ctx'> 	struct i2c_msg msg;</div><div class='ctx'> 	struct tuner_setup tun_setup;</div><div class='ctx'> 	v4l2_std_id std = V4L2_STD_PAL_BG;</div><div class='add'>+	struct v4l2_routing route;</div><div class='ctx'> </div><div class='ctx'> 	int i = 0, err = 0;</div><div class='del'>-	struct	tea6415c_multiplex vm;</div><div class='add'>+	struct tea6415c_multiplex vm;</div><div class='ctx'> </div><div class='ctx'> 	/* select video mode in saa7111a */</div><div class='del'>-	i = VIDEO_MODE_PAL;</div><div class='del'>-	/* fixme: currently pointless: gets overwritten by configuration below */</div><div class='del'>-	mxb-&gt;saa7111a-&gt;driver-&gt;command(mxb-&gt;saa7111a,DECODER_SET_NORM, &amp;i);</div><div class='del'>-</div><div class='del'>-	/* write configuration to saa7111a */</div><div class='del'>-	init.data = mxb_saa7111_init;</div><div class='del'>-	init.len = sizeof(mxb_saa7111_init);</div><div class='del'>-	mxb-&gt;saa7111a-&gt;driver-&gt;command(mxb-&gt;saa7111a,DECODER_INIT, &amp;init);</div><div class='add'>+	mxb-&gt;saa7111a-&gt;driver-&gt;command(mxb-&gt;saa7111a, VIDIOC_S_STD, &amp;std);</div><div class='ctx'> </div><div class='ctx'> 	/* select tuner-output on saa7111a */</div><div class='ctx'> 	i = 0;</div><div class='del'>-	mxb-&gt;saa7111a-&gt;driver-&gt;command(mxb-&gt;saa7111a,DECODER_SET_INPUT, &amp;i);</div><div class='del'>-</div><div class='del'>-	/* enable vbi bypass */</div><div class='del'>-	i = 1;</div><div class='del'>-	mxb-&gt;saa7111a-&gt;driver-&gt;command(mxb-&gt;saa7111a,DECODER_SET_VBI_BYPASS, &amp;i);</div><div class='add'>+	route.input = SAA7115_COMPOSITE0;</div><div class='add'>+	route.output = SAA7111_FMT_CCIR | SAA7111_VBI_BYPASS;</div><div class='add'>+	mxb-&gt;saa7111a-&gt;driver-&gt;command(mxb-&gt;saa7111a, VIDIOC_INT_S_VIDEO_ROUTING, &amp;route);</div><div class='ctx'> </div><div class='ctx'> 	/* select a tuner type */</div><div class='ctx'> 	tun_setup.mode_mask = T_ANALOG_TV;</div><div class='ctx'> 	tun_setup.addr = ADDR_UNSET;</div><div class='ctx'> 	tun_setup.type = TUNER_PHILIPS_PAL;</div><div class='del'>-	mxb-&gt;tuner-&gt;driver-&gt;command(mxb-&gt;tuner,TUNER_SET_TYPE_ADDR, &amp;tun_setup);</div><div class='add'>+	mxb-&gt;tuner-&gt;driver-&gt;command(mxb-&gt;tuner, TUNER_SET_TYPE_ADDR, &amp;tun_setup);</div><div class='ctx'> 	/* tune in some frequency on tuner */</div><div class='ctx'> 	mxb-&gt;cur_freq.tuner = 0;</div><div class='ctx'> 	mxb-&gt;cur_freq.type = V4L2_TUNER_ANALOG_TV;</div><div class='hunk'>@@ -373,27 +342,26 @@ static int mxb_init_done(struct saa7146_dev* dev)</div><div class='ctx'> 	mxb-&gt;tuner-&gt;driver-&gt;command(mxb-&gt;tuner, VIDIOC_S_STD, &amp;std);</div><div class='ctx'> </div><div class='ctx'> 	/* mute audio on tea6420s */</div><div class='del'>-	mxb-&gt;tea6420_1-&gt;driver-&gt;command(mxb-&gt;tea6420_1,TEA6420_SWITCH, &amp;TEA6420_line[6][0]);</div><div class='del'>-	mxb-&gt;tea6420_2-&gt;driver-&gt;command(mxb-&gt;tea6420_2,TEA6420_SWITCH, &amp;TEA6420_line[6][1]);</div><div class='del'>-	mxb-&gt;tea6420_1-&gt;driver-&gt;command(mxb-&gt;tea6420_1,TEA6420_SWITCH, &amp;TEA6420_cd[6][0]);</div><div class='del'>-	mxb-&gt;tea6420_2-&gt;driver-&gt;command(mxb-&gt;tea6420_2,TEA6420_SWITCH, &amp;TEA6420_cd[6][1]);</div><div class='add'>+	mxb-&gt;tea6420_1-&gt;driver-&gt;command(mxb-&gt;tea6420_1, TEA6420_SWITCH, &amp;TEA6420_line[6][0]);</div><div class='add'>+	mxb-&gt;tea6420_2-&gt;driver-&gt;command(mxb-&gt;tea6420_2, TEA6420_SWITCH, &amp;TEA6420_line[6][1]);</div><div class='add'>+	mxb-&gt;tea6420_1-&gt;driver-&gt;command(mxb-&gt;tea6420_1, TEA6420_SWITCH, &amp;TEA6420_cd[6][0]);</div><div class='add'>+	mxb-&gt;tea6420_2-&gt;driver-&gt;command(mxb-&gt;tea6420_2, TEA6420_SWITCH, &amp;TEA6420_cd[6][1]);</div><div class='ctx'> </div><div class='ctx'> 	/* switch to tuner-channel on tea6415c*/</div><div class='ctx'> 	vm.out = 17;</div><div class='ctx'> 	vm.in  = 3;</div><div class='del'>-	mxb-&gt;tea6415c-&gt;driver-&gt;command(mxb-&gt;tea6415c,TEA6415C_SWITCH, &amp;vm);</div><div class='add'>+	mxb-&gt;tea6415c-&gt;driver-&gt;command(mxb-&gt;tea6415c, TEA6415C_SWITCH, &amp;vm);</div><div class='ctx'> </div><div class='ctx'> 	/* select tuner-output on multicable on tea6415c*/</div><div class='ctx'> 	vm.in  = 3;</div><div class='ctx'> 	vm.out = 13;</div><div class='del'>-	mxb-&gt;tea6415c-&gt;driver-&gt;command(mxb-&gt;tea6415c,TEA6415C_SWITCH, &amp;vm);</div><div class='add'>+	mxb-&gt;tea6415c-&gt;driver-&gt;command(mxb-&gt;tea6415c, TEA6415C_SWITCH, &amp;vm);</div><div class='ctx'> </div><div class='ctx'> 	/* the rest for mxb */</div><div class='ctx'> 	mxb-&gt;cur_input = 0;</div><div class='ctx'> 	mxb-&gt;cur_mute = 1;</div><div class='ctx'> </div><div class='ctx'> 	mxb-&gt;cur_mode = V4L2_TUNER_MODE_STEREO;</div><div class='del'>-	mxb-&gt;tda9840-&gt;driver-&gt;command(mxb-&gt;tda9840, TDA9840_SWITCH, &amp;mxb-&gt;cur_mode);</div><div class='ctx'> </div><div class='ctx'> 	/* check if the saa7740 (aka 'sound arena module') is present</div><div class='ctx'> 	   on the mxb. if so, we must initialize it. due to lack of</div><div class='hunk'>@@ -404,21 +372,22 @@ static int mxb_init_done(struct saa7146_dev* dev)</div><div class='ctx'> 	msg.len = mxb_saa7740_init[0].length;</div><div class='ctx'> 	msg.buf = &amp;mxb_saa7740_init[0].data[0];</div><div class='ctx'> </div><div class='del'>-	if( 1 == (err = i2c_transfer(&amp;mxb-&gt;i2c_adapter, &amp;msg, 1))) {</div><div class='add'>+	err = i2c_transfer(&amp;mxb-&gt;i2c_adapter, &amp;msg, 1);</div><div class='add'>+	if (err == 1) {</div><div class='ctx'> 		/* the sound arena module is a pos, that's probably the reason</div><div class='ctx'> 		   philips refuses to hand out a datasheet for the saa7740...</div><div class='ctx'> 		   it seems to screw up the i2c bus, so we disable fast irq</div><div class='ctx'> 		   based i2c transactions here and rely on the slow and safe</div><div class='ctx'> 		   polling method ... */</div><div class='ctx'> 		extension.flags &amp;= ~SAA7146_USE_I2C_IRQ;</div><div class='del'>-		for(i = 1;;i++) {</div><div class='del'>-			if( -1 == mxb_saa7740_init[i].length ) {</div><div class='add'>+		for (i = 1; ; i++) {</div><div class='add'>+			if (-1 == mxb_saa7740_init[i].length)</div><div class='ctx'> 				break;</div><div class='del'>-			}</div><div class='ctx'> </div><div class='ctx'> 			msg.len = mxb_saa7740_init[i].length;</div><div class='ctx'> 			msg.buf = &amp;mxb_saa7740_init[i].data[0];</div><div class='del'>-			if( 1 != (err = i2c_transfer(&amp;mxb-&gt;i2c_adapter, &amp;msg, 1))) {</div><div class='add'>+			err = i2c_transfer(&amp;mxb-&gt;i2c_adapter, &amp;msg, 1);</div><div class='add'>+			if (err != 1) {</div><div class='ctx'> 				DEB_D(("failed to initialize 'sound arena module'.\n"));</div><div class='ctx'> 				goto err;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -432,7 +401,8 @@ err:</div><div class='ctx'> 	/* ext-&gt;saa has been filled by the core driver */</div><div class='ctx'> </div><div class='ctx'> 	/* some stuff is done via variables */</div><div class='del'>-	saa7146_set_hps_source_and_sync(dev, input_port_selection[mxb-&gt;cur_input].hps_source, input_port_selection[mxb-&gt;cur_input].hps_sync);</div><div class='add'>+	saa7146_set_hps_source_and_sync(dev, input_port_selection[mxb-&gt;cur_input].hps_source,</div><div class='add'>+			input_port_selection[mxb-&gt;cur_input].hps_sync);</div><div class='ctx'> </div><div class='ctx'> 	/* some stuff is done via direct write to the registers */</div><div class='ctx'> </div><div class='hunk'>@@ -457,24 +427,24 @@ void mxb_irq_bh(struct saa7146_dev* dev, u32* irq_mask)</div><div class='ctx'> static struct saa7146_ext_vv vv_data;</div><div class='ctx'> </div><div class='ctx'> /* this function only gets called when the probing was successful */</div><div class='del'>-static int mxb_attach(struct saa7146_dev* dev, struct saa7146_pci_extension_data *info)</div><div class='add'>+static int mxb_attach(struct saa7146_dev *dev, struct saa7146_pci_extension_data *info)</div><div class='ctx'> {</div><div class='del'>-	struct mxb* mxb = (struct mxb*)dev-&gt;ext_priv;</div><div class='add'>+	struct mxb *mxb = (struct mxb *)dev-&gt;ext_priv;</div><div class='ctx'> </div><div class='del'>-	DEB_EE(("dev:%p\n",dev));</div><div class='add'>+	DEB_EE(("dev:%p\n", dev));</div><div class='ctx'> </div><div class='ctx'> 	/* checking for i2c-devices can be omitted here, because we</div><div class='ctx'> 	   already did this in "mxb_vl42_probe" */</div><div class='ctx'> </div><div class='del'>-	saa7146_vv_init(dev,&amp;vv_data);</div><div class='del'>-	if( 0 != saa7146_register_device(&amp;mxb-&gt;video_dev, dev, "mxb", VFL_TYPE_GRABBER)) {</div><div class='add'>+	saa7146_vv_init(dev, &amp;vv_data);</div><div class='add'>+	if (saa7146_register_device(&amp;mxb-&gt;video_dev, dev, "mxb", VFL_TYPE_GRABBER)) {</div><div class='ctx'> 		ERR(("cannot register capture v4l2 device. skipping.\n"));</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* initialization stuff (vbi) (only for revision &gt; 0 and for extensions which want it)*/</div><div class='del'>-	if( 0 != MXB_BOARD_CAN_DO_VBI(dev)) {</div><div class='del'>-		if( 0 != saa7146_register_device(&amp;mxb-&gt;vbi_dev, dev, "mxb", VFL_TYPE_VBI)) {</div><div class='add'>+	if (MXB_BOARD_CAN_DO_VBI(dev)) {</div><div class='add'>+		if (saa7146_register_device(&amp;mxb-&gt;vbi_dev, dev, "mxb", VFL_TYPE_VBI)) {</div><div class='ctx'> 			ERR(("cannot register vbi v4l2 device. skipping.\n"));</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -486,18 +456,18 @@ static int mxb_attach(struct saa7146_dev* dev, struct saa7146_pci_extension_data</div><div class='ctx'> 	i2c_use_client(mxb-&gt;saa7111a);</div><div class='ctx'> 	i2c_use_client(mxb-&gt;tuner);</div><div class='ctx'> </div><div class='del'>-	printk("mxb: found 'Multimedia eXtension Board'-%d.\n",mxb_num);</div><div class='add'>+	printk("mxb: found Multimedia eXtension Board #%d.\n", mxb_num);</div><div class='ctx'> </div><div class='ctx'> 	mxb_num++;</div><div class='ctx'> 	mxb_init_done(dev);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mxb_detach(struct saa7146_dev* dev)</div><div class='add'>+static int mxb_detach(struct saa7146_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	struct mxb* mxb = (struct mxb*)dev-&gt;ext_priv;</div><div class='add'>+	struct mxb *mxb = (struct mxb *)dev-&gt;ext_priv;</div><div class='ctx'> </div><div class='del'>-	DEB_EE(("dev:%p\n",dev));</div><div class='add'>+	DEB_EE(("dev:%p\n", dev));</div><div class='ctx'> </div><div class='ctx'> 	i2c_release_client(mxb-&gt;tea6420_1);</div><div class='ctx'> 	i2c_release_client(mxb-&gt;tea6420_2);</div><div class='hunk'>@@ -507,9 +477,8 @@ static int mxb_detach(struct saa7146_dev* dev)</div><div class='ctx'> 	i2c_release_client(mxb-&gt;tuner);</div><div class='ctx'> </div><div class='ctx'> 	saa7146_unregister_device(&amp;mxb-&gt;video_dev,dev);</div><div class='del'>-	if( 0 != MXB_BOARD_CAN_DO_VBI(dev)) {</div><div class='del'>-		saa7146_unregister_device(&amp;mxb-&gt;vbi_dev,dev);</div><div class='del'>-	}</div><div class='add'>+	if (MXB_BOARD_CAN_DO_VBI(dev))</div><div class='add'>+		saa7146_unregister_device(&amp;mxb-&gt;vbi_dev, dev);</div><div class='ctx'> 	saa7146_vv_release(dev);</div><div class='ctx'> </div><div class='ctx'> 	mxb_num--;</div><div class='hunk'>@@ -523,7 +492,7 @@ static int mxb_detach(struct saa7146_dev* dev)</div><div class='ctx'> static int mxb_ioctl(struct saa7146_fh *fh, unsigned int cmd, void *arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct saa7146_dev *dev = fh-&gt;dev;</div><div class='del'>-	struct mxb* mxb = (struct mxb*)dev-&gt;ext_priv;</div><div class='add'>+	struct mxb *mxb = (struct mxb *)dev-&gt;ext_priv;</div><div class='ctx'> 	struct saa7146_vv *vv = dev-&gt;vv_data;</div><div class='ctx'> </div><div class='ctx'> 	switch(cmd) {</div><div class='hunk'>@@ -532,11 +501,9 @@ static int mxb_ioctl(struct saa7146_fh *fh, unsigned int cmd, void *arg)</div><div class='ctx'> 		struct v4l2_input *i = arg;</div><div class='ctx'> </div><div class='ctx'> 		DEB_EE(("VIDIOC_ENUMINPUT %d.\n",i-&gt;index));</div><div class='del'>-		if( i-&gt;index &lt; 0 || i-&gt;index &gt;= MXB_INPUTS) {</div><div class='add'>+		if (i-&gt;index &lt; 0 || i-&gt;index &gt;= MXB_INPUTS)</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-		}</div><div class='ctx'> 		memcpy(i, &amp;mxb_inputs[i-&gt;index], sizeof(struct v4l2_input));</div><div class='del'>-</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* the saa7146 provides some controls (brightness, contrast, saturation)</div><div class='hunk'>@@ -550,7 +517,7 @@ static int mxb_ioctl(struct saa7146_fh *fh, unsigned int cmd, void *arg)</div><div class='ctx'> 		for (i = MAXCONTROLS - 1; i &gt;= 0; i--) {</div><div class='ctx'> 			if (mxb_controls[i].id == qc-&gt;id) {</div><div class='ctx'> 				*qc = mxb_controls[i];</div><div class='del'>-				DEB_D(("VIDIOC_QUERYCTRL %d.\n",qc-&gt;id));</div><div class='add'>+				DEB_D(("VIDIOC_QUERYCTRL %d.\n", qc-&gt;id));</div><div class='ctx'> 				return 0;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -562,56 +529,51 @@ static int mxb_ioctl(struct saa7146_fh *fh, unsigned int cmd, void *arg)</div><div class='ctx'> 		int i;</div><div class='ctx'> </div><div class='ctx'> 		for (i = MAXCONTROLS - 1; i &gt;= 0; i--) {</div><div class='del'>-			if (mxb_controls[i].id == vc-&gt;id) {</div><div class='add'>+			if (mxb_controls[i].id == vc-&gt;id)</div><div class='ctx'> 				break;</div><div class='del'>-			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if( i &lt; 0 ) {</div><div class='add'>+		if (i &lt; 0)</div><div class='ctx'> 			return -EAGAIN;</div><div class='del'>-		}</div><div class='ctx'> </div><div class='del'>-		switch (vc-&gt;id ) {</div><div class='del'>-			case V4L2_CID_AUDIO_MUTE: {</div><div class='del'>-				vc-&gt;value = mxb-&gt;cur_mute;</div><div class='del'>-				DEB_D(("VIDIOC_G_CTRL V4L2_CID_AUDIO_MUTE:%d.\n",vc-&gt;value));</div><div class='del'>-				return 0;</div><div class='del'>-			}</div><div class='add'>+		if (vc-&gt;id == V4L2_CID_AUDIO_MUTE) {</div><div class='add'>+			vc-&gt;value = mxb-&gt;cur_mute;</div><div class='add'>+			DEB_D(("VIDIOC_G_CTRL V4L2_CID_AUDIO_MUTE:%d.\n", vc-&gt;value));</div><div class='add'>+			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		DEB_EE(("VIDIOC_G_CTRL V4L2_CID_AUDIO_MUTE:%d.\n",vc-&gt;value));</div><div class='add'>+		DEB_EE(("VIDIOC_G_CTRL V4L2_CID_AUDIO_MUTE:%d.\n", vc-&gt;value));</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	case VIDIOC_S_CTRL:</div><div class='ctx'> 	{</div><div class='del'>-		struct	v4l2_control	*vc = arg;</div><div class='add'>+		struct v4l2_control *vc = arg;</div><div class='ctx'> 		int i = 0;</div><div class='ctx'> </div><div class='ctx'> 		for (i = MAXCONTROLS - 1; i &gt;= 0; i--) {</div><div class='del'>-			if (mxb_controls[i].id == vc-&gt;id) {</div><div class='add'>+			if (mxb_controls[i].id == vc-&gt;id)</div><div class='ctx'> 				break;</div><div class='del'>-			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if( i &lt; 0 ) {</div><div class='add'>+		if (i &lt; 0)</div><div class='ctx'> 			return -EAGAIN;</div><div class='del'>-		}</div><div class='ctx'> </div><div class='del'>-		switch (vc-&gt;id ) {</div><div class='del'>-			case V4L2_CID_AUDIO_MUTE: {</div><div class='del'>-				mxb-&gt;cur_mute = vc-&gt;value;</div><div class='del'>-				if( 0 == vc-&gt;value ) {</div><div class='del'>-					/* switch the audio-source */</div><div class='del'>-					mxb-&gt;tea6420_1-&gt;driver-&gt;command(mxb-&gt;tea6420_1,TEA6420_SWITCH, &amp;TEA6420_line[video_audio_connect[mxb-&gt;cur_input]][0]);</div><div class='del'>-					mxb-&gt;tea6420_2-&gt;driver-&gt;command(mxb-&gt;tea6420_2,TEA6420_SWITCH, &amp;TEA6420_line[video_audio_connect[mxb-&gt;cur_input]][1]);</div><div class='del'>-				} else {</div><div class='del'>-					mxb-&gt;tea6420_1-&gt;driver-&gt;command(mxb-&gt;tea6420_1,TEA6420_SWITCH, &amp;TEA6420_line[6][0]);</div><div class='del'>-					mxb-&gt;tea6420_2-&gt;driver-&gt;command(mxb-&gt;tea6420_2,TEA6420_SWITCH, &amp;TEA6420_line[6][1]);</div><div class='del'>-				}</div><div class='del'>-				DEB_EE(("VIDIOC_S_CTRL, V4L2_CID_AUDIO_MUTE: %d.\n",vc-&gt;value));</div><div class='del'>-				break;</div><div class='add'>+		if (vc-&gt;id == V4L2_CID_AUDIO_MUTE) {</div><div class='add'>+			mxb-&gt;cur_mute = vc-&gt;value;</div><div class='add'>+			if (!vc-&gt;value) {</div><div class='add'>+				/* switch the audio-source */</div><div class='add'>+				mxb-&gt;tea6420_1-&gt;driver-&gt;command(mxb-&gt;tea6420_1, TEA6420_SWITCH,</div><div class='add'>+						&amp;TEA6420_line[video_audio_connect[mxb-&gt;cur_input]][0]);</div><div class='add'>+				mxb-&gt;tea6420_2-&gt;driver-&gt;command(mxb-&gt;tea6420_2, TEA6420_SWITCH,</div><div class='add'>+						&amp;TEA6420_line[video_audio_connect[mxb-&gt;cur_input]][1]);</div><div class='add'>+			} else {</div><div class='add'>+				mxb-&gt;tea6420_1-&gt;driver-&gt;command(mxb-&gt;tea6420_1, TEA6420_SWITCH,</div><div class='add'>+						&amp;TEA6420_line[6][0]);</div><div class='add'>+				mxb-&gt;tea6420_2-&gt;driver-&gt;command(mxb-&gt;tea6420_2, TEA6420_SWITCH,</div><div class='add'>+						&amp;TEA6420_line[6][1]);</div><div class='ctx'> 			}</div><div class='add'>+			DEB_EE(("VIDIOC_S_CTRL, V4L2_CID_AUDIO_MUTE: %d.\n", vc-&gt;value));</div><div class='ctx'> 		}</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -620,106 +582,84 @@ static int mxb_ioctl(struct saa7146_fh *fh, unsigned int cmd, void *arg)</div><div class='ctx'> 		int *input = (int *)arg;</div><div class='ctx'> 		*input = mxb-&gt;cur_input;</div><div class='ctx'> </div><div class='del'>-		DEB_EE(("VIDIOC_G_INPUT %d.\n",*input));</div><div class='add'>+		DEB_EE(("VIDIOC_G_INPUT %d.\n", *input));</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	case VIDIOC_S_INPUT:</div><div class='ctx'> 	{</div><div class='ctx'> 		int input = *(int *)arg;</div><div class='del'>-		struct	tea6415c_multiplex vm;</div><div class='add'>+		struct tea6415c_multiplex vm;</div><div class='add'>+		struct v4l2_routing route;</div><div class='ctx'> 		int i = 0;</div><div class='ctx'> </div><div class='del'>-		DEB_EE(("VIDIOC_S_INPUT %d.\n",input));</div><div class='add'>+		DEB_EE(("VIDIOC_S_INPUT %d.\n", input));</div><div class='ctx'> </div><div class='del'>-		if (input &lt; 0 || input &gt;= MXB_INPUTS) {</div><div class='add'>+		if (input &lt; 0 || input &gt;= MXB_INPUTS)</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* fixme: locke das setzen des inputs mit hilfe des mutexes</div><div class='del'>-		mutex_lock(&amp;dev-&gt;lock);</div><div class='del'>-		video_mux(dev,*i);</div><div class='del'>-		mutex_unlock(&amp;dev-&gt;lock);</div><div class='del'>-		*/</div><div class='del'>-</div><div class='del'>-		/* fixme: check if streaming capture</div><div class='del'>-		if ( 0 != dev-&gt;streaming ) {</div><div class='del'>-			DEB_D(("VIDIOC_S_INPUT illegal while streaming.\n"));</div><div class='del'>-			return -EPERM;</div><div class='del'>-		}</div><div class='del'>-		*/</div><div class='ctx'> </div><div class='ctx'> 		mxb-&gt;cur_input = input;</div><div class='ctx'> </div><div class='del'>-		saa7146_set_hps_source_and_sync(dev, input_port_selection[input].hps_source, input_port_selection[input].hps_sync);</div><div class='add'>+		saa7146_set_hps_source_and_sync(dev, input_port_selection[input].hps_source,</div><div class='add'>+				input_port_selection[input].hps_sync);</div><div class='ctx'> </div><div class='ctx'> 		/* prepare switching of tea6415c and saa7111a;</div><div class='ctx'> 		   have a look at the 'background'-file for further informations  */</div><div class='del'>-		switch( input ) {</div><div class='del'>-</div><div class='del'>-			case TUNER:</div><div class='del'>-			{</div><div class='del'>-				i = 0;</div><div class='del'>-				vm.in  = 3;</div><div class='del'>-				vm.out = 17;</div><div class='del'>-</div><div class='del'>-			if ( 0 != mxb-&gt;tea6415c-&gt;driver-&gt;command(mxb-&gt;tea6415c,TEA6415C_SWITCH, &amp;vm)) {</div><div class='del'>-					printk("VIDIOC_S_INPUT: could not address tea6415c #1\n");</div><div class='del'>-					return -EFAULT;</div><div class='del'>-				}</div><div class='del'>-				/* connect tuner-output always to multicable */</div><div class='del'>-				vm.in  = 3;</div><div class='del'>-				vm.out = 13;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			case AUX3_YC:</div><div class='del'>-			{</div><div class='del'>-				/* nothing to be done here. aux3_yc is</div><div class='del'>-				   directly connected to the saa711a */</div><div class='del'>-				i = 5;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			case AUX3:</div><div class='del'>-			{</div><div class='del'>-				/* nothing to be done here. aux3 is</div><div class='del'>-				   directly connected to the saa711a */</div><div class='del'>-				i = 1;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			case AUX1:</div><div class='del'>-			{</div><div class='del'>-				i = 0;</div><div class='del'>-				vm.in  = 1;</div><div class='del'>-				vm.out = 17;</div><div class='del'>-				break;</div><div class='add'>+		switch (input) {</div><div class='add'>+		case TUNER:</div><div class='add'>+			i = SAA7115_COMPOSITE0;</div><div class='add'>+			vm.in  = 3;</div><div class='add'>+			vm.out = 17;</div><div class='add'>+</div><div class='add'>+			if (mxb-&gt;tea6415c-&gt;driver-&gt;command(mxb-&gt;tea6415c, TEA6415C_SWITCH, &amp;vm)) {</div><div class='add'>+				printk(KERN_ERR "VIDIOC_S_INPUT: could not address tea6415c #1\n");</div><div class='add'>+				return -EFAULT;</div><div class='ctx'> 			}</div><div class='add'>+			/* connect tuner-output always to multicable */</div><div class='add'>+			vm.in  = 3;</div><div class='add'>+			vm.out = 13;</div><div class='add'>+			break;</div><div class='add'>+		case AUX3_YC:</div><div class='add'>+			/* nothing to be done here. aux3_yc is</div><div class='add'>+			   directly connected to the saa711a */</div><div class='add'>+			i = SAA7115_SVIDEO1;</div><div class='add'>+			break;</div><div class='add'>+		case AUX3:</div><div class='add'>+			/* nothing to be done here. aux3 is</div><div class='add'>+			   directly connected to the saa711a */</div><div class='add'>+			i = SAA7115_COMPOSITE1;</div><div class='add'>+			break;</div><div class='add'>+		case AUX1:</div><div class='add'>+			i = SAA7115_COMPOSITE0;</div><div class='add'>+			vm.in  = 1;</div><div class='add'>+			vm.out = 17;</div><div class='add'>+			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* switch video in tea6415c only if necessary */</div><div class='del'>-		switch( input ) {</div><div class='del'>-			case TUNER:</div><div class='del'>-			case AUX1:</div><div class='del'>-			{</div><div class='del'>-				if ( 0 != mxb-&gt;tea6415c-&gt;driver-&gt;command(mxb-&gt;tea6415c,TEA6415C_SWITCH, &amp;vm)) {</div><div class='del'>-					printk("VIDIOC_S_INPUT: could not address tea6415c #3\n");</div><div class='del'>-					return -EFAULT;</div><div class='del'>-				}</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			default:</div><div class='del'>-			{</div><div class='del'>-				break;</div><div class='add'>+		switch (input) {</div><div class='add'>+		case TUNER:</div><div class='add'>+		case AUX1:</div><div class='add'>+			if (mxb-&gt;tea6415c-&gt;driver-&gt;command(mxb-&gt;tea6415c, TEA6415C_SWITCH, &amp;vm)) {</div><div class='add'>+				printk(KERN_ERR "VIDIOC_S_INPUT: could not address tea6415c #3\n");</div><div class='add'>+				return -EFAULT;</div><div class='ctx'> 			}</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* switch video in saa7111a */</div><div class='del'>-		if ( 0 != mxb-&gt;saa7111a-&gt;driver-&gt;command(mxb-&gt;saa7111a,DECODER_SET_INPUT, &amp;i)) {</div><div class='add'>+		route.input = i;</div><div class='add'>+		route.output = 0;</div><div class='add'>+		if (mxb-&gt;saa7111a-&gt;driver-&gt;command(mxb-&gt;saa7111a, VIDIOC_INT_S_VIDEO_ROUTING, &amp;route))</div><div class='ctx'> 			printk("VIDIOC_S_INPUT: could not address saa7111a #1.\n");</div><div class='del'>-		}</div><div class='ctx'> </div><div class='ctx'> 		/* switch the audio-source only if necessary */</div><div class='ctx'> 		if( 0 == mxb-&gt;cur_mute ) {</div><div class='del'>-			mxb-&gt;tea6420_1-&gt;driver-&gt;command(mxb-&gt;tea6420_1,TEA6420_SWITCH, &amp;TEA6420_line[video_audio_connect[input]][0]);</div><div class='del'>-			mxb-&gt;tea6420_2-&gt;driver-&gt;command(mxb-&gt;tea6420_2,TEA6420_SWITCH, &amp;TEA6420_line[video_audio_connect[input]][1]);</div><div class='add'>+			mxb-&gt;tea6420_1-&gt;driver-&gt;command(mxb-&gt;tea6420_1, TEA6420_SWITCH,</div><div class='add'>+					&amp;TEA6420_line[video_audio_connect[input]][0]);</div><div class='add'>+			mxb-&gt;tea6420_2-&gt;driver-&gt;command(mxb-&gt;tea6420_2, TEA6420_SWITCH,</div><div class='add'>+				       &amp;TEA6420_line[video_audio_connect[input]][1]);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -727,114 +667,44 @@ static int mxb_ioctl(struct saa7146_fh *fh, unsigned int cmd, void *arg)</div><div class='ctx'> 	case VIDIOC_G_TUNER:</div><div class='ctx'> 	{</div><div class='ctx'> 		struct v4l2_tuner *t = arg;</div><div class='del'>-		int byte = 0;</div><div class='ctx'> </div><div class='del'>-		if( 0 != t-&gt;index ) {</div><div class='add'>+		if (t-&gt;index) {</div><div class='ctx'> 			DEB_D(("VIDIOC_G_TUNER: channel %d does not have a tuner attached.\n", t-&gt;index));</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		DEB_EE(("VIDIOC_G_TUNER: %d\n", t-&gt;index));</div><div class='ctx'> </div><div class='del'>-		memset(t,0,sizeof(*t));</div><div class='del'>-		strcpy(t-&gt;name, "Television");</div><div class='add'>+		memset(t, 0, sizeof(*t));</div><div class='add'>+		i2c_clients_command(&amp;mxb-&gt;i2c_adapter, cmd, arg);</div><div class='ctx'> </div><div class='add'>+		strlcpy(t-&gt;name, "TV Tuner", sizeof(t-&gt;name));</div><div class='ctx'> 		t-&gt;type = V4L2_TUNER_ANALOG_TV;</div><div class='del'>-		t-&gt;capability = V4L2_TUNER_CAP_NORM | V4L2_TUNER_CAP_STEREO | V4L2_TUNER_CAP_LANG1 | V4L2_TUNER_CAP_LANG2 | V4L2_TUNER_CAP_SAP;</div><div class='del'>-		t-&gt;rangelow = 772;	/* 48.25 MHZ / 62.5 kHz = 772, see fi1216mk2-specs, page 2 */</div><div class='del'>-		t-&gt;rangehigh = 13684;	/* 855.25 MHz / 62.5 kHz = 13684 */</div><div class='del'>-		/* FIXME: add the real signal strength here */</div><div class='del'>-		t-&gt;signal = 0xffff;</div><div class='del'>-		t-&gt;afc = 0;</div><div class='del'>-</div><div class='del'>-		mxb-&gt;tda9840-&gt;driver-&gt;command(mxb-&gt;tda9840,TDA9840_DETECT, &amp;byte);</div><div class='add'>+		t-&gt;capability = V4L2_TUNER_CAP_NORM | V4L2_TUNER_CAP_STEREO | \</div><div class='add'>+			V4L2_TUNER_CAP_LANG1 | V4L2_TUNER_CAP_LANG2 | V4L2_TUNER_CAP_SAP;</div><div class='ctx'> 		t-&gt;audmode = mxb-&gt;cur_mode;</div><div class='del'>-</div><div class='del'>-		if( byte &lt; 0 ) {</div><div class='del'>-			t-&gt;rxsubchans  = V4L2_TUNER_SUB_MONO;</div><div class='del'>-		} else {</div><div class='del'>-			switch(byte) {</div><div class='del'>-				case TDA9840_MONO_DETECT: {</div><div class='del'>-					t-&gt;rxsubchans 	= V4L2_TUNER_SUB_MONO;</div><div class='del'>-					DEB_D(("VIDIOC_G_TUNER: V4L2_TUNER_MODE_MONO.\n"));</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-				case TDA9840_DUAL_DETECT: {</div><div class='del'>-					t-&gt;rxsubchans 	= V4L2_TUNER_SUB_LANG1 | V4L2_TUNER_SUB_LANG2;</div><div class='del'>-					DEB_D(("VIDIOC_G_TUNER: V4L2_TUNER_MODE_LANG1.\n"));</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-				case TDA9840_STEREO_DETECT: {</div><div class='del'>-					t-&gt;rxsubchans 	= V4L2_TUNER_SUB_STEREO | V4L2_TUNER_SUB_MONO;</div><div class='del'>-					DEB_D(("VIDIOC_G_TUNER: V4L2_TUNER_MODE_STEREO.\n"));</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-				default: { /* TDA9840_INCORRECT_DETECT */</div><div class='del'>-					t-&gt;rxsubchans 	= V4L2_TUNER_MODE_MONO;</div><div class='del'>-					DEB_D(("VIDIOC_G_TUNER: TDA9840_INCORRECT_DETECT =&gt; V4L2_TUNER_MODE_MONO\n"));</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	case VIDIOC_S_TUNER:</div><div class='ctx'> 	{</div><div class='ctx'> 		struct v4l2_tuner *t = arg;</div><div class='del'>-		int result = 0;</div><div class='del'>-		int byte = 0;</div><div class='ctx'> </div><div class='del'>-		if( 0 != t-&gt;index ) {</div><div class='add'>+		if (t-&gt;index) {</div><div class='ctx'> 			DEB_D(("VIDIOC_S_TUNER: channel %d does not have a tuner attached.\n",t-&gt;index));</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		switch(t-&gt;audmode) {</div><div class='del'>-			case V4L2_TUNER_MODE_STEREO: {</div><div class='del'>-				mxb-&gt;cur_mode = V4L2_TUNER_MODE_STEREO;</div><div class='del'>-				byte = TDA9840_SET_STEREO;</div><div class='del'>-				DEB_D(("VIDIOC_S_TUNER: V4L2_TUNER_MODE_STEREO\n"));</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			case V4L2_TUNER_MODE_LANG1_LANG2: {</div><div class='del'>-				mxb-&gt;cur_mode = V4L2_TUNER_MODE_LANG1_LANG2;</div><div class='del'>-				byte = TDA9840_SET_BOTH;</div><div class='del'>-				DEB_D(("VIDIOC_S_TUNER: V4L2_TUNER_MODE_LANG1_LANG2\n"));</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			case V4L2_TUNER_MODE_LANG1: {</div><div class='del'>-				mxb-&gt;cur_mode = V4L2_TUNER_MODE_LANG1;</div><div class='del'>-				byte = TDA9840_SET_LANG1;</div><div class='del'>-				DEB_D(("VIDIOC_S_TUNER: V4L2_TUNER_MODE_LANG1\n"));</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			case V4L2_TUNER_MODE_LANG2: {</div><div class='del'>-				mxb-&gt;cur_mode = V4L2_TUNER_MODE_LANG2;</div><div class='del'>-				byte = TDA9840_SET_LANG2;</div><div class='del'>-				DEB_D(("VIDIOC_S_TUNER: V4L2_TUNER_MODE_LANG2\n"));</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			default: { /* case V4L2_TUNER_MODE_MONO: {*/</div><div class='del'>-				mxb-&gt;cur_mode = V4L2_TUNER_MODE_MONO;</div><div class='del'>-				byte = TDA9840_SET_MONO;</div><div class='del'>-				DEB_D(("VIDIOC_S_TUNER: TDA9840_SET_MONO\n"));</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if( 0 != (result = mxb-&gt;tda9840-&gt;driver-&gt;command(mxb-&gt;tda9840, TDA9840_SWITCH, &amp;byte))) {</div><div class='del'>-			printk("VIDIOC_S_TUNER error. result:%d, byte:%d\n",result,byte);</div><div class='del'>-		}</div><div class='del'>-</div><div class='add'>+		mxb-&gt;cur_mode = t-&gt;audmode;</div><div class='add'>+		i2c_clients_command(&amp;mxb-&gt;i2c_adapter, cmd, arg);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	case VIDIOC_G_FREQUENCY:</div><div class='ctx'> 	{</div><div class='ctx'> 		struct v4l2_frequency *f = arg;</div><div class='ctx'> </div><div class='del'>-		if(0 != mxb-&gt;cur_input) {</div><div class='del'>-			DEB_D(("VIDIOC_G_FREQ: channel %d does not have a tuner!\n",mxb-&gt;cur_input));</div><div class='add'>+		if (mxb-&gt;cur_input) {</div><div class='add'>+			DEB_D(("VIDIOC_G_FREQ: channel %d does not have a tuner!\n",</div><div class='add'>+						mxb-&gt;cur_input));</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -847,14 +717,14 @@ static int mxb_ioctl(struct saa7146_fh *fh, unsigned int cmd, void *arg)</div><div class='ctx'> 	{</div><div class='ctx'> 		struct v4l2_frequency *f = arg;</div><div class='ctx'> </div><div class='del'>-		if (0 != f-&gt;tuner)</div><div class='add'>+		if (f-&gt;tuner)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 		if (V4L2_TUNER_ANALOG_TV != f-&gt;type)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='del'>-		if(0 != mxb-&gt;cur_input) {</div><div class='del'>-			DEB_D(("VIDIOC_S_FREQ: channel %d does not have a tuner!\n",mxb-&gt;cur_input));</div><div class='add'>+		if (mxb-&gt;cur_input) {</div><div class='add'>+			DEB_D(("VIDIOC_S_FREQ: channel %d does not have a tuner!\n", mxb-&gt;cur_input));</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -875,7 +745,7 @@ static int mxb_ioctl(struct saa7146_fh *fh, unsigned int cmd, void *arg)</div><div class='ctx'> 	{</div><div class='ctx'> 		int i = *(int*)arg;</div><div class='ctx'> </div><div class='del'>-		if( i &lt; 0 || i &gt;= MXB_AUDIOS ) {</div><div class='add'>+		if (i &lt; 0 || i &gt;= MXB_AUDIOS) {</div><div class='ctx'> 			DEB_D(("illegal argument to MXB_S_AUDIO_CD: i:%d.\n",i));</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -891,7 +761,7 @@ static int mxb_ioctl(struct saa7146_fh *fh, unsigned int cmd, void *arg)</div><div class='ctx'> 	{</div><div class='ctx'> 		int i = *(int*)arg;</div><div class='ctx'> </div><div class='del'>-		if( i &lt; 0 || i &gt;= MXB_AUDIOS ) {</div><div class='add'>+		if (i &lt; 0 || i &gt;= MXB_AUDIOS) {</div><div class='ctx'> 			DEB_D(("illegal argument to MXB_S_AUDIO_LINE: i:%d.\n",i));</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -906,12 +776,12 @@ static int mxb_ioctl(struct saa7146_fh *fh, unsigned int cmd, void *arg)</div><div class='ctx'> 	{</div><div class='ctx'> 		struct v4l2_audio *a = arg;</div><div class='ctx'> </div><div class='del'>-		if( a-&gt;index &lt; 0 || a-&gt;index &gt; MXB_INPUTS ) {</div><div class='del'>-			DEB_D(("VIDIOC_G_AUDIO %d out of range.\n",a-&gt;index));</div><div class='add'>+		if (a-&gt;index &lt; 0 || a-&gt;index &gt; MXB_INPUTS) {</div><div class='add'>+			DEB_D(("VIDIOC_G_AUDIO %d out of range.\n", a-&gt;index));</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		DEB_EE(("VIDIOC_G_AUDIO %d.\n",a-&gt;index));</div><div class='add'>+		DEB_EE(("VIDIOC_G_AUDIO %d.\n", a-&gt;index));</div><div class='ctx'> 		memcpy(a, &amp;mxb_audios[video_audio_connect[mxb-&gt;cur_input]], sizeof(struct v4l2_audio));</div><div class='ctx'> </div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -919,9 +789,16 @@ static int mxb_ioctl(struct saa7146_fh *fh, unsigned int cmd, void *arg)</div><div class='ctx'> 	case VIDIOC_S_AUDIO:</div><div class='ctx'> 	{</div><div class='ctx'> 		struct v4l2_audio *a = arg;</div><div class='del'>-		DEB_D(("VIDIOC_S_AUDIO %d.\n",a-&gt;index));</div><div class='add'>+</div><div class='add'>+		DEB_D(("VIDIOC_S_AUDIO %d.\n", a-&gt;index));</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='add'>+#ifdef CONFIG_VIDEO_ADV_DEBUG</div><div class='add'>+	case VIDIOC_DBG_S_REGISTER:</div><div class='add'>+	case VIDIOC_DBG_G_REGISTER:</div><div class='add'>+		i2c_clients_command(&amp;mxb-&gt;i2c_adapter, cmd, arg);</div><div class='add'>+		return 0;</div><div class='add'>+#endif</div><div class='ctx'> 	default:</div><div class='ctx'> /*</div><div class='ctx'> 		DEB2(printk("does not handle this ioctl.\n"));</div><div class='hunk'>@@ -944,7 +821,7 @@ static int std_callback(struct saa7146_dev *dev, struct saa7146_standard *standa</div><div class='ctx'> 		/* set the 7146 gpio register -- I don't know what this does exactly */</div><div class='ctx'> 		saa7146_write(dev, GPIO_CTRL, 0x00404050);</div><div class='ctx'> 		/* unset the 7111 gpio register -- I don't know what this does exactly */</div><div class='del'>-		mxb-&gt;saa7111a-&gt;driver-&gt;command(mxb-&gt;saa7111a, DECODER_SET_GPIO, &amp;zero);</div><div class='add'>+		mxb-&gt;saa7111a-&gt;driver-&gt;command(mxb-&gt;saa7111a, VIDIOC_INT_S_GPIO, &amp;zero);</div><div class='ctx'> 		mxb-&gt;tuner-&gt;driver-&gt;command(mxb-&gt;tuner, VIDIOC_S_STD, &amp;std);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		v4l2_std_id std = V4L2_STD_PAL_BG;</div><div class='hunk'>@@ -953,7 +830,7 @@ static int std_callback(struct saa7146_dev *dev, struct saa7146_standard *standa</div><div class='ctx'> 		/* set the 7146 gpio register -- I don't know what this does exactly */</div><div class='ctx'> 		saa7146_write(dev, GPIO_CTRL, 0x00404050);</div><div class='ctx'> 		/* set the 7111 gpio register -- I don't know what this does exactly */</div><div class='del'>-		mxb-&gt;saa7111a-&gt;driver-&gt;command(mxb-&gt;saa7111a, DECODER_SET_GPIO, &amp;one);</div><div class='add'>+		mxb-&gt;saa7111a-&gt;driver-&gt;command(mxb-&gt;saa7111a, VIDIOC_INT_S_GPIO, &amp;one);</div><div class='ctx'> 		mxb-&gt;tuner-&gt;driver-&gt;command(mxb-&gt;tuner, VIDIOC_S_STD, &amp;std);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1029,7 +906,7 @@ static struct saa7146_extension extension = {</div><div class='ctx'> </div><div class='ctx'> static int __init mxb_init_module(void)</div><div class='ctx'> {</div><div class='del'>-	if( 0 != saa7146_register_extension(&amp;extension)) {</div><div class='add'>+	if (saa7146_register_extension(&amp;extension)) {</div><div class='ctx'> 		DEB_S(("failed to register extension.\n"));</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/media/video/ov511.c b/drivers/media/video/ov511.c<br/>index c6852402c5e9..210f1240b331 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/ov511.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/ov511.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/ov511.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/ov511.c</a></div><div class='hunk'>@@ -974,14 +974,14 @@ dump_i2c_range(struct usb_ov511 *ov, int reg1, int regn)</div><div class='ctx'> </div><div class='ctx'> 	for (i = reg1; i &lt;= regn; i++) {</div><div class='ctx'> 		rc = i2c_r(ov, i);</div><div class='del'>-		info("Sensor[0x%02X] = 0x%02X", i, rc);</div><div class='add'>+		dev_info(&amp;ov-&gt;dev-&gt;dev, "Sensor[0x%02X] = 0x%02X\n", i, rc);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> dump_i2c_regs(struct usb_ov511 *ov)</div><div class='ctx'> {</div><div class='del'>-	info("I2C REGS");</div><div class='add'>+	dev_info(&amp;ov-&gt;dev-&gt;dev, "I2C REGS\n");</div><div class='ctx'> 	dump_i2c_range(ov, 0x00, 0x7C);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -992,28 +992,28 @@ dump_reg_range(struct usb_ov511 *ov, int reg1, int regn)</div><div class='ctx'> </div><div class='ctx'> 	for (i = reg1; i &lt;= regn; i++) {</div><div class='ctx'> 		rc = reg_r(ov, i);</div><div class='del'>-		info("OV511[0x%02X] = 0x%02X", i, rc);</div><div class='add'>+		dev_info(&amp;ov-&gt;dev-&gt;dev, "OV511[0x%02X] = 0x%02X\n", i, rc);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> ov511_dump_regs(struct usb_ov511 *ov)</div><div class='ctx'> {</div><div class='del'>-	info("CAMERA INTERFACE REGS");</div><div class='add'>+	dev_info(&amp;ov-&gt;dev-&gt;dev, "CAMERA INTERFACE REGS\n");</div><div class='ctx'> 	dump_reg_range(ov, 0x10, 0x1f);</div><div class='del'>-	info("DRAM INTERFACE REGS");</div><div class='add'>+	dev_info(&amp;ov-&gt;dev-&gt;dev, "DRAM INTERFACE REGS\n");</div><div class='ctx'> 	dump_reg_range(ov, 0x20, 0x23);</div><div class='del'>-	info("ISO FIFO REGS");</div><div class='add'>+	dev_info(&amp;ov-&gt;dev-&gt;dev, "ISO FIFO REGS\n");</div><div class='ctx'> 	dump_reg_range(ov, 0x30, 0x31);</div><div class='del'>-	info("PIO REGS");</div><div class='add'>+	dev_info(&amp;ov-&gt;dev-&gt;dev, "PIO REGS\n");</div><div class='ctx'> 	dump_reg_range(ov, 0x38, 0x39);</div><div class='ctx'> 	dump_reg_range(ov, 0x3e, 0x3e);</div><div class='del'>-	info("I2C REGS");</div><div class='add'>+	dev_info(&amp;ov-&gt;dev-&gt;dev, "I2C REGS\n");</div><div class='ctx'> 	dump_reg_range(ov, 0x40, 0x49);</div><div class='del'>-	info("SYSTEM CONTROL REGS");</div><div class='add'>+	dev_info(&amp;ov-&gt;dev-&gt;dev, "SYSTEM CONTROL REGS\n");</div><div class='ctx'> 	dump_reg_range(ov, 0x50, 0x55);</div><div class='ctx'> 	dump_reg_range(ov, 0x5e, 0x5f);</div><div class='del'>-	info("OmniCE REGS");</div><div class='add'>+	dev_info(&amp;ov-&gt;dev-&gt;dev, "OmniCE REGS\n");</div><div class='ctx'> 	dump_reg_range(ov, 0x70, 0x79);</div><div class='ctx'> 	/* NOTE: Quantization tables are not readable. You will get the value</div><div class='ctx'> 	 * in reg. 0x79 for every table register */</div><div class='hunk'>@@ -1025,25 +1025,25 @@ ov511_dump_regs(struct usb_ov511 *ov)</div><div class='ctx'> static void</div><div class='ctx'> ov518_dump_regs(struct usb_ov511 *ov)</div><div class='ctx'> {</div><div class='del'>-	info("VIDEO MODE REGS");</div><div class='add'>+	dev_info(&amp;ov-&gt;dev-&gt;dev, "VIDEO MODE REGS\n");</div><div class='ctx'> 	dump_reg_range(ov, 0x20, 0x2f);</div><div class='del'>-	info("DATA PUMP AND SNAPSHOT REGS");</div><div class='add'>+	dev_info(&amp;ov-&gt;dev-&gt;dev, "DATA PUMP AND SNAPSHOT REGS\n");</div><div class='ctx'> 	dump_reg_range(ov, 0x30, 0x3f);</div><div class='del'>-	info("I2C REGS");</div><div class='add'>+	dev_info(&amp;ov-&gt;dev-&gt;dev, "I2C REGS\n");</div><div class='ctx'> 	dump_reg_range(ov, 0x40, 0x4f);</div><div class='del'>-	info("SYSTEM CONTROL AND VENDOR REGS");</div><div class='add'>+	dev_info(&amp;ov-&gt;dev-&gt;dev, "SYSTEM CONTROL AND VENDOR REGS\n");</div><div class='ctx'> 	dump_reg_range(ov, 0x50, 0x5f);</div><div class='del'>-	info("60 - 6F");</div><div class='add'>+	dev_info(&amp;ov-&gt;dev-&gt;dev, "60 - 6F\n");</div><div class='ctx'> 	dump_reg_range(ov, 0x60, 0x6f);</div><div class='del'>-	info("70 - 7F");</div><div class='add'>+	dev_info(&amp;ov-&gt;dev-&gt;dev, "70 - 7F\n");</div><div class='ctx'> 	dump_reg_range(ov, 0x70, 0x7f);</div><div class='del'>-	info("Y QUANTIZATION TABLE");</div><div class='add'>+	dev_info(&amp;ov-&gt;dev-&gt;dev, "Y QUANTIZATION TABLE\n");</div><div class='ctx'> 	dump_reg_range(ov, 0x80, 0x8f);</div><div class='del'>-	info("UV QUANTIZATION TABLE");</div><div class='add'>+	dev_info(&amp;ov-&gt;dev-&gt;dev, "UV QUANTIZATION TABLE\n");</div><div class='ctx'> 	dump_reg_range(ov, 0x90, 0x9f);</div><div class='del'>-	info("A0 - BF");</div><div class='add'>+	dev_info(&amp;ov-&gt;dev-&gt;dev, "A0 - BF\n");</div><div class='ctx'> 	dump_reg_range(ov, 0xa0, 0xbf);</div><div class='del'>-	info("CBR");</div><div class='add'>+	dev_info(&amp;ov-&gt;dev-&gt;dev, "CBR\n");</div><div class='ctx'> 	dump_reg_range(ov, 0xc0, 0xcf);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='hunk'>@@ -1098,9 +1098,10 @@ ov51x_clear_snapshot(struct usb_ov511 *ov)</div><div class='ctx'> 		reg_w(ov, R51x_SYS_SNAP, 0x02);</div><div class='ctx'> 		reg_w(ov, R51x_SYS_SNAP, 0x00);</div><div class='ctx'> 	} else if (ov-&gt;bclass == BCL_OV518) {</div><div class='del'>-		warn("snapshot reset not supported yet on OV518(+)");</div><div class='add'>+		dev_warn(&amp;ov-&gt;dev-&gt;dev,</div><div class='add'>+			 "snapshot reset not supported yet on OV518(+)\n");</div><div class='ctx'> 	} else {</div><div class='del'>-		err("clear snap: invalid bridge type");</div><div class='add'>+		dev_err(&amp;ov-&gt;dev-&gt;dev, "clear snap: invalid bridge type\n");</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1115,14 +1116,16 @@ ov51x_check_snapshot(struct usb_ov511 *ov)</div><div class='ctx'> 	if (ov-&gt;bclass == BCL_OV511) {</div><div class='ctx'> 		ret = reg_r(ov, R51x_SYS_SNAP);</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='del'>-			err("Error checking snspshot status (%d)", ret);</div><div class='add'>+			dev_err(&amp;ov-&gt;dev-&gt;dev,</div><div class='add'>+				"Error checking snspshot status (%d)\n", ret);</div><div class='ctx'> 		} else if (ret &amp; 0x08) {</div><div class='ctx'> 			status = 1;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else if (ov-&gt;bclass == BCL_OV518) {</div><div class='del'>-		warn("snapshot check not supported yet on OV518(+)");</div><div class='add'>+		dev_warn(&amp;ov-&gt;dev-&gt;dev,</div><div class='add'>+			 "snapshot check not supported yet on OV518(+)\n");</div><div class='ctx'> 	} else {</div><div class='del'>-		err("check snap: invalid bridge type");</div><div class='add'>+		dev_err(&amp;ov-&gt;dev-&gt;dev, "clear snap: invalid bridge type\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return status;</div><div class='hunk'>@@ -3205,9 +3208,10 @@ ov511_move_data(struct usb_ov511 *ov, unsigned char *in, int n)</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	if (printph) {</div><div class='del'>-		info("ph(%3d): %2x %2x %2x %2x %2x %2x %2x %2x %2x %2x %2x %2x",</div><div class='del'>-		     pnum, in[0], in[1], in[2], in[3], in[4], in[5], in[6],</div><div class='del'>-		     in[7], in[8], in[9], in[10], in[11]);</div><div class='add'>+		dev_info(&amp;ov-&gt;dev-&gt;dev,</div><div class='add'>+			 "ph(%3d): %2x %2x %2x %2x %2x %2x %2x %2x %2x %2x %2x %2x\n",</div><div class='add'>+			 pnum, in[0], in[1], in[2], in[3], in[4], in[5], in[6],</div><div class='add'>+			 in[7], in[8], in[9], in[10], in[11]);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Check for SOF/EOF packet */</div><div class='hunk'>@@ -3366,8 +3370,10 @@ ov518_move_data(struct usb_ov511 *ov, unsigned char *in, int n)</div><div class='ctx'> 	 * the definitive SOF/EOF format */</div><div class='ctx'> 	if ((!(in[0] | in[1] | in[2] | in[3] | in[5])) &amp;&amp; in[6]) {</div><div class='ctx'> 		if (printph) {</div><div class='del'>-			info("ph: %2x %2x %2x %2x %2x %2x %2x %2x", in[0],</div><div class='del'>-			     in[1], in[2], in[3], in[4], in[5], in[6], in[7]);</div><div class='add'>+			dev_info(&amp;ov-&gt;dev-&gt;dev,</div><div class='add'>+				 "ph: %2x %2x %2x %2x %2x %2x %2x %2x\n",</div><div class='add'>+				 in[0], in[1], in[2], in[3], in[4], in[5],</div><div class='add'>+				 in[6], in[7]);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (frame-&gt;scanstate == STATE_LINES) {</div><div class='hunk'>@@ -3646,14 +3652,16 @@ ov51x_init_isoc(struct usb_ov511 *ov)</div><div class='ctx'> 		if (packetsize == -1) {</div><div class='ctx'> 			ov518_set_packet_size(ov, 640);</div><div class='ctx'> 		} else {</div><div class='del'>-			info("Forcing packet size to %d", packetsize);</div><div class='add'>+			dev_info(&amp;ov-&gt;dev-&gt;dev, "Forcing packet size to %d\n",</div><div class='add'>+				 packetsize);</div><div class='ctx'> 			ov518_set_packet_size(ov, packetsize);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (packetsize == -1) {</div><div class='ctx'> 			ov511_set_packet_size(ov, size);</div><div class='ctx'> 		} else {</div><div class='del'>-			info("Forcing packet size to %d", packetsize);</div><div class='add'>+			dev_info(&amp;ov-&gt;dev-&gt;dev, "Forcing packet size to %d\n",</div><div class='add'>+				 packetsize);</div><div class='ctx'> 			ov511_set_packet_size(ov, packetsize);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -4121,7 +4129,7 @@ ov51x_v4l1_ioctl_internal(struct inode *inode, struct file *file,</div><div class='ctx'> 			return -EIO;</div><div class='ctx'> </div><div class='ctx'> 		if (force_palette &amp;&amp; p-&gt;palette != force_palette) {</div><div class='del'>-			info("Palette rejected (%s)",</div><div class='add'>+			dev_info(&amp;ov-&gt;dev-&gt;dev, "Palette rejected (%s)\n",</div><div class='ctx'> 			     symbolic(v4l1_plist, p-&gt;palette));</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -4849,26 +4857,27 @@ ov7xx0_configure(struct usb_ov511 *ov)</div><div class='ctx'> 		err("Error detecting sensor type");</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	} else if ((rc &amp; 3) == 3) {</div><div class='del'>-		info("Sensor is an OV7610");</div><div class='add'>+		dev_info(&amp;ov-&gt;dev-&gt;dev, "Sensor is an OV7610\n");</div><div class='ctx'> 		ov-&gt;sensor = SEN_OV7610;</div><div class='ctx'> 	} else if ((rc &amp; 3) == 1) {</div><div class='ctx'> 		/* I don't know what's different about the 76BE yet. */</div><div class='ctx'> 		if (i2c_r(ov, 0x15) &amp; 1)</div><div class='del'>-			info("Sensor is an OV7620AE");</div><div class='add'>+			dev_info(&amp;ov-&gt;dev-&gt;dev, "Sensor is an OV7620AE\n");</div><div class='ctx'> 		else</div><div class='del'>-			info("Sensor is an OV76BE");</div><div class='add'>+			dev_info(&amp;ov-&gt;dev-&gt;dev, "Sensor is an OV76BE\n");</div><div class='ctx'> </div><div class='ctx'> 		/* OV511+ will return all zero isoc data unless we</div><div class='ctx'> 		 * configure the sensor as a 7620. Someone needs to</div><div class='ctx'> 		 * find the exact reg. setting that causes this. */</div><div class='ctx'> 		if (ov-&gt;bridge == BRG_OV511PLUS) {</div><div class='del'>-			info("Enabling 511+/7620AE workaround");</div><div class='add'>+			dev_info(&amp;ov-&gt;dev-&gt;dev,</div><div class='add'>+				 "Enabling 511+/7620AE workaround\n");</div><div class='ctx'> 			ov-&gt;sensor = SEN_OV7620;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			ov-&gt;sensor = SEN_OV76BE;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else if ((rc &amp; 3) == 0) {</div><div class='del'>-		info("Sensor is an OV7620");</div><div class='add'>+		dev_info(&amp;ov-&gt;dev-&gt;dev, "Sensor is an OV7620\n");</div><div class='ctx'> 		ov-&gt;sensor = SEN_OV7620;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		err("Unknown image sensor version: %d", rc &amp; 3);</div><div class='hunk'>@@ -5024,16 +5033,16 @@ ov6xx0_configure(struct usb_ov511 *ov)</div><div class='ctx'> </div><div class='ctx'> 	if ((rc &amp; 3) == 0) {</div><div class='ctx'> 		ov-&gt;sensor = SEN_OV6630;</div><div class='del'>-		info("Sensor is an OV6630");</div><div class='add'>+		dev_info(&amp;ov-&gt;dev-&gt;dev, "Sensor is an OV6630\n");</div><div class='ctx'> 	} else if ((rc &amp; 3) == 1) {</div><div class='ctx'> 		ov-&gt;sensor = SEN_OV6620;</div><div class='del'>-		info("Sensor is an OV6620");</div><div class='add'>+		dev_info(&amp;ov-&gt;dev-&gt;dev, "Sensor is an OV6620\n");</div><div class='ctx'> 	} else if ((rc &amp; 3) == 2) {</div><div class='ctx'> 		ov-&gt;sensor = SEN_OV6630;</div><div class='del'>-		info("Sensor is an OV6630AE");</div><div class='add'>+		dev_info(&amp;ov-&gt;dev-&gt;dev, "Sensor is an OV6630AE\n");</div><div class='ctx'> 	} else if ((rc &amp; 3) == 3) {</div><div class='ctx'> 		ov-&gt;sensor = SEN_OV6630;</div><div class='del'>-		info("Sensor is an OV6630AF");</div><div class='add'>+		dev_info(&amp;ov-&gt;dev-&gt;dev, "Sensor is an OV6630AF\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Set sensor-specific vars */</div><div class='hunk'>@@ -5088,10 +5097,10 @@ ks0127_configure(struct usb_ov511 *ov)</div><div class='ctx'> 			err("Error detecting sensor type");</div><div class='ctx'> 			return -1;</div><div class='ctx'> 		} else if ((rc &amp; 0x0f) == 0) {</div><div class='del'>-			info("Sensor is a KS0127");</div><div class='add'>+			dev_info(&amp;ov-&gt;dev-&gt;dev, "Sensor is a KS0127\n");</div><div class='ctx'> 			ov-&gt;sensor = SEN_KS0127;</div><div class='ctx'> 		} else if ((rc &amp; 0x0f) == 9) {</div><div class='del'>-			info("Sensor is a KS0127B Rev. A");</div><div class='add'>+			dev_info(&amp;ov-&gt;dev-&gt;dev, "Sensor is a KS0127B Rev. A\n");</div><div class='ctx'> 			ov-&gt;sensor = SEN_KS0127B;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -5200,7 +5209,8 @@ saa7111a_configure(struct usb_ov511 *ov)</div><div class='ctx'> 		err("Error detecting sensor version");</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	} else {</div><div class='del'>-		info("Sensor is an SAA7111A (version 0x%x)", rc);</div><div class='add'>+		dev_info(&amp;ov-&gt;dev-&gt;dev,</div><div class='add'>+			 "Sensor is an SAA7111A (version 0x%x)\n", rc);</div><div class='ctx'> 		ov-&gt;sensor = SEN_SAA7111A;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -5210,7 +5220,8 @@ saa7111a_configure(struct usb_ov511 *ov)</div><div class='ctx'> 	if (ov-&gt;bclass == BCL_OV511)</div><div class='ctx'> 		reg_w(ov, 0x11, 0x00);</div><div class='ctx'> 	else</div><div class='del'>-		warn("SAA7111A not yet supported with OV518/OV518+");</div><div class='add'>+		dev_warn(&amp;ov-&gt;dev-&gt;dev,</div><div class='add'>+			 "SAA7111A not yet supported with OV518/OV518+\n");</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -5262,7 +5273,7 @@ ov511_configure(struct usb_ov511 *ov)</div><div class='ctx'> </div><div class='ctx'> 	PDEBUG (1, "CustomID = %d", ov-&gt;customid);</div><div class='ctx'> 	ov-&gt;desc = symbolic(camlist, ov-&gt;customid);</div><div class='del'>-	info("model: %s", ov-&gt;desc);</div><div class='add'>+	dev_info(&amp;ov-&gt;dev-&gt;dev, "model: %s\n", ov-&gt;desc);</div><div class='ctx'> </div><div class='ctx'> 	if (0 == strcmp(ov-&gt;desc, NOT_DEFINED_STR)) {</div><div class='ctx'> 		err("Camera type (%d) not recognized", ov-&gt;customid);</div><div class='hunk'>@@ -5426,7 +5437,8 @@ ov518_configure(struct usb_ov511 *ov)</div><div class='ctx'> 	PDEBUG(4, "");</div><div class='ctx'> </div><div class='ctx'> 	/* First 5 bits of custom ID reg are a revision ID on OV518 */</div><div class='del'>-	info("Device revision %d", 0x1F &amp; reg_r(ov, R511_SYS_CUST_ID));</div><div class='add'>+	dev_info(&amp;ov-&gt;dev-&gt;dev, "Device revision %d\n",</div><div class='add'>+		 0x1F &amp; reg_r(ov, R511_SYS_CUST_ID));</div><div class='ctx'> </div><div class='ctx'> 	/* Give it the default description */</div><div class='ctx'> 	ov-&gt;desc = symbolic(camlist, 0);</div><div class='hunk'>@@ -5448,7 +5460,8 @@ ov518_configure(struct usb_ov511 *ov)</div><div class='ctx'> 	 * required. OV518 has no uncompressed mode, to save RAM. */</div><div class='ctx'> 	if (!dumppix &amp;&amp; !ov-&gt;compress) {</div><div class='ctx'> 		ov-&gt;compress = 1;</div><div class='del'>-		warn("Compression required with OV518...enabling");</div><div class='add'>+		dev_warn(&amp;ov-&gt;dev-&gt;dev,</div><div class='add'>+			 "Compression required with OV518...enabling\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ov-&gt;bridge == BRG_OV518) {</div><div class='hunk'>@@ -5773,7 +5786,8 @@ ov51x_probe(struct usb_interface *intf, const struct usb_device_id *id)</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	info("USB %s video device found", symbolic(brglist, ov-&gt;bridge));</div><div class='add'>+	dev_info(&amp;intf-&gt;dev, "USB %s video device found\n",</div><div class='add'>+		 symbolic(brglist, ov-&gt;bridge));</div><div class='ctx'> </div><div class='ctx'> 	init_waitqueue_head(&amp;ov-&gt;wq);</div><div class='ctx'> </div><div class='hunk'>@@ -5854,8 +5868,8 @@ ov51x_probe(struct usb_interface *intf, const struct usb_device_id *id)</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	info("Device at %s registered to minor %d", ov-&gt;usb_path,</div><div class='del'>-	     ov-&gt;vdev-&gt;minor);</div><div class='add'>+	dev_info(&amp;intf-&gt;dev, "Device at %s registered to minor %d\n",</div><div class='add'>+		 ov-&gt;usb_path, ov-&gt;vdev-&gt;minor);</div><div class='ctx'> </div><div class='ctx'> 	usb_set_intfdata(intf, ov);</div><div class='ctx'> 	if (ov_create_sysfs(ov-&gt;vdev)) {</div><div class='hunk'>@@ -5958,7 +5972,8 @@ usb_ov511_init(void)</div><div class='ctx'> 	if (retval)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	info(DRIVER_VERSION " : " DRIVER_DESC);</div><div class='add'>+	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"</div><div class='add'>+	       DRIVER_DESC "\n");</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	return retval;</div><div class='hunk'>@@ -5968,8 +5983,7 @@ static void __exit</div><div class='ctx'> usb_ov511_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	usb_deregister(&amp;ov511_driver);</div><div class='del'>-	info("driver deregistered");</div><div class='del'>-</div><div class='add'>+	printk(KERN_INFO KBUILD_MODNAME ": driver deregistered\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(usb_ov511_init);</div><div class='head'>diff --git a/drivers/media/video/ov511.h b/drivers/media/video/ov511.h<br/>index baded1262ca9..70d99e52329d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/ov511.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/ov511.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/ov511.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/ov511.h</a></div><div class='hunk'>@@ -12,7 +12,8 @@</div><div class='ctx'> </div><div class='ctx'> #ifdef OV511_DEBUG</div><div class='ctx'> 	#define PDEBUG(level, fmt, args...) \</div><div class='del'>-		if (debug &gt;= (level)) info("[%s:%d] " fmt, \</div><div class='add'>+		if (debug &gt;= (level))	\</div><div class='add'>+			printk(KERN_INFO KBUILD_MODNAME "[%s:%d] \n" fmt, \</div><div class='ctx'> 		__func__, __LINE__ , ## args)</div><div class='ctx'> #else</div><div class='ctx'> 	#define PDEBUG(level, fmt, args...) do {} while(0)</div><div class='head'>diff --git a/drivers/media/video/ovcamchip/ovcamchip_core.c b/drivers/media/video/ovcamchip/ovcamchip_core.c<br/>index 065c2454113e..2c4acbf5a4fe 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/ovcamchip/ovcamchip_core.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/ovcamchip/ovcamchip_core.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/ovcamchip/ovcamchip_core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/ovcamchip/ovcamchip_core.c</a></div><div class='hunk'>@@ -49,12 +49,6 @@ MODULE_LICENSE("GPL");</div><div class='ctx'> #define GENERIC_REG_ID_LOW        0x1D	/* manufacturer ID LSB */</div><div class='ctx'> #define GENERIC_REG_COM_I         0x29	/* misc ID bits */</div><div class='ctx'> </div><div class='del'>-extern struct ovcamchip_ops ov6x20_ops;</div><div class='del'>-extern struct ovcamchip_ops ov6x30_ops;</div><div class='del'>-extern struct ovcamchip_ops ov7x10_ops;</div><div class='del'>-extern struct ovcamchip_ops ov7x20_ops;</div><div class='del'>-extern struct ovcamchip_ops ov76be_ops;</div><div class='del'>-</div><div class='ctx'> static char *chip_names[NUM_CC_TYPES] = {</div><div class='ctx'> 	[CC_UNKNOWN]	= "Unknown chip",</div><div class='ctx'> 	[CC_OV76BE]	= "OV76BE",</div><div class='head'>diff --git a/drivers/media/video/ovcamchip/ovcamchip_priv.h b/drivers/media/video/ovcamchip/ovcamchip_priv.h<br/>index 9afa4fe47726..a05650faedda 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/ovcamchip/ovcamchip_priv.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/ovcamchip/ovcamchip_priv.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/ovcamchip/ovcamchip_priv.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/ovcamchip/ovcamchip_priv.h</a></div><div class='hunk'>@@ -53,6 +53,12 @@ struct ovcamchip {</div><div class='ctx'> 	int initialized;           /* OVCAMCHIP_CMD_INITIALIZE was successful */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+extern struct ovcamchip_ops ov6x20_ops;</div><div class='add'>+extern struct ovcamchip_ops ov6x30_ops;</div><div class='add'>+extern struct ovcamchip_ops ov7x10_ops;</div><div class='add'>+extern struct ovcamchip_ops ov7x20_ops;</div><div class='add'>+extern struct ovcamchip_ops ov76be_ops;</div><div class='add'>+</div><div class='ctx'> /* --------------------------------- */</div><div class='ctx'> /*              I2C I/O              */</div><div class='ctx'> /* --------------------------------- */</div><div class='head'>diff --git a/drivers/media/video/pms.c b/drivers/media/video/pms.c<br/>index 7c84f795db54..994807818aa2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/pms.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/pms.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/pms.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/pms.c</a></div><div class='hunk'>@@ -47,6 +47,7 @@ struct pms_device</div><div class='ctx'> 	struct video_picture picture;</div><div class='ctx'> 	int height;</div><div class='ctx'> 	int width;</div><div class='add'>+	unsigned long in_use;</div><div class='ctx'> 	struct mutex lock;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -881,10 +882,27 @@ static ssize_t pms_read(struct file *file, char __user *buf,</div><div class='ctx'> 	return len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int pms_exclusive_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct video_device *v = video_devdata(file);</div><div class='add'>+	struct pms_device *pd = (struct pms_device *)v;</div><div class='add'>+</div><div class='add'>+	return test_and_set_bit(0, &amp;pd-&gt;in_use) ? -EBUSY : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pms_exclusive_release(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct video_device *v = video_devdata(file);</div><div class='add'>+	struct pms_device *pd = (struct pms_device *)v;</div><div class='add'>+</div><div class='add'>+	clear_bit(0, &amp;pd-&gt;in_use);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct file_operations pms_fops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='del'>-	.open           = video_exclusive_open,</div><div class='del'>-	.release        = video_exclusive_release,</div><div class='add'>+	.open           = pms_exclusive_open,</div><div class='add'>+	.release        = pms_exclusive_release,</div><div class='ctx'> 	.ioctl          = pms_ioctl,</div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='ctx'> 	.compat_ioctl	= v4l_compat_ioctl32,</div><div class='hunk'>@@ -897,6 +915,7 @@ static struct video_device pms_template=</div><div class='ctx'> {</div><div class='ctx'> 	.name		= "Mediavision PMS",</div><div class='ctx'> 	.fops           = &amp;pms_fops,</div><div class='add'>+	.release 	= video_device_release_empty,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct pms_device pms_device;</div><div class='head'>diff --git a/drivers/media/video/pvrusb2/pvrusb2-ctrl.c b/drivers/media/video/pvrusb2/pvrusb2-ctrl.c<br/>index 0764fbfffb73..203f54cd18a1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/pvrusb2/pvrusb2-ctrl.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/pvrusb2/pvrusb2-ctrl.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/pvrusb2/pvrusb2-ctrl.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/pvrusb2/pvrusb2-ctrl.c</a></div><div class='hunk'>@@ -134,13 +134,17 @@ int pvr2_ctrl_get_min(struct pvr2_ctrl *cptr)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* Retrieve control's default value (any type) */</div><div class='del'>-int pvr2_ctrl_get_def(struct pvr2_ctrl *cptr)</div><div class='add'>+int pvr2_ctrl_get_def(struct pvr2_ctrl *cptr, int *valptr)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	if (!cptr) return 0;</div><div class='ctx'> 	LOCK_TAKE(cptr-&gt;hdw-&gt;big_lock); do {</div><div class='ctx'> 		if (cptr-&gt;info-&gt;type == pvr2_ctl_int) {</div><div class='del'>-			ret = cptr-&gt;info-&gt;default_value;</div><div class='add'>+			if (cptr-&gt;info-&gt;get_def_value) {</div><div class='add'>+				ret = cptr-&gt;info-&gt;get_def_value(cptr, valptr);</div><div class='add'>+			} else {</div><div class='add'>+				*valptr = cptr-&gt;info-&gt;default_value;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 	} while(0); LOCK_GIVE(cptr-&gt;hdw-&gt;big_lock);</div><div class='ctx'> 	return ret;</div><div class='head'>diff --git a/drivers/media/video/pvrusb2/pvrusb2-ctrl.h b/drivers/media/video/pvrusb2/pvrusb2-ctrl.h<br/>index 0371ae6e6e4e..794ff90121c7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/pvrusb2/pvrusb2-ctrl.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/pvrusb2/pvrusb2-ctrl.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/pvrusb2/pvrusb2-ctrl.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/pvrusb2/pvrusb2-ctrl.h</a></div><div class='hunk'>@@ -49,7 +49,7 @@ int pvr2_ctrl_get_max(struct pvr2_ctrl *);</div><div class='ctx'> int pvr2_ctrl_get_min(struct pvr2_ctrl *);</div><div class='ctx'> </div><div class='ctx'> /* Retrieve control's default value (any type) */</div><div class='del'>-int pvr2_ctrl_get_def(struct pvr2_ctrl *);</div><div class='add'>+int pvr2_ctrl_get_def(struct pvr2_ctrl *, int *valptr);</div><div class='ctx'> </div><div class='ctx'> /* Retrieve control's enumeration count (enum only) */</div><div class='ctx'> int pvr2_ctrl_get_cnt(struct pvr2_ctrl *);</div><div class='head'>diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h b/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h<br/>index 657f861593b3..de7ee7264be6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h</a></div><div class='hunk'>@@ -82,6 +82,7 @@ struct pvr2_ctl_info {</div><div class='ctx'> </div><div class='ctx'> 	/* Control's implementation */</div><div class='ctx'> 	pvr2_ctlf_get_value get_value;      /* Get its value */</div><div class='add'>+	pvr2_ctlf_get_value get_def_value;  /* Get its default value */</div><div class='ctx'> 	pvr2_ctlf_get_value get_min_value;  /* Get minimum allowed value */</div><div class='ctx'> 	pvr2_ctlf_get_value get_max_value;  /* Get maximum allowed value */</div><div class='ctx'> 	pvr2_ctlf_set_value set_value;      /* Set its value */</div><div class='hunk'>@@ -307,6 +308,10 @@ struct pvr2_hdw {</div><div class='ctx'> 	struct v4l2_tuner tuner_signal_info;</div><div class='ctx'> 	int tuner_signal_stale;</div><div class='ctx'> </div><div class='add'>+	/* Cropping capability info */</div><div class='add'>+	struct v4l2_cropcap cropcap_info;</div><div class='add'>+	int cropcap_stale;</div><div class='add'>+</div><div class='ctx'> 	/* Video standard handling */</div><div class='ctx'> 	v4l2_std_id std_mask_eeprom; // Hardware supported selections</div><div class='ctx'> 	v4l2_std_id std_mask_avail;  // Which standards we may select from</div><div class='hunk'>@@ -367,6 +372,10 @@ struct pvr2_hdw {</div><div class='ctx'> 	VCREATE_DATA(bass);</div><div class='ctx'> 	VCREATE_DATA(treble);</div><div class='ctx'> 	VCREATE_DATA(mute);</div><div class='add'>+	VCREATE_DATA(cropl);</div><div class='add'>+	VCREATE_DATA(cropt);</div><div class='add'>+	VCREATE_DATA(cropw);</div><div class='add'>+	VCREATE_DATA(croph);</div><div class='ctx'> 	VCREATE_DATA(input);</div><div class='ctx'> 	VCREATE_DATA(audiomode);</div><div class='ctx'> 	VCREATE_DATA(res_hor);</div><div class='head'>diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/drivers/media/video/pvrusb2/pvrusb2-hdw.c<br/>index f051c6aa7f1f..94265bd3d926 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/pvrusb2/pvrusb2-hdw.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/pvrusb2/pvrusb2-hdw.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/pvrusb2/pvrusb2-hdw.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/pvrusb2/pvrusb2-hdw.c</a></div><div class='hunk'>@@ -298,6 +298,7 @@ static int pvr2_send_request_ex(struct pvr2_hdw *hdw,</div><div class='ctx'> 				unsigned int timeout,int probe_fl,</div><div class='ctx'> 				void *write_data,unsigned int write_len,</div><div class='ctx'> 				void *read_data,unsigned int read_len);</div><div class='add'>+static int pvr2_hdw_check_cropcap(struct pvr2_hdw *hdw);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static void trace_stbit(const char *name,int val)</div><div class='hunk'>@@ -402,6 +403,194 @@ static int ctrl_freq_set(struct pvr2_ctrl *cptr,int m,int v)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int ctrl_cropl_min_get(struct pvr2_ctrl *cptr, int *left)</div><div class='add'>+{</div><div class='add'>+	struct v4l2_cropcap *cap = &amp;cptr-&gt;hdw-&gt;cropcap_info;</div><div class='add'>+	int stat = pvr2_hdw_check_cropcap(cptr-&gt;hdw);</div><div class='add'>+	if (stat != 0) {</div><div class='add'>+		return stat;</div><div class='add'>+	}</div><div class='add'>+	*left = cap-&gt;bounds.left;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ctrl_cropl_max_get(struct pvr2_ctrl *cptr, int *left)</div><div class='add'>+{</div><div class='add'>+	struct v4l2_cropcap *cap = &amp;cptr-&gt;hdw-&gt;cropcap_info;</div><div class='add'>+	int stat = pvr2_hdw_check_cropcap(cptr-&gt;hdw);</div><div class='add'>+	if (stat != 0) {</div><div class='add'>+		return stat;</div><div class='add'>+	}</div><div class='add'>+	*left = cap-&gt;bounds.left;</div><div class='add'>+	if (cap-&gt;bounds.width &gt; cptr-&gt;hdw-&gt;cropw_val) {</div><div class='add'>+		*left += cap-&gt;bounds.width - cptr-&gt;hdw-&gt;cropw_val;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ctrl_cropt_min_get(struct pvr2_ctrl *cptr, int *top)</div><div class='add'>+{</div><div class='add'>+	struct v4l2_cropcap *cap = &amp;cptr-&gt;hdw-&gt;cropcap_info;</div><div class='add'>+	int stat = pvr2_hdw_check_cropcap(cptr-&gt;hdw);</div><div class='add'>+	if (stat != 0) {</div><div class='add'>+		return stat;</div><div class='add'>+	}</div><div class='add'>+	*top = cap-&gt;bounds.top;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ctrl_cropt_max_get(struct pvr2_ctrl *cptr, int *top)</div><div class='add'>+{</div><div class='add'>+	struct v4l2_cropcap *cap = &amp;cptr-&gt;hdw-&gt;cropcap_info;</div><div class='add'>+	int stat = pvr2_hdw_check_cropcap(cptr-&gt;hdw);</div><div class='add'>+	if (stat != 0) {</div><div class='add'>+		return stat;</div><div class='add'>+	}</div><div class='add'>+	*top = cap-&gt;bounds.top;</div><div class='add'>+	if (cap-&gt;bounds.height &gt; cptr-&gt;hdw-&gt;croph_val) {</div><div class='add'>+		*top += cap-&gt;bounds.height - cptr-&gt;hdw-&gt;croph_val;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ctrl_cropw_max_get(struct pvr2_ctrl *cptr, int *val)</div><div class='add'>+{</div><div class='add'>+	struct v4l2_cropcap *cap = &amp;cptr-&gt;hdw-&gt;cropcap_info;</div><div class='add'>+	int stat = pvr2_hdw_check_cropcap(cptr-&gt;hdw);</div><div class='add'>+	if (stat != 0) {</div><div class='add'>+		return stat;</div><div class='add'>+	}</div><div class='add'>+	*val = 0;</div><div class='add'>+	if (cap-&gt;bounds.width &gt; cptr-&gt;hdw-&gt;cropl_val) {</div><div class='add'>+		*val = cap-&gt;bounds.width - cptr-&gt;hdw-&gt;cropl_val;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ctrl_croph_max_get(struct pvr2_ctrl *cptr, int *val)</div><div class='add'>+{</div><div class='add'>+	struct v4l2_cropcap *cap = &amp;cptr-&gt;hdw-&gt;cropcap_info;</div><div class='add'>+	int stat = pvr2_hdw_check_cropcap(cptr-&gt;hdw);</div><div class='add'>+	if (stat != 0) {</div><div class='add'>+		return stat;</div><div class='add'>+	}</div><div class='add'>+	*val = 0;</div><div class='add'>+	if (cap-&gt;bounds.height &gt; cptr-&gt;hdw-&gt;cropt_val) {</div><div class='add'>+		*val = cap-&gt;bounds.height - cptr-&gt;hdw-&gt;cropt_val;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ctrl_get_cropcapbl(struct pvr2_ctrl *cptr, int *val)</div><div class='add'>+{</div><div class='add'>+	struct v4l2_cropcap *cap = &amp;cptr-&gt;hdw-&gt;cropcap_info;</div><div class='add'>+	int stat = pvr2_hdw_check_cropcap(cptr-&gt;hdw);</div><div class='add'>+	if (stat != 0) {</div><div class='add'>+		return stat;</div><div class='add'>+	}</div><div class='add'>+	*val = cap-&gt;bounds.left;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ctrl_get_cropcapbt(struct pvr2_ctrl *cptr, int *val)</div><div class='add'>+{</div><div class='add'>+	struct v4l2_cropcap *cap = &amp;cptr-&gt;hdw-&gt;cropcap_info;</div><div class='add'>+	int stat = pvr2_hdw_check_cropcap(cptr-&gt;hdw);</div><div class='add'>+	if (stat != 0) {</div><div class='add'>+		return stat;</div><div class='add'>+	}</div><div class='add'>+	*val = cap-&gt;bounds.top;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ctrl_get_cropcapbw(struct pvr2_ctrl *cptr, int *val)</div><div class='add'>+{</div><div class='add'>+	struct v4l2_cropcap *cap = &amp;cptr-&gt;hdw-&gt;cropcap_info;</div><div class='add'>+	int stat = pvr2_hdw_check_cropcap(cptr-&gt;hdw);</div><div class='add'>+	if (stat != 0) {</div><div class='add'>+		return stat;</div><div class='add'>+	}</div><div class='add'>+	*val = cap-&gt;bounds.width;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ctrl_get_cropcapbh(struct pvr2_ctrl *cptr, int *val)</div><div class='add'>+{</div><div class='add'>+	struct v4l2_cropcap *cap = &amp;cptr-&gt;hdw-&gt;cropcap_info;</div><div class='add'>+	int stat = pvr2_hdw_check_cropcap(cptr-&gt;hdw);</div><div class='add'>+	if (stat != 0) {</div><div class='add'>+		return stat;</div><div class='add'>+	}</div><div class='add'>+	*val = cap-&gt;bounds.height;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ctrl_get_cropcapdl(struct pvr2_ctrl *cptr, int *val)</div><div class='add'>+{</div><div class='add'>+	struct v4l2_cropcap *cap = &amp;cptr-&gt;hdw-&gt;cropcap_info;</div><div class='add'>+	int stat = pvr2_hdw_check_cropcap(cptr-&gt;hdw);</div><div class='add'>+	if (stat != 0) {</div><div class='add'>+		return stat;</div><div class='add'>+	}</div><div class='add'>+	*val = cap-&gt;defrect.left;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ctrl_get_cropcapdt(struct pvr2_ctrl *cptr, int *val)</div><div class='add'>+{</div><div class='add'>+	struct v4l2_cropcap *cap = &amp;cptr-&gt;hdw-&gt;cropcap_info;</div><div class='add'>+	int stat = pvr2_hdw_check_cropcap(cptr-&gt;hdw);</div><div class='add'>+	if (stat != 0) {</div><div class='add'>+		return stat;</div><div class='add'>+	}</div><div class='add'>+	*val = cap-&gt;defrect.top;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ctrl_get_cropcapdw(struct pvr2_ctrl *cptr, int *val)</div><div class='add'>+{</div><div class='add'>+	struct v4l2_cropcap *cap = &amp;cptr-&gt;hdw-&gt;cropcap_info;</div><div class='add'>+	int stat = pvr2_hdw_check_cropcap(cptr-&gt;hdw);</div><div class='add'>+	if (stat != 0) {</div><div class='add'>+		return stat;</div><div class='add'>+	}</div><div class='add'>+	*val = cap-&gt;defrect.width;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ctrl_get_cropcapdh(struct pvr2_ctrl *cptr, int *val)</div><div class='add'>+{</div><div class='add'>+	struct v4l2_cropcap *cap = &amp;cptr-&gt;hdw-&gt;cropcap_info;</div><div class='add'>+	int stat = pvr2_hdw_check_cropcap(cptr-&gt;hdw);</div><div class='add'>+	if (stat != 0) {</div><div class='add'>+		return stat;</div><div class='add'>+	}</div><div class='add'>+	*val = cap-&gt;defrect.height;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ctrl_get_cropcappan(struct pvr2_ctrl *cptr, int *val)</div><div class='add'>+{</div><div class='add'>+	struct v4l2_cropcap *cap = &amp;cptr-&gt;hdw-&gt;cropcap_info;</div><div class='add'>+	int stat = pvr2_hdw_check_cropcap(cptr-&gt;hdw);</div><div class='add'>+	if (stat != 0) {</div><div class='add'>+		return stat;</div><div class='add'>+	}</div><div class='add'>+	*val = cap-&gt;pixelaspect.numerator;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ctrl_get_cropcappad(struct pvr2_ctrl *cptr, int *val)</div><div class='add'>+{</div><div class='add'>+	struct v4l2_cropcap *cap = &amp;cptr-&gt;hdw-&gt;cropcap_info;</div><div class='add'>+	int stat = pvr2_hdw_check_cropcap(cptr-&gt;hdw);</div><div class='add'>+	if (stat != 0) {</div><div class='add'>+		return stat;</div><div class='add'>+	}</div><div class='add'>+	*val = cap-&gt;pixelaspect.denominator;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ctrl_vres_max_get(struct pvr2_ctrl *cptr,int *vp)</div><div class='ctx'> {</div><div class='ctx'> 	/* Actual maximum depends on the video standard in effect. */</div><div class='hunk'>@@ -779,6 +968,10 @@ VCREATE_FUNCS(balance)</div><div class='ctx'> VCREATE_FUNCS(bass)</div><div class='ctx'> VCREATE_FUNCS(treble)</div><div class='ctx'> VCREATE_FUNCS(mute)</div><div class='add'>+VCREATE_FUNCS(cropl)</div><div class='add'>+VCREATE_FUNCS(cropt)</div><div class='add'>+VCREATE_FUNCS(cropw)</div><div class='add'>+VCREATE_FUNCS(croph)</div><div class='ctx'> VCREATE_FUNCS(audiomode)</div><div class='ctx'> VCREATE_FUNCS(res_hor)</div><div class='ctx'> VCREATE_FUNCS(res_ver)</div><div class='hunk'>@@ -849,6 +1042,72 @@ static const struct pvr2_ctl_info control_defs[] = {</div><div class='ctx'> 		.default_value = 0,</div><div class='ctx'> 		DEFREF(mute),</div><div class='ctx'> 		DEFBOOL,</div><div class='add'>+	}, {</div><div class='add'>+		.desc = "Capture crop left margin",</div><div class='add'>+		.name = "crop_left",</div><div class='add'>+		.internal_id = PVR2_CID_CROPL,</div><div class='add'>+		.default_value = 0,</div><div class='add'>+		DEFREF(cropl),</div><div class='add'>+		DEFINT(-129, 340),</div><div class='add'>+		.get_min_value = ctrl_cropl_min_get,</div><div class='add'>+		.get_max_value = ctrl_cropl_max_get,</div><div class='add'>+		.get_def_value = ctrl_get_cropcapdl,</div><div class='add'>+	}, {</div><div class='add'>+		.desc = "Capture crop top margin",</div><div class='add'>+		.name = "crop_top",</div><div class='add'>+		.internal_id = PVR2_CID_CROPT,</div><div class='add'>+		.default_value = 0,</div><div class='add'>+		DEFREF(cropt),</div><div class='add'>+		DEFINT(-35, 544),</div><div class='add'>+		.get_min_value = ctrl_cropt_min_get,</div><div class='add'>+		.get_max_value = ctrl_cropt_max_get,</div><div class='add'>+		.get_def_value = ctrl_get_cropcapdt,</div><div class='add'>+	}, {</div><div class='add'>+		.desc = "Capture crop width",</div><div class='add'>+		.name = "crop_width",</div><div class='add'>+		.internal_id = PVR2_CID_CROPW,</div><div class='add'>+		.default_value = 720,</div><div class='add'>+		DEFREF(cropw),</div><div class='add'>+		.get_max_value = ctrl_cropw_max_get,</div><div class='add'>+		.get_def_value = ctrl_get_cropcapdw,</div><div class='add'>+	}, {</div><div class='add'>+		.desc = "Capture crop height",</div><div class='add'>+		.name = "crop_height",</div><div class='add'>+		.internal_id = PVR2_CID_CROPH,</div><div class='add'>+		.default_value = 480,</div><div class='add'>+		DEFREF(croph),</div><div class='add'>+		.get_max_value = ctrl_croph_max_get,</div><div class='add'>+		.get_def_value = ctrl_get_cropcapdh,</div><div class='add'>+	}, {</div><div class='add'>+		.desc = "Capture capability pixel aspect numerator",</div><div class='add'>+		.name = "cropcap_pixel_numerator",</div><div class='add'>+		.internal_id = PVR2_CID_CROPCAPPAN,</div><div class='add'>+		.get_value = ctrl_get_cropcappan,</div><div class='add'>+	}, {</div><div class='add'>+		.desc = "Capture capability pixel aspect denominator",</div><div class='add'>+		.name = "cropcap_pixel_denominator",</div><div class='add'>+		.internal_id = PVR2_CID_CROPCAPPAD,</div><div class='add'>+		.get_value = ctrl_get_cropcappad,</div><div class='add'>+	}, {</div><div class='add'>+		.desc = "Capture capability bounds top",</div><div class='add'>+		.name = "cropcap_bounds_top",</div><div class='add'>+		.internal_id = PVR2_CID_CROPCAPBT,</div><div class='add'>+		.get_value = ctrl_get_cropcapbt,</div><div class='add'>+	}, {</div><div class='add'>+		.desc = "Capture capability bounds left",</div><div class='add'>+		.name = "cropcap_bounds_left",</div><div class='add'>+		.internal_id = PVR2_CID_CROPCAPBL,</div><div class='add'>+		.get_value = ctrl_get_cropcapbl,</div><div class='add'>+	}, {</div><div class='add'>+		.desc = "Capture capability bounds width",</div><div class='add'>+		.name = "cropcap_bounds_width",</div><div class='add'>+		.internal_id = PVR2_CID_CROPCAPBW,</div><div class='add'>+		.get_value = ctrl_get_cropcapbw,</div><div class='add'>+	}, {</div><div class='add'>+		.desc = "Capture capability bounds height",</div><div class='add'>+		.name = "cropcap_bounds_height",</div><div class='add'>+		.internal_id = PVR2_CID_CROPCAPBH,</div><div class='add'>+		.get_value = ctrl_get_cropcapbh,</div><div class='ctx'> 	},{</div><div class='ctx'> 		.desc = "Video Source",</div><div class='ctx'> 		.name = "input",</div><div class='hunk'>@@ -1313,9 +1572,19 @@ int pvr2_upload_firmware2(struct pvr2_hdw *hdw)</div><div class='ctx'> 		if (bcnt &gt; FIRMWARE_CHUNK_SIZE) bcnt = FIRMWARE_CHUNK_SIZE;</div><div class='ctx'> 		memcpy(fw_ptr, fw_entry-&gt;data + fw_done, bcnt);</div><div class='ctx'> 		/* Usbsnoop log shows that we must swap bytes... */</div><div class='add'>+		/* Some background info: The data being swapped here is a</div><div class='add'>+		   firmware image destined for the mpeg encoder chip that</div><div class='add'>+		   lives at the other end of a USB endpoint.  The encoder</div><div class='add'>+		   chip always talks in 32 bit chunks and its storage is</div><div class='add'>+		   organized into 32 bit words.  However from the file</div><div class='add'>+		   system to the encoder chip everything is purely a byte</div><div class='add'>+		   stream.  The firmware file's contents are always 32 bit</div><div class='add'>+		   swapped from what the encoder expects.  Thus the need</div><div class='add'>+		   always exists to swap the bytes regardless of the endian</div><div class='add'>+		   type of the host processor and therefore swab32() makes</div><div class='add'>+		   the most sense. */</div><div class='ctx'> 		for (icnt = 0; icnt &lt; bcnt/4 ; icnt++)</div><div class='del'>-			((u32 *)fw_ptr)[icnt] =</div><div class='del'>-				___swab32(((u32 *)fw_ptr)[icnt]);</div><div class='add'>+			((u32 *)fw_ptr)[icnt] = swab32(((u32 *)fw_ptr)[icnt]);</div><div class='ctx'> </div><div class='ctx'> 		ret |= usb_bulk_msg(hdw-&gt;usb_dev, pipe, fw_ptr,bcnt,</div><div class='ctx'> 				    &amp;actual_length, HZ);</div><div class='hunk'>@@ -1905,7 +2174,7 @@ struct pvr2_hdw *pvr2_hdw_create(struct usb_interface *intf,</div><div class='ctx'> 				 const struct usb_device_id *devid)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int idx,cnt1,cnt2,m;</div><div class='del'>-	struct pvr2_hdw *hdw;</div><div class='add'>+	struct pvr2_hdw *hdw = NULL;</div><div class='ctx'> 	int valid_std_mask;</div><div class='ctx'> 	struct pvr2_ctrl *cptr;</div><div class='ctx'> 	const struct pvr2_device_desc *hdw_desc;</div><div class='hunk'>@@ -1915,6 +2184,16 @@ struct pvr2_hdw *pvr2_hdw_create(struct usb_interface *intf,</div><div class='ctx'> </div><div class='ctx'> 	hdw_desc = (const struct pvr2_device_desc *)(devid-&gt;driver_info);</div><div class='ctx'> </div><div class='add'>+	if (hdw_desc == NULL) {</div><div class='add'>+		pvr2_trace(PVR2_TRACE_INIT, "pvr2_hdw_create:"</div><div class='add'>+			   " No device description pointer,"</div><div class='add'>+			   " unable to continue.");</div><div class='add'>+		pvr2_trace(PVR2_TRACE_INIT, "If you have a new device type,"</div><div class='add'>+			   " please contact Mike Isely &lt;isely@pobox.com&gt;"</div><div class='add'>+			   " to get it included in the driver\n");</div><div class='add'>+		goto fail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	hdw = kzalloc(sizeof(*hdw),GFP_KERNEL);</div><div class='ctx'> 	pvr2_trace(PVR2_TRACE_INIT,"pvr2_hdw_create: hdw=%p, type \"%s\"",</div><div class='ctx'> 		   hdw,hdw_desc-&gt;description);</div><div class='hunk'>@@ -2072,6 +2351,7 @@ struct pvr2_hdw *pvr2_hdw_create(struct usb_interface *intf,</div><div class='ctx'> 			valid_std_mask;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	hdw-&gt;cropcap_stale = !0;</div><div class='ctx'> 	hdw-&gt;eeprom_addr = -1;</div><div class='ctx'> 	hdw-&gt;unit_number = -1;</div><div class='ctx'> 	hdw-&gt;v4l_minor_number_video = -1;</div><div class='hunk'>@@ -2508,6 +2788,28 @@ static int pvr2_hdw_commit_execute(struct pvr2_hdw *hdw)</div><div class='ctx'> 		/* Can't commit anything until pathway is ok. */</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='add'>+	/* The broadcast decoder can only scale down, so if</div><div class='add'>+	 * res_*_dirty &amp;&amp; crop window &lt; output format ==&gt; enlarge crop.</div><div class='add'>+	 *</div><div class='add'>+	 * The mpeg encoder receives fields of res_hor_val dots and</div><div class='add'>+	 * res_ver_val halflines.  Limits: hor&lt;=720, ver&lt;=576.</div><div class='add'>+	 */</div><div class='add'>+	if (hdw-&gt;res_hor_dirty &amp;&amp; hdw-&gt;cropw_val &lt; hdw-&gt;res_hor_val) {</div><div class='add'>+		hdw-&gt;cropw_val = hdw-&gt;res_hor_val;</div><div class='add'>+		hdw-&gt;cropw_dirty = !0;</div><div class='add'>+	} else if (hdw-&gt;cropw_dirty) {</div><div class='add'>+		hdw-&gt;res_hor_dirty = !0;           /* must rescale */</div><div class='add'>+		hdw-&gt;res_hor_val = min(720, hdw-&gt;cropw_val);</div><div class='add'>+	}</div><div class='add'>+	if (hdw-&gt;res_ver_dirty &amp;&amp; hdw-&gt;croph_val &lt; hdw-&gt;res_ver_val) {</div><div class='add'>+		hdw-&gt;croph_val = hdw-&gt;res_ver_val;</div><div class='add'>+		hdw-&gt;croph_dirty = !0;</div><div class='add'>+	} else if (hdw-&gt;croph_dirty) {</div><div class='add'>+		int nvres = hdw-&gt;std_mask_cur &amp; V4L2_STD_525_60 ? 480 : 576;</div><div class='add'>+		hdw-&gt;res_ver_dirty = !0;</div><div class='add'>+		hdw-&gt;res_ver_val = min(nvres, hdw-&gt;croph_val);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* If any of the below has changed, then we can't do the update</div><div class='ctx'> 	   while the pipeline is running.  Pipeline must be paused first</div><div class='ctx'> 	   and decoder -&gt; encoder connection be made quiescent before we</div><div class='hunk'>@@ -2518,6 +2820,8 @@ static int pvr2_hdw_commit_execute(struct pvr2_hdw *hdw)</div><div class='ctx'> 		 hdw-&gt;srate_dirty ||</div><div class='ctx'> 		 hdw-&gt;res_ver_dirty ||</div><div class='ctx'> 		 hdw-&gt;res_hor_dirty ||</div><div class='add'>+		 hdw-&gt;cropw_dirty ||</div><div class='add'>+		 hdw-&gt;croph_dirty ||</div><div class='ctx'> 		 hdw-&gt;input_dirty ||</div><div class='ctx'> 		 (hdw-&gt;active_stream_type != hdw-&gt;desired_stream_type));</div><div class='ctx'> 	if (disruptive_change &amp;&amp; !hdw-&gt;state_pipeline_idle) {</div><div class='hunk'>@@ -2587,6 +2891,9 @@ static int pvr2_hdw_commit_execute(struct pvr2_hdw *hdw)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	hdw-&gt;state_pipeline_config = !0;</div><div class='add'>+	/* Hardware state may have changed in a way to cause the cropping</div><div class='add'>+	   capabilities to have changed.  So mark it stale, which will</div><div class='add'>+	   cause a later re-fetch. */</div><div class='ctx'> 	trace_stbit("state_pipeline_config",hdw-&gt;state_pipeline_config);</div><div class='ctx'> 	return !0;</div><div class='ctx'> }</div><div class='hunk'>@@ -2677,6 +2984,33 @@ void pvr2_hdw_execute_tuner_poll(struct pvr2_hdw *hdw)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+static int pvr2_hdw_check_cropcap(struct pvr2_hdw *hdw)</div><div class='add'>+{</div><div class='add'>+	if (!hdw-&gt;cropcap_stale) {</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	pvr2_i2c_core_status_poll(hdw);</div><div class='add'>+	if (hdw-&gt;cropcap_stale) {</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Return information about cropping capabilities */</div><div class='add'>+int pvr2_hdw_get_cropcap(struct pvr2_hdw *hdw, struct v4l2_cropcap *pp)</div><div class='add'>+{</div><div class='add'>+	int stat = 0;</div><div class='add'>+	LOCK_TAKE(hdw-&gt;big_lock);</div><div class='add'>+	stat = pvr2_hdw_check_cropcap(hdw);</div><div class='add'>+	if (!stat) {</div><div class='add'>+		memcpy(pp, &amp;hdw-&gt;cropcap_info, sizeof(hdw-&gt;cropcap_info));</div><div class='add'>+	}</div><div class='add'>+	LOCK_GIVE(hdw-&gt;big_lock);</div><div class='add'>+	return stat;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> /* Return information about the tuner */</div><div class='ctx'> int pvr2_hdw_get_tuner_status(struct pvr2_hdw *hdw,struct v4l2_tuner *vtp)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.h b/drivers/media/video/pvrusb2/pvrusb2-hdw.h<br/>index c04956d304a7..49482d1f2b28 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/pvrusb2/pvrusb2-hdw.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/pvrusb2/pvrusb2-hdw.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/pvrusb2/pvrusb2-hdw.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/pvrusb2/pvrusb2-hdw.h</a></div><div class='hunk'>@@ -36,6 +36,16 @@</div><div class='ctx'> #define PVR2_CID_FREQUENCY 6</div><div class='ctx'> #define PVR2_CID_HRES 7</div><div class='ctx'> #define PVR2_CID_VRES 8</div><div class='add'>+#define PVR2_CID_CROPL 9</div><div class='add'>+#define PVR2_CID_CROPT 10</div><div class='add'>+#define PVR2_CID_CROPW 11</div><div class='add'>+#define PVR2_CID_CROPH 12</div><div class='add'>+#define PVR2_CID_CROPCAPPAN 13</div><div class='add'>+#define PVR2_CID_CROPCAPPAD 14</div><div class='add'>+#define PVR2_CID_CROPCAPBL 15</div><div class='add'>+#define PVR2_CID_CROPCAPBT 16</div><div class='add'>+#define PVR2_CID_CROPCAPBW 17</div><div class='add'>+#define PVR2_CID_CROPCAPBH 18</div><div class='ctx'> </div><div class='ctx'> /* Legal values for the INPUT state variable */</div><div class='ctx'> #define PVR2_CVAL_INPUT_TV 0</div><div class='hunk'>@@ -170,6 +180,9 @@ void pvr2_hdw_execute_tuner_poll(struct pvr2_hdw *);</div><div class='ctx'> /* Return information about the tuner */</div><div class='ctx'> int pvr2_hdw_get_tuner_status(struct pvr2_hdw *,struct v4l2_tuner *);</div><div class='ctx'> </div><div class='add'>+/* Return information about cropping capabilities */</div><div class='add'>+int pvr2_hdw_get_cropcap(struct pvr2_hdw *, struct v4l2_cropcap *);</div><div class='add'>+</div><div class='ctx'> /* Query device and see if it thinks it is on a high-speed USB link */</div><div class='ctx'> int pvr2_hdw_is_hsm(struct pvr2_hdw *);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c b/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c<br/>index ccdb429fc7af..94a47718e88e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c</a></div><div class='hunk'>@@ -37,8 +37,9 @@</div><div class='ctx'> #define OP_VOLUME 3</div><div class='ctx'> #define OP_FREQ 4</div><div class='ctx'> #define OP_AUDIORATE 5</div><div class='del'>-#define OP_SIZE 6</div><div class='del'>-#define OP_LOG 7</div><div class='add'>+#define OP_CROP 6</div><div class='add'>+#define OP_SIZE 7</div><div class='add'>+#define OP_LOG 8</div><div class='ctx'> </div><div class='ctx'> static const struct pvr2_i2c_op * const ops[] = {</div><div class='ctx'> 	[OP_STANDARD] = &amp;pvr2_i2c_op_v4l2_standard,</div><div class='hunk'>@@ -46,6 +47,7 @@ static const struct pvr2_i2c_op * const ops[] = {</div><div class='ctx'> 	[OP_BCSH] = &amp;pvr2_i2c_op_v4l2_bcsh,</div><div class='ctx'> 	[OP_VOLUME] = &amp;pvr2_i2c_op_v4l2_volume,</div><div class='ctx'> 	[OP_FREQ] = &amp;pvr2_i2c_op_v4l2_frequency,</div><div class='add'>+	[OP_CROP] = &amp;pvr2_i2c_op_v4l2_crop,</div><div class='ctx'> 	[OP_SIZE] = &amp;pvr2_i2c_op_v4l2_size,</div><div class='ctx'> 	[OP_LOG] = &amp;pvr2_i2c_op_v4l2_log,</div><div class='ctx'> };</div><div class='hunk'>@@ -59,6 +61,7 @@ void pvr2_i2c_probe(struct pvr2_hdw *hdw,struct pvr2_i2c_client *cp)</div><div class='ctx'> 			(1 &lt;&lt; OP_BCSH) |</div><div class='ctx'> 			(1 &lt;&lt; OP_VOLUME) |</div><div class='ctx'> 			(1 &lt;&lt; OP_FREQ) |</div><div class='add'>+			(1 &lt;&lt; OP_CROP) |</div><div class='ctx'> 			(1 &lt;&lt; OP_SIZE) |</div><div class='ctx'> 			(1 &lt;&lt; OP_LOG));</div><div class='ctx'> 	cp-&gt;status_poll = pvr2_v4l2_cmd_status_poll;</div><div class='head'>diff --git a/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c b/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c<br/>index 55f04a0b2047..16bb11902a52 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c</a></div><div class='hunk'>@@ -37,6 +37,7 @@ static void set_standard(struct pvr2_hdw *hdw)</div><div class='ctx'> 		pvr2_i2c_core_cmd(hdw,VIDIOC_S_STD,&amp;vs);</div><div class='ctx'> 	}</div><div class='ctx'> 	hdw-&gt;tuner_signal_stale = !0;</div><div class='add'>+	hdw-&gt;cropcap_stale = !0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -233,6 +234,37 @@ const struct pvr2_i2c_op pvr2_i2c_op_v4l2_size = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+static void set_crop(struct pvr2_hdw *hdw)</div><div class='add'>+{</div><div class='add'>+	struct v4l2_crop crop;</div><div class='add'>+</div><div class='add'>+	memset(&amp;crop, 0, sizeof crop);</div><div class='add'>+	crop.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;</div><div class='add'>+	crop.c.left = hdw-&gt;cropl_val;</div><div class='add'>+	crop.c.top = hdw-&gt;cropt_val;</div><div class='add'>+	crop.c.height = hdw-&gt;croph_val;</div><div class='add'>+	crop.c.width = hdw-&gt;cropw_val;</div><div class='add'>+</div><div class='add'>+	pvr2_trace(PVR2_TRACE_CHIPS,</div><div class='add'>+		   "i2c v4l2 set_crop crop=%d:%d:%d:%d",</div><div class='add'>+		   crop.c.width, crop.c.height, crop.c.left, crop.c.top);</div><div class='add'>+</div><div class='add'>+	pvr2_i2c_core_cmd(hdw, VIDIOC_S_CROP, &amp;crop);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int check_crop(struct pvr2_hdw *hdw)</div><div class='add'>+{</div><div class='add'>+	return (hdw-&gt;cropl_dirty || hdw-&gt;cropt_dirty ||</div><div class='add'>+		hdw-&gt;cropw_dirty || hdw-&gt;croph_dirty);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct pvr2_i2c_op pvr2_i2c_op_v4l2_crop = {</div><div class='add'>+	.check = check_crop,</div><div class='add'>+	.update = set_crop,</div><div class='add'>+	.name = "v4l2_crop",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> static void do_log(struct pvr2_hdw *hdw)</div><div class='ctx'> {</div><div class='ctx'> 	pvr2_trace(PVR2_TRACE_CHIPS,"i2c v4l2 do_log()");</div><div class='hunk'>@@ -263,7 +295,19 @@ void pvr2_v4l2_cmd_stream(struct pvr2_i2c_client *cp,int fl)</div><div class='ctx'> </div><div class='ctx'> void pvr2_v4l2_cmd_status_poll(struct pvr2_i2c_client *cp)</div><div class='ctx'> {</div><div class='del'>-	pvr2_i2c_client_cmd(cp,VIDIOC_G_TUNER,&amp;cp-&gt;hdw-&gt;tuner_signal_info);</div><div class='add'>+	int stat;</div><div class='add'>+	struct pvr2_hdw *hdw = cp-&gt;hdw;</div><div class='add'>+	if (hdw-&gt;cropcap_stale) {</div><div class='add'>+		hdw-&gt;cropcap_info.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;</div><div class='add'>+		stat = pvr2_i2c_client_cmd(cp, VIDIOC_CROPCAP,</div><div class='add'>+					   &amp;hdw-&gt;cropcap_info);</div><div class='add'>+		if (stat == 0) {</div><div class='add'>+			/* Check was successful, so the data is no</div><div class='add'>+			   longer considered stale. */</div><div class='add'>+			hdw-&gt;cropcap_stale = 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	pvr2_i2c_client_cmd(cp, VIDIOC_G_TUNER, &amp;hdw-&gt;tuner_signal_info);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.h b/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.h<br/>index 7fa38683b3b1..eb744a20610d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.h</a></div><div class='hunk'>@@ -29,6 +29,7 @@ extern const struct pvr2_i2c_op pvr2_i2c_op_v4l2_radio;</div><div class='ctx'> extern const struct pvr2_i2c_op pvr2_i2c_op_v4l2_bcsh;</div><div class='ctx'> extern const struct pvr2_i2c_op pvr2_i2c_op_v4l2_volume;</div><div class='ctx'> extern const struct pvr2_i2c_op pvr2_i2c_op_v4l2_frequency;</div><div class='add'>+extern const struct pvr2_i2c_op pvr2_i2c_op_v4l2_crop;</div><div class='ctx'> extern const struct pvr2_i2c_op pvr2_i2c_op_v4l2_size;</div><div class='ctx'> extern const struct pvr2_i2c_op pvr2_i2c_op_v4l2_audiomode;</div><div class='ctx'> extern const struct pvr2_i2c_op pvr2_i2c_op_v4l2_log;</div><div class='head'>diff --git a/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c b/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c<br/>index e600576a6c4b..d6a35401fefb 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/pvrusb2/pvrusb2-i2c-core.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/pvrusb2/pvrusb2-i2c-core.c</a></div><div class='hunk'>@@ -827,7 +827,7 @@ static unsigned int pvr2_i2c_client_describe(struct pvr2_i2c_client *cp,</div><div class='ctx'> 	if ((detail &amp; PVR2_I2C_DETAIL_CTLMASK) &amp;&amp; cp-&gt;ctl_mask) {</div><div class='ctx'> 		unsigned int idx;</div><div class='ctx'> 		unsigned long msk,sm;</div><div class='del'>-		int spcfl;</div><div class='add'>+</div><div class='ctx'> 		bcnt = scnprintf(buf,maxlen," [");</div><div class='ctx'> 		ccnt += bcnt; buf += bcnt; maxlen -= bcnt;</div><div class='ctx'> 		sm = 0;</div><div class='hunk'>@@ -891,6 +891,7 @@ static int pvr2_i2c_attach_inform(struct i2c_client *client)</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;cp-&gt;list);</div><div class='ctx'> 	cp-&gt;client = client;</div><div class='ctx'> 	mutex_lock(&amp;hdw-&gt;i2c_list_lock); do {</div><div class='add'>+		hdw-&gt;cropcap_stale = !0;</div><div class='ctx'> 		list_add_tail(&amp;cp-&gt;list,&amp;hdw-&gt;i2c_clients);</div><div class='ctx'> 		hdw-&gt;i2c_pend_types |= PVR2_I2C_PEND_DETECT;</div><div class='ctx'> 	} while (0); mutex_unlock(&amp;hdw-&gt;i2c_list_lock);</div><div class='hunk'>@@ -905,6 +906,7 @@ static int pvr2_i2c_detach_inform(struct i2c_client *client)</div><div class='ctx'> 	unsigned long amask = 0;</div><div class='ctx'> 	int foundfl = 0;</div><div class='ctx'> 	mutex_lock(&amp;hdw-&gt;i2c_list_lock); do {</div><div class='add'>+		hdw-&gt;cropcap_stale = !0;</div><div class='ctx'> 		list_for_each_entry_safe(cp, ncp, &amp;hdw-&gt;i2c_clients, list) {</div><div class='ctx'> 			if (cp-&gt;client == client) {</div><div class='ctx'> 				trace_i2c("pvr2_i2c_detach"</div><div class='hunk'>@@ -946,22 +948,32 @@ static struct i2c_adapter pvr2_i2c_adap_template = {</div><div class='ctx'> 	.client_unregister = pvr2_i2c_detach_inform,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void do_i2c_scan(struct pvr2_hdw *hdw)</div><div class='add'>+</div><div class='add'>+/* Return true if device exists at given address */</div><div class='add'>+static int do_i2c_probe(struct pvr2_hdw *hdw, int addr)</div><div class='ctx'> {</div><div class='ctx'> 	struct i2c_msg msg[1];</div><div class='del'>-	int i,rc;</div><div class='add'>+	int rc;</div><div class='ctx'> 	msg[0].addr = 0;</div><div class='ctx'> 	msg[0].flags = I2C_M_RD;</div><div class='ctx'> 	msg[0].len = 0;</div><div class='ctx'> 	msg[0].buf = NULL;</div><div class='del'>-	printk("%s: i2c scan beginning\n",hdw-&gt;name);</div><div class='add'>+	msg[0].addr = addr;</div><div class='add'>+	rc = i2c_transfer(&amp;hdw-&gt;i2c_adap, msg, ARRAY_SIZE(msg));</div><div class='add'>+	return rc == 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void do_i2c_scan(struct pvr2_hdw *hdw)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	printk(KERN_INFO "%s: i2c scan beginning\n", hdw-&gt;name);</div><div class='ctx'> 	for (i = 0; i &lt; 128; i++) {</div><div class='del'>-		msg[0].addr = i;</div><div class='del'>-		rc = i2c_transfer(&amp;hdw-&gt;i2c_adap,msg, ARRAY_SIZE(msg));</div><div class='del'>-		if (rc != 1) continue;</div><div class='del'>-		printk("%s: i2c scan: found device @ 0x%x\n",hdw-&gt;name,i);</div><div class='add'>+		if (do_i2c_probe(hdw, i)) {</div><div class='add'>+			printk(KERN_INFO "%s: i2c scan: found device @ 0x%x\n",</div><div class='add'>+			       hdw-&gt;name, i);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	printk("%s: i2c scan done.\n",hdw-&gt;name);</div><div class='add'>+	printk(KERN_INFO "%s: i2c scan done.\n", hdw-&gt;name);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void pvr2_i2c_core_init(struct pvr2_hdw *hdw)</div><div class='hunk'>@@ -980,8 +992,6 @@ void pvr2_i2c_core_init(struct pvr2_hdw *hdw)</div><div class='ctx'> 		hdw-&gt;i2c_func[0x18] = i2c_black_hole;</div><div class='ctx'> 	} else if (ir_mode[hdw-&gt;unit_number] == 1) {</div><div class='ctx'> 		if (hdw-&gt;hdw_desc-&gt;ir_scheme == PVR2_IR_SCHEME_24XXX) {</div><div class='del'>-			/* This comment is present PURELY to get</div><div class='del'>-			   checkpatch.pl to STFU.  Lovely, eh? */</div><div class='ctx'> 			hdw-&gt;i2c_func[0x18] = i2c_24xxx_ir;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1006,6 +1016,16 @@ void pvr2_i2c_core_init(struct pvr2_hdw *hdw)</div><div class='ctx'> 	mutex_init(&amp;hdw-&gt;i2c_list_lock);</div><div class='ctx'> 	hdw-&gt;i2c_linked = !0;</div><div class='ctx'> 	i2c_add_adapter(&amp;hdw-&gt;i2c_adap);</div><div class='add'>+	if (hdw-&gt;i2c_func[0x18] == i2c_24xxx_ir) {</div><div class='add'>+		/* Probe for a different type of IR receiver on this</div><div class='add'>+		   device.  If present, disable the emulated IR receiver. */</div><div class='add'>+		if (do_i2c_probe(hdw, 0x71)) {</div><div class='add'>+			pvr2_trace(PVR2_TRACE_INFO,</div><div class='add'>+				   "Device has newer IR hardware;"</div><div class='add'>+				   " disabling unneeded virtual IR device");</div><div class='add'>+			hdw-&gt;i2c_func[0x18] = NULL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> 	if (i2c_scan) do_i2c_scan(hdw);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/pvrusb2/pvrusb2-main.c b/drivers/media/video/pvrusb2/pvrusb2-main.c<br/>index ad0d98c2ebb4..9b3c874d96d6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/pvrusb2/pvrusb2-main.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/pvrusb2/pvrusb2-main.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/pvrusb2/pvrusb2-main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/pvrusb2/pvrusb2-main.c</a></div><div class='hunk'>@@ -137,9 +137,11 @@ static int __init pvr_init(void)</div><div class='ctx'> 	ret = usb_register(&amp;pvr_driver);</div><div class='ctx'> </div><div class='ctx'> 	if (ret == 0)</div><div class='del'>-		info(DRIVER_DESC " : " DRIVER_VERSION);</div><div class='del'>-	if (pvrusb2_debug) info("Debug mask is %d (0x%x)",</div><div class='del'>-				pvrusb2_debug,pvrusb2_debug);</div><div class='add'>+		printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"</div><div class='add'>+		       DRIVER_DESC "\n");</div><div class='add'>+	if (pvrusb2_debug)</div><div class='add'>+		printk(KERN_INFO KBUILD_MODNAME ": Debug mask is %d (0x%x)\n",</div><div class='add'>+		       pvrusb2_debug,pvrusb2_debug);</div><div class='ctx'> </div><div class='ctx'> 	pvr2_trace(PVR2_TRACE_INIT,"pvr_init complete");</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/pvrusb2/pvrusb2-sysfs.c b/drivers/media/video/pvrusb2/pvrusb2-sysfs.c<br/>index 46a8c39ba030..733680f21317 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/pvrusb2/pvrusb2-sysfs.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/pvrusb2/pvrusb2-sysfs.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/pvrusb2/pvrusb2-sysfs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/pvrusb2/pvrusb2-sysfs.c</a></div><div class='hunk'>@@ -65,6 +65,7 @@ struct pvr2_sysfs_ctl_item {</div><div class='ctx'> 	struct device_attribute attr_type;</div><div class='ctx'> 	struct device_attribute attr_min;</div><div class='ctx'> 	struct device_attribute attr_max;</div><div class='add'>+	struct device_attribute attr_def;</div><div class='ctx'> 	struct device_attribute attr_enum;</div><div class='ctx'> 	struct device_attribute attr_bits;</div><div class='ctx'> 	struct device_attribute attr_val;</div><div class='hunk'>@@ -145,6 +146,23 @@ static ssize_t show_max(struct device *class_dev,</div><div class='ctx'> 	return scnprintf(buf, PAGE_SIZE, "%ld\n", val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static ssize_t show_def(struct device *class_dev,</div><div class='add'>+			struct device_attribute *attr,</div><div class='add'>+			char *buf)</div><div class='add'>+{</div><div class='add'>+	struct pvr2_sysfs_ctl_item *cip;</div><div class='add'>+	int val;</div><div class='add'>+	int ret;</div><div class='add'>+	cip = container_of(attr, struct pvr2_sysfs_ctl_item, attr_def);</div><div class='add'>+	ret = pvr2_ctrl_get_def(cip-&gt;cptr, &amp;val);</div><div class='add'>+	pvr2_sysfs_trace("pvr2_sysfs(%p) show_def(cid=%d) is %d, stat=%d",</div><div class='add'>+			 cip-&gt;chptr, cip-&gt;ctl_id, val, ret);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+	return scnprintf(buf, PAGE_SIZE, "%d\n", val);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static ssize_t show_val_norm(struct device *class_dev,</div><div class='ctx'> 			     struct device_attribute *attr,</div><div class='ctx'> 			     char *buf)</div><div class='hunk'>@@ -320,6 +338,10 @@ static void pvr2_sysfs_add_control(struct pvr2_sysfs *sfp,int ctl_id)</div><div class='ctx'> 	cip-&gt;attr_max.attr.mode = S_IRUGO;</div><div class='ctx'> 	cip-&gt;attr_max.show = show_max;</div><div class='ctx'> </div><div class='add'>+	cip-&gt;attr_def.attr.name = "def_val";</div><div class='add'>+	cip-&gt;attr_def.attr.mode = S_IRUGO;</div><div class='add'>+	cip-&gt;attr_def.show = show_def;</div><div class='add'>+</div><div class='ctx'> 	cip-&gt;attr_val.attr.name = "cur_val";</div><div class='ctx'> 	cip-&gt;attr_val.attr.mode = S_IRUGO;</div><div class='ctx'> </div><div class='hunk'>@@ -343,6 +365,7 @@ static void pvr2_sysfs_add_control(struct pvr2_sysfs *sfp,int ctl_id)</div><div class='ctx'> 	cip-&gt;attr_gen[acnt++] = &amp;cip-&gt;attr_name.attr;</div><div class='ctx'> 	cip-&gt;attr_gen[acnt++] = &amp;cip-&gt;attr_type.attr;</div><div class='ctx'> 	cip-&gt;attr_gen[acnt++] = &amp;cip-&gt;attr_val.attr;</div><div class='add'>+	cip-&gt;attr_gen[acnt++] = &amp;cip-&gt;attr_def.attr;</div><div class='ctx'> 	cip-&gt;attr_val.show = show_val_norm;</div><div class='ctx'> 	cip-&gt;attr_val.store = store_val_norm;</div><div class='ctx'> 	if (pvr2_ctrl_has_custom_symbols(cptr)) {</div><div class='head'>diff --git a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c<br/>index 00306faeac01..f048d80b77e5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/pvrusb2/pvrusb2-v4l2.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/pvrusb2/pvrusb2-v4l2.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/pvrusb2/pvrusb2-v4l2.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/pvrusb2/pvrusb2-v4l2.c</a></div><div class='hunk'>@@ -533,7 +533,7 @@ static int pvr2_v4l2_do_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> </div><div class='ctx'> 			lmin = pvr2_ctrl_get_min(hcp);</div><div class='ctx'> 			lmax = pvr2_ctrl_get_max(hcp);</div><div class='del'>-			ldef = pvr2_ctrl_get_def(hcp);</div><div class='add'>+			pvr2_ctrl_get_def(hcp, &amp;ldef);</div><div class='ctx'> 			if (w == -1) {</div><div class='ctx'> 				w = ldef;</div><div class='ctx'> 			} else if (w &lt; lmin) {</div><div class='hunk'>@@ -543,7 +543,7 @@ static int pvr2_v4l2_do_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 			}</div><div class='ctx'> 			lmin = pvr2_ctrl_get_min(vcp);</div><div class='ctx'> 			lmax = pvr2_ctrl_get_max(vcp);</div><div class='del'>-			ldef = pvr2_ctrl_get_def(vcp);</div><div class='add'>+			pvr2_ctrl_get_def(vcp, &amp;ldef);</div><div class='ctx'> 			if (h == -1) {</div><div class='ctx'> 				h = ldef;</div><div class='ctx'> 			} else if (h &lt; lmin) {</div><div class='hunk'>@@ -604,6 +604,7 @@ static int pvr2_v4l2_do_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 	case VIDIOC_QUERYCTRL:</div><div class='ctx'> 	{</div><div class='ctx'> 		struct pvr2_ctrl *cptr;</div><div class='add'>+		int val;</div><div class='ctx'> 		struct v4l2_queryctrl *vc = (struct v4l2_queryctrl *)arg;</div><div class='ctx'> 		ret = 0;</div><div class='ctx'> 		if (vc-&gt;id &amp; V4L2_CTRL_FLAG_NEXT_CTRL) {</div><div class='hunk'>@@ -627,7 +628,8 @@ static int pvr2_v4l2_do_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 			   pvr2_ctrl_get_desc(cptr));</div><div class='ctx'> 		strlcpy(vc-&gt;name,pvr2_ctrl_get_desc(cptr),sizeof(vc-&gt;name));</div><div class='ctx'> 		vc-&gt;flags = pvr2_ctrl_get_v4lflags(cptr);</div><div class='del'>-		vc-&gt;default_value = pvr2_ctrl_get_def(cptr);</div><div class='add'>+		pvr2_ctrl_get_def(cptr, &amp;val);</div><div class='add'>+		vc-&gt;default_value = val;</div><div class='ctx'> 		switch (pvr2_ctrl_get_type(cptr)) {</div><div class='ctx'> 		case pvr2_ctl_enum:</div><div class='ctx'> 			vc-&gt;type = V4L2_CTRL_TYPE_MENU;</div><div class='hunk'>@@ -753,6 +755,92 @@ static int pvr2_v4l2_do_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	case VIDIOC_CROPCAP:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_cropcap *cap = (struct v4l2_cropcap *)arg;</div><div class='add'>+		if (cap-&gt;type != V4L2_BUF_TYPE_VIDEO_CAPTURE) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		ret = pvr2_hdw_get_cropcap(hdw, cap);</div><div class='add'>+		cap-&gt;type = V4L2_BUF_TYPE_VIDEO_CAPTURE; /* paranoia */</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_G_CROP:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_crop *crop = (struct v4l2_crop *)arg;</div><div class='add'>+		int val = 0;</div><div class='add'>+		if (crop-&gt;type != V4L2_BUF_TYPE_VIDEO_CAPTURE) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		ret = pvr2_ctrl_get_value(</div><div class='add'>+			pvr2_hdw_get_ctrl_by_id(hdw, PVR2_CID_CROPL), &amp;val);</div><div class='add'>+		if (ret != 0) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		crop-&gt;c.left = val;</div><div class='add'>+		ret = pvr2_ctrl_get_value(</div><div class='add'>+			pvr2_hdw_get_ctrl_by_id(hdw, PVR2_CID_CROPT), &amp;val);</div><div class='add'>+		if (ret != 0) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		crop-&gt;c.top = val;</div><div class='add'>+		ret = pvr2_ctrl_get_value(</div><div class='add'>+			pvr2_hdw_get_ctrl_by_id(hdw, PVR2_CID_CROPW), &amp;val);</div><div class='add'>+		if (ret != 0) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		crop-&gt;c.width = val;</div><div class='add'>+		ret = pvr2_ctrl_get_value(</div><div class='add'>+			pvr2_hdw_get_ctrl_by_id(hdw, PVR2_CID_CROPH), &amp;val);</div><div class='add'>+		if (ret != 0) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		crop-&gt;c.height = val;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_S_CROP:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_crop *crop = (struct v4l2_crop *)arg;</div><div class='add'>+		struct v4l2_cropcap cap;</div><div class='add'>+		if (crop-&gt;type != V4L2_BUF_TYPE_VIDEO_CAPTURE) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		cap.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;</div><div class='add'>+		ret = pvr2_ctrl_set_value(</div><div class='add'>+			pvr2_hdw_get_ctrl_by_id(hdw, PVR2_CID_CROPL),</div><div class='add'>+			crop-&gt;c.left);</div><div class='add'>+		if (ret != 0) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		ret = pvr2_ctrl_set_value(</div><div class='add'>+			pvr2_hdw_get_ctrl_by_id(hdw, PVR2_CID_CROPT),</div><div class='add'>+			crop-&gt;c.top);</div><div class='add'>+		if (ret != 0) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		ret = pvr2_ctrl_set_value(</div><div class='add'>+			pvr2_hdw_get_ctrl_by_id(hdw, PVR2_CID_CROPW),</div><div class='add'>+			crop-&gt;c.width);</div><div class='add'>+		if (ret != 0) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		ret = pvr2_ctrl_set_value(</div><div class='add'>+			pvr2_hdw_get_ctrl_by_id(hdw, PVR2_CID_CROPH),</div><div class='add'>+			crop-&gt;c.height);</div><div class='add'>+		if (ret != 0) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> 	case VIDIOC_LOG_STATUS:</div><div class='ctx'> 	{</div><div class='ctx'> 		pvr2_hdw_trigger_module_log(hdw);</div><div class='head'>diff --git a/drivers/media/video/pwc/pwc-ctrl.c b/drivers/media/video/pwc/pwc-ctrl.c<br/>index dbc560742553..c66530210192 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/pwc/pwc-ctrl.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/pwc/pwc-ctrl.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/pwc/pwc-ctrl.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/pwc/pwc-ctrl.c</a></div><div class='hunk'>@@ -41,7 +41,6 @@</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> #include &lt;asm/errno.h&gt;</div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "pwc.h"</div><div class='ctx'> #include "pwc-uncompress.h"</div><div class='head'>diff --git a/drivers/media/video/pwc/pwc-if.c b/drivers/media/video/pwc/pwc-if.c<br/>index 9aee7cb6f79a..ab28389b4cda 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/pwc/pwc-if.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/pwc/pwc-if.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/pwc/pwc-if.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/pwc/pwc-if.c</a></div><div class='hunk'>@@ -1112,7 +1112,7 @@ static int pwc_video_open(struct inode *inode, struct file *file)</div><div class='ctx'> </div><div class='ctx'> 	PWC_DEBUG_OPEN("&gt;&gt; video_open called(vdev = 0x%p).\n", vdev);</div><div class='ctx'> </div><div class='del'>-	pdev = (struct pwc_device *)vdev-&gt;priv;</div><div class='add'>+	pdev = video_get_drvdata(vdev);</div><div class='ctx'> 	BUG_ON(!pdev);</div><div class='ctx'> 	if (pdev-&gt;vopen) {</div><div class='ctx'> 		PWC_DEBUG_OPEN("I'm busy, someone is using the device.\n");</div><div class='hunk'>@@ -1233,7 +1233,7 @@ static int pwc_video_close(struct inode *inode, struct file *file)</div><div class='ctx'> 	PWC_DEBUG_OPEN("&gt;&gt; video_close called(vdev = 0x%p).\n", vdev);</div><div class='ctx'> </div><div class='ctx'> 	lock_kernel();</div><div class='del'>-	pdev = (struct pwc_device *)vdev-&gt;priv;</div><div class='add'>+	pdev = video_get_drvdata(vdev);</div><div class='ctx'> 	if (pdev-&gt;vopen == 0)</div><div class='ctx'> 		PWC_DEBUG_MODULE("video_close() called on closed device?\n");</div><div class='ctx'> </div><div class='hunk'>@@ -1304,7 +1304,7 @@ static ssize_t pwc_video_read(struct file *file, char __user *buf,</div><div class='ctx'> 			vdev, buf, count);</div><div class='ctx'> 	if (vdev == NULL)</div><div class='ctx'> 		return -EFAULT;</div><div class='del'>-	pdev = vdev-&gt;priv;</div><div class='add'>+	pdev = video_get_drvdata(vdev);</div><div class='ctx'> 	if (pdev == NULL)</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='hunk'>@@ -1386,7 +1386,7 @@ static unsigned int pwc_video_poll(struct file *file, poll_table *wait)</div><div class='ctx'> </div><div class='ctx'> 	if (vdev == NULL)</div><div class='ctx'> 		return -EFAULT;</div><div class='del'>-	pdev = vdev-&gt;priv;</div><div class='add'>+	pdev = video_get_drvdata(vdev);</div><div class='ctx'> 	if (pdev == NULL)</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='hunk'>@@ -1408,7 +1408,7 @@ static int pwc_video_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> </div><div class='ctx'> 	if (!vdev)</div><div class='ctx'> 		goto out;</div><div class='del'>-	pdev = vdev-&gt;priv;</div><div class='add'>+	pdev = video_get_drvdata(vdev);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;pdev-&gt;modlock);</div><div class='ctx'> 	if (!pdev-&gt;unplugged)</div><div class='hunk'>@@ -1428,7 +1428,7 @@ static int pwc_video_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='ctx'> 	int index;</div><div class='ctx'> </div><div class='ctx'> 	PWC_DEBUG_MEMORY("&gt;&gt; %s\n", __func__);</div><div class='del'>-	pdev = vdev-&gt;priv;</div><div class='add'>+	pdev = video_get_drvdata(vdev);</div><div class='ctx'> 	size = vma-&gt;vm_end - vma-&gt;vm_start;</div><div class='ctx'> 	start = vma-&gt;vm_start;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/pwc/pwc-v4l.c b/drivers/media/video/pwc/pwc-v4l.c<br/>index 1742889874df..76a1376c9751 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/pwc/pwc-v4l.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/pwc/pwc-v4l.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/pwc/pwc-v4l.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/pwc/pwc-v4l.c</a></div><div class='hunk'>@@ -346,7 +346,7 @@ int pwc_video_do_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> </div><div class='ctx'> 	if (vdev == NULL)</div><div class='ctx'> 		return -EFAULT;</div><div class='del'>-	pdev = vdev-&gt;priv;</div><div class='add'>+	pdev = video_get_drvdata(vdev);</div><div class='ctx'> 	if (pdev == NULL)</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/pxa_camera.c b/drivers/media/video/pxa_camera.c<br/>index 388cf94055d3..eb6be5802928 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/pxa_camera.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/pxa_camera.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/pxa_camera.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/pxa_camera.c</a></div><div class='hunk'>@@ -629,17 +629,6 @@ static void pxa_camera_activate(struct pxa_camera_dev *pcdev)</div><div class='ctx'> 		pdata-&gt;init(pcdev-&gt;dev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (pdata &amp;&amp; pdata-&gt;power) {</div><div class='del'>-		dev_dbg(pcdev-&gt;dev, "%s: Power on camera\n", __func__);</div><div class='del'>-		pdata-&gt;power(pcdev-&gt;dev, 1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (pdata &amp;&amp; pdata-&gt;reset) {</div><div class='del'>-		dev_dbg(pcdev-&gt;dev, "%s: Releasing camera reset\n",</div><div class='del'>-			__func__);</div><div class='del'>-		pdata-&gt;reset(pcdev-&gt;dev, 1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	CICR0 = 0x3FF;   /* disable all interrupts */</div><div class='ctx'> </div><div class='ctx'> 	if (pcdev-&gt;platform_flags &amp; PXA_CAMERA_PCLK_EN)</div><div class='hunk'>@@ -660,20 +649,7 @@ static void pxa_camera_activate(struct pxa_camera_dev *pcdev)</div><div class='ctx'> </div><div class='ctx'> static void pxa_camera_deactivate(struct pxa_camera_dev *pcdev)</div><div class='ctx'> {</div><div class='del'>-	struct pxacamera_platform_data *board = pcdev-&gt;pdata;</div><div class='del'>-</div><div class='ctx'> 	clk_disable(pcdev-&gt;clk);</div><div class='del'>-</div><div class='del'>-	if (board &amp;&amp; board-&gt;reset) {</div><div class='del'>-		dev_dbg(pcdev-&gt;dev, "%s: Asserting camera reset\n",</div><div class='del'>-			__func__);</div><div class='del'>-		board-&gt;reset(pcdev-&gt;dev, 0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (board &amp;&amp; board-&gt;power) {</div><div class='del'>-		dev_dbg(pcdev-&gt;dev, "%s: Power off camera\n", __func__);</div><div class='del'>-		board-&gt;power(pcdev-&gt;dev, 0);</div><div class='del'>-	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static irqreturn_t pxa_camera_irq(int irq, void *data)</div><div class='hunk'>@@ -1025,9 +1001,9 @@ static int pxa_camera_resume(struct soc_camera_device *icd)</div><div class='ctx'> 	struct pxa_camera_dev *pcdev = ici-&gt;priv;</div><div class='ctx'> 	int i = 0, ret = 0;</div><div class='ctx'> </div><div class='del'>-	DRCMR68 = pcdev-&gt;dma_chans[0] | DRCMR_MAPVLD;</div><div class='del'>-	DRCMR69 = pcdev-&gt;dma_chans[1] | DRCMR_MAPVLD;</div><div class='del'>-	DRCMR70 = pcdev-&gt;dma_chans[2] | DRCMR_MAPVLD;</div><div class='add'>+	DRCMR(68) = pcdev-&gt;dma_chans[0] | DRCMR_MAPVLD;</div><div class='add'>+	DRCMR(69) = pcdev-&gt;dma_chans[1] | DRCMR_MAPVLD;</div><div class='add'>+	DRCMR(70) = pcdev-&gt;dma_chans[2] | DRCMR_MAPVLD;</div><div class='ctx'> </div><div class='ctx'> 	CICR0 = pcdev-&gt;save_cicr[i++] &amp; ~CICR0_ENB;</div><div class='ctx'> 	CICR1 = pcdev-&gt;save_cicr[i++];</div><div class='hunk'>@@ -1144,36 +1120,36 @@ static int pxa_camera_probe(struct platform_device *pdev)</div><div class='ctx'> 	pcdev-&gt;dev = &amp;pdev-&gt;dev;</div><div class='ctx'> </div><div class='ctx'> 	/* request dma */</div><div class='del'>-	pcdev-&gt;dma_chans[0] = pxa_request_dma("CI_Y", DMA_PRIO_HIGH,</div><div class='del'>-					      pxa_camera_dma_irq_y, pcdev);</div><div class='del'>-	if (pcdev-&gt;dma_chans[0] &lt; 0) {</div><div class='add'>+	err = pxa_request_dma("CI_Y", DMA_PRIO_HIGH,</div><div class='add'>+			      pxa_camera_dma_irq_y, pcdev);</div><div class='add'>+	if (err &lt; 0) {</div><div class='ctx'> 		dev_err(pcdev-&gt;dev, "Can't request DMA for Y\n");</div><div class='del'>-		err = -ENOMEM;</div><div class='ctx'> 		goto exit_iounmap;</div><div class='ctx'> 	}</div><div class='add'>+	pcdev-&gt;dma_chans[0] = err;</div><div class='ctx'> 	dev_dbg(pcdev-&gt;dev, "got DMA channel %d\n", pcdev-&gt;dma_chans[0]);</div><div class='ctx'> </div><div class='del'>-	pcdev-&gt;dma_chans[1] = pxa_request_dma("CI_U", DMA_PRIO_HIGH,</div><div class='del'>-					      pxa_camera_dma_irq_u, pcdev);</div><div class='del'>-	if (pcdev-&gt;dma_chans[1] &lt; 0) {</div><div class='add'>+	err = pxa_request_dma("CI_U", DMA_PRIO_HIGH,</div><div class='add'>+			      pxa_camera_dma_irq_u, pcdev);</div><div class='add'>+	if (err &lt; 0) {</div><div class='ctx'> 		dev_err(pcdev-&gt;dev, "Can't request DMA for U\n");</div><div class='del'>-		err = -ENOMEM;</div><div class='ctx'> 		goto exit_free_dma_y;</div><div class='ctx'> 	}</div><div class='add'>+	pcdev-&gt;dma_chans[1] = err;</div><div class='ctx'> 	dev_dbg(pcdev-&gt;dev, "got DMA channel (U) %d\n", pcdev-&gt;dma_chans[1]);</div><div class='ctx'> </div><div class='del'>-	pcdev-&gt;dma_chans[2] = pxa_request_dma("CI_V", DMA_PRIO_HIGH,</div><div class='del'>-					      pxa_camera_dma_irq_v, pcdev);</div><div class='del'>-	if (pcdev-&gt;dma_chans[0] &lt; 0) {</div><div class='add'>+	err = pxa_request_dma("CI_V", DMA_PRIO_HIGH,</div><div class='add'>+			      pxa_camera_dma_irq_v, pcdev);</div><div class='add'>+	if (err &lt; 0) {</div><div class='ctx'> 		dev_err(pcdev-&gt;dev, "Can't request DMA for V\n");</div><div class='del'>-		err = -ENOMEM;</div><div class='ctx'> 		goto exit_free_dma_u;</div><div class='ctx'> 	}</div><div class='add'>+	pcdev-&gt;dma_chans[2] = err;</div><div class='ctx'> 	dev_dbg(pcdev-&gt;dev, "got DMA channel (V) %d\n", pcdev-&gt;dma_chans[2]);</div><div class='ctx'> </div><div class='del'>-	DRCMR68 = pcdev-&gt;dma_chans[0] | DRCMR_MAPVLD;</div><div class='del'>-	DRCMR69 = pcdev-&gt;dma_chans[1] | DRCMR_MAPVLD;</div><div class='del'>-	DRCMR70 = pcdev-&gt;dma_chans[2] | DRCMR_MAPVLD;</div><div class='add'>+	DRCMR(68) = pcdev-&gt;dma_chans[0] | DRCMR_MAPVLD;</div><div class='add'>+	DRCMR(69) = pcdev-&gt;dma_chans[1] | DRCMR_MAPVLD;</div><div class='add'>+	DRCMR(70) = pcdev-&gt;dma_chans[2] | DRCMR_MAPVLD;</div><div class='ctx'> </div><div class='ctx'> 	/* request irq */</div><div class='ctx'> 	err = request_irq(pcdev-&gt;irq, pxa_camera_irq, 0, PXA_CAM_DRV_NAME,</div><div class='head'>diff --git a/drivers/media/video/s2255drv.c b/drivers/media/video/s2255drv.c<br/>index 92b83feae366..5272926db73e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/s2255drv.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/s2255drv.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/s2255drv.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/s2255drv.c</a></div><div class='hunk'>@@ -58,6 +58,8 @@</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+/* default JPEG quality */</div><div class='add'>+#define S2255_DEF_JPEG_QUAL     50</div><div class='ctx'> /* vendor request in */</div><div class='ctx'> #define S2255_VR_IN		0</div><div class='ctx'> /* vendor request out */</div><div class='hunk'>@@ -67,20 +69,21 @@</div><div class='ctx'> /* USB endpoint number for configuring the device */</div><div class='ctx'> #define S2255_CONFIG_EP         2</div><div class='ctx'> /* maximum time for DSP to start responding after last FW word loaded(ms) */</div><div class='del'>-#define S2255_DSP_BOOTTIME      400</div><div class='add'>+#define S2255_DSP_BOOTTIME      800</div><div class='ctx'> /* maximum time to wait for firmware to load (ms) */</div><div class='ctx'> #define S2255_LOAD_TIMEOUT      (5000 + S2255_DSP_BOOTTIME)</div><div class='ctx'> #define S2255_DEF_BUFS          16</div><div class='add'>+#define S2255_SETMODE_TIMEOUT   500</div><div class='ctx'> #define MAX_CHANNELS		4</div><div class='del'>-#define FRAME_MARKER		0x2255DA4AL</div><div class='del'>-#define MAX_PIPE_USBBLOCK	(40 * 1024)</div><div class='del'>-#define DEFAULT_PIPE_USBBLOCK	(16 * 1024)</div><div class='add'>+#define S2255_MARKER_FRAME	0x2255DA4AL</div><div class='add'>+#define S2255_MARKER_RESPONSE	0x2255ACACL</div><div class='add'>+#define S2255_USB_XFER_SIZE	(16 * 1024)</div><div class='ctx'> #define MAX_CHANNELS		4</div><div class='ctx'> #define MAX_PIPE_BUFFERS	1</div><div class='ctx'> #define SYS_FRAMES		4</div><div class='ctx'> /* maximum size is PAL full size plus room for the marker header(s) */</div><div class='del'>-#define SYS_FRAMES_MAXSIZE	(720 * 288 * 2 * 2 + 4096)</div><div class='del'>-#define DEF_USB_BLOCK		(4096)</div><div class='add'>+#define SYS_FRAMES_MAXSIZE	(720*288*2*2 + 4096)</div><div class='add'>+#define DEF_USB_BLOCK		S2255_USB_XFER_SIZE</div><div class='ctx'> #define LINE_SZ_4CIFS_NTSC	640</div><div class='ctx'> #define LINE_SZ_2CIFS_NTSC	640</div><div class='ctx'> #define LINE_SZ_1CIFS_NTSC	320</div><div class='hunk'>@@ -108,6 +111,9 @@</div><div class='ctx'> #define COLOR_YUVPL	1	/* YUV planar */</div><div class='ctx'> #define COLOR_YUVPK	2	/* YUV packed */</div><div class='ctx'> #define COLOR_Y8	4	/* monochrome */</div><div class='add'>+#define COLOR_JPG       5       /* JPEG */</div><div class='add'>+#define MASK_COLOR      0xff</div><div class='add'>+#define MASK_JPG_QUALITY 0xff00</div><div class='ctx'> </div><div class='ctx'> /* frame decimation. Not implemented by V4L yet(experimental in V4L) */</div><div class='ctx'> #define FDEC_1		1	/* capture every frame. default */</div><div class='hunk'>@@ -148,16 +154,14 @@ struct s2255_mode {</div><div class='ctx'> 	u32 restart;	/* if DSP requires restart */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* frame structure */</div><div class='del'>-#define FRAME_STATE_UNUSED	0</div><div class='del'>-#define FRAME_STATE_FILLING	1</div><div class='del'>-#define FRAME_STATE_FULL	2</div><div class='ctx'> </div><div class='add'>+#define S2255_READ_IDLE		0</div><div class='add'>+#define S2255_READ_FRAME	1</div><div class='ctx'> </div><div class='add'>+/* frame structure */</div><div class='ctx'> struct s2255_framei {</div><div class='ctx'> 	unsigned long size;</div><div class='del'>-</div><div class='del'>-	unsigned long ulState;	/* ulState ==0 unused, 1 being filled, 2 full */</div><div class='add'>+	unsigned long ulState;	/* ulState:S2255_READ_IDLE, S2255_READ_FRAME*/</div><div class='ctx'> 	void *lpvbits;		/* image data */</div><div class='ctx'> 	unsigned long cur_size;	/* current data copied to it */</div><div class='ctx'> };</div><div class='hunk'>@@ -188,6 +192,10 @@ struct s2255_dmaqueue {</div><div class='ctx'> #define S2255_FW_FAILED		3</div><div class='ctx'> #define S2255_FW_DISCONNECTING  4</div><div class='ctx'> </div><div class='add'>+#define S2255_FW_MARKER         0x22552f2f</div><div class='add'>+/* 2255 read states */</div><div class='add'>+#define S2255_READ_IDLE         0</div><div class='add'>+#define S2255_READ_FRAME        1</div><div class='ctx'> struct s2255_fw {</div><div class='ctx'> 	int		      fw_loaded;</div><div class='ctx'> 	int		      fw_size;</div><div class='hunk'>@@ -195,7 +203,6 @@ struct s2255_fw {</div><div class='ctx'> 	atomic_t	      fw_state;</div><div class='ctx'> 	void		      *pfw_data;</div><div class='ctx'> 	wait_queue_head_t     wait_fw;</div><div class='del'>-	struct timer_list     dsp_wait;</div><div class='ctx'> 	const struct firmware *fw;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -237,15 +244,27 @@ struct s2255_dev {</div><div class='ctx'> 	struct s2255_pipeinfo	pipes[MAX_PIPE_BUFFERS];</div><div class='ctx'> 	struct s2255_bufferi		buffer[MAX_CHANNELS];</div><div class='ctx'> 	struct s2255_mode	mode[MAX_CHANNELS];</div><div class='add'>+	/* jpeg compression */</div><div class='add'>+	struct v4l2_jpegcompression jc[MAX_CHANNELS];</div><div class='ctx'> 	const struct s2255_fmt	*cur_fmt[MAX_CHANNELS];</div><div class='ctx'> 	int			cur_frame[MAX_CHANNELS];</div><div class='ctx'> 	int			last_frame[MAX_CHANNELS];</div><div class='ctx'> 	u32			cc;	/* current channel */</div><div class='ctx'> 	int			b_acquire[MAX_CHANNELS];</div><div class='add'>+	/* allocated image size */</div><div class='ctx'> 	unsigned long		req_image_size[MAX_CHANNELS];</div><div class='add'>+	/* received packet size */</div><div class='add'>+	unsigned long		pkt_size[MAX_CHANNELS];</div><div class='ctx'> 	int			bad_payload[MAX_CHANNELS];</div><div class='ctx'> 	unsigned long		frame_count[MAX_CHANNELS];</div><div class='ctx'> 	int			frame_ready;</div><div class='add'>+	/* if JPEG image */</div><div class='add'>+	int                     jpg_size[MAX_CHANNELS];</div><div class='add'>+	/* if channel configured to default state */</div><div class='add'>+	int                     chn_configured[MAX_CHANNELS];</div><div class='add'>+	wait_queue_head_t       wait_setmode[MAX_CHANNELS];</div><div class='add'>+	int                     setmode_ready[MAX_CHANNELS];</div><div class='add'>+	int                     chn_ready;</div><div class='ctx'> 	struct kref		kref;</div><div class='ctx'> 	spinlock_t              slock;</div><div class='ctx'> };</div><div class='hunk'>@@ -306,12 +325,16 @@ static void s2255_stop_readpipe(struct s2255_dev *dev);</div><div class='ctx'> static int s2255_start_acquire(struct s2255_dev *dev, unsigned long chn);</div><div class='ctx'> static int s2255_stop_acquire(struct s2255_dev *dev, unsigned long chn);</div><div class='ctx'> static void s2255_fillbuff(struct s2255_dev *dev, struct s2255_buffer *buf,</div><div class='del'>-			   int chn);</div><div class='add'>+			   int chn, int jpgsize);</div><div class='ctx'> static int s2255_set_mode(struct s2255_dev *dev, unsigned long chn,</div><div class='ctx'> 			  struct s2255_mode *mode);</div><div class='ctx'> static int s2255_board_shutdown(struct s2255_dev *dev);</div><div class='ctx'> static void s2255_exit_v4l(struct s2255_dev *dev);</div><div class='del'>-static void s2255_fwload_start(struct s2255_dev *dev);</div><div class='add'>+static void s2255_fwload_start(struct s2255_dev *dev, int reset);</div><div class='add'>+static void s2255_destroy(struct kref *kref);</div><div class='add'>+static long s2255_vendor_req(struct s2255_dev *dev, unsigned char req,</div><div class='add'>+			     u16 index, u16 value, void *buf,</div><div class='add'>+			     s32 buf_len, int bOut);</div><div class='ctx'> </div><div class='ctx'> #define dprintk(level, fmt, arg...)					\</div><div class='ctx'> 	do {								\</div><div class='hunk'>@@ -407,6 +430,10 @@ static const struct s2255_fmt formats[] = {</div><div class='ctx'> 		.fourcc = V4L2_PIX_FMT_UYVY,</div><div class='ctx'> 		.depth = 16</div><div class='ctx'> 	}, {</div><div class='add'>+		.name = "JPG",</div><div class='add'>+		.fourcc = V4L2_PIX_FMT_JPEG,</div><div class='add'>+		.depth = 24</div><div class='add'>+	}, {</div><div class='ctx'> 		.name = "8bpp GREY",</div><div class='ctx'> 		.fourcc = V4L2_PIX_FMT_GREY,</div><div class='ctx'> 		.depth = 8</div><div class='hunk'>@@ -464,6 +491,13 @@ static void planar422p_to_yuv_packed(const unsigned char *in,</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void s2255_reset_dsppower(struct s2255_dev *dev)</div><div class='add'>+{</div><div class='add'>+	s2255_vendor_req(dev, 0x40, 0x0b0b, 0x0b0b, NULL, 0, 1);</div><div class='add'>+	msleep(10);</div><div class='add'>+	s2255_vendor_req(dev, 0x50, 0x0000, 0x0000, NULL, 0, 1);</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /* kickstarts the firmware loading. from probe</div><div class='ctx'>  */</div><div class='hunk'>@@ -480,18 +514,6 @@ static void s2255_timer(unsigned long user_data)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* called when DSP is up and running.  DSP is guaranteed to</div><div class='del'>-   be running after S2255_DSP_BOOTTIME */</div><div class='del'>-static void s2255_dsp_running(unsigned long user_data)</div><div class='del'>-{</div><div class='del'>-	struct s2255_fw *data = (struct s2255_fw *)user_data;</div><div class='del'>-	dprintk(1, "dsp running\n");</div><div class='del'>-	atomic_set(&amp;data-&gt;fw_state, S2255_FW_SUCCESS);</div><div class='del'>-	wake_up(&amp;data-&gt;wait_fw);</div><div class='del'>-	printk(KERN_INFO "s2255: firmware loaded successfully\n");</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> </div><div class='ctx'> /* this loads the firmware asynchronously.</div><div class='ctx'>    Originally this was done synchroously in probe.</div><div class='hunk'>@@ -549,19 +571,14 @@ static void s2255_fwchunk_complete(struct urb *urb)</div><div class='ctx'> 		}</div><div class='ctx'> 		data-&gt;fw_loaded += len;</div><div class='ctx'> 	} else {</div><div class='del'>-		init_timer(&amp;data-&gt;dsp_wait);</div><div class='del'>-		data-&gt;dsp_wait.function = s2255_dsp_running;</div><div class='del'>-		data-&gt;dsp_wait.data = (unsigned long)data;</div><div class='ctx'> 		atomic_set(&amp;data-&gt;fw_state, S2255_FW_LOADED_DSPWAIT);</div><div class='del'>-		mod_timer(&amp;data-&gt;dsp_wait, msecs_to_jiffies(S2255_DSP_BOOTTIME)</div><div class='del'>-			  + jiffies);</div><div class='ctx'> 	}</div><div class='ctx'> 	dprintk(100, "2255 complete done\n");</div><div class='ctx'> 	return;</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int s2255_got_frame(struct s2255_dev *dev, int chn)</div><div class='add'>+static int s2255_got_frame(struct s2255_dev *dev, int chn, int jpgsize)</div><div class='ctx'> {</div><div class='ctx'> 	struct s2255_dmaqueue *dma_q = &amp;dev-&gt;vidq[chn];</div><div class='ctx'> 	struct s2255_buffer *buf;</div><div class='hunk'>@@ -586,8 +603,7 @@ static int s2255_got_frame(struct s2255_dev *dev, int chn)</div><div class='ctx'> 	list_del(&amp;buf-&gt;vb.queue);</div><div class='ctx'> 	do_gettimeofday(&amp;buf-&gt;vb.ts);</div><div class='ctx'> 	dprintk(100, "[%p/%d] wakeup\n", buf, buf-&gt;vb.i);</div><div class='del'>-</div><div class='del'>-	s2255_fillbuff(dev, buf, dma_q-&gt;channel);</div><div class='add'>+	s2255_fillbuff(dev, buf, dma_q-&gt;channel, jpgsize);</div><div class='ctx'> 	wake_up(&amp;buf-&gt;vb.done);</div><div class='ctx'> 	dprintk(2, "wakeup [buf/i] [%p/%d]\n", buf, buf-&gt;vb.i);</div><div class='ctx'> unlock:</div><div class='hunk'>@@ -621,7 +637,7 @@ static const struct s2255_fmt *format_by_fourcc(int fourcc)</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> static void s2255_fillbuff(struct s2255_dev *dev, struct s2255_buffer *buf,</div><div class='del'>-			   int chn)</div><div class='add'>+			   int chn, int jpgsize)</div><div class='ctx'> {</div><div class='ctx'> 	int pos = 0;</div><div class='ctx'> 	struct timeval ts;</div><div class='hunk'>@@ -649,6 +665,10 @@ static void s2255_fillbuff(struct s2255_dev *dev, struct s2255_buffer *buf,</div><div class='ctx'> 		case V4L2_PIX_FMT_GREY:</div><div class='ctx'> 			memcpy(vbuf, tmpbuf, buf-&gt;vb.width * buf-&gt;vb.height);</div><div class='ctx'> 			break;</div><div class='add'>+		case V4L2_PIX_FMT_JPEG:</div><div class='add'>+			buf-&gt;vb.size = jpgsize;</div><div class='add'>+			memcpy(vbuf, tmpbuf, buf-&gt;vb.size);</div><div class='add'>+			break;</div><div class='ctx'> 		case V4L2_PIX_FMT_YUV422P:</div><div class='ctx'> 			memcpy(vbuf, tmpbuf,</div><div class='ctx'> 			       buf-&gt;vb.width * buf-&gt;vb.height * 2);</div><div class='hunk'>@@ -657,9 +677,6 @@ static void s2255_fillbuff(struct s2255_dev *dev, struct s2255_buffer *buf,</div><div class='ctx'> 			printk(KERN_DEBUG "s2255: unknown format?\n");</div><div class='ctx'> 		}</div><div class='ctx'> 		dev-&gt;last_frame[chn] = -1;</div><div class='del'>-		/* done with the frame, free it */</div><div class='del'>-		frm-&gt;ulState = 0;</div><div class='del'>-		dprintk(4, "freeing buffer\n");</div><div class='ctx'> 	} else {</div><div class='ctx'> 		printk(KERN_ERR "s2255: =======no frame\n");</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -1021,6 +1038,10 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,</div><div class='ctx'> 	case V4L2_PIX_FMT_GREY:</div><div class='ctx'> 		fh-&gt;mode.color = COLOR_Y8;</div><div class='ctx'> 		break;</div><div class='add'>+	case V4L2_PIX_FMT_JPEG:</div><div class='add'>+		fh-&gt;mode.color = COLOR_JPG |</div><div class='add'>+			(fh-&gt;dev-&gt;jc[fh-&gt;channel].quality &lt;&lt; 8);</div><div class='add'>+		break;</div><div class='ctx'> 	case V4L2_PIX_FMT_YUV422P:</div><div class='ctx'> 		fh-&gt;mode.color = COLOR_YUVPL;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1139,7 +1160,7 @@ static u32 get_transfer_size(struct s2255_mode *mode)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	outImageSize = linesPerFrame * pixelsPerLine;</div><div class='del'>-	if (mode-&gt;color != COLOR_Y8) {</div><div class='add'>+	if ((mode-&gt;color &amp; MASK_COLOR) != COLOR_Y8) {</div><div class='ctx'> 		/* 2 bytes/pixel if not monochrome */</div><div class='ctx'> 		outImageSize *= 2;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1185,12 +1206,17 @@ static int s2255_set_mode(struct s2255_dev *dev, unsigned long chn,</div><div class='ctx'> 	u32 *buffer;</div><div class='ctx'> 	unsigned long chn_rev;</div><div class='ctx'> </div><div class='add'>+	mutex_lock(&amp;dev-&gt;lock);</div><div class='ctx'> 	chn_rev = G_chnmap[chn];</div><div class='ctx'> 	dprintk(3, "mode scale [%ld] %p %d\n", chn, mode, mode-&gt;scale);</div><div class='ctx'> 	dprintk(3, "mode scale [%ld] %p %d\n", chn, &amp;dev-&gt;mode[chn],</div><div class='ctx'> 		dev-&gt;mode[chn].scale);</div><div class='ctx'> 	dprintk(2, "mode contrast %x\n", mode-&gt;contrast);</div><div class='ctx'> </div><div class='add'>+	/* if JPEG, set the quality */</div><div class='add'>+	if ((mode-&gt;color &amp; MASK_COLOR) == COLOR_JPG)</div><div class='add'>+		mode-&gt;color = (dev-&gt;jc[chn].quality &lt;&lt; 8) | COLOR_JPG;</div><div class='add'>+</div><div class='ctx'> 	/* save the mode */</div><div class='ctx'> 	dev-&gt;mode[chn] = *mode;</div><div class='ctx'> 	dev-&gt;req_image_size[chn] = get_transfer_size(mode);</div><div class='hunk'>@@ -1199,6 +1225,7 @@ static int s2255_set_mode(struct s2255_dev *dev, unsigned long chn,</div><div class='ctx'> 	buffer = kzalloc(512, GFP_KERNEL);</div><div class='ctx'> 	if (buffer == NULL) {</div><div class='ctx'> 		dev_err(&amp;dev-&gt;udev-&gt;dev, "out of mem\n");</div><div class='add'>+		mutex_unlock(&amp;dev-&gt;lock);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1214,12 +1241,20 @@ static int s2255_set_mode(struct s2255_dev *dev, unsigned long chn,</div><div class='ctx'> 	dprintk(1, "set mode done chn %lu, %d\n", chn, res);</div><div class='ctx'> </div><div class='ctx'> 	/* wait at least 3 frames before continuing */</div><div class='del'>-	if (mode-&gt;restart)</div><div class='del'>-		msleep(125);</div><div class='add'>+	if (mode-&gt;restart) {</div><div class='add'>+		dev-&gt;setmode_ready[chn] = 0;</div><div class='add'>+		wait_event_timeout(dev-&gt;wait_setmode[chn],</div><div class='add'>+				   (dev-&gt;setmode_ready[chn] != 0),</div><div class='add'>+				   msecs_to_jiffies(S2255_SETMODE_TIMEOUT));</div><div class='add'>+		if (dev-&gt;setmode_ready[chn] != 1) {</div><div class='add'>+			printk(KERN_DEBUG "s2255: no set mode response\n");</div><div class='add'>+			res = -EFAULT;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* clear the restart flag */</div><div class='ctx'> 	dev-&gt;mode[chn].restart = 0;</div><div class='del'>-</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;lock);</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1270,7 +1305,7 @@ static int vidioc_streamon(struct file *file, void *priv, enum v4l2_buf_type i)</div><div class='ctx'> 	dev-&gt;cur_frame[chn] = 0;</div><div class='ctx'> 	dev-&gt;frame_count[chn] = 0;</div><div class='ctx'> 	for (j = 0; j &lt; SYS_FRAMES; j++) {</div><div class='del'>-		dev-&gt;buffer[chn].frame[j].ulState = 0;</div><div class='add'>+		dev-&gt;buffer[chn].frame[j].ulState = S2255_READ_IDLE;</div><div class='ctx'> 		dev-&gt;buffer[chn].frame[j].cur_size = 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	res = videobuf_streamon(&amp;fh-&gt;vb_vidq);</div><div class='hunk'>@@ -1446,6 +1481,27 @@ static int vidioc_s_ctrl(struct file *file, void *priv,</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int vidioc_g_jpegcomp(struct file *file, void *priv,</div><div class='add'>+			 struct v4l2_jpegcompression *jc)</div><div class='add'>+{</div><div class='add'>+	struct s2255_fh *fh = priv;</div><div class='add'>+	struct s2255_dev *dev = fh-&gt;dev;</div><div class='add'>+	*jc = dev-&gt;jc[fh-&gt;channel];</div><div class='add'>+	dprintk(2, "getting jpegcompression, quality %d\n", jc-&gt;quality);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vidioc_s_jpegcomp(struct file *file, void *priv,</div><div class='add'>+			 struct v4l2_jpegcompression *jc)</div><div class='add'>+{</div><div class='add'>+	struct s2255_fh *fh = priv;</div><div class='add'>+	struct s2255_dev *dev = fh-&gt;dev;</div><div class='add'>+	if (jc-&gt;quality &lt; 0 || jc-&gt;quality &gt; 100)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	dev-&gt;jc[fh-&gt;channel].quality = jc-&gt;quality;</div><div class='add'>+	dprintk(2, "setting jpeg quality %d\n", jc-&gt;quality);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> static int s2255_open(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='ctx'> 	int minor = iminor(inode);</div><div class='hunk'>@@ -1455,8 +1511,10 @@ static int s2255_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	enum v4l2_buf_type type = 0;</div><div class='ctx'> 	int i = 0;</div><div class='ctx'> 	int cur_channel = -1;</div><div class='add'>+	int state;</div><div class='ctx'> 	dprintk(1, "s2255: open called (minor=%d)\n", minor);</div><div class='ctx'> </div><div class='add'>+	lock_kernel();</div><div class='ctx'> 	list_for_each(list, &amp;s2255_devlist) {</div><div class='ctx'> 		h = list_entry(list, struct s2255_dev, s2255_devlist);</div><div class='ctx'> 		for (i = 0; i &lt; MAX_CHANNELS; i++) {</div><div class='hunk'>@@ -1469,45 +1527,78 @@ static int s2255_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if ((NULL == dev) || (cur_channel == -1)) {</div><div class='del'>-		dprintk(1, "s2255: openv4l no dev\n");</div><div class='add'>+		unlock_kernel();</div><div class='add'>+		printk(KERN_INFO "s2255: openv4l no dev\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (atomic_read(&amp;dev-&gt;fw_data-&gt;fw_state) == S2255_FW_DISCONNECTING) {</div><div class='add'>+		unlock_kernel();</div><div class='add'>+		printk(KERN_INFO "disconnecting\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+	kref_get(&amp;dev-&gt;kref);</div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;open_lock);</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;users[cur_channel]++;</div><div class='ctx'> 	dprintk(4, "s2255: open_handles %d\n", dev-&gt;users[cur_channel]);</div><div class='ctx'> </div><div class='del'>-	if (atomic_read(&amp;dev-&gt;fw_data-&gt;fw_state) == S2255_FW_FAILED) {</div><div class='add'>+	switch (atomic_read(&amp;dev-&gt;fw_data-&gt;fw_state)) {</div><div class='add'>+	case S2255_FW_FAILED:</div><div class='ctx'> 		err("2255 firmware load failed. retrying.\n");</div><div class='del'>-		s2255_fwload_start(dev);</div><div class='add'>+		s2255_fwload_start(dev, 1);</div><div class='ctx'> 		wait_event_timeout(dev-&gt;fw_data-&gt;wait_fw,</div><div class='del'>-				   (atomic_read(&amp;dev-&gt;fw_data-&gt;fw_state)</div><div class='del'>-				    != S2255_FW_NOTLOADED),</div><div class='add'>+				   ((atomic_read(&amp;dev-&gt;fw_data-&gt;fw_state)</div><div class='add'>+				     == S2255_FW_SUCCESS) ||</div><div class='add'>+				    (atomic_read(&amp;dev-&gt;fw_data-&gt;fw_state)</div><div class='add'>+				     == S2255_FW_DISCONNECTING)),</div><div class='ctx'> 				   msecs_to_jiffies(S2255_LOAD_TIMEOUT));</div><div class='del'>-		if (atomic_read(&amp;dev-&gt;fw_data-&gt;fw_state)</div><div class='del'>-		    != S2255_FW_SUCCESS) {</div><div class='del'>-			printk(KERN_INFO "2255 FW load failed.\n");</div><div class='del'>-			dev-&gt;users[cur_channel]--;</div><div class='del'>-			mutex_unlock(&amp;dev-&gt;open_lock);</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		}</div><div class='del'>-	} else if (atomic_read(&amp;dev-&gt;fw_data-&gt;fw_state) == S2255_FW_NOTLOADED) {</div><div class='add'>+		break;</div><div class='add'>+	case S2255_FW_NOTLOADED:</div><div class='add'>+	case S2255_FW_LOADED_DSPWAIT:</div><div class='ctx'> 		/* give S2255_LOAD_TIMEOUT time for firmware to load in case</div><div class='ctx'> 		   driver loaded and then device immediately opened */</div><div class='ctx'> 		printk(KERN_INFO "%s waiting for firmware load\n", __func__);</div><div class='ctx'> 		wait_event_timeout(dev-&gt;fw_data-&gt;wait_fw,</div><div class='del'>-				   (atomic_read(&amp;dev-&gt;fw_data-&gt;fw_state)</div><div class='del'>-				   != S2255_FW_NOTLOADED),</div><div class='del'>-				   msecs_to_jiffies(S2255_LOAD_TIMEOUT));</div><div class='del'>-		if (atomic_read(&amp;dev-&gt;fw_data-&gt;fw_state)</div><div class='del'>-		    != S2255_FW_SUCCESS) {</div><div class='del'>-			printk(KERN_INFO "2255 firmware not loaded"</div><div class='del'>-			       "try again\n");</div><div class='del'>-			dev-&gt;users[cur_channel]--;</div><div class='del'>-			mutex_unlock(&amp;dev-&gt;open_lock);</div><div class='del'>-			return -EBUSY;</div><div class='add'>+				   ((atomic_read(&amp;dev-&gt;fw_data-&gt;fw_state)</div><div class='add'>+				     == S2255_FW_SUCCESS) ||</div><div class='add'>+				    (atomic_read(&amp;dev-&gt;fw_data-&gt;fw_state)</div><div class='add'>+				     == S2255_FW_DISCONNECTING)),</div><div class='add'>+			msecs_to_jiffies(S2255_LOAD_TIMEOUT));</div><div class='add'>+		break;</div><div class='add'>+	case S2255_FW_SUCCESS:</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	state = atomic_read(&amp;dev-&gt;fw_data-&gt;fw_state);</div><div class='add'>+	if (state != S2255_FW_SUCCESS) {</div><div class='add'>+		int rc;</div><div class='add'>+		switch (state) {</div><div class='add'>+		case S2255_FW_FAILED:</div><div class='add'>+			printk(KERN_INFO "2255 FW load failed. %d\n", state);</div><div class='add'>+			rc = -ENODEV;</div><div class='add'>+			break;</div><div class='add'>+		case S2255_FW_DISCONNECTING:</div><div class='add'>+			printk(KERN_INFO "%s: disconnecting\n", __func__);</div><div class='add'>+			rc = -ENODEV;</div><div class='add'>+			break;</div><div class='add'>+		case S2255_FW_LOADED_DSPWAIT:</div><div class='add'>+		case S2255_FW_NOTLOADED:</div><div class='add'>+			printk(KERN_INFO "%s: firmware not loaded yet"</div><div class='add'>+			       "please try again later\n",</div><div class='add'>+			       __func__);</div><div class='add'>+			rc = -EAGAIN;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			printk(KERN_INFO "%s: unknown state\n", __func__);</div><div class='add'>+			rc = -EFAULT;</div><div class='add'>+			break;</div><div class='ctx'> 		}</div><div class='add'>+		dev-&gt;users[cur_channel]--;</div><div class='add'>+		mutex_unlock(&amp;dev-&gt;open_lock);</div><div class='add'>+		kref_put(&amp;dev-&gt;kref, s2255_destroy);</div><div class='add'>+		unlock_kernel();</div><div class='add'>+		return rc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* allocate + initialize per filehandle data */</div><div class='hunk'>@@ -1515,6 +1606,8 @@ static int s2255_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	if (NULL == fh) {</div><div class='ctx'> 		dev-&gt;users[cur_channel]--;</div><div class='ctx'> 		mutex_unlock(&amp;dev-&gt;open_lock);</div><div class='add'>+		kref_put(&amp;dev-&gt;kref, s2255_destroy);</div><div class='add'>+		unlock_kernel();</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1528,6 +1621,13 @@ static int s2255_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	fh-&gt;height = NUM_LINES_4CIFS_NTSC * 2;</div><div class='ctx'> 	fh-&gt;channel = cur_channel;</div><div class='ctx'> </div><div class='add'>+	/* configure channel to default state */</div><div class='add'>+	if (!dev-&gt;chn_configured[cur_channel]) {</div><div class='add'>+		s2255_set_mode(dev, cur_channel, &amp;fh-&gt;mode);</div><div class='add'>+		dev-&gt;chn_configured[cur_channel] = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> 	/* Put all controls at a sane state */</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(s2255_qctrl); i++)</div><div class='ctx'> 		qctl_regs[i] = s2255_qctrl[i].default_value;</div><div class='hunk'>@@ -1546,8 +1646,8 @@ static int s2255_open(struct inode *inode, struct file *file)</div><div class='ctx'> 				    V4L2_FIELD_INTERLACED,</div><div class='ctx'> 				    sizeof(struct s2255_buffer), fh);</div><div class='ctx'> </div><div class='del'>-	kref_get(&amp;dev-&gt;kref);</div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;open_lock);</div><div class='add'>+	unlock_kernel();</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1569,30 +1669,24 @@ static unsigned int s2255_poll(struct file *file,</div><div class='ctx'> static void s2255_destroy(struct kref *kref)</div><div class='ctx'> {</div><div class='ctx'> 	struct s2255_dev *dev = to_s2255_dev(kref);</div><div class='add'>+	struct list_head *list;</div><div class='add'>+	int i;</div><div class='ctx'> 	if (!dev) {</div><div class='ctx'> 		printk(KERN_ERR "s2255drv: kref problem\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Wake up any firmware load waiting (only done in .open,</div><div class='del'>-	 * which holds the open_lock mutex)</div><div class='del'>-	 */</div><div class='ctx'> 	atomic_set(&amp;dev-&gt;fw_data-&gt;fw_state, S2255_FW_DISCONNECTING);</div><div class='ctx'> 	wake_up(&amp;dev-&gt;fw_data-&gt;wait_fw);</div><div class='del'>-</div><div class='del'>-	/* prevent s2255_disconnect from racing s2255_open */</div><div class='add'>+	for (i = 0; i &lt; MAX_CHANNELS; i++) {</div><div class='add'>+		dev-&gt;setmode_ready[i] = 1;</div><div class='add'>+		wake_up(&amp;dev-&gt;wait_setmode[i]);</div><div class='add'>+	}</div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;open_lock);</div><div class='add'>+	/* reset the DSP so firmware can be reload next time */</div><div class='add'>+	s2255_reset_dsppower(dev);</div><div class='ctx'> 	s2255_exit_v4l(dev);</div><div class='del'>-	/*</div><div class='del'>-	 * device unregistered so no longer possible to open. open_mutex</div><div class='del'>-	 *  can be unlocked and timers deleted afterwards.</div><div class='del'>-	 */</div><div class='del'>-	mutex_unlock(&amp;dev-&gt;open_lock);</div><div class='del'>-</div><div class='ctx'> 	/* board shutdown stops the read pipe if it is running */</div><div class='ctx'> 	s2255_board_shutdown(dev);</div><div class='del'>-</div><div class='ctx'> 	/* make sure firmware still not trying to load */</div><div class='ctx'> 	del_timer(&amp;dev-&gt;timer);  /* only started in .probe and .open */</div><div class='ctx'> </div><div class='hunk'>@@ -1602,23 +1696,19 @@ static void s2255_destroy(struct kref *kref)</div><div class='ctx'> 		usb_free_urb(dev-&gt;fw_data-&gt;fw_urb);</div><div class='ctx'> 		dev-&gt;fw_data-&gt;fw_urb = NULL;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * delete the dsp_wait timer, which sets the firmware</div><div class='del'>-	 * state on completion.  This is done before fw_data</div><div class='del'>-	 * is freed below.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	del_timer(&amp;dev-&gt;fw_data-&gt;dsp_wait); /* only started in .open */</div><div class='del'>-</div><div class='ctx'> 	if (dev-&gt;fw_data-&gt;fw)</div><div class='ctx'> 		release_firmware(dev-&gt;fw_data-&gt;fw);</div><div class='ctx'> 	kfree(dev-&gt;fw_data-&gt;pfw_data);</div><div class='ctx'> 	kfree(dev-&gt;fw_data);</div><div class='del'>-</div><div class='ctx'> 	usb_put_dev(dev-&gt;udev);</div><div class='ctx'> 	dprintk(1, "%s", __func__);</div><div class='ctx'> 	kfree(dev);</div><div class='add'>+</div><div class='add'>+	while (!list_empty(&amp;s2255_devlist)) {</div><div class='add'>+		list = s2255_devlist.next;</div><div class='add'>+		list_del(list);</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;open_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int s2255_close(struct inode *inode, struct file *file)</div><div class='hunk'>@@ -1702,6 +1792,8 @@ static const struct v4l2_ioctl_ops s2255_ioctl_ops = {</div><div class='ctx'> #ifdef CONFIG_VIDEO_V4L1_COMPAT</div><div class='ctx'> 	.vidiocgmbuf = vidioc_cgmbuf,</div><div class='ctx'> #endif</div><div class='add'>+	.vidioc_s_jpegcomp = vidioc_s_jpegcomp,</div><div class='add'>+	.vidioc_g_jpegcomp = vidioc_g_jpegcomp,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct video_device template = {</div><div class='hunk'>@@ -1740,7 +1832,7 @@ static int s2255_probe_v4l(struct s2255_dev *dev)</div><div class='ctx'> 			ret = video_register_device(dev-&gt;vdev[i],</div><div class='ctx'> 						    VFL_TYPE_GRABBER,</div><div class='ctx'> 						    cur_nr + i);</div><div class='del'>-		dev-&gt;vdev[i]-&gt;priv = dev;</div><div class='add'>+		video_set_drvdata(dev-&gt;vdev[i], dev);</div><div class='ctx'> </div><div class='ctx'> 		if (ret != 0) {</div><div class='ctx'> 			dev_err(&amp;dev-&gt;udev-&gt;dev,</div><div class='hunk'>@@ -1754,18 +1846,16 @@ static int s2255_probe_v4l(struct s2255_dev *dev)</div><div class='ctx'> </div><div class='ctx'> static void s2255_exit_v4l(struct s2255_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	struct list_head *list;</div><div class='add'>+</div><div class='ctx'> 	int i;</div><div class='del'>-	/* unregister the video devices */</div><div class='del'>-	while (!list_empty(&amp;s2255_devlist)) {</div><div class='del'>-		list = s2255_devlist.next;</div><div class='del'>-		list_del(list);</div><div class='del'>-	}</div><div class='ctx'> 	for (i = 0; i &lt; MAX_CHANNELS; i++) {</div><div class='del'>-		if (-1 != dev-&gt;vdev[i]-&gt;minor)</div><div class='add'>+		if (-1 != dev-&gt;vdev[i]-&gt;minor) {</div><div class='ctx'> 			video_unregister_device(dev-&gt;vdev[i]);</div><div class='del'>-		else</div><div class='add'>+			printk(KERN_INFO "s2255 unregistered\n");</div><div class='add'>+		} else {</div><div class='ctx'> 			video_device_release(dev-&gt;vdev[i]);</div><div class='add'>+			printk(KERN_INFO "s2255 released\n");</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1775,134 +1865,123 @@ static void s2255_exit_v4l(struct s2255_dev *dev)</div><div class='ctx'>  * function again).</div><div class='ctx'>  *</div><div class='ctx'>  * Received frame structure:</div><div class='del'>- * bytes 0-3:  marker : 0x2255DA4AL (FRAME_MARKER)</div><div class='add'>+ * bytes 0-3:  marker : 0x2255DA4AL (S2255_MARKER_FRAME)</div><div class='ctx'>  * bytes 4-7:  channel: 0-3</div><div class='ctx'>  * bytes 8-11: payload size:  size of the frame</div><div class='ctx'>  * bytes 12-payloadsize+12:  frame data</div><div class='ctx'>  */</div><div class='ctx'> static int save_frame(struct s2255_dev *dev, struct s2255_pipeinfo *pipe_info)</div><div class='ctx'> {</div><div class='del'>-	static int dbgsync; /* = 0; */</div><div class='ctx'> 	char *pdest;</div><div class='ctx'> 	u32 offset = 0;</div><div class='del'>-	int bsync = 0;</div><div class='del'>-	int btrunc = 0;</div><div class='add'>+	int bframe = 0;</div><div class='ctx'> 	char *psrc;</div><div class='ctx'> 	unsigned long copy_size;</div><div class='ctx'> 	unsigned long size;</div><div class='ctx'> 	s32 idx = -1;</div><div class='ctx'> 	struct s2255_framei *frm;</div><div class='ctx'> 	unsigned char *pdata;</div><div class='del'>-	unsigned long cur_size;</div><div class='del'>-	int bsearch = 0;</div><div class='del'>-	struct s2255_bufferi *buf;</div><div class='add'>+</div><div class='ctx'> 	dprintk(100, "buffer to user\n");</div><div class='ctx'> </div><div class='ctx'> 	idx = dev-&gt;cur_frame[dev-&gt;cc];</div><div class='del'>-	buf = &amp;dev-&gt;buffer[dev-&gt;cc];</div><div class='del'>-	frm = &amp;buf-&gt;frame[idx];</div><div class='del'>-</div><div class='del'>-	if (frm-&gt;ulState == 0) {</div><div class='del'>-		frm-&gt;ulState = 1;</div><div class='del'>-		frm-&gt;cur_size = 0;</div><div class='del'>-		bsearch = 1;</div><div class='del'>-	} else if (frm-&gt;ulState == 2) {</div><div class='del'>-		/* system frame was not freed */</div><div class='del'>-		dprintk(2, "sys frame not free.  overrun ringbuf\n");</div><div class='del'>-		bsearch = 1;</div><div class='del'>-		frm-&gt;ulState = 1;</div><div class='del'>-		frm-&gt;cur_size = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (bsearch) {</div><div class='del'>-		if (*(s32 *) pipe_info-&gt;transfer_buffer != FRAME_MARKER) {</div><div class='del'>-			u32 jj;</div><div class='del'>-			if (dbgsync == 0) {</div><div class='del'>-				dprintk(3, "not synched, discarding all packets"</div><div class='del'>-					"until marker\n");</div><div class='add'>+	frm = &amp;dev-&gt;buffer[dev-&gt;cc].frame[idx];</div><div class='ctx'> </div><div class='del'>-				dbgsync++;</div><div class='del'>-			}</div><div class='del'>-			pdata = (unsigned char *)pipe_info-&gt;transfer_buffer;</div><div class='del'>-			for (jj = 0; jj &lt; (pipe_info-&gt;cur_transfer_size - 12);</div><div class='del'>-			     jj++) {</div><div class='del'>-				if (*(s32 *) pdata == FRAME_MARKER) {</div><div class='del'>-					int cc;</div><div class='del'>-					dprintk(3,</div><div class='del'>-						"found frame marker at offset:"</div><div class='del'>-						" %d [%x %x]\n", jj, pdata[0],</div><div class='del'>-						pdata[1]);</div><div class='del'>-					offset = jj;</div><div class='del'>-					bsync = 1;</div><div class='del'>-					cc = *(u32 *) (pdata + sizeof(u32));</div><div class='del'>-					if (cc &gt;= MAX_CHANNELS) {</div><div class='del'>-						printk(KERN_ERR</div><div class='del'>-						       "bad channel\n");</div><div class='del'>-						return -EINVAL;</div><div class='del'>-					}</div><div class='del'>-					/* reverse it */</div><div class='del'>-					dev-&gt;cc = G_chnmap[cc];</div><div class='add'>+	if (frm-&gt;ulState == S2255_READ_IDLE) {</div><div class='add'>+		int jj;</div><div class='add'>+		unsigned int cc;</div><div class='add'>+		s32 *pdword;</div><div class='add'>+		int payload;</div><div class='add'>+		/* search for marker codes */</div><div class='add'>+		pdata = (unsigned char *)pipe_info-&gt;transfer_buffer;</div><div class='add'>+		for (jj = 0; jj &lt; (pipe_info-&gt;cur_transfer_size - 12); jj++) {</div><div class='add'>+			switch (*(s32 *) pdata) {</div><div class='add'>+			case S2255_MARKER_FRAME:</div><div class='add'>+				pdword = (s32 *)pdata;</div><div class='add'>+				dprintk(4, "found frame marker at offset:"</div><div class='add'>+					" %d [%x %x]\n", jj, pdata[0],</div><div class='add'>+					pdata[1]);</div><div class='add'>+				offset = jj + PREFIX_SIZE;</div><div class='add'>+				bframe = 1;</div><div class='add'>+				cc = pdword[1];</div><div class='add'>+				if (cc &gt;= MAX_CHANNELS) {</div><div class='add'>+					printk(KERN_ERR</div><div class='add'>+					       "bad channel\n");</div><div class='add'>+					return -EINVAL;</div><div class='add'>+				}</div><div class='add'>+				/* reverse it */</div><div class='add'>+				dev-&gt;cc = G_chnmap[cc];</div><div class='add'>+				payload =  pdword[3];</div><div class='add'>+				if (payload &gt; dev-&gt;req_image_size[dev-&gt;cc]) {</div><div class='add'>+					dev-&gt;bad_payload[dev-&gt;cc]++;</div><div class='add'>+					/* discard the bad frame */</div><div class='add'>+					return -EINVAL;</div><div class='add'>+				}</div><div class='add'>+				dev-&gt;pkt_size[dev-&gt;cc] = payload;</div><div class='add'>+				dev-&gt;jpg_size[dev-&gt;cc] = pdword[4];</div><div class='add'>+				break;</div><div class='add'>+			case S2255_MARKER_RESPONSE:</div><div class='add'>+				pdword = (s32 *)pdata;</div><div class='add'>+				pdata += DEF_USB_BLOCK;</div><div class='add'>+				jj += DEF_USB_BLOCK;</div><div class='add'>+				if (pdword[1] &gt;= MAX_CHANNELS)</div><div class='add'>+					break;</div><div class='add'>+				cc = G_chnmap[pdword[1]];</div><div class='add'>+				if (!(cc &gt;= 0 &amp;&amp; cc &lt; MAX_CHANNELS))</div><div class='add'>+					break;</div><div class='add'>+				switch (pdword[2]) {</div><div class='add'>+				case 0x01:</div><div class='add'>+					/* check if channel valid */</div><div class='add'>+					/* set mode ready */</div><div class='add'>+					dev-&gt;setmode_ready[cc] = 1;</div><div class='add'>+					wake_up(&amp;dev-&gt;wait_setmode[cc]);</div><div class='add'>+					dprintk(5, "setmode ready %d\n", cc);</div><div class='ctx'> 					break;</div><div class='add'>+				case 0x10:</div><div class='add'>+</div><div class='add'>+					dev-&gt;chn_ready |= (1 &lt;&lt; cc);</div><div class='add'>+					if ((dev-&gt;chn_ready &amp; 0x0f) != 0x0f)</div><div class='add'>+						break;</div><div class='add'>+					/* all channels ready */</div><div class='add'>+					printk(KERN_INFO "s2255: fw loaded\n");</div><div class='add'>+					atomic_set(&amp;dev-&gt;fw_data-&gt;fw_state,</div><div class='add'>+						   S2255_FW_SUCCESS);</div><div class='add'>+					wake_up(&amp;dev-&gt;fw_data-&gt;wait_fw);</div><div class='add'>+					break;</div><div class='add'>+				default:</div><div class='add'>+					printk(KERN_INFO "s2255 unknwn resp\n");</div><div class='ctx'> 				}</div><div class='add'>+			default:</div><div class='ctx'> 				pdata++;</div><div class='add'>+				break;</div><div class='ctx'> 			}</div><div class='del'>-			if (bsync == 0)</div><div class='del'>-				return -EINVAL;</div><div class='del'>-		} else {</div><div class='del'>-			u32 *pword;</div><div class='del'>-			u32 payload;</div><div class='del'>-			int cc;</div><div class='del'>-			dbgsync = 0;</div><div class='del'>-			bsync = 1;</div><div class='del'>-			pword = (u32 *) pipe_info-&gt;transfer_buffer;</div><div class='del'>-			cc = pword[1];</div><div class='del'>-</div><div class='del'>-			if (cc &gt;= MAX_CHANNELS) {</div><div class='del'>-				printk("invalid channel found. "</div><div class='del'>-					"throwing out data!\n");</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			}</div><div class='del'>-			dev-&gt;cc = G_chnmap[cc];</div><div class='del'>-			payload = pword[2];</div><div class='del'>-			if (payload != dev-&gt;req_image_size[dev-&gt;cc]) {</div><div class='del'>-				dprintk(1, "[%d][%d]unexpected payload: %d"</div><div class='del'>-					"required: %lu \n", cc, dev-&gt;cc,</div><div class='del'>-					payload, dev-&gt;req_image_size[dev-&gt;cc]);</div><div class='del'>-				dev-&gt;bad_payload[dev-&gt;cc]++;</div><div class='del'>-				/* discard the bad frame */</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	/* search done.  now find out if should be acquiring</div><div class='del'>-	   on this channel */</div><div class='del'>-	if (!dev-&gt;b_acquire[dev-&gt;cc]) {</div><div class='del'>-		frm-&gt;ulState = 0;</div><div class='del'>-		return -EINVAL;</div><div class='add'>+			if (bframe)</div><div class='add'>+				break;</div><div class='add'>+		} /* for */</div><div class='add'>+		if (!bframe)</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> 	idx = dev-&gt;cur_frame[dev-&gt;cc];</div><div class='ctx'> 	frm = &amp;dev-&gt;buffer[dev-&gt;cc].frame[idx];</div><div class='ctx'> </div><div class='del'>-	if (frm-&gt;ulState == 0) {</div><div class='del'>-		frm-&gt;ulState = 1;</div><div class='del'>-		frm-&gt;cur_size = 0;</div><div class='del'>-	} else if (frm-&gt;ulState == 2) {</div><div class='del'>-		/* system frame ring buffer overrun */</div><div class='del'>-		dprintk(2, "sys frame overrun.  overwriting frame %d %d\n",</div><div class='del'>-			dev-&gt;cc, idx);</div><div class='del'>-		frm-&gt;ulState = 1;</div><div class='del'>-		frm-&gt;cur_size = 0;</div><div class='add'>+	/* search done.  now find out if should be acquiring on this channel */</div><div class='add'>+	if (!dev-&gt;b_acquire[dev-&gt;cc]) {</div><div class='add'>+		/* we found a frame, but this channel is turned off */</div><div class='add'>+		frm-&gt;ulState = S2255_READ_IDLE;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (bsync) {</div><div class='del'>-		/* skip the marker 512 bytes (and offset if out of sync) */</div><div class='del'>-		psrc = (u8 *)pipe_info-&gt;transfer_buffer + offset + PREFIX_SIZE;</div><div class='del'>-	} else {</div><div class='del'>-		psrc = (u8 *)pipe_info-&gt;transfer_buffer;</div><div class='add'>+	if (frm-&gt;ulState == S2255_READ_IDLE) {</div><div class='add'>+		frm-&gt;ulState = S2255_READ_FRAME;</div><div class='add'>+		frm-&gt;cur_size = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* skip the marker 512 bytes (and offset if out of sync) */</div><div class='add'>+	psrc = (u8 *)pipe_info-&gt;transfer_buffer + offset;</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> 	if (frm-&gt;lpvbits == NULL) {</div><div class='ctx'> 		dprintk(1, "s2255 frame buffer == NULL.%p %p %d %d",</div><div class='ctx'> 			frm, dev, dev-&gt;cc, idx);</div><div class='hunk'>@@ -1911,33 +1990,20 @@ static int save_frame(struct s2255_dev *dev, struct s2255_pipeinfo *pipe_info)</div><div class='ctx'> </div><div class='ctx'> 	pdest = frm-&gt;lpvbits + frm-&gt;cur_size;</div><div class='ctx'> </div><div class='del'>-	if (bsync) {</div><div class='del'>-		copy_size =</div><div class='del'>-		    (pipe_info-&gt;cur_transfer_size - offset) - PREFIX_SIZE;</div><div class='del'>-		if (copy_size &gt; pipe_info-&gt;cur_transfer_size) {</div><div class='del'>-			printk("invalid copy size, overflow!\n");</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		copy_size = pipe_info-&gt;cur_transfer_size;</div><div class='del'>-	}</div><div class='add'>+	copy_size = (pipe_info-&gt;cur_transfer_size - offset);</div><div class='ctx'> </div><div class='del'>-	cur_size = frm-&gt;cur_size;</div><div class='del'>-	size = dev-&gt;req_image_size[dev-&gt;cc];</div><div class='add'>+	size = dev-&gt;pkt_size[dev-&gt;cc] - PREFIX_SIZE;</div><div class='ctx'> </div><div class='del'>-	if ((copy_size + cur_size) &gt; size) {</div><div class='del'>-		copy_size = size - cur_size;</div><div class='del'>-		btrunc = 1;</div><div class='del'>-	}</div><div class='add'>+	/* sanity check on pdest */</div><div class='add'>+	if ((copy_size + frm-&gt;cur_size) &lt; dev-&gt;req_image_size[dev-&gt;cc])</div><div class='add'>+		memcpy(pdest, psrc, copy_size);</div><div class='ctx'> </div><div class='del'>-	memcpy(pdest, psrc, copy_size);</div><div class='del'>-	cur_size += copy_size;</div><div class='ctx'> 	frm-&gt;cur_size += copy_size;</div><div class='del'>-	dprintk(50, "cur_size size %lu size %lu \n", cur_size, size);</div><div class='add'>+	dprintk(4, "cur_size size %lu size %lu \n", frm-&gt;cur_size, size);</div><div class='add'>+</div><div class='add'>+	if (frm-&gt;cur_size &gt;= size) {</div><div class='ctx'> </div><div class='del'>-	if (cur_size &gt;= (size - PREFIX_SIZE)) {</div><div class='ctx'> 		u32 cc = dev-&gt;cc;</div><div class='del'>-		frm-&gt;ulState = 2;</div><div class='ctx'> 		dprintk(2, "****************[%d]Buffer[%d]full*************\n",</div><div class='ctx'> 			cc, idx);</div><div class='ctx'> 		dev-&gt;last_frame[cc] = dev-&gt;cur_frame[cc];</div><div class='hunk'>@@ -1946,16 +2012,13 @@ static int save_frame(struct s2255_dev *dev, struct s2255_pipeinfo *pipe_info)</div><div class='ctx'> 		if ((dev-&gt;cur_frame[cc] == SYS_FRAMES) ||</div><div class='ctx'> 		    (dev-&gt;cur_frame[cc] == dev-&gt;buffer[cc].dwFrames))</div><div class='ctx'> 			dev-&gt;cur_frame[cc] = 0;</div><div class='del'>-</div><div class='del'>-		/* signal the semaphore for this channel */</div><div class='add'>+		/* frame ready */</div><div class='ctx'> 		if (dev-&gt;b_acquire[cc])</div><div class='del'>-			s2255_got_frame(dev, cc);</div><div class='add'>+			s2255_got_frame(dev, cc, dev-&gt;jpg_size[cc]);</div><div class='ctx'> 		dev-&gt;frame_count[cc]++;</div><div class='del'>-	}</div><div class='del'>-	/* frame was truncated */</div><div class='del'>-	if (btrunc) {</div><div class='del'>-		/* return more data to process */</div><div class='del'>-		return EAGAIN;</div><div class='add'>+		frm-&gt;ulState = S2255_READ_IDLE;</div><div class='add'>+		frm-&gt;cur_size = 0;</div><div class='add'>+</div><div class='ctx'> 	}</div><div class='ctx'> 	/* done successfully */</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1974,8 +2037,8 @@ static void s2255_read_video_callback(struct s2255_dev *dev,</div><div class='ctx'> 	}</div><div class='ctx'> 	/* otherwise copy to the system buffers */</div><div class='ctx'> 	res = save_frame(dev, pipe_info);</div><div class='del'>-	if (res == EAGAIN)</div><div class='del'>-		save_frame(dev, pipe_info);</div><div class='add'>+	if (res != 0)</div><div class='add'>+		dprintk(4, "s2255: read callback failed\n");</div><div class='ctx'> </div><div class='ctx'> 	dprintk(50, "callback read video done\n");</div><div class='ctx'> 	return;</div><div class='hunk'>@@ -2095,11 +2158,9 @@ static int s2255_board_init(struct s2255_dev *dev)</div><div class='ctx'> </div><div class='ctx'> 		memset(pipe, 0, sizeof(*pipe));</div><div class='ctx'> 		pipe-&gt;dev = dev;</div><div class='del'>-		pipe-&gt;cur_transfer_size = DEFAULT_PIPE_USBBLOCK;</div><div class='del'>-		pipe-&gt;max_transfer_size = MAX_PIPE_USBBLOCK;</div><div class='add'>+		pipe-&gt;cur_transfer_size = S2255_USB_XFER_SIZE;</div><div class='add'>+		pipe-&gt;max_transfer_size = S2255_USB_XFER_SIZE;</div><div class='ctx'> </div><div class='del'>-		if (pipe-&gt;cur_transfer_size &gt; pipe-&gt;max_transfer_size)</div><div class='del'>-			pipe-&gt;cur_transfer_size = pipe-&gt;max_transfer_size;</div><div class='ctx'> 		pipe-&gt;transfer_buffer = kzalloc(pipe-&gt;max_transfer_size,</div><div class='ctx'> 						GFP_KERNEL);</div><div class='ctx'> 		if (pipe-&gt;transfer_buffer == NULL) {</div><div class='hunk'>@@ -2119,6 +2180,7 @@ static int s2255_board_init(struct s2255_dev *dev)</div><div class='ctx'> 	for (j = 0; j &lt; MAX_CHANNELS; j++) {</div><div class='ctx'> 		dev-&gt;b_acquire[j] = 0;</div><div class='ctx'> 		dev-&gt;mode[j] = mode_def;</div><div class='add'>+		dev-&gt;jc[j].quality = S2255_DEF_JPEG_QUAL;</div><div class='ctx'> 		dev-&gt;cur_fmt[j] = &amp;formats[0];</div><div class='ctx'> 		dev-&gt;mode[j].restart = 1;</div><div class='ctx'> 		dev-&gt;req_image_size[j] = get_transfer_size(&amp;mode_def);</div><div class='hunk'>@@ -2323,7 +2385,7 @@ static int s2255_stop_acquire(struct s2255_dev *dev, unsigned long chn)</div><div class='ctx'> 	kfree(buffer);</div><div class='ctx'> 	dev-&gt;b_acquire[chn] = 0;</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void s2255_stop_readpipe(struct s2255_dev *dev)</div><div class='hunk'>@@ -2359,8 +2421,10 @@ static void s2255_stop_readpipe(struct s2255_dev *dev)</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void s2255_fwload_start(struct s2255_dev *dev)</div><div class='add'>+static void s2255_fwload_start(struct s2255_dev *dev, int reset)</div><div class='ctx'> {</div><div class='add'>+	if (reset)</div><div class='add'>+		s2255_reset_dsppower(dev);</div><div class='ctx'> 	dev-&gt;fw_data-&gt;fw_size = dev-&gt;fw_data-&gt;fw-&gt;size;</div><div class='ctx'> 	atomic_set(&amp;dev-&gt;fw_data-&gt;fw_state, S2255_FW_NOTLOADED);</div><div class='ctx'> 	memcpy(dev-&gt;fw_data-&gt;pfw_data,</div><div class='hunk'>@@ -2383,6 +2447,8 @@ static int s2255_probe(struct usb_interface *interface,</div><div class='ctx'> 	struct usb_endpoint_descriptor *endpoint;</div><div class='ctx'> 	int i;</div><div class='ctx'> 	int retval = -ENOMEM;</div><div class='add'>+	__le32 *pdata;</div><div class='add'>+	int fw_size;</div><div class='ctx'> </div><div class='ctx'> 	dprintk(2, "s2255: probe\n");</div><div class='ctx'> </div><div class='hunk'>@@ -2437,6 +2503,8 @@ static int s2255_probe(struct usb_interface *interface,</div><div class='ctx'> 	dev-&gt;timer.data = (unsigned long)dev-&gt;fw_data;</div><div class='ctx'> </div><div class='ctx'> 	init_waitqueue_head(&amp;dev-&gt;fw_data-&gt;wait_fw);</div><div class='add'>+	for (i = 0; i &lt; MAX_CHANNELS; i++)</div><div class='add'>+		init_waitqueue_head(&amp;dev-&gt;wait_setmode[i]);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;fw_data-&gt;fw_urb = usb_alloc_urb(0, GFP_KERNEL);</div><div class='hunk'>@@ -2456,16 +2524,30 @@ static int s2255_probe(struct usb_interface *interface,</div><div class='ctx'> 		printk(KERN_ERR "sensoray 2255 failed to get firmware\n");</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='add'>+	/* check the firmware is valid */</div><div class='add'>+	fw_size = dev-&gt;fw_data-&gt;fw-&gt;size;</div><div class='add'>+	pdata = (__le32 *) &amp;dev-&gt;fw_data-&gt;fw-&gt;data[fw_size - 8];</div><div class='ctx'> </div><div class='add'>+	if (*pdata != S2255_FW_MARKER) {</div><div class='add'>+		printk(KERN_INFO "Firmware invalid.\n");</div><div class='add'>+		retval = -ENODEV;</div><div class='add'>+		goto error;</div><div class='add'>+	} else {</div><div class='add'>+		/* make sure firmware is the latest */</div><div class='add'>+		__le32 *pRel;</div><div class='add'>+		pRel = (__le32 *) &amp;dev-&gt;fw_data-&gt;fw-&gt;data[fw_size - 4];</div><div class='add'>+		printk(KERN_INFO "s2255 dsp fw version %x\n", *pRel);</div><div class='add'>+	}</div><div class='ctx'> 	/* loads v4l specific */</div><div class='ctx'> 	s2255_probe_v4l(dev);</div><div class='add'>+	usb_reset_device(dev-&gt;udev);</div><div class='ctx'> 	/* load 2255 board specific */</div><div class='ctx'> 	s2255_board_init(dev);</div><div class='ctx'> </div><div class='ctx'> 	dprintk(4, "before probe done %p\n", dev);</div><div class='ctx'> 	spin_lock_init(&amp;dev-&gt;slock);</div><div class='ctx'> </div><div class='del'>-	s2255_fwload_start(dev);</div><div class='add'>+	s2255_fwload_start(dev, 0);</div><div class='ctx'> 	dev_info(&amp;interface-&gt;dev, "Sensoray 2255 detected\n");</div><div class='ctx'> 	return 0;</div><div class='ctx'> error:</div><div class='hunk'>@@ -2476,14 +2558,30 @@ error:</div><div class='ctx'> static void s2255_disconnect(struct usb_interface *interface)</div><div class='ctx'> {</div><div class='ctx'> 	struct s2255_dev *dev = NULL;</div><div class='add'>+	int i;</div><div class='ctx'> 	dprintk(1, "s2255: disconnect interface %p\n", interface);</div><div class='ctx'> 	dev = usb_get_intfdata(interface);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * wake up any of the timers to allow open_lock to be</div><div class='add'>+	 * acquired sooner</div><div class='add'>+	 */</div><div class='add'>+	atomic_set(&amp;dev-&gt;fw_data-&gt;fw_state, S2255_FW_DISCONNECTING);</div><div class='add'>+	wake_up(&amp;dev-&gt;fw_data-&gt;wait_fw);</div><div class='add'>+	for (i = 0; i &lt; MAX_CHANNELS; i++) {</div><div class='add'>+		dev-&gt;setmode_ready[i] = 1;</div><div class='add'>+		wake_up(&amp;dev-&gt;wait_setmode[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;open_lock);</div><div class='add'>+	usb_set_intfdata(interface, NULL);</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;open_lock);</div><div class='add'>+</div><div class='ctx'> 	if (dev) {</div><div class='ctx'> 		kref_put(&amp;dev-&gt;kref, s2255_destroy);</div><div class='ctx'> 		dprintk(1, "s2255drv: disconnect\n");</div><div class='ctx'> 		dev_info(&amp;interface-&gt;dev, "s2255usb now disconnected\n");</div><div class='ctx'> 	}</div><div class='del'>-	usb_set_intfdata(interface, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct usb_driver s2255_driver = {</div><div class='head'>diff --git a/drivers/media/video/saa5246a.c b/drivers/media/video/saa5246a.c<br/>index 6ee63e69b36c..4a21b8a6a709 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/saa5246a.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/saa5246a.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/saa5246a.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/saa5246a.c</a></div><div class='hunk'>@@ -43,135 +43,363 @@</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/smp_lock.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/videotext.h&gt;</div><div class='ctx'> #include &lt;linux/videodev.h&gt;</div><div class='ctx'> #include &lt;media/v4l2-common.h&gt;</div><div class='ctx'> #include &lt;media/v4l2-ioctl.h&gt;</div><div class='del'>-#include &lt;linux/mutex.h&gt;</div><div class='del'>-</div><div class='del'>-#include "saa5246a.h"</div><div class='add'>+#include &lt;media/v4l2-i2c-drv-legacy.h&gt;</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Michael Geng &lt;linux@MichaelGeng.de&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Philips SAA5246A, SAA5281 Teletext decoder driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='del'>-struct saa5246a_device</div><div class='del'>-{</div><div class='del'>-	u8     pgbuf[NUM_DAUS][VTX_VIRTUALSIZE];</div><div class='del'>-	int    is_searching[NUM_DAUS];</div><div class='del'>-	struct i2c_client *client;</div><div class='del'>-	struct mutex lock;</div><div class='del'>-};</div><div class='add'>+#define MAJOR_VERSION 1		/* driver major version number */</div><div class='add'>+#define MINOR_VERSION 8		/* driver minor version number */</div><div class='add'>+</div><div class='add'>+/* Number of DAUs = number of pages that can be searched at the same time. */</div><div class='add'>+#define NUM_DAUS 4</div><div class='add'>+</div><div class='add'>+#define NUM_ROWS_PER_PAGE 40</div><div class='add'>+</div><div class='add'>+/* first column is 0 (not 1) */</div><div class='add'>+#define POS_TIME_START 32</div><div class='add'>+#define POS_TIME_END 39</div><div class='add'>+</div><div class='add'>+#define POS_HEADER_START 7</div><div class='add'>+#define POS_HEADER_END 31</div><div class='add'>+</div><div class='add'>+/* Returns 'true' if the part of the videotext page described with req contains</div><div class='add'>+   (at least parts of) the time field */</div><div class='add'>+#define REQ_CONTAINS_TIME(p_req) \</div><div class='add'>+	((p_req)-&gt;start &lt;= POS_TIME_END &amp;&amp; \</div><div class='add'>+	 (p_req)-&gt;end   &gt;= POS_TIME_START)</div><div class='add'>+</div><div class='add'>+/* Returns 'true' if the part of the videotext page described with req contains</div><div class='add'>+   (at least parts of) the page header */</div><div class='add'>+#define REQ_CONTAINS_HEADER(p_req) \</div><div class='add'>+	((p_req)-&gt;start &lt;= POS_HEADER_END &amp;&amp; \</div><div class='add'>+	 (p_req)-&gt;end   &gt;= POS_HEADER_START)</div><div class='add'>+</div><div class='add'>+/*****************************************************************************/</div><div class='add'>+/* Mode register numbers of the SAA5246A				     */</div><div class='add'>+/*****************************************************************************/</div><div class='add'>+#define SAA5246A_REGISTER_R0    0</div><div class='add'>+#define SAA5246A_REGISTER_R1    1</div><div class='add'>+#define SAA5246A_REGISTER_R2    2</div><div class='add'>+#define SAA5246A_REGISTER_R3    3</div><div class='add'>+#define SAA5246A_REGISTER_R4    4</div><div class='add'>+#define SAA5246A_REGISTER_R5    5</div><div class='add'>+#define SAA5246A_REGISTER_R6    6</div><div class='add'>+#define SAA5246A_REGISTER_R7    7</div><div class='add'>+#define SAA5246A_REGISTER_R8    8</div><div class='add'>+#define SAA5246A_REGISTER_R9    9</div><div class='add'>+#define SAA5246A_REGISTER_R10  10</div><div class='add'>+#define SAA5246A_REGISTER_R11  11</div><div class='add'>+#define SAA5246A_REGISTER_R11B 11</div><div class='add'>+</div><div class='add'>+/* SAA5246A mode registers often autoincrement to the next register.</div><div class='add'>+   Therefore we use variable argument lists. The following macro indicates</div><div class='add'>+   the end of a command list. */</div><div class='add'>+#define COMMAND_END (-1)</div><div class='add'>+</div><div class='add'>+/*****************************************************************************/</div><div class='add'>+/* Contents of the mode registers of the SAA5246A			     */</div><div class='add'>+/*****************************************************************************/</div><div class='add'>+/* Register R0 (Advanced Control) */</div><div class='add'>+#define R0_SELECT_R11					   0x00</div><div class='add'>+#define R0_SELECT_R11B					   0x01</div><div class='add'>+</div><div class='add'>+#define R0_PLL_TIME_CONSTANT_LONG			   0x00</div><div class='add'>+#define R0_PLL_TIME_CONSTANT_SHORT			   0x02</div><div class='add'>+</div><div class='add'>+#define R0_ENABLE_nODD_EVEN_OUTPUT			   0x00</div><div class='add'>+#define R0_DISABLE_nODD_EVEN_OUTPUT			   0x04</div><div class='add'>+</div><div class='add'>+#define R0_ENABLE_HDR_POLL				   0x00</div><div class='add'>+#define R0_DISABLE_HDR_POLL				   0x10</div><div class='add'>+</div><div class='add'>+#define R0_DO_NOT_FORCE_nODD_EVEN_LOW_IF_PICTURE_DISPLAYED 0x00</div><div class='add'>+#define R0_FORCE_nODD_EVEN_LOW_IF_PICTURE_DISPLAYED	   0x20</div><div class='add'>+</div><div class='add'>+#define R0_NO_FREE_RUN_PLL				   0x00</div><div class='add'>+#define R0_FREE_RUN_PLL					   0x40</div><div class='add'>+</div><div class='add'>+#define R0_NO_AUTOMATIC_FASTEXT_PROMPT			   0x00</div><div class='add'>+#define R0_AUTOMATIC_FASTEXT_PROMPT			   0x80</div><div class='add'>+</div><div class='add'>+/* Register R1 (Mode) */</div><div class='add'>+#define R1_INTERLACED_312_AND_HALF_312_AND_HALF_LINES	   0x00</div><div class='add'>+#define R1_NON_INTERLACED_312_313_LINES			   0x01</div><div class='add'>+#define R1_NON_INTERLACED_312_312_LINES			   0x02</div><div class='add'>+#define R1_FFB_LEADING_EDGE_IN_FIRST_BROAD_PULSE	   0x03</div><div class='add'>+#define R1_FFB_LEADING_EDGE_IN_SECOND_BROAD_PULSE	   0x07</div><div class='add'>+</div><div class='add'>+#define R1_DEW						   0x00</div><div class='add'>+#define R1_FULL_FIELD					   0x08</div><div class='add'>+</div><div class='add'>+#define R1_EXTENDED_PACKET_DISABLE			   0x00</div><div class='add'>+#define R1_EXTENDED_PACKET_ENABLE			   0x10</div><div class='add'>+</div><div class='add'>+#define R1_DAUS_ALL_ON					   0x00</div><div class='add'>+#define R1_DAUS_ALL_OFF					   0x20</div><div class='add'>+</div><div class='add'>+#define R1_7_BITS_PLUS_PARITY				   0x00</div><div class='add'>+#define R1_8_BITS_NO_PARITY				   0x40</div><div class='add'>+</div><div class='add'>+#define R1_VCS_TO_SCS					   0x00</div><div class='add'>+#define R1_NO_VCS_TO_SCS				   0x80</div><div class='add'>+</div><div class='add'>+/* Register R2 (Page request address) */</div><div class='add'>+#define R2_IN_R3_SELECT_PAGE_HUNDREDS			   0x00</div><div class='add'>+#define R2_IN_R3_SELECT_PAGE_TENS			   0x01</div><div class='add'>+#define R2_IN_R3_SELECT_PAGE_UNITS			   0x02</div><div class='add'>+#define R2_IN_R3_SELECT_HOURS_TENS			   0x03</div><div class='add'>+#define R2_IN_R3_SELECT_HOURS_UNITS			   0x04</div><div class='add'>+#define R2_IN_R3_SELECT_MINUTES_TENS			   0x05</div><div class='add'>+#define R2_IN_R3_SELECT_MINUTES_UNITS			   0x06</div><div class='add'>+</div><div class='add'>+#define R2_DAU_0					   0x00</div><div class='add'>+#define R2_DAU_1					   0x10</div><div class='add'>+#define R2_DAU_2					   0x20</div><div class='add'>+#define R2_DAU_3					   0x30</div><div class='add'>+</div><div class='add'>+#define R2_BANK_0					   0x00</div><div class='add'>+#define R2_BANK 1					   0x40</div><div class='add'>+</div><div class='add'>+#define R2_HAMMING_CHECK_ON				   0x80</div><div class='add'>+#define R2_HAMMING_CHECK_OFF				   0x00</div><div class='add'>+</div><div class='add'>+/* Register R3 (Page request data) */</div><div class='add'>+#define R3_PAGE_HUNDREDS_0				   0x00</div><div class='add'>+#define R3_PAGE_HUNDREDS_1				   0x01</div><div class='add'>+#define R3_PAGE_HUNDREDS_2				   0x02</div><div class='add'>+#define R3_PAGE_HUNDREDS_3				   0x03</div><div class='add'>+#define R3_PAGE_HUNDREDS_4				   0x04</div><div class='add'>+#define R3_PAGE_HUNDREDS_5				   0x05</div><div class='add'>+#define R3_PAGE_HUNDREDS_6				   0x06</div><div class='add'>+#define R3_PAGE_HUNDREDS_7				   0x07</div><div class='ctx'> </div><div class='del'>-static struct video_device saa_template;	/* Declared near bottom */</div><div class='add'>+#define R3_HOLD_PAGE					   0x00</div><div class='add'>+#define R3_UPDATE_PAGE					   0x08</div><div class='ctx'> </div><div class='del'>-/* Addresses to scan */</div><div class='del'>-static unsigned short normal_i2c[]	 = { I2C_ADDRESS, I2C_CLIENT_END };</div><div class='add'>+#define R3_PAGE_HUNDREDS_DO_NOT_CARE			   0x00</div><div class='add'>+#define R3_PAGE_HUNDREDS_DO_CARE			   0x10</div><div class='ctx'> </div><div class='del'>-I2C_CLIENT_INSMOD;</div><div class='add'>+#define R3_PAGE_TENS_DO_NOT_CARE			   0x00</div><div class='add'>+#define R3_PAGE_TENS_DO_CARE				   0x10</div><div class='ctx'> </div><div class='del'>-static struct i2c_client client_template;</div><div class='add'>+#define R3_PAGE_UNITS_DO_NOT_CARE			   0x00</div><div class='add'>+#define R3_PAGE_UNITS_DO_CARE				   0x10</div><div class='ctx'> </div><div class='del'>-static int saa5246a_attach(struct i2c_adapter *adap, int addr, int kind)</div><div class='del'>-{</div><div class='del'>-	int pgbuf;</div><div class='del'>-	int err;</div><div class='del'>-	struct i2c_client *client;</div><div class='del'>-	struct video_device *vd;</div><div class='del'>-	struct saa5246a_device *t;</div><div class='add'>+#define R3_HOURS_TENS_DO_NOT_CARE			   0x00</div><div class='add'>+#define R3_HOURS_TENS_DO_CARE				   0x10</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "saa5246a: teletext chip found.\n");</div><div class='del'>-	client=kmalloc(sizeof(*client), GFP_KERNEL);</div><div class='del'>-	if(client==NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	client_template.adapter = adap;</div><div class='del'>-	client_template.addr = addr;</div><div class='del'>-	memcpy(client, &amp;client_template, sizeof(*client));</div><div class='del'>-	t = kzalloc(sizeof(*t), GFP_KERNEL);</div><div class='del'>-	if(t==NULL)</div><div class='del'>-	{</div><div class='del'>-		kfree(client);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-	strlcpy(client-&gt;name, IF_NAME, I2C_NAME_SIZE);</div><div class='del'>-	mutex_init(&amp;t-&gt;lock);</div><div class='add'>+#define R3_HOURS_UNITS_DO_NOT_CARE			   0x00</div><div class='add'>+#define R3_HOURS_UNITS_DO_CARE				   0x10</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 *	Now create a video4linux device</div><div class='del'>-	 */</div><div class='add'>+#define R3_MINUTES_TENS_DO_NOT_CARE			   0x00</div><div class='add'>+#define R3_MINUTES_TENS_DO_CARE				   0x10</div><div class='ctx'> </div><div class='del'>-	vd = video_device_alloc();</div><div class='del'>-	if(vd==NULL)</div><div class='del'>-	{</div><div class='del'>-		kfree(t);</div><div class='del'>-		kfree(client);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-	i2c_set_clientdata(client, vd);</div><div class='del'>-	memcpy(vd, &amp;saa_template, sizeof(*vd));</div><div class='add'>+#define R3_MINUTES_UNITS_DO_NOT_CARE			   0x00</div><div class='add'>+#define R3_MINUTES_UNITS_DO_CARE			   0x10</div><div class='ctx'> </div><div class='del'>-	for (pgbuf = 0; pgbuf &lt; NUM_DAUS; pgbuf++)</div><div class='del'>-	{</div><div class='del'>-		memset(t-&gt;pgbuf[pgbuf], ' ', sizeof(t-&gt;pgbuf[0]));</div><div class='del'>-		t-&gt;is_searching[pgbuf] = false;</div><div class='del'>-	}</div><div class='del'>-	vd-&gt;priv=t;</div><div class='add'>+/* Register R4 (Display chapter) */</div><div class='add'>+#define R4_DISPLAY_PAGE_0				   0x00</div><div class='add'>+#define R4_DISPLAY_PAGE_1				   0x01</div><div class='add'>+#define R4_DISPLAY_PAGE_2				   0x02</div><div class='add'>+#define R4_DISPLAY_PAGE_3				   0x03</div><div class='add'>+#define R4_DISPLAY_PAGE_4				   0x04</div><div class='add'>+#define R4_DISPLAY_PAGE_5				   0x05</div><div class='add'>+#define R4_DISPLAY_PAGE_6				   0x06</div><div class='add'>+#define R4_DISPLAY_PAGE_7				   0x07</div><div class='ctx'> </div><div class='add'>+/* Register R5 (Normal display control) */</div><div class='add'>+#define R5_PICTURE_INSIDE_BOXING_OFF			   0x00</div><div class='add'>+#define R5_PICTURE_INSIDE_BOXING_ON			   0x01</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 *	Register it</div><div class='del'>-	 */</div><div class='add'>+#define R5_PICTURE_OUTSIDE_BOXING_OFF			   0x00</div><div class='add'>+#define R5_PICTURE_OUTSIDE_BOXING_ON			   0x02</div><div class='ctx'> </div><div class='del'>-	if((err=video_register_device(vd, VFL_TYPE_VTX,-1))&lt;0)</div><div class='del'>-	{</div><div class='del'>-		kfree(t);</div><div class='del'>-		kfree(client);</div><div class='del'>-		video_device_release(vd);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-	t-&gt;client = client;</div><div class='del'>-	i2c_attach_client(client);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='add'>+#define R5_TEXT_INSIDE_BOXING_OFF			   0x00</div><div class='add'>+#define R5_TEXT_INSIDE_BOXING_ON			   0x04</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- *	We do most of the hard work when we become a device on the i2c.</div><div class='del'>- */</div><div class='del'>-static int saa5246a_probe(struct i2c_adapter *adap)</div><div class='del'>-{</div><div class='del'>-	if (adap-&gt;class &amp; I2C_CLASS_TV_ANALOG)</div><div class='del'>-		return i2c_probe(adap, &amp;addr_data, saa5246a_attach);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='add'>+#define R5_TEXT_OUTSIDE_BOXING_OFF			   0x00</div><div class='add'>+#define R5_TEXT_OUTSIDE_BOXING_ON			   0x08</div><div class='ctx'> </div><div class='del'>-static int saa5246a_detach(struct i2c_client *client)</div><div class='del'>-{</div><div class='del'>-	struct video_device *vd = i2c_get_clientdata(client);</div><div class='del'>-	i2c_detach_client(client);</div><div class='del'>-	video_unregister_device(vd);</div><div class='del'>-	kfree(vd-&gt;priv);</div><div class='del'>-	kfree(client);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='add'>+#define R5_CONTRAST_REDUCTION_INSIDE_BOXING_OFF		   0x00</div><div class='add'>+#define R5_CONTRAST_REDUCTION_INSIDE_BOXING_ON		   0x10</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- *	I2C interfaces</div><div class='del'>- */</div><div class='add'>+#define R5_CONTRAST_REDUCTION_OUTSIDE_BOXING_OFF	   0x00</div><div class='add'>+#define R5_CONTRAST_REDUCTION_OUTSIDE_BOXING_ON		   0x20</div><div class='add'>+</div><div class='add'>+#define R5_BACKGROUND_COLOR_INSIDE_BOXING_OFF		   0x00</div><div class='add'>+#define R5_BACKGROUND_COLOR_INSIDE_BOXING_ON		   0x40</div><div class='add'>+</div><div class='add'>+#define R5_BACKGROUND_COLOR_OUTSIDE_BOXING_OFF		   0x00</div><div class='add'>+#define R5_BACKGROUND_COLOR_OUTSIDE_BOXING_ON		   0x80</div><div class='add'>+</div><div class='add'>+/* Register R6 (Newsflash display) */</div><div class='add'>+#define R6_NEWSFLASH_PICTURE_INSIDE_BOXING_OFF		   0x00</div><div class='add'>+#define R6_NEWSFLASH_PICTURE_INSIDE_BOXING_ON		   0x01</div><div class='add'>+</div><div class='add'>+#define R6_NEWSFLASH_PICTURE_OUTSIDE_BOXING_OFF		   0x00</div><div class='add'>+#define R6_NEWSFLASH_PICTURE_OUTSIDE_BOXING_ON		   0x02</div><div class='add'>+</div><div class='add'>+#define R6_NEWSFLASH_TEXT_INSIDE_BOXING_OFF		   0x00</div><div class='add'>+#define R6_NEWSFLASH_TEXT_INSIDE_BOXING_ON		   0x04</div><div class='add'>+</div><div class='add'>+#define R6_NEWSFLASH_TEXT_OUTSIDE_BOXING_OFF		   0x00</div><div class='add'>+#define R6_NEWSFLASH_TEXT_OUTSIDE_BOXING_ON		   0x08</div><div class='add'>+</div><div class='add'>+#define R6_NEWSFLASH_CONTRAST_REDUCTION_INSIDE_BOXING_OFF  0x00</div><div class='add'>+#define R6_NEWSFLASH_CONTRAST_REDUCTION_INSIDE_BOXING_ON   0x10</div><div class='add'>+</div><div class='add'>+#define R6_NEWSFLASH_CONTRAST_REDUCTION_OUTSIDE_BOXING_OFF 0x00</div><div class='add'>+#define R6_NEWSFLASH_CONTRAST_REDUCTION_OUTSIDE_BOXING_ON  0x20</div><div class='add'>+</div><div class='add'>+#define R6_NEWSFLASH_BACKGROUND_COLOR_INSIDE_BOXING_OFF    0x00</div><div class='add'>+#define R6_NEWSFLASH_BACKGROUND_COLOR_INSIDE_BOXING_ON	   0x40</div><div class='add'>+</div><div class='add'>+#define R6_NEWSFLASH_BACKGROUND_COLOR_OUTSIDE_BOXING_OFF   0x00</div><div class='add'>+#define R6_NEWSFLASH_BACKGROUND_COLOR_OUTSIDE_BOXING_ON    0x80</div><div class='add'>+</div><div class='add'>+/* Register R7 (Display mode) */</div><div class='add'>+#define R7_BOX_OFF_ROW_0				   0x00</div><div class='add'>+#define R7_BOX_ON_ROW_0					   0x01</div><div class='add'>+</div><div class='add'>+#define R7_BOX_OFF_ROW_1_TO_23				   0x00</div><div class='add'>+#define R7_BOX_ON_ROW_1_TO_23				   0x02</div><div class='add'>+</div><div class='add'>+#define R7_BOX_OFF_ROW_24				   0x00</div><div class='add'>+#define R7_BOX_ON_ROW_24				   0x04</div><div class='add'>+</div><div class='add'>+#define R7_SINGLE_HEIGHT				   0x00</div><div class='add'>+#define R7_DOUBLE_HEIGHT				   0x08</div><div class='add'>+</div><div class='add'>+#define R7_TOP_HALF					   0x00</div><div class='add'>+#define R7_BOTTOM_HALF					   0x10</div><div class='add'>+</div><div class='add'>+#define R7_REVEAL_OFF					   0x00</div><div class='add'>+#define R7_REVEAL_ON					   0x20</div><div class='add'>+</div><div class='add'>+#define R7_CURSER_OFF					   0x00</div><div class='add'>+#define R7_CURSER_ON					   0x40</div><div class='add'>+</div><div class='add'>+#define R7_STATUS_BOTTOM				   0x00</div><div class='add'>+#define R7_STATUS_TOP					   0x80</div><div class='add'>+</div><div class='add'>+/* Register R8 (Active chapter) */</div><div class='add'>+#define R8_ACTIVE_CHAPTER_0				   0x00</div><div class='add'>+#define R8_ACTIVE_CHAPTER_1				   0x01</div><div class='add'>+#define R8_ACTIVE_CHAPTER_2				   0x02</div><div class='add'>+#define R8_ACTIVE_CHAPTER_3				   0x03</div><div class='add'>+#define R8_ACTIVE_CHAPTER_4				   0x04</div><div class='add'>+#define R8_ACTIVE_CHAPTER_5				   0x05</div><div class='add'>+#define R8_ACTIVE_CHAPTER_6				   0x06</div><div class='add'>+#define R8_ACTIVE_CHAPTER_7				   0x07</div><div class='add'>+</div><div class='add'>+#define R8_CLEAR_MEMORY					   0x08</div><div class='add'>+#define R8_DO_NOT_CLEAR_MEMORY				   0x00</div><div class='add'>+</div><div class='add'>+/* Register R9 (Curser row) */</div><div class='add'>+#define R9_CURSER_ROW_0					   0x00</div><div class='add'>+#define R9_CURSER_ROW_1					   0x01</div><div class='add'>+#define R9_CURSER_ROW_2					   0x02</div><div class='add'>+#define R9_CURSER_ROW_25				   0x19</div><div class='add'>+</div><div class='add'>+/* Register R10 (Curser column) */</div><div class='add'>+#define R10_CURSER_COLUMN_0				   0x00</div><div class='add'>+#define R10_CURSER_COLUMN_6				   0x06</div><div class='add'>+#define R10_CURSER_COLUMN_8				   0x08</div><div class='add'>+</div><div class='add'>+/*****************************************************************************/</div><div class='add'>+/* Row 25 control data in column 0 to 9					     */</div><div class='add'>+/*****************************************************************************/</div><div class='add'>+#define ROW25_COLUMN0_PAGE_UNITS			   0x0F</div><div class='add'>+</div><div class='add'>+#define ROW25_COLUMN1_PAGE_TENS				   0x0F</div><div class='add'>+</div><div class='add'>+#define ROW25_COLUMN2_MINUTES_UNITS			   0x0F</div><div class='ctx'> </div><div class='del'>-static struct i2c_driver i2c_driver_videotext =</div><div class='add'>+#define ROW25_COLUMN3_MINUTES_TENS			   0x07</div><div class='add'>+#define ROW25_COLUMN3_DELETE_PAGE			   0x08</div><div class='add'>+</div><div class='add'>+#define ROW25_COLUMN4_HOUR_UNITS			   0x0F</div><div class='add'>+</div><div class='add'>+#define ROW25_COLUMN5_HOUR_TENS				   0x03</div><div class='add'>+#define ROW25_COLUMN5_INSERT_HEADLINE			   0x04</div><div class='add'>+#define ROW25_COLUMN5_INSERT_SUBTITLE			   0x08</div><div class='add'>+</div><div class='add'>+#define ROW25_COLUMN6_SUPPRESS_HEADER			   0x01</div><div class='add'>+#define ROW25_COLUMN6_UPDATE_PAGE			   0x02</div><div class='add'>+#define ROW25_COLUMN6_INTERRUPTED_SEQUENCE		   0x04</div><div class='add'>+#define ROW25_COLUMN6_SUPPRESS_DISPLAY			   0x08</div><div class='add'>+</div><div class='add'>+#define ROW25_COLUMN7_SERIAL_MODE			   0x01</div><div class='add'>+#define ROW25_COLUMN7_CHARACTER_SET			   0x0E</div><div class='add'>+</div><div class='add'>+#define ROW25_COLUMN8_PAGE_HUNDREDS			   0x07</div><div class='add'>+#define ROW25_COLUMN8_PAGE_NOT_FOUND			   0x10</div><div class='add'>+</div><div class='add'>+#define ROW25_COLUMN9_PAGE_BEING_LOOKED_FOR		   0x20</div><div class='add'>+</div><div class='add'>+#define ROW25_COLUMN0_TO_7_HAMMING_ERROR		   0x10</div><div class='add'>+</div><div class='add'>+/*****************************************************************************/</div><div class='add'>+/* Helper macros for extracting page, hour and minute digits		     */</div><div class='add'>+/*****************************************************************************/</div><div class='add'>+/* BYTE_POS  0 is at row 0, column 0,</div><div class='add'>+   BYTE_POS  1 is at row 0, column 1,</div><div class='add'>+   BYTE_POS 40 is at row 1, column 0, (with NUM_ROWS_PER_PAGE = 40)</div><div class='add'>+   BYTE_POS 41 is at row 1, column 1, (with NUM_ROWS_PER_PAGE = 40),</div><div class='add'>+   ... */</div><div class='add'>+#define ROW(BYTE_POS)    (BYTE_POS / NUM_ROWS_PER_PAGE)</div><div class='add'>+#define COLUMN(BYTE_POS) (BYTE_POS % NUM_ROWS_PER_PAGE)</div><div class='add'>+</div><div class='add'>+/*****************************************************************************/</div><div class='add'>+/* Helper macros for extracting page, hour and minute digits		     */</div><div class='add'>+/*****************************************************************************/</div><div class='add'>+/* Macros for extracting hundreds, tens and units of a page number which</div><div class='add'>+   must be in the range 0 ... 0x799.</div><div class='add'>+   Note that page is coded in hexadecimal, i.e. 0x123 means page 123.</div><div class='add'>+   page 0x.. means page 8.. */</div><div class='add'>+#define HUNDREDS_OF_PAGE(page) (((page) / 0x100) &amp; 0x7)</div><div class='add'>+#define TENS_OF_PAGE(page)     (((page) / 0x10)  &amp; 0xF)</div><div class='add'>+#define UNITS_OF_PAGE(page)     ((page) &amp; 0xF)</div><div class='add'>+</div><div class='add'>+/* Macros for extracting tens and units of a hour information which</div><div class='add'>+   must be in the range 0 ... 0x24.</div><div class='add'>+   Note that hour is coded in hexadecimal, i.e. 0x12 means 12 hours */</div><div class='add'>+#define TENS_OF_HOUR(hour)  ((hour) / 0x10)</div><div class='add'>+#define UNITS_OF_HOUR(hour) ((hour) &amp; 0xF)</div><div class='add'>+</div><div class='add'>+/* Macros for extracting tens and units of a minute information which</div><div class='add'>+   must be in the range 0 ... 0x59.</div><div class='add'>+   Note that minute is coded in hexadecimal, i.e. 0x12 means 12 minutes */</div><div class='add'>+#define TENS_OF_MINUTE(minute)  ((minute) / 0x10)</div><div class='add'>+#define UNITS_OF_MINUTE(minute) ((minute) &amp; 0xF)</div><div class='add'>+</div><div class='add'>+#define HOUR_MAX   0x23</div><div class='add'>+#define MINUTE_MAX 0x59</div><div class='add'>+#define PAGE_MAX   0x8FF</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+struct saa5246a_device</div><div class='ctx'> {</div><div class='del'>-	.driver = {</div><div class='del'>-		.name 	= IF_NAME,		/* name */</div><div class='del'>-	},</div><div class='del'>-	.id 		= I2C_DRIVERID_SAA5249, /* in i2c.h */</div><div class='del'>-	.attach_adapter = saa5246a_probe,</div><div class='del'>-	.detach_client  = saa5246a_detach,</div><div class='add'>+	u8     pgbuf[NUM_DAUS][VTX_VIRTUALSIZE];</div><div class='add'>+	int    is_searching[NUM_DAUS];</div><div class='add'>+	struct i2c_client *client;</div><div class='add'>+	unsigned long in_use;</div><div class='add'>+	struct mutex lock;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct i2c_client client_template = {</div><div class='del'>-	.driver		= &amp;i2c_driver_videotext,</div><div class='del'>-	.name		= "(unset)",</div><div class='del'>-};</div><div class='add'>+static struct video_device saa_template;	/* Declared near bottom */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *	I2C interfaces</div><div class='add'>+ */</div><div class='ctx'> </div><div class='ctx'> static int i2c_sendbuf(struct saa5246a_device *t, int reg, int count, u8 *data)</div><div class='ctx'> {</div><div class='hunk'>@@ -579,8 +807,8 @@ static inline int saa5246a_stop_dau(struct saa5246a_device *t,</div><div class='ctx'> static int do_saa5246a_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 			    unsigned int cmd, void *arg)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *vd = video_devdata(file);</div><div class='del'>-	struct saa5246a_device *t=vd-&gt;priv;</div><div class='add'>+	struct saa5246a_device *t = video_drvdata(file);</div><div class='add'>+</div><div class='ctx'> 	switch(cmd)</div><div class='ctx'> 	{</div><div class='ctx'> 		case VTXIOCGETINFO:</div><div class='hunk'>@@ -720,8 +948,7 @@ static inline unsigned int vtx_fix_command(unsigned int cmd)</div><div class='ctx'> static int saa5246a_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 			 unsigned int cmd, unsigned long arg)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *vd = video_devdata(file);</div><div class='del'>-	struct saa5246a_device *t = vd-&gt;priv;</div><div class='add'>+	struct saa5246a_device *t = video_drvdata(file);</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	cmd = vtx_fix_command(cmd);</div><div class='hunk'>@@ -733,21 +960,15 @@ static int saa5246a_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> </div><div class='ctx'> static int saa5246a_open(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *vd = video_devdata(file);</div><div class='del'>-	struct saa5246a_device *t = vd-&gt;priv;</div><div class='del'>-	int err;</div><div class='add'>+	struct saa5246a_device *t = video_drvdata(file);</div><div class='ctx'> </div><div class='del'>-	err = video_exclusive_open(inode,file);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='add'>+	if (t-&gt;client == NULL)</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	if (t-&gt;client==NULL) {</div><div class='del'>-		err = -ENODEV;</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='add'>+	if (test_and_set_bit(0, &amp;t-&gt;in_use))</div><div class='add'>+		return -EBUSY;</div><div class='ctx'> </div><div class='ctx'> 	if (i2c_senddata(t, SAA5246A_REGISTER_R0,</div><div class='del'>-</div><div class='ctx'> 		R0_SELECT_R11 |</div><div class='ctx'> 		R0_PLL_TIME_CONSTANT_LONG |</div><div class='ctx'> 		R0_ENABLE_nODD_EVEN_OUTPUT |</div><div class='hunk'>@@ -773,21 +994,15 @@ static int saa5246a_open(struct inode *inode, struct file *file)</div><div class='ctx'> </div><div class='ctx'> 		COMMAND_END))</div><div class='ctx'> 	{</div><div class='del'>-		err = -EIO;</div><div class='del'>-		goto fail;</div><div class='add'>+		clear_bit(0, &amp;t-&gt;in_use);</div><div class='add'>+		return -EIO;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='del'>-fail:</div><div class='del'>-	video_exclusive_release(inode,file);</div><div class='del'>-	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int saa5246a_release(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *vd = video_devdata(file);</div><div class='del'>-	struct saa5246a_device *t = vd-&gt;priv;</div><div class='add'>+	struct saa5246a_device *t = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	/* Stop all acquisition circuits. */</div><div class='ctx'> 	i2c_senddata(t, SAA5246A_REGISTER_R1,</div><div class='hunk'>@@ -800,26 +1015,10 @@ static int saa5246a_release(struct inode *inode, struct file *file)</div><div class='ctx'> 		R1_VCS_TO_SCS,</div><div class='ctx'> </div><div class='ctx'> 		COMMAND_END);</div><div class='del'>-	video_exclusive_release(inode,file);</div><div class='add'>+	clear_bit(0, &amp;t-&gt;in_use);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init init_saa_5246a (void)</div><div class='del'>-{</div><div class='del'>-	printk(KERN_INFO</div><div class='del'>-		"SAA5246A (or compatible) Teletext decoder driver version %d.%d\n",</div><div class='del'>-		MAJOR_VERSION, MINOR_VERSION);</div><div class='del'>-	return i2c_add_driver(&amp;i2c_driver_videotext);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit cleanup_saa_5246a (void)</div><div class='del'>-{</div><div class='del'>-	i2c_del_driver(&amp;i2c_driver_videotext);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(init_saa_5246a);</div><div class='del'>-module_exit(cleanup_saa_5246a);</div><div class='del'>-</div><div class='ctx'> static const struct file_operations saa_fops = {</div><div class='ctx'> 	.owner	 = THIS_MODULE,</div><div class='ctx'> 	.open	 = saa5246a_open,</div><div class='hunk'>@@ -830,8 +1029,79 @@ static const struct file_operations saa_fops = {</div><div class='ctx'> </div><div class='ctx'> static struct video_device saa_template =</div><div class='ctx'> {</div><div class='del'>-	.name	  = IF_NAME,</div><div class='add'>+	.name	  = "saa5246a",</div><div class='ctx'> 	.fops	  = &amp;saa_fops,</div><div class='ctx'> 	.release  = video_device_release,</div><div class='ctx'> 	.minor    = -1,</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+/* Addresses to scan */</div><div class='add'>+static unsigned short normal_i2c[] = { 0x22 &gt;&gt; 1, I2C_CLIENT_END };</div><div class='add'>+</div><div class='add'>+I2C_CLIENT_INSMOD;</div><div class='add'>+</div><div class='add'>+static int saa5246a_probe(struct i2c_client *client,</div><div class='add'>+			const struct i2c_device_id *id)</div><div class='add'>+{</div><div class='add'>+	int pgbuf;</div><div class='add'>+	int err;</div><div class='add'>+	struct video_device *vd;</div><div class='add'>+	struct saa5246a_device *t;</div><div class='add'>+</div><div class='add'>+	v4l_info(client, "chip found @ 0x%x (%s)\n",</div><div class='add'>+			client-&gt;addr &lt;&lt; 1, client-&gt;adapter-&gt;name);</div><div class='add'>+	v4l_info(client, "VideoText version %d.%d\n",</div><div class='add'>+			MAJOR_VERSION, MINOR_VERSION);</div><div class='add'>+	t = kzalloc(sizeof(*t), GFP_KERNEL);</div><div class='add'>+	if (t == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	mutex_init(&amp;t-&gt;lock);</div><div class='add'>+</div><div class='add'>+	/* Now create a video4linux device */</div><div class='add'>+	vd = video_device_alloc();</div><div class='add'>+	if (vd == NULL) {</div><div class='add'>+		kfree(t);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	i2c_set_clientdata(client, vd);</div><div class='add'>+	memcpy(vd, &amp;saa_template, sizeof(*vd));</div><div class='add'>+</div><div class='add'>+	for (pgbuf = 0; pgbuf &lt; NUM_DAUS; pgbuf++) {</div><div class='add'>+		memset(t-&gt;pgbuf[pgbuf], ' ', sizeof(t-&gt;pgbuf[0]));</div><div class='add'>+		t-&gt;is_searching[pgbuf] = false;</div><div class='add'>+	}</div><div class='add'>+	video_set_drvdata(vd, t);</div><div class='add'>+</div><div class='add'>+	/* Register it */</div><div class='add'>+	err = video_register_device(vd, VFL_TYPE_VTX, -1);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		kfree(t);</div><div class='add'>+		video_device_release(vd);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+	t-&gt;client = client;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int saa5246a_remove(struct i2c_client *client)</div><div class='add'>+{</div><div class='add'>+	struct video_device *vd = i2c_get_clientdata(client);</div><div class='add'>+</div><div class='add'>+	video_unregister_device(vd);</div><div class='add'>+	kfree(video_get_drvdata(vd));</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct i2c_device_id saa5246a_id[] = {</div><div class='add'>+	{ "saa5246a", 0 },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(i2c, saa5246a_id);</div><div class='add'>+</div><div class='add'>+static struct v4l2_i2c_driver_data v4l2_i2c_data = {</div><div class='add'>+	.name = "saa5246a",</div><div class='add'>+	.driverid = I2C_DRIVERID_SAA5249,</div><div class='add'>+	.probe = saa5246a_probe,</div><div class='add'>+	.remove = saa5246a_remove,</div><div class='add'>+	.id_table = saa5246a_id,</div><div class='add'>+};</div><div class='head'>diff --git a/drivers/media/video/saa5246a.h b/drivers/media/video/saa5246a.h<br/>deleted file mode 100644<br/>index 64394c036c60..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/saa5246a.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/saa5246a.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,359 +0,0 @@</div><div class='del'>-/*</div><div class='del'>-   Driver for the SAA5246A or SAA5281 Teletext (=Videotext) decoder chips from</div><div class='del'>-   Philips.</div><div class='del'>-</div><div class='del'>-   Copyright (C) 2004 Michael Geng (linux@MichaelGeng.de)</div><div class='del'>-</div><div class='del'>-   This program is free software; you can redistribute it and/or modify</div><div class='del'>-   it under the terms of the GNU General Public License as published by</div><div class='del'>-   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>-   (at your option) any later version.</div><div class='del'>-</div><div class='del'>-   This program is distributed in the hope that it will be useful,</div><div class='del'>-   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>-   GNU General Public License for more details.</div><div class='del'>-</div><div class='del'>-   You should have received a copy of the GNU General Public License</div><div class='del'>-   along with this program; if not, write to the Free Software</div><div class='del'>-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='del'>-</div><div class='del'>- */</div><div class='del'>-#ifndef __SAA5246A_H__</div><div class='del'>-#define __SAA5246A_H__</div><div class='del'>-</div><div class='del'>-#define MAJOR_VERSION 1		/* driver major version number */</div><div class='del'>-#define MINOR_VERSION 8		/* driver minor version number */</div><div class='del'>-</div><div class='del'>-#define IF_NAME "SAA5246A"</div><div class='del'>-</div><div class='del'>-#define I2C_ADDRESS 17</div><div class='del'>-</div><div class='del'>-/* Number of DAUs = number of pages that can be searched at the same time. */</div><div class='del'>-#define NUM_DAUS 4</div><div class='del'>-</div><div class='del'>-#define NUM_ROWS_PER_PAGE 40</div><div class='del'>-</div><div class='del'>-/* first column is 0 (not 1) */</div><div class='del'>-#define POS_TIME_START 32</div><div class='del'>-#define POS_TIME_END 39</div><div class='del'>-</div><div class='del'>-#define POS_HEADER_START 7</div><div class='del'>-#define POS_HEADER_END 31</div><div class='del'>-</div><div class='del'>-/* Returns 'true' if the part of the videotext page described with req contains</div><div class='del'>-   (at least parts of) the time field */</div><div class='del'>-#define REQ_CONTAINS_TIME(p_req) \</div><div class='del'>-	((p_req)-&gt;start &lt;= POS_TIME_END &amp;&amp; \</div><div class='del'>-	 (p_req)-&gt;end   &gt;= POS_TIME_START)</div><div class='del'>-</div><div class='del'>-/* Returns 'true' if the part of the videotext page described with req contains</div><div class='del'>-   (at least parts of) the page header */</div><div class='del'>-#define REQ_CONTAINS_HEADER(p_req) \</div><div class='del'>-	((p_req)-&gt;start &lt;= POS_HEADER_END &amp;&amp; \</div><div class='del'>-	 (p_req)-&gt;end   &gt;= POS_HEADER_START)</div><div class='del'>-</div><div class='del'>-/*****************************************************************************/</div><div class='del'>-/* Mode register numbers of the SAA5246A				     */</div><div class='del'>-/*****************************************************************************/</div><div class='del'>-#define SAA5246A_REGISTER_R0    0</div><div class='del'>-#define SAA5246A_REGISTER_R1    1</div><div class='del'>-#define SAA5246A_REGISTER_R2    2</div><div class='del'>-#define SAA5246A_REGISTER_R3    3</div><div class='del'>-#define SAA5246A_REGISTER_R4    4</div><div class='del'>-#define SAA5246A_REGISTER_R5    5</div><div class='del'>-#define SAA5246A_REGISTER_R6    6</div><div class='del'>-#define SAA5246A_REGISTER_R7    7</div><div class='del'>-#define SAA5246A_REGISTER_R8    8</div><div class='del'>-#define SAA5246A_REGISTER_R9    9</div><div class='del'>-#define SAA5246A_REGISTER_R10  10</div><div class='del'>-#define SAA5246A_REGISTER_R11  11</div><div class='del'>-#define SAA5246A_REGISTER_R11B 11</div><div class='del'>-</div><div class='del'>-/* SAA5246A mode registers often autoincrement to the next register.</div><div class='del'>-   Therefore we use variable argument lists. The following macro indicates</div><div class='del'>-   the end of a command list. */</div><div class='del'>-#define COMMAND_END (- 1)</div><div class='del'>-</div><div class='del'>-/*****************************************************************************/</div><div class='del'>-/* Contents of the mode registers of the SAA5246A			     */</div><div class='del'>-/*****************************************************************************/</div><div class='del'>-/* Register R0 (Advanced Control) */</div><div class='del'>-#define R0_SELECT_R11					   0x00</div><div class='del'>-#define R0_SELECT_R11B					   0x01</div><div class='del'>-</div><div class='del'>-#define R0_PLL_TIME_CONSTANT_LONG			   0x00</div><div class='del'>-#define R0_PLL_TIME_CONSTANT_SHORT			   0x02</div><div class='del'>-</div><div class='del'>-#define R0_ENABLE_nODD_EVEN_OUTPUT			   0x00</div><div class='del'>-#define R0_DISABLE_nODD_EVEN_OUTPUT			   0x04</div><div class='del'>-</div><div class='del'>-#define R0_ENABLE_HDR_POLL				   0x00</div><div class='del'>-#define R0_DISABLE_HDR_POLL				   0x10</div><div class='del'>-</div><div class='del'>-#define R0_DO_NOT_FORCE_nODD_EVEN_LOW_IF_PICTURE_DISPLAYED 0x00</div><div class='del'>-#define R0_FORCE_nODD_EVEN_LOW_IF_PICTURE_DISPLAYED	   0x20</div><div class='del'>-</div><div class='del'>-#define R0_NO_FREE_RUN_PLL				   0x00</div><div class='del'>-#define R0_FREE_RUN_PLL					   0x40</div><div class='del'>-</div><div class='del'>-#define R0_NO_AUTOMATIC_FASTEXT_PROMPT			   0x00</div><div class='del'>-#define R0_AUTOMATIC_FASTEXT_PROMPT			   0x80</div><div class='del'>-</div><div class='del'>-/* Register R1 (Mode) */</div><div class='del'>-#define R1_INTERLACED_312_AND_HALF_312_AND_HALF_LINES	   0x00</div><div class='del'>-#define R1_NON_INTERLACED_312_313_LINES			   0x01</div><div class='del'>-#define R1_NON_INTERLACED_312_312_LINES			   0x02</div><div class='del'>-#define R1_FFB_LEADING_EDGE_IN_FIRST_BROAD_PULSE	   0x03</div><div class='del'>-#define R1_FFB_LEADING_EDGE_IN_SECOND_BROAD_PULSE	   0x07</div><div class='del'>-</div><div class='del'>-#define R1_DEW						   0x00</div><div class='del'>-#define R1_FULL_FIELD					   0x08</div><div class='del'>-</div><div class='del'>-#define R1_EXTENDED_PACKET_DISABLE			   0x00</div><div class='del'>-#define R1_EXTENDED_PACKET_ENABLE			   0x10</div><div class='del'>-</div><div class='del'>-#define R1_DAUS_ALL_ON					   0x00</div><div class='del'>-#define R1_DAUS_ALL_OFF					   0x20</div><div class='del'>-</div><div class='del'>-#define R1_7_BITS_PLUS_PARITY				   0x00</div><div class='del'>-#define R1_8_BITS_NO_PARITY				   0x40</div><div class='del'>-</div><div class='del'>-#define R1_VCS_TO_SCS					   0x00</div><div class='del'>-#define R1_NO_VCS_TO_SCS				   0x80</div><div class='del'>-</div><div class='del'>-/* Register R2 (Page request address) */</div><div class='del'>-#define R2_IN_R3_SELECT_PAGE_HUNDREDS			   0x00</div><div class='del'>-#define R2_IN_R3_SELECT_PAGE_TENS			   0x01</div><div class='del'>-#define R2_IN_R3_SELECT_PAGE_UNITS			   0x02</div><div class='del'>-#define R2_IN_R3_SELECT_HOURS_TENS			   0x03</div><div class='del'>-#define R2_IN_R3_SELECT_HOURS_UNITS			   0x04</div><div class='del'>-#define R2_IN_R3_SELECT_MINUTES_TENS			   0x05</div><div class='del'>-#define R2_IN_R3_SELECT_MINUTES_UNITS			   0x06</div><div class='del'>-</div><div class='del'>-#define R2_DAU_0					   0x00</div><div class='del'>-#define R2_DAU_1					   0x10</div><div class='del'>-#define R2_DAU_2					   0x20</div><div class='del'>-#define R2_DAU_3					   0x30</div><div class='del'>-</div><div class='del'>-#define R2_BANK_0					   0x00</div><div class='del'>-#define R2_BANK 1					   0x40</div><div class='del'>-</div><div class='del'>-#define R2_HAMMING_CHECK_ON				   0x80</div><div class='del'>-#define R2_HAMMING_CHECK_OFF				   0x00</div><div class='del'>-</div><div class='del'>-/* Register R3 (Page request data) */</div><div class='del'>-#define R3_PAGE_HUNDREDS_0				   0x00</div><div class='del'>-#define R3_PAGE_HUNDREDS_1				   0x01</div><div class='del'>-#define R3_PAGE_HUNDREDS_2				   0x02</div><div class='del'>-#define R3_PAGE_HUNDREDS_3				   0x03</div><div class='del'>-#define R3_PAGE_HUNDREDS_4				   0x04</div><div class='del'>-#define R3_PAGE_HUNDREDS_5				   0x05</div><div class='del'>-#define R3_PAGE_HUNDREDS_6				   0x06</div><div class='del'>-#define R3_PAGE_HUNDREDS_7				   0x07</div><div class='del'>-</div><div class='del'>-#define R3_HOLD_PAGE					   0x00</div><div class='del'>-#define R3_UPDATE_PAGE					   0x08</div><div class='del'>-</div><div class='del'>-#define R3_PAGE_HUNDREDS_DO_NOT_CARE			   0x00</div><div class='del'>-#define R3_PAGE_HUNDREDS_DO_CARE			   0x10</div><div class='del'>-</div><div class='del'>-#define R3_PAGE_TENS_DO_NOT_CARE			   0x00</div><div class='del'>-#define R3_PAGE_TENS_DO_CARE				   0x10</div><div class='del'>-</div><div class='del'>-#define R3_PAGE_UNITS_DO_NOT_CARE			   0x00</div><div class='del'>-#define R3_PAGE_UNITS_DO_CARE				   0x10</div><div class='del'>-</div><div class='del'>-#define R3_HOURS_TENS_DO_NOT_CARE			   0x00</div><div class='del'>-#define R3_HOURS_TENS_DO_CARE				   0x10</div><div class='del'>-</div><div class='del'>-#define R3_HOURS_UNITS_DO_NOT_CARE			   0x00</div><div class='del'>-#define R3_HOURS_UNITS_DO_CARE				   0x10</div><div class='del'>-</div><div class='del'>-#define R3_MINUTES_TENS_DO_NOT_CARE			   0x00</div><div class='del'>-#define R3_MINUTES_TENS_DO_CARE				   0x10</div><div class='del'>-</div><div class='del'>-#define R3_MINUTES_UNITS_DO_NOT_CARE			   0x00</div><div class='del'>-#define R3_MINUTES_UNITS_DO_CARE			   0x10</div><div class='del'>-</div><div class='del'>-/* Register R4 (Display chapter) */</div><div class='del'>-#define R4_DISPLAY_PAGE_0				   0x00</div><div class='del'>-#define R4_DISPLAY_PAGE_1				   0x01</div><div class='del'>-#define R4_DISPLAY_PAGE_2				   0x02</div><div class='del'>-#define R4_DISPLAY_PAGE_3				   0x03</div><div class='del'>-#define R4_DISPLAY_PAGE_4				   0x04</div><div class='del'>-#define R4_DISPLAY_PAGE_5				   0x05</div><div class='del'>-#define R4_DISPLAY_PAGE_6				   0x06</div><div class='del'>-#define R4_DISPLAY_PAGE_7				   0x07</div><div class='del'>-</div><div class='del'>-/* Register R5 (Normal display control) */</div><div class='del'>-#define R5_PICTURE_INSIDE_BOXING_OFF			   0x00</div><div class='del'>-#define R5_PICTURE_INSIDE_BOXING_ON			   0x01</div><div class='del'>-</div><div class='del'>-#define R5_PICTURE_OUTSIDE_BOXING_OFF			   0x00</div><div class='del'>-#define R5_PICTURE_OUTSIDE_BOXING_ON			   0x02</div><div class='del'>-</div><div class='del'>-#define R5_TEXT_INSIDE_BOXING_OFF			   0x00</div><div class='del'>-#define R5_TEXT_INSIDE_BOXING_ON			   0x04</div><div class='del'>-</div><div class='del'>-#define R5_TEXT_OUTSIDE_BOXING_OFF			   0x00</div><div class='del'>-#define R5_TEXT_OUTSIDE_BOXING_ON			   0x08</div><div class='del'>-</div><div class='del'>-#define R5_CONTRAST_REDUCTION_INSIDE_BOXING_OFF		   0x00</div><div class='del'>-#define R5_CONTRAST_REDUCTION_INSIDE_BOXING_ON		   0x10</div><div class='del'>-</div><div class='del'>-#define R5_CONTRAST_REDUCTION_OUTSIDE_BOXING_OFF	   0x00</div><div class='del'>-#define R5_CONTRAST_REDUCTION_OUTSIDE_BOXING_ON		   0x20</div><div class='del'>-</div><div class='del'>-#define R5_BACKGROUND_COLOR_INSIDE_BOXING_OFF		   0x00</div><div class='del'>-#define R5_BACKGROUND_COLOR_INSIDE_BOXING_ON		   0x40</div><div class='del'>-</div><div class='del'>-#define R5_BACKGROUND_COLOR_OUTSIDE_BOXING_OFF		   0x00</div><div class='del'>-#define R5_BACKGROUND_COLOR_OUTSIDE_BOXING_ON		   0x80</div><div class='del'>-</div><div class='del'>-/* Register R6 (Newsflash display) */</div><div class='del'>-#define R6_NEWSFLASH_PICTURE_INSIDE_BOXING_OFF		   0x00</div><div class='del'>-#define R6_NEWSFLASH_PICTURE_INSIDE_BOXING_ON		   0x01</div><div class='del'>-</div><div class='del'>-#define R6_NEWSFLASH_PICTURE_OUTSIDE_BOXING_OFF		   0x00</div><div class='del'>-#define R6_NEWSFLASH_PICTURE_OUTSIDE_BOXING_ON		   0x02</div><div class='del'>-</div><div class='del'>-#define R6_NEWSFLASH_TEXT_INSIDE_BOXING_OFF		   0x00</div><div class='del'>-#define R6_NEWSFLASH_TEXT_INSIDE_BOXING_ON		   0x04</div><div class='del'>-</div><div class='del'>-#define R6_NEWSFLASH_TEXT_OUTSIDE_BOXING_OFF		   0x00</div><div class='del'>-#define R6_NEWSFLASH_TEXT_OUTSIDE_BOXING_ON		   0x08</div><div class='del'>-</div><div class='del'>-#define R6_NEWSFLASH_CONTRAST_REDUCTION_INSIDE_BOXING_OFF  0x00</div><div class='del'>-#define R6_NEWSFLASH_CONTRAST_REDUCTION_INSIDE_BOXING_ON   0x10</div><div class='del'>-</div><div class='del'>-#define R6_NEWSFLASH_CONTRAST_REDUCTION_OUTSIDE_BOXING_OFF 0x00</div><div class='del'>-#define R6_NEWSFLASH_CONTRAST_REDUCTION_OUTSIDE_BOXING_ON  0x20</div><div class='del'>-</div><div class='del'>-#define R6_NEWSFLASH_BACKGROUND_COLOR_INSIDE_BOXING_OFF    0x00</div><div class='del'>-#define R6_NEWSFLASH_BACKGROUND_COLOR_INSIDE_BOXING_ON	   0x40</div><div class='del'>-</div><div class='del'>-#define R6_NEWSFLASH_BACKGROUND_COLOR_OUTSIDE_BOXING_OFF   0x00</div><div class='del'>-#define R6_NEWSFLASH_BACKGROUND_COLOR_OUTSIDE_BOXING_ON    0x80</div><div class='del'>-</div><div class='del'>-/* Register R7 (Display mode) */</div><div class='del'>-#define R7_BOX_OFF_ROW_0				   0x00</div><div class='del'>-#define R7_BOX_ON_ROW_0					   0x01</div><div class='del'>-</div><div class='del'>-#define R7_BOX_OFF_ROW_1_TO_23				   0x00</div><div class='del'>-#define R7_BOX_ON_ROW_1_TO_23				   0x02</div><div class='del'>-</div><div class='del'>-#define R7_BOX_OFF_ROW_24				   0x00</div><div class='del'>-#define R7_BOX_ON_ROW_24				   0x04</div><div class='del'>-</div><div class='del'>-#define R7_SINGLE_HEIGHT				   0x00</div><div class='del'>-#define R7_DOUBLE_HEIGHT				   0x08</div><div class='del'>-</div><div class='del'>-#define R7_TOP_HALF					   0x00</div><div class='del'>-#define R7_BOTTOM_HALF					   0x10</div><div class='del'>-</div><div class='del'>-#define R7_REVEAL_OFF					   0x00</div><div class='del'>-#define R7_REVEAL_ON					   0x20</div><div class='del'>-</div><div class='del'>-#define R7_CURSER_OFF					   0x00</div><div class='del'>-#define R7_CURSER_ON					   0x40</div><div class='del'>-</div><div class='del'>-#define R7_STATUS_BOTTOM				   0x00</div><div class='del'>-#define R7_STATUS_TOP					   0x80</div><div class='del'>-</div><div class='del'>-/* Register R8 (Active chapter) */</div><div class='del'>-#define R8_ACTIVE_CHAPTER_0				   0x00</div><div class='del'>-#define R8_ACTIVE_CHAPTER_1				   0x01</div><div class='del'>-#define R8_ACTIVE_CHAPTER_2				   0x02</div><div class='del'>-#define R8_ACTIVE_CHAPTER_3				   0x03</div><div class='del'>-#define R8_ACTIVE_CHAPTER_4				   0x04</div><div class='del'>-#define R8_ACTIVE_CHAPTER_5				   0x05</div><div class='del'>-#define R8_ACTIVE_CHAPTER_6				   0x06</div><div class='del'>-#define R8_ACTIVE_CHAPTER_7				   0x07</div><div class='del'>-</div><div class='del'>-#define R8_CLEAR_MEMORY					   0x08</div><div class='del'>-#define R8_DO_NOT_CLEAR_MEMORY				   0x00</div><div class='del'>-</div><div class='del'>-/* Register R9 (Curser row) */</div><div class='del'>-#define R9_CURSER_ROW_0					   0x00</div><div class='del'>-#define R9_CURSER_ROW_1					   0x01</div><div class='del'>-#define R9_CURSER_ROW_2					   0x02</div><div class='del'>-#define R9_CURSER_ROW_25				   0x19</div><div class='del'>-</div><div class='del'>-/* Register R10 (Curser column) */</div><div class='del'>-#define R10_CURSER_COLUMN_0				   0x00</div><div class='del'>-#define R10_CURSER_COLUMN_6				   0x06</div><div class='del'>-#define R10_CURSER_COLUMN_8				   0x08</div><div class='del'>-</div><div class='del'>-/*****************************************************************************/</div><div class='del'>-/* Row 25 control data in column 0 to 9					     */</div><div class='del'>-/*****************************************************************************/</div><div class='del'>-#define ROW25_COLUMN0_PAGE_UNITS			   0x0F</div><div class='del'>-</div><div class='del'>-#define ROW25_COLUMN1_PAGE_TENS				   0x0F</div><div class='del'>-</div><div class='del'>-#define ROW25_COLUMN2_MINUTES_UNITS			   0x0F</div><div class='del'>-</div><div class='del'>-#define ROW25_COLUMN3_MINUTES_TENS			   0x07</div><div class='del'>-#define ROW25_COLUMN3_DELETE_PAGE			   0x08</div><div class='del'>-</div><div class='del'>-#define ROW25_COLUMN4_HOUR_UNITS			   0x0F</div><div class='del'>-</div><div class='del'>-#define ROW25_COLUMN5_HOUR_TENS				   0x03</div><div class='del'>-#define ROW25_COLUMN5_INSERT_HEADLINE			   0x04</div><div class='del'>-#define ROW25_COLUMN5_INSERT_SUBTITLE			   0x08</div><div class='del'>-</div><div class='del'>-#define ROW25_COLUMN6_SUPPRESS_HEADER			   0x01</div><div class='del'>-#define ROW25_COLUMN6_UPDATE_PAGE			   0x02</div><div class='del'>-#define ROW25_COLUMN6_INTERRUPTED_SEQUENCE		   0x04</div><div class='del'>-#define ROW25_COLUMN6_SUPPRESS_DISPLAY			   0x08</div><div class='del'>-</div><div class='del'>-#define ROW25_COLUMN7_SERIAL_MODE			   0x01</div><div class='del'>-#define ROW25_COLUMN7_CHARACTER_SET			   0x0E</div><div class='del'>-</div><div class='del'>-#define ROW25_COLUMN8_PAGE_HUNDREDS			   0x07</div><div class='del'>-#define ROW25_COLUMN8_PAGE_NOT_FOUND			   0x10</div><div class='del'>-</div><div class='del'>-#define ROW25_COLUMN9_PAGE_BEING_LOOKED_FOR		   0x20</div><div class='del'>-</div><div class='del'>-#define ROW25_COLUMN0_TO_7_HAMMING_ERROR		   0x10</div><div class='del'>-</div><div class='del'>-/*****************************************************************************/</div><div class='del'>-/* Helper macros for extracting page, hour and minute digits		     */</div><div class='del'>-/*****************************************************************************/</div><div class='del'>-/* BYTE_POS  0 is at row 0, column 0,</div><div class='del'>-   BYTE_POS  1 is at row 0, column 1,</div><div class='del'>-   BYTE_POS 40 is at row 1, column 0, (with NUM_ROWS_PER_PAGE = 40)</div><div class='del'>-   BYTE_POS 41 is at row 1, column 1, (with NUM_ROWS_PER_PAGE = 40),</div><div class='del'>-   ... */</div><div class='del'>-#define ROW(BYTE_POS)    (BYTE_POS / NUM_ROWS_PER_PAGE)</div><div class='del'>-#define COLUMN(BYTE_POS) (BYTE_POS % NUM_ROWS_PER_PAGE)</div><div class='del'>-</div><div class='del'>-/*****************************************************************************/</div><div class='del'>-/* Helper macros for extracting page, hour and minute digits		     */</div><div class='del'>-/*****************************************************************************/</div><div class='del'>-/* Macros for extracting hundreds, tens and units of a page number which</div><div class='del'>-   must be in the range 0 ... 0x799.</div><div class='del'>-   Note that page is coded in hexadecimal, i.e. 0x123 means page 123.</div><div class='del'>-   page 0x.. means page 8.. */</div><div class='del'>-#define HUNDREDS_OF_PAGE(page) (((page) / 0x100) &amp; 0x7)</div><div class='del'>-#define TENS_OF_PAGE(page)     (((page) / 0x10)  &amp; 0xF)</div><div class='del'>-#define UNITS_OF_PAGE(page)     ((page) &amp; 0xF)</div><div class='del'>-</div><div class='del'>-/* Macros for extracting tens and units of a hour information which</div><div class='del'>-   must be in the range 0 ... 0x24.</div><div class='del'>-   Note that hour is coded in hexadecimal, i.e. 0x12 means 12 hours */</div><div class='del'>-#define TENS_OF_HOUR(hour)  ((hour) / 0x10)</div><div class='del'>-#define UNITS_OF_HOUR(hour) ((hour) &amp; 0xF)</div><div class='del'>-</div><div class='del'>-/* Macros for extracting tens and units of a minute information which</div><div class='del'>-   must be in the range 0 ... 0x59.</div><div class='del'>-   Note that minute is coded in hexadecimal, i.e. 0x12 means 12 minutes */</div><div class='del'>-#define TENS_OF_MINUTE(minute)  ((minute) / 0x10)</div><div class='del'>-#define UNITS_OF_MINUTE(minute) ((minute) &amp; 0xF)</div><div class='del'>-</div><div class='del'>-#define HOUR_MAX   0x23</div><div class='del'>-#define MINUTE_MAX 0x59</div><div class='del'>-#define PAGE_MAX   0x8FF</div><div class='del'>-</div><div class='del'>-#endif  /* __SAA5246A_H__ */</div><div class='head'>diff --git a/drivers/media/video/saa5249.c b/drivers/media/video/saa5249.c<br/>index 0d639738d4e6..3bb959c25d9d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/saa5249.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/saa5249.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/saa5249.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/saa5249.c</a></div><div class='hunk'>@@ -15,8 +15,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  *	Copyright (c) 1998 Richard Guenther &lt;richard.guenther@student.uni-tuebingen.de&gt;</div><div class='ctx'>  *</div><div class='del'>- * $Id: saa5249.c,v 1.1 1998/03/30 22:23:23 alan Exp $</div><div class='del'>- *</div><div class='ctx'>  *	Derived From</div><div class='ctx'>  *</div><div class='ctx'>  * vtx.c:</div><div class='hunk'>@@ -45,33 +43,28 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/ioport.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;stdarg.h&gt;</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/smp_lock.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/videotext.h&gt;</div><div class='ctx'> #include &lt;linux/videodev.h&gt;</div><div class='ctx'> #include &lt;media/v4l2-common.h&gt;</div><div class='ctx'> #include &lt;media/v4l2-ioctl.h&gt;</div><div class='del'>-#include &lt;linux/mutex.h&gt;</div><div class='del'>-</div><div class='add'>+#include &lt;media/v4l2-i2c-drv-legacy.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+MODULE_AUTHOR("Michael Geng &lt;linux@MichaelGeng.de&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Philips SAA5249 Teletext decoder driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='ctx'> #define VTX_VER_MAJ 1</div><div class='ctx'> #define VTX_VER_MIN 8</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> #define NUM_DAUS 4</div><div class='ctx'> #define NUM_BUFS 8</div><div class='del'>-#define IF_NAME "SAA5249"</div><div class='ctx'> </div><div class='ctx'> static const int disp_modes[8][3] =</div><div class='ctx'> {</div><div class='hunk'>@@ -109,6 +102,7 @@ struct saa5249_device</div><div class='ctx'> 	int disp_mode;</div><div class='ctx'> 	int virtual_mode;</div><div class='ctx'> 	struct i2c_client *client;</div><div class='add'>+	unsigned long in_use;</div><div class='ctx'> 	struct mutex lock;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -123,125 +117,8 @@ struct saa5249_device</div><div class='ctx'> </div><div class='ctx'> #define VTX_DEV_MINOR 0</div><div class='ctx'> </div><div class='del'>-/* General defines and debugging support */</div><div class='del'>-</div><div class='del'>-#define RESCHED do { cond_resched(); } while(0)</div><div class='del'>-</div><div class='ctx'> static struct video_device saa_template;	/* Declared near bottom */</div><div class='ctx'> </div><div class='del'>-/* Addresses to scan */</div><div class='del'>-static unsigned short normal_i2c[] = {34&gt;&gt;1,I2C_CLIENT_END};</div><div class='del'>-</div><div class='del'>-I2C_CLIENT_INSMOD;</div><div class='del'>-</div><div class='del'>-static struct i2c_client client_template;</div><div class='del'>-</div><div class='del'>-static int saa5249_attach(struct i2c_adapter *adap, int addr, int kind)</div><div class='del'>-{</div><div class='del'>-	int pgbuf;</div><div class='del'>-	int err;</div><div class='del'>-	struct i2c_client *client;</div><div class='del'>-	struct video_device *vd;</div><div class='del'>-	struct saa5249_device *t;</div><div class='del'>-</div><div class='del'>-	printk(KERN_INFO "saa5249: teletext chip found.\n");</div><div class='del'>-	client=kmalloc(sizeof(*client), GFP_KERNEL);</div><div class='del'>-	if(client==NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	client_template.adapter = adap;</div><div class='del'>-	client_template.addr = addr;</div><div class='del'>-	memcpy(client, &amp;client_template, sizeof(*client));</div><div class='del'>-	t = kzalloc(sizeof(*t), GFP_KERNEL);</div><div class='del'>-	if(t==NULL)</div><div class='del'>-	{</div><div class='del'>-		kfree(client);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-	strlcpy(client-&gt;name, IF_NAME, I2C_NAME_SIZE);</div><div class='del'>-	mutex_init(&amp;t-&gt;lock);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 *	Now create a video4linux device</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	vd = kmalloc(sizeof(struct video_device), GFP_KERNEL);</div><div class='del'>-	if(vd==NULL)</div><div class='del'>-	{</div><div class='del'>-		kfree(t);</div><div class='del'>-		kfree(client);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-	i2c_set_clientdata(client, vd);</div><div class='del'>-	memcpy(vd, &amp;saa_template, sizeof(*vd));</div><div class='del'>-</div><div class='del'>-	for (pgbuf = 0; pgbuf &lt; NUM_DAUS; pgbuf++)</div><div class='del'>-	{</div><div class='del'>-		memset(t-&gt;vdau[pgbuf].pgbuf, ' ', sizeof(t-&gt;vdau[0].pgbuf));</div><div class='del'>-		memset(t-&gt;vdau[pgbuf].sregs, 0, sizeof(t-&gt;vdau[0].sregs));</div><div class='del'>-		memset(t-&gt;vdau[pgbuf].laststat, 0, sizeof(t-&gt;vdau[0].laststat));</div><div class='del'>-		t-&gt;vdau[pgbuf].expire = 0;</div><div class='del'>-		t-&gt;vdau[pgbuf].clrfound = true;</div><div class='del'>-		t-&gt;vdau[pgbuf].stopped = true;</div><div class='del'>-		t-&gt;is_searching[pgbuf] = false;</div><div class='del'>-	}</div><div class='del'>-	vd-&gt;priv=t;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 *	Register it</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if((err=video_register_device(vd, VFL_TYPE_VTX,-1))&lt;0)</div><div class='del'>-	{</div><div class='del'>-		kfree(t);</div><div class='del'>-		kfree(vd);</div><div class='del'>-		kfree(client);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-	t-&gt;client = client;</div><div class='del'>-	i2c_attach_client(client);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	We do most of the hard work when we become a device on the i2c.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int saa5249_probe(struct i2c_adapter *adap)</div><div class='del'>-{</div><div class='del'>-	if (adap-&gt;class &amp; I2C_CLASS_TV_ANALOG)</div><div class='del'>-		return i2c_probe(adap, &amp;addr_data, saa5249_attach);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int saa5249_detach(struct i2c_client *client)</div><div class='del'>-{</div><div class='del'>-	struct video_device *vd = i2c_get_clientdata(client);</div><div class='del'>-	i2c_detach_client(client);</div><div class='del'>-	video_unregister_device(vd);</div><div class='del'>-	kfree(vd-&gt;priv);</div><div class='del'>-	kfree(vd);</div><div class='del'>-	kfree(client);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* new I2C driver support */</div><div class='del'>-</div><div class='del'>-static struct i2c_driver i2c_driver_videotext =</div><div class='del'>-{</div><div class='del'>-	.driver = {</div><div class='del'>-		.name 	= IF_NAME,		/* name */</div><div class='del'>-	},</div><div class='del'>-	.id 		= I2C_DRIVERID_SAA5249, /* in i2c.h */</div><div class='del'>-	.attach_adapter = saa5249_probe,</div><div class='del'>-	.detach_client  = saa5249_detach,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct i2c_client client_template = {</div><div class='del'>-	.driver		= &amp;i2c_driver_videotext,</div><div class='del'>-	.name		= "(unset)",</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  *	Wait the given number of jiffies (10ms). This calls the scheduler, so the actual</div><div class='ctx'>  *	delay may be longer.</div><div class='hunk'>@@ -275,7 +152,7 @@ static int i2c_sendbuf(struct saa5249_device *t, int reg, int count, u8 *data)</div><div class='ctx'> 	buf[0] = reg;</div><div class='ctx'> 	memcpy(buf+1, data, count);</div><div class='ctx'> </div><div class='del'>-	if(i2c_master_send(t-&gt;client, buf, count+1)==count+1)</div><div class='add'>+	if (i2c_master_send(t-&gt;client, buf, count + 1) == count + 1)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	return -1;</div><div class='ctx'> }</div><div class='hunk'>@@ -317,246 +194,236 @@ static int do_saa5249_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 			    unsigned int cmd, void *arg)</div><div class='ctx'> {</div><div class='ctx'> 	static int virtual_mode = false;</div><div class='del'>-	struct video_device *vd = video_devdata(file);</div><div class='del'>-	struct saa5249_device *t=vd-&gt;priv;</div><div class='add'>+	struct saa5249_device *t = video_drvdata(file);</div><div class='ctx'> </div><div class='del'>-	switch(cmd)</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case VTXIOCGETINFO:</div><div class='ctx'> 	{</div><div class='del'>-		case VTXIOCGETINFO:</div><div class='del'>-		{</div><div class='del'>-			vtx_info_t *info = arg;</div><div class='del'>-			info-&gt;version_major = VTX_VER_MAJ;</div><div class='del'>-			info-&gt;version_minor = VTX_VER_MIN;</div><div class='del'>-			info-&gt;numpages = NUM_DAUS;</div><div class='del'>-			/*info-&gt;cct_type = CCT_TYPE;*/</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='add'>+		vtx_info_t *info = arg;</div><div class='add'>+		info-&gt;version_major = VTX_VER_MAJ;</div><div class='add'>+		info-&gt;version_minor = VTX_VER_MIN;</div><div class='add'>+		info-&gt;numpages = NUM_DAUS;</div><div class='add'>+		/*info-&gt;cct_type = CCT_TYPE;*/</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		case VTXIOCCLRPAGE:</div><div class='del'>-		{</div><div class='del'>-			vtx_pagereq_t *req = arg;</div><div class='add'>+	case VTXIOCCLRPAGE:</div><div class='add'>+	{</div><div class='add'>+		vtx_pagereq_t *req = arg;</div><div class='ctx'> </div><div class='del'>-			if (req-&gt;pgbuf &lt; 0 || req-&gt;pgbuf &gt;= NUM_DAUS)</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			memset(t-&gt;vdau[req-&gt;pgbuf].pgbuf, ' ', sizeof(t-&gt;vdau[0].pgbuf));</div><div class='del'>-			t-&gt;vdau[req-&gt;pgbuf].clrfound = true;</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='add'>+		if (req-&gt;pgbuf &lt; 0 || req-&gt;pgbuf &gt;= NUM_DAUS)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		memset(t-&gt;vdau[req-&gt;pgbuf].pgbuf, ' ', sizeof(t-&gt;vdau[0].pgbuf));</div><div class='add'>+		t-&gt;vdau[req-&gt;pgbuf].clrfound = true;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		case VTXIOCCLRFOUND:</div><div class='del'>-		{</div><div class='del'>-			vtx_pagereq_t *req = arg;</div><div class='add'>+	case VTXIOCCLRFOUND:</div><div class='add'>+	{</div><div class='add'>+		vtx_pagereq_t *req = arg;</div><div class='ctx'> </div><div class='del'>-			if (req-&gt;pgbuf &lt; 0 || req-&gt;pgbuf &gt;= NUM_DAUS)</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			t-&gt;vdau[req-&gt;pgbuf].clrfound = true;</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='add'>+		if (req-&gt;pgbuf &lt; 0 || req-&gt;pgbuf &gt;= NUM_DAUS)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		t-&gt;vdau[req-&gt;pgbuf].clrfound = true;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		case VTXIOCPAGEREQ:</div><div class='del'>-		{</div><div class='del'>-			vtx_pagereq_t *req = arg;</div><div class='del'>-			if (!(req-&gt;pagemask &amp; PGMASK_PAGE))</div><div class='del'>-				req-&gt;page = 0;</div><div class='del'>-			if (!(req-&gt;pagemask &amp; PGMASK_HOUR))</div><div class='del'>-				req-&gt;hour = 0;</div><div class='del'>-			if (!(req-&gt;pagemask &amp; PGMASK_MINUTE))</div><div class='del'>-				req-&gt;minute = 0;</div><div class='del'>-			if (req-&gt;page &lt; 0 || req-&gt;page &gt; 0x8ff) /* 7FF ?? */</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			req-&gt;page &amp;= 0x7ff;</div><div class='del'>-			if (req-&gt;hour &lt; 0 || req-&gt;hour &gt; 0x3f || req-&gt;minute &lt; 0 || req-&gt;minute &gt; 0x7f ||</div><div class='del'>-				req-&gt;pagemask &lt; 0 || req-&gt;pagemask &gt;= PGMASK_MAX || req-&gt;pgbuf &lt; 0 || req-&gt;pgbuf &gt;= NUM_DAUS)</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			t-&gt;vdau[req-&gt;pgbuf].sregs[0] = (req-&gt;pagemask &amp; PG_HUND ? 0x10 : 0) | (req-&gt;page / 0x100);</div><div class='del'>-			t-&gt;vdau[req-&gt;pgbuf].sregs[1] = (req-&gt;pagemask &amp; PG_TEN ? 0x10 : 0) | ((req-&gt;page / 0x10) &amp; 0xf);</div><div class='del'>-			t-&gt;vdau[req-&gt;pgbuf].sregs[2] = (req-&gt;pagemask &amp; PG_UNIT ? 0x10 : 0) | (req-&gt;page &amp; 0xf);</div><div class='del'>-			t-&gt;vdau[req-&gt;pgbuf].sregs[3] = (req-&gt;pagemask &amp; HR_TEN ? 0x10 : 0) | (req-&gt;hour / 0x10);</div><div class='del'>-			t-&gt;vdau[req-&gt;pgbuf].sregs[4] = (req-&gt;pagemask &amp; HR_UNIT ? 0x10 : 0) | (req-&gt;hour &amp; 0xf);</div><div class='del'>-			t-&gt;vdau[req-&gt;pgbuf].sregs[5] = (req-&gt;pagemask &amp; MIN_TEN ? 0x10 : 0) | (req-&gt;minute / 0x10);</div><div class='del'>-			t-&gt;vdau[req-&gt;pgbuf].sregs[6] = (req-&gt;pagemask &amp; MIN_UNIT ? 0x10 : 0) | (req-&gt;minute &amp; 0xf);</div><div class='del'>-			t-&gt;vdau[req-&gt;pgbuf].stopped = false;</div><div class='del'>-			t-&gt;vdau[req-&gt;pgbuf].clrfound = true;</div><div class='del'>-			t-&gt;is_searching[req-&gt;pgbuf] = true;</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='add'>+	case VTXIOCPAGEREQ:</div><div class='add'>+	{</div><div class='add'>+		vtx_pagereq_t *req = arg;</div><div class='add'>+		if (!(req-&gt;pagemask &amp; PGMASK_PAGE))</div><div class='add'>+			req-&gt;page = 0;</div><div class='add'>+		if (!(req-&gt;pagemask &amp; PGMASK_HOUR))</div><div class='add'>+			req-&gt;hour = 0;</div><div class='add'>+		if (!(req-&gt;pagemask &amp; PGMASK_MINUTE))</div><div class='add'>+			req-&gt;minute = 0;</div><div class='add'>+		if (req-&gt;page &lt; 0 || req-&gt;page &gt; 0x8ff) /* 7FF ?? */</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		req-&gt;page &amp;= 0x7ff;</div><div class='add'>+		if (req-&gt;hour &lt; 0 || req-&gt;hour &gt; 0x3f || req-&gt;minute &lt; 0 || req-&gt;minute &gt; 0x7f ||</div><div class='add'>+			req-&gt;pagemask &lt; 0 || req-&gt;pagemask &gt;= PGMASK_MAX || req-&gt;pgbuf &lt; 0 || req-&gt;pgbuf &gt;= NUM_DAUS)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		t-&gt;vdau[req-&gt;pgbuf].sregs[0] = (req-&gt;pagemask &amp; PG_HUND ? 0x10 : 0) | (req-&gt;page / 0x100);</div><div class='add'>+		t-&gt;vdau[req-&gt;pgbuf].sregs[1] = (req-&gt;pagemask &amp; PG_TEN ? 0x10 : 0) | ((req-&gt;page / 0x10) &amp; 0xf);</div><div class='add'>+		t-&gt;vdau[req-&gt;pgbuf].sregs[2] = (req-&gt;pagemask &amp; PG_UNIT ? 0x10 : 0) | (req-&gt;page &amp; 0xf);</div><div class='add'>+		t-&gt;vdau[req-&gt;pgbuf].sregs[3] = (req-&gt;pagemask &amp; HR_TEN ? 0x10 : 0) | (req-&gt;hour / 0x10);</div><div class='add'>+		t-&gt;vdau[req-&gt;pgbuf].sregs[4] = (req-&gt;pagemask &amp; HR_UNIT ? 0x10 : 0) | (req-&gt;hour &amp; 0xf);</div><div class='add'>+		t-&gt;vdau[req-&gt;pgbuf].sregs[5] = (req-&gt;pagemask &amp; MIN_TEN ? 0x10 : 0) | (req-&gt;minute / 0x10);</div><div class='add'>+		t-&gt;vdau[req-&gt;pgbuf].sregs[6] = (req-&gt;pagemask &amp; MIN_UNIT ? 0x10 : 0) | (req-&gt;minute &amp; 0xf);</div><div class='add'>+		t-&gt;vdau[req-&gt;pgbuf].stopped = false;</div><div class='add'>+		t-&gt;vdau[req-&gt;pgbuf].clrfound = true;</div><div class='add'>+		t-&gt;is_searching[req-&gt;pgbuf] = true;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		case VTXIOCGETSTAT:</div><div class='del'>-		{</div><div class='del'>-			vtx_pagereq_t *req = arg;</div><div class='del'>-			u8 infobits[10];</div><div class='del'>-			vtx_pageinfo_t info;</div><div class='del'>-			int a;</div><div class='del'>-</div><div class='del'>-			if (req-&gt;pgbuf &lt; 0 || req-&gt;pgbuf &gt;= NUM_DAUS)</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			if (!t-&gt;vdau[req-&gt;pgbuf].stopped)</div><div class='del'>-			{</div><div class='del'>-				if (i2c_senddata(t, 2, 0, -1) ||</div><div class='del'>-					i2c_sendbuf(t, 3, sizeof(t-&gt;vdau[0].sregs), t-&gt;vdau[req-&gt;pgbuf].sregs) ||</div><div class='del'>-					i2c_senddata(t, 8, 0, 25, 0, ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', -1) ||</div><div class='del'>-					i2c_senddata(t, 2, 0, t-&gt;vdau[req-&gt;pgbuf].sregs[0] | 8, -1) ||</div><div class='del'>-					i2c_senddata(t, 8, 0, 25, 0, -1))</div><div class='del'>-					return -EIO;</div><div class='del'>-				jdelay(PAGE_WAIT);</div><div class='del'>-				if (i2c_getdata(t, 10, infobits))</div><div class='del'>-					return -EIO;</div><div class='add'>+	case VTXIOCGETSTAT:</div><div class='add'>+	{</div><div class='add'>+		vtx_pagereq_t *req = arg;</div><div class='add'>+		u8 infobits[10];</div><div class='add'>+		vtx_pageinfo_t info;</div><div class='add'>+		int a;</div><div class='add'>+</div><div class='add'>+		if (req-&gt;pgbuf &lt; 0 || req-&gt;pgbuf &gt;= NUM_DAUS)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (!t-&gt;vdau[req-&gt;pgbuf].stopped) {</div><div class='add'>+			if (i2c_senddata(t, 2, 0, -1) ||</div><div class='add'>+				i2c_sendbuf(t, 3, sizeof(t-&gt;vdau[0].sregs), t-&gt;vdau[req-&gt;pgbuf].sregs) ||</div><div class='add'>+				i2c_senddata(t, 8, 0, 25, 0, ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', -1) ||</div><div class='add'>+				i2c_senddata(t, 2, 0, t-&gt;vdau[req-&gt;pgbuf].sregs[0] | 8, -1) ||</div><div class='add'>+				i2c_senddata(t, 8, 0, 25, 0, -1))</div><div class='add'>+				return -EIO;</div><div class='add'>+			jdelay(PAGE_WAIT);</div><div class='add'>+			if (i2c_getdata(t, 10, infobits))</div><div class='add'>+				return -EIO;</div><div class='ctx'> </div><div class='del'>-				if (!(infobits[8] &amp; 0x10) &amp;&amp; !(infobits[7] &amp; 0xf0) &amp;&amp;	/* check FOUND-bit */</div><div class='del'>-					(memcmp(infobits, t-&gt;vdau[req-&gt;pgbuf].laststat, sizeof(infobits)) ||</div><div class='del'>-					time_after_eq(jiffies, t-&gt;vdau[req-&gt;pgbuf].expire)))</div><div class='del'>-				{		/* check if new page arrived */</div><div class='del'>-					if (i2c_senddata(t, 8, 0, 0, 0, -1) ||</div><div class='del'>-						i2c_getdata(t, VTX_PAGESIZE, t-&gt;vdau[req-&gt;pgbuf].pgbuf))</div><div class='add'>+			if (!(infobits[8] &amp; 0x10) &amp;&amp; !(infobits[7] &amp; 0xf0) &amp;&amp;	/* check FOUND-bit */</div><div class='add'>+				(memcmp(infobits, t-&gt;vdau[req-&gt;pgbuf].laststat, sizeof(infobits)) ||</div><div class='add'>+				time_after_eq(jiffies, t-&gt;vdau[req-&gt;pgbuf].expire)))</div><div class='add'>+			{		/* check if new page arrived */</div><div class='add'>+				if (i2c_senddata(t, 8, 0, 0, 0, -1) ||</div><div class='add'>+					i2c_getdata(t, VTX_PAGESIZE, t-&gt;vdau[req-&gt;pgbuf].pgbuf))</div><div class='add'>+					return -EIO;</div><div class='add'>+				t-&gt;vdau[req-&gt;pgbuf].expire = jiffies + PGBUF_EXPIRE;</div><div class='add'>+				memset(t-&gt;vdau[req-&gt;pgbuf].pgbuf + VTX_PAGESIZE, ' ', VTX_VIRTUALSIZE - VTX_PAGESIZE);</div><div class='add'>+				if (t-&gt;virtual_mode) {</div><div class='add'>+					/* Packet X/24 */</div><div class='add'>+					if (i2c_senddata(t, 8, 0, 0x20, 0, -1) ||</div><div class='add'>+						i2c_getdata(t, 40, t-&gt;vdau[req-&gt;pgbuf].pgbuf + VTX_PAGESIZE + 20 * 40))</div><div class='add'>+						return -EIO;</div><div class='add'>+					/* Packet X/27/0 */</div><div class='add'>+					if (i2c_senddata(t, 8, 0, 0x21, 0, -1) ||</div><div class='add'>+						i2c_getdata(t, 40, t-&gt;vdau[req-&gt;pgbuf].pgbuf + VTX_PAGESIZE + 16 * 40))</div><div class='add'>+						return -EIO;</div><div class='add'>+					/* Packet 8/30/0...8/30/15</div><div class='add'>+					 * FIXME: AFAIK, the 5249 does hamming-decoding for some bytes in packet 8/30,</div><div class='add'>+					 *        so we should undo this here.</div><div class='add'>+					 */</div><div class='add'>+					if (i2c_senddata(t, 8, 0, 0x22, 0, -1) ||</div><div class='add'>+						i2c_getdata(t, 40, t-&gt;vdau[req-&gt;pgbuf].pgbuf + VTX_PAGESIZE + 23 * 40))</div><div class='ctx'> 						return -EIO;</div><div class='del'>-					t-&gt;vdau[req-&gt;pgbuf].expire = jiffies + PGBUF_EXPIRE;</div><div class='del'>-					memset(t-&gt;vdau[req-&gt;pgbuf].pgbuf + VTX_PAGESIZE, ' ', VTX_VIRTUALSIZE - VTX_PAGESIZE);</div><div class='del'>-					if (t-&gt;virtual_mode)</div><div class='del'>-					{</div><div class='del'>-						/* Packet X/24 */</div><div class='del'>-						if (i2c_senddata(t, 8, 0, 0x20, 0, -1) ||</div><div class='del'>-							i2c_getdata(t, 40, t-&gt;vdau[req-&gt;pgbuf].pgbuf + VTX_PAGESIZE + 20 * 40))</div><div class='del'>-							return -EIO;</div><div class='del'>-						/* Packet X/27/0 */</div><div class='del'>-						if (i2c_senddata(t, 8, 0, 0x21, 0, -1) ||</div><div class='del'>-							i2c_getdata(t, 40, t-&gt;vdau[req-&gt;pgbuf].pgbuf + VTX_PAGESIZE + 16 * 40))</div><div class='del'>-							return -EIO;</div><div class='del'>-						/* Packet 8/30/0...8/30/15</div><div class='del'>-						 * FIXME: AFAIK, the 5249 does hamming-decoding for some bytes in packet 8/30,</div><div class='del'>-						 *        so we should undo this here.</div><div class='del'>-						 */</div><div class='del'>-						if (i2c_senddata(t, 8, 0, 0x22, 0, -1) ||</div><div class='del'>-							i2c_getdata(t, 40, t-&gt;vdau[req-&gt;pgbuf].pgbuf + VTX_PAGESIZE + 23 * 40))</div><div class='del'>-							return -EIO;</div><div class='del'>-					}</div><div class='del'>-					t-&gt;vdau[req-&gt;pgbuf].clrfound = false;</div><div class='del'>-					memcpy(t-&gt;vdau[req-&gt;pgbuf].laststat, infobits, sizeof(infobits));</div><div class='del'>-				}</div><div class='del'>-				else</div><div class='del'>-				{</div><div class='del'>-					memcpy(infobits, t-&gt;vdau[req-&gt;pgbuf].laststat, sizeof(infobits));</div><div class='ctx'> 				}</div><div class='del'>-			}</div><div class='del'>-			else</div><div class='del'>-			{</div><div class='add'>+				t-&gt;vdau[req-&gt;pgbuf].clrfound = false;</div><div class='add'>+				memcpy(t-&gt;vdau[req-&gt;pgbuf].laststat, infobits, sizeof(infobits));</div><div class='add'>+			} else {</div><div class='ctx'> 				memcpy(infobits, t-&gt;vdau[req-&gt;pgbuf].laststat, sizeof(infobits));</div><div class='ctx'> 			}</div><div class='add'>+		} else {</div><div class='add'>+			memcpy(infobits, t-&gt;vdau[req-&gt;pgbuf].laststat, sizeof(infobits));</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-			info.pagenum = ((infobits[8] &lt;&lt; 8) &amp; 0x700) | ((infobits[1] &lt;&lt; 4) &amp; 0xf0) | (infobits[0] &amp; 0x0f);</div><div class='del'>-			if (info.pagenum &lt; 0x100)</div><div class='del'>-				info.pagenum += 0x800;</div><div class='del'>-			info.hour = ((infobits[5] &lt;&lt; 4) &amp; 0x30) | (infobits[4] &amp; 0x0f);</div><div class='del'>-			info.minute = ((infobits[3] &lt;&lt; 4) &amp; 0x70) | (infobits[2] &amp; 0x0f);</div><div class='del'>-			info.charset = ((infobits[7] &gt;&gt; 1) &amp; 7);</div><div class='del'>-			info.delete = !!(infobits[3] &amp; 8);</div><div class='del'>-			info.headline = !!(infobits[5] &amp; 4);</div><div class='del'>-			info.subtitle = !!(infobits[5] &amp; 8);</div><div class='del'>-			info.supp_header = !!(infobits[6] &amp; 1);</div><div class='del'>-			info.update = !!(infobits[6] &amp; 2);</div><div class='del'>-			info.inter_seq = !!(infobits[6] &amp; 4);</div><div class='del'>-			info.dis_disp = !!(infobits[6] &amp; 8);</div><div class='del'>-			info.serial = !!(infobits[7] &amp; 1);</div><div class='del'>-			info.notfound = !!(infobits[8] &amp; 0x10);</div><div class='del'>-			info.pblf = !!(infobits[9] &amp; 0x20);</div><div class='del'>-			info.hamming = 0;</div><div class='del'>-			for (a = 0; a &lt;= 7; a++)</div><div class='del'>-			{</div><div class='del'>-				if (infobits[a] &amp; 0xf0)</div><div class='del'>-				{</div><div class='del'>-					info.hamming = 1;</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			if (t-&gt;vdau[req-&gt;pgbuf].clrfound)</div><div class='del'>-				info.notfound = 1;</div><div class='del'>-			if(copy_to_user(req-&gt;buffer, &amp;info, sizeof(vtx_pageinfo_t)))</div><div class='del'>-				return -EFAULT;</div><div class='del'>-			if (!info.hamming &amp;&amp; !info.notfound)</div><div class='del'>-			{</div><div class='del'>-				t-&gt;is_searching[req-&gt;pgbuf] = false;</div><div class='add'>+		info.pagenum = ((infobits[8] &lt;&lt; 8) &amp; 0x700) | ((infobits[1] &lt;&lt; 4) &amp; 0xf0) | (infobits[0] &amp; 0x0f);</div><div class='add'>+		if (info.pagenum &lt; 0x100)</div><div class='add'>+			info.pagenum += 0x800;</div><div class='add'>+		info.hour = ((infobits[5] &lt;&lt; 4) &amp; 0x30) | (infobits[4] &amp; 0x0f);</div><div class='add'>+		info.minute = ((infobits[3] &lt;&lt; 4) &amp; 0x70) | (infobits[2] &amp; 0x0f);</div><div class='add'>+		info.charset = ((infobits[7] &gt;&gt; 1) &amp; 7);</div><div class='add'>+		info.delete = !!(infobits[3] &amp; 8);</div><div class='add'>+		info.headline = !!(infobits[5] &amp; 4);</div><div class='add'>+		info.subtitle = !!(infobits[5] &amp; 8);</div><div class='add'>+		info.supp_header = !!(infobits[6] &amp; 1);</div><div class='add'>+		info.update = !!(infobits[6] &amp; 2);</div><div class='add'>+		info.inter_seq = !!(infobits[6] &amp; 4);</div><div class='add'>+		info.dis_disp = !!(infobits[6] &amp; 8);</div><div class='add'>+		info.serial = !!(infobits[7] &amp; 1);</div><div class='add'>+		info.notfound = !!(infobits[8] &amp; 0x10);</div><div class='add'>+		info.pblf = !!(infobits[9] &amp; 0x20);</div><div class='add'>+		info.hamming = 0;</div><div class='add'>+		for (a = 0; a &lt;= 7; a++) {</div><div class='add'>+			if (infobits[a] &amp; 0xf0) {</div><div class='add'>+				info.hamming = 1;</div><div class='add'>+				break;</div><div class='ctx'> 			}</div><div class='del'>-			return 0;</div><div class='ctx'> 		}</div><div class='add'>+		if (t-&gt;vdau[req-&gt;pgbuf].clrfound)</div><div class='add'>+			info.notfound = 1;</div><div class='add'>+		if (copy_to_user(req-&gt;buffer, &amp;info, sizeof(vtx_pageinfo_t)))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		if (!info.hamming &amp;&amp; !info.notfound)</div><div class='add'>+			t-&gt;is_searching[req-&gt;pgbuf] = false;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		case VTXIOCGETPAGE:</div><div class='del'>-		{</div><div class='del'>-			vtx_pagereq_t *req = arg;</div><div class='del'>-			int start, end;</div><div class='del'>-</div><div class='del'>-			if (req-&gt;pgbuf &lt; 0 || req-&gt;pgbuf &gt;= NUM_DAUS || req-&gt;start &lt; 0 ||</div><div class='del'>-				req-&gt;start &gt; req-&gt;end || req-&gt;end &gt;= (virtual_mode ? VTX_VIRTUALSIZE : VTX_PAGESIZE))</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			if(copy_to_user(req-&gt;buffer, &amp;t-&gt;vdau[req-&gt;pgbuf].pgbuf[req-&gt;start], req-&gt;end - req-&gt;start + 1))</div><div class='add'>+	case VTXIOCGETPAGE:</div><div class='add'>+	{</div><div class='add'>+		vtx_pagereq_t *req = arg;</div><div class='add'>+		int start, end;</div><div class='add'>+</div><div class='add'>+		if (req-&gt;pgbuf &lt; 0 || req-&gt;pgbuf &gt;= NUM_DAUS || req-&gt;start &lt; 0 ||</div><div class='add'>+			req-&gt;start &gt; req-&gt;end || req-&gt;end &gt;= (virtual_mode ? VTX_VIRTUALSIZE : VTX_PAGESIZE))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (copy_to_user(req-&gt;buffer, &amp;t-&gt;vdau[req-&gt;pgbuf].pgbuf[req-&gt;start], req-&gt;end - req-&gt;start + 1))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+</div><div class='add'>+		 /*</div><div class='add'>+		  *	Always read the time directly from SAA5249</div><div class='add'>+		  */</div><div class='add'>+</div><div class='add'>+		if (req-&gt;start &lt;= 39 &amp;&amp; req-&gt;end &gt;= 32) {</div><div class='add'>+			int len;</div><div class='add'>+			char buf[16];</div><div class='add'>+			start = max(req-&gt;start, 32);</div><div class='add'>+			end = min(req-&gt;end, 39);</div><div class='add'>+			len = end - start + 1;</div><div class='add'>+			if (i2c_senddata(t, 8, 0, 0, start, -1) ||</div><div class='add'>+				i2c_getdata(t, len, buf))</div><div class='add'>+				return -EIO;</div><div class='add'>+			if (copy_to_user(req-&gt;buffer + start - req-&gt;start, buf, len))</div><div class='add'>+				return -EFAULT;</div><div class='add'>+		}</div><div class='add'>+		/* Insert the current header if DAU is still searching for a page */</div><div class='add'>+		if (req-&gt;start &lt;= 31 &amp;&amp; req-&gt;end &gt;= 7 &amp;&amp; t-&gt;is_searching[req-&gt;pgbuf]) {</div><div class='add'>+			char buf[32];</div><div class='add'>+			int len;</div><div class='add'>+</div><div class='add'>+			start = max(req-&gt;start, 7);</div><div class='add'>+			end = min(req-&gt;end, 31);</div><div class='add'>+			len = end - start + 1;</div><div class='add'>+			if (i2c_senddata(t, 8, 0, 0, start, -1) ||</div><div class='add'>+				i2c_getdata(t, len, buf))</div><div class='add'>+				return -EIO;</div><div class='add'>+			if (copy_to_user(req-&gt;buffer + start - req-&gt;start, buf, len))</div><div class='ctx'> 				return -EFAULT;</div><div class='del'>-</div><div class='del'>-			 /*</div><div class='del'>-			  *	Always read the time directly from SAA5249</div><div class='del'>-			  */</div><div class='del'>-</div><div class='del'>-			if (req-&gt;start &lt;= 39 &amp;&amp; req-&gt;end &gt;= 32)</div><div class='del'>-			{</div><div class='del'>-				int len;</div><div class='del'>-				char buf[16];</div><div class='del'>-				start = max(req-&gt;start, 32);</div><div class='del'>-				end = min(req-&gt;end, 39);</div><div class='del'>-				len=end-start+1;</div><div class='del'>-				if (i2c_senddata(t, 8, 0, 0, start, -1) ||</div><div class='del'>-					i2c_getdata(t, len, buf))</div><div class='del'>-					return -EIO;</div><div class='del'>-				if(copy_to_user(req-&gt;buffer+start-req-&gt;start, buf, len))</div><div class='del'>-					return -EFAULT;</div><div class='del'>-			}</div><div class='del'>-			/* Insert the current header if DAU is still searching for a page */</div><div class='del'>-			if (req-&gt;start &lt;= 31 &amp;&amp; req-&gt;end &gt;= 7 &amp;&amp; t-&gt;is_searching[req-&gt;pgbuf])</div><div class='del'>-			{</div><div class='del'>-				char buf[32];</div><div class='del'>-				int len;</div><div class='del'>-				start = max(req-&gt;start, 7);</div><div class='del'>-				end = min(req-&gt;end, 31);</div><div class='del'>-				len=end-start+1;</div><div class='del'>-				if (i2c_senddata(t, 8, 0, 0, start, -1) ||</div><div class='del'>-					i2c_getdata(t, len, buf))</div><div class='del'>-					return -EIO;</div><div class='del'>-				if(copy_to_user(req-&gt;buffer+start-req-&gt;start, buf, len))</div><div class='del'>-					return -EFAULT;</div><div class='del'>-			}</div><div class='del'>-			return 0;</div><div class='ctx'> 		}</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		case VTXIOCSTOPDAU:</div><div class='del'>-		{</div><div class='del'>-			vtx_pagereq_t *req = arg;</div><div class='add'>+	case VTXIOCSTOPDAU:</div><div class='add'>+	{</div><div class='add'>+		vtx_pagereq_t *req = arg;</div><div class='ctx'> </div><div class='del'>-			if (req-&gt;pgbuf &lt; 0 || req-&gt;pgbuf &gt;= NUM_DAUS)</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			t-&gt;vdau[req-&gt;pgbuf].stopped = true;</div><div class='del'>-			t-&gt;is_searching[req-&gt;pgbuf] = false;</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='add'>+		if (req-&gt;pgbuf &lt; 0 || req-&gt;pgbuf &gt;= NUM_DAUS)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		t-&gt;vdau[req-&gt;pgbuf].stopped = true;</div><div class='add'>+		t-&gt;is_searching[req-&gt;pgbuf] = false;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		case VTXIOCPUTPAGE:</div><div class='del'>-		case VTXIOCSETDISP:</div><div class='del'>-		case VTXIOCPUTSTAT:</div><div class='del'>-			return 0;</div><div class='add'>+	case VTXIOCPUTPAGE:</div><div class='add'>+	case VTXIOCSETDISP:</div><div class='add'>+	case VTXIOCPUTSTAT:</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-		case VTXIOCCLRCACHE:</div><div class='del'>-		{</div><div class='del'>-			if (i2c_senddata(t, 0, NUM_DAUS, 0, 8, -1) || i2c_senddata(t, 11,</div><div class='del'>-				' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',</div><div class='del'>-				' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ', -1))</div><div class='del'>-				return -EIO;</div><div class='del'>-			if (i2c_senddata(t, 3, 0x20, -1))</div><div class='del'>-				return -EIO;</div><div class='del'>-			jdelay(10 * CLEAR_DELAY);			/* I have no idea how long we have to wait here */</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='add'>+	case VTXIOCCLRCACHE:</div><div class='add'>+	{</div><div class='add'>+		if (i2c_senddata(t, 0, NUM_DAUS, 0, 8, -1) || i2c_senddata(t, 11,</div><div class='add'>+			' ', ' ', ' ', ' ', ' ', ' ',</div><div class='add'>+			' ', ' ', ' ', ' ', ' ', ' ',</div><div class='add'>+			' ', ' ', ' ', ' ', ' ', ' ',</div><div class='add'>+			' ', ' ', ' ', ' ', ' ', ' ',</div><div class='add'>+			-1))</div><div class='add'>+			return -EIO;</div><div class='add'>+		if (i2c_senddata(t, 3, 0x20, -1))</div><div class='add'>+			return -EIO;</div><div class='add'>+		jdelay(10 * CLEAR_DELAY);			/* I have no idea how long we have to wait here */</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		case VTXIOCSETVIRT:</div><div class='del'>-		{</div><div class='del'>-			/* The SAA5249 has virtual-row reception turned on always */</div><div class='del'>-			t-&gt;virtual_mode = (int)(long)arg;</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='add'>+	case VTXIOCSETVIRT:</div><div class='add'>+	{</div><div class='add'>+		/* The SAA5249 has virtual-row reception turned on always */</div><div class='add'>+		t-&gt;virtual_mode = (int)(long)arg;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='ctx'> 	}</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='hunk'>@@ -616,8 +483,7 @@ static inline unsigned int vtx_fix_command(unsigned int cmd)</div><div class='ctx'> static int saa5249_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 			 unsigned int cmd, unsigned long arg)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *vd = video_devdata(file);</div><div class='del'>-	struct saa5249_device *t=vd-&gt;priv;</div><div class='add'>+	struct saa5249_device *t = video_drvdata(file);</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	cmd = vtx_fix_command(cmd);</div><div class='hunk'>@@ -629,32 +495,27 @@ static int saa5249_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> </div><div class='ctx'> static int saa5249_open(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *vd = video_devdata(file);</div><div class='del'>-	struct saa5249_device *t=vd-&gt;priv;</div><div class='del'>-	int err,pgbuf;</div><div class='add'>+	struct saa5249_device *t = video_drvdata(file);</div><div class='add'>+	int pgbuf;</div><div class='ctx'> </div><div class='del'>-	err = video_exclusive_open(inode,file);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='add'>+	if (t-&gt;client == NULL)</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	if (t-&gt;client==NULL) {</div><div class='del'>-		err = -ENODEV;</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='add'>+	if (test_and_set_bit(0, &amp;t-&gt;in_use))</div><div class='add'>+		return -EBUSY;</div><div class='ctx'> </div><div class='del'>-	if (i2c_senddata(t, 0, 0, -1) ||		/* Select R11 */</div><div class='del'>-						/* Turn off parity checks (we do this ourselves) */</div><div class='add'>+	if (i2c_senddata(t, 0, 0, -1) || /* Select R11 */</div><div class='add'>+		/* Turn off parity checks (we do this ourselves) */</div><div class='ctx'> 		i2c_senddata(t, 1, disp_modes[t-&gt;disp_mode][0], 0, -1) ||</div><div class='del'>-						/* Display TV-picture, no virtual rows */</div><div class='del'>-		i2c_senddata(t, 4, NUM_DAUS, disp_modes[t-&gt;disp_mode][1], disp_modes[t-&gt;disp_mode][2], 7, -1)) /* Set display to page 4 */</div><div class='del'>-</div><div class='add'>+		/* Display TV-picture, no virtual rows */</div><div class='add'>+		i2c_senddata(t, 4, NUM_DAUS, disp_modes[t-&gt;disp_mode][1], disp_modes[t-&gt;disp_mode][2], 7, -1))</div><div class='add'>+		/* Set display to page 4 */</div><div class='ctx'> 	{</div><div class='del'>-		err = -EIO;</div><div class='del'>-		goto fail;</div><div class='add'>+		clear_bit(0, &amp;t-&gt;in_use);</div><div class='add'>+		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (pgbuf = 0; pgbuf &lt; NUM_DAUS; pgbuf++)</div><div class='del'>-	{</div><div class='add'>+	for (pgbuf = 0; pgbuf &lt; NUM_DAUS; pgbuf++) {</div><div class='ctx'> 		memset(t-&gt;vdau[pgbuf].pgbuf, ' ', sizeof(t-&gt;vdau[0].pgbuf));</div><div class='ctx'> 		memset(t-&gt;vdau[pgbuf].sregs, 0, sizeof(t-&gt;vdau[0].sregs));</div><div class='ctx'> 		memset(t-&gt;vdau[pgbuf].laststat, 0, sizeof(t-&gt;vdau[0].laststat));</div><div class='hunk'>@@ -665,39 +526,20 @@ static int saa5249_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	}</div><div class='ctx'> 	t-&gt;virtual_mode = false;</div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='del'>- fail:</div><div class='del'>-	video_exclusive_release(inode,file);</div><div class='del'>-	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static int saa5249_release(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *vd = video_devdata(file);</div><div class='del'>-	struct saa5249_device *t=vd-&gt;priv;</div><div class='add'>+	struct saa5249_device *t = video_drvdata(file);</div><div class='add'>+</div><div class='ctx'> 	i2c_senddata(t, 1, 0x20, -1);		/* Turn off CCT */</div><div class='ctx'> 	i2c_senddata(t, 5, 3, 3, -1);		/* Turn off TV-display */</div><div class='del'>-	video_exclusive_release(inode,file);</div><div class='add'>+	clear_bit(0, &amp;t-&gt;in_use);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init init_saa_5249 (void)</div><div class='del'>-{</div><div class='del'>-	printk(KERN_INFO "SAA5249 driver (" IF_NAME " interface) for VideoText version %d.%d\n",</div><div class='del'>-			VTX_VER_MAJ, VTX_VER_MIN);</div><div class='del'>-	return i2c_add_driver(&amp;i2c_driver_videotext);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit cleanup_saa_5249 (void)</div><div class='del'>-{</div><div class='del'>-	i2c_del_driver(&amp;i2c_driver_videotext);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(init_saa_5249);</div><div class='del'>-module_exit(cleanup_saa_5249);</div><div class='del'>-</div><div class='ctx'> static const struct file_operations saa_fops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.open		= saa5249_open,</div><div class='hunk'>@@ -711,8 +553,84 @@ static const struct file_operations saa_fops = {</div><div class='ctx'> </div><div class='ctx'> static struct video_device saa_template =</div><div class='ctx'> {</div><div class='del'>-	.name		= IF_NAME,</div><div class='add'>+	.name		= "saa5249",</div><div class='ctx'> 	.fops           = &amp;saa_fops,</div><div class='add'>+	.release 	= video_device_release,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='add'>+/* Addresses to scan */</div><div class='add'>+static unsigned short normal_i2c[] = { 0x22 &gt;&gt; 1, I2C_CLIENT_END };</div><div class='add'>+</div><div class='add'>+I2C_CLIENT_INSMOD;</div><div class='add'>+</div><div class='add'>+static int saa5249_probe(struct i2c_client *client,</div><div class='add'>+			const struct i2c_device_id *id)</div><div class='add'>+{</div><div class='add'>+	int pgbuf;</div><div class='add'>+	int err;</div><div class='add'>+	struct video_device *vd;</div><div class='add'>+	struct saa5249_device *t;</div><div class='add'>+</div><div class='add'>+	v4l_info(client, "chip found @ 0x%x (%s)\n",</div><div class='add'>+			client-&gt;addr &lt;&lt; 1, client-&gt;adapter-&gt;name);</div><div class='add'>+	v4l_info(client, "VideoText version %d.%d\n",</div><div class='add'>+			VTX_VER_MAJ, VTX_VER_MIN);</div><div class='add'>+	t = kzalloc(sizeof(*t), GFP_KERNEL);</div><div class='add'>+	if (t == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	mutex_init(&amp;t-&gt;lock);</div><div class='add'>+</div><div class='add'>+	/* Now create a video4linux device */</div><div class='add'>+	vd = kmalloc(sizeof(struct video_device), GFP_KERNEL);</div><div class='add'>+	if (vd == NULL) {</div><div class='add'>+		kfree(client);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	i2c_set_clientdata(client, vd);</div><div class='add'>+	memcpy(vd, &amp;saa_template, sizeof(*vd));</div><div class='add'>+</div><div class='add'>+	for (pgbuf = 0; pgbuf &lt; NUM_DAUS; pgbuf++) {</div><div class='add'>+		memset(t-&gt;vdau[pgbuf].pgbuf, ' ', sizeof(t-&gt;vdau[0].pgbuf));</div><div class='add'>+		memset(t-&gt;vdau[pgbuf].sregs, 0, sizeof(t-&gt;vdau[0].sregs));</div><div class='add'>+		memset(t-&gt;vdau[pgbuf].laststat, 0, sizeof(t-&gt;vdau[0].laststat));</div><div class='add'>+		t-&gt;vdau[pgbuf].expire = 0;</div><div class='add'>+		t-&gt;vdau[pgbuf].clrfound = true;</div><div class='add'>+		t-&gt;vdau[pgbuf].stopped = true;</div><div class='add'>+		t-&gt;is_searching[pgbuf] = false;</div><div class='add'>+	}</div><div class='add'>+	video_set_drvdata(vd, t);</div><div class='add'>+</div><div class='add'>+	/* Register it */</div><div class='add'>+	err = video_register_device(vd, VFL_TYPE_VTX, -1);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		kfree(t);</div><div class='add'>+		kfree(vd);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+	t-&gt;client = client;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int saa5249_remove(struct i2c_client *client)</div><div class='add'>+{</div><div class='add'>+	struct video_device *vd = i2c_get_clientdata(client);</div><div class='add'>+</div><div class='add'>+	video_unregister_device(vd);</div><div class='add'>+	kfree(video_get_drvdata(vd));</div><div class='add'>+	kfree(vd);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct i2c_device_id saa5249_id[] = {</div><div class='add'>+	{ "saa5249", 0 },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(i2c, saa5249_id);</div><div class='add'>+</div><div class='add'>+static struct v4l2_i2c_driver_data v4l2_i2c_data = {</div><div class='add'>+	.name = "saa5249",</div><div class='add'>+	.driverid = I2C_DRIVERID_SAA5249,</div><div class='add'>+	.probe = saa5249_probe,</div><div class='add'>+	.remove = saa5249_remove,</div><div class='add'>+	.id_table = saa5249_id,</div><div class='add'>+};</div><div class='head'>diff --git a/drivers/media/video/saa7110.c b/drivers/media/video/saa7110.c<br/>index 4aa82b310708..adf2ba79496a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/saa7110.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/saa7110.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/saa7110.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/saa7110.c</a></div><div class='hunk'>@@ -31,36 +31,24 @@</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/videodev.h&gt;</div><div class='add'>+#include &lt;linux/video_decoder.h&gt;</div><div class='add'>+#include &lt;media/v4l2-common.h&gt;</div><div class='add'>+#include &lt;media/v4l2-i2c-drv-legacy.h&gt;</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("Philips SAA7110 video decoder driver");</div><div class='ctx'> MODULE_AUTHOR("Pauline Middelink");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/i2c.h&gt;</div><div class='del'>-</div><div class='del'>-#define I2C_NAME(s) (s)-&gt;name</div><div class='del'>-</div><div class='del'>-#include &lt;linux/videodev.h&gt;</div><div class='del'>-#include &lt;media/v4l2-common.h&gt;</div><div class='del'>-#include &lt;linux/video_decoder.h&gt;</div><div class='del'>-</div><div class='ctx'> static int debug;</div><div class='ctx'> module_param(debug, int, 0);</div><div class='ctx'> MODULE_PARM_DESC(debug, "Debug level (0-1)");</div><div class='ctx'> </div><div class='del'>-#define dprintk(num, format, args...) \</div><div class='del'>-	do { \</div><div class='del'>-		if (debug &gt;= num) \</div><div class='del'>-			printk(format, ##args); \</div><div class='del'>-	} while (0)</div><div class='del'>-</div><div class='ctx'> #define SAA7110_MAX_INPUT	9	/* 6 CVBS, 3 SVHS */</div><div class='ctx'> #define SAA7110_MAX_OUTPUT	0	/* its a decoder only */</div><div class='ctx'> </div><div class='del'>-#define	I2C_SAA7110		0x9C	/* or 0x9E */</div><div class='del'>-</div><div class='ctx'> #define SAA7110_NR_REG		0x35</div><div class='ctx'> </div><div class='ctx'> struct saa7110 {</div><div class='hunk'>@@ -81,10 +69,7 @@ struct saa7110 {</div><div class='ctx'> /* I2C support functions						   */</div><div class='ctx'> /* ----------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-saa7110_write (struct i2c_client *client,</div><div class='del'>-	       u8                 reg,</div><div class='del'>-	       u8                 value)</div><div class='add'>+static int saa7110_write(struct i2c_client *client, u8 reg, u8 value)</div><div class='ctx'> {</div><div class='ctx'> 	struct saa7110 *decoder = i2c_get_clientdata(client);</div><div class='ctx'> </div><div class='hunk'>@@ -92,10 +77,7 @@ saa7110_write (struct i2c_client *client,</div><div class='ctx'> 	return i2c_smbus_write_byte_data(client, reg, value);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-saa7110_write_block (struct i2c_client *client,</div><div class='del'>-		     const u8          *data,</div><div class='del'>-		     unsigned int       len)</div><div class='add'>+static int saa7110_write_block(struct i2c_client *client, const u8 *data, unsigned int len)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = -1;</div><div class='ctx'> 	u8 reg = *data;		/* first register to write to */</div><div class='hunk'>@@ -115,8 +97,8 @@ saa7110_write_block (struct i2c_client *client,</div><div class='ctx'> 		memcpy(decoder-&gt;reg + reg, data + 1, len - 1);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		for (++data, --len; len; len--) {</div><div class='del'>-			if ((ret = saa7110_write(client, reg++,</div><div class='del'>-						 *data++)) &lt; 0)</div><div class='add'>+			ret = saa7110_write(client, reg++, *data++);</div><div class='add'>+			if (ret &lt; 0)</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -124,8 +106,7 @@ saa7110_write_block (struct i2c_client *client,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int</div><div class='del'>-saa7110_read (struct i2c_client *client)</div><div class='add'>+static inline int saa7110_read(struct i2c_client *client)</div><div class='ctx'> {</div><div class='ctx'> 	return i2c_smbus_read_byte(client);</div><div class='ctx'> }</div><div class='hunk'>@@ -138,9 +119,7 @@ saa7110_read (struct i2c_client *client)</div><div class='ctx'> #define FRESP_06H_SVIDEO 0x83	//0xC0</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-saa7110_selmux (struct i2c_client *client,</div><div class='del'>-		int                chan)</div><div class='add'>+static int saa7110_selmux(struct i2c_client *client, int chan)</div><div class='ctx'> {</div><div class='ctx'> 	static const unsigned char modes[9][8] = {</div><div class='ctx'> 		/* mode 0 */</div><div class='hunk'>@@ -197,8 +176,7 @@ static const unsigned char initseq[1 + SAA7110_NR_REG] = {</div><div class='ctx'> 	/* 0x30 */ 0x44, 0x71, 0x02, 0x8C, 0x02</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-determine_norm (struct i2c_client *client)</div><div class='add'>+static int determine_norm(struct i2c_client *client)</div><div class='ctx'> {</div><div class='ctx'> 	DEFINE_WAIT(wait);</div><div class='ctx'> 	struct saa7110 *decoder = i2c_get_clientdata(client);</div><div class='hunk'>@@ -212,29 +190,23 @@ determine_norm (struct i2c_client *client)</div><div class='ctx'> 	finish_wait(&amp;decoder-&gt;wq, &amp;wait);</div><div class='ctx'> 	status = saa7110_read(client);</div><div class='ctx'> 	if (status &amp; 0x40) {</div><div class='del'>-		dprintk(1, KERN_INFO "%s: status=0x%02x (no signal)\n",</div><div class='del'>-			I2C_NAME(client), status);</div><div class='add'>+		v4l_dbg(1, debug, client, "status=0x%02x (no signal)\n", status);</div><div class='ctx'> 		return decoder-&gt;norm;	// no change</div><div class='ctx'> 	}</div><div class='ctx'> 	if ((status &amp; 3) == 0) {</div><div class='ctx'> 		saa7110_write(client, 0x06, 0x83);</div><div class='ctx'> 		if (status &amp; 0x20) {</div><div class='del'>-			dprintk(1,</div><div class='del'>-				KERN_INFO</div><div class='del'>-				"%s: status=0x%02x (NTSC/no color)\n",</div><div class='del'>-				I2C_NAME(client), status);</div><div class='add'>+			v4l_dbg(1, debug, client, "status=0x%02x (NTSC/no color)\n", status);</div><div class='ctx'> 			//saa7110_write(client,0x2E,0x81);</div><div class='ctx'> 			return VIDEO_MODE_NTSC;</div><div class='ctx'> 		}</div><div class='del'>-		dprintk(1, KERN_INFO "%s: status=0x%02x (PAL/no color)\n",</div><div class='del'>-			I2C_NAME(client), status);</div><div class='add'>+		v4l_dbg(1, debug, client, "status=0x%02x (PAL/no color)\n", status);</div><div class='ctx'> 		//saa7110_write(client,0x2E,0x9A);</div><div class='ctx'> 		return VIDEO_MODE_PAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	//saa7110_write(client,0x06,0x03);</div><div class='ctx'> 	if (status &amp; 0x20) {	/* 60Hz */</div><div class='del'>-		dprintk(1, KERN_INFO "%s: status=0x%02x (NTSC)\n",</div><div class='del'>-			I2C_NAME(client), status);</div><div class='add'>+		v4l_dbg(1, debug, client, "status=0x%02x (NTSC)\n", status);</div><div class='ctx'> 		saa7110_write(client, 0x0D, 0x86);</div><div class='ctx'> 		saa7110_write(client, 0x0F, 0x50);</div><div class='ctx'> 		saa7110_write(client, 0x11, 0x2C);</div><div class='hunk'>@@ -254,13 +226,11 @@ determine_norm (struct i2c_client *client)</div><div class='ctx'> </div><div class='ctx'> 	status = saa7110_read(client);</div><div class='ctx'> 	if ((status &amp; 0x03) == 0x01) {</div><div class='del'>-		dprintk(1, KERN_INFO "%s: status=0x%02x (SECAM)\n",</div><div class='del'>-			I2C_NAME(client), status);</div><div class='add'>+		v4l_dbg(1, debug, client, "status=0x%02x (SECAM)\n", status);</div><div class='ctx'> 		saa7110_write(client, 0x0D, 0x87);</div><div class='ctx'> 		return VIDEO_MODE_SECAM;</div><div class='ctx'> 	}</div><div class='del'>-	dprintk(1, KERN_INFO "%s: status=0x%02x (PAL)\n", I2C_NAME(client),</div><div class='del'>-		status);</div><div class='add'>+	v4l_dbg(1, debug, client, "status=0x%02x (PAL)\n", status);</div><div class='ctx'> 	return VIDEO_MODE_PAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -286,8 +256,8 @@ saa7110_command (struct i2c_client *client,</div><div class='ctx'> 		    VIDEO_DECODER_SECAM | VIDEO_DECODER_AUTO;</div><div class='ctx'> 		dc-&gt;inputs = SAA7110_MAX_INPUT;</div><div class='ctx'> 		dc-&gt;outputs = SAA7110_MAX_OUTPUT;</div><div class='del'>-	}</div><div class='ctx'> 		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	case DECODER_GET_STATUS:</div><div class='ctx'> 	{</div><div class='hunk'>@@ -295,8 +265,8 @@ saa7110_command (struct i2c_client *client,</div><div class='ctx'> 		int res = 0;</div><div class='ctx'> </div><div class='ctx'> 		status = saa7110_read(client);</div><div class='del'>-		dprintk(1, KERN_INFO "%s: status=0x%02x norm=%d\n",</div><div class='del'>-			I2C_NAME(client), status, decoder-&gt;norm);</div><div class='add'>+		v4l_dbg(1, debug, client, "status=0x%02x norm=%d\n",</div><div class='add'>+			       status, decoder-&gt;norm);</div><div class='ctx'> 		if (!(status &amp; 0x40))</div><div class='ctx'> 			res |= DECODER_STATUS_GOOD;</div><div class='ctx'> 		if (status &amp; 0x03)</div><div class='hunk'>@@ -314,8 +284,8 @@ saa7110_command (struct i2c_client *client,</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		*(int *) arg = res;</div><div class='del'>-	}</div><div class='ctx'> 		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	case DECODER_SET_NORM:</div><div class='ctx'> 		v = *(int *) arg;</div><div class='hunk'>@@ -328,34 +298,24 @@ saa7110_command (struct i2c_client *client,</div><div class='ctx'> 				saa7110_write(client, 0x0F, 0x50);</div><div class='ctx'> 				saa7110_write(client, 0x11, 0x2C);</div><div class='ctx'> 				//saa7110_write(client, 0x2E, 0x81);</div><div class='del'>-				dprintk(1,</div><div class='del'>-					KERN_INFO "%s: switched to NTSC\n",</div><div class='del'>-					I2C_NAME(client));</div><div class='add'>+				v4l_dbg(1, debug, client, "switched to NTSC\n");</div><div class='ctx'> 				break;</div><div class='ctx'> 			case VIDEO_MODE_PAL:</div><div class='ctx'> 				saa7110_write(client, 0x0D, 0x86);</div><div class='ctx'> 				saa7110_write(client, 0x0F, 0x10);</div><div class='ctx'> 				saa7110_write(client, 0x11, 0x59);</div><div class='ctx'> 				//saa7110_write(client, 0x2E, 0x9A);</div><div class='del'>-				dprintk(1,</div><div class='del'>-					KERN_INFO "%s: switched to PAL\n",</div><div class='del'>-					I2C_NAME(client));</div><div class='add'>+				v4l_dbg(1, debug, client, "switched to PAL\n");</div><div class='ctx'> 				break;</div><div class='ctx'> 			case VIDEO_MODE_SECAM:</div><div class='ctx'> 				saa7110_write(client, 0x0D, 0x87);</div><div class='ctx'> 				saa7110_write(client, 0x0F, 0x10);</div><div class='ctx'> 				saa7110_write(client, 0x11, 0x59);</div><div class='ctx'> 				//saa7110_write(client, 0x2E, 0x9A);</div><div class='del'>-				dprintk(1,</div><div class='del'>-					KERN_INFO</div><div class='del'>-					"%s: switched to SECAM\n",</div><div class='del'>-					I2C_NAME(client));</div><div class='add'>+				v4l_dbg(1, debug, client, "switched to SECAM\n");</div><div class='ctx'> 				break;</div><div class='ctx'> 			case VIDEO_MODE_AUTO:</div><div class='del'>-				dprintk(1,</div><div class='del'>-					KERN_INFO</div><div class='del'>-					"%s: TV standard detection...\n",</div><div class='del'>-					I2C_NAME(client));</div><div class='add'>+				v4l_dbg(1, debug, client, "switched to AUTO\n");</div><div class='ctx'> 				decoder-&gt;norm = determine_norm(client);</div><div class='ctx'> 				*(int *) arg = decoder-&gt;norm;</div><div class='ctx'> 				break;</div><div class='hunk'>@@ -368,15 +328,12 @@ saa7110_command (struct i2c_client *client,</div><div class='ctx'> 	case DECODER_SET_INPUT:</div><div class='ctx'> 		v = *(int *) arg;</div><div class='ctx'> 		if (v &lt; 0 || v &gt; SAA7110_MAX_INPUT) {</div><div class='del'>-			dprintk(1,</div><div class='del'>-				KERN_INFO "%s: input=%d not available\n",</div><div class='del'>-				I2C_NAME(client), v);</div><div class='add'>+			v4l_dbg(1, debug, client, "input=%d not available\n", v);</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (decoder-&gt;input != v) {</div><div class='ctx'> 			saa7110_selmux(client, v);</div><div class='del'>-			dprintk(1, KERN_INFO "%s: switched to input=%d\n",</div><div class='del'>-				I2C_NAME(client), v);</div><div class='add'>+			v4l_dbg(1, debug, client, "switched to input=%d\n", v);</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='hunk'>@@ -392,8 +349,7 @@ saa7110_command (struct i2c_client *client,</div><div class='ctx'> 		if (decoder-&gt;enable != v) {</div><div class='ctx'> 			decoder-&gt;enable = v;</div><div class='ctx'> 			saa7110_write(client, 0x0E, v ? 0x18 : 0x80);</div><div class='del'>-			dprintk(1, KERN_INFO "%s: YUV %s\n", I2C_NAME(client),</div><div class='del'>-				v ? "on" : "off");</div><div class='add'>+			v4l_dbg(1, debug, client, "YUV %s\n", v ? "on" : "off");</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='hunk'>@@ -423,23 +379,23 @@ saa7110_command (struct i2c_client *client,</div><div class='ctx'> 			saa7110_write(client, 0x07,</div><div class='ctx'> 				      (decoder-&gt;hue &gt;&gt; 8) - 128);</div><div class='ctx'> 		}</div><div class='del'>-	}</div><div class='ctx'> 		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	case DECODER_DUMP:</div><div class='add'>+		if (!debug)</div><div class='add'>+			break;</div><div class='ctx'> 		for (v = 0; v &lt; SAA7110_NR_REG; v += 16) {</div><div class='ctx'> 			int j;</div><div class='del'>-			dprintk(1, KERN_DEBUG "%s: %02x:", I2C_NAME(client),</div><div class='del'>-				v);</div><div class='add'>+			v4l_dbg(1, debug, client, "%02x:", v);</div><div class='ctx'> 			for (j = 0; j &lt; 16 &amp;&amp; v + j &lt; SAA7110_NR_REG; j++)</div><div class='del'>-				dprintk(1, " %02x", decoder-&gt;reg[v + j]);</div><div class='del'>-			dprintk(1, "\n");</div><div class='add'>+				printk(KERN_CONT " %02x", decoder-&gt;reg[v + j]);</div><div class='add'>+			printk(KERN_CONT "\n");</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='del'>-		dprintk(1, KERN_INFO "unknown saa7110_command??(%d)\n",</div><div class='del'>-			cmd);</div><div class='add'>+		v4l_dbg(1, debug, client, "unknown command %08x\n", cmd);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -451,55 +407,28 @@ saa7110_command (struct i2c_client *client,</div><div class='ctx'>  * Generic i2c probe</div><div class='ctx'>  * concerning the addresses: i2c wants 7 bit (without the r/w bit), so '&gt;&gt;1'</div><div class='ctx'>  */</div><div class='del'>-static unsigned short normal_i2c[] = {</div><div class='del'>-	I2C_SAA7110 &gt;&gt; 1,</div><div class='del'>-	(I2C_SAA7110 &gt;&gt; 1) + 1,</div><div class='del'>-	I2C_CLIENT_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned short ignore = I2C_CLIENT_END;</div><div class='ctx'> </div><div class='del'>-static struct i2c_client_address_data addr_data = {</div><div class='del'>-	.normal_i2c		= normal_i2c,</div><div class='del'>-	.probe			= &amp;ignore,</div><div class='del'>-	.ignore			= &amp;ignore,</div><div class='del'>-};</div><div class='add'>+static unsigned short normal_i2c[] = { 0x9c &gt;&gt; 1, 0x9e &gt;&gt; 1, I2C_CLIENT_END };</div><div class='ctx'> </div><div class='del'>-static struct i2c_driver i2c_driver_saa7110;</div><div class='add'>+I2C_CLIENT_INSMOD;</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-saa7110_detect_client (struct i2c_adapter *adapter,</div><div class='del'>-		       int                 address,</div><div class='del'>-		       int                 kind)</div><div class='add'>+static int saa7110_probe(struct i2c_client *client,</div><div class='add'>+			const struct i2c_device_id *id)</div><div class='ctx'> {</div><div class='del'>-	struct i2c_client *client;</div><div class='ctx'> 	struct saa7110 *decoder;</div><div class='ctx'> 	int rv;</div><div class='ctx'> </div><div class='del'>-	dprintk(1,</div><div class='del'>-		KERN_INFO</div><div class='del'>-		"saa7110.c: detecting saa7110 client on address 0x%x\n",</div><div class='del'>-		address &lt;&lt; 1);</div><div class='del'>-</div><div class='ctx'> 	/* Check if the adapter supports the needed features */</div><div class='del'>-	if (!i2c_check_functionality</div><div class='del'>-	    (adapter,</div><div class='del'>-	     I2C_FUNC_SMBUS_READ_BYTE | I2C_FUNC_SMBUS_WRITE_BYTE_DATA))</div><div class='del'>-		return 0;</div><div class='add'>+	if (!i2c_check_functionality(client-&gt;adapter,</div><div class='add'>+		I2C_FUNC_SMBUS_READ_BYTE | I2C_FUNC_SMBUS_WRITE_BYTE_DATA))</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);</div><div class='del'>-	if (!client)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	client-&gt;addr = address;</div><div class='del'>-	client-&gt;adapter = adapter;</div><div class='del'>-	client-&gt;driver = &amp;i2c_driver_saa7110;</div><div class='del'>-	strlcpy(I2C_NAME(client), "saa7110", sizeof(I2C_NAME(client)));</div><div class='add'>+	v4l_info(client, "chip found @ 0x%x (%s)\n",</div><div class='add'>+			client-&gt;addr &lt;&lt; 1, client-&gt;adapter-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	decoder = kzalloc(sizeof(struct saa7110), GFP_KERNEL);</div><div class='del'>-	if (!decoder) {</div><div class='del'>-		kfree(client);</div><div class='add'>+	if (!decoder)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	}</div><div class='ctx'> 	decoder-&gt;norm = VIDEO_MODE_PAL;</div><div class='ctx'> 	decoder-&gt;input = 0;</div><div class='ctx'> 	decoder-&gt;enable = 1;</div><div class='hunk'>@@ -510,18 +439,10 @@ saa7110_detect_client (struct i2c_adapter *adapter,</div><div class='ctx'> 	init_waitqueue_head(&amp;decoder-&gt;wq);</div><div class='ctx'> 	i2c_set_clientdata(client, decoder);</div><div class='ctx'> </div><div class='del'>-	rv = i2c_attach_client(client);</div><div class='del'>-	if (rv) {</div><div class='del'>-		kfree(client);</div><div class='del'>-		kfree(decoder);</div><div class='del'>-		return rv;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	rv = saa7110_write_block(client, initseq, sizeof(initseq));</div><div class='del'>-	if (rv &lt; 0)</div><div class='del'>-		dprintk(1, KERN_ERR "%s_attach: init status %d\n",</div><div class='del'>-			I2C_NAME(client), rv);</div><div class='del'>-	else {</div><div class='add'>+	if (rv &lt; 0) {</div><div class='add'>+		v4l_dbg(1, debug, client, "init status %d\n", rv);</div><div class='add'>+	} else {</div><div class='ctx'> 		int ver, status;</div><div class='ctx'> 		saa7110_write(client, 0x21, 0x10);</div><div class='ctx'> 		saa7110_write(client, 0x0e, 0x18);</div><div class='hunk'>@@ -530,10 +451,8 @@ saa7110_detect_client (struct i2c_adapter *adapter,</div><div class='ctx'> 		saa7110_write(client, 0x0D, 0x06);</div><div class='ctx'> 		//mdelay(150);</div><div class='ctx'> 		status = saa7110_read(client);</div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_INFO</div><div class='del'>-			"%s_attach: SAA7110A version %x at 0x%02x, status=0x%02x\n",</div><div class='del'>-			I2C_NAME(client), ver, client-&gt;addr &lt;&lt; 1, status);</div><div class='add'>+		v4l_dbg(1, debug, client, "version %x, status=0x%02x\n",</div><div class='add'>+			       ver, status);</div><div class='ctx'> 		saa7110_write(client, 0x0D, 0x86);</div><div class='ctx'> 		saa7110_write(client, 0x0F, 0x10);</div><div class='ctx'> 		saa7110_write(client, 0x11, 0x59);</div><div class='hunk'>@@ -547,58 +466,25 @@ saa7110_detect_client (struct i2c_adapter *adapter,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-saa7110_attach_adapter (struct i2c_adapter *adapter)</div><div class='del'>-{</div><div class='del'>-	dprintk(1,</div><div class='del'>-		KERN_INFO</div><div class='del'>-		"saa7110.c: starting probe for adapter %s (0x%x)\n",</div><div class='del'>-		I2C_NAME(adapter), adapter-&gt;id);</div><div class='del'>-	return i2c_probe(adapter, &amp;addr_data, &amp;saa7110_detect_client);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-saa7110_detach_client (struct i2c_client *client)</div><div class='add'>+static int saa7110_remove(struct i2c_client *client)</div><div class='ctx'> {</div><div class='del'>-	struct saa7110 *decoder = i2c_get_clientdata(client);</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = i2c_detach_client(client);</div><div class='del'>-	if (err) {</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	kfree(decoder);</div><div class='del'>-	kfree(client);</div><div class='del'>-</div><div class='add'>+	kfree(i2c_get_clientdata(client));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* ----------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='del'>-static struct i2c_driver i2c_driver_saa7110 = {</div><div class='del'>-	.driver = {</div><div class='del'>-		.name = "saa7110",</div><div class='del'>-	},</div><div class='del'>-</div><div class='del'>-	.id = I2C_DRIVERID_SAA7110,</div><div class='add'>+static const struct i2c_device_id saa7110_id[] = {</div><div class='add'>+	{ "saa7110", 0 },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(i2c, saa7110_id);</div><div class='ctx'> </div><div class='del'>-	.attach_adapter = saa7110_attach_adapter,</div><div class='del'>-	.detach_client = saa7110_detach_client,</div><div class='add'>+static struct v4l2_i2c_driver_data v4l2_i2c_data = {</div><div class='add'>+	.name = "saa7110",</div><div class='add'>+	.driverid = I2C_DRIVERID_SAA7110,</div><div class='ctx'> 	.command = saa7110_command,</div><div class='add'>+	.probe = saa7110_probe,</div><div class='add'>+	.remove = saa7110_remove,</div><div class='add'>+	.id_table = saa7110_id,</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init</div><div class='del'>-saa7110_init (void)</div><div class='del'>-{</div><div class='del'>-	return i2c_add_driver(&amp;i2c_driver_saa7110);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit</div><div class='del'>-saa7110_exit (void)</div><div class='del'>-{</div><div class='del'>-	i2c_del_driver(&amp;i2c_driver_saa7110);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(saa7110_init);</div><div class='del'>-module_exit(saa7110_exit);</div><div class='head'>diff --git a/drivers/media/video/saa7111.c b/drivers/media/video/saa7111.c<br/>index 96c3d4357722..a4738a2fb4d3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/saa7111.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/saa7111.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/saa7111.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/saa7111.c</a></div><div class='hunk'>@@ -28,43 +28,24 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/fs.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/major.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/i2c.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/pgtable.h&gt;</div><div class='del'>-#include &lt;asm/page.h&gt;</div><div class='add'>+#include &lt;linux/ioctl.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='del'>-</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/i2c-id.h&gt;</div><div class='ctx'> #include &lt;linux/videodev.h&gt;</div><div class='ctx'> #include &lt;linux/video_decoder.h&gt;</div><div class='add'>+#include &lt;media/v4l2-common.h&gt;</div><div class='add'>+#include &lt;media/v4l2-i2c-drv-legacy.h&gt;</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("Philips SAA7111 video decoder driver");</div><div class='ctx'> MODULE_AUTHOR("Dave Perks");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-#define I2C_NAME(s) (s)-&gt;name</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> static int debug;</div><div class='ctx'> module_param(debug, int, 0644);</div><div class='ctx'> MODULE_PARM_DESC(debug, "Debug level (0-1)");</div><div class='ctx'> </div><div class='del'>-#define dprintk(num, format, args...) \</div><div class='del'>-	do { \</div><div class='del'>-		if (debug &gt;= num) \</div><div class='del'>-			printk(format, ##args); \</div><div class='del'>-	} while (0)</div><div class='del'>-</div><div class='ctx'> /* ----------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='ctx'> #define SAA7111_NR_REG		0x18</div><div class='hunk'>@@ -77,14 +58,9 @@ struct saa7111 {</div><div class='ctx'> 	int enable;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define   I2C_SAA7111        0x48</div><div class='del'>-</div><div class='ctx'> /* ----------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='del'>-static inline int</div><div class='del'>-saa7111_write (struct i2c_client *client,</div><div class='del'>-	       u8                 reg,</div><div class='del'>-	       u8                 value)</div><div class='add'>+static inline int saa7111_write(struct i2c_client *client, u8 reg, u8 value)</div><div class='ctx'> {</div><div class='ctx'> 	struct saa7111 *decoder = i2c_get_clientdata(client);</div><div class='ctx'> </div><div class='hunk'>@@ -92,8 +68,7 @@ saa7111_write (struct i2c_client *client,</div><div class='ctx'> 	return i2c_smbus_write_byte_data(client, reg, value);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void</div><div class='del'>-saa7111_write_if_changed(struct i2c_client *client, u8 reg, u8 value)</div><div class='add'>+static inline void saa7111_write_if_changed(struct i2c_client *client, u8 reg, u8 value)</div><div class='ctx'> {</div><div class='ctx'> 	struct saa7111 *decoder = i2c_get_clientdata(client);</div><div class='ctx'> </div><div class='hunk'>@@ -103,10 +78,7 @@ saa7111_write_if_changed(struct i2c_client *client, u8 reg, u8 value)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-saa7111_write_block (struct i2c_client *client,</div><div class='del'>-		     const u8          *data,</div><div class='del'>-		     unsigned int       len)</div><div class='add'>+static int saa7111_write_block(struct i2c_client *client, const u8 *data, unsigned int len)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = -1;</div><div class='ctx'> 	u8 reg;</div><div class='hunk'>@@ -127,18 +99,17 @@ saa7111_write_block (struct i2c_client *client,</div><div class='ctx'> 				    decoder-&gt;reg[reg++] = data[1];</div><div class='ctx'> 				len -= 2;</div><div class='ctx'> 				data += 2;</div><div class='del'>-			} while (len &gt;= 2 &amp;&amp; data[0] == reg &amp;&amp;</div><div class='del'>-				 block_len &lt; 32);</div><div class='del'>-			if ((ret = i2c_master_send(client, block_data,</div><div class='del'>-						   block_len)) &lt; 0)</div><div class='add'>+			} while (len &gt;= 2 &amp;&amp; data[0] == reg &amp;&amp; block_len &lt; 32);</div><div class='add'>+			ret = i2c_master_send(client, block_data, block_len);</div><div class='add'>+			if (ret &lt; 0)</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* do some slow I2C emulation kind of thing */</div><div class='ctx'> 		while (len &gt;= 2) {</div><div class='ctx'> 			reg = *data++;</div><div class='del'>-			if ((ret = saa7111_write(client, reg,</div><div class='del'>-						 *data++)) &lt; 0)</div><div class='add'>+			ret = saa7111_write(client, reg, *data++);</div><div class='add'>+			if (ret &lt; 0)</div><div class='ctx'> 				break;</div><div class='ctx'> 			len -= 2;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -147,16 +118,13 @@ saa7111_write_block (struct i2c_client *client,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-saa7111_init_decoder (struct i2c_client *client,</div><div class='del'>-	      struct video_decoder_init *init)</div><div class='add'>+static int saa7111_init_decoder(struct i2c_client *client,</div><div class='add'>+		struct video_decoder_init *init)</div><div class='ctx'> {</div><div class='ctx'> 	return saa7111_write_block(client, init-&gt;data, init-&gt;len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int</div><div class='del'>-saa7111_read (struct i2c_client *client,</div><div class='del'>-	      u8                 reg)</div><div class='add'>+static inline int saa7111_read(struct i2c_client *client, u8 reg)</div><div class='ctx'> {</div><div class='ctx'> 	return i2c_smbus_read_byte_data(client, reg);</div><div class='ctx'> }</div><div class='hunk'>@@ -203,28 +171,23 @@ static const unsigned char saa7111_i2c_init[] = {</div><div class='ctx'> 	0x17, 0x00,		/* 17 - VBI */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-saa7111_command (struct i2c_client *client,</div><div class='del'>-		 unsigned int       cmd,</div><div class='del'>-		 void              *arg)</div><div class='add'>+static int saa7111_command(struct i2c_client *client, unsigned cmd, void *arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct saa7111 *decoder = i2c_get_clientdata(client);</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='del'>-</div><div class='ctx'> 	case 0:</div><div class='ctx'> 		break;</div><div class='ctx'> 	case DECODER_INIT:</div><div class='ctx'> 	{</div><div class='ctx'> 		struct video_decoder_init *init = arg;</div><div class='add'>+		struct video_decoder_init vdi;</div><div class='add'>+</div><div class='ctx'> 		if (NULL != init)</div><div class='ctx'> 			return saa7111_init_decoder(client, init);</div><div class='del'>-		else {</div><div class='del'>-			struct video_decoder_init vdi;</div><div class='del'>-			vdi.data = saa7111_i2c_init;</div><div class='del'>-			vdi.len = sizeof(saa7111_i2c_init);</div><div class='del'>-			return saa7111_init_decoder(client, &amp;vdi);</div><div class='del'>-		}</div><div class='add'>+		vdi.data = saa7111_i2c_init;</div><div class='add'>+		vdi.len = sizeof(saa7111_i2c_init);</div><div class='add'>+		return saa7111_init_decoder(client, &amp;vdi);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	case DECODER_DUMP:</div><div class='hunk'>@@ -234,15 +197,15 @@ saa7111_command (struct i2c_client *client,</div><div class='ctx'> 		for (i = 0; i &lt; SAA7111_NR_REG; i += 16) {</div><div class='ctx'> 			int j;</div><div class='ctx'> </div><div class='del'>-			printk(KERN_DEBUG "%s: %03x", I2C_NAME(client), i);</div><div class='add'>+			v4l_info(client, "%03x", i);</div><div class='ctx'> 			for (j = 0; j &lt; 16 &amp;&amp; i + j &lt; SAA7111_NR_REG; ++j) {</div><div class='del'>-				printk(" %02x",</div><div class='add'>+				printk(KERN_CONT " %02x",</div><div class='ctx'> 				       saa7111_read(client, i + j));</div><div class='ctx'> 			}</div><div class='del'>-			printk("\n");</div><div class='add'>+			printk(KERN_CONT "\n");</div><div class='ctx'> 		}</div><div class='del'>-	}</div><div class='ctx'> 		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	case DECODER_GET_CAPABILITIES:</div><div class='ctx'> 	{</div><div class='hunk'>@@ -255,8 +218,8 @@ saa7111_command (struct i2c_client *client,</div><div class='ctx'> 			     VIDEO_DECODER_CCIR;</div><div class='ctx'> 		cap-&gt;inputs = 8;</div><div class='ctx'> 		cap-&gt;outputs = 1;</div><div class='del'>-	}</div><div class='ctx'> 		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	case DECODER_GET_STATUS:</div><div class='ctx'> 	{</div><div class='hunk'>@@ -265,8 +228,7 @@ saa7111_command (struct i2c_client *client,</div><div class='ctx'> 		int res;</div><div class='ctx'> </div><div class='ctx'> 		status = saa7111_read(client, 0x1f);</div><div class='del'>-		dprintk(1, KERN_DEBUG "%s status: 0x%02x\n", I2C_NAME(client),</div><div class='del'>-			status);</div><div class='add'>+		v4l_dbg(1, debug, client, "status: 0x%02x\n", status);</div><div class='ctx'> 		res = 0;</div><div class='ctx'> 		if ((status &amp; (1 &lt;&lt; 6)) == 0) {</div><div class='ctx'> 			res |= DECODER_STATUS_GOOD;</div><div class='hunk'>@@ -294,8 +256,8 @@ saa7111_command (struct i2c_client *client,</div><div class='ctx'> 			res |= DECODER_STATUS_COLOR;</div><div class='ctx'> 		}</div><div class='ctx'> 		*iarg = res;</div><div class='del'>-	}</div><div class='ctx'> 		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	case DECODER_SET_GPIO:</div><div class='ctx'> 	{</div><div class='hunk'>@@ -362,8 +324,8 @@ saa7111_command (struct i2c_client *client,</div><div class='ctx'> </div><div class='ctx'> 		}</div><div class='ctx'> 		decoder-&gt;norm = *iarg;</div><div class='del'>-	}</div><div class='ctx'> 		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	case DECODER_SET_INPUT:</div><div class='ctx'> 	{</div><div class='hunk'>@@ -387,8 +349,8 @@ saa7111_command (struct i2c_client *client,</div><div class='ctx'> 							     3) ? 0x80 :</div><div class='ctx'> 							    0));</div><div class='ctx'> 		}</div><div class='del'>-	}</div><div class='ctx'> 		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	case DECODER_SET_OUTPUT:</div><div class='ctx'> 	{</div><div class='hunk'>@@ -398,8 +360,8 @@ saa7111_command (struct i2c_client *client,</div><div class='ctx'> 		if (*iarg != 0) {</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='del'>-	}</div><div class='ctx'> 		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	case DECODER_ENABLE_OUTPUT:</div><div class='ctx'> 	{</div><div class='hunk'>@@ -439,8 +401,8 @@ saa7111_command (struct i2c_client *client,</div><div class='ctx'> 					      (decoder-&gt;reg[0x11] &amp; 0xf3));</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-	}</div><div class='ctx'> 		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	case DECODER_SET_PICTURE:</div><div class='ctx'> 	{</div><div class='hunk'>@@ -454,8 +416,8 @@ saa7111_command (struct i2c_client *client,</div><div class='ctx'> 		saa7111_write(client, 0x0c, pic-&gt;colour &gt;&gt; 9);</div><div class='ctx'> 		/* We want -128 to 127 we get 0-65535 */</div><div class='ctx'> 		saa7111_write(client, 0x0d, (pic-&gt;hue - 32768) &gt;&gt; 8);</div><div class='del'>-	}</div><div class='ctx'> 		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -466,48 +428,23 @@ saa7111_command (struct i2c_client *client,</div><div class='ctx'> </div><div class='ctx'> /* ----------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Generic i2c probe</div><div class='del'>- * concerning the addresses: i2c wants 7 bit (without the r/w bit), so '&gt;&gt;1'</div><div class='del'>- */</div><div class='del'>-static unsigned short normal_i2c[] = { I2C_SAA7111 &gt;&gt; 1, I2C_CLIENT_END };</div><div class='del'>-</div><div class='del'>-static unsigned short ignore = I2C_CLIENT_END;</div><div class='del'>-</div><div class='del'>-static struct i2c_client_address_data addr_data = {</div><div class='del'>-	.normal_i2c		= normal_i2c,</div><div class='del'>-	.probe			= &amp;ignore,</div><div class='del'>-	.ignore			= &amp;ignore,</div><div class='del'>-};</div><div class='add'>+static unsigned short normal_i2c[] = { 0x48 &gt;&gt; 1, I2C_CLIENT_END };</div><div class='ctx'> </div><div class='del'>-static struct i2c_driver i2c_driver_saa7111;</div><div class='add'>+I2C_CLIENT_INSMOD;</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-saa7111_detect_client (struct i2c_adapter *adapter,</div><div class='del'>-		       int                 address,</div><div class='del'>-		       int                 kind)</div><div class='add'>+static int saa7111_probe(struct i2c_client *client,</div><div class='add'>+			const struct i2c_device_id *id)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='del'>-	struct i2c_client *client;</div><div class='ctx'> 	struct saa7111 *decoder;</div><div class='ctx'> 	struct video_decoder_init vdi;</div><div class='ctx'> </div><div class='del'>-	dprintk(1,</div><div class='del'>-		KERN_INFO</div><div class='del'>-		"saa7111.c: detecting saa7111 client on address 0x%x\n",</div><div class='del'>-		address &lt;&lt; 1);</div><div class='del'>-</div><div class='ctx'> 	/* Check if the adapter supports the needed features */</div><div class='del'>-	if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))</div><div class='del'>-		return 0;</div><div class='add'>+	if (!i2c_check_functionality(client-&gt;adapter, I2C_FUNC_SMBUS_BYTE_DATA))</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);</div><div class='del'>-	if (!client)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	client-&gt;addr = address;</div><div class='del'>-	client-&gt;adapter = adapter;</div><div class='del'>-	client-&gt;driver = &amp;i2c_driver_saa7111;</div><div class='del'>-	strlcpy(I2C_NAME(client), "saa7111", sizeof(I2C_NAME(client)));</div><div class='add'>+	v4l_info(client, "chip found @ 0x%x (%s)\n",</div><div class='add'>+			client-&gt;addr &lt;&lt; 1, client-&gt;adapter-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	decoder = kzalloc(sizeof(struct saa7111), GFP_KERNEL);</div><div class='ctx'> 	if (decoder == NULL) {</div><div class='hunk'>@@ -519,82 +456,37 @@ saa7111_detect_client (struct i2c_adapter *adapter,</div><div class='ctx'> 	decoder-&gt;enable = 1;</div><div class='ctx'> 	i2c_set_clientdata(client, decoder);</div><div class='ctx'> </div><div class='del'>-	i = i2c_attach_client(client);</div><div class='del'>-	if (i) {</div><div class='del'>-		kfree(client);</div><div class='del'>-		kfree(decoder);</div><div class='del'>-		return i;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	vdi.data = saa7111_i2c_init;</div><div class='ctx'> 	vdi.len = sizeof(saa7111_i2c_init);</div><div class='ctx'> 	i = saa7111_init_decoder(client, &amp;vdi);</div><div class='ctx'> 	if (i &lt; 0) {</div><div class='del'>-		dprintk(1, KERN_ERR "%s_attach error: init status %d\n",</div><div class='del'>-			I2C_NAME(client), i);</div><div class='add'>+		v4l_dbg(1, debug, client, "init status %d\n", i);</div><div class='ctx'> 	} else {</div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_INFO</div><div class='del'>-			"%s_attach: chip version %x at address 0x%x\n",</div><div class='del'>-			I2C_NAME(client), saa7111_read(client, 0x00) &gt;&gt; 4,</div><div class='del'>-			client-&gt;addr &lt;&lt; 1);</div><div class='add'>+		v4l_dbg(1, debug, client, "revision %x\n",</div><div class='add'>+			saa7111_read(client, 0x00) &gt;&gt; 4);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-saa7111_attach_adapter (struct i2c_adapter *adapter)</div><div class='add'>+static int saa7111_remove(struct i2c_client *client)</div><div class='ctx'> {</div><div class='del'>-	dprintk(1,</div><div class='del'>-		KERN_INFO</div><div class='del'>-		"saa7111.c: starting probe for adapter %s (0x%x)\n",</div><div class='del'>-		I2C_NAME(adapter), adapter-&gt;id);</div><div class='del'>-	return i2c_probe(adapter, &amp;addr_data, &amp;saa7111_detect_client);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-saa7111_detach_client (struct i2c_client *client)</div><div class='del'>-{</div><div class='del'>-	struct saa7111 *decoder = i2c_get_clientdata(client);</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = i2c_detach_client(client);</div><div class='del'>-	if (err) {</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	kfree(decoder);</div><div class='del'>-	kfree(client);</div><div class='del'>-</div><div class='add'>+	kfree(i2c_get_clientdata(client));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* ----------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='del'>-static struct i2c_driver i2c_driver_saa7111 = {</div><div class='del'>-	.driver = {</div><div class='del'>-		.name = "saa7111",</div><div class='del'>-	},</div><div class='del'>-</div><div class='del'>-	.id = I2C_DRIVERID_SAA7111A,</div><div class='add'>+static const struct i2c_device_id saa7111_id[] = {</div><div class='add'>+	{ "saa7111_old", 0 },	/* "saa7111" maps to the saa7115 driver */</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(i2c, saa7111_id);</div><div class='ctx'> </div><div class='del'>-	.attach_adapter = saa7111_attach_adapter,</div><div class='del'>-	.detach_client = saa7111_detach_client,</div><div class='add'>+static struct v4l2_i2c_driver_data v4l2_i2c_data = {</div><div class='add'>+	.name = "saa7111",</div><div class='add'>+	.driverid = I2C_DRIVERID_SAA7111A,</div><div class='ctx'> 	.command = saa7111_command,</div><div class='add'>+	.probe = saa7111_probe,</div><div class='add'>+	.remove = saa7111_remove,</div><div class='add'>+	.id_table = saa7111_id,</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init</div><div class='del'>-saa7111_init (void)</div><div class='del'>-{</div><div class='del'>-	return i2c_add_driver(&amp;i2c_driver_saa7111);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit</div><div class='del'>-saa7111_exit (void)</div><div class='del'>-{</div><div class='del'>-	i2c_del_driver(&amp;i2c_driver_saa7111);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(saa7111_init);</div><div class='del'>-module_exit(saa7111_exit);</div><div class='head'>diff --git a/drivers/media/video/saa7114.c b/drivers/media/video/saa7114.c<br/>index e79075533beb..7ca709fda5f4 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/saa7114.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/saa7114.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/saa7114.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/saa7114.c</a></div><div class='hunk'>@@ -29,43 +29,24 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/fs.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/major.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/i2c.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/pgtable.h&gt;</div><div class='del'>-#include &lt;asm/page.h&gt;</div><div class='add'>+#include &lt;linux/ioctl.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='del'>-</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/i2c-id.h&gt;</div><div class='ctx'> #include &lt;linux/videodev.h&gt;</div><div class='ctx'> #include &lt;linux/video_decoder.h&gt;</div><div class='add'>+#include &lt;media/v4l2-common.h&gt;</div><div class='add'>+#include &lt;media/v4l2-i2c-drv-legacy.h&gt;</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("Philips SAA7114H video decoder driver");</div><div class='ctx'> MODULE_AUTHOR("Maxim Yevtyushkin");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-#define I2C_NAME(x) (x)-&gt;name</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> static int debug;</div><div class='ctx'> module_param(debug, int, 0);</div><div class='ctx'> MODULE_PARM_DESC(debug, "Debug level (0-1)");</div><div class='ctx'> </div><div class='del'>-#define dprintk(num, format, args...) \</div><div class='del'>-	do { \</div><div class='del'>-		if (debug &gt;= num) \</div><div class='del'>-			printk(format, ##args); \</div><div class='del'>-	} while (0)</div><div class='del'>-</div><div class='ctx'> /* ----------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='ctx'> struct saa7114 {</div><div class='hunk'>@@ -81,9 +62,6 @@ struct saa7114 {</div><div class='ctx'> 	int playback;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define   I2C_SAA7114        0x42</div><div class='del'>-#define   I2C_SAA7114A       0x40</div><div class='del'>-</div><div class='ctx'> #define   I2C_DELAY   10</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -129,18 +107,12 @@ struct saa7114 {</div><div class='ctx'> </div><div class='ctx'> /* ----------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='del'>-static inline int</div><div class='del'>-saa7114_write (struct i2c_client *client,</div><div class='del'>-	       u8                 reg,</div><div class='del'>-	       u8                 value)</div><div class='add'>+static inline int saa7114_write(struct i2c_client *client, u8 reg, u8 value)</div><div class='ctx'> {</div><div class='ctx'> 	return i2c_smbus_write_byte_data(client, reg, value);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-saa7114_write_block (struct i2c_client *client,</div><div class='del'>-		     const u8          *data,</div><div class='del'>-		     unsigned int       len)</div><div class='add'>+static int saa7114_write_block(struct i2c_client *client, const u8 *data, unsigned int len)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = -1;</div><div class='ctx'> 	u8 reg;</div><div class='hunk'>@@ -160,18 +132,17 @@ saa7114_write_block (struct i2c_client *client,</div><div class='ctx'> 				reg++;</div><div class='ctx'> 				len -= 2;</div><div class='ctx'> 				data += 2;</div><div class='del'>-			} while (len &gt;= 2 &amp;&amp; data[0] == reg &amp;&amp;</div><div class='del'>-				 block_len &lt; 32);</div><div class='del'>-			if ((ret = i2c_master_send(client, block_data,</div><div class='del'>-						   block_len)) &lt; 0)</div><div class='add'>+			} while (len &gt;= 2 &amp;&amp; data[0] == reg &amp;&amp; block_len &lt; 32);</div><div class='add'>+			ret = i2c_master_send(client, block_data, block_len);</div><div class='add'>+			if (ret &lt; 0)</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* do some slow I2C emulation kind of thing */</div><div class='ctx'> 		while (len &gt;= 2) {</div><div class='ctx'> 			reg = *data++;</div><div class='del'>-			if ((ret = saa7114_write(client, reg,</div><div class='del'>-						 *data++)) &lt; 0)</div><div class='add'>+			ret = saa7114_write(client, reg, *data++);</div><div class='add'>+			if (ret &lt; 0)</div><div class='ctx'> 				break;</div><div class='ctx'> 			len -= 2;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -180,9 +151,7 @@ saa7114_write_block (struct i2c_client *client,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int</div><div class='del'>-saa7114_read (struct i2c_client *client,</div><div class='del'>-	      u8                 reg)</div><div class='add'>+static inline int saa7114_read(struct i2c_client *client, u8 reg)</div><div class='ctx'> {</div><div class='ctx'> 	return i2c_smbus_read_byte_data(client, reg);</div><div class='ctx'> }</div><div class='hunk'>@@ -452,15 +421,11 @@ static const unsigned char init[] = {</div><div class='ctx'> 	0xef, 0x00</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-saa7114_command (struct i2c_client *client,</div><div class='del'>-		 unsigned int       cmd,</div><div class='del'>-		 void              *arg)</div><div class='add'>+static int saa7114_command(struct i2c_client *client, unsigned cmd, void *arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct saa7114 *decoder = i2c_get_clientdata(client);</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='del'>-</div><div class='ctx'> 	case 0:</div><div class='ctx'> 		//dprintk(1, KERN_INFO "%s: writing init\n", I2C_NAME(client));</div><div class='ctx'> 		//saa7114_write_block(client, init, sizeof(init));</div><div class='hunk'>@@ -470,27 +435,28 @@ saa7114_command (struct i2c_client *client,</div><div class='ctx'> 	{</div><div class='ctx'> 		int i;</div><div class='ctx'> </div><div class='del'>-		dprintk(1, KERN_INFO "%s: decoder dump\n", I2C_NAME(client));</div><div class='add'>+		if (!debug)</div><div class='add'>+			break;</div><div class='add'>+		v4l_info(client, "decoder dump\n");</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; i &lt; 32; i += 16) {</div><div class='ctx'> 			int j;</div><div class='ctx'> </div><div class='del'>-			printk(KERN_DEBUG "%s: %03x", I2C_NAME(client), i);</div><div class='add'>+			v4l_info(client, "%03x", i);</div><div class='ctx'> 			for (j = 0; j &lt; 16; ++j) {</div><div class='del'>-				printk(" %02x",</div><div class='add'>+				printk(KERN_CONT " %02x",</div><div class='ctx'> 				       saa7114_read(client, i + j));</div><div class='ctx'> 			}</div><div class='del'>-			printk("\n");</div><div class='add'>+			printk(KERN_CONT "\n");</div><div class='ctx'> 		}</div><div class='del'>-	}</div><div class='ctx'> 		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	case DECODER_GET_CAPABILITIES:</div><div class='ctx'> 	{</div><div class='ctx'> 		struct video_decoder_capability *cap = arg;</div><div class='ctx'> </div><div class='del'>-		dprintk(1, KERN_DEBUG "%s: decoder get capabilities\n",</div><div class='del'>-			I2C_NAME(client));</div><div class='add'>+		v4l_dbg(1, debug, client, "get capabilities\n");</div><div class='ctx'> </div><div class='ctx'> 		cap-&gt;flags = VIDEO_DECODER_PAL |</div><div class='ctx'> 			     VIDEO_DECODER_NTSC |</div><div class='hunk'>@@ -498,8 +464,8 @@ saa7114_command (struct i2c_client *client,</div><div class='ctx'> 			     VIDEO_DECODER_CCIR;</div><div class='ctx'> 		cap-&gt;inputs = 8;</div><div class='ctx'> 		cap-&gt;outputs = 1;</div><div class='del'>-	}</div><div class='ctx'> 		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	case DECODER_GET_STATUS:</div><div class='ctx'> 	{</div><div class='hunk'>@@ -509,8 +475,7 @@ saa7114_command (struct i2c_client *client,</div><div class='ctx'> </div><div class='ctx'> 		status = saa7114_read(client, 0x1f);</div><div class='ctx'> </div><div class='del'>-		dprintk(1, KERN_DEBUG "%s status: 0x%02x\n", I2C_NAME(client),</div><div class='del'>-			status);</div><div class='add'>+		v4l_dbg(1, debug, client, "status: 0x%02x\n", status);</div><div class='ctx'> 		res = 0;</div><div class='ctx'> 		if ((status &amp; (1 &lt;&lt; 6)) == 0) {</div><div class='ctx'> 			res |= DECODER_STATUS_GOOD;</div><div class='hunk'>@@ -538,8 +503,8 @@ saa7114_command (struct i2c_client *client,</div><div class='ctx'> 			res |= DECODER_STATUS_COLOR;</div><div class='ctx'> 		}</div><div class='ctx'> 		*iarg = res;</div><div class='del'>-	}</div><div class='ctx'> 		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	case DECODER_SET_NORM:</div><div class='ctx'> 	{</div><div class='hunk'>@@ -547,12 +512,11 @@ saa7114_command (struct i2c_client *client,</div><div class='ctx'> </div><div class='ctx'> 		short int hoff = 0, voff = 0, w = 0, h = 0;</div><div class='ctx'> </div><div class='del'>-		dprintk(1, KERN_DEBUG "%s: decoder set norm ",</div><div class='del'>-			I2C_NAME(client));</div><div class='del'>-		switch (*iarg) {</div><div class='add'>+		v4l_dbg(1, debug, client, "set norm\n");</div><div class='ctx'> </div><div class='add'>+		switch (*iarg) {</div><div class='ctx'> 		case VIDEO_MODE_NTSC:</div><div class='del'>-			dprintk(1, "NTSC\n");</div><div class='add'>+			v4l_dbg(1, debug, client, "NTSC\n");</div><div class='ctx'> 			decoder-&gt;reg[REG_ADDR(0x06)] =</div><div class='ctx'> 			    SAA_7114_NTSC_HSYNC_START;</div><div class='ctx'> 			decoder-&gt;reg[REG_ADDR(0x07)] =</div><div class='hunk'>@@ -571,7 +535,7 @@ saa7114_command (struct i2c_client *client,</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case VIDEO_MODE_PAL:</div><div class='del'>-			dprintk(1, "PAL\n");</div><div class='add'>+			v4l_dbg(1, debug, client, "PAL\n");</div><div class='ctx'> 			decoder-&gt;reg[REG_ADDR(0x06)] =</div><div class='ctx'> 			    SAA_7114_PAL_HSYNC_START;</div><div class='ctx'> 			decoder-&gt;reg[REG_ADDR(0x07)] =</div><div class='hunk'>@@ -590,9 +554,8 @@ saa7114_command (struct i2c_client *client,</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		default:</div><div class='del'>-			dprintk(1, " Unknown video mode!!!\n");</div><div class='add'>+			v4l_dbg(1, debug, client, "Unknown video mode\n");</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -644,22 +607,20 @@ saa7114_command (struct i2c_client *client,</div><div class='ctx'> 		saa7114_write(client, 0x80, 0x36);	// i-port and scaler back end clock selection</div><div class='ctx'> </div><div class='ctx'> 		decoder-&gt;norm = *iarg;</div><div class='del'>-	}</div><div class='ctx'> 		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	case DECODER_SET_INPUT:</div><div class='ctx'> 	{</div><div class='ctx'> 		int *iarg = arg;</div><div class='ctx'> </div><div class='del'>-		dprintk(1, KERN_DEBUG "%s: decoder set input (%d)\n",</div><div class='del'>-			I2C_NAME(client), *iarg);</div><div class='add'>+		v4l_dbg(1, debug, client, "set input (%d)\n", *iarg);</div><div class='ctx'> 		if (*iarg &lt; 0 || *iarg &gt; 7) {</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (decoder-&gt;input != *iarg) {</div><div class='del'>-			dprintk(1, KERN_DEBUG "%s: now setting %s input\n",</div><div class='del'>-				I2C_NAME(client),</div><div class='add'>+			v4l_dbg(1, debug, client, "now setting %s input\n",</div><div class='ctx'> 				*iarg &gt;= 6 ? "S-Video" : "Composite");</div><div class='ctx'> 			decoder-&gt;input = *iarg;</div><div class='ctx'> </div><div class='hunk'>@@ -690,30 +651,29 @@ saa7114_command (struct i2c_client *client,</div><div class='ctx'> 			saa7114_write(client, 0x0e,</div><div class='ctx'> 				      decoder-&gt;reg[REG_ADDR(0x0e)]);</div><div class='ctx'> 		}</div><div class='del'>-	}</div><div class='ctx'> 		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	case DECODER_SET_OUTPUT:</div><div class='ctx'> 	{</div><div class='ctx'> 		int *iarg = arg;</div><div class='ctx'> </div><div class='del'>-		dprintk(1, KERN_DEBUG "%s: decoder set output\n",</div><div class='del'>-			I2C_NAME(client));</div><div class='add'>+		v4l_dbg(1, debug, client, "set output\n");</div><div class='ctx'> </div><div class='ctx'> 		/* not much choice of outputs */</div><div class='ctx'> 		if (*iarg != 0) {</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='del'>-	}</div><div class='ctx'> 		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	case DECODER_ENABLE_OUTPUT:</div><div class='ctx'> 	{</div><div class='ctx'> 		int *iarg = arg;</div><div class='ctx'> 		int enable = (*iarg != 0);</div><div class='ctx'> </div><div class='del'>-		dprintk(1, KERN_DEBUG "%s: decoder %s output\n",</div><div class='del'>-			I2C_NAME(client), enable ? "enable" : "disable");</div><div class='add'>+		v4l_dbg(1, debug, client, "%s output\n",</div><div class='add'>+			enable ? "enable" : "disable");</div><div class='ctx'> </div><div class='ctx'> 		decoder-&gt;playback = !enable;</div><div class='ctx'> </div><div class='hunk'>@@ -754,18 +714,16 @@ saa7114_command (struct i2c_client *client,</div><div class='ctx'> 			saa7114_write(client, 0x80, 0x36);</div><div class='ctx'> </div><div class='ctx'> 		}</div><div class='del'>-	}</div><div class='ctx'> 		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	case DECODER_SET_PICTURE:</div><div class='ctx'> 	{</div><div class='ctx'> 		struct video_picture *pic = arg;</div><div class='ctx'> </div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_DEBUG</div><div class='del'>-			"%s: decoder set picture bright=%d contrast=%d saturation=%d hue=%d\n",</div><div class='del'>-			I2C_NAME(client), pic-&gt;brightness, pic-&gt;contrast,</div><div class='del'>-			pic-&gt;colour, pic-&gt;hue);</div><div class='add'>+		v4l_dbg(1, debug, client,</div><div class='add'>+			"decoder set picture bright=%d contrast=%d saturation=%d hue=%d\n",</div><div class='add'>+			pic-&gt;brightness, pic-&gt;contrast, pic-&gt;colour, pic-&gt;hue);</div><div class='ctx'> </div><div class='ctx'> 		if (decoder-&gt;bright != pic-&gt;brightness) {</div><div class='ctx'> 			/* We want 0 to 255 we get 0-65535 */</div><div class='hunk'>@@ -789,8 +747,8 @@ saa7114_command (struct i2c_client *client,</div><div class='ctx'> 			saa7114_write(client, 0x0d,</div><div class='ctx'> 				      (decoder-&gt;hue - 32768) &gt;&gt; 8);</div><div class='ctx'> 		}</div><div class='del'>-	}</div><div class='ctx'> 		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -801,58 +759,30 @@ saa7114_command (struct i2c_client *client,</div><div class='ctx'> </div><div class='ctx'> /* ----------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Generic i2c probe</div><div class='del'>- * concerning the addresses: i2c wants 7 bit (without the r/w bit), so '&gt;&gt;1'</div><div class='del'>- */</div><div class='del'>-static unsigned short normal_i2c[] =</div><div class='del'>-    { I2C_SAA7114 &gt;&gt; 1, I2C_SAA7114A &gt;&gt; 1, I2C_CLIENT_END };</div><div class='del'>-</div><div class='del'>-static unsigned short ignore = I2C_CLIENT_END;</div><div class='del'>-</div><div class='del'>-static struct i2c_client_address_data addr_data = {</div><div class='del'>-	.normal_i2c		= normal_i2c,</div><div class='del'>-	.probe			= &amp;ignore,</div><div class='del'>-	.ignore			= &amp;ignore,</div><div class='del'>-};</div><div class='add'>+static unsigned short normal_i2c[] = { 0x42 &gt;&gt; 1, 0x40 &gt;&gt; 1, I2C_CLIENT_END };</div><div class='ctx'> </div><div class='del'>-static struct i2c_driver i2c_driver_saa7114;</div><div class='add'>+I2C_CLIENT_INSMOD;</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-saa7114_detect_client (struct i2c_adapter *adapter,</div><div class='del'>-		       int                 address,</div><div class='del'>-		       int                 kind)</div><div class='add'>+static int saa7114_probe(struct i2c_client *client,</div><div class='add'>+			const struct i2c_device_id *id)</div><div class='ctx'> {</div><div class='ctx'> 	int i, err[30];</div><div class='ctx'> 	short int hoff = SAA_7114_NTSC_HOFFSET;</div><div class='ctx'> 	short int voff = SAA_7114_NTSC_VOFFSET;</div><div class='ctx'> 	short int w = SAA_7114_NTSC_WIDTH;</div><div class='ctx'> 	short int h = SAA_7114_NTSC_HEIGHT;</div><div class='del'>-	struct i2c_client *client;</div><div class='ctx'> 	struct saa7114 *decoder;</div><div class='ctx'> </div><div class='del'>-	dprintk(1,</div><div class='del'>-		KERN_INFO</div><div class='del'>-		"saa7114.c: detecting saa7114 client on address 0x%x\n",</div><div class='del'>-		address &lt;&lt; 1);</div><div class='del'>-</div><div class='ctx'> 	/* Check if the adapter supports the needed features */</div><div class='del'>-	if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))</div><div class='del'>-		return 0;</div><div class='add'>+	if (!i2c_check_functionality(client-&gt;adapter, I2C_FUNC_SMBUS_BYTE_DATA))</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);</div><div class='del'>-	if (!client)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	client-&gt;addr = address;</div><div class='del'>-	client-&gt;adapter = adapter;</div><div class='del'>-	client-&gt;driver = &amp;i2c_driver_saa7114;</div><div class='del'>-	strlcpy(I2C_NAME(client), "saa7114", sizeof(I2C_NAME(client)));</div><div class='add'>+	v4l_info(client, "chip found @ 0x%x (%s)\n",</div><div class='add'>+			client-&gt;addr &lt;&lt; 1, client-&gt;adapter-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	decoder = kzalloc(sizeof(struct saa7114), GFP_KERNEL);</div><div class='del'>-	if (decoder == NULL) {</div><div class='del'>-		kfree(client);</div><div class='add'>+	if (decoder == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	}</div><div class='ctx'> 	decoder-&gt;norm = VIDEO_MODE_NTSC;</div><div class='ctx'> 	decoder-&gt;input = -1;</div><div class='ctx'> 	decoder-&gt;enable = 1;</div><div class='hunk'>@@ -937,8 +867,7 @@ saa7114_detect_client (struct i2c_adapter *adapter,</div><div class='ctx'> 	decoder-&gt;reg[REG_ADDR(0x0e)] |= 1;	// combfilter on</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-	dprintk(1, KERN_DEBUG "%s_attach: starting decoder init\n",</div><div class='del'>-		I2C_NAME(client));</div><div class='add'>+	v4l_dbg(1, debug, client, "starting init\n");</div><div class='ctx'> </div><div class='ctx'> 	err[0] =</div><div class='ctx'> 	    saa7114_write_block(client, decoder-&gt;reg + (0x20 &lt;&lt; 1),</div><div class='hunk'>@@ -962,28 +891,23 @@ saa7114_detect_client (struct i2c_adapter *adapter,</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt;= 5; i++) {</div><div class='ctx'> 		if (err[i] &lt; 0) {</div><div class='del'>-			dprintk(1,</div><div class='del'>-				KERN_ERR</div><div class='del'>-				"%s_attach: init error %d at stage %d, leaving attach.\n",</div><div class='del'>-				I2C_NAME(client), i, err[i]);</div><div class='add'>+			v4l_dbg(1, debug, client,</div><div class='add'>+				"init error %d at stage %d, leaving attach.\n",</div><div class='add'>+				i, err[i]);</div><div class='ctx'> 			kfree(decoder);</div><div class='del'>-			kfree(client);</div><div class='del'>-			return 0;</div><div class='add'>+			return -EIO;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 6; i &lt; 8; i++) {</div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_DEBUG</div><div class='del'>-			"%s_attach: reg[0x%02x] = 0x%02x (0x%02x)\n",</div><div class='del'>-			I2C_NAME(client), i, saa7114_read(client, i),</div><div class='add'>+		v4l_dbg(1, debug, client,</div><div class='add'>+			"reg[0x%02x] = 0x%02x (0x%02x)\n",</div><div class='add'>+			i, saa7114_read(client, i),</div><div class='ctx'> 			decoder-&gt;reg[REG_ADDR(i)]);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dprintk(1,</div><div class='del'>-		KERN_DEBUG</div><div class='del'>-		"%s_attach: performing decoder reset sequence\n",</div><div class='del'>-		I2C_NAME(client));</div><div class='add'>+	v4l_dbg(1, debug, client,</div><div class='add'>+		"performing decoder reset sequence\n");</div><div class='ctx'> </div><div class='ctx'> 	err[6] = saa7114_write(client, 0x80, 0x06);	// i-port and scaler backend clock selection, task A&amp;B off</div><div class='ctx'> 	err[7] = saa7114_write(client, 0x88, 0xd8);	// sw reset scaler</div><div class='hunk'>@@ -991,19 +915,15 @@ saa7114_detect_client (struct i2c_adapter *adapter,</div><div class='ctx'> </div><div class='ctx'> 	for (i = 6; i &lt;= 8; i++) {</div><div class='ctx'> 		if (err[i] &lt; 0) {</div><div class='del'>-			dprintk(1,</div><div class='del'>-				KERN_ERR</div><div class='del'>-				"%s_attach: init error %d at stage %d, leaving attach.\n",</div><div class='del'>-				I2C_NAME(client), i, err[i]);</div><div class='add'>+			v4l_dbg(1, debug, client,</div><div class='add'>+				"init error %d at stage %d, leaving attach.\n",</div><div class='add'>+				i, err[i]);</div><div class='ctx'> 			kfree(decoder);</div><div class='del'>-			kfree(client);</div><div class='del'>-			return 0;</div><div class='add'>+			return -EIO;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dprintk(1, KERN_INFO "%s_attach: performing the rest of init\n",</div><div class='del'>-		I2C_NAME(client));</div><div class='del'>-</div><div class='add'>+	v4l_dbg(1, debug, client, "performing the rest of init\n");</div><div class='ctx'> </div><div class='ctx'> 	err[9] = saa7114_write(client, 0x01, decoder-&gt;reg[REG_ADDR(0x01)]);</div><div class='ctx'> 	err[10] = saa7114_write_block(client, decoder-&gt;reg + (0x03 &lt;&lt; 1), (0x1e + 1 - 0x03) &lt;&lt; 1);	// big seq</div><div class='hunk'>@@ -1039,37 +959,32 @@ saa7114_detect_client (struct i2c_adapter *adapter,</div><div class='ctx'> </div><div class='ctx'> 	for (i = 9; i &lt;= 18; i++) {</div><div class='ctx'> 		if (err[i] &lt; 0) {</div><div class='del'>-			dprintk(1,</div><div class='del'>-				KERN_ERR</div><div class='del'>-				"%s_attach: init error %d at stage %d, leaving attach.\n",</div><div class='del'>-				I2C_NAME(client), i, err[i]);</div><div class='add'>+			v4l_dbg(1, debug, client,</div><div class='add'>+				"init error %d at stage %d, leaving attach.\n",</div><div class='add'>+				i, err[i]);</div><div class='ctx'> 			kfree(decoder);</div><div class='del'>-			kfree(client);</div><div class='del'>-			return 0;</div><div class='add'>+			return -EIO;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 	for (i = 6; i &lt; 8; i++) {</div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_DEBUG</div><div class='del'>-			"%s_attach: reg[0x%02x] = 0x%02x (0x%02x)\n",</div><div class='del'>-			I2C_NAME(client), i, saa7114_read(client, i),</div><div class='add'>+		v4l_dbg(1, debug, client,</div><div class='add'>+			"reg[0x%02x] = 0x%02x (0x%02x)\n",</div><div class='add'>+			i, saa7114_read(client, i),</div><div class='ctx'> 			decoder-&gt;reg[REG_ADDR(i)]);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 	for (i = 0x11; i &lt;= 0x13; i++) {</div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_DEBUG</div><div class='del'>-			"%s_attach: reg[0x%02x] = 0x%02x (0x%02x)\n",</div><div class='del'>-			I2C_NAME(client), i, saa7114_read(client, i),</div><div class='add'>+		v4l_dbg(1, debug, client,</div><div class='add'>+			"reg[0x%02x] = 0x%02x (0x%02x)\n",</div><div class='add'>+			i, saa7114_read(client, i),</div><div class='ctx'> 			decoder-&gt;reg[REG_ADDR(i)]);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-	dprintk(1, KERN_DEBUG "%s_attach: setting video input\n",</div><div class='del'>-		I2C_NAME(client));</div><div class='add'>+	v4l_dbg(1, debug, client, "setting video input\n");</div><div class='ctx'> </div><div class='ctx'> 	err[19] =</div><div class='ctx'> 	    saa7114_write(client, 0x02, decoder-&gt;reg[REG_ADDR(0x02)]);</div><div class='hunk'>@@ -1080,20 +995,15 @@ saa7114_detect_client (struct i2c_adapter *adapter,</div><div class='ctx'> </div><div class='ctx'> 	for (i = 19; i &lt;= 21; i++) {</div><div class='ctx'> 		if (err[i] &lt; 0) {</div><div class='del'>-			dprintk(1,</div><div class='del'>-				KERN_ERR</div><div class='del'>-				"%s_attach: init error %d at stage %d, leaving attach.\n",</div><div class='del'>-				I2C_NAME(client), i, err[i]);</div><div class='add'>+			v4l_dbg(1, debug, client,</div><div class='add'>+				"init error %d at stage %d, leaving attach.\n",</div><div class='add'>+				i, err[i]);</div><div class='ctx'> 			kfree(decoder);</div><div class='del'>-			kfree(client);</div><div class='del'>-			return 0;</div><div class='add'>+			return -EIO;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dprintk(1,</div><div class='del'>-		KERN_DEBUG</div><div class='del'>-		"%s_attach: performing decoder reset sequence\n",</div><div class='del'>-		I2C_NAME(client));</div><div class='add'>+	v4l_dbg(1, debug, client, "performing decoder reset sequence\n");</div><div class='ctx'> </div><div class='ctx'> 	err[22] = saa7114_write(client, 0x88, 0xd8);	// sw reset scaler</div><div class='ctx'> 	err[23] = saa7114_write(client, 0x88, 0xf8);	// sw reset scaler release</div><div class='hunk'>@@ -1102,13 +1012,11 @@ saa7114_detect_client (struct i2c_adapter *adapter,</div><div class='ctx'> </div><div class='ctx'> 	for (i = 22; i &lt;= 24; i++) {</div><div class='ctx'> 		if (err[i] &lt; 0) {</div><div class='del'>-			dprintk(1,</div><div class='del'>-				KERN_ERR</div><div class='del'>-				"%s_attach: init error %d at stage %d, leaving attach.\n",</div><div class='del'>-				I2C_NAME(client), i, err[i]);</div><div class='add'>+			v4l_dbg(1, debug, client,</div><div class='add'>+				"init error %d at stage %d, leaving attach.\n",</div><div class='add'>+				i, err[i]);</div><div class='ctx'> 			kfree(decoder);</div><div class='del'>-			kfree(client);</div><div class='del'>-			return 0;</div><div class='add'>+			return -EIO;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1116,101 +1024,45 @@ saa7114_detect_client (struct i2c_adapter *adapter,</div><div class='ctx'> 	err[26] = saa7114_write(client, 0x07, init[REG_ADDR(0x07)]);</div><div class='ctx'> 	err[27] = saa7114_write(client, 0x10, init[REG_ADDR(0x10)]);</div><div class='ctx'> </div><div class='del'>-	dprintk(1,</div><div class='del'>-		KERN_INFO</div><div class='del'>-		"%s_attach: chip version %x, decoder status 0x%02x\n",</div><div class='del'>-		I2C_NAME(client), saa7114_read(client, 0x00) &gt;&gt; 4,</div><div class='add'>+	v4l_dbg(1, debug, client, "chip version %x, decoder status 0x%02x\n",</div><div class='add'>+		saa7114_read(client, 0x00) &gt;&gt; 4,</div><div class='ctx'> 		saa7114_read(client, 0x1f));</div><div class='del'>-	dprintk(1,</div><div class='del'>-		KERN_DEBUG</div><div class='del'>-		"%s_attach: power save control: 0x%02x, scaler status: 0x%02x\n",</div><div class='del'>-		I2C_NAME(client), saa7114_read(client, 0x88),</div><div class='add'>+	v4l_dbg(1, debug, client,</div><div class='add'>+		"power save control: 0x%02x, scaler status: 0x%02x\n",</div><div class='add'>+		saa7114_read(client, 0x88),</div><div class='ctx'> 		saa7114_read(client, 0x8f));</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 	for (i = 0x94; i &lt; 0x96; i++) {</div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_DEBUG</div><div class='del'>-			"%s_attach: reg[0x%02x] = 0x%02x (0x%02x)\n",</div><div class='del'>-			I2C_NAME(client), i, saa7114_read(client, i),</div><div class='add'>+		v4l_dbg(1, debug, client,</div><div class='add'>+			"reg[0x%02x] = 0x%02x (0x%02x)\n",</div><div class='add'>+			i, saa7114_read(client, i),</div><div class='ctx'> 			decoder-&gt;reg[REG_ADDR(i)]);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	i = i2c_attach_client(client);</div><div class='del'>-	if (i) {</div><div class='del'>-		kfree(client);</div><div class='del'>-		kfree(decoder);</div><div class='del'>-		return i;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	//i = saa7114_write_block(client, init, sizeof(init));</div><div class='del'>-	i = 0;</div><div class='del'>-	if (i &lt; 0) {</div><div class='del'>-		dprintk(1, KERN_ERR "%s_attach error: init status %d\n",</div><div class='del'>-			I2C_NAME(client), i);</div><div class='del'>-	} else {</div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_INFO</div><div class='del'>-			"%s_attach: chip version %x at address 0x%x\n",</div><div class='del'>-			I2C_NAME(client), saa7114_read(client, 0x00) &gt;&gt; 4,</div><div class='del'>-			client-&gt;addr &lt;&lt; 1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-saa7114_attach_adapter (struct i2c_adapter *adapter)</div><div class='del'>-{</div><div class='del'>-	dprintk(1,</div><div class='del'>-		KERN_INFO</div><div class='del'>-		"saa7114.c: starting probe for adapter %s (0x%x)\n",</div><div class='del'>-		I2C_NAME(adapter), adapter-&gt;id);</div><div class='del'>-	return i2c_probe(adapter, &amp;addr_data, &amp;saa7114_detect_client);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-saa7114_detach_client (struct i2c_client *client)</div><div class='add'>+static int saa7114_remove(struct i2c_client *client)</div><div class='ctx'> {</div><div class='del'>-	struct saa7114 *decoder = i2c_get_clientdata(client);</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = i2c_detach_client(client);</div><div class='del'>-	if (err) {</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	kfree(decoder);</div><div class='del'>-	kfree(client);</div><div class='del'>-</div><div class='add'>+	kfree(i2c_get_clientdata(client));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* ----------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='del'>-static struct i2c_driver i2c_driver_saa7114 = {</div><div class='del'>-	.driver = {</div><div class='del'>-		.name = "saa7114",</div><div class='del'>-	},</div><div class='del'>-</div><div class='del'>-	.id = I2C_DRIVERID_SAA7114,</div><div class='add'>+static const struct i2c_device_id saa7114_id[] = {</div><div class='add'>+	{ "saa7114_old", 0 },	/* "saa7114" maps to the saa7115 driver */</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(i2c, saa7114_id);</div><div class='ctx'> </div><div class='del'>-	.attach_adapter = saa7114_attach_adapter,</div><div class='del'>-	.detach_client = saa7114_detach_client,</div><div class='add'>+static struct v4l2_i2c_driver_data v4l2_i2c_data = {</div><div class='add'>+	.name = "saa7114",</div><div class='add'>+	.driverid = I2C_DRIVERID_SAA7114,</div><div class='ctx'> 	.command = saa7114_command,</div><div class='add'>+	.probe = saa7114_probe,</div><div class='add'>+	.remove = saa7114_remove,</div><div class='add'>+	.id_table = saa7114_id,</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init</div><div class='del'>-saa7114_init (void)</div><div class='del'>-{</div><div class='del'>-	return i2c_add_driver(&amp;i2c_driver_saa7114);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit</div><div class='del'>-saa7114_exit (void)</div><div class='del'>-{</div><div class='del'>-	i2c_del_driver(&amp;i2c_driver_saa7114);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(saa7114_init);</div><div class='del'>-module_exit(saa7114_exit);</div><div class='head'>diff --git a/drivers/media/video/saa7115.c b/drivers/media/video/saa7115.c<br/>index ad733caec720..c8e9cb3db30a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/saa7115.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/saa7115.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/saa7115.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/saa7115.c</a></div><div class='hunk'>@@ -1057,7 +1057,7 @@ static void saa711x_set_lcr(struct i2c_client *client, struct v4l2_sliced_vbi_fo</div><div class='ctx'> 	for (i = 0; i &lt;= 23; i++)</div><div class='ctx'> 		lcr[i] = 0xff;</div><div class='ctx'> </div><div class='del'>-	if (fmt-&gt;service_set == 0) {</div><div class='add'>+	if (fmt == NULL) {</div><div class='ctx'> 		/* raw VBI */</div><div class='ctx'> 		if (is_50hz)</div><div class='ctx'> 			for (i = 6; i &lt;= 23; i++)</div><div class='hunk'>@@ -1113,7 +1113,7 @@ static void saa711x_set_lcr(struct i2c_client *client, struct v4l2_sliced_vbi_fo</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* enable/disable raw VBI capturing */</div><div class='del'>-	saa711x_writeregs(client, fmt-&gt;service_set == 0 ?</div><div class='add'>+	saa711x_writeregs(client, fmt == NULL ?</div><div class='ctx'> 				saa7115_cfg_vbi_on :</div><div class='ctx'> 				saa7115_cfg_vbi_off);</div><div class='ctx'> }</div><div class='hunk'>@@ -1153,6 +1153,10 @@ static int saa711x_set_v4lfmt(struct i2c_client *client, struct v4l2_format *fmt</div><div class='ctx'> 		saa711x_set_lcr(client, &amp;fmt-&gt;fmt.sliced);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='add'>+	if (fmt-&gt;type == V4L2_BUF_TYPE_VBI_CAPTURE) {</div><div class='add'>+		saa711x_set_lcr(client, NULL);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='ctx'> 	if (fmt-&gt;type != V4L2_BUF_TYPE_VIDEO_CAPTURE)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='hunk'>@@ -1309,10 +1313,13 @@ static int saa7115_command(struct i2c_client *client, unsigned int cmd, void *ar</div><div class='ctx'> 	case VIDIOC_INT_S_VIDEO_ROUTING:</div><div class='ctx'> 	{</div><div class='ctx'> 		struct v4l2_routing *route = arg;</div><div class='add'>+		u32 input = route-&gt;input;</div><div class='add'>+		u8 mask = (state-&gt;ident == V4L2_IDENT_SAA7111) ? 0xf8 : 0xf0;</div><div class='ctx'> </div><div class='ctx'> 		v4l_dbg(1, debug, client, "decoder set input %d output %d\n", route-&gt;input, route-&gt;output);</div><div class='del'>-		/* saa7113 does not have these inputs */</div><div class='del'>-		if (state-&gt;ident == V4L2_IDENT_SAA7113 &amp;&amp;</div><div class='add'>+		/* saa7111/3 does not have these inputs */</div><div class='add'>+		if ((state-&gt;ident == V4L2_IDENT_SAA7113 ||</div><div class='add'>+		     state-&gt;ident == V4L2_IDENT_SAA7111) &amp;&amp;</div><div class='ctx'> 		    (route-&gt;input == SAA7115_COMPOSITE4 ||</div><div class='ctx'> 		     route-&gt;input == SAA7115_COMPOSITE5)) {</div><div class='ctx'> 			return -EINVAL;</div><div class='hunk'>@@ -1327,10 +1334,23 @@ static int saa7115_command(struct i2c_client *client, unsigned int cmd, void *ar</div><div class='ctx'> 			(route-&gt;input &gt;= SAA7115_SVIDEO0) ? "S-Video" : "Composite", (route-&gt;output == SAA7115_IPORT_ON) ? "iport on" : "iport off");</div><div class='ctx'> 		state-&gt;input = route-&gt;input;</div><div class='ctx'> </div><div class='add'>+		/* saa7111 has slightly different input numbering */</div><div class='add'>+		if (state-&gt;ident == V4L2_IDENT_SAA7111) {</div><div class='add'>+			if (input &gt;= SAA7115_COMPOSITE4)</div><div class='add'>+				input -= 2;</div><div class='add'>+			/* saa7111 specific */</div><div class='add'>+			saa711x_write(client, R_10_CHROMA_CNTL_2,</div><div class='add'>+					(saa711x_read(client, R_10_CHROMA_CNTL_2) &amp; 0x3f) |</div><div class='add'>+					((route-&gt;output &amp; 0xc0) ^ 0x40));</div><div class='add'>+			saa711x_write(client, R_13_RT_X_PORT_OUT_CNTL,</div><div class='add'>+					(saa711x_read(client, R_13_RT_X_PORT_OUT_CNTL) &amp; 0xf0) |</div><div class='add'>+					((route-&gt;output &amp; 2) ? 0x0a : 0));</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		/* select mode */</div><div class='ctx'> 		saa711x_write(client, R_02_INPUT_CNTL_1,</div><div class='del'>-			      (saa711x_read(client, R_02_INPUT_CNTL_1) &amp; 0xf0) |</div><div class='del'>-			       state-&gt;input);</div><div class='add'>+			      (saa711x_read(client, R_02_INPUT_CNTL_1) &amp; mask) |</div><div class='add'>+			       input);</div><div class='ctx'> </div><div class='ctx'> 		/* bypass chrominance trap for S-Video modes */</div><div class='ctx'> 		saa711x_write(client, R_09_LUMA_CNTL,</div><div class='hunk'>@@ -1384,6 +1404,13 @@ static int saa7115_command(struct i2c_client *client, unsigned int cmd, void *ar</div><div class='ctx'> 		saa711x_writeregs(client, saa7115_cfg_reset_scaler);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='add'>+	case VIDIOC_INT_S_GPIO:</div><div class='add'>+		if (state-&gt;ident != V4L2_IDENT_SAA7111)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		saa711x_write(client, 0x11, (saa711x_read(client, 0x11) &amp; 0x7f) |</div><div class='add'>+			(*(u32 *)arg ? 0x80 : 0));</div><div class='add'>+		break;</div><div class='add'>+</div><div class='ctx'> 	case VIDIOC_INT_G_VBI_DATA:</div><div class='ctx'> 	{</div><div class='ctx'> 		struct v4l2_sliced_vbi_data *data = arg;</div><div class='hunk'>@@ -1539,7 +1566,8 @@ static int saa7115_probe(struct i2c_client *client,</div><div class='ctx'> 		state-&gt;crystal_freq = SAA7115_FREQ_32_11_MHZ;</div><div class='ctx'> 		saa711x_writeregs(client, saa7115_init_auto_input);</div><div class='ctx'> 	}</div><div class='del'>-	saa711x_writeregs(client, saa7115_init_misc);</div><div class='add'>+	if (state-&gt;ident != V4L2_IDENT_SAA7111)</div><div class='add'>+		saa711x_writeregs(client, saa7115_init_misc);</div><div class='ctx'> 	saa711x_set_v4lstd(client, V4L2_STD_NTSC);</div><div class='ctx'> </div><div class='ctx'> 	v4l_dbg(1, debug, client, "status: (1E) 0x%02x, (1F) 0x%02x\n",</div><div class='head'>diff --git a/drivers/media/video/saa7127.c b/drivers/media/video/saa7127.c<br/>index d0e83fe0ff51..cc02fb18efa7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/saa7127.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/saa7127.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/saa7127.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/saa7127.c</a></div><div class='hunk'>@@ -29,7 +29,7 @@</div><div class='ctx'>  * Note: the saa7126 is identical to the saa7127, and the saa7128 is</div><div class='ctx'>  * identical to the saa7129, except that the saa7126 and saa7128 have</div><div class='ctx'>  * macrovision anti-taping support. This driver will almost certainly</div><div class='del'>- * work find for those chips, except of course for the missing anti-taping</div><div class='add'>+ * work fine for those chips, except of course for the missing anti-taping</div><div class='ctx'>  * support.</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='head'>diff --git a/drivers/media/video/saa7134/saa6752hs.c b/drivers/media/video/saa7134/saa6752hs.c<br/>index 707be175509d..1fb6eccdade3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/saa7134/saa6752hs.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/saa7134/saa6752hs.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/saa7134/saa6752hs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/saa7134/saa6752hs.c</a></div><div class='hunk'>@@ -1,3 +1,27 @@</div><div class='add'>+ /*</div><div class='add'>+    saa6752hs - i2c-driver for the saa6752hs by Philips</div><div class='add'>+</div><div class='add'>+    Copyright (C) 2004 Andrew de Quincey</div><div class='add'>+</div><div class='add'>+    AC-3 support:</div><div class='add'>+</div><div class='add'>+    Copyright (C) 2008 Hans Verkuil &lt;hverkuil@xs4all.nl&gt;</div><div class='add'>+</div><div class='add'>+    This program is free software; you can redistribute it and/or modify</div><div class='add'>+    it under the terms of the GNU General Public License vs published by</div><div class='add'>+    the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+    (at your option) any later version.</div><div class='add'>+</div><div class='add'>+    This program is distributed in the hope that it will be useful,</div><div class='add'>+    but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+    GNU General Public License for more details.</div><div class='add'>+</div><div class='add'>+    You should have received a copy of the GNU General Public License</div><div class='add'>+    along with this program; if not, write to the Free Software</div><div class='add'>+    Foundation, Inc., 675 Mvss Ave, Cambridge, MA 02139, USA.</div><div class='add'>+  */</div><div class='add'>+</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='hunk'>@@ -10,6 +34,8 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/videodev2.h&gt;</div><div class='ctx'> #include &lt;media/v4l2-common.h&gt;</div><div class='add'>+#include &lt;media/v4l2-chip-ident.h&gt;</div><div class='add'>+#include &lt;media/v4l2-i2c-drv-legacy.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/crc32.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -27,9 +53,6 @@ MODULE_DESCRIPTION("device driver for saa6752hs MPEG2 encoder");</div><div class='ctx'> MODULE_AUTHOR("Andrew de Quincey");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='del'>-static struct i2c_driver driver;</div><div class='del'>-static struct i2c_client client_template;</div><div class='del'>-</div><div class='ctx'> enum saa6752hs_videoformat {</div><div class='ctx'> 	SAA6752HS_VF_D1 = 0,    /* standard D1 video format: 720x576 */</div><div class='ctx'> 	SAA6752HS_VF_2_3_D1 = 1,/* 2/3D1 video format: 480x576 */</div><div class='hunk'>@@ -46,7 +69,9 @@ struct saa6752hs_mpeg_params {</div><div class='ctx'> 	__u16				ts_pid_pcr;</div><div class='ctx'> </div><div class='ctx'> 	/* audio */</div><div class='del'>-	enum v4l2_mpeg_audio_l2_bitrate au_l2_bitrate;</div><div class='add'>+	enum v4l2_mpeg_audio_encoding    au_encoding;</div><div class='add'>+	enum v4l2_mpeg_audio_l2_bitrate  au_l2_bitrate;</div><div class='add'>+	enum v4l2_mpeg_audio_ac3_bitrate au_ac3_bitrate;</div><div class='ctx'> </div><div class='ctx'> 	/* video */</div><div class='ctx'> 	enum v4l2_mpeg_video_aspect	vi_aspect;</div><div class='hunk'>@@ -70,7 +95,9 @@ static const struct v4l2_format v4l2_format_table[] =</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct saa6752hs_state {</div><div class='del'>-	struct i2c_client             client;</div><div class='add'>+	int 			      chip;</div><div class='add'>+	u32 			      revision;</div><div class='add'>+	int 			      has_ac3;</div><div class='ctx'> 	struct saa6752hs_mpeg_params  params;</div><div class='ctx'> 	enum saa6752hs_videoformat    video_format;</div><div class='ctx'> 	v4l2_std_id                   standard;</div><div class='hunk'>@@ -145,6 +172,39 @@ static u8 PMT[] = {</div><div class='ctx'> 	0x00, 0x00, 0x00, 0x00 /* CRC32 */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static u8 PMT_AC3[] = {</div><div class='add'>+	0xc2, /* i2c register */</div><div class='add'>+	0x01, /* table number for encoder(1) */</div><div class='add'>+	0x47, /* sync */</div><div class='add'>+</div><div class='add'>+	0x40, /* transport_error_indicator(0), payload_unit_start(1), transport_priority(0) */</div><div class='add'>+	0x10, /* PMT PID (0x0010) */</div><div class='add'>+	0x10, /* transport_scrambling_control(00), adaptation_field_control(01), continuity_counter(0) */</div><div class='add'>+</div><div class='add'>+	0x00, /* PSI pointer to start of table */</div><div class='add'>+</div><div class='add'>+	0x02, /* TID (2) */</div><div class='add'>+	0xb0, 0x1a, /* section_syntax_indicator(1), section_length(26) */</div><div class='add'>+</div><div class='add'>+	0x00, 0x01, /* program_number(1) */</div><div class='add'>+</div><div class='add'>+	0xc1, /* version_number(0), current_next_indicator(1) */</div><div class='add'>+</div><div class='add'>+	0x00, 0x00, /* section_number(0), last_section_number(0) */</div><div class='add'>+</div><div class='add'>+	0xe1, 0x04, /* PCR_PID (0x0104) */</div><div class='add'>+</div><div class='add'>+	0xf0, 0x00, /* program_info_length(0) */</div><div class='add'>+</div><div class='add'>+	0x02, 0xe1, 0x00, 0xf0, 0x00, /* video stream type(2), pid */</div><div class='add'>+	0x06, 0xe1, 0x03, 0xf0, 0x03, /* audio stream type(6), pid */</div><div class='add'>+	0x6a, /* AC3 */</div><div class='add'>+	0x01, /* Descriptor_length(1) */</div><div class='add'>+	0x00, /* component_type_flag(0), bsid_flag(0), mainid_flag(0), asvc_flag(0), reserved flags(0) */</div><div class='add'>+</div><div class='add'>+	0xED, 0xDE, 0x2D, 0xF3 /* CRC32 BE */</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct saa6752hs_mpeg_params param_defaults =</div><div class='ctx'> {</div><div class='ctx'> 	.ts_pid_pmt      = 16,</div><div class='hunk'>@@ -157,12 +217,14 @@ static struct saa6752hs_mpeg_params param_defaults =</div><div class='ctx'> 	.vi_bitrate_peak = 6000,</div><div class='ctx'> 	.vi_bitrate_mode = V4L2_MPEG_VIDEO_BITRATE_MODE_VBR,</div><div class='ctx'> </div><div class='add'>+	.au_encoding     = V4L2_MPEG_AUDIO_ENCODING_LAYER_2,</div><div class='ctx'> 	.au_l2_bitrate   = V4L2_MPEG_AUDIO_L2_BITRATE_256K,</div><div class='add'>+	.au_ac3_bitrate  = V4L2_MPEG_AUDIO_AC3_BITRATE_256K,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* ---------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='del'>-static int saa6752hs_chip_command(struct i2c_client* client,</div><div class='add'>+static int saa6752hs_chip_command(struct i2c_client *client,</div><div class='ctx'> 				  enum saa6752hs_command command)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char buf[3];</div><div class='hunk'>@@ -229,45 +291,61 @@ static int saa6752hs_chip_command(struct i2c_client* client,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int saa6752hs_set_bitrate(struct i2c_client* client,</div><div class='del'>-				 struct saa6752hs_mpeg_params* params)</div><div class='add'>+static inline void set_reg8(struct i2c_client *client, uint8_t reg, uint8_t val)</div><div class='add'>+{</div><div class='add'>+	u8 buf[2];</div><div class='add'>+</div><div class='add'>+	buf[0] = reg;</div><div class='add'>+	buf[1] = val;</div><div class='add'>+	i2c_master_send(client, buf, 2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void set_reg16(struct i2c_client *client, uint8_t reg, uint16_t val)</div><div class='ctx'> {</div><div class='ctx'> 	u8 buf[3];</div><div class='add'>+</div><div class='add'>+	buf[0] = reg;</div><div class='add'>+	buf[1] = val &gt;&gt; 8;</div><div class='add'>+	buf[2] = val &amp; 0xff;</div><div class='add'>+	i2c_master_send(client, buf, 3);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int saa6752hs_set_bitrate(struct i2c_client *client,</div><div class='add'>+				 struct saa6752hs_state *h)</div><div class='add'>+{</div><div class='add'>+	struct saa6752hs_mpeg_params *params = &amp;h-&gt;params;</div><div class='ctx'> 	int tot_bitrate;</div><div class='add'>+	int is_384k;</div><div class='ctx'> </div><div class='ctx'> 	/* set the bitrate mode */</div><div class='del'>-	buf[0] = 0x71;</div><div class='del'>-	buf[1] = (params-&gt;vi_bitrate_mode == V4L2_MPEG_VIDEO_BITRATE_MODE_VBR) ? 0 : 1;</div><div class='del'>-	i2c_master_send(client, buf, 2);</div><div class='add'>+	set_reg8(client, 0x71,</div><div class='add'>+		params-&gt;vi_bitrate_mode != V4L2_MPEG_VIDEO_BITRATE_MODE_VBR);</div><div class='ctx'> </div><div class='ctx'> 	/* set the video bitrate */</div><div class='ctx'> 	if (params-&gt;vi_bitrate_mode == V4L2_MPEG_VIDEO_BITRATE_MODE_VBR) {</div><div class='ctx'> 		/* set the target bitrate */</div><div class='del'>-		buf[0] = 0x80;</div><div class='del'>-		buf[1] = params-&gt;vi_bitrate &gt;&gt; 8;</div><div class='del'>-		buf[2] = params-&gt;vi_bitrate &amp; 0xff;</div><div class='del'>-		i2c_master_send(client, buf, 3);</div><div class='add'>+		set_reg16(client, 0x80, params-&gt;vi_bitrate);</div><div class='ctx'> </div><div class='ctx'> 		/* set the max bitrate */</div><div class='del'>-		buf[0] = 0x81;</div><div class='del'>-		buf[1] = params-&gt;vi_bitrate_peak &gt;&gt; 8;</div><div class='del'>-		buf[2] = params-&gt;vi_bitrate_peak &amp; 0xff;</div><div class='del'>-		i2c_master_send(client, buf, 3);</div><div class='add'>+		set_reg16(client, 0x81, params-&gt;vi_bitrate_peak);</div><div class='ctx'> 		tot_bitrate = params-&gt;vi_bitrate_peak;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* set the target bitrate (no max bitrate for CBR) */</div><div class='del'>-		buf[0] = 0x81;</div><div class='del'>-		buf[1] = params-&gt;vi_bitrate &gt;&gt; 8;</div><div class='del'>-		buf[2] = params-&gt;vi_bitrate &amp; 0xff;</div><div class='del'>-		i2c_master_send(client, buf, 3);</div><div class='add'>+		set_reg16(client, 0x81, params-&gt;vi_bitrate);</div><div class='ctx'> 		tot_bitrate = params-&gt;vi_bitrate;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* set the audio encoding */</div><div class='add'>+	set_reg8(client, 0x93,</div><div class='add'>+			params-&gt;au_encoding == V4L2_MPEG_AUDIO_ENCODING_AC3);</div><div class='add'>+</div><div class='ctx'> 	/* set the audio bitrate */</div><div class='del'>-	buf[0] = 0x94;</div><div class='del'>-	buf[1] = (V4L2_MPEG_AUDIO_L2_BITRATE_256K == params-&gt;au_l2_bitrate) ? 0 : 1;</div><div class='del'>-	i2c_master_send(client, buf, 2);</div><div class='del'>-	tot_bitrate += (V4L2_MPEG_AUDIO_L2_BITRATE_256K == params-&gt;au_l2_bitrate) ? 256 : 384;</div><div class='add'>+	if (params-&gt;au_encoding == V4L2_MPEG_AUDIO_ENCODING_AC3)</div><div class='add'>+		is_384k = V4L2_MPEG_AUDIO_AC3_BITRATE_384K == params-&gt;au_ac3_bitrate;</div><div class='add'>+	else</div><div class='add'>+		is_384k = V4L2_MPEG_AUDIO_L2_BITRATE_384K == params-&gt;au_l2_bitrate;</div><div class='add'>+	set_reg8(client, 0x94, is_384k);</div><div class='add'>+	tot_bitrate += is_384k ? 384 : 256;</div><div class='ctx'> </div><div class='ctx'> 	/* Note: the total max bitrate is determined by adding the video and audio</div><div class='ctx'> 	   bitrates together and also adding an extra 768kbit/s to stay on the</div><div class='hunk'>@@ -278,16 +356,12 @@ static int saa6752hs_set_bitrate(struct i2c_client* client,</div><div class='ctx'> 		tot_bitrate = MPEG_TOTAL_TARGET_BITRATE_MAX;</div><div class='ctx'> </div><div class='ctx'> 	/* set the total bitrate */</div><div class='del'>-	buf[0] = 0xb1;</div><div class='del'>-	buf[1] = tot_bitrate &gt;&gt; 8;</div><div class='del'>-	buf[2] = tot_bitrate &amp; 0xff;</div><div class='del'>-	i2c_master_send(client, buf, 3);</div><div class='del'>-</div><div class='add'>+	set_reg16(client, 0xb1, tot_bitrate);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void saa6752hs_set_subsampling(struct i2c_client* client,</div><div class='del'>-				      struct v4l2_format* f)</div><div class='add'>+static void saa6752hs_set_subsampling(struct i2c_client *client,</div><div class='add'>+				      struct v4l2_format *f)</div><div class='ctx'> {</div><div class='ctx'> 	struct saa6752hs_state *h = i2c_get_clientdata(client);</div><div class='ctx'> 	int dist_352, dist_480, dist_720;</div><div class='hunk'>@@ -332,7 +406,7 @@ static void saa6752hs_set_subsampling(struct i2c_client* client,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int handle_ctrl(struct saa6752hs_mpeg_params *params,</div><div class='add'>+static int handle_ctrl(int has_ac3, struct saa6752hs_mpeg_params *params,</div><div class='ctx'> 		struct v4l2_ext_control *ctrl, unsigned int cmd)</div><div class='ctx'> {</div><div class='ctx'> 	int old = 0, new;</div><div class='hunk'>@@ -379,8 +453,9 @@ static int handle_ctrl(struct saa6752hs_mpeg_params *params,</div><div class='ctx'> 			params-&gt;ts_pid_pcr = new;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case V4L2_CID_MPEG_AUDIO_ENCODING:</div><div class='del'>-			old = V4L2_MPEG_AUDIO_ENCODING_LAYER_2;</div><div class='del'>-			if (set &amp;&amp; new != old)</div><div class='add'>+			old = params-&gt;au_encoding;</div><div class='add'>+			if (set &amp;&amp; new != V4L2_MPEG_AUDIO_ENCODING_LAYER_2 &amp;&amp;</div><div class='add'>+			    (!has_ac3 || new != V4L2_MPEG_AUDIO_ENCODING_AC3))</div><div class='ctx'> 				return -ERANGE;</div><div class='ctx'> 			new = old;</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -395,6 +470,19 @@ static int handle_ctrl(struct saa6752hs_mpeg_params *params,</div><div class='ctx'> 				new = V4L2_MPEG_AUDIO_L2_BITRATE_384K;</div><div class='ctx'> 			params-&gt;au_l2_bitrate = new;</div><div class='ctx'> 			break;</div><div class='add'>+		case V4L2_CID_MPEG_AUDIO_AC3_BITRATE:</div><div class='add'>+			if (!has_ac3)</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			old = params-&gt;au_ac3_bitrate;</div><div class='add'>+			if (set &amp;&amp; new != V4L2_MPEG_AUDIO_AC3_BITRATE_256K &amp;&amp;</div><div class='add'>+				   new != V4L2_MPEG_AUDIO_AC3_BITRATE_384K)</div><div class='add'>+				return -ERANGE;</div><div class='add'>+			if (new &lt;= V4L2_MPEG_AUDIO_AC3_BITRATE_256K)</div><div class='add'>+				new = V4L2_MPEG_AUDIO_AC3_BITRATE_256K;</div><div class='add'>+			else</div><div class='add'>+				new = V4L2_MPEG_AUDIO_AC3_BITRATE_384K;</div><div class='add'>+			params-&gt;au_ac3_bitrate = new;</div><div class='add'>+			break;</div><div class='ctx'> 		case V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ:</div><div class='ctx'> 			old = V4L2_MPEG_AUDIO_SAMPLING_FREQ_48000;</div><div class='ctx'> 			if (set &amp;&amp; new != old)</div><div class='hunk'>@@ -448,17 +536,19 @@ static int handle_ctrl(struct saa6752hs_mpeg_params *params,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int saa6752hs_qctrl(struct saa6752hs_mpeg_params *params,</div><div class='add'>+static int saa6752hs_qctrl(struct saa6752hs_state *h,</div><div class='ctx'> 		struct v4l2_queryctrl *qctrl)</div><div class='ctx'> {</div><div class='add'>+	struct saa6752hs_mpeg_params *params = &amp;h-&gt;params;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	switch (qctrl-&gt;id) {</div><div class='ctx'> 	case V4L2_CID_MPEG_AUDIO_ENCODING:</div><div class='ctx'> 		return v4l2_ctrl_query_fill(qctrl,</div><div class='ctx'> 				V4L2_MPEG_AUDIO_ENCODING_LAYER_2,</div><div class='del'>-				V4L2_MPEG_AUDIO_ENCODING_LAYER_2, 1,</div><div class='del'>-				V4L2_MPEG_AUDIO_ENCODING_LAYER_2);</div><div class='add'>+				h-&gt;has_ac3 ? V4L2_MPEG_AUDIO_ENCODING_AC3 :</div><div class='add'>+					V4L2_MPEG_AUDIO_ENCODING_LAYER_2,</div><div class='add'>+				1, V4L2_MPEG_AUDIO_ENCODING_LAYER_2);</div><div class='ctx'> </div><div class='ctx'> 	case V4L2_CID_MPEG_AUDIO_L2_BITRATE:</div><div class='ctx'> 		return v4l2_ctrl_query_fill(qctrl,</div><div class='hunk'>@@ -466,6 +556,14 @@ static int saa6752hs_qctrl(struct saa6752hs_mpeg_params *params,</div><div class='ctx'> 				V4L2_MPEG_AUDIO_L2_BITRATE_384K, 1,</div><div class='ctx'> 				V4L2_MPEG_AUDIO_L2_BITRATE_256K);</div><div class='ctx'> </div><div class='add'>+	case V4L2_CID_MPEG_AUDIO_AC3_BITRATE:</div><div class='add'>+		if (!h-&gt;has_ac3)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		return v4l2_ctrl_query_fill(qctrl,</div><div class='add'>+				V4L2_MPEG_AUDIO_AC3_BITRATE_256K,</div><div class='add'>+				V4L2_MPEG_AUDIO_AC3_BITRATE_384K, 1,</div><div class='add'>+				V4L2_MPEG_AUDIO_AC3_BITRATE_256K);</div><div class='add'>+</div><div class='ctx'> 	case V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ:</div><div class='ctx'> 		return v4l2_ctrl_query_fill(qctrl,</div><div class='ctx'> 				V4L2_MPEG_AUDIO_SAMPLING_FREQ_48000,</div><div class='hunk'>@@ -512,44 +610,57 @@ static int saa6752hs_qctrl(struct saa6752hs_mpeg_params *params,</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int saa6752hs_qmenu(struct saa6752hs_mpeg_params *params,</div><div class='add'>+static int saa6752hs_qmenu(struct saa6752hs_state *h,</div><div class='ctx'> 		struct v4l2_querymenu *qmenu)</div><div class='ctx'> {</div><div class='del'>-	static const char *mpeg_audio_l2_bitrate[] = {</div><div class='del'>-		"",</div><div class='del'>-		"",</div><div class='del'>-		"",</div><div class='del'>-		"",</div><div class='del'>-		"",</div><div class='del'>-		"",</div><div class='del'>-		"",</div><div class='del'>-		"",</div><div class='del'>-		"",</div><div class='del'>-		"",</div><div class='del'>-		"",</div><div class='del'>-		"256 kbps",</div><div class='del'>-		"",</div><div class='del'>-		"384 kbps",</div><div class='del'>-		NULL</div><div class='add'>+	static const u32 mpeg_audio_encoding[] = {</div><div class='add'>+		V4L2_MPEG_AUDIO_ENCODING_LAYER_2,</div><div class='add'>+		V4L2_CTRL_MENU_IDS_END</div><div class='add'>+	};</div><div class='add'>+	static const u32 mpeg_audio_ac3_encoding[] = {</div><div class='add'>+		V4L2_MPEG_AUDIO_ENCODING_LAYER_2,</div><div class='add'>+		V4L2_MPEG_AUDIO_ENCODING_AC3,</div><div class='add'>+		V4L2_CTRL_MENU_IDS_END</div><div class='add'>+	};</div><div class='add'>+	static u32 mpeg_audio_l2_bitrate[] = {</div><div class='add'>+		V4L2_MPEG_AUDIO_L2_BITRATE_256K,</div><div class='add'>+		V4L2_MPEG_AUDIO_L2_BITRATE_384K,</div><div class='add'>+		V4L2_CTRL_MENU_IDS_END</div><div class='add'>+	};</div><div class='add'>+	static u32 mpeg_audio_ac3_bitrate[] = {</div><div class='add'>+		V4L2_MPEG_AUDIO_AC3_BITRATE_256K,</div><div class='add'>+		V4L2_MPEG_AUDIO_AC3_BITRATE_384K,</div><div class='add'>+		V4L2_CTRL_MENU_IDS_END</div><div class='ctx'> 	};</div><div class='ctx'> 	struct v4l2_queryctrl qctrl;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	qctrl.id = qmenu-&gt;id;</div><div class='del'>-	err = saa6752hs_qctrl(params, &amp;qctrl);</div><div class='add'>+	err = saa6752hs_qctrl(h, &amp;qctrl);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='del'>-	if (qmenu-&gt;id == V4L2_CID_MPEG_AUDIO_L2_BITRATE)</div><div class='del'>-		return v4l2_ctrl_query_menu(qmenu, &amp;qctrl,</div><div class='add'>+	switch (qmenu-&gt;id) {</div><div class='add'>+	case V4L2_CID_MPEG_AUDIO_L2_BITRATE:</div><div class='add'>+		return v4l2_ctrl_query_menu_valid_items(qmenu,</div><div class='ctx'> 				mpeg_audio_l2_bitrate);</div><div class='del'>-	return v4l2_ctrl_query_menu(qmenu, &amp;qctrl,</div><div class='del'>-			v4l2_ctrl_get_menu(qmenu-&gt;id));</div><div class='add'>+	case V4L2_CID_MPEG_AUDIO_AC3_BITRATE:</div><div class='add'>+		if (!h-&gt;has_ac3)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		return v4l2_ctrl_query_menu_valid_items(qmenu,</div><div class='add'>+				mpeg_audio_ac3_bitrate);</div><div class='add'>+	case V4L2_CID_MPEG_AUDIO_ENCODING:</div><div class='add'>+		return v4l2_ctrl_query_menu_valid_items(qmenu,</div><div class='add'>+			h-&gt;has_ac3 ? mpeg_audio_ac3_encoding :</div><div class='add'>+				mpeg_audio_encoding);</div><div class='add'>+	}</div><div class='add'>+	return v4l2_ctrl_query_menu(qmenu, &amp;qctrl, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int saa6752hs_init(struct i2c_client* client)</div><div class='add'>+static int saa6752hs_init(struct i2c_client *client, u32 leading_null_bytes)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char buf[9], buf2[4];</div><div class='ctx'> 	struct saa6752hs_state *h;</div><div class='add'>+	unsigned size;</div><div class='ctx'> 	u32 crc;</div><div class='ctx'> 	unsigned char localPAT[256];</div><div class='ctx'> 	unsigned char localPMT[256];</div><div class='hunk'>@@ -557,45 +668,31 @@ static int saa6752hs_init(struct i2c_client* client)</div><div class='ctx'> 	h = i2c_get_clientdata(client);</div><div class='ctx'> </div><div class='ctx'> 	/* Set video format - must be done first as it resets other settings */</div><div class='del'>-	buf[0] = 0x41;</div><div class='del'>-	buf[1] = h-&gt;video_format;</div><div class='del'>-	i2c_master_send(client, buf, 2);</div><div class='add'>+	set_reg8(client, 0x41, h-&gt;video_format);</div><div class='ctx'> </div><div class='ctx'> 	/* Set number of lines in input signal */</div><div class='del'>-	buf[0] = 0x40;</div><div class='del'>-	buf[1] = 0x00;</div><div class='del'>-	if (h-&gt;standard &amp; V4L2_STD_525_60)</div><div class='del'>-		buf[1] = 0x01;</div><div class='del'>-	i2c_master_send(client, buf, 2);</div><div class='add'>+	set_reg8(client, 0x40, (h-&gt;standard &amp; V4L2_STD_525_60) ? 1 : 0);</div><div class='ctx'> </div><div class='ctx'> 	/* set bitrate */</div><div class='del'>-	saa6752hs_set_bitrate(client, &amp;h-&gt;params);</div><div class='add'>+	saa6752hs_set_bitrate(client, h);</div><div class='ctx'> </div><div class='ctx'> 	/* Set GOP structure {3, 13} */</div><div class='del'>-	buf[0] = 0x72;</div><div class='del'>-	buf[1] = 0x03;</div><div class='del'>-	buf[2] = 0x0D;</div><div class='del'>-	i2c_master_send(client,buf,3);</div><div class='add'>+	set_reg16(client, 0x72, 0x030d);</div><div class='ctx'> </div><div class='ctx'> 	/* Set minimum Q-scale {4} */</div><div class='del'>-	buf[0] = 0x82;</div><div class='del'>-	buf[1] = 0x04;</div><div class='del'>-	i2c_master_send(client,buf,2);</div><div class='add'>+	set_reg8(client, 0x82, 0x04);</div><div class='ctx'> </div><div class='ctx'> 	/* Set maximum Q-scale {12} */</div><div class='del'>-	buf[0] = 0x83;</div><div class='del'>-	buf[1] = 0x0C;</div><div class='del'>-	i2c_master_send(client,buf,2);</div><div class='add'>+	set_reg8(client, 0x83, 0x0c);</div><div class='ctx'> </div><div class='ctx'> 	/* Set Output Protocol */</div><div class='del'>-	buf[0] = 0xD0;</div><div class='del'>-	buf[1] = 0x81;</div><div class='del'>-	i2c_master_send(client,buf,2);</div><div class='add'>+	set_reg8(client, 0xd0, 0x81);</div><div class='ctx'> </div><div class='ctx'> 	/* Set video output stream format {TS} */</div><div class='del'>-	buf[0] = 0xB0;</div><div class='del'>-	buf[1] = 0x05;</div><div class='del'>-	i2c_master_send(client,buf,2);</div><div class='add'>+	set_reg8(client, 0xb0, 0x05);</div><div class='add'>+</div><div class='add'>+	/* Set leading null byte for TS */</div><div class='add'>+	set_reg16(client, 0xf6, leading_null_bytes);</div><div class='ctx'> </div><div class='ctx'> 	/* compute PAT */</div><div class='ctx'> 	memcpy(localPAT, PAT, sizeof(PAT));</div><div class='hunk'>@@ -608,7 +705,13 @@ static int saa6752hs_init(struct i2c_client* client)</div><div class='ctx'> 	localPAT[sizeof(PAT) - 1] = crc &amp; 0xFF;</div><div class='ctx'> </div><div class='ctx'> 	/* compute PMT */</div><div class='del'>-	memcpy(localPMT, PMT, sizeof(PMT));</div><div class='add'>+	if (h-&gt;params.au_encoding == V4L2_MPEG_AUDIO_ENCODING_AC3) {</div><div class='add'>+		size = sizeof(PMT_AC3);</div><div class='add'>+		memcpy(localPMT, PMT_AC3, size);</div><div class='add'>+	} else {</div><div class='add'>+		size = sizeof(PMT);</div><div class='add'>+		memcpy(localPMT, PMT, size);</div><div class='add'>+	}</div><div class='ctx'> 	localPMT[3] = 0x40 | ((h-&gt;params.ts_pid_pmt &gt;&gt; 8) &amp; 0x0f);</div><div class='ctx'> 	localPMT[4] = h-&gt;params.ts_pid_pmt &amp; 0xff;</div><div class='ctx'> 	localPMT[15] = 0xE0 | ((h-&gt;params.ts_pid_pcr &gt;&gt; 8) &amp; 0x0F);</div><div class='hunk'>@@ -617,40 +720,28 @@ static int saa6752hs_init(struct i2c_client* client)</div><div class='ctx'> 	localPMT[21] = h-&gt;params.ts_pid_video &amp; 0xFF;</div><div class='ctx'> 	localPMT[25] = 0xE0 | ((h-&gt;params.ts_pid_audio &gt;&gt; 8) &amp; 0x0F);</div><div class='ctx'> 	localPMT[26] = h-&gt;params.ts_pid_audio &amp; 0xFF;</div><div class='del'>-	crc = crc32_be(~0, &amp;localPMT[7], sizeof(PMT) - 7 - 4);</div><div class='del'>-	localPMT[sizeof(PMT) - 4] = (crc &gt;&gt; 24) &amp; 0xFF;</div><div class='del'>-	localPMT[sizeof(PMT) - 3] = (crc &gt;&gt; 16) &amp; 0xFF;</div><div class='del'>-	localPMT[sizeof(PMT) - 2] = (crc &gt;&gt; 8) &amp; 0xFF;</div><div class='del'>-	localPMT[sizeof(PMT) - 1] = crc &amp; 0xFF;</div><div class='add'>+	crc = crc32_be(~0, &amp;localPMT[7], size - 7 - 4);</div><div class='add'>+	localPMT[size - 4] = (crc &gt;&gt; 24) &amp; 0xFF;</div><div class='add'>+	localPMT[size - 3] = (crc &gt;&gt; 16) &amp; 0xFF;</div><div class='add'>+	localPMT[size - 2] = (crc &gt;&gt; 8) &amp; 0xFF;</div><div class='add'>+	localPMT[size - 1] = crc &amp; 0xFF;</div><div class='ctx'> </div><div class='ctx'> 	/* Set Audio PID */</div><div class='del'>-	buf[0] = 0xC1;</div><div class='del'>-	buf[1] = (h-&gt;params.ts_pid_audio &gt;&gt; 8) &amp; 0xFF;</div><div class='del'>-	buf[2] = h-&gt;params.ts_pid_audio &amp; 0xFF;</div><div class='del'>-	i2c_master_send(client,buf,3);</div><div class='add'>+	set_reg16(client, 0xc1, h-&gt;params.ts_pid_audio);</div><div class='ctx'> </div><div class='ctx'> 	/* Set Video PID */</div><div class='del'>-	buf[0] = 0xC0;</div><div class='del'>-	buf[1] = (h-&gt;params.ts_pid_video &gt;&gt; 8) &amp; 0xFF;</div><div class='del'>-	buf[2] = h-&gt;params.ts_pid_video &amp; 0xFF;</div><div class='del'>-	i2c_master_send(client,buf,3);</div><div class='add'>+	set_reg16(client, 0xc0, h-&gt;params.ts_pid_video);</div><div class='ctx'> </div><div class='ctx'> 	/* Set PCR PID */</div><div class='del'>-	buf[0] = 0xC4;</div><div class='del'>-	buf[1] = (h-&gt;params.ts_pid_pcr &gt;&gt; 8) &amp; 0xFF;</div><div class='del'>-	buf[2] = h-&gt;params.ts_pid_pcr &amp; 0xFF;</div><div class='del'>-	i2c_master_send(client,buf,3);</div><div class='add'>+	set_reg16(client, 0xc4, h-&gt;params.ts_pid_pcr);</div><div class='ctx'> </div><div class='ctx'> 	/* Send SI tables */</div><div class='del'>-	i2c_master_send(client,localPAT,sizeof(PAT));</div><div class='del'>-	i2c_master_send(client,localPMT,sizeof(PMT));</div><div class='add'>+	i2c_master_send(client, localPAT, sizeof(PAT));</div><div class='add'>+	i2c_master_send(client, localPMT, size);</div><div class='ctx'> </div><div class='ctx'> 	/* mute then unmute audio. This removes buzzing artefacts */</div><div class='del'>-	buf[0] = 0xa4;</div><div class='del'>-	buf[1] = 1;</div><div class='del'>-	i2c_master_send(client, buf, 2);</div><div class='del'>-	buf[1] = 0;</div><div class='del'>-	i2c_master_send(client, buf, 2);</div><div class='add'>+	set_reg8(client, 0xa4, 1);</div><div class='add'>+	set_reg8(client, 0xa4, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* start it going */</div><div class='ctx'> 	saa6752hs_chip_command(client, SAA6752HS_COMMAND_START);</div><div class='hunk'>@@ -688,45 +779,6 @@ static int saa6752hs_init(struct i2c_client* client)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int saa6752hs_attach(struct i2c_adapter *adap, int addr, int kind)</div><div class='del'>-{</div><div class='del'>-	struct saa6752hs_state *h;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	if (NULL == (h = kzalloc(sizeof(*h), GFP_KERNEL)))</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	h-&gt;client = client_template;</div><div class='del'>-	h-&gt;params = param_defaults;</div><div class='del'>-	h-&gt;client.adapter = adap;</div><div class='del'>-	h-&gt;client.addr = addr;</div><div class='del'>-</div><div class='del'>-	/* Assume 625 input lines */</div><div class='del'>-	h-&gt;standard = 0;</div><div class='del'>-</div><div class='del'>-	i2c_set_clientdata(&amp;h-&gt;client, h);</div><div class='del'>-	i2c_attach_client(&amp;h-&gt;client);</div><div class='del'>-</div><div class='del'>-	v4l_info(&amp;h-&gt;client,"saa6752hs: chip found @ 0x%x\n", addr&lt;&lt;1);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int saa6752hs_probe(struct i2c_adapter *adap)</div><div class='del'>-{</div><div class='del'>-	if (adap-&gt;class &amp; I2C_CLASS_TV_ANALOG)</div><div class='del'>-		return i2c_probe(adap, &amp;addr_data, saa6752hs_attach);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int saa6752hs_detach(struct i2c_client *client)</div><div class='del'>-{</div><div class='del'>-	struct saa6752hs_state *h;</div><div class='del'>-</div><div class='del'>-	h = i2c_get_clientdata(client);</div><div class='del'>-	i2c_detach_client(client);</div><div class='del'>-	kfree(h);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int</div><div class='ctx'> saa6752hs_command(struct i2c_client *client, unsigned int cmd, void *arg)</div><div class='ctx'> {</div><div class='hunk'>@@ -737,14 +789,13 @@ saa6752hs_command(struct i2c_client *client, unsigned int cmd, void *arg)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='add'>+	case VIDIOC_INT_INIT:</div><div class='add'>+		/* apply settings and start encoder */</div><div class='add'>+		saa6752hs_init(client, *(u32 *)arg);</div><div class='add'>+		break;</div><div class='ctx'> 	case VIDIOC_S_EXT_CTRLS:</div><div class='ctx'> 		if (ctrls-&gt;ctrl_class != V4L2_CTRL_CLASS_MPEG)</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-		if (ctrls-&gt;count == 0) {</div><div class='del'>-			/* apply settings and start encoder */</div><div class='del'>-			saa6752hs_init(client);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='ctx'> 		/* fall through */</div><div class='ctx'> 	case VIDIOC_TRY_EXT_CTRLS:</div><div class='ctx'> 	case VIDIOC_G_EXT_CTRLS:</div><div class='hunk'>@@ -752,7 +803,8 @@ saa6752hs_command(struct i2c_client *client, unsigned int cmd, void *arg)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		params = h-&gt;params;</div><div class='ctx'> 		for (i = 0; i &lt; ctrls-&gt;count; i++) {</div><div class='del'>-			if ((err = handle_ctrl(&amp;params, ctrls-&gt;controls + i, cmd))) {</div><div class='add'>+			err = handle_ctrl(h-&gt;has_ac3, &amp;params, ctrls-&gt;controls + i, cmd);</div><div class='add'>+			if (err) {</div><div class='ctx'> 				ctrls-&gt;error_idx = i;</div><div class='ctx'> 				return err;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -760,9 +812,9 @@ saa6752hs_command(struct i2c_client *client, unsigned int cmd, void *arg)</div><div class='ctx'> 		h-&gt;params = params;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case VIDIOC_QUERYCTRL:</div><div class='del'>-		return saa6752hs_qctrl(&amp;h-&gt;params, arg);</div><div class='add'>+		return saa6752hs_qctrl(h, arg);</div><div class='ctx'> 	case VIDIOC_QUERYMENU:</div><div class='del'>-		return saa6752hs_qmenu(&amp;h-&gt;params, arg);</div><div class='add'>+		return saa6752hs_qmenu(h, arg);</div><div class='ctx'> 	case VIDIOC_G_FMT:</div><div class='ctx'> 	{</div><div class='ctx'> 	   struct v4l2_format *f = arg;</div><div class='hunk'>@@ -785,6 +837,11 @@ saa6752hs_command(struct i2c_client *client, unsigned int cmd, void *arg)</div><div class='ctx'> 	case VIDIOC_S_STD:</div><div class='ctx'> 		h-&gt;standard = *((v4l2_std_id *) arg);</div><div class='ctx'> 		break;</div><div class='add'>+</div><div class='add'>+	case VIDIOC_G_CHIP_IDENT:</div><div class='add'>+		return v4l2_chip_ident_i2c_client(client,</div><div class='add'>+				arg, h-&gt;chip, h-&gt;revision);</div><div class='add'>+</div><div class='ctx'> 	default:</div><div class='ctx'> 		/* nothing */</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -793,36 +850,55 @@ saa6752hs_command(struct i2c_client *client, unsigned int cmd, void *arg)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* ----------------------------------------------------------------------- */</div><div class='add'>+static int saa6752hs_probe(struct i2c_client *client,</div><div class='add'>+			const struct i2c_device_id *id)</div><div class='add'>+{</div><div class='add'>+	struct saa6752hs_state *h = kzalloc(sizeof(*h), GFP_KERNEL);</div><div class='add'>+	u8 addr = 0x13;</div><div class='add'>+	u8 data[12];</div><div class='ctx'> </div><div class='del'>-static struct i2c_driver driver = {</div><div class='del'>-	.driver = {</div><div class='del'>-		.name   = "saa6752hs",</div><div class='del'>-	},</div><div class='del'>-	.id             = I2C_DRIVERID_SAA6752HS,</div><div class='del'>-	.attach_adapter = saa6752hs_probe,</div><div class='del'>-	.detach_client  = saa6752hs_detach,</div><div class='del'>-	.command        = saa6752hs_command,</div><div class='del'>-};</div><div class='add'>+	v4l_info(client, "chip found @ 0x%x (%s)\n",</div><div class='add'>+			client-&gt;addr &lt;&lt; 1, client-&gt;adapter-&gt;name);</div><div class='add'>+	if (h == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-static struct i2c_client client_template =</div><div class='del'>-{</div><div class='del'>-	.name       = "saa6752hs",</div><div class='del'>-	.driver     = &amp;driver,</div><div class='del'>-};</div><div class='add'>+	i2c_master_send(client, &amp;addr, 1);</div><div class='add'>+	i2c_master_recv(client, data, sizeof(data));</div><div class='add'>+	h-&gt;chip = V4L2_IDENT_SAA6752HS;</div><div class='add'>+	h-&gt;revision = (data[8] &lt;&lt; 8) | data[9];</div><div class='add'>+	h-&gt;has_ac3 = 0;</div><div class='add'>+	if (h-&gt;revision == 0x0206) {</div><div class='add'>+		h-&gt;chip = V4L2_IDENT_SAA6752HS_AC3;</div><div class='add'>+		h-&gt;has_ac3 = 1;</div><div class='add'>+		v4l_info(client, "support AC-3\n");</div><div class='add'>+	}</div><div class='add'>+	h-&gt;params = param_defaults;</div><div class='add'>+	h-&gt;standard = 0; /* Assume 625 input lines */</div><div class='ctx'> </div><div class='del'>-static int __init saa6752hs_init_module(void)</div><div class='del'>-{</div><div class='del'>-	return i2c_add_driver(&amp;driver);</div><div class='add'>+	i2c_set_clientdata(client, h);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __exit saa6752hs_cleanup_module(void)</div><div class='add'>+static int saa6752hs_remove(struct i2c_client *client)</div><div class='ctx'> {</div><div class='del'>-	i2c_del_driver(&amp;driver);</div><div class='add'>+	kfree(i2c_get_clientdata(client));</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(saa6752hs_init_module);</div><div class='del'>-module_exit(saa6752hs_cleanup_module);</div><div class='add'>+static const struct i2c_device_id saa6752hs_id[] = {</div><div class='add'>+	{ "saa6752hs", 0 },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(i2c, saa6752hs_id);</div><div class='add'>+</div><div class='add'>+static struct v4l2_i2c_driver_data v4l2_i2c_data = {</div><div class='add'>+	.name = "saa6752hs",</div><div class='add'>+	.driverid = I2C_DRIVERID_SAA6752HS,</div><div class='add'>+	.command = saa6752hs_command,</div><div class='add'>+	.probe = saa6752hs_probe,</div><div class='add'>+	.remove = saa6752hs_remove,</div><div class='add'>+	.id_table = saa6752hs_id,</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Overrides for Emacs so that we follow Linus's tabbing style.</div><div class='head'>diff --git a/drivers/media/video/saa7134/saa7134-alsa.c b/drivers/media/video/saa7134/saa7134-alsa.c<br/>index 9929d20320b4..26194a0ce927 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/saa7134/saa7134-alsa.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/saa7134/saa7134-alsa.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/saa7134/saa7134-alsa.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/saa7134/saa7134-alsa.c</a></div><div class='hunk'>@@ -488,10 +488,12 @@ static int snd_card_saa7134_hw_params(struct snd_pcm_substream * substream,</div><div class='ctx'> 	period_size = params_period_bytes(hw_params);</div><div class='ctx'> 	periods = params_periods(hw_params);</div><div class='ctx'> </div><div class='del'>-	snd_assert(period_size &gt;= 0x100 &amp;&amp; period_size &lt;= 0x10000,</div><div class='del'>-		   return -EINVAL);</div><div class='del'>-	snd_assert(periods &gt;= 4, return -EINVAL);</div><div class='del'>-	snd_assert(period_size * periods &lt;= 1024 * 1024, return -EINVAL);</div><div class='add'>+	if (period_size &lt; 0x100 || period_size &gt; 0x10000)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (periods &lt; 4)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (period_size * periods &gt; 1024 * 1024)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	dev = saa7134-&gt;dev;</div><div class='ctx'> </div><div class='hunk'>@@ -942,7 +944,8 @@ static int snd_card_saa7134_new_mixer(snd_card_saa7134_t * chip)</div><div class='ctx'> 	unsigned int idx;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	snd_assert(chip != NULL, return -EINVAL);</div><div class='add'>+	if (snd_BUG_ON(!chip))</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	strcpy(card-&gt;mixername, "SAA7134 Mixer");</div><div class='ctx'> </div><div class='ctx'> 	for (idx = 0; idx &lt; ARRAY_SIZE(snd_saa7134_controls); idx++) {</div><div class='head'>diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c<br/>index 98364d171def..ddc5402c5fb0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/saa7134/saa7134-cards.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/saa7134/saa7134-cards.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/saa7134/saa7134-cards.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/saa7134/saa7134-cards.c</a></div><div class='hunk'>@@ -3260,6 +3260,7 @@ struct saa7134_board saa7134_boards[] = {</div><div class='ctx'> 	},</div><div class='ctx'> 	[SAA7134_BOARD_HAUPPAUGE_HVR1110] = {</div><div class='ctx'> 		/* Thomas Genty &lt;tomlohave@gmail.com&gt; */</div><div class='add'>+		/* David Bentham &lt;db260179@hotmail.com&gt; */</div><div class='ctx'> 		.name           = "Hauppauge WinTV-HVR1110 DVB-T/Hybrid",</div><div class='ctx'> 		.audio_clock    = 0x00187de7,</div><div class='ctx'> 		.tuner_type     = TUNER_PHILIPS_TDA8290,</div><div class='hunk'>@@ -3268,23 +3269,26 @@ struct saa7134_board saa7134_boards[] = {</div><div class='ctx'> 		.radio_addr     = ADDR_UNSET,</div><div class='ctx'> 		.tuner_config   = 1,</div><div class='ctx'> 		.mpeg           = SAA7134_MPEG_DVB,</div><div class='add'>+		.gpiomask       = 0x0200100,</div><div class='ctx'> 		.inputs         = {{</div><div class='ctx'> 			.name = name_tv,</div><div class='ctx'> 			.vmux = 1,</div><div class='ctx'> 			.amux = TV,</div><div class='ctx'> 			.tv   = 1,</div><div class='del'>-		},{</div><div class='del'>-			.name   = name_comp1,</div><div class='del'>-			.vmux   = 3,</div><div class='del'>-			.amux   = LINE2, /* FIXME: audio doesn't work on svideo/composite */</div><div class='del'>-		},{</div><div class='del'>-			.name   = name_svideo,</div><div class='del'>-			.vmux   = 8,</div><div class='del'>-			.amux   = LINE2, /* FIXME: audio doesn't work on svideo/composite */</div><div class='del'>-		}},</div><div class='add'>+			.gpio = 0x0000100,</div><div class='add'>+		}, {</div><div class='add'>+			.name = name_comp1,</div><div class='add'>+			.vmux = 3,</div><div class='add'>+			.amux = LINE1,</div><div class='add'>+		}, {</div><div class='add'>+			.name = name_svideo,</div><div class='add'>+			.vmux = 8,</div><div class='add'>+			.amux = LINE1,</div><div class='add'>+		} },</div><div class='ctx'> 		.radio = {</div><div class='ctx'> 			.name = name_radio,</div><div class='del'>-			.amux   = TV,</div><div class='add'>+			.amux = TV,</div><div class='add'>+			.gpio = 0x0200100,</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='ctx'> 	[SAA7134_BOARD_CINERGY_HT_PCMCIA] = {</div><div class='hunk'>@@ -3388,6 +3392,42 @@ struct saa7134_board saa7134_boards[] = {</div><div class='ctx'> 			.amux = 0,</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='add'>+	[SAA7134_BOARD_ENCORE_ENLTV_FM53] = {</div><div class='add'>+		.name           = "Encore ENLTV-FM v5.3",</div><div class='add'>+		.audio_clock    = 0x00200000,</div><div class='add'>+		.tuner_type     = TUNER_TNF_5335MF,</div><div class='add'>+		.radio_type     = UNSET,</div><div class='add'>+		.tuner_addr	= ADDR_UNSET,</div><div class='add'>+		.radio_addr	= ADDR_UNSET,</div><div class='add'>+		.gpiomask	= 0x7000,</div><div class='add'>+		.inputs         = { {</div><div class='add'>+			.name = name_tv,</div><div class='add'>+			.vmux = 1,</div><div class='add'>+			.amux = 1,</div><div class='add'>+			.tv   = 1,</div><div class='add'>+			.gpio = 0x50000,</div><div class='add'>+		}, {</div><div class='add'>+			.name = name_comp1,</div><div class='add'>+			.vmux = 3,</div><div class='add'>+			.amux = 2,</div><div class='add'>+			.gpio = 0x2000,</div><div class='add'>+		}, {</div><div class='add'>+			.name = name_svideo,</div><div class='add'>+			.vmux = 8,</div><div class='add'>+			.amux = 2,</div><div class='add'>+			.gpio = 0x2000,</div><div class='add'>+		} },</div><div class='add'>+		.radio = {</div><div class='add'>+			.name = name_radio,</div><div class='add'>+			.vmux = 1,</div><div class='add'>+			.amux = 1,</div><div class='add'>+		},</div><div class='add'>+		.mute = {</div><div class='add'>+			.name = name_mute,</div><div class='add'>+			.gpio = 0xf000,</div><div class='add'>+			.amux = 0,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='ctx'> 	[SAA7134_BOARD_CINERGY_HT_PCI] = {</div><div class='ctx'> 		.name           = "Terratec Cinergy HT PCI",</div><div class='ctx'> 		.audio_clock    = 0x00187de7,</div><div class='hunk'>@@ -3631,6 +3671,40 @@ struct saa7134_board saa7134_boards[] = {</div><div class='ctx'> 			.tv     = 1,</div><div class='ctx'> 		}},</div><div class='ctx'> 	},</div><div class='add'>+	[SAA7134_BOARD_AVERMEDIA_M135A] = {</div><div class='add'>+		.name           = "Avermedia PCI pure analog (M135A)",</div><div class='add'>+		.audio_clock    = 0x00187de7,</div><div class='add'>+		.tuner_type     = TUNER_PHILIPS_TDA8290,</div><div class='add'>+		.radio_type     = UNSET,</div><div class='add'>+		.tuner_addr     = ADDR_UNSET,</div><div class='add'>+		.radio_addr     = ADDR_UNSET,</div><div class='add'>+		.tuner_config   = 2,</div><div class='add'>+		.gpiomask       = 0x020200000,</div><div class='add'>+		.inputs         = {{</div><div class='add'>+			.name = name_tv,</div><div class='add'>+			.vmux = 1,</div><div class='add'>+			.amux = TV,</div><div class='add'>+			.tv   = 1,</div><div class='add'>+		}, {</div><div class='add'>+			.name = name_comp1,</div><div class='add'>+			.vmux = 3,</div><div class='add'>+			.amux = LINE1,</div><div class='add'>+		}, {</div><div class='add'>+			.name = name_svideo,</div><div class='add'>+			.vmux = 8,</div><div class='add'>+			.amux = LINE1,</div><div class='add'>+		} },</div><div class='add'>+		.radio = {</div><div class='add'>+			.name = name_radio,</div><div class='add'>+			.amux = TV,</div><div class='add'>+			.gpio = 0x00200000,</div><div class='add'>+		},</div><div class='add'>+		.mute = {</div><div class='add'>+			.name = name_mute,</div><div class='add'>+			.amux = TV,</div><div class='add'>+			.gpio = 0x01,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='ctx'> 	[SAA7134_BOARD_BEHOLD_401] = {</div><div class='ctx'> 		/*       Beholder Intl. Ltd. 2008      */</div><div class='ctx'> 		/*Dmitry Belimov &lt;d.belimov@gmail.com&gt; */</div><div class='hunk'>@@ -4409,6 +4483,129 @@ struct saa7134_board saa7134_boards[] = {</div><div class='ctx'> 		/* no DVB support for now */</div><div class='ctx'> 		/* .mpeg           = SAA7134_MPEG_DVB, */</div><div class='ctx'> 	},</div><div class='add'>+	[SAA7134_BOARD_ASUSTeK_TIGER_3IN1] = {</div><div class='add'>+		.name           = "Asus Tiger 3in1",</div><div class='add'>+		.audio_clock    = 0x00187de7,</div><div class='add'>+		.tuner_type     = TUNER_PHILIPS_TDA8290,</div><div class='add'>+		.radio_type     = UNSET,</div><div class='add'>+		.tuner_addr     = ADDR_UNSET,</div><div class='add'>+		.radio_addr     = ADDR_UNSET,</div><div class='add'>+		.tuner_config   = 2,</div><div class='add'>+		.gpiomask       = 1 &lt;&lt; 21,</div><div class='add'>+		.mpeg           = SAA7134_MPEG_DVB,</div><div class='add'>+		.inputs         = {{</div><div class='add'>+			.name = name_tv,</div><div class='add'>+			.vmux = 1,</div><div class='add'>+			.amux = TV,</div><div class='add'>+			.tv   = 1,</div><div class='add'>+		}, {</div><div class='add'>+			.name = name_comp,</div><div class='add'>+			.vmux = 0,</div><div class='add'>+			.amux = LINE2,</div><div class='add'>+		}, {</div><div class='add'>+			.name = name_svideo,</div><div class='add'>+			.vmux = 8,</div><div class='add'>+			.amux = LINE2,</div><div class='add'>+		} },</div><div class='add'>+		.radio = {</div><div class='add'>+			.name = name_radio,</div><div class='add'>+			.amux = TV,</div><div class='add'>+			.gpio = 0x0200000,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	[SAA7134_BOARD_REAL_ANGEL_220] = {</div><div class='add'>+		.name           = "Zogis Real Angel 220",</div><div class='add'>+		.audio_clock    = 0x00187de7,</div><div class='add'>+		.tuner_type     = TUNER_TNF_5335MF,</div><div class='add'>+		.radio_type     = UNSET,</div><div class='add'>+		.tuner_addr     = ADDR_UNSET,</div><div class='add'>+		.radio_addr     = ADDR_UNSET,</div><div class='add'>+		.gpiomask       = 0x801a8087,</div><div class='add'>+		.inputs = { {</div><div class='add'>+			.name   = name_tv,</div><div class='add'>+			.vmux   = 3,</div><div class='add'>+			.amux   = LINE2,</div><div class='add'>+			.tv     = 1,</div><div class='add'>+			.gpio   = 0x624000,</div><div class='add'>+		}, {</div><div class='add'>+			.name   = name_comp1,</div><div class='add'>+			.vmux   = 1,</div><div class='add'>+			.amux   = LINE1,</div><div class='add'>+			.gpio   = 0x624000,</div><div class='add'>+		}, {</div><div class='add'>+			.name   = name_svideo,</div><div class='add'>+			.vmux   = 1,</div><div class='add'>+			.amux   = LINE1,</div><div class='add'>+			.gpio   = 0x624000,</div><div class='add'>+		} },</div><div class='add'>+		.radio = {</div><div class='add'>+			.name   = name_radio,</div><div class='add'>+			.amux   = LINE2,</div><div class='add'>+			.gpio   = 0x624001,</div><div class='add'>+		},</div><div class='add'>+		.mute = {</div><div class='add'>+			.name = name_mute,</div><div class='add'>+			.amux = TV,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	[SAA7134_BOARD_ADS_INSTANT_HDTV_PCI] = {</div><div class='add'>+		.name           = "ADS Tech Instant HDTV",</div><div class='add'>+		.audio_clock    = 0x00187de7,</div><div class='add'>+		.tuner_type     = TUNER_PHILIPS_TUV1236D,</div><div class='add'>+		.radio_type     = UNSET,</div><div class='add'>+		.tuner_addr     = ADDR_UNSET,</div><div class='add'>+		.radio_addr     = ADDR_UNSET,</div><div class='add'>+		.tda9887_conf   = TDA9887_PRESENT,</div><div class='add'>+		.mpeg           = SAA7134_MPEG_DVB,</div><div class='add'>+		.inputs         = { {</div><div class='add'>+			.name = name_tv,</div><div class='add'>+			.vmux = 1,</div><div class='add'>+			.amux = TV,</div><div class='add'>+			.tv   = 1,</div><div class='add'>+		}, {</div><div class='add'>+			.name = name_comp,</div><div class='add'>+			.vmux = 4,</div><div class='add'>+			.amux = LINE1,</div><div class='add'>+		}, {</div><div class='add'>+			.name = name_svideo,</div><div class='add'>+			.vmux = 8,</div><div class='add'>+			.amux = LINE1,</div><div class='add'>+		} },</div><div class='add'>+	},</div><div class='add'>+	[SAA7134_BOARD_ASUSTeK_TIGER] = {</div><div class='add'>+		.name           = "Asus Tiger Rev:1.00",</div><div class='add'>+		.audio_clock    = 0x00187de7,</div><div class='add'>+		.tuner_type     = TUNER_PHILIPS_TDA8290,</div><div class='add'>+		.radio_type     = UNSET,</div><div class='add'>+		.tuner_addr	= ADDR_UNSET,</div><div class='add'>+		.radio_addr	= ADDR_UNSET,</div><div class='add'>+		.tuner_config   = 0,</div><div class='add'>+		.mpeg           = SAA7134_MPEG_DVB,</div><div class='add'>+		.gpiomask       = 0x0200000,</div><div class='add'>+		.inputs = { {</div><div class='add'>+			.name   = name_tv,</div><div class='add'>+			.vmux   = 1,</div><div class='add'>+			.amux   = TV,</div><div class='add'>+			.tv     = 1,</div><div class='add'>+		}, {</div><div class='add'>+			.name   = name_comp1,</div><div class='add'>+			.vmux   = 3,</div><div class='add'>+			.amux   = LINE2,</div><div class='add'>+		}, {</div><div class='add'>+			.name   = name_comp2,</div><div class='add'>+			.vmux   = 0,</div><div class='add'>+			.amux   = LINE2,</div><div class='add'>+		}, {</div><div class='add'>+			.name   = name_svideo,</div><div class='add'>+			.vmux   = 8,</div><div class='add'>+			.amux   = LINE2,</div><div class='add'>+		} },</div><div class='add'>+		.radio = {</div><div class='add'>+			.name   = name_radio,</div><div class='add'>+			.amux   = TV,</div><div class='add'>+			.gpio   = 0x0200000,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards);</div><div class='hunk'>@@ -4777,6 +4974,12 @@ struct pci_device_id saa7134_pci_tbl[] = {</div><div class='ctx'> </div><div class='ctx'> 	},{</div><div class='ctx'> 		.vendor       = PCI_VENDOR_ID_PHILIPS,</div><div class='add'>+		.device       = PCI_DEVICE_ID_PHILIPS_SAA7133,</div><div class='add'>+		.subvendor    = 0x1461, /* Avermedia Technologies Inc */</div><div class='add'>+		.subdevice    = 0xf11d,</div><div class='add'>+		.driver_data  = SAA7134_BOARD_AVERMEDIA_M135A,</div><div class='add'>+	}, {</div><div class='add'>+		.vendor       = PCI_VENDOR_ID_PHILIPS,</div><div class='ctx'> 		.device       = PCI_DEVICE_ID_PHILIPS_SAA7130,</div><div class='ctx'> 		.subvendor    = PCI_VENDOR_ID_PHILIPS,</div><div class='ctx'> 		.subdevice    = 0x2004,</div><div class='hunk'>@@ -5157,6 +5360,12 @@ struct pci_device_id saa7134_pci_tbl[] = {</div><div class='ctx'> 		.driver_data  = SAA7134_BOARD_ENCORE_ENLTV_FM,</div><div class='ctx'> 	},{</div><div class='ctx'> 		.vendor       = PCI_VENDOR_ID_PHILIPS,</div><div class='add'>+		.device       = PCI_DEVICE_ID_PHILIPS_SAA7130,</div><div class='add'>+		.subvendor    = 0x1a7f,</div><div class='add'>+		.subdevice    = 0x2008,</div><div class='add'>+		.driver_data  = SAA7134_BOARD_ENCORE_ENLTV_FM53,</div><div class='add'>+	}, {</div><div class='add'>+		.vendor       = PCI_VENDOR_ID_PHILIPS,</div><div class='ctx'> 		.device       = PCI_DEVICE_ID_PHILIPS_SAA7133,</div><div class='ctx'> 		.subvendor    = 0x153b,</div><div class='ctx'> 		.subdevice    = 0x1175,</div><div class='hunk'>@@ -5183,8 +5392,8 @@ struct pci_device_id saa7134_pci_tbl[] = {</div><div class='ctx'> 		.vendor       = PCI_VENDOR_ID_PHILIPS,</div><div class='ctx'> 		.device       = PCI_DEVICE_ID_PHILIPS_SAA7133,</div><div class='ctx'> 		.subvendor    = 0x1043,</div><div class='del'>-		.subdevice    = 0x4857,</div><div class='del'>-		.driver_data  = SAA7134_BOARD_ASUSTeK_P7131_DUAL,</div><div class='add'>+		.subdevice    = 0x4857,		/* REV:1.00 */</div><div class='add'>+		.driver_data  = SAA7134_BOARD_ASUSTeK_TIGER,</div><div class='ctx'> 	},{</div><div class='ctx'> 		.vendor       = PCI_VENDOR_ID_PHILIPS,</div><div class='ctx'> 		.device       = PCI_DEVICE_ID_PHILIPS_SAA7134,</div><div class='hunk'>@@ -5415,6 +5624,12 @@ struct pci_device_id saa7134_pci_tbl[] = {</div><div class='ctx'> 		.driver_data  = SAA7134_BOARD_VIDEOMATE_T750,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.vendor       = PCI_VENDOR_ID_PHILIPS,</div><div class='add'>+		.device       = PCI_DEVICE_ID_PHILIPS_SAA7133, /* SAA7135HL */</div><div class='add'>+		.subvendor    = 0x1421,</div><div class='add'>+		.subdevice    = 0x0380,</div><div class='add'>+		.driver_data  = SAA7134_BOARD_ADS_INSTANT_HDTV_PCI,</div><div class='add'>+	}, {</div><div class='add'>+		.vendor       = PCI_VENDOR_ID_PHILIPS,</div><div class='ctx'> 		.device       = PCI_DEVICE_ID_PHILIPS_SAA7133,</div><div class='ctx'> 		.subvendor    = 0x5169,</div><div class='ctx'> 		.subdevice    = 0x1502,</div><div class='hunk'>@@ -5432,6 +5647,12 @@ struct pci_device_id saa7134_pci_tbl[] = {</div><div class='ctx'> 		.subdevice    = 0xf636,</div><div class='ctx'> 		.driver_data  = SAA7134_BOARD_AVERMEDIA_M103,</div><div class='ctx'> 	}, {</div><div class='add'>+		.vendor       = PCI_VENDOR_ID_PHILIPS,</div><div class='add'>+		.device       = PCI_DEVICE_ID_PHILIPS_SAA7133,</div><div class='add'>+		.subvendor    = 0x1043,</div><div class='add'>+		.subdevice    = 0x4878, /* REV:1.02G */</div><div class='add'>+		.driver_data  = SAA7134_BOARD_ASUSTeK_TIGER_3IN1,</div><div class='add'>+	}, {</div><div class='ctx'> 		/* --- boards without eeprom + subsystem ID --- */</div><div class='ctx'> 		.vendor       = PCI_VENDOR_ID_PHILIPS,</div><div class='ctx'> 		.device       = PCI_DEVICE_ID_PHILIPS_SAA7134,</div><div class='hunk'>@@ -5540,7 +5761,7 @@ static int saa7134_tda8290_callback(struct saa7134_dev *dev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int saa7134_tuner_callback(void *priv, int command, int arg)</div><div class='add'>+int saa7134_tuner_callback(void *priv, int component, int command, int arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct saa7134_dev *dev = priv;</div><div class='ctx'> 	if (dev != NULL) {</div><div class='hunk'>@@ -5620,6 +5841,7 @@ int saa7134_board_init1(struct saa7134_dev *dev)</div><div class='ctx'> 	case SAA7134_BOARD_AVERMEDIA_STUDIO_507:</div><div class='ctx'> 	case SAA7134_BOARD_AVERMEDIA_GO_007_FM:</div><div class='ctx'> 	case SAA7134_BOARD_AVERMEDIA_777:</div><div class='add'>+	case SAA7134_BOARD_AVERMEDIA_M135A:</div><div class='ctx'> /*      case SAA7134_BOARD_SABRENT_SBTTVFM:  */ /* not finished yet */</div><div class='ctx'> 	case SAA7134_BOARD_VIDEOMATE_TV_PVR:</div><div class='ctx'> 	case SAA7134_BOARD_VIDEOMATE_GOLD_PLUS:</div><div class='hunk'>@@ -5644,6 +5866,7 @@ int saa7134_board_init1(struct saa7134_dev *dev)</div><div class='ctx'> 	case SAA7134_BOARD_AVERMEDIA_A16AR:</div><div class='ctx'> 	case SAA7134_BOARD_ENCORE_ENLTV:</div><div class='ctx'> 	case SAA7134_BOARD_ENCORE_ENLTV_FM:</div><div class='add'>+	case SAA7134_BOARD_ENCORE_ENLTV_FM53:</div><div class='ctx'> 	case SAA7134_BOARD_10MOONSTVMASTER3:</div><div class='ctx'> 	case SAA7134_BOARD_BEHOLD_401:</div><div class='ctx'> 	case SAA7134_BOARD_BEHOLD_403:</div><div class='hunk'>@@ -5656,6 +5879,7 @@ int saa7134_board_init1(struct saa7134_dev *dev)</div><div class='ctx'> 	case SAA7134_BOARD_BEHOLD_505FM:</div><div class='ctx'> 	case SAA7134_BOARD_BEHOLD_507_9FM:</div><div class='ctx'> 	case SAA7134_BOARD_GENIUS_TVGO_A11MCE:</div><div class='add'>+	case SAA7134_BOARD_REAL_ANGEL_220:</div><div class='ctx'> 		dev-&gt;has_remote = SAA7134_REMOTE_GPIO;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SAA7134_BOARD_FLYDVBS_LR300:</div><div class='hunk'>@@ -5745,6 +5969,7 @@ int saa7134_board_init1(struct saa7134_dev *dev)</div><div class='ctx'> 	case SAA7134_BOARD_PINNACLE_PCTV_110i:</div><div class='ctx'> 	case SAA7134_BOARD_PINNACLE_PCTV_310i:</div><div class='ctx'> 	case SAA7134_BOARD_UPMOST_PURPLE_TV:</div><div class='add'>+	case SAA7134_BOARD_MSI_TVATANYWHERE_PLUS:</div><div class='ctx'> 	case SAA7134_BOARD_HAUPPAUGE_HVR1110:</div><div class='ctx'> 	case SAA7134_BOARD_BEHOLD_607_9FM:</div><div class='ctx'> 	case SAA7134_BOARD_BEHOLD_M6:</div><div class='hunk'>@@ -5987,6 +6212,7 @@ int saa7134_board_init2(struct saa7134_dev *dev)</div><div class='ctx'> 	case SAA7134_BOARD_PINNACLE_PCTV_310i:</div><div class='ctx'> 	case SAA7134_BOARD_KWORLD_DVBT_210:</div><div class='ctx'> 	case SAA7134_BOARD_TEVION_DVBT_220RF:</div><div class='add'>+	case SAA7134_BOARD_ASUSTeK_TIGER:</div><div class='ctx'> 	case SAA7134_BOARD_ASUSTeK_P7131_DUAL:</div><div class='ctx'> 	case SAA7134_BOARD_ASUSTeK_P7131_HYBRID_LNA:</div><div class='ctx'> 	case SAA7134_BOARD_MEDION_MD8800_QUADRO:</div><div class='hunk'>@@ -6002,6 +6228,14 @@ int saa7134_board_init2(struct saa7134_dev *dev)</div><div class='ctx'> 		i2c_transfer(&amp;dev-&gt;i2c_adap, &amp;msg, 1);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='add'>+	case SAA7134_BOARD_ASUSTeK_TIGER_3IN1:</div><div class='add'>+	{</div><div class='add'>+		u8 data[] = { 0x3c, 0x33, 0x60};</div><div class='add'>+		struct i2c_msg msg = {.addr = 0x0b, .flags = 0, .buf = data,</div><div class='add'>+							.len = sizeof(data)};</div><div class='add'>+		i2c_transfer(&amp;dev-&gt;i2c_adap, &amp;msg, 1);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> 	case SAA7134_BOARD_FLYDVB_TRIO:</div><div class='ctx'> 	{</div><div class='ctx'> 		u8 data[] = { 0x3c, 0x33, 0x62};</div><div class='hunk'>@@ -6027,6 +6261,7 @@ int saa7134_board_init2(struct saa7134_dev *dev)</div><div class='ctx'> 		i2c_transfer(&amp;dev-&gt;i2c_adap, &amp;msg, 1);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='add'>+	case SAA7134_BOARD_ADS_INSTANT_HDTV_PCI:</div><div class='ctx'> 	case SAA7134_BOARD_KWORLD_ATSC110:</div><div class='ctx'> 	{</div><div class='ctx'> 		/* enable tuner */</div><div class='head'>diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c<br/>index 75d618415f4f..b686bfabbde0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/saa7134/saa7134-core.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/saa7134/saa7134-core.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/saa7134/saa7134-core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/saa7134/saa7134-core.c</a></div><div class='hunk'>@@ -215,7 +215,7 @@ unsigned long saa7134_buffer_base(struct saa7134_buf *buf)</div><div class='ctx'> int saa7134_pgtable_alloc(struct pci_dev *pci, struct saa7134_pgtable *pt)</div><div class='ctx'> {</div><div class='ctx'> 	__le32       *cpu;</div><div class='del'>-	dma_addr_t   dma_addr;</div><div class='add'>+	dma_addr_t   dma_addr = 0;</div><div class='ctx'> </div><div class='ctx'> 	cpu = pci_alloc_consistent(pci, SAA7134_PGTABLE_SIZE, &amp;dma_addr);</div><div class='ctx'> 	if (NULL == cpu)</div><div class='hunk'>@@ -359,32 +359,6 @@ void saa7134_buffer_timeout(unsigned long data)</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;dev-&gt;slock,flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* resends a current buffer in queue after resume */</div><div class='del'>-</div><div class='del'>-static int saa7134_buffer_requeue(struct saa7134_dev *dev,</div><div class='del'>-				  struct saa7134_dmaqueue *q)</div><div class='del'>-{</div><div class='del'>-	struct saa7134_buf *buf, *next;</div><div class='del'>-</div><div class='del'>-	assert_spin_locked(&amp;dev-&gt;slock);</div><div class='del'>-</div><div class='del'>-	buf  = q-&gt;curr;</div><div class='del'>-	next = buf;</div><div class='del'>-	dprintk("buffer_requeue\n");</div><div class='del'>-</div><div class='del'>-	if (!buf)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	dprintk("buffer_requeue : resending active buffers \n");</div><div class='del'>-</div><div class='del'>-	if (!list_empty(&amp;q-&gt;queue))</div><div class='del'>-		next = list_entry(q-&gt;queue.next, struct saa7134_buf,</div><div class='del'>-					  vb.queue);</div><div class='del'>-	buf-&gt;activate(dev, buf, next);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* ------------------------------------------------------------------ */</div><div class='ctx'> </div><div class='ctx'> int saa7134_set_dmabits(struct saa7134_dev *dev)</div><div class='hunk'>@@ -442,9 +416,7 @@ int saa7134_set_dmabits(struct saa7134_dev *dev)</div><div class='ctx'> 	/* TS capture -- dma 5 */</div><div class='ctx'> 	if (dev-&gt;ts_q.curr) {</div><div class='ctx'> 		ctrl |= SAA7134_MAIN_CTRL_TE5;</div><div class='del'>-		irq  |= SAA7134_IRQ1_INTE_RA2_3 |</div><div class='del'>-			SAA7134_IRQ1_INTE_RA2_2 |</div><div class='del'>-			SAA7134_IRQ1_INTE_RA2_1 |</div><div class='add'>+		irq  |= SAA7134_IRQ1_INTE_RA2_1 |</div><div class='ctx'> 			SAA7134_IRQ1_INTE_RA2_0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -727,6 +699,10 @@ static int saa7134_hw_enable2(struct saa7134_dev *dev)</div><div class='ctx'> 			irq2_mask |= SAA7134_IRQ2_INTE_GPIO18A;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (dev-&gt;has_remote == SAA7134_REMOTE_I2C) {</div><div class='add'>+		request_module("ir-kbd-i2c");</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	saa_writel(SAA7134_IRQ1, 0);</div><div class='ctx'> 	saa_writel(SAA7134_IRQ2, irq2_mask);</div><div class='ctx'> </div><div class='hunk'>@@ -1139,6 +1115,32 @@ static void __devexit saa7134_finidev(struct pci_dev *pci_dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PM</div><div class='add'>+</div><div class='add'>+/* resends a current buffer in queue after resume */</div><div class='add'>+static int saa7134_buffer_requeue(struct saa7134_dev *dev,</div><div class='add'>+				  struct saa7134_dmaqueue *q)</div><div class='add'>+{</div><div class='add'>+	struct saa7134_buf *buf, *next;</div><div class='add'>+</div><div class='add'>+	assert_spin_locked(&amp;dev-&gt;slock);</div><div class='add'>+</div><div class='add'>+	buf  = q-&gt;curr;</div><div class='add'>+	next = buf;</div><div class='add'>+	dprintk("buffer_requeue\n");</div><div class='add'>+</div><div class='add'>+	if (!buf)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	dprintk("buffer_requeue : resending active buffers \n");</div><div class='add'>+</div><div class='add'>+	if (!list_empty(&amp;q-&gt;queue))</div><div class='add'>+		next = list_entry(q-&gt;queue.next, struct saa7134_buf,</div><div class='add'>+					  vb.queue);</div><div class='add'>+	buf-&gt;activate(dev, buf, next);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int saa7134_suspend(struct pci_dev *pci_dev , pm_message_t state)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/saa7134/saa7134-dvb.c b/drivers/media/video/saa7134/saa7134-dvb.c<br/>index be48b9b66a67..8c46115d4c79 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/saa7134/saa7134-dvb.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/saa7134/saa7134-dvb.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/saa7134/saa7134-dvb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/saa7134/saa7134-dvb.c</a></div><div class='hunk'>@@ -535,11 +535,16 @@ static int configure_tda827x_fe(struct saa7134_dev *dev,</div><div class='ctx'> 				struct tda1004x_config *cdec_conf,</div><div class='ctx'> 				struct tda827x_config *tuner_conf)</div><div class='ctx'> {</div><div class='del'>-	dev-&gt;dvb.frontend = dvb_attach(tda10046_attach, cdec_conf, &amp;dev-&gt;i2c_adap);</div><div class='del'>-	if (dev-&gt;dvb.frontend) {</div><div class='add'>+	struct videobuf_dvb_frontend *fe0;</div><div class='add'>+</div><div class='add'>+	/* Get the first frontend */</div><div class='add'>+	fe0 = videobuf_dvb_get_frontend(&amp;dev-&gt;frontends, 1);</div><div class='add'>+</div><div class='add'>+	fe0-&gt;dvb.frontend = dvb_attach(tda10046_attach, cdec_conf, &amp;dev-&gt;i2c_adap);</div><div class='add'>+	if (fe0-&gt;dvb.frontend) {</div><div class='ctx'> 		if (cdec_conf-&gt;i2c_gate)</div><div class='del'>-			dev-&gt;dvb.frontend-&gt;ops.i2c_gate_ctrl = tda8290_i2c_gate_ctrl;</div><div class='del'>-		if (dvb_attach(tda827x_attach, dev-&gt;dvb.frontend,</div><div class='add'>+			fe0-&gt;dvb.frontend-&gt;ops.i2c_gate_ctrl = tda8290_i2c_gate_ctrl;</div><div class='add'>+		if (dvb_attach(tda827x_attach, fe0-&gt;dvb.frontend,</div><div class='ctx'> 			       cdec_conf-&gt;tuner_address,</div><div class='ctx'> 			       &amp;dev-&gt;i2c_adap, tuner_conf))</div><div class='ctx'> 			return 0;</div><div class='hunk'>@@ -553,7 +558,6 @@ static int configure_tda827x_fe(struct saa7134_dev *dev,</div><div class='ctx'> /* ------------------------------------------------------------------ */</div><div class='ctx'> </div><div class='ctx'> static struct tda827x_config tda827x_cfg_0 = {</div><div class='del'>-	.tuner_callback = saa7134_tuner_callback,</div><div class='ctx'> 	.init = philips_tda827x_tuner_init,</div><div class='ctx'> 	.sleep = philips_tda827x_tuner_sleep,</div><div class='ctx'> 	.config = 0,</div><div class='hunk'>@@ -561,7 +565,6 @@ static struct tda827x_config tda827x_cfg_0 = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct tda827x_config tda827x_cfg_1 = {</div><div class='del'>-	.tuner_callback = saa7134_tuner_callback,</div><div class='ctx'> 	.init = philips_tda827x_tuner_init,</div><div class='ctx'> 	.sleep = philips_tda827x_tuner_sleep,</div><div class='ctx'> 	.config = 1,</div><div class='hunk'>@@ -569,7 +572,6 @@ static struct tda827x_config tda827x_cfg_1 = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct tda827x_config tda827x_cfg_2 = {</div><div class='del'>-	.tuner_callback = saa7134_tuner_callback,</div><div class='ctx'> 	.init = philips_tda827x_tuner_init,</div><div class='ctx'> 	.sleep = philips_tda827x_tuner_sleep,</div><div class='ctx'> 	.config = 2,</div><div class='hunk'>@@ -577,7 +579,6 @@ static struct tda827x_config tda827x_cfg_2 = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct tda827x_config tda827x_cfg_2_sw42 = {</div><div class='del'>-	.tuner_callback = saa7134_tuner_callback,</div><div class='ctx'> 	.init = philips_tda827x_tuner_init,</div><div class='ctx'> 	.sleep = philips_tda827x_tuner_sleep,</div><div class='ctx'> 	.config = 2,</div><div class='hunk'>@@ -799,6 +800,20 @@ static struct tda1004x_config twinhan_dtv_dvb_3056_config = {</div><div class='ctx'> 	.request_firmware = philips_tda1004x_request_firmware</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct tda1004x_config asus_tiger_3in1_config = {</div><div class='add'>+	.demod_address = 0x0b,</div><div class='add'>+	.invert        = 1,</div><div class='add'>+	.invert_oclk   = 0,</div><div class='add'>+	.xtal_freq     = TDA10046_XTAL_16M,</div><div class='add'>+	.agc_config    = TDA10046_AGC_TDA827X,</div><div class='add'>+	.gpio_config   = TDA10046_GP11_I,</div><div class='add'>+	.if_freq       = TDA10046_FREQ_045,</div><div class='add'>+	.i2c_gate      = 0x4b,</div><div class='add'>+	.tuner_address = 0x61,</div><div class='add'>+	.antenna_switch = 1,</div><div class='add'>+	.request_firmware = philips_tda1004x_request_firmware</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* ------------------------------------------------------------------</div><div class='ctx'>  * special case: this card uses saa713x GPIO22 for the mode switch</div><div class='ctx'>  */</div><div class='hunk'>@@ -822,7 +837,6 @@ static int ads_duo_tuner_sleep(struct dvb_frontend *fe)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct tda827x_config ads_duo_cfg = {</div><div class='del'>-	.tuner_callback = saa7134_tuner_callback,</div><div class='ctx'> 	.init = ads_duo_tuner_init,</div><div class='ctx'> 	.sleep = ads_duo_tuner_sleep,</div><div class='ctx'> 	.config = 0</div><div class='hunk'>@@ -935,12 +949,30 @@ static int dvb_init(struct saa7134_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	int attach_xc3028 = 0;</div><div class='add'>+	struct videobuf_dvb_frontend *fe0;</div><div class='add'>+</div><div class='add'>+	/* FIXME: add support for multi-frontend */</div><div class='add'>+	mutex_init(&amp;dev-&gt;frontends.lock);</div><div class='add'>+	INIT_LIST_HEAD(&amp;dev-&gt;frontends.felist);</div><div class='add'>+	dev-&gt;frontends.active_fe_id = 0;</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "%s() allocating 1 frontend\n", __func__);</div><div class='add'>+</div><div class='add'>+	if (videobuf_dvb_alloc_frontend(&amp;dev-&gt;frontends, 1) == NULL) {</div><div class='add'>+		printk(KERN_ERR "%s() failed to alloc\n", __func__);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Get the first frontend */</div><div class='add'>+	fe0 = videobuf_dvb_get_frontend(&amp;dev-&gt;frontends, 1);</div><div class='add'>+	if (!fe0)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* init struct videobuf_dvb */</div><div class='ctx'> 	dev-&gt;ts.nr_bufs    = 32;</div><div class='ctx'> 	dev-&gt;ts.nr_packets = 32*4;</div><div class='del'>-	dev-&gt;dvb.name = dev-&gt;name;</div><div class='del'>-	videobuf_queue_sg_init(&amp;dev-&gt;dvb.dvbq, &amp;saa7134_ts_qops,</div><div class='add'>+	fe0-&gt;dvb.name = dev-&gt;name;</div><div class='add'>+	videobuf_queue_sg_init(&amp;fe0-&gt;dvb.dvbq, &amp;saa7134_ts_qops,</div><div class='ctx'> 			    &amp;dev-&gt;pci-&gt;dev, &amp;dev-&gt;slock,</div><div class='ctx'> 			    V4L2_BUF_TYPE_VIDEO_CAPTURE,</div><div class='ctx'> 			    V4L2_FIELD_ALTERNATE,</div><div class='hunk'>@@ -950,47 +982,47 @@ static int dvb_init(struct saa7134_dev *dev)</div><div class='ctx'> 	switch (dev-&gt;board) {</div><div class='ctx'> 	case SAA7134_BOARD_PINNACLE_300I_DVBT_PAL:</div><div class='ctx'> 		dprintk("pinnacle 300i dvb setup\n");</div><div class='del'>-		dev-&gt;dvb.frontend = dvb_attach(mt352_attach, &amp;pinnacle_300i,</div><div class='add'>+		fe0-&gt;dvb.frontend = dvb_attach(mt352_attach, &amp;pinnacle_300i,</div><div class='ctx'> 					       &amp;dev-&gt;i2c_adap);</div><div class='del'>-		if (dev-&gt;dvb.frontend) {</div><div class='del'>-			dev-&gt;dvb.frontend-&gt;ops.tuner_ops.set_params = mt352_pinnacle_tuner_set_params;</div><div class='add'>+		if (fe0-&gt;dvb.frontend) {</div><div class='add'>+			fe0-&gt;dvb.frontend-&gt;ops.tuner_ops.set_params = mt352_pinnacle_tuner_set_params;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SAA7134_BOARD_AVERMEDIA_777:</div><div class='ctx'> 	case SAA7134_BOARD_AVERMEDIA_A16AR:</div><div class='ctx'> 		dprintk("avertv 777 dvb setup\n");</div><div class='del'>-		dev-&gt;dvb.frontend = dvb_attach(mt352_attach, &amp;avermedia_777,</div><div class='add'>+		fe0-&gt;dvb.frontend = dvb_attach(mt352_attach, &amp;avermedia_777,</div><div class='ctx'> 					       &amp;dev-&gt;i2c_adap);</div><div class='del'>-		if (dev-&gt;dvb.frontend) {</div><div class='del'>-			dvb_attach(simple_tuner_attach, dev-&gt;dvb.frontend,</div><div class='add'>+		if (fe0-&gt;dvb.frontend) {</div><div class='add'>+			dvb_attach(simple_tuner_attach, fe0-&gt;dvb.frontend,</div><div class='ctx'> 				   &amp;dev-&gt;i2c_adap, 0x61,</div><div class='ctx'> 				   TUNER_PHILIPS_TD1316);</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SAA7134_BOARD_AVERMEDIA_A16D:</div><div class='ctx'> 		dprintk("AverMedia A16D dvb setup\n");</div><div class='del'>-		dev-&gt;dvb.frontend = dvb_attach(mt352_attach,</div><div class='add'>+		fe0-&gt;dvb.frontend = dvb_attach(mt352_attach,</div><div class='ctx'> 						&amp;avermedia_xc3028_mt352_dev,</div><div class='ctx'> 						&amp;dev-&gt;i2c_adap);</div><div class='ctx'> 		attach_xc3028 = 1;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SAA7134_BOARD_MD7134:</div><div class='del'>-		dev-&gt;dvb.frontend = dvb_attach(tda10046_attach,</div><div class='add'>+		fe0-&gt;dvb.frontend = dvb_attach(tda10046_attach,</div><div class='ctx'> 					       &amp;medion_cardbus,</div><div class='ctx'> 					       &amp;dev-&gt;i2c_adap);</div><div class='del'>-		if (dev-&gt;dvb.frontend) {</div><div class='del'>-			dvb_attach(simple_tuner_attach, dev-&gt;dvb.frontend,</div><div class='add'>+		if (fe0-&gt;dvb.frontend) {</div><div class='add'>+			dvb_attach(simple_tuner_attach, fe0-&gt;dvb.frontend,</div><div class='ctx'> 				   &amp;dev-&gt;i2c_adap, medion_cardbus.tuner_address,</div><div class='ctx'> 				   TUNER_PHILIPS_FMD1216ME_MK3);</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SAA7134_BOARD_PHILIPS_TOUGH:</div><div class='del'>-		dev-&gt;dvb.frontend = dvb_attach(tda10046_attach,</div><div class='add'>+		fe0-&gt;dvb.frontend = dvb_attach(tda10046_attach,</div><div class='ctx'> 					       &amp;philips_tu1216_60_config,</div><div class='ctx'> 					       &amp;dev-&gt;i2c_adap);</div><div class='del'>-		if (dev-&gt;dvb.frontend) {</div><div class='del'>-			dev-&gt;dvb.frontend-&gt;ops.tuner_ops.init = philips_tu1216_init;</div><div class='del'>-			dev-&gt;dvb.frontend-&gt;ops.tuner_ops.set_params = philips_tda6651_pll_set;</div><div class='add'>+		if (fe0-&gt;dvb.frontend) {</div><div class='add'>+			fe0-&gt;dvb.frontend-&gt;ops.tuner_ops.init = philips_tu1216_init;</div><div class='add'>+			fe0-&gt;dvb.frontend-&gt;ops.tuner_ops.set_params = philips_tda6651_pll_set;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SAA7134_BOARD_FLYDVBTDUO:</div><div class='hunk'>@@ -1001,24 +1033,24 @@ static int dvb_init(struct saa7134_dev *dev)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SAA7134_BOARD_PHILIPS_EUROPA:</div><div class='ctx'> 	case SAA7134_BOARD_VIDEOMATE_DVBT_300:</div><div class='del'>-		dev-&gt;dvb.frontend = dvb_attach(tda10046_attach,</div><div class='add'>+		fe0-&gt;dvb.frontend = dvb_attach(tda10046_attach,</div><div class='ctx'> 					       &amp;philips_europa_config,</div><div class='ctx'> 					       &amp;dev-&gt;i2c_adap);</div><div class='del'>-		if (dev-&gt;dvb.frontend) {</div><div class='del'>-			dev-&gt;original_demod_sleep = dev-&gt;dvb.frontend-&gt;ops.sleep;</div><div class='del'>-			dev-&gt;dvb.frontend-&gt;ops.sleep = philips_europa_demod_sleep;</div><div class='del'>-			dev-&gt;dvb.frontend-&gt;ops.tuner_ops.init = philips_europa_tuner_init;</div><div class='del'>-			dev-&gt;dvb.frontend-&gt;ops.tuner_ops.sleep = philips_europa_tuner_sleep;</div><div class='del'>-			dev-&gt;dvb.frontend-&gt;ops.tuner_ops.set_params = philips_td1316_tuner_set_params;</div><div class='add'>+		if (fe0-&gt;dvb.frontend) {</div><div class='add'>+			dev-&gt;original_demod_sleep = fe0-&gt;dvb.frontend-&gt;ops.sleep;</div><div class='add'>+			fe0-&gt;dvb.frontend-&gt;ops.sleep = philips_europa_demod_sleep;</div><div class='add'>+			fe0-&gt;dvb.frontend-&gt;ops.tuner_ops.init = philips_europa_tuner_init;</div><div class='add'>+			fe0-&gt;dvb.frontend-&gt;ops.tuner_ops.sleep = philips_europa_tuner_sleep;</div><div class='add'>+			fe0-&gt;dvb.frontend-&gt;ops.tuner_ops.set_params = philips_td1316_tuner_set_params;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SAA7134_BOARD_VIDEOMATE_DVBT_200:</div><div class='del'>-		dev-&gt;dvb.frontend = dvb_attach(tda10046_attach,</div><div class='add'>+		fe0-&gt;dvb.frontend = dvb_attach(tda10046_attach,</div><div class='ctx'> 					       &amp;philips_tu1216_61_config,</div><div class='ctx'> 					       &amp;dev-&gt;i2c_adap);</div><div class='del'>-		if (dev-&gt;dvb.frontend) {</div><div class='del'>-			dev-&gt;dvb.frontend-&gt;ops.tuner_ops.init = philips_tu1216_init;</div><div class='del'>-			dev-&gt;dvb.frontend-&gt;ops.tuner_ops.set_params = philips_tda6651_pll_set;</div><div class='add'>+		if (fe0-&gt;dvb.frontend) {</div><div class='add'>+			fe0-&gt;dvb.frontend-&gt;ops.tuner_ops.init = philips_tu1216_init;</div><div class='add'>+			fe0-&gt;dvb.frontend-&gt;ops.tuner_ops.set_params = philips_tda6651_pll_set;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SAA7134_BOARD_KWORLD_DVBT_210:</div><div class='hunk'>@@ -1057,14 +1089,14 @@ static int dvb_init(struct saa7134_dev *dev)</div><div class='ctx'> 						 &amp;tda827x_cfg_0) &lt; 0)</div><div class='ctx'> 				goto dettach_frontend;</div><div class='ctx'> 		} else {  		/* satellite */</div><div class='del'>-			dev-&gt;dvb.frontend = dvb_attach(tda10086_attach, &amp;flydvbs, &amp;dev-&gt;i2c_adap);</div><div class='del'>-			if (dev-&gt;dvb.frontend) {</div><div class='del'>-				if (dvb_attach(tda826x_attach, dev-&gt;dvb.frontend, 0x63,</div><div class='add'>+			fe0-&gt;dvb.frontend = dvb_attach(tda10086_attach, &amp;flydvbs, &amp;dev-&gt;i2c_adap);</div><div class='add'>+			if (fe0-&gt;dvb.frontend) {</div><div class='add'>+				if (dvb_attach(tda826x_attach, fe0-&gt;dvb.frontend, 0x63,</div><div class='ctx'> 									&amp;dev-&gt;i2c_adap, 0) == NULL) {</div><div class='ctx'> 					wprintk("%s: Lifeview Trio, No tda826x found!\n", __func__);</div><div class='ctx'> 					goto dettach_frontend;</div><div class='ctx'> 				}</div><div class='del'>-				if (dvb_attach(isl6421_attach, dev-&gt;dvb.frontend, &amp;dev-&gt;i2c_adap,</div><div class='add'>+				if (dvb_attach(isl6421_attach, fe0-&gt;dvb.frontend, &amp;dev-&gt;i2c_adap,</div><div class='ctx'> 										0x08, 0, 0) == NULL) {</div><div class='ctx'> 					wprintk("%s: Lifeview Trio, No ISL6421 found!\n", __func__);</div><div class='ctx'> 					goto dettach_frontend;</div><div class='hunk'>@@ -1074,11 +1106,11 @@ static int dvb_init(struct saa7134_dev *dev)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SAA7134_BOARD_ADS_DUO_CARDBUS_PTV331:</div><div class='ctx'> 	case SAA7134_BOARD_FLYDVBT_HYBRID_CARDBUS:</div><div class='del'>-		dev-&gt;dvb.frontend = dvb_attach(tda10046_attach,</div><div class='add'>+		fe0-&gt;dvb.frontend = dvb_attach(tda10046_attach,</div><div class='ctx'> 					       &amp;ads_tech_duo_config,</div><div class='ctx'> 					       &amp;dev-&gt;i2c_adap);</div><div class='del'>-		if (dev-&gt;dvb.frontend) {</div><div class='del'>-			if (dvb_attach(tda827x_attach,dev-&gt;dvb.frontend,</div><div class='add'>+		if (fe0-&gt;dvb.frontend) {</div><div class='add'>+			if (dvb_attach(tda827x_attach,fe0-&gt;dvb.frontend,</div><div class='ctx'> 				   ads_tech_duo_config.tuner_address, &amp;dev-&gt;i2c_adap,</div><div class='ctx'> 								&amp;ads_duo_cfg) == NULL) {</div><div class='ctx'> 				wprintk("no tda827x tuner found at addr: %02x\n",</div><div class='hunk'>@@ -1099,15 +1131,15 @@ static int dvb_init(struct saa7134_dev *dev)</div><div class='ctx'> 						 &amp;tda827x_cfg_0) &lt; 0)</div><div class='ctx'> 				goto dettach_frontend;</div><div class='ctx'> 		} else {        /* satellite */</div><div class='del'>-			dev-&gt;dvb.frontend = dvb_attach(tda10086_attach,</div><div class='add'>+			fe0-&gt;dvb.frontend = dvb_attach(tda10086_attach,</div><div class='ctx'> 							&amp;flydvbs, &amp;dev-&gt;i2c_adap);</div><div class='del'>-			if (dev-&gt;dvb.frontend) {</div><div class='del'>-				struct dvb_frontend *fe = dev-&gt;dvb.frontend;</div><div class='add'>+			if (fe0-&gt;dvb.frontend) {</div><div class='add'>+				struct dvb_frontend *fe = fe0-&gt;dvb.frontend;</div><div class='ctx'> 				u8 dev_id = dev-&gt;eedata[2];</div><div class='ctx'> 				u8 data = 0xc4;</div><div class='ctx'> 				struct i2c_msg msg = {.addr = 0x08, .flags = 0, .len = 1};</div><div class='ctx'> </div><div class='del'>-				if (dvb_attach(tda826x_attach, dev-&gt;dvb.frontend,</div><div class='add'>+				if (dvb_attach(tda826x_attach, fe0-&gt;dvb.frontend,</div><div class='ctx'> 						0x60, &amp;dev-&gt;i2c_adap, 0) == NULL) {</div><div class='ctx'> 					wprintk("%s: Medion Quadro, no tda826x "</div><div class='ctx'> 						"found !\n", __func__);</div><div class='hunk'>@@ -1141,30 +1173,31 @@ static int dvb_init(struct saa7134_dev *dev)</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SAA7134_BOARD_AVERMEDIA_AVERTVHD_A180:</div><div class='del'>-		dev-&gt;dvb.frontend = dvb_attach(nxt200x_attach, &amp;avertvhda180,</div><div class='add'>+		fe0-&gt;dvb.frontend = dvb_attach(nxt200x_attach, &amp;avertvhda180,</div><div class='ctx'> 					       &amp;dev-&gt;i2c_adap);</div><div class='del'>-		if (dev-&gt;dvb.frontend)</div><div class='del'>-			dvb_attach(dvb_pll_attach, dev-&gt;dvb.frontend, 0x61,</div><div class='add'>+		if (fe0-&gt;dvb.frontend)</div><div class='add'>+			dvb_attach(dvb_pll_attach, fe0-&gt;dvb.frontend, 0x61,</div><div class='ctx'> 				   NULL, DVB_PLL_TDHU2);</div><div class='ctx'> 		break;</div><div class='add'>+	case SAA7134_BOARD_ADS_INSTANT_HDTV_PCI:</div><div class='ctx'> 	case SAA7134_BOARD_KWORLD_ATSC110:</div><div class='del'>-		dev-&gt;dvb.frontend = dvb_attach(nxt200x_attach, &amp;kworldatsc110,</div><div class='add'>+		fe0-&gt;dvb.frontend = dvb_attach(nxt200x_attach, &amp;kworldatsc110,</div><div class='ctx'> 					       &amp;dev-&gt;i2c_adap);</div><div class='del'>-		if (dev-&gt;dvb.frontend)</div><div class='del'>-			dvb_attach(simple_tuner_attach, dev-&gt;dvb.frontend,</div><div class='add'>+		if (fe0-&gt;dvb.frontend)</div><div class='add'>+			dvb_attach(simple_tuner_attach, fe0-&gt;dvb.frontend,</div><div class='ctx'> 				   &amp;dev-&gt;i2c_adap, 0x61,</div><div class='ctx'> 				   TUNER_PHILIPS_TUV1236D);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SAA7134_BOARD_FLYDVBS_LR300:</div><div class='del'>-		dev-&gt;dvb.frontend = dvb_attach(tda10086_attach, &amp;flydvbs,</div><div class='add'>+		fe0-&gt;dvb.frontend = dvb_attach(tda10086_attach, &amp;flydvbs,</div><div class='ctx'> 					       &amp;dev-&gt;i2c_adap);</div><div class='del'>-		if (dev-&gt;dvb.frontend) {</div><div class='del'>-			if (dvb_attach(tda826x_attach, dev-&gt;dvb.frontend, 0x60,</div><div class='add'>+		if (fe0-&gt;dvb.frontend) {</div><div class='add'>+			if (dvb_attach(tda826x_attach, fe0-&gt;dvb.frontend, 0x60,</div><div class='ctx'> 				       &amp;dev-&gt;i2c_adap, 0) == NULL) {</div><div class='ctx'> 				wprintk("%s: No tda826x found!\n", __func__);</div><div class='ctx'> 				goto dettach_frontend;</div><div class='ctx'> 			}</div><div class='del'>-			if (dvb_attach(isl6421_attach, dev-&gt;dvb.frontend,</div><div class='add'>+			if (dvb_attach(isl6421_attach, fe0-&gt;dvb.frontend,</div><div class='ctx'> 				       &amp;dev-&gt;i2c_adap, 0x08, 0, 0) == NULL) {</div><div class='ctx'> 				wprintk("%s: No ISL6421 found!\n", __func__);</div><div class='ctx'> 				goto dettach_frontend;</div><div class='hunk'>@@ -1172,25 +1205,25 @@ static int dvb_init(struct saa7134_dev *dev)</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SAA7134_BOARD_ASUS_EUROPA2_HYBRID:</div><div class='del'>-		dev-&gt;dvb.frontend = dvb_attach(tda10046_attach,</div><div class='add'>+		fe0-&gt;dvb.frontend = dvb_attach(tda10046_attach,</div><div class='ctx'> 					       &amp;medion_cardbus,</div><div class='ctx'> 					       &amp;dev-&gt;i2c_adap);</div><div class='del'>-		if (dev-&gt;dvb.frontend) {</div><div class='del'>-			dev-&gt;original_demod_sleep = dev-&gt;dvb.frontend-&gt;ops.sleep;</div><div class='del'>-			dev-&gt;dvb.frontend-&gt;ops.sleep = philips_europa_demod_sleep;</div><div class='add'>+		if (fe0-&gt;dvb.frontend) {</div><div class='add'>+			dev-&gt;original_demod_sleep = fe0-&gt;dvb.frontend-&gt;ops.sleep;</div><div class='add'>+			fe0-&gt;dvb.frontend-&gt;ops.sleep = philips_europa_demod_sleep;</div><div class='ctx'> </div><div class='del'>-			dvb_attach(simple_tuner_attach, dev-&gt;dvb.frontend,</div><div class='add'>+			dvb_attach(simple_tuner_attach, fe0-&gt;dvb.frontend,</div><div class='ctx'> 				   &amp;dev-&gt;i2c_adap, medion_cardbus.tuner_address,</div><div class='ctx'> 				   TUNER_PHILIPS_FMD1216ME_MK3);</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SAA7134_BOARD_VIDEOMATE_DVBT_200A:</div><div class='del'>-		dev-&gt;dvb.frontend = dvb_attach(tda10046_attach,</div><div class='add'>+		fe0-&gt;dvb.frontend = dvb_attach(tda10046_attach,</div><div class='ctx'> 				&amp;philips_europa_config,</div><div class='ctx'> 				&amp;dev-&gt;i2c_adap);</div><div class='del'>-		if (dev-&gt;dvb.frontend) {</div><div class='del'>-			dev-&gt;dvb.frontend-&gt;ops.tuner_ops.init = philips_td1316_tuner_init;</div><div class='del'>-			dev-&gt;dvb.frontend-&gt;ops.tuner_ops.set_params = philips_td1316_tuner_set_params;</div><div class='add'>+		if (fe0-&gt;dvb.frontend) {</div><div class='add'>+			fe0-&gt;dvb.frontend-&gt;ops.tuner_ops.init = philips_td1316_tuner_init;</div><div class='add'>+			fe0-&gt;dvb.frontend-&gt;ops.tuner_ops.set_params = philips_td1316_tuner_set_params;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SAA7134_BOARD_CINERGY_HT_PCMCIA:</div><div class='hunk'>@@ -1229,15 +1262,15 @@ static int dvb_init(struct saa7134_dev *dev)</div><div class='ctx'> 			goto dettach_frontend;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SAA7134_BOARD_PHILIPS_SNAKE:</div><div class='del'>-		dev-&gt;dvb.frontend = dvb_attach(tda10086_attach, &amp;flydvbs,</div><div class='add'>+		fe0-&gt;dvb.frontend = dvb_attach(tda10086_attach, &amp;flydvbs,</div><div class='ctx'> 						&amp;dev-&gt;i2c_adap);</div><div class='del'>-		if (dev-&gt;dvb.frontend) {</div><div class='del'>-			if (dvb_attach(tda826x_attach, dev-&gt;dvb.frontend, 0x60,</div><div class='add'>+		if (fe0-&gt;dvb.frontend) {</div><div class='add'>+			if (dvb_attach(tda826x_attach, fe0-&gt;dvb.frontend, 0x60,</div><div class='ctx'> 					&amp;dev-&gt;i2c_adap, 0) == NULL) {</div><div class='ctx'> 				wprintk("%s: No tda826x found!\n", __func__);</div><div class='ctx'> 				goto dettach_frontend;</div><div class='ctx'> 			}</div><div class='del'>-			if (dvb_attach(lnbp21_attach, dev-&gt;dvb.frontend,</div><div class='add'>+			if (dvb_attach(lnbp21_attach, fe0-&gt;dvb.frontend,</div><div class='ctx'> 					&amp;dev-&gt;i2c_adap, 0, 0) == NULL) {</div><div class='ctx'> 				wprintk("%s: No lnbp21 found!\n", __func__);</div><div class='ctx'> 				goto dettach_frontend;</div><div class='hunk'>@@ -1259,24 +1292,24 @@ static int dvb_init(struct saa7134_dev *dev)</div><div class='ctx'> 		saa7134_set_gpio(dev, 25, 0);</div><div class='ctx'> 		msleep(10);</div><div class='ctx'> 		saa7134_set_gpio(dev, 25, 1);</div><div class='del'>-		dev-&gt;dvb.frontend = dvb_attach(mt352_attach,</div><div class='add'>+		fe0-&gt;dvb.frontend = dvb_attach(mt352_attach,</div><div class='ctx'> 						&amp;avermedia_xc3028_mt352_dev,</div><div class='ctx'> 						&amp;dev-&gt;i2c_adap);</div><div class='ctx'> 		attach_xc3028 = 1;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SAA7134_BOARD_MD7134_BRIDGE_2:</div><div class='del'>-		dev-&gt;dvb.frontend = dvb_attach(tda10086_attach,</div><div class='add'>+		fe0-&gt;dvb.frontend = dvb_attach(tda10086_attach,</div><div class='ctx'> 						&amp;sd1878_4m, &amp;dev-&gt;i2c_adap);</div><div class='del'>-		if (dev-&gt;dvb.frontend) {</div><div class='add'>+		if (fe0-&gt;dvb.frontend) {</div><div class='ctx'> 			struct dvb_frontend *fe;</div><div class='del'>-			if (dvb_attach(dvb_pll_attach, dev-&gt;dvb.frontend, 0x60,</div><div class='add'>+			if (dvb_attach(dvb_pll_attach, fe0-&gt;dvb.frontend, 0x60,</div><div class='ctx'> 				  &amp;dev-&gt;i2c_adap, DVB_PLL_PHILIPS_SD1878_TDA8261) == NULL) {</div><div class='ctx'> 				wprintk("%s: MD7134 DVB-S, no SD1878 "</div><div class='ctx'> 					"found !\n", __func__);</div><div class='ctx'> 				goto dettach_frontend;</div><div class='ctx'> 			}</div><div class='ctx'> 			/* we need to open the i2c gate (we know it exists) */</div><div class='del'>-			fe = dev-&gt;dvb.frontend;</div><div class='add'>+			fe = fe0-&gt;dvb.frontend;</div><div class='ctx'> 			fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='ctx'> 			if (dvb_attach(isl6405_attach, fe,</div><div class='ctx'> 					&amp;dev-&gt;i2c_adap, 0x08, 0, 0) == NULL) {</div><div class='hunk'>@@ -1295,11 +1328,41 @@ static int dvb_init(struct saa7134_dev *dev)</div><div class='ctx'> 		saa7134_set_gpio(dev, 25, 0);</div><div class='ctx'> 		msleep(10);</div><div class='ctx'> 		saa7134_set_gpio(dev, 25, 1);</div><div class='del'>-		dev-&gt;dvb.frontend = dvb_attach(mt352_attach,</div><div class='add'>+		fe0-&gt;dvb.frontend = dvb_attach(mt352_attach,</div><div class='ctx'> 						&amp;avermedia_xc3028_mt352_dev,</div><div class='ctx'> 						&amp;dev-&gt;i2c_adap);</div><div class='ctx'> 		attach_xc3028 = 1;</div><div class='ctx'> 		break;</div><div class='add'>+	case SAA7134_BOARD_ASUSTeK_TIGER_3IN1:</div><div class='add'>+		if (!use_frontend) {     /* terrestrial */</div><div class='add'>+			if (configure_tda827x_fe(dev, &amp;asus_tiger_3in1_config,</div><div class='add'>+							&amp;tda827x_cfg_2) &lt; 0)</div><div class='add'>+				goto dettach_frontend;</div><div class='add'>+		} else {  		/* satellite */</div><div class='add'>+			fe0-&gt;dvb.frontend = dvb_attach(tda10086_attach,</div><div class='add'>+						&amp;flydvbs, &amp;dev-&gt;i2c_adap);</div><div class='add'>+			if (fe0-&gt;dvb.frontend) {</div><div class='add'>+				if (dvb_attach(tda826x_attach,</div><div class='add'>+						fe0-&gt;dvb.frontend, 0x60,</div><div class='add'>+						&amp;dev-&gt;i2c_adap, 0) == NULL) {</div><div class='add'>+					wprintk("%s: Asus Tiger 3in1, no "</div><div class='add'>+						"tda826x found!\n", __func__);</div><div class='add'>+					goto dettach_frontend;</div><div class='add'>+				}</div><div class='add'>+				if (dvb_attach(lnbp21_attach, fe0-&gt;dvb.frontend,</div><div class='add'>+						&amp;dev-&gt;i2c_adap, 0, 0) == NULL) {</div><div class='add'>+					wprintk("%s: Asus Tiger 3in1, no lnbp21"</div><div class='add'>+						" found!\n", __func__);</div><div class='add'>+					goto dettach_frontend;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case SAA7134_BOARD_ASUSTeK_TIGER:</div><div class='add'>+		if (configure_tda827x_fe(dev, &amp;philips_tiger_config,</div><div class='add'>+					 &amp;tda827x_cfg_0) &lt; 0)</div><div class='add'>+			goto dettach_frontend;</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		wprintk("Huh? unknown DVB card?\n");</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1312,10 +1375,10 @@ static int dvb_init(struct saa7134_dev *dev)</div><div class='ctx'> 			.i2c_addr  = 0x61,</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		if (!dev-&gt;dvb.frontend)</div><div class='add'>+		if (!fe0-&gt;dvb.frontend)</div><div class='ctx'> 			return -1;</div><div class='ctx'> </div><div class='del'>-		fe = dvb_attach(xc2028_attach, dev-&gt;dvb.frontend, &amp;cfg);</div><div class='add'>+		fe = dvb_attach(xc2028_attach, fe0-&gt;dvb.frontend, &amp;cfg);</div><div class='ctx'> 		if (!fe) {</div><div class='ctx'> 			printk(KERN_ERR "%s/2: xc3028 attach failed\n",</div><div class='ctx'> 			       dev-&gt;name);</div><div class='hunk'>@@ -1323,38 +1386,47 @@ static int dvb_init(struct saa7134_dev *dev)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (NULL == dev-&gt;dvb.frontend) {</div><div class='add'>+	if (NULL == fe0-&gt;dvb.frontend) {</div><div class='ctx'> 		printk(KERN_ERR "%s/dvb: frontend initialization failed\n", dev-&gt;name);</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='add'>+	/* define general-purpose callback pointer */</div><div class='add'>+	fe0-&gt;dvb.frontend-&gt;callback = saa7134_tuner_callback;</div><div class='ctx'> </div><div class='ctx'> 	/* register everything else */</div><div class='del'>-	ret = videobuf_dvb_register(&amp;dev-&gt;dvb, THIS_MODULE, dev, &amp;dev-&gt;pci-&gt;dev,</div><div class='del'>-				    adapter_nr);</div><div class='add'>+	ret = videobuf_dvb_register_bus(&amp;dev-&gt;frontends, THIS_MODULE, dev,</div><div class='add'>+		&amp;dev-&gt;pci-&gt;dev, adapter_nr, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* this sequence is necessary to make the tda1004x load its firmware</div><div class='ctx'> 	 * and to enter analog mode of hybrid boards</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!ret) {</div><div class='del'>-		if (dev-&gt;dvb.frontend-&gt;ops.init)</div><div class='del'>-			dev-&gt;dvb.frontend-&gt;ops.init(dev-&gt;dvb.frontend);</div><div class='del'>-		if (dev-&gt;dvb.frontend-&gt;ops.sleep)</div><div class='del'>-			dev-&gt;dvb.frontend-&gt;ops.sleep(dev-&gt;dvb.frontend);</div><div class='del'>-		if (dev-&gt;dvb.frontend-&gt;ops.tuner_ops.sleep)</div><div class='del'>-			dev-&gt;dvb.frontend-&gt;ops.tuner_ops.sleep(dev-&gt;dvb.frontend);</div><div class='add'>+		if (fe0-&gt;dvb.frontend-&gt;ops.init)</div><div class='add'>+			fe0-&gt;dvb.frontend-&gt;ops.init(fe0-&gt;dvb.frontend);</div><div class='add'>+		if (fe0-&gt;dvb.frontend-&gt;ops.sleep)</div><div class='add'>+			fe0-&gt;dvb.frontend-&gt;ops.sleep(fe0-&gt;dvb.frontend);</div><div class='add'>+		if (fe0-&gt;dvb.frontend-&gt;ops.tuner_ops.sleep)</div><div class='add'>+			fe0-&gt;dvb.frontend-&gt;ops.tuner_ops.sleep(fe0-&gt;dvb.frontend);</div><div class='ctx'> 	}</div><div class='ctx'> 	return ret;</div><div class='ctx'> </div><div class='ctx'> dettach_frontend:</div><div class='del'>-	if (dev-&gt;dvb.frontend)</div><div class='del'>-		dvb_frontend_detach(dev-&gt;dvb.frontend);</div><div class='del'>-	dev-&gt;dvb.frontend = NULL;</div><div class='add'>+	if (fe0-&gt;dvb.frontend)</div><div class='add'>+		dvb_frontend_detach(fe0-&gt;dvb.frontend);</div><div class='add'>+	fe0-&gt;dvb.frontend = NULL;</div><div class='ctx'> </div><div class='ctx'> 	return -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int dvb_fini(struct saa7134_dev *dev)</div><div class='ctx'> {</div><div class='add'>+	struct videobuf_dvb_frontend *fe0;</div><div class='add'>+</div><div class='add'>+	/* Get the first frontend */</div><div class='add'>+	fe0 = videobuf_dvb_get_frontend(&amp;dev-&gt;frontends, 1);</div><div class='add'>+	if (!fe0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	/* FIXME: I suspect that this code is bogus, since the entry for</div><div class='ctx'> 	   Pinnacle 300I DVB-T PAL already defines the proper init to allow</div><div class='ctx'> 	   the detection of mt2032 (TDA9887_PORT2_INACTIVE)</div><div class='hunk'>@@ -1374,7 +1446,7 @@ static int dvb_fini(struct saa7134_dev *dev)</div><div class='ctx'> 			u8 data = 0x80;</div><div class='ctx'> 			struct i2c_msg msg = {.addr = 0x08, .buf = &amp;data, .flags = 0, .len = 1};</div><div class='ctx'> 			struct dvb_frontend *fe;</div><div class='del'>-			fe = dev-&gt;dvb.frontend;</div><div class='add'>+			fe = fe0-&gt;dvb.frontend;</div><div class='ctx'> 			if (fe-&gt;ops.i2c_gate_ctrl) {</div><div class='ctx'> 				fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='ctx'> 				i2c_transfer(&amp;dev-&gt;i2c_adap, &amp;msg, 1);</div><div class='hunk'>@@ -1382,8 +1454,8 @@ static int dvb_fini(struct saa7134_dev *dev)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	if (dev-&gt;dvb.frontend)</div><div class='del'>-		videobuf_dvb_unregister(&amp;dev-&gt;dvb);</div><div class='add'>+	if (fe0-&gt;dvb.frontend)</div><div class='add'>+		videobuf_dvb_unregister_bus(&amp;dev-&gt;frontends);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/saa7134/saa7134-empress.c b/drivers/media/video/saa7134/saa7134-empress.c<br/>index c0c5d7509c25..9a8766a78a0c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/saa7134/saa7134-empress.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/saa7134/saa7134-empress.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/saa7134/saa7134-empress.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/saa7134/saa7134-empress.c</a></div><div class='hunk'>@@ -29,6 +29,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;media/saa6752hs.h&gt;</div><div class='ctx'> #include &lt;media/v4l2-common.h&gt;</div><div class='add'>+#include &lt;media/v4l2-chip-ident.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* ------------------------------------------------------------------ */</div><div class='ctx'> </div><div class='hunk'>@@ -63,10 +64,19 @@ static void ts_reset_encoder(struct saa7134_dev* dev)</div><div class='ctx'> </div><div class='ctx'> static int ts_init_encoder(struct saa7134_dev* dev)</div><div class='ctx'> {</div><div class='del'>-	struct v4l2_ext_controls ctrls = { V4L2_CTRL_CLASS_MPEG, 0 };</div><div class='add'>+	u32 leading_null_bytes = 0;</div><div class='ctx'> </div><div class='add'>+	/* If more cards start to need this, then this</div><div class='add'>+	   should probably be added to the card definitions. */</div><div class='add'>+	switch (dev-&gt;board) {</div><div class='add'>+	case SAA7134_BOARD_BEHOLD_M6:</div><div class='add'>+	case SAA7134_BOARD_BEHOLD_M63:</div><div class='add'>+	case SAA7134_BOARD_BEHOLD_M6_EXTRA:</div><div class='add'>+		leading_null_bytes = 1;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> 	ts_reset_encoder(dev);</div><div class='del'>-	saa7134_i2c_call_clients(dev, VIDIOC_S_EXT_CTRLS, &amp;ctrls);</div><div class='add'>+	saa7134_i2c_call_clients(dev, VIDIOC_INT_INIT, &amp;leading_null_bytes);</div><div class='ctx'> 	dev-&gt;empress_started = 1;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -79,9 +89,11 @@ static int ts_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	struct saa7134_dev *dev;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='add'>+	lock_kernel();</div><div class='ctx'> 	list_for_each_entry(dev, &amp;saa7134_devlist, devlist)</div><div class='ctx'> 		if (dev-&gt;empress_dev &amp;&amp; dev-&gt;empress_dev-&gt;minor == minor)</div><div class='ctx'> 			goto found;</div><div class='add'>+	unlock_kernel();</div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'>  found:</div><div class='ctx'> </div><div class='hunk'>@@ -103,6 +115,7 @@ static int ts_open(struct inode *inode, struct file *file)</div><div class='ctx'> done_up:</div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;empress_tsq.vb_lock);</div><div class='ctx'> done:</div><div class='add'>+	unlock_kernel();</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -290,15 +303,6 @@ static int empress_streamoff(struct file *file, void *priv,</div><div class='ctx'> 	return videobuf_streamoff(&amp;dev-&gt;empress_tsq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int saa7134_i2c_call_saa6752(struct saa7134_dev *dev,</div><div class='del'>-					      unsigned int cmd, void *arg)</div><div class='del'>-{</div><div class='del'>-	if (dev-&gt;mpeg_i2c_client == NULL)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	return dev-&gt;mpeg_i2c_client-&gt;driver-&gt;command(dev-&gt;mpeg_i2c_client,</div><div class='del'>-								cmd, arg);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int empress_s_ext_ctrls(struct file *file, void *priv,</div><div class='ctx'> 			       struct v4l2_ext_controls *ctrls)</div><div class='ctx'> {</div><div class='hunk'>@@ -400,6 +404,39 @@ static int empress_querymenu(struct file *file, void *priv,</div><div class='ctx'> 	return saa7134_i2c_call_saa6752(dev, VIDIOC_QUERYMENU, c);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int empress_g_chip_ident(struct file *file, void *fh,</div><div class='add'>+	       struct v4l2_chip_ident *chip)</div><div class='add'>+{</div><div class='add'>+	struct saa7134_dev *dev = file-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	chip-&gt;ident = V4L2_IDENT_NONE;</div><div class='add'>+	chip-&gt;revision = 0;</div><div class='add'>+	if (dev-&gt;mpeg_i2c_client == NULL)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (chip-&gt;match_type == V4L2_CHIP_MATCH_I2C_DRIVER &amp;&amp;</div><div class='add'>+	    chip-&gt;match_chip == I2C_DRIVERID_SAA6752HS)</div><div class='add'>+		return saa7134_i2c_call_saa6752(dev, VIDIOC_G_CHIP_IDENT, chip);</div><div class='add'>+	if (chip-&gt;match_type == V4L2_CHIP_MATCH_I2C_ADDR &amp;&amp;</div><div class='add'>+	    chip-&gt;match_chip == dev-&gt;mpeg_i2c_client-&gt;addr)</div><div class='add'>+		return saa7134_i2c_call_saa6752(dev, VIDIOC_G_CHIP_IDENT, chip);</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int empress_s_std(struct file *file, void *priv, v4l2_std_id *id)</div><div class='add'>+{</div><div class='add'>+	struct saa7134_dev *dev = file-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	return saa7134_s_std_internal(dev, NULL, id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int empress_g_std(struct file *file, void *priv, v4l2_std_id *id)</div><div class='add'>+{</div><div class='add'>+	struct saa7134_dev *dev = file-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	*id = dev-&gt;tvnorm-&gt;id;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct file_operations ts_fops =</div><div class='ctx'> {</div><div class='ctx'> 	.owner	  = THIS_MODULE,</div><div class='hunk'>@@ -428,11 +465,13 @@ static const struct v4l2_ioctl_ops ts_ioctl_ops = {</div><div class='ctx'> 	.vidioc_enum_input		= empress_enum_input,</div><div class='ctx'> 	.vidioc_g_input			= empress_g_input,</div><div class='ctx'> 	.vidioc_s_input			= empress_s_input,</div><div class='del'>-</div><div class='ctx'> 	.vidioc_queryctrl		= empress_queryctrl,</div><div class='ctx'> 	.vidioc_querymenu		= empress_querymenu,</div><div class='ctx'> 	.vidioc_g_ctrl			= empress_g_ctrl,</div><div class='ctx'> 	.vidioc_s_ctrl			= empress_s_ctrl,</div><div class='add'>+	.vidioc_g_chip_ident 		= empress_g_chip_ident,</div><div class='add'>+	.vidioc_s_std			= empress_s_std,</div><div class='add'>+	.vidioc_g_std			= empress_g_std,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* ----------------------------------------------------------- */</div><div class='head'>diff --git a/drivers/media/video/saa7134/saa7134-i2c.c b/drivers/media/video/saa7134/saa7134-i2c.c<br/>index 5f713e637683..20c1b33caf7b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/saa7134/saa7134-i2c.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/saa7134/saa7134-i2c.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/saa7134/saa7134-i2c.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/saa7134/saa7134-i2c.c</a></div><div class='hunk'>@@ -337,6 +337,7 @@ static int attach_inform(struct i2c_client *client)</div><div class='ctx'> 		case 0x47:</div><div class='ctx'> 		case 0x71:</div><div class='ctx'> 		case 0x2d:</div><div class='add'>+		case 0x30:</div><div class='ctx'> 		{</div><div class='ctx'> 			struct IR_i2c *ir = i2c_get_clientdata(client);</div><div class='ctx'> 			d1printk("%s i2c IR detected (%s).\n",</div><div class='hunk'>@@ -427,6 +428,16 @@ void saa7134_i2c_call_clients(struct saa7134_dev *dev,</div><div class='ctx'> 	i2c_clients_command(&amp;dev-&gt;i2c_adap, cmd, arg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int saa7134_i2c_call_saa6752(struct saa7134_dev *dev,</div><div class='add'>+					      unsigned int cmd, void *arg)</div><div class='add'>+{</div><div class='add'>+	if (dev-&gt;mpeg_i2c_client == NULL)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	return dev-&gt;mpeg_i2c_client-&gt;driver-&gt;command(dev-&gt;mpeg_i2c_client,</div><div class='add'>+								cmd, arg);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(saa7134_i2c_call_saa6752);</div><div class='add'>+</div><div class='ctx'> int saa7134_i2c_register(struct saa7134_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	dev-&gt;i2c_adap = saa7134_adap_template;</div><div class='head'>diff --git a/drivers/media/video/saa7134/saa7134-input.c b/drivers/media/video/saa7134/saa7134-input.c<br/>index ad08d13dffdd..c53fd5f9f6b5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/saa7134/saa7134-input.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/saa7134/saa7134-input.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/saa7134/saa7134-input.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/saa7134/saa7134-input.c</a></div><div class='hunk'>@@ -62,8 +62,11 @@ MODULE_PARM_DESC(disable_other_ir, "disable full codes of "</div><div class='ctx'> #define i2cdprintk(fmt, arg...)    if (ir_debug) \</div><div class='ctx'> 	printk(KERN_DEBUG "%s/ir: " fmt, ir-&gt;c.name , ## arg)</div><div class='ctx'> </div><div class='del'>-/** rc5 functions */</div><div class='add'>+/* Helper functions for RC5 and NEC decoding at GPIO16 or GPIO18 */</div><div class='ctx'> static int saa7134_rc5_irq(struct saa7134_dev *dev);</div><div class='add'>+static int saa7134_nec_irq(struct saa7134_dev *dev);</div><div class='add'>+static void nec_task(unsigned long data);</div><div class='add'>+static void saa7134_nec_timer(unsigned long data);</div><div class='ctx'> </div><div class='ctx'> /* -------------------- GPIO generic keycode builder -------------------- */</div><div class='ctx'> </div><div class='hunk'>@@ -115,6 +118,53 @@ static int build_key(struct saa7134_dev *dev)</div><div class='ctx'> </div><div class='ctx'> /* --------------------- Chip specific I2C key builders ----------------- */</div><div class='ctx'> </div><div class='add'>+static int get_key_msi_tvanywhere_plus(struct IR_i2c *ir, u32 *ir_key,</div><div class='add'>+				       u32 *ir_raw)</div><div class='add'>+{</div><div class='add'>+	unsigned char b;</div><div class='add'>+	int gpio;</div><div class='add'>+</div><div class='add'>+	/* &lt;dev&gt; is needed to access GPIO. Used by the saa_readl macro. */</div><div class='add'>+	struct saa7134_dev *dev = ir-&gt;c.adapter-&gt;algo_data;</div><div class='add'>+	if (dev == NULL) {</div><div class='add'>+		dprintk("get_key_msi_tvanywhere_plus: "</div><div class='add'>+			"gir-&gt;c.adapter-&gt;algo_data is NULL!\n");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* rising SAA7134_GPIO_GPRESCAN reads the status */</div><div class='add'>+</div><div class='add'>+	saa_clearb(SAA7134_GPIO_GPMODE3, SAA7134_GPIO_GPRESCAN);</div><div class='add'>+	saa_setb(SAA7134_GPIO_GPMODE3, SAA7134_GPIO_GPRESCAN);</div><div class='add'>+</div><div class='add'>+	gpio = saa_readl(SAA7134_GPIO_GPSTATUS0 &gt;&gt; 2);</div><div class='add'>+</div><div class='add'>+	/* GPIO&amp;0x40 is pulsed low when a button is pressed. Don't do</div><div class='add'>+	   I2C receive if gpio&amp;0x40 is not low. */</div><div class='add'>+</div><div class='add'>+	if (gpio &amp; 0x40)</div><div class='add'>+		return 0;       /* No button press */</div><div class='add'>+</div><div class='add'>+	/* GPIO says there is a button press. Get it. */</div><div class='add'>+</div><div class='add'>+	if (1 != i2c_master_recv(&amp;ir-&gt;c, &amp;b, 1)) {</div><div class='add'>+		i2cdprintk("read error\n");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* No button press */</div><div class='add'>+</div><div class='add'>+	if (b == 0xff)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Button pressed */</div><div class='add'>+</div><div class='add'>+	dprintk("get_key_msi_tvanywhere_plus: Key = 0x%02X\n", b);</div><div class='add'>+	*ir_key = b;</div><div class='add'>+	*ir_raw = b;</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int get_key_purpletv(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char b;</div><div class='hunk'>@@ -280,7 +330,9 @@ void saa7134_input_irq(struct saa7134_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct card_ir *ir = dev-&gt;remote;</div><div class='ctx'> </div><div class='del'>-	if (!ir-&gt;polling &amp;&amp; !ir-&gt;rc5_gpio) {</div><div class='add'>+	if (ir-&gt;nec_gpio) {</div><div class='add'>+		saa7134_nec_irq(dev);</div><div class='add'>+	} else if (!ir-&gt;polling &amp;&amp; !ir-&gt;rc5_gpio) {</div><div class='ctx'> 		build_key(dev);</div><div class='ctx'> 	} else if (ir-&gt;rc5_gpio) {</div><div class='ctx'> 		saa7134_rc5_irq(dev);</div><div class='hunk'>@@ -316,6 +368,10 @@ void saa7134_ir_start(struct saa7134_dev *dev, struct card_ir *ir)</div><div class='ctx'> 		ir-&gt;addr = 0x17;</div><div class='ctx'> 		ir-&gt;rc5_key_timeout = ir_rc5_key_timeout;</div><div class='ctx'> 		ir-&gt;rc5_remote_gap = ir_rc5_remote_gap;</div><div class='add'>+	} else if (ir-&gt;nec_gpio) {</div><div class='add'>+		setup_timer(&amp;ir-&gt;timer_keyup, saa7134_nec_timer,</div><div class='add'>+			    (unsigned long)dev);</div><div class='add'>+		tasklet_init(&amp;ir-&gt;tlet, nec_task, (unsigned long)dev);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -335,6 +391,7 @@ int saa7134_input_init1(struct saa7134_dev *dev)</div><div class='ctx'> 	u32 mask_keyup   = 0;</div><div class='ctx'> 	int polling      = 0;</div><div class='ctx'> 	int rc5_gpio	 = 0;</div><div class='add'>+	int nec_gpio	 = 0;</div><div class='ctx'> 	int ir_type      = IR_TYPE_OTHER;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -391,6 +448,12 @@ int saa7134_input_init1(struct saa7134_dev *dev)</div><div class='ctx'> 		saa_setb(SAA7134_GPIO_GPMODE0, 0x4);</div><div class='ctx'> 		saa_setb(SAA7134_GPIO_GPSTATUS0, 0x4);</div><div class='ctx'> 		break;</div><div class='add'>+	case SAA7134_BOARD_AVERMEDIA_M135A:</div><div class='add'>+		ir_codes     = ir_codes_avermedia_m135a;</div><div class='add'>+		mask_keydown = 0x0040000;</div><div class='add'>+		mask_keycode = 0x00013f;</div><div class='add'>+		nec_gpio     = 1;</div><div class='add'>+		break;</div><div class='ctx'> 	case SAA7134_BOARD_AVERMEDIA_777:</div><div class='ctx'> 	case SAA7134_BOARD_AVERMEDIA_A16AR:</div><div class='ctx'> 		ir_codes     = ir_codes_avermedia;</div><div class='hunk'>@@ -499,6 +562,12 @@ int saa7134_input_init1(struct saa7134_dev *dev)</div><div class='ctx'> 		mask_keyup   = 0x040000;</div><div class='ctx'> 		polling      = 50; // ms</div><div class='ctx'> 		break;</div><div class='add'>+	case SAA7134_BOARD_ENCORE_ENLTV_FM53:</div><div class='add'>+		ir_codes     = ir_codes_encore_enltv_fm53;</div><div class='add'>+		mask_keydown = 0x0040000;</div><div class='add'>+		mask_keycode = 0x00007f;</div><div class='add'>+		nec_gpio = 1;</div><div class='add'>+		break;</div><div class='ctx'> 	case SAA7134_BOARD_10MOONSTVMASTER3:</div><div class='ctx'> 		ir_codes     = ir_codes_encore_enltv;</div><div class='ctx'> 		mask_keycode = 0x5f80000;</div><div class='hunk'>@@ -511,6 +580,12 @@ int saa7134_input_init1(struct saa7134_dev *dev)</div><div class='ctx'> 		mask_keydown = 0xf00000;</div><div class='ctx'> 		polling = 50; /* ms */</div><div class='ctx'> 		break;</div><div class='add'>+	case SAA7134_BOARD_REAL_ANGEL_220:</div><div class='add'>+		ir_codes     = ir_codes_real_audio_220_32_keys;</div><div class='add'>+		mask_keycode = 0x3f00;</div><div class='add'>+		mask_keyup   = 0x4000;</div><div class='add'>+		polling = 50; /* ms */</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (NULL == ir_codes) {</div><div class='ctx'> 		printk("%s: Oops: IR config error [card=%d]\n",</div><div class='hunk'>@@ -533,6 +608,7 @@ int saa7134_input_init1(struct saa7134_dev *dev)</div><div class='ctx'> 	ir-&gt;mask_keyup   = mask_keyup;</div><div class='ctx'> 	ir-&gt;polling      = polling;</div><div class='ctx'> 	ir-&gt;rc5_gpio	 = rc5_gpio;</div><div class='add'>+	ir-&gt;nec_gpio	 = nec_gpio;</div><div class='ctx'> </div><div class='ctx'> 	/* init input device */</div><div class='ctx'> 	snprintf(ir-&gt;name, sizeof(ir-&gt;name), "saa7134 IR (%s)",</div><div class='hunk'>@@ -612,6 +688,11 @@ void saa7134_set_i2c_ir(struct saa7134_dev *dev, struct IR_i2c *ir)</div><div class='ctx'> 		ir-&gt;get_key   = get_key_purpletv;</div><div class='ctx'> 		ir-&gt;ir_codes  = ir_codes_purpletv;</div><div class='ctx'> 		break;</div><div class='add'>+	case SAA7134_BOARD_MSI_TVATANYWHERE_PLUS:</div><div class='add'>+		snprintf(ir-&gt;c.name, sizeof(ir-&gt;c.name), "MSI TV@nywhere Plus");</div><div class='add'>+		ir-&gt;get_key  = get_key_msi_tvanywhere_plus;</div><div class='add'>+		ir-&gt;ir_codes = ir_codes_msi_tvanywhere_plus;</div><div class='add'>+		break;</div><div class='ctx'> 	case SAA7134_BOARD_HAUPPAUGE_HVR1110:</div><div class='ctx'> 		snprintf(ir-&gt;c.name, sizeof(ir-&gt;c.name), "HVR 1110");</div><div class='ctx'> 		ir-&gt;get_key   = get_key_hvr1110;</div><div class='hunk'>@@ -675,8 +756,125 @@ static int saa7134_rc5_irq(struct saa7134_dev *dev)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* ----------------------------------------------------------------------</div><div class='del'>- * Local variables:</div><div class='del'>- * c-basic-offset: 8</div><div class='del'>- * End:</div><div class='add'>+</div><div class='add'>+/* On NEC protocol, One has 2.25 ms, and zero has 1.125 ms</div><div class='add'>+   The first pulse (start) has 9 + 4.5 ms</div><div class='ctx'>  */</div><div class='add'>+</div><div class='add'>+static void saa7134_nec_timer(unsigned long data)</div><div class='add'>+{</div><div class='add'>+	struct saa7134_dev *dev = (struct saa7134_dev *) data;</div><div class='add'>+	struct card_ir *ir = dev-&gt;remote;</div><div class='add'>+</div><div class='add'>+	dprintk("Cancel key repeat\n");</div><div class='add'>+</div><div class='add'>+	ir_input_nokey(ir-&gt;dev, &amp;ir-&gt;ir);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nec_task(unsigned long data)</div><div class='add'>+{</div><div class='add'>+	struct saa7134_dev *dev = (struct saa7134_dev *) data;</div><div class='add'>+	struct card_ir *ir;</div><div class='add'>+	struct timeval tv;</div><div class='add'>+	int count, pulse, oldpulse, gap;</div><div class='add'>+	u32 ircode = 0, not_code = 0;</div><div class='add'>+	int ngap = 0;</div><div class='add'>+</div><div class='add'>+	if (!data) {</div><div class='add'>+		printk(KERN_ERR "saa713x/ir: Can't recover dev struct\n");</div><div class='add'>+		/* GPIO will be kept disabled */</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ir = dev-&gt;remote;</div><div class='add'>+</div><div class='add'>+	/* rising SAA7134_GPIO_GPRESCAN reads the status */</div><div class='add'>+	saa_clearb(SAA7134_GPIO_GPMODE3, SAA7134_GPIO_GPRESCAN);</div><div class='add'>+	saa_setb(SAA7134_GPIO_GPMODE3, SAA7134_GPIO_GPRESCAN);</div><div class='add'>+</div><div class='add'>+	oldpulse = saa_readl(SAA7134_GPIO_GPSTATUS0 &gt;&gt; 2) &amp; ir-&gt;mask_keydown;</div><div class='add'>+	pulse = oldpulse;</div><div class='add'>+</div><div class='add'>+	do_gettimeofday(&amp;tv);</div><div class='add'>+	ir-&gt;base_time = tv;</div><div class='add'>+</div><div class='add'>+	/* Decode NEC pulsecode. This code can take up to 76.5 ms to run.</div><div class='add'>+	   Unfortunately, using IRQ to decode pulse didn't work, since it uses</div><div class='add'>+	   a pulse train of 38KHz. This means one pulse on each 52 us</div><div class='add'>+	 */</div><div class='add'>+	do {</div><div class='add'>+		/* Wait until the end of pulse/space or 5 ms */</div><div class='add'>+		for (count = 0; count &lt; 500; count++)  {</div><div class='add'>+			udelay(10);</div><div class='add'>+			/* rising SAA7134_GPIO_GPRESCAN reads the status */</div><div class='add'>+			saa_clearb(SAA7134_GPIO_GPMODE3, SAA7134_GPIO_GPRESCAN);</div><div class='add'>+			saa_setb(SAA7134_GPIO_GPMODE3, SAA7134_GPIO_GPRESCAN);</div><div class='add'>+			pulse = saa_readl(SAA7134_GPIO_GPSTATUS0 &gt;&gt; 2)</div><div class='add'>+				&amp; ir-&gt;mask_keydown;</div><div class='add'>+			if (pulse != oldpulse)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		do_gettimeofday(&amp;tv);</div><div class='add'>+		gap = 1000000 * (tv.tv_sec - ir-&gt;base_time.tv_sec) +</div><div class='add'>+				tv.tv_usec - ir-&gt;base_time.tv_usec;</div><div class='add'>+</div><div class='add'>+		if (!pulse) {</div><div class='add'>+			/* Bit 0 has 560 us, while bit 1 has 1120 us.</div><div class='add'>+			   Do something only if bit == 1</div><div class='add'>+			 */</div><div class='add'>+			if (ngap &amp;&amp; (gap &gt; 560 + 280)) {</div><div class='add'>+				unsigned int shift = ngap - 1;</div><div class='add'>+</div><div class='add'>+				/* Address first, then command */</div><div class='add'>+				if (shift &lt; 8) {</div><div class='add'>+					shift += 8;</div><div class='add'>+					ircode |= 1 &lt;&lt; shift;</div><div class='add'>+				} else if (shift &lt; 16) {</div><div class='add'>+					not_code |= 1 &lt;&lt; shift;</div><div class='add'>+				} else if (shift &lt; 24) {</div><div class='add'>+					shift -= 16;</div><div class='add'>+					ircode |= 1 &lt;&lt; shift;</div><div class='add'>+				} else {</div><div class='add'>+					shift -= 24;</div><div class='add'>+					not_code |= 1 &lt;&lt; shift;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+			ngap++;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+		ir-&gt;base_time = tv;</div><div class='add'>+</div><div class='add'>+		/* TIMEOUT - Long pulse */</div><div class='add'>+		if (gap &gt;= 5000)</div><div class='add'>+			break;</div><div class='add'>+		oldpulse = pulse;</div><div class='add'>+	} while (ngap &lt; 32);</div><div class='add'>+</div><div class='add'>+	if (ngap == 32) {</div><div class='add'>+		/* FIXME: should check if not_code == ~ircode */</div><div class='add'>+		ir-&gt;code = ir_extract_bits(ircode, ir-&gt;mask_keycode);</div><div class='add'>+</div><div class='add'>+		dprintk("scancode = 0x%02x (code = 0x%02x, notcode= 0x%02x)\n",</div><div class='add'>+			 ir-&gt;code, ircode, not_code);</div><div class='add'>+</div><div class='add'>+		ir_input_keydown(ir-&gt;dev, &amp;ir-&gt;ir, ir-&gt;code, ir-&gt;code);</div><div class='add'>+	} else</div><div class='add'>+		dprintk("Repeat last key\n");</div><div class='add'>+</div><div class='add'>+	/* Keep repeating the last key */</div><div class='add'>+	mod_timer(&amp;ir-&gt;timer_keyup, jiffies + msecs_to_jiffies(150));</div><div class='add'>+</div><div class='add'>+	saa_setl(SAA7134_IRQ2, SAA7134_IRQ2_INTE_GPIO18);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int saa7134_nec_irq(struct saa7134_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct card_ir *ir = dev-&gt;remote;</div><div class='add'>+</div><div class='add'>+	saa_clearl(SAA7134_IRQ2, SAA7134_IRQ2_INTE_GPIO18);</div><div class='add'>+	tasklet_schedule(&amp;ir-&gt;tlet);</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/media/video/saa7134/saa7134-ts.c b/drivers/media/video/saa7134/saa7134-ts.c<br/>index eae72fd60cec..ef55a59f0cda 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/saa7134/saa7134-ts.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/saa7134/saa7134-ts.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/saa7134/saa7134-ts.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/saa7134/saa7134-ts.c</a></div><div class='hunk'>@@ -66,11 +66,29 @@ static int buffer_activate(struct saa7134_dev *dev,</div><div class='ctx'> 	saa7134_set_dmabits(dev);</div><div class='ctx'> </div><div class='ctx'> 	mod_timer(&amp;dev-&gt;ts_q.timeout, jiffies+BUFFER_TIMEOUT);</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;ts_state == SAA7134_TS_BUFF_DONE) {</div><div class='add'>+		/* Clear TS cache */</div><div class='add'>+		dev-&gt;buff_cnt = 0;</div><div class='add'>+		saa_writeb(SAA7134_TS_SERIAL1, 0x00);</div><div class='add'>+		saa_writeb(SAA7134_TS_SERIAL1, 0x03);</div><div class='add'>+		saa_writeb(SAA7134_TS_SERIAL1, 0x00);</div><div class='add'>+		saa_writeb(SAA7134_TS_SERIAL1, 0x01);</div><div class='add'>+</div><div class='add'>+		/* TS clock non-inverted */</div><div class='add'>+		saa_writeb(SAA7134_TS_SERIAL1, 0x00);</div><div class='add'>+</div><div class='add'>+		/* Start TS stream */</div><div class='add'>+		saa_writeb(SAA7134_TS_SERIAL0, 0x40);</div><div class='add'>+		saa_writeb(SAA7134_TS_PARALLEL, 0xEC);</div><div class='add'>+		dev-&gt;ts_state = SAA7134_TS_STARTED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int buffer_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb,</div><div class='del'>-			  enum v4l2_field field)</div><div class='add'>+		enum v4l2_field field)</div><div class='ctx'> {</div><div class='ctx'> 	struct saa7134_dev *dev = q-&gt;priv_data;</div><div class='ctx'> 	struct saa7134_buf *buf = container_of(vb,struct saa7134_buf,vb);</div><div class='hunk'>@@ -110,16 +128,22 @@ static int buffer_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb,</div><div class='ctx'> 			goto oops;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* dma: setup channel 5 (= TS) */</div><div class='del'>-	control = SAA7134_RS_CONTROL_BURST_16 |</div><div class='del'>-		  SAA7134_RS_CONTROL_ME |</div><div class='del'>-		  (buf-&gt;pt-&gt;dma &gt;&gt; 12);</div><div class='del'>-</div><div class='del'>-	saa_writeb(SAA7134_TS_DMA0, ((lines-1)&amp;0xff));</div><div class='del'>-	saa_writeb(SAA7134_TS_DMA1, (((lines-1)&gt;&gt;8)&amp;0xff));</div><div class='del'>-	saa_writeb(SAA7134_TS_DMA2, ((((lines-1)&gt;&gt;16)&amp;0x3f) | 0x00)); /* TSNOPIT=0, TSCOLAP=0 */</div><div class='del'>-	saa_writel(SAA7134_RS_PITCH(5),TS_PACKET_SIZE);</div><div class='del'>-	saa_writel(SAA7134_RS_CONTROL(5),control);</div><div class='add'>+	dev-&gt;buff_cnt++;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;buff_cnt == dev-&gt;ts.nr_bufs) {</div><div class='add'>+		dev-&gt;ts_state = SAA7134_TS_BUFF_DONE;</div><div class='add'>+		/* dma: setup channel 5 (= TS) */</div><div class='add'>+		control = SAA7134_RS_CONTROL_BURST_16 |</div><div class='add'>+			SAA7134_RS_CONTROL_ME |</div><div class='add'>+			(buf-&gt;pt-&gt;dma &gt;&gt; 12);</div><div class='add'>+</div><div class='add'>+		saa_writeb(SAA7134_TS_DMA0, (lines - 1) &amp; 0xff);</div><div class='add'>+		saa_writeb(SAA7134_TS_DMA1, ((lines - 1) &gt;&gt; 8) &amp; 0xff);</div><div class='add'>+		/* TSNOPIT=0, TSCOLAP=0 */</div><div class='add'>+		saa_writeb(SAA7134_TS_DMA2, (((lines - 1) &gt;&gt; 16) &amp; 0x3f) | 0x00);</div><div class='add'>+		saa_writel(SAA7134_RS_PITCH(5), TS_PACKET_SIZE);</div><div class='add'>+		saa_writel(SAA7134_RS_CONTROL(5), control);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	buf-&gt;vb.state = VIDEOBUF_PREPARED;</div><div class='ctx'> 	buf-&gt;activate = buffer_activate;</div><div class='hunk'>@@ -140,6 +164,8 @@ buffer_setup(struct videobuf_queue *q, unsigned int *count, unsigned int *size)</div><div class='ctx'> 	if (0 == *count)</div><div class='ctx'> 		*count = dev-&gt;ts.nr_bufs;</div><div class='ctx'> 	*count = saa7134_buffer_count(*size,*count);</div><div class='add'>+	dev-&gt;buff_cnt = 0;</div><div class='add'>+	dev-&gt;ts_state = SAA7134_TS_STOPPED;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -154,7 +180,13 @@ static void buffer_queue(struct videobuf_queue *q, struct videobuf_buffer *vb)</div><div class='ctx'> static void buffer_release(struct videobuf_queue *q, struct videobuf_buffer *vb)</div><div class='ctx'> {</div><div class='ctx'> 	struct saa7134_buf *buf = container_of(vb,struct saa7134_buf,vb);</div><div class='add'>+	struct saa7134_dev *dev = q-&gt;priv_data;</div><div class='ctx'> </div><div class='add'>+	if (dev-&gt;ts_state == SAA7134_TS_STARTED) {</div><div class='add'>+		/* Stop TS transport */</div><div class='add'>+		saa_writeb(SAA7134_TS_PARALLEL, 0x6c);</div><div class='add'>+		dev-&gt;ts_state = SAA7134_TS_STOPPED;</div><div class='add'>+	}</div><div class='ctx'> 	saa7134_dma_free(q,buf);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -182,7 +214,7 @@ int saa7134_ts_init_hw(struct saa7134_dev *dev)</div><div class='ctx'> 	/* deactivate TS softreset */</div><div class='ctx'> 	saa_writeb(SAA7134_TS_SERIAL1, 0x00);</div><div class='ctx'> 	/* TSSOP high active, TSVAL high active, TSLOCK ignored */</div><div class='del'>-	saa_writeb(SAA7134_TS_PARALLEL, 0xec);</div><div class='add'>+	saa_writeb(SAA7134_TS_PARALLEL, 0x6c);</div><div class='ctx'> 	saa_writeb(SAA7134_TS_PARALLEL_SERIAL, (TS_PACKET_SIZE-1));</div><div class='ctx'> 	saa_writeb(SAA7134_TS_DMA0, ((dev-&gt;ts.nr_packets-1)&amp;0xff));</div><div class='ctx'> 	saa_writeb(SAA7134_TS_DMA1, (((dev-&gt;ts.nr_packets-1)&gt;&gt;8)&amp;0xff));</div><div class='head'>diff --git a/drivers/media/video/saa7134/saa7134-video.c b/drivers/media/video/saa7134/saa7134-video.c<br/>index 68c268981861..02bb6747a39c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/saa7134/saa7134-video.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/saa7134/saa7134-video.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/saa7134/saa7134-video.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/saa7134/saa7134-video.c</a></div><div class='hunk'>@@ -628,6 +628,9 @@ void saa7134_set_tvnorm_hw(struct saa7134_dev *dev)</div><div class='ctx'> </div><div class='ctx'> 	if (card_in(dev, dev-&gt;ctl_input).tv)</div><div class='ctx'> 		saa7134_i2c_call_clients(dev, VIDIOC_S_STD, &amp;dev-&gt;tvnorm-&gt;id);</div><div class='add'>+	/* Set the correct norm for the saa6752hs. This function</div><div class='add'>+	   does nothing if there is no saa6752hs. */</div><div class='add'>+	saa7134_i2c_call_saa6752(dev, VIDIOC_S_STD, &amp;dev-&gt;tvnorm-&gt;id);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void set_h_prescale(struct saa7134_dev *dev, int task, int prescale)</div><div class='hunk'>@@ -1330,6 +1333,8 @@ static int video_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	struct saa7134_fh *fh;</div><div class='ctx'> 	enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE;</div><div class='ctx'> 	int radio = 0;</div><div class='add'>+</div><div class='add'>+	lock_kernel();</div><div class='ctx'> 	list_for_each_entry(dev, &amp;saa7134_devlist, devlist) {</div><div class='ctx'> 		if (dev-&gt;video_dev &amp;&amp; (dev-&gt;video_dev-&gt;minor == minor))</div><div class='ctx'> 			goto found;</div><div class='hunk'>@@ -1342,6 +1347,7 @@ static int video_open(struct inode *inode, struct file *file)</div><div class='ctx'> 			goto found;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+	unlock_kernel();</div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'>  found:</div><div class='ctx'> </div><div class='hunk'>@@ -1350,8 +1356,10 @@ static int video_open(struct inode *inode, struct file *file)</div><div class='ctx'> </div><div class='ctx'> 	/* allocate + initialize per filehandle data */</div><div class='ctx'> 	fh = kzalloc(sizeof(*fh),GFP_KERNEL);</div><div class='del'>-	if (NULL == fh)</div><div class='add'>+	if (NULL == fh) {</div><div class='add'>+		unlock_kernel();</div><div class='ctx'> 		return -ENOMEM;</div><div class='add'>+	}</div><div class='ctx'> 	file-&gt;private_data = fh;</div><div class='ctx'> 	fh-&gt;dev      = dev;</div><div class='ctx'> 	fh-&gt;radio    = radio;</div><div class='hunk'>@@ -1384,6 +1392,7 @@ static int video_open(struct inode *inode, struct file *file)</div><div class='ctx'> 		/* switch to video/vbi mode */</div><div class='ctx'> 		video_mux(dev,dev-&gt;ctl_input);</div><div class='ctx'> 	}</div><div class='add'>+	unlock_kernel();</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1790,18 +1799,25 @@ static int saa7134_querycap(struct file *file, void  *priv,</div><div class='ctx'> 		return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int saa7134_s_std(struct file *file, void *priv, v4l2_std_id *id)</div><div class='add'>+int saa7134_s_std_internal(struct saa7134_dev *dev, struct saa7134_fh *fh, v4l2_std_id *id)</div><div class='ctx'> {</div><div class='del'>-	struct saa7134_fh *fh = priv;</div><div class='del'>-	struct saa7134_dev *dev = fh-&gt;dev;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	v4l2_std_id fixup;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = v4l2_prio_check(&amp;dev-&gt;prio, &amp;fh-&gt;prio);</div><div class='del'>-	if (0 != err)</div><div class='del'>-		return err;</div><div class='add'>+	/* When called from the empress code fh == NULL.</div><div class='add'>+	   That needs to be fixed somehow, but for now this is</div><div class='add'>+	   good enough. */</div><div class='add'>+	if (fh) {</div><div class='add'>+		err = v4l2_prio_check(&amp;dev-&gt;prio, &amp;fh-&gt;prio);</div><div class='add'>+		if (0 != err)</div><div class='add'>+			return err;</div><div class='add'>+	} else if (res_locked(dev, RESOURCE_OVERLAY)) {</div><div class='add'>+		/* Don't change the std from the mpeg device</div><div class='add'>+		   if overlay is active. */</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; TVNORMS; i++)</div><div class='ctx'> 		if (*id == tvnorms[i].id)</div><div class='hunk'>@@ -1834,7 +1850,7 @@ static int saa7134_s_std(struct file *file, void *priv, v4l2_std_id *id)</div><div class='ctx'> 	*id = tvnorms[i].id;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;lock);</div><div class='del'>-	if (res_check(fh, RESOURCE_OVERLAY)) {</div><div class='add'>+	if (fh &amp;&amp; res_check(fh, RESOURCE_OVERLAY)) {</div><div class='ctx'> 		spin_lock_irqsave(&amp;dev-&gt;slock, flags);</div><div class='ctx'> 		stop_preview(dev, fh);</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;dev-&gt;slock, flags);</div><div class='hunk'>@@ -1851,6 +1867,23 @@ static int saa7134_s_std(struct file *file, void *priv, v4l2_std_id *id)</div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(saa7134_s_std_internal);</div><div class='add'>+</div><div class='add'>+static int saa7134_s_std(struct file *file, void *priv, v4l2_std_id *id)</div><div class='add'>+{</div><div class='add'>+	struct saa7134_fh *fh = priv;</div><div class='add'>+</div><div class='add'>+	return saa7134_s_std_internal(fh-&gt;dev, fh, id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int saa7134_g_std(struct file *file, void *priv, v4l2_std_id *id)</div><div class='add'>+{</div><div class='add'>+	struct saa7134_fh *fh = priv;</div><div class='add'>+	struct saa7134_dev *dev = fh-&gt;dev;</div><div class='add'>+</div><div class='add'>+	*id = dev-&gt;tvnorm-&gt;id;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static int saa7134_cropcap(struct file *file, void *priv,</div><div class='ctx'> 					struct v4l2_cropcap *cap)</div><div class='hunk'>@@ -2077,18 +2110,6 @@ static int saa7134_enum_fmt_vid_overlay(struct file *file, void  *priv,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int saa7134_enum_fmt_vbi_cap(struct file *file, void  *priv,</div><div class='del'>-					struct v4l2_fmtdesc *f)</div><div class='del'>-{</div><div class='del'>-	if (0 != f-&gt;index)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	f-&gt;pixelformat = V4L2_PIX_FMT_GREY;</div><div class='del'>-	strcpy(f-&gt;description, "vbi data");</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int saa7134_g_fbuf(struct file *file, void *f,</div><div class='ctx'> 				struct v4l2_framebuffer *fb)</div><div class='ctx'> {</div><div class='hunk'>@@ -2379,7 +2400,6 @@ static const struct v4l2_ioctl_ops video_ioctl_ops = {</div><div class='ctx'> 	.vidioc_g_fmt_vid_overlay	= saa7134_g_fmt_vid_overlay,</div><div class='ctx'> 	.vidioc_try_fmt_vid_overlay	= saa7134_try_fmt_vid_overlay,</div><div class='ctx'> 	.vidioc_s_fmt_vid_overlay	= saa7134_s_fmt_vid_overlay,</div><div class='del'>-	.vidioc_enum_fmt_vbi_cap	= saa7134_enum_fmt_vbi_cap,</div><div class='ctx'> 	.vidioc_g_fmt_vbi_cap		= saa7134_try_get_set_fmt_vbi_cap,</div><div class='ctx'> 	.vidioc_try_fmt_vbi_cap		= saa7134_try_get_set_fmt_vbi_cap,</div><div class='ctx'> 	.vidioc_s_fmt_vbi_cap		= saa7134_try_get_set_fmt_vbi_cap,</div><div class='hunk'>@@ -2391,6 +2411,7 @@ static const struct v4l2_ioctl_ops video_ioctl_ops = {</div><div class='ctx'> 	.vidioc_qbuf			= saa7134_qbuf,</div><div class='ctx'> 	.vidioc_dqbuf			= saa7134_dqbuf,</div><div class='ctx'> 	.vidioc_s_std			= saa7134_s_std,</div><div class='add'>+	.vidioc_g_std			= saa7134_g_std,</div><div class='ctx'> 	.vidioc_enum_input		= saa7134_enum_input,</div><div class='ctx'> 	.vidioc_g_input			= saa7134_g_input,</div><div class='ctx'> 	.vidioc_s_input			= saa7134_s_input,</div><div class='head'>diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h<br/>index a0884f639f65..24096d6e1ef8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/saa7134/saa7134.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/saa7134/saa7134.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/saa7134/saa7134.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/saa7134/saa7134.h</a></div><div class='hunk'>@@ -269,6 +269,12 @@ struct saa7134_format {</div><div class='ctx'> #define SAA7134_BOARD_BEHOLD_M6_EXTRA    144</div><div class='ctx'> #define SAA7134_BOARD_AVERMEDIA_M103    145</div><div class='ctx'> #define SAA7134_BOARD_ASUSTeK_P7131_ANALOG 146</div><div class='add'>+#define SAA7134_BOARD_ASUSTeK_TIGER_3IN1   147</div><div class='add'>+#define SAA7134_BOARD_ENCORE_ENLTV_FM53 148</div><div class='add'>+#define SAA7134_BOARD_AVERMEDIA_M135A    149</div><div class='add'>+#define SAA7134_BOARD_REAL_ANGEL_220     150</div><div class='add'>+#define SAA7134_BOARD_ADS_INSTANT_HDTV_PCI  151</div><div class='add'>+#define SAA7134_BOARD_ASUSTeK_TIGER         152</div><div class='ctx'> </div><div class='ctx'> #define SAA7134_MAXBOARDS 8</div><div class='ctx'> #define SAA7134_INPUT_MAX 8</div><div class='hunk'>@@ -462,6 +468,12 @@ struct saa7134_mpeg_ops {</div><div class='ctx'> 	void                       (*signal_change)(struct saa7134_dev *dev);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum saa7134_ts_status {</div><div class='add'>+	SAA7134_TS_STOPPED,</div><div class='add'>+	SAA7134_TS_BUFF_DONE,</div><div class='add'>+	SAA7134_TS_STARTED,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* global device status */</div><div class='ctx'> struct saa7134_dev {</div><div class='ctx'> 	struct list_head           devlist;</div><div class='hunk'>@@ -555,6 +567,8 @@ struct saa7134_dev {</div><div class='ctx'> 	/* SAA7134_MPEG_* */</div><div class='ctx'> 	struct saa7134_ts          ts;</div><div class='ctx'> 	struct saa7134_dmaqueue    ts_q;</div><div class='add'>+	enum saa7134_ts_status 	   ts_state;</div><div class='add'>+	unsigned int 		   buff_cnt;</div><div class='ctx'> 	struct saa7134_mpeg_ops    *mops;</div><div class='ctx'> 	struct i2c_client 	   *mpeg_i2c_client;</div><div class='ctx'> </div><div class='hunk'>@@ -567,7 +581,7 @@ struct saa7134_dev {</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_VIDEO_SAA7134_DVB) || defined(CONFIG_VIDEO_SAA7134_DVB_MODULE)</div><div class='ctx'> 	/* SAA7134_MPEG_DVB only */</div><div class='del'>-	struct videobuf_dvb        dvb;</div><div class='add'>+	struct videobuf_dvb_frontends frontends;</div><div class='ctx'> 	int (*original_demod_sleep)(struct dvb_frontend *fe);</div><div class='ctx'> 	int (*original_set_voltage)(struct dvb_frontend *fe, fe_sec_voltage_t voltage);</div><div class='ctx'> 	int (*original_set_high_voltage)(struct dvb_frontend *fe, long arg);</div><div class='hunk'>@@ -644,7 +658,7 @@ extern struct pci_device_id __devinitdata saa7134_pci_tbl[];</div><div class='ctx'> </div><div class='ctx'> extern int saa7134_board_init1(struct saa7134_dev *dev);</div><div class='ctx'> extern int saa7134_board_init2(struct saa7134_dev *dev);</div><div class='del'>-int saa7134_tuner_callback(void *priv, int command, int arg);</div><div class='add'>+int saa7134_tuner_callback(void *priv, int component, int command, int arg);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* ----------------------------------------------------------- */</div><div class='hunk'>@@ -654,6 +668,8 @@ int saa7134_i2c_register(struct saa7134_dev *dev);</div><div class='ctx'> int saa7134_i2c_unregister(struct saa7134_dev *dev);</div><div class='ctx'> void saa7134_i2c_call_clients(struct saa7134_dev *dev,</div><div class='ctx'> 			      unsigned int cmd, void *arg);</div><div class='add'>+int saa7134_i2c_call_saa6752(struct saa7134_dev *dev,</div><div class='add'>+			      unsigned int cmd, void *arg);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* ----------------------------------------------------------- */</div><div class='hunk'>@@ -666,6 +682,7 @@ extern struct video_device saa7134_radio_template;</div><div class='ctx'> int saa7134_s_ctrl_internal(struct saa7134_dev *dev,  struct saa7134_fh *fh, struct v4l2_control *c);</div><div class='ctx'> int saa7134_g_ctrl_internal(struct saa7134_dev *dev,  struct saa7134_fh *fh, struct v4l2_control *c);</div><div class='ctx'> int saa7134_queryctrl(struct file *file, void *priv, struct v4l2_queryctrl *c);</div><div class='add'>+int saa7134_s_std_internal(struct saa7134_dev *dev,  struct saa7134_fh *fh, v4l2_std_id *id);</div><div class='ctx'> </div><div class='ctx'> int saa7134_videoport_init(struct saa7134_dev *dev);</div><div class='ctx'> void saa7134_set_tvnorm_hw(struct saa7134_dev *dev);</div><div class='head'>diff --git a/drivers/media/video/saa7185.c b/drivers/media/video/saa7185.c<br/>index 02fda4eecea3..6debb65152ee 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/saa7185.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/saa7185.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/saa7185.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/saa7185.c</a></div><div class='hunk'>@@ -25,43 +25,25 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/fs.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/major.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/i2c.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/pgtable.h&gt;</div><div class='del'>-#include &lt;asm/page.h&gt;</div><div class='add'>+#include &lt;linux/ioctl.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='del'>-</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/i2c-id.h&gt;</div><div class='ctx'> #include &lt;linux/videodev.h&gt;</div><div class='ctx'> #include &lt;linux/video_encoder.h&gt;</div><div class='add'>+#include &lt;media/v4l2-common.h&gt;</div><div class='add'>+#include &lt;media/v4l2-i2c-drv-legacy.h&gt;</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("Philips SAA7185 video encoder driver");</div><div class='ctx'> MODULE_AUTHOR("Dave Perks");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#define I2C_NAME(s) (s)-&gt;name</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> static int debug;</div><div class='ctx'> module_param(debug, int, 0);</div><div class='ctx'> MODULE_PARM_DESC(debug, "Debug level (0-1)");</div><div class='ctx'> </div><div class='del'>-#define dprintk(num, format, args...) \</div><div class='del'>-	do { \</div><div class='del'>-		if (debug &gt;= num) \</div><div class='del'>-			printk(format, ##args); \</div><div class='del'>-	} while (0)</div><div class='del'>-</div><div class='ctx'> /* ----------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='ctx'> struct saa7185 {</div><div class='hunk'>@@ -75,32 +57,24 @@ struct saa7185 {</div><div class='ctx'> 	int sat;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define   I2C_SAA7185        0x88</div><div class='del'>-</div><div class='ctx'> /* ----------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='del'>-static inline int</div><div class='del'>-saa7185_read (struct i2c_client *client)</div><div class='add'>+static inline int saa7185_read(struct i2c_client *client)</div><div class='ctx'> {</div><div class='ctx'> 	return i2c_smbus_read_byte(client);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-saa7185_write (struct i2c_client *client,</div><div class='del'>-	       u8                 reg,</div><div class='del'>-	       u8                 value)</div><div class='add'>+static int saa7185_write(struct i2c_client *client, u8 reg, u8 value)</div><div class='ctx'> {</div><div class='ctx'> 	struct saa7185 *encoder = i2c_get_clientdata(client);</div><div class='ctx'> </div><div class='del'>-	dprintk(1, KERN_DEBUG "SAA7185: %02x set to %02x\n", reg, value);</div><div class='add'>+	v4l_dbg(1, debug, client, "%02x set to %02x\n", reg, value);</div><div class='ctx'> 	encoder-&gt;reg[reg] = value;</div><div class='ctx'> 	return i2c_smbus_write_byte_data(client, reg, value);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-saa7185_write_block (struct i2c_client *client,</div><div class='del'>-		     const u8          *data,</div><div class='del'>-		     unsigned int       len)</div><div class='add'>+static int saa7185_write_block(struct i2c_client *client,</div><div class='add'>+		const u8 *data, unsigned int len)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = -1;</div><div class='ctx'> 	u8 reg;</div><div class='hunk'>@@ -121,18 +95,17 @@ saa7185_write_block (struct i2c_client *client,</div><div class='ctx'> 				    encoder-&gt;reg[reg++] = data[1];</div><div class='ctx'> 				len -= 2;</div><div class='ctx'> 				data += 2;</div><div class='del'>-			} while (len &gt;= 2 &amp;&amp; data[0] == reg &amp;&amp;</div><div class='del'>-				 block_len &lt; 32);</div><div class='del'>-			if ((ret = i2c_master_send(client, block_data,</div><div class='del'>-						   block_len)) &lt; 0)</div><div class='add'>+			} while (len &gt;= 2 &amp;&amp; data[0] == reg &amp;&amp; block_len &lt; 32);</div><div class='add'>+			ret = i2c_master_send(client, block_data, block_len);</div><div class='add'>+			if (ret &lt; 0)</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* do some slow I2C emulation kind of thing */</div><div class='ctx'> 		while (len &gt;= 2) {</div><div class='ctx'> 			reg = *data++;</div><div class='del'>-			if ((ret = saa7185_write(client, reg,</div><div class='del'>-						 *data++)) &lt; 0)</div><div class='add'>+			ret = saa7185_write(client, reg, *data++);</div><div class='add'>+			if (ret &lt; 0)</div><div class='ctx'> 				break;</div><div class='ctx'> 			len -= 2;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -240,15 +213,11 @@ static const unsigned char init_ntsc[] = {</div><div class='ctx'> 	0x66, 0x21,		/* FSC3 */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-saa7185_command (struct i2c_client *client,</div><div class='del'>-		 unsigned int       cmd,</div><div class='del'>-		 void              *arg)</div><div class='add'>+static int saa7185_command(struct i2c_client *client, unsigned cmd, void *arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct saa7185 *encoder = i2c_get_clientdata(client);</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='del'>-</div><div class='ctx'> 	case 0:</div><div class='ctx'> 		saa7185_write_block(client, init_common,</div><div class='ctx'> 				    sizeof(init_common));</div><div class='hunk'>@@ -264,7 +233,6 @@ saa7185_command (struct i2c_client *client,</div><div class='ctx'> 					    sizeof(init_pal));</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case ENCODER_GET_CAPABILITIES:</div><div class='hunk'>@@ -276,8 +244,8 @@ saa7185_command (struct i2c_client *client,</div><div class='ctx'> 		    VIDEO_ENCODER_SECAM | VIDEO_ENCODER_CCIR;</div><div class='ctx'> 		cap-&gt;inputs = 1;</div><div class='ctx'> 		cap-&gt;outputs = 1;</div><div class='del'>-	}</div><div class='ctx'> 		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	case ENCODER_SET_NORM:</div><div class='ctx'> 	{</div><div class='hunk'>@@ -286,7 +254,6 @@ saa7185_command (struct i2c_client *client,</div><div class='ctx'> 		//saa7185_write_block(client, init_common, sizeof(init_common));</div><div class='ctx'> </div><div class='ctx'> 		switch (*iarg) {</div><div class='del'>-</div><div class='ctx'> 		case VIDEO_MODE_NTSC:</div><div class='ctx'> 			saa7185_write_block(client, init_ntsc,</div><div class='ctx'> 					    sizeof(init_ntsc));</div><div class='hunk'>@@ -300,11 +267,10 @@ saa7185_command (struct i2c_client *client,</div><div class='ctx'> 		case VIDEO_MODE_SECAM:</div><div class='ctx'> 		default:</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-</div><div class='ctx'> 		}</div><div class='ctx'> 		encoder-&gt;norm = *iarg;</div><div class='del'>-	}</div><div class='ctx'> 		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	case ENCODER_SET_INPUT:</div><div class='ctx'> 	{</div><div class='hunk'>@@ -314,7 +280,6 @@ saa7185_command (struct i2c_client *client,</div><div class='ctx'> 		 *iarg = 1: input is from ZR36060 */</div><div class='ctx'> </div><div class='ctx'> 		switch (*iarg) {</div><div class='del'>-</div><div class='ctx'> 		case 0:</div><div class='ctx'> 			/* Switch RTCE to 1 */</div><div class='ctx'> 			saa7185_write(client, 0x61,</div><div class='hunk'>@@ -332,21 +297,19 @@ saa7185_command (struct i2c_client *client,</div><div class='ctx'> </div><div class='ctx'> 		default:</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-</div><div class='ctx'> 		}</div><div class='del'>-	}</div><div class='ctx'> 		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	case ENCODER_SET_OUTPUT:</div><div class='ctx'> 	{</div><div class='ctx'> 		int *iarg = arg;</div><div class='ctx'> </div><div class='ctx'> 		/* not much choice of outputs */</div><div class='del'>-		if (*iarg != 0) {</div><div class='add'>+		if (*iarg != 0)</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='ctx'> 		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	case ENCODER_ENABLE_OUTPUT:</div><div class='ctx'> 	{</div><div class='hunk'>@@ -356,8 +319,8 @@ saa7185_command (struct i2c_client *client,</div><div class='ctx'> 		saa7185_write(client, 0x61,</div><div class='ctx'> 			      (encoder-&gt;reg[0x61] &amp; 0xbf) |</div><div class='ctx'> 			      (encoder-&gt;enable ? 0x00 : 0x40));</div><div class='del'>-	}</div><div class='ctx'> 		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -368,138 +331,65 @@ saa7185_command (struct i2c_client *client,</div><div class='ctx'> </div><div class='ctx'> /* ----------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Generic i2c probe</div><div class='del'>- * concerning the addresses: i2c wants 7 bit (without the r/w bit), so '&gt;&gt;1'</div><div class='del'>- */</div><div class='del'>-static unsigned short normal_i2c[] = { I2C_SAA7185 &gt;&gt; 1, I2C_CLIENT_END };</div><div class='add'>+static unsigned short normal_i2c[] = { 0x88 &gt;&gt; 1, I2C_CLIENT_END };</div><div class='ctx'> </div><div class='del'>-static unsigned short ignore = I2C_CLIENT_END;</div><div class='add'>+I2C_CLIENT_INSMOD;</div><div class='ctx'> </div><div class='del'>-static struct i2c_client_address_data addr_data = {</div><div class='del'>-	.normal_i2c		= normal_i2c,</div><div class='del'>-	.probe			= &amp;ignore,</div><div class='del'>-	.ignore			= &amp;ignore,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct i2c_driver i2c_driver_saa7185;</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-saa7185_detect_client (struct i2c_adapter *adapter,</div><div class='del'>-		       int                 address,</div><div class='del'>-		       int                 kind)</div><div class='add'>+static int saa7185_probe(struct i2c_client *client,</div><div class='add'>+			const struct i2c_device_id *id)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='del'>-	struct i2c_client *client;</div><div class='ctx'> 	struct saa7185 *encoder;</div><div class='ctx'> </div><div class='del'>-	dprintk(1,</div><div class='del'>-		KERN_INFO</div><div class='del'>-		"saa7185.c: detecting saa7185 client on address 0x%x\n",</div><div class='del'>-		address &lt;&lt; 1);</div><div class='del'>-</div><div class='ctx'> 	/* Check if the adapter supports the needed features */</div><div class='del'>-	if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))</div><div class='del'>-		return 0;</div><div class='add'>+	if (!i2c_check_functionality(client-&gt;adapter, I2C_FUNC_SMBUS_BYTE_DATA))</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);</div><div class='del'>-	if (!client)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	client-&gt;addr = address;</div><div class='del'>-	client-&gt;adapter = adapter;</div><div class='del'>-	client-&gt;driver = &amp;i2c_driver_saa7185;</div><div class='del'>-	strlcpy(I2C_NAME(client), "saa7185", sizeof(I2C_NAME(client)));</div><div class='add'>+	v4l_info(client, "chip found @ 0x%x (%s)\n",</div><div class='add'>+			client-&gt;addr &lt;&lt; 1, client-&gt;adapter-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	encoder = kzalloc(sizeof(struct saa7185), GFP_KERNEL);</div><div class='del'>-	if (encoder == NULL) {</div><div class='del'>-		kfree(client);</div><div class='add'>+	if (encoder == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	}</div><div class='ctx'> 	encoder-&gt;norm = VIDEO_MODE_NTSC;</div><div class='ctx'> 	encoder-&gt;enable = 1;</div><div class='ctx'> 	i2c_set_clientdata(client, encoder);</div><div class='ctx'> </div><div class='del'>-	i = i2c_attach_client(client);</div><div class='del'>-	if (i) {</div><div class='del'>-		kfree(client);</div><div class='del'>-		kfree(encoder);</div><div class='del'>-		return i;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	i = saa7185_write_block(client, init_common, sizeof(init_common));</div><div class='del'>-	if (i &gt;= 0) {</div><div class='del'>-		i = saa7185_write_block(client, init_ntsc,</div><div class='del'>-					sizeof(init_ntsc));</div><div class='del'>-	}</div><div class='del'>-	if (i &lt; 0) {</div><div class='del'>-		dprintk(1, KERN_ERR "%s_attach: init error %d\n",</div><div class='del'>-			I2C_NAME(client), i);</div><div class='del'>-	} else {</div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_INFO</div><div class='del'>-			"%s_attach: chip version %d at address 0x%x\n",</div><div class='del'>-			I2C_NAME(client), saa7185_read(client) &gt;&gt; 5,</div><div class='del'>-			client-&gt;addr &lt;&lt; 1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='add'>+	if (i &gt;= 0)</div><div class='add'>+		i = saa7185_write_block(client, init_ntsc, sizeof(init_ntsc));</div><div class='add'>+	if (i &lt; 0)</div><div class='add'>+		v4l_dbg(1, debug, client, "init error %d\n", i);</div><div class='add'>+	else</div><div class='add'>+		v4l_dbg(1, debug, client, "revision 0x%x\n",</div><div class='add'>+				saa7185_read(client) &gt;&gt; 5);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-saa7185_attach_adapter (struct i2c_adapter *adapter)</div><div class='del'>-{</div><div class='del'>-	dprintk(1,</div><div class='del'>-		KERN_INFO</div><div class='del'>-		"saa7185.c: starting probe for adapter %s (0x%x)\n",</div><div class='del'>-		I2C_NAME(adapter), adapter-&gt;id);</div><div class='del'>-	return i2c_probe(adapter, &amp;addr_data, &amp;saa7185_detect_client);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-saa7185_detach_client (struct i2c_client *client)</div><div class='add'>+static int saa7185_remove(struct i2c_client *client)</div><div class='ctx'> {</div><div class='ctx'> 	struct saa7185 *encoder = i2c_get_clientdata(client);</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = i2c_detach_client(client);</div><div class='del'>-	if (err) {</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	saa7185_write(client, 0x61, (encoder-&gt;reg[0x61]) | 0x40);	/* SW: output off is active */</div><div class='ctx'> 	//saa7185_write(client, 0x3a, (encoder-&gt;reg[0x3a]) | 0x80); /* SW: color bar */</div><div class='ctx'> </div><div class='ctx'> 	kfree(encoder);</div><div class='del'>-	kfree(client);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* ----------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='del'>-static struct i2c_driver i2c_driver_saa7185 = {</div><div class='del'>-	.driver = {</div><div class='del'>-		.name = "saa7185",	/* name */</div><div class='del'>-	},</div><div class='del'>-</div><div class='del'>-	.id = I2C_DRIVERID_SAA7185B,</div><div class='add'>+static const struct i2c_device_id saa7185_id[] = {</div><div class='add'>+	{ "saa7185", 0 },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(i2c, saa7185_id);</div><div class='ctx'> </div><div class='del'>-	.attach_adapter = saa7185_attach_adapter,</div><div class='del'>-	.detach_client = saa7185_detach_client,</div><div class='add'>+static struct v4l2_i2c_driver_data v4l2_i2c_data = {</div><div class='add'>+	.name = "saa7185",</div><div class='add'>+	.driverid = I2C_DRIVERID_SAA7185B,</div><div class='ctx'> 	.command = saa7185_command,</div><div class='add'>+	.probe = saa7185_probe,</div><div class='add'>+	.remove = saa7185_remove,</div><div class='add'>+	.id_table = saa7185_id,</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init</div><div class='del'>-saa7185_init (void)</div><div class='del'>-{</div><div class='del'>-	return i2c_add_driver(&amp;i2c_driver_saa7185);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit</div><div class='del'>-saa7185_exit (void)</div><div class='del'>-{</div><div class='del'>-	i2c_del_driver(&amp;i2c_driver_saa7185);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(saa7185_init);</div><div class='del'>-module_exit(saa7185_exit);</div><div class='head'>diff --git a/drivers/media/video/se401.c b/drivers/media/video/se401.c<br/>index acceed5d04ae..ae3949180c4e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/se401.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/se401.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/se401.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/se401.c</a></div><div class='hunk'>@@ -288,7 +288,7 @@ static void se401_button_irq(struct urb *urb)</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='ctx'> 	if (!se401-&gt;dev) {</div><div class='del'>-		info("ohoh: device vapourished");</div><div class='add'>+		dev_info(&amp;urb-&gt;dev-&gt;dev, "device vapourished\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -328,7 +328,7 @@ static void se401_video_irq(struct urb *urb)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (!se401-&gt;dev) {</div><div class='del'>-		info ("ohoh: device vapourished");</div><div class='add'>+		dev_info(&amp;urb-&gt;dev-&gt;dev, "device vapourished\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -375,7 +375,7 @@ static void se401_video_irq(struct urb *urb)</div><div class='ctx'> 	urb-&gt;status=0;</div><div class='ctx'> 	urb-&gt;dev=se401-&gt;dev;</div><div class='ctx'> 	if(usb_submit_urb(urb, GFP_KERNEL))</div><div class='del'>-		info("urb burned down");</div><div class='add'>+		dev_info(&amp;urb-&gt;dev-&gt;dev, "urb burned down\n");</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -860,7 +860,8 @@ static int se401_newframe(struct usb_se401 *se401, int framenr)</div><div class='ctx'> 		);</div><div class='ctx'> 		if (se401-&gt;nullpackets &gt; SE401_MAX_NULLPACKETS) {</div><div class='ctx'> 			se401-&gt;nullpackets=0;</div><div class='del'>-			info("to many null length packets, restarting capture");</div><div class='add'>+			dev_info(&amp;se401-&gt;dev-&gt;dev,</div><div class='add'>+				 "too many null length packets, restarting capture\n");</div><div class='ctx'> 			se401_stop_stream(se401);</div><div class='ctx'> 			se401_start_stream(se401);</div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -880,7 +881,8 @@ static int se401_newframe(struct usb_se401 *se401, int framenr)</div><div class='ctx'> 				se401-&gt;scratch_use=0;</div><div class='ctx'> 			if (errors &gt; SE401_MAX_ERRORS) {</div><div class='ctx'> 				errors=0;</div><div class='del'>-				info("to much errors, restarting capture");</div><div class='add'>+				dev_info(&amp;se401-&gt;dev-&gt;dev,</div><div class='add'>+					 "too many errors, restarting capture\n");</div><div class='ctx'> 				se401_stop_stream(se401);</div><div class='ctx'> 				se401_start_stream(se401);</div><div class='ctx'> 			}</div><div class='hunk'>@@ -913,7 +915,7 @@ static void usb_se401_remove_disconnected (struct usb_se401 *se401)</div><div class='ctx'> 		usb_kill_urb(se401-&gt;inturb);</div><div class='ctx'> 		usb_free_urb(se401-&gt;inturb);</div><div class='ctx'> 	}</div><div class='del'>-	info("%s disconnected", se401-&gt;camera_name);</div><div class='add'>+	dev_info(&amp;se401-&gt;dev-&gt;dev, "%s disconnected", se401-&gt;camera_name);</div><div class='ctx'> </div><div class='ctx'> 	/* Free the memory */</div><div class='ctx'> 	kfree(se401-&gt;width);</div><div class='hunk'>@@ -936,14 +938,18 @@ static int se401_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	struct usb_se401 *se401 = (struct usb_se401 *)dev;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='del'>-	if (se401-&gt;user)</div><div class='add'>+	lock_kernel();</div><div class='add'>+	if (se401-&gt;user) {</div><div class='add'>+		unlock_kernel();</div><div class='ctx'> 		return -EBUSY;</div><div class='add'>+	}</div><div class='ctx'> 	se401-&gt;fbuf = rvmalloc(se401-&gt;maxframesize * SE401_NUMFRAMES);</div><div class='ctx'> 	if (se401-&gt;fbuf)</div><div class='ctx'> 		file-&gt;private_data = dev;</div><div class='ctx'> 	else</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 	se401-&gt;user = !err;</div><div class='add'>+	unlock_kernel();</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -956,8 +962,8 @@ static int se401_close(struct inode *inode, struct file *file)</div><div class='ctx'> </div><div class='ctx'> 	rvfree(se401-&gt;fbuf, se401-&gt;maxframesize * SE401_NUMFRAMES);</div><div class='ctx'> 	if (se401-&gt;removed) {</div><div class='add'>+		dev_info(&amp;se401-&gt;dev-&gt;dev, "device unregistered\n");</div><div class='ctx'> 		usb_se401_remove_disconnected(se401);</div><div class='del'>-		info("device unregistered");</div><div class='ctx'> 	} else {</div><div class='ctx'> 		for (i=0; i&lt;SE401_NUMFRAMES; i++)</div><div class='ctx'> 			se401-&gt;frame[i].grabstate=FRAME_UNUSED;</div><div class='hunk'>@@ -1232,6 +1238,7 @@ static const struct file_operations se401_fops = {</div><div class='ctx'> static struct video_device se401_template = {</div><div class='ctx'> 	.name =         "se401 USB camera",</div><div class='ctx'> 	.fops =         &amp;se401_fops,</div><div class='add'>+	.release = video_device_release_empty,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -1271,7 +1278,7 @@ static int se401_init(struct usb_se401 *se401, int button)</div><div class='ctx'> 	for (i=0; i&lt;se401-&gt;sizes; i++) {</div><div class='ctx'> 		sprintf(temp, "%s %dx%d", temp, se401-&gt;width[i], se401-&gt;height[i]);</div><div class='ctx'> 	}</div><div class='del'>-	info("%s", temp);</div><div class='add'>+	dev_info(&amp;se401-&gt;dev-&gt;dev, "%s\n", temp);</div><div class='ctx'> 	se401-&gt;maxframesize=se401-&gt;width[se401-&gt;sizes-1]*se401-&gt;height[se401-&gt;sizes-1]*3;</div><div class='ctx'> </div><div class='ctx'> 	rc=se401_sndctrl(0, se401, SE401_REQ_GET_WIDTH, 0, cp, sizeof(cp));</div><div class='hunk'>@@ -1305,7 +1312,8 @@ static int se401_init(struct usb_se401 *se401, int button)</div><div class='ctx'> 	if (button) {</div><div class='ctx'> 		se401-&gt;inturb=usb_alloc_urb(0, GFP_KERNEL);</div><div class='ctx'> 		if (!se401-&gt;inturb) {</div><div class='del'>-			info("Allocation of inturb failed");</div><div class='add'>+			dev_info(&amp;se401-&gt;dev-&gt;dev,</div><div class='add'>+				 "Allocation of inturb failed\n");</div><div class='ctx'> 			return 1;</div><div class='ctx'> 		}</div><div class='ctx'> 		usb_fill_int_urb(se401-&gt;inturb, se401-&gt;dev,</div><div class='hunk'>@@ -1316,7 +1324,7 @@ static int se401_init(struct usb_se401 *se401, int button)</div><div class='ctx'> 		    8</div><div class='ctx'> 		);</div><div class='ctx'> 		if (usb_submit_urb(se401-&gt;inturb, GFP_KERNEL)) {</div><div class='del'>-			info("int urb burned down");</div><div class='add'>+			dev_info(&amp;se401-&gt;dev-&gt;dev, "int urb burned down\n");</div><div class='ctx'> 			return 1;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else</div><div class='hunk'>@@ -1373,7 +1381,7 @@ static int se401_probe(struct usb_interface *intf,</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	/* We found one */</div><div class='del'>-	info("SE401 camera found: %s", camera_name);</div><div class='add'>+	dev_info(&amp;intf-&gt;dev, "SE401 camera found: %s\n", camera_name);</div><div class='ctx'> </div><div class='ctx'> 	if ((se401 = kzalloc(sizeof(*se401), GFP_KERNEL)) == NULL) {</div><div class='ctx'> 		err("couldn't kmalloc se401 struct");</div><div class='hunk'>@@ -1384,7 +1392,8 @@ static int se401_probe(struct usb_interface *intf,</div><div class='ctx'> 	se401-&gt;iface = interface-&gt;bInterfaceNumber;</div><div class='ctx'> 	se401-&gt;camera_name = camera_name;</div><div class='ctx'> </div><div class='del'>-	info("firmware version: %02x", le16_to_cpu(dev-&gt;descriptor.bcdDevice) &amp; 255);</div><div class='add'>+	dev_info(&amp;intf-&gt;dev, "firmware version: %02x\n",</div><div class='add'>+		 le16_to_cpu(dev-&gt;descriptor.bcdDevice) &amp; 255);</div><div class='ctx'> </div><div class='ctx'> 	if (se401_init(se401, button)) {</div><div class='ctx'> 		kfree(se401);</div><div class='hunk'>@@ -1402,7 +1411,8 @@ static int se401_probe(struct usb_interface *intf,</div><div class='ctx'> 		err("video_register_device failed");</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='del'>-	info("registered new video device: video%d", se401-&gt;vdev.minor);</div><div class='add'>+	dev_info(&amp;intf-&gt;dev, "registered new video device: video%d\n",</div><div class='add'>+		 se401-&gt;vdev.minor);</div><div class='ctx'> </div><div class='ctx'> 	usb_set_intfdata (intf, se401);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1446,10 +1456,10 @@ static struct usb_driver se401_driver = {</div><div class='ctx'> </div><div class='ctx'> static int __init usb_se401_init(void)</div><div class='ctx'> {</div><div class='del'>-	info("SE401 usb camera driver version %s registering", version);</div><div class='add'>+	printk(KERN_INFO "SE401 usb camera driver version %s registering\n", version);</div><div class='ctx'> 	if (flickerless)</div><div class='ctx'> 		if (flickerless!=50 &amp;&amp; flickerless!=60) {</div><div class='del'>-			info("Invallid flickerless value, use 0, 50 or 60.");</div><div class='add'>+			printk(KERN_ERR "Invallid flickerless value, use 0, 50 or 60.\n");</div><div class='ctx'> 			return -1;</div><div class='ctx'> 	}</div><div class='ctx'> 	return usb_register(&amp;se401_driver);</div><div class='hunk'>@@ -1458,7 +1468,7 @@ static int __init usb_se401_init(void)</div><div class='ctx'> static void __exit usb_se401_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	usb_deregister(&amp;se401_driver);</div><div class='del'>-	info("SE401 driver deregistered");</div><div class='add'>+	printk(KERN_INFO "SE401 driver deregistered\frame");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(usb_se401_init);</div><div class='head'>diff --git a/drivers/media/video/sh_mobile_ceu_camera.c b/drivers/media/video/sh_mobile_ceu_camera.c<br/>index 318754e73132..2407607f2eff 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/sh_mobile_ceu_camera.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/sh_mobile_ceu_camera.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/sh_mobile_ceu_camera.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/sh_mobile_ceu_camera.c</a></div><div class='hunk'>@@ -40,39 +40,39 @@</div><div class='ctx'> </div><div class='ctx'> /* register offsets for sh7722 / sh7723 */</div><div class='ctx'> </div><div class='del'>-#define CAPSR  0x00</div><div class='del'>-#define CAPCR  0x04</div><div class='del'>-#define CAMCR  0x08</div><div class='del'>-#define CMCYR  0x0c</div><div class='del'>-#define CAMOR  0x10</div><div class='del'>-#define CAPWR  0x14</div><div class='del'>-#define CAIFR  0x18</div><div class='del'>-#define CSTCR  0x20 /* not on sh7723 */</div><div class='del'>-#define CSECR  0x24 /* not on sh7723 */</div><div class='del'>-#define CRCNTR 0x28</div><div class='del'>-#define CRCMPR 0x2c</div><div class='del'>-#define CFLCR  0x30</div><div class='del'>-#define CFSZR  0x34</div><div class='del'>-#define CDWDR  0x38</div><div class='del'>-#define CDAYR  0x3c</div><div class='del'>-#define CDACR  0x40</div><div class='del'>-#define CDBYR  0x44</div><div class='del'>-#define CDBCR  0x48</div><div class='del'>-#define CBDSR  0x4c</div><div class='del'>-#define CFWCR  0x5c</div><div class='del'>-#define CLFCR  0x60</div><div class='del'>-#define CDOCR  0x64</div><div class='del'>-#define CDDCR  0x68</div><div class='del'>-#define CDDAR  0x6c</div><div class='del'>-#define CEIER  0x70</div><div class='del'>-#define CETCR  0x74</div><div class='del'>-#define CSTSR  0x7c</div><div class='del'>-#define CSRTR  0x80</div><div class='del'>-#define CDSSR  0x84</div><div class='del'>-#define CDAYR2 0x90</div><div class='del'>-#define CDACR2 0x94</div><div class='del'>-#define CDBYR2 0x98</div><div class='del'>-#define CDBCR2 0x9c</div><div class='add'>+#define CAPSR  0x00 /* Capture start register */</div><div class='add'>+#define CAPCR  0x04 /* Capture control register */</div><div class='add'>+#define CAMCR  0x08 /* Capture interface control register */</div><div class='add'>+#define CMCYR  0x0c /* Capture interface cycle  register */</div><div class='add'>+#define CAMOR  0x10 /* Capture interface offset register */</div><div class='add'>+#define CAPWR  0x14 /* Capture interface width register */</div><div class='add'>+#define CAIFR  0x18 /* Capture interface input format register */</div><div class='add'>+#define CSTCR  0x20 /* Camera strobe control register (&lt;= sh7722) */</div><div class='add'>+#define CSECR  0x24 /* Camera strobe emission count register (&lt;= sh7722) */</div><div class='add'>+#define CRCNTR 0x28 /* CEU register control register */</div><div class='add'>+#define CRCMPR 0x2c /* CEU register forcible control register */</div><div class='add'>+#define CFLCR  0x30 /* Capture filter control register */</div><div class='add'>+#define CFSZR  0x34 /* Capture filter size clip register */</div><div class='add'>+#define CDWDR  0x38 /* Capture destination width register */</div><div class='add'>+#define CDAYR  0x3c /* Capture data address Y register */</div><div class='add'>+#define CDACR  0x40 /* Capture data address C register */</div><div class='add'>+#define CDBYR  0x44 /* Capture data bottom-field address Y register */</div><div class='add'>+#define CDBCR  0x48 /* Capture data bottom-field address C register */</div><div class='add'>+#define CBDSR  0x4c /* Capture bundle destination size register */</div><div class='add'>+#define CFWCR  0x5c /* Firewall operation control register */</div><div class='add'>+#define CLFCR  0x60 /* Capture low-pass filter control register */</div><div class='add'>+#define CDOCR  0x64 /* Capture data output control register */</div><div class='add'>+#define CDDCR  0x68 /* Capture data complexity level register */</div><div class='add'>+#define CDDAR  0x6c /* Capture data complexity level address register */</div><div class='add'>+#define CEIER  0x70 /* Capture event interrupt enable register */</div><div class='add'>+#define CETCR  0x74 /* Capture event flag clear register */</div><div class='add'>+#define CSTSR  0x7c /* Capture status register */</div><div class='add'>+#define CSRTR  0x80 /* Capture software reset register */</div><div class='add'>+#define CDSSR  0x84 /* Capture data size register */</div><div class='add'>+#define CDAYR2 0x90 /* Capture data address Y register 2 */</div><div class='add'>+#define CDACR2 0x94 /* Capture data address C register 2 */</div><div class='add'>+#define CDBYR2 0x98 /* Capture data bottom-field address Y register 2 */</div><div class='add'>+#define CDBCR2 0x9c /* Capture data bottom-field address C register 2 */</div><div class='ctx'> </div><div class='ctx'> static DEFINE_MUTEX(camera_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -165,6 +165,7 @@ static void sh_mobile_ceu_capture(struct sh_mobile_ceu_dev *pcdev)</div><div class='ctx'> 	ceu_write(pcdev, CETCR, 0x0317f313 ^ 0x10);</div><div class='ctx'> </div><div class='ctx'> 	if (pcdev-&gt;active) {</div><div class='add'>+		pcdev-&gt;active-&gt;state = VIDEOBUF_ACTIVE;</div><div class='ctx'> 		ceu_write(pcdev, CDAYR, videobuf_to_dma_contig(pcdev-&gt;active));</div><div class='ctx'> 		ceu_write(pcdev, CAPSR, 0x1); /* start capture */</div><div class='ctx'> 	}</div><div class='hunk'>@@ -236,7 +237,7 @@ static void sh_mobile_ceu_videobuf_queue(struct videobuf_queue *vq,</div><div class='ctx'> 	dev_dbg(&amp;icd-&gt;dev, "%s (vb=0x%p) 0x%08lx %zd\n", __func__,</div><div class='ctx'> 		vb, vb-&gt;baddr, vb-&gt;bsize);</div><div class='ctx'> </div><div class='del'>-	vb-&gt;state = VIDEOBUF_ACTIVE;</div><div class='add'>+	vb-&gt;state = VIDEOBUF_QUEUED;</div><div class='ctx'> 	spin_lock_irqsave(&amp;pcdev-&gt;lock, flags);</div><div class='ctx'> 	list_add_tail(&amp;vb-&gt;queue, &amp;pcdev-&gt;capture);</div><div class='ctx'> </div><div class='hunk'>@@ -304,9 +305,6 @@ static int sh_mobile_ceu_add_device(struct soc_camera_device *icd)</div><div class='ctx'> 		 "SuperH Mobile CEU driver attached to camera %d\n",</div><div class='ctx'> 		 icd-&gt;devnum);</div><div class='ctx'> </div><div class='del'>-	if (pcdev-&gt;pdata-&gt;enable_camera)</div><div class='del'>-		pcdev-&gt;pdata-&gt;enable_camera();</div><div class='del'>-</div><div class='ctx'> 	ret = icd-&gt;ops-&gt;init(icd);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err;</div><div class='hunk'>@@ -326,15 +324,25 @@ static void sh_mobile_ceu_remove_device(struct soc_camera_device *icd)</div><div class='ctx'> {</div><div class='ctx'> 	struct soc_camera_host *ici = to_soc_camera_host(icd-&gt;dev.parent);</div><div class='ctx'> 	struct sh_mobile_ceu_dev *pcdev = ici-&gt;priv;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(icd != pcdev-&gt;icd);</div><div class='ctx'> </div><div class='ctx'> 	/* disable capture, disable interrupts */</div><div class='ctx'> 	ceu_write(pcdev, CEIER, 0);</div><div class='ctx'> 	ceu_write(pcdev, CAPSR, 1 &lt;&lt; 16); /* reset */</div><div class='add'>+</div><div class='add'>+	/* make sure active buffer is canceled */</div><div class='add'>+	spin_lock_irqsave(&amp;pcdev-&gt;lock, flags);</div><div class='add'>+	if (pcdev-&gt;active) {</div><div class='add'>+		list_del(&amp;pcdev-&gt;active-&gt;queue);</div><div class='add'>+		pcdev-&gt;active-&gt;state = VIDEOBUF_ERROR;</div><div class='add'>+		wake_up_all(&amp;pcdev-&gt;active-&gt;done);</div><div class='add'>+		pcdev-&gt;active = NULL;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;pcdev-&gt;lock, flags);</div><div class='add'>+</div><div class='ctx'> 	icd-&gt;ops-&gt;release(icd);</div><div class='del'>-	if (pcdev-&gt;pdata-&gt;disable_camera)</div><div class='del'>-		pcdev-&gt;pdata-&gt;disable_camera();</div><div class='ctx'> </div><div class='ctx'> 	dev_info(&amp;icd-&gt;dev,</div><div class='ctx'> 		 "SuperH Mobile CEU driver detached from camera %d\n",</div><div class='hunk'>@@ -396,7 +404,20 @@ static int sh_mobile_ceu_set_bus_param(struct soc_camera_device *icd,</div><div class='ctx'> 	ceu_write(pcdev, CFLCR, 0); /* data fetch mode - no scaling */</div><div class='ctx'> 	ceu_write(pcdev, CFSZR, (icd-&gt;height &lt;&lt; 16) | cfszr_width);</div><div class='ctx'> 	ceu_write(pcdev, CLFCR, 0); /* data fetch mode - no lowpass filter */</div><div class='del'>-	ceu_write(pcdev, CDOCR, 0x00000016);</div><div class='add'>+</div><div class='add'>+	/* A few words about byte order (observed in Big Endian mode)</div><div class='add'>+	 *</div><div class='add'>+	 * In data fetch mode bytes are received in chunks of 8 bytes.</div><div class='add'>+	 * D0, D1, D2, D3, D4, D5, D6, D7 (D0 received first)</div><div class='add'>+	 *</div><div class='add'>+	 * The data is however by default written to memory in reverse order:</div><div class='add'>+	 * D7, D6, D5, D4, D3, D2, D1, D0 (D7 written to lowest byte)</div><div class='add'>+	 *</div><div class='add'>+	 * The lowest three bits of CDOCR allows us to do swapping,</div><div class='add'>+	 * using 7 we swap the data bytes to match the incoming order:</div><div class='add'>+	 * D0, D1, D2, D3, D4, D5, D6, D7</div><div class='add'>+	 */</div><div class='add'>+	ceu_write(pcdev, CDOCR, 0x00000017);</div><div class='ctx'> </div><div class='ctx'> 	ceu_write(pcdev, CDWDR, cdwdr_width);</div><div class='ctx'> 	ceu_write(pcdev, CFWCR, 0); /* keep "datafetch firewall" disabled */</div><div class='head'>diff --git a/drivers/media/video/sn9c102/sn9c102_core.c b/drivers/media/video/sn9c102/sn9c102_core.c<br/>index 2da6938718f2..20e30bd9364b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/sn9c102/sn9c102_core.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/sn9c102/sn9c102_core.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/sn9c102/sn9c102_core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/sn9c102/sn9c102_core.c</a></div><div class='hunk'>@@ -116,6 +116,26 @@ MODULE_PARM_DESC(debug,</div><div class='ctx'> 		 "\n");</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+   Add the probe entries to this table. Be sure to add the entry in the right</div><div class='add'>+   place, since, on failure, the next probing routine is called according to</div><div class='add'>+   the order of the list below, from top to bottom.</div><div class='add'>+*/</div><div class='add'>+static int (*sn9c102_sensor_table[])(struct sn9c102_device *) = {</div><div class='add'>+	&amp;sn9c102_probe_hv7131d, /* strong detection based on SENSOR ids */</div><div class='add'>+	&amp;sn9c102_probe_hv7131r, /* strong detection based on SENSOR ids */</div><div class='add'>+	&amp;sn9c102_probe_mi0343, /* strong detection based on SENSOR ids */</div><div class='add'>+	&amp;sn9c102_probe_mi0360, /* strong detection based on SENSOR ids */</div><div class='add'>+	&amp;sn9c102_probe_mt9v111, /* strong detection based on SENSOR ids */</div><div class='add'>+	&amp;sn9c102_probe_pas106b, /* strong detection based on SENSOR ids */</div><div class='add'>+	&amp;sn9c102_probe_pas202bcb, /* strong detection based on SENSOR ids */</div><div class='add'>+	&amp;sn9c102_probe_ov7630, /* strong detection based on SENSOR ids */</div><div class='add'>+	&amp;sn9c102_probe_ov7660, /* strong detection based on SENSOR ids */</div><div class='add'>+	&amp;sn9c102_probe_tas5110c1b, /* detection based on USB pid/vid */</div><div class='add'>+	&amp;sn9c102_probe_tas5110d, /* detection based on USB pid/vid */</div><div class='add'>+	&amp;sn9c102_probe_tas5130d1b, /* detection based on USB pid/vid */</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /*****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> static u32</div><div class='hunk'>@@ -1746,7 +1766,7 @@ static int sn9c102_open(struct inode* inode, struct file* filp)</div><div class='ctx'> 	if (!down_read_trylock(&amp;sn9c102_dev_lock))</div><div class='ctx'> 		return -ERESTARTSYS;</div><div class='ctx'> </div><div class='del'>-	cam = video_get_drvdata(video_devdata(filp));</div><div class='add'>+	cam = video_drvdata(filp);</div><div class='ctx'> </div><div class='ctx'> 	if (wait_for_completion_interruptible(&amp;cam-&gt;probe)) {</div><div class='ctx'> 		up_read(&amp;sn9c102_dev_lock);</div><div class='hunk'>@@ -1843,7 +1863,7 @@ static int sn9c102_release(struct inode* inode, struct file* filp)</div><div class='ctx'> </div><div class='ctx'> 	down_write(&amp;sn9c102_dev_lock);</div><div class='ctx'> </div><div class='del'>-	cam = video_get_drvdata(video_devdata(filp));</div><div class='add'>+	cam = video_drvdata(filp);</div><div class='ctx'> </div><div class='ctx'> 	sn9c102_stop_transfer(cam);</div><div class='ctx'> 	sn9c102_release_buffers(cam);</div><div class='hunk'>@@ -1863,7 +1883,7 @@ static int sn9c102_release(struct inode* inode, struct file* filp)</div><div class='ctx'> static ssize_t</div><div class='ctx'> sn9c102_read(struct file* filp, char __user * buf, size_t count, loff_t* f_pos)</div><div class='ctx'> {</div><div class='del'>-	struct sn9c102_device* cam = video_get_drvdata(video_devdata(filp));</div><div class='add'>+	struct sn9c102_device *cam = video_drvdata(filp);</div><div class='ctx'> 	struct sn9c102_frame_t* f, * i;</div><div class='ctx'> 	unsigned long lock_flags;</div><div class='ctx'> 	long timeout;</div><div class='hunk'>@@ -1987,7 +2007,7 @@ exit:</div><div class='ctx'> </div><div class='ctx'> static unsigned int sn9c102_poll(struct file *filp, poll_table *wait)</div><div class='ctx'> {</div><div class='del'>-	struct sn9c102_device* cam = video_get_drvdata(video_devdata(filp));</div><div class='add'>+	struct sn9c102_device *cam = video_drvdata(filp);</div><div class='ctx'> 	struct sn9c102_frame_t* f;</div><div class='ctx'> 	unsigned long lock_flags;</div><div class='ctx'> 	unsigned int mask = 0;</div><div class='hunk'>@@ -2063,7 +2083,7 @@ static struct vm_operations_struct sn9c102_vm_ops = {</div><div class='ctx'> </div><div class='ctx'> static int sn9c102_mmap(struct file* filp, struct vm_area_struct *vma)</div><div class='ctx'> {</div><div class='del'>-	struct sn9c102_device* cam = video_get_drvdata(video_devdata(filp));</div><div class='add'>+	struct sn9c102_device *cam = video_drvdata(filp);</div><div class='ctx'> 	unsigned long size = vma-&gt;vm_end - vma-&gt;vm_start,</div><div class='ctx'> 		      start = vma-&gt;vm_start;</div><div class='ctx'> 	void *pos;</div><div class='hunk'>@@ -3075,7 +3095,7 @@ sn9c102_vidioc_s_audio(struct sn9c102_device* cam, void __user * arg)</div><div class='ctx'> static int sn9c102_ioctl_v4l2(struct inode* inode, struct file* filp,</div><div class='ctx'> 			      unsigned int cmd, void __user * arg)</div><div class='ctx'> {</div><div class='del'>-	struct sn9c102_device* cam = video_get_drvdata(video_devdata(filp));</div><div class='add'>+	struct sn9c102_device *cam = video_drvdata(filp);</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> </div><div class='hunk'>@@ -3179,7 +3199,7 @@ static int sn9c102_ioctl_v4l2(struct inode* inode, struct file* filp,</div><div class='ctx'> static int sn9c102_ioctl(struct inode* inode, struct file* filp,</div><div class='ctx'> 			 unsigned int cmd, unsigned long arg)</div><div class='ctx'> {</div><div class='del'>-	struct sn9c102_device* cam = video_get_drvdata(video_devdata(filp));</div><div class='add'>+	struct sn9c102_device *cam = video_drvdata(filp);</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (mutex_lock_interruptible(&amp;cam-&gt;fileop_mutex))</div><div class='head'>diff --git a/drivers/media/video/sn9c102/sn9c102_devtable.h b/drivers/media/video/sn9c102/sn9c102_devtable.h<br/>index 90a401dc3884..e23734f6d6e2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/sn9c102/sn9c102_devtable.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/sn9c102/sn9c102_devtable.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/sn9c102/sn9c102_devtable.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/sn9c102/sn9c102_devtable.h</a></div><div class='hunk'>@@ -140,24 +140,4 @@ extern int sn9c102_probe_tas5110c1b(struct sn9c102_device* cam);</div><div class='ctx'> extern int sn9c102_probe_tas5110d(struct sn9c102_device* cam);</div><div class='ctx'> extern int sn9c102_probe_tas5130d1b(struct sn9c102_device* cam);</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>-   Add the above entries to this table. Be sure to add the entry in the right</div><div class='del'>-   place, since, on failure, the next probing routine is called according to</div><div class='del'>-   the order of the list below, from top to bottom.</div><div class='del'>-*/</div><div class='del'>-static int (*sn9c102_sensor_table[])(struct sn9c102_device*) = {</div><div class='del'>-	&amp;sn9c102_probe_hv7131d, /* strong detection based on SENSOR ids */</div><div class='del'>-	&amp;sn9c102_probe_hv7131r, /* strong detection based on SENSOR ids */</div><div class='del'>-	&amp;sn9c102_probe_mi0343, /* strong detection based on SENSOR ids */</div><div class='del'>-	&amp;sn9c102_probe_mi0360, /* strong detection based on SENSOR ids */</div><div class='del'>-	&amp;sn9c102_probe_mt9v111, /* strong detection based on SENSOR ids */</div><div class='del'>-	&amp;sn9c102_probe_pas106b, /* strong detection based on SENSOR ids */</div><div class='del'>-	&amp;sn9c102_probe_pas202bcb, /* strong detection based on SENSOR ids */</div><div class='del'>-	&amp;sn9c102_probe_ov7630, /* strong detection based on SENSOR ids */</div><div class='del'>-	&amp;sn9c102_probe_ov7660, /* strong detection based on SENSOR ids */</div><div class='del'>-	&amp;sn9c102_probe_tas5110c1b, /* detection based on USB pid/vid */</div><div class='del'>-	&amp;sn9c102_probe_tas5110d, /* detection based on USB pid/vid */</div><div class='del'>-	&amp;sn9c102_probe_tas5130d1b, /* detection based on USB pid/vid */</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> #endif /* _SN9C102_DEVTABLE_H_ */</div><div class='head'>diff --git a/drivers/media/video/sn9c102/sn9c102_hv7131d.c b/drivers/media/video/sn9c102/sn9c102_hv7131d.c<br/>index eaf9ad0dc8a6..db2434948939 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/sn9c102/sn9c102_hv7131d.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/sn9c102/sn9c102_hv7131d.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/sn9c102/sn9c102_hv7131d.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/sn9c102/sn9c102_hv7131d.c</a></div><div class='hunk'>@@ -20,6 +20,7 @@</div><div class='ctx'>  ***************************************************************************/</div><div class='ctx'> </div><div class='ctx'> #include "sn9c102_sensor.h"</div><div class='add'>+#include "sn9c102_devtable.h"</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static int hv7131d_init(struct sn9c102_device* cam)</div><div class='head'>diff --git a/drivers/media/video/sn9c102/sn9c102_hv7131r.c b/drivers/media/video/sn9c102/sn9c102_hv7131r.c<br/>index 0fc401223cfc..4295887ff609 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/sn9c102/sn9c102_hv7131r.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/sn9c102/sn9c102_hv7131r.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/sn9c102/sn9c102_hv7131r.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/sn9c102/sn9c102_hv7131r.c</a></div><div class='hunk'>@@ -20,6 +20,7 @@</div><div class='ctx'>  ***************************************************************************/</div><div class='ctx'> </div><div class='ctx'> #include "sn9c102_sensor.h"</div><div class='add'>+#include "sn9c102_devtable.h"</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static int hv7131r_init(struct sn9c102_device* cam)</div><div class='head'>diff --git a/drivers/media/video/sn9c102/sn9c102_mi0343.c b/drivers/media/video/sn9c102/sn9c102_mi0343.c<br/>index 00b134ca0a3d..1f5b09bec89c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/sn9c102/sn9c102_mi0343.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/sn9c102/sn9c102_mi0343.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/sn9c102/sn9c102_mi0343.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/sn9c102/sn9c102_mi0343.c</a></div><div class='hunk'>@@ -20,6 +20,7 @@</div><div class='ctx'>  ***************************************************************************/</div><div class='ctx'> </div><div class='ctx'> #include "sn9c102_sensor.h"</div><div class='add'>+#include "sn9c102_devtable.h"</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static int mi0343_init(struct sn9c102_device* cam)</div><div class='head'>diff --git a/drivers/media/video/sn9c102/sn9c102_mi0360.c b/drivers/media/video/sn9c102/sn9c102_mi0360.c<br/>index f8d81d82e8d5..d973fc1973d9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/sn9c102/sn9c102_mi0360.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/sn9c102/sn9c102_mi0360.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/sn9c102/sn9c102_mi0360.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/sn9c102/sn9c102_mi0360.c</a></div><div class='hunk'>@@ -20,6 +20,7 @@</div><div class='ctx'>  ***************************************************************************/</div><div class='ctx'> </div><div class='ctx'> #include "sn9c102_sensor.h"</div><div class='add'>+#include "sn9c102_devtable.h"</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static int mi0360_init(struct sn9c102_device* cam)</div><div class='head'>diff --git a/drivers/media/video/sn9c102/sn9c102_mt9v111.c b/drivers/media/video/sn9c102/sn9c102_mt9v111.c<br/>index 3b98ac3bbc38..95986eb492e4 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/sn9c102/sn9c102_mt9v111.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/sn9c102/sn9c102_mt9v111.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/sn9c102/sn9c102_mt9v111.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/sn9c102/sn9c102_mt9v111.c</a></div><div class='hunk'>@@ -20,6 +20,7 @@</div><div class='ctx'>  ***************************************************************************/</div><div class='ctx'> </div><div class='ctx'> #include "sn9c102_sensor.h"</div><div class='add'>+#include "sn9c102_devtable.h"</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static int mt9v111_init(struct sn9c102_device *cam)</div><div class='head'>diff --git a/drivers/media/video/sn9c102/sn9c102_ov7630.c b/drivers/media/video/sn9c102/sn9c102_ov7630.c<br/>index e4856fd77982..803712c29f02 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/sn9c102/sn9c102_ov7630.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/sn9c102/sn9c102_ov7630.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/sn9c102/sn9c102_ov7630.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/sn9c102/sn9c102_ov7630.c</a></div><div class='hunk'>@@ -20,6 +20,7 @@</div><div class='ctx'>  ***************************************************************************/</div><div class='ctx'> </div><div class='ctx'> #include "sn9c102_sensor.h"</div><div class='add'>+#include "sn9c102_devtable.h"</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static int ov7630_init(struct sn9c102_device* cam)</div><div class='head'>diff --git a/drivers/media/video/sn9c102/sn9c102_ov7660.c b/drivers/media/video/sn9c102/sn9c102_ov7660.c<br/>index 8aae416ba8ec..7977795d342b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/sn9c102/sn9c102_ov7660.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/sn9c102/sn9c102_ov7660.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/sn9c102/sn9c102_ov7660.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/sn9c102/sn9c102_ov7660.c</a></div><div class='hunk'>@@ -20,6 +20,7 @@</div><div class='ctx'>  ***************************************************************************/</div><div class='ctx'> </div><div class='ctx'> #include "sn9c102_sensor.h"</div><div class='add'>+#include "sn9c102_devtable.h"</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static int ov7660_init(struct sn9c102_device* cam)</div><div class='head'>diff --git a/drivers/media/video/sn9c102/sn9c102_pas106b.c b/drivers/media/video/sn9c102/sn9c102_pas106b.c<br/>index 360f2a848bc0..81cd969c1b7b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/sn9c102/sn9c102_pas106b.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/sn9c102/sn9c102_pas106b.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/sn9c102/sn9c102_pas106b.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/sn9c102/sn9c102_pas106b.c</a></div><div class='hunk'>@@ -21,6 +21,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include "sn9c102_sensor.h"</div><div class='add'>+#include "sn9c102_devtable.h"</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static int pas106b_init(struct sn9c102_device* cam)</div><div class='head'>diff --git a/drivers/media/video/sn9c102/sn9c102_pas202bcb.c b/drivers/media/video/sn9c102/sn9c102_pas202bcb.c<br/>index ca4a1506ed3d..2782f94cf6f8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/sn9c102/sn9c102_pas202bcb.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/sn9c102/sn9c102_pas202bcb.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/sn9c102/sn9c102_pas202bcb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/sn9c102/sn9c102_pas202bcb.c</a></div><div class='hunk'>@@ -26,6 +26,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include "sn9c102_sensor.h"</div><div class='add'>+#include "sn9c102_devtable.h"</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static int pas202bcb_init(struct sn9c102_device* cam)</div><div class='head'>diff --git a/drivers/media/video/sn9c102/sn9c102_tas5110c1b.c b/drivers/media/video/sn9c102/sn9c102_tas5110c1b.c<br/>index e7d2de2bace1..04cdfdde8564 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/sn9c102/sn9c102_tas5110c1b.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/sn9c102/sn9c102_tas5110c1b.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/sn9c102/sn9c102_tas5110c1b.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/sn9c102/sn9c102_tas5110c1b.c</a></div><div class='hunk'>@@ -20,6 +20,7 @@</div><div class='ctx'>  ***************************************************************************/</div><div class='ctx'> </div><div class='ctx'> #include "sn9c102_sensor.h"</div><div class='add'>+#include "sn9c102_devtable.h"</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static int tas5110c1b_init(struct sn9c102_device* cam)</div><div class='head'>diff --git a/drivers/media/video/sn9c102/sn9c102_tas5110d.c b/drivers/media/video/sn9c102/sn9c102_tas5110d.c<br/>index d32fdbccdc5e..9372e6f9fcff 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/sn9c102/sn9c102_tas5110d.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/sn9c102/sn9c102_tas5110d.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/sn9c102/sn9c102_tas5110d.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/sn9c102/sn9c102_tas5110d.c</a></div><div class='hunk'>@@ -20,6 +20,7 @@</div><div class='ctx'>  ***************************************************************************/</div><div class='ctx'> </div><div class='ctx'> #include "sn9c102_sensor.h"</div><div class='add'>+#include "sn9c102_devtable.h"</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static int tas5110d_init(struct sn9c102_device* cam)</div><div class='head'>diff --git a/drivers/media/video/sn9c102/sn9c102_tas5130d1b.c b/drivers/media/video/sn9c102/sn9c102_tas5130d1b.c<br/>index 56fb1d575a8a..a30bbc4389f5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/sn9c102/sn9c102_tas5130d1b.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/sn9c102/sn9c102_tas5130d1b.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/sn9c102/sn9c102_tas5130d1b.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/sn9c102/sn9c102_tas5130d1b.c</a></div><div class='hunk'>@@ -20,6 +20,7 @@</div><div class='ctx'>  ***************************************************************************/</div><div class='ctx'> </div><div class='ctx'> #include "sn9c102_sensor.h"</div><div class='add'>+#include "sn9c102_devtable.h"</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static int tas5130d1b_init(struct sn9c102_device* cam)</div><div class='head'>diff --git a/drivers/media/video/soc_camera_platform.c b/drivers/media/video/soc_camera_platform.c<br/>index 1adc257ebdb9..bb7a9d480e8f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/soc_camera_platform.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/soc_camera_platform.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/soc_camera_platform.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/soc_camera_platform.c</a></div><div class='hunk'>@@ -18,15 +18,7 @@</div><div class='ctx'> #include &lt;linux/videodev2.h&gt;</div><div class='ctx'> #include &lt;media/v4l2-common.h&gt;</div><div class='ctx'> #include &lt;media/soc_camera.h&gt;</div><div class='del'>-</div><div class='del'>-struct soc_camera_platform_info {</div><div class='del'>-	int iface;</div><div class='del'>-	char *format_name;</div><div class='del'>-	unsigned long format_depth;</div><div class='del'>-	struct v4l2_pix_format format;</div><div class='del'>-	unsigned long bus_param;</div><div class='del'>-	int (*set_capture)(struct soc_camera_platform_info *info, int enable);</div><div class='del'>-};</div><div class='add'>+#include &lt;media/soc_camera_platform.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct soc_camera_platform_priv {</div><div class='ctx'> 	struct soc_camera_platform_info *info;</div><div class='hunk'>@@ -44,11 +36,21 @@ soc_camera_platform_get_info(struct soc_camera_device *icd)</div><div class='ctx'> </div><div class='ctx'> static int soc_camera_platform_init(struct soc_camera_device *icd)</div><div class='ctx'> {</div><div class='add'>+	struct soc_camera_platform_info *p = soc_camera_platform_get_info(icd);</div><div class='add'>+</div><div class='add'>+	if (p-&gt;power)</div><div class='add'>+		p-&gt;power(1);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int soc_camera_platform_release(struct soc_camera_device *icd)</div><div class='ctx'> {</div><div class='add'>+	struct soc_camera_platform_info *p = soc_camera_platform_get_info(icd);</div><div class='add'>+</div><div class='add'>+	if (p-&gt;power)</div><div class='add'>+		p-&gt;power(0);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/stk-webcam.c b/drivers/media/video/stk-webcam.c<br/>index ad36af30e099..edaea4964513 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/stk-webcam.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/stk-webcam.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/stk-webcam.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/stk-webcam.c</a></div><div class='hunk'>@@ -27,7 +27,6 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/kref.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='hunk'>@@ -65,22 +64,6 @@ static struct usb_device_id stkwebcam_table[] = {</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(usb, stkwebcam_table);</div><div class='ctx'> </div><div class='del'>-static void stk_camera_cleanup(struct kref *kref)</div><div class='del'>-{</div><div class='del'>-	struct stk_camera *dev = to_stk_camera(kref);</div><div class='del'>-</div><div class='del'>-	STK_INFO("Syntek USB2.0 Camera release resources"</div><div class='del'>-		" video device /dev/video%d\n", dev-&gt;vdev.minor);</div><div class='del'>-	video_unregister_device(&amp;dev-&gt;vdev);</div><div class='del'>-	dev-&gt;vdev.priv = NULL;</div><div class='del'>-</div><div class='del'>-	if (dev-&gt;sio_bufs != NULL || dev-&gt;isobufs != NULL)</div><div class='del'>-		STK_ERROR("We are leaking memory\n");</div><div class='del'>-	usb_put_intf(dev-&gt;interface);</div><div class='del'>-	kfree(dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Basic stuff</div><div class='ctx'>  */</div><div class='hunk'>@@ -576,7 +559,7 @@ static void stk_clean_iso(struct stk_camera *dev)</div><div class='ctx'> </div><div class='ctx'> 		urb = dev-&gt;isobufs[i].urb;</div><div class='ctx'> 		if (urb) {</div><div class='del'>-			if (atomic_read(&amp;dev-&gt;urbs_used))</div><div class='add'>+			if (atomic_read(&amp;dev-&gt;urbs_used) &amp;&amp; is_present(dev))</div><div class='ctx'> 				usb_kill_urb(urb);</div><div class='ctx'> 			usb_free_urb(urb);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -689,45 +672,30 @@ static int v4l_stk_open(struct inode *inode, struct file *fp)</div><div class='ctx'> 	vdev = video_devdata(fp);</div><div class='ctx'> 	dev = vdev_to_camera(vdev);</div><div class='ctx'> </div><div class='del'>-	if (dev == NULL || !is_present(dev))</div><div class='add'>+	lock_kernel();</div><div class='add'>+	if (dev == NULL || !is_present(dev)) {</div><div class='add'>+		unlock_kernel();</div><div class='ctx'> 		return -ENXIO;</div><div class='del'>-	fp-&gt;private_data = vdev;</div><div class='del'>-	kref_get(&amp;dev-&gt;kref);</div><div class='add'>+	}</div><div class='add'>+	fp-&gt;private_data = dev;</div><div class='ctx'> 	usb_autopm_get_interface(dev-&gt;interface);</div><div class='add'>+	unlock_kernel();</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int v4l_stk_release(struct inode *inode, struct file *fp)</div><div class='ctx'> {</div><div class='del'>-	struct stk_camera *dev;</div><div class='del'>-	struct video_device *vdev;</div><div class='add'>+	struct stk_camera *dev = fp-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	vdev = video_devdata(fp);</div><div class='del'>-	if (vdev == NULL) {</div><div class='del'>-		STK_ERROR("v4l_release called w/o video devdata\n");</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	}</div><div class='del'>-	dev = vdev_to_camera(vdev);</div><div class='del'>-	if (dev == NULL) {</div><div class='del'>-		STK_ERROR("v4l_release called on removed device\n");</div><div class='del'>-		return -ENODEV;</div><div class='add'>+	if (dev-&gt;owner == fp) {</div><div class='add'>+		stk_stop_stream(dev);</div><div class='add'>+		stk_free_buffers(dev);</div><div class='add'>+		dev-&gt;owner = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;owner != fp) {</div><div class='add'>+	if(is_present(dev))</div><div class='ctx'> 		usb_autopm_put_interface(dev-&gt;interface);</div><div class='del'>-		kref_put(&amp;dev-&gt;kref, stk_camera_cleanup);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	stk_stop_stream(dev);</div><div class='del'>-</div><div class='del'>-	stk_free_buffers(dev);</div><div class='del'>-</div><div class='del'>-	dev-&gt;owner = NULL;</div><div class='del'>-</div><div class='del'>-	usb_autopm_put_interface(dev-&gt;interface);</div><div class='del'>-	kref_put(&amp;dev-&gt;kref, stk_camera_cleanup);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -738,17 +706,8 @@ static ssize_t v4l_stk_read(struct file *fp, char __user *buf,</div><div class='ctx'> 	int i;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	struct stk_camera *dev;</div><div class='del'>-	struct video_device *vdev;</div><div class='ctx'> 	struct stk_sio_buffer *sbuf;</div><div class='del'>-</div><div class='del'>-	vdev = video_devdata(fp);</div><div class='del'>-	if (vdev == NULL)</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	dev = vdev_to_camera(vdev);</div><div class='del'>-</div><div class='del'>-	if (dev == NULL)</div><div class='del'>-		return -EIO;</div><div class='add'>+	struct stk_camera *dev = fp-&gt;private_data;</div><div class='ctx'> </div><div class='ctx'> 	if (!is_present(dev))</div><div class='ctx'> 		return -EIO;</div><div class='hunk'>@@ -804,17 +763,7 @@ static ssize_t v4l_stk_read(struct file *fp, char __user *buf,</div><div class='ctx'> </div><div class='ctx'> static unsigned int v4l_stk_poll(struct file *fp, poll_table *wait)</div><div class='ctx'> {</div><div class='del'>-	struct stk_camera *dev;</div><div class='del'>-	struct video_device *vdev;</div><div class='del'>-</div><div class='del'>-	vdev = video_devdata(fp);</div><div class='del'>-</div><div class='del'>-	if (vdev == NULL)</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	dev = vdev_to_camera(vdev);</div><div class='del'>-	if (dev == NULL)</div><div class='del'>-		return -ENODEV;</div><div class='add'>+	struct stk_camera *dev = fp-&gt;private_data;</div><div class='ctx'> </div><div class='ctx'> 	poll_wait(fp, &amp;dev-&gt;wait_frame, wait);</div><div class='ctx'> </div><div class='hunk'>@@ -850,16 +799,12 @@ static int v4l_stk_mmap(struct file *fp, struct vm_area_struct *vma)</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	unsigned long offset = vma-&gt;vm_pgoff &lt;&lt; PAGE_SHIFT;</div><div class='del'>-	struct stk_camera *dev;</div><div class='del'>-	struct video_device *vdev;</div><div class='add'>+	struct stk_camera *dev = fp-&gt;private_data;</div><div class='ctx'> 	struct stk_sio_buffer *sbuf = NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (!(vma-&gt;vm_flags &amp; VM_WRITE) || !(vma-&gt;vm_flags &amp; VM_SHARED))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	vdev = video_devdata(fp);</div><div class='del'>-	dev = vdev_to_camera(vdev);</div><div class='del'>-</div><div class='ctx'> 	for (i = 0; i &lt; dev-&gt;n_sbufs; i++) {</div><div class='ctx'> 		if (dev-&gt;sio_bufs[i].v4lbuf.m.offset == offset) {</div><div class='ctx'> 			sbuf = dev-&gt;sio_bufs + i;</div><div class='hunk'>@@ -1355,6 +1300,12 @@ static const struct v4l2_ioctl_ops v4l_stk_ioctl_ops = {</div><div class='ctx'> </div><div class='ctx'> static void stk_v4l_dev_release(struct video_device *vd)</div><div class='ctx'> {</div><div class='add'>+	struct stk_camera *dev = vdev_to_camera(vd);</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;sio_bufs != NULL || dev-&gt;isobufs != NULL)</div><div class='add'>+		STK_ERROR("We are leaking memory\n");</div><div class='add'>+	usb_put_intf(dev-&gt;interface);</div><div class='add'>+	kfree(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct video_device stk_v4l_data = {</div><div class='hunk'>@@ -1375,7 +1326,6 @@ static int stk_register_video_device(struct stk_camera *dev)</div><div class='ctx'> 	dev-&gt;vdev = stk_v4l_data;</div><div class='ctx'> 	dev-&gt;vdev.debug = debug;</div><div class='ctx'> 	dev-&gt;vdev.parent = &amp;dev-&gt;interface-&gt;dev;</div><div class='del'>-	dev-&gt;vdev.priv = dev;</div><div class='ctx'> 	err = video_register_device(&amp;dev-&gt;vdev, VFL_TYPE_GRABBER, -1);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		STK_ERROR("v4l registration failed\n");</div><div class='hunk'>@@ -1392,7 +1342,7 @@ static int stk_camera_probe(struct usb_interface *interface,</div><div class='ctx'> 		const struct usb_device_id *id)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='del'>-	int err;</div><div class='add'>+	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	struct stk_camera *dev = NULL;</div><div class='ctx'> 	struct usb_device *udev = interface_to_usbdev(interface);</div><div class='hunk'>@@ -1405,7 +1355,6 @@ static int stk_camera_probe(struct usb_interface *interface,</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	kref_init(&amp;dev-&gt;kref);</div><div class='ctx'> 	spin_lock_init(&amp;dev-&gt;spinlock);</div><div class='ctx'> 	init_waitqueue_head(&amp;dev-&gt;wait_frame);</div><div class='ctx'> </div><div class='hunk'>@@ -1438,8 +1387,8 @@ static int stk_camera_probe(struct usb_interface *interface,</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!dev-&gt;isoc_ep) {</div><div class='ctx'> 		STK_ERROR("Could not find isoc-in endpoint");</div><div class='del'>-		kref_put(&amp;dev-&gt;kref, stk_camera_cleanup);</div><div class='del'>-		return -ENODEV;</div><div class='add'>+		err = -ENODEV;</div><div class='add'>+		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> 	dev-&gt;vsettings.brightness = 0x7fff;</div><div class='ctx'> 	dev-&gt;vsettings.palette = V4L2_PIX_FMT_RGB565;</div><div class='hunk'>@@ -1453,14 +1402,17 @@ static int stk_camera_probe(struct usb_interface *interface,</div><div class='ctx'> </div><div class='ctx'> 	err = stk_register_video_device(dev);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		kref_put(&amp;dev-&gt;kref, stk_camera_cleanup);</div><div class='del'>-		return err;</div><div class='add'>+		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	stk_create_sysfs_files(&amp;dev-&gt;vdev);</div><div class='ctx'> 	usb_autopm_enable(dev-&gt;interface);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	kfree(dev);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void stk_camera_disconnect(struct usb_interface *interface)</div><div class='hunk'>@@ -1473,7 +1425,10 @@ static void stk_camera_disconnect(struct usb_interface *interface)</div><div class='ctx'> 	wake_up_interruptible(&amp;dev-&gt;wait_frame);</div><div class='ctx'> 	stk_remove_sysfs_files(&amp;dev-&gt;vdev);</div><div class='ctx'> </div><div class='del'>-	kref_put(&amp;dev-&gt;kref, stk_camera_cleanup);</div><div class='add'>+	STK_INFO("Syntek USB2.0 Camera release resources "</div><div class='add'>+		"video device /dev/video%d\n", dev-&gt;vdev.minor);</div><div class='add'>+</div><div class='add'>+	video_unregister_device(&amp;dev-&gt;vdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PM</div><div class='head'>diff --git a/drivers/media/video/stk-webcam.h b/drivers/media/video/stk-webcam.h<br/>index df4dfefc5327..9f6736637571 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/stk-webcam.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/stk-webcam.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/stk-webcam.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/stk-webcam.h</a></div><div class='hunk'>@@ -99,7 +99,6 @@ struct stk_camera {</div><div class='ctx'> </div><div class='ctx'> 	u8 isoc_ep;</div><div class='ctx'> </div><div class='del'>-	struct kref kref;</div><div class='ctx'> 	/* Not sure if this is right */</div><div class='ctx'> 	atomic_t urbs_used;</div><div class='ctx'> </div><div class='hunk'>@@ -121,10 +120,8 @@ struct stk_camera {</div><div class='ctx'> 	unsigned sequence;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define to_stk_camera(d) container_of(d, struct stk_camera, kref)</div><div class='ctx'> #define vdev_to_camera(d) container_of(d, struct stk_camera, vdev)</div><div class='ctx'> </div><div class='del'>-void stk_camera_delete(struct kref *);</div><div class='ctx'> int stk_camera_write_reg(struct stk_camera *, u16, u8);</div><div class='ctx'> int stk_camera_read_reg(struct stk_camera *, u16, int *);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/stradis.c b/drivers/media/video/stradis.c<br/>index 276bded06ab3..bbad54f85c83 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/stradis.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/stradis.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/stradis.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/stradis.c</a></div><div class='hunk'>@@ -1882,12 +1882,16 @@ static int saa_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	struct video_device *vdev = video_devdata(file);</div><div class='ctx'> 	struct saa7146 *saa = container_of(vdev, struct saa7146, video_dev);</div><div class='ctx'> </div><div class='add'>+	lock_kernel();</div><div class='ctx'> 	file-&gt;private_data = saa;</div><div class='ctx'> </div><div class='ctx'> 	saa-&gt;user++;</div><div class='del'>-	if (saa-&gt;user &gt; 1)</div><div class='add'>+	if (saa-&gt;user &gt; 1) {</div><div class='add'>+		unlock_kernel();</div><div class='ctx'> 		return 0;	/* device open already, don't reset */</div><div class='add'>+	}</div><div class='ctx'> 	saa-&gt;writemode = VID_WRITE_MPEG_VID;	/* default to video */</div><div class='add'>+	unlock_kernel();</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1921,6 +1925,7 @@ static struct video_device saa_template = {</div><div class='ctx'> 	.name = "SAA7146A",</div><div class='ctx'> 	.fops = &amp;saa_fops,</div><div class='ctx'> 	.minor = -1,</div><div class='add'>+	.release = video_device_release_empty,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __devinit configure_saa7146(struct pci_dev *pdev, int num)</div><div class='head'>diff --git a/drivers/media/video/stv680.c b/drivers/media/video/stv680.c<br/>index dce947439459..9c549d935994 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/stv680.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/stv680.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/stv680.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/stv680.c</a></div><div class='hunk'>@@ -84,7 +84,8 @@ static unsigned int debug;</div><div class='ctx'> #define PDEBUG(level, fmt, args...) \</div><div class='ctx'> 	do { \</div><div class='ctx'> 	if (debug &gt;= level)	\</div><div class='del'>-		info("[%s:%d] " fmt, __func__, __LINE__ , ## args);	\</div><div class='add'>+		printk(KERN_INFO KBUILD_MODNAME " [%s:%d] \n" fmt,	\</div><div class='add'>+			__func__, __LINE__ , ## args);	\</div><div class='ctx'> 	} while (0)</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -1086,6 +1087,7 @@ static int stv_open (struct inode *inode, struct file *file)</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* we are called with the BKL held */</div><div class='add'>+	lock_kernel();</div><div class='ctx'> 	stv680-&gt;user = 1;</div><div class='ctx'> 	err = stv_init (stv680);	/* main initialization routine for camera */</div><div class='ctx'> </div><div class='hunk'>@@ -1099,6 +1101,7 @@ static int stv_open (struct inode *inode, struct file *file)</div><div class='ctx'> 	}</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		stv680-&gt;user = 0;</div><div class='add'>+	unlock_kernel();</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -1550,7 +1553,8 @@ static int __init usb_stv680_init (void)</div><div class='ctx'> 	}</div><div class='ctx'> 	PDEBUG (0, "STV(i): usb camera driver version %s registering", DRIVER_VERSION);</div><div class='ctx'> </div><div class='del'>-	info(DRIVER_DESC " " DRIVER_VERSION);</div><div class='add'>+	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"</div><div class='add'>+	       DRIVER_DESC "\n");</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/tda9840.c b/drivers/media/video/tda9840.c<br/>index 2437c1a269c5..1c391f0328fd 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/tda9840.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/tda9840.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/tda9840.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/tda9840.c</a></div><div class='hunk'>@@ -2,6 +2,7 @@</div><div class='ctx'>     tda9840 - i2c-driver for the tda9840 by SGS Thomson</div><div class='ctx'> </div><div class='ctx'>     Copyright (C) 1998-2003 Michael Hunold &lt;michael@mihu.de&gt;</div><div class='add'>+    Copyright (C) 2008 Hans Verkuil &lt;hverkuil@xs4all.nl&gt;</div><div class='ctx'> </div><div class='ctx'>     The tda9840 is a stereo/dual sound processor with digital</div><div class='ctx'>     identification. It can be found at address 0x84 on the i2c-bus.</div><div class='hunk'>@@ -28,59 +29,118 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/ioctl.h&gt;</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='del'>-</div><div class='add'>+#include &lt;media/v4l2-common.h&gt;</div><div class='add'>+#include &lt;media/v4l2-i2c-drv-legacy.h&gt;</div><div class='ctx'> #include "tda9840.h"</div><div class='ctx'> </div><div class='del'>-static int debug;		/* insmod parameter */</div><div class='add'>+MODULE_AUTHOR("Michael Hunold &lt;michael@mihu.de&gt;");</div><div class='add'>+MODULE_DESCRIPTION("tda9840 driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='add'>+static int debug;</div><div class='ctx'> module_param(debug, int, 0644);</div><div class='del'>-MODULE_PARM_DESC(debug, "Turn on/off device debugging (default:off).");</div><div class='ctx'> </div><div class='del'>-#define dprintk(args...) \</div><div class='del'>-	    do { if (debug) { printk("%s: %s()[%d]: ", KBUILD_MODNAME, __func__, __LINE__); printk(args); } } while (0)</div><div class='add'>+MODULE_PARM_DESC(debug, "Debug level (0-1)");</div><div class='ctx'> </div><div class='ctx'> #define	SWITCH		0x00</div><div class='ctx'> #define	LEVEL_ADJUST	0x02</div><div class='ctx'> #define	STEREO_ADJUST	0x03</div><div class='ctx'> #define	TEST		0x04</div><div class='ctx'> </div><div class='add'>+#define TDA9840_SET_MUTE                0x00</div><div class='add'>+#define TDA9840_SET_MONO                0x10</div><div class='add'>+#define TDA9840_SET_STEREO              0x2a</div><div class='add'>+#define TDA9840_SET_LANG1               0x12</div><div class='add'>+#define TDA9840_SET_LANG2               0x1e</div><div class='add'>+#define TDA9840_SET_BOTH                0x1a</div><div class='add'>+#define TDA9840_SET_BOTH_R              0x16</div><div class='add'>+#define TDA9840_SET_EXTERNAL            0x7a</div><div class='add'>+</div><div class='ctx'> /* addresses to scan, found only at 0x42 (7-Bit) */</div><div class='ctx'> static unsigned short normal_i2c[] = { I2C_ADDR_TDA9840, I2C_CLIENT_END };</div><div class='ctx'> </div><div class='ctx'> /* magic definition of all other variables and things */</div><div class='ctx'> I2C_CLIENT_INSMOD;</div><div class='ctx'> </div><div class='del'>-static struct i2c_driver driver;</div><div class='del'>-static struct i2c_client client_template;</div><div class='add'>+static void tda9840_write(struct i2c_client *client, u8 reg, u8 val)</div><div class='add'>+{</div><div class='add'>+	if (i2c_smbus_write_byte_data(client, reg, val))</div><div class='add'>+		v4l_dbg(1, debug, client, "error writing %02x to %02x\n",</div><div class='add'>+				val, reg);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-static int command(struct i2c_client *client, unsigned int cmd, void *arg)</div><div class='add'>+static int tda9840_command(struct i2c_client *client, unsigned cmd, void *arg)</div><div class='ctx'> {</div><div class='del'>-	int result;</div><div class='ctx'> 	int byte = *(int *)arg;</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='del'>-	case TDA9840_SWITCH:</div><div class='del'>-</div><div class='del'>-		dprintk("TDA9840_SWITCH: 0x%02x\n", byte);</div><div class='del'>-</div><div class='del'>-		if (byte != TDA9840_SET_MONO</div><div class='del'>-		    &amp;&amp; byte != TDA9840_SET_MUTE</div><div class='del'>-		    &amp;&amp; byte != TDA9840_SET_STEREO</div><div class='del'>-		    &amp;&amp; byte != TDA9840_SET_LANG1</div><div class='del'>-		    &amp;&amp; byte != TDA9840_SET_LANG2</div><div class='del'>-		    &amp;&amp; byte != TDA9840_SET_BOTH</div><div class='del'>-		    &amp;&amp; byte != TDA9840_SET_BOTH_R</div><div class='del'>-		    &amp;&amp; byte != TDA9840_SET_EXTERNAL) {</div><div class='add'>+	case VIDIOC_S_TUNER: {</div><div class='add'>+		struct v4l2_tuner *t = arg;</div><div class='add'>+		int byte;</div><div class='add'>+</div><div class='add'>+		if (t-&gt;index)</div><div class='ctx'> 			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		switch (t-&gt;audmode) {</div><div class='add'>+		case V4L2_TUNER_MODE_STEREO:</div><div class='add'>+			byte = TDA9840_SET_STEREO;</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_TUNER_MODE_LANG1_LANG2:</div><div class='add'>+			byte = TDA9840_SET_BOTH;</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_TUNER_MODE_LANG1:</div><div class='add'>+			byte = TDA9840_SET_LANG1;</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_TUNER_MODE_LANG2:</div><div class='add'>+			byte = TDA9840_SET_LANG2;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			byte = TDA9840_SET_MONO;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		v4l_dbg(1, debug, client, "TDA9840_SWITCH: 0x%02x\n", byte);</div><div class='add'>+		tda9840_write(client, SWITCH, byte);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	case VIDIOC_G_TUNER: {</div><div class='add'>+		struct v4l2_tuner *t = arg;</div><div class='add'>+		u8 byte;</div><div class='add'>+</div><div class='add'>+		t-&gt;rxsubchans = V4L2_TUNER_SUB_MONO;</div><div class='add'>+		if (1 != i2c_master_recv(client, &amp;byte, 1)) {</div><div class='add'>+			v4l_dbg(1, debug, client,</div><div class='add'>+				"i2c_master_recv() failed\n");</div><div class='add'>+			return -EIO;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		result = i2c_smbus_write_byte_data(client, SWITCH, byte);</div><div class='del'>-		if (result)</div><div class='del'>-			dprintk("i2c_smbus_write_byte() failed, ret:%d\n", result);</div><div class='add'>+		if (byte &amp; 0x80) {</div><div class='add'>+			v4l_dbg(1, debug, client,</div><div class='add'>+				"TDA9840_DETECT: register contents invalid\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		v4l_dbg(1, debug, client, "TDA9840_DETECT: byte: 0x%02x\n", byte);</div><div class='add'>+</div><div class='add'>+		switch (byte &amp; 0x60) {</div><div class='add'>+		case 0x00:</div><div class='add'>+			t-&gt;rxsubchans = V4L2_TUNER_SUB_MONO;</div><div class='add'>+			break;</div><div class='add'>+		case 0x20:</div><div class='add'>+			t-&gt;rxsubchans = V4L2_TUNER_SUB_LANG1 | V4L2_TUNER_SUB_LANG2;</div><div class='add'>+			break;</div><div class='add'>+		case 0x40:</div><div class='add'>+			t-&gt;rxsubchans = V4L2_TUNER_SUB_STEREO | V4L2_TUNER_SUB_MONO;</div><div class='add'>+			break;</div><div class='add'>+		default: /* Incorrect detect */</div><div class='add'>+			t-&gt;rxsubchans = V4L2_TUNER_MODE_MONO;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	case TDA9840_LEVEL_ADJUST:</div><div class='del'>-</div><div class='del'>-		dprintk("TDA9840_LEVEL_ADJUST: %d\n", byte);</div><div class='add'>+		v4l_dbg(1, debug, client, "TDA9840_LEVEL_ADJUST: %d\n", byte);</div><div class='ctx'> </div><div class='ctx'> 		/* check for correct range */</div><div class='ctx'> 		if (byte &gt; 25 || byte &lt; -20)</div><div class='hunk'>@@ -92,15 +152,11 @@ static int command(struct i2c_client *client, unsigned int cmd, void *arg)</div><div class='ctx'> 			byte += 0x8;</div><div class='ctx'> 		else</div><div class='ctx'> 			byte = -byte;</div><div class='del'>-</div><div class='del'>-		result = i2c_smbus_write_byte_data(client, LEVEL_ADJUST, byte);</div><div class='del'>-		if (result)</div><div class='del'>-			dprintk("i2c_smbus_write_byte() failed, ret:%d\n", result);</div><div class='add'>+		tda9840_write(client, LEVEL_ADJUST, byte);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case TDA9840_STEREO_ADJUST:</div><div class='del'>-</div><div class='del'>-		dprintk("TDA9840_STEREO_ADJUST: %d\n", byte);</div><div class='add'>+		v4l_dbg(1, debug, client, "TDA9840_STEREO_ADJUST: %d\n", byte);</div><div class='ctx'> </div><div class='ctx'> 		/* check for correct range */</div><div class='ctx'> 		if (byte &gt; 25 || byte &lt; -24)</div><div class='hunk'>@@ -113,143 +169,59 @@ static int command(struct i2c_client *client, unsigned int cmd, void *arg)</div><div class='ctx'> 		else</div><div class='ctx'> 			byte = -byte;</div><div class='ctx'> </div><div class='del'>-		result = i2c_smbus_write_byte_data(client, STEREO_ADJUST, byte);</div><div class='del'>-		if (result)</div><div class='del'>-			dprintk("i2c_smbus_write_byte() failed, ret:%d\n", result);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case TDA9840_DETECT: {</div><div class='del'>-		int *ret = (int *)arg;</div><div class='del'>-</div><div class='del'>-		byte = i2c_smbus_read_byte_data(client, STEREO_ADJUST);</div><div class='del'>-		if (byte == -1) {</div><div class='del'>-			dprintk("i2c_smbus_read_byte_data() failed\n");</div><div class='del'>-			return -EIO;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (0 != (byte &amp; 0x80)) {</div><div class='del'>-			dprintk("TDA9840_DETECT: register contents invalid\n");</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		dprintk("TDA9840_DETECT: byte: 0x%02x\n", byte);</div><div class='del'>-		*ret = ((byte &amp; 0x60) &gt;&gt; 5);</div><div class='del'>-		result = 0;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	case TDA9840_TEST:</div><div class='del'>-		dprintk("TDA9840_TEST: 0x%02x\n", byte);</div><div class='del'>-</div><div class='del'>-		/* mask out irrelevant bits */</div><div class='del'>-		byte &amp;= 0x3;</div><div class='del'>-</div><div class='del'>-		result = i2c_smbus_write_byte_data(client, TEST, byte);</div><div class='del'>-		if (result)</div><div class='del'>-			dprintk("i2c_smbus_write_byte() failed, ret:%d\n", result);</div><div class='add'>+		tda9840_write(client, STEREO_ADJUST, byte);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -ENOIOCTLCMD;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (result)</div><div class='del'>-		return -EIO;</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int detect(struct i2c_adapter *adapter, int address, int kind)</div><div class='add'>+static int tda9840_probe(struct i2c_client *client,</div><div class='add'>+			  const struct i2c_device_id *id)</div><div class='ctx'> {</div><div class='del'>-	struct i2c_client *client;</div><div class='del'>-	int result = 0;</div><div class='del'>-</div><div class='del'>-	int byte = 0x0;</div><div class='add'>+	int result;</div><div class='add'>+	int byte;</div><div class='ctx'> </div><div class='ctx'> 	/* let's see whether this adapter can support what we need */</div><div class='del'>-	if (0 == i2c_check_functionality(adapter,</div><div class='del'>-				    I2C_FUNC_SMBUS_READ_BYTE_DATA |</div><div class='del'>-				    I2C_FUNC_SMBUS_WRITE_BYTE_DATA)) {</div><div class='add'>+	if (!i2c_check_functionality(client-&gt;adapter,</div><div class='add'>+			I2C_FUNC_SMBUS_READ_BYTE_DATA |</div><div class='add'>+			I2C_FUNC_SMBUS_WRITE_BYTE_DATA))</div><div class='ctx'> 		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* allocate memory for client structure */</div><div class='del'>-	client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL);</div><div class='del'>-	if (!client) {</div><div class='del'>-		printk("not enough kernel memory\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* fill client structure */</div><div class='del'>-	memcpy(client, &amp;client_template, sizeof(struct i2c_client));</div><div class='del'>-	client-&gt;addr = address;</div><div class='del'>-	client-&gt;adapter = adapter;</div><div class='ctx'> </div><div class='del'>-	/* tell the i2c layer a new client has arrived */</div><div class='del'>-	if (0 != (result = i2c_attach_client(client))) {</div><div class='del'>-		kfree(client);</div><div class='del'>-		return result;</div><div class='del'>-	}</div><div class='add'>+	v4l_info(client, "chip found @ 0x%x (%s)\n",</div><div class='add'>+			client-&gt;addr &lt;&lt; 1, client-&gt;adapter-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	/* set initial values for level &amp; stereo - adjustment, mode */</div><div class='ctx'> 	byte = 0;</div><div class='del'>-	result  = command(client, TDA9840_LEVEL_ADJUST, &amp;byte);</div><div class='del'>-	result += command(client, TDA9840_STEREO_ADJUST, &amp;byte);</div><div class='del'>-	byte = TDA9840_SET_MONO;</div><div class='del'>-	result = command(client, TDA9840_SWITCH, &amp;byte);</div><div class='add'>+	result = tda9840_command(client, TDA9840_LEVEL_ADJUST, &amp;byte);</div><div class='add'>+	result += tda9840_command(client, TDA9840_STEREO_ADJUST, &amp;byte);</div><div class='add'>+	tda9840_write(client, SWITCH, TDA9840_SET_STEREO);</div><div class='ctx'> 	if (result) {</div><div class='del'>-		dprintk("could not initialize tda9840\n");</div><div class='add'>+		v4l_dbg(1, debug, client, "could not initialize tda9840\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	printk("tda9840: detected @ 0x%02x on adapter %s\n", address, &amp;client-&gt;adapter-&gt;name[0]);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int attach(struct i2c_adapter *adapter)</div><div class='del'>-{</div><div class='del'>-	/* let's see whether this is a know adapter we can attach to */</div><div class='del'>-	if (adapter-&gt;id != I2C_HW_SAA7146) {</div><div class='del'>-		dprintk("refusing to probe on unknown adapter [name='%s',id=0x%x]\n", adapter-&gt;name, adapter-&gt;id);</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return i2c_probe(adapter, &amp;addr_data, &amp;detect);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int detach(struct i2c_client *client)</div><div class='add'>+static int tda9840_legacy_probe(struct i2c_adapter *adapter)</div><div class='ctx'> {</div><div class='del'>-	int ret = i2c_detach_client(client);</div><div class='del'>-	kfree(client);</div><div class='del'>-	return ret;</div><div class='add'>+	/* Let's see whether this is a known adapter we can attach to.</div><div class='add'>+	   Prevents conflicts with tvaudio.c. */</div><div class='add'>+	return adapter-&gt;id == I2C_HW_SAA7146;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-static struct i2c_driver driver = {</div><div class='del'>-	.driver = {</div><div class='del'>-		.name = "tda9840",</div><div class='del'>-	},</div><div class='del'>-	.id	= I2C_DRIVERID_TDA9840,</div><div class='del'>-	.attach_adapter	= attach,</div><div class='del'>-	.detach_client	= detach,</div><div class='del'>-	.command	= command,</div><div class='add'>+static const struct i2c_device_id tda9840_id[] = {</div><div class='add'>+	{ "tda9840", 0 },</div><div class='add'>+	{ }</div><div class='ctx'> };</div><div class='add'>+MODULE_DEVICE_TABLE(i2c, tda9840_id);</div><div class='ctx'> </div><div class='del'>-static struct i2c_client client_template = {</div><div class='add'>+static struct v4l2_i2c_driver_data v4l2_i2c_data = {</div><div class='ctx'> 	.name = "tda9840",</div><div class='del'>-	.driver = &amp;driver,</div><div class='add'>+	.driverid = I2C_DRIVERID_TDA9840,</div><div class='add'>+	.command = tda9840_command,</div><div class='add'>+	.probe = tda9840_probe,</div><div class='add'>+	.legacy_probe = tda9840_legacy_probe,</div><div class='add'>+	.id_table = tda9840_id,</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init this_module_init(void)</div><div class='del'>-{</div><div class='del'>-	return i2c_add_driver(&amp;driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit this_module_exit(void)</div><div class='del'>-{</div><div class='del'>-	i2c_del_driver(&amp;driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(this_module_init);</div><div class='del'>-module_exit(this_module_exit);</div><div class='del'>-</div><div class='del'>-MODULE_AUTHOR("Michael Hunold &lt;michael@mihu.de&gt;");</div><div class='del'>-MODULE_DESCRIPTION("tda9840 driver");</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/media/video/tda9840.h b/drivers/media/video/tda9840.h<br/>index 7da8432cdca7..dc12ae7caf6f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/tda9840.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/tda9840.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/tda9840.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/tda9840.h</a></div><div class='hunk'>@@ -3,24 +3,6 @@</div><div class='ctx'> </div><div class='ctx'> #define	I2C_ADDR_TDA9840		0x42</div><div class='ctx'> </div><div class='del'>-#define TDA9840_DETECT		_IOR('v',1,int)</div><div class='del'>-/* return values for TDA9840_DETCT */</div><div class='del'>-#define TDA9840_MONO_DETECT		0x0</div><div class='del'>-#define	TDA9840_DUAL_DETECT		0x1</div><div class='del'>-#define	TDA9840_STEREO_DETECT		0x2</div><div class='del'>-#define	TDA9840_INCORRECT_DETECT	0x3</div><div class='del'>-</div><div class='del'>-#define TDA9840_SWITCH		_IOW('v',2,int)</div><div class='del'>-/* modes than can be set with TDA9840_SWITCH */</div><div class='del'>-#define	TDA9840_SET_MUTE		0x00</div><div class='del'>-#define	TDA9840_SET_MONO		0x10</div><div class='del'>-#define	TDA9840_SET_STEREO		0x2a</div><div class='del'>-#define	TDA9840_SET_LANG1		0x12</div><div class='del'>-#define	TDA9840_SET_LANG2		0x1e</div><div class='del'>-#define	TDA9840_SET_BOTH		0x1a</div><div class='del'>-#define	TDA9840_SET_BOTH_R		0x16</div><div class='del'>-#define	TDA9840_SET_EXTERNAL		0x7a</div><div class='del'>-</div><div class='ctx'> /* values may range between +2.5 and -2.0;</div><div class='ctx'>    the value has to be multiplied with 10 */</div><div class='ctx'> #define TDA9840_LEVEL_ADJUST	_IOW('v',3,int)</div><div class='hunk'>@@ -29,7 +11,4 @@</div><div class='ctx'>    the value has to be multiplied with 10 */</div><div class='ctx'> #define TDA9840_STEREO_ADJUST	_IOW('v',4,int)</div><div class='ctx'> </div><div class='del'>-/* currently not implemented */</div><div class='del'>-#define TDA9840_TEST		_IOW('v',5,int)</div><div class='del'>-</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/media/video/tea6415c.c b/drivers/media/video/tea6415c.c<br/>index 421c1445e96c..cde092adbb5a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/tea6415c.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/tea6415c.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/tea6415c.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/tea6415c.c</a></div><div class='hunk'>@@ -2,6 +2,7 @@</div><div class='ctx'>     tea6415c - i2c-driver for the tea6415c by SGS Thomson</div><div class='ctx'> </div><div class='ctx'>     Copyright (C) 1998-2003 Michael Hunold &lt;michael@mihu.de&gt;</div><div class='add'>+    Copyright (C) 2008 Hans Verkuil &lt;hverkuil@xs4all.nl&gt;</div><div class='ctx'> </div><div class='ctx'>     The tea6415c is a bus controlled video-matrix-switch</div><div class='ctx'>     with 8 inputs and 6 outputs.</div><div class='hunk'>@@ -30,18 +31,18 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/ioctl.h&gt;</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='del'>-</div><div class='add'>+#include &lt;media/v4l2-common.h&gt;</div><div class='add'>+#include &lt;media/v4l2-i2c-drv-legacy.h&gt;</div><div class='ctx'> #include "tea6415c.h"</div><div class='ctx'> </div><div class='del'>-static int debug;		/* insmod parameter */</div><div class='del'>-module_param(debug, int, 0644);</div><div class='del'>-MODULE_PARM_DESC(debug, "Turn on/off device debugging (default:off).");</div><div class='add'>+MODULE_AUTHOR("Michael Hunold &lt;michael@mihu.de&gt;");</div><div class='add'>+MODULE_DESCRIPTION("tea6415c driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='del'>-#define dprintk(args...) \</div><div class='del'>-	    do { if (debug) { printk("%s: %s()[%d]: ", KBUILD_MODNAME, __func__, __LINE__); printk(args); } } while (0)</div><div class='add'>+static int debug;</div><div class='add'>+module_param(debug, int, 0644);</div><div class='ctx'> </div><div class='del'>-#define TEA6415C_NUM_INPUTS	8</div><div class='del'>-#define TEA6415C_NUM_OUTPUTS	6</div><div class='add'>+MODULE_PARM_DESC(debug, "Debug level (0-1)");</div><div class='ctx'> </div><div class='ctx'> /* addresses to scan, found only at 0x03 and/or 0x43 (7-bit) */</div><div class='ctx'> static unsigned short normal_i2c[] = { I2C_TEA6415C_1, I2C_TEA6415C_2, I2C_CLIENT_END };</div><div class='hunk'>@@ -49,60 +50,6 @@ static unsigned short normal_i2c[] = { I2C_TEA6415C_1, I2C_TEA6415C_2, I2C_CLIEN</div><div class='ctx'> /* magic definition of all other variables and things */</div><div class='ctx'> I2C_CLIENT_INSMOD;</div><div class='ctx'> </div><div class='del'>-static struct i2c_driver driver;</div><div class='del'>-static struct i2c_client client_template;</div><div class='del'>-</div><div class='del'>-/* this function is called by i2c_probe */</div><div class='del'>-static int detect(struct i2c_adapter *adapter, int address, int kind)</div><div class='del'>-{</div><div class='del'>-	struct i2c_client *client = NULL;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	/* let's see whether this adapter can support what we need */</div><div class='del'>-	if (0 == i2c_check_functionality(adapter, I2C_FUNC_SMBUS_WRITE_BYTE)) {</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* allocate memory for client structure */</div><div class='del'>-	client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL);</div><div class='del'>-	if (!client) {</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* fill client structure */</div><div class='del'>-	memcpy(client, &amp;client_template, sizeof(struct i2c_client));</div><div class='del'>-	client-&gt;addr = address;</div><div class='del'>-	client-&gt;adapter = adapter;</div><div class='del'>-</div><div class='del'>-	/* tell the i2c layer a new client has arrived */</div><div class='del'>-	if (0 != (err = i2c_attach_client(client))) {</div><div class='del'>-		kfree(client);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printk("tea6415c: detected @ 0x%02x on adapter %s\n", address, &amp;client-&gt;adapter-&gt;name[0]);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int attach(struct i2c_adapter *adapter)</div><div class='del'>-{</div><div class='del'>-	/* let's see whether this is a know adapter we can attach to */</div><div class='del'>-	if (adapter-&gt;id != I2C_HW_SAA7146) {</div><div class='del'>-		dprintk("refusing to probe on unknown adapter [name='%s',id=0x%x]\n", adapter-&gt;name, adapter-&gt;id);</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return i2c_probe(adapter, &amp;addr_data, &amp;detect);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int detach(struct i2c_client *client)</div><div class='del'>-{</div><div class='del'>-	int ret = i2c_detach_client(client);</div><div class='del'>-	kfree(client);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* makes a connection between the input-pin 'i' and the output-pin 'o'</div><div class='ctx'>    for the tea6415c-client 'client' */</div><div class='ctx'> static int switch_matrix(struct i2c_client *client, int i, int o)</div><div class='hunk'>@@ -110,7 +57,7 @@ static int switch_matrix(struct i2c_client *client, int i, int o)</div><div class='ctx'> 	u8 byte = 0;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	dprintk("adr:0x%02x, i:%d, o:%d\n", client-&gt;addr, i, o);</div><div class='add'>+	v4l_dbg(1, debug, client, "i=%d, o=%d\n", i, o);</div><div class='ctx'> </div><div class='ctx'> 	/* check if the pins are valid */</div><div class='ctx'> 	if (0 == ((1 == i ||  3 == i ||  5 == i ||  6 == i ||  8 == i || 10 == i || 20 == i || 11 == i)</div><div class='hunk'>@@ -168,14 +115,14 @@ static int switch_matrix(struct i2c_client *client, int i, int o)</div><div class='ctx'> </div><div class='ctx'> 	ret = i2c_smbus_write_byte(client, byte);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		dprintk("i2c_smbus_write_byte() failed, ret:%d\n", ret);</div><div class='add'>+		v4l_dbg(1, debug, client,</div><div class='add'>+			"i2c_smbus_write_byte() failed, ret:%d\n", ret);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int command(struct i2c_client *client, unsigned int cmd, void *arg)</div><div class='add'>+static int tea6415c_command(struct i2c_client *client, unsigned cmd, void *arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct tea6415c_multiplex *v = (struct tea6415c_multiplex *)arg;</div><div class='ctx'> 	int result = 0;</div><div class='hunk'>@@ -187,38 +134,40 @@ static int command(struct i2c_client *client, unsigned int cmd, void *arg)</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -ENOIOCTLCMD;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct i2c_driver driver = {</div><div class='del'>-	.driver = {</div><div class='del'>-		.name = "tea6415c",</div><div class='del'>-	},</div><div class='del'>-	.id 	= I2C_DRIVERID_TEA6415C,</div><div class='del'>-	.attach_adapter	= attach,</div><div class='del'>-	.detach_client	= detach,</div><div class='del'>-	.command	= command,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct i2c_client client_template = {</div><div class='del'>-	.name = "tea6415c",</div><div class='del'>-	.driver = &amp;driver,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init this_module_init(void)</div><div class='add'>+/* this function is called by i2c_probe */</div><div class='add'>+static int tea6415c_probe(struct i2c_client *client,</div><div class='add'>+			  const struct i2c_device_id *id)</div><div class='ctx'> {</div><div class='del'>-	return i2c_add_driver(&amp;driver);</div><div class='add'>+	/* let's see whether this adapter can support what we need */</div><div class='add'>+	if (!i2c_check_functionality(client-&gt;adapter, I2C_FUNC_SMBUS_WRITE_BYTE))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	v4l_info(client, "chip found @ 0x%x (%s)\n",</div><div class='add'>+			client-&gt;addr &lt;&lt; 1, client-&gt;adapter-&gt;name);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __exit this_module_exit(void)</div><div class='add'>+static int tea6415c_legacy_probe(struct i2c_adapter *adapter)</div><div class='ctx'> {</div><div class='del'>-	i2c_del_driver(&amp;driver);</div><div class='add'>+	/* Let's see whether this is a known adapter we can attach to.</div><div class='add'>+	   Prevents conflicts with tvaudio.c. */</div><div class='add'>+	return adapter-&gt;id == I2C_HW_SAA7146;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(this_module_init);</div><div class='del'>-module_exit(this_module_exit);</div><div class='add'>+static const struct i2c_device_id tea6415c_id[] = {</div><div class='add'>+	{ "tea6415c", 0 },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(i2c, tea6415c_id);</div><div class='ctx'> </div><div class='del'>-MODULE_AUTHOR("Michael Hunold &lt;michael@mihu.de&gt;");</div><div class='del'>-MODULE_DESCRIPTION("tea6415c driver");</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='add'>+static struct v4l2_i2c_driver_data v4l2_i2c_data = {</div><div class='add'>+	.name = "tea6415c",</div><div class='add'>+	.driverid = I2C_DRIVERID_TEA6415C,</div><div class='add'>+	.command = tea6415c_command,</div><div class='add'>+	.probe = tea6415c_probe,</div><div class='add'>+	.legacy_probe = tea6415c_legacy_probe,</div><div class='add'>+	.id_table = tea6415c_id,</div><div class='add'>+};</div><div class='head'>diff --git a/drivers/media/video/tea6420.c b/drivers/media/video/tea6420.c<br/>index b5c8957d130e..e50820969e64 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/tea6420.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/tea6420.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/tea6420.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/tea6420.c</a></div><div class='hunk'>@@ -2,6 +2,7 @@</div><div class='ctx'>     tea6420 - i2c-driver for the tea6420 by SGS Thomson</div><div class='ctx'> </div><div class='ctx'>     Copyright (C) 1998-2003 Michael Hunold &lt;michael@mihu.de&gt;</div><div class='add'>+    Copyright (C) 2008 Hans Verkuil &lt;hverkuil@xs4all.nl&gt;</div><div class='ctx'> </div><div class='ctx'>     The tea6420 is a bus controlled audio-matrix with 5 stereo inputs,</div><div class='ctx'>     4 stereo outputs and gain control for each output.</div><div class='hunk'>@@ -30,15 +31,18 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/ioctl.h&gt;</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='del'>-</div><div class='add'>+#include &lt;media/v4l2-common.h&gt;</div><div class='add'>+#include &lt;media/v4l2-i2c-drv-legacy.h&gt;</div><div class='ctx'> #include "tea6420.h"</div><div class='ctx'> </div><div class='del'>-static int debug;		/* insmod parameter */</div><div class='add'>+MODULE_AUTHOR("Michael Hunold &lt;michael@mihu.de&gt;");</div><div class='add'>+MODULE_DESCRIPTION("tea6420 driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='add'>+static int debug;</div><div class='ctx'> module_param(debug, int, 0644);</div><div class='del'>-MODULE_PARM_DESC(debug, "Turn on/off device debugging (default:off).");</div><div class='ctx'> </div><div class='del'>-#define dprintk(args...) \</div><div class='del'>-	    do { if (debug) { printk("%s: %s()[%d]: ", KBUILD_MODNAME, __func__, __LINE__); printk(args); } } while (0)</div><div class='add'>+MODULE_PARM_DESC(debug, "Debug level (0-1)");</div><div class='ctx'> </div><div class='ctx'> /* addresses to scan, found only at 0x4c and/or 0x4d (7-Bit) */</div><div class='ctx'> static unsigned short normal_i2c[] = { I2C_ADDR_TEA6420_1, I2C_ADDR_TEA6420_2, I2C_CLIENT_END };</div><div class='hunk'>@@ -46,23 +50,20 @@ static unsigned short normal_i2c[] = { I2C_ADDR_TEA6420_1, I2C_ADDR_TEA6420_2, I</div><div class='ctx'> /* magic definition of all other variables and things */</div><div class='ctx'> I2C_CLIENT_INSMOD;</div><div class='ctx'> </div><div class='del'>-static struct i2c_driver driver;</div><div class='del'>-static struct i2c_client client_template;</div><div class='del'>-</div><div class='ctx'> /* make a connection between the input 'i' and the output 'o'</div><div class='ctx'>    with gain 'g' for the tea6420-client 'client' (note: i = 6 means 'mute') */</div><div class='ctx'> static int tea6420_switch(struct i2c_client *client, int i, int o, int g)</div><div class='ctx'> {</div><div class='del'>-	u8 byte = 0;</div><div class='add'>+	u8 byte;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	dprintk("adr:0x%02x, i:%d, o:%d, g:%d\n", client-&gt;addr, i, o, g);</div><div class='add'>+	v4l_dbg(1, debug, client, "i=%d, o=%d, g=%d\n", i, o, g);</div><div class='ctx'> </div><div class='ctx'> 	/* check if the parameters are valid */</div><div class='ctx'> 	if (i &lt; 1 || i &gt; 6 || o &lt; 1 || o &gt; 4 || g &lt; 0 || g &gt; 6 || g % 2 != 0)</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='del'>-	byte  = ((o - 1) &lt;&lt; 5);</div><div class='add'>+	byte = ((o - 1) &lt;&lt; 5);</div><div class='ctx'> 	byte |= (i - 1);</div><div class='ctx'> </div><div class='ctx'> 	/* to understand this, have a look at the tea6420-specs (p.5) */</div><div class='hunk'>@@ -82,40 +83,41 @@ static int tea6420_switch(struct i2c_client *client, int i, int o, int g)</div><div class='ctx'> </div><div class='ctx'> 	ret = i2c_smbus_write_byte(client, byte);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		dprintk("i2c_smbus_write_byte() failed, ret:%d\n", ret);</div><div class='add'>+		v4l_dbg(1, debug, client,</div><div class='add'>+			"i2c_smbus_write_byte() failed, ret:%d\n", ret);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* this function is called by i2c_probe */</div><div class='del'>-static int tea6420_detect(struct i2c_adapter *adapter, int address, int kind)</div><div class='add'>+static int tea6420_command(struct i2c_client *client, unsigned cmd, void *arg)</div><div class='ctx'> {</div><div class='del'>-	struct i2c_client *client;</div><div class='del'>-	int err = 0, i = 0;</div><div class='add'>+	struct tea6420_multiplex *a = (struct tea6420_multiplex *)arg;</div><div class='add'>+	int result = 0;</div><div class='ctx'> </div><div class='del'>-	/* let's see whether this adapter can support what we need */</div><div class='del'>-	if (0 == i2c_check_functionality(adapter, I2C_FUNC_SMBUS_WRITE_BYTE)) {</div><div class='del'>-		return 0;</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case TEA6420_SWITCH:</div><div class='add'>+		result = tea6420_switch(client, a-&gt;in, a-&gt;out, a-&gt;gain);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -ENOIOCTLCMD;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* allocate memory for client structure */</div><div class='del'>-	client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);</div><div class='del'>-	if (!client) {</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	/* fill client structure */</div><div class='del'>-	memcpy(client, &amp;client_template, sizeof(struct i2c_client));</div><div class='del'>-	client-&gt;addr = address;</div><div class='del'>-	client-&gt;adapter = adapter;</div><div class='add'>+/* this function is called by i2c_probe */</div><div class='add'>+static int tea6420_probe(struct i2c_client *client,</div><div class='add'>+			  const struct i2c_device_id *id)</div><div class='add'>+{</div><div class='add'>+	int err, i;</div><div class='ctx'> </div><div class='del'>-	/* tell the i2c layer a new client has arrived */</div><div class='del'>-	if (0 != (err = i2c_attach_client(client))) {</div><div class='del'>-		kfree(client);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='add'>+	/* let's see whether this adapter can support what we need */</div><div class='add'>+	if (!i2c_check_functionality(client-&gt;adapter, I2C_FUNC_SMBUS_WRITE_BYTE))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	v4l_info(client, "chip found @ 0x%x (%s)\n",</div><div class='add'>+			client-&gt;addr &lt;&lt; 1, client-&gt;adapter-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	/* set initial values: set "mute"-input to all outputs at gain 0 */</div><div class='ctx'> 	err = 0;</div><div class='hunk'>@@ -123,78 +125,31 @@ static int tea6420_detect(struct i2c_adapter *adapter, int address, int kind)</div><div class='ctx'> 		err += tea6420_switch(client, 6, i, 0);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (err) {</div><div class='del'>-		dprintk("could not initialize tea6420\n");</div><div class='add'>+		v4l_dbg(1, debug, client, "could not initialize tea6420\n");</div><div class='ctx'> 		kfree(client);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	printk("tea6420: detected @ 0x%02x on adapter %s\n", address, &amp;client-&gt;adapter-&gt;name[0]);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int attach(struct i2c_adapter *adapter)</div><div class='add'>+static int tea6420_legacy_probe(struct i2c_adapter *adapter)</div><div class='ctx'> {</div><div class='del'>-	/* let's see whether this is a know adapter we can attach to */</div><div class='del'>-	if (adapter-&gt;id != I2C_HW_SAA7146) {</div><div class='del'>-		dprintk("refusing to probe on unknown adapter [name='%s',id=0x%x]\n", adapter-&gt;name, adapter-&gt;id);</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return i2c_probe(adapter, &amp;addr_data, &amp;tea6420_detect);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int detach(struct i2c_client *client)</div><div class='del'>-{</div><div class='del'>-	int ret = i2c_detach_client(client);</div><div class='del'>-	kfree(client);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int command(struct i2c_client *client, unsigned int cmd, void *arg)</div><div class='del'>-{</div><div class='del'>-	struct tea6420_multiplex *a = (struct tea6420_multiplex *)arg;</div><div class='del'>-	int result = 0;</div><div class='del'>-</div><div class='del'>-	switch (cmd) {</div><div class='del'>-	case TEA6420_SWITCH:</div><div class='del'>-		result = tea6420_switch(client, a-&gt;in, a-&gt;out, a-&gt;gain);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		return -ENOIOCTLCMD;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return result;</div><div class='add'>+	/* Let's see whether this is a known adapter we can attach to.</div><div class='add'>+	   Prevents conflicts with tvaudio.c. */</div><div class='add'>+	return adapter-&gt;id == I2C_HW_SAA7146;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct i2c_driver driver = {</div><div class='del'>-	.driver = {</div><div class='del'>-		.name = "tea6420",</div><div class='del'>-	},</div><div class='del'>-	.id	= I2C_DRIVERID_TEA6420,</div><div class='del'>-	.attach_adapter	= attach,</div><div class='del'>-	.detach_client	= detach,</div><div class='del'>-	.command	= command,</div><div class='add'>+static const struct i2c_device_id tea6420_id[] = {</div><div class='add'>+	{ "tea6420", 0 },</div><div class='add'>+	{ }</div><div class='ctx'> };</div><div class='add'>+MODULE_DEVICE_TABLE(i2c, tea6420_id);</div><div class='ctx'> </div><div class='del'>-static struct i2c_client client_template = {</div><div class='add'>+static struct v4l2_i2c_driver_data v4l2_i2c_data = {</div><div class='ctx'> 	.name = "tea6420",</div><div class='del'>-	.driver = &amp;driver,</div><div class='add'>+	.driverid = I2C_DRIVERID_TEA6420,</div><div class='add'>+	.command = tea6420_command,</div><div class='add'>+	.probe = tea6420_probe,</div><div class='add'>+	.legacy_probe = tea6420_legacy_probe,</div><div class='add'>+	.id_table = tea6420_id,</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init this_module_init(void)</div><div class='del'>-{</div><div class='del'>-	return i2c_add_driver(&amp;driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit this_module_exit(void)</div><div class='del'>-{</div><div class='del'>-	i2c_del_driver(&amp;driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(this_module_init);</div><div class='del'>-module_exit(this_module_exit);</div><div class='del'>-</div><div class='del'>-MODULE_AUTHOR("Michael Hunold &lt;michael@mihu.de&gt;");</div><div class='del'>-MODULE_DESCRIPTION("tea6420 driver");</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/media/video/tuner-3036.c b/drivers/media/video/tuner-3036.c<br/>deleted file mode 100644<br/>index bdf506e6ae27..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/tuner-3036.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/tuner-3036.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,214 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Driver for Philips SAB3036 "CITAC" tuner control chip.</div><div class='del'>- *</div><div class='del'>- * Author: Phil Blundell &lt;philb@gnu.org&gt;</div><div class='del'>- *</div><div class='del'>- * The SAB3036 is just about different enough from the chips that</div><div class='del'>- * tuner.c copes with to make it not worth the effort to crowbar</div><div class='del'>- * the support into that file.  So instead we have a separate driver.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of the GNU General Public License</div><div class='del'>- * as published by the Free Software Foundation; either version</div><div class='del'>- * 2 of the License, or (at your option) any later version.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/timer.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;linux/i2c.h&gt;</div><div class='del'>-#include &lt;linux/videodev.h&gt;</div><div class='del'>-#include &lt;media/v4l2-common.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;media/tuner.h&gt;</div><div class='del'>-</div><div class='del'>-static int debug;	/* insmod parameter */</div><div class='del'>-static int this_adap;</div><div class='del'>-</div><div class='del'>-static struct i2c_client client_template;</div><div class='del'>-</div><div class='del'>-/* Addresses to scan */</div><div class='del'>-static unsigned short normal_i2c[] = { 0x60, 0x61, I2C_CLIENT_END };</div><div class='del'>-static unsigned short ignore = I2C_CLIENT_END;</div><div class='del'>-</div><div class='del'>-static struct i2c_client_address_data addr_data = {</div><div class='del'>-	.normal_i2c	= normal_i2c,</div><div class='del'>-	.probe		= &amp;ignore,</div><div class='del'>-	.ignore		= &amp;ignore,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* ---------------------------------------------------------------------- */</div><div class='del'>-</div><div class='del'>-static unsigned char</div><div class='del'>-tuner_getstatus (struct i2c_client *c)</div><div class='del'>-{</div><div class='del'>-	unsigned char byte;</div><div class='del'>-	if (i2c_master_recv(c, &amp;byte, 1) != 1)</div><div class='del'>-		printk(KERN_ERR "tuner-3036: I/O error.\n");</div><div class='del'>-	return byte;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define TUNER_FL        0x80</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-tuner_islocked (struct i2c_client *c)</div><div class='del'>-{</div><div class='del'>-	return (tuner_getstatus(c) &amp; TUNER_FL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* ---------------------------------------------------------------------- */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_tv_freq(struct i2c_client *c, int freq)</div><div class='del'>-{</div><div class='del'>-	u16 div = ((freq * 20) / 16);</div><div class='del'>-	unsigned long give_up = jiffies + HZ;</div><div class='del'>-	unsigned char buffer[2];</div><div class='del'>-</div><div class='del'>-	if (debug)</div><div class='del'>-		printk(KERN_DEBUG "tuner: setting frequency %dMHz, divisor %x\n", freq / 16, div);</div><div class='del'>-</div><div class='del'>-	/* Select high tuning current */</div><div class='del'>-	buffer[0] = 0x29;</div><div class='del'>-	buffer[1] = 0x3e;</div><div class='del'>-</div><div class='del'>-	if (i2c_master_send(c, buffer, 2) != 2)</div><div class='del'>-		printk("tuner: i2c i/o error 1\n");</div><div class='del'>-</div><div class='del'>-	buffer[0] = 0x80 | ((div&gt;&gt;8) &amp; 0x7f);</div><div class='del'>-	buffer[1] = div &amp; 0xff;</div><div class='del'>-</div><div class='del'>-	if (i2c_master_send(c, buffer, 2) != 2)</div><div class='del'>-		printk("tuner: i2c i/o error 2\n");</div><div class='del'>-</div><div class='del'>-	while (!tuner_islocked(c) &amp;&amp; time_before(jiffies, give_up))</div><div class='del'>-		schedule();</div><div class='del'>-</div><div class='del'>-	if (!tuner_islocked(c))</div><div class='del'>-		printk(KERN_WARNING "tuner: failed to achieve PLL lock\n");</div><div class='del'>-</div><div class='del'>-	/* Select low tuning current and engage AFC */</div><div class='del'>-	buffer[0] = 0x29;</div><div class='del'>-	buffer[1] = 0xb2;</div><div class='del'>-</div><div class='del'>-	if (i2c_master_send(c, buffer, 2) != 2)</div><div class='del'>-		printk("tuner: i2c i/o error 3\n");</div><div class='del'>-</div><div class='del'>-	if (debug)</div><div class='del'>-		printk(KERN_DEBUG "tuner: status %02x\n", tuner_getstatus(c));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* ---------------------------------------------------------------------- */</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-tuner_attach(struct i2c_adapter *adap, int addr, int kind)</div><div class='del'>-{</div><div class='del'>-	static unsigned char buffer[] = { 0x29, 0x32, 0x2a, 0, 0x2b, 0 };</div><div class='del'>-</div><div class='del'>-	struct i2c_client *client;</div><div class='del'>-</div><div class='del'>-	if (this_adap &gt; 0)</div><div class='del'>-		return -1;</div><div class='del'>-	this_adap++;</div><div class='del'>-</div><div class='del'>-	client_template.adapter = adap;</div><div class='del'>-	client_template.addr = addr;</div><div class='del'>-</div><div class='del'>-	client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL);</div><div class='del'>-	if (client == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	memcpy(client, &amp;client_template, sizeof(struct i2c_client));</div><div class='del'>-</div><div class='del'>-	printk("tuner: SAB3036 found, status %02x\n", tuner_getstatus(client));</div><div class='del'>-</div><div class='del'>-	i2c_attach_client(client);</div><div class='del'>-</div><div class='del'>-	if (i2c_master_send(client, buffer, 2) != 2)</div><div class='del'>-		printk("tuner: i2c i/o error 1\n");</div><div class='del'>-	if (i2c_master_send(client, buffer+2, 2) != 2)</div><div class='del'>-		printk("tuner: i2c i/o error 2\n");</div><div class='del'>-	if (i2c_master_send(client, buffer+4, 2) != 2)</div><div class='del'>-		printk("tuner: i2c i/o error 3\n");</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-tuner_detach(struct i2c_client *c)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)</div><div class='del'>-{</div><div class='del'>-	int *iarg = (int*)arg;</div><div class='del'>-</div><div class='del'>-	switch (cmd)</div><div class='del'>-	{</div><div class='del'>-		case VIDIOCSFREQ:</div><div class='del'>-			set_tv_freq(client, *iarg);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		default:</div><div class='del'>-			return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-tuner_probe(struct i2c_adapter *adap)</div><div class='del'>-{</div><div class='del'>-	this_adap = 0;</div><div class='del'>-	if (adap-&gt;id == I2C_HW_B_LP)</div><div class='del'>-		return i2c_probe(adap, &amp;addr_data, tuner_attach);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* ----------------------------------------------------------------------- */</div><div class='del'>-</div><div class='del'>-static struct i2c_driver</div><div class='del'>-i2c_driver_tuner =</div><div class='del'>-{</div><div class='del'>-	.driver = {</div><div class='del'>-		.name	=	"sab3036",</div><div class='del'>-	},</div><div class='del'>-	.id		=	I2C_DRIVERID_SAB3036,</div><div class='del'>-	.attach_adapter =	tuner_probe,</div><div class='del'>-	.detach_client  =	tuner_detach,</div><div class='del'>-	.command	=	tuner_command</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct i2c_client client_template =</div><div class='del'>-{</div><div class='del'>-	.driver		= &amp;i2c_driver_tuner,</div><div class='del'>-	.name		= "SAB3036",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init</div><div class='del'>-tuner3036_init(void)</div><div class='del'>-{</div><div class='del'>-	return i2c_add_driver(&amp;i2c_driver_tuner);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit</div><div class='del'>-tuner3036_exit(void)</div><div class='del'>-{</div><div class='del'>-	i2c_del_driver(&amp;i2c_driver_tuner);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-MODULE_DESCRIPTION("SAB3036 tuner driver");</div><div class='del'>-MODULE_AUTHOR("Philip Blundell &lt;philb@gnu.org&gt;");</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-</div><div class='del'>-module_param(debug, int, 0);</div><div class='del'>-MODULE_PARM_DESC(debug,"Enable debugging output");</div><div class='del'>-</div><div class='del'>-module_init(tuner3036_init);</div><div class='del'>-module_exit(tuner3036_exit);</div><div class='head'>diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c<br/>index d806a3556eed..4a7735c6c1a6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/tuner-core.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/tuner-core.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/tuner-core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/tuner-core.c</a></div><div class='hunk'>@@ -92,7 +92,6 @@ struct tuner {</div><div class='ctx'> </div><div class='ctx'> 	unsigned int        type; /* chip type id */</div><div class='ctx'> 	unsigned int        config;</div><div class='del'>-	int (*tuner_callback) (void *dev, int command, int arg);</div><div class='ctx'> 	const char          *name;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -346,7 +345,7 @@ static struct xc5000_config xc5000_cfg;</div><div class='ctx'> </div><div class='ctx'> static void set_type(struct i2c_client *c, unsigned int type,</div><div class='ctx'> 		     unsigned int new_mode_mask, unsigned int new_config,</div><div class='del'>-		     int (*tuner_callback) (void *dev, int command,int arg))</div><div class='add'>+		     int (*tuner_callback) (void *dev, int component, int cmd, int arg))</div><div class='ctx'> {</div><div class='ctx'> 	struct tuner *t = i2c_get_clientdata(c);</div><div class='ctx'> 	struct dvb_tuner_ops *fe_tuner_ops = &amp;t-&gt;fe.ops.tuner_ops;</div><div class='hunk'>@@ -362,7 +361,7 @@ static void set_type(struct i2c_client *c, unsigned int type,</div><div class='ctx'> 	t-&gt;config = new_config;</div><div class='ctx'> 	if (tuner_callback != NULL) {</div><div class='ctx'> 		tuner_dbg("defining GPIO callback\n");</div><div class='del'>-		t-&gt;tuner_callback = tuner_callback;</div><div class='add'>+		t-&gt;fe.callback = tuner_callback;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (t-&gt;mode == T_UNINITIALIZED) {</div><div class='hunk'>@@ -385,7 +384,6 @@ static void set_type(struct i2c_client *c, unsigned int type,</div><div class='ctx'> 	{</div><div class='ctx'> 		struct tda829x_config cfg = {</div><div class='ctx'> 			.lna_cfg        = t-&gt;config,</div><div class='del'>-			.tuner_callback = t-&gt;tuner_callback,</div><div class='ctx'> 		};</div><div class='ctx'> 		if (!dvb_attach(tda829x_attach, &amp;t-&gt;fe, t-&gt;i2c-&gt;adapter,</div><div class='ctx'> 				t-&gt;i2c-&gt;addr, &amp;cfg))</div><div class='hunk'>@@ -433,7 +431,6 @@ static void set_type(struct i2c_client *c, unsigned int type,</div><div class='ctx'> 		struct xc2028_config cfg = {</div><div class='ctx'> 			.i2c_adap  = t-&gt;i2c-&gt;adapter,</div><div class='ctx'> 			.i2c_addr  = t-&gt;i2c-&gt;addr,</div><div class='del'>-			.callback  = t-&gt;tuner_callback,</div><div class='ctx'> 		};</div><div class='ctx'> 		if (!dvb_attach(xc2028_attach, &amp;t-&gt;fe, &amp;cfg))</div><div class='ctx'> 			goto attach_failed;</div><div class='hunk'>@@ -450,10 +447,8 @@ static void set_type(struct i2c_client *c, unsigned int type,</div><div class='ctx'> </div><div class='ctx'> 		xc5000_cfg.i2c_address	  = t-&gt;i2c-&gt;addr;</div><div class='ctx'> 		xc5000_cfg.if_khz	  = 5380;</div><div class='del'>-		xc5000_cfg.tuner_callback = t-&gt;tuner_callback;</div><div class='ctx'> 		if (!dvb_attach(xc5000_attach,</div><div class='del'>-				&amp;t-&gt;fe, t-&gt;i2c-&gt;adapter, &amp;xc5000_cfg,</div><div class='del'>-				c-&gt;adapter-&gt;algo_data))</div><div class='add'>+				&amp;t-&gt;fe, t-&gt;i2c-&gt;adapter, &amp;xc5000_cfg))</div><div class='ctx'> 			goto attach_failed;</div><div class='ctx'> </div><div class='ctx'> 		xc_tuner_ops = &amp;t-&gt;fe.ops.tuner_ops;</div><div class='hunk'>@@ -1225,7 +1220,7 @@ register_client:</div><div class='ctx'> 	} else {</div><div class='ctx'> 		t-&gt;mode = V4L2_TUNER_DIGITAL_TV;</div><div class='ctx'> 	}</div><div class='del'>-	set_type(client, t-&gt;type, t-&gt;mode_mask, t-&gt;config, t-&gt;tuner_callback);</div><div class='add'>+	set_type(client, t-&gt;type, t-&gt;mode_mask, t-&gt;config, t-&gt;fe.callback);</div><div class='ctx'> 	list_add_tail(&amp;t-&gt;list, &amp;tuner_list);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/media/video/tvaudio.c b/drivers/media/video/tvaudio.c<br/>index 463680b13289..b59e47272abf 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/tvaudio.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/tvaudio.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/tvaudio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/tvaudio.c</a></div><div class='hunk'>@@ -1792,7 +1792,7 @@ static int chip_command(struct i2c_client *client,</div><div class='ctx'> 		break;</div><div class='ctx'> 	case VIDIOC_S_FREQUENCY:</div><div class='ctx'> 		chip-&gt;mode = 0; /* automatic */</div><div class='del'>-		if (desc-&gt;checkmode) {</div><div class='add'>+		if (desc-&gt;checkmode &amp;&amp; desc-&gt;setmode) {</div><div class='ctx'> 			desc-&gt;setmode(chip,V4L2_TUNER_MODE_MONO);</div><div class='ctx'> 			if (chip-&gt;prevmode != V4L2_TUNER_MODE_MONO)</div><div class='ctx'> 				chip-&gt;prevmode = -1; /* reset previous mode */</div><div class='head'>diff --git a/drivers/media/video/tveeprom.c b/drivers/media/video/tveeprom.c<br/>index bcc32fa92a81..3b0b84c2e451 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/tveeprom.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/tveeprom.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/tveeprom.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/tveeprom.c</a></div><div class='hunk'>@@ -242,7 +242,7 @@ hauppauge_tuner[] =</div><div class='ctx'> 	{ TUNER_ABSENT,        		"TCL M2523_3DBH_E"},</div><div class='ctx'> 	{ TUNER_ABSENT,        		"TCL M2523_3DIH_E"},</div><div class='ctx'> 	{ TUNER_ABSENT,        		"TCL MFPE05_2_U"},</div><div class='del'>-	{ TUNER_PHILIPS_FMD1216ME_MK3,	"Philips FMD1216MEX"},</div><div class='add'>+	{ TUNER_PHILIPS_FMD1216MEX_MK3,	"Philips FMD1216MEX"},</div><div class='ctx'> 	{ TUNER_ABSENT,        		"Philips FRH2036B"},</div><div class='ctx'> 	{ TUNER_ABSENT,        		"Panasonic ENGF75_01GF"},</div><div class='ctx'> 	{ TUNER_ABSENT,        		"MaxLinear MXL5005"},</div><div class='head'>diff --git a/drivers/media/video/usbvideo/ibmcam.c b/drivers/media/video/usbvideo/ibmcam.c<br/>index cc27efe121dd..28421d386f1e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/usbvideo/ibmcam.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/usbvideo/ibmcam.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/usbvideo/ibmcam.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/usbvideo/ibmcam.c</a></div><div class='hunk'>@@ -258,7 +258,9 @@ static enum ParseState ibmcam_find_header(struct uvd *uvd) /* FIXME: Add frame h</div><div class='ctx'> 			    (RING_QUEUE_PEEK(&amp;uvd-&gt;dp, 2) == 0x00))</div><div class='ctx'> 			{</div><div class='ctx'> #if 0				/* This code helps to detect new frame markers */</div><div class='del'>-				info("Header sig: 00 FF 00 %02X", RING_QUEUE_PEEK(&amp;uvd-&gt;dp, 3));</div><div class='add'>+				dev_info(&amp;uvd-&gt;dev-&gt;dev,</div><div class='add'>+					 "Header sig: 00 FF 00 %02X\n",</div><div class='add'>+					 RING_QUEUE_PEEK(&amp;uvd-&gt;dp, 3));</div><div class='ctx'> #endif</div><div class='ctx'> 				frame-&gt;header = RING_QUEUE_PEEK(&amp;uvd-&gt;dp, 3);</div><div class='ctx'> 				if ((frame-&gt;header == HDRSIG_MODEL1_128x96) ||</div><div class='hunk'>@@ -266,7 +268,8 @@ static enum ParseState ibmcam_find_header(struct uvd *uvd) /* FIXME: Add frame h</div><div class='ctx'> 				    (frame-&gt;header == HDRSIG_MODEL1_352x288))</div><div class='ctx'> 				{</div><div class='ctx'> #if 0</div><div class='del'>-					info("Header found.");</div><div class='add'>+					dev_info(&amp;uvd-&gt;dev-&gt;dev,</div><div class='add'>+						 "Header found.\n");</div><div class='ctx'> #endif</div><div class='ctx'> 					RING_QUEUE_DEQUEUE_BYTES(&amp;uvd-&gt;dp, marker_len);</div><div class='ctx'> 					icam-&gt;has_hdr = 1;</div><div class='hunk'>@@ -295,7 +298,7 @@ case IBMCAM_MODEL_4:</div><div class='ctx'> 			    (RING_QUEUE_PEEK(&amp;uvd-&gt;dp, 1) == 0xFF))</div><div class='ctx'> 			{</div><div class='ctx'> #if 0</div><div class='del'>-				info("Header found.");</div><div class='add'>+				dev_info(&amp;uvd-&gt;dev-&gt;dev, "Header found.\n");</div><div class='ctx'> #endif</div><div class='ctx'> 				RING_QUEUE_DEQUEUE_BYTES(&amp;uvd-&gt;dp, marker_len);</div><div class='ctx'> 				icam-&gt;has_hdr = 1;</div><div class='hunk'>@@ -338,7 +341,7 @@ case IBMCAM_MODEL_4:</div><div class='ctx'> 				byte4 = RING_QUEUE_PEEK(&amp;uvd-&gt;dp, 3);</div><div class='ctx'> 				frame-&gt;header = (byte3 &lt;&lt; 8) | byte4;</div><div class='ctx'> #if 0</div><div class='del'>-				info("Header found.");</div><div class='add'>+				dev_info(&amp;uvd-&gt;dev-&gt;dev, "Header found.\n");</div><div class='ctx'> #endif</div><div class='ctx'> 				RING_QUEUE_DEQUEUE_BYTES(&amp;uvd-&gt;dp, marker_len);</div><div class='ctx'> 				icam-&gt;has_hdr = 1;</div><div class='hunk'>@@ -354,7 +357,8 @@ case IBMCAM_MODEL_4:</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!icam-&gt;has_hdr) {</div><div class='ctx'> 		if (uvd-&gt;debug &gt; 2)</div><div class='del'>-			info("Skipping frame, no header");</div><div class='add'>+			dev_info(&amp;uvd-&gt;dev-&gt;dev,</div><div class='add'>+				 "Skipping frame, no header\n");</div><div class='ctx'> 		return scan_EndParse;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -881,7 +885,9 @@ static enum ParseState ibmcam_model3_parse_lines(</div><div class='ctx'> 	 */</div><div class='ctx'> 	if ((frame-&gt;curline + 1) &gt;= data_h) {</div><div class='ctx'> 		if (uvd-&gt;debug &gt;= 3)</div><div class='del'>-			info("Reached line %d. (frame is done)", frame-&gt;curline);</div><div class='add'>+			dev_info(&amp;uvd-&gt;dev-&gt;dev,</div><div class='add'>+				 "Reached line %d. (frame is done)\n",</div><div class='add'>+				 frame-&gt;curline);</div><div class='ctx'> 		return scan_NextFrame;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -954,8 +960,9 @@ static enum ParseState ibmcam_model3_parse_lines(</div><div class='ctx'> </div><div class='ctx'> 	if (frame-&gt;curline &gt;= VIDEOSIZE_Y(frame-&gt;request)) {</div><div class='ctx'> 		if (uvd-&gt;debug &gt;= 3) {</div><div class='del'>-			info("All requested lines (%ld.) done.",</div><div class='del'>-			     VIDEOSIZE_Y(frame-&gt;request));</div><div class='add'>+			dev_info(&amp;uvd-&gt;dev-&gt;dev,</div><div class='add'>+				 "All requested lines (%ld.) done.\n",</div><div class='add'>+				 VIDEOSIZE_Y(frame-&gt;request));</div><div class='ctx'> 		}</div><div class='ctx'> 		return scan_NextFrame;</div><div class='ctx'> 	} else</div><div class='hunk'>@@ -1000,7 +1007,9 @@ static enum ParseState ibmcam_model4_128x96_parse_lines(</div><div class='ctx'> 	 */</div><div class='ctx'> 	if ((frame-&gt;curline + 1) &gt;= data_h) {</div><div class='ctx'> 		if (uvd-&gt;debug &gt;= 3)</div><div class='del'>-			info("Reached line %d. (frame is done)", frame-&gt;curline);</div><div class='add'>+			dev_info(&amp;uvd-&gt;dev-&gt;dev,</div><div class='add'>+				 "Reached line %d. (frame is done)\n",</div><div class='add'>+				 frame-&gt;curline);</div><div class='ctx'> 		return scan_NextFrame;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1049,8 +1058,9 @@ static enum ParseState ibmcam_model4_128x96_parse_lines(</div><div class='ctx'> </div><div class='ctx'> 	if (frame-&gt;curline &gt;= VIDEOSIZE_Y(frame-&gt;request)) {</div><div class='ctx'> 		if (uvd-&gt;debug &gt;= 3) {</div><div class='del'>-			info("All requested lines (%ld.) done.",</div><div class='del'>-			     VIDEOSIZE_Y(frame-&gt;request));</div><div class='add'>+			dev_info(&amp;uvd-&gt;dev-&gt;dev,</div><div class='add'>+				 "All requested lines (%ld.) done.\n",</div><div class='add'>+				 VIDEOSIZE_Y(frame-&gt;request));</div><div class='ctx'> 		}</div><div class='ctx'> 		return scan_NextFrame;</div><div class='ctx'> 	} else</div><div class='hunk'>@@ -1171,10 +1181,11 @@ static int ibmcam_veio(</div><div class='ctx'> 			sizeof(cp),</div><div class='ctx'> 			1000);</div><div class='ctx'> #if 0</div><div class='del'>-		info("USB =&gt; %02x%02x%02x%02x%02x%02x%02x%02x "</div><div class='del'>-		       "(req=$%02x val=$%04x ind=$%04x)",</div><div class='del'>-		       cp[0],cp[1],cp[2],cp[3],cp[4],cp[5],cp[6],cp[7],</div><div class='del'>-		       req, value, index);</div><div class='add'>+		dev_info(&amp;uvd-&gt;dev-&gt;dev,</div><div class='add'>+			 "USB =&gt; %02x%02x%02x%02x%02x%02x%02x%02x "</div><div class='add'>+			 "(req=$%02x val=$%04x ind=$%04x)\n",</div><div class='add'>+			 cp[0],cp[1],cp[2],cp[3],cp[4],cp[5],cp[6],cp[7],</div><div class='add'>+			 req, value, index);</div><div class='ctx'> #endif</div><div class='ctx'> 	} else {</div><div class='ctx'> 		i = usb_control_msg(</div><div class='hunk'>@@ -1449,10 +1460,9 @@ static void ibmcam_adjust_contrast(struct uvd *uvd)</div><div class='ctx'>  */</div><div class='ctx'> static void ibmcam_change_lighting_conditions(struct uvd *uvd)</div><div class='ctx'> {</div><div class='del'>-	static const char proc[] = "ibmcam_change_lighting_conditions";</div><div class='del'>-</div><div class='ctx'> 	if (debug &gt; 0)</div><div class='del'>-		info("%s: Set lighting to %hu.", proc, lighting);</div><div class='add'>+		dev_info(&amp;uvd-&gt;dev-&gt;dev,</div><div class='add'>+			 "%s: Set lighting to %hu.\n", __func__, lighting);</div><div class='ctx'> </div><div class='ctx'> 	switch (IBMCAM_T(uvd)-&gt;camera_model) {</div><div class='ctx'> 	case IBMCAM_MODEL_1:</div><div class='hunk'>@@ -1495,8 +1505,6 @@ static void ibmcam_change_lighting_conditions(struct uvd *uvd)</div><div class='ctx'>  */</div><div class='ctx'> static void ibmcam_set_sharpness(struct uvd *uvd)</div><div class='ctx'> {</div><div class='del'>-	static const char proc[] = "ibmcam_set_sharpness";</div><div class='del'>-</div><div class='ctx'> 	switch (IBMCAM_T(uvd)-&gt;camera_model) {</div><div class='ctx'> 	case IBMCAM_MODEL_1:</div><div class='ctx'> 	{</div><div class='hunk'>@@ -1505,7 +1513,8 @@ static void ibmcam_set_sharpness(struct uvd *uvd)</div><div class='ctx'> </div><div class='ctx'> 		RESTRICT_TO_RANGE(sharpness, SHARPNESS_MIN, SHARPNESS_MAX);</div><div class='ctx'> 		if (debug &gt; 0)</div><div class='del'>-			info("%s: Set sharpness to %hu.", proc, sharpness);</div><div class='add'>+			dev_info(&amp;uvd-&gt;dev-&gt;dev, "%s: Set sharpness to %hu.\n",</div><div class='add'>+				 __func__, sharpness);</div><div class='ctx'> </div><div class='ctx'> 		sv = sa[sharpness - SHARPNESS_MIN];</div><div class='ctx'> 		for (i=0; i &lt; 2; i++) {</div><div class='hunk'>@@ -1564,11 +1573,11 @@ static void ibmcam_set_sharpness(struct uvd *uvd)</div><div class='ctx'>  */</div><div class='ctx'> static void ibmcam_set_brightness(struct uvd *uvd)</div><div class='ctx'> {</div><div class='del'>-	static const char proc[] = "ibmcam_set_brightness";</div><div class='ctx'> 	static const unsigned short n = 1;</div><div class='ctx'> </div><div class='ctx'> 	if (debug &gt; 0)</div><div class='del'>-		info("%s: Set brightness to %hu.", proc, uvd-&gt;vpic.brightness);</div><div class='add'>+		dev_info(&amp;uvd-&gt;dev-&gt;dev, "%s: Set brightness to %hu.\n",</div><div class='add'>+			 __func__, uvd-&gt;vpic.brightness);</div><div class='ctx'> </div><div class='ctx'> 	switch (IBMCAM_T(uvd)-&gt;camera_model) {</div><div class='ctx'> 	case IBMCAM_MODEL_1:</div><div class='hunk'>@@ -2115,7 +2124,8 @@ static void ibmcam_model2_setup_after_video_if(struct uvd *uvd)</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (uvd-&gt;debug &gt; 0)</div><div class='del'>-			info("Framerate (hardware): %hd.", hw_fps);</div><div class='add'>+			dev_info(&amp;uvd-&gt;dev-&gt;dev, "Framerate (hardware): %hd.\n",</div><div class='add'>+				 hw_fps);</div><div class='ctx'> 		RESTRICT_TO_RANGE(hw_fps, 0, 31);</div><div class='ctx'> 		ibmcam_model2_Packet1(uvd, mod2_set_framerate, hw_fps);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3487,7 +3497,7 @@ static void ibmcam_model3_setup_after_video_if(struct uvd *uvd)</div><div class='ctx'> 	/* 01.01.08 - Added for RCA video in support -LO */</div><div class='ctx'> 	if(init_model3_input) {</div><div class='ctx'> 		if (debug &gt; 0)</div><div class='del'>-			info("Setting input to RCA.");</div><div class='add'>+			dev_info(&amp;uvd-&gt;dev-&gt;dev, "Setting input to RCA.\n");</div><div class='ctx'> 		for (i=0; i &lt; ARRAY_SIZE(initData); i++) {</div><div class='ctx'> 			ibmcam_veio(uvd, initData[i].req, initData[i].value, initData[i].index);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -3685,7 +3695,7 @@ static int ibmcam_probe(struct usb_interface *intf, const struct usb_device_id *</div><div class='ctx'> 	unsigned char video_ep = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (debug &gt;= 1)</div><div class='del'>-		info("ibmcam_probe(%p,%u.)", intf, ifnum);</div><div class='add'>+		dev_info(&amp;uvd-&gt;dev-&gt;dev, "ibmcam_probe(%p,%u.)\n", intf, ifnum);</div><div class='ctx'> </div><div class='ctx'> 	/* We don't handle multi-config cameras */</div><div class='ctx'> 	if (dev-&gt;descriptor.bNumConfigurations != 1)</div><div class='hunk'>@@ -3736,14 +3746,16 @@ static int ibmcam_probe(struct usb_interface *intf, const struct usb_device_id *</div><div class='ctx'> 			brand = "IBM PC Camera"; /* a.k.a. Xirlink C-It */</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		info("%s USB camera found (model %d, rev. 0x%04x)",</div><div class='del'>-		     brand, model, le16_to_cpu(dev-&gt;descriptor.bcdDevice));</div><div class='add'>+		dev_info(&amp;uvd-&gt;dev-&gt;dev,</div><div class='add'>+			 "%s USB camera found (model %d, rev. 0x%04x)\n",</div><div class='add'>+			 brand, model, le16_to_cpu(dev-&gt;descriptor.bcdDevice));</div><div class='ctx'> 	} while (0);</div><div class='ctx'> </div><div class='ctx'> 	/* Validate found interface: must have one ISO endpoint */</div><div class='ctx'> 	nas = intf-&gt;num_altsetting;</div><div class='ctx'> 	if (debug &gt; 0)</div><div class='del'>-		info("Number of alternate settings=%d.", nas);</div><div class='add'>+		dev_info(&amp;uvd-&gt;dev-&gt;dev, "Number of alternate settings=%d.\n",</div><div class='add'>+			 nas);</div><div class='ctx'> 	if (nas &lt; 2) {</div><div class='ctx'> 		err("Too few alternate settings for this camera!");</div><div class='ctx'> 		return -ENODEV;</div><div class='hunk'>@@ -3787,7 +3799,9 @@ static int ibmcam_probe(struct usb_interface *intf, const struct usb_device_id *</div><div class='ctx'> 				actInterface = i;</div><div class='ctx'> 				maxPS = le16_to_cpu(endpoint-&gt;wMaxPacketSize);</div><div class='ctx'> 				if (debug &gt; 0)</div><div class='del'>-					info("Active setting=%d. maxPS=%d.", i, maxPS);</div><div class='add'>+					dev_info(&amp;uvd-&gt;dev-&gt;dev,</div><div class='add'>+						 "Active setting=%d. "</div><div class='add'>+						 "maxPS=%d.\n", i, maxPS);</div><div class='ctx'> 			} else</div><div class='ctx'> 				err("More than one active alt. setting! Ignoring #%d.", i);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -3826,7 +3840,7 @@ static int ibmcam_probe(struct usb_interface *intf, const struct usb_device_id *</div><div class='ctx'> 			RESTRICT_TO_RANGE(framerate, 0, 5);</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='del'>-			info("IBM camera: using 320x240");</div><div class='add'>+			dev_info(&amp;uvd-&gt;dev-&gt;dev, "IBM camera: using 320x240\n");</div><div class='ctx'> 			size = SIZE_320x240;</div><div class='ctx'> 			/* No break here */</div><div class='ctx'> 		case SIZE_320x240:</div><div class='hunk'>@@ -3855,7 +3869,7 @@ static int ibmcam_probe(struct usb_interface *intf, const struct usb_device_id *</div><div class='ctx'> 			canvasY = 120;</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='del'>-			info("IBM NetCamera: using 176x144");</div><div class='add'>+			dev_info(&amp;uvd-&gt;dev-&gt;dev, "IBM NetCamera: using 176x144\n");</div><div class='ctx'> 			size = SIZE_176x144;</div><div class='ctx'> 			/* No break here */</div><div class='ctx'> 		case SIZE_176x144:</div><div class='head'>diff --git a/drivers/media/video/usbvideo/konicawc.c b/drivers/media/video/usbvideo/konicawc.c<br/>index 1c180284ec6c..da27a5287983 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/usbvideo/konicawc.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/usbvideo/konicawc.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/usbvideo/konicawc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/usbvideo/konicawc.c</a></div><div class='hunk'>@@ -229,7 +229,8 @@ static void konicawc_register_input(struct konicawc *cam, struct usb_device *dev</div><div class='ctx'> </div><div class='ctx'> 	cam-&gt;input = input_dev = input_allocate_device();</div><div class='ctx'> 	if (!input_dev) {</div><div class='del'>-		warn("Not enough memory for camera's input device\n");</div><div class='add'>+		dev_warn(&amp;dev-&gt;dev,</div><div class='add'>+			 "Not enough memory for camera's input device\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -243,8 +244,9 @@ static void konicawc_register_input(struct konicawc *cam, struct usb_device *dev</div><div class='ctx'> </div><div class='ctx'> 	error = input_register_device(cam-&gt;input);</div><div class='ctx'> 	if (error) {</div><div class='del'>-		warn("Failed to register camera's input device, err: %d\n",</div><div class='del'>-		     error);</div><div class='add'>+		dev_warn(&amp;dev-&gt;dev,</div><div class='add'>+			 "Failed to register camera's input device, err: %d\n",</div><div class='add'>+			 error);</div><div class='ctx'> 		input_free_device(cam-&gt;input);</div><div class='ctx'> 		cam-&gt;input = NULL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -337,7 +339,8 @@ static int konicawc_compress_iso(struct uvd *uvd, struct urb *dataurb, struct ur</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if((sts &gt; 0x01) &amp;&amp; (sts &lt; 0x80)) {</div><div class='del'>-			info("unknown status %2.2x", sts);</div><div class='add'>+			dev_info(&amp;uvd-&gt;dev-&gt;dev, "unknown status %2.2x\n",</div><div class='add'>+				 sts);</div><div class='ctx'> 			bad++;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -568,8 +571,12 @@ static void konicawc_process_isoc(struct uvd *uvd, struct usbvideo_frame *frame)</div><div class='ctx'> 					fdrops = (0x80 + curframe - cam-&gt;lastframe) &amp; 0x7F;</div><div class='ctx'> 					fdrops--;</div><div class='ctx'> 					if(fdrops) {</div><div class='del'>-						info("Dropped %d frames (%d -&gt; %d)", fdrops,</div><div class='del'>-						     cam-&gt;lastframe, curframe);</div><div class='add'>+						dev_info(&amp;uvd-&gt;dev-&gt;dev,</div><div class='add'>+							 "Dropped %d frames "</div><div class='add'>+							 "(%d -&gt; %d)\n",</div><div class='add'>+							 fdrops,</div><div class='add'>+							 cam-&gt;lastframe,</div><div class='add'>+							 curframe);</div><div class='ctx'> 					}</div><div class='ctx'> 				}</div><div class='ctx'> 				cam-&gt;lastframe = curframe;</div><div class='hunk'>@@ -784,7 +791,8 @@ static int konicawc_probe(struct usb_interface *intf, const struct usb_device_id</div><div class='ctx'> 	if (dev-&gt;descriptor.bNumConfigurations != 1)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	info("Konica Webcam (rev. 0x%04x)", le16_to_cpu(dev-&gt;descriptor.bcdDevice));</div><div class='add'>+	dev_info(&amp;intf-&gt;dev, "Konica Webcam (rev. 0x%04x)\n",</div><div class='add'>+		 le16_to_cpu(dev-&gt;descriptor.bcdDevice));</div><div class='ctx'> 	RESTRICT_TO_RANGE(speed, 0, MAX_SPEED);</div><div class='ctx'> </div><div class='ctx'> 	/* Validate found interface: must have one ISO endpoint */</div><div class='hunk'>@@ -925,7 +933,8 @@ static struct usb_device_id id_table[] = {</div><div class='ctx'> static int __init konicawc_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct usbvideo_cb cbTbl;</div><div class='del'>-	info(DRIVER_DESC " " DRIVER_VERSION);</div><div class='add'>+	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"</div><div class='add'>+	       DRIVER_DESC "\n");</div><div class='ctx'> 	memset(&amp;cbTbl, 0, sizeof(cbTbl));</div><div class='ctx'> 	cbTbl.probe = konicawc_probe;</div><div class='ctx'> 	cbTbl.setupOnOpen = konicawc_setup_on_open;</div><div class='head'>diff --git a/drivers/media/video/usbvideo/quickcam_messenger.c b/drivers/media/video/usbvideo/quickcam_messenger.c<br/>index 3d26a30abe1e..4459b8a7f818 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/usbvideo/quickcam_messenger.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/usbvideo/quickcam_messenger.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/usbvideo/quickcam_messenger.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/usbvideo/quickcam_messenger.c</a></div><div class='hunk'>@@ -93,7 +93,7 @@ static void qcm_register_input(struct qcm *cam, struct usb_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	cam-&gt;input = input_dev = input_allocate_device();</div><div class='ctx'> 	if (!input_dev) {</div><div class='del'>-		warn("insufficient mem for cam input device");</div><div class='add'>+		dev_warn(&amp;dev-&gt;dev, "insufficient mem for cam input device\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -107,8 +107,9 @@ static void qcm_register_input(struct qcm *cam, struct usb_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	error = input_register_device(cam-&gt;input);</div><div class='ctx'> 	if (error) {</div><div class='del'>-		warn("Failed to register camera's input device, err: %d\n",</div><div class='del'>-		     error);</div><div class='add'>+		dev_warn(&amp;dev-&gt;dev,</div><div class='add'>+			 "Failed to register camera's input device, err: %d\n",</div><div class='add'>+			 error);</div><div class='ctx'> 		input_free_device(cam-&gt;input);</div><div class='ctx'> 		cam-&gt;input = NULL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -587,8 +588,9 @@ static int qcm_compress_iso(struct uvd *uvd, struct urb *dataurb)</div><div class='ctx'> 			dataurb-&gt;iso_frame_desc[i].offset;</div><div class='ctx'> </div><div class='ctx'> 		if (st &lt; 0) {</div><div class='del'>-			warn("Data error: packet=%d. len=%d. status=%d.",</div><div class='del'>-			      i, n, st);</div><div class='add'>+			dev_warn(&amp;uvd-&gt;dev-&gt;dev,</div><div class='add'>+				 "Data error: packet=%d. len=%d. status=%d.\n",</div><div class='add'>+				 i, n, st);</div><div class='ctx'> 			uvd-&gt;stats.iso_err_count++;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -699,7 +701,7 @@ static void qcm_stop_data(struct uvd *uvd)</div><div class='ctx'> </div><div class='ctx'> 	ret = qcm_camera_off(uvd);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		warn("couldn't turn the cam off.");</div><div class='add'>+		dev_warn(&amp;uvd-&gt;dev-&gt;dev, "couldn't turn the cam off.\n");</div><div class='ctx'> </div><div class='ctx'> 	uvd-&gt;streaming = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1080,7 +1082,8 @@ static struct usbvideo_cb qcm_driver = {</div><div class='ctx'> </div><div class='ctx'> static int __init qcm_init(void)</div><div class='ctx'> {</div><div class='del'>-	info(DRIVER_DESC " " DRIVER_VERSION);</div><div class='add'>+	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"</div><div class='add'>+	       DRIVER_DESC "\n");</div><div class='ctx'> </div><div class='ctx'> 	return usbvideo_register(</div><div class='ctx'> 		&amp;cams,</div><div class='head'>diff --git a/drivers/media/video/usbvideo/ultracam.c b/drivers/media/video/usbvideo/ultracam.c<br/>index 9544e644bf0d..9714baab7833 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/usbvideo/ultracam.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/usbvideo/ultracam.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/usbvideo/ultracam.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/usbvideo/ultracam.c</a></div><div class='hunk'>@@ -156,10 +156,11 @@ static int ultracam_veio(</div><div class='ctx'> 			sizeof(cp),</div><div class='ctx'> 			1000);</div><div class='ctx'> #if 1</div><div class='del'>-		info("USB =&gt; %02x%02x%02x%02x%02x%02x%02x%02x "</div><div class='del'>-		       "(req=$%02x val=$%04x ind=$%04x)",</div><div class='del'>-		       cp[0],cp[1],cp[2],cp[3],cp[4],cp[5],cp[6],cp[7],</div><div class='del'>-		       req, value, index);</div><div class='add'>+		dev_info(&amp;uvd-&gt;dev-&gt;dev,</div><div class='add'>+			 "USB =&gt; %02x%02x%02x%02x%02x%02x%02x%02x "</div><div class='add'>+			 "(req=$%02x val=$%04x ind=$%04x)\n",</div><div class='add'>+			 cp[0],cp[1],cp[2],cp[3],cp[4],cp[5],cp[6],cp[7],</div><div class='add'>+			 req, value, index);</div><div class='ctx'> #endif</div><div class='ctx'> 	} else {</div><div class='ctx'> 		i = usb_control_msg(</div><div class='hunk'>@@ -517,19 +518,20 @@ static int ultracam_probe(struct usb_interface *intf, const struct usb_device_id</div><div class='ctx'> 	unsigned char video_ep = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (debug &gt;= 1)</div><div class='del'>-		info("ultracam_probe(%p)", intf);</div><div class='add'>+		dev_info(&amp;intf-&gt;dev, "ultracam_probe\n");</div><div class='ctx'> </div><div class='ctx'> 	/* We don't handle multi-config cameras */</div><div class='ctx'> 	if (dev-&gt;descriptor.bNumConfigurations != 1)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	info("IBM Ultra camera found (rev. 0x%04x)",</div><div class='del'>-		le16_to_cpu(dev-&gt;descriptor.bcdDevice));</div><div class='add'>+	dev_info(&amp;intf-&gt;dev, "IBM Ultra camera found (rev. 0x%04x)\n",</div><div class='add'>+		 le16_to_cpu(dev-&gt;descriptor.bcdDevice));</div><div class='ctx'> </div><div class='ctx'> 	/* Validate found interface: must have one ISO endpoint */</div><div class='ctx'> 	nas = intf-&gt;num_altsetting;</div><div class='ctx'> 	if (debug &gt; 0)</div><div class='del'>-		info("Number of alternate settings=%d.", nas);</div><div class='add'>+		dev_info(&amp;intf-&gt;dev, "Number of alternate settings=%d.\n",</div><div class='add'>+			 nas);</div><div class='ctx'> 	if (nas &lt; 8) {</div><div class='ctx'> 		err("Too few alternate settings for this camera!");</div><div class='ctx'> 		return -ENODEV;</div><div class='hunk'>@@ -576,7 +578,9 @@ static int ultracam_probe(struct usb_interface *intf, const struct usb_device_id</div><div class='ctx'> 				actInterface = i;</div><div class='ctx'> 				maxPS = le16_to_cpu(endpoint-&gt;wMaxPacketSize);</div><div class='ctx'> 				if (debug &gt; 0)</div><div class='del'>-					info("Active setting=%d. maxPS=%d.", i, maxPS);</div><div class='add'>+					dev_info(&amp;intf-&gt;dev,</div><div class='add'>+						 "Active setting=%d. "</div><div class='add'>+						 "maxPS=%d.\n", i, maxPS);</div><div class='ctx'> 			} else {</div><div class='ctx'> 				/* Got another active alt. setting */</div><div class='ctx'> 				if (maxPS &lt; le16_to_cpu(endpoint-&gt;wMaxPacketSize)) {</div><div class='hunk'>@@ -584,8 +588,11 @@ static int ultracam_probe(struct usb_interface *intf, const struct usb_device_id</div><div class='ctx'> 					actInterface = i;</div><div class='ctx'> 					maxPS = le16_to_cpu(endpoint-&gt;wMaxPacketSize);</div><div class='ctx'> 					if (debug &gt; 0) {</div><div class='del'>-						info("Even better ctive setting=%d. maxPS=%d.",</div><div class='del'>-						     i, maxPS);</div><div class='add'>+						dev_info(&amp;intf-&gt;dev,</div><div class='add'>+							 "Even better ctive "</div><div class='add'>+							 "setting=%d. "</div><div class='add'>+							 "maxPS=%d.\n",</div><div class='add'>+							 i, maxPS);</div><div class='ctx'> 					}</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='head'>diff --git a/drivers/media/video/usbvideo/usbvideo.c b/drivers/media/video/usbvideo/usbvideo.c<br/>index bf1bc2f69b02..07cd87d16f69 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/usbvideo/usbvideo.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/usbvideo/usbvideo.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/usbvideo/usbvideo.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/usbvideo/usbvideo.c</a></div><div class='hunk'>@@ -468,8 +468,9 @@ static void usbvideo_ReportStatistics(const struct uvd *uvd)</div><div class='ctx'> 			percent = (100 * goodPackets) / allPackets;</div><div class='ctx'> 		else</div><div class='ctx'> 			percent = goodPackets / (allPackets / 100);</div><div class='del'>-		info("Packet Statistics: Total=%lu. Empty=%lu. Usage=%lu%%",</div><div class='del'>-		     allPackets, badPackets, percent);</div><div class='add'>+		dev_info(&amp;uvd-&gt;dev-&gt;dev,</div><div class='add'>+			 "Packet Statistics: Total=%lu. Empty=%lu. Usage=%lu%%\n",</div><div class='add'>+			 allPackets, badPackets, percent);</div><div class='ctx'> 		if (uvd-&gt;iso_packet_len &gt; 0) {</div><div class='ctx'> 			unsigned long allBytes, xferBytes;</div><div class='ctx'> 			char multiplier = ' ';</div><div class='hunk'>@@ -497,8 +498,9 @@ static void usbvideo_ReportStatistics(const struct uvd *uvd)</div><div class='ctx'> 					}</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='del'>-			info("Transfer Statistics: Transferred=%lu%cB Usage=%lu%%",</div><div class='del'>-			     xferBytes, multiplier, percent);</div><div class='add'>+			dev_info(&amp;uvd-&gt;dev-&gt;dev,</div><div class='add'>+				 "Transfer Statistics: Transferred=%lu%cB Usage=%lu%%\n",</div><div class='add'>+				 xferBytes, multiplier, percent);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -545,7 +547,7 @@ void usbvideo_TestPattern(struct uvd *uvd, int fullframe, int pmode)</div><div class='ctx'> 	{	/* For debugging purposes only */</div><div class='ctx'> 		char tmp[20];</div><div class='ctx'> 		usbvideo_VideosizeToString(tmp, sizeof(tmp), frame-&gt;request);</div><div class='del'>-		info("testpattern: frame=%s", tmp);</div><div class='add'>+		dev_info(&amp;uvd-&gt;dev-&gt;dev, "testpattern: frame=%s\n", tmp);</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> 	/* Form every scan line */</div><div class='hunk'>@@ -854,7 +856,7 @@ static void usbvideo_Disconnect(struct usb_interface *intf)</div><div class='ctx'> </div><div class='ctx'> 	usbvideo_ClientIncModCount(uvd);</div><div class='ctx'> 	if (uvd-&gt;debug &gt; 0)</div><div class='del'>-		info("%s(%p.)", __func__, intf);</div><div class='add'>+		dev_info(&amp;intf-&gt;dev, "%s(%p.)\n", __func__, intf);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;uvd-&gt;lock);</div><div class='ctx'> 	uvd-&gt;remove_pending = 1; /* Now all ISO data will be ignored */</div><div class='hunk'>@@ -870,14 +872,15 @@ static void usbvideo_Disconnect(struct usb_interface *intf)</div><div class='ctx'> </div><div class='ctx'> 	video_unregister_device(&amp;uvd-&gt;vdev);</div><div class='ctx'> 	if (uvd-&gt;debug &gt; 0)</div><div class='del'>-		info("%s: Video unregistered.", __func__);</div><div class='add'>+		dev_info(&amp;intf-&gt;dev, "%s: Video unregistered.\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	if (uvd-&gt;user)</div><div class='del'>-		info("%s: In use, disconnect pending.", __func__);</div><div class='add'>+		dev_info(&amp;intf-&gt;dev, "%s: In use, disconnect pending.\n",</div><div class='add'>+			 __func__);</div><div class='ctx'> 	else</div><div class='ctx'> 		usbvideo_CameraRelease(uvd);</div><div class='ctx'> 	mutex_unlock(&amp;uvd-&gt;lock);</div><div class='del'>-	info("USB camera disconnected.");</div><div class='add'>+	dev_info(&amp;intf-&gt;dev, "USB camera disconnected.\n");</div><div class='ctx'> </div><div class='ctx'> 	usbvideo_ClientDecModCount(uvd);</div><div class='ctx'> }</div><div class='hunk'>@@ -1015,14 +1018,17 @@ int usbvideo_RegisterVideoDevice(struct uvd *uvd)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (uvd-&gt;video_endp == 0) {</div><div class='del'>-		info("%s: No video endpoint specified; data pump disabled.", __func__);</div><div class='add'>+		dev_info(&amp;uvd-&gt;dev-&gt;dev,</div><div class='add'>+			 "%s: No video endpoint specified; data pump disabled.\n",</div><div class='add'>+			 __func__);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (uvd-&gt;paletteBits == 0) {</div><div class='ctx'> 		err("%s: No palettes specified!", __func__);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (uvd-&gt;defaultPalette == 0) {</div><div class='del'>-		info("%s: No default palette!", __func__);</div><div class='add'>+		dev_info(&amp;uvd-&gt;dev-&gt;dev, "%s: No default palette!\n",</div><div class='add'>+			 __func__);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	uvd-&gt;max_frame_size = VIDEOSIZE_X(uvd-&gt;canvas) *</div><div class='hunk'>@@ -1031,25 +1037,29 @@ int usbvideo_RegisterVideoDevice(struct uvd *uvd)</div><div class='ctx'> 	usbvideo_VideosizeToString(tmp2, sizeof(tmp2), uvd-&gt;canvas);</div><div class='ctx'> </div><div class='ctx'> 	if (uvd-&gt;debug &gt; 0) {</div><div class='del'>-		info("%s: iface=%d. endpoint=$%02x paletteBits=$%08lx",</div><div class='del'>-		     __func__, uvd-&gt;iface, uvd-&gt;video_endp, uvd-&gt;paletteBits);</div><div class='add'>+		dev_info(&amp;uvd-&gt;dev-&gt;dev,</div><div class='add'>+			 "%s: iface=%d. endpoint=$%02x paletteBits=$%08lx\n",</div><div class='add'>+			 __func__, uvd-&gt;iface, uvd-&gt;video_endp,</div><div class='add'>+			 uvd-&gt;paletteBits);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (uvd-&gt;dev == NULL) {</div><div class='ctx'> 		err("%s: uvd-&gt;dev == NULL", __func__);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	uvd-&gt;vdev.parent = &amp;uvd-&gt;dev-&gt;dev;</div><div class='del'>-	if (video_register_device(&amp;uvd-&gt;vdev, VFL_TYPE_GRABBER, video_nr) == -1) {</div><div class='add'>+	uvd-&gt;vdev.release = video_device_release_empty;</div><div class='add'>+	if (video_register_device(&amp;uvd-&gt;vdev, VFL_TYPE_GRABBER, video_nr) &lt; 0) {</div><div class='ctx'> 		err("%s: video_register_device failed", __func__);</div><div class='ctx'> 		return -EPIPE;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (uvd-&gt;debug &gt; 1) {</div><div class='del'>-		info("%s: video_register_device() successful", __func__);</div><div class='add'>+		dev_info(&amp;uvd-&gt;dev-&gt;dev,</div><div class='add'>+			 "%s: video_register_device() successful\n", __func__);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	info("%s on /dev/video%d: canvas=%s videosize=%s",</div><div class='del'>-	     (uvd-&gt;handle != NULL) ? uvd-&gt;handle-&gt;drvName : "???",</div><div class='del'>-	     uvd-&gt;vdev.minor, tmp2, tmp1);</div><div class='add'>+	dev_info(&amp;uvd-&gt;dev-&gt;dev, "%s on /dev/video%d: canvas=%s videosize=%s\n",</div><div class='add'>+		 (uvd-&gt;handle != NULL) ? uvd-&gt;handle-&gt;drvName : "???",</div><div class='add'>+		 uvd-&gt;vdev.minor, tmp2, tmp1);</div><div class='ctx'> </div><div class='ctx'> 	usb_get_dev(uvd-&gt;dev);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1111,7 +1121,7 @@ static int usbvideo_v4l_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	int i, errCode = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (uvd-&gt;debug &gt; 1)</div><div class='del'>-		info("%s($%p)", __func__, dev);</div><div class='add'>+		dev_info(&amp;uvd-&gt;dev-&gt;dev, "%s($%p)\n", __func__, dev);</div><div class='ctx'> </div><div class='ctx'> 	if (0 &lt; usbvideo_ClientIncModCount(uvd))</div><div class='ctx'> 		return -ENODEV;</div><div class='hunk'>@@ -1178,19 +1188,25 @@ static int usbvideo_v4l_open(struct inode *inode, struct file *file)</div><div class='ctx'> 		if (errCode == 0) {</div><div class='ctx'> 			if (VALID_CALLBACK(uvd, setupOnOpen)) {</div><div class='ctx'> 				if (uvd-&gt;debug &gt; 1)</div><div class='del'>-					info("%s: setupOnOpen callback", __func__);</div><div class='add'>+					dev_info(&amp;uvd-&gt;dev-&gt;dev,</div><div class='add'>+						 "%s: setupOnOpen callback\n",</div><div class='add'>+						 __func__);</div><div class='ctx'> 				errCode = GET_CALLBACK(uvd, setupOnOpen)(uvd);</div><div class='ctx'> 				if (errCode &lt; 0) {</div><div class='ctx'> 					err("%s: setupOnOpen callback failed (%d.).",</div><div class='ctx'> 					    __func__, errCode);</div><div class='ctx'> 				} else if (uvd-&gt;debug &gt; 1) {</div><div class='del'>-					info("%s: setupOnOpen callback successful", __func__);</div><div class='add'>+					dev_info(&amp;uvd-&gt;dev-&gt;dev,</div><div class='add'>+						 "%s: setupOnOpen callback successful\n",</div><div class='add'>+						 __func__);</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='ctx'> 			if (errCode == 0) {</div><div class='ctx'> 				uvd-&gt;settingsAdjusted = 0;</div><div class='ctx'> 				if (uvd-&gt;debug &gt; 1)</div><div class='del'>-					info("%s: Open succeeded.", __func__);</div><div class='add'>+					dev_info(&amp;uvd-&gt;dev-&gt;dev,</div><div class='add'>+						 "%s: Open succeeded.\n",</div><div class='add'>+						 __func__);</div><div class='ctx'> 				uvd-&gt;user++;</div><div class='ctx'> 				file-&gt;private_data = uvd;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -1200,7 +1216,8 @@ static int usbvideo_v4l_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	if (errCode != 0)</div><div class='ctx'> 		usbvideo_ClientDecModCount(uvd);</div><div class='ctx'> 	if (uvd-&gt;debug &gt; 0)</div><div class='del'>-		info("%s: Returning %d.", __func__, errCode);</div><div class='add'>+		dev_info(&amp;uvd-&gt;dev-&gt;dev, "%s: Returning %d.\n", __func__,</div><div class='add'>+			 errCode);</div><div class='ctx'> 	return errCode;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1223,7 +1240,7 @@ static int usbvideo_v4l_close(struct inode *inode, struct file *file)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (uvd-&gt;debug &gt; 1)</div><div class='del'>-		info("%s($%p)", __func__, dev);</div><div class='add'>+		dev_info(&amp;uvd-&gt;dev-&gt;dev, "%s($%p)\n", __func__, dev);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;uvd-&gt;lock);</div><div class='ctx'> 	GET_CALLBACK(uvd, stopDataPump)(uvd);</div><div class='hunk'>@@ -1243,14 +1260,15 @@ static int usbvideo_v4l_close(struct inode *inode, struct file *file)</div><div class='ctx'> 	uvd-&gt;user--;</div><div class='ctx'> 	if (uvd-&gt;remove_pending) {</div><div class='ctx'> 		if (uvd-&gt;debug &gt; 0)</div><div class='del'>-			info("usbvideo_v4l_close: Final disconnect.");</div><div class='add'>+			dev_info(&amp;uvd-&gt;dev-&gt;dev, "%s: Final disconnect.\n",</div><div class='add'>+				 __func__);</div><div class='ctx'> 		usbvideo_CameraRelease(uvd);</div><div class='ctx'> 	}</div><div class='ctx'> 	mutex_unlock(&amp;uvd-&gt;lock);</div><div class='ctx'> 	usbvideo_ClientDecModCount(uvd);</div><div class='ctx'> </div><div class='ctx'> 	if (uvd-&gt;debug &gt; 1)</div><div class='del'>-		info("%s: Completed.", __func__);</div><div class='add'>+		dev_info(&amp;uvd-&gt;dev-&gt;dev, "%s: Completed.\n", __func__);</div><div class='ctx'> 	file-&gt;private_data = NULL;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1364,8 +1382,9 @@ static int usbvideo_v4l_do_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 			struct video_mmap *vm = arg;</div><div class='ctx'> </div><div class='ctx'> 			if (uvd-&gt;debug &gt;= 1) {</div><div class='del'>-				info("VIDIOCMCAPTURE: frame=%d. size=%dx%d, format=%d.",</div><div class='del'>-				     vm-&gt;frame, vm-&gt;width, vm-&gt;height, vm-&gt;format);</div><div class='add'>+				dev_info(&amp;uvd-&gt;dev-&gt;dev,</div><div class='add'>+					 "VIDIOCMCAPTURE: frame=%d. size=%dx%d, format=%d.\n",</div><div class='add'>+					 vm-&gt;frame, vm-&gt;width, vm-&gt;height, vm-&gt;format);</div><div class='ctx'> 			}</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Check if the requested size is supported. If the requestor</div><div class='hunk'>@@ -1383,18 +1402,24 @@ static int usbvideo_v4l_do_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 			if ((vm-&gt;width &gt; VIDEOSIZE_X(uvd-&gt;canvas)) ||</div><div class='ctx'> 			    (vm-&gt;height &gt; VIDEOSIZE_Y(uvd-&gt;canvas))) {</div><div class='ctx'> 				if (uvd-&gt;debug &gt; 0) {</div><div class='del'>-					info("VIDIOCMCAPTURE: Size=%dx%d too large; "</div><div class='del'>-					     "allowed only up to %ldx%ld", vm-&gt;width, vm-&gt;height,</div><div class='del'>-					     VIDEOSIZE_X(uvd-&gt;canvas), VIDEOSIZE_Y(uvd-&gt;canvas));</div><div class='add'>+					dev_info(&amp;uvd-&gt;dev-&gt;dev,</div><div class='add'>+						 "VIDIOCMCAPTURE: Size=%dx%d "</div><div class='add'>+						 "too large; allowed only up "</div><div class='add'>+						 "to %ldx%ld\n", vm-&gt;width,</div><div class='add'>+						 vm-&gt;height,</div><div class='add'>+						 VIDEOSIZE_X(uvd-&gt;canvas),</div><div class='add'>+						 VIDEOSIZE_Y(uvd-&gt;canvas));</div><div class='ctx'> 				}</div><div class='ctx'> 				return -EINVAL;</div><div class='ctx'> 			}</div><div class='ctx'> 			/* Check if the palette is supported */</div><div class='ctx'> 			if (((1L &lt;&lt; vm-&gt;format) &amp; uvd-&gt;paletteBits) == 0) {</div><div class='ctx'> 				if (uvd-&gt;debug &gt; 0) {</div><div class='del'>-					info("VIDIOCMCAPTURE: format=%d. not supported"</div><div class='del'>-					     " (paletteBits=$%08lx)",</div><div class='del'>-					     vm-&gt;format, uvd-&gt;paletteBits);</div><div class='add'>+					dev_info(&amp;uvd-&gt;dev-&gt;dev,</div><div class='add'>+						 "VIDIOCMCAPTURE: format=%d. "</div><div class='add'>+						 "not supported "</div><div class='add'>+						 "(paletteBits=$%08lx)\n",</div><div class='add'>+						 vm-&gt;format, uvd-&gt;paletteBits);</div><div class='ctx'> 				}</div><div class='ctx'> 				return -EINVAL;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -1422,7 +1447,9 @@ static int usbvideo_v4l_do_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 				return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 			if (uvd-&gt;debug &gt;= 1)</div><div class='del'>-				info("VIDIOCSYNC: syncing to frame %d.", *frameNum);</div><div class='add'>+				dev_info(&amp;uvd-&gt;dev-&gt;dev,</div><div class='add'>+					 "VIDIOCSYNC: syncing to frame %d.\n",</div><div class='add'>+					 *frameNum);</div><div class='ctx'> 			if (uvd-&gt;flags &amp; FLAGS_NO_DECODING)</div><div class='ctx'> 				ret = usbvideo_GetFrame(uvd, *frameNum);</div><div class='ctx'> 			else if (VALID_CALLBACK(uvd, getFrame)) {</div><div class='hunk'>@@ -1504,7 +1531,9 @@ static ssize_t usbvideo_v4l_read(struct file *file, char __user *buf,</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	if (uvd-&gt;debug &gt;= 1)</div><div class='del'>-		info("%s: %Zd. bytes, noblock=%d.", __func__, count, noblock);</div><div class='add'>+		dev_info(&amp;uvd-&gt;dev-&gt;dev,</div><div class='add'>+			 "%s: %Zd. bytes, noblock=%d.\n",</div><div class='add'>+			 __func__, count, noblock);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;uvd-&gt;lock);</div><div class='ctx'> </div><div class='hunk'>@@ -1685,18 +1714,21 @@ static void usbvideo_IsocIrq(struct urb *urb)</div><div class='ctx'> 		return;</div><div class='ctx'> #if 0</div><div class='ctx'> 	if (urb-&gt;actual_length &gt; 0) {</div><div class='del'>-		info("urb=$%p status=%d. errcount=%d. length=%d.",</div><div class='del'>-		     urb, urb-&gt;status, urb-&gt;error_count, urb-&gt;actual_length);</div><div class='add'>+		dev_info(&amp;uvd-&gt;dev-&gt;dev,</div><div class='add'>+			 "urb=$%p status=%d. errcount=%d. length=%d.\n",</div><div class='add'>+			 urb, urb-&gt;status, urb-&gt;error_count,</div><div class='add'>+			 urb-&gt;actual_length);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		static int c = 0;</div><div class='ctx'> 		if (c++ % 100 == 0)</div><div class='del'>-			info("No Isoc data");</div><div class='add'>+			dev_info(&amp;uvd-&gt;dev-&gt;dev, "No Isoc data\n");</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	if (!uvd-&gt;streaming) {</div><div class='ctx'> 		if (uvd-&gt;debug &gt;= 1)</div><div class='del'>-			info("Not streaming, but interrupt!");</div><div class='add'>+			dev_info(&amp;uvd-&gt;dev-&gt;dev,</div><div class='add'>+				 "Not streaming, but interrupt!\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1741,7 +1773,7 @@ static int usbvideo_StartDataPump(struct uvd *uvd)</div><div class='ctx'> 	int i, errFlag;</div><div class='ctx'> </div><div class='ctx'> 	if (uvd-&gt;debug &gt; 1)</div><div class='del'>-		info("%s($%p)", __func__, uvd);</div><div class='add'>+		dev_info(&amp;uvd-&gt;dev-&gt;dev, "%s($%p)\n", __func__, uvd);</div><div class='ctx'> </div><div class='ctx'> 	if (!CAMERA_IS_OPERATIONAL(uvd)) {</div><div class='ctx'> 		err("%s: Camera is not operational", __func__);</div><div class='hunk'>@@ -1789,7 +1821,9 @@ static int usbvideo_StartDataPump(struct uvd *uvd)</div><div class='ctx'> </div><div class='ctx'> 	uvd-&gt;streaming = 1;</div><div class='ctx'> 	if (uvd-&gt;debug &gt; 1)</div><div class='del'>-		info("%s: streaming=1 video_endp=$%02x", __func__, uvd-&gt;video_endp);</div><div class='add'>+		dev_info(&amp;uvd-&gt;dev-&gt;dev,</div><div class='add'>+			 "%s: streaming=1 video_endp=$%02x\n", __func__,</div><div class='add'>+			 uvd-&gt;video_endp);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1811,14 +1845,14 @@ static void usbvideo_StopDataPump(struct uvd *uvd)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (uvd-&gt;debug &gt; 1)</div><div class='del'>-		info("%s($%p)", __func__, uvd);</div><div class='add'>+		dev_info(&amp;uvd-&gt;dev-&gt;dev, "%s($%p)\n", __func__, uvd);</div><div class='ctx'> </div><div class='ctx'> 	/* Unschedule all of the iso td's */</div><div class='ctx'> 	for (i=0; i &lt; USBVIDEO_NUMSBUF; i++) {</div><div class='ctx'> 		usb_kill_urb(uvd-&gt;sbuf[i].urb);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (uvd-&gt;debug &gt; 1)</div><div class='del'>-		info("%s: streaming=0", __func__);</div><div class='add'>+		dev_info(&amp;uvd-&gt;dev-&gt;dev, "%s: streaming=0\n", __func__);</div><div class='ctx'> 	uvd-&gt;streaming = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!uvd-&gt;remove_pending) {</div><div class='hunk'>@@ -1850,7 +1884,8 @@ static int usbvideo_NewFrame(struct uvd *uvd, int framenum)</div><div class='ctx'> 	int n;</div><div class='ctx'> </div><div class='ctx'> 	if (uvd-&gt;debug &gt; 1)</div><div class='del'>-		info("usbvideo_NewFrame($%p,%d.)", uvd, framenum);</div><div class='add'>+		dev_info(&amp;uvd-&gt;dev-&gt;dev, "usbvideo_NewFrame($%p,%d.)\n", uvd,</div><div class='add'>+			 framenum);</div><div class='ctx'> </div><div class='ctx'> 	/* If we're not grabbing a frame right now and the other frame is */</div><div class='ctx'> 	/*  ready to be grabbed into, then use it instead */</div><div class='hunk'>@@ -1955,12 +1990,14 @@ static int usbvideo_GetFrame(struct uvd *uvd, int frameNum)</div><div class='ctx'> 	struct usbvideo_frame *frame = &amp;uvd-&gt;frame[frameNum];</div><div class='ctx'> </div><div class='ctx'> 	if (uvd-&gt;debug &gt;= 2)</div><div class='del'>-		info("%s($%p,%d.)", __func__, uvd, frameNum);</div><div class='add'>+		dev_info(&amp;uvd-&gt;dev-&gt;dev, "%s($%p,%d.)\n", __func__, uvd,</div><div class='add'>+			 frameNum);</div><div class='ctx'> </div><div class='ctx'> 	switch (frame-&gt;frameState) {</div><div class='ctx'> 	case FrameState_Unused:</div><div class='ctx'> 		if (uvd-&gt;debug &gt;= 2)</div><div class='del'>-			info("%s: FrameState_Unused", __func__);</div><div class='add'>+			dev_info(&amp;uvd-&gt;dev-&gt;dev, "%s: FrameState_Unused\n",</div><div class='add'>+				 __func__);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	case FrameState_Ready:</div><div class='ctx'> 	case FrameState_Grabbing:</div><div class='hunk'>@@ -1970,7 +2007,9 @@ static int usbvideo_GetFrame(struct uvd *uvd, int frameNum)</div><div class='ctx'> 	redo:</div><div class='ctx'> 		if (!CAMERA_IS_OPERATIONAL(uvd)) {</div><div class='ctx'> 			if (uvd-&gt;debug &gt;= 2)</div><div class='del'>-				info("%s: Camera is not operational (1)", __func__);</div><div class='add'>+				dev_info(&amp;uvd-&gt;dev-&gt;dev,</div><div class='add'>+					 "%s: Camera is not operational (1)\n",</div><div class='add'>+					 __func__);</div><div class='ctx'> 			return -EIO;</div><div class='ctx'> 		}</div><div class='ctx'> 		ntries = 0;</div><div class='hunk'>@@ -1979,24 +2018,33 @@ static int usbvideo_GetFrame(struct uvd *uvd, int frameNum)</div><div class='ctx'> 			signalPending = signal_pending(current);</div><div class='ctx'> 			if (!CAMERA_IS_OPERATIONAL(uvd)) {</div><div class='ctx'> 				if (uvd-&gt;debug &gt;= 2)</div><div class='del'>-					info("%s: Camera is not operational (2)", __func__);</div><div class='add'>+					dev_info(&amp;uvd-&gt;dev-&gt;dev,</div><div class='add'>+						 "%s: Camera is not "</div><div class='add'>+						 "operational (2)\n", __func__);</div><div class='ctx'> 				return -EIO;</div><div class='ctx'> 			}</div><div class='ctx'> 			assert(uvd-&gt;fbuf != NULL);</div><div class='ctx'> 			if (signalPending) {</div><div class='ctx'> 				if (uvd-&gt;debug &gt;= 2)</div><div class='del'>-					info("%s: Signal=$%08x", __func__, signalPending);</div><div class='add'>+					dev_info(&amp;uvd-&gt;dev-&gt;dev,</div><div class='add'>+					"%s: Signal=$%08x\n", __func__,</div><div class='add'>+					signalPending);</div><div class='ctx'> 				if (uvd-&gt;flags &amp; FLAGS_RETRY_VIDIOCSYNC) {</div><div class='ctx'> 					usbvideo_TestPattern(uvd, 1, 0);</div><div class='ctx'> 					uvd-&gt;curframe = -1;</div><div class='ctx'> 					uvd-&gt;stats.frame_num++;</div><div class='ctx'> 					if (uvd-&gt;debug &gt;= 2)</div><div class='del'>-						info("%s: Forced test pattern screen", __func__);</div><div class='add'>+						dev_info(&amp;uvd-&gt;dev-&gt;dev,</div><div class='add'>+							 "%s: Forced test "</div><div class='add'>+							 "pattern screen\n",</div><div class='add'>+							 __func__);</div><div class='ctx'> 					return 0;</div><div class='ctx'> 				} else {</div><div class='ctx'> 					/* Standard answer: Interrupted! */</div><div class='ctx'> 					if (uvd-&gt;debug &gt;= 2)</div><div class='del'>-						info("%s: Interrupted!", __func__);</div><div class='add'>+						dev_info(&amp;uvd-&gt;dev-&gt;dev,</div><div class='add'>+							 "%s: Interrupted!\n",</div><div class='add'>+							 __func__);</div><div class='ctx'> 					return -EINTR;</div><div class='ctx'> 				}</div><div class='ctx'> 			} else {</div><div class='hunk'>@@ -2010,8 +2058,10 @@ static int usbvideo_GetFrame(struct uvd *uvd, int frameNum)</div><div class='ctx'> 			}</div><div class='ctx'> 		} while (frame-&gt;frameState == FrameState_Grabbing);</div><div class='ctx'> 		if (uvd-&gt;debug &gt;= 2) {</div><div class='del'>-			info("%s: Grabbing done; state=%d. (%lu. bytes)",</div><div class='del'>-			     __func__, frame-&gt;frameState, frame-&gt;seqRead_Length);</div><div class='add'>+			dev_info(&amp;uvd-&gt;dev-&gt;dev,</div><div class='add'>+				 "%s: Grabbing done; state=%d. (%lu. bytes)\n",</div><div class='add'>+				 __func__, frame-&gt;frameState,</div><div class='add'>+				 frame-&gt;seqRead_Length);</div><div class='ctx'> 		}</div><div class='ctx'> 		if (frame-&gt;frameState == FrameState_Error) {</div><div class='ctx'> 			int ret = usbvideo_NewFrame(uvd, frameNum);</div><div class='hunk'>@@ -2048,7 +2098,9 @@ static int usbvideo_GetFrame(struct uvd *uvd, int frameNum)</div><div class='ctx'> 		}</div><div class='ctx'> 		frame-&gt;frameState = FrameState_Done_Hold;</div><div class='ctx'> 		if (uvd-&gt;debug &gt;= 2)</div><div class='del'>-			info("%s: Entered FrameState_Done_Hold state.", __func__);</div><div class='add'>+			dev_info(&amp;uvd-&gt;dev-&gt;dev,</div><div class='add'>+				 "%s: Entered FrameState_Done_Hold state.\n",</div><div class='add'>+				 __func__);</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	case FrameState_Done_Hold:</div><div class='hunk'>@@ -2059,7 +2111,9 @@ static int usbvideo_GetFrame(struct uvd *uvd, int frameNum)</div><div class='ctx'> 		 * it will be released back into the wild to roam freely.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (uvd-&gt;debug &gt;= 2)</div><div class='del'>-			info("%s: FrameState_Done_Hold state.", __func__);</div><div class='add'>+			dev_info(&amp;uvd-&gt;dev-&gt;dev,</div><div class='add'>+				 "%s: FrameState_Done_Hold state.\n",</div><div class='add'>+				 __func__);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/usbvideo/vicam.c b/drivers/media/video/usbvideo/vicam.c<br/>index 2eb45829791c..7a127d6bfdee 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/usbvideo/vicam.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/usbvideo/vicam.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/usbvideo/vicam.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/usbvideo/vicam.c</a></div><div class='hunk'>@@ -472,9 +472,8 @@ vicam_ioctl(struct inode *inode, struct file *file, unsigned int ioctlnr, unsign</div><div class='ctx'> static int</div><div class='ctx'> vicam_open(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct vicam_camera *cam =</div><div class='del'>-	    (struct vicam_camera *) dev-&gt;priv;</div><div class='add'>+	struct vicam_camera *cam = video_drvdata(file);</div><div class='add'>+</div><div class='ctx'> 	DBG("open\n");</div><div class='ctx'> </div><div class='ctx'> 	if (!cam) {</div><div class='hunk'>@@ -488,20 +487,24 @@ vicam_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	 * rely on this fact forever.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='add'>+	lock_kernel();</div><div class='ctx'> 	if (cam-&gt;open_count &gt; 0) {</div><div class='ctx'> 		printk(KERN_INFO</div><div class='ctx'> 		       "vicam_open called on already opened camera");</div><div class='add'>+		unlock_kernel();</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	cam-&gt;raw_image = kmalloc(VICAM_MAX_READ_SIZE, GFP_KERNEL);</div><div class='ctx'> 	if (!cam-&gt;raw_image) {</div><div class='add'>+		unlock_kernel();</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	cam-&gt;framebuf = rvmalloc(VICAM_MAX_FRAME_SIZE * VICAM_FRAMES);</div><div class='ctx'> 	if (!cam-&gt;framebuf) {</div><div class='ctx'> 		kfree(cam-&gt;raw_image);</div><div class='add'>+		unlock_kernel();</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -509,6 +512,7 @@ vicam_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	if (!cam-&gt;cntrlbuf) {</div><div class='ctx'> 		kfree(cam-&gt;raw_image);</div><div class='ctx'> 		rvfree(cam-&gt;framebuf, VICAM_MAX_FRAME_SIZE * VICAM_FRAMES);</div><div class='add'>+		unlock_kernel();</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -526,6 +530,7 @@ vicam_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	cam-&gt;open_count++;</div><div class='ctx'> </div><div class='ctx'> 	file-&gt;private_data = cam;</div><div class='add'>+	unlock_kernel();</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -795,6 +800,7 @@ static struct video_device vicam_template = {</div><div class='ctx'> 	.name 		= "ViCam-based USB Camera",</div><div class='ctx'> 	.fops 		= &amp;vicam_fops,</div><div class='ctx'> 	.minor 		= -1,</div><div class='add'>+	.release 	= video_device_release_empty,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* table of devices that work with this driver */</div><div class='hunk'>@@ -859,9 +865,8 @@ vicam_probe( struct usb_interface *intf, const struct usb_device_id *id)</div><div class='ctx'> </div><div class='ctx'> 	mutex_init(&amp;cam-&gt;cam_lock);</div><div class='ctx'> </div><div class='del'>-	memcpy(&amp;cam-&gt;vdev, &amp;vicam_template,</div><div class='del'>-	       sizeof (vicam_template));</div><div class='del'>-	cam-&gt;vdev.priv = cam;	// sort of a reverse mapping for those functions that get vdev only</div><div class='add'>+	memcpy(&amp;cam-&gt;vdev, &amp;vicam_template, sizeof(vicam_template));</div><div class='add'>+	video_set_drvdata(&amp;cam-&gt;vdev, cam);</div><div class='ctx'> </div><div class='ctx'> 	cam-&gt;udev = dev;</div><div class='ctx'> 	cam-&gt;bulkEndpoint = bulkEndpoint;</div><div class='head'>diff --git a/drivers/media/video/usbvision/usbvision-core.c b/drivers/media/video/usbvision/usbvision-core.c<br/>index c317ed7a8482..9e4f50639975 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/usbvision/usbvision-core.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/usbvision/usbvision-core.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/usbvision/usbvision-core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/usbvision/usbvision-core.c</a></div><div class='hunk'>@@ -45,10 +45,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_KMOD</div><div class='del'>-#include &lt;linux/kmod.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #include "usbvision.h"</div><div class='ctx'> </div><div class='ctx'> static unsigned int core_debug;</div><div class='hunk'>@@ -84,7 +80,8 @@ MODULE_PARM_DESC(adjust_Y_Offset, "adjust Y offset display [core]");</div><div class='ctx'> #ifdef USBVISION_DEBUG</div><div class='ctx'> 	#define PDEBUG(level, fmt, args...) { \</div><div class='ctx'> 		if (core_debug &amp; (level)) \</div><div class='del'>-			info("[%s:%d] " fmt, __func__, __LINE__ , ## args); \</div><div class='add'>+			printk(KERN_INFO KBUILD_MODNAME ":[%s:%d] " fmt, \</div><div class='add'>+				__func__, __LINE__ , ## args); \</div><div class='ctx'> 	}</div><div class='ctx'> #else</div><div class='ctx'> 	#define PDEBUG(level, fmt, args...) do {} while(0)</div><div class='head'>diff --git a/drivers/media/video/usbvision/usbvision-i2c.c b/drivers/media/video/usbvision/usbvision-i2c.c<br/>index a6d00858b07e..92427fdc1459 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/usbvision/usbvision-i2c.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/usbvision/usbvision-i2c.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/usbvision/usbvision-i2c.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/usbvision/usbvision-i2c.c</a></div><div class='hunk'>@@ -47,7 +47,8 @@ MODULE_PARM_DESC(i2c_debug, "enable debug messages [i2c]");</div><div class='ctx'> </div><div class='ctx'> #define PDEBUG(level, fmt, args...) { \</div><div class='ctx'> 		if (i2c_debug &amp; (level)) \</div><div class='del'>-			info("[%s:%d] " fmt, __func__, __LINE__ , ## args); \</div><div class='add'>+			printk(KERN_INFO KBUILD_MODNAME ":[%s:%d] " fmt, \</div><div class='add'>+				__func__, __LINE__ , ## args); \</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> static int usbvision_i2c_write(struct usb_usbvision *usbvision, unsigned char addr, char *buf,</div><div class='head'>diff --git a/drivers/media/video/usbvision/usbvision-video.c b/drivers/media/video/usbvision/usbvision-video.c<br/>index b977116a0dd9..77aeb39b2750 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/usbvision/usbvision-video.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/usbvision/usbvision-video.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/usbvision/usbvision-video.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/usbvision/usbvision-video.c</a></div><div class='hunk'>@@ -69,10 +69,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_KMOD</div><div class='del'>-#include &lt;linux/kmod.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #include "usbvision.h"</div><div class='ctx'> #include "usbvision-cards.h"</div><div class='ctx'> </div><div class='hunk'>@@ -98,7 +94,8 @@ USBVISION_DRIVER_VERSION_PATCHLEVEL)</div><div class='ctx'> #ifdef USBVISION_DEBUG</div><div class='ctx'> 	#define PDEBUG(level, fmt, args...) { \</div><div class='ctx'> 		if (video_debug &amp; (level)) \</div><div class='del'>-			info("[%s:%d] " fmt, __func__, __LINE__ , ## args); \</div><div class='add'>+			printk(KERN_INFO KBUILD_MODNAME ":[%s:%d] " fmt, \</div><div class='add'>+				__func__, __LINE__ , ## args); \</div><div class='ctx'> 	}</div><div class='ctx'> #else</div><div class='ctx'> 	#define PDEBUG(level, fmt, args...) do {} while(0)</div><div class='hunk'>@@ -360,13 +357,12 @@ static void usbvision_remove_sysfs(struct video_device *vdev)</div><div class='ctx'>  */</div><div class='ctx'> static int usbvision_v4l2_open(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct usb_usbvision *usbvision =</div><div class='del'>-		(struct usb_usbvision *) video_get_drvdata(dev);</div><div class='add'>+	struct usb_usbvision *usbvision = video_drvdata(file);</div><div class='ctx'> 	int errCode = 0;</div><div class='ctx'> </div><div class='ctx'> 	PDEBUG(DBG_IO, "open");</div><div class='ctx'> </div><div class='add'>+	lock_kernel();</div><div class='ctx'> 	usbvision_reset_powerOffTimer(usbvision);</div><div class='ctx'> </div><div class='ctx'> 	if (usbvision-&gt;user)</div><div class='hunk'>@@ -424,6 +420,7 @@ static int usbvision_v4l2_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	usbvision_empty_framequeues(usbvision);</div><div class='ctx'> </div><div class='ctx'> 	PDEBUG(DBG_IO, "success");</div><div class='add'>+	unlock_kernel();</div><div class='ctx'> 	return errCode;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -437,9 +434,7 @@ static int usbvision_v4l2_open(struct inode *inode, struct file *file)</div><div class='ctx'>  */</div><div class='ctx'> static int usbvision_v4l2_close(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct usb_usbvision *usbvision =</div><div class='del'>-		(struct usb_usbvision *) video_get_drvdata(dev);</div><div class='add'>+	struct usb_usbvision *usbvision = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	PDEBUG(DBG_IO, "close");</div><div class='ctx'> 	mutex_lock(&amp;usbvision-&gt;lock);</div><div class='hunk'>@@ -484,9 +479,7 @@ static int usbvision_v4l2_close(struct inode *inode, struct file *file)</div><div class='ctx'> static int vidioc_g_register (struct file *file, void *priv,</div><div class='ctx'> 				struct v4l2_register *reg)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct usb_usbvision *usbvision =</div><div class='del'>-		(struct usb_usbvision *) video_get_drvdata(dev);</div><div class='add'>+	struct usb_usbvision *usbvision = video_drvdata(file);</div><div class='ctx'> 	int errCode;</div><div class='ctx'> </div><div class='ctx'> 	if (!v4l2_chip_match_host(reg-&gt;match_type, reg-&gt;match_chip))</div><div class='hunk'>@@ -505,9 +498,7 @@ static int vidioc_g_register (struct file *file, void *priv,</div><div class='ctx'> static int vidioc_s_register (struct file *file, void *priv,</div><div class='ctx'> 				struct v4l2_register *reg)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct usb_usbvision *usbvision =</div><div class='del'>-		(struct usb_usbvision *) video_get_drvdata(dev);</div><div class='add'>+	struct usb_usbvision *usbvision = video_drvdata(file);</div><div class='ctx'> 	int errCode;</div><div class='ctx'> </div><div class='ctx'> 	if (!v4l2_chip_match_host(reg-&gt;match_type, reg-&gt;match_chip))</div><div class='hunk'>@@ -526,9 +517,7 @@ static int vidioc_s_register (struct file *file, void *priv,</div><div class='ctx'> static int vidioc_querycap (struct file *file, void  *priv,</div><div class='ctx'> 					struct v4l2_capability *vc)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct usb_usbvision *usbvision =</div><div class='del'>-		(struct usb_usbvision *) video_get_drvdata(dev);</div><div class='add'>+	struct usb_usbvision *usbvision = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	strlcpy(vc-&gt;driver, "USBVision", sizeof(vc-&gt;driver));</div><div class='ctx'> 	strlcpy(vc-&gt;card,</div><div class='hunk'>@@ -548,9 +537,7 @@ static int vidioc_querycap (struct file *file, void  *priv,</div><div class='ctx'> static int vidioc_enum_input (struct file *file, void *priv,</div><div class='ctx'> 				struct v4l2_input *vi)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct usb_usbvision *usbvision =</div><div class='del'>-		(struct usb_usbvision *) video_get_drvdata(dev);</div><div class='add'>+	struct usb_usbvision *usbvision = video_drvdata(file);</div><div class='ctx'> 	int chan;</div><div class='ctx'> </div><div class='ctx'> 	if ((vi-&gt;index &gt;= usbvision-&gt;video_inputs) || (vi-&gt;index &lt; 0) )</div><div class='hunk'>@@ -603,9 +590,7 @@ static int vidioc_enum_input (struct file *file, void *priv,</div><div class='ctx'> </div><div class='ctx'> static int vidioc_g_input (struct file *file, void *priv, unsigned int *input)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct usb_usbvision *usbvision =</div><div class='del'>-		(struct usb_usbvision *) video_get_drvdata(dev);</div><div class='add'>+	struct usb_usbvision *usbvision = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	*input = usbvision-&gt;ctl_input;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -613,9 +598,7 @@ static int vidioc_g_input (struct file *file, void *priv, unsigned int *input)</div><div class='ctx'> </div><div class='ctx'> static int vidioc_s_input (struct file *file, void *priv, unsigned int input)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct usb_usbvision *usbvision =</div><div class='del'>-		(struct usb_usbvision *) video_get_drvdata(dev);</div><div class='add'>+	struct usb_usbvision *usbvision = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	if ((input &gt;= usbvision-&gt;video_inputs) || (input &lt; 0) )</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -632,9 +615,8 @@ static int vidioc_s_input (struct file *file, void *priv, unsigned int input)</div><div class='ctx'> </div><div class='ctx'> static int vidioc_s_std (struct file *file, void *priv, v4l2_std_id *id)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct usb_usbvision *usbvision =</div><div class='del'>-		(struct usb_usbvision *) video_get_drvdata(dev);</div><div class='add'>+	struct usb_usbvision *usbvision = video_drvdata(file);</div><div class='add'>+</div><div class='ctx'> 	usbvision-&gt;tvnormId=*id;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;usbvision-&gt;lock);</div><div class='hunk'>@@ -650,9 +632,7 @@ static int vidioc_s_std (struct file *file, void *priv, v4l2_std_id *id)</div><div class='ctx'> static int vidioc_g_tuner (struct file *file, void *priv,</div><div class='ctx'> 				struct v4l2_tuner *vt)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct usb_usbvision *usbvision =</div><div class='del'>-		(struct usb_usbvision *) video_get_drvdata(dev);</div><div class='add'>+	struct usb_usbvision *usbvision = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	if (!usbvision-&gt;have_tuner || vt-&gt;index)	// Only tuner 0</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -671,9 +651,7 @@ static int vidioc_g_tuner (struct file *file, void *priv,</div><div class='ctx'> static int vidioc_s_tuner (struct file *file, void *priv,</div><div class='ctx'> 				struct v4l2_tuner *vt)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct usb_usbvision *usbvision =</div><div class='del'>-		(struct usb_usbvision *) video_get_drvdata(dev);</div><div class='add'>+	struct usb_usbvision *usbvision = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	// Only no or one tuner for now</div><div class='ctx'> 	if (!usbvision-&gt;have_tuner || vt-&gt;index)</div><div class='hunk'>@@ -687,9 +665,7 @@ static int vidioc_s_tuner (struct file *file, void *priv,</div><div class='ctx'> static int vidioc_g_frequency (struct file *file, void *priv,</div><div class='ctx'> 				struct v4l2_frequency *freq)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct usb_usbvision *usbvision =</div><div class='del'>-		(struct usb_usbvision *) video_get_drvdata(dev);</div><div class='add'>+	struct usb_usbvision *usbvision = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	freq-&gt;tuner = 0; // Only one tuner</div><div class='ctx'> 	if(usbvision-&gt;radio) {</div><div class='hunk'>@@ -705,9 +681,7 @@ static int vidioc_g_frequency (struct file *file, void *priv,</div><div class='ctx'> static int vidioc_s_frequency (struct file *file, void *priv,</div><div class='ctx'> 				struct v4l2_frequency *freq)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct usb_usbvision *usbvision =</div><div class='del'>-		(struct usb_usbvision *) video_get_drvdata(dev);</div><div class='add'>+	struct usb_usbvision *usbvision = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	// Only no or one tuner for now</div><div class='ctx'> 	if (!usbvision-&gt;have_tuner || freq-&gt;tuner)</div><div class='hunk'>@@ -721,9 +695,7 @@ static int vidioc_s_frequency (struct file *file, void *priv,</div><div class='ctx'> </div><div class='ctx'> static int vidioc_g_audio (struct file *file, void *priv, struct v4l2_audio *a)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct usb_usbvision *usbvision =</div><div class='del'>-		(struct usb_usbvision *) video_get_drvdata(dev);</div><div class='add'>+	struct usb_usbvision *usbvision = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	memset(a,0,sizeof(*a));</div><div class='ctx'> 	if(usbvision-&gt;radio) {</div><div class='hunk'>@@ -748,9 +720,7 @@ static int vidioc_s_audio (struct file *file, void *fh,</div><div class='ctx'> static int vidioc_queryctrl (struct file *file, void *priv,</div><div class='ctx'> 			    struct v4l2_queryctrl *ctrl)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct usb_usbvision *usbvision =</div><div class='del'>-		(struct usb_usbvision *) video_get_drvdata(dev);</div><div class='add'>+	struct usb_usbvision *usbvision = video_drvdata(file);</div><div class='ctx'> 	int id=ctrl-&gt;id;</div><div class='ctx'> </div><div class='ctx'> 	memset(ctrl,0,sizeof(*ctrl));</div><div class='hunk'>@@ -767,9 +737,7 @@ static int vidioc_queryctrl (struct file *file, void *priv,</div><div class='ctx'> static int vidioc_g_ctrl (struct file *file, void *priv,</div><div class='ctx'> 				struct v4l2_control *ctrl)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct usb_usbvision *usbvision =</div><div class='del'>-		(struct usb_usbvision *) video_get_drvdata(dev);</div><div class='add'>+	struct usb_usbvision *usbvision = video_drvdata(file);</div><div class='ctx'> 	call_i2c_clients(usbvision, VIDIOC_G_CTRL, ctrl);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -778,9 +746,7 @@ static int vidioc_g_ctrl (struct file *file, void *priv,</div><div class='ctx'> static int vidioc_s_ctrl (struct file *file, void *priv,</div><div class='ctx'> 				struct v4l2_control *ctrl)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct usb_usbvision *usbvision =</div><div class='del'>-		(struct usb_usbvision *) video_get_drvdata(dev);</div><div class='add'>+	struct usb_usbvision *usbvision = video_drvdata(file);</div><div class='ctx'> 	call_i2c_clients(usbvision, VIDIOC_S_CTRL, ctrl);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -789,9 +755,7 @@ static int vidioc_s_ctrl (struct file *file, void *priv,</div><div class='ctx'> static int vidioc_reqbufs (struct file *file,</div><div class='ctx'> 			   void *priv, struct v4l2_requestbuffers *vr)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct usb_usbvision *usbvision =</div><div class='del'>-		(struct usb_usbvision *) video_get_drvdata(dev);</div><div class='add'>+	struct usb_usbvision *usbvision = video_drvdata(file);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	RESTRICT_TO_RANGE(vr-&gt;count,1,USBVISION_NUMFRAMES);</div><div class='hunk'>@@ -819,9 +783,7 @@ static int vidioc_reqbufs (struct file *file,</div><div class='ctx'> static int vidioc_querybuf (struct file *file,</div><div class='ctx'> 			    void *priv, struct v4l2_buffer *vb)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct usb_usbvision *usbvision =</div><div class='del'>-		(struct usb_usbvision *) video_get_drvdata(dev);</div><div class='add'>+	struct usb_usbvision *usbvision = video_drvdata(file);</div><div class='ctx'> 	struct usbvision_frame *frame;</div><div class='ctx'> </div><div class='ctx'> 	/* FIXME : must control</div><div class='hunk'>@@ -857,9 +819,7 @@ static int vidioc_querybuf (struct file *file,</div><div class='ctx'> </div><div class='ctx'> static int vidioc_qbuf (struct file *file, void *priv, struct v4l2_buffer *vb)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct usb_usbvision *usbvision =</div><div class='del'>-		(struct usb_usbvision *) video_get_drvdata(dev);</div><div class='add'>+	struct usb_usbvision *usbvision = video_drvdata(file);</div><div class='ctx'> 	struct usbvision_frame *frame;</div><div class='ctx'> 	unsigned long lock_flags;</div><div class='ctx'> </div><div class='hunk'>@@ -896,9 +856,7 @@ static int vidioc_qbuf (struct file *file, void *priv, struct v4l2_buffer *vb)</div><div class='ctx'> </div><div class='ctx'> static int vidioc_dqbuf (struct file *file, void *priv, struct v4l2_buffer *vb)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct usb_usbvision *usbvision =</div><div class='del'>-		(struct usb_usbvision *) video_get_drvdata(dev);</div><div class='add'>+	struct usb_usbvision *usbvision = video_drvdata(file);</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct usbvision_frame *f;</div><div class='ctx'> 	unsigned long lock_flags;</div><div class='hunk'>@@ -939,9 +897,7 @@ static int vidioc_dqbuf (struct file *file, void *priv, struct v4l2_buffer *vb)</div><div class='ctx'> </div><div class='ctx'> static int vidioc_streamon(struct file *file, void *priv, enum v4l2_buf_type i)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct usb_usbvision *usbvision =</div><div class='del'>-		(struct usb_usbvision *) video_get_drvdata(dev);</div><div class='add'>+	struct usb_usbvision *usbvision = video_drvdata(file);</div><div class='ctx'> 	int b=V4L2_BUF_TYPE_VIDEO_CAPTURE;</div><div class='ctx'> </div><div class='ctx'> 	usbvision-&gt;streaming = Stream_On;</div><div class='hunk'>@@ -953,9 +909,7 @@ static int vidioc_streamon(struct file *file, void *priv, enum v4l2_buf_type i)</div><div class='ctx'> static int vidioc_streamoff(struct file *file,</div><div class='ctx'> 			    void *priv, enum v4l2_buf_type type)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct usb_usbvision *usbvision =</div><div class='del'>-		(struct usb_usbvision *) video_get_drvdata(dev);</div><div class='add'>+	struct usb_usbvision *usbvision = video_drvdata(file);</div><div class='ctx'> 	int b=V4L2_BUF_TYPE_VIDEO_CAPTURE;</div><div class='ctx'> </div><div class='ctx'> 	if (type != V4L2_BUF_TYPE_VIDEO_CAPTURE)</div><div class='hunk'>@@ -988,9 +942,7 @@ static int vidioc_enum_fmt_vid_cap (struct file *file, void  *priv,</div><div class='ctx'> static int vidioc_g_fmt_vid_cap (struct file *file, void *priv,</div><div class='ctx'> 					struct v4l2_format *vf)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct usb_usbvision *usbvision =</div><div class='del'>-		(struct usb_usbvision *) video_get_drvdata(dev);</div><div class='add'>+	struct usb_usbvision *usbvision = video_drvdata(file);</div><div class='ctx'> 	vf-&gt;fmt.pix.width = usbvision-&gt;curwidth;</div><div class='ctx'> 	vf-&gt;fmt.pix.height = usbvision-&gt;curheight;</div><div class='ctx'> 	vf-&gt;fmt.pix.pixelformat = usbvision-&gt;palette.format;</div><div class='hunk'>@@ -1006,9 +958,7 @@ static int vidioc_g_fmt_vid_cap (struct file *file, void *priv,</div><div class='ctx'> static int vidioc_try_fmt_vid_cap (struct file *file, void *priv,</div><div class='ctx'> 			       struct v4l2_format *vf)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct usb_usbvision *usbvision =</div><div class='del'>-		(struct usb_usbvision *) video_get_drvdata(dev);</div><div class='add'>+	struct usb_usbvision *usbvision = video_drvdata(file);</div><div class='ctx'> 	int formatIdx;</div><div class='ctx'> </div><div class='ctx'> 	/* Find requested format in available ones */</div><div class='hunk'>@@ -1036,9 +986,7 @@ static int vidioc_try_fmt_vid_cap (struct file *file, void *priv,</div><div class='ctx'> static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,</div><div class='ctx'> 			       struct v4l2_format *vf)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct usb_usbvision *usbvision =</div><div class='del'>-		(struct usb_usbvision *) video_get_drvdata(dev);</div><div class='add'>+	struct usb_usbvision *usbvision = video_drvdata(file);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if( 0 != (ret=vidioc_try_fmt_vid_cap (file, priv, vf)) ) {</div><div class='hunk'>@@ -1066,9 +1014,7 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,</div><div class='ctx'> static ssize_t usbvision_v4l2_read(struct file *file, char __user *buf,</div><div class='ctx'> 		      size_t count, loff_t *ppos)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct usb_usbvision *usbvision =</div><div class='del'>-		(struct usb_usbvision *) video_get_drvdata(dev);</div><div class='add'>+	struct usb_usbvision *usbvision = video_drvdata(file);</div><div class='ctx'> 	int noblock = file-&gt;f_flags &amp; O_NONBLOCK;</div><div class='ctx'> 	unsigned long lock_flags;</div><div class='ctx'> </div><div class='hunk'>@@ -1177,10 +1123,7 @@ static int usbvision_v4l2_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='ctx'> 		start = vma-&gt;vm_start;</div><div class='ctx'> 	void *pos;</div><div class='ctx'> 	u32 i;</div><div class='del'>-</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct usb_usbvision *usbvision =</div><div class='del'>-		(struct usb_usbvision *) video_get_drvdata(dev);</div><div class='add'>+	struct usb_usbvision *usbvision = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	PDEBUG(DBG_MMAP, "mmap");</div><div class='ctx'> </div><div class='hunk'>@@ -1237,9 +1180,7 @@ static int usbvision_v4l2_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='ctx'>  */</div><div class='ctx'> static int usbvision_radio_open(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct usb_usbvision *usbvision =</div><div class='del'>-		(struct usb_usbvision *) video_get_drvdata(dev);</div><div class='add'>+	struct usb_usbvision *usbvision = video_drvdata(file);</div><div class='ctx'> 	int errCode = 0;</div><div class='ctx'> </div><div class='ctx'> 	PDEBUG(DBG_IO, "%s:", __func__);</div><div class='hunk'>@@ -1289,9 +1230,7 @@ out:</div><div class='ctx'> </div><div class='ctx'> static int usbvision_radio_close(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct usb_usbvision *usbvision =</div><div class='del'>-		(struct usb_usbvision *) video_get_drvdata(dev);</div><div class='add'>+	struct usb_usbvision *usbvision = video_drvdata(file);</div><div class='ctx'> 	int errCode = 0;</div><div class='ctx'> </div><div class='ctx'> 	PDEBUG(DBG_IO, "");</div><div class='head'>diff --git a/drivers/media/video/uvc/uvc_ctrl.c b/drivers/media/video/uvc/uvc_ctrl.c<br/>index feab12aa2c7b..f16aafe9cf14 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/uvc/uvc_ctrl.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/uvc/uvc_ctrl.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/uvc/uvc_ctrl.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/uvc/uvc_ctrl.c</a></div><div class='hunk'>@@ -83,6 +83,22 @@ static struct uvc_control_info uvc_ctrls[] = {</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.entity		= UVC_GUID_UVC_PROCESSING,</div><div class='add'>+		.selector	= PU_WHITE_BALANCE_TEMPERATURE_CONTROL,</div><div class='add'>+		.index		= 6,</div><div class='add'>+		.size		= 2,</div><div class='add'>+		.flags		= UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_RANGE</div><div class='add'>+				| UVC_CONTROL_RESTORE | UVC_CONTROL_AUTO_UPDATE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.entity		= UVC_GUID_UVC_PROCESSING,</div><div class='add'>+		.selector	= PU_WHITE_BALANCE_COMPONENT_CONTROL,</div><div class='add'>+		.index		= 7,</div><div class='add'>+		.size		= 4,</div><div class='add'>+		.flags		= UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_RANGE</div><div class='add'>+				| UVC_CONTROL_RESTORE | UVC_CONTROL_AUTO_UPDATE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.entity		= UVC_GUID_UVC_PROCESSING,</div><div class='ctx'> 		.selector	= PU_BACKLIGHT_COMPENSATION_CONTROL,</div><div class='ctx'> 		.index		= 8,</div><div class='ctx'> 		.size		= 2,</div><div class='hunk'>@@ -114,6 +130,60 @@ static struct uvc_control_info uvc_ctrls[] = {</div><div class='ctx'> 				| UVC_CONTROL_GET_DEF | UVC_CONTROL_RESTORE,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='add'>+		.entity		= UVC_GUID_UVC_PROCESSING,</div><div class='add'>+		.selector	= PU_WHITE_BALANCE_TEMPERATURE_AUTO_CONTROL,</div><div class='add'>+		.index		= 12,</div><div class='add'>+		.size		= 1,</div><div class='add'>+		.flags		= UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_CUR</div><div class='add'>+				| UVC_CONTROL_GET_DEF | UVC_CONTROL_RESTORE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.entity		= UVC_GUID_UVC_PROCESSING,</div><div class='add'>+		.selector	= PU_WHITE_BALANCE_COMPONENT_AUTO_CONTROL,</div><div class='add'>+		.index		= 13,</div><div class='add'>+		.size		= 1,</div><div class='add'>+		.flags		= UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_CUR</div><div class='add'>+				| UVC_CONTROL_GET_DEF | UVC_CONTROL_RESTORE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.entity		= UVC_GUID_UVC_PROCESSING,</div><div class='add'>+		.selector	= PU_DIGITAL_MULTIPLIER_CONTROL,</div><div class='add'>+		.index		= 14,</div><div class='add'>+		.size		= 2,</div><div class='add'>+		.flags		= UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_RANGE</div><div class='add'>+				| UVC_CONTROL_RESTORE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.entity		= UVC_GUID_UVC_PROCESSING,</div><div class='add'>+		.selector	= PU_DIGITAL_MULTIPLIER_LIMIT_CONTROL,</div><div class='add'>+		.index		= 15,</div><div class='add'>+		.size		= 2,</div><div class='add'>+		.flags		= UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_RANGE</div><div class='add'>+				| UVC_CONTROL_RESTORE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.entity		= UVC_GUID_UVC_PROCESSING,</div><div class='add'>+		.selector	= PU_ANALOG_VIDEO_STANDARD_CONTROL,</div><div class='add'>+		.index		= 16,</div><div class='add'>+		.size		= 1,</div><div class='add'>+		.flags		= UVC_CONTROL_GET_CUR,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.entity		= UVC_GUID_UVC_PROCESSING,</div><div class='add'>+		.selector	= PU_ANALOG_LOCK_STATUS_CONTROL,</div><div class='add'>+		.index		= 17,</div><div class='add'>+		.size		= 1,</div><div class='add'>+		.flags		= UVC_CONTROL_GET_CUR,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.entity		= UVC_GUID_UVC_CAMERA,</div><div class='add'>+		.selector	= CT_SCANNING_MODE_CONTROL,</div><div class='add'>+		.index		= 0,</div><div class='add'>+		.size		= 1,</div><div class='add'>+		.flags		= UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_CUR</div><div class='add'>+				| UVC_CONTROL_RESTORE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='ctx'> 		.entity		= UVC_GUID_UVC_CAMERA,</div><div class='ctx'> 		.selector	= CT_AE_MODE_CONTROL,</div><div class='ctx'> 		.index		= 1,</div><div class='hunk'>@@ -140,6 +210,14 @@ static struct uvc_control_info uvc_ctrls[] = {</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.entity		= UVC_GUID_UVC_CAMERA,</div><div class='add'>+		.selector	= CT_EXPOSURE_TIME_RELATIVE_CONTROL,</div><div class='add'>+		.index		= 4,</div><div class='add'>+		.size		= 1,</div><div class='add'>+		.flags		= UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_CUR</div><div class='add'>+				| UVC_CONTROL_RESTORE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.entity		= UVC_GUID_UVC_CAMERA,</div><div class='ctx'> 		.selector	= CT_FOCUS_ABSOLUTE_CONTROL,</div><div class='ctx'> 		.index		= 5,</div><div class='ctx'> 		.size		= 2,</div><div class='hunk'>@@ -148,42 +226,90 @@ static struct uvc_control_info uvc_ctrls[] = {</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.entity		= UVC_GUID_UVC_CAMERA,</div><div class='del'>-		.selector	= CT_FOCUS_AUTO_CONTROL,</div><div class='del'>-		.index		= 17,</div><div class='del'>-		.size		= 1,</div><div class='del'>-		.flags		= UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_CUR</div><div class='del'>-				| UVC_CONTROL_GET_DEF | UVC_CONTROL_RESTORE,</div><div class='add'>+		.selector	= CT_FOCUS_RELATIVE_CONTROL,</div><div class='add'>+		.index		= 6,</div><div class='add'>+		.size		= 2,</div><div class='add'>+		.flags		= UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_RANGE</div><div class='add'>+				| UVC_CONTROL_AUTO_UPDATE,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='del'>-		.entity		= UVC_GUID_UVC_PROCESSING,</div><div class='del'>-		.selector	= PU_WHITE_BALANCE_TEMPERATURE_AUTO_CONTROL,</div><div class='del'>-		.index		= 12,</div><div class='add'>+		.entity		= UVC_GUID_UVC_CAMERA,</div><div class='add'>+		.selector	= CT_IRIS_ABSOLUTE_CONTROL,</div><div class='add'>+		.index		= 7,</div><div class='add'>+		.size		= 2,</div><div class='add'>+		.flags		= UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_RANGE</div><div class='add'>+				| UVC_CONTROL_RESTORE | UVC_CONTROL_AUTO_UPDATE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.entity		= UVC_GUID_UVC_CAMERA,</div><div class='add'>+		.selector	= CT_IRIS_RELATIVE_CONTROL,</div><div class='add'>+		.index		= 8,</div><div class='ctx'> 		.size		= 1,</div><div class='ctx'> 		.flags		= UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_CUR</div><div class='del'>-				| UVC_CONTROL_GET_DEF | UVC_CONTROL_RESTORE,</div><div class='add'>+				| UVC_CONTROL_AUTO_UPDATE,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='del'>-		.entity		= UVC_GUID_UVC_PROCESSING,</div><div class='del'>-		.selector	= PU_WHITE_BALANCE_TEMPERATURE_CONTROL,</div><div class='del'>-		.index		= 6,</div><div class='add'>+		.entity		= UVC_GUID_UVC_CAMERA,</div><div class='add'>+		.selector	= CT_ZOOM_ABSOLUTE_CONTROL,</div><div class='add'>+		.index		= 9,</div><div class='ctx'> 		.size		= 2,</div><div class='ctx'> 		.flags		= UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_RANGE</div><div class='ctx'> 				| UVC_CONTROL_RESTORE | UVC_CONTROL_AUTO_UPDATE,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='del'>-		.entity		= UVC_GUID_UVC_PROCESSING,</div><div class='del'>-		.selector	= PU_WHITE_BALANCE_COMPONENT_AUTO_CONTROL,</div><div class='add'>+		.entity		= UVC_GUID_UVC_CAMERA,</div><div class='add'>+		.selector	= CT_ZOOM_RELATIVE_CONTROL,</div><div class='add'>+		.index		= 10,</div><div class='add'>+		.size		= 3,</div><div class='add'>+		.flags		= UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_RANGE</div><div class='add'>+				| UVC_CONTROL_AUTO_UPDATE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.entity		= UVC_GUID_UVC_CAMERA,</div><div class='add'>+		.selector	= CT_PANTILT_ABSOLUTE_CONTROL,</div><div class='add'>+		.index		= 11,</div><div class='add'>+		.size		= 8,</div><div class='add'>+		.flags		= UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_RANGE</div><div class='add'>+				| UVC_CONTROL_RESTORE | UVC_CONTROL_AUTO_UPDATE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.entity		= UVC_GUID_UVC_CAMERA,</div><div class='add'>+		.selector	= CT_PANTILT_RELATIVE_CONTROL,</div><div class='add'>+		.index		= 12,</div><div class='add'>+		.size		= 4,</div><div class='add'>+		.flags		= UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_RANGE</div><div class='add'>+				| UVC_CONTROL_AUTO_UPDATE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.entity		= UVC_GUID_UVC_CAMERA,</div><div class='add'>+		.selector	= CT_ROLL_ABSOLUTE_CONTROL,</div><div class='ctx'> 		.index		= 13,</div><div class='add'>+		.size		= 2,</div><div class='add'>+		.flags		= UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_RANGE</div><div class='add'>+				| UVC_CONTROL_RESTORE | UVC_CONTROL_AUTO_UPDATE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.entity		= UVC_GUID_UVC_CAMERA,</div><div class='add'>+		.selector	= CT_ROLL_RELATIVE_CONTROL,</div><div class='add'>+		.index		= 14,</div><div class='add'>+		.size		= 2,</div><div class='add'>+		.flags		= UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_RANGE</div><div class='add'>+				| UVC_CONTROL_AUTO_UPDATE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.entity		= UVC_GUID_UVC_CAMERA,</div><div class='add'>+		.selector	= CT_FOCUS_AUTO_CONTROL,</div><div class='add'>+		.index		= 17,</div><div class='ctx'> 		.size		= 1,</div><div class='ctx'> 		.flags		= UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_CUR</div><div class='ctx'> 				| UVC_CONTROL_GET_DEF | UVC_CONTROL_RESTORE,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='del'>-		.entity		= UVC_GUID_UVC_PROCESSING,</div><div class='del'>-		.selector	= PU_WHITE_BALANCE_COMPONENT_CONTROL,</div><div class='del'>-		.index		= 7,</div><div class='del'>-		.size		= 4,</div><div class='del'>-		.flags		= UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_RANGE</div><div class='add'>+		.entity		= UVC_GUID_UVC_CAMERA,</div><div class='add'>+		.selector	= CT_PRIVACY_CONTROL,</div><div class='add'>+		.index		= 18,</div><div class='add'>+		.size		= 1,</div><div class='add'>+		.flags		= UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_CUR</div><div class='ctx'> 				| UVC_CONTROL_RESTORE | UVC_CONTROL_AUTO_UPDATE,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='hunk'>@@ -711,7 +837,17 @@ static int uvc_ctrl_commit_entity(struct uvc_device *dev,</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; entity-&gt;ncontrols; ++i) {</div><div class='ctx'> 		ctrl = &amp;entity-&gt;controls[i];</div><div class='del'>-		if (ctrl-&gt;info == NULL || !ctrl-&gt;dirty)</div><div class='add'>+		if (ctrl-&gt;info == NULL)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* Reset the loaded flag for auto-update controls that were</div><div class='add'>+		 * marked as loaded in uvc_ctrl_get/uvc_ctrl_set to prevent</div><div class='add'>+		 * uvc_ctrl_get from using the cached value.</div><div class='add'>+		 */</div><div class='add'>+		if (ctrl-&gt;info-&gt;flags &amp; UVC_CONTROL_AUTO_UPDATE)</div><div class='add'>+			ctrl-&gt;loaded = 0;</div><div class='add'>+</div><div class='add'>+		if (!ctrl-&gt;dirty)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		if (!rollback)</div><div class='hunk'>@@ -727,9 +863,6 @@ static int uvc_ctrl_commit_entity(struct uvc_device *dev,</div><div class='ctx'> 			       uvc_ctrl_data(ctrl, UVC_CTRL_DATA_BACKUP),</div><div class='ctx'> 			       ctrl-&gt;info-&gt;size);</div><div class='ctx'> </div><div class='del'>-		if ((ctrl-&gt;info-&gt;flags &amp; UVC_CONTROL_GET_CUR) == 0)</div><div class='del'>-			ctrl-&gt;loaded = 0;</div><div class='del'>-</div><div class='ctx'> 		ctrl-&gt;dirty = 0;</div><div class='ctx'> </div><div class='ctx'> 		if (ret &lt; 0)</div><div class='hunk'>@@ -787,8 +920,7 @@ int uvc_ctrl_get(struct uvc_video_device *video,</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			return ret;</div><div class='ctx'> </div><div class='del'>-		if ((ctrl-&gt;info-&gt;flags &amp; UVC_CONTROL_AUTO_UPDATE) == 0)</div><div class='del'>-			ctrl-&gt;loaded = 1;</div><div class='add'>+		ctrl-&gt;loaded = 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	xctrl-&gt;value = uvc_get_le_value(</div><div class='hunk'>@@ -839,8 +971,7 @@ int uvc_ctrl_set(struct uvc_video_device *video,</div><div class='ctx'> 				return ret;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if ((ctrl-&gt;info-&gt;flags &amp; UVC_CONTROL_AUTO_UPDATE) == 0)</div><div class='del'>-			ctrl-&gt;loaded = 1;</div><div class='add'>+		ctrl-&gt;loaded = 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!ctrl-&gt;dirty) {</div><div class='head'>diff --git a/drivers/media/video/uvc/uvc_driver.c b/drivers/media/video/uvc/uvc_driver.c<br/>index 7e102034d38d..d7ad060640bc 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/uvc/uvc_driver.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/uvc/uvc_driver.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/uvc/uvc_driver.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/uvc/uvc_driver.c</a></div><div class='hunk'>@@ -1663,7 +1663,7 @@ static int uvc_suspend(struct usb_interface *intf, pm_message_t message)</div><div class='ctx'> 	return uvc_video_suspend(&amp;dev-&gt;video);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int uvc_resume(struct usb_interface *intf)</div><div class='add'>+static int __uvc_resume(struct usb_interface *intf, int reset)</div><div class='ctx'> {</div><div class='ctx'> 	struct uvc_device *dev = usb_get_intfdata(intf);</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -1672,7 +1672,7 @@ static int uvc_resume(struct usb_interface *intf)</div><div class='ctx'> 		intf-&gt;cur_altsetting-&gt;desc.bInterfaceNumber);</div><div class='ctx'> </div><div class='ctx'> 	if (intf-&gt;cur_altsetting-&gt;desc.bInterfaceSubClass == SC_VIDEOCONTROL) {</div><div class='del'>-		if ((ret = uvc_ctrl_resume_device(dev)) &lt; 0)</div><div class='add'>+		if (reset &amp;&amp; (ret = uvc_ctrl_resume_device(dev)) &lt; 0)</div><div class='ctx'> 			return ret;</div><div class='ctx'> </div><div class='ctx'> 		return uvc_status_resume(dev);</div><div class='hunk'>@@ -1687,6 +1687,16 @@ static int uvc_resume(struct usb_interface *intf)</div><div class='ctx'> 	return uvc_video_resume(&amp;dev-&gt;video);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int uvc_resume(struct usb_interface *intf)</div><div class='add'>+{</div><div class='add'>+	return __uvc_resume(intf, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int uvc_reset_resume(struct usb_interface *intf)</div><div class='add'>+{</div><div class='add'>+	return __uvc_resume(intf, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* ------------------------------------------------------------------------</div><div class='ctx'>  * Driver initialization and cleanup</div><div class='ctx'>  */</div><div class='hunk'>@@ -1902,6 +1912,24 @@ static struct usb_device_id uvc_ids[] = {</div><div class='ctx'> 	  .bInterfaceSubClass	= 1,</div><div class='ctx'> 	  .bInterfaceProtocol	= 0,</div><div class='ctx'> 	  .driver_info		= UVC_QUIRK_PROBE_MINMAX },</div><div class='add'>+	/* Compaq Presario B1200 - Bison Electronics */</div><div class='add'>+	{ .match_flags		= USB_DEVICE_ID_MATCH_DEVICE</div><div class='add'>+				| USB_DEVICE_ID_MATCH_INT_INFO,</div><div class='add'>+	  .idVendor		= 0x5986,</div><div class='add'>+	  .idProduct		= 0x0104,</div><div class='add'>+	  .bInterfaceClass	= USB_CLASS_VIDEO,</div><div class='add'>+	  .bInterfaceSubClass	= 1,</div><div class='add'>+	  .bInterfaceProtocol	= 0,</div><div class='add'>+	  .driver_info		= UVC_QUIRK_PROBE_MINMAX },</div><div class='add'>+	/* Acer Travelmate 7720 - Bison Electronics */</div><div class='add'>+	{ .match_flags		= USB_DEVICE_ID_MATCH_DEVICE</div><div class='add'>+				| USB_DEVICE_ID_MATCH_INT_INFO,</div><div class='add'>+	  .idVendor		= 0x5986,</div><div class='add'>+	  .idProduct		= 0x0105,</div><div class='add'>+	  .bInterfaceClass	= USB_CLASS_VIDEO,</div><div class='add'>+	  .bInterfaceSubClass	= 1,</div><div class='add'>+	  .bInterfaceProtocol	= 0,</div><div class='add'>+	  .driver_info		= UVC_QUIRK_PROBE_MINMAX },</div><div class='ctx'> 	/* Medion Akoya Mini E1210 - Bison Electronics */</div><div class='ctx'> 	{ .match_flags		= USB_DEVICE_ID_MATCH_DEVICE</div><div class='ctx'> 				| USB_DEVICE_ID_MATCH_INT_INFO,</div><div class='hunk'>@@ -1920,6 +1948,24 @@ static struct usb_device_id uvc_ids[] = {</div><div class='ctx'> 	  .bInterfaceSubClass	= 1,</div><div class='ctx'> 	  .bInterfaceProtocol	= 0,</div><div class='ctx'> 	  .driver_info		= UVC_QUIRK_PROBE_MINMAX },</div><div class='add'>+	/*  Fujitsu Amilo SI2636 - Bison Electronics */</div><div class='add'>+	{ .match_flags		= USB_DEVICE_ID_MATCH_DEVICE</div><div class='add'>+				| USB_DEVICE_ID_MATCH_INT_INFO,</div><div class='add'>+	  .idVendor		= 0x5986,</div><div class='add'>+	  .idProduct		= 0x0202,</div><div class='add'>+	  .bInterfaceClass	= USB_CLASS_VIDEO,</div><div class='add'>+	  .bInterfaceSubClass	= 1,</div><div class='add'>+	  .bInterfaceProtocol	= 0,</div><div class='add'>+	  .driver_info		= UVC_QUIRK_PROBE_MINMAX },</div><div class='add'>+	/*  Advent 4211 - Bison Electronics */</div><div class='add'>+	{ .match_flags		= USB_DEVICE_ID_MATCH_DEVICE</div><div class='add'>+				| USB_DEVICE_ID_MATCH_INT_INFO,</div><div class='add'>+	  .idVendor		= 0x5986,</div><div class='add'>+	  .idProduct		= 0x0203,</div><div class='add'>+	  .bInterfaceClass	= USB_CLASS_VIDEO,</div><div class='add'>+	  .bInterfaceSubClass	= 1,</div><div class='add'>+	  .bInterfaceProtocol	= 0,</div><div class='add'>+	  .driver_info		= UVC_QUIRK_PROBE_MINMAX },</div><div class='ctx'> 	/* Bison Electronics */</div><div class='ctx'> 	{ .match_flags		= USB_DEVICE_ID_MATCH_DEVICE</div><div class='ctx'> 				| USB_DEVICE_ID_MATCH_INT_INFO,</div><div class='hunk'>@@ -1952,6 +1998,7 @@ struct uvc_driver uvc_driver = {</div><div class='ctx'> 		.disconnect	= uvc_disconnect,</div><div class='ctx'> 		.suspend	= uvc_suspend,</div><div class='ctx'> 		.resume		= uvc_resume,</div><div class='add'>+		.reset_resume	= uvc_reset_resume,</div><div class='ctx'> 		.id_table	= uvc_ids,</div><div class='ctx'> 		.supports_autosuspend = 1,</div><div class='ctx'> 	},</div><div class='head'>diff --git a/drivers/media/video/uvc/uvc_status.c b/drivers/media/video/uvc/uvc_status.c<br/>index 75e678ac54eb..5d60b264d59a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/uvc/uvc_status.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/uvc/uvc_status.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/uvc/uvc_status.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/uvc/uvc_status.c</a></div><div class='hunk'>@@ -177,9 +177,15 @@ int uvc_status_init(struct uvc_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	uvc_input_init(dev);</div><div class='ctx'> </div><div class='add'>+	dev-&gt;status = kzalloc(UVC_MAX_STATUS_SIZE, GFP_KERNEL);</div><div class='add'>+	if (dev-&gt;status == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='ctx'> 	dev-&gt;int_urb = usb_alloc_urb(0, GFP_KERNEL);</div><div class='del'>-	if (dev-&gt;int_urb == NULL)</div><div class='add'>+	if (dev-&gt;int_urb == NULL) {</div><div class='add'>+		kfree(dev-&gt;status);</div><div class='ctx'> 		return -ENOMEM;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	pipe = usb_rcvintpipe(dev-&gt;udev, ep-&gt;desc.bEndpointAddress);</div><div class='ctx'> </div><div class='hunk'>@@ -192,7 +198,7 @@ int uvc_status_init(struct uvc_device *dev)</div><div class='ctx'> 		interval = fls(interval) - 1;</div><div class='ctx'> </div><div class='ctx'> 	usb_fill_int_urb(dev-&gt;int_urb, dev-&gt;udev, pipe,</div><div class='del'>-		dev-&gt;status, sizeof dev-&gt;status, uvc_status_complete,</div><div class='add'>+		dev-&gt;status, UVC_MAX_STATUS_SIZE, uvc_status_complete,</div><div class='ctx'> 		dev, interval);</div><div class='ctx'> </div><div class='ctx'> 	return usb_submit_urb(dev-&gt;int_urb, GFP_KERNEL);</div><div class='hunk'>@@ -202,6 +208,7 @@ void uvc_status_cleanup(struct uvc_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	usb_kill_urb(dev-&gt;int_urb);</div><div class='ctx'> 	usb_free_urb(dev-&gt;int_urb);</div><div class='add'>+	kfree(dev-&gt;status);</div><div class='ctx'> 	uvc_input_cleanup(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/uvc/uvc_v4l2.c b/drivers/media/video/uvc/uvc_v4l2.c<br/>index d7bd71be40a9..78e4c4e09d89 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/uvc/uvc_v4l2.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/uvc/uvc_v4l2.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/uvc/uvc_v4l2.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/uvc/uvc_v4l2.c</a></div><div class='hunk'>@@ -400,15 +400,13 @@ static int uvc_has_privileges(struct uvc_fh *handle)</div><div class='ctx'> </div><div class='ctx'> static int uvc_v4l2_open(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *vdev;</div><div class='ctx'> 	struct uvc_video_device *video;</div><div class='ctx'> 	struct uvc_fh *handle;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	uvc_trace(UVC_TRACE_CALLS, "uvc_v4l2_open\n");</div><div class='ctx'> 	mutex_lock(&amp;uvc_driver.open_mutex);</div><div class='del'>-	vdev = video_devdata(file);</div><div class='del'>-	video = video_get_drvdata(vdev);</div><div class='add'>+	video = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	if (video-&gt;dev-&gt;state &amp; UVC_DEV_DISCONNECTED) {</div><div class='ctx'> 		ret = -ENODEV;</div><div class='hunk'>@@ -440,8 +438,7 @@ done:</div><div class='ctx'> </div><div class='ctx'> static int uvc_v4l2_release(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *vdev = video_devdata(file);</div><div class='del'>-	struct uvc_video_device *video = video_get_drvdata(vdev);</div><div class='add'>+	struct uvc_video_device *video = video_drvdata(file);</div><div class='ctx'> 	struct uvc_fh *handle = (struct uvc_fh *)file-&gt;private_data;</div><div class='ctx'> </div><div class='ctx'> 	uvc_trace(UVC_TRACE_CALLS, "uvc_v4l2_release\n");</div><div class='hunk'>@@ -845,10 +842,6 @@ static int uvc_v4l2_do_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			return ret;</div><div class='ctx'> </div><div class='del'>-		if (!(video-&gt;streaming-&gt;cur_format-&gt;flags &amp;</div><div class='del'>-		    UVC_FMT_FLAG_COMPRESSED))</div><div class='del'>-			video-&gt;queue.flags |= UVC_QUEUE_DROP_INCOMPLETE;</div><div class='del'>-</div><div class='ctx'> 		rb-&gt;count = ret;</div><div class='ctx'> 		ret = 0;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1031,8 +1024,7 @@ static struct vm_operations_struct uvc_vm_ops = {</div><div class='ctx'> </div><div class='ctx'> static int uvc_v4l2_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *vdev = video_devdata(file);</div><div class='del'>-	struct uvc_video_device *video = video_get_drvdata(vdev);</div><div class='add'>+	struct uvc_video_device *video = video_drvdata(file);</div><div class='ctx'> 	struct uvc_buffer *uninitialized_var(buffer);</div><div class='ctx'> 	struct page *page;</div><div class='ctx'> 	unsigned long addr, start, size;</div><div class='hunk'>@@ -1085,8 +1077,7 @@ done:</div><div class='ctx'> </div><div class='ctx'> static unsigned int uvc_v4l2_poll(struct file *file, poll_table *wait)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *vdev = video_devdata(file);</div><div class='del'>-	struct uvc_video_device *video = video_get_drvdata(vdev);</div><div class='add'>+	struct uvc_video_device *video = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	uvc_trace(UVC_TRACE_CALLS, "uvc_v4l2_poll\n");</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/uvc/uvc_video.c b/drivers/media/video/uvc/uvc_video.c<br/>index 6854ac78a161..b7bb23820d80 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/uvc/uvc_video.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/uvc/uvc_video.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/uvc/uvc_video.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/uvc/uvc_video.c</a></div><div class='hunk'>@@ -455,7 +455,8 @@ static void uvc_video_decode_isoc(struct urb *urb,</div><div class='ctx'> 			urb-&gt;iso_frame_desc[i].actual_length - ret);</div><div class='ctx'> </div><div class='ctx'> 		/* Process the header again. */</div><div class='del'>-		uvc_video_decode_end(video, buf, mem, ret);</div><div class='add'>+		uvc_video_decode_end(video, buf, mem,</div><div class='add'>+			urb-&gt;iso_frame_desc[i].actual_length);</div><div class='ctx'> </div><div class='ctx'> 		if (buf-&gt;state == UVC_BUF_STATE_DONE ||</div><div class='ctx'> 		    buf-&gt;state == UVC_BUF_STATE_ERROR)</div><div class='hunk'>@@ -512,7 +513,7 @@ static void uvc_video_decode_bulk(struct urb *urb,</div><div class='ctx'> 	    video-&gt;bulk.payload_size &gt;= video-&gt;bulk.max_payload_size) {</div><div class='ctx'> 		if (!video-&gt;bulk.skip_payload &amp;&amp; buf != NULL) {</div><div class='ctx'> 			uvc_video_decode_end(video, buf, video-&gt;bulk.header,</div><div class='del'>-				video-&gt;bulk.header_size);</div><div class='add'>+				video-&gt;bulk.payload_size);</div><div class='ctx'> 			if (buf-&gt;state == UVC_BUF_STATE_DONE ||</div><div class='ctx'> 			    buf-&gt;state == UVC_BUF_STATE_ERROR)</div><div class='ctx'> 				buf = uvc_queue_next_buffer(&amp;video-&gt;queue, buf);</div><div class='hunk'>@@ -655,7 +656,7 @@ static int uvc_init_video_isoc(struct uvc_video_device *video,</div><div class='ctx'> 	if (size &gt; UVC_MAX_FRAME_SIZE)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	npackets = (size + psize - 1) / psize;</div><div class='add'>+	npackets = DIV_ROUND_UP(size, psize);</div><div class='ctx'> 	if (npackets &gt; UVC_MAX_ISO_PACKETS)</div><div class='ctx'> 		npackets = UVC_MAX_ISO_PACKETS;</div><div class='ctx'> </div><div class='hunk'>@@ -970,6 +971,11 @@ int uvc_video_enable(struct uvc_video_device *video, int enable)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (video-&gt;streaming-&gt;cur_format-&gt;flags &amp; UVC_FMT_FLAG_COMPRESSED)</div><div class='add'>+		video-&gt;queue.flags &amp;= ~UVC_QUEUE_DROP_INCOMPLETE;</div><div class='add'>+	else</div><div class='add'>+		video-&gt;queue.flags |= UVC_QUEUE_DROP_INCOMPLETE;</div><div class='add'>+</div><div class='ctx'> 	if ((ret = uvc_queue_enable(&amp;video-&gt;queue, 1)) &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/uvc/uvcvideo.h b/drivers/media/video/uvc/uvcvideo.h<br/>index bafe3406e305..9a6bc1aafb16 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/uvc/uvcvideo.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/uvc/uvcvideo.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/uvc/uvcvideo.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/uvc/uvcvideo.h</a></div><div class='hunk'>@@ -303,6 +303,8 @@ struct uvc_xu_control {</div><div class='ctx'> #define UVC_MAX_FRAME_SIZE	(16*1024*1024)</div><div class='ctx'> /* Maximum number of video buffers. */</div><div class='ctx'> #define UVC_MAX_VIDEO_BUFFERS	32</div><div class='add'>+/* Maximum status buffer size in bytes of interrupt URB. */</div><div class='add'>+#define UVC_MAX_STATUS_SIZE	16</div><div class='ctx'> </div><div class='ctx'> #define UVC_CTRL_CONTROL_TIMEOUT	300</div><div class='ctx'> #define UVC_CTRL_STREAMING_TIMEOUT	1000</div><div class='hunk'>@@ -634,7 +636,7 @@ struct uvc_device {</div><div class='ctx'> 	/* Status Interrupt Endpoint */</div><div class='ctx'> 	struct usb_host_endpoint *int_ep;</div><div class='ctx'> 	struct urb *int_urb;</div><div class='del'>-	__u8 status[16];</div><div class='add'>+	__u8 *status;</div><div class='ctx'> 	struct input_dev *input;</div><div class='ctx'> </div><div class='ctx'> 	/* Video Streaming interfaces */</div><div class='head'>diff --git a/drivers/media/video/v4l1-compat.c b/drivers/media/video/v4l1-compat.c<br/>index 79937d1031fc..928cb4037372 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/v4l1-compat.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/v4l1-compat.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/v4l1-compat.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/v4l1-compat.c</a></div><div class='hunk'>@@ -36,10 +36,6 @@</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_KMOD</div><div class='del'>-#include &lt;linux/kmod.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> static unsigned int debug;</div><div class='ctx'> module_param(debug, int, 0644);</div><div class='ctx'> MODULE_PARM_DESC(debug, "enable debug messages");</div><div class='head'>diff --git a/drivers/media/video/v4l2-common.c b/drivers/media/video/v4l2-common.c<br/>index 88ca13104417..846763d7349e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/v4l2-common.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/v4l2-common.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/v4l2-common.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/v4l2-common.c</a></div><div class='hunk'>@@ -60,10 +60,6 @@</div><div class='ctx'> #include &lt;media/v4l2-common.h&gt;</div><div class='ctx'> #include &lt;media/v4l2-chip-ident.h&gt;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_KMOD</div><div class='del'>-#include &lt;linux/kmod.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #include &lt;linux/videodev2.h&gt;</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Bill Dirks, Justin Schoeman, Gerd Knorr");</div><div class='hunk'>@@ -187,9 +183,11 @@ const char **v4l2_ctrl_get_menu(u32 id)</div><div class='ctx'> 		NULL</div><div class='ctx'> 	};</div><div class='ctx'> 	static const char *mpeg_audio_encoding[] = {</div><div class='del'>-		"Layer I",</div><div class='del'>-		"Layer II",</div><div class='del'>-		"Layer III",</div><div class='add'>+		"MPEG-1/2 Layer I",</div><div class='add'>+		"MPEG-1/2 Layer II",</div><div class='add'>+		"MPEG-1/2 Layer III",</div><div class='add'>+		"MPEG-2/4 AAC",</div><div class='add'>+		"AC-3",</div><div class='ctx'> 		NULL</div><div class='ctx'> 	};</div><div class='ctx'> 	static const char *mpeg_audio_l1_bitrate[] = {</div><div class='hunk'>@@ -243,6 +241,28 @@ const char **v4l2_ctrl_get_menu(u32 id)</div><div class='ctx'> 		"320 kbps",</div><div class='ctx'> 		NULL</div><div class='ctx'> 	};</div><div class='add'>+	static const char *mpeg_audio_ac3_bitrate[] = {</div><div class='add'>+		"32 kbps",</div><div class='add'>+		"40 kbps",</div><div class='add'>+		"48 kbps",</div><div class='add'>+		"56 kbps",</div><div class='add'>+		"64 kbps",</div><div class='add'>+		"80 kbps",</div><div class='add'>+		"96 kbps",</div><div class='add'>+		"112 kbps",</div><div class='add'>+		"128 kbps",</div><div class='add'>+		"160 kbps",</div><div class='add'>+		"192 kbps",</div><div class='add'>+		"224 kbps",</div><div class='add'>+		"256 kbps",</div><div class='add'>+		"320 kbps",</div><div class='add'>+		"384 kbps",</div><div class='add'>+		"448 kbps",</div><div class='add'>+		"512 kbps",</div><div class='add'>+		"576 kbps",</div><div class='add'>+		"640 kbps",</div><div class='add'>+		NULL</div><div class='add'>+	};</div><div class='ctx'> 	static const char *mpeg_audio_mode[] = {</div><div class='ctx'> 		"Stereo",</div><div class='ctx'> 		"Joint Stereo",</div><div class='hunk'>@@ -271,6 +291,7 @@ const char **v4l2_ctrl_get_menu(u32 id)</div><div class='ctx'> 	static const char *mpeg_video_encoding[] = {</div><div class='ctx'> 		"MPEG-1",</div><div class='ctx'> 		"MPEG-2",</div><div class='add'>+		"MPEG-4 AVC",</div><div class='ctx'> 		NULL</div><div class='ctx'> 	};</div><div class='ctx'> 	static const char *mpeg_video_aspect[] = {</div><div class='hunk'>@@ -311,6 +332,8 @@ const char **v4l2_ctrl_get_menu(u32 id)</div><div class='ctx'> 			return mpeg_audio_l2_bitrate;</div><div class='ctx'> 		case V4L2_CID_MPEG_AUDIO_L3_BITRATE:</div><div class='ctx'> 			return mpeg_audio_l3_bitrate;</div><div class='add'>+		case V4L2_CID_MPEG_AUDIO_AC3_BITRATE:</div><div class='add'>+			return mpeg_audio_ac3_bitrate;</div><div class='ctx'> 		case V4L2_CID_MPEG_AUDIO_MODE:</div><div class='ctx'> 			return mpeg_audio_mode;</div><div class='ctx'> 		case V4L2_CID_MPEG_AUDIO_MODE_EXTENSION:</div><div class='hunk'>@@ -335,62 +358,73 @@ const char **v4l2_ctrl_get_menu(u32 id)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(v4l2_ctrl_get_menu);</div><div class='ctx'> </div><div class='del'>-/* Fill in a struct v4l2_queryctrl */</div><div class='del'>-int v4l2_ctrl_query_fill(struct v4l2_queryctrl *qctrl, s32 min, s32 max, s32 step, s32 def)</div><div class='add'>+/* Return the control name. */</div><div class='add'>+const char *v4l2_ctrl_get_name(u32 id)</div><div class='ctx'> {</div><div class='del'>-	const char *name;</div><div class='del'>-</div><div class='del'>-	qctrl-&gt;flags = 0;</div><div class='del'>-	switch (qctrl-&gt;id) {</div><div class='add'>+	switch (id) {</div><div class='ctx'> 	/* USER controls */</div><div class='del'>-	case V4L2_CID_USER_CLASS: 	name = "User Controls"; break;</div><div class='del'>-	case V4L2_CID_AUDIO_VOLUME: 	name = "Volume"; break;</div><div class='del'>-	case V4L2_CID_AUDIO_MUTE: 	name = "Mute"; break;</div><div class='del'>-	case V4L2_CID_AUDIO_BALANCE: 	name = "Balance"; break;</div><div class='del'>-	case V4L2_CID_AUDIO_BASS: 	name = "Bass"; break;</div><div class='del'>-	case V4L2_CID_AUDIO_TREBLE: 	name = "Treble"; break;</div><div class='del'>-	case V4L2_CID_AUDIO_LOUDNESS: 	name = "Loudness"; break;</div><div class='del'>-	case V4L2_CID_BRIGHTNESS: 	name = "Brightness"; break;</div><div class='del'>-	case V4L2_CID_CONTRAST: 	name = "Contrast"; break;</div><div class='del'>-	case V4L2_CID_SATURATION: 	name = "Saturation"; break;</div><div class='del'>-	case V4L2_CID_HUE: 		name = "Hue"; break;</div><div class='add'>+	case V4L2_CID_USER_CLASS: 	return "User Controls";</div><div class='add'>+	case V4L2_CID_AUDIO_VOLUME: 	return "Volume";</div><div class='add'>+	case V4L2_CID_AUDIO_MUTE: 	return "Mute";</div><div class='add'>+	case V4L2_CID_AUDIO_BALANCE: 	return "Balance";</div><div class='add'>+	case V4L2_CID_AUDIO_BASS: 	return "Bass";</div><div class='add'>+	case V4L2_CID_AUDIO_TREBLE: 	return "Treble";</div><div class='add'>+	case V4L2_CID_AUDIO_LOUDNESS: 	return "Loudness";</div><div class='add'>+	case V4L2_CID_BRIGHTNESS: 	return "Brightness";</div><div class='add'>+	case V4L2_CID_CONTRAST: 	return "Contrast";</div><div class='add'>+	case V4L2_CID_SATURATION: 	return "Saturation";</div><div class='add'>+	case V4L2_CID_HUE: 		return "Hue";</div><div class='ctx'> </div><div class='ctx'> 	/* MPEG controls */</div><div class='del'>-	case V4L2_CID_MPEG_CLASS: 		name = "MPEG Encoder Controls"; break;</div><div class='del'>-	case V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ: name = "Audio Sampling Frequency"; break;</div><div class='del'>-	case V4L2_CID_MPEG_AUDIO_ENCODING: 	name = "Audio Encoding Layer"; break;</div><div class='del'>-	case V4L2_CID_MPEG_AUDIO_L1_BITRATE: 	name = "Audio Layer I Bitrate"; break;</div><div class='del'>-	case V4L2_CID_MPEG_AUDIO_L2_BITRATE: 	name = "Audio Layer II Bitrate"; break;</div><div class='del'>-	case V4L2_CID_MPEG_AUDIO_L3_BITRATE: 	name = "Audio Layer III Bitrate"; break;</div><div class='del'>-	case V4L2_CID_MPEG_AUDIO_MODE: 		name = "Audio Stereo Mode"; break;</div><div class='del'>-	case V4L2_CID_MPEG_AUDIO_MODE_EXTENSION: name = "Audio Stereo Mode Extension"; break;</div><div class='del'>-	case V4L2_CID_MPEG_AUDIO_EMPHASIS: 	name = "Audio Emphasis"; break;</div><div class='del'>-	case V4L2_CID_MPEG_AUDIO_CRC: 		name = "Audio CRC"; break;</div><div class='del'>-	case V4L2_CID_MPEG_AUDIO_MUTE: 		name = "Audio Mute"; break;</div><div class='del'>-	case V4L2_CID_MPEG_VIDEO_ENCODING: 	name = "Video Encoding"; break;</div><div class='del'>-	case V4L2_CID_MPEG_VIDEO_ASPECT: 	name = "Video Aspect"; break;</div><div class='del'>-	case V4L2_CID_MPEG_VIDEO_B_FRAMES: 	name = "Video B Frames"; break;</div><div class='del'>-	case V4L2_CID_MPEG_VIDEO_GOP_SIZE: 	name = "Video GOP Size"; break;</div><div class='del'>-	case V4L2_CID_MPEG_VIDEO_GOP_CLOSURE: 	name = "Video GOP Closure"; break;</div><div class='del'>-	case V4L2_CID_MPEG_VIDEO_PULLDOWN: 	name = "Video Pulldown"; break;</div><div class='del'>-	case V4L2_CID_MPEG_VIDEO_BITRATE_MODE: 	name = "Video Bitrate Mode"; break;</div><div class='del'>-	case V4L2_CID_MPEG_VIDEO_BITRATE: 	name = "Video Bitrate"; break;</div><div class='del'>-	case V4L2_CID_MPEG_VIDEO_BITRATE_PEAK: 	name = "Video Peak Bitrate"; break;</div><div class='del'>-	case V4L2_CID_MPEG_VIDEO_TEMPORAL_DECIMATION: name = "Video Temporal Decimation"; break;</div><div class='del'>-	case V4L2_CID_MPEG_VIDEO_MUTE: 		name = "Video Mute"; break;</div><div class='del'>-	case V4L2_CID_MPEG_VIDEO_MUTE_YUV:	name = "Video Mute YUV"; break;</div><div class='del'>-	case V4L2_CID_MPEG_STREAM_TYPE: 	name = "Stream Type"; break;</div><div class='del'>-	case V4L2_CID_MPEG_STREAM_PID_PMT: 	name = "Stream PMT Program ID"; break;</div><div class='del'>-	case V4L2_CID_MPEG_STREAM_PID_AUDIO: 	name = "Stream Audio Program ID"; break;</div><div class='del'>-	case V4L2_CID_MPEG_STREAM_PID_VIDEO: 	name = "Stream Video Program ID"; break;</div><div class='del'>-	case V4L2_CID_MPEG_STREAM_PID_PCR: 	name = "Stream PCR Program ID"; break;</div><div class='del'>-	case V4L2_CID_MPEG_STREAM_PES_ID_AUDIO: name = "Stream PES Audio ID"; break;</div><div class='del'>-	case V4L2_CID_MPEG_STREAM_PES_ID_VIDEO: name = "Stream PES Video ID"; break;</div><div class='del'>-	case V4L2_CID_MPEG_STREAM_VBI_FMT:	name = "Stream VBI Format"; break;</div><div class='add'>+	case V4L2_CID_MPEG_CLASS: 		return "MPEG Encoder Controls";</div><div class='add'>+	case V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ: return "Audio Sampling Frequency";</div><div class='add'>+	case V4L2_CID_MPEG_AUDIO_ENCODING: 	return "Audio Encoding";</div><div class='add'>+	case V4L2_CID_MPEG_AUDIO_L1_BITRATE: 	return "Audio Layer I Bitrate";</div><div class='add'>+	case V4L2_CID_MPEG_AUDIO_L2_BITRATE: 	return "Audio Layer II Bitrate";</div><div class='add'>+	case V4L2_CID_MPEG_AUDIO_L3_BITRATE: 	return "Audio Layer III Bitrate";</div><div class='add'>+	case V4L2_CID_MPEG_AUDIO_AAC_BITRATE: 	return "Audio AAC Bitrate";</div><div class='add'>+	case V4L2_CID_MPEG_AUDIO_AC3_BITRATE: 	return "Audio AC-3 Bitrate";</div><div class='add'>+	case V4L2_CID_MPEG_AUDIO_MODE: 		return "Audio Stereo Mode";</div><div class='add'>+	case V4L2_CID_MPEG_AUDIO_MODE_EXTENSION: return "Audio Stereo Mode Extension";</div><div class='add'>+	case V4L2_CID_MPEG_AUDIO_EMPHASIS: 	return "Audio Emphasis";</div><div class='add'>+	case V4L2_CID_MPEG_AUDIO_CRC: 		return "Audio CRC";</div><div class='add'>+	case V4L2_CID_MPEG_AUDIO_MUTE: 		return "Audio Mute";</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_ENCODING: 	return "Video Encoding";</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_ASPECT: 	return "Video Aspect";</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_B_FRAMES: 	return "Video B Frames";</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_GOP_SIZE: 	return "Video GOP Size";</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_GOP_CLOSURE: 	return "Video GOP Closure";</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_PULLDOWN: 	return "Video Pulldown";</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_BITRATE_MODE: 	return "Video Bitrate Mode";</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_BITRATE: 	return "Video Bitrate";</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_BITRATE_PEAK: 	return "Video Peak Bitrate";</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_TEMPORAL_DECIMATION: return "Video Temporal Decimation";</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_MUTE: 		return "Video Mute";</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_MUTE_YUV:	return "Video Mute YUV";</div><div class='add'>+	case V4L2_CID_MPEG_STREAM_TYPE: 	return "Stream Type";</div><div class='add'>+	case V4L2_CID_MPEG_STREAM_PID_PMT: 	return "Stream PMT Program ID";</div><div class='add'>+	case V4L2_CID_MPEG_STREAM_PID_AUDIO: 	return "Stream Audio Program ID";</div><div class='add'>+	case V4L2_CID_MPEG_STREAM_PID_VIDEO: 	return "Stream Video Program ID";</div><div class='add'>+	case V4L2_CID_MPEG_STREAM_PID_PCR: 	return "Stream PCR Program ID";</div><div class='add'>+	case V4L2_CID_MPEG_STREAM_PES_ID_AUDIO: return "Stream PES Audio ID";</div><div class='add'>+	case V4L2_CID_MPEG_STREAM_PES_ID_VIDEO: return "Stream PES Video ID";</div><div class='add'>+	case V4L2_CID_MPEG_STREAM_VBI_FMT:	return "Stream VBI Format";</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		return NULL;</div><div class='ctx'> 	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(v4l2_ctrl_get_name);</div><div class='add'>+</div><div class='add'>+/* Fill in a struct v4l2_queryctrl */</div><div class='add'>+int v4l2_ctrl_query_fill(struct v4l2_queryctrl *qctrl, s32 min, s32 max, s32 step, s32 def)</div><div class='add'>+{</div><div class='add'>+	const char *name = v4l2_ctrl_get_name(qctrl-&gt;id);</div><div class='add'>+</div><div class='add'>+	qctrl-&gt;flags = 0;</div><div class='add'>+	if (name == NULL)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	switch (qctrl-&gt;id) {</div><div class='ctx'> 	case V4L2_CID_AUDIO_MUTE:</div><div class='ctx'> 	case V4L2_CID_AUDIO_LOUDNESS:</div><div class='hunk'>@@ -407,6 +441,7 @@ int v4l2_ctrl_query_fill(struct v4l2_queryctrl *qctrl, s32 min, s32 max, s32 ste</div><div class='ctx'> 	case V4L2_CID_MPEG_AUDIO_L1_BITRATE:</div><div class='ctx'> 	case V4L2_CID_MPEG_AUDIO_L2_BITRATE:</div><div class='ctx'> 	case V4L2_CID_MPEG_AUDIO_L3_BITRATE:</div><div class='add'>+	case V4L2_CID_MPEG_AUDIO_AC3_BITRATE:</div><div class='ctx'> 	case V4L2_CID_MPEG_AUDIO_MODE:</div><div class='ctx'> 	case V4L2_CID_MPEG_AUDIO_MODE_EXTENSION:</div><div class='ctx'> 	case V4L2_CID_MPEG_AUDIO_EMPHASIS:</div><div class='hunk'>@@ -493,7 +528,7 @@ int v4l2_ctrl_query_fill_std(struct v4l2_queryctrl *qctrl)</div><div class='ctx'> 	case V4L2_CID_MPEG_AUDIO_ENCODING:</div><div class='ctx'> 		return v4l2_ctrl_query_fill(qctrl,</div><div class='ctx'> 				V4L2_MPEG_AUDIO_ENCODING_LAYER_1,</div><div class='del'>-				V4L2_MPEG_AUDIO_ENCODING_LAYER_3, 1,</div><div class='add'>+				V4L2_MPEG_AUDIO_ENCODING_AC3, 1,</div><div class='ctx'> 				V4L2_MPEG_AUDIO_ENCODING_LAYER_2);</div><div class='ctx'> 	case V4L2_CID_MPEG_AUDIO_L1_BITRATE:</div><div class='ctx'> 		return v4l2_ctrl_query_fill(qctrl,</div><div class='hunk'>@@ -510,6 +545,13 @@ int v4l2_ctrl_query_fill_std(struct v4l2_queryctrl *qctrl)</div><div class='ctx'> 				V4L2_MPEG_AUDIO_L3_BITRATE_32K,</div><div class='ctx'> 				V4L2_MPEG_AUDIO_L3_BITRATE_320K, 1,</div><div class='ctx'> 				V4L2_MPEG_AUDIO_L3_BITRATE_192K);</div><div class='add'>+	case V4L2_CID_MPEG_AUDIO_AAC_BITRATE:</div><div class='add'>+		return v4l2_ctrl_query_fill(qctrl, 0, 6400, 1, 3200000);</div><div class='add'>+	case V4L2_CID_MPEG_AUDIO_AC3_BITRATE:</div><div class='add'>+		return v4l2_ctrl_query_fill(qctrl,</div><div class='add'>+				V4L2_MPEG_AUDIO_AC3_BITRATE_32K,</div><div class='add'>+				V4L2_MPEG_AUDIO_AC3_BITRATE_640K, 1,</div><div class='add'>+				V4L2_MPEG_AUDIO_AC3_BITRATE_384K);</div><div class='ctx'> 	case V4L2_CID_MPEG_AUDIO_MODE:</div><div class='ctx'> 		return v4l2_ctrl_query_fill(qctrl,</div><div class='ctx'> 				V4L2_MPEG_AUDIO_MODE_STEREO,</div><div class='hunk'>@@ -535,7 +577,7 @@ int v4l2_ctrl_query_fill_std(struct v4l2_queryctrl *qctrl)</div><div class='ctx'> 	case V4L2_CID_MPEG_VIDEO_ENCODING:</div><div class='ctx'> 		return v4l2_ctrl_query_fill(qctrl,</div><div class='ctx'> 				V4L2_MPEG_VIDEO_ENCODING_MPEG_1,</div><div class='del'>-				V4L2_MPEG_VIDEO_ENCODING_MPEG_2, 1,</div><div class='add'>+				V4L2_MPEG_VIDEO_ENCODING_MPEG_4_AVC, 1,</div><div class='ctx'> 				V4L2_MPEG_VIDEO_ENCODING_MPEG_2);</div><div class='ctx'> 	case V4L2_CID_MPEG_VIDEO_ASPECT:</div><div class='ctx'> 		return v4l2_ctrl_query_fill(qctrl,</div><div class='hunk'>@@ -594,12 +636,17 @@ int v4l2_ctrl_query_fill_std(struct v4l2_queryctrl *qctrl)</div><div class='ctx'> EXPORT_SYMBOL(v4l2_ctrl_query_fill_std);</div><div class='ctx'> </div><div class='ctx'> /* Fill in a struct v4l2_querymenu based on the struct v4l2_queryctrl and</div><div class='del'>-   the menu. The qctrl pointer may be NULL, in which case it is ignored. */</div><div class='add'>+   the menu. The qctrl pointer may be NULL, in which case it is ignored.</div><div class='add'>+   If menu_items is NULL, then the menu items are retrieved using</div><div class='add'>+   v4l2_ctrl_get_menu. */</div><div class='ctx'> int v4l2_ctrl_query_menu(struct v4l2_querymenu *qmenu, struct v4l2_queryctrl *qctrl,</div><div class='ctx'> 	       const char **menu_items)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	qmenu-&gt;reserved = 0;</div><div class='add'>+	if (menu_items == NULL)</div><div class='add'>+		menu_items = v4l2_ctrl_get_menu(qmenu-&gt;id);</div><div class='ctx'> 	if (menu_items == NULL ||</div><div class='ctx'> 	    (qctrl &amp;&amp; (qmenu-&gt;index &lt; qctrl-&gt;minimum || qmenu-&gt;index &gt; qctrl-&gt;maximum)))</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -607,11 +654,31 @@ int v4l2_ctrl_query_menu(struct v4l2_querymenu *qmenu, struct v4l2_queryctrl *qc</div><div class='ctx'> 	if (menu_items[i] == NULL || menu_items[i][0] == '\0')</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	snprintf(qmenu-&gt;name, sizeof(qmenu-&gt;name), menu_items[qmenu-&gt;index]);</div><div class='del'>-	qmenu-&gt;reserved = 0;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(v4l2_ctrl_query_menu);</div><div class='ctx'> </div><div class='add'>+/* Fill in a struct v4l2_querymenu based on the specified array of valid</div><div class='add'>+   menu items (terminated by V4L2_CTRL_MENU_IDS_END).</div><div class='add'>+   Use this if there are 'holes' in the list of valid menu items. */</div><div class='add'>+int v4l2_ctrl_query_menu_valid_items(struct v4l2_querymenu *qmenu, const u32 *ids)</div><div class='add'>+{</div><div class='add'>+	const char **menu_items = v4l2_ctrl_get_menu(qmenu-&gt;id);</div><div class='add'>+</div><div class='add'>+	qmenu-&gt;reserved = 0;</div><div class='add'>+	if (menu_items == NULL || ids == NULL)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	while (*ids != V4L2_CTRL_MENU_IDS_END) {</div><div class='add'>+		if (*ids++ == qmenu-&gt;index) {</div><div class='add'>+			snprintf(qmenu-&gt;name, sizeof(qmenu-&gt;name),</div><div class='add'>+				       menu_items[qmenu-&gt;index]);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(v4l2_ctrl_query_menu_valid_items);</div><div class='add'>+</div><div class='ctx'> /* ctrl_classes points to an array of u32 pointers, the last element is</div><div class='ctx'>    a NULL pointer. Each u32 array is a 0-terminated array of control IDs.</div><div class='ctx'>    Each array must be sorted low to high and belong to the same control</div><div class='head'>diff --git a/drivers/media/video/v4l2-dev.c b/drivers/media/video/v4l2-dev.c<br/>index 155fdec9ac7d..ccd6566a515e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/v4l2-dev.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/v4l2-dev.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/v4l2-dev.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/v4l2-dev.c</a></div><div class='hunk'>@@ -42,6 +42,7 @@ static ssize_t show_index(struct device *cd,</div><div class='ctx'> 			 struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct video_device *vfd = container_of(cd, struct video_device, dev);</div><div class='add'>+</div><div class='ctx'> 	return sprintf(buf, "%i\n", vfd-&gt;index);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -49,6 +50,7 @@ static ssize_t show_name(struct device *cd,</div><div class='ctx'> 			 struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct video_device *vfd = container_of(cd, struct video_device, dev);</div><div class='add'>+</div><div class='ctx'> 	return sprintf(buf, "%.*s\n", (int)sizeof(vfd-&gt;name), vfd-&gt;name);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -58,12 +60,16 @@ static struct device_attribute video_device_attrs[] = {</div><div class='ctx'> 	__ATTR_NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ *	Active devices</div><div class='add'>+ */</div><div class='add'>+static struct video_device *video_device[VIDEO_NUM_DEVICES];</div><div class='add'>+static DEFINE_MUTEX(videodev_lock);</div><div class='add'>+static DECLARE_BITMAP(video_nums[VFL_TYPE_MAX], VIDEO_NUM_DEVICES);</div><div class='add'>+</div><div class='ctx'> struct video_device *video_device_alloc(void)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *vfd;</div><div class='del'>-</div><div class='del'>-	vfd = kzalloc(sizeof(*vfd), GFP_KERNEL);</div><div class='del'>-	return vfd;</div><div class='add'>+	return kzalloc(sizeof(struct video_device), GFP_KERNEL);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(video_device_alloc);</div><div class='ctx'> </div><div class='hunk'>@@ -73,16 +79,52 @@ void video_device_release(struct video_device *vfd)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(video_device_release);</div><div class='ctx'> </div><div class='add'>+void video_device_release_empty(struct video_device *vfd)</div><div class='add'>+{</div><div class='add'>+	/* Do nothing */</div><div class='add'>+	/* Only valid when the video_device struct is a static. */</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(video_device_release_empty);</div><div class='add'>+</div><div class='add'>+/* Called when the last user of the character device is gone. */</div><div class='add'>+static void v4l2_chardev_release(struct kobject *kobj)</div><div class='add'>+{</div><div class='add'>+	struct video_device *vfd = container_of(kobj, struct video_device, cdev.kobj);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;videodev_lock);</div><div class='add'>+	if (video_device[vfd-&gt;minor] != vfd) {</div><div class='add'>+		mutex_unlock(&amp;videodev_lock);</div><div class='add'>+		BUG();</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Free up this device for reuse */</div><div class='add'>+	video_device[vfd-&gt;minor] = NULL;</div><div class='add'>+	clear_bit(vfd-&gt;num, video_nums[vfd-&gt;vfl_type]);</div><div class='add'>+	mutex_unlock(&amp;videodev_lock);</div><div class='add'>+</div><div class='add'>+	/* Release the character device */</div><div class='add'>+	vfd-&gt;cdev_release(kobj);</div><div class='add'>+	/* Release video_device and perform other</div><div class='add'>+	   cleanups as needed. */</div><div class='add'>+	if (vfd-&gt;release)</div><div class='add'>+		vfd-&gt;release(vfd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* The new kobj_type for the character device */</div><div class='add'>+static struct kobj_type v4l2_ktype_cdev_default = {</div><div class='add'>+	.release = v4l2_chardev_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static void video_release(struct device *cd)</div><div class='ctx'> {</div><div class='ctx'> 	struct video_device *vfd = container_of(cd, struct video_device, dev);</div><div class='ctx'> </div><div class='del'>-#if 1</div><div class='del'>-	/* needed until all drivers are fixed */</div><div class='del'>-	if (!vfd-&gt;release)</div><div class='del'>-		return;</div><div class='del'>-#endif</div><div class='del'>-	vfd-&gt;release(vfd);</div><div class='add'>+	/* It's now safe to delete the char device.</div><div class='add'>+	   This will either trigger the v4l2_chardev_release immediately (if</div><div class='add'>+	   the refcount goes to 0) or later when the last user of the</div><div class='add'>+	   character device closes it. */</div><div class='add'>+	cdev_del(&amp;vfd-&gt;cdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct class video_class = {</div><div class='hunk'>@@ -91,87 +133,12 @@ static struct class video_class = {</div><div class='ctx'> 	.dev_release = video_release,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- *	Active devices</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static struct video_device *video_device[VIDEO_NUM_DEVICES];</div><div class='del'>-static DEFINE_MUTEX(videodev_lock);</div><div class='del'>-</div><div class='ctx'> struct video_device *video_devdata(struct file *file)</div><div class='ctx'> {</div><div class='ctx'> 	return video_device[iminor(file-&gt;f_path.dentry-&gt;d_inode)];</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(video_devdata);</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- *	Open a video device - FIXME: Obsoleted</div><div class='del'>- */</div><div class='del'>-static int video_open(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	unsigned int minor = iminor(inode);</div><div class='del'>-	int err = 0;</div><div class='del'>-	struct video_device *vfl;</div><div class='del'>-	const struct file_operations *old_fops;</div><div class='del'>-</div><div class='del'>-	if (minor &gt;= VIDEO_NUM_DEVICES)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	lock_kernel();</div><div class='del'>-	mutex_lock(&amp;videodev_lock);</div><div class='del'>-	vfl = video_device[minor];</div><div class='del'>-	if (vfl == NULL) {</div><div class='del'>-		mutex_unlock(&amp;videodev_lock);</div><div class='del'>-		request_module("char-major-%d-%d", VIDEO_MAJOR, minor);</div><div class='del'>-		mutex_lock(&amp;videodev_lock);</div><div class='del'>-		vfl = video_device[minor];</div><div class='del'>-		if (vfl == NULL) {</div><div class='del'>-			mutex_unlock(&amp;videodev_lock);</div><div class='del'>-			unlock_kernel();</div><div class='del'>-			return -ENODEV;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	old_fops = file-&gt;f_op;</div><div class='del'>-	file-&gt;f_op = fops_get(vfl-&gt;fops);</div><div class='del'>-	if (file-&gt;f_op-&gt;open)</div><div class='del'>-		err = file-&gt;f_op-&gt;open(inode, file);</div><div class='del'>-	if (err) {</div><div class='del'>-		fops_put(file-&gt;f_op);</div><div class='del'>-		file-&gt;f_op = fops_get(old_fops);</div><div class='del'>-	}</div><div class='del'>-	fops_put(old_fops);</div><div class='del'>-	mutex_unlock(&amp;videodev_lock);</div><div class='del'>-	unlock_kernel();</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * open/release helper functions -- handle exclusive opens</div><div class='del'>- * Should be removed soon</div><div class='del'>- */</div><div class='del'>-int video_exclusive_open(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	struct video_device *vfl = video_devdata(file);</div><div class='del'>-	int retval = 0;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;vfl-&gt;lock);</div><div class='del'>-	if (vfl-&gt;users)</div><div class='del'>-		retval = -EBUSY;</div><div class='del'>-	else</div><div class='del'>-		vfl-&gt;users++;</div><div class='del'>-	mutex_unlock(&amp;vfl-&gt;lock);</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(video_exclusive_open);</div><div class='del'>-</div><div class='del'>-int video_exclusive_release(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	struct video_device *vfl = video_devdata(file);</div><div class='del'>-</div><div class='del'>-	vfl-&gt;users--;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(video_exclusive_release);</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * get_index - assign stream number based on parent device</div><div class='ctx'>  * @vdev: video_device to assign index number to, vdev-&gt;dev should be assigned</div><div class='hunk'>@@ -252,33 +219,29 @@ int video_register_device_index(struct video_device *vfd, int type, int nr,</div><div class='ctx'> 					int index)</div><div class='ctx'> {</div><div class='ctx'> 	int i = 0;</div><div class='del'>-	int base;</div><div class='del'>-	int end;</div><div class='ctx'> 	int ret;</div><div class='del'>-	char *name_base;</div><div class='add'>+	int minor_offset = 0;</div><div class='add'>+	int minor_cnt = VIDEO_NUM_DEVICES;</div><div class='add'>+	const char *name_base;</div><div class='add'>+	void *priv = video_get_drvdata(vfd);</div><div class='add'>+</div><div class='add'>+	/* the release callback MUST be present */</div><div class='add'>+	BUG_ON(!vfd-&gt;release);</div><div class='ctx'> </div><div class='ctx'> 	if (vfd == NULL)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	switch (type) {</div><div class='ctx'> 	case VFL_TYPE_GRABBER:</div><div class='del'>-		base = MINOR_VFL_TYPE_GRABBER_MIN;</div><div class='del'>-		end = MINOR_VFL_TYPE_GRABBER_MAX+1;</div><div class='ctx'> 		name_base = "video";</div><div class='ctx'> 		break;</div><div class='ctx'> 	case VFL_TYPE_VTX:</div><div class='del'>-		base = MINOR_VFL_TYPE_VTX_MIN;</div><div class='del'>-		end = MINOR_VFL_TYPE_VTX_MAX+1;</div><div class='ctx'> 		name_base = "vtx";</div><div class='ctx'> 		break;</div><div class='ctx'> 	case VFL_TYPE_VBI:</div><div class='del'>-		base = MINOR_VFL_TYPE_VBI_MIN;</div><div class='del'>-		end = MINOR_VFL_TYPE_VBI_MAX+1;</div><div class='ctx'> 		name_base = "vbi";</div><div class='ctx'> 		break;</div><div class='ctx'> 	case VFL_TYPE_RADIO:</div><div class='del'>-		base = MINOR_VFL_TYPE_RADIO_MIN;</div><div class='del'>-		end = MINOR_VFL_TYPE_RADIO_MAX+1;</div><div class='ctx'> 		name_base = "radio";</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -287,28 +250,70 @@ int video_register_device_index(struct video_device *vfd, int type, int nr,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	vfd-&gt;vfl_type = type;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_VIDEO_FIXED_MINOR_RANGES</div><div class='add'>+	/* Keep the ranges for the first four types for historical</div><div class='add'>+	 * reasons.</div><div class='add'>+	 * Newer devices (not yet in place) should use the range</div><div class='add'>+	 * of 128-191 and just pick the first free minor there</div><div class='add'>+	 * (new style). */</div><div class='add'>+	switch (type) {</div><div class='add'>+	case VFL_TYPE_GRABBER:</div><div class='add'>+		minor_offset = 0;</div><div class='add'>+		minor_cnt = 64;</div><div class='add'>+		break;</div><div class='add'>+	case VFL_TYPE_RADIO:</div><div class='add'>+		minor_offset = 64;</div><div class='add'>+		minor_cnt = 64;</div><div class='add'>+		break;</div><div class='add'>+	case VFL_TYPE_VTX:</div><div class='add'>+		minor_offset = 192;</div><div class='add'>+		minor_cnt = 32;</div><div class='add'>+		break;</div><div class='add'>+	case VFL_TYPE_VBI:</div><div class='add'>+		minor_offset = 224;</div><div class='add'>+		minor_cnt = 32;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		minor_offset = 128;</div><div class='add'>+		minor_cnt = 64;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* Initialize the character device */</div><div class='add'>+	cdev_init(&amp;vfd-&gt;cdev, vfd-&gt;fops);</div><div class='add'>+	vfd-&gt;cdev.owner = vfd-&gt;fops-&gt;owner;</div><div class='ctx'> 	/* pick a minor number */</div><div class='ctx'> 	mutex_lock(&amp;videodev_lock);</div><div class='del'>-	if (nr &gt;= 0  &amp;&amp;  nr &lt; end-base) {</div><div class='del'>-		/* use the one the driver asked for */</div><div class='del'>-		i = base + nr;</div><div class='del'>-		if (NULL != video_device[i]) {</div><div class='del'>-			mutex_unlock(&amp;videodev_lock);</div><div class='del'>-			return -ENFILE;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		/* use first free */</div><div class='del'>-		for (i = base; i &lt; end; i++)</div><div class='del'>-			if (NULL == video_device[i])</div><div class='del'>-				break;</div><div class='del'>-		if (i == end) {</div><div class='del'>-			mutex_unlock(&amp;videodev_lock);</div><div class='del'>-			return -ENFILE;</div><div class='del'>-		}</div><div class='add'>+	nr = find_next_zero_bit(video_nums[type], minor_cnt, nr == -1 ? 0 : nr);</div><div class='add'>+	if (nr == minor_cnt)</div><div class='add'>+		nr = find_first_zero_bit(video_nums[type], minor_cnt);</div><div class='add'>+	if (nr == minor_cnt) {</div><div class='add'>+		printk(KERN_ERR "could not get a free kernel number\n");</div><div class='add'>+		mutex_unlock(&amp;videodev_lock);</div><div class='add'>+		return -ENFILE;</div><div class='ctx'> 	}</div><div class='del'>-	video_device[i] = vfd;</div><div class='del'>-	vfd-&gt;vfl_type = type;</div><div class='del'>-	vfd-&gt;minor = i;</div><div class='add'>+#ifdef CONFIG_VIDEO_FIXED_MINOR_RANGES</div><div class='add'>+	/* 1-on-1 mapping of kernel number to minor number */</div><div class='add'>+	i = nr;</div><div class='add'>+#else</div><div class='add'>+	/* The kernel number and minor numbers are independent */</div><div class='add'>+	for (i = 0; i &lt; VIDEO_NUM_DEVICES; i++)</div><div class='add'>+		if (video_device[i] == NULL)</div><div class='add'>+			break;</div><div class='add'>+	if (i == VIDEO_NUM_DEVICES) {</div><div class='add'>+		mutex_unlock(&amp;videodev_lock);</div><div class='add'>+		printk(KERN_ERR "could not get a free minor\n");</div><div class='add'>+		return -ENFILE;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	vfd-&gt;minor = i + minor_offset;</div><div class='add'>+	vfd-&gt;num = nr;</div><div class='add'>+	set_bit(nr, video_nums[type]);</div><div class='add'>+	BUG_ON(video_device[vfd-&gt;minor]);</div><div class='add'>+	video_device[vfd-&gt;minor] = vfd;</div><div class='ctx'> </div><div class='ctx'> 	ret = get_index(vfd, index);</div><div class='ctx'> 	vfd-&gt;index = ret;</div><div class='hunk'>@@ -320,35 +325,41 @@ int video_register_device_index(struct video_device *vfd, int type, int nr,</div><div class='ctx'> 		goto fail_minor;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mutex_init(&amp;vfd-&gt;lock);</div><div class='del'>-</div><div class='add'>+	ret = cdev_add(&amp;vfd-&gt;cdev, MKDEV(VIDEO_MAJOR, vfd-&gt;minor), 1);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		printk(KERN_ERR "%s: cdev_add failed\n", __func__);</div><div class='add'>+		goto fail_minor;</div><div class='add'>+	}</div><div class='ctx'> 	/* sysfs class */</div><div class='del'>-	memset(&amp;vfd-&gt;dev, 0x00, sizeof(vfd-&gt;dev));</div><div class='add'>+	memset(&amp;vfd-&gt;dev, 0, sizeof(vfd-&gt;dev));</div><div class='add'>+	/* The memset above cleared the device's drvdata, so</div><div class='add'>+	   put back the copy we made earlier. */</div><div class='add'>+	video_set_drvdata(vfd, priv);</div><div class='ctx'> 	vfd-&gt;dev.class = &amp;video_class;</div><div class='ctx'> 	vfd-&gt;dev.devt = MKDEV(VIDEO_MAJOR, vfd-&gt;minor);</div><div class='ctx'> 	if (vfd-&gt;parent)</div><div class='ctx'> 		vfd-&gt;dev.parent = vfd-&gt;parent;</div><div class='del'>-	sprintf(vfd-&gt;dev.bus_id, "%s%d", name_base, i - base);</div><div class='add'>+	sprintf(vfd-&gt;dev.bus_id, "%s%d", name_base, nr);</div><div class='ctx'> 	ret = device_register(&amp;vfd-&gt;dev);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		printk(KERN_ERR "%s: device_register failed\n", __func__);</div><div class='del'>-		goto fail_minor;</div><div class='add'>+		goto del_cdev;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-#if 1</div><div class='del'>-	/* needed until all drivers are fixed */</div><div class='del'>-	if (!vfd-&gt;release)</div><div class='del'>-		printk(KERN_WARNING "videodev: \"%s\" has no release callback. "</div><div class='del'>-		       "Please fix your driver for proper sysfs support, see "</div><div class='del'>-		       "http://lwn.net/Articles/36850/\n", vfd-&gt;name);</div><div class='del'>-#endif</div><div class='add'>+	/* Remember the cdev's release function */</div><div class='add'>+	vfd-&gt;cdev_release = vfd-&gt;cdev.kobj.ktype-&gt;release;</div><div class='add'>+	/* Install our own */</div><div class='add'>+	vfd-&gt;cdev.kobj.ktype = &amp;v4l2_ktype_cdev_default;</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='add'>+del_cdev:</div><div class='add'>+	cdev_del(&amp;vfd-&gt;cdev);</div><div class='add'>+</div><div class='ctx'> fail_minor:</div><div class='ctx'> 	mutex_lock(&amp;videodev_lock);</div><div class='ctx'> 	video_device[vfd-&gt;minor] = NULL;</div><div class='del'>-	vfd-&gt;minor = -1;</div><div class='add'>+	clear_bit(vfd-&gt;num, video_nums[type]);</div><div class='ctx'> 	mutex_unlock(&amp;videodev_lock);</div><div class='add'>+	vfd-&gt;minor = -1;</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(video_register_device_index);</div><div class='hunk'>@@ -363,42 +374,29 @@ EXPORT_SYMBOL(video_register_device_index);</div><div class='ctx'> </div><div class='ctx'> void video_unregister_device(struct video_device *vfd)</div><div class='ctx'> {</div><div class='del'>-	mutex_lock(&amp;videodev_lock);</div><div class='del'>-	if (video_device[vfd-&gt;minor] != vfd)</div><div class='del'>-		panic("videodev: bad unregister");</div><div class='del'>-</div><div class='del'>-	video_device[vfd-&gt;minor] = NULL;</div><div class='ctx'> 	device_unregister(&amp;vfd-&gt;dev);</div><div class='del'>-	mutex_unlock(&amp;videodev_lock);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(video_unregister_device);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Video fs operations</div><div class='del'>- */</div><div class='del'>-static const struct file_operations video_fops = {</div><div class='del'>-	.owner		= THIS_MODULE,</div><div class='del'>-	.llseek		= no_llseek,</div><div class='del'>-	.open		= video_open,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  *	Initialise video for linux</div><div class='ctx'>  */</div><div class='del'>-</div><div class='ctx'> static int __init videodev_init(void)</div><div class='ctx'> {</div><div class='add'>+	dev_t dev = MKDEV(VIDEO_MAJOR, 0);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_INFO "Linux video capture interface: v2.00\n");</div><div class='del'>-	if (register_chrdev(VIDEO_MAJOR, VIDEO_NAME, &amp;video_fops)) {</div><div class='del'>-		printk(KERN_WARNING "video_dev: unable to get major %d\n", VIDEO_MAJOR);</div><div class='del'>-		return -EIO;</div><div class='add'>+	ret = register_chrdev_region(dev, VIDEO_NUM_DEVICES, VIDEO_NAME);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		printk(KERN_WARNING "videodev: unable to get major %d\n",</div><div class='add'>+				VIDEO_MAJOR);</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = class_register(&amp;video_class);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='del'>-		unregister_chrdev(VIDEO_MAJOR, VIDEO_NAME);</div><div class='add'>+		unregister_chrdev_region(dev, VIDEO_NUM_DEVICES);</div><div class='ctx'> 		printk(KERN_WARNING "video_dev: class_register failed\n");</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -408,8 +406,10 @@ static int __init videodev_init(void)</div><div class='ctx'> </div><div class='ctx'> static void __exit videodev_exit(void)</div><div class='ctx'> {</div><div class='add'>+	dev_t dev = MKDEV(VIDEO_MAJOR, 0);</div><div class='add'>+</div><div class='ctx'> 	class_unregister(&amp;video_class);</div><div class='del'>-	unregister_chrdev(VIDEO_MAJOR, VIDEO_NAME);</div><div class='add'>+	unregister_chrdev_region(dev, VIDEO_NUM_DEVICES);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(videodev_init)</div><div class='head'>diff --git a/drivers/media/video/v4l2-ioctl.c b/drivers/media/video/v4l2-ioctl.c<br/>index 140ef92c19c1..155c9d77a463 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/v4l2-ioctl.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/v4l2-ioctl.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/v4l2-ioctl.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/v4l2-ioctl.c</a></div><div class='hunk'>@@ -746,18 +746,6 @@ static int __video_do_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 				ret = ops-&gt;vidioc_enum_fmt_vid_overlay(file,</div><div class='ctx'> 					fh, f);</div><div class='ctx'> 			break;</div><div class='del'>-#if 1</div><div class='del'>-		/* V4L2_BUF_TYPE_VBI_CAPTURE should not support VIDIOC_ENUM_FMT</div><div class='del'>-		 * according to the spec. The bttv and saa7134 drivers support</div><div class='del'>-		 * it though, so just warn that this is deprecated and will be</div><div class='del'>-		 * removed in the near future. */</div><div class='del'>-		case V4L2_BUF_TYPE_VBI_CAPTURE:</div><div class='del'>-			if (ops-&gt;vidioc_enum_fmt_vbi_cap) {</div><div class='del'>-				printk(KERN_WARNING "vidioc_enum_fmt_vbi_cap will be removed in 2.6.28!\n");</div><div class='del'>-				ret = ops-&gt;vidioc_enum_fmt_vbi_cap(file, fh, f);</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-#endif</div><div class='ctx'> 		case V4L2_BUF_TYPE_VIDEO_OUTPUT:</div><div class='ctx'> 			if (ops-&gt;vidioc_enum_fmt_vid_out)</div><div class='ctx'> 				ret = ops-&gt;vidioc_enum_fmt_vid_out(file, fh, f);</div><div class='head'>diff --git a/drivers/media/video/videobuf-dvb.c b/drivers/media/video/videobuf-dvb.c<br/>index b56cffcbfd45..917277d36605 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/videobuf-dvb.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/videobuf-dvb.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/videobuf-dvb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/videobuf-dvb.c</a></div><div class='hunk'>@@ -126,7 +126,6 @@ static int videobuf_dvb_stop_feed(struct dvb_demux_feed *feed)</div><div class='ctx'> 	mutex_lock(&amp;dvb-&gt;lock);</div><div class='ctx'> 	dvb-&gt;nfeeds--;</div><div class='ctx'> 	if (0 == dvb-&gt;nfeeds  &amp;&amp;  NULL != dvb-&gt;thread) {</div><div class='del'>-		// FIXME: cx8802_cancel_buffers(dev);</div><div class='ctx'> 		err = kthread_stop(dvb-&gt;thread);</div><div class='ctx'> 		dvb-&gt;thread = NULL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -134,30 +133,38 @@ static int videobuf_dvb_stop_feed(struct dvb_demux_feed *feed)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* ------------------------------------------------------------------ */</div><div class='del'>-</div><div class='del'>-int videobuf_dvb_register(struct videobuf_dvb *dvb,</div><div class='add'>+static int videobuf_dvb_register_adapter(struct videobuf_dvb_frontends *fe,</div><div class='ctx'> 			  struct module *module,</div><div class='ctx'> 			  void *adapter_priv,</div><div class='ctx'> 			  struct device *device,</div><div class='del'>-			  short *adapter_nr)</div><div class='add'>+			  char *adapter_name,</div><div class='add'>+			  short *adapter_nr,</div><div class='add'>+			  int mfe_shared)</div><div class='ctx'> {</div><div class='ctx'> 	int result;</div><div class='ctx'> </div><div class='del'>-	mutex_init(&amp;dvb-&gt;lock);</div><div class='add'>+	mutex_init(&amp;fe-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	/* register adapter */</div><div class='del'>-	result = dvb_register_adapter(&amp;dvb-&gt;adapter, dvb-&gt;name, module, device,</div><div class='del'>-				      adapter_nr);</div><div class='add'>+	result = dvb_register_adapter(&amp;fe-&gt;adapter, adapter_name, module,</div><div class='add'>+		device, adapter_nr);</div><div class='ctx'> 	if (result &lt; 0) {</div><div class='ctx'> 		printk(KERN_WARNING "%s: dvb_register_adapter failed (errno = %d)\n",</div><div class='del'>-		       dvb-&gt;name, result);</div><div class='del'>-		goto fail_adapter;</div><div class='add'>+		       adapter_name, result);</div><div class='ctx'> 	}</div><div class='del'>-	dvb-&gt;adapter.priv = adapter_priv;</div><div class='add'>+	fe-&gt;adapter.priv = adapter_priv;</div><div class='add'>+	fe-&gt;adapter.mfe_shared = mfe_shared;</div><div class='add'>+</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int videobuf_dvb_register_frontend(struct dvb_adapter *adapter,</div><div class='add'>+	struct videobuf_dvb *dvb)</div><div class='add'>+{</div><div class='add'>+	int result;</div><div class='ctx'> </div><div class='ctx'> 	/* register frontend */</div><div class='del'>-	result = dvb_register_frontend(&amp;dvb-&gt;adapter, dvb-&gt;frontend);</div><div class='add'>+	result = dvb_register_frontend(adapter, dvb-&gt;frontend);</div><div class='ctx'> 	if (result &lt; 0) {</div><div class='ctx'> 		printk(KERN_WARNING "%s: dvb_register_frontend failed (errno = %d)\n",</div><div class='ctx'> 		       dvb-&gt;name, result);</div><div class='hunk'>@@ -183,7 +190,8 @@ int videobuf_dvb_register(struct videobuf_dvb *dvb,</div><div class='ctx'> 	dvb-&gt;dmxdev.filternum    = 256;</div><div class='ctx'> 	dvb-&gt;dmxdev.demux        = &amp;dvb-&gt;demux.dmx;</div><div class='ctx'> 	dvb-&gt;dmxdev.capabilities = 0;</div><div class='del'>-	result = dvb_dmxdev_init(&amp;dvb-&gt;dmxdev, &amp;dvb-&gt;adapter);</div><div class='add'>+	result = dvb_dmxdev_init(&amp;dvb-&gt;dmxdev, adapter);</div><div class='add'>+</div><div class='ctx'> 	if (result &lt; 0) {</div><div class='ctx'> 		printk(KERN_WARNING "%s: dvb_dmxdev_init failed (errno = %d)\n",</div><div class='ctx'> 		       dvb-&gt;name, result);</div><div class='hunk'>@@ -214,7 +222,11 @@ int videobuf_dvb_register(struct videobuf_dvb *dvb,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* register network adapter */</div><div class='del'>-	dvb_net_init(&amp;dvb-&gt;adapter, &amp;dvb-&gt;net, &amp;dvb-&gt;demux.dmx);</div><div class='add'>+	dvb_net_init(adapter, &amp;dvb-&gt;net, &amp;dvb-&gt;demux.dmx);</div><div class='add'>+	if (dvb-&gt;net.dvbdev == NULL) {</div><div class='add'>+		result = -ENOMEM;</div><div class='add'>+		goto fail_fe_conn;</div><div class='add'>+	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> fail_fe_conn:</div><div class='hunk'>@@ -229,30 +241,151 @@ fail_dmx:</div><div class='ctx'> 	dvb_unregister_frontend(dvb-&gt;frontend);</div><div class='ctx'> fail_frontend:</div><div class='ctx'> 	dvb_frontend_detach(dvb-&gt;frontend);</div><div class='del'>-	dvb_unregister_adapter(&amp;dvb-&gt;adapter);</div><div class='del'>-fail_adapter:</div><div class='add'>+	dvb-&gt;frontend = NULL;</div><div class='add'>+</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void videobuf_dvb_unregister(struct videobuf_dvb *dvb)</div><div class='add'>+/* ------------------------------------------------------------------ */</div><div class='add'>+/* Register a single adapter and one or more frontends */</div><div class='add'>+int videobuf_dvb_register_bus(struct videobuf_dvb_frontends *f,</div><div class='add'>+			  struct module *module,</div><div class='add'>+			  void *adapter_priv,</div><div class='add'>+			  struct device *device,</div><div class='add'>+			  short *adapter_nr,</div><div class='add'>+			  int mfe_shared)</div><div class='ctx'> {</div><div class='del'>-	dvb_net_release(&amp;dvb-&gt;net);</div><div class='del'>-	dvb-&gt;demux.dmx.remove_frontend(&amp;dvb-&gt;demux.dmx, &amp;dvb-&gt;fe_mem);</div><div class='del'>-	dvb-&gt;demux.dmx.remove_frontend(&amp;dvb-&gt;demux.dmx, &amp;dvb-&gt;fe_hw);</div><div class='del'>-	dvb_dmxdev_release(&amp;dvb-&gt;dmxdev);</div><div class='del'>-	dvb_dmx_release(&amp;dvb-&gt;demux);</div><div class='del'>-	dvb_unregister_frontend(dvb-&gt;frontend);</div><div class='del'>-	dvb_frontend_detach(dvb-&gt;frontend);</div><div class='del'>-	dvb_unregister_adapter(&amp;dvb-&gt;adapter);</div><div class='add'>+	struct list_head *list, *q;</div><div class='add'>+	struct videobuf_dvb_frontend *fe;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	fe = videobuf_dvb_get_frontend(f, 1);</div><div class='add'>+	if (!fe) {</div><div class='add'>+		printk(KERN_WARNING "Unable to register the adapter which has no frontends\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Bring up the adapter */</div><div class='add'>+	res = videobuf_dvb_register_adapter(f, module, adapter_priv, device,</div><div class='add'>+		fe-&gt;dvb.name, adapter_nr, mfe_shared);</div><div class='add'>+	if (res &lt; 0) {</div><div class='add'>+		printk(KERN_WARNING "videobuf_dvb_register_adapter failed (errno = %d)\n", res);</div><div class='add'>+		return res;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Attach all of the frontends to the adapter */</div><div class='add'>+	mutex_lock(&amp;f-&gt;lock);</div><div class='add'>+	list_for_each_safe(list, q, &amp;f-&gt;felist) {</div><div class='add'>+		fe = list_entry(list, struct videobuf_dvb_frontend, felist);</div><div class='add'>+		res = videobuf_dvb_register_frontend(&amp;f-&gt;adapter, &amp;fe-&gt;dvb);</div><div class='add'>+		if (res &lt; 0) {</div><div class='add'>+			printk(KERN_WARNING "%s: videobuf_dvb_register_frontend failed (errno = %d)\n",</div><div class='add'>+				fe-&gt;dvb.name, res);</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;f-&gt;lock);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	mutex_unlock(&amp;f-&gt;lock);</div><div class='add'>+	videobuf_dvb_unregister_bus(f);</div><div class='add'>+	return res;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(videobuf_dvb_register_bus);</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(videobuf_dvb_register);</div><div class='del'>-EXPORT_SYMBOL(videobuf_dvb_unregister);</div><div class='add'>+void videobuf_dvb_unregister_bus(struct videobuf_dvb_frontends *f)</div><div class='add'>+{</div><div class='add'>+	struct list_head *list, *q;</div><div class='add'>+	struct videobuf_dvb_frontend *fe;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;f-&gt;lock);</div><div class='add'>+	list_for_each_safe(list, q, &amp;f-&gt;felist) {</div><div class='add'>+		fe = list_entry(list, struct videobuf_dvb_frontend, felist);</div><div class='add'>+		if (fe-&gt;dvb.net.dvbdev) {</div><div class='add'>+			dvb_net_release(&amp;fe-&gt;dvb.net);</div><div class='add'>+			fe-&gt;dvb.demux.dmx.remove_frontend(&amp;fe-&gt;dvb.demux.dmx,</div><div class='add'>+				&amp;fe-&gt;dvb.fe_mem);</div><div class='add'>+			fe-&gt;dvb.demux.dmx.remove_frontend(&amp;fe-&gt;dvb.demux.dmx,</div><div class='add'>+				&amp;fe-&gt;dvb.fe_hw);</div><div class='add'>+			dvb_dmxdev_release(&amp;fe-&gt;dvb.dmxdev);</div><div class='add'>+			dvb_dmx_release(&amp;fe-&gt;dvb.demux);</div><div class='add'>+			dvb_unregister_frontend(fe-&gt;dvb.frontend);</div><div class='add'>+		}</div><div class='add'>+		if (fe-&gt;dvb.frontend)</div><div class='add'>+			/* always allocated, may have been reset */</div><div class='add'>+			dvb_frontend_detach(fe-&gt;dvb.frontend);</div><div class='add'>+		list_del(list);</div><div class='add'>+		kfree(fe);</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;f-&gt;lock);</div><div class='ctx'> </div><div class='del'>-/* ------------------------------------------------------------------ */</div><div class='del'>-/*</div><div class='del'>- * Local variables:</div><div class='del'>- * c-basic-offset: 8</div><div class='del'>- * compile-command: "make DVB=1"</div><div class='del'>- * End:</div><div class='del'>- */</div><div class='add'>+	dvb_unregister_adapter(&amp;f-&gt;adapter);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(videobuf_dvb_unregister_bus);</div><div class='add'>+</div><div class='add'>+struct videobuf_dvb_frontend *videobuf_dvb_get_frontend(</div><div class='add'>+	struct videobuf_dvb_frontends *f, int id)</div><div class='add'>+{</div><div class='add'>+	struct list_head *list, *q;</div><div class='add'>+	struct videobuf_dvb_frontend *fe, *ret = NULL;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;f-&gt;lock);</div><div class='add'>+</div><div class='add'>+	list_for_each_safe(list, q, &amp;f-&gt;felist) {</div><div class='add'>+		fe = list_entry(list, struct videobuf_dvb_frontend, felist);</div><div class='add'>+		if (fe-&gt;id == id) {</div><div class='add'>+			ret = fe;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;f-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(videobuf_dvb_get_frontend);</div><div class='add'>+</div><div class='add'>+int videobuf_dvb_find_frontend(struct videobuf_dvb_frontends *f,</div><div class='add'>+	struct dvb_frontend *p)</div><div class='add'>+{</div><div class='add'>+	struct list_head *list, *q;</div><div class='add'>+	struct videobuf_dvb_frontend *fe = NULL;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;f-&gt;lock);</div><div class='add'>+</div><div class='add'>+	list_for_each_safe(list, q, &amp;f-&gt;felist) {</div><div class='add'>+		fe = list_entry(list, struct videobuf_dvb_frontend, felist);</div><div class='add'>+		if (fe-&gt;dvb.frontend == p) {</div><div class='add'>+			ret = fe-&gt;id;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;f-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(videobuf_dvb_find_frontend);</div><div class='add'>+</div><div class='add'>+struct videobuf_dvb_frontend *videobuf_dvb_alloc_frontend(</div><div class='add'>+	struct videobuf_dvb_frontends *f, int id)</div><div class='add'>+{</div><div class='add'>+	struct videobuf_dvb_frontend *fe;</div><div class='add'>+</div><div class='add'>+	fe = kzalloc(sizeof(struct videobuf_dvb_frontend), GFP_KERNEL);</div><div class='add'>+	if (fe == NULL)</div><div class='add'>+		goto fail_alloc;</div><div class='add'>+</div><div class='add'>+	fe-&gt;id = id;</div><div class='add'>+	mutex_init(&amp;fe-&gt;dvb.lock);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;f-&gt;lock);</div><div class='add'>+	list_add_tail(&amp;fe-&gt;felist, &amp;f-&gt;felist);</div><div class='add'>+	mutex_unlock(&amp;f-&gt;lock);</div><div class='add'>+</div><div class='add'>+fail_alloc:</div><div class='add'>+	return fe;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(videobuf_dvb_alloc_frontend);</div><div class='head'>diff --git a/drivers/media/video/vino.c b/drivers/media/video/vino.c<br/>index 1edda456fc64..1efc5f3462c6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/vino.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/vino.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/vino.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/vino.c</a></div><div class='hunk'>@@ -30,16 +30,12 @@</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='ctx'> #include &lt;linux/version.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_KMOD</div><div class='ctx'> #include &lt;linux/kmod.h&gt;</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='ctx'> #include &lt;linux/i2c-algo-sgi.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/videodev2.h&gt;</div><div class='del'>-#include &lt;media/v4l2-ioctl.h&gt;</div><div class='ctx'> #include &lt;media/v4l2-common.h&gt;</div><div class='ctx'> #include &lt;media/v4l2-ioctl.h&gt;</div><div class='ctx'> #include &lt;linux/video_decoder.h&gt;</div><div class='hunk'>@@ -810,7 +806,7 @@ static void vino_free_buffer_with_count(struct vino_framebuffer *fb,</div><div class='ctx'> 	dprintk("vino_free_buffer_with_count(): count = %d\n", count);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; count; i++) {</div><div class='del'>-		ClearPageReserved(virt_to_page(fb-&gt;desc_table.virtual[i]));</div><div class='add'>+		ClearPageReserved(virt_to_page((void *)fb-&gt;desc_table.virtual[i]));</div><div class='ctx'> 		dma_unmap_single(NULL,</div><div class='ctx'> 				 fb-&gt;desc_table.dma_cpu[VINO_PAGE_RATIO * i],</div><div class='ctx'> 				 PAGE_SIZE, DMA_FROM_DEVICE);</div><div class='hunk'>@@ -888,7 +884,7 @@ static int vino_allocate_buffer(struct vino_framebuffer *fb,</div><div class='ctx'> 				dma_data_addr + VINO_PAGE_SIZE * j;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		SetPageReserved(virt_to_page(fb-&gt;desc_table.virtual[i]));</div><div class='add'>+		SetPageReserved(virt_to_page((void *)fb-&gt;desc_table.virtual[i]));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* page_count needs to be set anyway, because the descriptor table has</div><div class='hunk'>@@ -975,7 +971,7 @@ static int vino_prepare_user_buffer(struct vino_framebuffer *fb,</div><div class='ctx'> 				dma_data_addr + VINO_PAGE_SIZE * j;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		SetPageReserved(virt_to_page(fb-&gt;desc_table.virtual[i]));</div><div class='add'>+		SetPageReserved(virt_to_page((void *)fb-&gt;desc_table.virtual[i]));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* page_count needs to be set anyway, because the descriptor table has</div><div class='hunk'>@@ -4025,8 +4021,7 @@ out:</div><div class='ctx'> </div><div class='ctx'> static int vino_open(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct vino_channel_settings *vcs = video_get_drvdata(dev);</div><div class='add'>+	struct vino_channel_settings *vcs = video_drvdata(file);</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	dprintk("open(): channel = %c\n",</div><div class='ctx'> 	       (vcs-&gt;channel == VINO_CHANNEL_A) ? 'A' : 'B');</div><div class='hunk'>@@ -4057,8 +4052,7 @@ static int vino_open(struct inode *inode, struct file *file)</div><div class='ctx'> </div><div class='ctx'> static int vino_close(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct vino_channel_settings *vcs = video_get_drvdata(dev);</div><div class='add'>+	struct vino_channel_settings *vcs = video_drvdata(file);</div><div class='ctx'> 	dprintk("close():\n");</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;vcs-&gt;mutex);</div><div class='hunk'>@@ -4101,8 +4095,7 @@ static struct vm_operations_struct vino_vm_ops = {</div><div class='ctx'> </div><div class='ctx'> static int vino_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct vino_channel_settings *vcs = video_get_drvdata(dev);</div><div class='add'>+	struct vino_channel_settings *vcs = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	unsigned long start = vma-&gt;vm_start;</div><div class='ctx'> 	unsigned long size = vma-&gt;vm_end - vma-&gt;vm_start;</div><div class='hunk'>@@ -4207,8 +4200,7 @@ out:</div><div class='ctx'> </div><div class='ctx'> static unsigned int vino_poll(struct file *file, poll_table *pt)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct vino_channel_settings *vcs = video_get_drvdata(dev);</div><div class='add'>+	struct vino_channel_settings *vcs = video_drvdata(file);</div><div class='ctx'> 	unsigned int outgoing;</div><div class='ctx'> 	unsigned int ret = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -4248,8 +4240,7 @@ error:</div><div class='ctx'> static int vino_do_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 		      unsigned int cmd, void *arg)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct vino_channel_settings *vcs = video_get_drvdata(dev);</div><div class='add'>+	struct vino_channel_settings *vcs = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> #ifdef VINO_DEBUG</div><div class='ctx'> 	switch (_IOC_TYPE(cmd)) {</div><div class='hunk'>@@ -4356,8 +4347,7 @@ static int vino_do_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> static int vino_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 		      unsigned int cmd, unsigned long arg)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct vino_channel_settings *vcs = video_get_drvdata(dev);</div><div class='add'>+	struct vino_channel_settings *vcs = video_drvdata(file);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (mutex_lock_interruptible(&amp;vcs-&gt;mutex))</div><div class='hunk'>@@ -4641,7 +4631,7 @@ static int __init vino_module_init(void)</div><div class='ctx'> 	}</div><div class='ctx'> 	vino_init_stage++;</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_KMOD) &amp;&amp; defined(MODULE)</div><div class='add'>+#ifdef MODULE</div><div class='ctx'> 	request_module("saa7191");</div><div class='ctx'> 	request_module("indycam");</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/media/video/vivi.c b/drivers/media/video/vivi.c<br/>index 8ba8daafd7ea..7d7e51def461 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/vivi.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/vivi.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/vivi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/vivi.c</a></div><div class='hunk'>@@ -128,12 +128,56 @@ struct vivi_fmt {</div><div class='ctx'> 	int   depth;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct vivi_fmt format = {</div><div class='del'>-	.name     = "4:2:2, packed, YUYV",</div><div class='del'>-	.fourcc   = V4L2_PIX_FMT_YUYV,</div><div class='del'>-	.depth    = 16,</div><div class='add'>+static struct vivi_fmt formats[] = {</div><div class='add'>+	{</div><div class='add'>+		.name     = "4:2:2, packed, YUYV",</div><div class='add'>+		.fourcc   = V4L2_PIX_FMT_YUYV,</div><div class='add'>+		.depth    = 16,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name     = "4:2:2, packed, UYVY",</div><div class='add'>+		.fourcc   = V4L2_PIX_FMT_UYVY,</div><div class='add'>+		.depth    = 16,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name     = "RGB565 (LE)",</div><div class='add'>+		.fourcc   = V4L2_PIX_FMT_RGB565, /* gggbbbbb rrrrrggg */</div><div class='add'>+		.depth    = 16,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name     = "RGB565 (BE)",</div><div class='add'>+		.fourcc   = V4L2_PIX_FMT_RGB565X, /* rrrrrggg gggbbbbb */</div><div class='add'>+		.depth    = 16,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name     = "RGB555 (LE)",</div><div class='add'>+		.fourcc   = V4L2_PIX_FMT_RGB555, /* gggbbbbb arrrrrgg */</div><div class='add'>+		.depth    = 16,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name     = "RGB555 (BE)",</div><div class='add'>+		.fourcc   = V4L2_PIX_FMT_RGB555X, /* arrrrrgg gggbbbbb */</div><div class='add'>+		.depth    = 16,</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct vivi_fmt *get_format(struct v4l2_format *f)</div><div class='add'>+{</div><div class='add'>+	struct vivi_fmt *fmt;</div><div class='add'>+	unsigned int k;</div><div class='add'>+</div><div class='add'>+	for (k = 0; k &lt; ARRAY_SIZE(formats); k++) {</div><div class='add'>+		fmt = &amp;formats[k];</div><div class='add'>+		if (fmt-&gt;fourcc == f-&gt;fmt.pix.pixelformat)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (k == ARRAY_SIZE(formats))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	return &amp;formats[k];</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> struct sg_to_addr {</div><div class='ctx'> 	int pos;</div><div class='ctx'> 	struct scatterlist *sg;</div><div class='hunk'>@@ -190,6 +234,7 @@ struct vivi_fh {</div><div class='ctx'> 	struct videobuf_queue      vb_vidq;</div><div class='ctx'> </div><div class='ctx'> 	enum v4l2_buf_type         type;</div><div class='add'>+	unsigned char              bars[8][3];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* ------------------------------------------------------------------</div><div class='hunk'>@@ -234,42 +279,118 @@ static u8 bars[8][3] = {</div><div class='ctx'> #define TSTAMP_MAX_Y TSTAMP_MIN_Y+15</div><div class='ctx'> #define TSTAMP_MIN_X 64</div><div class='ctx'> </div><div class='del'>-static void gen_line(char *basep, int inipos, int wmax,</div><div class='del'>-		int hmax, int line, int count, char *timestr)</div><div class='add'>+static void gen_twopix(struct vivi_fh *fh, unsigned char *buf, int colorpos)</div><div class='ctx'> {</div><div class='del'>-	int  w, i, j, y;</div><div class='del'>-	int pos = inipos;</div><div class='del'>-	char *p, *s;</div><div class='del'>-	u8   chr, r, g, b, color;</div><div class='add'>+	unsigned char r_y, g_u, b_v;</div><div class='add'>+	unsigned char *p;</div><div class='add'>+	int color;</div><div class='ctx'> </div><div class='del'>-	/* We will just duplicate the second pixel at the packet */</div><div class='del'>-	wmax /= 2;</div><div class='add'>+	r_y = fh-&gt;bars[colorpos][0]; /* R or precalculated Y */</div><div class='add'>+	g_u = fh-&gt;bars[colorpos][1]; /* G or precalculated U */</div><div class='add'>+	b_v = fh-&gt;bars[colorpos][2]; /* B or precalculated V */</div><div class='ctx'> </div><div class='del'>-	/* Generate a standard color bar pattern */</div><div class='del'>-	for (w = 0; w &lt; wmax; w++) {</div><div class='del'>-		int colorpos = ((w + count) * 8/(wmax + 1)) % 8;</div><div class='del'>-		r = bars[colorpos][0];</div><div class='del'>-		g = bars[colorpos][1];</div><div class='del'>-		b = bars[colorpos][2];</div><div class='del'>-</div><div class='del'>-		for (color = 0; color &lt; 4; color++) {</div><div class='del'>-			p = basep + pos;</div><div class='add'>+	for (color = 0; color &lt; 4; color++) {</div><div class='add'>+		p = buf + color;</div><div class='ctx'> </div><div class='add'>+		switch (fh-&gt;fmt-&gt;fourcc) {</div><div class='add'>+		case V4L2_PIX_FMT_YUYV:</div><div class='add'>+			switch (color) {</div><div class='add'>+			case 0:</div><div class='add'>+			case 2:</div><div class='add'>+				*p = r_y;</div><div class='add'>+				break;</div><div class='add'>+			case 1:</div><div class='add'>+				*p = g_u;</div><div class='add'>+				break;</div><div class='add'>+			case 3:</div><div class='add'>+				*p = b_v;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_PIX_FMT_UYVY:</div><div class='add'>+			switch (color) {</div><div class='add'>+			case 1:</div><div class='add'>+			case 3:</div><div class='add'>+				*p = r_y;</div><div class='add'>+				break;</div><div class='add'>+			case 0:</div><div class='add'>+				*p = g_u;</div><div class='add'>+				break;</div><div class='add'>+			case 2:</div><div class='add'>+				*p = b_v;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_PIX_FMT_RGB565:</div><div class='add'>+			switch (color) {</div><div class='add'>+			case 0:</div><div class='add'>+			case 2:</div><div class='add'>+				*p = (g_u &lt;&lt; 5) | b_v;</div><div class='add'>+				break;</div><div class='add'>+			case 1:</div><div class='add'>+			case 3:</div><div class='add'>+				*p = (r_y &lt;&lt; 3) | (g_u &gt;&gt; 3);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_PIX_FMT_RGB565X:</div><div class='ctx'> 			switch (color) {</div><div class='ctx'> 			case 0:</div><div class='ctx'> 			case 2:</div><div class='del'>-				*p = TO_Y(r, g, b);	/* Luma */</div><div class='add'>+				*p = (r_y &lt;&lt; 3) | (g_u &gt;&gt; 3);</div><div class='ctx'> 				break;</div><div class='ctx'> 			case 1:</div><div class='del'>-				*p = TO_U(r, g, b);	/* Cb */</div><div class='add'>+			case 3:</div><div class='add'>+				*p = (g_u &lt;&lt; 5) | b_v;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_PIX_FMT_RGB555:</div><div class='add'>+			switch (color) {</div><div class='add'>+			case 0:</div><div class='add'>+			case 2:</div><div class='add'>+				*p = (g_u &lt;&lt; 5) | b_v;</div><div class='add'>+				break;</div><div class='add'>+			case 1:</div><div class='add'>+			case 3:</div><div class='add'>+				*p = (r_y &lt;&lt; 2) | (g_u &gt;&gt; 3);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_PIX_FMT_RGB555X:</div><div class='add'>+			switch (color) {</div><div class='add'>+			case 0:</div><div class='add'>+			case 2:</div><div class='add'>+				*p = (r_y &lt;&lt; 2) | (g_u &gt;&gt; 3);</div><div class='ctx'> 				break;</div><div class='add'>+			case 1:</div><div class='ctx'> 			case 3:</div><div class='del'>-				*p = TO_V(r, g, b);	/* Cr */</div><div class='add'>+				*p = (g_u &lt;&lt; 5) | b_v;</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='del'>-			pos++;</div><div class='add'>+			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void gen_line(struct vivi_fh *fh, char *basep, int inipos, int wmax,</div><div class='add'>+		int hmax, int line, int count, char *timestr)</div><div class='add'>+{</div><div class='add'>+	int  w, i, j;</div><div class='add'>+	int pos = inipos;</div><div class='add'>+	char *s;</div><div class='add'>+	u8 chr;</div><div class='add'>+</div><div class='add'>+	/* We will just duplicate the second pixel at the packet */</div><div class='add'>+	wmax /= 2;</div><div class='add'>+</div><div class='add'>+	/* Generate a standard color bar pattern */</div><div class='add'>+	for (w = 0; w &lt; wmax; w++) {</div><div class='add'>+		int colorpos = ((w + count) * 8/(wmax + 1)) % 8;</div><div class='add'>+</div><div class='add'>+		gen_twopix(fh, basep + pos, colorpos);</div><div class='add'>+		pos += 4; /* only 16 bpp supported for now */</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Checks if it is possible to show timestamp */</div><div class='ctx'> 	if (TSTAMP_MAX_Y &gt;= hmax)</div><div class='hunk'>@@ -283,38 +404,12 @@ static void gen_line(char *basep, int inipos, int wmax,</div><div class='ctx'> 		for (s = timestr; *s; s++) {</div><div class='ctx'> 			chr = rom8x16_bits[(*s-0x30)*16+line-TSTAMP_MIN_Y];</div><div class='ctx'> 			for (i = 0; i &lt; 7; i++) {</div><div class='del'>-				if (chr &amp; 1 &lt;&lt; (7 - i)) {</div><div class='del'>-					/* Font color*/</div><div class='del'>-					r = 0;</div><div class='del'>-					g = 198;</div><div class='del'>-					b = 0;</div><div class='del'>-				} else {</div><div class='del'>-					/* Background color */</div><div class='del'>-					r = bars[BLACK][0];</div><div class='del'>-					g = bars[BLACK][1];</div><div class='del'>-					b = bars[BLACK][2];</div><div class='del'>-				}</div><div class='del'>-</div><div class='ctx'> 				pos = inipos + j * 2;</div><div class='del'>-				for (color = 0; color &lt; 4; color++) {</div><div class='del'>-					p = basep + pos;</div><div class='del'>-</div><div class='del'>-					y = TO_Y(r, g, b);</div><div class='del'>-</div><div class='del'>-					switch (color) {</div><div class='del'>-					case 0:</div><div class='del'>-					case 2:</div><div class='del'>-						*p = TO_Y(r, g, b); /* Luma */</div><div class='del'>-						break;</div><div class='del'>-					case 1:</div><div class='del'>-						*p = TO_U(r, g, b); /* Cb */</div><div class='del'>-						break;</div><div class='del'>-					case 3:</div><div class='del'>-						*p = TO_V(r, g, b); /* Cr */</div><div class='del'>-						break;</div><div class='del'>-					}</div><div class='del'>-					pos++;</div><div class='del'>-				}</div><div class='add'>+				/* Draw white font on black background */</div><div class='add'>+				if (chr &amp; 1 &lt;&lt; (7 - i))</div><div class='add'>+					gen_twopix(fh, basep + pos, WHITE);</div><div class='add'>+				else</div><div class='add'>+					gen_twopix(fh, basep + pos, BLACK);</div><div class='ctx'> 				j++;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -324,8 +419,9 @@ end:</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void vivi_fillbuff(struct vivi_dev *dev, struct vivi_buffer *buf)</div><div class='add'>+static void vivi_fillbuff(struct vivi_fh *fh, struct vivi_buffer *buf)</div><div class='ctx'> {</div><div class='add'>+	struct vivi_dev *dev = fh-&gt;dev;</div><div class='ctx'> 	int h , pos = 0;</div><div class='ctx'> 	int hmax  = buf-&gt;vb.height;</div><div class='ctx'> 	int wmax  = buf-&gt;vb.width;</div><div class='hunk'>@@ -341,7 +437,7 @@ static void vivi_fillbuff(struct vivi_dev *dev, struct vivi_buffer *buf)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	for (h = 0; h &lt; hmax; h++) {</div><div class='del'>-		gen_line(tmpbuf, 0, wmax, hmax, h, dev-&gt;mv_count,</div><div class='add'>+		gen_line(fh, tmpbuf, 0, wmax, hmax, h, dev-&gt;mv_count,</div><div class='ctx'> 			 dev-&gt;timestr);</div><div class='ctx'> 		memcpy(vbuf + pos, tmpbuf, wmax * 2);</div><div class='ctx'> 		pos += wmax*2;</div><div class='hunk'>@@ -410,7 +506,7 @@ static void vivi_thread_tick(struct vivi_fh *fh)</div><div class='ctx'> 	do_gettimeofday(&amp;buf-&gt;vb.ts);</div><div class='ctx'> </div><div class='ctx'> 	/* Fill buffer */</div><div class='del'>-	vivi_fillbuff(dev, buf);</div><div class='add'>+	vivi_fillbuff(fh, buf);</div><div class='ctx'> 	dprintk(dev, 1, "filled buffer %p\n", buf);</div><div class='ctx'> </div><div class='ctx'> 	wake_up(&amp;buf-&gt;vb.done);</div><div class='hunk'>@@ -636,11 +732,15 @@ static int vidioc_querycap(struct file *file, void  *priv,</div><div class='ctx'> static int vidioc_enum_fmt_vid_cap(struct file *file, void  *priv,</div><div class='ctx'> 					struct v4l2_fmtdesc *f)</div><div class='ctx'> {</div><div class='del'>-	if (f-&gt;index &gt; 0)</div><div class='add'>+	struct vivi_fmt *fmt;</div><div class='add'>+</div><div class='add'>+	if (f-&gt;index &gt;= ARRAY_SIZE(formats))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	strlcpy(f-&gt;description, format.name, sizeof(f-&gt;description));</div><div class='del'>-	f-&gt;pixelformat = format.fourcc;</div><div class='add'>+	fmt = &amp;formats[f-&gt;index];</div><div class='add'>+</div><div class='add'>+	strlcpy(f-&gt;description, fmt-&gt;name, sizeof(f-&gt;description));</div><div class='add'>+	f-&gt;pixelformat = fmt-&gt;fourcc;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -670,13 +770,12 @@ static int vidioc_try_fmt_vid_cap(struct file *file, void *priv,</div><div class='ctx'> 	enum v4l2_field field;</div><div class='ctx'> 	unsigned int maxw, maxh;</div><div class='ctx'> </div><div class='del'>-	if (format.fourcc != f-&gt;fmt.pix.pixelformat) {</div><div class='del'>-		dprintk(dev, 1, "Fourcc format (0x%08x) invalid. "</div><div class='del'>-			"Driver accepts only 0x%08x\n",</div><div class='del'>-			f-&gt;fmt.pix.pixelformat, format.fourcc);</div><div class='add'>+	fmt = get_format(f);</div><div class='add'>+	if (!fmt) {</div><div class='add'>+		dprintk(dev, 1, "Fourcc format (0x%08x) invalid.\n",</div><div class='add'>+			f-&gt;fmt.pix.pixelformat);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	fmt = &amp;format;</div><div class='ctx'> </div><div class='ctx'> 	field = f-&gt;fmt.pix.field;</div><div class='ctx'> </div><div class='hunk'>@@ -714,6 +813,8 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,</div><div class='ctx'> {</div><div class='ctx'> 	struct vivi_fh  *fh = priv;</div><div class='ctx'> 	struct videobuf_queue *q = &amp;fh-&gt;vb_vidq;</div><div class='add'>+	unsigned char r, g, b;</div><div class='add'>+	int k, is_yuv;</div><div class='ctx'> </div><div class='ctx'> 	int ret = vidioc_try_fmt_vid_cap(file, fh, f);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='hunk'>@@ -727,12 +828,49 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	fh-&gt;fmt           = &amp;format;</div><div class='add'>+	fh-&gt;fmt           = get_format(f);</div><div class='ctx'> 	fh-&gt;width         = f-&gt;fmt.pix.width;</div><div class='ctx'> 	fh-&gt;height        = f-&gt;fmt.pix.height;</div><div class='ctx'> 	fh-&gt;vb_vidq.field = f-&gt;fmt.pix.field;</div><div class='ctx'> 	fh-&gt;type          = f-&gt;type;</div><div class='ctx'> </div><div class='add'>+	/* precalculate color bar values to speed up rendering */</div><div class='add'>+	for (k = 0; k &lt; 8; k++) {</div><div class='add'>+		r = bars[k][0];</div><div class='add'>+		g = bars[k][1];</div><div class='add'>+		b = bars[k][2];</div><div class='add'>+		is_yuv = 0;</div><div class='add'>+</div><div class='add'>+		switch (fh-&gt;fmt-&gt;fourcc) {</div><div class='add'>+		case V4L2_PIX_FMT_YUYV:</div><div class='add'>+		case V4L2_PIX_FMT_UYVY:</div><div class='add'>+			is_yuv = 1;</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_PIX_FMT_RGB565:</div><div class='add'>+		case V4L2_PIX_FMT_RGB565X:</div><div class='add'>+			r &gt;&gt;= 3;</div><div class='add'>+			g &gt;&gt;= 2;</div><div class='add'>+			b &gt;&gt;= 3;</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_PIX_FMT_RGB555:</div><div class='add'>+		case V4L2_PIX_FMT_RGB555X:</div><div class='add'>+			r &gt;&gt;= 3;</div><div class='add'>+			g &gt;&gt;= 3;</div><div class='add'>+			b &gt;&gt;= 3;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (is_yuv) {</div><div class='add'>+			fh-&gt;bars[k][0] = TO_Y(r, g, b);	/* Luma */</div><div class='add'>+			fh-&gt;bars[k][1] = TO_U(r, g, b);	/* Cb */</div><div class='add'>+			fh-&gt;bars[k][2] = TO_V(r, g, b);	/* Cr */</div><div class='add'>+		} else {</div><div class='add'>+			fh-&gt;bars[k][0] = r;</div><div class='add'>+			fh-&gt;bars[k][1] = g;</div><div class='add'>+			fh-&gt;bars[k][2] = b;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ret = 0;</div><div class='ctx'> out:</div><div class='ctx'> 	mutex_unlock(&amp;q-&gt;vb_lock);</div><div class='hunk'>@@ -886,8 +1024,6 @@ static int vidioc_s_ctrl(struct file *file, void *priv,</div><div class='ctx'> 	File operations for the device</div><div class='ctx'>    ------------------------------------------------------------------*/</div><div class='ctx'> </div><div class='del'>-#define line_buf_size(norm) (norm_maxw(norm)*(format.depth+7)/8)</div><div class='del'>-</div><div class='ctx'> static int vivi_open(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='ctx'> 	int minor = iminor(inode);</div><div class='hunk'>@@ -898,9 +1034,11 @@ static int vivi_open(struct inode *inode, struct file *file)</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_DEBUG "vivi: open called (minor=%d)\n", minor);</div><div class='ctx'> </div><div class='add'>+	lock_kernel();</div><div class='ctx'> 	list_for_each_entry(dev, &amp;vivi_devlist, vivi_devlist)</div><div class='ctx'> 		if (dev-&gt;vfd-&gt;minor == minor)</div><div class='ctx'> 			goto found;</div><div class='add'>+	unlock_kernel();</div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> found:</div><div class='hunk'>@@ -925,14 +1063,16 @@ found:</div><div class='ctx'> 	}</div><div class='ctx'> unlock:</div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;mutex);</div><div class='del'>-	if (retval)</div><div class='add'>+	if (retval) {</div><div class='add'>+		unlock_kernel();</div><div class='ctx'> 		return retval;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	file-&gt;private_data = fh;</div><div class='ctx'> 	fh-&gt;dev      = dev;</div><div class='ctx'> </div><div class='ctx'> 	fh-&gt;type     = V4L2_BUF_TYPE_VIDEO_CAPTURE;</div><div class='del'>-	fh-&gt;fmt      = &amp;format;</div><div class='add'>+	fh-&gt;fmt      = &amp;formats[0];</div><div class='ctx'> 	fh-&gt;width    = 640;</div><div class='ctx'> 	fh-&gt;height   = 480;</div><div class='ctx'> </div><div class='hunk'>@@ -955,6 +1095,7 @@ unlock:</div><div class='ctx'> 			sizeof(struct vivi_buffer), fh);</div><div class='ctx'> </div><div class='ctx'> 	vivi_start_thread(fh);</div><div class='add'>+	unlock_kernel();</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/media/video/vpx3220.c b/drivers/media/video/vpx3220.c<br/>index 35293029da02..67aa0db4b81a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/vpx3220.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/vpx3220.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/vpx3220.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/vpx3220.c</a></div><div class='hunk'>@@ -22,34 +22,21 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;linux/byteorder/swab.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='del'>-</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='del'>-</div><div class='del'>-#define I2C_NAME(x) (x)-&gt;name</div><div class='del'>-</div><div class='del'>-#include &lt;linux/videodev.h&gt;</div><div class='ctx'> #include &lt;media/v4l2-common.h&gt;</div><div class='add'>+#include &lt;media/v4l2-i2c-drv-legacy.h&gt;</div><div class='add'>+#include &lt;linux/videodev.h&gt;</div><div class='ctx'> #include &lt;linux/video_decoder.h&gt;</div><div class='ctx'> </div><div class='del'>-#define I2C_VPX3220        0x86</div><div class='del'>-#define VPX3220_DEBUG	KERN_DEBUG "vpx3220: "</div><div class='add'>+MODULE_DESCRIPTION("vpx3220a/vpx3216b/vpx3214c video decoder driver");</div><div class='add'>+MODULE_AUTHOR("Laurent Pinchart");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='ctx'> static int debug;</div><div class='ctx'> module_param(debug, int, 0);</div><div class='ctx'> MODULE_PARM_DESC(debug, "Debug level (0-1)");</div><div class='ctx'> </div><div class='del'>-#define dprintk(num, format, args...) \</div><div class='del'>-	do { \</div><div class='del'>-		if (debug &gt;= num) \</div><div class='del'>-			printk(format, ##args); \</div><div class='del'>-	} while (0)</div><div class='del'>-</div><div class='ctx'> #define VPX_TIMEOUT_COUNT  10</div><div class='ctx'> </div><div class='ctx'> /* ----------------------------------------------------------------------- */</div><div class='hunk'>@@ -69,10 +56,8 @@ struct vpx3220 {</div><div class='ctx'> static char *inputs[] = { "internal", "composite", "svideo" };</div><div class='ctx'> </div><div class='ctx'> /* ----------------------------------------------------------------------- */</div><div class='del'>-static inline int</div><div class='del'>-vpx3220_write (struct i2c_client *client,</div><div class='del'>-	       u8                 reg,</div><div class='del'>-	       u8                 value)</div><div class='add'>+</div><div class='add'>+static inline int vpx3220_write(struct i2c_client *client, u8 reg, u8 value)</div><div class='ctx'> {</div><div class='ctx'> 	struct vpx3220 *decoder = i2c_get_clientdata(client);</div><div class='ctx'> </div><div class='hunk'>@@ -80,15 +65,12 @@ vpx3220_write (struct i2c_client *client,</div><div class='ctx'> 	return i2c_smbus_write_byte_data(client, reg, value);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int</div><div class='del'>-vpx3220_read (struct i2c_client *client,</div><div class='del'>-	      u8                 reg)</div><div class='add'>+static inline int vpx3220_read(struct i2c_client *client, u8 reg)</div><div class='ctx'> {</div><div class='ctx'> 	return i2c_smbus_read_byte_data(client, reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-vpx3220_fp_status (struct i2c_client *client)</div><div class='add'>+static int vpx3220_fp_status(struct i2c_client *client)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char status;</div><div class='ctx'> 	unsigned int i;</div><div class='hunk'>@@ -108,14 +90,11 @@ vpx3220_fp_status (struct i2c_client *client)</div><div class='ctx'> 	return -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-vpx3220_fp_write (struct i2c_client *client,</div><div class='del'>-		  u8                 fpaddr,</div><div class='del'>-		  u16                data)</div><div class='add'>+static int vpx3220_fp_write(struct i2c_client *client, u8 fpaddr, u16 data)</div><div class='ctx'> {</div><div class='ctx'> 	/* Write the 16-bit address to the FPWR register */</div><div class='ctx'> 	if (i2c_smbus_write_word_data(client, 0x27, swab16(fpaddr)) == -1) {</div><div class='del'>-		dprintk(1, VPX3220_DEBUG "%s: failed\n", __func__);</div><div class='add'>+		v4l_dbg(1, debug, client, "%s: failed\n", __func__);</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -124,22 +103,20 @@ vpx3220_fp_write (struct i2c_client *client,</div><div class='ctx'> </div><div class='ctx'> 	/* Write the 16-bit data to the FPDAT register */</div><div class='ctx'> 	if (i2c_smbus_write_word_data(client, 0x28, swab16(data)) == -1) {</div><div class='del'>-		dprintk(1, VPX3220_DEBUG "%s: failed\n", __func__);</div><div class='add'>+		v4l_dbg(1, debug, client, "%s: failed\n", __func__);</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u16</div><div class='del'>-vpx3220_fp_read (struct i2c_client *client,</div><div class='del'>-		 u16                fpaddr)</div><div class='add'>+static u16 vpx3220_fp_read(struct i2c_client *client, u16 fpaddr)</div><div class='ctx'> {</div><div class='ctx'> 	s16 data;</div><div class='ctx'> </div><div class='ctx'> 	/* Write the 16-bit address to the FPRD register */</div><div class='ctx'> 	if (i2c_smbus_write_word_data(client, 0x26, swab16(fpaddr)) == -1) {</div><div class='del'>-		dprintk(1, VPX3220_DEBUG "%s: failed\n", __func__);</div><div class='add'>+		v4l_dbg(1, debug, client, "%s: failed\n", __func__);</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -149,25 +126,22 @@ vpx3220_fp_read (struct i2c_client *client,</div><div class='ctx'> 	/* Read the 16-bit data from the FPDAT register */</div><div class='ctx'> 	data = i2c_smbus_read_word_data(client, 0x28);</div><div class='ctx'> 	if (data == -1) {</div><div class='del'>-		dprintk(1, VPX3220_DEBUG "%s: failed\n", __func__);</div><div class='add'>+		v4l_dbg(1, debug, client, "%s: failed\n", __func__);</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return swab16(data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-vpx3220_write_block (struct i2c_client *client,</div><div class='del'>-		     const u8          *data,</div><div class='del'>-		     unsigned int       len)</div><div class='add'>+static int vpx3220_write_block(struct i2c_client *client, const u8 *data, unsigned int len)</div><div class='ctx'> {</div><div class='ctx'> 	u8 reg;</div><div class='ctx'> 	int ret = -1;</div><div class='ctx'> </div><div class='ctx'> 	while (len &gt;= 2) {</div><div class='ctx'> 		reg = *data++;</div><div class='del'>-		if ((ret =</div><div class='del'>-		     vpx3220_write(client, reg, *data++)) &lt; 0)</div><div class='add'>+		ret = vpx3220_write(client, reg, *data++);</div><div class='add'>+		if (ret &lt; 0)</div><div class='ctx'> 			break;</div><div class='ctx'> 		len -= 2;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -175,10 +149,8 @@ vpx3220_write_block (struct i2c_client *client,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-vpx3220_write_fp_block (struct i2c_client *client,</div><div class='del'>-			const u16         *data,</div><div class='del'>-			unsigned int       len)</div><div class='add'>+static int vpx3220_write_fp_block(struct i2c_client *client,</div><div class='add'>+		const u16 *data, unsigned int len)</div><div class='ctx'> {</div><div class='ctx'> 	u8 reg;</div><div class='ctx'> 	int ret = 0;</div><div class='hunk'>@@ -287,25 +259,20 @@ static const unsigned short init_fp[] = {</div><div class='ctx'> 	0x4b, 0x298,		/* PLL gain */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-vpx3220_dump_i2c (struct i2c_client *client)</div><div class='add'>+static void vpx3220_dump_i2c(struct i2c_client *client)</div><div class='ctx'> {</div><div class='ctx'> 	int len = sizeof(init_common);</div><div class='ctx'> 	const unsigned char *data = init_common;</div><div class='ctx'> </div><div class='ctx'> 	while (len &gt; 1) {</div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_DEBUG "vpx3216b i2c reg 0x%02x data 0x%02x\n",</div><div class='add'>+		v4l_dbg(1, debug, client, "i2c reg 0x%02x data 0x%02x\n",</div><div class='ctx'> 			*data, vpx3220_read(client, *data));</div><div class='ctx'> 		data += 2;</div><div class='ctx'> 		len -= 2;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-vpx3220_command (struct i2c_client *client,</div><div class='del'>-		 unsigned int       cmd,</div><div class='del'>-		 void              *arg)</div><div class='add'>+static int vpx3220_command(struct i2c_client *client, unsigned cmd, void *arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct vpx3220 *decoder = i2c_get_clientdata(client);</div><div class='ctx'> </div><div class='hunk'>@@ -317,7 +284,6 @@ vpx3220_command (struct i2c_client *client,</div><div class='ctx'> 		vpx3220_write_fp_block(client, init_fp,</div><div class='ctx'> 				       sizeof(init_fp) &gt;&gt; 1);</div><div class='ctx'> 		switch (decoder-&gt;norm) {</div><div class='del'>-</div><div class='ctx'> 		case VIDEO_MODE_NTSC:</div><div class='ctx'> 			vpx3220_write_fp_block(client, init_ntsc,</div><div class='ctx'> 					       sizeof(init_ntsc) &gt;&gt; 1);</div><div class='hunk'>@@ -336,21 +302,20 @@ vpx3220_command (struct i2c_client *client,</div><div class='ctx'> 					       sizeof(init_pal) &gt;&gt; 1);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-	}</div><div class='ctx'> 		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	case DECODER_DUMP:</div><div class='ctx'> 	{</div><div class='ctx'> 		vpx3220_dump_i2c(client);</div><div class='del'>-	}</div><div class='ctx'> 		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	case DECODER_GET_CAPABILITIES:</div><div class='ctx'> 	{</div><div class='ctx'> 		struct video_decoder_capability *cap = arg;</div><div class='ctx'> </div><div class='del'>-		dprintk(1, KERN_DEBUG "%s: DECODER_GET_CAPABILITIES\n",</div><div class='del'>-			I2C_NAME(client));</div><div class='add'>+		v4l_dbg(1, debug, client, "DECODER_GET_CAPABILITIES\n");</div><div class='ctx'> </div><div class='ctx'> 		cap-&gt;flags = VIDEO_DECODER_PAL |</div><div class='ctx'> 			     VIDEO_DECODER_NTSC |</div><div class='hunk'>@@ -359,20 +324,18 @@ vpx3220_command (struct i2c_client *client,</div><div class='ctx'> 			     VIDEO_DECODER_CCIR;</div><div class='ctx'> 		cap-&gt;inputs = 3;</div><div class='ctx'> 		cap-&gt;outputs = 1;</div><div class='del'>-	}</div><div class='ctx'> 		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	case DECODER_GET_STATUS:</div><div class='ctx'> 	{</div><div class='ctx'> 		int res = 0, status;</div><div class='ctx'> </div><div class='del'>-		dprintk(1, KERN_INFO "%s: DECODER_GET_STATUS\n",</div><div class='del'>-			I2C_NAME(client));</div><div class='add'>+		v4l_dbg(1, debug, client, "DECODER_GET_STATUS\n");</div><div class='ctx'> </div><div class='ctx'> 		status = vpx3220_fp_read(client, 0x0f3);</div><div class='ctx'> </div><div class='del'>-		dprintk(1, KERN_INFO "%s: status: 0x%04x\n", I2C_NAME(client),</div><div class='del'>-			status);</div><div class='add'>+		v4l_dbg(1, debug, client, "status: 0x%04x\n", status);</div><div class='ctx'> </div><div class='ctx'> 		if (status &lt; 0)</div><div class='ctx'> 			return status;</div><div class='hunk'>@@ -381,7 +344,6 @@ vpx3220_command (struct i2c_client *client,</div><div class='ctx'> 			res |= DECODER_STATUS_GOOD | DECODER_STATUS_COLOR;</div><div class='ctx'> </div><div class='ctx'> 			switch (status &amp; 0x18) {</div><div class='del'>-</div><div class='ctx'> 			case 0x00:</div><div class='ctx'> 			case 0x10:</div><div class='ctx'> 			case 0x14:</div><div class='hunk'>@@ -402,8 +364,8 @@ vpx3220_command (struct i2c_client *client,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		*(int *) arg = res;</div><div class='del'>-	}</div><div class='ctx'> 		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	case DECODER_SET_NORM:</div><div class='ctx'> 	{</div><div class='hunk'>@@ -415,50 +377,43 @@ vpx3220_command (struct i2c_client *client,</div><div class='ctx'> 		   choosen video norm */</div><div class='ctx'> 		temp_input = vpx3220_fp_read(client, 0xf2);</div><div class='ctx'> </div><div class='del'>-		dprintk(1, KERN_DEBUG "%s: DECODER_SET_NORM %d\n",</div><div class='del'>-			I2C_NAME(client), *iarg);</div><div class='add'>+		v4l_dbg(1, debug, client, "DECODER_SET_NORM %d\n", *iarg);</div><div class='ctx'> 		switch (*iarg) {</div><div class='del'>-</div><div class='ctx'> 		case VIDEO_MODE_NTSC:</div><div class='ctx'> 			vpx3220_write_fp_block(client, init_ntsc,</div><div class='ctx'> 					       sizeof(init_ntsc) &gt;&gt; 1);</div><div class='del'>-			dprintk(1, KERN_INFO "%s: norm switched to NTSC\n",</div><div class='del'>-				I2C_NAME(client));</div><div class='add'>+			v4l_dbg(1, debug, client, "norm switched to NTSC\n");</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case VIDEO_MODE_PAL:</div><div class='ctx'> 			vpx3220_write_fp_block(client, init_pal,</div><div class='ctx'> 					       sizeof(init_pal) &gt;&gt; 1);</div><div class='del'>-			dprintk(1, KERN_INFO "%s: norm switched to PAL\n",</div><div class='del'>-				I2C_NAME(client));</div><div class='add'>+			v4l_dbg(1, debug, client, "norm switched to PAL\n");</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case VIDEO_MODE_SECAM:</div><div class='ctx'> 			vpx3220_write_fp_block(client, init_secam,</div><div class='ctx'> 					       sizeof(init_secam) &gt;&gt; 1);</div><div class='del'>-			dprintk(1, KERN_INFO "%s: norm switched to SECAM\n",</div><div class='del'>-				I2C_NAME(client));</div><div class='add'>+			v4l_dbg(1, debug, client, "norm switched to SECAM\n");</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case VIDEO_MODE_AUTO:</div><div class='ctx'> 			/* FIXME This is only preliminary support */</div><div class='ctx'> 			data = vpx3220_fp_read(client, 0xf2) &amp; 0x20;</div><div class='ctx'> 			vpx3220_fp_write(client, 0xf2, 0x00c0 | data);</div><div class='del'>-			dprintk(1, KERN_INFO "%s: norm switched to Auto\n",</div><div class='del'>-				I2C_NAME(client));</div><div class='add'>+			v4l_dbg(1, debug, client, "norm switched to AUTO\n");</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		default:</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-</div><div class='ctx'> 		}</div><div class='ctx'> 		decoder-&gt;norm = *iarg;</div><div class='ctx'> </div><div class='ctx'> 		/* And here we set the backed up video input again */</div><div class='ctx'> 		vpx3220_fp_write(client, 0xf2, temp_input | 0x0010);</div><div class='ctx'> 		udelay(10);</div><div class='del'>-	}</div><div class='ctx'> 		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	case DECODER_SET_INPUT:</div><div class='ctx'> 	{</div><div class='hunk'>@@ -477,8 +432,7 @@ vpx3220_command (struct i2c_client *client,</div><div class='ctx'> 		if (*iarg &lt; 0 || *iarg &gt; 2)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='del'>-		dprintk(1, KERN_INFO "%s: input switched to %s\n",</div><div class='del'>-			I2C_NAME(client), inputs[*iarg]);</div><div class='add'>+		v4l_dbg(1, debug, client, "input switched to %s\n", inputs[*iarg]);</div><div class='ctx'> </div><div class='ctx'> 		vpx3220_write(client, 0x33, input[*iarg][0]);</div><div class='ctx'> </div><div class='hunk'>@@ -490,8 +444,8 @@ vpx3220_command (struct i2c_client *client,</div><div class='ctx'> 				 data | (input[*iarg][1] &lt;&lt; 5) | 0x0010);</div><div class='ctx'> </div><div class='ctx'> 		udelay(10);</div><div class='del'>-	}</div><div class='ctx'> 		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	case DECODER_SET_OUTPUT:</div><div class='ctx'> 	{</div><div class='hunk'>@@ -501,19 +455,18 @@ vpx3220_command (struct i2c_client *client,</div><div class='ctx'> 		if (*iarg != 0) {</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='del'>-	}</div><div class='ctx'> 		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	case DECODER_ENABLE_OUTPUT:</div><div class='ctx'> 	{</div><div class='ctx'> 		int *iarg = arg;</div><div class='ctx'> </div><div class='del'>-		dprintk(1, KERN_DEBUG "%s: DECODER_ENABLE_OUTPUT %d\n",</div><div class='del'>-			I2C_NAME(client), *iarg);</div><div class='add'>+		v4l_dbg(1, debug, client, "DECODER_ENABLE_OUTPUT %d\n", *iarg);</div><div class='ctx'> </div><div class='ctx'> 		vpx3220_write(client, 0xf2, (*iarg ? 0x1b : 0x00));</div><div class='del'>-	}</div><div class='ctx'> 		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	case DECODER_SET_PICTURE:</div><div class='ctx'> 	{</div><div class='hunk'>@@ -544,8 +497,8 @@ vpx3220_command (struct i2c_client *client,</div><div class='ctx'> 			vpx3220_fp_write(client, 0x1c,</div><div class='ctx'> 					 ((decoder-&gt;hue - 32768) &gt;&gt; 6) &amp; 0xFFF);</div><div class='ctx'> 		}</div><div class='del'>-	}</div><div class='ctx'> 		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -554,8 +507,7 @@ vpx3220_command (struct i2c_client *client,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-vpx3220_init_client (struct i2c_client *client)</div><div class='add'>+static int vpx3220_init_client(struct i2c_client *client)</div><div class='ctx'> {</div><div class='ctx'> 	vpx3220_write_block(client, init_common, sizeof(init_common));</div><div class='ctx'> 	vpx3220_write_fp_block(client, init_fp, sizeof(init_fp) &gt;&gt; 1);</div><div class='hunk'>@@ -569,115 +521,26 @@ vpx3220_init_client (struct i2c_client *client)</div><div class='ctx'>  * Client management code</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Generic i2c probe</div><div class='del'>- * concerning the addresses: i2c wants 7 bit (without the r/w bit), so '&gt;&gt;1'</div><div class='del'>- */</div><div class='del'>-static unsigned short normal_i2c[] =</div><div class='del'>-    { I2C_VPX3220 &gt;&gt; 1, (I2C_VPX3220 &gt;&gt; 1) + 4,</div><div class='del'>-	I2C_CLIENT_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned short ignore = I2C_CLIENT_END;</div><div class='del'>-</div><div class='del'>-static struct i2c_client_address_data addr_data = {</div><div class='del'>-	.normal_i2c		= normal_i2c,</div><div class='del'>-	.probe			= &amp;ignore,</div><div class='del'>-	.ignore			= &amp;ignore,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct i2c_driver vpx3220_i2c_driver;</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-vpx3220_detach_client (struct i2c_client *client)</div><div class='del'>-{</div><div class='del'>-	struct vpx3220 *decoder = i2c_get_clientdata(client);</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = i2c_detach_client(client);</div><div class='del'>-	if (err) {</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	kfree(decoder);</div><div class='del'>-	kfree(client);</div><div class='add'>+static unsigned short normal_i2c[] = { 0x86 &gt;&gt; 1, 0x8e &gt;&gt; 1, I2C_CLIENT_END };</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='add'>+I2C_CLIENT_INSMOD;</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-vpx3220_detect_client (struct i2c_adapter *adapter,</div><div class='del'>-		       int                 address,</div><div class='del'>-		       int                 kind)</div><div class='add'>+static int vpx3220_probe(struct i2c_client *client,</div><div class='add'>+			const struct i2c_device_id *id)</div><div class='ctx'> {</div><div class='del'>-	int err;</div><div class='del'>-	struct i2c_client *client;</div><div class='ctx'> 	struct vpx3220 *decoder;</div><div class='del'>-</div><div class='del'>-	dprintk(1, VPX3220_DEBUG "%s\n", __func__);</div><div class='add'>+	const char *name = NULL;</div><div class='add'>+	u8 ver;</div><div class='add'>+	u16 pn;</div><div class='ctx'> </div><div class='ctx'> 	/* Check if the adapter supports the needed features */</div><div class='del'>-	if (!i2c_check_functionality</div><div class='del'>-	    (adapter, I2C_FUNC_SMBUS_BYTE_DATA | I2C_FUNC_SMBUS_WORD_DATA))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);</div><div class='del'>-	if (client == NULL) {</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	client-&gt;addr = address;</div><div class='del'>-	client-&gt;adapter = adapter;</div><div class='del'>-	client-&gt;driver = &amp;vpx3220_i2c_driver;</div><div class='del'>-</div><div class='del'>-	/* Check for manufacture ID and part number */</div><div class='del'>-	if (kind &lt; 0) {</div><div class='del'>-		u8 id;</div><div class='del'>-		u16 pn;</div><div class='del'>-</div><div class='del'>-		id = vpx3220_read(client, 0x00);</div><div class='del'>-		if (id != 0xec) {</div><div class='del'>-			dprintk(1,</div><div class='del'>-				KERN_INFO</div><div class='del'>-				"vpx3220_attach: Wrong manufacturer ID (0x%02x)\n",</div><div class='del'>-				id);</div><div class='del'>-			kfree(client);</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		pn = (vpx3220_read(client, 0x02) &lt;&lt; 8) +</div><div class='del'>-		    vpx3220_read(client, 0x01);</div><div class='del'>-		switch (pn) {</div><div class='del'>-		case 0x4680:</div><div class='del'>-			strlcpy(I2C_NAME(client), "vpx3220a",</div><div class='del'>-				sizeof(I2C_NAME(client)));</div><div class='del'>-			break;</div><div class='del'>-		case 0x4260:</div><div class='del'>-			strlcpy(I2C_NAME(client), "vpx3216b",</div><div class='del'>-				sizeof(I2C_NAME(client)));</div><div class='del'>-			break;</div><div class='del'>-		case 0x4280:</div><div class='del'>-			strlcpy(I2C_NAME(client), "vpx3214c",</div><div class='del'>-				sizeof(I2C_NAME(client)));</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			dprintk(1,</div><div class='del'>-				KERN_INFO</div><div class='del'>-				"%s: Wrong part number (0x%04x)\n",</div><div class='del'>-				__func__, pn);</div><div class='del'>-			kfree(client);</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		strlcpy(I2C_NAME(client), "forced vpx32xx",</div><div class='del'>-			sizeof(I2C_NAME(client)));</div><div class='del'>-	}</div><div class='add'>+	if (!i2c_check_functionality(client-&gt;adapter,</div><div class='add'>+		I2C_FUNC_SMBUS_BYTE_DATA | I2C_FUNC_SMBUS_WORD_DATA))</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	decoder = kzalloc(sizeof(struct vpx3220), GFP_KERNEL);</div><div class='del'>-	if (decoder == NULL) {</div><div class='del'>-		kfree(client);</div><div class='add'>+	if (decoder == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	}</div><div class='ctx'> 	decoder-&gt;norm = VIDEO_MODE_PAL;</div><div class='ctx'> 	decoder-&gt;input = 0;</div><div class='ctx'> 	decoder-&gt;enable = 1;</div><div class='hunk'>@@ -687,63 +550,52 @@ vpx3220_detect_client (struct i2c_adapter *adapter,</div><div class='ctx'> 	decoder-&gt;sat = 32768;</div><div class='ctx'> 	i2c_set_clientdata(client, decoder);</div><div class='ctx'> </div><div class='del'>-	err = i2c_attach_client(client);</div><div class='del'>-	if (err) {</div><div class='del'>-		kfree(client);</div><div class='del'>-		kfree(decoder);</div><div class='del'>-		return err;</div><div class='add'>+	ver = i2c_smbus_read_byte_data(client, 0x00);</div><div class='add'>+	pn = (i2c_smbus_read_byte_data(client, 0x02) &lt;&lt; 8) +</div><div class='add'>+		i2c_smbus_read_byte_data(client, 0x01);</div><div class='add'>+	if (ver == 0xec) {</div><div class='add'>+		switch (pn) {</div><div class='add'>+		case 0x4680:</div><div class='add'>+			name = "vpx3220a";</div><div class='add'>+			break;</div><div class='add'>+		case 0x4260:</div><div class='add'>+			name = "vpx3216b";</div><div class='add'>+			break;</div><div class='add'>+		case 0x4280:</div><div class='add'>+			name = "vpx3214c";</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	dprintk(1, KERN_INFO "%s: vpx32xx client found at address 0x%02x\n",</div><div class='del'>-		I2C_NAME(client), client-&gt;addr &lt;&lt; 1);</div><div class='add'>+	if (name)</div><div class='add'>+		v4l_info(client, "%s found @ 0x%x (%s)\n", name,</div><div class='add'>+			client-&gt;addr &lt;&lt; 1, client-&gt;adapter-&gt;name);</div><div class='add'>+	else</div><div class='add'>+		v4l_info(client, "chip (%02x:%04x) found @ 0x%x (%s)\n",</div><div class='add'>+			ver, pn, client-&gt;addr &lt;&lt; 1, client-&gt;adapter-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	vpx3220_init_client(client);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-vpx3220_attach_adapter (struct i2c_adapter *adapter)</div><div class='add'>+static int vpx3220_remove(struct i2c_client *client)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = i2c_probe(adapter, &amp;addr_data, &amp;vpx3220_detect_client);</div><div class='del'>-	dprintk(1, VPX3220_DEBUG "%s: i2c_probe returned %d\n",</div><div class='del'>-		__func__, ret);</div><div class='del'>-	return ret;</div><div class='add'>+	kfree(i2c_get_clientdata(client));</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* -----------------------------------------------------------------------</div><div class='del'>- * Driver initialization and cleanup code</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static struct i2c_driver vpx3220_i2c_driver = {</div><div class='del'>-	.driver = {</div><div class='del'>-		.name = "vpx3220",</div><div class='del'>-	},</div><div class='del'>-</div><div class='del'>-	.id = I2C_DRIVERID_VPX3220,</div><div class='add'>+static const struct i2c_device_id vpx3220_id[] = {</div><div class='add'>+	{ "vpx3220a", 0 },</div><div class='add'>+	{ "vpx3216b", 0 },</div><div class='add'>+	{ "vpx3214c", 0 },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(i2c, vpx3220_id);</div><div class='ctx'> </div><div class='del'>-	.attach_adapter = vpx3220_attach_adapter,</div><div class='del'>-	.detach_client = vpx3220_detach_client,</div><div class='add'>+static struct v4l2_i2c_driver_data v4l2_i2c_data = {</div><div class='add'>+	.name = "vpx3220",</div><div class='add'>+	.driverid = I2C_DRIVERID_VPX3220,</div><div class='ctx'> 	.command = vpx3220_command,</div><div class='add'>+	.probe = vpx3220_probe,</div><div class='add'>+	.remove = vpx3220_remove,</div><div class='add'>+	.id_table = vpx3220_id,</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init</div><div class='del'>-vpx3220_init (void)</div><div class='del'>-{</div><div class='del'>-	return i2c_add_driver(&amp;vpx3220_i2c_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit</div><div class='del'>-vpx3220_cleanup (void)</div><div class='del'>-{</div><div class='del'>-	i2c_del_driver(&amp;vpx3220_i2c_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(vpx3220_init);</div><div class='del'>-module_exit(vpx3220_cleanup);</div><div class='del'>-</div><div class='del'>-MODULE_DESCRIPTION("vpx3220a/vpx3216b/vpx3214c video decoder driver");</div><div class='del'>-MODULE_AUTHOR("Laurent Pinchart");</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/media/video/w9966.c b/drivers/media/video/w9966.c<br/>index 2ff00bc5ad64..b2dbe48a92bb 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/w9966.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/w9966.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/w9966.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/w9966.c</a></div><div class='hunk'>@@ -113,6 +113,7 @@ struct w9966_dev {</div><div class='ctx'> 	signed char contrast;</div><div class='ctx'> 	signed char color;</div><div class='ctx'> 	signed char hue;</div><div class='add'>+	unsigned long in_use;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -184,10 +185,25 @@ static int w9966_v4l_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> static ssize_t w9966_v4l_read(struct file *file, char __user *buf,</div><div class='ctx'> 			      size_t count, loff_t *ppos);</div><div class='ctx'> </div><div class='add'>+static int w9966_exclusive_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct w9966_dev *cam = video_drvdata(file);</div><div class='add'>+</div><div class='add'>+	return test_and_set_bit(0, &amp;cam-&gt;in_use) ? -EBUSY : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int w9966_exclusive_release(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct w9966_dev *cam = video_drvdata(file);</div><div class='add'>+</div><div class='add'>+	clear_bit(0, &amp;cam-&gt;in_use);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct file_operations w9966_fops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='del'>-	.open           = video_exclusive_open,</div><div class='del'>-	.release        = video_exclusive_release,</div><div class='add'>+	.open           = w9966_exclusive_open,</div><div class='add'>+	.release        = w9966_exclusive_release,</div><div class='ctx'> 	.ioctl          = w9966_v4l_ioctl,</div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='ctx'> 	.compat_ioctl	= v4l_compat_ioctl32,</div><div class='hunk'>@@ -198,6 +214,7 @@ static const struct file_operations w9966_fops = {</div><div class='ctx'> static struct video_device w9966_template = {</div><div class='ctx'> 	.name           = W9966_DRIVERNAME,</div><div class='ctx'> 	.fops           = &amp;w9966_fops,</div><div class='add'>+	.release 	= video_device_release_empty,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -332,7 +349,7 @@ static int w9966_init(struct w9966_dev* cam, struct parport* port)</div><div class='ctx'> </div><div class='ctx'> // Fill in the video_device struct and register us to v4l</div><div class='ctx'> 	memcpy(&amp;cam-&gt;vdev, &amp;w9966_template, sizeof(struct video_device));</div><div class='del'>-	cam-&gt;vdev.priv = cam;</div><div class='add'>+	video_set_drvdata(&amp;cam-&gt;vdev, cam);</div><div class='ctx'> </div><div class='ctx'> 	if (video_register_device(&amp;cam-&gt;vdev, VFL_TYPE_GRABBER, video_nr) &lt; 0)</div><div class='ctx'> 		return -1;</div><div class='hunk'>@@ -713,8 +730,7 @@ static int w9966_wReg_i2c(struct w9966_dev* cam, int reg, int data)</div><div class='ctx'> static int w9966_v4l_do_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 			      unsigned int cmd, void *arg)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *vdev = video_devdata(file);</div><div class='del'>-	struct w9966_dev *cam = vdev-&gt;priv;</div><div class='add'>+	struct w9966_dev *cam = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	switch(cmd)</div><div class='ctx'> 	{</div><div class='hunk'>@@ -872,8 +888,7 @@ static int w9966_v4l_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> static ssize_t w9966_v4l_read(struct file *file, char  __user *buf,</div><div class='ctx'> 			      size_t count, loff_t *ppos)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *vdev = video_devdata(file);</div><div class='del'>-	struct w9966_dev *cam = vdev-&gt;priv;</div><div class='add'>+	struct w9966_dev *cam = video_drvdata(file);</div><div class='ctx'> 	unsigned char addr = 0xa0;	// ECP, read, CCD-transfer, 00000</div><div class='ctx'> 	unsigned char __user *dest = (unsigned char __user *)buf;</div><div class='ctx'> 	unsigned long dleft = count;</div><div class='head'>diff --git a/drivers/media/video/w9968cf.c b/drivers/media/video/w9968cf.c<br/>index 11edf79f57be..dcd45dbd82dc 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/w9968cf.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/w9968cf.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/w9968cf.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/w9968cf.c</a></div><div class='hunk'>@@ -111,7 +111,7 @@ static int specific_debug = W9968CF_SPECIFIC_DEBUG;</div><div class='ctx'> </div><div class='ctx'> static unsigned int param_nv[24]; /* number of values per parameter */</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_KMOD</div><div class='add'>+#ifdef CONFIG_MODULES</div><div class='ctx'> module_param(ovmod_load, bool, 0644);</div><div class='ctx'> #endif</div><div class='ctx'> module_param(simcams, ushort, 0644);</div><div class='hunk'>@@ -144,7 +144,7 @@ module_param(debug, ushort, 0644);</div><div class='ctx'> module_param(specific_debug, bool, 0644);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_KMOD</div><div class='add'>+#ifdef CONFIG_MODULES</div><div class='ctx'> MODULE_PARM_DESC(ovmod_load,</div><div class='ctx'> 		 "\n&lt;0|1&gt; Automatic 'ovcamchip' module loading."</div><div class='ctx'> 		 "\n0 disabled, 1 enabled."</div><div class='head'>diff --git a/drivers/media/video/zc0301/zc0301_core.c b/drivers/media/video/zc0301/zc0301_core.c<br/>index 0c3287734c93..6a0902bcba6b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/zc0301/zc0301_core.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/zc0301/zc0301_core.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/zc0301/zc0301_core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/zc0301/zc0301_core.c</a></div><div class='hunk'>@@ -657,7 +657,7 @@ static int zc0301_open(struct inode* inode, struct file* filp)</div><div class='ctx'> 	if (!down_read_trylock(&amp;zc0301_dev_lock))</div><div class='ctx'> 		return -EAGAIN;</div><div class='ctx'> </div><div class='del'>-	cam = video_get_drvdata(video_devdata(filp));</div><div class='add'>+	cam = video_drvdata(filp);</div><div class='ctx'> </div><div class='ctx'> 	if (wait_for_completion_interruptible(&amp;cam-&gt;probe)) {</div><div class='ctx'> 		up_read(&amp;zc0301_dev_lock);</div><div class='hunk'>@@ -739,7 +739,7 @@ static int zc0301_release(struct inode* inode, struct file* filp)</div><div class='ctx'> </div><div class='ctx'> 	down_write(&amp;zc0301_dev_lock);</div><div class='ctx'> </div><div class='del'>-	cam = video_get_drvdata(video_devdata(filp));</div><div class='add'>+	cam = video_drvdata(filp);</div><div class='ctx'> </div><div class='ctx'> 	zc0301_stop_transfer(cam);</div><div class='ctx'> 	zc0301_release_buffers(cam);</div><div class='hunk'>@@ -759,7 +759,7 @@ static int zc0301_release(struct inode* inode, struct file* filp)</div><div class='ctx'> static ssize_t</div><div class='ctx'> zc0301_read(struct file* filp, char __user * buf, size_t count, loff_t* f_pos)</div><div class='ctx'> {</div><div class='del'>-	struct zc0301_device* cam = video_get_drvdata(video_devdata(filp));</div><div class='add'>+	struct zc0301_device *cam = video_drvdata(filp);</div><div class='ctx'> 	struct zc0301_frame_t* f, * i;</div><div class='ctx'> 	unsigned long lock_flags;</div><div class='ctx'> 	long timeout;</div><div class='hunk'>@@ -866,7 +866,7 @@ exit:</div><div class='ctx'> </div><div class='ctx'> static unsigned int zc0301_poll(struct file *filp, poll_table *wait)</div><div class='ctx'> {</div><div class='del'>-	struct zc0301_device* cam = video_get_drvdata(video_devdata(filp));</div><div class='add'>+	struct zc0301_device *cam = video_drvdata(filp);</div><div class='ctx'> 	struct zc0301_frame_t* f;</div><div class='ctx'> 	unsigned long lock_flags;</div><div class='ctx'> 	unsigned int mask = 0;</div><div class='hunk'>@@ -941,7 +941,7 @@ static struct vm_operations_struct zc0301_vm_ops = {</div><div class='ctx'> </div><div class='ctx'> static int zc0301_mmap(struct file* filp, struct vm_area_struct *vma)</div><div class='ctx'> {</div><div class='del'>-	struct zc0301_device* cam = video_get_drvdata(video_devdata(filp));</div><div class='add'>+	struct zc0301_device *cam = video_drvdata(filp);</div><div class='ctx'> 	unsigned long size = vma-&gt;vm_end - vma-&gt;vm_start,</div><div class='ctx'> 		      start = vma-&gt;vm_start;</div><div class='ctx'> 	void *pos;</div><div class='hunk'>@@ -1796,7 +1796,7 @@ zc0301_vidioc_s_parm(struct zc0301_device* cam, void __user * arg)</div><div class='ctx'> static int zc0301_ioctl_v4l2(struct inode* inode, struct file* filp,</div><div class='ctx'> 			     unsigned int cmd, void __user * arg)</div><div class='ctx'> {</div><div class='del'>-	struct zc0301_device* cam = video_get_drvdata(video_devdata(filp));</div><div class='add'>+	struct zc0301_device *cam = video_drvdata(filp);</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> </div><div class='hunk'>@@ -1891,7 +1891,7 @@ static int zc0301_ioctl_v4l2(struct inode* inode, struct file* filp,</div><div class='ctx'> static int zc0301_ioctl(struct inode* inode, struct file* filp,</div><div class='ctx'> 			unsigned int cmd, unsigned long arg)</div><div class='ctx'> {</div><div class='del'>-	struct zc0301_device* cam = video_get_drvdata(video_devdata(filp));</div><div class='add'>+	struct zc0301_device *cam = video_drvdata(filp);</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (mutex_lock_interruptible(&amp;cam-&gt;fileop_mutex))</div><div class='head'>diff --git a/drivers/media/video/zoran/Kconfig b/drivers/media/video/zoran/Kconfig<br/>new file mode 100644<br/>index 000000000000..4ea5fa71de89<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/zoran/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/zoran/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,73 @@</div><div class='add'>+config VIDEO_ZORAN</div><div class='add'>+	tristate "Zoran ZR36057/36067 Video For Linux"</div><div class='add'>+	depends on PCI &amp;&amp; I2C_ALGOBIT &amp;&amp; VIDEO_V4L1 &amp;&amp; VIRT_TO_BUS</div><div class='add'>+	help</div><div class='add'>+	  Say Y for support for MJPEG capture cards based on the Zoran</div><div class='add'>+	  36057/36067 PCI controller chipset. This includes the Iomega</div><div class='add'>+	  Buz, Pinnacle DC10+ and the Linux Media Labs LML33. There is</div><div class='add'>+	  a driver homepage at &lt;http://mjpeg.sf.net/driver-zoran/&gt;. For</div><div class='add'>+	  more information, check &lt;file:Documentation/video4linux/Zoran&gt;.</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here: the</div><div class='add'>+	  module will be called zr36067.</div><div class='add'>+</div><div class='add'>+config VIDEO_ZORAN_DC30</div><div class='add'>+	tristate "Pinnacle/Miro DC30(+) support"</div><div class='add'>+	depends on VIDEO_ZORAN</div><div class='add'>+	select VIDEO_ADV7175 if VIDEO_HELPER_CHIPS_AUTO</div><div class='add'>+	select VIDEO_VPX3220 if VIDEO_HELPER_CHIPS_AUTO</div><div class='add'>+	help</div><div class='add'>+	  Support for the Pinnacle/Miro DC30(+) MJPEG capture/playback</div><div class='add'>+	  card. This also supports really old DC10 cards based on the</div><div class='add'>+	  zr36050 MJPEG codec and zr36016 VFE.</div><div class='add'>+</div><div class='add'>+config VIDEO_ZORAN_ZR36060</div><div class='add'>+	tristate "Zoran ZR36060"</div><div class='add'>+	depends on VIDEO_ZORAN</div><div class='add'>+	help</div><div class='add'>+	  Say Y to support Zoran boards based on 36060 chips.</div><div class='add'>+	  This includes Iomega Buz, Pinnacle DC10, Linux media Labs 33</div><div class='add'>+	  and 33 R10 and AverMedia 6 boards.</div><div class='add'>+</div><div class='add'>+config VIDEO_ZORAN_BUZ</div><div class='add'>+	tristate "Iomega Buz support"</div><div class='add'>+	depends on VIDEO_ZORAN_ZR36060</div><div class='add'>+	select VIDEO_SAA7111 if VIDEO_HELPER_CHIPS_AUTO</div><div class='add'>+	select VIDEO_SAA7185 if VIDEO_HELPER_CHIPS_AUTO</div><div class='add'>+	help</div><div class='add'>+	  Support for the Iomega Buz MJPEG capture/playback card.</div><div class='add'>+</div><div class='add'>+config VIDEO_ZORAN_DC10</div><div class='add'>+	tristate "Pinnacle/Miro DC10(+) support"</div><div class='add'>+	depends on VIDEO_ZORAN_ZR36060</div><div class='add'>+	select VIDEO_SAA7110 if VIDEO_HELPER_CHIPS_AUTO</div><div class='add'>+	select VIDEO_ADV7175 if VIDEO_HELPER_CHIPS_AUTO</div><div class='add'>+	help</div><div class='add'>+	  Support for the Pinnacle/Miro DC10(+) MJPEG capture/playback</div><div class='add'>+	  card.</div><div class='add'>+</div><div class='add'>+config VIDEO_ZORAN_LML33</div><div class='add'>+	tristate "Linux Media Labs LML33 support"</div><div class='add'>+	depends on VIDEO_ZORAN_ZR36060</div><div class='add'>+	select VIDEO_BT819 if VIDEO_HELPER_CHIPS_AUTO</div><div class='add'>+	select VIDEO_BT856 if VIDEO_HELPER_CHIPS_AUTO</div><div class='add'>+	help</div><div class='add'>+	  Support for the Linux Media Labs LML33 MJPEG capture/playback</div><div class='add'>+	  card.</div><div class='add'>+</div><div class='add'>+config VIDEO_ZORAN_LML33R10</div><div class='add'>+	tristate "Linux Media Labs LML33R10 support"</div><div class='add'>+	depends on VIDEO_ZORAN_ZR36060</div><div class='add'>+	select VIDEO_SAA7114 if VIDEO_HELPER_CHIPS_AUTO</div><div class='add'>+	select VIDEO_ADV7170 if VIDEO_HELPER_CHIPS_AUTO</div><div class='add'>+	help</div><div class='add'>+	  support for the Linux Media Labs LML33R10 MJPEG capture/playback</div><div class='add'>+	  card.</div><div class='add'>+</div><div class='add'>+config VIDEO_ZORAN_AVS6EYES</div><div class='add'>+	tristate "AverMedia 6 Eyes support (EXPERIMENTAL)"</div><div class='add'>+	depends on VIDEO_ZORAN_ZR36060 &amp;&amp; EXPERIMENTAL &amp;&amp; VIDEO_V4L1</div><div class='add'>+	select VIDEO_BT856 if VIDEO_HELPER_CHIPS_AUTO</div><div class='add'>+	select VIDEO_KS0127 if VIDEO_HELPER_CHIPS_AUTO</div><div class='add'>+	help</div><div class='add'>+	  Support for the AverMedia 6 Eyes video surveillance card.</div><div class='head'>diff --git a/drivers/media/video/zoran/Makefile b/drivers/media/video/zoran/Makefile<br/>new file mode 100644<br/>index 000000000000..44cc13352c88<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/zoran/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/zoran/Makefile</a></div><div class='hunk'>@@ -0,0 +1,6 @@</div><div class='add'>+zr36067-objs	:=	zoran_procfs.o zoran_device.o \</div><div class='add'>+			zoran_driver.o zoran_card.o</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_VIDEO_ZORAN) += zr36067.o videocodec.o</div><div class='add'>+obj-$(CONFIG_VIDEO_ZORAN_DC30) += zr36050.o zr36016.o</div><div class='add'>+obj-$(CONFIG_VIDEO_ZORAN_ZR36060) += zr36060.o</div><div class='head'>diff --git a/drivers/media/video/videocodec.c b/drivers/media/video/zoran/videocodec.c<br/>index cf24956f3204..cf24956f3204 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/videocodec.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/videocodec.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/zoran/videocodec.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/zoran/videocodec.c</a></div><div class='head'>diff --git a/drivers/media/video/videocodec.h b/drivers/media/video/zoran/videocodec.h<br/>index 97a3bbeda505..97a3bbeda505 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/videocodec.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/videocodec.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/zoran/videocodec.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/zoran/videocodec.h</a></div><div class='head'>diff --git a/drivers/media/video/zoran.h b/drivers/media/video/zoran/zoran.h<br/>index 46b7ad477ceb..46b7ad477ceb 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/zoran.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/zoran.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/zoran/zoran.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/zoran/zoran.h</a></div><div class='head'>diff --git a/drivers/media/video/zoran_card.c b/drivers/media/video/zoran/zoran_card.c<br/>index 3282be730298..fa5f2f8f518a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/zoran_card.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/zoran_card.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/zoran/zoran_card.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/zoran/zoran_card.c</a></div><div class='hunk'>@@ -817,6 +817,7 @@ zoran_register_i2c (struct zoran *zr)</div><div class='ctx'> 	memcpy(&amp;zr-&gt;i2c_algo, &amp;zoran_i2c_bit_data_template,</div><div class='ctx'> 	       sizeof(struct i2c_algo_bit_data));</div><div class='ctx'> 	zr-&gt;i2c_algo.data = zr;</div><div class='add'>+	zr-&gt;i2c_adapter.class = I2C_CLASS_TV_ANALOG;</div><div class='ctx'> 	zr-&gt;i2c_adapter.id = I2C_HW_B_ZR36067;</div><div class='ctx'> 	zr-&gt;i2c_adapter.client_register = zoran_i2c_client_register;</div><div class='ctx'> 	zr-&gt;i2c_adapter.client_unregister = zoran_i2c_client_unregister;</div><div class='head'>diff --git a/drivers/media/video/zoran_card.h b/drivers/media/video/zoran/zoran_card.h<br/>index e4dc9d29b404..e4dc9d29b404 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/zoran_card.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/zoran_card.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/zoran/zoran_card.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/zoran/zoran_card.h</a></div><div class='head'>diff --git a/drivers/media/video/zoran_device.c b/drivers/media/video/zoran/zoran_device.c<br/>index 88d369708e4c..5d948ff7faf0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/zoran_device.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/zoran_device.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/zoran/zoran_device.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/zoran/zoran_device.c</a></div><div class='hunk'>@@ -58,8 +58,6 @@</div><div class='ctx'> 		   ZR36057_ISR_GIRQ1 | \</div><div class='ctx'> 		   ZR36057_ISR_JPEGRepIRQ )</div><div class='ctx'> </div><div class='del'>-extern const struct zoran_format zoran_formats[];</div><div class='del'>-</div><div class='ctx'> static int lml33dpath;		/* default = 0</div><div class='ctx'> 				 * 1 will use digital path in capture</div><div class='ctx'> 				 * mode instead of analog. It can be</div><div class='hunk'>@@ -377,7 +375,7 @@ zr36057_set_vfe (struct zoran              *zr,</div><div class='ctx'> </div><div class='ctx'> 	/* horizontal */</div><div class='ctx'> 	VidWinWid = video_width;</div><div class='del'>-	X = (VidWinWid * 64 + tvn-&gt;Wa - 1) / tvn-&gt;Wa;</div><div class='add'>+	X = DIV_ROUND_UP(VidWinWid * 64, tvn-&gt;Wa);</div><div class='ctx'> 	We = (VidWinWid * 64) / X;</div><div class='ctx'> 	HorDcm = 64 - X;</div><div class='ctx'> 	hcrop1 = 2 * ((tvn-&gt;Wa - We) / 4);</div><div class='hunk'>@@ -403,7 +401,7 @@ zr36057_set_vfe (struct zoran              *zr,</div><div class='ctx'> 	/* Vertical */</div><div class='ctx'> 	DispMode = !(video_height &gt; BUZ_MAX_HEIGHT / 2);</div><div class='ctx'> 	VidWinHt = DispMode ? video_height : video_height / 2;</div><div class='del'>-	Y = (VidWinHt * 64 * 2 + tvn-&gt;Ha - 1) / tvn-&gt;Ha;</div><div class='add'>+	Y = DIV_ROUND_UP(VidWinHt * 64 * 2, tvn-&gt;Ha);</div><div class='ctx'> 	He = (VidWinHt * 64) / Y;</div><div class='ctx'> 	VerDcm = 64 - Y;</div><div class='ctx'> 	vcrop1 = (tvn-&gt;Ha / 2 - He) / 2;</div><div class='head'>diff --git a/drivers/media/video/zoran_device.h b/drivers/media/video/zoran/zoran_device.h<br/>index 37fa86a34083..74c6c8edb7d0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/zoran_device.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/zoran_device.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/zoran/zoran_device.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/zoran/zoran_device.h</a></div><div class='hunk'>@@ -78,6 +78,14 @@ extern void zoran_set_pci_master(struct zoran *zr,</div><div class='ctx'> extern void zoran_init_hardware(struct zoran *zr);</div><div class='ctx'> extern void zr36057_restart(struct zoran *zr);</div><div class='ctx'> </div><div class='add'>+extern const struct zoran_format zoran_formats[];</div><div class='add'>+</div><div class='add'>+extern int v4l_nbufs;</div><div class='add'>+extern int v4l_bufsize;</div><div class='add'>+extern int jpg_nbufs;</div><div class='add'>+extern int jpg_bufsize;</div><div class='add'>+extern int pass_through;</div><div class='add'>+</div><div class='ctx'> /* i2c */</div><div class='ctx'> extern int decoder_command(struct zoran *zr,</div><div class='ctx'> 			   int cmd,</div><div class='head'>diff --git a/drivers/media/video/zoran_driver.c b/drivers/media/video/zoran/zoran_driver.c<br/>index 2dab9eea4def..db11ab9e60da 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/zoran_driver.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/zoran_driver.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/zoran/zoran_driver.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/zoran/zoran_driver.c</a></div><div class='hunk'>@@ -194,12 +194,6 @@ const struct zoran_format zoran_formats[] = {</div><div class='ctx'> // RJ: Test only - want to test BUZ_USE_HIMEM even when CONFIG_BIGPHYS_AREA is defined</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-extern int v4l_nbufs;</div><div class='del'>-extern int v4l_bufsize;</div><div class='del'>-extern int jpg_nbufs;</div><div class='del'>-extern int jpg_bufsize;</div><div class='del'>-extern int pass_through;</div><div class='del'>-</div><div class='ctx'> static int lock_norm;	/* 0 = default 1 = Don't change TV standard (norm) */</div><div class='ctx'> module_param(lock_norm, int, 0644);</div><div class='ctx'> MODULE_PARM_DESC(lock_norm, "Prevent norm changes (1 = ignore, &gt;1 = fail)");</div><div class='hunk'>@@ -1211,6 +1205,7 @@ zoran_open (struct inode *inode,</div><div class='ctx'> 	struct zoran_fh *fh;</div><div class='ctx'> 	int i, res, first_open = 0, have_module_locks = 0;</div><div class='ctx'> </div><div class='add'>+	lock_kernel();</div><div class='ctx'> 	/* find the device */</div><div class='ctx'> 	for (i = 0; i &lt; zoran_num; i++) {</div><div class='ctx'> 		if (zoran[i]-&gt;video_dev-&gt;minor == minor) {</div><div class='hunk'>@@ -1321,6 +1316,7 @@ zoran_open (struct inode *inode,</div><div class='ctx'> 	file-&gt;private_data = fh;</div><div class='ctx'> 	fh-&gt;zr = zr;</div><div class='ctx'> 	zoran_open_init_session(file);</div><div class='add'>+	unlock_kernel();</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1338,6 +1334,7 @@ open_unlock_and_return:</div><div class='ctx'> 	if (zr) {</div><div class='ctx'> 		/*mutex_unlock(&amp;zr-&gt;resource_lock);*/</div><div class='ctx'> 	}</div><div class='add'>+	unlock_kernel();</div><div class='ctx'> </div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='hunk'>@@ -2920,6 +2917,8 @@ zoran_do_ioctl (struct inode *inode,</div><div class='ctx'> 				fmt-&gt;fmt.pix.bytesperline = 0;</div><div class='ctx'> 				fmt-&gt;fmt.pix.sizeimage =</div><div class='ctx'> 				    fh-&gt;jpg_buffers.buffer_size;</div><div class='add'>+				fmt-&gt;fmt.pix.colorspace =</div><div class='add'>+				    V4L2_COLORSPACE_SMPTE170M;</div><div class='ctx'> </div><div class='ctx'> 				/* we hereby abuse this variable to show that</div><div class='ctx'> 				 * we're gonna do mjpeg capture */</div><div class='hunk'>@@ -2979,6 +2978,8 @@ zoran_do_ioctl (struct inode *inode,</div><div class='ctx'> 				fmt-&gt;fmt.pix.sizeimage =</div><div class='ctx'> 					fh-&gt;v4l_settings.height *</div><div class='ctx'> 					fh-&gt;v4l_settings.bytesperline;</div><div class='add'>+				fmt-&gt;fmt.pix.colorspace =</div><div class='add'>+					fh-&gt;v4l_settings.format-&gt;colorspace;</div><div class='ctx'> 				if (BUZ_MAX_HEIGHT &lt;</div><div class='ctx'> 				    (fh-&gt;v4l_settings.height * 2))</div><div class='ctx'> 					fmt-&gt;fmt.pix.field =</div><div class='hunk'>@@ -2995,7 +2996,6 @@ zoran_do_ioctl (struct inode *inode,</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		default:</div><div class='del'>-			dprintk(3, "unsupported\n");</div><div class='ctx'> 			dprintk(1,</div><div class='ctx'> 				KERN_ERR</div><div class='ctx'> 				"%s: VIDIOC_S_FMT - unsupported type %d\n",</div><div class='head'>diff --git a/drivers/media/video/zoran_procfs.c b/drivers/media/video/zoran/zoran_procfs.c<br/>index 870bc5a70e3f..870bc5a70e3f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/zoran_procfs.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/zoran_procfs.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/zoran/zoran_procfs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/zoran/zoran_procfs.c</a></div><div class='head'>diff --git a/drivers/media/video/zoran_procfs.h b/drivers/media/video/zoran/zoran_procfs.h<br/>index f2d5b1ba448f..f2d5b1ba448f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/zoran_procfs.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/zoran_procfs.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/zoran/zoran_procfs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/zoran/zoran_procfs.h</a></div><div class='head'>diff --git a/drivers/media/video/zr36016.c b/drivers/media/video/zoran/zr36016.c<br/>index 00d132bcd1e4..00d132bcd1e4 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/zr36016.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/zr36016.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/zoran/zr36016.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/zoran/zr36016.c</a></div><div class='head'>diff --git a/drivers/media/video/zr36016.h b/drivers/media/video/zoran/zr36016.h<br/>index 8c79229f69d1..8c79229f69d1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/zr36016.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/zr36016.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/zoran/zr36016.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/zoran/zr36016.h</a></div><div class='head'>diff --git a/drivers/media/video/zr36050.c b/drivers/media/video/zoran/zr36050.c<br/>index cf8b271a1c8f..cf8b271a1c8f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/zr36050.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/zr36050.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/zoran/zr36050.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/zoran/zr36050.c</a></div><div class='head'>diff --git a/drivers/media/video/zr36050.h b/drivers/media/video/zoran/zr36050.h<br/>index 9f52f0cdde50..9f52f0cdde50 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/zr36050.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/zr36050.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/zoran/zr36050.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/zoran/zr36050.h</a></div><div class='head'>diff --git a/drivers/media/video/zr36057.h b/drivers/media/video/zoran/zr36057.h<br/>index 54c9362aa980..54c9362aa980 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/zr36057.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/zr36057.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/zoran/zr36057.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/zoran/zr36057.h</a></div><div class='head'>diff --git a/drivers/media/video/zr36060.c b/drivers/media/video/zoran/zr36060.c<br/>index 8e74054d5ef1..8e74054d5ef1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/zr36060.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/zr36060.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/zoran/zr36060.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/zoran/zr36060.c</a></div><div class='head'>diff --git a/drivers/media/video/zr36060.h b/drivers/media/video/zoran/zr36060.h<br/>index 914ffa4ad8d3..914ffa4ad8d3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/zr36060.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/zr36060.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/zoran/zr36060.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/zoran/zr36060.h</a></div><div class='head'>diff --git a/drivers/media/video/zr364xx.c b/drivers/media/video/zr364xx.c<br/>index 18d1c4ba79fb..7cdac99deea6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/zr364xx.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/media/video/zr364xx.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/media/video/zr364xx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/media/video/zr364xx.c</a></div><div class='hunk'>@@ -52,7 +52,7 @@</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* Debug macro */</div><div class='del'>-#define DBG(x...) if (debug) info(x)</div><div class='add'>+#define DBG(x...) if (debug) printk(KERN_INFO KBUILD_MODNAME x)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* Init methods, need to find nicer names for these</div><div class='hunk'>@@ -116,6 +116,7 @@ struct zr364xx_camera {</div><div class='ctx'> 	int height;</div><div class='ctx'> 	int method;</div><div class='ctx'> 	struct mutex lock;</div><div class='add'>+	int users;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -127,7 +128,7 @@ static int send_control_msg(struct usb_device *udev, u8 request, u16 value,</div><div class='ctx'> </div><div class='ctx'> 	unsigned char *transfer_buffer = kmalloc(size, GFP_KERNEL);</div><div class='ctx'> 	if (!transfer_buffer) {</div><div class='del'>-		info("kmalloc(%d) failed", size);</div><div class='add'>+		dev_err(&amp;udev-&gt;dev, "kmalloc(%d) failed\n", size);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -143,7 +144,8 @@ static int send_control_msg(struct usb_device *udev, u8 request, u16 value,</div><div class='ctx'> 	kfree(transfer_buffer);</div><div class='ctx'> </div><div class='ctx'> 	if (status &lt; 0)</div><div class='del'>-		info("Failed sending control message, error %d.", status);</div><div class='add'>+		dev_err(&amp;udev-&gt;dev,</div><div class='add'>+			"Failed sending control message, error %d.\n", status);</div><div class='ctx'> </div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='hunk'>@@ -303,11 +305,11 @@ static int read_frame(struct zr364xx_camera *cam, int framenum)</div><div class='ctx'> 		DBG("buffer : %d %d", cam-&gt;buffer[0], cam-&gt;buffer[1]);</div><div class='ctx'> 		DBG("bulk : n=%d size=%d", n, actual_length);</div><div class='ctx'> 		if (n &lt; 0) {</div><div class='del'>-			info("error reading bulk msg");</div><div class='add'>+			dev_err(&amp;cam-&gt;udev-&gt;dev, "error reading bulk msg\n");</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (actual_length &lt; 0 || actual_length &gt; BUFFER_SIZE) {</div><div class='del'>-			info("wrong number of bytes");</div><div class='add'>+			dev_err(&amp;cam-&gt;udev-&gt;dev, "wrong number of bytes\n");</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -641,42 +643,47 @@ static int zr364xx_open(struct inode *inode, struct file *file)</div><div class='ctx'> </div><div class='ctx'> 	DBG("zr364xx_open");</div><div class='ctx'> </div><div class='del'>-	cam-&gt;skip = 2;</div><div class='add'>+	mutex_lock(&amp;cam-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	err = video_exclusive_open(inode, file);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='add'>+	if (cam-&gt;users) {</div><div class='add'>+		err = -EBUSY;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (!cam-&gt;framebuf) {</div><div class='ctx'> 		cam-&gt;framebuf = vmalloc_32(MAX_FRAME_SIZE * FRAMES);</div><div class='ctx'> 		if (!cam-&gt;framebuf) {</div><div class='del'>-			info("vmalloc_32 failed!");</div><div class='del'>-			return -ENOMEM;</div><div class='add'>+			dev_err(&amp;cam-&gt;udev-&gt;dev, "vmalloc_32 failed!\n");</div><div class='add'>+			err = -ENOMEM;</div><div class='add'>+			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;cam-&gt;lock);</div><div class='ctx'> 	for (i = 0; init[cam-&gt;method][i].size != -1; i++) {</div><div class='ctx'> 		err =</div><div class='ctx'> 		    send_control_msg(udev, 1, init[cam-&gt;method][i].value,</div><div class='ctx'> 				     0, init[cam-&gt;method][i].bytes,</div><div class='ctx'> 				     init[cam-&gt;method][i].size);</div><div class='ctx'> 		if (err &lt; 0) {</div><div class='del'>-			info("error during open sequence: %d", i);</div><div class='del'>-			mutex_unlock(&amp;cam-&gt;lock);</div><div class='del'>-			return err;</div><div class='add'>+			dev_err(&amp;cam-&gt;udev-&gt;dev,</div><div class='add'>+				"error during open sequence: %d\n", i);</div><div class='add'>+			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	cam-&gt;skip = 2;</div><div class='add'>+	cam-&gt;users++;</div><div class='ctx'> 	file-&gt;private_data = vdev;</div><div class='ctx'> </div><div class='ctx'> 	/* Added some delay here, since opening/closing the camera quickly,</div><div class='ctx'> 	 * like Ekiga does during its startup, can crash the webcam</div><div class='ctx'> 	 */</div><div class='ctx'> 	mdelay(100);</div><div class='add'>+	err = 0;</div><div class='ctx'> </div><div class='add'>+out:</div><div class='ctx'> 	mutex_unlock(&amp;cam-&gt;lock);</div><div class='del'>-	return 0;</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -697,28 +704,30 @@ static int zr364xx_release(struct inode *inode, struct file *file)</div><div class='ctx'> 	udev = cam-&gt;udev;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;cam-&gt;lock);</div><div class='add'>+</div><div class='add'>+	cam-&gt;users--;</div><div class='add'>+	file-&gt;private_data = NULL;</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; 2; i++) {</div><div class='ctx'> 		err =</div><div class='ctx'> 		    send_control_msg(udev, 1, init[cam-&gt;method][i].value,</div><div class='ctx'> 				     0, init[i][cam-&gt;method].bytes,</div><div class='ctx'> 				     init[cam-&gt;method][i].size);</div><div class='ctx'> 		if (err &lt; 0) {</div><div class='del'>-			info("error during release sequence");</div><div class='del'>-			mutex_unlock(&amp;cam-&gt;lock);</div><div class='del'>-			return err;</div><div class='add'>+			dev_err(&amp;udev-&gt;dev, "error during release sequence\n");</div><div class='add'>+			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	file-&gt;private_data = NULL;</div><div class='del'>-	video_exclusive_release(inode, file);</div><div class='del'>-</div><div class='ctx'> 	/* Added some delay here, since opening/closing the camera quickly,</div><div class='ctx'> 	 * like Ekiga does during its startup, can crash the webcam</div><div class='ctx'> 	 */</div><div class='ctx'> 	mdelay(100);</div><div class='add'>+	err = 0;</div><div class='ctx'> </div><div class='add'>+out:</div><div class='ctx'> 	mutex_unlock(&amp;cam-&gt;lock);</div><div class='del'>-	return 0;</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -801,13 +810,14 @@ static int zr364xx_probe(struct usb_interface *intf,</div><div class='ctx'> </div><div class='ctx'> 	DBG("probing...");</div><div class='ctx'> </div><div class='del'>-	info(DRIVER_DESC " compatible webcam plugged");</div><div class='del'>-	info("model %04x:%04x detected", udev-&gt;descriptor.idVendor,</div><div class='del'>-	     udev-&gt;descriptor.idProduct);</div><div class='add'>+	dev_info(&amp;intf-&gt;dev, DRIVER_DESC " compatible webcam plugged\n");</div><div class='add'>+	dev_info(&amp;intf-&gt;dev, "model %04x:%04x detected\n",</div><div class='add'>+		 le16_to_cpu(udev-&gt;descriptor.idVendor),</div><div class='add'>+		 le16_to_cpu(udev-&gt;descriptor.idProduct));</div><div class='ctx'> </div><div class='ctx'> 	cam = kzalloc(sizeof(struct zr364xx_camera), GFP_KERNEL);</div><div class='ctx'> 	if (cam == NULL) {</div><div class='del'>-		info("cam: out of memory !");</div><div class='add'>+		dev_err(&amp;udev-&gt;dev, "cam: out of memory !\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* save the init method used by this camera */</div><div class='hunk'>@@ -815,7 +825,7 @@ static int zr364xx_probe(struct usb_interface *intf,</div><div class='ctx'> </div><div class='ctx'> 	cam-&gt;vdev = video_device_alloc();</div><div class='ctx'> 	if (cam-&gt;vdev == NULL) {</div><div class='del'>-		info("cam-&gt;vdev: out of memory !");</div><div class='add'>+		dev_err(&amp;udev-&gt;dev, "cam-&gt;vdev: out of memory !\n");</div><div class='ctx'> 		kfree(cam);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -827,7 +837,7 @@ static int zr364xx_probe(struct usb_interface *intf,</div><div class='ctx'> 	cam-&gt;udev = udev;</div><div class='ctx'> </div><div class='ctx'> 	if ((cam-&gt;buffer = kmalloc(BUFFER_SIZE, GFP_KERNEL)) == NULL) {</div><div class='del'>-		info("cam-&gt;buffer: out of memory !");</div><div class='add'>+		dev_info(&amp;udev-&gt;dev, "cam-&gt;buffer: out of memory !\n");</div><div class='ctx'> 		video_device_release(cam-&gt;vdev);</div><div class='ctx'> 		kfree(cam);</div><div class='ctx'> 		return -ENODEV;</div><div class='hunk'>@@ -835,17 +845,17 @@ static int zr364xx_probe(struct usb_interface *intf,</div><div class='ctx'> </div><div class='ctx'> 	switch (mode) {</div><div class='ctx'> 	case 1:</div><div class='del'>-		info("160x120 mode selected");</div><div class='add'>+		dev_info(&amp;udev-&gt;dev, "160x120 mode selected\n");</div><div class='ctx'> 		cam-&gt;width = 160;</div><div class='ctx'> 		cam-&gt;height = 120;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 2:</div><div class='del'>-		info("640x480 mode selected");</div><div class='add'>+		dev_info(&amp;udev-&gt;dev, "640x480 mode selected\n");</div><div class='ctx'> 		cam-&gt;width = 640;</div><div class='ctx'> 		cam-&gt;height = 480;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		info("320x240 mode selected");</div><div class='add'>+		dev_info(&amp;udev-&gt;dev, "320x240 mode selected\n");</div><div class='ctx'> 		cam-&gt;width = 320;</div><div class='ctx'> 		cam-&gt;height = 240;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -865,7 +875,7 @@ static int zr364xx_probe(struct usb_interface *intf,</div><div class='ctx'> </div><div class='ctx'> 	err = video_register_device(cam-&gt;vdev, VFL_TYPE_GRABBER, -1);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		info("video_register_device failed");</div><div class='add'>+		dev_err(&amp;udev-&gt;dev, "video_register_device failed\n");</div><div class='ctx'> 		video_device_release(cam-&gt;vdev);</div><div class='ctx'> 		kfree(cam-&gt;buffer);</div><div class='ctx'> 		kfree(cam);</div><div class='hunk'>@@ -874,7 +884,8 @@ static int zr364xx_probe(struct usb_interface *intf,</div><div class='ctx'> </div><div class='ctx'> 	usb_set_intfdata(intf, cam);</div><div class='ctx'> </div><div class='del'>-	info(DRIVER_DESC " controlling video device %d", cam-&gt;vdev-&gt;minor);</div><div class='add'>+	dev_info(&amp;udev-&gt;dev, DRIVER_DESC " controlling video device %d\n",</div><div class='add'>+		 cam-&gt;vdev-&gt;minor);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -884,7 +895,7 @@ static void zr364xx_disconnect(struct usb_interface *intf)</div><div class='ctx'> 	struct zr364xx_camera *cam = usb_get_intfdata(intf);</div><div class='ctx'> 	usb_set_intfdata(intf, NULL);</div><div class='ctx'> 	dev_set_drvdata(&amp;intf-&gt;dev, NULL);</div><div class='del'>-	info(DRIVER_DESC " webcam unplugged");</div><div class='add'>+	dev_info(&amp;intf-&gt;dev, DRIVER_DESC " webcam unplugged\n");</div><div class='ctx'> 	if (cam-&gt;vdev)</div><div class='ctx'> 		video_unregister_device(cam-&gt;vdev);</div><div class='ctx'> 	cam-&gt;vdev = NULL;</div><div class='hunk'>@@ -913,16 +924,16 @@ static int __init zr364xx_init(void)</div><div class='ctx'> 	int retval;</div><div class='ctx'> 	retval = usb_register(&amp;zr364xx_driver);</div><div class='ctx'> 	if (retval)</div><div class='del'>-		info("usb_register failed!");</div><div class='add'>+		printk(KERN_ERR KBUILD_MODNAME ": usb_register failed!\n");</div><div class='ctx'> 	else</div><div class='del'>-		info(DRIVER_DESC " module loaded");</div><div class='add'>+		printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_DESC "\n");</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static void __exit zr364xx_exit(void)</div><div class='ctx'> {</div><div class='del'>-	info(DRIVER_DESC " module unloaded");</div><div class='add'>+	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_DESC " module unloaded\n");</div><div class='ctx'> 	usb_deregister(&amp;zr364xx_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/memstick/core/mspro_block.c b/drivers/memstick/core/mspro_block.c<br/>index d2d2318dafa4..6e291bf8237a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/memstick/core/mspro_block.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/memstick/core/mspro_block.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/memstick/core/mspro_block.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/memstick/core/mspro_block.c</a></div><div class='hunk'>@@ -197,7 +197,7 @@ static int mspro_block_bd_open(struct inode *inode, struct file *filp)</div><div class='ctx'> static int mspro_block_disk_release(struct gendisk *disk)</div><div class='ctx'> {</div><div class='ctx'> 	struct mspro_block_data *msb = disk-&gt;private_data;</div><div class='del'>-	int disk_id = disk-&gt;first_minor &gt;&gt; MSPRO_BLOCK_PART_SHIFT;</div><div class='add'>+	int disk_id = MINOR(disk_devt(disk)) &gt;&gt; MSPRO_BLOCK_PART_SHIFT;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;mspro_block_disk_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -828,7 +828,7 @@ static void mspro_block_submit_req(struct request_queue *q)</div><div class='ctx'> </div><div class='ctx'> 	if (msb-&gt;eject) {</div><div class='ctx'> 		while ((req = elv_next_request(q)) != NULL)</div><div class='del'>-			end_queued_request(req, -ENODEV);</div><div class='add'>+			__blk_end_request(req, -ENODEV, blk_rq_bytes(req));</div><div class='ctx'> </div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/message/i2o/Makefile b/drivers/message/i2o/Makefile<br/>index 2c2e39aa1efa..b0982dacfd0a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/message/i2o/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/message/i2o/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/message/i2o/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/message/i2o/Makefile</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'> # In the future, some of these should be built conditionally.</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-i2o_core-y		+= iop.o driver.o device.o debug.o pci.o exec-osm.o</div><div class='add'>+i2o_core-y		+= iop.o driver.o device.o debug.o pci.o exec-osm.o memory.o</div><div class='ctx'> i2o_bus-y		+= bus-osm.o</div><div class='ctx'> i2o_config-y		+= config-osm.o</div><div class='ctx'> obj-$(CONFIG_I2O)	+= i2o_core.o</div><div class='head'>diff --git a/drivers/message/i2o/device.c b/drivers/message/i2o/device.c<br/>index 8774c670e668..54c2e9ae23e5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/message/i2o/device.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/message/i2o/device.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/message/i2o/device.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/message/i2o/device.c</a></div><div class='hunk'>@@ -467,7 +467,7 @@ int i2o_parm_issue(struct i2o_device *i2o_dev, int cmd, void *oplist,</div><div class='ctx'> </div><div class='ctx'> 	res.virt = NULL;</div><div class='ctx'> </div><div class='del'>-	if (i2o_dma_alloc(dev, &amp;res, reslen, GFP_KERNEL))</div><div class='add'>+	if (i2o_dma_alloc(dev, &amp;res, reslen))</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	msg = i2o_msg_get_wait(c, I2O_TIMEOUT_MESSAGE_GET);</div><div class='head'>diff --git a/drivers/message/i2o/exec-osm.c b/drivers/message/i2o/exec-osm.c<br/>index 6cbcc21de518..56faef1a1d55 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/message/i2o/exec-osm.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/message/i2o/exec-osm.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/message/i2o/exec-osm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/message/i2o/exec-osm.c</a></div><div class='hunk'>@@ -388,8 +388,8 @@ static int i2o_exec_lct_notify(struct i2o_controller *c, u32 change_ind)</div><div class='ctx'> </div><div class='ctx'> 	dev = &amp;c-&gt;pdev-&gt;dev;</div><div class='ctx'> </div><div class='del'>-	if (i2o_dma_realloc</div><div class='del'>-	    (dev, &amp;c-&gt;dlct, le32_to_cpu(sb-&gt;expected_lct_size), GFP_KERNEL))</div><div class='add'>+	if (i2o_dma_realloc(dev, &amp;c-&gt;dlct,</div><div class='add'>+					le32_to_cpu(sb-&gt;expected_lct_size)))</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	msg = i2o_msg_get_wait(c, I2O_TIMEOUT_MESSAGE_GET);</div><div class='head'>diff --git a/drivers/message/i2o/i2o_config.c b/drivers/message/i2o/i2o_config.c<br/>index 4238de98d4a6..a3fabdbe6ca6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/message/i2o/i2o_config.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/message/i2o/i2o_config.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/message/i2o/i2o_config.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/message/i2o/i2o_config.c</a></div><div class='hunk'>@@ -260,7 +260,7 @@ static int i2o_cfg_swdl(unsigned long arg)</div><div class='ctx'> 	if (IS_ERR(msg))</div><div class='ctx'> 		return PTR_ERR(msg);</div><div class='ctx'> </div><div class='del'>-	if (i2o_dma_alloc(&amp;c-&gt;pdev-&gt;dev, &amp;buffer, fragsize, GFP_KERNEL)) {</div><div class='add'>+	if (i2o_dma_alloc(&amp;c-&gt;pdev-&gt;dev, &amp;buffer, fragsize)) {</div><div class='ctx'> 		i2o_msg_nop(c, msg);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -339,7 +339,7 @@ static int i2o_cfg_swul(unsigned long arg)</div><div class='ctx'> 	if (IS_ERR(msg))</div><div class='ctx'> 		return PTR_ERR(msg);</div><div class='ctx'> </div><div class='del'>-	if (i2o_dma_alloc(&amp;c-&gt;pdev-&gt;dev, &amp;buffer, fragsize, GFP_KERNEL)) {</div><div class='add'>+	if (i2o_dma_alloc(&amp;c-&gt;pdev-&gt;dev, &amp;buffer, fragsize)) {</div><div class='ctx'> 		i2o_msg_nop(c, msg);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -634,9 +634,7 @@ static int i2o_cfg_passthru32(struct file *file, unsigned cmnd,</div><div class='ctx'> 			sg_size = sg[i].flag_count &amp; 0xffffff;</div><div class='ctx'> 			p = &amp;(sg_list[sg_index]);</div><div class='ctx'> 			/* Allocate memory for the transfer */</div><div class='del'>-			if (i2o_dma_alloc</div><div class='del'>-			    (&amp;c-&gt;pdev-&gt;dev, p, sg_size,</div><div class='del'>-			     PCI_DMA_BIDIRECTIONAL)) {</div><div class='add'>+			if (i2o_dma_alloc(&amp;c-&gt;pdev-&gt;dev, p, sg_size)) {</div><div class='ctx'> 				printk(KERN_DEBUG</div><div class='ctx'> 				       "%s: Could not allocate SG buffer - size = %d buffer number %d of %d\n",</div><div class='ctx'> 				       c-&gt;name, sg_size, i, sg_count);</div><div class='hunk'>@@ -780,12 +778,11 @@ static int i2o_cfg_passthru(unsigned long arg)</div><div class='ctx'> 	u32 size = 0;</div><div class='ctx'> 	u32 reply_size = 0;</div><div class='ctx'> 	u32 rcode = 0;</div><div class='del'>-	void *sg_list[SG_TABLESIZE];</div><div class='add'>+	struct i2o_dma sg_list[SG_TABLESIZE];</div><div class='ctx'> 	u32 sg_offset = 0;</div><div class='ctx'> 	u32 sg_count = 0;</div><div class='ctx'> 	int sg_index = 0;</div><div class='ctx'> 	u32 i = 0;</div><div class='del'>-	void *p = NULL;</div><div class='ctx'> 	i2o_status_block *sb;</div><div class='ctx'> 	struct i2o_message *msg;</div><div class='ctx'> 	unsigned int iop;</div><div class='hunk'>@@ -842,6 +839,7 @@ static int i2o_cfg_passthru(unsigned long arg)</div><div class='ctx'> 	memset(sg_list, 0, sizeof(sg_list[0]) * SG_TABLESIZE);</div><div class='ctx'> 	if (sg_offset) {</div><div class='ctx'> 		struct sg_simple_element *sg;</div><div class='add'>+		struct i2o_dma *p;</div><div class='ctx'> </div><div class='ctx'> 		if (sg_offset * 4 &gt;= size) {</div><div class='ctx'> 			rcode = -EFAULT;</div><div class='hunk'>@@ -871,22 +869,22 @@ static int i2o_cfg_passthru(unsigned long arg)</div><div class='ctx'> 				goto sg_list_cleanup;</div><div class='ctx'> 			}</div><div class='ctx'> 			sg_size = sg[i].flag_count &amp; 0xffffff;</div><div class='add'>+			p = &amp;(sg_list[sg_index]);</div><div class='add'>+			if (i2o_dma_alloc(&amp;c-&gt;pdev-&gt;dev, p, sg_size)) {</div><div class='ctx'> 			/* Allocate memory for the transfer */</div><div class='del'>-			p = kmalloc(sg_size, GFP_KERNEL);</div><div class='del'>-			if (!p) {</div><div class='ctx'> 				printk(KERN_DEBUG</div><div class='ctx'> 				       "%s: Could not allocate SG buffer - size = %d buffer number %d of %d\n",</div><div class='ctx'> 				       c-&gt;name, sg_size, i, sg_count);</div><div class='ctx'> 				rcode = -ENOMEM;</div><div class='ctx'> 				goto sg_list_cleanup;</div><div class='ctx'> 			}</div><div class='del'>-			sg_list[sg_index++] = p;	// sglist indexed with input frame, not our internal frame.</div><div class='add'>+			sg_index++;</div><div class='ctx'> 			/* Copy in the user's SG buffer if necessary */</div><div class='ctx'> 			if (sg[i].</div><div class='ctx'> 			    flag_count &amp; 0x04000000 /*I2O_SGL_FLAGS_DIR */ ) {</div><div class='ctx'> 				// TODO 64bit fix</div><div class='ctx'> 				if (copy_from_user</div><div class='del'>-				    (p, (void __user *)sg[i].addr_bus,</div><div class='add'>+				    (p-&gt;virt, (void __user *)sg[i].addr_bus,</div><div class='ctx'> 				     sg_size)) {</div><div class='ctx'> 					printk(KERN_DEBUG</div><div class='ctx'> 					       "%s: Could not copy SG buf %d FROM user\n",</div><div class='hunk'>@@ -895,8 +893,7 @@ static int i2o_cfg_passthru(unsigned long arg)</div><div class='ctx'> 					goto sg_list_cleanup;</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='del'>-			//TODO 64bit fix</div><div class='del'>-			sg[i].addr_bus = virt_to_bus(p);</div><div class='add'>+			sg[i].addr_bus = p-&gt;phys;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -908,7 +905,7 @@ static int i2o_cfg_passthru(unsigned long arg)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (sg_offset) {</div><div class='del'>-		u32 rmsg[128];</div><div class='add'>+		u32 rmsg[I2O_OUTBOUND_MSG_FRAME_SIZE];</div><div class='ctx'> 		/* Copy back the Scatter Gather buffers back to user space */</div><div class='ctx'> 		u32 j;</div><div class='ctx'> 		// TODO 64bit fix</div><div class='hunk'>@@ -942,11 +939,11 @@ static int i2o_cfg_passthru(unsigned long arg)</div><div class='ctx'> 				sg_size = sg[j].flag_count &amp; 0xffffff;</div><div class='ctx'> 				// TODO 64bit fix</div><div class='ctx'> 				if (copy_to_user</div><div class='del'>-				    ((void __user *)sg[j].addr_bus, sg_list[j],</div><div class='add'>+				    ((void __user *)sg[j].addr_bus, sg_list[j].virt,</div><div class='ctx'> 				     sg_size)) {</div><div class='ctx'> 					printk(KERN_WARNING</div><div class='ctx'> 					       "%s: Could not copy %p TO user %x\n",</div><div class='del'>-					       c-&gt;name, sg_list[j],</div><div class='add'>+					       c-&gt;name, sg_list[j].virt,</div><div class='ctx'> 					       sg[j].addr_bus);</div><div class='ctx'> 					rcode = -EFAULT;</div><div class='ctx'> 					goto sg_list_cleanup;</div><div class='hunk'>@@ -973,7 +970,7 @@ sg_list_cleanup:</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; sg_index; i++)</div><div class='del'>-		kfree(sg_list[i]);</div><div class='add'>+		i2o_dma_free(&amp;c-&gt;pdev-&gt;dev, &amp;sg_list[i]);</div><div class='ctx'> </div><div class='ctx'> cleanup:</div><div class='ctx'> 	kfree(reply);</div><div class='head'>diff --git a/drivers/message/i2o/iop.c b/drivers/message/i2o/iop.c<br/>index da715e11c1b2..be2b5926d26c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/message/i2o/iop.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/message/i2o/iop.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/message/i2o/iop.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/message/i2o/iop.c</a></div><div class='hunk'>@@ -1004,7 +1004,7 @@ static int i2o_hrt_get(struct i2o_controller *c)</div><div class='ctx'> </div><div class='ctx'> 		size = hrt-&gt;num_entries * hrt-&gt;entry_len &lt;&lt; 2;</div><div class='ctx'> 		if (size &gt; c-&gt;hrt.len) {</div><div class='del'>-			if (i2o_dma_realloc(dev, &amp;c-&gt;hrt, size, GFP_KERNEL))</div><div class='add'>+			if (i2o_dma_realloc(dev, &amp;c-&gt;hrt, size))</div><div class='ctx'> 				return -ENOMEM;</div><div class='ctx'> 			else</div><div class='ctx'> 				hrt = c-&gt;hrt.virt;</div><div class='head'>diff --git a/drivers/message/i2o/memory.c b/drivers/message/i2o/memory.c<br/>new file mode 100644<br/>index 000000000000..f5cc95c564e2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/message/i2o/memory.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/message/i2o/memory.c</a></div><div class='hunk'>@@ -0,0 +1,313 @@</div><div class='add'>+/*</div><div class='add'>+ *	Functions to handle I2O memory</div><div class='add'>+ *</div><div class='add'>+ *	Pulled from the inlines in i2o headers and uninlined</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ *	This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ *	under the terms of the GNU General Public License as published by the</div><div class='add'>+ *	Free Software Foundation; either version 2 of the License, or (at your</div><div class='add'>+ *	option) any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/i2o.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include "core.h"</div><div class='add'>+</div><div class='add'>+/* Protects our 32/64bit mask switching */</div><div class='add'>+static DEFINE_MUTEX(mem_lock);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	i2o_sg_tablesize - Calculate the maximum number of elements in a SGL</div><div class='add'>+ *	@c: I2O controller for which the calculation should be done</div><div class='add'>+ *	@body_size: maximum body size used for message in 32-bit words.</div><div class='add'>+ *</div><div class='add'>+ *	Return the maximum number of SG elements in a SG list.</div><div class='add'>+ */</div><div class='add'>+u16 i2o_sg_tablesize(struct i2o_controller *c, u16 body_size)</div><div class='add'>+{</div><div class='add'>+	i2o_status_block *sb = c-&gt;status_block.virt;</div><div class='add'>+	u16 sg_count =</div><div class='add'>+	    (sb-&gt;inbound_frame_size - sizeof(struct i2o_message) / 4) -</div><div class='add'>+	    body_size;</div><div class='add'>+</div><div class='add'>+	if (c-&gt;pae_support) {</div><div class='add'>+		/*</div><div class='add'>+		 * for 64-bit a SG attribute element must be added and each</div><div class='add'>+		 * SG element needs 12 bytes instead of 8.</div><div class='add'>+		 */</div><div class='add'>+		sg_count -= 2;</div><div class='add'>+		sg_count /= 3;</div><div class='add'>+	} else</div><div class='add'>+		sg_count /= 2;</div><div class='add'>+</div><div class='add'>+	if (c-&gt;short_req &amp;&amp; (sg_count &gt; 8))</div><div class='add'>+		sg_count = 8;</div><div class='add'>+</div><div class='add'>+	return sg_count;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(i2o_sg_tablesize);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	i2o_dma_map_single - Map pointer to controller and fill in I2O message.</div><div class='add'>+ *	@c: I2O controller</div><div class='add'>+ *	@ptr: pointer to the data which should be mapped</div><div class='add'>+ *	@size: size of data in bytes</div><div class='add'>+ *	@direction: DMA_TO_DEVICE / DMA_FROM_DEVICE</div><div class='add'>+ *	@sg_ptr: pointer to the SG list inside the I2O message</div><div class='add'>+ *</div><div class='add'>+ *	This function does all necessary DMA handling and also writes the I2O</div><div class='add'>+ *	SGL elements into the I2O message. For details on DMA handling see also</div><div class='add'>+ *	dma_map_single(). The pointer sg_ptr will only be set to the end of the</div><div class='add'>+ *	SG list if the allocation was successful.</div><div class='add'>+ *</div><div class='add'>+ *	Returns DMA address which must be checked for failures using</div><div class='add'>+ *	dma_mapping_error().</div><div class='add'>+ */</div><div class='add'>+dma_addr_t i2o_dma_map_single(struct i2o_controller *c, void *ptr,</div><div class='add'>+					    size_t size,</div><div class='add'>+					    enum dma_data_direction direction,</div><div class='add'>+					    u32 ** sg_ptr)</div><div class='add'>+{</div><div class='add'>+	u32 sg_flags;</div><div class='add'>+	u32 *mptr = *sg_ptr;</div><div class='add'>+	dma_addr_t dma_addr;</div><div class='add'>+</div><div class='add'>+	switch (direction) {</div><div class='add'>+	case DMA_TO_DEVICE:</div><div class='add'>+		sg_flags = 0xd4000000;</div><div class='add'>+		break;</div><div class='add'>+	case DMA_FROM_DEVICE:</div><div class='add'>+		sg_flags = 0xd0000000;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dma_addr = dma_map_single(&amp;c-&gt;pdev-&gt;dev, ptr, size, direction);</div><div class='add'>+	if (!dma_mapping_error(&amp;c-&gt;pdev-&gt;dev, dma_addr)) {</div><div class='add'>+#ifdef CONFIG_I2O_EXT_ADAPTEC_DMA64</div><div class='add'>+		if ((sizeof(dma_addr_t) &gt; 4) &amp;&amp; c-&gt;pae_support) {</div><div class='add'>+			*mptr++ = cpu_to_le32(0x7C020002);</div><div class='add'>+			*mptr++ = cpu_to_le32(PAGE_SIZE);</div><div class='add'>+		}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+		*mptr++ = cpu_to_le32(sg_flags | size);</div><div class='add'>+		*mptr++ = cpu_to_le32(i2o_dma_low(dma_addr));</div><div class='add'>+#ifdef CONFIG_I2O_EXT_ADAPTEC_DMA64</div><div class='add'>+		if ((sizeof(dma_addr_t) &gt; 4) &amp;&amp; c-&gt;pae_support)</div><div class='add'>+			*mptr++ = cpu_to_le32(i2o_dma_high(dma_addr));</div><div class='add'>+#endif</div><div class='add'>+		*sg_ptr = mptr;</div><div class='add'>+	}</div><div class='add'>+	return dma_addr;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(i2o_dma_map_single);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	i2o_dma_map_sg - Map a SG List to controller and fill in I2O message.</div><div class='add'>+ *	@c: I2O controller</div><div class='add'>+ *	@sg: SG list to be mapped</div><div class='add'>+ *	@sg_count: number of elements in the SG list</div><div class='add'>+ *	@direction: DMA_TO_DEVICE / DMA_FROM_DEVICE</div><div class='add'>+ *	@sg_ptr: pointer to the SG list inside the I2O message</div><div class='add'>+ *</div><div class='add'>+ *	This function does all necessary DMA handling and also writes the I2O</div><div class='add'>+ *	SGL elements into the I2O message. For details on DMA handling see also</div><div class='add'>+ *	dma_map_sg(). The pointer sg_ptr will only be set to the end of the SG</div><div class='add'>+ *	list if the allocation was successful.</div><div class='add'>+ *</div><div class='add'>+ *	Returns 0 on failure or 1 on success.</div><div class='add'>+ */</div><div class='add'>+int i2o_dma_map_sg(struct i2o_controller *c, struct scatterlist *sg,</div><div class='add'>+	    int sg_count, enum dma_data_direction direction, u32 ** sg_ptr)</div><div class='add'>+{</div><div class='add'>+	u32 sg_flags;</div><div class='add'>+	u32 *mptr = *sg_ptr;</div><div class='add'>+</div><div class='add'>+	switch (direction) {</div><div class='add'>+	case DMA_TO_DEVICE:</div><div class='add'>+		sg_flags = 0x14000000;</div><div class='add'>+		break;</div><div class='add'>+	case DMA_FROM_DEVICE:</div><div class='add'>+		sg_flags = 0x10000000;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sg_count = dma_map_sg(&amp;c-&gt;pdev-&gt;dev, sg, sg_count, direction);</div><div class='add'>+	if (!sg_count)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_I2O_EXT_ADAPTEC_DMA64</div><div class='add'>+	if ((sizeof(dma_addr_t) &gt; 4) &amp;&amp; c-&gt;pae_support) {</div><div class='add'>+		*mptr++ = cpu_to_le32(0x7C020002);</div><div class='add'>+		*mptr++ = cpu_to_le32(PAGE_SIZE);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	while (sg_count-- &gt; 0) {</div><div class='add'>+		if (!sg_count)</div><div class='add'>+			sg_flags |= 0xC0000000;</div><div class='add'>+		*mptr++ = cpu_to_le32(sg_flags | sg_dma_len(sg));</div><div class='add'>+		*mptr++ = cpu_to_le32(i2o_dma_low(sg_dma_address(sg)));</div><div class='add'>+#ifdef CONFIG_I2O_EXT_ADAPTEC_DMA64</div><div class='add'>+		if ((sizeof(dma_addr_t) &gt; 4) &amp;&amp; c-&gt;pae_support)</div><div class='add'>+			*mptr++ = cpu_to_le32(i2o_dma_high(sg_dma_address(sg)));</div><div class='add'>+#endif</div><div class='add'>+		sg = sg_next(sg);</div><div class='add'>+	}</div><div class='add'>+	*sg_ptr = mptr;</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(i2o_dma_map_sg);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	i2o_dma_alloc - Allocate DMA memory</div><div class='add'>+ *	@dev: struct device pointer to the PCI device of the I2O controller</div><div class='add'>+ *	@addr: i2o_dma struct which should get the DMA buffer</div><div class='add'>+ *	@len: length of the new DMA memory</div><div class='add'>+ *</div><div class='add'>+ *	Allocate a coherent DMA memory and write the pointers into addr.</div><div class='add'>+ *</div><div class='add'>+ *	Returns 0 on success or -ENOMEM on failure.</div><div class='add'>+ */</div><div class='add'>+int i2o_dma_alloc(struct device *dev, struct i2o_dma *addr, size_t len)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pdev = to_pci_dev(dev);</div><div class='add'>+	int dma_64 = 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;mem_lock);</div><div class='add'>+	if ((sizeof(dma_addr_t) &gt; 4) &amp;&amp; (pdev-&gt;dma_mask == DMA_64BIT_MASK)) {</div><div class='add'>+		dma_64 = 1;</div><div class='add'>+		if (pci_set_dma_mask(pdev, DMA_32BIT_MASK)) {</div><div class='add'>+			mutex_unlock(&amp;mem_lock);</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	addr-&gt;virt = dma_alloc_coherent(dev, len, &amp;addr-&gt;phys, GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if ((sizeof(dma_addr_t) &gt; 4) &amp;&amp; dma_64)</div><div class='add'>+		if (pci_set_dma_mask(pdev, DMA_64BIT_MASK))</div><div class='add'>+			printk(KERN_WARNING "i2o: unable to set 64-bit DMA");</div><div class='add'>+	mutex_unlock(&amp;mem_lock);</div><div class='add'>+</div><div class='add'>+	if (!addr-&gt;virt)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	memset(addr-&gt;virt, 0, len);</div><div class='add'>+	addr-&gt;len = len;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(i2o_dma_alloc);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	i2o_dma_free - Free DMA memory</div><div class='add'>+ *	@dev: struct device pointer to the PCI device of the I2O controller</div><div class='add'>+ *	@addr: i2o_dma struct which contains the DMA buffer</div><div class='add'>+ *</div><div class='add'>+ *	Free a coherent DMA memory and set virtual address of addr to NULL.</div><div class='add'>+ */</div><div class='add'>+void i2o_dma_free(struct device *dev, struct i2o_dma *addr)</div><div class='add'>+{</div><div class='add'>+	if (addr-&gt;virt) {</div><div class='add'>+		if (addr-&gt;phys)</div><div class='add'>+			dma_free_coherent(dev, addr-&gt;len, addr-&gt;virt,</div><div class='add'>+					  addr-&gt;phys);</div><div class='add'>+		else</div><div class='add'>+			kfree(addr-&gt;virt);</div><div class='add'>+		addr-&gt;virt = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(i2o_dma_free);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	i2o_dma_realloc - Realloc DMA memory</div><div class='add'>+ *	@dev: struct device pointer to the PCI device of the I2O controller</div><div class='add'>+ *	@addr: pointer to a i2o_dma struct DMA buffer</div><div class='add'>+ *	@len: new length of memory</div><div class='add'>+ *</div><div class='add'>+ *	If there was something allocated in the addr, free it first. If len &gt; 0</div><div class='add'>+ *	than try to allocate it and write the addresses back to the addr</div><div class='add'>+ *	structure. If len == 0 set the virtual address to NULL.</div><div class='add'>+ *</div><div class='add'>+ *	Returns the 0 on success or negative error code on failure.</div><div class='add'>+ */</div><div class='add'>+int i2o_dma_realloc(struct device *dev, struct i2o_dma *addr, size_t len)</div><div class='add'>+{</div><div class='add'>+	i2o_dma_free(dev, addr);</div><div class='add'>+</div><div class='add'>+	if (len)</div><div class='add'>+		return i2o_dma_alloc(dev, addr, len);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(i2o_dma_realloc);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *	i2o_pool_alloc - Allocate an slab cache and mempool</div><div class='add'>+ *	@mempool: pointer to struct i2o_pool to write data into.</div><div class='add'>+ *	@name: name which is used to identify cache</div><div class='add'>+ *	@size: size of each object</div><div class='add'>+ *	@min_nr: minimum number of objects</div><div class='add'>+ *</div><div class='add'>+ *	First allocates a slab cache with name and size. Then allocates a</div><div class='add'>+ *	mempool which uses the slab cache for allocation and freeing.</div><div class='add'>+ *</div><div class='add'>+ *	Returns 0 on success or negative error code on failure.</div><div class='add'>+ */</div><div class='add'>+int i2o_pool_alloc(struct i2o_pool *pool, const char *name,</div><div class='add'>+				 size_t size, int min_nr)</div><div class='add'>+{</div><div class='add'>+	pool-&gt;name = kmalloc(strlen(name) + 1, GFP_KERNEL);</div><div class='add'>+	if (!pool-&gt;name)</div><div class='add'>+		goto exit;</div><div class='add'>+	strcpy(pool-&gt;name, name);</div><div class='add'>+</div><div class='add'>+	pool-&gt;slab =</div><div class='add'>+	    kmem_cache_create(pool-&gt;name, size, 0, SLAB_HWCACHE_ALIGN, NULL);</div><div class='add'>+	if (!pool-&gt;slab)</div><div class='add'>+		goto free_name;</div><div class='add'>+</div><div class='add'>+	pool-&gt;mempool = mempool_create_slab_pool(min_nr, pool-&gt;slab);</div><div class='add'>+	if (!pool-&gt;mempool)</div><div class='add'>+		goto free_slab;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+free_slab:</div><div class='add'>+	kmem_cache_destroy(pool-&gt;slab);</div><div class='add'>+</div><div class='add'>+free_name:</div><div class='add'>+	kfree(pool-&gt;name);</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	return -ENOMEM;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(i2o_pool_alloc);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *	i2o_pool_free - Free slab cache and mempool again</div><div class='add'>+ *	@mempool: pointer to struct i2o_pool which should be freed</div><div class='add'>+ *</div><div class='add'>+ *	Note that you have to return all objects to the mempool again before</div><div class='add'>+ *	calling i2o_pool_free().</div><div class='add'>+ */</div><div class='add'>+void i2o_pool_free(struct i2o_pool *pool)</div><div class='add'>+{</div><div class='add'>+	mempool_destroy(pool-&gt;mempool);</div><div class='add'>+	kmem_cache_destroy(pool-&gt;slab);</div><div class='add'>+	kfree(pool-&gt;name);</div><div class='add'>+};</div><div class='add'>+EXPORT_SYMBOL_GPL(i2o_pool_free);</div><div class='head'>diff --git a/drivers/message/i2o/pci.c b/drivers/message/i2o/pci.c<br/>index 685a89547a51..610ef1204e68 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/message/i2o/pci.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/message/i2o/pci.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/message/i2o/pci.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/message/i2o/pci.c</a></div><div class='hunk'>@@ -186,31 +186,29 @@ static int __devinit i2o_pci_alloc(struct i2o_controller *c)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (i2o_dma_alloc(dev, &amp;c-&gt;status, 8, GFP_KERNEL)) {</div><div class='add'>+	if (i2o_dma_alloc(dev, &amp;c-&gt;status, 8)) {</div><div class='ctx'> 		i2o_pci_free(c);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (i2o_dma_alloc(dev, &amp;c-&gt;hrt, sizeof(i2o_hrt), GFP_KERNEL)) {</div><div class='add'>+	if (i2o_dma_alloc(dev, &amp;c-&gt;hrt, sizeof(i2o_hrt))) {</div><div class='ctx'> 		i2o_pci_free(c);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (i2o_dma_alloc(dev, &amp;c-&gt;dlct, 8192, GFP_KERNEL)) {</div><div class='add'>+	if (i2o_dma_alloc(dev, &amp;c-&gt;dlct, 8192)) {</div><div class='ctx'> 		i2o_pci_free(c);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (i2o_dma_alloc(dev, &amp;c-&gt;status_block, sizeof(i2o_status_block),</div><div class='del'>-			  GFP_KERNEL)) {</div><div class='add'>+	if (i2o_dma_alloc(dev, &amp;c-&gt;status_block, sizeof(i2o_status_block))) {</div><div class='ctx'> 		i2o_pci_free(c);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (i2o_dma_alloc</div><div class='del'>-	    (dev, &amp;c-&gt;out_queue,</div><div class='del'>-	     I2O_MAX_OUTBOUND_MSG_FRAMES * I2O_OUTBOUND_MSG_FRAME_SIZE *</div><div class='del'>-	     sizeof(u32), GFP_KERNEL)) {</div><div class='add'>+	if (i2o_dma_alloc(dev, &amp;c-&gt;out_queue,</div><div class='add'>+		I2O_MAX_OUTBOUND_MSG_FRAMES * I2O_OUTBOUND_MSG_FRAME_SIZE *</div><div class='add'>+				sizeof(u32))) {</div><div class='ctx'> 		i2o_pci_free(c);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig<br/>index 68dc8d9eb24e..5eff8ad834d6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/mfd/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/mfd/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/mfd/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/mfd/Kconfig</a></div><div class='hunk'>@@ -50,6 +50,15 @@ config HTC_PASIC3</div><div class='ctx'> 	  HTC Magician devices, respectively. Actual functionality is</div><div class='ctx'> 	  handled by the leds-pasic3 and ds1wm drivers.</div><div class='ctx'> </div><div class='add'>+config UCB1400_CORE</div><div class='add'>+	tristate "Philips UCB1400 Core driver"</div><div class='add'>+	help</div><div class='add'>+	  This enables support for the Philips UCB1400 core functions.</div><div class='add'>+	  The UCB1400 is an AC97 audio codec.</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here: the</div><div class='add'>+	  module will be called ucb1400_core.</div><div class='add'>+</div><div class='ctx'> config MFD_TMIO</div><div class='ctx'> 	bool</div><div class='ctx'> 	default n</div><div class='hunk'>@@ -78,6 +87,44 @@ config MFD_TC6393XB</div><div class='ctx'> 	help</div><div class='ctx'> 	  Support for Toshiba Mobile IO Controller TC6393XB</div><div class='ctx'> </div><div class='add'>+config MFD_WM8400</div><div class='add'>+	tristate "Support Wolfson Microelectronics WM8400"</div><div class='add'>+	help</div><div class='add'>+	  Support for the Wolfson Microelecronics WM8400 PMIC and audio</div><div class='add'>+	  CODEC.  This driver adds provides common support for accessing</div><div class='add'>+	  the device, additional drivers must be enabled in order to use</div><div class='add'>+	  the functionality of the device.</div><div class='add'>+</div><div class='add'>+config MFD_WM8350</div><div class='add'>+	tristate</div><div class='add'>+</div><div class='add'>+config MFD_WM8350_CONFIG_MODE_0</div><div class='add'>+	bool</div><div class='add'>+	depends on MFD_WM8350</div><div class='add'>+</div><div class='add'>+config MFD_WM8350_CONFIG_MODE_1</div><div class='add'>+	bool</div><div class='add'>+	depends on MFD_WM8350</div><div class='add'>+</div><div class='add'>+config MFD_WM8350_CONFIG_MODE_2</div><div class='add'>+	bool</div><div class='add'>+	depends on MFD_WM8350</div><div class='add'>+</div><div class='add'>+config MFD_WM8350_CONFIG_MODE_3</div><div class='add'>+	bool</div><div class='add'>+	depends on MFD_WM8350</div><div class='add'>+</div><div class='add'>+config MFD_WM8350_I2C</div><div class='add'>+	tristate "Support Wolfson Microelectronics WM8350 with I2C"</div><div class='add'>+	select MFD_WM8350</div><div class='add'>+	depends on I2C</div><div class='add'>+	help</div><div class='add'>+	  The WM8350 is an integrated audio and power management</div><div class='add'>+	  subsystem with watchdog and RTC functionality for embedded</div><div class='add'>+	  systems.  This option enables core support for the WM8350 with</div><div class='add'>+	  I2C as the control interface.  Additional options must be</div><div class='add'>+	  selected to enable support for the functionality of the chip.</div><div class='add'>+</div><div class='ctx'> endmenu</div><div class='ctx'> </div><div class='ctx'> menu "Multimedia Capabilities Port drivers"</div><div class='head'>diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile<br/>index 03ad239ecef0..759b1fe1c891 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/mfd/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/mfd/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/mfd/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/mfd/Makefile</a></div><div class='hunk'>@@ -12,6 +12,11 @@ obj-$(CONFIG_MFD_T7L66XB)	+= t7l66xb.o</div><div class='ctx'> obj-$(CONFIG_MFD_TC6387XB)	+= tc6387xb.o</div><div class='ctx'> obj-$(CONFIG_MFD_TC6393XB)	+= tc6393xb.o</div><div class='ctx'> </div><div class='add'>+obj-$(CONFIG_MFD_WM8400)	+= wm8400-core.o</div><div class='add'>+wm8350-objs			:= wm8350-core.o wm8350-regmap.o wm8350-gpio.o</div><div class='add'>+obj-$(CONFIG_MFD_WM8350)	+= wm8350.o</div><div class='add'>+obj-$(CONFIG_MFD_WM8350_I2C)	+= wm8350-i2c.o</div><div class='add'>+</div><div class='ctx'> obj-$(CONFIG_MFD_CORE)		+= mfd-core.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_MCP)		+= mcp-core.o</div><div class='hunk'>@@ -22,3 +27,4 @@ obj-$(CONFIG_MCP_UCB1200_TS)	+= ucb1x00-ts.o</div><div class='ctx'> ifeq ($(CONFIG_SA1100_ASSABET),y)</div><div class='ctx'> obj-$(CONFIG_MCP_UCB1200)	+= ucb1x00-assabet.o</div><div class='ctx'> endif</div><div class='add'>+obj-$(CONFIG_UCB1400_CORE)	+= ucb1400_core.o</div><div class='head'>diff --git a/drivers/mfd/ucb1400_core.c b/drivers/mfd/ucb1400_core.c<br/>new file mode 100644<br/>index 000000000000..178159e264ce<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/mfd/ucb1400_core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/mfd/ucb1400_core.c</a></div><div class='hunk'>@@ -0,0 +1,106 @@</div><div class='add'>+/*</div><div class='add'>+ * Core functions for:</div><div class='add'>+ *  Philips UCB1400 multifunction chip</div><div class='add'>+ *</div><div class='add'>+ * Based on ucb1400_ts.c:</div><div class='add'>+ *  Author:	Nicolas Pitre</div><div class='add'>+ *  Created:	September 25, 2006</div><div class='add'>+ *  Copyright:	MontaVista Software, Inc.</div><div class='add'>+ *</div><div class='add'>+ * Spliting done by: Marek Vasut &lt;marek.vasut@gmail.com&gt;</div><div class='add'>+ * If something doesnt work and it worked before spliting, e-mail me,</div><div class='add'>+ * dont bother Nicolas please ;-)</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This code is heavily based on ucb1x00-*.c copyrighted by Russell King</div><div class='add'>+ * covering the UCB1100, UCB1200 and UCB1300..  Support for the UCB1400 has</div><div class='add'>+ * been made separate from ucb1x00-core/ucb1x00-ts on Russell's request.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/ucb1400.h&gt;</div><div class='add'>+</div><div class='add'>+static int ucb1400_core_probe(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	struct ucb1400 *ucb;</div><div class='add'>+	struct ucb1400_ts ucb_ts;</div><div class='add'>+	struct snd_ac97 *ac97;</div><div class='add'>+</div><div class='add'>+	memset(&amp;ucb_ts, 0, sizeof(ucb_ts));</div><div class='add'>+</div><div class='add'>+	ucb = kzalloc(sizeof(struct ucb1400), GFP_KERNEL);</div><div class='add'>+	if (!ucb) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(dev, ucb);</div><div class='add'>+</div><div class='add'>+	ac97 = to_ac97_t(dev);</div><div class='add'>+</div><div class='add'>+	ucb_ts.id = ucb1400_reg_read(ac97, UCB_ID);</div><div class='add'>+	if (ucb_ts.id != UCB_ID_1400) {</div><div class='add'>+		err = -ENODEV;</div><div class='add'>+		goto err0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* TOUCHSCREEN */</div><div class='add'>+	ucb_ts.ac97 = ac97;</div><div class='add'>+	ucb-&gt;ucb1400_ts = platform_device_alloc("ucb1400_ts", -1);</div><div class='add'>+	if (!ucb-&gt;ucb1400_ts) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto err0;</div><div class='add'>+	}</div><div class='add'>+	err = platform_device_add_data(ucb-&gt;ucb1400_ts, &amp;ucb_ts,</div><div class='add'>+					sizeof(ucb_ts));</div><div class='add'>+	if (err)</div><div class='add'>+		goto err1;</div><div class='add'>+	err = platform_device_add(ucb-&gt;ucb1400_ts);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err1:</div><div class='add'>+	platform_device_put(ucb-&gt;ucb1400_ts);</div><div class='add'>+err0:</div><div class='add'>+	kfree(ucb);</div><div class='add'>+err:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ucb1400_core_remove(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct ucb1400 *ucb = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	platform_device_unregister(ucb-&gt;ucb1400_ts);</div><div class='add'>+	kfree(ucb);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct device_driver ucb1400_core_driver = {</div><div class='add'>+	.name	= "ucb1400_core",</div><div class='add'>+	.bus	= &amp;ac97_bus_type,</div><div class='add'>+	.probe	= ucb1400_core_probe,</div><div class='add'>+	.remove	= ucb1400_core_remove,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init ucb1400_core_init(void)</div><div class='add'>+{</div><div class='add'>+	return driver_register(&amp;ucb1400_core_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit ucb1400_core_exit(void)</div><div class='add'>+{</div><div class='add'>+	driver_unregister(&amp;ucb1400_core_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(ucb1400_core_init);</div><div class='add'>+module_exit(ucb1400_core_exit);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("Philips UCB1400 driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/mfd/wm8350-core.c b/drivers/mfd/wm8350-core.c<br/>new file mode 100644<br/>index 000000000000..25a7a5d08bce<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/mfd/wm8350-core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/mfd/wm8350-core.c</a></div><div class='hunk'>@@ -0,0 +1,1273 @@</div><div class='add'>+/*</div><div class='add'>+ * wm8350-core.c  --  Device access for Wolfson WM8350</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2007, 2008 Wolfson Microelectronics PLC.</div><div class='add'>+ *</div><div class='add'>+ * Author: Liam Girdwood, Mark Brown</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute  it and/or modify it</div><div class='add'>+ *  under  the terms of  the GNU General  Public License as published by the</div><div class='add'>+ *  Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='add'>+ *  option) any later version.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/bug.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/workqueue.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/mfd/wm8350/core.h&gt;</div><div class='add'>+#include &lt;linux/mfd/wm8350/audio.h&gt;</div><div class='add'>+#include &lt;linux/mfd/wm8350/comparator.h&gt;</div><div class='add'>+#include &lt;linux/mfd/wm8350/gpio.h&gt;</div><div class='add'>+#include &lt;linux/mfd/wm8350/pmic.h&gt;</div><div class='add'>+#include &lt;linux/mfd/wm8350/rtc.h&gt;</div><div class='add'>+#include &lt;linux/mfd/wm8350/supply.h&gt;</div><div class='add'>+#include &lt;linux/mfd/wm8350/wdt.h&gt;</div><div class='add'>+</div><div class='add'>+#define WM8350_UNLOCK_KEY		0x0013</div><div class='add'>+#define WM8350_LOCK_KEY			0x0000</div><div class='add'>+</div><div class='add'>+#define WM8350_CLOCK_CONTROL_1		0x28</div><div class='add'>+#define WM8350_AIF_TEST			0x74</div><div class='add'>+</div><div class='add'>+/* debug */</div><div class='add'>+#define WM8350_BUS_DEBUG 0</div><div class='add'>+#if WM8350_BUS_DEBUG</div><div class='add'>+#define dump(regs, src) do { \</div><div class='add'>+	int i_; \</div><div class='add'>+	u16 *src_ = src; \</div><div class='add'>+	printk(KERN_DEBUG); \</div><div class='add'>+	for (i_ = 0; i_ &lt; regs; i_++) \</div><div class='add'>+		printk(" 0x%4.4x", *src_++); \</div><div class='add'>+	printk("\n"); \</div><div class='add'>+} while (0);</div><div class='add'>+#else</div><div class='add'>+#define dump(bytes, src)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define WM8350_LOCK_DEBUG 0</div><div class='add'>+#if WM8350_LOCK_DEBUG</div><div class='add'>+#define ldbg(format, arg...) printk(format, ## arg)</div><div class='add'>+#else</div><div class='add'>+#define ldbg(format, arg...)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * WM8350 Device IO</div><div class='add'>+ */</div><div class='add'>+static DEFINE_MUTEX(io_mutex);</div><div class='add'>+static DEFINE_MUTEX(reg_lock_mutex);</div><div class='add'>+static DEFINE_MUTEX(auxadc_mutex);</div><div class='add'>+</div><div class='add'>+/* Perform a physical read from the device.</div><div class='add'>+ */</div><div class='add'>+static int wm8350_phys_read(struct wm8350 *wm8350, u8 reg, int num_regs,</div><div class='add'>+			    u16 *dest)</div><div class='add'>+{</div><div class='add'>+	int i, ret;</div><div class='add'>+	int bytes = num_regs * 2;</div><div class='add'>+</div><div class='add'>+	dev_dbg(wm8350-&gt;dev, "volatile read\n");</div><div class='add'>+	ret = wm8350-&gt;read_dev(wm8350, reg, bytes, (char *)dest);</div><div class='add'>+</div><div class='add'>+	for (i = reg; i &lt; reg + num_regs; i++) {</div><div class='add'>+		/* Cache is CPU endian */</div><div class='add'>+		dest[i - reg] = be16_to_cpu(dest[i - reg]);</div><div class='add'>+</div><div class='add'>+		/* Satisfy non-volatile bits from cache */</div><div class='add'>+		dest[i - reg] &amp;= wm8350_reg_io_map[i].vol;</div><div class='add'>+		dest[i - reg] |= wm8350-&gt;reg_cache[i];</div><div class='add'>+</div><div class='add'>+		/* Mask out non-readable bits */</div><div class='add'>+		dest[i - reg] &amp;= wm8350_reg_io_map[i].readable;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dump(num_regs, dest);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wm8350_read(struct wm8350 *wm8350, u8 reg, int num_regs, u16 *dest)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	int end = reg + num_regs;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	int bytes = num_regs * 2;</div><div class='add'>+</div><div class='add'>+	if (wm8350-&gt;read_dev == NULL)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	if ((reg + num_regs - 1) &gt; WM8350_MAX_REGISTER) {</div><div class='add'>+		dev_err(wm8350-&gt;dev, "invalid reg %x\n",</div><div class='add'>+			reg + num_regs - 1);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_dbg(wm8350-&gt;dev,</div><div class='add'>+		"%s R%d(0x%2.2x) %d regs\n", __func__, reg, reg, num_regs);</div><div class='add'>+</div><div class='add'>+#if WM8350_BUS_DEBUG</div><div class='add'>+	/* we can _safely_ read any register, but warn if read not supported */</div><div class='add'>+	for (i = reg; i &lt; end; i++) {</div><div class='add'>+		if (!wm8350_reg_io_map[i].readable)</div><div class='add'>+			dev_warn(wm8350-&gt;dev,</div><div class='add'>+				"reg R%d is not readable\n", i);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* if any volatile registers are required, then read back all */</div><div class='add'>+	for (i = reg; i &lt; end; i++)</div><div class='add'>+		if (wm8350_reg_io_map[i].vol)</div><div class='add'>+			return wm8350_phys_read(wm8350, reg, num_regs, dest);</div><div class='add'>+</div><div class='add'>+	/* no volatiles, then cache is good */</div><div class='add'>+	dev_dbg(wm8350-&gt;dev, "cache read\n");</div><div class='add'>+	memcpy(dest, &amp;wm8350-&gt;reg_cache[reg], bytes);</div><div class='add'>+	dump(num_regs, dest);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int is_reg_locked(struct wm8350 *wm8350, u8 reg)</div><div class='add'>+{</div><div class='add'>+	if (reg == WM8350_SECURITY ||</div><div class='add'>+	    wm8350-&gt;reg_cache[WM8350_SECURITY] == WM8350_UNLOCK_KEY)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if ((reg == WM8350_GPIO_CONFIGURATION_I_O) ||</div><div class='add'>+	    (reg &gt;= WM8350_GPIO_FUNCTION_SELECT_1 &amp;&amp;</div><div class='add'>+	     reg &lt;= WM8350_GPIO_FUNCTION_SELECT_4) ||</div><div class='add'>+	    (reg &gt;= WM8350_BATTERY_CHARGER_CONTROL_1 &amp;&amp;</div><div class='add'>+	     reg &lt;= WM8350_BATTERY_CHARGER_CONTROL_3))</div><div class='add'>+		return 1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wm8350_write(struct wm8350 *wm8350, u8 reg, int num_regs, u16 *src)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	int end = reg + num_regs;</div><div class='add'>+	int bytes = num_regs * 2;</div><div class='add'>+</div><div class='add'>+	if (wm8350-&gt;write_dev == NULL)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	if ((reg + num_regs - 1) &gt; WM8350_MAX_REGISTER) {</div><div class='add'>+		dev_err(wm8350-&gt;dev, "invalid reg %x\n",</div><div class='add'>+			reg + num_regs - 1);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* it's generally not a good idea to write to RO or locked registers */</div><div class='add'>+	for (i = reg; i &lt; end; i++) {</div><div class='add'>+		if (!wm8350_reg_io_map[i].writable) {</div><div class='add'>+			dev_err(wm8350-&gt;dev,</div><div class='add'>+				"attempted write to read only reg R%d\n", i);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (is_reg_locked(wm8350, i)) {</div><div class='add'>+			dev_err(wm8350-&gt;dev,</div><div class='add'>+			       "attempted write to locked reg R%d\n", i);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		src[i - reg] &amp;= wm8350_reg_io_map[i].writable;</div><div class='add'>+</div><div class='add'>+		wm8350-&gt;reg_cache[i] =</div><div class='add'>+			(wm8350-&gt;reg_cache[i] &amp; ~wm8350_reg_io_map[i].writable)</div><div class='add'>+			| src[i - reg];</div><div class='add'>+</div><div class='add'>+		src[i - reg] = cpu_to_be16(src[i - reg]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Actually write it out */</div><div class='add'>+	return wm8350-&gt;write_dev(wm8350, reg, bytes, (char *)src);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Safe read, modify, write methods</div><div class='add'>+ */</div><div class='add'>+int wm8350_clear_bits(struct wm8350 *wm8350, u16 reg, u16 mask)</div><div class='add'>+{</div><div class='add'>+	u16 data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;io_mutex);</div><div class='add'>+	err = wm8350_read(wm8350, reg, 1, &amp;data);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(wm8350-&gt;dev, "read from reg R%d failed\n", reg);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	data &amp;= ~mask;</div><div class='add'>+	err = wm8350_write(wm8350, reg, 1, &amp;data);</div><div class='add'>+	if (err)</div><div class='add'>+		dev_err(wm8350-&gt;dev, "write to reg R%d failed\n", reg);</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;io_mutex);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(wm8350_clear_bits);</div><div class='add'>+</div><div class='add'>+int wm8350_set_bits(struct wm8350 *wm8350, u16 reg, u16 mask)</div><div class='add'>+{</div><div class='add'>+	u16 data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;io_mutex);</div><div class='add'>+	err = wm8350_read(wm8350, reg, 1, &amp;data);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(wm8350-&gt;dev, "read from reg R%d failed\n", reg);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	data |= mask;</div><div class='add'>+	err = wm8350_write(wm8350, reg, 1, &amp;data);</div><div class='add'>+	if (err)</div><div class='add'>+		dev_err(wm8350-&gt;dev, "write to reg R%d failed\n", reg);</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;io_mutex);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(wm8350_set_bits);</div><div class='add'>+</div><div class='add'>+u16 wm8350_reg_read(struct wm8350 *wm8350, int reg)</div><div class='add'>+{</div><div class='add'>+	u16 data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;io_mutex);</div><div class='add'>+	err = wm8350_read(wm8350, reg, 1, &amp;data);</div><div class='add'>+	if (err)</div><div class='add'>+		dev_err(wm8350-&gt;dev, "read from reg R%d failed\n", reg);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;io_mutex);</div><div class='add'>+	return data;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(wm8350_reg_read);</div><div class='add'>+</div><div class='add'>+int wm8350_reg_write(struct wm8350 *wm8350, int reg, u16 val)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u16 data = val;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;io_mutex);</div><div class='add'>+	ret = wm8350_write(wm8350, reg, 1, &amp;data);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_err(wm8350-&gt;dev, "write to reg R%d failed\n", reg);</div><div class='add'>+	mutex_unlock(&amp;io_mutex);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(wm8350_reg_write);</div><div class='add'>+</div><div class='add'>+int wm8350_block_read(struct wm8350 *wm8350, int start_reg, int regs,</div><div class='add'>+		      u16 *dest)</div><div class='add'>+{</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;io_mutex);</div><div class='add'>+	err = wm8350_read(wm8350, start_reg, regs, dest);</div><div class='add'>+	if (err)</div><div class='add'>+		dev_err(wm8350-&gt;dev, "block read starting from R%d failed\n",</div><div class='add'>+			start_reg);</div><div class='add'>+	mutex_unlock(&amp;io_mutex);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(wm8350_block_read);</div><div class='add'>+</div><div class='add'>+int wm8350_block_write(struct wm8350 *wm8350, int start_reg, int regs,</div><div class='add'>+		       u16 *src)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;io_mutex);</div><div class='add'>+	ret = wm8350_write(wm8350, start_reg, regs, src);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_err(wm8350-&gt;dev, "block write starting at R%d failed\n",</div><div class='add'>+			start_reg);</div><div class='add'>+	mutex_unlock(&amp;io_mutex);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(wm8350_block_write);</div><div class='add'>+</div><div class='add'>+int wm8350_reg_lock(struct wm8350 *wm8350)</div><div class='add'>+{</div><div class='add'>+	u16 key = WM8350_LOCK_KEY;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ldbg(__func__);</div><div class='add'>+	mutex_lock(&amp;io_mutex);</div><div class='add'>+	ret = wm8350_write(wm8350, WM8350_SECURITY, 1, &amp;key);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_err(wm8350-&gt;dev, "lock failed\n");</div><div class='add'>+	mutex_unlock(&amp;io_mutex);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(wm8350_reg_lock);</div><div class='add'>+</div><div class='add'>+int wm8350_reg_unlock(struct wm8350 *wm8350)</div><div class='add'>+{</div><div class='add'>+	u16 key = WM8350_UNLOCK_KEY;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ldbg(__func__);</div><div class='add'>+	mutex_lock(&amp;io_mutex);</div><div class='add'>+	ret = wm8350_write(wm8350, WM8350_SECURITY, 1, &amp;key);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_err(wm8350-&gt;dev, "unlock failed\n");</div><div class='add'>+	mutex_unlock(&amp;io_mutex);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(wm8350_reg_unlock);</div><div class='add'>+</div><div class='add'>+static void wm8350_irq_call_handler(struct wm8350 *wm8350, int irq)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;wm8350-&gt;irq_mutex);</div><div class='add'>+</div><div class='add'>+	if (wm8350-&gt;irq[irq].handler)</div><div class='add'>+		wm8350-&gt;irq[irq].handler(wm8350, irq, wm8350-&gt;irq[irq].data);</div><div class='add'>+	else {</div><div class='add'>+		dev_err(wm8350-&gt;dev, "irq %d nobody cared. now masked.\n",</div><div class='add'>+			irq);</div><div class='add'>+		wm8350_mask_irq(wm8350, irq);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;wm8350-&gt;irq_mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * wm8350_irq_worker actually handles the interrupts.  Since all</div><div class='add'>+ * interrupts are clear on read the IRQ line will be reasserted and</div><div class='add'>+ * the physical IRQ will be handled again if another interrupt is</div><div class='add'>+ * asserted while we run - in the normal course of events this is a</div><div class='add'>+ * rare occurrence so we save I2C/SPI reads.</div><div class='add'>+ */</div><div class='add'>+static void wm8350_irq_worker(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct wm8350 *wm8350 = container_of(work, struct wm8350, irq_work);</div><div class='add'>+	u16 level_one, status1, status2, comp;</div><div class='add'>+</div><div class='add'>+	/* TODO: Use block reads to improve performance? */</div><div class='add'>+	level_one = wm8350_reg_read(wm8350, WM8350_SYSTEM_INTERRUPTS)</div><div class='add'>+		&amp; ~wm8350_reg_read(wm8350, WM8350_SYSTEM_INTERRUPTS_MASK);</div><div class='add'>+	status1 = wm8350_reg_read(wm8350, WM8350_INT_STATUS_1)</div><div class='add'>+		&amp; ~wm8350_reg_read(wm8350, WM8350_INT_STATUS_1_MASK);</div><div class='add'>+	status2 = wm8350_reg_read(wm8350, WM8350_INT_STATUS_2)</div><div class='add'>+		&amp; ~wm8350_reg_read(wm8350, WM8350_INT_STATUS_2_MASK);</div><div class='add'>+	comp = wm8350_reg_read(wm8350, WM8350_COMPARATOR_INT_STATUS)</div><div class='add'>+		&amp; ~wm8350_reg_read(wm8350, WM8350_COMPARATOR_INT_STATUS_MASK);</div><div class='add'>+</div><div class='add'>+	/* over current */</div><div class='add'>+	if (level_one &amp; WM8350_OC_INT) {</div><div class='add'>+		u16 oc;</div><div class='add'>+</div><div class='add'>+		oc = wm8350_reg_read(wm8350, WM8350_OVER_CURRENT_INT_STATUS);</div><div class='add'>+		oc &amp;= ~wm8350_reg_read(wm8350,</div><div class='add'>+				       WM8350_OVER_CURRENT_INT_STATUS_MASK);</div><div class='add'>+</div><div class='add'>+		if (oc &amp; WM8350_OC_LS_EINT)	/* limit switch */</div><div class='add'>+			wm8350_irq_call_handler(wm8350, WM8350_IRQ_OC_LS);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* under voltage */</div><div class='add'>+	if (level_one &amp; WM8350_UV_INT) {</div><div class='add'>+		u16 uv;</div><div class='add'>+</div><div class='add'>+		uv = wm8350_reg_read(wm8350, WM8350_UNDER_VOLTAGE_INT_STATUS);</div><div class='add'>+		uv &amp;= ~wm8350_reg_read(wm8350,</div><div class='add'>+				       WM8350_UNDER_VOLTAGE_INT_STATUS_MASK);</div><div class='add'>+</div><div class='add'>+		if (uv &amp; WM8350_UV_DC1_EINT)</div><div class='add'>+			wm8350_irq_call_handler(wm8350, WM8350_IRQ_UV_DC1);</div><div class='add'>+		if (uv &amp; WM8350_UV_DC2_EINT)</div><div class='add'>+			wm8350_irq_call_handler(wm8350, WM8350_IRQ_UV_DC2);</div><div class='add'>+		if (uv &amp; WM8350_UV_DC3_EINT)</div><div class='add'>+			wm8350_irq_call_handler(wm8350, WM8350_IRQ_UV_DC3);</div><div class='add'>+		if (uv &amp; WM8350_UV_DC4_EINT)</div><div class='add'>+			wm8350_irq_call_handler(wm8350, WM8350_IRQ_UV_DC4);</div><div class='add'>+		if (uv &amp; WM8350_UV_DC5_EINT)</div><div class='add'>+			wm8350_irq_call_handler(wm8350, WM8350_IRQ_UV_DC5);</div><div class='add'>+		if (uv &amp; WM8350_UV_DC6_EINT)</div><div class='add'>+			wm8350_irq_call_handler(wm8350, WM8350_IRQ_UV_DC6);</div><div class='add'>+		if (uv &amp; WM8350_UV_LDO1_EINT)</div><div class='add'>+			wm8350_irq_call_handler(wm8350, WM8350_IRQ_UV_LDO1);</div><div class='add'>+		if (uv &amp; WM8350_UV_LDO2_EINT)</div><div class='add'>+			wm8350_irq_call_handler(wm8350, WM8350_IRQ_UV_LDO2);</div><div class='add'>+		if (uv &amp; WM8350_UV_LDO3_EINT)</div><div class='add'>+			wm8350_irq_call_handler(wm8350, WM8350_IRQ_UV_LDO3);</div><div class='add'>+		if (uv &amp; WM8350_UV_LDO4_EINT)</div><div class='add'>+			wm8350_irq_call_handler(wm8350, WM8350_IRQ_UV_LDO4);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* charger, RTC */</div><div class='add'>+	if (status1) {</div><div class='add'>+		if (status1 &amp; WM8350_CHG_BAT_HOT_EINT)</div><div class='add'>+			wm8350_irq_call_handler(wm8350,</div><div class='add'>+						WM8350_IRQ_CHG_BAT_HOT);</div><div class='add'>+		if (status1 &amp; WM8350_CHG_BAT_COLD_EINT)</div><div class='add'>+			wm8350_irq_call_handler(wm8350,</div><div class='add'>+						WM8350_IRQ_CHG_BAT_COLD);</div><div class='add'>+		if (status1 &amp; WM8350_CHG_BAT_FAIL_EINT)</div><div class='add'>+			wm8350_irq_call_handler(wm8350,</div><div class='add'>+						WM8350_IRQ_CHG_BAT_FAIL);</div><div class='add'>+		if (status1 &amp; WM8350_CHG_TO_EINT)</div><div class='add'>+			wm8350_irq_call_handler(wm8350, WM8350_IRQ_CHG_TO);</div><div class='add'>+		if (status1 &amp; WM8350_CHG_END_EINT)</div><div class='add'>+			wm8350_irq_call_handler(wm8350, WM8350_IRQ_CHG_END);</div><div class='add'>+		if (status1 &amp; WM8350_CHG_START_EINT)</div><div class='add'>+			wm8350_irq_call_handler(wm8350, WM8350_IRQ_CHG_START);</div><div class='add'>+		if (status1 &amp; WM8350_CHG_FAST_RDY_EINT)</div><div class='add'>+			wm8350_irq_call_handler(wm8350,</div><div class='add'>+						WM8350_IRQ_CHG_FAST_RDY);</div><div class='add'>+		if (status1 &amp; WM8350_CHG_VBATT_LT_3P9_EINT)</div><div class='add'>+			wm8350_irq_call_handler(wm8350,</div><div class='add'>+						WM8350_IRQ_CHG_VBATT_LT_3P9);</div><div class='add'>+		if (status1 &amp; WM8350_CHG_VBATT_LT_3P1_EINT)</div><div class='add'>+			wm8350_irq_call_handler(wm8350,</div><div class='add'>+						WM8350_IRQ_CHG_VBATT_LT_3P1);</div><div class='add'>+		if (status1 &amp; WM8350_CHG_VBATT_LT_2P85_EINT)</div><div class='add'>+			wm8350_irq_call_handler(wm8350,</div><div class='add'>+						WM8350_IRQ_CHG_VBATT_LT_2P85);</div><div class='add'>+		if (status1 &amp; WM8350_RTC_ALM_EINT)</div><div class='add'>+			wm8350_irq_call_handler(wm8350, WM8350_IRQ_RTC_ALM);</div><div class='add'>+		if (status1 &amp; WM8350_RTC_SEC_EINT)</div><div class='add'>+			wm8350_irq_call_handler(wm8350, WM8350_IRQ_RTC_SEC);</div><div class='add'>+		if (status1 &amp; WM8350_RTC_PER_EINT)</div><div class='add'>+			wm8350_irq_call_handler(wm8350, WM8350_IRQ_RTC_PER);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* current sink, system, aux adc */</div><div class='add'>+	if (status2) {</div><div class='add'>+		if (status2 &amp; WM8350_CS1_EINT)</div><div class='add'>+			wm8350_irq_call_handler(wm8350, WM8350_IRQ_CS1);</div><div class='add'>+		if (status2 &amp; WM8350_CS2_EINT)</div><div class='add'>+			wm8350_irq_call_handler(wm8350, WM8350_IRQ_CS2);</div><div class='add'>+</div><div class='add'>+		if (status2 &amp; WM8350_SYS_HYST_COMP_FAIL_EINT)</div><div class='add'>+			wm8350_irq_call_handler(wm8350,</div><div class='add'>+						WM8350_IRQ_SYS_HYST_COMP_FAIL);</div><div class='add'>+		if (status2 &amp; WM8350_SYS_CHIP_GT115_EINT)</div><div class='add'>+			wm8350_irq_call_handler(wm8350,</div><div class='add'>+						WM8350_IRQ_SYS_CHIP_GT115);</div><div class='add'>+		if (status2 &amp; WM8350_SYS_CHIP_GT140_EINT)</div><div class='add'>+			wm8350_irq_call_handler(wm8350,</div><div class='add'>+						WM8350_IRQ_SYS_CHIP_GT140);</div><div class='add'>+		if (status2 &amp; WM8350_SYS_WDOG_TO_EINT)</div><div class='add'>+			wm8350_irq_call_handler(wm8350,</div><div class='add'>+						WM8350_IRQ_SYS_WDOG_TO);</div><div class='add'>+</div><div class='add'>+		if (status2 &amp; WM8350_AUXADC_DATARDY_EINT)</div><div class='add'>+			wm8350_irq_call_handler(wm8350,</div><div class='add'>+						WM8350_IRQ_AUXADC_DATARDY);</div><div class='add'>+		if (status2 &amp; WM8350_AUXADC_DCOMP4_EINT)</div><div class='add'>+			wm8350_irq_call_handler(wm8350,</div><div class='add'>+						WM8350_IRQ_AUXADC_DCOMP4);</div><div class='add'>+		if (status2 &amp; WM8350_AUXADC_DCOMP3_EINT)</div><div class='add'>+			wm8350_irq_call_handler(wm8350,</div><div class='add'>+						WM8350_IRQ_AUXADC_DCOMP3);</div><div class='add'>+		if (status2 &amp; WM8350_AUXADC_DCOMP2_EINT)</div><div class='add'>+			wm8350_irq_call_handler(wm8350,</div><div class='add'>+						WM8350_IRQ_AUXADC_DCOMP2);</div><div class='add'>+		if (status2 &amp; WM8350_AUXADC_DCOMP1_EINT)</div><div class='add'>+			wm8350_irq_call_handler(wm8350,</div><div class='add'>+						WM8350_IRQ_AUXADC_DCOMP1);</div><div class='add'>+</div><div class='add'>+		if (status2 &amp; WM8350_USB_LIMIT_EINT)</div><div class='add'>+			wm8350_irq_call_handler(wm8350, WM8350_IRQ_USB_LIMIT);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* wake, codec, ext */</div><div class='add'>+	if (comp) {</div><div class='add'>+		if (comp &amp; WM8350_WKUP_OFF_STATE_EINT)</div><div class='add'>+			wm8350_irq_call_handler(wm8350,</div><div class='add'>+						WM8350_IRQ_WKUP_OFF_STATE);</div><div class='add'>+		if (comp &amp; WM8350_WKUP_HIB_STATE_EINT)</div><div class='add'>+			wm8350_irq_call_handler(wm8350,</div><div class='add'>+						WM8350_IRQ_WKUP_HIB_STATE);</div><div class='add'>+		if (comp &amp; WM8350_WKUP_CONV_FAULT_EINT)</div><div class='add'>+			wm8350_irq_call_handler(wm8350,</div><div class='add'>+						WM8350_IRQ_WKUP_CONV_FAULT);</div><div class='add'>+		if (comp &amp; WM8350_WKUP_WDOG_RST_EINT)</div><div class='add'>+			wm8350_irq_call_handler(wm8350,</div><div class='add'>+						WM8350_IRQ_WKUP_WDOG_RST);</div><div class='add'>+		if (comp &amp; WM8350_WKUP_GP_PWR_ON_EINT)</div><div class='add'>+			wm8350_irq_call_handler(wm8350,</div><div class='add'>+						WM8350_IRQ_WKUP_GP_PWR_ON);</div><div class='add'>+		if (comp &amp; WM8350_WKUP_ONKEY_EINT)</div><div class='add'>+			wm8350_irq_call_handler(wm8350, WM8350_IRQ_WKUP_ONKEY);</div><div class='add'>+		if (comp &amp; WM8350_WKUP_GP_WAKEUP_EINT)</div><div class='add'>+			wm8350_irq_call_handler(wm8350,</div><div class='add'>+						WM8350_IRQ_WKUP_GP_WAKEUP);</div><div class='add'>+</div><div class='add'>+		if (comp &amp; WM8350_CODEC_JCK_DET_L_EINT)</div><div class='add'>+			wm8350_irq_call_handler(wm8350,</div><div class='add'>+						WM8350_IRQ_CODEC_JCK_DET_L);</div><div class='add'>+		if (comp &amp; WM8350_CODEC_JCK_DET_R_EINT)</div><div class='add'>+			wm8350_irq_call_handler(wm8350,</div><div class='add'>+						WM8350_IRQ_CODEC_JCK_DET_R);</div><div class='add'>+		if (comp &amp; WM8350_CODEC_MICSCD_EINT)</div><div class='add'>+			wm8350_irq_call_handler(wm8350,</div><div class='add'>+						WM8350_IRQ_CODEC_MICSCD);</div><div class='add'>+		if (comp &amp; WM8350_CODEC_MICD_EINT)</div><div class='add'>+			wm8350_irq_call_handler(wm8350, WM8350_IRQ_CODEC_MICD);</div><div class='add'>+</div><div class='add'>+		if (comp &amp; WM8350_EXT_USB_FB_EINT)</div><div class='add'>+			wm8350_irq_call_handler(wm8350, WM8350_IRQ_EXT_USB_FB);</div><div class='add'>+		if (comp &amp; WM8350_EXT_WALL_FB_EINT)</div><div class='add'>+			wm8350_irq_call_handler(wm8350,</div><div class='add'>+						WM8350_IRQ_EXT_WALL_FB);</div><div class='add'>+		if (comp &amp; WM8350_EXT_BAT_FB_EINT)</div><div class='add'>+			wm8350_irq_call_handler(wm8350, WM8350_IRQ_EXT_BAT_FB);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (level_one &amp; WM8350_GP_INT) {</div><div class='add'>+		int i;</div><div class='add'>+		u16 gpio;</div><div class='add'>+</div><div class='add'>+		gpio = wm8350_reg_read(wm8350, WM8350_GPIO_INT_STATUS);</div><div class='add'>+		gpio &amp;= ~wm8350_reg_read(wm8350,</div><div class='add'>+					 WM8350_GPIO_INT_STATUS_MASK);</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; 12; i++) {</div><div class='add'>+			if (gpio &amp; (1 &lt;&lt; i))</div><div class='add'>+				wm8350_irq_call_handler(wm8350,</div><div class='add'>+							WM8350_IRQ_GPIO(i));</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	enable_irq(wm8350-&gt;chip_irq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t wm8350_irq(int irq, void *data)</div><div class='add'>+{</div><div class='add'>+	struct wm8350 *wm8350 = data;</div><div class='add'>+</div><div class='add'>+	disable_irq_nosync(irq);</div><div class='add'>+	schedule_work(&amp;wm8350-&gt;irq_work);</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int wm8350_register_irq(struct wm8350 *wm8350, int irq,</div><div class='add'>+			void (*handler) (struct wm8350 *, int, void *),</div><div class='add'>+			void *data)</div><div class='add'>+{</div><div class='add'>+	if (irq &lt; 0 || irq &gt; WM8350_NUM_IRQ || !handler)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (wm8350-&gt;irq[irq].handler)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;wm8350-&gt;irq_mutex);</div><div class='add'>+	wm8350-&gt;irq[irq].handler = handler;</div><div class='add'>+	wm8350-&gt;irq[irq].data = data;</div><div class='add'>+	mutex_unlock(&amp;wm8350-&gt;irq_mutex);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(wm8350_register_irq);</div><div class='add'>+</div><div class='add'>+int wm8350_free_irq(struct wm8350 *wm8350, int irq)</div><div class='add'>+{</div><div class='add'>+	if (irq &lt; 0 || irq &gt; WM8350_NUM_IRQ)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;wm8350-&gt;irq_mutex);</div><div class='add'>+	wm8350-&gt;irq[irq].handler = NULL;</div><div class='add'>+	mutex_unlock(&amp;wm8350-&gt;irq_mutex);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(wm8350_free_irq);</div><div class='add'>+</div><div class='add'>+int wm8350_mask_irq(struct wm8350 *wm8350, int irq)</div><div class='add'>+{</div><div class='add'>+	switch (irq) {</div><div class='add'>+	case WM8350_IRQ_CHG_BAT_HOT:</div><div class='add'>+		return wm8350_set_bits(wm8350, WM8350_INT_STATUS_1_MASK,</div><div class='add'>+				       WM8350_IM_CHG_BAT_HOT_EINT);</div><div class='add'>+	case WM8350_IRQ_CHG_BAT_COLD:</div><div class='add'>+		return wm8350_set_bits(wm8350, WM8350_INT_STATUS_1_MASK,</div><div class='add'>+				       WM8350_IM_CHG_BAT_COLD_EINT);</div><div class='add'>+	case WM8350_IRQ_CHG_BAT_FAIL:</div><div class='add'>+		return wm8350_set_bits(wm8350, WM8350_INT_STATUS_1_MASK,</div><div class='add'>+				       WM8350_IM_CHG_BAT_FAIL_EINT);</div><div class='add'>+	case WM8350_IRQ_CHG_TO:</div><div class='add'>+		return wm8350_set_bits(wm8350, WM8350_INT_STATUS_1_MASK,</div><div class='add'>+				       WM8350_IM_CHG_TO_EINT);</div><div class='add'>+	case WM8350_IRQ_CHG_END:</div><div class='add'>+		return wm8350_set_bits(wm8350, WM8350_INT_STATUS_1_MASK,</div><div class='add'>+				       WM8350_IM_CHG_END_EINT);</div><div class='add'>+	case WM8350_IRQ_CHG_START:</div><div class='add'>+		return wm8350_set_bits(wm8350, WM8350_INT_STATUS_1_MASK,</div><div class='add'>+				       WM8350_IM_CHG_START_EINT);</div><div class='add'>+	case WM8350_IRQ_CHG_FAST_RDY:</div><div class='add'>+		return wm8350_set_bits(wm8350, WM8350_INT_STATUS_1_MASK,</div><div class='add'>+				       WM8350_IM_CHG_FAST_RDY_EINT);</div><div class='add'>+	case WM8350_IRQ_RTC_PER:</div><div class='add'>+		return wm8350_set_bits(wm8350, WM8350_INT_STATUS_1_MASK,</div><div class='add'>+				       WM8350_IM_RTC_PER_EINT);</div><div class='add'>+	case WM8350_IRQ_RTC_SEC:</div><div class='add'>+		return wm8350_set_bits(wm8350, WM8350_INT_STATUS_1_MASK,</div><div class='add'>+				       WM8350_IM_RTC_SEC_EINT);</div><div class='add'>+	case WM8350_IRQ_RTC_ALM:</div><div class='add'>+		return wm8350_set_bits(wm8350, WM8350_INT_STATUS_1_MASK,</div><div class='add'>+				       WM8350_IM_RTC_ALM_EINT);</div><div class='add'>+	case WM8350_IRQ_CHG_VBATT_LT_3P9:</div><div class='add'>+		return wm8350_set_bits(wm8350, WM8350_INT_STATUS_1_MASK,</div><div class='add'>+				       WM8350_IM_CHG_VBATT_LT_3P9_EINT);</div><div class='add'>+	case WM8350_IRQ_CHG_VBATT_LT_3P1:</div><div class='add'>+		return wm8350_set_bits(wm8350, WM8350_INT_STATUS_1_MASK,</div><div class='add'>+				       WM8350_IM_CHG_VBATT_LT_3P1_EINT);</div><div class='add'>+	case WM8350_IRQ_CHG_VBATT_LT_2P85:</div><div class='add'>+		return wm8350_set_bits(wm8350, WM8350_INT_STATUS_1_MASK,</div><div class='add'>+				       WM8350_IM_CHG_VBATT_LT_2P85_EINT);</div><div class='add'>+	case WM8350_IRQ_CS1:</div><div class='add'>+		return wm8350_set_bits(wm8350, WM8350_INT_STATUS_2_MASK,</div><div class='add'>+				       WM8350_IM_CS1_EINT);</div><div class='add'>+	case WM8350_IRQ_CS2:</div><div class='add'>+		return wm8350_set_bits(wm8350, WM8350_INT_STATUS_2_MASK,</div><div class='add'>+				       WM8350_IM_CS2_EINT);</div><div class='add'>+	case WM8350_IRQ_USB_LIMIT:</div><div class='add'>+		return wm8350_set_bits(wm8350, WM8350_INT_STATUS_2_MASK,</div><div class='add'>+				       WM8350_IM_USB_LIMIT_EINT);</div><div class='add'>+	case WM8350_IRQ_AUXADC_DATARDY:</div><div class='add'>+		return wm8350_set_bits(wm8350, WM8350_INT_STATUS_2_MASK,</div><div class='add'>+				       WM8350_IM_AUXADC_DATARDY_EINT);</div><div class='add'>+	case WM8350_IRQ_AUXADC_DCOMP4:</div><div class='add'>+		return wm8350_set_bits(wm8350, WM8350_INT_STATUS_2_MASK,</div><div class='add'>+				       WM8350_IM_AUXADC_DCOMP4_EINT);</div><div class='add'>+	case WM8350_IRQ_AUXADC_DCOMP3:</div><div class='add'>+		return wm8350_set_bits(wm8350, WM8350_INT_STATUS_2_MASK,</div><div class='add'>+				       WM8350_IM_AUXADC_DCOMP3_EINT);</div><div class='add'>+	case WM8350_IRQ_AUXADC_DCOMP2:</div><div class='add'>+		return wm8350_set_bits(wm8350, WM8350_INT_STATUS_2_MASK,</div><div class='add'>+				       WM8350_IM_AUXADC_DCOMP2_EINT);</div><div class='add'>+	case WM8350_IRQ_AUXADC_DCOMP1:</div><div class='add'>+		return wm8350_set_bits(wm8350, WM8350_INT_STATUS_2_MASK,</div><div class='add'>+				       WM8350_IM_AUXADC_DCOMP1_EINT);</div><div class='add'>+	case WM8350_IRQ_SYS_HYST_COMP_FAIL:</div><div class='add'>+		return wm8350_set_bits(wm8350, WM8350_INT_STATUS_2_MASK,</div><div class='add'>+				       WM8350_IM_SYS_HYST_COMP_FAIL_EINT);</div><div class='add'>+	case WM8350_IRQ_SYS_CHIP_GT115:</div><div class='add'>+		return wm8350_set_bits(wm8350, WM8350_INT_STATUS_2_MASK,</div><div class='add'>+				       WM8350_IM_SYS_CHIP_GT115_EINT);</div><div class='add'>+	case WM8350_IRQ_SYS_CHIP_GT140:</div><div class='add'>+		return wm8350_set_bits(wm8350, WM8350_INT_STATUS_2_MASK,</div><div class='add'>+				       WM8350_IM_SYS_CHIP_GT140_EINT);</div><div class='add'>+	case WM8350_IRQ_SYS_WDOG_TO:</div><div class='add'>+		return wm8350_set_bits(wm8350, WM8350_INT_STATUS_2_MASK,</div><div class='add'>+				       WM8350_IM_SYS_WDOG_TO_EINT);</div><div class='add'>+	case WM8350_IRQ_UV_LDO4:</div><div class='add'>+		return wm8350_set_bits(wm8350,</div><div class='add'>+				       WM8350_UNDER_VOLTAGE_INT_STATUS_MASK,</div><div class='add'>+				       WM8350_IM_UV_LDO4_EINT);</div><div class='add'>+	case WM8350_IRQ_UV_LDO3:</div><div class='add'>+		return wm8350_set_bits(wm8350,</div><div class='add'>+				       WM8350_UNDER_VOLTAGE_INT_STATUS_MASK,</div><div class='add'>+				       WM8350_IM_UV_LDO3_EINT);</div><div class='add'>+	case WM8350_IRQ_UV_LDO2:</div><div class='add'>+		return wm8350_set_bits(wm8350,</div><div class='add'>+				       WM8350_UNDER_VOLTAGE_INT_STATUS_MASK,</div><div class='add'>+				       WM8350_IM_UV_LDO2_EINT);</div><div class='add'>+	case WM8350_IRQ_UV_LDO1:</div><div class='add'>+		return wm8350_set_bits(wm8350,</div><div class='add'>+				       WM8350_UNDER_VOLTAGE_INT_STATUS_MASK,</div><div class='add'>+				       WM8350_IM_UV_LDO1_EINT);</div><div class='add'>+	case WM8350_IRQ_UV_DC6:</div><div class='add'>+		return wm8350_set_bits(wm8350,</div><div class='add'>+				       WM8350_UNDER_VOLTAGE_INT_STATUS_MASK,</div><div class='add'>+				       WM8350_IM_UV_DC6_EINT);</div><div class='add'>+	case WM8350_IRQ_UV_DC5:</div><div class='add'>+		return wm8350_set_bits(wm8350,</div><div class='add'>+				       WM8350_UNDER_VOLTAGE_INT_STATUS_MASK,</div><div class='add'>+				       WM8350_IM_UV_DC5_EINT);</div><div class='add'>+	case WM8350_IRQ_UV_DC4:</div><div class='add'>+		return wm8350_set_bits(wm8350,</div><div class='add'>+				       WM8350_UNDER_VOLTAGE_INT_STATUS_MASK,</div><div class='add'>+				       WM8350_IM_UV_DC4_EINT);</div><div class='add'>+	case WM8350_IRQ_UV_DC3:</div><div class='add'>+		return wm8350_set_bits(wm8350,</div><div class='add'>+				       WM8350_UNDER_VOLTAGE_INT_STATUS_MASK,</div><div class='add'>+				       WM8350_IM_UV_DC3_EINT);</div><div class='add'>+	case WM8350_IRQ_UV_DC2:</div><div class='add'>+		return wm8350_set_bits(wm8350,</div><div class='add'>+				       WM8350_UNDER_VOLTAGE_INT_STATUS_MASK,</div><div class='add'>+				       WM8350_IM_UV_DC2_EINT);</div><div class='add'>+	case WM8350_IRQ_UV_DC1:</div><div class='add'>+		return wm8350_set_bits(wm8350,</div><div class='add'>+				       WM8350_UNDER_VOLTAGE_INT_STATUS_MASK,</div><div class='add'>+				       WM8350_IM_UV_DC1_EINT);</div><div class='add'>+	case WM8350_IRQ_OC_LS:</div><div class='add'>+		return wm8350_set_bits(wm8350,</div><div class='add'>+				       WM8350_OVER_CURRENT_INT_STATUS_MASK,</div><div class='add'>+				       WM8350_IM_OC_LS_EINT);</div><div class='add'>+	case WM8350_IRQ_EXT_USB_FB:</div><div class='add'>+		return wm8350_set_bits(wm8350,</div><div class='add'>+				       WM8350_COMPARATOR_INT_STATUS_MASK,</div><div class='add'>+				       WM8350_IM_EXT_USB_FB_EINT);</div><div class='add'>+	case WM8350_IRQ_EXT_WALL_FB:</div><div class='add'>+		return wm8350_set_bits(wm8350,</div><div class='add'>+				       WM8350_COMPARATOR_INT_STATUS_MASK,</div><div class='add'>+				       WM8350_IM_EXT_WALL_FB_EINT);</div><div class='add'>+	case WM8350_IRQ_EXT_BAT_FB:</div><div class='add'>+		return wm8350_set_bits(wm8350,</div><div class='add'>+				       WM8350_COMPARATOR_INT_STATUS_MASK,</div><div class='add'>+				       WM8350_IM_EXT_BAT_FB_EINT);</div><div class='add'>+	case WM8350_IRQ_CODEC_JCK_DET_L:</div><div class='add'>+		return wm8350_set_bits(wm8350,</div><div class='add'>+				       WM8350_COMPARATOR_INT_STATUS_MASK,</div><div class='add'>+				       WM8350_IM_CODEC_JCK_DET_L_EINT);</div><div class='add'>+	case WM8350_IRQ_CODEC_JCK_DET_R:</div><div class='add'>+		return wm8350_set_bits(wm8350,</div><div class='add'>+				       WM8350_COMPARATOR_INT_STATUS_MASK,</div><div class='add'>+				       WM8350_IM_CODEC_JCK_DET_R_EINT);</div><div class='add'>+	case WM8350_IRQ_CODEC_MICSCD:</div><div class='add'>+		return wm8350_set_bits(wm8350,</div><div class='add'>+				       WM8350_COMPARATOR_INT_STATUS_MASK,</div><div class='add'>+				       WM8350_IM_CODEC_MICSCD_EINT);</div><div class='add'>+	case WM8350_IRQ_CODEC_MICD:</div><div class='add'>+		return wm8350_set_bits(wm8350,</div><div class='add'>+				       WM8350_COMPARATOR_INT_STATUS_MASK,</div><div class='add'>+				       WM8350_IM_CODEC_MICD_EINT);</div><div class='add'>+	case WM8350_IRQ_WKUP_OFF_STATE:</div><div class='add'>+		return wm8350_set_bits(wm8350,</div><div class='add'>+				       WM8350_COMPARATOR_INT_STATUS_MASK,</div><div class='add'>+				       WM8350_IM_WKUP_OFF_STATE_EINT);</div><div class='add'>+	case WM8350_IRQ_WKUP_HIB_STATE:</div><div class='add'>+		return wm8350_set_bits(wm8350,</div><div class='add'>+				       WM8350_COMPARATOR_INT_STATUS_MASK,</div><div class='add'>+				       WM8350_IM_WKUP_HIB_STATE_EINT);</div><div class='add'>+	case WM8350_IRQ_WKUP_CONV_FAULT:</div><div class='add'>+		return wm8350_set_bits(wm8350,</div><div class='add'>+				       WM8350_COMPARATOR_INT_STATUS_MASK,</div><div class='add'>+				       WM8350_IM_WKUP_CONV_FAULT_EINT);</div><div class='add'>+	case WM8350_IRQ_WKUP_WDOG_RST:</div><div class='add'>+		return wm8350_set_bits(wm8350,</div><div class='add'>+				       WM8350_COMPARATOR_INT_STATUS_MASK,</div><div class='add'>+				       WM8350_IM_WKUP_OFF_STATE_EINT);</div><div class='add'>+	case WM8350_IRQ_WKUP_GP_PWR_ON:</div><div class='add'>+		return wm8350_set_bits(wm8350,</div><div class='add'>+				       WM8350_COMPARATOR_INT_STATUS_MASK,</div><div class='add'>+				       WM8350_IM_WKUP_GP_PWR_ON_EINT);</div><div class='add'>+	case WM8350_IRQ_WKUP_ONKEY:</div><div class='add'>+		return wm8350_set_bits(wm8350,</div><div class='add'>+				       WM8350_COMPARATOR_INT_STATUS_MASK,</div><div class='add'>+				       WM8350_IM_WKUP_ONKEY_EINT);</div><div class='add'>+	case WM8350_IRQ_WKUP_GP_WAKEUP:</div><div class='add'>+		return wm8350_set_bits(wm8350,</div><div class='add'>+				       WM8350_COMPARATOR_INT_STATUS_MASK,</div><div class='add'>+				       WM8350_IM_WKUP_GP_WAKEUP_EINT);</div><div class='add'>+	case WM8350_IRQ_GPIO(0):</div><div class='add'>+		return wm8350_set_bits(wm8350,</div><div class='add'>+				       WM8350_GPIO_INT_STATUS_MASK,</div><div class='add'>+				       WM8350_IM_GP0_EINT);</div><div class='add'>+	case WM8350_IRQ_GPIO(1):</div><div class='add'>+		return wm8350_set_bits(wm8350,</div><div class='add'>+				       WM8350_GPIO_INT_STATUS_MASK,</div><div class='add'>+				       WM8350_IM_GP1_EINT);</div><div class='add'>+	case WM8350_IRQ_GPIO(2):</div><div class='add'>+		return wm8350_set_bits(wm8350,</div><div class='add'>+				       WM8350_GPIO_INT_STATUS_MASK,</div><div class='add'>+				       WM8350_IM_GP2_EINT);</div><div class='add'>+	case WM8350_IRQ_GPIO(3):</div><div class='add'>+		return wm8350_set_bits(wm8350,</div><div class='add'>+				       WM8350_GPIO_INT_STATUS_MASK,</div><div class='add'>+				       WM8350_IM_GP3_EINT);</div><div class='add'>+	case WM8350_IRQ_GPIO(4):</div><div class='add'>+		return wm8350_set_bits(wm8350,</div><div class='add'>+				       WM8350_GPIO_INT_STATUS_MASK,</div><div class='add'>+				       WM8350_IM_GP4_EINT);</div><div class='add'>+	case WM8350_IRQ_GPIO(5):</div><div class='add'>+		return wm8350_set_bits(wm8350,</div><div class='add'>+				       WM8350_GPIO_INT_STATUS_MASK,</div><div class='add'>+				       WM8350_IM_GP5_EINT);</div><div class='add'>+	case WM8350_IRQ_GPIO(6):</div><div class='add'>+		return wm8350_set_bits(wm8350,</div><div class='add'>+				       WM8350_GPIO_INT_STATUS_MASK,</div><div class='add'>+				       WM8350_IM_GP6_EINT);</div><div class='add'>+	case WM8350_IRQ_GPIO(7):</div><div class='add'>+		return wm8350_set_bits(wm8350,</div><div class='add'>+				       WM8350_GPIO_INT_STATUS_MASK,</div><div class='add'>+				       WM8350_IM_GP7_EINT);</div><div class='add'>+	case WM8350_IRQ_GPIO(8):</div><div class='add'>+		return wm8350_set_bits(wm8350,</div><div class='add'>+				       WM8350_GPIO_INT_STATUS_MASK,</div><div class='add'>+				       WM8350_IM_GP8_EINT);</div><div class='add'>+	case WM8350_IRQ_GPIO(9):</div><div class='add'>+		return wm8350_set_bits(wm8350,</div><div class='add'>+				       WM8350_GPIO_INT_STATUS_MASK,</div><div class='add'>+				       WM8350_IM_GP9_EINT);</div><div class='add'>+	case WM8350_IRQ_GPIO(10):</div><div class='add'>+		return wm8350_set_bits(wm8350,</div><div class='add'>+				       WM8350_GPIO_INT_STATUS_MASK,</div><div class='add'>+				       WM8350_IM_GP10_EINT);</div><div class='add'>+	case WM8350_IRQ_GPIO(11):</div><div class='add'>+		return wm8350_set_bits(wm8350,</div><div class='add'>+				       WM8350_GPIO_INT_STATUS_MASK,</div><div class='add'>+				       WM8350_IM_GP11_EINT);</div><div class='add'>+	case WM8350_IRQ_GPIO(12):</div><div class='add'>+		return wm8350_set_bits(wm8350,</div><div class='add'>+				       WM8350_GPIO_INT_STATUS_MASK,</div><div class='add'>+				       WM8350_IM_GP12_EINT);</div><div class='add'>+	default:</div><div class='add'>+		dev_warn(wm8350-&gt;dev, "Attempting to mask unknown IRQ %d\n",</div><div class='add'>+			 irq);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(wm8350_mask_irq);</div><div class='add'>+</div><div class='add'>+int wm8350_unmask_irq(struct wm8350 *wm8350, int irq)</div><div class='add'>+{</div><div class='add'>+	switch (irq) {</div><div class='add'>+	case WM8350_IRQ_CHG_BAT_HOT:</div><div class='add'>+		return wm8350_clear_bits(wm8350, WM8350_INT_STATUS_1_MASK,</div><div class='add'>+					 WM8350_IM_CHG_BAT_HOT_EINT);</div><div class='add'>+	case WM8350_IRQ_CHG_BAT_COLD:</div><div class='add'>+		return wm8350_clear_bits(wm8350, WM8350_INT_STATUS_1_MASK,</div><div class='add'>+					 WM8350_IM_CHG_BAT_COLD_EINT);</div><div class='add'>+	case WM8350_IRQ_CHG_BAT_FAIL:</div><div class='add'>+		return wm8350_clear_bits(wm8350, WM8350_INT_STATUS_1_MASK,</div><div class='add'>+					 WM8350_IM_CHG_BAT_FAIL_EINT);</div><div class='add'>+	case WM8350_IRQ_CHG_TO:</div><div class='add'>+		return wm8350_clear_bits(wm8350, WM8350_INT_STATUS_1_MASK,</div><div class='add'>+					 WM8350_IM_CHG_TO_EINT);</div><div class='add'>+	case WM8350_IRQ_CHG_END:</div><div class='add'>+		return wm8350_clear_bits(wm8350, WM8350_INT_STATUS_1_MASK,</div><div class='add'>+					 WM8350_IM_CHG_END_EINT);</div><div class='add'>+	case WM8350_IRQ_CHG_START:</div><div class='add'>+		return wm8350_clear_bits(wm8350, WM8350_INT_STATUS_1_MASK,</div><div class='add'>+					 WM8350_IM_CHG_START_EINT);</div><div class='add'>+	case WM8350_IRQ_CHG_FAST_RDY:</div><div class='add'>+		return wm8350_clear_bits(wm8350, WM8350_INT_STATUS_1_MASK,</div><div class='add'>+					 WM8350_IM_CHG_FAST_RDY_EINT);</div><div class='add'>+	case WM8350_IRQ_RTC_PER:</div><div class='add'>+		return wm8350_clear_bits(wm8350, WM8350_INT_STATUS_1_MASK,</div><div class='add'>+					 WM8350_IM_RTC_PER_EINT);</div><div class='add'>+	case WM8350_IRQ_RTC_SEC:</div><div class='add'>+		return wm8350_clear_bits(wm8350, WM8350_INT_STATUS_1_MASK,</div><div class='add'>+					 WM8350_IM_RTC_SEC_EINT);</div><div class='add'>+	case WM8350_IRQ_RTC_ALM:</div><div class='add'>+		return wm8350_clear_bits(wm8350, WM8350_INT_STATUS_1_MASK,</div><div class='add'>+					 WM8350_IM_RTC_ALM_EINT);</div><div class='add'>+	case WM8350_IRQ_CHG_VBATT_LT_3P9:</div><div class='add'>+		return wm8350_clear_bits(wm8350, WM8350_INT_STATUS_1_MASK,</div><div class='add'>+					 WM8350_IM_CHG_VBATT_LT_3P9_EINT);</div><div class='add'>+	case WM8350_IRQ_CHG_VBATT_LT_3P1:</div><div class='add'>+		return wm8350_clear_bits(wm8350, WM8350_INT_STATUS_1_MASK,</div><div class='add'>+					 WM8350_IM_CHG_VBATT_LT_3P1_EINT);</div><div class='add'>+	case WM8350_IRQ_CHG_VBATT_LT_2P85:</div><div class='add'>+		return wm8350_clear_bits(wm8350, WM8350_INT_STATUS_1_MASK,</div><div class='add'>+					 WM8350_IM_CHG_VBATT_LT_2P85_EINT);</div><div class='add'>+	case WM8350_IRQ_CS1:</div><div class='add'>+		return wm8350_clear_bits(wm8350, WM8350_INT_STATUS_2_MASK,</div><div class='add'>+					 WM8350_IM_CS1_EINT);</div><div class='add'>+	case WM8350_IRQ_CS2:</div><div class='add'>+		return wm8350_clear_bits(wm8350, WM8350_INT_STATUS_2_MASK,</div><div class='add'>+					 WM8350_IM_CS2_EINT);</div><div class='add'>+	case WM8350_IRQ_USB_LIMIT:</div><div class='add'>+		return wm8350_clear_bits(wm8350, WM8350_INT_STATUS_2_MASK,</div><div class='add'>+					 WM8350_IM_USB_LIMIT_EINT);</div><div class='add'>+	case WM8350_IRQ_AUXADC_DATARDY:</div><div class='add'>+		return wm8350_clear_bits(wm8350, WM8350_INT_STATUS_2_MASK,</div><div class='add'>+					 WM8350_IM_AUXADC_DATARDY_EINT);</div><div class='add'>+	case WM8350_IRQ_AUXADC_DCOMP4:</div><div class='add'>+		return wm8350_clear_bits(wm8350, WM8350_INT_STATUS_2_MASK,</div><div class='add'>+					 WM8350_IM_AUXADC_DCOMP4_EINT);</div><div class='add'>+	case WM8350_IRQ_AUXADC_DCOMP3:</div><div class='add'>+		return wm8350_clear_bits(wm8350, WM8350_INT_STATUS_2_MASK,</div><div class='add'>+					 WM8350_IM_AUXADC_DCOMP3_EINT);</div><div class='add'>+	case WM8350_IRQ_AUXADC_DCOMP2:</div><div class='add'>+		return wm8350_clear_bits(wm8350, WM8350_INT_STATUS_2_MASK,</div><div class='add'>+					 WM8350_IM_AUXADC_DCOMP2_EINT);</div><div class='add'>+	case WM8350_IRQ_AUXADC_DCOMP1:</div><div class='add'>+		return wm8350_clear_bits(wm8350, WM8350_INT_STATUS_2_MASK,</div><div class='add'>+					 WM8350_IM_AUXADC_DCOMP1_EINT);</div><div class='add'>+	case WM8350_IRQ_SYS_HYST_COMP_FAIL:</div><div class='add'>+		return wm8350_clear_bits(wm8350, WM8350_INT_STATUS_2_MASK,</div><div class='add'>+					 WM8350_IM_SYS_HYST_COMP_FAIL_EINT);</div><div class='add'>+	case WM8350_IRQ_SYS_CHIP_GT115:</div><div class='add'>+		return wm8350_clear_bits(wm8350, WM8350_INT_STATUS_2_MASK,</div><div class='add'>+					 WM8350_IM_SYS_CHIP_GT115_EINT);</div><div class='add'>+	case WM8350_IRQ_SYS_CHIP_GT140:</div><div class='add'>+		return wm8350_clear_bits(wm8350, WM8350_INT_STATUS_2_MASK,</div><div class='add'>+					 WM8350_IM_SYS_CHIP_GT140_EINT);</div><div class='add'>+	case WM8350_IRQ_SYS_WDOG_TO:</div><div class='add'>+		return wm8350_clear_bits(wm8350, WM8350_INT_STATUS_2_MASK,</div><div class='add'>+					 WM8350_IM_SYS_WDOG_TO_EINT);</div><div class='add'>+	case WM8350_IRQ_UV_LDO4:</div><div class='add'>+		return wm8350_clear_bits(wm8350,</div><div class='add'>+					 WM8350_UNDER_VOLTAGE_INT_STATUS_MASK,</div><div class='add'>+					 WM8350_IM_UV_LDO4_EINT);</div><div class='add'>+	case WM8350_IRQ_UV_LDO3:</div><div class='add'>+		return wm8350_clear_bits(wm8350,</div><div class='add'>+					 WM8350_UNDER_VOLTAGE_INT_STATUS_MASK,</div><div class='add'>+					 WM8350_IM_UV_LDO3_EINT);</div><div class='add'>+	case WM8350_IRQ_UV_LDO2:</div><div class='add'>+		return wm8350_clear_bits(wm8350,</div><div class='add'>+					 WM8350_UNDER_VOLTAGE_INT_STATUS_MASK,</div><div class='add'>+					 WM8350_IM_UV_LDO2_EINT);</div><div class='add'>+	case WM8350_IRQ_UV_LDO1:</div><div class='add'>+		return wm8350_clear_bits(wm8350,</div><div class='add'>+					 WM8350_UNDER_VOLTAGE_INT_STATUS_MASK,</div><div class='add'>+					 WM8350_IM_UV_LDO1_EINT);</div><div class='add'>+	case WM8350_IRQ_UV_DC6:</div><div class='add'>+		return wm8350_clear_bits(wm8350,</div><div class='add'>+					 WM8350_UNDER_VOLTAGE_INT_STATUS_MASK,</div><div class='add'>+					 WM8350_IM_UV_DC6_EINT);</div><div class='add'>+	case WM8350_IRQ_UV_DC5:</div><div class='add'>+		return wm8350_clear_bits(wm8350,</div><div class='add'>+					 WM8350_UNDER_VOLTAGE_INT_STATUS_MASK,</div><div class='add'>+					 WM8350_IM_UV_DC5_EINT);</div><div class='add'>+	case WM8350_IRQ_UV_DC4:</div><div class='add'>+		return wm8350_clear_bits(wm8350,</div><div class='add'>+					 WM8350_UNDER_VOLTAGE_INT_STATUS_MASK,</div><div class='add'>+					 WM8350_IM_UV_DC4_EINT);</div><div class='add'>+	case WM8350_IRQ_UV_DC3:</div><div class='add'>+		return wm8350_clear_bits(wm8350,</div><div class='add'>+					 WM8350_UNDER_VOLTAGE_INT_STATUS_MASK,</div><div class='add'>+					 WM8350_IM_UV_DC3_EINT);</div><div class='add'>+	case WM8350_IRQ_UV_DC2:</div><div class='add'>+		return wm8350_clear_bits(wm8350,</div><div class='add'>+					 WM8350_UNDER_VOLTAGE_INT_STATUS_MASK,</div><div class='add'>+					 WM8350_IM_UV_DC2_EINT);</div><div class='add'>+	case WM8350_IRQ_UV_DC1:</div><div class='add'>+		return wm8350_clear_bits(wm8350,</div><div class='add'>+					 WM8350_UNDER_VOLTAGE_INT_STATUS_MASK,</div><div class='add'>+					 WM8350_IM_UV_DC1_EINT);</div><div class='add'>+	case WM8350_IRQ_OC_LS:</div><div class='add'>+		return wm8350_clear_bits(wm8350,</div><div class='add'>+					 WM8350_OVER_CURRENT_INT_STATUS_MASK,</div><div class='add'>+					 WM8350_IM_OC_LS_EINT);</div><div class='add'>+	case WM8350_IRQ_EXT_USB_FB:</div><div class='add'>+		return wm8350_clear_bits(wm8350,</div><div class='add'>+					 WM8350_COMPARATOR_INT_STATUS_MASK,</div><div class='add'>+					 WM8350_IM_EXT_USB_FB_EINT);</div><div class='add'>+	case WM8350_IRQ_EXT_WALL_FB:</div><div class='add'>+		return wm8350_clear_bits(wm8350,</div><div class='add'>+					 WM8350_COMPARATOR_INT_STATUS_MASK,</div><div class='add'>+					 WM8350_IM_EXT_WALL_FB_EINT);</div><div class='add'>+	case WM8350_IRQ_EXT_BAT_FB:</div><div class='add'>+		return wm8350_clear_bits(wm8350,</div><div class='add'>+					 WM8350_COMPARATOR_INT_STATUS_MASK,</div><div class='add'>+					 WM8350_IM_EXT_BAT_FB_EINT);</div><div class='add'>+	case WM8350_IRQ_CODEC_JCK_DET_L:</div><div class='add'>+		return wm8350_clear_bits(wm8350,</div><div class='add'>+					 WM8350_COMPARATOR_INT_STATUS_MASK,</div><div class='add'>+					 WM8350_IM_CODEC_JCK_DET_L_EINT);</div><div class='add'>+	case WM8350_IRQ_CODEC_JCK_DET_R:</div><div class='add'>+		return wm8350_clear_bits(wm8350,</div><div class='add'>+					 WM8350_COMPARATOR_INT_STATUS_MASK,</div><div class='add'>+					 WM8350_IM_CODEC_JCK_DET_R_EINT);</div><div class='add'>+	case WM8350_IRQ_CODEC_MICSCD:</div><div class='add'>+		return wm8350_clear_bits(wm8350,</div><div class='add'>+					 WM8350_COMPARATOR_INT_STATUS_MASK,</div><div class='add'>+					 WM8350_IM_CODEC_MICSCD_EINT);</div><div class='add'>+	case WM8350_IRQ_CODEC_MICD:</div><div class='add'>+		return wm8350_clear_bits(wm8350,</div><div class='add'>+					 WM8350_COMPARATOR_INT_STATUS_MASK,</div><div class='add'>+					 WM8350_IM_CODEC_MICD_EINT);</div><div class='add'>+	case WM8350_IRQ_WKUP_OFF_STATE:</div><div class='add'>+		return wm8350_clear_bits(wm8350,</div><div class='add'>+					 WM8350_COMPARATOR_INT_STATUS_MASK,</div><div class='add'>+					 WM8350_IM_WKUP_OFF_STATE_EINT);</div><div class='add'>+	case WM8350_IRQ_WKUP_HIB_STATE:</div><div class='add'>+		return wm8350_clear_bits(wm8350,</div><div class='add'>+					 WM8350_COMPARATOR_INT_STATUS_MASK,</div><div class='add'>+					 WM8350_IM_WKUP_HIB_STATE_EINT);</div><div class='add'>+	case WM8350_IRQ_WKUP_CONV_FAULT:</div><div class='add'>+		return wm8350_clear_bits(wm8350,</div><div class='add'>+					 WM8350_COMPARATOR_INT_STATUS_MASK,</div><div class='add'>+					 WM8350_IM_WKUP_CONV_FAULT_EINT);</div><div class='add'>+	case WM8350_IRQ_WKUP_WDOG_RST:</div><div class='add'>+		return wm8350_clear_bits(wm8350,</div><div class='add'>+					 WM8350_COMPARATOR_INT_STATUS_MASK,</div><div class='add'>+					 WM8350_IM_WKUP_OFF_STATE_EINT);</div><div class='add'>+	case WM8350_IRQ_WKUP_GP_PWR_ON:</div><div class='add'>+		return wm8350_clear_bits(wm8350,</div><div class='add'>+					 WM8350_COMPARATOR_INT_STATUS_MASK,</div><div class='add'>+					 WM8350_IM_WKUP_GP_PWR_ON_EINT);</div><div class='add'>+	case WM8350_IRQ_WKUP_ONKEY:</div><div class='add'>+		return wm8350_clear_bits(wm8350,</div><div class='add'>+					 WM8350_COMPARATOR_INT_STATUS_MASK,</div><div class='add'>+					 WM8350_IM_WKUP_ONKEY_EINT);</div><div class='add'>+	case WM8350_IRQ_WKUP_GP_WAKEUP:</div><div class='add'>+		return wm8350_clear_bits(wm8350,</div><div class='add'>+					 WM8350_COMPARATOR_INT_STATUS_MASK,</div><div class='add'>+					 WM8350_IM_WKUP_GP_WAKEUP_EINT);</div><div class='add'>+	case WM8350_IRQ_GPIO(0):</div><div class='add'>+		return wm8350_clear_bits(wm8350,</div><div class='add'>+					 WM8350_GPIO_INT_STATUS_MASK,</div><div class='add'>+					 WM8350_IM_GP0_EINT);</div><div class='add'>+	case WM8350_IRQ_GPIO(1):</div><div class='add'>+		return wm8350_clear_bits(wm8350,</div><div class='add'>+					 WM8350_GPIO_INT_STATUS_MASK,</div><div class='add'>+					 WM8350_IM_GP1_EINT);</div><div class='add'>+	case WM8350_IRQ_GPIO(2):</div><div class='add'>+		return wm8350_clear_bits(wm8350,</div><div class='add'>+					 WM8350_GPIO_INT_STATUS_MASK,</div><div class='add'>+					 WM8350_IM_GP2_EINT);</div><div class='add'>+	case WM8350_IRQ_GPIO(3):</div><div class='add'>+		return wm8350_clear_bits(wm8350,</div><div class='add'>+					 WM8350_GPIO_INT_STATUS_MASK,</div><div class='add'>+					 WM8350_IM_GP3_EINT);</div><div class='add'>+	case WM8350_IRQ_GPIO(4):</div><div class='add'>+		return wm8350_clear_bits(wm8350,</div><div class='add'>+					 WM8350_GPIO_INT_STATUS_MASK,</div><div class='add'>+					 WM8350_IM_GP4_EINT);</div><div class='add'>+	case WM8350_IRQ_GPIO(5):</div><div class='add'>+		return wm8350_clear_bits(wm8350,</div><div class='add'>+					 WM8350_GPIO_INT_STATUS_MASK,</div><div class='add'>+					 WM8350_IM_GP5_EINT);</div><div class='add'>+	case WM8350_IRQ_GPIO(6):</div><div class='add'>+		return wm8350_clear_bits(wm8350,</div><div class='add'>+					 WM8350_GPIO_INT_STATUS_MASK,</div><div class='add'>+					 WM8350_IM_GP6_EINT);</div><div class='add'>+	case WM8350_IRQ_GPIO(7):</div><div class='add'>+		return wm8350_clear_bits(wm8350,</div><div class='add'>+					 WM8350_GPIO_INT_STATUS_MASK,</div><div class='add'>+					 WM8350_IM_GP7_EINT);</div><div class='add'>+	case WM8350_IRQ_GPIO(8):</div><div class='add'>+		return wm8350_clear_bits(wm8350,</div><div class='add'>+					 WM8350_GPIO_INT_STATUS_MASK,</div><div class='add'>+					 WM8350_IM_GP8_EINT);</div><div class='add'>+	case WM8350_IRQ_GPIO(9):</div><div class='add'>+		return wm8350_clear_bits(wm8350,</div><div class='add'>+					 WM8350_GPIO_INT_STATUS_MASK,</div><div class='add'>+					 WM8350_IM_GP9_EINT);</div><div class='add'>+	case WM8350_IRQ_GPIO(10):</div><div class='add'>+		return wm8350_clear_bits(wm8350,</div><div class='add'>+					 WM8350_GPIO_INT_STATUS_MASK,</div><div class='add'>+					 WM8350_IM_GP10_EINT);</div><div class='add'>+	case WM8350_IRQ_GPIO(11):</div><div class='add'>+		return wm8350_clear_bits(wm8350,</div><div class='add'>+					 WM8350_GPIO_INT_STATUS_MASK,</div><div class='add'>+					 WM8350_IM_GP11_EINT);</div><div class='add'>+	case WM8350_IRQ_GPIO(12):</div><div class='add'>+		return wm8350_clear_bits(wm8350,</div><div class='add'>+					 WM8350_GPIO_INT_STATUS_MASK,</div><div class='add'>+					 WM8350_IM_GP12_EINT);</div><div class='add'>+	default:</div><div class='add'>+		dev_warn(wm8350-&gt;dev, "Attempting to unmask unknown IRQ %d\n",</div><div class='add'>+			 irq);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(wm8350_unmask_irq);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Cache is always host endian.</div><div class='add'>+ */</div><div class='add'>+static int wm8350_create_cache(struct wm8350 *wm8350, int mode)</div><div class='add'>+{</div><div class='add'>+	int i, ret = 0;</div><div class='add'>+	u16 value;</div><div class='add'>+	const u16 *reg_map;</div><div class='add'>+</div><div class='add'>+	switch (mode) {</div><div class='add'>+#ifdef CONFIG_MFD_WM8350_CONFIG_MODE_0</div><div class='add'>+	case 0:</div><div class='add'>+		reg_map = wm8350_mode0_defaults;</div><div class='add'>+		break;</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_MFD_WM8350_CONFIG_MODE_1</div><div class='add'>+	case 1:</div><div class='add'>+		reg_map = wm8350_mode1_defaults;</div><div class='add'>+		break;</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_MFD_WM8350_CONFIG_MODE_2</div><div class='add'>+	case 2:</div><div class='add'>+		reg_map = wm8350_mode2_defaults;</div><div class='add'>+		break;</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_MFD_WM8350_CONFIG_MODE_3</div><div class='add'>+	case 3:</div><div class='add'>+		reg_map = wm8350_mode3_defaults;</div><div class='add'>+		break;</div><div class='add'>+#endif</div><div class='add'>+	default:</div><div class='add'>+		dev_err(wm8350-&gt;dev, "Configuration mode %d not supported\n",</div><div class='add'>+			mode);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	wm8350-&gt;reg_cache =</div><div class='add'>+	    kzalloc(sizeof(u16) * (WM8350_MAX_REGISTER + 1), GFP_KERNEL);</div><div class='add'>+	if (wm8350-&gt;reg_cache == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* Read the initial cache state back from the device - this is</div><div class='add'>+	 * a PMIC so the device many not be in a virgin state and we</div><div class='add'>+	 * can't rely on the silicon values.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; WM8350_MAX_REGISTER; i++) {</div><div class='add'>+		/* audio register range */</div><div class='add'>+		if (wm8350_reg_io_map[i].readable &amp;&amp;</div><div class='add'>+		    (i &lt; WM8350_CLOCK_CONTROL_1 || i &gt; WM8350_AIF_TEST)) {</div><div class='add'>+			ret = wm8350-&gt;read_dev(wm8350, i, 2, (char *)&amp;value);</div><div class='add'>+			if (ret &lt; 0) {</div><div class='add'>+				dev_err(wm8350-&gt;dev,</div><div class='add'>+				       "failed to read initial cache value\n");</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+			value = be16_to_cpu(value);</div><div class='add'>+			value &amp;= wm8350_reg_io_map[i].readable;</div><div class='add'>+			wm8350-&gt;reg_cache[i] = value;</div><div class='add'>+		} else</div><div class='add'>+			wm8350-&gt;reg_cache[i] = reg_map[i];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(wm8350_create_cache);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Register a client device.  This is non-fatal since there is no need to</div><div class='add'>+ * fail the entire device init due to a single platform device failing.</div><div class='add'>+ */</div><div class='add'>+static void wm8350_client_dev_register(struct wm8350 *wm8350,</div><div class='add'>+				       const char *name,</div><div class='add'>+				       struct platform_device **pdev)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	*pdev = platform_device_alloc(name, -1);</div><div class='add'>+	if (pdev == NULL) {</div><div class='add'>+		dev_err(wm8350-&gt;dev, "Failed to allocate %s\n", name);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	(*pdev)-&gt;dev.parent = wm8350-&gt;dev;</div><div class='add'>+	platform_set_drvdata(*pdev, wm8350);</div><div class='add'>+	ret = platform_device_add(*pdev);</div><div class='add'>+	if (ret != 0) {</div><div class='add'>+		dev_err(wm8350-&gt;dev, "Failed to register %s: %d\n", name, ret);</div><div class='add'>+		platform_device_put(*pdev);</div><div class='add'>+		*pdev = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int wm8350_device_init(struct wm8350 *wm8350, int irq,</div><div class='add'>+		       struct wm8350_platform_data *pdata)</div><div class='add'>+{</div><div class='add'>+	int ret = -EINVAL;</div><div class='add'>+	u16 id1, id2, mask, mode;</div><div class='add'>+</div><div class='add'>+	/* get WM8350 revision and config mode */</div><div class='add'>+	wm8350-&gt;read_dev(wm8350, WM8350_RESET_ID, sizeof(id1), &amp;id1);</div><div class='add'>+	wm8350-&gt;read_dev(wm8350, WM8350_ID, sizeof(id2), &amp;id2);</div><div class='add'>+</div><div class='add'>+	id1 = be16_to_cpu(id1);</div><div class='add'>+	id2 = be16_to_cpu(id2);</div><div class='add'>+</div><div class='add'>+	if (id1 == 0x6143) {</div><div class='add'>+		switch ((id2 &amp; WM8350_CHIP_REV_MASK) &gt;&gt; 12) {</div><div class='add'>+		case WM8350_REV_E:</div><div class='add'>+			dev_info(wm8350-&gt;dev, "Found Rev E device\n");</div><div class='add'>+			wm8350-&gt;rev = WM8350_REV_E;</div><div class='add'>+			break;</div><div class='add'>+		case WM8350_REV_F:</div><div class='add'>+			dev_info(wm8350-&gt;dev, "Found Rev F device\n");</div><div class='add'>+			wm8350-&gt;rev = WM8350_REV_F;</div><div class='add'>+			break;</div><div class='add'>+		case WM8350_REV_G:</div><div class='add'>+			dev_info(wm8350-&gt;dev, "Found Rev G device\n");</div><div class='add'>+			wm8350-&gt;rev = WM8350_REV_G;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			/* For safety we refuse to run on unknown hardware */</div><div class='add'>+			dev_info(wm8350-&gt;dev, "Found unknown rev\n");</div><div class='add'>+			ret = -ENODEV;</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		dev_info(wm8350-&gt;dev, "Device with ID %x is not a WM8350\n",</div><div class='add'>+			 id1);</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mode = id2 &amp; WM8350_CONF_STS_MASK &gt;&gt; 10;</div><div class='add'>+	mask = id2 &amp; WM8350_CUST_ID_MASK;</div><div class='add'>+	dev_info(wm8350-&gt;dev, "Config mode %d, ROM mask %d\n", mode, mask);</div><div class='add'>+</div><div class='add'>+	ret = wm8350_create_cache(wm8350, mode);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		printk(KERN_ERR "wm8350: failed to create register cache\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pdata-&gt;init) {</div><div class='add'>+		ret = pdata-&gt;init(wm8350);</div><div class='add'>+		if (ret != 0) {</div><div class='add'>+			dev_err(wm8350-&gt;dev, "Platform init() failed: %d\n",</div><div class='add'>+				ret);</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_init(&amp;wm8350-&gt;irq_mutex);</div><div class='add'>+	INIT_WORK(&amp;wm8350-&gt;irq_work, wm8350_irq_worker);</div><div class='add'>+	if (irq != NO_IRQ) {</div><div class='add'>+		ret = request_irq(irq, wm8350_irq, 0,</div><div class='add'>+				  "wm8350", wm8350);</div><div class='add'>+		if (ret != 0) {</div><div class='add'>+			dev_err(wm8350-&gt;dev, "Failed to request IRQ: %d\n",</div><div class='add'>+				ret);</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		dev_err(wm8350-&gt;dev, "No IRQ configured\n");</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+	wm8350-&gt;chip_irq = irq;</div><div class='add'>+</div><div class='add'>+	wm8350_reg_write(wm8350, WM8350_SYSTEM_INTERRUPTS_MASK, 0x0);</div><div class='add'>+</div><div class='add'>+	wm8350_client_dev_register(wm8350, "wm8350-codec",</div><div class='add'>+				   &amp;(wm8350-&gt;codec.pdev));</div><div class='add'>+	wm8350_client_dev_register(wm8350, "wm8350-gpio",</div><div class='add'>+				   &amp;(wm8350-&gt;gpio.pdev));</div><div class='add'>+	wm8350_client_dev_register(wm8350, "wm8350-power",</div><div class='add'>+				   &amp;(wm8350-&gt;power.pdev));</div><div class='add'>+	wm8350_client_dev_register(wm8350, "wm8350-rtc", &amp;(wm8350-&gt;rtc.pdev));</div><div class='add'>+	wm8350_client_dev_register(wm8350, "wm8350-wdt", &amp;(wm8350-&gt;wdt.pdev));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	kfree(wm8350-&gt;reg_cache);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(wm8350_device_init);</div><div class='add'>+</div><div class='add'>+void wm8350_device_exit(struct wm8350 *wm8350)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(wm8350-&gt;pmic.pdev); i++)</div><div class='add'>+		platform_device_unregister(wm8350-&gt;pmic.pdev[i]);</div><div class='add'>+</div><div class='add'>+	platform_device_unregister(wm8350-&gt;wdt.pdev);</div><div class='add'>+	platform_device_unregister(wm8350-&gt;rtc.pdev);</div><div class='add'>+	platform_device_unregister(wm8350-&gt;power.pdev);</div><div class='add'>+	platform_device_unregister(wm8350-&gt;gpio.pdev);</div><div class='add'>+	platform_device_unregister(wm8350-&gt;codec.pdev);</div><div class='add'>+</div><div class='add'>+	free_irq(wm8350-&gt;chip_irq, wm8350);</div><div class='add'>+	flush_work(&amp;wm8350-&gt;irq_work);</div><div class='add'>+	kfree(wm8350-&gt;reg_cache);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(wm8350_device_exit);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("WM8350 AudioPlus PMIC core driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/mfd/wm8350-gpio.c b/drivers/mfd/wm8350-gpio.c<br/>new file mode 100644<br/>index 000000000000..ebf99bef392f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/mfd/wm8350-gpio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/mfd/wm8350-gpio.c</a></div><div class='hunk'>@@ -0,0 +1,222 @@</div><div class='add'>+/*</div><div class='add'>+ * wm8350-core.c  --  Device access for Wolfson WM8350</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2007, 2008 Wolfson Microelectronics PLC.</div><div class='add'>+ *</div><div class='add'>+ * Author: Liam Girdwood</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute  it and/or modify it</div><div class='add'>+ *  under  the terms of  the GNU General  Public License as published by the</div><div class='add'>+ *  Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='add'>+ *  option) any later version.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/mfd/wm8350/core.h&gt;</div><div class='add'>+#include &lt;linux/mfd/wm8350/gpio.h&gt;</div><div class='add'>+#include &lt;linux/mfd/wm8350/pmic.h&gt;</div><div class='add'>+</div><div class='add'>+static int gpio_set_dir(struct wm8350 *wm8350, int gpio, int dir)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	wm8350_reg_unlock(wm8350);</div><div class='add'>+	if (dir == WM8350_GPIO_DIR_OUT)</div><div class='add'>+		ret = wm8350_clear_bits(wm8350,</div><div class='add'>+					WM8350_GPIO_CONFIGURATION_I_O,</div><div class='add'>+					1 &lt;&lt; gpio);</div><div class='add'>+	else</div><div class='add'>+		ret = wm8350_set_bits(wm8350,</div><div class='add'>+				      WM8350_GPIO_CONFIGURATION_I_O,</div><div class='add'>+				      1 &lt;&lt; gpio);</div><div class='add'>+	wm8350_reg_lock(wm8350);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gpio_set_debounce(struct wm8350 *wm8350, int gpio, int db)</div><div class='add'>+{</div><div class='add'>+	if (db == WM8350_GPIO_DEBOUNCE_ON)</div><div class='add'>+		return wm8350_set_bits(wm8350, WM8350_GPIO_DEBOUNCE,</div><div class='add'>+				       1 &lt;&lt; gpio);</div><div class='add'>+	else</div><div class='add'>+		return wm8350_clear_bits(wm8350,</div><div class='add'>+					 WM8350_GPIO_DEBOUNCE, 1 &lt;&lt; gpio);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gpio_set_func(struct wm8350 *wm8350, int gpio, int func)</div><div class='add'>+{</div><div class='add'>+	u16 reg;</div><div class='add'>+</div><div class='add'>+	wm8350_reg_unlock(wm8350);</div><div class='add'>+	switch (gpio) {</div><div class='add'>+	case 0:</div><div class='add'>+		reg = wm8350_reg_read(wm8350, WM8350_GPIO_FUNCTION_SELECT_1)</div><div class='add'>+		    &amp; ~WM8350_GP0_FN_MASK;</div><div class='add'>+		wm8350_reg_write(wm8350, WM8350_GPIO_FUNCTION_SELECT_1,</div><div class='add'>+				 reg | ((func &amp; 0xf) &lt;&lt; 0));</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		reg = wm8350_reg_read(wm8350, WM8350_GPIO_FUNCTION_SELECT_1)</div><div class='add'>+		    &amp; ~WM8350_GP1_FN_MASK;</div><div class='add'>+		wm8350_reg_write(wm8350, WM8350_GPIO_FUNCTION_SELECT_1,</div><div class='add'>+				 reg | ((func &amp; 0xf) &lt;&lt; 4));</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		reg = wm8350_reg_read(wm8350, WM8350_GPIO_FUNCTION_SELECT_1)</div><div class='add'>+		    &amp; ~WM8350_GP2_FN_MASK;</div><div class='add'>+		wm8350_reg_write(wm8350, WM8350_GPIO_FUNCTION_SELECT_1,</div><div class='add'>+				 reg | ((func &amp; 0xf) &lt;&lt; 8));</div><div class='add'>+		break;</div><div class='add'>+	case 3:</div><div class='add'>+		reg = wm8350_reg_read(wm8350, WM8350_GPIO_FUNCTION_SELECT_1)</div><div class='add'>+		    &amp; ~WM8350_GP3_FN_MASK;</div><div class='add'>+		wm8350_reg_write(wm8350, WM8350_GPIO_FUNCTION_SELECT_1,</div><div class='add'>+				 reg | ((func &amp; 0xf) &lt;&lt; 12));</div><div class='add'>+		break;</div><div class='add'>+	case 4:</div><div class='add'>+		reg = wm8350_reg_read(wm8350, WM8350_GPIO_FUNCTION_SELECT_2)</div><div class='add'>+		    &amp; ~WM8350_GP4_FN_MASK;</div><div class='add'>+		wm8350_reg_write(wm8350, WM8350_GPIO_FUNCTION_SELECT_2,</div><div class='add'>+				 reg | ((func &amp; 0xf) &lt;&lt; 0));</div><div class='add'>+		break;</div><div class='add'>+	case 5:</div><div class='add'>+		reg = wm8350_reg_read(wm8350, WM8350_GPIO_FUNCTION_SELECT_2)</div><div class='add'>+		    &amp; ~WM8350_GP5_FN_MASK;</div><div class='add'>+		wm8350_reg_write(wm8350, WM8350_GPIO_FUNCTION_SELECT_2,</div><div class='add'>+				 reg | ((func &amp; 0xf) &lt;&lt; 4));</div><div class='add'>+		break;</div><div class='add'>+	case 6:</div><div class='add'>+		reg = wm8350_reg_read(wm8350, WM8350_GPIO_FUNCTION_SELECT_2)</div><div class='add'>+		    &amp; ~WM8350_GP6_FN_MASK;</div><div class='add'>+		wm8350_reg_write(wm8350, WM8350_GPIO_FUNCTION_SELECT_2,</div><div class='add'>+				 reg | ((func &amp; 0xf) &lt;&lt; 8));</div><div class='add'>+		break;</div><div class='add'>+	case 7:</div><div class='add'>+		reg = wm8350_reg_read(wm8350, WM8350_GPIO_FUNCTION_SELECT_2)</div><div class='add'>+		    &amp; ~WM8350_GP7_FN_MASK;</div><div class='add'>+		wm8350_reg_write(wm8350, WM8350_GPIO_FUNCTION_SELECT_2,</div><div class='add'>+				 reg | ((func &amp; 0xf) &lt;&lt; 12));</div><div class='add'>+		break;</div><div class='add'>+	case 8:</div><div class='add'>+		reg = wm8350_reg_read(wm8350, WM8350_GPIO_FUNCTION_SELECT_3)</div><div class='add'>+		    &amp; ~WM8350_GP8_FN_MASK;</div><div class='add'>+		wm8350_reg_write(wm8350, WM8350_GPIO_FUNCTION_SELECT_3,</div><div class='add'>+				 reg | ((func &amp; 0xf) &lt;&lt; 0));</div><div class='add'>+		break;</div><div class='add'>+	case 9:</div><div class='add'>+		reg = wm8350_reg_read(wm8350, WM8350_GPIO_FUNCTION_SELECT_3)</div><div class='add'>+		    &amp; ~WM8350_GP9_FN_MASK;</div><div class='add'>+		wm8350_reg_write(wm8350, WM8350_GPIO_FUNCTION_SELECT_3,</div><div class='add'>+				 reg | ((func &amp; 0xf) &lt;&lt; 4));</div><div class='add'>+		break;</div><div class='add'>+	case 10:</div><div class='add'>+		reg = wm8350_reg_read(wm8350, WM8350_GPIO_FUNCTION_SELECT_3)</div><div class='add'>+		    &amp; ~WM8350_GP10_FN_MASK;</div><div class='add'>+		wm8350_reg_write(wm8350, WM8350_GPIO_FUNCTION_SELECT_3,</div><div class='add'>+				 reg | ((func &amp; 0xf) &lt;&lt; 8));</div><div class='add'>+		break;</div><div class='add'>+	case 11:</div><div class='add'>+		reg = wm8350_reg_read(wm8350, WM8350_GPIO_FUNCTION_SELECT_3)</div><div class='add'>+		    &amp; ~WM8350_GP11_FN_MASK;</div><div class='add'>+		wm8350_reg_write(wm8350, WM8350_GPIO_FUNCTION_SELECT_3,</div><div class='add'>+				 reg | ((func &amp; 0xf) &lt;&lt; 12));</div><div class='add'>+		break;</div><div class='add'>+	case 12:</div><div class='add'>+		reg = wm8350_reg_read(wm8350, WM8350_GPIO_FUNCTION_SELECT_4)</div><div class='add'>+		    &amp; ~WM8350_GP12_FN_MASK;</div><div class='add'>+		wm8350_reg_write(wm8350, WM8350_GPIO_FUNCTION_SELECT_4,</div><div class='add'>+				 reg | ((func &amp; 0xf) &lt;&lt; 0));</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		wm8350_reg_lock(wm8350);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	wm8350_reg_lock(wm8350);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gpio_set_pull_up(struct wm8350 *wm8350, int gpio, int up)</div><div class='add'>+{</div><div class='add'>+	if (up)</div><div class='add'>+		return wm8350_set_bits(wm8350,</div><div class='add'>+				       WM8350_GPIO_PIN_PULL_UP_CONTROL,</div><div class='add'>+				       1 &lt;&lt; gpio);</div><div class='add'>+	else</div><div class='add'>+		return wm8350_clear_bits(wm8350,</div><div class='add'>+					 WM8350_GPIO_PIN_PULL_UP_CONTROL,</div><div class='add'>+					 1 &lt;&lt; gpio);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gpio_set_pull_down(struct wm8350 *wm8350, int gpio, int down)</div><div class='add'>+{</div><div class='add'>+	if (down)</div><div class='add'>+		return wm8350_set_bits(wm8350,</div><div class='add'>+				       WM8350_GPIO_PULL_DOWN_CONTROL,</div><div class='add'>+				       1 &lt;&lt; gpio);</div><div class='add'>+	else</div><div class='add'>+		return wm8350_clear_bits(wm8350,</div><div class='add'>+					 WM8350_GPIO_PULL_DOWN_CONTROL,</div><div class='add'>+					 1 &lt;&lt; gpio);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gpio_set_polarity(struct wm8350 *wm8350, int gpio, int pol)</div><div class='add'>+{</div><div class='add'>+	if (pol == WM8350_GPIO_ACTIVE_HIGH)</div><div class='add'>+		return wm8350_set_bits(wm8350,</div><div class='add'>+				       WM8350_GPIO_PIN_POLARITY_TYPE,</div><div class='add'>+				       1 &lt;&lt; gpio);</div><div class='add'>+	else</div><div class='add'>+		return wm8350_clear_bits(wm8350,</div><div class='add'>+					 WM8350_GPIO_PIN_POLARITY_TYPE,</div><div class='add'>+					 1 &lt;&lt; gpio);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gpio_set_invert(struct wm8350 *wm8350, int gpio, int invert)</div><div class='add'>+{</div><div class='add'>+	if (invert == WM8350_GPIO_INVERT_ON)</div><div class='add'>+		return wm8350_set_bits(wm8350, WM8350_GPIO_INT_MODE, 1 &lt;&lt; gpio);</div><div class='add'>+	else</div><div class='add'>+		return wm8350_clear_bits(wm8350,</div><div class='add'>+					 WM8350_GPIO_INT_MODE, 1 &lt;&lt; gpio);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int wm8350_gpio_config(struct wm8350 *wm8350, int gpio, int dir, int func,</div><div class='add'>+		       int pol, int pull, int invert, int debounce)</div><div class='add'>+{</div><div class='add'>+	/* make sure we never pull up and down at the same time */</div><div class='add'>+	if (pull == WM8350_GPIO_PULL_NONE) {</div><div class='add'>+		if (gpio_set_pull_up(wm8350, gpio, 0))</div><div class='add'>+			goto err;</div><div class='add'>+		if (gpio_set_pull_down(wm8350, gpio, 0))</div><div class='add'>+			goto err;</div><div class='add'>+	} else if (pull == WM8350_GPIO_PULL_UP) {</div><div class='add'>+		if (gpio_set_pull_down(wm8350, gpio, 0))</div><div class='add'>+			goto err;</div><div class='add'>+		if (gpio_set_pull_up(wm8350, gpio, 1))</div><div class='add'>+			goto err;</div><div class='add'>+	} else if (pull == WM8350_GPIO_PULL_DOWN) {</div><div class='add'>+		if (gpio_set_pull_up(wm8350, gpio, 0))</div><div class='add'>+			goto err;</div><div class='add'>+		if (gpio_set_pull_down(wm8350, gpio, 1))</div><div class='add'>+			goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (gpio_set_invert(wm8350, gpio, invert))</div><div class='add'>+		goto err;</div><div class='add'>+	if (gpio_set_polarity(wm8350, gpio, pol))</div><div class='add'>+		goto err;</div><div class='add'>+	if (gpio_set_debounce(wm8350, gpio, debounce))</div><div class='add'>+		goto err;</div><div class='add'>+	if (gpio_set_dir(wm8350, gpio, dir))</div><div class='add'>+		goto err;</div><div class='add'>+	return gpio_set_func(wm8350, gpio, func);</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	return -EIO;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(wm8350_gpio_config);</div><div class='head'>diff --git a/drivers/mfd/wm8350-i2c.c b/drivers/mfd/wm8350-i2c.c<br/>new file mode 100644<br/>index 000000000000..8dfe21bb3bd1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/mfd/wm8350-i2c.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/mfd/wm8350-i2c.c</a></div><div class='hunk'>@@ -0,0 +1,120 @@</div><div class='add'>+/*</div><div class='add'>+ * wm8350-i2c.c  --  Generic I2C driver for Wolfson WM8350 PMIC</div><div class='add'>+ *</div><div class='add'>+ * This driver defines and configures the WM8350 for the Freescale i.MX32ADS.</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2007, 2008 Wolfson Microelectronics PLC.</div><div class='add'>+ *</div><div class='add'>+ * Author: Liam Girdwood</div><div class='add'>+ *         linux@wolfsonmicro.com</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute  it and/or modify it</div><div class='add'>+ *  under  the terms of  the GNU General  Public License as published by the</div><div class='add'>+ *  Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='add'>+ *  option) any later version.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/mfd/wm8350/core.h&gt;</div><div class='add'>+</div><div class='add'>+static int wm8350_i2c_read_device(struct wm8350 *wm8350, char reg,</div><div class='add'>+				  int bytes, void *dest)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = i2c_master_send(wm8350-&gt;i2c_client, &amp;reg, 1);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	return i2c_master_recv(wm8350-&gt;i2c_client, dest, bytes);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wm8350_i2c_write_device(struct wm8350 *wm8350, char reg,</div><div class='add'>+				   int bytes, void *src)</div><div class='add'>+{</div><div class='add'>+	/* we add 1 byte for device register */</div><div class='add'>+	u8 msg[(WM8350_MAX_REGISTER &lt;&lt; 1) + 1];</div><div class='add'>+</div><div class='add'>+	if (bytes &gt; ((WM8350_MAX_REGISTER &lt;&lt; 1) + 1))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	msg[0] = reg;</div><div class='add'>+	memcpy(&amp;msg[1], src, bytes);</div><div class='add'>+	return i2c_master_send(wm8350-&gt;i2c_client, msg, bytes + 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wm8350_i2c_probe(struct i2c_client *i2c,</div><div class='add'>+			    const struct i2c_device_id *id)</div><div class='add'>+{</div><div class='add'>+	struct wm8350 *wm8350;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	wm8350 = kzalloc(sizeof(struct wm8350), GFP_KERNEL);</div><div class='add'>+	if (wm8350 == NULL) {</div><div class='add'>+		kfree(i2c);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	i2c_set_clientdata(i2c, wm8350);</div><div class='add'>+	wm8350-&gt;dev = &amp;i2c-&gt;dev;</div><div class='add'>+	wm8350-&gt;i2c_client = i2c;</div><div class='add'>+	wm8350-&gt;read_dev = wm8350_i2c_read_device;</div><div class='add'>+	wm8350-&gt;write_dev = wm8350_i2c_write_device;</div><div class='add'>+</div><div class='add'>+	ret = wm8350_device_init(wm8350, i2c-&gt;irq, i2c-&gt;dev.platform_data);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	kfree(wm8350);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wm8350_i2c_remove(struct i2c_client *i2c)</div><div class='add'>+{</div><div class='add'>+	struct wm8350 *wm8350 = i2c_get_clientdata(i2c);</div><div class='add'>+</div><div class='add'>+	wm8350_device_exit(wm8350);</div><div class='add'>+	kfree(wm8350);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct i2c_device_id wm8350_i2c_id[] = {</div><div class='add'>+       { "wm8350", 0 },</div><div class='add'>+       { }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(i2c, wm8350_i2c_id);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static struct i2c_driver wm8350_i2c_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		   .name = "wm8350",</div><div class='add'>+		   .owner = THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+	.probe = wm8350_i2c_probe,</div><div class='add'>+	.remove = wm8350_i2c_remove,</div><div class='add'>+	.id_table = wm8350_i2c_id,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init wm8350_i2c_init(void)</div><div class='add'>+{</div><div class='add'>+	return i2c_add_driver(&amp;wm8350_i2c_driver);</div><div class='add'>+}</div><div class='add'>+/* init early so consumer devices can complete system boot */</div><div class='add'>+subsys_initcall(wm8350_i2c_init);</div><div class='add'>+</div><div class='add'>+static void __exit wm8350_i2c_exit(void)</div><div class='add'>+{</div><div class='add'>+	i2c_del_driver(&amp;wm8350_i2c_driver);</div><div class='add'>+}</div><div class='add'>+module_exit(wm8350_i2c_exit);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("I2C support for the WM8350 AudioPlus PMIC");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/mfd/wm8350-regmap.c b/drivers/mfd/wm8350-regmap.c<br/>new file mode 100644<br/>index 000000000000..974678db22cd<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/mfd/wm8350-regmap.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/mfd/wm8350-regmap.c</a></div><div class='hunk'>@@ -0,0 +1,1347 @@</div><div class='add'>+/*</div><div class='add'>+ * wm8350-regmap.c  --  Wolfson Microelectronics WM8350 register map</div><div class='add'>+ *</div><div class='add'>+ * This file splits out the tables describing the defaults and access</div><div class='add'>+ * status of the WM8350 registers since they are rather large.</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2007, 2008 Wolfson Microelectronics PLC.</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute  it and/or modify it</div><div class='add'>+ *  under  the terms of  the GNU General  Public License as published by the</div><div class='add'>+ *  Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='add'>+ *  option) any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/mfd/wm8350/core.h&gt;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_MFD_WM8350_CONFIG_MODE_0</div><div class='add'>+</div><div class='add'>+#undef WM8350_HAVE_CONFIG_MODE</div><div class='add'>+#define WM8350_HAVE_CONFIG_MODE</div><div class='add'>+</div><div class='add'>+const u16 wm8350_mode0_defaults[] = {</div><div class='add'>+	0x17FF,     /* R0   - Reset/ID */</div><div class='add'>+	0x1000,     /* R1   - ID */</div><div class='add'>+	0x0000,     /* R2 */</div><div class='add'>+	0x1002,     /* R3   - System Control 1 */</div><div class='add'>+	0x0004,     /* R4   - System Control 2 */</div><div class='add'>+	0x0000,     /* R5   - System Hibernate */</div><div class='add'>+	0x8A00,     /* R6   - Interface Control */</div><div class='add'>+	0x0000,     /* R7 */</div><div class='add'>+	0x8000,     /* R8   - Power mgmt (1) */</div><div class='add'>+	0x0000,     /* R9   - Power mgmt (2) */</div><div class='add'>+	0x0000,     /* R10  - Power mgmt (3) */</div><div class='add'>+	0x2000,     /* R11  - Power mgmt (4) */</div><div class='add'>+	0x0E00,     /* R12  - Power mgmt (5) */</div><div class='add'>+	0x0000,     /* R13  - Power mgmt (6) */</div><div class='add'>+	0x0000,     /* R14  - Power mgmt (7) */</div><div class='add'>+	0x0000,     /* R15 */</div><div class='add'>+	0x0000,     /* R16  - RTC Seconds/Minutes */</div><div class='add'>+	0x0100,     /* R17  - RTC Hours/Day */</div><div class='add'>+	0x0101,     /* R18  - RTC Date/Month */</div><div class='add'>+	0x1400,     /* R19  - RTC Year */</div><div class='add'>+	0x0000,     /* R20  - Alarm Seconds/Minutes */</div><div class='add'>+	0x0000,     /* R21  - Alarm Hours/Day */</div><div class='add'>+	0x0000,     /* R22  - Alarm Date/Month */</div><div class='add'>+	0x0320,     /* R23  - RTC Time Control */</div><div class='add'>+	0x0000,     /* R24  - System Interrupts */</div><div class='add'>+	0x0000,     /* R25  - Interrupt Status 1 */</div><div class='add'>+	0x0000,     /* R26  - Interrupt Status 2 */</div><div class='add'>+	0x0000,     /* R27  - Power Up Interrupt Status */</div><div class='add'>+	0x0000,     /* R28  - Under Voltage Interrupt status */</div><div class='add'>+	0x0000,     /* R29  - Over Current Interrupt status */</div><div class='add'>+	0x0000,     /* R30  - GPIO Interrupt Status */</div><div class='add'>+	0x0000,     /* R31  - Comparator Interrupt Status */</div><div class='add'>+	0x3FFF,     /* R32  - System Interrupts Mask */</div><div class='add'>+	0x0000,     /* R33  - Interrupt Status 1 Mask */</div><div class='add'>+	0x0000,     /* R34  - Interrupt Status 2 Mask */</div><div class='add'>+	0x0000,     /* R35  - Power Up Interrupt Status Mask */</div><div class='add'>+	0x0000,     /* R36  - Under Voltage Interrupt status Mask */</div><div class='add'>+	0x0000,     /* R37  - Over Current Interrupt status Mask */</div><div class='add'>+	0x0000,     /* R38  - GPIO Interrupt Status Mask */</div><div class='add'>+	0x0000,     /* R39  - Comparator Interrupt Status Mask */</div><div class='add'>+	0x0040,     /* R40  - Clock Control 1 */</div><div class='add'>+	0x0000,     /* R41  - Clock Control 2 */</div><div class='add'>+	0x3B00,     /* R42  - FLL Control 1 */</div><div class='add'>+	0x7086,     /* R43  - FLL Control 2 */</div><div class='add'>+	0xC226,     /* R44  - FLL Control 3 */</div><div class='add'>+	0x0000,     /* R45  - FLL Control 4 */</div><div class='add'>+	0x0000,     /* R46 */</div><div class='add'>+	0x0000,     /* R47 */</div><div class='add'>+	0x0000,     /* R48  - DAC Control */</div><div class='add'>+	0x0000,     /* R49 */</div><div class='add'>+	0x00C0,     /* R50  - DAC Digital Volume L */</div><div class='add'>+	0x00C0,     /* R51  - DAC Digital Volume R */</div><div class='add'>+	0x0000,     /* R52 */</div><div class='add'>+	0x0040,     /* R53  - DAC LR Rate */</div><div class='add'>+	0x0000,     /* R54  - DAC Clock Control */</div><div class='add'>+	0x0000,     /* R55 */</div><div class='add'>+	0x0000,     /* R56 */</div><div class='add'>+	0x0000,     /* R57 */</div><div class='add'>+	0x4000,     /* R58  - DAC Mute */</div><div class='add'>+	0x0000,     /* R59  - DAC Mute Volume */</div><div class='add'>+	0x0000,     /* R60  - DAC Side */</div><div class='add'>+	0x0000,     /* R61 */</div><div class='add'>+	0x0000,     /* R62 */</div><div class='add'>+	0x0000,     /* R63 */</div><div class='add'>+	0x8000,     /* R64  - ADC Control */</div><div class='add'>+	0x0000,     /* R65 */</div><div class='add'>+	0x00C0,     /* R66  - ADC Digital Volume L */</div><div class='add'>+	0x00C0,     /* R67  - ADC Digital Volume R */</div><div class='add'>+	0x0000,     /* R68  - ADC Divider */</div><div class='add'>+	0x0000,     /* R69 */</div><div class='add'>+	0x0040,     /* R70  - ADC LR Rate */</div><div class='add'>+	0x0000,     /* R71 */</div><div class='add'>+	0x0303,     /* R72  - Input Control */</div><div class='add'>+	0x0000,     /* R73  - IN3 Input Control */</div><div class='add'>+	0x0000,     /* R74  - Mic Bias Control */</div><div class='add'>+	0x0000,     /* R75 */</div><div class='add'>+	0x0000,     /* R76  - Output Control */</div><div class='add'>+	0x0000,     /* R77  - Jack Detect */</div><div class='add'>+	0x0000,     /* R78  - Anti Pop Control */</div><div class='add'>+	0x0000,     /* R79 */</div><div class='add'>+	0x0040,     /* R80  - Left Input Volume */</div><div class='add'>+	0x0040,     /* R81  - Right Input Volume */</div><div class='add'>+	0x0000,     /* R82 */</div><div class='add'>+	0x0000,     /* R83 */</div><div class='add'>+	0x0000,     /* R84 */</div><div class='add'>+	0x0000,     /* R85 */</div><div class='add'>+	0x0000,     /* R86 */</div><div class='add'>+	0x0000,     /* R87 */</div><div class='add'>+	0x0800,     /* R88  - Left Mixer Control */</div><div class='add'>+	0x1000,     /* R89  - Right Mixer Control */</div><div class='add'>+	0x0000,     /* R90 */</div><div class='add'>+	0x0000,     /* R91 */</div><div class='add'>+	0x0000,     /* R92  - OUT3 Mixer Control */</div><div class='add'>+	0x0000,     /* R93  - OUT4 Mixer Control */</div><div class='add'>+	0x0000,     /* R94 */</div><div class='add'>+	0x0000,     /* R95 */</div><div class='add'>+	0x0000,     /* R96  - Output Left Mixer Volume */</div><div class='add'>+	0x0000,     /* R97  - Output Right Mixer Volume */</div><div class='add'>+	0x0000,     /* R98  - Input Mixer Volume L */</div><div class='add'>+	0x0000,     /* R99  - Input Mixer Volume R */</div><div class='add'>+	0x0000,     /* R100 - Input Mixer Volume */</div><div class='add'>+	0x0000,     /* R101 */</div><div class='add'>+	0x0000,     /* R102 */</div><div class='add'>+	0x0000,     /* R103 */</div><div class='add'>+	0x00E4,     /* R104 - LOUT1 Volume */</div><div class='add'>+	0x00E4,     /* R105 - ROUT1 Volume */</div><div class='add'>+	0x00E4,     /* R106 - LOUT2 Volume */</div><div class='add'>+	0x02E4,     /* R107 - ROUT2 Volume */</div><div class='add'>+	0x0000,     /* R108 */</div><div class='add'>+	0x0000,     /* R109 */</div><div class='add'>+	0x0000,     /* R110 */</div><div class='add'>+	0x0000,     /* R111 - BEEP Volume */</div><div class='add'>+	0x0A00,     /* R112 - AI Formating */</div><div class='add'>+	0x0000,     /* R113 - ADC DAC COMP */</div><div class='add'>+	0x0020,     /* R114 - AI ADC Control */</div><div class='add'>+	0x0020,     /* R115 - AI DAC Control */</div><div class='add'>+	0x0000,     /* R116 - AIF Test */</div><div class='add'>+	0x0000,     /* R117 */</div><div class='add'>+	0x0000,     /* R118 */</div><div class='add'>+	0x0000,     /* R119 */</div><div class='add'>+	0x0000,     /* R120 */</div><div class='add'>+	0x0000,     /* R121 */</div><div class='add'>+	0x0000,     /* R122 */</div><div class='add'>+	0x0000,     /* R123 */</div><div class='add'>+	0x0000,     /* R124 */</div><div class='add'>+	0x0000,     /* R125 */</div><div class='add'>+	0x0000,     /* R126 */</div><div class='add'>+	0x0000,     /* R127 */</div><div class='add'>+	0x1FFF,     /* R128 - GPIO Debounce */</div><div class='add'>+	0x0000,     /* R129 - GPIO Pin pull up Control */</div><div class='add'>+	0x03FC,     /* R130 - GPIO Pull down Control */</div><div class='add'>+	0x0000,     /* R131 - GPIO Interrupt Mode */</div><div class='add'>+	0x0000,     /* R132 */</div><div class='add'>+	0x0000,     /* R133 - GPIO Control */</div><div class='add'>+	0x0FFC,     /* R134 - GPIO Configuration (i/o) */</div><div class='add'>+	0x0FFC,     /* R135 - GPIO Pin Polarity / Type */</div><div class='add'>+	0x0000,     /* R136 */</div><div class='add'>+	0x0000,     /* R137 */</div><div class='add'>+	0x0000,     /* R138 */</div><div class='add'>+	0x0000,     /* R139 */</div><div class='add'>+	0x0013,     /* R140 - GPIO Function Select 1 */</div><div class='add'>+	0x0000,     /* R141 - GPIO Function Select 2 */</div><div class='add'>+	0x0000,     /* R142 - GPIO Function Select 3 */</div><div class='add'>+	0x0003,     /* R143 - GPIO Function Select 4 */</div><div class='add'>+	0x0000,     /* R144 - Digitiser Control (1) */</div><div class='add'>+	0x0002,     /* R145 - Digitiser Control (2) */</div><div class='add'>+	0x0000,     /* R146 */</div><div class='add'>+	0x0000,     /* R147 */</div><div class='add'>+	0x0000,     /* R148 */</div><div class='add'>+	0x0000,     /* R149 */</div><div class='add'>+	0x0000,     /* R150 */</div><div class='add'>+	0x0000,     /* R151 */</div><div class='add'>+	0x7000,     /* R152 - AUX1 Readback */</div><div class='add'>+	0x7000,     /* R153 - AUX2 Readback */</div><div class='add'>+	0x7000,     /* R154 - AUX3 Readback */</div><div class='add'>+	0x7000,     /* R155 - AUX4 Readback */</div><div class='add'>+	0x0000,     /* R156 - USB Voltage Readback */</div><div class='add'>+	0x0000,     /* R157 - LINE Voltage Readback */</div><div class='add'>+	0x0000,     /* R158 - BATT Voltage Readback */</div><div class='add'>+	0x0000,     /* R159 - Chip Temp Readback */</div><div class='add'>+	0x0000,     /* R160 */</div><div class='add'>+	0x0000,     /* R161 */</div><div class='add'>+	0x0000,     /* R162 */</div><div class='add'>+	0x0000,     /* R163 - Generic Comparator Control */</div><div class='add'>+	0x0000,     /* R164 - Generic comparator 1 */</div><div class='add'>+	0x0000,     /* R165 - Generic comparator 2 */</div><div class='add'>+	0x0000,     /* R166 - Generic comparator 3 */</div><div class='add'>+	0x0000,     /* R167 - Generic comparator 4 */</div><div class='add'>+	0xA00F,     /* R168 - Battery Charger Control 1 */</div><div class='add'>+	0x0B06,     /* R169 - Battery Charger Control 2 */</div><div class='add'>+	0x0000,     /* R170 - Battery Charger Control 3 */</div><div class='add'>+	0x0000,     /* R171 */</div><div class='add'>+	0x0000,     /* R172 - Current Sink Driver A */</div><div class='add'>+	0x0000,     /* R173 - CSA Flash control */</div><div class='add'>+	0x0000,     /* R174 - Current Sink Driver B */</div><div class='add'>+	0x0000,     /* R175 - CSB Flash control */</div><div class='add'>+	0x0000,     /* R176 - DCDC/LDO requested */</div><div class='add'>+	0x002D,     /* R177 - DCDC Active options */</div><div class='add'>+	0x0000,     /* R178 - DCDC Sleep options */</div><div class='add'>+	0x0025,     /* R179 - Power-check comparator */</div><div class='add'>+	0x000E,     /* R180 - DCDC1 Control */</div><div class='add'>+	0x0000,     /* R181 - DCDC1 Timeouts */</div><div class='add'>+	0x1006,     /* R182 - DCDC1 Low Power */</div><div class='add'>+	0x0018,     /* R183 - DCDC2 Control */</div><div class='add'>+	0x0000,     /* R184 - DCDC2 Timeouts */</div><div class='add'>+	0x0000,     /* R185 */</div><div class='add'>+	0x0000,     /* R186 - DCDC3 Control */</div><div class='add'>+	0x0000,     /* R187 - DCDC3 Timeouts */</div><div class='add'>+	0x0006,     /* R188 - DCDC3 Low Power */</div><div class='add'>+	0x0000,     /* R189 - DCDC4 Control */</div><div class='add'>+	0x0000,     /* R190 - DCDC4 Timeouts */</div><div class='add'>+	0x0006,     /* R191 - DCDC4 Low Power */</div><div class='add'>+	0x0008,     /* R192 - DCDC5 Control */</div><div class='add'>+	0x0000,     /* R193 - DCDC5 Timeouts */</div><div class='add'>+	0x0000,     /* R194 */</div><div class='add'>+	0x0000,     /* R195 - DCDC6 Control */</div><div class='add'>+	0x0000,     /* R196 - DCDC6 Timeouts */</div><div class='add'>+	0x0006,     /* R197 - DCDC6 Low Power */</div><div class='add'>+	0x0000,     /* R198 */</div><div class='add'>+	0x0003,     /* R199 - Limit Switch Control */</div><div class='add'>+	0x001C,     /* R200 - LDO1 Control */</div><div class='add'>+	0x0000,     /* R201 - LDO1 Timeouts */</div><div class='add'>+	0x001C,     /* R202 - LDO1 Low Power */</div><div class='add'>+	0x001B,     /* R203 - LDO2 Control */</div><div class='add'>+	0x0000,     /* R204 - LDO2 Timeouts */</div><div class='add'>+	0x001C,     /* R205 - LDO2 Low Power */</div><div class='add'>+	0x001B,     /* R206 - LDO3 Control */</div><div class='add'>+	0x0000,     /* R207 - LDO3 Timeouts */</div><div class='add'>+	0x001C,     /* R208 - LDO3 Low Power */</div><div class='add'>+	0x001B,     /* R209 - LDO4 Control */</div><div class='add'>+	0x0000,     /* R210 - LDO4 Timeouts */</div><div class='add'>+	0x001C,     /* R211 - LDO4 Low Power */</div><div class='add'>+	0x0000,     /* R212 */</div><div class='add'>+	0x0000,     /* R213 */</div><div class='add'>+	0x0000,     /* R214 */</div><div class='add'>+	0x0000,     /* R215 - VCC_FAULT Masks */</div><div class='add'>+	0x001F,     /* R216 - Main Bandgap Control */</div><div class='add'>+	0x0000,     /* R217 - OSC Control */</div><div class='add'>+	0x9000,     /* R218 - RTC Tick Control */</div><div class='add'>+	0x0000,     /* R219 */</div><div class='add'>+	0x4000,     /* R220 - RAM BIST 1 */</div><div class='add'>+	0x0000,     /* R221 */</div><div class='add'>+	0x0000,     /* R222 */</div><div class='add'>+	0x0000,     /* R223 */</div><div class='add'>+	0x0000,     /* R224 */</div><div class='add'>+	0x0000,     /* R225 - DCDC/LDO status */</div><div class='add'>+	0x0000,     /* R226 */</div><div class='add'>+	0x0000,     /* R227 */</div><div class='add'>+	0x0000,     /* R228 */</div><div class='add'>+	0x0000,     /* R229 */</div><div class='add'>+	0xE000,     /* R230 - GPIO Pin Status */</div><div class='add'>+	0x0000,     /* R231 */</div><div class='add'>+	0x0000,     /* R232 */</div><div class='add'>+	0x0000,     /* R233 */</div><div class='add'>+	0x0000,     /* R234 */</div><div class='add'>+	0x0000,     /* R235 */</div><div class='add'>+	0x0000,     /* R236 */</div><div class='add'>+	0x0000,     /* R237 */</div><div class='add'>+	0x0000,     /* R238 */</div><div class='add'>+	0x0000,     /* R239 */</div><div class='add'>+	0x0000,     /* R240 */</div><div class='add'>+	0x0000,     /* R241 */</div><div class='add'>+	0x0000,     /* R242 */</div><div class='add'>+	0x0000,     /* R243 */</div><div class='add'>+	0x0000,     /* R244 */</div><div class='add'>+	0x0000,     /* R245 */</div><div class='add'>+	0x0000,     /* R246 */</div><div class='add'>+	0x0000,     /* R247 */</div><div class='add'>+	0x0000,     /* R248 */</div><div class='add'>+	0x0000,     /* R249 */</div><div class='add'>+	0x0000,     /* R250 */</div><div class='add'>+	0x0000,     /* R251 */</div><div class='add'>+	0x0000,     /* R252 */</div><div class='add'>+	0x0000,     /* R253 */</div><div class='add'>+	0x0000,     /* R254 */</div><div class='add'>+	0x0000,     /* R255 */</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_MFD_WM8350_CONFIG_MODE_1</div><div class='add'>+</div><div class='add'>+#undef WM8350_HAVE_CONFIG_MODE</div><div class='add'>+#define WM8350_HAVE_CONFIG_MODE</div><div class='add'>+</div><div class='add'>+const u16 wm8350_mode1_defaults[] = {</div><div class='add'>+	0x17FF,     /* R0   - Reset/ID */</div><div class='add'>+	0x1000,     /* R1   - ID */</div><div class='add'>+	0x0000,     /* R2 */</div><div class='add'>+	0x1002,     /* R3   - System Control 1 */</div><div class='add'>+	0x0014,     /* R4   - System Control 2 */</div><div class='add'>+	0x0000,     /* R5   - System Hibernate */</div><div class='add'>+	0x8A00,     /* R6   - Interface Control */</div><div class='add'>+	0x0000,     /* R7 */</div><div class='add'>+	0x8000,     /* R8   - Power mgmt (1) */</div><div class='add'>+	0x0000,     /* R9   - Power mgmt (2) */</div><div class='add'>+	0x0000,     /* R10  - Power mgmt (3) */</div><div class='add'>+	0x2000,     /* R11  - Power mgmt (4) */</div><div class='add'>+	0x0E00,     /* R12  - Power mgmt (5) */</div><div class='add'>+	0x0000,     /* R13  - Power mgmt (6) */</div><div class='add'>+	0x0000,     /* R14  - Power mgmt (7) */</div><div class='add'>+	0x0000,     /* R15 */</div><div class='add'>+	0x0000,     /* R16  - RTC Seconds/Minutes */</div><div class='add'>+	0x0100,     /* R17  - RTC Hours/Day */</div><div class='add'>+	0x0101,     /* R18  - RTC Date/Month */</div><div class='add'>+	0x1400,     /* R19  - RTC Year */</div><div class='add'>+	0x0000,     /* R20  - Alarm Seconds/Minutes */</div><div class='add'>+	0x0000,     /* R21  - Alarm Hours/Day */</div><div class='add'>+	0x0000,     /* R22  - Alarm Date/Month */</div><div class='add'>+	0x0320,     /* R23  - RTC Time Control */</div><div class='add'>+	0x0000,     /* R24  - System Interrupts */</div><div class='add'>+	0x0000,     /* R25  - Interrupt Status 1 */</div><div class='add'>+	0x0000,     /* R26  - Interrupt Status 2 */</div><div class='add'>+	0x0000,     /* R27  - Power Up Interrupt Status */</div><div class='add'>+	0x0000,     /* R28  - Under Voltage Interrupt status */</div><div class='add'>+	0x0000,     /* R29  - Over Current Interrupt status */</div><div class='add'>+	0x0000,     /* R30  - GPIO Interrupt Status */</div><div class='add'>+	0x0000,     /* R31  - Comparator Interrupt Status */</div><div class='add'>+	0x3FFF,     /* R32  - System Interrupts Mask */</div><div class='add'>+	0x0000,     /* R33  - Interrupt Status 1 Mask */</div><div class='add'>+	0x0000,     /* R34  - Interrupt Status 2 Mask */</div><div class='add'>+	0x0000,     /* R35  - Power Up Interrupt Status Mask */</div><div class='add'>+	0x0000,     /* R36  - Under Voltage Interrupt status Mask */</div><div class='add'>+	0x0000,     /* R37  - Over Current Interrupt status Mask */</div><div class='add'>+	0x0000,     /* R38  - GPIO Interrupt Status Mask */</div><div class='add'>+	0x0000,     /* R39  - Comparator Interrupt Status Mask */</div><div class='add'>+	0x0040,     /* R40  - Clock Control 1 */</div><div class='add'>+	0x0000,     /* R41  - Clock Control 2 */</div><div class='add'>+	0x3B00,     /* R42  - FLL Control 1 */</div><div class='add'>+	0x7086,     /* R43  - FLL Control 2 */</div><div class='add'>+	0xC226,     /* R44  - FLL Control 3 */</div><div class='add'>+	0x0000,     /* R45  - FLL Control 4 */</div><div class='add'>+	0x0000,     /* R46 */</div><div class='add'>+	0x0000,     /* R47 */</div><div class='add'>+	0x0000,     /* R48  - DAC Control */</div><div class='add'>+	0x0000,     /* R49 */</div><div class='add'>+	0x00C0,     /* R50  - DAC Digital Volume L */</div><div class='add'>+	0x00C0,     /* R51  - DAC Digital Volume R */</div><div class='add'>+	0x0000,     /* R52 */</div><div class='add'>+	0x0040,     /* R53  - DAC LR Rate */</div><div class='add'>+	0x0000,     /* R54  - DAC Clock Control */</div><div class='add'>+	0x0000,     /* R55 */</div><div class='add'>+	0x0000,     /* R56 */</div><div class='add'>+	0x0000,     /* R57 */</div><div class='add'>+	0x4000,     /* R58  - DAC Mute */</div><div class='add'>+	0x0000,     /* R59  - DAC Mute Volume */</div><div class='add'>+	0x0000,     /* R60  - DAC Side */</div><div class='add'>+	0x0000,     /* R61 */</div><div class='add'>+	0x0000,     /* R62 */</div><div class='add'>+	0x0000,     /* R63 */</div><div class='add'>+	0x8000,     /* R64  - ADC Control */</div><div class='add'>+	0x0000,     /* R65 */</div><div class='add'>+	0x00C0,     /* R66  - ADC Digital Volume L */</div><div class='add'>+	0x00C0,     /* R67  - ADC Digital Volume R */</div><div class='add'>+	0x0000,     /* R68  - ADC Divider */</div><div class='add'>+	0x0000,     /* R69 */</div><div class='add'>+	0x0040,     /* R70  - ADC LR Rate */</div><div class='add'>+	0x0000,     /* R71 */</div><div class='add'>+	0x0303,     /* R72  - Input Control */</div><div class='add'>+	0x0000,     /* R73  - IN3 Input Control */</div><div class='add'>+	0x0000,     /* R74  - Mic Bias Control */</div><div class='add'>+	0x0000,     /* R75 */</div><div class='add'>+	0x0000,     /* R76  - Output Control */</div><div class='add'>+	0x0000,     /* R77  - Jack Detect */</div><div class='add'>+	0x0000,     /* R78  - Anti Pop Control */</div><div class='add'>+	0x0000,     /* R79 */</div><div class='add'>+	0x0040,     /* R80  - Left Input Volume */</div><div class='add'>+	0x0040,     /* R81  - Right Input Volume */</div><div class='add'>+	0x0000,     /* R82 */</div><div class='add'>+	0x0000,     /* R83 */</div><div class='add'>+	0x0000,     /* R84 */</div><div class='add'>+	0x0000,     /* R85 */</div><div class='add'>+	0x0000,     /* R86 */</div><div class='add'>+	0x0000,     /* R87 */</div><div class='add'>+	0x0800,     /* R88  - Left Mixer Control */</div><div class='add'>+	0x1000,     /* R89  - Right Mixer Control */</div><div class='add'>+	0x0000,     /* R90 */</div><div class='add'>+	0x0000,     /* R91 */</div><div class='add'>+	0x0000,     /* R92  - OUT3 Mixer Control */</div><div class='add'>+	0x0000,     /* R93  - OUT4 Mixer Control */</div><div class='add'>+	0x0000,     /* R94 */</div><div class='add'>+	0x0000,     /* R95 */</div><div class='add'>+	0x0000,     /* R96  - Output Left Mixer Volume */</div><div class='add'>+	0x0000,     /* R97  - Output Right Mixer Volume */</div><div class='add'>+	0x0000,     /* R98  - Input Mixer Volume L */</div><div class='add'>+	0x0000,     /* R99  - Input Mixer Volume R */</div><div class='add'>+	0x0000,     /* R100 - Input Mixer Volume */</div><div class='add'>+	0x0000,     /* R101 */</div><div class='add'>+	0x0000,     /* R102 */</div><div class='add'>+	0x0000,     /* R103 */</div><div class='add'>+	0x00E4,     /* R104 - LOUT1 Volume */</div><div class='add'>+	0x00E4,     /* R105 - ROUT1 Volume */</div><div class='add'>+	0x00E4,     /* R106 - LOUT2 Volume */</div><div class='add'>+	0x02E4,     /* R107 - ROUT2 Volume */</div><div class='add'>+	0x0000,     /* R108 */</div><div class='add'>+	0x0000,     /* R109 */</div><div class='add'>+	0x0000,     /* R110 */</div><div class='add'>+	0x0000,     /* R111 - BEEP Volume */</div><div class='add'>+	0x0A00,     /* R112 - AI Formating */</div><div class='add'>+	0x0000,     /* R113 - ADC DAC COMP */</div><div class='add'>+	0x0020,     /* R114 - AI ADC Control */</div><div class='add'>+	0x0020,     /* R115 - AI DAC Control */</div><div class='add'>+	0x0000,     /* R116 - AIF Test */</div><div class='add'>+	0x0000,     /* R117 */</div><div class='add'>+	0x0000,     /* R118 */</div><div class='add'>+	0x0000,     /* R119 */</div><div class='add'>+	0x0000,     /* R120 */</div><div class='add'>+	0x0000,     /* R121 */</div><div class='add'>+	0x0000,     /* R122 */</div><div class='add'>+	0x0000,     /* R123 */</div><div class='add'>+	0x0000,     /* R124 */</div><div class='add'>+	0x0000,     /* R125 */</div><div class='add'>+	0x0000,     /* R126 */</div><div class='add'>+	0x0000,     /* R127 */</div><div class='add'>+	0x1FFF,     /* R128 - GPIO Debounce */</div><div class='add'>+	0x0000,     /* R129 - GPIO Pin pull up Control */</div><div class='add'>+	0x03FC,     /* R130 - GPIO Pull down Control */</div><div class='add'>+	0x0000,     /* R131 - GPIO Interrupt Mode */</div><div class='add'>+	0x0000,     /* R132 */</div><div class='add'>+	0x0000,     /* R133 - GPIO Control */</div><div class='add'>+	0x00FB,     /* R134 - GPIO Configuration (i/o) */</div><div class='add'>+	0x04FE,     /* R135 - GPIO Pin Polarity / Type */</div><div class='add'>+	0x0000,     /* R136 */</div><div class='add'>+	0x0000,     /* R137 */</div><div class='add'>+	0x0000,     /* R138 */</div><div class='add'>+	0x0000,     /* R139 */</div><div class='add'>+	0x0312,     /* R140 - GPIO Function Select 1 */</div><div class='add'>+	0x1003,     /* R141 - GPIO Function Select 2 */</div><div class='add'>+	0x1331,     /* R142 - GPIO Function Select 3 */</div><div class='add'>+	0x0003,     /* R143 - GPIO Function Select 4 */</div><div class='add'>+	0x0000,     /* R144 - Digitiser Control (1) */</div><div class='add'>+	0x0002,     /* R145 - Digitiser Control (2) */</div><div class='add'>+	0x0000,     /* R146 */</div><div class='add'>+	0x0000,     /* R147 */</div><div class='add'>+	0x0000,     /* R148 */</div><div class='add'>+	0x0000,     /* R149 */</div><div class='add'>+	0x0000,     /* R150 */</div><div class='add'>+	0x0000,     /* R151 */</div><div class='add'>+	0x7000,     /* R152 - AUX1 Readback */</div><div class='add'>+	0x7000,     /* R153 - AUX2 Readback */</div><div class='add'>+	0x7000,     /* R154 - AUX3 Readback */</div><div class='add'>+	0x7000,     /* R155 - AUX4 Readback */</div><div class='add'>+	0x0000,     /* R156 - USB Voltage Readback */</div><div class='add'>+	0x0000,     /* R157 - LINE Voltage Readback */</div><div class='add'>+	0x0000,     /* R158 - BATT Voltage Readback */</div><div class='add'>+	0x0000,     /* R159 - Chip Temp Readback */</div><div class='add'>+	0x0000,     /* R160 */</div><div class='add'>+	0x0000,     /* R161 */</div><div class='add'>+	0x0000,     /* R162 */</div><div class='add'>+	0x0000,     /* R163 - Generic Comparator Control */</div><div class='add'>+	0x0000,     /* R164 - Generic comparator 1 */</div><div class='add'>+	0x0000,     /* R165 - Generic comparator 2 */</div><div class='add'>+	0x0000,     /* R166 - Generic comparator 3 */</div><div class='add'>+	0x0000,     /* R167 - Generic comparator 4 */</div><div class='add'>+	0xA00F,     /* R168 - Battery Charger Control 1 */</div><div class='add'>+	0x0B06,     /* R169 - Battery Charger Control 2 */</div><div class='add'>+	0x0000,     /* R170 - Battery Charger Control 3 */</div><div class='add'>+	0x0000,     /* R171 */</div><div class='add'>+	0x0000,     /* R172 - Current Sink Driver A */</div><div class='add'>+	0x0000,     /* R173 - CSA Flash control */</div><div class='add'>+	0x0000,     /* R174 - Current Sink Driver B */</div><div class='add'>+	0x0000,     /* R175 - CSB Flash control */</div><div class='add'>+	0x0000,     /* R176 - DCDC/LDO requested */</div><div class='add'>+	0x002D,     /* R177 - DCDC Active options */</div><div class='add'>+	0x0000,     /* R178 - DCDC Sleep options */</div><div class='add'>+	0x0025,     /* R179 - Power-check comparator */</div><div class='add'>+	0x0062,     /* R180 - DCDC1 Control */</div><div class='add'>+	0x0400,     /* R181 - DCDC1 Timeouts */</div><div class='add'>+	0x1006,     /* R182 - DCDC1 Low Power */</div><div class='add'>+	0x0018,     /* R183 - DCDC2 Control */</div><div class='add'>+	0x0000,     /* R184 - DCDC2 Timeouts */</div><div class='add'>+	0x0000,     /* R185 */</div><div class='add'>+	0x0026,     /* R186 - DCDC3 Control */</div><div class='add'>+	0x0400,     /* R187 - DCDC3 Timeouts */</div><div class='add'>+	0x0006,     /* R188 - DCDC3 Low Power */</div><div class='add'>+	0x0062,     /* R189 - DCDC4 Control */</div><div class='add'>+	0x0400,     /* R190 - DCDC4 Timeouts */</div><div class='add'>+	0x0006,     /* R191 - DCDC4 Low Power */</div><div class='add'>+	0x0008,     /* R192 - DCDC5 Control */</div><div class='add'>+	0x0000,     /* R193 - DCDC5 Timeouts */</div><div class='add'>+	0x0000,     /* R194 */</div><div class='add'>+	0x0026,     /* R195 - DCDC6 Control */</div><div class='add'>+	0x0800,     /* R196 - DCDC6 Timeouts */</div><div class='add'>+	0x0006,     /* R197 - DCDC6 Low Power */</div><div class='add'>+	0x0000,     /* R198 */</div><div class='add'>+	0x0003,     /* R199 - Limit Switch Control */</div><div class='add'>+	0x0006,     /* R200 - LDO1 Control */</div><div class='add'>+	0x0400,     /* R201 - LDO1 Timeouts */</div><div class='add'>+	0x001C,     /* R202 - LDO1 Low Power */</div><div class='add'>+	0x0006,     /* R203 - LDO2 Control */</div><div class='add'>+	0x0400,     /* R204 - LDO2 Timeouts */</div><div class='add'>+	0x001C,     /* R205 - LDO2 Low Power */</div><div class='add'>+	0x001B,     /* R206 - LDO3 Control */</div><div class='add'>+	0x0000,     /* R207 - LDO3 Timeouts */</div><div class='add'>+	0x001C,     /* R208 - LDO3 Low Power */</div><div class='add'>+	0x001B,     /* R209 - LDO4 Control */</div><div class='add'>+	0x0000,     /* R210 - LDO4 Timeouts */</div><div class='add'>+	0x001C,     /* R211 - LDO4 Low Power */</div><div class='add'>+	0x0000,     /* R212 */</div><div class='add'>+	0x0000,     /* R213 */</div><div class='add'>+	0x0000,     /* R214 */</div><div class='add'>+	0x0000,     /* R215 - VCC_FAULT Masks */</div><div class='add'>+	0x001F,     /* R216 - Main Bandgap Control */</div><div class='add'>+	0x0000,     /* R217 - OSC Control */</div><div class='add'>+	0x9000,     /* R218 - RTC Tick Control */</div><div class='add'>+	0x0000,     /* R219 */</div><div class='add'>+	0x4000,     /* R220 - RAM BIST 1 */</div><div class='add'>+	0x0000,     /* R221 */</div><div class='add'>+	0x0000,     /* R222 */</div><div class='add'>+	0x0000,     /* R223 */</div><div class='add'>+	0x0000,     /* R224 */</div><div class='add'>+	0x0000,     /* R225 - DCDC/LDO status */</div><div class='add'>+	0x0000,     /* R226 */</div><div class='add'>+	0x0000,     /* R227 */</div><div class='add'>+	0x0000,     /* R228 */</div><div class='add'>+	0x0000,     /* R229 */</div><div class='add'>+	0xE000,     /* R230 - GPIO Pin Status */</div><div class='add'>+	0x0000,     /* R231 */</div><div class='add'>+	0x0000,     /* R232 */</div><div class='add'>+	0x0000,     /* R233 */</div><div class='add'>+	0x0000,     /* R234 */</div><div class='add'>+	0x0000,     /* R235 */</div><div class='add'>+	0x0000,     /* R236 */</div><div class='add'>+	0x0000,     /* R237 */</div><div class='add'>+	0x0000,     /* R238 */</div><div class='add'>+	0x0000,     /* R239 */</div><div class='add'>+	0x0000,     /* R240 */</div><div class='add'>+	0x0000,     /* R241 */</div><div class='add'>+	0x0000,     /* R242 */</div><div class='add'>+	0x0000,     /* R243 */</div><div class='add'>+	0x0000,     /* R244 */</div><div class='add'>+	0x0000,     /* R245 */</div><div class='add'>+	0x0000,     /* R246 */</div><div class='add'>+	0x0000,     /* R247 */</div><div class='add'>+	0x0000,     /* R248 */</div><div class='add'>+	0x0000,     /* R249 */</div><div class='add'>+	0x0000,     /* R250 */</div><div class='add'>+	0x0000,     /* R251 */</div><div class='add'>+	0x0000,     /* R252 */</div><div class='add'>+	0x0000,     /* R253 */</div><div class='add'>+	0x0000,     /* R254 */</div><div class='add'>+	0x0000,     /* R255 */</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_MFD_WM8350_CONFIG_MODE_2</div><div class='add'>+</div><div class='add'>+#undef WM8350_HAVE_CONFIG_MODE</div><div class='add'>+#define WM8350_HAVE_CONFIG_MODE</div><div class='add'>+</div><div class='add'>+const u16 wm8350_mode2_defaults[] = {</div><div class='add'>+	0x17FF,     /* R0   - Reset/ID */</div><div class='add'>+	0x1000,     /* R1   - ID */</div><div class='add'>+	0x0000,     /* R2 */</div><div class='add'>+	0x1002,     /* R3   - System Control 1 */</div><div class='add'>+	0x0014,     /* R4   - System Control 2 */</div><div class='add'>+	0x0000,     /* R5   - System Hibernate */</div><div class='add'>+	0x8A00,     /* R6   - Interface Control */</div><div class='add'>+	0x0000,     /* R7 */</div><div class='add'>+	0x8000,     /* R8   - Power mgmt (1) */</div><div class='add'>+	0x0000,     /* R9   - Power mgmt (2) */</div><div class='add'>+	0x0000,     /* R10  - Power mgmt (3) */</div><div class='add'>+	0x2000,     /* R11  - Power mgmt (4) */</div><div class='add'>+	0x0E00,     /* R12  - Power mgmt (5) */</div><div class='add'>+	0x0000,     /* R13  - Power mgmt (6) */</div><div class='add'>+	0x0000,     /* R14  - Power mgmt (7) */</div><div class='add'>+	0x0000,     /* R15 */</div><div class='add'>+	0x0000,     /* R16  - RTC Seconds/Minutes */</div><div class='add'>+	0x0100,     /* R17  - RTC Hours/Day */</div><div class='add'>+	0x0101,     /* R18  - RTC Date/Month */</div><div class='add'>+	0x1400,     /* R19  - RTC Year */</div><div class='add'>+	0x0000,     /* R20  - Alarm Seconds/Minutes */</div><div class='add'>+	0x0000,     /* R21  - Alarm Hours/Day */</div><div class='add'>+	0x0000,     /* R22  - Alarm Date/Month */</div><div class='add'>+	0x0320,     /* R23  - RTC Time Control */</div><div class='add'>+	0x0000,     /* R24  - System Interrupts */</div><div class='add'>+	0x0000,     /* R25  - Interrupt Status 1 */</div><div class='add'>+	0x0000,     /* R26  - Interrupt Status 2 */</div><div class='add'>+	0x0000,     /* R27  - Power Up Interrupt Status */</div><div class='add'>+	0x0000,     /* R28  - Under Voltage Interrupt status */</div><div class='add'>+	0x0000,     /* R29  - Over Current Interrupt status */</div><div class='add'>+	0x0000,     /* R30  - GPIO Interrupt Status */</div><div class='add'>+	0x0000,     /* R31  - Comparator Interrupt Status */</div><div class='add'>+	0x3FFF,     /* R32  - System Interrupts Mask */</div><div class='add'>+	0x0000,     /* R33  - Interrupt Status 1 Mask */</div><div class='add'>+	0x0000,     /* R34  - Interrupt Status 2 Mask */</div><div class='add'>+	0x0000,     /* R35  - Power Up Interrupt Status Mask */</div><div class='add'>+	0x0000,     /* R36  - Under Voltage Interrupt status Mask */</div><div class='add'>+	0x0000,     /* R37  - Over Current Interrupt status Mask */</div><div class='add'>+	0x0000,     /* R38  - GPIO Interrupt Status Mask */</div><div class='add'>+	0x0000,     /* R39  - Comparator Interrupt Status Mask */</div><div class='add'>+	0x0040,     /* R40  - Clock Control 1 */</div><div class='add'>+	0x0000,     /* R41  - Clock Control 2 */</div><div class='add'>+	0x3B00,     /* R42  - FLL Control 1 */</div><div class='add'>+	0x7086,     /* R43  - FLL Control 2 */</div><div class='add'>+	0xC226,     /* R44  - FLL Control 3 */</div><div class='add'>+	0x0000,     /* R45  - FLL Control 4 */</div><div class='add'>+	0x0000,     /* R46 */</div><div class='add'>+	0x0000,     /* R47 */</div><div class='add'>+	0x0000,     /* R48  - DAC Control */</div><div class='add'>+	0x0000,     /* R49 */</div><div class='add'>+	0x00C0,     /* R50  - DAC Digital Volume L */</div><div class='add'>+	0x00C0,     /* R51  - DAC Digital Volume R */</div><div class='add'>+	0x0000,     /* R52 */</div><div class='add'>+	0x0040,     /* R53  - DAC LR Rate */</div><div class='add'>+	0x0000,     /* R54  - DAC Clock Control */</div><div class='add'>+	0x0000,     /* R55 */</div><div class='add'>+	0x0000,     /* R56 */</div><div class='add'>+	0x0000,     /* R57 */</div><div class='add'>+	0x4000,     /* R58  - DAC Mute */</div><div class='add'>+	0x0000,     /* R59  - DAC Mute Volume */</div><div class='add'>+	0x0000,     /* R60  - DAC Side */</div><div class='add'>+	0x0000,     /* R61 */</div><div class='add'>+	0x0000,     /* R62 */</div><div class='add'>+	0x0000,     /* R63 */</div><div class='add'>+	0x8000,     /* R64  - ADC Control */</div><div class='add'>+	0x0000,     /* R65 */</div><div class='add'>+	0x00C0,     /* R66  - ADC Digital Volume L */</div><div class='add'>+	0x00C0,     /* R67  - ADC Digital Volume R */</div><div class='add'>+	0x0000,     /* R68  - ADC Divider */</div><div class='add'>+	0x0000,     /* R69 */</div><div class='add'>+	0x0040,     /* R70  - ADC LR Rate */</div><div class='add'>+	0x0000,     /* R71 */</div><div class='add'>+	0x0303,     /* R72  - Input Control */</div><div class='add'>+	0x0000,     /* R73  - IN3 Input Control */</div><div class='add'>+	0x0000,     /* R74  - Mic Bias Control */</div><div class='add'>+	0x0000,     /* R75 */</div><div class='add'>+	0x0000,     /* R76  - Output Control */</div><div class='add'>+	0x0000,     /* R77  - Jack Detect */</div><div class='add'>+	0x0000,     /* R78  - Anti Pop Control */</div><div class='add'>+	0x0000,     /* R79 */</div><div class='add'>+	0x0040,     /* R80  - Left Input Volume */</div><div class='add'>+	0x0040,     /* R81  - Right Input Volume */</div><div class='add'>+	0x0000,     /* R82 */</div><div class='add'>+	0x0000,     /* R83 */</div><div class='add'>+	0x0000,     /* R84 */</div><div class='add'>+	0x0000,     /* R85 */</div><div class='add'>+	0x0000,     /* R86 */</div><div class='add'>+	0x0000,     /* R87 */</div><div class='add'>+	0x0800,     /* R88  - Left Mixer Control */</div><div class='add'>+	0x1000,     /* R89  - Right Mixer Control */</div><div class='add'>+	0x0000,     /* R90 */</div><div class='add'>+	0x0000,     /* R91 */</div><div class='add'>+	0x0000,     /* R92  - OUT3 Mixer Control */</div><div class='add'>+	0x0000,     /* R93  - OUT4 Mixer Control */</div><div class='add'>+	0x0000,     /* R94 */</div><div class='add'>+	0x0000,     /* R95 */</div><div class='add'>+	0x0000,     /* R96  - Output Left Mixer Volume */</div><div class='add'>+	0x0000,     /* R97  - Output Right Mixer Volume */</div><div class='add'>+	0x0000,     /* R98  - Input Mixer Volume L */</div><div class='add'>+	0x0000,     /* R99  - Input Mixer Volume R */</div><div class='add'>+	0x0000,     /* R100 - Input Mixer Volume */</div><div class='add'>+	0x0000,     /* R101 */</div><div class='add'>+	0x0000,     /* R102 */</div><div class='add'>+	0x0000,     /* R103 */</div><div class='add'>+	0x00E4,     /* R104 - LOUT1 Volume */</div><div class='add'>+	0x00E4,     /* R105 - ROUT1 Volume */</div><div class='add'>+	0x00E4,     /* R106 - LOUT2 Volume */</div><div class='add'>+	0x02E4,     /* R107 - ROUT2 Volume */</div><div class='add'>+	0x0000,     /* R108 */</div><div class='add'>+	0x0000,     /* R109 */</div><div class='add'>+	0x0000,     /* R110 */</div><div class='add'>+	0x0000,     /* R111 - BEEP Volume */</div><div class='add'>+	0x0A00,     /* R112 - AI Formating */</div><div class='add'>+	0x0000,     /* R113 - ADC DAC COMP */</div><div class='add'>+	0x0020,     /* R114 - AI ADC Control */</div><div class='add'>+	0x0020,     /* R115 - AI DAC Control */</div><div class='add'>+	0x0000,     /* R116 - AIF Test */</div><div class='add'>+	0x0000,     /* R117 */</div><div class='add'>+	0x0000,     /* R118 */</div><div class='add'>+	0x0000,     /* R119 */</div><div class='add'>+	0x0000,     /* R120 */</div><div class='add'>+	0x0000,     /* R121 */</div><div class='add'>+	0x0000,     /* R122 */</div><div class='add'>+	0x0000,     /* R123 */</div><div class='add'>+	0x0000,     /* R124 */</div><div class='add'>+	0x0000,     /* R125 */</div><div class='add'>+	0x0000,     /* R126 */</div><div class='add'>+	0x0000,     /* R127 */</div><div class='add'>+	0x1FFF,     /* R128 - GPIO Debounce */</div><div class='add'>+	0x0000,     /* R129 - GPIO Pin pull up Control */</div><div class='add'>+	0x03FC,     /* R130 - GPIO Pull down Control */</div><div class='add'>+	0x0000,     /* R131 - GPIO Interrupt Mode */</div><div class='add'>+	0x0000,     /* R132 */</div><div class='add'>+	0x0000,     /* R133 - GPIO Control */</div><div class='add'>+	0x08FB,     /* R134 - GPIO Configuration (i/o) */</div><div class='add'>+	0x0CFE,     /* R135 - GPIO Pin Polarity / Type */</div><div class='add'>+	0x0000,     /* R136 */</div><div class='add'>+	0x0000,     /* R137 */</div><div class='add'>+	0x0000,     /* R138 */</div><div class='add'>+	0x0000,     /* R139 */</div><div class='add'>+	0x0312,     /* R140 - GPIO Function Select 1 */</div><div class='add'>+	0x0003,     /* R141 - GPIO Function Select 2 */</div><div class='add'>+	0x2331,     /* R142 - GPIO Function Select 3 */</div><div class='add'>+	0x0003,     /* R143 - GPIO Function Select 4 */</div><div class='add'>+	0x0000,     /* R144 - Digitiser Control (1) */</div><div class='add'>+	0x0002,     /* R145 - Digitiser Control (2) */</div><div class='add'>+	0x0000,     /* R146 */</div><div class='add'>+	0x0000,     /* R147 */</div><div class='add'>+	0x0000,     /* R148 */</div><div class='add'>+	0x0000,     /* R149 */</div><div class='add'>+	0x0000,     /* R150 */</div><div class='add'>+	0x0000,     /* R151 */</div><div class='add'>+	0x7000,     /* R152 - AUX1 Readback */</div><div class='add'>+	0x7000,     /* R153 - AUX2 Readback */</div><div class='add'>+	0x7000,     /* R154 - AUX3 Readback */</div><div class='add'>+	0x7000,     /* R155 - AUX4 Readback */</div><div class='add'>+	0x0000,     /* R156 - USB Voltage Readback */</div><div class='add'>+	0x0000,     /* R157 - LINE Voltage Readback */</div><div class='add'>+	0x0000,     /* R158 - BATT Voltage Readback */</div><div class='add'>+	0x0000,     /* R159 - Chip Temp Readback */</div><div class='add'>+	0x0000,     /* R160 */</div><div class='add'>+	0x0000,     /* R161 */</div><div class='add'>+	0x0000,     /* R162 */</div><div class='add'>+	0x0000,     /* R163 - Generic Comparator Control */</div><div class='add'>+	0x0000,     /* R164 - Generic comparator 1 */</div><div class='add'>+	0x0000,     /* R165 - Generic comparator 2 */</div><div class='add'>+	0x0000,     /* R166 - Generic comparator 3 */</div><div class='add'>+	0x0000,     /* R167 - Generic comparator 4 */</div><div class='add'>+	0xA00F,     /* R168 - Battery Charger Control 1 */</div><div class='add'>+	0x0B06,     /* R169 - Battery Charger Control 2 */</div><div class='add'>+	0x0000,     /* R170 - Battery Charger Control 3 */</div><div class='add'>+	0x0000,     /* R171 */</div><div class='add'>+	0x0000,     /* R172 - Current Sink Driver A */</div><div class='add'>+	0x0000,     /* R173 - CSA Flash control */</div><div class='add'>+	0x0000,     /* R174 - Current Sink Driver B */</div><div class='add'>+	0x0000,     /* R175 - CSB Flash control */</div><div class='add'>+	0x0000,     /* R176 - DCDC/LDO requested */</div><div class='add'>+	0x002D,     /* R177 - DCDC Active options */</div><div class='add'>+	0x0000,     /* R178 - DCDC Sleep options */</div><div class='add'>+	0x0025,     /* R179 - Power-check comparator */</div><div class='add'>+	0x000E,     /* R180 - DCDC1 Control */</div><div class='add'>+	0x0400,     /* R181 - DCDC1 Timeouts */</div><div class='add'>+	0x1006,     /* R182 - DCDC1 Low Power */</div><div class='add'>+	0x0018,     /* R183 - DCDC2 Control */</div><div class='add'>+	0x0000,     /* R184 - DCDC2 Timeouts */</div><div class='add'>+	0x0000,     /* R185 */</div><div class='add'>+	0x002E,     /* R186 - DCDC3 Control */</div><div class='add'>+	0x0800,     /* R187 - DCDC3 Timeouts */</div><div class='add'>+	0x0006,     /* R188 - DCDC3 Low Power */</div><div class='add'>+	0x000E,     /* R189 - DCDC4 Control */</div><div class='add'>+	0x0800,     /* R190 - DCDC4 Timeouts */</div><div class='add'>+	0x0006,     /* R191 - DCDC4 Low Power */</div><div class='add'>+	0x0008,     /* R192 - DCDC5 Control */</div><div class='add'>+	0x0000,     /* R193 - DCDC5 Timeouts */</div><div class='add'>+	0x0000,     /* R194 */</div><div class='add'>+	0x0026,     /* R195 - DCDC6 Control */</div><div class='add'>+	0x0C00,     /* R196 - DCDC6 Timeouts */</div><div class='add'>+	0x0006,     /* R197 - DCDC6 Low Power */</div><div class='add'>+	0x0000,     /* R198 */</div><div class='add'>+	0x0003,     /* R199 - Limit Switch Control */</div><div class='add'>+	0x001A,     /* R200 - LDO1 Control */</div><div class='add'>+	0x0800,     /* R201 - LDO1 Timeouts */</div><div class='add'>+	0x001C,     /* R202 - LDO1 Low Power */</div><div class='add'>+	0x0010,     /* R203 - LDO2 Control */</div><div class='add'>+	0x0800,     /* R204 - LDO2 Timeouts */</div><div class='add'>+	0x001C,     /* R205 - LDO2 Low Power */</div><div class='add'>+	0x000A,     /* R206 - LDO3 Control */</div><div class='add'>+	0x0C00,     /* R207 - LDO3 Timeouts */</div><div class='add'>+	0x001C,     /* R208 - LDO3 Low Power */</div><div class='add'>+	0x001A,     /* R209 - LDO4 Control */</div><div class='add'>+	0x0800,     /* R210 - LDO4 Timeouts */</div><div class='add'>+	0x001C,     /* R211 - LDO4 Low Power */</div><div class='add'>+	0x0000,     /* R212 */</div><div class='add'>+	0x0000,     /* R213 */</div><div class='add'>+	0x0000,     /* R214 */</div><div class='add'>+	0x0000,     /* R215 - VCC_FAULT Masks */</div><div class='add'>+	0x001F,     /* R216 - Main Bandgap Control */</div><div class='add'>+	0x0000,     /* R217 - OSC Control */</div><div class='add'>+	0x9000,     /* R218 - RTC Tick Control */</div><div class='add'>+	0x0000,     /* R219 */</div><div class='add'>+	0x4000,     /* R220 - RAM BIST 1 */</div><div class='add'>+	0x0000,     /* R221 */</div><div class='add'>+	0x0000,     /* R222 */</div><div class='add'>+	0x0000,     /* R223 */</div><div class='add'>+	0x0000,     /* R224 */</div><div class='add'>+	0x0000,     /* R225 - DCDC/LDO status */</div><div class='add'>+	0x0000,     /* R226 */</div><div class='add'>+	0x0000,     /* R227 */</div><div class='add'>+	0x0000,     /* R228 */</div><div class='add'>+	0x0000,     /* R229 */</div><div class='add'>+	0xE000,     /* R230 - GPIO Pin Status */</div><div class='add'>+	0x0000,     /* R231 */</div><div class='add'>+	0x0000,     /* R232 */</div><div class='add'>+	0x0000,     /* R233 */</div><div class='add'>+	0x0000,     /* R234 */</div><div class='add'>+	0x0000,     /* R235 */</div><div class='add'>+	0x0000,     /* R236 */</div><div class='add'>+	0x0000,     /* R237 */</div><div class='add'>+	0x0000,     /* R238 */</div><div class='add'>+	0x0000,     /* R239 */</div><div class='add'>+	0x0000,     /* R240 */</div><div class='add'>+	0x0000,     /* R241 */</div><div class='add'>+	0x0000,     /* R242 */</div><div class='add'>+	0x0000,     /* R243 */</div><div class='add'>+	0x0000,     /* R244 */</div><div class='add'>+	0x0000,     /* R245 */</div><div class='add'>+	0x0000,     /* R246 */</div><div class='add'>+	0x0000,     /* R247 */</div><div class='add'>+	0x0000,     /* R248 */</div><div class='add'>+	0x0000,     /* R249 */</div><div class='add'>+	0x0000,     /* R250 */</div><div class='add'>+	0x0000,     /* R251 */</div><div class='add'>+	0x0000,     /* R252 */</div><div class='add'>+	0x0000,     /* R253 */</div><div class='add'>+	0x0000,     /* R254 */</div><div class='add'>+	0x0000,     /* R255 */</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_MFD_WM8350_CONFIG_MODE_3</div><div class='add'>+</div><div class='add'>+#undef WM8350_HAVE_CONFIG_MODE</div><div class='add'>+#define WM8350_HAVE_CONFIG_MODE</div><div class='add'>+</div><div class='add'>+const u16 wm8350_mode3_defaults[] = {</div><div class='add'>+	0x17FF,     /* R0   - Reset/ID */</div><div class='add'>+	0x1000,     /* R1   - ID */</div><div class='add'>+	0x0000,     /* R2 */</div><div class='add'>+	0x1000,     /* R3   - System Control 1 */</div><div class='add'>+	0x0004,     /* R4   - System Control 2 */</div><div class='add'>+	0x0000,     /* R5   - System Hibernate */</div><div class='add'>+	0x8A00,     /* R6   - Interface Control */</div><div class='add'>+	0x0000,     /* R7 */</div><div class='add'>+	0x8000,     /* R8   - Power mgmt (1) */</div><div class='add'>+	0x0000,     /* R9   - Power mgmt (2) */</div><div class='add'>+	0x0000,     /* R10  - Power mgmt (3) */</div><div class='add'>+	0x2000,     /* R11  - Power mgmt (4) */</div><div class='add'>+	0x0E00,     /* R12  - Power mgmt (5) */</div><div class='add'>+	0x0000,     /* R13  - Power mgmt (6) */</div><div class='add'>+	0x0000,     /* R14  - Power mgmt (7) */</div><div class='add'>+	0x0000,     /* R15 */</div><div class='add'>+	0x0000,     /* R16  - RTC Seconds/Minutes */</div><div class='add'>+	0x0100,     /* R17  - RTC Hours/Day */</div><div class='add'>+	0x0101,     /* R18  - RTC Date/Month */</div><div class='add'>+	0x1400,     /* R19  - RTC Year */</div><div class='add'>+	0x0000,     /* R20  - Alarm Seconds/Minutes */</div><div class='add'>+	0x0000,     /* R21  - Alarm Hours/Day */</div><div class='add'>+	0x0000,     /* R22  - Alarm Date/Month */</div><div class='add'>+	0x0320,     /* R23  - RTC Time Control */</div><div class='add'>+	0x0000,     /* R24  - System Interrupts */</div><div class='add'>+	0x0000,     /* R25  - Interrupt Status 1 */</div><div class='add'>+	0x0000,     /* R26  - Interrupt Status 2 */</div><div class='add'>+	0x0000,     /* R27  - Power Up Interrupt Status */</div><div class='add'>+	0x0000,     /* R28  - Under Voltage Interrupt status */</div><div class='add'>+	0x0000,     /* R29  - Over Current Interrupt status */</div><div class='add'>+	0x0000,     /* R30  - GPIO Interrupt Status */</div><div class='add'>+	0x0000,     /* R31  - Comparator Interrupt Status */</div><div class='add'>+	0x3FFF,     /* R32  - System Interrupts Mask */</div><div class='add'>+	0x0000,     /* R33  - Interrupt Status 1 Mask */</div><div class='add'>+	0x0000,     /* R34  - Interrupt Status 2 Mask */</div><div class='add'>+	0x0000,     /* R35  - Power Up Interrupt Status Mask */</div><div class='add'>+	0x0000,     /* R36  - Under Voltage Interrupt status Mask */</div><div class='add'>+	0x0000,     /* R37  - Over Current Interrupt status Mask */</div><div class='add'>+	0x0000,     /* R38  - GPIO Interrupt Status Mask */</div><div class='add'>+	0x0000,     /* R39  - Comparator Interrupt Status Mask */</div><div class='add'>+	0x0040,     /* R40  - Clock Control 1 */</div><div class='add'>+	0x0000,     /* R41  - Clock Control 2 */</div><div class='add'>+	0x3B00,     /* R42  - FLL Control 1 */</div><div class='add'>+	0x7086,     /* R43  - FLL Control 2 */</div><div class='add'>+	0xC226,     /* R44  - FLL Control 3 */</div><div class='add'>+	0x0000,     /* R45  - FLL Control 4 */</div><div class='add'>+	0x0000,     /* R46 */</div><div class='add'>+	0x0000,     /* R47 */</div><div class='add'>+	0x0000,     /* R48  - DAC Control */</div><div class='add'>+	0x0000,     /* R49 */</div><div class='add'>+	0x00C0,     /* R50  - DAC Digital Volume L */</div><div class='add'>+	0x00C0,     /* R51  - DAC Digital Volume R */</div><div class='add'>+	0x0000,     /* R52 */</div><div class='add'>+	0x0040,     /* R53  - DAC LR Rate */</div><div class='add'>+	0x0000,     /* R54  - DAC Clock Control */</div><div class='add'>+	0x0000,     /* R55 */</div><div class='add'>+	0x0000,     /* R56 */</div><div class='add'>+	0x0000,     /* R57 */</div><div class='add'>+	0x4000,     /* R58  - DAC Mute */</div><div class='add'>+	0x0000,     /* R59  - DAC Mute Volume */</div><div class='add'>+	0x0000,     /* R60  - DAC Side */</div><div class='add'>+	0x0000,     /* R61 */</div><div class='add'>+	0x0000,     /* R62 */</div><div class='add'>+	0x0000,     /* R63 */</div><div class='add'>+	0x8000,     /* R64  - ADC Control */</div><div class='add'>+	0x0000,     /* R65 */</div><div class='add'>+	0x00C0,     /* R66  - ADC Digital Volume L */</div><div class='add'>+	0x00C0,     /* R67  - ADC Digital Volume R */</div><div class='add'>+	0x0000,     /* R68  - ADC Divider */</div><div class='add'>+	0x0000,     /* R69 */</div><div class='add'>+	0x0040,     /* R70  - ADC LR Rate */</div><div class='add'>+	0x0000,     /* R71 */</div><div class='add'>+	0x0303,     /* R72  - Input Control */</div><div class='add'>+	0x0000,     /* R73  - IN3 Input Control */</div><div class='add'>+	0x0000,     /* R74  - Mic Bias Control */</div><div class='add'>+	0x0000,     /* R75 */</div><div class='add'>+	0x0000,     /* R76  - Output Control */</div><div class='add'>+	0x0000,     /* R77  - Jack Detect */</div><div class='add'>+	0x0000,     /* R78  - Anti Pop Control */</div><div class='add'>+	0x0000,     /* R79 */</div><div class='add'>+	0x0040,     /* R80  - Left Input Volume */</div><div class='add'>+	0x0040,     /* R81  - Right Input Volume */</div><div class='add'>+	0x0000,     /* R82 */</div><div class='add'>+	0x0000,     /* R83 */</div><div class='add'>+	0x0000,     /* R84 */</div><div class='add'>+	0x0000,     /* R85 */</div><div class='add'>+	0x0000,     /* R86 */</div><div class='add'>+	0x0000,     /* R87 */</div><div class='add'>+	0x0800,     /* R88  - Left Mixer Control */</div><div class='add'>+	0x1000,     /* R89  - Right Mixer Control */</div><div class='add'>+	0x0000,     /* R90 */</div><div class='add'>+	0x0000,     /* R91 */</div><div class='add'>+	0x0000,     /* R92  - OUT3 Mixer Control */</div><div class='add'>+	0x0000,     /* R93  - OUT4 Mixer Control */</div><div class='add'>+	0x0000,     /* R94 */</div><div class='add'>+	0x0000,     /* R95 */</div><div class='add'>+	0x0000,     /* R96  - Output Left Mixer Volume */</div><div class='add'>+	0x0000,     /* R97  - Output Right Mixer Volume */</div><div class='add'>+	0x0000,     /* R98  - Input Mixer Volume L */</div><div class='add'>+	0x0000,     /* R99  - Input Mixer Volume R */</div><div class='add'>+	0x0000,     /* R100 - Input Mixer Volume */</div><div class='add'>+	0x0000,     /* R101 */</div><div class='add'>+	0x0000,     /* R102 */</div><div class='add'>+	0x0000,     /* R103 */</div><div class='add'>+	0x00E4,     /* R104 - LOUT1 Volume */</div><div class='add'>+	0x00E4,     /* R105 - ROUT1 Volume */</div><div class='add'>+	0x00E4,     /* R106 - LOUT2 Volume */</div><div class='add'>+	0x02E4,     /* R107 - ROUT2 Volume */</div><div class='add'>+	0x0000,     /* R108 */</div><div class='add'>+	0x0000,     /* R109 */</div><div class='add'>+	0x0000,     /* R110 */</div><div class='add'>+	0x0000,     /* R111 - BEEP Volume */</div><div class='add'>+	0x0A00,     /* R112 - AI Formating */</div><div class='add'>+	0x0000,     /* R113 - ADC DAC COMP */</div><div class='add'>+	0x0020,     /* R114 - AI ADC Control */</div><div class='add'>+	0x0020,     /* R115 - AI DAC Control */</div><div class='add'>+	0x0000,     /* R116 - AIF Test */</div><div class='add'>+	0x0000,     /* R117 */</div><div class='add'>+	0x0000,     /* R118 */</div><div class='add'>+	0x0000,     /* R119 */</div><div class='add'>+	0x0000,     /* R120 */</div><div class='add'>+	0x0000,     /* R121 */</div><div class='add'>+	0x0000,     /* R122 */</div><div class='add'>+	0x0000,     /* R123 */</div><div class='add'>+	0x0000,     /* R124 */</div><div class='add'>+	0x0000,     /* R125 */</div><div class='add'>+	0x0000,     /* R126 */</div><div class='add'>+	0x0000,     /* R127 */</div><div class='add'>+	0x1FFF,     /* R128 - GPIO Debounce */</div><div class='add'>+	0x0000,     /* R129 - GPIO Pin pull up Control */</div><div class='add'>+	0x03FC,     /* R130 - GPIO Pull down Control */</div><div class='add'>+	0x0000,     /* R131 - GPIO Interrupt Mode */</div><div class='add'>+	0x0000,     /* R132 */</div><div class='add'>+	0x0000,     /* R133 - GPIO Control */</div><div class='add'>+	0x0A7B,     /* R134 - GPIO Configuration (i/o) */</div><div class='add'>+	0x06FE,     /* R135 - GPIO Pin Polarity / Type */</div><div class='add'>+	0x0000,     /* R136 */</div><div class='add'>+	0x0000,     /* R137 */</div><div class='add'>+	0x0000,     /* R138 */</div><div class='add'>+	0x0000,     /* R139 */</div><div class='add'>+	0x1312,     /* R140 - GPIO Function Select 1 */</div><div class='add'>+	0x1030,     /* R141 - GPIO Function Select 2 */</div><div class='add'>+	0x2231,     /* R142 - GPIO Function Select 3 */</div><div class='add'>+	0x0003,     /* R143 - GPIO Function Select 4 */</div><div class='add'>+	0x0000,     /* R144 - Digitiser Control (1) */</div><div class='add'>+	0x0002,     /* R145 - Digitiser Control (2) */</div><div class='add'>+	0x0000,     /* R146 */</div><div class='add'>+	0x0000,     /* R147 */</div><div class='add'>+	0x0000,     /* R148 */</div><div class='add'>+	0x0000,     /* R149 */</div><div class='add'>+	0x0000,     /* R150 */</div><div class='add'>+	0x0000,     /* R151 */</div><div class='add'>+	0x7000,     /* R152 - AUX1 Readback */</div><div class='add'>+	0x7000,     /* R153 - AUX2 Readback */</div><div class='add'>+	0x7000,     /* R154 - AUX3 Readback */</div><div class='add'>+	0x7000,     /* R155 - AUX4 Readback */</div><div class='add'>+	0x0000,     /* R156 - USB Voltage Readback */</div><div class='add'>+	0x0000,     /* R157 - LINE Voltage Readback */</div><div class='add'>+	0x0000,     /* R158 - BATT Voltage Readback */</div><div class='add'>+	0x0000,     /* R159 - Chip Temp Readback */</div><div class='add'>+	0x0000,     /* R160 */</div><div class='add'>+	0x0000,     /* R161 */</div><div class='add'>+	0x0000,     /* R162 */</div><div class='add'>+	0x0000,     /* R163 - Generic Comparator Control */</div><div class='add'>+	0x0000,     /* R164 - Generic comparator 1 */</div><div class='add'>+	0x0000,     /* R165 - Generic comparator 2 */</div><div class='add'>+	0x0000,     /* R166 - Generic comparator 3 */</div><div class='add'>+	0x0000,     /* R167 - Generic comparator 4 */</div><div class='add'>+	0xA00F,     /* R168 - Battery Charger Control 1 */</div><div class='add'>+	0x0B06,     /* R169 - Battery Charger Control 2 */</div><div class='add'>+	0x0000,     /* R170 - Battery Charger Control 3 */</div><div class='add'>+	0x0000,     /* R171 */</div><div class='add'>+	0x0000,     /* R172 - Current Sink Driver A */</div><div class='add'>+	0x0000,     /* R173 - CSA Flash control */</div><div class='add'>+	0x0000,     /* R174 - Current Sink Driver B */</div><div class='add'>+	0x0000,     /* R175 - CSB Flash control */</div><div class='add'>+	0x0000,     /* R176 - DCDC/LDO requested */</div><div class='add'>+	0x002D,     /* R177 - DCDC Active options */</div><div class='add'>+	0x0000,     /* R178 - DCDC Sleep options */</div><div class='add'>+	0x0025,     /* R179 - Power-check comparator */</div><div class='add'>+	0x000E,     /* R180 - DCDC1 Control */</div><div class='add'>+	0x0400,     /* R181 - DCDC1 Timeouts */</div><div class='add'>+	0x1006,     /* R182 - DCDC1 Low Power */</div><div class='add'>+	0x0018,     /* R183 - DCDC2 Control */</div><div class='add'>+	0x0000,     /* R184 - DCDC2 Timeouts */</div><div class='add'>+	0x0000,     /* R185 */</div><div class='add'>+	0x000E,     /* R186 - DCDC3 Control */</div><div class='add'>+	0x0400,     /* R187 - DCDC3 Timeouts */</div><div class='add'>+	0x0006,     /* R188 - DCDC3 Low Power */</div><div class='add'>+	0x0026,     /* R189 - DCDC4 Control */</div><div class='add'>+	0x0400,     /* R190 - DCDC4 Timeouts */</div><div class='add'>+	0x0006,     /* R191 - DCDC4 Low Power */</div><div class='add'>+	0x0008,     /* R192 - DCDC5 Control */</div><div class='add'>+	0x0000,     /* R193 - DCDC5 Timeouts */</div><div class='add'>+	0x0000,     /* R194 */</div><div class='add'>+	0x0026,     /* R195 - DCDC6 Control */</div><div class='add'>+	0x0400,     /* R196 - DCDC6 Timeouts */</div><div class='add'>+	0x0006,     /* R197 - DCDC6 Low Power */</div><div class='add'>+	0x0000,     /* R198 */</div><div class='add'>+	0x0003,     /* R199 - Limit Switch Control */</div><div class='add'>+	0x001C,     /* R200 - LDO1 Control */</div><div class='add'>+	0x0000,     /* R201 - LDO1 Timeouts */</div><div class='add'>+	0x001C,     /* R202 - LDO1 Low Power */</div><div class='add'>+	0x001C,     /* R203 - LDO2 Control */</div><div class='add'>+	0x0400,     /* R204 - LDO2 Timeouts */</div><div class='add'>+	0x001C,     /* R205 - LDO2 Low Power */</div><div class='add'>+	0x001C,     /* R206 - LDO3 Control */</div><div class='add'>+	0x0400,     /* R207 - LDO3 Timeouts */</div><div class='add'>+	0x001C,     /* R208 - LDO3 Low Power */</div><div class='add'>+	0x001F,     /* R209 - LDO4 Control */</div><div class='add'>+	0x0400,     /* R210 - LDO4 Timeouts */</div><div class='add'>+	0x001C,     /* R211 - LDO4 Low Power */</div><div class='add'>+	0x0000,     /* R212 */</div><div class='add'>+	0x0000,     /* R213 */</div><div class='add'>+	0x0000,     /* R214 */</div><div class='add'>+	0x0000,     /* R215 - VCC_FAULT Masks */</div><div class='add'>+	0x001F,     /* R216 - Main Bandgap Control */</div><div class='add'>+	0x0000,     /* R217 - OSC Control */</div><div class='add'>+	0x9000,     /* R218 - RTC Tick Control */</div><div class='add'>+	0x0000,     /* R219 */</div><div class='add'>+	0x4000,     /* R220 - RAM BIST 1 */</div><div class='add'>+	0x0000,     /* R221 */</div><div class='add'>+	0x0000,     /* R222 */</div><div class='add'>+	0x0000,     /* R223 */</div><div class='add'>+	0x0000,     /* R224 */</div><div class='add'>+	0x0000,     /* R225 - DCDC/LDO status */</div><div class='add'>+	0x0000,     /* R226 */</div><div class='add'>+	0x0000,     /* R227 */</div><div class='add'>+	0x0000,     /* R228 */</div><div class='add'>+	0x0000,     /* R229 */</div><div class='add'>+	0xE000,     /* R230 - GPIO Pin Status */</div><div class='add'>+	0x0000,     /* R231 */</div><div class='add'>+	0x0000,     /* R232 */</div><div class='add'>+	0x0000,     /* R233 */</div><div class='add'>+	0x0000,     /* R234 */</div><div class='add'>+	0x0000,     /* R235 */</div><div class='add'>+	0x0000,     /* R236 */</div><div class='add'>+	0x0000,     /* R237 */</div><div class='add'>+	0x0000,     /* R238 */</div><div class='add'>+	0x0000,     /* R239 */</div><div class='add'>+	0x0000,     /* R240 */</div><div class='add'>+	0x0000,     /* R241 */</div><div class='add'>+	0x0000,     /* R242 */</div><div class='add'>+	0x0000,     /* R243 */</div><div class='add'>+	0x0000,     /* R244 */</div><div class='add'>+	0x0000,     /* R245 */</div><div class='add'>+	0x0000,     /* R246 */</div><div class='add'>+	0x0000,     /* R247 */</div><div class='add'>+	0x0000,     /* R248 */</div><div class='add'>+	0x0000,     /* R249 */</div><div class='add'>+	0x0000,     /* R250 */</div><div class='add'>+	0x0000,     /* R251 */</div><div class='add'>+	0x0000,     /* R252 */</div><div class='add'>+	0x0000,     /* R253 */</div><div class='add'>+	0x0000,     /* R254 */</div><div class='add'>+	0x0000,     /* R255 */</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* The register defaults for the config mode used must be compiled in but</div><div class='add'>+ * due to the impact on kernel size it is possible to disable</div><div class='add'>+ */</div><div class='add'>+#ifndef WM8350_HAVE_CONFIG_MODE</div><div class='add'>+#warning No WM8350 config modes supported - select at least one of the</div><div class='add'>+#warning MFD_WM8350_CONFIG_MODE_n options from the board driver.</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Access masks.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+const struct wm8350_reg_access wm8350_reg_io_map[] = {</div><div class='add'>+	/*  read    write volatile */</div><div class='add'>+	{ 0xFFFF, 0xFFFF, 0xFFFF }, /* R0   - Reset/ID */</div><div class='add'>+	{ 0x7CFF, 0x0C00, 0x7FFF }, /* R1   - ID */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R2 */</div><div class='add'>+	{ 0xBE3B, 0xBE3B, 0x8000 }, /* R3   - System Control 1 */</div><div class='add'>+	{ 0xFCF7, 0xFCF7, 0xF800 }, /* R4   - System Control 2 */</div><div class='add'>+	{ 0x80FF, 0x80FF, 0x8000 }, /* R5   - System Hibernate */</div><div class='add'>+	{ 0xFB0E, 0xFB0E, 0x0000 }, /* R6   - Interface Control */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R7 */</div><div class='add'>+	{ 0xE537, 0xE537, 0xFFFF }, /* R8   - Power mgmt (1) */</div><div class='add'>+	{ 0x0FF3, 0x0FF3, 0xFFFF }, /* R9   - Power mgmt (2) */</div><div class='add'>+	{ 0x008F, 0x008F, 0xFFFF }, /* R10  - Power mgmt (3) */</div><div class='add'>+	{ 0x6D3C, 0x6D3C, 0xFFFF }, /* R11  - Power mgmt (4) */</div><div class='add'>+	{ 0x1F8F, 0x1F8F, 0xFFFF }, /* R12  - Power mgmt (5) */</div><div class='add'>+	{ 0x8F3F, 0x8F3F, 0xFFFF }, /* R13  - Power mgmt (6) */</div><div class='add'>+	{ 0x0003, 0x0003, 0xFFFF }, /* R14  - Power mgmt (7) */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R15 */</div><div class='add'>+	{ 0x7F7F, 0x7F7F, 0xFFFF }, /* R16  - RTC Seconds/Minutes */</div><div class='add'>+	{ 0x073F, 0x073F, 0xFFFF }, /* R17  - RTC Hours/Day */</div><div class='add'>+	{ 0x1F3F, 0x1F3F, 0xFFFF }, /* R18  - RTC Date/Month */</div><div class='add'>+	{ 0x3FFF, 0x00FF, 0xFFFF }, /* R19  - RTC Year */</div><div class='add'>+	{ 0x7F7F, 0x7F7F, 0x0000 }, /* R20  - Alarm Seconds/Minutes */</div><div class='add'>+	{ 0x0F3F, 0x0F3F, 0x0000 }, /* R21  - Alarm Hours/Day */</div><div class='add'>+	{ 0x1F3F, 0x1F3F, 0x0000 }, /* R22  - Alarm Date/Month */</div><div class='add'>+	{ 0xEF7F, 0xEA7F, 0xFFFF }, /* R23  - RTC Time Control */</div><div class='add'>+	{ 0x3BFF, 0x0000, 0xFFFF }, /* R24  - System Interrupts */</div><div class='add'>+	{ 0xFEE7, 0x0000, 0xFFFF }, /* R25  - Interrupt Status 1 */</div><div class='add'>+	{ 0x35FF, 0x0000, 0xFFFF }, /* R26  - Interrupt Status 2 */</div><div class='add'>+	{ 0x0F3F, 0x0000, 0xFFFF }, /* R27  - Power Up Interrupt Status */</div><div class='add'>+	{ 0x0F3F, 0x0000, 0xFFFF }, /* R28  - Under Voltage Interrupt status */</div><div class='add'>+	{ 0x8000, 0x0000, 0xFFFF }, /* R29  - Over Current Interrupt status */</div><div class='add'>+	{ 0x1FFF, 0x0000, 0xFFFF }, /* R30  - GPIO Interrupt Status */</div><div class='add'>+	{ 0xEF7F, 0x0000, 0xFFFF }, /* R31  - Comparator Interrupt Status */</div><div class='add'>+	{ 0x3FFF, 0x3FFF, 0x0000 }, /* R32  - System Interrupts Mask */</div><div class='add'>+	{ 0xFEE7, 0xFEE7, 0x0000 }, /* R33  - Interrupt Status 1 Mask */</div><div class='add'>+	{ 0xF5FF, 0xF5FF, 0x0000 }, /* R34  - Interrupt Status 2 Mask */</div><div class='add'>+	{ 0x0F3F, 0x0F3F, 0x0000 }, /* R35  - Power Up Interrupt Status Mask */</div><div class='add'>+	{ 0x0F3F, 0x0F3F, 0x0000 }, /* R36  - Under Voltage Int status Mask */</div><div class='add'>+	{ 0x8000, 0x8000, 0x0000 }, /* R37  - Over Current Int status Mask */</div><div class='add'>+	{ 0x1FFF, 0x1FFF, 0x0000 }, /* R38  - GPIO Interrupt Status Mask */</div><div class='add'>+	{ 0xEF7F, 0xEF7F, 0x0000 }, /* R39  - Comparator IntStatus Mask */</div><div class='add'>+	{ 0xC9F7, 0xC9F7, 0xFFFF }, /* R40  - Clock Control 1 */</div><div class='add'>+	{ 0x8001, 0x8001, 0x0000 }, /* R41  - Clock Control 2 */</div><div class='add'>+	{ 0xFFF7, 0xFFF7, 0xFFFF }, /* R42  - FLL Control 1 */</div><div class='add'>+	{ 0xFBFF, 0xFBFF, 0x0000 }, /* R43  - FLL Control 2 */</div><div class='add'>+	{ 0xFFFF, 0xFFFF, 0x0000 }, /* R44  - FLL Control 3 */</div><div class='add'>+	{ 0x0033, 0x0033, 0x0000 }, /* R45  - FLL Control 4 */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R46 */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R47 */</div><div class='add'>+	{ 0x3033, 0x3033, 0x0000 }, /* R48  - DAC Control */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R49 */</div><div class='add'>+	{ 0x81FF, 0x81FF, 0xFFFF }, /* R50  - DAC Digital Volume L */</div><div class='add'>+	{ 0x81FF, 0x81FF, 0xFFFF }, /* R51  - DAC Digital Volume R */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R52 */</div><div class='add'>+	{ 0x0FFF, 0x0FFF, 0xFFFF }, /* R53  - DAC LR Rate */</div><div class='add'>+	{ 0x0017, 0x0017, 0x0000 }, /* R54  - DAC Clock Control */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R55 */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R56 */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R57 */</div><div class='add'>+	{ 0x4000, 0x4000, 0x0000 }, /* R58  - DAC Mute */</div><div class='add'>+	{ 0x7000, 0x7000, 0x0000 }, /* R59  - DAC Mute Volume */</div><div class='add'>+	{ 0x3C00, 0x3C00, 0x0000 }, /* R60  - DAC Side */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R61 */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R62 */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R63 */</div><div class='add'>+	{ 0x8303, 0x8303, 0xFFFF }, /* R64  - ADC Control */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R65 */</div><div class='add'>+	{ 0x81FF, 0x81FF, 0xFFFF }, /* R66  - ADC Digital Volume L */</div><div class='add'>+	{ 0x81FF, 0x81FF, 0xFFFF }, /* R67  - ADC Digital Volume R */</div><div class='add'>+	{ 0x0FFF, 0x0FFF, 0x0000 }, /* R68  - ADC Divider */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R69 */</div><div class='add'>+	{ 0x0FFF, 0x0FFF, 0xFFFF }, /* R70  - ADC LR Rate */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R71 */</div><div class='add'>+	{ 0x0707, 0x0707, 0xFFFF }, /* R72  - Input Control */</div><div class='add'>+	{ 0xC0C0, 0xC0C0, 0xFFFF }, /* R73  - IN3 Input Control */</div><div class='add'>+	{ 0xC09F, 0xC09F, 0xFFFF }, /* R74  - Mic Bias Control */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R75 */</div><div class='add'>+	{ 0x0F15, 0x0F15, 0xFFFF }, /* R76  - Output Control */</div><div class='add'>+	{ 0xC000, 0xC000, 0xFFFF }, /* R77  - Jack Detect */</div><div class='add'>+	{ 0x03FF, 0x03FF, 0x0000 }, /* R78  - Anti Pop Control */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R79 */</div><div class='add'>+	{ 0xE1FC, 0xE1FC, 0x8000 }, /* R80  - Left Input Volume */</div><div class='add'>+	{ 0xE1FC, 0xE1FC, 0x8000 }, /* R81  - Right Input Volume */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R82 */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R83 */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R84 */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R85 */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R86 */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R87 */</div><div class='add'>+	{ 0x9807, 0x9807, 0xFFFF }, /* R88  - Left Mixer Control */</div><div class='add'>+	{ 0x980B, 0x980B, 0xFFFF }, /* R89  - Right Mixer Control */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R90 */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R91 */</div><div class='add'>+	{ 0x8909, 0x8909, 0xFFFF }, /* R92  - OUT3 Mixer Control */</div><div class='add'>+	{ 0x9E07, 0x9E07, 0xFFFF }, /* R93  - OUT4 Mixer Control */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R94 */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R95 */</div><div class='add'>+	{ 0x0EEE, 0x0EEE, 0x0000 }, /* R96  - Output Left Mixer Volume */</div><div class='add'>+	{ 0xE0EE, 0xE0EE, 0x0000 }, /* R97  - Output Right Mixer Volume */</div><div class='add'>+	{ 0x0E0F, 0x0E0F, 0x0000 }, /* R98  - Input Mixer Volume L */</div><div class='add'>+	{ 0xE0E1, 0xE0E1, 0x0000 }, /* R99  - Input Mixer Volume R */</div><div class='add'>+	{ 0x800E, 0x800E, 0x0000 }, /* R100 - Input Mixer Volume */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R101 */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R102 */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R103 */</div><div class='add'>+	{ 0xE1FC, 0xE1FC, 0xFFFF }, /* R104 - LOUT1 Volume */</div><div class='add'>+	{ 0xE1FC, 0xE1FC, 0xFFFF }, /* R105 - ROUT1 Volume */</div><div class='add'>+	{ 0xE1FC, 0xE1FC, 0xFFFF }, /* R106 - LOUT2 Volume */</div><div class='add'>+	{ 0xE7FC, 0xE7FC, 0xFFFF }, /* R107 - ROUT2 Volume */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R108 */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R109 */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R110 */</div><div class='add'>+	{ 0x80E0, 0x80E0, 0xFFFF }, /* R111 - BEEP Volume */</div><div class='add'>+	{ 0xBF00, 0xBF00, 0x0000 }, /* R112 - AI Formating */</div><div class='add'>+	{ 0x00F1, 0x00F1, 0x0000 }, /* R113 - ADC DAC COMP */</div><div class='add'>+	{ 0x00F8, 0x00F8, 0x0000 }, /* R114 - AI ADC Control */</div><div class='add'>+	{ 0x40FB, 0x40FB, 0x0000 }, /* R115 - AI DAC Control */</div><div class='add'>+	{ 0x7C30, 0x7C30, 0x0000 }, /* R116 - AIF Test */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R117 */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R118 */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R119 */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R120 */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R121 */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R122 */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R123 */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R124 */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R125 */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R126 */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R127 */</div><div class='add'>+	{ 0x1FFF, 0x1FFF, 0x0000 }, /* R128 - GPIO Debounce */</div><div class='add'>+	{ 0x1FFF, 0x1FFF, 0x0000 }, /* R129 - GPIO Pin pull up Control */</div><div class='add'>+	{ 0x1FFF, 0x1FFF, 0x0000 }, /* R130 - GPIO Pull down Control */</div><div class='add'>+	{ 0x1FFF, 0x1FFF, 0x0000 }, /* R131 - GPIO Interrupt Mode */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R132 */</div><div class='add'>+	{ 0x00C0, 0x00C0, 0x0000 }, /* R133 - GPIO Control */</div><div class='add'>+	{ 0x1FFF, 0x1FFF, 0x0000 }, /* R134 - GPIO Configuration (i/o) */</div><div class='add'>+	{ 0x1FFF, 0x1FFF, 0x0000 }, /* R135 - GPIO Pin Polarity / Type */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R136 */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R137 */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R138 */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R139 */</div><div class='add'>+	{ 0xFFFF, 0xFFFF, 0x0000 }, /* R140 - GPIO Function Select 1 */</div><div class='add'>+	{ 0xFFFF, 0xFFFF, 0x0000 }, /* R141 - GPIO Function Select 2 */</div><div class='add'>+	{ 0xFFFF, 0xFFFF, 0x0000 }, /* R142 - GPIO Function Select 3 */</div><div class='add'>+	{ 0x000F, 0x000F, 0x0000 }, /* R143 - GPIO Function Select 4 */</div><div class='add'>+	{ 0xF0FF, 0xF0FF, 0xA000 }, /* R144 - Digitiser Control (1) */</div><div class='add'>+	{ 0x3707, 0x3707, 0x0000 }, /* R145 - Digitiser Control (2) */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R146 */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R147 */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R148 */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R149 */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R150 */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R151 */</div><div class='add'>+	{ 0x7FFF, 0x7000, 0xFFFF }, /* R152 - AUX1 Readback */</div><div class='add'>+	{ 0x7FFF, 0x7000, 0xFFFF }, /* R153 - AUX2 Readback */</div><div class='add'>+	{ 0x7FFF, 0x7000, 0xFFFF }, /* R154 - AUX3 Readback */</div><div class='add'>+	{ 0x7FFF, 0x7000, 0xFFFF }, /* R155 - AUX4 Readback */</div><div class='add'>+	{ 0x0FFF, 0x0000, 0xFFFF }, /* R156 - USB Voltage Readback */</div><div class='add'>+	{ 0x0FFF, 0x0000, 0xFFFF }, /* R157 - LINE Voltage Readback */</div><div class='add'>+	{ 0x0FFF, 0x0000, 0xFFFF }, /* R158 - BATT Voltage Readback */</div><div class='add'>+	{ 0x0FFF, 0x0000, 0xFFFF }, /* R159 - Chip Temp Readback */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R160 */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R161 */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R162 */</div><div class='add'>+	{ 0x000F, 0x000F, 0x0000 }, /* R163 - Generic Comparator Control */</div><div class='add'>+	{ 0xFFFF, 0xFFFF, 0x0000 }, /* R164 - Generic comparator 1 */</div><div class='add'>+	{ 0xFFFF, 0xFFFF, 0x0000 }, /* R165 - Generic comparator 2 */</div><div class='add'>+	{ 0xFFFF, 0xFFFF, 0x0000 }, /* R166 - Generic comparator 3 */</div><div class='add'>+	{ 0xFFFF, 0xFFFF, 0x0000 }, /* R167 - Generic comparator 4 */</div><div class='add'>+	{ 0xBFFF, 0xBFFF, 0x8000 }, /* R168 - Battery Charger Control 1 */</div><div class='add'>+	{ 0xFFFF, 0x4FFF, 0xB000 }, /* R169 - Battery Charger Control 2 */</div><div class='add'>+	{ 0x007F, 0x007F, 0x0000 }, /* R170 - Battery Charger Control 3 */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R171 */</div><div class='add'>+	{ 0x903F, 0x903F, 0xFFFF }, /* R172 - Current Sink Driver A */</div><div class='add'>+	{ 0xE333, 0xE333, 0xFFFF }, /* R173 - CSA Flash control */</div><div class='add'>+	{ 0x903F, 0x903F, 0xFFFF }, /* R174 - Current Sink Driver B */</div><div class='add'>+	{ 0xE333, 0xE333, 0xFFFF }, /* R175 - CSB Flash control */</div><div class='add'>+	{ 0x8F3F, 0x8F3F, 0xFFFF }, /* R176 - DCDC/LDO requested */</div><div class='add'>+	{ 0x332D, 0x332D, 0x0000 }, /* R177 - DCDC Active options */</div><div class='add'>+	{ 0x002D, 0x002D, 0x0000 }, /* R178 - DCDC Sleep options */</div><div class='add'>+	{ 0x5177, 0x5177, 0x8000 }, /* R179 - Power-check comparator */</div><div class='add'>+	{ 0x047F, 0x047F, 0x0000 }, /* R180 - DCDC1 Control */</div><div class='add'>+	{ 0xFFC0, 0xFFC0, 0x0000 }, /* R181 - DCDC1 Timeouts */</div><div class='add'>+	{ 0x737F, 0x737F, 0x0000 }, /* R182 - DCDC1 Low Power */</div><div class='add'>+	{ 0x535B, 0x535B, 0x0000 }, /* R183 - DCDC2 Control */</div><div class='add'>+	{ 0xFFC0, 0xFFC0, 0x0000 }, /* R184 - DCDC2 Timeouts */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R185 */</div><div class='add'>+	{ 0x047F, 0x047F, 0x0000 }, /* R186 - DCDC3 Control */</div><div class='add'>+	{ 0xFFC0, 0xFFC0, 0x0000 }, /* R187 - DCDC3 Timeouts */</div><div class='add'>+	{ 0x737F, 0x737F, 0x0000 }, /* R188 - DCDC3 Low Power */</div><div class='add'>+	{ 0x047F, 0x047F, 0x0000 }, /* R189 - DCDC4 Control */</div><div class='add'>+	{ 0xFFC0, 0xFFC0, 0x0000 }, /* R190 - DCDC4 Timeouts */</div><div class='add'>+	{ 0x737F, 0x737F, 0x0000 }, /* R191 - DCDC4 Low Power */</div><div class='add'>+	{ 0x535B, 0x535B, 0x0000 }, /* R192 - DCDC5 Control */</div><div class='add'>+	{ 0xFFC0, 0xFFC0, 0x0000 }, /* R193 - DCDC5 Timeouts */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R194 */</div><div class='add'>+	{ 0x047F, 0x047F, 0x0000 }, /* R195 - DCDC6 Control */</div><div class='add'>+	{ 0xFFC0, 0xFFC0, 0x0000 }, /* R196 - DCDC6 Timeouts */</div><div class='add'>+	{ 0x737F, 0x737F, 0x0000 }, /* R197 - DCDC6 Low Power */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R198 */</div><div class='add'>+	{ 0xFFD3, 0xFFD3, 0x0000 }, /* R199 - Limit Switch Control */</div><div class='add'>+	{ 0x441F, 0x441F, 0x0000 }, /* R200 - LDO1 Control */</div><div class='add'>+	{ 0xFFC0, 0xFFC0, 0x0000 }, /* R201 - LDO1 Timeouts */</div><div class='add'>+	{ 0x331F, 0x331F, 0x0000 }, /* R202 - LDO1 Low Power */</div><div class='add'>+	{ 0x441F, 0x441F, 0x0000 }, /* R203 - LDO2 Control */</div><div class='add'>+	{ 0xFFC0, 0xFFC0, 0x0000 }, /* R204 - LDO2 Timeouts */</div><div class='add'>+	{ 0x331F, 0x331F, 0x0000 }, /* R205 - LDO2 Low Power */</div><div class='add'>+	{ 0x441F, 0x441F, 0x0000 }, /* R206 - LDO3 Control */</div><div class='add'>+	{ 0xFFC0, 0xFFC0, 0x0000 }, /* R207 - LDO3 Timeouts */</div><div class='add'>+	{ 0x331F, 0x331F, 0x0000 }, /* R208 - LDO3 Low Power */</div><div class='add'>+	{ 0x441F, 0x441F, 0x0000 }, /* R209 - LDO4 Control */</div><div class='add'>+	{ 0xFFC0, 0xFFC0, 0x0000 }, /* R210 - LDO4 Timeouts */</div><div class='add'>+	{ 0x331F, 0x331F, 0x0000 }, /* R211 - LDO4 Low Power */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R212 */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R213 */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R214 */</div><div class='add'>+	{ 0x8F3F, 0x8F3F, 0x0000 }, /* R215 - VCC_FAULT Masks */</div><div class='add'>+	{ 0xFF3F, 0xE03F, 0x0000 }, /* R216 - Main Bandgap Control */</div><div class='add'>+	{ 0xEF2F, 0xE02F, 0x0000 }, /* R217 - OSC Control */</div><div class='add'>+	{ 0xF3FF, 0xB3FF, 0xc000 }, /* R218 - RTC Tick Control */</div><div class='add'>+	{ 0xFFFF, 0xFFFF, 0xFFFF }, /* R219 */</div><div class='add'>+	{ 0x09FF, 0x01FF, 0x0000 }, /* R220 - RAM BIST 1 */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R221 */</div><div class='add'>+	{ 0xFFFF, 0xFFFF, 0xFFFF }, /* R222 */</div><div class='add'>+	{ 0xFFFF, 0xFFFF, 0xFFFF }, /* R223 */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R224 */</div><div class='add'>+	{ 0x8F3F, 0x0000, 0xFFFF }, /* R225 - DCDC/LDO status */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R226 */</div><div class='add'>+	{ 0x0000, 0x0000, 0xFFFF }, /* R227 */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R228 */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R229 */</div><div class='add'>+	{ 0xFFFF, 0x1FFF, 0xFFFF }, /* R230 - GPIO Pin Status */</div><div class='add'>+	{ 0xFFFF, 0x1FFF, 0xFFFF }, /* R231 */</div><div class='add'>+	{ 0xFFFF, 0x1FFF, 0xFFFF }, /* R232 */</div><div class='add'>+	{ 0xFFFF, 0x1FFF, 0xFFFF }, /* R233 */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R234 */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R235 */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R236 */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R237 */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R238 */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R239 */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R240 */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R241 */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R242 */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R243 */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R244 */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R245 */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R246 */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R247 */</div><div class='add'>+	{ 0xFFFF, 0x0010, 0xFFFF }, /* R248 */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R249 */</div><div class='add'>+	{ 0xFFFF, 0x0010, 0xFFFF }, /* R250 */</div><div class='add'>+	{ 0xFFFF, 0x0010, 0xFFFF }, /* R251 */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R252 */</div><div class='add'>+	{ 0xFFFF, 0x0010, 0xFFFF }, /* R253 */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R254 */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000 }, /* R255 */</div><div class='add'>+};</div><div class='head'>diff --git a/drivers/mfd/wm8400-core.c b/drivers/mfd/wm8400-core.c<br/>new file mode 100644<br/>index 000000000000..6a0cedb5bb8a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/mfd/wm8400-core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/mfd/wm8400-core.c</a></div><div class='hunk'>@@ -0,0 +1,455 @@</div><div class='add'>+/*</div><div class='add'>+ * Core driver for WM8400.</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2008 Wolfson Microelectronics PLC.</div><div class='add'>+ *</div><div class='add'>+ * Author: Mark Brown &lt;broonie@opensource.wolfsonmicro.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public License as</div><div class='add'>+ * published by the Free Software Foundation; either version 2 of the</div><div class='add'>+ * License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bug.h&gt;</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/mfd/wm8400-private.h&gt;</div><div class='add'>+#include &lt;linux/mfd/wm8400-audio.h&gt;</div><div class='add'>+</div><div class='add'>+static struct {</div><div class='add'>+	u16  readable;    /* Mask of readable bits */</div><div class='add'>+	u16  writable;    /* Mask of writable bits */</div><div class='add'>+	u16  vol;         /* Mask of volatile bits */</div><div class='add'>+	int  is_codec;    /* Register controlled by codec reset */</div><div class='add'>+	u16  default_val; /* Value on reset */</div><div class='add'>+} reg_data[] = {</div><div class='add'>+	{ 0xFFFF, 0xFFFF, 0x0000, 0, 0x6172 }, /* R0 */</div><div class='add'>+	{ 0x7000, 0x0000, 0x8000, 0, 0x0000 }, /* R1 */</div><div class='add'>+	{ 0xFF17, 0xFF17, 0x0000, 0, 0x0000 }, /* R2 */</div><div class='add'>+	{ 0xEBF3, 0xEBF3, 0x0000, 1, 0x6000 }, /* R3 */</div><div class='add'>+	{ 0x3CF3, 0x3CF3, 0x0000, 1, 0x0000 }, /* R4  */</div><div class='add'>+	{ 0xF1F8, 0xF1F8, 0x0000, 1, 0x4050 }, /* R5  */</div><div class='add'>+	{ 0xFC1F, 0xFC1F, 0x0000, 1, 0x4000 }, /* R6  */</div><div class='add'>+	{ 0xDFDE, 0xDFDE, 0x0000, 1, 0x01C8 }, /* R7  */</div><div class='add'>+	{ 0xFCFC, 0xFCFC, 0x0000, 1, 0x0000 }, /* R8  */</div><div class='add'>+	{ 0xEFFF, 0xEFFF, 0x0000, 1, 0x0040 }, /* R9  */</div><div class='add'>+	{ 0xEFFF, 0xEFFF, 0x0000, 1, 0x0040 }, /* R10 */</div><div class='add'>+	{ 0x27F7, 0x27F7, 0x0000, 1, 0x0004 }, /* R11 */</div><div class='add'>+	{ 0x01FF, 0x01FF, 0x0000, 1, 0x00C0 }, /* R12 */</div><div class='add'>+	{ 0x01FF, 0x01FF, 0x0000, 1, 0x00C0 }, /* R13 */</div><div class='add'>+	{ 0x1FEF, 0x1FEF, 0x0000, 1, 0x0000 }, /* R14 */</div><div class='add'>+	{ 0x0163, 0x0163, 0x0000, 1, 0x0100 }, /* R15 */</div><div class='add'>+	{ 0x01FF, 0x01FF, 0x0000, 1, 0x00C0 }, /* R16 */</div><div class='add'>+	{ 0x01FF, 0x01FF, 0x0000, 1, 0x00C0 }, /* R17 */</div><div class='add'>+	{ 0x1FFF, 0x0FFF, 0x0000, 1, 0x0000 }, /* R18 */</div><div class='add'>+	{ 0xFFFF, 0xFFFF, 0x0000, 1, 0x1000 }, /* R19 */</div><div class='add'>+	{ 0xFFFF, 0xFFFF, 0x0000, 1, 0x1010 }, /* R20 */</div><div class='add'>+	{ 0xFFFF, 0xFFFF, 0x0000, 1, 0x1010 }, /* R21 */</div><div class='add'>+	{ 0x0FDD, 0x0FDD, 0x0000, 1, 0x8000 }, /* R22 */</div><div class='add'>+	{ 0x1FFF, 0x1FFF, 0x0000, 1, 0x0800 }, /* R23 */</div><div class='add'>+	{ 0x0000, 0x01DF, 0x0000, 1, 0x008B }, /* R24 */</div><div class='add'>+	{ 0x0000, 0x01DF, 0x0000, 1, 0x008B }, /* R25 */</div><div class='add'>+	{ 0x0000, 0x01DF, 0x0000, 1, 0x008B }, /* R26 */</div><div class='add'>+	{ 0x0000, 0x01DF, 0x0000, 1, 0x008B }, /* R27 */</div><div class='add'>+	{ 0x0000, 0x01FF, 0x0000, 1, 0x0000 }, /* R28 */</div><div class='add'>+	{ 0x0000, 0x01FF, 0x0000, 1, 0x0000 }, /* R29 */</div><div class='add'>+	{ 0x0000, 0x0077, 0x0000, 1, 0x0066 }, /* R30 */</div><div class='add'>+	{ 0x0000, 0x0033, 0x0000, 1, 0x0022 }, /* R31 */</div><div class='add'>+	{ 0x0000, 0x01FF, 0x0000, 1, 0x0079 }, /* R32 */</div><div class='add'>+	{ 0x0000, 0x01FF, 0x0000, 1, 0x0079 }, /* R33 */</div><div class='add'>+	{ 0x0000, 0x0003, 0x0000, 1, 0x0003 }, /* R34 */</div><div class='add'>+	{ 0x0000, 0x01FF, 0x0000, 1, 0x0003 }, /* R35 */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000, 0, 0x0000 }, /* R36 */</div><div class='add'>+	{ 0x0000, 0x003F, 0x0000, 1, 0x0100 }, /* R37 */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000, 0, 0x0000 }, /* R38 */</div><div class='add'>+	{ 0x0000, 0x000F, 0x0000, 0, 0x0000 }, /* R39 */</div><div class='add'>+	{ 0x0000, 0x00FF, 0x0000, 1, 0x0000 }, /* R40 */</div><div class='add'>+	{ 0x0000, 0x01B7, 0x0000, 1, 0x0000 }, /* R41 */</div><div class='add'>+	{ 0x0000, 0x01B7, 0x0000, 1, 0x0000 }, /* R42 */</div><div class='add'>+	{ 0x0000, 0x01FF, 0x0000, 1, 0x0000 }, /* R43 */</div><div class='add'>+	{ 0x0000, 0x01FF, 0x0000, 1, 0x0000 }, /* R44 */</div><div class='add'>+	{ 0x0000, 0x00FD, 0x0000, 1, 0x0000 }, /* R45 */</div><div class='add'>+	{ 0x0000, 0x00FD, 0x0000, 1, 0x0000 }, /* R46 */</div><div class='add'>+	{ 0x0000, 0x01FF, 0x0000, 1, 0x0000 }, /* R47 */</div><div class='add'>+	{ 0x0000, 0x01FF, 0x0000, 1, 0x0000 }, /* R48 */</div><div class='add'>+	{ 0x0000, 0x01FF, 0x0000, 1, 0x0000 }, /* R49 */</div><div class='add'>+	{ 0x0000, 0x01FF, 0x0000, 1, 0x0000 }, /* R50 */</div><div class='add'>+	{ 0x0000, 0x01B3, 0x0000, 1, 0x0180 }, /* R51 */</div><div class='add'>+	{ 0x0000, 0x0077, 0x0000, 1, 0x0000 }, /* R52 */</div><div class='add'>+	{ 0x0000, 0x0077, 0x0000, 1, 0x0000 }, /* R53 */</div><div class='add'>+	{ 0x0000, 0x00FF, 0x0000, 1, 0x0000 }, /* R54 */</div><div class='add'>+	{ 0x0000, 0x0001, 0x0000, 1, 0x0000 }, /* R55 */</div><div class='add'>+	{ 0x0000, 0x003F, 0x0000, 1, 0x0000 }, /* R56 */</div><div class='add'>+	{ 0x0000, 0x004F, 0x0000, 1, 0x0000 }, /* R57 */</div><div class='add'>+	{ 0x0000, 0x00FD, 0x0000, 1, 0x0000 }, /* R58 */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000, 0, 0x0000 }, /* R59 */</div><div class='add'>+	{ 0x1FFF, 0x1FFF, 0x0000, 1, 0x0000 }, /* R60 */</div><div class='add'>+	{ 0xFFFF, 0xFFFF, 0x0000, 1, 0x0000 }, /* R61 */</div><div class='add'>+	{ 0x03FF, 0x03FF, 0x0000, 1, 0x0000 }, /* R62 */</div><div class='add'>+	{ 0x007F, 0x007F, 0x0000, 1, 0x0000 }, /* R63 */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000, 0, 0x0000 }, /* R64 */</div><div class='add'>+	{ 0xDFFF, 0xDFFF, 0x0000, 0, 0x0000 }, /* R65 */</div><div class='add'>+	{ 0xDFFF, 0xDFFF, 0x0000, 0, 0x0000 }, /* R66 */</div><div class='add'>+	{ 0xDFFF, 0xDFFF, 0x0000, 0, 0x0000 }, /* R67 */</div><div class='add'>+	{ 0xDFFF, 0xDFFF, 0x0000, 0, 0x0000 }, /* R68 */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000, 0, 0x0000 }, /* R69 */</div><div class='add'>+	{ 0xFFFF, 0xFFFF, 0x0000, 0, 0x4400 }, /* R70 */</div><div class='add'>+	{ 0x23FF, 0x23FF, 0x0000, 0, 0x0000 }, /* R71 */</div><div class='add'>+	{ 0xFFFF, 0xFFFF, 0x0000, 0, 0x4400 }, /* R72 */</div><div class='add'>+	{ 0x23FF, 0x23FF, 0x0000, 0, 0x0000 }, /* R73 */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000, 0, 0x0000 }, /* R74 */</div><div class='add'>+	{ 0x000E, 0x000E, 0x0000, 0, 0x0008 }, /* R75 */</div><div class='add'>+	{ 0xE00F, 0xE00F, 0x0000, 0, 0x0000 }, /* R76 */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000, 0, 0x0000 }, /* R77 */</div><div class='add'>+	{ 0x03C0, 0x03C0, 0x0000, 0, 0x02C0 }, /* R78 */</div><div class='add'>+	{ 0xFFFF, 0x0000, 0xffff, 0, 0x0000 }, /* R79 */</div><div class='add'>+	{ 0xFFFF, 0xFFFF, 0x0000, 0, 0x0000 }, /* R80 */</div><div class='add'>+	{ 0xFFFF, 0x0000, 0xffff, 0, 0x0000 }, /* R81 */</div><div class='add'>+	{ 0x2BFF, 0x0000, 0xffff, 0, 0x0000 }, /* R82 */</div><div class='add'>+	{ 0x0000, 0x0000, 0x0000, 0, 0x0000 }, /* R83 */</div><div class='add'>+	{ 0x80FF, 0x80FF, 0x0000, 0, 0x00ff }, /* R84 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int wm8400_read(struct wm8400 *wm8400, u8 reg, int num_regs, u16 *dest)</div><div class='add'>+{</div><div class='add'>+	int i, ret = 0;</div><div class='add'>+</div><div class='add'>+	BUG_ON(reg + num_regs - 1 &gt; ARRAY_SIZE(wm8400-&gt;reg_cache));</div><div class='add'>+</div><div class='add'>+	/* If there are any volatile reads then read back the entire block */</div><div class='add'>+	for (i = reg; i &lt; reg + num_regs; i++)</div><div class='add'>+		if (reg_data[i].vol) {</div><div class='add'>+			ret = wm8400-&gt;read_dev(wm8400-&gt;io_data, reg,</div><div class='add'>+					       num_regs, dest);</div><div class='add'>+			if (ret != 0)</div><div class='add'>+				return ret;</div><div class='add'>+			for (i = 0; i &lt; num_regs; i++)</div><div class='add'>+				dest[i] = be16_to_cpu(dest[i]);</div><div class='add'>+</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	/* Otherwise use the cache */</div><div class='add'>+	memcpy(dest, &amp;wm8400-&gt;reg_cache[reg], num_regs * sizeof(u16));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wm8400_write(struct wm8400 *wm8400, u8 reg, int num_regs,</div><div class='add'>+			u16 *src)</div><div class='add'>+{</div><div class='add'>+	int ret, i;</div><div class='add'>+</div><div class='add'>+	BUG_ON(reg + num_regs - 1 &gt; ARRAY_SIZE(wm8400-&gt;reg_cache));</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num_regs; i++) {</div><div class='add'>+		BUG_ON(!reg_data[reg + i].writable);</div><div class='add'>+		wm8400-&gt;reg_cache[reg + i] = src[i];</div><div class='add'>+		src[i] = cpu_to_be16(src[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Do the actual I/O */</div><div class='add'>+	ret = wm8400-&gt;write_dev(wm8400-&gt;io_data, reg, num_regs, src);</div><div class='add'>+	if (ret != 0)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * wm8400_reg_read - Single register read</div><div class='add'>+ *</div><div class='add'>+ * @wm8400: Pointer to wm8400 control structure</div><div class='add'>+ * @reg:    Register to read</div><div class='add'>+ *</div><div class='add'>+ * @return  Read value</div><div class='add'>+ */</div><div class='add'>+u16 wm8400_reg_read(struct wm8400 *wm8400, u8 reg)</div><div class='add'>+{</div><div class='add'>+	u16 val;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;wm8400-&gt;io_lock);</div><div class='add'>+</div><div class='add'>+	wm8400_read(wm8400, reg, 1, &amp;val);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;wm8400-&gt;io_lock);</div><div class='add'>+</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(wm8400_reg_read);</div><div class='add'>+</div><div class='add'>+int wm8400_block_read(struct wm8400 *wm8400, u8 reg, int count, u16 *data)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;wm8400-&gt;io_lock);</div><div class='add'>+</div><div class='add'>+	ret = wm8400_read(wm8400, reg, count, data);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;wm8400-&gt;io_lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(wm8400_block_read);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * wm8400_set_bits - Bitmask write</div><div class='add'>+ *</div><div class='add'>+ * @wm8400: Pointer to wm8400 control structure</div><div class='add'>+ * @reg:    Register to access</div><div class='add'>+ * @mask:   Mask of bits to change</div><div class='add'>+ * @val:    Value to set for masked bits</div><div class='add'>+ */</div><div class='add'>+int wm8400_set_bits(struct wm8400 *wm8400, u8 reg, u16 mask, u16 val)</div><div class='add'>+{</div><div class='add'>+	u16 tmp;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;wm8400-&gt;io_lock);</div><div class='add'>+</div><div class='add'>+	ret = wm8400_read(wm8400, reg, 1, &amp;tmp);</div><div class='add'>+	tmp = (tmp &amp; ~mask) | val;</div><div class='add'>+	if (ret == 0)</div><div class='add'>+		ret = wm8400_write(wm8400, reg, 1, &amp;tmp);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;wm8400-&gt;io_lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(wm8400_set_bits);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * wm8400_reset_codec_reg_cache - Reset cached codec registers to</div><div class='add'>+ * their default values.</div><div class='add'>+ */</div><div class='add'>+void wm8400_reset_codec_reg_cache(struct wm8400 *wm8400)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;wm8400-&gt;io_lock);</div><div class='add'>+</div><div class='add'>+	/* Reset all codec registers to their initial value */</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(wm8400-&gt;reg_cache); i++)</div><div class='add'>+		if (reg_data[i].is_codec)</div><div class='add'>+			wm8400-&gt;reg_cache[i] = reg_data[i].default_val;</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;wm8400-&gt;io_lock);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(wm8400_reset_codec_reg_cache);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * wm8400_init - Generic initialisation</div><div class='add'>+ *</div><div class='add'>+ * The WM8400 can be configured as either an I2C or SPI device.  Probe</div><div class='add'>+ * functions for each bus set up the accessors then call into this to</div><div class='add'>+ * set up the device itself.</div><div class='add'>+ */</div><div class='add'>+static int wm8400_init(struct wm8400 *wm8400,</div><div class='add'>+		       struct wm8400_platform_data *pdata)</div><div class='add'>+{</div><div class='add'>+	u16 reg;</div><div class='add'>+	int ret, i;</div><div class='add'>+</div><div class='add'>+	mutex_init(&amp;wm8400-&gt;io_lock);</div><div class='add'>+</div><div class='add'>+	wm8400-&gt;dev-&gt;driver_data = wm8400;</div><div class='add'>+</div><div class='add'>+	/* Check that this is actually a WM8400 */</div><div class='add'>+	ret = wm8400-&gt;read_dev(wm8400-&gt;io_data, WM8400_RESET_ID, 1, &amp;reg);</div><div class='add'>+	if (ret != 0) {</div><div class='add'>+		dev_err(wm8400-&gt;dev, "Chip ID register read failed\n");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+	if (be16_to_cpu(reg) != reg_data[WM8400_RESET_ID].default_val) {</div><div class='add'>+		dev_err(wm8400-&gt;dev, "Device is not a WM8400, ID is %x\n",</div><div class='add'>+			be16_to_cpu(reg));</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* We don't know what state the hardware is in and since this</div><div class='add'>+	 * is a PMIC we can't reset it safely so initialise the register</div><div class='add'>+	 * cache from the hardware.</div><div class='add'>+	 */</div><div class='add'>+	ret = wm8400-&gt;read_dev(wm8400-&gt;io_data, 0,</div><div class='add'>+			       ARRAY_SIZE(wm8400-&gt;reg_cache),</div><div class='add'>+			       wm8400-&gt;reg_cache);</div><div class='add'>+	if (ret != 0) {</div><div class='add'>+		dev_err(wm8400-&gt;dev, "Register cache read failed\n");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(wm8400-&gt;reg_cache); i++)</div><div class='add'>+		wm8400-&gt;reg_cache[i] = be16_to_cpu(wm8400-&gt;reg_cache[i]);</div><div class='add'>+</div><div class='add'>+	/* If the codec is in reset use hard coded values */</div><div class='add'>+	if (!(wm8400-&gt;reg_cache[WM8400_POWER_MANAGEMENT_1] &amp; WM8400_CODEC_ENA))</div><div class='add'>+		for (i = 0; i &lt; ARRAY_SIZE(wm8400-&gt;reg_cache); i++)</div><div class='add'>+			if (reg_data[i].is_codec)</div><div class='add'>+				wm8400-&gt;reg_cache[i] = reg_data[i].default_val;</div><div class='add'>+</div><div class='add'>+	ret = wm8400_read(wm8400, WM8400_ID, 1, &amp;reg);</div><div class='add'>+	if (ret != 0) {</div><div class='add'>+		dev_err(wm8400-&gt;dev, "ID register read failed: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+	reg = (reg &amp; WM8400_CHIP_REV_MASK) &gt;&gt; WM8400_CHIP_REV_SHIFT;</div><div class='add'>+	dev_info(wm8400-&gt;dev, "WM8400 revision %x\n", reg);</div><div class='add'>+</div><div class='add'>+	if (pdata &amp;&amp; pdata-&gt;platform_init) {</div><div class='add'>+		ret = pdata-&gt;platform_init(wm8400-&gt;dev);</div><div class='add'>+		if (ret != 0)</div><div class='add'>+			dev_err(wm8400-&gt;dev, "Platform init failed: %d\n",</div><div class='add'>+				ret);</div><div class='add'>+	} else</div><div class='add'>+		dev_warn(wm8400-&gt;dev, "No platform initialisation supplied\n");</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void wm8400_release(struct wm8400 *wm8400)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(wm8400-&gt;regulators); i++)</div><div class='add'>+		if (wm8400-&gt;regulators[i].name)</div><div class='add'>+			platform_device_unregister(&amp;wm8400-&gt;regulators[i]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)</div><div class='add'>+static int wm8400_i2c_read(void *io_data, char reg, int count, u16 *dest)</div><div class='add'>+{</div><div class='add'>+	struct i2c_client *i2c = io_data;</div><div class='add'>+	struct i2c_msg xfer[2];</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Write register */</div><div class='add'>+	xfer[0].addr = i2c-&gt;addr;</div><div class='add'>+	xfer[0].flags = 0;</div><div class='add'>+	xfer[0].len = 1;</div><div class='add'>+	xfer[0].buf = &amp;reg;</div><div class='add'>+</div><div class='add'>+	/* Read data */</div><div class='add'>+	xfer[1].addr = i2c-&gt;addr;</div><div class='add'>+	xfer[1].flags = I2C_M_RD;</div><div class='add'>+	xfer[1].len = count * sizeof(u16);</div><div class='add'>+	xfer[1].buf = (u8 *)dest;</div><div class='add'>+</div><div class='add'>+	ret = i2c_transfer(i2c-&gt;adapter, xfer, 2);</div><div class='add'>+	if (ret == 2)</div><div class='add'>+		ret = 0;</div><div class='add'>+	else if (ret &gt;= 0)</div><div class='add'>+		ret = -EIO;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wm8400_i2c_write(void *io_data, char reg, int count, const u16 *src)</div><div class='add'>+{</div><div class='add'>+	struct i2c_client *i2c = io_data;</div><div class='add'>+	u8 *msg;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* We add 1 byte for device register - ideally I2C would gather. */</div><div class='add'>+	msg = kmalloc((count * sizeof(u16)) + 1, GFP_KERNEL);</div><div class='add'>+	if (msg == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	msg[0] = reg;</div><div class='add'>+	memcpy(&amp;msg[1], src, count * sizeof(u16));</div><div class='add'>+</div><div class='add'>+	ret = i2c_master_send(i2c, msg, (count * sizeof(u16)) + 1);</div><div class='add'>+</div><div class='add'>+	if (ret == (count * 2) + 1)</div><div class='add'>+		ret = 0;</div><div class='add'>+	else if (ret &gt;= 0)</div><div class='add'>+		ret = -EIO;</div><div class='add'>+</div><div class='add'>+	kfree(msg);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wm8400_i2c_probe(struct i2c_client *i2c,</div><div class='add'>+			    const struct i2c_device_id *id)</div><div class='add'>+{</div><div class='add'>+	struct wm8400 *wm8400;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	wm8400 = kzalloc(sizeof(struct wm8400), GFP_KERNEL);</div><div class='add'>+	if (wm8400 == NULL) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	wm8400-&gt;io_data = i2c;</div><div class='add'>+	wm8400-&gt;read_dev = wm8400_i2c_read;</div><div class='add'>+	wm8400-&gt;write_dev = wm8400_i2c_write;</div><div class='add'>+	wm8400-&gt;dev = &amp;i2c-&gt;dev;</div><div class='add'>+	i2c_set_clientdata(i2c, wm8400);</div><div class='add'>+</div><div class='add'>+	ret = wm8400_init(wm8400, i2c-&gt;dev.platform_data);</div><div class='add'>+	if (ret != 0)</div><div class='add'>+		goto struct_err;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+struct_err:</div><div class='add'>+	i2c_set_clientdata(i2c, NULL);</div><div class='add'>+	kfree(wm8400);</div><div class='add'>+err:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wm8400_i2c_remove(struct i2c_client *i2c)</div><div class='add'>+{</div><div class='add'>+	struct wm8400 *wm8400 = i2c_get_clientdata(i2c);</div><div class='add'>+</div><div class='add'>+	wm8400_release(wm8400);</div><div class='add'>+	i2c_set_clientdata(i2c, NULL);</div><div class='add'>+	kfree(wm8400);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct i2c_device_id wm8400_i2c_id[] = {</div><div class='add'>+       { "wm8400", 0 },</div><div class='add'>+       { }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(i2c, wm8400_i2c_id);</div><div class='add'>+</div><div class='add'>+static struct i2c_driver wm8400_i2c_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = "WM8400",</div><div class='add'>+		.owner = THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+	.probe    = wm8400_i2c_probe,</div><div class='add'>+	.remove   = wm8400_i2c_remove,</div><div class='add'>+	.id_table = wm8400_i2c_id,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static int __init wm8400_module_init(void)</div><div class='add'>+{</div><div class='add'>+	int ret = -ENODEV;</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)</div><div class='add'>+	ret = i2c_add_driver(&amp;wm8400_i2c_driver);</div><div class='add'>+	if (ret != 0)</div><div class='add'>+		pr_err("Failed to register I2C driver: %d\n", ret);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+module_init(wm8400_module_init);</div><div class='add'>+</div><div class='add'>+static void __exit wm8400_module_exit(void)</div><div class='add'>+{</div><div class='add'>+#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)</div><div class='add'>+	i2c_del_driver(&amp;wm8400_i2c_driver);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+module_exit(wm8400_module_exit);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_AUTHOR("Mark Brown &lt;broonie@opensource.wolfsonmicro.com&gt;");</div><div class='head'>diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig<br/>index a726f3b01a6b..efd3aa08b88b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/misc/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/misc/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/misc/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/misc/Kconfig</a></div><div class='hunk'>@@ -15,7 +15,7 @@ if MISC_DEVICES</div><div class='ctx'> </div><div class='ctx'> config ATMEL_PWM</div><div class='ctx'> 	tristate "Atmel AT32/AT91 PWM support"</div><div class='del'>-	depends on AVR32 || ARCH_AT91</div><div class='add'>+	depends on AVR32 || ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || ARCH_AT91CAP9</div><div class='ctx'> 	help</div><div class='ctx'> 	  This option enables device driver support for the PWM channels</div><div class='ctx'> 	  on certain Atmel prcoessors.  Pulse Width Modulation is used for</div><div class='hunk'>@@ -409,6 +409,7 @@ config EEEPC_LAPTOP</div><div class='ctx'> 	depends on BACKLIGHT_CLASS_DEVICE</div><div class='ctx'> 	depends on HWMON</div><div class='ctx'> 	depends on EXPERIMENTAL</div><div class='add'>+	depends on RFKILL</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  This driver supports the Fn-Fx keys on Eee PC laptops.</div><div class='ctx'> 	  It also adds the ability to switch camera/wlan on/off.</div><div class='head'>diff --git a/drivers/misc/hp-wmi.c b/drivers/misc/hp-wmi.c<br/>index 6d407c2a4f91..5dabfb69ee53 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/misc/hp-wmi.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/misc/hp-wmi.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/misc/hp-wmi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/misc/hp-wmi.c</a></div><div class='hunk'>@@ -309,7 +309,7 @@ static int hp_wmi_setkeycode(struct input_dev *dev, int scancode, int keycode)</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void hp_wmi_notify(u32 value, void *context)</div><div class='add'>+static void hp_wmi_notify(u32 value, void *context)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_buffer response = { ACPI_ALLOCATE_BUFFER, NULL };</div><div class='ctx'> 	static struct key_entry *key;</div><div class='head'>diff --git a/drivers/misc/phantom.c b/drivers/misc/phantom.c<br/>index daf585689ce3..abdebe347383 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/misc/phantom.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/misc/phantom.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/misc/phantom.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/misc/phantom.c</a></div><div class='hunk'>@@ -399,9 +399,9 @@ static int __devinit phantom_probe(struct pci_dev *pdev,</div><div class='ctx'> 		goto err_irq;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (IS_ERR(device_create_drvdata(phantom_class, &amp;pdev-&gt;dev,</div><div class='del'>-					 MKDEV(phantom_major, minor),</div><div class='del'>-					 NULL, "phantom%u", minor)))</div><div class='add'>+	if (IS_ERR(device_create(phantom_class, &amp;pdev-&gt;dev,</div><div class='add'>+				 MKDEV(phantom_major, minor), NULL,</div><div class='add'>+				 "phantom%u", minor)))</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "can't create device\n");</div><div class='ctx'> </div><div class='ctx'> 	pci_set_drvdata(pdev, pht);</div><div class='head'>diff --git a/drivers/misc/sgi-gru/gru.h b/drivers/misc/sgi-gru/gru.h<br/>index 40df7cb3f0a5..f93f03a9e6e9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/misc/sgi-gru/gru.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/misc/sgi-gru/gru.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/misc/sgi-gru/gru.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/misc/sgi-gru/gru.h</a></div><div class='hunk'>@@ -30,9 +30,9 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Size used to map GRU GSeg</div><div class='ctx'>  */</div><div class='del'>-#if defined CONFIG_IA64</div><div class='add'>+#if defined(CONFIG_IA64)</div><div class='ctx'> #define GRU_GSEG_PAGESIZE	(256 * 1024UL)</div><div class='del'>-#elif defined CONFIG_X86_64</div><div class='add'>+#elif defined(CONFIG_X86_64)</div><div class='ctx'> #define GRU_GSEG_PAGESIZE	(256 * 1024UL)		/* ZZZ 2MB ??? */</div><div class='ctx'> #else</div><div class='ctx'> #error "Unsupported architecture"</div><div class='head'>diff --git a/drivers/misc/sgi-gru/gru_instructions.h b/drivers/misc/sgi-gru/gru_instructions.h<br/>index 0dc36225c7c6..48762e7b98be 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/misc/sgi-gru/gru_instructions.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/misc/sgi-gru/gru_instructions.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/misc/sgi-gru/gru_instructions.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/misc/sgi-gru/gru_instructions.h</a></div><div class='hunk'>@@ -26,7 +26,7 @@</div><div class='ctx'>  * Architecture dependent functions</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#if defined CONFIG_IA64</div><div class='add'>+#if defined(CONFIG_IA64)</div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='ctx'> #include &lt;asm/intrinsics.h&gt;</div><div class='ctx'> #define __flush_cache(p)		ia64_fc(p)</div><div class='hunk'>@@ -36,7 +36,7 @@</div><div class='ctx'> 			barrier();					\</div><div class='ctx'> 			*((volatile int *)(p)) = v; /* force st.rel */	\</div><div class='ctx'> 		} while (0)</div><div class='del'>-#elif defined CONFIG_X86_64</div><div class='add'>+#elif defined(CONFIG_X86_64)</div><div class='ctx'> #define __flush_cache(p)		clflush(p)</div><div class='ctx'> #define gru_ordered_store_int(p,v)					\</div><div class='ctx'> 		do {							\</div><div class='hunk'>@@ -299,6 +299,7 @@ static inline void gru_flush_cache(void *p)</div><div class='ctx'> static inline void gru_start_instruction(struct gru_instruction *ins, int op32)</div><div class='ctx'> {</div><div class='ctx'> 	gru_ordered_store_int(ins, op32);</div><div class='add'>+	gru_flush_cache(ins);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -604,8 +605,9 @@ static inline int gru_get_cb_substatus(void *cb)</div><div class='ctx'> static inline int gru_check_status(void *cb)</div><div class='ctx'> {</div><div class='ctx'> 	struct gru_control_block_status *cbs = (void *)cb;</div><div class='del'>-	int ret = cbs-&gt;istatus;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='add'>+	ret = cbs-&gt;istatus;</div><div class='ctx'> 	if (ret == CBS_CALL_OS)</div><div class='ctx'> 		ret = gru_check_status_proc(cb);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -617,7 +619,7 @@ static inline int gru_check_status(void *cb)</div><div class='ctx'> static inline int gru_wait(void *cb)</div><div class='ctx'> {</div><div class='ctx'> 	struct gru_control_block_status *cbs = (void *)cb;</div><div class='del'>-	int ret = cbs-&gt;istatus;;</div><div class='add'>+	int ret = cbs-&gt;istatus;</div><div class='ctx'> </div><div class='ctx'> 	if (ret != CBS_IDLE)</div><div class='ctx'> 		ret = gru_wait_proc(cb);</div><div class='head'>diff --git a/drivers/misc/sgi-gru/grufault.c b/drivers/misc/sgi-gru/grufault.c<br/>index 3d33015bbf31..8c389d606c30 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/misc/sgi-gru/grufault.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/misc/sgi-gru/grufault.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/misc/sgi-gru/grufault.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/misc/sgi-gru/grufault.c</a></div><div class='hunk'>@@ -214,12 +214,14 @@ static int non_atomic_pte_lookup(struct vm_area_struct *vma,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- *</div><div class='ctx'>  * atomic_pte_lookup</div><div class='ctx'>  *</div><div class='ctx'>  * Convert a user virtual address to a physical address</div><div class='ctx'>  * Only supports Intel large pages (2MB only) on x86_64.</div><div class='ctx'>  *	ZZZ - hugepage support is incomplete</div><div class='add'>+ *</div><div class='add'>+ * NOTE: mmap_sem is already held on entry to this function. This</div><div class='add'>+ * guarantees existence of the page tables.</div><div class='ctx'>  */</div><div class='ctx'> static int atomic_pte_lookup(struct vm_area_struct *vma, unsigned long vaddr,</div><div class='ctx'> 	int write, unsigned long *paddr, int *pageshift)</div><div class='hunk'>@@ -229,9 +231,6 @@ static int atomic_pte_lookup(struct vm_area_struct *vma, unsigned long vaddr,</div><div class='ctx'> 	pud_t *pudp;</div><div class='ctx'> 	pte_t pte;</div><div class='ctx'> </div><div class='del'>-	WARN_ON(irqs_disabled());		/* ZZZ debug */</div><div class='del'>-</div><div class='del'>-	local_irq_disable();</div><div class='ctx'> 	pgdp = pgd_offset(vma-&gt;vm_mm, vaddr);</div><div class='ctx'> 	if (unlikely(pgd_none(*pgdp)))</div><div class='ctx'> 		goto err;</div><div class='hunk'>@@ -250,8 +249,6 @@ static int atomic_pte_lookup(struct vm_area_struct *vma, unsigned long vaddr,</div><div class='ctx'> #endif</div><div class='ctx'> 		pte = *pte_offset_kernel(pmdp, vaddr);</div><div class='ctx'> </div><div class='del'>-	local_irq_enable();</div><div class='del'>-</div><div class='ctx'> 	if (unlikely(!pte_present(pte) ||</div><div class='ctx'> 		     (write &amp;&amp; (!pte_write(pte) || !pte_dirty(pte)))))</div><div class='ctx'> 		return 1;</div><div class='hunk'>@@ -324,6 +321,7 @@ static int gru_try_dropin(struct gru_thread_state *gts,</div><div class='ctx'> 	 * Atomic lookup is faster &amp; usually works even if called in non-atomic</div><div class='ctx'> 	 * context.</div><div class='ctx'> 	 */</div><div class='add'>+	rmb();	/* Must/check ms_range_active before loading PTEs */</div><div class='ctx'> 	ret = atomic_pte_lookup(vma, vaddr, write, &amp;paddr, &amp;pageshift);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		if (!cb)</div><div class='hunk'>@@ -543,6 +541,7 @@ int gru_get_exception_detail(unsigned long arg)</div><div class='ctx'> 		ucbnum = get_cb_number((void *)excdet.cb);</div><div class='ctx'> 		cbrnum = thread_cbr_number(gts, ucbnum);</div><div class='ctx'> 		cbe = get_cbe_by_index(gts-&gt;ts_gru, cbrnum);</div><div class='add'>+		prefetchw(cbe);		/* Harmless on hardware, required for emulator */</div><div class='ctx'> 		excdet.opc = cbe-&gt;opccpy;</div><div class='ctx'> 		excdet.exopc = cbe-&gt;exopccpy;</div><div class='ctx'> 		excdet.ecause = cbe-&gt;ecause;</div><div class='head'>diff --git a/drivers/misc/sgi-gru/grufile.c b/drivers/misc/sgi-gru/grufile.c<br/>index d61cee796efd..5c027b6b4e5a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/misc/sgi-gru/grufile.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/misc/sgi-gru/grufile.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/misc/sgi-gru/grufile.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/misc/sgi-gru/grufile.c</a></div><div class='hunk'>@@ -113,7 +113,7 @@ static int gru_file_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> </div><div class='ctx'> 	if (vma-&gt;vm_start &amp; (GRU_GSEG_PAGESIZE - 1) ||</div><div class='del'>-			vma-&gt;vm_end &amp; (GRU_GSEG_PAGESIZE - 1))</div><div class='add'>+	    			vma-&gt;vm_end &amp; (GRU_GSEG_PAGESIZE - 1))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	vma-&gt;vm_flags |=</div><div class='hunk'>@@ -398,6 +398,12 @@ static int __init gru_init(void)</div><div class='ctx'> 	irq = get_base_irq();</div><div class='ctx'> 	for (chip = 0; chip &lt; GRU_CHIPLETS_PER_BLADE; chip++) {</div><div class='ctx'> 		ret = request_irq(irq + chip, gru_intr, 0, id, NULL);</div><div class='add'>+		/* TODO: fix irq handling on x86. For now ignore failures because</div><div class='add'>+		 * interrupts are not required &amp; not yet fully supported */</div><div class='add'>+		if (ret) {</div><div class='add'>+			printk("!!!WARNING: GRU ignoring request failure!!!\n");</div><div class='add'>+			ret = 0;</div><div class='add'>+		}</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			printk(KERN_ERR "%s: request_irq failed\n",</div><div class='ctx'> 			       GRU_DRIVER_ID_STR);</div><div class='head'>diff --git a/drivers/misc/sgi-gru/gruhandles.h b/drivers/misc/sgi-gru/gruhandles.h<br/>index d16031d62673..b63018d60fe1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/misc/sgi-gru/gruhandles.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/misc/sgi-gru/gruhandles.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/misc/sgi-gru/gruhandles.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/misc/sgi-gru/gruhandles.h</a></div><div class='hunk'>@@ -91,12 +91,7 @@</div><div class='ctx'> #define GSEGPOFF(h) 		((h) &amp; (GRU_SIZE - 1))</div><div class='ctx'> </div><div class='ctx'> /* Convert an arbitrary handle address to the beginning of the GRU segment */</div><div class='del'>-#ifndef __PLUGIN__</div><div class='ctx'> #define GRUBASE(h)		((void *)((unsigned long)(h) &amp; ~(GRU_SIZE - 1)))</div><div class='del'>-#else</div><div class='del'>-extern void *gmu_grubase(void *h);</div><div class='del'>-#define GRUBASE(h)		gmu_grubase(h)</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> /* General addressing macros. */</div><div class='ctx'> static inline void *get_gseg_base_address(void *base, int ctxnum)</div><div class='head'>diff --git a/drivers/misc/sgi-gru/grukservices.c b/drivers/misc/sgi-gru/grukservices.c<br/>index dfd49af0fe18..880c55dfb662 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/misc/sgi-gru/grukservices.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/misc/sgi-gru/grukservices.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/misc/sgi-gru/grukservices.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/misc/sgi-gru/grukservices.c</a></div><div class='hunk'>@@ -122,6 +122,7 @@ int gru_get_cb_exception_detail(void *cb,</div><div class='ctx'> 	struct gru_control_block_extended *cbe;</div><div class='ctx'> </div><div class='ctx'> 	cbe = get_cbe(GRUBASE(cb), get_cb_number(cb));</div><div class='add'>+	prefetchw(cbe);         /* Harmless on hardware, required for emulator */</div><div class='ctx'> 	excdet-&gt;opc = cbe-&gt;opccpy;</div><div class='ctx'> 	excdet-&gt;exopc = cbe-&gt;exopccpy;</div><div class='ctx'> 	excdet-&gt;ecause = cbe-&gt;ecause;</div><div class='hunk'>@@ -466,7 +467,7 @@ int gru_send_message_gpa(unsigned long mq, void *mesg, unsigned int bytes)</div><div class='ctx'> 	STAT(mesq_send);</div><div class='ctx'> 	BUG_ON(bytes &lt; sizeof(int) || bytes &gt; 2 * GRU_CACHE_LINE_BYTES);</div><div class='ctx'> </div><div class='del'>-	clines = (bytes + GRU_CACHE_LINE_BYTES - 1) / GRU_CACHE_LINE_BYTES;</div><div class='add'>+	clines = DIV_ROUND_UP(bytes, GRU_CACHE_LINE_BYTES);</div><div class='ctx'> 	if (gru_get_cpu_resources(bytes, &amp;cb, &amp;dsr))</div><div class='ctx'> 		return MQE_BUG_NO_RESOURCES;</div><div class='ctx'> 	memcpy(dsr, mesg, bytes);</div><div class='head'>diff --git a/drivers/misc/sgi-gru/grumain.c b/drivers/misc/sgi-gru/grumain.c<br/>index 0eeb8dddd2f5..e11e1ac50900 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/misc/sgi-gru/grumain.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/misc/sgi-gru/grumain.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/misc/sgi-gru/grumain.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/misc/sgi-gru/grumain.c</a></div><div class='hunk'>@@ -432,29 +432,35 @@ static inline long gru_copy_handle(void *d, void *s)</div><div class='ctx'> 	return GRU_HANDLE_BYTES;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* rewrite in assembly &amp; use lots of prefetch */</div><div class='del'>-static void gru_load_context_data(void *save, void *grubase, int ctxnum,</div><div class='del'>-				  unsigned long cbrmap, unsigned long dsrmap)</div><div class='add'>+static void gru_prefetch_context(void *gseg, void *cb, void *cbe, unsigned long cbrmap,</div><div class='add'>+				unsigned long length)</div><div class='ctx'> {</div><div class='del'>-	void *gseg, *cb, *cbe;</div><div class='del'>-	unsigned long length;</div><div class='ctx'> 	int i, scr;</div><div class='ctx'> </div><div class='del'>-	gseg = grubase + ctxnum * GRU_GSEG_STRIDE;</div><div class='del'>-	length = hweight64(dsrmap) * GRU_DSR_AU_BYTES;</div><div class='ctx'> 	prefetch_data(gseg + GRU_DS_BASE, length / GRU_CACHE_LINE_BYTES,</div><div class='ctx'> 		      GRU_CACHE_LINE_BYTES);</div><div class='ctx'> </div><div class='del'>-	cb = gseg + GRU_CB_BASE;</div><div class='del'>-	cbe = grubase + GRU_CBE_BASE;</div><div class='ctx'> 	for_each_cbr_in_allocation_map(i, &amp;cbrmap, scr) {</div><div class='ctx'> 		prefetch_data(cb, 1, GRU_CACHE_LINE_BYTES);</div><div class='ctx'> 		prefetch_data(cbe + i * GRU_HANDLE_STRIDE, 1,</div><div class='ctx'> 			      GRU_CACHE_LINE_BYTES);</div><div class='ctx'> 		cb += GRU_HANDLE_STRIDE;</div><div class='ctx'> 	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void gru_load_context_data(void *save, void *grubase, int ctxnum,</div><div class='add'>+				  unsigned long cbrmap, unsigned long dsrmap)</div><div class='add'>+{</div><div class='add'>+	void *gseg, *cb, *cbe;</div><div class='add'>+	unsigned long length;</div><div class='add'>+	int i, scr;</div><div class='ctx'> </div><div class='add'>+	gseg = grubase + ctxnum * GRU_GSEG_STRIDE;</div><div class='ctx'> 	cb = gseg + GRU_CB_BASE;</div><div class='add'>+	cbe = grubase + GRU_CBE_BASE;</div><div class='add'>+	length = hweight64(dsrmap) * GRU_DSR_AU_BYTES;</div><div class='add'>+	gru_prefetch_context(gseg, cb, cbe, cbrmap, length);</div><div class='add'>+</div><div class='ctx'> 	for_each_cbr_in_allocation_map(i, &amp;cbrmap, scr) {</div><div class='ctx'> 		save += gru_copy_handle(cb, save);</div><div class='ctx'> 		save += gru_copy_handle(cbe + i * GRU_HANDLE_STRIDE, save);</div><div class='hunk'>@@ -472,15 +478,16 @@ static void gru_unload_context_data(void *save, void *grubase, int ctxnum,</div><div class='ctx'> 	int i, scr;</div><div class='ctx'> </div><div class='ctx'> 	gseg = grubase + ctxnum * GRU_GSEG_STRIDE;</div><div class='del'>-</div><div class='ctx'> 	cb = gseg + GRU_CB_BASE;</div><div class='ctx'> 	cbe = grubase + GRU_CBE_BASE;</div><div class='add'>+	length = hweight64(dsrmap) * GRU_DSR_AU_BYTES;</div><div class='add'>+	gru_prefetch_context(gseg, cb, cbe, cbrmap, length);</div><div class='add'>+</div><div class='ctx'> 	for_each_cbr_in_allocation_map(i, &amp;cbrmap, scr) {</div><div class='ctx'> 		save += gru_copy_handle(save, cb);</div><div class='ctx'> 		save += gru_copy_handle(save, cbe + i * GRU_HANDLE_STRIDE);</div><div class='ctx'> 		cb += GRU_HANDLE_STRIDE;</div><div class='ctx'> 	}</div><div class='del'>-	length = hweight64(dsrmap) * GRU_DSR_AU_BYTES;</div><div class='ctx'> 	memcpy(save, gseg + GRU_DS_BASE, length);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig<br/>index c0b41e8bcd9d..f2eeb38efa65 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/mmc/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/mmc/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/mmc/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/mmc/Kconfig</a></div><div class='hunk'>@@ -3,13 +3,14 @@</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> menuconfig MMC</div><div class='del'>-	tristate "MMC/SD card support"</div><div class='add'>+	tristate "MMC/SD/SDIO card support"</div><div class='ctx'> 	depends on HAS_IOMEM</div><div class='ctx'> 	help</div><div class='del'>-	  MMC is the "multi-media card" bus protocol.</div><div class='add'>+	  This selects MultiMediaCard, Secure Digital and Secure</div><div class='add'>+	  Digital I/O support.</div><div class='ctx'> </div><div class='del'>-	  If you want MMC support, you should say Y here and also</div><div class='del'>-	  to the specific driver for your MMC interface.</div><div class='add'>+	  If you want MMC/SD/SDIO support, you should say Y here and</div><div class='add'>+	  also to your specific host controller driver.</div><div class='ctx'> </div><div class='ctx'> config MMC_DEBUG</div><div class='ctx'> 	bool "MMC debugging"</div><div class='head'>diff --git a/drivers/mmc/card/Kconfig b/drivers/mmc/card/Kconfig<br/>index dd0f398ee2f5..3f2a912659af 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/mmc/card/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/mmc/card/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/mmc/card/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/mmc/card/Kconfig</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'> # MMC/SD card drivers</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-comment "MMC/SD Card Drivers"</div><div class='add'>+comment "MMC/SD/SDIO Card Drivers"</div><div class='ctx'> </div><div class='ctx'> config MMC_BLOCK</div><div class='ctx'> 	tristate "MMC block device driver"</div><div class='hunk'>@@ -34,7 +34,6 @@ config MMC_BLOCK_BOUNCE</div><div class='ctx'> </div><div class='ctx'> config SDIO_UART</div><div class='ctx'> 	tristate "SDIO UART/GPS class support"</div><div class='del'>-	depends on MMC</div><div class='ctx'> 	help</div><div class='ctx'> 	  SDIO function driver for SDIO cards that implements the UART</div><div class='ctx'> 	  class, as well as the GPS class which appears like a UART.</div><div class='head'>diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c<br/>index ebc8b9d77613..24c97d3d16bb 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/mmc/card/block.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/mmc/card/block.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/mmc/card/block.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/mmc/card/block.c</a></div><div class='hunk'>@@ -29,6 +29,7 @@</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/scatterlist.h&gt;</div><div class='add'>+#include &lt;linux/string_helpers.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/mmc/card.h&gt;</div><div class='ctx'> #include &lt;linux/mmc/host.h&gt;</div><div class='hunk'>@@ -57,7 +58,6 @@ struct mmc_blk_data {</div><div class='ctx'> 	struct mmc_queue queue;</div><div class='ctx'> </div><div class='ctx'> 	unsigned int	usage;</div><div class='del'>-	unsigned int	block_bits;</div><div class='ctx'> 	unsigned int	read_only;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -83,7 +83,7 @@ static void mmc_blk_put(struct mmc_blk_data *md)</div><div class='ctx'> 	mutex_lock(&amp;open_lock);</div><div class='ctx'> 	md-&gt;usage--;</div><div class='ctx'> 	if (md-&gt;usage == 0) {</div><div class='del'>-		int devidx = md-&gt;disk-&gt;first_minor &gt;&gt; MMC_SHIFT;</div><div class='add'>+		int devidx = MINOR(disk_devt(md-&gt;disk)) &gt;&gt; MMC_SHIFT;</div><div class='ctx'> 		__clear_bit(devidx, dev_use);</div><div class='ctx'> </div><div class='ctx'> 		put_disk(md-&gt;disk);</div><div class='hunk'>@@ -215,8 +215,7 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req)</div><div class='ctx'> 	struct mmc_blk_data *md = mq-&gt;data;</div><div class='ctx'> 	struct mmc_card *card = md-&gt;queue.card;</div><div class='ctx'> 	struct mmc_blk_request brq;</div><div class='del'>-	int ret = 1, data_size, i;</div><div class='del'>-	struct scatterlist *sg;</div><div class='add'>+	int ret = 1;</div><div class='ctx'> </div><div class='ctx'> 	mmc_claim_host(card-&gt;host);</div><div class='ctx'> </div><div class='hunk'>@@ -232,13 +231,11 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req)</div><div class='ctx'> 		if (!mmc_card_blockaddr(card))</div><div class='ctx'> 			brq.cmd.arg &lt;&lt;= 9;</div><div class='ctx'> 		brq.cmd.flags = MMC_RSP_SPI_R1 | MMC_RSP_R1 | MMC_CMD_ADTC;</div><div class='del'>-		brq.data.blksz = 1 &lt;&lt; md-&gt;block_bits;</div><div class='add'>+		brq.data.blksz = 512;</div><div class='ctx'> 		brq.stop.opcode = MMC_STOP_TRANSMISSION;</div><div class='ctx'> 		brq.stop.arg = 0;</div><div class='ctx'> 		brq.stop.flags = MMC_RSP_SPI_R1B | MMC_RSP_R1B | MMC_CMD_AC;</div><div class='del'>-		brq.data.blocks = req-&gt;nr_sectors &gt;&gt; (md-&gt;block_bits - 9);</div><div class='del'>-		if (brq.data.blocks &gt; card-&gt;host-&gt;max_blk_count)</div><div class='del'>-			brq.data.blocks = card-&gt;host-&gt;max_blk_count;</div><div class='add'>+		brq.data.blocks = req-&gt;nr_sectors;</div><div class='ctx'> </div><div class='ctx'> 		if (brq.data.blocks &gt; 1) {</div><div class='ctx'> 			/* SPI multiblock writes terminate using a special</div><div class='hunk'>@@ -270,24 +267,6 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req)</div><div class='ctx'> </div><div class='ctx'> 		mmc_queue_bounce_pre(mq);</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * Adjust the sg list so it is the same size as the</div><div class='del'>-		 * request.</div><div class='del'>-		 */</div><div class='del'>-		if (brq.data.blocks !=</div><div class='del'>-		    (req-&gt;nr_sectors &gt;&gt; (md-&gt;block_bits - 9))) {</div><div class='del'>-			data_size = brq.data.blocks * brq.data.blksz;</div><div class='del'>-			for_each_sg(brq.data.sg, sg, brq.data.sg_len, i) {</div><div class='del'>-				data_size -= sg-&gt;length;</div><div class='del'>-				if (data_size &lt;= 0) {</div><div class='del'>-					sg-&gt;length += data_size;</div><div class='del'>-					i++;</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			brq.data.sg_len = i;</div><div class='del'>-		}</div><div class='del'>-</div><div class='ctx'> 		mmc_wait_for_req(card-&gt;host, &amp;brq.mrq);</div><div class='ctx'> </div><div class='ctx'> 		mmc_queue_bounce_post(mq);</div><div class='hunk'>@@ -372,16 +351,11 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req)</div><div class='ctx'> 	if (rq_data_dir(req) != READ) {</div><div class='ctx'> 		if (mmc_card_sd(card)) {</div><div class='ctx'> 			u32 blocks;</div><div class='del'>-			unsigned int bytes;</div><div class='ctx'> </div><div class='ctx'> 			blocks = mmc_sd_num_wr_blocks(card);</div><div class='ctx'> 			if (blocks != (u32)-1) {</div><div class='del'>-				if (card-&gt;csd.write_partial)</div><div class='del'>-					bytes = blocks &lt;&lt; md-&gt;block_bits;</div><div class='del'>-				else</div><div class='del'>-					bytes = blocks &lt;&lt; 9;</div><div class='ctx'> 				spin_lock_irq(&amp;md-&gt;lock);</div><div class='del'>-				ret = __blk_end_request(req, 0, bytes);</div><div class='add'>+				ret = __blk_end_request(req, 0, blocks &lt;&lt; 9);</div><div class='ctx'> 				spin_unlock_irq(&amp;md-&gt;lock);</div><div class='ctx'> 			}</div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -431,13 +405,6 @@ static struct mmc_blk_data *mmc_blk_alloc(struct mmc_card *card)</div><div class='ctx'> 	 */</div><div class='ctx'> 	md-&gt;read_only = mmc_blk_readonly(card);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Both SD and MMC specifications state (although a bit</div><div class='del'>-	 * unclearly in the MMC case) that a block size of 512</div><div class='del'>-	 * bytes must always be supported by the card.</div><div class='del'>-	 */</div><div class='del'>-	md-&gt;block_bits = 9;</div><div class='del'>-</div><div class='ctx'> 	md-&gt;disk = alloc_disk(1 &lt;&lt; MMC_SHIFT);</div><div class='ctx'> 	if (md-&gt;disk == NULL) {</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='hunk'>@@ -475,7 +442,7 @@ static struct mmc_blk_data *mmc_blk_alloc(struct mmc_card *card)</div><div class='ctx'> </div><div class='ctx'> 	sprintf(md-&gt;disk-&gt;disk_name, "mmcblk%d", devidx);</div><div class='ctx'> </div><div class='del'>-	blk_queue_hardsect_size(md-&gt;queue.queue, 1 &lt;&lt; md-&gt;block_bits);</div><div class='add'>+	blk_queue_hardsect_size(md-&gt;queue.queue, 512);</div><div class='ctx'> </div><div class='ctx'> 	if (!mmc_card_sd(card) &amp;&amp; mmc_card_blockaddr(card)) {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -513,7 +480,7 @@ mmc_blk_set_blksize(struct mmc_blk_data *md, struct mmc_card *card)</div><div class='ctx'> </div><div class='ctx'> 	mmc_claim_host(card-&gt;host);</div><div class='ctx'> 	cmd.opcode = MMC_SET_BLOCKLEN;</div><div class='del'>-	cmd.arg = 1 &lt;&lt; md-&gt;block_bits;</div><div class='add'>+	cmd.arg = 512;</div><div class='ctx'> 	cmd.flags = MMC_RSP_SPI_R1 | MMC_RSP_R1 | MMC_CMD_AC;</div><div class='ctx'> 	err = mmc_wait_for_cmd(card-&gt;host, &amp;cmd, 5);</div><div class='ctx'> 	mmc_release_host(card-&gt;host);</div><div class='hunk'>@@ -532,6 +499,8 @@ static int mmc_blk_probe(struct mmc_card *card)</div><div class='ctx'> 	struct mmc_blk_data *md;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='add'>+	char cap_str[10];</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Check that the card supports the command class(es) we need.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -546,10 +515,11 @@ static int mmc_blk_probe(struct mmc_card *card)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "%s: %s %s %lluKiB %s\n",</div><div class='add'>+	string_get_size(get_capacity(md-&gt;disk) &lt;&lt; 9, STRING_UNITS_2,</div><div class='add'>+			cap_str, sizeof(cap_str));</div><div class='add'>+	printk(KERN_INFO "%s: %s %s %s %s\n",</div><div class='ctx'> 		md-&gt;disk-&gt;disk_name, mmc_card_id(card), mmc_card_name(card),</div><div class='del'>-		(unsigned long long)(get_capacity(md-&gt;disk) &gt;&gt; 1),</div><div class='del'>-		md-&gt;read_only ? "(ro)" : "");</div><div class='add'>+		cap_str, md-&gt;read_only ? "(ro)" : "");</div><div class='ctx'> </div><div class='ctx'> 	mmc_set_drvdata(card, md);</div><div class='ctx'> 	add_disk(md-&gt;disk);</div><div class='head'>diff --git a/drivers/mmc/card/queue.c b/drivers/mmc/card/queue.c<br/>index 3dee97e7d165..406989e992ba 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/mmc/card/queue.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/mmc/card/queue.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/mmc/card/queue.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/mmc/card/queue.c</a></div><div class='hunk'>@@ -31,7 +31,7 @@ static int mmc_prep_request(struct request_queue *q, struct request *req)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We only like normal block requests.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!blk_fs_request(req) &amp;&amp; !blk_pc_request(req)) {</div><div class='add'>+	if (!blk_fs_request(req)) {</div><div class='ctx'> 		blk_dump_rq_flags(req, "MMC bad request");</div><div class='ctx'> 		return BLKPREP_KILL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -131,6 +131,7 @@ int mmc_init_queue(struct mmc_queue *mq, struct mmc_card *card, spinlock_t *lock</div><div class='ctx'> 	mq-&gt;req = NULL;</div><div class='ctx'> </div><div class='ctx'> 	blk_queue_prep_rq(mq-&gt;queue, mmc_prep_request);</div><div class='add'>+	blk_queue_ordered(mq-&gt;queue, QUEUE_ORDERED_DRAIN, NULL);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MMC_BLOCK_BOUNCE</div><div class='ctx'> 	if (host-&gt;max_hw_segs == 1) {</div><div class='hunk'>@@ -142,12 +143,19 @@ int mmc_init_queue(struct mmc_queue *mq, struct mmc_card *card, spinlock_t *lock</div><div class='ctx'> 			bouncesz = host-&gt;max_req_size;</div><div class='ctx'> 		if (bouncesz &gt; host-&gt;max_seg_size)</div><div class='ctx'> 			bouncesz = host-&gt;max_seg_size;</div><div class='add'>+		if (bouncesz &gt; (host-&gt;max_blk_count * 512))</div><div class='add'>+			bouncesz = host-&gt;max_blk_count * 512;</div><div class='add'>+</div><div class='add'>+		if (bouncesz &gt; 512) {</div><div class='add'>+			mq-&gt;bounce_buf = kmalloc(bouncesz, GFP_KERNEL);</div><div class='add'>+			if (!mq-&gt;bounce_buf) {</div><div class='add'>+				printk(KERN_WARNING "%s: unable to "</div><div class='add'>+					"allocate bounce buffer\n",</div><div class='add'>+					mmc_card_name(card));</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		mq-&gt;bounce_buf = kmalloc(bouncesz, GFP_KERNEL);</div><div class='del'>-		if (!mq-&gt;bounce_buf) {</div><div class='del'>-			printk(KERN_WARNING "%s: unable to allocate "</div><div class='del'>-				"bounce buffer\n", mmc_card_name(card));</div><div class='del'>-		} else {</div><div class='add'>+		if (mq-&gt;bounce_buf) {</div><div class='ctx'> 			blk_queue_bounce_limit(mq-&gt;queue, BLK_BOUNCE_ANY);</div><div class='ctx'> 			blk_queue_max_sectors(mq-&gt;queue, bouncesz / 512);</div><div class='ctx'> 			blk_queue_max_phys_segments(mq-&gt;queue, bouncesz / 512);</div><div class='hunk'>@@ -175,7 +183,8 @@ int mmc_init_queue(struct mmc_queue *mq, struct mmc_card *card, spinlock_t *lock</div><div class='ctx'> </div><div class='ctx'> 	if (!mq-&gt;bounce_buf) {</div><div class='ctx'> 		blk_queue_bounce_limit(mq-&gt;queue, limit);</div><div class='del'>-		blk_queue_max_sectors(mq-&gt;queue, host-&gt;max_req_size / 512);</div><div class='add'>+		blk_queue_max_sectors(mq-&gt;queue,</div><div class='add'>+			min(host-&gt;max_blk_count, host-&gt;max_req_size / 512));</div><div class='ctx'> 		blk_queue_max_phys_segments(mq-&gt;queue, host-&gt;max_phys_segs);</div><div class='ctx'> 		blk_queue_max_hw_segments(mq-&gt;queue, host-&gt;max_hw_segs);</div><div class='ctx'> 		blk_queue_max_segment_size(mq-&gt;queue, host-&gt;max_seg_size);</div><div class='head'>diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c<br/>index 64b05c6270f2..9c50e6f1c236 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/mmc/core/mmc_ops.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/mmc/core/mmc_ops.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/mmc/core/mmc_ops.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/mmc/core/mmc_ops.c</a></div><div class='hunk'>@@ -248,8 +248,12 @@ mmc_send_cxd_data(struct mmc_card *card, struct mmc_host *host,</div><div class='ctx'> </div><div class='ctx'> 	sg_init_one(&amp;sg, data_buf, len);</div><div class='ctx'> </div><div class='del'>-	if (card)</div><div class='del'>-		mmc_set_data_timeout(&amp;data, card);</div><div class='add'>+	/*</div><div class='add'>+	 * The spec states that CSR and CID accesses have a timeout</div><div class='add'>+	 * of 64 clock cycles.</div><div class='add'>+	 */</div><div class='add'>+	data.timeout_ns = 0;</div><div class='add'>+	data.timeout_clks = 64;</div><div class='ctx'> </div><div class='ctx'> 	mmc_wait_for_req(host, &amp;mrq);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c<br/>index 4eab79e09ccc..fb99ccff9080 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/mmc/core/sdio.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/mmc/core/sdio.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/mmc/core/sdio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/mmc/core/sdio.c</a></div><div class='hunk'>@@ -165,6 +165,36 @@ static int sdio_enable_wide(struct mmc_card *card)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Test if the card supports high-speed mode and, if so, switch to it.</div><div class='add'>+ */</div><div class='add'>+static int sdio_enable_hs(struct mmc_card *card)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u8 speed;</div><div class='add'>+</div><div class='add'>+	if (!(card-&gt;host-&gt;caps &amp; MMC_CAP_SD_HIGHSPEED))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (!card-&gt;cccr.high_speed)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ret = mmc_io_rw_direct(card, 0, 0, SDIO_CCCR_SPEED, 0, &amp;speed);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	speed |= SDIO_SPEED_EHS;</div><div class='add'>+</div><div class='add'>+	ret = mmc_io_rw_direct(card, 1, 0, SDIO_CCCR_SPEED, speed, NULL);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	mmc_card_set_highspeed(card);</div><div class='add'>+	mmc_set_timing(card-&gt;host, MMC_TIMING_SD_HS);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Host is being removed. Free up the current card.</div><div class='ctx'>  */</div><div class='ctx'> static void mmc_sdio_remove(struct mmc_host *host)</div><div class='hunk'>@@ -333,10 +363,26 @@ int mmc_attach_sdio(struct mmc_host *host, u32 ocr)</div><div class='ctx'> 		goto remove;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * No support for high-speed yet, so just set</div><div class='del'>-	 * the card's maximum speed.</div><div class='add'>+	 * Switch to high-speed (if supported).</div><div class='ctx'> 	 */</div><div class='del'>-	mmc_set_clock(host, card-&gt;cis.max_dtr);</div><div class='add'>+	err = sdio_enable_hs(card);</div><div class='add'>+	if (err)</div><div class='add'>+		goto remove;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Change to the card's maximum speed.</div><div class='add'>+	 */</div><div class='add'>+	if (mmc_card_highspeed(card)) {</div><div class='add'>+		/*</div><div class='add'>+		 * The SDIO specification doesn't mention how</div><div class='add'>+		 * the CIS transfer speed register relates to</div><div class='add'>+		 * high-speed, but it seems that 50 MHz is</div><div class='add'>+		 * mandatory.</div><div class='add'>+		 */</div><div class='add'>+		mmc_set_clock(host, 50000000);</div><div class='add'>+	} else {</div><div class='add'>+		mmc_set_clock(host, card-&gt;cis.max_dtr);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Switch to wider bus (if supported).</div><div class='head'>diff --git a/drivers/mmc/core/sdio_irq.c b/drivers/mmc/core/sdio_irq.c<br/>index c292e124107a..bb192f90e8e9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/mmc/core/sdio_irq.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/mmc/core/sdio_irq.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/mmc/core/sdio_irq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/mmc/core/sdio_irq.c</a></div><div class='hunk'>@@ -5,6 +5,8 @@</div><div class='ctx'>  * Created:     June 18, 2007</div><div class='ctx'>  * Copyright:   MontaVista Software Inc.</div><div class='ctx'>  *</div><div class='add'>+ * Copyright 2008 Pierre Ossman</div><div class='add'>+ *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of the GNU General Public License as published by</div><div class='ctx'>  * the Free Software Foundation; either version 2 of the License, or (at</div><div class='hunk'>@@ -107,11 +109,14 @@ static int sdio_irq_thread(void *_host)</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Give other threads a chance to run in the presence of</div><div class='del'>-		 * errors.  FIXME: determine if due to card removal and</div><div class='del'>-		 * possibly exit this thread if so.</div><div class='add'>+		 * errors.</div><div class='ctx'> 		 */</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			ssleep(1);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			set_current_state(TASK_INTERRUPTIBLE);</div><div class='add'>+			if (!kthread_should_stop())</div><div class='add'>+				schedule_timeout(HZ);</div><div class='add'>+			set_current_state(TASK_RUNNING);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Adaptive polling frequency based on the assumption</div><div class='hunk'>@@ -154,7 +159,8 @@ static int sdio_card_irq_get(struct mmc_card *card)</div><div class='ctx'> 	if (!host-&gt;sdio_irqs++) {</div><div class='ctx'> 		atomic_set(&amp;host-&gt;sdio_irq_thread_abort, 0);</div><div class='ctx'> 		host-&gt;sdio_irq_thread =</div><div class='del'>-			kthread_run(sdio_irq_thread, host, "ksdiorqd");</div><div class='add'>+			kthread_run(sdio_irq_thread, host, "ksdioirqd/%s",</div><div class='add'>+				mmc_hostname(host));</div><div class='ctx'> 		if (IS_ERR(host-&gt;sdio_irq_thread)) {</div><div class='ctx'> 			int err = PTR_ERR(host-&gt;sdio_irq_thread);</div><div class='ctx'> 			host-&gt;sdio_irqs--;</div><div class='head'>diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig<br/>index ea8d7a3490d9..dfa585f7feaf 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/mmc/host/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/mmc/host/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/mmc/host/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/mmc/host/Kconfig</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'> # MMC/SD host controller drivers</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-comment "MMC/SD Host Controller Drivers"</div><div class='add'>+comment "MMC/SD/SDIO Host Controller Drivers"</div><div class='ctx'> </div><div class='ctx'> config MMC_ARMMMCI</div><div class='ctx'> 	tristate "ARM AMBA Multimedia Card Interface support"</div><div class='hunk'>@@ -114,6 +114,17 @@ config MMC_ATMELMCI</div><div class='ctx'> </div><div class='ctx'> 	  If unsure, say N.</div><div class='ctx'> </div><div class='add'>+config MMC_ATMELMCI_DMA</div><div class='add'>+	bool "Atmel MCI DMA support (EXPERIMENTAL)"</div><div class='add'>+	depends on MMC_ATMELMCI &amp;&amp; DMA_ENGINE &amp;&amp; EXPERIMENTAL</div><div class='add'>+	help</div><div class='add'>+	  Say Y here to have the Atmel MCI driver use a DMA engine to</div><div class='add'>+	  do data transfers and thus increase the throughput and</div><div class='add'>+	  reduce the CPU utilization. Note that this is highly</div><div class='add'>+	  experimental and may cause the driver to lock up.</div><div class='add'>+</div><div class='add'>+	  If unsure, say N.</div><div class='add'>+</div><div class='ctx'> config MMC_IMX</div><div class='ctx'> 	tristate "Motorola i.MX Multimedia Card Interface support"</div><div class='ctx'> 	depends on ARCH_IMX</div><div class='hunk'>@@ -141,21 +152,22 @@ config MMC_TIFM_SD</div><div class='ctx'> 	  module will be called tifm_sd.</div><div class='ctx'> </div><div class='ctx'> config MMC_SPI</div><div class='del'>-	tristate "MMC/SD over SPI"</div><div class='del'>-	depends on MMC &amp;&amp; SPI_MASTER &amp;&amp; !HIGHMEM &amp;&amp; HAS_DMA</div><div class='add'>+	tristate "MMC/SD/SDIO over SPI"</div><div class='add'>+	depends on SPI_MASTER &amp;&amp; !HIGHMEM &amp;&amp; HAS_DMA</div><div class='ctx'> 	select CRC7</div><div class='ctx'> 	select CRC_ITU_T</div><div class='ctx'> 	help</div><div class='del'>-	  Some systems accss MMC/SD cards using a SPI controller instead of</div><div class='del'>-	  using a "native" MMC/SD controller.  This has a disadvantage of</div><div class='del'>-	  being relatively high overhead, but a compensating advantage of</div><div class='del'>-	  working on many systems without dedicated MMC/SD controllers.</div><div class='add'>+	  Some systems accss MMC/SD/SDIO cards using a SPI controller</div><div class='add'>+	  instead of using a "native" MMC/SD/SDIO controller.  This has a</div><div class='add'>+	  disadvantage of being relatively high overhead, but a compensating</div><div class='add'>+	  advantage of working on many systems without dedicated MMC/SD/SDIO</div><div class='add'>+	  controllers.</div><div class='ctx'> </div><div class='ctx'> 	  If unsure, or if your system has no SPI master driver, say N.</div><div class='ctx'> </div><div class='ctx'> config MMC_S3C</div><div class='ctx'> 	tristate "Samsung S3C SD/MMC Card Interface support"</div><div class='del'>-	depends on ARCH_S3C2410 &amp;&amp; MMC</div><div class='add'>+	depends on ARCH_S3C2410</div><div class='ctx'> 	help</div><div class='ctx'> 	  This selects a driver for the MCI interface found in</div><div class='ctx'>           Samsung's S3C2410, S3C2412, S3C2440, S3C2442 CPUs.</div><div class='hunk'>@@ -166,7 +178,7 @@ config MMC_S3C</div><div class='ctx'> </div><div class='ctx'> config MMC_SDRICOH_CS</div><div class='ctx'> 	tristate "MMC/SD driver for Ricoh Bay1Controllers (EXPERIMENTAL)"</div><div class='del'>-	depends on EXPERIMENTAL &amp;&amp; MMC &amp;&amp; PCI &amp;&amp; PCMCIA</div><div class='add'>+	depends on EXPERIMENTAL &amp;&amp; PCI &amp;&amp; PCMCIA</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say Y here if your Notebook reports a Ricoh Bay1Controller PCMCIA</div><div class='ctx'> 	  card whenever you insert a MMC or SD card into the card slot.</div><div class='head'>diff --git a/drivers/mmc/host/atmel-mci-regs.h b/drivers/mmc/host/atmel-mci-regs.h<br/>index 26bd80e65031..b58364ed6bba 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/mmc/host/atmel-mci-regs.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/mmc/host/atmel-mci-regs.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/mmc/host/atmel-mci-regs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/mmc/host/atmel-mci-regs.h</a></div><div class='hunk'>@@ -25,8 +25,10 @@</div><div class='ctx'> #define MCI_SDCR		0x000c	/* SD Card / SDIO */</div><div class='ctx'> # define MCI_SDCSEL_SLOT_A	(  0 &lt;&lt;  0)	/* Select SD slot A */</div><div class='ctx'> # define MCI_SDCSEL_SLOT_B	(  1 &lt;&lt;  0)	/* Select SD slot A */</div><div class='del'>-# define MCI_SDCBUS_1BIT	(  0 &lt;&lt;  7)	/* 1-bit data bus */</div><div class='del'>-# define MCI_SDCBUS_4BIT	(  1 &lt;&lt;  7)	/* 4-bit data bus */</div><div class='add'>+# define MCI_SDCSEL_MASK	(  3 &lt;&lt;  0)</div><div class='add'>+# define MCI_SDCBUS_1BIT	(  0 &lt;&lt;  6)	/* 1-bit data bus */</div><div class='add'>+# define MCI_SDCBUS_4BIT	(  2 &lt;&lt;  6)	/* 4-bit data bus */</div><div class='add'>+# define MCI_SDCBUS_MASK	(  3 &lt;&lt;  6)</div><div class='ctx'> #define MCI_ARGR		0x0010	/* Command Argument */</div><div class='ctx'> #define MCI_CMDR		0x0014	/* Command */</div><div class='ctx'> # define MCI_CMDR_CMDNB(x)	((x) &lt;&lt;  0)	/* Command Opcode */</div><div class='head'>diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c<br/>index 00008967ef7a..7a3f2436b011 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/mmc/host/atmel-mci.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/mmc/host/atmel-mci.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/mmc/host/atmel-mci.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/mmc/host/atmel-mci.c</a></div><div class='hunk'>@@ -11,6 +11,8 @@</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/debugfs.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/dmaengine.h&gt;</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/gpio.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -33,64 +35,178 @@</div><div class='ctx'> #include "atmel-mci-regs.h"</div><div class='ctx'> </div><div class='ctx'> #define ATMCI_DATA_ERROR_FLAGS	(MCI_DCRCE | MCI_DTOE | MCI_OVRE | MCI_UNRE)</div><div class='add'>+#define ATMCI_DMA_THRESHOLD	16</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='ctx'> 	EVENT_CMD_COMPLETE = 0,</div><div class='del'>-	EVENT_DATA_ERROR,</div><div class='del'>-	EVENT_DATA_COMPLETE,</div><div class='del'>-	EVENT_STOP_SENT,</div><div class='del'>-	EVENT_STOP_COMPLETE,</div><div class='ctx'> 	EVENT_XFER_COMPLETE,</div><div class='add'>+	EVENT_DATA_COMPLETE,</div><div class='add'>+	EVENT_DATA_ERROR,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum atmel_mci_state {</div><div class='add'>+	STATE_IDLE = 0,</div><div class='add'>+	STATE_SENDING_CMD,</div><div class='add'>+	STATE_SENDING_DATA,</div><div class='add'>+	STATE_DATA_BUSY,</div><div class='add'>+	STATE_SENDING_STOP,</div><div class='add'>+	STATE_DATA_ERROR,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct atmel_mci_dma {</div><div class='add'>+#ifdef CONFIG_MMC_ATMELMCI_DMA</div><div class='add'>+	struct dma_client		client;</div><div class='add'>+	struct dma_chan			*chan;</div><div class='add'>+	struct dma_async_tx_descriptor	*data_desc;</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * struct atmel_mci - MMC controller state shared between all slots</div><div class='add'>+ * @lock: Spinlock protecting the queue and associated data.</div><div class='add'>+ * @regs: Pointer to MMIO registers.</div><div class='add'>+ * @sg: Scatterlist entry currently being processed by PIO code, if any.</div><div class='add'>+ * @pio_offset: Offset into the current scatterlist entry.</div><div class='add'>+ * @cur_slot: The slot which is currently using the controller.</div><div class='add'>+ * @mrq: The request currently being processed on @cur_slot,</div><div class='add'>+ *	or NULL if the controller is idle.</div><div class='add'>+ * @cmd: The command currently being sent to the card, or NULL.</div><div class='add'>+ * @data: The data currently being transferred, or NULL if no data</div><div class='add'>+ *	transfer is in progress.</div><div class='add'>+ * @dma: DMA client state.</div><div class='add'>+ * @data_chan: DMA channel being used for the current data transfer.</div><div class='add'>+ * @cmd_status: Snapshot of SR taken upon completion of the current</div><div class='add'>+ *	command. Only valid when EVENT_CMD_COMPLETE is pending.</div><div class='add'>+ * @data_status: Snapshot of SR taken upon completion of the current</div><div class='add'>+ *	data transfer. Only valid when EVENT_DATA_COMPLETE or</div><div class='add'>+ *	EVENT_DATA_ERROR is pending.</div><div class='add'>+ * @stop_cmdr: Value to be loaded into CMDR when the stop command is</div><div class='add'>+ *	to be sent.</div><div class='add'>+ * @tasklet: Tasklet running the request state machine.</div><div class='add'>+ * @pending_events: Bitmask of events flagged by the interrupt handler</div><div class='add'>+ *	to be processed by the tasklet.</div><div class='add'>+ * @completed_events: Bitmask of events which the state machine has</div><div class='add'>+ *	processed.</div><div class='add'>+ * @state: Tasklet state.</div><div class='add'>+ * @queue: List of slots waiting for access to the controller.</div><div class='add'>+ * @need_clock_update: Update the clock rate before the next request.</div><div class='add'>+ * @need_reset: Reset controller before next request.</div><div class='add'>+ * @mode_reg: Value of the MR register.</div><div class='add'>+ * @bus_hz: The rate of @mck in Hz. This forms the basis for MMC bus</div><div class='add'>+ *	rate and timeout calculations.</div><div class='add'>+ * @mapbase: Physical address of the MMIO registers.</div><div class='add'>+ * @mck: The peripheral bus clock hooked up to the MMC controller.</div><div class='add'>+ * @pdev: Platform device associated with the MMC controller.</div><div class='add'>+ * @slot: Slots sharing this MMC controller.</div><div class='add'>+ *</div><div class='add'>+ * Locking</div><div class='add'>+ * =======</div><div class='add'>+ *</div><div class='add'>+ * @lock is a softirq-safe spinlock protecting @queue as well as</div><div class='add'>+ * @cur_slot, @mrq and @state. These must always be updated</div><div class='add'>+ * at the same time while holding @lock.</div><div class='add'>+ *</div><div class='add'>+ * @lock also protects mode_reg and need_clock_update since these are</div><div class='add'>+ * used to synchronize mode register updates with the queue</div><div class='add'>+ * processing.</div><div class='add'>+ *</div><div class='add'>+ * The @mrq field of struct atmel_mci_slot is also protected by @lock,</div><div class='add'>+ * and must always be written at the same time as the slot is added to</div><div class='add'>+ * @queue.</div><div class='add'>+ *</div><div class='add'>+ * @pending_events and @completed_events are accessed using atomic bit</div><div class='add'>+ * operations, so they don't need any locking.</div><div class='add'>+ *</div><div class='add'>+ * None of the fields touched by the interrupt handler need any</div><div class='add'>+ * locking. However, ordering is important: Before EVENT_DATA_ERROR or</div><div class='add'>+ * EVENT_DATA_COMPLETE is set in @pending_events, all data-related</div><div class='add'>+ * interrupts must be disabled and @data_status updated with a</div><div class='add'>+ * snapshot of SR. Similarly, before EVENT_CMD_COMPLETE is set, the</div><div class='add'>+ * CMDRDY interupt must be disabled and @cmd_status updated with a</div><div class='add'>+ * snapshot of SR, and before EVENT_XFER_COMPLETE can be set, the</div><div class='add'>+ * bytes_xfered field of @data must be written. This is ensured by</div><div class='add'>+ * using barriers.</div><div class='add'>+ */</div><div class='ctx'> struct atmel_mci {</div><div class='del'>-	struct mmc_host		*mmc;</div><div class='add'>+	spinlock_t		lock;</div><div class='ctx'> 	void __iomem		*regs;</div><div class='ctx'> </div><div class='ctx'> 	struct scatterlist	*sg;</div><div class='ctx'> 	unsigned int		pio_offset;</div><div class='ctx'> </div><div class='add'>+	struct atmel_mci_slot	*cur_slot;</div><div class='ctx'> 	struct mmc_request	*mrq;</div><div class='ctx'> 	struct mmc_command	*cmd;</div><div class='ctx'> 	struct mmc_data		*data;</div><div class='ctx'> </div><div class='add'>+	struct atmel_mci_dma	dma;</div><div class='add'>+	struct dma_chan		*data_chan;</div><div class='add'>+</div><div class='ctx'> 	u32			cmd_status;</div><div class='ctx'> 	u32			data_status;</div><div class='del'>-	u32			stop_status;</div><div class='ctx'> 	u32			stop_cmdr;</div><div class='ctx'> </div><div class='del'>-	u32			mode_reg;</div><div class='del'>-	u32			sdc_reg;</div><div class='del'>-</div><div class='ctx'> 	struct tasklet_struct	tasklet;</div><div class='ctx'> 	unsigned long		pending_events;</div><div class='ctx'> 	unsigned long		completed_events;</div><div class='add'>+	enum atmel_mci_state	state;</div><div class='add'>+	struct list_head	queue;</div><div class='ctx'> </div><div class='del'>-	int			present;</div><div class='del'>-	int			detect_pin;</div><div class='del'>-	int			wp_pin;</div><div class='del'>-</div><div class='del'>-	/* For detect pin debouncing */</div><div class='del'>-	struct timer_list	detect_timer;</div><div class='del'>-</div><div class='add'>+	bool			need_clock_update;</div><div class='add'>+	bool			need_reset;</div><div class='add'>+	u32			mode_reg;</div><div class='ctx'> 	unsigned long		bus_hz;</div><div class='ctx'> 	unsigned long		mapbase;</div><div class='ctx'> 	struct clk		*mck;</div><div class='ctx'> 	struct platform_device	*pdev;</div><div class='add'>+</div><div class='add'>+	struct atmel_mci_slot	*slot[ATMEL_MCI_MAX_NR_SLOTS];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct atmel_mci_slot - MMC slot state</div><div class='add'>+ * @mmc: The mmc_host representing this slot.</div><div class='add'>+ * @host: The MMC controller this slot is using.</div><div class='add'>+ * @sdc_reg: Value of SDCR to be written before using this slot.</div><div class='add'>+ * @mrq: mmc_request currently being processed or waiting to be</div><div class='add'>+ *	processed, or NULL when the slot is idle.</div><div class='add'>+ * @queue_node: List node for placing this node in the @queue list of</div><div class='add'>+ *	&amp;struct atmel_mci.</div><div class='add'>+ * @clock: Clock rate configured by set_ios(). Protected by host-&gt;lock.</div><div class='add'>+ * @flags: Random state bits associated with the slot.</div><div class='add'>+ * @detect_pin: GPIO pin used for card detection, or negative if not</div><div class='add'>+ *	available.</div><div class='add'>+ * @wp_pin: GPIO pin used for card write protect sending, or negative</div><div class='add'>+ *	if not available.</div><div class='add'>+ * @detect_timer: Timer used for debouncing @detect_pin interrupts.</div><div class='add'>+ */</div><div class='add'>+struct atmel_mci_slot {</div><div class='add'>+	struct mmc_host		*mmc;</div><div class='add'>+	struct atmel_mci	*host;</div><div class='add'>+</div><div class='add'>+	u32			sdc_reg;</div><div class='add'>+</div><div class='add'>+	struct mmc_request	*mrq;</div><div class='add'>+	struct list_head	queue_node;</div><div class='add'>+</div><div class='add'>+	unsigned int		clock;</div><div class='add'>+	unsigned long		flags;</div><div class='add'>+#define ATMCI_CARD_PRESENT	0</div><div class='add'>+#define ATMCI_CARD_NEED_INIT	1</div><div class='add'>+#define ATMCI_SHUTDOWN		2</div><div class='add'>+</div><div class='add'>+	int			detect_pin;</div><div class='add'>+	int			wp_pin;</div><div class='add'>+</div><div class='add'>+	struct timer_list	detect_timer;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define atmci_is_completed(host, event)				\</div><div class='del'>-	test_bit(event, &amp;host-&gt;completed_events)</div><div class='ctx'> #define atmci_test_and_clear_pending(host, event)		\</div><div class='ctx'> 	test_and_clear_bit(event, &amp;host-&gt;pending_events)</div><div class='del'>-#define atmci_test_and_set_completed(host, event)		\</div><div class='del'>-	test_and_set_bit(event, &amp;host-&gt;completed_events)</div><div class='ctx'> #define atmci_set_completed(host, event)			\</div><div class='ctx'> 	set_bit(event, &amp;host-&gt;completed_events)</div><div class='ctx'> #define atmci_set_pending(host, event)				\</div><div class='ctx'> 	set_bit(event, &amp;host-&gt;pending_events)</div><div class='del'>-#define atmci_clear_pending(host, event)			\</div><div class='del'>-	clear_bit(event, &amp;host-&gt;pending_events)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * The debugfs stuff below is mostly optimized away when</div><div class='hunk'>@@ -98,14 +214,15 @@ struct atmel_mci {</div><div class='ctx'>  */</div><div class='ctx'> static int atmci_req_show(struct seq_file *s, void *v)</div><div class='ctx'> {</div><div class='del'>-	struct atmel_mci	*host = s-&gt;private;</div><div class='del'>-	struct mmc_request	*mrq = host-&gt;mrq;</div><div class='add'>+	struct atmel_mci_slot	*slot = s-&gt;private;</div><div class='add'>+	struct mmc_request	*mrq;</div><div class='ctx'> 	struct mmc_command	*cmd;</div><div class='ctx'> 	struct mmc_command	*stop;</div><div class='ctx'> 	struct mmc_data		*data;</div><div class='ctx'> </div><div class='ctx'> 	/* Make sure we get a consistent snapshot */</div><div class='del'>-	spin_lock_irq(&amp;host-&gt;mmc-&gt;lock);</div><div class='add'>+	spin_lock_bh(&amp;slot-&gt;host-&gt;lock);</div><div class='add'>+	mrq = slot-&gt;mrq;</div><div class='ctx'> </div><div class='ctx'> 	if (mrq) {</div><div class='ctx'> 		cmd = mrq-&gt;cmd;</div><div class='hunk'>@@ -130,7 +247,7 @@ static int atmci_req_show(struct seq_file *s, void *v)</div><div class='ctx'> 				stop-&gt;resp[2], stop-&gt;error);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irq(&amp;host-&gt;mmc-&gt;lock);</div><div class='add'>+	spin_unlock_bh(&amp;slot-&gt;host-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -193,12 +310,16 @@ static int atmci_regs_show(struct seq_file *s, void *v)</div><div class='ctx'> 	if (!buf)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	/* Grab a more or less consistent snapshot */</div><div class='del'>-	spin_lock_irq(&amp;host-&gt;mmc-&gt;lock);</div><div class='add'>+	/*</div><div class='add'>+	 * Grab a more or less consistent snapshot. Note that we're</div><div class='add'>+	 * not disabling interrupts, so IMR and SR may not be</div><div class='add'>+	 * consistent.</div><div class='add'>+	 */</div><div class='add'>+	spin_lock_bh(&amp;host-&gt;lock);</div><div class='ctx'> 	clk_enable(host-&gt;mck);</div><div class='ctx'> 	memcpy_fromio(buf, host-&gt;regs, MCI_REGS_SIZE);</div><div class='ctx'> 	clk_disable(host-&gt;mck);</div><div class='del'>-	spin_unlock_irq(&amp;host-&gt;mmc-&gt;lock);</div><div class='add'>+	spin_unlock_bh(&amp;host-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	seq_printf(s, "MR:\t0x%08x%s%s CLKDIV=%u\n",</div><div class='ctx'> 			buf[MCI_MR / 4],</div><div class='hunk'>@@ -236,13 +357,13 @@ static const struct file_operations atmci_regs_fops = {</div><div class='ctx'> 	.release	= single_release,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void atmci_init_debugfs(struct atmel_mci *host)</div><div class='add'>+static void atmci_init_debugfs(struct atmel_mci_slot *slot)</div><div class='ctx'> {</div><div class='del'>-	struct mmc_host	*mmc;</div><div class='del'>-	struct dentry	*root;</div><div class='del'>-	struct dentry	*node;</div><div class='add'>+	struct mmc_host		*mmc = slot-&gt;mmc;</div><div class='add'>+	struct atmel_mci	*host = slot-&gt;host;</div><div class='add'>+	struct dentry		*root;</div><div class='add'>+	struct dentry		*node;</div><div class='ctx'> </div><div class='del'>-	mmc = host-&gt;mmc;</div><div class='ctx'> 	root = mmc-&gt;debugfs_root;</div><div class='ctx'> 	if (!root)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -254,7 +375,11 @@ static void atmci_init_debugfs(struct atmel_mci *host)</div><div class='ctx'> 	if (!node)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='del'>-	node = debugfs_create_file("req", S_IRUSR, root, host, &amp;atmci_req_fops);</div><div class='add'>+	node = debugfs_create_file("req", S_IRUSR, root, slot, &amp;atmci_req_fops);</div><div class='add'>+	if (!node)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	node = debugfs_create_u32("state", S_IRUSR, root, (u32 *)&amp;host-&gt;state);</div><div class='ctx'> 	if (!node)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='hunk'>@@ -271,25 +396,7 @@ static void atmci_init_debugfs(struct atmel_mci *host)</div><div class='ctx'> 	return;</div><div class='ctx'> </div><div class='ctx'> err:</div><div class='del'>-	dev_err(&amp;host-&gt;pdev-&gt;dev,</div><div class='del'>-		"failed to initialize debugfs for controller\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void atmci_enable(struct atmel_mci *host)</div><div class='del'>-{</div><div class='del'>-	clk_enable(host-&gt;mck);</div><div class='del'>-	mci_writel(host, CR, MCI_CR_MCIEN);</div><div class='del'>-	mci_writel(host, MR, host-&gt;mode_reg);</div><div class='del'>-	mci_writel(host, SDCR, host-&gt;sdc_reg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void atmci_disable(struct atmel_mci *host)</div><div class='del'>-{</div><div class='del'>-	mci_writel(host, CR, MCI_CR_SWRST);</div><div class='del'>-</div><div class='del'>-	/* Stall until write is complete, then disable the bus clock */</div><div class='del'>-	mci_readl(host, SR);</div><div class='del'>-	clk_disable(host-&gt;mck);</div><div class='add'>+	dev_err(&amp;mmc-&gt;class_dev, "failed to initialize debugfs for slot\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline unsigned int ns_to_clocks(struct atmel_mci *host,</div><div class='hunk'>@@ -299,7 +406,7 @@ static inline unsigned int ns_to_clocks(struct atmel_mci *host,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void atmci_set_timeout(struct atmel_mci *host,</div><div class='del'>-			      struct mmc_data *data)</div><div class='add'>+		struct atmel_mci_slot *slot, struct mmc_data *data)</div><div class='ctx'> {</div><div class='ctx'> 	static unsigned	dtomul_to_shift[] = {</div><div class='ctx'> 		0, 4, 7, 8, 10, 12, 16, 20</div><div class='hunk'>@@ -322,7 +429,7 @@ static void atmci_set_timeout(struct atmel_mci *host,</div><div class='ctx'> 		dtocyc = 15;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dev_vdbg(&amp;host-&gt;mmc-&gt;class_dev, "setting timeout to %u cycles\n",</div><div class='add'>+	dev_vdbg(&amp;slot-&gt;mmc-&gt;class_dev, "setting timeout to %u cycles\n",</div><div class='ctx'> 			dtocyc &lt;&lt; dtomul_to_shift[dtomul]);</div><div class='ctx'> 	mci_writel(host, DTOR, (MCI_DTOMUL(dtomul) | MCI_DTOCYC(dtocyc)));</div><div class='ctx'> }</div><div class='hunk'>@@ -375,15 +482,12 @@ static u32 atmci_prepare_command(struct mmc_host *mmc,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void atmci_start_command(struct atmel_mci *host,</div><div class='del'>-				struct mmc_command *cmd,</div><div class='del'>-				u32 cmd_flags)</div><div class='add'>+		struct mmc_command *cmd, u32 cmd_flags)</div><div class='ctx'> {</div><div class='del'>-	/* Must read host-&gt;cmd after testing event flags */</div><div class='del'>-	smp_rmb();</div><div class='ctx'> 	WARN_ON(host-&gt;cmd);</div><div class='ctx'> 	host-&gt;cmd = cmd;</div><div class='ctx'> </div><div class='del'>-	dev_vdbg(&amp;host-&gt;mmc-&gt;class_dev,</div><div class='add'>+	dev_vdbg(&amp;host-&gt;pdev-&gt;dev,</div><div class='ctx'> 			"start command: ARGR=0x%08x CMDR=0x%08x\n",</div><div class='ctx'> 			cmd-&gt;arg, cmd_flags);</div><div class='ctx'> </div><div class='hunk'>@@ -391,34 +495,157 @@ static void atmci_start_command(struct atmel_mci *host,</div><div class='ctx'> 	mci_writel(host, CMDR, cmd_flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void send_stop_cmd(struct mmc_host *mmc, struct mmc_data *data)</div><div class='add'>+static void send_stop_cmd(struct atmel_mci *host, struct mmc_data *data)</div><div class='ctx'> {</div><div class='del'>-	struct atmel_mci *host = mmc_priv(mmc);</div><div class='del'>-</div><div class='ctx'> 	atmci_start_command(host, data-&gt;stop, host-&gt;stop_cmdr);</div><div class='ctx'> 	mci_writel(host, IER, MCI_CMDRDY);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void atmci_request_end(struct mmc_host *mmc, struct mmc_request *mrq)</div><div class='add'>+#ifdef CONFIG_MMC_ATMELMCI_DMA</div><div class='add'>+static void atmci_dma_cleanup(struct atmel_mci *host)</div><div class='ctx'> {</div><div class='del'>-	struct atmel_mci *host = mmc_priv(mmc);</div><div class='add'>+	struct mmc_data			*data = host-&gt;data;</div><div class='ctx'> </div><div class='del'>-	WARN_ON(host-&gt;cmd || host-&gt;data);</div><div class='del'>-	host-&gt;mrq = NULL;</div><div class='add'>+	dma_unmap_sg(&amp;host-&gt;pdev-&gt;dev, data-&gt;sg, data-&gt;sg_len,</div><div class='add'>+		     ((data-&gt;flags &amp; MMC_DATA_WRITE)</div><div class='add'>+		      ? DMA_TO_DEVICE : DMA_FROM_DEVICE));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void atmci_stop_dma(struct atmel_mci *host)</div><div class='add'>+{</div><div class='add'>+	struct dma_chan *chan = host-&gt;data_chan;</div><div class='add'>+</div><div class='add'>+	if (chan) {</div><div class='add'>+		chan-&gt;device-&gt;device_terminate_all(chan);</div><div class='add'>+		atmci_dma_cleanup(host);</div><div class='add'>+	} else {</div><div class='add'>+		/* Data transfer was stopped by the interrupt handler */</div><div class='add'>+		atmci_set_pending(host, EVENT_XFER_COMPLETE);</div><div class='add'>+		mci_writel(host, IER, MCI_NOTBUSY);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This function is called by the DMA driver from tasklet context. */</div><div class='add'>+static void atmci_dma_complete(void *arg)</div><div class='add'>+{</div><div class='add'>+	struct atmel_mci	*host = arg;</div><div class='add'>+	struct mmc_data		*data = host-&gt;data;</div><div class='add'>+</div><div class='add'>+	dev_vdbg(&amp;host-&gt;pdev-&gt;dev, "DMA complete\n");</div><div class='add'>+</div><div class='add'>+	atmci_dma_cleanup(host);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If the card was removed, data will be NULL. No point trying</div><div class='add'>+	 * to send the stop command or waiting for NBUSY in this case.</div><div class='add'>+	 */</div><div class='add'>+	if (data) {</div><div class='add'>+		atmci_set_pending(host, EVENT_XFER_COMPLETE);</div><div class='add'>+		tasklet_schedule(&amp;host-&gt;tasklet);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Regardless of what the documentation says, we have</div><div class='add'>+		 * to wait for NOTBUSY even after block read</div><div class='add'>+		 * operations.</div><div class='add'>+		 *</div><div class='add'>+		 * When the DMA transfer is complete, the controller</div><div class='add'>+		 * may still be reading the CRC from the card, i.e.</div><div class='add'>+		 * the data transfer is still in progress and we</div><div class='add'>+		 * haven't seen all the potential error bits yet.</div><div class='add'>+		 *</div><div class='add'>+		 * The interrupt handler will schedule a different</div><div class='add'>+		 * tasklet to finish things up when the data transfer</div><div class='add'>+		 * is completely done.</div><div class='add'>+		 *</div><div class='add'>+		 * We may not complete the mmc request here anyway</div><div class='add'>+		 * because the mmc layer may call back and cause us to</div><div class='add'>+		 * violate the "don't submit new operations from the</div><div class='add'>+		 * completion callback" rule of the dma engine</div><div class='add'>+		 * framework.</div><div class='add'>+		 */</div><div class='add'>+		mci_writel(host, IER, MCI_NOTBUSY);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+atmci_submit_data_dma(struct atmel_mci *host, struct mmc_data *data)</div><div class='add'>+{</div><div class='add'>+	struct dma_chan			*chan;</div><div class='add'>+	struct dma_async_tx_descriptor	*desc;</div><div class='add'>+	struct scatterlist		*sg;</div><div class='add'>+	unsigned int			i;</div><div class='add'>+	enum dma_data_direction		direction;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We don't do DMA on "complex" transfers, i.e. with</div><div class='add'>+	 * non-word-aligned buffers or lengths. Also, we don't bother</div><div class='add'>+	 * with all the DMA setup overhead for short transfers.</div><div class='add'>+	 */</div><div class='add'>+	if (data-&gt;blocks * data-&gt;blksz &lt; ATMCI_DMA_THRESHOLD)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (data-&gt;blksz &amp; 3)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	for_each_sg(data-&gt;sg, sg, data-&gt;sg_len, i) {</div><div class='add'>+		if (sg-&gt;offset &amp; 3 || sg-&gt;length &amp; 3)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If we don't have a channel, we can't do DMA */</div><div class='add'>+	chan = host-&gt;dma.chan;</div><div class='add'>+	if (chan) {</div><div class='add'>+		dma_chan_get(chan);</div><div class='add'>+		host-&gt;data_chan = chan;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!chan)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	if (data-&gt;flags &amp; MMC_DATA_READ)</div><div class='add'>+		direction = DMA_FROM_DEVICE;</div><div class='add'>+	else</div><div class='add'>+		direction = DMA_TO_DEVICE;</div><div class='add'>+</div><div class='add'>+	desc = chan-&gt;device-&gt;device_prep_slave_sg(chan,</div><div class='add'>+			data-&gt;sg, data-&gt;sg_len, direction,</div><div class='add'>+			DMA_PREP_INTERRUPT | DMA_CTRL_ACK);</div><div class='add'>+	if (!desc)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	atmci_disable(host);</div><div class='add'>+	host-&gt;dma.data_desc = desc;</div><div class='add'>+	desc-&gt;callback = atmci_dma_complete;</div><div class='add'>+	desc-&gt;callback_param = host;</div><div class='add'>+	desc-&gt;tx_submit(desc);</div><div class='ctx'> </div><div class='del'>-	mmc_request_done(mmc, mrq);</div><div class='add'>+	/* Go! */</div><div class='add'>+	chan-&gt;device-&gt;device_issue_pending(chan);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else /* CONFIG_MMC_ATMELMCI_DMA */</div><div class='add'>+</div><div class='add'>+static int atmci_submit_data_dma(struct atmel_mci *host, struct mmc_data *data)</div><div class='add'>+{</div><div class='add'>+	return -ENOSYS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void atmci_stop_dma(struct atmel_mci *host)</div><div class='add'>+{</div><div class='add'>+	/* Data transfer was stopped by the interrupt handler */</div><div class='add'>+	atmci_set_pending(host, EVENT_XFER_COMPLETE);</div><div class='add'>+	mci_writel(host, IER, MCI_NOTBUSY);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_MMC_ATMELMCI_DMA */</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Returns a mask of interrupt flags to be enabled after the whole</div><div class='ctx'>  * request has been prepared.</div><div class='ctx'>  */</div><div class='del'>-static u32 atmci_submit_data(struct mmc_host *mmc, struct mmc_data *data)</div><div class='add'>+static u32 atmci_submit_data(struct atmel_mci *host, struct mmc_data *data)</div><div class='ctx'> {</div><div class='del'>-	struct atmel_mci	*host = mmc_priv(mmc);</div><div class='del'>-	u32			iflags;</div><div class='add'>+	u32 iflags;</div><div class='ctx'> </div><div class='ctx'> 	data-&gt;error = -EINPROGRESS;</div><div class='ctx'> </div><div class='hunk'>@@ -426,77 +653,89 @@ static u32 atmci_submit_data(struct mmc_host *mmc, struct mmc_data *data)</div><div class='ctx'> 	host-&gt;sg = NULL;</div><div class='ctx'> 	host-&gt;data = data;</div><div class='ctx'> </div><div class='del'>-	dev_vdbg(&amp;mmc-&gt;class_dev, "BLKR=0x%08x\n",</div><div class='del'>-			MCI_BCNT(data-&gt;blocks) | MCI_BLKLEN(data-&gt;blksz));</div><div class='del'>-</div><div class='ctx'> 	iflags = ATMCI_DATA_ERROR_FLAGS;</div><div class='del'>-	host-&gt;sg = data-&gt;sg;</div><div class='del'>-	host-&gt;pio_offset = 0;</div><div class='del'>-	if (data-&gt;flags &amp; MMC_DATA_READ)</div><div class='del'>-		iflags |= MCI_RXRDY;</div><div class='del'>-	else</div><div class='del'>-		iflags |= MCI_TXRDY;</div><div class='add'>+	if (atmci_submit_data_dma(host, data)) {</div><div class='add'>+		host-&gt;data_chan = NULL;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Errata: MMC data write operation with less than 12</div><div class='add'>+		 * bytes is impossible.</div><div class='add'>+		 *</div><div class='add'>+		 * Errata: MCI Transmit Data Register (TDR) FIFO</div><div class='add'>+		 * corruption when length is not multiple of 4.</div><div class='add'>+		 */</div><div class='add'>+		if (data-&gt;blocks * data-&gt;blksz &lt; 12</div><div class='add'>+				|| (data-&gt;blocks * data-&gt;blksz) &amp; 3)</div><div class='add'>+			host-&gt;need_reset = true;</div><div class='add'>+</div><div class='add'>+		host-&gt;sg = data-&gt;sg;</div><div class='add'>+		host-&gt;pio_offset = 0;</div><div class='add'>+		if (data-&gt;flags &amp; MMC_DATA_READ)</div><div class='add'>+			iflags |= MCI_RXRDY;</div><div class='add'>+		else</div><div class='add'>+			iflags |= MCI_TXRDY;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return iflags;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void atmci_request(struct mmc_host *mmc, struct mmc_request *mrq)</div><div class='add'>+static void atmci_start_request(struct atmel_mci *host,</div><div class='add'>+		struct atmel_mci_slot *slot)</div><div class='ctx'> {</div><div class='del'>-	struct atmel_mci	*host = mmc_priv(mmc);</div><div class='del'>-	struct mmc_data		*data;</div><div class='add'>+	struct mmc_request	*mrq;</div><div class='ctx'> 	struct mmc_command	*cmd;</div><div class='add'>+	struct mmc_data		*data;</div><div class='ctx'> 	u32			iflags;</div><div class='del'>-	u32			cmdflags = 0;</div><div class='del'>-</div><div class='del'>-	iflags = mci_readl(host, IMR);</div><div class='del'>-	if (iflags)</div><div class='del'>-		dev_warn(&amp;mmc-&gt;class_dev, "WARNING: IMR=0x%08x\n",</div><div class='del'>-				mci_readl(host, IMR));</div><div class='del'>-</div><div class='del'>-	WARN_ON(host-&gt;mrq != NULL);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We may "know" the card is gone even though there's still an</div><div class='del'>-	 * electrical connection. If so, we really need to communicate</div><div class='del'>-	 * this to the MMC core since there won't be any more</div><div class='del'>-	 * interrupts as the card is completely removed. Otherwise,</div><div class='del'>-	 * the MMC core might believe the card is still there even</div><div class='del'>-	 * though the card was just removed very slowly.</div><div class='del'>-	 */</div><div class='del'>-	if (!host-&gt;present) {</div><div class='del'>-		mrq-&gt;cmd-&gt;error = -ENOMEDIUM;</div><div class='del'>-		mmc_request_done(mmc, mrq);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='add'>+	u32			cmdflags;</div><div class='ctx'> </div><div class='add'>+	mrq = slot-&gt;mrq;</div><div class='add'>+	host-&gt;cur_slot = slot;</div><div class='ctx'> 	host-&gt;mrq = mrq;</div><div class='add'>+</div><div class='ctx'> 	host-&gt;pending_events = 0;</div><div class='ctx'> 	host-&gt;completed_events = 0;</div><div class='add'>+	host-&gt;data_status = 0;</div><div class='ctx'> </div><div class='del'>-	atmci_enable(host);</div><div class='add'>+	if (host-&gt;need_reset) {</div><div class='add'>+		mci_writel(host, CR, MCI_CR_SWRST);</div><div class='add'>+		mci_writel(host, CR, MCI_CR_MCIEN);</div><div class='add'>+		mci_writel(host, MR, host-&gt;mode_reg);</div><div class='add'>+		host-&gt;need_reset = false;</div><div class='add'>+	}</div><div class='add'>+	mci_writel(host, SDCR, slot-&gt;sdc_reg);</div><div class='ctx'> </div><div class='del'>-	/* We don't support multiple blocks of weird lengths. */</div><div class='add'>+	iflags = mci_readl(host, IMR);</div><div class='add'>+	if (iflags)</div><div class='add'>+		dev_warn(&amp;slot-&gt;mmc-&gt;class_dev, "WARNING: IMR=0x%08x\n",</div><div class='add'>+				iflags);</div><div class='add'>+</div><div class='add'>+	if (unlikely(test_and_clear_bit(ATMCI_CARD_NEED_INIT, &amp;slot-&gt;flags))) {</div><div class='add'>+		/* Send init sequence (74 clock cycles) */</div><div class='add'>+		mci_writel(host, CMDR, MCI_CMDR_SPCMD_INIT);</div><div class='add'>+		while (!(mci_readl(host, SR) &amp; MCI_CMDRDY))</div><div class='add'>+			cpu_relax();</div><div class='add'>+	}</div><div class='ctx'> 	data = mrq-&gt;data;</div><div class='ctx'> 	if (data) {</div><div class='del'>-		if (data-&gt;blocks &gt; 1 &amp;&amp; data-&gt;blksz &amp; 3)</div><div class='del'>-			goto fail;</div><div class='del'>-		atmci_set_timeout(host, data);</div><div class='add'>+		atmci_set_timeout(host, slot, data);</div><div class='ctx'> </div><div class='ctx'> 		/* Must set block count/size before sending command */</div><div class='ctx'> 		mci_writel(host, BLKR, MCI_BCNT(data-&gt;blocks)</div><div class='ctx'> 				| MCI_BLKLEN(data-&gt;blksz));</div><div class='add'>+		dev_vdbg(&amp;slot-&gt;mmc-&gt;class_dev, "BLKR=0x%08x\n",</div><div class='add'>+			MCI_BCNT(data-&gt;blocks) | MCI_BLKLEN(data-&gt;blksz));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	iflags = MCI_CMDRDY;</div><div class='ctx'> 	cmd = mrq-&gt;cmd;</div><div class='del'>-	cmdflags = atmci_prepare_command(mmc, cmd);</div><div class='add'>+	cmdflags = atmci_prepare_command(slot-&gt;mmc, cmd);</div><div class='ctx'> 	atmci_start_command(host, cmd, cmdflags);</div><div class='ctx'> </div><div class='ctx'> 	if (data)</div><div class='del'>-		iflags |= atmci_submit_data(mmc, data);</div><div class='add'>+		iflags |= atmci_submit_data(host, data);</div><div class='ctx'> </div><div class='ctx'> 	if (mrq-&gt;stop) {</div><div class='del'>-		host-&gt;stop_cmdr = atmci_prepare_command(mmc, mrq-&gt;stop);</div><div class='add'>+		host-&gt;stop_cmdr = atmci_prepare_command(slot-&gt;mmc, mrq-&gt;stop);</div><div class='ctx'> 		host-&gt;stop_cmdr |= MCI_CMDR_STOP_XFER;</div><div class='ctx'> 		if (!(data-&gt;flags &amp; MMC_DATA_WRITE))</div><div class='ctx'> 			host-&gt;stop_cmdr |= MCI_CMDR_TRDIR_READ;</div><div class='hunk'>@@ -513,59 +752,156 @@ static void atmci_request(struct mmc_host *mmc, struct mmc_request *mrq)</div><div class='ctx'> 	 * prepared yet.)</div><div class='ctx'> 	 */</div><div class='ctx'> 	mci_writel(host, IER, iflags);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	return;</div><div class='add'>+static void atmci_queue_request(struct atmel_mci *host,</div><div class='add'>+		struct atmel_mci_slot *slot, struct mmc_request *mrq)</div><div class='add'>+{</div><div class='add'>+	dev_vdbg(&amp;slot-&gt;mmc-&gt;class_dev, "queue request: state=%d\n",</div><div class='add'>+			host-&gt;state);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;host-&gt;lock);</div><div class='add'>+	slot-&gt;mrq = mrq;</div><div class='add'>+	if (host-&gt;state == STATE_IDLE) {</div><div class='add'>+		host-&gt;state = STATE_SENDING_CMD;</div><div class='add'>+		atmci_start_request(host, slot);</div><div class='add'>+	} else {</div><div class='add'>+		list_add_tail(&amp;slot-&gt;queue_node, &amp;host-&gt;queue);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(&amp;host-&gt;lock);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-fail:</div><div class='del'>-	atmci_disable(host);</div><div class='del'>-	host-&gt;mrq = NULL;</div><div class='del'>-	mrq-&gt;cmd-&gt;error = -EINVAL;</div><div class='del'>-	mmc_request_done(mmc, mrq);</div><div class='add'>+static void atmci_request(struct mmc_host *mmc, struct mmc_request *mrq)</div><div class='add'>+{</div><div class='add'>+	struct atmel_mci_slot	*slot = mmc_priv(mmc);</div><div class='add'>+	struct atmel_mci	*host = slot-&gt;host;</div><div class='add'>+	struct mmc_data		*data;</div><div class='add'>+</div><div class='add'>+	WARN_ON(slot-&gt;mrq);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We may "know" the card is gone even though there's still an</div><div class='add'>+	 * electrical connection. If so, we really need to communicate</div><div class='add'>+	 * this to the MMC core since there won't be any more</div><div class='add'>+	 * interrupts as the card is completely removed. Otherwise,</div><div class='add'>+	 * the MMC core might believe the card is still there even</div><div class='add'>+	 * though the card was just removed very slowly.</div><div class='add'>+	 */</div><div class='add'>+	if (!test_bit(ATMCI_CARD_PRESENT, &amp;slot-&gt;flags)) {</div><div class='add'>+		mrq-&gt;cmd-&gt;error = -ENOMEDIUM;</div><div class='add'>+		mmc_request_done(mmc, mrq);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* We don't support multiple blocks of weird lengths. */</div><div class='add'>+	data = mrq-&gt;data;</div><div class='add'>+	if (data &amp;&amp; data-&gt;blocks &gt; 1 &amp;&amp; data-&gt;blksz &amp; 3) {</div><div class='add'>+		mrq-&gt;cmd-&gt;error = -EINVAL;</div><div class='add'>+		mmc_request_done(mmc, mrq);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	atmci_queue_request(host, slot, mrq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void atmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)</div><div class='ctx'> {</div><div class='del'>-	struct atmel_mci	*host = mmc_priv(mmc);</div><div class='add'>+	struct atmel_mci_slot	*slot = mmc_priv(mmc);</div><div class='add'>+	struct atmel_mci	*host = slot-&gt;host;</div><div class='add'>+	unsigned int		i;</div><div class='add'>+</div><div class='add'>+	slot-&gt;sdc_reg &amp;= ~MCI_SDCBUS_MASK;</div><div class='add'>+	switch (ios-&gt;bus_width) {</div><div class='add'>+	case MMC_BUS_WIDTH_1:</div><div class='add'>+		slot-&gt;sdc_reg |= MCI_SDCBUS_1BIT;</div><div class='add'>+		break;</div><div class='add'>+	case MMC_BUS_WIDTH_4:</div><div class='add'>+		slot-&gt;sdc_reg = MCI_SDCBUS_4BIT;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (ios-&gt;clock) {</div><div class='add'>+		unsigned int clock_min = ~0U;</div><div class='ctx'> 		u32 clkdiv;</div><div class='ctx'> </div><div class='del'>-		/* Set clock rate */</div><div class='del'>-		clkdiv = DIV_ROUND_UP(host-&gt;bus_hz, 2 * ios-&gt;clock) - 1;</div><div class='add'>+		spin_lock_bh(&amp;host-&gt;lock);</div><div class='add'>+		if (!host-&gt;mode_reg) {</div><div class='add'>+			clk_enable(host-&gt;mck);</div><div class='add'>+			mci_writel(host, CR, MCI_CR_SWRST);</div><div class='add'>+			mci_writel(host, CR, MCI_CR_MCIEN);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Use mirror of ios-&gt;clock to prevent race with mmc</div><div class='add'>+		 * core ios update when finding the minimum.</div><div class='add'>+		 */</div><div class='add'>+		slot-&gt;clock = ios-&gt;clock;</div><div class='add'>+		for (i = 0; i &lt; ATMEL_MCI_MAX_NR_SLOTS; i++) {</div><div class='add'>+			if (host-&gt;slot[i] &amp;&amp; host-&gt;slot[i]-&gt;clock</div><div class='add'>+					&amp;&amp; host-&gt;slot[i]-&gt;clock &lt; clock_min)</div><div class='add'>+				clock_min = host-&gt;slot[i]-&gt;clock;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Calculate clock divider */</div><div class='add'>+		clkdiv = DIV_ROUND_UP(host-&gt;bus_hz, 2 * clock_min) - 1;</div><div class='ctx'> 		if (clkdiv &gt; 255) {</div><div class='ctx'> 			dev_warn(&amp;mmc-&gt;class_dev,</div><div class='ctx'> 				"clock %u too slow; using %lu\n",</div><div class='del'>-				ios-&gt;clock, host-&gt;bus_hz / (2 * 256));</div><div class='add'>+				clock_min, host-&gt;bus_hz / (2 * 256));</div><div class='ctx'> 			clkdiv = 255;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		/*</div><div class='add'>+		 * WRPROOF and RDPROOF prevent overruns/underruns by</div><div class='add'>+		 * stopping the clock when the FIFO is full/empty.</div><div class='add'>+		 * This state is not expected to last for long.</div><div class='add'>+		 */</div><div class='ctx'> 		host-&gt;mode_reg = MCI_MR_CLKDIV(clkdiv) | MCI_MR_WRPROOF</div><div class='ctx'> 					| MCI_MR_RDPROOF;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	switch (ios-&gt;bus_width) {</div><div class='del'>-	case MMC_BUS_WIDTH_1:</div><div class='del'>-		host-&gt;sdc_reg = 0;</div><div class='del'>-		break;</div><div class='del'>-	case MMC_BUS_WIDTH_4:</div><div class='del'>-		host-&gt;sdc_reg = MCI_SDCBUS_4BIT;</div><div class='del'>-		break;</div><div class='add'>+		if (list_empty(&amp;host-&gt;queue))</div><div class='add'>+			mci_writel(host, MR, host-&gt;mode_reg);</div><div class='add'>+		else</div><div class='add'>+			host-&gt;need_clock_update = true;</div><div class='add'>+</div><div class='add'>+		spin_unlock_bh(&amp;host-&gt;lock);</div><div class='add'>+	} else {</div><div class='add'>+		bool any_slot_active = false;</div><div class='add'>+</div><div class='add'>+		spin_lock_bh(&amp;host-&gt;lock);</div><div class='add'>+		slot-&gt;clock = 0;</div><div class='add'>+		for (i = 0; i &lt; ATMEL_MCI_MAX_NR_SLOTS; i++) {</div><div class='add'>+			if (host-&gt;slot[i] &amp;&amp; host-&gt;slot[i]-&gt;clock) {</div><div class='add'>+				any_slot_active = true;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if (!any_slot_active) {</div><div class='add'>+			mci_writel(host, CR, MCI_CR_MCIDIS);</div><div class='add'>+			if (host-&gt;mode_reg) {</div><div class='add'>+				mci_readl(host, MR);</div><div class='add'>+				clk_disable(host-&gt;mck);</div><div class='add'>+			}</div><div class='add'>+			host-&gt;mode_reg = 0;</div><div class='add'>+		}</div><div class='add'>+		spin_unlock_bh(&amp;host-&gt;lock);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	switch (ios-&gt;power_mode) {</div><div class='del'>-	case MMC_POWER_ON:</div><div class='del'>-		/* Send init sequence (74 clock cycles) */</div><div class='del'>-		atmci_enable(host);</div><div class='del'>-		mci_writel(host, CMDR, MCI_CMDR_SPCMD_INIT);</div><div class='del'>-		while (!(mci_readl(host, SR) &amp; MCI_CMDRDY))</div><div class='del'>-			cpu_relax();</div><div class='del'>-		atmci_disable(host);</div><div class='add'>+	case MMC_POWER_UP:</div><div class='add'>+		set_bit(ATMCI_CARD_NEED_INIT, &amp;slot-&gt;flags);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * TODO: None of the currently available AVR32-based</div><div class='ctx'> 		 * boards allow MMC power to be turned off. Implement</div><div class='ctx'> 		 * power control when this can be tested properly.</div><div class='add'>+		 *</div><div class='add'>+		 * We also need to hook this into the clock management</div><div class='add'>+		 * somehow so that newly inserted cards aren't</div><div class='add'>+		 * subjected to a fast clock before we have a chance</div><div class='add'>+		 * to figure out what the maximum rate is. Currently,</div><div class='add'>+		 * there's no way to avoid this, and there never will</div><div class='add'>+		 * be for boards that don't support power control.</div><div class='ctx'> 		 */</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -573,31 +909,82 @@ static void atmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)</div><div class='ctx'> </div><div class='ctx'> static int atmci_get_ro(struct mmc_host *mmc)</div><div class='ctx'> {</div><div class='del'>-	int			read_only = 0;</div><div class='del'>-	struct atmel_mci	*host = mmc_priv(mmc);</div><div class='add'>+	int			read_only = -ENOSYS;</div><div class='add'>+	struct atmel_mci_slot	*slot = mmc_priv(mmc);</div><div class='ctx'> </div><div class='del'>-	if (gpio_is_valid(host-&gt;wp_pin)) {</div><div class='del'>-		read_only = gpio_get_value(host-&gt;wp_pin);</div><div class='add'>+	if (gpio_is_valid(slot-&gt;wp_pin)) {</div><div class='add'>+		read_only = gpio_get_value(slot-&gt;wp_pin);</div><div class='ctx'> 		dev_dbg(&amp;mmc-&gt;class_dev, "card is %s\n",</div><div class='ctx'> 				read_only ? "read-only" : "read-write");</div><div class='del'>-	} else {</div><div class='del'>-		dev_dbg(&amp;mmc-&gt;class_dev,</div><div class='del'>-			"no pin for checking read-only switch."</div><div class='del'>-			" Assuming write-enable.\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return read_only;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct mmc_host_ops atmci_ops = {</div><div class='add'>+static int atmci_get_cd(struct mmc_host *mmc)</div><div class='add'>+{</div><div class='add'>+	int			present = -ENOSYS;</div><div class='add'>+	struct atmel_mci_slot	*slot = mmc_priv(mmc);</div><div class='add'>+</div><div class='add'>+	if (gpio_is_valid(slot-&gt;detect_pin)) {</div><div class='add'>+		present = !gpio_get_value(slot-&gt;detect_pin);</div><div class='add'>+		dev_dbg(&amp;mmc-&gt;class_dev, "card is %spresent\n",</div><div class='add'>+				present ? "" : "not ");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return present;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct mmc_host_ops atmci_ops = {</div><div class='ctx'> 	.request	= atmci_request,</div><div class='ctx'> 	.set_ios	= atmci_set_ios,</div><div class='ctx'> 	.get_ro		= atmci_get_ro,</div><div class='add'>+	.get_cd		= atmci_get_cd,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* Called with host-&gt;lock held */</div><div class='add'>+static void atmci_request_end(struct atmel_mci *host, struct mmc_request *mrq)</div><div class='add'>+	__releases(&amp;host-&gt;lock)</div><div class='add'>+	__acquires(&amp;host-&gt;lock)</div><div class='add'>+{</div><div class='add'>+	struct atmel_mci_slot	*slot = NULL;</div><div class='add'>+	struct mmc_host		*prev_mmc = host-&gt;cur_slot-&gt;mmc;</div><div class='add'>+</div><div class='add'>+	WARN_ON(host-&gt;cmd || host-&gt;data);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Update the MMC clock rate if necessary. This may be</div><div class='add'>+	 * necessary if set_ios() is called when a different slot is</div><div class='add'>+	 * busy transfering data.</div><div class='add'>+	 */</div><div class='add'>+	if (host-&gt;need_clock_update)</div><div class='add'>+		mci_writel(host, MR, host-&gt;mode_reg);</div><div class='add'>+</div><div class='add'>+	host-&gt;cur_slot-&gt;mrq = NULL;</div><div class='add'>+	host-&gt;mrq = NULL;</div><div class='add'>+	if (!list_empty(&amp;host-&gt;queue)) {</div><div class='add'>+		slot = list_entry(host-&gt;queue.next,</div><div class='add'>+				struct atmel_mci_slot, queue_node);</div><div class='add'>+		list_del(&amp;slot-&gt;queue_node);</div><div class='add'>+		dev_vdbg(&amp;host-&gt;pdev-&gt;dev, "list not empty: %s is next\n",</div><div class='add'>+				mmc_hostname(slot-&gt;mmc));</div><div class='add'>+		host-&gt;state = STATE_SENDING_CMD;</div><div class='add'>+		atmci_start_request(host, slot);</div><div class='add'>+	} else {</div><div class='add'>+		dev_vdbg(&amp;host-&gt;pdev-&gt;dev, "list empty\n");</div><div class='add'>+		host-&gt;state = STATE_IDLE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;host-&gt;lock);</div><div class='add'>+	mmc_request_done(prev_mmc, mrq);</div><div class='add'>+	spin_lock(&amp;host-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void atmci_command_complete(struct atmel_mci *host,</div><div class='del'>-			struct mmc_command *cmd, u32 status)</div><div class='add'>+			struct mmc_command *cmd)</div><div class='ctx'> {</div><div class='add'>+	u32		status = host-&gt;cmd_status;</div><div class='add'>+</div><div class='ctx'> 	/* Read the response from the card (up to 16 bytes) */</div><div class='ctx'> 	cmd-&gt;resp[0] = mci_readl(host, RSPR);</div><div class='ctx'> 	cmd-&gt;resp[1] = mci_readl(host, RSPR);</div><div class='hunk'>@@ -614,11 +1001,12 @@ static void atmci_command_complete(struct atmel_mci *host,</div><div class='ctx'> 		cmd-&gt;error = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (cmd-&gt;error) {</div><div class='del'>-		dev_dbg(&amp;host-&gt;mmc-&gt;class_dev,</div><div class='add'>+		dev_dbg(&amp;host-&gt;pdev-&gt;dev,</div><div class='ctx'> 			"command error: status=0x%08x\n", status);</div><div class='ctx'> </div><div class='ctx'> 		if (cmd-&gt;data) {</div><div class='ctx'> 			host-&gt;data = NULL;</div><div class='add'>+			atmci_stop_dma(host);</div><div class='ctx'> 			mci_writel(host, IDR, MCI_NOTBUSY</div><div class='ctx'> 					| MCI_TXRDY | MCI_RXRDY</div><div class='ctx'> 					| ATMCI_DATA_ERROR_FLAGS);</div><div class='hunk'>@@ -628,146 +1016,222 @@ static void atmci_command_complete(struct atmel_mci *host,</div><div class='ctx'> </div><div class='ctx'> static void atmci_detect_change(unsigned long data)</div><div class='ctx'> {</div><div class='del'>-	struct atmel_mci *host = (struct atmel_mci *)data;</div><div class='del'>-	struct mmc_request *mrq = host-&gt;mrq;</div><div class='del'>-	int present;</div><div class='add'>+	struct atmel_mci_slot	*slot = (struct atmel_mci_slot *)data;</div><div class='add'>+	bool			present;</div><div class='add'>+	bool			present_old;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * atmci_remove() sets detect_pin to -1 before freeing the</div><div class='del'>-	 * interrupt. We must not re-enable the interrupt if it has</div><div class='del'>-	 * been freed.</div><div class='add'>+	 * atmci_cleanup_slot() sets the ATMCI_SHUTDOWN flag before</div><div class='add'>+	 * freeing the interrupt. We must not re-enable the interrupt</div><div class='add'>+	 * if it has been freed, and if we're shutting down, it</div><div class='add'>+	 * doesn't really matter whether the card is present or not.</div><div class='ctx'> 	 */</div><div class='ctx'> 	smp_rmb();</div><div class='del'>-	if (!gpio_is_valid(host-&gt;detect_pin))</div><div class='add'>+	if (test_bit(ATMCI_SHUTDOWN, &amp;slot-&gt;flags))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	enable_irq(gpio_to_irq(host-&gt;detect_pin));</div><div class='del'>-	present = !gpio_get_value(host-&gt;detect_pin);</div><div class='add'>+	enable_irq(gpio_to_irq(slot-&gt;detect_pin));</div><div class='add'>+	present = !gpio_get_value(slot-&gt;detect_pin);</div><div class='add'>+	present_old = test_bit(ATMCI_CARD_PRESENT, &amp;slot-&gt;flags);</div><div class='add'>+</div><div class='add'>+	dev_vdbg(&amp;slot-&gt;mmc-&gt;class_dev, "detect change: %d (was %d)\n",</div><div class='add'>+			present, present_old);</div><div class='ctx'> </div><div class='del'>-	dev_vdbg(&amp;host-&gt;pdev-&gt;dev, "detect change: %d (was %d)\n",</div><div class='del'>-			present, host-&gt;present);</div><div class='add'>+	if (present != present_old) {</div><div class='add'>+		struct atmel_mci	*host = slot-&gt;host;</div><div class='add'>+		struct mmc_request	*mrq;</div><div class='ctx'> </div><div class='del'>-	if (present != host-&gt;present) {</div><div class='del'>-		dev_dbg(&amp;host-&gt;mmc-&gt;class_dev, "card %s\n",</div><div class='add'>+		dev_dbg(&amp;slot-&gt;mmc-&gt;class_dev, "card %s\n",</div><div class='ctx'> 			present ? "inserted" : "removed");</div><div class='del'>-		host-&gt;present = present;</div><div class='ctx'> </div><div class='del'>-		/* Reset controller if card is gone */</div><div class='del'>-		if (!present) {</div><div class='del'>-			mci_writel(host, CR, MCI_CR_SWRST);</div><div class='del'>-			mci_writel(host, IDR, ~0UL);</div><div class='del'>-			mci_writel(host, CR, MCI_CR_MCIEN);</div><div class='del'>-		}</div><div class='add'>+		spin_lock(&amp;host-&gt;lock);</div><div class='add'>+</div><div class='add'>+		if (!present)</div><div class='add'>+			clear_bit(ATMCI_CARD_PRESENT, &amp;slot-&gt;flags);</div><div class='add'>+		else</div><div class='add'>+			set_bit(ATMCI_CARD_PRESENT, &amp;slot-&gt;flags);</div><div class='ctx'> </div><div class='ctx'> 		/* Clean up queue if present */</div><div class='add'>+		mrq = slot-&gt;mrq;</div><div class='ctx'> 		if (mrq) {</div><div class='del'>-			/*</div><div class='del'>-			 * Reset controller to terminate any ongoing</div><div class='del'>-			 * commands or data transfers.</div><div class='del'>-			 */</div><div class='del'>-			mci_writel(host, CR, MCI_CR_SWRST);</div><div class='add'>+			if (mrq == host-&gt;mrq) {</div><div class='add'>+				/*</div><div class='add'>+				 * Reset controller to terminate any ongoing</div><div class='add'>+				 * commands or data transfers.</div><div class='add'>+				 */</div><div class='add'>+				mci_writel(host, CR, MCI_CR_SWRST);</div><div class='add'>+				mci_writel(host, CR, MCI_CR_MCIEN);</div><div class='add'>+				mci_writel(host, MR, host-&gt;mode_reg);</div><div class='ctx'> </div><div class='del'>-			if (!atmci_is_completed(host, EVENT_CMD_COMPLETE))</div><div class='del'>-				mrq-&gt;cmd-&gt;error = -ENOMEDIUM;</div><div class='del'>-</div><div class='del'>-			if (mrq-&gt;data &amp;&amp; !atmci_is_completed(host,</div><div class='del'>-						EVENT_DATA_COMPLETE)) {</div><div class='ctx'> 				host-&gt;data = NULL;</div><div class='del'>-				mrq-&gt;data-&gt;error = -ENOMEDIUM;</div><div class='add'>+				host-&gt;cmd = NULL;</div><div class='add'>+</div><div class='add'>+				switch (host-&gt;state) {</div><div class='add'>+				case STATE_IDLE:</div><div class='add'>+					break;</div><div class='add'>+				case STATE_SENDING_CMD:</div><div class='add'>+					mrq-&gt;cmd-&gt;error = -ENOMEDIUM;</div><div class='add'>+					if (!mrq-&gt;data)</div><div class='add'>+						break;</div><div class='add'>+					/* fall through */</div><div class='add'>+				case STATE_SENDING_DATA:</div><div class='add'>+					mrq-&gt;data-&gt;error = -ENOMEDIUM;</div><div class='add'>+					atmci_stop_dma(host);</div><div class='add'>+					break;</div><div class='add'>+				case STATE_DATA_BUSY:</div><div class='add'>+				case STATE_DATA_ERROR:</div><div class='add'>+					if (mrq-&gt;data-&gt;error == -EINPROGRESS)</div><div class='add'>+						mrq-&gt;data-&gt;error = -ENOMEDIUM;</div><div class='add'>+					if (!mrq-&gt;stop)</div><div class='add'>+						break;</div><div class='add'>+					/* fall through */</div><div class='add'>+				case STATE_SENDING_STOP:</div><div class='add'>+					mrq-&gt;stop-&gt;error = -ENOMEDIUM;</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+				atmci_request_end(host, mrq);</div><div class='add'>+			} else {</div><div class='add'>+				list_del(&amp;slot-&gt;queue_node);</div><div class='add'>+				mrq-&gt;cmd-&gt;error = -ENOMEDIUM;</div><div class='add'>+				if (mrq-&gt;data)</div><div class='add'>+					mrq-&gt;data-&gt;error = -ENOMEDIUM;</div><div class='add'>+				if (mrq-&gt;stop)</div><div class='add'>+					mrq-&gt;stop-&gt;error = -ENOMEDIUM;</div><div class='add'>+</div><div class='add'>+				spin_unlock(&amp;host-&gt;lock);</div><div class='add'>+				mmc_request_done(slot-&gt;mmc, mrq);</div><div class='add'>+				spin_lock(&amp;host-&gt;lock);</div><div class='ctx'> 			}</div><div class='del'>-			if (mrq-&gt;stop &amp;&amp; !atmci_is_completed(host,</div><div class='del'>-						EVENT_STOP_COMPLETE))</div><div class='del'>-				mrq-&gt;stop-&gt;error = -ENOMEDIUM;</div><div class='del'>-</div><div class='del'>-			host-&gt;cmd = NULL;</div><div class='del'>-			atmci_request_end(host-&gt;mmc, mrq);</div><div class='ctx'> 		}</div><div class='add'>+		spin_unlock(&amp;host-&gt;lock);</div><div class='ctx'> </div><div class='del'>-		mmc_detect_change(host-&gt;mmc, 0);</div><div class='add'>+		mmc_detect_change(slot-&gt;mmc, 0);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void atmci_tasklet_func(unsigned long priv)</div><div class='ctx'> {</div><div class='del'>-	struct mmc_host		*mmc = (struct mmc_host *)priv;</div><div class='del'>-	struct atmel_mci	*host = mmc_priv(mmc);</div><div class='add'>+	struct atmel_mci	*host = (struct atmel_mci *)priv;</div><div class='ctx'> 	struct mmc_request	*mrq = host-&gt;mrq;</div><div class='ctx'> 	struct mmc_data		*data = host-&gt;data;</div><div class='add'>+	struct mmc_command	*cmd = host-&gt;cmd;</div><div class='add'>+	enum atmel_mci_state	state = host-&gt;state;</div><div class='add'>+	enum atmel_mci_state	prev_state;</div><div class='add'>+	u32			status;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;host-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	dev_vdbg(&amp;mmc-&gt;class_dev,</div><div class='del'>-		"tasklet: pending/completed/mask %lx/%lx/%x\n",</div><div class='del'>-		host-&gt;pending_events, host-&gt;completed_events,</div><div class='add'>+	state = host-&gt;state;</div><div class='add'>+</div><div class='add'>+	dev_vdbg(&amp;host-&gt;pdev-&gt;dev,</div><div class='add'>+		"tasklet: state %u pending/completed/mask %lx/%lx/%x\n",</div><div class='add'>+		state, host-&gt;pending_events, host-&gt;completed_events,</div><div class='ctx'> 		mci_readl(host, IMR));</div><div class='ctx'> </div><div class='del'>-	if (atmci_test_and_clear_pending(host, EVENT_CMD_COMPLETE)) {</div><div class='del'>-		/*</div><div class='del'>-		 * host-&gt;cmd must be set to NULL before the interrupt</div><div class='del'>-		 * handler sees EVENT_CMD_COMPLETE</div><div class='del'>-		 */</div><div class='del'>-		host-&gt;cmd = NULL;</div><div class='del'>-		smp_wmb();</div><div class='del'>-		atmci_set_completed(host, EVENT_CMD_COMPLETE);</div><div class='del'>-		atmci_command_complete(host, mrq-&gt;cmd, host-&gt;cmd_status);</div><div class='del'>-</div><div class='del'>-		if (!mrq-&gt;cmd-&gt;error &amp;&amp; mrq-&gt;stop</div><div class='del'>-				&amp;&amp; atmci_is_completed(host, EVENT_XFER_COMPLETE)</div><div class='del'>-				&amp;&amp; !atmci_test_and_set_completed(host,</div><div class='del'>-					EVENT_STOP_SENT))</div><div class='del'>-			send_stop_cmd(host-&gt;mmc, mrq-&gt;data);</div><div class='del'>-	}</div><div class='del'>-	if (atmci_test_and_clear_pending(host, EVENT_STOP_COMPLETE)) {</div><div class='del'>-		/*</div><div class='del'>-		 * host-&gt;cmd must be set to NULL before the interrupt</div><div class='del'>-		 * handler sees EVENT_STOP_COMPLETE</div><div class='del'>-		 */</div><div class='del'>-		host-&gt;cmd = NULL;</div><div class='del'>-		smp_wmb();</div><div class='del'>-		atmci_set_completed(host, EVENT_STOP_COMPLETE);</div><div class='del'>-		atmci_command_complete(host, mrq-&gt;stop, host-&gt;stop_status);</div><div class='del'>-	}</div><div class='del'>-	if (atmci_test_and_clear_pending(host, EVENT_DATA_ERROR)) {</div><div class='del'>-		u32 status = host-&gt;data_status;</div><div class='add'>+	do {</div><div class='add'>+		prev_state = state;</div><div class='ctx'> </div><div class='del'>-		dev_vdbg(&amp;mmc-&gt;class_dev, "data error: status=%08x\n", status);</div><div class='add'>+		switch (state) {</div><div class='add'>+		case STATE_IDLE:</div><div class='add'>+			break;</div><div class='ctx'> </div><div class='del'>-		atmci_set_completed(host, EVENT_DATA_ERROR);</div><div class='del'>-		atmci_set_completed(host, EVENT_DATA_COMPLETE);</div><div class='add'>+		case STATE_SENDING_CMD:</div><div class='add'>+			if (!atmci_test_and_clear_pending(host,</div><div class='add'>+						EVENT_CMD_COMPLETE))</div><div class='add'>+				break;</div><div class='ctx'> </div><div class='del'>-		if (status &amp; MCI_DTOE) {</div><div class='del'>-			dev_dbg(&amp;mmc-&gt;class_dev,</div><div class='del'>-					"data timeout error\n");</div><div class='del'>-			data-&gt;error = -ETIMEDOUT;</div><div class='del'>-		} else if (status &amp; MCI_DCRCE) {</div><div class='del'>-			dev_dbg(&amp;mmc-&gt;class_dev, "data CRC error\n");</div><div class='del'>-			data-&gt;error = -EILSEQ;</div><div class='del'>-		} else {</div><div class='del'>-			dev_dbg(&amp;mmc-&gt;class_dev,</div><div class='del'>-					"data FIFO error (status=%08x)\n",</div><div class='del'>-					status);</div><div class='del'>-			data-&gt;error = -EIO;</div><div class='del'>-		}</div><div class='add'>+			host-&gt;cmd = NULL;</div><div class='add'>+			atmci_set_completed(host, EVENT_CMD_COMPLETE);</div><div class='add'>+			atmci_command_complete(host, mrq-&gt;cmd);</div><div class='add'>+			if (!mrq-&gt;data || cmd-&gt;error) {</div><div class='add'>+				atmci_request_end(host, host-&gt;mrq);</div><div class='add'>+				goto unlock;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			prev_state = state = STATE_SENDING_DATA;</div><div class='add'>+			/* fall through */</div><div class='add'>+</div><div class='add'>+		case STATE_SENDING_DATA:</div><div class='add'>+			if (atmci_test_and_clear_pending(host,</div><div class='add'>+						EVENT_DATA_ERROR)) {</div><div class='add'>+				atmci_stop_dma(host);</div><div class='add'>+				if (data-&gt;stop)</div><div class='add'>+					send_stop_cmd(host, data);</div><div class='add'>+				state = STATE_DATA_ERROR;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='ctx'> </div><div class='del'>-		if (host-&gt;present &amp;&amp; data-&gt;stop</div><div class='del'>-				&amp;&amp; atmci_is_completed(host, EVENT_CMD_COMPLETE)</div><div class='del'>-				&amp;&amp; !atmci_test_and_set_completed(</div><div class='del'>-					host, EVENT_STOP_SENT))</div><div class='del'>-			send_stop_cmd(host-&gt;mmc, data);</div><div class='add'>+			if (!atmci_test_and_clear_pending(host,</div><div class='add'>+						EVENT_XFER_COMPLETE))</div><div class='add'>+				break;</div><div class='ctx'> </div><div class='del'>-		host-&gt;data = NULL;</div><div class='del'>-	}</div><div class='del'>-	if (atmci_test_and_clear_pending(host, EVENT_DATA_COMPLETE)) {</div><div class='del'>-		atmci_set_completed(host, EVENT_DATA_COMPLETE);</div><div class='add'>+			atmci_set_completed(host, EVENT_XFER_COMPLETE);</div><div class='add'>+			prev_state = state = STATE_DATA_BUSY;</div><div class='add'>+			/* fall through */</div><div class='add'>+</div><div class='add'>+		case STATE_DATA_BUSY:</div><div class='add'>+			if (!atmci_test_and_clear_pending(host,</div><div class='add'>+						EVENT_DATA_COMPLETE))</div><div class='add'>+				break;</div><div class='ctx'> </div><div class='del'>-		if (!atmci_is_completed(host, EVENT_DATA_ERROR)) {</div><div class='del'>-			data-&gt;bytes_xfered = data-&gt;blocks * data-&gt;blksz;</div><div class='del'>-			data-&gt;error = 0;</div><div class='add'>+			host-&gt;data = NULL;</div><div class='add'>+			atmci_set_completed(host, EVENT_DATA_COMPLETE);</div><div class='add'>+			status = host-&gt;data_status;</div><div class='add'>+			if (unlikely(status &amp; ATMCI_DATA_ERROR_FLAGS)) {</div><div class='add'>+				if (status &amp; MCI_DTOE) {</div><div class='add'>+					dev_dbg(&amp;host-&gt;pdev-&gt;dev,</div><div class='add'>+							"data timeout error\n");</div><div class='add'>+					data-&gt;error = -ETIMEDOUT;</div><div class='add'>+				} else if (status &amp; MCI_DCRCE) {</div><div class='add'>+					dev_dbg(&amp;host-&gt;pdev-&gt;dev,</div><div class='add'>+							"data CRC error\n");</div><div class='add'>+					data-&gt;error = -EILSEQ;</div><div class='add'>+				} else {</div><div class='add'>+					dev_dbg(&amp;host-&gt;pdev-&gt;dev,</div><div class='add'>+						"data FIFO error (status=%08x)\n",</div><div class='add'>+						status);</div><div class='add'>+					data-&gt;error = -EIO;</div><div class='add'>+				}</div><div class='add'>+			} else {</div><div class='add'>+				data-&gt;bytes_xfered = data-&gt;blocks * data-&gt;blksz;</div><div class='add'>+				data-&gt;error = 0;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (!data-&gt;stop) {</div><div class='add'>+				atmci_request_end(host, host-&gt;mrq);</div><div class='add'>+				goto unlock;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			prev_state = state = STATE_SENDING_STOP;</div><div class='add'>+			if (!data-&gt;error)</div><div class='add'>+				send_stop_cmd(host, data);</div><div class='add'>+			/* fall through */</div><div class='add'>+</div><div class='add'>+		case STATE_SENDING_STOP:</div><div class='add'>+			if (!atmci_test_and_clear_pending(host,</div><div class='add'>+						EVENT_CMD_COMPLETE))</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			host-&gt;cmd = NULL;</div><div class='add'>+			atmci_command_complete(host, mrq-&gt;stop);</div><div class='add'>+			atmci_request_end(host, host-&gt;mrq);</div><div class='add'>+			goto unlock;</div><div class='add'>+</div><div class='add'>+		case STATE_DATA_ERROR:</div><div class='add'>+			if (!atmci_test_and_clear_pending(host,</div><div class='add'>+						EVENT_XFER_COMPLETE))</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			state = STATE_DATA_BUSY;</div><div class='add'>+			break;</div><div class='ctx'> 		}</div><div class='add'>+	} while (state != prev_state);</div><div class='ctx'> </div><div class='del'>-		host-&gt;data = NULL;</div><div class='del'>-	}</div><div class='add'>+	host-&gt;state = state;</div><div class='ctx'> </div><div class='del'>-	if (host-&gt;mrq &amp;&amp; !host-&gt;cmd &amp;&amp; !host-&gt;data)</div><div class='del'>-		atmci_request_end(mmc, host-&gt;mrq);</div><div class='add'>+unlock:</div><div class='add'>+	spin_unlock(&amp;host-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void atmci_read_data_pio(struct atmel_mci *host)</div><div class='hunk'>@@ -789,6 +1253,7 @@ static void atmci_read_data_pio(struct atmel_mci *host)</div><div class='ctx'> 			nbytes += 4;</div><div class='ctx'> </div><div class='ctx'> 			if (offset == sg-&gt;length) {</div><div class='add'>+				flush_dcache_page(sg_page(sg));</div><div class='ctx'> 				host-&gt;sg = sg = sg_next(sg);</div><div class='ctx'> 				if (!sg)</div><div class='ctx'> 					goto done;</div><div class='hunk'>@@ -817,9 +1282,11 @@ static void atmci_read_data_pio(struct atmel_mci *host)</div><div class='ctx'> 			mci_writel(host, IDR, (MCI_NOTBUSY | MCI_RXRDY</div><div class='ctx'> 						| ATMCI_DATA_ERROR_FLAGS));</div><div class='ctx'> 			host-&gt;data_status = status;</div><div class='add'>+			data-&gt;bytes_xfered += nbytes;</div><div class='add'>+			smp_wmb();</div><div class='ctx'> 			atmci_set_pending(host, EVENT_DATA_ERROR);</div><div class='ctx'> 			tasklet_schedule(&amp;host-&gt;tasklet);</div><div class='del'>-			break;</div><div class='add'>+			return;</div><div class='ctx'> 		}</div><div class='ctx'> 	} while (status &amp; MCI_RXRDY);</div><div class='ctx'> </div><div class='hunk'>@@ -832,10 +1299,8 @@ done:</div><div class='ctx'> 	mci_writel(host, IDR, MCI_RXRDY);</div><div class='ctx'> 	mci_writel(host, IER, MCI_NOTBUSY);</div><div class='ctx'> 	data-&gt;bytes_xfered += nbytes;</div><div class='del'>-	atmci_set_completed(host, EVENT_XFER_COMPLETE);</div><div class='del'>-	if (data-&gt;stop &amp;&amp; atmci_is_completed(host, EVENT_CMD_COMPLETE)</div><div class='del'>-			&amp;&amp; !atmci_test_and_set_completed(host, EVENT_STOP_SENT))</div><div class='del'>-		send_stop_cmd(host-&gt;mmc, data);</div><div class='add'>+	smp_wmb();</div><div class='add'>+	atmci_set_pending(host, EVENT_XFER_COMPLETE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void atmci_write_data_pio(struct atmel_mci *host)</div><div class='hunk'>@@ -888,9 +1353,11 @@ static void atmci_write_data_pio(struct atmel_mci *host)</div><div class='ctx'> 			mci_writel(host, IDR, (MCI_NOTBUSY | MCI_TXRDY</div><div class='ctx'> 						| ATMCI_DATA_ERROR_FLAGS));</div><div class='ctx'> 			host-&gt;data_status = status;</div><div class='add'>+			data-&gt;bytes_xfered += nbytes;</div><div class='add'>+			smp_wmb();</div><div class='ctx'> 			atmci_set_pending(host, EVENT_DATA_ERROR);</div><div class='ctx'> 			tasklet_schedule(&amp;host-&gt;tasklet);</div><div class='del'>-			break;</div><div class='add'>+			return;</div><div class='ctx'> 		}</div><div class='ctx'> 	} while (status &amp; MCI_TXRDY);</div><div class='ctx'> </div><div class='hunk'>@@ -903,38 +1370,26 @@ done:</div><div class='ctx'> 	mci_writel(host, IDR, MCI_TXRDY);</div><div class='ctx'> 	mci_writel(host, IER, MCI_NOTBUSY);</div><div class='ctx'> 	data-&gt;bytes_xfered += nbytes;</div><div class='del'>-	atmci_set_completed(host, EVENT_XFER_COMPLETE);</div><div class='del'>-	if (data-&gt;stop &amp;&amp; atmci_is_completed(host, EVENT_CMD_COMPLETE)</div><div class='del'>-			&amp;&amp; !atmci_test_and_set_completed(host, EVENT_STOP_SENT))</div><div class='del'>-		send_stop_cmd(host-&gt;mmc, data);</div><div class='add'>+	smp_wmb();</div><div class='add'>+	atmci_set_pending(host, EVENT_XFER_COMPLETE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void atmci_cmd_interrupt(struct mmc_host *mmc, u32 status)</div><div class='add'>+static void atmci_cmd_interrupt(struct atmel_mci *host, u32 status)</div><div class='ctx'> {</div><div class='del'>-	struct atmel_mci	*host = mmc_priv(mmc);</div><div class='del'>-</div><div class='ctx'> 	mci_writel(host, IDR, MCI_CMDRDY);</div><div class='ctx'> </div><div class='del'>-	if (atmci_is_completed(host, EVENT_STOP_SENT)) {</div><div class='del'>-		host-&gt;stop_status = status;</div><div class='del'>-		atmci_set_pending(host, EVENT_STOP_COMPLETE);</div><div class='del'>-	} else {</div><div class='del'>-		host-&gt;cmd_status = status;</div><div class='del'>-		atmci_set_pending(host, EVENT_CMD_COMPLETE);</div><div class='del'>-	}</div><div class='del'>-</div><div class='add'>+	host-&gt;cmd_status = status;</div><div class='add'>+	smp_wmb();</div><div class='add'>+	atmci_set_pending(host, EVENT_CMD_COMPLETE);</div><div class='ctx'> 	tasklet_schedule(&amp;host-&gt;tasklet);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static irqreturn_t atmci_interrupt(int irq, void *dev_id)</div><div class='ctx'> {</div><div class='del'>-	struct mmc_host		*mmc = dev_id;</div><div class='del'>-	struct atmel_mci	*host = mmc_priv(mmc);</div><div class='add'>+	struct atmel_mci	*host = dev_id;</div><div class='ctx'> 	u32			status, mask, pending;</div><div class='ctx'> 	unsigned int		pass_count = 0;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;mmc-&gt;lock);</div><div class='del'>-</div><div class='ctx'> 	do {</div><div class='ctx'> 		status = mci_readl(host, SR);</div><div class='ctx'> 		mask = mci_readl(host, IMR);</div><div class='hunk'>@@ -946,13 +1401,18 @@ static irqreturn_t atmci_interrupt(int irq, void *dev_id)</div><div class='ctx'> 			mci_writel(host, IDR, ATMCI_DATA_ERROR_FLAGS</div><div class='ctx'> 					| MCI_RXRDY | MCI_TXRDY);</div><div class='ctx'> 			pending &amp;= mci_readl(host, IMR);</div><div class='add'>+</div><div class='ctx'> 			host-&gt;data_status = status;</div><div class='add'>+			smp_wmb();</div><div class='ctx'> 			atmci_set_pending(host, EVENT_DATA_ERROR);</div><div class='ctx'> 			tasklet_schedule(&amp;host-&gt;tasklet);</div><div class='ctx'> 		}</div><div class='ctx'> 		if (pending &amp; MCI_NOTBUSY) {</div><div class='del'>-			mci_writel(host, IDR, (MCI_NOTBUSY</div><div class='del'>-					       | ATMCI_DATA_ERROR_FLAGS));</div><div class='add'>+			mci_writel(host, IDR,</div><div class='add'>+					ATMCI_DATA_ERROR_FLAGS | MCI_NOTBUSY);</div><div class='add'>+			if (!host-&gt;data_status)</div><div class='add'>+				host-&gt;data_status = status;</div><div class='add'>+			smp_wmb();</div><div class='ctx'> 			atmci_set_pending(host, EVENT_DATA_COMPLETE);</div><div class='ctx'> 			tasklet_schedule(&amp;host-&gt;tasklet);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -962,18 +1422,15 @@ static irqreturn_t atmci_interrupt(int irq, void *dev_id)</div><div class='ctx'> 			atmci_write_data_pio(host);</div><div class='ctx'> </div><div class='ctx'> 		if (pending &amp; MCI_CMDRDY)</div><div class='del'>-			atmci_cmd_interrupt(mmc, status);</div><div class='add'>+			atmci_cmd_interrupt(host, status);</div><div class='ctx'> 	} while (pass_count++ &lt; 5);</div><div class='ctx'> </div><div class='del'>-	spin_unlock(&amp;mmc-&gt;lock);</div><div class='del'>-</div><div class='ctx'> 	return pass_count ? IRQ_HANDLED : IRQ_NONE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static irqreturn_t atmci_detect_interrupt(int irq, void *dev_id)</div><div class='ctx'> {</div><div class='del'>-	struct mmc_host		*mmc = dev_id;</div><div class='del'>-	struct atmel_mci	*host = mmc_priv(mmc);</div><div class='add'>+	struct atmel_mci_slot	*slot = dev_id;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Disable interrupts until the pin has stabilized and check</div><div class='hunk'>@@ -981,19 +1438,176 @@ static irqreturn_t atmci_detect_interrupt(int irq, void *dev_id)</div><div class='ctx'> 	 * middle of the timer routine when this interrupt triggers.</div><div class='ctx'> 	 */</div><div class='ctx'> 	disable_irq_nosync(irq);</div><div class='del'>-	mod_timer(&amp;host-&gt;detect_timer, jiffies + msecs_to_jiffies(20));</div><div class='add'>+	mod_timer(&amp;slot-&gt;detect_timer, jiffies + msecs_to_jiffies(20));</div><div class='ctx'> </div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_MMC_ATMELMCI_DMA</div><div class='add'>+</div><div class='add'>+static inline struct atmel_mci *</div><div class='add'>+dma_client_to_atmel_mci(struct dma_client *client)</div><div class='add'>+{</div><div class='add'>+	return container_of(client, struct atmel_mci, dma.client);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum dma_state_client atmci_dma_event(struct dma_client *client,</div><div class='add'>+		struct dma_chan *chan, enum dma_state state)</div><div class='add'>+{</div><div class='add'>+	struct atmel_mci	*host;</div><div class='add'>+	enum dma_state_client	ret = DMA_NAK;</div><div class='add'>+</div><div class='add'>+	host = dma_client_to_atmel_mci(client);</div><div class='add'>+</div><div class='add'>+	switch (state) {</div><div class='add'>+	case DMA_RESOURCE_AVAILABLE:</div><div class='add'>+		spin_lock_bh(&amp;host-&gt;lock);</div><div class='add'>+		if (!host-&gt;dma.chan) {</div><div class='add'>+			host-&gt;dma.chan = chan;</div><div class='add'>+			ret = DMA_ACK;</div><div class='add'>+		}</div><div class='add'>+		spin_unlock_bh(&amp;host-&gt;lock);</div><div class='add'>+</div><div class='add'>+		if (ret == DMA_ACK)</div><div class='add'>+			dev_info(&amp;host-&gt;pdev-&gt;dev,</div><div class='add'>+					"Using %s for DMA transfers\n",</div><div class='add'>+					chan-&gt;dev.bus_id);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case DMA_RESOURCE_REMOVED:</div><div class='add'>+		spin_lock_bh(&amp;host-&gt;lock);</div><div class='add'>+		if (host-&gt;dma.chan == chan) {</div><div class='add'>+			host-&gt;dma.chan = NULL;</div><div class='add'>+			ret = DMA_ACK;</div><div class='add'>+		}</div><div class='add'>+		spin_unlock_bh(&amp;host-&gt;lock);</div><div class='add'>+</div><div class='add'>+		if (ret == DMA_ACK)</div><div class='add'>+			dev_info(&amp;host-&gt;pdev-&gt;dev,</div><div class='add'>+					"Lost %s, falling back to PIO\n",</div><div class='add'>+					chan-&gt;dev.bus_id);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_MMC_ATMELMCI_DMA */</div><div class='add'>+</div><div class='add'>+static int __init atmci_init_slot(struct atmel_mci *host,</div><div class='add'>+		struct mci_slot_pdata *slot_data, unsigned int id,</div><div class='add'>+		u32 sdc_reg)</div><div class='add'>+{</div><div class='add'>+	struct mmc_host			*mmc;</div><div class='add'>+	struct atmel_mci_slot		*slot;</div><div class='add'>+</div><div class='add'>+	mmc = mmc_alloc_host(sizeof(struct atmel_mci_slot), &amp;host-&gt;pdev-&gt;dev);</div><div class='add'>+	if (!mmc)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	slot = mmc_priv(mmc);</div><div class='add'>+	slot-&gt;mmc = mmc;</div><div class='add'>+	slot-&gt;host = host;</div><div class='add'>+	slot-&gt;detect_pin = slot_data-&gt;detect_pin;</div><div class='add'>+	slot-&gt;wp_pin = slot_data-&gt;wp_pin;</div><div class='add'>+	slot-&gt;sdc_reg = sdc_reg;</div><div class='add'>+</div><div class='add'>+	mmc-&gt;ops = &amp;atmci_ops;</div><div class='add'>+	mmc-&gt;f_min = DIV_ROUND_UP(host-&gt;bus_hz, 512);</div><div class='add'>+	mmc-&gt;f_max = host-&gt;bus_hz / 2;</div><div class='add'>+	mmc-&gt;ocr_avail	= MMC_VDD_32_33 | MMC_VDD_33_34;</div><div class='add'>+	if (slot_data-&gt;bus_width &gt;= 4)</div><div class='add'>+		mmc-&gt;caps |= MMC_CAP_4_BIT_DATA;</div><div class='add'>+</div><div class='add'>+	mmc-&gt;max_hw_segs = 64;</div><div class='add'>+	mmc-&gt;max_phys_segs = 64;</div><div class='add'>+	mmc-&gt;max_req_size = 32768 * 512;</div><div class='add'>+	mmc-&gt;max_blk_size = 32768;</div><div class='add'>+	mmc-&gt;max_blk_count = 512;</div><div class='add'>+</div><div class='add'>+	/* Assume card is present initially */</div><div class='add'>+	set_bit(ATMCI_CARD_PRESENT, &amp;slot-&gt;flags);</div><div class='add'>+	if (gpio_is_valid(slot-&gt;detect_pin)) {</div><div class='add'>+		if (gpio_request(slot-&gt;detect_pin, "mmc_detect")) {</div><div class='add'>+			dev_dbg(&amp;mmc-&gt;class_dev, "no detect pin available\n");</div><div class='add'>+			slot-&gt;detect_pin = -EBUSY;</div><div class='add'>+		} else if (gpio_get_value(slot-&gt;detect_pin)) {</div><div class='add'>+			clear_bit(ATMCI_CARD_PRESENT, &amp;slot-&gt;flags);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!gpio_is_valid(slot-&gt;detect_pin))</div><div class='add'>+		mmc-&gt;caps |= MMC_CAP_NEEDS_POLL;</div><div class='add'>+</div><div class='add'>+	if (gpio_is_valid(slot-&gt;wp_pin)) {</div><div class='add'>+		if (gpio_request(slot-&gt;wp_pin, "mmc_wp")) {</div><div class='add'>+			dev_dbg(&amp;mmc-&gt;class_dev, "no WP pin available\n");</div><div class='add'>+			slot-&gt;wp_pin = -EBUSY;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	host-&gt;slot[id] = slot;</div><div class='add'>+	mmc_add_host(mmc);</div><div class='add'>+</div><div class='add'>+	if (gpio_is_valid(slot-&gt;detect_pin)) {</div><div class='add'>+		int ret;</div><div class='add'>+</div><div class='add'>+		setup_timer(&amp;slot-&gt;detect_timer, atmci_detect_change,</div><div class='add'>+				(unsigned long)slot);</div><div class='add'>+</div><div class='add'>+		ret = request_irq(gpio_to_irq(slot-&gt;detect_pin),</div><div class='add'>+				atmci_detect_interrupt,</div><div class='add'>+				IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING,</div><div class='add'>+				"mmc-detect", slot);</div><div class='add'>+		if (ret) {</div><div class='add'>+			dev_dbg(&amp;mmc-&gt;class_dev,</div><div class='add'>+				"could not request IRQ %d for detect pin\n",</div><div class='add'>+				gpio_to_irq(slot-&gt;detect_pin));</div><div class='add'>+			gpio_free(slot-&gt;detect_pin);</div><div class='add'>+			slot-&gt;detect_pin = -EBUSY;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	atmci_init_debugfs(slot);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit atmci_cleanup_slot(struct atmel_mci_slot *slot,</div><div class='add'>+		unsigned int id)</div><div class='add'>+{</div><div class='add'>+	/* Debugfs stuff is cleaned up by mmc core */</div><div class='add'>+</div><div class='add'>+	set_bit(ATMCI_SHUTDOWN, &amp;slot-&gt;flags);</div><div class='add'>+	smp_wmb();</div><div class='add'>+</div><div class='add'>+	mmc_remove_host(slot-&gt;mmc);</div><div class='add'>+</div><div class='add'>+	if (gpio_is_valid(slot-&gt;detect_pin)) {</div><div class='add'>+		int pin = slot-&gt;detect_pin;</div><div class='add'>+</div><div class='add'>+		free_irq(gpio_to_irq(pin), slot);</div><div class='add'>+		del_timer_sync(&amp;slot-&gt;detect_timer);</div><div class='add'>+		gpio_free(pin);</div><div class='add'>+	}</div><div class='add'>+	if (gpio_is_valid(slot-&gt;wp_pin))</div><div class='add'>+		gpio_free(slot-&gt;wp_pin);</div><div class='add'>+</div><div class='add'>+	slot-&gt;host-&gt;slot[id] = NULL;</div><div class='add'>+	mmc_free_host(slot-&gt;mmc);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int __init atmci_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct mci_platform_data	*pdata;</div><div class='del'>-	struct atmel_mci *host;</div><div class='del'>-	struct mmc_host *mmc;</div><div class='del'>-	struct resource *regs;</div><div class='del'>-	int irq;</div><div class='del'>-	int ret;</div><div class='add'>+	struct atmel_mci		*host;</div><div class='add'>+	struct resource			*regs;</div><div class='add'>+	unsigned int			nr_slots;</div><div class='add'>+	int				irq;</div><div class='add'>+	int				ret;</div><div class='ctx'> </div><div class='ctx'> 	regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='ctx'> 	if (!regs)</div><div class='hunk'>@@ -1005,15 +1619,13 @@ static int __init atmci_probe(struct platform_device *pdev)</div><div class='ctx'> 	if (irq &lt; 0)</div><div class='ctx'> 		return irq;</div><div class='ctx'> </div><div class='del'>-	mmc = mmc_alloc_host(sizeof(struct atmel_mci), &amp;pdev-&gt;dev);</div><div class='del'>-	if (!mmc)</div><div class='add'>+	host = kzalloc(sizeof(struct atmel_mci), GFP_KERNEL);</div><div class='add'>+	if (!host)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	host = mmc_priv(mmc);</div><div class='ctx'> 	host-&gt;pdev = pdev;</div><div class='del'>-	host-&gt;mmc = mmc;</div><div class='del'>-	host-&gt;detect_pin = pdata-&gt;detect_pin;</div><div class='del'>-	host-&gt;wp_pin = pdata-&gt;wp_pin;</div><div class='add'>+	spin_lock_init(&amp;host-&gt;lock);</div><div class='add'>+	INIT_LIST_HEAD(&amp;host-&gt;queue);</div><div class='ctx'> </div><div class='ctx'> 	host-&gt;mck = clk_get(&amp;pdev-&gt;dev, "mci_clk");</div><div class='ctx'> 	if (IS_ERR(host-&gt;mck)) {</div><div class='hunk'>@@ -1033,122 +1645,102 @@ static int __init atmci_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	host-&gt;mapbase = regs-&gt;start;</div><div class='ctx'> </div><div class='del'>-	mmc-&gt;ops = &amp;atmci_ops;</div><div class='del'>-	mmc-&gt;f_min = (host-&gt;bus_hz + 511) / 512;</div><div class='del'>-	mmc-&gt;f_max = host-&gt;bus_hz / 2;</div><div class='del'>-	mmc-&gt;ocr_avail	= MMC_VDD_32_33 | MMC_VDD_33_34;</div><div class='del'>-	mmc-&gt;caps |= MMC_CAP_4_BIT_DATA;</div><div class='del'>-</div><div class='del'>-	mmc-&gt;max_hw_segs = 64;</div><div class='del'>-	mmc-&gt;max_phys_segs = 64;</div><div class='del'>-	mmc-&gt;max_req_size = 32768 * 512;</div><div class='del'>-	mmc-&gt;max_blk_size = 32768;</div><div class='del'>-	mmc-&gt;max_blk_count = 512;</div><div class='del'>-</div><div class='del'>-	tasklet_init(&amp;host-&gt;tasklet, atmci_tasklet_func, (unsigned long)mmc);</div><div class='add'>+	tasklet_init(&amp;host-&gt;tasklet, atmci_tasklet_func, (unsigned long)host);</div><div class='ctx'> </div><div class='del'>-	ret = request_irq(irq, atmci_interrupt, 0, pdev-&gt;dev.bus_id, mmc);</div><div class='add'>+	ret = request_irq(irq, atmci_interrupt, 0, pdev-&gt;dev.bus_id, host);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err_request_irq;</div><div class='ctx'> </div><div class='del'>-	/* Assume card is present if we don't have a detect pin */</div><div class='del'>-	host-&gt;present = 1;</div><div class='del'>-	if (gpio_is_valid(host-&gt;detect_pin)) {</div><div class='del'>-		if (gpio_request(host-&gt;detect_pin, "mmc_detect")) {</div><div class='del'>-			dev_dbg(&amp;mmc-&gt;class_dev, "no detect pin available\n");</div><div class='del'>-			host-&gt;detect_pin = -1;</div><div class='del'>-		} else {</div><div class='del'>-			host-&gt;present = !gpio_get_value(host-&gt;detect_pin);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+#ifdef CONFIG_MMC_ATMELMCI_DMA</div><div class='add'>+	if (pdata-&gt;dma_slave) {</div><div class='add'>+		struct dma_slave *slave = pdata-&gt;dma_slave;</div><div class='ctx'> </div><div class='del'>-	if (!gpio_is_valid(host-&gt;detect_pin))</div><div class='del'>-		mmc-&gt;caps |= MMC_CAP_NEEDS_POLL;</div><div class='add'>+		slave-&gt;tx_reg = regs-&gt;start + MCI_TDR;</div><div class='add'>+		slave-&gt;rx_reg = regs-&gt;start + MCI_RDR;</div><div class='ctx'> </div><div class='del'>-	if (gpio_is_valid(host-&gt;wp_pin)) {</div><div class='del'>-		if (gpio_request(host-&gt;wp_pin, "mmc_wp")) {</div><div class='del'>-			dev_dbg(&amp;mmc-&gt;class_dev, "no WP pin available\n");</div><div class='del'>-			host-&gt;wp_pin = -1;</div><div class='del'>-		}</div><div class='add'>+		/* Try to grab a DMA channel */</div><div class='add'>+		host-&gt;dma.client.event_callback = atmci_dma_event;</div><div class='add'>+		dma_cap_set(DMA_SLAVE, host-&gt;dma.client.cap_mask);</div><div class='add'>+		host-&gt;dma.client.slave = slave;</div><div class='add'>+</div><div class='add'>+		dma_async_client_register(&amp;host-&gt;dma.client);</div><div class='add'>+		dma_async_client_chan_request(&amp;host-&gt;dma.client);</div><div class='add'>+	} else {</div><div class='add'>+		dev_notice(&amp;pdev-&gt;dev, "DMA not available, using PIO\n");</div><div class='ctx'> 	}</div><div class='add'>+#endif /* CONFIG_MMC_ATMELMCI_DMA */</div><div class='ctx'> </div><div class='ctx'> 	platform_set_drvdata(pdev, host);</div><div class='ctx'> </div><div class='del'>-	mmc_add_host(mmc);</div><div class='del'>-</div><div class='del'>-	if (gpio_is_valid(host-&gt;detect_pin)) {</div><div class='del'>-		setup_timer(&amp;host-&gt;detect_timer, atmci_detect_change,</div><div class='del'>-				(unsigned long)host);</div><div class='del'>-</div><div class='del'>-		ret = request_irq(gpio_to_irq(host-&gt;detect_pin),</div><div class='del'>-				atmci_detect_interrupt,</div><div class='del'>-				IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING,</div><div class='del'>-				"mmc-detect", mmc);</div><div class='del'>-		if (ret) {</div><div class='del'>-			dev_dbg(&amp;mmc-&gt;class_dev,</div><div class='del'>-				"could not request IRQ %d for detect pin\n",</div><div class='del'>-				gpio_to_irq(host-&gt;detect_pin));</div><div class='del'>-			gpio_free(host-&gt;detect_pin);</div><div class='del'>-			host-&gt;detect_pin = -1;</div><div class='del'>-		}</div><div class='add'>+	/* We need at least one slot to succeed */</div><div class='add'>+	nr_slots = 0;</div><div class='add'>+	ret = -ENODEV;</div><div class='add'>+	if (pdata-&gt;slot[0].bus_width) {</div><div class='add'>+		ret = atmci_init_slot(host, &amp;pdata-&gt;slot[0],</div><div class='add'>+				MCI_SDCSEL_SLOT_A, 0);</div><div class='add'>+		if (!ret)</div><div class='add'>+			nr_slots++;</div><div class='add'>+	}</div><div class='add'>+	if (pdata-&gt;slot[1].bus_width) {</div><div class='add'>+		ret = atmci_init_slot(host, &amp;pdata-&gt;slot[1],</div><div class='add'>+				MCI_SDCSEL_SLOT_B, 1);</div><div class='add'>+		if (!ret)</div><div class='add'>+			nr_slots++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dev_info(&amp;mmc-&gt;class_dev,</div><div class='del'>-			"Atmel MCI controller at 0x%08lx irq %d\n",</div><div class='del'>-			host-&gt;mapbase, irq);</div><div class='add'>+	if (!nr_slots)</div><div class='add'>+		goto err_init_slot;</div><div class='ctx'> </div><div class='del'>-	atmci_init_debugfs(host);</div><div class='add'>+	dev_info(&amp;pdev-&gt;dev,</div><div class='add'>+			"Atmel MCI controller at 0x%08lx irq %d, %u slots\n",</div><div class='add'>+			host-&gt;mapbase, irq, nr_slots);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='add'>+err_init_slot:</div><div class='add'>+#ifdef CONFIG_MMC_ATMELMCI_DMA</div><div class='add'>+	if (pdata-&gt;dma_slave)</div><div class='add'>+		dma_async_client_unregister(&amp;host-&gt;dma.client);</div><div class='add'>+#endif</div><div class='add'>+	free_irq(irq, host);</div><div class='ctx'> err_request_irq:</div><div class='ctx'> 	iounmap(host-&gt;regs);</div><div class='ctx'> err_ioremap:</div><div class='ctx'> 	clk_put(host-&gt;mck);</div><div class='ctx'> err_clk_get:</div><div class='del'>-	mmc_free_host(mmc);</div><div class='add'>+	kfree(host);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __exit atmci_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='del'>-	struct atmel_mci *host = platform_get_drvdata(pdev);</div><div class='add'>+	struct atmel_mci	*host = platform_get_drvdata(pdev);</div><div class='add'>+	unsigned int		i;</div><div class='ctx'> </div><div class='ctx'> 	platform_set_drvdata(pdev, NULL);</div><div class='ctx'> </div><div class='del'>-	if (host) {</div><div class='del'>-		/* Debugfs stuff is cleaned up by mmc core */</div><div class='del'>-</div><div class='del'>-		if (gpio_is_valid(host-&gt;detect_pin)) {</div><div class='del'>-			int pin = host-&gt;detect_pin;</div><div class='del'>-</div><div class='del'>-			/* Make sure the timer doesn't enable the interrupt */</div><div class='del'>-			host-&gt;detect_pin = -1;</div><div class='del'>-			smp_wmb();</div><div class='del'>-</div><div class='del'>-			free_irq(gpio_to_irq(pin), host-&gt;mmc);</div><div class='del'>-			del_timer_sync(&amp;host-&gt;detect_timer);</div><div class='del'>-			gpio_free(pin);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		mmc_remove_host(host-&gt;mmc);</div><div class='add'>+	for (i = 0; i &lt; ATMEL_MCI_MAX_NR_SLOTS; i++) {</div><div class='add'>+		if (host-&gt;slot[i])</div><div class='add'>+			atmci_cleanup_slot(host-&gt;slot[i], i);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		clk_enable(host-&gt;mck);</div><div class='del'>-		mci_writel(host, IDR, ~0UL);</div><div class='del'>-		mci_writel(host, CR, MCI_CR_MCIDIS);</div><div class='del'>-		mci_readl(host, SR);</div><div class='del'>-		clk_disable(host-&gt;mck);</div><div class='add'>+	clk_enable(host-&gt;mck);</div><div class='add'>+	mci_writel(host, IDR, ~0UL);</div><div class='add'>+	mci_writel(host, CR, MCI_CR_MCIDIS);</div><div class='add'>+	mci_readl(host, SR);</div><div class='add'>+	clk_disable(host-&gt;mck);</div><div class='ctx'> </div><div class='del'>-		if (gpio_is_valid(host-&gt;wp_pin))</div><div class='del'>-			gpio_free(host-&gt;wp_pin);</div><div class='add'>+#ifdef CONFIG_MMC_ATMELMCI_DMA</div><div class='add'>+	if (host-&gt;dma.client.slave)</div><div class='add'>+		dma_async_client_unregister(&amp;host-&gt;dma.client);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='del'>-		free_irq(platform_get_irq(pdev, 0), host-&gt;mmc);</div><div class='del'>-		iounmap(host-&gt;regs);</div><div class='add'>+	free_irq(platform_get_irq(pdev, 0), host);</div><div class='add'>+	iounmap(host-&gt;regs);</div><div class='ctx'> </div><div class='del'>-		clk_put(host-&gt;mck);</div><div class='add'>+	clk_put(host-&gt;mck);</div><div class='add'>+	kfree(host);</div><div class='ctx'> </div><div class='del'>-		mmc_free_host(host-&gt;mmc);</div><div class='del'>-	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/mmc/host/mmc_spi.c b/drivers/mmc/host/mmc_spi.c<br/>index 7503b81374e0..07faf5412a1f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/mmc/host/mmc_spi.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/mmc/host/mmc_spi.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/mmc/host/mmc_spi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/mmc/host/mmc_spi.c</a></div><div class='hunk'>@@ -95,8 +95,6 @@</div><div class='ctx'>  * reads which takes nowhere near that long.  Older cards may be able to use</div><div class='ctx'>  * shorter timeouts ... but why bother?</div><div class='ctx'>  */</div><div class='del'>-#define readblock_timeout	ktime_set(0, 100 * 1000 * 1000)</div><div class='del'>-#define writeblock_timeout	ktime_set(0, 250 * 1000 * 1000)</div><div class='ctx'> #define r1b_timeout		ktime_set(3, 0)</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -220,9 +218,9 @@ mmc_spi_wait_unbusy(struct mmc_spi_host *host, ktime_t timeout)</div><div class='ctx'> 	return mmc_spi_skip(host, timeout, sizeof(host-&gt;data-&gt;status), 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mmc_spi_readtoken(struct mmc_spi_host *host)</div><div class='add'>+static int mmc_spi_readtoken(struct mmc_spi_host *host, ktime_t timeout)</div><div class='ctx'> {</div><div class='del'>-	return mmc_spi_skip(host, readblock_timeout, 1, 0xff);</div><div class='add'>+	return mmc_spi_skip(host, timeout, 1, 0xff);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -605,7 +603,8 @@ mmc_spi_setup_data_message(</div><div class='ctx'>  * Return negative errno, else success.</div><div class='ctx'>  */</div><div class='ctx'> static int</div><div class='del'>-mmc_spi_writeblock(struct mmc_spi_host *host, struct spi_transfer *t)</div><div class='add'>+mmc_spi_writeblock(struct mmc_spi_host *host, struct spi_transfer *t,</div><div class='add'>+	ktime_t timeout)</div><div class='ctx'> {</div><div class='ctx'> 	struct spi_device	*spi = host-&gt;spi;</div><div class='ctx'> 	int			status, i;</div><div class='hunk'>@@ -673,7 +672,7 @@ mmc_spi_writeblock(struct mmc_spi_host *host, struct spi_transfer *t)</div><div class='ctx'> 		if (scratch-&gt;status[i] != 0)</div><div class='ctx'> 			return 0;</div><div class='ctx'> 	}</div><div class='del'>-	return mmc_spi_wait_unbusy(host, writeblock_timeout);</div><div class='add'>+	return mmc_spi_wait_unbusy(host, timeout);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -693,7 +692,8 @@ mmc_spi_writeblock(struct mmc_spi_host *host, struct spi_transfer *t)</div><div class='ctx'>  * STOP_TRANSMISSION command.</div><div class='ctx'>  */</div><div class='ctx'> static int</div><div class='del'>-mmc_spi_readblock(struct mmc_spi_host *host, struct spi_transfer *t)</div><div class='add'>+mmc_spi_readblock(struct mmc_spi_host *host, struct spi_transfer *t,</div><div class='add'>+	ktime_t timeout)</div><div class='ctx'> {</div><div class='ctx'> 	struct spi_device	*spi = host-&gt;spi;</div><div class='ctx'> 	int			status;</div><div class='hunk'>@@ -707,7 +707,7 @@ mmc_spi_readblock(struct mmc_spi_host *host, struct spi_transfer *t)</div><div class='ctx'> 		return status;</div><div class='ctx'> 	status = scratch-&gt;status[0];</div><div class='ctx'> 	if (status == 0xff || status == 0)</div><div class='del'>-		status = mmc_spi_readtoken(host);</div><div class='add'>+		status = mmc_spi_readtoken(host, timeout);</div><div class='ctx'> </div><div class='ctx'> 	if (status == SPI_TOKEN_SINGLE) {</div><div class='ctx'> 		if (host-&gt;dma_dev) {</div><div class='hunk'>@@ -778,6 +778,8 @@ mmc_spi_data_do(struct mmc_spi_host *host, struct mmc_command *cmd,</div><div class='ctx'> 	struct scatterlist	*sg;</div><div class='ctx'> 	unsigned		n_sg;</div><div class='ctx'> 	int			multiple = (data-&gt;blocks &gt; 1);</div><div class='add'>+	u32			clock_rate;</div><div class='add'>+	ktime_t			timeout;</div><div class='ctx'> </div><div class='ctx'> 	if (data-&gt;flags &amp; MMC_DATA_READ)</div><div class='ctx'> 		direction = DMA_FROM_DEVICE;</div><div class='hunk'>@@ -786,6 +788,14 @@ mmc_spi_data_do(struct mmc_spi_host *host, struct mmc_command *cmd,</div><div class='ctx'> 	mmc_spi_setup_data_message(host, multiple, direction);</div><div class='ctx'> 	t = &amp;host-&gt;t;</div><div class='ctx'> </div><div class='add'>+	if (t-&gt;speed_hz)</div><div class='add'>+		clock_rate = t-&gt;speed_hz;</div><div class='add'>+	else</div><div class='add'>+		clock_rate = spi-&gt;max_speed_hz;</div><div class='add'>+</div><div class='add'>+	timeout = ktime_add_ns(ktime_set(0, 0), data-&gt;timeout_ns +</div><div class='add'>+			data-&gt;timeout_clks * 1000000 / clock_rate);</div><div class='add'>+</div><div class='ctx'> 	/* Handle scatterlist segments one at a time, with synch for</div><div class='ctx'> 	 * each 512-byte block</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -832,9 +842,9 @@ mmc_spi_data_do(struct mmc_spi_host *host, struct mmc_command *cmd,</div><div class='ctx'> 				t-&gt;len);</div><div class='ctx'> </div><div class='ctx'> 			if (direction == DMA_TO_DEVICE)</div><div class='del'>-				status = mmc_spi_writeblock(host, t);</div><div class='add'>+				status = mmc_spi_writeblock(host, t, timeout);</div><div class='ctx'> 			else</div><div class='del'>-				status = mmc_spi_readblock(host, t);</div><div class='add'>+				status = mmc_spi_readblock(host, t, timeout);</div><div class='ctx'> 			if (status &lt; 0)</div><div class='ctx'> 				break;</div><div class='ctx'> </div><div class='hunk'>@@ -917,7 +927,7 @@ mmc_spi_data_do(struct mmc_spi_host *host, struct mmc_command *cmd,</div><div class='ctx'> 			if (scratch-&gt;status[tmp] != 0)</div><div class='ctx'> 				return;</div><div class='ctx'> 		}</div><div class='del'>-		tmp = mmc_spi_wait_unbusy(host, writeblock_timeout);</div><div class='add'>+		tmp = mmc_spi_wait_unbusy(host, timeout);</div><div class='ctx'> 		if (tmp &lt; 0 &amp;&amp; !data-&gt;error)</div><div class='ctx'> 			data-&gt;error = tmp;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c<br/>index c16028872bbb..1b9fc3c6b875 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/mmc/host/omap.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/mmc/host/omap.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/mmc/host/omap.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/mmc/host/omap.c</a></div><div class='hunk'>@@ -172,7 +172,7 @@ struct mmc_omap_host {</div><div class='ctx'> 	struct omap_mmc_platform_data *pdata;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-void mmc_omap_fclk_offdelay(struct mmc_omap_slot *slot)</div><div class='add'>+static void mmc_omap_fclk_offdelay(struct mmc_omap_slot *slot)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long tick_ns;</div><div class='ctx'> </div><div class='hunk'>@@ -182,7 +182,7 @@ void mmc_omap_fclk_offdelay(struct mmc_omap_slot *slot)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void mmc_omap_fclk_enable(struct mmc_omap_host *host, unsigned int enable)</div><div class='add'>+static void mmc_omap_fclk_enable(struct mmc_omap_host *host, unsigned int enable)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='hunk'>@@ -1455,7 +1455,9 @@ static int __init mmc_omap_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	host-&gt;irq = irq;</div><div class='ctx'> 	host-&gt;phys_base = host-&gt;mem_res-&gt;start;</div><div class='del'>-	host-&gt;virt_base = (void __iomem *) IO_ADDRESS(host-&gt;phys_base);</div><div class='add'>+	host-&gt;virt_base = ioremap(res-&gt;start, res-&gt;end - res-&gt;start + 1);</div><div class='add'>+	if (!host-&gt;virt_base)</div><div class='add'>+		goto err_ioremap;</div><div class='ctx'> </div><div class='ctx'> 	if (cpu_is_omap24xx()) {</div><div class='ctx'> 		host-&gt;iclk = clk_get(&amp;pdev-&gt;dev, "mmc_ick");</div><div class='hunk'>@@ -1510,6 +1512,8 @@ err_free_iclk:</div><div class='ctx'> 		clk_put(host-&gt;iclk);</div><div class='ctx'> 	}</div><div class='ctx'> err_free_mmc_host:</div><div class='add'>+	iounmap(host-&gt;virt_base);</div><div class='add'>+err_ioremap:</div><div class='ctx'> 	kfree(host);</div><div class='ctx'> err_free_mem_region:</div><div class='ctx'> 	release_mem_region(res-&gt;start, res-&gt;end - res-&gt;start + 1);</div><div class='hunk'>@@ -1536,6 +1540,7 @@ static int mmc_omap_remove(struct platform_device *pdev)</div><div class='ctx'> 	if (host-&gt;fclk &amp;&amp; !IS_ERR(host-&gt;fclk))</div><div class='ctx'> 		clk_put(host-&gt;fclk);</div><div class='ctx'> </div><div class='add'>+	iounmap(host-&gt;virt_base);</div><div class='ctx'> 	release_mem_region(pdev-&gt;resource[0].start,</div><div class='ctx'> 			   pdev-&gt;resource[0].end - pdev-&gt;resource[0].start + 1);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/mmc/host/pxamci.c b/drivers/mmc/host/pxamci.c<br/>index 55093ad132ca..ebfaa9960939 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/mmc/host/pxamci.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/mmc/host/pxamci.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/mmc/host/pxamci.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/mmc/host/pxamci.c</a></div><div class='hunk'>@@ -520,7 +520,7 @@ static int pxamci_probe(struct platform_device *pdev)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Block length register is only 10 bits before PXA27x.</div><div class='ctx'> 	 */</div><div class='del'>-	mmc-&gt;max_blk_size = (cpu_is_pxa21x() || cpu_is_pxa25x()) ? 1023 : 2048;</div><div class='add'>+	mmc-&gt;max_blk_size = cpu_is_pxa25x() ? 1023 : 2048;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Block count register is 16 bits.</div><div class='hunk'>@@ -554,7 +554,7 @@ static int pxamci_probe(struct platform_device *pdev)</div><div class='ctx'> 			 MMC_VDD_32_33|MMC_VDD_33_34;</div><div class='ctx'> 	mmc-&gt;caps = 0;</div><div class='ctx'> 	host-&gt;cmdat = 0;</div><div class='del'>-	if (!cpu_is_pxa21x() &amp;&amp; !cpu_is_pxa25x()) {</div><div class='add'>+	if (!cpu_is_pxa25x()) {</div><div class='ctx'> 		mmc-&gt;caps |= MMC_CAP_4_BIT_DATA | MMC_CAP_SDIO_IRQ;</div><div class='ctx'> 		host-&gt;cmdat |= CMDAT_SDIO_INT_EN;</div><div class='ctx'> 		if (cpu_is_pxa300() || cpu_is_pxa310())</div><div class='head'>diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c<br/>index fcb14c2346cc..9bd7026b0021 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/mmc/host/sdhci-pci.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/mmc/host/sdhci-pci.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/mmc/host/sdhci-pci.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/mmc/host/sdhci-pci.c</a></div><div class='hunk'>@@ -144,7 +144,8 @@ static int jmicron_probe(struct sdhci_pci_chip *chip)</div><div class='ctx'> 			  SDHCI_QUIRK_32BIT_DMA_SIZE |</div><div class='ctx'> 			  SDHCI_QUIRK_32BIT_ADMA_SIZE |</div><div class='ctx'> 			  SDHCI_QUIRK_RESET_AFTER_REQUEST |</div><div class='del'>-			  SDHCI_QUIRK_BROKEN_SMALL_PIO;</div><div class='add'>+			  SDHCI_QUIRK_BROKEN_SMALL_PIO |</div><div class='add'>+			  SDHCI_QUIRK_FORCE_HIGHSPEED;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -326,7 +327,7 @@ static const struct pci_device_id pci_ids[] __devinitdata = {</div><div class='ctx'> </div><div class='ctx'> 	{</div><div class='ctx'> 		.vendor         = PCI_VENDOR_ID_MARVELL,</div><div class='del'>-		.device         = PCI_DEVICE_ID_MARVELL_CAFE_SD,</div><div class='add'>+		.device         = PCI_DEVICE_ID_MARVELL_88ALP01_SD,</div><div class='ctx'> 		.subvendor      = PCI_ANY_ID,</div><div class='ctx'> 		.subdevice      = PCI_ANY_ID,</div><div class='ctx'> 		.driver_data    = (kernel_ulong_t)&amp;sdhci_cafe,</div><div class='head'>diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c<br/>index e3a8133560a2..30f64b1f2354 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/mmc/host/sdhci.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/mmc/host/sdhci.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/mmc/host/sdhci.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/mmc/host/sdhci.c</a></div><div class='hunk'>@@ -177,7 +177,7 @@ static void sdhci_read_block_pio(struct sdhci_host *host)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	size_t blksize, len, chunk;</div><div class='del'>-	u32 scratch;</div><div class='add'>+	u32 uninitialized_var(scratch);</div><div class='ctx'> 	u8 *buf;</div><div class='ctx'> </div><div class='ctx'> 	DBG("PIO reading\n");</div><div class='hunk'>@@ -1154,7 +1154,7 @@ static void sdhci_tasklet_card(unsigned long param)</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;host-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-	mmc_detect_change(host-&gt;mmc, msecs_to_jiffies(500));</div><div class='add'>+	mmc_detect_change(host-&gt;mmc, msecs_to_jiffies(200));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sdhci_tasklet_finish(unsigned long param)</div><div class='hunk'>@@ -1266,9 +1266,31 @@ static void sdhci_cmd_irq(struct sdhci_host *host, u32 intmask)</div><div class='ctx'> 			SDHCI_INT_INDEX))</div><div class='ctx'> 		host-&gt;cmd-&gt;error = -EILSEQ;</div><div class='ctx'> </div><div class='del'>-	if (host-&gt;cmd-&gt;error)</div><div class='add'>+	if (host-&gt;cmd-&gt;error) {</div><div class='ctx'> 		tasklet_schedule(&amp;host-&gt;finish_tasklet);</div><div class='del'>-	else if (intmask &amp; SDHCI_INT_RESPONSE)</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The host can send and interrupt when the busy state has</div><div class='add'>+	 * ended, allowing us to wait without wasting CPU cycles.</div><div class='add'>+	 * Unfortunately this is overloaded on the "data complete"</div><div class='add'>+	 * interrupt, so we need to take some care when handling</div><div class='add'>+	 * it.</div><div class='add'>+	 *</div><div class='add'>+	 * Note: The 1.0 specification is a bit ambiguous about this</div><div class='add'>+	 *       feature so there might be some problems with older</div><div class='add'>+	 *       controllers.</div><div class='add'>+	 */</div><div class='add'>+	if (host-&gt;cmd-&gt;flags &amp; MMC_RSP_BUSY) {</div><div class='add'>+		if (host-&gt;cmd-&gt;data)</div><div class='add'>+			DBG("Cannot wait for busy signal when also "</div><div class='add'>+				"doing a data transfer");</div><div class='add'>+		else</div><div class='add'>+			return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (intmask &amp; SDHCI_INT_RESPONSE)</div><div class='ctx'> 		sdhci_finish_command(host);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1278,11 +1300,16 @@ static void sdhci_data_irq(struct sdhci_host *host, u32 intmask)</div><div class='ctx'> </div><div class='ctx'> 	if (!host-&gt;data) {</div><div class='ctx'> 		/*</div><div class='del'>-		 * A data end interrupt is sent together with the response</div><div class='del'>-		 * for the stop command.</div><div class='add'>+		 * The "data complete" interrupt is also used to</div><div class='add'>+		 * indicate that a busy state has ended. See comment</div><div class='add'>+		 * above in sdhci_cmd_irq().</div><div class='ctx'> 		 */</div><div class='del'>-		if (intmask &amp; SDHCI_INT_DATA_END)</div><div class='del'>-			return;</div><div class='add'>+		if (host-&gt;cmd &amp;&amp; (host-&gt;cmd-&gt;flags &amp; MMC_RSP_BUSY)) {</div><div class='add'>+			if (intmask &amp; SDHCI_INT_DATA_END) {</div><div class='add'>+				sdhci_finish_command(host);</div><div class='add'>+				return;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		printk(KERN_ERR "%s: Got data interrupt 0x%08x even "</div><div class='ctx'> 			"though no data operation was in progress.\n",</div><div class='hunk'>@@ -1604,7 +1631,8 @@ int sdhci_add_host(struct sdhci_host *host)</div><div class='ctx'> 	mmc-&gt;f_max = host-&gt;max_clk;</div><div class='ctx'> 	mmc-&gt;caps = MMC_CAP_4_BIT_DATA | MMC_CAP_SDIO_IRQ;</div><div class='ctx'> </div><div class='del'>-	if (caps &amp; SDHCI_CAN_DO_HISPD)</div><div class='add'>+	if ((caps &amp; SDHCI_CAN_DO_HISPD) ||</div><div class='add'>+		(host-&gt;quirks &amp; SDHCI_QUIRK_FORCE_HIGHSPEED))</div><div class='ctx'> 		mmc-&gt;caps |= MMC_CAP_SD_HIGHSPEED;</div><div class='ctx'> </div><div class='ctx'> 	mmc-&gt;ocr_avail = 0;</div><div class='head'>diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h<br/>index 197d4a05f4ae..31f4b1528e76 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/mmc/host/sdhci.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/mmc/host/sdhci.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/mmc/host/sdhci.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/mmc/host/sdhci.h</a></div><div class='hunk'>@@ -208,6 +208,8 @@ struct sdhci_host {</div><div class='ctx'> #define SDHCI_QUIRK_BROKEN_TIMEOUT_VAL			(1&lt;&lt;12)</div><div class='ctx'> /* Controller has an issue with buffer bits for small transfers */</div><div class='ctx'> #define SDHCI_QUIRK_BROKEN_SMALL_PIO			(1&lt;&lt;13)</div><div class='add'>+/* Controller supports high speed but doesn't have the caps bit set */</div><div class='add'>+#define SDHCI_QUIRK_FORCE_HIGHSPEED			(1&lt;&lt;14)</div><div class='ctx'> </div><div class='ctx'> 	int			irq;		/* Device IRQ */</div><div class='ctx'> 	void __iomem *		ioaddr;		/* Mapped address */</div><div class='head'>diff --git a/drivers/mtd/ftl.c b/drivers/mtd/ftl.c<br/>index f34f20c78911..9bf581c4f740 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/mtd/ftl.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/mtd/ftl.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/mtd/ftl.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/mtd/ftl.c</a></div><div class='hunk'>@@ -1005,6 +1005,29 @@ static int ftl_writesect(struct mtd_blktrans_dev *dev,</div><div class='ctx'> 	return ftl_write((void *)dev, buf, block, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int ftl_discardsect(struct mtd_blktrans_dev *dev,</div><div class='add'>+			   unsigned long sector, unsigned nr_sects)</div><div class='add'>+{</div><div class='add'>+	partition_t *part = (void *)dev;</div><div class='add'>+	uint32_t bsize = 1 &lt;&lt; part-&gt;header.EraseUnitSize;</div><div class='add'>+</div><div class='add'>+	DEBUG(1, "FTL erase sector %ld for %d sectors\n",</div><div class='add'>+	      sector, nr_sects);</div><div class='add'>+</div><div class='add'>+	while (nr_sects) {</div><div class='add'>+		uint32_t old_addr = part-&gt;VirtualBlockMap[sector];</div><div class='add'>+		if (old_addr != 0xffffffff) {</div><div class='add'>+			part-&gt;VirtualBlockMap[sector] = 0xffffffff;</div><div class='add'>+			part-&gt;EUNInfo[old_addr/bsize].Deleted++;</div><div class='add'>+			if (set_bam_entry(part, old_addr, 0))</div><div class='add'>+				return -EIO;</div><div class='add'>+		}</div><div class='add'>+		nr_sects--;</div><div class='add'>+		sector++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> /*====================================================================*/</div><div class='ctx'> </div><div class='ctx'> static void ftl_freepart(partition_t *part)</div><div class='hunk'>@@ -1069,6 +1092,7 @@ static struct mtd_blktrans_ops ftl_tr = {</div><div class='ctx'> 	.blksize 	= SECTOR_SIZE,</div><div class='ctx'> 	.readsect	= ftl_readsect,</div><div class='ctx'> 	.writesect	= ftl_writesect,</div><div class='add'>+	.discard	= ftl_discardsect,</div><div class='ctx'> 	.getgeo		= ftl_getgeo,</div><div class='ctx'> 	.add_mtd	= ftl_add_mtd,</div><div class='ctx'> 	.remove_dev	= ftl_remove_dev,</div><div class='head'>diff --git a/drivers/mtd/maps/pcmciamtd.c b/drivers/mtd/maps/pcmciamtd.c<br/>index 90924fb00481..d600c2deff73 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/mtd/maps/pcmciamtd.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/mtd/maps/pcmciamtd.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/mtd/maps/pcmciamtd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/mtd/maps/pcmciamtd.c</a></div><div class='hunk'>@@ -118,7 +118,8 @@ static caddr_t remap_window(struct map_info *map, unsigned long to)</div><div class='ctx'> 		DEBUG(2, "Remapping window from 0x%8.8x to 0x%8.8x",</div><div class='ctx'> 		      dev-&gt;offset, mrq.CardOffset);</div><div class='ctx'> 		mrq.Page = 0;</div><div class='del'>-		if( (ret = pcmcia_map_mem_page(win, &amp;mrq)) != CS_SUCCESS) {</div><div class='add'>+		ret = pcmcia_map_mem_page(win, &amp;mrq);</div><div class='add'>+		if (ret != 0) {</div><div class='ctx'> 			cs_error(dev-&gt;p_dev, MapMemPage, ret);</div><div class='ctx'> 			return NULL;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -326,9 +327,8 @@ static void pcmciamtd_set_vpp(struct map_info *map, int on)</div><div class='ctx'> </div><div class='ctx'> 	DEBUG(2, "dev = %p on = %d vpp = %d\n", dev, on, dev-&gt;vpp);</div><div class='ctx'> 	ret = pcmcia_modify_configuration(link, &amp;mod);</div><div class='del'>-	if(ret != CS_SUCCESS) {</div><div class='add'>+	if (ret != 0)</div><div class='ctx'> 		cs_error(link, ModifyConfiguration, ret);</div><div class='del'>-	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -368,14 +368,14 @@ static void card_settings(struct pcmciamtd_dev *dev, struct pcmcia_device *link,</div><div class='ctx'> 	tuple.DesiredTuple = RETURN_FIRST_TUPLE;</div><div class='ctx'> </div><div class='ctx'> 	rc = pcmcia_get_first_tuple(link, &amp;tuple);</div><div class='del'>-	while(rc == CS_SUCCESS) {</div><div class='add'>+	while (rc == 0) {</div><div class='ctx'> 		rc = pcmcia_get_tuple_data(link, &amp;tuple);</div><div class='del'>-		if(rc != CS_SUCCESS) {</div><div class='add'>+		if (rc != 0) {</div><div class='ctx'> 			cs_error(link, GetTupleData, rc);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		rc = pcmcia_parse_tuple(link, &amp;tuple, &amp;parse);</div><div class='del'>-		if(rc != CS_SUCCESS) {</div><div class='add'>+		rc = pcmcia_parse_tuple(&amp;tuple, &amp;parse);</div><div class='add'>+		if (rc != 0) {</div><div class='ctx'> 			cs_error(link, ParseTuple, rc);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -493,18 +493,11 @@ static int pcmciamtd_config(struct pcmcia_device *link)</div><div class='ctx'> 	int last_ret = 0, last_fn = 0;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	int i;</div><div class='del'>-	config_info_t t;</div><div class='ctx'> 	static char *probes[] = { "jedec_probe", "cfi_probe" };</div><div class='ctx'> 	int new_name = 0;</div><div class='ctx'> </div><div class='ctx'> 	DEBUG(3, "link=0x%p", link);</div><div class='ctx'> </div><div class='del'>-	DEBUG(2, "Validating CIS");</div><div class='del'>-	ret = pcmcia_validate_cis(link, NULL);</div><div class='del'>-	if(ret != CS_SUCCESS) {</div><div class='del'>-		cs_error(link, GetTupleData, ret);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	card_settings(dev, link, &amp;new_name);</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;pcmcia_map.phys = NO_XIP;</div><div class='hunk'>@@ -571,10 +564,7 @@ static int pcmciamtd_config(struct pcmcia_device *link)</div><div class='ctx'> 	dev-&gt;pcmcia_map.map_priv_1 = (unsigned long)dev;</div><div class='ctx'> 	dev-&gt;pcmcia_map.map_priv_2 = (unsigned long)link-&gt;win;</div><div class='ctx'> </div><div class='del'>-	DEBUG(2, "Getting configuration");</div><div class='del'>-	CS_CHECK(GetConfigurationInfo, pcmcia_get_configuration_info(link, &amp;t));</div><div class='del'>-	DEBUG(2, "Vcc = %d Vpp1 = %d Vpp2 = %d", t.Vcc, t.Vpp1, t.Vpp2);</div><div class='del'>-	dev-&gt;vpp = (vpp) ? vpp : t.Vpp1;</div><div class='add'>+	dev-&gt;vpp = (vpp) ? vpp : link-&gt;socket.socket.Vpp;</div><div class='ctx'> 	link-&gt;conf.Attributes = 0;</div><div class='ctx'> 	if(setvpp == 2) {</div><div class='ctx'> 		link-&gt;conf.Vpp = dev-&gt;vpp;</div><div class='hunk'>@@ -583,16 +573,10 @@ static int pcmciamtd_config(struct pcmcia_device *link)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	link-&gt;conf.IntType = INT_MEMORY;</div><div class='del'>-	link-&gt;conf.ConfigBase = t.ConfigBase;</div><div class='del'>-	link-&gt;conf.Status = t.Status;</div><div class='del'>-	link-&gt;conf.Pin = t.Pin;</div><div class='del'>-	link-&gt;conf.Copy = t.Copy;</div><div class='del'>-	link-&gt;conf.ExtStatus = t.ExtStatus;</div><div class='ctx'> 	link-&gt;conf.ConfigIndex = 0;</div><div class='del'>-	link-&gt;conf.Present = t.Present;</div><div class='ctx'> 	DEBUG(2, "Setting Configuration");</div><div class='ctx'> 	ret = pcmcia_request_configuration(link, &amp;link-&gt;conf);</div><div class='del'>-	if(ret != CS_SUCCESS) {</div><div class='add'>+	if (ret != 0) {</div><div class='ctx'> 		cs_error(link, RequestConfiguration, ret);</div><div class='ctx'> 		if (dev-&gt;win_base) {</div><div class='ctx'> 			iounmap(dev-&gt;win_base);</div><div class='head'>diff --git a/drivers/mtd/maps/sun_uflash.c b/drivers/mtd/maps/sun_uflash.c<br/>index 0d7c88396c88..fd7a1017399a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/mtd/maps/sun_uflash.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/mtd/maps/sun_uflash.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/mtd/maps/sun_uflash.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/mtd/maps/sun_uflash.c</a></div><div class='hunk'>@@ -1,13 +1,10 @@</div><div class='del'>-/*</div><div class='del'>- *</div><div class='del'>- * sun_uflash - Driver implementation for user-programmable flash</div><div class='del'>- * present on many Sun Microsystems SME boardsets.</div><div class='add'>+/* sun_uflash.c - Driver for user-programmable flash on</div><div class='add'>+ *                Sun Microsystems SME boardsets.</div><div class='ctx'>  *</div><div class='ctx'>  * This driver does NOT provide access to the OBP-flash for</div><div class='ctx'>  * safety reasons-- use &lt;linux&gt;/drivers/sbus/char/flash.c instead.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2001 Eric Brower (ebrower@usa.net)</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -16,8 +13,8 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='del'>-#include &lt;asm/ebus.h&gt;</div><div class='del'>-#include &lt;asm/oplib.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_device.h&gt;</div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='hunk'>@@ -26,67 +23,65 @@</div><div class='ctx'> #include &lt;linux/mtd/map.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define UFLASH_OBPNAME	"flashprom"</div><div class='del'>-#define UFLASH_DEVNAME 	"userflash"</div><div class='add'>+#define DRIVER_NAME	"sun_uflash"</div><div class='add'>+#define PFX		DRIVER_NAME ": "</div><div class='ctx'> </div><div class='ctx'> #define UFLASH_WINDOW_SIZE	0x200000</div><div class='ctx'> #define UFLASH_BUSWIDTH		1			/* EBus is 8-bit */</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Eric Brower &lt;ebrower@usa.net&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("User-programmable flash device on Sun Microsystems boardsets");</div><div class='del'>-MODULE_SUPPORTED_DEVICE("userflash");</div><div class='add'>+MODULE_SUPPORTED_DEVICE(DRIVER_NAME);</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_VERSION("2.0");</div><div class='add'>+MODULE_VERSION("2.1");</div><div class='ctx'> </div><div class='del'>-static LIST_HEAD(device_list);</div><div class='ctx'> struct uflash_dev {</div><div class='ctx'> 	const char		*name;	/* device name */</div><div class='ctx'> 	struct map_info 	map;	/* mtd map info */</div><div class='ctx'> 	struct mtd_info		*mtd;	/* mtd info */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> struct map_info uflash_map_templ = {</div><div class='ctx'> 	.name =		"SUNW,???-????",</div><div class='ctx'> 	.size =		UFLASH_WINDOW_SIZE,</div><div class='ctx'> 	.bankwidth =	UFLASH_BUSWIDTH,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int uflash_devinit(struct linux_ebus_device *edev, struct device_node *dp)</div><div class='add'>+int uflash_devinit(struct of_device *op, struct device_node *dp)</div><div class='ctx'> {</div><div class='ctx'> 	struct uflash_dev *up;</div><div class='del'>-	struct resource *res;</div><div class='ctx'> </div><div class='del'>-	res = &amp;edev-&gt;resource[0];</div><div class='del'>-</div><div class='del'>-	if (edev-&gt;num_addrs != 1) {</div><div class='add'>+	if (op-&gt;resource[1].flags) {</div><div class='ctx'> 		/* Non-CFI userflash device-- once I find one we</div><div class='ctx'> 		 * can work on supporting it.</div><div class='ctx'> 		 */</div><div class='del'>-		printk("%s: unsupported device at 0x%llx (%d regs): " \</div><div class='del'>-			"email ebrower@usa.net\n",</div><div class='del'>-		       dp-&gt;full_name, (unsigned long long)res-&gt;start,</div><div class='del'>-		       edev-&gt;num_addrs);</div><div class='add'>+		printk(KERN_ERR PFX "Unsupported device at %s, 0x%llx\n",</div><div class='add'>+		       dp-&gt;full_name, (unsigned long long)op-&gt;resource[0].start);</div><div class='ctx'> </div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	up = kzalloc(sizeof(struct uflash_dev), GFP_KERNEL);</div><div class='del'>-	if (!up)</div><div class='add'>+	if (!up) {</div><div class='add'>+		printk(KERN_ERR PFX "Cannot allocate struct uflash_dev\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* copy defaults and tweak parameters */</div><div class='ctx'> 	memcpy(&amp;up-&gt;map, &amp;uflash_map_templ, sizeof(uflash_map_templ));</div><div class='del'>-	up-&gt;map.size = (res-&gt;end - res-&gt;start) + 1UL;</div><div class='add'>+</div><div class='add'>+	up-&gt;map.size = resource_size(&amp;op-&gt;resource[0]);</div><div class='ctx'> </div><div class='ctx'> 	up-&gt;name = of_get_property(dp, "model", NULL);</div><div class='ctx'> 	if (up-&gt;name &amp;&amp; 0 &lt; strlen(up-&gt;name))</div><div class='ctx'> 		up-&gt;map.name = (char *)up-&gt;name;</div><div class='ctx'> </div><div class='del'>-	up-&gt;map.phys = res-&gt;start;</div><div class='add'>+	up-&gt;map.phys = op-&gt;resource[0].start;</div><div class='ctx'> </div><div class='del'>-	up-&gt;map.virt = ioremap_nocache(res-&gt;start, up-&gt;map.size);</div><div class='add'>+	up-&gt;map.virt = of_ioremap(&amp;op-&gt;resource[0], 0, up-&gt;map.size,</div><div class='add'>+				  DRIVER_NAME);</div><div class='ctx'> 	if (!up-&gt;map.virt) {</div><div class='del'>-		printk("%s: Failed to map device.\n", dp-&gt;full_name);</div><div class='add'>+		printk(KERN_ERR PFX "Failed to map device.\n");</div><div class='ctx'> 		kfree(up);</div><div class='ctx'> </div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -97,7 +92,7 @@ int uflash_devinit(struct linux_ebus_device *edev, struct device_node *dp)</div><div class='ctx'> 	/* MTD registration */</div><div class='ctx'> 	up-&gt;mtd = do_map_probe("cfi_probe", &amp;up-&gt;map);</div><div class='ctx'> 	if (!up-&gt;mtd) {</div><div class='del'>-		iounmap(up-&gt;map.virt);</div><div class='add'>+		of_iounmap(&amp;op-&gt;resource[0], up-&gt;map.virt, up-&gt;map.size);</div><div class='ctx'> 		kfree(up);</div><div class='ctx'> </div><div class='ctx'> 		return -ENXIO;</div><div class='hunk'>@@ -107,32 +102,34 @@ int uflash_devinit(struct linux_ebus_device *edev, struct device_node *dp)</div><div class='ctx'> </div><div class='ctx'> 	add_mtd_device(up-&gt;mtd);</div><div class='ctx'> </div><div class='del'>-	dev_set_drvdata(&amp;edev-&gt;ofdev.dev, up);</div><div class='add'>+	dev_set_drvdata(&amp;op-&gt;dev, up);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit uflash_probe(struct of_device *dev, const struct of_device_id *match)</div><div class='add'>+static int __devinit uflash_probe(struct of_device *op, const struct of_device_id *match)</div><div class='ctx'> {</div><div class='del'>-	struct linux_ebus_device *edev = to_ebus_device(&amp;dev-&gt;dev);</div><div class='del'>-	struct device_node *dp = dev-&gt;node;</div><div class='add'>+	struct device_node *dp = op-&gt;node;</div><div class='ctx'> </div><div class='del'>-	if (of_find_property(dp, "user", NULL))</div><div class='add'>+	/* Flashprom must have the "user" property in order to</div><div class='add'>+	 * be used by this driver.</div><div class='add'>+	 */</div><div class='add'>+	if (!of_find_property(dp, "user", NULL))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	return uflash_devinit(edev, dp);</div><div class='add'>+	return uflash_devinit(op, dp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devexit uflash_remove(struct of_device *dev)</div><div class='add'>+static int __devexit uflash_remove(struct of_device *op)</div><div class='ctx'> {</div><div class='del'>-	struct uflash_dev *up = dev_get_drvdata(&amp;dev-&gt;dev);</div><div class='add'>+	struct uflash_dev *up = dev_get_drvdata(&amp;op-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	if (up-&gt;mtd) {</div><div class='ctx'> 		del_mtd_device(up-&gt;mtd);</div><div class='ctx'> 		map_destroy(up-&gt;mtd);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (up-&gt;map.virt) {</div><div class='del'>-		iounmap(up-&gt;map.virt);</div><div class='add'>+		of_iounmap(&amp;op-&gt;resource[0], up-&gt;map.virt, up-&gt;map.size);</div><div class='ctx'> 		up-&gt;map.virt = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -141,7 +138,7 @@ static int __devexit uflash_remove(struct of_device *dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct of_device_id uflash_match[] = {</div><div class='add'>+static const struct of_device_id uflash_match[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.name = UFLASH_OBPNAME,</div><div class='ctx'> 	},</div><div class='hunk'>@@ -151,7 +148,7 @@ static struct of_device_id uflash_match[] = {</div><div class='ctx'> MODULE_DEVICE_TABLE(of, uflash_match);</div><div class='ctx'> </div><div class='ctx'> static struct of_platform_driver uflash_driver = {</div><div class='del'>-	.name		= UFLASH_DEVNAME,</div><div class='add'>+	.name		= DRIVER_NAME,</div><div class='ctx'> 	.match_table	= uflash_match,</div><div class='ctx'> 	.probe		= uflash_probe,</div><div class='ctx'> 	.remove		= __devexit_p(uflash_remove),</div><div class='hunk'>@@ -159,7 +156,7 @@ static struct of_platform_driver uflash_driver = {</div><div class='ctx'> </div><div class='ctx'> static int __init uflash_init(void)</div><div class='ctx'> {</div><div class='del'>-	return of_register_driver(&amp;uflash_driver, &amp;ebus_bus_type);</div><div class='add'>+	return of_register_driver(&amp;uflash_driver, &amp;of_bus_type);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit uflash_exit(void)</div><div class='head'>diff --git a/drivers/mtd/mtd_blkdevs.c b/drivers/mtd/mtd_blkdevs.c<br/>index 9ff007c4962c..681d5aca2af4 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/mtd/mtd_blkdevs.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/mtd/mtd_blkdevs.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/mtd/mtd_blkdevs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/mtd/mtd_blkdevs.c</a></div><div class='hunk'>@@ -32,6 +32,14 @@ struct mtd_blkcore_priv {</div><div class='ctx'> 	spinlock_t queue_lock;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static int blktrans_discard_request(struct request_queue *q,</div><div class='add'>+				    struct request *req)</div><div class='add'>+{</div><div class='add'>+	req-&gt;cmd_type = REQ_TYPE_LINUX_BLOCK;</div><div class='add'>+	req-&gt;cmd[0] = REQ_LB_OP_DISCARD;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int do_blktrans_request(struct mtd_blktrans_ops *tr,</div><div class='ctx'> 			       struct mtd_blktrans_dev *dev,</div><div class='ctx'> 			       struct request *req)</div><div class='hunk'>@@ -44,6 +52,10 @@ static int do_blktrans_request(struct mtd_blktrans_ops *tr,</div><div class='ctx'> </div><div class='ctx'> 	buf = req-&gt;buffer;</div><div class='ctx'> </div><div class='add'>+	if (req-&gt;cmd_type == REQ_TYPE_LINUX_BLOCK &amp;&amp;</div><div class='add'>+	    req-&gt;cmd[0] == REQ_LB_OP_DISCARD)</div><div class='add'>+		return !tr-&gt;discard(dev, block, nsect);</div><div class='add'>+</div><div class='ctx'> 	if (!blk_fs_request(req))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -367,6 +379,10 @@ int register_mtd_blktrans(struct mtd_blktrans_ops *tr)</div><div class='ctx'> </div><div class='ctx'> 	tr-&gt;blkcore_priv-&gt;rq-&gt;queuedata = tr;</div><div class='ctx'> 	blk_queue_hardsect_size(tr-&gt;blkcore_priv-&gt;rq, tr-&gt;blksize);</div><div class='add'>+	if (tr-&gt;discard)</div><div class='add'>+		blk_queue_set_discard(tr-&gt;blkcore_priv-&gt;rq,</div><div class='add'>+				      blktrans_discard_request);</div><div class='add'>+</div><div class='ctx'> 	tr-&gt;blkshift = ffs(tr-&gt;blksize) - 1;</div><div class='ctx'> </div><div class='ctx'> 	tr-&gt;blkcore_priv-&gt;thread = kthread_run(mtd_blktrans_thread, tr,</div><div class='head'>diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c<br/>index e00d424e6575..1c74762dec89 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/mtd/mtdchar.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/mtd/mtdchar.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/mtd/mtdchar.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/mtd/mtdchar.c</a></div><div class='hunk'>@@ -26,13 +26,11 @@ static void mtd_notify_add(struct mtd_info* mtd)</div><div class='ctx'> 	if (!mtd)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	device_create_drvdata(mtd_class, NULL,</div><div class='del'>-			      MKDEV(MTD_CHAR_MAJOR, mtd-&gt;index*2),</div><div class='del'>-			      NULL, "mtd%d", mtd-&gt;index);</div><div class='add'>+	device_create(mtd_class, NULL, MKDEV(MTD_CHAR_MAJOR, mtd-&gt;index*2),</div><div class='add'>+		      NULL, "mtd%d", mtd-&gt;index);</div><div class='ctx'> </div><div class='del'>-	device_create_drvdata(mtd_class, NULL,</div><div class='del'>-			      MKDEV(MTD_CHAR_MAJOR, mtd-&gt;index*2+1),</div><div class='del'>-			      NULL, "mtd%dro", mtd-&gt;index);</div><div class='add'>+	device_create(mtd_class, NULL, MKDEV(MTD_CHAR_MAJOR, mtd-&gt;index*2+1),</div><div class='add'>+		      NULL, "mtd%dro", mtd-&gt;index);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void mtd_notify_remove(struct mtd_info* mtd)</div><div class='head'>diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c<br/>index edb90b58a9b1..9a06dc93ee0d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/mtd/mtdpart.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/mtd/mtdpart.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/mtd/mtdpart.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/mtd/mtdpart.c</a></div><div class='hunk'>@@ -564,10 +564,8 @@ int parse_mtd_partitions(struct mtd_info *master, const char **types,</div><div class='ctx'> </div><div class='ctx'> 	for ( ; ret &lt;= 0 &amp;&amp; *types; types++) {</div><div class='ctx'> 		parser = get_partition_parser(*types);</div><div class='del'>-#ifdef CONFIG_KMOD</div><div class='ctx'> 		if (!parser &amp;&amp; !request_module("%s", *types))</div><div class='ctx'> 				parser = get_partition_parser(*types);</div><div class='del'>-#endif</div><div class='ctx'> 		if (!parser) {</div><div class='ctx'> 			printk(KERN_NOTICE "%s partition parsing not available\n",</div><div class='ctx'> 			       *types);</div><div class='head'>diff --git a/drivers/mtd/nand/alauda.c b/drivers/mtd/nand/alauda.c<br/>index 257937cd99bf..962380394855 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/mtd/nand/alauda.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/mtd/nand/alauda.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/mtd/nand/alauda.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/mtd/nand/alauda.c</a></div><div class='hunk'>@@ -691,7 +691,7 @@ static int alauda_probe(struct usb_interface *interface,</div><div class='ctx'> 	al[0].port = ALAUDA_PORT_XD;</div><div class='ctx'> 	al[1].port = ALAUDA_PORT_SM;</div><div class='ctx'> </div><div class='del'>-	info("alauda probed");</div><div class='add'>+	dev_info(&amp;interface-&gt;dev, "alauda probed\n");</div><div class='ctx'> 	alauda_check_media(al);</div><div class='ctx'> 	alauda_check_media(al+1);</div><div class='ctx'> </div><div class='hunk'>@@ -716,7 +716,7 @@ static void alauda_disconnect(struct usb_interface *interface)</div><div class='ctx'> 	if (al)</div><div class='ctx'> 		kref_put(&amp;al-&gt;kref, alauda_delete);</div><div class='ctx'> </div><div class='del'>-	info("alauda gone");</div><div class='add'>+	dev_info(&amp;interface-&gt;dev, "alauda gone");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct usb_driver alauda_driver = {</div><div class='head'>diff --git a/drivers/mtd/nand/ams-delta.c b/drivers/mtd/nand/ams-delta.c<br/>index 26d42987971f..782994ead0e8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/mtd/nand/ams-delta.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/mtd/nand/ams-delta.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/mtd/nand/ams-delta.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/mtd/nand/ams-delta.c</a></div><div class='hunk'>@@ -145,7 +145,7 @@ static void ams_delta_hwcontrol(struct mtd_info *mtd, int cmd,</div><div class='ctx'> </div><div class='ctx'> static int ams_delta_nand_ready(struct mtd_info *mtd)</div><div class='ctx'> {</div><div class='del'>-	return omap_get_gpio_datain(AMS_DELTA_GPIO_PIN_NAND_RB);</div><div class='add'>+	return gpio_get_value(AMS_DELTA_GPIO_PIN_NAND_RB);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -185,7 +185,7 @@ static int __init ams_delta_init(void)</div><div class='ctx'> 	this-&gt;read_buf = ams_delta_read_buf;</div><div class='ctx'> 	this-&gt;verify_buf = ams_delta_verify_buf;</div><div class='ctx'> 	this-&gt;cmd_ctrl = ams_delta_hwcontrol;</div><div class='del'>-	if (!omap_request_gpio(AMS_DELTA_GPIO_PIN_NAND_RB)) {</div><div class='add'>+	if (gpio_request(AMS_DELTA_GPIO_PIN_NAND_RB, "nand_rdy") == 0) {</div><div class='ctx'> 		this-&gt;dev_ready = ams_delta_nand_ready;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		this-&gt;dev_ready = NULL;</div><div class='head'>diff --git a/drivers/mtd/nand/atmel_nand_ecc.h b/drivers/mtd/nand/atmel_nand_ecc.h<br/>index 1ee7f993db1c..578c776e1356 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/mtd/nand/atmel_nand_ecc.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/mtd/nand/atmel_nand_ecc.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/mtd/nand/atmel_nand_ecc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/mtd/nand/atmel_nand_ecc.h</a></div><div class='hunk'>@@ -2,6 +2,9 @@</div><div class='ctx'>  * Error Corrected Code Controller (ECC) - System peripherals regsters.</div><div class='ctx'>  * Based on AT91SAM9260 datasheet revision B.</div><div class='ctx'>  *</div><div class='add'>+ * Copyright (C) 2007 Andrew Victor</div><div class='add'>+ * Copyright (C) 2007 Atmel Corporation.</div><div class='add'>+ *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify it</div><div class='ctx'>  * under the terms of the GNU General Public License as published by the</div><div class='ctx'>  * Free Software Foundation; either version 2 of the License, or (at your</div><div class='head'>diff --git a/drivers/mtd/nand/cafe_nand.c b/drivers/mtd/nand/cafe_nand.c<br/>index 95345d051579..b8064bf3aee4 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/mtd/nand/cafe_nand.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/mtd/nand/cafe_nand.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/mtd/nand/cafe_nand.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/mtd/nand/cafe_nand.c</a></div><div class='hunk'>@@ -1,6 +1,9 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Driver for One Laptop Per Child ‘CAFÉ’ controller, aka Marvell 88ALP01</div><div class='ctx'>  *</div><div class='add'>+ * The data sheet for this device can be found at:</div><div class='add'>+ *    http://www.marvell.com/products/pcconn/88ALP01.jsp</div><div class='add'>+ *</div><div class='ctx'>  * Copyright © 2006 Red Hat, Inc.</div><div class='ctx'>  * Copyright © 2006 David Woodhouse &lt;dwmw2@infradead.org&gt;</div><div class='ctx'>  */</div><div class='hunk'>@@ -842,7 +845,8 @@ static void __devexit cafe_nand_remove(struct pci_dev *pdev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct pci_device_id cafe_nand_tbl[] = {</div><div class='del'>-	{ 0x11ab, 0x4100, PCI_ANY_ID, PCI_ANY_ID },</div><div class='add'>+	{ PCI_VENDOR_ID_MARVELL, PCI_DEVICE_ID_MARVELL_88ALP01_NAND,</div><div class='add'>+	  PCI_ANY_ID, PCI_ANY_ID },</div><div class='ctx'> 	{ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/mtd/nand/cmx270_nand.c b/drivers/mtd/nand/cmx270_nand.c<br/>index 9eba3f04783a..fa129c09bca8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/mtd/nand/cmx270_nand.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/mtd/nand/cmx270_nand.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/mtd/nand/cmx270_nand.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/mtd/nand/cmx270_nand.c</a></div><div class='hunk'>@@ -156,7 +156,7 @@ static int cmx270_init(void)</div><div class='ctx'> 	int mtd_parts_nb = 0;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (!machine_is_armcore())</div><div class='add'>+	if (!(machine_is_armcore() &amp;&amp; cpu_is_pxa27x()))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	ret = gpio_request(GPIO_NAND_CS, "NAND CS");</div><div class='head'>diff --git a/drivers/net/3c501.c b/drivers/net/3c501.c<br/>index 5ba4bab6d43e..7d15e7c6bcad 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/3c501.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/3c501.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/3c501.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/3c501.c</a></div><div class='hunk'>@@ -17,7 +17,7 @@</div><div class='ctx'> 	Annapolis MD 21403</div><div class='ctx'> </div><div class='ctx'>     Fixed (again!) the missing interrupt locking on TX/RX shifting.</div><div class='del'>-	Alan Cox &lt;Alan.Cox@linux.org&gt;</div><div class='add'>+	Alan Cox &lt;alan@lxorguk.ukuu.org.uk&gt;</div><div class='ctx'> </div><div class='ctx'>     Removed calls to init_etherdev since they are no longer needed, and</div><div class='ctx'>     cleaned up modularization just a bit. The driver still allows only</div><div class='hunk'>@@ -29,16 +29,16 @@</div><div class='ctx'>     the board. Now getting 150K/second FTP with a 3c501 card. Still playing</div><div class='ctx'>     with a TX-TX optimisation to see if we can touch 180-200K/second as seems</div><div class='ctx'>     theoretically maximum.</div><div class='del'>-		19950402 Alan Cox &lt;Alan.Cox@linux.org&gt;</div><div class='add'>+		19950402 Alan Cox &lt;alan@lxorguk.ukuu.org.uk&gt;</div><div class='ctx'> </div><div class='ctx'>     Cleaned up for 2.3.x because we broke SMP now.</div><div class='del'>-		20000208 Alan Cox &lt;alan@redhat.com&gt;</div><div class='add'>+		20000208 Alan Cox &lt;alan@lxorguk.ukuu.org.uk&gt;</div><div class='ctx'> </div><div class='ctx'>     Check up pass for 2.5. Nothing significant changed</div><div class='del'>-		20021009 Alan Cox &lt;alan@redhat.com&gt;</div><div class='add'>+		20021009 Alan Cox &lt;alan@lxorguk.ukuu.org.uk&gt;</div><div class='ctx'> </div><div class='ctx'>     Fixed zero fill corner case</div><div class='del'>-		20030104 Alan Cox &lt;alan@redhat.com&gt;</div><div class='add'>+		20030104 Alan Cox &lt;alan@lxorguk.ukuu.org.uk&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'>    For the avoidance of doubt the "preferred form" of this code is one which</div><div class='hunk'>@@ -104,7 +104,7 @@</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static const char version[] =</div><div class='del'>-	DRV_NAME ".c: " DRV_VERSION " Alan Cox (alan@redhat.com).\n";</div><div class='add'>+	DRV_NAME ".c: " DRV_VERSION " Alan Cox (alan@lxorguk.ukuu.org.uk).\n";</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *	Braindamage remaining:</div><div class='head'>diff --git a/drivers/net/3c505.c b/drivers/net/3c505.c<br/>index fdfb2b2cb734..a424869707a5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/3c505.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/3c505.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/3c505.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/3c505.c</a></div><div class='hunk'>@@ -130,12 +130,12 @@ static const char filename[] = __FILE__;</div><div class='ctx'> </div><div class='ctx'> static const char timeout_msg[] = "*** timeout at %s:%s (line %d) ***\n";</div><div class='ctx'> #define TIMEOUT_MSG(lineno) \</div><div class='del'>-	printk(timeout_msg, filename,__FUNCTION__,(lineno))</div><div class='add'>+	printk(timeout_msg, filename,__func__,(lineno))</div><div class='ctx'> </div><div class='ctx'> static const char invalid_pcb_msg[] =</div><div class='ctx'> "*** invalid pcb length %d at %s:%s (line %d) ***\n";</div><div class='ctx'> #define INVALID_PCB_MSG(len) \</div><div class='del'>-	printk(invalid_pcb_msg, (len),filename,__FUNCTION__,__LINE__)</div><div class='add'>+	printk(invalid_pcb_msg, (len),filename,__func__,__LINE__)</div><div class='ctx'> </div><div class='ctx'> static char search_msg[] __initdata = KERN_INFO "%s: Looking for 3c505 adapter at address %#x...";</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/3c509.c b/drivers/net/3c509.c<br/>index b9d097c9f6bb..3a7bc524af33 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/3c509.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/3c509.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/3c509.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/3c509.c</a></div><div class='hunk'>@@ -40,7 +40,7 @@</div><div class='ctx'> 		v1.14 10/15/97 Avoided waiting..discard message for fast machines -djb</div><div class='ctx'> 		v1.15 1/31/98 Faster recovery for Tx errors. -djb</div><div class='ctx'> 		v1.16 2/3/98 Different ID port handling to avoid sound cards. -djb</div><div class='del'>-		v1.18 12Mar2001 Andrew Morton &lt;andrewm@uow.edu.au&gt;</div><div class='add'>+		v1.18 12Mar2001 Andrew Morton</div><div class='ctx'> 			- Avoid bogus detect of 3c590's (Andrzej Krzysztofowicz)</div><div class='ctx'> 			- Reviewed against 1.18 from scyld.com</div><div class='ctx'> 		v1.18a 17Nov2001 Jeff Garzik &lt;jgarzik@pobox.com&gt;</div><div class='head'>diff --git a/drivers/net/3c515.c b/drivers/net/3c515.c<br/>index e4e3241628d6..a0f8b6e2d0af 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/3c515.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/3c515.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/3c515.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/3c515.c</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'> </div><div class='ctx'> 	2001/11/17 - Added ethtool support (jgarzik)</div><div class='ctx'> </div><div class='del'>-	2002/10/28 - Locking updates for 2.5 (alan@redhat.com)</div><div class='add'>+	2002/10/28 - Locking updates for 2.5 (alan@lxorguk.ukuu.org.uk)</div><div class='ctx'> </div><div class='ctx'> */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c<br/>index 6011d6fabef0..85fa40a0a667 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/8139cp.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/8139cp.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/8139cp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/8139cp.c</a></div><div class='hunk'>@@ -127,7 +127,6 @@ MODULE_PARM_DESC (multicast_filter_limit, "8139cp: maximum number of filtered mu</div><div class='ctx'> 	  (CP)-&gt;tx_tail - (CP)-&gt;tx_head - 1)</div><div class='ctx'> </div><div class='ctx'> #define PKT_BUF_SZ		1536	/* Size of each temporary Rx buffer.*/</div><div class='del'>-#define RX_OFFSET		2</div><div class='ctx'> #define CP_INTERNAL_PHY		32</div><div class='ctx'> </div><div class='ctx'> /* The following settings are log_2(bytes)-4:  0 == 16 bytes .. 6==1024, 7==end of packet. */</div><div class='hunk'>@@ -552,14 +551,14 @@ rx_status_loop:</div><div class='ctx'> 			printk(KERN_DEBUG "%s: rx slot %d status 0x%x len %d\n",</div><div class='ctx'> 			       dev-&gt;name, rx_tail, status, len);</div><div class='ctx'> </div><div class='del'>-		buflen = cp-&gt;rx_buf_sz + RX_OFFSET;</div><div class='del'>-		new_skb = dev_alloc_skb (buflen);</div><div class='add'>+		buflen = cp-&gt;rx_buf_sz + NET_IP_ALIGN;</div><div class='add'>+		new_skb = netdev_alloc_skb(dev, buflen);</div><div class='ctx'> 		if (!new_skb) {</div><div class='ctx'> 			dev-&gt;stats.rx_dropped++;</div><div class='ctx'> 			goto rx_next;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		skb_reserve(new_skb, RX_OFFSET);</div><div class='add'>+		skb_reserve(new_skb, NET_IP_ALIGN);</div><div class='ctx'> </div><div class='ctx'> 		dma_unmap_single(&amp;cp-&gt;pdev-&gt;dev, mapping,</div><div class='ctx'> 				 buflen, PCI_DMA_FROMDEVICE);</div><div class='hunk'>@@ -1051,19 +1050,20 @@ static void cp_init_hw (struct cp_private *cp)</div><div class='ctx'> 	cpw8_f(Cfg9346, Cfg9346_Lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cp_refill_rx (struct cp_private *cp)</div><div class='add'>+static int cp_refill_rx(struct cp_private *cp)</div><div class='ctx'> {</div><div class='add'>+	struct net_device *dev = cp-&gt;dev;</div><div class='ctx'> 	unsigned i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; CP_RX_RING_SIZE; i++) {</div><div class='ctx'> 		struct sk_buff *skb;</div><div class='ctx'> 		dma_addr_t mapping;</div><div class='ctx'> </div><div class='del'>-		skb = dev_alloc_skb(cp-&gt;rx_buf_sz + RX_OFFSET);</div><div class='add'>+		skb = netdev_alloc_skb(dev, cp-&gt;rx_buf_sz + NET_IP_ALIGN);</div><div class='ctx'> 		if (!skb)</div><div class='ctx'> 			goto err_out;</div><div class='ctx'> </div><div class='del'>-		skb_reserve(skb, RX_OFFSET);</div><div class='add'>+		skb_reserve(skb, NET_IP_ALIGN);</div><div class='ctx'> </div><div class='ctx'> 		mapping = dma_map_single(&amp;cp-&gt;pdev-&gt;dev, skb-&gt;data,</div><div class='ctx'> 					 cp-&gt;rx_buf_sz, PCI_DMA_FROMDEVICE);</div><div class='head'>diff --git a/drivers/net/8139too.c b/drivers/net/8139too.c<br/>index 8a5b0d293f75..0daf8c15e381 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/8139too.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/8139too.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/8139too.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/8139too.c</a></div><div class='hunk'>@@ -309,7 +309,7 @@ enum RTL8139_registers {</div><div class='ctx'> 	Cfg9346		= 0x50,</div><div class='ctx'> 	Config0		= 0x51,</div><div class='ctx'> 	Config1		= 0x52,</div><div class='del'>-	FlashReg	= 0x54,</div><div class='add'>+	TimerInt	= 0x54,</div><div class='ctx'> 	MediaStatus	= 0x58,</div><div class='ctx'> 	Config3		= 0x59,</div><div class='ctx'> 	Config4		= 0x5A,	 /* absent on RTL-8139A */</div><div class='hunk'>@@ -325,6 +325,7 @@ enum RTL8139_registers {</div><div class='ctx'> 	FIFOTMS		= 0x70,	 /* FIFO Control and test. */</div><div class='ctx'> 	CSCR		= 0x74,	 /* Chip Status and Configuration Register. */</div><div class='ctx'> 	PARA78		= 0x78,</div><div class='add'>+	FlashReg	= 0xD4,	/* Communication with Flash ROM, four bytes. */</div><div class='ctx'> 	PARA7c		= 0x7c,	 /* Magic transceiver parameter register. */</div><div class='ctx'> 	Config5		= 0xD8,	 /* absent on RTL-8139A */</div><div class='ctx'> };</div><div class='hunk'>@@ -1722,13 +1723,18 @@ static int rtl8139_start_xmit (struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;tp-&gt;lock, flags);</div><div class='add'>+	/*</div><div class='add'>+	 * Writing to TxStatus triggers a DMA transfer of the data</div><div class='add'>+	 * copied to tp-&gt;tx_buf[entry] above. Use a memory barrier</div><div class='add'>+	 * to make sure that the device sees the updated data.</div><div class='add'>+	 */</div><div class='add'>+	wmb();</div><div class='ctx'> 	RTL_W32_F (TxStatus0 + (entry * sizeof (u32)),</div><div class='ctx'> 		   tp-&gt;tx_flag | max(len, (unsigned int)ETH_ZLEN));</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;trans_start = jiffies;</div><div class='ctx'> </div><div class='ctx'> 	tp-&gt;cur_tx++;</div><div class='del'>-	wmb();</div><div class='ctx'> </div><div class='ctx'> 	if ((tp-&gt;cur_tx - NUM_TX_DESC) == tp-&gt;dirty_tx)</div><div class='ctx'> 		netif_stop_queue (dev);</div><div class='hunk'>@@ -2009,9 +2015,9 @@ no_early_rx:</div><div class='ctx'> 		/* Malloc up new buffer, compatible with net-2e. */</div><div class='ctx'> 		/* Omit the four octet CRC from the length. */</div><div class='ctx'> </div><div class='del'>-		skb = dev_alloc_skb (pkt_size + 2);</div><div class='add'>+		skb = netdev_alloc_skb(dev, pkt_size + NET_IP_ALIGN);</div><div class='ctx'> 		if (likely(skb)) {</div><div class='del'>-			skb_reserve (skb, 2);	/* 16 byte align the IP fields. */</div><div class='add'>+			skb_reserve (skb, NET_IP_ALIGN);	/* 16 byte align the IP fields. */</div><div class='ctx'> #if RX_BUF_IDX == 3</div><div class='ctx'> 			wrap_copy(skb, rx_ring, ring_offset+4, pkt_size);</div><div class='ctx'> #else</div><div class='head'>diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig<br/>index 4a11296a9514..ad301ace6085 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/Kconfig</a></div><div class='hunk'>@@ -1386,7 +1386,8 @@ config FORCEDETH_NAPI</div><div class='ctx'> </div><div class='ctx'> config CS89x0</div><div class='ctx'> 	tristate "CS89x0 support"</div><div class='del'>-	depends on NET_PCI &amp;&amp; (ISA || MACH_IXDP2351 || ARCH_IXDP2X01 || ARCH_PNX010X)</div><div class='add'>+	depends on NET_ETHERNET &amp;&amp; (ISA || EISA || MACH_IXDP2351 \</div><div class='add'>+		|| ARCH_IXDP2X01 || ARCH_PNX010X || MACH_MX31ADS)</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  Support for CS89x0 chipset based Ethernet cards. If you have a</div><div class='ctx'> 	  network (Ethernet) card of this type, say Y and read the</div><div class='hunk'>@@ -1397,6 +1398,11 @@ config CS89x0</div><div class='ctx'> 	  To compile this driver as a module, choose M here. The module</div><div class='ctx'> 	  will be called cs89x0.</div><div class='ctx'> </div><div class='add'>+config CS89x0_NONISA_IRQ</div><div class='add'>+	def_bool y</div><div class='add'>+	depends on CS89x0 != n</div><div class='add'>+	depends on MACH_IXDP2351 || ARCH_IXDP2X01 || ARCH_PNX010X || MACH_MX31ADS</div><div class='add'>+</div><div class='ctx'> config TC35815</div><div class='ctx'> 	tristate "TOSHIBA TC35815 Ethernet support"</div><div class='ctx'> 	depends on NET_PCI &amp;&amp; PCI &amp;&amp; MIPS</div><div class='hunk'>@@ -1813,7 +1819,7 @@ config FEC2</div><div class='ctx'> </div><div class='ctx'> config FEC_MPC52xx</div><div class='ctx'> 	tristate "MPC52xx FEC driver"</div><div class='del'>-	depends on PPC_MERGE &amp;&amp; PPC_MPC52xx &amp;&amp; PPC_BESTCOMM_FEC</div><div class='add'>+	depends on PPC_MPC52xx &amp;&amp; PPC_BESTCOMM_FEC</div><div class='ctx'> 	select CRC32</div><div class='ctx'> 	select PHYLIB</div><div class='ctx'> 	---help---</div><div class='hunk'>@@ -1840,6 +1846,17 @@ config NE_H8300</div><div class='ctx'> 	  Say Y here if you want to use the NE2000 compatible</div><div class='ctx'> 	  controller on the Renesas H8/300 processor.</div><div class='ctx'> </div><div class='add'>+config ATL2</div><div class='add'>+	tristate "Atheros L2 Fast Ethernet support"</div><div class='add'>+	depends on PCI</div><div class='add'>+	select CRC32</div><div class='add'>+	select MII</div><div class='add'>+	help</div><div class='add'>+	  This driver supports the Atheros L2 fast ethernet adapter.</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here.  The module</div><div class='add'>+	  will be called atl2.</div><div class='add'>+</div><div class='ctx'> source "drivers/net/fs_enet/Kconfig"</div><div class='ctx'> </div><div class='ctx'> endif # NET_ETHERNET</div><div class='hunk'>@@ -1927,15 +1944,6 @@ config E1000</div><div class='ctx'> 	  To compile this driver as a module, choose M here. The module</div><div class='ctx'> 	  will be called e1000.</div><div class='ctx'> </div><div class='del'>-config E1000_DISABLE_PACKET_SPLIT</div><div class='del'>-	bool "Disable Packet Split for PCI express adapters"</div><div class='del'>-	depends on E1000</div><div class='del'>-	help</div><div class='del'>-	  Say Y here if you want to use the legacy receive path for PCI express</div><div class='del'>-	  hardware.</div><div class='del'>-</div><div class='del'>-	  If in doubt, say N.</div><div class='del'>-</div><div class='ctx'> config E1000E</div><div class='ctx'> 	tristate "Intel(R) PRO/1000 PCI-Express Gigabit Ethernet support"</div><div class='ctx'> 	depends on PCI &amp;&amp; (!SPARC32 || BROKEN)</div><div class='hunk'>@@ -2046,6 +2054,7 @@ config R8169</div><div class='ctx'> 	tristate "Realtek 8169 gigabit ethernet support"</div><div class='ctx'> 	depends on PCI</div><div class='ctx'> 	select CRC32</div><div class='add'>+	select MII</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  Say Y here if you have a Realtek 8169 PCI Gigabit Ethernet adapter.</div><div class='ctx'> </div><div class='hunk'>@@ -2262,7 +2271,7 @@ config UGETH_TX_ON_DEMAND</div><div class='ctx'> config MV643XX_ETH</div><div class='ctx'> 	tristate "Marvell Discovery (643XX) and Orion ethernet support"</div><div class='ctx'> 	depends on MV64360 || MV64X60 || (PPC_MULTIPLATFORM &amp;&amp; PPC32) || PLAT_ORION</div><div class='del'>-	select MII</div><div class='add'>+	select PHYLIB</div><div class='ctx'> 	help</div><div class='ctx'> 	  This driver supports the gigabit ethernet MACs in the</div><div class='ctx'> 	  Marvell Discovery PPC/MIPS chipset family (MV643XX) and</div><div class='hunk'>@@ -2281,12 +2290,13 @@ config QLA3XXX</div><div class='ctx'> 	  will be called qla3xxx.</div><div class='ctx'> </div><div class='ctx'> config ATL1</div><div class='del'>-	tristate "Attansic L1 Gigabit Ethernet support (EXPERIMENTAL)"</div><div class='del'>-	depends on PCI &amp;&amp; EXPERIMENTAL</div><div class='add'>+	tristate "Atheros/Attansic L1 Gigabit Ethernet support"</div><div class='add'>+	depends on PCI</div><div class='ctx'> 	select CRC32</div><div class='ctx'> 	select MII</div><div class='ctx'> 	help</div><div class='del'>-	  This driver supports the Attansic L1 gigabit ethernet adapter.</div><div class='add'>+	  This driver supports the Atheros/Attansic L1 gigabit ethernet</div><div class='add'>+	  adapter.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here.  The module</div><div class='ctx'> 	  will be called atl1.</div><div class='hunk'>@@ -2302,6 +2312,18 @@ config ATL1E</div><div class='ctx'> 	  To compile this driver as a module, choose M here.  The module</div><div class='ctx'> 	  will be called atl1e.</div><div class='ctx'> </div><div class='add'>+config JME</div><div class='add'>+	tristate "JMicron(R) PCI-Express Gigabit Ethernet support"</div><div class='add'>+	depends on PCI</div><div class='add'>+	select CRC32</div><div class='add'>+	select MII</div><div class='add'>+	---help---</div><div class='add'>+	  This driver supports the PCI-Express gigabit ethernet adapters</div><div class='add'>+	  based on JMicron JMC250 chipset.</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here. The module</div><div class='add'>+	  will be called jme.</div><div class='add'>+</div><div class='ctx'> endif # NETDEV_1000</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -2377,6 +2399,13 @@ config EHEA</div><div class='ctx'> 	  To compile the driver as a module, choose M here. The module</div><div class='ctx'> 	  will be called ehea.</div><div class='ctx'> </div><div class='add'>+config ENIC</div><div class='add'>+	tristate "Cisco 10G Ethernet NIC support"</div><div class='add'>+	depends on PCI &amp;&amp; INET</div><div class='add'>+	select INET_LRO</div><div class='add'>+	help</div><div class='add'>+	  This enables the support for the Cisco 10G Ethernet card.</div><div class='add'>+</div><div class='ctx'> config IXGBE</div><div class='ctx'> 	tristate "Intel(R) 10GbE PCI Express adapters support"</div><div class='ctx'> 	depends on PCI &amp;&amp; INET</div><div class='hunk'>@@ -2396,6 +2425,11 @@ config IXGBE</div><div class='ctx'> 	  To compile this driver as a module, choose M here. The module</div><div class='ctx'> 	  will be called ixgbe.</div><div class='ctx'> </div><div class='add'>+config IXGBE_DCA</div><div class='add'>+	bool</div><div class='add'>+	default y</div><div class='add'>+	depends on IXGBE &amp;&amp; DCA &amp;&amp; !(IXGBE=y &amp;&amp; DCA=m)</div><div class='add'>+</div><div class='ctx'> config IXGB</div><div class='ctx'> 	tristate "Intel(R) PRO/10GbE support"</div><div class='ctx'> 	depends on PCI</div><div class='hunk'>@@ -2443,6 +2477,11 @@ config MYRI10GE</div><div class='ctx'> 	  To compile this driver as a module, choose M here. The module</div><div class='ctx'> 	  will be called myri10ge.</div><div class='ctx'> </div><div class='add'>+config MYRI10GE_DCA</div><div class='add'>+	bool</div><div class='add'>+	default y</div><div class='add'>+	depends on MYRI10GE &amp;&amp; DCA &amp;&amp; !(MYRI10GE=y &amp;&amp; DCA=m)</div><div class='add'>+</div><div class='ctx'> config NETXEN_NIC</div><div class='ctx'> 	tristate "NetXen Multi port (1/10) Gigabit Ethernet NIC"</div><div class='ctx'> 	depends on PCI</div><div class='hunk'>@@ -2496,6 +2535,15 @@ config BNX2X</div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module</div><div class='ctx'> 	  will be called bnx2x.  This is recommended.</div><div class='ctx'> </div><div class='add'>+config QLGE</div><div class='add'>+	tristate "QLogic QLGE 10Gb Ethernet Driver Support"</div><div class='add'>+	depends on PCI</div><div class='add'>+	help</div><div class='add'>+	  This driver supports QLogic ISP8XXX 10Gb Ethernet cards.</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here: the module</div><div class='add'>+	  will be called qlge.</div><div class='add'>+</div><div class='ctx'> source "drivers/net/sfc/Kconfig"</div><div class='ctx'> </div><div class='ctx'> endif # NETDEV_10000</div><div class='head'>diff --git a/drivers/net/Makefile b/drivers/net/Makefile<br/>index 7629c9017215..fa2510b2e609 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/Makefile</a></div><div class='hunk'>@@ -15,9 +15,12 @@ obj-$(CONFIG_EHEA) += ehea/</div><div class='ctx'> obj-$(CONFIG_CAN) += can/</div><div class='ctx'> obj-$(CONFIG_BONDING) += bonding/</div><div class='ctx'> obj-$(CONFIG_ATL1) += atlx/</div><div class='add'>+obj-$(CONFIG_ATL2) += atlx/</div><div class='ctx'> obj-$(CONFIG_ATL1E) += atl1e/</div><div class='ctx'> obj-$(CONFIG_GIANFAR) += gianfar_driver.o</div><div class='ctx'> obj-$(CONFIG_TEHUTI) += tehuti.o</div><div class='add'>+obj-$(CONFIG_ENIC) += enic/</div><div class='add'>+obj-$(CONFIG_JME) += jme.o</div><div class='ctx'> </div><div class='ctx'> gianfar_driver-objs := gianfar.o \</div><div class='ctx'> 		gianfar_ethtool.o \</div><div class='hunk'>@@ -111,7 +114,7 @@ obj-$(CONFIG_EL2) += 3c503.o 8390p.o</div><div class='ctx'> obj-$(CONFIG_NE2000) += ne.o 8390p.o</div><div class='ctx'> obj-$(CONFIG_NE2_MCA) += ne2.o 8390p.o</div><div class='ctx'> obj-$(CONFIG_HPLAN) += hp.o 8390p.o</div><div class='del'>-obj-$(CONFIG_HPLAN_PLUS) += hp-plus.o 8390p.o</div><div class='add'>+obj-$(CONFIG_HPLAN_PLUS) += hp-plus.o 8390.o</div><div class='ctx'> obj-$(CONFIG_ULTRA) += smc-ultra.o 8390.o</div><div class='ctx'> obj-$(CONFIG_ULTRAMCA) += smc-mca.o 8390.o</div><div class='ctx'> obj-$(CONFIG_ULTRA32) += smc-ultra32.o 8390.o</div><div class='hunk'>@@ -128,6 +131,7 @@ obj-$(CONFIG_AX88796) += ax88796.o</div><div class='ctx'> obj-$(CONFIG_TSI108_ETH) += tsi108_eth.o</div><div class='ctx'> obj-$(CONFIG_MV643XX_ETH) += mv643xx_eth.o</div><div class='ctx'> obj-$(CONFIG_QLA3XXX) += qla3xxx.o</div><div class='add'>+obj-$(CONFIG_QLGE) += qlge/</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_PPP) += ppp_generic.o</div><div class='ctx'> obj-$(CONFIG_PPP_ASYNC) += ppp_async.o</div><div class='head'>diff --git a/drivers/net/appletalk/cops.c b/drivers/net/appletalk/cops.c<br/>index a0b4c8516073..735fc9476403 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/appletalk/cops.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/appletalk/cops.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/appletalk/cops.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/appletalk/cops.c</a></div><div class='hunk'>@@ -4,7 +4,7 @@</div><div class='ctx'>  *      - Jay Schulist &lt;jschlst@samba.org&gt;</div><div class='ctx'>  *</div><div class='ctx'>  *	With more than a little help from;</div><div class='del'>- *	- Alan Cox &lt;Alan.Cox@linux.org&gt; </div><div class='add'>+ *	- Alan Cox &lt;alan@lxorguk.ukuu.org.uk&gt;</div><div class='ctx'>  *</div><div class='ctx'>  *      Derived from:</div><div class='ctx'>  *      - skeleton.c: A network driver outline for linux.</div><div class='head'>diff --git a/drivers/net/arcnet/arcnet.c b/drivers/net/arcnet/arcnet.c<br/>index bdc4c0bb56d9..a5b07691e466 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/arcnet/arcnet.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/arcnet/arcnet.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/arcnet/arcnet.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/arcnet/arcnet.c</a></div><div class='hunk'>@@ -442,24 +442,24 @@ static int arcnet_open(struct net_device *dev)</div><div class='ctx'> 		BUGMSG(D_NORMAL, "WARNING!  Station address FF may confuse "</div><div class='ctx'> 		       "DOS networking programs!\n");</div><div class='ctx'> </div><div class='del'>-	BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__FUNCTION__);</div><div class='add'>+	BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__func__);</div><div class='ctx'> 	if (ASTATUS() &amp; RESETflag) {</div><div class='del'>-	  	BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__FUNCTION__);</div><div class='add'>+	  	BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__func__);</div><div class='ctx'> 		ACOMMAND(CFLAGScmd | RESETclear);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-	BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__FUNCTION__);</div><div class='add'>+	BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__func__);</div><div class='ctx'> 	/* make sure we're ready to receive IRQ's. */</div><div class='ctx'> 	AINTMASK(0);</div><div class='ctx'> 	udelay(1);		/* give it time to set the mask before</div><div class='ctx'> 				 * we reset it again. (may not even be</div><div class='ctx'> 				 * necessary)</div><div class='ctx'> 				 */</div><div class='del'>-	BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__FUNCTION__);</div><div class='add'>+	BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__func__);</div><div class='ctx'> 	lp-&gt;intmask = NORXflag | RECONflag;</div><div class='ctx'> 	AINTMASK(lp-&gt;intmask);</div><div class='del'>-	BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__FUNCTION__);</div><div class='add'>+	BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__func__);</div><div class='ctx'> </div><div class='ctx'> 	netif_start_queue(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -670,14 +670,14 @@ static int arcnet_send_packet(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 		freeskb = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	BUGMSG(D_DEBUG, "%s: %d: %s, status: %x\n",__FILE__,__LINE__,__FUNCTION__,ASTATUS());</div><div class='add'>+	BUGMSG(D_DEBUG, "%s: %d: %s, status: %x\n",__FILE__,__LINE__,__func__,ASTATUS());</div><div class='ctx'> 	/* make sure we didn't ignore a TX IRQ while we were in here */</div><div class='ctx'> 	AINTMASK(0);</div><div class='ctx'> </div><div class='del'>-	BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__FUNCTION__);</div><div class='add'>+	BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__func__);</div><div class='ctx'> 	lp-&gt;intmask |= TXFREEflag|EXCNAKflag;</div><div class='ctx'> 	AINTMASK(lp-&gt;intmask);</div><div class='del'>-	BUGMSG(D_DEBUG, "%s: %d: %s, status: %x\n",__FILE__,__LINE__,__FUNCTION__,ASTATUS());</div><div class='add'>+	BUGMSG(D_DEBUG, "%s: %d: %s, status: %x\n",__FILE__,__LINE__,__func__,ASTATUS());</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;lp-&gt;lock, flags);</div><div class='ctx'> 	if (freeskb) {</div><div class='hunk'>@@ -798,7 +798,7 @@ irqreturn_t arcnet_interrupt(int irq, void *dev_id)</div><div class='ctx'>                 diagstatus = (status &gt;&gt; 8) &amp; 0xFF;</div><div class='ctx'> </div><div class='ctx'> 		BUGMSG(D_DEBUG, "%s: %d: %s: status=%x\n",</div><div class='del'>-			__FILE__,__LINE__,__FUNCTION__,status);</div><div class='add'>+			__FILE__,__LINE__,__func__,status);</div><div class='ctx'> 		didsomething = 0;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='head'>diff --git a/drivers/net/arcnet/com20020.c b/drivers/net/arcnet/com20020.c<br/>index 8b51313b1300..70124a944e7d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/arcnet/com20020.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/arcnet/com20020.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/arcnet/com20020.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/arcnet/com20020.c</a></div><div class='hunk'>@@ -238,15 +238,15 @@ static int com20020_reset(struct net_device *dev, int really_reset)</div><div class='ctx'> 	u_char inbyte;</div><div class='ctx'> </div><div class='ctx'> 	BUGMSG(D_DEBUG, "%s: %d: %s: dev: %p, lp: %p, dev-&gt;name: %s\n",</div><div class='del'>-		__FILE__,__LINE__,__FUNCTION__,dev,lp,dev-&gt;name);</div><div class='add'>+		__FILE__,__LINE__,__func__,dev,lp,dev-&gt;name);</div><div class='ctx'> 	BUGMSG(D_INIT, "Resetting %s (status=%02Xh)\n",</div><div class='ctx'> 	       dev-&gt;name, ASTATUS());</div><div class='ctx'> </div><div class='del'>-	BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__FUNCTION__);</div><div class='add'>+	BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__func__);</div><div class='ctx'> 	lp-&gt;config = TXENcfg | (lp-&gt;timeout &lt;&lt; 3) | (lp-&gt;backplane &lt;&lt; 2);</div><div class='ctx'> 	/* power-up defaults */</div><div class='ctx'> 	SETCONF;</div><div class='del'>-	BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__FUNCTION__);</div><div class='add'>+	BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__func__);</div><div class='ctx'> </div><div class='ctx'> 	if (really_reset) {</div><div class='ctx'> 		/* reset the card */</div><div class='hunk'>@@ -254,22 +254,22 @@ static int com20020_reset(struct net_device *dev, int really_reset)</div><div class='ctx'> 		mdelay(RESETtime * 2);	/* COM20020 seems to be slower sometimes */</div><div class='ctx'> 	}</div><div class='ctx'> 	/* clear flags &amp; end reset */</div><div class='del'>-	BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__FUNCTION__);</div><div class='add'>+	BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__func__);</div><div class='ctx'> 	ACOMMAND(CFLAGScmd | RESETclear | CONFIGclear);</div><div class='ctx'> </div><div class='ctx'> 	/* verify that the ARCnet signature byte is present */</div><div class='del'>-	BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__FUNCTION__);</div><div class='add'>+	BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__func__);</div><div class='ctx'> </div><div class='ctx'> 	com20020_copy_from_card(dev, 0, 0, &amp;inbyte, 1);</div><div class='del'>-	BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__FUNCTION__);</div><div class='add'>+	BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__func__);</div><div class='ctx'> 	if (inbyte != TESTvalue) {</div><div class='del'>-		BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__FUNCTION__);</div><div class='add'>+		BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__func__);</div><div class='ctx'> 		BUGMSG(D_NORMAL, "reset failed: TESTvalue not present.\n");</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* enable extended (512-byte) packets */</div><div class='ctx'> 	ACOMMAND(CONFIGcmd | EXTconf);</div><div class='del'>-	BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__FUNCTION__);</div><div class='add'>+	BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__func__);</div><div class='ctx'> </div><div class='ctx'> 	/* done!  return success. */</div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/net/atl1e/atl1e_hw.c b/drivers/net/atl1e/atl1e_hw.c<br/>index 949e75358bf0..8cbc1b59bd62 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/atl1e/atl1e_hw.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/atl1e/atl1e_hw.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/atl1e/atl1e_hw.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/atl1e/atl1e_hw.c</a></div><div class='hunk'>@@ -397,7 +397,7 @@ static int atl1e_phy_setup_autoneg_adv(struct atl1e_hw *hw)</div><div class='ctx'>  */</div><div class='ctx'> int atl1e_phy_commit(struct atl1e_hw *hw)</div><div class='ctx'> {</div><div class='del'>-	struct atl1e_adapter *adapter = (struct atl1e_adapter *)hw-&gt;adapter;</div><div class='add'>+	struct atl1e_adapter *adapter = hw-&gt;adapter;</div><div class='ctx'> 	struct pci_dev *pdev = adapter-&gt;pdev;</div><div class='ctx'> 	int ret_val;</div><div class='ctx'> 	u16 phy_data;</div><div class='hunk'>@@ -431,7 +431,7 @@ int atl1e_phy_commit(struct atl1e_hw *hw)</div><div class='ctx'> </div><div class='ctx'> int atl1e_phy_init(struct atl1e_hw *hw)</div><div class='ctx'> {</div><div class='del'>-	struct atl1e_adapter *adapter = (struct atl1e_adapter *)hw-&gt;adapter;</div><div class='add'>+	struct atl1e_adapter *adapter = hw-&gt;adapter;</div><div class='ctx'> 	struct pci_dev *pdev = adapter-&gt;pdev;</div><div class='ctx'> 	s32 ret_val;</div><div class='ctx'> 	u16 phy_val;</div><div class='hunk'>@@ -525,7 +525,7 @@ int atl1e_phy_init(struct atl1e_hw *hw)</div><div class='ctx'>  */</div><div class='ctx'> int atl1e_reset_hw(struct atl1e_hw *hw)</div><div class='ctx'> {</div><div class='del'>-	struct atl1e_adapter *adapter = (struct atl1e_adapter *)hw-&gt;adapter;</div><div class='add'>+	struct atl1e_adapter *adapter = hw-&gt;adapter;</div><div class='ctx'> 	struct pci_dev *pdev = adapter-&gt;pdev;</div><div class='ctx'> </div><div class='ctx'> 	u32 idle_status_data = 0;</div><div class='head'>diff --git a/drivers/net/atl1e/atl1e_main.c b/drivers/net/atl1e/atl1e_main.c<br/>index 7685b995ff9b..9b603528143d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/atl1e/atl1e_main.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/atl1e/atl1e_main.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/atl1e/atl1e_main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/atl1e/atl1e_main.c</a></div><div class='hunk'>@@ -2390,9 +2390,7 @@ static int __devinit atl1e_probe(struct pci_dev *pdev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Init GPHY as early as possible due to power saving issue  */</div><div class='del'>-	spin_lock(&amp;adapter-&gt;mdio_lock);</div><div class='ctx'> 	atl1e_phy_init(&amp;adapter-&gt;hw);</div><div class='del'>-	spin_unlock(&amp;adapter-&gt;mdio_lock);</div><div class='ctx'> 	/* reset the controller to</div><div class='ctx'> 	 * put the device in a known good starting state */</div><div class='ctx'> 	err = atl1e_reset_hw(&amp;adapter-&gt;hw);</div><div class='head'>diff --git a/drivers/net/atlx/Makefile b/drivers/net/atlx/Makefile<br/>index ca45553a040d..e4f6022ca552 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/atlx/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/atlx/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/atlx/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/atlx/Makefile</a></div><div class='hunk'>@@ -1 +1,3 @@</div><div class='ctx'> obj-$(CONFIG_ATL1)	+= atl1.o</div><div class='add'>+obj-$(CONFIG_ATL2)	+= atl2.o</div><div class='add'>+</div><div class='head'>diff --git a/drivers/net/atlx/atl1.c b/drivers/net/atlx/atl1.c<br/>index e23ce77712f1..3cf59a7f5a1c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/atlx/atl1.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/atlx/atl1.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/atlx/atl1.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/atlx/atl1.c</a></div><div class='hunk'>@@ -24,16 +24,12 @@</div><div class='ctx'>  * file called COPYING.</div><div class='ctx'>  *</div><div class='ctx'>  * Contact Information:</div><div class='del'>- * Xiong Huang &lt;xiong_huang@attansic.com&gt;</div><div class='del'>- * Attansic Technology Corp. 3F 147, Xianzheng 9th Road, Zhubei,</div><div class='del'>- * Xinzhu  302, TAIWAN, REPUBLIC OF CHINA</div><div class='del'>- *</div><div class='add'>+ * Xiong Huang &lt;xiong.huang@atheros.com&gt;</div><div class='add'>+ * Jie Yang &lt;jie.yang@atheros.com&gt;</div><div class='ctx'>  * Chris Snook &lt;csnook@redhat.com&gt;</div><div class='ctx'>  * Jay Cliburn &lt;jcliburn@gmail.com&gt;</div><div class='ctx'>  *</div><div class='del'>- * This version is adapted from the Attansic reference driver for</div><div class='del'>- * inclusion in the Linux kernel.  It is currently under heavy development.</div><div class='del'>- * A very incomplete list of things that need to be dealt with:</div><div class='add'>+ * This version is adapted from the Attansic reference driver.</div><div class='ctx'>  *</div><div class='ctx'>  * TODO:</div><div class='ctx'>  * Add more ethtool functions.</div><div class='hunk'>@@ -2109,7 +2105,6 @@ static u16 atl1_tpd_avail(struct atl1_tpd_ring *tpd_ring)</div><div class='ctx'> static int atl1_tso(struct atl1_adapter *adapter, struct sk_buff *skb,</div><div class='ctx'> 	struct tx_packet_desc *ptpd)</div><div class='ctx'> {</div><div class='del'>-	/* spinlock held */</div><div class='ctx'> 	u8 hdr_len, ip_off;</div><div class='ctx'> 	u32 real_len;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -2196,7 +2191,6 @@ static int atl1_tx_csum(struct atl1_adapter *adapter, struct sk_buff *skb,</div><div class='ctx'> static void atl1_tx_map(struct atl1_adapter *adapter, struct sk_buff *skb,</div><div class='ctx'> 	struct tx_packet_desc *ptpd)</div><div class='ctx'> {</div><div class='del'>-	/* spinlock held */</div><div class='ctx'> 	struct atl1_tpd_ring *tpd_ring = &amp;adapter-&gt;tpd_ring;</div><div class='ctx'> 	struct atl1_buffer *buffer_info;</div><div class='ctx'> 	u16 buf_len = skb-&gt;len;</div><div class='hunk'>@@ -2303,7 +2297,6 @@ static void atl1_tx_map(struct atl1_adapter *adapter, struct sk_buff *skb,</div><div class='ctx'> static void atl1_tx_queue(struct atl1_adapter *adapter, u16 count,</div><div class='ctx'>        struct tx_packet_desc *ptpd)</div><div class='ctx'> {</div><div class='del'>-	/* spinlock held */</div><div class='ctx'> 	struct atl1_tpd_ring *tpd_ring = &amp;adapter-&gt;tpd_ring;</div><div class='ctx'> 	struct atl1_buffer *buffer_info;</div><div class='ctx'> 	struct tx_packet_desc *tpd;</div><div class='hunk'>@@ -2361,7 +2354,6 @@ static int atl1_xmit_frame(struct sk_buff *skb, struct net_device *netdev)</div><div class='ctx'> 	struct tx_packet_desc *ptpd;</div><div class='ctx'> 	u16 frag_size;</div><div class='ctx'> 	u16 vlan_tag;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	unsigned int nr_frags = 0;</div><div class='ctx'> 	unsigned int mss = 0;</div><div class='ctx'> 	unsigned int f;</div><div class='hunk'>@@ -2399,18 +2391,9 @@ static int atl1_xmit_frame(struct sk_buff *skb, struct net_device *netdev)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!spin_trylock_irqsave(&amp;adapter-&gt;lock, flags)) {</div><div class='del'>-		/* Can't get lock - tell upper layer to requeue */</div><div class='del'>-		if (netif_msg_tx_queued(adapter))</div><div class='del'>-			dev_printk(KERN_DEBUG, &amp;adapter-&gt;pdev-&gt;dev,</div><div class='del'>-				"tx locked\n");</div><div class='del'>-		return NETDEV_TX_LOCKED;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if (atl1_tpd_avail(&amp;adapter-&gt;tpd_ring) &lt; count) {</div><div class='ctx'> 		/* not enough descriptors */</div><div class='ctx'> 		netif_stop_queue(netdev);</div><div class='del'>-		spin_unlock_irqrestore(&amp;adapter-&gt;lock, flags);</div><div class='ctx'> 		if (netif_msg_tx_queued(adapter))</div><div class='ctx'> 			dev_printk(KERN_DEBUG, &amp;adapter-&gt;pdev-&gt;dev,</div><div class='ctx'> 				"tx busy\n");</div><div class='hunk'>@@ -2432,7 +2415,6 @@ static int atl1_xmit_frame(struct sk_buff *skb, struct net_device *netdev)</div><div class='ctx'> </div><div class='ctx'> 	tso = atl1_tso(adapter, skb, ptpd);</div><div class='ctx'> 	if (tso &lt; 0) {</div><div class='del'>-		spin_unlock_irqrestore(&amp;adapter-&gt;lock, flags);</div><div class='ctx'> 		dev_kfree_skb_any(skb);</div><div class='ctx'> 		return NETDEV_TX_OK;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2440,7 +2422,6 @@ static int atl1_xmit_frame(struct sk_buff *skb, struct net_device *netdev)</div><div class='ctx'> 	if (!tso) {</div><div class='ctx'> 		ret_val = atl1_tx_csum(adapter, skb, ptpd);</div><div class='ctx'> 		if (ret_val &lt; 0) {</div><div class='del'>-			spin_unlock_irqrestore(&amp;adapter-&gt;lock, flags);</div><div class='ctx'> 			dev_kfree_skb_any(skb);</div><div class='ctx'> 			return NETDEV_TX_OK;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2449,7 +2430,7 @@ static int atl1_xmit_frame(struct sk_buff *skb, struct net_device *netdev)</div><div class='ctx'> 	atl1_tx_map(adapter, skb, ptpd);</div><div class='ctx'> 	atl1_tx_queue(adapter, count, ptpd);</div><div class='ctx'> 	atl1_update_mailbox(adapter);</div><div class='del'>-	spin_unlock_irqrestore(&amp;adapter-&gt;lock, flags);</div><div class='add'>+	mmiowb();</div><div class='ctx'> 	netdev-&gt;trans_start = jiffies;</div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='ctx'> }</div><div class='hunk'>@@ -2642,6 +2623,7 @@ static void atl1_down(struct atl1_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *netdev = adapter-&gt;netdev;</div><div class='ctx'> </div><div class='add'>+	netif_stop_queue(netdev);</div><div class='ctx'> 	del_timer_sync(&amp;adapter-&gt;watchdog_timer);</div><div class='ctx'> 	del_timer_sync(&amp;adapter-&gt;phy_config_timer);</div><div class='ctx'> 	adapter-&gt;phy_timer_pending = false;</div><div class='hunk'>@@ -2655,7 +2637,6 @@ static void atl1_down(struct atl1_adapter *adapter)</div><div class='ctx'> 	adapter-&gt;link_speed = SPEED_0;</div><div class='ctx'> 	adapter-&gt;link_duplex = -1;</div><div class='ctx'> 	netif_carrier_off(netdev);</div><div class='del'>-	netif_stop_queue(netdev);</div><div class='ctx'> </div><div class='ctx'> 	atl1_clean_tx_ring(adapter);</div><div class='ctx'> 	atl1_clean_rx_ring(adapter);</div><div class='hunk'>@@ -2724,6 +2705,8 @@ static int atl1_open(struct net_device *netdev)</div><div class='ctx'> 	struct atl1_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='add'>+	netif_carrier_off(netdev);</div><div class='add'>+</div><div class='ctx'> 	/* allocate transmit descriptors */</div><div class='ctx'> 	err = atl1_setup_ring_resources(adapter);</div><div class='ctx'> 	if (err)</div><div class='hunk'>@@ -3022,7 +3005,6 @@ static int __devinit atl1_probe(struct pci_dev *pdev,</div><div class='ctx'> 	netdev-&gt;features = NETIF_F_HW_CSUM;</div><div class='ctx'> 	netdev-&gt;features |= NETIF_F_SG;</div><div class='ctx'> 	netdev-&gt;features |= (NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX);</div><div class='del'>-	netdev-&gt;features |= NETIF_F_LLTX;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * patch for some L1 of old version,</div><div class='head'>diff --git a/drivers/net/atlx/atl2.c b/drivers/net/atlx/atl2.c<br/>new file mode 100644<br/>index 000000000000..f5bdc92c1a65<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/atlx/atl2.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/atlx/atl2.c</a></div><div class='hunk'>@@ -0,0 +1,3119 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright(c) 2006 - 2007 Atheros Corporation. All rights reserved.</div><div class='add'>+ * Copyright(c) 2007 - 2008 Chris Snook &lt;csnook@redhat.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * Derived from Intel e1000 driver</div><div class='add'>+ * Copyright(c) 1999 - 2005 Intel Corporation. All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms of the GNU General Public License as published by the Free</div><div class='add'>+ * Software Foundation; either version 2 of the License, or (at your option)</div><div class='add'>+ * any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful, but WITHOUT</div><div class='add'>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='add'>+ * more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License along with</div><div class='add'>+ * this program; if not, write to the Free Software Foundation, Inc., 59</div><div class='add'>+ * Temple Place - Suite 330, Boston, MA  02111-1307, USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;asm/atomic.h&gt;</div><div class='add'>+#include &lt;linux/crc32.h&gt;</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='add'>+#include &lt;linux/hardirq.h&gt;</div><div class='add'>+#include &lt;linux/if_vlan.h&gt;</div><div class='add'>+#include &lt;linux/in.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/ip.h&gt;</div><div class='add'>+#include &lt;linux/irqflags.h&gt;</div><div class='add'>+#include &lt;linux/irqreturn.h&gt;</div><div class='add'>+#include &lt;linux/mii.h&gt;</div><div class='add'>+#include &lt;linux/net.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/pci_ids.h&gt;</div><div class='add'>+#include &lt;linux/pm.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/tcp.h&gt;</div><div class='add'>+#include &lt;linux/timer.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/workqueue.h&gt;</div><div class='add'>+</div><div class='add'>+#include "atl2.h"</div><div class='add'>+</div><div class='add'>+#define ATL2_DRV_VERSION "2.2.3"</div><div class='add'>+</div><div class='add'>+static char atl2_driver_name[] = "atl2";</div><div class='add'>+static const char atl2_driver_string[] = "Atheros(R) L2 Ethernet Driver";</div><div class='add'>+static char atl2_copyright[] = "Copyright (c) 2007 Atheros Corporation.";</div><div class='add'>+static char atl2_driver_version[] = ATL2_DRV_VERSION;</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Atheros Corporation &lt;xiong.huang@atheros.com&gt;, Chris Snook &lt;csnook@redhat.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Atheros Fast Ethernet Network Driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_VERSION(ATL2_DRV_VERSION);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * atl2_pci_tbl - PCI Device ID Table</div><div class='add'>+ */</div><div class='add'>+static struct pci_device_id atl2_pci_tbl[] = {</div><div class='add'>+	{PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, PCI_DEVICE_ID_ATTANSIC_L2)},</div><div class='add'>+	/* required last entry */</div><div class='add'>+	{0,}</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(pci, atl2_pci_tbl);</div><div class='add'>+</div><div class='add'>+static void atl2_set_ethtool_ops(struct net_device *netdev);</div><div class='add'>+</div><div class='add'>+static void atl2_check_options(struct atl2_adapter *adapter);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * atl2_sw_init - Initialize general software structures (struct atl2_adapter)</div><div class='add'>+ * @adapter: board private structure to initialize</div><div class='add'>+ *</div><div class='add'>+ * atl2_sw_init initializes the Adapter private data structure.</div><div class='add'>+ * Fields are initialized based on PCI device information and</div><div class='add'>+ * OS network device settings (MTU size).</div><div class='add'>+ */</div><div class='add'>+static int __devinit atl2_sw_init(struct atl2_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	struct atl2_hw *hw = &amp;adapter-&gt;hw;</div><div class='add'>+	struct pci_dev *pdev = adapter-&gt;pdev;</div><div class='add'>+</div><div class='add'>+	/* PCI config space info */</div><div class='add'>+	hw-&gt;vendor_id = pdev-&gt;vendor;</div><div class='add'>+	hw-&gt;device_id = pdev-&gt;device;</div><div class='add'>+	hw-&gt;subsystem_vendor_id = pdev-&gt;subsystem_vendor;</div><div class='add'>+	hw-&gt;subsystem_id = pdev-&gt;subsystem_device;</div><div class='add'>+</div><div class='add'>+	pci_read_config_byte(pdev, PCI_REVISION_ID, &amp;hw-&gt;revision_id);</div><div class='add'>+	pci_read_config_word(pdev, PCI_COMMAND, &amp;hw-&gt;pci_cmd_word);</div><div class='add'>+</div><div class='add'>+	adapter-&gt;wol = 0;</div><div class='add'>+	adapter-&gt;ict = 50000;  /* ~100ms */</div><div class='add'>+	adapter-&gt;link_speed = SPEED_0;   /* hardware init */</div><div class='add'>+	adapter-&gt;link_duplex = FULL_DUPLEX;</div><div class='add'>+</div><div class='add'>+	hw-&gt;phy_configured = false;</div><div class='add'>+	hw-&gt;preamble_len = 7;</div><div class='add'>+	hw-&gt;ipgt = 0x60;</div><div class='add'>+	hw-&gt;min_ifg = 0x50;</div><div class='add'>+	hw-&gt;ipgr1 = 0x40;</div><div class='add'>+	hw-&gt;ipgr2 = 0x60;</div><div class='add'>+	hw-&gt;retry_buf = 2;</div><div class='add'>+	hw-&gt;max_retry = 0xf;</div><div class='add'>+	hw-&gt;lcol = 0x37;</div><div class='add'>+	hw-&gt;jam_ipg = 7;</div><div class='add'>+	hw-&gt;fc_rxd_hi = 0;</div><div class='add'>+	hw-&gt;fc_rxd_lo = 0;</div><div class='add'>+	hw-&gt;max_frame_size = adapter-&gt;netdev-&gt;mtu;</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;adapter-&gt;stats_lock);</div><div class='add'>+</div><div class='add'>+	set_bit(__ATL2_DOWN, &amp;adapter-&gt;flags);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * atl2_set_multi - Multicast and Promiscuous mode set</div><div class='add'>+ * @netdev: network interface device structure</div><div class='add'>+ *</div><div class='add'>+ * The set_multi entry point is called whenever the multicast address</div><div class='add'>+ * list or the network interface flags are updated.  This routine is</div><div class='add'>+ * responsible for configuring the hardware for proper multicast,</div><div class='add'>+ * promiscuous mode, and all-multi behavior.</div><div class='add'>+ */</div><div class='add'>+static void atl2_set_multi(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct atl2_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+	struct atl2_hw *hw = &amp;adapter-&gt;hw;</div><div class='add'>+	struct dev_mc_list *mc_ptr;</div><div class='add'>+	u32 rctl;</div><div class='add'>+	u32 hash_value;</div><div class='add'>+</div><div class='add'>+	/* Check for Promiscuous and All Multicast modes */</div><div class='add'>+	rctl = ATL2_READ_REG(hw, REG_MAC_CTRL);</div><div class='add'>+</div><div class='add'>+	if (netdev-&gt;flags &amp; IFF_PROMISC) {</div><div class='add'>+		rctl |= MAC_CTRL_PROMIS_EN;</div><div class='add'>+	} else if (netdev-&gt;flags &amp; IFF_ALLMULTI) {</div><div class='add'>+		rctl |= MAC_CTRL_MC_ALL_EN;</div><div class='add'>+		rctl &amp;= ~MAC_CTRL_PROMIS_EN;</div><div class='add'>+	} else</div><div class='add'>+		rctl &amp;= ~(MAC_CTRL_PROMIS_EN | MAC_CTRL_MC_ALL_EN);</div><div class='add'>+</div><div class='add'>+	ATL2_WRITE_REG(hw, REG_MAC_CTRL, rctl);</div><div class='add'>+</div><div class='add'>+	/* clear the old settings from the multicast hash table */</div><div class='add'>+	ATL2_WRITE_REG(hw, REG_RX_HASH_TABLE, 0);</div><div class='add'>+	ATL2_WRITE_REG_ARRAY(hw, REG_RX_HASH_TABLE, 1, 0);</div><div class='add'>+</div><div class='add'>+	/* comoute mc addresses' hash value ,and put it into hash table */</div><div class='add'>+	for (mc_ptr = netdev-&gt;mc_list; mc_ptr; mc_ptr = mc_ptr-&gt;next) {</div><div class='add'>+		hash_value = atl2_hash_mc_addr(hw, mc_ptr-&gt;dmi_addr);</div><div class='add'>+		atl2_hash_set(hw, hash_value);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void init_ring_ptrs(struct atl2_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	/* Read / Write Ptr Initialize: */</div><div class='add'>+	adapter-&gt;txd_write_ptr = 0;</div><div class='add'>+	atomic_set(&amp;adapter-&gt;txd_read_ptr, 0);</div><div class='add'>+</div><div class='add'>+	adapter-&gt;rxd_read_ptr = 0;</div><div class='add'>+	adapter-&gt;rxd_write_ptr = 0;</div><div class='add'>+</div><div class='add'>+	atomic_set(&amp;adapter-&gt;txs_write_ptr, 0);</div><div class='add'>+	adapter-&gt;txs_next_clear = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * atl2_configure - Configure Transmit&amp;Receive Unit after Reset</div><div class='add'>+ * @adapter: board private structure</div><div class='add'>+ *</div><div class='add'>+ * Configure the Tx /Rx unit of the MAC after a reset.</div><div class='add'>+ */</div><div class='add'>+static int atl2_configure(struct atl2_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	struct atl2_hw *hw = &amp;adapter-&gt;hw;</div><div class='add'>+	u32 value;</div><div class='add'>+</div><div class='add'>+	/* clear interrupt status */</div><div class='add'>+	ATL2_WRITE_REG(&amp;adapter-&gt;hw, REG_ISR, 0xffffffff);</div><div class='add'>+</div><div class='add'>+	/* set MAC Address */</div><div class='add'>+	value = (((u32)hw-&gt;mac_addr[2]) &lt;&lt; 24) |</div><div class='add'>+		(((u32)hw-&gt;mac_addr[3]) &lt;&lt; 16) |</div><div class='add'>+		(((u32)hw-&gt;mac_addr[4]) &lt;&lt; 8) |</div><div class='add'>+		(((u32)hw-&gt;mac_addr[5]));</div><div class='add'>+	ATL2_WRITE_REG(hw, REG_MAC_STA_ADDR, value);</div><div class='add'>+	value = (((u32)hw-&gt;mac_addr[0]) &lt;&lt; 8) |</div><div class='add'>+		(((u32)hw-&gt;mac_addr[1]));</div><div class='add'>+	ATL2_WRITE_REG(hw, (REG_MAC_STA_ADDR+4), value);</div><div class='add'>+</div><div class='add'>+	/* HI base address */</div><div class='add'>+	ATL2_WRITE_REG(hw, REG_DESC_BASE_ADDR_HI,</div><div class='add'>+		(u32)((adapter-&gt;ring_dma &amp; 0xffffffff00000000ULL) &gt;&gt; 32));</div><div class='add'>+</div><div class='add'>+	/* LO base address */</div><div class='add'>+	ATL2_WRITE_REG(hw, REG_TXD_BASE_ADDR_LO,</div><div class='add'>+		(u32)(adapter-&gt;txd_dma &amp; 0x00000000ffffffffULL));</div><div class='add'>+	ATL2_WRITE_REG(hw, REG_TXS_BASE_ADDR_LO,</div><div class='add'>+		(u32)(adapter-&gt;txs_dma &amp; 0x00000000ffffffffULL));</div><div class='add'>+	ATL2_WRITE_REG(hw, REG_RXD_BASE_ADDR_LO,</div><div class='add'>+		(u32)(adapter-&gt;rxd_dma &amp; 0x00000000ffffffffULL));</div><div class='add'>+</div><div class='add'>+	/* element count */</div><div class='add'>+	ATL2_WRITE_REGW(hw, REG_TXD_MEM_SIZE, (u16)(adapter-&gt;txd_ring_size/4));</div><div class='add'>+	ATL2_WRITE_REGW(hw, REG_TXS_MEM_SIZE, (u16)adapter-&gt;txs_ring_size);</div><div class='add'>+	ATL2_WRITE_REGW(hw, REG_RXD_BUF_NUM,  (u16)adapter-&gt;rxd_ring_size);</div><div class='add'>+</div><div class='add'>+	/* config Internal SRAM */</div><div class='add'>+/*</div><div class='add'>+    ATL2_WRITE_REGW(hw, REG_SRAM_TXRAM_END, sram_tx_end);</div><div class='add'>+    ATL2_WRITE_REGW(hw, REG_SRAM_TXRAM_END, sram_rx_end);</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+	/* config IPG/IFG */</div><div class='add'>+	value = (((u32)hw-&gt;ipgt &amp; MAC_IPG_IFG_IPGT_MASK) &lt;&lt;</div><div class='add'>+		MAC_IPG_IFG_IPGT_SHIFT) |</div><div class='add'>+		(((u32)hw-&gt;min_ifg &amp; MAC_IPG_IFG_MIFG_MASK) &lt;&lt;</div><div class='add'>+		MAC_IPG_IFG_MIFG_SHIFT) |</div><div class='add'>+		(((u32)hw-&gt;ipgr1 &amp; MAC_IPG_IFG_IPGR1_MASK) &lt;&lt;</div><div class='add'>+		MAC_IPG_IFG_IPGR1_SHIFT)|</div><div class='add'>+		(((u32)hw-&gt;ipgr2 &amp; MAC_IPG_IFG_IPGR2_MASK) &lt;&lt;</div><div class='add'>+		MAC_IPG_IFG_IPGR2_SHIFT);</div><div class='add'>+	ATL2_WRITE_REG(hw, REG_MAC_IPG_IFG, value);</div><div class='add'>+</div><div class='add'>+	/* config  Half-Duplex Control */</div><div class='add'>+	value = ((u32)hw-&gt;lcol &amp; MAC_HALF_DUPLX_CTRL_LCOL_MASK) |</div><div class='add'>+		(((u32)hw-&gt;max_retry &amp; MAC_HALF_DUPLX_CTRL_RETRY_MASK) &lt;&lt;</div><div class='add'>+		MAC_HALF_DUPLX_CTRL_RETRY_SHIFT) |</div><div class='add'>+		MAC_HALF_DUPLX_CTRL_EXC_DEF_EN |</div><div class='add'>+		(0xa &lt;&lt; MAC_HALF_DUPLX_CTRL_ABEBT_SHIFT) |</div><div class='add'>+		(((u32)hw-&gt;jam_ipg &amp; MAC_HALF_DUPLX_CTRL_JAMIPG_MASK) &lt;&lt;</div><div class='add'>+		MAC_HALF_DUPLX_CTRL_JAMIPG_SHIFT);</div><div class='add'>+	ATL2_WRITE_REG(hw, REG_MAC_HALF_DUPLX_CTRL, value);</div><div class='add'>+</div><div class='add'>+	/* set Interrupt Moderator Timer */</div><div class='add'>+	ATL2_WRITE_REGW(hw, REG_IRQ_MODU_TIMER_INIT, adapter-&gt;imt);</div><div class='add'>+	ATL2_WRITE_REG(hw, REG_MASTER_CTRL, MASTER_CTRL_ITIMER_EN);</div><div class='add'>+</div><div class='add'>+	/* set Interrupt Clear Timer */</div><div class='add'>+	ATL2_WRITE_REGW(hw, REG_CMBDISDMA_TIMER, adapter-&gt;ict);</div><div class='add'>+</div><div class='add'>+	/* set MTU */</div><div class='add'>+	ATL2_WRITE_REG(hw, REG_MTU, adapter-&gt;netdev-&gt;mtu +</div><div class='add'>+		ENET_HEADER_SIZE + VLAN_SIZE + ETHERNET_FCS_SIZE);</div><div class='add'>+</div><div class='add'>+	/* 1590 */</div><div class='add'>+	ATL2_WRITE_REG(hw, REG_TX_CUT_THRESH, 0x177);</div><div class='add'>+</div><div class='add'>+	/* flow control */</div><div class='add'>+	ATL2_WRITE_REGW(hw, REG_PAUSE_ON_TH, hw-&gt;fc_rxd_hi);</div><div class='add'>+	ATL2_WRITE_REGW(hw, REG_PAUSE_OFF_TH, hw-&gt;fc_rxd_lo);</div><div class='add'>+</div><div class='add'>+	/* Init mailbox */</div><div class='add'>+	ATL2_WRITE_REGW(hw, REG_MB_TXD_WR_IDX, (u16)adapter-&gt;txd_write_ptr);</div><div class='add'>+	ATL2_WRITE_REGW(hw, REG_MB_RXD_RD_IDX, (u16)adapter-&gt;rxd_read_ptr);</div><div class='add'>+</div><div class='add'>+	/* enable DMA read/write */</div><div class='add'>+	ATL2_WRITE_REGB(hw, REG_DMAR, DMAR_EN);</div><div class='add'>+	ATL2_WRITE_REGB(hw, REG_DMAW, DMAW_EN);</div><div class='add'>+</div><div class='add'>+	value = ATL2_READ_REG(&amp;adapter-&gt;hw, REG_ISR);</div><div class='add'>+	if ((value &amp; ISR_PHY_LINKDOWN) != 0)</div><div class='add'>+		value = 1; /* config failed */</div><div class='add'>+	else</div><div class='add'>+		value = 0;</div><div class='add'>+</div><div class='add'>+	/* clear all interrupt status */</div><div class='add'>+	ATL2_WRITE_REG(&amp;adapter-&gt;hw, REG_ISR, 0x3fffffff);</div><div class='add'>+	ATL2_WRITE_REG(&amp;adapter-&gt;hw, REG_ISR, 0);</div><div class='add'>+	return value;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * atl2_setup_ring_resources - allocate Tx / RX descriptor resources</div><div class='add'>+ * @adapter: board private structure</div><div class='add'>+ *</div><div class='add'>+ * Return 0 on success, negative on failure</div><div class='add'>+ */</div><div class='add'>+static s32 atl2_setup_ring_resources(struct atl2_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pdev = adapter-&gt;pdev;</div><div class='add'>+	int size;</div><div class='add'>+	u8 offset = 0;</div><div class='add'>+</div><div class='add'>+	/* real ring DMA buffer */</div><div class='add'>+	adapter-&gt;ring_size = size =</div><div class='add'>+		adapter-&gt;txd_ring_size * 1 + 7 +	/* dword align */</div><div class='add'>+		adapter-&gt;txs_ring_size * 4 + 7 +	/* dword align */</div><div class='add'>+		adapter-&gt;rxd_ring_size * 1536 + 127;	/* 128bytes align */</div><div class='add'>+</div><div class='add'>+	adapter-&gt;ring_vir_addr = pci_alloc_consistent(pdev, size,</div><div class='add'>+		&amp;adapter-&gt;ring_dma);</div><div class='add'>+	if (!adapter-&gt;ring_vir_addr)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	memset(adapter-&gt;ring_vir_addr, 0, adapter-&gt;ring_size);</div><div class='add'>+</div><div class='add'>+	/* Init TXD Ring */</div><div class='add'>+	adapter-&gt;txd_dma = adapter-&gt;ring_dma ;</div><div class='add'>+	offset = (adapter-&gt;txd_dma &amp; 0x7) ? (8 - (adapter-&gt;txd_dma &amp; 0x7)) : 0;</div><div class='add'>+	adapter-&gt;txd_dma += offset;</div><div class='add'>+	adapter-&gt;txd_ring = (struct tx_pkt_header *) (adapter-&gt;ring_vir_addr +</div><div class='add'>+		offset);</div><div class='add'>+</div><div class='add'>+	/* Init TXS Ring */</div><div class='add'>+	adapter-&gt;txs_dma = adapter-&gt;txd_dma + adapter-&gt;txd_ring_size;</div><div class='add'>+	offset = (adapter-&gt;txs_dma &amp; 0x7) ? (8 - (adapter-&gt;txs_dma &amp; 0x7)) : 0;</div><div class='add'>+	adapter-&gt;txs_dma += offset;</div><div class='add'>+	adapter-&gt;txs_ring = (struct tx_pkt_status *)</div><div class='add'>+		(((u8 *)adapter-&gt;txd_ring) + (adapter-&gt;txd_ring_size + offset));</div><div class='add'>+</div><div class='add'>+	/* Init RXD Ring */</div><div class='add'>+	adapter-&gt;rxd_dma = adapter-&gt;txs_dma + adapter-&gt;txs_ring_size * 4;</div><div class='add'>+	offset = (adapter-&gt;rxd_dma &amp; 127) ?</div><div class='add'>+		(128 - (adapter-&gt;rxd_dma &amp; 127)) : 0;</div><div class='add'>+	if (offset &gt; 7)</div><div class='add'>+		offset -= 8;</div><div class='add'>+	else</div><div class='add'>+		offset += (128 - 8);</div><div class='add'>+</div><div class='add'>+	adapter-&gt;rxd_dma += offset;</div><div class='add'>+	adapter-&gt;rxd_ring = (struct rx_desc *) (((u8 *)adapter-&gt;txs_ring) +</div><div class='add'>+		(adapter-&gt;txs_ring_size * 4 + offset));</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Read / Write Ptr Initialize:</div><div class='add'>+ *      init_ring_ptrs(adapter);</div><div class='add'>+ */</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * atl2_irq_enable - Enable default interrupt generation settings</div><div class='add'>+ * @adapter: board private structure</div><div class='add'>+ */</div><div class='add'>+static inline void atl2_irq_enable(struct atl2_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	ATL2_WRITE_REG(&amp;adapter-&gt;hw, REG_IMR, IMR_NORMAL_MASK);</div><div class='add'>+	ATL2_WRITE_FLUSH(&amp;adapter-&gt;hw);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * atl2_irq_disable - Mask off interrupt generation on the NIC</div><div class='add'>+ * @adapter: board private structure</div><div class='add'>+ */</div><div class='add'>+static inline void atl2_irq_disable(struct atl2_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+    ATL2_WRITE_REG(&amp;adapter-&gt;hw, REG_IMR, 0);</div><div class='add'>+    ATL2_WRITE_FLUSH(&amp;adapter-&gt;hw);</div><div class='add'>+    synchronize_irq(adapter-&gt;pdev-&gt;irq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef NETIF_F_HW_VLAN_TX</div><div class='add'>+static void atl2_vlan_rx_register(struct net_device *netdev,</div><div class='add'>+	struct vlan_group *grp)</div><div class='add'>+{</div><div class='add'>+	struct atl2_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+	u32 ctrl;</div><div class='add'>+</div><div class='add'>+	atl2_irq_disable(adapter);</div><div class='add'>+	adapter-&gt;vlgrp = grp;</div><div class='add'>+</div><div class='add'>+	if (grp) {</div><div class='add'>+		/* enable VLAN tag insert/strip */</div><div class='add'>+		ctrl = ATL2_READ_REG(&amp;adapter-&gt;hw, REG_MAC_CTRL);</div><div class='add'>+		ctrl |= MAC_CTRL_RMV_VLAN;</div><div class='add'>+		ATL2_WRITE_REG(&amp;adapter-&gt;hw, REG_MAC_CTRL, ctrl);</div><div class='add'>+	} else {</div><div class='add'>+		/* disable VLAN tag insert/strip */</div><div class='add'>+		ctrl = ATL2_READ_REG(&amp;adapter-&gt;hw, REG_MAC_CTRL);</div><div class='add'>+		ctrl &amp;= ~MAC_CTRL_RMV_VLAN;</div><div class='add'>+		ATL2_WRITE_REG(&amp;adapter-&gt;hw, REG_MAC_CTRL, ctrl);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	atl2_irq_enable(adapter);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void atl2_restore_vlan(struct atl2_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	atl2_vlan_rx_register(adapter-&gt;netdev, adapter-&gt;vlgrp);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static void atl2_intr_rx(struct atl2_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev = adapter-&gt;netdev;</div><div class='add'>+	struct rx_desc *rxd;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		rxd = adapter-&gt;rxd_ring+adapter-&gt;rxd_write_ptr;</div><div class='add'>+		if (!rxd-&gt;status.update)</div><div class='add'>+			break; /* end of tx */</div><div class='add'>+</div><div class='add'>+		/* clear this flag at once */</div><div class='add'>+		rxd-&gt;status.update = 0;</div><div class='add'>+</div><div class='add'>+		if (rxd-&gt;status.ok &amp;&amp; rxd-&gt;status.pkt_size &gt;= 60) {</div><div class='add'>+			int rx_size = (int)(rxd-&gt;status.pkt_size - 4);</div><div class='add'>+			/* alloc new buffer */</div><div class='add'>+			skb = netdev_alloc_skb(netdev, rx_size + NET_IP_ALIGN);</div><div class='add'>+			if (NULL == skb) {</div><div class='add'>+				printk(KERN_WARNING</div><div class='add'>+					"%s: Mem squeeze, deferring packet.\n",</div><div class='add'>+					netdev-&gt;name);</div><div class='add'>+				/*</div><div class='add'>+				 * Check that some rx space is free. If not,</div><div class='add'>+				 * free one and mark stats-&gt;rx_dropped++.</div><div class='add'>+				 */</div><div class='add'>+				adapter-&gt;net_stats.rx_dropped++;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			skb_reserve(skb, NET_IP_ALIGN);</div><div class='add'>+			skb-&gt;dev = netdev;</div><div class='add'>+			memcpy(skb-&gt;data, rxd-&gt;packet, rx_size);</div><div class='add'>+			skb_put(skb, rx_size);</div><div class='add'>+			skb-&gt;protocol = eth_type_trans(skb, netdev);</div><div class='add'>+#ifdef NETIF_F_HW_VLAN_TX</div><div class='add'>+			if (adapter-&gt;vlgrp &amp;&amp; (rxd-&gt;status.vlan)) {</div><div class='add'>+				u16 vlan_tag = (rxd-&gt;status.vtag&gt;&gt;4) |</div><div class='add'>+					((rxd-&gt;status.vtag&amp;7) &lt;&lt; 13) |</div><div class='add'>+					((rxd-&gt;status.vtag&amp;8) &lt;&lt; 9);</div><div class='add'>+				vlan_hwaccel_rx(skb, adapter-&gt;vlgrp, vlan_tag);</div><div class='add'>+			} else</div><div class='add'>+#endif</div><div class='add'>+			netif_rx(skb);</div><div class='add'>+			adapter-&gt;net_stats.rx_bytes += rx_size;</div><div class='add'>+			adapter-&gt;net_stats.rx_packets++;</div><div class='add'>+			netdev-&gt;last_rx = jiffies;</div><div class='add'>+		} else {</div><div class='add'>+			adapter-&gt;net_stats.rx_errors++;</div><div class='add'>+</div><div class='add'>+			if (rxd-&gt;status.ok &amp;&amp; rxd-&gt;status.pkt_size &lt;= 60)</div><div class='add'>+				adapter-&gt;net_stats.rx_length_errors++;</div><div class='add'>+			if (rxd-&gt;status.mcast)</div><div class='add'>+				adapter-&gt;net_stats.multicast++;</div><div class='add'>+			if (rxd-&gt;status.crc)</div><div class='add'>+				adapter-&gt;net_stats.rx_crc_errors++;</div><div class='add'>+			if (rxd-&gt;status.align)</div><div class='add'>+				adapter-&gt;net_stats.rx_frame_errors++;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* advance write ptr */</div><div class='add'>+		if (++adapter-&gt;rxd_write_ptr == adapter-&gt;rxd_ring_size)</div><div class='add'>+			adapter-&gt;rxd_write_ptr = 0;</div><div class='add'>+	} while (1);</div><div class='add'>+</div><div class='add'>+	/* update mailbox? */</div><div class='add'>+	adapter-&gt;rxd_read_ptr = adapter-&gt;rxd_write_ptr;</div><div class='add'>+	ATL2_WRITE_REGW(&amp;adapter-&gt;hw, REG_MB_RXD_RD_IDX, adapter-&gt;rxd_read_ptr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void atl2_intr_tx(struct atl2_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	u32 txd_read_ptr;</div><div class='add'>+	u32 txs_write_ptr;</div><div class='add'>+	struct tx_pkt_status *txs;</div><div class='add'>+	struct tx_pkt_header *txph;</div><div class='add'>+	int free_hole = 0;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		txs_write_ptr = (u32) atomic_read(&amp;adapter-&gt;txs_write_ptr);</div><div class='add'>+		txs = adapter-&gt;txs_ring + txs_write_ptr;</div><div class='add'>+		if (!txs-&gt;update)</div><div class='add'>+			break; /* tx stop here */</div><div class='add'>+</div><div class='add'>+		free_hole = 1;</div><div class='add'>+		txs-&gt;update = 0;</div><div class='add'>+</div><div class='add'>+		if (++txs_write_ptr == adapter-&gt;txs_ring_size)</div><div class='add'>+			txs_write_ptr = 0;</div><div class='add'>+		atomic_set(&amp;adapter-&gt;txs_write_ptr, (int)txs_write_ptr);</div><div class='add'>+</div><div class='add'>+		txd_read_ptr = (u32) atomic_read(&amp;adapter-&gt;txd_read_ptr);</div><div class='add'>+		txph = (struct tx_pkt_header *)</div><div class='add'>+			(((u8 *)adapter-&gt;txd_ring) + txd_read_ptr);</div><div class='add'>+</div><div class='add'>+		if (txph-&gt;pkt_size != txs-&gt;pkt_size) {</div><div class='add'>+			struct tx_pkt_status *old_txs = txs;</div><div class='add'>+			printk(KERN_WARNING</div><div class='add'>+				"%s: txs packet size not consistent with txd"</div><div class='add'>+				" txd_:0x%08x, txs_:0x%08x!\n",</div><div class='add'>+				adapter-&gt;netdev-&gt;name,</div><div class='add'>+				*(u32 *)txph, *(u32 *)txs);</div><div class='add'>+			printk(KERN_WARNING</div><div class='add'>+				"txd read ptr: 0x%x\n",</div><div class='add'>+				txd_read_ptr);</div><div class='add'>+			txs = adapter-&gt;txs_ring + txs_write_ptr;</div><div class='add'>+			printk(KERN_WARNING</div><div class='add'>+				"txs-behind:0x%08x\n",</div><div class='add'>+				*(u32 *)txs);</div><div class='add'>+			if (txs_write_ptr &lt; 2) {</div><div class='add'>+				txs = adapter-&gt;txs_ring +</div><div class='add'>+					(adapter-&gt;txs_ring_size +</div><div class='add'>+					txs_write_ptr - 2);</div><div class='add'>+			} else {</div><div class='add'>+				txs = adapter-&gt;txs_ring + (txs_write_ptr - 2);</div><div class='add'>+			}</div><div class='add'>+			printk(KERN_WARNING</div><div class='add'>+				"txs-before:0x%08x\n",</div><div class='add'>+				*(u32 *)txs);</div><div class='add'>+			txs = old_txs;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		 /* 4for TPH */</div><div class='add'>+		txd_read_ptr += (((u32)(txph-&gt;pkt_size) + 7) &amp; ~3);</div><div class='add'>+		if (txd_read_ptr &gt;= adapter-&gt;txd_ring_size)</div><div class='add'>+			txd_read_ptr -= adapter-&gt;txd_ring_size;</div><div class='add'>+</div><div class='add'>+		atomic_set(&amp;adapter-&gt;txd_read_ptr, (int)txd_read_ptr);</div><div class='add'>+</div><div class='add'>+		/* tx statistics: */</div><div class='add'>+		if (txs-&gt;ok) {</div><div class='add'>+			adapter-&gt;net_stats.tx_bytes += txs-&gt;pkt_size;</div><div class='add'>+			adapter-&gt;net_stats.tx_packets++;</div><div class='add'>+		}</div><div class='add'>+		else</div><div class='add'>+			adapter-&gt;net_stats.tx_errors++;</div><div class='add'>+</div><div class='add'>+		if (txs-&gt;defer)</div><div class='add'>+			adapter-&gt;net_stats.collisions++;</div><div class='add'>+		if (txs-&gt;abort_col)</div><div class='add'>+			adapter-&gt;net_stats.tx_aborted_errors++;</div><div class='add'>+		if (txs-&gt;late_col)</div><div class='add'>+			adapter-&gt;net_stats.tx_window_errors++;</div><div class='add'>+		if (txs-&gt;underun)</div><div class='add'>+			adapter-&gt;net_stats.tx_fifo_errors++;</div><div class='add'>+	} while (1);</div><div class='add'>+</div><div class='add'>+	if (free_hole) {</div><div class='add'>+		if (netif_queue_stopped(adapter-&gt;netdev) &amp;&amp;</div><div class='add'>+			netif_carrier_ok(adapter-&gt;netdev))</div><div class='add'>+			netif_wake_queue(adapter-&gt;netdev);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void atl2_check_for_link(struct atl2_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev = adapter-&gt;netdev;</div><div class='add'>+	u16 phy_data = 0;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;adapter-&gt;stats_lock);</div><div class='add'>+	atl2_read_phy_reg(&amp;adapter-&gt;hw, MII_BMSR, &amp;phy_data);</div><div class='add'>+	atl2_read_phy_reg(&amp;adapter-&gt;hw, MII_BMSR, &amp;phy_data);</div><div class='add'>+	spin_unlock(&amp;adapter-&gt;stats_lock);</div><div class='add'>+</div><div class='add'>+	/* notify upper layer link down ASAP */</div><div class='add'>+	if (!(phy_data &amp; BMSR_LSTATUS)) { /* Link Down */</div><div class='add'>+		if (netif_carrier_ok(netdev)) { /* old link state: Up */</div><div class='add'>+		printk(KERN_INFO "%s: %s NIC Link is Down\n",</div><div class='add'>+			atl2_driver_name, netdev-&gt;name);</div><div class='add'>+		adapter-&gt;link_speed = SPEED_0;</div><div class='add'>+		netif_carrier_off(netdev);</div><div class='add'>+		netif_stop_queue(netdev);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	schedule_work(&amp;adapter-&gt;link_chg_task);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void atl2_clear_phy_int(struct atl2_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	u16 phy_data;</div><div class='add'>+	spin_lock(&amp;adapter-&gt;stats_lock);</div><div class='add'>+	atl2_read_phy_reg(&amp;adapter-&gt;hw, 19, &amp;phy_data);</div><div class='add'>+	spin_unlock(&amp;adapter-&gt;stats_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * atl2_intr - Interrupt Handler</div><div class='add'>+ * @irq: interrupt number</div><div class='add'>+ * @data: pointer to a network interface device structure</div><div class='add'>+ * @pt_regs: CPU registers structure</div><div class='add'>+ */</div><div class='add'>+static irqreturn_t atl2_intr(int irq, void *data)</div><div class='add'>+{</div><div class='add'>+	struct atl2_adapter *adapter = netdev_priv(data);</div><div class='add'>+	struct atl2_hw *hw = &amp;adapter-&gt;hw;</div><div class='add'>+	u32 status;</div><div class='add'>+</div><div class='add'>+	status = ATL2_READ_REG(hw, REG_ISR);</div><div class='add'>+	if (0 == status)</div><div class='add'>+		return IRQ_NONE;</div><div class='add'>+</div><div class='add'>+	/* link event */</div><div class='add'>+	if (status &amp; ISR_PHY)</div><div class='add'>+		atl2_clear_phy_int(adapter);</div><div class='add'>+</div><div class='add'>+	/* clear ISR status, and Enable CMB DMA/Disable Interrupt */</div><div class='add'>+	ATL2_WRITE_REG(hw, REG_ISR, status | ISR_DIS_INT);</div><div class='add'>+</div><div class='add'>+	/* check if PCIE PHY Link down */</div><div class='add'>+	if (status &amp; ISR_PHY_LINKDOWN) {</div><div class='add'>+		if (netif_running(adapter-&gt;netdev)) { /* reset MAC */</div><div class='add'>+			ATL2_WRITE_REG(hw, REG_ISR, 0);</div><div class='add'>+			ATL2_WRITE_REG(hw, REG_IMR, 0);</div><div class='add'>+			ATL2_WRITE_FLUSH(hw);</div><div class='add'>+			schedule_work(&amp;adapter-&gt;reset_task);</div><div class='add'>+			return IRQ_HANDLED;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* check if DMA read/write error? */</div><div class='add'>+	if (status &amp; (ISR_DMAR_TO_RST | ISR_DMAW_TO_RST)) {</div><div class='add'>+		ATL2_WRITE_REG(hw, REG_ISR, 0);</div><div class='add'>+		ATL2_WRITE_REG(hw, REG_IMR, 0);</div><div class='add'>+		ATL2_WRITE_FLUSH(hw);</div><div class='add'>+		schedule_work(&amp;adapter-&gt;reset_task);</div><div class='add'>+		return IRQ_HANDLED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* link event */</div><div class='add'>+	if (status &amp; (ISR_PHY | ISR_MANUAL)) {</div><div class='add'>+		adapter-&gt;net_stats.tx_carrier_errors++;</div><div class='add'>+		atl2_check_for_link(adapter);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* transmit event */</div><div class='add'>+	if (status &amp; ISR_TX_EVENT)</div><div class='add'>+		atl2_intr_tx(adapter);</div><div class='add'>+</div><div class='add'>+	/* rx exception */</div><div class='add'>+	if (status &amp; ISR_RX_EVENT)</div><div class='add'>+		atl2_intr_rx(adapter);</div><div class='add'>+</div><div class='add'>+	/* re-enable Interrupt */</div><div class='add'>+	ATL2_WRITE_REG(&amp;adapter-&gt;hw, REG_ISR, 0);</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int atl2_request_irq(struct atl2_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev = adapter-&gt;netdev;</div><div class='add'>+	int flags, err = 0;</div><div class='add'>+</div><div class='add'>+	flags = IRQF_SHARED;</div><div class='add'>+#ifdef CONFIG_PCI_MSI</div><div class='add'>+	adapter-&gt;have_msi = true;</div><div class='add'>+	err = pci_enable_msi(adapter-&gt;pdev);</div><div class='add'>+	if (err)</div><div class='add'>+		adapter-&gt;have_msi = false;</div><div class='add'>+</div><div class='add'>+	if (adapter-&gt;have_msi)</div><div class='add'>+		flags &amp;= ~IRQF_SHARED;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	return request_irq(adapter-&gt;pdev-&gt;irq, &amp;atl2_intr, flags, netdev-&gt;name,</div><div class='add'>+		netdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * atl2_free_ring_resources - Free Tx / RX descriptor Resources</div><div class='add'>+ * @adapter: board private structure</div><div class='add'>+ *</div><div class='add'>+ * Free all transmit software resources</div><div class='add'>+ */</div><div class='add'>+static void atl2_free_ring_resources(struct atl2_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pdev = adapter-&gt;pdev;</div><div class='add'>+	pci_free_consistent(pdev, adapter-&gt;ring_size, adapter-&gt;ring_vir_addr,</div><div class='add'>+		adapter-&gt;ring_dma);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * atl2_open - Called when a network interface is made active</div><div class='add'>+ * @netdev: network interface device structure</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 on success, negative value on failure</div><div class='add'>+ *</div><div class='add'>+ * The open entry point is called when a network interface is made</div><div class='add'>+ * active by the system (IFF_UP).  At this point all resources needed</div><div class='add'>+ * for transmit and receive operations are allocated, the interrupt</div><div class='add'>+ * handler is registered with the OS, the watchdog timer is started,</div><div class='add'>+ * and the stack is notified that the interface is ready.</div><div class='add'>+ */</div><div class='add'>+static int atl2_open(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct atl2_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+	int err;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	/* disallow open during test */</div><div class='add'>+	if (test_bit(__ATL2_TESTING, &amp;adapter-&gt;flags))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	/* allocate transmit descriptors */</div><div class='add'>+	err = atl2_setup_ring_resources(adapter);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = atl2_init_hw(&amp;adapter-&gt;hw);</div><div class='add'>+	if (err) {</div><div class='add'>+		err = -EIO;</div><div class='add'>+		goto err_init_hw;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* hardware has been reset, we need to reload some things */</div><div class='add'>+	atl2_set_multi(netdev);</div><div class='add'>+	init_ring_ptrs(adapter);</div><div class='add'>+</div><div class='add'>+#ifdef NETIF_F_HW_VLAN_TX</div><div class='add'>+	atl2_restore_vlan(adapter);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	if (atl2_configure(adapter)) {</div><div class='add'>+		err = -EIO;</div><div class='add'>+		goto err_config;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = atl2_request_irq(adapter);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_req_irq;</div><div class='add'>+</div><div class='add'>+	clear_bit(__ATL2_DOWN, &amp;adapter-&gt;flags);</div><div class='add'>+</div><div class='add'>+	mod_timer(&amp;adapter-&gt;watchdog_timer, jiffies + 4*HZ);</div><div class='add'>+</div><div class='add'>+	val = ATL2_READ_REG(&amp;adapter-&gt;hw, REG_MASTER_CTRL);</div><div class='add'>+	ATL2_WRITE_REG(&amp;adapter-&gt;hw, REG_MASTER_CTRL,</div><div class='add'>+		val | MASTER_CTRL_MANUAL_INT);</div><div class='add'>+</div><div class='add'>+	atl2_irq_enable(adapter);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_init_hw:</div><div class='add'>+err_req_irq:</div><div class='add'>+err_config:</div><div class='add'>+	atl2_free_ring_resources(adapter);</div><div class='add'>+	atl2_reset_hw(&amp;adapter-&gt;hw);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void atl2_down(struct atl2_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev = adapter-&gt;netdev;</div><div class='add'>+</div><div class='add'>+	/* signal that we're down so the interrupt handler does not</div><div class='add'>+	 * reschedule our watchdog timer */</div><div class='add'>+	set_bit(__ATL2_DOWN, &amp;adapter-&gt;flags);</div><div class='add'>+</div><div class='add'>+	netif_tx_disable(netdev);</div><div class='add'>+</div><div class='add'>+	/* reset MAC to disable all RX/TX */</div><div class='add'>+	atl2_reset_hw(&amp;adapter-&gt;hw);</div><div class='add'>+	msleep(1);</div><div class='add'>+</div><div class='add'>+	atl2_irq_disable(adapter);</div><div class='add'>+</div><div class='add'>+	del_timer_sync(&amp;adapter-&gt;watchdog_timer);</div><div class='add'>+	del_timer_sync(&amp;adapter-&gt;phy_config_timer);</div><div class='add'>+	clear_bit(0, &amp;adapter-&gt;cfg_phy);</div><div class='add'>+</div><div class='add'>+	netif_carrier_off(netdev);</div><div class='add'>+	adapter-&gt;link_speed = SPEED_0;</div><div class='add'>+	adapter-&gt;link_duplex = -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void atl2_free_irq(struct atl2_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev = adapter-&gt;netdev;</div><div class='add'>+</div><div class='add'>+	free_irq(adapter-&gt;pdev-&gt;irq, netdev);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PCI_MSI</div><div class='add'>+	if (adapter-&gt;have_msi)</div><div class='add'>+		pci_disable_msi(adapter-&gt;pdev);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * atl2_close - Disables a network interface</div><div class='add'>+ * @netdev: network interface device structure</div><div class='add'>+ *</div><div class='add'>+ * Returns 0, this is not allowed to fail</div><div class='add'>+ *</div><div class='add'>+ * The close entry point is called when an interface is de-activated</div><div class='add'>+ * by the OS.  The hardware is still under the drivers control, but</div><div class='add'>+ * needs to be disabled.  A global MAC reset is issued to stop the</div><div class='add'>+ * hardware, and all transmit and receive resources are freed.</div><div class='add'>+ */</div><div class='add'>+static int atl2_close(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct atl2_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	WARN_ON(test_bit(__ATL2_RESETTING, &amp;adapter-&gt;flags));</div><div class='add'>+</div><div class='add'>+	atl2_down(adapter);</div><div class='add'>+	atl2_free_irq(adapter);</div><div class='add'>+	atl2_free_ring_resources(adapter);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int TxsFreeUnit(struct atl2_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	u32 txs_write_ptr = (u32) atomic_read(&amp;adapter-&gt;txs_write_ptr);</div><div class='add'>+</div><div class='add'>+	return (adapter-&gt;txs_next_clear &gt;= txs_write_ptr) ?</div><div class='add'>+		(int) (adapter-&gt;txs_ring_size - adapter-&gt;txs_next_clear +</div><div class='add'>+		txs_write_ptr - 1) :</div><div class='add'>+		(int) (txs_write_ptr - adapter-&gt;txs_next_clear - 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int TxdFreeBytes(struct atl2_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	u32 txd_read_ptr = (u32)atomic_read(&amp;adapter-&gt;txd_read_ptr);</div><div class='add'>+</div><div class='add'>+	return (adapter-&gt;txd_write_ptr &gt;= txd_read_ptr) ?</div><div class='add'>+		(int) (adapter-&gt;txd_ring_size - adapter-&gt;txd_write_ptr +</div><div class='add'>+		txd_read_ptr - 1) :</div><div class='add'>+		(int) (txd_read_ptr - adapter-&gt;txd_write_ptr - 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int atl2_xmit_frame(struct sk_buff *skb, struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct atl2_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+	struct tx_pkt_header *txph;</div><div class='add'>+	u32 offset, copy_len;</div><div class='add'>+	int txs_unused;</div><div class='add'>+	int txbuf_unused;</div><div class='add'>+</div><div class='add'>+	if (test_bit(__ATL2_DOWN, &amp;adapter-&gt;flags)) {</div><div class='add'>+		dev_kfree_skb_any(skb);</div><div class='add'>+		return NETDEV_TX_OK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (unlikely(skb-&gt;len &lt;= 0)) {</div><div class='add'>+		dev_kfree_skb_any(skb);</div><div class='add'>+		return NETDEV_TX_OK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	txs_unused = TxsFreeUnit(adapter);</div><div class='add'>+	txbuf_unused = TxdFreeBytes(adapter);</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;len + sizeof(struct tx_pkt_header) + 4  &gt; txbuf_unused ||</div><div class='add'>+		txs_unused &lt; 1) {</div><div class='add'>+		/* not enough resources */</div><div class='add'>+		netif_stop_queue(netdev);</div><div class='add'>+		return NETDEV_TX_BUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	offset = adapter-&gt;txd_write_ptr;</div><div class='add'>+</div><div class='add'>+	txph = (struct tx_pkt_header *) (((u8 *)adapter-&gt;txd_ring) + offset);</div><div class='add'>+</div><div class='add'>+	*(u32 *)txph = 0;</div><div class='add'>+	txph-&gt;pkt_size = skb-&gt;len;</div><div class='add'>+</div><div class='add'>+	offset += 4;</div><div class='add'>+	if (offset &gt;= adapter-&gt;txd_ring_size)</div><div class='add'>+		offset -= adapter-&gt;txd_ring_size;</div><div class='add'>+	copy_len = adapter-&gt;txd_ring_size - offset;</div><div class='add'>+	if (copy_len &gt;= skb-&gt;len) {</div><div class='add'>+		memcpy(((u8 *)adapter-&gt;txd_ring) + offset, skb-&gt;data, skb-&gt;len);</div><div class='add'>+		offset += ((u32)(skb-&gt;len + 3) &amp; ~3);</div><div class='add'>+	} else {</div><div class='add'>+		memcpy(((u8 *)adapter-&gt;txd_ring)+offset, skb-&gt;data, copy_len);</div><div class='add'>+		memcpy((u8 *)adapter-&gt;txd_ring, skb-&gt;data+copy_len,</div><div class='add'>+			skb-&gt;len-copy_len);</div><div class='add'>+		offset = ((u32)(skb-&gt;len-copy_len + 3) &amp; ~3);</div><div class='add'>+	}</div><div class='add'>+#ifdef NETIF_F_HW_VLAN_TX</div><div class='add'>+	if (adapter-&gt;vlgrp &amp;&amp; vlan_tx_tag_present(skb)) {</div><div class='add'>+		u16 vlan_tag = vlan_tx_tag_get(skb);</div><div class='add'>+		vlan_tag = (vlan_tag &lt;&lt; 4) |</div><div class='add'>+			(vlan_tag &gt;&gt; 13) |</div><div class='add'>+			((vlan_tag &gt;&gt; 9) &amp; 0x8);</div><div class='add'>+		txph-&gt;ins_vlan = 1;</div><div class='add'>+		txph-&gt;vlan = vlan_tag;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	if (offset &gt;= adapter-&gt;txd_ring_size)</div><div class='add'>+		offset -= adapter-&gt;txd_ring_size;</div><div class='add'>+	adapter-&gt;txd_write_ptr = offset;</div><div class='add'>+</div><div class='add'>+	/* clear txs before send */</div><div class='add'>+	adapter-&gt;txs_ring[adapter-&gt;txs_next_clear].update = 0;</div><div class='add'>+	if (++adapter-&gt;txs_next_clear == adapter-&gt;txs_ring_size)</div><div class='add'>+		adapter-&gt;txs_next_clear = 0;</div><div class='add'>+</div><div class='add'>+	ATL2_WRITE_REGW(&amp;adapter-&gt;hw, REG_MB_TXD_WR_IDX,</div><div class='add'>+		(adapter-&gt;txd_write_ptr &gt;&gt; 2));</div><div class='add'>+</div><div class='add'>+	mmiowb();</div><div class='add'>+	netdev-&gt;trans_start = jiffies;</div><div class='add'>+	dev_kfree_skb_any(skb);</div><div class='add'>+	return NETDEV_TX_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * atl2_get_stats - Get System Network Statistics</div><div class='add'>+ * @netdev: network interface device structure</div><div class='add'>+ *</div><div class='add'>+ * Returns the address of the device statistics structure.</div><div class='add'>+ * The statistics are actually updated from the timer callback.</div><div class='add'>+ */</div><div class='add'>+static struct net_device_stats *atl2_get_stats(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct atl2_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+	return &amp;adapter-&gt;net_stats;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * atl2_change_mtu - Change the Maximum Transfer Unit</div><div class='add'>+ * @netdev: network interface device structure</div><div class='add'>+ * @new_mtu: new value for maximum frame size</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 on success, negative on failure</div><div class='add'>+ */</div><div class='add'>+static int atl2_change_mtu(struct net_device *netdev, int new_mtu)</div><div class='add'>+{</div><div class='add'>+	struct atl2_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+	struct atl2_hw *hw = &amp;adapter-&gt;hw;</div><div class='add'>+</div><div class='add'>+	if ((new_mtu &lt; 40) || (new_mtu &gt; (ETH_DATA_LEN + VLAN_SIZE)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* set MTU */</div><div class='add'>+	if (hw-&gt;max_frame_size != new_mtu) {</div><div class='add'>+		netdev-&gt;mtu = new_mtu;</div><div class='add'>+		ATL2_WRITE_REG(hw, REG_MTU, new_mtu + ENET_HEADER_SIZE +</div><div class='add'>+			VLAN_SIZE + ETHERNET_FCS_SIZE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * atl2_set_mac - Change the Ethernet Address of the NIC</div><div class='add'>+ * @netdev: network interface device structure</div><div class='add'>+ * @p: pointer to an address structure</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 on success, negative on failure</div><div class='add'>+ */</div><div class='add'>+static int atl2_set_mac(struct net_device *netdev, void *p)</div><div class='add'>+{</div><div class='add'>+	struct atl2_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+	struct sockaddr *addr = p;</div><div class='add'>+</div><div class='add'>+	if (!is_valid_ether_addr(addr-&gt;sa_data))</div><div class='add'>+		return -EADDRNOTAVAIL;</div><div class='add'>+</div><div class='add'>+	if (netif_running(netdev))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	memcpy(netdev-&gt;dev_addr, addr-&gt;sa_data, netdev-&gt;addr_len);</div><div class='add'>+	memcpy(adapter-&gt;hw.mac_addr, addr-&gt;sa_data, netdev-&gt;addr_len);</div><div class='add'>+</div><div class='add'>+	atl2_set_mac_addr(&amp;adapter-&gt;hw);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * atl2_mii_ioctl -</div><div class='add'>+ * @netdev:</div><div class='add'>+ * @ifreq:</div><div class='add'>+ * @cmd:</div><div class='add'>+ */</div><div class='add'>+static int atl2_mii_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)</div><div class='add'>+{</div><div class='add'>+	struct atl2_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+	struct mii_ioctl_data *data = if_mii(ifr);</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case SIOCGMIIPHY:</div><div class='add'>+		data-&gt;phy_id = 0;</div><div class='add'>+		break;</div><div class='add'>+	case SIOCGMIIREG:</div><div class='add'>+		if (!capable(CAP_NET_ADMIN))</div><div class='add'>+			return -EPERM;</div><div class='add'>+		spin_lock_irqsave(&amp;adapter-&gt;stats_lock, flags);</div><div class='add'>+		if (atl2_read_phy_reg(&amp;adapter-&gt;hw,</div><div class='add'>+			data-&gt;reg_num &amp; 0x1F, &amp;data-&gt;val_out)) {</div><div class='add'>+			spin_unlock_irqrestore(&amp;adapter-&gt;stats_lock, flags);</div><div class='add'>+			return -EIO;</div><div class='add'>+		}</div><div class='add'>+		spin_unlock_irqrestore(&amp;adapter-&gt;stats_lock, flags);</div><div class='add'>+		break;</div><div class='add'>+	case SIOCSMIIREG:</div><div class='add'>+		if (!capable(CAP_NET_ADMIN))</div><div class='add'>+			return -EPERM;</div><div class='add'>+		if (data-&gt;reg_num &amp; ~(0x1F))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		spin_lock_irqsave(&amp;adapter-&gt;stats_lock, flags);</div><div class='add'>+		if (atl2_write_phy_reg(&amp;adapter-&gt;hw, data-&gt;reg_num,</div><div class='add'>+			data-&gt;val_in)) {</div><div class='add'>+			spin_unlock_irqrestore(&amp;adapter-&gt;stats_lock, flags);</div><div class='add'>+			return -EIO;</div><div class='add'>+		}</div><div class='add'>+		spin_unlock_irqrestore(&amp;adapter-&gt;stats_lock, flags);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * atl2_ioctl -</div><div class='add'>+ * @netdev:</div><div class='add'>+ * @ifreq:</div><div class='add'>+ * @cmd:</div><div class='add'>+ */</div><div class='add'>+static int atl2_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)</div><div class='add'>+{</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case SIOCGMIIPHY:</div><div class='add'>+	case SIOCGMIIREG:</div><div class='add'>+	case SIOCSMIIREG:</div><div class='add'>+		return atl2_mii_ioctl(netdev, ifr, cmd);</div><div class='add'>+#ifdef ETHTOOL_OPS_COMPAT</div><div class='add'>+	case SIOCETHTOOL:</div><div class='add'>+		return ethtool_ioctl(ifr);</div><div class='add'>+#endif</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * atl2_tx_timeout - Respond to a Tx Hang</div><div class='add'>+ * @netdev: network interface device structure</div><div class='add'>+ */</div><div class='add'>+static void atl2_tx_timeout(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct atl2_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	/* Do the reset outside of interrupt context */</div><div class='add'>+	schedule_work(&amp;adapter-&gt;reset_task);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * atl2_watchdog - Timer Call-back</div><div class='add'>+ * @data: pointer to netdev cast into an unsigned long</div><div class='add'>+ */</div><div class='add'>+static void atl2_watchdog(unsigned long data)</div><div class='add'>+{</div><div class='add'>+	struct atl2_adapter *adapter = (struct atl2_adapter *) data;</div><div class='add'>+	u32 drop_rxd, drop_rxs;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	if (!test_bit(__ATL2_DOWN, &amp;adapter-&gt;flags)) {</div><div class='add'>+		spin_lock_irqsave(&amp;adapter-&gt;stats_lock, flags);</div><div class='add'>+		drop_rxd = ATL2_READ_REG(&amp;adapter-&gt;hw, REG_STS_RXD_OV);</div><div class='add'>+		drop_rxs = ATL2_READ_REG(&amp;adapter-&gt;hw, REG_STS_RXS_OV);</div><div class='add'>+		adapter-&gt;net_stats.rx_over_errors += (drop_rxd+drop_rxs);</div><div class='add'>+		spin_unlock_irqrestore(&amp;adapter-&gt;stats_lock, flags);</div><div class='add'>+</div><div class='add'>+		/* Reset the timer */</div><div class='add'>+		mod_timer(&amp;adapter-&gt;watchdog_timer, jiffies + 4 * HZ);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * atl2_phy_config - Timer Call-back</div><div class='add'>+ * @data: pointer to netdev cast into an unsigned long</div><div class='add'>+ */</div><div class='add'>+static void atl2_phy_config(unsigned long data)</div><div class='add'>+{</div><div class='add'>+	struct atl2_adapter *adapter = (struct atl2_adapter *) data;</div><div class='add'>+	struct atl2_hw *hw = &amp;adapter-&gt;hw;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;adapter-&gt;stats_lock, flags);</div><div class='add'>+	atl2_write_phy_reg(hw, MII_ADVERTISE, hw-&gt;mii_autoneg_adv_reg);</div><div class='add'>+	atl2_write_phy_reg(hw, MII_BMCR, MII_CR_RESET | MII_CR_AUTO_NEG_EN |</div><div class='add'>+		MII_CR_RESTART_AUTO_NEG);</div><div class='add'>+	spin_unlock_irqrestore(&amp;adapter-&gt;stats_lock, flags);</div><div class='add'>+	clear_bit(0, &amp;adapter-&gt;cfg_phy);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int atl2_up(struct atl2_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev = adapter-&gt;netdev;</div><div class='add'>+	int err = 0;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	/* hardware has been reset, we need to reload some things */</div><div class='add'>+</div><div class='add'>+	err = atl2_init_hw(&amp;adapter-&gt;hw);</div><div class='add'>+	if (err) {</div><div class='add'>+		err = -EIO;</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	atl2_set_multi(netdev);</div><div class='add'>+	init_ring_ptrs(adapter);</div><div class='add'>+</div><div class='add'>+#ifdef NETIF_F_HW_VLAN_TX</div><div class='add'>+	atl2_restore_vlan(adapter);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	if (atl2_configure(adapter)) {</div><div class='add'>+		err = -EIO;</div><div class='add'>+		goto err_up;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	clear_bit(__ATL2_DOWN, &amp;adapter-&gt;flags);</div><div class='add'>+</div><div class='add'>+	val = ATL2_READ_REG(&amp;adapter-&gt;hw, REG_MASTER_CTRL);</div><div class='add'>+	ATL2_WRITE_REG(&amp;adapter-&gt;hw, REG_MASTER_CTRL, val |</div><div class='add'>+		MASTER_CTRL_MANUAL_INT);</div><div class='add'>+</div><div class='add'>+	atl2_irq_enable(adapter);</div><div class='add'>+</div><div class='add'>+err_up:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void atl2_reinit_locked(struct atl2_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	WARN_ON(in_interrupt());</div><div class='add'>+	while (test_and_set_bit(__ATL2_RESETTING, &amp;adapter-&gt;flags))</div><div class='add'>+		msleep(1);</div><div class='add'>+	atl2_down(adapter);</div><div class='add'>+	atl2_up(adapter);</div><div class='add'>+	clear_bit(__ATL2_RESETTING, &amp;adapter-&gt;flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void atl2_reset_task(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct atl2_adapter *adapter;</div><div class='add'>+	adapter = container_of(work, struct atl2_adapter, reset_task);</div><div class='add'>+</div><div class='add'>+	atl2_reinit_locked(adapter);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void atl2_setup_mac_ctrl(struct atl2_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	u32 value;</div><div class='add'>+	struct atl2_hw *hw = &amp;adapter-&gt;hw;</div><div class='add'>+	struct net_device *netdev = adapter-&gt;netdev;</div><div class='add'>+</div><div class='add'>+	/* Config MAC CTRL Register */</div><div class='add'>+	value = MAC_CTRL_TX_EN | MAC_CTRL_RX_EN | MAC_CTRL_MACLP_CLK_PHY;</div><div class='add'>+</div><div class='add'>+	/* duplex */</div><div class='add'>+	if (FULL_DUPLEX == adapter-&gt;link_duplex)</div><div class='add'>+		value |= MAC_CTRL_DUPLX;</div><div class='add'>+</div><div class='add'>+	/* flow control */</div><div class='add'>+	value |= (MAC_CTRL_TX_FLOW | MAC_CTRL_RX_FLOW);</div><div class='add'>+</div><div class='add'>+	/* PAD &amp; CRC */</div><div class='add'>+	value |= (MAC_CTRL_ADD_CRC | MAC_CTRL_PAD);</div><div class='add'>+</div><div class='add'>+	/* preamble length */</div><div class='add'>+	value |= (((u32)adapter-&gt;hw.preamble_len &amp; MAC_CTRL_PRMLEN_MASK) &lt;&lt;</div><div class='add'>+		MAC_CTRL_PRMLEN_SHIFT);</div><div class='add'>+</div><div class='add'>+	/* vlan */</div><div class='add'>+	if (adapter-&gt;vlgrp)</div><div class='add'>+		value |= MAC_CTRL_RMV_VLAN;</div><div class='add'>+</div><div class='add'>+	/* filter mode */</div><div class='add'>+	value |= MAC_CTRL_BC_EN;</div><div class='add'>+	if (netdev-&gt;flags &amp; IFF_PROMISC)</div><div class='add'>+		value |= MAC_CTRL_PROMIS_EN;</div><div class='add'>+	else if (netdev-&gt;flags &amp; IFF_ALLMULTI)</div><div class='add'>+		value |= MAC_CTRL_MC_ALL_EN;</div><div class='add'>+</div><div class='add'>+	/* half retry buffer */</div><div class='add'>+	value |= (((u32)(adapter-&gt;hw.retry_buf &amp;</div><div class='add'>+		MAC_CTRL_HALF_LEFT_BUF_MASK)) &lt;&lt; MAC_CTRL_HALF_LEFT_BUF_SHIFT);</div><div class='add'>+</div><div class='add'>+	ATL2_WRITE_REG(hw, REG_MAC_CTRL, value);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int atl2_check_link(struct atl2_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	struct atl2_hw *hw = &amp;adapter-&gt;hw;</div><div class='add'>+	struct net_device *netdev = adapter-&gt;netdev;</div><div class='add'>+	int ret_val;</div><div class='add'>+	u16 speed, duplex, phy_data;</div><div class='add'>+	int reconfig = 0;</div><div class='add'>+</div><div class='add'>+	/* MII_BMSR must read twise */</div><div class='add'>+	atl2_read_phy_reg(hw, MII_BMSR, &amp;phy_data);</div><div class='add'>+	atl2_read_phy_reg(hw, MII_BMSR, &amp;phy_data);</div><div class='add'>+	if (!(phy_data&amp;BMSR_LSTATUS)) { /* link down */</div><div class='add'>+		if (netif_carrier_ok(netdev)) { /* old link state: Up */</div><div class='add'>+			u32 value;</div><div class='add'>+			/* disable rx */</div><div class='add'>+			value = ATL2_READ_REG(hw, REG_MAC_CTRL);</div><div class='add'>+			value &amp;= ~MAC_CTRL_RX_EN;</div><div class='add'>+			ATL2_WRITE_REG(hw, REG_MAC_CTRL, value);</div><div class='add'>+			adapter-&gt;link_speed = SPEED_0;</div><div class='add'>+			netif_carrier_off(netdev);</div><div class='add'>+			netif_stop_queue(netdev);</div><div class='add'>+		}</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Link Up */</div><div class='add'>+	ret_val = atl2_get_speed_and_duplex(hw, &amp;speed, &amp;duplex);</div><div class='add'>+	if (ret_val)</div><div class='add'>+		return ret_val;</div><div class='add'>+	switch (hw-&gt;MediaType) {</div><div class='add'>+	case MEDIA_TYPE_100M_FULL:</div><div class='add'>+		if (speed  != SPEED_100 || duplex != FULL_DUPLEX)</div><div class='add'>+			reconfig = 1;</div><div class='add'>+		break;</div><div class='add'>+	case MEDIA_TYPE_100M_HALF:</div><div class='add'>+		if (speed  != SPEED_100 || duplex != HALF_DUPLEX)</div><div class='add'>+			reconfig = 1;</div><div class='add'>+		break;</div><div class='add'>+	case MEDIA_TYPE_10M_FULL:</div><div class='add'>+		if (speed != SPEED_10 || duplex != FULL_DUPLEX)</div><div class='add'>+			reconfig = 1;</div><div class='add'>+		break;</div><div class='add'>+	case MEDIA_TYPE_10M_HALF:</div><div class='add'>+		if (speed  != SPEED_10 || duplex != HALF_DUPLEX)</div><div class='add'>+			reconfig = 1;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	/* link result is our setting */</div><div class='add'>+	if (reconfig == 0) {</div><div class='add'>+		if (adapter-&gt;link_speed != speed ||</div><div class='add'>+			adapter-&gt;link_duplex != duplex) {</div><div class='add'>+			adapter-&gt;link_speed = speed;</div><div class='add'>+			adapter-&gt;link_duplex = duplex;</div><div class='add'>+			atl2_setup_mac_ctrl(adapter);</div><div class='add'>+			printk(KERN_INFO "%s: %s NIC Link is Up&lt;%d Mbps %s&gt;\n",</div><div class='add'>+				atl2_driver_name, netdev-&gt;name,</div><div class='add'>+				adapter-&gt;link_speed,</div><div class='add'>+				adapter-&gt;link_duplex == FULL_DUPLEX ?</div><div class='add'>+					"Full Duplex" : "Half Duplex");</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!netif_carrier_ok(netdev)) { /* Link down -&gt; Up */</div><div class='add'>+			netif_carrier_on(netdev);</div><div class='add'>+			netif_wake_queue(netdev);</div><div class='add'>+		}</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* change original link status */</div><div class='add'>+	if (netif_carrier_ok(netdev)) {</div><div class='add'>+		u32 value;</div><div class='add'>+		/* disable rx */</div><div class='add'>+		value = ATL2_READ_REG(hw, REG_MAC_CTRL);</div><div class='add'>+		value &amp;= ~MAC_CTRL_RX_EN;</div><div class='add'>+		ATL2_WRITE_REG(hw, REG_MAC_CTRL, value);</div><div class='add'>+</div><div class='add'>+		adapter-&gt;link_speed = SPEED_0;</div><div class='add'>+		netif_carrier_off(netdev);</div><div class='add'>+		netif_stop_queue(netdev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* auto-neg, insert timer to re-config phy</div><div class='add'>+	 * (if interval smaller than 5 seconds, something strange) */</div><div class='add'>+	if (!test_bit(__ATL2_DOWN, &amp;adapter-&gt;flags)) {</div><div class='add'>+		if (!test_and_set_bit(0, &amp;adapter-&gt;cfg_phy))</div><div class='add'>+			mod_timer(&amp;adapter-&gt;phy_config_timer, jiffies + 5 * HZ);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * atl2_link_chg_task - deal with link change event Out of interrupt context</div><div class='add'>+ * @netdev: network interface device structure</div><div class='add'>+ */</div><div class='add'>+static void atl2_link_chg_task(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct atl2_adapter *adapter;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	adapter = container_of(work, struct atl2_adapter, link_chg_task);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;adapter-&gt;stats_lock, flags);</div><div class='add'>+	atl2_check_link(adapter);</div><div class='add'>+	spin_unlock_irqrestore(&amp;adapter-&gt;stats_lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void atl2_setup_pcicmd(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	u16 cmd;</div><div class='add'>+</div><div class='add'>+	pci_read_config_word(pdev, PCI_COMMAND, &amp;cmd);</div><div class='add'>+</div><div class='add'>+	if (cmd &amp; PCI_COMMAND_INTX_DISABLE)</div><div class='add'>+		cmd &amp;= ~PCI_COMMAND_INTX_DISABLE;</div><div class='add'>+	if (cmd &amp; PCI_COMMAND_IO)</div><div class='add'>+		cmd &amp;= ~PCI_COMMAND_IO;</div><div class='add'>+	if (0 == (cmd &amp; PCI_COMMAND_MEMORY))</div><div class='add'>+		cmd |= PCI_COMMAND_MEMORY;</div><div class='add'>+	if (0 == (cmd &amp; PCI_COMMAND_MASTER))</div><div class='add'>+		cmd |= PCI_COMMAND_MASTER;</div><div class='add'>+	pci_write_config_word(pdev, PCI_COMMAND, cmd);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * some motherboards BIOS(PXE/EFI) driver may set PME</div><div class='add'>+	 * while they transfer control to OS (Windows/Linux)</div><div class='add'>+	 * so we should clear this bit before NIC work normally</div><div class='add'>+	 */</div><div class='add'>+	pci_write_config_dword(pdev, REG_PM_CTRLSTAT, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_NET_POLL_CONTROLLER</div><div class='add'>+static void atl2_poll_controller(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	disable_irq(netdev-&gt;irq);</div><div class='add'>+	atl2_intr(netdev-&gt;irq, netdev);</div><div class='add'>+	enable_irq(netdev-&gt;irq);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * atl2_probe - Device Initialization Routine</div><div class='add'>+ * @pdev: PCI device information struct</div><div class='add'>+ * @ent: entry in atl2_pci_tbl</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 on success, negative on failure</div><div class='add'>+ *</div><div class='add'>+ * atl2_probe initializes an adapter identified by a pci_dev structure.</div><div class='add'>+ * The OS initialization, configuring of the adapter private structure,</div><div class='add'>+ * and a hardware reset occur.</div><div class='add'>+ */</div><div class='add'>+static int __devinit atl2_probe(struct pci_dev *pdev,</div><div class='add'>+	const struct pci_device_id *ent)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev;</div><div class='add'>+	struct atl2_adapter *adapter;</div><div class='add'>+	static int cards_found;</div><div class='add'>+	unsigned long mmio_start;</div><div class='add'>+	int mmio_len;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	cards_found = 0;</div><div class='add'>+</div><div class='add'>+	err = pci_enable_device(pdev);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * atl2 is a shared-high-32-bit device, so we're stuck with 32-bit DMA</div><div class='add'>+	 * until the kernel has the proper infrastructure to support 64-bit DMA</div><div class='add'>+	 * on these devices.</div><div class='add'>+	 */</div><div class='add'>+	if (pci_set_dma_mask(pdev, DMA_32BIT_MASK) &amp;&amp;</div><div class='add'>+		pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK)) {</div><div class='add'>+		printk(KERN_ERR "atl2: No usable DMA configuration, aborting\n");</div><div class='add'>+		goto err_dma;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Mark all PCI regions associated with PCI device</div><div class='add'>+	 * pdev as being reserved by owner atl2_driver_name */</div><div class='add'>+	err = pci_request_regions(pdev, atl2_driver_name);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_pci_reg;</div><div class='add'>+</div><div class='add'>+	/* Enables bus-mastering on the device and calls</div><div class='add'>+	 * pcibios_set_master to do the needed arch specific settings */</div><div class='add'>+	pci_set_master(pdev);</div><div class='add'>+</div><div class='add'>+	err = -ENOMEM;</div><div class='add'>+	netdev = alloc_etherdev(sizeof(struct atl2_adapter));</div><div class='add'>+	if (!netdev)</div><div class='add'>+		goto err_alloc_etherdev;</div><div class='add'>+</div><div class='add'>+	SET_NETDEV_DEV(netdev, &amp;pdev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	pci_set_drvdata(pdev, netdev);</div><div class='add'>+	adapter = netdev_priv(netdev);</div><div class='add'>+	adapter-&gt;netdev = netdev;</div><div class='add'>+	adapter-&gt;pdev = pdev;</div><div class='add'>+	adapter-&gt;hw.back = adapter;</div><div class='add'>+</div><div class='add'>+	mmio_start = pci_resource_start(pdev, 0x0);</div><div class='add'>+	mmio_len = pci_resource_len(pdev, 0x0);</div><div class='add'>+</div><div class='add'>+	adapter-&gt;hw.mem_rang = (u32)mmio_len;</div><div class='add'>+	adapter-&gt;hw.hw_addr = ioremap(mmio_start, mmio_len);</div><div class='add'>+	if (!adapter-&gt;hw.hw_addr) {</div><div class='add'>+		err = -EIO;</div><div class='add'>+		goto err_ioremap;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	atl2_setup_pcicmd(pdev);</div><div class='add'>+</div><div class='add'>+	netdev-&gt;open = &amp;atl2_open;</div><div class='add'>+	netdev-&gt;stop = &amp;atl2_close;</div><div class='add'>+	netdev-&gt;hard_start_xmit = &amp;atl2_xmit_frame;</div><div class='add'>+	netdev-&gt;get_stats = &amp;atl2_get_stats;</div><div class='add'>+	netdev-&gt;set_multicast_list = &amp;atl2_set_multi;</div><div class='add'>+	netdev-&gt;set_mac_address = &amp;atl2_set_mac;</div><div class='add'>+	netdev-&gt;change_mtu = &amp;atl2_change_mtu;</div><div class='add'>+	netdev-&gt;do_ioctl = &amp;atl2_ioctl;</div><div class='add'>+	atl2_set_ethtool_ops(netdev);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_NET_POLL_CONTROLLER</div><div class='add'>+	netdev-&gt;poll_controller = atl2_poll_controller;</div><div class='add'>+#endif</div><div class='add'>+#ifdef HAVE_TX_TIMEOUT</div><div class='add'>+	netdev-&gt;tx_timeout = &amp;atl2_tx_timeout;</div><div class='add'>+	netdev-&gt;watchdog_timeo = 5 * HZ;</div><div class='add'>+#endif</div><div class='add'>+#ifdef NETIF_F_HW_VLAN_TX</div><div class='add'>+	netdev-&gt;vlan_rx_register = atl2_vlan_rx_register;</div><div class='add'>+#endif</div><div class='add'>+	strncpy(netdev-&gt;name, pci_name(pdev), sizeof(netdev-&gt;name) - 1);</div><div class='add'>+</div><div class='add'>+	netdev-&gt;mem_start = mmio_start;</div><div class='add'>+	netdev-&gt;mem_end = mmio_start + mmio_len;</div><div class='add'>+	adapter-&gt;bd_number = cards_found;</div><div class='add'>+	adapter-&gt;pci_using_64 = false;</div><div class='add'>+</div><div class='add'>+	/* setup the private structure */</div><div class='add'>+	err = atl2_sw_init(adapter);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_sw_init;</div><div class='add'>+</div><div class='add'>+	err = -EIO;</div><div class='add'>+</div><div class='add'>+#ifdef NETIF_F_HW_VLAN_TX</div><div class='add'>+	netdev-&gt;features |= (NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* Init PHY as early as possible due to power saving issue  */</div><div class='add'>+	atl2_phy_init(&amp;adapter-&gt;hw);</div><div class='add'>+</div><div class='add'>+	/* reset the controller to</div><div class='add'>+	 * put the device in a known good starting state */</div><div class='add'>+</div><div class='add'>+	if (atl2_reset_hw(&amp;adapter-&gt;hw)) {</div><div class='add'>+		err = -EIO;</div><div class='add'>+		goto err_reset;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* copy the MAC address out of the EEPROM */</div><div class='add'>+	atl2_read_mac_addr(&amp;adapter-&gt;hw);</div><div class='add'>+	memcpy(netdev-&gt;dev_addr, adapter-&gt;hw.mac_addr, netdev-&gt;addr_len);</div><div class='add'>+/* FIXME: do we still need this? */</div><div class='add'>+#ifdef ETHTOOL_GPERMADDR</div><div class='add'>+	memcpy(netdev-&gt;perm_addr, adapter-&gt;hw.mac_addr, netdev-&gt;addr_len);</div><div class='add'>+</div><div class='add'>+	if (!is_valid_ether_addr(netdev-&gt;perm_addr)) {</div><div class='add'>+#else</div><div class='add'>+	if (!is_valid_ether_addr(netdev-&gt;dev_addr)) {</div><div class='add'>+#endif</div><div class='add'>+		err = -EIO;</div><div class='add'>+		goto err_eeprom;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	atl2_check_options(adapter);</div><div class='add'>+</div><div class='add'>+	init_timer(&amp;adapter-&gt;watchdog_timer);</div><div class='add'>+	adapter-&gt;watchdog_timer.function = &amp;atl2_watchdog;</div><div class='add'>+	adapter-&gt;watchdog_timer.data = (unsigned long) adapter;</div><div class='add'>+</div><div class='add'>+	init_timer(&amp;adapter-&gt;phy_config_timer);</div><div class='add'>+	adapter-&gt;phy_config_timer.function = &amp;atl2_phy_config;</div><div class='add'>+	adapter-&gt;phy_config_timer.data = (unsigned long) adapter;</div><div class='add'>+</div><div class='add'>+	INIT_WORK(&amp;adapter-&gt;reset_task, atl2_reset_task);</div><div class='add'>+	INIT_WORK(&amp;adapter-&gt;link_chg_task, atl2_link_chg_task);</div><div class='add'>+</div><div class='add'>+	strcpy(netdev-&gt;name, "eth%d"); /* ?? */</div><div class='add'>+	err = register_netdev(netdev);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_register;</div><div class='add'>+</div><div class='add'>+	/* assume we have no link for now */</div><div class='add'>+	netif_carrier_off(netdev);</div><div class='add'>+	netif_stop_queue(netdev);</div><div class='add'>+</div><div class='add'>+	cards_found++;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_reset:</div><div class='add'>+err_register:</div><div class='add'>+err_sw_init:</div><div class='add'>+err_eeprom:</div><div class='add'>+	iounmap(adapter-&gt;hw.hw_addr);</div><div class='add'>+err_ioremap:</div><div class='add'>+	free_netdev(netdev);</div><div class='add'>+err_alloc_etherdev:</div><div class='add'>+	pci_release_regions(pdev);</div><div class='add'>+err_pci_reg:</div><div class='add'>+err_dma:</div><div class='add'>+	pci_disable_device(pdev);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * atl2_remove - Device Removal Routine</div><div class='add'>+ * @pdev: PCI device information struct</div><div class='add'>+ *</div><div class='add'>+ * atl2_remove is called by the PCI subsystem to alert the driver</div><div class='add'>+ * that it should release a PCI device.  The could be caused by a</div><div class='add'>+ * Hot-Plug event, or because the driver is going to be removed from</div><div class='add'>+ * memory.</div><div class='add'>+ */</div><div class='add'>+/* FIXME: write the original MAC address back in case it was changed from a</div><div class='add'>+ * BIOS-set value, as in atl1 -- CHS */</div><div class='add'>+static void __devexit atl2_remove(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev = pci_get_drvdata(pdev);</div><div class='add'>+	struct atl2_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	/* flush_scheduled work may reschedule our watchdog task, so</div><div class='add'>+	 * explicitly disable watchdog tasks from being rescheduled  */</div><div class='add'>+	set_bit(__ATL2_DOWN, &amp;adapter-&gt;flags);</div><div class='add'>+</div><div class='add'>+	del_timer_sync(&amp;adapter-&gt;watchdog_timer);</div><div class='add'>+	del_timer_sync(&amp;adapter-&gt;phy_config_timer);</div><div class='add'>+</div><div class='add'>+	flush_scheduled_work();</div><div class='add'>+</div><div class='add'>+	unregister_netdev(netdev);</div><div class='add'>+</div><div class='add'>+	atl2_force_ps(&amp;adapter-&gt;hw);</div><div class='add'>+</div><div class='add'>+	iounmap(adapter-&gt;hw.hw_addr);</div><div class='add'>+	pci_release_regions(pdev);</div><div class='add'>+</div><div class='add'>+	free_netdev(netdev);</div><div class='add'>+</div><div class='add'>+	pci_disable_device(pdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int atl2_suspend(struct pci_dev *pdev, pm_message_t state)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev = pci_get_drvdata(pdev);</div><div class='add'>+	struct atl2_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+	struct atl2_hw *hw = &amp;adapter-&gt;hw;</div><div class='add'>+	u16 speed, duplex;</div><div class='add'>+	u32 ctrl = 0;</div><div class='add'>+	u32 wufc = adapter-&gt;wol;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+	int retval = 0;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	netif_device_detach(netdev);</div><div class='add'>+</div><div class='add'>+	if (netif_running(netdev)) {</div><div class='add'>+		WARN_ON(test_bit(__ATL2_RESETTING, &amp;adapter-&gt;flags));</div><div class='add'>+		atl2_down(adapter);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+	retval = pci_save_state(pdev);</div><div class='add'>+	if (retval)</div><div class='add'>+		return retval;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	atl2_read_phy_reg(hw, MII_BMSR, (u16 *)&amp;ctrl);</div><div class='add'>+	atl2_read_phy_reg(hw, MII_BMSR, (u16 *)&amp;ctrl);</div><div class='add'>+	if (ctrl &amp; BMSR_LSTATUS)</div><div class='add'>+		wufc &amp;= ~ATLX_WUFC_LNKC;</div><div class='add'>+</div><div class='add'>+	if (0 != (ctrl &amp; BMSR_LSTATUS) &amp;&amp; 0 != wufc) {</div><div class='add'>+		u32 ret_val;</div><div class='add'>+		/* get current link speed &amp; duplex */</div><div class='add'>+		ret_val = atl2_get_speed_and_duplex(hw, &amp;speed, &amp;duplex);</div><div class='add'>+		if (ret_val) {</div><div class='add'>+			printk(KERN_DEBUG</div><div class='add'>+				"%s: get speed&amp;duplex error while suspend\n",</div><div class='add'>+				atl2_driver_name);</div><div class='add'>+			goto wol_dis;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ctrl = 0;</div><div class='add'>+</div><div class='add'>+		/* turn on magic packet wol */</div><div class='add'>+		if (wufc &amp; ATLX_WUFC_MAG)</div><div class='add'>+			ctrl |= (WOL_MAGIC_EN | WOL_MAGIC_PME_EN);</div><div class='add'>+</div><div class='add'>+		/* ignore Link Chg event when Link is up */</div><div class='add'>+		ATL2_WRITE_REG(hw, REG_WOL_CTRL, ctrl);</div><div class='add'>+</div><div class='add'>+		/* Config MAC CTRL Register */</div><div class='add'>+		ctrl = MAC_CTRL_RX_EN | MAC_CTRL_MACLP_CLK_PHY;</div><div class='add'>+		if (FULL_DUPLEX == adapter-&gt;link_duplex)</div><div class='add'>+			ctrl |= MAC_CTRL_DUPLX;</div><div class='add'>+		ctrl |= (MAC_CTRL_ADD_CRC | MAC_CTRL_PAD);</div><div class='add'>+		ctrl |= (((u32)adapter-&gt;hw.preamble_len &amp;</div><div class='add'>+			MAC_CTRL_PRMLEN_MASK) &lt;&lt; MAC_CTRL_PRMLEN_SHIFT);</div><div class='add'>+		ctrl |= (((u32)(adapter-&gt;hw.retry_buf &amp;</div><div class='add'>+			MAC_CTRL_HALF_LEFT_BUF_MASK)) &lt;&lt;</div><div class='add'>+			MAC_CTRL_HALF_LEFT_BUF_SHIFT);</div><div class='add'>+		if (wufc &amp; ATLX_WUFC_MAG) {</div><div class='add'>+			/* magic packet maybe Broadcast&amp;multicast&amp;Unicast */</div><div class='add'>+			ctrl |= MAC_CTRL_BC_EN;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ATL2_WRITE_REG(hw, REG_MAC_CTRL, ctrl);</div><div class='add'>+</div><div class='add'>+		/* pcie patch */</div><div class='add'>+		ctrl = ATL2_READ_REG(hw, REG_PCIE_PHYMISC);</div><div class='add'>+		ctrl |= PCIE_PHYMISC_FORCE_RCV_DET;</div><div class='add'>+		ATL2_WRITE_REG(hw, REG_PCIE_PHYMISC, ctrl);</div><div class='add'>+		ctrl = ATL2_READ_REG(hw, REG_PCIE_DLL_TX_CTRL1);</div><div class='add'>+		ctrl |= PCIE_DLL_TX_CTRL1_SEL_NOR_CLK;</div><div class='add'>+		ATL2_WRITE_REG(hw, REG_PCIE_DLL_TX_CTRL1, ctrl);</div><div class='add'>+</div><div class='add'>+		pci_enable_wake(pdev, pci_choose_state(pdev, state), 1);</div><div class='add'>+		goto suspend_exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (0 == (ctrl&amp;BMSR_LSTATUS) &amp;&amp; 0 != (wufc&amp;ATLX_WUFC_LNKC)) {</div><div class='add'>+		/* link is down, so only LINK CHG WOL event enable */</div><div class='add'>+		ctrl |= (WOL_LINK_CHG_EN | WOL_LINK_CHG_PME_EN);</div><div class='add'>+		ATL2_WRITE_REG(hw, REG_WOL_CTRL, ctrl);</div><div class='add'>+		ATL2_WRITE_REG(hw, REG_MAC_CTRL, 0);</div><div class='add'>+</div><div class='add'>+		/* pcie patch */</div><div class='add'>+		ctrl = ATL2_READ_REG(hw, REG_PCIE_PHYMISC);</div><div class='add'>+		ctrl |= PCIE_PHYMISC_FORCE_RCV_DET;</div><div class='add'>+		ATL2_WRITE_REG(hw, REG_PCIE_PHYMISC, ctrl);</div><div class='add'>+		ctrl = ATL2_READ_REG(hw, REG_PCIE_DLL_TX_CTRL1);</div><div class='add'>+		ctrl |= PCIE_DLL_TX_CTRL1_SEL_NOR_CLK;</div><div class='add'>+		ATL2_WRITE_REG(hw, REG_PCIE_DLL_TX_CTRL1, ctrl);</div><div class='add'>+</div><div class='add'>+		hw-&gt;phy_configured = false; /* re-init PHY when resume */</div><div class='add'>+</div><div class='add'>+		pci_enable_wake(pdev, pci_choose_state(pdev, state), 1);</div><div class='add'>+</div><div class='add'>+		goto suspend_exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+wol_dis:</div><div class='add'>+	/* WOL disabled */</div><div class='add'>+	ATL2_WRITE_REG(hw, REG_WOL_CTRL, 0);</div><div class='add'>+</div><div class='add'>+	/* pcie patch */</div><div class='add'>+	ctrl = ATL2_READ_REG(hw, REG_PCIE_PHYMISC);</div><div class='add'>+	ctrl |= PCIE_PHYMISC_FORCE_RCV_DET;</div><div class='add'>+	ATL2_WRITE_REG(hw, REG_PCIE_PHYMISC, ctrl);</div><div class='add'>+	ctrl = ATL2_READ_REG(hw, REG_PCIE_DLL_TX_CTRL1);</div><div class='add'>+	ctrl |= PCIE_DLL_TX_CTRL1_SEL_NOR_CLK;</div><div class='add'>+	ATL2_WRITE_REG(hw, REG_PCIE_DLL_TX_CTRL1, ctrl);</div><div class='add'>+</div><div class='add'>+	atl2_force_ps(hw);</div><div class='add'>+	hw-&gt;phy_configured = false; /* re-init PHY when resume */</div><div class='add'>+</div><div class='add'>+	pci_enable_wake(pdev, pci_choose_state(pdev, state), 0);</div><div class='add'>+</div><div class='add'>+suspend_exit:</div><div class='add'>+	if (netif_running(netdev))</div><div class='add'>+		atl2_free_irq(adapter);</div><div class='add'>+</div><div class='add'>+	pci_disable_device(pdev);</div><div class='add'>+</div><div class='add'>+	pci_set_power_state(pdev, pci_choose_state(pdev, state));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+static int atl2_resume(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev = pci_get_drvdata(pdev);</div><div class='add'>+	struct atl2_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+	u32 err;</div><div class='add'>+</div><div class='add'>+	pci_set_power_state(pdev, PCI_D0);</div><div class='add'>+	pci_restore_state(pdev);</div><div class='add'>+</div><div class='add'>+	err = pci_enable_device(pdev);</div><div class='add'>+	if (err) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+			"atl2: Cannot enable PCI device from suspend\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pci_set_master(pdev);</div><div class='add'>+</div><div class='add'>+	ATL2_READ_REG(&amp;adapter-&gt;hw, REG_WOL_CTRL); /* clear WOL status */</div><div class='add'>+</div><div class='add'>+	pci_enable_wake(pdev, PCI_D3hot, 0);</div><div class='add'>+	pci_enable_wake(pdev, PCI_D3cold, 0);</div><div class='add'>+</div><div class='add'>+	ATL2_WRITE_REG(&amp;adapter-&gt;hw, REG_WOL_CTRL, 0);</div><div class='add'>+</div><div class='add'>+	err = atl2_request_irq(adapter);</div><div class='add'>+	if (netif_running(netdev) &amp;&amp; err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	atl2_reset_hw(&amp;adapter-&gt;hw);</div><div class='add'>+</div><div class='add'>+	if (netif_running(netdev))</div><div class='add'>+		atl2_up(adapter);</div><div class='add'>+</div><div class='add'>+	netif_device_attach(netdev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static void atl2_shutdown(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	atl2_suspend(pdev, PMSG_SUSPEND);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct pci_driver atl2_driver = {</div><div class='add'>+	.name     = atl2_driver_name,</div><div class='add'>+	.id_table = atl2_pci_tbl,</div><div class='add'>+	.probe    = atl2_probe,</div><div class='add'>+	.remove   = __devexit_p(atl2_remove),</div><div class='add'>+	/* Power Managment Hooks */</div><div class='add'>+	.suspend  = atl2_suspend,</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+	.resume   = atl2_resume,</div><div class='add'>+#endif</div><div class='add'>+	.shutdown = atl2_shutdown,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * atl2_init_module - Driver Registration Routine</div><div class='add'>+ *</div><div class='add'>+ * atl2_init_module is the first routine called when the driver is</div><div class='add'>+ * loaded. All it does is register with the PCI subsystem.</div><div class='add'>+ */</div><div class='add'>+static int __init atl2_init_module(void)</div><div class='add'>+{</div><div class='add'>+	printk(KERN_INFO "%s - version %s\n", atl2_driver_string,</div><div class='add'>+		atl2_driver_version);</div><div class='add'>+	printk(KERN_INFO "%s\n", atl2_copyright);</div><div class='add'>+	return pci_register_driver(&amp;atl2_driver);</div><div class='add'>+}</div><div class='add'>+module_init(atl2_init_module);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * atl2_exit_module - Driver Exit Cleanup Routine</div><div class='add'>+ *</div><div class='add'>+ * atl2_exit_module is called just before the driver is removed</div><div class='add'>+ * from memory.</div><div class='add'>+ */</div><div class='add'>+static void __exit atl2_exit_module(void)</div><div class='add'>+{</div><div class='add'>+	pci_unregister_driver(&amp;atl2_driver);</div><div class='add'>+}</div><div class='add'>+module_exit(atl2_exit_module);</div><div class='add'>+</div><div class='add'>+static void atl2_read_pci_cfg(struct atl2_hw *hw, u32 reg, u16 *value)</div><div class='add'>+{</div><div class='add'>+	struct atl2_adapter *adapter = hw-&gt;back;</div><div class='add'>+	pci_read_config_word(adapter-&gt;pdev, reg, value);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void atl2_write_pci_cfg(struct atl2_hw *hw, u32 reg, u16 *value)</div><div class='add'>+{</div><div class='add'>+	struct atl2_adapter *adapter = hw-&gt;back;</div><div class='add'>+	pci_write_config_word(adapter-&gt;pdev, reg, *value);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int atl2_get_settings(struct net_device *netdev,</div><div class='add'>+	struct ethtool_cmd *ecmd)</div><div class='add'>+{</div><div class='add'>+	struct atl2_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+	struct atl2_hw *hw = &amp;adapter-&gt;hw;</div><div class='add'>+</div><div class='add'>+	ecmd-&gt;supported = (SUPPORTED_10baseT_Half |</div><div class='add'>+		SUPPORTED_10baseT_Full |</div><div class='add'>+		SUPPORTED_100baseT_Half |</div><div class='add'>+		SUPPORTED_100baseT_Full |</div><div class='add'>+		SUPPORTED_Autoneg |</div><div class='add'>+		SUPPORTED_TP);</div><div class='add'>+	ecmd-&gt;advertising = ADVERTISED_TP;</div><div class='add'>+</div><div class='add'>+	ecmd-&gt;advertising |= ADVERTISED_Autoneg;</div><div class='add'>+	ecmd-&gt;advertising |= hw-&gt;autoneg_advertised;</div><div class='add'>+</div><div class='add'>+	ecmd-&gt;port = PORT_TP;</div><div class='add'>+	ecmd-&gt;phy_address = 0;</div><div class='add'>+	ecmd-&gt;transceiver = XCVR_INTERNAL;</div><div class='add'>+</div><div class='add'>+	if (adapter-&gt;link_speed != SPEED_0) {</div><div class='add'>+		ecmd-&gt;speed = adapter-&gt;link_speed;</div><div class='add'>+		if (adapter-&gt;link_duplex == FULL_DUPLEX)</div><div class='add'>+			ecmd-&gt;duplex = DUPLEX_FULL;</div><div class='add'>+		else</div><div class='add'>+			ecmd-&gt;duplex = DUPLEX_HALF;</div><div class='add'>+	} else {</div><div class='add'>+		ecmd-&gt;speed = -1;</div><div class='add'>+		ecmd-&gt;duplex = -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ecmd-&gt;autoneg = AUTONEG_ENABLE;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int atl2_set_settings(struct net_device *netdev,</div><div class='add'>+	struct ethtool_cmd *ecmd)</div><div class='add'>+{</div><div class='add'>+	struct atl2_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+	struct atl2_hw *hw = &amp;adapter-&gt;hw;</div><div class='add'>+</div><div class='add'>+	while (test_and_set_bit(__ATL2_RESETTING, &amp;adapter-&gt;flags))</div><div class='add'>+		msleep(1);</div><div class='add'>+</div><div class='add'>+	if (ecmd-&gt;autoneg == AUTONEG_ENABLE) {</div><div class='add'>+#define MY_ADV_MASK	(ADVERTISE_10_HALF | \</div><div class='add'>+			 ADVERTISE_10_FULL | \</div><div class='add'>+			 ADVERTISE_100_HALF| \</div><div class='add'>+			 ADVERTISE_100_FULL)</div><div class='add'>+</div><div class='add'>+		if ((ecmd-&gt;advertising &amp; MY_ADV_MASK) == MY_ADV_MASK) {</div><div class='add'>+			hw-&gt;MediaType = MEDIA_TYPE_AUTO_SENSOR;</div><div class='add'>+			hw-&gt;autoneg_advertised =  MY_ADV_MASK;</div><div class='add'>+		} else if ((ecmd-&gt;advertising &amp; MY_ADV_MASK) ==</div><div class='add'>+				ADVERTISE_100_FULL) {</div><div class='add'>+			hw-&gt;MediaType = MEDIA_TYPE_100M_FULL;</div><div class='add'>+			hw-&gt;autoneg_advertised = ADVERTISE_100_FULL;</div><div class='add'>+		} else if ((ecmd-&gt;advertising &amp; MY_ADV_MASK) ==</div><div class='add'>+				ADVERTISE_100_HALF) {</div><div class='add'>+			hw-&gt;MediaType = MEDIA_TYPE_100M_HALF;</div><div class='add'>+			hw-&gt;autoneg_advertised = ADVERTISE_100_HALF;</div><div class='add'>+		} else if ((ecmd-&gt;advertising &amp; MY_ADV_MASK) ==</div><div class='add'>+				ADVERTISE_10_FULL) {</div><div class='add'>+			hw-&gt;MediaType = MEDIA_TYPE_10M_FULL;</div><div class='add'>+			hw-&gt;autoneg_advertised = ADVERTISE_10_FULL;</div><div class='add'>+		}  else if ((ecmd-&gt;advertising &amp; MY_ADV_MASK) ==</div><div class='add'>+				ADVERTISE_10_HALF) {</div><div class='add'>+			hw-&gt;MediaType = MEDIA_TYPE_10M_HALF;</div><div class='add'>+			hw-&gt;autoneg_advertised = ADVERTISE_10_HALF;</div><div class='add'>+		} else {</div><div class='add'>+			clear_bit(__ATL2_RESETTING, &amp;adapter-&gt;flags);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		ecmd-&gt;advertising = hw-&gt;autoneg_advertised |</div><div class='add'>+			ADVERTISED_TP | ADVERTISED_Autoneg;</div><div class='add'>+	} else {</div><div class='add'>+		clear_bit(__ATL2_RESETTING, &amp;adapter-&gt;flags);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* reset the link */</div><div class='add'>+	if (netif_running(adapter-&gt;netdev)) {</div><div class='add'>+		atl2_down(adapter);</div><div class='add'>+		atl2_up(adapter);</div><div class='add'>+	} else</div><div class='add'>+		atl2_reset_hw(&amp;adapter-&gt;hw);</div><div class='add'>+</div><div class='add'>+	clear_bit(__ATL2_RESETTING, &amp;adapter-&gt;flags);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 atl2_get_tx_csum(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	return (netdev-&gt;features &amp; NETIF_F_HW_CSUM) != 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 atl2_get_msglevel(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * It's sane for this to be empty, but we might want to take advantage of this.</div><div class='add'>+ */</div><div class='add'>+static void atl2_set_msglevel(struct net_device *netdev, u32 data)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int atl2_get_regs_len(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+#define ATL2_REGS_LEN 42</div><div class='add'>+	return sizeof(u32) * ATL2_REGS_LEN;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void atl2_get_regs(struct net_device *netdev,</div><div class='add'>+	struct ethtool_regs *regs, void *p)</div><div class='add'>+{</div><div class='add'>+	struct atl2_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+	struct atl2_hw *hw = &amp;adapter-&gt;hw;</div><div class='add'>+	u32 *regs_buff = p;</div><div class='add'>+	u16 phy_data;</div><div class='add'>+</div><div class='add'>+	memset(p, 0, sizeof(u32) * ATL2_REGS_LEN);</div><div class='add'>+</div><div class='add'>+	regs-&gt;version = (1 &lt;&lt; 24) | (hw-&gt;revision_id &lt;&lt; 16) | hw-&gt;device_id;</div><div class='add'>+</div><div class='add'>+	regs_buff[0]  = ATL2_READ_REG(hw, REG_VPD_CAP);</div><div class='add'>+	regs_buff[1]  = ATL2_READ_REG(hw, REG_SPI_FLASH_CTRL);</div><div class='add'>+	regs_buff[2]  = ATL2_READ_REG(hw, REG_SPI_FLASH_CONFIG);</div><div class='add'>+	regs_buff[3]  = ATL2_READ_REG(hw, REG_TWSI_CTRL);</div><div class='add'>+	regs_buff[4]  = ATL2_READ_REG(hw, REG_PCIE_DEV_MISC_CTRL);</div><div class='add'>+	regs_buff[5]  = ATL2_READ_REG(hw, REG_MASTER_CTRL);</div><div class='add'>+	regs_buff[6]  = ATL2_READ_REG(hw, REG_MANUAL_TIMER_INIT);</div><div class='add'>+	regs_buff[7]  = ATL2_READ_REG(hw, REG_IRQ_MODU_TIMER_INIT);</div><div class='add'>+	regs_buff[8]  = ATL2_READ_REG(hw, REG_PHY_ENABLE);</div><div class='add'>+	regs_buff[9]  = ATL2_READ_REG(hw, REG_CMBDISDMA_TIMER);</div><div class='add'>+	regs_buff[10] = ATL2_READ_REG(hw, REG_IDLE_STATUS);</div><div class='add'>+	regs_buff[11] = ATL2_READ_REG(hw, REG_MDIO_CTRL);</div><div class='add'>+	regs_buff[12] = ATL2_READ_REG(hw, REG_SERDES_LOCK);</div><div class='add'>+	regs_buff[13] = ATL2_READ_REG(hw, REG_MAC_CTRL);</div><div class='add'>+	regs_buff[14] = ATL2_READ_REG(hw, REG_MAC_IPG_IFG);</div><div class='add'>+	regs_buff[15] = ATL2_READ_REG(hw, REG_MAC_STA_ADDR);</div><div class='add'>+	regs_buff[16] = ATL2_READ_REG(hw, REG_MAC_STA_ADDR+4);</div><div class='add'>+	regs_buff[17] = ATL2_READ_REG(hw, REG_RX_HASH_TABLE);</div><div class='add'>+	regs_buff[18] = ATL2_READ_REG(hw, REG_RX_HASH_TABLE+4);</div><div class='add'>+	regs_buff[19] = ATL2_READ_REG(hw, REG_MAC_HALF_DUPLX_CTRL);</div><div class='add'>+	regs_buff[20] = ATL2_READ_REG(hw, REG_MTU);</div><div class='add'>+	regs_buff[21] = ATL2_READ_REG(hw, REG_WOL_CTRL);</div><div class='add'>+	regs_buff[22] = ATL2_READ_REG(hw, REG_SRAM_TXRAM_END);</div><div class='add'>+	regs_buff[23] = ATL2_READ_REG(hw, REG_DESC_BASE_ADDR_HI);</div><div class='add'>+	regs_buff[24] = ATL2_READ_REG(hw, REG_TXD_BASE_ADDR_LO);</div><div class='add'>+	regs_buff[25] = ATL2_READ_REG(hw, REG_TXD_MEM_SIZE);</div><div class='add'>+	regs_buff[26] = ATL2_READ_REG(hw, REG_TXS_BASE_ADDR_LO);</div><div class='add'>+	regs_buff[27] = ATL2_READ_REG(hw, REG_TXS_MEM_SIZE);</div><div class='add'>+	regs_buff[28] = ATL2_READ_REG(hw, REG_RXD_BASE_ADDR_LO);</div><div class='add'>+	regs_buff[29] = ATL2_READ_REG(hw, REG_RXD_BUF_NUM);</div><div class='add'>+	regs_buff[30] = ATL2_READ_REG(hw, REG_DMAR);</div><div class='add'>+	regs_buff[31] = ATL2_READ_REG(hw, REG_TX_CUT_THRESH);</div><div class='add'>+	regs_buff[32] = ATL2_READ_REG(hw, REG_DMAW);</div><div class='add'>+	regs_buff[33] = ATL2_READ_REG(hw, REG_PAUSE_ON_TH);</div><div class='add'>+	regs_buff[34] = ATL2_READ_REG(hw, REG_PAUSE_OFF_TH);</div><div class='add'>+	regs_buff[35] = ATL2_READ_REG(hw, REG_MB_TXD_WR_IDX);</div><div class='add'>+	regs_buff[36] = ATL2_READ_REG(hw, REG_MB_RXD_RD_IDX);</div><div class='add'>+	regs_buff[38] = ATL2_READ_REG(hw, REG_ISR);</div><div class='add'>+	regs_buff[39] = ATL2_READ_REG(hw, REG_IMR);</div><div class='add'>+</div><div class='add'>+	atl2_read_phy_reg(hw, MII_BMCR, &amp;phy_data);</div><div class='add'>+	regs_buff[40] = (u32)phy_data;</div><div class='add'>+	atl2_read_phy_reg(hw, MII_BMSR, &amp;phy_data);</div><div class='add'>+	regs_buff[41] = (u32)phy_data;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int atl2_get_eeprom_len(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct atl2_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	if (!atl2_check_eeprom_exist(&amp;adapter-&gt;hw))</div><div class='add'>+		return 512;</div><div class='add'>+	else</div><div class='add'>+		return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int atl2_get_eeprom(struct net_device *netdev,</div><div class='add'>+	struct ethtool_eeprom *eeprom, u8 *bytes)</div><div class='add'>+{</div><div class='add'>+	struct atl2_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+	struct atl2_hw *hw = &amp;adapter-&gt;hw;</div><div class='add'>+	u32 *eeprom_buff;</div><div class='add'>+	int first_dword, last_dword;</div><div class='add'>+	int ret_val = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (eeprom-&gt;len == 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (atl2_check_eeprom_exist(hw))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	eeprom-&gt;magic = hw-&gt;vendor_id | (hw-&gt;device_id &lt;&lt; 16);</div><div class='add'>+</div><div class='add'>+	first_dword = eeprom-&gt;offset &gt;&gt; 2;</div><div class='add'>+	last_dword = (eeprom-&gt;offset + eeprom-&gt;len - 1) &gt;&gt; 2;</div><div class='add'>+</div><div class='add'>+	eeprom_buff = kmalloc(sizeof(u32) * (last_dword - first_dword + 1),</div><div class='add'>+		GFP_KERNEL);</div><div class='add'>+	if (!eeprom_buff)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	for (i = first_dword; i &lt; last_dword; i++) {</div><div class='add'>+		if (!atl2_read_eeprom(hw, i*4, &amp;(eeprom_buff[i-first_dword])))</div><div class='add'>+			return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(bytes, (u8 *)eeprom_buff + (eeprom-&gt;offset &amp; 3),</div><div class='add'>+		eeprom-&gt;len);</div><div class='add'>+	kfree(eeprom_buff);</div><div class='add'>+</div><div class='add'>+	return ret_val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int atl2_set_eeprom(struct net_device *netdev,</div><div class='add'>+	struct ethtool_eeprom *eeprom, u8 *bytes)</div><div class='add'>+{</div><div class='add'>+	struct atl2_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+	struct atl2_hw *hw = &amp;adapter-&gt;hw;</div><div class='add'>+	u32 *eeprom_buff;</div><div class='add'>+	u32 *ptr;</div><div class='add'>+	int max_len, first_dword, last_dword, ret_val = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (eeprom-&gt;len == 0)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (eeprom-&gt;magic != (hw-&gt;vendor_id | (hw-&gt;device_id &lt;&lt; 16)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	max_len = 512;</div><div class='add'>+</div><div class='add'>+	first_dword = eeprom-&gt;offset &gt;&gt; 2;</div><div class='add'>+	last_dword = (eeprom-&gt;offset + eeprom-&gt;len - 1) &gt;&gt; 2;</div><div class='add'>+	eeprom_buff = kmalloc(max_len, GFP_KERNEL);</div><div class='add'>+	if (!eeprom_buff)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ptr = (u32 *)eeprom_buff;</div><div class='add'>+</div><div class='add'>+	if (eeprom-&gt;offset &amp; 3) {</div><div class='add'>+		/* need read/modify/write of first changed EEPROM word */</div><div class='add'>+		/* only the second byte of the word is being modified */</div><div class='add'>+		if (!atl2_read_eeprom(hw, first_dword*4, &amp;(eeprom_buff[0])))</div><div class='add'>+			return -EIO;</div><div class='add'>+		ptr++;</div><div class='add'>+	}</div><div class='add'>+	if (((eeprom-&gt;offset + eeprom-&gt;len) &amp; 3)) {</div><div class='add'>+		/*</div><div class='add'>+		 * need read/modify/write of last changed EEPROM word</div><div class='add'>+		 * only the first byte of the word is being modified</div><div class='add'>+		 */</div><div class='add'>+		if (!atl2_read_eeprom(hw, last_dword * 4,</div><div class='add'>+			&amp;(eeprom_buff[last_dword - first_dword])))</div><div class='add'>+			return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Device's eeprom is always little-endian, word addressable */</div><div class='add'>+	memcpy(ptr, bytes, eeprom-&gt;len);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; last_dword - first_dword + 1; i++) {</div><div class='add'>+		if (!atl2_write_eeprom(hw, ((first_dword+i)*4), eeprom_buff[i]))</div><div class='add'>+			return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kfree(eeprom_buff);</div><div class='add'>+	return ret_val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void atl2_get_drvinfo(struct net_device *netdev,</div><div class='add'>+	struct ethtool_drvinfo *drvinfo)</div><div class='add'>+{</div><div class='add'>+	struct atl2_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	strncpy(drvinfo-&gt;driver,  atl2_driver_name, 32);</div><div class='add'>+	strncpy(drvinfo-&gt;version, atl2_driver_version, 32);</div><div class='add'>+	strncpy(drvinfo-&gt;fw_version, "L2", 32);</div><div class='add'>+	strncpy(drvinfo-&gt;bus_info, pci_name(adapter-&gt;pdev), 32);</div><div class='add'>+	drvinfo-&gt;n_stats = 0;</div><div class='add'>+	drvinfo-&gt;testinfo_len = 0;</div><div class='add'>+	drvinfo-&gt;regdump_len = atl2_get_regs_len(netdev);</div><div class='add'>+	drvinfo-&gt;eedump_len = atl2_get_eeprom_len(netdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void atl2_get_wol(struct net_device *netdev,</div><div class='add'>+	struct ethtool_wolinfo *wol)</div><div class='add'>+{</div><div class='add'>+	struct atl2_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	wol-&gt;supported = WAKE_MAGIC;</div><div class='add'>+	wol-&gt;wolopts = 0;</div><div class='add'>+</div><div class='add'>+	if (adapter-&gt;wol &amp; ATLX_WUFC_EX)</div><div class='add'>+		wol-&gt;wolopts |= WAKE_UCAST;</div><div class='add'>+	if (adapter-&gt;wol &amp; ATLX_WUFC_MC)</div><div class='add'>+		wol-&gt;wolopts |= WAKE_MCAST;</div><div class='add'>+	if (adapter-&gt;wol &amp; ATLX_WUFC_BC)</div><div class='add'>+		wol-&gt;wolopts |= WAKE_BCAST;</div><div class='add'>+	if (adapter-&gt;wol &amp; ATLX_WUFC_MAG)</div><div class='add'>+		wol-&gt;wolopts |= WAKE_MAGIC;</div><div class='add'>+	if (adapter-&gt;wol &amp; ATLX_WUFC_LNKC)</div><div class='add'>+		wol-&gt;wolopts |= WAKE_PHY;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int atl2_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)</div><div class='add'>+{</div><div class='add'>+	struct atl2_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	if (wol-&gt;wolopts &amp; (WAKE_ARP | WAKE_MAGICSECURE))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (wol-&gt;wolopts &amp; (WAKE_MCAST|WAKE_BCAST|WAKE_MCAST))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	/* these settings will always override what we currently have */</div><div class='add'>+	adapter-&gt;wol = 0;</div><div class='add'>+</div><div class='add'>+	if (wol-&gt;wolopts &amp; WAKE_MAGIC)</div><div class='add'>+		adapter-&gt;wol |= ATLX_WUFC_MAG;</div><div class='add'>+	if (wol-&gt;wolopts &amp; WAKE_PHY)</div><div class='add'>+		adapter-&gt;wol |= ATLX_WUFC_LNKC;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int atl2_nway_reset(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct atl2_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+	if (netif_running(netdev))</div><div class='add'>+		atl2_reinit_locked(adapter);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct ethtool_ops atl2_ethtool_ops = {</div><div class='add'>+	.get_settings		= atl2_get_settings,</div><div class='add'>+	.set_settings		= atl2_set_settings,</div><div class='add'>+	.get_drvinfo		= atl2_get_drvinfo,</div><div class='add'>+	.get_regs_len		= atl2_get_regs_len,</div><div class='add'>+	.get_regs		= atl2_get_regs,</div><div class='add'>+	.get_wol		= atl2_get_wol,</div><div class='add'>+	.set_wol		= atl2_set_wol,</div><div class='add'>+	.get_msglevel		= atl2_get_msglevel,</div><div class='add'>+	.set_msglevel		= atl2_set_msglevel,</div><div class='add'>+	.nway_reset		= atl2_nway_reset,</div><div class='add'>+	.get_link		= ethtool_op_get_link,</div><div class='add'>+	.get_eeprom_len		= atl2_get_eeprom_len,</div><div class='add'>+	.get_eeprom		= atl2_get_eeprom,</div><div class='add'>+	.set_eeprom		= atl2_set_eeprom,</div><div class='add'>+	.get_tx_csum		= atl2_get_tx_csum,</div><div class='add'>+	.get_sg			= ethtool_op_get_sg,</div><div class='add'>+	.set_sg			= ethtool_op_set_sg,</div><div class='add'>+#ifdef NETIF_F_TSO</div><div class='add'>+	.get_tso		= ethtool_op_get_tso,</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void atl2_set_ethtool_ops(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	SET_ETHTOOL_OPS(netdev, &amp;atl2_ethtool_ops);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define LBYTESWAP(a)  ((((a) &amp; 0x00ff00ff) &lt;&lt; 8) | \</div><div class='add'>+	(((a) &amp; 0xff00ff00) &gt;&gt; 8))</div><div class='add'>+#define LONGSWAP(a)   ((LBYTESWAP(a) &lt;&lt; 16) | (LBYTESWAP(a) &gt;&gt; 16))</div><div class='add'>+#define SHORTSWAP(a)  (((a) &lt;&lt; 8) | ((a) &gt;&gt; 8))</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Reset the transmit and receive units; mask and clear all interrupts.</div><div class='add'>+ *</div><div class='add'>+ * hw - Struct containing variables accessed by shared code</div><div class='add'>+ * return : 0  or  idle status (if error)</div><div class='add'>+ */</div><div class='add'>+static s32 atl2_reset_hw(struct atl2_hw *hw)</div><div class='add'>+{</div><div class='add'>+	u32 icr;</div><div class='add'>+	u16 pci_cfg_cmd_word;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* Workaround for PCI problem when BIOS sets MMRBC incorrectly. */</div><div class='add'>+	atl2_read_pci_cfg(hw, PCI_REG_COMMAND, &amp;pci_cfg_cmd_word);</div><div class='add'>+	if ((pci_cfg_cmd_word &amp;</div><div class='add'>+		(CMD_IO_SPACE|CMD_MEMORY_SPACE|CMD_BUS_MASTER)) !=</div><div class='add'>+		(CMD_IO_SPACE|CMD_MEMORY_SPACE|CMD_BUS_MASTER)) {</div><div class='add'>+		pci_cfg_cmd_word |=</div><div class='add'>+			(CMD_IO_SPACE|CMD_MEMORY_SPACE|CMD_BUS_MASTER);</div><div class='add'>+		atl2_write_pci_cfg(hw, PCI_REG_COMMAND, &amp;pci_cfg_cmd_word);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Clear Interrupt mask to stop board from generating</div><div class='add'>+	 * interrupts &amp; Clear any pending interrupt events</div><div class='add'>+	 */</div><div class='add'>+	/* FIXME */</div><div class='add'>+	/* ATL2_WRITE_REG(hw, REG_IMR, 0); */</div><div class='add'>+	/* ATL2_WRITE_REG(hw, REG_ISR, 0xffffffff); */</div><div class='add'>+</div><div class='add'>+	/* Issue Soft Reset to the MAC.  This will reset the chip's</div><div class='add'>+	 * transmit, receive, DMA.  It will not effect</div><div class='add'>+	 * the current PCI configuration.  The global reset bit is self-</div><div class='add'>+	 * clearing, and should clear within a microsecond.</div><div class='add'>+	 */</div><div class='add'>+	ATL2_WRITE_REG(hw, REG_MASTER_CTRL, MASTER_CTRL_SOFT_RST);</div><div class='add'>+	wmb();</div><div class='add'>+	msleep(1); /* delay about 1ms */</div><div class='add'>+</div><div class='add'>+	/* Wait at least 10ms for All module to be Idle */</div><div class='add'>+	for (i = 0; i &lt; 10; i++) {</div><div class='add'>+		icr = ATL2_READ_REG(hw, REG_IDLE_STATUS);</div><div class='add'>+		if (!icr)</div><div class='add'>+			break;</div><div class='add'>+		msleep(1); /* delay 1 ms */</div><div class='add'>+		cpu_relax();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (icr)</div><div class='add'>+		return icr;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define CUSTOM_SPI_CS_SETUP        2</div><div class='add'>+#define CUSTOM_SPI_CLK_HI          2</div><div class='add'>+#define CUSTOM_SPI_CLK_LO          2</div><div class='add'>+#define CUSTOM_SPI_CS_HOLD         2</div><div class='add'>+#define CUSTOM_SPI_CS_HI           3</div><div class='add'>+</div><div class='add'>+static struct atl2_spi_flash_dev flash_table[] =</div><div class='add'>+{</div><div class='add'>+/* MFR    WRSR  READ  PROGRAM WREN  WRDI  RDSR  RDID  SECTOR_ERASE CHIP_ERASE */</div><div class='add'>+{"Atmel", 0x0,  0x03, 0x02,   0x06, 0x04, 0x05, 0x15, 0x52,        0x62 },</div><div class='add'>+{"SST",   0x01, 0x03, 0x02,   0x06, 0x04, 0x05, 0x90, 0x20,        0x60 },</div><div class='add'>+{"ST",    0x01, 0x03, 0x02,   0x06, 0x04, 0x05, 0xAB, 0xD8,        0xC7 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static bool atl2_spi_read(struct atl2_hw *hw, u32 addr, u32 *buf)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	u32 value;</div><div class='add'>+</div><div class='add'>+	ATL2_WRITE_REG(hw, REG_SPI_DATA, 0);</div><div class='add'>+	ATL2_WRITE_REG(hw, REG_SPI_ADDR, addr);</div><div class='add'>+</div><div class='add'>+	value = SPI_FLASH_CTRL_WAIT_READY |</div><div class='add'>+		(CUSTOM_SPI_CS_SETUP &amp; SPI_FLASH_CTRL_CS_SETUP_MASK) &lt;&lt;</div><div class='add'>+			SPI_FLASH_CTRL_CS_SETUP_SHIFT |</div><div class='add'>+		(CUSTOM_SPI_CLK_HI &amp; SPI_FLASH_CTRL_CLK_HI_MASK) &lt;&lt;</div><div class='add'>+			SPI_FLASH_CTRL_CLK_HI_SHIFT |</div><div class='add'>+		(CUSTOM_SPI_CLK_LO &amp; SPI_FLASH_CTRL_CLK_LO_MASK) &lt;&lt;</div><div class='add'>+			SPI_FLASH_CTRL_CLK_LO_SHIFT |</div><div class='add'>+		(CUSTOM_SPI_CS_HOLD &amp; SPI_FLASH_CTRL_CS_HOLD_MASK) &lt;&lt;</div><div class='add'>+			SPI_FLASH_CTRL_CS_HOLD_SHIFT |</div><div class='add'>+		(CUSTOM_SPI_CS_HI &amp; SPI_FLASH_CTRL_CS_HI_MASK) &lt;&lt;</div><div class='add'>+			SPI_FLASH_CTRL_CS_HI_SHIFT |</div><div class='add'>+		(0x1 &amp; SPI_FLASH_CTRL_INS_MASK) &lt;&lt; SPI_FLASH_CTRL_INS_SHIFT;</div><div class='add'>+</div><div class='add'>+	ATL2_WRITE_REG(hw, REG_SPI_FLASH_CTRL, value);</div><div class='add'>+</div><div class='add'>+	value |= SPI_FLASH_CTRL_START;</div><div class='add'>+</div><div class='add'>+	ATL2_WRITE_REG(hw, REG_SPI_FLASH_CTRL, value);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 10; i++) {</div><div class='add'>+		msleep(1);</div><div class='add'>+		value = ATL2_READ_REG(hw, REG_SPI_FLASH_CTRL);</div><div class='add'>+		if (!(value &amp; SPI_FLASH_CTRL_START))</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (value &amp; SPI_FLASH_CTRL_START)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	*buf = ATL2_READ_REG(hw, REG_SPI_DATA);</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * get_permanent_address</div><div class='add'>+ * return 0 if get valid mac address,</div><div class='add'>+ */</div><div class='add'>+static int get_permanent_address(struct atl2_hw *hw)</div><div class='add'>+{</div><div class='add'>+	u32 Addr[2];</div><div class='add'>+	u32 i, Control;</div><div class='add'>+	u16 Register;</div><div class='add'>+	u8  EthAddr[NODE_ADDRESS_SIZE];</div><div class='add'>+	bool KeyValid;</div><div class='add'>+</div><div class='add'>+	if (is_valid_ether_addr(hw-&gt;perm_mac_addr))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	Addr[0] = 0;</div><div class='add'>+	Addr[1] = 0;</div><div class='add'>+</div><div class='add'>+	if (!atl2_check_eeprom_exist(hw)) { /* eeprom exists */</div><div class='add'>+		Register = 0;</div><div class='add'>+		KeyValid = false;</div><div class='add'>+</div><div class='add'>+		/* Read out all EEPROM content */</div><div class='add'>+		i = 0;</div><div class='add'>+		while (1) {</div><div class='add'>+			if (atl2_read_eeprom(hw, i + 0x100, &amp;Control)) {</div><div class='add'>+				if (KeyValid) {</div><div class='add'>+					if (Register == REG_MAC_STA_ADDR)</div><div class='add'>+						Addr[0] = Control;</div><div class='add'>+					else if (Register ==</div><div class='add'>+						(REG_MAC_STA_ADDR + 4))</div><div class='add'>+						Addr[1] = Control;</div><div class='add'>+					KeyValid = false;</div><div class='add'>+				} else if ((Control &amp; 0xff) == 0x5A) {</div><div class='add'>+					KeyValid = true;</div><div class='add'>+					Register = (u16) (Control &gt;&gt; 16);</div><div class='add'>+				} else {</div><div class='add'>+			/* assume data end while encount an invalid KEYWORD */</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+			} else {</div><div class='add'>+				break; /* read error */</div><div class='add'>+			}</div><div class='add'>+			i += 4;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		*(u32 *) &amp;EthAddr[2] = LONGSWAP(Addr[0]);</div><div class='add'>+		*(u16 *) &amp;EthAddr[0] = SHORTSWAP(*(u16 *) &amp;Addr[1]);</div><div class='add'>+</div><div class='add'>+		if (is_valid_ether_addr(EthAddr)) {</div><div class='add'>+			memcpy(hw-&gt;perm_mac_addr, EthAddr, NODE_ADDRESS_SIZE);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* see if SPI flash exists? */</div><div class='add'>+	Addr[0] = 0;</div><div class='add'>+	Addr[1] = 0;</div><div class='add'>+	Register = 0;</div><div class='add'>+	KeyValid = false;</div><div class='add'>+	i = 0;</div><div class='add'>+	while (1) {</div><div class='add'>+		if (atl2_spi_read(hw, i + 0x1f000, &amp;Control)) {</div><div class='add'>+			if (KeyValid) {</div><div class='add'>+				if (Register == REG_MAC_STA_ADDR)</div><div class='add'>+					Addr[0] = Control;</div><div class='add'>+				else if (Register == (REG_MAC_STA_ADDR + 4))</div><div class='add'>+					Addr[1] = Control;</div><div class='add'>+				KeyValid = false;</div><div class='add'>+			} else if ((Control &amp; 0xff) == 0x5A) {</div><div class='add'>+				KeyValid = true;</div><div class='add'>+				Register = (u16) (Control &gt;&gt; 16);</div><div class='add'>+			} else {</div><div class='add'>+				break; /* data end */</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			break; /* read error */</div><div class='add'>+		}</div><div class='add'>+		i += 4;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*(u32 *) &amp;EthAddr[2] = LONGSWAP(Addr[0]);</div><div class='add'>+	*(u16 *) &amp;EthAddr[0] = SHORTSWAP(*(u16 *)&amp;Addr[1]);</div><div class='add'>+	if (is_valid_ether_addr(EthAddr)) {</div><div class='add'>+		memcpy(hw-&gt;perm_mac_addr, EthAddr, NODE_ADDRESS_SIZE);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	/* maybe MAC-address is from BIOS */</div><div class='add'>+	Addr[0] = ATL2_READ_REG(hw, REG_MAC_STA_ADDR);</div><div class='add'>+	Addr[1] = ATL2_READ_REG(hw, REG_MAC_STA_ADDR + 4);</div><div class='add'>+	*(u32 *) &amp;EthAddr[2] = LONGSWAP(Addr[0]);</div><div class='add'>+	*(u16 *) &amp;EthAddr[0] = SHORTSWAP(*(u16 *) &amp;Addr[1]);</div><div class='add'>+</div><div class='add'>+	if (is_valid_ether_addr(EthAddr)) {</div><div class='add'>+		memcpy(hw-&gt;perm_mac_addr, EthAddr, NODE_ADDRESS_SIZE);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Reads the adapter's MAC address from the EEPROM</div><div class='add'>+ *</div><div class='add'>+ * hw - Struct containing variables accessed by shared code</div><div class='add'>+ */</div><div class='add'>+static s32 atl2_read_mac_addr(struct atl2_hw *hw)</div><div class='add'>+{</div><div class='add'>+	u16 i;</div><div class='add'>+</div><div class='add'>+	if (get_permanent_address(hw)) {</div><div class='add'>+		/* for test */</div><div class='add'>+		/* FIXME: shouldn't we use random_ether_addr() here? */</div><div class='add'>+		hw-&gt;perm_mac_addr[0] = 0x00;</div><div class='add'>+		hw-&gt;perm_mac_addr[1] = 0x13;</div><div class='add'>+		hw-&gt;perm_mac_addr[2] = 0x74;</div><div class='add'>+		hw-&gt;perm_mac_addr[3] = 0x00;</div><div class='add'>+		hw-&gt;perm_mac_addr[4] = 0x5c;</div><div class='add'>+		hw-&gt;perm_mac_addr[5] = 0x38;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; NODE_ADDRESS_SIZE; i++)</div><div class='add'>+		hw-&gt;mac_addr[i] = hw-&gt;perm_mac_addr[i];</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Hashes an address to determine its location in the multicast table</div><div class='add'>+ *</div><div class='add'>+ * hw - Struct containing variables accessed by shared code</div><div class='add'>+ * mc_addr - the multicast address to hash</div><div class='add'>+ *</div><div class='add'>+ * atl2_hash_mc_addr</div><div class='add'>+ *  purpose</div><div class='add'>+ *      set hash value for a multicast address</div><div class='add'>+ *      hash calcu processing :</div><div class='add'>+ *          1. calcu 32bit CRC for multicast address</div><div class='add'>+ *          2. reverse crc with MSB to LSB</div><div class='add'>+ */</div><div class='add'>+static u32 atl2_hash_mc_addr(struct atl2_hw *hw, u8 *mc_addr)</div><div class='add'>+{</div><div class='add'>+	u32 crc32, value;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	value = 0;</div><div class='add'>+	crc32 = ether_crc_le(6, mc_addr);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 32; i++)</div><div class='add'>+		value |= (((crc32 &gt;&gt; i) &amp; 1) &lt;&lt; (31 - i));</div><div class='add'>+</div><div class='add'>+	return value;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Sets the bit in the multicast table corresponding to the hash value.</div><div class='add'>+ *</div><div class='add'>+ * hw - Struct containing variables accessed by shared code</div><div class='add'>+ * hash_value - Multicast address hash value</div><div class='add'>+ */</div><div class='add'>+static void atl2_hash_set(struct atl2_hw *hw, u32 hash_value)</div><div class='add'>+{</div><div class='add'>+	u32 hash_bit, hash_reg;</div><div class='add'>+	u32 mta;</div><div class='add'>+</div><div class='add'>+	/* The HASH Table  is a register array of 2 32-bit registers.</div><div class='add'>+	 * It is treated like an array of 64 bits.  We want to set</div><div class='add'>+	 * bit BitArray[hash_value]. So we figure out what register</div><div class='add'>+	 * the bit is in, read it, OR in the new bit, then write</div><div class='add'>+	 * back the new value.  The register is determined by the</div><div class='add'>+	 * upper 7 bits of the hash value and the bit within that</div><div class='add'>+	 * register are determined by the lower 5 bits of the value.</div><div class='add'>+	 */</div><div class='add'>+	hash_reg = (hash_value &gt;&gt; 31) &amp; 0x1;</div><div class='add'>+	hash_bit = (hash_value &gt;&gt; 26) &amp; 0x1F;</div><div class='add'>+</div><div class='add'>+	mta = ATL2_READ_REG_ARRAY(hw, REG_RX_HASH_TABLE, hash_reg);</div><div class='add'>+</div><div class='add'>+	mta |= (1 &lt;&lt; hash_bit);</div><div class='add'>+</div><div class='add'>+	ATL2_WRITE_REG_ARRAY(hw, REG_RX_HASH_TABLE, hash_reg, mta);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * atl2_init_pcie - init PCIE module</div><div class='add'>+ */</div><div class='add'>+static void atl2_init_pcie(struct atl2_hw *hw)</div><div class='add'>+{</div><div class='add'>+    u32 value;</div><div class='add'>+    value = LTSSM_TEST_MODE_DEF;</div><div class='add'>+    ATL2_WRITE_REG(hw, REG_LTSSM_TEST_MODE, value);</div><div class='add'>+</div><div class='add'>+    value = PCIE_DLL_TX_CTRL1_DEF;</div><div class='add'>+    ATL2_WRITE_REG(hw, REG_PCIE_DLL_TX_CTRL1, value);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void atl2_init_flash_opcode(struct atl2_hw *hw)</div><div class='add'>+{</div><div class='add'>+	if (hw-&gt;flash_vendor &gt;= ARRAY_SIZE(flash_table))</div><div class='add'>+		hw-&gt;flash_vendor = 0; /* ATMEL */</div><div class='add'>+</div><div class='add'>+	/* Init OP table */</div><div class='add'>+	ATL2_WRITE_REGB(hw, REG_SPI_FLASH_OP_PROGRAM,</div><div class='add'>+		flash_table[hw-&gt;flash_vendor].cmdPROGRAM);</div><div class='add'>+	ATL2_WRITE_REGB(hw, REG_SPI_FLASH_OP_SC_ERASE,</div><div class='add'>+		flash_table[hw-&gt;flash_vendor].cmdSECTOR_ERASE);</div><div class='add'>+	ATL2_WRITE_REGB(hw, REG_SPI_FLASH_OP_CHIP_ERASE,</div><div class='add'>+		flash_table[hw-&gt;flash_vendor].cmdCHIP_ERASE);</div><div class='add'>+	ATL2_WRITE_REGB(hw, REG_SPI_FLASH_OP_RDID,</div><div class='add'>+		flash_table[hw-&gt;flash_vendor].cmdRDID);</div><div class='add'>+	ATL2_WRITE_REGB(hw, REG_SPI_FLASH_OP_WREN,</div><div class='add'>+		flash_table[hw-&gt;flash_vendor].cmdWREN);</div><div class='add'>+	ATL2_WRITE_REGB(hw, REG_SPI_FLASH_OP_RDSR,</div><div class='add'>+		flash_table[hw-&gt;flash_vendor].cmdRDSR);</div><div class='add'>+	ATL2_WRITE_REGB(hw, REG_SPI_FLASH_OP_WRSR,</div><div class='add'>+		flash_table[hw-&gt;flash_vendor].cmdWRSR);</div><div class='add'>+	ATL2_WRITE_REGB(hw, REG_SPI_FLASH_OP_READ,</div><div class='add'>+		flash_table[hw-&gt;flash_vendor].cmdREAD);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/********************************************************************</div><div class='add'>+* Performs basic configuration of the adapter.</div><div class='add'>+*</div><div class='add'>+* hw - Struct containing variables accessed by shared code</div><div class='add'>+* Assumes that the controller has previously been reset and is in a</div><div class='add'>+* post-reset uninitialized state. Initializes multicast table,</div><div class='add'>+* and  Calls routines to setup link</div><div class='add'>+* Leaves the transmit and receive units disabled and uninitialized.</div><div class='add'>+********************************************************************/</div><div class='add'>+static s32 atl2_init_hw(struct atl2_hw *hw)</div><div class='add'>+{</div><div class='add'>+	u32 ret_val = 0;</div><div class='add'>+</div><div class='add'>+	atl2_init_pcie(hw);</div><div class='add'>+</div><div class='add'>+	/* Zero out the Multicast HASH table */</div><div class='add'>+	/* clear the old settings from the multicast hash table */</div><div class='add'>+	ATL2_WRITE_REG(hw, REG_RX_HASH_TABLE, 0);</div><div class='add'>+	ATL2_WRITE_REG_ARRAY(hw, REG_RX_HASH_TABLE, 1, 0);</div><div class='add'>+</div><div class='add'>+	atl2_init_flash_opcode(hw);</div><div class='add'>+</div><div class='add'>+	ret_val = atl2_phy_init(hw);</div><div class='add'>+</div><div class='add'>+	return ret_val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Detects the current speed and duplex settings of the hardware.</div><div class='add'>+ *</div><div class='add'>+ * hw - Struct containing variables accessed by shared code</div><div class='add'>+ * speed - Speed of the connection</div><div class='add'>+ * duplex - Duplex setting of the connection</div><div class='add'>+ */</div><div class='add'>+static s32 atl2_get_speed_and_duplex(struct atl2_hw *hw, u16 *speed,</div><div class='add'>+	u16 *duplex)</div><div class='add'>+{</div><div class='add'>+	s32 ret_val;</div><div class='add'>+	u16 phy_data;</div><div class='add'>+</div><div class='add'>+	/* Read PHY Specific Status Register (17) */</div><div class='add'>+	ret_val = atl2_read_phy_reg(hw, MII_ATLX_PSSR, &amp;phy_data);</div><div class='add'>+	if (ret_val)</div><div class='add'>+		return ret_val;</div><div class='add'>+</div><div class='add'>+	if (!(phy_data &amp; MII_ATLX_PSSR_SPD_DPLX_RESOLVED))</div><div class='add'>+		return ATLX_ERR_PHY_RES;</div><div class='add'>+</div><div class='add'>+	switch (phy_data &amp; MII_ATLX_PSSR_SPEED) {</div><div class='add'>+	case MII_ATLX_PSSR_100MBS:</div><div class='add'>+		*speed = SPEED_100;</div><div class='add'>+		break;</div><div class='add'>+	case MII_ATLX_PSSR_10MBS:</div><div class='add'>+		*speed = SPEED_10;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return ATLX_ERR_PHY_SPEED;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (phy_data &amp; MII_ATLX_PSSR_DPLX)</div><div class='add'>+		*duplex = FULL_DUPLEX;</div><div class='add'>+	else</div><div class='add'>+		*duplex = HALF_DUPLEX;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Reads the value from a PHY register</div><div class='add'>+ * hw - Struct containing variables accessed by shared code</div><div class='add'>+ * reg_addr - address of the PHY register to read</div><div class='add'>+ */</div><div class='add'>+static s32 atl2_read_phy_reg(struct atl2_hw *hw, u16 reg_addr, u16 *phy_data)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	val = ((u32)(reg_addr &amp; MDIO_REG_ADDR_MASK)) &lt;&lt; MDIO_REG_ADDR_SHIFT |</div><div class='add'>+		MDIO_START |</div><div class='add'>+		MDIO_SUP_PREAMBLE |</div><div class='add'>+		MDIO_RW |</div><div class='add'>+		MDIO_CLK_25_4 &lt;&lt; MDIO_CLK_SEL_SHIFT;</div><div class='add'>+	ATL2_WRITE_REG(hw, REG_MDIO_CTRL, val);</div><div class='add'>+</div><div class='add'>+	wmb();</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MDIO_WAIT_TIMES; i++) {</div><div class='add'>+		udelay(2);</div><div class='add'>+		val = ATL2_READ_REG(hw, REG_MDIO_CTRL);</div><div class='add'>+		if (!(val &amp; (MDIO_START | MDIO_BUSY)))</div><div class='add'>+			break;</div><div class='add'>+		wmb();</div><div class='add'>+	}</div><div class='add'>+	if (!(val &amp; (MDIO_START | MDIO_BUSY))) {</div><div class='add'>+		*phy_data = (u16)val;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ATLX_ERR_PHY;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Writes a value to a PHY register</div><div class='add'>+ * hw - Struct containing variables accessed by shared code</div><div class='add'>+ * reg_addr - address of the PHY register to write</div><div class='add'>+ * data - data to write to the PHY</div><div class='add'>+ */</div><div class='add'>+static s32 atl2_write_phy_reg(struct atl2_hw *hw, u32 reg_addr, u16 phy_data)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	val = ((u32)(phy_data &amp; MDIO_DATA_MASK)) &lt;&lt; MDIO_DATA_SHIFT |</div><div class='add'>+		(reg_addr &amp; MDIO_REG_ADDR_MASK) &lt;&lt; MDIO_REG_ADDR_SHIFT |</div><div class='add'>+		MDIO_SUP_PREAMBLE |</div><div class='add'>+		MDIO_START |</div><div class='add'>+		MDIO_CLK_25_4 &lt;&lt; MDIO_CLK_SEL_SHIFT;</div><div class='add'>+	ATL2_WRITE_REG(hw, REG_MDIO_CTRL, val);</div><div class='add'>+</div><div class='add'>+	wmb();</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MDIO_WAIT_TIMES; i++) {</div><div class='add'>+		udelay(2);</div><div class='add'>+		val = ATL2_READ_REG(hw, REG_MDIO_CTRL);</div><div class='add'>+		if (!(val &amp; (MDIO_START | MDIO_BUSY)))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		wmb();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!(val &amp; (MDIO_START | MDIO_BUSY)))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return ATLX_ERR_PHY;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Configures PHY autoneg and flow control advertisement settings</div><div class='add'>+ *</div><div class='add'>+ * hw - Struct containing variables accessed by shared code</div><div class='add'>+ */</div><div class='add'>+static s32 atl2_phy_setup_autoneg_adv(struct atl2_hw *hw)</div><div class='add'>+{</div><div class='add'>+	s32 ret_val;</div><div class='add'>+	s16 mii_autoneg_adv_reg;</div><div class='add'>+</div><div class='add'>+	/* Read the MII Auto-Neg Advertisement Register (Address 4). */</div><div class='add'>+	mii_autoneg_adv_reg = MII_AR_DEFAULT_CAP_MASK;</div><div class='add'>+</div><div class='add'>+	/* Need to parse autoneg_advertised  and set up</div><div class='add'>+	 * the appropriate PHY registers.  First we will parse for</div><div class='add'>+	 * autoneg_advertised software override.  Since we can advertise</div><div class='add'>+	 * a plethora of combinations, we need to check each bit</div><div class='add'>+	 * individually.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* First we clear all the 10/100 mb speed bits in the Auto-Neg</div><div class='add'>+	 * Advertisement Register (Address 4) and the 1000 mb speed bits in</div><div class='add'>+	 * the  1000Base-T Control Register (Address 9). */</div><div class='add'>+	mii_autoneg_adv_reg &amp;= ~MII_AR_SPEED_MASK;</div><div class='add'>+</div><div class='add'>+	/* Need to parse MediaType and setup the</div><div class='add'>+	 * appropriate PHY registers. */</div><div class='add'>+	switch (hw-&gt;MediaType) {</div><div class='add'>+	case MEDIA_TYPE_AUTO_SENSOR:</div><div class='add'>+		mii_autoneg_adv_reg |=</div><div class='add'>+			(MII_AR_10T_HD_CAPS |</div><div class='add'>+			MII_AR_10T_FD_CAPS  |</div><div class='add'>+			MII_AR_100TX_HD_CAPS|</div><div class='add'>+			MII_AR_100TX_FD_CAPS);</div><div class='add'>+		hw-&gt;autoneg_advertised =</div><div class='add'>+			ADVERTISE_10_HALF |</div><div class='add'>+			ADVERTISE_10_FULL |</div><div class='add'>+			ADVERTISE_100_HALF|</div><div class='add'>+			ADVERTISE_100_FULL;</div><div class='add'>+		break;</div><div class='add'>+	case MEDIA_TYPE_100M_FULL:</div><div class='add'>+		mii_autoneg_adv_reg |= MII_AR_100TX_FD_CAPS;</div><div class='add'>+		hw-&gt;autoneg_advertised = ADVERTISE_100_FULL;</div><div class='add'>+		break;</div><div class='add'>+	case MEDIA_TYPE_100M_HALF:</div><div class='add'>+		mii_autoneg_adv_reg |= MII_AR_100TX_HD_CAPS;</div><div class='add'>+		hw-&gt;autoneg_advertised = ADVERTISE_100_HALF;</div><div class='add'>+		break;</div><div class='add'>+	case MEDIA_TYPE_10M_FULL:</div><div class='add'>+		mii_autoneg_adv_reg |= MII_AR_10T_FD_CAPS;</div><div class='add'>+		hw-&gt;autoneg_advertised = ADVERTISE_10_FULL;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		mii_autoneg_adv_reg |= MII_AR_10T_HD_CAPS;</div><div class='add'>+		hw-&gt;autoneg_advertised = ADVERTISE_10_HALF;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* flow control fixed to enable all */</div><div class='add'>+	mii_autoneg_adv_reg |= (MII_AR_ASM_DIR | MII_AR_PAUSE);</div><div class='add'>+</div><div class='add'>+	hw-&gt;mii_autoneg_adv_reg = mii_autoneg_adv_reg;</div><div class='add'>+</div><div class='add'>+	ret_val = atl2_write_phy_reg(hw, MII_ADVERTISE, mii_autoneg_adv_reg);</div><div class='add'>+</div><div class='add'>+	if (ret_val)</div><div class='add'>+		return ret_val;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Resets the PHY and make all config validate</div><div class='add'>+ *</div><div class='add'>+ * hw - Struct containing variables accessed by shared code</div><div class='add'>+ *</div><div class='add'>+ * Sets bit 15 and 12 of the MII Control regiser (for F001 bug)</div><div class='add'>+ */</div><div class='add'>+static s32 atl2_phy_commit(struct atl2_hw *hw)</div><div class='add'>+{</div><div class='add'>+	s32 ret_val;</div><div class='add'>+	u16 phy_data;</div><div class='add'>+</div><div class='add'>+	phy_data = MII_CR_RESET | MII_CR_AUTO_NEG_EN | MII_CR_RESTART_AUTO_NEG;</div><div class='add'>+	ret_val = atl2_write_phy_reg(hw, MII_BMCR, phy_data);</div><div class='add'>+	if (ret_val) {</div><div class='add'>+		u32 val;</div><div class='add'>+		int i;</div><div class='add'>+		/* pcie serdes link may be down ! */</div><div class='add'>+		for (i = 0; i &lt; 25; i++) {</div><div class='add'>+			msleep(1);</div><div class='add'>+			val = ATL2_READ_REG(hw, REG_MDIO_CTRL);</div><div class='add'>+			if (!(val &amp; (MDIO_START | MDIO_BUSY)))</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (0 != (val &amp; (MDIO_START | MDIO_BUSY))) {</div><div class='add'>+			printk(KERN_ERR "atl2: PCIe link down for at least 25ms !\n");</div><div class='add'>+			return ret_val;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static s32 atl2_phy_init(struct atl2_hw *hw)</div><div class='add'>+{</div><div class='add'>+	s32 ret_val;</div><div class='add'>+	u16 phy_val;</div><div class='add'>+</div><div class='add'>+	if (hw-&gt;phy_configured)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Enable PHY */</div><div class='add'>+	ATL2_WRITE_REGW(hw, REG_PHY_ENABLE, 1);</div><div class='add'>+	ATL2_WRITE_FLUSH(hw);</div><div class='add'>+	msleep(1);</div><div class='add'>+</div><div class='add'>+	/* check if the PHY is in powersaving mode */</div><div class='add'>+	atl2_write_phy_reg(hw, MII_DBG_ADDR, 0);</div><div class='add'>+	atl2_read_phy_reg(hw, MII_DBG_DATA, &amp;phy_val);</div><div class='add'>+</div><div class='add'>+	/* 024E / 124E 0r 0274 / 1274 ? */</div><div class='add'>+	if (phy_val &amp; 0x1000) {</div><div class='add'>+		phy_val &amp;= ~0x1000;</div><div class='add'>+		atl2_write_phy_reg(hw, MII_DBG_DATA, phy_val);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	msleep(1);</div><div class='add'>+</div><div class='add'>+	/*Enable PHY LinkChange Interrupt */</div><div class='add'>+	ret_val = atl2_write_phy_reg(hw, 18, 0xC00);</div><div class='add'>+	if (ret_val)</div><div class='add'>+		return ret_val;</div><div class='add'>+</div><div class='add'>+	/* setup AutoNeg parameters */</div><div class='add'>+	ret_val = atl2_phy_setup_autoneg_adv(hw);</div><div class='add'>+	if (ret_val)</div><div class='add'>+		return ret_val;</div><div class='add'>+</div><div class='add'>+	/* SW.Reset &amp; En-Auto-Neg to restart Auto-Neg */</div><div class='add'>+	ret_val = atl2_phy_commit(hw);</div><div class='add'>+	if (ret_val)</div><div class='add'>+		return ret_val;</div><div class='add'>+</div><div class='add'>+	hw-&gt;phy_configured = true;</div><div class='add'>+</div><div class='add'>+	return ret_val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void atl2_set_mac_addr(struct atl2_hw *hw)</div><div class='add'>+{</div><div class='add'>+	u32 value;</div><div class='add'>+	/* 00-0B-6A-F6-00-DC</div><div class='add'>+	 * 0:  6AF600DC   1: 000B</div><div class='add'>+	 * low dword */</div><div class='add'>+	value = (((u32)hw-&gt;mac_addr[2]) &lt;&lt; 24) |</div><div class='add'>+		(((u32)hw-&gt;mac_addr[3]) &lt;&lt; 16) |</div><div class='add'>+		(((u32)hw-&gt;mac_addr[4]) &lt;&lt; 8)  |</div><div class='add'>+		(((u32)hw-&gt;mac_addr[5]));</div><div class='add'>+	ATL2_WRITE_REG_ARRAY(hw, REG_MAC_STA_ADDR, 0, value);</div><div class='add'>+	/* hight dword */</div><div class='add'>+	value = (((u32)hw-&gt;mac_addr[0]) &lt;&lt; 8) |</div><div class='add'>+		(((u32)hw-&gt;mac_addr[1]));</div><div class='add'>+	ATL2_WRITE_REG_ARRAY(hw, REG_MAC_STA_ADDR, 1, value);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * check_eeprom_exist</div><div class='add'>+ * return 0 if eeprom exist</div><div class='add'>+ */</div><div class='add'>+static int atl2_check_eeprom_exist(struct atl2_hw *hw)</div><div class='add'>+{</div><div class='add'>+	u32 value;</div><div class='add'>+</div><div class='add'>+	value = ATL2_READ_REG(hw, REG_SPI_FLASH_CTRL);</div><div class='add'>+	if (value &amp; SPI_FLASH_CTRL_EN_VPD) {</div><div class='add'>+		value &amp;= ~SPI_FLASH_CTRL_EN_VPD;</div><div class='add'>+		ATL2_WRITE_REG(hw, REG_SPI_FLASH_CTRL, value);</div><div class='add'>+	}</div><div class='add'>+	value = ATL2_READ_REGW(hw, REG_PCIE_CAP_LIST);</div><div class='add'>+	return ((value &amp; 0xFF00) == 0x6C00) ? 0 : 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* FIXME: This doesn't look right. -- CHS */</div><div class='add'>+static bool atl2_write_eeprom(struct atl2_hw *hw, u32 offset, u32 value)</div><div class='add'>+{</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool atl2_read_eeprom(struct atl2_hw *hw, u32 Offset, u32 *pValue)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	u32    Control;</div><div class='add'>+</div><div class='add'>+	if (Offset &amp; 0x3)</div><div class='add'>+		return false; /* address do not align */</div><div class='add'>+</div><div class='add'>+	ATL2_WRITE_REG(hw, REG_VPD_DATA, 0);</div><div class='add'>+	Control = (Offset &amp; VPD_CAP_VPD_ADDR_MASK) &lt;&lt; VPD_CAP_VPD_ADDR_SHIFT;</div><div class='add'>+	ATL2_WRITE_REG(hw, REG_VPD_CAP, Control);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 10; i++) {</div><div class='add'>+		msleep(2);</div><div class='add'>+		Control = ATL2_READ_REG(hw, REG_VPD_CAP);</div><div class='add'>+		if (Control &amp; VPD_CAP_VPD_FLAG)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (Control &amp; VPD_CAP_VPD_FLAG) {</div><div class='add'>+		*pValue = ATL2_READ_REG(hw, REG_VPD_DATA);</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+	return false; /* timeout */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void atl2_force_ps(struct atl2_hw *hw)</div><div class='add'>+{</div><div class='add'>+	u16 phy_val;</div><div class='add'>+</div><div class='add'>+	atl2_write_phy_reg(hw, MII_DBG_ADDR, 0);</div><div class='add'>+	atl2_read_phy_reg(hw, MII_DBG_DATA, &amp;phy_val);</div><div class='add'>+	atl2_write_phy_reg(hw, MII_DBG_DATA, phy_val | 0x1000);</div><div class='add'>+</div><div class='add'>+	atl2_write_phy_reg(hw, MII_DBG_ADDR, 2);</div><div class='add'>+	atl2_write_phy_reg(hw, MII_DBG_DATA, 0x3000);</div><div class='add'>+	atl2_write_phy_reg(hw, MII_DBG_ADDR, 3);</div><div class='add'>+	atl2_write_phy_reg(hw, MII_DBG_DATA, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This is the only thing that needs to be changed to adjust the</div><div class='add'>+ * maximum number of ports that the driver can manage.</div><div class='add'>+ */</div><div class='add'>+#define ATL2_MAX_NIC 4</div><div class='add'>+</div><div class='add'>+#define OPTION_UNSET    -1</div><div class='add'>+#define OPTION_DISABLED 0</div><div class='add'>+#define OPTION_ENABLED  1</div><div class='add'>+</div><div class='add'>+/* All parameters are treated the same, as an integer array of values.</div><div class='add'>+ * This macro just reduces the need to repeat the same declaration code</div><div class='add'>+ * over and over (plus this helps to avoid typo bugs).</div><div class='add'>+ */</div><div class='add'>+#define ATL2_PARAM_INIT {[0 ... ATL2_MAX_NIC] = OPTION_UNSET}</div><div class='add'>+#ifndef module_param_array</div><div class='add'>+/* Module Parameters are always initialized to -1, so that the driver</div><div class='add'>+ * can tell the difference between no user specified value or the</div><div class='add'>+ * user asking for the default value.</div><div class='add'>+ * The true default values are loaded in when atl2_check_options is called.</div><div class='add'>+ *</div><div class='add'>+ * This is a GCC extension to ANSI C.</div><div class='add'>+ * See the item "Labeled Elements in Initializers" in the section</div><div class='add'>+ * "Extensions to the C Language Family" of the GCC documentation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define ATL2_PARAM(X, desc) \</div><div class='add'>+    static const int __devinitdata X[ATL2_MAX_NIC + 1] = ATL2_PARAM_INIT; \</div><div class='add'>+    MODULE_PARM(X, "1-" __MODULE_STRING(ATL2_MAX_NIC) "i"); \</div><div class='add'>+    MODULE_PARM_DESC(X, desc);</div><div class='add'>+#else</div><div class='add'>+#define ATL2_PARAM(X, desc) \</div><div class='add'>+    static int __devinitdata X[ATL2_MAX_NIC+1] = ATL2_PARAM_INIT; \</div><div class='add'>+    static int num_##X = 0; \</div><div class='add'>+    module_param_array_named(X, X, int, &amp;num_##X, 0); \</div><div class='add'>+    MODULE_PARM_DESC(X, desc);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Transmit Memory Size</div><div class='add'>+ * Valid Range: 64-2048</div><div class='add'>+ * Default Value: 128</div><div class='add'>+ */</div><div class='add'>+#define ATL2_MIN_TX_MEMSIZE		4	/* 4KB */</div><div class='add'>+#define ATL2_MAX_TX_MEMSIZE		64	/* 64KB */</div><div class='add'>+#define ATL2_DEFAULT_TX_MEMSIZE		8	/* 8KB */</div><div class='add'>+ATL2_PARAM(TxMemSize, "Bytes of Transmit Memory");</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Receive Memory Block Count</div><div class='add'>+ * Valid Range: 16-512</div><div class='add'>+ * Default Value: 128</div><div class='add'>+ */</div><div class='add'>+#define ATL2_MIN_RXD_COUNT		16</div><div class='add'>+#define ATL2_MAX_RXD_COUNT		512</div><div class='add'>+#define ATL2_DEFAULT_RXD_COUNT		64</div><div class='add'>+ATL2_PARAM(RxMemBlock, "Number of receive memory block");</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * User Specified MediaType Override</div><div class='add'>+ *</div><div class='add'>+ * Valid Range: 0-5</div><div class='add'>+ *  - 0    - auto-negotiate at all supported speeds</div><div class='add'>+ *  - 1    - only link at 1000Mbps Full Duplex</div><div class='add'>+ *  - 2    - only link at 100Mbps Full Duplex</div><div class='add'>+ *  - 3    - only link at 100Mbps Half Duplex</div><div class='add'>+ *  - 4    - only link at 10Mbps Full Duplex</div><div class='add'>+ *  - 5    - only link at 10Mbps Half Duplex</div><div class='add'>+ * Default Value: 0</div><div class='add'>+ */</div><div class='add'>+ATL2_PARAM(MediaType, "MediaType Select");</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Interrupt Moderate Timer in units of 2048 ns (~2 us)</div><div class='add'>+ * Valid Range: 10-65535</div><div class='add'>+ * Default Value: 45000(90ms)</div><div class='add'>+ */</div><div class='add'>+#define INT_MOD_DEFAULT_CNT	100 /* 200us */</div><div class='add'>+#define INT_MOD_MAX_CNT		65000</div><div class='add'>+#define INT_MOD_MIN_CNT		50</div><div class='add'>+ATL2_PARAM(IntModTimer, "Interrupt Moderator Timer");</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * FlashVendor</div><div class='add'>+ * Valid Range: 0-2</div><div class='add'>+ * 0 - Atmel</div><div class='add'>+ * 1 - SST</div><div class='add'>+ * 2 - ST</div><div class='add'>+ */</div><div class='add'>+ATL2_PARAM(FlashVendor, "SPI Flash Vendor");</div><div class='add'>+</div><div class='add'>+#define AUTONEG_ADV_DEFAULT	0x2F</div><div class='add'>+#define AUTONEG_ADV_MASK	0x2F</div><div class='add'>+#define FLOW_CONTROL_DEFAULT	FLOW_CONTROL_FULL</div><div class='add'>+</div><div class='add'>+#define FLASH_VENDOR_DEFAULT	0</div><div class='add'>+#define FLASH_VENDOR_MIN	0</div><div class='add'>+#define FLASH_VENDOR_MAX	2</div><div class='add'>+</div><div class='add'>+struct atl2_option {</div><div class='add'>+	enum { enable_option, range_option, list_option } type;</div><div class='add'>+	char *name;</div><div class='add'>+	char *err;</div><div class='add'>+	int  def;</div><div class='add'>+	union {</div><div class='add'>+		struct { /* range_option info */</div><div class='add'>+			int min;</div><div class='add'>+			int max;</div><div class='add'>+		} r;</div><div class='add'>+		struct { /* list_option info */</div><div class='add'>+			int nr;</div><div class='add'>+			struct atl2_opt_list { int i; char *str; } *p;</div><div class='add'>+		} l;</div><div class='add'>+	} arg;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __devinit atl2_validate_option(int *value, struct atl2_option *opt)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	struct atl2_opt_list *ent;</div><div class='add'>+</div><div class='add'>+	if (*value == OPTION_UNSET) {</div><div class='add'>+		*value = opt-&gt;def;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (opt-&gt;type) {</div><div class='add'>+	case enable_option:</div><div class='add'>+		switch (*value) {</div><div class='add'>+		case OPTION_ENABLED:</div><div class='add'>+			printk(KERN_INFO "%s Enabled\n", opt-&gt;name);</div><div class='add'>+			return 0;</div><div class='add'>+			break;</div><div class='add'>+		case OPTION_DISABLED:</div><div class='add'>+			printk(KERN_INFO "%s Disabled\n", opt-&gt;name);</div><div class='add'>+			return 0;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case range_option:</div><div class='add'>+		if (*value &gt;= opt-&gt;arg.r.min &amp;&amp; *value &lt;= opt-&gt;arg.r.max) {</div><div class='add'>+			printk(KERN_INFO "%s set to %i\n", opt-&gt;name, *value);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case list_option:</div><div class='add'>+		for (i = 0; i &lt; opt-&gt;arg.l.nr; i++) {</div><div class='add'>+			ent = &amp;opt-&gt;arg.l.p[i];</div><div class='add'>+			if (*value == ent-&gt;i) {</div><div class='add'>+				if (ent-&gt;str[0] != '\0')</div><div class='add'>+					printk(KERN_INFO "%s\n", ent-&gt;str);</div><div class='add'>+			return 0;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		BUG();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "Invalid %s specified (%i) %s\n",</div><div class='add'>+		opt-&gt;name, *value, opt-&gt;err);</div><div class='add'>+	*value = opt-&gt;def;</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * atl2_check_options - Range Checking for Command Line Parameters</div><div class='add'>+ * @adapter: board private structure</div><div class='add'>+ *</div><div class='add'>+ * This routine checks all command line parameters for valid user</div><div class='add'>+ * input.  If an invalid value is given, or if no user specified</div><div class='add'>+ * value exists, a default value is used.  The final value is stored</div><div class='add'>+ * in a variable in the adapter structure.</div><div class='add'>+ */</div><div class='add'>+static void __devinit atl2_check_options(struct atl2_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	int val;</div><div class='add'>+	struct atl2_option opt;</div><div class='add'>+	int bd = adapter-&gt;bd_number;</div><div class='add'>+	if (bd &gt;= ATL2_MAX_NIC) {</div><div class='add'>+		printk(KERN_NOTICE "Warning: no configuration for board #%i\n",</div><div class='add'>+			bd);</div><div class='add'>+		printk(KERN_NOTICE "Using defaults for all values\n");</div><div class='add'>+#ifndef module_param_array</div><div class='add'>+		bd = ATL2_MAX_NIC;</div><div class='add'>+#endif</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Bytes of Transmit Memory */</div><div class='add'>+	opt.type = range_option;</div><div class='add'>+	opt.name = "Bytes of Transmit Memory";</div><div class='add'>+	opt.err = "using default of " __MODULE_STRING(ATL2_DEFAULT_TX_MEMSIZE);</div><div class='add'>+	opt.def = ATL2_DEFAULT_TX_MEMSIZE;</div><div class='add'>+	opt.arg.r.min = ATL2_MIN_TX_MEMSIZE;</div><div class='add'>+	opt.arg.r.max = ATL2_MAX_TX_MEMSIZE;</div><div class='add'>+#ifdef module_param_array</div><div class='add'>+	if (num_TxMemSize &gt; bd) {</div><div class='add'>+#endif</div><div class='add'>+		val = TxMemSize[bd];</div><div class='add'>+		atl2_validate_option(&amp;val, &amp;opt);</div><div class='add'>+		adapter-&gt;txd_ring_size = ((u32) val) * 1024;</div><div class='add'>+#ifdef module_param_array</div><div class='add'>+	} else</div><div class='add'>+		adapter-&gt;txd_ring_size = ((u32)opt.def) * 1024;</div><div class='add'>+#endif</div><div class='add'>+	/* txs ring size: */</div><div class='add'>+	adapter-&gt;txs_ring_size = adapter-&gt;txd_ring_size / 128;</div><div class='add'>+	if (adapter-&gt;txs_ring_size &gt; 160)</div><div class='add'>+		adapter-&gt;txs_ring_size = 160;</div><div class='add'>+</div><div class='add'>+	/* Receive Memory Block Count */</div><div class='add'>+	opt.type = range_option;</div><div class='add'>+	opt.name = "Number of receive memory block";</div><div class='add'>+	opt.err = "using default of " __MODULE_STRING(ATL2_DEFAULT_RXD_COUNT);</div><div class='add'>+	opt.def = ATL2_DEFAULT_RXD_COUNT;</div><div class='add'>+	opt.arg.r.min = ATL2_MIN_RXD_COUNT;</div><div class='add'>+	opt.arg.r.max = ATL2_MAX_RXD_COUNT;</div><div class='add'>+#ifdef module_param_array</div><div class='add'>+	if (num_RxMemBlock &gt; bd) {</div><div class='add'>+#endif</div><div class='add'>+		val = RxMemBlock[bd];</div><div class='add'>+		atl2_validate_option(&amp;val, &amp;opt);</div><div class='add'>+		adapter-&gt;rxd_ring_size = (u32)val;</div><div class='add'>+		/* FIXME */</div><div class='add'>+		/* ((u16)val)&amp;~1; */	/* even number */</div><div class='add'>+#ifdef module_param_array</div><div class='add'>+	} else</div><div class='add'>+		adapter-&gt;rxd_ring_size = (u32)opt.def;</div><div class='add'>+#endif</div><div class='add'>+	/* init RXD Flow control value */</div><div class='add'>+	adapter-&gt;hw.fc_rxd_hi = (adapter-&gt;rxd_ring_size / 8) * 7;</div><div class='add'>+	adapter-&gt;hw.fc_rxd_lo = (ATL2_MIN_RXD_COUNT / 8) &gt;</div><div class='add'>+		(adapter-&gt;rxd_ring_size / 12) ? (ATL2_MIN_RXD_COUNT / 8) :</div><div class='add'>+		(adapter-&gt;rxd_ring_size / 12);</div><div class='add'>+</div><div class='add'>+	/* Interrupt Moderate Timer */</div><div class='add'>+	opt.type = range_option;</div><div class='add'>+	opt.name = "Interrupt Moderate Timer";</div><div class='add'>+	opt.err = "using default of " __MODULE_STRING(INT_MOD_DEFAULT_CNT);</div><div class='add'>+	opt.def = INT_MOD_DEFAULT_CNT;</div><div class='add'>+	opt.arg.r.min = INT_MOD_MIN_CNT;</div><div class='add'>+	opt.arg.r.max = INT_MOD_MAX_CNT;</div><div class='add'>+#ifdef module_param_array</div><div class='add'>+	if (num_IntModTimer &gt; bd) {</div><div class='add'>+#endif</div><div class='add'>+		val = IntModTimer[bd];</div><div class='add'>+		atl2_validate_option(&amp;val, &amp;opt);</div><div class='add'>+		adapter-&gt;imt = (u16) val;</div><div class='add'>+#ifdef module_param_array</div><div class='add'>+	} else</div><div class='add'>+		adapter-&gt;imt = (u16)(opt.def);</div><div class='add'>+#endif</div><div class='add'>+	/* Flash Vendor */</div><div class='add'>+	opt.type = range_option;</div><div class='add'>+	opt.name = "SPI Flash Vendor";</div><div class='add'>+	opt.err = "using default of " __MODULE_STRING(FLASH_VENDOR_DEFAULT);</div><div class='add'>+	opt.def = FLASH_VENDOR_DEFAULT;</div><div class='add'>+	opt.arg.r.min = FLASH_VENDOR_MIN;</div><div class='add'>+	opt.arg.r.max = FLASH_VENDOR_MAX;</div><div class='add'>+#ifdef module_param_array</div><div class='add'>+	if (num_FlashVendor &gt; bd) {</div><div class='add'>+#endif</div><div class='add'>+		val = FlashVendor[bd];</div><div class='add'>+		atl2_validate_option(&amp;val, &amp;opt);</div><div class='add'>+		adapter-&gt;hw.flash_vendor = (u8) val;</div><div class='add'>+#ifdef module_param_array</div><div class='add'>+	} else</div><div class='add'>+		adapter-&gt;hw.flash_vendor = (u8)(opt.def);</div><div class='add'>+#endif</div><div class='add'>+	/* MediaType */</div><div class='add'>+	opt.type = range_option;</div><div class='add'>+	opt.name = "Speed/Duplex Selection";</div><div class='add'>+	opt.err = "using default of " __MODULE_STRING(MEDIA_TYPE_AUTO_SENSOR);</div><div class='add'>+	opt.def = MEDIA_TYPE_AUTO_SENSOR;</div><div class='add'>+	opt.arg.r.min = MEDIA_TYPE_AUTO_SENSOR;</div><div class='add'>+	opt.arg.r.max = MEDIA_TYPE_10M_HALF;</div><div class='add'>+#ifdef module_param_array</div><div class='add'>+	if (num_MediaType &gt; bd) {</div><div class='add'>+#endif</div><div class='add'>+		val = MediaType[bd];</div><div class='add'>+		atl2_validate_option(&amp;val, &amp;opt);</div><div class='add'>+		adapter-&gt;hw.MediaType = (u16) val;</div><div class='add'>+#ifdef module_param_array</div><div class='add'>+	} else</div><div class='add'>+		adapter-&gt;hw.MediaType = (u16)(opt.def);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/atlx/atl2.h b/drivers/net/atlx/atl2.h<br/>new file mode 100644<br/>index 000000000000..09974df76b18<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/atlx/atl2.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/atlx/atl2.h</a></div><div class='hunk'>@@ -0,0 +1,529 @@</div><div class='add'>+/* atl2.h -- atl2 driver definitions</div><div class='add'>+ *</div><div class='add'>+ * Copyright(c) 2007 Atheros Corporation. All rights reserved.</div><div class='add'>+ * Copyright(c) 2006 xiong huang &lt;xiong.huang@atheros.com&gt;</div><div class='add'>+ * Copyright(c) 2007 Chris Snook &lt;csnook@redhat.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * Derived from Intel e1000 driver</div><div class='add'>+ * Copyright(c) 1999 - 2005 Intel Corporation. All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms of the GNU General Public License as published by the Free</div><div class='add'>+ * Software Foundation; either version 2 of the License, or (at your option)</div><div class='add'>+ * any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful, but WITHOUT</div><div class='add'>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='add'>+ * more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License along with</div><div class='add'>+ * this program; if not, write to the Free Software Foundation, Inc., 59</div><div class='add'>+ * Temple Place - Suite 330, Boston, MA  02111-1307, USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _ATL2_H_</div><div class='add'>+#define _ATL2_H_</div><div class='add'>+</div><div class='add'>+#include &lt;asm/atomic.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+</div><div class='add'>+#ifndef _ATL2_HW_H_</div><div class='add'>+#define _ATL2_HW_H_</div><div class='add'>+</div><div class='add'>+#ifndef _ATL2_OSDEP_H_</div><div class='add'>+#define _ATL2_OSDEP_H_</div><div class='add'>+</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/if_ether.h&gt;</div><div class='add'>+</div><div class='add'>+#include "atlx.h"</div><div class='add'>+</div><div class='add'>+#ifdef ETHTOOL_OPS_COMPAT</div><div class='add'>+extern int ethtool_ioctl(struct ifreq *ifr);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define PCI_COMMAND_REGISTER	PCI_COMMAND</div><div class='add'>+#define CMD_MEM_WRT_INVALIDATE	PCI_COMMAND_INVALIDATE</div><div class='add'>+#define ETH_ADDR_LEN		ETH_ALEN</div><div class='add'>+</div><div class='add'>+#define ATL2_WRITE_REG(a, reg, value) (iowrite32((value), \</div><div class='add'>+	((a)-&gt;hw_addr + (reg))))</div><div class='add'>+</div><div class='add'>+#define ATL2_WRITE_FLUSH(a) (ioread32((a)-&gt;hw_addr))</div><div class='add'>+</div><div class='add'>+#define ATL2_READ_REG(a, reg) (ioread32((a)-&gt;hw_addr + (reg)))</div><div class='add'>+</div><div class='add'>+#define ATL2_WRITE_REGB(a, reg, value) (iowrite8((value), \</div><div class='add'>+	((a)-&gt;hw_addr + (reg))))</div><div class='add'>+</div><div class='add'>+#define ATL2_READ_REGB(a, reg) (ioread8((a)-&gt;hw_addr + (reg)))</div><div class='add'>+</div><div class='add'>+#define ATL2_WRITE_REGW(a, reg, value) (iowrite16((value), \</div><div class='add'>+	((a)-&gt;hw_addr + (reg))))</div><div class='add'>+</div><div class='add'>+#define ATL2_READ_REGW(a, reg) (ioread16((a)-&gt;hw_addr + (reg)))</div><div class='add'>+</div><div class='add'>+#define ATL2_WRITE_REG_ARRAY(a, reg, offset, value) \</div><div class='add'>+	(iowrite32((value), (((a)-&gt;hw_addr + (reg)) + ((offset) &lt;&lt; 2))))</div><div class='add'>+</div><div class='add'>+#define ATL2_READ_REG_ARRAY(a, reg, offset) \</div><div class='add'>+	(ioread32(((a)-&gt;hw_addr + (reg)) + ((offset) &lt;&lt; 2)))</div><div class='add'>+</div><div class='add'>+#endif /* _ATL2_OSDEP_H_ */</div><div class='add'>+</div><div class='add'>+struct atl2_adapter;</div><div class='add'>+struct atl2_hw;</div><div class='add'>+</div><div class='add'>+/* function prototype */</div><div class='add'>+static s32 atl2_reset_hw(struct atl2_hw *hw);</div><div class='add'>+static s32 atl2_read_mac_addr(struct atl2_hw *hw);</div><div class='add'>+static s32 atl2_init_hw(struct atl2_hw *hw);</div><div class='add'>+static s32 atl2_get_speed_and_duplex(struct atl2_hw *hw, u16 *speed,</div><div class='add'>+	u16 *duplex);</div><div class='add'>+static u32 atl2_hash_mc_addr(struct atl2_hw *hw, u8 *mc_addr);</div><div class='add'>+static void atl2_hash_set(struct atl2_hw *hw, u32 hash_value);</div><div class='add'>+static s32 atl2_read_phy_reg(struct atl2_hw *hw, u16 reg_addr, u16 *phy_data);</div><div class='add'>+static s32 atl2_write_phy_reg(struct atl2_hw *hw, u32 reg_addr, u16 phy_data);</div><div class='add'>+static void atl2_read_pci_cfg(struct atl2_hw *hw, u32 reg, u16 *value);</div><div class='add'>+static void atl2_write_pci_cfg(struct atl2_hw *hw, u32 reg, u16 *value);</div><div class='add'>+static void atl2_set_mac_addr(struct atl2_hw *hw);</div><div class='add'>+static bool atl2_read_eeprom(struct atl2_hw *hw, u32 Offset, u32 *pValue);</div><div class='add'>+static bool atl2_write_eeprom(struct atl2_hw *hw, u32 offset, u32 value);</div><div class='add'>+static s32 atl2_phy_init(struct atl2_hw *hw);</div><div class='add'>+static int atl2_check_eeprom_exist(struct atl2_hw *hw);</div><div class='add'>+static void atl2_force_ps(struct atl2_hw *hw);</div><div class='add'>+</div><div class='add'>+/* register definition */</div><div class='add'>+</div><div class='add'>+/* Block IDLE Status Register */</div><div class='add'>+#define IDLE_STATUS_RXMAC	1	/* 1: RXMAC is non-IDLE */</div><div class='add'>+#define IDLE_STATUS_TXMAC	2	/* 1: TXMAC is non-IDLE */</div><div class='add'>+#define IDLE_STATUS_DMAR	8	/* 1: DMAR is non-IDLE */</div><div class='add'>+#define IDLE_STATUS_DMAW	4	/* 1: DMAW is non-IDLE */</div><div class='add'>+</div><div class='add'>+/* MDIO Control Register */</div><div class='add'>+#define MDIO_WAIT_TIMES		10</div><div class='add'>+</div><div class='add'>+/* MAC Control Register */</div><div class='add'>+#define MAC_CTRL_DBG_TX_BKPRESURE	0x100000	/* 1: TX max backoff */</div><div class='add'>+#define MAC_CTRL_MACLP_CLK_PHY		0x8000000	/* 1: 25MHz from phy */</div><div class='add'>+#define MAC_CTRL_HALF_LEFT_BUF_SHIFT	28</div><div class='add'>+#define MAC_CTRL_HALF_LEFT_BUF_MASK	0xF		/* MAC retry buf x32B */</div><div class='add'>+</div><div class='add'>+/* Internal SRAM Partition Register */</div><div class='add'>+#define REG_SRAM_TXRAM_END	0x1500	/* Internal tail address of TXRAM</div><div class='add'>+					 * default: 2byte*1024 */</div><div class='add'>+#define REG_SRAM_RXRAM_END	0x1502	/* Internal tail address of RXRAM</div><div class='add'>+					 * default: 2byte*1024 */</div><div class='add'>+</div><div class='add'>+/* Descriptor Control register */</div><div class='add'>+#define REG_TXD_BASE_ADDR_LO	0x1544	/* The base address of the Transmit</div><div class='add'>+					 * Data Mem low 32-bit(dword align) */</div><div class='add'>+#define REG_TXD_MEM_SIZE	0x1548	/* Transmit Data Memory size(by</div><div class='add'>+					 * double word , max 256KB) */</div><div class='add'>+#define REG_TXS_BASE_ADDR_LO	0x154C	/* The base address of the Transmit</div><div class='add'>+					 * Status Memory low 32-bit(dword word</div><div class='add'>+					 * align) */</div><div class='add'>+#define REG_TXS_MEM_SIZE	0x1550	/* double word unit, max 4*2047</div><div class='add'>+					 * bytes. */</div><div class='add'>+#define REG_RXD_BASE_ADDR_LO	0x1554	/* The base address of the Transmit</div><div class='add'>+					 * Status Memory low 32-bit(unit 8</div><div class='add'>+					 * bytes) */</div><div class='add'>+#define REG_RXD_BUF_NUM		0x1558	/* Receive Data &amp; Status Memory buffer</div><div class='add'>+					 * number (unit 1536bytes, max</div><div class='add'>+					 * 1536*2047) */</div><div class='add'>+</div><div class='add'>+/* DMAR Control Register */</div><div class='add'>+#define REG_DMAR	0x1580</div><div class='add'>+#define     DMAR_EN	0x1	/* 1: Enable DMAR */</div><div class='add'>+</div><div class='add'>+/* TX Cur-Through (early tx threshold) Control Register */</div><div class='add'>+#define REG_TX_CUT_THRESH	0x1590	/* TxMac begin transmit packet</div><div class='add'>+					 * threshold(unit word) */</div><div class='add'>+</div><div class='add'>+/* DMAW Control Register */</div><div class='add'>+#define REG_DMAW	0x15A0</div><div class='add'>+#define     DMAW_EN	0x1</div><div class='add'>+</div><div class='add'>+/* Flow control register */</div><div class='add'>+#define REG_PAUSE_ON_TH		0x15A8	/* RXD high watermark of overflow</div><div class='add'>+					 * threshold configuration register */</div><div class='add'>+#define REG_PAUSE_OFF_TH	0x15AA	/* RXD lower watermark of overflow</div><div class='add'>+					 * threshold configuration register */</div><div class='add'>+</div><div class='add'>+/* Mailbox Register */</div><div class='add'>+#define REG_MB_TXD_WR_IDX	0x15f0	/* double word align */</div><div class='add'>+#define REG_MB_RXD_RD_IDX	0x15F4	/* RXD Read index (unit: 1536byets) */</div><div class='add'>+</div><div class='add'>+/* Interrupt Status Register */</div><div class='add'>+#define ISR_TIMER	1	/* Interrupt when Timer counts down to zero */</div><div class='add'>+#define ISR_MANUAL	2	/* Software manual interrupt, for debug. Set</div><div class='add'>+				 * when SW_MAN_INT_EN is set in Table 51</div><div class='add'>+				 * Selene Master Control Register</div><div class='add'>+				 * (Offset 0x1400). */</div><div class='add'>+#define ISR_RXF_OV	4	/* RXF overflow interrupt */</div><div class='add'>+#define ISR_TXF_UR	8	/* TXF underrun interrupt */</div><div class='add'>+#define ISR_TXS_OV	0x10	/* Internal transmit status buffer full</div><div class='add'>+				 * interrupt */</div><div class='add'>+#define ISR_RXS_OV	0x20	/* Internal receive status buffer full</div><div class='add'>+				 * interrupt */</div><div class='add'>+#define ISR_LINK_CHG	0x40	/* Link Status Change Interrupt */</div><div class='add'>+#define ISR_HOST_TXD_UR	0x80</div><div class='add'>+#define ISR_HOST_RXD_OV	0x100	/* Host rx data memory full , one pulse */</div><div class='add'>+#define ISR_DMAR_TO_RST	0x200	/* DMAR op timeout interrupt. SW should</div><div class='add'>+				 * do Reset */</div><div class='add'>+#define ISR_DMAW_TO_RST	0x400</div><div class='add'>+#define ISR_PHY		0x800	/* phy interrupt */</div><div class='add'>+#define ISR_TS_UPDATE	0x10000	/* interrupt after new tx pkt status written</div><div class='add'>+				 * to host */</div><div class='add'>+#define ISR_RS_UPDATE	0x20000	/* interrupt ater new rx pkt status written</div><div class='add'>+				 * to host. */</div><div class='add'>+#define ISR_TX_EARLY	0x40000	/* interrupt when txmac begin transmit one</div><div class='add'>+				 * packet */</div><div class='add'>+</div><div class='add'>+#define ISR_TX_EVENT (ISR_TXF_UR | ISR_TXS_OV | ISR_HOST_TXD_UR |\</div><div class='add'>+	ISR_TS_UPDATE | ISR_TX_EARLY)</div><div class='add'>+#define ISR_RX_EVENT (ISR_RXF_OV | ISR_RXS_OV | ISR_HOST_RXD_OV |\</div><div class='add'>+	 ISR_RS_UPDATE)</div><div class='add'>+</div><div class='add'>+#define IMR_NORMAL_MASK		(\</div><div class='add'>+	/*ISR_LINK_CHG		|*/\</div><div class='add'>+	ISR_MANUAL		|\</div><div class='add'>+	ISR_DMAR_TO_RST		|\</div><div class='add'>+	ISR_DMAW_TO_RST		|\</div><div class='add'>+	ISR_PHY			|\</div><div class='add'>+	ISR_PHY_LINKDOWN	|\</div><div class='add'>+	ISR_TS_UPDATE		|\</div><div class='add'>+	ISR_RS_UPDATE)</div><div class='add'>+</div><div class='add'>+/* Receive MAC Statistics Registers */</div><div class='add'>+#define REG_STS_RX_PAUSE	0x1700	/* Num pause packets received */</div><div class='add'>+#define REG_STS_RXD_OV		0x1704	/* Num frames dropped due to RX</div><div class='add'>+					 * FIFO overflow */</div><div class='add'>+#define REG_STS_RXS_OV		0x1708	/* Num frames dropped due to RX</div><div class='add'>+					 * Status Buffer Overflow */</div><div class='add'>+#define REG_STS_RX_FILTER	0x170C	/* Num packets dropped due to</div><div class='add'>+					 * address filtering */</div><div class='add'>+</div><div class='add'>+/* MII definitions */</div><div class='add'>+</div><div class='add'>+/* PHY Common Register */</div><div class='add'>+#define MII_SMARTSPEED	0x14</div><div class='add'>+#define MII_DBG_ADDR	0x1D</div><div class='add'>+#define MII_DBG_DATA	0x1E</div><div class='add'>+</div><div class='add'>+/* PCI Command Register Bit Definitions */</div><div class='add'>+#define PCI_REG_COMMAND		0x04</div><div class='add'>+#define CMD_IO_SPACE		0x0001</div><div class='add'>+#define CMD_MEMORY_SPACE	0x0002</div><div class='add'>+#define CMD_BUS_MASTER		0x0004</div><div class='add'>+</div><div class='add'>+#define MEDIA_TYPE_100M_FULL	1</div><div class='add'>+#define MEDIA_TYPE_100M_HALF	2</div><div class='add'>+#define MEDIA_TYPE_10M_FULL	3</div><div class='add'>+#define MEDIA_TYPE_10M_HALF	4</div><div class='add'>+</div><div class='add'>+#define AUTONEG_ADVERTISE_SPEED_DEFAULT	0x000F	/* Everything */</div><div class='add'>+</div><div class='add'>+/* The size (in bytes) of a ethernet packet */</div><div class='add'>+#define ENET_HEADER_SIZE		14</div><div class='add'>+#define MAXIMUM_ETHERNET_FRAME_SIZE	1518	/* with FCS */</div><div class='add'>+#define MINIMUM_ETHERNET_FRAME_SIZE	64	/* with FCS */</div><div class='add'>+#define ETHERNET_FCS_SIZE		4</div><div class='add'>+#define MAX_JUMBO_FRAME_SIZE		0x2000</div><div class='add'>+#define VLAN_SIZE                                               4</div><div class='add'>+</div><div class='add'>+struct tx_pkt_header {</div><div class='add'>+	unsigned pkt_size:11;</div><div class='add'>+	unsigned:4;			/* reserved */</div><div class='add'>+	unsigned ins_vlan:1;		/* txmac should insert vlan */</div><div class='add'>+	unsigned short vlan;		/* vlan tag */</div><div class='add'>+};</div><div class='add'>+/* FIXME: replace above bitfields with MASK/SHIFT defines below */</div><div class='add'>+#define TX_PKT_HEADER_SIZE_MASK		0x7FF</div><div class='add'>+#define TX_PKT_HEADER_SIZE_SHIFT	0</div><div class='add'>+#define TX_PKT_HEADER_INS_VLAN_MASK	0x1</div><div class='add'>+#define TX_PKT_HEADER_INS_VLAN_SHIFT	15</div><div class='add'>+#define TX_PKT_HEADER_VLAN_TAG_MASK	0xFFFF</div><div class='add'>+#define TX_PKT_HEADER_VLAN_TAG_SHIFT	16</div><div class='add'>+</div><div class='add'>+struct tx_pkt_status {</div><div class='add'>+	unsigned pkt_size:11;</div><div class='add'>+	unsigned:5;		/* reserved */</div><div class='add'>+	unsigned ok:1;		/* current packet transmitted without error */</div><div class='add'>+	unsigned bcast:1;	/* broadcast packet */</div><div class='add'>+	unsigned mcast:1;	/* multicast packet */</div><div class='add'>+	unsigned pause:1;	/* transmiited a pause frame */</div><div class='add'>+	unsigned ctrl:1;</div><div class='add'>+	unsigned defer:1;    	/* current packet is xmitted with defer */</div><div class='add'>+	unsigned exc_defer:1;</div><div class='add'>+	unsigned single_col:1;</div><div class='add'>+	unsigned multi_col:1;</div><div class='add'>+	unsigned late_col:1;</div><div class='add'>+	unsigned abort_col:1;</div><div class='add'>+	unsigned underun:1;	/* current packet is aborted</div><div class='add'>+				 * due to txram underrun */</div><div class='add'>+	unsigned:3;		/* reserved */</div><div class='add'>+	unsigned update:1;	/* always 1'b1 in tx_status_buf */</div><div class='add'>+};</div><div class='add'>+/* FIXME: replace above bitfields with MASK/SHIFT defines below */</div><div class='add'>+#define TX_PKT_STATUS_SIZE_MASK		0x7FF</div><div class='add'>+#define TX_PKT_STATUS_SIZE_SHIFT	0</div><div class='add'>+#define TX_PKT_STATUS_OK_MASK		0x1</div><div class='add'>+#define TX_PKT_STATUS_OK_SHIFT		16</div><div class='add'>+#define TX_PKT_STATUS_BCAST_MASK	0x1</div><div class='add'>+#define TX_PKT_STATUS_BCAST_SHIFT	17</div><div class='add'>+#define TX_PKT_STATUS_MCAST_MASK	0x1</div><div class='add'>+#define TX_PKT_STATUS_MCAST_SHIFT	18</div><div class='add'>+#define TX_PKT_STATUS_PAUSE_MASK	0x1</div><div class='add'>+#define TX_PKT_STATUS_PAUSE_SHIFT	19</div><div class='add'>+#define TX_PKT_STATUS_CTRL_MASK		0x1</div><div class='add'>+#define TX_PKT_STATUS_CTRL_SHIFT	20</div><div class='add'>+#define TX_PKT_STATUS_DEFER_MASK	0x1</div><div class='add'>+#define TX_PKT_STATUS_DEFER_SHIFT	21</div><div class='add'>+#define TX_PKT_STATUS_EXC_DEFER_MASK	0x1</div><div class='add'>+#define TX_PKT_STATUS_EXC_DEFER_SHIFT	22</div><div class='add'>+#define TX_PKT_STATUS_SINGLE_COL_MASK	0x1</div><div class='add'>+#define TX_PKT_STATUS_SINGLE_COL_SHIFT	23</div><div class='add'>+#define TX_PKT_STATUS_MULTI_COL_MASK	0x1</div><div class='add'>+#define TX_PKT_STATUS_MULTI_COL_SHIFT	24</div><div class='add'>+#define TX_PKT_STATUS_LATE_COL_MASK	0x1</div><div class='add'>+#define TX_PKT_STATUS_LATE_COL_SHIFT	25</div><div class='add'>+#define TX_PKT_STATUS_ABORT_COL_MASK	0x1</div><div class='add'>+#define TX_PKT_STATUS_ABORT_COL_SHIFT	26</div><div class='add'>+#define TX_PKT_STATUS_UNDERRUN_MASK	0x1</div><div class='add'>+#define TX_PKT_STATUS_UNDERRUN_SHIFT	27</div><div class='add'>+#define TX_PKT_STATUS_UPDATE_MASK	0x1</div><div class='add'>+#define TX_PKT_STATUS_UPDATE_SHIFT	31</div><div class='add'>+</div><div class='add'>+struct rx_pkt_status {</div><div class='add'>+	unsigned pkt_size:11;	/* packet size, max 2047 bytes */</div><div class='add'>+	unsigned:5;		/* reserved */</div><div class='add'>+	unsigned ok:1;		/* current packet received ok without error */</div><div class='add'>+	unsigned bcast:1;	/* current packet is broadcast */</div><div class='add'>+	unsigned mcast:1;	/* current packet is multicast */</div><div class='add'>+	unsigned pause:1;</div><div class='add'>+	unsigned ctrl:1;</div><div class='add'>+	unsigned crc:1;		/* received a packet with crc error */</div><div class='add'>+	unsigned code:1;	/* received a packet with code error */</div><div class='add'>+	unsigned runt:1;	/* received a packet less than 64 bytes</div><div class='add'>+				 * with good crc */</div><div class='add'>+	unsigned frag:1;	/* received a packet less than 64 bytes</div><div class='add'>+				 * with bad crc */</div><div class='add'>+	unsigned trunc:1;	/* current frame truncated due to rxram full */</div><div class='add'>+	unsigned align:1;	/* this packet is alignment error */</div><div class='add'>+	unsigned vlan:1;	/* this packet has vlan */</div><div class='add'>+	unsigned:3;		/* reserved */</div><div class='add'>+	unsigned update:1;</div><div class='add'>+	unsigned short vtag;	/* vlan tag */</div><div class='add'>+	unsigned:16;</div><div class='add'>+};</div><div class='add'>+/* FIXME: replace above bitfields with MASK/SHIFT defines below */</div><div class='add'>+#define RX_PKT_STATUS_SIZE_MASK		0x7FF</div><div class='add'>+#define RX_PKT_STATUS_SIZE_SHIFT	0</div><div class='add'>+#define RX_PKT_STATUS_OK_MASK		0x1</div><div class='add'>+#define RX_PKT_STATUS_OK_SHIFT		16</div><div class='add'>+#define RX_PKT_STATUS_BCAST_MASK	0x1</div><div class='add'>+#define RX_PKT_STATUS_BCAST_SHIFT	17</div><div class='add'>+#define RX_PKT_STATUS_MCAST_MASK	0x1</div><div class='add'>+#define RX_PKT_STATUS_MCAST_SHIFT	18</div><div class='add'>+#define RX_PKT_STATUS_PAUSE_MASK	0x1</div><div class='add'>+#define RX_PKT_STATUS_PAUSE_SHIFT	19</div><div class='add'>+#define RX_PKT_STATUS_CTRL_MASK		0x1</div><div class='add'>+#define RX_PKT_STATUS_CTRL_SHIFT	20</div><div class='add'>+#define RX_PKT_STATUS_CRC_MASK		0x1</div><div class='add'>+#define RX_PKT_STATUS_CRC_SHIFT		21</div><div class='add'>+#define RX_PKT_STATUS_CODE_MASK		0x1</div><div class='add'>+#define RX_PKT_STATUS_CODE_SHIFT	22</div><div class='add'>+#define RX_PKT_STATUS_RUNT_MASK		0x1</div><div class='add'>+#define RX_PKT_STATUS_RUNT_SHIFT	23</div><div class='add'>+#define RX_PKT_STATUS_FRAG_MASK		0x1</div><div class='add'>+#define RX_PKT_STATUS_FRAG_SHIFT	24</div><div class='add'>+#define RX_PKT_STATUS_TRUNK_MASK	0x1</div><div class='add'>+#define RX_PKT_STATUS_TRUNK_SHIFT	25</div><div class='add'>+#define RX_PKT_STATUS_ALIGN_MASK	0x1</div><div class='add'>+#define RX_PKT_STATUS_ALIGN_SHIFT	26</div><div class='add'>+#define RX_PKT_STATUS_VLAN_MASK		0x1</div><div class='add'>+#define RX_PKT_STATUS_VLAN_SHIFT	27</div><div class='add'>+#define RX_PKT_STATUS_UPDATE_MASK	0x1</div><div class='add'>+#define RX_PKT_STATUS_UPDATE_SHIFT	31</div><div class='add'>+#define RX_PKT_STATUS_VLAN_TAG_MASK	0xFFFF</div><div class='add'>+#define RX_PKT_STATUS_VLAN_TAG_SHIFT	32</div><div class='add'>+</div><div class='add'>+struct rx_desc {</div><div class='add'>+	struct rx_pkt_status	status;</div><div class='add'>+	unsigned char     	packet[1536-sizeof(struct rx_pkt_status)];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum atl2_speed_duplex {</div><div class='add'>+	atl2_10_half = 0,</div><div class='add'>+	atl2_10_full = 1,</div><div class='add'>+	atl2_100_half = 2,</div><div class='add'>+	atl2_100_full = 3</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct atl2_spi_flash_dev {</div><div class='add'>+	const char *manu_name;	/* manufacturer id */</div><div class='add'>+	/* op-code */</div><div class='add'>+	u8 cmdWRSR;</div><div class='add'>+	u8 cmdREAD;</div><div class='add'>+	u8 cmdPROGRAM;</div><div class='add'>+	u8 cmdWREN;</div><div class='add'>+	u8 cmdWRDI;</div><div class='add'>+	u8 cmdRDSR;</div><div class='add'>+	u8 cmdRDID;</div><div class='add'>+	u8 cmdSECTOR_ERASE;</div><div class='add'>+	u8 cmdCHIP_ERASE;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Structure containing variables used by the shared code (atl2_hw.c) */</div><div class='add'>+struct atl2_hw {</div><div class='add'>+	u8 __iomem *hw_addr;</div><div class='add'>+	void *back;</div><div class='add'>+</div><div class='add'>+	u8 preamble_len;</div><div class='add'>+	u8 max_retry;          /* Retransmission maximum, afterwards the</div><div class='add'>+				* packet will be discarded. */</div><div class='add'>+	u8 jam_ipg;            /* IPG to start JAM for collision based flow</div><div class='add'>+				* control in half-duplex mode. In unit of</div><div class='add'>+				* 8-bit time. */</div><div class='add'>+	u8 ipgt;               /* Desired back to back inter-packet gap. The</div><div class='add'>+				* default is 96-bit time. */</div><div class='add'>+	u8 min_ifg;            /* Minimum number of IFG to enforce in between</div><div class='add'>+				* RX frames. Frame gap below such IFP is</div><div class='add'>+				* dropped. */</div><div class='add'>+	u8 ipgr1;              /* 64bit Carrier-Sense window */</div><div class='add'>+	u8 ipgr2;              /* 96-bit IPG window */</div><div class='add'>+	u8 retry_buf;          /* When half-duplex mode, should hold some</div><div class='add'>+				* bytes for mac retry . (8*4bytes unit) */</div><div class='add'>+</div><div class='add'>+	u16 fc_rxd_hi;</div><div class='add'>+	u16 fc_rxd_lo;</div><div class='add'>+	u16 lcol;              /* Collision Window */</div><div class='add'>+	u16 max_frame_size;</div><div class='add'>+</div><div class='add'>+	u16 MediaType;</div><div class='add'>+	u16 autoneg_advertised;</div><div class='add'>+	u16 pci_cmd_word;</div><div class='add'>+</div><div class='add'>+	u16 mii_autoneg_adv_reg;</div><div class='add'>+</div><div class='add'>+	u32 mem_rang;</div><div class='add'>+	u32 txcw;</div><div class='add'>+	u32 mc_filter_type;</div><div class='add'>+	u32 num_mc_addrs;</div><div class='add'>+	u32 collision_delta;</div><div class='add'>+	u32 tx_packet_delta;</div><div class='add'>+	u16 phy_spd_default;</div><div class='add'>+</div><div class='add'>+	u16 device_id;</div><div class='add'>+	u16 vendor_id;</div><div class='add'>+	u16 subsystem_id;</div><div class='add'>+	u16 subsystem_vendor_id;</div><div class='add'>+	u8 revision_id;</div><div class='add'>+</div><div class='add'>+	/* spi flash */</div><div class='add'>+	u8 flash_vendor;</div><div class='add'>+</div><div class='add'>+	u8 dma_fairness;</div><div class='add'>+	u8 mac_addr[NODE_ADDRESS_SIZE];</div><div class='add'>+	u8 perm_mac_addr[NODE_ADDRESS_SIZE];</div><div class='add'>+</div><div class='add'>+	/* FIXME */</div><div class='add'>+	/* bool phy_preamble_sup; */</div><div class='add'>+	bool phy_configured;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif /* _ATL2_HW_H_ */</div><div class='add'>+</div><div class='add'>+struct atl2_ring_header {</div><div class='add'>+    /* pointer to the descriptor ring memory */</div><div class='add'>+    void *desc;</div><div class='add'>+    /* physical adress of the descriptor ring */</div><div class='add'>+    dma_addr_t dma;</div><div class='add'>+    /* length of descriptor ring in bytes */</div><div class='add'>+    unsigned int size;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* board specific private data structure */</div><div class='add'>+struct atl2_adapter {</div><div class='add'>+	/* OS defined structs */</div><div class='add'>+	struct net_device *netdev;</div><div class='add'>+	struct pci_dev *pdev;</div><div class='add'>+	struct net_device_stats net_stats;</div><div class='add'>+#ifdef NETIF_F_HW_VLAN_TX</div><div class='add'>+	struct vlan_group *vlgrp;</div><div class='add'>+#endif</div><div class='add'>+	u32 wol;</div><div class='add'>+	u16 link_speed;</div><div class='add'>+	u16 link_duplex;</div><div class='add'>+</div><div class='add'>+	spinlock_t stats_lock;</div><div class='add'>+</div><div class='add'>+	struct work_struct reset_task;</div><div class='add'>+	struct work_struct link_chg_task;</div><div class='add'>+	struct timer_list watchdog_timer;</div><div class='add'>+	struct timer_list phy_config_timer;</div><div class='add'>+</div><div class='add'>+	unsigned long cfg_phy;</div><div class='add'>+	bool mac_disabled;</div><div class='add'>+</div><div class='add'>+	/* All Descriptor memory */</div><div class='add'>+	dma_addr_t	ring_dma;</div><div class='add'>+	void		*ring_vir_addr;</div><div class='add'>+	int		ring_size;</div><div class='add'>+</div><div class='add'>+	struct tx_pkt_header	*txd_ring;</div><div class='add'>+	dma_addr_t	txd_dma;</div><div class='add'>+</div><div class='add'>+	struct tx_pkt_status	*txs_ring;</div><div class='add'>+	dma_addr_t	txs_dma;</div><div class='add'>+</div><div class='add'>+	struct rx_desc	*rxd_ring;</div><div class='add'>+	dma_addr_t	rxd_dma;</div><div class='add'>+</div><div class='add'>+	u32 txd_ring_size;         /* bytes per unit */</div><div class='add'>+	u32 txs_ring_size;         /* dwords per unit */</div><div class='add'>+	u32 rxd_ring_size;         /* 1536 bytes per unit */</div><div class='add'>+</div><div class='add'>+	/* read /write ptr: */</div><div class='add'>+	/* host */</div><div class='add'>+	u32 txd_write_ptr;</div><div class='add'>+	u32 txs_next_clear;</div><div class='add'>+	u32 rxd_read_ptr;</div><div class='add'>+</div><div class='add'>+	/* nic */</div><div class='add'>+	atomic_t txd_read_ptr;</div><div class='add'>+	atomic_t txs_write_ptr;</div><div class='add'>+	u32 rxd_write_ptr;</div><div class='add'>+</div><div class='add'>+	/* Interrupt Moderator timer ( 2us resolution) */</div><div class='add'>+	u16 imt;</div><div class='add'>+	/* Interrupt Clear timer (2us resolution) */</div><div class='add'>+	u16 ict;</div><div class='add'>+</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	/* structs defined in atl2_hw.h */</div><div class='add'>+	u32 bd_number;     /* board number */</div><div class='add'>+	bool pci_using_64;</div><div class='add'>+	bool have_msi;</div><div class='add'>+	struct atl2_hw hw;</div><div class='add'>+</div><div class='add'>+	u32 usr_cmd;</div><div class='add'>+	/* FIXME */</div><div class='add'>+	/* u32 regs_buff[ATL2_REGS_LEN]; */</div><div class='add'>+	u32 pci_state[16];</div><div class='add'>+</div><div class='add'>+	u32 *config_space;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum atl2_state_t {</div><div class='add'>+	__ATL2_TESTING,</div><div class='add'>+	__ATL2_RESETTING,</div><div class='add'>+	__ATL2_DOWN</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif /* _ATL2_H_ */</div><div class='head'>diff --git a/drivers/net/atlx/atlx.c b/drivers/net/atlx/atlx.c<br/>index b3e7fcf0f6e7..3cc9d1089ca1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/atlx/atlx.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/atlx/atlx.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/atlx/atlx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/atlx/atlx.c</a></div><div class='hunk'>@@ -105,7 +105,6 @@ static void atlx_check_for_link(struct atlx_adapter *adapter)</div><div class='ctx'> 				netdev-&gt;name);</div><div class='ctx'> 			adapter-&gt;link_speed = SPEED_0;</div><div class='ctx'> 			netif_carrier_off(netdev);</div><div class='del'>-			netif_stop_queue(netdev);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	schedule_work(&amp;adapter-&gt;link_chg_task);</div><div class='head'>diff --git a/drivers/net/au1000_eth.c b/drivers/net/au1000_eth.c<br/>index 5ee1b0557a02..019b13c08ae6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/au1000_eth.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/au1000_eth.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/au1000_eth.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/au1000_eth.c</a></div><div class='hunk'>@@ -94,8 +94,8 @@ static irqreturn_t au1000_interrupt(int, void *);</div><div class='ctx'> static void au1000_tx_timeout(struct net_device *);</div><div class='ctx'> static void set_rx_mode(struct net_device *);</div><div class='ctx'> static int au1000_ioctl(struct net_device *, struct ifreq *, int);</div><div class='del'>-static int mdio_read(struct net_device *, int, int);</div><div class='del'>-static void mdio_write(struct net_device *, int, int, u16);</div><div class='add'>+static int au1000_mdio_read(struct net_device *, int, int);</div><div class='add'>+static void au1000_mdio_write(struct net_device *, int, int, u16);</div><div class='ctx'> static void au1000_adjust_link(struct net_device *);</div><div class='ctx'> static void enable_mac(struct net_device *, int);</div><div class='ctx'> </div><div class='hunk'>@@ -191,7 +191,7 @@ struct au1000_private *au_macs[NUM_ETH_INTERFACES];</div><div class='ctx'> /*</div><div class='ctx'>  * MII operations</div><div class='ctx'>  */</div><div class='del'>-static int mdio_read(struct net_device *dev, int phy_addr, int reg)</div><div class='add'>+static int au1000_mdio_read(struct net_device *dev, int phy_addr, int reg)</div><div class='ctx'> {</div><div class='ctx'> 	struct au1000_private *aup = (struct au1000_private *) dev-&gt;priv;</div><div class='ctx'> 	volatile u32 *const mii_control_reg = &amp;aup-&gt;mac-&gt;mii_control;</div><div class='hunk'>@@ -225,7 +225,8 @@ static int mdio_read(struct net_device *dev, int phy_addr, int reg)</div><div class='ctx'> 	return (int)*mii_data_reg;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mdio_write(struct net_device *dev, int phy_addr, int reg, u16 value)</div><div class='add'>+static void au1000_mdio_write(struct net_device *dev, int phy_addr,</div><div class='add'>+			      int reg, u16 value)</div><div class='ctx'> {</div><div class='ctx'> 	struct au1000_private *aup = (struct au1000_private *) dev-&gt;priv;</div><div class='ctx'> 	volatile u32 *const mii_control_reg = &amp;aup-&gt;mac-&gt;mii_control;</div><div class='hunk'>@@ -249,7 +250,7 @@ static void mdio_write(struct net_device *dev, int phy_addr, int reg, u16 value)</div><div class='ctx'> 	*mii_control_reg = mii_control;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mdiobus_read(struct mii_bus *bus, int phy_addr, int regnum)</div><div class='add'>+static int au1000_mdiobus_read(struct mii_bus *bus, int phy_addr, int regnum)</div><div class='ctx'> {</div><div class='ctx'> 	/* WARNING: bus-&gt;phy_map[phy_addr].attached_dev == dev does</div><div class='ctx'> 	 * _NOT_ hold (e.g. when PHY is accessed through other MAC's MII bus) */</div><div class='hunk'>@@ -257,21 +258,21 @@ static int mdiobus_read(struct mii_bus *bus, int phy_addr, int regnum)</div><div class='ctx'> </div><div class='ctx'> 	enable_mac(dev, 0); /* make sure the MAC associated with this</div><div class='ctx'> 			     * mii_bus is enabled */</div><div class='del'>-	return mdio_read(dev, phy_addr, regnum);</div><div class='add'>+	return au1000_mdio_read(dev, phy_addr, regnum);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mdiobus_write(struct mii_bus *bus, int phy_addr, int regnum,</div><div class='del'>-			 u16 value)</div><div class='add'>+static int au1000_mdiobus_write(struct mii_bus *bus, int phy_addr, int regnum,</div><div class='add'>+				u16 value)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *const dev = bus-&gt;priv;</div><div class='ctx'> </div><div class='ctx'> 	enable_mac(dev, 0); /* make sure the MAC associated with this</div><div class='ctx'> 			     * mii_bus is enabled */</div><div class='del'>-	mdio_write(dev, phy_addr, regnum, value);</div><div class='add'>+	au1000_mdio_write(dev, phy_addr, regnum, value);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mdiobus_reset(struct mii_bus *bus)</div><div class='add'>+static int au1000_mdiobus_reset(struct mii_bus *bus)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *const dev = bus-&gt;priv;</div><div class='ctx'> </div><div class='hunk'>@@ -290,7 +291,7 @@ static int mii_probe (struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	if(aup-&gt;mac_id == 0) { /* get PHY0 */</div><div class='ctx'> # if defined(AU1XXX_PHY0_ADDR)</div><div class='del'>-		phydev = au_macs[AU1XXX_PHY0_BUSID]-&gt;mii_bus.phy_map[AU1XXX_PHY0_ADDR];</div><div class='add'>+		phydev = au_macs[AU1XXX_PHY0_BUSID]-&gt;mii_bus-&gt;phy_map[AU1XXX_PHY0_ADDR];</div><div class='ctx'> # else</div><div class='ctx'> 		printk (KERN_INFO DRV_NAME ":%s: using PHY-less setup\n",</div><div class='ctx'> 			dev-&gt;name);</div><div class='hunk'>@@ -298,7 +299,7 @@ static int mii_probe (struct net_device *dev)</div><div class='ctx'> # endif /* defined(AU1XXX_PHY0_ADDR) */</div><div class='ctx'> 	} else if (aup-&gt;mac_id == 1) { /* get PHY1 */</div><div class='ctx'> # if defined(AU1XXX_PHY1_ADDR)</div><div class='del'>-		phydev = au_macs[AU1XXX_PHY1_BUSID]-&gt;mii_bus.phy_map[AU1XXX_PHY1_ADDR];</div><div class='add'>+		phydev = au_macs[AU1XXX_PHY1_BUSID]-&gt;mii_bus-&gt;phy_map[AU1XXX_PHY1_ADDR];</div><div class='ctx'> # else</div><div class='ctx'> 		printk (KERN_INFO DRV_NAME ":%s: using PHY-less setup\n",</div><div class='ctx'> 			dev-&gt;name);</div><div class='hunk'>@@ -311,8 +312,8 @@ static int mii_probe (struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	/* find the first (lowest address) PHY on the current MAC's MII bus */</div><div class='ctx'> 	for (phy_addr = 0; phy_addr &lt; PHY_MAX_ADDR; phy_addr++)</div><div class='del'>-		if (aup-&gt;mii_bus.phy_map[phy_addr]) {</div><div class='del'>-			phydev = aup-&gt;mii_bus.phy_map[phy_addr];</div><div class='add'>+		if (aup-&gt;mii_bus-&gt;phy_map[phy_addr]) {</div><div class='add'>+			phydev = aup-&gt;mii_bus-&gt;phy_map[phy_addr];</div><div class='ctx'> # if !defined(AU1XXX_PHY_SEARCH_HIGHEST_ADDR)</div><div class='ctx'> 			break; /* break out with first one found */</div><div class='ctx'> # endif</div><div class='hunk'>@@ -331,7 +332,7 @@ static int mii_probe (struct net_device *dev)</div><div class='ctx'> 		 * the MAC0 MII bus */</div><div class='ctx'> 		for (phy_addr = 0; phy_addr &lt; PHY_MAX_ADDR; phy_addr++) {</div><div class='ctx'> 			struct phy_device *const tmp_phydev =</div><div class='del'>-				au_macs[0]-&gt;mii_bus.phy_map[phy_addr];</div><div class='add'>+				au_macs[0]-&gt;mii_bus-&gt;phy_map[phy_addr];</div><div class='ctx'> </div><div class='ctx'> 			if (!tmp_phydev)</div><div class='ctx'> 				continue; /* no PHY here... */</div><div class='hunk'>@@ -653,6 +654,8 @@ static struct net_device * au1000_probe(int port_num)</div><div class='ctx'> </div><div class='ctx'> 	aup = dev-&gt;priv;</div><div class='ctx'> </div><div class='add'>+	spin_lock_init(&amp;aup-&gt;lock);</div><div class='add'>+</div><div class='ctx'> 	/* Allocate the data buffers */</div><div class='ctx'> 	/* Snooping works fine with eth on all au1xxx */</div><div class='ctx'> 	aup-&gt;vaddr = (u32)dma_alloc_noncoherent(NULL, MAX_BUF_SIZE *</div><div class='hunk'>@@ -696,28 +699,32 @@ static struct net_device * au1000_probe(int port_num)</div><div class='ctx'> 	*aup-&gt;enable = 0;</div><div class='ctx'> 	aup-&gt;mac_enabled = 0;</div><div class='ctx'> </div><div class='del'>-	aup-&gt;mii_bus.priv = dev;</div><div class='del'>-	aup-&gt;mii_bus.read = mdiobus_read;</div><div class='del'>-	aup-&gt;mii_bus.write = mdiobus_write;</div><div class='del'>-	aup-&gt;mii_bus.reset = mdiobus_reset;</div><div class='del'>-	aup-&gt;mii_bus.name = "au1000_eth_mii";</div><div class='del'>-	snprintf(aup-&gt;mii_bus.id, MII_BUS_ID_SIZE, "%x", aup-&gt;mac_id);</div><div class='del'>-	aup-&gt;mii_bus.irq = kmalloc(sizeof(int)*PHY_MAX_ADDR, GFP_KERNEL);</div><div class='add'>+	aup-&gt;mii_bus = mdiobus_alloc();</div><div class='add'>+	if (aup-&gt;mii_bus == NULL)</div><div class='add'>+		goto err_out;</div><div class='add'>+</div><div class='add'>+	aup-&gt;mii_bus-&gt;priv = dev;</div><div class='add'>+	aup-&gt;mii_bus-&gt;read = au1000_mdiobus_read;</div><div class='add'>+	aup-&gt;mii_bus-&gt;write = au1000_mdiobus_write;</div><div class='add'>+	aup-&gt;mii_bus-&gt;reset = au1000_mdiobus_reset;</div><div class='add'>+	aup-&gt;mii_bus-&gt;name = "au1000_eth_mii";</div><div class='add'>+	snprintf(aup-&gt;mii_bus-&gt;id, MII_BUS_ID_SIZE, "%x", aup-&gt;mac_id);</div><div class='add'>+	aup-&gt;mii_bus-&gt;irq = kmalloc(sizeof(int)*PHY_MAX_ADDR, GFP_KERNEL);</div><div class='ctx'> 	for(i = 0; i &lt; PHY_MAX_ADDR; ++i)</div><div class='del'>-		aup-&gt;mii_bus.irq[i] = PHY_POLL;</div><div class='add'>+		aup-&gt;mii_bus-&gt;irq[i] = PHY_POLL;</div><div class='ctx'> </div><div class='ctx'> 	/* if known, set corresponding PHY IRQs */</div><div class='ctx'> #if defined(AU1XXX_PHY_STATIC_CONFIG)</div><div class='ctx'> # if defined(AU1XXX_PHY0_IRQ)</div><div class='ctx'> 	if (AU1XXX_PHY0_BUSID == aup-&gt;mac_id)</div><div class='del'>-		aup-&gt;mii_bus.irq[AU1XXX_PHY0_ADDR] = AU1XXX_PHY0_IRQ;</div><div class='add'>+		aup-&gt;mii_bus-&gt;irq[AU1XXX_PHY0_ADDR] = AU1XXX_PHY0_IRQ;</div><div class='ctx'> # endif</div><div class='ctx'> # if defined(AU1XXX_PHY1_IRQ)</div><div class='ctx'> 	if (AU1XXX_PHY1_BUSID == aup-&gt;mac_id)</div><div class='del'>-		aup-&gt;mii_bus.irq[AU1XXX_PHY1_ADDR] = AU1XXX_PHY1_IRQ;</div><div class='add'>+		aup-&gt;mii_bus-&gt;irq[AU1XXX_PHY1_ADDR] = AU1XXX_PHY1_IRQ;</div><div class='ctx'> # endif</div><div class='ctx'> #endif</div><div class='del'>-	mdiobus_register(&amp;aup-&gt;mii_bus);</div><div class='add'>+	mdiobus_register(aup-&gt;mii_bus);</div><div class='ctx'> </div><div class='ctx'> 	if (mii_probe(dev) != 0) {</div><div class='ctx'> 		goto err_out;</div><div class='hunk'>@@ -753,7 +760,6 @@ static struct net_device * au1000_probe(int port_num)</div><div class='ctx'> 		aup-&gt;tx_db_inuse[i] = pDB;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_lock_init(&amp;aup-&gt;lock);</div><div class='ctx'> 	dev-&gt;base_addr = base;</div><div class='ctx'> 	dev-&gt;irq = irq;</div><div class='ctx'> 	dev-&gt;open = au1000_open;</div><div class='hunk'>@@ -774,6 +780,11 @@ static struct net_device * au1000_probe(int port_num)</div><div class='ctx'> 	return dev;</div><div class='ctx'> </div><div class='ctx'> err_out:</div><div class='add'>+	if (aup-&gt;mii_bus != NULL) {</div><div class='add'>+		mdiobus_unregister(aup-&gt;mii_bus);</div><div class='add'>+		mdiobus_free(aup-&gt;mii_bus);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* here we should have a valid dev plus aup-&gt; register addresses</div><div class='ctx'> 	 * so we can reset the mac properly.*/</div><div class='ctx'> 	reset_mac(dev);</div><div class='hunk'>@@ -1004,6 +1015,8 @@ static void __exit au1000_cleanup_module(void)</div><div class='ctx'> 		if (dev) {</div><div class='ctx'> 			aup = (struct au1000_private *) dev-&gt;priv;</div><div class='ctx'> 			unregister_netdev(dev);</div><div class='add'>+			mdiobus_unregister(aup-&gt;mii_bus);</div><div class='add'>+			mdiobus_free(aup-&gt;mii_bus);</div><div class='ctx'> 			for (j = 0; j &lt; NUM_RX_DMA; j++)</div><div class='ctx'> 				if (aup-&gt;rx_db_inuse[j])</div><div class='ctx'> 					ReleaseDB(aup, aup-&gt;rx_db_inuse[j]);</div><div class='head'>diff --git a/drivers/net/au1000_eth.h b/drivers/net/au1000_eth.h<br/>index f3baeaa12854..824ecd5ff3a8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/au1000_eth.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/au1000_eth.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/au1000_eth.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/au1000_eth.h</a></div><div class='hunk'>@@ -106,7 +106,7 @@ struct au1000_private {</div><div class='ctx'> 	int old_duplex;</div><div class='ctx'> </div><div class='ctx'> 	struct phy_device *phy_dev;</div><div class='del'>-	struct mii_bus mii_bus;</div><div class='add'>+	struct mii_bus *mii_bus;</div><div class='ctx'> </div><div class='ctx'> 	/* These variables are just for quick access to certain regs addresses. */</div><div class='ctx'> 	volatile mac_reg_t *mac;  /* mac registers                      */</div><div class='head'>diff --git a/drivers/net/ax88796.c b/drivers/net/ax88796.c<br/>index a886a4b9f7e5..4207d6efddc0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/ax88796.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/ax88796.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/ax88796.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/ax88796.c</a></div><div class='hunk'>@@ -153,7 +153,7 @@ static void ax_reset_8390(struct net_device *dev)</div><div class='ctx'> 	while ((ei_inb(addr + EN0_ISR) &amp; ENISR_RESET) == 0) {</div><div class='ctx'> 		if (jiffies - reset_start_time &gt; 2*HZ/100) {</div><div class='ctx'> 			dev_warn(&amp;ax-&gt;dev-&gt;dev, "%s: %s did not complete.\n",</div><div class='del'>-			       __FUNCTION__, dev-&gt;name);</div><div class='add'>+			       __func__, dev-&gt;name);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -173,7 +173,7 @@ static void ax_get_8390_hdr(struct net_device *dev, struct e8390_pkt_hdr *hdr,</div><div class='ctx'> 	if (ei_status.dmaing) {</div><div class='ctx'> 		dev_err(&amp;ax-&gt;dev-&gt;dev, "%s: DMAing conflict in %s "</div><div class='ctx'> 			"[DMAstat:%d][irqlock:%d].\n",</div><div class='del'>-			dev-&gt;name, __FUNCTION__,</div><div class='add'>+			dev-&gt;name, __func__,</div><div class='ctx'> 			ei_status.dmaing, ei_status.irqlock);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -215,7 +215,7 @@ static void ax_block_input(struct net_device *dev, int count,</div><div class='ctx'> 		dev_err(&amp;ax-&gt;dev-&gt;dev,</div><div class='ctx'> 			"%s: DMAing conflict in %s "</div><div class='ctx'> 			"[DMAstat:%d][irqlock:%d].\n",</div><div class='del'>-			dev-&gt;name, __FUNCTION__,</div><div class='add'>+			dev-&gt;name, __func__,</div><div class='ctx'> 			ei_status.dmaing, ei_status.irqlock);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -260,7 +260,7 @@ static void ax_block_output(struct net_device *dev, int count,</div><div class='ctx'> 	if (ei_status.dmaing) {</div><div class='ctx'> 		dev_err(&amp;ax-&gt;dev-&gt;dev, "%s: DMAing conflict in %s."</div><div class='ctx'> 			"[DMAstat:%d][irqlock:%d]\n",</div><div class='del'>-			dev-&gt;name, __FUNCTION__,</div><div class='add'>+			dev-&gt;name, __func__,</div><div class='ctx'> 		       ei_status.dmaing, ei_status.irqlock);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -396,7 +396,7 @@ ax_phy_issueaddr(struct net_device *dev, int phy_addr, int reg, int opc)</div><div class='ctx'> {</div><div class='ctx'> 	if (phy_debug)</div><div class='ctx'> 		pr_debug("%s: dev %p, %04x, %04x, %d\n",</div><div class='del'>-			__FUNCTION__, dev, phy_addr, reg, opc);</div><div class='add'>+			__func__, dev, phy_addr, reg, opc);</div><div class='ctx'> </div><div class='ctx'> 	ax_mii_ei_outbits(dev, 0x3f, 6);	/* pre-amble */</div><div class='ctx'> 	ax_mii_ei_outbits(dev, 1, 2);		/* frame-start */</div><div class='hunk'>@@ -422,7 +422,7 @@ ax_phy_read(struct net_device *dev, int phy_addr, int reg)</div><div class='ctx'>       	spin_unlock_irqrestore(&amp;ei_local-&gt;page_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	if (phy_debug)</div><div class='del'>-		pr_debug("%s: %04x.%04x =&gt; read %04x\n", __FUNCTION__,</div><div class='add'>+		pr_debug("%s: %04x.%04x =&gt; read %04x\n", __func__,</div><div class='ctx'> 			 phy_addr, reg, result);</div><div class='ctx'> </div><div class='ctx'> 	return result;</div><div class='hunk'>@@ -436,7 +436,7 @@ ax_phy_write(struct net_device *dev, int phy_addr, int reg, int value)</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(&amp;ax-&gt;dev-&gt;dev, "%s: %p, %04x, %04x %04x\n",</div><div class='del'>-		__FUNCTION__, dev, phy_addr, reg, value);</div><div class='add'>+		__func__, dev, phy_addr, reg, value);</div><div class='ctx'> </div><div class='ctx'>       	spin_lock_irqsave(&amp;ei-&gt;page_lock, flags);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/bfin_mac.c b/drivers/net/bfin_mac.c<br/>index 3db7db1828e7..b458d607a9c6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/bfin_mac.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/bfin_mac.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/bfin_mac.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/bfin_mac.c</a></div><div class='hunk'>@@ -253,7 +253,7 @@ init_error:</div><div class='ctx'>  * MII operations</div><div class='ctx'>  */</div><div class='ctx'> /* Wait until the previous MDC/MDIO transaction has completed */</div><div class='del'>-static void mdio_poll(void)</div><div class='add'>+static void bfin_mdio_poll(void)</div><div class='ctx'> {</div><div class='ctx'> 	int timeout_cnt = MAX_TIMEOUT_CNT;</div><div class='ctx'> </div><div class='hunk'>@@ -269,25 +269,25 @@ static void mdio_poll(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Read an off-chip register in a PHY through the MDC/MDIO port */</div><div class='del'>-static int mdiobus_read(struct mii_bus *bus, int phy_addr, int regnum)</div><div class='add'>+static int bfin_mdiobus_read(struct mii_bus *bus, int phy_addr, int regnum)</div><div class='ctx'> {</div><div class='del'>-	mdio_poll();</div><div class='add'>+	bfin_mdio_poll();</div><div class='ctx'> </div><div class='ctx'> 	/* read mode */</div><div class='ctx'> 	bfin_write_EMAC_STAADD(SET_PHYAD((u16) phy_addr) |</div><div class='ctx'> 				SET_REGAD((u16) regnum) |</div><div class='ctx'> 				STABUSY);</div><div class='ctx'> </div><div class='del'>-	mdio_poll();</div><div class='add'>+	bfin_mdio_poll();</div><div class='ctx'> </div><div class='ctx'> 	return (int) bfin_read_EMAC_STADAT();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Write an off-chip register in a PHY through the MDC/MDIO port */</div><div class='del'>-static int mdiobus_write(struct mii_bus *bus, int phy_addr, int regnum,</div><div class='del'>-			 u16 value)</div><div class='add'>+static int bfin_mdiobus_write(struct mii_bus *bus, int phy_addr, int regnum,</div><div class='add'>+			      u16 value)</div><div class='ctx'> {</div><div class='del'>-	mdio_poll();</div><div class='add'>+	bfin_mdio_poll();</div><div class='ctx'> </div><div class='ctx'> 	bfin_write_EMAC_STADAT((u32) value);</div><div class='ctx'> </div><div class='hunk'>@@ -297,12 +297,12 @@ static int mdiobus_write(struct mii_bus *bus, int phy_addr, int regnum,</div><div class='ctx'> 				STAOP |</div><div class='ctx'> 				STABUSY);</div><div class='ctx'> </div><div class='del'>-	mdio_poll();</div><div class='add'>+	bfin_mdio_poll();</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mdiobus_reset(struct mii_bus *bus)</div><div class='add'>+static int bfin_mdiobus_reset(struct mii_bus *bus)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -398,7 +398,7 @@ static int mii_probe(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	/* search for connect PHY device */</div><div class='ctx'> 	for (i = 0; i &lt; PHY_MAX_ADDR; i++) {</div><div class='del'>-		struct phy_device *const tmp_phydev = lp-&gt;mii_bus.phy_map[i];</div><div class='add'>+		struct phy_device *const tmp_phydev = lp-&gt;mii_bus-&gt;phy_map[i];</div><div class='ctx'> </div><div class='ctx'> 		if (!tmp_phydev)</div><div class='ctx'> 			continue; /* no PHY here... */</div><div class='hunk'>@@ -811,14 +811,14 @@ static void bfin_mac_enable(void)</div><div class='ctx'> {</div><div class='ctx'> 	u32 opmode;</div><div class='ctx'> </div><div class='del'>-	pr_debug("%s: %s\n", DRV_NAME, __FUNCTION__);</div><div class='add'>+	pr_debug("%s: %s\n", DRV_NAME, __func__);</div><div class='ctx'> </div><div class='ctx'> 	/* Set RX DMA */</div><div class='ctx'> 	bfin_write_DMA1_NEXT_DESC_PTR(&amp;(rx_list_head-&gt;desc_a));</div><div class='ctx'> 	bfin_write_DMA1_CONFIG(rx_list_head-&gt;desc_a.config);</div><div class='ctx'> </div><div class='ctx'> 	/* Wait MII done */</div><div class='del'>-	mdio_poll();</div><div class='add'>+	bfin_mdio_poll();</div><div class='ctx'> </div><div class='ctx'> 	/* We enable only RX here */</div><div class='ctx'> 	/* ASTP   : Enable Automatic Pad Stripping</div><div class='hunk'>@@ -847,7 +847,7 @@ static void bfin_mac_enable(void)</div><div class='ctx'> /* Our watchdog timed out. Called by the networking layer */</div><div class='ctx'> static void bfin_mac_timeout(struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	pr_debug("%s: %s\n", dev-&gt;name, __FUNCTION__);</div><div class='add'>+	pr_debug("%s: %s\n", dev-&gt;name, __func__);</div><div class='ctx'> </div><div class='ctx'> 	bfin_mac_disable();</div><div class='ctx'> </div><div class='hunk'>@@ -949,7 +949,7 @@ static int bfin_mac_open(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct bfin_mac_local *lp = netdev_priv(dev);</div><div class='ctx'> 	int retval;</div><div class='del'>-	pr_debug("%s: %s\n", dev-&gt;name, __FUNCTION__);</div><div class='add'>+	pr_debug("%s: %s\n", dev-&gt;name, __func__);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Check that the address is valid.  If its not, refuse</div><div class='hunk'>@@ -989,7 +989,7 @@ static int bfin_mac_open(struct net_device *dev)</div><div class='ctx'> static int bfin_mac_close(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct bfin_mac_local *lp = netdev_priv(dev);</div><div class='del'>-	pr_debug("%s: %s\n", dev-&gt;name, __FUNCTION__);</div><div class='add'>+	pr_debug("%s: %s\n", dev-&gt;name, __func__);</div><div class='ctx'> </div><div class='ctx'> 	netif_stop_queue(dev);</div><div class='ctx'> 	netif_carrier_off(dev);</div><div class='hunk'>@@ -1058,17 +1058,21 @@ static int __devinit bfin_mac_probe(struct platform_device *pdev)</div><div class='ctx'> 	setup_mac_addr(ndev-&gt;dev_addr);</div><div class='ctx'> </div><div class='ctx'> 	/* MDIO bus initial */</div><div class='del'>-	lp-&gt;mii_bus.priv = ndev;</div><div class='del'>-	lp-&gt;mii_bus.read = mdiobus_read;</div><div class='del'>-	lp-&gt;mii_bus.write = mdiobus_write;</div><div class='del'>-	lp-&gt;mii_bus.reset = mdiobus_reset;</div><div class='del'>-	lp-&gt;mii_bus.name = "bfin_mac_mdio";</div><div class='del'>-	snprintf(lp-&gt;mii_bus.id, MII_BUS_ID_SIZE, "0");</div><div class='del'>-	lp-&gt;mii_bus.irq = kmalloc(sizeof(int)*PHY_MAX_ADDR, GFP_KERNEL);</div><div class='add'>+	lp-&gt;mii_bus = mdiobus_alloc();</div><div class='add'>+	if (lp-&gt;mii_bus == NULL)</div><div class='add'>+		goto out_err_mdiobus_alloc;</div><div class='add'>+</div><div class='add'>+	lp-&gt;mii_bus-&gt;priv = ndev;</div><div class='add'>+	lp-&gt;mii_bus-&gt;read = bfin_mdiobus_read;</div><div class='add'>+	lp-&gt;mii_bus-&gt;write = bfin_mdiobus_write;</div><div class='add'>+	lp-&gt;mii_bus-&gt;reset = bfin_mdiobus_reset;</div><div class='add'>+	lp-&gt;mii_bus-&gt;name = "bfin_mac_mdio";</div><div class='add'>+	snprintf(lp-&gt;mii_bus-&gt;id, MII_BUS_ID_SIZE, "0");</div><div class='add'>+	lp-&gt;mii_bus-&gt;irq = kmalloc(sizeof(int)*PHY_MAX_ADDR, GFP_KERNEL);</div><div class='ctx'> 	for (i = 0; i &lt; PHY_MAX_ADDR; ++i)</div><div class='del'>-		lp-&gt;mii_bus.irq[i] = PHY_POLL;</div><div class='add'>+		lp-&gt;mii_bus-&gt;irq[i] = PHY_POLL;</div><div class='ctx'> </div><div class='del'>-	rc = mdiobus_register(&amp;lp-&gt;mii_bus);</div><div class='add'>+	rc = mdiobus_register(lp-&gt;mii_bus);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "Cannot register MDIO bus!\n");</div><div class='ctx'> 		goto out_err_mdiobus_register;</div><div class='hunk'>@@ -1121,8 +1125,10 @@ out_err_reg_ndev:</div><div class='ctx'> 	free_irq(IRQ_MAC_RX, ndev);</div><div class='ctx'> out_err_request_irq:</div><div class='ctx'> out_err_mii_probe:</div><div class='del'>-	mdiobus_unregister(&amp;lp-&gt;mii_bus);</div><div class='add'>+	mdiobus_unregister(lp-&gt;mii_bus);</div><div class='ctx'> out_err_mdiobus_register:</div><div class='add'>+	mdiobus_free(lp-&gt;mii_bus);</div><div class='add'>+out_err_mdiobus_alloc:</div><div class='ctx'> 	peripheral_free_list(pin_req);</div><div class='ctx'> out_err_setup_pin_mux:</div><div class='ctx'> out_err_probe_mac:</div><div class='hunk'>@@ -1139,7 +1145,8 @@ static int __devexit bfin_mac_remove(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	platform_set_drvdata(pdev, NULL);</div><div class='ctx'> </div><div class='del'>-	mdiobus_unregister(&amp;lp-&gt;mii_bus);</div><div class='add'>+	mdiobus_unregister(lp-&gt;mii_bus);</div><div class='add'>+	mdiobus_free(lp-&gt;mii_bus);</div><div class='ctx'> </div><div class='ctx'> 	unregister_netdev(ndev);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/bfin_mac.h b/drivers/net/bfin_mac.h<br/>index beff51064ff4..052b5dce3e3c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/bfin_mac.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/bfin_mac.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/bfin_mac.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/bfin_mac.h</a></div><div class='hunk'>@@ -66,7 +66,7 @@ struct bfin_mac_local {</div><div class='ctx'> 	int old_duplex;</div><div class='ctx'> </div><div class='ctx'> 	struct phy_device *phydev;</div><div class='del'>-	struct mii_bus mii_bus;</div><div class='add'>+	struct mii_bus *mii_bus;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern void bfin_get_ether_addr(char *addr);</div><div class='head'>diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c<br/>index 2486a656f12d..430d430bce29 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/bnx2.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/bnx2.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/bnx2.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/bnx2.c</a></div><div class='hunk'>@@ -57,8 +57,8 @@</div><div class='ctx'> </div><div class='ctx'> #define DRV_MODULE_NAME		"bnx2"</div><div class='ctx'> #define PFX DRV_MODULE_NAME	": "</div><div class='del'>-#define DRV_MODULE_VERSION	"1.8.0"</div><div class='del'>-#define DRV_MODULE_RELDATE	"Aug 14, 2008"</div><div class='add'>+#define DRV_MODULE_VERSION	"1.8.1"</div><div class='add'>+#define DRV_MODULE_RELDATE	"Oct 7, 2008"</div><div class='ctx'> </div><div class='ctx'> #define RUN_AT(x) (jiffies + (x))</div><div class='ctx'> </div><div class='hunk'>@@ -69,7 +69,7 @@ static char version[] __devinitdata =</div><div class='ctx'> 	"Broadcom NetXtreme II Gigabit Ethernet Driver " DRV_MODULE_NAME " v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n";</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Michael Chan &lt;mchan@broadcom.com&gt;");</div><div class='del'>-MODULE_DESCRIPTION("Broadcom NetXtreme II BCM5706/5708/5709 Driver");</div><div class='add'>+MODULE_DESCRIPTION("Broadcom NetXtreme II BCM5706/5708/5709/5716 Driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_VERSION(DRV_MODULE_VERSION);</div><div class='ctx'> </div><div class='hunk'>@@ -1127,7 +1127,7 @@ bnx2_init_all_rx_contexts(struct bnx2 *bp)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='add'>+static void</div><div class='ctx'> bnx2_set_mac_link(struct bnx2 *bp)</div><div class='ctx'> {</div><div class='ctx'> 	u32 val;</div><div class='hunk'>@@ -1193,8 +1193,6 @@ bnx2_set_mac_link(struct bnx2 *bp)</div><div class='ctx'> </div><div class='ctx'> 	if (CHIP_NUM(bp) == CHIP_NUM_5709)</div><div class='ctx'> 		bnx2_init_all_rx_contexts(bp);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -2478,6 +2476,11 @@ bnx2_alloc_rx_page(struct bnx2 *bp, struct bnx2_rx_ring_info *rxr, u16 index)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	mapping = pci_map_page(bp-&gt;pdev, page, 0, PAGE_SIZE,</div><div class='ctx'> 			       PCI_DMA_FROMDEVICE);</div><div class='add'>+	if (pci_dma_mapping_error(bp-&gt;pdev, mapping)) {</div><div class='add'>+		__free_page(page);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	rx_pg-&gt;page = page;</div><div class='ctx'> 	pci_unmap_addr_set(rx_pg, mapping, mapping);</div><div class='ctx'> 	rxbd-&gt;rx_bd_haddr_hi = (u64) mapping &gt;&gt; 32;</div><div class='hunk'>@@ -2520,6 +2523,10 @@ bnx2_alloc_rx_skb(struct bnx2 *bp, struct bnx2_rx_ring_info *rxr, u16 index)</div><div class='ctx'> </div><div class='ctx'> 	mapping = pci_map_single(bp-&gt;pdev, skb-&gt;data, bp-&gt;rx_buf_use_size,</div><div class='ctx'> 		PCI_DMA_FROMDEVICE);</div><div class='add'>+	if (pci_dma_mapping_error(bp-&gt;pdev, mapping)) {</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	rx_buf-&gt;skb = skb;</div><div class='ctx'> 	pci_unmap_addr_set(rx_buf, mapping, mapping);</div><div class='hunk'>@@ -2594,7 +2601,7 @@ bnx2_tx_int(struct bnx2 *bp, struct bnx2_napi *bnapi, int budget)</div><div class='ctx'> 	sw_cons = txr-&gt;tx_cons;</div><div class='ctx'> </div><div class='ctx'> 	while (sw_cons != hw_cons) {</div><div class='del'>-		struct sw_bd *tx_buf;</div><div class='add'>+		struct sw_tx_bd *tx_buf;</div><div class='ctx'> 		struct sk_buff *skb;</div><div class='ctx'> 		int i, last;</div><div class='ctx'> </div><div class='hunk'>@@ -2619,21 +2626,13 @@ bnx2_tx_int(struct bnx2 *bp, struct bnx2_napi *bnapi, int budget)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		pci_unmap_single(bp-&gt;pdev, pci_unmap_addr(tx_buf, mapping),</div><div class='del'>-			skb_headlen(skb), PCI_DMA_TODEVICE);</div><div class='add'>+		skb_dma_unmap(&amp;bp-&gt;pdev-&gt;dev, skb, DMA_TO_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 		tx_buf-&gt;skb = NULL;</div><div class='ctx'> 		last = skb_shinfo(skb)-&gt;nr_frags;</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; i &lt; last; i++) {</div><div class='ctx'> 			sw_cons = NEXT_TX_BD(sw_cons);</div><div class='del'>-</div><div class='del'>-			pci_unmap_page(bp-&gt;pdev,</div><div class='del'>-				pci_unmap_addr(</div><div class='del'>-					&amp;txr-&gt;tx_buf_ring[TX_RING_IDX(sw_cons)],</div><div class='del'>-				       	mapping),</div><div class='del'>-				skb_shinfo(skb)-&gt;frags[i].size,</div><div class='del'>-				PCI_DMA_TODEVICE);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		sw_cons = NEXT_TX_BD(sw_cons);</div><div class='hunk'>@@ -2674,11 +2673,31 @@ bnx2_reuse_rx_skb_pages(struct bnx2 *bp, struct bnx2_rx_ring_info *rxr,</div><div class='ctx'> {</div><div class='ctx'> 	struct sw_pg *cons_rx_pg, *prod_rx_pg;</div><div class='ctx'> 	struct rx_bd *cons_bd, *prod_bd;</div><div class='del'>-	dma_addr_t mapping;</div><div class='ctx'> 	int i;</div><div class='del'>-	u16 hw_prod = rxr-&gt;rx_pg_prod, prod;</div><div class='add'>+	u16 hw_prod, prod;</div><div class='ctx'> 	u16 cons = rxr-&gt;rx_pg_cons;</div><div class='ctx'> </div><div class='add'>+	cons_rx_pg = &amp;rxr-&gt;rx_pg_ring[cons];</div><div class='add'>+</div><div class='add'>+	/* The caller was unable to allocate a new page to replace the</div><div class='add'>+	 * last one in the frags array, so we need to recycle that page</div><div class='add'>+	 * and then free the skb.</div><div class='add'>+	 */</div><div class='add'>+	if (skb) {</div><div class='add'>+		struct page *page;</div><div class='add'>+		struct skb_shared_info *shinfo;</div><div class='add'>+</div><div class='add'>+		shinfo = skb_shinfo(skb);</div><div class='add'>+		shinfo-&gt;nr_frags--;</div><div class='add'>+		page = shinfo-&gt;frags[shinfo-&gt;nr_frags].page;</div><div class='add'>+		shinfo-&gt;frags[shinfo-&gt;nr_frags].page = NULL;</div><div class='add'>+</div><div class='add'>+		cons_rx_pg-&gt;page = page;</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hw_prod = rxr-&gt;rx_pg_prod;</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; count; i++) {</div><div class='ctx'> 		prod = RX_PG_RING_IDX(hw_prod);</div><div class='ctx'> </div><div class='hunk'>@@ -2687,20 +2706,6 @@ bnx2_reuse_rx_skb_pages(struct bnx2 *bp, struct bnx2_rx_ring_info *rxr,</div><div class='ctx'> 		cons_bd = &amp;rxr-&gt;rx_pg_desc_ring[RX_RING(cons)][RX_IDX(cons)];</div><div class='ctx'> 		prod_bd = &amp;rxr-&gt;rx_pg_desc_ring[RX_RING(prod)][RX_IDX(prod)];</div><div class='ctx'> </div><div class='del'>-		if (i == 0 &amp;&amp; skb) {</div><div class='del'>-			struct page *page;</div><div class='del'>-			struct skb_shared_info *shinfo;</div><div class='del'>-</div><div class='del'>-			shinfo = skb_shinfo(skb);</div><div class='del'>-			shinfo-&gt;nr_frags--;</div><div class='del'>-			page = shinfo-&gt;frags[shinfo-&gt;nr_frags].page;</div><div class='del'>-			shinfo-&gt;frags[shinfo-&gt;nr_frags].page = NULL;</div><div class='del'>-			mapping = pci_map_page(bp-&gt;pdev, page, 0, PAGE_SIZE,</div><div class='del'>-					       PCI_DMA_FROMDEVICE);</div><div class='del'>-			cons_rx_pg-&gt;page = page;</div><div class='del'>-			pci_unmap_addr_set(cons_rx_pg, mapping, mapping);</div><div class='del'>-			dev_kfree_skb(skb);</div><div class='del'>-		}</div><div class='ctx'> 		if (prod != cons) {</div><div class='ctx'> 			prod_rx_pg-&gt;page = cons_rx_pg-&gt;page;</div><div class='ctx'> 			cons_rx_pg-&gt;page = NULL;</div><div class='hunk'>@@ -2786,6 +2791,8 @@ bnx2_rx_skb(struct bnx2 *bp, struct bnx2_rx_ring_info *rxr, struct sk_buff *skb,</div><div class='ctx'> 		skb_put(skb, hdr_len);</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; i &lt; pages; i++) {</div><div class='add'>+			dma_addr_t mapping_old;</div><div class='add'>+</div><div class='ctx'> 			frag_len = min(frag_size, (unsigned int) PAGE_SIZE);</div><div class='ctx'> 			if (unlikely(frag_len &lt;= 4)) {</div><div class='ctx'> 				unsigned int tail = 4 - frag_len;</div><div class='hunk'>@@ -2808,9 +2815,10 @@ bnx2_rx_skb(struct bnx2 *bp, struct bnx2_rx_ring_info *rxr, struct sk_buff *skb,</div><div class='ctx'> 			}</div><div class='ctx'> 			rx_pg = &amp;rxr-&gt;rx_pg_ring[pg_cons];</div><div class='ctx'> </div><div class='del'>-			pci_unmap_page(bp-&gt;pdev, pci_unmap_addr(rx_pg, mapping),</div><div class='del'>-				       PAGE_SIZE, PCI_DMA_FROMDEVICE);</div><div class='del'>-</div><div class='add'>+			/* Don't unmap yet.  If we're unable to allocate a new</div><div class='add'>+			 * page, we need to recycle the page and the DMA addr.</div><div class='add'>+			 */</div><div class='add'>+			mapping_old = pci_unmap_addr(rx_pg, mapping);</div><div class='ctx'> 			if (i == pages - 1)</div><div class='ctx'> 				frag_len -= 4;</div><div class='ctx'> </div><div class='hunk'>@@ -2827,6 +2835,9 @@ bnx2_rx_skb(struct bnx2 *bp, struct bnx2_rx_ring_info *rxr, struct sk_buff *skb,</div><div class='ctx'> 				return err;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='add'>+			pci_unmap_page(bp-&gt;pdev, mapping_old,</div><div class='add'>+				       PAGE_SIZE, PCI_DMA_FROMDEVICE);</div><div class='add'>+</div><div class='ctx'> 			frag_size -= frag_len;</div><div class='ctx'> 			skb-&gt;data_len += frag_len;</div><div class='ctx'> 			skb-&gt;truesize += frag_len;</div><div class='hunk'>@@ -3250,6 +3261,9 @@ bnx2_set_rx_mode(struct net_device *dev)</div><div class='ctx'> 	struct dev_addr_list *uc_ptr;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	if (!netif_running(dev))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	spin_lock_bh(&amp;bp-&gt;phy_lock);</div><div class='ctx'> </div><div class='ctx'> 	rx_mode = bp-&gt;rx_mode &amp; ~(BNX2_EMAC_RX_MODE_PROMISCUOUS |</div><div class='hunk'>@@ -4970,31 +4984,20 @@ bnx2_free_tx_skbs(struct bnx2 *bp)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		for (j = 0; j &lt; TX_DESC_CNT; ) {</div><div class='del'>-			struct sw_bd *tx_buf = &amp;txr-&gt;tx_buf_ring[j];</div><div class='add'>+			struct sw_tx_bd *tx_buf = &amp;txr-&gt;tx_buf_ring[j];</div><div class='ctx'> 			struct sk_buff *skb = tx_buf-&gt;skb;</div><div class='del'>-			int k, last;</div><div class='ctx'> </div><div class='ctx'> 			if (skb == NULL) {</div><div class='ctx'> 				j++;</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			pci_unmap_single(bp-&gt;pdev,</div><div class='del'>-					 pci_unmap_addr(tx_buf, mapping),</div><div class='del'>-			skb_headlen(skb), PCI_DMA_TODEVICE);</div><div class='add'>+			skb_dma_unmap(&amp;bp-&gt;pdev-&gt;dev, skb, DMA_TO_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 			tx_buf-&gt;skb = NULL;</div><div class='ctx'> </div><div class='del'>-			last = skb_shinfo(skb)-&gt;nr_frags;</div><div class='del'>-			for (k = 0; k &lt; last; k++) {</div><div class='del'>-				tx_buf = &amp;txr-&gt;tx_buf_ring[j + k + 1];</div><div class='del'>-				pci_unmap_page(bp-&gt;pdev,</div><div class='del'>-					pci_unmap_addr(tx_buf, mapping),</div><div class='del'>-					skb_shinfo(skb)-&gt;frags[j].size,</div><div class='del'>-					PCI_DMA_TODEVICE);</div><div class='del'>-			}</div><div class='add'>+			j += skb_shinfo(skb)-&gt;nr_frags + 1;</div><div class='ctx'> 			dev_kfree_skb(skb);</div><div class='del'>-			j += k + 1;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -5075,6 +5078,21 @@ bnx2_init_nic(struct bnx2 *bp, int reset_phy)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='add'>+bnx2_shutdown_chip(struct bnx2 *bp)</div><div class='add'>+{</div><div class='add'>+	u32 reset_code;</div><div class='add'>+</div><div class='add'>+	if (bp-&gt;flags &amp; BNX2_FLAG_NO_WOL)</div><div class='add'>+		reset_code = BNX2_DRV_MSG_CODE_UNLOAD_LNK_DN;</div><div class='add'>+	else if (bp-&gt;wol)</div><div class='add'>+		reset_code = BNX2_DRV_MSG_CODE_SUSPEND_WOL;</div><div class='add'>+	else</div><div class='add'>+		reset_code = BNX2_DRV_MSG_CODE_SUSPEND_NO_WOL;</div><div class='add'>+</div><div class='add'>+	return bnx2_reset_chip(bp, reset_code);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='ctx'> bnx2_test_registers(struct bnx2 *bp)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -5357,8 +5375,11 @@ bnx2_run_loopback(struct bnx2 *bp, int loopback_mode)</div><div class='ctx'> 	for (i = 14; i &lt; pkt_size; i++)</div><div class='ctx'> 		packet[i] = (unsigned char) (i &amp; 0xff);</div><div class='ctx'> </div><div class='del'>-	map = pci_map_single(bp-&gt;pdev, skb-&gt;data, pkt_size,</div><div class='del'>-		PCI_DMA_TODEVICE);</div><div class='add'>+	if (skb_dma_map(&amp;bp-&gt;pdev-&gt;dev, skb, DMA_TO_DEVICE)) {</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+	map = skb_shinfo(skb)-&gt;dma_maps[0];</div><div class='ctx'> </div><div class='ctx'> 	REG_WR(bp, BNX2_HC_COMMAND,</div><div class='ctx'> 	       bp-&gt;hc_cmd | BNX2_HC_COMMAND_COAL_NOW_WO_INT);</div><div class='hunk'>@@ -5393,7 +5414,7 @@ bnx2_run_loopback(struct bnx2 *bp, int loopback_mode)</div><div class='ctx'> </div><div class='ctx'> 	udelay(5);</div><div class='ctx'> </div><div class='del'>-	pci_unmap_single(bp-&gt;pdev, map, pkt_size, PCI_DMA_TODEVICE);</div><div class='add'>+	skb_dma_unmap(&amp;bp-&gt;pdev-&gt;dev, skb, DMA_TO_DEVICE);</div><div class='ctx'> 	dev_kfree_skb(skb);</div><div class='ctx'> </div><div class='ctx'> 	if (bnx2_get_hw_tx_cons(tx_napi) != txr-&gt;tx_prod)</div><div class='hunk'>@@ -5508,6 +5529,9 @@ bnx2_test_link(struct bnx2 *bp)</div><div class='ctx'> {</div><div class='ctx'> 	u32 bmsr;</div><div class='ctx'> </div><div class='add'>+	if (!netif_running(bp-&gt;dev))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='ctx'> 	if (bp-&gt;phy_flags &amp; BNX2_PHY_FLAG_REMOTE_PHY_CAP) {</div><div class='ctx'> 		if (bp-&gt;link_up)</div><div class='ctx'> 			return 0;</div><div class='hunk'>@@ -5600,7 +5624,7 @@ bnx2_5706_serdes_timer(struct bnx2 *bp)</div><div class='ctx'> 	} else if ((bp-&gt;link_up == 0) &amp;&amp; (bp-&gt;autoneg &amp; AUTONEG_SPEED)) {</div><div class='ctx'> 		u32 bmcr;</div><div class='ctx'> </div><div class='del'>-		bp-&gt;current_interval = bp-&gt;timer_interval;</div><div class='add'>+		bp-&gt;current_interval = BNX2_TIMER_INTERVAL;</div><div class='ctx'> </div><div class='ctx'> 		bnx2_read_phy(bp, bp-&gt;mii_bmcr, &amp;bmcr);</div><div class='ctx'> </div><div class='hunk'>@@ -5629,7 +5653,7 @@ bnx2_5706_serdes_timer(struct bnx2 *bp)</div><div class='ctx'> 			bp-&gt;phy_flags &amp;= ~BNX2_PHY_FLAG_PARALLEL_DETECT;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else</div><div class='del'>-		bp-&gt;current_interval = bp-&gt;timer_interval;</div><div class='add'>+		bp-&gt;current_interval = BNX2_TIMER_INTERVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (check_link) {</div><div class='ctx'> 		u32 val;</div><div class='hunk'>@@ -5674,11 +5698,11 @@ bnx2_5708_serdes_timer(struct bnx2 *bp)</div><div class='ctx'> 		} else {</div><div class='ctx'> 			bnx2_disable_forced_2g5(bp);</div><div class='ctx'> 			bp-&gt;serdes_an_pending = 2;</div><div class='del'>-			bp-&gt;current_interval = bp-&gt;timer_interval;</div><div class='add'>+			bp-&gt;current_interval = BNX2_TIMER_INTERVAL;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 	} else</div><div class='del'>-		bp-&gt;current_interval = bp-&gt;timer_interval;</div><div class='add'>+		bp-&gt;current_interval = BNX2_TIMER_INTERVAL;</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock(&amp;bp-&gt;phy_lock);</div><div class='ctx'> }</div><div class='hunk'>@@ -5951,13 +5975,14 @@ bnx2_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	struct bnx2 *bp = netdev_priv(dev);</div><div class='ctx'> 	dma_addr_t mapping;</div><div class='ctx'> 	struct tx_bd *txbd;</div><div class='del'>-	struct sw_bd *tx_buf;</div><div class='add'>+	struct sw_tx_bd *tx_buf;</div><div class='ctx'> 	u32 len, vlan_tag_flags, last_frag, mss;</div><div class='ctx'> 	u16 prod, ring_prod;</div><div class='ctx'> 	int i;</div><div class='ctx'> 	struct bnx2_napi *bnapi;</div><div class='ctx'> 	struct bnx2_tx_ring_info *txr;</div><div class='ctx'> 	struct netdev_queue *txq;</div><div class='add'>+	struct skb_shared_info *sp;</div><div class='ctx'> </div><div class='ctx'> 	/*  Determine which tx ring we will be placed on */</div><div class='ctx'> 	i = skb_get_queue_mapping(skb);</div><div class='hunk'>@@ -5989,7 +6014,7 @@ bnx2_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> 	if ((mss = skb_shinfo(skb)-&gt;gso_size)) {</div><div class='del'>-		u32 tcp_opt_len, ip_tcp_len;</div><div class='add'>+		u32 tcp_opt_len;</div><div class='ctx'> 		struct iphdr *iph;</div><div class='ctx'> </div><div class='ctx'> 		vlan_tag_flags |= TX_BD_FLAGS_SW_LSO;</div><div class='hunk'>@@ -6013,21 +6038,7 @@ bnx2_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 				mss |= (tcp_off &amp; 0xc) &lt;&lt; TX_BD_TCP6_OFF2_SHL;</div><div class='ctx'> 			}</div><div class='ctx'> 		} else {</div><div class='del'>-			if (skb_header_cloned(skb) &amp;&amp;</div><div class='del'>-			    pskb_expand_head(skb, 0, 0, GFP_ATOMIC)) {</div><div class='del'>-				dev_kfree_skb(skb);</div><div class='del'>-				return NETDEV_TX_OK;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			ip_tcp_len = ip_hdrlen(skb) + sizeof(struct tcphdr);</div><div class='del'>-</div><div class='ctx'> 			iph = ip_hdr(skb);</div><div class='del'>-			iph-&gt;check = 0;</div><div class='del'>-			iph-&gt;tot_len = htons(mss + ip_tcp_len + tcp_opt_len);</div><div class='del'>-			tcp_hdr(skb)-&gt;check = ~csum_tcpudp_magic(iph-&gt;saddr,</div><div class='del'>-								 iph-&gt;daddr, 0,</div><div class='del'>-								 IPPROTO_TCP,</div><div class='del'>-								 0);</div><div class='ctx'> 			if (tcp_opt_len || (iph-&gt;ihl &gt; 5)) {</div><div class='ctx'> 				vlan_tag_flags |= ((iph-&gt;ihl - 5) +</div><div class='ctx'> 						   (tcp_opt_len &gt;&gt; 2)) &lt;&lt; 8;</div><div class='hunk'>@@ -6036,11 +6047,16 @@ bnx2_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	} else</div><div class='ctx'> 		mss = 0;</div><div class='ctx'> </div><div class='del'>-	mapping = pci_map_single(bp-&gt;pdev, skb-&gt;data, len, PCI_DMA_TODEVICE);</div><div class='add'>+	if (skb_dma_map(&amp;bp-&gt;pdev-&gt;dev, skb, DMA_TO_DEVICE)) {</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+		return NETDEV_TX_OK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sp = skb_shinfo(skb);</div><div class='add'>+	mapping = sp-&gt;dma_maps[0];</div><div class='ctx'> </div><div class='ctx'> 	tx_buf = &amp;txr-&gt;tx_buf_ring[ring_prod];</div><div class='ctx'> 	tx_buf-&gt;skb = skb;</div><div class='del'>-	pci_unmap_addr_set(tx_buf, mapping, mapping);</div><div class='ctx'> </div><div class='ctx'> 	txbd = &amp;txr-&gt;tx_desc_ring[ring_prod];</div><div class='ctx'> </div><div class='hunk'>@@ -6059,10 +6075,7 @@ bnx2_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 		txbd = &amp;txr-&gt;tx_desc_ring[ring_prod];</div><div class='ctx'> </div><div class='ctx'> 		len = frag-&gt;size;</div><div class='del'>-		mapping = pci_map_page(bp-&gt;pdev, frag-&gt;page, frag-&gt;page_offset,</div><div class='del'>-			len, PCI_DMA_TODEVICE);</div><div class='del'>-		pci_unmap_addr_set(&amp;txr-&gt;tx_buf_ring[ring_prod],</div><div class='del'>-				mapping, mapping);</div><div class='add'>+		mapping = sp-&gt;dma_maps[i + 1];</div><div class='ctx'> </div><div class='ctx'> 		txbd-&gt;tx_bd_haddr_hi = (u64) mapping &gt;&gt; 32;</div><div class='ctx'> 		txbd-&gt;tx_bd_haddr_lo = (u64) mapping &amp; 0xffffffff;</div><div class='hunk'>@@ -6097,20 +6110,13 @@ static int</div><div class='ctx'> bnx2_close(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnx2 *bp = netdev_priv(dev);</div><div class='del'>-	u32 reset_code;</div><div class='ctx'> </div><div class='ctx'> 	cancel_work_sync(&amp;bp-&gt;reset_task);</div><div class='ctx'> </div><div class='ctx'> 	bnx2_disable_int_sync(bp);</div><div class='ctx'> 	bnx2_napi_disable(bp);</div><div class='ctx'> 	del_timer_sync(&amp;bp-&gt;timer);</div><div class='del'>-	if (bp-&gt;flags &amp; BNX2_FLAG_NO_WOL)</div><div class='del'>-		reset_code = BNX2_DRV_MSG_CODE_UNLOAD_LNK_DN;</div><div class='del'>-	else if (bp-&gt;wol)</div><div class='del'>-		reset_code = BNX2_DRV_MSG_CODE_SUSPEND_WOL;</div><div class='del'>-	else</div><div class='del'>-		reset_code = BNX2_DRV_MSG_CODE_SUSPEND_NO_WOL;</div><div class='del'>-	bnx2_reset_chip(bp, reset_code);</div><div class='add'>+	bnx2_shutdown_chip(bp);</div><div class='ctx'> 	bnx2_free_irq(bp);</div><div class='ctx'> 	bnx2_free_skbs(bp);</div><div class='ctx'> 	bnx2_free_mem(bp);</div><div class='hunk'>@@ -6479,6 +6485,9 @@ bnx2_nway_reset(struct net_device *dev)</div><div class='ctx'> 	struct bnx2 *bp = netdev_priv(dev);</div><div class='ctx'> 	u32 bmcr;</div><div class='ctx'> </div><div class='add'>+	if (!netif_running(dev))</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+</div><div class='ctx'> 	if (!(bp-&gt;autoneg &amp; AUTONEG_SPEED)) {</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -6534,6 +6543,9 @@ bnx2_get_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,</div><div class='ctx'> 	struct bnx2 *bp = netdev_priv(dev);</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='add'>+	if (!netif_running(dev))</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+</div><div class='ctx'> 	/* parameters already validated in ethtool_get_eeprom */</div><div class='ctx'> </div><div class='ctx'> 	rc = bnx2_nvram_read(bp, eeprom-&gt;offset, eebuf, eeprom-&gt;len);</div><div class='hunk'>@@ -6548,6 +6560,9 @@ bnx2_set_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,</div><div class='ctx'> 	struct bnx2 *bp = netdev_priv(dev);</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='add'>+	if (!netif_running(dev))</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+</div><div class='ctx'> 	/* parameters already validated in ethtool_set_eeprom */</div><div class='ctx'> </div><div class='ctx'> 	rc = bnx2_nvram_write(bp, eeprom-&gt;offset, eebuf, eeprom-&gt;len);</div><div class='hunk'>@@ -6712,11 +6727,11 @@ bnx2_set_pauseparam(struct net_device *dev, struct ethtool_pauseparam *epause)</div><div class='ctx'> 		bp-&gt;autoneg &amp;= ~AUTONEG_FLOW_CTRL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;bp-&gt;phy_lock);</div><div class='del'>-</div><div class='del'>-	bnx2_setup_phy(bp, bp-&gt;phy_port);</div><div class='del'>-</div><div class='del'>-	spin_unlock_bh(&amp;bp-&gt;phy_lock);</div><div class='add'>+	if (netif_running(dev)) {</div><div class='add'>+		spin_lock_bh(&amp;bp-&gt;phy_lock);</div><div class='add'>+		bnx2_setup_phy(bp, bp-&gt;phy_port);</div><div class='add'>+		spin_unlock_bh(&amp;bp-&gt;phy_lock);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -6907,6 +6922,8 @@ bnx2_self_test(struct net_device *dev, struct ethtool_test *etest, u64 *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnx2 *bp = netdev_priv(dev);</div><div class='ctx'> </div><div class='add'>+	bnx2_set_power_state(bp, PCI_D0);</div><div class='add'>+</div><div class='ctx'> 	memset(buf, 0, sizeof(u64) * BNX2_NUM_TESTS);</div><div class='ctx'> 	if (etest-&gt;flags &amp; ETH_TEST_FL_OFFLINE) {</div><div class='ctx'> 		int i;</div><div class='hunk'>@@ -6926,9 +6943,8 @@ bnx2_self_test(struct net_device *dev, struct ethtool_test *etest, u64 *buf)</div><div class='ctx'> 		if ((buf[2] = bnx2_test_loopback(bp)) != 0)</div><div class='ctx'> 			etest-&gt;flags |= ETH_TEST_FL_FAILED;</div><div class='ctx'> </div><div class='del'>-		if (!netif_running(bp-&gt;dev)) {</div><div class='del'>-			bnx2_reset_chip(bp, BNX2_DRV_MSG_CODE_RESET);</div><div class='del'>-		}</div><div class='add'>+		if (!netif_running(bp-&gt;dev))</div><div class='add'>+			bnx2_shutdown_chip(bp);</div><div class='ctx'> 		else {</div><div class='ctx'> 			bnx2_init_nic(bp, 1);</div><div class='ctx'> 			bnx2_netif_start(bp);</div><div class='hunk'>@@ -6956,6 +6972,8 @@ bnx2_self_test(struct net_device *dev, struct ethtool_test *etest, u64 *buf)</div><div class='ctx'> 		etest-&gt;flags |= ETH_TEST_FL_FAILED;</div><div class='ctx'> </div><div class='ctx'> 	}</div><div class='add'>+	if (!netif_running(bp-&gt;dev))</div><div class='add'>+		bnx2_set_power_state(bp, PCI_D3hot);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -7021,6 +7039,8 @@ bnx2_phys_id(struct net_device *dev, u32 data)</div><div class='ctx'> 	int i;</div><div class='ctx'> 	u32 save;</div><div class='ctx'> </div><div class='add'>+	bnx2_set_power_state(bp, PCI_D0);</div><div class='add'>+</div><div class='ctx'> 	if (data == 0)</div><div class='ctx'> 		data = 2;</div><div class='ctx'> </div><div class='hunk'>@@ -7045,6 +7065,10 @@ bnx2_phys_id(struct net_device *dev, u32 data)</div><div class='ctx'> 	}</div><div class='ctx'> 	REG_WR(bp, BNX2_EMAC_LED, 0);</div><div class='ctx'> 	REG_WR(bp, BNX2_MISC_CFG, save);</div><div class='add'>+</div><div class='add'>+	if (!netif_running(dev))</div><div class='add'>+		bnx2_set_power_state(bp, PCI_D3hot);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -7516,8 +7540,7 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	bp-&gt;stats_ticks = USEC_PER_SEC &amp; BNX2_HC_STATS_TICKS_HC_STAT_TICKS;</div><div class='ctx'> </div><div class='del'>-	bp-&gt;timer_interval =  HZ;</div><div class='del'>-	bp-&gt;current_interval =  HZ;</div><div class='add'>+	bp-&gt;current_interval = BNX2_TIMER_INTERVAL;</div><div class='ctx'> </div><div class='ctx'> 	bp-&gt;phy_addr = 1;</div><div class='ctx'> </div><div class='hunk'>@@ -7607,7 +7630,7 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)</div><div class='ctx'> 	bp-&gt;req_flow_ctrl = FLOW_CTRL_RX | FLOW_CTRL_TX;</div><div class='ctx'> </div><div class='ctx'> 	init_timer(&amp;bp-&gt;timer);</div><div class='del'>-	bp-&gt;timer.expires = RUN_AT(bp-&gt;timer_interval);</div><div class='add'>+	bp-&gt;timer.expires = RUN_AT(BNX2_TIMER_INTERVAL);</div><div class='ctx'> 	bp-&gt;timer.data = (unsigned long) bp;</div><div class='ctx'> 	bp-&gt;timer.function = bnx2_timer;</div><div class='ctx'> </div><div class='hunk'>@@ -7720,7 +7743,6 @@ bnx2_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> </div><div class='ctx'> 	memcpy(dev-&gt;dev_addr, bp-&gt;mac_addr, 6);</div><div class='ctx'> 	memcpy(dev-&gt;perm_addr, bp-&gt;mac_addr, 6);</div><div class='del'>-	bp-&gt;name = board_info[ent-&gt;driver_data].name;</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;features |= NETIF_F_IP_CSUM | NETIF_F_SG;</div><div class='ctx'> 	if (CHIP_NUM(bp) == CHIP_NUM_5709)</div><div class='hunk'>@@ -7747,7 +7769,7 @@ bnx2_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	printk(KERN_INFO "%s: %s (%c%d) %s found at mem %lx, "</div><div class='ctx'> 		"IRQ %d, node addr %s\n",</div><div class='ctx'> 		dev-&gt;name,</div><div class='del'>-		bp-&gt;name,</div><div class='add'>+		board_info[ent-&gt;driver_data].name,</div><div class='ctx'> 		((CHIP_ID(bp) &amp; 0xf000) &gt;&gt; 12) + 'A',</div><div class='ctx'> 		((CHIP_ID(bp) &amp; 0x0ff0) &gt;&gt; 4),</div><div class='ctx'> 		bnx2_bus_string(bp, str),</div><div class='hunk'>@@ -7781,7 +7803,6 @@ bnx2_suspend(struct pci_dev *pdev, pm_message_t state)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = pci_get_drvdata(pdev);</div><div class='ctx'> 	struct bnx2 *bp = netdev_priv(dev);</div><div class='del'>-	u32 reset_code;</div><div class='ctx'> </div><div class='ctx'> 	/* PCI register 4 needs to be saved whether netif_running() or not.</div><div class='ctx'> 	 * MSI address and data need to be saved if using MSI and</div><div class='hunk'>@@ -7795,13 +7816,7 @@ bnx2_suspend(struct pci_dev *pdev, pm_message_t state)</div><div class='ctx'> 	bnx2_netif_stop(bp);</div><div class='ctx'> 	netif_device_detach(dev);</div><div class='ctx'> 	del_timer_sync(&amp;bp-&gt;timer);</div><div class='del'>-	if (bp-&gt;flags &amp; BNX2_FLAG_NO_WOL)</div><div class='del'>-		reset_code = BNX2_DRV_MSG_CODE_UNLOAD_LNK_DN;</div><div class='del'>-	else if (bp-&gt;wol)</div><div class='del'>-		reset_code = BNX2_DRV_MSG_CODE_SUSPEND_WOL;</div><div class='del'>-	else</div><div class='del'>-		reset_code = BNX2_DRV_MSG_CODE_SUSPEND_NO_WOL;</div><div class='del'>-	bnx2_reset_chip(bp, reset_code);</div><div class='add'>+	bnx2_shutdown_chip(bp);</div><div class='ctx'> 	bnx2_free_skbs(bp);</div><div class='ctx'> 	bnx2_set_power_state(bp, pci_choose_state(pdev, state));</div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/net/bnx2.h b/drivers/net/bnx2.h<br/>index dfacd31f7ed0..617d95340160 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/bnx2.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/bnx2.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/bnx2.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/bnx2.h</a></div><div class='hunk'>@@ -6526,10 +6526,14 @@ struct sw_pg {</div><div class='ctx'> 	DECLARE_PCI_UNMAP_ADDR(mapping)</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct sw_tx_bd {</div><div class='add'>+	struct sk_buff		*skb;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #define SW_RXBD_RING_SIZE (sizeof(struct sw_bd) * RX_DESC_CNT)</div><div class='ctx'> #define SW_RXPG_RING_SIZE (sizeof(struct sw_pg) * RX_DESC_CNT)</div><div class='ctx'> #define RXBD_RING_SIZE (sizeof(struct rx_bd) * RX_DESC_CNT)</div><div class='del'>-#define SW_TXBD_RING_SIZE (sizeof(struct sw_bd) * TX_DESC_CNT)</div><div class='add'>+#define SW_TXBD_RING_SIZE (sizeof(struct sw_tx_bd) * TX_DESC_CNT)</div><div class='ctx'> #define TXBD_RING_SIZE (sizeof(struct tx_bd) * TX_DESC_CNT)</div><div class='ctx'> </div><div class='ctx'> /* Buffered flash (Atmel: AT45DB011B) specific information */</div><div class='hunk'>@@ -6609,7 +6613,7 @@ struct bnx2_tx_ring_info {</div><div class='ctx'> 	u32			tx_bseq_addr;</div><div class='ctx'> </div><div class='ctx'> 	struct tx_bd		*tx_desc_ring;</div><div class='del'>-	struct sw_bd		*tx_buf_ring;</div><div class='add'>+	struct sw_tx_bd		*tx_buf_ring;</div><div class='ctx'> </div><div class='ctx'> 	u16			tx_cons;</div><div class='ctx'> 	u16			hw_tx_cons;</div><div class='hunk'>@@ -6654,6 +6658,8 @@ struct bnx2_napi {</div><div class='ctx'> 	struct bnx2_tx_ring_info	tx_ring;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define BNX2_TIMER_INTERVAL			HZ</div><div class='add'>+</div><div class='ctx'> struct bnx2 {</div><div class='ctx'> 	/* Fields used in the tx and intr/napi performance paths are grouped */</div><div class='ctx'> 	/* together in the beginning of the structure. */</div><div class='hunk'>@@ -6701,9 +6707,6 @@ struct bnx2 {</div><div class='ctx'> </div><div class='ctx'> 	/* End of fields used in the performance code paths. */</div><div class='ctx'> </div><div class='del'>-	char			*name;</div><div class='del'>-</div><div class='del'>-	int			timer_interval;</div><div class='ctx'> 	int			current_interval;</div><div class='ctx'> 	struct			timer_list timer;</div><div class='ctx'> 	struct work_struct	reset_task;</div><div class='head'>diff --git a/drivers/net/bnx2_fw.h b/drivers/net/bnx2_fw.h<br/>index e4b1de435567..24c3cc40c23d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/bnx2_fw.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/bnx2_fw.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/bnx2_fw.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/bnx2_fw.h</a></div><div class='hunk'>@@ -15,854 +15,854 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static u8 bnx2_COM_b06FwText[] = {</div><div class='del'>-	0xcd, 0x7c, 0x0d, 0x70, 0x5c, 0xd5, 0x95, 0xe6, 0xe9, 0xd7, 0xdd, 0x52,</div><div class='del'>-	0x4b, 0x96, 0xe5, 0x27, 0xb9, 0x51, 0x1a, 0xa2, 0x24, 0xef, 0xa9, 0x9f,</div><div class='del'>-	0xa4, 0x06, 0x29, 0xe4, 0xd9, 0x08, 0x10, 0x49, 0x0f, 0x34, 0xdd, 0x92,</div><div class='del'>-	0x11, 0x89, 0x77, 0x24, 0x40, 0x61, 0xbc, 0x3b, 0xae, 0xac, 0xa6, 0x2d,</div><div class='del'>-	0x13, 0x42, 0x31, 0x35, 0xae, 0x0a, 0x3b, 0x71, 0xb2, 0x04, 0x37, 0x2d,</div><div class='del'>-	0x99, 0x38, 0x8c, 0xec, 0x56, 0x64, 0x59, 0x66, 0x67, 0xd8, 0xd9, 0x4e,</div><div class='del'>-	0x4b, 0xb2, 0x19, 0xa6, 0xed, 0xc6, 0x90, 0x1f, 0xa6, 0x92, 0x0c, 0x5a,</div><div class='del'>-	0xe3, 0x00, 0x93, 0xcd, 0x56, 0x41, 0x2a, 0xb5, 0xcb, 0x6c, 0x51, 0xbb,</div><div class='del'>-	0x5e, 0x27, 0x4c, 0xb2, 0xa9, 0xda, 0x0a, 0x3b, 0x93, 0xda, 0x65, 0xf2,</div><div class='del'>-	0x33, 0x6f, 0xbf, 0xef, 0xbe, 0xfb, 0xa4, 0x96, 0xac, 0x38, 0x4c, 0xa6,</div><div class='del'>-	0x52, 0x35, 0xaa, 0xea, 0xba, 0xef, 0xde, 0x77, 0x7f, 0xce, 0x3d, 0xf7,</div><div class='del'>-	0xdc, 0x73, 0xbe, 0x73, 0xee, 0x7d, 0xba, 0x55, 0xa4, 0x59, 0xf4, 0xdf,</div><div class='del'>-	0x56, 0xfc, 0x06, 0x7e, 0xff, 0x0f, 0xf6, 0xdd, 0x78, 0xbd, 0x7b, 0x3d,</div><div class='del'>-	0xf3, 0x46, 0x54, 0x22, 0x4c, 0xc3, 0xf8, 0xc5, 0xf1, 0xdb, 0xa9, 0x9f,</div><div class='del'>-	0x37, 0xfb, 0x33, 0xf1, 0xbb, 0x29, 0x24, 0x32, 0xf1, 0x23, 0x91, 0xd0,</div><div class='del'>-	0x86, 0x77, 0xb1, 0x4d, 0xea, 0x7b, 0xde, 0x2f, 0xe9, 0x48, 0xff, 0x19,</div><div class='del'>-	0xf8, 0x59, 0x57, 0xae, 0xb2, 0x3a, 0xee, 0xaf, 0xfb, 0x17, 0xd6, 0xcd,</div><div class='del'>-	0xb7, 0xea, 0x9f, 0xc4, 0x8c, 0xf4, 0xc5, 0xdf, 0xce, 0x3a, 0x12, 0x0b,</div><div class='del'>-	0xa7, 0xbf, 0x3b, 0xba, 0xcf, 0x11, 0xc9, 0x54, 0xfb, 0xac, 0x9c, 0xfc,</div><div class='del'>-	0xc2, 0x2b, 0xc4, 0x23, 0xc2, 0xf2, 0xf7, 0xa4, 0x7f, 0x7e, 0xe8, 0x1b,</div><div class='del'>-	0x37, 0xdb, 0x6f, 0x95, 0xc3, 0x12, 0x33, 0xd3, 0x6f, 0x8b, 0xd9, 0x23,</div><div class='del'>-	0xb1, 0x4e, 0xb4, 0x79, 0xb2, 0xf7, 0x29, 0x43, 0x5a, 0x83, 0xbe, 0xcc,</div><div class='del'>-	0x89, 0x70, 0x5a, 0xc6, 0x26, 0x67, 0x0e, 0x79, 0x86, 0x23, 0x85, 0x6b,</div><div class='del'>-	0xd2, 0x8e, 0x55, 0x94, 0x96, 0xc1, 0xe9, 0x81, 0x9b, 0x05, 0xf9, 0xb1,</div><div class='del'>-	0xc9, 0x6a, 0x4c, 0xb2, 0xb5, 0x42, 0x8b, 0xe1, 0x38, 0x48, 0x63, 0x85,</div><div class='del'>-	0x77, 0xa7, 0x25, 0xd6, 0x90, 0x9e, 0x6f, 0x7c, 0xc9, 0xe1, 0xf8, 0x89,</div><div class='del'>-	0xd1, 0xac, 0xf3, 0x6e, 0x89, 0x38, 0x9e, 0x37, 0x8d, 0xf1, 0x77, 0x55,</div><div class='del'>-	0x7f, 0xe1, 0x3d, 0x1a, 0xf1, 0xc7, 0x36, 0xd2, 0x07, 0xc3, 0x4c, 0x43,</div><div class='del'>-	0x69, 0x6b, 0xb4, 0xab, 0xaa, 0xf2, 0x0d, 0x7e, 0xde, 0xd1, 0xf9, 0x58,</div><div class='del'>-	0xb3, 0x4f, 0xbb, 0x34, 0x81, 0xf6, 0x58, 0x24, 0x9d, 0x6e, 0x42, 0x1f,</div><div class='del'>-	0xb1, 0x68, 0xfa, 0x99, 0xdf, 0x5a, 0x56, 0xf5, 0xee, 0xd7, 0xf5, 0xee,</div><div class='del'>-	0x8f, 0xfa, 0xed, 0x26, 0x47, 0x7b, 0xaa, 0x4c, 0x1f, 0x1a, 0xed, 0x56,</div><div class='del'>-	0xe9, 0xc3, 0xa3, 0x49, 0x95, 0x16, 0x54, 0xbd, 0x50, 0x7a, 0x7a, 0xd4,</div><div class='del'>-	0x51, 0x69, 0xa7, 0x2e, 0x4f, 0x8d, 0x5a, 0x2a, 0xed, 0xd7, 0xa9, 0xab,</div><div class='del'>-	0xd3, 0x01, 0x9d, 0x0e, 0xea, 0x34, 0xad, 0xd3, 0x8c, 0x4e, 0x87, 0x74,</div><div class='del'>-	0x3f, 0x23, 0x3a, 0xbf, 0x5b, 0xa7, 0x63, 0x3a, 0x1d, 0xd7, 0xe9, 0x1e,</div><div class='del'>-	0x9d, 0xee, 0xd5, 0x74, 0x4d, 0xe8, 0xf4, 0x41, 0x5d, 0x7e, 0x40, 0xd3,</div><div class='del'>-	0x79, 0x10, 0xf4, 0x7c, 0xa6, 0x51, 0xcb, 0x2d, 0xe6, 0x6b, 0xc9, 0xbe,</div><div class='del'>-	0x99, 0x98, 0x14, 0x4b, 0x61, 0xc9, 0xa9, 0xf5, 0xfc, 0x7c, 0x54, 0x9a,</div><div class='del'>-	0x63, 0x32, 0x55, 0x8b, 0xc9, 0x45, 0x25, 0xae, 0x3f, 0xf4, 0xbe, 0xd1,</div><div class='del'>-	0x6b, 0xca, 0x33, 0xb5, 0xb8, 0xbc, 0x50, 0x93, 0xd0, 0x58, 0x6f, 0x93,</div><div class='del'>-	0x18, 0x73, 0xd7, 0x48, 0xc6, 0x0c, 0x49, 0x58, 0xf1, 0xd5, 0x92, 0xec,</div><div class='del'>-	0x4c, 0x07, 0xf2, 0x76, 0x42, 0xe4, 0xe5, 0xa8, 0xbf, 0x8e, 0x31, 0x09,</div><div class='del'>-	0x2f, 0x70, 0x5d, 0x16, 0x46, 0x5f, 0x9a, 0x4f, 0x48, 0xe4, 0x98, 0x85,</div><div class='del'>-	0xfe, 0x5b, 0x24, 0xba, 0x20, 0x9d, 0x61, 0xe9, 0x4e, 0xdc, 0x87, 0x1a,</div><div class='del'>-	0x43, 0xd5, 0x88, 0x0c, 0x57, 0x43, 0x58, 0xab, 0x18, 0xe4, 0xa4, 0x05,</div><div class='del'>-	0x3f, 0x13, 0xbf, 0x38, 0x7e, 0x09, 0xfc, 0x3c, 0xf4, 0xd3, 0x29, 0xb9,</div><div class='del'>-	0x2a, 0xfb, 0xc4, 0xb8, 0x25, 0x8c, 0x5f, 0xb2, 0xcd, 0x09, 0x21, 0x4d,</div><div class='del'>-	0x09, 0xf9, 0x46, 0xaf, 0x4f, 0xd3, 0x0b, 0xb5, 0x58, 0x28, 0x7b, 0x52,</div><div class='del'>-	0x0e, 0xe4, 0x5c, 0xb1, 0x0c, 0xa7, 0x59, 0xf2, 0x66, 0xc8, 0x9a, 0x4c,</div><div class='del'>-	0xb5, 0x4b, 0x61, 0x1c, 0xef, 0x4a, 0x92, 0x31, 0xd0, 0x77, 0xde, 0x94,</div><div class='del'>-	0x09, 0xff, 0x1d, 0xcb, 0xfe, 0x1e, 0xfb, 0xd5, 0x36, 0x29, 0xb8, 0x2f,</div><div class='del'>-	0x94, 0xfe, 0x02, 0xcf, 0xec, 0xeb, 0xcd, 0x88, 0x4f, 0xf3, 0xdb, 0xc8,</div><div class='del'>-	0xb3, 0xfc, 0x67, 0xdb, 0xfc, 0x3c, 0x9f, 0x59, 0x37, 0x18, 0x33, 0x98,</div><div class='del'>-	0x2b, 0xc7, 0xee, 0xc5, 0x7c, 0x39, 0xfe, 0xea, 0x7c, 0x41, 0x47, 0x4b,</div><div class='del'>-	0x28, 0x77, 0xd2, 0x92, 0xc3, 0xa5, 0x5b, 0x25, 0xeb, 0x7a, 0xde, 0x3e,</div><div class='del'>-	0x57, 0xe2, 0x86, 0x74, 0x9b, 0x39, 0xbc, 0xad, 0x54, 0x25, 0x94, 0x2d,</div><div class='del'>-	0x05, 0xfc, 0x60, 0xbf, 0x11, 0x94, 0x75, 0xa0, 0x7e, 0x6b, 0x68, 0xe8,</div><div class='del'>-	0x24, 0x68, 0x4f, 0x93, 0x2f, 0x90, 0x59, 0xb7, 0x3b, 0x31, 0x89, 0xf1,</div><div class='del'>-	0x16, 0xab, 0xdd, 0xee, 0x79, 0x31, 0xd1, 0x67, 0x3b, 0xea, 0x90, 0x47,</div><div class='del'>-	0xec, 0x8b, 0x7d, 0xb2, 0xbf, 0x16, 0xb4, 0x8d, 0xe3, 0x1d, 0x69, 0xf2,</div><div class='del'>-	0xbc, 0xac, 0x6b, 0x32, 0x2f, 0x65, 0xf0, 0xad, 0x4c, 0xbe, 0x35, 0x77,</div><div class='del'>-	0xca, 0xa9, 0x2a, 0xc7, 0xd8, 0x8c, 0xee, 0xeb, 0xfe, 0x99, 0xd1, 0x9d,</div><div class='del'>-	0x40, 0xff, 0x71, 0xa4, 0x5b, 0x42, 0xd9, 0xe3, 0x1e, 0xc6, 0x4f, 0xe0,</div><div class='del'>-	0x79, 0xb3, 0x39, 0x5c, 0xd4, 0x32, 0x98, 0x00, 0xed, 0x71, 0x39, 0xa7,</div><div class='del'>-	0xe4, 0x70, 0x8b, 0x84, 0x21, 0x87, 0x5c, 0xe3, 0xb6, 0x85, 0x1b, 0x25,</div><div class='del'>-	0x1f, 0xb7, 0x2d, 0xea, 0xce, 0xae, 0x9d, 0x4d, 0x98, 0xa3, 0xd6, 0x82,</div><div class='del'>-	0xc7, 0xe2, 0x90, 0xc3, 0xf3, 0x6d, 0x06, 0x4a, 0x0c, 0xb1, 0xcd, 0x7f,</div><div class='del'>-	0x25, 0x05, 0xc9, 0x2d, 0x7d, 0x2a, 0x24, 0xcd, 0x06, 0xea, 0x5d, 0x1b,</div><div class='del'>-	0xf2, 0x79, 0x40, 0xfe, 0x64, 0xc0, 0x9f, 0x90, 0xf8, 0xfb, 0x3a, 0x23,</div><div class='del'>-	0x5d, 0x55, 0xbe, 0xef, 0xb3, 0x0c, 0xf5, 0x6e, 0x08, 0xef, 0x22, 0x92,</div><div class='del'>-	0xdc, 0x19, 0xbc, 0x1f, 0xc2, 0xfb, 0x6b, 0x64, 0xc2, 0x04, 0x2d, 0xa5,</div><div class='del'>-	0xe7, 0x8d, 0x2c, 0x68, 0xbc, 0x3d, 0xa2, 0xe6, 0x8a, 0xba, 0x13, 0x75,</div><div class='del'>-	0xfd, 0x4c, 0xa0, 0xde, 0x1f, 0x63, 0x2c, 0xd0, 0x5b, 0xb2, 0x40, 0x4b,</div><div class='del'>-	0x07, 0x68, 0x21, 0x8d, 0x05, 0x23, 0x5b, 0x8b, 0x20, 0x3f, 0x6d, 0xe4,</div><div class='del'>-	0x4e, 0x1f, 0xc1, 0xb3, 0x98, 0x46, 0xfa, 0x79, 0xa6, 0x68, 0xbf, 0xb7,</div><div class='del'>-	0xae, 0xfd, 0x5e, 0xb4, 0xe7, 0x18, 0x6c, 0xef, 0xcb, 0x7f, 0x41, 0xc9,</div><div class='del'>-	0xa2, 0x75, 0x05, 0x7e, 0x84, 0x7f, 0x0d, 0x7e, 0x7c, 0x4d, 0xf3, 0xe3,</div><div class='del'>-	0x67, 0xf2, 0x9b, 0xe7, 0xc7, 0x7f, 0xff, 0x0d, 0xf1, 0x43, 0x24, 0x7f,</div><div class='del'>-	0x9c, 0xcf, 0x11, 0x29, 0x28, 0xbd, 0xc5, 0x7d, 0x4b, 0x79, 0xa7, 0xce,</div><div class='del'>-	0x22, 0x9f, 0x28, 0xc7, 0xd8, 0x03, 0xb5, 0x08, 0xd2, 0xa7, 0x90, 0x6e,</div><div class='del'>-	0x09, 0x8d, 0x1d, 0xbf, 0x84, 0xf5, 0xf7, 0xc4, 0xdc, 0x19, 0xd8, 0x8d,</div><div class='del'>-	0x42, 0xc2, 0x94, 0x4e, 0x31, 0xaf, 0x87, 0xd1, 0xee, 0xb0, 0xcd, 0xbc,</div><div class='del'>-	0xbc, 0x89, 0xf7, 0xbf, 0x08, 0x05, 0xf6, 0x3d, 0x3b, 0xd3, 0xf4, 0x76,</div><div class='del'>-	0x46, 0x3d, 0x45, 0xc9, 0xcf, 0x8c, 0x91, 0x8e, 0x84, 0x72, 0x25, 0x6b,</div><div class='del'>-	0xc2, 0x48, 0xc7, 0xa1, 0xa7, 0x98, 0x1f, 0x0c, 0xf9, 0x34, 0x0f, 0xa0,</div><div class='del'>-	0x6e, 0xa0, 0xb3, 0x02, 0xda, 0x07, 0x40, 0xfb, 0x46, 0xdd, 0x95, 0x01,</div><div class='del'>-	0x2d, 0xa4, 0x81, 0x74, 0x55, 0xc2, 0x9a, 0xf7, 0xe8, 0xe7, 0xa0, 0xea,</div><div class='del'>-	0x27, 0x9c, 0x1e, 0x14, 0xda, 0xd0, 0xfc, 0x0c, 0xf7, 0x01, 0xdb, 0xb1,</div><div class='del'>-	0x2f, 0x5f, 0x27, 0xe7, 0xab, 0x41, 0x1f, 0x85, 0xba, 0x3e, 0x0a, 0xa0,</div><div class='del'>-	0x47, 0xb6, 0x19, 0x4e, 0x14, 0x6b, 0xcf, 0xae, 0x8e, 0xe0, 0xdd, 0x93,</div><div class='del'>-	0x92, 0x3d, 0x7d, 0xb3, 0x81, 0x39, 0xa0, 0x5f, 0xf2, 0x68, 0x0c, 0x3a,</div><div class='del'>-	0x9b, 0xfb, 0x2c, 0x26, 0xb9, 0x38, 0xcb, 0x3e, 0xa6, 0xc7, 0x8d, 0x48,</div><div class='del'>-	0x46, 0xe5, 0x5f, 0x69, 0x5d, 0xa3, 0xe3, 0x79, 0x3d, 0x9f, 0x34, 0xe6,</div><div class='del'>-	0x43, 0x1a, 0x82, 0xb9, 0xa4, 0xeb, 0xe6, 0x12, 0xf0, 0x9a, 0xbc, 0x30,</div><div class='del'>-	0xa1, 0xe3, 0x63, 0xda, 0x86, 0xb0, 0xdd, 0x74, 0xdd, 0xda, 0x4d, 0xa3,</div><div class='del'>-	0x0d, 0x79, 0x8f, 0x3a, 0x1b, 0xec, 0x0a, 0x6d, 0xca, 0x10, 0xfa, 0x29,</div><div class='del'>-	0xce, 0x1b, 0x92, 0x73, 0x61, 0xab, 0xdd, 0x77, 0x6b, 0x79, 0x5d, 0x93,</div><div class='del'>-	0xa5, 0xe8, 0xa6, 0xb2, 0x74, 0xc8, 0xf0, 0xf5, 0x35, 0x6c, 0x0b, 0xec,</div><div class='del'>-	0xcf, 0xd4, 0xbc, 0x9d, 0x0a, 0x64, 0xa9, 0x38, 0xf3, 0x4e, 0x64, 0x29,</div><div class='del'>-	0x68, 0x1f, 0x83, 0xec, 0x06, 0x63, 0x6c, 0xa4, 0x39, 0xa8, 0x03, 0x1a,</div><div class='del'>-	0x4b, 0x59, 0x8d, 0x51, 0x38, 0x8e, 0x6f, 0x1b, 0xca, 0xeb, 0x6c, 0xc3,</div><div class='del'>-	0x11, 0xb4, 0x95, 0x50, 0xae, 0xb7, 0x45, 0xf6, 0xcf, 0x07, 0x7d, 0x1c,</div><div class='del'>-	0x51, 0x32, 0x3b, 0x39, 0x63, 0x9b, 0xc3, 0x61, 0xc9, 0x0c, 0xcf, 0x0e,</div><div class='del'>-	0xca, 0x50, 0xad, 0x13, 0x6b, 0xfa, 0xb6, 0x07, 0xdb, 0x79, 0x7d, 0x54,</div><div class='del'>-	0x1c, 0xe8, 0x45, 0xcc, 0x79, 0x00, 0x3c, 0xae, 0x45, 0xc5, 0x48, 0xbb,</div><div class='del'>-	0x48, 0xeb, 0x31, 0x56, 0x24, 0x32, 0xbc, 0x2e, 0xdf, 0x80, 0x3a, 0xe8,</div><div class='del'>-	0x7b, 0x60, 0x63, 0x3d, 0xc8, 0x27, 0x78, 0x9b, 0x75, 0x7f, 0xe1, 0xc1,</div><div class='del'>-	0x0e, 0x6b, 0x9b, 0xc5, 0x52, 0xea, 0x89, 0x40, 0x47, 0x7c, 0x14, 0xfb,</div><div class='del'>-	0x5b, 0xed, 0x85, 0x82, 0x91, 0x3e, 0x80, 0x3e, 0x44, 0xc9, 0x69, 0xb1,</div><div class='del'>-	0xf6, 0x4c, 0xb0, 0xef, 0x55, 0xf9, 0xae, 0x01, 0xca, 0x5e, 0x19, 0x98,</div><div class='del'>-	0x80, 0x73, 0x5a, 0x52, 0x7b, 0x3d, 0x67, 0xc6, 0x65, 0xba, 0xc4, 0xf9,</div><div class='del'>-	0x2c, 0x49, 0xb2, 0xfa, 0xa7, 0x92, 0x3b, 0x2d, 0xf2, 0xad, 0x19, 0xd6,</div><div class='del'>-	0xfb, 0xba, 0xae, 0xf7, 0x3c, 0xea, 0x25, 0xad, 0xa1, 0x90, 0x0d, 0x3b,</div><div class='del'>-	0x60, 0x63, 0x9b, 0xf4, 0x59, 0x48, 0xcd, 0x11, 0xfc, 0x86, 0x68, 0x64,</div><div class='del'>-	0x50, 0xcf, 0xc7, 0x40, 0xcf, 0x83, 0x1f, 0x22, 0x77, 0x95, 0x1a, 0xa1,</div><div class='del'>-	0x4f, 0xfe, 0x27, 0x68, 0x8d, 0xcb, 0xe3, 0x98, 0xc7, 0x4b, 0x33, 0xc4,</div><div class='del'>-	0x59, 0x5f, 0x97, 0xe5, 0x19, 0xe2, 0xae, 0xe7, 0x65, 0x7a, 0x26, 0xe9,</div><div class='del'>-	0x7e, 0x0b, 0x7c, 0x3e, 0x25, 0x9c, 0x4b, 0x9f, 0x8b, 0x14, 0x18, 0xd0,</div><div class='del'>-	0xb6, 0x1e, 0x83, 0x3e, 0xeb, 0xdd, 0xe9, 0xf7, 0xd7, 0xad, 0xfb, 0x73,</div><div class='del'>-	0xaa, 0xb6, 0x5c, 0x34, 0xa9, 0x9f, 0x2e, 0xdf, 0xe3, 0x59, 0xbd, 0xc7,</div><div class='del'>-	0xc7, 0xdc, 0x4e, 0x31, 0xb0, 0xaf, 0x33, 0xe3, 0x05, 0x58, 0x3f, 0xee,</div><div class='del'>-	0xeb, 0xff, 0x6b, 0xac, 0xe1, 0x9f, 0x04, 0xb0, 0xaa, 0xad, 0xec, 0xdd,</div><div class='del'>-	0x3f, 0x6e, 0x8f, 0xd7, 0xef, 0x6d, 0x8e, 0xdf, 0x8a, 0x36, 0x11, 0xa4,</div><div class='del'>-	0x57, 0xde, 0xd7, 0xe8, 0xa3, 0xae, 0xed, 0x20, 0xf7, 0x05, 0xda, 0xfc,</div><div class='del'>-	0x09, 0x78, 0x41, 0xfe, 0xbf, 0x93, 0xfd, 0xdc, 0x17, 0x7e, 0x47, 0xfb,</div><div class='del'>-	0x79, 0xfc, 0x4a, 0xfb, 0xb9, 0x7e, 0x2f, 0x9f, 0x25, 0x2f, 0x30, 0xb6,</div><div class='del'>-	0xcc, 0xfa, 0xb2, 0xd5, 0x0d, 0x5e, 0x5b, 0x90, 0x53, 0xd0, 0x50, 0xfa,</div><div class='del'>-	0x07, 0x2f, 0x13, 0xf1, 0xf1, 0x9c, 0x2f, 0x4f, 0xac, 0x17, 0xd4, 0xf1,</div><div class='del'>-	0x75, 0xef, 0x50, 0xed, 0xa2, 0xd2, 0xb3, 0xe7, 0x94, 0x9e, 0xb5, 0x8f,</div><div class='del'>-	0x14, 0x84, 0xf2, 0x76, 0x43, 0x98, 0x7c, 0x7f, 0xc6, 0xfd, 0x2c, 0x68,</div><div class='del'>-	0xb4, 0x2d, 0xcb, 0xe8, 0x2e, 0x18, 0xc6, 0x67, 0xe5, 0xc0, 0xe2, 0x43,</div><div class='del'>-	0x72, 0xa0, 0xc4, 0x3e, 0xd2, 0x78, 0xef, 0xa0, 0xac, 0x09, 0xba, 0x96,</div><div class='del'>-	0x3a, 0xfd, 0xed, 0x90, 0x3f, 0x96, 0x01, 0xfb, 0xb5, 0x12, 0xba, 0xab,</div><div class='del'>-	0x76, 0x21, 0x94, 0x5d, 0xe4, 0xde, 0x45, 0x79, 0xad, 0x5e, 0xe7, 0x07,</div><div class='del'>-	0xfa, 0xbe, 0x5e, 0xb7, 0x17, 0x42, 0x63, 0xa5, 0x69, 0xe2, 0x40, 0x23,</div><div class='del'>-	0xeb, 0x46, 0xb5, 0xee, 0xf8, 0x9a, 0x29, 0xad, 0xb0, 0x2d, 0xc6, 0x3c,</div><div class='del'>-	0x78, 0x45, 0x9c, 0x4a, 0xde, 0xa5, 0x24, 0x13, 0x21, 0x9e, 0xe4, 0xb3,</div><div class='del'>-	0x78, 0xe1, 0x34, 0xf7, 0x9e, 0x44, 0xc2, 0xe9, 0x2e, 0xf0, 0x8e, 0x75,</div><div class='del'>-	0x6e, 0x05, 0xad, 0xb0, 0x7b, 0xee, 0xfb, 0x84, 0x72, 0xf9, 0x42, 0xe9,</div><div class='del'>-	0x36, 0xe4, 0x23, 0x9a, 0xbf, 0x51, 0xd4, 0x61, 0x7f, 0x3f, 0x6d, 0x90,</div><div class='del'>-	0xd6, 0xe3, 0xd0, 0x15, 0x41, 0xbf, 0xac, 0x93, 0xd0, 0x75, 0x5a, 0x74,</div><div class='del'>-	0x9d, 0x5b, 0xf0, 0x7e, 0x0e, 0xf5, 0x6c, 0x57, 0x84, 0x7c, 0x60, 0x59,</div><div class='del'>-	0x3b, 0xe6, 0x85, 0xba, 0x8b, 0xe9, 0xf0, 0x7a, 0xba, 0x6e, 0xaa, 0xab,</div><div class='del'>-	0xcb, 0xfc, 0x66, 0x58, 0x97, 0xf2, 0x24, 0x5a, 0x97, 0xb1, 0x6c, 0x10,</div><div class='del'>-	0xcf, 0x5d, 0x32, 0xb1, 0x98, 0x81, 0x4e, 0xba, 0x5d, 0xf5, 0x13, 0x75,</div><div class='del'>-	0xd6, 0xd9, 0x3a, 0xd0, 0x64, 0x69, 0x9a, 0xb6, 0x04, 0xfa, 0x18, 0x65,</div><div class='del'>-	0xae, 0x2e, 0x6b, 0xa8, 0x2b, 0x0b, 0xe4, 0xe7, 0x5f, 0x83, 0x76, 0x8e,</div><div class='del'>-	0x3d, 0xa2, 0x71, 0x98, 0xe7, 0xe5, 0x28, 0x77, 0xfd, 0xff, 0x52, 0xf3,</div><div class='del'>-	0xa2, 0x60, 0x86, 0xd5, 0x5e, 0xa9, 0xfe, 0xf6, 0xda, 0x5e, 0x01, 0x6e,</div><div class='del'>-	0x57, 0xbd, 0x70, 0x8e, 0xa4, 0xa5, 0x05, 0x6b, 0x3b, 0x04, 0x5a, 0xb1,</div><div class='del'>-	0x86, 0x1d, 0x21, 0xcc, 0xb7, 0x45, 0xf2, 0xb5, 0xb4, 0x7e, 0xc7, 0xf2,</div><div class='del'>-	0x88, 0x8c, 0xc5, 0x83, 0xf9, 0x7d, 0xc0, 0xf4, 0xb1, 0x37, 0xea, 0x94,</div><div class='del'>-	0xb6, 0x44, 0xfc, 0xbd, 0x68, 0x4a, 0xfe, 0xe4, 0x10, 0x64, 0x9e, 0xd8,</div><div class='del'>-	0xb0, 0x01, 0x32, 0x1f, 0x57, 0x36, 0xc7, 0x70, 0x58, 0x1f, 0xef, 0x4e,</div><div class='del'>-	0xff, 0xbb, 0xb0, 0xdf, 0x86, 0xf5, 0x82, 0x36, 0xc1, 0xd8, 0xed, 0xab,</div><div class='del'>-	0x6d, 0xc7, 0x5c, 0x43, 0xc2, 0x6a, 0x7c, 0x94, 0x9d, 0x5e, 0x3f, 0xbe,</div><div class='del'>-	0xd1, 0x11, 0x8c, 0xff, 0xa7, 0xba, 0xaf, 0xf6, 0xba, 0xbe, 0xe2, 0x57,</div><div class='del'>-	0x18, 0x1f, 0xef, 0x4e, 0xff, 0xee, 0x76, 0xbf, 0x4d, 0xbc, 0xae, 0x4d,</div><div class='del'>-	0xc7, 0x86, 0x36, 0xac, 0x1f, 0x8c, 0x81, 0x77, 0xa7, 0xef, 0x6b, 0xf1,</div><div class='del'>-	0xdb, 0xb0, 0x5e, 0x03, 0x6c, 0x2c, 0xdf, 0x71, 0x0f, 0x1e, 0xa8, 0xdb,</div><div class='del'>-	0x83, 0x07, 0xb0, 0x07, 0x03, 0xd9, 0xde, 0x88, 0xd7, 0x03, 0xbf, 0x8b,</div><div class='del'>-	0xfe, 0x16, 0x31, 0xde, 0x9a, 0x7f, 0x15, 0x59, 0x68, 0x01, 0x7e, 0x6a,</div><div class='del'>-	0xa5, 0x4f, 0xa5, 0xf1, 0x39, 0x7d, 0x2c, 0xe2, 0x71, 0x71, 0x22, 0xd2,</div><div class='del'>-	0x0d, 0x5d, 0xd9, 0x9d, 0xd8, 0xcf, 0x8d, 0x5f, 0x8d, 0x2b, 0xdc, 0x9e,</div><div class='del'>-	0xd1, 0x63, 0xd0, 0xbf, 0x22, 0xdf, 0x99, 0xcf, 0xad, 0xfa, 0x5b, 0x9d,</div><div class='del'>-	0xf0, 0xc7, 0x88, 0xbb, 0x89, 0xdb, 0x02, 0xfa, 0x03, 0x7a, 0x0e, 0x1a,</div><div class='del'>-	0x6b, 0x7b, 0x33, 0x63, 0x0c, 0xd5, 0x86, 0x0c, 0x7f, 0x6f, 0xf2, 0xfd,</div><div class='del'>-	0x41, 0x6d, 0x5b, 0x37, 0xd2, 0xfb, 0x9e, 0x0d, 0xf4, 0x12, 0xdf, 0x59,</div><div class='del'>-	0x32, 0x05, 0x19, 0x89, 0x2c, 0x50, 0xd7, 0x2f, 0x8c, 0x2e, 0xcf, 0x13,</div><div class='del'>-	0xc7, 0xf4, 0x83, 0x2f, 0xa4, 0x97, 0xfc, 0xa3, 0x4e, 0x69, 0x85, 0x9e,</div><div class='del'>-	0xea, 0x4e, 0x55, 0x50, 0x9f, 0x7e, 0xfe, 0x84, 0xf2, 0x0f, 0x5b, 0x90,</div><div class='del'>-	0xc2, 0x89, 0x03, 0xad, 0x13, 0xa0, 0x75, 0x42, 0xfb, 0x86, 0xfb, 0x61,</div><div class='del'>-	0x47, 0x22, 0xc7, 0x02, 0x5a, 0x6f, 0x89, 0x04, 0x6b, 0xb3, 0x9e, 0xf6,</div><div class='del'>-	0x7a, 0xfb, 0xe7, 0xe3, 0xc0, 0xbb, 0x7a, 0xd5, 0x9e, 0x2c, 0x10, 0x3b,</div><div class='del'>-	0x4e, 0x9c, 0x0e, 0xf6, 0xa3, 0xf8, 0x7b, 0xa9, 0x35, 0xc0, 0x01, 0x9c,</div><div class='del'>-	0x0f, 0x71, 0x08, 0x75, 0x4f, 0x30, 0x87, 0x16, 0xe9, 0x5a, 0xe0, 0x1c,</div><div class='del'>-	0x56, 0xe9, 0x8f, 0x33, 0xca, 0x72, 0x00, 0xfa, 0x3b, 0xaf, 0x68, 0xdd,</div><div class='del'>-	0x2d, 0x93, 0xa5, 0xf7, 0x69, 0xfa, 0x5b, 0x40, 0xff, 0x18, 0x64, 0x7b,</div><div class='del'>-	0x4d, 0x77, 0xe5, 0xab, 0xe3, 0xc8, 0xfb, 0x98, 0x90, 0x3c, 0xce, 0x57,</div><div class='del'>-	0xa9, 0xc7, 0xf4, 0x7c, 0x9a, 0x39, 0x9f, 0x8d, 0x3a, 0x6e, 0x33, 0xbe,</div><div class='del'>-	0xbe, 0x77, 0x03, 0x5f, 0x45, 0xf3, 0x35, 0x26, 0x0d, 0x0b, 0xca, 0xbf,</div><div class='del'>-	0x46, 0xbf, 0xe4, 0x35, 0xed, 0xe8, 0xc2, 0xe8, 0xf4, 0xbc, 0xf4, 0x33,</div><div class='del'>-	0x08, 0x95, 0x07, 0xdf, 0x50, 0x36, 0xd0, 0x20, 0xdd, 0xee, 0x05, 0xcc,</div><div class='del'>-	0x3b, 0x8f, 0xf5, 0x36, 0x8e, 0xf9, 0xf2, 0x4d, 0xfe, 0xe6, 0xab, 0xcd,</div><div class='del'>-	0xf0, 0xe9, 0x39, 0x36, 0x79, 0x46, 0xfa, 0x4d, 0x45, 0xcf, 0x2a, 0xbf,</div><div class='del'>-	0x41, 0xdf, 0x7d, 0xd5, 0x8d, 0xbc, 0xad, 0xd7, 0x33, 0x41, 0xec, 0xe0,</div><div class='del'>-	0x35, 0xd3, 0xdf, 0x17, 0x9b, 0xc5, 0x0e, 0x5a, 0xa0, 0xa3, 0x23, 0x8c,</div><div class='del'>-	0x13, 0x80, 0xf7, 0x8c, 0xf3, 0x5c, 0x8a, 0xd0, 0x17, 0x78, 0xa1, 0x04,</div><div class='del'>-	0x3d, 0x73, 0x9c, 0xd8, 0xa5, 0x55, 0xef, 0x8f, 0x1b, 0xb4, 0x0d, 0x8b,</div><div class='del'>-	0x2a, 0xdb, 0x21, 0x86, 0x49, 0x7c, 0x84, 0x32, 0xe4, 0x17, 0x99, 0x0f,</div><div class='del'>-	0xe8, 0xb8, 0x7b, 0x4f, 0xd4, 0x79, 0x21, 0x12, 0xe8, 0x84, 0x35, 0xba,</div><div class='del'>-	0xea, 0x63, 0x03, 0x1e, 0x30, 0xe5, 0xfb, 0x20, 0xb7, 0xb7, 0xc3, 0xff,</div><div class='del'>-	0xb7, 0x24, 0x9f, 0xe2, 0x3e, 0x1a, 0x54, 0x3e, 0x92, 0xe1, 0xec, 0x47,</div><div class='del'>-	0x59, 0x13, 0xca, 0x60, 0x4c, 0x4d, 0xcc, 0xdf, 0xf9, 0x3d, 0x99, 0x80,</div><div class='del'>-	0x8c, 0xe7, 0x53, 0x7d, 0xa0, 0x83, 0xf8, 0x0e, 0x58, 0xcb, 0x49, 0x31,</div><div class='del'>-	0x7e, 0x80, 0xbf, 0x7b, 0xa3, 0xfe, 0xbc, 0xf6, 0x20, 0xdf, 0x8c, 0x3a,</div><div class='del'>-	0x5d, 0xba, 0xce, 0x16, 0x61, 0x1c, 0x2a, 0x6f, 0xb6, 0x22, 0xed, 0xd9,</div><div class='del'>-	0x50, 0xf7, 0x43, 0xc8, 0xdf, 0xa2, 0xfb, 0x2f, 0xe0, 0xfd, 0x4d, 0xf8,</div><div class='del'>-	0x0d, 0xa1, 0xec, 0x66, 0x94, 0xb9, 0x28, 0xbb, 0x11, 0xf9, 0x0f, 0xe9,</div><div class='del'>-	0xb8, 0x44, 0xd0, 0xa6, 0x15, 0xf9, 0x47, 0xf1, 0x1e, 0xba, 0xc2, 0x7c,</div><div class='del'>-	0x05, 0xef, 0x6f, 0xc1, 0xef, 0xfa, 0x0d, 0x75, 0xda, 0x37, 0xe4, 0x4f,</div><div class='del'>-	0xae, 0xf2, 0xe0, 0x85, 0xd2, 0x55, 0xfa, 0x99, 0xf2, 0xcc, 0xfc, 0x2b,</div><div class='del'>-	0x3a, 0x7f, 0xfb, 0x86, 0xf2, 0xfb, 0x83, 0x7c, 0xdd, 0x1a, 0xc2, 0x0e,</div><div class='del'>-	0x9a, 0x01, 0xd6, 0xbd, 0xda, 0xf4, 0xd7, 0xe0, 0x3d, 0x7e, 0xbc, 0xa0,</div><div class='del'>-	0x14, 0xb4, 0x23, 0xf6, 0xbd, 0x3d, 0xbc, 0xbe, 0xaf, 0xff, 0xd6, 0xb0,</div><div class='del'>-	0x96, 0x6f, 0x09, 0x0d, 0x9f, 0x64, 0xd9, 0x4f, 0x1b, 0xd6, 0xd7, 0x79,</div><div class='del'>-	0x5f, 0xe3, 0x5a, 0x7e, 0x6b, 0x68, 0xf8, 0x38, 0xcb, 0xee, 0x6b, 0x5c,</div><div class='del'>-	0x5f, 0x67, 0xb8, 0x71, 0x6d, 0x1e, 0x6b, 0xba, 0x30, 0x92, 0xae, 0x50,</div><div class='del'>-	0x8e, 0xb1, 0x17, 0xaa, 0xa3, 0xd9, 0x19, 0xcf, 0x9b, 0x72, 0x57, 0x12,</div><div class='del'>-	0x61, 0xa1, 0x0d, 0x22, 0x66, 0x66, 0xf9, 0x53, 0x28, 0x07, 0xa6, 0xaa,</div><div class='del'>-	0x8d, 0x09, 0x75, 0xd2, 0xe6, 0xd8, 0xd8, 0xd2, 0xd8, 0x58, 0x65, 0x23,</div><div class='del'>-	0x59, 0x85, 0x65, 0x9f, 0x18, 0x05, 0xf6, 0xd2, 0xcf, 0x4f, 0xe2, 0xd9,</div><div class='del'>-	0xaa, 0xc7, 0xdf, 0xe8, 0xb7, 0x3c, 0x9a, 0x9d, 0xa7, 0xcd, 0x5b, 0x1a,</div><div class='del'>-	0xdd, 0x37, 0xcf, 0x3d, 0x7f, 0x0a, 0x7b, 0x3e, 0x24, 0xd3, 0xca, 0xfe,</div><div class='del'>-	0x91, 0x0e, 0xb6, 0x2b, 0x8f, 0x76, 0x2d, 0x31, 0xad, 0x8c, 0x3a, 0x4b,</div><div class='del'>-	0x61, 0xd9, 0x1f, 0xf7, 0xdb, 0x32, 0x6f, 0x2d, 0x05, 0x7b, 0xa0, 0x59,</div><div class='del'>-	0xa2, 0x69, 0xca, 0xa4, 0x9d, 0x82, 0x0f, 0x80, 0xf9, 0x1c, 0x19, 0x9d,</div><div class='del'>-	0x76, 0x28, 0x9f, 0x9f, 0x82, 0xdd, 0x6f, 0x96, 0x06, 0xa5, 0x6f, 0x1e,</div><div class='del'>-	0xd7, 0x63, 0x9d, 0xc2, 0x58, 0xdb, 0xd4, 0x7e, 0xca, 0x3a, 0x91, 0x04,</div><div class='del'>-	0xc6, 0x39, 0x64, 0x38, 0x7d, 0x18, 0x8f, 0x1e, 0x7b, 0xa7, 0x4c, 0xd5,</div><div class='del'>-	0xb8, 0x6f, 0xf6, 0x44, 0xd7, 0xfc, 0xf4, 0x39, 0xb4, 0x0b, 0xfc, 0x43,</div><div class='del'>-	0x8e, 0x57, 0x01, 0x3e, 0x84, 0x2c, 0xa7, 0x6d, 0x33, 0x1b, 0x86, 0x9d,</div><div class='del'>-	0x9f, 0x0f, 0xea, 0x90, 0xa6, 0x63, 0xa3, 0xc9, 0xa5, 0x24, 0xfa, 0xea,</div><div class='del'>-	0xa4, 0x0e, 0x83, 0xee, 0x0a, 0xe3, 0xc7, 0xbe, 0xd9, 0x0e, 0xb6, 0x68,</div><div class='del'>-	0x90, 0x76, 0x64, 0x0e, 0x76, 0xa4, 0x53, 0x0e, 0x97, 0x54, 0x1f, 0x16,</div><div class='del'>-	0xfb, 0x28, 0xea, 0xb6, 0x5d, 0x4b, 0x0d, 0xf0, 0xb1, 0x92, 0xe6, 0x8b,</div><div class='del'>-	0xb2, 0xd6, 0x76, 0x58, 0xfc, 0x76, 0x7e, 0xdf, 0x3f, 0xf1, 0x32, 0xf1,</div><div class='del'>-	0xfa, 0xbd, 0xdf, 0x2c, 0x61, 0xd0, 0x91, 0x43, 0x1f, 0x1c, 0x7f, 0xad,</div><div class='del'>-	0xef, 0xa0, 0xbf, 0xa4, 0x79, 0xfe, 0xb2, 0xbe, 0xb6, 0x69, 0xfc, 0x66,</div><div class='del'>-	0x5b, 0xb9, 0x5f, 0x6b, 0x6c, 0xce, 0xf7, 0x09, 0xc8, 0x83, 0x44, 0x72,</div><div class='del'>-	0xbd, 0xd0, 0x8b, 0xb5, 0x41, 0x2d, 0x23, 0x4f, 0xa2, 0xac, 0xde, 0xc7,</div><div class='del'>-	0xf2, 0xe5, 0xab, 0x00, 0x6c, 0x59, 0xc4, 0x3e, 0x0f, 0xa7, 0x33, 0x6d,</div><div class='del'>-	0x7e, 0xcc, 0xeb, 0x4a, 0x7e, 0x15, 0xe4, 0x06, 0x7d, 0x16, 0x57, 0xdb,</div><div class='del'>-	0x72, 0x4e, 0x4f, 0x8e, 0xbe, 0x34, 0x93, 0xc0, 0x9c, 0x7c, 0xbb, 0xe0,</div><div class='del'>-	0xf3, 0x9a, 0x36, 0x27, 0x24, 0xcb, 0x8e, 0x05, 0xff, 0x9d, 0x36, 0xde,</div><div class='del'>-	0x92, 0x97, 0x9d, 0xc0, 0xfe, 0xd0, 0x16, 0xa1, 0x7e, 0x8d, 0xb4, 0x91,</div><div class='del'>-	0xf6, 0x39, 0xcc, 0xcd, 0x93, 0x59, 0xd7, 0x97, 0xc1, 0x5e, 0xd8, 0x91,</div><div class='del'>-	0xff, 0x18, 0xb1, 0x8f, 0xd0, 0xcf, 0xbb, 0x18, 0xa9, 0x9f, 0x4f, 0x80,</div><div class='del'>-	0x15, 0x9e, 0xd0, 0x31, 0xe8, 0x39, 0x2d, 0x2f, 0x65, 0xc8, 0x4b, 0x9f,</div><div class='del'>-	0x65, 0x4a, 0x0f, 0x68, 0x47, 0x9d, 0xfe, 0x6e, 0xf8, 0x5b, 0xf4, 0xe5,</div><div class='del'>-	0x13, 0xa0, 0xc7, 0x84, 0xee, 0xd8, 0xa6, 0x7d, 0x87, 0xb7, 0xa2, 0xb4,</div><div class='del'>-	0x6d, 0x6d, 0x2a, 0xbe, 0x3d, 0xa7, 0xe4, 0xd9, 0x97, 0xef, 0xb0, 0x7e,</div><div class='del'>-	0x1f, 0xc8, 0x54, 0x98, 0x90, 0x46, 0xd6, 0xe2, 0xb8, 0xac, 0xbf, 0xa0,</div><div class='del'>-	0xeb, 0xcf, 0xa3, 0x7e, 0x08, 0x73, 0xf2, 0xbc, 0x49, 0x45, 0xef, 0x02,</div><div class='del'>-	0xf8, 0x1e, 0x96, 0xe2, 0xaa, 0xcc, 0x2f, 0x40, 0xe6, 0x29, 0xdf, 0x73,</div><div class='del'>-	0xd8, 0xaf, 0x20, 0xfe, 0x6e, 0xca, 0x7d, 0x45, 0x86, 0x4e, 0xef, 0x6f,</div><div class='del'>-	0x60, 0xcc, 0xd5, 0x32, 0xe8, 0x03, 0x53, 0x26, 0x3b, 0xe5, 0xb1, 0x52,</div><div class='del'>-	0xd2, 0x9c, 0xaa, 0x5b, 0xcb, 0x5d, 0xeb, 0xd6, 0x92, 0x32, 0xa0, 0xea,</div><div class='del'>-	0xa7, 0x58, 0xbf, 0x52, 0x27, 0x03, 0x8b, 0xf3, 0x57, 0x6a, 0x47, 0x19,</div><div class='del'>-	0x60, 0xbb, 0xcd, 0xfc, 0x05, 0xc6, 0x28, 0x3d, 0x6f, 0xd9, 0x25, 0xfe,</div><div class='del'>-	0x6f, 0x94, 0x82, 0x92, 0xb1, 0x90, 0x14, 0x5d, 0xee, 0xab, 0xac, 0x15,</div><div class='del'>-	0x11, 0x1b, 0x58, 0xe9, 0xf7, 0x41, 0x67, 0x26, 0x15, 0x15, 0x3f, 0xa6,</div><div class='del'>-	0x31, 0x81, 0x35, 0x58, 0x31, 0x3d, 0xef, 0x25, 0x47, 0xa4, 0x02, 0x1f,</div><div class='del'>-	0x78, 0x19, 0x69, 0xb1, 0x8a, 0x3d, 0xdb, 0x1c, 0x81, 0x0e, 0x08, 0x64,</div><div class='del'>-	0x3c, 0x26, 0x65, 0xd4, 0x59, 0xc4, 0xbb, 0xc7, 0xaa, 0x81, 0xc4, 0x78,</div><div class='del'>-	0x9e, 0x01, 0x1e, 0xed, 0x73, 0x7e, 0xea, 0xe5, 0xe3, 0xf5, 0x75, 0x03,</div><div class='del'>-	0x4c, 0x4c, 0x2c, 0x4b, 0x6c, 0x4a, 0x4c, 0xc9, 0x77, 0xc4, 0x89, 0x87,</div><div class='del'>-	0x40, 0x0b, 0xf7, 0x6c, 0xab, 0xc4, 0xd2, 0x76, 0x62, 0x44, 0x02, 0xdb,</div><div class='del'>-	0xff, 0x3a, 0x64, 0xa9, 0xe0, 0x35, 0x3a, 0x9d, 0xf2, 0x1c, 0xe4, 0xe6,</div><div class='del'>-	0xd9, 0x55, 0x1c, 0x63, 0x41, 0x8e, 0x68, 0x47, 0x3d, 0x39, 0xe7, 0x3a,</div><div class='del'>-	0xd6, 0xe7, 0x90, 0x7e, 0xc7, 0xfd, 0x00, 0xf9, 0xf6, 0x84, 0x48, 0x3f,</div><div class='del'>-	0x7c, 0x32, 0xe8, 0xf5, 0xd9, 0x00, 0xdb, 0xb7, 0xd2, 0x37, 0xd4, 0xb2,</div><div class='del'>-	0x74, 0x11, 0x7d, 0xda, 0xa6, 0x01, 0x50, 0x7b, 0x07, 0xea, 0xf9, 0x7b,</div><div class='del'>-	0x23, 0x28, 0x3b, 0x84, 0xba, 0xa4, 0x81, 0x7e, 0xfb, 0x77, 0xb1, 0x67,</div><div class='del'>-	0x3d, 0xef, 0x1e, 0xf7, 0xe5, 0x3a, 0x5d, 0xb3, 0x80, 0xf5, 0x57, 0x72,</div><div class='del'>-	0x3e, 0xd0, 0x26, 0x8c, 0xf3, 0x4a, 0x7f, 0xbb, 0xf2, 0x2b, 0xf9, 0x0c,</div><div class='del'>-	0x79, 0x1f, 0x20, 0x16, 0xb2, 0x14, 0xd6, 0x24, 0x6e, 0x78, 0x16, 0xbc,</div><div class='del'>-	0xff, 0xa4, 0xc2, 0x34, 0xc4, 0x6f, 0xa0, 0xbf, 0x44, 0x4c, 0xe1, 0x63,</div><div class='del'>-	0x69, 0x1f, 0xd7, 0x11, 0x5b, 0xa4, 0xb8, 0x36, 0x1a, 0x5f, 0xb0, 0x2d,</div><div class='del'>-	0xeb, 0xb1, 0x6d, 0xfd, 0xfa, 0xb1, 0xce, 0xb6, 0x50, 0xee, 0x38, 0xe5,</div><div class='del'>-	0x99, 0xf6, 0xb1, 0x4d, 0xf6, 0xa7, 0x1a, 0xc1, 0xf7, 0x76, 0x6d, 0xc7,</div><div class='del'>-	0x3f, 0x08, 0xcc, 0x06, 0xec, 0x6d, 0xd2, 0x87, 0x0a, 0x78, 0x7d, 0x23,</div><div class='del'>-	0xca, 0x7e, 0x0e, 0xfe, 0xb3, 0x0c, 0xfe, 0x95, 0xb2, 0x93, 0x0f, 0x61,</div><div class='del'>-	0x2f, 0x97, 0xb7, 0xf9, 0x31, 0x34, 0xae, 0x43, 0x80, 0x13, 0x02, 0xdc,</div><div class='del'>-	0x67, 0x6a, 0xbc, 0xcf, 0xb5, 0xf1, 0xe3, 0x6d, 0x86, 0xaa, 0x4b, 0x5f,</div><div class='del'>-	0xab, 0xde, 0xc7, 0xe5, 0x1e, 0xf6, 0xbc, 0x73, 0x6e, 0x80, 0x23, 0xeb,</div><div class='del'>-	0xfd, 0xc4, 0xc0, 0x07, 0x8c, 0x89, 0xd5, 0x4e, 0x4c, 0xf1, 0x47, 0x0d,</div><div class='del'>-	0x6b, 0x58, 0xe6, 0x1f, 0xbc, 0xb0, 0x43, 0x9f, 0x93, 0x38, 0x26, 0xf0,</div><div class='del'>-	0x07, 0x59, 0x97, 0xd8, 0xe6, 0x51, 0x8c, 0x11, 0x16, 0xab, 0x83, 0xf9,</div><div class='del'>-	0x1f, 0xeb, 0x36, 0x7c, 0xf6, 0xa4, 0x67, 0x67, 0xbd, 0x3c, 0x0f, 0xfa,</div><div class='del'>-	0xfe, 0x62, 0x73, 0x10, 0x03, 0xee, 0x54, 0xfa, 0x64, 0x4d, 0x2e, 0x02,</div><div class='del'>-	0x9a, 0x82, 0x71, 0x7d, 0xff, 0xb4, 0x1d, 0xb4, 0xdd, 0x05, 0x9b, 0xb2,</div><div class='del'>-	0xb3, 0xdd, 0xae, 0xf3, 0x45, 0xeb, 0x69, 0xaa, 0xc7, 0x57, 0x16, 0xc6,</div><div class='del'>-	0x68, 0x94, 0x9d, 0x1d, 0xe4, 0x5d, 0xa7, 0xb2, 0x2d, 0x6b, 0xeb, 0x41,</div><div class='del'>-	0xdb, 0xcf, 0xb1, 0x37, 0x96, 0xdf, 0x52, 0x47, 0xd7, 0x46, 0xcc, 0x47,</div><div class='del'>-	0x1f, 0xd7, 0xc7, 0x7c, 0x99, 0xb8, 0x27, 0xbb, 0xdc, 0x00, 0xdf, 0xd5,</div><div class='del'>-	0xd3, 0x41, 0x8c, 0x47, 0x9a, 0xa3, 0x75, 0x3e, 0xf2, 0xef, 0xea, 0x33,</div><div class='del'>-	0xaa, 0x39, 0x3d, 0x97, 0xc0, 0x97, 0x4e, 0xa2, 0xfe, 0x7f, 0x00, 0xdd,</div><div class='del'>-	0x7c, 0x26, 0xed, 0x01, 0x1e, 0x4c, 0xfa, 0x6d, 0x9b, 0x37, 0xc3, 0xfd,</div><div class='del'>-	0xdc, 0x27, 0x01, 0x6f, 0xda, 0xf5, 0xba, 0xd4, 0xfb, 0xe3, 0xea, 0xe7,</div><div class='del'>-	0xae, 0xd7, 0x1d, 0x37, 0xd6, 0xcd, 0xa9, 0x5f, 0x0a, 0x8b, 0x94, 0x85,</div><div class='del'>-	0xf7, 0x23, 0x0d, 0xfc, 0xa1, 0x01, 0xd8, 0x8e, 0x0c, 0xfc, 0x1f, 0xfa,</div><div class='del'>-	0x45, 0x97, 0xf9, 0x44, 0x3c, 0xc3, 0x1c, 0xcf, 0xc3, 0x47, 0x56, 0xb6,</div><div class='del'>-	0xc3, 0xb7, 0x8b, 0xc8, 0x43, 0x87, 0xd4, 0xee, 0xa6, 0x5c, 0x8d, 0x4f,</div><div class='del'>-	0x54, 0xdd, 0xf1, 0xc9, 0xea, 0xc0, 0x38, 0x7d, 0x07, 0x5f, 0xce, 0x50,</div><div class='del'>-	0xbf, 0x2a, 0x13, 0x06, 0xda, 0x65, 0x55, 0x3b, 0x15, 0xcb, 0xd8, 0xa4,</div><div class='del'>-	0x1f, 0xe1, 0x1e, 0x9c, 0xf0, 0xc7, 0x8a, 0x8d, 0xe7, 0xa0, 0x77, 0x16,</div><div class='del'>-	0x67, 0x61, 0xd7, 0x1c, 0x3b, 0x43, 0x59, 0xdc, 0xe7, 0xda, 0x23, 0x4a,</div><div class='del'>-	0xde, 0xe2, 0xf6, 0x18, 0xd7, 0xaf, 0x32, 0xfb, 0x5e, 0xe8, 0x4d, 0x4f,</div><div class='del'>-	0xee, 0x84, 0xfe, 0x7b, 0x00, 0xf2, 0x29, 0x67, 0xa0, 0xfc, 0xce, 0x40,</div><div class='del'>-	0x61, 0x9d, 0x89, 0x8b, 0x71, 0xa2, 0x53, 0xa2, 0x47, 0x13, 0x12, 0x39,</div><div class='del'>-	0x4a, 0xff, 0x2b, 0x69, 0xde, 0x29, 0x02, 0x3b, 0xf8, 0xe2, 0xcd, 0x86,</div><div class='del'>-	0xd8, 0x83, 0x19, 0x49, 0xc2, 0x87, 0xec, 0x33, 0x2b, 0x48, 0x8b, 0x92,</div><div class='del'>-	0x4c, 0x9d, 0x46, 0x5f, 0xd1, 0x33, 0xa8, 0x8b, 0x76, 0x4d, 0xcb, 0x16,</div><div class='del'>-	0x7e, 0x1d, 0xd2, 0xbc, 0xec, 0xef, 0x8f, 0xe6, 0xe5, 0xf5, 0xf1, 0x9b,</div><div class='del'>-	0xa1, 0xd5, 0xf8, 0x0d, 0xdf, 0xbf, 0xad, 0xe3, 0x4e, 0x5f, 0xd2, 0xbe,</div><div class='del'>-	0x0c, 0xe5, 0x82, 0xf6, 0x4c, 0xf9, 0x63, 0xd0, 0xdd, 0x5f, 0x82, 0xff,</div><div class='del'>-	0xeb, 0x48, 0xae, 0x04, 0x9c, 0x9e, 0xf6, 0xe4, 0x69, 0xb7, 0xe0, 0x65,</div><div class='del'>-	0x07, 0x3c, 0x79, 0xdd, 0x75, 0x0a, 0x79, 0xb1, 0xdf, 0xa6, 0x8e, 0xfb,</div><div class='del'>-	0xb1, 0xfb, 0x21, 0xd9, 0xd3, 0x66, 0xef, 0xc9, 0x84, 0x0a, 0x5e, 0x8b,</div><div class='del'>-	0xd3, 0x2c, 0x57, 0xa7, 0x0f, 0xc9, 0xbe, 0x1d, 0x2b, 0x66, 0x58, 0x32,</div><div class='del'>-	0x57, 0x03, 0x0b, 0x26, 0xf2, 0x4a, 0x3f, 0xbd, 0xa1, 0x7c, 0xea, 0xfb,</div><div class='del'>-	0xbb, 0x0f, 0xc9, 0xd6, 0x1d, 0xb6, 0x79, 0x29, 0x4c, 0x9c, 0x76, 0x08,</div><div class='del'>-	0xf8, 0xdf, 0x4e, 0xe4, 0xc2, 0x8e, 0xb9, 0x5b, 0xec, 0x91, 0x4f, 0x0b,</div><div class='del'>-	0xcf, 0x8c, 0x1d, 0xe9, 0x3a, 0xea, 0x24, 0x1e, 0x0c, 0xf5, 0x1c, 0x78,</div><div class='del'>-	0x90, 0x3e, 0xdd, 0x19, 0xe6, 0x3d, 0x89, 0xed, 0x30, 0xf1, 0x1c, 0x97,</div><div class='del'>-	0xae, 0x13, 0x96, 0x24, 0xc1, 0x97, 0x5e, 0xc5, 0x13, 0x9e, 0x5d, 0x25,</div><div class='del'>-	0xa4, 0xe7, 0x28, 0x71, 0x93, 0xe2, 0x4d, 0x2f, 0x78, 0x93, 0x02, 0x6f,</div><div class='del'>-	0xe0, 0x47, 0xf5, 0x99, 0x97, 0x90, 0x9e, 0x97, 0xe4, 0xe0, 0x9b, 0xe0,</div><div class='del'>-	0x4d, 0x2f, 0x78, 0xd3, 0x73, 0xc6, 0x42, 0x7b, 0xf4, 0xb1, 0xdc, 0x85,</div><div class='del'>-	0xb4, 0x59, 0x3e, 0x72, 0x55, 0x07, 0x9e, 0x1d, 0x49, 0x1e, 0x8d, 0x61,</div><div class='del'>-	0x8c, 0x90, 0xec, 0xea, 0x2e, 0xc8, 0xf0, 0x0e, 0xf8, 0x63, 0xf1, 0x43,</div><div class='del'>-	0x72, 0x01, 0xb6, 0xa7, 0x04, 0xbf, 0xe0, 0xe9, 0x41, 0x7b, 0x6c, 0x05,</div><div class='del'>-	0xfa, 0xb3, 0x76, 0x97, 0x27, 0xaf, 0xec, 0xf8, 0x2b, 0x2f, 0x71, 0x95,</div><div class='del'>-	0xbd, 0x47, 0x42, 0x03, 0x32, 0x5d, 0x52, 0x36, 0x21, 0x91, 0x0d, 0x2b,</div><div class='del'>-	0x2c, 0x86, 0x39, 0x16, 0x60, 0x57, 0x78, 0x16, 0xee, 0x40, 0xbf, 0x7f,</div><div class='del'>-	0x5a, 0x1e, 0x28, 0x4f, 0xe1, 0x07, 0x1f, 0x73, 0x86, 0x75, 0x0f, 0xc0,</div><div class='del'>-	0x87, 0x7b, 0x48, 0xf6, 0xcf, 0x00, 0x2f, 0xa6, 0x41, 0xf7, 0x80, 0x03,</div><div class='del'>-	0x1f, 0xee, 0x7c, 0xa3, 0xb4, 0xa2, 0x0c, 0xbc, 0x1d, 0xab, 0x6d, 0xf4,</div><div class='del'>-	0xdd, 0x56, 0xb0, 0x0e, 0x83, 0xf2, 0x97, 0xb5, 0x01, 0xf9, 0x6a, 0xad,</div><div class='del'>-	0x5f, 0xbe, 0x0c, 0x7b, 0xf2, 0x6c, 0xad, 0x13, 0x7b, 0x25, 0x81, 0x35,</div><div class='del'>-	0x49, 0x63, 0x7d, 0x5c, 0xf9, 0x4a, 0x2d, 0x25, 0x5f, 0x02, 0xaf, 0x9e,</div><div class='del'>-	0xc3, 0x6f, 0xb8, 0x94, 0x92, 0x5d, 0xa5, 0x7e, 0xbd, 0x46, 0x5c, 0x1f,</div><div class='del'>-	0x07, 0xf4, 0x38, 0x98, 0xbb, 0xfd, 0x54, 0x01, 0xfb, 0x6f, 0xb1, 0xe6,</div><div class='del'>-	0xbc, 0x55, 0x91, 0xc7, 0x1a, 0x19, 0x5f, 0x3e, 0xb5, 0x6a, 0x53, 0x0a,</div><div class='del'>-	0x9e, 0xe9, 0xd8, 0x47, 0x26, 0xb0, 0x0e, 0x15, 0xec, 0xd3, 0x31, 0xc5,</div><div class='del'>-	0xfb, 0x35, 0x7b, 0x53, 0xf1, 0xed, 0x4d, 0x30, 0xbf, 0xd9, 0xbc, 0x7c,</div><div class='del'>-	0x47, 0xb2, 0x73, 0xd3, 0xb2, 0xef, 0xb8, 0x27, 0xbf, 0xe3, 0x7a, 0x90,</div><div class='del'>-	0x63, 0xea, 0xdf, 0x01, 0xea, 0x75, 0x6b, 0x22, 0x6c, 0x28, 0xff, 0xc9,</div><div class='del'>-	0xc7, 0x2a, 0xbd, 0xdb, 0xb1, 0x67, 0x53, 0x19, 0x63, 0x4a, 0x92, 0x73,</div><div class='del'>-	0x53, 0xd2, 0x35, 0x07, 0x59, 0x70, 0xd9, 0xd7, 0x8a, 0x69, 0x5c, 0x26,</div><div class='del'>-	0x0f, 0x1c, 0xc7, 0x1e, 0xcc, 0x89, 0x63, 0xbe, 0x25, 0x29, 0x8c, 0x7f,</div><div class='del'>-	0x50, 0xba, 0xd1, 0xc6, 0x41, 0x9b, 0x4b, 0x6a, 0xec, 0x16, 0x8c, 0xdd,</div><div class='del'>-	0x28, 0x87, 0xe3, 0x36, 0x64, 0x8d, 0x76, 0xfb, 0xff, 0x48, 0xb6, 0xc2,</div><div class='del'>-	0xf4, 0x6f, 0x25, 0x7b, 0xea, 0x91, 0x98, 0x34, 0xf3, 0x19, 0xaa, 0x61,</div><div class='del'>-	0x81, 0xe5, 0x5d, 0x48, 0x59, 0xee, 0xc0, 0x77, 0xfe, 0x89, 0x64, 0xcf,</div><div class='del'>-	0x72, 0xec, 0xb7, 0x50, 0xfe, 0x8a, 0x64, 0x8f, 0xfd, 0x1c, 0xf9, 0x0b,</div><div class='del'>-	0x48, 0xdf, 0x46, 0x3a, 0x26, 0x5d, 0xc7, 0x24, 0x94, 0x3d, 0xfb, 0x6d,</div><div class='del'>-	0xe4, 0x23, 0x48, 0x0f, 0xa3, 0xde, 0x6d, 0xa0, 0xef, 0xaf, 0xd1, 0x5f,</div><div class='del'>-	0x06, 0x7a, 0xee, 0xc3, 0x9a, 0x7e, 0x96, 0xb3, 0x8c, 0xef, 0x0e, 0x43,</div><div class='del'>-	0xa7, 0xfd, 0x0f, 0x8f, 0xf1, 0x44, 0xf5, 0xbc, 0xc8, 0x3c, 0x75, 0x1b,</div><div class='del'>-	0x9f, 0xa7, 0xc0, 0x93, 0x83, 0xc8, 0x7b, 0xf2, 0x90, 0x4b, 0x1b, 0x73,</div><div class='del'>-	0x93, 0x8c, 0x9b, 0x05, 0xaf, 0x19, 0x58, 0xa2, 0x05, 0xfb, 0x60, 0x6a,</div><div class='del'>-	0xe7, 0xe6, 0xfb, 0xe0, 0x48, 0xcf, 0x21, 0x69, 0xda, 0x11, 0xcc, 0x3f,</div><div class='del'>-	0x98, 0xaf, 0x63, 0xfe, 0x48, 0xf1, 0xc1, 0x2e, 0x3c, 0x28, 0x9c, 0x87,</div><div class='del'>-	0x93, 0x78, 0xdc, 0xe8, 0xd9, 0xf3, 0x00, 0xf6, 0x81, 0x71, 0x96, 0x79,</div><div class='del'>-	0x7f, 0x1f, 0x18, 0x67, 0xa1, 0x1b, 0x16, 0xe0, 0x17, 0x2e, 0x74, 0x4a,</div><div class='del'>-	0xe3, 0xb1, 0xb5, 0x7d, 0xd0, 0x70, 0xec, 0x57, 0xef, 0x83, 0xc6, 0xb3,</div><div class='del'>-	0xa8, 0x77, 0x96, 0x3c, 0x43, 0x1f, 0xa7, 0xc8, 0xb3, 0x0e, 0xa4, 0x9f,</div><div class='del'>-	0xc6, 0x5c, 0x49, 0x7b, 0x23, 0x68, 0xf7, 0xb1, 0xd0, 0xcd, 0x90, 0xf7,</div><div class='del'>-	0xfb, 0x77, 0x1c, 0xd4, 0xe5, 0xff, 0xd9, 0x1b, 0x89, 0xdb, 0x65, 0x09,</div><div class='del'>-	0x91, 0xa7, 0xa8, 0x5b, 0x21, 0x0f, 0x6f, 0x69, 0x92, 0xe6, 0x03, 0xd2,</div><div class='del'>-	0x45, 0xfe, 0x55, 0x76, 0x23, 0x5f, 0xf0, 0xa2, 0x4e, 0x8b, 0xe6, 0x27,</div><div class='del'>-	0xb0, 0xd1, 0x00, 0xcb, 0x5f, 0x83, 0xcc, 0x10, 0xa3, 0xbe, 0x21, 0xfb,</div><div class='del'>-	0x66, 0x3c, 0x19, 0x77, 0x39, 0xff, 0xef, 0x63, 0xfe, 0x99, 0x1d, 0x71,</div><div class='del'>-	0x59, 0xb1, 0xe2, 0xe0, 0xc9, 0x22, 0x74, 0xfb, 0x05, 0xf1, 0xf9, 0xc0,</div><div class='del'>-	0x33, 0x89, 0x5d, 0xe2, 0x24, 0x86, 0xc5, 0x49, 0xbd, 0x09, 0x3e, 0x0c,</div><div class='del'>-	0x43, 0xf6, 0x73, 0x35, 0xca, 0xce, 0xab, 0x32, 0x04, 0x99, 0xf8, 0x9e,</div><div class='del'>-	0x6b, 0xa7, 0x80, 0x7f, 0xa0, 0x2f, 0x28, 0x17, 0x94, 0x89, 0x56, 0xa5,</div><div class='del'>-	0x93, 0x16, 0x5c, 0xfb, 0x89, 0x8a, 0x5c, 0x27, 0x0b, 0xed, 0xa4, 0x1d,</div><div class='del'>-	0xef, 0x8e, 0x29, 0x7b, 0x91, 0x9a, 0x30, 0xba, 0xa1, 0xa3, 0x53, 0x62,</div><div class='del'>-	0xf6, 0x7c, 0xb1, 0x31, 0xb8, 0xbf, 0x92, 0x9f, 0x0b, 0xc9, 0x54, 0x0f,</div><div class='del'>-	0xd7, 0x8a, 0xfd, 0x22, 0x5f, 0x29, 0x78, 0x11, 0xe7, 0x2d, 0xef, 0x64,</div><div class='del'>-	0x87, 0x25, 0x9f, 0xec, 0x59, 0x95, 0xcb, 0xb2, 0x88, 0xbf, 0x2f, 0x86,</div><div class='del'>-	0xd4, 0x7a, 0x04, 0x74, 0x07, 0x73, 0x09, 0xde, 0xf5, 0xd7, 0xbd, 0xe3,</div><div class='del'>-	0x5c, 0x28, 0xeb, 0xab, 0x7b, 0xc7, 0xba, 0x9c, 0xd6, 0x9f, 0x41, 0x9e,</div><div class='del'>-	0xec, 0x27, 0x8a, 0xf2, 0x3a, 0x64, 0x0f, 0x3c, 0x3c, 0xcb, 0x94, 0x3c,</div><div class='del'>-	0x9c, 0x82, 0xdc, 0xbf, 0x26, 0xbb, 0xe6, 0xb8, 0x67, 0x5e, 0xc3, 0x5c,</div><div class='del'>-	0x95, 0x2e, 0x81, 0x8e, 0x60, 0x7f, 0x9e, 0x4c, 0xbb, 0xdd, 0xa9, 0x53,</div><div class='del'>-	0x72, 0x5d, 0x62, 0x12, 0x7e, 0xe6, 0x84, 0xe9, 0xc9, 0xb2, 0x5b, 0x90,</div><div class='del'>-	0xe5, 0x41, 0xb4, 0xa9, 0x7c, 0x1a, 0xbf, 0x79, 0x3d, 0xb7, 0x47, 0xc0,</div><div class='del'>-	0x77, 0xdb, 0x2a, 0x1b, 0x9f, 0x01, 0xdf, 0x1f, 0x92, 0xe4, 0xb1, 0x55,</div><div class='del'>-	0x5d, 0x03, 0xb9, 0xf3, 0x75, 0x4d, 0xf2, 0xac, 0x29, 0x95, 0x92, 0x23,</div><div class='del'>-	0x1f, 0xa3, 0x0e, 0x29, 0x71, 0x5e, 0xd0, 0x31, 0x3c, 0xdf, 0x2f, 0x41,</div><div class='del'>-	0xcf, 0x94, 0xa0, 0x53, 0xa0, 0x43, 0xbe, 0x8c, 0xf2, 0x2f, 0xa1, 0xce,</div><div class='del'>-	0x73, 0xf0, 0x99, 0x9e, 0x05, 0xde, 0x3b, 0x07, 0x1c, 0xf1, 0x4c, 0x29,</div><div class='del'>-	0xa3, 0xfd, 0x57, 0x35, 0x5f, 0xd8, 0x2c, 0xe5, 0xef, 0x48, 0xa5, 0x4c,</div><div class='del'>-	0x7e, 0xfc, 0x44, 0xad, 0x6d, 0xd6, 0xdd, 0x46, 0x6c, 0x05, 0xca, 0x44,</div><div class='del'>-	0xca, 0xe5, 0x80, 0x27, 0xd4, 0x7d, 0x3c, 0x1b, 0x0a, 0x74, 0x65, 0xcb,</div><div class='del'>-	0x06, 0x5d, 0x29, 0xf2, 0x62, 0xd5, 0xc7, 0x90, 0xc4, 0xc4, 0xc5, 0x19,</div><div class='del'>-	0x6b, 0xf5, 0x0c, 0xb5, 0x08, 0xbb, 0x79, 0x1e, 0xbe, 0x45, 0x2c, 0xfd,</div><div class='del'>-	0x2d, 0x89, 0x9d, 0xf0, 0xbc, 0x1f, 0xc0, 0x6e, 0x16, 0xb0, 0x26, 0x46,</div><div class='del'>-	0x08, 0xe5, 0x4b, 0x7c, 0x47, 0xb9, 0xa7, 0x6c, 0x87, 0x78, 0x96, 0x22,</div><div class='del'>-	0x2f, 0xa3, 0xac, 0xa2, 0x7c, 0xae, 0x6f, 0x83, 0x1e, 0x4d, 0x9f, 0x2a,</div><div class='del'>-	0x63, 0xbd, 0x46, 0xc9, 0x8d, 0xa7, 0xe0, 0xd7, 0xf4, 0x99, 0x8d, 0x68,</div><div class='del'>-	0x5f, 0x5e, 0x62, 0x1b, 0x7b, 0x90, 0x57, 0xb9, 0x5e, 0x5e, 0x62, 0x79,</div><div class='del'>-	0xa7, 0x5c, 0x80, 0xff, 0x49, 0x1a, 0x2a, 0xf3, 0x69, 0xf1, 0xe3, 0xc5,</div><div class='del'>-	0xd4, 0x57, 0xa4, 0x15, 0x79, 0xf0, 0x2b, 0x5b, 0xa2, 0x9d, 0x8d, 0x48,</div><div class='del'>-	0x21, 0x41, 0x5e, 0x27, 0xe4, 0xfc, 0xcc, 0x1f, 0x37, 0x31, 0x1e, 0x9b,</div><div class='del'>-	0x75, 0xf8, 0x1c, 0xc4, 0x37, 0xcc, 0x77, 0x10, 0xdf, 0x60, 0x4c, 0x23,</div><div class='del'>-	0x02, 0x5b, 0xa6, 0xe2, 0x1c, 0x48, 0xad, 0x3a, 0x9f, 0x97, 0xef, 0x7d,</div><div class='del'>-	0x6c, 0xb4, 0x86, 0x19, 0x89, 0x21, 0x39, 0x5f, 0xbb, 0xb0, 0x02, 0xfd,</div><div class='del'>-	0xd1, 0x9e, 0x7e, 0x49, 0xee, 0x5e, 0xf0, 0xe7, 0x67, 0x9c, 0x12, 0xde,</div><div class='del'>-	0xe3, 0x91, 0x4b, 0xf3, 0xb6, 0x7b, 0x51, 0x78, 0x06, 0xe2, 0x62, 0xbd,</div><div class='del'>-	0xfe, 0xa0, 0x09, 0xfa, 0x6b, 0x30, 0x63, 0x7c, 0xbb, 0xc9, 0xc7, 0x67,</div><div class='del'>-	0x11, 0x99, 0x9a, 0xe1, 0x99, 0x2b, 0x74, 0x1b, 0x70, 0xe3, 0xef, 0x45,</div><div class='del'>-	0xf0, 0x5c, 0x65, 0x1e, 0x7e, 0xa8, 0xef, 0xc3, 0xe2, 0xd9, 0xef, 0x8f,</div><div class='del'>-	0x3c, 0x37, 0x16, 0x38, 0xf7, 0x90, 0xdc, 0x0d, 0x74, 0x22, 0xe8, 0xbf,</div><div class='del'>-	0x4b, 0x8f, 0xd5, 0x75, 0x2a, 0xc5, 0xf8, 0xb5, 0x24, 0xa1, 0x2f, 0xb2,</div><div class='del'>-	0xf0, 0x1f, 0x73, 0xf1, 0x4e, 0x8d, 0xc7, 0xf9, 0x6e, 0x23, 0xde, 0x0c,</div><div class='del'>-	0xfc, 0xba, 0x94, 0x7c, 0xbe, 0x14, 0x60, 0xbd, 0x14, 0x6c, 0xac, 0x44,</div><div class='del'>-	0x46, 0x7a, 0x3d, 0xf9, 0x81, 0x4b, 0x7e, 0xf5, 0x23, 0xef, 0xca, 0x91,</div><div class='del'>-	0xda, 0x2f, 0x3b, 0x5b, 0xad, 0xff, 0x6b, 0x01, 0x8d, 0xfc, 0x81, 0x3e,</div><div class='del'>-	0xe0, 0x23, 0xd2, 0x6e, 0xc0, 0x9e, 0x17, 0x81, 0xbb, 0x8c, 0x33, 0x9d,</div><div class='del'>-	0xea, 0x9d, 0x01, 0x6c, 0x50, 0x99, 0x81, 0x6e, 0x3c, 0xc3, 0xf3, 0x66,</div><div class='del'>-	0xe8, 0xb6, 0x33, 0x51, 0x29, 0xce, 0x52, 0x2e, 0xa5, 0xdd, 0xc0, 0x7a,</div><div class='del'>-	0xb1, 0x7e, 0x65, 0xa6, 0x13, 0x69, 0x0b, 0x52, 0x4b, 0xf5, 0x53, 0x99,</div><div class='del'>-	0x71, 0x54, 0xfb, 0xca, 0x4c, 0x4a, 0xb5, 0xab, 0xcc, 0xf4, 0x23, 0x75,</div><div class='del'>-	0xa5, 0xe1, 0x0c, 0x9c, 0xa5, 0x33, 0x3d, 0x32, 0x75, 0x12, 0xf6, 0x65,</div><div class='del'>-	0xc0, 0x50, 0x77, 0x35, 0x26, 0x60, 0x7f, 0x22, 0xf0, 0xac, 0x2e, 0x9a,</div><div class='del'>-	0x83, 0xc0, 0x58, 0x37, 0x01, 0x83, 0xdc, 0x24, 0xce, 0x09, 0xce, 0x9f,</div><div class='del'>-	0xba, 0xf7, 0x3c, 0x63, 0x5e, 0x89, 0x4f, 0x48, 0x46, 0xf6, 0xcf, 0x36,</div><div class='del'>-	0x62, 0xbf, 0x46, 0xcc, 0xa2, 0x74, 0x9b, 0xc3, 0xc8, 0xe7, 0xcb, 0xe4,</div><div class='del'>-	0xdb, 0xbd, 0xca, 0x5f, 0xcb, 0xba, 0x37, 0x34, 0x4b, 0x73, 0x1a, 0x63,</div><div class='del'>-	0xbc, 0x93, 0xf6, 0xbd, 0x90, 0x3f, 0x47, 0xf7, 0x91, 0x06, 0x3d, 0xf5,</div><div class='del'>-	0xfc, 0xe0, 0x39, 0x73, 0xe6, 0x57, 0x9c, 0x33, 0x53, 0xae, 0xc9, 0xdf,</div><div class='del'>-	0x7b, 0xe5, 0xbc, 0x93, 0x96, 0x97, 0x9d, 0x94, 0x5c, 0x70, 0x76, 0xca,</div><div class='del'>-	0x37, 0x61, 0xa7, 0x5f, 0x72, 0xce, 0x34, 0x11, 0x0b, 0x54, 0xd4, 0xd9,</div><div class='del'>-	0x5d, 0xb0, 0x56, 0x8e, 0x8e, 0x9d, 0xff, 0x50, 0x96, 0x67, 0x88, 0x9d,</div><div class='del'>-	0xbd, 0xdb, 0xf6, 0xb9, 0x05, 0xda, 0x2d, 0xd0, 0x40, 0xac, 0x56, 0x80,</div><div class='del'>-	0xfd, 0x3b, 0x24, 0xc3, 0x2e, 0xed, 0x9e, 0xb2, 0x51, 0x89, 0x61, 0x7f,</div><div class='del'>-	0x3f, 0xbb, 0x79, 0xe8, 0xd5, 0xf3, 0xb3, 0xd8, 0x4f, 0x42, 0xf9, 0xc7,</div><div class='del'>-	0x73, 0x99, 0xeb, 0xee, 0xc8, 0xe3, 0x25, 0xce, 0xb3, 0xb8, 0xbd, 0x59,</div><div class='del'>-	0xc2, 0x32, 0xa2, 0xf0, 0x42, 0xab, 0xbc, 0xb8, 0xb4, 0x45, 0x0c, 0x58,</div><div class='del'>-	0x28, 0xe3, 0xda, 0xa8, 0xba, 0xe5, 0x42, 0x9f, 0x5b, 0xda, 0x78, 0xb6,</div><div class='del'>-	0xf6, 0x87, 0xe0, 0x0d, 0xfd, 0x7f, 0xcc, 0xad, 0x8d, 0x33, 0x09, 0xf2,</div><div class='del'>-	0xfd, 0xd8, 0x5f, 0x7c, 0x0e, 0x49, 0xce, 0x89, 0xe3, 0x99, 0x29, 0xf7,</div><div class='del'>-	0x1c, 0x63, 0x63, 0x61, 0xf1, 0x31, 0xf7, 0x21, 0xf5, 0xbe, 0xd1, 0xb9,</div><div class='del'>-	0x15, 0xb8, 0x8e, 0xf2, 0x8a, 0x74, 0xd9, 0x1f, 0x37, 0x07, 0x1c, 0x97,</div><div class='del'>-	0xef, 0xe7, 0x1d, 0x1b, 0x3b, 0x55, 0xc0, 0x5e, 0x98, 0x50, 0xf5, 0x07,</div><div class='del'>-	0xe4, 0xa5, 0x99, 0x52, 0xb3, 0xbf, 0x3f, 0x06, 0xf5, 0x33, 0xdf, 0xd3,</div><div class='del'>-	0xa7, 0x62, 0x8c, 0xe4, 0x99, 0xd1, 0x69, 0xe7, 0xa2, 0xde, 0x3f, 0x12,</div><div class='del'>-	0xba, 0xb3, 0x17, 0x38, 0xf4, 0x68, 0x03, 0xe6, 0x62, 0x5b, 0x56, 0xc8,</div><div class='del'>-	0xe8, 0x30, 0x80, 0xe3, 0x87, 0x95, 0xcd, 0xed, 0x55, 0x31, 0xe8, 0x53,</div><div class='del'>-	0xa9, 0x56, 0xa9, 0x98, 0x8e, 0xba, 0x93, 0xb7, 0x62, 0xee, 0x20, 0xd6,</div><div class='del'>-	0xc7, 0xaf, 0x09, 0x65, 0xdd, 0x48, 0x1b, 0x91, 0xbe, 0x5f, 0x8a, 0xc7,</div><div class='del'>-	0xcf, 0xe8, 0xf1, 0xa2, 0x1b, 0xf2, 0x1f, 0xd1, 0xe9, 0x67, 0xb5, 0x3f,</div><div class='del'>-	0xc5, 0x71, 0xa2, 0xe2, 0x7c, 0xa1, 0x45, 0xba, 0x8f, 0x9a, 0xc0, 0xb6,</div><div class='del'>-	0x09, 0x60, 0xdd, 0x4e, 0x49, 0x1d, 0xb5, 0xe4, 0xda, 0xa3, 0x41, 0x9c,</div><div class='del'>-	0xe9, 0x2b, 0xa3, 0x49, 0x15, 0xd7, 0xfc, 0xf2, 0xa8, 0x53, 0x56, 0xe7,</div><div class='del'>-	0xed, 0xfa, 0xee, 0xe0, 0x8a, 0xbe, 0x53, 0xf8, 0xca, 0x68, 0xaf, 0x4a,</div><div class='del'>-	0xbf, 0x3d, 0x9a, 0x52, 0xe9, 0xab, 0xa3, 0xd7, 0x56, 0x7d, 0xff, 0xa8,</div><div class='del'>-	0xb8, 0x98, 0x92, 0xcf, 0x95, 0x88, 0x2f, 0x07, 0x80, 0x1d, 0x5d, 0xe8,</div><div class='del'>-	0x99, 0x7e, 0xe8, 0x99, 0x14, 0xf4, 0xcc, 0x20, 0xf5, 0x0c, 0xf4, 0xf6,</div><div class='del'>-	0xab, 0xd0, 0xdb, 0xae, 0x7c, 0x0f, 0xf2, 0xfa, 0x8c, 0xdb, 0x08, 0x5c,</div><div class='del'>-	0xe8, 0x79, 0xfe, 0x5c, 0xed, 0x27, 0x56, 0xb0, 0xbe, 0x95, 0xd3, 0x12,</div><div class='del'>-	0x6b, 0x83, 0x0e, 0xda, 0xb1, 0xd0, 0x20, 0x8b, 0x71, 0xcf, 0x9b, 0x73,</div><div class='del'>-	0x1d, 0xb9, 0x84, 0xfa, 0x59, 0x87, 0xfb, 0xf8, 0x6f, 0x9a, 0xe9, 0x8f,</div><div class='del'>-	0x5d, 0x9a, 0xd9, 0x09, 0x9d, 0x44, 0x79, 0x8f, 0x49, 0x65, 0x3c, 0x21,</div><div class='del'>-	0x4b, 0xf0, 0xcf, 0xd6, 0xea, 0xa4, 0xf0, 0xcc, 0xfd, 0xff, 0x13, 0xd4,</div><div class='del'>-	0x4d, 0xc1, 0x3e, 0x98, 0xb2, 0xdc, 0x6b, 0xc9, 0xa9, 0x5e, 0x7b, 0xd0,</div><div class='del'>-	0x32, 0xa8, 0xbb, 0x2c, 0x29, 0xc3, 0xbf, 0xaf, 0x94, 0x58, 0x9f, 0xf5,</div><div class='del'>-	0xb0, 0x3f, 0x4b, 0x7e, 0xbb, 0xe9, 0x52, 0xa0, 0x27, 0x06, 0x18, 0x7b,</div><div class='del'>-	0x8c, 0xe4, 0x7a, 0x7d, 0x1b, 0x60, 0x18, 0x8d, 0x90, 0x03, 0x17, 0xfc,</div><div class='del'>-	0x1f, 0x47, 0xf9, 0x00, 0xef, 0x9a, 0xa0, 0x8c, 0x58, 0x28, 0xb6, 0x85,</div><div class='del'>-	0x18, 0x31, 0xe7, 0x8e, 0xa3, 0x8c, 0x6d, 0xec, 0x44, 0x12, 0xe5, 0x63,</div><div class='del'>-	0x92, 0x4c, 0xe4, 0xd5, 0xbd, 0xb7, 0x0e, 0x94, 0xb1, 0x8f, 0xb0, 0x8e,</div><div class='del'>-	0xc1, 0x74, 0x6c, 0xf1, 0xcf, 0x7d, 0x83, 0xf2, 0x3e, 0x15, 0x0f, 0xc8,</div><div class='del'>-	0x98, 0x2e, 0xf6, 0x03, 0xcb, 0x92, 0x26, 0xdb, 0xe5, 0x5c, 0x57, 0xe9,</div><div class='del'>-	0xc2, 0x7b, 0xaa, 0x3c, 0xb7, 0x8b, 0xc9, 0xdd, 0xd5, 0x16, 0xc9, 0x55,</div><div class='del'>-	0x1b, 0xae, 0xa0, 0xff, 0x83, 0x3d, 0x79, 0x3e, 0x61, 0x0a, 0xef, 0x60,</div><div class='del'>-	0xf8, 0xfb, 0x3c, 0xb2, 0x93, 0x7b, 0x02, 0x7c, 0x87, 0xfd, 0x7d, 0x0e,</div><div class='del'>-	0xf3, 0x7d, 0x16, 0xf6, 0xf7, 0x1c, 0xec, 0xef, 0x33, 0xa5, 0x35, 0xfd,</div><div class='del'>-	0xe1, 0xdb, 0x5d, 0xea, 0x80, 0xa7, 0xb0, 0x66, 0x63, 0xc0, 0xfd, 0xbb,</div><div class='del'>-	0xe1, 0x0f, 0x8c, 0x00, 0xfb, 0x0f, 0x61, 0xfd, 0xd2, 0x58, 0xbb, 0x71,</div><div class='del'>-	0xde, 0x55, 0xc2, 0x3a, 0x0e, 0xaa, 0xb3, 0xe5, 0x59, 0x75, 0xdf, 0xe3,</div><div class='del'>-	0x87, 0xca, 0xf6, 0x3e, 0x56, 0x32, 0x60, 0x1f, 0x0a, 0xde, 0x76, 0xc7,</div><div class='del'>-	0x06, 0xfe, 0x5b, 0xdd, 0xcf, 0x83, 0x2f, 0x42, 0xaf, 0xfc, 0x1d, 0xe8,</div><div class='del'>-	0x7a, 0x76, 0x96, 0xf6, 0x1c, 0x75, 0x7c, 0xbc, 0xed, 0x32, 0xbe, 0x85,</div><div class='del'>-	0xfd, 0x7c, 0xe4, 0xbc, 0xac, 0x00, 0x77, 0x64, 0x28, 0xc7, 0xf0, 0x1f,</div><div class='del'>-	0xec, 0x67, 0xca, 0xd2, 0x43, 0x1d, 0x58, 0xe6, 0x5e, 0x19, 0x38, 0x96,</div><div class='del'>-	0x00, 0xd6, 0x03, 0x92, 0x57, 0x67, 0xa9, 0x78, 0x3e, 0xbb, 0x55, 0x0c,</div><div class='del'>-	0xe2, 0x3d, 0xf7, 0x2a, 0x94, 0x51, 0x6f, 0x04, 0x18, 0x69, 0x65, 0xb0,</div><div class='del'>-	0x5d, 0x32, 0x3b, 0xda, 0x95, 0xee, 0xb0, 0xdd, 0x97, 0x31, 0xee, 0x2e,</div><div class='del'>-	0x69, 0x04, 0x86, 0x2b, 0x60, 0x8c, 0x83, 0xf2, 0x37, 0x2e, 0xe3, 0x52,</div><div class='del'>-	0xbe, 0xef, 0x07, 0x5a, 0x62, 0xe0, 0x59, 0xd3, 0x3e, 0xc7, 0x8c, 0xed,</div><div class='del'>-	0xaa, 0xb1, 0xff, 0x98, 0xc2, 0x58, 0x39, 0x61, 0xff, 0xb0, 0x13, 0x18,</div><div class='del'>-	0x33, 0x79, 0x8c, 0xb2, 0xdf, 0x87, 0x75, 0xfb, 0x2d, 0x60, 0x20, 0x72,</div><div class='del'>-	0xf5, 0x5b, 0x5b, 0xfc, 0xfd, 0x42, 0xfa, 0x57, 0x88, 0x27, 0x18, 0xf7,</div><div class='del'>-	0xf7, 0xfd, 0xf2, 0x55, 0xda, 0x06, 0x40, 0xef, 0x73, 0x5b, 0x82, 0xf3,</div><div class='del'>-	0xe3, 0xae, 0x63, 0xbe, 0xbd, 0xee, 0x3a, 0x8b, 0x56, 0x73, 0xd2, 0xc1,</div><div class='del'>-	0x93, 0x68, 0x43, 0xae, 0x95, 0xdb, 0x23, 0x7e, 0x3f, 0xc6, 0x82, 0x09,</div><div class='del'>-	0x59, 0xa5, 0x1e, 0xe8, 0x80, 0x9c, 0x33, 0x4f, 0x9d, 0x42, 0x9d, 0x40,</div><div class='del'>-	0x59, 0x70, 0xa4, 0x58, 0x83, 0x4e, 0x68, 0xed, 0x94, 0x32, 0x79, 0xb6,</div><div class='del'>-	0x40, 0x3d, 0xf1, 0x43, 0x99, 0xde, 0xa0, 0x2b, 0x87, 0x24, 0xf0, 0x6b,</div><div class='del'>-	0x5b, 0x24, 0x9a, 0x76, 0xcc, 0x7b, 0xd4, 0x1c, 0x7d, 0x7d, 0xb9, 0x9f,</div><div class='del'>-	0xf8, 0x73, 0x36, 0x63, 0xb7, 0x8b, 0xc6, 0x9e, 0x0a, 0x3f, 0x7d, 0x1f,</div><div class='del'>-	0x73, 0x65, 0x1f, 0x8a, 0x4f, 0x83, 0x43, 0xbe, 0x2f, 0xa0, 0xe2, 0x7c,</div><div class='del'>-	0xc0, 0xc1, 0x89, 0xbf, 0x83, 0xae, 0xcd, 0x11, 0x97, 0x80, 0xcf, 0x5d,</div><div class='del'>-	0x73, 0x94, 0xa3, 0xed, 0xd4, 0x65, 0xc0, 0x79, 0x29, 0xea, 0x6b, 0x59,</div><div class='del'>-	0x3a, 0x06, 0xcc, 0x65, 0xdc, 0x2a, 0x79, 0xca, 0x2b, 0xef, 0x48, 0x2c,</div><div class='del'>-	0x19, 0x32, 0x3d, 0xdf, 0x2a, 0xdd, 0x0b, 0x8c, 0xa9, 0x7e, 0xb3, 0x59,</div><div class='del'>-	0x5a, 0x19, 0x57, 0xa5, 0x0d, 0x1a, 0x90, 0x1c, 0xca, 0xbb, 0x16, 0xc2,</div><div class='del'>-	0x2a, 0x06, 0x56, 0x36, 0xc8, 0xa3, 0x7e, 0xe8, 0x03, 0x3b, 0xb5, 0x62,</div><div class='del'>-	0x7c, 0xb4, 0xc9, 0xc7, 0x90, 0x90, 0xa5, 0x12, 0x64, 0xac, 0x04, 0x19,</div><div class='del'>-	0x2b, 0x41, 0xc6, 0x4a, 0x90, 0x31, 0x60, 0xbf, 0x67, 0xb1, 0xff, 0xce,</div><div class='del'>-	0x95, 0x06, 0xb5, 0x5d, 0xdf, 0xa3, 0xec, 0xfa, 0xe1, 0xd2, 0xab, 0x1e,</div><div class='del'>-	0xd3, 0x2f, 0x29, 0xdf, 0xb4, 0x1f, 0x32, 0x48, 0x5f, 0x34, 0xf0, 0x51,</div><div class='del'>-	0x5f, 0x95, 0xa7, 0x66, 0x5f, 0x93, 0x53, 0xb3, 0x6b, 0x38, 0x70, 0xaa,</div><div class='del'>-	0xe4, 0xc9, 0xcb, 0x2e, 0xfc, 0xcf, 0x45, 0x62, 0xaa, 0x4c, 0x5b, 0xa3,</div><div class='del'>-	0xc2, 0x56, 0x87, 0x24, 0xaf, 0x70, 0xb2, 0xb2, 0x23, 0xc0, 0x57, 0x0a,</div><div class='del'>-	0x17, 0x72, 0x6f, 0x4a, 0xfb, 0x8e, 0xd7, 0xe5, 0x1c, 0xec, 0xf8, 0x52,</div><div class='del'>-	0xed, 0x0d, 0x79, 0x4e, 0xe1, 0x71, 0xf2, 0xe1, 0x7d, 0xf2, 0xb7, 0xa6,</div><div class='del'>-	0x7f, 0x86, 0x7f, 0x0a, 0x58, 0x63, 0xa9, 0x97, 0xba, 0x23, 0x02, 0x5b,</div><div class='del'>-	0x60, 0x17, 0xba, 0xb0, 0xaf, 0x0f, 0x18, 0xef, 0x02, 0xa6, 0xe1, 0xfb,</div><div class='del'>-	0xad, 0xf2, 0xe2, 0x6c, 0xa1, 0x4e, 0x26, 0xa8, 0x1f, 0xec, 0x23, 0x62,</div><div class='del'>-	0xd0, 0x4e, 0xd1, 0x6e, 0x72, 0xbe, 0xb4, 0x53, 0x6d, 0x2d, 0xbc, 0x3f,</div><div class='del'>-	0x56, 0x39, 0x7e, 0xc3, 0x16, 0xc6, 0x18, 0xe3, 0x0e, 0x79, 0xfa, 0xba,</div><div class='del'>-	0x1c, 0xa8, 0xb2, 0xec, 0x35, 0xac, 0x0f, 0xd3, 0x37, 0xbd, 0xbb, 0xe3,</div><div class='del'>-	0x1c, 0x8f, 0xfd, 0x02, 0x37, 0x75, 0x60, 0xae, 0xa5, 0xcf, 0x6a, 0xcc,</div><div class='del'>-	0xdd, 0xaf, 0x70, 0xf4, 0xe5, 0x78, 0x99, 0x7c, 0x72, 0xc1, 0xa7, 0xd7,</div><div class='del'>-	0x55, 0x0c, 0x70, 0x93, 0xd8, 0xf0, 0x13, 0xd8, 0x57, 0x85, 0x8b, 0xc2,</div><div class='del'>-	0x38, 0x25, 0x63, 0xb8, 0x8c, 0x0f, 0xd7, 0x6b, 0x0c, 0x75, 0x57, 0x40,</div><div class='del'>-	0xee, 0x82, 0x7e, 0xb9, 0x1b, 0xfa, 0xe5, 0x9e, 0xcb, 0xee, 0x5f, 0x07,</div><div class='del'>-	0x71, 0xff, 0xee, 0x42, 0xd8, 0xe8, 0x94, 0xb1, 0x6a, 0x7d, 0x5b, 0xc6,</div><div class='del'>-	0x6e, 0x37, 0x8b, 0xd5, 0x32, 0x8e, 0x9b, 0xda, 0x10, 0xff, 0xa3, 0x6c,</div><div class='del'>-	0x78, 0xf2, 0x92, 0xcb, 0xb8, 0x5b, 0x70, 0x67, 0x7f, 0x33, 0xfc, 0x65,</div><div class='del'>-	0xb5, 0x04, 0x71, 0xe6, 0x48, 0xfa, 0xa2, 0xf0, 0xee, 0x7e, 0x71, 0x86,</div><div class='del'>-	0x78, 0x20, 0xae, 0xee, 0xd9, 0x19, 0x2a, 0xce, 0xe7, 0xb7, 0x2d, 0xce,</div><div class='del'>-	0xa8, 0x73, 0xa5, 0x02, 0xe3, 0xd5, 0xe6, 0x4e, 0xdb, 0x1c, 0x0b, 0xfb,</div><div class='del'>-	0xf7, 0x65, 0xb8, 0x97, 0x7d, 0x5d, 0x06, 0x59, 0xac, 0xad, 0xdd, 0xb1,</div><div class='del'>-	0x1c, 0x52, 0xfa, 0xe2, 0x22, 0xf6, 0x00, 0xd7, 0x0b, 0xfe, 0x02, 0xf6,</div><div class='del'>-	0xc9, 0x14, 0xf4, 0x53, 0x5e, 0xf5, 0x17, 0xa3, 0x5c, 0x64, 0xb2, 0x61,</div><div class='del'>-	0x43, 0xa2, 0x27, 0xe8, 0x0b, 0xf9, 0xb1, 0x96, 0x5c, 0xd8, 0x56, 0xfa,</div><div class='del'>-	0x1b, 0xb4, 0x03, 0x9f, 0x71, 0x7f, 0x5a, 0x13, 0x8d, 0xe9, 0x06, 0xd8,</div><div class='del'>-	0x55, 0xac, 0x5f, 0x8d, 0x31, 0x01, 0xec, 0xdd, 0xe5, 0xef, 0xca, 0xfe,</div><div class='del'>-	0xf9, 0xe1, 0x16, 0x5f, 0xfe, 0x19, 0x3b, 0xe6, 0xfc, 0x02, 0x1a, 0xd6,</div><div class='del'>-	0xf7, 0x6d, 0x9c, 0x90, 0x58, 0x33, 0x6c, 0xda, 0x87, 0xe1, 0x67, 0xec,</div><div class='del'>-	0x82, 0xac, 0xac, 0xc4, 0xd9, 0xaf, 0xbf, 0x67, 0xa6, 0x4b, 0xec, 0xfb,</div><div class='del'>-	0xbb, 0x32, 0x3c, 0x7f, 0xb6, 0x85, 0xb6, 0x64, 0x19, 0x7a, 0xe0, 0xbc,</div><div class='del'>-	0x49, 0x1b, 0x3a, 0x0e, 0x1b, 0xd7, 0x21, 0xdf, 0x9f, 0xa7, 0x7d, 0x4c,</div><div class='del'>-	0x9a, 0xa7, 0xa4, 0x2f, 0x71, 0x0a, 0x34, 0x7d, 0xde, 0x8d, 0xd0, 0x47,</div><div class='del'>-	0xf3, 0x86, 0x50, 0xf6, 0x4d, 0x49, 0x9a, 0x5d, 0x21, 0x3e, 0xf7, 0x99,</div><div class='del'>-	0x8f, 0x03, 0xc3, 0x66, 0xcc, 0xa4, 0x79, 0x5d, 0x88, 0x72, 0x04, 0x9f,</div><div class='del'>-	0x7b, 0x79, 0x8d, 0xce, 0x37, 0xe7, 0x95, 0x9f, 0xa4, 0xf4, 0xcc, 0xb2,</div><div class='del'>-	0xcb, 0xf1, 0x40, 0xb7, 0xd2, 0x59, 0xd7, 0x41, 0x9f, 0xc4, 0xf4, 0x99,</div><div class='del'>-	0x1b, 0xda, 0x10, 0xdb, 0xb8, 0x11, 0x9d, 0x7f, 0x44, 0xb2, 0x27, 0xe3,</div><div class='del'>-	0xd0, 0x67, 0xec, 0x2b, 0xf0, 0x1d, 0x68, 0x23, 0x03, 0xbc, 0x4d, 0x7b,</div><div class='del'>-	0x77, 0x2b, 0xec, 0xde, 0x35, 0x8a, 0x9e, 0x11, 0xb7, 0x5f, 0xa6, 0x8e,</div><div class='del'>-	0x73, 0xec, 0x5e, 0xe8, 0xf2, 0x84, 0x92, 0xdb, 0x62, 0xe9, 0x7c, 0x22,</div><div class='del'>-	0x06, 0x9d, 0x1c, 0xdb, 0x41, 0x7e, 0x7e, 0x50, 0xee, 0x70, 0xc6, 0xe5,</div><div class='del'>-	0x4e, 0xc8, 0xce, 0x90, 0xe3, 0xca, 0x30, 0xd6, 0x62, 0x97, 0x03, 0xbb,</div><div class='del'>-	0xa3, 0x30, 0x74, 0x23, 0xfc, 0x2e, 0x8e, 0xdd, 0xa1, 0xef, 0x5c, 0xf8,</div><div class='del'>-	0xf8, 0xf1, 0xcf, 0x6a, 0x3e, 0x8f, 0xb2, 0xf3, 0x2f, 0x2b, 0xde, 0x8c,</div><div class='del'>-	0xb8, 0x37, 0x69, 0x3b, 0xdb, 0x2a, 0x39, 0x55, 0xef, 0x26, 0x65, 0x8f,</div><div class='del'>-	0x8b, 0x4b, 0xf7, 0x22, 0x85, 0x6d, 0x5e, 0x82, 0xbe, 0x01, 0xe6, 0x2e,</div><div class='del'>-	0x56, 0x77, 0x22, 0x0f, 0x1b, 0xba, 0x94, 0x46, 0xfa, 0x41, 0xa4, 0xac,</div><div class='del'>-	0xfb, 0xb9, 0x16, 0x3f, 0x96, 0x5b, 0x7f, 0x87, 0xcc, 0xbf, 0x7f, 0xfa,</div><div class='del'>-	0x61, 0x85, 0x4b, 0x2f, 0xaa, 0xfb, 0x87, 0x06, 0xb0, 0x4e, 0x16, 0x7a,</div><div class='del'>-	0xa5, 0x05, 0x18, 0x68, 0xe6, 0x84, 0x9d, 0x1a, 0x0e, 0xdd, 0x26, 0x1f,</div><div class='del'>-	0x81, 0x2f, 0x5f, 0x71, 0xb9, 0x96, 0x3b, 0xe5, 0x13, 0xb7, 0x50, 0x46,</div><div class='del'>-	0x6e, 0x93, 0x7d, 0xb7, 0x84, 0x64, 0x5f, 0xbf, 0x9d, 0x21, 0xdd, 0xd7,</div><div class='del'>-	0xbe, 0x3f, 0xf0, 0xa7, 0xbb, 0x47, 0x92, 0xa1, 0x01, 0x79, 0x1c, 0x32,</div><div class='del'>-	0x56, 0x80, 0x7c, 0x0d, 0xd7, 0xc8, 0x73, 0xea, 0x7b, 0xea, 0xf9, 0x14,</div><div class='del'>-	0xb0, 0x72, 0x80, 0xfd, 0x1c, 0x99, 0xa9, 0x35, 0x88, 0x75, 0x15, 0xe3,</div><div class='del'>-	0xc9, 0x96, 0x7f, 0xae, 0x71, 0x15, 0x65, 0x02, 0x3e, 0xc8, 0x55, 0xfe,</div><div class='del'>-	0xfe, 0x54, 0xf7, 0xfe, 0xae, 0xf2, 0xed, 0x0a, 0xfc, 0x5f, 0x8f, 0x38,</div><div class='del'>-	0xcf, 0xbf, 0x5f, 0x70, 0x51, 0xeb, 0xd2, 0xe4, 0xd6, 0x55, 0x7c, 0xd7,</div><div class='del'>-	0x4a, 0xff, 0xe1, 0xeb, 0x2d, 0x6b, 0xdf, 0x2d, 0x6c, 0x94, 0xc5, 0x20,</div><div class='del'>-	0xee, 0x56, 0xc6, 0x9c, 0x69, 0xd3, 0x6d, 0x93, 0xba, 0xb0, 0xcd, 0xd9,</div><div class='del'>-	0x23, 0x7f, 0x09, 0xfb, 0xfe, 0xd5, 0x55, 0xfb, 0xbe, 0x17, 0xfc, 0xd8,</div><div class='del'>-	0x88, 0x01, 0x1c, 0xf3, 0x2e, 0xcc, 0x65, 0x04, 0xeb, 0x79, 0x27, 0x7e,</div><div class='del'>-	0x77, 0x94, 0xd6, 0xc5, 0xf1, 0x66, 0x0b, 0xc0, 0x93, 0x0d, 0x0e, 0xfb,</div><div class='del'>-	0x5b, 0x17, 0xcf, 0x2b, 0xe4, 0x65, 0x35, 0x56, 0x38, 0x78, 0x49, 0x68,</div><div class='del'>-	0xf7, 0xde, 0x92, 0x68, 0x8f, 0xf3, 0x56, 0x57, 0xc8, 0x79, 0xde, 0x08,</div><div class='del'>-	0xf1, 0xec, 0xdb, 0x95, 0xd3, 0x35, 0xe2, 0xb0, 0x0b, 0x62, 0x9c, 0x25,</div><div class='del'>-	0x06, 0x7b, 0x45, 0xc5, 0xa0, 0x2a, 0xa5, 0x6f, 0x23, 0x45, 0x7d, 0xe8,</div><div class='del'>-	0xc7, 0xb0, 0x1f, 0xa7, 0x50, 0x58, 0x85, 0x7a, 0xf6, 0x4e, 0xac, 0xc3,</div><div class='del'>-	0x14, 0x7e, 0x5d, 0x3b, 0xae, 0xc3, 0xfe, 0xa5, 0x9c, 0x32, 0xf6, 0xd5,</div><div class='del'>-	0x63, 0xee, 0x08, 0xf1, 0xdd, 0x66, 0x71, 0xb0, 0xef, 0x48, 0x64, 0x0e,</div><div class='del'>-	0xb6, 0xce, 0xa0, 0x7e, 0xe0, 0x3c, 0x68, 0x27, 0x4d, 0x59, 0x3c, 0xce,</div><div class='del'>-	0xbd, 0xbe, 0x59, 0xfd, 0xa0, 0x6e, 0x30, 0x17, 0x65, 0x37, 0x32, 0x79,</div><div class='del'>-	0xc6, 0x38, 0x4b, 0x5c, 0x03, 0x17, 0x6b, 0xe0, 0xc9, 0x09, 0xb7, 0x0d,</div><div class='del'>-	0x7a, 0x3b, 0x2e, 0xe1, 0x13, 0x9e, 0x0c, 0x29, 0xec, 0xda, 0x07, 0xcc,</div><div class='del'>-	0xb5, 0x55, 0xe3, 0x86, 0xb8, 0x44, 0x4e, 0x74, 0x4a, 0x23, 0x70, 0x75,</div><div class='del'>-	0xc3, 0x51, 0xda, 0xc8, 0xa4, 0x35, 0x04, 0x21, 0x88, 0xa8, 0xbb, 0xac,</div><div class='del'>-	0xf6, 0xe0, 0xf7, 0xa5, 0xcf, 0xfa, 0xbe, 0x10, 0x2f, 0xfd, 0x7b, 0xac,</div><div class='del'>-	0x9f, 0xed, 0x5e, 0xd8, 0xa4, 0x7e, 0x71, 0xad, 0x3e, 0xe4, 0x88, 0xb1,</div><div class='del'>-	0x35, 0xb6, 0x61, 0xac, 0x2d, 0x39, 0xf8, 0x3d, 0xc6, 0xd8, 0xe0, 0x6b,</div><div class='del'>-	0x36, 0x9c, 0xf1, 0x69, 0x30, 0x96, 0xdb, 0xa5, 0x72, 0x92, 0x7b, 0x94,</div><div class='del'>-	0x71, 0x16, 0xd3, 0xf7, 0x53, 0x4b, 0xf4, 0x57, 0xf9, 0xde, 0xd2, 0xef,</div><div class='del'>-	0xbb, 0xf4, 0x7b, 0xfa, 0xa3, 0x05, 0xaf, 0x01, 0x3c, 0xdd, 0x05, 0xfd,</div><div class='del'>-	0x79, 0xef, 0x4e, 0x47, 0xe1, 0x86, 0x7b, 0x57, 0xd7, 0x6c, 0xb7, 0xba,</div><div class='del'>-	0x4f, 0x54, 0x29, 0x1d, 0x12, 0x67, 0xc7, 0x4a, 0x2a, 0x22, 0x63, 0x58,</div><div class='del'>-	0x0b, 0xe6, 0x33, 0xa4, 0x27, 0x75, 0x58, 0x0e, 0xa8, 0xb5, 0xa9, 0x1c,</div><div class='del'>-	0xb7, 0x8f, 0x58, 0xa1, 0x29, 0x31, 0x2a, 0x7c, 0xfe, 0x34, 0xd2, 0xc3,</div><div class='del'>-	0xc0, 0x3b, 0x7e, 0xec, 0xd2, 0xa8, 0xac, 0xe7, 0x25, 0x30, 0x86, 0xb9,</div><div class='del'>-	0x6b, 0x5d, 0x1c, 0x6b, 0x2d, 0xc6, 0xc5, 0xf7, 0x43, 0xea, 0x7d, 0x6a,</div><div class='del'>-	0x5d, 0x9c, 0x2b, 0x67, 0x10, 0xcb, 0x04, 0xef, 0xb9, 0x16, 0x5c, 0x2f,</div><div class='del'>-	0xd8, 0xe2, 0xe3, 0x41, 0xcc, 0xab, 0x55, 0xaf, 0x0b, 0xd7, 0x67, 0x46,</div><div class='del'>-	0xce, 0x99, 0xf6, 0x08, 0xe5, 0xef, 0x86, 0x9d, 0x57, 0xcb, 0x44, 0x07,</div><div class='del'>-	0xe3, 0x6d, 0xf5, 0x34, 0x6c, 0x8c, 0xa3, 0xd5, 0x8f, 0xbf, 0x31, 0xfe,</div><div class='del'>-	0xc6, 0xb1, 0xfd, 0x18, 0x5b, 0x76, 0x5d, 0x8c, 0xad, 0x7e, 0x3c, 0x8e,</div><div class='del'>-	0xb5, 0x15, 0xfe, 0x53, 0xc1, 0x8b, 0x3b, 0x5c, 0xa3, 0x6e, 0x6b, 0x9e,</div><div class='del'>-	0xf9, 0x2f, 0x1a, 0x58, 0xc7, 0x38, 0xec, 0x08, 0xd7, 0x32, 0x38, 0x6f,</div><div class='del'>-	0xe6, 0x9a, 0x26, 0xad, 0xc3, 0xfe, 0x7a, 0x0e, 0xfa, 0xeb, 0xee, 0xaf,</div><div class='del'>-	0xff, 0x85, 0xd5, 0x75, 0xa4, 0x7d, 0xe0, 0x3a, 0x76, 0x88, 0x40, 0xcf,</div><div class='del'>-	0x1a, 0x47, 0xb9, 0x86, 0x4c, 0xb9, 0x86, 0x7c, 0xc7, 0x35, 0xec, 0xd2,</div><div class='del'>-	0xef, 0xb8, 0x7e, 0xc0, 0x69, 0x5f, 0xe0, 0x3d, 0xd5, 0xac, 0xfa, 0x06,</div><div class='del'>-	0xab, 0xab, 0x27, 0xd8, 0x8b, 0x29, 0x79, 0x6e, 0xb1, 0x59, 0xcc, 0xb4,</div><div class='del'>-	0x3f, 0xaf, 0xf1, 0x75, 0xf1, 0x76, 0x9e, 0x5f, 0xf5, 0x13, 0x7b, 0x06,</div><div class='del'>-	0xf3, 0x4a, 0x70, 0x5e, 0x07, 0xe4, 0x75, 0xc9, 0xcf, 0x44, 0xe0, 0x03,</div><div class='del'>-	0xa6, 0x80, 0x73, 0xfa, 0xa1, 0x6f, 0x19, 0x1f, 0x45, 0x59, 0x95, 0x78,</div><div class='del'>-	0x85, 0xb6, 0x2e, 0x85, 0xbd, 0x42, 0x1d, 0x4c, 0x3c, 0xf2, 0x9a, 0xe4,</div><div class='del'>-	0xca, 0x81, 0x8e, 0x41, 0xff, 0x46, 0xd0, 0x3f, 0xf9, 0x9c, 0xb9, 0x76,</div><div class='del'>-	0xbb, 0xac, 0x58, 0xdb, 0xc5, 0xb6, 0x96, 0x64, 0x6d, 0x5d, 0xc7, 0x37,</div><div class='del'>-	0xe7, 0xbb, 0x7b, 0x6f, 0x78, 0x4d, 0x36, 0xc6, 0x37, 0x59, 0xfb, 0x49,</div><div class='del'>-	0x09, 0xde, 0x07, 0x6b, 0xbf, 0xe9, 0x3a, 0x14, 0x5e, 0x15, 0xae, 0x05,</div><div class='del'>-	0x79, 0x40, 0x3c, 0x1c, 0x95, 0x7f, 0x13, 0xe7, 0x7e, 0x2c, 0xa8, 0x33,</div><div class='del'>-	0xcd, 0xa4, 0xd1, 0xa3, 0x74, 0xc6, 0x90, 0xeb, 0xcb, 0x6b, 0x01, 0xe3,</div><div class='del'>-	0xc4, 0xba, 0xff, 0xd0, 0x1b, 0x8a, 0xc3, 0xcf, 0xed, 0xa6, 0x7e, 0x09,</div><div class='del'>-	0xf6, 0x74, 0xb3, 0xda, 0xd3, 0x9f, 0x77, 0x43, 0x52, 0x74, 0x42, 0x32,</div><div class='del'>-	0xe5, 0x1c, 0x52, 0x18, 0xff, 0xa3, 0xe8, 0xeb, 0x13, 0xba, 0xaf, 0x29,</div><div class='del'>-	0xe9, 0xd1, 0xfa, 0xe7, 0x20, 0xe4, 0xdc, 0x93, 0x7b, 0xdc, 0x9d, 0x72,</div><div class='del'>-	0x43, 0x1b, 0xf7, 0x40, 0x30, 0xff, 0x43, 0xd2, 0xbd, 0x73, 0xc5, 0x82,</div><div class='del'>-	0x67, 0x70, 0x6d, 0x74, 0x95, 0x07, 0xdc, 0x67, 0x81, 0x7c, 0xfb, 0x7c,</div><div class='del'>-	0xf0, 0xe7, 0xbf, 0x6e, 0xae, 0x7a, 0x9e, 0x9c, 0x33, 0xeb, 0x71, 0xae,</div><div class='del'>-	0x3e, 0x96, 0x5f, 0x9b, 0x6b, 0x50, 0xbf, 0x05, 0xb2, 0x64, 0x5b, 0x12,</div><div class='del'>-	0xaa, 0xe7, 0xcd, 0xaa, 0x8e, 0x1a, 0x61, 0x8c, 0x64, 0xc5, 0xb4, 0x53,</div><div class='del'>-	0x56, 0x28, 0x88, 0x45, 0xfb, 0x58, 0xb7, 0x0b, 0x38, 0xdc, 0xe9, 0xe9,</div><div class='del'>-	0x49, 0xe5, 0x55, 0x8c, 0xd4, 0x50, 0xf3, 0x9a, 0x02, 0x26, 0x5b, 0x74,</div><div class='del'>-	0x5f, 0xf5, 0x3e, 0x09, 0xcc, 0x3a, 0x21, 0x0f, 0x49, 0x78, 0x5d, 0x2c,</div><div class='del'>-	0x17, 0xf9, 0xb3, 0x8c, 0xe7, 0xda, 0x56, 0x06, 0x6b, 0xfc, 0x3b, 0xf0,</div><div class='del'>-	0xe1, 0x2b, 0xd0, 0xfb, 0x1f, 0xa3, 0x6d, 0x28, 0xc1, 0x5e, 0x00, 0x97,</div><div class='del'>-	0x7c, 0xf5, 0x8a, 0x18, 0x7e, 0xa2, 0x2e, 0x96, 0xeb, 0xe3, 0xd3, 0x73,</div><div class='del'>-	0x0a, 0x93, 0x12, 0xb7, 0x1f, 0x09, 0xdd, 0xd5, 0x1b, 0x86, 0x9f, 0x51,</div><div class='del'>-	0xf0, 0x62, 0x0e, 0x71, 0xdc, 0x21, 0xb9, 0x03, 0xeb, 0x73, 0x7a, 0xb1,</div><div class='del'>-	0x10, 0xda, 0x55, 0x0a, 0x64, 0x15, 0x7e, 0x65, 0xcd, 0x4e, 0x9d, 0x07,</div><div class='del'>-	0x3f, 0x9e, 0xd2, 0x98, 0x8f, 0xe7, 0x35, 0x15, 0xed, 0xb3, 0x30, 0x36,</div><div class='del'>-	0x54, 0xac, 0x1d, 0x92, 0x69, 0x97, 0xb1, 0x9d, 0x6e, 0x29, 0xc6, 0x33,</div><div class='del'>-	0x57, 0x37, 0xae, 0xf2, 0xc8, 0x36, 0xe1, 0xf3, 0xa5, 0xa8, 0xbf, 0x2b,</div><div class='del'>-	0xfa, 0xbc, 0xe3, 0x29, 0x25, 0x5f, 0x41, 0x5c, 0x98, 0xfe, 0x11, 0xcf,</div><div class='del'>-	0xab, 0xba, 0xcd, 0x11, 0x3e, 0x97, 0x29, 0x03, 0xca, 0x67, 0x02, 0x2f,</div><div class='del'>-	0xef, 0x90, 0xcc, 0x98, 0xa5, 0x70, 0xcb, 0x63, 0x25, 0xee, 0x17, 0xe2,</div><div class='del'>-	0xff, 0xd7, 0x81, 0xfd, 0x23, 0x58, 0x33, 0xfa, 0x01, 0x1c, 0x9b, 0xfb,</div><div class='del'>-	0x02, 0x65, 0x55, 0xf3, 0x97, 0xec, 0x8b, 0x0f, 0x6d, 0x23, 0xc6, 0x78,</div><div class='del'>-	0xa1, 0xf4, 0x98, 0xe2, 0xdf, 0x8a, 0x04, 0xb1, 0x73, 0x85, 0x05, 0x0b,</div><div class='del'>-	0xd9, 0x70, 0x48, 0x92, 0x73, 0xff, 0x16, 0x32, 0xd4, 0x0f, 0x1f, 0x89,</div><div class='del'>-	0xf5, 0x44, 0x9d, 0x5f, 0x0d, 0x01, 0x73, 0x19, 0xce, 0xbb, 0xa4, 0x68,</div><div class='del'>-	0x46, 0xa5, 0xa8, 0xee, 0xfe, 0xf1, 0x3c, 0x37, 0xac, 0x62, 0x3b, 0x45,</div><div class='del'>-	0x93, 0x98, 0x3f, 0xbd, 0x2d, 0xb8, 0xfb, 0x57, 0x34, 0xd9, 0x8e, 0x79,</div><div class='del'>-	0x96, 0x4f, 0x49, 0x74, 0xee, 0xa0, 0x34, 0xcc, 0x3d, 0x24, 0x8d, 0xc7,</div><div class='del'>-	0x88, 0xf1, 0x18, 0xbb, 0x37, 0x6e, 0x6d, 0x14, 0x62, 0xee, 0x6f, 0x61,</div><div class='del'>-	0xec, 0x43, 0xf2, 0x03, 0x37, 0xa0, 0xe9, 0xba, 0xad, 0xd2, 0xca, 0x3a,</div><div class='del'>-	0x41, 0x9e, 0xcf, 0xc4, 0x09, 0x3c, 0x17, 0x77, 0xfc, 0x18, 0xa9, 0x3a,</div><div class='del'>-	0x57, 0x41, 0x5a, 0xe1, 0xb9, 0x38, 0xdf, 0xbf, 0x66, 0xfa, 0xa9, 0x8f,</div><div class='del'>-	0xf7, 0x7d, 0xdf, 0x83, 0x6d, 0x52, 0x75, 0xd8, 0x62, 0xfd, 0xf7, 0xa1,</div><div class='del'>-	0x39, 0x94, 0xe7, 0xe7, 0x83, 0x3b, 0x3a, 0x06, 0x7c, 0x5f, 0xbb, 0x40,</div><div class='del'>-	0x9f, 0xc1, 0xe4, 0xb7, 0x98, 0xf3, 0x05, 0xf0, 0xf9, 0x1a, 0x75, 0xbf,</div><div class='del'>-	0x87, 0x77, 0x24, 0x50, 0xcf, 0xf2, 0x31, 0x1f, 0xf3, 0x09, 0xf0, 0xf9,</div><div class='del'>-	0xfd, 0x9d, 0x46, 0xfa, 0x7f, 0x5f, 0x9d, 0x1d, 0x20, 0xa6, 0xd8, 0xc6,</div><div class='del'>-	0xb3, 0x3f, 0x60, 0x55, 0xae, 0xed, 0x77, 0xb1, 0xb6, 0x8d, 0xea, 0xac,</div><div class='del'>-	0xa5, 0x58, 0xa2, 0x0f, 0x95, 0xc7, 0x9a, 0xf1, 0x9e, 0x1c, 0x7d, 0xad,</div><div class='del'>-	0xbc, 0x8e, 0x81, 0x92, 0x4e, 0xe2, 0xe8, 0x00, 0x93, 0xb3, 0xcf, 0xcd,</div><div class='del'>-	0xee, 0x03, 0x07, 0x7e, 0x12, 0xd7, 0x38, 0xa1, 0x68, 0x1e, 0xde, 0xe0,</div><div class='del'>-	0x23, 0x1c, 0xc6, 0xfe, 0x5b, 0x84, 0x0c, 0x4d, 0x42, 0xef, 0x0c, 0x85,</div><div class='del'>-	0xb9, 0x27, 0x9a, 0xb5, 0xff, 0xe8, 0xd0, 0x57, 0x0e, 0x8d, 0xa1, 0x0f,</div><div class='del'>-	0xe3, 0xd8, 0x1b, 0x32, 0x05, 0x9d, 0x3b, 0x5d, 0x4b, 0xaa, 0x6f, 0x78,</div><div class='del'>-	0x32, 0x09, 0xde, 0xdb, 0x62, 0xf9, 0x7f, 0x81, 0x8c, 0xbc, 0x01, 0x0c,</div><div class='del'>-	0xba, 0x05, 0xfc, 0x34, 0xf4, 0xbd, 0x90, 0x0f, 0xe8, 0xf8, 0x4f, 0x8c,</div><div class='del'>-	0xf1, 0x6f, 0xe8, 0xaa, 0xa2, 0x8f, 0xef, 0xe2, 0xd3, 0x48, 0xbf, 0xd0,</div><div class='del'>-	0xec, 0xcb, 0xc8, 0xcb, 0x7a, 0x8d, 0x9b, 0x50, 0xfe, 0xa8, 0x8a, 0xfb,</div><div class='del'>-	0xf9, 0x73, 0xb2, 0xb5, 0x7f, 0x10, 0xc5, 0x3a, 0x73, 0x5e, 0x5f, 0x41,</div><div class='del'>-	0x3d, 0xae, 0x6f, 0xaf, 0x3e, 0x0f, 0x6d, 0x56, 0x3a, 0x29, 0xe7, 0x5a,</div><div class='del'>-	0xf0, 0x75, 0x89, 0x89, 0x80, 0xa9, 0x5d, 0xb6, 0x7b, 0x76, 0x1b, 0xcf,</div><div class='del'>-	0x1b, 0x1b, 0x1c, 0x85, 0xe7, 0x3b, 0xc2, 0x12, 0x94, 0xdd, 0x8e, 0x32,</div><div class='del'>-	0xc6, 0x25, 0xde, 0x85, 0xb5, 0x61, 0x59, 0x16, 0x79, 0x8e, 0x75, 0xb5,</div><div class='del'>-	0x1e, 0x87, 0x63, 0x0c, 0xb7, 0xac, 0xa7, 0x89, 0x73, 0xe9, 0xd8, 0xf0,</div><div class='del'>-	0xfd, 0x00, 0xcb, 0xde, 0xa5, 0xcb, 0x22, 0x7a, 0x7e, 0xb7, 0xeb, 0x6f,</div><div class='del'>-	0x67, 0xed, 0x23, 0x99, 0x55, 0x3c, 0x4a, 0xfa, 0x62, 0xaa, 0x5d, 0xc6,</div><div class='del'>-	0xf4, 0x65, 0xe7, 0x30, 0xd6, 0x23, 0x92, 0xf6, 0xda, 0xb9, 0x47, 0x86,</div><div class='del'>-	0xc2, 0x81, 0x5f, 0x98, 0x50, 0xbe, 0x9e, 0x65, 0xf8, 0x77, 0x84, 0xce,</div><div class='del'>-	0x5d, 0x76, 0x0f, 0xda, 0xbf, 0x53, 0x3e, 0xdc, 0xdb, 0x24, 0x8b, 0xb3,</div><div class='del'>-	0x31, 0x7d, 0x3f, 0x31, 0xa1, 0xf6, 0x49, 0x7e, 0x9c, 0xf9, 0x1f, 0x6d,</div><div class='del'>-	0xe3, 0x77, 0xcb, 0x86, 0xc3, 0xf2, 0x0e, 0xcd, 0xdf, 0x77, 0xa9, 0xfb,</div><div class='del'>-	0x3c, 0xbc, 0x67, 0x52, 0x2c, 0xff, 0x44, 0xbd, 0x3f, 0x3d, 0xdf, 0xa0,</div><div class='del'>-	0xea, 0x9f, 0x9e, 0xdf, 0x78, 0x27, 0x87, 0x65, 0xef, 0x66, 0x4c, 0x41,</div><div class='del'>-	0x96, 0x66, 0x1a, 0x64, 0x79, 0xde, 0xa2, 0x8f, 0x94, 0x6e, 0x5c, 0xfb,</div><div class='del'>-	0xf6, 0x45, 0x7f, 0xa7, 0xe6, 0xc9, 0x30, 0xd6, 0x6f, 0x71, 0x70, 0x5a,</div><div class='del'>-	0x2a, 0x83, 0xf4, 0x01, 0xd4, 0xbd, 0x3b, 0xc8, 0x48, 0x03, 0xf0, 0x5f,</div><div class='del'>-	0xc1, 0xab, 0x38, 0x8c, 0xbd, 0xb6, 0x6a, 0x1f, 0xea, 0xc7, 0xda, 0xcf,</div><div class='del'>-	0x22, 0x8f, 0x0c, 0xc9, 0xf5, 0x4f, 0x29, 0xba, 0x2a, 0x8a, 0x57, 0xc1,</div><div class='del'>-	0xb7, 0x45, 0xec, 0x9f, 0xdf, 0x17, 0x85, 0x35, 0x7e, 0x7c, 0x50, 0xf3,</div><div class='del'>-	0xfc, 0xaf, 0x75, 0xfa, 0x88, 0xec, 0x3b, 0xfe, 0x19, 0xd0, 0xda, 0xe4,</div><div class='del'>-	0xdf, 0x2d, 0x92, 0xfa, 0xef, 0x36, 0x22, 0xea, 0xdb, 0x95, 0x88, 0xf3,</div><div class='del'>-	0x08, 0xca, 0x18, 0x7b, 0x7a, 0x44, 0xcd, 0x83, 0xf7, 0xd7, 0x0a, 0xf2,</div><div class='del'>-	0xab, 0xee, 0x64, 0x04, 0xfe, 0x0f, 0xef, 0x08, 0x35, 0xeb, 0xfe, 0x76,</div><div class='del'>-	0xe9, 0x75, 0x1c, 0x97, 0x7d, 0xd0, 0xef, 0x79, 0xe0, 0x40, 0xde, 0xab,</div><div class='del'>-	0x9a, 0x08, 0xd7, 0x8f, 0x19, 0xc8, 0xb2, 0xef, 0x5b, 0x07, 0x67, 0xfd,</div><div class='del'>-	0x61, 0xe5, 0x03, 0xac, 0xfa, 0xe9, 0xba, 0x7c, 0x5c, 0xf6, 0x97, 0x94,</div><div class='del'>-	0xbf, 0xae, 0xce, 0xe8, 0xa6, 0xb1, 0x27, 0x87, 0x94, 0x0e, 0x8f, 0x85,</div><div class='del'>-	0x86, 0xab, 0x69, 0xc9, 0x9f, 0xdc, 0x8d, 0x71, 0x18, 0xfb, 0xca, 0xe8,</div><div class='del'>-	0xb3, 0xb0, 0xbd, 0xb2, 0xaf, 0xe6, 0x8f, 0x3d, 0x59, 0xe2, 0xfb, 0x24,</div><div class='del'>-	0xec, 0x22, 0xdf, 0xe7, 0x12, 0x61, 0x15, 0xcd, 0xbf, 0x0e, 0x6d, 0x1b,</div><div class='del'>-	0x34, 0x6f, 0x79, 0x9f, 0x9e, 0xed, 0xb9, 0xff, 0x3e, 0x6e, 0x4a, 0x73,</div><div class='del'>-	0x0e, 0xef, 0xd9, 0x26, 0xe8, 0x6f, 0x12, 0x7a, 0x9a, 0xfe, 0xe8, 0xc3,</div><div class='del'>-	0xb2, 0x52, 0x9e, 0x96, 0xf3, 0xe5, 0x40, 0xce, 0x78, 0xb7, 0x99, 0xb4,</div><div class='del'>-	0xdf, 0xa9, 0xef, 0x36, 0x67, 0xb0, 0x0e, 0xeb, 0x79, 0x95, 0x5b, 0xf7,</div><div class='del'>-	0xfd, 0xd1, 0x5f, 0x98, 0xfe, 0x37, 0x80, 0xb7, 0xa9, 0x7b, 0x4a, 0xeb,</div><div class='del'>-	0xe5, 0x9d, 0xfd, 0x2c, 0x9b, 0x8c, 0xed, 0xfb, 0x77, 0xad, 0x3a, 0xea,</div><div class='del'>-	0xde, 0xc7, 0xf5, 0xfd, 0xa6, 0xe7, 0xf4, 0x9d, 0x78, 0xf2, 0x73, 0x4c,</div><div class='del'>-	0xd3, 0x7b, 0x1d, 0xf6, 0x1e, 0xfb, 0x7c, 0x54, 0xaf, 0x1b, 0xd2, 0x45,</div><div class='del'>-	0x3e, 0x53, 0x0f, 0xad, 0xe8, 0xf3, 0x4e, 0x53, 0x8f, 0x51, 0x7f, 0xbf,</div><div class='del'>-	0xac, 0xa1, 0x6e, 0x5c, 0xb6, 0xe7, 0xb7, 0x48, 0xc1, 0x5d, 0x6b, 0x96,</div><div class='del'>-	0x1d, 0xd7, 0xf7, 0xd8, 0x82, 0xbb, 0xd5, 0x2c, 0x0b, 0xee, 0x5b, 0x91,</div><div class='del'>-	0x5f, 0x8c, 0xe1, 0x21, 0xad, 0x8d, 0xe9, 0xe7, 0xb1, 0xba, 0x6f, 0x74,</div><div class='del'>-	0x82, 0x3e, 0x23, 0xe8, 0xe3, 0xf6, 0xf0, 0xe5, 0x77, 0xb1, 0xf9, 0xdd,</div><div class='del'>-	0x14, 0x65, 0xd1, 0xe0, 0x37, 0xdd, 0xf4, 0x7b, 0x80, 0x55, 0xb6, 0xca,</div><div class='del'>-	0xa4, 0xa2, 0xa7, 0xa0, 0xee, 0x27, 0x64, 0xdd, 0x26, 0x19, 0x32, 0xfd,</div><div class='del'>-	0xfc, 0xe4, 0xe2, 0x46, 0x39, 0x65, 0xf9, 0xf5, 0x31, 0x69, 0x2e, 0x60,</div><div class='del'>-	0x1c, 0xbe, 0xdf, 0xec, 0x1b, 0x81, 0xa8, 0xfe, 0x4e, 0xc9, 0x45, 0x9b,</div><div class='del'>-	0xcf, 0x53, 0xde, 0x0b, 0x85, 0xd5, 0xbb, 0x90, 0x05, 0x15, 0x97, 0x14,</div><div class='del'>-	0x23, 0xb8, 0x93, 0xc8, 0x6f, 0xd6, 0x45, 0x9e, 0xa9, 0xf2, 0xbb, 0xad,</div><div class='del'>-	0xdb, 0xd4, 0xbd, 0x11, 0xff, 0x2c, 0x8e, 0x74, 0x75, 0x2b, 0x9d, 0x5c,</div><div class='del'>-	0xa9, 0x16, 0xc9, 0x53, 0x1d, 0x87, 0x8d, 0xea, 0x38, 0x2c, 0x79, 0x3c,</div><div class='del'>-	0x02, 0x1e, 0xff, 0x3f, 0xbd, 0x2e, 0xc1, 0x77, 0x5f, 0x3c, 0xeb, 0xe1,</div><div class='del'>-	0x79, 0xd0, 0xa3, 0x6a, 0x2e, 0xd4, 0xd1, 0x68, 0xfb, 0xde, 0xb0, 0xda,</div><div class='del'>-	0xbb, 0xea, 0x9b, 0x78, 0xc8, 0x27, 0xbf, 0x71, 0x87, 0x7e, 0x2d, 0xf1,</div><div class='del'>-	0x5b, 0xf6, 0x11, 0xf5, 0x3d, 0x47, 0xa5, 0xca, 0x75, 0xe5, 0x37, 0xec,</div><div class='del'>-	0x63, 0x75, 0xf2, 0x18, 0xd6, 0x63, 0x6d, 0x69, 0x93, 0x66, 0x7f, 0xdd,</div><div class='del'>-	0xf9, 0x2d, 0x48, 0xa5, 0x1a, 0xdc, 0xa3, 0xdc, 0xb2, 0xc2, 0x3d, 0x21,</div><div class='del'>-	0xbe, 0x5f, 0xab, 0xbe, 0x67, 0xa9, 0xa8, 0xef, 0x43, 0x2c, 0x7e, 0x67,</div><div class='del'>-	0x09, 0xdb, 0xb1, 0x07, 0xcf, 0x3c, 0x47, 0xdd, 0x8b, 0x14, 0x3a, 0xa7,</div><div class='del'>-	0x3a, 0x81, 0xf4, 0x21, 0xc9, 0xa9, 0x38, 0x57, 0x0b, 0xf2, 0x93, 0x6a,</div><div class='del'>-	0xec, 0x62, 0xf5, 0x7e, 0xd9, 0x77, 0xf2, 0x01, 0x7e, 0x43, 0xa3, 0xbe,</div><div class='del'>-	0xc3, 0xcf, 0xba, 0xa4, 0x31, 0x2e, 0x53, 0x6a, 0xde, 0x85, 0xb5, 0x6f,</div><div class='del'>-	0x33, 0x7c, 0x39, 0x6a, 0xe3, 0x9a, 0x16, 0xaa, 0x2d, 0xa0, 0x31, 0xa4,</div><div class='del'>-	0xef, 0x52, 0x12, 0xff, 0x06, 0xf3, 0x6f, 0xe6, 0xfd, 0x3c, 0x8f, 0xe7,</div><div class='del'>-	0x65, 0xfb, 0x4a, 0xbc, 0x2b, 0x99, 0xd4, 0x7e, 0x31, 0x63, 0x65, 0x8c,</div><div class='del'>-	0xc7, 0x53, 0xc6, 0xed, 0xd4, 0x04, 0xb4, 0x7f, 0x54, 0x12, 0x3c, 0xcb,</div><div class='del'>-	0xd5, 0x73, 0x69, 0xa9, 0x9b, 0x0b, 0xef, 0x87, 0xfa, 0xf3, 0xe1, 0x37,</div><div class='del'>-	0x27, 0xf9, 0x52, 0xfd, 0xf7, 0x32, 0xea, 0x9b, 0x70, 0xf5, 0x7d, 0xca,</div><div class='del'>-	0x44, 0xf5, 0x41, 0xb9, 0xaf, 0xb4, 0x55, 0x7f, 0x2b, 0x13, 0x93, 0xfb,</div><div class='del'>-	0xaa, 0x6f, 0x28, 0x9e, 0xe6, 0xd5, 0x77, 0x3e, 0x51, 0xbd, 0x66, 0x71,</div><div class='del'>-	0xd5, 0xc7, 0xda, 0xf7, 0x3e, 0x76, 0xdd, 0xb7, 0x1f, 0x51, 0x99, 0x58,</div><div class='del'>-	0xfc, 0x65, 0xdf, 0xfc, 0x3c, 0x2c, 0xfc, 0xee, 0xe3, 0x25, 0x77, 0x5a,</div><div class='del'>-	0x1e, 0x2b, 0x7b, 0xde, 0x1d, 0x2e, 0xb1, 0xd4, 0x16, 0x39, 0x1f, 0xcf,</div><div class='del'>-	0x0c, 0x7e, 0xcf, 0x69, 0x0f, 0x55, 0x66, 0x1b, 0xa1, 0xaf, 0x1b, 0x95,</div><div class='del'>-	0x2d, 0x61, 0x7e, 0x71, 0x96, 0x7b, 0x3e, 0x82, 0x39, 0xda, 0xe6, 0x25,</div><div class='del'>-	0xf9, 0x54, 0x1b, 0xe3, 0x4c, 0x77, 0xc0, 0x77, 0xfb, 0xb8, 0xeb, 0xeb,</div><div class='del'>-	0xe5, 0xcf, 0x2d, 0xed, 0x96, 0xcf, 0x55, 0x63, 0xa1, 0xca, 0x0c, 0xef,</div><div class='del'>-	0xd7, 0xd9, 0x23, 0x65, 0x49, 0xa2, 0x1e, 0xfb, 0x87, 0xbc, 0x24, 0xb6,</div><div class='del'>-	0xcb, 0xd3, 0xc7, 0x7f, 0xee, 0x5d, 0x72, 0xf0, 0x1e, 0xba, 0xe6, 0xbc,</div><div class='del'>-	0x1b, 0xc4, 0xd2, 0xe0, 0x37, 0x1f, 0x65, 0xbd, 0xed, 0x90, 0x03, 0xd8,</div><div class='del'>-	0x6d, 0xec, 0x39, 0xfa, 0x75, 0x97, 0xb4, 0xde, 0x32, 0x8e, 0x5e, 0x23,</div><div class='del'>-	0x97, 0x56, 0xef, 0xe4, 0xbe, 0x0e, 0xd9, 0xb6, 0x7c, 0xfe, 0xab, 0xd8,</div><div class='del'>-	0xf3, 0x41, 0x09, 0x7f, 0x01, 0x76, 0xe2, 0x0b, 0x0d, 0x4a, 0xb7, 0xd3,</div><div class='del'>-	0x9e, 0x01, 0xf3, 0x03, 0xd7, 0x47, 0xd0, 0xcf, 0xfe, 0x36, 0x5f, 0x66,</div><div class='del'>-	0xa7, 0x45, 0xbe, 0xd8, 0x24, 0x99, 0x36, 0xfa, 0x8d, 0xf2, 0x2b, 0xf4,</div><div class='del'>-	0x57, 0xfd, 0x3e, 0x4b, 0xc9, 0x9f, 0x71, 0x8f, 0xd7, 0x38, 0x97, 0x64,</div><div class='del'>-	0xe2, 0x7f, 0xc9, 0x27, 0x65, 0x22, 0xc1, 0xb9, 0x3c, 0x2c, 0x85, 0xf2,</div><div class='del'>-	0xa3, 0xf8, 0x71, 0x9e, 0xa4, 0xfb, 0x5f, 0xe8, 0xb3, 0xfb, 0x31, 0x29,</div><div class='del'>-	0xce, 0xa4, 0x65, 0x6a, 0x7e, 0x92, 0xdf, 0xe4, 0x8e, 0xdc, 0xa1, 0xce,</div><div class='del'>-	0xb4, 0xec, 0x44, 0x32, 0xd4, 0x67, 0x4d, 0xf1, 0xae, 0x82, 0x9a, 0xcf,</div><div class='del'>-	0x24, 0xe6, 0xf3, 0x4a, 0x1b, 0xef, 0x78, 0x5f, 0x82, 0xfe, 0x35, 0x4e,</div><div class='del'>-	0x50, 0x0e, 0x6d, 0xb3, 0x2b, 0xc4, 0xfc, 0x5e, 0xf8, 0xab, 0x2c, 0xdb,</div><div class='del'>-	0x2b, 0xe1, 0xa3, 0xab, 0x7a, 0x1e, 0xe5, 0xfa, 0x6c, 0x55, 0xb5, 0xff,</div><div class='del'>-	0xaf, 0x68, 0x8b, 0x7a, 0x47, 0x83, 0xb6, 0x41, 0x1d, 0xb6, 0xe5, 0x3c,</div><div class='del'>-	0x77, 0xc3, 0x4f, 0x0e, 0xe8, 0x82, 0x1c, 0x26, 0xea, 0xf9, 0xdd, 0xbc,</div><div class='del'>-	0x81, 0xdf, 0x11, 0xe2, 0x4d, 0xf0, 0x8b, 0x3c, 0x0e, 0x6b, 0x1e, 0xff,</div><div class='del'>-	0x3d, 0xfa, 0x0f, 0xd6, 0xe0, 0x0e, 0x94, 0x99, 0xfa, 0x1b, 0xbc, 0x77,</div><div class='del'>-	0xc2, 0x77, 0xf2, 0x9c, 0xf5, 0xf7, 0xb7, 0xf9, 0xb2, 0x46, 0x7a, 0x36,</div><div class='del'>-	0xe3, 0xf9, 0x7b, 0xdb, 0xfd, 0x75, 0xd9, 0x0b, 0x7e, 0xf1, 0x1e, 0x65,</div><div class='del'>-	0x9f, 0xba, 0x8f, 0x9f, 0x19, 0xdf, 0x0b, 0xd9, 0x09, 0xe6, 0xd5, 0x07,</div><div class='del'>-	0x19, 0xe3, 0x39, 0x01, 0xeb, 0xd7, 0xf3, 0xc4, 0xb7, 0x7b, 0x61, 0xfa,</div><div class='del'>-	0xfa, 0x0e, 0xe7, 0x0a, 0x4c, 0xf8, 0x45, 0xf5, 0xfd, 0x0d, 0xf4, 0xe4,</div><div class='del'>-	0xbb, 0x57, 0xbf, 0xbf, 0xb9, 0xf2, 0x1a, 0x0f, 0xb4, 0xfb, 0x36, 0xca,</div><div class='del'>-	0x04, 0x4f, 0x5a, 0x75, 0x9b, 0xbd, 0xc0, 0xa7, 0x8c, 0x7f, 0x26, 0x13,</div><div class='del'>-	0x9f, 0x90, 0x60, 0x1c, 0xef, 0x36, 0xfa, 0x79, 0x43, 0x03, 0x7d, 0xf0,</div><div class='del'>-	0x69, 0xd5, 0x1d, 0x95, 0x04, 0xef, 0xbc, 0x24, 0x43, 0x7b, 0xd5, 0x7d,</div><div class='del'>-	0x85, 0x17, 0xd6, 0x7d, 0x43, 0x95, 0x92, 0xa7, 0xd7, 0x64, 0x65, 0xe4,</div><div class='del'>-	0x47, 0x62, 0x8b, 0x75, 0x35, 0x65, 0x85, 0xfd, 0x4e, 0x72, 0x9e, 0x89,</div><div class='del'>-	0x07, 0xd4, 0x3c, 0x4d, 0xf8, 0x4d, 0xbc, 0x5b, 0x60, 0x86, 0x2a, 0xf3,</div><div class='del'>-	0x5c, 0x77, 0xa4, 0x4b, 0x7c, 0x0e, 0xce, 0x37, 0x95, 0x5e, 0xc1, 0xb8,</div><div class='del'>-	0x2c, 0xa3, 0x6e, 0xe4, 0xfb, 0xb4, 0x3e, 0xff, 0xbc, 0xa7, 0x9d, 0x67,</div><div class='del'>-	0xf0, 0x79, 0x94, 0x95, 0x97, 0x36, 0xa7, 0xed, 0xe3, 0x4a, 0x0e, 0x1e,</div><div class='del'>-	0x06, 0xdf, 0xff, 0x04, 0x75, 0x1f, 0x45, 0xca, 0x39, 0xa6, 0x57, 0xd7,</div><div class='del'>-	0x9d, 0xfc, 0xfe, 0xb0, 0x0c, 0x42, 0x2e, 0x98, 0x7f, 0x58, 0x8a, 0xea,</div><div class='del'>-	0xee, 0x10, 0xd2, 0x32, 0x9f, 0xa9, 0xeb, 0x1d, 0x6d, 0x4f, 0x49, 0xcb,</div><div class='del'>-	0x5e, 0xfd, 0xdd, 0x56, 0x20, 0x4f, 0x7b, 0x74, 0xbb, 0xf1, 0x55, 0x5e,</div><div class='del'>-	0x3d, 0x70, 0x19, 0xde, 0x88, 0xae, 0xe2, 0x0d, 0x7f, 0xac, 0x62, 0x7b,</div><div class='del'>-	0x80, 0x35, 0xfc, 0x39, 0xf8, 0x58, 0xc3, 0x97, 0xf3, 0x49, 0x89, 0x40,</div><div class='del'>-	0x8e, 0xc3, 0x6b, 0x72, 0x0c, 0xdc, 0xe3, 0xef, 0x99, 0x29, 0x9e, 0xdb,</div><div class='del'>-	0x29, 0x3e, 0x53, 0x0e, 0x29, 0xbf, 0x5c, 0xc7, 0xfa, 0xb5, 0xbe, 0xf1,</div><div class='del'>-	0x97, 0xac, 0xf5, 0x85, 0xf6, 0x00, 0x3f, 0xfc, 0xd3, 0xf6, 0xc1, 0xd7,</div><div class='del'>-	0xda, 0xd7, 0xf6, 0xc1, 0x35, 0xbf, 0xa1, 0x7d, 0xb0, 0x51, 0x2e, 0xeb,</div><div class='del'>-	0x65, 0xca, 0x84, 0x3c, 0x71, 0xbd, 0x28, 0x4f, 0x94, 0x23, 0xf2, 0x92,</div><div class='del'>-	0xfa, 0xb4, 0x91, 0xbe, 0x53, 0xe2, 0xa2, 0xfa, 0x3e, 0x62, 0x1a, 0x3a,</div><div class='del'>-	0xa8, 0x3d, 0x54, 0x86, 0x5f, 0x5e, 0x5c, 0xba, 0x49, 0xc9, 0xf4, 0xd3,</div><div class='del'>-	0x35, 0xea, 0xa5, 0x2b, 0xcd, 0x7d, 0xbd, 0xce, 0xcd, 0x6f, 0xd0, 0xb9,</div><div class='del'>-	0xf9, 0x55, 0x9d, 0xdb, 0xa6, 0xfd, 0xa5, 0x7f, 0x8a, 0xce, 0x8d, 0xd7,</div><div class='del'>-	0x9d, 0x85, 0x04, 0xe7, 0x20, 0x12, 0xca, 0xf6, 0x36, 0xcb, 0xae, 0xd9,</div><div class='del'>-	0xb8, 0x8c, 0xcc, 0xec, 0x96, 0x3f, 0x9a, 0x99, 0x56, 0xf7, 0x82, 0xfe,</div><div class='del'>-	0xca, 0x4d, 0x26, 0xee, 0x0f, 0x79, 0xf2, 0x61, 0xf8, 0xbb, 0x13, 0x9d,</div><div class='del'>-	0x0d, 0xb2, 0xeb, 0xfd, 0xea, 0x7c, 0xcf, 0xcc, 0x86, 0x3a, 0x84, 0x91,</div><div class='del'>-	0xe7, 0x9c, 0x6b, 0xbb, 0x56, 0x88, 0x77, 0xc4, 0x1a, 0x65, 0x22, 0xde,</div><div class='del'>-	0x22, 0xbb, 0x81, 0x9d, 0x0a, 0x57, 0xb9, 0xea, 0x9b, 0xed, 0x8c, 0x3a,</div><div class='del'>-	0x3f, 0xe9, 0xde, 0xee, 0x8f, 0x0b, 0x3e, 0xb4, 0x9a, 0xf2, 0xe7, 0xb5,</div><div class='del'>-	0x6e, 0xf5, 0xfd, 0xf1, 0x0b, 0xa5, 0x3f, 0x6f, 0x5b, 0x9f, 0xe7, 0xf3,</div><div class='del'>-	0x7f, 0x42, 0x9d, 0x38, 0x78, 0x55, 0x7f, 0xdf, 0x26, 0xac, 0xf8, 0x59,</div><div class='del'>-	0x2c, 0x8f, 0xab, 0x7b, 0x4c, 0x17, 0xc3, 0xe4, 0x97, 0xf2, 0x9b, 0x12,</div><div class='del'>-	0xd9, 0x30, 0x30, 0xce, 0x2c, 0x90, 0xb4, 0x43, 0x9f, 0x4f, 0xe3, 0x4f,</div><div class='del'>-	0xe8, 0xff, 0x7d, 0xea, 0x3c, 0x75, 0x05, 0xbc, 0xf1, 0x54, 0xbc, 0x35,</div><div class='del'>-	0x1f, 0x27, 0xae, 0x5f, 0xbb, 0xb3, 0x7b, 0x39, 0xbe, 0xf7, 0xbf, 0xf1,</div><div class='del'>-	0xd2, 0xb1, 0x7f, 0x1d, 0x9f, 0xd1, 0x3e, 0xb8, 0x3a, 0xcb, 0xda, 0xec,</div><div class='del'>-	0xff, 0x50, 0xf8, 0xdf, 0xec, 0x67, 0x4b, 0xc4, 0x76, 0xf6, 0x91, 0xb2,</div><div class='del'>-	0xf4, 0x6f, 0x57, 0xb1, 0x26, 0xf2, 0xb7, 0x82, 0x75, 0x3a, 0x96, 0x08,</div><div class='del'>-	0xec, 0x79, 0xa8, 0xeb, 0x6c, 0xbd, 0x1f, 0xc8, 0x3e, 0x62, 0xea, 0x0e,</div><div class='del'>-	0xc4, 0xda, 0xff, 0xbd, 0x61, 0x4c, 0x25, 0x13, 0xba, 0xab, 0x34, 0x2d,</div><div class='del'>-	0xe1, 0xb9, 0x31, 0x89, 0x1c, 0x63, 0xfc, 0x3a, 0x23, 0xc5, 0xb8, 0x27,</div><div class='del'>-	0xf7, 0xb9, 0xeb, 0x7d, 0x93, 0x2e, 0x63, 0x23, 0xed, 0x0f, 0xcb, 0xd0,</div><div class='del'>-	0xc9, 0x47, 0x25, 0x3a, 0xc7, 0x77, 0xeb, 0xce, 0x2e, 0xa0, 0x8f, 0xb6,</div><div class='del'>-	0x48, 0x39, 0xce, 0x18, 0x6e, 0x54, 0x9d, 0x05, 0x9f, 0x1f, 0x5f, 0x90,</div><div class='del'>-	0x22, 0xb0, 0x42, 0x5e, 0xe9, 0x16, 0xa4, 0xab, 0xbe, 0xc4, 0xf4, 0x76,</div><div class='del'>-	0xee, 0x29, 0xf8, 0x98, 0xa1, 0x89, 0x72, 0x54, 0xdd, 0xc9, 0x39, 0x1f,</div><div class='del'>-	0x67, 0x5d, 0xf8, 0xef, 0x73, 0xc4, 0x19, 0xd0, 0x1d, 0x63, 0x12, 0x62,</div><div class='del'>-	0x3e, 0x3c, 0xb7, 0x86, 0x33, 0xa8, 0x13, 0x86, 0xdc, 0xb8, 0x44, 0x4e,</div><div class='del'>-	0xf9, 0x73, 0xe7, 0x3f, 0x52, 0x32, 0x16, 0x76, 0x4b, 0xf8, 0x18, 0x9f,</div><div class='del'>-	0xeb, 0xfd, 0x21, 0x62, 0x77, 0xd8, 0x86, 0xb3, 0x9f, 0x45, 0x7f, 0x7c,</div><div class='del'>-	0x97, 0xd1, 0xdf, 0xc2, 0x22, 0x5f, 0xf9, 0xc7, 0xfe, 0xcf, 0x04, 0xca,</div><div class='del'>-	0xfe, 0xff, 0x07, 0x3b, 0x97, 0x22, 0x9a, 0xb0, 0x4e, 0x00, 0x00, 0x00 };</div><div class='add'>+	0xcd, 0x7c, 0x0d, 0x70, 0x5b, 0xd7, 0x95, 0xde, 0xc1, 0x03, 0x40, 0x82,</div><div class='add'>+	0x10, 0x45, 0x3d, 0x52, 0x30, 0x0d, 0x3b, 0x4c, 0x82, 0x47, 0x3c, 0x92,</div><div class='add'>+	0xb0, 0xc9, 0x64, 0x9f, 0x64, 0x46, 0x66, 0x12, 0xac, 0x05, 0x03, 0xa4,</div><div class='add'>+	0x4c, 0x27, 0xea, 0x92, 0xb6, 0x19, 0x47, 0x6d, 0x35, 0x09, 0x17, 0x92,</div><div class='add'>+	0x12, 0xdb, 0x4d, 0xa7, 0x9a, 0xc6, 0xe9, 0x2a, 0x1b, 0xc7, 0x82, 0x41,</div><div class='add'>+	0xca, 0x51, 0x52, 0x8a, 0x60, 0x24, 0x4a, 0xf2, 0x74, 0xb3, 0xbb, 0x0c,</div><div class='add'>+	0x48, 0x4a, 0x8e, 0x03, 0x09, 0x96, 0xec, 0x75, 0xdc, 0xad, 0xb3, 0x62,</div><div class='add'>+	0x68, 0xad, 0xec, 0x4d, 0xb3, 0xad, 0x9d, 0x49, 0x3a, 0x9a, 0xa9, 0xb7,</div><div class='add'>+	0x55, 0x95, 0xa4, 0xf9, 0x99, 0xfe, 0xb8, 0x49, 0xa6, 0x75, 0xbb, 0xf1,</div><div class='add'>+	0xbe, 0x7e, 0xdf, 0x7d, 0xf7, 0x11, 0x20, 0xc5, 0x28, 0xde, 0xec, 0x64,</div><div class='add'>+	0x66, 0x39, 0x83, 0xb9, 0xef, 0xde, 0x77, 0x7f, 0xce, 0x3d, 0xf7, 0xfc,</div><div class='add'>+	0x7c, 0xe7, 0xde, 0xfb, 0x78, 0x87, 0x48, 0x54, 0xf4, 0xdf, 0x46, 0xfc,</div><div class='add'>+	0xfa, 0xff, 0xe9, 0x3f, 0xdb, 0xb3, 0xf5, 0xdd, 0xfd, 0xef, 0x66, 0xde,</div><div class='add'>+	0x30, 0x42, 0x21, 0xa6, 0x41, 0xfc, 0x62, 0xf8, 0x6d, 0xd5, 0xcf, 0xeb,</div><div class='add'>+	0xfd, 0x99, 0xf8, 0x6d, 0x0b, 0x88, 0x8c, 0xff, 0x44, 0x24, 0xb0, 0xe6,</div><div class='add'>+	0x5d, 0x64, 0x9d, 0xfa, 0xae, 0xfb, 0x4b, 0x3a, 0xd2, 0x7f, 0x06, 0x7e,</div><div class='add'>+	0x89, 0xeb, 0x57, 0x59, 0x19, 0xf7, 0xd7, 0xfd, 0x0b, 0xea, 0xe6, 0x1b,</div><div class='add'>+	0xf5, 0x4f, 0x22, 0x46, 0x5a, 0x46, 0xb2, 0xb6, 0x44, 0x82, 0xe9, 0x9f,</div><div class='add'>+	0x8f, 0xec, 0xb1, 0x45, 0x32, 0x95, 0xde, 0x44, 0x4e, 0xde, 0x74, 0x0b,</div><div class='add'>+	0xb1, 0x90, 0xb0, 0xfc, 0xed, 0xe9, 0x5f, 0x1c, 0xfc, 0xfa, 0xed, 0xd6,</div><div class='add'>+	0xeb, 0x73, 0x41, 0x89, 0x98, 0xe9, 0x37, 0xc4, 0xec, 0x96, 0x48, 0x07,</div><div class='add'>+	0xda, 0x7c, 0xa9, 0xe7, 0x49, 0x43, 0x5a, 0xfc, 0xbe, 0xcc, 0xf1, 0x60,</div><div class='add'>+	0x5a, 0x46, 0xf7, 0x4e, 0x1d, 0x74, 0x0d, 0x5b, 0x0a, 0x37, 0xa7, 0xed,</div><div class='add'>+	0x44, 0x51, 0x9a, 0x07, 0x26, 0xfb, 0x6f, 0x17, 0xe4, 0x47, 0xf7, 0x56,</div><div class='add'>+	0x22, 0x92, 0xad, 0x16, 0x9a, 0x0d, 0xdb, 0x46, 0x1a, 0x29, 0xbc, 0x2d,</div><div class='add'>+	0x2d, 0x91, 0x86, 0xf4, 0x6c, 0xe3, 0x25, 0x9b, 0xe3, 0x0f, 0x60, 0xfc,</div><div class='add'>+	0xb7, 0x49, 0xc8, 0x76, 0xdd, 0x49, 0x8c, 0xbf, 0xa3, 0xf2, 0xa6, 0xfb,</div><div class='add'>+	0x58, 0xc8, 0x1b, 0xdb, 0x48, 0x1f, 0x08, 0x32, 0x0d, 0xa4, 0x33, 0x23,</div><div class='add'>+	0x9d, 0x15, 0x95, 0x6f, 0xf0, 0xf2, 0x83, 0x3a, 0x1f, 0x89, 0x7a, 0xb4,</div><div class='add'>+	0x4b, 0x13, 0x68, 0x8f, 0x84, 0xd2, 0xe9, 0x26, 0xf4, 0x11, 0x09, 0xa7,</div><div class='add'>+	0x97, 0x7e, 0x7b, 0x51, 0xd5, 0x3b, 0xac, 0xeb, 0x3d, 0x10, 0xf6, 0xda,</div><div class='add'>+	0x4d, 0x8e, 0x74, 0x57, 0x98, 0xce, 0x8e, 0x74, 0xa9, 0xf4, 0x4b, 0x23,</div><div class='add'>+	0x49, 0x95, 0xce, 0xa9, 0x7a, 0x81, 0xf4, 0xc2, 0x88, 0xad, 0xd2, 0xb4,</div><div class='add'>+	0x2e, 0x1f, 0x1e, 0x49, 0xa8, 0x74, 0xa7, 0x4e, 0x47, 0x75, 0x3a, 0xa6,</div><div class='add'>+	0xd3, 0x5d, 0x3a, 0xdd, 0xad, 0xd3, 0x71, 0x9d, 0xee, 0xd5, 0xfd, 0x3c,</div><div class='add'>+	0xa0, 0xf3, 0x9f, 0xd0, 0xe9, 0x7e, 0x9d, 0x3e, 0xac, 0xd3, 0x03, 0x3a,</div><div class='add'>+	0x7d, 0x44, 0xd3, 0x55, 0xd0, 0xe9, 0x94, 0x2e, 0x9f, 0xd1, 0x74, 0x3e,</div><div class='add'>+	0x01, 0x7a, 0xfe, 0x71, 0xa3, 0x96, 0x5b, 0xcc, 0x37, 0x21, 0x7b, 0xa6,</div><div class='add'>+	0x22, 0x52, 0x2c, 0x05, 0x25, 0xa7, 0xd6, 0xf3, 0xe3, 0x61, 0x89, 0x46,</div><div class='add'>+	0x64, 0xa2, 0x1a, 0x91, 0x2b, 0x4a, 0x5c, 0x7f, 0xe4, 0x7e, 0xbd, 0xc7,</div><div class='add'>+	0x94, 0xa7, 0xab, 0x31, 0xb9, 0x50, 0x95, 0xc0, 0x68, 0x4f, 0x93, 0x18,</div><div class='add'>+	0x47, 0x6f, 0x96, 0x8c, 0x19, 0x90, 0xa0, 0xe2, 0x6b, 0x42, 0xb2, 0x53,</div><div class='add'>+	0xed, 0xc8, 0x5b, 0x71, 0x91, 0xc5, 0xb0, 0xb7, 0x8e, 0x11, 0x09, 0x9e,</div><div class='add'>+	0xe0, 0xba, 0x3c, 0x37, 0x72, 0x69, 0x36, 0x2e, 0xa1, 0xe9, 0x04, 0xfa,</div><div class='add'>+	0x6f, 0x96, 0xf0, 0x09, 0xe9, 0x08, 0x4a, 0x57, 0xfc, 0x63, 0xa8, 0x31,</div><div class='add'>+	0x58, 0x09, 0xc9, 0x50, 0x25, 0x80, 0xb5, 0x8a, 0x40, 0x4e, 0x9a, 0xf1,</div><div class='add'>+	0x33, 0xf1, 0x8b, 0xe1, 0x17, 0xc7, 0xef, 0xaf, 0xd0, 0x4f, 0x87, 0xe4,</div><div class='add'>+	0x2a, 0xec, 0x13, 0xe3, 0x96, 0x30, 0x7e, 0xc9, 0x32, 0xc7, 0x85, 0x34,</div><div class='add'>+	0xc5, 0xe5, 0xeb, 0x3d, 0x1e, 0x4d, 0x17, 0xaa, 0x91, 0x40, 0xf6, 0xa4,</div><div class='add'>+	0xec, 0xcf, 0x39, 0x92, 0x30, 0xec, 0xa8, 0xe4, 0xcd, 0x40, 0x62, 0x6f,</div><div class='add'>+	0xaa, 0x4d, 0x0a, 0x63, 0x78, 0x57, 0x92, 0x8c, 0x81, 0xbe, 0xf3, 0xa6,</div><div class='add'>+	0x8c, 0x7b, 0xef, 0x58, 0xf6, 0x7f, 0xa1, 0xaf, 0x96, 0x49, 0xc1, 0xbd,</div><div class='add'>+	0x50, 0xfa, 0xd7, 0x78, 0x66, 0x5f, 0x2f, 0x86, 0x3c, 0x9a, 0xdf, 0x40,</div><div class='add'>+	0x9e, 0xe5, 0xee, 0x26, 0x2f, 0xcf, 0x67, 0xd6, 0xf5, 0xc7, 0xf4, 0xe7,</div><div class='add'>+	0xca, 0xb1, 0x7b, 0x30, 0x5f, 0x8e, 0xbf, 0x32, 0x5f, 0xd0, 0xd1, 0x1c,</div><div class='add'>+	0xc8, 0x9d, 0x4c, 0xc8, 0xa1, 0xd2, 0x1d, 0x92, 0x75, 0x5c, 0x77, 0x8f,</div><div class='add'>+	0x23, 0x31, 0x43, 0xba, 0xcc, 0x1c, 0xde, 0x96, 0x2b, 0x12, 0xc8, 0x96,</div><div class='add'>+	0x7c, 0x7e, 0xb0, 0xdf, 0x10, 0xca, 0xda, 0x51, 0xbf, 0x25, 0x30, 0x78,</div><div class='add'>+	0x12, 0xb4, 0xa7, 0xc9, 0x17, 0xc8, 0xac, 0xd3, 0x15, 0xdf, 0x8b, 0xf1,</div><div class='add'>+	0xe6, 0x2b, 0x5d, 0xce, 0xb2, 0x98, 0xe8, 0xb3, 0x0d, 0x75, 0xc8, 0x23,</div><div class='add'>+	0xf6, 0xc5, 0x3e, 0xd9, 0x5f, 0x33, 0xda, 0xc6, 0xf0, 0x8e, 0x34, 0xb9,</div><div class='add'>+	0x6e, 0xd6, 0x31, 0x99, 0x97, 0x39, 0xf0, 0x6d, 0x8e, 0x7c, 0x8b, 0x76,</div><div class='add'>+	0xc8, 0xa9, 0x0a, 0xc7, 0x58, 0x8f, 0xee, 0x5b, 0xff, 0x9e, 0xd1, 0x1d,</div><div class='add'>+	0x47, 0xff, 0x31, 0xa4, 0x1b, 0x02, 0xd9, 0x63, 0x2e, 0xc6, 0x8f, 0xe3,</div><div class='add'>+	0x79, 0xbd, 0x39, 0x5c, 0xd1, 0x32, 0x18, 0x07, 0xed, 0x31, 0x39, 0xa7,</div><div class='add'>+	0xe4, 0x70, 0x83, 0x04, 0x21, 0x87, 0x5c, 0xe3, 0xd6, 0x13, 0xef, 0x91,</div><div class='add'>+	0x7c, 0xcc, 0x4a, 0xd0, 0x76, 0x76, 0x6e, 0x6d, 0xc2, 0x1c, 0xb5, 0x15,</div><div class='add'>+	0x9c, 0x8e, 0x41, 0x0e, 0x97, 0x5b, 0x0d, 0x94, 0x18, 0x62, 0x99, 0xff,</div><div class='add'>+	0x48, 0x0a, 0x92, 0x5b, 0xf8, 0xbd, 0x80, 0x44, 0x0d, 0xd4, 0xbb, 0x25,</div><div class='add'>+	0xe0, 0xf1, 0x80, 0xfc, 0xc9, 0x80, 0x3f, 0x01, 0xd1, 0xf6, 0x41, 0x3a,</div><div class='add'>+	0x2b, 0x7c, 0xdf, 0x9b, 0x30, 0xd4, 0xbb, 0x41, 0xbc, 0x0b, 0x49, 0x72,</div><div class='add'>+	0xab, 0xff, 0x7e, 0x10, 0xef, 0x6f, 0x96, 0x71, 0x13, 0xb4, 0x94, 0x9e,</div><div class='add'>+	0x37, 0xb2, 0xa0, 0xf1, 0xce, 0x90, 0x9a, 0x2b, 0xea, 0x8e, 0xd7, 0xf5,</div><div class='add'>+	0x33, 0x8e, 0x7a, 0xff, 0x0a, 0x63, 0x81, 0xde, 0x52, 0x02, 0xb4, 0xb4,</div><div class='add'>+	0x83, 0x16, 0xd2, 0x58, 0x30, 0xb2, 0xd5, 0x10, 0xf2, 0x93, 0x46, 0xee,</div><div class='add'>+	0xf4, 0x61, 0x3c, 0x8b, 0x69, 0xa4, 0x9f, 0x67, 0x8a, 0xf6, 0xbb, 0xeb,</div><div class='add'>+	0xda, 0xef, 0x46, 0x7b, 0x8e, 0xc1, 0xf6, 0x9e, 0xfc, 0x17, 0x94, 0x2c,</div><div class='add'>+	0x26, 0xae, 0xc3, 0x8f, 0xe0, 0xaf, 0xc1, 0x8f, 0x7f, 0xa3, 0xf9, 0xf1,</div><div class='add'>+	0xd7, 0xf2, 0x9b, 0xe7, 0xc7, 0x7f, 0xfa, 0x0d, 0xf1, 0x43, 0x24, 0x7f,</div><div class='add'>+	0x8c, 0xcf, 0x21, 0x29, 0x28, 0xbb, 0x45, 0xbd, 0xa5, 0xbc, 0xd3, 0x66,</div><div class='add'>+	0x91, 0x4f, 0x94, 0x63, 0xe8, 0x40, 0x35, 0x84, 0xf4, 0x49, 0xa4, 0x1b,</div><div class='add'>+	0x02, 0xa3, 0xc7, 0xae, 0x62, 0xfd, 0x5d, 0x31, 0xb7, 0xfa, 0x7e, 0xa3,</div><div class='add'>+	0x10, 0x37, 0xa5, 0x43, 0xcc, 0x77, 0xc3, 0x69, 0xb7, 0x5b, 0x66, 0x5e,</div><div class='add'>+	0x7e, 0x80, 0xf7, 0x6f, 0x06, 0x7c, 0xff, 0x9e, 0x9d, 0x6a, 0x7a, 0x23,</div><div class='add'>+	0xa3, 0x9e, 0xc2, 0xe4, 0x67, 0xc6, 0x48, 0x87, 0x02, 0xb9, 0x52, 0x62,</div><div class='add'>+	0xdc, 0x48, 0xc7, 0x60, 0xa7, 0x98, 0x1f, 0x08, 0x78, 0x34, 0xf7, 0xa3,</div><div class='add'>+	0xae, 0x6f, 0xb3, 0x7c, 0xda, 0xfb, 0x41, 0xfb, 0x5a, 0xdb, 0x95, 0x01,</div><div class='add'>+	0x2d, 0xa4, 0x81, 0x74, 0x15, 0x82, 0x9a, 0xf7, 0xe8, 0xe7, 0x80, 0xea,</div><div class='add'>+	0x27, 0x98, 0x1e, 0x10, 0xfa, 0xd0, 0xfc, 0x14, 0xf5, 0x80, 0xed, 0xd8,</div><div class='add'>+	0x97, 0x67, 0x93, 0xf3, 0x15, 0xbf, 0x8f, 0x42, 0x7d, 0x1f, 0xa0, 0x47,</div><div class='add'>+	0x36, 0x19, 0x76, 0x18, 0x6b, 0xcf, 0xae, 0x0e, 0xe3, 0xdd, 0x97, 0x24,</div><div class='add'>+	0x7b, 0xfa, 0x76, 0x03, 0x73, 0x40, 0xbf, 0xe4, 0xd1, 0x28, 0x6c, 0x36,</div><div class='add'>+	0xf5, 0x2c, 0x22, 0xb9, 0x18, 0xcb, 0x3e, 0xa2, 0xc7, 0x0d, 0x49, 0x46,</div><div class='add'>+	0xe5, 0xbf, 0xd2, 0x52, 0xa3, 0xe3, 0x79, 0x3d, 0x9f, 0x34, 0xe6, 0x43,</div><div class='add'>+	0x1a, 0xfc, 0xb9, 0xa4, 0xeb, 0xe6, 0xe2, 0xf3, 0x9a, 0xbc, 0x30, 0x61,</div><div class='add'>+	0xe3, 0x23, 0xda, 0x87, 0xb0, 0xdd, 0x64, 0xdd, 0xda, 0x4d, 0xa2, 0x0d,</div><div class='add'>+	0x79, 0x8f, 0x3a, 0x6b, 0xfc, 0x0a, 0x7d, 0xca, 0x20, 0xfa, 0x29, 0xce,</div><div class='add'>+	0x1a, 0x92, 0x73, 0xe0, 0xab, 0x9d, 0xb7, 0x69, 0x79, 0xad, 0xc9, 0x52,</div><div class='add'>+	0x78, 0x5d, 0x59, 0x3a, 0x68, 0x78, 0xf6, 0x1a, 0xbe, 0x05, 0xfe, 0x67,</div><div class='add'>+	0x62, 0xd6, 0x4a, 0xf9, 0xb2, 0x54, 0x9c, 0x7a, 0x2b, 0xb2, 0xe4, 0xb7,</div><div class='add'>+	0x8f, 0x40, 0x76, 0xfd, 0x31, 0xd6, 0xd2, 0xec, 0xd7, 0x01, 0x8d, 0xa5,</div><div class='add'>+	0xac, 0xc6, 0x28, 0x1c, 0xc7, 0xf3, 0x0d, 0x73, 0xab, 0x7c, 0xc3, 0x61,</div><div class='add'>+	0xb4, 0x95, 0x40, 0xae, 0xa7, 0x59, 0xf6, 0xcd, 0xfa, 0x7d, 0x1c, 0x56,</div><div class='add'>+	0x32, 0xbb, 0x77, 0xca, 0x32, 0x87, 0x82, 0x92, 0x19, 0x9a, 0x19, 0x90,</div><div class='add'>+	0xc1, 0x6a, 0x07, 0xd6, 0xf4, 0x0d, 0x17, 0xbe, 0xf3, 0xdd, 0x61, 0xb1,</div><div class='add'>+	0x61, 0x17, 0x31, 0xe7, 0x7e, 0xf0, 0xb8, 0x1a, 0x16, 0x23, 0xed, 0x20,</div><div class='add'>+	0xad, 0xc7, 0x58, 0xa1, 0xd0, 0xd0, 0xaa, 0x7c, 0x03, 0xea, 0xa0, 0xef,</div><div class='add'>+	0xfe, 0xb5, 0xf5, 0x20, 0x9f, 0xe0, 0x6d, 0xd6, 0x79, 0xd3, 0x85, 0x1f,</div><div class='add'>+	0xd6, 0x3e, 0x8b, 0xa5, 0xb4, 0x13, 0xbe, 0x8d, 0xf8, 0x10, 0xf4, 0x5b,</div><div class='add'>+	0xe9, 0x42, 0xc1, 0x48, 0xef, 0x47, 0x1f, 0xa2, 0xe4, 0xb4, 0x58, 0x7d,</div><div class='add'>+	0xda, 0xd7, 0x7b, 0x55, 0xbe, 0xa3, 0x9f, 0xb2, 0x37, 0x07, 0x4c, 0xc0,</div><div class='add'>+	0x39, 0x2d, 0x28, 0x5d, 0xcf, 0x99, 0x31, 0x99, 0x2c, 0x29, 0x4c, 0x23,</div><div class='add'>+	0xc9, 0xca, 0x1f, 0x49, 0xee, 0xb4, 0xc8, 0x37, 0xa7, 0x58, 0xef, 0x05,</div><div class='add'>+	0x5d, 0xef, 0x79, 0xd4, 0x4b, 0x26, 0x06, 0x03, 0x16, 0xfc, 0x80, 0x05,</div><div class='add'>+	0x35, 0xe9, 0x4d, 0x20, 0x35, 0x87, 0xf1, 0x1b, 0xa4, 0x93, 0x41, 0x3d,</div><div class='add'>+	0x0f, 0x03, 0x3d, 0x0f, 0x7e, 0x88, 0xdc, 0x53, 0x6a, 0x84, 0x3d, 0xf9,</div><div class='add'>+	0x2f, 0xa0, 0x35, 0x26, 0x5f, 0xc0, 0x3c, 0x2e, 0x4d, 0x11, 0x67, 0xbd,</div><div class='add'>+	0x20, 0x8b, 0x53, 0xc4, 0x5d, 0xcf, 0xcb, 0xe4, 0x54, 0xd2, 0xf9, 0x26,</div><div class='add'>+	0xf8, 0x7c, 0x4a, 0x38, 0x97, 0x5e, 0x07, 0x29, 0x30, 0xa0, 0x95, 0x78,</div><div class='add'>+	0x1c, 0xf6, 0xac, 0x67, 0xab, 0xd7, 0x5f, 0x97, 0xee, 0xcf, 0xae, 0x58,</div><div class='add'>+	0x72, 0xc5, 0xa4, 0x7d, 0xba, 0x56, 0xc7, 0xb3, 0x5a, 0xc7, 0x47, 0x9d,</div><div class='add'>+	0x0e, 0x31, 0xa0, 0xd7, 0x99, 0xb1, 0x02, 0xbc, 0x1f, 0xf5, 0xfa, 0x7f,</div><div class='add'>+	0x1b, 0x35, 0xfc, 0x33, 0x00, 0xac, 0x6a, 0x29, 0x7f, 0xf7, 0xb7, 0xd3,</div><div class='add'>+	0xf1, 0x7a, 0xdd, 0xe6, 0xf8, 0x2d, 0x68, 0x13, 0x42, 0x7a, 0x7d, 0xbd,</div><div class='add'>+	0x46, 0x1f, 0x75, 0x6d, 0x07, 0xa8, 0x17, 0x68, 0xf3, 0x07, 0xe0, 0x05,</div><div class='add'>+	0xf9, 0xff, 0x56, 0xf4, 0xb9, 0x37, 0xf8, 0x96, 0xf4, 0x79, 0xec, 0x7a,</div><div class='add'>+	0xfa, 0x5c, 0xaf, 0xcb, 0x67, 0xc9, 0x0b, 0x8c, 0x2d, 0x33, 0x9e, 0x6c,</div><div class='add'>+	0x75, 0x81, 0xd7, 0x09, 0xc8, 0x29, 0x68, 0x28, 0xfd, 0x8d, 0x9b, 0x09,</div><div class='add'>+	0x79, 0x78, 0xce, 0x93, 0x27, 0xd6, 0xf3, 0xeb, 0x78, 0xb6, 0x77, 0xb0,</div><div class='add'>+	0x7a, 0x45, 0xd9, 0xd9, 0x73, 0xca, 0xce, 0x5a, 0x87, 0x0b, 0x42, 0x79,</div><div class='add'>+	0xbb, 0x2d, 0x48, 0xbe, 0x3f, 0xed, 0x7c, 0x16, 0x34, 0x5a, 0x89, 0x84,</div><div class='add'>+	0xd1, 0x55, 0x30, 0x8c, 0xcf, 0xca, 0xfe, 0xf9, 0x87, 0x65, 0x7f, 0x89,</div><div class='add'>+	0x7d, 0xa4, 0xf1, 0xde, 0x46, 0x59, 0x13, 0x6c, 0x2d, 0x6d, 0xfa, 0x1b,</div><div class='add'>+	0x01, 0x6f, 0x2c, 0x03, 0xfe, 0x6b, 0x29, 0x70, 0x4f, 0xf5, 0x62, 0x20,</div><div class='add'>+	0x3b, 0x4f, 0xdd, 0x45, 0x79, 0xb5, 0xde, 0xe6, 0xfb, 0xf6, 0xbe, 0x66,</div><div class='add'>+	0xff, 0x06, 0x4b, 0x93, 0xc4, 0x80, 0x46, 0xd6, 0xe1, 0x9a, 0x51, 0x37,</div><div class='add'>+	0x2f, 0x98, 0xde, 0x9c, 0x3f, 0x09, 0x3e, 0x51, 0xaf, 0xc9, 0x37, 0xf8,</div><div class='add'>+	0xc0, 0x10, 0x75, 0x96, 0xcf, 0xe2, 0x06, 0xd3, 0xd4, 0x3b, 0x09, 0x05,</div><div class='add'>+	0x41, 0x46, 0x2e, 0xc6, 0x3a, 0x77, 0x80, 0xce, 0xb5, 0x3a, 0xcd, 0x75,</div><div class='add'>+	0x14, 0x6d, 0x43, 0x58, 0x36, 0x80, 0xe7, 0x4e, 0x19, 0x9f, 0xcf, 0x60,</div><div class='add'>+	0xcc, 0x3b, 0x75, 0xdf, 0xab, 0x7c, 0x0c, 0xfa, 0x48, 0xe8, 0xf5, 0xd8,</div><div class='add'>+	0xe0, 0xdb, 0x41, 0x94, 0x39, 0xba, 0xac, 0xa1, 0xae, 0xcc, 0x5f, 0xb7,</div><div class='add'>+	0x8f, 0x62, 0x7c, 0xfa, 0x8a, 0x61, 0x8d, 0x7f, 0x5c, 0x37, 0xc7, 0xf5,</div><div class='add'>+	0xee, 0xfb, 0x87, 0x42, 0xdd, 0xb8, 0x50, 0x2a, 0x98, 0x41, 0x25, 0xa3,</div><div class='add'>+	0x2f, 0xfc, 0x4e, 0x4d, 0x46, 0x81, 0x97, 0x55, 0x2f, 0xe4, 0x31, 0x69,</div><div class='add'>+	0x69, 0x06, 0x4f, 0x07, 0x41, 0x2b, 0x78, 0xd7, 0x1e, 0x00, 0xff, 0x9a,</div><div class='add'>+	0x25, 0x5f, 0x4d, 0xeb, 0x77, 0x2c, 0x0f, 0xc9, 0x68, 0xcc, 0xf7, 0x47,</div><div class='add'>+	0xb7, 0x99, 0x1e, 0xe6, 0x45, 0x9d, 0xd2, 0x8f, 0x83, 0x9e, 0x0e, 0x98,</div><div class='add'>+	0x92, 0x3f, 0x39, 0x08, 0x59, 0x23, 0x26, 0x6b, 0x80, 0xac, 0xc5, 0x94,</div><div class='add'>+	0xad, 0x37, 0x6c, 0xd6, 0xc7, 0xbb, 0xd3, 0xbf, 0x17, 0xf4, 0xda, 0xb0,</div><div class='add'>+	0x9e, 0xdf, 0xc6, 0x1f, 0xbb, 0x6d, 0xa5, 0xed, 0xa8, 0x63, 0x48, 0x50,</div><div class='add'>+	0x8d, 0x8f, 0xb2, 0xd3, 0xab, 0xc7, 0x37, 0xda, 0xfd, 0xf1, 0x1f, 0xd1,</div><div class='add'>+	0x7d, 0xb5, 0xd5, 0xf5, 0x15, 0xbb, 0xce, 0xf8, 0x78, 0x77, 0xfa, 0xa3,</div><div class='add'>+	0x9b, 0xbd, 0x36, 0xb1, 0xba, 0x36, 0xed, 0x6b, 0xda, 0xb0, 0xbe, 0x3f,</div><div class='add'>+	0x06, 0xde, 0x9d, 0xbe, 0xab, 0xd9, 0x6b, 0xc3, 0x7a, 0x0d, 0xf0, 0x6d,</div><div class='add'>+	0x7c, 0x47, 0xd9, 0xdf, 0x5f, 0x27, 0xfb, 0xfb, 0x21, 0xfb, 0xbe, 0x4c,</div><div class='add'>+	0xad, 0xc5, 0xc9, 0x7e, 0xbc, 0xc3, 0x38, 0x87, 0xd8, 0xaa, 0x16, 0xd7,</div><div class='add'>+	0x84, 0x4e, 0x34, 0x03, 0xb7, 0xb4, 0x30, 0x96, 0xd1, 0xb8, 0x98, 0xb1,</div><div class='add'>+	0x0d, 0x71, 0xb0, 0xd8, 0x21, 0xe9, 0x82, 0x8d, 0xea, 0x8a, 0xef, 0xa3,</div><div class='add'>+	0xc2, 0x55, 0x62, 0x0a, 0x2f, 0x67, 0xf4, 0x18, 0x8c, 0x6b, 0xc8, 0x77,</div><div class='add'>+	0xe6, 0x73, 0x2b, 0x71, 0x4e, 0x07, 0xe2, 0x20, 0xe2, 0x5d, 0xe2, 0x25,</div><div class='add'>+	0x9f, 0x7e, 0x9f, 0x9e, 0x03, 0x46, 0x4d, 0x27, 0x32, 0xc6, 0x60, 0x75,</div><div class='add'>+	0xd0, 0xf0, 0x74, 0x82, 0xef, 0x0f, 0x68, 0x9f, 0xb6, 0x96, 0xde, 0xb7,</div><div class='add'>+	0xaf, 0xa1, 0x97, 0xb8, 0x2a, 0x21, 0x13, 0x90, 0x91, 0xd0, 0x09, 0xda,</div><div class='add'>+	0xd8, 0xe7, 0x46, 0x16, 0x67, 0x89, 0x1f, 0xfa, 0xc0, 0x17, 0xd2, 0x4b,</div><div class='add'>+	0xfe, 0x51, 0x97, 0x5b, 0x60, 0x1f, 0xba, 0x52, 0x65, 0xd4, 0x67, 0x7c,</div><div class='add'>+	0x3d, 0xae, 0xe2, 0xb2, 0x66, 0xa4, 0x08, 0x9e, 0x40, 0xeb, 0x38, 0x68,</div><div class='add'>+	0x1d, 0xd7, 0x31, 0xd9, 0x3e, 0xd8, 0xef, 0xd0, 0xb4, 0x4f, 0xeb, 0x8d,</div><div class='add'>+	0x21, 0x7f, 0x6d, 0x56, 0xd3, 0x5e, 0xef, 0x77, 0x3c, 0xfc, 0x75, 0x4f,</div><div class='add'>+	0x0f, 0x65, 0xc6, 0x2a, 0x10, 0xb3, 0x8d, 0x2b, 0xf9, 0x00, 0xf6, 0x33,</div><div class='add'>+	0xc4, 0xd3, 0xa5, 0x16, 0xdf, 0xff, 0x72, 0x3e, 0xf4, 0xff, 0xd4, 0x79,</div><div class='add'>+	0x7f, 0x0e, 0xcd, 0xd2, 0x79, 0x82, 0x73, 0x58, 0xa1, 0x3f, 0xc6, 0xdd,</div><div class='add'>+	0x8d, 0xfd, 0xb0, 0x9b, 0x79, 0x45, 0xeb, 0x4e, 0xd9, 0x5b, 0x7a, 0xa7,</div><div class='add'>+	0xa6, 0xbf, 0x19, 0xf4, 0x8f, 0x42, 0xb6, 0x6b, 0x36, 0x23, 0x5f, 0x19,</div><div class='add'>+	0x43, 0xde, 0xc3, 0x62, 0xe4, 0x71, 0xbe, 0x42, 0xfb, 0xa1, 0xe7, 0x13,</div><div class='add'>+	0xe5, 0x7c, 0xd6, 0xda, 0x96, 0xf5, 0xf8, 0xfa, 0x8e, 0x35, 0x7c, 0x15,</div><div class='add'>+	0xcd, 0xd7, 0x88, 0x34, 0x9c, 0x50, 0x71, 0x2d, 0xfa, 0x25, 0xaf, 0xe9,</div><div class='add'>+	0xbf, 0x9e, 0x1b, 0x99, 0x9c, 0x95, 0xbe, 0xb0, 0x90, 0xbe, 0x38, 0xcb,</div><div class='add'>+	0xfa, 0x1b, 0xa4, 0xcb, 0xb9, 0x88, 0x79, 0xe7, 0xb1, 0xde, 0xc6, 0xb4,</div><div class='add'>+	0x27, 0xdf, 0xe4, 0x6f, 0xbe, 0x12, 0x45, 0x2c, 0xcd, 0xb1, 0xc9, 0x33,</div><div class='add'>+	0xd2, 0x6f, 0x2a, 0x7a, 0x56, 0xf8, 0x0d, 0xfa, 0x3e, 0x56, 0x59, 0xcb,</div><div class='add'>+	0xdb, 0x7a, 0x3b, 0xe3, 0xc7, 0xec, 0xdf, 0x35, 0x3d, 0xbd, 0x58, 0x2f,</div><div class='add'>+	0x66, 0x6f, 0x86, 0x7d, 0x0c, 0xd1, 0x36, 0x82, 0xf7, 0xdc, 0x5f, 0x59,</div><div class='add'>+	0x0a, 0x11, 0x83, 0x5f, 0x28, 0x85, 0x95, 0xcd, 0xcb, 0x3a, 0x2d, 0x5a,</div><div class='add'>+	0x3f, 0x6e, 0xd3, 0xbe, 0x23, 0xac, 0x6c, 0xb6, 0x18, 0x26, 0x71, 0x09,</div><div class='add'>+	0xca, 0x90, 0x9f, 0x67, 0xde, 0xa7, 0xe3, 0xde, 0x5d, 0x61, 0xfb, 0x0f,</div><div class='add'>+	0x43, 0xbe, 0x4d, 0xa8, 0xd1, 0x55, 0x1f, 0x93, 0xbb, 0xc0, 0x72, 0xef,</div><div class='add'>+	0x84, 0xdc, 0xde, 0x89, 0xb8, 0x3b, 0x21, 0xf9, 0x14, 0xf5, 0x68, 0x40,</div><div class='add'>+	0xc5, 0x26, 0x86, 0xbd, 0x0f, 0x65, 0x4d, 0x28, 0x83, 0x13, 0x33, 0x31,</div><div class='add'>+	0x7f, 0xfb, 0x77, 0x65, 0x1c, 0x32, 0x9e, 0x4f, 0xf5, 0x82, 0x0e, 0xda,</div><div class='add'>+	0x60, 0x60, 0x1c, 0x3b, 0xc5, 0xb8, 0x1d, 0x7f, 0xfd, 0x61, 0x6f, 0x5e,</div><div class='add'>+	0xbb, 0x90, 0x47, 0x0c, 0x9f, 0xea, 0xd4, 0x75, 0x36, 0x08, 0xf7, 0x7f,</div><div class='add'>+	0xf2, 0x66, 0x0b, 0xd2, 0xee, 0x35, 0x75, 0xdf, 0x8f, 0xfc, 0x7b, 0x75,</div><div class='add'>+	0xff, 0x05, 0xbc, 0xdf, 0x86, 0xdf, 0x20, 0xca, 0x6e, 0x47, 0x99, 0x83,</div><div class='add'>+	0xb2, 0xf7, 0x20, 0xff, 0x7e, 0xbd, 0x1f, 0xe0, 0xb7, 0x69, 0x41, 0xfe,</div><div class='add'>+	0x31, 0xbc, 0x87, 0xad, 0x30, 0x5f, 0xc6, 0xfb, 0xf7, 0xe2, 0xf7, 0xee,</div><div class='add'>+	0x35, 0x75, 0xda, 0xd6, 0xe4, 0x3f, 0xb5, 0xc2, 0x83, 0x0b, 0xa5, 0x9f,</div><div class='add'>+	0x69, 0xbb, 0x46, 0x79, 0x66, 0xfe, 0x94, 0x7e, 0xf7, 0xce, 0xd0, 0xea,</div><div class='add'>+	0xf2, 0x1d, 0x7e, 0xbe, 0x6e, 0x0d, 0x3b, 0xb1, 0x86, 0x3e, 0xc6, 0x7c,</div><div class='add'>+	0xbb, 0xf6, 0x5d, 0x6f, 0xf7, 0xe2, 0xf4, 0x92, 0xdf, 0x8e, 0x7e, 0xed,</div><div class='add'>+	0xce, 0x35, 0x63, 0x3c, 0xdf, 0x50, 0xcb, 0x37, 0x07, 0x86, 0x4e, 0xb2,</div><div class='add'>+	0xec, 0x72, 0xc3, 0xea, 0x3a, 0x6f, 0xd6, 0xe5, 0x37, 0x06, 0x86, 0x94,</div><div class='add'>+	0x8f, 0xbb, 0xab, 0x71, 0x75, 0x9d, 0x64, 0x63, 0x6d, 0x1e, 0x35, 0x5b,</div><div class='add'>+	0x18, 0x4a, 0x2f, 0x53, 0x8e, 0xa1, 0x0b, 0xdf, 0x1a, 0xc9, 0x4e, 0xb9,</div><div class='add'>+	0xee, 0x84, 0xb3, 0x14, 0x0f, 0x0a, 0x7d, 0x10, 0xb1, 0x2a, 0xcb, 0x5f,</div><div class='add'>+	0x46, 0x39, 0xb0, 0x4c, 0x75, 0x54, 0x68, 0x93, 0xd6, 0xc7, 0xa4, 0x09,</div><div class='add'>+	0x8d, 0x49, 0x55, 0x36, 0x94, 0x55, 0x18, 0xf2, 0xf9, 0x11, 0x60, 0x1e,</div><div class='add'>+	0xfd, 0xfc, 0x02, 0x9e, 0x13, 0xf5, 0xb8, 0x17, 0xfd, 0x2e, 0x8d, 0x64,</div><div class='add'>+	0x67, 0xe9, 0xf3, 0x2e, 0x8e, 0xec, 0x99, 0xa5, 0xce, 0x5f, 0x82, 0xce,</div><div class='add'>+	0x07, 0x64, 0x52, 0xf9, 0x3f, 0xd2, 0xc1, 0x76, 0x4b, 0x23, 0x9d, 0x0b,</div><div class='add'>+	0x4c, 0x97, 0x47, 0xec, 0x85, 0xa0, 0xec, 0x8b, 0x79, 0x6d, 0x99, 0x4f,</div><div class='add'>+	0x2c, 0xf8, 0x3a, 0x10, 0x95, 0x70, 0x9a, 0x32, 0x69, 0xa5, 0x80, 0xbd,</div><div class='add'>+	0x31, 0x9f, 0x27, 0x47, 0x26, 0x6d, 0xca, 0xe7, 0x87, 0x1a, 0xa4, 0x25,</div><div class='add'>+	0x2a, 0x0d, 0xca, 0xde, 0x3c, 0xa5, 0xc7, 0xba, 0x84, 0xb1, 0x36, 0x29,</div><div class='add'>+	0x7d, 0xca, 0xda, 0xa1, 0x38, 0xc6, 0x39, 0x68, 0xd8, 0xbd, 0x18, 0x8f,</div><div class='add'>+	0x91, 0x72, 0x87, 0x4c, 0x54, 0xa9, 0x37, 0xdb, 0xc2, 0xb5, 0xf8, 0xf8,</div><div class='add'>+	0x3c, 0xda, 0xf9, 0x71, 0x19, 0xc7, 0x2b, 0x03, 0x97, 0x41, 0x96, 0xd3,</div><div class='add'>+	0x96, 0x99, 0x0d, 0xc2, 0xcf, 0xcf, 0xfa, 0x75, 0x48, 0xd3, 0xd9, 0x91,</div><div class='add'>+	0xe4, 0x42, 0x12, 0x7d, 0x75, 0xd0, 0x86, 0xc1, 0x76, 0x05, 0xf1, 0x63,</div><div class='add'>+	0xdf, 0x6c, 0x07, 0x5f, 0x34, 0x40, 0x3f, 0x72, 0x1e, 0x7e, 0xa4, 0x43,</div><div class='add'>+	0x0e, 0x95, 0x54, 0x1f, 0x09, 0xf6, 0x51, 0xd4, 0x6d, 0x3b, 0x17, 0x1a,</div><div class='add'>+	0x10, 0xdb, 0x24, 0xcd, 0x17, 0xa5, 0xd6, 0x76, 0x48, 0xbc, 0x76, 0x5e,</div><div class='add'>+	0xdf, 0x3f, 0x77, 0x33, 0xb1, 0x7a, 0xdd, 0x8f, 0x4a, 0x10, 0x74, 0xe4,</div><div class='add'>+	0xd0, 0x07, 0xc7, 0xaf, 0xf5, 0xed, 0xf7, 0x97, 0x34, 0x97, 0xaf, 0xe9,</div><div class='add'>+	0x6b, 0x93, 0x8e, 0xb9, 0xac, 0x44, 0xee, 0xd7, 0x1a, 0x5b, 0xc5, 0x00,</div><div class='add'>+	0x90, 0x07, 0x09, 0xe5, 0x7a, 0x60, 0x17, 0xab, 0x03, 0x5a, 0x46, 0x5e,</div><div class='add'>+	0x40, 0x59, 0x7d, 0x6c, 0xe3, 0xc9, 0x57, 0x01, 0x98, 0xae, 0x08, 0x3d,</div><div class='add'>+	0x0f, 0xa6, 0x33, 0xad, 0xde, 0x5e, 0xd3, 0xf5, 0xe2, 0x19, 0xc8, 0x0d,</div><div class='add'>+	0xfa, 0x2c, 0xae, 0xb4, 0xe5, 0x9c, 0x5e, 0x18, 0xb9, 0x34, 0x15, 0xc7,</div><div class='add'>+	0x9c, 0x3c, 0xbf, 0xe0, 0xf1, 0x9a, 0x3e, 0x27, 0x20, 0x8b, 0x76, 0x02,</div><div class='add'>+	0x71, 0x33, 0x7d, 0x7c, 0x42, 0x5e, 0xb2, 0x7d, 0xff, 0x43, 0x5f, 0x84,</div><div class='add'>+	0xfa, 0x55, 0xd2, 0x46, 0xda, 0xcf, 0x63, 0x6e, 0xae, 0xcc, 0x38, 0x9e,</div><div class='add'>+	0x0c, 0xf6, 0xc0, 0x8f, 0x7c, 0x23, 0x64, 0x1d, 0x66, 0x7c, 0x75, 0x25,</div><div class='add'>+	0x54, 0x3f, 0x1f, 0x1f, 0x2b, 0x3c, 0xaf, 0xf7, 0x7e, 0xcf, 0x6b, 0x79,</div><div class='add'>+	0x59, 0x82, 0xbc, 0xf4, 0x26, 0x4c, 0xe9, 0x06, 0xed, 0xa8, 0xd3, 0xd7,</div><div class='add'>+	0x85, 0x38, 0x87, 0x31, 0x74, 0x1c, 0xf4, 0x98, 0xb0, 0x1d, 0x9b, 0x34,</div><div class='add'>+	0x66, 0xff, 0x77, 0x61, 0xfa, 0xb6, 0x56, 0xb5, 0xaf, 0x7c, 0x5e, 0xc9,</div><div class='add'>+	0xb3, 0x27, 0xdf, 0x41, 0xfd, 0xde, 0x97, 0xa9, 0x20, 0x21, 0x8d, 0xd4,</div><div class='add'>+	0xf6, 0x4f, 0x59, 0xff, 0x39, 0x5d, 0xff, 0x59, 0xd4, 0x0f, 0x60, 0x4e,</div><div class='add'>+	0xae, 0xbb, 0x57, 0xd1, 0xfb, 0x1c, 0xf8, 0x1e, 0x94, 0xe2, 0x8a, 0xcc,</div><div class='add'>+	0x3f, 0x07, 0x99, 0xa7, 0x7c, 0x9f, 0x87, 0xbe, 0x82, 0xf8, 0x7b, 0x29,</div><div class='add'>+	0xf7, 0x65, 0x19, 0x3c, 0x9d, 0x6b, 0xe0, 0x5e, 0x67, 0xc2, 0x60, 0xec,</div><div class='add'>+	0x49, 0x99, 0xec, 0x90, 0xc7, 0x4b, 0x49, 0x73, 0xa2, 0x6e, 0x2d, 0x77,</div><div class='add'>+	0xac, 0x5a, 0x4b, 0xca, 0x80, 0xaa, 0x9f, 0x62, 0xfd, 0x72, 0x9d, 0x0c,</div><div class='add'>+	0xcc, 0xcf, 0x5e, 0xaf, 0x1d, 0x65, 0x80, 0xed, 0xd6, 0xc3, 0xe9, 0xdc,</div><div class='add'>+	0x1b, 0x74, 0xdd, 0x45, 0x87, 0xfb, 0xb8, 0x8d, 0x52, 0x50, 0x32, 0x16,</div><div class='add'>+	0x90, 0xa2, 0x43, 0xbd, 0xca, 0x26, 0x42, 0x62, 0x01, 0x2b, 0x7d, 0x10,</div><div class='add'>+	0x74, 0x66, 0x52, 0x61, 0xf1, 0xf6, 0x12, 0xc6, 0xb1, 0x06, 0x4b, 0xa6,</div><div class='add'>+	0xeb, 0x5e, 0xb2, 0x45, 0xca, 0x88, 0x3d, 0x17, 0x91, 0x16, 0x2b, 0xd0,</div><div class='add'>+	0xd9, 0x68, 0x08, 0x36, 0xc0, 0x97, 0xf1, 0x88, 0xcc, 0xa1, 0xce, 0x3c,</div><div class='add'>+	0xde, 0x3d, 0x5e, 0xf1, 0x25, 0xc6, 0x75, 0x0d, 0xf0, 0x68, 0x8f, 0xfd,</div><div class='add'>+	0xff, 0xdc, 0x7c, 0xac, 0xbe, 0xae, 0x8f, 0x89, 0x89, 0x65, 0x89, 0x4d,</div><div class='add'>+	0x89, 0x29, 0xf9, 0x8e, 0x38, 0xf1, 0x20, 0x68, 0xa1, 0xce, 0xb6, 0x48,</div><div class='add'>+	0x24, 0x6d, 0xc5, 0x87, 0xc5, 0xf7, 0xfd, 0x97, 0x21, 0x4b, 0x05, 0xb7,</div><div class='add'>+	0xd1, 0xee, 0x90, 0x67, 0x20, 0x37, 0xe7, 0x57, 0x70, 0x4c, 0x02, 0x72,</div><div class='add'>+	0x44, 0x3f, 0xea, 0xca, 0x39, 0xc7, 0x4e, 0x7c, 0x0e, 0xe9, 0xb7, 0x9d,</div><div class='add'>+	0xdf, 0x22, 0xdf, 0x9e, 0x10, 0xe9, 0x43, 0x2c, 0x04, 0xbb, 0x3e, 0xe3,</div><div class='add'>+	0x63, 0xfb, 0x16, 0xc6, 0x64, 0x5a, 0x96, 0xae, 0xa0, 0x4f, 0xcb, 0x34,</div><div class='add'>+	0x00, 0x6a, 0xef, 0x42, 0x3d, 0x4f, 0x37, 0xfc, 0xb2, 0x83, 0xa8, 0x4b,</div><div class='add'>+	0x1a, 0x18, 0x2f, 0x7f, 0x07, 0x3a, 0xeb, 0xba, 0xf7, 0x39, 0x8b, 0x75,</div><div class='add'>+	0xb6, 0xe6, 0x39, 0xac, 0xbf, 0x92, 0xf3, 0xfe, 0x56, 0xe1, 0xfe, 0xaa,</div><div class='add'>+	0xf4, 0xb5, 0xa9, 0x78, 0x8e, 0xcf, 0x90, 0xf7, 0x7e, 0x62, 0xa1, 0x84,</div><div class='add'>+	0xc2, 0x9a, 0xc4, 0x0d, 0xe7, 0xc1, 0xfb, 0x4f, 0x2a, 0x4c, 0x43, 0xfc,</div><div class='add'>+	0x06, 0xfa, 0x4b, 0xc4, 0x14, 0x1e, 0x96, 0xf6, 0x70, 0x1d, 0xb1, 0x45,</div><div class='add'>+	0x0a, 0x6b, 0xe3, 0xe3, 0x0b, 0xb6, 0x65, 0x3d, 0xb6, 0xad, 0x5f, 0x3f,</div><div class='add'>+	0xd6, 0xd9, 0x14, 0xc8, 0x1d, 0xa3, 0x3c, 0xd3, 0x3f, 0xb6, 0xca, 0xbe,</div><div class='add'>+	0x54, 0x23, 0xf8, 0xde, 0xa6, 0xfd, 0xf8, 0xfb, 0x80, 0xd9, 0x80, 0xbd,</div><div class='add'>+	0x4d, 0xcb, 0xa9, 0xd9, 0x9e, 0xf7, 0xa0, 0xec, 0x17, 0xe0, 0x3f, 0xcb,</div><div class='add'>+	0xf6, 0x37, 0x78, 0x7e, 0xf2, 0x61, 0xe8, 0xf2, 0xdc, 0x26, 0x6f, 0xef,</div><div class='add'>+	0x8a, 0xeb, 0xe0, 0xe3, 0x04, 0x1f, 0xf7, 0x99, 0x1a, 0xef, 0x73, 0x6d,</div><div class='add'>+	0xbc, 0x7d, 0x2e, 0x43, 0xd5, 0x65, 0xac, 0x55, 0x1f, 0x5b, 0x52, 0x87,</div><div class='add'>+	0x5d, 0xf7, 0x9c, 0xe3, 0xe3, 0xc8, 0xed, 0xf0, 0xa1, 0x21, 0xcd, 0xeb,</div><div class='add'>+	0x66, 0xf0, 0x9a, 0x18, 0x25, 0x22, 0x89, 0x36, 0x62, 0x8a, 0x07, 0x1b,</div><div class='add'>+	0x6a, 0x58, 0xe6, 0x6f, 0xdc, 0xa0, 0xcd, 0x78, 0x8f, 0x38, 0x86, 0xb4,</div><div class='add'>+	0x6f, 0xd7, 0x78, 0x86, 0xd8, 0xe6, 0x31, 0x8c, 0x11, 0x94, 0x44, 0x3b,</div><div class='add'>+	0xf3, 0x7f, 0xa9, 0xdb, 0xf0, 0xd9, 0x95, 0xee, 0xad, 0xf5, 0xf2, 0x3c,</div><div class='add'>+	0x00, 0x3a, 0x39, 0x1f, 0x7f, 0xef, 0xb5, 0x43, 0xd9, 0x93, 0x9a, 0x5c,</div><div class='add'>+	0xf8, 0x34, 0xf9, 0xe3, 0x92, 0xb6, 0xb8, 0xb4, 0x81, 0xb6, 0x7b, 0xe0,</div><div class='add'>+	0x53, 0xb6, 0xb6, 0xb1, 0x4f, 0x7f, 0xec, 0x7a, 0x9a, 0xea, 0xf1, 0x55,</div><div class='add'>+	0x02, 0x63, 0x34, 0xca, 0xd6, 0x76, 0xf2, 0xae, 0x43, 0xf9, 0x96, 0xda,</div><div class='add'>+	0x7a, 0xd0, 0xf7, 0x73, 0xec, 0xb5, 0xe5, 0xef, 0xad, 0xa3, 0x6b, 0x2d,</div><div class='add'>+	0xe6, 0xdb, 0x86, 0x77, 0xa4, 0xc9, 0x84, 0x5d, 0x72, 0x65, 0x87, 0xe3,</div><div class='add'>+	0xe3, 0xbb, 0x7a, 0x3a, 0x88, 0xf1, 0x48, 0x33, 0x69, 0xf0, 0x31, 0x39,</div><div class='add'>+	0x7f, 0x5c, 0x1b, 0xd2, 0x93, 0xd6, 0xe7, 0x44, 0xfb, 0xf5, 0xbc, 0x6e,</div><div class='add'>+	0xd3, 0x75, 0x92, 0x68, 0xfb, 0xc7, 0x98, 0x03, 0x9f, 0x39, 0x0f, 0x1f,</div><div class='add'>+	0x1b, 0x26, 0xbd, 0x7e, 0xa2, 0xeb, 0xc5, 0x00, 0xd4, 0x19, 0x9f, 0x4f,</div><div class='add'>+	0x6d, 0x7a, 0x8d, 0xb6, 0xaf, 0x19, 0xd7, 0x72, 0x56, 0xdb, 0x91, 0xf7,</div><div class='add'>+	0xd4, 0xcd, 0xaf, 0x4f, 0x0a, 0xf3, 0x94, 0x8b, 0x77, 0x21, 0xf5, 0x63,</div><div class='add'>+	0xa3, 0x7e, 0xf8, 0x91, 0x0c, 0x62, 0x21, 0xc6, 0x48, 0xd7, 0xc4, 0x47,</div><div class='add'>+	0x3c, 0x47, 0x1c, 0xcb, 0x23, 0x5e, 0x56, 0x7e, 0xc4, 0xf3, 0x91, 0xc8,</div><div class='add'>+	0xc3, 0x9e, 0x54, 0xef, 0xa5, 0x8c, 0x8d, 0x8d, 0x57, 0x9c, 0xb1, 0xbd,</div><div class='add'>+	0x95, 0xfe, 0x31, 0xc6, 0x11, 0x9e, 0xcc, 0xa1, 0x7e, 0x45, 0xc6, 0x0d,</div><div class='add'>+	0xb4, 0xcb, 0xaa, 0x76, 0x6a, 0x1f, 0x68, 0x9d, 0x7e, 0x84, 0xfa, 0x38,</div><div class='add'>+	0xee, 0x8d, 0x15, 0x19, 0xcb, 0xc1, 0x06, 0xcd, 0xcf, 0xc0, 0xc7, 0xd9,</div><div class='add'>+	0x56, 0x86, 0x72, 0xb9, 0xc7, 0xb1, 0x86, 0x95, 0xec, 0xc5, 0xac, 0x51,</div><div class='add'>+	0xae, 0x65, 0x79, 0xe6, 0x1d, 0xb0, 0xa1, 0xae, 0xdc, 0x0d, 0x5b, 0xf8,</div><div class='add'>+	0x10, 0x64, 0x55, 0xce, 0xc0, 0x10, 0x9e, 0x81, 0xf1, 0x3a, 0x13, 0x13,</div><div class='add'>+	0xe3, 0x78, 0x87, 0x84, 0x8f, 0xc4, 0x25, 0x74, 0x84, 0xb1, 0x58, 0xd2,</div><div class='add'>+	0xbc, 0x5b, 0x04, 0x3e, 0xf1, 0xc5, 0xdb, 0x0d, 0xb1, 0x06, 0x32, 0x92,</div><div class='add'>+	0x44, 0x3c, 0xd9, 0x6b, 0x96, 0x91, 0x16, 0x25, 0x99, 0x3a, 0x8d, 0xbe,</div><div class='add'>+	0xc2, 0x67, 0x50, 0x17, 0xed, 0x9a, 0x16, 0x13, 0xf8, 0xb5, 0x4b, 0x74,</div><div class='add'>+	0xd1, 0xd3, 0x95, 0xe8, 0xe2, 0xea, 0x3d, 0x94, 0xc1, 0x95, 0x3d, 0x14,</div><div class='add'>+	0xbe, 0x7f, 0x43, 0xef, 0xfd, 0x3c, 0xab, 0xe3, 0x1a, 0xca, 0x08, 0x7d,</div><div class='add'>+	0x9b, 0x8a, 0xcd, 0x60, 0xc7, 0x9f, 0x45, 0x2c, 0x6c, 0x4b, 0xae, 0x04,</div><div class='add'>+	0xcc, 0x9e, 0x76, 0xe5, 0x29, 0xa7, 0xe0, 0x66, 0xfb, 0x5d, 0xb9, 0xec,</div><div class='add'>+	0xd8, 0x85, 0xbc, 0x58, 0x6f, 0xd0, 0xde, 0xfd, 0x4f, 0xe7, 0xfd, 0xb2,</div><div class='add'>+	0xab, 0xd5, 0xda, 0x95, 0x09, 0x14, 0xdc, 0x66, 0x3b, 0x2a, 0x37, 0xa5,</div><div class='add'>+	0x0f, 0xca, 0x9e, 0x2d, 0x4b, 0x66, 0x50, 0x32, 0x37, 0x01, 0x17, 0xc6,</div><div class='add'>+	0xf3, 0xca, 0x56, 0xbd, 0xa6, 0xe2, 0xeb, 0x07, 0xba, 0x0e, 0xca, 0xc6,</div><div class='add'>+	0x2d, 0x96, 0x79, 0x35, 0x48, 0xcc, 0x76, 0x10, 0xb1, 0x80, 0x15, 0xcf,</div><div class='add'>+	0x05, 0x6d, 0x73, 0xa7, 0x58, 0xc3, 0x9f, 0x16, 0x9e, 0xdb, 0xda, 0xd2,</div><div class='add'>+	0x79, 0xc4, 0x8e, 0x7f, 0x22, 0xd0, 0xbd, 0xff, 0x13, 0x8c, 0xef, 0xce,</div><div class='add'>+	0x30, 0xef, 0x4a, 0x64, 0x8b, 0x89, 0xe7, 0x98, 0x74, 0x1e, 0x4f, 0x48,</div><div class='add'>+	0x12, 0x7c, 0xe9, 0x51, 0x3c, 0xe1, 0xf9, 0x51, 0x5c, 0xba, 0x8f, 0x10,</div><div class='add'>+	0x43, 0x29, 0xde, 0xf4, 0x80, 0x37, 0x29, 0xf0, 0x06, 0x31, 0x55, 0xaf,</div><div class='add'>+	0x79, 0x15, 0xe9, 0xb2, 0x24, 0x07, 0x7e, 0x00, 0xde, 0xf4, 0x80, 0x37,</div><div class='add'>+	0xdd, 0x67, 0x12, 0x68, 0x8f, 0x3e, 0x16, 0x3b, 0x91, 0x46, 0xe5, 0x83,</div><div class='add'>+	0x37, 0xb4, 0xe3, 0xd9, 0x96, 0xe4, 0x91, 0x08, 0xc6, 0x08, 0xc8, 0x8e,</div><div class='add'>+	0xae, 0x82, 0x0c, 0x6d, 0x41, 0x6c, 0x16, 0x3b, 0x28, 0x17, 0xe1, 0x87,</div><div class='add'>+	0x4a, 0x88, 0x11, 0x9e, 0x1a, 0xb0, 0x46, 0x97, 0x60, 0x4b, 0xab, 0xf7,</div><div class='add'>+	0xb8, 0xf2, 0xf2, 0x96, 0xbf, 0x70, 0xe3, 0x37, 0x58, 0xbb, 0x24, 0xd0,</div><div class='add'>+	0x2f, 0x93, 0x25, 0xe5, 0x1f, 0xe2, 0xd9, 0xa0, 0xc2, 0x65, 0x98, 0x63,</div><div class='add'>+	0x01, 0x3e, 0x86, 0xe7, 0xd1, 0x36, 0x6c, 0xfd, 0xa7, 0xe5, 0xa1, 0xb9,</div><div class='add'>+	0x09, 0xfc, 0x10, 0x6f, 0x4e, 0xb1, 0xee, 0x7e, 0xc4, 0x73, 0x0f, 0xcb,</div><div class='add'>+	0xbe, 0x29, 0x60, 0xc7, 0x34, 0xe8, 0xee, 0xb7, 0x11, 0xcf, 0xcd, 0x37,</div><div class='add'>+	0x4a, 0x0b, 0xca, 0xc0, 0xdb, 0xd1, 0xea, 0xda, 0x38, 0x6e, 0x09, 0xeb,</div><div class='add'>+	0x30, 0x20, 0x7f, 0x56, 0xed, 0x97, 0xaf, 0x55, 0xfb, 0xe4, 0x4f, 0xe0,</div><div class='add'>+	0x5b, 0xce, 0x57, 0x3b, 0xa0, 0x2b, 0x71, 0xac, 0x49, 0x1a, 0xeb, 0xe3,</div><div class='add'>+	0xc8, 0x73, 0xd5, 0x94, 0x3c, 0x0b, 0x5e, 0x3d, 0x83, 0xdf, 0x50, 0x29,</div><div class='add'>+	0x25, 0x3b, 0x4a, 0x7d, 0x7a, 0x8d, 0xb8, 0x3e, 0x36, 0xe8, 0xb1, 0x31,</div><div class='add'>+	0x77, 0xeb, 0xc9, 0x02, 0xf4, 0x6f, 0xbe, 0x6a, 0xbf, 0x5e, 0x96, 0x8f,</div><div class='add'>+	0x37, 0x72, 0x8f, 0xf7, 0xd4, 0x8a, 0x7f, 0x29, 0xb8, 0xa6, 0x6d, 0x1d,</div><div class='add'>+	0x1e, 0xc7, 0x3a, 0x94, 0xa1, 0xa7, 0xa3, 0x8a, 0xf7, 0x35, 0xdf, 0x53,</div><div class='add'>+	0xf6, 0x7c, 0x8f, 0x3f, 0xbf, 0x99, 0xbc, 0x7c, 0x5b, 0xb2, 0x47, 0x27,</div><div class='add'>+	0x65, 0xcf, 0x31, 0x57, 0x3e, 0xec, 0xb8, 0x90, 0x63, 0xda, 0xe2, 0x7e,</div><div class='add'>+	0xda, 0xf8, 0xc4, 0x78, 0xd0, 0x50, 0xb1, 0x94, 0x87, 0x5b, 0x7a, 0x37,</div><div class='add'>+	0x43, 0x67, 0x53, 0x19, 0x63, 0x42, 0x92, 0x47, 0x27, 0xa4, 0xf3, 0x28,</div><div class='add'>+	0x64, 0xc1, 0x61, 0x5f, 0x4b, 0xa6, 0x71, 0x8d, 0x3c, 0x70, 0x1c, 0x6b,</div><div class='add'>+	0x20, 0x27, 0xb6, 0xf9, 0xba, 0xa4, 0x30, 0xfe, 0x01, 0xe9, 0x42, 0x1b,</div><div class='add'>+	0x1b, 0x6d, 0xae, 0xaa, 0xb1, 0x9b, 0x31, 0x76, 0xa3, 0x1c, 0x8a, 0x59,</div><div class='add'>+	0x90, 0x35, 0xfa, 0xf0, 0xff, 0x25, 0xd9, 0x32, 0xd3, 0x9f, 0x4a, 0xf6,</div><div class='add'>+	0xd4, 0x47, 0x23, 0x12, 0xe5, 0x33, 0x4c, 0xc3, 0x09, 0x96, 0x77, 0x22,</div><div class='add'>+	0x65, 0xb9, 0x8d, 0x38, 0xfa, 0xe7, 0x92, 0x3d, 0xcb, 0xb1, 0x5f, 0x47,</div><div class='add'>+	0xf9, 0xcb, 0x92, 0x9d, 0xfe, 0x05, 0xf2, 0x17, 0x91, 0xbe, 0x81, 0x74,</div><div class='add'>+	0x54, 0x3a, 0xa7, 0x25, 0x90, 0x3d, 0xfb, 0x2d, 0xe4, 0x43, 0x48, 0x0f,</div><div class='add'>+	0xa1, 0xde, 0x76, 0xd0, 0xf7, 0xa7, 0xe8, 0x2f, 0x03, 0x9b, 0xf7, 0x3b,</div><div class='add'>+	0x9a, 0x7e, 0x96, 0xb3, 0x8c, 0xef, 0x0e, 0xc1, 0xa6, 0xfd, 0x67, 0xd8,</div><div class='add'>+	0x34, 0xfd, 0x3c, 0xcf, 0x3c, 0x6d, 0x1b, 0x9f, 0x27, 0xc0, 0x93, 0x03,</div><div class='add'>+	0xc8, 0xbb, 0xf2, 0xb0, 0x43, 0x7f, 0xb3, 0x4d, 0xc6, 0xcc, 0x82, 0x1b,</div><div class='add'>+	0x05, 0xae, 0x68, 0x86, 0x1e, 0x4c, 0x6c, 0x5d, 0x5f, 0x0f, 0x0e, 0x77,</div><div class='add'>+	0x1f, 0x94, 0xa6, 0x2d, 0xfe, 0xfc, 0xfd, 0xf9, 0xda, 0xe6, 0x4f, 0x14,</div><div class='add'>+	0x1f, 0xac, 0xc2, 0x27, 0x84, 0xf3, 0xb0, 0xe3, 0x5f, 0x30, 0xba, 0x77,</div><div class='add'>+	0x3d, 0x04, 0x3d, 0x30, 0xce, 0x32, 0xef, 0xe9, 0x81, 0x71, 0x16, 0xb6,</div><div class='add'>+	0xe1, 0x04, 0x62, 0xc4, 0x13, 0x1d, 0xd2, 0x38, 0x5d, 0xd3, 0x83, 0x86,</div><div class='add'>+	0xe9, 0x5f, 0xad, 0x07, 0x8d, 0x67, 0x51, 0xef, 0x2c, 0x79, 0x86, 0x3e,</div><div class='add'>+	0x4e, 0x91, 0x67, 0xed, 0x48, 0x3f, 0x8d, 0xb9, 0x92, 0xf6, 0x46, 0xd0,</div><div class='add'>+	0xee, 0xe1, 0xa2, 0xdb, 0x21, 0xef, 0x0f, 0x6c, 0x39, 0xa0, 0xcb, 0xff,</div><div class='add'>+	0xd2, 0x1d, 0x8e, 0x59, 0x73, 0x12, 0x20, 0x4f, 0x51, 0xb7, 0x4c, 0x1e,</div><div class='add'>+	0xde, 0xdc, 0x24, 0xd1, 0xfd, 0xd2, 0x49, 0xfe, 0x95, 0x77, 0x22, 0x5f,</div><div class='add'>+	0x70, 0xc3, 0x76, 0xb3, 0xe6, 0x27, 0x70, 0x52, 0x3f, 0xcb, 0x5f, 0x85,</div><div class='add'>+	0xcc, 0x10, 0xaf, 0xbe, 0x26, 0x7b, 0xa6, 0x5c, 0x19, 0x73, 0x38, 0xff,</div><div class='add'>+	0xef, 0x63, 0xfe, 0x99, 0x2d, 0x31, 0x59, 0x4a, 0xc4, 0xc0, 0x93, 0x79,</div><div class='add'>+	0xd8, 0xf6, 0x8b, 0xe2, 0xf1, 0x81, 0xe7, 0x02, 0x3b, 0xc4, 0x8e, 0x0f,</div><div class='add'>+	0x89, 0x9d, 0xfa, 0x01, 0xf8, 0x30, 0x04, 0xd9, 0xcf, 0x55, 0x29, 0x3b,</div><div class='add'>+	0xaf, 0xc8, 0x20, 0x64, 0xe2, 0x7b, 0x8e, 0x95, 0x02, 0x16, 0x82, 0xbd,</div><div class='add'>+	0xa0, 0x5c, 0x50, 0x26, 0x5a, 0x94, 0x4d, 0x3a, 0xe1, 0x58, 0x4f, 0x94,</div><div class='add'>+	0xe5, 0x56, 0x39, 0xd1, 0x46, 0xda, 0xf1, 0x6e, 0x5a, 0xf9, 0x8b, 0xd4,</div><div class='add'>+	0xb8, 0xd1, 0x05, 0x1b, 0x9d, 0x12, 0xb3, 0xbb, 0xd8, 0xe8, 0xdf, 0x21,</div><div class='add'>+	0xc9, 0x1f, 0x0d, 0xc8, 0x44, 0x37, 0xd7, 0x8a, 0xfd, 0x22, 0x5f, 0x2e,</div><div class='add'>+	0xb8, 0x21, 0xfb, 0x75, 0xf7, 0x64, 0x7b, 0x42, 0x3e, 0xd9, 0xbd, 0x22,</div><div class='add'>+	0x97, 0x73, 0x22, 0x9e, 0x5e, 0x0c, 0xaa, 0xf5, 0xf0, 0xe9, 0xf6, 0xe7,</div><div class='add'>+	0xe2, 0xbf, 0xeb, 0xab, 0x7b, 0xc7, 0xb9, 0x50, 0xd6, 0x57, 0x74, 0x27,</div><div class='add'>+	0x71, 0x2d, 0xad, 0xaf, 0x41, 0x9e, 0xac, 0x27, 0x8a, 0x72, 0x19, 0xb2,</div><div class='add'>+	0x07, 0x1e, 0x9e, 0x65, 0x4a, 0x1e, 0x4e, 0x40, 0xee, 0x5f, 0x95, 0x1d,</div><div class='add'>+	0x47, 0xa9, 0x33, 0xaf, 0x62, 0xae, 0xca, 0x96, 0xc0, 0x46, 0xb0, 0x3f,</div><div class='add'>+	0x57, 0x26, 0x9d, 0xae, 0xd4, 0x29, 0xb9, 0x35, 0xbe, 0x17, 0x31, 0xe7,</div><div class='add'>+	0xb8, 0xe9, 0xca, 0xa2, 0x53, 0x90, 0xc5, 0x01, 0xb4, 0x29, 0x7f, 0x1a,</div><div class='add'>+	0xbf, 0x4f, 0xe9, 0xb9, 0x3d, 0x0a, 0xbe, 0x5b, 0x89, 0x39, 0xe3, 0xf7,</div><div class='add'>+	0xc1, 0xf7, 0x87, 0x25, 0x39, 0xbd, 0x62, 0x6b, 0x20, 0x77, 0x9e, 0xad,</div><div class='add'>+	0x49, 0x9e, 0x35, 0xa5, 0x5c, 0xb2, 0xe5, 0x23, 0xb4, 0x21, 0x25, 0xce,</div><div class='add'>+	0x0b, 0x36, 0x86, 0x67, 0xec, 0x25, 0xd8, 0x99, 0x12, 0x6c, 0x0a, 0x6c,</div><div class='add'>+	0xc8, 0x9f, 0xa0, 0xfc, 0x59, 0xd4, 0x79, 0x06, 0xf1, 0xd3, 0x79, 0x60,</div><div class='add'>+	0xbf, 0x73, 0xc0, 0x14, 0x4f, 0x97, 0x32, 0x3a, 0x96, 0x55, 0xf3, 0x85,</div><div class='add'>+	0xcf, 0x52, 0xb1, 0x8f, 0x94, 0xe7, 0xd4, 0x7d, 0x1e, 0xb5, 0xb6, 0x59,</div><div class='add'>+	0x67, 0x13, 0x71, 0x16, 0x28, 0x13, 0x99, 0x9b, 0xf3, 0x79, 0x42, 0xdb,</div><div class='add'>+	0xc7, 0xf3, 0x19, 0xdf, 0x56, 0x36, 0xaf, 0xb1, 0x95, 0x22, 0x2f, 0x56,</div><div class='add'>+	0x3c, 0x3c, 0x49, 0x7c, 0x5c, 0x9c, 0x4a, 0xac, 0x9c, 0x63, 0x16, 0xe1,</div><div class='add'>+	0x37, 0x97, 0x11, 0x67, 0x44, 0xd2, 0xdf, 0x94, 0xc8, 0x71, 0xd7, 0xfd,</div><div class='add'>+	0x21, 0xfc, 0x66, 0x01, 0x6b, 0x62, 0x04, 0x50, 0xbe, 0xc0, 0x77, 0x94,</div><div class='add'>+	0x7b, 0xca, 0x76, 0x80, 0xe7, 0x19, 0xf2, 0x12, 0xca, 0xca, 0x2a, 0xfe,</div><div class='add'>+	0xfa, 0x16, 0xe8, 0xd1, 0xf4, 0xa9, 0x32, 0xd6, 0x6b, 0x94, 0xdc, 0x58,</div><div class='add'>+	0x0a, 0x31, 0x4e, 0xaf, 0xd9, 0x88, 0xf6, 0x73, 0x0b, 0x6c, 0x63, 0x0d,</div><div class='add'>+	0xf0, 0x3a, 0xd5, 0x4b, 0x0b, 0x2c, 0xef, 0x90, 0x8b, 0x88, 0x45, 0x49,</div><div class='add'>+	0x43, 0x79, 0x36, 0x2d, 0xde, 0xde, 0x31, 0xed, 0x15, 0x69, 0x45, 0x1e,</div><div class='add'>+	0xfc, 0xca, 0x96, 0xe8, 0x67, 0x43, 0x52, 0x88, 0x93, 0xd7, 0x71, 0x59,</div><div class='add'>+	0x9e, 0xfa, 0x4c, 0x13, 0xf7, 0x66, 0xb3, 0x36, 0x9f, 0xfd, 0xbd, 0x0e,</div><div class='add'>+	0xf3, 0x2d, 0xec, 0x75, 0x70, 0x7f, 0x23, 0x04, 0x5f, 0xa6, 0xf6, 0x3c,</div><div class='add'>+	0x90, 0x26, 0xea, 0xe2, 0x5f, 0xbe, 0xf7, 0xb0, 0x51, 0x0d, 0x3f, 0x12,</div><div class='add'>+	0x4f, 0x72, 0xbe, 0x56, 0x61, 0x09, 0xf6, 0xa3, 0x2d, 0x7d, 0x49, 0xee,</div><div class='add'>+	0x3d, 0xe1, 0xcd, 0xcf, 0x38, 0x25, 0xbc, 0x4b, 0x23, 0x57, 0x67, 0x2d,</div><div class='add'>+	0xe7, 0x0a, 0x30, 0x45, 0x2e, 0xe6, 0x60, 0xbd, 0x46, 0x9b, 0x60, 0xbf,</div><div class='add'>+	0x06, 0x32, 0xc6, 0x99, 0x26, 0x0f, 0x9f, 0x85, 0x64, 0x62, 0x8a, 0xe7,</div><div class='add'>+	0x9e, 0xb0, 0x6d, 0xc0, 0x90, 0xbf, 0x1b, 0xc2, 0x73, 0x85, 0x79, 0xc4,</div><div class='add'>+	0xa4, 0x5e, 0x3c, 0x8b, 0x67, 0xaf, 0x3f, 0xf2, 0xdc, 0x38, 0xc1, 0xb9,</div><div class='add'>+	0x07, 0xe4, 0x5e, 0xa0, 0x13, 0x41, 0xff, 0x9d, 0x7a, 0xac, 0xce, 0x53,</div><div class='add'>+	0x29, 0xee, 0x65, 0x4b, 0x12, 0xf6, 0x22, 0x8b, 0x58, 0x32, 0x17, 0xeb,</div><div class='add'>+	0xd0, 0xd8, 0x9c, 0xef, 0xd6, 0x62, 0x4f, 0x3f, 0xc6, 0x4b, 0xc9, 0xe7,</div><div class='add'>+	0x4b, 0x3e, 0xd6, 0x4b, 0xc1, 0xc7, 0x4a, 0x68, 0xb8, 0xc7, 0x95, 0x1f,</div><div class='add'>+	0x3a, 0xe4, 0x57, 0x1f, 0xf2, 0x8e, 0x1c, 0xae, 0xfe, 0xb2, 0xf3, 0xcd,</div><div class='add'>+	0xfa, 0xbf, 0x66, 0xd0, 0xc8, 0x1f, 0xe8, 0x03, 0x3e, 0x22, 0xed, 0x06,</div><div class='add'>+	0xfc, 0x79, 0x11, 0xb8, 0xcb, 0x38, 0xd3, 0xa1, 0xde, 0x19, 0xc0, 0x06,</div><div class='add'>+	0xe5, 0x29, 0xd8, 0xc6, 0x33, 0x3c, 0xf3, 0x85, 0x6d, 0x3b, 0x13, 0x96,</div><div class='add'>+	0xe2, 0x0c, 0xe5, 0x52, 0xda, 0x0c, 0xac, 0x17, 0xeb, 0x97, 0xa7, 0x3a,</div><div class='add'>+	0x90, 0x36, 0x23, 0x4d, 0xa8, 0x7e, 0xca, 0x53, 0xb6, 0x6a, 0x5f, 0x9e,</div><div class='add'>+	0x4a, 0xa9, 0x76, 0xe5, 0xa9, 0x3e, 0xa4, 0x8e, 0x34, 0x9c, 0x41, 0xe0,</div><div class='add'>+	0x74, 0xa6, 0x5b, 0x26, 0x4e, 0xc2, 0xbf, 0xf4, 0x1b, 0xea, 0xbe, 0xc4,</div><div class='add'>+	0x38, 0xfc, 0x4f, 0x08, 0x51, 0xd6, 0x15, 0x73, 0x00, 0x18, 0x6b, 0x1b,</div><div class='add'>+	0x30, 0xc8, 0x36, 0xb1, 0x8f, 0x73, 0xfe, 0xb4, 0xbd, 0xcb, 0xdc, 0xff,</div><div class='add'>+	0x8a, 0x3f, 0x28, 0x19, 0xd9, 0x37, 0xd3, 0x08, 0x7d, 0x0d, 0x99, 0x45,</div><div class='add'>+	0xe9, 0x32, 0x87, 0x90, 0xcf, 0xcf, 0x91, 0x6f, 0xf7, 0xab, 0xd8, 0x2d,</div><div class='add'>+	0xeb, 0xc4, 0xa2, 0x12, 0x4d, 0x63, 0x8c, 0xb7, 0xd2, 0xbe, 0x07, 0xf2,</div><div class='add'>+	0x67, 0xeb, 0x3e, 0xd2, 0xa0, 0xa7, 0x9e, 0x1f, 0x3c, 0xeb, 0xcd, 0xfc,</div><div class='add'>+	0x8a, 0xb3, 0x5e, 0xca, 0x35, 0xf9, 0x7b, 0xbf, 0x2c, 0xdb, 0x69, 0x79,</div><div class='add'>+	0xc9, 0x4e, 0xc9, 0x45, 0x7b, 0xab, 0xfc, 0x39, 0xfc, 0xf4, 0x25, 0x7b,</div><div class='add'>+	0xba, 0x89, 0x58, 0xa0, 0xac, 0xce, 0xcf, 0xfc, 0xb5, 0xb2, 0xf5, 0x3e,</div><div class='add'>+	0xfa, 0x8f, 0x64, 0x71, 0x8a, 0xd8, 0xd9, 0xdd, 0xbe, 0xc7, 0x29, 0xd0,</div><div class='add'>+	0x6f, 0x81, 0x06, 0x62, 0xb5, 0x02, 0xfc, 0xdf, 0x41, 0x19, 0x72, 0xe8,</div><div class='add'>+	0xf7, 0x94, 0x8f, 0x8a, 0x0f, 0x79, 0xfa, 0xec, 0xe4, 0x61, 0x57, 0x97,</div><div class='add'>+	0x67, 0xa0, 0x4f, 0x42, 0xf9, 0xc7, 0xf3, 0x1c, 0xd7, 0xdd, 0x96, 0x2f,</div><div class='add'>+	0x94, 0x38, 0xcf, 0xe2, 0xe6, 0xa8, 0x04, 0x65, 0x58, 0xe1, 0x85, 0x16,</div><div class='add'>+	0x79, 0x71, 0x61, 0x83, 0x18, 0xf0, 0x50, 0xc6, 0x2d, 0x61, 0x75, 0xd3,</div><div class='add'>+	0x84, 0xf1, 0xb7, 0xb4, 0xf2, 0xbe, 0xd8, 0x87, 0xc1, 0x1b, 0xee, 0x05,</div><div class='add'>+	0x60, 0x6e, 0xad, 0x9c, 0x89, 0x9f, 0xef, 0x83, 0x7e, 0xf1, 0x39, 0x20,</div><div class='add'>+	0x39, 0x3b, 0x86, 0x67, 0xa6, 0xd4, 0x39, 0xee, 0x93, 0x05, 0xc5, 0xc3,</div><div class='add'>+	0xdc, 0xe3, 0xea, 0x7d, 0xa3, 0x7d, 0x07, 0x70, 0x1d, 0xe5, 0x15, 0xe9,</div><div class='add'>+	0xa2, 0x37, 0x6e, 0x0e, 0x38, 0x2e, 0xdf, 0xd7, 0xa4, 0xce, 0xff, 0x0a,</div><div class='add'>+	0xd0, 0x85, 0x71, 0x55, 0xbf, 0x5f, 0x2e, 0x4d, 0xed, 0x8f, 0x7a, 0xfa,</div><div class='add'>+	0x31, 0xa0, 0x9f, 0xf9, 0x9e, 0xf1, 0x15, 0xf7, 0x4b, 0x5e, 0x19, 0x99,</div><div class='add'>+	0xb4, 0xbf, 0xa1, 0xf5, 0x47, 0x02, 0x77, 0xf7, 0x00, 0x87, 0x1e, 0x69,</div><div class='add'>+	0xc0, 0x5c, 0xac, 0x44, 0x22, 0x60, 0xb4, 0x1b, 0xc0, 0xf1, 0x43, 0xca,</div><div class='add'>+	0xe7, 0xf6, 0xa8, 0xfd, 0xe8, 0x53, 0xa9, 0x16, 0x29, 0x9b, 0xb6, 0xba,</div><div class='add'>+	0x17, 0xb7, 0x64, 0x6e, 0x21, 0xd6, 0xc7, 0xaf, 0x09, 0x65, 0x5d, 0x48,</div><div class='add'>+	0x1b, 0x91, 0xbe, 0x4b, 0x8a, 0xc7, 0xa6, 0xf5, 0x78, 0xe1, 0x35, 0xf9,</div><div class='add'>+	0x3e, 0x9d, 0x7e, 0x44, 0xc7, 0x53, 0x1c, 0x27, 0x2c, 0xf6, 0x17, 0x9b,</div><div class='add'>+	0xa5, 0xeb, 0x88, 0x09, 0x6c, 0x1b, 0x07, 0xd6, 0xed, 0x90, 0xd4, 0x91,</div><div class='add'>+	0x84, 0xdc, 0x72, 0xc4, 0xdf, 0x73, 0xfa, 0x0f, 0x23, 0x49, 0xb5, 0xc7,</div><div class='add'>+	0xf9, 0xdd, 0x11, 0x7b, 0x8e, 0xe9, 0x6b, 0xfa, 0xfe, 0xde, 0x15, 0x7d,</div><div class='add'>+	0xaf, 0xef, 0x47, 0x23, 0x3d, 0x2a, 0xfd, 0x6f, 0x23, 0x29, 0x95, 0xbe,</div><div class='add'>+	0x3e, 0x72, 0x4b, 0xc5, 0x8b, 0x8f, 0x8a, 0xf3, 0x29, 0xf9, 0x5c, 0x89,</div><div class='add'>+	0xf8, 0xb2, 0x1f, 0xd8, 0xd1, 0x81, 0x9d, 0xe9, 0x83, 0x9d, 0x49, 0xc1,</div><div class='add'>+	0xce, 0x0c, 0xd0, 0xce, 0xc0, 0x6e, 0xbf, 0x02, 0xbb, 0xed, 0xc8, 0xf7,</div><div class='add'>+	0x20, 0xaf, 0x4f, 0x3b, 0x8d, 0xc0, 0x85, 0xae, 0xeb, 0xcd, 0xd5, 0x7a,</div><div class='add'>+	0x62, 0x09, 0xeb, 0x5b, 0x3e, 0x2d, 0x91, 0x56, 0xd8, 0xa0, 0x2d, 0x27,</div><div class='add'>+	0x1a, 0x64, 0x3e, 0xe6, 0xba, 0x47, 0x1d, 0x5b, 0xae, 0xa2, 0x7e, 0xd6,</div><div class='add'>+	0xa6, 0x1e, 0xbf, 0x14, 0x65, 0x3c, 0x76, 0x75, 0x6a, 0x2b, 0x6c, 0x12,</div><div class='add'>+	0xe5, 0x3d, 0x22, 0xe5, 0xb1, 0xb8, 0x2c, 0x20, 0x3e, 0xab, 0xd5, 0x49,</div><div class='add'>+	0xe1, 0x99, 0xfa, 0xff, 0x5d, 0xd4, 0x4d, 0xc1, 0x3f, 0x98, 0xb2, 0xd8,</div><div class='add'>+	0x93, 0x90, 0x53, 0x3d, 0xd6, 0x40, 0xc2, 0xa0, 0xed, 0x4a, 0xc8, 0x1c,</div><div class='add'>+	0x62, 0xfd, 0x72, 0x89, 0xf5, 0x59, 0x0f, 0xfa, 0x59, 0xf2, 0xda, 0x4d,</div><div class='add'>+	0x96, 0x7c, 0x3b, 0xd1, 0xcf, 0x7d, 0xc8, 0x50, 0xae, 0xc7, 0xf3, 0x01,</div><div class='add'>+	0x86, 0xd1, 0x08, 0x39, 0x70, 0xc0, 0xff, 0x31, 0x94, 0xf7, 0xf3, 0xbe,</div><div class='add'>+	0x07, 0xca, 0x88, 0x85, 0x7e, 0x1c, 0x25, 0x46, 0xcc, 0x39, 0x63, 0x28,</div><div class='add'>+	0x63, 0x1b, 0x2b, 0x9e, 0x44, 0xf9, 0xa8, 0x24, 0xe3, 0x79, 0x75, 0xf7,</div><div class='add'>+	0xac, 0x1d, 0x65, 0xec, 0x23, 0xa8, 0xf7, 0x63, 0xfe, 0x8f, 0x92, 0xa3,</div><div class='add'>+	0xa0, 0xed, 0x97, 0xf7, 0xaa, 0xbd, 0x81, 0x8c, 0xe9, 0x40, 0x1f, 0x58,</div><div class='add'>+	0x96, 0x34, 0xd9, 0x2e, 0xe7, 0x38, 0xca, 0x16, 0xde, 0x57, 0xe1, 0x19,</div><div class='add'>+	0x5e, 0x44, 0xee, 0xad, 0x34, 0x4b, 0xae, 0xd2, 0x70, 0x1d, 0xfb, 0xef,</div><div class='add'>+	0xeb, 0xe4, 0x72, 0xdc, 0x14, 0xde, 0x83, 0xf0, 0xf4, 0x3c, 0xb4, 0x95,</div><div class='add'>+	0x3a, 0x31, 0xc0, 0x73, 0x03, 0xf8, 0x5b, 0xac, 0x05, 0xfc, 0xef, 0x39,</div><div class='add'>+	0xf8, 0xdf, 0xa7, 0x4b, 0x35, 0xfb, 0xe1, 0xf9, 0x5d, 0xda, 0x80, 0x27,</div><div class='add'>+	0xb1, 0x66, 0xa3, 0xc0, 0xfd, 0x3b, 0x11, 0x0f, 0x0c, 0x03, 0xfb, 0x0f,</div><div class='add'>+	0x62, 0xfd, 0xd2, 0x58, 0xbb, 0x31, 0xde, 0x17, 0xc2, 0x3a, 0x0e, 0xa8,</div><div class='add'>+	0x73, 0xe6, 0x19, 0x75, 0xe7, 0xe2, 0x47, 0xca, 0xf7, 0x3e, 0x5e, 0x32,</div><div class='add'>+	0xe0, 0x1f, 0x0a, 0xee, 0x66, 0xdb, 0x02, 0xfe, 0x5b, 0xd1, 0xe7, 0x81,</div><div class='add'>+	0x17, 0x61, 0x57, 0x7e, 0x06, 0xba, 0xce, 0xcf, 0xd0, 0x9f, 0xa3, 0x8e,</div><div class='add'>+	0x87, 0xb7, 0x1d, 0xee, 0x75, 0x41, 0x9f, 0x0f, 0x2f, 0xcb, 0x12, 0x70,</div><div class='add'>+	0x47, 0x86, 0x72, 0x8c, 0xf8, 0xc1, 0x7a, 0x7a, 0x4e, 0xba, 0x69, 0x03,</div><div class='add'>+	0xe7, 0xa8, 0x2b, 0xfd, 0xd3, 0x71, 0x60, 0x3d, 0x20, 0x79, 0x75, 0xae,</div><div class='add'>+	0x8a, 0xe7, 0xb3, 0x1b, 0xc5, 0x20, 0xde, 0x73, 0x6e, 0x40, 0x19, 0xed,</div><div class='add'>+	0x86, 0x8f, 0x91, 0x96, 0x06, 0xda, 0x24, 0xb3, 0xa5, 0x4d, 0xd9, 0x0e,</div><div class='add'>+	0xcb, 0x79, 0x09, 0xe3, 0xee, 0x90, 0x46, 0x60, 0xb8, 0x02, 0xc6, 0x38,</div><div class='add'>+	0x20, 0xff, 0xd5, 0xe1, 0x1e, 0x95, 0x17, 0xfb, 0x81, 0x96, 0x08, 0x78,</div><div class='add'>+	0xd6, 0xb4, 0xc7, 0x36, 0x23, 0x3b, 0xaa, 0xec, 0x3f, 0xa2, 0x30, 0x56,</div><div class='add'>+	0x4e, 0xd8, 0x3f, 0xfc, 0x04, 0xc6, 0x4c, 0x4e, 0x53, 0xf6, 0x7b, 0xb1,</div><div class='add'>+	0x6e, 0xbf, 0x0d, 0x0c, 0x44, 0xae, 0x7e, 0x75, 0x83, 0xa7, 0x2f, 0xa4,</div><div class='add'>+	0x7f, 0x89, 0x78, 0x82, 0x67, 0x00, 0x5e, 0x5c, 0xbe, 0x42, 0x5b, 0x3f,</div><div class='add'>+	0xe8, 0x9d, 0xdd, 0xe0, 0x9f, 0x25, 0x77, 0x4e, 0x7b, 0xfe, 0xba, 0xf3,</div><div class='add'>+	0x2c, 0x5a, 0x1d, 0x95, 0x76, 0x9e, 0x4a, 0x1b, 0x72, 0x8b, 0xdc, 0x19,</div><div class='add'>+	0xf2, 0xfa, 0x31, 0x4e, 0x98, 0x90, 0x55, 0xda, 0x81, 0x76, 0xc8, 0x39,</div><div class='add'>+	0xf3, 0xb4, 0x29, 0xb4, 0x09, 0x94, 0x05, 0x5b, 0x8a, 0x55, 0xd8, 0x84,</div><div class='add'>+	0x96, 0x0e, 0x99, 0x23, 0xcf, 0x4e, 0xd0, 0x4e, 0xfc, 0x48, 0x26, 0xd7,</div><div class='add'>+	0xd8, 0xca, 0x41, 0xf1, 0xe3, 0xda, 0x66, 0x09, 0xa7, 0x6d, 0xf3, 0x3e,</div><div class='add'>+	0x35, 0x47, 0xcf, 0x5e, 0xee, 0x23, 0xfe, 0x9c, 0xc9, 0x58, 0x6d, 0xa2,</div><div class='add'>+	0xb1, 0xa7, 0xc2, 0x4f, 0xdf, 0xc7, 0x5c, 0xd9, 0x87, 0xe2, 0xd3, 0xc0,</div><div class='add'>+	0xa0, 0x17, 0x0b, 0xa8, 0x3d, 0x3f, 0xe0, 0xe0, 0xf8, 0xcf, 0x60, 0x6b,</div><div class='add'>+	0x73, 0xc4, 0x25, 0xe0, 0x73, 0xe7, 0x51, 0xca, 0xd1, 0x66, 0xda, 0x32,</div><div class='add'>+	0xe0, 0xbc, 0x14, 0xed, 0xb5, 0x2c, 0x4c, 0x03, 0x73, 0x19, 0x77, 0x48,</div><div class='add'>+	0x9e, 0xf2, 0xca, 0xbb, 0x0a, 0x0b, 0x86, 0x4c, 0xce, 0xb6, 0x48, 0xd7,</div><div class='add'>+	0x09, 0xee, 0xaf, 0x9e, 0x8a, 0x4a, 0x0b, 0xf7, 0x58, 0xe9, 0x83, 0xfa,</div><div class='add'>+	0x25, 0x87, 0xf2, 0xce, 0x13, 0x41, 0xb5, 0x1f, 0x36, 0x67, 0x90, 0x47,</div><div class='add'>+	0x7d, 0xb0, 0x07, 0x56, 0x6a, 0xc9, 0xd8, 0xd6, 0xe4, 0x61, 0x48, 0xc8,</div><div class='add'>+	0x52, 0x09, 0x32, 0x56, 0x82, 0x8c, 0x95, 0x20, 0x63, 0x25, 0xc8, 0x18,</div><div class='add'>+	0xb0, 0xdf, 0x79, 0xe8, 0xdf, 0xb9, 0xd2, 0x80, 0xf6, 0xeb, 0xbb, 0x94,</div><div class='add'>+	0x5f, 0x3f, 0x54, 0x7a, 0xc5, 0x65, 0xfa, 0xac, 0x8a, 0x4d, 0xfb, 0x20,</div><div class='add'>+	0x83, 0x8c, 0x45, 0xfd, 0x18, 0xf5, 0x15, 0x79, 0x72, 0xe6, 0x55, 0x39,</div><div class='add'>+	0x35, 0x53, 0xc3, 0x81, 0x13, 0x25, 0x57, 0x5e, 0x72, 0x10, 0x7f, 0xce,</div><div class='add'>+	0x13, 0x53, 0x65, 0x5a, 0x1b, 0x15, 0xb6, 0x3a, 0x28, 0x79, 0x85, 0x93,</div><div class='add'>+	0x95, 0x1f, 0x01, 0xbe, 0x52, 0xb8, 0x90, 0xba, 0x29, 0x6d, 0x5b, 0x2e,</div><div class='add'>+	0xcb, 0x39, 0xf8, 0xf1, 0x85, 0xea, 0x6b, 0xf2, 0x8c, 0xc2, 0xe3, 0xe4,</div><div class='add'>+	0xc3, 0x3b, 0xe5, 0xa7, 0xa6, 0x77, 0x9e, 0x7f, 0x0a, 0x58, 0x63, 0xa1,</div><div class='add'>+	0x87, 0xb6, 0x23, 0x04, 0x5f, 0x60, 0x15, 0x3a, 0xa1, 0xd7, 0xfb, 0x8d,</div><div class='add'>+	0x1b, 0x81, 0x69, 0xf8, 0x7e, 0xa3, 0xbc, 0x38, 0x53, 0xa8, 0x93, 0x09,</div><div class='add'>+	0xda, 0x07, 0xeb, 0xb0, 0x18, 0xf4, 0x53, 0xf4, 0x9b, 0x9c, 0x2f, 0xfd,</div><div class='add'>+	0xd4, 0x4f, 0x37, 0xf0, 0x0e, 0x57, 0xf9, 0x58, 0x6c, 0x03, 0xf7, 0x1b,</div><div class='add'>+	0x63, 0x36, 0x79, 0x7a, 0x59, 0xf6, 0x57, 0x58, 0xf6, 0x2a, 0xd6, 0x87,</div><div class='add'>+	0xe9, 0x0f, 0xdc, 0x7b, 0x63, 0x1c, 0x8f, 0xfd, 0x02, 0x37, 0xb5, 0x63,</div><div class='add'>+	0xae, 0xa5, 0x8f, 0x68, 0xcc, 0xdd, 0xa7, 0x70, 0xf4, 0xb5, 0x78, 0x99,</div><div class='add'>+	0x7c, 0x72, 0xc0, 0xa7, 0xcb, 0x6a, 0x3f, 0x70, 0x9d, 0x7d, 0xe2, 0x27,</div><div class='add'>+	0xa0, 0x57, 0x85, 0x2b, 0xc2, 0x3d, 0x4b, 0xee, 0xe7, 0x72, 0xaf, 0xb8,</div><div class='add'>+	0xde, 0x62, 0xa8, 0x7b, 0x03, 0x72, 0x0f, 0xec, 0xcb, 0xbd, 0xb0, 0x2f,</div><div class='add'>+	0xf7, 0x5d, 0x73, 0x07, 0xda, 0x3f, 0x03, 0xe8, 0x2a, 0x04, 0x8d, 0x0e,</div><div class='add'>+	0x19, 0xad, 0xd4, 0xb7, 0xe5, 0x3e, 0xee, 0x7a, 0xfb, 0xb6, 0xdc, 0xd3,</div><div class='add'>+	0x4d, 0xad, 0xd9, 0x0b, 0xa4, 0x6c, 0xb8, 0x72, 0xc9, 0xe1, 0xbe, 0x9b,</div><div class='add'>+	0x7f, 0x6f, 0x7e, 0x3d, 0xfc, 0x15, 0x68, 0xf6, 0xf7, 0x9c, 0x43, 0xe9,</div><div class='add'>+	0x2b, 0xc2, 0xfb, 0xf3, 0xc5, 0x29, 0xe2, 0x81, 0x98, 0xba, 0x17, 0x63,</div><div class='add'>+	0xa8, 0x7d, 0x3e, 0xaf, 0x6d, 0x71, 0x4a, 0x9d, 0x31, 0x15, 0xb8, 0x77,</div><div class='add'>+	0x6d, 0x6e, 0xb5, 0xcc, 0xd1, 0xa0, 0x77, 0x1f, 0x93, 0xba, 0xec, 0xd9,</div><div class='add'>+	0x32, 0xc8, 0x62, 0xb5, 0x76, 0xcf, 0x71, 0x50, 0xd9, 0x8b, 0x2b, 0xd0,</div><div class='add'>+	0x01, 0xae, 0x17, 0xe2, 0x05, 0xe8, 0xc9, 0x04, 0xec, 0x53, 0x5e, 0xf5,</div><div class='add'>+	0x17, 0xa1, 0x5c, 0x64, 0xb2, 0x41, 0x43, 0xc2, 0xc7, 0x19, 0x0b, 0x79,</div><div class='add'>+	0x7b, 0x2d, 0xb9, 0xa0, 0xa5, 0xec, 0x37, 0x68, 0x07, 0x3e, 0xa3, 0x7e,</div><div class='add'>+	0x26, 0xc6, 0x1b, 0xd3, 0x0d, 0xf0, 0xab, 0x58, 0xbf, 0x2a, 0xf7, 0x04,</div><div class='add'>+	0xa0, 0xbb, 0x8b, 0xdf, 0x91, 0x7d, 0xb3, 0xdd, 0xcd, 0x9e, 0xfc, 0x73,</div><div class='add'>+	0x1f, 0x99, 0xf3, 0xf3, 0x69, 0x58, 0xdd, 0xb7, 0x71, 0x5c, 0x22, 0x51,</div><div class='add'>+	0xf8, 0xb4, 0x0f, 0x20, 0xce, 0xd8, 0x01, 0x59, 0x59, 0x8a, 0xb1, 0x5f,</div><div class='add'>+	0x4f, 0x67, 0x26, 0x4b, 0xec, 0xfb, 0x3b, 0x32, 0x34, 0x5b, 0x6a, 0xa6,</div><div class='add'>+	0x2f, 0x59, 0x84, 0x1d, 0x58, 0x36, 0xe9, 0x43, 0xc7, 0xe0, 0xe3, 0xda,</div><div class='add'>+	0xe5, 0xfb, 0xb3, 0xf4, 0x8f, 0x49, 0xf3, 0x94, 0xf4, 0xc6, 0x4f, 0x81,</div><div class='add'>+	0xa6, 0xcf, 0x3b, 0x21, 0xc6, 0x68, 0xee, 0x20, 0xca, 0xfe, 0x5c, 0x92,</div><div class='add'>+	0x66, 0x67, 0x80, 0xcf, 0xbd, 0xe6, 0x17, 0x80, 0x61, 0x33, 0x66, 0xd2,</div><div class='add'>+	0xbc, 0x35, 0x40, 0x39, 0x42, 0xcc, 0xbd, 0x58, 0xa3, 0xf3, 0x07, 0xb3,</div><div class='add'>+	0x2a, 0x4e, 0x52, 0x76, 0x66, 0xd1, 0xe1, 0x78, 0xa0, 0x5b, 0xd9, 0xac,</div><div class='add'>+	0x5b, 0x61, 0x4f, 0x22, 0xfa, 0xfc, 0x0d, 0x6d, 0x88, 0x6d, 0x9c, 0x90,</div><div class='add'>+	0xce, 0x3f, 0x2a, 0xd9, 0x93, 0x31, 0xd8, 0x33, 0xf6, 0xe5, 0xc7, 0x0e,</div><div class='add'>+	0xf4, 0x91, 0x3e, 0xde, 0xa6, 0xbf, 0xbb, 0x03, 0x7e, 0xef, 0x66, 0x45,</div><div class='add'>+	0xcf, 0xb0, 0xd3, 0x27, 0x13, 0xc7, 0x38, 0x76, 0x0f, 0x6c, 0x79, 0x5c,</div><div class='add'>+	0xc9, 0x6d, 0xb1, 0xb4, 0x1c, 0x8f, 0xc0, 0x26, 0x47, 0xb6, 0x90, 0x9f,</div><div class='add'>+	0xef, 0x93, 0xbb, 0xec, 0x31, 0xb9, 0x1b, 0xb2, 0x33, 0x68, 0x3b, 0x32,</div><div class='add'>+	0x84, 0xb5, 0xd8, 0x61, 0xc3, 0xef, 0x28, 0x0c, 0xdd, 0x88, 0xb8, 0x8b,</div><div class='add'>+	0x63, 0xb7, 0xeb, 0xfb, 0x17, 0x1e, 0x7e, 0xfc, 0x4a, 0xd5, 0xe3, 0x51,</div><div class='add'>+	0x76, 0xf6, 0x49, 0xc5, 0x9b, 0x61, 0x67, 0x9b, 0xf6, 0xb3, 0x2d, 0x92,</div><div class='add'>+	0x53, 0xf5, 0xb6, 0x29, 0x7f, 0x5c, 0x5c, 0xb8, 0x1f, 0x29, 0x7c, 0xf3,</div><div class='add'>+	0x02, 0xec, 0x0d, 0x30, 0x77, 0xb1, 0xb2, 0x15, 0x79, 0xf8, 0xd0, 0x85,</div><div class='add'>+	0x34, 0xd2, 0xf7, 0x21, 0x65, 0xdd, 0x07, 0x9a, 0xbd, 0xbd, 0xdc, 0xb5,</div><div class='add'>+	0xf7, 0xb8, 0x24, 0xf0, 0x01, 0x85, 0x4b, 0xaf, 0xa8, 0x3b, 0x80, 0x88,</div><div class='add'>+	0xa1, 0x47, 0xb2, 0xb0, 0x2b, 0xcd, 0xc0, 0x40, 0x53, 0xc7, 0xad, 0xd4,</div><div class='add'>+	0x50, 0x60, 0xbb, 0x7c, 0x10, 0xb1, 0x7c, 0xd9, 0xe1, 0x5a, 0x6e, 0x95,</div><div class='add'>+	0x07, 0xdf, 0x4b, 0x19, 0xd9, 0x2e, 0x7b, 0xde, 0x1b, 0x90, 0x3d, 0x7d,</div><div class='add'>+	0x56, 0x86, 0x74, 0xdf, 0xf2, 0x2e, 0x3f, 0x9e, 0xee, 0x1a, 0x4e, 0x06,</div><div class='add'>+	0xfa, 0xe5, 0x0b, 0x90, 0xb1, 0x02, 0xe4, 0x6b, 0xa8, 0x4a, 0x9e, 0xd3,</div><div class='add'>+	0xde, 0xd3, 0xce, 0xa7, 0x80, 0x95, 0x7d, 0xec, 0x67, 0xcb, 0x54, 0xb5,</div><div class='add'>+	0x41, 0x12, 0x37, 0x70, 0x3f, 0x39, 0xe1, 0x9d, 0x71, 0xdc, 0x40, 0x99,</div><div class='add'>+	0x40, 0x0c, 0x72, 0x83, 0xa7, 0x9f, 0xea, 0xee, 0xdd, 0x0d, 0x9e, 0x5f,</div><div class='add'>+	0x41, 0xfc, 0xeb, 0x12, 0xe7, 0x79, 0x77, 0x0d, 0xbe, 0xa1, 0x6d, 0x69,</div><div class='add'>+	0x68, 0xe3, 0x0a, 0xbe, 0x6b, 0x61, 0xfc, 0xf0, 0x87, 0xcd, 0xb5, 0x6f,</div><div class='add'>+	0x07, 0xd6, 0xca, 0xa2, 0xbf, 0xef, 0x36, 0x87, 0x39, 0xd3, 0xa7, 0x5b,</div><div class='add'>+	0x26, 0x6d, 0x61, 0xab, 0xbd, 0x4b, 0xfe, 0x0c, 0xfe, 0xfd, 0x6b, 0x2b,</div><div class='add'>+	0xfe, 0x7d, 0x37, 0xf8, 0xb1, 0x16, 0x03, 0xd8, 0xe6, 0x3d, 0x98, 0xcb,</div><div class='add'>+	0x30, 0xd6, 0xf3, 0x6e, 0xfc, 0xee, 0x2a, 0xad, 0xda, 0xc7, 0x9b, 0x29,</div><div class='add'>+	0x00, 0x4f, 0x36, 0xd8, 0xec, 0x6f, 0xd5, 0x7e, 0x5e, 0x21, 0x2f, 0x2b,</div><div class='add'>+	0x7b, 0x85, 0x03, 0x57, 0x85, 0x7e, 0xef, 0x75, 0x09, 0x77, 0xdb, 0xaf,</div><div class='add'>+	0x77, 0x06, 0xec, 0xe7, 0x8d, 0x00, 0xcf, 0xc1, 0x1d, 0x39, 0x5d, 0x25,</div><div class='add'>+	0x0e, 0xbb, 0x28, 0xc6, 0x59, 0x62, 0xb0, 0x97, 0xd5, 0x1e, 0x54, 0xb9,</div><div class='add'>+	0xf4, 0x2d, 0xa4, 0xa8, 0x0f, 0xfb, 0x18, 0xf4, 0xf6, 0x29, 0x14, 0x56,</div><div class='add'>+	0xa1, 0x9d, 0xbd, 0x1b, 0xeb, 0x30, 0x81, 0x5f, 0xe7, 0x96, 0x5b, 0xa1,</div><div class='add'>+	0xbf, 0x94, 0x53, 0xee, 0x7d, 0x75, 0x9b, 0x5b, 0x02, 0x7c, 0xb7, 0xde,</div><div class='add'>+	0x3e, 0xd8, 0xb7, 0x25, 0x74, 0x14, 0xbe, 0xce, 0xa0, 0x7d, 0xe0, 0x3c,</div><div class='add'>+	0xe8, 0x27, 0x4d, 0x99, 0x3f, 0x46, 0x5d, 0x5f, 0xaf, 0xbe, 0x5f, 0xd7,</div><div class='add'>+	0x9f, 0x8b, 0xf2, 0x1b, 0x99, 0x3c, 0xf7, 0x38, 0x4b, 0x5c, 0x03, 0x07,</div><div class='add'>+	0x6b, 0xe0, 0xca, 0x71, 0xa7, 0x95, 0x36, 0x5d, 0x82, 0xc7, 0x5d, 0x19,</div><div class='add'>+	0x54, 0xd8, 0xb5, 0x17, 0x98, 0x6b, 0xa3, 0xc6, 0x0d, 0x31, 0x09, 0x1d,</div><div class='add'>+	0xef, 0x90, 0x46, 0xe0, 0xea, 0x86, 0x23, 0xf4, 0x91, 0xc9, 0xc4, 0x20,</div><div class='add'>+	0x84, 0x20, 0xa4, 0xee, 0x93, 0x5a, 0x03, 0xdf, 0x97, 0xde, 0xc4, 0xf7,</div><div class='add'>+	0x85, 0x78, 0xe9, 0x51, 0xac, 0x9f, 0xe5, 0x5c, 0x5c, 0xa7, 0x7e, 0xb1,</div><div class='add'>+	0x56, 0x1f, 0x72, 0xc4, 0xbd, 0x35, 0xb6, 0xe1, 0x5e, 0x5b, 0x72, 0xe0,</div><div class='add'>+	0x7b, 0xdc, 0x63, 0x43, 0xac, 0xd9, 0x70, 0xc6, 0xa3, 0xc1, 0x58, 0x6c,</div><div class='add'>+	0x93, 0xf2, 0x49, 0xea, 0x28, 0xf7, 0x59, 0x4c, 0x2f, 0x4e, 0x2d, 0x31,</div><div class='add'>+	0x5e, 0xe5, 0xfb, 0x84, 0x7e, 0xdf, 0xa9, 0xdf, 0x33, 0x1e, 0x2d, 0xb8,</div><div class='add'>+	0x0d, 0xe0, 0xe9, 0x0e, 0xd8, 0xcf, 0xfb, 0xb7, 0xda, 0x0a, 0x37, 0xdc,</div><div class='add'>+	0xbf, 0xb2, 0x66, 0x3b, 0xd5, 0xdd, 0xa2, 0x72, 0xe9, 0xa0, 0xd8, 0x5b,</div><div class='add'>+	0x96, 0x52, 0x21, 0x19, 0xc5, 0x5a, 0x30, 0x9f, 0x21, 0x3d, 0xa9, 0x43,</div><div class='add'>+	0xb2, 0x5f, 0xad, 0x4d, 0xf9, 0x98, 0x75, 0x38, 0x11, 0x98, 0x10, 0xa3,</div><div class='add'>+	0xcc, 0xe7, 0x4f, 0x23, 0x3d, 0x04, 0xbc, 0xe3, 0xed, 0x5d, 0x1a, 0xe5,</div><div class='add'>+	0xd5, 0xbc, 0x04, 0xc6, 0x30, 0x77, 0xac, 0xda, 0xc7, 0xaa, 0xed, 0x71,</div><div class='add'>+	0xf1, 0xfd, 0xa0, 0x7a, 0x9f, 0x5a, 0xb5, 0xcf, 0x95, 0x33, 0x88, 0x65,</div><div class='add'>+	0xfc, 0xf7, 0x5c, 0x0b, 0xae, 0x17, 0x7c, 0xf1, 0x31, 0x7f, 0xcf, 0xab,</div><div class='add'>+	0x45, 0xaf, 0x0b, 0xd7, 0x67, 0x4a, 0xce, 0x99, 0xd6, 0x30, 0xe5, 0xef,</div><div class='add'>+	0xb6, 0xad, 0x37, 0xc9, 0x78, 0x3b, 0xf7, 0xdb, 0xea, 0x69, 0x58, 0xbb,</div><div class='add'>+	0x8f, 0x56, 0x3f, 0xfe, 0xda, 0xfd, 0x37, 0x8e, 0xed, 0xed, 0xb1, 0x65,</div><div class='add'>+	0x57, 0xed, 0xb1, 0xd5, 0x8f, 0xc7, 0xb1, 0x36, 0x22, 0x7e, 0x2a, 0xb8,</div><div class='add'>+	0x31, 0x9b, 0x6b, 0xd4, 0x95, 0x98, 0x65, 0xfe, 0xcb, 0x06, 0xd6, 0x31,</div><div class='add'>+	0x06, 0x3f, 0xc2, 0xb5, 0xf4, 0xcf, 0x9e, 0xb9, 0xa6, 0xc9, 0xc4, 0x21,</div><div class='add'>+	0x6f, 0x3d, 0x07, 0xbc, 0x75, 0xf7, 0xd6, 0xff, 0xe2, 0xca, 0x3a, 0xd2,</div><div class='add'>+	0x3f, 0x70, 0x1d, 0xdb, 0x45, 0x60, 0x67, 0x8d, 0x23, 0x5c, 0x43, 0xa6,</div><div class='add'>+	0x5c, 0x43, 0xbe, 0xe3, 0x1a, 0x76, 0xea, 0x77, 0x5c, 0x3f, 0xe0, 0xb4,</div><div class='add'>+	0x2f, 0x02, 0x63, 0x38, 0x59, 0xf5, 0x1d, 0x54, 0x67, 0xb7, 0xaf, 0x8b,</div><div class='add'>+	0x29, 0x79, 0x66, 0x3e, 0x2a, 0x66, 0xda, 0x9b, 0xd7, 0xd8, 0xaa, 0xfd,</div><div class='add'>+	0x76, 0x9e, 0x5f, 0xf5, 0x11, 0x7b, 0xfa, 0xf3, 0x8a, 0x73, 0x5e, 0xfb,</div><div class='add'>+	0xe5, 0xb2, 0xe4, 0xa7, 0x42, 0x88, 0x01, 0x53, 0xc0, 0x39, 0x7d, 0xb0,</div><div class='add'>+	0xb7, 0xdc, 0x1f, 0x45, 0x59, 0x85, 0x78, 0x85, 0xbe, 0x2e, 0x05, 0x5d,</div><div class='add'>+	0xa1, 0x0d, 0x26, 0x1e, 0x79, 0x55, 0x72, 0x73, 0xbe, 0x8d, 0x41, 0xff,</div><div class='add'>+	0x86, 0xdf, 0x3f, 0xf9, 0x9c, 0xb9, 0x65, 0xb3, 0x2c, 0x25, 0x36, 0x8b,</div><div class='add'>+	0x95, 0x58, 0x90, 0xda, 0xba, 0x8e, 0xad, 0xcf, 0x77, 0xe7, 0xfe, 0x60,</div><div class='add'>+	0x4d, 0x36, 0xc6, 0xd6, 0x59, 0xfb, 0xbd, 0xe2, 0xbf, 0xf7, 0xd7, 0x7e,</div><div class='add'>+	0xdd, 0x75, 0x28, 0xbc, 0x22, 0x5c, 0x0b, 0xf2, 0x80, 0x78, 0x38, 0x2c,</div><div class='add'>+	0x9f, 0x8a, 0x51, 0x1f, 0x0b, 0xea, 0x7c, 0x33, 0x69, 0x74, 0x2b, 0x9b,</div><div class='add'>+	0x31, 0xe8, 0x78, 0xf2, 0x5a, 0xc0, 0x38, 0x91, 0xae, 0x7f, 0xe1, 0x0e,</div><div class='add'>+	0xc6, 0x10, 0xe7, 0x76, 0xd1, 0xbe, 0xf8, 0x3a, 0x1d, 0x55, 0x3a, 0xfd,</div><div class='add'>+	0x79, 0x27, 0x20, 0x45, 0x3b, 0x20, 0x13, 0xf6, 0x41, 0x85, 0xf1, 0x3f,</div><div class='add'>+	0x84, 0xbe, 0x1e, 0xd4, 0x7d, 0x4d, 0x48, 0xb7, 0xb6, 0x3f, 0x07, 0x20,</div><div class='add'>+	0xe7, 0xae, 0xdc, 0xe7, 0x6c, 0x95, 0xdb, 0x5a, 0xa9, 0x03, 0xfe, 0xfc,</div><div class='add'>+	0x0f, 0x4a, 0xd7, 0xd6, 0xa5, 0x04, 0x22, 0x83, 0x5b, 0xc2, 0x2b, 0x3c,</div><div class='add'>+	0xa0, 0x9e, 0xf9, 0xf2, 0xed, 0xf1, 0xc1, 0x9b, 0xff, 0xaa, 0xb9, 0xea,</div><div class='add'>+	0x79, 0x72, 0xce, 0xac, 0xc7, 0xb9, 0x7a, 0x58, 0xbe, 0x36, 0x57, 0xbf,</div><div class='add'>+	0x7e, 0x33, 0x64, 0xc9, 0x4a, 0x48, 0xa0, 0x9e, 0x37, 0x2b, 0x36, 0x6a,</div><div class='add'>+	0x98, 0x7b, 0x24, 0x4b, 0xa6, 0x95, 0x4a, 0x04, 0xfc, 0xbd, 0x68, 0x0f,</div><div class='add'>+	0xeb, 0x76, 0x02, 0x87, 0xdb, 0xdd, 0xdd, 0xa9, 0xbc, 0xda, 0x23, 0x35,</div><div class='add'>+	0xd4, 0xbc, 0x26, 0x80, 0xc9, 0xe6, 0x9d, 0x57, 0xdc, 0x4f, 0x02, 0xb3,</div><div class='add'>+	0x8e, 0xcb, 0xc3, 0x12, 0x5c, 0xb5, 0x97, 0x8b, 0xfc, 0x59, 0xee, 0xe7,</div><div class='add'>+	0x5a, 0x89, 0x0c, 0xd6, 0xf8, 0xc3, 0x88, 0xe1, 0xcb, 0xb0, 0xfb, 0x1f,</div><div class='add'>+	0xa1, 0x6f, 0x28, 0xc1, 0x5f, 0x00, 0x97, 0x7c, 0xed, 0xba, 0x18, 0x7e,</div><div class='add'>+	0xbc, 0x6e, 0x2f, 0xd7, 0xc3, 0xa7, 0xe7, 0x14, 0x26, 0x25, 0x6e, 0x3f,</div><div class='add'>+	0x1c, 0xb8, 0xa7, 0x27, 0x88, 0x38, 0xa3, 0xe0, 0x46, 0x6c, 0xe2, 0xb8,</div><div class='add'>+	0x83, 0x72, 0x17, 0xd6, 0xe7, 0xf4, 0x7c, 0x21, 0xb0, 0xa3, 0xe4, 0xcb,</div><div class='add'>+	0x2a, 0xe2, 0xca, 0xaa, 0x95, 0x5a, 0x06, 0x3f, 0x9e, 0xd4, 0x98, 0x8f,</div><div class='add'>+	0xe7, 0x35, 0x65, 0x1d, 0xb3, 0x70, 0x6f, 0xa8, 0x58, 0x3d, 0x28, 0x93,</div><div class='add'>+	0x0e, 0xf7, 0x76, 0xba, 0xa4, 0x18, 0xcb, 0xdc, 0xd4, 0xb8, 0xc2, 0x23,</div><div class='add'>+	0xcb, 0x44, 0xcc, 0x97, 0xa2, 0xfd, 0x2e, 0xeb, 0xf3, 0x8e, 0x27, 0x95,</div><div class='add'>+	0x7c, 0xf9, 0xfb, 0xc2, 0x8c, 0x8f, 0x78, 0x5e, 0xd5, 0x65, 0x0e, 0xf3,</div><div class='add'>+	0x79, 0x8e, 0x32, 0xa0, 0x62, 0x26, 0xf0, 0xf2, 0x21, 0xc9, 0x8c, 0x26,</div><div class='add'>+	0x14, 0x6e, 0x79, 0xbc, 0x44, 0x7d, 0x21, 0xfe, 0xbf, 0x0c, 0xec, 0x1f,</div><div class='add'>+	0xc2, 0x9a, 0x31, 0x0e, 0xe0, 0xd8, 0xd4, 0x0b, 0x94, 0x55, 0xcc, 0x5f,</div><div class='add'>+	0xa2, 0x17, 0xdb, 0x37, 0x11, 0x63, 0x5c, 0x28, 0x7d, 0x5c, 0xf1, 0x6f,</div><div class='add'>+	0x49, 0xfc, 0xbd, 0x73, 0x85, 0x05, 0x0b, 0xd9, 0x60, 0x40, 0x92, 0x47,</div><div class='add'>+	0x3f, 0x03, 0x19, 0x1a, 0x41, 0x8c, 0xc4, 0x7a, 0xa2, 0xce, 0xaf, 0x06,</div><div class='add'>+	0x81, 0xb9, 0x0c, 0xfb, 0x46, 0x29, 0x9a, 0x61, 0x29, 0xaa, 0x7b, 0x80,</div><div class='add'>+	0x3c, 0xcf, 0x0d, 0xaa, 0xbd, 0x9d, 0xa2, 0x49, 0xcc, 0x9f, 0xd9, 0xe4,</div><div class='add'>+	0xdf, 0x03, 0x2c, 0x9a, 0x6c, 0xc7, 0x3c, 0xcb, 0x27, 0x24, 0x7c, 0xf4,</div><div class='add'>+	0x80, 0x34, 0x1c, 0x7d, 0x58, 0x1a, 0xa7, 0x89, 0xf1, 0xb8, 0x77, 0x6f,</div><div class='add'>+	0xdc, 0xd1, 0x28, 0xc4, 0xdc, 0x5f, 0xc5, 0xd8, 0x07, 0xe5, 0x87, 0x8e,</div><div class='add'>+	0x4f, 0xd3, 0x86, 0x8d, 0xd2, 0xc2, 0x3a, 0x7e, 0xde, 0xc7, 0xe3, 0x77,</div><div class='add'>+	0x80, 0x1e, 0xce, 0x3f, 0xa1, 0x71, 0xdf, 0x1d, 0x75, 0xb1, 0x6b, 0x83,</div><div class='add'>+	0x8e, 0x5d, 0xd9, 0xee, 0x32, 0x7c, 0xf6, 0x31, 0x09, 0xdb, 0x7e, 0xfb,</div><div class='add'>+	0xed, 0xa8, 0x17, 0xaf, 0xbb, 0x03, 0xc1, 0x3a, 0xfa, 0x4e, 0x40, 0x0b,</div><div class='add'>+	0x71, 0x0f, 0xcf, 0xdb, 0x59, 0xe6, 0x9d, 0xf9, 0x1b, 0xe5, 0x74, 0x70,</div><div class='add'>+	0xf5, 0xf8, 0xdb, 0xea, 0xea, 0xfa, 0x65, 0x7e, 0x9b, 0xb0, 0x17, 0xf3,</div><div class='add'>+	0xf7, 0x87, 0xeb, 0xda, 0x7d, 0xd7, 0xf4, 0x52, 0x2f, 0xf6, 0xf0, 0xe2,</div><div class='add'>+	0x20, 0xce, 0x21, 0x55, 0x87, 0x73, 0x56, 0x7f, 0x2f, 0x9a, 0x43, 0x79,</div><div class='add'>+	0x7e, 0xd6, 0xbf, 0x3b, 0x64, 0x60, 0x2e, 0x56, 0x81, 0xf1, 0x8b, 0xc9,</div><div class='add'>+	0x6f, 0x33, 0x67, 0x0b, 0xa0, 0xfb, 0x66, 0x75, 0xef, 0x88, 0x77, 0x37,</div><div class='add'>+	0x50, 0x2f, 0xe1, 0xe1, 0x4f, 0xe6, 0xe3, 0x58, 0xf3, 0x77, 0x75, 0x18,</div><div class='add'>+	0xe9, 0xff, 0x7e, 0x53, 0xb6, 0x9f, 0xf8, 0x66, 0x13, 0xcf, 0x21, 0x81,</div><div class='add'>+	0x9b, 0x29, 0x67, 0xdf, 0x81, 0x9c, 0x35, 0xaa, 0x73, 0x9f, 0x62, 0x89,</div><div class='add'>+	0xf1, 0x5c, 0x1e, 0xf2, 0xc3, 0xfb, 0x7b, 0x8c, 0xfb, 0xf2, 0x7a, 0x3f,</div><div class='add'>+	0x96, 0x74, 0x12, 0xd3, 0xfb, 0xf1, 0x01, 0xfb, 0x5c, 0xef, 0x9e, 0xb2,</div><div class='add'>+	0x1f, 0xb3, 0x51, 0xde, 0xe2, 0x8a, 0xe6, 0xa1, 0x35, 0xf1, 0xca, 0x21,</div><div class='add'>+	0xd8, 0x82, 0x79, 0xc8, 0xf3, 0x5e, 0xd8, 0xc0, 0xc1, 0x20, 0xf5, 0x33,</div><div class='add'>+	0xaa, 0x63, 0x59, 0x9b, 0x71, 0x7b, 0x60, 0x14, 0x7d, 0x18, 0xd3, 0xaf,</div><div class='add'>+	0xc9, 0x04, 0xec, 0xff, 0x64, 0x35, 0xa9, 0xbe, 0xe9, 0xc9, 0xc4, 0x79,</div><div class='add'>+	0x9f, 0x8c, 0xe5, 0x5f, 0x83, 0xbc, 0xbe, 0x06, 0x3c, 0xbc, 0x01, 0xfc,</div><div class='add'>+	0x34, 0xf4, 0x5a, 0xfd, 0x96, 0xde, 0x8b, 0x8a, 0x70, 0x2f, 0x1e, 0x76,</div><div class='add'>+	0xb3, 0xe8, 0x61, 0xcd, 0xd8, 0x24, 0xd2, 0x7f, 0x1e, 0xf5, 0xe4, 0xf5,</div><div class='add'>+	0xdf, 0x6a, 0x79, 0x6b, 0x42, 0xf9, 0x63, 0x6a, 0x0f, 0xd2, 0x9b, 0x93,</div><div class='add'>+	0xa5, 0x63, 0x95, 0x30, 0x64, 0x8e, 0xf3, 0xfa, 0x53, 0xd4, 0xa3, 0xac,</div><div class='add'>+	0xf5, 0xe8, 0xb3, 0xd9, 0xa8, 0xb2, 0x8f, 0x39, 0xc8, 0x52, 0x5e, 0xc5,</div><div class='add'>+	0x11, 0xc0, 0xf7, 0x0e, 0xdb, 0x3d, 0xb7, 0x89, 0x67, 0x9f, 0x0d, 0xb6,</div><div class='add'>+	0x8a, 0x2d, 0xda, 0x83, 0xe2, 0x97, 0xdd, 0x89, 0x32, 0xca, 0xd9, 0x8d,</div><div class='add'>+	0x58, 0x1b, 0x96, 0x65, 0x91, 0xe7, 0x58, 0x37, 0xe9, 0x71, 0x38, 0x46,</div><div class='add'>+	0x77, 0xf3, 0x6a, 0x9a, 0x38, 0x97, 0xf6, 0x35, 0xdf, 0x35, 0xb0, 0xec,</div><div class='add'>+	0x46, 0x5d, 0x16, 0xd2, 0xf3, 0x1b, 0xd2, 0xdf, 0xd2, 0x5a, 0x87, 0x33,</div><div class='add'>+	0x2b, 0xd8, 0x98, 0xf4, 0x45, 0x54, 0xbb, 0x8c, 0xe9, 0xc9, 0xce, 0x21,</div><div class='add'>+	0xac, 0x47, 0x28, 0x1d, 0xe4, 0x99, 0x2c, 0xf8, 0xeb, 0xeb, 0x44, 0x5c,</div><div class='add'>+	0xc5, 0x9d, 0x09, 0xc3, 0xbb, 0xbb, 0x74, 0xee, 0x9a, 0xfb, 0xd9, 0xde,</div><div class='add'>+	0x5d, 0xf7, 0xa1, 0x9e, 0x26, 0x99, 0x9f, 0x89, 0xe8, 0x7b, 0x93, 0x71,</div><div class='add'>+	0xa5, 0xb3, 0xf9, 0x31, 0xe6, 0xff, 0xc7, 0x26, 0x7e, 0xc7, 0x6c, 0xd8,</div><div class='add'>+	0x2c, 0x6f, 0xd7, 0xfc, 0xbd, 0x51, 0xdd, 0x33, 0xa2, 0x2e, 0x14, 0xe7,</div><div class='add'>+	0xde, 0x50, 0xef, 0x4f, 0xcf, 0x36, 0xa8, 0xfa, 0xa7, 0x67, 0xd7, 0xde,</div><div class='add'>+	0x15, 0x62, 0xd9, 0xdb, 0xb8, 0xbf, 0x21, 0x0b, 0x53, 0x0d, 0xb2, 0x38,</div><div class='add'>+	0x1b, 0x60, 0xbc, 0x96, 0x6e, 0xac, 0x7d, 0x0b, 0xa3, 0xbf, 0x5b, 0x73,</div><div class='add'>+	0x65, 0x08, 0xeb, 0x37, 0x3f, 0x30, 0x29, 0xe5, 0x01, 0xc6, 0x23, 0xea,</div><div class='add'>+	0x3e, 0x20, 0x64, 0xa4, 0x01, 0x58, 0xb4, 0xe0, 0x96, 0x6d, 0xee, 0x03,</div><div class='add'>+	0xb7, 0x68, 0xbd, 0x7e, 0x45, 0xc7, 0x7c, 0xe4, 0x91, 0x21, 0xb9, 0xbe,</div><div class='add'>+	0x09, 0x45, 0x57, 0x59, 0xf1, 0xca, 0xff, 0xd6, 0x88, 0xfd, 0xf3, 0x7b,</div><div class='add'>+	0xa3, 0xa0, 0xc6, 0xb2, 0xfb, 0x35, 0xcf, 0xff, 0x4a, 0xa7, 0x8f, 0xca,</div><div class='add'>+	0x9e, 0x63, 0xbf, 0x0f, 0x5a, 0x9b, 0xbc, 0x3b, 0x4f, 0x52, 0xff, 0x3d,</div><div class='add'>+	0x49, 0x48, 0x7d, 0xcf, 0x12, 0xb2, 0x1f, 0x45, 0x19, 0xf7, 0xc1, 0x1e,</div><div class='add'>+	0x55, 0xf3, 0xe0, 0xbd, 0xba, 0x82, 0xfc, 0xaa, 0xfb, 0x21, 0x7e, 0x2c,</div><div class='add'>+	0xc6, 0xbb, 0x4b, 0x51, 0xdd, 0xdf, 0x0e, 0xbd, 0x8e, 0x63, 0xb2, 0x07,</div><div class='add'>+	0xbe, 0x26, 0x0f, 0x4c, 0xca, 0xfb, 0x5e, 0xe3, 0xc1, 0xfa, 0x31, 0x7d,</div><div class='add'>+	0x59, 0xf6, 0xe2, 0x7c, 0xff, 0xde, 0x41, 0x50, 0xc5, 0x23, 0x2b, 0x7b,</div><div class='add'>+	0x06, 0xba, 0x7c, 0x4c, 0xf6, 0x95, 0xd4, 0xde, 0x81, 0x3a, 0x2f, 0x9c,</div><div class='add'>+	0x84, 0x4e, 0x0e, 0x2a, 0x7f, 0x12, 0x09, 0x0c, 0x55, 0xd2, 0x92, 0x3f,</div><div class='add'>+	0xb9, 0x13, 0xe3, 0x70, 0x1f, 0x2e, 0xa3, 0xcf, 0xe5, 0x76, 0xcb, 0x9e,</div><div class='add'>+	0xaa, 0x37, 0xf6, 0xde, 0x12, 0xdf, 0x27, 0xe1, 0xa3, 0xf9, 0x3e, 0x17,</div><div class='add'>+	0x0f, 0xaa, 0x93, 0x85, 0x5b, 0xd1, 0xb6, 0x41, 0xf3, 0x96, 0xf7, 0xfc,</div><div class='add'>+	0xd9, 0x9e, 0xfa, 0xf7, 0x4f, 0x4c, 0x89, 0xe6, 0xf0, 0x9e, 0x6d, 0xfc,</div><div class='add'>+	0xfe, 0xf6, 0xc2, 0x67, 0x30, 0x36, 0x7e, 0x44, 0x96, 0xe6, 0x26, 0x65,</div><div class='add'>+	0x79, 0xce, 0x97, 0x33, 0xde, 0xb9, 0x26, 0xed, 0x77, 0xeb, 0x3b, 0xd7,</div><div class='add'>+	0x19, 0xac, 0xc3, 0x6a, 0x5e, 0xe5, 0x56, 0x7d, 0x8f, 0xf4, 0x75, 0xd3,</div><div class='add'>+	0xfb, 0x26, 0x70, 0xbb, 0xba, 0x3f, 0xb5, 0x5a, 0xde, 0xd9, 0xcf, 0x57,</div><div class='add'>+	0x4c, 0x9e, 0x33, 0x78, 0x77, 0xc0, 0xda, 0xeb, 0xde, 0xc7, 0xf4, 0xbd,</div><div class='add'>+	0xab, 0xaf, 0xe9, 0xbb, 0xfa, 0xe4, 0xe7, 0xa8, 0xa6, 0xf7, 0x56, 0xe8,</div><div class='add'>+	0x1e, 0xfb, 0x7c, 0x4c, 0xaf, 0x1b, 0xd2, 0x79, 0x3e, 0xab, 0xbb, 0xa6,</div><div class='add'>+	0xfa, 0xec, 0xd5, 0xd4, 0x63, 0xd4, 0xdf, 0x7b, 0x6b, 0xa8, 0x1b, 0x97,</div><div class='add'>+	0xed, 0xe9, 0x1b, 0xfc, 0x3b, 0xe0, 0x2c, 0x3b, 0xa6, 0xef, 0xd7, 0xf9,</div><div class='add'>+	0x77, 0xbe, 0x59, 0xe6, 0xdf, 0x03, 0x23, 0xbf, 0xb8, 0x9f, 0x88, 0xb4,</div><div class='add'>+	0x3a, 0xaa, 0x9f, 0x47, 0xeb, 0xbe, 0x1d, 0xf2, 0xfb, 0x0c, 0xa1, 0x8f,</div><div class='add'>+	0x3b, 0x83, 0xd7, 0xde, 0x11, 0xe7, 0xb7, 0x54, 0x94, 0x45, 0x83, 0xdf,</div><div class='add'>+	0x78, 0x33, 0x06, 0x03, 0x6e, 0xda, 0x28, 0x7b, 0x15, 0x3d, 0x05, 0x75,</div><div class='add'>+	0x57, 0x22, 0xeb, 0x34, 0xc9, 0xa0, 0xe9, 0xe5, 0xf7, 0xce, 0xaf, 0x95,</div><div class='add'>+	0x53, 0x96, 0x6f, 0x8a, 0x48, 0x94, 0xdf, 0x70, 0xf1, 0xfd, 0x7a, 0xdf,</div><div class='add'>+	0x2e, 0x84, 0xf5, 0xf7, 0x53, 0x0e, 0xda, 0x7c, 0x9e, 0xf2, 0x5e, 0x28,</div><div class='add'>+	0xac, 0xdc, 0xd1, 0x2c, 0xa8, 0x3d, 0x52, 0x00, 0x73, 0x7d, 0x57, 0x92,</div><div class='add'>+	0xdf, 0xb0, 0x8b, 0x3c, 0x5d, 0xe1, 0xb7, 0x5c, 0xdb, 0xd5, 0x1d, 0x16,</div><div class='add'>+	0xef, 0x5c, 0x90, 0x74, 0x75, 0x29, 0x9b, 0x5c, 0xae, 0x14, 0xc9, 0x53,</div><div class='add'>+	0xed, 0x57, 0xc3, 0xda, 0xaf, 0x92, 0xc7, 0xc3, 0xe0, 0xf1, 0x5f, 0xeb,</div><div class='add'>+	0x75, 0x61, 0xfb, 0x8c, 0xba, 0x0b, 0x9e, 0x89, 0xf1, 0x6c, 0xea, 0x31,</div><div class='add'>+	0x35, 0x17, 0xda, 0x68, 0xb4, 0x7d, 0x47, 0x50, 0xe9, 0xae, 0xfa, 0x46,</div><div class='add'>+	0x1e, 0xf2, 0xc9, 0x6f, 0xde, 0x61, 0x5f, 0x4b, 0xfc, 0xb6, 0x7d, 0x58,</div><div class='add'>+	0x7d, 0x67, 0x52, 0xae, 0x70, 0x5d, 0xf9, 0x4d, 0xfb, 0x68, 0x9d, 0x3c,</div><div class='add'>+	0x06, 0xf5, 0x58, 0x9b, 0x5a, 0x25, 0xea, 0xad, 0x3b, 0xbf, 0x51, 0x29,</div><div class='add'>+	0x57, 0xfc, 0xfb, 0x9d, 0x1b, 0x96, 0xa8, 0x13, 0xa2, 0x62, 0x6c, 0xef,</div><div class='add'>+	0x3b, 0x9b, 0xb2, 0xfa, 0x6e, 0x25, 0xc1, 0xef, 0x2e, 0xe1, 0x3b, 0x76,</div><div class='add'>+	0xe1, 0x99, 0x67, 0xba, 0xbb, 0x91, 0xc2, 0xe6, 0x54, 0xc6, 0x91, 0x3e,</div><div class='add'>+	0x2c, 0x39, 0xb5, 0xe7, 0xd6, 0x8c, 0xfc, 0x5e, 0x35, 0x76, 0xb1, 0xf2,</div><div class='add'>+	0x80, 0xec, 0x39, 0xf9, 0x10, 0xbf, 0xed, 0x51, 0xdf, 0xe5, 0x67, 0x1d,</div><div class='add'>+	0xd2, 0x18, 0x93, 0x09, 0x35, 0xef, 0x42, 0xed, 0x9b, 0x11, 0xc5, 0xfb,</div><div class='add'>+	0x5c, 0x2b, 0xd7, 0xb4, 0x50, 0x69, 0x06, 0x8d, 0x01, 0x7d, 0xc7, 0x93,</div><div class='add'>+	0x58, 0xdc, 0x9f, 0x7f, 0x94, 0xf7, 0x06, 0x5d, 0x9e, 0xdd, 0xed, 0x29,</div><div class='add'>+	0xf1, 0x0e, 0x67, 0x52, 0xc7, 0xe8, 0xdc, 0xb7, 0xe3, 0xd9, 0x00, 0x65,</div><div class='add'>+	0xdc, 0x4a, 0x8d, 0xc3, 0xfa, 0x87, 0x25, 0xce, 0x73, 0x65, 0x3d, 0x97,</div><div class='add'>+	0xe6, 0xba, 0xb9, 0xf0, 0xde, 0xaa, 0x37, 0x1f, 0x7e, 0x0b, 0x93, 0x2f,</div><div class='add'>+	0xd5, 0x7f, 0xc7, 0xa3, 0xbe, 0x11, 0x57, 0xdf, 0xcd, 0x8c, 0x57, 0x3e,</div><div class='add'>+	0x21, 0x1f, 0x2b, 0x6d, 0xd4, 0xdf, 0xf0, 0x44, 0xe4, 0x63, 0x95, 0xd7,</div><div class='add'>+	0x14, 0x4f, 0xf3, 0xea, 0xfb, 0xa3, 0xb0, 0x5e, 0xb3, 0x98, 0xea, 0xa3,</div><div class='add'>+	0xf6, 0x1d, 0x92, 0x55, 0xf7, 0x4d, 0x4a, 0x58, 0xc6, 0xe7, 0x7f, 0xd9,</div><div class='add'>+	0xb7, 0x48, 0x8f, 0x08, 0xbf, 0x47, 0xb9, 0xe4, 0x4c, 0xca, 0xe3, 0x73,</div><div class='add'>+	0xae, 0x7b, 0x97, 0x43, 0x5c, 0xb7, 0x41, 0x96, 0x63, 0xa3, 0x3b, 0xbe,</div><div class='add'>+	0x67, 0xb7, 0x05, 0xca, 0x33, 0x8d, 0xb0, 0xd7, 0xc4, 0x12, 0x12, 0x65,</div><div class='add'>+	0x7e, 0x7e, 0x86, 0x7a, 0x1a, 0xc2, 0x1c, 0x2d, 0xf3, 0xaa, 0x7c, 0xa6,</div><div class='add'>+	0x95, 0x7b, 0x5e, 0x77, 0x21, 0x8e, 0xfc, 0xb8, 0xe3, 0xd9, 0xe5, 0xcf,</div><div class='add'>+	0x2d, 0xec, 0x94, 0xcf, 0x55, 0x22, 0x81, 0xf2, 0x14, 0xef, 0xfa, 0x59,</div><div class='add'>+	0xc3, 0x73, 0x92, 0x44, 0x3d, 0xf6, 0x0f, 0x79, 0x89, 0x6f, 0x96, 0xa7,</div><div class='add'>+	0x8e, 0xfd, 0xc2, 0xbd, 0x6a, 0xe3, 0x3d, 0x6c, 0xcd, 0xb2, 0xe3, 0xef,</div><div class='add'>+	0xeb, 0x21, 0x86, 0x3f, 0xc2, 0x7a, 0x9b, 0x21, 0x07, 0xf0, 0xdb, 0xd0,</div><div class='add'>+	0x39, 0xc6, 0x98, 0x57, 0xb5, 0xdd, 0x32, 0x8e, 0xdc, 0x2c, 0x57, 0x57,</div><div class='add'>+	0xee, 0x0a, 0x5f, 0x86, 0x6c, 0x27, 0x3c, 0xfe, 0xab, 0x7d, 0xf0, 0x03,</div><div class='add'>+	0x12, 0xfc, 0x22, 0xfc, 0xc4, 0x17, 0x1b, 0x94, 0x6d, 0xa7, 0x3f, 0x43,</div><div class='add'>+	0xfc, 0x81, 0x18, 0x23, 0x84, 0x7e, 0x1e, 0x6c, 0xf5, 0x64, 0x76, 0x52,</div><div class='add'>+	0xe4, 0xcb, 0x4d, 0x92, 0x69, 0x65, 0x0c, 0x2b, 0xbf, 0xc2, 0x7e, 0xd5,</div><div class='add'>+	0xeb, 0x59, 0x4a, 0xbe, 0x42, 0x1d, 0xaf, 0x72, 0x2e, 0xc9, 0xf8, 0x8f,</div><div class='add'>+	0xe5, 0x93, 0x32, 0x1e, 0xe7, 0x5c, 0x1e, 0x91, 0xc2, 0xdc, 0x63, 0xf8,</div><div class='add'>+	0x71, 0x9e, 0xa4, 0xfb, 0x1f, 0xe8, 0x7b, 0x04, 0xa3, 0x52, 0x9c, 0x4a,</div><div class='add'>+	0xcb, 0xc4, 0xec, 0x5e, 0x7e, 0xa3, 0x3b, 0x7c, 0x97, 0x3a, 0x5f, 0xb3,</div><div class='add'>+	0xe2, 0xc9, 0x40, 0x6f, 0x62, 0x82, 0xf7, 0x26, 0xd4, 0x7c, 0xf6, 0x62,</div><div class='add'>+	0x3e, 0xdf, 0x6a, 0xe5, 0xdd, 0xf3, 0xab, 0xb0, 0xbf, 0xc6, 0x71, 0xca,</div><div class='add'>+	0xa1, 0x65, 0x76, 0x06, 0x98, 0xdf, 0x8d, 0xd8, 0x99, 0x65, 0xbb, 0x25,</div><div class='add'>+	0x78, 0x64, 0xc5, 0xce, 0xa3, 0x5c, 0x9f, 0xf3, 0xaa, 0xf6, 0xff, 0x11,</div><div class='add'>+	0x6d, 0x51, 0xef, 0x88, 0xdf, 0xd6, 0xaf, 0xc3, 0xb6, 0x9c, 0xe7, 0x4e,</div><div class='add'>+	0xc4, 0xec, 0x3e, 0x5d, 0x90, 0xc3, 0x78, 0x3d, 0xbf, 0xa3, 0x6b, 0xf8,</div><div class='add'>+	0x1d, 0x22, 0xde, 0x04, 0xbf, 0xc8, 0xe3, 0xa0, 0xe6, 0xf1, 0x9b, 0xe8,</div><div class='add'>+	0xdf, 0x5f, 0x83, 0xbb, 0x50, 0x66, 0xea, 0x6f, 0x03, 0xdf, 0x0a, 0xdf,</div><div class='add'>+	0xc9, 0x73, 0xd6, 0x7f, 0xb0, 0xd5, 0x93, 0x35, 0xd2, 0xb3, 0x1e, 0xcf,</div><div class='add'>+	0x3b, 0xdb, 0xbc, 0x75, 0xd9, 0x0d, 0x7e, 0xf1, 0x4e, 0x67, 0xaf, 0xfa,</div><div class='add'>+	0x4e, 0x20, 0x33, 0xb6, 0x1b, 0xb2, 0xe3, 0xcf, 0xab, 0x17, 0x32, 0xc6,</div><div class='add'>+	0x33, 0x0b, 0xd6, 0xaf, 0xe7, 0x89, 0xe7, 0xf7, 0x82, 0xdc, 0x77, 0xb0,</div><div class='add'>+	0x39, 0x57, 0x60, 0xc2, 0x2f, 0xab, 0xef, 0x82, 0x60, 0x27, 0xdf, 0xb6,</div><div class='add'>+	0xf2, 0x5d, 0xd0, 0xf5, 0xd7, 0x78, 0xa0, 0xcd, 0xf3, 0x51, 0x26, 0x78,</div><div class='add'>+	0xd2, 0xa2, 0xdb, 0xec, 0x06, 0x3e, 0xe5, 0x5e, 0x6c, 0x32, 0xfe, 0xa0,</div><div class='add'>+	0xf8, 0xe3, 0xb8, 0xdb, 0x19, 0x73, 0x0e, 0xf6, 0xf7, 0x22, 0xbe, 0x56,</div><div class='add'>+	0xf7, 0x65, 0xe2, 0xbc, 0x7f, 0x93, 0x0c, 0xec, 0x56, 0x77, 0x27, 0x2e,</div><div class='add'>+	0xac, 0xfa, 0xb6, 0x2b, 0x25, 0x4f, 0xd5, 0x64, 0x65, 0xf8, 0x27, 0x62,</div><div class='add'>+	0x49, 0xe2, 0x26, 0xca, 0x0a, 0xfb, 0xdd, 0xcb, 0x79, 0xc6, 0x1f, 0x52,</div><div class='add'>+	0xf3, 0x34, 0x11, 0xc3, 0xf1, 0x9e, 0x83, 0x19, 0x28, 0xcf, 0x72, 0xdd,</div><div class='add'>+	0x91, 0x2e, 0xf0, 0xd9, 0x3f, 0x6b, 0x55, 0x76, 0x05, 0xe3, 0xb2, 0x8c,</div><div class='add'>+	0xb6, 0x91, 0xef, 0xd3, 0xfa, 0x2c, 0xf6, 0xc3, 0x6d, 0xbc, 0x0f, 0x90,</div><div class='add'>+	0x47, 0xd9, 0xdc, 0xc2, 0xfa, 0xb4, 0x7d, 0x5c, 0xc9, 0xc1, 0x23, 0xe0,</div><div class='add'>+	0xfb, 0x1f, 0xa3, 0xee, 0x63, 0x48, 0x39, 0xc7, 0xf4, 0xca, 0xba, 0x93,</div><div class='add'>+	0xdf, 0x1f, 0x90, 0x01, 0xc8, 0x05, 0xf3, 0x8f, 0x48, 0x51, 0xdd, 0x63,</div><div class='add'>+	0x42, 0x3a, 0xc7, 0x67, 0xda, 0x7a, 0x5b, 0xfb, 0x53, 0xd2, 0xb2, 0x5b,</div><div class='add'>+	0x7f, 0x4f, 0xe6, 0xcb, 0xd3, 0x2e, 0xdd, 0x6e, 0x6c, 0x85, 0x57, 0x0f,</div><div class='add'>+	0x5d, 0x83, 0x37, 0xc2, 0x2b, 0x78, 0xc3, 0x1b, 0xeb, 0xf1, 0x36, 0x1f,</div><div class='add'>+	0x6b, 0x78, 0x73, 0xf0, 0xb0, 0x86, 0x27, 0xe7, 0x7b, 0x25, 0x04, 0x39,</div><div class='add'>+	0x0e, 0xd6, 0xe4, 0x18, 0xb8, 0xc7, 0xd3, 0x99, 0x09, 0x9e, 0x21, 0x2a,</div><div class='add'>+	0x3e, 0x53, 0x0e, 0x29, 0xbf, 0x5c, 0xc7, 0xfa, 0xb5, 0x7e, 0xcf, 0x2f,</div><div class='add'>+	0x59, 0xeb, 0x97, 0xdb, 0x7c, 0xfc, 0xf0, 0x77, 0xd3, 0x83, 0x0b, 0x6d,</div><div class='add'>+	0x35, 0x3d, 0xb8, 0xf9, 0x37, 0xa4, 0x07, 0x6b, 0xe5, 0xb2, 0x5e, 0xa6,</div><div class='add'>+	0x4c, 0xc8, 0x13, 0xd7, 0x8b, 0xf2, 0x44, 0x39, 0x22, 0x2f, 0x69, 0x4f,</div><div class='add'>+	0x1b, 0x19, 0x3b, 0xc5, 0xaf, 0xa8, 0xef, 0x36, 0x26, 0x61, 0x83, 0xda,</div><div class='add'>+	0x02, 0x73, 0x73, 0x31, 0x29, 0x2e, 0xbc, 0x4f, 0xc9, 0xf4, 0x53, 0x55,</div><div class='add'>+	0xda, 0xa5, 0xeb, 0xcd, 0x7d, 0xb5, 0xcd, 0xcd, 0xaf, 0xb1, 0xb9, 0xf9,</div><div class='add'>+	0x15, 0x9b, 0xdb, 0xaa, 0xe3, 0xa5, 0xbf, 0x8b, 0xcd, 0x8d, 0xd5, 0x9d,</div><div class='add'>+	0xcb, 0xf8, 0x67, 0x32, 0x12, 0xc8, 0xf6, 0x44, 0x65, 0x07, 0xfc, 0xc8,</div><div class='add'>+	0xf0, 0xd4, 0x4e, 0xf9, 0x97, 0x53, 0x93, 0xea, 0x8e, 0xd2, 0x5f, 0x38,</div><div class='add'>+	0xc9, 0xf8, 0x03, 0x01, 0x57, 0x3e, 0x80, 0x78, 0x77, 0xbc, 0xa3, 0x41,</div><div class='add'>+	0x76, 0xbc, 0x4b, 0x9d, 0x35, 0x9a, 0xd9, 0x40, 0xbb, 0x70, 0x17, 0x3c,</div><div class='add'>+	0xe7, 0x58, 0x4e, 0x22, 0xc0, 0xfb, 0x6a, 0x8d, 0x32, 0x1e, 0x6b, 0x96,</div><div class='add'>+	0x9d, 0xc0, 0x4e, 0x85, 0x1b, 0x1c, 0xf5, 0x2d, 0x79, 0x46, 0x9d, 0xe5,</div><div class='add'>+	0xdc, 0xb2, 0xd9, 0x1b, 0x17, 0x7c, 0x68, 0x31, 0xe5, 0xab, 0xd5, 0x5b,</div><div class='add'>+	0xd4, 0x77, 0xd1, 0x17, 0x4a, 0xd5, 0xd6, 0xd5, 0x79, 0x3e, 0xff, 0x7b,</div><div class='add'>+	0xd4, 0x89, 0x81, 0x57, 0xf5, 0x77, 0x7f, 0x82, 0x8a, 0x9f, 0xc5, 0xb9,</div><div class='add'>+	0x31, 0x75, 0xa7, 0xea, 0x4a, 0x90, 0xfc, 0x52, 0x71, 0x53, 0x3c, 0x1b,</div><div class='add'>+	0x04, 0xc6, 0x99, 0x01, 0x92, 0xb6, 0x19, 0xf3, 0x69, 0xfc, 0x09, 0xfb,</div><div class='add'>+	0xbf, 0x47, 0x9d, 0xed, 0x2e, 0x81, 0x37, 0xae, 0xda, 0xfb, 0xcd, 0xc7,</div><div class='add'>+	0x88, 0xeb, 0x6b, 0xf7, 0x87, 0xaf, 0xc5, 0xf7, 0xde, 0xb7, 0x67, 0xfa,</div><div class='add'>+	0x1c, 0x42, 0xef, 0x15, 0xe9, 0x18, 0x5c, 0x9d, 0xab, 0xad, 0xf7, 0x7f,</div><div class='add'>+	0x29, 0x88, 0xf5, 0xf8, 0x7f, 0x0f, 0x88, 0xed, 0xac, 0xc3, 0x73, 0xe2,</div><div class='add'>+	0xa8, 0x38, 0x30, 0x43, 0xfe, 0x96, 0xb1, 0x4e, 0xd3, 0x71, 0xdf, 0x9f,</div><div class='add'>+	0x07, 0x3a, 0xcf, 0xd6, 0xc7, 0x81, 0xec, 0x23, 0xa2, 0xee, 0x63, 0xd4,</div><div class='add'>+	0xfe, 0x0f, 0x0e, 0xf7, 0x77, 0x32, 0x81, 0x7b, 0x4a, 0x93, 0x12, 0x3c,</div><div class='add'>+	0x3a, 0x2a, 0xa1, 0x69, 0xee, 0xa5, 0x67, 0xa4, 0x18, 0x73, 0xe5, 0x63,</div><div class='add'>+	0xce, 0xea, 0xd8, 0xa4, 0xd3, 0x58, 0x4b, 0xfb, 0x23, 0x32, 0x78, 0xf2,</div><div class='add'>+	0x31, 0x09, 0x1f, 0xe5, 0xbb, 0x55, 0xe7, 0x28, 0xb0, 0x47, 0x1b, 0x64,</div><div class='add'>+	0x2e, 0xc6, 0xfd, 0xe4, 0xb0, 0x3a, 0x97, 0x5e, 0x1e, 0x7b, 0x2d, 0x5c,</div><div class='add'>+	0x04, 0x56, 0xc8, 0x2b, 0xdb, 0x82, 0x74, 0x25, 0x96, 0x38, 0xbc, 0x99,</div><div class='add'>+	0x3a, 0x85, 0x18, 0x33, 0x30, 0x3e, 0x17, 0x56, 0xf7, 0x83, 0x96, 0x63,</div><div class='add'>+	0xac, 0x8b, 0xf8, 0xfd, 0x28, 0x71, 0x06, 0x6c, 0xc7, 0xa8, 0x44, 0x99,</div><div class='add'>+	0x0f, 0x1e, 0xad, 0xe1, 0x0c, 0xda, 0x84, 0x41, 0x27, 0x26, 0xa1, 0x53,</div><div class='add'>+	0xde, 0xdc, 0xf9, 0x8f, 0x95, 0x8c, 0x13, 0x3b, 0x25, 0x38, 0xcd, 0xe7,</div><div class='add'>+	0xfa, 0x78, 0x88, 0xd8, 0x1d, 0xbe, 0xe1, 0xec, 0x67, 0xd1, 0x1f, 0xdf,</div><div class='add'>+	0x65, 0xf4, 0x37, 0xba, 0xc8, 0x97, 0xff, 0xb6, 0xff, 0x43, 0x81, 0xb2,</div><div class='add'>+	0xff, 0xff, 0x01, 0xe6, 0x8e, 0x9a, 0x21, 0xc0, 0x4e, 0x00, 0x00, 0x00 };</div><div class='ctx'> </div><div class='ctx'> static const u32 bnx2_COM_b06FwData[(0x0/4) + 1] = { 0x0 };</div><div class='ctx'> static const u32 bnx2_COM_b06FwRodata[(0x14/4) + 1] = {</div><div class='del'>-	0x08000f04, 0x08000f4c, 0x08000f80, 0x08000fcc, 0x08001000, 0x00000000</div><div class='add'>+	0x08000e7c, 0x08000ec4, 0x08000ef8, 0x08000f44, 0x08000f78, 0x00000000</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct fw_info bnx2_com_fw_06 = {</div><div class='del'>-	/* Firmware version: 4.0.5 */</div><div class='add'>+	/* Firmware version: 4.4.2 */</div><div class='ctx'> 	.ver_major			= 0x4,</div><div class='del'>-	.ver_minor			= 0x0,</div><div class='del'>-	.ver_fix			= 0x5,</div><div class='add'>+	.ver_minor			= 0x4,</div><div class='add'>+	.ver_fix			= 0x2,</div><div class='ctx'> </div><div class='ctx'> 	.start_addr			= 0x080000f8,</div><div class='ctx'> </div><div class='ctx'> 	.text_addr			= 0x08000000,</div><div class='del'>-	.text_len			= 0x4eac,</div><div class='add'>+	.text_len			= 0x4ebc,</div><div class='ctx'> 	.text_index			= 0x0,</div><div class='ctx'> 	.gz_text			= bnx2_COM_b06FwText,</div><div class='ctx'> 	.gz_text_len			= sizeof(bnx2_COM_b06FwText),</div><div class='hunk'>@@ -872,15 +872,15 @@ static struct fw_info bnx2_com_fw_06 = {</div><div class='ctx'> 	.data_index			= 0x0,</div><div class='ctx'> 	.data				= bnx2_COM_b06FwData,</div><div class='ctx'> </div><div class='del'>-	.sbss_addr			= 0x08004ee0,</div><div class='add'>+	.sbss_addr			= 0x08004f00,</div><div class='ctx'> 	.sbss_len			= 0x38,</div><div class='ctx'> 	.sbss_index			= 0x0,</div><div class='ctx'> </div><div class='del'>-	.bss_addr			= 0x08004f18,</div><div class='add'>+	.bss_addr			= 0x08004f38,</div><div class='ctx'> 	.bss_len			= 0xbc,</div><div class='ctx'> 	.bss_index			= 0x0,</div><div class='ctx'> </div><div class='del'>-	.rodata_addr			= 0x08004eac,</div><div class='add'>+	.rodata_addr			= 0x08004ebc,</div><div class='ctx'> 	.rodata_len			= 0x14,</div><div class='ctx'> 	.rodata_index			= 0x0,</div><div class='ctx'> 	.rodata				= bnx2_COM_b06FwRodata,</div><div class='hunk'>@@ -902,1231 +902,1232 @@ static const struct cpu_reg cpu_reg_com = {</div><div class='ctx'> 	.mips_view_base = 0x8000000,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> static u8 bnx2_CP_b06FwText[] = {</div><div class='del'>-	0x9d, 0xbc, 0x0d, 0x78, 0x13, 0xe7, 0x99, 0x2e, 0x7c, 0xcf, 0x48, 0xb2,</div><div class='del'>-	0x65, 0x5b, 0xb6, 0xc7, 0xb6, 0x0c, 0x22, 0x65, 0x41, 0x83, 0x47, 0x20,</div><div class='del'>-	0x62, 0x27, 0x1d, 0x81, 0x49, 0x94, 0xac, 0x36, 0xa8, 0xc6, 0x01, 0x93,</div><div class='del'>-	0x90, 0xc6, 0x34, 0xb4, 0x75, 0x7a, 0xd2, 0x8d, 0x62, 0x0c, 0x21, 0x84,</div><div class='del'>-	0x10, 0x67, 0x9b, 0x9e, 0xe3, 0x7c, 0x5f, 0xce, 0x5a, 0x35, 0x06, 0x0c,</div><div class='del'>-	0xc8, 0x96, 0x31, 0x0e, 0x90, 0xfd, 0x7a, 0x9d, 0x18, 0x6c, 0x30, 0x49,</div><div class='del'>-	0x65, 0x8b, 0x34, 0x74, 0x97, 0xf4, 0xa3, 0x45, 0x07, 0xf2, 0xe3, 0xfc,</div><div class='del'>-	0x35, 0xa4, 0xed, 0x76, 0xdb, 0x3d, 0x39, 0x89, 0x0f, 0x25, 0x84, 0xb4,</div><div class='del'>-	0xdd, 0xfc, 0xb4, 0xdd, 0x2d, 0x69, 0x9b, 0xcc, 0x77, 0x3f, 0x23, 0x09,</div><div class='del'>-	0x0c, 0x4d, 0x7f, 0xf6, 0xf3, 0x75, 0xcd, 0x65, 0xcd, 0xcc, 0xfb, 0xf3,</div><div class='del'>-	0xbc, 0xcf, 0xfb, 0x3c, 0xf7, 0x73, 0x3f, 0xef, 0xbc, 0x33, 0xb3, 0x80,</div><div class='del'>-	0x62, 0xe4, 0xfe, 0x4a, 0x79, 0x5c, 0x5d, 0xdf, 0xbe, 0x1a, 0x8b, 0xae,</div><div class='del'>-	0x36, 0xe5, 0xdc, 0xe9, 0x82, 0x13, 0x7f, 0xe1, 0x9f, 0xff, 0x2f, 0x2d,</div><div class='del'>-	0x38, 0xe5, 0xcf, 0x01, 0x68, 0xf9, 0x7e, 0xe5, 0x80, 0x5b, 0x8d, 0x3c,</div><div class='del'>-	0xf3, 0x5f, 0x1a, 0x0c, 0xb8, 0x1d, 0x91, 0x9e, 0xd6, 0xd5, 0x06, 0x10,</div><div class='del'>-	0x4d, 0xd5, 0xfa, 0x97, 0xe0, 0x23, 0x2b, 0xee, 0x75, 0x42, 0xae, 0xff,</div><div class='del'>-	0x55, 0xe4, 0xf7, 0x9d, 0xdf, 0xb9, 0x56, 0x7f, 0x7f, 0xc8, 0x01, 0xb7,</div><div class='del'>-	0x16, 0xe9, 0x80, 0x36, 0x17, 0xee, 0x99, 0xac, 0xf3, 0xf5, 0x79, 0xdb,</div><div class='del'>-	0x15, 0x94, 0xe5, 0xdb, 0x3a, 0x67, 0x7d, 0x67, 0x9e, 0x2f, 0x56, 0x14,</div><div class='del'>-	0xd1, 0x70, 0x3c, 0x8d, 0xe6, 0xba, 0xde, 0x4e, 0xab, 0xd4, 0x08, 0xc1,</div><div class='del'>-	0x6d, 0x18, 0x2d, 0xbd, 0x8a, 0x27, 0xbc, 0x7e, 0x11, 0x3c, 0x85, 0x06,</div><div class='del'>-	0xe2, 0x57, 0x44, 0xd0, 0x7c, 0xe5, 0x58, 0x71, 0xdc, 0x19, 0x71, 0xa3,</div><div class='del'>-	0x29, 0xed, 0x8e, 0x7f, 0x2a, 0x62, 0x60, 0x59, 0xfa, 0xfa, 0x62, 0x94,</div><div class='del'>-	0xb9, 0xd1, 0x9d, 0xfe, 0xa8, 0x28, 0xdb, 0x5e, 0x73, 0xee, 0xff, 0xec,</div><div class='del'>-	0xaa, 0xec, 0xff, 0x69, 0x31, 0x67, 0x04, 0xd8, 0x9c, 0xb0, 0xac, 0x82,</div><div class='del'>-	0xc8, 0x6d, 0xb7, 0xa9, 0x11, 0xc3, 0x77, 0x10, 0x8b, 0xd1, 0xaa, 0xe1,</div><div class='del'>-	0xe1, 0x2d, 0xf5, 0xbf, 0x54, 0x4e, 0x0c, 0xb2, 0xe1, 0x51, 0x07, 0xa2,</div><div class='del'>-	0xda, 0x33, 0xfc, 0x3f, 0x6b, 0x56, 0x4b, 0xd8, 0xc0, 0xde, 0xd1, 0xf3,</div><div class='del'>-	0xbc, 0xee, 0xb4, 0xaf, 0x6d, 0xda, 0x33, 0x6b, 0xd6, 0xed, 0xe1, 0x67,</div><div class='del'>-	0xf0, 0xe8, 0xa8, 0xfc, 0xbe, 0x1b, 0x9d, 0x75, 0x0a, 0x26, 0x6f, 0x5b,</div><div class='del'>-	0x0b, 0x87, 0x61, 0xa0, 0x7b, 0x8f, 0xe2, 0xec, 0xaa, 0x53, 0x11, 0xf5,</div><div class='del'>-	0xea, 0xc1, 0x18, 0x95, 0xef, 0x34, 0x10, 0x2b, 0x8c, 0x84, 0x9d, 0xef,</div><div class='del'>-	0x24, 0x22, 0x9a, 0xc3, 0xb0, 0xac, 0x60, 0x68, 0x3a, 0x1c, 0x15, 0x96,</div><div class='del'>-	0xf5, 0xb4, 0xe9, 0x81, 0xff, 0x8b, 0xcf, 0x21, 0x3e, 0xdc, 0x0c, 0xd5,</div><div class='del'>-	0x78, 0x0e, 0x5d, 0xc3, 0xcf, 0xe1, 0xb1, 0x5d, 0xc5, 0x98, 0xac, 0xe2,</div><div class='del'>-	0x78, 0x93, 0x3e, 0x7c, 0x67, 0x9e, 0xf4, 0x2d, 0x72, 0xd4, 0xf1, 0x70,</div><div class='del'>-	0x63, 0xd2, 0xf1, 0x06, 0xff, 0x4b, 0x99, 0xf3, 0xd6, 0xe4, 0xf4, 0x8b,</div><div class='del'>-	0x65, 0x36, 0xb3, 0x4c, 0xf7, 0x65, 0x65, 0xe2, 0xc3, 0x11, 0xbc, 0x94,</div><div class='del'>-	0x50, 0xb0, 0x3e, 0x54, 0x86, 0x68, 0x85, 0x8c, 0xd7, 0xb2, 0x46, 0xcd,</div><div class='del'>-	0xb3, 0xd6, 0xa4, 0x26, 0x7d, 0x4d, 0xe0, 0x65, 0xde, 0xdb, 0x12, 0x3a,</div><div class='del'>-	0x63, 0x65, 0xbc, 0xd2, 0x5e, 0x3b, 0x6d, 0x67, 0x25, 0xaf, 0x3b, 0x91,</div><div class='del'>-	0x4c, 0x20, 0x56, 0x16, 0xb9, 0x8d, 0xe7, 0xba, 0xf9, 0xae, 0xe2, 0x76,</div><div class='del'>-	0xbf, 0x97, 0x70, 0x7f, 0xb1, 0xd4, 0x50, 0x1f, 0x2c, 0xa7, 0x01, 0xbd,</div><div class='del'>-	0x42, 0x99, 0x8f, 0x9a, 0x6b, 0xe1, 0x32, 0x1e, 0x10, 0x5b, 0xe3, 0xb8,</div><div class='del'>-	0x7e, 0x68, 0x61, 0x7a, 0xbe, 0xbe, 0xb4, 0xeb, 0xc6, 0x96, 0xa4, 0x65,</div><div class='del'>-	0x6d, 0x33, 0xa3, 0xd7, 0x15, 0xd1, 0x20, 0x4e, 0x26, 0x9a, 0xe1, 0x8e,</div><div class='del'>-	0x04, 0xfc, 0xe7, 0x10, 0xc6, 0x92, 0xb4, 0x17, 0xcf, 0x26, 0xe0, 0x6c,</div><div class='del'>-	0x98, 0xe7, 0x45, 0x57, 0x3a, 0x82, 0x1b, 0xd3, 0x26, 0x1a, 0xd3, 0x7f,</div><div class='del'>-	0xde, 0xb2, 0x6e, 0x4e, 0xfa, 0x39, 0x86, 0x8f, 0xac, 0xec, 0x18, 0x64,</div><div class='del'>-	0x7c, 0xd9, 0xff, 0xdd, 0xc9, 0x2b, 0xb0, 0x9d, 0x73, 0xb4, 0x95, 0xf3,</div><div class='del'>-	0xb7, 0x3c, 0x94, 0x89, 0x16, 0x41, 0x37, 0xcf, 0x21, 0x82, 0xa5, 0x69,</div><div class='del'>-	0x83, 0x73, 0x1a, 0xc1, 0x92, 0x64, 0x8d, 0x36, 0x8c, 0xf9, 0x88, 0xfa,</div><div class='del'>-	0xb2, 0x36, 0xbd, 0x83, 0xe3, 0x6d, 0x0d, 0x34, 0xa3, 0x94, 0x36, 0x92,</div><div class='del'>-	0x5a, 0x14, 0x46, 0x03, 0xfb, 0x5f, 0xf1, 0x17, 0xf4, 0x7f, 0x2b, 0xfb,</div><div class='del'>-	0x7f, 0x97, 0xfd, 0x67, 0xec, 0xfe, 0xe1, 0xbc, 0x89, 0xe7, 0x6e, 0xda,</div><div class='del'>-	0xe3, 0xf6, 0x94, 0xd3, 0xb9, 0x3c, 0xe9, 0xc5, 0xb6, 0x94, 0x49, 0x9b,</div><div class='del'>-	0x93, 0x5b, 0x3e, 0x6c, 0x19, 0x9c, 0x89, 0xad, 0x83, 0xba, 0xef, 0x79,</div><div class='del'>-	0xfe, 0xde, 0x34, 0x72, 0x05, 0x36, 0x0f, 0x2a, 0xd8, 0x6f, 0x5c, 0x81,</div><div class='del'>-	0x2e, 0xfe, 0xde, 0x3b, 0x38, 0x0b, 0x8f, 0x0e, 0x3a, 0x10, 0xae, 0xba,</div><div class='del'>-	0x74, 0x1c, 0x93, 0x8e, 0x2b, 0x10, 0x1f, 0xf1, 0xa3, 0x2b, 0xf1, 0xa2,</div><div class='del'>-	0xad, 0xc3, 0xd2, 0xc8, 0xff, 0x9b, 0xf7, 0x63, 0xfa, 0x8e, 0x1f, 0xab,</div><div class='del'>-	0x13, 0x1a, 0xba, 0x92, 0x0e, 0xb1, 0x4b, 0xfe, 0xfd, 0x92, 0xf7, 0x34,</div><div class='del'>-	0x6c, 0x4a, 0xe7, 0xeb, 0x8b, 0x9f, 0xf9, 0xd1, 0x90, 0x98, 0xa0, 0x9f,</div><div class='del'>-	0xd4, 0xd3, 0x47, 0x4c, 0x7c, 0x37, 0x5d, 0x87, 0x7f, 0x4a, 0x07, 0xf1,</div><div class='del'>-	0x8f, 0xd4, 0xc3, 0xb7, 0xd2, 0x7e, 0x1c, 0x49, 0xcf, 0xc4, 0x53, 0x69,</div><div class='del'>-	0x1f, 0xbe, 0x49, 0xfd, 0x3f, 0x99, 0x6e, 0xa6, 0xed, 0x6a, 0x38, 0x9c,</div><div class='del'>-	0x16, 0xfd, 0x15, 0x50, 0xde, 0x62, 0x6c, 0x1a, 0xac, 0x09, 0x9e, 0xa4,</div><div class='del'>-	0x6d, 0xfc, 0xa3, 0x79, 0x13, 0x32, 0x95, 0xf5, 0xb6, 0x4d, 0x6d, 0xe3,</div><div class='del'>-	0xf5, 0xed, 0x83, 0x35, 0xd1, 0x2b, 0x15, 0xcb, 0x52, 0x43, 0xb5, 0xe1,</div><div class='del'>-	0x13, 0xaa, 0x8a, 0x49, 0xaf, 0xee, 0xcf, 0xa8, 0xba, 0x3f, 0x0a, 0x17,</div><div class='del'>-	0x12, 0xb4, 0xed, 0x78, 0xb5, 0x3e, 0x14, 0xa7, 0x4d, 0x78, 0x8d, 0x7d,</div><div class='del'>-	0x40, 0x99, 0xee, 0x8f, 0xab, 0x6e, 0x6c, 0x4d, 0xea, 0x7b, 0xe3, 0xaa,</div><div class='del'>-	0x07, 0xf1, 0x74, 0x31, 0xfe, 0x6d, 0x50, 0xef, 0x89, 0xab, 0x9f, 0x45,</div><div class='del'>-	0xbc, 0xd2, 0xb2, 0xbe, 0x19, 0x42, 0xfb, 0xf4, 0x08, 0xa2, 0xd5, 0x11,</div><div class='del'>-	0xc4, 0x66, 0x45, 0xbc, 0x48, 0x26, 0x81, 0x77, 0x7b, 0x0d, 0xdf, 0xbf,</div><div class='del'>-	0x28, 0xcd, 0xf8, 0x6a, 0xb3, 0xee, 0xf7, 0xab, 0xb5, 0xf1, 0x61, 0x75,</div><div class='del'>-	0x11, 0x5d, 0x12, 0x7e, 0x5f, 0x64, 0x19, 0x3a, 0xec, 0x6b, 0x0a, 0x34,</div><div class='del'>-	0xc3, 0x83, 0x4d, 0xc9, 0xeb, 0x10, 0xf3, 0xd6, 0xb4, 0xec, 0x54, 0x6b,</div><div class='del'>-	0xce, 0x9b, 0xaa, 0x3e, 0xd1, 0xac, 0x5a, 0xd6, 0x07, 0x0b, 0xdf, 0xb5,</div><div class='del'>-	0xfc, 0xd3, 0x2c, 0x6b, 0xc1, 0x42, 0xe9, 0xd3, 0x8f, 0x8a, 0x88, 0x89,</div><div class='del'>-	0x95, 0xf6, 0x1c, 0x14, 0xe3, 0xec, 0x60, 0x25, 0xfb, 0xd0, 0xf0, 0xcf,</div><div class='del'>-	0xd7, 0xea, 0xc1, 0xb5, 0x6a, 0x31, 0xde, 0x1a, 0x29, 0xc6, 0x69, 0x8e,</div><div class='del'>-	0xe7, 0x97, 0x83, 0x3e, 0xfc, 0x7a, 0xd0, 0xb2, 0xbe, 0x68, 0xfe, 0x35,</div><div class='del'>-	0x06, 0x2a, 0xfb, 0xf1, 0x4f, 0xe3, 0x5e, 0xfc, 0x1b, 0x75, 0x7b, 0x26,</div><div class='del'>-	0x11, 0x7d, 0xa0, 0x0a, 0x7a, 0x74, 0x5c, 0x39, 0x79, 0x67, 0x19, 0x6a,</div><div class='del'>-	0x9b, 0xcb, 0x14, 0xbd, 0x69, 0x07, 0x74, 0xdf, 0x95, 0x8a, 0x17, 0xe7,</div><div class='del'>-	0x52, 0x1a, 0x7e, 0x9a, 0xaa, 0x09, 0xff, 0x80, 0x7d, 0xfe, 0x87, 0xf9,</div><div class='del'>-	0xb4, 0x95, 0x99, 0x26, 0x7a, 0x13, 0x1d, 0x51, 0xcf, 0x49, 0xea, 0x39,</div><div class='del'>-	0x49, 0x3d, 0x27, 0xa9, 0x67, 0xca, 0x70, 0x24, 0x49, 0x3d, 0x53, 0x77,</div><div class='del'>-	0xdf, 0xa4, 0x4d, 0x3c, 0x99, 0xa4, 0x8e, 0x93, 0x32, 0x47, 0x61, 0xfa,</div><div class='del'>-	0xe7, 0xa7, 0xf0, 0xf7, 0xf6, 0xdc, 0xbd, 0x6c, 0xfd, 0x37, 0xaf, 0x8c,</div><div class='del'>-	0xe9, 0xfe, 0x69, 0x59, 0xfc, 0x91, 0xb1, 0xbd, 0x64, 0xc5, 0x34, 0x19,</div><div class='del'>-	0x97, 0x8c, 0xcf, 0xd6, 0x9f, 0xbf, 0x5d, 0xf9, 0xaa, 0x82, 0x62, 0xcb,</div><div class='del'>-	0xda, 0x65, 0xe6, 0xee, 0x7b, 0xf3, 0xe3, 0xfb, 0x8c, 0x92, 0xb5, 0x8b,</div><div class='del'>-	0x7f, 0x72, 0x53, 0xdf, 0xc1, 0xa8, 0xba, 0x88, 0xe7, 0x7a, 0x3c, 0x8a,</div><div class='del'>-	0x9b, 0x0a, 0x2f, 0x3d, 0xbf, 0xb6, 0x5a, 0xe6, 0xc3, 0x7f, 0xe1, 0x9c,</div><div class='del'>-	0xf6, 0x64, 0xf7, 0xf7, 0x45, 0x9e, 0xcb, 0x58, 0x04, 0x53, 0xc5, 0x06,</div><div class='del'>-	0xbc, 0xb4, 0x97, 0x45, 0xb9, 0x7b, 0x88, 0xab, 0x91, 0x76, 0x34, 0xd7,</div><div class='del'>-	0xef, 0xb5, 0xfb, 0x28, 0xe8, 0x13, 0xbb, 0x57, 0xf0, 0xee, 0x75, 0x0a,</div><div class='del'>-	0x4e, 0x84, 0x0c, 0xda, 0xcc, 0x10, 0xfd, 0x1a, 0x28, 0xec, 0x83, 0xdb,</div><div class='del'>-	0x13, 0x89, 0x20, 0xd1, 0x0b, 0x77, 0x51, 0x24, 0x8c, 0xf9, 0xbd, 0x35,</div><div class='del'>-	0xeb, 0xce, 0x42, 0x0f, 0xf6, 0x2a, 0x7a, 0x33, 0x50, 0x6b, 0x8e, 0x51,</div><div class='del'>-	0x8f, 0x57, 0x2a, 0xba, 0xbf, 0x40, 0x81, 0x5b, 0x61, 0xb9, 0x40, 0x6a,</div><div class='del'>-	0x08, 0x5b, 0xd3, 0xf2, 0x3b, 0x0c, 0x23, 0xf5, 0xeb, 0x7c, 0x5f, 0xb4,</div><div class='del'>-	0xeb, 0x76, 0xda, 0xf5, 0x59, 0x8e, 0x5d, 0xf7, 0x13, 0x1f, 0xdd, 0xae,</div><div class='del'>-	0xc8, 0x3a, 0x1c, 0x48, 0xc0, 0x5d, 0x10, 0xd9, 0x80, 0xe7, 0x12, 0x1f,</div><div class='del'>-	0x57, 0xe7, 0xcb, 0x29, 0x2c, 0xe7, 0x4f, 0x4d, 0x95, 0xe5, 0x0d, 0x2b,</div><div class='del'>-	0xea, 0xcd, 0xca, 0x52, 0xdc, 0x37, 0x84, 0x1d, 0x49, 0xa9, 0x1b, 0xb1,</div><div class='del'>-	0xeb, 0x3a, 0xd9, 0x47, 0x77, 0xa2, 0xa6, 0xe9, 0x66, 0x45, 0x0f, 0x3f,</div><div class='del'>-	0x8e, 0xda, 0xe8, 0x3b, 0x9c, 0xc3, 0x2e, 0xe8, 0xe7, 0xd7, 0x21, 0x2b,</div><div class='del'>-	0xcb, 0xbc, 0x54, 0x56, 0x8e, 0xc5, 0x29, 0x28, 0xb7, 0x27, 0xe1, 0xf1,</div><div class='del'>-	0x19, 0x55, 0x39, 0x5f, 0x84, 0x72, 0x0b, 0xe7, 0x4f, 0x35, 0xfc, 0xb8,</div><div class='del'>-	0x85, 0x36, 0xb4, 0x61, 0x97, 0x85, 0x4d, 0xa1, 0x4a, 0xfa, 0x5b, 0x33,</div><div class='del'>-	0xca, 0x88, 0x87, 0x1b, 0x35, 0x44, 0xcb, 0x23, 0x61, 0xe5, 0xd6, 0xf4,</div><div class='del'>-	0xce, 0x9c, 0xfe, 0x9f, 0xae, 0xa4, 0x7c, 0x4a, 0x63, 0xf2, 0xf2, 0xeb,</div><div class='del'>-	0x1f, 0xe5, 0xc7, 0x77, 0xd9, 0xf5, 0xb9, 0x05, 0x9f, 0x5c, 0xbe, 0x56,</div><div class='del'>-	0x1b, 0x81, 0xc2, 0x78, 0x51, 0x44, 0xfd, 0xea, 0x8c, 0xd2, 0xd1, 0xa0,</div><div class='del'>-	0xcb, 0xbe, 0xe6, 0xc0, 0x90, 0x33, 0xea, 0x73, 0xe0, 0xf7, 0x56, 0x74,</div><div class='del'>-	0x95, 0x5c, 0x2b, 0x46, 0xac, 0xb9, 0xd6, 0xe7, 0x44, 0x6d, 0x78, 0x33,</div><div class='del'>-	0xfd, 0x6d, 0x72, 0x55, 0x03, 0xef, 0x05, 0xcc, 0x93, 0xa8, 0xf1, 0x6f,</div><div class='del'>-	0x86, 0xfc, 0xfe, 0x90, 0x36, 0xd2, 0x20, 0x75, 0x59, 0x46, 0x6c, 0x4e,</div><div class='del'>-	0xd7, 0x4e, 0xc2, 0x8b, 0xcd, 0xb4, 0xbf, 0xc2, 0x88, 0x6e, 0x2e, 0x73,</div><div class='del'>-	0x38, 0x71, 0x88, 0x38, 0xec, 0x30, 0x7a, 0x50, 0xc8, 0x31, 0x32, 0x3e,</div><div class='del'>-	0xe2, 0xf1, 0x04, 0xf0, 0x62, 0xbf, 0x85, 0x86, 0x90, 0x07, 0x4b, 0x6c,</div><div class='del'>-	0xdb, 0x3c, 0xaa, 0xdc, 0x98, 0xfc, 0xd8, 0x1a, 0x72, 0x16, 0x45, 0xd5,</div><div class='del'>-	0x48, 0xc0, 0x77, 0x9a, 0xd1, 0xbc, 0x20, 0x52, 0xab, 0x39, 0x11, 0x57,</div><div class='del'>-	0x9a, 0xd2, 0xdd, 0xca, 0xf2, 0x74, 0x8f, 0xb2, 0xc4, 0xc6, 0x9c, 0xa3,</div><div class='del'>-	0xca, 0xd2, 0xb4, 0x07, 0xa9, 0x7e, 0x05, 0x3b, 0x42, 0x94, 0xab, 0x3a,</div><div class='del'>-	0x6b, 0xc7, 0xe9, 0x7e, 0x95, 0x18, 0xf9, 0x2e, 0x31, 0x52, 0x0f, 0x83,</div><div class='del'>-	0x7d, 0x3f, 0x9d, 0xa8, 0xc4, 0x51, 0x62, 0xe1, 0x4f, 0x52, 0xe5, 0x2a,</div><div class='del'>-	0x8a, 0xaf, 0xc0, 0x8f, 0x47, 0xca, 0x30, 0x36, 0x38, 0x8b, 0xbf, 0xeb,</div><div class='del'>-	0xf0, 0xca, 0x88, 0x65, 0x75, 0x9b, 0x96, 0x75, 0xc0, 0x3c, 0xaa, 0x34,</div><div class='del'>-	0xb0, 0xcf, 0xa8, 0x33, 0x1e, 0x2d, 0x8c, 0x04, 0xcc, 0xad, 0xec, 0xd3,</div><div class='del'>-	0x11, 0x89, 0x2b, 0x51, 0xf6, 0x77, 0x23, 0xfb, 0x5b, 0x9a, 0xeb, 0x2f,</div><div class='del'>-	0xdb, 0xaf, 0xc8, 0x22, 0xf5, 0xf2, 0x75, 0xc2, 0xac, 0x03, 0x1c, 0x4c,</div><div class='del'>-	0x04, 0x82, 0xf9, 0x7a, 0x4b, 0x59, 0xe7, 0xc6, 0x0b, 0x75, 0x80, 0xe1,</div><div class='del'>-	0x44, 0x90, 0x73, 0x2a, 0xb6, 0xee, 0x67, 0xec, 0xf9, 0x1a, 0x9c, 0x46,</div><div class='del'>-	0x3d, 0x5a, 0x87, 0x85, 0x47, 0x84, 0xd5, 0xec, 0x3c, 0x49, 0xfc, 0x74,</div><div class='del'>-	0xdb, 0x31, 0x6b, 0xd2, 0x21, 0x71, 0x34, 0x88, 0x5e, 0xfa, 0x75, 0x57,</div><div class='del'>-	0x52, 0x6c, 0xbc, 0xfe, 0xcb, 0x89, 0x80, 0x82, 0x6f, 0x04, 0x32, 0xcd,</div><div class='del'>-	0xa5, 0x28, 0xc7, 0xba, 0x90, 0xd8, 0xa6, 0xf9, 0xe5, 0xe7, 0x0c, 0x3d,</div><div class='del'>-	0xbc, 0x42, 0xe1, 0x9c, 0x05, 0xf4, 0xa6, 0xa5, 0x0a, 0x10, 0x18, 0x03,</div><div class='del'>-	0xce, 0xa4, 0xca, 0xb1, 0xda, 0x74, 0x40, 0xad, 0x08, 0xa2, 0x27, 0x3d,</div><div class='del'>-	0x15, 0xd7, 0x4d, 0xe2, 0xb4, 0xb4, 0x17, 0xa4, 0x5f, 0x97, 0x60, 0x99,</div><div class='del'>-	0x96, 0xb5, 0x69, 0x37, 0xdb, 0x76, 0x07, 0x32, 0x41, 0x95, 0xf1, 0xea,</div><div class='del'>-	0x10, 0x2f, 0x9c, 0x64, 0x5c, 0x6a, 0x30, 0x5c, 0x68, 0xd3, 0xca, 0xd1,</div><div class='del'>-	0x60, 0xfe, 0xd6, 0x5a, 0xb6, 0x4a, 0xee, 0x5d, 0xc4, 0xf7, 0x42, 0xf6,</div><div class='del'>-	0xfb, 0xb6, 0xa1, 0xfb, 0x47, 0x79, 0x92, 0x49, 0x65, 0xaf, 0xc7, 0x19,</div><div class='del'>-	0x73, 0x36, 0xb1, 0xdd, 0x2d, 0x6c, 0x77, 0xad, 0xa6, 0x47, 0xe3, 0x17,</div><div class='del'>-	0xca, 0x65, 0x82, 0x0e, 0xe8, 0x9a, 0x94, 0x6d, 0x64, 0xbb, 0xab, 0xd9,</div><div class='del'>-	0x6e, 0x8f, 0x26, 0xf2, 0xfd, 0xd6, 0x5a, 0xbb, 0x4a, 0xee, 0x65, 0xed,</div><div class='del'>-	0x23, 0xdb, 0x6e, 0xbd, 0xb4, 0x6b, 0x8e, 0xe6, 0xfa, 0x3a, 0x91, 0x40,</div><div class='del'>-	0xbf, 0x23, 0xc2, 0x18, 0x59, 0x1f, 0xf0, 0x77, 0x31, 0x5e, 0x36, 0x32,</div><div class='del'>-	0x76, 0x64, 0x6d, 0x62, 0x6a, 0xbc, 0x42, 0xfc, 0x62, 0x19, 0xb9, 0x26,</div><div class='del'>-	0xe5, 0xc4, 0xd6, 0x26, 0xa9, 0x67, 0x89, 0x2f, 0x3e, 0xea, 0x57, 0xb0,</div><div class='del'>-	0xc5, 0x89, 0xc3, 0x09, 0xe2, 0x3f, 0xbe, 0x46, 0xbb, 0xf3, 0xa3, 0x39,</div><div class='del'>-	0x5d, 0x83, 0xb6, 0x5d, 0x8c, 0x63, 0x66, 0x05, 0x6d, 0x3d, 0x6b, 0x6f,</div><div class='del'>-	0xcb, 0xd8, 0xf6, 0xa4, 0xdd, 0x76, 0x5c, 0x69, 0x4e, 0xd7, 0x6a, 0x15,</div><div class='del'>-	0x8c, 0x99, 0xc7, 0x2f, 0x60, 0xe7, 0xec, 0x68, 0x71, 0x24, 0xd0, 0xb4,</div><div class='del'>-	0x9e, 0x93, 0xe4, 0x66, 0x7c, 0xfb, 0xce, 0xbc, 0x6e, 0xda, 0x45, 0x0f,</div><div class='del'>-	0xed, 0x30, 0x3b, 0xbf, 0x4d, 0x62, 0x70, 0xc4, 0x38, 0xa8, 0x35, 0x58,</div><div class='del'>-	0xbb, 0x4b, 0xfe, 0x93, 0x6b, 0xd4, 0x3f, 0xca, 0x6b, 0x35, 0x58, 0x3d,</div><div class='del'>-	0xfc, 0x0d, 0xda, 0x99, 0xee, 0x13, 0x3b, 0xec, 0xba, 0x20, 0x97, 0xc8,</div><div class='del'>-	0x24, 0xb2, 0x89, 0x4c, 0xff, 0x37, 0xcb, 0xcd, 0xa4, 0x7e, 0x04, 0x1b,</div><div class='del'>-	0x2b, 0x29, 0xcf, 0x36, 0xf2, 0x99, 0xa3, 0xca, 0x67, 0x29, 0x4f, 0xc6,</div><div class='del'>-	0xe5, 0xc5, 0x63, 0x49, 0x91, 0x47, 0x89, 0xce, 0x88, 0xcc, 0xc4, 0xf9,</div><div class='del'>-	0x64, 0x20, 0xfe, 0x34, 0x44, 0xb6, 0x6e, 0xa5, 0x45, 0xea, 0x27, 0x7b,</div><div class='del'>-	0x78, 0x2f, 0x2f, 0x23, 0xb4, 0x72, 0x5b, 0xb6, 0xac, 0x4c, 0xb7, 0x72,</div><div class='del'>-	0xae, 0x5d, 0xc6, 0xfd, 0xa5, 0x28, 0x73, 0xd2, 0xd6, 0xa4, 0xed, 0x9f,</div><div class='del'>-	0x59, 0x51, 0x6d, 0x13, 0xaf, 0x79, 0x39, 0x4f, 0x6e, 0xc6, 0x75, 0x3d,</div><div class='del'>-	0x78, 0x8b, 0x43, 0x69, 0xf6, 0x48, 0xbc, 0xa6, 0x7d, 0xa6, 0x52, 0x4e,</div><div class='del'>-	0x3c, 0x93, 0x58, 0xba, 0xb4, 0xc4, 0xb8, 0x1a, 0xdf, 0x18, 0xf1, 0x61,</div><div class='del'>-	0x84, 0x73, 0xfb, 0x62, 0x42, 0xe2, 0xeb, 0x4c, 0x3c, 0x91, 0xf2, 0xe0,</div><div class='del'>-	0x85, 0x84, 0x1f, 0x8f, 0x33, 0xfe, 0x4c, 0x24, 0x0c, 0x1c, 0x4a, 0x79,</div><div class='del'>-	0xf1, 0x3c, 0xed, 0x79, 0x34, 0xe5, 0xa3, 0xbd, 0xd4, 0x61, 0x38, 0xd5,</div><div class='del'>-	0x6c, 0x8f, 0xe1, 0xd9, 0xc4, 0xab, 0x32, 0xd6, 0xa0, 0x8c, 0x75, 0x8b,</div><div class='del'>-	0x3d, 0xd6, 0x7c, 0x9c, 0x9f, 0x79, 0x61, 0x1e, 0x4e, 0x25, 0x6c, 0x1c,</div><div class='del'>-	0xe8, 0x59, 0xe6, 0x90, 0x79, 0xa0, 0xcd, 0x0e, 0x08, 0x16, 0xe8, 0xfd,</div><div class='del'>-	0x71, 0x58, 0xd8, 0x6f, 0xce, 0xa0, 0xff, 0xf7, 0x50, 0x5e, 0xea, 0x94,</div><div class='del'>-	0xe3, 0x87, 0xab, 0x2c, 0x5a, 0x1a, 0x09, 0xc4, 0x7a, 0xa9, 0x77, 0x67,</div><div class='del'>-	0x44, 0xf4, 0x90, 0xd5, 0xfb, 0x8a, 0xf4, 0x51, 0x45, 0xb8, 0xda, 0x95,</div><div class='del'>-	0x03, 0x71, 0xab, 0xc4, 0x10, 0x7d, 0x07, 0x88, 0xb3, 0xc0, 0xfc, 0xfd,</div><div class='del'>-	0x4e, 0x8e, 0x6f, 0x25, 0xc7, 0x6c, 0xa2, 0xc0, 0xa8, 0xd5, 0x2a, 0x29,</div><div class='del'>-	0xfb, 0xf1, 0x3f, 0x88, 0x81, 0xa2, 0xa3, 0x35, 0xb9, 0xf9, 0x2a, 0x77,</div><div class='del'>-	0x50, 0x5e, 0x3f, 0x90, 0x9f, 0x17, 0xcb, 0xda, 0x69, 0xe6, 0xe7, 0xa6,</div><div class='del'>-	0x1a, 0xfe, 0x4a, 0x3d, 0x3e, 0x44, 0x8b, 0x18, 0x49, 0x54, 0x21, 0xae,</div><div class='del'>-	0xa9, 0xb9, 0xb6, 0xa3, 0x4a, 0x01, 0xf3, 0x07, 0x8c, 0x8b, 0xef, 0x97,</div><div class='del'>-	0x22, 0xea, 0x94, 0xfa, 0x88, 0x16, 0x44, 0x02, 0xc1, 0xb9, 0xea, 0x54,</div><div class='del'>-	0x9b, 0x11, 0x1c, 0x90, 0xbe, 0xe2, 0x94, 0xf5, 0x52, 0x2c, 0x18, 0x49,</div><div class='del'>-	0xe4, 0x71, 0xe3, 0x3f, 0x53, 0xcf, 0x4b, 0x1f, 0x9b, 0xaa, 0x53, 0x91,</div><div class='del'>-	0x53, 0xf4, 0xaa, 0xa2, 0x75, 0x50, 0xf4, 0xe7, 0xc4, 0x4a, 0x73, 0x51,</div><div class='del'>-	0x4e, 0xe6, 0x99, 0x68, 0x4b, 0xa8, 0xd8, 0x30, 0xc8, 0xbe, 0x52, 0x0a,</div><div class='del'>-	0x36, 0x87, 0x96, 0x60, 0xc8, 0x6b, 0xd3, 0x45, 0xb4, 0x26, 0x1a, 0x69,</div><div class='del'>-	0x63, 0xc4, 0x99, 0x71, 0x3b, 0x7e, 0xda, 0xfe, 0x33, 0x9b, 0x3e, 0xb1,</div><div class='del'>-	0x2c, 0xfd, 0x20, 0xd6, 0x26, 0x03, 0xfe, 0x93, 0x78, 0x10, 0x6d, 0x69,</div><div class='del'>-	0x17, 0x62, 0xc3, 0x1e, 0x74, 0xb2, 0x6f, 0xb5, 0x4f, 0xfc, 0x49, 0x43,</div><div class='del'>-	0xe7, 0xe8, 0x89, 0x17, 0x54, 0xda, 0x67, 0xe7, 0xa8, 0x97, 0xc7, 0x34,</div><div class='del'>-	0x1e, 0x6e, 0x3c, 0xc4, 0xe3, 0x28, 0xe7, 0xbf, 0x83, 0x18, 0x9c, 0x4e,</div><div class='del'>-	0x98, 0xb8, 0x9f, 0x32, 0x8d, 0x27, 0xea, 0xb1, 0x91, 0xf2, 0x8d, 0x25,</div><div class='del'>-	0x1c, 0xf0, 0x4f, 0x0b, 0xe3, 0x3e, 0xea, 0xf2, 0xc9, 0x44, 0x58, 0x79,</div><div class='del'>-	0x80, 0xff, 0x0f, 0x51, 0x26, 0xc9, 0x47, 0xd6, 0xd1, 0x0e, 0xa2, 0xd3,</div><div class='del'>-	0x68, 0x27, 0x6a, 0xad, 0xc3, 0x9e, 0x07, 0x88, 0x7f, 0x5c, 0x3e, 0x57,</div><div class='del'>-	0xba, 0x16, 0x43, 0x7e, 0xbe, 0x80, 0xa1, 0x14, 0x62, 0xee, 0x48, 0x5d,</div><div class='del'>-	0x63, 0x41, 0x6f, 0xeb, 0x86, 0xc2, 0x48, 0xfb, 0x43, 0x3f, 0xad, 0x9f,</div><div class='del'>-	0x85, 0x93, 0x9c, 0x13, 0xa7, 0x6d, 0xe3, 0x51, 0xc5, 0x65, 0x18, 0xb6,</div><div class='del'>-	0x2f, 0xab, 0xe3, 0xed, 0xb9, 0xbc, 0x4a, 0x97, 0x38, 0xc6, 0x3e, 0x44,</div><div class='del'>-	0x6f, 0xa2, 0x0b, 0xd1, 0xc3, 0x71, 0x6b, 0xc8, 0xf6, 0x77, 0xf1, 0x39,</div><div class='del'>-	0x27, 0x75, 0xf4, 0x5d, 0xc6, 0x6f, 0xd1, 0x85, 0x94, 0xdb, 0xca, 0xb6,</div><div class='del'>-	0x44, 0x1e, 0x3b, 0x16, 0xfa, 0xfe, 0xd0, 0x76, 0xa6, 0xca, 0x53, 0x87,</div><div class='del'>-	0xed, 0x7b, 0x0c, 0xec, 0xd8, 0x53, 0x4b, 0xbb, 0xfb, 0xa5, 0xe5, 0xaf,</div><div class='del'>-	0x18, 0x60, 0xdd, 0xa9, 0xb2, 0x08, 0x2f, 0x40, 0xae, 0x5d, 0x69, 0x73,</div><div class='del'>-	0x13, 0xef, 0x1d, 0xa6, 0xad, 0x49, 0xbb, 0x96, 0xb5, 0xe5, 0x42, 0xdc,</div><div class='del'>-	0x28, 0x88, 0x16, 0x31, 0x6e, 0x1c, 0x4a, 0x04, 0xc2, 0x2f, 0xd8, 0xb1,</div><div class='del'>-	0xcd, 0x49, 0xdb, 0x90, 0xf9, 0xef, 0xb6, 0xe7, 0x7e, 0xd9, 0x85, 0xb9,</div><div class='del'>-	0x9f, 0xbc, 0xc0, 0x91, 0xfa, 0x93, 0x53, 0x7d, 0x2a, 0x3b, 0xef, 0xce,</div><div class='del'>-	0x3e, 0xbd, 0xc7, 0xb6, 0xd3, 0x94, 0xe0, 0x9f, 0x03, 0x8e, 0x01, 0xce,</div><div class='del'>-	0xb3, 0x79, 0x15, 0xc7, 0x5f, 0xc9, 0x78, 0x52, 0xc0, 0x83, 0x79, 0xe4,</div><div class='del'>-	0xf0, 0xa7, 0x50, 0x3c, 0x90, 0xb1, 0x8a, 0xf8, 0xbb, 0x29, 0x14, 0x08,</div><div class='del'>-	0x17, 0x29, 0x37, 0xe0, 0xee, 0x61, 0x07, 0x0a, 0x06, 0x14, 0x3c, 0x6b,</div><div class='del'>-	0xd6, 0xe5, 0xec, 0x43, 0xe6, 0xfb, 0x2a, 0xdb, 0x3e, 0xe6, 0x8c, 0xcb,</div><div class='del'>-	0x7c, 0xcb, 0x1c, 0x7b, 0xe0, 0xeb, 0x53, 0xe0, 0x21, 0x6e, 0x94, 0x18,</div><div class='del'>-	0x32, 0xd7, 0x1a, 0xca, 0xfb, 0x64, 0xae, 0x49, 0x1b, 0x77, 0x87, 0xb1,</div><div class='del'>-	0x91, 0xf6, 0x50, 0xba, 0xfb, 0x7a, 0xdc, 0xc7, 0x72, 0x1b, 0x78, 0x6f,</div><div class='del'>-	0xc3, 0x68, 0x25, 0x0f, 0x2f, 0x8f, 0x69, 0x3c, 0xea, 0x71, 0xef, 0x70,</div><div class='del'>-	0x0d, 0xa2, 0x95, 0x7a, 0xd0, 0xaf, 0x3a, 0x50, 0x39, 0x20, 0x3a, 0x55,</div><div class='del'>-	0xb1, 0x72, 0x81, 0x02, 0xf3, 0xea, 0x42, 0xa8, 0x73, 0x3f, 0xc9, 0x37,</div><div class='del'>-	0xff, 0x9c, 0xac, 0x3f, 0x9a, 0x32, 0x87, 0x6e, 0x8e, 0xfd, 0x9f, 0xed,</div><div class='del'>-	0x39, 0x9c, 0x33, 0x2e, 0x7d, 0x48, 0x2c, 0xb5, 0xe7, 0xf1, 0x4f, 0xf8,</div><div class='del'>-	0xfe, 0x73, 0x9c, 0x8f, 0x2e, 0x96, 0xf9, 0xc3, 0xf9, 0xc5, 0x85, 0xf9,</div><div class='del'>-	0x9d, 0xca, 0x49, 0x25, 0xae, 0xeb, 0xe1, 0x21, 0x9b, 0xc3, 0xf8, 0x99,</div><div class='del'>-	0xcf, 0xe9, 0x71, 0xd1, 0x39, 0x39, 0x8b, 0x5b, 0x35, 0xe0, 0x2f, 0x30,</div><div class='del'>-	0xee, 0xc0, 0x3d, 0x9c, 0xa7, 0x03, 0x09, 0x75, 0xa9, 0x0b, 0xea, 0x4c,</div><div class='del'>-	0x17, 0x13, 0xdb, 0x11, 0x53, 0xc7, 0xba, 0x61, 0xe6, 0x4a, 0xc3, 0xa5,</div><div class='del'>-	0xe8, 0xd2, 0x14, 0xf7, 0xf6, 0xba, 0x45, 0x92, 0xf3, 0xfa, 0xcb, 0x0d,</div><div class='del'>-	0xa8, 0x25, 0x8c, 0xef, 0x3b, 0x34, 0x38, 0x0b, 0x0c, 0x45, 0x4d, 0xd4,</div><div class='del'>-	0x35, 0x22, 0x5e, 0x01, 0x67, 0x99, 0x01, 0x85, 0x39, 0x2d, 0x7a, 0x35,</div><div class='del'>-	0x08, 0xb6, 0x44, 0x0b, 0x8c, 0x07, 0x71, 0x4f, 0x12, 0x56, 0x71, 0x84,</div><div class='del'>-	0xf9, 0x4e, 0xc4, 0x20, 0x87, 0x0d, 0xf8, 0x0a, 0x94, 0x07, 0xb1, 0x9a,</div><div class='del'>-	0xbc, 0x61, 0xcd, 0xb0, 0xc8, 0xe1, 0x21, 0x9f, 0x30, 0xfc, 0xad, 0x60,</div><div class='del'>-	0x8e, 0xdd, 0xac, 0x07, 0x27, 0x99, 0x67, 0xae, 0xa6, 0xee, 0x47, 0x12,</div><div class='del'>-	0x0f, 0xa2, 0x21, 0x79, 0xdc, 0xf2, 0x90, 0x27, 0x16, 0x18, 0x35, 0xe7,</div><div class='del'>-	0xbb, 0x10, 0xa3, 0x0f, 0x0b, 0xff, 0x69, 0xc3, 0x43, 0xf4, 0xbf, 0x74,</div><div class='del'>-	0x42, 0x7d, 0x86, 0xec, 0x01, 0x1d, 0xa3, 0xeb, 0x71, 0xff, 0xe8, 0x4c,</div><div class='del'>-	0xfa, 0xea, 0x06, 0xfa, 0x2a, 0xb9, 0x50, 0xff, 0x0d, 0xb8, 0x6f, 0xf8,</div><div class='del'>-	0x06, 0xdc, 0xbb, 0xcb, 0x08, 0x6e, 0xa0, 0xae, 0xd7, 0x0c, 0x33, 0x10,</div><div class='del'>-	0x4e, 0x93, 0x76, 0xf3, 0xba, 0x12, 0x3e, 0x48, 0x5d, 0xe4, 0xf4, 0x94,</div><div class='del'>-	0x41, 0x9e, 0xa3, 0xfc, 0xb3, 0xc5, 0x4b, 0xf1, 0x82, 0x7a, 0xc5, 0xbf,</div><div class='del'>-	0xb7, 0xee, 0xfb, 0xcc, 0xbd, 0x45, 0x76, 0x44, 0x67, 0x18, 0xaf, 0x5a,</div><div class='del'>-	0x8f, 0x6a, 0x0a, 0x0a, 0x22, 0x88, 0xcf, 0xae, 0x7f, 0xd9, 0x7a, 0x6c,</div><div class='del'>-	0x95, 0x5c, 0xbf, 0xd5, 0x89, 0x62, 0x95, 0xd7, 0xa4, 0xcd, 0x1d, 0x32,</div><div class='del'>-	0x47, 0x44, 0xda, 0x4f, 0x6a, 0x33, 0x63, 0xf5, 0x5d, 0x28, 0x4f, 0xde,</div><div class='del'>-	0x47, 0xac, 0x7d, 0x3a, 0xe1, 0x45, 0x4f, 0x32, 0xcb, 0x9d, 0x6e, 0x4f,</div><div class='del'>-	0x0b, 0x67, 0x72, 0xa3, 0xb8, 0x57, 0xe2, 0x46, 0x14, 0xeb, 0xf9, 0xbb,</div><div class='del'>-	0xa8, 0x57, 0x6f, 0x8e, 0x83, 0xc9, 0xbc, 0xd1, 0xc8, 0xb9, 0xa0, 0xbd,</div><div class='del'>-	0xf6, 0x3a, 0x50, 0x64, 0x34, 0x65, 0x6d, 0xb5, 0x77, 0x85, 0x8d, 0x4b,</div><div class='del'>-	0x65, 0xbd, 0xdd, 0x36, 0x2e, 0x95, 0xb2, 0x9e, 0x60, 0x92, 0xa7, 0x77,</div><div class='del'>-	0x15, 0xed, 0x75, 0x26, 0x4a, 0x7a, 0x5b, 0x70, 0x2f, 0xe7, 0x78, 0x2d,</div><div class='del'>-	0x79, 0xf6, 0x09, 0xb3, 0x3c, 0xc7, 0x3f, 0x9b, 0x70, 0x77, 0x32, 0x8a,</div><div class='del'>-	0xd6, 0x64, 0x4d, 0xf4, 0xb4, 0xac, 0x25, 0xb9, 0xb2, 0xd8, 0x19, 0xad,</div><div class='del'>-	0x16, 0x5d, 0x3c, 0x97, 0xc3, 0x08, 0xbd, 0x29, 0xcb, 0xd9, 0x74, 0xcd,</div><div class='del'>-	0xaf, 0xe4, 0x65, 0xef, 0x46, 0x8c, 0xf9, 0xc5, 0xec, 0x48, 0x33, 0xac,</div><div class='del'>-	0xa4, 0xc8, 0x1d, 0xb7, 0x7c, 0xcc, 0x19, 0x3d, 0x11, 0xbd, 0x7d, 0xb1,</div><div class='del'>-	0xc3, 0xe8, 0xf8, 0xb1, 0x12, 0xc4, 0xad, 0x94, 0xa1, 0xa4, 0xb7, 0x13,</div><div class='del'>-	0xaf, 0x84, 0x74, 0xdf, 0xb7, 0x15, 0xfd, 0xfc, 0x06, 0xfc, 0x18, 0x3f,</div><div class='del'>-	0xe7, 0xb5, 0x82, 0xde, 0x09, 0x3c, 0x96, 0x7e, 0x1d, 0x67, 0x29, 0xab,</div><div class='del'>-	0xda, 0xfb, 0xb1, 0xb5, 0xcc, 0x20, 0x18, 0x14, 0xbb, 0x95, 0xb7, 0xd3,</div><div class='del'>-	0x53, 0x6d, 0xf1, 0x06, 0xac, 0xde, 0x25, 0xf6, 0xa7, 0x07, 0xe3, 0xa0,</div><div class='del'>-	0x7c, 0x66, 0x99, 0x60, 0x9c, 0xc4, 0x1f, 0xca, 0xdf, 0x4c, 0xd9, 0x2c,</div><div class='del'>-	0xfa, 0x07, 0xed, 0xc0, 0x1e, 0xc3, 0x43, 0x36, 0x0e, 0x3a, 0xfb, 0xe4,</div><div class='del'>-	0xc8, 0xeb, 0x39, 0xa2, 0xb4, 0x8e, 0x5e, 0x53, 0x8c, 0x62, 0x5f, 0xce,</div><div class='del'>-	0x0f, 0xb2, 0x6b, 0x0a, 0x17, 0xeb, 0xfe, 0xd2, 0x1a, 0xf1, 0x5e, 0x5a,</div><div class='del'>-	0xb7, 0x8c, 0x39, 0x56, 0x39, 0xc7, 0xf3, 0x5e, 0x6f, 0xdc, 0x2a, 0xce,</div><div class='del'>-	0x8e, 0xa5, 0xe9, 0x55, 0x45, 0x6c, 0x32, 0x48, 0xee, 0xde, 0x89, 0xab,</div><div class='del'>-	0x42, 0x7a, 0xcb, 0xb7, 0x15, 0x29, 0xab, 0x87, 0x37, 0x28, 0xf9, 0x7e,</div><div class='del'>-	0x7e, 0x84, 0xd3, 0x23, 0xd2, 0x87, 0xf4, 0x35, 0xc1, 0x9c, 0xeb, 0x52,</div><div class='del'>-	0x7f, 0x4a, 0xd9, 0xf3, 0xa9, 0x9b, 0x43, 0xe4, 0x75, 0x2b, 0x38, 0xcc,</div><div class='del'>-	0x92, 0x5e, 0x19, 0x93, 0xa9, 0xdc, 0x3b, 0x2a, 0xf3, 0xba, 0x40, 0x59,</div><div class='del'>-	0x4f, 0x2c, 0x29, 0xea, 0xad, 0x57, 0xee, 0x21, 0x96, 0x14, 0xee, 0xac,</div><div class='del'>-	0x51, 0xee, 0xb6, 0x6d, 0xbe, 0x0a, 0x23, 0xfd, 0xd7, 0x28, 0x6d, 0xc3,</div><div class='del'>-	0xa2, 0x03, 0x37, 0xc7, 0x3e, 0x8d, 0x63, 0xf7, 0xa2, 0x8f, 0xfe, 0xfb,</div><div class='del'>-	0x4a, 0x6f, 0x9d, 0x72, 0x1f, 0x7d, 0xa3, 0x73, 0x97, 0x8a, 0xc9, 0x2a,</div><div class='del'>-	0x85, 0x78, 0x47, 0xfe, 0x6b, 0xf8, 0x94, 0xd6, 0xe1, 0xef, 0x3b, 0x25,</div><div class='del'>-	0xbe, 0x64, 0x70, 0x03, 0x5a, 0x79, 0x6f, 0xa9, 0xe9, 0x42, 0x46, 0xab,</div><div class='del'>-	0xd5, 0x34, 0xac, 0xc0, 0xea, 0xe4, 0x2a, 0xb4, 0x25, 0x8b, 0xc9, 0x73,</div><div class='del'>-	0x65, 0xbc, 0x79, 0xb9, 0xf3, 0xf3, 0xf8, 0x20, 0x5a, 0x92, 0x88, 0xcf,</div><div class='del'>-	0x88, 0x04, 0x3a, 0x66, 0x38, 0xe8, 0xd2, 0xc5, 0x75, 0xca, 0xfd, 0xe9,</div><div class='del'>-	0x1a, 0x65, 0xcd, 0xae, 0x72, 0x64, 0xb1, 0xe7, 0x61, 0x34, 0xed, 0xa9,</div><div class='del'>-	0x57, 0xee, 0xde, 0x53, 0x85, 0x49, 0xcd, 0xb2, 0x9c, 0xa1, 0x7a, 0xa5,</div><div class='del'>-	0x75, 0x8f, 0x65, 0xdd, 0x64, 0x46, 0x9b, 0x8a, 0xc9, 0x77, 0xb7, 0xb1,</div><div class='del'>-	0xbd, 0xd6, 0x51, 0xe9, 0xe7, 0xf2, 0x76, 0x4d, 0x65, 0xe3, 0x9e, 0x87,</div><div class='del'>-	0xb1, 0x82, 0x65, 0x5f, 0x09, 0x45, 0x5b, 0x4a, 0x59, 0x56, 0x74, 0xd6,</div><div class='del'>-	0x3a, 0xfa, 0x19, 0xf6, 0x21, 0xe5, 0x17, 0x4c, 0x69, 0x67, 0x31, 0xaf,</div><div class='del'>-	0x49, 0x5b, 0x59, 0xdd, 0x89, 0xde, 0x1e, 0xcf, 0xea, 0x2d, 0x2c, 0x7a,</div><div class='del'>-	0x5b, 0x4e, 0x5d, 0xba, 0x7a, 0x7d, 0x3c, 0x5c, 0xf4, 0x75, 0x1f, 0xd6,</div><div class='del'>-	0xa4, 0x65, 0x4c, 0x33, 0x89, 0x03, 0xcd, 0xb4, 0xdb, 0x76, 0xb4, 0x52,</div><div class='del'>-	0xaf, 0x71, 0x2d, 0x6b, 0x9f, 0x17, 0x7d, 0x4b, 0xf7, 0x4f, 0x72, 0xec,</div><div class='del'>-	0xad, 0x49, 0xd1, 0x4b, 0x33, 0xcb, 0xdb, 0xf7, 0xe9, 0xdb, 0x53, 0xcb,</div><div class='del'>-	0x5c, 0x3a, 0x57, 0xfb, 0x13, 0xc2, 0x27, 0x0a, 0xc8, 0x7d, 0x0a, 0xd8,</div><div class='del'>-	0x5e, 0x96, 0x2b, 0x8a, 0xbd, 0x38, 0x68, 0x2f, 0xcf, 0x98, 0xc5, 0xd8,</div><div class='del'>-	0xe4, 0x95, 0x31, 0x66, 0xf5, 0x0c, 0x15, 0x58, 0xc7, 0x7b, 0x2e, 0xde,</div><div class='del'>-	0x2b, 0x0c, 0x15, 0xe2, 0x2d, 0x5b, 0x57, 0x59, 0x3e, 0x98, 0xf7, 0xf3,</div><div class='del'>-	0xa1, 0x0b, 0xfd, 0x1c, 0xab, 0xce, 0xda, 0xd8, 0x26, 0x57, 0x96, 0x33,</div><div class='del'>-	0xe6, 0xb9, 0x8d, 0x65, 0x0d, 0x98, 0x79, 0x6e, 0x23, 0x71, 0xee, 0x53,</div><div class='del'>-	0xc2, 0x15, 0x6c, 0x1e, 0xd6, 0x96, 0xeb, 0xb7, 0xcb, 0x0c, 0xd0, 0x4f,</div><div class='del'>-	0x85, 0xfb, 0x45, 0x94, 0xb6, 0x3d, 0xa7, 0x68, 0xab, 0x92, 0x8b, 0x01,</div><div class='del'>-	0x1b, 0x79, 0xbf, 0x94, 0xf7, 0x5f, 0x0b, 0xb9, 0x70, 0xd5, 0x34, 0xe9,</div><div class='del'>-	0xfb, 0x06, 0x74, 0xec, 0x8a, 0xa2, 0x7c, 0x61, 0x00, 0x93, 0xf6, 0x7a,</div><div class='del'>-	0x59, 0x9e, 0xa7, 0xbb, 0x70, 0xdf, 0xae, 0x8f, 0xad, 0x32, 0x9b, 0x3b,</div><div class='del'>-	0x1a, 0xb1, 0x71, 0x45, 0xc5, 0x8e, 0x45, 0xc2, 0xd7, 0x5d, 0x8c, 0x57,</div><div class='del'>-	0xe4, 0xce, 0x92, 0x0b, 0xb8, 0x4a, 0xc8, 0xb9, 0x85, 0x73, 0x06, 0x32,</div><div class='del'>-	0xb7, 0xab, 0xd0, 0xb4, 0x88, 0x70, 0xcf, 0x99, 0x36, 0xe7, 0x16, 0xee,</div><div class='del'>-	0xfd, 0xcd, 0xe4, 0xd1, 0x29, 0xdc, 0xfb, 0x02, 0x4f, 0x61, 0xae, 0xd6,</div><div class='del'>-	0x8c, 0x44, 0xaf, 0x07, 0xee, 0x88, 0xde, 0xbc, 0x59, 0xe9, 0xc4, 0xf2,</div><div class='del'>-	0x90, 0x61, 0xca, 0x1a, 0xc0, 0xf5, 0x8a, 0x1e, 0x3c, 0x87, 0x20, 0xe3,</div><div class='del'>-	0xc7, 0x8f, 0x30, 0x32, 0xf8, 0x0f, 0x2e, 0xf1, 0x8b, 0xcd, 0xe9, 0x8b,</div><div class='del'>-	0xf2, 0xdc, 0x4d, 0x79, 0xdc, 0x59, 0x79, 0xcc, 0x73, 0x54, 0xe4, 0xb3,</div><div class='del'>-	0xf5, 0x2e, 0xe2, 0xf0, 0x7f, 0xb7, 0xed, 0x76, 0x89, 0x9d, 0x4b, 0xfc,</div><div class='del'>-	0x77, 0xc6, 0x93, 0x70, 0x71, 0x5e, 0xcf, 0x9d, 0xc4, 0xab, 0x0f, 0x17,</div><div class='del'>-	0x16, 0x21, 0x44, 0x7b, 0xaf, 0x30, 0x3a, 0x98, 0xcf, 0x7f, 0x6c, 0xc5,</div><div class='del'>-	0x9d, 0xa4, 0xdf, 0x06, 0xb4, 0xa2, 0x48, 0x94, 0xb2, 0x35, 0x2a, 0x37,</div><div class='del'>-	0x0d, 0x8f, 0xb3, 0x9f, 0x0e, 0xe6, 0x29, 0x1e, 0x3c, 0x40, 0x5c, 0x79,</div><div class='del'>-	0x80, 0xfe, 0xf4, 0x00, 0x63, 0xf3, 0x03, 0xa3, 0xff, 0x8b, 0xd7, 0xa7,</div><div class='del'>-	0xd9, 0xbf, 0x37, 0x27, 0xf3, 0xf6, 0xe5, 0x64, 0x9c, 0x13, 0xfd, 0x6e,</div><div class='del'>-	0x21, 0x16, 0x48, 0x9c, 0x03, 0x65, 0xb2, 0x70, 0xda, 0x2c, 0xa4, 0xae,</div><div class='del'>-	0xf5, 0x60, 0x06, 0x09, 0xd7, 0xc5, 0x3c, 0x35, 0x1f, 0x2b, 0x65, 0x1e,</div><div class='del'>-	0x5d, 0xb8, 0x87, 0x32, 0x06, 0x43, 0xbf, 0xb1, 0x50, 0x21, 0x58, 0x74,</div><div class='del'>-	0xf9, 0xfd, 0xec, 0xbc, 0x1e, 0xbf, 0xc0, 0x59, 0x15, 0xc9, 0x91, 0xe8,</div><div class='del'>-	0xef, 0xfd, 0x36, 0x07, 0x7b, 0x8d, 0x3e, 0xd9, 0xb6, 0xeb, 0xc4, 0x7c,</div><div class='del'>-	0x31, 0x95, 0x35, 0xa3, 0x51, 0x6c, 0xe2, 0xb8, 0x57, 0x0f, 0x3f, 0x9a,</div><div class='del'>-	0xd3, 0x4b, 0x7e, 0xbc, 0xe2, 0xd3, 0x1e, 0xda, 0x74, 0x36, 0xb7, 0x6a,</div><div class='del'>-	0x1d, 0x15, 0x2e, 0x5e, 0xc9, 0xff, 0xc2, 0xc5, 0xc5, 0x7f, 0x84, 0x97,</div><div class='del'>-	0x4f, 0xe3, 0x7f, 0x27, 0x39, 0xa7, 0x70, 0xe9, 0x3a, 0xf4, 0xd0, 0x8f,</div><div class='del'>-	0x0a, 0x03, 0x75, 0xd8, 0x3a, 0x7a, 0xf9, 0x1c, 0x5d, 0x2e, 0x8f, 0x3d,</div><div class='del'>-	0x07, 0xcc, 0xc3, 0x5c, 0x82, 0xad, 0x7e, 0xbf, 0x2a, 0x7d, 0x5b, 0x68,</div><div class='del'>-	0x37, 0x6f, 0xc8, 0x72, 0xa7, 0x4a, 0xb9, 0x36, 0x95, 0x9f, 0xe7, 0xdb,</div><div class='del'>-	0x99, 0x7a, 0x4d, 0x2d, 0x40, 0x71, 0x9e, 0x37, 0x78, 0x73, 0xb9, 0x0e,</div><div class='del'>-	0xf3, 0x9b, 0xa4, 0xe8, 0x4b, 0xc6, 0x90, 0xcd, 0x5f, 0xc5, 0x5e, 0x2e,</div><div class='del'>-	0xc5, 0x83, 0xf8, 0xb4, 0x22, 0x43, 0x6c, 0x25, 0x48, 0x7f, 0xd6, 0xc3,</div><div class='del'>-	0x4d, 0x0c, 0x35, 0x67, 0x13, 0x88, 0x39, 0x22, 0x4d, 0x8d, 0x6b, 0x12,</div><div class='del'>-	0x73, 0xb5, 0x67, 0x72, 0xf9, 0xf1, 0x7e, 0xc6, 0x1e, 0xd5, 0x90, 0xb5,</div><div class='del'>-	0x19, 0xda, 0xc3, 0xb0, 0xe8, 0xa7, 0x43, 0xb9, 0x98, 0x0b, 0x47, 0xc9,</div><div class='del'>-	0x15, 0x19, 0x57, 0x0d, 0xc9, 0x91, 0x1a, 0x95, 0xa5, 0xc3, 0x52, 0x87,</div><div class='del'>-	0xf6, 0x70, 0x19, 0x67, 0xcc, 0x8e, 0xb7, 0x0c, 0x9e, 0x01, 0xe1, 0x8a,</div><div class='del'>-	0x3a, 0x36, 0x90, 0x9b, 0x94, 0x0c, 0xf8, 0x69, 0xef, 0x95, 0x28, 0xde,</div><div class='del'>-	0x1d, 0xc1, 0xfa, 0x51, 0x0d, 0x45, 0xbb, 0x2d, 0x6b, 0x6e, 0xa8, 0x1b,</div><div class='del'>-	0x6b, 0xd3, 0xcb, 0x0b, 0x24, 0x9f, 0x73, 0xf6, 0x11, 0x2b, 0x88, 0x2b,</div><div class='del'>-	0xeb, 0x92, 0x0a, 0x6e, 0x24, 0x07, 0x88, 0xa2, 0x99, 0xdc, 0x5d, 0xf0,</div><div class='del'>-	0xc5, 0xea, 0x9c, 0x1d, 0x71, 0xd1, 0x4e, 0x56, 0xf1, 0x7e, 0x0b, 0xb1,</div><div class='del'>-	0xa7, 0x85, 0x58, 0x62, 0x59, 0x1f, 0x5e, 0x8b, 0xce, 0x92, 0xc8, 0x1d,</div><div class='del'>-	0xc4, 0xa0, 0x1a, 0xe6, 0x0f, 0xc2, 0x39, 0xae, 0x45, 0x1b, 0xb1, 0xbb,</div><div class='del'>-	0xb0, 0xcf, 0xce, 0xf1, 0xa8, 0x47, 0xc6, 0xd5, 0x34, 0xe3, 0x32, 0x65,</div><div class='del'>-	0x7f, 0x9e, 0x7c, 0xbd, 0x83, 0x7e, 0x54, 0xde, 0xb7, 0x81, 0xf1, 0xd9,</div><div class='del'>-	0x83, 0xb2, 0x81, 0x6b, 0xb0, 0x91, 0xd8, 0x7e, 0xdf, 0x2e, 0x3f, 0x52,</div><div class='del'>-	0x8b, 0x6e, 0xa0, 0x7c, 0x0f, 0x62, 0x7d, 0xd2, 0x90, 0xbc, 0x2e, 0x1a,</div><div class='del'>-	0x5c, 0xf4, 0x20, 0xfb, 0xa5, 0x7d, 0xec, 0x92, 0x1c, 0xb1, 0x04, 0x4b,</div><div class='del'>-	0x9a, 0x81, 0x60, 0x9f, 0x60, 0x8e, 0x8c, 0xff, 0x36, 0x59, 0xcf, 0x82,</div><div class='del'>-	0xd1, 0x37, 0x75, 0x3e, 0xa6, 0x72, 0x39, 0x59, 0x1b, 0x6c, 0xc6, 0x7c,</div><div class='del'>-	0xc6, 0x2f, 0xb1, 0x21, 0x8d, 0x79, 0x6f, 0x91, 0x62, 0xf8, 0xf6, 0xd3,</div><div class='del'>-	0x17, 0x25, 0x17, 0xbb, 0xae, 0x2f, 0x1f, 0xaf, 0xf5, 0xcc, 0x62, 0x47,</div><div class='del'>-	0x27, 0xb1, 0x42, 0x6f, 0xff, 0xad, 0xa2, 0xaf, 0x3b, 0xa5, 0xfc, 0x18,</div><div class='del'>-	0x07, 0xc7, 0x5e, 0xc7, 0xd0, 0x98, 0x5b, 0x19, 0x1d, 0x93, 0xbe, 0x26,</div><div class='del'>-	0xd0, 0x9b, 0xfe, 0x73, 0x7d, 0x4d, 0x5d, 0x13, 0x5a, 0x74, 0xc9, 0x3a,</div><div class='del'>-	0xd2, 0x8d, 0xb9, 0xdc, 0x75, 0xe9, 0x25, 0x9c, 0x5e, 0xe6, 0x44, 0x6c,</div><div class='del'>-	0xcf, 0x8b, 0xee, 0xe4, 0xc5, 0xb5, 0x8a, 0xfe, 0xc4, 0x76, 0xdb, 0x07,</div><div class='del'>-	0x9b, 0xd3, 0x62, 0x93, 0xcc, 0xef, 0xcc, 0x39, 0xf6, 0xb3, 0x1b, 0x59,</div><div class='del'>-	0x5f, 0x58, 0xb3, 0xab, 0xd7, 0xbe, 0x77, 0xd0, 0xfc, 0x2b, 0x64, 0xec,</div><div class='del'>-	0x6b, 0x8b, 0xe9, 0x7f, 0x8c, 0x93, 0xc4, 0xbd, 0x60, 0xc8, 0x87, 0xc2,</div><div class='del'>-	0x0a, 0x59, 0x5b, 0xba, 0xb8, 0x1e, 0xb1, 0x61, 0x17, 0x69, 0x84, 0x8d,</div><div class='del'>-	0x2b, 0x0d, 0xc4, 0xb8, 0x1a, 0xce, 0x77, 0x16, 0x4b, 0xd6, 0xd3, 0x86,</div><div class='del'>-	0x6e, 0x11, 0x1b, 0x72, 0x65, 0x6d, 0xe8, 0x0f, 0xd7, 0x3c, 0x54, 0x90,</div><div class='del'>-	0xaf, 0x6a, 0x65, 0x76, 0x2e, 0xda, 0xa8, 0xdc, 0x9a, 0xb3, 0xab, 0xcf,</div><div class='del'>-	0xa6, 0xbf, 0x53, 0x90, 0xcb, 0x91, 0x2e, 0x2b, 0xff, 0x49, 0x3a, 0xb8,</div><div class='del'>-	0xe6, 0x2f, 0xd0, 0x81, 0x60, 0xbe, 0xe4, 0x31, 0xa2, 0x83, 0x99, 0x53,</div><div class='del'>-	0xfc, 0xf2, 0x93, 0xf4, 0x50, 0x9b, 0xd3, 0xc3, 0x62, 0x62, 0x48, 0x25,</div><div class='del'>-	0x71, 0x4f, 0x38, 0x4b, 0x00, 0x4f, 0x6a, 0x79, 0x3d, 0x38, 0x73, 0x7a,</div><div class='del'>-	0xd0, 0xff, 0x40, 0x0f, 0xf7, 0x13, 0x5f, 0x4b, 0xd9, 0x56, 0x31, 0x8f,</div><div class='del'>-	0x77, 0xa9, 0x87, 0x8d, 0xc3, 0x8b, 0xf1, 0x00, 0x7d, 0x69, 0x83, 0xbd,</div><div class='del'>-	0x5e, 0x23, 0xcf, 0xef, 0x5c, 0x97, 0xe8, 0x66, 0x25, 0xe5, 0xf7, 0x17,</div><div class='del'>-	0xa8, 0x98, 0x41, 0x1d, 0xf8, 0x6c, 0x3c, 0x95, 0x3e, 0x1a, 0x95, 0xdb,</div><div class='del'>-	0x87, 0x05, 0xe3, 0x3e, 0xa6, 0x0e, 0x3a, 0x18, 0x07, 0xfe, 0x54, 0x9e,</div><div class='del'>-	0x21, 0xfd, 0x7f, 0x7c, 0x41, 0x57, 0x7f, 0xbc, 0xdc, 0x8f, 0xa9, 0x03,</div><div class='del'>-	0x79, 0x26, 0x22, 0x6b, 0xec, 0xf2, 0x7c, 0x44, 0xf4, 0x61, 0x4c, 0xd1,</div><div class='del'>-	0x83, 0x65, 0x1d, 0x31, 0xe7, 0x21, 0x56, 0xa9, 0xf7, 0x4b, 0x1c, 0xed,</div><div class='del'>-	0x27, 0xa6, 0x38, 0x98, 0xb7, 0x17, 0x44, 0xa2, 0x14, 0x5b, 0xbd, 0x81,</div><div class='del'>-	0x4c, 0xa7, 0xce, 0x81, 0x4e, 0x9c, 0x31, 0x8d, 0x9e, 0xb5, 0xf8, 0x2b,</div><div class='del'>-	0x74, 0x79, 0x2d, 0x1c, 0x60, 0x3b, 0x9b, 0x92, 0x45, 0x58, 0x57, 0x47,</div><div class='del'>-	0xd3, 0x5c, 0xe9, 0xc1, 0xce, 0x64, 0xbc, 0x85, 0xd0, 0xc2, 0xd8, 0x74,</div><div class='del'>-	0xe6, 0xf6, 0x44, 0x40, 0x6f, 0xde, 0x40, 0xbe, 0xb6, 0xbc, 0xd7, 0x0d,</div><div class='del'>-	0xbf, 0x92, 0x8d, 0xcf, 0x03, 0xaa, 0xac, 0x7f, 0x5e, 0xc9, 0xb1, 0x77,</div><div class='del'>-	0xdb, 0x79, 0xac, 0x7f, 0x9a, 0xf4, 0xe3, 0x47, 0x3c, 0x2d, 0x75, 0xa9,</div><div class='del'>-	0xb3, 0xb9, 0x0a, 0x96, 0xcf, 0xd5, 0xe3, 0x51, 0xc5, 0xb2, 0x16, 0x84,</div><div class='del'>-	0x9c, 0xf6, 0xfd, 0xed, 0xe9, 0xda, 0x96, 0xdb, 0xd4, 0xd7, 0xad, 0xec,</div><div class='del'>-	0x9a, 0xab, 0xae, 0x45, 0x99, 0x0c, 0x1d, 0xff, 0xa3, 0xcf, 0x1d, 0x82,</div><div class='del'>-	0x90, 0xe7, 0x41, 0x6e, 0x63, 0x25, 0x0e, 0xe5, 0xd6, 0x1d, 0x5d, 0x91,</div><div class='del'>-	0xc3, 0x5f, 0x3e, 0x60, 0x48, 0xbe, 0x26, 0x7a, 0x92, 0xfe, 0xc4, 0x9e,</div><div class='del'>-	0x1e, 0x28, 0x14, 0x1c, 0xed, 0x4a, 0x2f, 0xe4, 0x3c, 0xfe, 0x87, 0x35,</div><div class='del'>-	0xea, 0x9d, 0x5a, 0x76, 0x89, 0x9a, 0x7d, 0x8e, 0x20, 0x65, 0xf3, 0xe5,</div><div class='del'>-	0xe6, 0x10, 0x57, 0x1a, 0x30, 0x7c, 0x49, 0x9b, 0x92, 0x6f, 0xe7, 0xdb,</div><div class='del'>-	0xec, 0x2d, 0x14, 0x5e, 0x55, 0x81, 0x42, 0xe2, 0xe3, 0x6f, 0xac, 0x83,</div><div class='del'>-	0x97, 0xb4, 0xb7, 0xd1, 0x95, 0x6d, 0x6f, 0x0f, 0xcb, 0x48, 0xd9, 0x02,</div><div class='del'>-	0xd6, 0x79, 0x37, 0xc7, 0x7f, 0xf3, 0x65, 0x3e, 0x77, 0x59, 0x19, 0x66,</div><div class='del'>-	0x78, 0xc6, 0x5b, 0xd6, 0xfe, 0x4b, 0xca, 0x7c, 0xda, 0x79, 0x69, 0x19,</div><div class='del'>-	0x27, 0x66, 0x1b, 0xaf, 0x5b, 0xc7, 0x2f, 0x29, 0x33, 0x70, 0x59, 0x99,</div><div class='del'>-	0x6b, 0x31, 0x56, 0xf7, 0xb8, 0x35, 0x94, 0x9d, 0x9b, 0x0c, 0x5d, 0xd0,</div><div class='del'>-	0x3d, 0x23, 0xe2, 0xfe, 0xd2, 0x75, 0xf3, 0x74, 0xf2, 0x4d, 0x79, 0x16,</div><div class='del'>-	0xe5, 0x46, 0x26, 0x3b, 0x37, 0x71, 0x99, 0x1b, 0xd7, 0x82, 0xfc, 0xdc,</div><div class='del'>-	0x3c, 0x90, 0xab, 0x9f, 0x6f, 0x37, 0x56, 0x70, 0x69, 0xbb, 0xf9, 0xeb,</div><div class='del'>-	0x8e, 0xcb, 0xe4, 0x9e, 0xb8, 0xac, 0x5c, 0x51, 0xe1, 0x27, 0xd7, 0xfb,</div><div class='del'>-	0x81, 0xe3, 0xd2, 0xeb, 0xff, 0x43, 0xbd, 0xf4, 0xfc, 0x9a, 0xdc, 0x79,</div><div class='del'>-	0x5e, 0xff, 0xd6, 0x65, 0xf7, 0x1d, 0x97, 0x9d, 0x3f, 0xa3, 0x7e, 0x72,</div><div class='del'>-	0x3f, 0xab, 0x2e, 0xeb, 0xc7, 0x5e, 0x83, 0xc7, 0x73, 0x17, 0x70, 0x03,</div><div class='del'>-	0x8d, 0x05, 0x08, 0x98, 0x4e, 0x05, 0x7e, 0xe2, 0x87, 0xff, 0xf9, 0xcb,</div><div class='del'>-	0xd6, 0xe2, 0x1b, 0x2f, 0xe0, 0xc7, 0x25, 0x5c, 0x35, 0x56, 0x18, 0x91,</div><div class='del'>-	0x38, 0x28, 0x3c, 0x55, 0xf8, 0xe2, 0x27, 0xf1, 0xef, 0xb2, 0x58, 0x51,</div><div class='del'>-	0xa4, 0x1e, 0xfe, 0xb1, 0x99, 0xfe, 0xb7, 0x12, 0xb2, 0x1e, 0xfb, 0x7b,</div><div class='del'>-	0x72, 0x2e, 0xc3, 0x77, 0x08, 0x33, 0xfd, 0x3f, 0x4d, 0x95, 0xb8, 0x51,</div><div class='del'>-	0xe6, 0xc1, 0x8d, 0x89, 0x4f, 0xae, 0xa7, 0x46, 0xa0, 0x2c, 0xab, 0xf7,</div><div class='del'>-	0x31, 0xaf, 0x84, 0xf3, 0xa6, 0x79, 0x98, 0xf2, 0xd7, 0x2c, 0x79, 0xae,</div><div class='del'>-	0x7a, 0xb2, 0x3e, 0xcc, 0x18, 0x9f, 0x7d, 0x8e, 0xbc, 0x24, 0xad, 0xfb,</div><div class='del'>-	0xa2, 0x4a, 0xf6, 0x59, 0xf1, 0xba, 0xd0, 0x47, 0xe4, 0x45, 0x9d, 0x94,</div><div class='del'>-	0xcb, 0x62, 0x5f, 0xc0, 0x86, 0x84, 0x65, 0x3d, 0xc7, 0xfc, 0x5c, 0xf6,</div><div class='del'>-	0x20, 0xfc, 0x22, 0xf5, 0x3b, 0x6b, 0xc2, 0xeb, 0xc4, 0xdb, 0xc6, 0xd4,</div><div class='del'>-	0xf6, 0xfc, 0x28, 0x8f, 0x98, 0xcc, 0x13, 0xed, 0x13, 0x75, 0xcc, 0xa8,</div><div class='del'>-	0x6d, 0x3f, 0x40, 0xbf, 0x9b, 0x1f, 0xd0, 0xfd, 0x7d, 0xf8, 0x3f, 0x96,</div><div class='del'>-	0xbf, 0x5a, 0x0f, 0x0e, 0x29, 0xf9, 0xf5, 0xef, 0xcb, 0xd7, 0xb9, 0xcb,</div><div class='del'>-	0x62, 0x2e, 0x8e, 0x6f, 0xbf, 0xbd, 0xd6, 0x5d, 0x40, 0xac, 0x44, 0xcc,</div><div class='del'>-	0x19, 0x99, 0xe9, 0xdf, 0x9a, 0xb0, 0xc7, 0x49, 0x5e, 0xa9, 0xe0, 0x64,</div><div class='del'>-	0xfd, 0x4c, 0xff, 0xa6, 0x94, 0x17, 0x3b, 0x18, 0xd3, 0x8b, 0x8c, 0x7a,</div><div class='del'>-	0x3c, 0x9e, 0x52, 0x71, 0xcf, 0x23, 0x5e, 0xac, 0x21, 0x67, 0x6d, 0xef,</div><div class='del'>-	0xfd, 0x1a, 0x8c, 0xab, 0x9c, 0xb8, 0x9b, 0xf6, 0xb7, 0x96, 0xae, 0x23,</div><div class='del'>-	0xf9, 0xc3, 0xfa, 0x5e, 0x27, 0xea, 0xae, 0x2a, 0x43, 0xbc, 0xba, 0x10,</div><div class='del'>-	0xdf, 0x33, 0x1d, 0xcc, 0xf7, 0x4a, 0x30, 0x64, 0x73, 0x69, 0xc9, 0xe1,</div><div class='del'>-	0x05, 0x13, 0x45, 0x6f, 0x0e, 0x7b, 0xbd, 0xf5, 0x93, 0xe3, 0xc1, 0x7f,</div><div class='del'>-	0x58, 0x99, 0xea, 0x1d, 0x36, 0x8e, 0x3b, 0x22, 0xa6, 0x1d, 0x73, 0x81,</div><div class='del'>-	0x2c, 0x9f, 0xeb, 0xba, 0xe4, 0x79, 0x77, 0xb3, 0x32, 0x3b, 0x12, 0x98,</div><div class='del'>-	0x58, 0xac, 0x38, 0x10, 0x0e, 0x94, 0xc5, 0xca, 0x23, 0x61, 0x2c, 0x4b,</div><div class='del'>-	0x77, 0xf9, 0x7c, 0xf6, 0x33, 0xf4, 0x08, 0xce, 0x2d, 0x32, 0x99, 0xfb,</div><div class='del'>-	0xc3, 0xb9, 0x8c, 0xba, 0x6f, 0xa4, 0x5e, 0xb7, 0x98, 0x1f, 0x59, 0x19,</div><div class='del'>-	0xdb, 0xef, 0xdd, 0x88, 0x31, 0x07, 0x5b, 0x4b, 0xfd, 0x3a, 0xa8, 0xc7,</div><div class='del'>-	0x9f, 0xe7, 0xf4, 0x2b, 0x3a, 0x2d, 0x19, 0xfb, 0x9d, 0x75, 0x92, 0xfa,</div><div class='del'>-	0x75, 0xb3, 0x3d, 0x37, 0xdb, 0x2b, 0x1a, 0xbb, 0x54, 0xcf, 0x85, 0x94,</div><div class='del'>-	0x67, 0x99, 0x2d, 0xc3, 0x42, 0x79, 0x86, 0xe9, 0x8f, 0x2a, 0x32, 0x1e,</div><div class='del'>-	0xc1, 0xf7, 0x3f, 0x37, 0xa6, 0x1f, 0x4f, 0xc9, 0x55, 0x44, 0xff, 0x7e,</div><div class='del'>-	0xea, 0x5f, 0x30, 0x5c, 0xe6, 0xa0, 0x4e, 0xd6, 0xbb, 0x7a, 0x80, 0x97,</div><div class='del'>-	0x98, 0xcc, 0x2a, 0xa8, 0x32, 0x22, 0x78, 0xaa, 0xd9, 0x83, 0xb7, 0x12,</div><div class='del'>-	0xa5, 0xf6, 0xb8, 0xaf, 0x9a, 0x6b, 0x59, 0x4f, 0x86, 0xfc, 0xf8, 0x85,</div><div class='del'>-	0x51, 0x1b, 0x5e, 0xa0, 0xea, 0xcc, 0x1f, 0xbd, 0x48, 0x10, 0x67, 0xbb,</div><div class='del'>-	0x92, 0xb3, 0x38, 0x5f, 0x5e, 0x6c, 0x4d, 0xa2, 0x9d, 0xf6, 0xe4, 0x77,</div><div class='del'>-	0x44, 0x80, 0x33, 0x09, 0x23, 0xb8, 0x85, 0xfd, 0x0f, 0x7b, 0xeb, 0xc9,</div><div class='del'>-	0xd3, 0xd5, 0x46, 0xd2, 0xbd, 0x78, 0x51, 0xc4, 0x88, 0x6f, 0xc3, 0xcf,</div><div class='del'>-	0xac, 0x21, 0xe2, 0x7c, 0x41, 0x48, 0xd6, 0x1c, 0x67, 0xe3, 0x19, 0xcd,</div><div class='del'>-	0x81, 0x17, 0x83, 0xcc, 0x87, 0x2b, 0x1c, 0x28, 0x31, 0xde, 0xb6, 0x7e,</div><div class='del'>-	0xe0, 0x95, 0x7e, 0x64, 0x2c, 0x33, 0x38, 0x0e, 0xc5, 0xc6, 0xc2, 0xad,</div><div class='del'>-	0xc9, 0x7a, 0xea, 0xfb, 0xf2, 0xfe, 0xff, 0x8f, 0x35, 0xe9, 0x95, 0xfe,</div><div class='del'>-	0x75, 0xcd, 0xaf, 0x72, 0x0c, 0x7f, 0x14, 0xbb, 0xbf, 0x6f, 0xbd, 0x64,</div><div class='del'>-	0xb7, 0x79, 0xbb, 0x3b, 0x1b, 0x4f, 0xa5, 0xbd, 0xb7, 0x38, 0x3e, 0x69,</div><div class='del'>-	0x33, 0xdf, 0x8f, 0xe8, 0xed, 0x8c, 0x5b, 0xfc, 0x79, 0x6b, 0x52, 0xf4,</div><div class='del'>-	0x27, 0x78, 0x75, 0xd2, 0xc2, 0x34, 0x39, 0x7f, 0xd6, 0x2e, 0x1b, 0xa7,</div><div class='del'>-	0xbe, 0xba, 0x68, 0x43, 0x8c, 0xe1, 0x3e, 0xd8, 0xbb, 0x3b, 0x34, 0x3b,</div><div class='del'>-	0x9f, 0xdb, 0xcc, 0x1c, 0x60, 0xc8, 0x5b, 0x8e, 0xad, 0x26, 0xed, 0xce,</div><div class='del'>-	0x50, 0xe7, 0x38, 0x61, 0xe1, 0xa4, 0x29, 0xe7, 0x2e, 0x4c, 0x7a, 0x1d,</div><div class='del'>-	0xd8, 0x66, 0x3a, 0xb1, 0xce, 0x50, 0x75, 0xb9, 0xee, 0x08, 0xc9, 0xb9,</div><div class='del'>-	0x0b, 0xfe, 0x6a, 0x05, 0x3b, 0x18, 0x3e, 0xd6, 0x1b, 0x5d, 0x7e, 0xb9,</div><div class='del'>-	0xbe, 0x24, 0x24, 0xe7, 0x0a, 0xda, 0xa8, 0x93, 0xb8, 0xa6, 0x60, 0x83,</div><div class='del'>-	0x21, 0xcf, 0x4d, 0xb3, 0xfc, 0x39, 0x06, 0xcb, 0xda, 0x61, 0x36, 0x5c,</div><div class='del'>-	0x57, 0xc2, 0x72, 0x67, 0x4d, 0xe1, 0x83, 0x87, 0xef, 0x98, 0x1f, 0x88,</div><div class='del'>-	0x47, 0x0b, 0xa0, 0xc7, 0x8a, 0xe8, 0xa7, 0x5b, 0x7b, 0x67, 0xb3, 0x9e,</div><div class='del'>-	0x42, 0x6e, 0xe0, 0xf4, 0x6d, 0x87, 0xc4, 0xcf, 0x80, 0xff, 0xa7, 0x4c,</div><div class='del'>-	0xb2, 0x86, 0xbc, 0xf3, 0xa8, 0x59, 0xc3, 0x7f, 0x9a, 0xf3, 0x56, 0x6e,</div><div class='del'>-	0x38, 0xdb, 0x5f, 0x85, 0xbe, 0xae, 0x48, 0x99, 0x17, 0x2c, 0x63, 0xae,</div><div class='del'>-	0x10, 0x27, 0xbe, 0x8f, 0x8c, 0x39, 0xb1, 0x25, 0x69, 0x68, 0x07, 0x6d,</div><div class='del'>-	0xfe, 0xe7, 0xa4, 0x2e, 0x9c, 0xcc, 0xcf, 0x03, 0xda, 0x84, 0x92, 0x3f,</div><div class='del'>-	0x9f, 0x2d, 0xd8, 0x40, 0x3e, 0x2f, 0xf8, 0x16, 0xb7, 0x9e, 0xad, 0x17,</div><div class='del'>-	0xaa, 0xe1, 0xf6, 0xc7, 0x52, 0x1e, 0x1e, 0x1a, 0x0f, 0xaf, 0x7f, 0x4d,</div><div class='del'>-	0xca, 0xe7, 0x6f, 0x4b, 0xc1, 0xdf, 0x9a, 0xca, 0xdb, 0x65, 0xde, 0xb7,</div><div class='del'>-	0x05, 0xdb, 0x2c, 0x72, 0xd6, 0x6c, 0x6e, 0xd6, 0x25, 0xb9, 0x0f, 0xe4,</div><div class='del'>-	0xb9, 0xdf, 0xe1, 0x3b, 0x9e, 0xa3, 0xad, 0xbb, 0x98, 0x0f, 0x6c, 0x33,</div><div class='del'>-	0xe2, 0x51, 0x79, 0x0e, 0x69, 0x84, 0x74, 0x5f, 0x81, 0xe2, 0xc7, 0xd6,</div><div class='del'>-	0xba, 0xdf, 0x72, 0x3e, 0xc9, 0x93, 0x53, 0x9f, 0x29, 0xca, 0xce, 0x87,</div><div class='del'>-	0xf8, 0x99, 0x60, 0x80, 0x9f, 0xf9, 0x92, 0xcf, 0xdf, 0xc5, 0x7e, 0x36,</div><div class='del'>-	0xa7, 0xa6, 0xfa, 0x80, 0x82, 0x9b, 0xd8, 0x56, 0x43, 0x08, 0xce, 0xa5,</div><div class='del'>-	0x75, 0xbf, 0xb1, 0x32, 0xde, 0xec, 0x33, 0xc8, 0x2c, 0xe6, 0x81, 0x36,</div><div class='del'>-	0x67, 0xf7, 0xe9, 0xdc, 0x5f, 0x27, 0xfb, 0x8e, 0x14, 0x0c, 0xd3, 0xa7,</div><div class='del'>-	0x36, 0xa5, 0xc5, 0x9e, 0xb2, 0x7a, 0x8d, 0xff, 0x01, 0xfe, 0x98, 0xb8,</div><div class='del'>-	0x37, 0x89, 0x58, 0x41, 0x44, 0xf0, 0xc7, 0xed, 0x7f, 0x29, 0x55, 0x47,</div><div class='del'>-	0x0e, 0x2f, 0xcf, 0xf2, 0xdd, 0x9c, 0x67, 0x8f, 0xff, 0xc5, 0xd4, 0xf5,</div><div class='del'>-	0xb8, 0x67, 0x4f, 0x18, 0xeb, 0xf6, 0xa0, 0xae, 0x88, 0x72, 0x17, 0x86,</div><div class='del'>-	0x02, 0xfe, 0x51, 0x68, 0xfe, 0x67, 0xa8, 0x87, 0x13, 0x94, 0xed, 0xe4,</div><div class='del'>-	0x25, 0xb2, 0x89, 0xde, 0xe0, 0xbf, 0x2f, 0xe1, 0x46, 0x2a, 0xf4, 0xa1,</div><div class='del'>-	0x15, 0xb7, 0x79, 0x86, 0xd7, 0xbf, 0x31, 0xe1, 0x47, 0xc6, 0xe6, 0xac,</div><div class='del'>-	0xae, 0x22, 0xc9, 0x1f, 0xbb, 0x93, 0xf1, 0x28, 0xd3, 0xe1, 0xdc, 0x9c,</div><div class='del'>-	0xea, 0x61, 0x99, 0xcf, 0x33, 0x09, 0xb9, 0x17, 0xfd, 0x9a, 0x0a, 0xdd,</div><div class='del'>-	0xaf, 0x32, 0x7e, 0xf6, 0x9b, 0x62, 0xb3, 0x35, 0xa2, 0x93, 0x20, 0x2b,</div><div class='del'>-	0xc6, 0x3d, 0x91, 0x40, 0x4b, 0x1d, 0xaf, 0x6b, 0x0b, 0x10, 0xab, 0x88,</div><div class='del'>-	0x08, 0x27, 0xf4, 0xfa, 0x6b, 0xc7, 0x7d, 0x7e, 0x73, 0x1c, 0xfe, 0x2b,</div><div class='del'>-	0xc7, 0xa7, 0x8a, 0x40, 0x6e, 0xff, 0x89, 0xb9, 0x9f, 0xd7, 0xbf, 0x36,</div><div class='del'>-	0x31, 0x1b, 0x6a, 0x24, 0x6e, 0x2d, 0xa9, 0x3f, 0x67, 0xcd, 0x8e, 0x18,</div><div class='del'>-	0x99, 0x93, 0x94, 0xe1, 0xc3, 0x6b, 0xf5, 0xf8, 0x0c, 0xc7, 0x89, 0x87,</div><div class='del'>-	0xb4, 0x29, 0x7d, 0xbc, 0x1f, 0xfa, 0xff, 0xdb, 0x47, 0x3e, 0xb6, 0x89,</div><div class='del'>-	0xfc, 0x12, 0xdf, 0x72, 0x73, 0xaa, 0xe6, 0xc7, 0xa2, 0x70, 0x4e, 0x39,</div><div class='del'>-	0x1f, 0xc9, 0x7c, 0xac, 0xb2, 0xac, 0x56, 0xc3, 0x97, 0x7b, 0xfe, 0x07,</div><div class='del'>-	0xda, 0xcb, 0x89, 0xeb, 0x9c, 0x58, 0x4c, 0x7b, 0x6f, 0xf8, 0x6b, 0x27,</div><div class='del'>-	0xa2, 0xbe, 0x42, 0xc6, 0x50, 0xd9, 0x53, 0xf0, 0x4c, 0xdd, 0xa4, 0x35,</div><div class='del'>-	0x61, 0xd4, 0xa1, 0x21, 0x2d, 0xcf, 0x63, 0x1d, 0xb4, 0x63, 0x0b, 0x8f,</div><div class='del'>-	0x9b, 0x72, 0x5f, 0xf0, 0x24, 0x1e, 0x73, 0xd0, 0x26, 0xdc, 0x86, 0xde,</div><div class='del'>-	0xf2, 0x0f, 0x4a, 0x19, 0x8a, 0x23, 0xce, 0xe0, 0x04, 0xf4, 0xf0, 0x7a,</div><div class='del'>-	0x72, 0x63, 0x7f, 0xc5, 0x3c, 0x53, 0xd4, 0xfe, 0x4e, 0x22, 0x60, 0x06,</div><div class='del'>-	0x72, 0xf1, 0xe7, 0x2c, 0xe7, 0xeb, 0xdd, 0x84, 0xb1, 0xee, 0xb9, 0xdc,</div><div class='del'>-	0xf9, 0xbf, 0xa5, 0xa6, 0xe6, 0xbf, 0x62, 0x77, 0x6e, 0xf7, 0xe6, 0x04,</div><div class='del'>-	0xde, 0x77, 0xd4, 0xe3, 0xfd, 0xfd, 0x66, 0x01, 0xf3, 0x36, 0xb1, 0x47,</div><div class='del'>-	0xb7, 0x7b, 0x6b, 0x02, 0x93, 0x4e, 0x5e, 0x3b, 0x6b, 0xce, 0x22, 0x76,</div><div class='del'>-	0xa9, 0xbc, 0x16, 0x96, 0x58, 0x10, 0xd3, 0x18, 0x47, 0x8b, 0x23, 0x5e,</div><div class='del'>-	0x77, 0xf1, 0x38, 0xb4, 0x22, 0xa3, 0x8c, 0x79, 0x31, 0x1a, 0x1d, 0x7d,</div><div class='del'>-	0xba, 0xbf, 0xc9, 0x51, 0xc7, 0xfc, 0xd8, 0xaf, 0xb8, 0x8c, 0x6f, 0x31,</div><div class='del'>-	0xcf, 0x97, 0xf5, 0xaa, 0x30, 0xc7, 0xed, 0x64, 0x85, 0x9d, 0xd3, 0xd4,</div><div class='del'>-	0x88, 0x42, 0xcc, 0x2b, 0xc3, 0xbd, 0xda, 0x86, 0xc5, 0x6a, 0xa4, 0x1f,</div><div class='del'>-	0xb7, 0xd6, 0xbb, 0x1b, 0xcb, 0xc7, 0xf3, 0x3a, 0x41, 0xcc, 0x13, 0x61,</div><div class='del'>-	0x0e, 0x63, 0x40, 0x2d, 0x8d, 0x88, 0x6e, 0xfc, 0x8d, 0x7d, 0x63, 0x22,</div><div class='del'>-	0xab, 0xe6, 0xee, 0x1d, 0xf3, 0x14, 0xa3, 0x38, 0x4c, 0x4c, 0xfa, 0x57,</div><div class='del'>-	0xdf, 0x7f, 0xae, 0xde, 0x64, 0x91, 0xe0, 0xba, 0xcb, 0x90, 0xff, 0xb6,</div><div class='del'>-	0x3d, 0xb9, 0xdd, 0x91, 0x63, 0x31, 0x77, 0xc0, 0xb2, 0x18, 0x0f, 0x7d,</div><div class='del'>-	0x50, 0x66, 0x71, 0x3c, 0xf4, 0x29, 0xce, 0x4d, 0x5b, 0xea, 0x23, 0xeb,</div><div class='del'>-	0x33, 0x4e, 0x3b, 0xd6, 0xbb, 0x0b, 0x23, 0xe1, 0xbb, 0xde, 0x36, 0x7e,</div><div class='del'>-	0x6f, 0xbd, 0x95, 0x60, 0x5e, 0x4d, 0xdf, 0x2d, 0x20, 0x6e, 0x6f, 0x37,</div><div class='del'>-	0x9d, 0x4d, 0x4b, 0x15, 0x05, 0xdd, 0xc6, 0x3c, 0xad, 0x88, 0xf1, 0x68,</div><div class='del'>-	0x13, 0xfd, 0x37, 0xe6, 0x35, 0x82, 0xfb, 0xc1, 0x72, 0xa9, 0xb5, 0x6b,</div><div class='del'>-	0x5d, 0x91, 0x8d, 0x77, 0x8d, 0xd4, 0x8b, 0xcf, 0x9f, 0xbf, 0xeb, 0x39,</div><div class='del'>-	0xa3, 0x19, 0xdd, 0xe9, 0x41, 0xf4, 0xa4, 0xb3, 0xfd, 0x64, 0x30, 0xfb,</div><div class='del'>-	0x13, 0xfa, 0x59, 0xbb, 0xb6, 0x30, 0x22, 0x1c, 0xeb, 0xe8, 0x5d, 0x07,</div><div class='del'>-	0x8c, 0x28, 0xb6, 0xa4, 0x37, 0xde, 0x75, 0xb6, 0xbe, 0x9f, 0xff, 0xb3,</div><div class='del'>-	0x75, 0x86, 0x50, 0xfe, 0x89, 0x75, 0x4a, 0x22, 0xd2, 0x47, 0x98, 0x7d,</div><div class='del'>-	0x6c, 0xbc, 0x6b, 0xdd, 0xa2, 0xaf, 0x63, 0x73, 0x7a, 0xdd, 0x9f, 0xed,</div><div class='del'>-	0xa7, 0x94, 0x75, 0x8a, 0x23, 0x1d, 0xad, 0x37, 0x05, 0x36, 0xde, 0x95,</div><div class='del'>-	0x5a, 0xd4, 0xc3, 0x3e, 0x56, 0x31, 0x8e, 0x64, 0xeb, 0x44, 0x15, 0xc7,</div><div class='del'>-	0x27, 0xea, 0xa0, 0x28, 0xd2, 0xd3, 0x3a, 0x3f, 0xf0, 0x7b, 0x6b, 0x5e,</div><div class='del'>-	0x6f, 0x81, 0xad, 0x03, 0x17, 0x75, 0xf0, 0xa8, 0xe9, 0xcc, 0x04, 0x1c,</div><div class='del'>-	0xb6, 0x0e, 0x3a, 0x7c, 0xd4, 0x41, 0x1f, 0x75, 0x90, 0xa9, 0x36, 0xc2,</div><div class='del'>-	0xef, 0x51, 0x07, 0xf3, 0xc6, 0xd6, 0xae, 0x2d, 0x8a, 0xc0, 0xe9, 0x30,</div><div class='del'>-	0x5e, 0x77, 0x38, 0x39, 0x17, 0x2e, 0x63, 0x2d, 0xf5, 0xb6, 0xf1, 0xae,</div><div class='del'>-	0x39, 0x8b, 0x6c, 0x9d, 0x7f, 0xd9, 0x1d, 0xd8, 0x60, 0xef, 0xdd, 0xdb,</div><div class='del'>-	0x94, 0x6e, 0xe3, 0xd1, 0xc4, 0xe3, 0x61, 0x1e, 0xdd, 0xcc, 0x4d, 0xee,</div><div class='del'>-	0xa0, 0xae, 0x1a, 0x39, 0x8e, 0x15, 0x94, 0xab, 0x9d, 0xbf, 0x5b, 0xf8,</div><div class='del'>-	0xbb, 0x83, 0xbf, 0x65, 0x7e, 0xd4, 0x0b, 0xb2, 0xc5, 0x2e, 0xc8, 0xe6,</div><div class='del'>-	0xa0, 0x3c, 0x1e, 0x62, 0x94, 0x8c, 0x69, 0xe2, 0xcb, 0x37, 0x05, 0x62,</div><div class='del'>-	0x6c, 0xe3, 0xa9, 0x62, 0xd9, 0xf7, 0xe4, 0x32, 0xe2, 0x3e, 0x27, 0x44,</div><div class='del'>-	0x3e, 0xbd, 0x65, 0x1d, 0x32, 0xc4, 0xd8, 0xdf, 0x65, 0x31, 0x96, 0xb2,</div><div class='del'>-	0x95, 0x71, 0x7e, 0x5e, 0x59, 0x34, 0x34, 0xdd, 0x63, 0xc0, 0xe7, 0x36,</div><div class='del'>-	0xe2, 0xe8, 0x4d, 0x27, 0xa8, 0x03, 0xb1, 0x93, 0x07, 0xa9, 0xbf, 0x4e,</div><div class='del'>-	0x74, 0x19, 0x27, 0xf4, 0xec, 0xde, 0x89, 0xbd, 0x94, 0x21, 0x48, 0x7e,</div><div class='del'>-	0xe8, 0x81, 0x33, 0xa2, 0xfb, 0x1b, 0x1d, 0x5d, 0x41, 0x17, 0x68, 0xcb,</div><div class='del'>-	0xc5, 0x62, 0xcb, 0x71, 0xc6, 0x35, 0xc1, 0x3a, 0xb7, 0xd6, 0x66, 0xe3,</div><div class='del'>-	0x5f, 0x7c, 0xbe, 0x0b, 0x1e, 0x6d, 0x4d, 0x2a, 0x1f, 0x0b, 0x3c, 0x5a,</div><div class='del'>-	0x6b, 0x42, 0xfc, 0x4a, 0xd6, 0xfc, 0xc3, 0x76, 0x2c, 0x3f, 0x9e, 0x7e,</div><div class='del'>-	0xb1, 0x18, 0x65, 0xb6, 0x8f, 0x95, 0x39, 0x8d, 0x6c, 0xbb, 0x1a, 0xdb,</div><div class='del'>-	0x6d, 0x76, 0x68, 0xb8, 0xe8, 0x23, 0xba, 0xd6, 0xec, 0x90, 0x7d, 0xae,</div><div class='del'>-	0xf4, 0xfe, 0x54, 0xae, 0x5e, 0x16, 0x27, 0x16, 0xbb, 0x6c, 0x9c, 0x60,</div><div class='del'>-	0x1b, 0xc5, 0xc0, 0x92, 0xc4, 0xe5, 0xfd, 0x4b, 0x7f, 0xd2, 0x6f, 0x57,</div><div class='del'>-	0x85, 0x8a, 0x09, 0xfb, 0x99, 0xcb, 0x91, 0x74, 0x0c, 0x83, 0xc9, 0xa9,</div><div class='del'>-	0x7b, 0xf9, 0xf4, 0xa3, 0x6c, 0xff, 0x70, 0x9c, 0xfa, 0x98, 0x65, 0xc8,</div><div class='del'>-	0x3e, 0x3f, 0xd9, 0xdb, 0x37, 0x75, 0x5f, 0x9f, 0xc8, 0x56, 0x58, 0x42,</div><div class='del'>-	0x00, 0xc1, 0x01, 0xe2, 0x4c, 0xb4, 0x59, 0xea, 0x5b, 0xd6, 0x1b, 0xf3,</div><div class='del'>-	0x82, 0xc8, 0x54, 0x39, 0x31, 0x38, 0x17, 0x18, 0xe8, 0x93, 0x7d, 0x57,</div><div class='del'>-	0x47, 0x63, 0xab, 0x99, 0x97, 0x45, 0x2b, 0x6b, 0xb5, 0x4d, 0xaa, 0xec,</div><div class='del'>-	0x99, 0x3a, 0xf6, 0xe5, 0x6e, 0xa3, 0x46, 0xeb, 0x56, 0x33, 0x87, 0x88,</div><div class='del'>-	0xdd, 0x7b, 0x81, 0x69, 0x25, 0xe2, 0x6b, 0x15, 0x46, 0xb4, 0xa7, 0x02,</div><div class='del'>-	0x73, 0xe1, 0xaf, 0xb4, 0xf1, 0x32, 0xfe, 0x94, 0x6a, 0x04, 0x57, 0xda,</div><div class='del'>-	0x38, 0xf8, 0xa1, 0x35, 0xc4, 0xb8, 0xf4, 0x95, 0xb9, 0x3f, 0x28, 0xce,</div><div class='del'>-	0xe6, 0xd9, 0xd1, 0x75, 0xd3, 0x38, 0x57, 0xbf, 0x58, 0xa0, 0xfb, 0x53,</div><div class='del'>-	0x8a, 0xe8, 0x48, 0xb8, 0x49, 0x02, 0xdb, 0xc8, 0x75, 0x7f, 0x33, 0x37,</div><div class='del'>-	0x82, 0x83, 0xfc, 0xff, 0xf3, 0xeb, 0x65, 0x0f, 0xaa, 0x65, 0x05, 0x03,</div><div class='del'>-	0xf3, 0xc2, 0x15, 0x1c, 0xc3, 0x8b, 0xbc, 0xdf, 0x93, 0x7e, 0xdb, 0x3a,</div><div class='del'>-	0x3b, 0xcd, 0xe8, 0x5f, 0xc6, 0x40, 0x32, 0x30, 0xae, 0x6b, 0x93, 0xea,</div><div class='del'>-	0x7f, 0x76, 0x4f, 0x1d, 0xdc, 0x65, 0x1c, 0xcb, 0xf7, 0x02, 0xb5, 0x5a,</div><div class='del'>-	0x9f, 0xaa, 0x96, 0x88, 0x5e, 0x07, 0xc6, 0x7f, 0x3c, 0x65, 0xaf, 0x47,</div><div class='del'>-	0x9e, 0x1f, 0xda, 0x6b, 0x1d, 0x3d, 0x43, 0xf4, 0xa9, 0x21, 0x2d, 0x1a,</div><div class='del'>-	0xa7, 0xde, 0xdd, 0x55, 0x1c, 0xf3, 0x57, 0xe6, 0xde, 0x6a, 0x8f, 0xb3,</div><div class='del'>-	0xd2, 0x98, 0xc1, 0x31, 0x2a, 0xd0, 0xe6, 0xfe, 0x2c, 0xb7, 0xee, 0xd9,</div><div class='del'>-	0x40, 0x36, 0x33, 0x64, 0x35, 0xd2, 0x06, 0x0b, 0x58, 0xe7, 0x46, 0x73,</div><div class='del'>-	0xdf, 0xf4, 0xae, 0x3a, 0xdd, 0xf7, 0x15, 0xc6, 0xce, 0xd0, 0xdc, 0x5f,</div><div class='del'>-	0x5b, 0x51, 0xcd, 0x69, 0x7e, 0x93, 0xa3, 0xbe, 0x27, 0x21, 0x65, 0x65,</div><div class='del'>-	0x5e, 0x8d, 0xe8, 0x5c, 0xe5, 0x5d, 0x0b, 0xd5, 0x81, 0xf0, 0x5c, 0x7b,</div><div class='del'>-	0xfc, 0xc0, 0xdd, 0xa9, 0x04, 0xb6, 0x27, 0xa5, 0x4d, 0x05, 0xcb, 0x02,</div><div class='del'>-	0xef, 0x58, 0xfe, 0x69, 0x09, 0x6c, 0x4d, 0xff, 0x29, 0xae, 0x37, 0x28,</div><div class='del'>-	0x71, 0xbf, 0x25, 0x0e, 0x3d, 0x9a, 0x7d, 0xc6, 0x35, 0x5b, 0xd6, 0x94,</div><div class='del'>-	0x65, 0x0f, 0xd2, 0x5d, 0x89, 0x00, 0xdc, 0xa5, 0xc4, 0xba, 0xb1, 0x80,</div><div class='del'>-	0x3c, 0x13, 0xf5, 0x22, 0xd3, 0x2c, 0x65, 0x6a, 0xb4, 0x31, 0x64, 0xc8,</div><div class='del'>-	0xc4, 0x64, 0x7d, 0xb2, 0xa7, 0x24, 0xbb, 0x9f, 0x82, 0x86, 0x57, 0xad,</div><div class='del'>-	0x6b, 0x67, 0xc8, 0x9d, 0x9a, 0x0c, 0x69, 0x43, 0xc1, 0xfc, 0x40, 0x15,</div><div class='del'>-	0x6a, 0x57, 0xbe, 0xfe, 0x66, 0x41, 0xa0, 0x80, 0xb8, 0x2d, 0xfe, 0x64,</div><div class='del'>-	0xb4, 0x9f, 0xc4, 0xbf, 0xd3, 0xd7, 0x65, 0x6f, 0xd9, 0x16, 0xa9, 0xc7,</div><div class='del'>-	0xb6, 0xe6, 0x22, 0xa5, 0x39, 0xc9, 0x33, 0x64, 0x9f, 0xb2, 0x65, 0xdd,</div><div class='del'>-	0x14, 0x78, 0xcb, 0x8a, 0x56, 0x53, 0x1e, 0xf2, 0x9f, 0x6c, 0x5d, 0x29,</div><div class='del'>-	0x93, 0xdb, 0x33, 0xa4, 0x34, 0xdc, 0x25, 0x3a, 0x79, 0xd6, 0x8c, 0x93,</div><div class='del'>-	0x5d, 0x0b, 0xbe, 0x1e, 0x8b, 0xbd, 0x6d, 0x28, 0xf6, 0xb3, 0xca, 0x65,</div><div class='del'>-	0x4a, 0x39, 0xe3, 0x95, 0xd3, 0x3f, 0x62, 0xe7, 0xdf, 0x61, 0x62, 0xa1,</div><div class='del'>-	0xf0, 0x35, 0xc9, 0xa1, 0x9c, 0x78, 0xce, 0xa8, 0xc0, 0xb3, 0x5a, 0x96,</div><div class='del'>-	0xfb, 0x10, 0x53, 0xf0, 0x6a, 0x62, 0x5e, 0x86, 0x1e, 0x42, 0x0e, 0x69,</div><div class='del'>-	0xac, 0x3b, 0xaf, 0xfc, 0x3b, 0xf3, 0x2b, 0xe0, 0x95, 0x54, 0x3b, 0x1e,</div><div class='del'>-	0x95, 0x75, 0x3d, 0xa5, 0xa6, 0xa9, 0xd6, 0x21, 0xfd, 0xb5, 0x63, 0x5b,</div><div class='del'>-	0x5a, 0xda, 0x3a, 0x16, 0x3b, 0x60, 0xf4, 0xe7, 0x64, 0x15, 0xcc, 0x3c,</div><div class='del'>-	0x16, 0x7b, 0xce, 0x78, 0xdc, 0x9e, 0x3b, 0x79, 0x7e, 0xd6, 0x63, 0x0a,</div><div class='del'>-	0xb6, 0x14, 0x43, 0x25, 0x0f, 0x77, 0x18, 0x77, 0xc0, 0x51, 0xf1, 0x75,</div><div class='del'>-	0xda, 0x9e, 0xec, 0xbf, 0xb9, 0x13, 0xce, 0x0a, 0x17, 0x7d, 0xf3, 0x6e,</div><div class='del'>-	0xb8, 0x2a, 0x84, 0xfb, 0xe6, 0x79, 0x69, 0x94, 0xf7, 0x45, 0xb7, 0xe7,</div><div class='del'>-	0x6d, 0xdd, 0x3a, 0x89, 0xa7, 0xdd, 0x92, 0x27, 0x19, 0xe5, 0xd4, 0x91,</div><div class='del'>-	0xde, 0x42, 0x8e, 0x8c, 0x52, 0x62, 0x13, 0xe3, 0x90, 0xbb, 0x9c, 0x65,</div><div class='del'>-	0xde, 0xa3, 0xde, 0xe7, 0xf5, 0x96, 0x90, 0x13, 0x5b, 0xd6, 0x87, 0xe4,</div><div class='del'>-	0xc4, 0xf3, 0x03, 0xb5, 0x19, 0x83, 0xf1, 0x03, 0xb7, 0xe9, 0x4d, 0x71,</div><div class='del'>-	0xe6, 0x88, 0xab, 0x8d, 0xf3, 0x56, 0x6c, 0x95, 0x94, 0xd1, 0x7d, 0x31,</div><div class='del'>-	0x25, 0xdf, 0xc7, 0x02, 0xf8, 0xab, 0x2c, 0xb8, 0x22, 0xb2, 0x96, 0x2f,</div><div class='del'>-	0x6b, 0xb8, 0x0d, 0xf2, 0xcc, 0xb0, 0x59, 0xc6, 0xef, 0x92, 0x75, 0x41,</div><div class='del'>-	0x44, 0x27, 0x5c, 0x30, 0x32, 0x07, 0x65, 0xce, 0xa6, 0x5b, 0x08, 0x2c,</div><div class='del'>-	0xfc, 0x1d, 0x73, 0x0b, 0x99, 0x9f, 0x9a, 0x4c, 0x9d, 0x92, 0x09, 0xfa,</div><div class='del'>-	0xc8, 0x91, 0x9f, 0x80, 0xde, 0x9c, 0xa0, 0xae, 0x1b, 0x43, 0xb2, 0x0f,</div><div class='del'>-	0xc0, 0xe9, 0x4b, 0xc0, 0xe6, 0xc5, 0xe6, 0x69, 0x7c, 0x06, 0xa5, 0xcc,</div><div class='del'>-	0x05, 0xe7, 0x8e, 0xad, 0x40, 0x59, 0x45, 0xd4, 0x57, 0x8c, 0x6b, 0x78,</div><div class='del'>-	0xde, 0x46, 0xbe, 0xff, 0x05, 0x94, 0xad, 0x6c, 0x41, 0x82, 0x63, 0x2f,</div><div class='del'>-	0x35, 0xbe, 0xc4, 0x6b, 0x0f, 0xa3, 0x2f, 0xe9, 0xe2, 0x38, 0xfe, 0xd5,</div><div class='del'>-	0x2a, 0xab, 0x16, 0xd9, 0x4c, 0x6f, 0x09, 0xf3, 0xf4, 0xa8, 0xad, 0x0b,</div><div class='del'>-	0x62, 0x63, 0x52, 0xb8, 0x48, 0x6d, 0x74, 0x3d, 0x98, 0x2b, 0x57, 0xeb,</div><div class='del'>-	0x2d, 0x6d, 0x4a, 0x07, 0x6d, 0xb6, 0x9b, 0x3a, 0x97, 0xb2, 0x96, 0xb5,</div><div class='del'>-	0x3c, 0x30, 0x49, 0x1d, 0x77, 0xf0, 0xdc, 0xf0, 0xbf, 0x05, 0xf5, 0x9a,</div><div class='del'>-	0x42, 0x9c, 0xb2, 0xe2, 0x9a, 0x8f, 0x76, 0xa9, 0xae, 0x12, 0xde, 0xb2,</div><div class='del'>-	0x34, 0x74, 0xae, 0x44, 0xf6, 0x21, 0x67, 0xed, 0xf4, 0x68, 0x4e, 0x97,</div><div class='del'>-	0xe7, 0xef, 0xea, 0x36, 0x5e, 0xb5, 0xaf, 0x3b, 0xec, 0xeb, 0xe1, 0xdc,</div><div class='del'>-	0xf5, 0xa3, 0xbc, 0xfe, 0x3d, 0x5e, 0xef, 0xa1, 0xee, 0xd5, 0x2b, 0xa4,</div><div class='del'>-	0xfe, 0x5a, 0x53, 0xea, 0x33, 0x45, 0x31, 0xba, 0x73, 0xf3, 0xd1, 0xd1,</div><div class='del'>-	0x9a, 0x2d, 0xdb, 0xd3, 0x9a, 0x6d, 0xc3, 0xc9, 0x36, 0xe2, 0xd1, 0x62,</div><div class='del'>-	0x98, 0x28, 0x61, 0x9c, 0x3f, 0x6b, 0x88, 0x5c, 0x9c, 0xbb, 0xb4, 0xc8,</div><div class='del'>-	0xd5, 0xc6, 0xb8, 0xd2, 0xf5, 0x42, 0x31, 0xe2, 0x1d, 0x33, 0x6c, 0x3b,</div><div class='del'>-	0x3c, 0x7a, 0x97, 0xec, 0x8f, 0x7b, 0x5b, 0x69, 0xf0, 0xc9, 0xb6, 0xca,</div><div class='del'>-	0x24, 0x79, 0xe2, 0x43, 0xa6, 0x33, 0x5c, 0xe7, 0x98, 0x97, 0x29, 0x84,</div><div class='del'>-	0x11, 0x3b, 0xaf, 0x7c, 0x64, 0xe3, 0x43, 0x22, 0xd5, 0xc0, 0x4c, 0x26,</div><div class='del'>-	0x1e, 0x64, 0x0e, 0x12, 0x4c, 0x53, 0xb7, 0xad, 0x44, 0xec, 0xa3, 0xf6,</div><div class='del'>-	0x1e, 0x39, 0xe7, 0xc4, 0x0a, 0x34, 0xe8, 0x0e, 0xcc, 0x0b, 0xcf, 0x60,</div><div class='del'>-	0x26, 0x43, 0xbb, 0x34, 0x0b, 0x1d, 0xba, 0xff, 0x56, 0x7c, 0xc6, 0x23,</div><div class='del'>-	0xf5, 0x0e, 0xa6, 0x32, 0xeb, 0x8a, 0x39, 0xa7, 0xdf, 0xa0, 0x1c, 0xdb,</div><div class='del'>-	0x03, 0x22, 0xc7, 0xd7, 0x73, 0x72, 0xb4, 0x30, 0x66, 0x99, 0xda, 0xcd,</div><div class='del'>-	0x81, 0x9e, 0x0b, 0x7a, 0x7b, 0xc1, 0xd6, 0xdb, 0xc3, 0x3c, 0x2f, 0x64,</div><div class='del'>-	0xbe, 0x5c, 0x80, 0x13, 0x75, 0xde, 0xdc, 0x7e, 0x37, 0xc9, 0x7d, 0x04,</div><div class='del'>-	0x7f, 0xcf, 0x7c, 0x69, 0xb5, 0xa1, 0x87, 0x1d, 0x36, 0x67, 0x76, 0x23,</div><div class='del'>-	0x6e, 0xf3, 0x51, 0x79, 0x76, 0x5e, 0x86, 0xc7, 0xed, 0x72, 0x2e, 0xea,</div><div class='del'>-	0xa4, 0x04, 0x4f, 0xe4, 0xfc, 0x45, 0xf6, 0x2e, 0x7c, 0xc3, 0xfe, 0xbd,</div><div class='del'>-	0x97, 0x73, 0xeb, 0xa2, 0xaf, 0xe6, 0x63, 0x94, 0xac, 0x81, 0x6f, 0xb4,</div><div class='del'>-	0x7d, 0x7f, 0x08, 0xc7, 0xec, 0xff, 0x99, 0x6c, 0xfe, 0x82, 0x6e, 0x53,</div><div class='del'>-	0xf6, 0xfc, 0x94, 0x60, 0x93, 0x3c, 0x8b, 0x4c, 0x4b, 0x4e, 0x7d, 0x3d,</div><div class='del'>-	0xb6, 0x70, 0x54, 0x6e, 0x83, 0x1c, 0x43, 0x13, 0x9b, 0xe8, 0x44, 0x9f,</div><div class='del'>-	0x66, 0x7a, 0xd3, 0x75, 0x53, 0x73, 0x0f, 0x13, 0xfb, 0xeb, 0x7e, 0x6f,</div><div class='del'>-	0x45, 0xed, 0x7c, 0xe4, 0x94, 0x75, 0xc0, 0x38, 0x11, 0xa2, 0x07, 0xaf,</div><div class='del'>-	0x2b, 0xb0, 0xf5, 0x7b, 0xfe, 0x2e, 0x7b, 0x9f, 0x20, 0x65, 0x7e, 0x21,</div><div class='del'>-	0x21, 0x71, 0x74, 0x36, 0x52, 0xa6, 0xc8, 0xe6, 0x6c, 0xde, 0xc1, 0x39,</div><div class='del'>-	0xe9, 0x4e, 0x06, 0xa2, 0x57, 0xf2, 0xde, 0x04, 0x63, 0xd9, 0x26, 0xea,</div><div class='del'>-	0x33, 0xd6, 0x2c, 0x3c, 0xa8, 0x0d, 0x7b, 0x69, 0x63, 0xe3, 0xa6, 0x65,</div><div class='del'>-	0x1d, 0x24, 0x46, 0x94, 0xcf, 0x53, 0x91, 0xa9, 0x6e, 0x43, 0x92, 0xb1,</div><div class='del'>-	0xe9, 0xa0, 0xd1, 0xf0, 0x99, 0x02, 0xc4, 0xfd, 0x6e, 0xe8, 0xbe, 0xad,</div><div class='del'>-	0x1c, 0xcd, 0x43, 0x9c, 0xaf, 0x13, 0xa6, 0xf0, 0x33, 0xe7, 0xf9, 0xa5,</div><div class='del'>-	0x30, 0xc2, 0x8b, 0x1d, 0xff, 0x6a, 0x4d, 0xda, 0xcf, 0x51, 0xbb, 0xfe,</div><div class='del'>-	0x27, 0x65, 0x68, 0x17, 0xe7, 0x2d, 0xe7, 0x1c, 0xbf, 0x17, 0x90, 0xe7,</div><div class='del'>-	0xe0, 0x40, 0x6d, 0x6f, 0xc3, 0x3a, 0x91, 0xe1, 0x40, 0xc8, 0x19, 0x3b,</div><div class='del'>-	0x88, 0x40, 0xf3, 0x06, 0xe5, 0x22, 0x07, 0xbf, 0x72, 0xcc, 0xc4, 0x68,</div><div class='del'>-	0xdd, 0x8b, 0xe4, 0x0b, 0x52, 0xbf, 0x10, 0x4f, 0x9b, 0xcf, 0x5b, 0x35,</div><div class='del'>-	0xd3, 0xbf, 0x67, 0x1d, 0x32, 0xd4, 0xf5, 0xd4, 0x76, 0xac, 0x94, 0x6d,</div><div class='del'>-	0x95, 0xb0, 0xad, 0x7b, 0x03, 0xba, 0xb9, 0x83, 0x6d, 0x3d, 0x93, 0x38,</div><div class='del'>-	0x11, 0x74, 0xb3, 0xad, 0x27, 0x4c, 0xe1, 0xe0, 0xce, 0xa6, 0x26, 0xce,</div><div class='del'>-	0x6d, 0x57, 0x32, 0xe0, 0xdb, 0x46, 0xb9, 0x24, 0x37, 0xba, 0x33, 0x21,</div><div class='del'>-	0xef, 0x74, 0x7c, 0x9d, 0xe3, 0x89, 0xb6, 0xbb, 0xd0, 0xf0, 0x50, 0x19,</div><div class='del'>-	0xed, 0xa7, 0x1c, 0x79, 0x5b, 0xd7, 0x7d, 0xc4, 0x3b, 0xdc, 0xcb, 0x32,</div><div class='del'>-	0x6f, 0x06, 0x66, 0xe3, 0x95, 0x50, 0xc3, 0xca, 0xd9, 0x70, 0xc6, 0x0e,</div><div class='del'>-	0x29, 0x81, 0xa6, 0x0d, 0x4a, 0x5c, 0x13, 0x5b, 0xbc, 0x27, 0xa5, 0x07,</div><div class='del'>-	0x1b, 0x21, 0xd8, 0xdd, 0x42, 0x7d, 0xcc, 0xc6, 0x87, 0x0b, 0x45, 0x2e,</div><div class='del'>-	0x67, 0x38, 0xe8, 0x08, 0x74, 0x3c, 0xcf, 0xf9, 0x2d, 0x9b, 0x97, 0xcd,</div><div class='del'>-	0xfb, 0xd2, 0xf6, 0xbe, 0xce, 0x16, 0xf4, 0xa5, 0x4f, 0xbd, 0x77, 0xc0,</div><div class='del'>-	0x80, 0xf3, 0x68, 0xdd, 0xa3, 0x16, 0xec, 0x77, 0x40, 0x1a, 0x64, 0x1e,</div><div class='del'>-	0x5a, 0x64, 0x1e, 0x8a, 0xe9, 0x4f, 0x37, 0x51, 0xee, 0xf5, 0xb6, 0xdc,</div><div class='del'>-	0xb3, 0x31, 0x6c, 0xca, 0x7a, 0x92, 0x53, 0xbb, 0x07, 0x3d, 0xc4, 0xce,</div><div class='del'>-	0xc0, 0xf9, 0x2e, 0xf6, 0xf3, 0x26, 0x65, 0x9e, 0x47, 0xbd, 0x4f, 0x36,</div><div class='del'>-	0x0b, 0x3f, 0x7c, 0x18, 0xbd, 0xc9, 0xfc, 0x3b, 0x22, 0x0a, 0x52, 0x01,</div><div class='del'>-	0xe9, 0xe3, 0x61, 0xf2, 0xa5, 0x2e, 0x6b, 0xb2, 0x5a, 0xae, 0xef, 0x65,</div><div class='del'>-	0x2e, 0x1d, 0xd5, 0xe8, 0x0f, 0xd4, 0x3b, 0xf4, 0xd9, 0xd0, 0x27, 0xce,</div><div class='del'>-	0x38, 0xa2, 0xf4, 0x01, 0xd3, 0x7b, 0x9e, 0xd8, 0x70, 0x14, 0x1d, 0x16,</div><div class='del'>-	0x2a, 0x6c, 0x7b, 0xf8, 0xf9, 0x88, 0xf1, 0x0b, 0x45, 0x62, 0x7b, 0x86,</div><div class='del'>-	0x3a, 0x60, 0xb6, 0xdf, 0x2e, 0x3a, 0x28, 0xa5, 0xcf, 0x8e, 0x05, 0x74,</div><div class='del'>-	0xff, 0x2b, 0x94, 0x67, 0x07, 0xe5, 0x59, 0x91, 0x9d, 0x43, 0xdf, 0x16,</div><div class='del'>-	0x45, 0x7c, 0x3a, 0xd0, 0xbc, 0x9a, 0xd7, 0xb7, 0x53, 0x9e, 0x40, 0xaf,</div><div class='del'>-	0x82, 0xa1, 0xe6, 0x6e, 0xf2, 0xb1, 0x0e, 0xea, 0xe0, 0xa2, 0x3c, 0x6e,</div><div class='del'>-	0x7b, 0xce, 0x3a, 0xc8, 0x05, 0x0a, 0x99, 0xff, 0x0b, 0x7e, 0x6b, 0x18,</div><div class='del'>-	0xa6, 0x9d, 0xee, 0xe7, 0x8c, 0x44, 0xbd, 0x2a, 0x0a, 0x0d, 0xc1, 0x80,</div><div class='del'>-	0x6a, 0x5e, 0x73, 0x71, 0x6e, 0xca, 0x71, 0x48, 0xdb, 0x6b, 0xef, 0x69,</div><div class='del'>-	0xce, 0xe6, 0xea, 0x1f, 0x59, 0xa3, 0x5e, 0xe1, 0x67, 0xb2, 0xde, 0x24,</div><div class='del'>-	0x6b, 0x32, 0x71, 0x4f, 0x76, 0x4f, 0xb5, 0x8b, 0x3a, 0xc9, 0x5e, 0x7f,</div><div class='del'>-	0x41, 0x73, 0xe4, 0xf2, 0x66, 0xb9, 0xfe, 0x81, 0xf5, 0xac, 0x5d, 0x5e,</div><div class='del'>-	0xca, 0xb9, 0x6c, 0x2e, 0x5c, 0x6c, 0x97, 0xfb, 0xc0, 0x7a, 0x51, 0x73,</div><div class='del'>-	0x4e, 0x29, 0x97, 0x7f, 0x86, 0x77, 0xe2, 0x6b, 0x4e, 0x62, 0x5e, 0xe1,</div><div class='del'>-	0xdc, 0xc5, 0x38, 0x69, 0x9c, 0xaa, 0x39, 0x5d, 0xd7, 0xc9, 0x38, 0x36,</div><div class='del'>-	0x75, 0x1f, 0x98, 0x85, 0x27, 0xed, 0x1c, 0xb7, 0x6b, 0xbe, 0x03, 0x27,</div><div class='del'>-	0x76, 0x16, 0xd0, 0x27, 0xa3, 0x9a, 0xac, 0x87, 0x45, 0x4b, 0x72, 0x7b,</div><div class='del'>-	0x55, 0x24, 0x6f, 0x0c, 0xfa, 0xd5, 0xab, 0x6d, 0x6e, 0x18, 0x55, 0xff,</div><div class='del'>-	0xdc, 0x7e, 0x3b, 0xe1, 0x2e, 0x9d, 0xd8, 0x6f, 0xe4, 0x39, 0xcb, 0x89,</div><div class='del'>-	0x47, 0x55, 0xe2, 0xe4, 0x80, 0xb9, 0x58, 0x62, 0xb3, 0x9f, 0xf5, 0x83,</div><div class='del'>-	0x31, 0x75, 0x2a, 0xb7, 0x59, 0xed, 0x41, 0x59, 0xd7, 0x36, 0x07, 0x64,</div><div class='del'>-	0x9f, 0xa9, 0xec, 0x19, 0x95, 0xbe, 0x8a, 0x72, 0xeb, 0x3c, 0x9f, 0xc4,</div><div class='del'>-	0x35, 0xf2, 0x7d, 0x09, 0xdf, 0xf8, 0x20, 0xc7, 0xdd, 0xf4, 0x60, 0xd4,</div><div class='del'>-	0x96, 0xf3, 0x57, 0xd6, 0x4a, 0x2d, 0x33, 0x43, 0xc3, 0xa5, 0xb2, 0x47,</div><div class='del'>-	0x73, 0xb2, 0xc7, 0x3e, 0x71, 0x9d, 0x4a, 0xfa, 0x99, 0xda, 0x66, 0x7e,</div><div class='del'>-	0x4f, 0xb7, 0xac, 0x61, 0xca, 0x3d, 0x05, 0x5d, 0xc4, 0xa1, 0xa8, 0xd6,</div><div class='del'>-	0xc0, 0x38, 0xaf, 0xfb, 0xd6, 0x70, 0x3e, 0xe2, 0x5e, 0xd9, 0xcb, 0x9e,</div><div class='del'>-	0x8f, 0x91, 0x85, 0xc8, 0xae, 0x25, 0xca, 0x7e, 0x87, 0xec, 0xfa, 0x21,</div><div class='del'>-	0xed, 0x1e, 0x5d, 0xa9, 0xdf, 0x59, 0x19, 0xaf, 0x93, 0xb1, 0xf0, 0xe2,</div><div class='del'>-	0x3e, 0xea, 0x21, 0xea, 0x55, 0xd6, 0x41, 0xb6, 0x5c, 0x58, 0xab, 0x90,</div><div class='del'>-	0x35, 0x1a, 0x89, 0xbd, 0xbf, 0xb5, 0x5a, 0x2f, 0x29, 0x3b, 0x75, 0x4f,</div><div class='del'>-	0x79, 0x75, 0x4c, 0x9e, 0x83, 0x8d, 0xe6, 0xd6, 0xb1, 0x1b, 0xff, 0xe0,</div><div class='del'>-	0x39, 0xd8, 0x04, 0x6d, 0x09, 0xd1, 0x2d, 0xe4, 0x76, 0x71, 0x74, 0x63,</div><div class='del'>-	0x34, 0x51, 0xab, 0x6d, 0x85, 0x26, 0xeb, 0xb7, 0xfc, 0xeb, 0xc6, 0xa1,</div><div class='del'>-	0x04, 0xa2, 0x05, 0x57, 0x95, 0x93, 0x6f, 0x21, 0xea, 0x60, 0x8c, 0x7a,</div><div class='del'>-	0x22, 0x51, 0xdb, 0xb4, 0x9d, 0x63, 0xf2, 0xaf, 0xec, 0xc6, 0x70, 0xa2,</div><div class='del'>-	0xe1, 0x4b, 0x8c, 0x23, 0xfe, 0x12, 0x9b, 0xeb, 0x44, 0xff, 0xcb, 0x01,</div><div class='del'>-	0xe2, 0xc0, 0xe6, 0xdc, 0x1a, 0x52, 0x6b, 0xe2, 0xd7, 0x94, 0xdf, 0x16,</div><div class='del'>-	0x92, 0xf5, 0xfe, 0x54, 0xb9, 0x09, 0xe6, 0xd3, 0xa7, 0xb0, 0xb6, 0x5f,</div><div class='del'>-	0xc1, 0xb3, 0xc6, 0x29, 0xac, 0x19, 0x12, 0x79, 0x4e, 0xa1, 0xad, 0xff,</div><div class='del'>-	0xfb, 0xd8, 0xdf, 0x3f, 0x1d, 0x8d, 0xb6, 0x6e, 0x3a, 0xb0, 0x61, 0xd7,</div><div class='del'>-	0x11, 0xec, 0x48, 0x5a, 0xd8, 0x1e, 0xf2, 0x60, 0xfd, 0x3e, 0x05, 0xcb,</div><div class='del'>-	0x03, 0xc7, 0xb0, 0x75, 0x97, 0x85, 0x39, 0xa1, 0x4e, 0x34, 0x99, 0x25,</div><div class='del'>-	0x28, 0xac, 0x98, 0xb7, 0x4e, 0x65, 0xb9, 0xd6, 0xe1, 0x8e, 0xdc, 0xfe,</div><div class='del'>-	0xe5, 0x43, 0xc4, 0x02, 0x15, 0x3e, 0x43, 0xf6, 0x26, 0x47, 0x95, 0xdb,</div><div class='del'>-	0xd3, 0x8d, 0x4a, 0x4b, 0xee, 0x39, 0xe2, 0xad, 0xe9, 0x8f, 0x99, 0xff,</div><div class='del'>-	0xc4, 0xb1, 0x3f, 0x74, 0x0a, 0x43, 0x43, 0xbf, 0x2e, 0xcd, 0xfa, 0xcb,</div><div class='del'>-	0x04, 0xb9, 0x83, 0xe4, 0x1c, 0x26, 0x6d, 0xea, 0x4f, 0xbd, 0x37, 0x24,</div><div class='del'>-	0x76, 0x37, 0x89, 0x9f, 0x0e, 0x9e, 0xc6, 0xe9, 0xc1, 0x7f, 0xc1, 0x12,</div><div class='del'>-	0x4d, 0xf2, 0x34, 0xab, 0xd3, 0x19, 0xb1, 0xac, 0x3d, 0xf5, 0x71, 0xab,</div><div class='del'>-	0xda, 0x78, 0xab, 0x0c, 0xc5, 0x65, 0x98, 0x16, 0x79, 0x0d, 0xdb, 0x35,</div><div class='del'>-	0xb6, 0x95, 0x3c, 0x84, 0x9d, 0x8c, 0xeb, 0xbe, 0xc8, 0x1d, 0xf0, 0x25,</div><div class='del'>-	0x33, 0x66, 0x25, 0xa2, 0x3b, 0x2b, 0xa1, 0xb7, 0x57, 0x38, 0x8c, 0x8e,</div><div class='del'>-	0x7f, 0x56, 0xea, 0x70, 0x6b, 0xfa, 0x34, 0x7e, 0x31, 0x68, 0xef, 0xc9,</div><div class='del'>-	0x6a, 0xf9, 0xb6, 0x62, 0x75, 0x6e, 0x0f, 0xe9, 0x4d, 0xff, 0x55, 0x89,</div><div class='del'>-	0xc6, 0x65, 0x2f, 0x4f, 0x11, 0x73, 0x82, 0xdb, 0x06, 0x25, 0xdf, 0x6c,</div><div class='del'>-	0x81, 0xbb, 0x57, 0xcf, 0x2c, 0x25, 0xcf, 0xfe, 0xca, 0x82, 0xf8, 0x8c,</div><div class='del'>-	0x2a, 0xda, 0xa5, 0x43, 0xd1, 0x83, 0x86, 0xda, 0x89, 0xe3, 0xa6, 0x3e,</div><div class='del'>-	0xf1, 0x5b, 0x87, 0x31, 0xf4, 0x2d, 0xd4, 0x61, 0x55, 0x5a, 0x1f, 0xba,</div><div class='del'>-	0x86, 0x79, 0xd8, 0xd6, 0x3e, 0x13, 0xc9, 0x3e, 0xbd, 0xa5, 0xc3, 0xd1,</div><div class='del'>-	0x83, 0xfb, 0x02, 0x35, 0xed, 0xef, 0x91, 0xcb, 0x79, 0x88, 0x29, 0x7d,</div><div class='del'>-	0xe3, 0x23, 0xcc, 0x13, 0x7b, 0xb0, 0x61, 0x5f, 0x04, 0xeb, 0xf7, 0x98,</div><div class='del'>-	0xe8, 0xee, 0x1b, 0xa1, 0x6c, 0x2f, 0x95, 0xca, 0x1e, 0x96, 0xe6, 0x50,</div><div class='del'>-	0xfc, 0x66, 0x15, 0x81, 0x28, 0xfb, 0x6c, 0x50, 0x23, 0x01, 0xbf, 0xaa,</div><div class='del'>-	0x30, 0xfa, 0x8f, 0x3b, 0xb1, 0x89, 0x65, 0x7a, 0x93, 0xb4, 0xb9, 0x3e,</div><div class='del'>-	0x37, 0xe3, 0xe5, 0x4c, 0x0c, 0x8f, 0xf9, 0x70, 0x70, 0xcc, 0x83, 0xa1,</div><div class='del'>-	0x31, 0x8d, 0x47, 0x31, 0x1e, 0x1b, 0x90, 0xbd, 0x20, 0x5e, 0x3c, 0x7d,</div><div class='del'>-	0xc0, 0x8d, 0xcd, 0xbb, 0x3d, 0x98, 0x1d, 0x99, 0x86, 0x03, 0x07, 0x8a,</div><div class='del'>-	0xb1, 0x97, 0xd7, 0x2b, 0x16, 0xfa, 0xf1, 0x24, 0xaf, 0xf7, 0xef, 0x76,</div><div class='del'>-	0x71, 0x1e, 0xe6, 0xe0, 0x30, 0x0d, 0x7b, 0x68, 0xac, 0x04, 0xc9, 0x01,</div><div class='del'>-	0x9a, 0x3c, 0x39, 0xeb, 0xdb, 0xcc, 0x30, 0x46, 0x0f, 0x30, 0x36, 0xee,</div><div class='del'>-	0x33, 0x91, 0x60, 0x3f, 0x3b, 0xa8, 0xab, 0x6e, 0xe2, 0xda, 0x86, 0x31,</div><div class='del'>-	0xc1, 0xf8, 0x55, 0xb8, 0xa9, 0x57, 0x6f, 0x6a, 0x54, 0x8c, 0xe8, 0x22,</div><div class='del'>-	0x7b, 0xbf, 0x97, 0xbc, 0xdf, 0xb5, 0x0a, 0x0d, 0x09, 0xdd, 0x6c, 0x44,</div><div class='del'>-	0x27, 0x4e, 0x72, 0xdc, 0xff, 0x17, 0xfd, 0x76, 0xb1, 0x43, 0xef, 0xb9,</div><div class='del'>-	0x51, 0x3d, 0x82, 0x9d, 0xe9, 0xa3, 0xe4, 0xea, 0x40, 0x78, 0xff, 0x11,</div><div class='del'>-	0xf2, 0xb7, 0xe3, 0xc4, 0x9f, 0x37, 0x2d, 0x9f, 0xa1, 0xe2, 0xd6, 0x47,</div><div class='del'>-	0x8c, 0xf0, 0xfb, 0x4a, 0xa0, 0xfd, 0x57, 0xd4, 0xc1, 0x67, 0x0f, 0xa8,</div><div class='del'>-	0xb8, 0x65, 0xe7, 0x62, 0xa4, 0x42, 0x51, 0xec, 0x58, 0xa4, 0xe2, 0xe6,</div><div class='del'>-	0x7d, 0x47, 0x88, 0xfb, 0x13, 0x36, 0x4f, 0xce, 0xa4, 0x1e, 0x46, 0xb0,</div><div class='del'>-	0x57, 0xd6, 0xb8, 0xdd, 0x8c, 0xdf, 0xa5, 0x78, 0xa6, 0x9f, 0x39, 0xb4,</div><div class='del'>-	0x59, 0x8a, 0x13, 0x43, 0x47, 0x68, 0x8f, 0xa5, 0x38, 0xde, 0x6f, 0x4c,</div><div class='del'>-	0xfc, 0xd4, 0x51, 0x8a, 0xa7, 0x79, 0xbe, 0x93, 0xe7, 0x0b, 0x07, 0x8c,</div><div class='del'>-	0xfe, 0x0e, 0xb5, 0x14, 0x0b, 0xf6, 0xd7, 0xa3, 0xbf, 0x4f, 0x6c, 0x53,</div><div class='del'>-	0x43, 0xfb, 0x58, 0x5d, 0x4e, 0xf7, 0xa2, 0x73, 0x2f, 0x36, 0x52, 0x57,</div><div class='del'>-	0xf7, 0xed, 0xec, 0x64, 0x7f, 0x3e, 0xea, 0xfc, 0x08, 0x1e, 0x63, 0x5e,</div><div class='del'>-	0xb7, 0xbd, 0xcf, 0x87, 0x73, 0x49, 0xc3, 0xff, 0x45, 0xc5, 0x30, 0x8b,</div><div class='del'>-	0x94, 0x80, 0xf6, 0x0c, 0x7c, 0x38, 0x9d, 0x2e, 0xc6, 0xa6, 0x81, 0x99,</div><div class='del'>-	0xf8, 0x29, 0xed, 0xf3, 0xd1, 0xdd, 0xd2, 0xdf, 0x04, 0xe3, 0xc3, 0x2c,</div><div class='del'>-	0x3c, 0x3d, 0x62, 0xb2, 0x6d, 0x99, 0x27, 0x89, 0x39, 0xdd, 0x70, 0x25,</div><div class='del'>-	0xc5, 0x37, 0xa2, 0x3b, 0x69, 0x16, 0xc4, 0xc4, 0x63, 0x48, 0xf7, 0xeb,</div><div class='del'>-	0x3d, 0xb7, 0xa9, 0xc2, 0xab, 0x55, 0xea, 0xd2, 0x81, 0x49, 0x4d, 0x8f,</div><div class='del'>-	0x57, 0xa8, 0xf1, 0x7e, 0xe6, 0xaf, 0xf1, 0x4a, 0xf5, 0x18, 0x9e, 0xee,</div><div class='del'>-	0x77, 0x62, 0xde, 0x42, 0x95, 0xd7, 0xe3, 0xe7, 0x19, 0xdb, 0xe2, 0xb3,</div><div class='del'>-	0x55, 0x13, 0x7b, 0x6d, 0x59, 0x11, 0x2f, 0x20, 0xb7, 0x2f, 0x5f, 0x58,</div><div class='del'>-	0xc3, 0xf8, 0xe5, 0x10, 0xdb, 0x8b, 0x95, 0xaa, 0x4e, 0xea, 0xfd, 0x34,</div><div class='del'>-	0x46, 0x68, 0xd7, 0x4f, 0xf0, 0x38, 0x3c, 0x68, 0x75, 0x2e, 0x27, 0xe7,</div><div class='del'>-	0x9e, 0x13, 0xb0, 0x3a, 0x6f, 0x33, 0x0d, 0x5f, 0x81, 0x1a, 0x88, 0x7e,</div><div class='del'>-	0x05, 0xa7, 0x71, 0x68, 0x44, 0xca, 0xc0, 0xed, 0x8d, 0x30, 0xaf, 0xee,</div><div class='del'>-	0xb3, 0x3a, 0x77, 0x9a, 0x73, 0x50, 0x6f, 0xe7, 0xc6, 0x3f, 0x2f, 0xcd,</div><div class='del'>-	0x62, 0xa6, 0xf8, 0x91, 0xbd, 0xa7, 0x0a, 0xbf, 0x62, 0x3b, 0xef, 0x0f,</div><div class='del'>-	0x96, 0xa3, 0xaa, 0x52, 0xfc, 0xe0, 0x14, 0xde, 0xe9, 0x7f, 0x0d, 0xe7,</div><div class='del'>-	0xfa, 0x2d, 0x2c, 0x08, 0x59, 0x70, 0x86, 0x6a, 0xcd, 0x46, 0xf5, 0x1a,</div><div class='del'>-	0x62, 0x84, 0x82, 0x9b, 0xe6, 0x7e, 0x1f, 0xef, 0xd2, 0xff, 0x6f, 0x9e,</div><div class='del'>-	0x6b, 0xd9, 0xb2, 0xf4, 0x62, 0xa1, 0xb5, 0xa3, 0x5a, 0xfc, 0xc6, 0xb4,</div><div class='del'>-	0xf7, 0xd3, 0xfc, 0xe9, 0x3c, 0x38, 0xbf, 0xaf, 0x4b, 0x72, 0xe1, 0xd3,</div><div class='del'>-	0x18, 0x1e, 0x34, 0xa2, 0x6b, 0xf3, 0x72, 0xf6, 0x9f, 0xa6, 0x0e, 0x2c,</div><div class='del'>-	0xec, 0x34, 0x4f, 0xec, 0xab, 0xc0, 0xbc, 0xf3, 0xcc, 0x1a, 0xaf, 0x9b,</div><div class='del'>-	0x4d, 0xdb, 0x59, 0xb0, 0x30, 0x60, 0x2e, 0x53, 0xff, 0x37, 0xfd, 0xf4,</div><div class='del'>-	0x34, 0x0e, 0x0e, 0xe5, 0xf1, 0xda, 0x87, 0x46, 0xfa, 0x79, 0x76, 0xcf,</div><div class='del'>-	0xbb, 0x17, 0x0d, 0xc9, 0xa3, 0xf6, 0xfa, 0xc3, 0x61, 0xe2, 0x63, 0xf6,</div><div class='del'>-	0x19, 0xa1, 0x86, 0x91, 0x74, 0x23, 0xb1, 0x21, 0x8a, 0xef, 0xa6, 0x23,</div><div class='del'>-	0xc4, 0x87, 0x30, 0xf1, 0xa1, 0x9e, 0xf8, 0x60, 0x12, 0x1f, 0xea, 0x88,</div><div class='del'>-	0x0f, 0x41, 0xfb, 0xd9, 0xb9, 0xac, 0x47, 0x0f, 0x8d, 0xbe, 0x86, 0x82,</div><div class='del'>-	0x81, 0x53, 0x70, 0x0d, 0xc8, 0x3e, 0x35, 0x8b, 0xfc, 0xa4, 0x56, 0x6b,</div><div class='del'>-	0xc3, 0x1c, 0x45, 0xf6, 0x0c, 0x0e, 0xa5, 0x4f, 0xa1, 0x68, 0x40, 0xe3,</div><div class='del'>-	0x58, 0x64, 0xaf, 0x40, 0x4d, 0xb8, 0x87, 0x58, 0xfd, 0x6b, 0xa3, 0xb6,</div><div class='del'>-	0xc7, 0x8b, 0xda, 0xbd, 0xd5, 0x30, 0xfa, 0x17, 0xaa, 0x73, 0x95, 0xe8,</div><div class='del'>-	0xe7, 0xbc, 0x1c, 0x67, 0x25, 0x66, 0xed, 0xd6, 0x30, 0x9b, 0xc7, 0x3f,</div><div class='del'>-	0x25, 0x6b, 0x26, 0xde, 0x74, 0xc0, 0x3b, 0x9d, 0x74, 0x67, 0x06, 0x99,</div><div class='del'>-	0x00, 0x59, 0xad, 0xd7, 0x87, 0x2b, 0x0f, 0x9f, 0x56, 0x15, 0x64, 0x3e,</div><div class='del'>-	0x27, 0x31, 0xaf, 0x36, 0xd8, 0xad, 0x32, 0x5b, 0xd7, 0x04, 0xc3, 0x79,</div><div class='del'>-	0xa8, 0x88, 0x90, 0x45, 0xcc, 0x64, 0x7e, 0x61, 0xb5, 0x99, 0x45, 0xd8,</div><div class='del'>-	0x52, 0xa7, 0xca, 0x7e, 0x8d, 0xa3, 0x12, 0xa3, 0xa6, 0x33, 0x46, 0x14,</div><div class='del'>-	0xf7, 0xc5, 0xef, 0x99, 0x0e, 0x0f, 0x8a, 0xfa, 0x2c, 0xeb, 0x1b, 0x21,</div><div class='del'>-	0x0d, 0x9e, 0x48, 0x20, 0xba, 0x81, 0x69, 0xe4, 0xe7, 0xe6, 0x85, 0x71,</div><div class='del'>-	0x53, 0xfa, 0x30, 0x06, 0x38, 0xbe, 0xe5, 0xe9, 0xfc, 0xbb, 0x9c, 0x7f,</div><div class='del'>-	0xfa, 0xef, 0xe2, 0x3b, 0xa1, 0x57, 0xee, 0x9d, 0x0e, 0x43, 0x7b, 0x40,</div><div class='del'>-	0xed, 0x28, 0x27, 0x07, 0x3f, 0xcc, 0xb8, 0xa7, 0x4c, 0x7e, 0x5e, 0x41,</div><div class='del'>-	0xcb, 0x40, 0x1c, 0x55, 0xa1, 0x53, 0x4a, 0x4c, 0xf6, 0x32, 0x29, 0x95,</div><div class='del'>-	0xf8, 0xfc, 0x6e, 0xea, 0x7a, 0x41, 0x86, 0xb6, 0xe2, 0xc3, 0xb7, 0x46,</div><div class='del'>-	0x45, 0xb7, 0x35, 0x43, 0x3b, 0x39, 0x8e, 0x37, 0xe6, 0x1e, 0x16, 0x9c,</div><div class='del'>-	0x3c, 0x32, 0x0b, 0x8e, 0x23, 0xd3, 0x98, 0x9b, 0xd6, 0xcc, 0xbd, 0xf2,</div><div class='del'>-	0xfc, 0xbf, 0xa8, 0xa2, 0x17, 0x85, 0xd8, 0xa1, 0xf7, 0xc7, 0xd8, 0xf6,</div><div class='del'>-	0x07, 0x8e, 0xc3, 0xd8, 0x44, 0x0c, 0x3e, 0x9a, 0xfe, 0x0e, 0x75, 0x79,</div><div class='del'>-	0x28, 0x97, 0x2f, 0xad, 0x42, 0xa2, 0x57, 0xf6, 0xe3, 0x9d, 0xc2, 0xac,</div><div class='del'>-	0x01, 0xbd, 0x79, 0x9b, 0x62, 0x04, 0x6f, 0x56, 0x4e, 0x61, 0xc6, 0x40,</div><div class='del'>-	0x90, 0x73, 0xa9, 0x61, 0x59, 0x5f, 0x1e, 0x3f, 0x05, 0x83, 0x57, 0x11,</div><div class='del'>-	0x83, 0xad, 0xc5, 0x3f, 0x35, 0xe3, 0xcc, 0x71, 0x74, 0xd3, 0xa9, 0xe8,</div><div class='del'>-	0x2d, 0x73, 0x15, 0xd9, 0x9b, 0x63, 0x9c, 0x6f, 0x65, 0x1d, 0xcf, 0x40,</div><div class='del'>-	0x1d, 0xee, 0xe4, 0x98, 0x9b, 0x38, 0x6f, 0xaf, 0x2d, 0xb4, 0xb0, 0x68,</div><div class='del'>-	0xa1, 0xbe, 0xb7, 0xc8, 0x11, 0x7d, 0xa0, 0x02, 0x99, 0x8e, 0x6a, 0xda,</div><div class='del'>-	0xcd, 0x7d, 0x0b, 0xf4, 0xf0, 0xab, 0xc4, 0x5d, 0xe2, 0x34, 0x36, 0x31,</div><div class='del'>-	0xee, 0xb4, 0x31, 0x16, 0x15, 0x47, 0xf4, 0x1e, 0xe6, 0xa8, 0xef, 0xdf,</div><div class='del'>-	0xed, 0x88, 0x86, 0xe4, 0x7d, 0xa3, 0x7f, 0xc0, 0x62, 0xb8, 0x43, 0x65,</div><div class='del'>-	0xc4, 0x41, 0x3d, 0xf3, 0x1a, 0xf4, 0xbd, 0x77, 0x92, 0x93, 0xfe, 0x84,</div><div class='del'>-	0xfc, 0xae, 0xfa, 0xaa, 0xa3, 0xc4, 0xa8, 0x11, 0x3c, 0x9a, 0x3e, 0x82,</div><div class='del'>-	0xbd, 0xe9, 0x14, 0x76, 0xa5, 0x77, 0x28, 0x43, 0xf6, 0xb3, 0x3a, 0x45,</div><div class='del'>-	0xde, 0xad, 0x8b, 0x96, 0x29, 0x5f, 0x46, 0x69, 0xe8, 0x9b, 0xd6, 0x50,</div><div class='del'>-	0x85, 0x8a, 0xf2, 0x50, 0x10, 0x37, 0xf5, 0xc5, 0xe1, 0x88, 0xbc, 0x67,</div><div class='del'>-	0xc9, 0x7b, 0xd9, 0xeb, 0xc7, 0x0d, 0xdc, 0xd8, 0x57, 0x8c, 0xd8, 0x7e,</div><div class='del'>-	0xcb, 0xea, 0xa9, 0x77, 0x62, 0xcd, 0x78, 0x1d, 0x96, 0x0d, 0x3c, 0x66,</div><div class='del'>-	0xcd, 0x66, 0xcc, 0xf9, 0xf8, 0x5a, 0x0f, 0xee, 0xde, 0xef, 0x41, 0x6b,</div><div class='del'>-	0x5f, 0x14, 0xbe, 0x48, 0x09, 0x7f, 0x07, 0xcc, 0x25, 0x30, 0x26, 0x26,</div><div class='del'>-	0x60, 0xf4, 0xdc, 0xe0, 0x08, 0x1c, 0x0a, 0xab, 0x1e, 0x7c, 0x95, 0x38,</div><div class='del'>-	0xbe, 0x9c, 0xb8, 0x13, 0x1b, 0xb7, 0x50, 0x1e, 0xf1, 0xe2, 0x1e, 0xd6,</div><div class='del'>-	0xbf, 0x85, 0x73, 0xff, 0xee, 0xa2, 0x43, 0xc4, 0x02, 0xd9, 0x83, 0xa8,</div><div class='del'>-	0x61, 0xc3, 0xb8, 0x9b, 0xba, 0x72, 0x23, 0x76, 0xb0, 0x12, 0x37, 0xee,</div><div class='del'>-	0xf6, 0xe3, 0xee, 0x71, 0x0f, 0x1a, 0xfa, 0xac, 0xc5, 0x87, 0xcd, 0xf8,</div><div class='del'>-	0x4a, 0x0d, 0x06, 0x5a, 0xc7, 0xbd, 0xf8, 0xdb, 0x3e, 0xdd, 0x77, 0x33,</div><div class='del'>-	0x73, 0xfe, 0x11, 0x33, 0x88, 0xbf, 0x1f, 0xf7, 0xe1, 0xf6, 0xbe, 0x13,</div><div class='del'>-	0x92, 0x47, 0x2e, 0x71, 0x32, 0xf6, 0x3c, 0x34, 0x3e, 0x13, 0x2b, 0xfb,</div><div class='del'>-	0xf4, 0xf3, 0x13, 0xe4, 0x76, 0x9d, 0x07, 0x4d, 0x3c, 0x30, 0xae, 0xa2,</div><div class='del'>-	0x85, 0xed, 0x7c, 0xbe, 0x6f, 0x16, 0x3a, 0x0e, 0xd6, 0x53, 0x86, 0x85,</div><div class='del'>-	0x58, 0x3e, 0xe0, 0x84, 0x49, 0x16, 0x8f, 0x2f, 0x00, 0xcd, 0x03, 0x13,</div><div class='del'>-	0xcc, 0xe3, 0x1e, 0xc6, 0x8e, 0x5e, 0x13, 0xf7, 0x8e, 0xcb, 0xf9, 0x11,</div><div class='del'>-	0xfb, 0x5d, 0xd8, 0xf7, 0xf7, 0x2d, 0xc4, 0x67, 0x07, 0x54, 0xe2, 0x40,</div><div class='del'>-	0x21, 0x86, 0x56, 0x2a, 0xf8, 0x5b, 0x5e, 0xdf, 0x96, 0x94, 0xbd, 0xcc,</div><div class='del'>-	0x40, 0x68, 0x67, 0xe0, 0x50, 0x05, 0x39, 0xc3, 0xa2, 0x7d, 0xd9, 0xeb,</div><div class='del'>-	0x8f, 0x12, 0xe7, 0x8b, 0x88, 0xf3, 0x25, 0xe4, 0xb0, 0x37, 0x0c, 0x1f,</div><div class='del'>-	0xc1, 0x23, 0xc4, 0xe5, 0xa3, 0x03, 0x9d, 0x8c, 0x3b, 0xa5, 0x78, 0x92,</div><div class='del'>-	0x71, 0xa0, 0x8f, 0xe7, 0xa7, 0x76, 0x1a, 0x1d, 0x45, 0xc4, 0xe9, 0x57,</div><div class='del'>-	0x89, 0xbf, 0x3d, 0xc4, 0x8c, 0xfb, 0xfa, 0x18, 0xee, 0x77, 0x32, 0x07,</div><div class='del'>-	0xb8, 0x2a, 0x3a, 0xdf, 0xc3, 0x1c, 0xeb, 0x66, 0x25, 0xe0, 0x7b, 0x0b,</div><div class='del'>-	0xa5, 0x70, 0xec, 0xab, 0x44, 0xc3, 0x6e, 0x29, 0x23, 0xf8, 0xa5, 0x42,</div><div class='del'>-	0x3d, 0xe0, 0xa4, 0xce, 0x8f, 0xc1, 0xea, 0x77, 0x70, 0xbc, 0x35, 0x26,</div><div class='del'>-	0x19, 0x38, 0xde, 0x30, 0x75, 0xed, 0xbb, 0xc4, 0xda, 0x0f, 0x89, 0xa9,</div><div class='del'>-	0xfe, 0xe9, 0xf5, 0x68, 0x34, 0x4c, 0x1e, 0xc7, 0x70, 0xba, 0xdf, 0x30,</div><div class='del'>-	0x65, 0x9f, 0xdc, 0x9b, 0xe4, 0x79, 0x93, 0xd3, 0x19, 0x33, 0x0d, 0xf1,</div><div class='del'>-	0xc3, 0x11, 0x8e, 0x47, 0x95, 0xbc, 0x04, 0x8e, 0x31, 0xe0, 0x9d, 0x7d,</div><div class='del'>-	0x8b, 0x39, 0x2e, 0x89, 0xa5, 0x12, 0xef, 0x46, 0x28, 0xeb, 0x62, 0xac,</div><div class='del'>-	0xa0, 0x3e, 0x1a, 0xfb, 0x54, 0xa4, 0x0e, 0x46, 0x70, 0xef, 0x9e, 0x6c,</div><div class='del'>-	0x1c, 0x6e, 0x0f, 0xc5, 0x6f, 0x63, 0x1c, 0x0e, 0x17, 0x33, 0x0e, 0xbb,</div><div class='del'>-	0x22, 0x22, 0x9b, 0x13, 0xc3, 0x8c, 0xdb, 0x5b, 0x92, 0x61, 0x34, 0x71,</div><div class='del'>-	0x0e, 0x27, 0x52, 0xec, 0xb7, 0x6f, 0x26, 0x9e, 0x49, 0x79, 0x18, 0xb3,</div><div class='del'>-	0x34, 0x1e, 0x44, 0xb5, 0x91, 0x69, 0x3c, 0xfc, 0x3c, 0xe6, 0xf0, 0x30,</div><div class='del'>-	0xec, 0x6b, 0x6d, 0x7d, 0x0a, 0xe2, 0xcd, 0xd9, 0xe7, 0x65, 0xcf, 0xa4,</div><div class='del'>-	0x04, 0x9b, 0x65, 0x2d, 0xf3, 0xde, 0x72, 0xd9, 0xfb, 0xd9, 0x9f, 0xfc,</div><div class='del'>-	0x3e, 0xca, 0x89, 0x4f, 0x65, 0x39, 0x1c, 0xfa, 0x79, 0x48, 0x70, 0xb7,</div><div class='del'>-	0x86, 0xb8, 0x2b, 0xfb, 0x73, 0x2c, 0x6b, 0x55, 0x60, 0x2a, 0x1e, 0xfd,</div><div class='del'>-	0xef, 0x8f, 0xa3, 0xf6, 0x7e, 0x56, 0xc1, 0x24, 0xe2, 0x5f, 0x92, 0xf8,</div><div class='del'>-	0xc7, 0x31, 0x74, 0x5d, 0x4f, 0x0c, 0xa4, 0x4c, 0xff, 0x98, 0x24, 0x06,</div><div class='del'>-	0x12, 0xa7, 0x8f, 0x10, 0xa7, 0x9f, 0x22, 0x4e, 0x7f, 0x93, 0x38, 0xfd,</div><div class='del'>-	0x24, 0x31, 0x21, 0xbb, 0xa6, 0xd7, 0x24, 0xcf, 0x2f, 0x38, 0x1f, 0xef,</div><div class='del'>-	0xd9, 0x6b, 0x8b, 0xd5, 0xd4, 0xd5, 0xac, 0x01, 0x79, 0xe7, 0x47, 0x3f,</div><div class='del'>-	0x24, 0x76, 0xff, 0x13, 0xce, 0x93, 0xbf, 0x2a, 0xbb, 0xef, 0xaa, 0xb1,</div><div class='del'>-	0xaf, 0x1b, 0xee, 0xbe, 0x5a, 0xad, 0x07, 0xf6, 0xb7, 0x02, 0x4c, 0xe1,</div><div class='del'>-	0xa2, 0x05, 0x7d, 0x6d, 0x70, 0xf4, 0xd5, 0x1e, 0x3a, 0x29, 0xcf, 0x43,</div><div class='del'>-	0xa7, 0x49, 0x5e, 0xdf, 0x26, 0x7b, 0xbd, 0x0f, 0xc9, 0x7e, 0xad, 0x65,</div><div class='del'>-	0xbc, 0xe7, 0xea, 0xab, 0x35, 0xdf, 0x82, 0x8d, 0x6d, 0xfe, 0x49, 0xfb,</div><div class='del'>-	0x5e, 0xcd, 0xfb, 0x8f, 0x50, 0x5f, 0x19, 0xb6, 0x99, 0x4a, 0xca, 0x7e,</div><div class='del'>-	0xd4, 0x99, 0x78, 0x22, 0x2d, 0xbf, 0x6b, 0x5b, 0x12, 0xea, 0xe3, 0x88,</div><div class='del'>-	0x55, 0x0b, 0x1f, 0x0f, 0xe3, 0xd6, 0x3e, 0x0f, 0xed, 0x20, 0x8e, 0x32,</div><div class='del'>-	0xfa, 0xd6, 0xfd, 0xe3, 0xf5, 0xf4, 0xb5, 0xc7, 0x2c, 0x2d, 0x12, 0x68,</div><div class='del'>-	0x19, 0x27, 0xe7, 0x59, 0x3f, 0xbe, 0x18, 0x4b, 0x07, 0x2c, 0xcb, 0x73,</div><div class='del'>-	0x8d, 0x11, 0xde, 0xa0, 0xf8, 0xe1, 0xa2, 0x0f, 0x3a, 0xe8, 0x57, 0x6b,</div><div class='del'>-	0xf7, 0x07, 0xb4, 0xb7, 0x88, 0xa7, 0xeb, 0xea, 0x0f, 0xd3, 0x3e, 0x8c,</div><div class='del'>-	0xf3, 0x4d, 0xc4, 0x52, 0x67, 0x24, 0xc0, 0x3c, 0xd1, 0x43, 0xdb, 0xf7,</div><div class='del'>-	0xe2, 0x7c, 0x42, 0xfc, 0x4b, 0xef, 0xf8, 0x2e, 0x73, 0x93, 0x0e, 0xfa,</div><div class='del'>-	0xc6, 0x07, 0x89, 0xeb, 0xe9, 0x4b, 0x61, 0x1e, 0x33, 0xe9, 0x0b, 0x6e,</div><div class='del'>-	0xbc, 0x93, 0x30, 0xe8, 0x77, 0x1e, 0xbc, 0x9b, 0xa8, 0x63, 0x9f, 0x41,</div><div class='del'>-	0x96, 0xf5, 0x63, 0xa3, 0xfd, 0xde, 0x75, 0x4d, 0xfc, 0x5b, 0x4a, 0x4d,</div><div class='del'>-	0xff, 0x2c, 0xb5, 0x02, 0xd1, 0x4a, 0x0d, 0x7f, 0x37, 0xfe, 0x37, 0xf8,</div><div class='del'>-	0x19, 0xe3, 0xf6, 0x9a, 0x3e, 0x70, 0x0e, 0x11, 0x22, 0x0f, 0x9c, 0x38,</div><div class='del'>-	0x28, 0xcf, 0xe9, 0x50, 0x1b, 0x9d, 0xeb, 0xd0, 0x99, 0xdb, 0xea, 0x99,</div><div class='del'>-	0x73, 0x0e, 0x27, 0xfb, 0x24, 0x2b, 0x66, 0xd9, 0x0f, 0xfa, 0x8b, 0xf1,</div><div class='del'>-	0xc0, 0xfe, 0xc3, 0xf4, 0x91, 0x02, 0x2c, 0x78, 0xc4, 0x8d, 0xbf, 0x3b,</div><div class='del'>-	0x38, 0x22, 0x6b, 0x4b, 0x82, 0x99, 0xfe, 0x21, 0x12, 0x85, 0x30, 0xb9,</div><div class='del'>-	0xde, 0xfd, 0x7b, 0x46, 0x30, 0x90, 0xe3, 0x79, 0x1f, 0x84, 0xe2, 0x5f,</div><div class='del'>-	0x51, 0x71, 0x98, 0x3c, 0x22, 0x10, 0xbf, 0x9a, 0x36, 0x26, 0xef, 0xb8,</div><div class='del'>-	0x49, 0xec, 0x5f, 0x41, 0x1b, 0xeb, 0xe6, 0x7c, 0x7e, 0x83, 0xe3, 0xd8,</div><div class='del'>-	0x41, 0x1b, 0x1b, 0x4d, 0xcc, 0xc4, 0x56, 0xda, 0x58, 0x9c, 0x36, 0x16,</div><div class='del'>-	0xa7, 0x3d, 0xc5, 0x69, 0x63, 0xf2, 0x6e, 0x7e, 0x9c, 0x36, 0x16, 0xa7,</div><div class='del'>-	0x8d, 0xc5, 0x53, 0x8b, 0xf1, 0x14, 0x99, 0xc6, 0xae, 0x91, 0x45, 0xc4,</div><div class='del'>-	0x31, 0x79, 0xb6, 0xc6, 0x79, 0xb8, 0xed, 0x6f, 0xc8, 0xd9, 0x6f, 0xe0,</div><div class='del'>-	0xa1, 0xe0, 0x4e, 0xfa, 0xe4, 0x63, 0x43, 0xc4, 0x3b, 0xda, 0xc1, 0xa2,</div><div class='del'>-	0xb4, 0x70, 0xfc, 0x7a, 0xe6, 0xb1, 0xc7, 0xc8, 0xf3, 0x55, 0x3c, 0x6b,</div><div class='del'>-	0x4a, 0x1e, 0x6c, 0xf2, 0x9c, 0xb1, 0x26, 0x29, 0x1c, 0xec, 0x18, 0x36,</div><div class='del'>-	0xf4, 0x03, 0x37, 0x91, 0x17, 0x56, 0x92, 0x97, 0x8c, 0x2c, 0x00, 0x5e,</div><div class='del'>-	0x1c, 0x12, 0x19, 0xc5, 0xc7, 0xb3, 0xfb, 0x4f, 0x8f, 0xf7, 0xd7, 0x44,</div><div class='del'>-	0x1b, 0x65, 0x7d, 0x88, 0x9c, 0x64, 0xf1, 0xb0, 0x70, 0xbc, 0xc3, 0xe4,</div><div class='del'>-	0x48, 0x7a, 0xf8, 0xdf, 0x21, 0x1c, 0xaf, 0x12, 0x65, 0x7b, 0xf4, 0xf0,</div><div class='del'>-	0x3b, 0x30, 0xd6, 0xfd, 0x52, 0xb1, 0x16, 0xbf, 0x16, 0x0a, 0xc4, 0x9f,</div><div class='del'>-	0x54, 0x54, 0x34, 0x93, 0xef, 0xdd, 0xbc, 0xd3, 0x89, 0x9e, 0xd0, 0x62,</div><div class='del'>-	0x7c, 0x85, 0x9c, 0x6f, 0xf5, 0x35, 0x2a, 0x96, 0xec, 0xa3, 0x2d, 0x55,</div><div class='del'>-	0x0a, 0xc7, 0xd2, 0xc3, 0xe7, 0x30, 0x61, 0xaf, 0x13, 0x8e, 0xa6, 0x8e,</div><div class='del'>-	0x5b, 0x55, 0x86, 0x60, 0x11, 0xb1, 0xed, 0xea, 0x37, 0x2d, 0xb7, 0xac,</div><div class='del'>-	0x35, 0x91, 0x03, 0x0e, 0xf7, 0x47, 0x5f, 0x70, 0x12, 0xf7, 0xd7, 0x93,</div><div class='del'>-	0x07, 0x3e, 0x91, 0xe3, 0x81, 0x07, 0xfb, 0x0d, 0xed, 0x07, 0xc4, 0x8b,</div><div class='del'>-	0xfd, 0x3c, 0xdf, 0xca, 0x73, 0xab, 0xdf, 0xe0, 0x7c, 0x04, 0x9a, 0x66,</div><div class='del'>-	0x90, 0x1b, 0xbe, 0x43, 0x99, 0x7b, 0x29, 0x73, 0x82, 0xf6, 0x9f, 0xee,</div><div class='del'>-	0xd5, 0x90, 0x1c, 0x33, 0x30, 0xde, 0xeb, 0x45, 0xdf, 0x58, 0x10, 0x4f,</div><div class='del'>-	0xf6, 0xfa, 0xb0, 0x93, 0xfc, 0xf0, 0x70, 0xaf, 0xf8, 0xe2, 0x4c, 0xf4,</div><div class='del'>-	0x8f, 0xcd, 0xc4, 0x37, 0x92, 0xb2, 0x3e, 0xf5, 0x2e, 0x56, 0x57, 0x88,</div><div class='del'>-	0x7e, 0xc4, 0x2f, 0xc9, 0xaf, 0x93, 0x7a, 0x4f, 0x8c, 0x63, 0x8a, 0x79,</div><div class='del'>-	0xf5, 0x43, 0x31, 0xe8, 0x43, 0x9c, 0xc1, 0x8f, 0x87, 0xbe, 0x20, 0x31,</div><div class='del'>-	0x52, 0x7c, 0x52, 0xc3, 0x13, 0xe4, 0x3c, 0xa5, 0xc4, 0xd5, 0x92, 0x48,</div><div class='del'>-	0x4d, 0xf4, 0x0b, 0x8a, 0x1e, 0x7b, 0x45, 0xb5, 0xac, 0x4a, 0x89, 0xe1,</div><div class='del'>-	0x07, 0x35, 0xf2, 0x0f, 0x13, 0x37, 0xdb, 0x31, 0x5b, 0xc3, 0xf4, 0xdd,</div><div class='del'>-	0x95, 0xa8, 0xda, 0xdd, 0x87, 0xff, 0x56, 0x19, 0xff, 0x60, 0x1a, 0x63,</div><div class='del'>-	0xfd, 0x34, 0x62, 0xfb, 0xec, 0xbe, 0x93, 0xd3, 0x67, 0x91, 0x33, 0xbf,</div><div class='del'>-	0xa1, 0xd6, 0x66, 0xbe, 0x0b, 0xfd, 0xd0, 0x69, 0x87, 0x3e, 0x71, 0x94,</div><div class='del'>-	0xf1, 0xc1, 0x45, 0xfb, 0x9c, 0x31, 0xae, 0xd1, 0x7f, 0x6b, 0x8f, 0x56,</div><div class='del'>-	0xc1, 0x88, 0x5f, 0xab, 0x3a, 0x2d, 0x54, 0x8a, 0x3c, 0xa1, 0xf2, 0x6c,</div><div class='del'>-	0x6e, 0x14, 0x26, 0xf6, 0x4b, 0x6c, 0x70, 0x40, 0x23, 0x0e, 0xff, 0x3d,</div><div class='del'>-	0x7d, 0xe6, 0x4e, 0x3b, 0x1e, 0x1d, 0xb6, 0x9f, 0x85, 0x76, 0x8e, 0xc7,</div><div class='del'>-	0xe9, 0x27, 0x8b, 0xd1, 0xd1, 0xef, 0x41, 0xbb, 0x1d, 0x8b, 0x1e, 0xb3,</div><div class='del'>-	0x2a, 0xe8, 0x33, 0x1d, 0xfb, 0x03, 0x4d, 0x37, 0xd2, 0x67, 0xae, 0xbb,</div><div class='del'>-	0x46, 0xe2, 0xd8, 0x61, 0xf2, 0x5f, 0xc3, 0xbc, 0x8e, 0xf8, 0xb2, 0xb5,</div><div class='del'>-	0xde, 0xe8, 0x78, 0x9e, 0x32, 0xdd, 0x4f, 0xfb, 0x7f, 0x97, 0x3c, 0xe7,</div><div class='del'>-	0xdc, 0x9e, 0x43, 0xd4, 0x99, 0x66, 0xfb, 0xc3, 0xcf, 0x92, 0x3e, 0xdb,</div><div class='del'>-	0x37, 0x62, 0xfc, 0x2d, 0x71, 0x2f, 0x46, 0x5f, 0xfa, 0x37, 0xc6, 0xec,</div><div class='del'>-	0xe2, 0x50, 0xfc, 0xf6, 0x62, 0x04, 0x71, 0x1f, 0x65, 0xfd, 0x38, 0xa9,</div><div class='del'>-	0xf7, 0x6f, 0x90, 0x77, 0x8f, 0x43, 0x26, 0x65, 0xf1, 0xe0, 0x83, 0xa4,</div><div class='del'>-	0xd8, 0xd9, 0x89, 0xff, 0x59, 0x89, 0xf8, 0x26, 0xc6, 0xe0, 0xa0, 0xe6,</div><div class='del'>-	0x90, 0xb5, 0xf0, 0x99, 0x58, 0x73, 0xf0, 0x1a, 0xca, 0x5c, 0x47, 0xff,</div><div class='del'>-	0x03, 0xe6, 0x0c, 0x47, 0x70, 0xcf, 0x1e, 0xc9, 0x31, 0xd0, 0x20, 0xb9,</div><div class='del'>-	0xda, 0xbc, 0x50, 0xc0, 0x3c, 0x43, 0xac, 0x58, 0x3b, 0x76, 0x98, 0x71,</div><div class='del'>-	0x42, 0xd6, 0x96, 0x91, 0xf1, 0x19, 0x61, 0xbc, 0xda, 0x5b, 0x6f, 0xbf,</div><div class='del'>-	0xd3, 0x70, 0xff, 0x58, 0x3d, 0x5e, 0xe9, 0x9d, 0x89, 0xfb, 0x98, 0xeb,</div><div class='del'>-	0xc4, 0x98, 0xeb, 0xc4, 0xc6, 0xbc, 0x88, 0x1d, 0x98, 0xc6, 0x83, 0xb2,</div><div class='del'>-	0x1d, 0x98, 0xc3, 0x83, 0xb2, 0x8d, 0xa9, 0xf8, 0x2a, 0xf3, 0x97, 0x0d,</div><div class='del'>-	0xc4, 0xf3, 0x1e, 0xda, 0xe3, 0xff, 0xe0, 0xdc, 0x0f, 0xd0, 0xde, 0xab,</div><div class='del'>-	0x89, 0xf7, 0x6f, 0xee, 0x02, 0xee, 0xb4, 0xf5, 0x73, 0x84, 0x7a, 0x54,</div><div class='del'>-	0xf0, 0x15, 0xfa, 0x44, 0x15, 0x63, 0x52, 0x37, 0xe7, 0x7c, 0xe7, 0xa0,</div><div class='del'>-	0x11, 0x0c, 0xab, 0x01, 0xed, 0x09, 0xce, 0x73, 0xd7, 0x88, 0x8a, 0x47,</div><div class='del'>-	0xfb, 0x17, 0x63, 0x3e, 0x63, 0xca, 0xb6, 0xa1, 0x09, 0xbb, 0x7c, 0x37,</div><div class='del'>-	0xfd, 0xe1, 0x6e, 0xfa, 0xc9, 0x7b, 0xf4, 0x93, 0xc9, 0x95, 0xf2, 0x3e,</div><div class='del'>-	0xa9, 0x93, 0x39, 0xff, 0xc3, 0x58, 0x93, 0x90, 0x78, 0xa7, 0xf7, 0x0c,</div><div class='del'>-	0xa9, 0xcc, 0xb5, 0x68, 0x9f, 0x5d, 0xcc, 0x51, 0x6e, 0xa7, 0x6d, 0x3e,</div><div class='del'>-	0x3a, 0x24, 0x3e, 0x24, 0x39, 0x8b, 0x11, 0xde, 0x46, 0xdb, 0x7c, 0x7e,</div><div class='del'>-	0x48, 0xfc, 0xa3, 0x14, 0xb7, 0xee, 0x94, 0xfd, 0xa6, 0xa5, 0xf8, 0xec,</div><div class='del'>-	0xbe, 0xc3, 0x94, 0xef, 0x08, 0x76, 0xd1, 0x2e, 0x4b, 0x69, 0x97, 0xf7,</div><div class='del'>-	0x51, 0xaf, 0x1e, 0xda, 0xe5, 0x06, 0xe2, 0x50, 0x09, 0xed, 0xf2, 0x5e,</div><div class='del'>-	0xf2, 0x81, 0xca, 0x9c, 0x5d, 0xfe, 0xdd, 0xf8, 0xc2, 0x8a, 0x6c, 0x8c,</div><div class='del'>-	0xf0, 0x42, 0xdd, 0x2d, 0xef, 0xf7, 0x59, 0xd6, 0xed, 0x66, 0xa6, 0x69,</div><div class='del'>-	0x06, 0x74, 0xb6, 0x1d, 0xc1, 0xb2, 0xb4, 0x13, 0xe5, 0x7d, 0x11, 0x2c,</div><div class='del'>-	0x4d, 0xd6, 0xb4, 0x9f, 0x55, 0x22, 0xc8, 0xcc, 0xc8, 0xf2, 0x40, 0x57,</div><div class='del'>-	0x9f, 0x7c, 0xdf, 0x43, 0x23, 0x07, 0xe1, 0xf8, 0xaf, 0xcd, 0x7e, 0x53,</div><div class='del'>-	0xe4, 0xf3, 0x7f, 0x01, 0x7f, 0x5c, 0x42, 0x99, 0x3a, 0xcd, 0x8f, 0xac,</div><div class='del'>-	0xc9, 0xec, 0xf7, 0x07, 0x9c, 0xb7, 0xf1, 0x7c, 0x16, 0xdb, 0xa8, 0x1a,</div><div class='del'>-	0x77, 0x3a, 0xbf, 0x98, 0xf4, 0x60, 0xfa, 0xb8, 0x89, 0xbf, 0xcd, 0xb6,</div><div class='del'>-	0xe3, 0x2e, 0x88, 0x34, 0xe2, 0xb9, 0x84, 0x82, 0x69, 0xc6, 0xd3, 0xf8,</div><div class='del'>-	0x91, 0xbd, 0x2e, 0x50, 0x89, 0xf2, 0xdd, 0xf6, 0x9a, 0x02, 0x0e, 0x24,</div><div class='del'>-	0xf4, 0xf6, 0x34, 0xcf, 0xcb, 0x0e, 0x7a, 0x51, 0xbc, 0x5b, 0xc1, 0x2d,</div><div class='del'>-	0x01, 0x2f, 0x4a, 0xf9, 0xdb, 0x43, 0xbe, 0xd9, 0x1d, 0x5a, 0x6e, 0x6d,</div><div class='del'>-	0x59, 0x25, 0xf6, 0xed, 0x05, 0x0e, 0x96, 0x94, 0x0b, 0x0e, 0x1e, 0x30,</div><div class='del'>-	0x65, 0xed, 0xd2, 0x40, 0x77, 0xa2, 0x12, 0x85, 0xbb, 0x6b, 0x9a, 0x1a,</div><div class='del'>-	0x51, 0x63, 0xbe, 0xc3, 0xfa, 0x05, 0x07, 0x3f, 0x5b, 0x21, 0xeb, 0xf6,</div><div class='del'>-	0x4f, 0x49, 0x8c, 0x1b, 0x92, 0x79, 0xcd, 0xc6, 0x50, 0xe7, 0xd8, 0x5b,</div><div class='del'>-	0x9a, 0xe8, 0x65, 0x13, 0x39, 0x8a, 0xda, 0xf7, 0xa6, 0x5d, 0xc6, 0x17,</div><div class='del'>-	0x39, 0x4a, 0x0c, 0x90, 0xf8, 0x72, 0x0a, 0xed, 0xfd, 0xa7, 0x68, 0xff,</div><div class='del'>-	0xb2, 0x8e, 0xc1, 0xbc, 0x77, 0x81, 0x85, 0xe2, 0x85, 0x99, 0x60, 0x31,</div><div class='del'>-	0xa2, 0x15, 0x15, 0xc4, 0x6f, 0xfa, 0x00, 0x5e, 0x30, 0xf5, 0x96, 0x87,</div><div class='del'>-	0x1c, 0xd1, 0x87, 0x8a, 0xa0, 0xaf, 0x7b, 0x5b, 0xe9, 0xc1, 0xc6, 0xc0,</div><div class='del'>-	0x08, 0xfa, 0xc8, 0x05, 0xf3, 0xf9, 0xf8, 0xba, 0x3d, 0x8c, 0x6f, 0x8e,</div><div class='del'>-	0x8b, 0xf9, 0xb8, 0x16, 0x8a, 0xff, 0x8e, 0x3c, 0xc0, 0x3f, 0x9b, 0x18,</div><div class='del'>-	0xed, 0xb0, 0x7d, 0x27, 0x90, 0xd9, 0x44, 0x7b, 0x0d, 0x8f, 0x87, 0xe9,</div><div class='del'>-	0x23, 0x23, 0x82, 0x7d, 0xf2, 0x35, 0xa3, 0x17, 0x0a, 0x98, 0x3f, 0x16,</div><div class='del'>-	0x33, 0x0f, 0x39, 0x9d, 0xb4, 0x3a, 0xdd, 0xb4, 0x6b, 0xe7, 0xa2, 0x99,</div><div class='del'>-	0x50, 0xd3, 0x37, 0xe0, 0x9d, 0x5d, 0x33, 0x51, 0x48, 0x5f, 0xaa, 0x48,</div><div class='del'>-	0xca, 0x0b, 0x55, 0xea, 0xa7, 0xd9, 0x6f, 0xec, 0x3d, 0x04, 0xda, 0x03,</div><div class='del'>-	0x8e, 0xda, 0x75, 0x49, 0x45, 0x27, 0xf6, 0xeb, 0x2d, 0xa5, 0xea, 0x4c,</div><div class='del'>-	0x78, 0x98, 0xaf, 0x94, 0xa4, 0x3d, 0x00, 0xb9, 0x32, 0x58, 0xef, 0xa7,</div><div class='del'>-	0xbb, 0x5c, 0x28, 0x37, 0x8c, 0xe8, 0x33, 0xcc, 0x81, 0x1c, 0xa3, 0x4e,</div><div class='del'>-	0xfc, 0xcc, 0x96, 0x6b, 0x1a, 0x8a, 0x47, 0x6f, 0xc0, 0xe9, 0x5d, 0x7e,</div><div class='del'>-	0xa8, 0xbc, 0x76, 0x76, 0xcf, 0x1c, 0x14, 0x8c, 0x12, 0x08, 0xd2, 0x8b,</div><div class='del'>-	0xf1, 0xd6, 0x2e, 0x15, 0xae, 0xd1, 0xbf, 0xc1, 0x87, 0xbb, 0x14, 0xcc,</div><div class='del'>-	0x9f, 0xa7, 0xa0, 0x68, 0x78, 0x84, 0x3a, 0x11, 0xee, 0x45, 0x3f, 0x4d,</div><div class='del'>-	0xc1, 0xe6, 0x5d, 0x5b, 0x92, 0xc2, 0xed, 0xc9, 0xe9, 0x06, 0x2b, 0x61,</div><div class='del'>-	0xee, 0x7e, 0xd3, 0xaa, 0x30, 0x8c, 0xd8, 0x2d, 0xaa, 0xb5, 0xb8, 0x72,</div><div class='del'>-	0x41, 0xa0, 0x65, 0x80, 0x38, 0xfd, 0x12, 0x7d, 0xe0, 0x64, 0x7f, 0xdc,</div><div class='del'>-	0xf2, 0x18, 0x8b, 0x89, 0xb5, 0x51, 0x34, 0x30, 0x37, 0x97, 0xbc, 0x7b,</div><div class='del'>-	0x9b, 0x9d, 0xef, 0xca, 0x7e, 0x63, 0x27, 0xfc, 0x63, 0x0f, 0xe3, 0x78,</div><div class='del'>-	0xc2, 0x8d, 0xc5, 0x63, 0xa5, 0xb8, 0x8e, 0x39, 0x75, 0x98, 0xdc, 0x21,</div><div class='del'>-	0xbc, 0x2f, 0xcb, 0xf1, 0x9e, 0x27, 0xc7, 0xfb, 0x15, 0xb2, 0x1c, 0x6f,</div><div class='del'>-	0x80, 0xb9, 0x5a, 0x95, 0x51, 0x8a, 0x5b, 0x06, 0x0c, 0xc6, 0x80, 0x52,</div><div class='del'>-	0x34, 0xdb, 0xeb, 0x01, 0x1a, 0x6e, 0xa3, 0xff, 0x7e, 0x9e, 0xf9, 0xf8,</div><div class='del'>-	0xcd, 0x3b, 0x03, 0xbe, 0x1d, 0x8a, 0x8f, 0x71, 0x40, 0xda, 0x3f, 0x4c,</div><div class='del'>-	0xdc, 0xf0, 0x61, 0x4e, 0xaf, 0x11, 0x5c, 0x8a, 0xc0, 0xf9, 0x43, 0xd4,</div><div class='del'>-	0xe5, 0xe2, 0xb1, 0x1b, 0x10, 0xa6, 0xee, 0xc2, 0xfb, 0x0e, 0xe7, 0xc6,</div><div class='del'>-	0x31, 0x41, 0xd9, 0x9d, 0x78, 0x6f, 0x70, 0x16, 0x5e, 0x3d, 0x90, 0xcd,</div><div class='del'>-	0xc3, 0x03, 0x7d, 0x13, 0xb2, 0x5e, 0xfc, 0x35, 0x86, 0xd7, 0x7b, 0x24,</div><div class='del'>-	0x0f, 0xff, 0x41, 0xbf, 0xde, 0x5f, 0x2a, 0xeb, 0x84, 0xf4, 0xe7, 0xaf,</div><div class='del'>-	0x2e, 0x70, 0x30, 0xbe, 0xe8, 0xfe, 0xef, 0x3b, 0xe2, 0xf2, 0x1c, 0xd9,</div><div class='del'>-	0xff, 0x08, 0xef, 0x7f, 0x9f, 0xf1, 0xfc, 0x36, 0x5e, 0x8f, 0x55, 0x32,</div><div class='del'>-	0xd7, 0x5e, 0x18, 0x3f, 0xef, 0xe2, 0xf5, 0xc7, 0x38, 0x97, 0x65, 0x46,</div><div class='del'>-	0x4d, 0xec, 0x15, 0xe5, 0x08, 0x71, 0xc3, 0x81, 0x1d, 0x21, 0x3d, 0xba,</div><div class='del'>-	0xc3, 0xce, 0xa1, 0x9d, 0x98, 0x48, 0x5f, 0x9d, 0xf3, 0xc1, 0x4a, 0x94,</div><div class='del'>-	0xec, 0x96, 0xfc, 0xc5, 0x90, 0xf5, 0x9f, 0xfe, 0x12, 0xe6, 0x4f, 0x95,</div><div class='del'>-	0x17, 0xec, 0x33, 0xbf, 0xff, 0x09, 0xee, 0x8a, 0x48, 0x33, 0x42, 0x7d,</div><div class='del'>-	0xf9, 0x7d, 0x50, 0x87, 0xd0, 0x9d, 0x7e, 0x10, 0xed, 0xbb, 0xf4, 0x76,</div><div class='del'>-	0x59, 0x1f, 0x7a, 0x25, 0x14, 0xb7, 0xca, 0x8d, 0x4e, 0xb8, 0x16, 0x18,</div><div class='del'>-	0xcd, 0xcc, 0x5d, 0x62, 0xdf, 0x56, 0x8a, 0x19, 0x3b, 0x8e, 0x61, 0xf3,</div><div class='del'>-	0xb0, 0x1e, 0xdc, 0xa1, 0x18, 0xcc, 0xf7, 0x34, 0x1c, 0x1a, 0x2c, 0xc0,</div><div class='del'>-	0xdd, 0x7b, 0x5a, 0x19, 0xdb, 0x4c, 0xe2, 0x66, 0x8d, 0xff, 0x1c, 0xde,</div><div class='del'>-	0xc7, 0x49, 0x53, 0xde, 0x11, 0x2a, 0x42, 0xab, 0x26, 0x7b, 0x80, 0x98,</div><div class='del'>-	0x79, 0x4e, 0xbb, 0xe4, 0x3d, 0x71, 0x4f, 0x91, 0x91, 0x7f, 0xdf, 0xdf,</div><div class='del'>-	0x60, 0xae, 0x38, 0x89, 0xfd, 0x83, 0xb2, 0x2e, 0x50, 0xa5, 0x1c, 0xef,</div><div class='del'>-	0x9f, 0xeb, 0xeb, 0x22, 0xe6, 0x3f, 0x64, 0x66, 0x70, 0x7e, 0x61, 0x25,</div><div class='del'>-	0x30, 0x5d, 0x41, 0xe8, 0xd3, 0x01, 0xf9, 0x9e, 0x0d, 0xff, 0xde, 0xb3,</div><div class='del'>-	0xfc, 0x5f, 0x90, 0x76, 0x4a, 0xcb, 0xb2, 0x6b, 0x05, 0x3f, 0xaa, 0x94,</div><div class='del'>-	0xf7, 0x01, 0x8f, 0x27, 0x2b, 0xca, 0xb3, 0xcf, 0x9c, 0xff, 0x54, 0x1f,</div><div class='del'>-	0x6f, 0x58, 0x7e, 0xbb, 0x8d, 0x7c, 0xdd, 0xd7, 0xad, 0xa8, 0x57, 0xca,</div><div class='del'>-	0x17, 0xb0, 0x6d, 0xf1, 0xcb, 0x2a, 0x65, 0x1d, 0x71, 0x54, 0x0d, 0x55,</div><div class='del'>-	0x29, 0xad, 0x43, 0x97, 0xb7, 0xfb, 0x9a, 0x15, 0x6d, 0x96, 0xf3, 0x7c,</div><div class='del'>-	0x39, 0x8b, 0xf7, 0xa5, 0x6c, 0xfe, 0xfe, 0x0b, 0xb9, 0xb6, 0x0a, 0xc9,</div><div class='del'>-	0x53, 0xb3, 0x65, 0xee, 0xee, 0x97, 0xfd, 0x4b, 0x51, 0x9c, 0xa8, 0x9f,</div><div class='del'>-	0xda, 0x5e, 0xbe, 0xef, 0xef, 0x5c, 0xd2, 0x5e, 0xb6, 0x6c, 0x55, 0x15,</div><div class='del'>-	0x8a, 0xa5, 0x7c, 0x06, 0xff, 0x8f, 0xbd, 0x86, 0x70, 0xc6, 0xde, 0x73,</div><div class='del'>-	0xb8, 0xcd, 0x6c, 0x88, 0x16, 0xe1, 0x33, 0x50, 0xaf, 0x8a, 0xcf, 0x2f,</div><div class='del'>-	0xb2, 0xb9, 0x6d, 0xb4, 0xb9, 0x88, 0xf9, 0xad, 0xdb, 0x88, 0x3e, 0xe4,</div><div class='del'>-	0x46, 0x26, 0xe3, 0x86, 0xde, 0x72, 0x5e, 0x39, 0xa4, 0xdc, 0x1d, 0xd0,</div><div class='del'>-	0xdb, 0xdf, 0x23, 0xd7, 0x78, 0x39, 0x10, 0xb7, 0x4a, 0x0d, 0xc3, 0xd7,</div><div class='del'>-	0xab, 0xe8, 0xe6, 0x1a, 0xc6, 0xb2, 0x17, 0x99, 0x3f, 0xb6, 0x05, 0x7a,</div><div class='del'>-	0xec, 0xe7, 0x8b, 0x4a, 0x64, 0x05, 0xae, 0xb4, 0xbf, 0xdd, 0xd2, 0x0c,</div><div class='del'>-	0x23, 0xf5, 0xb2, 0xac, 0x77, 0xf1, 0x77, 0x0c, 0xf3, 0xed, 0x6b, 0x6d,</div><div class='del'>-	0x08, 0xda, 0xff, 0x57, 0xe5, 0xbe, 0xef, 0xd2, 0x82, 0x1a, 0xfb, 0xff,</div><div class='del'>-	0x1d, 0x98, 0x9b, 0xba, 0xb0, 0x2e, 0x8c, 0x4d, 0xa6, 0x65, 0x3d, 0x67,</div><div class='del'>-	0x5a, 0x38, 0x73, 0x71, 0xbf, 0xf3, 0x0a, 0x07, 0xf3, 0x0d, 0x52, 0xac,</div><div class='del'>-	0x58, 0xf6, 0xfb, 0x54, 0x17, 0xdf, 0x97, 0x58, 0x7a, 0xc9, 0x7e, 0x67,</div><div class='del'>-	0xf9, 0xae, 0x42, 0xa5, 0xfd, 0xfd, 0xb1, 0x79, 0x8b, 0x9c, 0x78, 0x29,</div><div class='del'>-	0x51, 0x16, 0xf3, 0xf0, 0xf7, 0xe6, 0x45, 0x05, 0x58, 0x4f, 0x4e, 0xd6,</div><div class='del'>-	0x74, 0xd5, 0x33, 0x38, 0x67, 0x7f, 0xc7, 0x21, 0x1e, 0x92, 0xef, 0x37,</div><div class='del'>-	0x9c, 0x48, 0xd0, 0xa7, 0x07, 0xbb, 0x43, 0xfb, 0xed, 0xbe, 0x5f, 0xc7,</div><div class='del'>-	0xa6, 0x51, 0x79, 0xe6, 0xd7, 0x8c, 0xd5, 0x89, 0x49, 0xc6, 0x37, 0x69,</div><div class='del'>-	0x4b, 0xf2, 0x6e, 0x3d, 0xd3, 0xc6, 0x5c, 0x55, 0x75, 0x04, 0x71, 0x3b,</div><div class='del'>-	0xe3, 0xca, 0x2b, 0x09, 0xda, 0xe9, 0x42, 0xbd, 0xe3, 0xdb, 0xe4, 0x06,</div><div class='del'>-	0x65, 0x11, 0x3d, 0xf8, 0xae, 0xd2, 0x82, 0x31, 0xd6, 0x9f, 0x48, 0x88,</div><div class='del'>-	0x2d, 0x56, 0xc6, 0x0a, 0x39, 0x96, 0x43, 0xe4, 0xa3, 0x2f, 0x27, 0x34,</div><div class='del'>-	0x9c, 0xab, 0xf7, 0x20, 0x45, 0x7e, 0xfa, 0x52, 0x42, 0xb8, 0x9a, 0x17,</div><div class='del'>-	0x4f, 0x0c, 0xca, 0xfa, 0x60, 0x23, 0x1a, 0x12, 0xb2, 0x36, 0xec, 0xc5,</div><div class='del'>-	0xe3, 0x23, 0x5e, 0xda, 0xa3, 0x65, 0x6d, 0xa2, 0xed, 0xb6, 0x6a, 0x13,</div><div class='del'>-	0xec, 0x53, 0xd6, 0x14, 0xa3, 0xb8, 0xa9, 0xb7, 0x12, 0x4f, 0x8c, 0xf8,</div><div class='del'>-	0xf0, 0x3d, 0xf2, 0xf1, 0x3e, 0xd6, 0x7b, 0x25, 0xe1, 0x47, 0x6f, 0xca,</div><div class='del'>-	0x87, 0xe7, 0xc9, 0xcb, 0xb7, 0xf2, 0x5c, 0xbe, 0x05, 0x56, 0x60, 0x04,</div><div class='del'>-	0x91, 0x48, 0x1d, 0x63, 0x6c, 0xbc, 0x02, 0x6b, 0x57, 0x1e, 0x81, 0xda,</div><div class='del'>-	0x7b, 0x94, 0xc7, 0xf5, 0x8c, 0xd5, 0xd7, 0x23, 0x39, 0x18, 0x41, 0x72,</div><div class='del'>-	0xe4, 0x87, 0xe8, 0x19, 0x94, 0x71, 0xc9, 0x37, 0xa1, 0x64, 0x6f, 0x91,</div><div class='del'>-	0x81, 0xf9, 0x8c, 0xa7, 0x43, 0x23, 0xd2, 0x4f, 0x25, 0xfb, 0xfe, 0x4b,</div><div class='del'>-	0xdb, 0xff, 0x99, 0xb5, 0xf6, 0xf3, 0xd2, 0xf6, 0x91, 0x3f, 0xd1, 0xbe,</div><div class='del'>-	0xe8, 0x2a, 0xff, 0x6e, 0x9f, 0xac, 0x73, 0xb8, 0xd9, 0xa6, 0x07, 0x8e,</div><div class='del'>-	0x48, 0x66, 0x65, 0x29, 0xf4, 0xe8, 0x76, 0xc5, 0x68, 0x2a, 0x51, 0x26,</div><div class='del'>-	0xb1, 0x3d, 0x2d, 0xef, 0x71, 0x15, 0xe2, 0x79, 0x72, 0x02, 0x57, 0x48,</div><div class='del'>-	0xd7, 0xbe, 0x4d, 0xdb, 0x59, 0x42, 0x8c, 0x39, 0x63, 0x7e, 0x1a, 0x71,</div><div class='del'>-	0x4d, 0xf4, 0x57, 0x88, 0x57, 0xfb, 0xdd, 0x78, 0x37, 0xc4, 0x98, 0x6d,</div><div class='del'>-	0xef, 0xa1, 0xf6, 0xe0, 0x27, 0x09, 0x2f, 0xe7, 0xab, 0x36, 0x63, 0x38,</div><div class='del'>-	0xe6, 0x02, 0x55, 0xd9, 0x6b, 0x27, 0x12, 0x6d, 0xd8, 0x4f, 0x79, 0x5f,</div><div class='del'>-	0x49, 0x9c, 0xe7, 0xfc, 0xac, 0xa3, 0xfe, 0x45, 0xdf, 0xf1, 0x9c, 0xae,</div><div class='del'>-	0xbb, 0xa9, 0xeb, 0x99, 0x78, 0x31, 0xf1, 0x30, 0x9e, 0xa0, 0xfc, 0x8f,</div><div class='del'>-	0xf7, 0x1b, 0xd1, 0x39, 0xca, 0x31, 0x1c, 0x1a, 0x2a, 0x24, 0x7e, 0xbb,</div><div class='del'>-	0x71, 0x37, 0xb3, 0xe4, 0x49, 0xe9, 0x2b, 0x29, 0x6b, 0x93, 0x0a, 0xb9,</div><div class='del'>-	0xc7, 0x31, 0x8c, 0xf3, 0xde, 0x4f, 0xf8, 0x3b, 0xbc, 0xb0, 0x9c, 0x7d,</div><div class='del'>-	0x88, 0x7e, 0xfc, 0x76, 0x1e, 0xd0, 0x45, 0x7e, 0xb3, 0xbc, 0xfe, 0x98,</div><div class='del'>-	0xcd, 0x79, 0xba, 0x93, 0xad, 0xe8, 0xe9, 0x7f, 0x9f, 0x7c, 0x8e, 0x38,</div><div class='del'>-	0xe4, 0xad, 0xa7, 0xad, 0x67, 0xb0, 0x3d, 0xf5, 0xef, 0x55, 0x59, 0xee,</div><div class='del'>-	0xf9, 0x6a, 0x95, 0xec, 0xeb, 0x3d, 0x91, 0x28, 0xc4, 0x4b, 0xac, 0xb3,</div><div class='del'>-	0x36, 0xe4, 0xca, 0x3d, 0x2f, 0x39, 0x86, 0x5e, 0xe2, 0x6a, 0x8a, 0x7d,</div><div class='del'>-	0x24, 0xec, 0x36, 0xaa, 0x94, 0xbd, 0xf4, 0xc3, 0xf2, 0x85, 0x55, 0x4a,</div><div class='del'>-	0x92, 0xe7, 0x7d, 0xc9, 0x1f, 0xe2, 0xd9, 0x47, 0xb2, 0x3a, 0xdc, 0x6f,</div><div class='del'>-	0xb6, 0x61, 0x28, 0x75, 0x2a, 0xd7, 0xde, 0x8f, 0xa7, 0xbc, 0x9b, 0x26,</div><div class='del'>-	0xef, 0xba, 0xe4, 0xdf, 0x7b, 0xc9, 0x3e, 0xcf, 0x7a, 0x2a, 0x5d, 0x46,</div><div class='del'>-	0xde, 0x5c, 0x4c, 0x5b, 0x2b, 0x88, 0x79, 0x19, 0x4f, 0xdb, 0x16, 0x68,</div><div class='del'>-	0xd8, 0x75, 0xcd, 0x9c, 0x2a, 0x94, 0x69, 0xee, 0x5f, 0xd7, 0xbf, 0xcc,</div><div class='del'>-	0x7e, 0xca, 0x62, 0x15, 0x91, 0x8c, 0xbd, 0x07, 0x2a, 0x74, 0x4d, 0x35,</div><div class='del'>-	0x73, 0x68, 0x79, 0x2e, 0x1c, 0xc3, 0xdb, 0x89, 0xca, 0x58, 0x65, 0xa4,</div><div class='del'>-	0x9c, 0x78, 0x7b, 0x0e, 0xbd, 0xc3, 0xc4, 0x76, 0xf2, 0xe5, 0xd2, 0xbe,</div><div class='del'>-	0x4a, 0xb8, 0xed, 0x35, 0xbc, 0x2b, 0x30, 0x63, 0xf7, 0x2c, 0xf8, 0x76,</div><div class='del'>-	0xcf, 0x24, 0x5f, 0x61, 0x6e, 0x19, 0xb2, 0xac, 0x9f, 0x2f, 0xb4, 0xac,</div><div class='del'>-	0x2b, 0x79, 0x14, 0xf1, 0x38, 0x1b, 0x12, 0x3f, 0x8d, 0xa2, 0xd6, 0xf6,</div><div class='del'>-	0x57, 0x03, 0x75, 0xf6, 0xff, 0x46, 0xfa, 0x7a, 0x47, 0x68, 0xfe, 0xf8,</div><div class='del'>-	0xc3, 0xa1, 0xb9, 0xe3, 0xd5, 0x50, 0x07, 0xa6, 0xc1, 0xc1, 0xb6, 0x3e,</div><div class='del'>-	0x77, 0x8d, 0x85, 0x46, 0xfa, 0xf0, 0x1a, 0x53, 0xf8, 0x50, 0x1b, 0xf9,</div><div class='del'>-	0x50, 0x4f, 0xc8, 0x18, 0x3f, 0x82, 0x1b, 0xc9, 0x97, 0xdd, 0x03, 0x3e,</div><div class='del'>-	0xf6, 0x23, 0xf9, 0xb5, 0x33, 0x33, 0x9b, 0x3c, 0xfb, 0xd3, 0x0b, 0x85,</div><div class='del'>-	0x1b, 0xb5, 0x90, 0x1b, 0x1d, 0x45, 0xcb, 0xf8, 0x31, 0xdc, 0xca, 0x32,</div><div class='del'>-	0x1e, 0xe6, 0xfd, 0x7d, 0xe9, 0x1f, 0x92, 0x77, 0x58, 0x8c, 0x39, 0x19,</div><div class='del'>-	0xdc, 0xcc, 0xb6, 0x8b, 0x07, 0x9a, 0x70, 0xf7, 0xf8, 0x0a, 0xac, 0x1d,</div><div class='del'>-	0xb7, 0xb0, 0x3c, 0x34, 0x81, 0xe5, 0xe3, 0xe4, 0x9a, 0xe3, 0x79, 0x7f,</div><div class='del'>-	0x15, 0x9e, 0xb4, 0x82, 0x3c, 0x49, 0xe2, 0xd0, 0x2a, 0x7b, 0x1d, 0x4d,</div><div class='del'>-	0xa5, 0x1f, 0x36, 0x24, 0xe4, 0x9d, 0x9b, 0x38, 0x56, 0x8f, 0x0b, 0x56,</div><div class='del'>-	0x3f, 0x88, 0x4d, 0xe3, 0xb2, 0x2e, 0xfb, 0xf5, 0xd0, 0x9c, 0xf1, 0xd7,</div><div class='del'>-	0xd1, 0x30, 0x3e, 0x14, 0x9a, 0x37, 0x3e, 0x42, 0xb9, 0x13, 0x94, 0xad,</div><div class='del'>-	0x3f, 0x54, 0x33, 0x3e, 0x18, 0x0a, 0x8e, 0xef, 0x0d, 0x05, 0xc6, 0x9b,</div><div class='del'>-	0xb1, 0x75, 0x7c, 0x15, 0xb6, 0x8c, 0xb7, 0x63, 0xf3, 0xb8, 0xe0, 0xfc,</div><div class='del'>-	0x24, 0x96, 0x8d, 0x9f, 0xc1, 0xd2, 0xf1, 0x97, 0xd1, 0x38, 0x7e, 0x0a,</div><div class='del'>-	0x4b, 0xc6, 0x7f, 0x88, 0xa6, 0xf1, 0x1f, 0x73, 0x2c, 0xb2, 0xce, 0x2b,</div><div class='del'>-	0x6b, 0xbc, 0xf9, 0x67, 0x6a, 0xf9, 0xf7, 0x44, 0xf3, 0xdf, 0xd7, 0x70,</div><div class='del'>-	0x21, 0xaa, 0xbd, 0x81, 0xee, 0x3d, 0xf2, 0xbd, 0xc1, 0x5a, 0x6d, 0x93,</div><div class='del'>-	0xfd, 0xbe, 0xc1, 0xcb, 0xb2, 0x4f, 0x1d, 0x45, 0xc6, 0xe5, 0xef, 0xc5,</div><div class='del'>-	0xcb, 0x77, 0x31, 0xe4, 0x39, 0xe7, 0x24, 0xba, 0xd2, 0xe7, 0xad, 0xa8,</div><div class='del'>-	0x26, 0x65, 0xde, 0xc0, 0xe6, 0x3d, 0xf2, 0x3e, 0x71, 0x06, 0x5d, 0x49,</div><div class='del'>-	0x79, 0x0e, 0x2f, 0xef, 0xa0, 0xbf, 0x81, 0x2d, 0xa3, 0xb6, 0xaf, 0xa1,</div><div class='del'>-	0x71, 0x48, 0xde, 0x89, 0x69, 0xc3, 0x75, 0xc9, 0x8c, 0xbd, 0x56, 0x5e,</div><div class='del'>-	0x66, 0xe0, 0xef, 0x67, 0xe0, 0x41, 0xe6, 0x04, 0x05, 0xe4, 0xfd, 0xc5,</div><div class='del'>-	0xe8, 0x7c, 0x24, 0x6e, 0x15, 0x1a, 0x1e, 0xcc, 0x88, 0x18, 0x99, 0x77,</div><div class='del'>-	0x1d, 0xc5, 0xe8, 0xe0, 0xb5, 0xfb, 0x76, 0xc2, 0xef, 0x33, 0x44, 0xf7,</div><div class='del'>-	0x81, 0xd8, 0x28, 0x63, 0xec, 0x86, 0x7d, 0x19, 0xf2, 0x8b, 0x0e, 0xf8,</div><div class='del'>-	0xf9, 0x7f, 0x7b, 0x52, 0xf6, 0x21, 0x6d, 0x42, 0x74, 0x9f, 0xe8, 0xb0,</div><div class='del'>-	0x99, 0x3a, 0x9c, 0x64, 0xdc, 0x90, 0x67, 0x38, 0x46, 0x70, 0x2b, 0x64,</div><div class='del'>-	0x9d, 0x52, 0xc5, 0xf7, 0x06, 0xe5, 0x79, 0x83, 0xde, 0xf1, 0x25, 0xfa,</div><div class='del'>-	0xf4, 0x87, 0xca, 0x0f, 0x51, 0x76, 0x40, 0xf8, 0xd2, 0x04, 0x7a, 0x84,</div><div class='del'>-	0x6f, 0x47, 0x14, 0x23, 0x15, 0x38, 0x0b, 0xcf, 0x01, 0xc1, 0x5d, 0x27,</div><div class='del'>-	0x4a, 0xc6, 0xe4, 0xfb, 0x38, 0x40, 0x31, 0xf3, 0x12, 0x1c, 0x20, 0xa7,</div><div class='del'>-	0x3d, 0x70, 0x0a, 0xd8, 0x27, 0xeb, 0x56, 0xaf, 0x61, 0x72, 0x48, 0xe6,</div><div class='del'>-	0xad, 0x8d, 0xf3, 0x26, 0x7e, 0xf8, 0x7d, 0x0c, 0x0f, 0x79, 0xe8, 0xe3,</div><div class='del'>-	0x13, 0x1c, 0xc7, 0xeb, 0x78, 0x74, 0x8f, 0x3c, 0x17, 0x99, 0x89, 0x36,</div><div class='del'>-	0xd6, 0x3b, 0xc1, 0x3c, 0xbf, 0x75, 0xcc, 0xe4, 0x78, 0x56, 0xa1, 0xf3,</div><div class='del'>-	0xc0, 0x17, 0x78, 0x4c, 0xc3, 0x43, 0x07, 0xd6, 0x71, 0x8c, 0x71, 0x74,</div><div class='del'>-	0x8c, 0x75, 0xf3, 0x68, 0xc5, 0xc6, 0x9d, 0x26, 0xb9, 0xa0, 0xd8, 0xb4,</div><div class='del'>-	0x46, 0x3f, 0x6b, 0xe5, 0x98, 0xa4, 0x8f, 0xd5, 0xf8, 0x19, 0x31, 0xa6,</div><div class='del'>-	0x29, 0xb4, 0x1a, 0xe7, 0x6c, 0xbf, 0x5b, 0x8d, 0x2d, 0xfd, 0x46, 0xf0,</div><div class='del'>-	0x24, 0x56, 0x63, 0x33, 0xcf, 0x1f, 0xa5, 0xef, 0xcf, 0x21, 0x17, 0xbc,</div><div class='del'>-	0x93, 0xbe, 0xbd, 0x78, 0x78, 0x42, 0xbe, 0x9d, 0x80, 0xbe, 0x5d, 0x32,</div><div class='del'>-	0x1f, 0x6d, 0xf0, 0x8d, 0x65, 0x50, 0x3e, 0xc6, 0xec, 0x79, 0x27, 0xee,</div><div class='del'>-	0x2a, 0x43, 0x39, 0xbe, 0x11, 0x92, 0x3d, 0x0b, 0x3f, 0x40, 0xf1, 0x3e,</div><div class='del'>-	0x91, 0xf5, 0x87, 0x6c, 0xfb, 0x1c, 0x73, 0xf1, 0x53, 0x9c, 0x83, 0xfc,</div><div class='del'>-	0xb3, 0xf1, 0x5f, 0xe0, 0x60, 0x6a, 0x92, 0xb8, 0x7a, 0x9a, 0xc7, 0xe5,</div><div class='del'>-	0xcf, 0xa5, 0xbd, 0x76, 0x8e, 0x92, 0xdd, 0xff, 0xed, 0xc4, 0x8c, 0x3e,</div><div class='del'>-	0x59, 0xdf, 0x6d, 0x86, 0x2f, 0x29, 0x7c, 0x27, 0xb3, 0x8d, 0xf9, 0x4a,</div><div class='del'>-	0x7b, 0xd8, 0xe6, 0x3f, 0x46, 0x8c, 0xbc, 0xa7, 0xf9, 0xdb, 0x8a, 0x87,</div><div class='del'>-	0xbc, 0x27, 0x88, 0x15, 0x69, 0x3d, 0x7a, 0x33, 0xf5, 0x5b, 0xf4, 0xc8,</div><div class='del'>-	0x8f, 0xe0, 0x7c, 0xc4, 0x89, 0x42, 0xe6, 0x37, 0xa1, 0x90, 0xe8, 0x59,</div><div class='del'>-	0xde, 0x95, 0xcd, 0xe8, 0x85, 0xc4, 0xcc, 0x82, 0xbe, 0x0c, 0xe7, 0x27,</div><div class='del'>-	0x33, 0xbf, 0x00, 0x7e, 0xce, 0xcd, 0x0d, 0x68, 0xeb, 0x8f, 0x72, 0x6e,</div><div class='del'>-	0x3e, 0x45, 0x1b, 0x9b, 0xa0, 0xbd, 0x48, 0x4e, 0xf4, 0x32, 0x65, 0x74,</div><div class='del'>-	0xe5, 0xbe, 0xc9, 0x93, 0xd1, 0x9d, 0xd0, 0x4d, 0xbf, 0x5a, 0x95, 0x7d,</div><div class='del'>-	0x27, 0x05, 0xf6, 0xb3, 0xe7, 0x30, 0xf0, 0x06, 0x6d, 0x33, 0xcf, 0x67,</div><div class='del'>-	0x2c, 0xab, 0x9d, 0xf6, 0xd5, 0x3f, 0x2a, 0xbe, 0xb2, 0xb4, 0x2a, 0xfb,</div><div class='del'>-	0xbe, 0xee, 0x54, 0xae, 0x93, 0xaf, 0xeb, 0x20, 0x36, 0xe6, 0xef, 0xff,</div><div class='del'>-	0x08, 0x77, 0x32, 0x7e, 0x9d, 0x59, 0x78, 0x2a, 0x67, 0xf3, 0xd3, 0xab,</div><div class='del'>-	0xb3, 0xf8, 0xf5, 0x49, 0xdf, 0x0b, 0xfa, 0x2b, 0xfb, 0xdb, 0x3b, 0xd9,</div><div class='del'>-	0x6f, 0x1f, 0x01, 0xcf, 0x26, 0x0a, 0xe4, 0x29, 0xc1, 0x62, 0x17, 0x54,</div><div class='del'>-	0xaf, 0x0b, 0x85, 0x8c, 0x01, 0xd5, 0xd8, 0xe4, 0xb5, 0x70, 0xa3, 0x59,</div><div class='del'>-	0x80, 0x43, 0x75, 0xb7, 0x00, 0x15, 0xf1, 0x16, 0x97, 0xfd, 0x4e, 0xde,</div><div class='del'>-	0xef, 0xbf, 0xf4, 0x87, 0xef, 0xe4, 0x9d, 0xb1, 0xf3, 0xe1, 0x52, 0xe3,</div><div class='del'>-	0x76, 0xbc, 0x62, 0xc7, 0x09, 0x05, 0x25, 0x73, 0x65, 0x5d, 0xd2, 0x8f,</div><div class='del'>-	0x17, 0x8d, 0x5a, 0x7f, 0x85, 0x3c, 0x6f, 0x52, 0xce, 0x5a, 0x71, 0xaf,</div><div class='del'>-	0xbc, 0x87, 0xf7, 0xc7, 0xf6, 0x8f, 0x3f, 0x87, 0xad, 0xbb, 0xc2, 0x90,</div><div class='del'>-	0xf7, 0x3b, 0x9c, 0x46, 0xa1, 0x37, 0x2b, 0xbf, 0xc8, 0x26, 0xeb, 0x44,</div><div class='del'>-	0xb7, 0x71, 0x1c, 0x67, 0xe8, 0x8b, 0x67, 0xec, 0x75, 0x2a, 0xb7, 0xf1,</div><div class='del'>-	0xd7, 0x08, 0x56, 0xe4, 0xc7, 0x2f, 0x39, 0x8d, 0x92, 0xd5, 0x41, 0xf6,</div><div class='del'>-	0xfd, 0xda, 0x6a, 0xc1, 0xfe, 0x2d, 0xc9, 0x33, 0xf6, 0x9a, 0xac, 0xcb,</div><div class='del'>-	0xf8, 0x0f, 0xeb, 0x2d, 0x6f, 0x25, 0xcb, 0x3e, 0x95, 0xbb, 0x3f, 0x29,</div><div class='del'>-	0xeb, 0x38, 0xa6, 0x7c, 0xbb, 0xca, 0x69, 0xd7, 0x11, 0xbd, 0x5f, 0xac,</div><div class='del'>-	0xb3, 0x89, 0xbc, 0x7a, 0xb6, 0x71, 0xca, 0xea, 0xf4, 0xca, 0x18, 0xd6,</div><div class='del'>-	0x5c, 0x56, 0x47, 0xd6, 0x08, 0x34, 0xe9, 0x37, 0x2c, 0x63, 0xee, 0x4a,</div><div class='del'>-	0xff, 0x61, 0x9f, 0xb2, 0x7e, 0x5b, 0x60, 0x94, 0xe0, 0x6c, 0x45, 0x76,</div><div class='del'>-	0x4d, 0xe5, 0xa2, 0x8c, 0xed, 0xd5, 0xb2, 0xef, 0xae, 0xd0, 0x3e, 0xb7,</div><div class='del'>-	0xfb, 0x35, 0x2f, 0xd6, 0x7b, 0x30, 0x37, 0xde, 0x4a, 0xfb, 0x9d, 0x9a,</div><div class='del'>-	0x47, 0x6d, 0xae, 0xe3, 0x98, 0x32, 0xee, 0xdf, 0x78, 0x2f, 0xed, 0xe7,</div><div class='del'>-	0xf3, 0xb9, 0x7e, 0x45, 0x1e, 0xef, 0x94, 0x3e, 0x44, 0xae, 0xde, 0x5c,</div><div class='del'>-	0x1d, 0x3d, 0x1c, 0xb5, 0xfb, 0x57, 0x11, 0xde, 0x93, 0xef, 0xd3, 0xb2,</div><div class='del'>-	0x0a, 0x16, 0xe6, 0xdb, 0xc8, 0xd0, 0x0f, 0xad, 0xce, 0x42, 0xc6, 0xab,</div><div class='del'>-	0xb3, 0xf5, 0x0f, 0x62, 0x73, 0x42, 0xf4, 0x2c, 0xdf, 0x70, 0x25, 0x2e,</div><div class='del'>-	0xdb, 0xfc, 0xcb, 0xc5, 0x5c, 0xf6, 0x1a, 0x0c, 0x69, 0x71, 0xec, 0xaf,</div><div class='del'>-	0x93, 0x77, 0xc8, 0x5c, 0xf4, 0x85, 0x38, 0x71, 0xb0, 0x90, 0x38, 0x1a,</div><div class='del'>-	0xb7, 0xf7, 0x94, 0x1c, 0x34, 0xf5, 0xe8, 0xb3, 0xf2, 0x8d, 0xb2, 0xab,</div><div class='del'>-	0xec, 0xb5, 0xa7, 0xa6, 0x21, 0xc8, 0xf5, 0xfc, 0x7a, 0x52, 0xfe, 0xaf,</div><div class='del'>-	0x88, 0xb6, 0x23, 0x72, 0x89, 0x0d, 0x50, 0xba, 0x84, 0xbc, 0xeb, 0x54,</div><div class='del'>-	0x1b, 0x23, 0x67, 0xc4, 0x2b, 0x29, 0xd9, 0x7f, 0xf0, 0x5b, 0x2b, 0x5e,</div><div class='del'>-	0x2d, 0xfb, 0x1c, 0xa7, 0xd6, 0x29, 0x20, 0x97, 0x0b, 0x84, 0xcb, 0x94,</div><div class='del'>-	0xfc, 0xfb, 0x4e, 0x17, 0xff, 0x6e, 0xa5, 0xcd, 0x9c, 0xb3, 0xdf, 0x51,</div><div class='del'>-	0x93, 0xb3, 0x08, 0x1a, 0x92, 0xf2, 0xad, 0x52, 0x7d, 0x62, 0x39, 0x6a,</div><div class='del'>-	0x33, 0x35, 0x0e, 0x67, 0x8e, 0x93, 0x84, 0xb1, 0x82, 0x76, 0xb3, 0x25,</div><div class='del'>-	0x10, 0xb6, 0xdf, 0xc5, 0x5a, 0x96, 0xac, 0x09, 0x3e, 0xce, 0x1c, 0xfa,</div><div class='del'>-	0x1d, 0x96, 0xbf, 0x25, 0xfd, 0x3d, 0x6b, 0xc8, 0x2b, 0x63, 0xca, 0x63,</div><div class='del'>-	0xc3, 0x29, 0xfa, 0x06, 0xf5, 0x18, 0x11, 0xff, 0xf0, 0xa0, 0x22, 0x12,</div><div class='del'>-	0xa6, 0xff, 0x4a, 0x4c, 0x97, 0xf7, 0xb8, 0xf4, 0xbd, 0x71, 0x98, 0xc4,</div><div class='del'>-	0xfc, 0x1e, 0xda, 0x91, 0xec, 0x5b, 0xd6, 0xfd, 0x2b, 0x19, 0x5b, 0x8e,</div><div class='del'>-	0x5f, 0x78, 0xc6, 0x2f, 0x1c, 0xe0, 0xd9, 0xea, 0xdc, 0xde, 0x66, 0xf7,</div><div class='del'>-	0x6c, 0xc6, 0x3c, 0xcb, 0x7e, 0x6e, 0xdf, 0x66, 0x63, 0x8a, 0x66, 0xe8,</div><div class='del'>-	0x87, 0x7e, 0xe5, 0xe8, 0xc4, 0xd3, 0x0b, 0x8c, 0x8e, 0xc3, 0x6a, 0x66,</div><div class='del'>-	0xc8, 0x47, 0x7c, 0xb9, 0xde, 0x11, 0xdd, 0xc9, 0xff, 0xfe, 0xd7, 0xec,</div><div class='del'>-	0x6f, 0xab, 0x48, 0x5d, 0x3d, 0xb8, 0x4a, 0x95, 0xfd, 0x40, 0xcd, 0x18,</div><div class='del'>-	0xeb, 0x95, 0x77, 0x06, 0xf4, 0x96, 0xa7, 0x94, 0x4e, 0x6c, 0x08, 0x19,</div><div class='del'>-	0xcd, 0xed, 0x8a, 0xde, 0xf4, 0x0f, 0x8a, 0xee, 0x0f, 0x29, 0x52, 0x2e,</div><div class='del'>-	0xc8, 0xbc, 0xeb, 0x62, 0x3c, 0x75, 0xb1, 0x8f, 0x03, 0x09, 0x3d, 0x5c,</div><div class='del'>-	0xc5, 0xb2, 0x67, 0x4d, 0xc3, 0xf7, 0x3e, 0xdb, 0xfc, 0x57, 0x1e, 0x3b,</div><div class='del'>-	0xed, 0xf7, 0xc4, 0xa5, 0x7c, 0x74, 0xbe, 0xcb, 0xfe, 0xbe, 0x69, 0x0b,</div><div class='del'>-	0xe3, 0xae, 0x7c, 0x23, 0x38, 0x06, 0xad, 0x6f, 0x26, 0x4d, 0x4c, 0xef,</div><div class='del'>-	0xb9, 0x0d, 0xb2, 0xe7, 0xa0, 0x89, 0x09, 0xba, 0x07, 0xde, 0x48, 0x27,</div><div class='add'>+	0x9d, 0xbc, 0x0d, 0x78, 0x1b, 0xe5, 0x95, 0x36, 0x7c, 0xcf, 0x48, 0xb2,</div><div class='add'>+	0x65, 0x5b, 0xb6, 0xc7, 0x8e, 0x9c, 0x28, 0x6c, 0x9a, 0x68, 0xf0, 0x28,</div><div class='add'>+	0x51, 0xb0, 0x69, 0x47, 0x89, 0x03, 0x82, 0x55, 0x89, 0xea, 0x98, 0xc4,</div><div class='add'>+	0x81, 0x50, 0x9c, 0x12, 0x5a, 0xb3, 0x4b, 0x5b, 0xe1, 0xfc, 0x60, 0x42,</div><div class='add'>+	0xa0, 0xa1, 0xb0, 0xef, 0x9a, 0xef, 0x65, 0x5f, 0xab, 0xb6, 0x93, 0x38,</div><div class='add'>+	0x89, 0x2c, 0x39, 0x8e, 0x21, 0x61, 0xbf, 0x5e, 0x8b, 0x89, 0x9d, 0x38,</div><div class='add'>+	0x80, 0x6c, 0x85, 0x36, 0xdd, 0x0d, 0x7d, 0xd3, 0x8d, 0x36, 0x09, 0x60,</div><div class='add'>+	0xfe, 0xda, 0x40, 0xbb, 0x2c, 0xed, 0xcb, 0x07, 0xde, 0x14, 0x42, 0xd8,</div><div class='add'>+	0xb6, 0x40, 0xb7, 0x3f, 0x1b, 0x5a, 0xca, 0xbc, 0xf7, 0x19, 0x49, 0x89,</div><div class='add'>+	0x13, 0x28, 0xed, 0x7e, 0xbe, 0xae, 0xb9, 0xac, 0x99, 0x79, 0x7e, 0xce,</div><div class='add'>+	0x73, 0x9e, 0x73, 0xee, 0x73, 0x9f, 0x67, 0x9e, 0x19, 0x3f, 0x50, 0x8a,</div><div class='add'>+	0xfc, 0x5f, 0x39, 0x8f, 0x4f, 0x37, 0x6c, 0x5c, 0xbd, 0x60, 0xc1, 0xa7,</div><div class='add'>+	0x1b, 0xe4, 0xdc, 0x39, 0xdd, 0xe9, 0xc4, 0x9f, 0xf9, 0xe7, 0xff, 0x73,</div><div class='add'>+	0x0b, 0x7e, 0xcc, 0x9f, 0x03, 0xd0, 0x0a, 0xfd, 0xcb, 0x01, 0xb7, 0x1a,</div><div class='add'>+	0x71, 0xde, 0xdc, 0x68, 0xc0, 0xed, 0x88, 0x4c, 0xb4, 0xad, 0x36, 0x80,</div><div class='add'>+	0x68, 0xba, 0xce, 0xbf, 0x04, 0x7f, 0xb0, 0xe2, 0x5e, 0x27, 0xe4, 0xfa,</div><div class='add'>+	0xa7, 0x22, 0x1f, 0x74, 0x7e, 0xef, 0x72, 0xfd, 0xbd, 0x21, 0x07, 0xdc,</div><div class='add'>+	0x5a, 0x24, 0x0e, 0x6d, 0x2e, 0xdc, 0xb3, 0x58, 0xe7, 0x9b, 0xf3, 0xbe,</div><div class='add'>+	0xa9, 0xa0, 0xa2, 0xd0, 0xd6, 0x69, 0xeb, 0x7b, 0xf3, 0x7c, 0xb1, 0x92,</div><div class='add'>+	0x88, 0x86, 0x23, 0x19, 0xb4, 0xd4, 0xf7, 0x75, 0x5a, 0xe5, 0x46, 0x08,</div><div class='add'>+	0x6e, 0xc3, 0x68, 0xed, 0x53, 0x3c, 0xe1, 0xf5, 0x8b, 0xe0, 0x29, 0x36,</div><div class='add'>+	0x10, 0xbf, 0x28, 0x82, 0x96, 0x4b, 0xc6, 0x4a, 0xe3, 0xce, 0x88, 0x1b,</div><div class='add'>+	0xcd, 0x19, 0x77, 0xfc, 0x2f, 0x22, 0x06, 0x96, 0x65, 0x66, 0x95, 0xa2,</div><div class='add'>+	0xc2, 0x8d, 0x9e, 0xcc, 0xeb, 0x25, 0xb9, 0xf6, 0xea, 0xf3, 0xff, 0x83,</div><div class='add'>+	0xd3, 0x72, 0xff, 0xa7, 0xc7, 0x9c, 0x11, 0x60, 0x53, 0xc2, 0xb2, 0x8a,</div><div class='add'>+	0x22, 0x37, 0xdc, 0xa0, 0x46, 0x0c, 0xdf, 0x3e, 0x2c, 0x46, 0x9b, 0x86,</div><div class='add'>+	0xfb, 0x36, 0x37, 0xfc, 0xa7, 0x72, 0x74, 0x90, 0x0d, 0x8f, 0x3a, 0x10,</div><div class='add'>+	0xd5, 0x8e, 0xf3, 0xff, 0xec, 0xd9, 0xad, 0x61, 0x03, 0xbb, 0x47, 0xcf,</div><div class='add'>+	0xf0, 0xba, 0xd3, 0xbe, 0xd6, 0xbd, 0x6b, 0xf6, 0xec, 0x9b, 0xc2, 0xc7,</div><div class='add'>+	0xf1, 0xe0, 0xa8, 0xfc, 0xbe, 0x15, 0x9d, 0xf5, 0x0a, 0x26, 0x6f, 0x58,</div><div class='add'>+	0x07, 0x87, 0x61, 0xa0, 0x67, 0x97, 0xe2, 0xec, 0xaa, 0x57, 0x11, 0xf5,</div><div class='add'>+	0xea, 0xc1, 0x18, 0x27, 0xc1, 0x69, 0x20, 0x56, 0x1c, 0x09, 0x3b, 0xdf,</div><div class='add'>+	0x4e, 0x44, 0x34, 0x87, 0x61, 0x59, 0xc1, 0xd0, 0x0c, 0x38, 0xaa, 0x2c,</div><div class='add'>+	0xeb, 0x09, 0xd3, 0x03, 0xff, 0x97, 0x9e, 0x42, 0x7c, 0xb8, 0x05, 0xaa,</div><div class='add'>+	0xf1, 0x14, 0xba, 0x86, 0x9f, 0xc2, 0x43, 0x3b, 0x4b, 0x31, 0x39, 0x8d,</div><div class='add'>+	0xe3, 0x4d, 0xf9, 0xf0, 0xbd, 0x79, 0xd2, 0xb7, 0xc8, 0x51, 0xcf, 0xc3,</div><div class='add'>+	0x8d, 0x49, 0xc7, 0x6b, 0xfc, 0x2f, 0x65, 0xce, 0x58, 0x93, 0x33, 0xce,</div><div class='add'>+	0x95, 0xd9, 0xc4, 0x32, 0x3d, 0x17, 0x94, 0x89, 0x0f, 0x47, 0xf0, 0x5c,</div><div class='add'>+	0x42, 0xc1, 0xfa, 0x50, 0x05, 0xa2, 0x55, 0x32, 0x5e, 0xcb, 0x1a, 0x35,</div><div class='add'>+	0x4f, 0x59, 0x93, 0x9a, 0xf4, 0x35, 0x81, 0xe7, 0x79, 0x6f, 0x73, 0xe8,</div><div class='add'>+	0x0d, 0x2b, 0xeb, 0x95, 0xf6, 0xbe, 0x4e, 0x1b, 0x5a, 0xc9, 0xeb, 0x4e,</div><div class='add'>+	0xa4, 0x12, 0x88, 0x55, 0x44, 0x6e, 0xe4, 0xb9, 0x6e, 0xbe, 0xa3, 0xb8,</div><div class='add'>+	0xdd, 0xef, 0x26, 0xdc, 0x5f, 0x2a, 0x37, 0xd4, 0x7b, 0x2a, 0xe1, 0xc4,</div><div class='add'>+	0x0b, 0x94, 0xf9, 0x90, 0xb9, 0x0e, 0x2e, 0xe3, 0x6e, 0xb1, 0x39, 0x8e,</div><div class='add'>+	0xeb, 0x47, 0x16, 0x66, 0x14, 0xea, 0x4b, 0xbb, 0x6e, 0x6c, 0x4e, 0x59,</div><div class='add'>+	0xd6, 0x56, 0x33, 0x7a, 0x45, 0x09, 0x0d, 0xe2, 0x58, 0xa2, 0x05, 0xee,</div><div class='add'>+	0x48, 0xc0, 0x7f, 0x1a, 0x61, 0x2c, 0xc9, 0x78, 0xf1, 0x64, 0x02, 0xce,</div><div class='add'>+	0xc6, 0x79, 0x5e, 0x74, 0x65, 0x22, 0xb8, 0x3a, 0x63, 0xa2, 0x29, 0xf3,</div><div class='add'>+	0xa7, 0x2d, 0xeb, 0xda, 0x94, 0x9f, 0x63, 0xf8, 0x83, 0x95, 0x1b, 0x83,</div><div class='add'>+	0x8c, 0x2f, 0xf7, 0xbf, 0x27, 0x75, 0x11, 0xb6, 0x71, 0x8e, 0xb6, 0x70,</div><div class='add'>+	0xfe, 0x96, 0x87, 0xb2, 0xd1, 0x12, 0xe8, 0xe6, 0x69, 0x44, 0xb0, 0x34,</div><div class='add'>+	0x63, 0x70, 0x4e, 0x23, 0x58, 0x92, 0xaa, 0xd5, 0x86, 0x31, 0x1f, 0x51,</div><div class='add'>+	0x5f, 0xce, 0xb6, 0xb7, 0x73, 0xbc, 0x6d, 0x81, 0x16, 0x94, 0xd3, 0x46,</div><div class='add'>+	0xd2, 0x8b, 0xc2, 0x68, 0x64, 0xff, 0x2b, 0xfe, 0x8c, 0xfe, 0xaf, 0x67,</div><div class='add'>+	0xff, 0xef, 0xb0, 0xff, 0xac, 0xdd, 0x3f, 0x9c, 0xd7, 0xf0, 0xdc, 0x4d,</div><div class='add'>+	0x7b, 0xdc, 0x96, 0x76, 0x3a, 0x97, 0xa7, 0xbc, 0xd8, 0x9a, 0x36, 0x69,</div><div class='add'>+	0x73, 0x72, 0xcb, 0x87, 0xcd, 0x83, 0xb3, 0xb0, 0x65, 0x50, 0xf7, 0x3d,</div><div class='add'>+	0xcd, 0xdf, 0xdd, 0x23, 0x17, 0x61, 0xd3, 0xa0, 0x82, 0x3d, 0xc6, 0x45,</div><div class='add'>+	0xe8, 0xe2, 0xef, 0xdd, 0x83, 0xb3, 0xf1, 0xe0, 0xa0, 0x03, 0xe1, 0x69,</div><div class='add'>+	0xe7, 0x8f, 0x63, 0xd2, 0x71, 0x11, 0xe2, 0x23, 0x7e, 0x74, 0x25, 0x9e,</div><div class='add'>+	0xb7, 0x75, 0x58, 0x1e, 0xf9, 0x5e, 0xc1, 0x9f, 0xe9, 0x3b, 0x7e, 0xac,</div><div class='add'>+	0x4e, 0x68, 0xe8, 0x4a, 0x89, 0x1f, 0xb8, 0x69, 0x9b, 0xe2, 0x07, 0xbf,</div><div class='add'>+	0x06, 0x2a, 0x34, 0x74, 0x67, 0x0a, 0xf7, 0x15, 0x38, 0x39, 0x6f, 0x6b,</div><div class='add'>+	0x34, 0x37, 0xb6, 0xa6, 0xc4, 0x26, 0xa4, 0x4d, 0xb1, 0x0b, 0xf9, 0x5d,</div><div class='add'>+	0x4d, 0xbb, 0x2b, 0x85, 0x7f, 0x6f, 0x29, 0x82, 0xf7, 0x6b, 0x78, 0xb3,</div><div class='add'>+	0x41, 0xae, 0xd3, 0xde, 0x43, 0x52, 0xa6, 0x1f, 0xfb, 0xd2, 0xe2, 0xa7,</div><div class='add'>+	0x7e, 0x34, 0x26, 0x26, 0xd8, 0x7e, 0x03, 0xdb, 0x36, 0xf1, 0xcf, 0x99,</div><div class='add'>+	0x7a, 0xfc, 0x53, 0x26, 0x88, 0x7f, 0xa4, 0x1e, 0xbf, 0x93, 0xf1, 0xe3,</div><div class='add'>+	0x60, 0x66, 0x16, 0xbe, 0x9d, 0xf1, 0xe1, 0x5b, 0x9c, 0xbf, 0xc7, 0x33,</div><div class='add'>+	0x2d, 0xb4, 0x7d, 0x0d, 0x07, 0x32, 0xa2, 0xff, 0x22, 0x8e, 0xb7, 0x14,</div><div class='add'>+	0xdd, 0x83, 0xb5, 0xc1, 0x63, 0xb4, 0xad, 0x7f, 0x34, 0xaf, 0x41, 0xb6,</div><div class='add'>+	0xba, 0xc1, 0xb6, 0xc9, 0xad, 0xbc, 0xbe, 0x6d, 0xb0, 0x36, 0x7a, 0x89,</div><div class='add'>+	0x62, 0x59, 0x6a, 0xa8, 0x2e, 0x7c, 0x54, 0x55, 0x31, 0xe9, 0xd5, 0xfd,</div><div class='add'>+	0x59, 0x55, 0xf7, 0x47, 0xe1, 0x42, 0x82, 0xbe, 0x11, 0xaf, 0xd1, 0x87,</div><div class='add'>+	0xe2, 0xb4, 0x29, 0xaf, 0x31, 0xcc, 0xf1, 0xe8, 0xfe, 0xb8, 0xea, 0xc6,</div><div class='add'>+	0x96, 0x94, 0xbe, 0x3b, 0xae, 0x7a, 0x10, 0xcf, 0x94, 0xe2, 0x17, 0x83,</div><div class='add'>+	0x7a, 0x6f, 0x5c, 0xfd, 0x3c, 0xe2, 0xd5, 0x96, 0xf5, 0xad, 0x10, 0x36,</div><div class='add'>+	0xce, 0x88, 0x20, 0x5a, 0x13, 0x41, 0x6c, 0x76, 0xc4, 0x8b, 0x54, 0x0a,</div><div class='add'>+	0x78, 0xa7, 0xcf, 0xf0, 0xfd, 0x9b, 0xd2, 0x82, 0xbf, 0x69, 0xd1, 0xfd,</div><div class='add'>+	0x7e, 0xb5, 0x2e, 0x3e, 0xac, 0x2e, 0xa2, 0x4b, 0xc3, 0xef, 0x8b, 0x2c,</div><div class='add'>+	0x43, 0x87, 0x7d, 0x4d, 0x81, 0x66, 0x78, 0xd0, 0x9d, 0xba, 0x02, 0x31,</div><div class='add'>+	0x6f, 0x6d, 0xeb, 0x0e, 0xb5, 0xf6, 0x8c, 0xa9, 0xea, 0x13, 0x2d, 0xaa,</div><div class='add'>+	0x65, 0xfd, 0x72, 0xe1, 0x3b, 0x96, 0x7f, 0xba, 0x65, 0x2d, 0x58, 0x28,</div><div class='add'>+	0x7d, 0xfa, 0x51, 0x15, 0x31, 0xb1, 0xd2, 0x9e, 0xc3, 0x52, 0x9c, 0x1a,</div><div class='add'>+	0xac, 0x66, 0x1f, 0x1a, 0xfe, 0xf5, 0x72, 0x3d, 0xb8, 0x4e, 0x2d, 0xc5,</div><div class='add'>+	0x9b, 0x23, 0xa5, 0x38, 0xc9, 0xf1, 0xfc, 0xe7, 0xa0, 0x0f, 0xbf, 0x1e,</div><div class='add'>+	0xb4, 0xac, 0x2f, 0x99, 0x7f, 0x89, 0x81, 0xea, 0x7e, 0xfc, 0xd3, 0xb8,</div><div class='add'>+	0x17, 0xbf, 0xe0, 0xdc, 0xbc, 0x91, 0x88, 0xde, 0x35, 0x0d, 0x7a, 0x74,</div><div class='add'>+	0x5c, 0x39, 0xf6, 0xd5, 0x0a, 0xd4, 0xb5, 0x54, 0x28, 0x7a, 0xf3, 0x76,</div><div class='add'>+	0xe8, 0xbe, 0x4b, 0x14, 0x2f, 0x4e, 0xa7, 0x35, 0xfc, 0x34, 0x5d, 0x1b,</div><div class='add'>+	0xfe, 0x21, 0xfb, 0xfc, 0xad, 0xf9, 0x84, 0x95, 0x9d, 0x2e, 0x7a, 0x13,</div><div class='add'>+	0x1d, 0x51, 0xcf, 0x29, 0xea, 0x39, 0x45, 0x3d, 0xa7, 0xa8, 0x67, 0xca,</div><div class='add'>+	0x70, 0x30, 0x45, 0x3d, 0x53, 0x77, 0xdf, 0xa2, 0x4d, 0x3d, 0xce, 0x79,</div><div class='add'>+	0x3c, 0x60, 0xcf, 0x63, 0x98, 0xf3, 0xf5, 0x17, 0xf8, 0x5f, 0x36, 0xb6,</div><div class='add'>+	0x3e, 0x6f, 0xfd, 0xad, 0x57, 0xc6, 0xd4, 0x3d, 0x3d, 0x87, 0x5f, 0x32,</div><div class='add'>+	0xb6, 0xe7, 0xac, 0x98, 0x26, 0xe3, 0x92, 0xf1, 0xd9, 0xfa, 0xf3, 0x6f,</div><div class='add'>+	0x54, 0xb6, 0x28, 0x28, 0xb5, 0xac, 0x9d, 0x66, 0xfe, 0xbe, 0xb7, 0x30,</div><div class='add'>+	0xbe, 0x1b, 0x94, 0x9c, 0x5d, 0xed, 0x74, 0x53, 0xdf, 0xc1, 0xa8, 0xba,</div><div class='add'>+	0x8c, 0xe7, 0x7a, 0x3c, 0x8a, 0xb9, 0xc5, 0xe7, 0x9f, 0x5f, 0x5b, 0x23,</div><div class='add'>+	0xf3, 0xe1, 0x3f, 0x7b, 0x4e, 0x7b, 0xb4, 0xfb, 0xbb, 0x8d, 0xe7, 0x32,</div><div class='add'>+	0x16, 0xb1, 0x45, 0xb1, 0x01, 0x2f, 0xed, 0xe5, 0xf2, 0xfc, 0x3d, 0xc4,</div><div class='add'>+	0xd5, 0xc8, 0x46, 0xb4, 0x34, 0x3c, 0x6a, 0xf7, 0x51, 0x94, 0x14, 0xbf,</div><div class='add'>+	0x51, 0xf0, 0xce, 0x15, 0x0a, 0x8e, 0x86, 0x0c, 0xda, 0xcc, 0x10, 0x71,</div><div class='add'>+	0x01, 0x28, 0x4e, 0xc2, 0xed, 0x89, 0x44, 0x90, 0xe8, 0x83, 0xbb, 0x24,</div><div class='add'>+	0x12, 0xc6, 0xfc, 0xbe, 0xda, 0xf6, 0x53, 0xd0, 0x83, 0x7d, 0x8a, 0xde,</div><div class='add'>+	0x02, 0xd4, 0x99, 0x63, 0xd4, 0xe3, 0x25, 0x8a, 0xee, 0x2f, 0x52, 0xe0,</div><div class='add'>+	0x56, 0x58, 0x2e, 0x90, 0x1e, 0xc2, 0x96, 0x8c, 0xfc, 0x0e, 0xc3, 0x48,</div><div class='add'>+	0xff, 0xb6, 0xd0, 0x17, 0xed, 0x7e, 0x23, 0xed, 0xfe, 0x14, 0xc7, 0xae,</div><div class='add'>+	0xfb, 0x89, 0xaf, 0x6e, 0x57, 0xa4, 0x1d, 0x7b, 0x13, 0x70, 0x17, 0x45,</div><div class='add'>+	0x36, 0xe0, 0xa9, 0x44, 0xf5, 0xf4, 0x42, 0x39, 0x85, 0xe5, 0xfc, 0xe9,</div><div class='add'>+	0xa9, 0xb2, 0xbc, 0x66, 0x45, 0xbd, 0x39, 0x59, 0x4a, 0x93, 0x43, 0xd8,</div><div class='add'>+	0x9e, 0x92, 0xba, 0x11, 0xbb, 0xae, 0x93, 0x7d, 0xf4, 0x24, 0x6a, 0x9b,</div><div class='add'>+	0xaf, 0x55, 0xf4, 0xf0, 0x23, 0xa8, 0x8b, 0xbe, 0xcd, 0x39, 0xec, 0x82,</div><div class='add'>+	0x7e, 0xa6, 0x1d, 0x39, 0x59, 0xe6, 0xa5, 0x73, 0x72, 0x2c, 0x4e, 0x43,</div><div class='add'>+	0xb9, 0x29, 0x05, 0x8f, 0xcf, 0x98, 0x96, 0xf7, 0x65, 0x28, 0xd7, 0x71,</div><div class='add'>+	0xfe, 0x54, 0xc3, 0x8f, 0xeb, 0x68, 0x43, 0x1b, 0x76, 0x5a, 0xe8, 0x0e,</div><div class='add'>+	0x55, 0xd3, 0x57, 0x5b, 0x50, 0x41, 0xbf, 0xbc, 0x53, 0x43, 0xb4, 0x32,</div><div class='add'>+	0x12, 0x56, 0xae, 0xcf, 0x0c, 0xe7, 0xf5, 0x7f, 0xb4, 0x9a, 0xf2, 0x29,</div><div class='add'>+	0x4d, 0xa9, 0x0b, 0xaf, 0x57, 0xe6, 0xe3, 0xde, 0x85, 0xd7, 0x3d, 0x45,</div><div class='add'>+	0x1f, 0x5f, 0xbe, 0x4e, 0x1b, 0x81, 0xc2, 0x78, 0x53, 0x42, 0xfd, 0xea,</div><div class='add'>+	0x26, 0xab, 0x05, 0x5d, 0xf6, 0x35, 0x07, 0x86, 0x9c, 0x51, 0x9f, 0x03,</div><div class='add'>+	0x1f, 0x58, 0xd1, 0x55, 0x72, 0xad, 0x14, 0xb1, 0x96, 0x3a, 0x9f, 0x13,</div><div class='add'>+	0x75, 0xe1, 0x4d, 0xf4, 0xb7, 0xc9, 0x55, 0x8d, 0xbc, 0x17, 0x30, 0x8f,</div><div class='add'>+	0xa1, 0xd6, 0xbf, 0x09, 0xf2, 0xfb, 0x7d, 0xda, 0x48, 0xa3, 0xd4, 0x65,</div><div class='add'>+	0x19, 0xb1, 0x39, 0x5d, 0x3b, 0x06, 0x2f, 0x36, 0xd1, 0xfe, 0x8a, 0x23,</div><div class='add'>+	0xba, 0xb9, 0xcc, 0xe1, 0xc4, 0x7e, 0xe2, 0xb8, 0xc3, 0xe8, 0x45, 0x31,</div><div class='add'>+	0xc7, 0xc8, 0xf8, 0x8a, 0x47, 0x12, 0xc0, 0xb3, 0xfd, 0x16, 0x1a, 0x43,</div><div class='add'>+	0x1e, 0x2c, 0xb1, 0x6d, 0xf3, 0x90, 0x72, 0x75, 0xea, 0x43, 0x6b, 0xc8,</div><div class='add'>+	0x59, 0x12, 0x55, 0x23, 0x01, 0xdf, 0x49, 0xb2, 0x81, 0xa2, 0x48, 0x9d,</div><div class='add'>+	0xe6, 0x44, 0x5c, 0x69, 0xce, 0xf4, 0x28, 0xcb, 0x33, 0xbd, 0xca, 0x92,</div><div class='add'>+	0x8c, 0xb4, 0x7d, 0x48, 0x59, 0x9a, 0xf1, 0x20, 0xdd, 0xaf, 0x60, 0x7b,</div><div class='add'>+	0x88, 0x72, 0xd5, 0xe4, 0xec, 0x38, 0xd3, 0xaf, 0x12, 0x63, 0xdf, 0x21,</div><div class='add'>+	0xc6, 0xea, 0x61, 0xb0, 0xef, 0x27, 0x12, 0xd5, 0x38, 0x44, 0x2c, 0xfd,</div><div class='add'>+	0x71, 0x5a, 0x57, 0x51, 0x7a, 0x11, 0x5e, 0x19, 0xa9, 0xc0, 0xd8, 0xa0,</div><div class='add'>+	0xc9, 0xdf, 0xf5, 0x78, 0x61, 0xc4, 0xb2, 0x7a, 0x4c, 0xcb, 0xda, 0x6b,</div><div class='add'>+	0x1e, 0x52, 0x1a, 0xd9, 0x67, 0xd4, 0x19, 0x8f, 0x16, 0x47, 0x02, 0xe6,</div><div class='add'>+	0x16, 0xf6, 0xe9, 0x88, 0xc4, 0x95, 0x28, 0xfb, 0xbb, 0x9a, 0xfd, 0x2d,</div><div class='add'>+	0xcd, 0xf7, 0x97, 0xeb, 0x57, 0x64, 0x91, 0x7a, 0x85, 0x3a, 0x61, 0xd6,</div><div class='add'>+	0x01, 0xf6, 0x25, 0x02, 0xc1, 0x42, 0xbd, 0xa5, 0xac, 0x73, 0xf5, 0xd9,</div><div class='add'>+	0x3a, 0xc0, 0x70, 0x22, 0xc8, 0x39, 0x15, 0x5b, 0xf7, 0x33, 0x76, 0x7d,</div><div class='add'>+	0x83, 0x18, 0xdb, 0x80, 0xb6, 0x61, 0xc1, 0xdf, 0x6b, 0xd4, 0xdc, 0x3c,</div><div class='add'>+	0xe5, 0xb0, 0x56, 0x62, 0x5e, 0x0e, 0x6f, 0x83, 0xe8, 0xa3, 0x5f, 0x77,</div><div class='add'>+	0xa5, 0xc4, 0xc6, 0xef, 0xf9, 0x72, 0x22, 0xa0, 0xe0, 0xb1, 0x40, 0xb6,</div><div class='add'>+	0xa5, 0x1c, 0x95, 0x68, 0x0f, 0x89, 0x6d, 0x6e, 0xfc, 0xf2, 0x53, 0x86,</div><div class='add'>+	0x1e, 0x5e, 0xa1, 0x70, 0xce, 0x02, 0x7a, 0xf3, 0x52, 0x05, 0x08, 0x8c,</div><div class='add'>+	0x01, 0x6f, 0xa4, 0x2b, 0xb1, 0xda, 0x74, 0x40, 0xad, 0x0a, 0xa2, 0x37,</div><div class='add'>+	0x33, 0x35, 0x2e, 0x98, 0xc4, 0x78, 0x69, 0x2f, 0x48, 0xbf, 0x2e, 0xc3,</div><div class='add'>+	0x32, 0x2d, 0x67, 0xd3, 0x6e, 0xb6, 0xed, 0x0e, 0x64, 0x83, 0x2a, 0xe3,</div><div class='add'>+	0xdd, 0x7e, 0x5e, 0x38, 0x46, 0xfc, 0x6f, 0x34, 0x5c, 0xc4, 0xff, 0x4a,</div><div class='add'>+	0x34, 0x9a, 0xbf, 0xb3, 0x96, 0xad, 0x92, 0x7b, 0x85, 0x76, 0xe0, 0x2e,</div><div class='add'>+	0x66, 0xbf, 0x6f, 0x19, 0xba, 0x7f, 0x94, 0x27, 0xd9, 0x74, 0xee, 0x7a,</div><div class='add'>+	0x9c, 0x31, 0xab, 0x9b, 0xed, 0x6e, 0x66, 0xbb, 0xeb, 0x34, 0x3d, 0x1a,</div><div class='add'>+	0x3f, 0x5b, 0x2e, 0x1b, 0x74, 0x40, 0xd7, 0xa4, 0x6c, 0x13, 0xdb, 0x5d,</div><div class='add'>+	0xcd, 0x76, 0x7b, 0x35, 0x91, 0xef, 0x77, 0xd6, 0xba, 0x55, 0x72, 0x2f,</div><div class='add'>+	0x67, 0x1f, 0xb9, 0x76, 0xef, 0x91, 0x76, 0xcd, 0xd1, 0x7c, 0x5f, 0x47,</div><div class='add'>+	0x13, 0xe8, 0x77, 0x44, 0x18, 0x63, 0x1b, 0x02, 0xfe, 0x2e, 0xc6, 0xdb,</div><div class='add'>+	0x26, 0xc6, 0x8e, 0x9c, 0x4d, 0x4c, 0x8d, 0x77, 0x88, 0x9f, 0x2b, 0x23,</div><div class='add'>+	0xd7, 0xa4, 0x9c, 0xd8, 0xda, 0x24, 0xf5, 0x2c, 0xf1, 0xc5, 0x47, 0xfd,</div><div class='add'>+	0x0a, 0xb6, 0x38, 0x71, 0x20, 0x41, 0xfc, 0xc7, 0x37, 0x68, 0x77, 0x7e,</div><div class='add'>+	0xb4, 0x64, 0x6a, 0xb1, 0x66, 0x27, 0xe3, 0xa0, 0x59, 0x45, 0x5b, 0xcf,</div><div class='add'>+	0xd9, 0xdb, 0x32, 0xb6, 0x3d, 0x69, 0xb7, 0x1d, 0x57, 0x5a, 0x32, 0x75,</div><div class='add'>+	0x5a, 0x15, 0x63, 0xee, 0x91, 0xb3, 0xd8, 0x39, 0x27, 0x5a, 0x1a, 0x09,</div><div class='add'>+	0x34, 0xaf, 0xe7, 0x24, 0xb9, 0x19, 0xdf, 0xbe, 0x37, 0xaf, 0x87, 0x76,</div><div class='add'>+	0xd1, 0x4b, 0x3b, 0xcc, 0xcd, 0x6f, 0x73, 0x66, 0x8f, 0x2a, 0x18, 0x07,</div><div class='add'>+	0xb5, 0x16, 0xeb, 0x76, 0xca, 0x7f, 0x72, 0x95, 0x86, 0xc7, 0x78, 0xad,</div><div class='add'>+	0x16, 0xab, 0x87, 0xbf, 0x47, 0x3b, 0xd3, 0x7d, 0x62, 0x87, 0x5d, 0x67,</div><div class='add'>+	0xe5, 0x12, 0x99, 0x44, 0x36, 0x91, 0xa9, 0x8f, 0xe5, 0x66, 0x51, 0x3f,</div><div class='add'>+	0x82, 0x8d, 0xd5, 0x94, 0x67, 0x2b, 0xf9, 0xd0, 0x21, 0xe5, 0xf3, 0x94,</div><div class='add'>+	0x27, 0xeb, 0xf2, 0xe2, 0xa1, 0x94, 0xc8, 0xa3, 0x44, 0x67, 0x46, 0x66,</div><div class='add'>+	0xe1, 0x4c, 0x2a, 0x10, 0x7f, 0x02, 0x22, 0x5b, 0x8f, 0xd2, 0x2a, 0xf5,</div><div class='add'>+	0x53, 0xbd, 0xbc, 0x57, 0x90, 0x11, 0x5a, 0xa5, 0x2d, 0x5b, 0x4e, 0xa6,</div><div class='add'>+	0xeb, 0x39, 0xd7, 0x2e, 0xe3, 0x6f, 0xcb, 0x51, 0xe1, 0xa4, 0xad, 0x49,</div><div class='add'>+	0xdb, 0xff, 0x61, 0x45, 0xb5, 0x6e, 0x5e, 0xf3, 0x72, 0x9e, 0xdc, 0xe4,</div><div class='add'>+	0x05, 0x7a, 0xf0, 0x3a, 0x87, 0xd2, 0xe2, 0x91, 0x78, 0x4d, 0xfb, 0x4c,</div><div class='add'>+	0xa7, 0x9d, 0x38, 0x9e, 0x58, 0xba, 0xb4, 0xcc, 0xf8, 0x34, 0x1e, 0x1b,</div><div class='add'>+	0xf1, 0x61, 0x84, 0x73, 0xfb, 0x6c, 0x42, 0xe2, 0xeb, 0x2c, 0x3c, 0x9a,</div><div class='add'>+	0xf6, 0xe0, 0x99, 0x84, 0x1f, 0x8f, 0x30, 0xfe, 0x4c, 0x24, 0x0c, 0xec,</div><div class='add'>+	0x4f, 0x7b, 0xf1, 0x34, 0xed, 0x79, 0x34, 0xed, 0xa3, 0xbd, 0xd4, 0x63,</div><div class='add'>+	0x38, 0xdd, 0x66, 0x8f, 0xe1, 0xc9, 0xc4, 0xbf, 0xcb, 0x58, 0x83, 0x32,</div><div class='add'>+	0xd6, 0xcd, 0xf6, 0x58, 0x0b, 0x71, 0x7e, 0xd6, 0xd9, 0x79, 0x38, 0x91,</div><div class='add'>+	0xb0, 0x71, 0xa0, 0x77, 0x99, 0x43, 0xe6, 0x81, 0x36, 0x3b, 0x20, 0x58,</div><div class='add'>+	0xa0, 0xf7, 0xc7, 0x61, 0x61, 0x8f, 0x39, 0x93, 0xfe, 0xdf, 0x4b, 0x79,</div><div class='add'>+	0xa9, 0x53, 0x8e, 0x1f, 0xae, 0x8a, 0x68, 0x79, 0x24, 0x10, 0xeb, 0xa3,</div><div class='add'>+	0xde, 0x9d, 0x11, 0xd1, 0x43, 0x4e, 0xef, 0x2b, 0x32, 0x87, 0x14, 0xe1,</div><div class='add'>+	0x7a, 0x97, 0x0c, 0xc4, 0xad, 0x32, 0x43, 0xf4, 0x1d, 0x20, 0xce, 0x02,</div><div class='add'>+	0xf3, 0xf7, 0x38, 0x39, 0xbe, 0x9b, 0x38, 0x66, 0x13, 0x45, 0x46, 0x9d,</div><div class='add'>+	0x56, 0x4d, 0xd9, 0x8f, 0x7c, 0x24, 0x06, 0x8a, 0x8e, 0xfe, 0x36, 0x3f,</div><div class='add'>+	0x5f, 0xba, 0x83, 0xf2, 0xfa, 0x81, 0xc2, 0xbc, 0x58, 0xd6, 0x0e, 0xb3,</div><div class='add'>+	0x30, 0x37, 0x35, 0xf0, 0x57, 0xeb, 0xf1, 0x21, 0x5a, 0xc4, 0x48, 0x62,</div><div class='add'>+	0x1a, 0xe2, 0x9a, 0x9a, 0x6f, 0x3b, 0xaa, 0x14, 0x31, 0xff, 0xc0, 0xb8,</div><div class='add'>+	0xf8, 0x7e, 0x39, 0xa2, 0x4e, 0xa9, 0x8f, 0x68, 0x51, 0x24, 0x10, 0x9c,</div><div class='add'>+	0xab, 0x4e, 0xb5, 0x19, 0xc1, 0x01, 0xe9, 0x2b, 0x4e, 0x59, 0xcf, 0xc7,</div><div class='add'>+	0x82, 0x91, 0x44, 0x01, 0x37, 0xfe, 0x3b, 0xf5, 0x2e, 0xd4, 0xa9, 0xc8,</div><div class='add'>+	0x29, 0x7a, 0x55, 0x71, 0x74, 0x50, 0xf4, 0xe7, 0xc4, 0x4a, 0x73, 0x7a,</div><div class='add'>+	0x5e, 0xe6, 0x59, 0x9c, 0x17, 0x62, 0x0e, 0xe7, 0xeb, 0x85, 0x7e, 0x2f,</div><div class='add'>+	0xe5, 0xb6, 0x90, 0x0e, 0x5d, 0x8c, 0x4d, 0x36, 0xe7, 0x5c, 0x95, 0xcf,</div><div class='add'>+	0x5b, 0x38, 0x4f, 0xea, 0x76, 0xea, 0xfa, 0xb3, 0x8e, 0xdc, 0x79, 0x9d,</div><div class='add'>+	0xef, 0xa3, 0xfa, 0xd2, 0xb5, 0x18, 0x0a, 0x3a, 0x03, 0x86, 0xd2, 0x88,</div><div class='add'>+	0xb9, 0x23, 0xf5, 0x4d, 0xce, 0xbe, 0xb6, 0x0d, 0xf4, 0xef, 0x7b, 0x4f,</div><div class='add'>+	0x35, 0x7c, 0x16, 0x9b, 0xa9, 0x17, 0xa7, 0x6d, 0x67, 0x51, 0xc5, 0x65,</div><div class='add'>+	0x2c, 0xb1, 0xfd, 0x49, 0x1d, 0x5f, 0x91, 0xef, 0x23, 0x6a, 0xe7, 0x2c,</div><div class='add'>+	0x50, 0x5b, 0xf2, 0xe7, 0x77, 0x53, 0xdf, 0x32, 0x0e, 0x15, 0x3f, 0x20,</div><div class='add'>+	0x97, 0x7d, 0x27, 0xf4, 0x59, 0x64, 0x6d, 0xcc, 0x76, 0xd2, 0xdf, 0xaf,</div><div class='add'>+	0x62, 0x5d, 0xe2, 0xdf, 0xb8, 0xc4, 0x52, 0xc4, 0x4b, 0xe8, 0xd7, 0x45,</div><div class='add'>+	0xf4, 0xd5, 0x6b, 0x32, 0xf7, 0xa0, 0x3d, 0x15, 0x08, 0x97, 0x28, 0xf7,</div><div class='add'>+	0xe0, 0xd6, 0x8c, 0x0b, 0xb1, 0x61, 0x0f, 0xd6, 0x51, 0x27, 0xce, 0xa4,</div><div class='add'>+	0xf8, 0xb9, 0x86, 0x75, 0xa3, 0x47, 0x67, 0x3a, 0xe9, 0x37, 0xeb, 0x46,</div><div class='add'>+	0xbd, 0x3c, 0xa6, 0xf3, 0x70, 0x63, 0x35, 0x8f, 0x3d, 0xb4, 0xcb, 0x36,</div><div class='add'>+	0xc6, 0x86, 0x23, 0x09, 0x13, 0x9d, 0xd4, 0xd5, 0x13, 0x89, 0x06, 0xdc,</div><div class='add'>+	0x4b, 0xbd, 0x1d, 0x4a, 0x7c, 0x8a, 0x3a, 0x0a, 0xa3, 0x83, 0x73, 0xfc,</div><div class='add'>+	0x58, 0x42, 0xb5, 0xf3, 0xab, 0xdb, 0x33, 0xff, 0x62, 0x45, 0xa7, 0x8b,</div><div class='add'>+	0x9c, 0xa2, 0x0b, 0x99, 0xcf, 0x8f, 0xe8, 0x81, 0xfe, 0x3b, 0x55, 0x17,</div><div class='add'>+	0xf5, 0xd8, 0xb6, 0xcb, 0xc0, 0xf6, 0x5d, 0x75, 0xb4, 0xbb, 0x8c, 0xe5,</div><div class='add'>+	0xaf, 0x1a, 0xa0, 0x0e, 0xa6, 0xea, 0xe1, 0x08, 0x79, 0x81, 0xe8, 0x41,</div><div class='add'>+	0xda, 0xbc, 0x8f, 0x63, 0xee, 0xe6, 0x3d, 0x1f, 0x1e, 0x4f, 0x7c, 0x97,</div><div class='add'>+	0xbf, 0xc3, 0xca, 0x5d, 0x19, 0xf1, 0x79, 0xf1, 0xb7, 0x7f, 0x70, 0xe4,</div><div class='add'>+	0x62, 0x6f, 0xa1, 0xdc, 0x16, 0x96, 0xb3, 0xac, 0xcd, 0x67, 0xe3, 0x4a,</div><div class='add'>+	0x51, 0xb4, 0x84, 0x71, 0x65, 0x7f, 0x22, 0x10, 0x7e, 0xc6, 0x8e, 0x7d,</div><div class='add'>+	0x4e, 0xda, 0x8e, 0xd8, 0x47, 0x8f, 0x6d, 0x1b, 0xcb, 0xce, 0xda, 0xc6,</div><div class='add'>+	0xe4, 0x59, 0x0e, 0xd5, 0x9f, 0x9a, 0xea, 0x73, 0x39, 0xbb, 0x70, 0x26,</div><div class='add'>+	0xf5, 0x5e, 0xdb, 0x8e, 0xd3, 0x82, 0x8f, 0x0e, 0x38, 0x06, 0x9c, 0x68,</div><div class='add'>+	0x33, 0x2f, 0xa5, 0xbe, 0xab, 0x19, 0x6f, 0x8a, 0x78, 0x30, 0x4f, 0x1d,</div><div class='add'>+	0xfe, 0x0b, 0x94, 0x0e, 0x64, 0xad, 0x12, 0xfe, 0x6e, 0x0e, 0x89, 0xbe,</div><div class='add'>+	0xaf, 0xc2, 0xad, 0xc3, 0x0e, 0x14, 0x0d, 0x28, 0x78, 0xd2, 0xac, 0xc7,</div><div class='add'>+	0x90, 0x37, 0x87, 0xbb, 0x6a, 0xf2, 0x52, 0x7b, 0x9e, 0x2e, 0x1e, 0x3f,</div><div class='add'>+	0xfa, 0x8c, 0xc4, 0x85, 0x7b, 0x47, 0x3d, 0xf0, 0x25, 0x15, 0x78, 0x88,</div><div class='add'>+	0x2b, 0x65, 0x46, 0x3d, 0xf5, 0xaa, 0xa1, 0x32, 0x69, 0xe2, 0x6b, 0x19,</div><div class='add'>+	0xd2, 0xa6, 0x07, 0xc2, 0xb8, 0x93, 0xf3, 0x52, 0xfe, 0xc0, 0x95, 0xb8,</div><div class='add'>+	0x83, 0xe5, 0x36, 0xf0, 0xde, 0x86, 0xd1, 0x6a, 0x1e, 0x5e, 0x1e, 0xd3,</div><div class='add'>+	0x79, 0x34, 0xe0, 0xf6, 0xe1, 0x5a, 0x44, 0xab, 0xf5, 0xa0, 0x5f, 0x75,</div><div class='add'>+	0xa0, 0x7a, 0x40, 0xf4, 0xae, 0x62, 0xe5, 0x02, 0x05, 0xe6, 0xa7, 0x8b,</div><div class='add'>+	0xa1, 0xce, 0xfd, 0x38, 0xdf, 0xfd, 0x53, 0xb2, 0xbe, 0x6c, 0x0d, 0xd9,</div><div class='add'>+	0x98, 0x2e, 0x3a, 0x16, 0x3b, 0xf9, 0x57, 0xce, 0x85, 0xc8, 0x2b, 0x7d,</div><div class='add'>+	0x48, 0xac, 0x15, 0x1d, 0x7f, 0x12, 0x36, 0x30, 0xb2, 0x54, 0x74, 0xb1,</div><div class='add'>+	0xcc, 0x47, 0x7d, 0x01, 0x67, 0xe7, 0x7f, 0x2a, 0x67, 0x95, 0xb8, 0xaf,</div><div class='add'>+	0x87, 0x87, 0x6c, 0x8e, 0xe3, 0x67, 0xbe, 0xa8, 0xc7, 0x45, 0xe7, 0xe4,</div><div class='add'>+	0x34, 0x6e, 0xd5, 0x80, 0xbf, 0xc8, 0xb8, 0x19, 0xb7, 0x71, 0x9e, 0xf6,</div><div class='add'>+	0x26, 0xd4, 0xa5, 0x2e, 0xa8, 0xb3, 0x5c, 0x4c, 0x9c, 0x47, 0x4c, 0x1d,</div><div class='add'>+	0xed, 0xc3, 0xcc, 0xb5, 0x86, 0xcb, 0xd1, 0xa5, 0x29, 0xee, 0x6d, 0xf5,</div><div class='add'>+	0x8b, 0x24, 0xa7, 0xf6, 0x57, 0x1a, 0x50, 0xcb, 0x18, 0xff, 0xb7, 0x6b,</div><div class='add'>+	0x70, 0x16, 0x19, 0x8a, 0x9a, 0xa8, 0x6f, 0x42, 0xbc, 0x0a, 0xce, 0x0a,</div><div class='add'>+	0x03, 0x0a, 0x73, 0x66, 0xf4, 0x69, 0x10, 0xec, 0x89, 0x16, 0x19, 0xf7,</div><div class='add'>+	0xe0, 0xb6, 0x14, 0xac, 0xd2, 0x08, 0xf3, 0xa1, 0x88, 0x41, 0x8e, 0x1b,</div><div class='add'>+	0xf0, 0x15, 0xd1, 0x3f, 0x56, 0x93, 0x57, 0xac, 0x1d, 0x16, 0x39, 0x3c,</div><div class='add'>+	0xe4, 0x1b, 0x86, 0xbf, 0x0d, 0xcc, 0xe1, 0x5b, 0xf4, 0xe0, 0x24, 0xf3,</div><div class='add'>+	0xd8, 0xd5, 0xd4, 0xfd, 0x48, 0xe2, 0x1e, 0x34, 0xa6, 0x8e, 0x58, 0x1e,</div><div class='add'>+	0xf2, 0xc8, 0x22, 0xa3, 0xf6, 0x4c, 0x17, 0x62, 0xf4, 0x0d, 0xe1, 0x47,</div><div class='add'>+	0x6b, 0xe8, 0x1b, 0x3e, 0x64, 0x12, 0xea, 0x71, 0xb2, 0x0b, 0x74, 0x8c,</div><div class='add'>+	0xae, 0xc7, 0xd7, 0x46, 0x67, 0x61, 0x3c, 0xb1, 0x01, 0x77, 0x66, 0xc8,</div><div class='add'>+	0x95, 0xfa, 0xaf, 0xc2, 0x1d, 0xc3, 0x57, 0xe1, 0xf6, 0x9d, 0x46, 0x70,</div><div class='add'>+	0x03, 0x75, 0xbd, 0x76, 0x98, 0x81, 0x72, 0xba, 0xb4, 0x5b, 0xd0, 0x95,</div><div class='add'>+	0xf0, 0x45, 0xea, 0x22, 0xaf, 0xa7, 0x2c, 0x0a, 0x1c, 0xe6, 0x5f, 0x2d,</div><div class='add'>+	0x5e, 0x8a, 0x17, 0x35, 0x28, 0xfe, 0xdd, 0xf5, 0x2f, 0x31, 0xb7, 0x17,</div><div class='add'>+	0xd9, 0x11, 0x9d, 0x69, 0xfc, 0xc0, 0x7a, 0x50, 0xa3, 0x7f, 0x47, 0x10,</div><div class='add'>+	0x9f, 0xd3, 0xf0, 0xbc, 0xf5, 0xd0, 0x2a, 0xb9, 0x7e, 0x9b, 0x13, 0xa5,</div><div class='add'>+	0x2a, 0xaf, 0x49, 0x9b, 0x82, 0x4b, 0x75, 0x44, 0xe2, 0x8f, 0x6b, 0x33,</div><div class='add'>+	0x6b, 0x25, 0xcf, 0x96, 0x27, 0x2f, 0x24, 0x16, 0x3f, 0x91, 0xf0, 0xa2,</div><div class='add'>+	0x37, 0x95, 0xe3, 0x56, 0x37, 0x65, 0x84, 0x53, 0xb9, 0x51, 0xda, 0x27,</div><div class='add'>+	0x71, 0x25, 0x8a, 0xf5, 0xfc, 0x5d, 0xd2, 0xa7, 0xb7, 0xc4, 0x91, 0x60,</div><div class='add'>+	0x9b, 0x4d, 0x9c, 0x0b, 0xda, 0x6b, 0x9f, 0x03, 0x25, 0x46, 0x73, 0xce,</div><div class='add'>+	0x56, 0xfb, 0x56, 0xd0, 0x56, 0x35, 0x54, 0xf4, 0xf5, 0x70, 0xac, 0xb4,</div><div class='add'>+	0x55, 0xd6, 0xbb, 0x83, 0xba, 0xf0, 0xf4, 0xad, 0xa2, 0xbd, 0xce, 0x42,</div><div class='add'>+	0x59, 0x5f, 0x2b, 0xf1, 0x01, 0x8c, 0xeb, 0x16, 0x8e, 0x9a, 0x95, 0x79,</div><div class='add'>+	0x7e, 0xda, 0x8c, 0x5b, 0x53, 0x51, 0xb4, 0xa5, 0x6a, 0xa3, 0x27, 0x65,</div><div class='add'>+	0xad, 0xca, 0x95, 0xc3, 0xb0, 0x68, 0x8d, 0xe8, 0x62, 0x32, 0x8f, 0xa7,</div><div class='add'>+	0x7a, 0x73, 0x8e, 0xd3, 0xe9, 0x9a, 0x5f, 0x29, 0xc8, 0xde, 0x83, 0x18,</div><div class='add'>+	0xf3, 0x8f, 0x39, 0x91, 0x16, 0x58, 0x29, 0x91, 0x3b, 0x6e, 0xf9, 0x98,</div><div class='add'>+	0x53, 0x7a, 0x22, 0xfa, 0xc6, 0xc5, 0x0e, 0xa3, 0xe3, 0x15, 0x25, 0x88,</div><div class='add'>+	0xeb, 0x29, 0x43, 0x59, 0x5f, 0x27, 0x5e, 0x08, 0xe9, 0xbe, 0xef, 0x2a,</div><div class='add'>+	0xfa, 0x99, 0x0d, 0x78, 0x05, 0x3f, 0xe3, 0xb5, 0xa2, 0xbe, 0x09, 0x3c,</div><div class='add'>+	0x94, 0x79, 0x15, 0xa7, 0x28, 0xab, 0xda, 0xf7, 0xa1, 0xb5, 0xcc, 0x78,</div><div class='add'>+	0x86, 0xe3, 0x77, 0x2b, 0x6f, 0x65, 0xa6, 0xda, 0xe2, 0x55, 0x58, 0xbd,</div><div class='add'>+	0x53, 0xec, 0x4f, 0x0f, 0xc6, 0x89, 0xbd, 0x6d, 0x66, 0x85, 0x70, 0x79,</div><div class='add'>+	0x89, 0x4f, 0x94, 0xbf, 0x45, 0xb0, 0x85, 0xfe, 0x41, 0x3b, 0xb0, 0xc7,</div><div class='add'>+	0xd0, 0x6a, 0x63, 0xb2, 0x33, 0x09, 0x1b, 0x4b, 0x73, 0x7a, 0x8e, 0x28,</div><div class='add'>+	0x6d, 0xa3, 0xbe, 0x52, 0x94, 0xfa, 0xf2, 0x7e, 0x90, 0x5b, 0xb3, 0x38,</div><div class='add'>+	0x57, 0xf7, 0x3f, 0xad, 0x11, 0xef, 0xf9, 0x75, 0x2b, 0x98, 0x83, 0x55,</div><div class='add'>+	0x72, 0x3c, 0xef, 0xf6, 0xc5, 0xad, 0xd2, 0xdc, 0x58, 0x9a, 0x7f, 0xa0,</div><div class='add'>+	0x88, 0x4d, 0x06, 0xc9, 0xed, 0x3b, 0x71, 0x69, 0x48, 0x6f, 0xfd, 0xae,</div><div class='add'>+	0x22, 0x65, 0xf5, 0xf0, 0x06, 0xa5, 0xd0, 0xcf, 0xcb, 0x38, 0x39, 0x22,</div><div class='add'>+	0x7d, 0x48, 0x5f, 0x13, 0xcc, 0xc9, 0x72, 0x63, 0x10, 0x5f, 0x7a, 0xc4,</div><div class='add'>+	0x9e, 0x4b, 0xf1, 0x27, 0x3f, 0x96, 0x73, 0x4c, 0xae, 0x3e, 0x1f, 0x0f,</div><div class='add'>+	0x17, 0xed, 0xd5, 0x87, 0xb5, 0x99, 0x15, 0x58, 0xcd, 0xbc, 0x76, 0x75,</div><div class='add'>+	0xa6, 0x85, 0xba, 0xdf, 0x48, 0x7c, 0x67, 0x46, 0xa0, 0xe5, 0x74, 0x7c,</div><div class='add'>+	0xce, 0x3e, 0x74, 0xff, 0x24, 0x56, 0xf0, 0xfe, 0xcf, 0x9d, 0xa8, 0x68,</div><div class='add'>+	0x61, 0x79, 0xfb, 0xbe, 0x29, 0xf8, 0x7d, 0xae, 0xcc, 0x47, 0x78, 0x98,</div><div class='add'>+	0x1d, 0xe7, 0xf7, 0xda, 0x1c, 0xb1, 0xc5, 0xce, 0xbd, 0xae, 0xb6, 0xe7,</div><div class='add'>+	0x5c, 0x38, 0x82, 0x85, 0x63, 0x66, 0x31, 0xf3, 0xaf, 0xba, 0xe0, 0xf9,</div><div class='add'>+	0x9c, 0x50, 0x67, 0x16, 0x5a, 0xc0, 0x03, 0xe9, 0x4b, 0xf4, 0x72, 0xa2,</div><div class='add'>+	0x26, 0xa7, 0x97, 0x4f, 0x2a, 0x7b, 0x3e, 0x76, 0xec, 0x49, 0x48, 0xdf,</div><div class='add'>+	0x45, 0x36, 0x2f, 0x6d, 0xcc, 0x94, 0x22, 0xee, 0x15, 0x1d, 0x49, 0x7b,</div><div class='add'>+	0xba, 0x5f, 0x64, 0x5a, 0xbb, 0x53, 0xec, 0xd8, 0xc2, 0x08, 0x65, 0xe8,</div><div class='add'>+	0xb6, 0xe7, 0x2d, 0xc7, 0x25, 0x8f, 0x9c, 0x17, 0x9f, 0x65, 0x4c, 0x85,</div><div class='add'>+	0xbe, 0x6f, 0x73, 0xe5, 0xf8, 0x66, 0x81, 0x2b, 0x58, 0xd6, 0x80, 0x59,</div><div class='add'>+	0xe0, 0x0a, 0x32, 0xe6, 0xbf, 0x00, 0x63, 0x9d, 0x3d, 0xde, 0x35, 0xf9,</div><div class='add'>+	0xb6, 0xbb, 0xcc, 0x00, 0xed, 0x5a, 0xb8, 0x54, 0x44, 0x59, 0xb3, 0x2b,</div><div class='add'>+	0xc3, 0xb9, 0x95, 0xdc, 0x06, 0xb8, 0x93, 0xf7, 0xcb, 0x79, 0xff, 0xc5,</div><div class='add'>+	0x90, 0x0b, 0x97, 0x4e, 0x97, 0xbe, 0xaf, 0x42, 0xc7, 0xce, 0x28, 0x2a,</div><div class='add'>+	0x17, 0x06, 0x30, 0x69, 0x73, 0x89, 0x02, 0xef, 0x75, 0xe1, 0x8e, 0x9d,</div><div class='add'>+	0x1f, 0x5a, 0x15, 0x36, 0x17, 0x33, 0x62, 0xe3, 0x8a, 0x8a, 0xed, 0x8b,</div><div class='add'>+	0x84, 0xff, 0xba, 0x88, 0xef, 0xe4, 0xa2, 0xc2, 0xad, 0x5d, 0x65, 0xe4,</div><div class='add'>+	0xb0, 0xc2, 0xe1, 0x02, 0xd9, 0x9b, 0x54, 0x68, 0x5a, 0x44, 0xb8, 0xdc,</div><div class='add'>+	0x2c, 0x9b, 0xc3, 0x0a, 0x97, 0xfd, 0x56, 0xea, 0xd0, 0x14, 0x2e, 0x7b,</div><div class='add'>+	0x96, 0x73, 0x30, 0xf7, 0x69, 0x61, 0x7e, 0xef, 0x81, 0x3b, 0xa2, 0xb7,</div><div class='add'>+	0x6c, 0x52, 0x3a, 0xb1, 0x3c, 0x64, 0x98, 0x92, 0x53, 0x5f, 0xa9, 0xe8,</div><div class='add'>+	0xc1, 0xd3, 0x08, 0x12, 0x6f, 0x5f, 0xc6, 0xc8, 0x60, 0xdc, 0x25, 0x76,</div><div class='add'>+	0xb4, 0x29, 0x73, 0x4e, 0x9e, 0x5b, 0x29, 0x8f, 0x3b, 0x27, 0x8f, 0x79,</div><div class='add'>+	0x1a, 0x2a, 0x9e, 0x6c, 0x70, 0x11, 0xb7, 0xfe, 0x0e, 0x6d, 0x3b, 0x55,</div><div class='add'>+	0x2c, 0xb1, 0xb9, 0xf9, 0xdf, 0x11, 0x7f, 0x2f, 0x2a, 0xcd, 0x95, 0x07,</div><div class='add'>+	0x3a, 0xe9, 0xdf, 0xef, 0x2f, 0x2c, 0x41, 0x68, 0x9a, 0x82, 0x2a, 0xa3,</div><div class='add'>+	0x83, 0xf9, 0xf1, 0x87, 0x56, 0xdc, 0x49, 0x3a, 0x6b, 0x40, 0x2b, 0x89,</div><div class='add'>+	0x44, 0x29, 0x5b, 0x93, 0x72, 0xcd, 0xf0, 0x20, 0xfb, 0xe9, 0x20, 0xef,</div><div class='add'>+	0xf7, 0xe0, 0x2e, 0xda, 0xce, 0x5d, 0x8c, 0x65, 0x77, 0x31, 0x96, 0xdd,</div><div class='add'>+	0x35, 0xfa, 0x2f, 0xbc, 0x3e, 0xdd, 0xfe, 0xbd, 0x29, 0x55, 0xb0, 0x65,</div><div class='add'>+	0x27, 0xe3, 0x82, 0xe8, 0x77, 0x33, 0x7d, 0x47, 0xe2, 0x02, 0x28, 0x93,</div><div class='add'>+	0x85, 0x93, 0x9c, 0xc7, 0x25, 0x9a, 0x1e, 0xcc, 0xe2, 0xeb, 0xae, 0x73,</div><div class='add'>+	0x79, 0x5f, 0x21, 0xb6, 0xc8, 0x3c, 0xba, 0x70, 0x1b, 0x65, 0x0c, 0x86,</div><div class='add'>+	0xfe, 0xcb, 0x42, 0x95, 0xf8, 0xee, 0x85, 0xf7, 0x73, 0xf3, 0x7a, 0xe4,</div><div class='add'>+	0x2c, 0x07, 0x54, 0xc4, 0x4e, 0xe9, 0xf3, 0x7b, 0x6c, 0x4e, 0xf1, 0xa2,</div><div class='add'>+	0xc9, 0xdc, 0x6d, 0xe7, 0xd1, 0xf9, 0x62, 0x2a, 0x6b, 0x47, 0xa3, 0xe8,</div><div class='add'>+	0xe6, 0xb8, 0x57, 0x0f, 0x3f, 0x96, 0xd7, 0x4b, 0x61, 0xbc, 0x0a, 0xd5,</div><div class='add'>+	0xe2, 0xa1, 0xff, 0xe4, 0x72, 0x95, 0xb6, 0x51, 0xe1, 0xb6, 0xd5, 0xfc,</div><div class='add'>+	0x2f, 0xdc, 0xd6, 0xcb, 0xff, 0xc2, 0x73, 0xa7, 0xf3, 0xbf, 0x13, 0xfe,</div><div class='add'>+	0xe9, 0x62, 0xc7, 0xf5, 0xe8, 0xdd, 0x65, 0x59, 0xc5, 0x81, 0x7a, 0x6c,</div><div class='add'>+	0x19, 0xfd, 0x48, 0xbc, 0xbc, 0x40, 0x1e, 0x7b, 0x0e, 0xe8, 0x47, 0x2e,</div><div class='add'>+	0xc1, 0x22, 0xbf, 0x5f, 0x95, 0xbe, 0x2d, 0x6c, 0x34, 0xaf, 0x62, 0x9f,</div><div class='add'>+	0x8c, 0x80, 0xd5, 0x53, 0xfd, 0xa2, 0xd0, 0x46, 0x41, 0xdf, 0xc5, 0xf4,</div><div class='add'>+	0x73, 0x68, 0x2e, 0xea, 0x7b, 0x65, 0x46, 0xea, 0x36, 0x29, 0x4b, 0x87,</div><div class='add'>+	0xa7, 0x96, 0xef, 0x20, 0x1f, 0x3e, 0x4d, 0x5d, 0x17, 0xfc, 0xc8, 0x9b,</div><div class='add'>+	0xcf, 0x2b, 0x98, 0x4b, 0xa4, 0x44, 0x97, 0x32, 0xbe, 0x5c, 0xae, 0x28,</div><div class='add'>+	0xb6, 0x74, 0xe4, 0x6c, 0x1f, 0xa2, 0xb7, 0xf8, 0xf4, 0x12, 0x43, 0xec,</div><div class='add'>+	0x28, 0x48, 0x5c, 0xd1, 0xc3, 0xcd, 0x84, 0xed, 0x53, 0x09, 0xc4, 0x1c,</div><div class='add'>+	0x91, 0xe6, 0xa6, 0xb5, 0x89, 0xb9, 0xda, 0xf1, 0x7c, 0x2e, 0xba, 0x87,</div><div class='add'>+	0x38, 0xae, 0x1a, 0xb2, 0x0e, 0x42, 0x5b, 0x19, 0x16, 0xdd, 0x75, 0x28,</div><div class='add'>+	0xe7, 0xf2, 0xce, 0x28, 0x79, 0x97, 0x6a, 0xcb, 0xe8, 0x8c, 0x88, 0x6c,</div><div class='add'>+	0x52, 0x87, 0xb2, 0x5f, 0xc0, 0xbf, 0x72, 0xba, 0xa8, 0x80, 0x67, 0x40,</div><div class='add'>+	0x78, 0x97, 0x8e, 0x0d, 0x8c, 0xf3, 0x65, 0x03, 0x7e, 0xfa, 0x42, 0x35,</div><div class='add'>+	0x4a, 0x1f, 0x88, 0x60, 0xfd, 0xa8, 0x86, 0x92, 0x07, 0x2c, 0x6b, 0x6e,</div><div class='add'>+	0xa8, 0x87, 0x5c, 0xf6, 0xb2, 0x22, 0xc9, 0x9d, 0x9c, 0x49, 0x62, 0x16,</div><div class='add'>+	0xf1, 0xad, 0x3d, 0xa5, 0xe0, 0x6a, 0xc6, 0xd3, 0x28, 0x71, 0xa8, 0xdd,</div><div class='add'>+	0xc6, 0x39, 0xab, 0x73, 0x4e, 0xc4, 0x45, 0x1b, 0x5a, 0xc5, 0xfb, 0xad,</div><div class='add'>+	0xc4, 0xc0, 0x56, 0x62, 0x9a, 0x65, 0xbd, 0x7f, 0x39, 0x3a, 0xcb, 0x22,</div><div class='add'>+	0x37, 0x13, 0x0b, 0x6b, 0xc9, 0x89, 0x25, 0x7e, 0x5f, 0x8e, 0x35, 0x8c,</div><div class='add'>+	0xfd, 0xc5, 0x49, 0x3b, 0x9f, 0xa2, 0xee, 0x18, 0xa3, 0x32, 0x8c, 0x71,</div><div class='add'>+	0x94, 0xfd, 0x69, 0x72, 0x5c, 0xe1, 0xbb, 0x95, 0xc9, 0x0d, 0x8c, 0x75,</div><div class='add'>+	0x1e, 0x54, 0x0c, 0x5c, 0x86, 0x3b, 0x19, 0xcf, 0xef, 0xd8, 0xe9, 0x47,</div><div class='add'>+	0x7a, 0xd1, 0x55, 0x94, 0xef, 0x1e, 0xac, 0x4f, 0x19, 0x92, 0x43, 0x45,</div><div class='add'>+	0x83, 0x8b, 0xc8, 0xb7, 0x33, 0x82, 0x3b, 0x92, 0x8f, 0x95, 0x61, 0x49,</div><div class='add'>+	0x0b, 0x10, 0x4c, 0x16, 0xf0, 0x2d, 0x2a, 0x6b, 0x47, 0x30, 0x92, 0xe7,</div><div class='add'>+	0x63, 0xdb, 0x39, 0x5e, 0x24, 0xeb, 0x70, 0x2d, 0x98, 0xcf, 0x58, 0x20,</div><div class='add'>+	0xf6, 0xa5, 0x31, 0xc7, 0x2c, 0x51, 0x0c, 0xdf, 0x1e, 0xfa, 0xa9, 0xe4,</div><div class='add'>+	0x3d, 0x57, 0x24, 0x0b, 0xb1, 0x4f, 0xcf, 0x2e, 0x76, 0x74, 0x12, 0x47,</div><div class='add'>+	0xf4, 0x8d, 0xbf, 0x53, 0xf4, 0xf6, 0x13, 0xca, 0x2b, 0xd8, 0x37, 0xf6,</div><div class='add'>+	0x2a, 0x86, 0xc6, 0xdc, 0xca, 0xe8, 0x98, 0xf4, 0x35, 0x81, 0xbe, 0xcc,</div><div class='add'>+	0x9f, 0xea, 0x6b, 0xea, 0xfa, 0xcb, 0xa2, 0xf3, 0xd6, 0x6c, 0xae, 0xce,</div><div class='add'>+	0xe7, 0x89, 0x4b, 0xcf, 0xe3, 0xc7, 0x32, 0x27, 0x62, 0x97, 0x5e, 0xf4,</div><div class='add'>+	0xa4, 0xce, 0xad, 0x0b, 0xf4, 0x27, 0xb6, 0xd9, 0xfe, 0xd9, 0x92, 0x11,</div><div class='add'>+	0x7b, 0x55, 0x19, 0x33, 0x2f, 0xce, 0xe7, 0x2c, 0xb5, 0xd4, 0x41, 0x9f,</div><div class='add'>+	0x7d, 0x6f, 0x9f, 0xf9, 0x29, 0x64, 0xed, 0x6b, 0x8b, 0xe9, 0x9b, 0xd5,</div><div class='add'>+	0x28, 0x26, 0x26, 0x06, 0x43, 0x3e, 0x14, 0x57, 0xc9, 0x3a, 0xce, 0xb9,</div><div class='add'>+	0xdc, 0x7f, 0xc3, 0x4e, 0x86, 0x64, 0x1b, 0x73, 0x1a, 0x89, 0x7f, 0xb5,</div><div class='add'>+	0x9c, 0xef, 0x1c, 0xce, 0xac, 0xa7, 0x0d, 0x5d, 0x27, 0x36, 0xe4, 0xca,</div><div class='add'>+	0xd9, 0xd0, 0x47, 0xd7, 0x17, 0x54, 0x90, 0xfb, 0x69, 0x15, 0x76, 0xde,</div><div class='add'>+	0xd7, 0xa4, 0x5c, 0x9f, 0xb7, 0xab, 0xcf, 0x67, 0x1e, 0x2d, 0xca, 0xe7,</div><div class='add'>+	0x66, 0x17, 0x94, 0xff, 0x38, 0x1d, 0x5c, 0xf6, 0x67, 0xe8, 0x40, 0xe2,</div><div class='add'>+	0x81, 0xe4, 0x04, 0xa2, 0x83, 0xf3, 0xf3, 0xf2, 0xfe, 0x44, 0x35, 0x71,</div><div class='add'>+	0xef, 0x42, 0x5d, 0xcc, 0xcc, 0xeb, 0x62, 0x31, 0xb1, 0x4b, 0xfe, 0x5b,</div><div class='add'>+	0x38, 0x65, 0x7a, 0xf1, 0xa2, 0x26, 0xe3, 0x5e, 0x8c, 0xf5, 0x1c, 0xaf,</div><div class='add'>+	0x9b, 0xba, 0x58, 0x1e, 0xaa, 0x44, 0xf0, 0xbc, 0x78, 0x50, 0xcb, 0xd8,</div><div class='add'>+	0xf1, 0x21, 0x79, 0xa6, 0xfc, 0xf6, 0xe3, 0x05, 0xea, 0xe2, 0x8e, 0xe1,</div><div class='add'>+	0xc5, 0xb8, 0x8b, 0xfe, 0x94, 0xe3, 0x90, 0xb9, 0xd8, 0xb0, 0x76, 0x58,</div><div class='add'>+	0xda, 0x14, 0x8c, 0xfb, 0xd9, 0xd9, 0x71, 0xfe, 0x71, 0x5e, 0xfe, 0x0a,</div><div class='add'>+	0xe5, 0x97, 0x67, 0x07, 0xb2, 0x16, 0x2d, 0xcf, 0x11, 0x64, 0x2c, 0xc6,</div><div class='add'>+	0x14, 0xdc, 0xb1, 0xac, 0x83, 0xe6, 0x3c, 0xc4, 0xaa, 0xf5, 0x7e, 0x89,</div><div class='add'>+	0x8f, 0xfd, 0xc4, 0x03, 0x07, 0xf3, 0xc8, 0xa2, 0x48, 0x94, 0xfe, 0xac,</div><div class='add'>+	0x5e, 0xe5, 0x80, 0x5a, 0xef, 0x40, 0x27, 0xde, 0x30, 0x8d, 0xde, 0x75,</div><div class='add'>+	0xf8, 0x14, 0xba, 0xbc, 0x16, 0xf6, 0xb2, 0x9d, 0xee, 0x54, 0x09, 0xda,</div><div class='add'>+	0xeb, 0x69, 0x56, 0x2b, 0x3d, 0xd8, 0x91, 0x8a, 0xb7, 0x12, 0x16, 0x18,</div><div class='add'>+	0x73, 0x1a, 0xfe, 0x2a, 0x11, 0xd0, 0x5b, 0x36, 0x90, 0xb7, 0x2c, 0xef,</div><div class='add'>+	0x73, 0xc3, 0xaf, 0xe4, 0x72, 0xb4, 0x01, 0x55, 0xd6, 0x09, 0x23, 0x94,</div><div class='add'>+	0xbd, 0xc7, 0xce, 0xf7, 0xfc, 0xd3, 0xa5, 0x1f, 0x3f, 0xe2, 0x19, 0xa9,</div><div class='add'>+	0xeb, 0x47, 0xe9, 0x5c, 0x05, 0xcb, 0xe7, 0xea, 0xf1, 0xa8, 0x62, 0x59,</div><div class='add'>+	0x0b, 0x42, 0x4e, 0xfb, 0xfe, 0xb6, 0x4c, 0x5d, 0xeb, 0x0d, 0xea, 0xab,</div><div class='add'>+	0x56, 0x6e, 0x6d, 0x52, 0xd7, 0xa2, 0x4c, 0x0a, 0x8e, 0xfc, 0xd1, 0xf5,</div><div class='add'>+	0xf9, 0x20, 0xe4, 0xb9, 0x89, 0xdb, 0x58, 0x89, 0xfd, 0xf9, 0xf5, 0x39,</div><div class='add'>+	0x57, 0xe4, 0xbd, 0x2f, 0xef, 0x35, 0x24, 0x6f, 0x11, 0x9d, 0x4b, 0x7f,</div><div class='add'>+	0x62, 0x0b, 0xd7, 0x15, 0x0b, 0x06, 0x76, 0x65, 0x16, 0xd2, 0x16, 0x7f,</div><div class='add'>+	0x6b, 0x8d, 0x7a, 0xa7, 0x96, 0xbd, 0x51, 0xcd, 0xad, 0xb7, 0x4b, 0xd9,</div><div class='add'>+	0x42, 0xb9, 0x8b, 0x89, 0x09, 0x8d, 0x18, 0x3e, 0xaf, 0x4d, 0xc9, 0x75,</div><div class='add'>+	0x0b, 0x6d, 0xde, 0xc6, 0x72, 0xd2, 0xae, 0xe0, 0xef, 0x7f, 0x59, 0xfb,</div><div class='add'>+	0xce, 0x6b, 0xaf, 0xd5, 0x95, 0x6b, 0xef, 0xee, 0x62, 0xc9, 0xdd, 0xfb,</div><div class='add'>+	0x53, 0x45, 0xac, 0xf3, 0x4e, 0x9e, 0x07, 0x16, 0xca, 0x7c, 0xea, 0x82,</div><div class='add'>+	0x32, 0xc4, 0x79, 0xe3, 0x4d, 0x6b, 0xcf, 0x79, 0x65, 0x96, 0x3b, 0xcf,</div><div class='add'>+	0x2f, 0xe3, 0xc4, 0x1c, 0xe3, 0x55, 0xeb, 0xc8, 0x79, 0x65, 0xd2, 0x17,</div><div class='add'>+	0x94, 0xb9, 0x1c, 0x63, 0xf5, 0x8f, 0x58, 0x43, 0xb9, 0xb9, 0xc9, 0xd2,</div><div class='add'>+	0x7d, 0xdc, 0x33, 0x23, 0xad, 0x7f, 0x75, 0xc5, 0x3c, 0xbd, 0x63, 0xa6,</div><div class='add'>+	0x43, 0x9e, 0xd9, 0xb8, 0x91, 0xcd, 0xcd, 0x4d, 0x5c, 0xe6, 0xc6, 0xb5,</div><div class='add'>+	0xa0, 0x30, 0x37, 0xd7, 0xe5, 0xeb, 0x17, 0xda, 0xbd, 0xae, 0xe8, 0xfc,</div><div class='add'>+	0x76, 0x0b, 0xd7, 0xaf, 0xb8, 0x40, 0xee, 0xef, 0x5c, 0x50, 0xee, 0xb7,</div><div class='add'>+	0x7f, 0xa4, 0xde, 0x2f, 0x1c, 0xe7, 0x5f, 0x3f, 0xa0, 0x9e, 0x7f, 0xde,</div><div class='add'>+	0x9c, 0x3f, 0x2f, 0xe8, 0xbf, 0xea, 0x82, 0xf2, 0x35, 0x17, 0x94, 0x7f,</div><div class='add'>+	0x59, 0xfd, 0xf8, 0x7e, 0xd6, 0x5d, 0x50, 0xcf, 0x5e, 0xab, 0xc6, 0x53,</div><div class='add'>+	0x67, 0x7d, 0x1e, 0x4d, 0x45, 0x08, 0x98, 0x4e, 0x05, 0x7e, 0xfa, 0xbe,</div><div class='add'>+	0xff, 0xe9, 0x0b, 0xd6, 0xac, 0x9b, 0xce, 0xfa, 0xfe, 0x79, 0x9c, 0x33,</div><div class='add'>+	0x56, 0x1c, 0x91, 0x18, 0x56, 0x44, 0xee, 0x2c, 0x3c, 0xb0, 0x4e, 0x3b,</div><div class='add'>+	0x97, 0x67, 0x15, 0x62, 0x65, 0x45, 0xac, 0x24, 0xd2, 0x00, 0xff, 0xd8,</div><div class='add'>+	0x2c, 0xff, 0x9b, 0x09, 0x59, 0xb7, 0xfc, 0x80, 0x5c, 0xca, 0xf0, 0xed,</div><div class='add'>+	0xc7, 0x2c, 0xff, 0x4f, 0xd3, 0x6f, 0x15, 0xa3, 0xc2, 0x83, 0xab, 0x13,</div><div class='add'>+	0x1f, 0x5f, 0x4f, 0x8d, 0x40, 0x59, 0xd6, 0xe0, 0x63, 0x7e, 0x05, 0xe7,</div><div class='add'>+	0x35, 0xf3, 0x30, 0xe5, 0xaf, 0x45, 0xf2, 0x3d, 0xf5, 0x58, 0x43, 0x98,</div><div class='add'>+	0xf1, 0x39, 0xf7, 0xbc, 0x76, 0x49, 0x46, 0xf7, 0x45, 0x95, 0xdc, 0x33,</div><div class='add'>+	0xd9, 0xf6, 0xd0, 0x1f, 0xc8, 0x77, 0x3a, 0x29, 0x97, 0xc5, 0xbe, 0x80,</div><div class='add'>+	0x0d, 0x09, 0xcb, 0x7a, 0x8a, 0x79, 0xaa, 0x3c, 0xeb, 0xff, 0x79, 0xfa,</div><div class='add'>+	0xf7, 0xd6, 0x84, 0xd7, 0x89, 0xb7, 0x8c, 0xa9, 0xed, 0xf9, 0x51, 0x19,</div><div class='add'>+	0x31, 0x99, 0x2f, 0xd9, 0x27, 0xea, 0x98, 0x51, 0xb7, 0x71, 0x2f, 0xfd,</div><div class='add'>+	0x6e, 0x7e, 0x40, 0xf7, 0x27, 0xf1, 0xef, 0x96, 0xbf, 0x46, 0x0f, 0x0e,</div><div class='add'>+	0x29, 0x85, 0x75, 0xe2, 0x0b, 0xd7, 0x83, 0x2b, 0x62, 0x2e, 0x8e, 0x6f,</div><div class='add'>+	0x8f, 0xcd, 0xf7, 0x8b, 0x88, 0x71, 0x88, 0x39, 0x23, 0xb3, 0xfc, 0x5b,</div><div class='add'>+	0x12, 0xf6, 0x38, 0xc9, 0x17, 0x15, 0x1c, 0x6b, 0x98, 0xe5, 0xef, 0x4e,</div><div class='add'>+	0x7b, 0xb1, 0x9d, 0xf1, 0xb8, 0xc4, 0x68, 0xc0, 0x23, 0x69, 0x15, 0xb7,</div><div class='add'>+	0xdd, 0xef, 0xc5, 0x5a, 0x72, 0xd1, 0x8d, 0x7d, 0xdf, 0x80, 0x71, 0xa9,</div><div class='add'>+	0x13, 0xb7, 0xd2, 0xfe, 0xd6, 0xf5, 0x15, 0xdb, 0x39, 0xc8, 0xfa, 0x3e,</div><div class='add'>+	0x27, 0xea, 0x2f, 0xad, 0x40, 0xbc, 0xa6, 0x18, 0xdf, 0x37, 0x1d, 0xcc,</div><div class='add'>+	0x7b, 0xca, 0x30, 0x64, 0x63, 0xa2, 0xe4, 0xb2, 0x82, 0x73, 0xa2, 0x37,</div><div class='add'>+	0x87, 0xbd, 0x2e, 0xf9, 0xf1, 0x58, 0xfe, 0x5b, 0x2b, 0x5b, 0xb3, 0xdd,</div><div class='add'>+	0xc6, 0x5f, 0x47, 0xc4, 0xb4, 0xe3, 0x25, 0x90, 0xe3, 0x69, 0x5d, 0xe7,</div><div class='add'>+	0x3d, 0x57, 0x6e, 0x51, 0xe6, 0x44, 0x02, 0x13, 0x8b, 0x15, 0x07, 0xc2,</div><div class='add'>+	0x81, 0x8a, 0x58, 0x65, 0x24, 0x8c, 0x65, 0x99, 0x2e, 0x9f, 0xcf, 0x7e,</div><div class='add'>+	0x56, 0x1d, 0xc1, 0xe9, 0x45, 0x26, 0x73, 0x60, 0x38, 0x97, 0x51, 0xf7,</div><div class='add'>+	0x4d, 0xd4, 0xeb, 0x66, 0xf3, 0x0f, 0x56, 0xd6, 0xf6, 0x7b, 0x37, 0x62,</div><div class='add'>+	0x9a, 0x65, 0xad, 0xa3, 0x7e, 0x1d, 0xd4, 0xe3, 0xcf, 0xf2, 0xfa, 0x15,</div><div class='add'>+	0x9d, 0x96, 0x8d, 0xfd, 0xde, 0x3a, 0x46, 0xfd, 0xba, 0xd9, 0x9e, 0x9b,</div><div class='add'>+	0xed, 0x95, 0x8c, 0x9d, 0xaf, 0xe7, 0x62, 0xca, 0xb3, 0xcc, 0x96, 0xa1,</div><div class='add'>+	0x52, 0x9e, 0xf5, 0xf9, 0xa3, 0x4a, 0x01, 0xb7, 0xff, 0xd4, 0x98, 0x5e,</div><div class='add'>+	0x99, 0x92, 0x83, 0x88, 0xfe, 0xfd, 0xd4, 0xbf, 0x60, 0xb8, 0xcc, 0x41,</div><div class='add'>+	0xbd, 0xac, 0xfb, 0xf4, 0x02, 0xa3, 0x4c, 0xd6, 0x15, 0x4c, 0x33, 0x22,</div><div class='add'>+	0xf8, 0x76, 0x8b, 0x07, 0x6f, 0x26, 0xca, 0xed, 0x71, 0x5f, 0x3a, 0xd7,</div><div class='add'>+	0xb2, 0x1e, 0x0f, 0xf9, 0xf1, 0x73, 0xa3, 0x2e, 0xbc, 0x40, 0xd5, 0x31,</div><div class='add'>+	0xa9, 0x79, 0x91, 0x20, 0xce, 0x76, 0xa5, 0x66, 0x73, 0xbe, 0xbc, 0xd8,</div><div class='add'>+	0x92, 0xc2, 0x46, 0xda, 0x93, 0xdf, 0x11, 0x01, 0xde, 0x48, 0x18, 0xc1,</div><div class='add'>+	0xcd, 0xec, 0x7f, 0xd8, 0xdb, 0x40, 0xfe, 0xad, 0x36, 0x91, 0xaa, 0xc5,</div><div class='add'>+	0x4b, 0x22, 0x46, 0x7c, 0x2b, 0xfe, 0xc3, 0x1a, 0x22, 0xce, 0x17, 0x85,</div><div class='add'>+	0x64, 0x6d, 0x6e, 0x0e, 0x8e, 0x6b, 0x0e, 0x3c, 0x1b, 0x9c, 0x8e, 0x28,</div><div class='add'>+	0xdd, 0xb1, 0xcc, 0x78, 0xcb, 0xfa, 0xa1, 0x57, 0xfa, 0x91, 0xb1, 0xfc,</div><div class='add'>+	0x86, 0xe3, 0x50, 0x6c, 0x2c, 0xdc, 0x92, 0x6a, 0xa0, 0xbe, 0x2f, 0xec,</div><div class='add'>+	0xff, 0xdf, 0xad, 0x49, 0xaf, 0xf4, 0xcf, 0x5c, 0x9e, 0xf1, 0xec, 0xc8,</div><div class='add'>+	0x1f, 0xc5, 0xee, 0x97, 0xac, 0xe7, 0xec, 0x36, 0x17, 0xb9, 0x73, 0x71,</div><div class='add'>+	0x50, 0xda, 0xfb, 0x17, 0x8e, 0x4f, 0xda, 0x2c, 0xf4, 0x23, 0x7a, 0xcb,</div><div class='add'>+	0xba, 0xc5, 0x9f, 0xb7, 0xa4, 0x44, 0x7f, 0x82, 0x57, 0xc7, 0x2c, 0x4c,</div><div class='add'>+	0x97, 0xf3, 0x87, 0xed, 0xb2, 0x71, 0xea, 0xab, 0x8b, 0x36, 0xc4, 0xd8,</div><div class='add'>+	0xcb, 0x3c, 0x4e, 0x76, 0x51, 0x68, 0x76, 0x9e, 0xb6, 0x89, 0xdc, 0x7e,</div><div class='add'>+	0xc8, 0x5b, 0x89, 0x2d, 0x26, 0xed, 0xce, 0x50, 0x2f, 0x76, 0x42, 0x72,</div><div class='add'>+	0x53, 0x39, 0x77, 0x61, 0xd2, 0xeb, 0xc0, 0x56, 0xd3, 0x89, 0x76, 0x43,</div><div class='add'>+	0xd5, 0xe5, 0xba, 0x23, 0x24, 0xe7, 0x2e, 0xf8, 0x6b, 0x14, 0x6c, 0x0f,</div><div class='add'>+	0xab, 0x58, 0x6f, 0x74, 0xf9, 0xe5, 0xfa, 0x92, 0x90, 0x9c, 0x2b, 0x58,</div><div class='add'>+	0x43, 0x9d, 0xc4, 0x35, 0x05, 0x1b, 0x0c, 0x79, 0xbe, 0x98, 0xe3, 0xbe,</div><div class='add'>+	0x31, 0x58, 0xd6, 0x76, 0xb3, 0xf1, 0x8a, 0x32, 0x48, 0x9c, 0x17, 0x2e,</div><div class='add'>+	0xf7, 0xde, 0xcd, 0xf3, 0x03, 0x71, 0x12, 0x31, 0x3d, 0x56, 0x42, 0x3f,</div><div class='add'>+	0xdd, 0xd2, 0x37, 0x87, 0xf5, 0x14, 0x72, 0x1c, 0xa7, 0x6f, 0x1b, 0x24,</div><div class='add'>+	0x7e, 0x06, 0xfc, 0x3f, 0x65, 0xf2, 0x34, 0xe4, 0x9d, 0x47, 0xcd, 0x1a,</div><div class='add'>+	0xfe, 0x93, 0x9c, 0xb7, 0x4a, 0xc3, 0xb9, 0xf1, 0x07, 0xd0, 0xdb, 0x4b,</div><div class='add'>+	0x94, 0x79, 0xc1, 0x0a, 0xe6, 0x00, 0x71, 0xe2, 0xfb, 0xc8, 0x98, 0x13,</div><div class='add'>+	0x9b, 0x53, 0x86, 0xb6, 0xcf, 0xe6, 0x6e, 0x4e, 0xea, 0xc2, 0xc9, 0x1c,</div><div class='add'>+	0x3f, 0xa0, 0x4d, 0x28, 0x85, 0xf3, 0x39, 0x82, 0x0d, 0xe4, 0xe2, 0x82,</div><div class='add'>+	0x6f, 0x71, 0xeb, 0xc9, 0x06, 0x49, 0xdb, 0xdc, 0xfe, 0x58, 0xda, 0xc3,</div><div class='add'>+	0x43, 0xe3, 0xe1, 0xf5, 0xaf, 0x4d, 0xfb, 0xfc, 0x6b, 0xd2, 0xf0, 0xb7,</div><div class='add'>+	0xa5, 0x0b, 0x76, 0x59, 0xf0, 0x6d, 0xc1, 0x36, 0x8b, 0x7c, 0x33, 0x97,</div><div class='add'>+	0x73, 0x75, 0x49, 0x4e, 0x03, 0x79, 0x3e, 0xf6, 0xde, 0xcd, 0x4f, 0xd1,</div><div class='add'>+	0xd6, 0x5d, 0xe4, 0xf2, 0x5b, 0x8d, 0x78, 0x54, 0x9e, 0xd7, 0x19, 0x21,</div><div class='add'>+	0xdd, 0x57, 0xa4, 0xf8, 0xb1, 0xa5, 0xfe, 0x77, 0x9c, 0x4f, 0x72, 0xdc,</div><div class='add'>+	0xf4, 0xa7, 0x4a, 0x72, 0xf3, 0x21, 0x7e, 0x26, 0x18, 0xe0, 0x67, 0x1e,</div><div class='add'>+	0xe4, 0xf3, 0x77, 0xb1, 0x9f, 0x4d, 0xe9, 0xa9, 0x3e, 0xa0, 0xe0, 0x1a,</div><div class='add'>+	0xb6, 0xd5, 0x18, 0x82, 0x73, 0x69, 0xfd, 0x7f, 0x59, 0x59, 0xef, 0xd4,</div><div class='add'>+	0x7d, 0x11, 0x20, 0x87, 0x80, 0xb3, 0xad, 0x5e, 0xce, 0x15, 0x34, 0x86,</div><div class='add'>+	0xe5, 0x5c, 0x41, 0x9b, 0x91, 0x93, 0x4f, 0x7c, 0xb7, 0x9b, 0xb8, 0x7d,</div><div class='add'>+	0xee, 0xfc, 0x42, 0x2c, 0x32, 0x71, 0x7b, 0x0a, 0xb1, 0xa2, 0x88, 0x60,</div><div class='add'>+	0x91, 0xdb, 0xff, 0x5c, 0xba, 0x9e, 0x5c, 0x5c, 0x9e, 0x7f, 0xbb, 0x39,</div><div class='add'>+	0xe7, 0x1e, 0xff, 0xb3, 0xe9, 0x2b, 0x71, 0xdb, 0xae, 0x30, 0xda, 0x77,</div><div class='add'>+	0xc9, 0x86, 0x23, 0xe6, 0x60, 0xa1, 0x80, 0x7f, 0x14, 0x9a, 0xff, 0x38,</div><div class='add'>+	0x75, 0x72, 0x94, 0x72, 0x1e, 0x3b, 0x4f, 0x4e, 0xd1, 0x21, 0xfc, 0x77,</div><div class='add'>+	0x24, 0xdc, 0x48, 0x87, 0xde, 0xb7, 0xe2, 0x36, 0xe7, 0xf0, 0xfa, 0xef,</div><div class='add'>+	0x4c, 0xf8, 0x91, 0xb5, 0xb9, 0xe7, 0xbf, 0xbb, 0x25, 0x47, 0xec, 0x49,</div><div class='add'>+	0xc5, 0xa3, 0x4c, 0x79, 0xf3, 0xf3, 0xab, 0x87, 0x65, 0x6e, 0xdf, 0x48,</div><div class='add'>+	0xc8, 0xbd, 0xe8, 0x37, 0x54, 0xe8, 0x7e, 0x95, 0xb1, 0xb4, 0xdf, 0x14,</div><div class='add'>+	0xfb, 0xb5, 0xec, 0x67, 0xfb, 0xac, 0x18, 0xf7, 0x44, 0x02, 0xad, 0xf5,</div><div class='add'>+	0xbc, 0xae, 0x2d, 0x40, 0xac, 0x8a, 0x7a, 0x2a, 0x35, 0xbc, 0xfe, 0xba,</div><div class='add'>+	0x71, 0x9f, 0xdf, 0x1c, 0x87, 0xff, 0x92, 0xf1, 0xa9, 0x22, 0x90, 0xa3,</div><div class='add'>+	0xab, 0x1f, 0x87, 0x05, 0x5e, 0xff, 0xba, 0xc4, 0x1c, 0xa8, 0x91, 0xb8,</div><div class='add'>+	0xb5, 0xa4, 0xe1, 0xb4, 0x35, 0x27, 0x62, 0x64, 0x8f, 0x51, 0x86, 0xf7,</div><div class='add'>+	0x2f, 0xd7, 0xe3, 0x33, 0x1d, 0x47, 0xef, 0xd5, 0xa6, 0xf4, 0xf1, 0x5e,</div><div class='add'>+	0xe8, 0xff, 0x6f, 0x1f, 0x85, 0x38, 0x47, 0x7b, 0x68, 0x90, 0x31, 0x48,</div><div class='add'>+	0xbc, 0x2b, 0x62, 0xce, 0x29, 0x63, 0xf9, 0x54, 0xe1, 0xb9, 0x47, 0x7e,</div><div class='add'>+	0x5c, 0x0a, 0xe7, 0x1a, 0x36, 0x0f, 0xce, 0xc5, 0x30, 0xcb, 0xea, 0x36,</div><div class='add'>+	0x7c, 0xf9, 0xe7, 0x67, 0x9c, 0xb3, 0xcc, 0xd1, 0x2b, 0x9c, 0x58, 0x4c,</div><div class='add'>+	0x3f, 0x68, 0xfc, 0x4b, 0x27, 0xa2, 0xbe, 0x62, 0xc6, 0x56, 0x59, 0x17,</div><div class='add'>+	0x3a, 0x5e, 0x3f, 0x69, 0x4d, 0x18, 0xf5, 0x68, 0xcc, 0xc8, 0xf3, 0x4c,</div><div class='add'>+	0x07, 0xed, 0xdb, 0xc2, 0x23, 0xa6, 0xdc, 0x17, 0x9c, 0x89, 0xc7, 0x1c,</div><div class='add'>+	0xb4, 0x15, 0xb7, 0xa1, 0xb7, 0xfe, 0xbd, 0x52, 0x81, 0xd2, 0x88, 0x33,</div><div class='add'>+	0x38, 0x01, 0x3d, 0xbc, 0x5e, 0xa1, 0x1f, 0x56, 0xcd, 0x33, 0x65, 0x0a,</div><div class='add'>+	0xde, 0x4e, 0x04, 0xcc, 0x40, 0x3e, 0x2e, 0x9d, 0xe2, 0xdc, 0xbd, 0x93,</div><div class='add'>+	0x30, 0xda, 0x9f, 0xca, 0x9f, 0xff, 0x22, 0x3d, 0x35, 0xa7, 0x15, 0x7b,</div><div class='add'>+	0x74, 0xbb, 0x37, 0x25, 0xf0, 0x9e, 0xa3, 0x01, 0xef, 0xed, 0x31, 0x8b,</div><div class='add'>+	0x98, 0x8b, 0x89, 0x9d, 0xba, 0xdd, 0x5b, 0x12, 0x98, 0x74, 0xf2, 0xda,</div><div class='add'>+	0x29, 0x73, 0x36, 0x31, 0x4d, 0xe5, 0xb5, 0xb0, 0xd8, 0x59, 0x4c, 0x63,</div><div class='add'>+	0x7c, 0x2d, 0x8d, 0x78, 0xdd, 0xa5, 0xe3, 0xd0, 0x4a, 0x8c, 0x0a, 0xe6,</div><div class='add'>+	0xba, 0x68, 0x72, 0x24, 0x75, 0x7f, 0xb3, 0xa3, 0x9e, 0x39, 0xaf, 0x5f,</div><div class='add'>+	0x71, 0x19, 0xdf, 0x63, 0x5e, 0x2f, 0x6b, 0x61, 0x61, 0xda, 0xa4, 0x93,</div><div class='add'>+	0x15, 0x76, 0x4c, 0x57, 0x23, 0x0a, 0xb1, 0xb0, 0x02, 0xb7, 0x6b, 0x1b,</div><div class='add'>+	0x3e, 0xab, 0x46, 0xfa, 0x71, 0x7d, 0x83, 0xbb, 0xa9, 0x72, 0xbc, 0xa0,</div><div class='add'>+	0x13, 0xc4, 0x3c, 0x11, 0xe6, 0x25, 0x06, 0xd4, 0xf2, 0x88, 0xe8, 0xc6,</div><div class='add'>+	0xdf, 0x94, 0x1c, 0x13, 0x59, 0x35, 0x77, 0xdf, 0xd8, 0x3b, 0x25, 0x28,</div><div class='add'>+	0x0d, 0x13, 0xab, 0x7e, 0xe2, 0xfb, 0xef, 0xd5, 0x3b, 0x5a, 0x22, 0x78,</div><div class='add'>+	0xef, 0x32, 0xe4, 0xbf, 0x6d, 0x5b, 0x6e, 0x77, 0xe4, 0x83, 0x98, 0x3b,</div><div class='add'>+	0x60, 0x59, 0x8c, 0x93, 0x3e, 0x28, 0xb3, 0x39, 0x1e, 0xfa, 0x1a, 0xe7,</div><div class='add'>+	0x66, 0x4d, 0xfa, 0x0f, 0xd6, 0xe7, 0x9c, 0x36, 0x07, 0x70, 0x17, 0x47,</div><div class='add'>+	0x3a, 0x6e, 0x79, 0xcb, 0xf8, 0xc0, 0x7a, 0x33, 0xc1, 0x5c, 0xd9, 0x90,</div><div class='add'>+	0x67, 0x43, 0x73, 0xb0, 0xcd, 0x74, 0x36, 0x2f, 0x55, 0x14, 0xf4, 0x18,</div><div class='add'>+	0xf3, 0xb4, 0x12, 0xc6, 0xa9, 0x6e, 0xfa, 0x75, 0xcc, 0x6b, 0x04, 0xf7,</div><div class='add'>+	0x80, 0xe5, 0xd2, 0xeb, 0xd6, 0xb9, 0x22, 0x77, 0xde, 0x32, 0xd2, 0x20,</div><div class='add'>+	0x58, 0x10, 0x6e, 0x7b, 0xca, 0x68, 0x41, 0x4f, 0x66, 0x10, 0xbd, 0x99,</div><div class='add'>+	0x5c, 0x3f, 0x59, 0xcc, 0xf9, 0x98, 0x7e, 0xd6, 0xad, 0x2b, 0x8e, 0x08,</div><div class='add'>+	0xf7, 0x3a, 0x73, 0xcb, 0x5e, 0x23, 0x8a, 0xcd, 0x99, 0x3b, 0x6f, 0x39,</div><div class='add'>+	0xd5, 0xd0, 0xcf, 0xff, 0xb9, 0x3a, 0x43, 0xa8, 0xfc, 0xd8, 0x3a, 0x65,</div><div class='add'>+	0x11, 0xe9, 0xa3, 0xe3, 0x96, 0xa7, 0x8c, 0x3b, 0x6f, 0x69, 0x5f, 0xf4,</div><div class='add'>+	0x4d, 0x6c, 0xca, 0xb4, 0xff, 0xc9, 0x7e, 0xca, 0x59, 0xa7, 0x34, 0x72,</div><div class='add'>+	0xa8, 0xed, 0x9a, 0xc0, 0x9d, 0xb7, 0xa4, 0x17, 0xf5, 0xb2, 0x8f, 0x55,</div><div class='add'>+	0x8c, 0x2f, 0xb9, 0x3a, 0x51, 0xc6, 0xf6, 0x8f, 0xd3, 0x41, 0x49, 0x64,</div><div class='add'>+	0xa2, 0x6d, 0x7e, 0xe0, 0x03, 0x6b, 0x5e, 0x5f, 0x91, 0xad, 0x03, 0x17,</div><div class='add'>+	0x75, 0xf0, 0xa0, 0xe9, 0xcc, 0x06, 0x1c, 0xb6, 0x0e, 0x3a, 0x7c, 0xd4,</div><div class='add'>+	0x41, 0x92, 0x3a, 0xc8, 0xd6, 0x18, 0xe1, 0x77, 0xa9, 0x83, 0x79, 0x63,</div><div class='add'>+	0xeb, 0xd6, 0x95, 0x44, 0xe0, 0x74, 0x18, 0xaf, 0x3a, 0x9c, 0x9c, 0x0b,</div><div class='add'>+	0x97, 0xb1, 0x8e, 0x7a, 0xbb, 0xf3, 0x96, 0x8b, 0x17, 0xd9, 0x3a, 0xff,</div><div class='add'>+	0xb2, 0x3b, 0xb0, 0xc1, 0xde, 0x3b, 0xd7, 0x9d, 0x59, 0xc3, 0xa3, 0x99,</div><div class='add'>+	0xc7, 0x7d, 0x3c, 0x7a, 0x98, 0xb3, 0xdc, 0x4c, 0x5d, 0x35, 0x71, 0x1c,</div><div class='add'>+	0x2b, 0x28, 0xd7, 0x46, 0xfe, 0x6e, 0xe5, 0xef, 0x0e, 0xfe, 0x96, 0xf9,</div><div class='add'>+	0x51, 0xcf, 0xca, 0x16, 0x3b, 0x2b, 0x9b, 0x83, 0xf2, 0x78, 0x88, 0x57,</div><div class='add'>+	0x32, 0x26, 0xf7, 0x57, 0xae, 0x09, 0xc4, 0xd8, 0xc6, 0xfd, 0xa5, 0xb2,</div><div class='add'>+	0x6f, 0xc8, 0x65, 0xc4, 0x7d, 0x4e, 0x88, 0x7c, 0x7a, 0x6b, 0x3b, 0xb2,</div><div class='add'>+	0xc4, 0xde, 0xdf, 0xe7, 0xb0, 0x97, 0xb2, 0x55, 0x70, 0x7e, 0x5e, 0x58,</div><div class='add'>+	0x34, 0x34, 0xc3, 0x63, 0xc0, 0xe7, 0x36, 0xe2, 0xcc, 0xf9, 0x13, 0xd4,</div><div class='add'>+	0x81, 0xd8, 0xc9, 0x3d, 0xd4, 0x5f, 0x27, 0xeb, 0x1c, 0x65, 0x2c, 0xdb,</div><div class='add'>+	0xcd, 0xfe, 0xed, 0xf5, 0xdb, 0xb0, 0xfd, 0x9c, 0x0c, 0xba, 0x79, 0x9c,</div><div class='add'>+	0xed, 0xed, 0x35, 0x7e, 0x53, 0x76, 0xb4, 0x5e, 0xf6, 0x53, 0x3a, 0x31,</div><div class='add'>+	0x6c, 0xcf, 0xbb, 0x42, 0x2e, 0x73, 0x11, 0x79, 0x82, 0x65, 0xfd, 0xd4,</div><div class='add'>+	0x68, 0x9c, 0xef, 0xb0, 0xed, 0xea, 0x50, 0x9b, 0x3b, 0xe0, 0xc6, 0x90,</div><div class='add'>+	0xbd, 0x06, 0x6e, 0x59, 0x45, 0xb6, 0x7d, 0x89, 0x2c, 0x75, 0xcd, 0x9b,</div><div class='add'>+	0x68, 0x78, 0xeb, 0xd2, 0x1f, 0x90, 0x27, 0x8a, 0xfc, 0x73, 0x70, 0x92,</div><div class='add'>+	0x31, 0x35, 0xaa, 0xc5, 0xdb, 0x45, 0xd6, 0x32, 0xc3, 0x19, 0xbe, 0x16,</div><div class='add'>+	0xf1, 0x16, 0x27, 0xfb, 0x6b, 0x26, 0xa7, 0x3c, 0x95, 0xc7, 0xee, 0x7d,</div><div class='add'>+	0x69, 0x3d, 0xb6, 0x5f, 0xc9, 0xf1, 0xd3, 0xde, 0xb1, 0x42, 0xfc, 0x09,</div><div class='add'>+	0x92, 0xcf, 0x7a, 0xe0, 0x8c, 0xe8, 0xfe, 0x26, 0x47, 0x57, 0xd0, 0x05,</div><div class='add'>+	0xfa, 0x58, 0xa9, 0xc8, 0x1b, 0xa7, 0xec, 0x82, 0xc7, 0x6e, 0x6d, 0x8d,</div><div class='add'>+	0x8d, 0xd1, 0xf1, 0xf9, 0x2e, 0x78, 0xb4, 0xb5, 0xe9, 0x42, 0xec, 0xf2,</div><div class='add'>+	0x68, 0x6d, 0x09, 0xf1, 0x77, 0x59, 0xab, 0x0f, 0xdb, 0xdc, 0xe3, 0x48,</div><div class='add'>+	0xe6, 0xa5, 0x52, 0xd9, 0x8b, 0x47, 0xdf, 0xaf, 0x70, 0x1a, 0xb9, 0x76,</div><div class='add'>+	0x35, 0xb6, 0xdb, 0xe2, 0xd0, 0x70, 0xce, 0x77, 0x75, 0xad, 0xc5, 0x21,</div><div class='add'>+	0xfb, 0x5f, 0x89, 0x4a, 0xe9, 0x7c, 0xbd, 0x1c, 0x7e, 0x2d, 0x76, 0xd9,</div><div class='add'>+	0xf8, 0xc5, 0x36, 0x4a, 0x81, 0x25, 0x89, 0x0b, 0xfb, 0x97, 0xfe, 0xa4,</div><div class='add'>+	0xdf, 0xae, 0x2a, 0x15, 0x13, 0xf6, 0xb3, 0x92, 0x83, 0x99, 0x18, 0x06,</div><div class='add'>+	0x53, 0x53, 0xf7, 0xe8, 0xe9, 0x87, 0xd8, 0xfe, 0x81, 0x38, 0xe7, 0x69,</div><div class='add'>+	0xb6, 0x21, 0xfb, 0xf7, 0x64, 0xcf, 0xde, 0xd4, 0xfd, 0x7a, 0x22, 0x5b,</div><div class='add'>+	0x65, 0x19, 0x81, 0x0d, 0x7b, 0x89, 0x7f, 0xd1, 0x16, 0xa9, 0x6f, 0x59,</div><div class='add'>+	0xaf, 0xcd, 0x0b, 0x22, 0x3b, 0xcd, 0x89, 0xc1, 0xb9, 0xc0, 0x40, 0x52,</div><div class='add'>+	0xf6, 0x53, 0x9d, 0x89, 0xad, 0x66, 0x1e, 0x19, 0xad, 0xae, 0xd3, 0xba,</div><div class='add'>+	0x55, 0xd9, 0x0b, 0xf5, 0xc1, 0x97, 0x7b, 0x8c, 0x5a, 0xad, 0x47, 0xcd,</div><div class='add'>+	0xee, 0x67, 0x7c, 0xd9, 0x0d, 0xcc, 0x2e, 0x13, 0x0c, 0xa8, 0x32, 0xa2,</div><div class='add'>+	0xbd, 0x55, 0x98, 0x0b, 0x7f, 0xb5, 0x8d, 0xcb, 0xf1, 0x6f, 0xab, 0x46,</div><div class='add'>+	0x70, 0xa5, 0xf0, 0x4a, 0xf5, 0x7d, 0x6b, 0x88, 0xdc, 0xe4, 0xee, 0xb9,</div><div class='add'>+	0xff, 0xa7, 0x34, 0xbf, 0xee, 0xd4, 0x3e, 0x9d, 0xf3, 0xf2, 0xf3, 0x05,</div><div class='add'>+	0xba, 0x3f, 0xad, 0x88, 0x8e, 0x84, 0x4b, 0x25, 0xb0, 0x95, 0x71, 0xf6,</div><div class='add'>+	0xbf, 0xe6, 0x46, 0xb0, 0x8f, 0xff, 0x7f, 0x76, 0xa5, 0xec, 0x4d, 0xb5,</div><div class='add'>+	0xac, 0x60, 0x60, 0x5e, 0xb8, 0x8a, 0x63, 0x78, 0x96, 0xf7, 0x7b, 0x33,</div><div class='add'>+	0x6f, 0x59, 0xa7, 0xa6, 0x1b, 0xfd, 0xcb, 0x18, 0xec, 0x06, 0xc6, 0x75,</div><div class='add'>+	0x6d, 0x52, 0xfd, 0xef, 0xee, 0x95, 0x83, 0xbb, 0x82, 0x63, 0xf9, 0x7e,</div><div class='add'>+	0xa0, 0x4e, 0x4b, 0xaa, 0xa5, 0x65, 0xa2, 0xd7, 0x81, 0xf1, 0x57, 0xa6,</div><div class='add'>+	0x3c, 0x3b, 0x28, 0xf0, 0x59, 0x7b, 0x5d, 0xa5, 0x77, 0x88, 0xbe, 0x3e,</div><div class='add'>+	0xa4, 0x45, 0xe3, 0xd4, 0xbb, 0x7b, 0x1a, 0xc7, 0x7c, 0xf7, 0xdc, 0x2f,</div><div class='add'>+	0xd9, 0xe3, 0xac, 0x36, 0x66, 0x72, 0x8c, 0x0a, 0xb4, 0xb9, 0xff, 0x99,</div><div class='add'>+	0x5f, 0x7f, 0x6d, 0x24, 0xfb, 0x1a, 0xb2, 0x9a, 0xe8, 0x1b, 0x45, 0xac,</div><div class='add'>+	0x73, 0xb5, 0xf9, 0xf0, 0x8c, 0xae, 0x7a, 0xdd, 0x77, 0x37, 0x6d, 0x34,</div><div class='add'>+	0x34, 0xf7, 0xd7, 0x16, 0x6d, 0xda, 0xfc, 0x16, 0x47, 0x7d, 0x5b, 0xc2,</div><div class='add'>+	0x8e, 0x55, 0x9c, 0x57, 0x23, 0x3a, 0x57, 0x79, 0xc7, 0x42, 0x4d, 0x20,</div><div class='add'>+	0x3c, 0xd7, 0x1e, 0x3f, 0x70, 0x6b, 0x3a, 0x81, 0x6d, 0x29, 0x69, 0x53,</div><div class='add'>+	0xc1, 0xb2, 0xc0, 0xdb, 0x96, 0x7f, 0x7a, 0x02, 0x5b, 0x32, 0x9f, 0xc4,</div><div class='add'>+	0x4d, 0x07, 0xc9, 0x8d, 0xf5, 0xd6, 0x38, 0xf4, 0x68, 0xee, 0xd9, 0xd4,</div><div class='add'>+	0x1c, 0x59, 0xdb, 0x96, 0xbd, 0x45, 0xb7, 0x24, 0x02, 0x70, 0x97, 0x13,</div><div class='add'>+	0x83, 0xc7, 0x02, 0xf2, 0x2c, 0xd3, 0x8b, 0x6c, 0x8b, 0x94, 0xa9, 0xd5,</div><div class='add'>+	0xc6, 0x90, 0x25, 0x73, 0x94, 0xb5, 0xd0, 0xfe, 0xb2, 0xdc, 0x3e, 0x09,</div><div class='add'>+	0x1a, 0x5e, 0x8d, 0xae, 0xbd, 0x41, 0xae, 0xd7, 0x6c, 0x48, 0x1b, 0x0a,</div><div class='add'>+	0xe6, 0x07, 0xa6, 0xa1, 0x6e, 0xe5, 0xab, 0xaf, 0x17, 0x05, 0x8a, 0x18,</div><div class='add'>+	0x4f, 0xc4, 0xb7, 0x8c, 0x8d, 0xc7, 0xf0, 0x1b, 0x62, 0x90, 0xec, 0x19,</div><div class='add'>+	0x4b, 0x4a, 0x3d, 0xb6, 0x35, 0x17, 0x69, 0xf1, 0x53, 0x43, 0xf6, 0x2f,</div><div class='add'>+	0x5b, 0xd6, 0x35, 0x81, 0x37, 0xad, 0x68, 0x0d, 0xe5, 0x21, 0x5f, 0xcb,</div><div class='add'>+	0xd5, 0x95, 0x32, 0xf9, 0xbd, 0x40, 0x4a, 0xe3, 0x2d, 0xa2, 0x93, 0x27,</div><div class='add'>+	0xcd, 0x38, 0xb3, 0x01, 0xc1, 0xfd, 0x0f, 0x62, 0x6f, 0x19, 0x8a, 0xfd,</div><div class='add'>+	0x8c, 0x71, 0x99, 0x52, 0xc9, 0x38, 0xea, 0xf4, 0x8f, 0xd8, 0xeb, 0x05,</div><div class='add'>+	0x1d, 0xc4, 0x68, 0xe1, 0x97, 0x92, 0xf3, 0x39, 0xf1, 0x94, 0x51, 0x85,</div><div class='add'>+	0x27, 0xb5, 0x1c, 0x57, 0x23, 0xd6, 0xe1, 0x07, 0x89, 0x79, 0x59, 0x7a,</div><div class='add'>+	0x08, 0x39, 0xaf, 0xd1, 0x7e, 0x46, 0xf9, 0x0d, 0xfd, 0x1c, 0x78, 0x21,</div><div class='add'>+	0xbd, 0x11, 0x0f, 0xca, 0x1a, 0xa2, 0x52, 0xdb, 0x5c, 0xe7, 0x90, 0xfe,</div><div class='add'>+	0x36, 0x62, 0x6b, 0x46, 0xda, 0xfa, 0x20, 0xb6, 0xd7, 0xd8, 0x9d, 0x97,</div><div class='add'>+	0x55, 0xb0, 0xfc, 0x83, 0xd8, 0x53, 0xc6, 0xe3, 0xf6, 0xdc, 0xc9, 0x73,</div><div class='add'>+	0xaf, 0x5e, 0x53, 0x30, 0xaf, 0x14, 0x2a, 0xf3, 0x06, 0x87, 0x71, 0x33,</div><div class='add'>+	0x1c, 0x55, 0xdf, 0xa4, 0xed, 0xc9, 0xbe, 0x9a, 0xaf, 0xc2, 0x59, 0xe5,</div><div class='add'>+	0xa2, 0x6f, 0xde, 0x0a, 0x57, 0x95, 0x70, 0xf5, 0x02, 0x8f, 0x8e, 0xf2,</div><div class='add'>+	0xbe, 0xe8, 0x36, 0xdc, 0x26, 0xba, 0x75, 0x12, 0x87, 0x7a, 0x24, 0xaf,</div><div class='add'>+	0x33, 0x2a, 0xa9, 0x23, 0xbd, 0x95, 0x9c, 0x1e, 0xe5, 0xc4, 0x4c, 0xc6,</div><div class='add'>+	0x47, 0x37, 0xf3, 0xb7, 0xb6, 0x77, 0xa9, 0xf7, 0x79, 0x7d, 0x65, 0xe4,</div><div class='add'>+	0xf0, 0x96, 0xf5, 0x3e, 0x39, 0xfc, 0xfc, 0x40, 0x5d, 0xd6, 0x20, 0x4e,</div><div class='add'>+	0xe1, 0x06, 0xbd, 0x39, 0x4e, 0xbc, 0x59, 0x6d, 0x9c, 0xb1, 0x62, 0xab,</div><div class='add'>+	0xa4, 0x8c, 0xee, 0x8b, 0x29, 0x85, 0x3e, 0x16, 0xc0, 0x3f, 0xcd, 0x82,</div><div class='add'>+	0x2b, 0x22, 0xcf, 0x14, 0x64, 0xbd, 0xb8, 0x51, 0x9e, 0xf5, 0xb5, 0xc8,</div><div class='add'>+	0xf8, 0x5d, 0xb2, 0xee, 0x86, 0xe8, 0x84, 0x0b, 0x46, 0x76, 0x9f, 0xcc,</div><div class='add'>+	0xd9, 0x0c, 0x0b, 0x81, 0x85, 0xbf, 0x67, 0x2e, 0x24, 0xf3, 0x53, 0x9b,</div><div class='add'>+	0xad, 0x57, 0xb2, 0x41, 0x1f, 0x39, 0xfd, 0xa3, 0xd0, 0x5b, 0x12, 0xd4,</div><div class='add'>+	0x75, 0x53, 0x48, 0x9e, 0xdf, 0x3b, 0x7d, 0x09, 0xd8, 0x3c, 0xde, 0x3c,</div><div class='add'>+	0x89, 0xcf, 0xa1, 0x9c, 0xb9, 0xeb, 0xdc, 0xb1, 0x15, 0xa8, 0xa8, 0x8a,</div><div class='add'>+	0xfa, 0x4a, 0x71, 0x19, 0xcf, 0xd7, 0x30, 0x3f, 0xf9, 0x22, 0x2a, 0x56,</div><div class='add'>+	0xb6, 0x22, 0xc1, 0xb1, 0x97, 0x1b, 0x7f, 0xc5, 0x6b, 0xf7, 0x21, 0x99,</div><div class='add'>+	0x72, 0x71, 0x1c, 0x3f, 0xb1, 0x2a, 0x6a, 0x44, 0x36, 0xd3, 0x5b, 0x66,</div><div class='add'>+	0x30, 0x9f, 0xb6, 0x75, 0x41, 0xdc, 0x4e, 0x09, 0x47, 0xaa, 0x8b, 0xae,</div><div class='add'>+	0x07, 0x73, 0xfb, 0x1a, 0xbd, 0x75, 0x8d, 0xd2, 0x41, 0x9b, 0xed, 0xa1,</div><div class='add'>+	0xce, 0xa5, 0xac, 0x65, 0x2d, 0x0f, 0x9c, 0xa6, 0x8e, 0x3b, 0x78, 0x6e,</div><div class='add'>+	0xf8, 0xdf, 0x84, 0x7a, 0x59, 0x31, 0x4e, 0x58, 0x71, 0xcd, 0x47, 0xbb,</div><div class='add'>+	0x54, 0x57, 0x09, 0x9f, 0x5a, 0x1a, 0x7a, 0x8f, 0xf7, 0xb5, 0xbc, 0x9d,</div><div class='add'>+	0x9e, 0xb9, 0x25, 0xa7, 0xcb, 0x30, 0x75, 0xf9, 0x6f, 0xf6, 0x75, 0x87,</div><div class='add'>+	0x7d, 0xbd, 0x23, 0x7f, 0xfd, 0xcc, 0x2d, 0x3d, 0xc6, 0xcb, 0xbc, 0xde,</div><div class='add'>+	0x4b, 0xdd, 0xab, 0x17, 0x49, 0xfd, 0x75, 0xa6, 0xd4, 0x67, 0x4a, 0x65,</div><div class='add'>+	0xf4, 0xe4, 0xe7, 0xe3, 0x50, 0x7e, 0x3e, 0x26, 0xf2, 0x6d, 0x38, 0xd9,</div><div class='add'>+	0x46, 0x3c, 0x5a, 0x0a, 0x13, 0x65, 0x01, 0xc1, 0x79, 0x91, 0x8b, 0x73,</div><div class='add'>+	0x97, 0x11, 0xb9, 0xd6, 0x30, 0xde, 0x75, 0x3d, 0x53, 0x8a, 0x78, 0xc7,</div><div class='add'>+	0x4c, 0xdb, 0x0e, 0xcf, 0xdc, 0x22, 0xfb, 0xde, 0xde, 0x52, 0x1a, 0x7d,</div><div class='add'>+	0xb2, 0x65, 0x23, 0x45, 0x2e, 0x7b, 0xaf, 0xe9, 0x0c, 0xd7, 0x3b, 0xe6,</div><div class='add'>+	0x65, 0x8b, 0x61, 0xc4, 0xce, 0x28, 0x2e, 0x8f, 0xe0, 0x43, 0x22, 0xdd,</div><div class='add'>+	0xc8, 0xcc, 0x2b, 0x1e, 0x64, 0xce, 0x14, 0xcc, 0x50, 0xb7, 0x6d, 0x44,</div><div class='add'>+	0xec, 0x43, 0xf6, 0xde, 0x37, 0xe7, 0xc4, 0x0a, 0x34, 0xea, 0x0e, 0xcc,</div><div class='add'>+	0x0b, 0xcf, 0x64, 0xe6, 0x45, 0xbb, 0x34, 0x8b, 0x1d, 0xba, 0xff, 0x7a,</div><div class='add'>+	0x2c, 0xb7, 0xeb, 0xed, 0x4b, 0x67, 0xdb, 0x4b, 0x39, 0xa7, 0x8f, 0x51,</div><div class='add'>+	0x8e, 0x6d, 0x01, 0x91, 0xe3, 0x9b, 0x79, 0x39, 0x5a, 0x19, 0x4b, 0x4d,</div><div class='add'>+	0xed, 0xda, 0x40, 0xef, 0x59, 0xbd, 0x3d, 0x63, 0xeb, 0xed, 0x3e, 0x9e,</div><div class='add'>+	0x17, 0x33, 0xbf, 0x2f, 0xc2, 0xd1, 0x7a, 0x6f, 0x7e, 0x1f, 0x9b, 0xe4,</div><div class='add'>+	0x6a, 0x82, 0xbf, 0x0d, 0x7f, 0xbd, 0xda, 0xd0, 0xc3, 0x0e, 0x9b, 0xd7,</div><div class='add'>+	0xbb, 0x11, 0xb7, 0x39, 0xb3, 0x3c, 0xf3, 0xae, 0xc0, 0x23, 0x76, 0x39,</div><div class='add'>+	0x17, 0x75, 0x52, 0x86, 0x47, 0xf3, 0xfe, 0x22, 0x7b, 0x0e, 0x1e, 0xb3,</div><div class='add'>+	0x7f, 0xef, 0xe6, 0xdc, 0xba, 0xe8, 0xab, 0x85, 0x18, 0x25, 0xeb, 0xed,</div><div class='add'>+	0xff, 0xc3, 0xf6, 0xfd, 0x21, 0x1c, 0xb7, 0xff, 0x67, 0x73, 0xf9, 0x16,</div><div class='add'>+	0x7a, 0x4c, 0xd9, 0x3b, 0x53, 0x86, 0x6e, 0x7b, 0x0f, 0xb9, 0xac, 0x01,</div><div class='add'>+	0x5c, 0x89, 0xcd, 0x9a, 0xac, 0x07, 0x93, 0xfb, 0x68, 0x62, 0x13, 0x9d,</div><div class='add'>+	0x48, 0x6a, 0xa6, 0x37, 0x53, 0x3f, 0x35, 0x57, 0x32, 0xb1, 0xa7, 0xfe,</div><div class='add'>+	0x03, 0x2b, 0x6a, 0xe7, 0x4f, 0x27, 0xac, 0xbd, 0xc6, 0xd1, 0x10, 0x3d,</div><div class='add'>+	0xb8, 0xbd, 0xc8, 0xd6, 0x6f, 0xb8, 0xcd, 0xde, 0xff, 0x47, 0x99, 0x9f,</div><div class='add'>+	0x49, 0x48, 0x1c, 0x9d, 0x83, 0xb4, 0x69, 0xc7, 0xe2, 0x96, 0xed, 0x9c,</div><div class='add'>+	0x93, 0x9e, 0x54, 0x20, 0x7a, 0x09, 0xef, 0x4d, 0x30, 0x96, 0x75, 0x53,</div><div class='add'>+	0x9f, 0xb1, 0x16, 0xe1, 0x67, 0x6b, 0xb0, 0x9b, 0x36, 0x36, 0x6e, 0x5a,</div><div class='add'>+	0xd6, 0x3e, 0x62, 0x44, 0xe5, 0x3c, 0x15, 0xd9, 0x9a, 0x35, 0x48, 0x31,</div><div class='add'>+	0x36, 0xed, 0x33, 0x1a, 0x3f, 0x57, 0x84, 0xb8, 0xdf, 0x0d, 0xdd, 0xb7,</div><div class='add'>+	0x85, 0xa3, 0xb9, 0x97, 0xf3, 0x75, 0xd4, 0x14, 0xde, 0xe8, 0x3c, 0xb3,</div><div class='add'>+	0x14, 0x46, 0x78, 0xb1, 0xe3, 0x27, 0xd6, 0xa4, 0xfd, 0xec, 0xb8, 0xeb,</div><div class='add'>+	0x5f, 0x28, 0xc3, 0x46, 0x71, 0xde, 0x4a, 0xce, 0xf1, 0xbb, 0x01, 0x79,</div><div class='add'>+	0x7e, 0x0d, 0xd4, 0xf5, 0x35, 0xb6, 0x8b, 0x0c, 0x7b, 0x43, 0xce, 0xd8,</div><div class='add'>+	0x3e, 0x04, 0x5a, 0x36, 0x28, 0xe7, 0x72, 0x83, 0x4b, 0xc6, 0x4c, 0x8c,</div><div class='add'>+	0xd6, 0x3f, 0x4b, 0x1e, 0x23, 0xf5, 0x8b, 0xf1, 0x84, 0xf9, 0xb4, 0x55,</div><div class='add'>+	0x3b, 0xe3, 0xfb, 0xd6, 0x7e, 0x43, 0x5d, 0x4f, 0x6d, 0xc7, 0xca, 0xd9,</div><div class='add'>+	0x56, 0x19, 0xdb, 0xba, 0x3d, 0xa0, 0x9b, 0xdb, 0xd9, 0xd6, 0xf1, 0xc4,</div><div class='add'>+	0xd1, 0xa0, 0x9b, 0x6d, 0x3d, 0x6a, 0x4a, 0x6e, 0xe0, 0x6c, 0x6e, 0xe6,</div><div class='add'>+	0xdc, 0x76, 0xa5, 0x02, 0xbe, 0xad, 0x94, 0x4b, 0xf2, 0xb7, 0xaf, 0x26,</div><div class='add'>+	0xe4, 0x5d, 0x8f, 0x6f, 0x72, 0x3c, 0xd1, 0x8d, 0x2e, 0x34, 0xde, 0x5b,</div><div class='add'>+	0x41, 0xfb, 0xa9, 0x44, 0xc1, 0xd6, 0x75, 0x1f, 0xf1, 0x0e, 0xb7, 0xb3,</div><div class='add'>+	0xcc, 0xeb, 0x81, 0x39, 0x78, 0x21, 0xd4, 0xb8, 0x72, 0x0e, 0x9c, 0xe4,</div><div class='add'>+	0x21, 0x81, 0xe6, 0x0d, 0x4a, 0x5c, 0x13, 0x5b, 0xbc, 0x2d, 0xad, 0x07,</div><div class='add'>+	0x9b, 0x20, 0xd8, 0xdd, 0x4a, 0x7d, 0xcc, 0xc1, 0xfb, 0x0b, 0x45, 0x2e,</div><div class='add'>+	0x67, 0x38, 0xe8, 0x08, 0x74, 0x3c, 0xcd, 0xf9, 0xad, 0x98, 0x97, 0xcb,</div><div class='add'>+	0x53, 0x33, 0xf6, 0x7e, 0xcd, 0x56, 0x24, 0x33, 0x27, 0xde, 0xdd, 0x6b,</div><div class='add'>+	0xc0, 0x79, 0xa8, 0xfe, 0x41, 0x0b, 0xf6, 0xbb, 0x21, 0x8d, 0x32, 0x0f,</div><div class='add'>+	0xad, 0x32, 0x0f, 0xa5, 0xf4, 0xa7, 0x6b, 0x28, 0xf7, 0x7a, 0x5b, 0xee,</div><div class='add'>+	0x39, 0x18, 0x36, 0x65, 0xfd, 0xcb, 0xa9, 0xdd, 0x86, 0x5e, 0x62, 0x67,</div><div class='add'>+	0xe0, 0x4c, 0x17, 0xfb, 0x79, 0x9d, 0x32, 0xcf, 0xa3, 0xde, 0x27, 0x5b,</div><div class='add'>+	0x84, 0xb7, 0xde, 0x87, 0xbe, 0x54, 0xe1, 0xdd, 0x11, 0x05, 0xe9, 0x80,</div><div class='add'>+	0xf4, 0x71, 0x1f, 0x79, 0x5c, 0x97, 0x35, 0x59, 0x23, 0xd7, 0x77, 0x33,</div><div class='add'>+	0xf7, 0x8f, 0x6a, 0xf4, 0x07, 0xea, 0x1d, 0xfa, 0x1c, 0xe8, 0x13, 0x6f,</div><div class='add'>+	0x38, 0xa2, 0xf4, 0x01, 0xd3, 0x7b, 0x86, 0xd8, 0x70, 0x08, 0x1d, 0x16,</div><div class='add'>+	0xaa, 0x6c, 0x7b, 0xf8, 0xd9, 0x88, 0xf1, 0xa1, 0x22, 0xb1, 0x3d, 0x4b,</div><div class='add'>+	0x1d, 0xa8, 0x9c, 0x13, 0xd1, 0x41, 0x39, 0x7d, 0x76, 0x2c, 0xa0, 0xfb,</div><div class='add'>+	0x5f, 0xa0, 0x3c, 0xdb, 0x29, 0xcf, 0x8a, 0xdc, 0x1c, 0xfa, 0x36, 0x2b,</div><div class='add'>+	0xe2, 0xd3, 0x81, 0x96, 0xd5, 0xbc, 0xbe, 0x8d, 0xf2, 0x04, 0xfa, 0x14,</div><div class='add'>+	0x0c, 0xb5, 0xf4, 0x90, 0x2b, 0x76, 0x50, 0x07, 0xe7, 0xe4, 0x71, 0xdb,</div><div class='add'>+	0x73, 0xd6, 0x41, 0x2e, 0x50, 0x8c, 0xbd, 0xa6, 0xe0, 0xb7, 0x86, 0x61,</div><div class='add'>+	0xda, 0xe9, 0x1e, 0xce, 0x48, 0xd4, 0xab, 0xa2, 0xd8, 0x10, 0x0c, 0xa8,</div><div class='add'>+	0xe1, 0x35, 0x17, 0xe7, 0xa6, 0x12, 0xfb, 0xb5, 0xdd, 0xf6, 0x5e, 0xe5,</div><div class='add'>+	0x1c, 0xb7, 0xfb, 0x83, 0x35, 0xea, 0x15, 0x7e, 0x26, 0xeb, 0x63, 0xb2,</div><div class='add'>+	0x86, 0xd4, 0xeb, 0xc9, 0xed, 0xd7, 0x72, 0x51, 0x27, 0xb9, 0xeb, 0xcf,</div><div class='add'>+	0x68, 0xc2, 0x7d, 0x0b, 0xe5, 0x7f, 0x69, 0x3d, 0x69, 0x97, 0x97, 0x72,</div><div class='add'>+	0x2e, 0x9b, 0xa3, 0x97, 0xda, 0xe5, 0x7e, 0x69, 0x3d, 0xab, 0x39, 0xa7,</div><div class='add'>+	0x94, 0x2b, 0x3c, 0x2f, 0x3c, 0xfa, 0x0d, 0x27, 0x31, 0xaf, 0x78, 0xee,</div><div class='add'>+	0x62, 0x1c, 0x33, 0x4e, 0xd4, 0x9e, 0xac, 0xef, 0x64, 0x1c, 0x9b, 0xba,</div><div class='add'>+	0x7f, 0xcb, 0xc2, 0xe3, 0x76, 0x1e, 0xde, 0x45, 0x3e, 0x7b, 0x74, 0x47,</div><div class='add'>+	0x11, 0x84, 0xa3, 0xca, 0xfa, 0x5d, 0x73, 0xd9, 0xb9, 0x5c, 0x56, 0xf6,</div><div class='add'>+	0x35, 0x5d, 0x66, 0x73, 0xc3, 0xa8, 0x2a, 0xb8, 0xfb, 0x49, 0x7b, 0xf8,</div><div class='add'>+	0x84, 0xbb, 0x74, 0x62, 0x8f, 0x51, 0xe0, 0x2c, 0x47, 0x1f, 0x54, 0x89,</div><div class='add'>+	0x93, 0x03, 0xe6, 0x62, 0x89, 0xcd, 0x7e, 0xd6, 0x0f, 0xc6, 0xd4, 0xa9,</div><div class='add'>+	0xdc, 0xe6, 0x76, 0x0f, 0x2a, 0xba, 0xb6, 0x3a, 0x20, 0xfb, 0x47, 0x65,</div><div class='add'>+	0x2f, 0xa8, 0xf4, 0x55, 0x92, 0x5f, 0x97, 0xfa, 0x38, 0xae, 0x51, 0xe8,</div><div class='add'>+	0x4b, 0xf8, 0xc6, 0xfb, 0xa5, 0x85, 0x7d, 0x86, 0x51, 0x5b, 0xce, 0x5f,</div><div class='add'>+	0x59, 0x2b, 0xb5, 0xec, 0x4c, 0x0d, 0xe7, 0xcb, 0x1e, 0xcd, 0xcb, 0x1e,</div><div class='add'>+	0xfb, 0xd8, 0x75, 0xb5, 0xa9, 0xfb, 0xee, 0x82, 0xf9, 0xe7, 0x5d, 0xf2,</div><div class='add'>+	0x0c, 0x46, 0xd6, 0x5c, 0xe5, 0x9e, 0x82, 0x2e, 0xe2, 0x50, 0x54, 0x6b,</div><div class='add'>+	0x64, 0x9c, 0xd7, 0x7d, 0x6b, 0x39, 0x1f, 0x71, 0xaf, 0xec, 0x51, 0x2f,</div><div class='add'>+	0xc4, 0xc8, 0x62, 0xe4, 0xd6, 0x3e, 0x65, 0x9f, 0x45, 0x6e, 0xbd, 0x93,</div><div class='add'>+	0x76, 0x8f, 0xae, 0xf4, 0xef, 0xad, 0xac, 0xd7, 0xc9, 0x58, 0x78, 0x6e,</div><div class='add'>+	0x7f, 0xf4, 0x10, 0xf5, 0x3a, 0xcc, 0x7b, 0x9b, 0xcf, 0xae, 0xa7, 0xc8,</div><div class='add'>+	0x9a, 0x92, 0xc4, 0xde, 0xdf, 0x59, 0x6d, 0xe7, 0x95, 0x9d, 0xba, 0x57,</div><div class='add'>+	0xbc, 0x26, 0x26, 0xcf, 0xdc, 0x46, 0xf3, 0xeb, 0xee, 0x4d, 0x1f, 0x79,</div><div class='add'>+	0xe6, 0x36, 0x41, 0x5b, 0x42, 0x74, 0x33, 0xb9, 0x5d, 0x1c, 0x3d, 0x18,</div><div class='add'>+	0x4d, 0xd4, 0x69, 0x5b, 0xa0, 0xc9, 0x7a, 0x33, 0xff, 0x7a, 0xb0, 0x3f,</div><div class='add'>+	0x81, 0x68, 0xd1, 0xa5, 0x95, 0xe4, 0x5b, 0x88, 0x3a, 0x18, 0xa3, 0x1e,</div><div class='add'>+	0x4d, 0xd4, 0x35, 0x6f, 0xe3, 0x98, 0xfc, 0x2b, 0x7b, 0x30, 0x9c, 0x68,</div><div class='add'>+	0xfc, 0x2b, 0xc6, 0x11, 0x7f, 0x99, 0xcd, 0x75, 0xe2, 0x7f, 0xbd, 0x97,</div><div class='add'>+	0x38, 0xb0, 0x29, 0xbf, 0xe6, 0xd5, 0x96, 0xf8, 0x35, 0xe5, 0xb7, 0x85,</div><div class='add'>+	0x64, 0xbd, 0x4f, 0x2a, 0x37, 0xc1, 0x3c, 0xff, 0x04, 0xd6, 0xf5, 0x2b,</div><div class='add'>+	0x78, 0xd2, 0x38, 0x81, 0xb5, 0x43, 0x22, 0xcf, 0x09, 0xac, 0xe9, 0x7f,</div><div class='add'>+	0x09, 0x7b, 0xfa, 0x67, 0xa0, 0xc9, 0xd6, 0x4d, 0x07, 0x36, 0xec, 0x3c,</div><div class='add'>+	0x88, 0xed, 0x29, 0x0b, 0xdb, 0x42, 0x1e, 0xac, 0x7f, 0x58, 0xc1, 0xf2,</div><div class='add'>+	0xc0, 0x61, 0x6c, 0xd9, 0x69, 0xe1, 0xe2, 0x50, 0x27, 0x9a, 0xcd, 0x32,</div><div class='add'>+	0x14, 0x57, 0xcd, 0x6b, 0x57, 0x59, 0xae, 0x6d, 0xb8, 0x23, 0xbf, 0x2f,</div><div class='add'>+	0x79, 0x3f, 0xb1, 0x40, 0x85, 0xcf, 0x90, 0x3d, 0xc7, 0x51, 0xe5, 0xa6,</div><div class='add'>+	0x4c, 0x93, 0xd2, 0x9a, 0x7f, 0x66, 0x79, 0x7d, 0xa6, 0xa8, 0x02, 0xa5,</div><div class='add'>+	0x71, 0xec, 0x09, 0x9d, 0xc0, 0xd0, 0xd0, 0x07, 0xe5, 0x39, 0x7f, 0x99,</div><div class='add'>+	0x20, 0x77, 0x90, 0x9c, 0xc3, 0xa4, 0x4d, 0x7d, 0xd2, 0xfb, 0x40, 0x62,</div><div class='add'>+	0x77, 0x93, 0xf8, 0xe9, 0xe0, 0x49, 0x9c, 0x1c, 0xfc, 0x37, 0x2c, 0xd1,</div><div class='add'>+	0x24, 0x7f, 0xb4, 0x3a, 0x9d, 0x11, 0xcb, 0xda, 0xd5, 0x10, 0xb7, 0x6a,</div><div class='add'>+	0x8c, 0x5f, 0xb0, 0xed, 0x0a, 0x4c, 0x8f, 0xbc, 0x88, 0x6d, 0x1a, 0xdb,</div><div class='add'>+	0x4a, 0xed, 0xc7, 0x0e, 0xc6, 0x75, 0x5f, 0xe4, 0x66, 0xf8, 0x52, 0x59,</div><div class='add'>+	0xb3, 0x1a, 0xd1, 0x1d, 0xd5, 0xd0, 0x37, 0x56, 0x39, 0x8c, 0x8e, 0x7f,</div><div class='add'>+	0x55, 0xea, 0x71, 0x7d, 0xe6, 0x24, 0x7e, 0x3e, 0x68, 0xef, 0xa5, 0x6a,</div><div class='add'>+	0xfd, 0xae, 0x62, 0x75, 0x6e, 0x0b, 0xe9, 0xcd, 0xff, 0x43, 0x89, 0xc6,</div><div class='add'>+	0x4b, 0x69, 0x53, 0x25, 0xcc, 0x09, 0x6e, 0x18, 0x94, 0x1c, 0xb1, 0x15,</div><div class='add'>+	0xee, 0x3e, 0x3d, 0xbb, 0x94, 0x3c, 0xfb, 0xee, 0x05, 0xf1, 0x99, 0xd3,</div><div class='add'>+	0x68, 0x97, 0x0e, 0x45, 0x0f, 0x1a, 0x6a, 0x27, 0x8e, 0x98, 0xfa, 0xc4,</div><div class='add'>+	0xef, 0x1c, 0xc6, 0xd0, 0x77, 0x50, 0x8f, 0x55, 0x19, 0x7d, 0xe8, 0x32,</div><div class='add'>+	0xe6, 0x61, 0x5b, 0x92, 0x26, 0x52, 0x49, 0xbd, 0xb5, 0xc3, 0xd1, 0x8b,</div><div class='add'>+	0x3b, 0x02, 0xb5, 0x1b, 0xdf, 0x25, 0x97, 0xf3, 0x10, 0x53, 0x92, 0xe3,</div><div class='add'>+	0x23, 0xcc, 0x5f, 0x7b, 0xb1, 0xe1, 0xe1, 0x08, 0xd6, 0xef, 0x32, 0xd1,</div><div class='add'>+	0x93, 0x1c, 0xa1, 0x6c, 0x3f, 0x2c, 0x97, 0xbd, 0x34, 0x2d, 0xa1, 0xf8,</div><div class='add'>+	0xb5, 0x2a, 0x02, 0x51, 0xf6, 0xd9, 0xa8, 0x46, 0x02, 0x7e, 0x55, 0x61,</div><div class='add'>+	0xf4, 0x1f, 0x77, 0xa2, 0x9b, 0x65, 0xfa, 0x52, 0xb4, 0xb9, 0xa4, 0x9b,</div><div class='add'>+	0xf1, 0x72, 0x16, 0x86, 0xc7, 0x7c, 0xd8, 0x37, 0xe6, 0xc1, 0xd0, 0x98,</div><div class='add'>+	0xc6, 0xa3, 0x14, 0x0f, 0x0d, 0xc8, 0x9e, 0x14, 0x2f, 0x9e, 0xd8, 0xeb,</div><div class='add'>+	0xc6, 0xa6, 0x07, 0x3c, 0x98, 0x13, 0x99, 0x8e, 0xbd, 0x7b, 0x4b, 0xb1,</div><div class='add'>+	0x9b, 0xd7, 0xab, 0x16, 0xfa, 0xf1, 0x38, 0xaf, 0xf7, 0x3f, 0xe0, 0xe2,</div><div class='add'>+	0x3c, 0x5c, 0x8c, 0x03, 0x34, 0xec, 0xa1, 0xb1, 0x32, 0xa4, 0x06, 0x68,</div><div class='add'>+	0xf2, 0xe4, 0xac, 0x6f, 0x31, 0xc3, 0x18, 0xdd, 0xcb, 0xd8, 0xf8, 0xb0,</div><div class='add'>+	0x89, 0x04, 0xfb, 0xd9, 0x4e, 0x5d, 0xf5, 0x10, 0xd7, 0x36, 0x8c, 0x09,</div><div class='add'>+	0xc6, 0xaf, 0xc2, 0x35, 0x7d, 0x7a, 0x73, 0x93, 0x62, 0x44, 0x17, 0xd9,</div><div class='add'>+	0xfb, 0xb4, 0xe4, 0xbd, 0xad, 0x55, 0x68, 0x4c, 0xe8, 0x66, 0x13, 0x3a,</div><div class='add'>+	0x71, 0x8c, 0xe3, 0xfe, 0x7f, 0xe8, 0xb7, 0x8b, 0x1d, 0x7a, 0xef, 0xd5,</div><div class='add'>+	0xea, 0x41, 0xec, 0xc8, 0x1c, 0x22, 0x57, 0x07, 0xc2, 0x7b, 0x0e, 0x92,</div><div class='add'>+	0xbf, 0x1d, 0x21, 0xfe, 0xbc, 0x6e, 0xf9, 0x0c, 0x15, 0xd7, 0xdf, 0x6f,</div><div class='add'>+	0x84, 0xdf, 0x53, 0x02, 0x1b, 0x7f, 0x45, 0x1d, 0x7c, 0x7e, 0xaf, 0x8a,</div><div class='add'>+	0xeb, 0x76, 0x2c, 0x46, 0x3a, 0x14, 0xc5, 0xf6, 0x45, 0x2a, 0xae, 0x7d,</div><div class='add'>+	0xf8, 0x20, 0x71, 0x7f, 0xc2, 0xe6, 0xc9, 0xd9, 0xf4, 0x7d, 0x08, 0xf6,</div><div class='add'>+	0xc9, 0x9a, 0xbc, 0x9b, 0xf1, 0xbb, 0x1c, 0xc7, 0xfb, 0x3b, 0xe9, 0xb7,</div><div class='add'>+	0xe5, 0x38, 0x3a, 0x74, 0x90, 0xf6, 0x58, 0x8e, 0x23, 0xfd, 0xc6, 0xc4,</div><div class='add'>+	0x4f, 0x1d, 0xe5, 0x78, 0x82, 0xe7, 0x3b, 0x78, 0xbe, 0x70, 0xc0, 0xe8,</div><div class='add'>+	0xef, 0x50, 0xcb, 0xb1, 0x60, 0x4f, 0x03, 0xfa, 0x93, 0x62, 0x9b, 0x1a,</div><div class='add'>+	0x36, 0x8e, 0xd5, 0xe7, 0x75, 0x2f, 0x3a, 0xf7, 0xe2, 0x4e, 0xea, 0xea,</div><div class='add'>+	0x8e, 0x1d, 0x9d, 0xec, 0xcf, 0x47, 0x9d, 0x1f, 0xc4, 0x43, 0xcc, 0xeb,</div><div class='add'>+	0xb6, 0x25, 0x7d, 0x38, 0x9d, 0x32, 0xfc, 0x5f, 0x52, 0x0c, 0xb3, 0x44,</div><div class='add'>+	0x09, 0x68, 0xc7, 0xe1, 0xc3, 0xc9, 0x4c, 0x29, 0xba, 0x07, 0x66, 0xe1,</div><div class='add'>+	0xa7, 0xb4, 0xcf, 0x07, 0x1f, 0x90, 0xfe, 0x26, 0x18, 0x1f, 0x66, 0xe3,</div><div class='add'>+	0x89, 0x11, 0x93, 0x6d, 0xcb, 0x3c, 0x49, 0xcc, 0xe9, 0x81, 0x2b, 0x25,</div><div class='add'>+	0xbe, 0x11, 0xdd, 0x41, 0xb3, 0x20, 0x26, 0x1e, 0x46, 0xa6, 0x5f, 0xef,</div><div class='add'>+	0xbd, 0x41, 0x15, 0x5e, 0xad, 0x52, 0x97, 0x0e, 0x4c, 0x6a, 0x7a, 0xbc,</div><div class='add'>+	0x4a, 0x8d, 0xf7, 0x33, 0x7f, 0x8d, 0x57, 0xab, 0x87, 0xf1, 0x44, 0xbf,</div><div class='add'>+	0x13, 0xf3, 0x16, 0xaa, 0xbc, 0x1e, 0x3f, 0xc3, 0xd8, 0x16, 0x9f, 0xa3,</div><div class='add'>+	0x9a, 0xd8, 0x6d, 0xcb, 0x8a, 0x78, 0x11, 0xb9, 0x7d, 0xe5, 0xc2, 0x5a,</div><div class='add'>+	0xc6, 0x2f, 0x87, 0xd8, 0x5e, 0xac, 0x5c, 0x75, 0x52, 0xef, 0x27, 0x31,</div><div class='add'>+	0x42, 0xbb, 0x7e, 0x94, 0xc7, 0x81, 0x41, 0xab, 0x73, 0x39, 0x39, 0xf7,</div><div class='add'>+	0xc5, 0x01, 0xab, 0xf3, 0x06, 0xd3, 0xf0, 0x15, 0xa9, 0x81, 0xe8, 0xdd,</div><div class='add'>+	0x38, 0x89, 0xfd, 0x23, 0x52, 0x06, 0x6e, 0x6f, 0x84, 0x79, 0x75, 0xd2,</div><div class='add'>+	0xea, 0xdc, 0x61, 0x5e, 0x8c, 0x06, 0x3b, 0x37, 0xfe, 0x55, 0x79, 0x0e,</div><div class='add'>+	0x33, 0xc5, 0x8f, 0x64, 0x0d, 0x64, 0x12, 0xbf, 0x62, 0x3b, 0xef, 0x0d,</div><div class='add'>+	0x56, 0x62, 0x5a, 0xb5, 0xf8, 0xc1, 0x09, 0xbc, 0xdd, 0xff, 0x22, 0x4e,</div><div class='add'>+	0xf7, 0x5b, 0x58, 0x10, 0xb2, 0xe0, 0x0c, 0xd5, 0x99, 0x4d, 0xea, 0x65,</div><div class='add'>+	0xc4, 0x08, 0x05, 0xd7, 0xcc, 0x7d, 0x09, 0xef, 0xd0, 0xff, 0xaf, 0x9d,</div><div class='add'>+	0x6b, 0xd9, 0xb2, 0xf4, 0x61, 0xa1, 0xb5, 0xbd, 0x46, 0xfc, 0xc6, 0xb4,</div><div class='add'>+	0xf7, 0xf5, 0x7c, 0x72, 0x1e, 0x5c, 0xd8, 0xb7, 0x26, 0xb9, 0xf0, 0x49,</div><div class='add'>+	0x0c, 0x0f, 0x1a, 0xd1, 0x75, 0x05, 0x39, 0xfb, 0x4f, 0x52, 0x07, 0x16,</div><div class='add'>+	0x76, 0x98, 0x47, 0x1f, 0xae, 0xc2, 0xbc, 0x33, 0xcc, 0x1a, 0xaf, 0x98,</div><div class='add'>+	0x43, 0xdb, 0x59, 0xb0, 0x30, 0x60, 0x2e, 0x53, 0xdf, 0xa4, 0x9f, 0x9e,</div><div class='add'>+	0xc4, 0xbe, 0xa1, 0x02, 0x5e, 0xfb, 0xd0, 0x44, 0x3f, 0xcf, 0xed, 0x65,</div><div class='add'>+	0xf7, 0xa2, 0x31, 0x75, 0xc8, 0x5e, 0x7f, 0x38, 0x40, 0x7c, 0xcc, 0x3d,</div><div class='add'>+	0xd3, 0xd4, 0x30, 0x92, 0x69, 0x22, 0x36, 0x44, 0xf1, 0xcf, 0x99, 0x08,</div><div class='add'>+	0xf1, 0x21, 0x4c, 0x7c, 0x68, 0x20, 0x3e, 0x98, 0xc4, 0x87, 0x7a, 0xe2,</div><div class='add'>+	0x43, 0xd0, 0x7e, 0xd6, 0x2f, 0x6b, 0xe6, 0x43, 0xa3, 0x2f, 0xa2, 0x68,</div><div class='add'>+	0xe0, 0x04, 0x5c, 0xf4, 0x81, 0xe3, 0xa6, 0x45, 0x7e, 0x52, 0xa7, 0xad,</div><div class='add'>+	0xc1, 0xc5, 0x4a, 0x54, 0xf3, 0x62, 0x28, 0x73, 0x02, 0x25, 0x03, 0x1a,</div><div class='add'>+	0xc7, 0x22, 0xfb, 0x33, 0x6a, 0xc3, 0xbd, 0xc4, 0xea, 0x5f, 0x1b, 0x75,</div><div class='add'>+	0xbd, 0x5e, 0xd4, 0xed, 0xae, 0x81, 0xd1, 0xbf, 0x50, 0x9d, 0xab, 0x44,</div><div class='add'>+	0xbf, 0xe0, 0xe5, 0x38, 0xab, 0x31, 0xfb, 0x01, 0x0d, 0x73, 0x78, 0xfc,</div><div class='add'>+	0x53, 0xaa, 0x76, 0xe2, 0x75, 0x07, 0xbc, 0x33, 0x48, 0x77, 0x66, 0x92,</div><div class='add'>+	0x09, 0x90, 0xd5, 0x7a, 0x7d, 0xb8, 0xe4, 0xc0, 0x49, 0x55, 0x41, 0xf6,</div><div class='add'>+	0x0b, 0x12, 0xf3, 0xea, 0x82, 0x3d, 0xaa, 0x2a, 0x6b, 0x48, 0xc4, 0x70,</div><div class='add'>+	0x1e, 0x2a, 0x22, 0x64, 0x11, 0xb3, 0x98, 0x5f, 0x58, 0x6b, 0xcc, 0x12,</div><div class='add'>+	0x6c, 0xae, 0x57, 0x65, 0x6f, 0xc8, 0x21, 0x89, 0x51, 0x33, 0x18, 0x23,</div><div class='add'>+	0x4a, 0x93, 0xf1, 0xdb, 0x66, 0xc0, 0x83, 0x92, 0xa4, 0x65, 0x3d, 0x16,</div><div class='add'>+	0xd2, 0xe0, 0x89, 0x04, 0xa2, 0x1b, 0x98, 0x46, 0x7e, 0x61, 0x5e, 0x18,</div><div class='add'>+	0xd7, 0x64, 0x0e, 0x60, 0x80, 0xe3, 0x5b, 0x9e, 0x29, 0xbc, 0xe3, 0xf9,</div><div class='add'>+	0xc9, 0x7f, 0xe7, 0xde, 0x15, 0xbd, 0x64, 0xf7, 0x0c, 0x18, 0xda, 0x5d,</div><div class='add'>+	0x6a, 0xbc, 0x92, 0x1c, 0xfc, 0x00, 0xe3, 0x9e, 0x32, 0x79, 0xa3, 0x82,</div><div class='add'>+	0xd6, 0x81, 0x38, 0xa6, 0x85, 0x7e, 0xa0, 0xc4, 0xaa, 0x75, 0xbf, 0x5f,</div><div class='add'>+	0xa9, 0xc6, 0x8d, 0x0f, 0x50, 0xd7, 0x0b, 0x26, 0x68, 0x2b, 0x3e, 0x7c,</div><div class='add'>+	0x67, 0x54, 0x74, 0x5b, 0x3b, 0xb4, 0x83, 0xe3, 0x98, 0x98, 0x7b, 0x40,</div><div class='add'>+	0x70, 0xf2, 0xa0, 0x1b, 0x8e, 0x83, 0xd3, 0x99, 0x9b, 0xd6, 0xcf, 0xbd,</div><div class='add'>+	0xa4, 0xe3, 0xdf, 0x54, 0xd1, 0x8b, 0xf0, 0x6b, 0xbd, 0x3f, 0xae, 0x18,</div><div class='add'>+	0xda, 0x2f, 0x95, 0x03, 0xe4, 0x6c, 0x5e, 0x3c, 0x96, 0x39, 0x4c, 0x5d,</div><div class='add'>+	0xee, 0xcf, 0xe7, 0x4b, 0xab, 0x90, 0xe8, 0x93, 0x7d, 0x81, 0x27, 0x30,</div><div class='add'>+	0x7b, 0x40, 0x6f, 0xd9, 0xaa, 0x18, 0xc1, 0x6b, 0x95, 0x13, 0x98, 0x39,</div><div class='add'>+	0x10, 0xe4, 0x5c, 0x6a, 0x58, 0x96, 0x2c, 0xe0, 0xa7, 0x60, 0xf0, 0x2a,</div><div class='add'>+	0x62, 0xb0, 0xb5, 0xf8, 0xa7, 0x66, 0x9c, 0x39, 0x8e, 0x6e, 0x3a, 0x15,</div><div class='add'>+	0xbd, 0x75, 0xae, 0x22, 0xfb, 0x80, 0x8c, 0x33, 0x6d, 0xac, 0xe3, 0x19,</div><div class='add'>+	0xa8, 0xc7, 0x57, 0x39, 0xe6, 0x66, 0xce, 0xdb, 0x8b, 0x0b, 0x2d, 0x2c,</div><div class='add'>+	0x5a, 0xa8, 0xef, 0x2e, 0x71, 0x44, 0xef, 0xaa, 0x42, 0xb6, 0xa3, 0x86,</div><div class='add'>+	0x76, 0x73, 0xc7, 0x02, 0x3d, 0xfc, 0x03, 0xe2, 0x2e, 0x71, 0x1a, 0xdd,</div><div class='add'>+	0x8c, 0x3b, 0x6b, 0x18, 0x8b, 0x4a, 0x23, 0x7a, 0x2f, 0x73, 0xd4, 0xf7,</div><div class='add'>+	0x6e, 0x75, 0x44, 0x43, 0xf2, 0x1e, 0xd1, 0xdf, 0x63, 0x31, 0xdc, 0xa1,</div><div class='add'>+	0x0a, 0xe2, 0xa0, 0x9e, 0x7d, 0x11, 0xfa, 0xee, 0xaf, 0x92, 0x93, 0xfe,</div><div class='add'>+	0x98, 0xfc, 0xae, 0xe6, 0xd2, 0x43, 0xc4, 0xa8, 0x11, 0x3c, 0x98, 0x39,</div><div class='add'>+	0x88, 0xdd, 0x99, 0x34, 0x76, 0x66, 0xb6, 0x29, 0x43, 0xf6, 0xb3, 0x45,</div><div class='add'>+	0x45, 0xde, 0x99, 0x8b, 0x56, 0x28, 0x5f, 0x46, 0x79, 0xe8, 0x5b, 0xd6,</div><div class='add'>+	0x50, 0x95, 0x8a, 0xca, 0x50, 0x10, 0xd7, 0x24, 0xe3, 0x70, 0x44, 0xde,</div><div class='add'>+	0xb5, 0xe4, 0x7d, 0xed, 0xf5, 0xe3, 0x06, 0xae, 0x4e, 0x96, 0x22, 0xb6,</div><div class='add'>+	0xc7, 0xb2, 0x7a, 0x1b, 0x9c, 0x58, 0x3b, 0x5e, 0x8f, 0x65, 0x03, 0x0f,</div><div class='add'>+	0x59, 0x73, 0x18, 0x73, 0x3e, 0xbc, 0xdc, 0x83, 0x5b, 0xf7, 0x78, 0xd0,</div><div class='add'>+	0x96, 0x8c, 0xc2, 0x17, 0x29, 0xe3, 0xef, 0x80, 0xb9, 0x04, 0xc6, 0xc4,</div><div class='add'>+	0x04, 0x8c, 0xde, 0xab, 0x1c, 0x81, 0xfd, 0x61, 0xd5, 0x83, 0xbf, 0x21,</div><div class='add'>+	0x8e, 0x2f, 0x27, 0xee, 0xc4, 0xc6, 0x2d, 0x54, 0x46, 0xbc, 0xb8, 0x8d,</div><div class='add'>+	0xf5, 0xaf, 0xe3, 0xdc, 0xbf, 0xb3, 0x68, 0x3f, 0xb1, 0x40, 0xf6, 0x42,</div><div class='add'>+	0x6a, 0xd8, 0x30, 0xee, 0xa6, 0xae, 0xdc, 0x88, 0xed, 0xab, 0xc6, 0xd5,</div><div class='add'>+	0x0f, 0xf8, 0x71, 0xeb, 0xb8, 0x07, 0x8d, 0x49, 0x6b, 0xf1, 0x01, 0x33,</div><div class='add'>+	0xbe, 0x52, 0x83, 0x81, 0xb6, 0x71, 0x2f, 0xbe, 0x92, 0xd4, 0x7d, 0xd7,</div><div class='add'>+	0x32, 0xe7, 0x1f, 0x31, 0x83, 0xf8, 0x5f, 0xe3, 0x3e, 0xdc, 0x94, 0x3c,</div><div class='add'>+	0x2a, 0x79, 0xe4, 0x12, 0x27, 0x63, 0xcf, 0xbd, 0xe3, 0xb3, 0xb0, 0x32,</div><div class='add'>+	0xa9, 0x9f, 0x99, 0x20, 0xb7, 0xeb, 0xdc, 0x67, 0xe2, 0xae, 0x71, 0x15,</div><div class='add'>+	0xad, 0x6c, 0xe7, 0xc6, 0xe4, 0x6c, 0x74, 0xec, 0x6b, 0xa0, 0x0c, 0x0b,</div><div class='add'>+	0xb1, 0x7c, 0xc0, 0x09, 0x93, 0x2c, 0x1e, 0x5f, 0x04, 0x5a, 0x06, 0x26,</div><div class='add'>+	0x98, 0xc7, 0xdd, 0x87, 0xed, 0x7d, 0x26, 0x6e, 0x1f, 0x97, 0xf3, 0x83,</div><div class='add'>+	0xf6, 0x3b, 0xae, 0xef, 0x3d, 0xbc, 0x10, 0x9f, 0x1f, 0x50, 0x89, 0x03,</div><div class='add'>+	0xc5, 0x18, 0x5a, 0xa9, 0xe0, 0x2b, 0xbc, 0xbe, 0x35, 0x25, 0x7b, 0x90,</div><div class='add'>+	0x81, 0xd0, 0x8e, 0xc0, 0xfe, 0x2a, 0x72, 0x86, 0x45, 0x0f, 0xe7, 0xae,</div><div class='add'>+	0x3f, 0x48, 0x9c, 0x2f, 0x21, 0xce, 0x97, 0x91, 0xc3, 0x5e, 0x35, 0x7c,</div><div class='add'>+	0x10, 0xf7, 0x13, 0x97, 0x0f, 0x0d, 0x74, 0x32, 0xee, 0x94, 0xe3, 0x71,</div><div class='add'>+	0xc6, 0x81, 0x24, 0xcf, 0x4f, 0xec, 0x30, 0x3a, 0x4a, 0x88, 0xd3, 0x3f,</div><div class='add'>+	0x20, 0xfe, 0xf6, 0x12, 0x33, 0xee, 0x48, 0x32, 0xdc, 0xef, 0x60, 0x0e,</div><div class='add'>+	0x70, 0x69, 0x74, 0xbe, 0x87, 0x39, 0xd6, 0xb5, 0x4a, 0xc0, 0xf7, 0x26,</div><div class='add'>+	0xca, 0xe1, 0x78, 0xb8, 0x1a, 0x8d, 0x0f, 0x48, 0x19, 0xc1, 0x2f, 0x15,</div><div class='add'>+	0xea, 0x5e, 0x27, 0x75, 0x7e, 0x18, 0x56, 0xbf, 0x83, 0xe3, 0xad, 0x35,</div><div class='add'>+	0xc9, 0xc0, 0xf1, 0x9a, 0xa9, 0x6b, 0xff, 0x4c, 0xac, 0x7d, 0x9f, 0x98,</div><div class='add'>+	0xea, 0x9f, 0xd1, 0x80, 0x26, 0xc3, 0xe4, 0x71, 0x18, 0x27, 0xfb, 0x0d,</div><div class='add'>+	0x53, 0xf6, 0xe4, 0xbd, 0x4e, 0x9e, 0x37, 0x39, 0x83, 0x31, 0xd3, 0x10,</div><div class='add'>+	0x3f, 0x1c, 0xe1, 0x78, 0x54, 0xc9, 0x4b, 0xe0, 0x18, 0x03, 0xde, 0x7e,</div><div class='add'>+	0x78, 0x31, 0xc7, 0x25, 0xb1, 0x54, 0xe2, 0xdd, 0x08, 0x65, 0x5d, 0x8c,</div><div class='add'>+	0x15, 0xd4, 0x47, 0x53, 0x52, 0x45, 0x7a, 0x5f, 0x04, 0xb7, 0xef, 0xca,</div><div class='add'>+	0xc5, 0xe1, 0x8d, 0xa1, 0xf8, 0x0d, 0x8c, 0xc3, 0xe1, 0x52, 0xc6, 0x61,</div><div class='add'>+	0x57, 0x44, 0x64, 0x73, 0x62, 0x98, 0x71, 0x7b, 0x73, 0x2a, 0x8c, 0x66,</div><div class='add'>+	0xce, 0xe1, 0x44, 0x9a, 0xfd, 0x26, 0x67, 0xe1, 0x78, 0xda, 0xc3, 0x98,</div><div class='add'>+	0xa5, 0xf1, 0x20, 0xaa, 0x8d, 0x4c, 0xe7, 0xe1, 0xe7, 0x71, 0x31, 0x0f,</div><div class='add'>+	0xc3, 0xbe, 0xb6, 0x26, 0xa9, 0x20, 0xde, 0xa2, 0xd8, 0x7c, 0xfe, 0x78,</div><div class='add'>+	0x5a, 0xb0, 0x59, 0xd6, 0x32, 0xef, 0xae, 0x94, 0x3d, 0xa8, 0xfd, 0xa9,</div><div class='add'>+	0x97, 0x50, 0x49, 0x7c, 0xaa, 0xc8, 0xe3, 0xd0, 0xcf, 0x42, 0x82, 0xbb,</div><div class='add'>+	0xb5, 0xc4, 0x5d, 0xd9, 0x4f, 0x64, 0x59, 0xab, 0x02, 0x53, 0xf1, 0xe8,</div><div class='add'>+	0xff, 0xfb, 0x30, 0x6a, 0xef, 0xab, 0x15, 0x4c, 0x22, 0xfe, 0xa5, 0x88,</div><div class='add'>+	0x7f, 0x1c, 0x43, 0xd7, 0x95, 0xc4, 0x40, 0xca, 0xf4, 0x8f, 0x29, 0x62,</div><div class='add'>+	0x20, 0x71, 0xfa, 0x20, 0x71, 0xfa, 0xdb, 0xc4, 0xe9, 0x6f, 0x11, 0xa7,</div><div class='add'>+	0x1f, 0x27, 0x26, 0xe4, 0xd6, 0xf4, 0x9a, 0xe5, 0xb9, 0x0a, 0xe7, 0xe3,</div><div class='add'>+	0x1d, 0x7b, 0x6d, 0xb1, 0x86, 0xba, 0x9a, 0x3d, 0xa0, 0x60, 0x8e, 0xa1,</div><div class='add'>+	0xef, 0x17, 0xbb, 0xff, 0x31, 0xe7, 0xc9, 0x3f, 0x2d, 0xb7, 0xe7, 0xb7,</div><div class='add'>+	0x29, 0xd9, 0x03, 0x77, 0xb2, 0x4e, 0xeb, 0x85, 0xfd, 0x0d, 0x01, 0x53,</div><div class='add'>+	0xb8, 0x68, 0x51, 0x72, 0x0d, 0x1c, 0xc9, 0xba, 0xfd, 0xc7, 0xe4, 0xf9,</div><div class='add'>+	0xed, 0x74, 0xc9, 0xeb, 0xd7, 0xc8, 0x1e, 0xed, 0xfd, 0xb2, 0x37, 0x6c,</div><div class='add'>+	0x19, 0xef, 0xb9, 0x92, 0x75, 0xe6, 0x9b, 0xb0, 0xb1, 0xcd, 0x3f, 0x69,</div><div class='add'>+	0xdf, 0xab, 0x7d, 0xef, 0x7e, 0xea, 0x2b, 0xcb, 0x36, 0xd3, 0x29, 0xd9,</div><div class='add'>+	0x17, 0x3b, 0x0b, 0x8f, 0x66, 0xe4, 0x77, 0x5d, 0x6b, 0x42, 0xdd, 0x8f,</div><div class='add'>+	0x58, 0x8d, 0xf0, 0xf1, 0x30, 0xae, 0x4f, 0x7a, 0x68, 0x07, 0x71, 0x54,</div><div class='add'>+	0xd0, 0xb7, 0xbe, 0x36, 0xde, 0x40, 0x5f, 0x7b, 0xc8, 0xd2, 0x22, 0x81,</div><div class='add'>+	0xd6, 0x71, 0x72, 0x9e, 0xf5, 0xe3, 0x8b, 0xb1, 0x74, 0xc0, 0xb2, 0x3c,</div><div class='add'>+	0x97, 0x19, 0xe1, 0x0d, 0x8a, 0x1f, 0x2e, 0xfa, 0xa0, 0x83, 0x7e, 0xb5,</div><div class='add'>+	0x6e, 0x4f, 0x40, 0x7b, 0x93, 0x78, 0xda, 0xde, 0x70, 0x80, 0xf6, 0x61,</div><div class='add'>+	0x9c, 0x69, 0x26, 0x96, 0x3a, 0x23, 0x01, 0xe6, 0x89, 0x1e, 0xda, 0xbe,</div><div class='add'>+	0x17, 0x67, 0x12, 0xe2, 0x5f, 0x7a, 0xc7, 0x3f, 0x33, 0x37, 0xe9, 0xa0,</div><div class='add'>+	0x6f, 0xfc, 0x32, 0x31, 0x8b, 0x3e, 0xe0, 0xc6, 0xdb, 0x09, 0x83, 0xfe,</div><div class='add'>+	0xe6, 0xc1, 0x3b, 0x89, 0x7a, 0xf6, 0x15, 0x64, 0x19, 0x3f, 0xee, 0x1c,</div><div class='add'>+	0x0f, 0xd3, 0xcf, 0xae, 0xe4, 0x21, 0xef, 0x53, 0xd7, 0xc6, 0xbf, 0xa3,</div><div class='add'>+	0xd4, 0xf6, 0xcf, 0x56, 0xab, 0x10, 0xad, 0xd6, 0xf0, 0xf5, 0xf1, 0xcf,</div><div class='add'>+	0xe2, 0x3f, 0x18, 0xb7, 0xd7, 0x26, 0xc1, 0x39, 0x44, 0x88, 0x3c, 0x70,</div><div class='add'>+	0x62, 0x9f, 0x3c, 0x4b, 0x44, 0x5d, 0x74, 0xae, 0x43, 0x67, 0x6e, 0xab,</div><div class='add'>+	0x67, 0x4f, 0x3b, 0x9c, 0xec, 0x93, 0xac, 0x98, 0x65, 0x7f, 0xd9, 0x5f,</div><div class='add'>+	0x8a, 0xbb, 0xf6, 0x1c, 0xa0, 0x8f, 0x14, 0x61, 0xc1, 0xfd, 0x6e, 0x7c,</div><div class='add'>+	0x7d, 0xdf, 0x08, 0xb9, 0x83, 0x8a, 0x99, 0xcc, 0x95, 0x86, 0x48, 0x14,</div><div class='add'>+	0x66, 0x0e, 0x47, 0x70, 0xdb, 0xae, 0x11, 0x0c, 0xe4, 0x79, 0x5e, 0x28,</div><div class='add'>+	0x14, 0xff, 0x9f, 0x2a, 0x0e, 0x90, 0x47, 0x04, 0xda, 0x3f, 0x43, 0x1b,</div><div class='add'>+	0xab, 0x88, 0x04, 0xe2, 0x32, 0xee, 0x16, 0xda, 0x58, 0x0f, 0xe7, 0x33,</div><div class='add'>+	0xcd, 0x71, 0x24, 0x68, 0x63, 0x8f, 0x51, 0xfe, 0xed, 0xb4, 0xb1, 0x38,</div><div class='add'>+	0x6d, 0x2c, 0x4e, 0x7b, 0x8a, 0xd3, 0xc6, 0xe4, 0x9d, 0xfd, 0x38, 0x6d,</div><div class='add'>+	0x2c, 0x4e, 0x1b, 0x8b, 0xa7, 0x17, 0x63, 0x94, 0x4c, 0x63, 0xcb, 0x48,</div><div class='add'>+	0x03, 0x71, 0x4c, 0xb1, 0xa3, 0x52, 0xf6, 0x86, 0xcf, 0x92, 0xb3, 0x5f,</div><div class='add'>+	0xc5, 0x43, 0x41, 0x33, 0x7d, 0xb2, 0x77, 0x68, 0x84, 0x9c, 0xc7, 0x8d,</div><div class='add'>+	0xdf, 0x64, 0x84, 0xe3, 0x37, 0x30, 0x8f, 0x3d, 0x4c, 0x9e, 0xaf, 0xe2,</div><div class='add'>+	0x49, 0x53, 0xf2, 0x60, 0x93, 0xe7, 0x8c, 0x35, 0x29, 0xe1, 0x6b, 0x87,</div><div class='add'>+	0x71, 0x47, 0x3f, 0x70, 0x2d, 0x79, 0x61, 0x35, 0x79, 0xc9, 0xde, 0x05,</div><div class='add'>+	0xfc, 0xfd, 0xf0, 0x01, 0xda, 0xbc, 0xf8, 0x63, 0x6e, 0xaf, 0xeb, 0xf1,</div><div class='add'>+	0xfe, 0x5a, 0xdf, 0xd5, 0xf4, 0xc1, 0x7b, 0x59, 0xd7, 0xf9, 0xb0, 0xd4,</div><div class='add'>+	0x39, 0xc0, 0xb6, 0xf5, 0xf0, 0x6f, 0x38, 0xff, 0xad, 0xf7, 0x57, 0xe3,</div><div class='add'>+	0xed, 0x5d, 0x7a, 0xf8, 0x7d, 0x62, 0x5e, 0xb5, 0xc3, 0x5a, 0xfc, 0x99,</div><div class='add'>+	0x50, 0x60, 0xe3, 0x67, 0xd4, 0x1c, 0xdf, 0x6b, 0xd9, 0xe1, 0xc4, 0xfe,</div><div class='add'>+	0xd0, 0x62, 0x78, 0x16, 0x14, 0x38, 0x1f, 0x6d, 0xa9, 0x5a, 0x38, 0x96,</div><div class='add'>+	0x1e, 0x3e, 0x4d, 0xae, 0x92, 0x64, 0xfb, 0xa3, 0xe9, 0x23, 0xc4, 0x90,</div><div class='add'>+	0xfb, 0xf0, 0x02, 0xf3, 0xf3, 0x91, 0x4f, 0xbf, 0x4e, 0xee, 0xe8, 0xc6,</div><div class='add'>+	0x18, 0x39, 0xe0, 0x81, 0xfe, 0xe8, 0xe7, 0x9c, 0xc4, 0x7d, 0xcf, 0x82,</div><div class='add'>+	0x72, 0xa4, 0x87, 0x84, 0x2b, 0x96, 0xe3, 0xd9, 0x7e, 0x43, 0xbb, 0x56,</div><div class='add'>+	0xc9, 0xf1, 0xc2, 0x2d, 0x3c, 0x7f, 0xb3, 0xdf, 0x38, 0x33, 0x8c, 0xc0,</div><div class='add'>+	0xc4, 0x69, 0x72, 0xc3, 0xf7, 0x87, 0x24, 0x86, 0x1d, 0xa4, 0x8f, 0xfb,</div><div class='add'>+	0x11, 0x4e, 0x6a, 0x38, 0x34, 0x66, 0x60, 0x7e, 0xd2, 0x8b, 0x47, 0xc6,</div><div class='add'>+	0x82, 0xf8, 0x0c, 0x7d, 0x37, 0x43, 0x7e, 0xf8, 0xe9, 0xa4, 0xf8, 0xe2,</div><div class='add'>+	0x2c, 0x8c, 0x8f, 0xcd, 0xb2, 0xf7, 0x54, 0x7a, 0x8c, 0x5f, 0xc0, 0x53,</div><div class='add'>+	0x2d, 0x3e, 0x49, 0x6e, 0x9d, 0xd2, 0x7b, 0x63, 0x1c, 0x4f, 0xcc, 0xab,</div><div class='add'>+	0xef, 0x8f, 0x41, 0x1f, 0x02, 0xae, 0xf8, 0x70, 0xe8, 0x8b, 0x12, 0x1f,</div><div class='add'>+	0xc5, 0x1f, 0x35, 0x8c, 0x93, 0xef, 0x14, 0x13, 0x53, 0x4b, 0x23, 0xb5,</div><div class='add'>+	0xef, 0xbd, 0xac, 0xe8, 0xd9, 0xa7, 0x55, 0xcb, 0x7a, 0x69, 0xa1, 0x06,</div><div class='add'>+	0xdf, 0x3e, 0x8d, 0xdc, 0xc3, 0x64, 0xec, 0x16, 0x3f, 0xd5, 0x30, 0xe3,</div><div class='add'>+	0x81, 0x6a, 0x4c, 0x7b, 0x20, 0x89, 0xbf, 0xad, 0x8e, 0x7f, 0x6e, 0x3a,</div><div class='add'>+	0xe3, 0xfc, 0x74, 0xe2, 0x7a, 0x65, 0xf2, 0xd8, 0x0c, 0x37, 0xf9, 0xf2,</div><div class='add'>+	0x84, 0x5a, 0xd7, 0xba, 0x1f, 0xfa, 0xfe, 0x93, 0x8a, 0xee, 0x7b, 0x8c,</div><div class='add'>+	0xb1, 0xc1, 0x45, 0x1b, 0x75, 0x8c, 0x6b, 0xf4, 0xdd, 0xba, 0x43, 0xd3,</div><div class='add'>+	0x60, 0xc4, 0x2f, 0x57, 0x5d, 0x16, 0x6c, 0x79, 0xae, 0xa8, 0xcc, 0xe5,</div><div class='add'>+	0x45, 0x82, 0x3b, 0x12, 0x17, 0x1c, 0xb2, 0xff, 0x13, 0xed, 0xf4, 0x97,</div><div class='add'>+	0x15, 0x76, 0x2c, 0x3a, 0x60, 0xef, 0x8f, 0xdb, 0x30, 0x1e, 0xa7, 0x8f,</div><div class='add'>+	0x2c, 0x46, 0xd9, 0x80, 0x07, 0x5f, 0xb3, 0xe3, 0xd0, 0x43, 0x56, 0x15,</div><div class='add'>+	0xfd, 0xe5, 0xf6, 0x3d, 0x81, 0xf6, 0xab, 0xe9, 0x2f, 0xb5, 0x97, 0x49,</div><div class='add'>+	0x0c, 0x63, 0xdc, 0x4e, 0x19, 0xe6, 0x30, 0xb1, 0xe5, 0xa1, 0x06, 0x63,</div><div class='add'>+	0xe2, 0x75, 0xe4, 0x7c, 0x66, 0x6b, 0x5f, 0x35, 0xfe, 0xe1, 0xfe, 0xfd,</div><div class='add'>+	0xf6, 0x5a, 0xc8, 0x6d, 0x3c, 0x4f, 0xf6, 0xf9, 0x6c, 0xff, 0x88, 0xf1,</div><div class='add'>+	0xf7, 0x9d, 0x8c, 0x79, 0x31, 0xfa, 0xd1, 0x96, 0x3e, 0x6b, 0xf1, 0xf7,</div><div class='add'>+	0x17, 0xc6, 0x57, 0x56, 0x20, 0xc8, 0x98, 0xe4, 0x46, 0x6f, 0x9f, 0xde,</div><div class='add'>+	0xdf, 0xca, 0x18, 0x74, 0x62, 0xa1, 0x49, 0x59, 0x3c, 0xd8, 0xd1, 0x27,</div><div class='add'>+	0x98, 0x7a, 0xf4, 0xa6, 0x6a, 0xc4, 0xff, 0xa7, 0xc6, 0xf1, 0x7d, 0xcd,</div><div class='add'>+	0x7e, 0xf6, 0x37, 0x0b, 0x6b, 0xf7, 0x5d, 0x46, 0x99, 0xeb, 0xe9, 0x83,</div><div class='add'>+	0xcc, 0xab, 0x99, 0xef, 0xac, 0xde, 0x25, 0x7e, 0x81, 0x46, 0xc9, 0xd3,</div><div class='add'>+	0x3a, 0xcd, 0x80, 0xf9, 0x06, 0x7d, 0xa8, 0x88, 0x5c, 0xe7, 0x41, 0x62,</div><div class='add'>+	0x59, 0x31, 0x21, 0xb3, 0xcc, 0x08, 0x63, 0x21, 0x6d, 0x54, 0xde, 0xe1,</div><div class='add'>+	0x98, 0x46, 0x5e, 0x37, 0x9f, 0xf3, 0x51, 0x92, 0xf1, 0x00, 0xe4, 0x10,</div><div class='add'>+	0x20, 0x3e, 0x61, 0x94, 0x20, 0x38, 0xea, 0xe7, 0x71, 0x31, 0x0f, 0x2a,</div><div class='add'>+	0x22, 0xa3, 0xa2, 0x66, 0x94, 0x75, 0x87, 0x47, 0x6c, 0x5b, 0xfc, 0x07,</div><div class='add'>+	0xce, 0x7b, 0x82, 0xb6, 0x7e, 0x23, 0xb1, 0x7e, 0x62, 0x27, 0xd0, 0xfb,</div><div class='add'>+	0x70, 0xce, 0xb6, 0x53, 0x6c, 0xbf, 0x85, 0x98, 0xf7, 0x1e, 0x6d, 0xb6,</div><div class='add'>+	0x87, 0xf3, 0xbd, 0x63, 0xd0, 0x08, 0xd6, 0xa9, 0x01, 0x6d, 0x9c, 0xf3,</div><div class='add'>+	0xdc, 0x35, 0xa2, 0xa2, 0xaf, 0x7f, 0x31, 0x86, 0x99, 0x07, 0x75, 0x0f,</div><div class='add'>+	0x89, 0x8f, 0x48, 0x99, 0xc3, 0xe8, 0xa4, 0x8f, 0xfc, 0x6a, 0xa1, 0x82,</div><div class='add'>+	0xd8, 0x17, 0xe4, 0x1d, 0x51, 0x27, 0xf3, 0xfd, 0xfb, 0xb0, 0x36, 0x71,</div><div class='add'>+	0xc4, 0x2a, 0x37, 0xf4, 0xde, 0x21, 0x95, 0x79, 0x16, 0x6d, 0xb3, 0x8b,</div><div class='add'>+	0xf9, 0xc9, 0x12, 0xe6, 0x27, 0xdd, 0x79, 0xbb, 0x3c, 0x4e, 0x3b, 0xec,</div><div class='add'>+	0x63, 0x1c, 0x7b, 0x7d, 0x28, 0x17, 0xf7, 0x7e, 0xbc, 0xc3, 0x8f, 0xf9,</div><div class='add'>+	0x97, 0x97, 0xe3, 0x99, 0x87, 0x73, 0xb2, 0xed, 0xa4, 0x4d, 0x3e, 0x4d,</div><div class='add'>+	0x3d, 0xdf, 0x4a, 0xbd, 0xbe, 0x92, 0x12, 0x8c, 0x0a, 0xe2, 0x59, 0xf2,</div><div class='add'>+	0xe8, 0xf5, 0xe4, 0x02, 0x2f, 0xa5, 0x72, 0x36, 0xf9, 0xf5, 0xf1, 0x2b,</div><div class='add'>+	0xab, 0x72, 0xf1, 0xc1, 0x0b, 0xf5, 0x01, 0x79, 0x27, 0xcf, 0xb2, 0x96,</div><div class='add'>+	0x98, 0xd9, 0x76, 0xf2, 0x1a, 0xb6, 0x1d, 0x21, 0x37, 0x72, 0x62, 0x66,</div><div class='add'>+	0x32, 0x82, 0xa5, 0xa9, 0xda, 0xe6, 0xb9, 0xb2, 0x89, 0x63, 0x66, 0x8e,</div><div class='add'>+	0x03, 0xba, 0x92, 0xf2, 0xcd, 0x0f, 0x0d, 0x65, 0xcc, 0x9d, 0xfe, 0x26,</div><div class='add'>+	0xff, 0x9d, 0x91, 0x1b, 0xff, 0x0c, 0xee, 0xb8, 0x82, 0x32, 0xa5, 0xc8,</div><div class='add'>+	0x1d, 0x27, 0xf3, 0xdf, 0x19, 0xb9, 0xc1, 0xfe, 0xce, 0x88, 0x1b, 0xd3,</div><div class='add'>+	0xc6, 0x9d, 0xce, 0x2f, 0xa5, 0x3c, 0x98, 0x31, 0x7e, 0x96, 0x83, 0xba,</div><div class='add'>+	0x8b, 0x22, 0x4d, 0x78, 0x2a, 0xa1, 0x60, 0xba, 0xf1, 0xbf, 0xf1, 0xb2,</div><div class='add'>+	0xbd, 0x26, 0x50, 0x8d, 0x99, 0x0f, 0xc8, 0x7a, 0x42, 0x54, 0xde, 0x89,</div><div class='add'>+	0x69, 0x7e, 0x82, 0xe7, 0x25, 0xc4, 0xd3, 0x8a, 0x07, 0x14, 0x3c, 0x1d,</div><div class='add'>+	0xf0, 0xa2, 0x98, 0xbf, 0x7d, 0xe4, 0x9a, 0xce, 0x85, 0xcb, 0xad, 0xcd,</div><div class='add'>+	0xab, 0xc4, 0xbe, 0x39, 0x87, 0xfb, 0xa6, 0x55, 0x0a, 0x06, 0xee, 0x35,</div><div class='add'>+	0x65, 0xdd, 0xd2, 0x40, 0x4f, 0xa2, 0x9a, 0xfc, 0xba, 0xb6, 0xbd, 0x09,</div><div class='add'>+	0xb5, 0xe6, 0x2f, 0x1c, 0xd5, 0x28, 0xda, 0x77, 0x63, 0x95, 0xac, 0xd9,</div><div class='add'>+	0x7f, 0x9b, 0x73, 0xd6, 0x4d, 0xec, 0xea, 0x4a, 0xe5, 0xe2, 0x67, 0x53,</div><div class='add'>+	0xfa, 0x17, 0x9a, 0xe8, 0xa5, 0x9b, 0xfc, 0x44, 0x4d, 0x9e, 0xb2, 0xcb,</div><div class='add'>+	0x94, 0x45, 0x0e, 0x11, 0x7f, 0x66, 0xe1, 0x10, 0xf3, 0x1a, 0x89, 0xa5,</div><div class='add'>+	0x65, 0x3c, 0xca, 0xc9, 0x1b, 0x7f, 0xc9, 0x58, 0x7a, 0x67, 0x28, 0x1b,</div><div class='add'>+	0x94, 0x2f, 0xd0, 0x54, 0x91, 0x8b, 0xd3, 0x07, 0xb0, 0x2f, 0xa4, 0xb7,</div><div class='add'>+	0xac, 0x76, 0x44, 0x9f, 0x61, 0x0e, 0x16, 0x5e, 0xcc, 0x9c, 0x7c, 0x79,</div><div class='add'>+	0x60, 0x04, 0x5b, 0xc9, 0x03, 0xb7, 0x30, 0x17, 0x6f, 0xa5, 0x6d, 0xb6,</div><div class='add'>+	0xef, 0x62, 0x6c, 0x73, 0x9c, 0xcb, 0xc5, 0xb5, 0x50, 0x7c, 0x35, 0x39,</div><div class='add'>+	0x40, 0x87, 0x47, 0x15, 0x7b, 0x15, 0xdf, 0x09, 0xb4, 0xbe, 0x41, 0x8c,</div><div class='add'>+	0xae, 0x63, 0xdc, 0x10, 0x7b, 0xdf, 0x9e, 0xd2, 0xdb, 0xa9, 0x80, 0xaa,</div><div class='add'>+	0x72, 0xe6, 0x8e, 0x77, 0x8d, 0x35, 0xd0, 0x6f, 0xac, 0x4e, 0x37, 0xed,</div><div class='add'>+	0xda, 0xb9, 0x68, 0x16, 0x73, 0xce, 0xab, 0xd0, 0xbd, 0x83, 0xf6, 0x4f,</div><div class='add'>+	0x5f, 0xba, 0xb7, 0x0f, 0xe4, 0x67, 0xea, 0x16, 0xce, 0x5f, 0x76, 0x1f,</div><div class='add'>+	0x02, 0x67, 0x5a, 0x50, 0xd7, 0x5c, 0xe4, 0x10, 0x19, 0xf4, 0x96, 0xb7,</div><div class='add'>+	0xc9, 0xd3, 0x3a, 0x98, 0x9f, 0xae, 0x67, 0x2e, 0x1f, 0x63, 0x2e, 0x1f,</div><div class='add'>+	0x63, 0xbd, 0xd4, 0x0e, 0x79, 0x4e, 0x64, 0xb4, 0x1c, 0x67, 0xfe, 0xf3,</div><div class='add'>+	0x35, 0xf2, 0x9f, 0x1d, 0xf7, 0x8b, 0x5c, 0xd3, 0x71, 0xd7, 0xde, 0xab,</div><div class='add'>+	0x90, 0xa4, 0x3d, 0xdd, 0xc9, 0x6b, 0x7d, 0xf7, 0x5f, 0x8c, 0x3b, 0x98,</div><div class='add'>+	0xc7, 0xc7, 0xc6, 0x16, 0xa3, 0x9f, 0x99, 0xe8, 0xc6, 0xbd, 0x9f, 0x45,</div><div class='add'>+	0x17, 0xf9, 0xd4, 0x12, 0x62, 0xf4, 0xea, 0x87, 0x47, 0x6c, 0xcc, 0x16,</div><div class='add'>+	0xcc, 0x7f, 0x2d, 0x0d, 0xbc, 0x49, 0x4e, 0xd6, 0x9f, 0x3a, 0x60, 0xf3,</div><div class='add'>+	0x34, 0x17, 0xe3, 0x43, 0x31, 0x71, 0x29, 0xbc, 0xcb, 0xe8, 0x58, 0xa6,</div><div class='add'>+	0x5a, 0x8b, 0x4b, 0x16, 0x06, 0x7a, 0xdf, 0xa6, 0xaf, 0x56, 0xed, 0x53,</div><div class='add'>+	0x51, 0x3d, 0x20, 0xb9, 0x3a, 0xf9, 0x11, 0x31, 0xfa, 0x05, 0x62, 0x74,</div><div class='add'>+	0xf9, 0x9e, 0x5c, 0x5e, 0x9e, 0x60, 0xde, 0x55, 0x6d, 0xe4, 0x72, 0xf3,</div><div class='add'>+	0xed, 0x7d, 0xb2, 0xf7, 0xc6, 0x8d, 0xe7, 0x68, 0xfb, 0x47, 0xf3, 0xb6,</div><div class='add'>+	0x7f, 0x2c, 0x8f, 0xc1, 0x16, 0x73, 0xf3, 0x37, 0x6d, 0xfc, 0xcd, 0xe5,</div><div class='add'>+	0xe6, 0xf3, 0x07, 0x8c, 0x8e, 0x30, 0x31, 0xfa, 0x33, 0x7b, 0xa4, 0x7f,</div><div class='add'>+	0x0d, 0xd5, 0xc4, 0x93, 0x1a, 0x62, 0x49, 0xc5, 0x80, 0xac, 0xcf, 0x04,</div><div class='add'>+	0xda, 0xc7, 0x55, 0x9f, 0xdd, 0xc7, 0x26, 0xca, 0xd6, 0x9d, 0x92, 0x77,</div><div class='add'>+	0x6c, 0x0d, 0x6d, 0x83, 0x12, 0x30, 0xaf, 0xa1, 0x3e, 0xf7, 0xa5, 0xaf,</div><div class='add'>+	0x42, 0x7b, 0xff, 0x2c, 0xec, 0x1f, 0x92, 0xf8, 0x22, 0xed, 0x4b, 0x2e,</div><div class='add'>+	0xee, 0xc4, 0xfb, 0xbb, 0x66, 0xe3, 0xfd, 0x91, 0x73, 0x79, 0xf8, 0xe6,</div><div class='add'>+	0x54, 0xf4, 0x5e, 0x86, 0xd7, 0xe5, 0x92, 0x87, 0xbf, 0xc4, 0x3c, 0xfc,</div><div class='add'>+	0x6d, 0x45, 0xd6, 0x10, 0x55, 0xdc, 0xb8, 0xc0, 0xc1, 0xf8, 0xa2, 0xfb,</div><div class='add'>+	0x5f, 0x74, 0xc4, 0xe5, 0x39, 0xb2, 0xff, 0x7e, 0xde, 0x7f, 0x9e, 0xf1,</div><div class='add'>+	0x7c, 0x80, 0x33, 0x11, 0xad, 0x76, 0xe0, 0x99, 0x85, 0xf1, 0xa8, 0x8b,</div><div class='add'>+	0xd7, 0x7b, 0xc9, 0x53, 0x66, 0x1a, 0x07, 0xe9, 0x9b, 0xb5, 0xe1, 0xf9,</div><div class='add'>+	0x0e, 0x07, 0xce, 0x98, 0x7a, 0xcb, 0x6e, 0x5e, 0x7b, 0x36, 0x23, 0xbe,</div><div class='add'>+	0x18, 0x26, 0x7e, 0x2d, 0xca, 0xfb, 0xa2, 0xbc, 0x8f, 0x01, 0xf7, 0x6c,</div><div class='add'>+	0xda, 0xeb, 0x6b, 0x29, 0xbd, 0xff, 0x59, 0xda, 0x69, 0xf5, 0x59, 0x3b,</div><div class='add'>+	0x2d, 0xec, 0xd3, 0x82, 0xbb, 0x2a, 0xd2, 0x82, 0x50, 0xb2, 0xb0, 0x5f,</div><div class='add'>+	0x6b, 0x3f, 0x7a, 0x32, 0xf7, 0x60, 0xe3, 0x4e, 0x7d, 0xa3, 0xac, 0x11,</div><div class='add'>+	0xbd, 0x10, 0x8a, 0x5b, 0x95, 0x46, 0x27, 0x5c, 0x0b, 0x8c, 0x16, 0xe6,</div><div class='add'>+	0x2f, 0xb1, 0xef, 0x2a, 0xa5, 0xb4, 0xdf, 0xc3, 0xd8, 0x34, 0xac, 0x07,</div><div class='add'>+	0xb7, 0x2b, 0x06, 0xe3, 0x86, 0x86, 0xfd, 0x83, 0x45, 0xb8, 0x75, 0x57,</div><div class='add'>+	0x1b, 0xf6, 0xf5, 0x9b, 0xc4, 0xcf, 0x5a, 0xff, 0x69, 0xbc, 0x87, 0x63,</div><div class='add'>+	0xa6, 0xbc, 0xaf, 0x54, 0x82, 0x36, 0x4d, 0xf6, 0x29, 0x31, 0xfb, 0x9c,</div><div class='add'>+	0x7e, 0xde, 0x3b, 0xe0, 0x9e, 0x12, 0xa3, 0xf0, 0x2e, 0xbf, 0xc1, 0x7c,</div><div class='add'>+	0x71, 0x12, 0x7b, 0x06, 0x65, 0x6d, 0x60, 0x9a, 0x72, 0xa4, 0x7f, 0xae,</div><div class='add'>+	0xaf, 0x8b, 0xd8, 0x7f, 0xaf, 0x99, 0xc5, 0x99, 0x85, 0xd5, 0xc0, 0x0c,</div><div class='add'>+	0x05, 0xa1, 0xcf, 0x04, 0xe4, 0x5b, 0x35, 0xfc, 0x7b, 0xd7, 0xf2, 0x7f,</div><div class='add'>+	0x51, 0xda, 0xa9, 0xa9, 0xc8, 0xad, 0x17, 0xbc, 0x5e, 0x2d, 0xef, 0xf2,</div><div class='add'>+	0x1d, 0x49, 0xcd, 0xac, 0xcc, 0x3d, 0x77, 0xfe, 0xa4, 0x3e, 0x5e, 0xb3,</div><div class='add'>+	0xfc, 0x76, 0x1b, 0x85, 0xba, 0xaf, 0x5a, 0x51, 0xaf, 0x94, 0x2f, 0x62,</div><div class='add'>+	0xdb, 0xe2, 0x9f, 0xd3, 0x94, 0x76, 0xe2, 0xa9, 0x1a, 0x9a, 0xa6, 0xb4,</div><div class='add'>+	0x0d, 0x5d, 0xd8, 0xee, 0x8b, 0x56, 0xb4, 0x45, 0xce, 0x0b, 0xe5, 0xdc,</div><div class='add'>+	0xd3, 0x50, 0x2a, 0x65, 0x0b, 0xf7, 0x9f, 0xc9, 0xb7, 0x55, 0x4c, 0xae,</div><div class='add'>+	0x9a, 0x2b, 0x73, 0x6b, 0xbf, 0xec, 0xad, 0x8a, 0xe2, 0x68, 0xc3, 0xd4,</div><div class='add'>+	0xf6, 0x0a, 0x7d, 0x7f, 0xef, 0xbc, 0xf6, 0x72, 0x65, 0x67, 0xb1, 0x4d,</div><div class='add'>+	0x29, 0x9f, 0xc5, 0xff, 0x6b, 0xaf, 0x23, 0xbc, 0x61, 0xef, 0x93, 0xdc,</div><div class='add'>+	0x6a, 0x36, 0x46, 0x4b, 0xf0, 0x39, 0xa8, 0x97, 0xc6, 0xe7, 0x97, 0xd8,</div><div class='add'>+	0xfc, 0x36, 0xda, 0x52, 0xc2, 0x1c, 0xd7, 0x6d, 0x44, 0xef, 0x75, 0x23,</div><div class='add'>+	0x9b, 0x65, 0x5c, 0x6e, 0x3d, 0xa3, 0xec, 0x57, 0x6e, 0x0d, 0xe8, 0x1b,</div><div class='add'>+	0xdf, 0x25, 0xdf, 0x78, 0x3e, 0x10, 0x27, 0xd6, 0x1b, 0xbe, 0x3e, 0x45,</div><div class='add'>+	0x37, 0xd7, 0x32, 0xa6, 0x3d, 0xcb, 0x1c, 0x72, 0x4d, 0xa0, 0xd7, 0x7e,</div><div class='add'>+	0xc6, 0xa8, 0x44, 0x56, 0xe0, 0x12, 0xfb, 0xbb, 0x2c, 0x2d, 0x30, 0xd2,</div><div class='add'>+	0xcf, 0xcb, 0x9a, 0x17, 0x7f, 0xc7, 0x30, 0xdf, 0xbe, 0xb6, 0x06, 0x41,</div><div class='add'>+	0xfb, 0xff, 0xaa, 0xfc, 0xb7, 0x5b, 0x5a, 0x51, 0x6b, 0xff, 0xbf, 0x19,</div><div class='add'>+	0x73, 0xd3, 0x67, 0xd7, 0x86, 0xd1, 0x6d, 0x5a, 0xd6, 0x53, 0xa6, 0x85,</div><div class='add'>+	0x37, 0xce, 0xed, 0xd1, 0x5e, 0xe1, 0x60, 0xce, 0x41, 0x17, 0x8e, 0xe5,</div><div class='add'>+	0xbe, 0x5d, 0x75, 0xee, 0xfd, 0x8c, 0xa5, 0xe7, 0xed, 0xd1, 0x96, 0xf7,</div><div class='add'>+	0xe2, 0xab, 0xed, 0x6f, 0x93, 0xcd, 0x5b, 0xe4, 0xc4, 0x73, 0x89, 0x8a,</div><div class='add'>+	0x98, 0x87, 0xbf, 0x37, 0x2d, 0x2a, 0xc2, 0xfa, 0x10, 0x39, 0xdf, 0xa5,</div><div class='add'>+	0xc7, 0x71, 0xda, 0xfe, 0x46, 0x43, 0x3c, 0x24, 0xdf, 0x66, 0x38, 0x9a,</div><div class='add'>+	0x50, 0x71, 0x6c, 0xb0, 0x27, 0xb4, 0xc7, 0xee, 0xfb, 0x55, 0x74, 0x8f,</div><div class='add'>+	0xca, 0x73, 0xbf, 0x16, 0xac, 0x4e, 0x4c, 0xda, 0x7b, 0xda, 0x36, 0xa7,</div><div class='add'>+	0x24, 0xf7, 0xd6, 0xb3, 0x6b, 0x98, 0xaf, 0xaa, 0x8e, 0x20, 0x6e, 0x62,</div><div class='add'>+	0x7c, 0x79, 0x21, 0x41, 0x3b, 0x5d, 0xa8, 0x77, 0x7c, 0x97, 0x1c, 0xa1,</div><div class='add'>+	0x22, 0xa2, 0x07, 0xdf, 0x51, 0x5a, 0xc9, 0xc5, 0xdc, 0x98, 0x48, 0x88,</div><div class='add'>+	0x2d, 0xca, 0xb7, 0x9d, 0x6e, 0xc6, 0x7e, 0x72, 0xd2, 0xe7, 0x13, 0x1a,</div><div class='add'>+	0x4e, 0x37, 0x78, 0x90, 0x26, 0x47, 0x7d, 0x2e, 0xe1, 0xc6, 0x63, 0xe4,</div><div class='add'>+	0xa8, 0x8f, 0x0e, 0xca, 0x1a, 0x61, 0x13, 0x1a, 0x13, 0xb2, 0x3e, 0x4c,</div><div class='add'>+	0xde, 0x35, 0xe2, 0xa5, 0x3d, 0x5a, 0x56, 0x37, 0x6d, 0xb7, 0x4d, 0x9b,</div><div class='add'>+	0x60, 0x9f, 0xb2, 0xae, 0x18, 0xc5, 0x35, 0xe4, 0x1d, 0x8f, 0x8e, 0xf8,</div><div class='add'>+	0xf0, 0x7d, 0x72, 0xf3, 0x24, 0xeb, 0xbd, 0x90, 0xf0, 0xa3, 0x2f, 0xed,</div><div class='add'>+	0xc3, 0xd3, 0xe4, 0xe8, 0x5b, 0x78, 0x2e, 0xdf, 0x09, 0x2b, 0x32, 0x82,</div><div class='add'>+	0xe4, 0xc1, 0x87, 0x51, 0xd6, 0x77, 0x11, 0xd6, 0xad, 0x3c, 0x08, 0xb5,</div><div class='add'>+	0xef, 0x10, 0x8f, 0x2b, 0x19, 0xb3, 0xaf, 0x44, 0x6a, 0x30, 0x82, 0xd4,</div><div class='add'>+	0xc8, 0x8f, 0xd0, 0x3b, 0x28, 0xe3, 0x92, 0xef, 0x3d, 0xc9, 0xbe, 0x27,</div><div class='add'>+	0x72, 0xbd, 0x3e, 0x2f, 0x86, 0x46, 0xa4, 0x9f, 0x6a, 0xf6, 0xfd, 0xe7,</div><div class='add'>+	0xb6, 0xff, 0x1f, 0xd6, 0xba, 0x1b, 0xa5, 0xed, 0x83, 0x9f, 0xd0, 0xbe,</div><div class='add'>+	0xe8, 0xaa, 0xf0, 0x9e, 0xa1, 0xac, 0x75, 0xb8, 0xd9, 0xa6, 0x07, 0x8e,</div><div class='add'>+	0x48, 0x76, 0x65, 0x39, 0xf4, 0xe8, 0x36, 0xc5, 0x68, 0x2e, 0x53, 0x26,</div><div class='add'>+	0xb1, 0x2d, 0x23, 0xef, 0x8d, 0x15, 0xe3, 0x69, 0xe2, 0xa3, 0x2b, 0xa4,</div><div class='add'>+	0x6b, 0xdf, 0xa5, 0xed, 0x2c, 0x21, 0xa6, 0xbc, 0x61, 0x7e, 0x06, 0x71,</div><div class='add'>+	0x4d, 0xf4, 0x57, 0x8c, 0x1f, 0xf4, 0xbb, 0xf1, 0x4e, 0x28, 0x82, 0xdc,</div><div class='add'>+	0xb7, 0xbd, 0x3c, 0xf8, 0x71, 0xc2, 0xcb, 0xf9, 0xaa, 0xcb, 0x1a, 0x8e,</div><div class='add'>+	0xb9, 0xc0, 0xb4, 0xdc, 0xb5, 0xa3, 0x89, 0x35, 0xd8, 0x43, 0x79, 0x5f,</div><div class='add'>+	0x48, 0x9c, 0xe1, 0xfc, 0xb4, 0x53, 0xff, 0xa2, 0xef, 0x78, 0x5e, 0xd7,</div><div class='add'>+	0x3d, 0xd4, 0xf5, 0x2c, 0x3c, 0x9b, 0xb8, 0x0f, 0x8f, 0x52, 0xfe, 0x47,</div><div class='add'>+	0xfa, 0x8d, 0xe8, 0xc5, 0xca, 0x61, 0xe2, 0x65, 0x31, 0x8e, 0xb1, 0xed,</div><div class='add'>+	0x5b, 0x99, 0x29, 0x4f, 0x4a, 0x5f, 0x29, 0x59, 0x9f, 0x54, 0xf0, 0xce,</div><div class='add'>+	0xa2, 0xc3, 0x18, 0xe7, 0xbd, 0x1f, 0xf3, 0x77, 0x78, 0x61, 0x25, 0xfb,</div><div class='add'>+	0x10, 0xfd, 0xf8, 0xed, 0x5c, 0xa0, 0x8b, 0x3c, 0x67, 0x79, 0xc3, 0x61,</div><div class='add'>+	0x6c, 0x1d, 0x92, 0x6b, 0x6d, 0xe8, 0xed, 0x7f, 0x0f, 0x8e, 0x10, 0x71,</div><div class='add'>+	0xc8, 0xdb, 0x40, 0x5b, 0xcf, 0x62, 0x5b, 0xfa, 0xc3, 0x69, 0x39, 0x0e,</div><div class='add'>+	0xfa, 0xca, 0x34, 0xd9, 0x8b, 0x7c, 0x34, 0x51, 0x8c, 0xe7, 0x58, 0x67,</div><div class='add'>+	0x5d, 0xc8, 0x95, 0x7f, 0x66, 0x72, 0x98, 0xfc, 0xc9, 0x89, 0x34, 0xfb,</div><div class='add'>+	0x48, 0xd8, 0x6d, 0x4c, 0x53, 0x76, 0xd3, 0x0f, 0x2b, 0x17, 0x4e, 0x53,</div><div class='add'>+	0x52, 0x43, 0xc2, 0xed, 0x7f, 0x84, 0x27, 0xef, 0xcf, 0xe9, 0x70, 0x8f,</div><div class='add'>+	0xb9, 0x06, 0x43, 0xe9, 0x1f, 0x17, 0xda, 0x9b, 0xf2, 0x2e, 0x9c, 0xbc,</div><div class='add'>+	0x9f, 0x53, 0x78, 0x57, 0x27, 0xf7, 0x4c, 0xeb, 0xdb, 0x99, 0x0a, 0xf2,</div><div class='add'>+	0xe7, 0x52, 0xda, 0x5a, 0x51, 0xcc, 0xcb, 0xb8, 0xba, 0x66, 0x81, 0x86,</div><div class='add'>+	0x9d, 0x97, 0xd5, 0x4d, 0x43, 0x85, 0xe6, 0xfc, 0x75, 0xc3, 0xf3, 0xec,</div><div class='add'>+	0xa7, 0x22, 0x56, 0x15, 0xd9, 0x63, 0xef, 0x83, 0x0a, 0x5d, 0x56, 0xc3,</div><div class='add'>+	0xb8, 0x22, 0xcf, 0x86, 0x63, 0x78, 0x2b, 0x51, 0x1d, 0xab, 0x8e, 0x54,</div><div class='add'>+	0x12, 0x6f, 0x4f, 0xa3, 0x6f, 0xd8, 0x89, 0x0a, 0xf2, 0xe6, 0xf2, 0x64,</div><div class='add'>+	0x35, 0xdc, 0xf6, 0x3a, 0xde, 0x45, 0xe4, 0x2b, 0xb3, 0xc9, 0x49, 0x66,</div><div class='add'>+	0xa1, 0x92, 0xbc, 0xc4, 0x13, 0xb2, 0xac, 0x9f, 0x2d, 0xb4, 0xac, 0x4b,</div><div class='add'>+	0x78, 0x94, 0xf0, 0x38, 0x15, 0x12, 0x3f, 0x8d, 0xa2, 0xce, 0xf6, 0x57,</div><div class='add'>+	0x03, 0xf5, 0xf6, 0xff, 0x26, 0xfa, 0x7a, 0x47, 0x68, 0xfe, 0xf8, 0x7d,</div><div class='add'>+	0xa1, 0xb9, 0xe3, 0x35, 0x50, 0x07, 0xa6, 0xc3, 0xc1, 0xb6, 0xbe, 0x70,</div><div class='add'>+	0x99, 0x85, 0x26, 0xfa, 0xf0, 0x5a, 0x53, 0x78, 0xd1, 0x1a, 0xf2, 0xa2,</div><div class='add'>+	0xde, 0x90, 0x31, 0x7e, 0x10, 0x57, 0x33, 0xce, 0xb9, 0x07, 0x7c, 0xec,</div><div class='add'>+	0x47, 0x72, 0x6c, 0x67, 0x76, 0x0e, 0xf9, 0xf6, 0x67, 0x16, 0x0a, 0x47,</div><div class='add'>+	0x6a, 0x25, 0x47, 0x3a, 0x84, 0xd6, 0xf1, 0xc3, 0xb8, 0x9e, 0x65, 0x3c,</div><div class='add'>+	0xe4, 0x2a, 0xc9, 0xcc, 0x8f, 0xd0, 0x97, 0xb1, 0xb0, 0x3d, 0x94, 0xc5,</div><div class='add'>+	0xb5, 0x6c, 0xbb, 0x74, 0xa0, 0x99, 0xdc, 0x70, 0x05, 0xd6, 0x8d, 0xcb,</div><div class='add'>+	0xbb, 0x52, 0x13, 0x58, 0x3e, 0x4e, 0xce, 0x39, 0x5e, 0xf0, 0x57, 0xe1,</div><div class='add'>+	0x4b, 0x2b, 0xc8, 0x97, 0x64, 0x2d, 0x6d, 0x95, 0xbd, 0x96, 0xa6, 0xd2,</div><div class='add'>+	0x0f, 0x1b, 0x13, 0xf2, 0x9e, 0x50, 0x1c, 0xab, 0xc7, 0x05, 0xab, 0xef,</div><div class='add'>+	0x41, 0xf7, 0xb8, 0xac, 0xcd, 0x7e, 0x33, 0x74, 0xf1, 0xf8, 0xab, 0x68,</div><div class='add'>+	0x1c, 0x1f, 0x0a, 0xcd, 0x1b, 0x1f, 0xa1, 0xdc, 0x09, 0xca, 0xd6, 0x1f,</div><div class='add'>+	0xaa, 0x1d, 0x1f, 0x0c, 0x05, 0xc7, 0x77, 0x87, 0x02, 0xe3, 0x2d, 0xd8,</div><div class='add'>+	0x32, 0xbe, 0x0a, 0x9b, 0xc7, 0x37, 0x62, 0xd3, 0xb8, 0xe0, 0xfc, 0x24,</div><div class='add'>+	0x96, 0x8d, 0xbf, 0x81, 0xa5, 0xe3, 0xcf, 0xa3, 0x69, 0xfc, 0x04, 0x96,</div><div class='add'>+	0x8c, 0xff, 0x08, 0xcd, 0xe3, 0xaf, 0x70, 0x2c, 0xb2, 0xd6, 0x2b, 0xeb,</div><div class='add'>+	0xbc, 0x85, 0xe7, 0x6a, 0x53, 0xf7, 0x24, 0xcb, 0x5a, 0x86, 0x7c, 0xbf,</div><div class='add'>+	0x43, 0xe6, 0xd0, 0x85, 0x95, 0xda, 0x6b, 0xe8, 0xd9, 0x25, 0xdf, 0x24,</div><div class='add'>+	0xac, 0xd3, 0xba, 0xe5, 0xf9, 0xa3, 0xf7, 0x79, 0xd9, 0x63, 0x4f, 0x1b,</div><div class='add'>+	0x3b, 0xff, 0xbd, 0xbc, 0xc9, 0xb3, 0xcf, 0x18, 0xe5, 0x1b, 0x18, 0xf2,</div><div class='add'>+	0xec, 0x73, 0x12, 0x5d, 0x99, 0xdf, 0x5a, 0x51, 0x4d, 0xca, 0xca, 0xf7,</div><div class='add'>+	0x3f, 0xc4, 0x1e, 0x5e, 0xc3, 0x43, 0xbb, 0x26, 0xc9, 0x59, 0xb2, 0xf6,</div><div class='add'>+	0x5a, 0xcd, 0xbb, 0xf3, 0xe4, 0x9b, 0x56, 0xf2, 0xce, 0xfe, 0x6b, 0x48,</div><div class='add'>+	0x8d, 0x02, 0xe3, 0x0f, 0x8b, 0x1f, 0xae, 0xa1, 0x1f, 0x66, 0xc5, 0x27,</div><div class='add'>+	0xe3, 0xc4, 0xe4, 0xaf, 0x78, 0x70, 0x0f, 0x79, 0x49, 0x11, 0xb2, 0x23,</div><div class='add'>+	0xa5, 0x78, 0x66, 0x30, 0x6e, 0xcd, 0x31, 0x3c, 0x28, 0x8f, 0x18, 0xd9,</div><div class='add'>+	0x4b, 0x18, 0x67, 0x5f, 0xe1, 0xb5, 0x89, 0x7e, 0xf8, 0x7d, 0x46, 0xc0,</div><div class='add'>+	0x37, 0x87, 0xe7, 0xc7, 0x86, 0xb2, 0xe4, 0x14, 0x1d, 0x98, 0xe4, 0x7f,</div><div class='add'>+	0xc9, 0x41, 0x81, 0x6e, 0x0c, 0x0d, 0x89, 0x3e, 0x5b, 0xa8, 0x4f, 0xc1,</div><div class='add'>+	0x45, 0xbd, 0xa3, 0x89, 0x78, 0x68, 0x29, 0x82, 0x87, 0x2a, 0xca, 0x1e,</div><div class='add'>+	0xe8, 0xa4, 0xbf, 0xea, 0xb1, 0x9f, 0x30, 0x16, 0xf4, 0x29, 0x3f, 0xc2,</div><div class='add'>+	0x73, 0xcc, 0x19, 0x4a, 0x1f, 0x20, 0xff, 0x20, 0x56, 0x56, 0x44, 0x14,</div><div class='add'>+	0x63, 0x79, 0xe0, 0x14, 0x9e, 0x19, 0x71, 0xc2, 0x9d, 0x74, 0x62, 0x82,</div><div class='add'>+	0x38, 0xe9, 0x48, 0xca, 0xf3, 0x7a, 0x8d, 0xb2, 0xc8, 0xba, 0xd0, 0x09,</div><div class='add'>+	0x64, 0xed, 0xe7, 0x69, 0xf2, 0x3c, 0xe4, 0x45, 0xbb, 0x1f, 0x27, 0x65,</div><div class='add'>+	0xef, 0x21, 0x96, 0x76, 0xa5, 0x5e, 0x42, 0xd3, 0x90, 0x07, 0x73, 0x92,</div><div class='add'>+	0x13, 0xcc, 0x5f, 0x5e, 0x45, 0x6a, 0xd7, 0x2c, 0x7c, 0x95, 0x3c, 0x70,</div><div class='add'>+	0x66, 0xd2, 0x84, 0x46, 0xbd, 0xdd, 0x34, 0x66, 0x22, 0xba, 0x77, 0x15,</div><div class='add'>+	0x56, 0xee, 0xfd, 0x22, 0x8f, 0xe9, 0xb8, 0x7e, 0x6f, 0x3b, 0x3e, 0x3f,</div><div class='add'>+	0x16, 0x47, 0xeb, 0x58, 0x0f, 0x8f, 0x36, 0x5c, 0xb7, 0xa3, 0x12, 0xe9,</div><div class='add'>+	0x90, 0xc6, 0x9c, 0xba, 0x8d, 0x39, 0xb5, 0xf0, 0xa1, 0xd5, 0x78, 0x86,</div><div class='add'>+	0xb8, 0x13, 0x0c, 0xad, 0xc6, 0x84, 0xed, 0x8b, 0xb2, 0x97, 0x71, 0x35,</div><div class='add'>+	0x36, 0x31, 0x5f, 0x1e, 0xc6, 0x6a, 0x74, 0xf1, 0xda, 0x0e, 0x7b, 0x0e,</div><div class='add'>+	0x0e, 0x63, 0x31, 0xf3, 0xa1, 0xf7, 0x2f, 0x3f, 0x8c, 0x2b, 0xf6, 0x48,</div><div class='add'>+	0xdf, 0xa7, 0x91, 0xda, 0xb9, 0x86, 0x6d, 0x66, 0xd1, 0x32, 0xf6, 0x43,</div><div class='add'>+	0x7c, 0x7e, 0x07, 0x6e, 0xab, 0x44, 0x25, 0x9e, 0x0f, 0x05, 0x5a, 0xfb,</div><div class='add'>+	0x94, 0x1f, 0xda, 0x6d, 0x6f, 0xa2, 0x1f, 0x6f, 0x65, 0xb9, 0x47, 0xd2,</div><div class='add'>+	0x27, 0xd0, 0x9b, 0x9a, 0x3a, 0xa7, 0xf6, 0x7b, 0xed, 0x8c, 0x07, 0x2f,</div><div class='add'>+	0x63, 0xdf, 0xc8, 0x24, 0xb1, 0xf7, 0x24, 0x8f, 0x0b, 0x9f, 0x5f, 0x7b,</div><div class='add'>+	0xed, 0x7c, 0x26, 0x67, 0x37, 0x92, 0xbf, 0xc8, 0x3a, 0x70, 0x0b, 0x7c,</div><div class='add'>+	0x29, 0xe1, 0x44, 0xd9, 0xad, 0x33, 0xa1, 0x6f, 0x0c, 0xdb, 0x1c, 0xc9,</div><div class='add'>+	0x88, 0x91, 0x1b, 0xb5, 0x7c, 0x57, 0xf1, 0x90, 0x1b, 0x05, 0xb1, 0x22,</div><div class='add'>+	0xa3, 0x47, 0xaf, 0xa5, 0xbe, 0x4b, 0xee, 0x7f, 0x19, 0xce, 0xfb, 0x9d,</div><div class='add'>+	0x28, 0x4e, 0xca, 0xda, 0xc9, 0x04, 0x7a, 0x33, 0xf2, 0xfe, 0x6e, 0x56,</div><div class='add'>+	0x2f, 0x26, 0xae, 0x16, 0x25, 0xb3, 0x8c, 0xfd, 0xd9, 0xf9, 0x45, 0x90,</div><div class='add'>+	0x77, 0xf1, 0xaf, 0xc2, 0x9a, 0xfe, 0x28, 0xba, 0x4c, 0x79, 0x57, 0x27,</div><div class='add'>+	0x37, 0xfe, 0x39, 0x0d, 0x2f, 0xa3, 0x9b, 0xf1, 0xa7, 0x8d, 0x98, 0xf8,</div><div class='add'>+	0x55, 0xfb, 0x59, 0xe8, 0xcb, 0xe8, 0x19, 0x2c, 0xbc, 0xbb, 0x2e, 0x6d,</div><div class='add'>+	0x3e, 0x4f, 0xbd, 0xb9, 0xf2, 0xdf, 0xec, 0x91, 0x36, 0x75, 0xd3, 0xaf,</div><div class='add'>+	0x4e, 0xcb, 0xbd, 0x8b, 0x03, 0xfb, 0x19, 0x36, 0xed, 0xe3, 0x35, 0xf4,</div><div class='add'>+	0xee, 0x2a, 0x8c, 0x99, 0xb9, 0x41, 0xe0, 0x35, 0xf4, 0x8f, 0xca, 0xd8,</div><div class='add'>+	0xaf, 0x9f, 0x96, 0x7b, 0xc7, 0x78, 0xaa, 0x3e, 0x0a, 0x75, 0x1d, 0xb4,</div><div class='add'>+	0xe7, 0xc2, 0xfd, 0x8f, 0xfb, 0x6e, 0xd0, 0xa7, 0xec, 0x6f, 0xf0, 0xe4,</div><div class='add'>+	0xbe, 0x81, 0x04, 0x3c, 0x99, 0x90, 0x77, 0xfb, 0xd5, 0xc5, 0x2e, 0xa8,</div><div class='add'>+	0x5e, 0x17, 0x8a, 0x19, 0x2f, 0x6a, 0xd0, 0xed, 0xb5, 0x70, 0x35, 0xc7,</div><div class='add'>+	0xb2, 0xbf, 0xfe, 0x3a, 0x66, 0x1a, 0xf1, 0x56, 0x97, 0xfd, 0xce, 0xe1,</div><div class='add'>+	0x8a, 0xbf, 0xfe, 0xe8, 0x3b, 0x87, 0x6f, 0x10, 0x67, 0x15, 0x94, 0x1b,</div><div class='add'>+	0x37, 0xe1, 0x05, 0x3b, 0xa6, 0x28, 0x28, 0x9b, 0x2b, 0xeb, 0x98, 0x7e,</div><div class='add'>+	0x3c, 0x6b, 0xd4, 0xf9, 0xab, 0xe4, 0xf9, 0x94, 0x72, 0xca, 0x92, 0x6f,</div><div class='add'>+	0x06, 0x6c, 0xcb, 0xfc, 0xb1, 0x3d, 0xf1, 0x4f, 0x61, 0xcb, 0xce, 0x30,</div><div class='add'>+	0xe4, 0xfd, 0x15, 0xa7, 0xa1, 0x79, 0x73, 0xfc, 0x4a, 0x64, 0x93, 0xbd,</div><div class='add'>+	0xe4, 0xb7, 0x12, 0x9c, 0xde, 0xa0, 0x9f, 0xbe, 0x21, 0x7b, 0xa6, 0xc8,</div><div class='add'>+	0x99, 0xfe, 0x12, 0xc1, 0xaa, 0xc2, 0x38, 0x65, 0xaf, 0xa9, 0x92, 0x1b,</div><div class='add'>+	0xab, 0x5d, 0x47, 0xca, 0x4a, 0xbd, 0x37, 0xec, 0x35, 0x5c, 0x97, 0xf1,</div><div class='add'>+	0x5b, 0xeb, 0x4d, 0x6f, 0x35, 0xcb, 0x1e, 0xce, 0xdf, 0x9f, 0x14, 0x9f,</div><div class='add'>+	0x33, 0xe5, 0x1b, 0x56, 0x4e, 0xbb, 0x8e, 0xe8, 0xf7, 0x5c, 0x9d, 0xee,</div><div class='add'>+	0x94, 0x83, 0xb8, 0x79, 0xc2, 0xea, 0xf4, 0xca, 0x18, 0xee, 0xbc, 0xa0,</div><div class='add'>+	0x8e, 0xac, 0x2b, 0x68, 0xd2, 0x6f, 0x58, 0xc6, 0xdc, 0x95, 0xf9, 0x68,</div><div class='add'>+	0x9f, 0xb2, 0xde, 0x5b, 0x64, 0x94, 0xe1, 0x54, 0x55, 0x6e, 0x1d, 0xe6,</div><div class='add'>+	0x9c, 0x8c, 0x3d, 0x35, 0xb2, 0x4f, 0xaf, 0xd8, 0x3e, 0xb7, 0xfb, 0x35,</div><div class='add'>+	0xcf, 0xd5, 0xfb, 0xbb, 0xfc, 0x78, 0xab, 0xed, 0x77, 0x86, 0x1e, 0xb4,</div><div class='add'>+	0x79, 0x91, 0x63, 0xca, 0xb8, 0x4b, 0x6a, 0xce, 0xef, 0xe7, 0x2b, 0xf9,</div><div class='add'>+	0x7e, 0x45, 0x1e, 0xef, 0x94, 0x3e, 0x44, 0xae, 0x87, 0xf3, 0x75, 0xf4,</div><div class='add'>+	0x70, 0xd4, 0xee, 0x5f, 0x65, 0xbe, 0x55, 0xe8, 0x93, 0xfe, 0xb8, 0xb0,</div><div class='add'>+	0xd0, 0x46, 0x56, 0xec, 0xb3, 0xb3, 0x98, 0xb1, 0xed, 0x54, 0xc3, 0x3d,</div><div class='add'>+	0xd8, 0x94, 0x10, 0x3d, 0xcb, 0xb7, 0x60, 0x89, 0xe1, 0x36, 0x57, 0x73,</div><div class='add'>+	0xd1, 0x5f, 0x2f, 0xc3, 0x90, 0x16, 0xc7, 0x9e, 0x7a, 0x79, 0x47, 0xce,</div><div class='add'>+	0x45, 0x9f, 0x88, 0xa3, 0xc4, 0x28, 0x96, 0xfd, 0xc7, 0xf6, 0x1e, 0x94,</div><div class='add'>+	0x7d, 0xa6, 0x1e, 0x7d, 0x52, 0xbe, 0x55, 0x76, 0xa9, 0xbd, 0x5e, 0xd5,</div><div class='add'>+	0x3c, 0x04, 0xb9, 0x6e, 0xe2, 0xda, 0xf3, 0xf2, 0xfe, 0x12, 0xda, 0x8e,</div><div class='add'>+	0xbd, 0x27, 0xda, 0x94, 0x77, 0xe8, 0xfa, 0x12, 0xf2, 0x2e, 0x57, 0x5d,</div><div class='add'>+	0x8c, 0xfc, 0x12, 0x2f, 0xa4, 0x65, 0xbf, 0xc2, 0xef, 0xac, 0x78, 0x8d,</div><div class='add'>+	0xec, 0x8b, 0x9c, 0x5a, 0xa7, 0x88, 0xb8, 0x16, 0x08, 0x57, 0x28, 0x85,</div><div class='add'>+	0xf7, 0xb9, 0xce, 0xfd, 0x5d, 0x4f, 0x9b, 0x39, 0x6d, 0xbf, 0x83, 0x27,</div><div class='add'>+	0x67, 0x11, 0x34, 0xa6, 0xe4, 0x9b, 0xa7, 0xfa, 0xc4, 0x72, 0xd4, 0x65,</div><div class='add'>+	0x6b, 0x1d, 0xce, 0x3c, 0x7f, 0x09, 0x63, 0x05, 0xed, 0x66, 0x73, 0x20,</div><div class='add'>+	0x6c, 0xbf, 0x6b, 0xb6, 0x2c, 0x55, 0x1b, 0x7c, 0x04, 0x7a, 0xfb, 0xdb,</div><div class='add'>+	0x2c, 0x7f, 0x5d, 0xe6, 0xfb, 0xd6, 0x90, 0x57, 0xc6, 0x54, 0xc0, 0x88,</div><div class='add'>+	0x13, 0xf4, 0x0d, 0xea, 0x31, 0x22, 0xfe, 0xe1, 0x41, 0x55, 0x24, 0x4c,</div><div class='add'>+	0x3f, 0x96, 0xf8, 0x2f, 0xef, 0xa9, 0xe9, 0xbb, 0xe3, 0x30, 0xd1, 0xc8,</div><div class='add'>+	0x1c, 0xdd, 0x65, 0xef, 0x73, 0xd6, 0xfd, 0x2b, 0x19, 0x87, 0x8e, 0x9c,</div><div class='add'>+	0xdd, 0x13, 0x20, 0x7c, 0xe1, 0xc7, 0x35, 0xf9, 0xbd, 0xd0, 0xee, 0x39,</div><div class='add'>+	0x8c, 0x8f, 0x96, 0xfd, 0x9c, 0x7f, 0x8d, 0x8d, 0x2d, 0x9a, 0xa1, 0xef,</div><div class='add'>+	0xff, 0x95, 0xa3, 0x13, 0x4f, 0x2c, 0x30, 0x3a, 0x0e, 0xa8, 0xd9, 0x21,</div><div class='add'>+	0x1f, 0x71, 0xe6, 0x4a, 0x47, 0x74, 0x07, 0xff, 0xfb, 0x5f, 0xb4, 0xbf,</div><div class='add'>+	0xa1, 0x22, 0x75, 0xf5, 0xe0, 0x2a, 0x55, 0xf6, 0x0f, 0xb5, 0x60, 0xac,</div><div class='add'>+	0x4f, 0xde, 0x7d, 0xd0, 0x5b, 0xbf, 0xad, 0x74, 0x62, 0x43, 0xc8, 0x68,</div><div class='add'>+	0xd9, 0xa8, 0xe8, 0xcd, 0x7f, 0xaf, 0xe8, 0xfe, 0x90, 0x22, 0xe5, 0x82,</div><div class='add'>+	0xb2, 0xb6, 0x77, 0x36, 0xf6, 0xba, 0xd8, 0xc7, 0xde, 0x84, 0x1e, 0x9e,</div><div class='add'>+	0xc6, 0xb2, 0xa7, 0x4c, 0xc3, 0xf7, 0x1e, 0xdb, 0xfc, 0x09, 0x8f, 0x1d,</div><div class='add'>+	0xf6, 0x3b, 0xec, 0x52, 0x3e, 0x3a, 0xdf, 0x65, 0x7f, 0x8f, 0xb8, 0x95,</div><div class='add'>+	0x31, 0x45, 0xbe, 0x35, 0x1c, 0x83, 0x96, 0x9c, 0x45, 0x13, 0xd3, 0x7b,</div><div class='add'>+	0x6f, 0x80, 0xe4, 0xc0, 0x37, 0x4f, 0x47, 0xa9, 0x07, 0xde, 0x48, 0x27,</div><div class='ctx'> 	0xe6, 0x2e, 0x30, 0x7c, 0x8b, 0x54, 0xbb, 0x7e, 0x30, 0xaa, 0x4a, 0x7d,</div><div class='del'>-	0xdd, 0x3f, 0x08, 0x69, 0x23, 0x63, 0x69, 0x73, 0xcb, 0xed, 0x3a, 0x0b,</div><div class='del'>-	0xd4, 0xcf, 0xc0, 0x75, 0xf5, 0xaf, 0xe5, 0x5b, 0x46, 0x5a, 0xa5, 0x21,</div><div class='del'>-	0x75, 0xe2, 0x3b, 0x35, 0xfc, 0xb1, 0x7a, 0x82, 0x2b, 0xbf, 0xb2, 0x30,</div><div class='del'>-	0x4d, 0xea, 0xc9, 0x9e, 0xb1, 0x3b, 0x70, 0xaf, 0xfd, 0x3d, 0x16, 0xf1,</div><div class='del'>-	0x47, 0x3d, 0xfa, 0x15, 0xf2, 0xcf, 0x62, 0x45, 0xb8, 0xa7, 0xf0, 0x84,</div><div class='del'>-	0x56, 0x74, 0x33, 0x8e, 0x69, 0x21, 0xbd, 0xe7, 0x0a, 0xd5, 0x83, 0xc2,</div><div class='del'>-	0xc8, 0x63, 0xb2, 0x6f, 0x66, 0xef, 0x3c, 0x35, 0xbb, 0xbf, 0x26, 0xc6,</div><div class='del'>-	0x76, 0x8f, 0xff, 0xd1, 0xe7, 0xb8, 0xec, 0xab, 0xd8, 0x94, 0xf7, 0x5b,</div><div class='del'>-	0xec, 0x35, 0xc5, 0xd6, 0x84, 0x23, 0xb7, 0x5f, 0x30, 0x3f, 0xb7, 0x1a,</div><div class='del'>-	0xda, 0xc8, 0xf5, 0xd7, 0xc8, 0x37, 0x31, 0x39, 0xd6, 0xb5, 0x09, 0x59,</div><div class='del'>-	0x4d, 0xfa, 0xff, 0x00, 0x85, 0x57, 0x0f, 0xe7, 0xe8, 0x59, 0x00, 0x00,</div><div class='add'>+	0xdd, 0x3f, 0x08, 0x69, 0x23, 0x6b, 0x69, 0x73, 0x2b, 0xed, 0x3a, 0x0b,</div><div class='add'>+	0xd4, 0xcf, 0xc1, 0xf5, 0xe9, 0x5f, 0xcb, 0x37, 0x8b, 0xb4, 0x6a, 0x43,</div><div class='add'>+	0xea, 0xc4, 0x77, 0x68, 0xf8, 0x63, 0xf5, 0x04, 0x57, 0x7e, 0x65, 0x61,</div><div class='add'>+	0xba, 0xd4, 0x93, 0x3d, 0x66, 0x37, 0xe3, 0x76, 0xfb, 0xbb, 0x2b, 0xe2,</div><div class='add'>+	0x8f, 0x7a, 0xf4, 0x6e, 0x72, 0xd5, 0x52, 0x45, 0x78, 0xaa, 0xc4, 0xa2,</div><div class='add'>+	0x36, 0xe2, 0x61, 0x27, 0xb4, 0x90, 0xde, 0x7b, 0x91, 0xea, 0x41, 0x71,</div><div class='add'>+	0x64, 0x54, 0xf6, 0xd9, 0xec, 0x9e, 0xa7, 0xe6, 0xf6, 0xe3, 0xc4, 0xd8,</div><div class='add'>+	0xee, 0x91, 0x3f, 0xfa, 0xdc, 0x97, 0x7d, 0x95, 0x9a, 0xf2, 0xce, 0x8e,</div><div class='add'>+	0xfd, 0x9e, 0x48, 0x5b, 0xc2, 0x91, 0xdf, 0x5f, 0x58, 0x98, 0x5b, 0x0d,</div><div class='add'>+	0x6b, 0x98, 0x17, 0xac, 0x95, 0x6f, 0x63, 0x72, 0xac, 0xeb, 0x12, 0xb2,</div><div class='add'>+	0x0a, 0xf5, 0x7f, 0x01, 0x28, 0xfc, 0xfc, 0x40, 0x38, 0x5a, 0x00, 0x00,</div><div class='ctx'> 	0x00 };</div><div class='ctx'> </div><div class='ctx'> static const u32 bnx2_CP_b06FwData[(0x84/4) + 1] = {</div><div class='hunk'>@@ -2137,48 +2138,48 @@ static const u32 bnx2_CP_b06FwData[(0x84/4) + 1] = {</div><div class='ctx'> 	0x00000002, 0x00000002, 0x00000002, 0x00000002, 0x00000002, 0x00000002,</div><div class='ctx'> 	0x00000001, 0x00000001, 0x00000001, 0x00000000 };</div><div class='ctx'> static const u32 bnx2_CP_b06FwRodata[(0x130/4) + 1] = {</div><div class='del'>-	0x08001f1c, 0x08001da8, 0x08001ef8, 0x08001ed4, 0x08001eb0, 0x08001e8c,</div><div class='del'>-	0x08001e64, 0x08001e3c, 0x08001e10, 0x08002014, 0x08002004, 0x08001dc4,</div><div class='del'>-	0x08001dc4, 0x08001dc4, 0x08001f44, 0x08001f44, 0x08001dc4, 0x08001dc4,</div><div class='del'>-	0x08001ff4, 0x08001dc4, 0x08001dc4, 0x08001dc4, 0x08001dc4, 0x08001fe4,</div><div class='del'>-	0x08001dc4, 0x08001dc4, 0x08001dc4, 0x08001dc4, 0x08001dc4, 0x08001dc4,</div><div class='del'>-	0x08001dc4, 0x08001dc4, 0x08001dc4, 0x08001dc4, 0x08001dc4, 0x08001dc4,</div><div class='del'>-	0x08001dc4, 0x08001dc4, 0x08001fd4, 0x08001dc4, 0x08001dc4, 0x08001fc4,</div><div class='del'>-	0x08001dc4, 0x08001dc4, 0x08001dc4, 0x08001dc4, 0x08001dc4, 0x08001dc4,</div><div class='del'>-	0x08001dc4, 0x08001dc4, 0x08001dc4, 0x08001dc4, 0x08001dc4, 0x08001dc4,</div><div class='del'>-	0x08001dc4, 0x08001dc4, 0x08001dc4, 0x08001dc4, 0x08001dc4, 0x08001fac,</div><div class='del'>-	0x08001dc4, 0x08001dc4, 0x08001f9c, 0x08001f8c, 0x080031e8, 0x080031f0,</div><div class='del'>-	0x080031b8, 0x080031c4, 0x080031d0, 0x080031dc, 0x08005644, 0x08005604,</div><div class='del'>-	0x080055d0, 0x080055a4, 0x08005580, 0x0800553c, 0x00000000 };</div><div class='add'>+	0x08001e8c, 0x08001d18, 0x08001e68, 0x08001e44, 0x08001e20, 0x08001dfc,</div><div class='add'>+	0x08001dd4, 0x08001dac, 0x08001d80, 0x08001f84, 0x08001f74, 0x08001d34,</div><div class='add'>+	0x08001d34, 0x08001d34, 0x08001eb4, 0x08001eb4, 0x08001d34, 0x08001d34,</div><div class='add'>+	0x08001f64, 0x08001d34, 0x08001d34, 0x08001d34, 0x08001d34, 0x08001f54,</div><div class='add'>+	0x08001d34, 0x08001d34, 0x08001d34, 0x08001d34, 0x08001d34, 0x08001d34,</div><div class='add'>+	0x08001d34, 0x08001d34, 0x08001d34, 0x08001d34, 0x08001d34, 0x08001d34,</div><div class='add'>+	0x08001d34, 0x08001d34, 0x08001f44, 0x08001d34, 0x08001d34, 0x08001f34,</div><div class='add'>+	0x08001d34, 0x08001d34, 0x08001d34, 0x08001d34, 0x08001d34, 0x08001d34,</div><div class='add'>+	0x08001d34, 0x08001d34, 0x08001d34, 0x08001d34, 0x08001d34, 0x08001d34,</div><div class='add'>+	0x08001d34, 0x08001d34, 0x08001d34, 0x08001d34, 0x08001d34, 0x08001f1c,</div><div class='add'>+	0x08001d34, 0x08001d34, 0x08001f0c, 0x08001efc, 0x08003208, 0x08003210,</div><div class='add'>+	0x080031d8, 0x080031e4, 0x080031f0, 0x080031fc, 0x08005694, 0x08005654,</div><div class='add'>+	0x08005620, 0x080055f4, 0x080055d0, 0x0800558c, 0x00000000 };</div><div class='ctx'> </div><div class='ctx'> static struct fw_info bnx2_cp_fw_06 = {</div><div class='del'>-	/* Firmware version: 4.0.5 */</div><div class='add'>+	/* Firmware version: 4.4.22 */</div><div class='ctx'> 	.ver_major			= 0x4,</div><div class='del'>-	.ver_minor			= 0x0,</div><div class='del'>-	.ver_fix			= 0x5,</div><div class='add'>+	.ver_minor			= 0x4,</div><div class='add'>+	.ver_fix			= 0x16,</div><div class='ctx'> </div><div class='del'>-	.start_addr			= 0x08000078,</div><div class='add'>+	.start_addr			= 0x08000080,</div><div class='ctx'> </div><div class='ctx'> 	.text_addr			= 0x08000000,</div><div class='del'>-	.text_len			= 0x59e4,</div><div class='add'>+	.text_len			= 0x5a34,</div><div class='ctx'> 	.text_index			= 0x0,</div><div class='ctx'> 	.gz_text			= bnx2_CP_b06FwText,</div><div class='ctx'> 	.gz_text_len			= sizeof(bnx2_CP_b06FwText),</div><div class='ctx'> </div><div class='del'>-	.data_addr			= 0x08005b40,</div><div class='add'>+	.data_addr			= 0x08005b80,</div><div class='ctx'> 	.data_len			= 0x84,</div><div class='ctx'> 	.data_index			= 0x0,</div><div class='ctx'> 	.data				= bnx2_CP_b06FwData,</div><div class='ctx'> </div><div class='del'>-	.sbss_addr			= 0x08005bc4,</div><div class='add'>+	.sbss_addr			= 0x08005c04,</div><div class='ctx'> 	.sbss_len			= 0xe9,</div><div class='ctx'> 	.sbss_index			= 0x0,</div><div class='ctx'> </div><div class='del'>-	.bss_addr			= 0x08005cb0,</div><div class='add'>+	.bss_addr			= 0x08005cf0,</div><div class='ctx'> 	.bss_len			= 0x5d8,</div><div class='ctx'> 	.bss_index			= 0x0,</div><div class='ctx'> </div><div class='del'>-	.rodata_addr			= 0x080059e4,</div><div class='add'>+	.rodata_addr			= 0x08005a34,</div><div class='ctx'> 	.rodata_len			= 0x130,</div><div class='ctx'> 	.rodata_index			= 0x0,</div><div class='ctx'> 	.rodata				= bnx2_CP_b06FwRodata,</div><div class='hunk'>@@ -2201,761 +2202,761 @@ static const struct cpu_reg cpu_reg_cp = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static u8 bnx2_RXP_b06FwText[] = {</div><div class='del'>-	0xec, 0x5b, 0x5d, 0x70, 0x5c, 0xd7, 0x5d, 0xff, 0xdf, 0xb3, 0x2b, 0x69,</div><div class='del'>-	0x2d, 0x4b, 0xf2, 0x95, 0xbc, 0x71, 0x56, 0xa9, 0x92, 0xec, 0x5a, 0x57,</div><div class='del'>-	0xd2, 0xa6, 0x12, 0xe1, 0xca, 0x6c, 0x12, 0x75, 0xd8, 0x69, 0xb6, 0xbb,</div><div class='del'>-	0xb2, 0xa3, 0xb4, 0x66, 0x46, 0x49, 0x0d, 0xcd, 0xb4, 0x65, 0x10, 0xbb,</div><div class='del'>-	0x0e, 0xa4, 0x0f, 0x0c, 0xc6, 0x40, 0x26, 0x80, 0xc1, 0xcb, 0x4a, 0x71,</div><div class='del'>-	0x94, 0x74, 0xad, 0xdd, 0xda, 0x0a, 0x86, 0x69, 0x61, 0x94, 0xd5, 0x87,</div><div class='del'>-	0x53, 0x66, 0xad, 0x4d, 0xcb, 0x4b, 0x99, 0xd6, 0xb1, 0xea, 0xb8, 0x26,</div><div class='del'>-	0x0f, 0x3c, 0xa4, 0x94, 0xce, 0x64, 0x20, 0x33, 0x35, 0xb2, 0x63, 0xfb,</div><div class='del'>-	0x81, 0x8f, 0xc0, 0x4c, 0x49, 0x20, 0x6e, 0x2e, 0xbf, 0xdf, 0xb9, 0xf7,</div><div class='del'>-	0xca, 0x2b, 0x45, 0xd0, 0x3c, 0xf0, 0x78, 0xcf, 0x8c, 0xe6, 0xde, 0x7b,</div><div class='del'>-	0xce, 0xff, 0xfc, 0xcf, 0xff, 0xfb, 0xe3, 0xac, 0xfd, 0x3b, 0x1d, 0xd2,</div><div class='del'>-	0x2e, 0xde, 0xe8, 0xc4, 0x5f, 0xea, 0xc8, 0x33, 0x47, 0x47, 0xef, 0x1f,</div><div class='del'>-	0xbd, 0x9f, 0xdf, 0x21, 0xc3, 0x08, 0xf3, 0x69, 0x48, 0x30, 0x82, 0x11,</div><div class='del'>-	0x8c, 0x60, 0x04, 0x23, 0x18, 0xc1, 0x08, 0x46, 0x30, 0x82, 0x11, 0x8c,</div><div class='del'>-	0x60, 0x04, 0x23, 0x18, 0xc1, 0x08, 0x46, 0x30, 0x82, 0x11, 0x8c, 0x60,</div><div class='del'>-	0x04, 0x23, 0x18, 0xc1, 0x08, 0x46, 0x30, 0x82, 0x11, 0x8c, 0x60, 0x04,</div><div class='del'>-	0x23, 0x18, 0xc1, 0x08, 0x46, 0x30, 0x82, 0x11, 0x8c, 0x60, 0x04, 0x23,</div><div class='del'>-	0x18, 0xc1, 0x08, 0x46, 0x30, 0x82, 0x11, 0x8c, 0x60, 0x04, 0x23, 0x18,</div><div class='del'>-	0xc1, 0x08, 0x46, 0x30, 0xfe, 0x3f, 0x47, 0x48, 0xc4, 0xe4, 0xb3, 0xd3,</div><div class='del'>-	0xfb, 0x93, 0x88, 0x4a, 0xc7, 0x8f, 0x66, 0x2d, 0x89, 0x84, 0xd2, 0x97,</div><div class='del'>-	0x9e, 0x2e, 0x58, 0x22, 0x99, 0xfa, 0x70, 0x3c, 0x27, 0x3f, 0x71, 0x8a,</div><div class='del'>-	0xd1, 0xb0, 0x70, 0xfe, 0xee, 0xf4, 0xad, 0xe3, 0xe7, 0x1f, 0x4a, 0xbc,</div><div class='del'>-	0xb3, 0x10, 0x92, 0x88, 0x99, 0x7e, 0x63, 0xd4, 0x1c, 0x94, 0x48, 0x1f,</div><div class='del'>-	0xf6, 0x7c, 0x6d, 0x68, 0x6d, 0x97, 0x74, 0xf9, 0xb8, 0x44, 0x6a, 0xe5,</div><div class='del'>-	0x84, 0x7d, 0x40, 0x86, 0xcd, 0x8b, 0x12, 0x96, 0x0c, 0xce, 0x58, 0xa9,</div><div class='del'>-	0x8b, 0x94, 0xca, 0x06, 0x71, 0x48, 0xa9, 0x1e, 0x91, 0x2b, 0x21, 0x42,</div><div class='del'>-	0x7d, 0xcb, 0xc8, 0x56, 0x3e, 0x70, 0x32, 0x61, 0x9c, 0x6b, 0xe1, 0xbd,</div><div class='del'>-	0xe1, 0xcf, 0x47, 0x44, 0xa5, 0x13, 0xc9, 0x6c, 0x68, 0x42, 0x6a, 0xf3,</div><div class='del'>-	0x8e, 0x33, 0x63, 0x7f, 0x0c, 0x38, 0x7a, 0x64, 0xc6, 0x72, 0xbf, 0xb3,</div><div class='del'>-	0xf6, 0xc7, 0xcd, 0x71, 0xb9, 0x13, 0x73, 0x21, 0x51, 0xd6, 0x5d, 0xf8,</div><div class='del'>-	0x8b, 0x1b, 0xb9, 0xd3, 0x5f, 0x36, 0xb2, 0x8b, 0x1d, 0x52, 0xaa, 0x38,</div><div class='del'>-	0x52, 0xb0, 0x25, 0x93, 0xb5, 0x77, 0x60, 0xfd, 0x03, 0xa7, 0xb0, 0xb1,</div><div class='del'>-	0x67, 0xd8, 0xcc, 0x49, 0x8b, 0x64, 0xa2, 0x31, 0xc0, 0xcc, 0x1b, 0xb9,</div><div class='del'>-	0xb3, 0x7f, 0xdd, 0x21, 0xed, 0xa0, 0x27, 0xc5, 0xef, 0x0f, 0x9c, 0x90,</div><div class='del'>-	0x65, 0x61, 0x9d, 0xe7, 0xe3, 0xbb, 0x41, 0xbc, 0x7c, 0x27, 0xce, 0x2b,</div><div class='del'>-	0xce, 0xf9, 0xa1, 0x98, 0x7c, 0xb3, 0x11, 0x95, 0x6f, 0x34, 0x4c, 0x79,</div><div class='del'>-	0xa5, 0xd1, 0x27, 0x17, 0x1a, 0x8e, 0xf3, 0x0d, 0xdb, 0x71, 0xde, 0xc0,</div><div class='del'>-	0xdf, 0x7f, 0xd8, 0x1b, 0x3c, 0x60, 0x14, 0x8d, 0xf1, 0xc6, 0x57, 0x3b,</div><div class='del'>-	0xa4, 0x2b, 0x11, 0x17, 0xd5, 0x21, 0xd3, 0x95, 0x98, 0xcc, 0x54, 0xca,</div><div class='del'>-	0xc6, 0x63, 0x67, 0xe7, 0x8c, 0xc9, 0xb3, 0x55, 0x9c, 0x19, 0xc6, 0x9c,</div><div class='del'>-	0x14, 0x4b, 0xf6, 0xcb, 0x46, 0xae, 0x31, 0x6b, 0x3c, 0x7e, 0xb6, 0x0b,</div><div class='del'>-	0x34, 0xf2, 0xfc, 0x3d, 0x46, 0xf6, 0xf4, 0x2d, 0xc9, 0xda, 0x94, 0x71,</div><div class='del'>-	0xc2, 0xfc, 0x3c, 0xc4, 0x9e, 0x2d, 0x93, 0xe6, 0x56, 0x8f, 0x5e, 0xc7,</div><div class='del'>-	0x51, 0x69, 0xe7, 0x78, 0x36, 0x65, 0x99, 0x25, 0x21, 0x7d, 0x7a, 0xee,</div><div class='del'>-	0x82, 0x4b, 0xf3, 0x8a, 0x91, 0x3d, 0xdb, 0x61, 0xe4, 0xce, 0x84, 0x41,</div><div class='del'>-	0x87, 0xf4, 0x85, 0x84, 0xfb, 0x06, 0x62, 0x79, 0xa9, 0xe3, 0x0c, 0x31,</div><div class='del'>-	0x55, 0x9a, 0x72, 0x05, 0xcd, 0xa0, 0xe5, 0x9b, 0x15, 0xf0, 0x50, 0x01,</div><div class='del'>-	0x0f, 0x15, 0xf2, 0x16, 0x97, 0xf3, 0x43, 0x3e, 0x6f, 0x8e, 0xf3, 0x77,</div><div class='del'>-	0x36, 0x69, 0x4f, 0xc4, 0x33, 0xca, 0xe7, 0xd3, 0x71, 0xfe, 0xdd, 0x26,</div><div class='del'>-	0xaf, 0xe4, 0xc7, 0x71, 0x5e, 0xb1, 0x63, 0xa0, 0xdd, 0xb9, 0xa0, 0xac,</div><div class='del'>-	0x32, 0x78, 0xb1, 0x80, 0x9f, 0xb2, 0x9e, 0x03, 0x0f, 0xb3, 0xe0, 0x6f,</div><div class='del'>-	0x05, 0xbc, 0x55, 0x41, 0xc7, 0x4f, 0x3b, 0xaf, 0x68, 0xe4, 0x86, 0x36,</div><div class='del'>-	0xe4, 0x15, 0xa7, 0x8c, 0xf3, 0x4b, 0x0a, 0xb2, 0xde, 0x29, 0xf9, 0x05,</div><div class='del'>-	0x53, 0xa6, 0x96, 0xfc, 0xfd, 0xbe, 0x1d, 0x1c, 0x91, 0x83, 0x95, 0x1e,</div><div class='del'>-	0xc8, 0x86, 0xb2, 0x4c, 0xd8, 0x22, 0x0e, 0x64, 0x54, 0x4a, 0x2a, 0x11,</div><div class='del'>-	0x23, 0x6f, 0x1f, 0xd7, 0xfa, 0x5f, 0xb2, 0x24, 0x93, 0xb7, 0x29, 0x47,</div><div class='del'>-	0x89, 0xe7, 0xed, 0x62, 0x2c, 0x0c, 0x7b, 0x5b, 0xb2, 0x8a, 0x66, 0x58,</div><div class='del'>-	0x28, 0xc7, 0x44, 0xec, 0xf7, 0x21, 0xcb, 0x27, 0xcb, 0x92, 0xf9, 0x74,</div><div class='del'>-	0xd9, 0x97, 0xb1, 0x2b, 0xdf, 0xcf, 0x94, 0x3f, 0xd5, 0x29, 0xed, 0xea,</div><div class='del'>-	0x9e, 0x16, 0xf9, 0x0d, 0xec, 0x25, 0xee, 0x4d, 0x7b, 0xb1, 0xcf, 0x85,</div><div class='del'>-	0x73, 0xf7, 0x26, 0x9e, 0x10, 0x21, 0x6c, 0xa9, 0xbf, 0x45, 0xfb, 0x88,</div><div class='del'>-	0x18, 0x59, 0xab, 0x18, 0x0b, 0x01, 0x2e, 0x2f, 0xa5, 0x51, 0x6f, 0xae,</div><div class='del'>-	0x25, 0x6b, 0xdd, 0x0a, 0xcd, 0xd8, 0x89, 0x78, 0x49, 0x6e, 0x85, 0x2e,</div><div class='del'>-	0xdb, 0x7a, 0x6e, 0x47, 0xd6, 0x72, 0x64, 0x19, 0xd8, 0x9f, 0x83, 0x3f,</div><div class='del'>-	0x5c, 0x04, 0x47, 0x5f, 0x2a, 0xeb, 0xf9, 0x4e, 0xec, 0x4f, 0xb6, 0x00,</div><div class='del'>-	0x67, 0xbb, 0x24, 0x92, 0x35, 0xcc, 0x5f, 0x76, 0xe7, 0xbb, 0x5d, 0xbc,</div><div class='del'>-	0xa5, 0xfe, 0x76, 0x8d, 0x5b, 0xe4, 0x65, 0x77, 0xfe, 0x0e, 0x17, 0x77,</div><div class='del'>-	0xe9, 0x3e, 0xcc, 0x03, 0xff, 0xe0, 0xc4, 0x90, 0xa1, 0xe7, 0x7b, 0xe9,</div><div class='del'>-	0x4f, 0xbf, 0x5e, 0xbe, 0x15, 0x5a, 0xb6, 0x1d, 0xc9, 0x8d, 0x0e, 0x4e,</div><div class='del'>-	0x0c, 0x1a, 0x2e, 0xbe, 0x13, 0xee, 0xbe, 0xbb, 0x5d, 0x7c, 0x83, 0x13,</div><div class='del'>-	0x49, 0xc3, 0xc5, 0xb7, 0x54, 0xd6, 0x7b, 0x25, 0x5f, 0x26, 0xec, 0xe0,</div><div class='del'>-	0x84, 0x65, 0xdc, 0x2d, 0x53, 0xdd, 0x83, 0x13, 0x7b, 0x0d, 0x75, 0xcf,</div><div class='del'>-	0x4e, 0x97, 0x8f, 0x84, 0x4f, 0xc3, 0x4e, 0x4d, 0x03, 0xcf, 0xd5, 0xf3,</div><div class='del'>-	0x03, 0x59, 0xab, 0x74, 0xdf, 0x4e, 0x7d, 0x3e, 0xcf, 0xd4, 0x73, 0xf7,</div><div class='del'>-	0x91, 0x2e, 0x9e, 0x5d, 0x18, 0xdd, 0x74, 0xee, 0xcf, 0xdc, 0x96, 0xcf,</div><div class='del'>-	0x76, 0x67, 0xf2, 0x3c, 0x89, 0x84, 0xd3, 0xe1, 0xd1, 0x99, 0xf2, 0x11,</div><div class='del'>-	0xc9, 0x56, 0xe2, 0x32, 0x3d, 0xb2, 0x43, 0xa6, 0xcc, 0xfe, 0xa9, 0x83,</div><div class='del'>-	0xc2, 0xd8, 0x13, 0x19, 0x2d, 0x78, 0x3a, 0xcc, 0x89, 0x21, 0xd3, 0xe0,</div><div class='del'>-	0xf1, 0x60, 0x5d, 0x22, 0x06, 0xe0, 0xfb, 0xeb, 0x61, 0x79, 0xbe, 0x61,</div><div class='del'>-	0x48, 0xab, 0xf6, 0xcf, 0x84, 0xb9, 0x06, 0x3b, 0x7c, 0xb6, 0x42, 0x3b,</div><div class='del'>-	0xa6, 0xcd, 0x4a, 0xa6, 0x06, 0x3b, 0xbd, 0xa0, 0x7d, 0xb5, 0x9d, 0x7a,</div><div class='del'>-	0x2d, 0x16, 0x05, 0xae, 0x98, 0xb6, 0xcc, 0x9a, 0xb4, 0x49, 0x66, 0x52,</div><div class='del'>-	0x8a, 0x5c, 0xf7, 0x7c, 0x27, 0xb6, 0x28, 0xdf, 0x85, 0x0d, 0x88, 0x99,</div><div class='del'>-	0x4d, 0x71, 0x9e, 0xf0, 0x4d, 0xb0, 0xa6, 0xeb, 0x77, 0x21, 0xf8, 0x5d,</div><div class='del'>-	0x21, 0x45, 0x58, 0x29, 0xea, 0x58, 0xd1, 0x80, 0x2d, 0x36, 0xee, 0xee,</div><div class='del'>-	0x74, 0x63, 0x5d, 0x04, 0xfe, 0xd9, 0x01, 0x1f, 0xbf, 0x07, 0xfe, 0xd7,</div><div class='del'>-	0x67, 0x64, 0xcf, 0x38, 0x0e, 0x62, 0x4f, 0x54, 0x09, 0xfd, 0x0f, 0xbe,</div><div class='del'>-	0xde, 0xe0, 0x5a, 0x07, 0xe6, 0xc5, 0x9c, 0xb6, 0xbb, 0xc1, 0x9f, 0xe3,</div><div class='del'>-	0x4c, 0xd8, 0x71, 0x29, 0xd9, 0xbb, 0xb0, 0xaf, 0x45, 0xba, 0x2d, 0xda,</div><div class='del'>-	0x3b, 0x7d, 0x7a, 0x27, 0xce, 0x33, 0xf8, 0xdd, 0x85, 0xf3, 0x3a, 0x31,</div><div class='del'>-	0x17, 0x9b, 0xa6, 0x1f, 0xa7, 0x18, 0xb3, 0xdc, 0xf8, 0x29, 0x72, 0x15,</div><div class='del'>-	0xb4, 0x72, 0x8f, 0x86, 0x8b, 0xb4, 0xa5, 0x53, 0x72, 0xa3, 0xdc, 0x2b,</div><div class='del'>-	0x57, 0xa2, 0xe4, 0x1f, 0x38, 0x2b, 0x88, 0x87, 0x51, 0x03, 0xf4, 0x93,</div><div class='del'>-	0x6e, 0xc6, 0xbf, 0xdd, 0xde, 0xb7, 0x71, 0xaf, 0x7b, 0x86, 0x98, 0xa1,</div><div class='del'>-	0x74, 0x97, 0xe4, 0xf4, 0x9c, 0x28, 0x35, 0xba, 0xd3, 0x5b, 0xef, 0x32,</div><div class='del'>-	0x0e, 0x9c, 0x51, 0x32, 0xf4, 0x20, 0x62, 0x16, 0xce, 0xba, 0x6c, 0x39,</div><div class='del'>-	0xce, 0x65, 0xfb, 0xc7, 0xf0, 0x79, 0x25, 0x2d, 0xd6, 0x7a, 0x97, 0xb4,</div><div class='del'>-	0x43, 0x9e, 0x15, 0xa3, 0x49, 0x86, 0x31, 0x39, 0x51, 0xe1, 0x9e, 0xa2,</div><div class='del'>-	0x84, 0x2d, 0xc2, 0x10, 0xfe, 0x47, 0x80, 0x0b, 0x49, 0x1b, 0x7c, 0xf1,</div><div class='del'>-	0xa2, 0x1d, 0x25, 0xbd, 0xbb, 0x5c, 0xf8, 0x6e, 0x9c, 0x41, 0xda, 0xe9,</div><div class='del'>-	0x7b, 0x8e, 0xf6, 0xbd, 0x6c, 0x48, 0x65, 0xc6, 0xe7, 0xe1, 0x49, 0x23,</div><div class='del'>-	0x94, 0x77, 0xb6, 0x1b, 0xa1, 0x5f, 0xa6, 0x87, 0x8a, 0xa6, 0xd2, 0xba,</div><div class='del'>-	0x16, 0xc9, 0x95, 0xef, 0x95, 0x19, 0x1b, 0xe7, 0x59, 0x61, 0xd0, 0xcc,</div><div class='del'>-	0x38, 0x33, 0x50, 0x0c, 0x29, 0x78, 0x58, 0x0f, 0x65, 0xe5, 0xd3, 0xfa,</div><div class='del'>-	0x16, 0xce, 0x2b, 0x1a, 0x61, 0x8b, 0x67, 0xfc, 0xb2, 0x27, 0x1f, 0xda,</div><div class='del'>-	0x9d, 0x2d, 0xd9, 0x72, 0x07, 0xbf, 0x41, 0x47, 0xbb, 0xa6, 0x23, 0x94,</div><div class='del'>-	0xd6, 0xba, 0x33, 0x54, 0xda, 0x8f, 0xff, 0x04, 0xdd, 0x84, 0x07, 0x7c,</div><div class='del'>-	0x70, 0xaf, 0x85, 0xbd, 0x11, 0xd0, 0xd8, 0xd9, 0x44, 0x7f, 0x3b, 0xe1,</div><div class='del'>-	0x21, 0xab, 0x88, 0x77, 0x86, 0xe6, 0xdb, 0x70, 0xf9, 0xf6, 0x65, 0xf5,</div><div class='del'>-	0x2a, 0x64, 0xf5, 0xbe, 0x33, 0xb4, 0x8f, 0x38, 0x52, 0xc0, 0x01, 0xb9,</div><div class='del'>-	0x9b, 0x8c, 0x57, 0x8c, 0x51, 0xe6, 0x06, 0x2e, 0xf8, 0x81, 0x0a, 0xa5,</div><div class='del'>-	0x3b, 0x24, 0x67, 0xea, 0x1c, 0x00, 0xd8, 0x31, 0xd1, 0x31, 0xde, 0x22,</div><div class='del'>-	0x8f, 0xde, 0xb7, 0x95, 0xd0, 0x76, 0x93, 0xaf, 0x32, 0x0f, 0xfc, 0x31,</div><div class='del'>-	0x68, 0x5b, 0x4b, 0x28, 0xcd, 0x5a, 0x07, 0x64, 0x2e, 0x91, 0x96, 0xf4,</div><div class='del'>-	0x1b, 0xb2, 0x5c, 0x56, 0x7b, 0x5a, 0x65, 0x97, 0x4c, 0x42, 0x46, 0xb5,</div><div class='del'>-	0x31, 0xe4, 0xaf, 0x91, 0x0e, 0x09, 0xdd, 0xcf, 0x3c, 0x10, 0x03, 0xad,</div><div class='del'>-	0x6b, 0x09, 0x53, 0x6e, 0x39, 0x6a, 0x10, 0xfb, 0x47, 0xa0, 0x87, 0x43,</div><div class='del'>-	0xd4, 0xa9, 0xf2, 0xe0, 0x08, 0x13, 0xa2, 0xcc, 0x7b, 0x5a, 0x85, 0xb8,</div><div class='del'>-	0xb9, 0x36, 0x1c, 0x33, 0x85, 0xf3, 0xc8, 0x95, 0x93, 0xdc, 0x4b, 0xfe,</div><div class='del'>-	0xdc, 0x3d, 0x1f, 0xe6, 0xcf, 0x5f, 0xa7, 0xcc, 0x28, 0x3b, 0xd8, 0x18,</div><div class='del'>-	0x78, 0xcc, 0xda, 0xbf, 0xe0, 0xc9, 0xe6, 0x4e, 0xb9, 0x62, 0x8a, 0x51,</div><div class='del'>-	0xb3, 0xef, 0x68, 0x92, 0x1f, 0x79, 0xee, 0xde, 0xc2, 0x33, 0x71, 0x6c,</div><div class='del'>-	0xcf, 0xf7, 0xe1, 0x2a, 0xcf, 0x74, 0xcf, 0x9e, 0xb1, 0xd6, 0x12, 0x61,</div><div class='del'>-	0xd9, 0x2c, 0x5f, 0xe8, 0x52, 0x0a, 0x65, 0xda, 0x46, 0xab, 0xe4, 0x51,</div><div class='del'>-	0x8f, 0xd8, 0xfb, 0x10, 0x54, 0x1e, 0x57, 0x32, 0xfa, 0x20, 0x71, 0xfe,</div><div class='del'>-	0x23, 0x79, 0x1a, 0x8b, 0x2b, 0x43, 0xf2, 0x3a, 0xf7, 0xfb, 0xfa, 0xe2,</div><div class='del'>-	0x5c, 0xb3, 0x6d, 0xbf, 0xea, 0xd9, 0xf6, 0xfb, 0xce, 0xe8, 0x3e, 0x5f,</div><div class='del'>-	0xef, 0x90, 0xd7, 0x87, 0xf6, 0x08, 0xf4, 0xfc, 0x7f, 0xed, 0xa1, 0xad,</div><div class='del'>-	0x44, 0xb6, 0xec, 0x29, 0x6e, 0xb3, 0x67, 0xb7, 0xc8, 0x2f, 0xd1, 0x87,</div><div class='del'>-	0xba, 0xbd, 0x98, 0xe1, 0xfb, 0x94, 0x8f, 0x07, 0xba, 0xd1, 0xb6, 0xca,</div><div class='del'>-	0xb9, 0xed, 0x7c, 0x91, 0x38, 0x88, 0x8b, 0x7b, 0x09, 0xe3, 0xe7, 0x54,</div><div class='del'>-	0xa8, 0x43, 0xb6, 0xcd, 0xab, 0x18, 0x13, 0x78, 0x57, 0x88, 0x43, 0xcd,</div><div class='del'>-	0xf9, 0x95, 0x73, 0x26, 0xbe, 0xc7, 0xf1, 0xb4, 0x24, 0x5f, 0xa7, 0x3f,</div><div class='del'>-	0x71, 0x3f, 0xf3, 0xed, 0x4d, 0x2f, 0x7e, 0x76, 0x4c, 0x85, 0xd3, 0x51,</div><div class='del'>-	0xc4, 0x4f, 0x99, 0x2c, 0x95, 0x8f, 0xa3, 0x26, 0x92, 0xe2, 0x5d, 0x69,</div><div class='del'>-	0xda, 0x47, 0xc7, 0x18, 0x62, 0xe4, 0x64, 0xa9, 0xce, 0xba, 0x08, 0x61,</div><div class='del'>-	0x0c, 0xfb, 0x90, 0xa3, 0x23, 0x6a, 0x2e, 0x52, 0xfc, 0x58, 0x9a, 0x71,</div><div class='del'>-	0x39, 0x2e, 0xf1, 0xfa, 0x3b, 0xa8, 0x3b, 0x4c, 0xc9, 0x6a, 0x5b, 0xfb,</div><div class='del'>-	0xb3, 0x5e, 0xd2, 0x5b, 0x42, 0x0d, 0x11, 0x4e, 0x4b, 0x58, 0xa5, 0x5b,</div><div class='del'>-	0x23, 0xd3, 0xa9, 0x0e, 0xd4, 0x5a, 0x13, 0xbd, 0x6a, 0xf5, 0x60, 0x6f,</div><div class='del'>-	0x68, 0x75, 0xcf, 0x54, 0x4b, 0xba, 0xd8, 0xab, 0xe6, 0x44, 0x16, 0xcb,</div><div class='del'>-	0xa2, 0x50, 0xd7, 0xc4, 0x0e, 0x0b, 0xbe, 0x57, 0x3f, 0xfb, 0x59, 0x95,</div><div class='del'>-	0x0e, 0x41, 0xb7, 0x72, 0x6c, 0x29, 0x15, 0x66, 0x0d, 0x19, 0x9f, 0x94,</div><div class='del'>-	0x63, 0xa8, 0x1b, 0x9f, 0x91, 0xe9, 0x32, 0xe8, 0xd2, 0x7c, 0xc7, 0xc0,</div><div class='del'>-	0x6f, 0x1f, 0x70, 0x93, 0xf6, 0x28, 0x62, 0xac, 0x4b, 0x3b, 0x68, 0xce,</div><div class='del'>-	0xe4, 0x58, 0x27, 0xa5, 0x98, 0x57, 0xde, 0x81, 0xfd, 0xd0, 0x5f, 0xfe,</div><div class='del'>-	0x59, 0x96, 0xad, 0x1d, 0x92, 0x77, 0xe3, 0x03, 0xed, 0x15, 0x6b, 0x37,</div><div class='del'>-	0xbd, 0xb5, 0x6b, 0x58, 0xa3, 0xfd, 0xee, 0x6c, 0xd2, 0xe1, 0x97, 0x75,</div><div class='del'>-	0xad, 0x73, 0xd9, 0xe6, 0x3b, 0x61, 0xff, 0x76, 0xd4, 0x85, 0x7d, 0x7d,</div><div class='del'>-	0x74, 0xd9, 0xfa, 0xdc, 0x2e, 0x69, 0x37, 0xa9, 0x37, 0x9c, 0x13, 0x65,</div><div class='del'>-	0x8c, 0xc5, 0xfa, 0x15, 0x0f, 0xd7, 0x5b, 0xc0, 0xd5, 0x41, 0xba, 0x31,</div><div class='del'>-	0xc2, 0x58, 0x07, 0x7d, 0xa8, 0x79, 0xf2, 0x1b, 0xb1, 0x86, 0xb0, 0xdf,</div><div class='del'>-	0xf1, 0x70, 0x7d, 0xab, 0x09, 0x17, 0xd7, 0xf8, 0xe4, 0x99, 0x38, 0xbb,</div><div class='del'>-	0x9d, 0xbc, 0x91, 0x1f, 0xea, 0x80, 0xfa, 0x48, 0x1a, 0x93, 0x88, 0xed,</div><div class='del'>-	0x93, 0x0d, 0x5d, 0xdb, 0x19, 0xb9, 0x0a, 0x6a, 0xae, 0xc6, 0x8b, 0xa0,</div><div class='del'>-	0x11, 0xb5, 0x58, 0x63, 0xd0, 0xab, 0xb7, 0x69, 0x47, 0x6b, 0xda, 0x1e,</div><div class='del'>-	0x19, 0x77, 0x4a, 0xda, 0xae, 0x2e, 0xb9, 0x76, 0x65, 0x51, 0x37, 0x97,</div><div class='del'>-	0x64, 0x6f, 0xbd, 0xba, 0xcb, 0xfd, 0xbf, 0xdb, 0xa6, 0x84, 0xb4, 0x3e,</div><div class='del'>-	0x99, 0xdf, 0x68, 0x63, 0x77, 0x22, 0xae, 0x3b, 0xef, 0x32, 0xcf, 0x4c,</div><div class='del'>-	0x32, 0x07, 0x4d, 0x32, 0x77, 0x18, 0x5e, 0x3c, 0x8c, 0x37, 0xe1, 0x88,</div><div class='del'>-	0x03, 0xc7, 0x8a, 0x67, 0xbf, 0x73, 0x1e, 0x2e, 0xbf, 0xfe, 0xf4, 0x63,</div><div class='del'>-	0xea, 0x9f, 0xdf, 0xb5, 0x79, 0x5d, 0x99, 0xee, 0x77, 0xab, 0x8e, 0xc7,</div><div class='del'>-	0xb0, 0x75, 0xd0, 0x1f, 0x9f, 0x52, 0xb0, 0xaf, 0x5c, 0xdd, 0xd5, 0x07,</div><div class='del'>-	0x7c, 0x1f, 0xb6, 0xc7, 0x57, 0x5f, 0xb7, 0x6e, 0xfd, 0xed, 0xca, 0x80,</div><div class='del'>-	0x3a, 0xcd, 0x90, 0xef, 0x4c, 0x98, 0xb4, 0x34, 0x26, 0xb0, 0x5f, 0x8e,</div><div class='del'>-	0x30, 0x37, 0xe6, 0xc1, 0xc7, 0x61, 0x73, 0xd8, 0x9c, 0x26, 0xee, 0xa8,</div><div class='del'>-	0x00, 0x27, 0x6a, 0xc9, 0x74, 0x9b, 0xa7, 0xe7, 0x6f, 0xf3, 0x7c, 0xe0,</div><div class='del'>-	0xde, 0xc9, 0x6f, 0x3c, 0xbf, 0xed, 0xd1, 0x73, 0xa3, 0xcb, 0xa5, 0xc7,</div><div class='del'>-	0x5f, 0x1f, 0x34, 0x37, 0x7f, 0xaf, 0xf4, 0x7a, 0xf2, 0xc4, 0xfb, 0x33,</div><div class='del'>-	0x1e, 0x5d, 0xd4, 0x4d, 0x33, 0x4d, 0xd4, 0xcb, 0xbb, 0xc0, 0xa3, 0x6b,</div><div class='del'>-	0x8d, 0xa2, 0x4a, 0xa3, 0x76, 0x49, 0x31, 0x67, 0x25, 0xc6, 0x32, 0x62,</div><div class='del'>-	0x41, 0x27, 0x09, 0x7b, 0x0a, 0xbb, 0x6e, 0x96, 0xa9, 0xe7, 0x5b, 0x88,</div><div class='del'>-	0xd5, 0xd4, 0xfb, 0x7b, 0x32, 0x53, 0xee, 0xb7, 0x5b, 0x0d, 0xfa, 0x6b,</div><div class='del'>-	0x22, 0xb9, 0x22, 0xc3, 0xf6, 0x8a, 0xae, 0xa1, 0x12, 0xf1, 0x13, 0x42,</div><div class='del'>-	0xd9, 0xde, 0x92, 0x01, 0x5d, 0xdb, 0xbc, 0x27, 0x16, 0xe4, 0x32, 0x59,</div><div class='del'>-	0x81, 0x8f, 0xed, 0xfb, 0x57, 0x47, 0xd7, 0xa4, 0x08, 0x6f, 0xd7, 0xb7,</div><div class='del'>-	0xc1, 0xf5, 0xba, 0xc6, 0x43, 0x7c, 0xcd, 0xb8, 0x0c, 0x69, 0xdb, 0xe7,</div><div class='del'>-	0xe3, 0xb3, 0x64, 0xb6, 0xe1, 0xe3, 0x0c, 0x23, 0x2e, 0x23, 0x06, 0xec,</div><div class='del'>-	0xfb, 0xbc, 0x67, 0x2f, 0x7c, 0xff, 0xbe, 0xc3, 0x5a, 0x48, 0xa5, 0xbf,</div><div class='del'>-	0xea, 0xcd, 0x7d, 0x8f, 0x32, 0xc0, 0xb7, 0x2f, 0xf7, 0x17, 0xbd, 0x78,</div><div class='del'>-	0x53, 0x34, 0x32, 0x0d, 0xca, 0x80, 0xb6, 0x02, 0xfd, 0x6b, 0xfb, 0x84,</div><div class='del'>-	0xcf, 0x54, 0x3e, 0x89, 0x98, 0xd5, 0xed, 0xd6, 0x0f, 0xe8, 0xaf, 0x32,</div><div class='del'>-	0x0d, 0xce, 0xad, 0xb5, 0x65, 0xed, 0x16, 0xcf, 0x97, 0x0e, 0x62, 0x6e,</div><div class='del'>-	0x12, 0x7f, 0x94, 0x1d, 0x61, 0x0e, 0xe1, 0x3d, 0xe3, 0xc1, 0xc9, 0x58,</div><div class='del'>-	0x16, 0xb9, 0x2b, 0x73, 0x68, 0x1c, 0xdf, 0x86, 0xd7, 0x67, 0x69, 0xb9,</div><div class='del'>-	0x57, 0x51, 0xab, 0x40, 0x9e, 0x03, 0xe0, 0x27, 0x2e, 0xe3, 0x0d, 0xe8,</div><div class='del'>-	0x7c, 0x23, 0x9e, 0x6d, 0xc0, 0x14, 0x6f, 0xc3, 0xb8, 0xb1, 0x6f, 0xbc,</div><div class='del'>-	0xf1, 0xa6, 0xc3, 0x78, 0xf0, 0x57, 0xda, 0x5f, 0xe2, 0xa0, 0xdd, 0xef,</div><div class='del'>-	0xd5, 0x32, 0xc6, 0x63, 0x95, 0x09, 0xe3, 0xf1, 0x0a, 0xf7, 0xa8, 0xaf,</div><div class='del'>-	0xf5, 0x88, 0x15, 0xcf, 0x2a, 0xd4, 0xa9, 0xfb, 0xba, 0x70, 0xe6, 0x09,</div><div class='del'>-	0xd8, 0x46, 0xd1, 0x98, 0x1c, 0xda, 0x25, 0xf9, 0x64, 0x0f, 0x68, 0x7e,</div><div class='del'>-	0x08, 0xcf, 0x56, 0xcc, 0xff, 0x3c, 0xe6, 0x61, 0x47, 0x49, 0xfa, 0xc7,</div><div class='del'>-	0x0e, 0xdd, 0x5b, 0x4e, 0x99, 0xa4, 0x71, 0xc0, 0xb3, 0xad, 0x37, 0x4d,</div><div class='del'>-	0xd7, 0x96, 0x9e, 0xc6, 0xf7, 0x4e, 0xcc, 0x7f, 0x01, 0x4f, 0xe4, 0xb2,</div><div class='del'>-	0x7d, 0xfe, 0x3c, 0x7d, 0x70, 0x0c, 0xf3, 0x0f, 0x00, 0xc7, 0x1f, 0xe0,</div><div class='del'>-	0xfd, 0x5e, 0xbc, 0xff, 0xde, 0x96, 0xbd, 0xbf, 0xcb, 0xb3, 0x31, 0x9f,</div><div class='del'>-	0xdd, 0x32, 0xef, 0xc7, 0x6f, 0x9e, 0x27, 0xd2, 0xbd, 0x0a, 0xc6, 0x57,</div><div class='del'>-	0x23, 0xb2, 0x7b, 0xa5, 0x5d, 0x54, 0xcd, 0x8d, 0xe1, 0xaa, 0x66, 0x4a,</div><div class='del'>-	0xcf, 0x0a, 0xe3, 0xf7, 0x0f, 0xb0, 0xc7, 0x12, 0xb5, 0x0a, 0xa5, 0x51,</div><div class='del'>-	0xb7, 0xda, 0x47, 0x9f, 0x39, 0xba, 0x77, 0x81, 0xcf, 0xe2, 0xd1, 0xd1,</div><div class='del'>-	0x3a, 0x61, 0xf8, 0x7e, 0xec, 0xe8, 0xde, 0xfa, 0x3f, 0x00, 0x16, 0x72,</div><div class='del'>-	0xa9, 0xf8, 0xf8, 0x09, 0x7f, 0x7e, 0xcb, 0x99, 0x5a, 0xb6, 0x38, 0x93,</div><div class='del'>-	0x7e, 0xff, 0xcc, 0xd1, 0x6c, 0x95, 0x75, 0x42, 0x22, 0x26, 0xba, 0x16,</div><div class='del'>-	0x2f, 0x1e, 0x2d, 0x20, 0x3f, 0x86, 0x34, 0x2d, 0xfe, 0x3a, 0xd7, 0xa8,</div><div class='del'>-	0x87, 0xed, 0x68, 0x23, 0x5d, 0xcd, 0x78, 0x98, 0x67, 0x88, 0xe7, 0x18,</div><div class='del'>-	0xf0, 0x24, 0x81, 0x87, 0xf9, 0xc6, 0xa5, 0x37, 0xbe, 0xb0, 0x1d, 0x6d,</div><div class='del'>-	0xc4, 0xc5, 0xb3, 0x7c, 0x7c, 0x3d, 0xa2, 0x56, 0x7e, 0x48, 0x7a, 0x4d,</div><div class='del'>-	0xd6, 0xb6, 0x6e, 0xac, 0x69, 0x91, 0xfc, 0x69, 0xe6, 0xec, 0x7d, 0xde,</div><div class='del'>-	0x37, 0xca, 0x18, 0xf4, 0xdc, 0x71, 0xc5, 0x79, 0x3e, 0xb1, 0x96, 0x62,</div><div class='del'>-	0xb9, 0x82, 0xef, 0x45, 0x1f, 0x56, 0x79, 0xb0, 0x9d, 0x4d, 0x7c, 0xb7,</div><div class='del'>-	0x78, 0xb2, 0xe6, 0x99, 0x7e, 0xef, 0xd9, 0x4c, 0x0b, 0x40, 0xa1, 0x87,</div><div class='del'>-	0xee, 0x0d, 0x3d, 0xf8, 0x7c, 0x62, 0x61, 0x95, 0xb4, 0x25, 0xc1, 0xab,</div><div class='del'>-	0x4f, 0xdb, 0x47, 0xd5, 0x1f, 0xf7, 0x26, 0xf1, 0xe7, 0x9f, 0xe7, 0xcb,</div><div class='del'>-	0x80, 0x74, 0xf1, 0x09, 0x5b, 0xfe, 0x50, 0xef, 0x9c, 0x84, 0xdf, 0xf1,</div><div class='del'>-	0x1e, 0xc4, 0x71, 0x96, 0x6d, 0xca, 0xbe, 0x0d, 0x7a, 0x27, 0x2f, 0x06,</div><div class='del'>-	0x7a, 0x09, 0xc5, 0x9a, 0x2e, 0xce, 0x9e, 0xf5, 0x49, 0xb9, 0x0a, 0x5c,</div><div class='del'>-	0x19, 0xf4, 0x95, 0x6e, 0x6f, 0x34, 0x85, 0xf8, 0xb8, 0x06, 0xfb, 0xbc,</div><div class='del'>-	0x6c, 0xf1, 0x3e, 0x26, 0xcc, 0x7c, 0x27, 0xa5, 0xfa, 0xbf, 0x00, 0x86,</div><div class='del'>-	0xf5, 0xd5, 0xed, 0xbb, 0x96, 0x05, 0xc0, 0x2c, 0x62, 0xed, 0x84, 0x1b,</div><div class='del'>-	0x97, 0x19, 0xdb, 0x1d, 0x85, 0xda, 0xa3, 0x60, 0xfd, 0xb7, 0xc3, 0x3a,</div><div class='del'>-	0xeb, 0x36, 0xec, 0x76, 0x77, 0x21, 0xc8, 0x39, 0xf3, 0x89, 0xd9, 0x05,</div><div class='del'>-	0xc4, 0xf0, 0xaa, 0xa5, 0x76, 0x2b, 0x6d, 0x91, 0x89, 0x2a, 0x62, 0x12,</div><div class='del'>-	0xba, 0xde, 0x44, 0x7c, 0x41, 0xfe, 0x53, 0xeb, 0xa1, 0xc5, 0x1a, 0x36,</div><div class='del'>-	0x7b, 0xd4, 0xe7, 0x68, 0x57, 0x9a, 0xf2, 0xd0, 0x29, 0xe4, 0xe5, 0x91,</div><div class='del'>-	0xc7, 0x90, 0x73, 0x20, 0xaf, 0x53, 0x45, 0x74, 0xf2, 0xb4, 0x91, 0x37,</div><div class='del'>-	0x7e, 0xab, 0x60, 0xb9, 0x7d, 0x80, 0xce, 0x67, 0xe2, 0xf2, 0x18, 0x3a,</div><div class='del'>-	0xd5, 0xa1, 0xe3, 0x4c, 0x5e, 0xc7, 0x9b, 0x7e, 0x73, 0x52, 0xb5, 0xa3,</div><div class='del'>-	0xc6, 0x40, 0x01, 0x8a, 0x0a, 0xc7, 0x1c, 0x14, 0xd9, 0x3b, 0x87, 0xb8,</div><div class='del'>-	0x82, 0x38, 0xbc, 0x77, 0x15, 0xd1, 0xed, 0x14, 0xe1, 0x95, 0x84, 0x4f,</div><div class='del'>-	0x85, 0xa4, 0xe5, 0x14, 0xef, 0x43, 0x64, 0x0f, 0xfa, 0x31, 0xe2, 0xdc,</div><div class='del'>-	0x1b, 0xc6, 0x73, 0x1c, 0x7f, 0xfb, 0x51, 0x5b, 0x99, 0xa8, 0x91, 0xb7,</div><div class='del'>-	0x81, 0x07, 0x2c, 0xf7, 0x6c, 0x07, 0x6f, 0x76, 0x4b, 0x7b, 0x04, 0x7b,</div><div class='del'>-	0x08, 0x1f, 0x06, 0x1d, 0x7b, 0x40, 0x8f, 0x7b, 0x3e, 0x71, 0x84, 0x4f,</div><div class='del'>-	0x89, 0xf4, 0xcf, 0x49, 0x8f, 0xd2, 0x7b, 0xc2, 0x52, 0x48, 0x71, 0xad,</div><div class='del'>-	0x03, 0xf0, 0xdc, 0x87, 0x35, 0xbd, 0xcf, 0xbd, 0x57, 0xca, 0xdf, 0xa6,</div><div class='del'>-	0x1b, 0x73, 0x06, 0xde, 0x51, 0x4f, 0xa5, 0x4c, 0xe9, 0xaf, 0xb9, 0xb0,</div><div class='del'>-	0x7b, 0x57, 0xbf, 0xd4, 0xcd, 0xbb, 0x29, 0x65, 0xb9, 0xb4, 0x29, 0xd4,</div><div class='del'>-	0xc4, 0x79, 0x48, 0x35, 0x3c, 0xc8, 0xfb, 0x19, 0xc2, 0xb0, 0xaf, 0x35,</div><div class='del'>-	0x35, 0x8c, 0x39, 0x48, 0xf9, 0xb9, 0x73, 0x4a, 0xfd, 0x6f, 0xf7, 0x2e,</div><div class='del'>-	0xcd, 0x35, 0x85, 0xf6, 0x15, 0xec, 0xff, 0x43, 0xed, 0x2b, 0xa2, 0xe2,</div><div class='del'>-	0x9e, 0xaf, 0xe0, 0x7b, 0x91, 0xdf, 0x7e, 0x2e, 0xfe, 0xed, 0xbb, 0xdc,</div><div class='del'>-	0x78, 0xef, 0xc8, 0xb4, 0xcd, 0x3b, 0x0c, 0x47, 0x2e, 0xdb, 0x45, 0xe3,</div><div class='del'>-	0x91, 0x4d, 0x75, 0x66, 0x52, 0xe7, 0xe7, 0x02, 0x64, 0xbf, 0x5e, 0xd7,</div><div class='del'>-	0x3d, 0x9b, 0x5c, 0xa9, 0x47, 0xe4, 0xea, 0x52, 0xbb, 0xac, 0x2f, 0xb8,</div><div class='del'>-	0x36, 0xbf, 0xbe, 0x40, 0x3b, 0x37, 0xe5, 0xed, 0x25, 0x0b, 0x6b, 0x49,</div><div class='del'>-	0xfc, 0xf5, 0xc8, 0xf5, 0xa5, 0xcd, 0x75, 0xe7, 0x85, 0xc6, 0xc3, 0xa0,</div><div class='del'>-	0xa5, 0x47, 0x42, 0x96, 0xa3, 0xfb, 0xaf, 0x1c, 0x72, 0x5f, 0x51, 0xc6,</div><div class='del'>-	0x25, 0x5f, 0xe9, 0x47, 0x0f, 0x88, 0xe4, 0x1c, 0x66, 0x0e, 0x82, 0xfe,</div><div class='del'>-	0x2b, 0x9f, 0x40, 0x6d, 0x92, 0x80, 0xf3, 0xf4, 0xeb, 0x7b, 0xc5, 0x4f,</div><div class='del'>-	0x85, 0x7b, 0xa4, 0xd5, 0xfa, 0xa3, 0x6e, 0x37, 0x57, 0x99, 0x6e, 0x9f,</div><div class='del'>-	0x6a, 0xf9, 0xf9, 0xfa, 0x75, 0xe0, 0x1e, 0x81, 0x9d, 0xd2, 0x36, 0x6d,</div><div class='del'>-	0xd8, 0xac, 0x29, 0xcb, 0x43, 0x89, 0x6a, 0x51, 0x18, 0x1f, 0x52, 0x38,</div><div class='del'>-	0xd3, 0xc0, 0xbe, 0x24, 0xe4, 0xb1, 0x43, 0xd7, 0x42, 0x19, 0x05, 0xdd,</div><div class='del'>-	0xce, 0xcd, 0x48, 0xbe, 0xf1, 0x9b, 0x98, 0xcf, 0xc8, 0x54, 0x63, 0x0c,</div><div class='del'>-	0x67, 0x9d, 0xa4, 0xdd, 0xf6, 0x48, 0x3b, 0xcf, 0x49, 0x81, 0xc6, 0x87,</div><div class='del'>-	0xa4, 0x70, 0x7a, 0x46, 0x0e, 0x57, 0x48, 0x27, 0xef, 0x19, 0x13, 0xc9,</div><div class='del'>-	0x9c, 0x0c, 0xc7, 0x97, 0x50, 0x3b, 0xb9, 0xfe, 0x98, 0x96, 0xc2, 0x19,</div><div class='del'>-	0xe0, 0xa8, 0xf0, 0x1e, 0xa0, 0x1f, 0x76, 0x33, 0xac, 0xfb, 0x9a, 0x29,</div><div class='del'>-	0x1d, 0x77, 0x38, 0xff, 0x43, 0xe8, 0xa9, 0xbf, 0xb8, 0x1f, 0x70, 0x79,</div><div class='del'>-	0xf4, 0x40, 0x93, 0xa8, 0x97, 0x17, 0x2b, 0xe8, 0xf7, 0xec, 0x10, 0x6b,</div><div class='del'>-	0x2f, 0xa5, 0xee, 0xef, 0x93, 0x5a, 0x65, 0xd8, 0x54, 0x8a, 0x35, 0x15,</div><div class='del'>-	0x75, 0xc1, 0x35, 0xfa, 0x77, 0x4c, 0x85, 0xad, 0x3e, 0x59, 0xaa, 0x14,</div><div class='del'>-	0xd1, 0x37, 0x2b, 0xef, 0x5e, 0x03, 0x16, 0x60, 0xb9, 0x71, 0x2f, 0xa3,</div><div class='del'>-	0xc8, 0x37, 0xea, 0xcf, 0xc6, 0x27, 0x41, 0x63, 0x26, 0x6e, 0xca, 0x71,</div><div class='del'>-	0xd0, 0x87, 0xf7, 0x45, 0xd8, 0xf8, 0x1c, 0x6b, 0xb8, 0x0c, 0xd6, 0xd2,</div><div class='del'>-	0x72, 0xe4, 0xec, 0x24, 0x68, 0xe8, 0x92, 0xfe, 0x3f, 0xa1, 0x8f, 0x3d,</div><div class='del'>-	0x81, 0x39, 0x7e, 0x27, 0x60, 0xaf, 0x5f, 0xc4, 0x3b, 0x61, 0x63, 0x78,</div><div class='del'>-	0x52, 0x0e, 0x7d, 0x78, 0x9a, 0xa0, 0x25, 0xe2, 0xf6, 0x26, 0x87, 0xe2,</div><div class='del'>-	0x52, 0x3b, 0xfd, 0xa0, 0x4c, 0x2d, 0x3e, 0x08, 0xfc, 0x3f, 0x42, 0x5f,</div><div class='del'>-	0x80, 0xfc, 0xb6, 0xc8, 0xb3, 0x58, 0xff, 0xf1, 0x9c, 0x9d, 0x3d, 0xda,</div><div class='del'>-	0x37, 0xe6, 0x38, 0xcf, 0xe7, 0x41, 0xec, 0x47, 0x8f, 0x51, 0xc9, 0x48,</div><div class='del'>-	0xa1, 0xc2, 0xb3, 0xa0, 0x3b, 0xd4, 0x53, 0xf9, 0xd3, 0x93, 0x9e, 0x8e,</div><div class='del'>-	0x7b, 0x24, 0x17, 0x2d, 0xb2, 0xbf, 0x40, 0x9e, 0x58, 0x18, 0xcd, 0x96,</div><div class='del'>-	0x13, 0x66, 0x56, 0x11, 0x57, 0x52, 0x98, 0x1b, 0xdc, 0xb9, 0x88, 0x58,</div><div class='del'>-	0x73, 0xe8, 0x6d, 0xd3, 0x5c, 0x3b, 0xee, 0xdd, 0x1d, 0x10, 0xd7, 0x9b,</div><div class='del'>-	0x32, 0x0e, 0x1b, 0xeb, 0x9f, 0x1b, 0x41, 0x2d, 0xfc, 0x16, 0x6a, 0xc9,</div><div class='del'>-	0x84, 0x27, 0x83, 0x31, 0xcf, 0x36, 0xda, 0x9b, 0x6c, 0x02, 0x7a, 0xae,</div><div class='del'>-	0x40, 0xf7, 0x15, 0xd8, 0x01, 0x62, 0xf5, 0x2b, 0x1b, 0xf6, 0x31, 0xd6,</div><div class='del'>-	0x54, 0x63, 0x76, 0xca, 0xdf, 0x54, 0x13, 0xc9, 0x35, 0xd8, 0xcf, 0x75,</div><div class='del'>-	0xf4, 0x02, 0x6b, 0xe8, 0x55, 0xd7, 0xd1, 0xd7, 0x2d, 0x96, 0x0f, 0x81,</div><div class='del'>-	0x7e, 0xd6, 0x94, 0xfc, 0x8e, 0xe9, 0x5a, 0xa7, 0xcd, 0x7a, 0xe1, 0x2e,</div><div class='del'>-	0x7d, 0xb7, 0x2b, 0x4f, 0xf4, 0xb0, 0xd7, 0x64, 0x5f, 0xce, 0x7b, 0xe9,</div><div class='del'>-	0xab, 0xd0, 0xe3, 0x9a, 0xc9, 0x75, 0x7f, 0x1f, 0x7b, 0x01, 0xdf, 0x7e,</div><div class='del'>-	0x48, 0x0b, 0xed, 0x87, 0x7b, 0x08, 0xd3, 0xa3, 0xfd, 0x24, 0xaf, 0xf1,</div><div class='del'>-	0xd1, 0x66, 0xeb, 0xdd, 0xae, 0x9f, 0xe9, 0x3a, 0xcb, 0xbc, 0x22, 0xbe,</div><div class='del'>-	0xfd, 0xbe, 0xe7, 0xb0, 0xaf, 0xcb, 0x0e, 0x21, 0x76, 0x37, 0x1c, 0x79,</div><div class='del'>-	0xc1, 0xde, 0xec, 0x77, 0x07, 0x2a, 0xbe, 0x9c, 0x28, 0xc7, 0x43, 0x72,</div><div class='del'>-	0xa2, 0x91, 0x80, 0x4f, 0x50, 0x86, 0x56, 0x93, 0x0c, 0x45, 0xbe, 0x5e,</div><div class='del'>-	0x11, 0x79, 0xb9, 0xc2, 0x35, 0x2d, 0xc3, 0x58, 0x36, 0xd4, 0xce, 0xbb,</div><div class='del'>-	0x75, 0xd8, 0xe5, 0xdf, 0xcb, 0xe1, 0x79, 0x91, 0xb3, 0x58, 0x5f, 0xae,</div><div class='del'>-	0xd0, 0x57, 0x47, 0x50, 0xbf, 0xee, 0x94, 0xda, 0x02, 0x7a, 0xb2, 0x8a,</div><div class='del'>-	0x4c, 0x65, 0x1f, 0x60, 0xbe, 0x89, 0xc8, 0xba, 0xbe, 0x93, 0x15, 0x19,</div><div class='del'>-	0x3c, 0x17, 0x96, 0xf0, 0x39, 0x34, 0x7f, 0x90, 0xfd, 0xf9, 0x21, 0xff,</div><div class='del'>-	0x8e, 0xd6, 0xf5, 0xf9, 0x52, 0x19, 0x7b, 0x2b, 0xfd, 0x3a, 0x4e, 0x96,</div><div class='del'>-	0xea, 0x05, 0xc9, 0x57, 0x79, 0x16, 0x9e, 0x0b, 0x71, 0xac, 0xa5, 0x64,</div><div class='del'>-	0xfa, 0xf4, 0x88, 0x3c, 0x8b, 0x33, 0xd0, 0xff, 0xe1, 0x8c, 0x71, 0x29,</div><div class='del'>-	0x9e, 0xc5, 0x7c, 0xfd, 0x9a, 0x2c, 0x2c, 0x15, 0xa4, 0x56, 0xbd, 0xd0,</div><div class='del'>-	0x74, 0xf7, 0x8e, 0xef, 0x85, 0xe6, 0x5e, 0xf6, 0x10, 0xfb, 0x19, 0xf4,</div><div class='del'>-	0xaa, 0x16, 0xbe, 0x21, 0xb3, 0xfa, 0xf4, 0xd4, 0xe6, 0x3b, 0xe3, 0xe6,</div><div class='del'>-	0x1e, 0x76, 0x42, 0x66, 0x2b, 0x29, 0x29, 0x9d, 0x1e, 0xd1, 0x77, 0x0d,</div><div class='del'>-	0x6d, 0xe9, 0xea, 0xd3, 0x37, 0x90, 0x2b, 0x26, 0xf4, 0x9d, 0xf1, 0x2d,</div><div class='del'>-	0x79, 0xd4, 0x9e, 0x95, 0x27, 0xad, 0x83, 0x72, 0x02, 0xf5, 0xf5, 0xa7,</div><div class='del'>-	0xd1, 0xeb, 0xc7, 0xbb, 0xa9, 0x47, 0xd0, 0x6b, 0xb1, 0x07, 0x75, 0x64,</div><div class='del'>-	0xdc, 0xfe, 0xb8, 0xf9, 0x3c, 0x24, 0x7b, 0xb5, 0xce, 0x3c, 0xf9, 0x5f,</div><div class='del'>-	0x4e, 0x06, 0x79, 0xef, 0x06, 0x7a, 0xc7, 0x8c, 0x86, 0x33, 0x5c, 0xb8,</div><div class='del'>-	0x2a, 0xe1, 0x86, 0xcd, 0x17, 0x08, 0xb7, 0x60, 0x78, 0x70, 0x06, 0xe0,</div><div class='del'>-	0x42, 0x72, 0xd1, 0x0e, 0xc3, 0x46, 0x26, 0xc0, 0x27, 0x62, 0xfc, 0x68,</div><div class='del'>-	0xa7, 0x57, 0x07, 0xef, 0x40, 0x6e, 0xbd, 0xbd, 0xff, 0x35, 0x6f, 0xff,</div><div class='del'>-	0xb3, 0xde, 0xfe, 0xcb, 0x1b, 0xfb, 0xfd, 0xfc, 0xfa, 0x13, 0x47, 0x9a,</div><div class='del'>-	0xe8, 0x7a, 0xad, 0xec, 0xc2, 0xcf, 0x7a, 0x74, 0x5d, 0xde, 0xa0, 0xcb,</div><div class='del'>-	0x87, 0x87, 0x3c, 0x35, 0xcf, 0x8c, 0xcd, 0x8c, 0xd1, 0xfd, 0x90, 0xa3,</div><div class='del'>-	0x23, 0x39, 0x1b, 0xbe, 0x51, 0x49, 0x8c, 0x15, 0xf5, 0x9d, 0x9a, 0x92,</div><div class='del'>-	0xb5, 0xe8, 0xac, 0x4c, 0x58, 0x89, 0xb1, 0x69, 0x09, 0xc1, 0x96, 0x19,</div><div class='del'>-	0x5b, 0x42, 0x52, 0x63, 0xcc, 0xc1, 0x33, 0x6f, 0x6f, 0x4f, 0xeb, 0xd5,</div><div class='del'>-	0x26, 0x5a, 0x43, 0x2f, 0x91, 0x46, 0x97, 0xd6, 0xc8, 0xc0, 0x6d, 0x5a,</div><div class='del'>-	0x5d, 0x78, 0x97, 0xd6, 0xab, 0xe5, 0x26, 0xf8, 0x73, 0x61, 0x0f, 0x3e,</div><div class='del'>-	0xdc, 0x04, 0x4f, 0x7b, 0x66, 0x5d, 0x41, 0x7b, 0x26, 0x6d, 0x3f, 0x0b,</div><div class='del'>-	0xdf, 0x90, 0xc8, 0x8e, 0x74, 0xf5, 0xe8, 0x7d, 0x03, 0x8e, 0x44, 0x50,</div><div class='del'>-	0x6f, 0xb4, 0x62, 0x6d, 0xbd, 0xca, 0x5a, 0x44, 0xed, 0x6d, 0x95, 0x41,</div><div class='del'>-	0xd8, 0x2c, 0x75, 0xe7, 0xde, 0x0d, 0x3e, 0xaa, 0x6b, 0x02, 0x47, 0x9e,</div><div class='del'>-	0xb4, 0x49, 0xcb, 0x8f, 0x9d, 0x97, 0xa3, 0x83, 0x76, 0x49, 0x86, 0xcc,</div><div class='del'>-	0x56, 0x9c, 0x5f, 0x6b, 0x68, 0x9c, 0x49, 0xd2, 0xb2, 0x32, 0xd4, 0x6f,</div><div class='del'>-	0x7e, 0x0f, 0x7c, 0x8e, 0x57, 0x0d, 0xa9, 0x59, 0x89, 0xd8, 0x79, 0xe0,</div><div class='del'>-	0xd8, 0x0f, 0xdd, 0xd4, 0x46, 0x48, 0x8f, 0xc8, 0x61, 0xd8, 0x77, 0x4d,</div><div class='del'>-	0xe7, 0x45, 0xda, 0x71, 0x62, 0xa2, 0x88, 0x5a, 0xe7, 0x2f, 0x75, 0x6e,</div><div class='del'>-	0x73, 0x9c, 0x1b, 0xc8, 0x6f, 0x13, 0x5b, 0x6c, 0x4f, 0x9d, 0x73, 0x6d,</div><div class='del'>-	0x4f, 0x9d, 0x43, 0x0f, 0x7c, 0x32, 0x22, 0x6d, 0xcb, 0xf0, 0x9f, 0x97,</div><div class='del'>-	0xf6, 0xb8, 0xf5, 0xdc, 0x4b, 0xfc, 0xdd, 0x09, 0xf1, 0xee, 0x64, 0x58,</div><div class='del'>-	0xac, 0x93, 0x3a, 0x1f, 0x40, 0xde, 0xe3, 0x32, 0x7d, 0x86, 0x31, 0xd5,</div><div class='del'>-	0x92, 0x81, 0x93, 0xd4, 0x07, 0xeb, 0x9a, 0x85, 0xd1, 0x02, 0x7c, 0x64,</div><div class='del'>-	0x06, 0x71, 0x41, 0x2d, 0xdf, 0x94, 0x82, 0x45, 0x39, 0x74, 0x49, 0xfb,</div><div class='del'>-	0x32, 0xfa, 0xf1, 0x65, 0xc4, 0x86, 0xe5, 0x98, 0xb4, 0xc0, 0xb7, 0xd4,</div><div class='del'>-	0xb9, 0xa8, 0x51, 0x9a, 0x7f, 0x17, 0xfe, 0xc0, 0xdf, 0x70, 0x50, 0x5b,</div><div class='del'>-	0x9e, 0x8b, 0x19, 0xf4, 0x2d, 0x75, 0x8e, 0x76, 0x8e, 0x72, 0xea, 0x1c,</div><div class='del'>-	0xed, 0x9c, 0x74, 0xf8, 0xfe, 0x82, 0xf7, 0x73, 0x23, 0xfa, 0x9e, 0xfa,</div><div class='del'>-	0x86, 0x4d, 0x5e, 0x7e, 0x20, 0xd9, 0x2a, 0x6b, 0x44, 0xf2, 0x23, 0xdd,</div><div class='del'>-	0xa8, 0x65, 0x76, 0x65, 0xed, 0x81, 0xb1, 0x75, 0xf9, 0xa8, 0x7c, 0xdd,</div><div class='del'>-	0xf9, 0x11, 0xf8, 0x22, 0x1f, 0xcd, 0x7c, 0x91, 0xa7, 0x2e, 0x69, 0xd1,</div><div class='del'>-	0x7c, 0xf9, 0xfc, 0x40, 0xd0, 0xe0, 0x67, 0xef, 0xc9, 0x18, 0xf0, 0x7f,</div><div class='del'>-	0x11, 0x31, 0xa0, 0x0f, 0xcf, 0x27, 0xf0, 0x44, 0x4a, 0x3b, 0x47, 0xde,</div><div class='del'>-	0xc9, 0xeb, 0x75, 0xd4, 0x8d, 0x3e, 0x9f, 0x53, 0x78, 0x7f, 0x55, 0xa6,</div><div class='del'>-	0xe7, 0x9d, 0xe3, 0xc8, 0xab, 0xbc, 0x43, 0xef, 0x71, 0xef, 0x83, 0xb7,</div><div class='del'>-	0xf2, 0xfe, 0xaa, 0xb8, 0xf2, 0x49, 0x98, 0x35, 0xc1, 0xfb, 0xd2, 0x56,</div><div class='del'>-	0x59, 0x34, 0xc7, 0x8e, 0x98, 0xae, 0xc3, 0x0f, 0xd7, 0x19, 0x27, 0x28,</div><div class='del'>-	0xa3, 0xeb, 0x92, 0x9d, 0xe7, 0xfd, 0x97, 0x8b, 0x6f, 0xaa, 0xee, 0xc7,</div><div class='del'>-	0x8d, 0xe6, 0x3d, 0x36, 0xe0, 0xfa, 0x00, 0x47, 0xba, 0xd6, 0x28, 0x3f,</div><div class='del'>-	0xc4, 0x9c, 0xde, 0xa6, 0x58, 0xd3, 0xbc, 0x6f, 0x4c, 0x9e, 0x43, 0x1d,</div><div class='del'>-	0xf0, 0x9a, 0xbd, 0x49, 0xae, 0x53, 0xac, 0x85, 0x6a, 0xf5, 0x49, 0xf8,</div><div class='del'>-	0x64, 0x0b, 0x62, 0x99, 0x29, 0xeb, 0xe5, 0x56, 0xa9, 0xa1, 0xde, 0x59,</div><div class='del'>-	0x5c, 0x62, 0x2c, 0x24, 0xed, 0xed, 0x98, 0x77, 0xe3, 0x17, 0x63, 0xed,</div><div class='del'>-	0x7a, 0x19, 0x79, 0x16, 0xbe, 0xbd, 0x5e, 0x8e, 0xe2, 0xd9, 0x87, 0xa7,</div><div class='del'>-	0x85, 0x67, 0x1c, 0xcf, 0x24, 0x9e, 0x23, 0x78, 0x8e, 0xe0, 0x69, 0x61,</div><div class='del'>-	0x6f, 0x0c, 0x4f, 0xbf, 0x67, 0x20, 0xae, 0xdb, 0x7c, 0x97, 0xf4, 0x79,</div><div class='del'>-	0xa8, 0x15, 0x2d, 0xe6, 0xb4, 0xb0, 0x9d, 0x43, 0x1f, 0x91, 0x1d, 0x61,</div><div class='del'>-	0xad, 0xc7, 0x9a, 0xef, 0x03, 0xc7, 0xb4, 0xd8, 0x97, 0x17, 0x8d, 0xfd,</div><div class='del'>-	0x43, 0xcc, 0x0b, 0x55, 0xe4, 0x85, 0xf7, 0x76, 0xa3, 0x7f, 0x34, 0x0f,</div><div class='del'>-	0xe8, 0xbb, 0xa3, 0x79, 0x7c, 0xf3, 0x1d, 0x3d, 0x6f, 0x74, 0x06, 0x79,</div><div class='del'>-	0x8a, 0xf1, 0xd3, 0xc1, 0x9e, 0x3c, 0xe2, 0xf8, 0x2e, 0xf8, 0x5f, 0x06,</div><div class='del'>-	0x71, 0x1b, 0xef, 0x0b, 0x97, 0x76, 0xbb, 0x39, 0x15, 0xf9, 0x56, 0x6d,</div><div class='del'>-	0xbd, 0xaf, 0xb1, 0xb1, 0x67, 0xbb, 0xde, 0xa0, 0x13, 0x38, 0x12, 0xd5,</div><div class='del'>-	0x05, 0xf8, 0xe0, 0xf7, 0xed, 0xe3, 0xba, 0xb6, 0xa3, 0x2e, 0x9e, 0x45,</div><div class='del'>-	0x8d, 0x9a, 0x9b, 0x63, 0x0d, 0x73, 0x0c, 0x7d, 0x09, 0xfa, 0xb3, 0x28,</div><div class='del'>-	0x7b, 0x72, 0xe6, 0x02, 0x5d, 0x8b, 0x46, 0xa5, 0x9d, 0x79, 0xe0, 0x06,</div><div class='del'>-	0xce, 0x03, 0x5f, 0x8b, 0x0e, 0x64, 0xf6, 0x08, 0x6a, 0x42, 0xc7, 0x09,</div><div class='del'>-	0x5b, 0xfb, 0x25, 0xfe, 0x38, 0x63, 0x8e, 0x60, 0xbf, 0x29, 0xee, 0xbd,</div><div class='del'>-	0x3a, 0xe2, 0xee, 0xa4, 0xfe, 0xbd, 0x18, 0xc6, 0x65, 0x63, 0xef, 0x1d,</div><div class='del'>-	0xc0, 0xc5, 0x79, 0xde, 0x69, 0x8b, 0xec, 0x9f, 0x73, 0x6b, 0x5a, 0x65,</div><div class='del'>-	0x35, 0xe3, 0xfb, 0x39, 0x0f, 0x1f, 0xd7, 0x95, 0xf7, 0xdb, 0xc6, 0x1e,</div><div class='del'>-	0xc8, 0x08, 0xfe, 0x00, 0x1d, 0x9f, 0x40, 0xfd, 0x7c, 0x11, 0x7a, 0x79,</div><div class='del'>-	0x0d, 0x3a, 0xb9, 0x54, 0xa6, 0xad, 0x0f, 0xc3, 0xee, 0x21, 0xc3, 0x49,</div><div class='del'>-	0xe2, 0x1a, 0xd1, 0x67, 0x5f, 0x2c, 0x23, 0x76, 0x32, 0xfe, 0xa9, 0x5f,</div><div class='del'>-	0x8d, 0xb2, 0x3e, 0x64, 0x1e, 0x74, 0xf1, 0xf4, 0xb9, 0x70, 0xe2, 0xaf,</div><div class='del'>-	0xed, 0xd6, 0xf4, 0xd4, 0xf4, 0x3d, 0x18, 0xe5, 0x04, 0x1b, 0xe4, 0x6f,</div><div class='del'>-	0x04, 0x1a, 0xe6, 0x0b, 0x51, 0x7d, 0x0f, 0xaf, 0x38, 0x47, 0x3e, 0x46,</div><div class='del'>-	0x24, 0x3b, 0xe7, 0xef, 0xeb, 0xc6, 0xbe, 0x1d, 0x4d, 0xb8, 0xee, 0xdc,</div><div class='del'>-	0xc2, 0x83, 0xf2, 0x78, 0xe0, 0xfa, 0xd6, 0xba, 0x3f, 0x61, 0x16, 0x37,</div><div class='del'>-	0xee, 0x86, 0x99, 0x7f, 0xa9, 0x9b, 0x14, 0xf6, 0xfb, 0xfa, 0xe9, 0xf3,</div><div class='del'>-	0x7a, 0x81, 0xc4, 0x6c, 0x51, 0x58, 0xab, 0x50, 0x47, 0x63, 0xf0, 0x6b,</div><div class='del'>-	0x13, 0xf8, 0x6d, 0xa9, 0x96, 0xdb, 0x44, 0xf5, 0xb0, 0x37, 0x66, 0xad,</div><div class='del'>-	0xdc, 0x7c, 0xe6, 0xaf, 0x78, 0x67, 0xa2, 0x9f, 0x3e, 0xc5, 0xba, 0x59,</div><div class='del'>-	0xe7, 0x19, 0xc0, 0x74, 0x6c, 0xa1, 0xed, 0x17, 0x3d, 0x38, 0xae, 0x27,</div><div class='del'>-	0xa5, 0x88, 0x3a, 0x34, 0x37, 0x87, 0x8a, 0x1e, 0xf1, 0x5b, 0xa5, 0xf9,</div><div class='del'>-	0xbb, 0x16, 0xef, 0xf0, 0x86, 0xe3, 0xd3, 0xa0, 0xb1, 0x68, 0x66, 0x78,</div><div class='del'>-	0x6f, 0x06, 0x1c, 0xbd, 0x5b, 0x70, 0x8c, 0x7b, 0x38, 0xc6, 0xa5, 0x74,</div><div class='del'>-	0x66, 0x02, 0xbe, 0x96, 0x41, 0x7e, 0xef, 0x37, 0x1f, 0x91, 0x4f, 0xa0,</div><div class='del'>-	0xb9, 0xc6, 0xdc, 0xd9, 0x11, 0xe8, 0xc9, 0x71, 0xf6, 0xdb, 0x87, 0x40,</div><div class='del'>-	0xf7, 0x77, 0x90, 0x5b, 0xfd, 0x9a, 0xa7, 0x14, 0x0b, 0x21, 0x87, 0x1d,</div><div class='del'>-	0xd1, 0xbf, 0xc3, 0x16, 0x4d, 0x13, 0xf6, 0xaa, 0x8c, 0xe1, 0x24, 0xda,</div><div class='del'>-	0x7b, 0xe4, 0xb7, 0x59, 0xe4, 0x2a, 0xf2, 0xd9, 0x29, 0x25, 0xd3, 0x78,</div><div class='del'>-	0x38, 0x84, 0xba, 0x26, 0x3b, 0x47, 0x3f, 0x92, 0x81, 0x50, 0xba, 0x15,</div><div class='del'>-	0x35, 0xa9, 0x23, 0x6f, 0xdb, 0xfc, 0x77, 0x0a, 0xb3, 0x72, 0xb1, 0x6e,</div><div class='del'>-	0xe2, 0xf9, 0x5d, 0xe8, 0xe1, 0x4f, 0xf1, 0xfe, 0x76, 0x0f, 0xea, 0x3e,</div><div class='del'>-	0xac, 0x64, 0x60, 0xbb, 0x49, 0x5d, 0xcf, 0xb0, 0x8e, 0xa8, 0x21, 0xdf,</div><div class='del'>-	0x2a, 0xe4, 0x1a, 0xd4, 0x55, 0x63, 0xac, 0x5d, 0x9f, 0x5b, 0xbc, 0x26,</div><div class='del'>-	0x97, 0xe6, 0xf9, 0x3b, 0x28, 0xf3, 0xf2, 0x41, 0xc6, 0x03, 0x73, 0x26,</div><div class='del'>-	0x85, 0xb9, 0x25, 0xc6, 0x32, 0x7c, 0x37, 0xe0, 0x40, 0x3d, 0xa8, 0x11,</div><div class='del'>-	0x50, 0x6b, 0xaf, 0x5b, 0x49, 0xf0, 0x79, 0x4d, 0x2e, 0xce, 0x87, 0x65,</div><div class='del'>-	0xd1, 0x62, 0x5d, 0x24, 0xf1, 0x2c, 0x60, 0x2f, 0x2e, 0xfd, 0x93, 0x6b,</div><div class='del'>-	0x13, 0x84, 0x47, 0xcf, 0x53, 0x44, 0x5d, 0xf7, 0x88, 0xde, 0xfb, 0xd3,</div><div class='del'>-	0xf4, 0x4c, 0x9a, 0x9a, 0xfb, 0xbc, 0x82, 0x5c, 0xa4, 0x3f, 0xe9, 0xdf,</div><div class='del'>-	0x28, 0x58, 0x1b, 0x1c, 0x83, 0xcd, 0xb2, 0x76, 0x67, 0x3f, 0x80, 0xf7,</div><div class='del'>-	0x3a, 0xd7, 0xc9, 0x3b, 0x9e, 0x0b, 0xfd, 0x90, 0x0d, 0xfd, 0x9e, 0x77,</div><div class='del'>-	0x62, 0xc8, 0xa3, 0x8a, 0xbe, 0x5e, 0xd2, 0xb1, 0xa0, 0x54, 0x29, 0x20,</div><div class='del'>-	0xa7, 0x20, 0x06, 0xd8, 0xbd, 0xb0, 0xc5, 0x49, 0xe8, 0x72, 0x0c, 0x70,</div><div class='del'>-	0x5b, 0x72, 0xc9, 0x6a, 0x49, 0xd7, 0x65, 0x6a, 0xe5, 0xf6, 0xfd, 0x4d,</div><div class='del'>-	0x1e, 0xfe, 0xa3, 0x56, 0x61, 0x5b, 0xf0, 0x21, 0xb5, 0x1a, 0xc5, 0x13,</div><div class='del'>-	0xf1, 0x78, 0x15, 0xfd, 0x45, 0x99, 0xf7, 0x43, 0xe8, 0x0d, 0xca, 0xbc,</div><div class='del'>-	0x3b, 0x49, 0xe2, 0x39, 0xc2, 0xfb, 0x22, 0x2f, 0xae, 0x11, 0x3f, 0xe9,</div><div class='del'>-	0xf0, 0xe3, 0x0b, 0x6b, 0x49, 0xc6, 0x17, 0xbf, 0x9e, 0x74, 0x6d, 0xe1,</div><div class='del'>-	0x44, 0x85, 0x31, 0x84, 0x76, 0xdd, 0x8f, 0xb8, 0x45, 0x5b, 0x70, 0x6b,</div><div class='del'>-	0xc9, 0xa5, 0xaa, 0x2b, 0xb3, 0xe9, 0xc6, 0x05, 0x9d, 0x23, 0x0e, 0x88,</div><div class='del'>-	0x05, 0x1b, 0xa3, 0xec, 0xb0, 0xa6, 0x73, 0xc0, 0x79, 0xc9, 0xe8, 0x27,</div><div class='del'>-	0x65, 0xf6, 0xaa, 0x64, 0x96, 0x46, 0xe4, 0x05, 0x1d, 0xb7, 0xfc, 0x98,</div><div class='del'>-	0xc5, 0x1a, 0x92, 0xbf, 0x1f, 0x27, 0xe5, 0xf9, 0xd3, 0xd7, 0x24, 0xfb,</div><div class='del'>-	0x22, 0xe3, 0xd6, 0x70, 0x6c, 0x87, 0xc1, 0x58, 0xe5, 0x48, 0x1d, 0xb9,</div><div class='del'>-	0xe9, 0x11, 0x9b, 0xff, 0x16, 0x20, 0x84, 0x9e, 0xce, 0x91, 0xd6, 0xd1,</div><div class='del'>-	0x84, 0x1d, 0x37, 0xfa, 0x9f, 0xd8, 0x61, 0x30, 0x37, 0x0e, 0x9b, 0x4f,</div><div class='del'>-	0x89, 0x7f, 0x1f, 0xd5, 0x26, 0x4f, 0xe9, 0xbb, 0x0a, 0xb8, 0xed, 0xdc,</div><div class='del'>-	0xfb, 0xfa, 0x77, 0x94, 0x1b, 0x29, 0xca, 0x1a, 0xdf, 0xab, 0x9c, 0x2f,</div><div class='del'>-	0x46, 0x6e, 0xa4, 0x5a, 0xa4, 0x74, 0x87, 0xe3, 0x3c, 0x39, 0xfa, 0xc0,</div><div class='del'>-	0x6e, 0xf7, 0xdf, 0x8b, 0x3c, 0x7d, 0x87, 0x1b, 0x0b, 0x7e, 0xcd, 0xfb,</div><div class='del'>-	0xfe, 0x3a, 0x9e, 0xb4, 0x6d, 0xe6, 0x5b, 0xe6, 0x47, 0xea, 0x0d, 0xcf,</div><div class='del'>-	0x25, 0xbe, 0x33, 0xf7, 0xce, 0x22, 0xf7, 0x32, 0x5f, 0xee, 0x92, 0x1c,</div><div class='del'>-	0x7f, 0xe7, 0x53, 0x7a, 0xbe, 0xe8, 0xd6, 0xd2, 0x1e, 0x5c, 0x75, 0x4a,</div><div class='del'>-	0xa6, 0xab, 0xac, 0xa1, 0x2e, 0x22, 0x97, 0x0d, 0xc1, 0x56, 0x99, 0xd3,</div><div class='del'>-	0x8e, 0x23, 0x9f, 0xf3, 0xf7, 0x69, 0xac, 0x2d, 0x70, 0x5f, 0x22, 0x19,</div><div class='del'>-	0x57, 0xcd, 0xbf, 0x2b, 0xdd, 0x8c, 0xf2, 0x3e, 0xea, 0xfc, 0x10, 0xf4,</div><div class='del'>-	0xfe, 0x15, 0xf6, 0x16, 0x03, 0xda, 0x46, 0xb2, 0x2f, 0x51, 0xf6, 0xee,</div><div class='del'>-	0xef, 0xd7, 0xd2, 0xed, 0xfa, 0x00, 0xeb, 0x80, 0xcf, 0x40, 0x2e, 0x07,</div><div class='del'>-	0xec, 0x6b, 0xcc, 0xdd, 0xff, 0xa6, 0xac, 0xe1, 0xe4, 0x53, 0x06, 0x7d,</div><div class='del'>-	0x1b, 0xdf, 0x4b, 0x21, 0x59, 0x88, 0x92, 0x7f, 0xc8, 0xcb, 0xa0, 0xef,</div><div class='del'>-	0x6c, 0x27, 0x87, 0xad, 0x32, 0xf8, 0x0b, 0xc8, 0x80, 0xb2, 0xf4, 0x65,</div><div class='del'>-	0xc0, 0xf7, 0x09, 0xe8, 0x8b, 0x3d, 0x43, 0xbf, 0xee, 0x23, 0x4b, 0x0d,</div><div class='del'>-	0xf7, 0xec, 0x52, 0xa5, 0x99, 0x66, 0xd2, 0x4b, 0x9d, 0x9e, 0x97, 0x9c,</div><div class='del'>-	0xd6, 0xef, 0xac, 0xe4, 0xaa, 0xe7, 0x65, 0x7f, 0x75, 0x56, 0x1e, 0xb5,</div><div class='del'>-	0x1e, 0x06, 0xbf, 0x57, 0x9c, 0x82, 0xa5, 0x7b, 0x95, 0xb1, 0x3c, 0xce,</div><div class='del'>-	0x2e, 0x8c, 0xf4, 0xca, 0x4d, 0xd4, 0x1d, 0xcf, 0x2e, 0x9a, 0xf2, 0x3f,</div><div class='del'>-	0x9d, 0x5b, 0x5f, 0x6c, 0x5b, 0xd5, 0x19, 0xff, 0x7c, 0x6d, 0x27, 0x69,</div><div class='del'>-	0x68, 0xc2, 0xad, 0xeb, 0x24, 0x6e, 0x9a, 0x51, 0x3b, 0xbe, 0x6d, 0x23,</div><div class='del'>-	0x92, 0xa2, 0xdb, 0x10, 0x68, 0xd4, 0x65, 0x8a, 0x71, 0x42, 0x17, 0xb6,</div><div class='del'>-	0x22, 0xd2, 0xae, 0xab, 0x2a, 0x8d, 0x81, 0xe5, 0xa6, 0x7f, 0xd8, 0xc3,</div><div class='del'>-	0x0a, 0x85, 0x75, 0x08, 0x21, 0xd5, 0xb8, 0xe9, 0xd6, 0x69, 0x21, 0x4e,</div><div class='del'>-	0xff, 0x2d, 0x8c, 0x87, 0xcd, 0x4a, 0xd2, 0x96, 0x4d, 0x11, 0x2e, 0x88,</div><div class='del'>-	0xb2, 0x3d, 0x6c, 0xa3, 0x4a, 0x01, 0xed, 0x79, 0x7b, 0x99, 0x34, 0x36,</div><div class='del'>-	0x65, 0x05, 0x36, 0x5e, 0x36, 0xf5, 0x81, 0x07, 0xa6, 0xd1, 0x79, 0xbf,</div><div class='del'>-	0xdf, 0x77, 0xee, 0x75, 0x6c, 0x13, 0x84, 0xb4, 0x48, 0x91, 0xef, 0x39,</div><div class='del'>-	0xf7, 0xdc, 0x73, 0xce, 0x3d, 0xdf, 0xff, 0xef, 0xfb, 0xdd, 0x8c, 0x3d,</div><div class='del'>-	0x28, 0x3f, 0xd2, 0x5c, 0x3e, 0xe3, 0x93, 0x00, 0x7c, 0x52, 0x83, 0x2d,</div><div class='del'>-	0x90, 0x36, 0x27, 0x76, 0x53, 0xe8, 0x53, 0x86, 0x41, 0xeb, 0xb8, 0xf1,</div><div class='del'>-	0x9b, 0x6d, 0x73, 0x7f, 0xcb, 0x59, 0xf8, 0xee, 0xee, 0x7d, 0x6d, 0x7e,</div><div class='del'>-	0xce, 0xd7, 0xf8, 0xb7, 0x7f, 0xf2, 0x6a, 0x68, 0x83, 0x32, 0x83, 0xfd,</div><div class='del'>-	0xbc, 0xa1, 0x7a, 0xd6, 0x01, 0x2f, 0x31, 0x37, 0x1d, 0xd3, 0xfc, 0x43,</div><div class='del'>-	0x78, 0x9a, 0x3a, 0xea, 0x2a, 0x74, 0xd4, 0x10, 0x75, 0xd7, 0xf0, 0xbc,</div><div class='del'>-	0xcb, 0xfc, 0x40, 0x54, 0xfe, 0x38, 0x45, 0x3d, 0x1c, 0x97, 0x3f, 0x4c,</div><div class='del'>-	0x3d, 0x8b, 0xfd, 0x24, 0x8a, 0xcc, 0x51, 0xde, 0x98, 0xc9, 0xd1, 0x4f,</div><div class='del'>-	0x52, 0x7f, 0x3e, 0xed, 0x3e, 0xad, 0x76, 0x20, 0x6e, 0xe5, 0xd7, 0x87,</div><div class='del'>-	0x55, 0xdf, 0x1c, 0xd3, 0xda, 0x6e, 0xdc, 0xea, 0x92, 0x1b, 0x17, 0x8c,</div><div class='del'>-	0x8e, 0x0d, 0x4f, 0x47, 0x03, 0x23, 0x0b, 0xb4, 0x4b, 0xc9, 0x58, 0xd6,</div><div class='del'>-	0x6a, 0x94, 0x43, 0x51, 0xe6, 0x9e, 0x53, 0xd4, 0xcf, 0xb0, 0x85, 0xbd,</div><div class='del'>-	0x76, 0xd6, 0x6a, 0xf2, 0xec, 0x4f, 0xac, 0x4e, 0xcf, 0x1e, 0xf3, 0xf4,</div><div class='del'>-	0x2c, 0xef, 0xa5, 0x68, 0x03, 0x20, 0x93, 0x89, 0x99, 0x51, 0x2b, 0x09,</div><div class='del'>-	0x9b, 0x87, 0xeb, 0x45, 0xce, 0x1f, 0x97, 0xe3, 0x8b, 0x47, 0xe1, 0x7f,</div><div class='del'>-	0xf7, 0xda, 0x7b, 0x69, 0x57, 0xed, 0x21, 0xe2, 0x71, 0xb0, 0xfe, 0x97,</div><div class='del'>-	0xea, 0xe6, 0x7a, 0xd4, 0x9b, 0x8b, 0xf7, 0x21, 0xe7, 0xd3, 0xac, 0xd7,</div><div class='del'>-	0x36, 0x32, 0x9f, 0xa3, 0x7b, 0xad, 0x1d, 0xbb, 0xa7, 0xb2, 0xee, 0x64,</div><div class='del'>-	0xc1, 0xf1, 0xb0, 0x61, 0xf8, 0x85, 0x2f, 0xf4, 0x8d, 0x08, 0xd7, 0xe4,</div><div class='del'>-	0x7a, 0xad, 0x92, 0xde, 0x0f, 0xfd, 0x32, 0xcd, 0xff, 0x9c, 0x57, 0xbb,</div><div class='del'>-	0x42, 0xbc, 0x12, 0xed, 0x5c, 0xc5, 0x36, 0x7d, 0xc5, 0x9b, 0xaf, 0xbf,</div><div class='del'>-	0x5d, 0x9a, 0xa3, 0x55, 0xe3, 0x99, 0x5b, 0x61, 0x3b, 0x2e, 0xb9, 0x45,</div><div class='del'>-	0xfe, 0x96, 0xcb, 0x11, 0xa7, 0x41, 0xf6, 0xda, 0x1b, 0xeb, 0xe6, 0xd8,</div><div class='del'>-	0x86, 0x3e, 0xe3, 0x13, 0x04, 0xa7, 0x03, 0x9e, 0x6f, 0xb1, 0x89, 0x7e,</div><div class='del'>-	0x93, 0x77, 0xdd, 0xa4, 0x39, 0x99, 0xb8, 0xd5, 0x59, 0xf7, 0x1e, 0x9b,</div><div class='del'>-	0x2a, 0x76, 0x38, 0x6e, 0x51, 0x77, 0x36, 0x46, 0xa5, 0x95, 0x3c, 0x54,</div><div class='del'>-	0x56, 0x3f, 0x3e, 0xe4, 0x18, 0xcc, 0x45, 0xd4, 0x39, 0xd2, 0xce, 0x9c,</div><div class='del'>-	0xfd, 0x5b, 0x7a, 0x6e, 0x2d, 0xf4, 0x09, 0x70, 0x0d, 0x3e, 0xf9, 0x4c,</div><div class='del'>-	0xbe, 0x97, 0xb9, 0x5e, 0xcc, 0xdf, 0xcc, 0xf9, 0x5d, 0xef, 0x9c, 0x13,</div><div class='del'>-	0x6e, 0xce, 0xba, 0x5f, 0xb2, 0x17, 0x0c, 0xff, 0xa5, 0x1d, 0xf0, 0x5e,</div><div class='del'>-	0x2b, 0xda, 0x0b, 0xb4, 0x09, 0x9f, 0x37, 0x8f, 0x6f, 0x1b, 0x7a, 0xd4,</div><div class='del'>-	0x36, 0x9c, 0x2a, 0x90, 0x3f, 0xc9, 0x97, 0x3e, 0x3f, 0xfa, 0x3a, 0x8f,</div><div class='del'>-	0x3c, 0x4a, 0x3d, 0x3b, 0x28, 0x67, 0x0b, 0x3c, 0x9b, 0x94, 0xd6, 0xb4,</div><div class='del'>-	0x36, 0x9f, 0x3b, 0xa8, 0x98, 0xac, 0xee, 0xe9, 0xc4, 0x4b, 0x39, 0x19,</div><div class='del'>-	0x96, 0xab, 0x2e, 0xcf, 0x2c, 0x51, 0xcc, 0x04, 0x5b, 0xaa, 0xde, 0x7f,</div><div class='del'>-	0xbf, 0x9e, 0x59, 0x58, 0x7d, 0xc6, 0x18, 0xc6, 0x3e, 0xef, 0xd1, 0xbb,</div><div class='del'>-	0x55, 0xcf, 0x36, 0x53, 0x43, 0x9f, 0xaf, 0xeb, 0x39, 0x85, 0xa1, 0x13,</div><div class='del'>-	0x59, 0xdf, 0x0f, 0x47, 0xf8, 0x0c, 0xd7, 0xa5, 0xcf, 0xc7, 0xb5, 0xc8,</div><div class='del'>-	0x7b, 0xdd, 0xb0, 0xd8, 0xfd, 0x12, 0xdc, 0x09, 0xd1, 0xdf, 0xc9, 0x3a,</div><div class='del'>-	0x72, 0x00, 0xb2, 0xba, 0xd9, 0x60, 0x60, 0xc6, 0x8d, 0xaf, 0x91, 0xb1,</div><div class='del'>-	0xae, 0xe1, 0x1c, 0x11, 0xab, 0xc0, 0x8f, 0x3e, 0xf5, 0x93, 0xdb, 0x98,</div><div class='del'>-	0x2f, 0xe3, 0xf9, 0xeb, 0x03, 0x98, 0xdf, 0xf1, 0xea, 0xea, 0x53, 0xdb,</div><div class='del'>-	0xc9, 0xab, 0xa3, 0x5a, 0x1f, 0xe4, 0x33, 0x94, 0x63, 0x9e, 0x19, 0xe9,</div><div class='del'>-	0xf2, 0x1e, 0x9e, 0x67, 0x7b, 0x5b, 0x1d, 0x1d, 0x93, 0xde, 0xfe, 0xfc,</div><div class='del'>-	0xfb, 0x61, 0x09, 0xb7, 0x53, 0xc7, 0x45, 0x25, 0x39, 0xcd, 0x98, 0x05,</div><div class='del'>-	0xb6, 0x6b, 0x9c, 0x73, 0x7d, 0xb1, 0x2e, 0xce, 0xfc, 0x9f, 0xba, 0x38,</div><div class='del'>-	0x63, 0x7d, 0xa4, 0xbc, 0x13, 0xd6, 0x3c, 0xd6, 0xe7, 0xd3, 0xb5, 0x58,</div><div class='del'>-	0x43, 0x57, 0xbf, 0x76, 0x1f, 0xad, 0xd0, 0xf1, 0x87, 0x05, 0xda, 0xab,</div><div class='del'>-	0x94, 0xe6, 0x94, 0xff, 0x3e, 0xc5, 0xb3, 0xe5, 0x1e, 0xaf, 0x72, 0x8f,</div><div class='del'>-	0xc3, 0x4b, 0x8a, 0x83, 0x7c, 0x58, 0x65, 0xf8, 0x74, 0x81, 0x3a, 0xa6,</div><div class='del'>-	0x45, 0xe6, 0x67, 0x7c, 0x3d, 0x33, 0xe6, 0xf9, 0xb8, 0xf9, 0xf5, 0x0d,</div><div class='del'>-	0xaa, 0x67, 0xe0, 0xdd, 0x38, 0x23, 0x9e, 0x7d, 0xe9, 0x92, 0xb9, 0x0b,</div><div class='del'>-	0xb4, 0xbb, 0x49, 0xf4, 0x45, 0x03, 0x73, 0x0b, 0xac, 0x4d, 0x12, 0x8b,</div><div class='del'>-	0x32, 0x2c, 0xac, 0xfb, 0x8f, 0xd8, 0xa7, 0x20, 0x6f, 0x31, 0x79, 0x7f,</div><div class='del'>-	0x8a, 0x3e, 0x7d, 0x03, 0x7c, 0xe3, 0xd6, 0xba, 0xf3, 0xdd, 0x51, 0xf1,</div><div class='del'>-	0x09, 0x6b, 0xe9, 0x1e, 0xef, 0x90, 0x66, 0xf2, 0xb9, 0x63, 0xdf, 0x10,</div><div class='del'>-	0xfa, 0x60, 0xbc, 0xce, 0x22, 0x16, 0x60, 0xec, 0x11, 0xd7, 0xd8, 0x63,</div><div class='del'>-	0xae, 0xc8, 0xbe, 0x16, 0x2f, 0xaf, 0xd4, 0xa2, 0xbc, 0x42, 0x7e, 0xcb,</div><div class='del'>-	0xa8, 0xff, 0x3d, 0xa4, 0x3a, 0x2b, 0x3f, 0xd5, 0x6b, 0x70, 0x2c, 0x76,</div><div class='del'>-	0x4c, 0x79, 0x4f, 0x6a, 0x78, 0x2f, 0xe6, 0xad, 0x3d, 0xd6, 0x61, 0x7c,</div><div class='del'>-	0x2b, 0x5b, 0xf5, 0x4d, 0x58, 0xc7, 0xd1, 0xae, 0x70, 0x7e, 0xf2, 0x06,</div><div class='del'>-	0x79, 0x84, 0x3a, 0xcf, 0x1f, 0xe7, 0xd3, 0xc3, 0x6f, 0x73, 0x3c, 0xf9,</div><div class='del'>-	0xbf, 0x1a, 0x8b, 0xe0, 0xcb, 0xaa, 0xdf, 0xe7, 0xcb, 0x1d, 0xef, 0x55,</div><div class='del'>-	0xdb, 0x04, 0xca, 0x5d, 0x75, 0x7d, 0xd2, 0x96, 0xc8, 0xf4, 0x0a, 0x5d,</div><div class='del'>-	0xd2, 0xfd, 0xdc, 0xff, 0xf3, 0xcc, 0xed, 0x42, 0xde, 0x56, 0xa3, 0xcd,</div><div class='del'>-	0x09, 0xa5, 0x4d, 0x06, 0xb4, 0x89, 0x28, 0x6d, 0x18, 0xef, 0x3d, 0xe5,</div><div class='del'>-	0xf1, 0x5b, 0x0b, 0xce, 0x8b, 0xb9, 0x5a, 0xe8, 0xba, 0x7d, 0xd4, 0xf9,</div><div class='del'>-	0xcf, 0x76, 0x68, 0x7d, 0xd0, 0xa1, 0xee, 0x5b, 0x0b, 0x7d, 0xc6, 0xf6,</div><div class='del'>-	0x56, 0xf5, 0x47, 0x4c, 0xbc, 0x15, 0xd7, 0x3c, 0x68, 0x10, 0xfa, 0x79,</div><div class='del'>-	0x6e, 0x0a, 0xbe, 0x1a, 0x71, 0x6f, 0x35, 0xb4, 0xfa, 0x8e, 0x77, 0x5e,</div><div class='del'>-	0xf3, 0x4a, 0x1b, 0xca, 0x00, 0xf5, 0xe6, 0x3a, 0xcc, 0xb7, 0x27, 0xda,</div><div class='del'>-	0x07, 0xfe, 0xfa, 0x19, 0xfa, 0x37, 0x6b, 0x3c, 0x11, 0x84, 0xcc, 0xdf,</div><div class='del'>-	0x9c, 0x6a, 0xf7, 0x62, 0x38, 0x07, 0x6d, 0xc4, 0xad, 0x53, 0x11, 0xc6,</div><div class='del'>-	0x14, 0x68, 0xf7, 0x48, 0xc3, 0x34, 0xe2, 0x57, 0xe8, 0xf1, 0x25, 0xb5,</div><div class='del'>-	0x47, 0x7d, 0xb8, 0x7f, 0x07, 0x71, 0x7e, 0xb8, 0x3e, 0x8a, 0xe7, 0x7a,</div><div class='del'>-	0x0d, 0x16, 0x21, 0xba, 0x45, 0xcf, 0x74, 0x6e, 0x2a, 0x11, 0x3b, 0x2c,</div><div class='del'>-	0x5e, 0xdf, 0xb8, 0xab, 0xfa, 0x60, 0x65, 0x5f, 0x0f, 0xca, 0x9e, 0x8a,</div><div class='del'>-	0xbd, 0x60, 0x1c, 0x0d, 0x1f, 0x7e, 0xc6, 0xd8, 0x83, 0x7c, 0xb1, 0x4f,</div><div class='del'>-	0xf1, 0x51, 0xc1, 0xa1, 0x45, 0x9c, 0x25, 0x7d, 0xd2, 0x65, 0xf8, 0xe1,</div><div class='del'>-	0x2e, 0xce, 0x90, 0x7e, 0x77, 0xf9, 0xe4, 0xa4, 0x9b, 0x62, 0x7d, 0x0c,</div><div class='del'>-	0xfa, 0xe0, 0xa4, 0x8c, 0x20, 0x2e, 0x18, 0x09, 0xb6, 0x32, 0xaf, 0x0c,</div><div class='del'>-	0xdf, 0x30, 0xe7, 0xe5, 0x1e, 0xfb, 0x98, 0x33, 0x95, 0x73, 0x0b, 0xdc,</div><div class='del'>-	0x3b, 0x65, 0xdb, 0xc4, 0xde, 0x73, 0x53, 0xdc, 0xaf, 0xc9, 0x43, 0xb0,</div><div class='del'>-	0x6d, 0x4d, 0xbb, 0xf8, 0xe5, 0x59, 0x0c, 0xe0, 0x77, 0x10, 0xf2, 0xc0,</div><div class='del'>-	0xb1, 0xf8, 0x5d, 0x58, 0x96, 0x77, 0x2f, 0xf8, 0xb6, 0x3d, 0x20, 0x6f,</div><div class='del'>-	0x3b, 0xe5, 0x93, 0xa7, 0xdc, 0xf5, 0x3c, 0x03, 0x37, 0xc7, 0x9a, 0xb5,</div><div class='del'>-	0xe3, 0xb8, 0x79, 0x29, 0x97, 0x97, 0xdc, 0xa5, 0xf5, 0x96, 0xd2, 0x92,</div><div class='del'>-	0xf2, 0xbf, 0x8c, 0x33, 0xbc, 0x7e, 0xaf, 0x25, 0x86, 0x7e, 0xa4, 0xcd,</div><div class='del'>-	0x67, 0x6b, 0x7f, 0xd5, 0xb6, 0xc0, 0xd7, 0x7f, 0xe4, 0x47, 0xf2, 0xe5,</div><div class='del'>-	0xb2, 0xec, 0x52, 0xfd, 0xbf, 0xda, 0x73, 0xd5, 0xba, 0xdf, 0xf7, 0x6f,</div><div class='del'>-	0xa9, 0xdf, 0xb5, 0xfe, 0xa3, 0xf1, 0xc1, 0x96, 0xe9, 0x7a, 0x9d, 0xf0,</div><div class='del'>-	0x98, 0x57, 0x57, 0x58, 0x8d, 0xf7, 0x0e, 0x78, 0x7a, 0x21, 0xa5, 0xbe,</div><div class='del'>-	0x73, 0xca, 0xa6, 0x7e, 0xe0, 0x7e, 0x9a, 0xe5, 0xe0, 0xec, 0x6d, 0xd0,</div><div class='del'>-	0xc4, 0xd7, 0xc1, 0x8c, 0xfb, 0x7c, 0xdd, 0xd1, 0xea, 0xf9, 0xc2, 0x96,</div><div class='del'>-	0x74, 0x9f, 0xa3, 0xef, 0xe4, 0x40, 0x8f, 0xb6, 0x49, 0x66, 0x3c, 0x28,</div><div class='del'>-	0xc9, 0x73, 0x1b, 0x62, 0xc6, 0xd7, 0x25, 0xff, 0x41, 0xde, 0xb4, 0x4f,</div><div class='del'>-	0x7d, 0x51, 0xf4, 0xdf, 0x29, 0x5c, 0xdb, 0xf0, 0x33, 0xe4, 0x79, 0x9f,</div><div class='del'>-	0x7f, 0xcf, 0xae, 0xe3, 0xd1, 0x9d, 0x1e, 0x8f, 0xf2, 0xbe, 0x65, 0xea,</div><div class='del'>-	0x1f, 0x18, 0xdb, 0x7d, 0x8e, 0x7b, 0x34, 0xcf, 0x75, 0x9f, 0x33, 0xf1,</div><div class='del'>-	0x7a, 0xed, 0x73, 0x7d, 0x95, 0xe7, 0x70, 0xbf, 0x47, 0xb1, 0x61, 0x98,</div><div class='del'>-	0x7b, 0xd7, 0x20, 0x7c, 0xba, 0x3e, 0xda, 0x1c, 0xda, 0xef, 0xcd, 0xee,</div><div class='del'>-	0x2e, 0x21, 0xbf, 0x27, 0x3c, 0x9e, 0xa3, 0xbe, 0x89, 0x78, 0xfa, 0x66,</div><div class='del'>-	0xc5, 0xbe, 0x8c, 0x18, 0xfc, 0x09, 0x73, 0x22, 0x55, 0xf6, 0xe5, 0x71,</div><div class='del'>-	0xf3, 0x6e, 0x35, 0xf6, 0xe5, 0x4e, 0x6f, 0x1e, 0xff, 0x9e, 0xaf, 0x57,</div><div class='del'>-	0xfc, 0xb6, 0xaf, 0x57, 0xea, 0x7d, 0x5a, 0x9f, 0xf6, 0xb5, 0xb8, 0xaf,</div><div class='del'>-	0xea, 0x98, 0x2f, 0xbf, 0x6a, 0xde, 0x25, 0x8b, 0x98, 0x8d, 0x3e, 0x65,</div><div class='del'>-	0x22, 0x67, 0x30, 0xd3, 0xd6, 0x59, 0x8b, 0xb8, 0x0f, 0xe7, 0xc7, 0x92,</div><div class='del'>-	0x8e, 0xdc, 0xd6, 0xd8, 0xfa, 0xf4, 0xec, 0x98, 0xe6, 0x79, 0xe6, 0x5c,</div><div class='del'>-	0x4f, 0xef, 0x44, 0x77, 0x43, 0xae, 0x5e, 0x89, 0xac, 0x60, 0x8a, 0x66,</div><div class='del'>-	0x4e, 0xa4, 0x61, 0x87, 0x52, 0x5a, 0x2f, 0xfb, 0x2e, 0xf6, 0x3b, 0xa8,</div><div class='del'>-	0x78, 0xae, 0x35, 0xce, 0x73, 0xf2, 0x90, 0x5d, 0xd6, 0xda, 0x4d, 0xd3,</div><div class='del'>-	0x50, 0xf1, 0x44, 0xd3, 0x8b, 0x3e, 0xdf, 0x93, 0x9f, 0x66, 0x4e, 0x1c,</div><div class='del'>-	0x9c, 0x29, 0x0f, 0x87, 0xb6, 0xf7, 0xda, 0x79, 0x21, 0x66, 0x7f, 0x58,</div><div class='del'>-	0x8e, 0x28, 0x76, 0xf8, 0x15, 0xdc, 0xdf, 0xc7, 0xf8, 0x32, 0x11, 0x52,</div><div class='del'>-	0x4c, 0x70, 0x22, 0x36, 0x01, 0x59, 0xcc, 0xba, 0xc4, 0xf8, 0xaf, 0x55,</div><div class='del'>-	0xac, 0xff, 0x9c, 0xd0, 0xcf, 0x22, 0xa6, 0xe0, 0x59, 0x39, 0xec, 0x6e,</div><div class='del'>-	0x76, 0x97, 0xc4, 0xf8, 0xbf, 0x59, 0xad, 0x09, 0x35, 0xca, 0x84, 0x1b,</div><div class='del'>-	0x6a, 0x4a, 0x97, 0x8c, 0x0c, 0x8c, 0x06, 0x53, 0x6b, 0x26, 0x9d, 0x68,</div><div class='del'>-	0xd3, 0xae, 0x12, 0x64, 0xbc, 0x04, 0xfd, 0x5f, 0x8a, 0x05, 0x46, 0x14,</div><div class='del'>-	0x9b, 0xf6, 0x65, 0x49, 0xb7, 0xd3, 0xcf, 0xa7, 0x3e, 0xf9, 0x8a, 0xdc,</div><div class='del'>-	0xb4, 0xb7, 0xca, 0xcd, 0x1e, 0xe2, 0x31, 0xfb, 0xd1, 0xa6, 0x2e, 0x19,</div><div class='del'>-	0x44, 0x5f, 0x12, 0x7d, 0x4d, 0xca, 0x8f, 0x1a, 0x9f, 0x41, 0x67, 0xdd,</div><div class='del'>-	0xb4, 0xa9, 0xab, 0xee, 0xe2, 0x2f, 0xde, 0xf5, 0x6f, 0xa0, 0x09, 0xb1,</div><div class='del'>-	0x1d, 0xdb, 0xd0, 0xa6, 0x8e, 0xb3, 0xeb, 0xfa, 0x3b, 0xd1, 0xbe, 0x17,</div><div class='del'>-	0x73, 0x34, 0xe8, 0xfb, 0x59, 0xce, 0x76, 0x53, 0xe7, 0xac, 0x19, 0xb3,</div><div class='del'>-	0xae, 0xae, 0xfd, 0xfb, 0x36, 0x83, 0x4f, 0xf8, 0x94, 0xf4, 0xce, 0xa5,</div><div class='del'>-	0xe4, 0xe1, 0x8e, 0xda, 0xf6, 0xbf, 0xea, 0xda, 0xad, 0xb2, 0xa6, 0x8d,</div><div class='del'>-	0x64, 0x38, 0xd6, 0x5e, 0xdb, 0xef, 0xf3, 0x93, 0xdf, 0xee, 0xc0, 0xfb,</div><div class='del'>-	0x42, 0x66, 0xac, 0xa4, 0xc6, 0x52, 0x37, 0xa3, 0x5c, 0xeb, 0xc3, 0xba,</div><div class='del'>-	0x67, 0x78, 0xcd, 0x67, 0xf8, 0x2c, 0xf3, 0x7a, 0xb7, 0xd9, 0x8f, 0x67,</div><div class='del'>-	0x98, 0x13, 0x60, 0x5e, 0x83, 0x3c, 0xbb, 0x5a, 0x9c, 0xc5, 0x31, 0x9f,</div><div class='del'>-	0xcd, 0x37, 0x64, 0x2a, 0xbc, 0xe7, 0xeb, 0x95, 0x58, 0x05, 0xab, 0xb6,</div><div class='del'>-	0xab, 0xe0, 0xe7, 0x84, 0x49, 0x3b, 0xad, 0x49, 0xc5, 0x6e, 0x80, 0xce,</div><div class='del'>-	0x87, 0x40, 0xe7, 0x07, 0x83, 0x8c, 0x0b, 0x9b, 0x3d, 0x5a, 0x3b, 0x32,</div><div class='del'>-	0x52, 0xfa, 0x0d, 0x64, 0x9c, 0x3c, 0x0a, 0x9f, 0xa2, 0x64, 0x79, 0xf8,</div><div class='del'>-	0x8c, 0x01, 0xd8, 0x34, 0x57, 0x82, 0x9a, 0x77, 0x40, 0x7c, 0x3f, 0x7f,</div><div class='del'>-	0x5d, 0x46, 0xa6, 0x98, 0x13, 0x20, 0x3f, 0x33, 0xae, 0x4f, 0xe1, 0xde,</div><div class='del'>-	0x2d, 0x8c, 0x75, 0x21, 0xc3, 0x63, 0xe0, 0xd7, 0x90, 0x38, 0xd3, 0xdb,</div><div class='del'>-	0x24, 0x37, 0x3e, 0xa6, 0x3e, 0x40, 0x37, 0x6c, 0xd4, 0x29, 0x77, 0x54,</div><div class='del'>-	0x26, 0xaf, 0x6c, 0x82, 0xac, 0x32, 0xee, 0xd7, 0x9c, 0x46, 0x39, 0xac,</div><div class='del'>-	0xbe, 0x39, 0x7d, 0x0e, 0xe6, 0xe1, 0x4c, 0x8d, 0xd9, 0xc8, 0xed, 0xa1,</div><div class='del'>-	0x98, 0xb4, 0x8e, 0xca, 0xcc, 0xac, 0xad, 0x78, 0x97, 0x94, 0xdc, 0x2e,</div><div class='del'>-	0x93, 0x76, 0xd9, 0x7d, 0x71, 0xe8, 0x2a, 0xfa, 0xf2, 0x3f, 0x88, 0x98,</div><div class='del'>-	0xb3, 0xdc, 0xbd, 0x81, 0x31, 0x71, 0x72, 0xba, 0x7a, 0x0e, 0xc5, 0xc8,</div><div class='del'>-	0xe0, 0xde, 0x2f, 0xdb, 0x8c, 0xcc, 0x30, 0x3e, 0xfe, 0xa0, 0x9c, 0x8a,</div><div class='del'>-	0x72, 0x4d, 0x8e, 0x65, 0xed, 0x96, 0x3c, 0xc2, 0xbd, 0xfd, 0xc7, 0xe3,</div><div class='del'>-	0xe5, 0x97, 0x31, 0x5f, 0x5c, 0xba, 0x5f, 0x1d, 0xd3, 0xb8, 0xfe, 0x54,</div><div class='del'>-	0x4d, 0x0c, 0x6b, 0xf2, 0x05, 0x26, 0x8e, 0xbd, 0x2e, 0x13, 0x8b, 0xa4,</div><div class='del'>-	0x0f, 0x6d, 0x7c, 0x40, 0x7e, 0xe1, 0xf4, 0xda, 0x4f, 0x68, 0xad, 0x31,</div><div class='del'>-	0x91, 0x62, 0x7d, 0xa6, 0xd9, 0x49, 0xda, 0xf3, 0x12, 0x1a, 0xfc, 0x1a,</div><div class='del'>-	0xae, 0x19, 0xd7, 0xe6, 0xdd, 0x5e, 0xf7, 0x09, 0xf1, 0x71, 0x20, 0x9b,</div><div class='del'>-	0x53, 0x8d, 0x81, 0x4f, 0xca, 0xd7, 0xf7, 0x71, 0x8c, 0xc1, 0x81, 0x48,</div><div class='del'>-	0x80, 0xb4, 0x7a, 0xef, 0x2e, 0xe2, 0x67, 0x6a, 0xf3, 0x7f, 0x0f, 0x1c,</div><div class='del'>-	0xdb, 0x3b, 0x90, 0x38, 0xc3, 0x18, 0x36, 0xec, 0x3c, 0xba, 0xc1, 0xbc,</div><div class='del'>-	0x6b, 0x2e, 0xb7, 0x4e, 0xb4, 0x7e, 0x76, 0xfc, 0x1f, 0x0e, 0xf1, 0x10,</div><div class='del'>-	0x89, 0x58, 0xa3, 0xc5, 0x3c, 0x38, 0x75, 0x1c, 0x6b, 0x2a, 0xcc, 0xb9,</div><div class='del'>-	0x11, 0xcb, 0xdf, 0x24, 0x97, 0xfb, 0x2c, 0x79, 0x20, 0x94, 0x8a, 0x5b,</div><div class='del'>-	0xb2, 0x25, 0x7e, 0x4e, 0xb0, 0x26, 0xeb, 0x2b, 0x8b, 0x89, 0x1c, 0xc7,</div><div class='del'>-	0x87, 0xa6, 0x39, 0x5f, 0x5c, 0xe3, 0x95, 0xe4, 0x96, 0x72, 0xf9, 0x29,</div><div class='del'>-	0x57, 0x02, 0xc9, 0x7b, 0x3e, 0x2c, 0xb3, 0x16, 0x6e, 0xbd, 0xfa, 0x79,</div><div class='del'>-	0x38, 0x05, 0xea, 0x0a, 0x7b, 0xc2, 0x60, 0x0e, 0x27, 0x8f, 0x77, 0x2f,</div><div class='del'>-	0xb2, 0xfd, 0xe4, 0x43, 0xa6, 0x7d, 0x06, 0xed, 0x06, 0x0f, 0xeb, 0x34,</div><div class='del'>-	0x75, 0xbc, 0xbb, 0x78, 0x6c, 0x83, 0x89, 0xbf, 0x97, 0x15, 0xff, 0xf5,</div><div class='del'>-	0x56, 0x4d, 0x4c, 0x93, 0x0a, 0x8c, 0x17, 0xc6, 0x02, 0x63, 0x05, 0xab,</div><div class='del'>-	0xaf, 0x09, 0xb4, 0x5a, 0x70, 0x99, 0xab, 0xf1, 0x73, 0x56, 0xcc, 0xf7,</div><div class='del'>-	0x8b, 0x3c, 0xa9, 0x18, 0x29, 0xd6, 0x14, 0x2d, 0xf5, 0x85, 0x0e, 0x2d,</div><div class='del'>-	0x30, 0xc7, 0x1f, 0x51, 0x7d, 0x70, 0x78, 0xb1, 0x55, 0xf2, 0xf6, 0x7a,</div><div class='del'>-	0xc9, 0xab, 0x8c, 0x47, 0x55, 0x07, 0x58, 0xce, 0x3d, 0xe8, 0xe3, 0xbe,</div><div class='del'>-	0x1f, 0x57, 0x5c, 0xc4, 0xeb, 0x85, 0x4e, 0xb4, 0x99, 0x6b, 0xde, 0x51,</div><div class='del'>-	0xd7, 0x5f, 0x5d, 0x97, 0x4d, 0xd8, 0x96, 0x55, 0x5f, 0x93, 0x65, 0x5f,</div><div class='del'>-	0x7d, 0x2d, 0xf6, 0xb4, 0x5c, 0x27, 0xdf, 0x94, 0xfc, 0x9c, 0xbb, 0xeb,</div><div class='del'>-	0xe5, 0xdc, 0x1f, 0xc3, 0x9c, 0x9c, 0x5b, 0x32, 0xa1, 0xa1, 0xa6, 0xbe,</div><div class='del'>-	0x53, 0x53, 0xc1, 0x5b, 0x2b, 0xf9, 0x53, 0xb4, 0x17, 0x2b, 0xb5, 0x72,</div><div class='del'>-	0xdc, 0x7b, 0x06, 0xbe, 0x48, 0x1e, 0x7e, 0x45, 0xce, 0xfb, 0xfe, 0x80,</div><div class='del'>-	0xf7, 0x2b, 0xcf, 0x7f, 0xc1, 0x9e, 0x9a, 0xb5, 0xce, 0x6e, 0xd5, 0xd4,</div><div class='del'>-	0xd9, 0xbf, 0x8d, 0x67, 0x59, 0x63, 0xcf, 0x95, 0x1b, 0xc0, 0xbb, 0x0d,</div><div class='del'>-	0xc4, 0x89, 0x54, 0xc6, 0x53, 0xc7, 0xab, 0x2e, 0xd7, 0xb9, 0x76, 0x79,</div><div class='del'>-	0x73, 0x05, 0xa1, 0xe7, 0x0f, 0x4e, 0xf9, 0x63, 0x4e, 0x4a, 0x63, 0x7f,</div><div class='del'>-	0x22, 0x16, 0xb4, 0x38, 0xc6, 0xe8, 0xfb, 0xb4, 0x7b, 0x12, 0x7a, 0x9c,</div><div class='del'>-	0x3a, 0x9f, 0xef, 0xed, 0xc0, 0xd7, 0xa3, 0x2e, 0xa0, 0x3e, 0x57, 0x1b,</div><div class='del'>-	0x10, 0xcf, 0x43, 0xd7, 0x8f, 0x94, 0x34, 0x97, 0x1f, 0xfb, 0x6a, 0x30,</div><div class='del'>-	0x31, 0x93, 0x55, 0xdd, 0x00, 0x7f, 0xaf, 0xf4, 0x26, 0xf3, 0x41, 0x67,</div><div class='del'>-	0x24, 0x50, 0x5d, 0xa7, 0x61, 0x6c, 0xc6, 0x9a, 0x46, 0x0b, 0x74, 0x83,</div><div class='del'>-	0xc8, 0x55, 0xf0, 0xc6, 0x6b, 0x0b, 0xe4, 0xd7, 0x60, 0xbb, 0x89, 0xaf,</div><div class='del'>-	0x96, 0x76, 0x58, 0xd2, 0xae, 0xb5, 0xcf, 0xbc, 0x13, 0xa1, 0x7f, 0x32,</div><div class='del'>-	0x9c, 0xec, 0x87, 0x9f, 0xad, 0xd8, 0x03, 0xe6, 0x2b, 0x0f, 0x22, 0x1e,</div><div class='del'>-	0xab, 0xce, 0xb1, 0x40, 0xbe, 0xc6, 0xd9, 0x9f, 0x85, 0x5f, 0xb9, 0x52,</div><div class='del'>-	0xf7, 0xc8, 0x17, 0x27, 0x35, 0xb7, 0x39, 0xb7, 0xd0, 0xa2, 0x3a, 0x76,</div><div class='del'>-	0xae, 0x38, 0x86, 0x73, 0x91, 0xad, 0xd6, 0x50, 0xde, 0xeb, 0x0f, 0x4b,</div><div class='del'>-	0xb1, 0xc8, 0xb6, 0x74, 0x35, 0xe8, 0xb9, 0xfb, 0xb5, 0x1d, 0x5b, 0xe6,</div><div class='del'>-	0xe1, 0x2b, 0x16, 0x17, 0x1d, 0xfc, 0xf7, 0xe0, 0xbf, 0x0f, 0xff, 0xbb,</div><div class='del'>-	0x25, 0x3d, 0x4d, 0xff, 0x95, 0xb5, 0x9c, 0x96, 0xba, 0xf5, 0xe9, 0x23,</div><div class='del'>-	0x75, 0x29, 0x0e, 0x2c, 0xef, 0xc5, 0x39, 0xf9, 0x62, 0xbd, 0x9c, 0x30,</div><div class='del'>-	0x4f, 0xea, 0xeb, 0x08, 0xe6, 0x4b, 0xfd, 0x5a, 0x5f, 0x75, 0x0d, 0xcb,</div><div class='del'>-	0xf2, 0xea, 0x5e, 0xe4, 0xe9, 0x66, 0x39, 0x5c, 0xf4, 0x6b, 0x57, 0x31,</div><div class='del'>-	0x39, 0x52, 0xa9, 0x5d, 0x49, 0x26, 0x38, 0xf4, 0xc9, 0x23, 0xd9, 0x29,</div><div class='del'>-	0xc5, 0x13, 0x58, 0xd6, 0xd0, 0xf5, 0x47, 0x26, 0x16, 0xdf, 0x7e, 0x64,</div><div class='del'>-	0x05, 0x13, 0x8e, 0x7b, 0x8b, 0xab, 0x61, 0x86, 0x88, 0xa5, 0xe3, 0xb7,</div><div class='del'>-	0x72, 0xea, 0xbb, 0x61, 0xdf, 0x7e, 0xcc, 0x43, 0x9c, 0x1d, 0xf4, 0x4c,</div><div class='del'>-	0xf3, 0x0a, 0x76, 0xd7, 0xc4, 0xa3, 0xc4, 0x91, 0xf2, 0xb9, 0x6a, 0xec,</div><div class='del'>-	0x47, 0x08, 0xe7, 0x2f, 0x01, 0xcb, 0xc9, 0x61, 0x1f, 0x3f, 0xed, 0x34,</div><div class='del'>-	0x7e, 0x20, 0x71, 0xa6, 0x89, 0x2a, 0xec, 0x91, 0x8f, 0x35, 0x7d, 0x09,</div><div class='del'>-	0x73, 0x65, 0xe4, 0x77, 0xa5, 0x47, 0xe5, 0x57, 0xa5, 0x31, 0xc8, 0xf7,</div><div class='del'>-	0x04, 0xe6, 0x3c, 0x20, 0x6f, 0x96, 0xf6, 0xc9, 0xb5, 0xd2, 0xb8, 0xbc,</div><div class='del'>-	0x51, 0xda, 0x8d, 0x98, 0x6a, 0x94, 0x58, 0x4f, 0x0f, 0x2b, 0x3d, 0x2c,</div><div class='del'>-	0x07, 0xcf, 0x2b, 0x06, 0xf0, 0x16, 0xfd, 0x9e, 0xe3, 0xea, 0x67, 0x13,</div><div class='del'>-	0x5f, 0x9f, 0xf8, 0x35, 0xe3, 0x79, 0x62, 0x33, 0x8b, 0x25, 0x1f, 0xc3,</div><div class='del'>-	0x71, 0xb4, 0x0b, 0x6b, 0xdb, 0xfc, 0x36, 0x65, 0xe4, 0x7c, 0x24, 0x30,</div><div class='del'>-	0x7a, 0x3e, 0x14, 0x78, 0x50, 0xbf, 0x73, 0x61, 0xbd, 0xb3, 0x2c, 0x93,</div><div class='del'>-	0xae, 0x43, 0xde, 0x1c, 0x1c, 0x81, 0x2c, 0x8c, 0x42, 0xd5, 0x3f, 0xe4,</div><div class='del'>-	0xac, 0x17, 0x90, 0x34, 0xf5, 0x11, 0xfc, 0xcc, 0xe4, 0x8b, 0xae, 0x64,</div><div class='del'>-	0x0b, 0xf3, 0x01, 0x83, 0x47, 0xb3, 0xd1, 0xee, 0x43, 0xfb, 0xe7, 0x5e,</div><div class='del'>-	0x7b, 0xa7, 0x64, 0x67, 0x25, 0xf5, 0xbe, 0xfa, 0xc3, 0x2f, 0x7b, 0x7d,</div><div class='del'>-	0x83, 0xe8, 0x03, 0x67, 0x5e, 0x64, 0xdf, 0x45, 0xaf, 0x8f, 0x67, 0xc2,</div><div class='del'>-	0x5a, 0x7d, 0x5c, 0xf9, 0x2a, 0x6b, 0x8f, 0x8b, 0x7e, 0xd7, 0xa0, 0xb5,</div><div class='del'>-	0xf8, 0x0f, 0x3a, 0x8d, 0x6e, 0x23, 0x26, 0xf0, 0x9f, 0x9d, 0x8c, 0xc1,</div><div class='del'>-	0x8a, 0x90, 0xaf, 0xbb, 0xa0, 0x13, 0xff, 0xba, 0x75, 0xa5, 0x6d, 0x0d,</div><div class='del'>-	0x7d, 0x5c, 0x85, 0xd1, 0xfe, 0x58, 0xba, 0x17, 0xff, 0xed, 0xe1, 0x79,</div><div class='del'>-	0x9f, 0xc0, 0xbb, 0xe1, 0xac, 0x0a, 0xc4, 0x8d, 0xc7, 0x21, 0xdb, 0x2d,</div><div class='del'>-	0xb2, 0xfe, 0x2c, 0xe9, 0xd5, 0x0b, 0x5d, 0x9d, 0x82, 0xdc, 0xba, 0xb2,</div><div class='del'>-	0x50, 0x0a, 0x05, 0x46, 0x0a, 0x29, 0x31, 0x78, 0x6a, 0x4b, 0x32, 0xd1,</div><div class='del'>-	0x94, 0x9c, 0x1e, 0x48, 0xf4, 0x30, 0x0f, 0x99, 0xed, 0x77, 0xe5, 0x52,</div><div class='del'>-	0x89, 0xf6, 0x38, 0x27, 0x97, 0x07, 0x12, 0x6e, 0x51, 0x88, 0x8b, 0x71,</div><div class='del'>-	0xe5, 0x32, 0x64, 0xf3, 0x9d, 0xf3, 0xbb, 0xe5, 0x48, 0x41, 0xfd, 0xe0,</div><div class='del'>-	0xde, 0xb0, 0xbc, 0x20, 0x97, 0x06, 0x5e, 0xb8, 0x75, 0xc9, 0x3d, 0x84,</div><div class='del'>-	0x33, 0x25, 0x1f, 0x1e, 0xee, 0x32, 0xfb, 0x56, 0x1c, 0x92, 0x30, 0x1f,</div><div class='del'>-	0xa2, 0x35, 0x35, 0xa7, 0x51, 0xd2, 0xfb, 0x23, 0x5e, 0x5c, 0x0e, 0x9f,</div><div class='del'>-	0x3b, 0x30, 0x60, 0xea, 0x29, 0x01, 0x7f, 0x9f, 0x61, 0xf8, 0x31, 0x7c,</div><div class='del'>-	0xce, 0xa7, 0x8d, 0x3f, 0x4f, 0x67, 0x20, 0x3d, 0xdb, 0x2a, 0xa1, 0x8b,</div><div class='del'>-	0xf7, 0x81, 0xae, 0x21, 0x39, 0xd4, 0x5f, 0x2e, 0x7f, 0xd3, 0x0d, 0xc5,</div><div class='del'>-	0x27, 0x10, 0xa3, 0x60, 0xff, 0xb2, 0xee, 0xc5, 0x36, 0xd0, 0xa4, 0x49,</div><div class='del'>-	0xa2, 0x2f, 0xfa, 0xeb, 0x35, 0x7a, 0x58, 0x86, 0x8b, 0xeb, 0x8c, 0x2d,</div><div class='del'>-	0xf3, 0xb1, 0x0d, 0xfe, 0x7c, 0x06, 0x53, 0xd6, 0x6d, 0xf5, 0x07, 0xbc,</div><div class='del'>-	0xef, 0x24, 0xbc, 0xf6, 0x3d, 0x81, 0x07, 0x42, 0xed, 0x12, 0x72, 0x9e,</div><div class='del'>-	0xdf, 0x48, 0x6c, 0xe4, 0x52, 0xc1, 0xef, 0x87, 0x9f, 0x18, 0xf2, 0xfd,</div><div class='del'>-	0x61, 0xd9, 0xbe, 0x72, 0xd6, 0xb2, 0xbd, 0x7b, 0xf1, 0x5b, 0xde, 0x9c,</div><div class='del'>-	0x29, 0x6f, 0x2c, 0x62, 0x8e, 0xd8, 0x5a, 0xb5, 0x4f, 0x66, 0xec, 0xa7,</div><div class='del'>-	0xf2, 0x74, 0x7f, 0xe2, 0x15, 0xc5, 0xc9, 0x56, 0x9e, 0xe1, 0x7d, 0xc4,</div><div class='del'>-	0x90, 0x25, 0x7d, 0x26, 0xb6, 0x07, 0xf4, 0xcd, 0xc4, 0xee, 0xb6, 0xe7,</div><div class='del'>-	0xad, 0x60, 0xc0, 0xf8, 0x23, 0x0d, 0xf2, 0xbd, 0x28, 0xec, 0x36, 0xbf,</div><div class='del'>-	0x61, 0x61, 0xfe, 0xcb, 0xbd, 0xed, 0xf9, 0x29, 0xec, 0x4b, 0x9c, 0x49,</div><div class='del'>-	0x5a, 0x13, 0xd8, 0x1f, 0xcf, 0x80, 0x18, 0x50, 0x0b, 0x74, 0xea, 0xc4,</div><div class='del'>-	0xfb, 0x21, 0x7e, 0xea, 0xf7, 0xdf, 0x7f, 0x1d, 0x74, 0x18, 0xf7, 0x6f,</div><div class='del'>-	0x70, 0x61, 0x62, 0x31, 0x17, 0x32, 0xec, 0x61, 0x60, 0xab, 0xe5, 0xd6,</div><div class='del'>-	0xc7, 0xc6, 0xfa, 0x78, 0x3a, 0x62, 0x94, 0x62, 0xf0, 0x03, 0x29, 0x13,</div><div class='del'>-	0xe4, 0xcd, 0x0e, 0xf4, 0xaf, 0xf9, 0x24, 0xa5, 0xaf, 0xee, 0xf7, 0x7d,</div><div class='del'>-	0x58, 0xc1, 0x76, 0x4f, 0x14, 0xf6, 0x19, 0x6c, 0x9e, 0xb5, 0x2c, 0xa9,</div><div class='del'>-	0xae, 0xa4, 0x3d, 0x89, 0xfd, 0xa6, 0x43, 0x89, 0x62, 0x4e, 0x62, 0x32,</div><div class='del'>-	0x0f, 0x7d, 0xf1, 0x1a, 0x64, 0xff, 0x5a, 0x29, 0x1e, 0x48, 0x63, 0x4f,</div><div class='del'>-	0x87, 0x0b, 0x43, 0x32, 0x31, 0xab, 0xdf, 0x7e, 0x41, 0xef, 0x0f, 0xc9,</div><div class='del'>-	0x5c, 0x21, 0xd1, 0x33, 0x0f, 0xfe, 0x9b, 0x2f, 0x10, 0x5f, 0xd4, 0x1b,</div><div class='del'>-	0x1f, 0xc5, 0x8c, 0x4b, 0x85, 0xcd, 0xb0, 0x0f, 0x92, 0xba, 0x04, 0xff,</div><div class='del'>-	0xe7, 0x52, 0xa9, 0x07, 0x7c, 0x86, 0xfb, 0x25, 0x07, 0xbf, 0xd0, 0x99,</div><div class='del'>-	0xa5, 0x01, 0xc8, 0x39, 0xf7, 0x62, 0xcb, 0xc2, 0x56, 0x9c, 0x1d, 0x71,</div><div class='del'>-	0x44, 0x8a, 0x1f, 0xff, 0x2f, 0xce, 0xd7, 0x7f, 0xef, 0x1d, 0x6a, 0xa7,</div><div class='del'>-	0xe7, 0x75, 0x5f, 0xb0, 0xcb, 0x88, 0x01, 0xb2, 0xfd, 0xc6, 0x6e, 0xa7,</div><div class='del'>-	0x23, 0x6d, 0x92, 0xbe, 0x9b, 0x76, 0xbc, 0x5d, 0x63, 0x44, 0xe5, 0xc5,</div><div class='del'>-	0x08, 0xef, 0xbf, 0xb3, 0xd1, 0xd0, 0x2f, 0x5c, 0xd7, 0xbe, 0x8e, 0xdf,</div><div class='del'>-	0x56, 0xe9, 0x70, 0xf8, 0x6b, 0xe3, 0xf7, 0xed, 0x8d, 0xac, 0xef, 0x76,</div><div class='del'>-	0x38, 0x49, 0xac, 0xf5, 0x5b, 0x2f, 0x5f, 0x80, 0xeb, 0x79, 0x3e, 0xb3,</div><div class='del'>-	0xc1, 0x5b, 0x97, 0xf3, 0xb6, 0x62, 0x9e, 0x16, 0x6f, 0xad, 0x56, 0xcd,</div><div class='del'>-	0x4f, 0x9a, 0xb5, 0x10, 0xe3, 0x16, 0xfe, 0xb2, 0x51, 0xbf, 0x35, 0x86,</div><div class='del'>-	0xbd, 0xa8, 0x6d, 0xff, 0x79, 0x23, 0x71, 0x73, 0x1d, 0x4e, 0xab, 0x62,</div><div class='del'>-	0x3c, 0x6f, 0xb6, 0xb7, 0xe3, 0x9a, 0x6b, 0x72, 0x8c, 0xc9, 0x87, 0xcf,</div><div class='del'>-	0x95, 0x38, 0x3f, 0xdb, 0x29, 0x39, 0xa1, 0xf9, 0x0c, 0x83, 0xe5, 0x9b,</div><div class='del'>-	0x2b, 0xdc, 0x2f, 0x13, 0xe7, 0x15, 0x5f, 0x37, 0x93, 0xb7, 0xf8, 0xdd,</div><div class='del'>-	0x0b, 0xbf, 0x97, 0xa3, 0x2f, 0x31, 0x26, 0x07, 0x71, 0x7e, 0x97, 0xe1,</div><div class='del'>-	0x53, 0x2d, 0x99, 0xef, 0x62, 0xf1, 0x77, 0x00, 0xe7, 0x12, 0x82, 0x8c,</div><div class='del'>-	0x51, 0x46, 0x29, 0x53, 0x38, 0xbf, 0x71, 0x5b, 0xde, 0x1d, 0xa0, 0x3c,</div><div class='del'>-	0x0f, 0xc8, 0x95, 0x8a, 0x3c, 0xe7, 0x20, 0xcf, 0x94, 0xe5, 0x1c, 0x64,</div><div class='del'>-	0xda, 0xf0, 0xf5, 0x7e, 0x7e, 0x67, 0x1d, 0x83, 0xbd, 0x52, 0x1f, 0xe2,</div><div class='del'>-	0x25, 0xf0, 0xb5, 0xed, 0x7d, 0x2b, 0x15, 0xd0, 0x1c, 0x4e, 0x76, 0xb6,</div><div class='del'>-	0xc1, 0xfb, 0x0e, 0x00, 0xd7, 0x57, 0x9e, 0x93, 0xf4, 0x6c, 0x33, 0xbf,</div><div class='del'>-	0xe7, 0xea, 0xe2, 0x99, 0x65, 0xaf, 0xf0, 0xdf, 0xe7, 0x45, 0xe2, 0x4d,</div><div class='del'>-	0xe9, 0xcf, 0xf2, 0x9a, 0x71, 0xde, 0x26, 0x8c, 0x19, 0x04, 0x9d, 0x9b,</div><div class='del'>-	0x31, 0x3f, 0xf7, 0xb8, 0xda, 0x38, 0xde, 0x0f, 0x55, 0xe1, 0x53, 0x7d,</div><div class='del'>-	0x7a, 0xaf, 0xd5, 0x35, 0xb3, 0xfd, 0xcd, 0xde, 0xfb, 0xf1, 0x1c, 0x94,</div><div class='del'>-	0xef, 0xc1, 0xb7, 0xf4, 0x89, 0xc9, 0x2f, 0x29, 0x3d, 0x87, 0xb9, 0x02,</div><div class='del'>-	0xf9, 0x37, 0xa4, 0x39, 0x8c, 0x2c, 0x6c, 0xcb, 0x5e, 0x1d, 0x1f, 0x5b,</div><div class='del'>-	0x91, 0xef, 0xae, 0x80, 0xc6, 0xdd, 0xd9, 0xc2, 0x1a, 0xe9, 0x56, 0x1d,</div><div class='del'>-	0xd4, 0xe5, 0xf1, 0x36, 0xec, 0x85, 0x62, 0xb9, 0x0f, 0xc8, 0xf1, 0xd2,</div><div class='del'>-	0x20, 0xe8, 0x10, 0x93, 0xa7, 0xe0, 0x37, 0x3f, 0x53, 0xba, 0x43, 0x96,</div><div class='del'>-	0x23, 0xd8, 0x57, 0x45, 0xc6, 0x86, 0xe5, 0xfb, 0xf3, 0x09, 0xef, 0x3a,</div><div class='del'>-	0xe1, 0x2e, 0x5b, 0x3b, 0xb0, 0x07, 0xca, 0x13, 0xe5, 0x8a, 0xe3, 0x82,</div><div class='del'>-	0x88, 0x45, 0x38, 0xef, 0xd3, 0x46, 0xb7, 0x61, 0xde, 0x62, 0x84, 0xf2,</div><div class='del'>-	0xcb, 0xbd, 0x85, 0x3c, 0x99, 0x65, 0x5c, 0xc5, 0x77, 0x36, 0x36, 0x29,</div><div class='del'>-	0x53, 0x73, 0x16, 0x09, 0xc5, 0x81, 0xae, 0x9c, 0x81, 0x3f, 0x8f, 0x2f,</div><div class='del'>-	0x97, 0xfe, 0x77, 0x14, 0xd4, 0xa3, 0xb0, 0x95, 0x05, 0xd8, 0xca, 0x02,</div><div class='del'>-	0x6c, 0x24, 0x64, 0xe1, 0x5a, 0x01, 0x36, 0xb2, 0x00, 0x1b, 0x09, 0x7d,</div><div class='del'>-	0xf6, 0x3a, 0x62, 0xbb, 0xd7, 0xc0, 0x43, 0xc6, 0xd7, 0x3e, 0x4a, 0x5f,</div><div class='del'>-	0x1b, 0x7f, 0xff, 0x03, 0x4c, 0x03, 0x3a, 0xe1, 0xd4, 0x71, 0x00, 0x00,</div><div class='del'>-	0x00 };</div><div class='add'>+	0xec, 0x5b, 0x5f, 0x6c, 0x5b, 0xd7, 0x79, 0xff, 0xee, 0x21, 0x25, 0x51,</div><div class='add'>+	0xb2, 0xfe, 0x5c, 0xc9, 0x8c, 0x43, 0x27, 0x4a, 0x43, 0x4a, 0x57, 0x12,</div><div class='add'>+	0x13, 0x69, 0xe9, 0x95, 0xc6, 0x26, 0x2a, 0x46, 0x34, 0x2c, 0x29, 0xdb,</div><div class='add'>+	0x4a, 0xe3, 0x07, 0xc5, 0xf5, 0xda, 0xac, 0xeb, 0x30, 0x81, 0xb2, 0xb1,</div><div class='add'>+	0xec, 0x61, 0x83, 0x67, 0xac, 0x41, 0xb6, 0xb9, 0x30, 0x41, 0x29, 0x8e,</div><div class='add'>+	0x92, 0xd2, 0x22, 0x67, 0x2b, 0x73, 0xb1, 0x65, 0x80, 0x42, 0x49, 0x76,</div><div class='add'>+	0xb6, 0xd1, 0x62, 0xda, 0xbd, 0x74, 0x45, 0x1c, 0x0b, 0x8a, 0xe7, 0xe5,</div><div class='add'>+	0xa1, 0x0f, 0x69, 0x17, 0x60, 0xed, 0xd0, 0x61, 0x86, 0xe2, 0xda, 0x79,</div><div class='add'>+	0x28, 0xb6, 0x6c, 0x40, 0x96, 0x6c, 0x71, 0x73, 0xf7, 0xfb, 0x9d, 0x7b,</div><div class='add'>+	0xaf, 0x4c, 0x2b, 0x1a, 0x9a, 0x87, 0x3d, 0xde, 0x03, 0x08, 0xe7, 0x9e,</div><div class='add'>+	0x73, 0xbe, 0xf3, 0x9d, 0xef, 0xfb, 0xce, 0xf7, 0xf7, 0xd0, 0xfe, 0xc3,</div><div class='add'>+	0x76, 0x69, 0x13, 0xaf, 0x75, 0xe0, 0x2f, 0x75, 0xec, 0x99, 0xe3, 0x63,</div><div class='add'>+	0x0f, 0xa5, 0x1e, 0xe2, 0x38, 0xa4, 0xc2, 0x61, 0xf6, 0x86, 0x04, 0x2d,</div><div class='add'>+	0x68, 0x41, 0x0b, 0x5a, 0xd0, 0x82, 0x16, 0xb4, 0xa0, 0x05, 0x2d, 0x68,</div><div class='add'>+	0x41, 0x0b, 0x5a, 0xd0, 0x82, 0x16, 0xb4, 0xa0, 0x05, 0x2d, 0x68, 0x41,</div><div class='add'>+	0x0b, 0x5a, 0xd0, 0x82, 0x16, 0xb4, 0xa0, 0x05, 0x2d, 0x68, 0x41, 0x0b,</div><div class='add'>+	0x5a, 0xd0, 0x82, 0x16, 0xb4, 0xa0, 0x05, 0x2d, 0x68, 0x41, 0x0b, 0x5a,</div><div class='add'>+	0xd0, 0x82, 0x16, 0xb4, 0xa0, 0x05, 0x2d, 0x68, 0x41, 0x0b, 0x5a, 0xd0,</div><div class='add'>+	0x82, 0x16, 0xb4, 0xa0, 0x05, 0xed, 0xff, 0xb3, 0x85, 0x44, 0x4c, 0xf6,</div><div class='add'>+	0x1d, 0xde, 0x9f, 0x44, 0x54, 0x3a, 0x7e, 0x3c, 0x6b, 0x49, 0x24, 0x94,</div><div class='add'>+	0xbe, 0xf2, 0xf4, 0x8c, 0x25, 0x92, 0xa9, 0x0d, 0xc7, 0x73, 0xf2, 0x0b,</div><div class='add'>+	0xa7, 0x10, 0x0d, 0x0b, 0xe7, 0xef, 0x4b, 0xdf, 0x3a, 0x79, 0xe9, 0x91,</div><div class='add'>+	0xc4, 0x7b, 0x4b, 0x21, 0x89, 0x98, 0xe9, 0xb7, 0x46, 0xcd, 0x41, 0x89,</div><div class='add'>+	0xf4, 0x62, 0xcf, 0x4b, 0x43, 0x97, 0xbb, 0xa4, 0xd3, 0xc7, 0x25, 0x52,</div><div class='add'>+	0x2d, 0x25, 0xec, 0xfd, 0x32, 0x6c, 0x6e, 0x48, 0x58, 0x32, 0x38, 0xe3,</div><div class='add'>+	0x7c, 0x4d, 0xa4, 0x58, 0x32, 0x88, 0x43, 0x8a, 0xb5, 0x88, 0x5c, 0x0b,</div><div class='add'>+	0x11, 0xea, 0x7b, 0x46, 0xb6, 0xfc, 0xb1, 0x93, 0x09, 0xe3, 0x5c, 0x0b,</div><div class='add'>+	0xdf, 0x75, 0x7f, 0x3e, 0x22, 0x2a, 0x9d, 0x48, 0x66, 0x43, 0x93, 0x52,</div><div class='add'>+	0x5d, 0x74, 0x9c, 0x39, 0xfb, 0x5e, 0xe0, 0xe8, 0x91, 0x39, 0xcb, 0x1d,</div><div class='add'>+	0x67, 0xed, 0x07, 0xcd, 0x09, 0xb9, 0x1b, 0x73, 0x21, 0x51, 0xd6, 0x3d,</div><div class='add'>+	0xf8, 0x8b, 0x1b, 0xb9, 0xb3, 0xdf, 0x32, 0xb2, 0xcb, 0xed, 0x52, 0x2c,</div><div class='add'>+	0x3b, 0x32, 0x63, 0x4b, 0x26, 0x6b, 0xb7, 0x62, 0xfd, 0x63, 0x67, 0x66,</div><div class='add'>+	0x6b, 0xcf, 0xb0, 0x99, 0x93, 0x26, 0xc9, 0x44, 0x63, 0x80, 0x59, 0x34,</div><div class='add'>+	0x72, 0x17, 0xfe, 0xae, 0x5d, 0xda, 0x40, 0x4f, 0x8a, 0xe3, 0x8f, 0x9d,</div><div class='add'>+	0x90, 0x65, 0x61, 0x9d, 0xe7, 0x63, 0x5c, 0x27, 0x5e, 0x7e, 0x13, 0xe7,</div><div class='add'>+	0x35, 0xe7, 0xd2, 0x50, 0x4c, 0xbe, 0x5b, 0x8f, 0xca, 0x77, 0xea, 0xa6,</div><div class='add'>+	0xbc, 0x5a, 0xef, 0x95, 0xcb, 0x75, 0xc7, 0xf9, 0x8e, 0xed, 0x38, 0x6f,</div><div class='add'>+	0xe1, 0xef, 0x3f, 0xed, 0x2d, 0x1e, 0xd0, 0x0a, 0xc6, 0x44, 0xfd, 0x2f,</div><div class='add'>+	0xda, 0xa5, 0x33, 0x11, 0x17, 0xd5, 0x2e, 0xb3, 0xe5, 0x98, 0xcc, 0x95,</div><div class='add'>+	0x4b, 0xc6, 0x13, 0x17, 0x16, 0x8c, 0xa9, 0x0b, 0x15, 0x9c, 0x19, 0xc6,</div><div class='add'>+	0x9c, 0x14, 0x8a, 0xf6, 0x2b, 0x46, 0xae, 0x3e, 0x6f, 0x1c, 0xba, 0xd0,</div><div class='add'>+	0x09, 0x1a, 0x79, 0xfe, 0x1e, 0x23, 0x7b, 0xf6, 0x96, 0x64, 0x6d, 0xca,</div><div class='add'>+	0x38, 0x61, 0x7e, 0x0d, 0x62, 0xcf, 0x96, 0x48, 0x73, 0xb3, 0x47, 0xaf,</div><div class='add'>+	0xe3, 0xa8, 0xb4, 0x73, 0x32, 0x9b, 0xb2, 0xcc, 0xa2, 0x90, 0x3e, 0x3d,</div><div class='add'>+	0x77, 0xd9, 0xa5, 0xf9, 0xbc, 0x91, 0xbd, 0xd0, 0x6e, 0xe4, 0xce, 0x85,</div><div class='add'>+	0x41, 0x87, 0xf4, 0x86, 0x84, 0xfb, 0x06, 0x62, 0x79, 0xa9, 0xe1, 0x0c,</div><div class='add'>+	0x31, 0x55, 0x9a, 0x72, 0x05, 0xcd, 0xa0, 0xe5, 0xbb, 0x65, 0xf0, 0x50,</div><div class='add'>+	0x06, 0x0f, 0x65, 0xf2, 0x16, 0x97, 0x4b, 0x43, 0x3e, 0x6f, 0x8e, 0xf3,</div><div class='add'>+	0x23, 0x9b, 0xb4, 0x27, 0xe2, 0x19, 0xe5, 0xf3, 0xe9, 0x38, 0xff, 0x61,</div><div class='add'>+	0x93, 0x57, 0xf2, 0xe3, 0x38, 0xaf, 0xda, 0x31, 0xd0, 0xee, 0x5c, 0x56,</div><div class='add'>+	0x56, 0x09, 0xbc, 0x58, 0xc0, 0x4f, 0x59, 0x2f, 0x80, 0x87, 0x79, 0xf0,</div><div class='add'>+	0x77, 0x1e, 0xbc, 0x55, 0x40, 0xc7, 0x2f, 0x3b, 0xaf, 0x60, 0xe4, 0x86,</div><div class='add'>+	0xb6, 0xe4, 0x15, 0xa7, 0x8c, 0xf3, 0x2b, 0x0a, 0xb2, 0xde, 0x25, 0xf9,</div><div class='add'>+	0x25, 0x53, 0xa6, 0x57, 0xfc, 0xfd, 0xbe, 0x1e, 0x1c, 0x93, 0x83, 0xe5,</div><div class='add'>+	0x1e, 0xc8, 0x86, 0xb2, 0x4c, 0xd8, 0x22, 0x0e, 0x64, 0x54, 0x4c, 0x2a,</div><div class='add'>+	0x11, 0x23, 0x6f, 0x9f, 0xd4, 0xf7, 0xbf, 0x62, 0x49, 0x26, 0x6f, 0x53,</div><div class='add'>+	0x8e, 0x12, 0xcf, 0xdb, 0x85, 0x58, 0x18, 0xfa, 0xb6, 0x62, 0x15, 0xcc,</div><div class='add'>+	0xb0, 0x50, 0x8e, 0x89, 0xd8, 0x1f, 0x43, 0x96, 0x47, 0x4b, 0x92, 0xf9,</div><div class='add'>+	0x52, 0xc9, 0x97, 0xb1, 0x2b, 0xdf, 0xc7, 0x4b, 0x5f, 0xec, 0x90, 0x36,</div><div class='add'>+	0xf5, 0x99, 0x26, 0xf9, 0x3d, 0xec, 0x25, 0xee, 0x3b, 0xf6, 0x62, 0x9f,</div><div class='add'>+	0x0b, 0xe7, 0xee, 0x4d, 0x3c, 0x29, 0x42, 0xd8, 0x62, 0x7f, 0x93, 0xb6,</div><div class='add'>+	0x11, 0x31, 0xb2, 0x56, 0x21, 0x16, 0x02, 0x5c, 0x5e, 0x8a, 0xa3, 0xde,</div><div class='add'>+	0x5c, 0x53, 0xd6, 0xba, 0x15, 0x9a, 0xb3, 0x13, 0xf1, 0xa2, 0xdc, 0x0a,</div><div class='add'>+	0x5d, 0xb5, 0xf5, 0x5c, 0x6b, 0xd6, 0x72, 0x64, 0x15, 0xd8, 0x9f, 0x83,</div><div class='add'>+	0x3d, 0x6c, 0x80, 0xa3, 0xdf, 0x2d, 0xe9, 0xf9, 0x0e, 0xec, 0x4f, 0x36,</div><div class='add'>+	0x01, 0x67, 0x9b, 0x24, 0x92, 0x55, 0xcc, 0x5f, 0x75, 0xe7, 0xbb, 0x5d,</div><div class='add'>+	0xbc, 0xc5, 0xfe, 0x36, 0x8d, 0x5b, 0xe4, 0x15, 0x77, 0xfe, 0x2e, 0x17,</div><div class='add'>+	0x77, 0xf1, 0x01, 0xcc, 0x03, 0xff, 0xe0, 0xe4, 0x90, 0xa1, 0xe7, 0xf7,</div><div class='add'>+	0xd2, 0x9e, 0x7e, 0xa7, 0x74, 0x2b, 0xb4, 0x6a, 0x3b, 0x92, 0x1b, 0x1d,</div><div class='add'>+	0x9c, 0x1c, 0x34, 0x5c, 0x7c, 0xa7, 0xdc, 0x7d, 0xf7, 0xb9, 0xf8, 0x06,</div><div class='add'>+	0x27, 0x93, 0x86, 0x8b, 0x6f, 0xa5, 0xa4, 0xf7, 0x4a, 0xbe, 0x44, 0xd8,</div><div class='add'>+	0xc1, 0x49, 0xcb, 0xb8, 0x4f, 0xa6, 0xbb, 0x07, 0x27, 0xfb, 0x0c, 0xf5,</div><div class='add'>+	0x99, 0x5d, 0x2e, 0x1f, 0x09, 0x9f, 0x86, 0x5d, 0x9a, 0x06, 0x9e, 0xab,</div><div class='add'>+	0xe7, 0x07, 0xb2, 0x56, 0xf1, 0x81, 0x5d, 0xfa, 0x7c, 0x9e, 0xa9, 0xe7,</div><div class='add'>+	0x1e, 0x20, 0x5d, 0x3c, 0x7b, 0x66, 0xf4, 0x8e, 0x73, 0x7f, 0xe5, 0xb6,</div><div class='add'>+	0x7c, 0x76, 0x3a, 0x93, 0xe7, 0x49, 0x24, 0x9c, 0x0e, 0x8f, 0xce, 0x95,</div><div class='add'>+	0x8e, 0x49, 0xb6, 0x1c, 0x97, 0xd9, 0x91, 0x56, 0x99, 0x36, 0xfb, 0xa7,</div><div class='add'>+	0x0f, 0x0a, 0x7d, 0x4f, 0x64, 0x74, 0xc6, 0xbb, 0xc3, 0x9c, 0x18, 0x32,</div><div class='add'>+	0x0b, 0x1e, 0x0f, 0xd6, 0x24, 0x62, 0x00, 0xbe, 0xbf, 0x16, 0x96, 0xe7,</div><div class='add'>+	0xeb, 0x86, 0x34, 0x6b, 0xfb, 0x4c, 0x98, 0xeb, 0xd0, 0xc3, 0x67, 0xcb,</div><div class='add'>+	0xd4, 0x63, 0xea, 0xac, 0x64, 0xaa, 0x5a, 0x67, 0x7d, 0x7b, 0x6d, 0xe3,</div><div class='add'>+	0xdd, 0x16, 0x0a, 0x02, 0x73, 0x4c, 0x5b, 0x66, 0x55, 0x5a, 0x24, 0x33,</div><div class='add'>+	0x25, 0x85, 0xaa, 0xbd, 0x65, 0x3f, 0xb1, 0x65, 0xd9, 0x80, 0x1e, 0x88,</div><div class='add'>+	0x99, 0x4d, 0x71, 0x9e, 0xf0, 0x0d, 0xb0, 0xa6, 0x6b, 0x7b, 0x21, 0xd8,</div><div class='add'>+	0xde, 0x4c, 0x8a, 0xb0, 0x52, 0xd0, 0xfe, 0xa2, 0x0e, 0x7d, 0xac, 0xdf,</div><div class='add'>+	0xd7, 0xe1, 0xfa, 0xbb, 0x08, 0x6c, 0xb4, 0x1d, 0x76, 0xfe, 0x19, 0xd8,</div><div class='add'>+	0x60, 0xaf, 0x91, 0x3d, 0xe7, 0x38, 0xf0, 0x3f, 0x51, 0x25, 0xb4, 0x41,</div><div class='add'>+	0xd8, 0x7b, 0x9d, 0x6b, 0xed, 0x98, 0x17, 0x73, 0xd6, 0xee, 0x06, 0x8f,</div><div class='add'>+	0x8e, 0x33, 0x69, 0xc7, 0xa5, 0x68, 0x77, 0x61, 0x5f, 0x93, 0xf4, 0x58,</div><div class='add'>+	0xd4, 0x79, 0xda, 0xf5, 0x2e, 0x9c, 0x67, 0x70, 0xdc, 0x89, 0xf3, 0x3a,</div><div class='add'>+	0x30, 0x17, 0x9b, 0xa5, 0x2d, 0xa7, 0xe8, 0xb7, 0x5c, 0x1f, 0x2a, 0x72,</div><div class='add'>+	0x1d, 0xb4, 0x72, 0x8f, 0x86, 0x8b, 0xb4, 0xa4, 0x53, 0x72, 0xb3, 0xb4,</div><div class='add'>+	0x57, 0xae, 0x45, 0x29, 0x03, 0xe0, 0x2c, 0xc3, 0x27, 0x46, 0x0d, 0xd0,</div><div class='add'>+	0x4f, 0xba, 0xe9, 0x03, 0x77, 0x7b, 0x63, 0xe3, 0x7e, 0xf7, 0x0c, 0x31,</div><div class='add'>+	0x43, 0xe9, 0x4e, 0xc9, 0xe9, 0x39, 0x51, 0x6a, 0x74, 0x97, 0xb7, 0xde,</div><div class='add'>+	0x69, 0xec, 0x3f, 0xa7, 0xe4, 0xc0, 0xc3, 0xf0, 0x5b, 0x38, 0xeb, 0xaa,</div><div class='add'>+	0xe5, 0x38, 0x57, 0xed, 0xf7, 0x61, 0xf7, 0x4a, 0x9a, 0xac, 0x6b, 0x9d,</div><div class='add'>+	0xd2, 0x46, 0x7b, 0x36, 0x1a, 0x64, 0x18, 0x93, 0x53, 0x65, 0xee, 0x29,</div><div class='add'>+	0x48, 0xd8, 0x22, 0x0c, 0xe1, 0xff, 0x05, 0x70, 0x21, 0x69, 0x81, 0x3d,</div><div class='add'>+	0x6e, 0xd8, 0x51, 0xd2, 0xdb, 0xe5, 0xc2, 0x77, 0xe3, 0x0c, 0xd2, 0x4e,</div><div class='add'>+	0xfb, 0x73, 0xb4, 0xfd, 0x65, 0x43, 0x2a, 0x33, 0xb1, 0x08, 0x6b, 0x1a,</div><div class='add'>+	0xa1, 0xbc, 0xb3, 0xdd, 0x70, 0xff, 0x32, 0x3b, 0x54, 0x30, 0x95, 0xbe,</div><div class='add'>+	0x6f, 0x91, 0x5c, 0xe9, 0x7e, 0x99, 0xb3, 0x71, 0x9e, 0x15, 0x06, 0xcd,</div><div class='add'>+	0xf4, 0x35, 0x03, 0x85, 0x90, 0x82, 0x95, 0xf5, 0x50, 0x56, 0x3e, 0xad,</div><div class='add'>+	0xff, 0x8c, 0xf3, 0x0a, 0x46, 0xd8, 0xe2, 0x19, 0xbf, 0xe5, 0xc9, 0x87,</div><div class='add'>+	0xba, 0x67, 0x4b, 0xb6, 0xd4, 0xce, 0x31, 0xe8, 0x68, 0xd3, 0x74, 0x84,</div><div class='add'>+	0xd2, 0xfa, 0xee, 0x0c, 0x95, 0xf6, 0x63, 0x00, 0x41, 0xef, 0xc0, 0x03,</div><div class='add'>+	0x3e, 0xb8, 0xd7, 0xc2, 0xde, 0x08, 0x68, 0xec, 0x68, 0xa0, 0xbf, 0x8d,</div><div class='add'>+	0xf0, 0x90, 0x55, 0xc4, 0x3b, 0x43, 0xf3, 0x6d, 0xb8, 0x7c, 0xfb, 0xb2,</div><div class='add'>+	0x7a, 0x1d, 0xb2, 0xfa, 0xc8, 0x39, 0x30, 0x46, 0x1c, 0x29, 0xe0, 0x80,</div><div class='add'>+	0xdc, 0x4d, 0xfa, 0x2c, 0xfa, 0x29, 0x73, 0x0b, 0x17, 0x6c, 0x41, 0x85,</div><div class='add'>+	0xd2, 0xed, 0x92, 0x33, 0x75, 0x1c, 0x00, 0xec, 0xb8, 0x68, 0x3f, 0x6f,</div><div class='add'>+	0x91, 0x47, 0x6f, 0x6c, 0x25, 0xb4, 0xde, 0xe4, 0x2b, 0x8c, 0x05, 0x45,</div><div class='add'>+	0xd0, 0xb6, 0x9e, 0x50, 0x9a, 0xb5, 0x76, 0xc8, 0x5c, 0x22, 0x4d, 0xe9,</div><div class='add'>+	0xb7, 0x64, 0xb5, 0xa4, 0xf6, 0x34, 0x4b, 0x97, 0x4c, 0x41, 0x46, 0xd5,</div><div class='add'>+	0x71, 0xc4, 0xb0, 0x91, 0x76, 0x09, 0x3d, 0xc4, 0x58, 0x10, 0x03, 0xad,</div><div class='add'>+	0xeb, 0x09, 0x53, 0x6e, 0x39, 0x6a, 0x10, 0xfb, 0x47, 0x70, 0x0f, 0x87,</div><div class='add'>+	0x79, 0xa7, 0xca, 0x83, 0x23, 0x4c, 0x88, 0x32, 0xef, 0x69, 0x16, 0xe2,</div><div class='add'>+	0xe6, 0xda, 0x70, 0xcc, 0x14, 0xce, 0x23, 0x5e, 0x4e, 0x71, 0x2f, 0xf9,</div><div class='add'>+	0x73, 0xf7, 0x7c, 0x92, 0x3f, 0x7f, 0x9d, 0x32, 0xa3, 0xec, 0xa0, 0x63,</div><div class='add'>+	0xa0, 0xa9, 0x1b, 0x72, 0x1b, 0x5d, 0x80, 0x4f, 0xb4, 0x1f, 0xd7, 0x3a,</div><div class='add'>+	0xdc, 0x37, 0x76, 0xaf, 0x5c, 0x83, 0xdd, 0xc5, 0x95, 0x18, 0x55, 0x7b,</div><div class='add'>+	0xaf, 0x9e, 0x53, 0x96, 0x2f, 0x4f, 0xca, 0x60, 0xf7, 0x36, 0x19, 0x10,</div><div class='add'>+	0xe7, 0xce, 0x72, 0x38, 0x52, 0x21, 0x0d, 0x2e, 0x2d, 0x73, 0xd6, 0x7a,</div><div class='add'>+	0x22, 0x2c, 0x8d, 0xf4, 0x7c, 0xec, 0x28, 0xcb, 0x2a, 0xf4, 0x29, 0xe2,</div><div class='add'>+	0x6f, 0x16, 0xb5, 0x27, 0x2c, 0x4f, 0x8c, 0x19, 0x12, 0x3f, 0xa4, 0xe4,</div><div class='add'>+	0xd0, 0xc3, 0xc4, 0xf9, 0x13, 0xf2, 0x38, 0x9e, 0xe1, 0xfa, 0x18, 0x75,</div><div class='add'>+	0x21, 0x8c, 0x5e, 0xf3, 0x87, 0xb9, 0x46, 0x5d, 0x7f, 0xdd, 0xd3, 0xf5,</div><div class='add'>+	0x8f, 0x9c, 0x43, 0x63, 0x61, 0x0f, 0x36, 0xd2, 0x00, 0x2b, 0xb8, 0xef,</div><div class='add'>+	0x9d, 0x60, 0x09, 0xd3, 0xa8, 0x17, 0x84, 0x2d, 0xec, 0x00, 0x8b, 0xe0,</div><div class='add'>+	0xf4, 0x15, 0xda, 0x50, 0xb7, 0xe7, 0x33, 0x7c, 0x9b, 0xe2, 0x39, 0xec,</div><div class='add'>+	0x77, 0xb2, 0x3f, 0xee, 0xe3, 0x7e, 0xc2, 0x6f, 0x8f, 0xa7, 0xb8, 0x06,</div><div class='add'>+	0xd9, 0x31, 0xa6, 0xa2, 0x4d, 0xe2, 0x5b, 0xc1, 0xff, 0x34, 0xc6, 0x56,</div><div class='add'>+	0xce, 0x99, 0x18, 0x4f, 0xa0, 0xb7, 0x24, 0x5f, 0xa3, 0x1d, 0x71, 0x3f,</div><div class='add'>+	0x63, 0xed, 0xbb, 0x9e, 0xef, 0x6c, 0x9f, 0x0e, 0xa7, 0xa3, 0xf0, 0x9d,</div><div class='add'>+	0x32, 0x55, 0x2c, 0x9d, 0x44, 0x3e, 0x24, 0x85, 0x7b, 0xd2, 0xd4, 0x8b,</div><div class='add'>+	0xf6, 0x71, 0xf8, 0xc6, 0xa9, 0x62, 0x8d, 0x39, 0x11, 0xdc, 0x17, 0xf6,</div><div class='add'>+	0x21, 0x3e, 0x47, 0xd4, 0x42, 0xa4, 0x70, 0x6f, 0x9a, 0x3e, 0x39, 0x2e,</div><div class='add'>+	0xf1, 0xda, 0x7b, 0xc8, 0x39, 0x4c, 0xc9, 0x6a, 0x1d, 0xfb, 0xf6, 0x5e,</div><div class='add'>+	0xd2, 0x5c, 0x44, 0xfe, 0x10, 0x4e, 0x4b, 0x58, 0xa5, 0x9b, 0x23, 0xb3,</div><div class='add'>+	0xa9, 0x76, 0xe4, 0x59, 0x93, 0x7b, 0xd5, 0xda, 0xc1, 0xbd, 0xa1, 0xb5,</div><div class='add'>+	0x3d, 0xd3, 0x4d, 0xe9, 0xc2, 0x5e, 0xb5, 0x20, 0xb2, 0x5c, 0x12, 0x85,</div><div class='add'>+	0x9c, 0x26, 0x76, 0x44, 0x30, 0x5e, 0xfb, 0xf2, 0x97, 0x55, 0x3a, 0x24,</div><div class='add'>+	0xf9, 0xa8, 0x9c, 0x58, 0x49, 0x85, 0x99, 0x3f, 0xc6, 0xa7, 0xe4, 0x04,</div><div class='add'>+	0x72, 0xc6, 0x67, 0x64, 0xb6, 0x04, 0xba, 0x34, 0xdf, 0x31, 0xf0, 0xdb,</div><div class='add'>+	0x0b, 0xdc, 0xa4, 0x3d, 0x0a, 0xdf, 0xea, 0xd2, 0x0e, 0x9a, 0x33, 0x39,</div><div class='add'>+	0xe6, 0x48, 0x29, 0xc6, 0x94, 0xf7, 0xa0, 0x27, 0xb4, 0x93, 0x9f, 0xcb,</div><div class='add'>+	0xaa, 0xd5, 0x2a, 0x79, 0xd7, 0x2f, 0x68, 0x3d, 0x0d, 0xa7, 0xdf, 0xf5,</div><div class='add'>+	0xd6, 0xae, 0x63, 0x8d, 0xfa, 0xba, 0xab, 0xe1, 0xee, 0xbe, 0xa5, 0xf3,</div><div class='add'>+	0x9c, 0xab, 0x36, 0xbf, 0x09, 0xfb, 0x83, 0x51, 0x17, 0xf6, 0xcd, 0xd1,</div><div class='add'>+	0x55, 0xeb, 0x2b, 0x5d, 0xd2, 0x86, 0x73, 0xca, 0x3c, 0x27, 0x4a, 0xdf,</div><div class='add'>+	0x8a, 0xf5, 0x6b, 0x1e, 0xae, 0x9f, 0x02, 0x57, 0x3b, 0xe9, 0x46, 0x0b,</div><div class='add'>+	0x63, 0x1d, 0xf4, 0x21, 0xdf, 0xc9, 0x6f, 0xf9, 0x18, 0xc2, 0xbe, 0xe6,</div><div class='add'>+	0xe1, 0xfa, 0x5e, 0x03, 0x2e, 0xae, 0xb1, 0xe7, 0x99, 0x38, 0xbb, 0x8d,</div><div class='add'>+	0xbc, 0x91, 0x1f, 0xde, 0x01, 0xef, 0x23, 0x69, 0x4c, 0xc1, 0xa7, 0x4f,</div><div class='add'>+	0xd5, 0x75, 0x5e, 0x67, 0xe4, 0xca, 0xc8, 0xb7, 0xea, 0x2f, 0x82, 0x46,</div><div class='add'>+	0xe4, 0x61, 0xf5, 0x01, 0x2f, 0xd7, 0xa6, 0xad, 0xac, 0x6b, 0x9f, 0x45,</div><div class='add'>+	0x7f, 0x53, 0xd4, 0xf6, 0x74, 0x05, 0x63, 0x9d, 0x67, 0xe3, 0x6e, 0xae,</div><div class='add'>+	0x48, 0x5f, 0xad, 0xdc, 0xe5, 0xfe, 0xbf, 0x6d, 0x53, 0x42, 0xfa, 0x3e,</div><div class='add'>+	0x19, 0xd7, 0xa8, 0x67, 0x77, 0xc3, 0x9f, 0x3b, 0x1f, 0x30, 0xbe, 0x4c,</div><div class='add'>+	0x31, 0xf6, 0x4c, 0x31, 0x66, 0x18, 0x9e, 0x1f, 0x8c, 0x37, 0xe0, 0x88,</div><div class='add'>+	0x03, 0xc7, 0x79, 0x4f, 0x6f, 0x4f, 0x7b, 0xb8, 0xfc, 0xdc, 0xd3, 0xf7,</div><div class='add'>+	0xa5, 0x2f, 0xdd, 0x73, 0xe7, 0xba, 0x61, 0xba, 0xe3, 0x66, 0xed, 0x87,</div><div class='add'>+	0x61, 0xf7, 0xa0, 0x3f, 0x3e, 0xad, 0xa0, 0x5f, 0xb9, 0x9a, 0x7b, 0x1f,</div><div class='add'>+	0xb0, 0x71, 0xe8, 0x1e, 0x3f, 0xfd, 0xbb, 0x75, 0x73, 0x6f, 0x57, 0x06,</div><div class='add'>+	0xbc, 0xd3, 0x0c, 0xf9, 0xce, 0x84, 0x49, 0x4b, 0x7d, 0x12, 0xfb, 0xe5,</div><div class='add'>+	0x18, 0x63, 0x62, 0x1e, 0x7c, 0x1c, 0x31, 0x87, 0xcd, 0x59, 0xe2, 0x8e,</div><div class='add'>+	0x0a, 0x70, 0x22, 0x8f, 0x4c, 0xb7, 0x78, 0xf7, 0xfc, 0x7d, 0x9e, 0x0f,</div><div class='add'>+	0xdc, 0xbb, 0x38, 0x46, 0xff, 0x7d, 0x8f, 0x9e, 0x1b, 0x9d, 0x2e, 0x3d,</div><div class='add'>+	0xfe, 0xfa, 0x80, 0x79, 0xe7, 0x78, 0x75, 0xaf, 0x27, 0x4f, 0x7c, 0x3f,</div><div class='add'>+	0xe3, 0xd1, 0xc5, 0xbb, 0x69, 0xa4, 0x89, 0xf7, 0xf2, 0x5f, 0xc0, 0xa3,</div><div class='add'>+	0xf3, 0x8c, 0x82, 0x4a, 0x23, 0x6f, 0x49, 0x31, 0x56, 0xc1, 0xe6, 0xc5,</div><div class='add'>+	0xc2, 0x9d, 0x24, 0xec, 0x69, 0xec, 0x7a, 0xb7, 0xc4, 0x7b, 0xbe, 0x05,</div><div class='add'>+	0x1f, 0xcd, 0x7b, 0xff, 0x50, 0xe6, 0x4a, 0xfd, 0x76, 0xb3, 0x41, 0x7b,</div><div class='add'>+	0x4d, 0x24, 0xcf, 0xcb, 0xb0, 0x7d, 0x5e, 0xe7, 0x4f, 0x89, 0xf8, 0x29,</div><div class='add'>+	0xa1, 0x6c, 0x6f, 0xc9, 0x80, 0xce, 0x6b, 0x3e, 0x14, 0x0b, 0x72, 0x99,</div><div class='add'>+	0x2a, 0xc3, 0xc6, 0xc6, 0xfe, 0xcd, 0xd1, 0xf9, 0x28, 0xf2, 0xa5, 0x1b,</div><div class='add'>+	0x3b, 0xe0, 0x7a, 0x53, 0xe3, 0x21, 0xbe, 0x46, 0x5c, 0x86, 0xb4, 0x8c,</div><div class='add'>+	0xf9, 0xf8, 0x2c, 0x99, 0xaf, 0xfb, 0x38, 0xc3, 0xf0, 0xc3, 0xf0, 0x01,</div><div class='add'>+	0x63, 0xbf, 0xe1, 0xe9, 0x0b, 0xbf, 0x7f, 0xe8, 0x30, 0x07, 0x52, 0xe9,</div><div class='add'>+	0x3f, 0xf7, 0xe6, 0xae, 0x50, 0x06, 0x18, 0xfb, 0x72, 0x7f, 0xd1, 0xf3,</div><div class='add'>+	0x39, 0x05, 0x23, 0x53, 0xa7, 0x0c, 0xa8, 0x2b, 0xb8, 0x7f, 0xad, 0x9f,</div><div class='add'>+	0xb0, 0x99, 0xf2, 0x17, 0x10, 0x1f, 0xbb, 0xdd, 0xbc, 0x01, 0xb5, 0x55,</div><div class='add'>+	0xa6, 0xce, 0xb9, 0xf5, 0x96, 0xac, 0xdd, 0xe4, 0xd9, 0xd2, 0x41, 0xcc,</div><div class='add'>+	0x4d, 0xe1, 0x8f, 0xb2, 0x23, 0xcc, 0x61, 0x7c, 0x67, 0x3c, 0x38, 0x19,</div><div class='add'>+	0xcf, 0x22, 0x66, 0x65, 0x0e, 0x4f, 0x60, 0x6c, 0x78, 0x35, 0x96, 0x96,</div><div class='add'>+	0x7b, 0x05, 0x39, 0x0a, 0xe4, 0x39, 0x00, 0x7e, 0xe2, 0x32, 0x51, 0xc7,</div><div class='add'>+	0x9d, 0x6f, 0xf9, 0xb3, 0x2d, 0x98, 0xc2, 0x6d, 0x18, 0xd7, 0xf7, 0x4d,</div><div class='add'>+	0xd4, 0x7f, 0xec, 0xd0, 0x1f, 0xfc, 0xad, 0xb6, 0x97, 0x78, 0x43, 0xde,</div><div class='add'>+	0x97, 0x31, 0x9e, 0x28, 0x4f, 0x1a, 0x87, 0xca, 0xdc, 0xa3, 0x5e, 0xea,</div><div class='add'>+	0x11, 0x2b, 0x9e, 0x55, 0xc8, 0x51, 0xc7, 0x3a, 0x71, 0xe6, 0x29, 0xe8,</div><div class='add'>+	0x46, 0xc1, 0x98, 0x1a, 0xea, 0x92, 0x7c, 0xb2, 0x07, 0x34, 0x3f, 0x82,</div><div class='add'>+	0x1e, 0xb1, 0xc3, 0xfa, 0x35, 0xcc, 0x43, 0x8f, 0x92, 0xb4, 0x8f, 0x56,</div><div class='add'>+	0x5d, 0x57, 0x4e, 0xeb, 0xb8, 0x35, 0xe0, 0xe9, 0xd6, 0x3f, 0x99, 0xae,</div><div class='add'>+	0x2e, 0x3d, 0x8d, 0xf1, 0x2e, 0xcc, 0xff, 0x26, 0x7a, 0xc4, 0xac, 0x31,</div><div class='add'>+	0x7f, 0x9e, 0x36, 0x38, 0x8e, 0xf9, 0xcf, 0x01, 0xc7, 0x9f, 0xe0, 0xfb,</div><div class='add'>+	0x7e, 0x7c, 0xff, 0xd1, 0xb6, 0xbd, 0xdf, 0xe0, 0xd9, 0x98, 0xcf, 0x6e,</div><div class='add'>+	0x9b, 0xf7, 0xfd, 0xb7, 0x8e, 0x93, 0xd2, 0xbd, 0x06, 0xc6, 0xd7, 0x22,</div><div class='add'>+	0xb2, 0xfb, 0x7c, 0x9b, 0xa8, 0xaa, 0xeb, 0xc3, 0x55, 0xd5, 0x94, 0x9e,</div><div class='add'>+	0xf3, 0xf4, 0xdf, 0x3f, 0xc2, 0x1e, 0x4b, 0xd4, 0x1a, 0x2e, 0x8d, 0x77,</div><div class='add'>+	0xab, 0x6d, 0xf4, 0x99, 0xe3, 0x7d, 0x4b, 0xec, 0x0b, 0xc7, 0x47, 0x6b,</div><div class='add'>+	0x84, 0xe1, 0xf7, 0x89, 0xe3, 0x7d, 0xb5, 0x9f, 0x00, 0x16, 0x72, 0x29,</div><div class='add'>+	0xfb, 0xf8, 0x09, 0xff, 0xda, 0xb6, 0x33, 0xb5, 0x6c, 0x71, 0x26, 0xed,</div><div class='add'>+	0xfe, 0x99, 0xe3, 0xd9, 0x0a, 0xf3, 0x83, 0x44, 0x4c, 0x74, 0x1e, 0x5e,</div><div class='add'>+	0x38, 0x3e, 0x53, 0x0a, 0x4b, 0x48, 0xd3, 0xe2, 0xaf, 0x73, 0x8d, 0xf7,</div><div class='add'>+	0xb0, 0x13, 0x6d, 0xa4, 0xab, 0x11, 0x0f, 0xe3, 0x0c, 0xf1, 0x9c, 0x00,</div><div class='add'>+	0x9e, 0x24, 0xf0, 0x30, 0xde, 0xb8, 0xf4, 0xc6, 0x97, 0x76, 0xa2, 0x8d,</div><div class='add'>+	0xb8, 0x78, 0x96, 0x8f, 0xaf, 0x47, 0xd4, 0xf9, 0xb7, 0x49, 0xaf, 0xc9,</div><div class='add'>+	0x9c, 0xd6, 0xf5, 0x35, 0x4d, 0x92, 0x3f, 0x8b, 0xdc, 0xc6, 0x1e, 0xf3,</div><div class='add'>+	0xc6, 0x77, 0x9b, 0xac, 0xb7, 0xe3, 0x8a, 0xf3, 0xec, 0xb1, 0x96, 0x8a,</div><div class='add'>+	0x63, 0x0e, 0xe3, 0x65, 0x1f, 0x56, 0x79, 0xb0, 0x1d, 0x0d, 0x7c, 0x37,</div><div class='add'>+	0x79, 0xb2, 0xe6, 0x99, 0x7e, 0xdd, 0xd9, 0x48, 0x0b, 0x40, 0x71, 0x0f,</div><div class='add'>+	0xdd, 0x5b, 0xf7, 0xe0, 0xf3, 0x89, 0x85, 0x35, 0xd2, 0x96, 0x04, 0xaf,</div><div class='add'>+	0x3e, 0x6d, 0x9f, 0xf6, 0xfe, 0xb8, 0x37, 0x89, 0x3f, 0xff, 0x3c, 0x5f,</div><div class='add'>+	0x06, 0xa4, 0x8b, 0x3d, 0x74, 0xf9, 0x13, 0x75, 0x73, 0x12, 0x76, 0xc7,</div><div class='add'>+	0x37, 0x10, 0xc7, 0x59, 0xb5, 0x29, 0xfb, 0x16, 0xdc, 0xbb, 0xf6, 0xb1,</div><div class='add'>+	0xa8, 0x21, 0x14, 0x73, 0xb9, 0x38, 0xeb, 0xd5, 0xa3, 0xb2, 0x09, 0x5c,</div><div class='add'>+	0x19, 0xd4, 0x94, 0x6e, 0x5d, 0x34, 0x0d, 0xff, 0xb8, 0x0e, 0xfd, 0xbc,</div><div class='add'>+	0x6a, 0xf1, 0x2d, 0x26, 0xcc, 0x78, 0x27, 0xc5, 0xda, 0xcf, 0x01, 0xc3,</div><div class='add'>+	0x3c, 0xea, 0xf6, 0x3b, 0xcb, 0x12, 0x60, 0x96, 0xb1, 0x76, 0xca, 0xf5,</div><div class='add'>+	0xcb, 0xf4, 0xed, 0xc8, 0xa9, 0x50, 0xc3, 0x58, 0xff, 0xe3, 0xe4, 0xa3,</div><div class='add'>+	0x8d, 0xb0, 0x3b, 0xbd, 0x83, 0x20, 0xe6, 0x2c, 0x26, 0xe6, 0x97, 0xe0,</div><div class='add'>+	0xc3, 0x2b, 0x96, 0xda, 0xad, 0xb4, 0x46, 0x26, 0x2a, 0xf0, 0x49, 0xa8,</div><div class='add'>+	0x78, 0x13, 0xf1, 0x25, 0x79, 0x5f, 0xdf, 0x43, 0x93, 0x35, 0x6c, 0xf6,</div><div class='add'>+	0xa8, 0xaf, 0x52, 0xaf, 0x34, 0xe5, 0xa1, 0x33, 0x88, 0xcb, 0x23, 0x4f,</div><div class='add'>+	0x20, 0xe6, 0x40, 0x5e, 0x67, 0x0a, 0xa8, 0xe2, 0xa9, 0x23, 0x3f, 0xf8,</div><div class='add'>+	0x83, 0x19, 0xcb, 0xcd, 0xff, 0x75, 0x3c, 0x13, 0x97, 0xc7, 0xd0, 0x99,</div><div class='add'>+	0x76, 0xed, 0x67, 0xf2, 0xda, 0xdf, 0xf4, 0x9b, 0x53, 0xaa, 0x0d, 0x39,</div><div class='add'>+	0x06, 0x12, 0x4f, 0x64, 0x38, 0xe6, 0xa0, 0x48, 0x1f, 0xf3, 0x4e, 0xf8,</div><div class='add'>+	0xe1, 0xbe, 0x35, 0x78, 0xb7, 0x33, 0x84, 0x57, 0x12, 0x3e, 0x13, 0x92,</div><div class='add'>+	0xa6, 0x33, 0x7c, 0x0b, 0x91, 0x3d, 0xa8, 0xc3, 0x88, 0xb3, 0x2f, 0x8c,</div><div class='add'>+	0x7e, 0x02, 0x7f, 0xfb, 0x90, 0x5f, 0x99, 0xc8, 0x8d, 0x77, 0x80, 0x07,</div><div class='add'>+	0x2c, 0xf7, 0xec, 0x04, 0xdf, 0xd5, 0x2d, 0x6d, 0x11, 0xec, 0x21, 0x3c,</div><div class='add'>+	0xf2, 0x43, 0x6b, 0x0f, 0xe8, 0x71, 0xcf, 0x27, 0x8e, 0xf0, 0x19, 0x91,</div><div class='add'>+	0xfe, 0x05, 0xe9, 0x51, 0x7a, 0x4f, 0x58, 0x66, 0x52, 0x5c, 0x6b, 0x07,</div><div class='add'>+	0x3c, 0xf7, 0x61, 0x4d, 0xef, 0x73, 0xdf, 0x94, 0xf2, 0xb7, 0xe9, 0xc6,</div><div class='add'>+	0x9c, 0x81, 0x6f, 0xe4, 0x53, 0x29, 0x53, 0xfa, 0xab, 0x2e, 0x6c, 0xdf,</div><div class='add'>+	0xda, 0x53, 0xdd, 0x7c, 0x97, 0x52, 0x96, 0x4b, 0x9b, 0x42, 0xee, 0x9b,</div><div class='add'>+	0x87, 0x54, 0xc3, 0x83, 0x7c, 0x9b, 0x21, 0x0c, 0xeb, 0xd9, 0x2e, 0x0d,</div><div class='add'>+	0x63, 0x0e, 0x52, 0x7e, 0xee, 0x9c, 0x52, 0xff, 0xd7, 0x9b, 0x4b, 0x63,</div><div class='add'>+	0x4e, 0xa1, 0x6d, 0x05, 0xfb, 0xbf, 0xa9, 0x6d, 0x45, 0x54, 0xdc, 0xb3,</div><div class='add'>+	0x15, 0x8c, 0x97, 0x39, 0xf6, 0x63, 0xf1, 0xf1, 0x7b, 0x5c, 0x7f, 0xef,</div><div class='add'>+	0xc8, 0xac, 0xcd, 0xf7, 0x0b, 0x47, 0xae, 0xda, 0x05, 0xe3, 0xc0, 0x1d,</div><div class='add'>+	0x79, 0x66, 0x52, 0xc7, 0xe7, 0x19, 0xc8, 0x7e, 0xb3, 0xa6, 0x6b, 0x35,</div><div class='add'>+	0xb9, 0x56, 0x8b, 0xc8, 0x3b, 0x2b, 0x6d, 0xb2, 0xb9, 0xe4, 0xea, 0xfc,</div><div class='add'>+	0xe6, 0x12, 0xf5, 0xdc, 0x94, 0x9f, 0xad, 0x58, 0x58, 0x4b, 0xe2, 0xaf,</div><div class='add'>+	0x47, 0x6e, 0xac, 0xdc, 0x99, 0x77, 0x5e, 0xae, 0x3f, 0x0a, 0x5a, 0x7a,</div><div class='add'>+	0x24, 0x64, 0x39, 0xba, 0xee, 0xca, 0x21, 0xf6, 0x15, 0x64, 0x42, 0xf2,</div><div class='add'>+	0xe5, 0x7e, 0xd4, 0x7e, 0x08, 0xce, 0x61, 0xc6, 0x20, 0xdc, 0x7f, 0xf9,</div><div class='add'>+	0xf3, 0xc8, 0x4d, 0x12, 0x30, 0x9e, 0x7e, 0xfd, 0xa6, 0xf8, 0xc5, 0x70,</div><div class='add'>+	0x8f, 0x34, 0x5b, 0xdf, 0xec, 0x76, 0x63, 0x95, 0xe9, 0xd6, 0xa7, 0x96,</div><div class='add'>+	0x1f, 0xaf, 0xdf, 0x04, 0xee, 0x11, 0xe8, 0x29, 0x75, 0xd3, 0x86, 0xce,</div><div class='add'>+	0x9a, 0xb2, 0x3a, 0x94, 0xa8, 0x14, 0x84, 0xfe, 0x21, 0xc5, 0x7c, 0x11,</div><div class='add'>+	0xfb, 0x92, 0x90, 0x47, 0xab, 0xce, 0x85, 0x32, 0x0a, 0x77, 0xbb, 0x30,</div><div class='add'>+	0x27, 0xf9, 0xfa, 0xef, 0x63, 0x3e, 0x23, 0xd3, 0xf5, 0x71, 0x9c, 0x75,</div><div class='add'>+	0x1a, 0x7a, 0xfb, 0x60, 0x8f, 0xb4, 0xf1, 0x9c, 0x14, 0x68, 0x7c, 0x44,</div><div class='add'>+	0x66, 0xce, 0xce, 0xc9, 0x91, 0x32, 0xe9, 0xe4, 0x1b, 0x63, 0x22, 0x99,</div><div class='add'>+	0x93, 0xe1, 0xf8, 0x0a, 0x72, 0x27, 0xd7, 0x1e, 0xd3, 0x32, 0x73, 0x0e,</div><div class='add'>+	0x38, 0xca, 0xac, 0xff, 0xfb, 0xa1, 0x37, 0xc3, 0xba, 0x7e, 0x99, 0xd6,</div><div class='add'>+	0x7e, 0x87, 0xf3, 0x6f, 0xe3, 0x9e, 0xfa, 0x0b, 0xfb, 0x00, 0x97, 0x47,</div><div class='add'>+	0xad, 0x33, 0x85, 0x7c, 0x79, 0xb9, 0x8c, 0x3a, 0xcf, 0x0e, 0x31, 0xf7,</div><div class='add'>+	0x52, 0xea, 0xa1, 0x5e, 0xa9, 0x96, 0x87, 0x4d, 0xa5, 0x98, 0x53, 0xf1,</div><div class='add'>+	0x2e, 0xb8, 0x46, 0xfb, 0x8e, 0xa9, 0xb0, 0xd5, 0x2b, 0x2b, 0xe5, 0x02,</div><div class='add'>+	0xea, 0x65, 0xe5, 0xbd, 0x67, 0x14, 0xc4, 0xb4, 0x5c, 0xbf, 0xa7, 0x6b,</div><div class='add'>+	0x1b, 0xe6, 0x9f, 0xf5, 0x2f, 0x80, 0xc6, 0x0c, 0x2e, 0xf3, 0x24, 0xe8,</div><div class='add'>+	0xc3, 0xf7, 0x32, 0x74, 0x7c, 0x81, 0x39, 0x5c, 0x06, 0x6b, 0x69, 0x39,</div><div class='add'>+	0x76, 0x61, 0x0a, 0x34, 0x74, 0x4a, 0xff, 0x9f, 0xd1, 0xc6, 0x9e, 0xc4,</div><div class='add'>+	0x1c, 0xc7, 0x09, 0xe8, 0xeb, 0xd7, 0xf1, 0x4d, 0xd8, 0x18, 0x7a, 0xca,</div><div class='add'>+	0xa1, 0x17, 0xbd, 0x09, 0x5a, 0x58, 0x07, 0x43, 0xfe, 0x87, 0xe3, 0x52,</div><div class='add'>+	0x3d, 0xfb, 0xb0, 0x4c, 0x2f, 0x3f, 0x0c, 0xfc, 0xff, 0x8a, 0xba, 0x00,</div><div class='add'>+	0xf1, 0x6d, 0x99, 0x67, 0x31, 0xff, 0xe3, 0x39, 0x10, 0x10, 0x6d, 0x63,</div><div class='add'>+	0x81, 0xf3, 0xec, 0x0f, 0x62, 0x3f, 0x6a, 0x8c, 0x72, 0x46, 0x66, 0xca,</div><div class='add'>+	0x3c, 0x0b, 0x77, 0x87, 0x7c, 0x2a, 0x7f, 0x76, 0xca, 0xbb, 0xe3, 0x1e,</div><div class='add'>+	0xc9, 0x45, 0x0b, 0xac, 0x2f, 0x10, 0x27, 0x96, 0x46, 0xb3, 0xa5, 0x84,</div><div class='add'>+	0x99, 0x55, 0xc4, 0x95, 0x14, 0xc6, 0x06, 0x77, 0x2e, 0x22, 0xd6, 0x02,</div><div class='add'>+	0x6a, 0xda, 0x34, 0xd7, 0x4e, 0x7a, 0x6f, 0x06, 0xc4, 0xf5, 0x63, 0x99,</div><div class='add'>+	0x80, 0x8e, 0xf5, 0x2f, 0x8c, 0x20, 0x17, 0xfe, 0x29, 0x72, 0xc9, 0xb8,</div><div class='add'>+	0x27, 0x83, 0x71, 0x4f, 0x37, 0xda, 0x1a, 0x74, 0x02, 0xf7, 0x5c, 0xc6,</div><div class='add'>+	0xdd, 0x97, 0xa1, 0x07, 0xf0, 0xd5, 0xaf, 0x6e, 0xe9, 0xc7, 0x78, 0x43,</div><div class='add'>+	0x8e, 0xd9, 0x21, 0xff, 0x50, 0x49, 0x24, 0xd7, 0xa1, 0x3f, 0x37, 0x50,</div><div class='add'>+	0x0b, 0xac, 0xa3, 0x3e, 0xdc, 0xb4, 0x23, 0xa8, 0x4b, 0x0e, 0x83, 0x7e,</div><div class='add'>+	0xe6, 0x94, 0x1c, 0xc7, 0x74, 0xae, 0xd3, 0x62, 0x3d, 0x7f, 0x8f, 0x7e,</div><div class='add'>+	0xd7, 0x95, 0xaf, 0xf6, 0xb0, 0xa6, 0x64, 0x3d, 0xce, 0x37, 0xe9, 0x77,</div><div class='add'>+	0x70, 0x8f, 0xeb, 0x26, 0xd7, 0xfd, 0x7d, 0xac, 0x05, 0x7c, 0xfd, 0x21,</div><div class='add'>+	0x2d, 0xd4, 0x1f, 0xee, 0x21, 0x4c, 0x8f, 0xb6, 0x93, 0xbc, 0xc6, 0x47,</div><div class='add'>+	0x9d, 0xfd, 0x9b, 0x6e, 0xd7, 0xce, 0x74, 0x9e, 0x65, 0x5e, 0x13, 0x5f,</div><div class='add'>+	0x7f, 0x3f, 0x74, 0x58, 0xd7, 0x65, 0x87, 0xe0, 0xbb, 0xeb, 0x8e, 0xbc,</div><div class='add'>+	0x60, 0xdf, 0x69, 0x77, 0xfb, 0xcb, 0xbe, 0x9c, 0x28, 0xc7, 0xc3, 0x72,</div><div class='add'>+	0xaa, 0x9e, 0x80, 0x4d, 0x50, 0x86, 0x56, 0x83, 0x0c, 0x45, 0xfe, 0xaa,</div><div class='add'>+	0x2c, 0xf2, 0x4a, 0x99, 0x6b, 0x5a, 0x86, 0xb1, 0x6c, 0xa8, 0x8d, 0xef,</div><div class='add'>+	0xea, 0xd0, 0xcb, 0xb7, 0xe5, 0xc8, 0xa2, 0xc8, 0x05, 0xac, 0xaf, 0x96,</div><div class='add'>+	0x69, 0xab, 0x23, 0xc8, 0x5f, 0x77, 0x49, 0x75, 0x09, 0x35, 0x59, 0x59,</div><div class='add'>+	0xa6, 0xb3, 0x9f, 0x63, 0xbc, 0x89, 0xc8, 0xa6, 0x7e, 0x8f, 0x15, 0x19,</div><div class='add'>+	0xbc, 0x18, 0x96, 0xf0, 0x45, 0x14, 0x7f, 0x90, 0xfd, 0xa5, 0x21, 0xff,</div><div class='add'>+	0x7d, 0xd6, 0xb5, 0xf9, 0x62, 0x09, 0x7b, 0xcb, 0xfd, 0xda, 0x4f, 0x16,</div><div class='add'>+	0x6b, 0x33, 0x92, 0xaf, 0xf0, 0x2c, 0xf4, 0x4b, 0x71, 0xac, 0xa5, 0x64,</div><div class='add'>+	0xf6, 0xec, 0x88, 0x3c, 0x8b, 0x33, 0x50, 0xff, 0xe1, 0x8c, 0x09, 0x29,</div><div class='add'>+	0x5c, 0xc0, 0x7c, 0xed, 0xba, 0x2c, 0xad, 0xcc, 0x48, 0xb5, 0x72, 0xb9,</div><div class='add'>+	0xe1, 0xdd, 0x1d, 0xe3, 0xa5, 0xc6, 0x5a, 0xf6, 0x30, 0xeb, 0x19, 0xd4,</div><div class='add'>+	0xaa, 0x16, 0xc6, 0x90, 0x59, 0x6d, 0x76, 0xfa, 0xce, 0xf7, 0xe2, 0xc6,</div><div class='add'>+	0x1a, 0x76, 0x52, 0xe6, 0xcb, 0x29, 0x29, 0x9e, 0x1d, 0xd1, 0x6f, 0x0a,</div><div class='add'>+	0x2d, 0xe9, 0xca, 0xd3, 0x37, 0x11, 0x2b, 0x26, 0xf5, 0x7b, 0xf1, 0x2d,</div><div class='add'>+	0x79, 0xcc, 0x9e, 0x97, 0xa3, 0xd6, 0x41, 0x39, 0x85, 0xfc, 0xfa, 0x4b,</div><div class='add'>+	0x76, 0xab, 0xc4, 0xbb, 0x79, 0x8f, 0xa0, 0xd7, 0x62, 0x0d, 0xea, 0xc8,</div><div class='add'>+	0x84, 0xfd, 0xa0, 0xf9, 0x3c, 0x24, 0xfb, 0x4e, 0x8d, 0x71, 0xf2, 0xbf,</div><div class='add'>+	0x9d, 0x0c, 0xe2, 0xde, 0x4d, 0xd4, 0x8e, 0x19, 0x0d, 0x67, 0xb8, 0x70,</div><div class='add'>+	0x15, 0xc2, 0x0d, 0x9b, 0x2f, 0x10, 0x6e, 0xc9, 0xf0, 0xe0, 0x0c, 0xc0,</div><div class='add'>+	0x85, 0x64, 0xc3, 0x0e, 0x43, 0x47, 0x26, 0xc1, 0x27, 0x7c, 0xfc, 0x68,</div><div class='add'>+	0x87, 0x97, 0x07, 0xb7, 0x22, 0xb6, 0xde, 0xde, 0xff, 0x86, 0xb7, 0xff,</div><div class='add'>+	0x59, 0x6f, 0xff, 0xd5, 0xad, 0xfd, 0x7e, 0x7c, 0xfd, 0x85, 0x23, 0x0d,</div><div class='add'>+	0x74, 0xbd, 0x51, 0x72, 0xe1, 0xe7, 0x3d, 0xba, 0xae, 0x6e, 0xd1, 0xe5,</div><div class='add'>+	0xc3, 0x43, 0x9e, 0x9a, 0x67, 0xfa, 0x66, 0xfa, 0xe8, 0x7e, 0xc8, 0xd1,</div><div class='add'>+	0x91, 0x9c, 0x0d, 0xdb, 0x28, 0x27, 0xc6, 0x0b, 0xfa, 0x2d, 0x4d, 0xc9,</div><div class='add'>+	0x7a, 0x74, 0x5e, 0x26, 0xad, 0xc4, 0xf8, 0xac, 0x84, 0xa0, 0xcb, 0xf4,</div><div class='add'>+	0x2d, 0x21, 0xa9, 0xd2, 0xe7, 0xa0, 0xcf, 0xdb, 0x3b, 0xd3, 0xfa, 0x4e,</div><div class='add'>+	0x03, 0xad, 0xa1, 0x97, 0x49, 0xa3, 0x4b, 0x6b, 0x64, 0xe0, 0x36, 0xad,</div><div class='add'>+	0x2e, 0xbc, 0x4b, 0xeb, 0x3b, 0xa5, 0x06, 0xf8, 0x8b, 0x61, 0x0f, 0x3e,</div><div class='add'>+	0xdc, 0x00, 0x4f, 0x7d, 0x66, 0x5e, 0x41, 0x7d, 0x26, 0x6d, 0x9f, 0x85,</div><div class='add'>+	0x6d, 0x48, 0xa4, 0x35, 0x5d, 0x39, 0xfe, 0xc0, 0x80, 0x23, 0x11, 0xe4,</div><div class='add'>+	0x1b, 0xcd, 0x58, 0xdb, 0xac, 0x30, 0x17, 0x51, 0x7d, 0xcd, 0x32, 0x08,</div><div class='add'>+	0x9d, 0xe5, 0xdd, 0xb9, 0x6f, 0x82, 0x8f, 0xe9, 0x9c, 0xc0, 0x91, 0xa3,</div><div class='add'>+	0x36, 0x69, 0x79, 0xdf, 0x79, 0x25, 0x3a, 0x68, 0x17, 0x65, 0xc8, 0x6c,</div><div class='add'>+	0xc6, 0xf9, 0xd5, 0xba, 0xc6, 0x99, 0x24, 0x2d, 0xe7, 0x87, 0xfa, 0xcd,</div><div class='add'>+	0xbf, 0x07, 0x9f, 0x13, 0x15, 0x43, 0xaa, 0x56, 0x22, 0x76, 0x09, 0x38,</div><div class='add'>+	0xf6, 0xe1, 0x6e, 0xaa, 0x23, 0xa4, 0x47, 0xe4, 0x08, 0xf4, 0xbb, 0xaa,</div><div class='add'>+	0xe3, 0x22, 0xf5, 0x38, 0x31, 0x59, 0x40, 0xae, 0xf3, 0xd7, 0x3a, 0xb6,</div><div class='add'>+	0x39, 0xce, 0x4d, 0xc4, 0xb7, 0xc9, 0x6d, 0xba, 0xa7, 0x2e, 0xba, 0xba,</div><div class='add'>+	0xa7, 0x2e, 0xa2, 0x06, 0x3e, 0x1d, 0x91, 0x96, 0x55, 0xd8, 0xcf, 0xcb,</div><div class='add'>+	0x7b, 0xdc, 0x7c, 0xee, 0x65, 0xfe, 0xe6, 0x04, 0x7f, 0x77, 0x3a, 0x2c,</div><div class='add'>+	0xd6, 0x69, 0x1d, 0x0f, 0x20, 0xef, 0x09, 0x99, 0x3d, 0x47, 0x9f, 0x6a,</div><div class='add'>+	0xc9, 0xc0, 0x69, 0xde, 0x07, 0xf3, 0x9a, 0xa5, 0xd1, 0x19, 0xd8, 0xc8,</div><div class='add'>+	0x1c, 0xfc, 0x82, 0x5a, 0x7d, 0x57, 0x66, 0x2c, 0xca, 0xa1, 0x53, 0xda,</div><div class='add'>+	0x56, 0x51, 0x8f, 0xaf, 0xc2, 0x37, 0xac, 0xc6, 0xa4, 0x09, 0xb6, 0xa5,</div><div class='add'>+	0x2e, 0x46, 0x8d, 0xe2, 0xe2, 0x07, 0xb0, 0x07, 0xfe, 0x7e, 0x83, 0xdc,</div><div class='add'>+	0xf2, 0x62, 0xcc, 0xa0, 0x6d, 0xa9, 0x8b, 0xd4, 0x73, 0xa4, 0x53, 0x17,</div><div class='add'>+	0xa9, 0xe7, 0xa4, 0xc3, 0xb7, 0x17, 0x7c, 0x5f, 0x1c, 0xd1, 0xef, 0xd3,</div><div class='add'>+	0x37, 0x6d, 0xf2, 0xf2, 0x8f, 0x92, 0xad, 0x30, 0x47, 0x24, 0x3f, 0xd2,</div><div class='add'>+	0x8d, 0x5c, 0xa6, 0x2b, 0x6b, 0x0f, 0x8c, 0x6f, 0xca, 0xa7, 0xe5, 0xeb,</div><div class='add'>+	0xee, 0x4f, 0xc1, 0x17, 0xf9, 0x68, 0xe4, 0x8b, 0x3c, 0x75, 0x4a, 0x93,</div><div class='add'>+	0xe6, 0xcb, 0xe7, 0x07, 0x82, 0x06, 0x3f, 0x7d, 0xa7, 0x63, 0xc0, 0xff,</div><div class='add'>+	0x75, 0xf8, 0x80, 0x5e, 0xf4, 0x4f, 0xa2, 0x47, 0x48, 0xbb, 0x48, 0xde,</div><div class='add'>+	0xc9, 0xeb, 0x0d, 0xe4, 0x8d, 0x3e, 0x9f, 0xd3, 0xf8, 0x7e, 0x5d, 0x66,</div><div class='add'>+	0x17, 0x9d, 0x93, 0x88, 0xab, 0x7c, 0x3b, 0xef, 0x71, 0xdf, 0x81, 0xb7,</div><div class='add'>+	0xf3, 0xfe, 0xba, 0xb8, 0xf2, 0x49, 0x98, 0x55, 0xc1, 0xf7, 0xca, 0x76,</div><div class='add'>+	0x59, 0x34, 0xfa, 0x8e, 0x98, 0xce, 0xc3, 0x8f, 0xd4, 0xe8, 0x27, 0x28,</div><div class='add'>+	0xa3, 0x1b, 0x92, 0x5d, 0xe4, 0xfb, 0x97, 0x8b, 0x6f, 0xba, 0xe6, 0xfb,</div><div class='add'>+	0x8d, 0xc6, 0x3d, 0x36, 0xe0, 0x7a, 0x01, 0x47, 0xba, 0xd6, 0x29, 0x3f,</div><div class='add'>+	0xf8, 0x9c, 0xbd, 0x0d, 0xbe, 0xa6, 0x71, 0xdf, 0xb8, 0x3c, 0x87, 0x3c,</div><div class='add'>+	0xe0, 0x0d, 0xfb, 0x0e, 0xb9, 0x4e, 0x33, 0x17, 0xaa, 0xd6, 0xa6, 0x60,</div><div class='add'>+	0x93, 0x4d, 0xf0, 0x65, 0xa6, 0x6c, 0x96, 0x9a, 0xa5, 0x8a, 0x7c, 0x67,</div><div class='add'>+	0x79, 0x85, 0xbe, 0x90, 0xb4, 0xb7, 0x61, 0xde, 0xf5, 0x5f, 0xf4, 0xb5,</div><div class='add'>+	0x9b, 0x25, 0xc4, 0x59, 0xd8, 0xf6, 0x66, 0x29, 0x8a, 0xbe, 0x17, 0xbd,</div><div class='add'>+	0x85, 0x3e, 0x8e, 0x3e, 0x89, 0x7e, 0x04, 0xfd, 0x08, 0x7a, 0x0b, 0x7b,</div><div class='add'>+	0x63, 0xe8, 0xfd, 0x9a, 0x81, 0xb8, 0x6e, 0xf3, 0x5d, 0xd4, 0xe7, 0x21,</div><div class='add'>+	0x57, 0xb4, 0x18, 0xd3, 0xc2, 0x76, 0x0e, 0x75, 0x44, 0x76, 0x84, 0xb9,</div><div class='add'>+	0x1e, 0x73, 0xbe, 0x8f, 0x1d, 0xd3, 0x62, 0x5d, 0x5e, 0x30, 0xf6, 0x0d,</div><div class='add'>+	0x31, 0x2e, 0x54, 0x10, 0x17, 0x3e, 0xd8, 0x8d, 0xfa, 0xd1, 0xdc, 0xaf,</div><div class='add'>+	0xdf, 0x8e, 0x16, 0x31, 0xe6, 0x37, 0x6a, 0xde, 0xe8, 0x1c, 0xe2, 0x14,</div><div class='add'>+	0xfd, 0xa7, 0x83, 0x3d, 0x79, 0xf8, 0xf1, 0x2e, 0xd8, 0x5f, 0x06, 0x7e,</div><div class='add'>+	0x1b, 0xdf, 0x4b, 0x6f, 0xec, 0x76, 0x63, 0x2a, 0xf2, 0x77, 0xb5, 0xfd,</div><div class='add'>+	0xbd, 0xc6, 0xc6, 0x9e, 0x9d, 0x6a, 0x83, 0x0e, 0xe0, 0x48, 0x54, 0x96,</div><div class='add'>+	0x60, 0x83, 0x3f, 0xb4, 0x4f, 0xea, 0xdc, 0x8e, 0x77, 0xf1, 0x2c, 0x72,</div><div class='add'>+	0xd4, 0xdc, 0x02, 0x73, 0x98, 0x13, 0xa8, 0x4b, 0x50, 0x9f, 0x45, 0x59,</div><div class='add'>+	0x93, 0x33, 0x16, 0xe8, 0x5c, 0x34, 0x2a, 0x6d, 0x8c, 0x03, 0x37, 0x70,</div><div class='add'>+	0x1e, 0xf8, 0x5a, 0x76, 0x20, 0xb3, 0x03, 0xc8, 0x09, 0x1d, 0x27, 0x6c,</div><div class='add'>+	0xed, 0x93, 0xf8, 0x21, 0xfa, 0x1c, 0xc1, 0x7e, 0x53, 0xdc, 0xf7, 0x74,</div><div class='add'>+	0xf8, 0xdd, 0x29, 0xfd, 0x5b, 0x31, 0x94, 0xeb, 0xb3, 0xd8, 0x7b, 0x17,</div><div class='add'>+	0x70, 0x71, 0x9e, 0x6f, 0xd9, 0x22, 0xfb, 0x16, 0xdc, 0x9c, 0x56, 0x59,</div><div class='add'>+	0x8d, 0xf8, 0x7e, 0xd5, 0xc3, 0xc7, 0x75, 0xe5, 0xfd, 0xa6, 0xb1, 0xc7,</div><div class='add'>+	0x7d, 0x1b, 0xc6, 0x1d, 0x9f, 0x42, 0xfe, 0xbc, 0x81, 0x7b, 0x79, 0x03,</div><div class='add'>+	0x77, 0x72, 0xa5, 0x44, 0x5d, 0x1f, 0x86, 0xde, 0x43, 0x86, 0x53, 0xc4,</div><div class='add'>+	0x35, 0xa2, 0xcf, 0xde, 0x28, 0xc1, 0x77, 0xd2, 0xff, 0x29, 0x64, 0x77,</div><div class='add'>+	0x6d, 0x6e, 0x4c, 0x77, 0xf1, 0xf4, 0xba, 0x70, 0xe2, 0xaf, 0xed, 0xd6,</div><div class='add'>+	0xf4, 0x54, 0xf5, 0x3b, 0x18, 0xe5, 0x04, 0x1d, 0xe4, 0x6f, 0x03, 0x1a,</div><div class='add'>+	0xe6, 0x6b, 0x51, 0xfd, 0xfe, 0xae, 0x38, 0x47, 0x3e, 0x46, 0x24, 0xbb,</div><div class='add'>+	0xe0, 0xef, 0xeb, 0xc6, 0xbe, 0xd6, 0x06, 0x5c, 0x77, 0x6f, 0xe3, 0x41,</div><div class='add'>+	0x79, 0x3c, 0x70, 0xfd, 0x93, 0x6f, 0xc3, 0x85, 0xad, 0xb7, 0x61, 0xc6,</div><div class='add'>+	0x5f, 0xde, 0x4d, 0x0a, 0xfb, 0xfd, 0xfb, 0xe9, 0xf5, 0x6a, 0x81, 0xc4,</div><div class='add'>+	0x7c, 0x41, 0x98, 0xab, 0xf0, 0x8e, 0xc6, 0x61, 0xd7, 0x5d, 0xc0, 0x6f,</div><div class='add'>+	0x4b, 0xa5, 0xd4, 0x22, 0xaa, 0x87, 0xb5, 0x31, 0x73, 0xe5, 0xc6, 0x33,</div><div class='add'>+	0x7f, 0xdb, 0x3b, 0x13, 0xf5, 0xf4, 0x19, 0xe6, 0xcd, 0x3a, 0xce, 0x00,</div><div class='add'>+	0xa6, 0x7d, 0x1b, 0x6d, 0xbf, 0xee, 0xc1, 0x71, 0x3d, 0x29, 0x05, 0xe4,</div><div class='add'>+	0xa1, 0xb9, 0x05, 0x64, 0xf4, 0xf0, 0xdf, 0x2a, 0xcd, 0xdf, 0xb3, 0xf8,</div><div class='add'>+	0x86, 0x37, 0x1c, 0x9f, 0x05, 0x8d, 0x05, 0x33, 0xc3, 0x77, 0x33, 0xe0,</div><div class='add'>+	0xd8, 0xbb, 0x0d, 0xc7, 0x84, 0x87, 0x63, 0x42, 0x8a, 0xe7, 0x26, 0x61,</div><div class='add'>+	0x6b, 0x19, 0xc4, 0xf7, 0x7e, 0xf3, 0x80, 0x7c, 0x1e, 0xc5, 0x35, 0xe6,</div><div class='add'>+	0x2e, 0x8c, 0xe0, 0x9e, 0x1c, 0x67, 0x9f, 0x7d, 0x18, 0x74, 0xbf, 0x86,</div><div class='add'>+	0xd8, 0xea, 0xe7, 0x3c, 0xc5, 0x58, 0x08, 0x31, 0xec, 0x98, 0xfe, 0x0d,</div><div class='add'>+	0xb6, 0x60, 0x9a, 0xd0, 0x57, 0x65, 0x0c, 0x27, 0x51, 0xde, 0x23, 0xbe,</div><div class='add'>+	0xcd, 0x23, 0x56, 0x91, 0xcf, 0x0e, 0x29, 0x9a, 0xc6, 0xa3, 0x21, 0xe4,</div><div class='add'>+	0x35, 0xd9, 0x05, 0xda, 0x91, 0x0c, 0x84, 0xd2, 0xcd, 0xc8, 0x49, 0x1d,</div><div class='add'>+	0xf9, 0x99, 0xcd, 0x7f, 0xa3, 0x30, 0x2f, 0x1b, 0x35, 0x13, 0xfd, 0x3a,</div><div class='add'>+	0xee, 0xe1, 0xdb, 0xf8, 0xbe, 0xde, 0x83, 0xbc, 0x0f, 0x2b, 0x19, 0xe8,</div><div class='add'>+	0x6e, 0x52, 0xe7, 0x33, 0xcc, 0x23, 0xaa, 0x88, 0xb7, 0x0a, 0xb1, 0x06,</div><div class='add'>+	0x79, 0xd5, 0x38, 0x73, 0xd7, 0xe7, 0x96, 0xaf, 0xcb, 0x95, 0x45, 0xfe,</div><div class='add'>+	0x06, 0xca, 0xb8, 0x7c, 0x90, 0xfe, 0xc0, 0x9c, 0x4b, 0x61, 0x6e, 0x85,</div><div class='add'>+	0xbe, 0x0c, 0xe3, 0x3a, 0x0c, 0xa8, 0x07, 0x39, 0x02, 0x72, 0xed, 0x4d,</div><div class='add'>+	0x2b, 0x09, 0x3e, 0xaf, 0xcb, 0xc6, 0x62, 0x58, 0x96, 0x2d, 0xe6, 0x45,</div><div class='add'>+	0x12, 0xcf, 0x02, 0x76, 0x63, 0xe5, 0x9a, 0xab, 0x13, 0x84, 0x47, 0xcd,</div><div class='add'>+	0x53, 0x40, 0x5e, 0x77, 0x40, 0xef, 0xfd, 0x65, 0xf7, 0x4c, 0x9a, 0x1a,</div><div class='add'>+	0xeb, 0xbc, 0x19, 0xd9, 0xa0, 0x3d, 0xd9, 0x7c, 0x93, 0x62, 0x6e, 0x70,</div><div class='add'>+	0x02, 0x3a, 0xcb, 0xdc, 0x9d, 0xf5, 0x00, 0xbe, 0x6b, 0x5c, 0x27, 0xef,</div><div class='add'>+	0xe8, 0x97, 0xfa, 0x21, 0x1b, 0xda, 0x3d, 0xdf, 0xc4, 0x10, 0x47, 0x15,</div><div class='add'>+	0x6d, 0xbd, 0xa8, 0x7d, 0x41, 0xb1, 0x3c, 0x83, 0x98, 0x02, 0x1f, 0xc0,</div><div class='add'>+	0xdf, 0x70, 0xa6, 0xa6, 0x70, 0x97, 0xe3, 0x80, 0xdb, 0x16, 0x4b, 0xd6,</div><div class='add'>+	0x8a, 0x3a, 0x2f, 0x53, 0xe7, 0x6f, 0xbf, 0xdf, 0xe4, 0x61, 0x3f, 0x6a,</div><div class='add'>+	0x0d, 0xba, 0x05, 0x1b, 0x52, 0x6b, 0x51, 0xf4, 0xf0, 0xc7, 0x6b, 0xa8,</div><div class='add'>+	0x2f, 0x4a, 0x7c, 0x1f, 0x42, 0x6d, 0x50, 0xe2, 0xdb, 0x49, 0x12, 0xfd,</div><div class='add'>+	0x08, 0xdf, 0x8b, 0x3c, 0xbf, 0x46, 0xfc, 0xa4, 0xc3, 0xf7, 0x2f, 0xcc,</div><div class='add'>+	0x25, 0xe9, 0x5f, 0xfc, 0x7c, 0xd2, 0xd5, 0x85, 0x53, 0x65, 0xfa, 0x10,</div><div class='add'>+	0xea, 0x75, 0x3f, 0xfc, 0x16, 0x75, 0xc1, 0xcd, 0x25, 0x57, 0x2a, 0xae,</div><div class='add'>+	0xcc, 0x66, 0xeb, 0x97, 0x75, 0x8c, 0xd8, 0x2f, 0x16, 0x74, 0x8c, 0xb2,</div><div class='add'>+	0xc3, 0x9a, 0x8e, 0x01, 0x97, 0x24, 0xa3, 0x7b, 0xca, 0xec, 0x75, 0xc9,</div><div class='add'>+	0xac, 0x8c, 0xc8, 0x0b, 0xda, 0x6f, 0xf9, 0x3e, 0x8b, 0x39, 0x64, 0x0c,</div><div class='add'>+	0xf2, 0x4b, 0xca, 0xf3, 0x67, 0xaf, 0x4b, 0xf6, 0x45, 0xfa, 0xad, 0xe1,</div><div class='add'>+	0x58, 0xab, 0x41, 0x5f, 0xe5, 0x48, 0x0d, 0xb1, 0xe9, 0x80, 0xcd, 0x7f,</div><div class='add'>+	0x07, 0x10, 0x42, 0x4d, 0xe7, 0x48, 0xf3, 0x68, 0xc2, 0x8e, 0x1b, 0xfd,</div><div class='add'>+	0x4f, 0xb6, 0x1a, 0x8c, 0x8d, 0xc3, 0xe6, 0x53, 0xe2, 0xbf, 0x47, 0xb5,</div><div class='add'>+	0xc8, 0x53, 0xfa, 0xad, 0x02, 0x66, 0xbb, 0xf0, 0x91, 0xfe, 0x1d, 0xe5,</div><div class='add'>+	0x66, 0x8a, 0xb2, 0xc6, 0x78, 0x8d, 0xf3, 0x85, 0xc8, 0xcd, 0x54, 0x93,</div><div class='add'>+	0x14, 0xef, 0x72, 0x9c, 0xa3, 0xa3, 0xa9, 0xdd, 0xee, 0xbf, 0x15, 0xf9,</div><div class='add'>+	0xc6, 0x5d, 0xae, 0x2f, 0x38, 0xea, 0x8d, 0x5f, 0x41, 0x4f, 0xdd, 0x66,</div><div class='add'>+	0xbc, 0x65, 0x7c, 0xe4, 0xbd, 0xa1, 0x5f, 0xe1, 0x37, 0x63, 0xef, 0x3c,</div><div class='add'>+	0x62, 0x2f, 0xe3, 0x65, 0x97, 0xe4, 0x0e, 0x6b, 0x9f, 0xc1, 0xf9, 0x82,</div><div class='add'>+	0x9b, 0x4b, 0x7b, 0x70, 0x95, 0x69, 0x99, 0xad, 0x30, 0x87, 0xda, 0x40,</div><div class='add'>+	0x2c, 0x1b, 0x82, 0xae, 0x32, 0xa6, 0x9d, 0x44, 0x3c, 0xe7, 0xef, 0xd2,</div><div class='add'>+	0x58, 0x5b, 0xe2, 0xbe, 0x44, 0x32, 0xae, 0xc0, 0xf3, 0x96, 0x4e, 0xdd,</div><div class='add'>+	0x8c, 0xf2, 0x3d, 0xea, 0xd2, 0x10, 0xee, 0xfd, 0x4f, 0x59, 0x5b, 0x0c,</div><div class='add'>+	0x68, 0x1d, 0xc9, 0xbe, 0x4c, 0xd9, 0xbb, 0xbf, 0x5b, 0x4b, 0xb7, 0x6b,</div><div class='add'>+	0x03, 0xcc, 0x03, 0x1e, 0x87, 0x5c, 0xf6, 0xdb, 0xd7, 0x19, 0xbb, 0xff,</div><div class='add'>+	0x5d, 0x59, 0xc3, 0xc9, 0xa7, 0x0c, 0xda, 0x36, 0xc6, 0x2b, 0x21, 0x59,</div><div class='add'>+	0x8a, 0x92, 0x7f, 0xc8, 0xcb, 0xa0, 0xed, 0xec, 0x24, 0x87, 0xed, 0x32,</div><div class='add'>+	0xf8, 0x4b, 0xc8, 0x80, 0xb2, 0xf4, 0x65, 0xc0, 0xef, 0x49, 0xdc, 0x17,</div><div class='add'>+	0x6b, 0x86, 0x7e, 0x5d, 0x47, 0x16, 0xeb, 0xee, 0xd9, 0xc5, 0x72, 0x23,</div><div class='add'>+	0xcd, 0xa4, 0x97, 0x77, 0x7a, 0x49, 0x72, 0xfa, 0x7e, 0xe7, 0x25, 0x57,</div><div class='add'>+	0xb9, 0x24, 0xfb, 0x2a, 0xf3, 0xf2, 0x98, 0xf5, 0x28, 0xf8, 0xbd, 0xe6,</div><div class='add'>+	0xcc, 0x58, 0xba, 0x56, 0x19, 0xcf, 0xff, 0x6f, 0xe7, 0x56, 0x1b, 0xdb,</div><div class='add'>+	0x56, 0x75, 0x86, 0x5f, 0x5f, 0xdb, 0x69, 0x1a, 0x9a, 0x70, 0xeb, 0x3a,</div><div class='add'>+	0x89, 0x9b, 0x66, 0xad, 0x1d, 0xdf, 0x7e, 0x88, 0xa4, 0xe8, 0x36, 0x64,</div><div class='add'>+	0x34, 0xea, 0x82, 0x62, 0x9c, 0x50, 0xc2, 0xe8, 0x44, 0xda, 0x75, 0x55,</div><div class='add'>+	0xb5, 0x31, 0x64, 0x39, 0xe9, 0x07, 0xd3, 0x06, 0xa3, 0xb0, 0x82, 0x18,</div><div class='add'>+	0x52, 0x8d, 0xdb, 0x6a, 0x9d, 0x96, 0xc6, 0xe9, 0x07, 0x6b, 0x37, 0x69,</div><div class='add'>+	0x9a, 0xe5, 0xa4, 0x2d, 0x48, 0x11, 0x2e, 0x88, 0x6e, 0xfb, 0xb1, 0x8d,</div><div class='add'>+	0x2a, 0x65, 0xec, 0xff, 0xf6, 0x67, 0xda, 0xd0, 0x16, 0x15, 0x18, 0xfc,</div><div class='add'>+	0xd8, 0xa4, 0xfe, 0xe0, 0x47, 0x25, 0xe8, 0xbc, 0xe7, 0x79, 0xcf, 0xbd,</div><div class='add'>+	0x8e, 0x6d, 0x82, 0x26, 0x2d, 0x52, 0xe4, 0x7b, 0xce, 0x3d, 0xf7, 0x9c,</div><div class='add'>+	0x73, 0xcf, 0xfb, 0xfd, 0xbe, 0xcf, 0xc5, 0xda, 0x13, 0x7d, 0x6b, 0xe5,</div><div class='add'>+	0x63, 0xf8, 0x1d, 0x27, 0x67, 0x6d, 0xc9, 0xd8, 0x83, 0xf2, 0x63, 0xcd,</div><div class='add'>+	0xe5, 0x33, 0x3e, 0x09, 0xc0, 0x27, 0x35, 0xb8, 0x02, 0x69, 0x77, 0x62,</div><div class='add'>+	0x37, 0x85, 0x3e, 0x65, 0x18, 0xb4, 0x8e, 0x1b, 0xbf, 0xd9, 0x36, 0xf7,</div><div class='add'>+	0x37, 0x9d, 0x81, 0xef, 0xee, 0x0e, 0xb4, 0xfb, 0x39, 0x5f, 0xe3, 0xdf,</div><div class='add'>+	0xfe, 0xc5, 0xab, 0xa1, 0x0d, 0xca, 0x0c, 0xf6, 0xf3, 0x96, 0xea, 0x59,</div><div class='add'>+	0x07, 0xbc, 0xc4, 0xdc, 0x74, 0x4c, 0xf3, 0x0f, 0xe1, 0x69, 0xea, 0xa8,</div><div class='add'>+	0xab, 0xd0, 0x51, 0x43, 0xd4, 0x5d, 0xc3, 0xb3, 0x2e, 0xf3, 0x03, 0x51,</div><div class='add'>+	0xf9, 0xf3, 0x14, 0xf5, 0x70, 0x5c, 0xfe, 0x34, 0xf5, 0x02, 0xf6, 0x93,</div><div class='add'>+	0x28, 0x32, 0x47, 0x79, 0x63, 0x26, 0x47, 0x3f, 0x49, 0xfd, 0xf9, 0xb4,</div><div class='add'>+	0xfb, 0xac, 0xda, 0x81, 0xb8, 0x95, 0x5f, 0x13, 0x56, 0x7d, 0xf3, 0xb4,</div><div class='add'>+	0xd6, 0x74, 0xe3, 0x56, 0xb7, 0xdc, 0x38, 0x6f, 0x74, 0x6c, 0x78, 0x3a,</div><div class='add'>+	0x1a, 0x18, 0x99, 0xa3, 0x5d, 0x4a, 0xc6, 0xb2, 0xd6, 0x0a, 0x39, 0x10,</div><div class='add'>+	0x65, 0xee, 0x39, 0x45, 0xfd, 0x0c, 0x5b, 0xd8, 0x6b, 0x67, 0xad, 0x66,</div><div class='add'>+	0xcf, 0xfe, 0xc4, 0x1a, 0xf4, 0xec, 0xd3, 0x9e, 0x9e, 0xe5, 0xbd, 0x14,</div><div class='add'>+	0x68, 0x4a, 0x5b, 0x94, 0x98, 0x19, 0xb5, 0x92, 0xb0, 0x79, 0xb8, 0x9e,</div><div class='add'>+	0xe7, 0xfc, 0x71, 0x39, 0x32, 0x7f, 0x18, 0xfe, 0x77, 0xaf, 0xbd, 0x87,</div><div class='add'>+	0x76, 0xd5, 0x1e, 0x22, 0x16, 0x07, 0xeb, 0x7f, 0xa9, 0x61, 0xae, 0xc7,</div><div class='add'>+	0xbd, 0xb9, 0x78, 0x1f, 0x72, 0x3e, 0xed, 0xc8, 0x04, 0x6c, 0xc9, 0x88,</div><div class='add'>+	0x6d, 0xf6, 0x5a, 0x3f, 0x76, 0x77, 0x75, 0xdd, 0x13, 0x05, 0xc7, 0xc3,</div><div class='add'>+	0x85, 0xe1, 0x17, 0xbe, 0xd0, 0xd7, 0x23, 0x5c, 0x93, 0xeb, 0xb5, 0x49,</div><div class='add'>+	0x7a, 0x1f, 0xf4, 0xcb, 0x34, 0xff, 0x73, 0x5e, 0xed, 0x0a, 0xf1, 0x4a,</div><div class='add'>+	0xb4, 0x6b, 0x19, 0xdb, 0xf4, 0x80, 0x37, 0xdf, 0xb6, 0x0e, 0x69, 0x89,</div><div class='add'>+	0xd6, 0x8c, 0x67, 0x6e, 0x85, 0xed, 0xb8, 0xe4, 0xe6, 0xf9, 0x5b, 0xa9,</div><div class='add'>+	0x44, 0x9c, 0x26, 0xd9, 0x63, 0xaf, 0x6b, 0x98, 0x63, 0x2b, 0xfa, 0x8c,</div><div class='add'>+	0x4f, 0x10, 0x9c, 0x0e, 0x78, 0xbe, 0xc5, 0x06, 0xfa, 0x4d, 0xde, 0x75,</div><div class='add'>+	0xb3, 0xe6, 0x64, 0xe2, 0x56, 0x57, 0xc3, 0x7b, 0x6c, 0xa8, 0xda, 0xe1,</div><div class='add'>+	0xb8, 0x45, 0xdd, 0xd9, 0x14, 0x95, 0x36, 0xf2, 0x50, 0x45, 0xfd, 0xf8,</div><div class='add'>+	0x90, 0x63, 0xb0, 0x16, 0x51, 0xe7, 0x60, 0x07, 0x73, 0xf6, 0x6f, 0xeb,</div><div class='add'>+	0xb9, 0xb5, 0xd2, 0x27, 0xc0, 0x35, 0xf8, 0xe4, 0x73, 0xf9, 0x5e, 0xe6,</div><div class='add'>+	0x7a, 0x31, 0x7f, 0x0b, 0xe7, 0x77, 0xbd, 0x73, 0x4e, 0xb8, 0x39, 0xeb,</div><div class='add'>+	0x7e, 0xc9, 0x9e, 0x37, 0xfc, 0x97, 0x76, 0xc0, 0x7b, 0x6d, 0x68, 0xcf,</div><div class='add'>+	0xd1, 0x26, 0x7c, 0xd1, 0x3c, 0xbe, 0x6d, 0xd8, 0xa2, 0xb6, 0xe1, 0x78,</div><div class='add'>+	0x81, 0xfc, 0x49, 0xbe, 0xf4, 0xf9, 0xd1, 0xd7, 0x79, 0xe4, 0x51, 0xea,</div><div class='add'>+	0xd9, 0x41, 0x39, 0x53, 0xe0, 0xd9, 0xa4, 0xb4, 0xa6, 0xb5, 0xf1, 0xec,</div><div class='add'>+	0x84, 0xe2, 0xb1, 0x7a, 0xa6, 0x13, 0x17, 0x73, 0x32, 0x2c, 0x57, 0x5d,</div><div class='add'>+	0x9e, 0x59, 0xa2, 0x98, 0x09, 0xb6, 0xd6, 0xbc, 0xff, 0x3e, 0x3d, 0xb3,</div><div class='add'>+	0xb0, 0xfa, 0x8c, 0x31, 0x8c, 0x7d, 0xc9, 0xa3, 0x77, 0x9b, 0x9e, 0x6d,</div><div class='add'>+	0xa6, 0x8e, 0x3e, 0x8f, 0xea, 0x39, 0x85, 0xa1, 0x13, 0x59, 0xc7, 0x0f,</div><div class='add'>+	0x47, 0xf8, 0x0c, 0xd7, 0xa5, 0xcf, 0xc7, 0xb5, 0xc8, 0x7b, 0x3d, 0xb0,</div><div class='add'>+	0xd8, 0xfd, 0x12, 0xdc, 0x01, 0xd1, 0xdf, 0xc1, 0x3a, 0x72, 0x00, 0xb2,</div><div class='add'>+	0xba, 0xd1, 0x60, 0x5f, 0xc6, 0x8d, 0xaf, 0x91, 0xb1, 0xde, 0xc2, 0x39,</div><div class='add'>+	0x22, 0x56, 0x81, 0x1f, 0x7d, 0xfc, 0xa7, 0x77, 0x30, 0x5f, 0xc6, 0xf3,</div><div class='add'>+	0xd7, 0x07, 0x30, 0x3f, 0xcf, 0x82, 0x32, 0x36, 0xb5, 0x8d, 0xbc, 0x3a,</div><div class='add'>+	0xaa, 0xf5, 0x41, 0x3e, 0x43, 0x39, 0xe6, 0x99, 0x91, 0x2e, 0x7f, 0xc3,</div><div class='add'>+	0xf3, 0x6c, 0x6f, 0x6d, 0xa0, 0x63, 0xd2, 0xdb, 0x9f, 0x7f, 0x3f, 0x2c,</div><div class='add'>+	0xe1, 0x0e, 0xea, 0xb8, 0xa8, 0x24, 0xa7, 0x19, 0xb3, 0xc0, 0x76, 0x8d,</div><div class='add'>+	0x73, 0xae, 0xff, 0xad, 0x8b, 0x33, 0xff, 0xa7, 0x2e, 0xce, 0x58, 0x1f,</div><div class='add'>+	0x29, 0xef, 0x84, 0x35, 0x8f, 0xf5, 0xc5, 0x74, 0x2d, 0xd6, 0xd1, 0xd5,</div><div class='add'>+	0xaf, 0xdd, 0x47, 0xab, 0x74, 0xfc, 0x51, 0x81, 0xf6, 0x2a, 0xa5, 0x39,</div><div class='add'>+	0xe5, 0x7f, 0x4e, 0xf1, 0x6c, 0xb9, 0xc7, 0xab, 0xdc, 0xe3, 0xf0, 0x82,</div><div class='add'>+	0x62, 0x20, 0xbf, 0xa6, 0x32, 0x7c, 0xb2, 0x40, 0x1d, 0xd3, 0x2a, 0xb3,</div><div class='add'>+	0x33, 0xbe, 0x9e, 0x19, 0xf3, 0x7c, 0xdc, 0xfc, 0x9a, 0x26, 0xd5, 0x33,</div><div class='add'>+	0xf0, 0x6e, 0x9c, 0x11, 0xcf, 0xbe, 0x74, 0x4b, 0xe9, 0x3c, 0xed, 0x6e,</div><div class='add'>+	0x12, 0x7d, 0xd1, 0x40, 0x69, 0x8e, 0xb5, 0x49, 0x62, 0x50, 0x86, 0x85,</div><div class='add'>+	0x75, 0xff, 0x11, 0xfb, 0x38, 0xe4, 0x2d, 0x26, 0xef, 0x4f, 0xd1, 0xa7,</div><div class='add'>+	0x6f, 0x82, 0x6f, 0xdc, 0xd6, 0x70, 0xbe, 0xdb, 0xab, 0x3e, 0x61, 0x3d,</div><div class='add'>+	0xdd, 0x37, 0x74, 0x4a, 0x0b, 0xf9, 0xdc, 0xb1, 0x6f, 0x08, 0x7d, 0x30,</div><div class='add'>+	0x5e, 0x67, 0x11, 0x0b, 0x30, 0xf6, 0x88, 0x6b, 0xec, 0x51, 0x2a, 0xb2,</div><div class='add'>+	0xaf, 0xd5, 0xcb, 0x2b, 0xb5, 0x2a, 0xaf, 0x90, 0xdf, 0x32, 0xea, 0x7f,</div><div class='add'>+	0x0f, 0xa9, 0xce, 0xca, 0x4f, 0xf5, 0x1a, 0xfc, 0x8a, 0x1d, 0x53, 0xde,</div><div class='add'>+	0x93, 0x3a, 0xde, 0x8b, 0x79, 0x6b, 0x3f, 0xdc, 0x69, 0x7c, 0x2b, 0x5b,</div><div class='add'>+	0xf5, 0x4d, 0x58, 0xc7, 0xd1, 0xae, 0x70, 0x7e, 0xf2, 0x06, 0x79, 0x84,</div><div class='add'>+	0x3a, 0xcf, 0x1f, 0xe7, 0xd3, 0xc3, 0x6f, 0x73, 0x3c, 0xf9, 0xbf, 0x16,</div><div class='add'>+	0x8b, 0xe0, 0xcb, 0xaa, 0xdf, 0xe7, 0xcb, 0x1d, 0xef, 0xd5, 0xda, 0x04,</div><div class='add'>+	0xca, 0x5d, 0x6d, 0x7d, 0xd2, 0x96, 0xc8, 0xf4, 0x12, 0x5d, 0xd2, 0xfd,</div><div class='add'>+	0xdc, 0xff, 0x4b, 0xcc, 0xed, 0x42, 0xde, 0x96, 0xa3, 0xcd, 0x51, 0xa5,</div><div class='add'>+	0x4d, 0x06, 0xb4, 0x89, 0x28, 0x6d, 0x18, 0xef, 0x3d, 0xe3, 0xf1, 0x5b,</div><div class='add'>+	0x2b, 0xce, 0x8b, 0xb9, 0x5a, 0xe8, 0xba, 0xbd, 0xd4, 0xf9, 0xcf, 0x77,</div><div class='add'>+	0x6a, 0x7d, 0xd0, 0xa1, 0xee, 0x5b, 0x05, 0x7d, 0xc6, 0xf6, 0x66, 0xf5,</div><div class='add'>+	0x47, 0x4c, 0xbc, 0x15, 0xd7, 0x3c, 0x68, 0x10, 0xfa, 0xb9, 0x34, 0x05,</div><div class='add'>+	0x5f, 0x8d, 0x78, 0xb7, 0x3a, 0x5a, 0x7d, 0xc7, 0x3b, 0xaf, 0x92, 0xd2,</div><div class='add'>+	0x86, 0x32, 0x40, 0xbd, 0xb9, 0x1a, 0xf3, 0xed, 0x8e, 0xf6, 0x81, 0xbf,</div><div class='add'>+	0x7e, 0x81, 0xfe, 0x8d, 0x1a, 0x4f, 0x04, 0x21, 0xf3, 0x37, 0xa7, 0x3a,</div><div class='add'>+	0xbc, 0x18, 0xce, 0x41, 0x1b, 0x71, 0xeb, 0x54, 0x84, 0x31, 0x05, 0xda,</div><div class='add'>+	0x5b, 0xa4, 0x69, 0x1a, 0xf1, 0x2b, 0xf4, 0xf8, 0x82, 0xda, 0xa3, 0x3e,</div><div class='add'>+	0xdc, 0xbf, 0x8b, 0x18, 0x3f, 0x5c, 0x1f, 0xc6, 0x73, 0xbd, 0x06, 0x8b,</div><div class='add'>+	0x10, 0xdd, 0xa4, 0x67, 0x5a, 0x9a, 0x4a, 0xc4, 0x0e, 0x8a, 0xd7, 0x37,</div><div class='add'>+	0xee, 0xaa, 0x3e, 0x58, 0xda, 0xd7, 0x43, 0xb2, 0xbb, 0x6a, 0x2f, 0x18,</div><div class='add'>+	0x47, 0xc3, 0x87, 0x9f, 0x31, 0xf6, 0x20, 0x5f, 0xec, 0x53, 0x5c, 0x54,</div><div class='add'>+	0x70, 0x68, 0x1e, 0x67, 0x49, 0x9f, 0x74, 0x11, 0x7e, 0xb8, 0x8b, 0x33,</div><div class='add'>+	0xa4, 0xdf, 0x5d, 0x39, 0x76, 0xc2, 0x4d, 0xb1, 0x3e, 0x06, 0x7d, 0x70,</div><div class='add'>+	0x4c, 0x46, 0x10, 0x17, 0x8c, 0x04, 0xdb, 0x98, 0x57, 0x86, 0x6f, 0x98,</div><div class='add'>+	0xf3, 0x72, 0x8f, 0x7d, 0xcc, 0x99, 0xca, 0xd9, 0x39, 0xee, 0x9d, 0xb2,</div><div class='add'>+	0x6d, 0x62, 0xef, 0xd2, 0x14, 0xf7, 0x6b, 0xf2, 0x10, 0x6c, 0x5b, 0xd3,</div><div class='add'>+	0x2e, 0x7e, 0x79, 0x16, 0x03, 0xf8, 0x1d, 0x84, 0x3c, 0x70, 0x2c, 0x7e,</div><div class='add'>+	0xe7, 0x16, 0xe5, 0xdd, 0xf3, 0xbe, 0x6d, 0x0f, 0xc8, 0x3b, 0x4e, 0xe5,</div><div class='add'>+	0xd8, 0x71, 0x77, 0x0d, 0xcf, 0xc0, 0xcd, 0xb1, 0x66, 0xed, 0x38, 0x6e,</div><div class='add'>+	0x5e, 0x2a, 0x95, 0x05, 0x77, 0x61, 0x8d, 0xa5, 0xb4, 0xa4, 0xfc, 0xff,</div><div class='add'>+	0x03, 0x67, 0x78, 0xfd, 0x3e, 0x4b, 0x0c, 0xfd, 0x48, 0x9b, 0xcf, 0xd7,</div><div class='add'>+	0xfe, 0x6a, 0x6d, 0x81, 0xaf, 0xff, 0xc8, 0x8f, 0xe4, 0xcb, 0x45, 0xd9,</div><div class='add'>+	0xa9, 0xfa, 0x7f, 0xb9, 0xe7, 0x6a, 0x75, 0xbf, 0xef, 0xdf, 0x52, 0xbf,</div><div class='add'>+	0x93, 0x17, 0x63, 0x1a, 0x1f, 0x6c, 0x9a, 0x6e, 0xd4, 0x09, 0x4f, 0x78,</div><div class='add'>+	0x75, 0x85, 0xe5, 0x78, 0x6f, 0xbf, 0xa7, 0x17, 0x52, 0xea, 0x3b, 0xa7,</div><div class='add'>+	0x6c, 0xea, 0x07, 0xee, 0xa7, 0x45, 0x26, 0x2e, 0xdc, 0x01, 0x4d, 0x7c,</div><div class='add'>+	0x1d, 0xcc, 0xb8, 0xcf, 0xd7, 0x1d, 0x6d, 0x9e, 0x2f, 0x6c, 0x49, 0xcf,</div><div class='add'>+	0x59, 0xfa, 0x4e, 0x0e, 0xf4, 0x68, 0xbb, 0x64, 0xc6, 0x83, 0x92, 0x3c,</div><div class='add'>+	0x1b, 0x8b, 0x19, 0x5f, 0x97, 0xfc, 0x07, 0x79, 0xd3, 0x3e, 0xad, 0x45,</div><div class='add'>+	0xa1, 0xff, 0x6e, 0xe1, 0xda, 0x86, 0x9f, 0x21, 0xcf, 0x7b, 0xfd, 0x7b,</div><div class='add'>+	0x76, 0x03, 0x8f, 0xee, 0xf0, 0x78, 0x94, 0xf7, 0x2d, 0x53, 0xff, 0xc0,</div><div class='add'>+	0xd8, 0x9e, 0xb3, 0xdc, 0xa3, 0x79, 0xae, 0xe7, 0xac, 0x89, 0xd7, 0xeb,</div><div class='add'>+	0x9f, 0xeb, 0xab, 0x3e, 0x87, 0xfb, 0xf0, 0x7d, 0xcd, 0xdc, 0x3b, 0x07,</div><div class='add'>+	0xe1, 0xd3, 0xf5, 0xd1, 0xe6, 0xd0, 0x7e, 0x6f, 0x74, 0x77, 0x0a, 0xf9,</div><div class='add'>+	0x3d, 0xe1, 0xf1, 0x1c, 0xf5, 0x4d, 0xc4, 0xd3, 0x37, 0x4b, 0xf6, 0x65,</div><div class='add'>+	0xc4, 0xe0, 0x4f, 0x98, 0x13, 0xa9, 0xb1, 0x2f, 0x4f, 0x98, 0x77, 0xab,</div><div class='add'>+	0xb3, 0x2f, 0x77, 0x7b, 0xf3, 0xf8, 0xf7, 0x7c, 0xbd, 0xe2, 0xb7, 0x7d,</div><div class='add'>+	0xbd, 0xd2, 0xe8, 0xd3, 0xfa, 0xb4, 0xaf, 0xed, 0xaf, 0x8f, 0xf9, 0xf2,</div><div class='add'>+	0xcb, 0xe6, 0x5d, 0xb2, 0x88, 0xd9, 0xe8, 0x53, 0x26, 0x72, 0x06, 0x2f,</div><div class='add'>+	0x6d, 0x9d, 0xb1, 0x88, 0xfb, 0x70, 0x7e, 0x22, 0xe9, 0xc8, 0x1d, 0x8d,</div><div class='add'>+	0xad, 0x4f, 0x5e, 0x18, 0xd3, 0x3c, 0x4f, 0xc9, 0xf5, 0xf4, 0x4e, 0x74,</div><div class='add'>+	0x17, 0xe4, 0xea, 0x4a, 0x64, 0x09, 0x53, 0x34, 0x73, 0x34, 0x0d, 0x3b,</div><div class='add'>+	0x94, 0xd2, 0x7a, 0xd9, 0xf7, 0xb0, 0xdf, 0x41, 0xc5, 0x73, 0xad, 0x74,</div><div class='add'>+	0x5e, 0x94, 0x47, 0xec, 0x8a, 0xd6, 0x6e, 0x9a, 0x87, 0x8a, 0x47, 0x9b,</div><div class='add'>+	0x4f, 0xfb, 0x7c, 0x4f, 0x7e, 0x9a, 0x39, 0x3a, 0x31, 0x53, 0x19, 0x0e,</div><div class='add'>+	0x6d, 0xeb, 0xb5, 0xf3, 0x42, 0xbc, 0xfe, 0xb0, 0x1c, 0x52, 0xdc, 0xf0,</div><div class='add'>+	0xab, 0xb8, 0xbf, 0x97, 0xf1, 0x65, 0x22, 0xa4, 0x78, 0xe0, 0x44, 0x6c,</div><div class='add'>+	0x12, 0xb2, 0x98, 0x75, 0x89, 0xef, 0x5f, 0xa5, 0x38, 0xff, 0x92, 0xd0,</div><div class='add'>+	0xcf, 0x22, 0xa6, 0xe0, 0x05, 0x39, 0xe8, 0x6e, 0x74, 0x17, 0xc4, 0xf8,</div><div class='add'>+	0xbf, 0x59, 0xad, 0x09, 0xad, 0x90, 0x49, 0x37, 0xd4, 0x9c, 0x2e, 0x1b,</div><div class='add'>+	0x19, 0x18, 0x0d, 0xa6, 0x56, 0x9e, 0x70, 0xa2, 0xcd, 0x3b, 0xcb, 0x90,</div><div class='add'>+	0xf1, 0x32, 0xf4, 0x7f, 0x39, 0x16, 0x18, 0x51, 0x6c, 0xda, 0x57, 0x24,</div><div class='add'>+	0xdd, 0x41, 0x3f, 0x9f, 0xfa, 0xe4, 0x01, 0xb9, 0x69, 0x6f, 0x96, 0x9b,</div><div class='add'>+	0x5b, 0x88, 0xc3, 0xec, 0x47, 0x9b, 0xba, 0x64, 0x10, 0x7d, 0x49, 0xf4,</div><div class='add'>+	0x35, 0x2b, 0x3f, 0x6a, 0x7c, 0x06, 0x9d, 0x75, 0xd3, 0xa6, 0xae, 0x5a,</div><div class='add'>+	0xcf, 0x5f, 0xbc, 0xeb, 0x22, 0x68, 0x42, 0x6c, 0xc7, 0x56, 0xb4, 0xa9,</div><div class='add'>+	0xe3, 0xec, 0x86, 0xfe, 0x2e, 0xb4, 0xef, 0xc3, 0x1c, 0x4d, 0xfa, 0x7e,</div><div class='add'>+	0x96, 0xb3, 0xcd, 0xd4, 0x39, 0xeb, 0xc6, 0xac, 0x6e, 0x68, 0xff, 0xb1,</div><div class='add'>+	0xdd, 0xe0, 0x13, 0x3e, 0x25, 0xbd, 0x73, 0x29, 0xd9, 0xd5, 0x59, 0xdf,</div><div class='add'>+	0xfe, 0x77, 0x43, 0xbb, 0x4d, 0x56, 0xb6, 0x93, 0x0c, 0x4f, 0x75, 0xd4,</div><div class='add'>+	0xf7, 0xfb, 0xfc, 0xe4, 0xb7, 0x3b, 0xf1, 0xbe, 0x09, 0x18, 0xbc, 0xa4,</div><div class='add'>+	0xc6, 0x52, 0x37, 0xa3, 0x5c, 0xeb, 0x83, 0x86, 0x67, 0x78, 0xcd, 0x67,</div><div class='add'>+	0xf8, 0x2c, 0xf3, 0x7a, 0x9f, 0xb1, 0x1f, 0xcf, 0x30, 0x27, 0xc0, 0xbc,</div><div class='add'>+	0x06, 0x79, 0x76, 0xb9, 0x38, 0x8b, 0x63, 0x3e, 0x9f, 0x6f, 0xc8, 0x54,</div><div class='add'>+	0x79, 0xcf, 0xd7, 0x2b, 0xb1, 0x2a, 0x56, 0x6d, 0x67, 0xc1, 0xcf, 0x09,</div><div class='add'>+	0x93, 0x76, 0x5a, 0x93, 0x8a, 0xdd, 0x00, 0x9d, 0x0f, 0x80, 0xce, 0x0f,</div><div class='add'>+	0x05, 0x19, 0x17, 0xb6, 0x78, 0xb4, 0x76, 0x64, 0xa4, 0xfc, 0x5b, 0xc8,</div><div class='add'>+	0x38, 0x79, 0x14, 0x3e, 0x45, 0xd9, 0xf2, 0xf0, 0x19, 0x03, 0xb0, 0x69,</div><div class='add'>+	0xae, 0x04, 0x35, 0xef, 0x80, 0xf8, 0x7e, 0xf6, 0xba, 0x8c, 0x4c, 0x31,</div><div class='add'>+	0x27, 0x40, 0x7e, 0x66, 0x5c, 0x9f, 0xc2, 0xbd, 0x5b, 0x18, 0xeb, 0x42,</div><div class='add'>+	0x86, 0xc7, 0xc0, 0xaf, 0x21, 0x71, 0xa6, 0xb7, 0x4a, 0x6e, 0x7c, 0x4c,</div><div class='add'>+	0x7d, 0x80, 0x1e, 0xd8, 0xa8, 0xe3, 0xee, 0xa8, 0x9c, 0xb8, 0xb2, 0x01,</div><div class='add'>+	0xb2, 0xca, 0xb8, 0x5f, 0x73, 0x1a, 0x95, 0xb0, 0xfa, 0xe6, 0xf4, 0x39,</div><div class='add'>+	0x98, 0x87, 0x33, 0x35, 0x66, 0x23, 0xb7, 0x93, 0x31, 0x69, 0x1b, 0x95,</div><div class='add'>+	0x99, 0x0b, 0xb6, 0xe2, 0x5d, 0x52, 0x72, 0xa7, 0x42, 0xda, 0x65, 0xf7,</div><div class='add'>+	0xc6, 0xa1, 0xab, 0xe8, 0xcb, 0x9f, 0x8c, 0x98, 0xb3, 0x7c, 0x74, 0x2d,</div><div class='add'>+	0x63, 0xe2, 0xe4, 0x74, 0xed, 0x1c, 0x8a, 0x91, 0xc1, 0xbd, 0xd7, 0xda,</div><div class='add'>+	0x8d, 0xcc, 0x30, 0x3e, 0xfe, 0xa0, 0x92, 0x8a, 0x72, 0x4d, 0x8e, 0x65,</div><div class='add'>+	0xed, 0x96, 0x3c, 0xc2, 0xbd, 0x7d, 0xea, 0xf1, 0xf2, 0xcf, 0x30, 0x5f,</div><div class='add'>+	0x5c, 0x7a, 0x5e, 0x1f, 0xd3, 0xb8, 0xfe, 0x78, 0x5d, 0x0c, 0x6b, 0xf2,</div><div class='add'>+	0x05, 0x26, 0x8e, 0xbd, 0x2e, 0x93, 0xf3, 0xa4, 0x0f, 0x6d, 0x7c, 0x40,</div><div class='add'>+	0x5e, 0x73, 0x7a, 0xed, 0x27, 0xb5, 0xd6, 0x98, 0x48, 0xb1, 0x3e, 0xd3,</div><div class='add'>+	0xe2, 0x24, 0xed, 0x59, 0x09, 0x0d, 0x7e, 0x15, 0xd7, 0x8c, 0x6b, 0xf3,</div><div class='add'>+	0x6e, 0xaf, 0xfb, 0xa4, 0xf8, 0x38, 0x90, 0x8d, 0xa9, 0x15, 0x81, 0xdb,</div><div class='add'>+	0x95, 0xeb, 0x7b, 0x39, 0xc6, 0xe0, 0x40, 0x24, 0x40, 0x5a, 0xbd, 0xb7,</div><div class='add'>+	0x9e, 0xf8, 0x99, 0xfa, 0xfc, 0xdf, 0x83, 0x4f, 0xef, 0x19, 0x48, 0x9c,</div><div class='add'>+	0x62, 0x0c, 0x1b, 0x76, 0xbe, 0xb5, 0xd6, 0xbc, 0x6b, 0x2e, 0xb7, 0x5a,</div><div class='add'>+	0xb4, 0x7e, 0x76, 0xe4, 0x23, 0x87, 0x78, 0x88, 0x44, 0x6c, 0x85, 0xc5,</div><div class='add'>+	0x3c, 0x38, 0x75, 0x1c, 0x6b, 0x2a, 0xcc, 0xb9, 0x11, 0xc7, 0xdf, 0x2c,</div><div class='add'>+	0x97, 0xfb, 0x2c, 0x79, 0x30, 0x94, 0x8a, 0x5b, 0xb2, 0x29, 0x7e, 0x56,</div><div class='add'>+	0xb0, 0x26, 0xeb, 0x2b, 0xf3, 0x89, 0x1c, 0xc7, 0x87, 0xa6, 0x39, 0x5f,</div><div class='add'>+	0x5c, 0xe3, 0x95, 0xe4, 0xa6, 0x4a, 0xe5, 0x19, 0x57, 0x02, 0xc9, 0x7b,</div><div class='add'>+	0x3f, 0xac, 0xb0, 0x16, 0x6e, 0xbd, 0xfe, 0x45, 0x38, 0x05, 0xea, 0x8a,</div><div class='add'>+	0x55, 0x93, 0x06, 0x73, 0x78, 0xe2, 0x48, 0xcf, 0x3c, 0xdb, 0xdf, 0x7d,</div><div class='add'>+	0xc4, 0xb4, 0x4f, 0xa1, 0xdd, 0xe4, 0x61, 0x9d, 0xa6, 0x8e, 0xf4, 0x14,</div><div class='add'>+	0x9f, 0x5a, 0x6b, 0xe2, 0xef, 0x45, 0xc5, 0x7f, 0xbd, 0x5d, 0x17, 0xd3,</div><div class='add'>+	0xa4, 0x02, 0xe3, 0x85, 0xb1, 0xc0, 0x58, 0xc1, 0xea, 0x6b, 0x06, 0xad,</div><div class='add'>+	0xe6, 0x5c, 0xe6, 0x6a, 0xfc, 0x9c, 0x15, 0xf3, 0xfd, 0x22, 0xdf, 0x57,</div><div class='add'>+	0x8c, 0x14, 0x6b, 0x8a, 0x96, 0xfa, 0x42, 0x07, 0xe6, 0x98, 0xe3, 0x8f,</div><div class='add'>+	0xa8, 0x3e, 0x38, 0x38, 0xdf, 0x26, 0x79, 0x7b, 0x8d, 0xe4, 0x55, 0xc6,</div><div class='add'>+	0xa3, 0xaa, 0x03, 0x2c, 0xe7, 0x5e, 0xf4, 0x71, 0xdf, 0x4f, 0x28, 0x2e,</div><div class='add'>+	0xe2, 0xcd, 0x42, 0x17, 0xda, 0xcc, 0x35, 0x6f, 0x6f, 0xe8, 0xaf, 0xad,</div><div class='add'>+	0xcb, 0x26, 0x6c, 0xcb, 0x6a, 0xac, 0xc9, 0xb2, 0xaf, 0xb1, 0x16, 0x7b,</div><div class='add'>+	0x52, 0xae, 0x93, 0x6f, 0xca, 0x7e, 0xce, 0xdd, 0xf5, 0x72, 0xee, 0xdf,</div><div class='add'>+	0xee, 0x32, 0x18, 0x61, 0xc9, 0x84, 0x86, 0x9a, 0xfb, 0x8e, 0x4f, 0x05,</div><div class='add'>+	0x6f, 0x2d, 0xe5, 0x4f, 0xd1, 0x9e, 0xaf, 0xd6, 0xca, 0x71, 0xef, 0x39,</div><div class='add'>+	0x62, 0xc5, 0xe1, 0x57, 0xe4, 0xbc, 0xef, 0x0e, 0x78, 0xbf, 0xfa, 0xfc,</div><div class='add'>+	0xff, 0xd8, 0x53, 0x8b, 0xd6, 0xd9, 0xad, 0xba, 0x3a, 0xfb, 0xe3, 0x78,</div><div class='add'>+	0x96, 0x35, 0xf6, 0x5c, 0xa5, 0x09, 0xbc, 0xdb, 0x44, 0x9c, 0x48, 0x75,</div><div class='add'>+	0x3c, 0x75, 0xbc, 0xea, 0x72, 0x9d, 0x6b, 0xa7, 0x37, 0x57, 0x10, 0x7a,</div><div class='add'>+	0x7e, 0x62, 0xca, 0x1f, 0x73, 0x4c, 0x56, 0xf4, 0x27, 0x62, 0x41, 0x8b,</div><div class='add'>+	0x63, 0x8c, 0xbe, 0x4f, 0xbb, 0xc7, 0xa0, 0xc7, 0xa9, 0xf3, 0xf9, 0xde,</div><div class='add'>+	0x0e, 0x7c, 0x3d, 0xea, 0x02, 0xea, 0x73, 0xb5, 0x01, 0xf1, 0x3c, 0x74,</div><div class='add'>+	0xfd, 0x48, 0x59, 0x73, 0xf9, 0xb1, 0x87, 0x83, 0x89, 0x99, 0xac, 0xea,</div><div class='add'>+	0x06, 0xf8, 0x7b, 0xe5, 0x6b, 0xcc, 0x07, 0x9d, 0x92, 0x40, 0x6d, 0x9d,</div><div class='add'>+	0x86, 0xb1, 0x19, 0x6b, 0x1a, 0xad, 0xd0, 0x0d, 0x22, 0x57, 0xc1, 0x1b,</div><div class='add'>+	0x6f, 0xcc, 0x91, 0x5f, 0x83, 0x1d, 0x26, 0xbe, 0x5a, 0xd8, 0x6e, 0x49,</div><div class='add'>+	0x87, 0xd6, 0x3e, 0xf3, 0x4e, 0x84, 0xfe, 0xc9, 0x70, 0xb2, 0x1f, 0x7e,</div><div class='add'>+	0xb6, 0x62, 0x0f, 0x98, 0xaf, 0x9c, 0x40, 0x3c, 0x56, 0x9b, 0x63, 0x81,</div><div class='add'>+	0x7c, 0x8d, 0xb3, 0x3f, 0x0b, 0xbf, 0x72, 0xa9, 0xee, 0x91, 0x2f, 0x9e,</div><div class='add'>+	0xd0, 0xdc, 0x66, 0x69, 0xae, 0x55, 0x75, 0x6c, 0xa9, 0xf8, 0x30, 0xce,</div><div class='add'>+	0x45, 0x36, 0x5b, 0x43, 0x79, 0xaf, 0x3f, 0x2c, 0xc5, 0x22, 0xdb, 0xd2,</div><div class='add'>+	0xdd, 0xa4, 0xe7, 0xee, 0xd7, 0x76, 0x6c, 0x99, 0x85, 0xaf, 0x58, 0x9c,</div><div class='add'>+	0x77, 0xf0, 0xbf, 0x05, 0xff, 0x7d, 0xf8, 0xdf, 0x25, 0xe9, 0x69, 0xfa,</div><div class='add'>+	0xaf, 0xac, 0xe5, 0xb4, 0x36, 0xac, 0x1f, 0xf6, 0x70, 0xe0, 0xf4, 0x6b,</div><div class='add'>+	0x4d, 0x9c, 0x93, 0x2f, 0x36, 0xca, 0x09, 0xf3, 0xa4, 0xbe, 0x8e, 0x60,</div><div class='add'>+	0xbe, 0xd4, 0xaf, 0xf5, 0xd5, 0xd6, 0xb0, 0x2c, 0xaf, 0xee, 0x45, 0x9e,</div><div class='add'>+	0x6e, 0x91, 0x83, 0x45, 0xbf, 0x76, 0x15, 0x93, 0x43, 0xd5, 0xda, 0x95,</div><div class='add'>+	0x64, 0x82, 0x43, 0xb7, 0x1f, 0xcb, 0x4e, 0x29, 0x9e, 0xc0, 0xb2, 0x86,</div><div class='add'>+	0xae, 0x3f, 0x36, 0x39, 0xff, 0xce, 0x63, 0x4b, 0x98, 0x70, 0xdc, 0x9b,</div><div class='add'>+	0x5f, 0x0e, 0x33, 0x44, 0x2c, 0x1d, 0xbf, 0x93, 0x53, 0xdf, 0x0d, 0xfb,</div><div class='add'>+	0xf6, 0x63, 0x1e, 0xe2, 0xec, 0xe2, 0xf6, 0x12, 0x7e, 0xd9, 0x8f, 0x47,</div><div class='add'>+	0x89, 0x23, 0xe5, 0x73, 0xb5, 0xd8, 0x8f, 0x10, 0xce, 0x5f, 0x02, 0x96,</div><div class='add'>+	0x93, 0xc3, 0x3e, 0x2e, 0x76, 0x19, 0x3f, 0x90, 0x38, 0xd3, 0x44, 0x0d,</div><div class='add'>+	0xf6, 0xc8, 0xc7, 0x9a, 0x5e, 0xc4, 0x5c, 0x19, 0xf9, 0x7d, 0xf9, 0x71,</div><div class='add'>+	0xf9, 0x75, 0x79, 0x0c, 0xf2, 0x3d, 0x89, 0x39, 0xf7, 0xcb, 0xaf, 0xca,</div><div class='add'>+	0x7b, 0xe5, 0x5a, 0x79, 0x5c, 0xde, 0x2a, 0xef, 0x42, 0x4c, 0x35, 0x4a,</div><div class='add'>+	0xac, 0xa7, 0x87, 0x95, 0x1e, 0x96, 0x89, 0x73, 0x8a, 0x01, 0xbc, 0x45,</div><div class='add'>+	0xbf, 0xe7, 0x88, 0xfa, 0xd9, 0x01, 0xf2, 0xf4, 0x6f, 0x18, 0xcf, 0x13,</div><div class='add'>+	0x9b, 0x59, 0x2c, 0xfb, 0x18, 0x8e, 0x43, 0xdd, 0x58, 0xdb, 0xe6, 0x37,</div><div class='add'>+	0x29, 0x23, 0xe7, 0x22, 0x81, 0xd1, 0x73, 0xa1, 0xc0, 0x43, 0xfa, 0x7d,</div><div class='add'>+	0x0b, 0xeb, 0x9d, 0x15, 0x39, 0xe1, 0x3a, 0xe4, 0xcd, 0xc1, 0x11, 0xc8,</div><div class='add'>+	0xc2, 0x28, 0x54, 0xfd, 0x23, 0xce, 0x1a, 0x01, 0x49, 0x53, 0x1f, 0xc3,</div><div class='add'>+	0xcf, 0x4c, 0x9e, 0x76, 0x25, 0x5b, 0x98, 0x0d, 0x18, 0x3c, 0x9a, 0x8d,</div><div class='add'>+	0x76, 0x1f, 0xda, 0xbf, 0xf4, 0xda, 0x3b, 0x24, 0x7b, 0x41, 0x52, 0xef,</div><div class='add'>+	0xab, 0x3f, 0xfc, 0x73, 0xaf, 0x6f, 0x10, 0x7d, 0xe0, 0xcc, 0x57, 0xd8,</div><div class='add'>+	0xf7, 0x8a, 0xd7, 0xc7, 0x33, 0x61, 0xad, 0x3e, 0xae, 0x7c, 0x95, 0xb5,</div><div class='add'>+	0xc7, 0x85, 0xdf, 0x2f, 0x18, 0x4c, 0xe8, 0xfb, 0x5d, 0x46, 0xb7, 0x11,</div><div class='add'>+	0x13, 0xf8, 0xaf, 0x2e, 0xc6, 0x60, 0x45, 0xc8, 0xd7, 0x7a, 0xe8, 0xc4,</div><div class='add'>+	0xbf, 0x6f, 0x5e, 0x6a, 0x5b, 0x43, 0x9f, 0xd4, 0x60, 0xb4, 0x3f, 0x91,</div><div class='add'>+	0x9e, 0xf9, 0xdb, 0x1e, 0x9e, 0xf7, 0x30, 0xde, 0x0d, 0x67, 0x55, 0x20,</div><div class='add'>+	0x6e, 0x3c, 0x0e, 0xd9, 0x6e, 0x95, 0x35, 0x67, 0x48, 0xaf, 0x5e, 0xe8,</div><div class='add'>+	0xea, 0x14, 0xe4, 0xd6, 0x95, 0xb9, 0x72, 0x28, 0x30, 0x52, 0x48, 0x89,</div><div class='add'>+	0xc1, 0x53, 0x5b, 0x92, 0x89, 0xa6, 0xe4, 0xe4, 0x40, 0x62, 0x0b, 0xf3,</div><div class='add'>+	0x90, 0xd9, 0x7e, 0x57, 0x2e, 0x95, 0x69, 0x8f, 0x73, 0x72, 0x79, 0x20,</div><div class='add'>+	0xe1, 0x16, 0x85, 0xb8, 0x18, 0x57, 0x2e, 0x43, 0x36, 0xff, 0x70, 0x6e,</div><div class='add'>+	0x97, 0x1c, 0x2a, 0xa8, 0x1f, 0xdc, 0x1b, 0x96, 0x97, 0xe5, 0xd2, 0xc0,</div><div class='add'>+	0xcb, 0xb7, 0x2e, 0xb9, 0x93, 0x38, 0x53, 0xf2, 0xe1, 0x81, 0x6e, 0xb3,</div><div class='add'>+	0x6f, 0xc5, 0x21, 0x09, 0xf3, 0x21, 0x5a, 0x53, 0x73, 0x56, 0x48, 0x7a,</div><div class='add'>+	0x5f, 0xc4, 0x8b, 0xcb, 0xe1, 0x73, 0x07, 0xee, 0x33, 0xf5, 0x94, 0x80,</div><div class='add'>+	0xbf, 0xcf, 0x30, 0xfc, 0x18, 0x3e, 0xe7, 0xd3, 0xc6, 0x9f, 0xa7, 0x2b,</div><div class='add'>+	0x90, 0xbe, 0xd0, 0x26, 0xa1, 0x57, 0xbe, 0x0c, 0xba, 0x86, 0xe4, 0x40,</div><div class='add'>+	0x7f, 0xa5, 0xf2, 0x0d, 0x37, 0x14, 0x9f, 0x44, 0x8c, 0x82, 0xfd, 0xcb,</div><div class='add'>+	0xea, 0xd3, 0xed, 0xa0, 0x49, 0xb3, 0x44, 0x4f, 0xfb, 0xeb, 0xad, 0xf0,</div><div class='add'>+	0xb0, 0x0c, 0xe7, 0x57, 0x1b, 0x5b, 0xe6, 0x63, 0x1b, 0xfc, 0xf9, 0x0c,</div><div class='add'>+	0xa6, 0xac, 0xc7, 0xea, 0x0f, 0x78, 0xdf, 0x49, 0x78, 0xed, 0x7b, 0x03,</div><div class='add'>+	0x0f, 0x86, 0x3a, 0x24, 0xe4, 0xfc, 0x70, 0x1d, 0xb1, 0x91, 0x0b, 0x05,</div><div class='add'>+	0xbf, 0x1f, 0x7e, 0x62, 0xc8, 0xf7, 0x87, 0x65, 0xdb, 0xd2, 0x59, 0xcb,</div><div class='add'>+	0xb6, 0x9e, 0xf9, 0x6f, 0x7a, 0x73, 0xa6, 0xbc, 0xb1, 0x88, 0x39, 0x62,</div><div class='add'>+	0xab, 0xd4, 0x3e, 0x99, 0xb1, 0x9f, 0xc9, 0xb3, 0xfd, 0x89, 0x57, 0x15,</div><div class='add'>+	0x27, 0x5b, 0x7d, 0x86, 0xf7, 0x11, 0x43, 0x96, 0xf5, 0x99, 0xd8, 0x6e,</div><div class='add'>+	0xd0, 0x37, 0x13, 0xbb, 0xc7, 0x9e, 0xb5, 0x82, 0x01, 0xe3, 0x8f, 0x34,</div><div class='add'>+	0xc9, 0x0f, 0xa2, 0xb0, 0xdb, 0x88, 0xf1, 0xb2, 0xcc, 0x7f, 0xb9, 0x77,</div><div class='add'>+	0x3c, 0x3f, 0x85, 0x7d, 0x89, 0x53, 0x49, 0x6b, 0x02, 0xfb, 0xe3, 0x19,</div><div class='add'>+	0x10, 0x03, 0x6a, 0x81, 0x4e, 0x5d, 0x78, 0x3f, 0xc4, 0x4f, 0xfd, 0xfe,</div><div class='add'>+	0xfb, 0xaf, 0x86, 0x0e, 0xe3, 0xfe, 0x0d, 0x2e, 0x4c, 0x2c, 0xe6, 0x42,</div><div class='add'>+	0x86, 0x3d, 0x0c, 0x6c, 0xad, 0xdc, 0xfa, 0xd8, 0x58, 0x1f, 0x4f, 0x47,</div><div class='add'>+	0x8c, 0x52, 0x0c, 0x7e, 0x20, 0x65, 0x82, 0xbc, 0xd9, 0x89, 0xfe, 0x95,</div><div class='add'>+	0xb7, 0x53, 0xfa, 0xea, 0x7e, 0xdf, 0x87, 0x55, 0x6c, 0xf7, 0x64, 0x61,</div><div class='add'>+	0xaf, 0xc1, 0xe6, 0x59, 0x8b, 0x92, 0xea, 0x4e, 0xda, 0x27, 0xb0, 0xdf,</div><div class='add'>+	0x74, 0x28, 0x51, 0xcc, 0x49, 0x4c, 0x66, 0xa1, 0x2f, 0xde, 0x80, 0xec,</div><div class='add'>+	0x5f, 0x2b, 0xc7, 0x03, 0x69, 0xec, 0xe9, 0x60, 0x61, 0x48, 0x26, 0x2f,</div><div class='add'>+	0xe8, 0x37, 0x5f, 0xd0, 0xfb, 0x43, 0x52, 0x2a, 0x24, 0xb6, 0xcc, 0x82,</div><div class='add'>+	0xff, 0x66, 0x0b, 0xc4, 0x17, 0xf5, 0xc6, 0x47, 0x31, 0xe3, 0x42, 0x61,</div><div class='add'>+	0x23, 0xec, 0x83, 0xa4, 0x2e, 0xc1, 0xff, 0xb9, 0x54, 0xde, 0x02, 0x3e,</div><div class='add'>+	0xc3, 0xfd, 0xb2, 0x83, 0x5f, 0xe8, 0xcc, 0xf2, 0x00, 0xe4, 0x9c, 0x7b,</div><div class='add'>+	0xb1, 0x65, 0x6e, 0x33, 0xce, 0x8e, 0x38, 0x22, 0xc5, 0x8f, 0xff, 0x07,</div><div class='add'>+	0xe7, 0xeb, 0xbf, 0xf7, 0x76, 0xb5, 0xd3, 0xb3, 0xba, 0x2f, 0xd8, 0x65,</div><div class='add'>+	0xc4, 0x00, 0xd9, 0x7e, 0x63, 0xb7, 0xd3, 0x91, 0x76, 0x49, 0xdf, 0x43,</div><div class='add'>+	0x3b, 0xde, 0xa1, 0x31, 0xa2, 0xf2, 0x62, 0x84, 0xf7, 0xdf, 0x59, 0x67,</div><div class='add'>+	0xe8, 0x17, 0x6e, 0x68, 0xbf, 0x8d, 0xdf, 0x36, 0xe9, 0x74, 0xf8, 0x6b,</div><div class='add'>+	0xe3, 0xf7, 0xc6, 0x3a, 0xd6, 0x77, 0x3b, 0x9d, 0x24, 0xd6, 0xfa, 0x9d,</div><div class='add'>+	0x97, 0x2f, 0xc0, 0xf5, 0x2c, 0x9f, 0x59, 0xeb, 0xad, 0xcb, 0x79, 0xdb,</div><div class='add'>+	0x30, 0x4f, 0xab, 0xb7, 0x56, 0x9b, 0xe6, 0x27, 0xcd, 0x5a, 0x88, 0x71,</div><div class='add'>+	0x0b, 0xef, 0xad, 0xd3, 0xef, 0x8c, 0x61, 0x2f, 0xea, 0xdb, 0x7f, 0x5d,</div><div class='add'>+	0x47, 0xdc, 0x5c, 0xa7, 0xd3, 0xa6, 0x18, 0xcf, 0x9b, 0x1d, 0x1d, 0xb8,</div><div class='add'>+	0xe6, 0x9a, 0x1c, 0x63, 0xf2, 0xe1, 0xa5, 0x32, 0xe7, 0x67, 0x3b, 0x25,</div><div class='add'>+	0x47, 0x35, 0x9f, 0x61, 0xb0, 0x7c, 0xa5, 0xc2, 0xfd, 0x32, 0x79, 0x4e,</div><div class='add'>+	0xf1, 0x75, 0x33, 0x79, 0x8b, 0xdf, 0xbd, 0xf0, 0x3b, 0x39, 0xfa, 0x12,</div><div class='add'>+	0x63, 0x32, 0x81, 0xf3, 0xbb, 0x0c, 0x9f, 0x6a, 0xc1, 0x7c, 0x13, 0x8b,</div><div class='add'>+	0xbf, 0xfd, 0x38, 0x97, 0x10, 0x64, 0x8c, 0x32, 0x4a, 0x99, 0xc2, 0xf9,</div><div class='add'>+	0x8d, 0xdb, 0xf2, 0xee, 0x00, 0xe5, 0x79, 0x40, 0xae, 0x54, 0xe5, 0x39,</div><div class='add'>+	0x07, 0x79, 0xa6, 0x2c, 0xe7, 0x20, 0xd3, 0x86, 0xaf, 0xf7, 0xf1, 0x1b,</div><div class='add'>+	0x6b, 0x84, 0xeb, 0x25, 0xf5, 0x21, 0x2e, 0x82, 0xaf, 0x6d, 0x13, 0x97,</div><div class='add'>+	0x2b, 0x2e, 0xfe, 0x30, 0xf4, 0x5a, 0x93, 0xf7, 0x1d, 0x00, 0xae, 0xaf,</div><div class='add'>+	0xbc, 0x28, 0xe9, 0x0b, 0x2d, 0xd8, 0x77, 0xbc, 0x9b, 0x67, 0x96, 0xbd,</div><div class='add'>+	0xc2, 0x7f, 0x9f, 0x17, 0x89, 0x37, 0xa5, 0x3f, 0xcb, 0x6b, 0xc6, 0x79,</div><div class='add'>+	0xeb, 0x31, 0x66, 0x10, 0x74, 0x6e, 0xc1, 0xfc, 0xdc, 0xe3, 0x72, 0xe3,</div><div class='add'>+	0x78, 0x3f, 0x54, 0x83, 0x4f, 0xf5, 0xe9, 0xbd, 0x4a, 0xd7, 0xcc, 0xea,</div><div class='add'>+	0x37, 0x5a, 0x46, 0x06, 0x27, 0x0a, 0xe4, 0xfb, 0x18, 0xf8, 0x96, 0x3e,</div><div class='add'>+	0x31, 0xf9, 0x25, 0xa5, 0xe7, 0x50, 0x2a, 0x90, 0x7f, 0x43, 0x9a, 0xc3,</div><div class='add'>+	0xc8, 0xc2, 0xb6, 0xec, 0xd1, 0xf1, 0xb1, 0x25, 0xf9, 0xee, 0x0e, 0x68,</div><div class='add'>+	0xdc, 0x9d, 0x2d, 0xac, 0x94, 0x1e, 0xd5, 0x41, 0xdd, 0x1e, 0x6f, 0xc3,</div><div class='add'>+	0x5e, 0x28, 0x96, 0x7b, 0xbf, 0x1c, 0x29, 0x0f, 0x82, 0x0e, 0x31, 0x79,</div><div class='add'>+	0x06, 0x7e, 0xf3, 0x73, 0xe5, 0xbb, 0x64, 0x31, 0x82, 0x7d, 0x55, 0x65,</div><div class='add'>+	0x6c, 0x58, 0x9e, 0x9f, 0x8d, 0x7b, 0xd7, 0x09, 0x77, 0xd1, 0xda, 0x8e,</div><div class='add'>+	0x3d, 0x50, 0x9e, 0x28, 0x57, 0x1c, 0x17, 0x44, 0x2c, 0xc2, 0x79, 0x8f,</div><div class='add'>+	0x18, 0xdd, 0x86, 0x79, 0x8b, 0x11, 0xca, 0x2f, 0xf7, 0x16, 0xf2, 0x64,</div><div class='add'>+	0x96, 0x71, 0x15, 0xdf, 0xd9, 0xd8, 0xa4, 0x4c, 0xdd, 0x59, 0x24, 0x14,</div><div class='add'>+	0x07, 0xba, 0x74, 0x06, 0xfe, 0x3c, 0xbe, 0x5c, 0xfa, 0xdf, 0x51, 0x50,</div><div class='add'>+	0x8f, 0xc2, 0x56, 0x16, 0x60, 0x2b, 0x0b, 0xb0, 0x91, 0x90, 0x85, 0x6b,</div><div class='add'>+	0x05, 0xd8, 0xc8, 0x02, 0x6c, 0x24, 0xf4, 0xd9, 0x9b, 0x88, 0xed, 0xde,</div><div class='add'>+	0x00, 0x0f, 0x19, 0x5f, 0xfb, 0x30, 0x7d, 0x6d, 0xfc, 0xfd, 0x17, 0xea,</div><div class='add'>+	0x52, 0x61, 0x78, 0xd0, 0x71, 0x00, 0x00, 0x00 };</div><div class='ctx'> </div><div class='ctx'> static const u32 bnx2_RXP_b06FwData[(0x0/4) + 1] = { 0x0 };</div><div class='ctx'> static const u32 bnx2_RXP_b06FwRodata[(0x24/4) + 1] = {</div><div class='del'>-	0x08004590, 0x08004590, 0x08004508, 0x08004540, 0x08004574, 0x08004598,</div><div class='del'>-	0x08004598, 0x08004598, 0x08004478, 0x00000000 };</div><div class='add'>+	0x0800458c, 0x0800458c, 0x08004504, 0x0800453c, 0x08004570, 0x08004594,</div><div class='add'>+	0x08004594, 0x08004594, 0x08004474, 0x00000000 };</div><div class='ctx'> </div><div class='ctx'> static struct fw_info bnx2_rxp_fw_06 = {</div><div class='del'>-	/* Firmware version: 4.1.1 */</div><div class='add'>+	/* Firmware version: 4.4.2 */</div><div class='ctx'> 	.ver_major			= 0x4,</div><div class='del'>-	.ver_minor			= 0x1,</div><div class='del'>-	.ver_fix			= 0x1,</div><div class='add'>+	.ver_minor			= 0x4,</div><div class='add'>+	.ver_fix			= 0x2,</div><div class='ctx'> </div><div class='ctx'> 	.start_addr			= 0x080031d0,</div><div class='ctx'> </div><div class='ctx'> 	.text_addr			= 0x08000000,</div><div class='del'>-	.text_len			= 0x71d0,</div><div class='add'>+	.text_len			= 0x71cc,</div><div class='ctx'> 	.text_index			= 0x0,</div><div class='ctx'> 	.gz_text			= bnx2_RXP_b06FwText,</div><div class='ctx'> 	.gz_text_len			= sizeof(bnx2_RXP_b06FwText),</div><div class='hunk'>@@ -2973,7 +2974,7 @@ static struct fw_info bnx2_rxp_fw_06 = {</div><div class='ctx'> 	.bss_len			= 0x44c,</div><div class='ctx'> 	.bss_index			= 0x0,</div><div class='ctx'> </div><div class='del'>-	.rodata_addr			= 0x080071d0,</div><div class='add'>+	.rodata_addr			= 0x080071cc,</div><div class='ctx'> 	.rodata_len			= 0x24,</div><div class='ctx'> 	.rodata_index			= 0x0,</div><div class='ctx'> 	.rodata				= bnx2_RXP_b06FwRodata,</div><div class='hunk'>@@ -2996,687 +2997,639 @@ static const struct cpu_reg cpu_reg_rxp = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static u8 bnx2_rv2p_proc1[] = {</div><div class='del'>-	/* Date:        12/07/2007 15:02 */</div><div class='del'>-	0xd5, 0x56, 0x41, 0x6b, 0x13, 0x51, 0x10, 0x9e, 0xdd, 0x6c, 0xbb, 0xdb,</div><div class='del'>-	0x64, 0xb3, 0x59, 0xaa, 0xd6, 0x50, 0x53, 0x93, 0x06, 0x2f, 0xad, 0x29,</div><div class='del'>-	0x6d, 0xaa, 0x82, 0x42, 0xa1, 0x92, 0x4b, 0xc1, 0xf6, 0x20, 0xf5, 0x22,</div><div class='del'>-	0x22, 0xd8, 0x46, 0xd1, 0x5f, 0x21, 0x06, 0xdb, 0xd4, 0x73, 0x05, 0x0b,</div><div class='del'>-	0xf5, 0xa0, 0x3d, 0x59, 0x11, 0xc1, 0x04, 0x14, 0x44, 0x04, 0x41, 0x45,</div><div class='del'>-	0x04, 0x3d, 0x78, 0xa8, 0x60, 0x2f, 0xad, 0x22, 0x56, 0x3c, 0x78, 0xd4,</div><div class='del'>-	0x93, 0x26, 0xbe, 0x37, 0x33, 0xaf, 0xdd, 0xdd, 0x66, 0x9b, 0x2a, 0x82,</div><div class='del'>-	0x18, 0x68, 0x3f, 0xde, 0xec, 0xbc, 0x37, 0x33, 0xdf, 0xcc, 0x9b, 0x79,</div><div class='del'>-	0x2e, 0x00, 0xe8, 0x50, 0xaa, 0xa6, 0x05, 0x82, 0xa5, 0x69, 0x96, 0x00,</div><div class='del'>-	0x0d, 0xe0, 0xae, 0x8d, 0x58, 0xea, 0x77, 0x05, 0xda, 0xda, 0x70, 0x46,</div><div class='del'>-	0x62, 0x04, 0x86, 0xbb, 0x25, 0xee, 0x87, 0x27, 0x99, 0xa4, 0xc0, 0x9f,</div><div class='del'>-	0x75, 0x28, 0xc9, 0xf5, 0xee, 0xca, 0xc3, 0x6a, 0x0c, 0xcf, 0x59, 0xed,</div><div class='del'>-	0x07, 0xfc, 0xbd, 0x8b, 0x10, 0x1e, 0xce, 0x59, 0x88, 0x25, 0x46, 0xe8,</div><div class='del'>-	0x73, 0x11, 0x96, 0x66, 0x2d, 0x34, 0x57, 0xea, 0xb3, 0x70, 0x1f, 0xe8,</div><div class='del'>-	0x24, 0x5f, 0x99, 0x4d, 0x88, 0xff, 0x29, 0x78, 0x5f, 0x90, 0x6b, 0x2b,</div><div class='del'>-	0x3a, 0x8d, 0x7a, 0x15, 0xde, 0x2f, 0xfe, 0x50, 0xff, 0xb8, 0xd8, 0x07,</div><div class='del'>-	0xfc, 0x53, 0xfb, 0x5c, 0x3c, 0xa7, 0x98, 0x93, 0x7e, 0xb5, 0x0b, 0x83,</div><div class='del'>-	0xca, 0x1f, 0x9b, 0xe2, 0x4b, 0x93, 0xb6, 0x89, 0xdf, 0xd7, 0x84, 0xdf,</div><div class='del'>-	0xca, 0x6e, 0x33, 0x7b, 0x41, 0x7f, 0x83, 0x76, 0xe5, 0x79, 0x86, 0xb0,</div><div class='del'>-	0xe7, 0xb7, 0x03, 0x20, 0xe5, 0xcb, 0xf5, 0x75, 0x79, 0x8f, 0xff, 0xfb,</div><div class='del'>-	0x6a, 0xaf, 0x3c, 0xaf, 0x05, 0xa0, 0x57, 0xea, 0x2d, 0xb1, 0x3f, 0x83,</div><div class='del'>-	0xb0, 0x4f, 0x4f, 0xe2, 0x77, 0x03, 0xf7, 0xef, 0x11, 0xe7, 0x4a, 0xec,</div><div class='del'>-	0x62, 0xec, 0x66, 0x1c, 0x67, 0xbc, 0xca, 0xb8, 0x8b, 0x71, 0x27, 0xe3,</div><div class='del'>-	0x0e, 0xc6, 0x76, 0xc6, 0x97, 0x8c, 0x2e, 0x63, 0x82, 0xd1, 0x61, 0x7c,</div><div class='del'>-	0xce, 0x68, 0x33, 0xc6, 0x18, 0x5f, 0x30, 0xbe, 0x62, 0xb4, 0x18, 0x6f,</div><div class='del'>-	0x30, 0x7e, 0x61, 0xfc, 0xaa, 0xfc, 0xd0, 0x08, 0x1f, 0xf1, 0xfa, 0x10,</div><div class='del'>-	0xaf, 0x8f, 0x30, 0x02, 0xf3, 0xa4, 0x05, 0x78, 0xba, 0xcf, 0x75, 0x24,</div><div class='del'>-	0x79, 0xe6, 0xef, 0x3d, 0x4a, 0x8f, 0xf3, 0x84, 0x3c, 0xdd, 0x63, 0xbd,</div><div class='del'>-	0xf6, 0xca, 0x42, 0xa0, 0xde, 0x32, 0x5b, 0xd6, 0x59, 0xaa, 0x41, 0xde,</div><div class='del'>-	0x12, 0x18, 0xcf, 0xc4, 0x48, 0x02, 0xed, 0x38, 0xad, 0x24, 0x57, 0x6e,</div><div class='del'>-	0x9d, 0x4c, 0x10, 0x9e, 0x8b, 0x12, 0x7e, 0x62, 0x3c, 0x1f, 0x23, 0x9c,</div><div class='del'>-	0x8c, 0x2b, 0x9e, 0xd5, 0x39, 0xca, 0x9f, 0x66, 0x7e, 0x84, 0xd9, 0x53,</div><div class='del'>-	0x7e, 0x35, 0xb3, 0x4b, 0x58, 0xd4, 0xfd, 0xf1, 0x5f, 0x1f, 0x20, 0x34,</div><div class='del'>-	0xf2, 0x44, 0xea, 0x9c, 0xdd, 0x26, 0xa0, 0x5e, 0x9f, 0xb7, 0x0d, 0xb9,</div><div class='del'>-	0x3e, 0x38, 0xff, 0x1a, 0xef, 0xc7, 0xe0, 0x5c, 0x95, 0xfd, 0x4b, 0x28,</div><div class='del'>-	0x9e, 0xe9, 0xde, 0x64, 0x81, 0xd6, 0xe3, 0xc8, 0xbb, 0xa8, 0xb0, 0x1e,</div><div class='del'>-	0xee, 0x03, 0x59, 0x7f, 0xbe, 0xa8, 0x6e, 0x23, 0x9c, 0x8f, 0x8b, 0x9c,</div><div class='del'>-	0x8f, 0xae, 0x90, 0x7c, 0x84, 0xdd, 0xa3, 0xcd, 0xf7, 0xf7, 0x4c, 0x26,</div><div class='del'>-	0xc8, 0x5b, 0xd8, 0x7d, 0x53, 0x7c, 0x93, 0xf4, 0x77, 0x79, 0xbc, 0xc0,</div><div class='del'>-	0x3c, 0x16, 0x89, 0xc7, 0xe4, 0xe7, 0x86, 0x3c, 0x65, 0x3c, 0x3c, 0xc9,</div><div class='del'>-	0x38, 0xf7, 0x86, 0xe4, 0x39, 0x2c, 0xbe, 0xdc, 0x1f, 0xe7, 0x39, 0xe0,</div><div class='del'>-	0x1f, 0x9c, 0xc5, 0xfe, 0xe4, 0x42, 0x71, 0x44, 0xf9, 0xeb, 0xe7, 0xb9,</div><div class='del'>-	0x93, 0xf2, 0x0d, 0xd3, 0x79, 0x29, 0xaf, 0x03, 0x3c, 0xd5, 0x71, 0x6d,</div><div class='del'>-	0x14, 0x34, 0x09, 0x56, 0x31, 0x4f, 0xfb, 0x1d, 0x5d, 0xe7, 0xf5, 0x76,</div><div class='del'>-	0xeb, 0x42, 0xe5, 0x5d, 0x62, 0x2b, 0x14, 0x26, 0x39, 0xce, 0x2c, 0xd9,</div><div class='del'>-	0xa3, 0x3a, 0x30, 0xb8, 0x0e, 0x86, 0xb8, 0x7f, 0x05, 0xf9, 0xb0, 0x2a,</div><div class='del'>-	0x0b, 0xb3, 0xde, 0x7b, 0x9d, 0x84, 0x62, 0x9e, 0xea, 0x6a, 0x73, 0x5e,</div><div class='del'>-	0xd5, 0xdc, 0x51, 0x7d, 0x09, 0xc5, 0x95, 0x52, 0xc4, 0x17, 0xef, 0x51,</div><div class='del'>-	0xc8, 0x79, 0x79, 0xd6, 0x1a, 0xd4, 0x47, 0x33, 0x3b, 0xbe, 0xf3, 0x1c,</div><div class='del'>-	0xc8, 0x35, 0xea, 0x37, 0x26, 0xc7, 0xd5, 0xcd, 0xf5, 0xdd, 0xb1, 0xa9,</div><div class='del'>-	0xbe, 0xd5, 0x7c, 0xfb, 0x7b, 0x75, 0xce, 0xf1, 0x9b, 0xa8, 0x97, 0x5a,</div><div class='del'>-	0x79, 0xe0, 0x9d, 0x67, 0x51, 0xcf, 0x3c, 0xa3, 0x6d, 0xa6, 0xf2, 0x3b,</div><div class='del'>-	0xed, 0x9d, 0x43, 0xb1, 0x90, 0x3c, 0x78, 0xe7, 0x57, 0x30, 0x5e, 0x7f,</div><div class='del'>-	0x3d, 0x52, 0x5e, 0xa3, 0x1c, 0xbf, 0xd6, 0xa4, 0x2f, 0xb7, 0xb1, 0xde,</div><div class='del'>-	0x8f, 0x5a, 0xb8, 0x1e, 0x9d, 0x5b, 0xe8, 0xf1, 0xf6, 0xf1, 0xef, 0x35,</div><div class='del'>-	0x9a, 0x07, 0xdf, 0x6a, 0x8a, 0xdf, 0xc7, 0x21, 0xfc, 0x0e, 0xfd, 0x53,</div><div class='del'>-	0x7e, 0x21, 0xc0, 0xef, 0x6a, 0x6d, 0x7b, 0xfc, 0x02, 0xc7, 0x0f, 0x21,</div><div class='del'>-	0xfc, 0xb6, 0x32, 0x0f, 0x6f, 0xb7, 0xe0, 0x4d, 0xea, 0xc5, 0x58, 0xef,</div><div class='del'>-	0x8d, 0x47, 0x0f, 0xfd, 0x1e, 0xa2, 0x7b, 0x65, 0x16, 0xd7, 0x02, 0xbc,</div><div class='del'>-	0xe5, 0x73, 0xf2, 0x7e, 0x5f, 0x82, 0x2a, 0xc7, 0xbf, 0xec, 0xe3, 0x21,</div><div class='del'>-	0x2e, 0xfc, 0x73, 0xd1, 0xfe, 0xed, 0xaa, 0xe2, 0x8b, 0x3e, 0x67, 0x72,</div><div class='del'>-	0x84, 0x8b, 0xa8, 0xef, 0x7a, 0x78, 0xf3, 0xbe, 0xaf, 0x5c, 0xb8, 0x55,</div><div class='del'>-	0x55, 0xfd, 0x4c, 0xf6, 0x15, 0x13, 0x06, 0x78, 0x4e, 0x4e, 0x70, 0xff,</div><div class='del'>-	0xfa, 0x10, 0xa5, 0x3e, 0x59, 0x1c, 0xc5, 0x3e, 0x03, 0x1d, 0xeb, 0xfd,</div><div class='del'>-	0x8c, 0xd6, 0x9d, 0x71, 0x7a, 0x47, 0x0e, 0x98, 0x36, 0xea, 0x75, 0xc6,</div><div class='del'>-	0x09, 0x3b, 0x62, 0x72, 0x5f, 0x12, 0x3e, 0x8e, 0xa1, 0x7a, 0x6e, 0xa3,</div><div class='del'>-	0x3f, 0x05, 0xfb, 0x12, 0xc7, 0x79, 0x40, 0xca, 0x3b, 0x02, 0xfd, 0x48,</div><div class='del'>-	0xe8, 0xf4, 0x92, 0x7f, 0x37, 0x81, 0xe3, 0x52, 0xfb, 0xd2, 0x92, 0xc7,</div><div class='del'>-	0xc5, 0x9a, 0xea, 0xe3, 0xd9, 0x11, 0xe9, 0x4f, 0x02, 0x1c, 0x93, 0xf2,</div><div class='del'>-	0x48, 0x28, 0xf4, 0x74, 0x53, 0x6e, 0x4b, 0x95, 0x75, 0x5a, 0x97, 0x2f,</div><div class='del'>-	0xe3, 0x31, 0x63, 0x65, 0x25, 0x2f, 0x60, 0x61, 0x8e, 0xdf, 0x79, 0x86,</div><div class='del'>-	0x72, 0xa7, 0x1a, 0x21, 0xb9, 0x39, 0xaa, 0xf8, 0x48, 0x60, 0x7c, 0x73,</div><div class='del'>-	0xc4, 0xc7, 0xe9, 0x6b, 0x84, 0xa7, 0xe0, 0x18, 0x62, 0x74, 0x63, 0x2e,</div><div class='del'>-	0x5b, 0x88, 0x10, 0xf7, 0xf6, 0xdf, 0x16, 0xe1, 0x1e, 0xf6, 0x4d, 0x4f,</div><div class='del'>-	0x7e, 0x82, 0x73, 0xb5, 0x59, 0x9e, 0xbc, 0x73, 0x5d, 0xe6, 0xa9, 0xd1,</div><div class='del'>-	0xfc, 0x8e, 0x73, 0x5d, 0x95, 0x9b, 0xd4, 0x9f, 0xea, 0x83, 0x25, 0xae,</div><div class='del'>-	0xfb, 0x46, 0xef, 0x1a, 0x89, 0x4e, 0xc8, 0xfc, 0x4f, 0xad, 0xfb, 0x95,</div><div class='del'>-	0x0e, 0x7d, 0x77, 0x91, 0xfe, 0xf6, 0xde, 0x5b, 0x6e, 0xc8, 0x1c, 0xfe,</div><div class='del'>-	0x1f, 0xde, 0x55, 0x5b, 0xbd, 0xa7, 0x1c, 0xe6, 0xf9, 0x04, 0xf3, 0x6c,</div><div class='del'>-	0x40, 0x4b, 0x04, 0x89, 0xb1, 0x8d, 0x29, 0x3c, 0x57, 0x2f, 0xd3, 0x58,</div><div class='del'>-	0xb7, 0x5b, 0x66, 0x70, 0xae, 0x3b, 0xf6, 0x0c, 0xe9, 0x19, 0x24, 0x4f,</div><div class='del'>-	0x2a, 0xbc, 0x32, 0x45, 0xef, 0x6c, 0x1d, 0x7e, 0x01, 0x50, 0xb6, 0x82,</div><div class='del'>-	0xa7, 0xd8, 0x0d, 0x00, 0x00, 0x00 };</div><div class='add'>+	/* Date:        05/13/2008 13:50 */</div><div class='add'>+	0xa5, 0x56, 0x4f, 0x48, 0x14, 0x61, 0x14, 0x7f, 0x3b, 0xfb, 0x67, 0xd6,</div><div class='add'>+	0xdd, 0xd9, 0x9d, 0x25, 0xff, 0x6d, 0x66, 0xb8, 0x49, 0x97, 0xd5, 0x15,</div><div class='add'>+	0xb5, 0x22, 0x3a, 0x18, 0x86, 0x17, 0x21, 0x3b, 0x84, 0x20, 0x45, 0x04,</div><div class='add'>+	0xd9, 0x12, 0xde, 0x82, 0x0e, 0xd1, 0x29, 0x68, 0xd1, 0x34, 0x8a, 0x0a,</div><div class='add'>+	0x16, 0x52, 0x30, 0xa2, 0xa4, 0x43, 0x85, 0x04, 0xed, 0x74, 0x0a, 0x12,</div><div class='add'>+	0x82, 0x8a, 0x88, 0xea, 0x12, 0x78, 0xa8, 0x4b, 0x16, 0x61, 0xd0, 0xa1,</div><div class='add'>+	0x83, 0x9d, 0xba, 0xe4, 0xf4, 0xbd, 0xef, 0xbd, 0xcf, 0x9d, 0xf9, 0x9c,</div><div class='add'>+	0x55, 0x21, 0x41, 0x7f, 0xbc, 0x6f, 0xde, 0x7b, 0xdf, 0x9b, 0xdf, 0x7b,</div><div class='add'>+	0xef, 0x37, 0x66, 0x00, 0xc0, 0x80, 0x92, 0xd3, 0x26, 0x10, 0x52, 0x46,</div><div class='add'>+	0x28, 0x2e, 0x20, 0x04, 0xf0, 0x18, 0xe8, 0x27, 0x6a, 0x49, 0xbb, 0xd4,</div><div class='add'>+	0xcd, 0x76, 0x27, 0x41, 0xa9, 0x33, 0x23, 0xfe, 0x9e, 0x85, 0xfe, 0x1c,</div><div class='add'>+	0x62, 0x18, 0xfa, 0x77, 0x21, 0x1e, 0x84, 0x17, 0xb9, 0xac, 0xc0, 0xbf,</div><div class='add'>+	0x2e, 0x94, 0xd0, 0x6e, 0xa8, 0x3c, 0x73, 0x92, 0x32, 0xff, 0x12, 0xc7,</div><div class='add'>+	0x7f, 0x0a, 0x13, 0x1e, 0x28, 0xc4, 0x29, 0x0f, 0x23, 0x74, 0x65, 0x24,</div><div class='add'>+	0x2c, 0x96, 0xd1, 0x1e, 0x19, 0x81, 0x18, 0xe6, 0x99, 0x12, 0x0e, 0x68,</div><div class='add'>+	0xb7, 0x86, 0x4a, 0x5d, 0x5c, 0x97, 0x41, 0x7e, 0x5f, 0xca, 0x36, 0x9e,</div><div class='add'>+	0xc3, 0xd7, 0x01, 0xb4, 0xb7, 0x27, 0x2e, 0x97, 0x11, 0xb3, 0x30, 0x16,</div><div class='add'>+	0xb7, 0xe8, 0x7d, 0xda, 0x28, 0xed, 0x52, 0x07, 0xc6, 0x09, 0xdf, 0x0e,</div><div class='add'>+	0xce, 0x1b, 0xc5, 0xbc, 0x3f, 0x5d, 0xca, 0x8b, 0xf9, 0xbc, 0x79, 0x5a,</div><div class='add'>+	0x45, 0x1e, 0x3c, 0x8f, 0x71, 0x5d, 0x31, 0xad, 0xae, 0x98, 0xa8, 0x83,</div><div class='add'>+	0x79, 0x00, 0x55, 0x07, 0x62, 0xa3, 0xb8, 0x17, 0xf3, 0xae, 0xf0, 0x7b,</div><div class='add'>+	0x03, 0x9c, 0xca, 0x71, 0x7e, 0x07, 0xb1, 0xc2, 0xf9, 0xc4, 0x2f, 0xbf,</div><div class='add'>+	0xc7, 0xfa, 0x3c, 0x8a, 0x27, 0x7f, 0xfd, 0x66, 0x41, 0x3d, 0x57, 0xfd,</div><div class='add'>+	0xc0, 0x7b, 0x3e, 0x8a, 0x7b, 0xbc, 0xfe, 0xb0, 0x89, 0xff, 0x7b, 0xe1,</div><div class='add'>+	0xef, 0xcf, 0x4b, 0xe7, 0x6f, 0xab, 0xe7, 0xf9, 0x20, 0xde, 0xa2, 0x1a,</div><div class='add'>+	0x6f, 0x2f, 0x99, 0xb7, 0x41, 0xd8, 0x6d, 0x64, 0xa5, 0x5f, 0x04, 0x10,</div><div class='add'>+	0x77, 0x88, 0x02, 0x10, 0x77, 0x32, 0x1e, 0x63, 0xbc, 0xc9, 0x78, 0x83,</div><div class='add'>+	0xb1, 0x91, 0xb1, 0x81, 0xb1, 0x9e, 0x71, 0x1b, 0xe3, 0x3b, 0xc6, 0x0c,</div><div class='add'>+	0xa3, 0xcd, 0x98, 0x66, 0x7c, 0xc3, 0x68, 0x31, 0x26, 0xb5, 0x7c, 0x2d,</div><div class='add'>+	0x8c, 0x71, 0xc6, 0xbb, 0x8c, 0xfb, 0xb5, 0xf8, 0xdf, 0x8c, 0x0b, 0x8c,</div><div class='add'>+	0xcd, 0x21, 0xc2, 0x43, 0x6c, 0x23, 0xa1, 0x3c, 0xf7, 0x3e, 0xbe, 0xee,</div><div class='add'>+	0xaf, 0xf5, 0x77, 0xb1, 0xcc, 0xcf, 0xf3, 0xca, 0x2f, 0x2e, 0xf9, 0x83,</div><div class='add'>+	0x0e, 0xaf, 0xff, 0x9d, 0x0d, 0xfc, 0xc9, 0x6d, 0x20, 0x1f, 0x14, 0x37,</div><div class='add'>+	0xed, 0x52, 0x1d, 0xb7, 0x38, 0xbe, 0xbe, 0xb2, 0x50, 0x63, 0x8f, 0xfa,</div><div class='add'>+	0x0a, 0xfa, 0x7c, 0x05, 0xed, 0xd1, 0x4e, 0xde, 0xa3, 0xa3, 0xeb, 0xe6,</div><div class='add'>+	0x97, 0xe6, 0xd4, 0xbb, 0x87, 0x32, 0x4f, 0x8d, 0x39, 0x7f, 0x1a, 0x2a,</div><div class='add'>+	0x16, 0xb2, 0x34, 0x17, 0xa5, 0x8d, 0xee, 0xc5, 0x78, 0x9e, 0xcb, 0xbc,</div><div class='add'>+	0x9a, 0x4f, 0xff, 0x5c, 0xd2, 0x7c, 0xc5, 0xb4, 0xf9, 0xba, 0xb0, 0x09,</div><div class='add'>+	0xbf, 0x49, 0x8d, 0xa7, 0x73, 0xae, 0xea, 0x97, 0xc1, 0xc7, 0xe3, 0xb1,</div><div class='add'>+	0x8c, 0xcc, 0x7b, 0xcd, 0x91, 0x66, 0x83, 0x35, 0x85, 0x76, 0x04, 0xae,</div><div class='add'>+	0x3b, 0x2a, 0x8e, 0xf7, 0xb2, 0x43, 0xdd, 0x43, 0xf1, 0x29, 0x20, 0x9e,</div><div class='add'>+	0xe7, 0x34, 0x9e, 0x73, 0x5b, 0xd2, 0xa9, 0x15, 0xb7, 0xaa, 0x53, 0xf4,</div><div class='add'>+	0xbc, 0x0d, 0xbc, 0x3a, 0x15, 0x87, 0xd1, 0x41, 0x5b, 0xde, 0x9b, 0x8e,</div><div class='add'>+	0x51, 0x9a, 0xe3, 0x36, 0xe1, 0x99, 0x04, 0xe1, 0x72, 0xa2, 0x4e, 0xfc,</div><div class='add'>+	0x75, 0xdd, 0xb1, 0x24, 0xd9, 0xa7, 0x53, 0x6a, 0x3f, 0x54, 0xbc, 0xaa,</div><div class='add'>+	0x6b, 0xa3, 0x7a, 0xf0, 0x7e, 0x75, 0x8f, 0xaa, 0x43, 0xdd, 0xe7, 0xe7,</div><div class='add'>+	0xbf, 0xf6, 0xbd, 0x84, 0x45, 0xc3, 0xcf, 0xc3, 0xed, 0x1e, 0xc2, 0x48,</div><div class='add'>+	0xaf, 0x84, 0xec, 0x8c, 0x45, 0x71, 0xb3, 0x56, 0x04, 0xed, 0x7d, 0xb3,</div><div class='add'>+	0x1f, 0x30, 0xbf, 0xb1, 0x67, 0xc6, 0xe1, 0xfa, 0x6c, 0xd5, 0x3f, 0x79,</div><div class='add'>+	0x0e, 0xed, 0x40, 0xf6, 0x30, 0xcf, 0xc3, 0xb0, 0x9c, 0x7b, 0xb1, 0xd7,</div><div class='add'>+	0x06, 0x62, 0x0b, 0x94, 0xa4, 0xae, 0x1b, 0x89, 0xd7, 0x32, 0x3e, 0xcc,</div><div class='add'>+	0xe7, 0xa2, 0x4f, 0xed, 0xfe, 0x7d, 0x59, 0xa2, 0xfe, 0xc7, 0xfd, 0x73,</div><div class='add'>+	0xd3, 0xed, 0x06, 0xcf, 0x63, 0xa2, 0x32, 0x57, 0x0e, 0xea, 0xd7, 0x73,</div><div class='add'>+	0xd6, 0xbd, 0x2c, 0x14, 0x7b, 0x6b, 0xe9, 0xb1, 0xfa, 0x0e, 0x2a, 0x3d,</div><div class='add'>+	0x92, 0xc7, 0x95, 0x52, 0xd8, 0xc7, 0xcb, 0x21, 0x28, 0x04, 0xe5, 0x7f,</div><div class='add'>+	0xa2, 0xbe, 0x2f, 0x01, 0x7b, 0xb4, 0xd9, 0xbd, 0xbe, 0xfc, 0x69, 0x28,</div><div class='add'>+	0x04, 0xed, 0x81, 0xa9, 0xed, 0x8d, 0xcd, 0x7b, 0xd3, 0xbc, 0x6e, 0x7e,</div><div class='add'>+	0x95, 0x4e, 0xe4, 0x36, 0xd4, 0x89, 0xff, 0xd5, 0x05, 0x03, 0x48, 0x17,</div><div class='add'>+	0x50, 0x8f, 0xfd, 0xf7, 0x9b, 0xaa, 0x7e, 0x6d, 0xff, 0xa9, 0xee, 0x3f,</div><div class='add'>+	0xab, 0x5b, 0xd3, 0x11, 0xef, 0xfb, 0x07, 0xe9, 0x48, 0x42, 0xd3, 0x85,</div><div class='add'>+	0x5f, 0xab, 0x55, 0x1d, 0xc1, 0xe7, 0xf3, 0xf3, 0xd4, 0x97, 0x8b, 0xee,</div><div class='add'>+	0x9a, 0xae, 0xfb, 0xf8, 0xac, 0x63, 0x3e, 0x85, 0x9f, 0x8c, 0x5f, 0xd6,</div><div class='add'>+	0xe2, 0x55, 0x5f, 0xcf, 0x33, 0xcf, 0x46, 0x1f, 0xcd, 0x95, 0x59, 0xfc,</div><div class='add'>+	0xa1, 0xf1, 0xdd, 0x5b, 0xc0, 0xbd, 0xb8, 0x04, 0x0e, 0xf3, 0xf6, 0xd9,</div><div class='add'>+	0xc7, 0x5f, 0x8a, 0xf5, 0xc1, 0x84, 0x47, 0x8e, 0xe2, 0x59, 0xf5, 0x87,</div><div class='add'>+	0xf0, 0xa1, 0xf4, 0xcf, 0x6c, 0xc2, 0x77, 0x06, 0x1e, 0x38, 0x6a, 0xbf,</div><div class='add'>+	0x6d, 0x99, 0xaf, 0x87, 0xf5, 0x64, 0x94, 0xf7, 0xfa, 0x5b, 0x82, 0x74,</div><div class='add'>+	0xa3, 0x38, 0x24, 0xf7, 0x14, 0x9a, 0x78, 0xbf, 0x8b, 0x29, 0xb2, 0x5b,</div><div class='add'>+	0x52, 0xf4, 0x7f, 0x5b, 0x8f, 0x69, 0x49, 0xbf, 0x96, 0x14, 0x61, 0x53,</div><div class='add'>+	0x12, 0xe3, 0xb2, 0xf0, 0xfd, 0x88, 0x74, 0x2f, 0x54, 0xf7, 0x5b, 0xdf,</div><div class='add'>+	0x6b, 0x7e, 0xdf, 0xbd, 0x78, 0xde, 0x24, 0xf6, 0xd4, 0xdb, 0x0f, 0x6b,</div><div class='add'>+	0x4d, 0x5f, 0xef, 0x71, 0xf5, 0x39, 0xdb, 0xcb, 0xb7, 0x9a, 0xdb, 0x67,</div><div class='add'>+	0x35, 0xfa, 0x34, 0xe8, 0x2a, 0xdd, 0x6b, 0x1f, 0xc4, 0x7a, 0x6d, 0x48,</div><div class='add'>+	0x9b, 0x34, 0x1f, 0x84, 0x22, 0x8f, 0x61, 0x62, 0x58, 0xeb, 0x24, 0xeb,</div><div class='add'>+	0xc4, 0xe4, 0xb8, 0x4c, 0x73, 0x64, 0x52, 0x9d, 0x0f, 0xc8, 0xc1, 0x1f,</div><div class='add'>+	0x9e, 0x7f, 0x25, 0xcf, 0xd3, 0x4e, 0x98, 0xce, 0xcd, 0x21, 0xc5, 0x97,</div><div class='add'>+	0x2d, 0xdf, 0x7f, 0x86, 0xf8, 0x3a, 0x39, 0x4d, 0x78, 0x02, 0x0e, 0x4b,</div><div class='add'>+	0x4c, 0x54, 0xf5, 0x2d, 0x2e, 0x11, 0x52, 0x5e, 0x7d, 0x8b, 0x8a, 0xf2,</div><div class='add'>+	0xd0, 0xae, 0xf3, 0xf4, 0x51, 0xff, 0x6e, 0x6c, 0xb5, 0x9f, 0x5e, 0x9d,</div><div class='add'>+	0xc4, 0x7e, 0xea, 0x7a, 0x27, 0xe7, 0x46, 0x9b, 0xcf, 0x72, 0x8d, 0xf9,</div><div class='add'>+	0xcc, 0xd5, 0x98, 0x6f, 0x5d, 0x2f, 0xae, 0xf2, 0xde, 0x45, 0x20, 0x1a,</div><div class='add'>+	0x96, 0x1f, 0x24, 0x2b, 0x32, 0x21, 0xfb, 0x6b, 0x4c, 0xd2, 0x87, 0xd4,</div><div class='add'>+	0x8a, 0x4e, 0x85, 0x24, 0x6f, 0xd6, 0x14, 0xf9, 0x45, 0xe8, 0x3c, 0xab,</div><div class='add'>+	0xf0, 0xca, 0x84, 0xfa, 0xee, 0xfe, 0x03, 0x65, 0x6c, 0x9a, 0x59, 0x40,</div><div class='add'>+	0x0c, 0x00, 0x00, 0x00 };</div><div class='ctx'> </div><div class='ctx'> static u8 bnx2_rv2p_proc2[] = {</div><div class='del'>-	/* Date:        12/07/2007 15:02 */</div><div class='del'>-	0xed, 0x59, 0x5d, 0x6c, 0x54, 0xc7, 0x15, 0x9e, 0xbd, 0xbb, 0x7b, 0xf7,</div><div class='del'>-	0x7a, 0x7d, 0xf7, 0xae, 0x71, 0xa8, 0xff, 0xf9, 0xb3, 0x09, 0xd8, 0xa9,</div><div class='del'>-	0x21, 0xce, 0x9a, 0x98, 0x02, 0x55, 0x63, 0x39, 0x95, 0x81, 0xa6, 0x55,</div><div class='del'>-	0x0c, 0x49, 0x9b, 0xbe, 0x35, 0x76, 0x02, 0xb6, 0xa9, 0x4d, 0x2d, 0x43,</div><div class='del'>-	0x83, 0x4a, 0x1b, 0x65, 0x85, 0xd7, 0xf6, 0xcb, 0x26, 0xea, 0x22, 0xc0,</div><div class='del'>-	0x24, 0xaa, 0xa8, 0x1b, 0xa4, 0x28, 0xea, 0xdb, 0x56, 0x6a, 0x6d, 0xda,</div><div class='del'>-	0x97, 0xfe, 0x10, 0xb7, 0x4a, 0xa4, 0x42, 0xa5, 0xf6, 0xa1, 0x52, 0x85,</div><div class='del'>-	0x44, 0xda, 0x62, 0x99, 0xc4, 0x20, 0x63, 0xba, 0x79, 0x21, 0x75, 0x67,</div><div class='del'>-	0xce, 0x77, 0xe6, 0xee, 0xbd, 0xeb, 0xb5, 0x21, 0x2d, 0x8f, 0xdd, 0x07,</div><div class='del'>-	0x1f, 0x66, 0xee, 0x99, 0x33, 0xe7, 0xe7, 0x9b, 0x33, 0x67, 0x0e, 0x65,</div><div class='del'>-	0x42, 0x08, 0x43, 0x24, 0xb3, 0x1b, 0x24, 0x15, 0x56, 0x20, 0x20, 0xf0,</div><div class='del'>-	0x7b, 0xac, 0x8c, 0xc8, 0x9f, 0xb3, 0x96, 0xfc, 0x1b, 0x16, 0xcf, 0x1b,</div><div class='del'>-	0x55, 0x34, 0x0e, 0x09, 0x45, 0x1d, 0x21, 0x92, 0x5e, 0x5a, 0xce, 0xf4,</div><div class='del'>-	0x67, 0x4c, 0x77, 0x1b, 0xa0, 0x3d, 0x4c, 0xeb, 0x98, 0x9e, 0x64, 0xba,</div><div class='del'>-	0x91, 0xe9, 0x56, 0xa6, 0x27, 0x98, 0x7e, 0x8f, 0xe9, 0x07, 0x4c, 0x77,</div><div class='del'>-	0xb2, 0x3c, 0xf9, 0x4b, 0xda, 0xf2, 0x4f, 0x40, 0x24, 0x9b, 0xb4, 0x7e,</div><div class='del'>-	0x36, 0xa6, 0x9b, 0xa0, 0xe7, 0x73, 0x1b, 0x15, 0xdf, 0xcd, 0xa5, 0x3c,</div><div class='del'>-	0x1f, 0xe6, 0xaf, 0x65, 0x40, 0x37, 0x60, 0xd5, 0x4f, 0x93, 0x8f, 0xeb,</div><div class='del'>-	0xf5, 0x20, 0xdd, 0x31, 0xd0, 0x9e, 0x20, 0x68, 0x7b, 0x33, 0x91, 0xf4,</div><div class='del'>-	0x4b, 0x06, 0xc6, 0x9d, 0x5b, 0x2c, 0xb2, 0x2f, 0x64, 0x28, 0x39, 0xeb,</div><div class='del'>-	0x2d, 0xf3, 0x12, 0xe6, 0xbf, 0x19, 0x07, 0x7d, 0x39, 0x0a, 0xfa, 0x4f,</div><div class='del'>-	0xa6, 0x87, 0x4b, 0x59, 0xbe, 0xcd, 0x6a, 0x97, 0x62, 0xfd, 0x8c, 0xad,</div><div class='del'>-	0x68, 0x50, 0x24, 0x79, 0x9d, 0x10, 0xd0, 0xeb, 0xc7, 0x02, 0xdf, 0xd7,</div><div class='del'>-	0x6c, 0xc5, 0xec, 0x0f, 0x0f, 0x63, 0x5c, 0x7b, 0xb1, 0x8c, 0xf8, 0xcf,</div><div class='del'>-	0x67, 0xb5, 0xfe, 0x16, 0x79, 0x3f, 0x19, 0x87, 0x1c, 0x51, 0x6f, 0xd1,</div><div class='del'>-	0x26, 0xc9, 0x66, 0x50, 0xb1, 0x4d, 0xcb, 0xc3, 0xef, 0xdc, 0xa3, 0xda,</div><div class='del'>-	0x3f, 0x18, 0xaf, 0x4d, 0x80, 0x9e, 0x65, 0x5a, 0xd1, 0x4a, 0x64, 0xfb,</div><div class='del'>-	0xdf, 0x9f, 0xb0, 0x48, 0x97, 0xe4, 0x36, 0xaf, 0x1f, 0x7f, 0x23, 0xfd,</div><div class='del'>-	0xc8, 0x82, 0x1a, 0x40, 0x6e, 0x3c, 0xaa, 0xf8, 0xa4, 0x71, 0xf5, 0x90,</div><div class='del'>-	0x7b, 0xb0, 0xbf, 0x98, 0xff, 0x7f, 0xf9, 0x19, 0xfc, 0xaf, 0xe4, 0xb5,</div><div class='del'>-	0xb3, 0xfe, 0x1b, 0xa5, 0xfe, 0x8a, 0xd6, 0x05, 0x92, 0xdb, 0xfc, 0xfe,</div><div class='del'>-	0xb9, 0x96, 0x89, 0xd3, 0xbf, 0x6f, 0x76, 0x94, 0x91, 0xfd, 0xcf, 0x62,</div><div class='del'>-	0xfe, 0x74, 0xe7, 0x14, 0xfc, 0xb4, 0x9f, 0xe2, 0x22, 0xa2, 0xa9, 0x9f,</div><div class='del'>-	0x63, 0x55, 0x77, 0x4c, 0x8d, 0x5f, 0xd8, 0x71, 0x23, 0x8b, 0xef, 0xe1,</div><div class='del'>-	0x11, 0x35, 0x36, 0xe4, 0x3a, 0xfc, 0xf6, 0x07, 0x09, 0xe0, 0x69, 0x73,</div><div class='del'>-	0x84, 0x86, 0xf6, 0x0c, 0x7d, 0xb7, 0xc5, 0x78, 0x16, 0xdf, 0x8f, 0x96,</div><div class='del'>-	0xaa, 0xf1, 0xb3, 0xcd, 0x73, 0x18, 0x37, 0xf7, 0x8f, 0xf1, 0x42, 0xa3,</div><div class='del'>-	0x44, 0xfe, 0x59, 0x5a, 0xba, 0x69, 0x40, 0x1e, 0x87, 0x37, 0x1a, 0x32,</div><div class='del'>-	0xe2, 0x64, 0xaf, 0xdd, 0x09, 0x3a, 0x4a, 0xdf, 0xef, 0x05, 0xd2, 0x64,</div><div class='del'>-	0x77, 0xa7, 0x13, 0x9a, 0x02, 0x23, 0xe3, 0xca, 0xc5, 0x8d, 0xc6, 0xdd,</div><div class='del'>-	0x83, 0xe2, 0x67, 0xcc, 0xc5, 0x0f, 0xfb, 0xbf, 0x69, 0x25, 0xfc, 0x80,</div><div class='del'>-	0x76, 0x6e, 0x01, 0x35, 0x1b, 0x14, 0x5f, 0xb8, 0x08, 0x8e, 0xfc, 0x7e,</div><div class='del'>-	0xe6, 0xf8, 0x14, 0xe2, 0x44, 0xe2, 0x03, 0x63, 0xc6, 0x8b, 0xc4, 0x95,</div><div class='del'>-	0xe2, 0xaf, 0x96, 0xfe, 0xd2, 0xf1, 0x57, 0x82, 0x22, 0xe2, 0xdb, 0x2c,</div><div class='del'>-	0xaf, 0x9f, 0xed, 0x1a, 0x60, 0x7b, 0xe6, 0xa3, 0xda, 0xaf, 0xda, 0x1e,</div><div class='del'>-	0xd0, 0x71, 0x9f, 0x3d, 0x01, 0x89, 0x27, 0x8d, 0x23, 0x9f, 0x3e, 0xe9,</div><div class='del'>-	0xf7, 0xea, 0xf1, 0x8f, 0x5a, 0xc6, 0xa1, 0x6b, 0xe7, 0x16, 0xc5, 0x67,</div><div class='del'>-	0x26, 0x26, 0xb2, 0x7e, 0x1c, 0x6e, 0x10, 0x5a, 0x8e, 0x96, 0xaf, 0x70,</div><div class='del'>-	0x99, 0x93, 0xb8, 0x44, 0xdc, 0xce, 0x67, 0xbd, 0xe7, 0xa8, 0xa6, 0xc8,</div><div class='del'>-	0x39, 0xf2, 0x9f, 0x07, 0xed, 0x97, 0xa3, 0x31, 0x4a, 0x10, 0x3b, 0xae,</div><div class='del'>-	0xcc, 0xfa, 0xf7, 0x03, 0xbe, 0x23, 0x2e, 0x7e, 0xd6, 0xb6, 0xb1, 0xff,</div><div class='del'>-	0x98, 0x56, 0xec, 0x54, 0xf2, 0xba, 0x58, 0x7e, 0x0b, 0xcb, 0xb7, 0x0b,</div><div class='del'>-	0xce, 0xdb, 0x73, 0xee, 0x79, 0xd3, 0x71, 0xcb, 0x9f, 0x3b, 0xed, 0x3f,</div><div class='del'>-	0xda, 0xbf, 0xf9, 0xca, 0xac, 0x5a, 0x5f, 0x7b, 0x9f, 0x73, 0xb8, 0xbf,</div><div class='del'>-	0xc8, 0x39, 0x84, 0x9c, 0xbf, 0x3c, 0xee, 0xb7, 0x6b, 0x88, 0xf3, 0x5c,</div><div class='del'>-	0x0f, 0xe2, 0x66, 0xbd, 0xf4, 0x2b, 0xfe, 0xf0, 0x18, 0xe1, 0x5d, 0xbc,</div><div class='del'>-	0x18, 0x41, 0x7c, 0x1d, 0xd2, 0x5f, 0xb0, 0x1d, 0x2f, 0x7b, 0xce, 0x6b,</div><div class='del'>-	0x09, 0xf9, 0xb5, 0xc3, 0xc4, 0x7e, 0x1d, 0xdd, 0x58, 0xde, 0xce, 0x78,</div><div class='del'>-	0xc8, 0xf1, 0x79, 0x99, 0xb5, 0x49, 0xff, 0xe8, 0x9d, 0x53, 0x98, 0x1f,</div><div class='del'>-	0xdd, 0x43, 0x24, 0x7d, 0xd5, 0xd0, 0xf6, 0x86, 0xd4, 0xdf, 0xc9, 0x41,</div><div class='del'>-	0x7c, 0x9f, 0x0c, 0xf1, 0xf9, 0x7c, 0xaf, 0x9e, 0xd6, 0x5b, 0xf3, 0x19,</div><div class='del'>-	0xac, 0xcf, 0xb1, 0x7e, 0x27, 0x82, 0xc4, 0x1f, 0x1d, 0x63, 0xbe, 0xf1,</div><div class='del'>-	0x11, 0xbf, 0x9d, 0x3f, 0x40, 0x3e, 0xb7, 0xbf, 0x3f, 0x42, 0xe7, 0xdd,</div><div class='del'>-	0x31, 0x5d, 0x3e, 0xa2, 0xce, 0xe8, 0x29, 0xc5, 0x5f, 0x29, 0xc6, 0xb2,</div><div class='del'>-	0x4a, 0xd1, 0x2a, 0xd1, 0xbd, 0x17, 0xeb, 0xde, 0x30, 0x91, 0x6f, 0x7a,</div><div class='del'>-	0xf7, 0x82, 0x7e, 0x88, 0xf9, 0xf5, 0xce, 0xb8, 0xe2, 0x5f, 0x53, 0xe3,</div><div class='del'>-	0x4c, 0x29, 0x1a, 0x97, 0xf6, 0x28, 0xfb, 0xa5, 0xed, 0x8c, 0xcf, 0xc1,</div><div class='del'>-	0x46, 0xf0, 0xf7, 0x1d, 0xa2, 0x8d, 0xcf, 0x0c, 0xe4, 0x28, 0x5f, 0x4d,</div><div class='del'>-	0x0e, 0x5f, 0x52, 0x7e, 0xa9, 0x16, 0xb3, 0xc7, 0x14, 0x0d, 0x89, 0x8e,</div><div class='del'>-	0x4d, 0xec, 0x97, 0x3d, 0xfe, 0xfc, 0x3c, 0xbf, 0x53, 0x8d, 0x6b, 0x24,</div><div class='del'>-	0x9f, 0x17, 0xbf, 0x16, 0xc7, 0x39, 0xe4, 0xfa, 0xf5, 0x13, 0x03, 0x76,</div><div class='del'>-	0xa7, 0x48, 0xff, 0x3d, 0xd1, 0x14, 0x9d, 0xeb, 0x98, 0xe8, 0x25, 0x3c,</div><div class='del'>-	0x85, 0xac, 0xc1, 0x4b, 0xf8, 0x3e, 0xff, 0x0b, 0x2d, 0x57, 0xe1, 0x61,</div><div class='del'>-	0x17, 0xdf, 0x9f, 0xc2, 0x95, 0x13, 0xda, 0xc9, 0x71, 0xd0, 0xfb, 0xb6,</div><div class='del'>-	0xe2, 0xbe, 0xe9, 0x08, 0xa8, 0xf1, 0x3a, 0x39, 0xb6, 0x29, 0x6e, 0x1d,</div><div class='del'>-	0xdd, 0x6a, 0xbd, 0x4c, 0x02, 0x74, 0x7e, 0x1c, 0x29, 0x5f, 0xcd, 0x47,</div><div class='del'>-	0xa4, 0x1d, 0xfe, 0x7d, 0x06, 0x11, 0x0f, 0xfb, 0x28, 0xf9, 0xe7, 0xf3,</div><div class='del'>-	0xf6, 0xad, 0x8c, 0xb6, 0x07, 0xf3, 0xb7, 0x5d, 0x7d, 0x6c, 0xb2, 0xab,</div><div class='del'>-	0x63, 0x13, 0xf6, 0x9b, 0x75, 0x78, 0x9f, 0x4d, 0xbc, 0xef, 0x31, 0xb5,</div><div class='del'>-	0x5f, 0x83, 0x47, 0x5f, 0xc5, 0x67, 0x45, 0x6f, 0x91, 0xdc, 0x75, 0xd6,</div><div class='del'>-	0x77, 0x2e, 0x91, 0x7f, 0xad, 0xa3, 0x53, 0xd8, 0xff, 0xf6, 0xd4, 0x6a,</div><div class='del'>-	0x7a, 0xd7, 0xb0, 0x9c, 0x75, 0xec, 0xd7, 0xd8, 0x43, 0x8c, 0xdb, 0xea,</div><div class='del'>-	0x71, 0xca, 0xfb, 0x57, 0xfb, 0x87, 0xe4, 0xdb, 0x0b, 0xd3, 0xab, 0xe9,</div><div class='del'>-	0x2b, 0x6d, 0x4a, 0x82, 0x3f, 0x65, 0xd0, 0xc1, 0xa8, 0x82, 0x5f, 0xf2,</div><div class='del'>-	0x71, 0xd3, 0xfa, 0xce, 0x1f, 0xc2, 0x7d, 0x34, 0xe8, 0xe6, 0x0b, 0x25,</div><div class='del'>-	0xb7, 0x9d, 0xf1, 0x20, 0xe5, 0x05, 0xe0, 0x9f, 0x85, 0x69, 0x9c, 0x9b,</div><div class='del'>-	0x13, 0x74, 0x3e, 0xbe, 0x68, 0x87, 0x68, 0xff, 0xa8, 0x75, 0x83, 0xef,</div><div class='del'>-	0xa5, 0xfc, 0xfd, 0x03, 0x79, 0x7d, 0x36, 0x68, 0x2f, 0xe7, 0xe9, 0x1b,</div><div class='del'>-	0x4c, 0x53, 0xb6, 0x5a, 0x57, 0x2a, 0xf3, 0xad, 0x45, 0xf2, 0x91, 0x57,</div><div class='del'>-	0x4b, 0x5c, 0x7d, 0x8f, 0xb0, 0x9c, 0x8f, 0x98, 0x0a, 0x96, 0x33, 0xc0,</div><div class='del'>-	0xeb, 0xe7, 0x7c, 0x72, 0x0c, 0x8f, 0x1c, 0x7f, 0x3e, 0x1a, 0xe3, 0x7b,</div><div class='del'>-	0xef, 0xbc, 0xb9, 0x52, 0xbd, 0xa4, 0x68, 0xb9, 0x5c, 0x8f, 0x59, 0x7d,</div><div class='del'>-	0x2f, 0xa4, 0x1a, 0x89, 0xb4, 0x85, 0x0c, 0xb2, 0x77, 0x32, 0x35, 0x02,</div><div class='del'>-	0x3f, 0x8d, 0xb3, 0x9f, 0x22, 0xf0, 0x53, 0x4d, 0xfe, 0x9e, 0xe4, 0x8d,</div><div class='del'>-	0xf8, 0xfc, 0xcd, 0x6c, 0xf6, 0x9f, 0xc7, 0xf3, 0xa6, 0x8e, 0x2f, 0x91,</div><div class='del'>-	0x34, 0xf2, 0x90, 0xbe, 0x3f, 0xf5, 0xbd, 0x72, 0x4b, 0xe7, 0x6d, 0xb9,</div><div class='del'>-	0x6f, 0x81, 0x3e, 0x41, 0x8a, 0x73, 0x74, 0x9c, 0xf3, 0xd1, 0xd5, 0xa0,</div><div class='del'>-	0x8e, 0x27, 0xf4, 0x1b, 0xff, 0x8c, 0xfa, 0xe5, 0xef, 0xe5, 0xb0, 0x22,</div><div class='del'>-	0xcd, 0xb3, 0xc7, 0x88, 0xb6, 0xf4, 0x1d, 0xc7, 0x7c, 0x65, 0xab, 0xd2,</div><div class='del'>-	0xe7, 0x27, 0x01, 0x9c, 0xd3, 0xb0, 0x98, 0xc9, 0xe0, 0x9e, 0x13, 0x11,</div><div class='del'>-	0xd2, 0xa3, 0xee, 0x32, 0xe1, 0xc2, 0x8c, 0xa6, 0x32, 0x3e, 0x7f, 0x79,</div><div class='del'>-	0xec, 0x2e, 0x66, 0xef, 0x84, 0xc4, 0x93, 0xfa, 0x6e, 0xf2, 0x79, 0x95,</div><div class='del'>-	0x78, 0xb5, 0xf9, 0xbc, 0x3c, 0x4d, 0x7c, 0xf6, 0x22, 0xd9, 0xf9, 0x0d,</div><div class='del'>-	0x6b, 0x9c, 0xeb, 0xb4, 0x8f, 0x3b, 0xd5, 0xf8, 0x79, 0xfb, 0x75, 0x9c,</div><div class='del'>-	0x77, 0xfb, 0x75, 0xe4, 0x5b, 0x2b, 0x7c, 0x11, 0x79, 0xb8, 0xf3, 0xa2,</div><div class='del'>-	0x6f, 0xff, 0x74, 0xc8, 0xd0, 0xe7, 0xe7, 0x7f, 0xf2, 0x9b, 0xfd, 0x5d,</div><div class='del'>-	0xf6, 0xdb, 0xdd, 0xd5, 0xe3, 0x9a, 0x36, 0xf9, 0x1c, 0xf6, 0xdd, 0x2d,</div><div class='del'>-	0xb4, 0x57, 0xf9, 0xef, 0x43, 0xf7, 0x1e, 0x0e, 0xed, 0x62, 0x7d, 0x76,</div><div class='del'>-	0x71, 0x1e, 0xe0, 0xfa, 0x67, 0x7d, 0x50, 0xdf, 0x8b, 0x1a, 0x0f, 0x7c,</div><div class='del'>-	0x3f, 0x02, 0xa7, 0xd6, 0x28, 0xec, 0x15, 0xaf, 0xf2, 0x39, 0xf8, 0x37,</div><div class='del'>-	0xd3, 0xd7, 0x18, 0xff, 0x27, 0xb9, 0x3e, 0xd2, 0xf5, 0xdd, 0x3d, 0xcc,</div><div class='del'>-	0x3b, 0x13, 0x6e, 0x3d, 0xa4, 0xef, 0x1f, 0x35, 0x0e, 0x08, 0x27, 0x52,</div><div class='del'>-	0x4a, 0xfb, 0x25, 0x7f, 0x07, 0x80, 0x8d, 0x3f, 0x0d, 0x3f, 0xce, 0xb6,</div><div class='del'>-	0x82, 0xef, 0x0d, 0xf8, 0xc7, 0xd1, 0xfa, 0x2d, 0x36, 0xfa, 0xde, 0x01,</div><div class='del'>-	0x6d, 0xf0, 0xaf, 0xe9, 0xfa, 0x57, 0xe3, 0x73, 0x89, 0x69, 0xed, 0x66,</div><div class='del'>-	0xb6, 0xf3, 0xbf, 0xf3, 0xbb, 0xa7, 0x1e, 0x5b, 0xc9, 0xef, 0xb4, 0xbe,</div><div class='del'>-	0xad, 0xef, 0x2e, 0xe6, 0xcb, 0x76, 0x83, 0x66, 0x76, 0xd3, 0xfc, 0x66,</div><div class='del'>-	0xe4, 0xdb, 0x70, 0xdb, 0xe9, 0xfb, 0xd4, 0xa7, 0xfa, 0x5d, 0x53, 0xf9,</div><div class='del'>-	0x25, 0xd0, 0x33, 0x4c, 0x3f, 0xf7, 0x14, 0xe8, 0xb9, 0xa7, 0xfc, 0x79,</div><div class='del'>-	0xc4, 0x8c, 0xfb, 0xe2, 0xdb, 0x86, 0xf8, 0xbe, 0xe3, 0xc6, 0x77, 0x3d,</div><div class='del'>-	0xea, 0x03, 0x19, 0xaf, 0x55, 0xe3, 0xe9, 0xc6, 0xe9, 0x7e, 0xf1, 0x7c,</div><div class='del'>-	0xd8, 0x71, 0x4c, 0xed, 0xc2, 0x3d, 0x37, 0xcc, 0xef, 0xcd, 0x45, 0xf7,</div><div class='del'>-	0x9e, 0x2a, 0x16, 0xdf, 0xc8, 0xff, 0xe3, 0x4b, 0xf1, 0x3d, 0xb2, 0xa4,</div><div class='del'>-	0xf3, 0x1f, 0xee, 0x79, 0x5d, 0xd7, 0x0f, 0x79, 0xea, 0x7a, 0xff, 0xbe,</div><div class='del'>-	0xdf, 0xa2, 0x7a, 0x79, 0x34, 0xe0, 0xe2, 0x82, 0xf8, 0xa7, 0x79, 0x5d,</div><div class='del'>-	0x19, 0xaf, 0xdb, 0xb7, 0x6c, 0xdd, 0xb5, 0x8c, 0x5a, 0xf7, 0xb7, 0x4f,</div><div class='del'>-	0x97, 0xf7, 0x25, 0x7c, 0x7a, 0x26, 0x45, 0x1c, 0xf1, 0xc1, 0x7d, 0x61,</div><div class='del'>-	0x16, 0xe9, 0x63, 0xf8, 0x71, 0xb7, 0x37, 0x8e, 0x7c, 0xa8, 0xdf, 0x79,</div><div class='del'>-	0xfe, 0xba, 0xfe, 0x8f, 0x9f, 0xae, 0x5c, 0xd7, 0x6b, 0x79, 0x88, 0x5f,</div><div class='del'>-	0xb7, 0x11, 0x23, 0xbe, 0xeb, 0x43, 0x6a, 0x5d, 0xbf, 0x6b, 0x5f, 0x3b,</div><div class='del'>-	0xd9, 0x75, 0x99, 0xed, 0xab, 0x63, 0xfb, 0xe4, 0xe7, 0x6d, 0x74, 0x9f,</div><div class='del'>-	0x58, 0xd7, 0x87, 0xbc, 0xf6, 0xfd, 0x7a, 0x95, 0xfd, 0x1e, 0xf4, 0x1d,</div><div class='del'>-	0xc1, 0xfb, 0xc6, 0xf5, 0xfe, 0x4a, 0x5e, 0x2d, 0xd7, 0x63, 0x8e, 0xe0,</div><div class='del'>-	0xe7, 0x54, 0x91, 0xba, 0x46, 0xed, 0xff, 0x7b, 0xe9, 0x00, 0xbe, 0xc7,</div><div class='del'>-	0xe8, 0x1d, 0x11, 0xb4, 0x2e, 0x67, 0x8a, 0xf9, 0xe5, 0x6b, 0x01, 0xf0,</div><div class='del'>-	0x15, 0x8b, 0x9b, 0xfa, 0x1e, 0x66, 0x39, 0xc5, 0xec, 0x66, 0x3d, 0x5d,</div><div class='del'>-	0x3c, 0xf0, 0x3a, 0xe2, 0xeb, 0x63, 0xbe, 0x50, 0x91, 0xbe, 0x04, 0x46,</div><div class='del'>-	0xb9, 0xad, 0x54, 0x2f, 0x5e, 0x38, 0x39, 0xad, 0xf8, 0x62, 0xee, 0xbb,</div><div class='del'>-	0xcc, 0xaf, 0xdf, 0xc4, 0x43, 0xf0, 0x23, 0xbd, 0x3f, 0x44, 0xaf, 0xb3,</div><div class='del'>-	0x92, 0xbf, 0xf0, 0x7e, 0x5a, 0x98, 0xd6, 0xfe, 0xb6, 0xc9, 0x4e, 0xd4,</div><div class='del'>-	0xd3, 0x17, 0x0a, 0xfc, 0x68, 0x78, 0xfc, 0x08, 0xfe, 0x95, 0x71, 0xef,</div><div class='del'>-	0x7f, 0x97, 0x03, 0x17, 0xaf, 0x16, 0xc1, 0x3d, 0xf5, 0xf7, 0x1e, 0xd8,</div><div class='del'>-	0xce, 0x03, 0xad, 0x5e, 0xbb, 0x1a, 0xc4, 0x4c, 0x16, 0xf8, 0xef, 0x62,</div><div class='del'>-	0x9c, 0xbc, 0xc8, 0x79, 0xf6, 0x7a, 0x54, 0x4d, 0x58, 0xa2, 0xe7, 0x19,</div><div class='del'>-	0xe4, 0xe9, 0x8a, 0x52, 0xd8, 0xdd, 0xf3, 0x55, 0xed, 0x27, 0xcc, 0xd7,</div><div class='del'>-	0xc4, 0x50, 0x57, 0x77, 0x45, 0xf0, 0xbe, 0xa8, 0x89, 0x81, 0x56, 0x70,</div><div class='del'>-	0x9e, 0x9e, 0x71, 0xfb, 0x29, 0xa0, 0xf9, 0xfa, 0x12, 0x7d, 0xa5, 0xdf,</div><div class='del'>-	0x9a, 0xa8, 0xc3, 0x45, 0x13, 0xd7, 0xcf, 0x94, 0xef, 0x82, 0xe2, 0x60,</div><div class='del'>-	0x13, 0x70, 0x22, 0xea, 0xfd, 0x79, 0x8a, 0xf3, 0xec, 0xb2, 0x7a, 0x0d,</div><div class='del'>-	0x7d, 0x99, 0x12, 0x4f, 0x5f, 0x42, 0xef, 0xa7, 0xfd, 0xa8, 0xe5, 0xd2,</div><div class='del'>-	0x70, 0x85, 0xba, 0x72, 0x91, 0xf3, 0xd8, 0x23, 0xe2, 0x0f, 0x59, 0xd8,</div><div class='del'>-	0x35, 0x93, 0x2d, 0xc4, 0x95, 0xde, 0x4f, 0xcb, 0x83, 0xde, 0xda, 0x8e,</div><div class='del'>-	0xbc, 0x7c, 0xec, 0x7f, 0x88, 0xf5, 0xfc, 0x07, 0xf5, 0x33, 0x2b, 0xd8,</div><div class='del'>-	0x1e, 0x25, 0x17, 0xf3, 0xfb, 0xb8, 0x4f, 0x94, 0x74, 0xc7, 0xfe, 0xfe,</div><div class='del'>-	0x4e, 0x17, 0xe9, 0xb5, 0x86, 0x71, 0x54, 0xe1, 0xc1, 0x39, 0xf8, 0xd7,</div><div class='del'>-	0xb6, 0x80, 0x9e, 0x6d, 0xd1, 0x71, 0xd0, 0xf1, 0xd2, 0xf1, 0x41, 0x1c,</div><div class='del'>-	0x2b, 0xd0, 0x4f, 0xda, 0xd1, 0xf3, 0x04, 0xdd, 0x0f, 0x2d, 0x3d, 0x0b,</div><div class='del'>-	0xfa, 0xdc, 0x61, 0xfd, 0x81, 0x66, 0xc5, 0xff, 0x9a, 0xf8, 0x13, 0xf7,</div><div class='del'>-	0x1b, 0xfe, 0xca, 0xb4, 0xb0, 0x6f, 0x82, 0xbe, 0x8b, 0x8c, 0x5b, 0x98,</div><div class='del'>-	0x03, 0xd2, 0xaa, 0xf3, 0xac, 0xf7, 0x9d, 0xa0, 0xcf, 0xdf, 0xd6, 0x65,</div><div class='del'>-	0x78, 0xcd, 0xe7, 0x4b, 0x6d, 0x9f, 0xe2, 0x6f, 0x66, 0x1c, 0xca, 0xf7,</div><div class='del'>-	0xe9, 0x5e, 0xa5, 0x47, 0x5c, 0xde, 0xdb, 0xc8, 0xc7, 0x4e, 0xc4, 0x1b,</div><div class='del'>-	0x27, 0x89, 0x87, 0x92, 0x88, 0x1a, 0xd6, 0x95, 0x97, 0x90, 0x1d, 0xa7,</div><div class='del'>-	0xdf, 0xff, 0x80, 0x3e, 0xbf, 0x3d, 0x51, 0x8a, 0xf9, 0xca, 0x67, 0xe2,</div><div class='del'>-	0xe4, 0x87, 0x73, 0xc0, 0xf1, 0x8f, 0xce, 0x82, 0xbe, 0x25, 0xbe, 0x82,</div><div class='del'>-	0xf5, 0xe5, 0xa7, 0xe8, 0xfe, 0xb7, 0x2a, 0x19, 0x97, 0x55, 0x38, 0xf7,</div><div class='del'>-	0x69, 0xd4, 0x0f, 0x4b, 0x4b, 0x22, 0x86, 0xba, 0x4d, 0xdf, 0x03, 0xc0,</div><div class='del'>-	0x65, 0xc8, 0x13, 0xdf, 0xfb, 0xe1, 0x54, 0x51, 0xbb, 0xf0, 0x9d, 0x64,</div><div class='del'>-	0x15, 0xe2, 0x55, 0xfb, 0xa3, 0xca, 0x28, 0x8a, 0xcf, 0x36, 0x3f, 0x3e,</div><div class='del'>-	0x4d, 0xc6, 0xe7, 0x5d, 0xb7, 0x8e, 0x5a, 0x2e, 0x97, 0xde, 0x89, 0x12,</div><div class='del'>-	0xb7, 0x0f, 0x0b, 0xaf, 0xa0, 0xfb, 0x1a, 0xd4, 0xfe, 0x95, 0xcb, 0xf2,</div><div class='del'>-	0xeb, 0x06, 0x5f, 0x9c, 0x6f, 0xde, 0xd3, 0x7a, 0x9d, 0x32, 0xbd, 0xdf,</div><div class='del'>-	0x5b, 0xdc, 0x7b, 0x66, 0x98, 0xfb, 0xfc, 0x39, 0xf4, 0xa3, 0x12, 0xf3,</div><div class='del'>-	0x69, 0x1a, 0xda, 0xd5, 0xef, 0x52, 0xdf, 0x22, 0x31, 0xcc, 0xf9, 0xf3,</div><div class='del'>-	0xfd, 0xa0, 0xae, 0xb7, 0x30, 0xbe, 0xc2, 0x79, 0xe3, 0x0e, 0xeb, 0x75,</div><div class='del'>-	0x80, 0x61, 0x39, 0xdf, 0x48, 0x79, 0x37, 0xa1, 0xeb, 0xb4, 0x61, 0x7e,</div><div class='del'>-	0x5f, 0xe8, 0x3e, 0xd5, 0x97, 0x83, 0x9c, 0x4f, 0xc9, 0x8f, 0xa1, 0xc4,</div><div class='del'>-	0xed, 0x29, 0xdd, 0x4f, 0xd0, 0xfd, 0x05, 0xd6, 0x07, 0xfd, 0x30, 0x71,</div><div class='del'>-	0x30, 0x02, 0x2a, 0x9a, 0xfc, 0xf1, 0x11, 0xae, 0x9d, 0x18, 0x99, 0x05,</div><div class='del'>-	0xfd, 0x86, 0x08, 0xf7, 0x09, 0x27, 0x58, 0xbf, 0x33, 0xfc, 0xbe, 0x73,</div><div class='del'>-	0xc8, 0x4f, 0x65, 0xd2, 0x7e, 0xea, 0x5b, 0x25, 0x8e, 0x4d, 0xc3, 0xae,</div><div class='del'>-	0x01, 0xf7, 0xfd, 0x06, 0x3e, 0xa6, 0xce, 0x9b, 0xdc, 0x2f, 0xe3, 0xbe,</div><div class='del'>-	0x9a, 0x63, 0x8e, 0xc0, 0x9e, 0x81, 0x1c, 0xc6, 0x8b, 0x78, 0x17, 0x39,</div><div class='del'>-	0xff, 0xe2, 0x3a, 0xef, 0xf8, 0x49, 0xfd, 0x1e, 0x2c, 0xbe, 0x4e, 0xd7,</div><div class='del'>-	0x85, 0x83, 0xf4, 0x2e, 0x79, 0x61, 0x92, 0xfb, 0xea, 0xa2, 0x9f, 0xea,</div><div class='del'>-	0xd1, 0xaf, 0xdb, 0x39, 0x1e, 0xe7, 0xfb, 0x07, 0xfe, 0xbe, 0x81, 0xae,</div><div class='del'>-	0xbf, 0xe7, 0xd0, 0xff, 0x9c, 0xcc, 0xa5, 0x81, 0x97, 0x64, 0x89, 0x17,</div><div class='del'>-	0xe7, 0x25, 0x89, 0x4a, 0x8e, 0xdb, 0xda, 0x27, 0x41, 0xcf, 0x3e, 0x89,</div><div class='del'>-	0x77, 0xf2, 0xc0, 0x2b, 0xec, 0x97, 0x1d, 0x14, 0xa7, 0xed, 0xe8, 0xbf,</div><div class='del'>-	0x78, 0xeb, 0x50, 0x85, 0x9b, 0x4f, 0x5c, 0x3c, 0xcf, 0x91, 0x5e, 0xb5,</div><div class='del'>-	0x93, 0x39, 0xe2, 0xab, 0x11, 0x8f, 0xd0, 0xbd, 0x57, 0xed, 0x2c, 0x40,</div><div class='del'>-	0xcf, 0xc4, 0x04, 0xdb, 0x37, 0xf4, 0x05, 0xd0, 0x57, 0x38, 0xce, 0x3a,</div><div class='del'>-	0x7e, 0x57, 0xdd, 0x3e, 0x1e, 0xf4, 0xd5, 0xf7, 0xf1, 0xf2, 0xf7, 0x3b,</div><div class='del'>-	0xc6, 0xd5, 0xad, 0x48, 0x60, 0x7d, 0xc7, 0x8b, 0xf7, 0xa7, 0xfc, 0x78,</div><div class='del'>-	0x50, 0x78, 0xd1, 0xb8, 0xf4, 0xe2, 0xa8, 0xf0, 0x9c, 0xe5, 0x71, 0xe1,</div><div class='del'>-	0x34, 0x55, 0x91, 0xbf, 0x70, 0x9f, 0x98, 0x89, 0x89, 0xcc, 0xea, 0x7e,</div><div class='del'>-	0x7a, 0x13, 0x7e, 0x4a, 0xb0, 0xde, 0x76, 0xff, 0x08, 0xee, 0xa1, 0x31,</div><div class='del'>-	0x8e, 0xd3, 0x5c, 0x23, 0xd7, 0x11, 0xac, 0xdf, 0xc7, 0xfc, 0xce, 0x40,</div><div class='del'>-	0x3c, 0x23, 0xf6, 0xe1, 0x69, 0x8e, 0x1f, 0xe3, 0xea, 0x08, 0xdb, 0xfd,</div><div class='del'>-	0x11, 0xec, 0xb6, 0xb5, 0xdd, 0xfd, 0xae, 0xdd, 0xba, 0x4e, 0xf1, 0xca,</div><div class='del'>-	0x29, 0x97, 0xb8, 0xa0, 0x7a, 0xc7, 0xbe, 0x4a, 0x79, 0x24, 0xcc, 0x76,</div><div class='del'>-	0x4a, 0xbe, 0x56, 0xfd, 0xff, 0x8e, 0xf0, 0x57, 0xef, 0x76, 0xef, 0xba,</div><div class='del'>-	0x52, 0x5e, 0x17, 0x95, 0xeb, 0x30, 0x8f, 0xf3, 0x67, 0xaf, 0xe0, 0x4f,</div><div class='del'>-	0xe5, 0x37, 0x2d, 0xb7, 0xf0, 0x7c, 0x79, 0xfd, 0x47, 0x95, 0x1d, 0xfd,</div><div class='del'>-	0x90, 0x57, 0x64, 0x9c, 0xe8, 0x1e, 0xb2, 0xdd, 0xbc, 0x72, 0x87, 0xea,</div><div class='del'>-	0xc0, 0xe8, 0x85, 0x41, 0xe4, 0x81, 0x0b, 0x83, 0xef, 0x72, 0x1d, 0xce,</div><div class='del'>-	0x7e, 0xe9, 0xa2, 0xff, 0xaf, 0x92, 0xb1, 0xab, 0xf7, 0xe7, 0x15, 0xbf,</div><div class='del'>-	0x1e, 0xb5, 0x1e, 0x3d, 0xf4, 0xbe, 0xff, 0x01, 0xfe, 0xf0, 0x11, 0xdc,</div><div class='del'>-	0xa0, 0x1d, 0x00, 0x00, 0x00 };</div><div class='add'>+	/* Date:        05/13/2008 13:50 */</div><div class='add'>+	0xad, 0x58, 0x4d, 0x6c, 0x54, 0x55, 0x14, 0xbe, 0x7d, 0xf3, 0xdb, 0x99,</div><div class='add'>+	0x37, 0x3f, 0xb4, 0xb5, 0xbf, 0x68, 0xa1, 0x95, 0xd2, 0x92, 0x29, 0x94,</div><div class='add'>+	0x69, 0x01, 0x95, 0x44, 0x49, 0x31, 0x05, 0x94, 0x84, 0x52, 0x5d, 0x10,</div><div class='add'>+	0x37, 0xd0, 0x22, 0xa5, 0x83, 0x2d, 0x69, 0x28, 0x61, 0xc1, 0xc6, 0x09,</div><div class='add'>+	0xc5, 0xe2, 0x62, 0x12, 0x2d, 0xb1, 0x14, 0x8c, 0xc1, 0x46, 0x37, 0xc4,</div><div class='add'>+	0xb8, 0x19, 0x83, 0x52, 0xd4, 0xc4, 0x84, 0x60, 0x43, 0x70, 0x01, 0x26,</div><div class='add'>+	0x9a, 0xe0, 0x42, 0x13, 0xa2, 0x50, 0x0b, 0x36, 0x58, 0x7e, 0x46, 0x17,</div><div class='add'>+	0xca, 0x78, 0xef, 0xf9, 0xce, 0x7d, 0x7d, 0x6f, 0x3a, 0xb5, 0x2c, 0xe8,</div><div class='add'>+	0xe6, 0xeb, 0xbd, 0xef, 0xdc, 0x73, 0xcf, 0xcf, 0x77, 0xcf, 0x39, 0x6d,</div><div class='add'>+	0x54, 0x08, 0xe1, 0x16, 0xc9, 0x74, 0xb5, 0x44, 0x11, 0x32, 0x0a, 0xfc,</div><div class='add'>+	0x12, 0xb2, 0x42, 0x78, 0xca, 0xd5, 0x5a, 0x18, 0x82, 0x7f, 0x56, 0x44,</div><div class='add'>+	0x09, 0x7e, 0x48, 0xab, 0xef, 0x3e, 0xf1, 0xaa, 0x81, 0xef, 0x6e, 0xa1,</div><div class='add'>+	0x30, 0x22, 0x44, 0x52, 0x61, 0x94, 0x71, 0x3d, 0x63, 0x86, 0x31, 0x58,</div><div class='add'>+	0x00, 0x6c, 0x66, 0x7c, 0xc0, 0xfb, 0x77, 0x78, 0x7d, 0x93, 0xf1, 0x6f,</div><div class='add'>+	0xde, 0x37, 0x19, 0x6f, 0xf3, 0xfe, 0xf3, 0x06, 0x30, 0xc1, 0xfb, 0x3f,</div><div class='add'>+	0x4b, 0xd4, 0x76, 0xa9, 0xf5, 0x74, 0x56, 0x24, 0xe5, 0x19, 0x21, 0xc5,</div><div class='add'>+	0x1b, 0xf4, 0xbe, 0x49, 0x90, 0x6c, 0x80, 0xdd, 0xaf, 0x2c, 0x51, 0x72,</div><div class='add'>+	0xbf, 0xe7, 0x91, 0x53, 0xfb, 0x37, 0xb2, 0xd0, 0x3b, 0xeb, 0xaf, 0xe1,</div><div class='add'>+	0x51, 0xe7, 0x96, 0xb6, 0x9c, 0x18, 0xc6, 0xf9, 0x9d, 0x4b, 0xb0, 0xff,</div><div class='add'>+	0x54, 0x4c, 0xf9, 0xef, 0x15, 0x49, 0x46, 0xd1, 0xa8, 0xd0, 0x28, 0x48,</div><div class='add'>+	0x36, 0xea, 0x40, 0x41, 0xfe, 0x97, 0x61, 0xac, 0x3a, 0x43, 0xd0, 0x1b,</div><div class='add'>+	0x70, 0xe8, 0x2d, 0x9d, 0xa3, 0xf7, 0x5a, 0xa1, 0x5d, 0xff, 0x67, 0xac,</div><div class='add'>+	0x3f, 0xb0, 0xa0, 0xfe, 0xae, 0x10, 0xb0, 0x38, 0x96, 0xef, 0x9e, 0xc2,</div><div class='add'>+	0x05, 0xec, 0xdf, 0xb7, 0xa0, 0xfe, 0xc3, 0x96, 0xfd, 0x3a, 0x6e, 0xfa,</div><div class='add'>+	0x3b, 0xb0, 0x1a, 0x62, 0x9f, 0x24, 0x57, 0xe9, 0x78, 0x6a, 0xbf, 0xd9,</div><div class='add'>+	0x3e, 0x17, 0x70, 0x43, 0x8c, 0x20, 0xb5, 0x9b, 0x03, 0xdc, 0x56, 0xa7,</div><div class='add'>+	0xee, 0x2d, 0x12, 0x6e, 0x43, 0xe9, 0x59, 0xee, 0xf7, 0x9e, 0xc7, 0xfe,</div><div class='add'>+	0x8e, 0x08, 0xf0, 0x75, 0x76, 0xe4, 0x46, 0x40, 0x05, 0x26, 0x9b, 0xed,</div><div class='add'>+	0x0e, 0xb2, 0x7e, 0xa4, 0x55, 0x24, 0x83, 0x38, 0x3f, 0x61, 0x2a, 0xfb,</div><div class='add'>+	0x2e, 0xcb, 0xfc, 0xa9, 0xb5, 0x4b, 0x24, 0x23, 0x4e, 0x3f, 0x3e, 0x14,</div><div class='add'>+	0x90, 0x5b, 0xb4, 0x1c, 0xbb, 0xef, 0x76, 0x63, 0x5d, 0xf5, 0x71, 0x94,</div><div class='add'>+	0xe4, 0x4f, 0xa6, 0xb5, 0x1f, 0x6a, 0x5f, 0xbe, 0x83, 0x08, 0xf4, 0x88,</div><div class='add'>+	0x1a, 0x3f, 0x5d, 0x86, 0x38, 0xc9, 0x4b, 0x1b, 0xb5, 0x3e, 0xfc, 0x9c,</div><div class='add'>+	0x58, 0xa6, 0xf9, 0x85, 0x75, 0xb7, 0x97, 0xa0, 0xbc, 0x73, 0x48, 0xd9,</div><div class='add'>+	0x1b, 0x11, 0xbb, 0x0c, 0x65, 0x88, 0xc1, 0xfe, 0xb9, 0xfc, 0xe6, 0x17,</div><div class='add'>+	0x90, 0xff, 0xa6, 0xda, 0x24, 0xdb, 0xba, 0x9b, 0x71, 0xae, 0x24, 0x0e,</div><div class='add'>+	0x1c, 0x89, 0x7b, 0x14, 0xc4, 0xba, 0x07, 0x68, 0xb9, 0xf2, 0xd7, 0xd5,</div><div class='add'>+	0x7e, 0x92, 0x4b, 0x36, 0x6a, 0xfe, 0xea, 0xb8, 0x2b, 0x7f, 0xdf, 0xc9,</div><div class='add'>+	0x5a, 0xfc, 0xaf, 0x45, 0x7c, 0x6e, 0x2e, 0x53, 0xf2, 0x32, 0x48, 0x35,</div><div class='add'>+	0xb8, 0xa7, 0x23, 0x91, 0x8f, 0xff, 0x6f, 0xdb, 0xf8, 0xff, 0x68, 0x79,</div><div class='add'>+	0xdc, 0x40, 0xfe, 0x6f, 0xe0, 0x38, 0x2c, 0x61, 0xbe, 0x2c, 0xce, 0xc3,</div><div class='add'>+	0x97, 0x08, 0xfd, 0x7e, 0xab, 0x35, 0x4a, 0x71, 0xdc, 0x86, 0xfd, 0xe3,</div><div class='add'>+	0x6d, 0xe7, 0x10, 0xef, 0x2d, 0x14, 0x07, 0x11, 0x38, 0xfa, 0x39, 0x4e,</div><div class='add'>+	0x75, 0x86, 0xd4, 0xfa, 0xb5, 0x96, 0xee, 0x2f, 0xb1, 0xee, 0x72, 0xa9,</div><div class='add'>+	0xf5, 0x0e, 0x73, 0xf7, 0x38, 0xe4, 0x3d, 0x83, 0x51, 0x8a, 0xdf, 0x36,</div><div class='add'>+	0xbe, 0x65, 0x8b, 0xab, 0x40, 0x41, 0xca, 0x3b, 0x48, 0x4b, 0x73, 0x82,</div><div class='add'>+	0xbe, 0x47, 0xc5, 0xb1, 0x34, 0xbe, 0xef, 0x0f, 0x52, 0x7d, 0x90, 0xfe,</div><div class='add'>+	0x91, 0x5c, 0x49, 0xc2, 0x8b, 0xf3, 0xa9, 0x61, 0x3f, 0xf9, 0x3b, 0x75,</div><div class='add'>+	0x56, 0xad, 0xb7, 0xc6, 0xa6, 0x20, 0x1f, 0x4b, 0x0c, 0xb1, 0x62, 0x03,</div><div class='add'>+	0xf1, 0xbb, 0x65, 0x40, 0x9e, 0xe9, 0x15, 0x70, 0x53, 0xfe, 0x0a, 0x84,</div><div class='add'>+	0xd9, 0x06, 0x7c, 0x8b, 0xbe, 0xff, 0x53, 0x90, 0xa2, 0x78, 0x6d, 0x0c,</div><div class='add'>+	0xbb, 0xcf, 0xe9, 0xf8, 0x30, 0x46, 0xb4, 0x5f, 0xc0, 0x47, 0xe5, 0xef,</div><div class='add'>+	0x90, 0xa9, 0x79, 0xcb, 0x79, 0x6b, 0x98, 0x8f, 0xb7, 0xc0, 0xb6, 0x3a,</div><div class='add'>+	0xa0, 0xb7, 0x56, 0xc9, 0x79, 0xf2, 0xf0, 0xd7, 0x99, 0x17, 0xce, 0xab,</div><div class='add'>+	0x8d, 0x67, 0x04, 0x92, 0x5f, 0x0e, 0xbe, 0x49, 0x3e, 0x53, 0x5d, 0x92,</div><div class='add'>+	0xf1, 0xd4, 0xbc, 0x51, 0x8a, 0x7c, 0xe2, 0x0d, 0xd6, 0x97, 0x60, 0xbf,</div><div class='add'>+	0x7a, 0xd9, 0xaf, 0xe9, 0x80, 0x8e, 0xbb, 0xf6, 0x07, 0x78, 0xcc, 0x04,</div><div class='add'>+	0xbf, 0x3a, 0x12, 0xda, 0x2f, 0x27, 0x7f, 0xd9, 0x9e, 0xd4, 0xb7, 0x35,</div><div class='add'>+	0xf8, 0xa5, 0xaa, 0x16, 0x68, 0xf9, 0x59, 0x47, 0xef, 0x25, 0x5c, 0x36,</div><div class='add'>+	0xae, 0xed, 0x50, 0x79, 0xfd, 0x4b, 0xe6, 0x15, 0xf9, 0x39, 0x99, 0xb6,</div><div class='add'>+	0xbf, 0xd3, 0xca, 0x3c, 0xef, 0xd4, 0xf9, 0x6e, 0xb4, 0xff, 0xfb, 0x43,</div><div class='add'>+	0x54, 0x88, 0x5a, 0xae, 0x4c, 0x3a, 0xdf, 0x05, 0xf8, 0xef, 0xb3, 0x78,</div><div class='add'>+	0x54, 0xb2, 0x96, 0xe3, 0xc4, 0x58, 0xba, 0x4e, 0xe9, 0x6b, 0x67, 0xfd,</div><div class='add'>+	0x4d, 0xac, 0xdf, 0xb4, 0xbd, 0x4b, 0x65, 0xdf, 0x93, 0xd6, 0x7b, 0xd4,</div><div class='add'>+	0xf9, 0x99, 0x7d, 0x97, 0x3a, 0x4e, 0x74, 0x7f, 0xec, 0xca, 0xa4, 0x3a,</div><div class='add'>+	0x5f, 0xb5, 0xc0, 0x3b, 0x2d, 0xb6, 0xf4, 0xfd, 0x68, 0xbd, 0x47, 0xf5,</div><div class='add'>+	0x3d, 0x28, 0x5e, 0xe0, 0xa5, 0xb3, 0xde, 0xfc, 0x29, 0xeb, 0x0d, 0xf9,</div><div class='add'>+	0xe1, 0x37, 0xcf, 0x71, 0x7d, 0x19, 0x50, 0xf7, 0x94, 0xb3, 0xdd, 0xe5,</div><div class='add'>+	0xba, 0xce, 0x4b, 0xbb, 0xb9, 0x0e, 0xed, 0xb4, 0xd7, 0x13, 0x8f, 0xad,</div><div class='add'>+	0x2e, 0xa8, 0xb5, 0x2b, 0x4f, 0x9f, 0x74, 0xc4, 0x33, 0x29, 0x22, 0x98,</div><div class='add'>+	0x03, 0x92, 0x11, 0x25, 0x7f, 0x4f, 0xcc, 0xad, 0x2b, 0xb9, 0xf6, 0x23,</div><div class='add'>+	0x1e, 0x9d, 0x46, 0x88, 0xe4, 0xae, 0xf7, 0xab, 0x73, 0xd7, 0xac, 0x3e,</div><div class='add'>+	0x8e, 0x3a, 0x73, 0x91, 0xed, 0x5d, 0xcc, 0xf6, 0x4a, 0x7d, 0x8d, 0xc4,</div><div class='add'>+	0x53, 0xff, 0xf5, 0x7e, 0xbb, 0xbd, 0x77, 0x1e, 0xce, 0x7f, 0x9f, 0x33,</div><div class='add'>+	0xef, 0xfd, 0xdc, 0x6f, 0xb8, 0x4f, 0xfa, 0x77, 0x7f, 0xa5, 0xed, 0xe1,</div><div class='add'>+	0x7b, 0x23, 0xfa, 0x7e, 0x93, 0xf2, 0x32, 0x39, 0xa0, 0xce, 0x87, 0x05,</div><div class='add'>+	0xd3, 0x44, 0xf4, 0xd5, 0xa3, 0xae, 0x4d, 0xef, 0x81, 0xfd, 0x7d, 0x75,</div><div class='add'>+	0xea, 0xfe, 0x16, 0x81, 0x7e, 0xe3, 0x96, 0x21, 0x45, 0x7d, 0xbf, 0x38,</div><div class='add'>+	0x9c, 0x2f, 0x8f, 0x5f, 0xb3, 0xdc, 0x38, 0xfb, 0x15, 0x65, 0xbf, 0x36,</div><div class='add'>+	0x4b, 0xbf, 0x28, 0xee, 0xfc, 0x3d, 0x9f, 0xdf, 0x6c, 0xa7, 0xd0, 0xfd,</div><div class='add'>+	0x9b, 0xcf, 0x91, 0x5c, 0x0f, 0xcb, 0xb9, 0xe7, 0xed, 0xdb, 0x99, 0xe5,</div><div class='add'>+	0x54, 0x87, 0x4f, 0x1f, 0xa6, 0x7a, 0x1a, 0xb2, 0xf8, 0xe6, 0xb4, 0x6f,</div><div class='add'>+	0xe2, 0x31, 0xc4, 0x51, 0xc9, 0x2d, 0x12, 0x7b, 0xc3, 0xf3, 0xc5, 0xcb,</div><div class='add'>+	0xad, 0xb6, 0xc7, 0x66, 0xc6, 0x75, 0xbc, 0x4d, 0xf2, 0x73, 0x72, 0x80,</div><div class='add'>+	0xe6, 0xc2, 0x9c, 0x38, 0x1a, 0xb6, 0x38, 0x42, 0x1e, 0xf3, 0x4a, 0xbe,</div><div class='add'>+	0xf8, 0xe5, 0xeb, 0x8b, 0x9f, 0x3e, 0xd4, 0x7c, 0x3a, 0xe2, 0xd5, 0xf6,</div><div class='add'>+	0x2b, 0x5c, 0x65, 0xe5, 0xf3, 0x00, 0xcf, 0x23, 0x19, 0x93, 0x7e, 0x89,</div><div class='add'>+	0x4f, 0xa7, 0x68, 0x69, 0x56, 0x9c, 0x51, 0x72, 0x2b, 0xe2, 0x07, 0xd8,</div><div class='add'>+	0xce, 0xcb, 0x2e, 0xf8, 0xd1, 0xb3, 0x07, 0xeb, 0x2b, 0x5c, 0xdf, 0xee,</div><div class='add'>+	0x72, 0x9d, 0xda, 0xee, 0x07, 0x4e, 0xd7, 0x93, 0x7f, 0xf1, 0x03, 0xe7,</div><div class='add'>+	0xb5, 0x7e, 0xd2, 0x6b, 0x66, 0x38, 0x3e, 0x2f, 0xba, 0xd8, 0xee, 0x1a,</div><div class='add'>+	0xca, 0x47, 0xfc, 0x0e, 0xbd, 0x4f, 0xb7, 0x68, 0x5d, 0xaa, 0xb0, 0x42,</div><div class='add'>+	0xc6, 0x81, 0xed, 0x59, 0x0f, 0xec, 0xf0, 0x71, 0x5c, 0x1b, 0x72, 0xf3,</div><div class='add'>+	0x85, 0x6d, 0x6f, 0x0d, 0x9f, 0xef, 0xc4, 0xda, 0xc7, 0xf5, 0x65, 0x94,</div><div class='add'>+	0xed, 0x7a, 0xaf, 0x1e, 0x18, 0x6e, 0x40, 0x7f, 0x9c, 0x34, 0x15, 0x46,</div><div class='add'>+	0xe2, 0x03, 0xe3, 0xf0, 0xa7, 0x77, 0x23, 0xfc, 0xbd, 0xc7, 0x71, 0x60,</div><div class='add'>+	0x0c, 0x9f, 0x1a, 0xa4, 0xbe, 0x19, 0x1e, 0x42, 0x7f, 0x0d, 0x7b, 0x07,</div><div class='add'>+	0xe1, 0x47, 0x6f, 0x06, 0xeb, 0x7b, 0xcf, 0x02, 0x1f, 0x3c, 0x87, 0x73,</div><div class='add'>+	0x07, 0x0f, 0x73, 0x7c, 0x36, 0xe6, 0x3f, 0xd7, 0x73, 0x1f, 0x72, 0x7d,</div><div class='add'>+	0xf5, 0xd4, 0xe7, 0xc7, 0xb8, 0xef, 0x8a, 0x04, 0xf7, 0xf9, 0x0c, 0xaf,</div><div class='add'>+	0xf7, 0x71, 0x1f, 0xb9, 0xcd, 0x7d, 0xb2, 0x37, 0xa7, 0x4f, 0x4e, 0xa1,</div><div class='add'>+	0x6e, 0x8e, 0x65, 0x52, 0x6a, 0x43, 0xd6, 0xaf, 0x42, 0xdd, 0x1f, 0x15,</div><div class='add'>+	0x06, 0xe2, 0x65, 0x9c, 0xaf, 0x92, 0x35, 0xc0, 0x91, 0x35, 0xe8, 0x6b,</div><div class='add'>+	0xbd, 0x87, 0x38, 0x2e, 0x2d, 0x94, 0x9f, 0x95, 0x33, 0xe3, 0x9a, 0x0f,</div><div class='add'>+	0x34, 0x3f, 0x3d, 0xd4, 0xbc, 0x43, 0xfd, 0xca, 0x58, 0xf5, 0x76, 0x8a,</div><div class='add'>+	0xec, 0xab, 0x1a, 0xcb, 0x90, 0x7c, 0xa5, 0x28, 0x26, 0x7e, 0x55, 0x84,</div><div class='add'>+	0x67, 0x60, 0x6f, 0x7c, 0x94, 0xfd, 0xec, 0x7f, 0x06, 0x78, 0x88, 0xf3,</div><div class='add'>+	0xac, 0xf3, 0x77, 0x75, 0x9d, 0x49, 0xe7, 0x26, 0x07, 0x60, 0xb7, 0xe6,</div><div class='add'>+	0x7d, 0xee, 0x9c, 0xa7, 0xf3, 0x5e, 0xd1, 0x4c, 0x6b, 0xd1, 0x73, 0x50,</div><div class='add'>+	0xdd, 0x13, 0x92, 0xf9, 0x52, 0x76, 0xc9, 0x58, 0x70, 0x7f, 0x74, 0xf2,</div><div class='add'>+	0x41, 0xf1, 0x45, 0xf3, 0xd2, 0xce, 0x23, 0x3b, 0x4f, 0x9c, 0xfc, 0x08,</div><div class='add'>+	0x53, 0x3d, 0x97, 0x8f, 0x97, 0xfa, 0xa7, 0x37, 0x3e, 0x3a, 0xfc, 0xff,</div><div class='add'>+	0xf1, 0x3a, 0x85, 0x78, 0xc5, 0xd9, 0x6e, 0x33, 0x41, 0x73, 0xd6, 0x13,</div><div class='add'>+	0x62, 0x88, 0xf3, 0x35, 0x55, 0xcf, 0xef, 0xb5, 0x06, 0xf9, 0xea, 0x7f,</div><div class='add'>+	0x1a, 0xf6, 0xf4, 0xf3, 0x3b, 0xf9, 0x83, 0xfb, 0x39, 0xf2, 0xec, 0x33,</div><div class='add'>+	0xbb, 0xc7, 0x39, 0xaf, 0xcc, 0xb7, 0x7d, 0x1c, 0x87, 0xdb, 0x88, 0x83,</div><div class='add'>+	0xa9, 0xe3, 0x90, 0xb0, 0xe2, 0xa0, 0xeb, 0x83, 0x5d, 0x4f, 0x91, 0xe4,</div><div class='add'>+	0x0b, 0xd5, 0x19, 0xf3, 0x2a, 0xcd, 0x27, 0x1e, 0xf6, 0x5b, 0xca, 0x35,</div><div class='add'>+	0x2b, 0xff, 0xc2, 0xec, 0x5f, 0x48, 0xec, 0x5d, 0x69, 0x3f, 0x17, 0xe4,</div><div class='add'>+	0x73, 0x01, 0x79, 0x0e, 0xfb, 0x78, 0x8f, 0xe6, 0x3c, 0xf1, 0x55, 0x71,</div><div class='add'>+	0xd4, 0x7a, 0x73, 0xdf, 0x9d, 0x3d, 0x9e, 0x54, 0x51, 0xe9, 0x07, 0x75,</div><div class='add'>+	0x46, 0xe6, 0x8d, 0xea, 0x91, 0x69, 0xd5, 0x99, 0xbb, 0x54, 0x7f, 0x03,</div><div class='add'>+	0xa7, 0xfb, 0x50, 0x17, 0x4e, 0xf7, 0x9d, 0xe1, 0xfe, 0xc7, 0x71, 0x69,</div><div class='add'>+	0xa7, 0xb9, 0x58, 0xc6, 0xae, 0xc6, 0x59, 0x67, 0x9c, 0x76, 0x54, 0xd9,</div><div class='add'>+	0xec, 0xd0, 0xf7, 0xce, 0xd7, 0x97, 0x31, 0xaf, 0x6d, 0xa2, 0xbe, 0xec,</div><div class='add'>+	0xb7, 0xe6, 0x49, 0x67, 0xbd, 0xf7, 0x3f, 0x72, 0xbd, 0xdf, 0xde, 0x6c,</div><div class='add'>+	0xd7, 0x5f, 0x2b, 0x26, 0xd2, 0xd0, 0xdf, 0xce, 0xfd, 0x72, 0x17, 0xbf,</div><div class='add'>+	0xdb, 0xeb, 0x81, 0x08, 0xdd, 0xd7, 0xf5, 0x32, 0xf9, 0x27, 0x4a, 0x83,</div><div class='add'>+	0xf0, 0xa7, 0x6b, 0x2b, 0xbe, 0x77, 0x85, 0xb0, 0x5f, 0x19, 0xc2, 0xdf,</div><div class='add'>+	0x5b, 0xed, 0x3e, 0x93, 0xe4, 0x2b, 0x43, 0xc0, 0x52, 0x7e, 0xef, 0x13,</div><div class='add'>+	0xd6, 0x5c, 0x0c, 0x3c, 0xe9, 0xb5, 0xcf, 0x8f, 0x6e, 0x71, 0xc1, 0x8b,</div><div class='add'>+	0xf7, 0x2f, 0x1a, 0x30, 0x07, 0xb6, 0xd6, 0x99, 0xf4, 0xbd, 0xa3, 0x01,</div><div class='add'>+	0xfd, 0x12, 0xf5, 0x75, 0xf6, 0xef, 0x33, 0x9e, 0x2b, 0x2b, 0x67, 0xe7,</div><div class='add'>+	0x67, 0xfb, 0x7c, 0x5d, 0x18, 0x1f, 0xb5, 0xe6, 0x5c, 0x7d, 0x9f, 0xfd,</div><div class='add'>+	0xfd, 0x28, 0xbd, 0xb4, 0x94, 0x73, 0xaa, 0x7d, 0xbe, 0x76, 0xe9, 0x79,</div><div class='add'>+	0x87, 0xe7, 0xd1, 0x62, 0x71, 0x29, 0x0d, 0xbf, 0x26, 0xd2, 0xf9, 0xde,</div><div class='add'>+	0xa1, 0xba, 0x4f, 0xeb, 0x83, 0xdd, 0xda, 0x8f, 0x59, 0xfd, 0xb8, 0x7f,</div><div class='add'>+	0x0f, 0xdb, 0xf9, 0x1b, 0xfd, 0x5d, 0x5c, 0xca, 0xfe, 0x28, 0xbd, 0xd8,</div><div class='add'>+	0xdf, 0xcc, 0xf3, 0x7e, 0xd2, 0x5a, 0x3b, 0xe7, 0xf4, 0x76, 0xb2, 0xab,</div><div class='add'>+	0x88, 0xfb, 0x69, 0xa9, 0xad, 0xdf, 0x43, 0xbe, 0xa4, 0x09, 0x38, 0xd2,</div><div class='add'>+	0xa4, 0xf3, 0xa0, 0xf3, 0xa5, 0xf3, 0x83, 0x3c, 0x96, 0xae, 0x26, 0xb1,</div><div class='add'>+	0x96, 0xae, 0xd5, 0xf4, 0x60, 0x9b, 0xba, 0x66, 0x9c, 0xff, 0x3f, 0xd8,</div><div class='add'>+	0x1e, 0x53, 0xf2, 0x6f, 0x8a, 0xef, 0x63, 0x68, 0x80, 0x3f, 0x31, 0xce,</div><div class='add'>+	0xce, 0xc5, 0x9c, 0x00, 0x6b, 0x1e, 0xc1, 0x7d, 0x17, 0x3c, 0xbc, 0xdd,</div><div class='add'>+	0xac, 0xe7, 0x46, 0x67, 0xff, 0xfe, 0x90, 0xea, 0xf2, 0xd9, 0x7f, 0x73,</div><div class='add'>+	0xe7, 0xce, 0xd9, 0xf9, 0x51, 0xfb, 0xa9, 0xe4, 0x1b, 0x99, 0x8f, 0x7e,</div><div class='add'>+	0xd1, 0xba, 0x09, 0x7f, 0x6f, 0x87, 0x7d, 0xe0, 0x7d, 0xd8, 0x67, 0xcf,</div><div class='add'>+	0x97, 0xe4, 0x45, 0x21, 0x3d, 0xf0, 0xc5, 0x45, 0x85, 0xe4, 0xcf, 0xf1,</div><div class='add'>+	0xcb, 0xdf, 0xd1, 0xe7, 0x8f, 0x46, 0x83, 0xd8, 0x2f, 0x6b, 0x85, 0x7a,</div><div class='add'>+	0x37, 0xf1, 0xd6, 0x25, 0x8e, 0x82, 0xd7, 0x1f, 0x8c, 0x00, 0xdf, 0x17,</div><div class='add'>+	0x2f, 0x41, 0x4f, 0xd1, 0x11, 0xea, 0x73, 0xfe, 0x32, 0x84, 0x35, 0x35,</div><div class='add'>+	0xca, 0x7c, 0x2d, 0x37, 0xe8, 0xff, 0x65, 0x59, 0x11, 0xe2, 0xff, 0xab,</div><div class='add'>+	0xf0, 0xbb, 0x03, 0x4f, 0xdd, 0xb6, 0x7c, 0x2f, 0xc4, 0x5b, 0xaa, 0x1f,</div><div class='add'>+	0x92, 0x97, 0x38, 0xce, 0xfc, 0xf5, 0xe7, 0xf2, 0x57, 0xc7, 0xa5, 0xdc,</div><div class='add'>+	0xc8, 0xcb, 0xd7, 0xb5, 0x4e, 0xbe, 0x7a, 0x99, 0xaf, 0xf7, 0xad, 0xfe,</div><div class='add'>+	0x36, 0x57, 0x2f, 0xfe, 0xae, 0xb8, 0xf4, 0xd8, 0xf8, 0x0b, 0xdc, 0x5c,</div><div class='add'>+	0xab, 0xee, 0x2f, 0x9b, 0x33, 0x77, 0x56, 0x0b, 0x7b, 0x3d, 0x3a, 0x24,</div><div class='add'>+	0xf3, 0xfd, 0x1f, 0xfe, 0xac, 0x5e, 0x92, 0x80, 0x14, 0x00, 0x00, 0x00 };</div><div class='ctx'> </div><div class='ctx'> static u8 bnx2_TPAT_b06FwText[] = {</div><div class='del'>-	0xbd, 0x59, 0x6f, 0x70, 0x5c, 0xd5, 0x7d, 0x3d, 0x6f, 0xf7, 0xed, 0xee,</div><div class='del'>-	0x93, 0xb4, 0x92, 0x9e, 0x90, 0x0c, 0xab, 0x56, 0x8d, 0xf6, 0x59, 0x6f,</div><div class='del'>-	0xa5, 0xc5, 0xab, 0xd8, 0x6f, 0x2d, 0xb9, 0xac, 0x87, 0x37, 0xcd, 0xb3,</div><div class='del'>-	0x2c, 0x29, 0x8b, 0xec, 0xd8, 0xeb, 0x42, 0x66, 0xe4, 0x09, 0x1d, 0x0b,</div><div class='del'>-	0x59, 0xd8, 0xc2, 0x18, 0xa2, 0x12, 0x3e, 0xa8, 0x13, 0x4f, 0xbd, 0xe8,</div><div class='del'>-	0x9f, 0x85, 0xbd, 0xd2, 0x23, 0x02, 0x2c, 0x3b, 0x93, 0x0e, 0x1e, 0xf9,</div><div class='del'>-	0x8f, 0x18, 0x58, 0x6b, 0xa1, 0xfd, 0x92, 0x69, 0xc3, 0x44, 0x13, 0x1b,</div><div class='del'>-	0xec, 0x90, 0x38, 0x4e, 0xa7, 0x5f, 0xcc, 0xb4, 0x9d, 0xaa, 0x80, 0x29,</div><div class='del'>-	0x50, 0x70, 0xdc, 0xce, 0xa4, 0x63, 0x0a, 0xf5, 0xed, 0xb9, 0x6f, 0x57,</div><div class='del'>-	0x46, 0x38, 0x4e, 0x3f, 0xd6, 0x33, 0x8b, 0x76, 0xef, 0x7b, 0xf7, 0xde,</div><div class='del'>-	0xdf, 0xbd, 0xbf, 0x73, 0xce, 0xef, 0xdc, 0xcb, 0x6a, 0x1f, 0xca, 0x51,</div><div class='del'>-	0xfa, 0x57, 0xc9, 0x4f, 0xfb, 0x23, 0x43, 0x4f, 0x6f, 0x58, 0x6b, 0xad,</div><div class='del'>-	0x95, 0xbf, 0x95, 0x00, 0x54, 0xfc, 0x3f, 0xfe, 0xf3, 0x03, 0xfa, 0x72,</div><div class='del'>-	0x1c, 0xf2, 0x03, 0xcd, 0x67, 0x2f, 0xae, 0xee, 0x30, 0xa1, 0xf9, 0xed,</div><div class='del'>-	0x87, 0x5a, 0x76, 0x9b, 0x80, 0x93, 0x4f, 0x44, 0x37, 0xe3, 0x7f, 0x44,</div><div class='del'>-	0xb6, 0x4e, 0x85, 0x6c, 0xff, 0x23, 0xfb, 0x8b, 0x75, 0x6f, 0xdc, 0x67,</div><div class='del'>-	0x5c, 0x3f, 0xe1, 0x87, 0xa6, 0xdb, 0x93, 0x9a, 0xde, 0x0c, 0xad, 0x81,</div><div class='del'>-	0x7d, 0x7e, 0xd4, 0xb2, 0x2b, 0x88, 0xaa, 0xe5, 0xb1, 0x80, 0x93, 0x39,</div><div class='del'>-	0xc3, 0xda, 0x83, 0x84, 0x7e, 0x8e, 0x0b, 0x72, 0x38, 0xc7, 0x99, 0x3c,</div><div class='del'>-	0x70, 0x28, 0xa7, 0xe0, 0x2a, 0xc7, 0x1c, 0xcf, 0x6b, 0x58, 0xf2, 0x7b,</div><div class='del'>-	0xd3, 0xf5, 0x95, 0xd9, 0xc8, 0x98, 0x53, 0x07, 0x45, 0xc8, 0x44, 0xf6,</div><div class='del'>-	0x0f, 0x6c, 0x33, 0x7e, 0x08, 0xe1, 0xd4, 0x5c, 0x3b, 0x32, 0xab, 0xcf,</div><div class='del'>-	0x6a, 0xd8, 0xe9, 0x36, 0xf4, 0x69, 0x36, 0xf8, 0x8e, 0x82, 0xd4, 0x7d,</div><div class='del'>-	0x1a, 0x7a, 0x0b, 0x71, 0x64, 0x0b, 0x59, 0x38, 0x85, 0x31, 0x7e, 0x34,</div><div class='del'>-	0x84, 0xa6, 0x34, 0x6d, 0xdd, 0xd4, 0xdd, 0xf2, 0x1d, 0x84, 0xa7, 0xae,</div><div class='del'>-	0x8b, 0x6b, 0x49, 0x1d, 0x6f, 0x6f, 0x14, 0xa2, 0xd2, 0x46, 0xb6, 0xa2,</div><div class='del'>-	0x3d, 0x0b, 0xbf, 0x6d, 0x58, 0x5b, 0xfc, 0x0a, 0x3a, 0xbf, 0x6e, 0xc6,</div><div class='del'>-	0xa7, 0x94, 0x07, 0x1f, 0xf4, 0xd9, 0xd0, 0x14, 0x3b, 0xaa, 0x35, 0xe5,</div><div class='del'>-	0x1b, 0x30, 0x51, 0xd0, 0x71, 0xa8, 0x50, 0x87, 0xb1, 0x02, 0x0e, 0xf8,</div><div class='del'>-	0x37, 0x04, 0x31, 0xa7, 0xc3, 0xf9, 0x4e, 0xcb, 0x01, 0xec, 0xcb, 0x0d,</div><div class='del'>-	0x63, 0x77, 0x2e, 0x85, 0xc3, 0x05, 0x19, 0x63, 0x14, 0xa3, 0x05, 0x15,</div><div class='del'>-	0xc1, 0x29, 0x23, 0xf2, 0x73, 0xdc, 0xe9, 0x99, 0x10, 0x63, 0x56, 0x08,</div><div class='del'>-	0x23, 0x56, 0x1c, 0xe3, 0xae, 0x8f, 0xeb, 0x0c, 0x61, 0xd4, 0xbc, 0x21,</div><div class='del'>-	0x06, 0x2c, 0xc3, 0x1a, 0x87, 0x68, 0x3c, 0x6f, 0x19, 0x91, 0x4e, 0x3f,</div><div class='del'>-	0x9c, 0xef, 0x9b, 0x11, 0x8c, 0x33, 0xf6, 0x31, 0xaf, 0xdf, 0x18, 0x3a,</div><div class='del'>-	0x6f, 0xf5, 0x73, 0xd8, 0x4f, 0xc7, 0xc4, 0x57, 0xfb, 0x46, 0xc7, 0x91,</div><div class='del'>-	0x88, 0x4c, 0xc0, 0x87, 0xbe, 0xba, 0x56, 0xf6, 0x6b, 0x8a, 0x4e, 0xc0,</div><div class='del'>-	0x88, 0x73, 0x9c, 0x6c, 0xb0, 0xdd, 0xe1, 0x18, 0x59, 0xf6, 0x37, 0xa2,</div><div class='del'>-	0x67, 0x20, 0xc7, 0x6a, 0xe0, 0xef, 0x76, 0xf6, 0x57, 0xe0, 0xb3, 0x63,</div><div class='del'>-	0xd1, 0x11, 0xf6, 0x39, 0x67, 0xa9, 0x78, 0x93, 0x9f, 0x3e, 0xdd, 0x90,</div><div class='del'>-	0x99, 0x55, 0x42, 0x6c, 0x3f, 0x04, 0x3e, 0x37, 0x2b, 0x70, 0x22, 0x63,</div><div class='del'>-	0x61, 0x84, 0xeb, 0xd6, 0xd8, 0x36, 0xc9, 0xb6, 0x80, 0x69, 0x71, 0x7c,</div><div class='del'>-	0xe8, 0x9d, 0x85, 0x95, 0x98, 0x58, 0xce, 0xcd, 0xef, 0x6b, 0xe7, 0x18,</div><div class='del'>-	0x6e, 0x31, 0xa7, 0xf2, 0x9d, 0xcd, 0xee, 0x4d, 0xf1, 0x88, 0xba, 0xf2,</div><div class='del'>-	0xf9, 0xb0, 0xd2, 0xc1, 0x36, 0x47, 0x6d, 0xc0, 0x21, 0x17, 0x5a, 0xd0,</div><div class='del'>-	0xd4, 0x38, 0x8f, 0x86, 0xf7, 0x72, 0xc3, 0x4a, 0x77, 0xc1, 0x51, 0xba,</div><div class='del'>-	0xe6, 0x3b, 0x14, 0x67, 0x5e, 0x55, 0x3a, 0x67, 0x65, 0xdc, 0x42, 0x3c,</div><div class='del'>-	0x6b, 0x29, 0x8c, 0xf9, 0x07, 0x32, 0x5e, 0x27, 0xaa, 0xdc, 0x14, 0x6b,</div><div class='del'>-	0x62, 0x3e, 0x54, 0x98, 0xdd, 0xca, 0x96, 0x79, 0x21, 0xd2, 0xc9, 0xb4,</div><div class='del'>-	0xd2, 0x33, 0x0f, 0x2d, 0x6c, 0xdb, 0x5a, 0x6e, 0xea, 0x30, 0xb2, 0xab,</div><div class='del'>-	0x4c, 0x1c, 0x77, 0xa3, 0xb8, 0x64, 0xf9, 0x70, 0x62, 0x55, 0x19, 0x54,</div><div class='del'>-	0x53, 0xe1, 0x07, 0xe1, 0xcb, 0x16, 0xd4, 0x2a, 0x7e, 0xbf, 0xb6, 0x43,</div><div class='del'>-	0xc5, 0x58, 0x7b, 0x8f, 0xd2, 0xc9, 0x3e, 0x01, 0xe6, 0xf9, 0x74, 0x2e,</div><div class='del'>-	0x8d, 0x30, 0xb1, 0x53, 0x61, 0xc7, 0x22, 0x79, 0xee, 0xcd, 0xdb, 0x56,</div><div class='del'>-	0x2c, 0xfe, 0xb8, 0xc4, 0x63, 0x8d, 0x11, 0x91, 0x7b, 0x53, 0x69, 0xc7,</div><div class='del'>-	0xe2, 0x67, 0xb9, 0x0f, 0x7e, 0x53, 0xc5, 0xaf, 0xac, 0x00, 0x16, 0x77,</div><div class='del'>-	0x58, 0xcc, 0xa9, 0x8e, 0x20, 0xdb, 0xcf, 0x78, 0xed, 0xf2, 0x37, 0xf4,</div><div class='del'>-	0xae, 0xaf, 0xec, 0x43, 0x71, 0x0f, 0x46, 0xdd, 0x26, 0xc6, 0x5c, 0xdc,</div><div class='del'>-	0x83, 0xed, 0x5c, 0xef, 0xbf, 0x06, 0xe4, 0xd7, 0xaf, 0xdd, 0x6a, 0xdb,</div><div class='del'>-	0xc9, 0x38, 0x7d, 0xb6, 0xb9, 0xb8, 0xda, 0x5f, 0x0f, 0xd4, 0xb6, 0xe3,</div><div class='del'>-	0x30, 0x73, 0xdc, 0x99, 0xbc, 0x1b, 0x59, 0xef, 0x79, 0x9d, 0xbe, 0x65,</div><div class='del'>-	0xb6, 0x16, 0x7d, 0xab, 0xbc, 0x7d, 0xd3, 0xb7, 0xcd, 0x0a, 0xf1, 0x66,</div><div class='del'>-	0x32, 0x88, 0xb3, 0xe6, 0x48, 0xa4, 0x12, 0x59, 0xcb, 0xcf, 0x7c, 0x5f,</div><div class='del'>-	0xe0, 0xfc, 0xf9, 0xa4, 0x1f, 0x27, 0x93, 0x27, 0x90, 0xad, 0x01, 0xe6,</div><div class='del'>-	0x72, 0x92, 0x57, 0xc6, 0xe2, 0x05, 0xfe, 0xd7, 0x57, 0x90, 0xeb, 0xb3,</div><div class='del'>-	0xb8, 0x3e, 0x05, 0x67, 0x4c, 0x89, 0x69, 0x4b, 0x6b, 0x26, 0xbf, 0xf6,</div><div class='del'>-	0x71, 0x3f, 0xeb, 0xdb, 0xc3, 0xc4, 0x27, 0xf0, 0x6e, 0x6e, 0x00, 0x3b,</div><div class='del'>-	0x8b, 0xb1, 0xe0, 0x46, 0x8e, 0xc2, 0xd2, 0x96, 0xc6, 0x89, 0xe2, 0x6f,</div><div class='del'>-	0x72, 0x3c, 0xad, 0x75, 0xe4, 0x8c, 0x4c, 0x1a, 0x89, 0x8b, 0x1d, 0x8a,</div><div class='del'>-	0xec, 0x9f, 0xd6, 0xd6, 0xe4, 0x83, 0x88, 0xd6, 0x16, 0x9f, 0x57, 0xd8,</div><div class='del'>-	0x5b, 0xb5, 0xc7, 0xa7, 0x14, 0xec, 0x8d, 0xc9, 0x67, 0x5b, 0xb5, 0x96,</div><div class='del'>-	0x3c, 0xb4, 0x4a, 0x7b, 0x48, 0x3b, 0x3b, 0x65, 0xf4, 0xbd, 0xac, 0x24,</div><div class='del'>-	0xa2, 0x53, 0x5e, 0x9f, 0x21, 0xad, 0x35, 0x1f, 0xe2, 0x7a, 0xe2, 0xcc,</div><div class='del'>-	0x09, 0xb4, 0x2a, 0xfb, 0x69, 0xed, 0x57, 0x7c, 0x70, 0xd1, 0xeb, 0xf3,</div><div class='del'>-	0xb4, 0x16, 0xcf, 0xcb, 0x76, 0xc3, 0x8a, 0x2a, 0x21, 0xdc, 0x9b, 0xd4,</div><div class='del'>-	0xb0, 0xa6, 0x45, 0x34, 0x76, 0x25, 0x8d, 0xc5, 0x2e, 0x7f, 0x04, 0xc7,</div><div class='del'>-	0xc9, 0x05, 0xe2, 0xce, 0xf9, 0xc3, 0x96, 0x31, 0x74, 0x15, 0xfc, 0x88,</div><div class='del'>-	0xd6, 0x38, 0x38, 0xe2, 0x86, 0xf0, 0x33, 0xe2, 0xbf, 0xdb, 0xd2, 0x31,</div><div class='del'>-	0xe6, 0x1a, 0xf1, 0x5f, 0x20, 0x91, 0x3a, 0xc5, 0x9c, 0x2d, 0x91, 0x03,</div><div class='del'>-	0x47, 0x0a, 0x4d, 0xf1, 0x53, 0x30, 0x06, 0xbb, 0xc8, 0x01, 0xad, 0x5d,</div><div class='del'>-	0xc6, 0x00, 0x5d, 0xb5, 0xc9, 0x9d, 0x42, 0x03, 0x72, 0xe4, 0x43, 0x97,</div><div class='del'>-	0xc7, 0xab, 0x61, 0xa5, 0xb3, 0xf0, 0x4b, 0x6a, 0x6b, 0x37, 0xf1, 0x85,</div><div class='del'>-	0xea, 0x88, 0x19, 0x44, 0xaa, 0x36, 0x8a, 0xf3, 0xc4, 0x4a, 0xb6, 0xae,</div><div class='del'>-	0x8c, 0xb9, 0x94, 0xf9, 0x7c, 0x87, 0xcf, 0x7b, 0x94, 0xcd, 0xf3, 0x51,</div><div class='del'>-	0xfc, 0xcc, 0xfa, 0x42, 0x38, 0x75, 0x95, 0x6c, 0x0b, 0xac, 0x68, 0xd7,</div><div class='del'>-	0x70, 0xf5, 0x85, 0x72, 0x7c, 0xfc, 0x42, 0x18, 0x9f, 0xbd, 0x40, 0x7e,</div><div class='del'>-	0xbb, 0x68, 0x2f, 0x87, 0x10, 0xa9, 0x36, 0x21, 0x0a, 0x56, 0x2b, 0xde,</div><div class='del'>-	0xab, 0x89, 0x45, 0xaf, 0x40, 0x6a, 0xa3, 0xa3, 0xed, 0xce, 0x19, 0x43,</div><div class='del'>-	0x83, 0x48, 0x38, 0xe7, 0xbc, 0xbd, 0x70, 0xb4, 0xb5, 0xf9, 0xf3, 0x02,</div><div class='del'>-	0x3b, 0x8a, 0x7b, 0x11, 0xb4, 0x3b, 0xb5, 0xb7, 0x98, 0x9b, 0xcb, 0x5e,</div><div class='del'>-	0x6e, 0x3a, 0xb5, 0x75, 0xf9, 0xfb, 0xfd, 0x28, 0x2f, 0x3e, 0x53, 0xed,</div><div class='del'>-	0x8c, 0x36, 0x96, 0x33, 0x7a, 0x27, 0xb9, 0xbe, 0x01, 0xaf, 0x6f, 0x46,</div><div class='del'>-	0x4b, 0x70, 0xef, 0x97, 0x4a, 0xb9, 0xa9, 0xb4, 0x1f, 0xe2, 0x3e, 0x33,</div><div class='del'>-	0xf7, 0xde, 0x3e, 0x3e, 0xc4, 0x3d, 0x96, 0xf3, 0x0d, 0xdf, 0x36, 0xdf,</div><div class='del'>-	0x30, 0xe7, 0x7b, 0x79, 0xc5, 0x7c, 0x07, 0x56, 0xcc, 0x77, 0x60, 0xc5,</div><div class='del'>-	0x7c, 0x29, 0x72, 0xf5, 0x1f, 0xc4, 0x48, 0x5d, 0x71, 0x6c, 0xd5, 0x1e,</div><div class='del'>-	0xbc, 0x6d, 0xee, 0x41, 0xce, 0x7d, 0x54, 0x2c, 0x65, 0x8a, 0xe3, 0x54,</div><div class='del'>-	0xda, 0xfb, 0x57, 0xcc, 0xbd, 0x9f, 0x73, 0x2f, 0x8f, 0xa3, 0x53, 0x8b,</div><div class='del'>-	0x84, 0xd8, 0x66, 0x09, 0xa1, 0xda, 0xa6, 0xde, 0x89, 0xe6, 0x4c, 0x27,</div><div class='del'>-	0xb1, 0x53, 0x8e, 0xc4, 0xa2, 0x0f, 0xe6, 0x70, 0xbd, 0x3f, 0x80, 0xa5,</div><div class='del'>-	0x9a, 0x65, 0x6e, 0x54, 0x96, 0xfe, 0xbe, 0xa4, 0x80, 0x5a, 0xff, 0x6a,</div><div class='del'>-	0xae, 0x9a, 0x63, 0xc4, 0xf4, 0x01, 0x45, 0x88, 0x73, 0x1b, 0x13, 0x83,</div><div class='del'>-	0x7e, 0x24, 0xfa, 0xaa, 0x60, 0x12, 0x43, 0x81, 0x12, 0x17, 0x56, 0xf6,</div><div class='del'>-	0x79, 0xd9, 0xeb, 0x53, 0xf0, 0xfa, 0x08, 0xf1, 0xee, 0x86, 0x0f, 0xc5,</div><div class='del'>-	0x1b, 0x2d, 0x75, 0xf8, 0x29, 0x39, 0xf9, 0x5a, 0x61, 0x59, 0x57, 0xa4,</div><div class='del'>-	0x6e, 0xc0, 0x77, 0xce, 0x0a, 0x32, 0xa6, 0x91, 0x7d, 0xc1, 0xaf, 0xf4,</div><div class='del'>-	0x27, 0x60, 0x4c, 0xd9, 0xe6, 0xc7, 0x2b, 0x49, 0x3c, 0x52, 0x0e, 0xa3,</div><div class='del'>-	0xf7, 0xb0, 0x92, 0x4d, 0x57, 0xc0, 0x70, 0xd6, 0x28, 0xd9, 0x94, 0x06,</div><div class='del'>-	0xc9, 0x1b, 0xb5, 0xe9, 0xb4, 0x69, 0x64, 0xaf, 0xf2, 0x65, 0x75, 0xfa,</div><div class='del'>-	0x4e, 0x31, 0xa8, 0x1c, 0x23, 0x8c, 0x27, 0xdd, 0x0b, 0x58, 0x0c, 0x34,</div><div class='del'>-	0x50, 0x9f, 0xa5, 0x76, 0x72, 0xe0, 0x05, 0x8d, 0x35, 0x2d, 0x44, 0x22,</div><div class='del'>-	0xaa, 0x38, 0xe8, 0xfa, 0xce, 0x37, 0x42, 0x20, 0xd8, 0x16, 0xc0, 0x3b,</div><div class='del'>-	0xe6, 0xa8, 0x55, 0x8f, 0x4d, 0xb8, 0xdc, 0xca, 0x3d, 0x58, 0xa5, 0x22,</div><div class='del'>-	0x32, 0xb7, 0x72, 0xac, 0x08, 0xc7, 0xfa, 0xb3, 0x10, 0xaa, 0xea, 0xa0,</div><div class='del'>-	0x36, 0xab, 0xd8, 0xeb, 0x6a, 0x4a, 0x97, 0x2b, 0xb1, 0x6b, 0x46, 0x4e,</div><div class='del'>-	0xe1, 0x14, 0xb5, 0x82, 0x35, 0xec, 0x8c, 0xaa, 0x6c, 0x99, 0x0d, 0xa1,</div><div class='del'>-	0x7c, 0xe6, 0x13, 0xf1, 0x18, 0xb5, 0x2f, 0xbd, 0x41, 0x08, 0x33, 0x19,</div><div class='del'>-	0x82, 0xc6, 0x79, 0x86, 0xc9, 0xe7, 0xea, 0xb6, 0x5a, 0x5c, 0xfb, 0x3a,</div><div class='del'>-	0xb5, 0xe9, 0xdb, 0x21, 0xf8, 0x67, 0x42, 0x08, 0xce, 0x28, 0x78, 0xa7,</div><div class='del'>-	0x3d, 0x84, 0xfa, 0x39, 0xf9, 0x5b, 0x41, 0xa3, 0x79, 0x14, 0x07, 0x75,</div><div class='del'>-	0x3f, 0x63, 0xfc, 0x2b, 0xf4, 0xeb, 0x0d, 0x98, 0xa4, 0x36, 0x3f, 0xea,</div><div class='del'>-	0x6a, 0xa8, 0x3a, 0x4a, 0x2d, 0xb0, 0x85, 0x38, 0x49, 0xfc, 0x1f, 0x64,</div><div class='del'>-	0x8c, 0x32, 0xde, 0x0b, 0x56, 0x36, 0x1a, 0x42, 0x00, 0xc1, 0x39, 0x23,</div><div class='del'>-	0x3d, 0xc9, 0xe8, 0x52, 0x53, 0xaa, 0xb2, 0x7d, 0x96, 0xb5, 0xd7, 0x36,</div><div class='del'>-	0x7b, 0xeb, 0xfd, 0x42, 0x7c, 0x9a, 0x6c, 0xea, 0x5b, 0xa0, 0x06, 0x8f,</div><div class='del'>-	0xc4, 0x62, 0x99, 0x7e, 0x05, 0x58, 0x73, 0x96, 0x76, 0x64, 0xe6, 0xbf,</div><div class='del'>-	0x44, 0x98, 0xe3, 0x1c, 0xd9, 0x20, 0x30, 0x6e, 0x65, 0x23, 0x01, 0x18,</div><div class='del'>-	0x37, 0x86, 0x50, 0x87, 0x0f, 0x9e, 0x17, 0x42, 0xb4, 0x57, 0xe3, 0x1d,</div><div class='del'>-	0xcb, 0x18, 0x34, 0xfd, 0x02, 0x3f, 0x4e, 0x66, 0x87, 0x22, 0x30, 0x86,</div><div class='del'>-	0x7f, 0xad, 0x44, 0xf1, 0xf1, 0x94, 0x91, 0xbe, 0xa8, 0x04, 0x51, 0x39,</div><div class='del'>-	0x67, 0xea, 0x5b, 0x94, 0x30, 0xca, 0x17, 0xc2, 0x58, 0x7d, 0x36, 0x88,</div><div class='del'>-	0xc0, 0x4c, 0x18, 0xc1, 0x69, 0xf3, 0xe2, 0x2e, 0x78, 0xe3, 0x2c, 0x0e,</div><div class='del'>-	0xa1, 0x19, 0xd5, 0xb3, 0x66, 0xf4, 0x5f, 0x20, 0xb1, 0x1d, 0x86, 0xba,</div><div class='del'>-	0x10, 0x45, 0x7d, 0xc1, 0x44, 0x35, 0xf3, 0x7d, 0xf9, 0xac, 0xcc, 0xb3,</div><div class='del'>-	0x8e, 0xb0, 0xe9, 0xe3, 0xda, 0x1c, 0x65, 0xab, 0x57, 0x37, 0x3a, 0xf9,</div><div class='del'>-	0xe9, 0x56, 0x3a, 0xe6, 0xe5, 0x9e, 0x29, 0x28, 0xe3, 0xb3, 0x8b, 0xd6,</div><div class='del'>-	0x4d, 0xb1, 0x2f, 0x26, 0xeb, 0x44, 0x19, 0x02, 0x76, 0x8f, 0xf2, 0xc0,</div><div class='del'>-	0x3c, 0x8b, 0x90, 0xa7, 0xef, 0x65, 0x4a, 0xc0, 0x2e, 0x6a, 0xfb, 0x25,</div><div class='del'>-	0x6a, 0xfb, 0x89, 0x92, 0xb6, 0x57, 0x51, 0xdb, 0x17, 0xfe, 0x4f, 0x6d,</div><div class='del'>-	0x67, 0xbd, 0x9f, 0xf1, 0xe1, 0xbc, 0x19, 0xc2, 0x71, 0xab, 0x69, 0xb1,</div><div class='del'>-	0x1e, 0x21, 0x54, 0xb7, 0xe9, 0xa8, 0x5e, 0xb0, 0xf0, 0x1c, 0xf7, 0x16,</div><div class='del'>-	0x77, 0x15, 0xf5, 0xfd, 0x9b, 0x52, 0xf3, 0x4b, 0x5e, 0xed, 0x71, 0x77,</div><div class='del'>-	0x59, 0x13, 0xc2, 0xd4, 0x2a, 0x55, 0xe9, 0xa1, 0x9e, 0x3f, 0x90, 0xbc,</div><div class='del'>-	0x29, 0xe2, 0x31, 0x23, 0x4e, 0xce, 0xde, 0x38, 0x89, 0xa2, 0x46, 0xc4,</div><div class='del'>-	0xa8, 0x97, 0x4b, 0xb5, 0x71, 0x1c, 0x73, 0x65, 0x4d, 0xeb, 0x64, 0x4d,</div><div class='del'>-	0x53, 0x30, 0x12, 0x2b, 0x6a, 0xc4, 0xea, 0xbc, 0x6c, 0xd7, 0x51, 0x4f,</div><div class='del'>-	0x9d, 0x5c, 0xd7, 0x16, 0xc1, 0x31, 0x6a, 0xa4, 0x4b, 0x9f, 0xb3, 0x9d,</div><div class='del'>-	0xe3, 0x6d, 0x9b, 0x35, 0xb2, 0xdb, 0x99, 0x9f, 0xf3, 0xc4, 0xc5, 0x14,</div><div class='del'>-	0xab, 0xc3, 0x89, 0x1a, 0x6a, 0x67, 0x73, 0x08, 0x13, 0xd4, 0xcb, 0xf3,</div><div class='del'>-	0xf4, 0x10, 0x2f, 0xb1, 0xdf, 0xb8, 0x6b, 0x44, 0x5f, 0x22, 0xaf, 0xc7,</div><div class='del'>-	0x4b, 0x9a, 0xf9, 0x12, 0x7d, 0xc3, 0x38, 0xf3, 0xf4, 0x53, 0x3e, 0x7b,</div><div class='del'>-	0xcd, 0x35, 0x1c, 0xe9, 0x1f, 0xfc, 0x9e, 0x7f, 0x30, 0xe2, 0x7e, 0x45,</div><div class='del'>-	0x7a, 0x88, 0x08, 0xde, 0x68, 0x91, 0x58, 0x24, 0xc6, 0x6f, 0xe9, 0xa7,</div><div class='del'>-	0xaa, 0x7c, 0x6b, 0xf6, 0xba, 0xc8, 0xc7, 0xca, 0x55, 0xc9, 0xbf, 0xb1,</div><div class='del'>-	0xa4, 0xc4, 0x93, 0x10, 0x65, 0x76, 0x98, 0x5e, 0xcb, 0x8c, 0x7f, 0x84,</div><div class='del'>-	0x18, 0x71, 0x1b, 0xe1, 0xb3, 0x30, 0xfc, 0x67, 0xb7, 0xa8, 0x9e, 0x8f,</div><div class='del'>-	0x5d, 0x90, 0x7e, 0x8b, 0x79, 0x9a, 0x32, 0x7b, 0xa7, 0x94, 0x58, 0x66,</div><div class='del'>-	0x40, 0x91, 0xcf, 0x75, 0x94, 0x9f, 0x5d, 0x22, 0x77, 0x23, 0xe4, 0x6e,</div><div class='del'>-	0x1d, 0x5e, 0xbf, 0x8d, 0xbf, 0xd4, 0x55, 0xdf, 0x00, 0xf9, 0x9b, 0xad,</div><div class='del'>-	0x1b, 0xe9, 0xf7, 0x7f, 0x85, 0x7b, 0x87, 0x24, 0x7f, 0xd9, 0xe6, 0xc7,</div><div class='del'>-	0xb3, 0x49, 0xec, 0x2c, 0x83, 0x91, 0x79, 0x4c, 0xc9, 0x3a, 0xe4, 0x71,</div><div class='del'>-	0xaa, 0x4c, 0xc9, 0xd2, 0x31, 0x7d, 0xc9, 0xdf, 0x37, 0xf9, 0xb6, 0x9f,</div><div class='del'>-	0xfc, 0xed, 0xab, 0xbb, 0x9d, 0xbf, 0x47, 0x38, 0x86, 0x8a, 0x27, 0xdc,</div><div class='del'>-	0xe3, 0x98, 0x0b, 0x04, 0x11, 0x99, 0x09, 0x20, 0x34, 0xa3, 0xa2, 0x92,</div><div class='del'>-	0x5c, 0x09, 0xdb, 0xd9, 0x78, 0x08, 0x46, 0xfa, 0x35, 0x44, 0x90, 0x98,</div><div class='del'>-	0xd2, 0xf0, 0xe7, 0x2d, 0x01, 0x9c, 0x89, 0x19, 0x99, 0xfd, 0x4a, 0x84,</div><div class='del'>-	0x58, 0x1f, 0x61, 0x44, 0x46, 0x34, 0xea, 0x2b, 0xf2, 0x35, 0xd0, 0x1c,</div><div class='del'>-	0x84, 0x36, 0x23, 0xb9, 0x2e, 0x0e, 0xfa, 0xec, 0x6c, 0x54, 0x23, 0x46,</div><div class='del'>-	0x7f, 0x40, 0x6c, 0x5c, 0x99, 0x12, 0x62, 0x73, 0xbb, 0x79, 0xf1, 0x3d,</div><div class='del'>-	0xbf, 0x41, 0xdd, 0x53, 0x89, 0xd3, 0xe2, 0xf8, 0x15, 0x33, 0x1a, 0x82,</div><div class='del'>-	0x47, 0xbd, 0xf1, 0x6f, 0xbc, 0xce, 0x28, 0x3e, 0x75, 0x55, 0x65, 0x2b,</div><div class='del'>-	0x71, 0x40, 0x6e, 0x45, 0xe6, 0xa9, 0x7d, 0x87, 0x93, 0x46, 0x7a, 0x8b,</div><div class='del'>-	0xd2, 0xe4, 0x34, 0xf3, 0xbb, 0x2f, 0x19, 0x8b, 0xf6, 0xf3, 0x9d, 0xf7,</div><div class='del'>-	0x0b, 0x45, 0x0e, 0xd7, 0x9b, 0xbb, 0xf1, 0x17, 0xe4, 0x70, 0x95, 0xf9,</div><div class='del'>-	0x14, 0x9e, 0xf4, 0xf4, 0x88, 0x38, 0x98, 0x2e, 0x27, 0xb7, 0x1d, 0x65,</div><div class='del'>-	0x17, 0x71, 0xbf, 0x73, 0x9e, 0xba, 0x32, 0xd3, 0xee, 0x69, 0x51, 0xc8,</div><div class='del'>-	0xec, 0x54, 0x7a, 0xe7, 0xbb, 0x3d, 0x0f, 0xb5, 0x7d, 0xd6, 0x87, 0xd7,</div><div class='del'>-	0xad, 0x4d, 0xf4, 0x2b, 0x69, 0x65, 0xfb, 0xbc, 0xc4, 0x7c, 0x8f, 0xf2,</div><div class='del'>-	0x4d, 0xe2, 0x3f, 0x7a, 0x97, 0x8a, 0x39, 0x6b, 0x93, 0x12, 0xf4, 0xf0,</div><div class='del'>-	0x1f, 0x80, 0x93, 0x29, 0x62, 0xdf, 0x6f, 0xc7, 0xac, 0x73, 0x2b, 0xb0,</div><div class='del'>-	0xdf, 0x7d, 0x07, 0x5f, 0x23, 0xf5, 0x03, 0x45, 0x2d, 0xd7, 0x3b, 0x99,</div><div class='del'>-	0xaf, 0x67, 0x4a, 0x18, 0x7f, 0x92, 0xed, 0x81, 0x19, 0x68, 0xe5, 0xc4,</div><div class='del'>-	0x71, 0xcf, 0x54, 0x18, 0xd3, 0x1e, 0x56, 0x04, 0x5e, 0x65, 0x4d, 0xc8,</div><div class='del'>-	0x27, 0x0d, 0x6b, 0xbf, 0x62, 0xa4, 0xbb, 0x95, 0x44, 0x76, 0x4d, 0xa9,</div><div class='del'>-	0x1e, 0xde, 0xcb, 0x9a, 0x86, 0xbb, 0xa8, 0x0b, 0x16, 0xb4, 0x10, 0xf1,</div><div class='del'>-	0xfd, 0x6f, 0xac, 0x4f, 0xff, 0x51, 0xaa, 0x87, 0xc9, 0x7c, 0x39, 0xaa,</div><div class='del'>-	0x5b, 0xa8, 0xef, 0xc4, 0x73, 0x97, 0xc4, 0x33, 0x3d, 0xc4, 0x18, 0xeb,</div><div class='del'>-	0xff, 0x4e, 0xe2, 0x79, 0x75, 0x9b, 0x91, 0xed, 0xa4, 0x77, 0xf6, 0xad,</div><div class='del'>-	0x8f, 0x10, 0xab, 0x71, 0xfa, 0xd5, 0x31, 0x74, 0x70, 0xae, 0xf4, 0xac,</div><div class='del'>-	0x11, 0xe9, 0x20, 0x07, 0x54, 0xf6, 0x79, 0x89, 0x7d, 0x96, 0x6a, 0xa5,</div><div class='del'>-	0xaf, 0x0e, 0xe1, 0x59, 0xf6, 0x31, 0x93, 0x8e, 0xa7, 0x15, 0x92, 0x03,</div><div class='del'>-	0x13, 0x48, 0x64, 0x24, 0x07, 0x9c, 0x55, 0xad, 0xf4, 0xf8, 0x92, 0x03,</div><div class='del'>-	0xc4, 0xa0, 0x4b, 0x0c, 0x16, 0x79, 0x30, 0x28, 0x79, 0x50, 0x45, 0x0f,</div><div class='del'>-	0xb1, 0x40, 0x0f, 0x51, 0x61, 0x47, 0xc9, 0x01, 0xc9, 0x89, 0xa2, 0x8f,</div><div class='del'>-	0xe8, 0x2c, 0xf1, 0x60, 0x8b, 0x37, 0x9f, 0x4a, 0xed, 0x0b, 0xa3, 0x69,</div><div class='del'>-	0xda, 0xd0, 0x55, 0xe5, 0x3f, 0xc5, 0x2e, 0xd3, 0x5c, 0xdc, 0x4b, 0x2f,</div><div class='del'>-	0xf0, 0x59, 0x5b, 0x8c, 0x79, 0x0f, 0x63, 0xdd, 0x42, 0x79, 0x40, 0xe2,</div><div class='del'>-	0xbc, 0x7e, 0x3a, 0x8c, 0xea, 0x69, 0xc9, 0x83, 0xec, 0x24, 0xf5, 0x6f,</div><div class='del'>-	0xc8, 0xf2, 0xfd, 0x13, 0xf1, 0x1f, 0x25, 0x2e, 0x54, 0xa5, 0x8b, 0x63,</div><div class='del'>-	0x54, 0xcd, 0xe8, 0x68, 0x9d, 0x36, 0x06, 0x17, 0x70, 0x4d, 0xbc, 0x1a,</div><div class='del'>-	0x33, 0x33, 0x87, 0x98, 0xff, 0x3d, 0xc9, 0x18, 0xf7, 0x4a, 0xc7, 0xbd,</div><div class='del'>-	0xb7, 0xc6, 0xf0, 0x38, 0xe1, 0xf4, 0x5b, 0xe1, 0x92, 0xaf, 0xd6, 0xd0,</div><div class='del'>-	0xef, 0x02, 0x7b, 0x5c, 0x1a, 0x5b, 0xd3, 0xb7, 0x36, 0x88, 0xeb, 0x38,</div><div class='del'>-	0x49, 0xf4, 0x0f, 0xe8, 0x0e, 0xf3, 0x1f, 0xc2, 0xde, 0xd2, 0x3b, 0x45,</div><div class='del'>-	0xbf, 0xfd, 0xe3, 0xd2, 0x79, 0xf2, 0x17, 0xfe, 0xe2, 0xdf, 0xbf, 0x55,</div><div class='del'>-	0x97, 0xcf, 0x97, 0xfd, 0xc4, 0xe0, 0x66, 0x62, 0xb0, 0x9b, 0x39, 0xda,</div><div class='del'>-	0x6b, 0x91, 0xdf, 0xcc, 0x67, 0x56, 0x0d, 0x51, 0x0f, 0x9b, 0xfa, 0x2a,</div><div class='del'>-	0xa9, 0x6b, 0x87, 0xa9, 0x51, 0x3f, 0x37, 0xcb, 0xe9, 0xb7, 0x1d, 0xfa,</div><div class='del'>-	0xed, 0x0e, 0x6a, 0x68, 0x27, 0xf5, 0x53, 0x62, 0x2b, 0x4d, 0x1c, 0x69,</div><div class='del'>-	0x4a, 0x9a, 0x1e, 0x36, 0x90, 0xa4, 0xd7, 0xae, 0x5b, 0xf6, 0xda, 0x32,</div><div class='del'>-	0x4e, 0xe9, 0xaf, 0x8d, 0xb8, 0x2c, 0xb5, 0x4f, 0x32, 0x0f, 0x8b, 0x35,</div><div class='del'>-	0x9b, 0xa0, 0xda, 0x9b, 0x14, 0xd5, 0x96, 0xe7, 0x09, 0x15, 0xdf, 0xa5,</div><div class='del'>-	0xd6, 0x2e, 0xed, 0x90, 0xe7, 0x0a, 0xae, 0x8b, 0x6d, 0x11, 0x33, 0x16,</div><div class='del'>-	0x3d, 0x4e, 0x5c, 0x1d, 0xfb, 0x9d, 0x73, 0x46, 0x11, 0x6f, 0xa3, 0xae,</div><div class='del'>-	0x7a, 0xcb, 0x33, 0x4b, 0x7d, 0xd8, 0x74, 0x0b, 0x6f, 0x1a, 0x9e, 0x68,</div><div class='del'>-	0x89, 0x12, 0x8f, 0x12, 0x6b, 0x1a, 0xf2, 0x2f, 0x96, 0xe3, 0xd5, 0x17,</div><div class='del'>-	0xc3, 0x78, 0xe5, 0x45, 0x21, 0xc6, 0x93, 0xe0, 0x69, 0x46, 0x6a, 0xec,</div><div class='del'>-	0x46, 0xbc, 0xac, 0xc7, 0xa2, 0xcf, 0x7a, 0x9e, 0xd5, 0xa1, 0x67, 0x35,</div><div class='del'>-	0x06, 0x2f, 0xe0, 0x26, 0xf5, 0x4b, 0x72, 0x3a, 0x41, 0xbe, 0x15, 0xb1,</div><div class='del'>-	0xe8, 0x79, 0xdb, 0x1a, 0x0d, 0x57, 0x88, 0xbf, 0x6a, 0xe2, 0xef, 0x37,</div><div class='del'>-	0xd4, 0xdd, 0x6b, 0x25, 0xdd, 0x5d, 0x9b, 0x27, 0x1f, 0xdb, 0x42, 0xe8,</div><div class='del'>-	0x96, 0x6b, 0x21, 0x0e, 0x47, 0x6f, 0xe1, 0x50, 0x88, 0x0f, 0xb8, 0xe7,</div><div class='del'>-	0x17, 0x2c, 0x23, 0xbe, 0x99, 0x78, 0x9c, 0xb3, 0x0c, 0xa7, 0x83, 0xde,</div><div class='del'>-	0x75, 0xd4, 0xc3, 0x24, 0xf5, 0x37, 0x26, 0x71, 0x49, 0x1c, 0x32, 0x27,</div><div class='del'>-	0x87, 0xd9, 0xe7, 0x3c, 0xfb, 0x4c, 0x94, 0xbc, 0xeb, 0xdb, 0x48, 0xa4,</div><div class='del'>-	0xa5, 0x77, 0x8d, 0x12, 0x83, 0x87, 0x3d, 0xef, 0x2a, 0xbd, 0xaa, 0xf4,</div><div class='del'>-	0xa9, 0x32, 0xce, 0x76, 0x2f, 0xce, 0xae, 0x5b, 0x38, 0xa4, 0x86, 0xd5,</div><div class='del'>-	0x48, 0xfc, 0x7d, 0x03, 0x13, 0xcf, 0x57, 0xa1, 0xda, 0xbc, 0x07, 0x97,</div><div class='del'>-	0x33, 0xdf, 0x50, 0x23, 0x26, 0xf4, 0x7a, 0xbb, 0x88, 0xc7, 0x9d, 0x85,</div><div class='del'>-	0x14, 0x5c, 0xf7, 0x2d, 0xe1, 0xd6, 0x19, 0xce, 0x05, 0xcf, 0x7f, 0x0e,</div><div class='del'>-	0xb2, 0xd6, 0xdc, 0x14, 0xbe, 0x98, 0x71, 0xb1, 0x9f, 0x1e, 0xac, 0xc9,</div><div class='del'>-	0x5f, 0xf4, 0x72, 0x1b, 0xf3, 0xbf, 0x14, 0xa8, 0x2d, 0xae, 0x53, 0xa5,</div><div class='del'>-	0x7f, 0x1b, 0x23, 0xe7, 0xc6, 0xcd, 0xa2, 0x97, 0x8b, 0xe5, 0xaf, 0x06,</div><div class='del'>-	0xa4, 0xa6, 0xfb, 0xda, 0xe4, 0xb8, 0x69, 0x6a, 0xc8, 0xf2, 0xd8, 0x5f,</div><div class='del'>-	0xea, 0xf2, 0x18, 0x31, 0x38, 0x2a, 0x7d, 0x15, 0x7d, 0x09, 0xcf, 0xe5,</div><div class='del'>-	0x2b, 0x34, 0x75, 0xd8, 0x0f, 0x53, 0xb6, 0x39, 0xca, 0x03, 0x5c, 0x83,</div><div class='del'>-	0x66, 0x0e, 0x2b, 0x69, 0x9e, 0x3b, 0x0f, 0x11, 0x5f, 0xdd, 0xac, 0xc3,</div><div class='del'>-	0x57, 0xad, 0x66, 0x72, 0x98, 0xf5, 0x89, 0xb5, 0xf8, 0xb0, 0xb9, 0x7c,</div><div class='del'>-	0x7e, 0x93, 0x35, 0x99, 0x35, 0xcc, 0xad, 0x64, 0xfd, 0xee, 0x61, 0xcd,</div><div class='del'>-	0xe6, 0x28, 0xcc, 0xe9, 0x67, 0x31, 0xd1, 0xb8, 0xb6, 0xcd, 0x18, 0xdc,</div><div class='del'>-	0xe6, 0x0f, 0x21, 0x47, 0xbc, 0x1f, 0x63, 0x1d, 0x72, 0xb9, 0xa7, 0xd3,</div><div class='del'>-	0x05, 0x23, 0x95, 0xc5, 0x18, 0xb6, 0x71, 0x4f, 0x79, 0xde, 0x71, 0xfe,</div><div class='del'>-	0x2e, 0x56, 0x3c, 0x0f, 0xef, 0x65, 0x7d, 0x9b, 0x2c, 0x71, 0xfb, 0x43,</div><div class='del'>-	0x24, 0x2c, 0xc9, 0xed, 0x45, 0xd6, 0xb7, 0x49, 0x8f, 0xdb, 0x46, 0x4a,</div><div class='del'>-	0xf2, 0xb9, 0xac, 0x54, 0xd7, 0x3e, 0x82, 0xe4, 0xf0, 0xed, 0x35, 0x4d,</div><div class='del'>-	0xe2, 0xd9, 0x0e, 0x4a, 0x1f, 0xeb, 0xba, 0xb2, 0x26, 0xc9, 0x5a, 0xb4,</div><div class='del'>-	0x5c, 0x97, 0x34, 0x79, 0x77, 0x90, 0x69, 0x9c, 0x3a, 0x28, 0x7c, 0xc5,</div><div class='del'>-	0xfb, 0x87, 0x8b, 0xef, 0xfa, 0xc3, 0xa9, 0xd4, 0x7d, 0xc8, 0x44, 0xce,</div><div class='del'>-	0x6a, 0xd8, 0xe1, 0x36, 0xf4, 0x85, 0x6c, 0xf0, 0x1d, 0x05, 0xd6, 0x1f,</div><div class='del'>-	0x6b, 0xc8, 0xdc, 0x76, 0xff, 0xf0, 0x41, 0x4e, 0xd3, 0xaa, 0xa7, 0xee,</div><div class='del'>-	0x96, 0xef, 0xe0, 0x93, 0xdc, 0x1d, 0xef, 0x1f, 0xd2, 0xbf, 0xef, 0xfe,</div><div class='del'>-	0xe1, 0x59, 0xf2, 0x63, 0xa2, 0x78, 0xff, 0xe0, 0x7c, 0xa7, 0xc5, 0x8f,</div><div class='del'>-	0xb9, 0x3a, 0x1c, 0x78, 0xaf, 0x5d, 0xc5, 0xd5, 0x9c, 0x11, 0x79, 0x19,</div><div class='del'>-	0x07, 0x30, 0xe0, 0xdd, 0x35, 0xf0, 0xcc, 0x6f, 0x0f, 0xe1, 0xd7, 0xed,</div><div class='del'>-	0xf2, 0xae, 0x21, 0x25, 0xd7, 0x38, 0xc9, 0xe5, 0x43, 0xa3, 0xde, 0x6c,</div><div class='del'>-	0x61, 0x2d, 0xd8, 0xb7, 0x51, 0xc1, 0x03, 0xc9, 0x7b, 0x3c, 0x6c, 0x4f,</div><div class='del'>-	0x16, 0x8c, 0x74, 0x94, 0xcf, 0xd6, 0x4d, 0xc9, 0x1a, 0xf9, 0x30, 0xcf,</div><div class='del'>-	0x86, 0xd0, 0x1a, 0xed, 0x5e, 0x4d, 0xb8, 0x4d, 0x91, 0x0f, 0x15, 0xc3,</div><div class='del'>-	0x39, 0x09, 0x79, 0x1f, 0x90, 0xb8, 0xe8, 0x57, 0x8c, 0xc5, 0x77, 0xfd,</div><div class='del'>-	0x46, 0xaa, 0xde, 0xc3, 0xcc, 0xc3, 0x3c, 0xa7, 0xc9, 0xbf, 0xbd, 0xf2,</div><div class='del'>-	0x8c, 0x87, 0x6d, 0x1c, 0xf3, 0xd2, 0x46, 0x79, 0xee, 0xfc, 0x54, 0x64,</div><div class='del'>-	0x57, 0x19, 0xce, 0x92, 0xa2, 0x31, 0x37, 0xa0, 0x3e, 0x49, 0x0d, 0x7f,</div><div class='del'>-	0x98, 0x1a, 0x2e, 0xcf, 0x08, 0xbd, 0x3c, 0x23, 0x34, 0x2d, 0xc6, 0xfd,</div><div class='del'>-	0x46, 0xe6, 0x06, 0xf5, 0x8e, 0x63, 0xf6, 0xf5, 0x2a, 0x46, 0xef, 0x02,</div><div class='del'>-	0xf5, 0x7f, 0xbf, 0x52, 0x1c, 0x73, 0x4d, 0x69, 0xcc, 0x7b, 0xf3, 0x9a,</div><div class='del'>-	0xb2, 0xd9, 0x05, 0x75, 0x07, 0xd1, 0x3d, 0x16, 0xb5, 0xa3, 0x50, 0x4e,</div><div class='del'>-	0x8e, 0x99, 0x72, 0xcd, 0x8c, 0xad, 0x95, 0xb1, 0x29, 0xf8, 0xb0, 0x45,</div><div class='del'>-	0xbe, 0xdb, 0x2a, 0xe3, 0x70, 0x2a, 0xec, 0x14, 0xb5, 0xf7, 0xb9, 0x60,</div><div class='del'>-	0x49, 0xbf, 0x7c, 0xfd, 0xd6, 0x2a, 0x38, 0x75, 0xa8, 0x0e, 0x98, 0xb5,</div><div class='del'>-	0x18, 0xd7, 0x51, 0x19, 0x36, 0x9b, 0x91, 0xd3, 0x83, 0xe8, 0xb7, 0x7e,</div><div class='del'>-	0x2b, 0xa8, 0x93, 0x7c, 0x1f, 0x78, 0xec, 0x79, 0x9e, 0xd7, 0xcd, 0xeb,</div><div class='del'>-	0x88, 0x25, 0x9f, 0xc6, 0x19, 0x7d, 0x08, 0xe5, 0xac, 0xa5, 0xaf, 0x78,</div><div class='del'>-	0x7a, 0x62, 0x13, 0xcf, 0x0a, 0x31, 0x64, 0xcb, 0x5a, 0x77, 0xdb, 0xd8,</div><div class='del'>-	0xf2, 0xfe, 0xe1, 0x7d, 0x91, 0x2d, 0x8e, 0xe1, 0xec, 0xb1, 0x32, 0x8c,</div><div class='del'>-	0xeb, 0x4b, 0xdd, 0xdd, 0x47, 0xdd, 0xa5, 0xb7, 0xfc, 0x5a, 0x39, 0x75,</div><div class='del'>-	0x77, 0xb7, 0xf5, 0x6d, 0x3c, 0x46, 0x8e, 0x57, 0x98, 0x9f, 0x88, 0xc7,</div><div class='del'>-	0xeb, 0xe4, 0x98, 0xd4, 0xd7, 0xaa, 0x95, 0xe3, 0xff, 0x33, 0xc7, 0x94,</div><div class='del'>-	0x73, 0xc8, 0x7a, 0x78, 0x59, 0x48, 0x6f, 0x56, 0x61, 0x0f, 0x2b, 0xdb,</div><div class='del'>-	0xc8, 0xa9, 0x45, 0x96, 0xde, 0xef, 0x92, 0x4f, 0x4b, 0xcc, 0x4f, 0xe3,</div><div class='del'>-	0x1d, 0xf8, 0xd4, 0x48, 0x3e, 0xed, 0x5a, 0xc1, 0xa7, 0xe3, 0xe4, 0x53,</div><div class='del'>-	0x2f, 0xf9, 0xd4, 0xd2, 0xf6, 0x27, 0xd4, 0x15, 0x21, 0x82, 0x6d, 0x37,</div><div class='del'>-	0xc5, 0x9b, 0x9e, 0xff, 0x95, 0x9e, 0x37, 0xad, 0x74, 0xcd, 0x4b, 0x7d,</div><div class='del'>-	0xaa, 0xa4, 0x27, 0xee, 0xa1, 0x1f, 0x06, 0x06, 0xc8, 0xa7, 0xc7, 0x4d,</div><div class='del'>-	0xd1, 0xb8, 0x2f, 0x69, 0xa4, 0x16, 0xe9, 0x6b, 0x7a, 0xc8, 0xa9, 0xb7,</div><div class='del'>-	0xc8, 0xa9, 0xb1, 0x42, 0x51, 0xa7, 0x0e, 0x73, 0xdd, 0xf7, 0x53, 0xa7,</div><div class='del'>-	0x7a, 0x0a, 0x52, 0xdb, 0x1c, 0xe2, 0x3f, 0x84, 0x4f, 0xc9, 0xa9, 0xf9,</div><div class='del'>-	0xa4, 0xa7, 0x53, 0xd6, 0x6f, 0x90, 0x18, 0x3a, 0x2f, 0xf9, 0x44, 0x9d,</div><div class='del'>-	0x72, 0x0b, 0x4d, 0xd6, 0x79, 0xae, 0x69, 0xd2, 0x35, 0x6e, 0x74, 0x93,</div><div class='del'>-	0x53, 0x81, 0x76, 0xe3, 0xe2, 0x55, 0x62, 0x37, 0x14, 0x83, 0x1e, 0xb1,</div><div class='del'>-	0xe5, 0x9a, 0x58, 0x63, 0x59, 0x27, 0x8f, 0x13, 0xff, 0xdd, 0xd4, 0x8c,</div><div class='del'>-	0xde, 0x82, 0x8d, 0x43, 0x85, 0x95, 0x7b, 0xca, 0x3a, 0x74, 0xc7, 0x7d,</div><div class='del'>-	0x19, 0x0d, 0xdd, 0xb9, 0x9d, 0xf5, 0xea, 0x8e, 0xed, 0x92, 0xaf, 0x7a,</div><div class='del'>-	0x48, 0xf2, 0x75, 0xd4, 0xfd, 0x61, 0xe0, 0xce, 0xef, 0xc8, 0xfb, 0x33,</div><div class='del'>-	0x21, 0x4e, 0x5b, 0xf2, 0xfe, 0x41, 0xfa, 0x1e, 0xfa, 0x68, 0x4b, 0xde,</div><div class='del'>-	0xa1, 0x75, 0x44, 0x55, 0x18, 0x91, 0x47, 0xf1, 0xb9, 0xc8, 0xd6, 0x39,</div><div class='del'>-	0xf1, 0x80, 0x57, 0x23, 0x0d, 0xbd, 0x8f, 0xb5, 0x6e, 0xb1, 0x74, 0xce,</div><div class='del'>-	0x9b, 0xcb, 0x09, 0xf1, 0x16, 0xeb, 0xd4, 0x69, 0x9e, 0xe9, 0x46, 0xf2,</div><div class='del'>-	0x9f, 0x8b, 0xc5, 0x3a, 0x15, 0x63, 0xe6, 0xad, 0xfb, 0x48, 0x4f, 0xc7,</div><div class='del'>-	0x4e, 0xf2, 0xd9, 0x44, 0x7e, 0xb9, 0x46, 0x51, 0x33, 0x4d, 0x21, 0x76,</div><div class='del'>-	0x9b, 0xff, 0x2d, 0xfa, 0xbf, 0xf2, 0xae, 0x10, 0xd3, 0x8c, 0xe1, 0x8a,</div><div class='del'>-	0x85, 0x03, 0x01, 0xc4, 0xfa, 0x6e, 0xb0, 0xae, 0x5f, 0xda, 0x68, 0x64,</div><div class='del'>-	0xf2, 0x4a, 0xa2, 0x77, 0xab, 0x22, 0xbd, 0x9e, 0xaf, 0xb3, 0x8c, 0xef,</div><div class='del'>-	0xb4, 0xd0, 0x1b, 0x7d, 0xc8, 0x0c, 0x06, 0xf9, 0xfd, 0x4d, 0xcb, 0xa0,</div><div class='del'>-	0x7f, 0x16, 0xa2, 0x3f, 0x25, 0xc7, 0x10, 0xa2, 0xc3, 0x92, 0xe7, 0x80,</div><div class='del'>-	0x31, 0x9e, 0x03, 0xb2, 0xa2, 0xc2, 0xbc, 0x42, 0x6d, 0x32, 0x32, 0x63,</div><div class='del'>-	0x8a, 0xc9, 0xbe, 0x51, 0x78, 0x3a, 0xcb, 0x67, 0xda, 0x54, 0x04, 0x7f,</div><div class='del'>-	0xed, 0xf9, 0xe7, 0x28, 0x35, 0xab, 0x01, 0x7f, 0xe3, 0xe9, 0x96, 0x8a,</div><div class='del'>-	0x3d, 0xcf, 0x1b, 0x29, 0x55, 0x39, 0x88, 0xf7, 0x2d, 0x43, 0xff, 0x21,</div><div class='del'>-	0xe3, 0xa6, 0xd6, 0x3c, 0xb7, 0x19, 0x51, 0x70, 0x8e, 0x6c, 0x9f, 0xbf,</div><div class='del'>-	0x46, 0xd1, 0x58, 0x3b, 0xbe, 0xdf, 0x22, 0x6b, 0xf7, 0x10, 0xba, 0x9b,</div><div class='del'>-	0xf7, 0xf3, 0xa3, 0xa2, 0x76, 0x46, 0x55, 0x76, 0xd0, 0x93, 0x54, 0xcf,</div><div class='del'>-	0x54, 0x63, 0xef, 0x7a, 0x21, 0xd6, 0xae, 0x77, 0xc0, 0x33, 0x5f, 0xfc,</div><div class='del'>-	0x02, 0x6b, 0xd0, 0x89, 0x1a, 0x23, 0x0d, 0xfc, 0x04, 0x3b, 0xe9, 0x65,</div><div class='del'>-	0x53, 0x6d, 0x39, 0xe0, 0x1e, 0xb9, 0xc6, 0x9f, 0x60, 0xb3, 0xf4, 0xc0,</div><div class='del'>-	0x56, 0xb5, 0xf4, 0x5b, 0x1e, 0x7e, 0x8b, 0x77, 0x48, 0x4c, 0xf5, 0xd1,</div><div class='del'>-	0xac, 0x28, 0x37, 0x8d, 0xbe, 0x79, 0xd6, 0xdb, 0x4b, 0xb1, 0xbb, 0xf5,</div><div class='del'>-	0x6f, 0xcd, 0x4b, 0x0f, 0x6c, 0x46, 0xb7, 0x28, 0x82, 0xb9, 0x78, 0x86,</div><div class='del'>-	0xb9, 0x88, 0x39, 0x61, 0x5a, 0x86, 0x6a, 0x3b, 0xe6, 0x54, 0x2b, 0xc3,</div><div class='del'>-	0xca, 0x83, 0xe4, 0x43, 0x5f, 0xb0, 0x9c, 0x1e, 0xc2, 0xa1, 0x7f, 0xf0,</div><div class='del'>-	0xa1, 0xf2, 0xa8, 0xf4, 0x14, 0x21, 0x6a, 0x4d, 0x53, 0x2f, 0x4f, 0x17,</div><div class='del'>-	0xd8, 0x97, 0x94, 0xfe, 0x83, 0x58, 0x3f, 0x7a, 0x53, 0x6c, 0xa6, 0xc7,</div><div class='del'>-	0xdd, 0x5c, 0xf2, 0xb8, 0xbb, 0x66, 0xd3, 0xf4, 0xc0, 0x9a, 0x22, 0xef,</div><div class='del'>-	0xd3, 0x52, 0x6d, 0x3c, 0x94, 0x3e, 0x28, 0x7d, 0x88, 0x5c, 0x83, 0x8e,</div><div class='del'>-	0x6b, 0x49, 0x89, 0x5d, 0x1d, 0xa3, 0xed, 0x46, 0x24, 0x0b, 0x79, 0x7f,</div><div class='del'>-	0x73, 0xbb, 0xbf, 0x80, 0x9e, 0xfe, 0x1d, 0xcf, 0x01, 0x7d, 0x07, 0x63,</div><div class='del'>-	0x31, 0x82, 0x42, 0xd4, 0x26, 0xfd, 0xe8, 0xf3, 0xce, 0x73, 0x11, 0x3d,</div><div class='del'>-	0x4d, 0xde, 0x5f, 0xa4, 0x4f, 0xf0, 0xf3, 0xdc, 0x7c, 0x90, 0x58, 0xfa,</div><div class='del'>-	0xac, 0x65, 0xe4, 0x58, 0x3d, 0xb2, 0x93, 0xb5, 0x30, 0xac, 0xfb, 0xa9,</div><div class='del'>-	0xab, 0x57, 0x72, 0x0f, 0xb2, 0x9e, 0xfb, 0xda, 0x23, 0x3c, 0x03, 0x34,</div><div class='del'>-	0xce, 0x64, 0x45, 0x3d, 0xfd, 0xe0, 0x37, 0x78, 0xee, 0xad, 0x69, 0x8b,</div><div class='del'>-	0xd3, 0x6f, 0x2f, 0xef, 0x95, 0x0f, 0x4f, 0x59, 0x26, 0x1c, 0xef, 0x77,</div><div class='del'>-	0x58, 0xef, 0x9a, 0xbd, 0x29, 0xe6, 0xcc, 0xbb, 0xf5, 0x8e, 0x62, 0x5c,</div><div class='del'>-	0x6a, 0x99, 0x6d, 0xa1, 0x65, 0x03, 0xcf, 0x8e, 0x77, 0x88, 0xa9, 0x47,</div><div class='del'>-	0x7a, 0x9f, 0x40, 0xb1, 0xdf, 0x9f, 0xce, 0x36, 0xe8, 0xdb, 0x59, 0xef,</div><div class='del'>-	0x16, 0x89, 0x95, 0x5d, 0xeb, 0x2d, 0x19, 0xcb, 0xa2, 0x8c, 0x85, 0xfe,</div><div class='del'>-	0xd2, 0xb9, 0xdf, 0x47, 0x5f, 0x92, 0x04, 0xaa, 0xcf, 0x3e, 0x45, 0x5e,</div><div class='del'>-	0xf9, 0x5a, 0xab, 0x91, 0x1d, 0x62, 0x8c, 0xc7, 0xfe, 0x91, 0x5b, 0x33,</div><div class='del'>-	0x30, 0x8d, 0x01, 0x1f, 0xfb, 0x4c, 0x59, 0xc0, 0x13, 0x0b, 0x3c, 0x97,</div><div class='del'>-	0x4e, 0xc7, 0xe8, 0xcb, 0xe9, 0x23, 0x17, 0x34, 0x3c, 0x3a, 0x5b, 0x8e,</div><div class='del'>-	0xef, 0xcd, 0x86, 0xb1, 0x6f, 0xd6, 0xbb, 0xd7, 0xda, 0x5a, 0xcb, 0xf7,</div><div class='del'>-	0x3a, 0x92, 0x42, 0xcc, 0x5b, 0xeb, 0xf1, 0x1e, 0x3d, 0xd4, 0x6a, 0xc5,</div><div class='del'>-	0x87, 0xc8, 0x51, 0xe8, 0x3a, 0x71, 0x53, 0xd3, 0xf2, 0x3d, 0x26, 0x58,</div><div class='del'>-	0x08, 0x73, 0xbd, 0xd4, 0xc9, 0x67, 0xbc, 0xef, 0x63, 0xf4, 0x8f, 0x19,</div><div class='del'>-	0x89, 0x41, 0x97, 0x18, 0x74, 0x89, 0xc9, 0x5b, 0x9e, 0x5a, 0x62, 0x39,</div><div class='del'>-	0x4e, 0x1f, 0xfd, 0xb4, 0x28, 0x62, 0xe3, 0x0b, 0x71, 0xda, 0x7c, 0x95,</div><div class='del'>-	0xfc, 0x55, 0xa9, 0xa1, 0xc0, 0xdf, 0xe7, 0x22, 0xfa, 0x8e, 0x82, 0xcc,</div><div class='del'>-	0xff, 0x5f, 0x96, 0xf2, 0xbf, 0x18, 0x2a, 0xea, 0x85, 0xe1, 0xcc, 0xa3,</div><div class='del'>-	0x01, 0xd3, 0x6e, 0x83, 0xbe, 0xd5, 0x1d, 0x19, 0xd6, 0x90, 0x8d, 0x56,</div><div class='del'>-	0xc3, 0x18, 0x9c, 0x86, 0xaf, 0x35, 0x0c, 0xb9, 0x76, 0x20, 0xef, 0xad,</div><div class='del'>-	0x51, 0x88, 0x09, 0xea, 0x9b, 0xcc, 0xc1, 0xbf, 0xe7, 0xd0, 0xea, 0x63,</div><div class='del'>-	0x3e, 0x1c, 0xc6, 0xbe, 0x8f, 0x7b, 0xf0, 0x71, 0x5e, 0xde, 0x73, 0xc6,</div><div class='del'>-	0xd2, 0x5d, 0xb8, 0xee, 0x8d, 0xf9, 0x51, 0x3e, 0x85, 0x23, 0xee, 0x25,</div><div class='del'>-	0x71, 0xa4, 0xae, 0xa8, 0xf1, 0x69, 0x9e, 0x8f, 0xaa, 0x8f, 0x96, 0xbc,</div><div class='del'>-	0x10, 0x39, 0x5c, 0xc9, 0xf5, 0x5e, 0x4b, 0x7a, 0xde, 0x9f, 0x35, 0x72,</div><div class='del'>-	0x50, 0x3b, 0x6d, 0x6e, 0xe4, 0xda, 0x6e, 0x8a, 0x89, 0x58, 0xb3, 0x56,</div><div class='del'>-	0x8c, 0x29, 0xa1, 0x9f, 0x42, 0x19, 0xb1, 0x2b, 0xcf, 0x48, 0x52, 0x3f,</div><div class='del'>-	0xe4, 0x6f, 0x9e, 0x4f, 0x54, 0x27, 0xe2, 0xe7, 0xba, 0x9c, 0x87, 0x64,</div><div class='del'>-	0x5b, 0xa8, 0xe4, 0x57, 0x97, 0xbd, 0x48, 0x07, 0x9f, 0x49, 0x2f, 0xf2,</div><div class='del'>-	0xb9, 0xe8, 0xab, 0xeb, 0xb8, 0xa5, 0x39, 0x59, 0xbe, 0x31, 0xee, 0xca,</div><div class='del'>-	0xfb, 0xab, 0x16, 0x3a, 0x62, 0x05, 0xe7, 0x18, 0xf9, 0xa9, 0xd6, 0x98,</div><div class='del'>-	0x3e, 0xca, 0xf1, 0x1c, 0x5d, 0x27, 0x97, 0x0f, 0xd2, 0x2f, 0xf3, 0x9d,</div><div class='del'>-	0x42, 0x0b, 0xfb, 0x48, 0x2d, 0xdb, 0xc1, 0xb5, 0xfe, 0xb6, 0x59, 0x62,</div><div class='del'>-	0x7b, 0xd4, 0x7d, 0xc3, 0xa7, 0x9a, 0x72, 0x9d, 0x89, 0xd4, 0x28, 0xe3,</div><div class='del'>-	0x59, 0xd2, 0xa5, 0xb7, 0x76, 0xa8, 0x6d, 0x09, 0xaf, 0x7f, 0x56, 0x95,</div><div class='del'>-	0x71, 0x78, 0xf1, 0xb0, 0x4d, 0x6a, 0x96, 0x91, 0x39, 0x87, 0x84, 0x33,</div><div class='del'>-	0x20, 0xcd, 0xc1, 0x2a, 0x19, 0x43, 0x53, 0x64, 0x80, 0xf1, 0x9c, 0xa8,</div><div class='del'>-	0xf3, 0xf4, 0x90, 0xcf, 0x38, 0x9f, 0xeb, 0xdb, 0x5a, 0x0e, 0x81, 0xd5,</div><div class='del'>-	0x49, 0xef, 0xdc, 0x5f, 0xfa, 0x7f, 0x18, 0x2a, 0x7d, 0x88, 0xc4, 0xe2,</div><div class='del'>-	0xff, 0x02, 0xc7, 0x2a, 0x26, 0xcf, 0x94, 0x1a, 0x00, 0x00, 0x00 };</div><div class='add'>+	0xbd, 0x59, 0x6d, 0x70, 0x5b, 0x55, 0x7a, 0x7e, 0xae, 0x74, 0x25, 0x5d,</div><div class='add'>+	0xdb, 0xb2, 0x75, 0x8d, 0x95, 0x20, 0xb7, 0x2e, 0xd6, 0x8d, 0xaf, 0x6c,</div><div class='add'>+	0x11, 0xb9, 0xe1, 0x2a, 0x36, 0x45, 0x19, 0xee, 0x94, 0x1b, 0x7f, 0x21,</div><div class='add'>+	0x92, 0x10, 0x94, 0x42, 0x5b, 0x67, 0x96, 0x19, 0x4c, 0xe2, 0x4d, 0x4c,</div><div class='add'>+	0x08, 0x6c, 0xba, 0xcb, 0x4c, 0xdd, 0xd9, 0x4c, 0x23, 0xfc, 0x15, 0x93,</div><div class='add'>+	0xc8, 0x16, 0x6b, 0x20, 0x26, 0x3b, 0x3b, 0x43, 0xc6, 0xf9, 0x70, 0x0a,</div><div class='add'>+	0x72, 0x14, 0xda, 0x3f, 0x3b, 0xd3, 0x65, 0xf0, 0x6c, 0x12, 0x12, 0x58,</div><div class='add'>+	0xd8, 0xb4, 0xd3, 0x3f, 0xc9, 0xf4, 0xc7, 0x7a, 0x21, 0xa1, 0x81, 0x42,</div><div class='add'>+	0x36, 0xed, 0x0c, 0x9d, 0x50, 0x68, 0x4e, 0x9f, 0x73, 0x25, 0x07, 0x13,</div><div class='add'>+	0xb2, 0xfd, 0xd9, 0xcc, 0x08, 0x4b, 0xe7, 0xde, 0x73, 0xce, 0x7b, 0xce,</div><div class='add'>+	0xfb, 0x3c, 0xcf, 0xfb, 0x9c, 0xc3, 0x0a, 0x05, 0x95, 0x28, 0xff, 0xab,</div><div class='add'>+	0xe6, 0xa7, 0xfd, 0xc9, 0x5d, 0xcf, 0xad, 0x5e, 0xd5, 0xbe, 0x8a, 0x5f,</div><div class='add'>+	0x57, 0x2b, 0xcb, 0x55, 0x15, 0xff, 0x8f, 0xff, 0xbc, 0x80, 0xbe, 0x18,</div><div class='add'>+	0x87, 0xfc, 0x40, 0xf3, 0xd8, 0xf3, 0x77, 0x75, 0x98, 0xd0, 0xbc, 0xf6,</div><div class='add'>+	0x63, 0x4d, 0x5b, 0x4d, 0xc0, 0x29, 0x24, 0xa2, 0x9d, 0xf8, 0x1f, 0x91,</div><div class='add'>+	0x0d, 0xab, 0x90, 0xed, 0x7f, 0x64, 0x7f, 0x7d, 0xcf, 0x5b, 0xf7, 0x19,</div><div class='add'>+	0xd7, 0x0e, 0x79, 0xa1, 0xe9, 0xf6, 0xb8, 0xaa, 0x37, 0x43, 0x6b, 0x60,</div><div class='add'>+	0x9f, 0x9f, 0xb5, 0xf4, 0xfb, 0x50, 0xb3, 0x38, 0x16, 0x70, 0x38, 0x67,</div><div class='add'>+	0x58, 0xdb, 0x90, 0xd0, 0x4f, 0x41, 0x85, 0xc3, 0x39, 0x8e, 0x15, 0x80,</div><div class='add'>+	0xbd, 0x39, 0x05, 0x97, 0x39, 0xe6, 0x68, 0x41, 0xc3, 0x82, 0xd7, 0x9d,</div><div class='add'>+	0xae, 0xaf, 0xc2, 0x46, 0xc6, 0x9c, 0xd8, 0x23, 0x02, 0x26, 0xb2, 0x7f,</div><div class='add'>+	0x60, 0x9b, 0xf1, 0xbd, 0x08, 0xa6, 0x66, 0xda, 0x91, 0x59, 0x31, 0xa7,</div><div class='add'>+	0x61, 0x73, 0xbe, 0xa1, 0x4f, 0xb3, 0xc1, 0x77, 0x14, 0xa4, 0xee, 0xd3,</div><div class='add'>+	0xd0, 0x5b, 0x8c, 0x23, 0x5b, 0xcc, 0xc2, 0x29, 0x8e, 0xf0, 0xa3, 0x21,</div><div class='add'>+	0x30, 0xa1, 0x69, 0xf7, 0x4c, 0x2c, 0x97, 0xef, 0x20, 0x38, 0x71, 0x4d,</div><div class='add'>+	0x5c, 0x4d, 0xea, 0x78, 0x6f, 0x8d, 0x10, 0xd5, 0x36, 0xb2, 0x55, 0xed,</div><div class='add'>+	0x59, 0x78, 0x6d, 0xc3, 0x5a, 0xef, 0x55, 0xd0, 0xf5, 0xc7, 0x66, 0x7c,</div><div class='add'>+	0x42, 0x79, 0xf4, 0x51, 0x8f, 0x0d, 0x4d, 0xb1, 0xa3, 0x6a, 0x53, 0xa1,</div><div class='add'>+	0x01, 0x63, 0x45, 0x1d, 0x7b, 0x8b, 0x61, 0x8c, 0x14, 0xb1, 0xdb, 0x7b,</div><div class='add'>+	0xaf, 0x1f, 0x33, 0x3a, 0x9c, 0xef, 0xb5, 0xec, 0xc6, 0x8e, 0xdc, 0x20,</div><div class='add'>+	0xb6, 0xe6, 0x52, 0xd8, 0x57, 0x94, 0x31, 0x46, 0x31, 0x5c, 0x54, 0xe1,</div><div class='add'>+	0x9f, 0x30, 0x22, 0xef, 0xe2, 0x76, 0xcf, 0x84, 0x18, 0xb1, 0x02, 0x18,</div><div class='add'>+	0xb2, 0xe2, 0x18, 0xcd, 0x7b, 0xb8, 0xce, 0x00, 0x86, 0xcd, 0xeb, 0xa2,</div><div class='add'>+	0xdf, 0x32, 0xac, 0x51, 0x88, 0xc6, 0xd3, 0x96, 0x11, 0xe9, 0xf2, 0xc2,</div><div class='add'>+	0xf9, 0xb1, 0x19, 0xc1, 0x28, 0x63, 0x1f, 0x71, 0xfb, 0x8d, 0xa0, 0xeb,</div><div class='add'>+	0x66, 0x3f, 0x87, 0xfd, 0x74, 0x8c, 0x7d, 0xbb, 0x6f, 0x74, 0x14, 0x89,</div><div class='add'>+	0xc8, 0x18, 0x3c, 0xe8, 0x0b, 0xb7, 0xb2, 0x5f, 0x53, 0x74, 0x0c, 0x46,</div><div class='add'>+	0x9c, 0xe3, 0x64, 0xfd, 0xed, 0x0e, 0xc7, 0xc8, 0xb2, 0xbf, 0x11, 0x3d,</div><div class='add'>+	0x06, 0x39, 0x56, 0x03, 0x7f, 0xb7, 0xb3, 0xbf, 0x02, 0x8f, 0x1d, 0x8b,</div><div class='add'>+	0x0e, 0xb1, 0xcf, 0x29, 0x4b, 0xc5, 0x19, 0x7e, 0xfa, 0x74, 0x43, 0x66,</div><div class='add'>+	0x56, 0x09, 0xb0, 0x7d, 0x2f, 0xf8, 0xdc, 0xac, 0xc2, 0xa1, 0x8c, 0x85,</div><div class='add'>+	0x21, 0xae, 0x5b, 0x63, 0xdb, 0x38, 0xdb, 0x7c, 0xa6, 0xc5, 0xf1, 0xa1,</div><div class='add'>+	0x77, 0x15, 0x97, 0x62, 0x62, 0x31, 0x37, 0xbf, 0xaf, 0x9d, 0x63, 0xe4,</div><div class='add'>+	0x4b, 0x39, 0x95, 0xef, 0x74, 0xe6, 0x6f, 0x88, 0x27, 0xd5, 0xa5, 0xcf,</div><div class='add'>+	0x07, 0x95, 0x0e, 0xb6, 0x39, 0x6a, 0x03, 0xf6, 0xe6, 0xa1, 0xf9, 0x4d,</div><div class='add'>+	0x8d, 0xf3, 0x68, 0xf8, 0x28, 0x37, 0xa8, 0xf4, 0x14, 0x1d, 0xa5, 0x7b,</div><div class='add'>+	0xb6, 0x43, 0x71, 0x66, 0x55, 0xa5, 0x6b, 0x5a, 0xc6, 0x2d, 0xc4, 0x0b,</div><div class='add'>+	0x96, 0xc2, 0x98, 0x7f, 0x22, 0xe3, 0x75, 0xa2, 0xca, 0x0d, 0xb1, 0x32,</div><div class='add'>+	0xe6, 0x41, 0x95, 0xd9, 0xa3, 0xac, 0x9f, 0x15, 0x22, 0x9d, 0x4c, 0x2b,</div><div class='add'>+	0xeb, 0x66, 0xa1, 0x05, 0x6d, 0x5b, 0xcd, 0x4d, 0xec, 0x43, 0x76, 0x99,</div><div class='add'>+	0x89, 0x83, 0xf9, 0x28, 0x3e, 0xb0, 0x3c, 0x38, 0xb4, 0xac, 0x02, 0xaa,</div><div class='add'>+	0xa9, 0xf0, 0x83, 0xe0, 0x79, 0x0b, 0x6a, 0x0d, 0xbf, 0x5f, 0xdd, 0xa4,</div><div class='add'>+	0x62, 0xa4, 0x7d, 0x9d, 0xd2, 0xc5, 0x3e, 0x3e, 0xe6, 0xf9, 0x68, 0x2e,</div><div class='add'>+	0x8d, 0x20, 0xb1, 0x53, 0x65, 0xc7, 0x22, 0x05, 0xee, 0xcd, 0x7b, 0x56,</div><div class='add'>+	0x2c, 0xfe, 0xb4, 0xc4, 0x63, 0xad, 0x11, 0x91, 0x7b, 0x53, 0x6d, 0xc7,</div><div class='add'>+	0xe2, 0x73, 0xdc, 0x07, 0xaf, 0xa9, 0xe2, 0xd7, 0x96, 0x0f, 0xf3, 0x9b,</div><div class='add'>+	0x2c, 0xe6, 0x54, 0x87, 0x9f, 0xed, 0xc7, 0xdc, 0x76, 0xf9, 0x1b, 0x7a,</div><div class='add'>+	0xf7, 0xb7, 0xf6, 0xa1, 0xb4, 0x07, 0xc3, 0xf9, 0x26, 0xc6, 0x5c, 0xda,</div><div class='add'>+	0x83, 0x47, 0xb8, 0xde, 0xdf, 0xfa, 0xe4, 0xd7, 0xbb, 0x6e, 0xb6, 0x6d,</div><div class='add'>+	0x66, 0x9c, 0x1e, 0xdb, 0x9c, 0x5f, 0xe1, 0xad, 0x07, 0xea, 0xda, 0xb1,</div><div class='add'>+	0x8f, 0x39, 0xee, 0x4a, 0x2e, 0x47, 0xd6, 0x7d, 0x1e, 0xd6, 0xd7, 0x4f,</div><div class='add'>+	0xd7, 0xa1, 0x6f, 0x99, 0xbb, 0x6f, 0xfa, 0xc6, 0x69, 0x21, 0xce, 0x24,</div><div class='add'>+	0xfd, 0x98, 0x33, 0x87, 0x22, 0xd5, 0xc8, 0x5a, 0x5e, 0xe6, 0xfb, 0x2c,</div><div class='add'>+	0xe7, 0x2f, 0x24, 0xbd, 0x38, 0x9c, 0x3c, 0x84, 0x6c, 0x2d, 0x30, 0x93,</div><div class='add'>+	0x93, 0xbc, 0x32, 0xe6, 0xcf, 0xf2, 0xbf, 0x9e, 0xa2, 0x5c, 0x9f, 0xc5,</div><div class='add'>+	0xf5, 0x29, 0x38, 0x66, 0x4a, 0x4c, 0x5b, 0x6a, 0x33, 0xf9, 0xb5, 0x83,</div><div class='add'>+	0xfb, 0x59, 0xdf, 0x1e, 0x24, 0x3e, 0x81, 0x0f, 0x73, 0xfd, 0xd8, 0x5c,</div><div class='add'>+	0x8a, 0x05, 0xd7, 0x73, 0x50, 0x7c, 0x6d, 0x69, 0x1c, 0x2a, 0xfd, 0x26,</div><div class='add'>+	0xc7, 0xd3, 0x6a, 0x47, 0xce, 0xc8, 0xa4, 0x91, 0x38, 0xd7, 0xa1, 0xc8,</div><div class='add'>+	0xfe, 0x69, 0x75, 0x65, 0xc1, 0x8f, 0x68, 0x5d, 0xe9, 0x79, 0x95, 0xbd,</div><div class='add'>+	0x41, 0x7d, 0x7a, 0x42, 0xc1, 0xf6, 0x98, 0x7c, 0xb6, 0x41, 0x6d, 0x29,</div><div class='add'>+	0x40, 0xab, 0xb6, 0x77, 0xa9, 0x73, 0x13, 0x46, 0xdf, 0x71, 0x25, 0x11,</div><div class='add'>+	0x9d, 0x70, 0xfb, 0xec, 0x52, 0x5b, 0x0b, 0x01, 0xae, 0x27, 0xce, 0x9c,</div><div class='add'>+	0x40, 0xab, 0xb1, 0x9f, 0x53, 0x7f, 0xcd, 0x07, 0xe7, 0xdc, 0x3e, 0xcf,</div><div class='add'>+	0xa9, 0xf1, 0x82, 0x6c, 0x37, 0xac, 0xa8, 0x12, 0xc0, 0xdd, 0x49, 0x0d,</div><div class='add'>+	0x2b, 0x5b, 0x44, 0x63, 0x77, 0xd2, 0x98, 0xef, 0xf6, 0x46, 0x70, 0x90,</div><div class='add'>+	0x5c, 0x20, 0xee, 0x9c, 0x3f, 0x6c, 0x19, 0x41, 0x77, 0xd1, 0x8b, 0x68,</div><div class='add'>+	0xad, 0x83, 0xfd, 0xf9, 0x00, 0x7e, 0x49, 0xfc, 0xf7, 0x58, 0x3a, 0x46,</div><div class='add'>+	0xf2, 0x46, 0xfc, 0x57, 0x48, 0xa4, 0x8e, 0x30, 0x67, 0x0b, 0xe4, 0xc0,</div><div class='add'>+	0xfe, 0x62, 0x53, 0xfc, 0x08, 0x8c, 0x81, 0x6e, 0x72, 0x40, 0x6b, 0x97,</div><div class='add'>+	0x31, 0x40, 0x57, 0x6d, 0x72, 0xa7, 0xd8, 0x80, 0x1c, 0xf9, 0xd0, 0xed,</div><div class='add'>+	0xf2, 0x6a, 0x50, 0xe9, 0x2a, 0xbe, 0x4f, 0x6d, 0xed, 0x21, 0xbe, 0x10,</div><div class='add'>+	0x8a, 0x98, 0x7e, 0xa4, 0xea, 0xa2, 0x38, 0x4d, 0xac, 0x64, 0xc3, 0x15,</div><div class='add'>+	0xcc, 0xa5, 0xcc, 0xe7, 0x45, 0x3e, 0x5f, 0xa7, 0x74, 0xce, 0x46, 0xf1,</div><div class='add'>+	0x4b, 0xeb, 0x6b, 0xe1, 0x84, 0xab, 0xd9, 0xe6, 0x5b, 0xd2, 0xae, 0xe1,</div><div class='add'>+	0xf2, 0xcb, 0x95, 0xf8, 0xf4, 0xe5, 0x20, 0xbe, 0x7c, 0x99, 0xfc, 0xce,</div><div class='add'>+	0xa3, 0xbd, 0x12, 0x42, 0xa4, 0xda, 0x84, 0x28, 0x5a, 0xad, 0xf8, 0xa8,</div><div class='add'>+	0x36, 0x16, 0xbd, 0x00, 0xa9, 0x8d, 0x8e, 0xba, 0x35, 0x67, 0xec, 0x1a,</div><div class='add'>+	0x40, 0xc2, 0x39, 0xe5, 0xee, 0x85, 0xa3, 0xae, 0x2a, 0x9c, 0x16, 0xd8,</div><div class='add'>+	0x54, 0xda, 0x0b, 0xbf, 0xdd, 0xa5, 0xbe, 0xc3, 0xdc, 0x9c, 0x77, 0x73,</div><div class='add'>+	0xd3, 0xa5, 0xde, 0x53, 0xb8, 0xdf, 0x83, 0xca, 0xd2, 0x33, 0xd5, 0xce,</div><div class='add'>+	0xa8, 0x23, 0x39, 0xa3, 0x77, 0x9c, 0xeb, 0xeb, 0x77, 0xfb, 0x66, 0xd4,</div><div class='add'>+	0x04, 0xf7, 0x7e, 0xa1, 0x9c, 0x9b, 0x6a, 0xfb, 0x31, 0xee, 0x33, 0x73,</div><div class='add'>+	0xef, 0xee, 0xe3, 0x63, 0xdc, 0x63, 0x39, 0xdf, 0xe0, 0x2d, 0xf3, 0x0d,</div><div class='add'>+	0x72, 0xbe, 0xe3, 0x4b, 0xe6, 0xdb, 0xbd, 0x64, 0xbe, 0xdd, 0x4b, 0xe6,</div><div class='add'>+	0x4b, 0x91, 0xab, 0xff, 0x22, 0x86, 0xc2, 0xa5, 0xb1, 0x55, 0x7b, 0xe0,</div><div class='add'>+	0x96, 0xb9, 0x07, 0x38, 0xf7, 0x01, 0xb1, 0x90, 0x29, 0x8d, 0x53, 0x6d,</div><div class='add'>+	0xef, 0x5c, 0x32, 0xf7, 0x4e, 0xce, 0xbd, 0x38, 0x8e, 0x4e, 0x2d, 0x12,</div><div class='add'>+	0x62, 0xa3, 0x25, 0x84, 0x6a, 0x9b, 0x7a, 0x17, 0x9a, 0x33, 0x5d, 0xc4,</div><div class='add'>+	0x4e, 0x25, 0x12, 0xf3, 0x1e, 0x98, 0x83, 0xf5, 0x5e, 0x1f, 0x16, 0x6a,</div><div class='add'>+	0x17, 0xb9, 0x51, 0x5d, 0xfe, 0xfb, 0x9a, 0x02, 0x6a, 0xfd, 0x1b, 0xb9,</div><div class='add'>+	0x10, 0xc7, 0x88, 0xe9, 0xfd, 0x8a, 0x10, 0xa7, 0xd6, 0x24, 0x06, 0xbc,</div><div class='add'>+	0x48, 0xf4, 0xd5, 0xc0, 0x24, 0x86, 0x7c, 0x65, 0x2e, 0x2c, 0xed, 0x73,</div><div class='add'>+	0xdc, 0xed, 0x53, 0x74, 0xfb, 0x08, 0xf1, 0xe1, 0xbd, 0x57, 0xc4, 0x5b,</div><div class='add'>+	0x2d, 0x61, 0xbc, 0x4d, 0x4e, 0x9e, 0x2c, 0x2e, 0xea, 0x8a, 0xd4, 0x0d,</div><div class='add'>+	0x78, 0x4e, 0x59, 0x7e, 0xc6, 0x34, 0xb4, 0xc3, 0xff, 0xad, 0xfe, 0x04,</div><div class='add'>+	0x8c, 0x29, 0xdb, 0xbc, 0x78, 0x3d, 0x89, 0x27, 0x2b, 0x61, 0xf4, 0xee,</div><div class='add'>+	0x53, 0xb2, 0xe9, 0x2a, 0x18, 0xce, 0x4a, 0x25, 0x9b, 0xd2, 0x20, 0x79,</div><div class='add'>+	0xa3, 0x36, 0x1e, 0x35, 0x8d, 0xec, 0x65, 0xbe, 0xac, 0x4e, 0xde, 0x2e,</div><div class='add'>+	0x06, 0x95, 0x63, 0x04, 0xf1, 0x6c, 0xfe, 0x7d, 0xcc, 0xfb, 0xa4, 0x86,</div><div class='add'>+	0x49, 0xed, 0xe4, 0xc0, 0x27, 0xa4, 0x86, 0x05, 0x48, 0x44, 0x15, 0x7b,</div><div class='add'>+	0xf2, 0x9e, 0xd3, 0x8d, 0x10, 0xf0, 0xb7, 0xf9, 0x70, 0xd1, 0x1c, 0xb6,</div><div class='add'>+	0xea, 0xb1, 0x16, 0xe7, 0x5b, 0xb9, 0x07, 0xcb, 0x54, 0x44, 0x66, 0x96,</div><div class='add'>+	0x8e, 0x15, 0xe1, 0x58, 0x11, 0x7c, 0x92, 0x13, 0xa2, 0xd2, 0x36, 0xe2,</div><div class='add'>+	0x0b, 0x30, 0x19, 0x47, 0x04, 0x57, 0x0a, 0x5b, 0xfc, 0xa8, 0x09, 0x43,</div><div class='add'>+	0x6d, 0x56, 0xb1, 0x3d, 0xaf, 0x29, 0xdd, 0x79, 0xe8, 0x5e, 0xdb, 0x8c,</div><div class='add'>+	0x1e, 0xc6, 0x51, 0xc6, 0xc3, 0xba, 0x76, 0x4c, 0x55, 0x36, 0x4e, 0x07,</div><div class='add'>+	0x50, 0x3d, 0xf5, 0x99, 0x78, 0x9f, 0x7a, 0xf8, 0xc6, 0xbd, 0xac, 0x17,</div><div class='add'>+	0xc9, 0x00, 0xaa, 0xdc, 0xb9, 0x85, 0xf8, 0xb8, 0xad, 0x0e, 0x17, 0x39,</div><div class='add'>+	0x5f, 0xf4, 0x2f, 0x03, 0xf0, 0x4e, 0x05, 0xe0, 0x9b, 0x52, 0x30, 0xd3,</div><div class='add'>+	0x1e, 0x80, 0x67, 0x46, 0xfe, 0x56, 0x10, 0x30, 0xa7, 0xb1, 0x5d, 0x6f,</div><div class='add'>+	0xc0, 0x78, 0x9e, 0x45, 0xda, 0xfc, 0x19, 0x06, 0xdc, 0xef, 0x2a, 0x9e,</div><div class='add'>+	0xca, 0x6b, 0x08, 0x1d, 0x10, 0xa2, 0xd1, 0x16, 0x22, 0x96, 0xf4, 0x60,</div><div class='add'>+	0xd6, 0x1c, 0x8e, 0x06, 0xb8, 0x8e, 0x61, 0x4b, 0x6a, 0x8e, 0x0f, 0xea,</div><div class='add'>+	0x8c, 0x91, 0x39, 0xc7, 0xa8, 0x37, 0x4f, 0xa8, 0x4a, 0xef, 0xf4, 0x1e,</div><div class='add'>+	0xc1, 0x98, 0xfa, 0x1e, 0xf0, 0x0a, 0x51, 0xd3, 0xd6, 0x34, 0x70, 0x9e,</div><div class='add'>+	0xda, 0x3c, 0x13, 0x8b, 0xf5, 0x0e, 0x29, 0xc0, 0xfa, 0x39, 0x1f, 0xfc,</div><div class='add'>+	0x53, 0xff, 0xc5, 0x3a, 0x2b, 0x44, 0xe1, 0x5e, 0x81, 0x77, 0xad, 0x6c,</div><div class='add'>+	0xbc, 0x02, 0x46, 0xea, 0x24, 0xc2, 0xb8, 0xf4, 0xa2, 0x10, 0xdb, 0xdb,</div><div class='add'>+	0x43, 0x78, 0xcd, 0x32, 0x76, 0x7d, 0xec, 0x15, 0xb8, 0x98, 0xcc, 0x0e,</div><div class='add'>+	0xd6, 0x53, 0xb7, 0xae, 0x29, 0x51, 0x54, 0xe5, 0x8d, 0xcc, 0x15, 0x85,</div><div class='add'>+	0x4b, 0x9f, 0x31, 0xf5, 0x9d, 0x4a, 0x10, 0x55, 0x27, 0x82, 0xe8, 0x98,</div><div class='add'>+	0xf3, 0xa3, 0x62, 0x2a, 0x08, 0xef, 0xa4, 0x79, 0xfd, 0x41, 0xb8, 0xe3,</div><div class='add'>+	0x58, 0x27, 0xd1, 0x8c, 0x8b, 0x2f, 0x1b, 0xf3, 0xc7, 0x89, 0x93, 0xed,</div><div class='add'>+	0x88, 0xe2, 0x37, 0x05, 0x13, 0x17, 0x0b, 0x41, 0xa8, 0x27, 0x74, 0xd4,</div><div class='add'>+	0xbb, 0xf5, 0x4e, 0x47, 0xb5, 0xe9, 0x61, 0x5e, 0x1c, 0xe5, 0x61, 0xb7,</div><div class='add'>+	0x9e, 0x74, 0xf1, 0xd3, 0xa3, 0x74, 0xb0, 0xae, 0x6c, 0x98, 0x26, 0x95,</div><div class='add'>+	0xf9, 0xec, 0x9c, 0x75, 0x43, 0xec, 0x8f, 0xa5, 0x59, 0x47, 0x2a, 0xe0,</div><div class='add'>+	0xb3, 0xd7, 0xb1, 0x8e, 0xb0, 0x38, 0xb9, 0xba, 0x5f, 0xa1, 0xf8, 0xec,</div><div class='add'>+	0xef, 0x6a, 0x7e, 0x88, 0x9a, 0x5f, 0xfc, 0x3f, 0x35, 0x5f, 0x85, 0x3a,</div><div class='add'>+	0xe5, 0xc1, 0x98, 0x19, 0xc0, 0x6f, 0xac, 0xa6, 0x73, 0x8d, 0x08, 0x20,</div><div class='add'>+	0xd5, 0xa6, 0x23, 0x72, 0xc2, 0xc2, 0x8b, 0xdc, 0x5b, 0xdc, 0x71, 0x6b,</div><div class='add'>+	0x3d, 0x04, 0x76, 0x92, 0x53, 0x15, 0xd4, 0x86, 0xbb, 0x27, 0x82, 0xd4,</div><div class='add'>+	0x29, 0x55, 0x59, 0x4f, 0x9d, 0xdf, 0x91, 0xbc, 0x21, 0xd2, 0x31, 0x23,</div><div class='add'>+	0x1e, 0x57, 0x12, 0xa9, 0xbf, 0x43, 0x49, 0x3b, 0x62, 0xd4, 0xd1, 0x05,</div><div class='add'>+	0x7d, 0x91, 0x83, 0x5d, 0x2e, 0x07, 0x67, 0x62, 0x25, 0xed, 0x58, 0x51,</div><div class='add'>+	0x28, 0xf1, 0xef, 0x01, 0xea, 0xe7, 0xf5, 0xb6, 0x92, 0x76, 0xbe, 0x4a,</div><div class='add'>+	0xff, 0xd3, 0xcb, 0xf1, 0x1e, 0x99, 0x36, 0xb2, 0xbd, 0xcc, 0xcf, 0x25,</div><div class='add'>+	0x62, 0x63, 0x92, 0x19, 0x9c, 0xaf, 0xa5, 0xa6, 0x36, 0x07, 0x18, 0xe3,</div><div class='add'>+	0x75, 0x71, 0x9a, 0xde, 0x62, 0x98, 0xfd, 0x46, 0xf3, 0x46, 0x74, 0x98,</div><div class='add'>+	0x7c, 0x1f, 0x2d, 0x6b, 0xe9, 0x30, 0xfd, 0xc4, 0x28, 0xf3, 0xf4, 0x36,</div><div class='add'>+	0x9f, 0x9d, 0xcc, 0x1b, 0xe9, 0x2e, 0x57, 0x53, 0xa5, 0xaf, 0x90, 0x31,</div><div class='add'>+	0x49, 0x6f, 0x11, 0xc1, 0x5b, 0x2d, 0x52, 0x5f, 0x1b, 0xa8, 0xaf, 0x8b,</div><div class='add'>+	0xba, 0x2a, 0xf1, 0x70, 0x4d, 0x84, 0x5a, 0x42, 0x5e, 0xc9, 0xcb, 0x4b,</div><div class='add'>+	0x49, 0x21, 0xaa, 0xec, 0x20, 0x2a, 0x27, 0xcc, 0xf4, 0x7a, 0x25, 0x16,</div><div class='add'>+	0x31, 0x95, 0xbb, 0xd8, 0xce, 0x1c, 0xce, 0x6d, 0xf2, 0xba, 0xde, 0xf6,</div><div class='add'>+	0x84, 0x10, 0x21, 0x5b, 0x47, 0xcd, 0x84, 0x49, 0xdc, 0xc4, 0xfa, 0x8e,</div><div class='add'>+	0xb8, 0xcf, 0x75, 0x04, 0xe7, 0x16, 0xc8, 0xe7, 0x08, 0xf9, 0x1c, 0xc6,</div><div class='add'>+	0x9b, 0xb7, 0x70, 0x9a, 0x5a, 0xeb, 0xe9, 0x27, 0xa7, 0xb3, 0xe1, 0xa1,</div><div class='add'>+	0x2d, 0xde, 0x6f, 0xf1, 0x71, 0xbf, 0xe4, 0x34, 0xdb, 0xbc, 0x78, 0x21,</div><div class='add'>+	0x89, 0xcd, 0xc4, 0x47, 0xe6, 0x29, 0x25, 0xeb, 0x90, 0xdb, 0xa9, 0x0a,</div><div class='add'>+	0x25, 0x4b, 0x17, 0xf5, 0x0d, 0xa7, 0xcf, 0xf0, 0x6d, 0x2f, 0x39, 0xdd,</div><div class='add'>+	0x17, 0xbe, 0x95, 0xd3, 0x2c, 0xbe, 0xcc, 0xf7, 0x33, 0xf9, 0x83, 0x98,</div><div class='add'>+	0xf1, 0xf9, 0x11, 0x99, 0xf2, 0x21, 0x30, 0xa5, 0x92, 0x5f, 0x0a, 0xfd,</div><div class='add'>+	0x41, 0x36, 0x1e, 0x80, 0x91, 0x3e, 0x89, 0x08, 0x12, 0x13, 0x1a, 0xfe,</div><div class='add'>+	0xaa, 0xc5, 0x87, 0x63, 0x31, 0x23, 0xb3, 0x93, 0x3c, 0x5d, 0x39, 0x37,</div><div class='add'>+	0xc4, 0x88, 0x8c, 0x68, 0xd4, 0x53, 0xe2, 0xab, 0xaf, 0xd9, 0x0f, 0x6d,</div><div class='add'>+	0xca, 0xe5, 0xe0, 0x1e, 0x8f, 0x9d, 0x8d, 0x6a, 0x30, 0x76, 0xfd, 0x84,</div><div class='add'>+	0xb8, 0xb8, 0x30, 0x21, 0x44, 0x67, 0xbb, 0x79, 0xee, 0x23, 0xaf, 0x41,</div><div class='add'>+	0x2d, 0x54, 0x71, 0x7e, 0xae, 0x34, 0x7e, 0xd5, 0x94, 0x06, 0xff, 0x01,</div><div class='add'>+	0x77, 0xfc, 0xeb, 0x6f, 0x32, 0x8a, 0xcf, 0xf3, 0x12, 0x9f, 0x42, 0x04,</div><div class='add'>+	0x6c, 0x33, 0x32, 0x4b, 0x3d, 0xdc, 0x97, 0x34, 0xb8, 0x7f, 0x4d, 0x4e,</div><div class='add'>+	0x33, 0xbf, 0x7b, 0x92, 0xb1, 0xe8, 0x16, 0xbe, 0x73, 0xa9, 0x58, 0xe2,</div><div class='add'>+	0x70, 0xbd, 0xb9, 0x15, 0x7f, 0xa3, 0x7b, 0x51, 0x63, 0xfe, 0x10, 0xcf,</div><div class='add'>+	0xba, 0x1a, 0x45, 0xec, 0x4f, 0x56, 0xa2, 0x91, 0x98, 0x7f, 0x82, 0x98,</div><div class='add'>+	0xdf, 0x3c, 0x4b, 0xad, 0x99, 0x6a, 0x67, 0x7e, 0x25, 0xdf, 0xbb, 0x94,</div><div class='add'>+	0xde, 0xd9, 0x1e, 0xd7, 0x57, 0x3d, 0x32, 0xed, 0xc1, 0x9b, 0xd6, 0x5a,</div><div class='add'>+	0x7a, 0x98, 0xb4, 0xf2, 0xc8, 0xac, 0xc4, 0xfb, 0x3a, 0xe5, 0x41, 0x62,</div><div class='add'>+	0x3f, 0x7a, 0x87, 0x8a, 0x19, 0x6b, 0xad, 0xe2, 0x77, 0xb1, 0xef, 0x83,</div><div class='add'>+	0x93, 0x29, 0xe1, 0xde, 0x6b, 0xc7, 0xac, 0x53, 0x4b, 0x70, 0xdf, 0x73,</div><div class='add'>+	0x1b, 0xaf, 0x23, 0xb5, 0x03, 0x25, 0x7d, 0xd7, 0xbb, 0x98, 0xaf, 0xe7,</div><div class='add'>+	0xcb, 0xf8, 0x7e, 0x96, 0xed, 0xbe, 0x29, 0x68, 0x95, 0xc4, 0xf0, 0x3a,</div><div class='add'>+	0x62, 0x7c, 0x92, 0x38, 0x79, 0x78, 0x5a, 0xe0, 0x0d, 0xd6, 0x89, 0x42,</div><div class='add'>+	0xd2, 0xb0, 0x76, 0x2a, 0x46, 0xba, 0x47, 0x49, 0x64, 0x57, 0x96, 0x6b,</div><div class='add'>+	0xe4, 0xdd, 0xac, 0x73, 0xb8, 0x43, 0xe0, 0xe7, 0x16, 0xb4, 0x00, 0xb1,</div><div class='add'>+	0xfd, 0x6f, 0xac, 0x59, 0xff, 0x51, 0xae, 0x91, 0xc9, 0x42, 0x25, 0x42,</div><div class='add'>+	0x2d, 0xd4, 0x7c, 0x62, 0xb9, 0x9b, 0x58, 0x3e, 0x44, 0x3e, 0x8c, 0xd0,</div><div class='add'>+	0x13, 0x6c, 0x26, 0x96, 0x57, 0xb4, 0x19, 0xd9, 0x2e, 0xfa, 0x69, 0xcf,</div><div class='add'>+	0xea, 0x08, 0x71, 0x1a, 0xa7, 0x87, 0x1d, 0x41, 0x07, 0xe7, 0x4a, 0x4f,</div><div class='add'>+	0x1b, 0x91, 0x0e, 0xe2, 0x5f, 0x65, 0x9f, 0xd7, 0xd8, 0x67, 0xa1, 0x4e,</div><div class='add'>+	0x7a, 0xed, 0x00, 0x5e, 0x60, 0x1f, 0x33, 0xe9, 0xb8, 0x3a, 0x21, 0xf1,</div><div class='add'>+	0x3f, 0x86, 0x44, 0x46, 0xe2, 0xdf, 0x59, 0xd6, 0x4a, 0xdf, 0x2f, 0xf1,</div><div class='add'>+	0x4f, 0x0c, 0xe6, 0x89, 0xc1, 0x12, 0x07, 0x06, 0x24, 0x07, 0x6a, 0xe8,</div><div class='add'>+	0x2b, 0x4e, 0xd0, 0x57, 0x54, 0xd9, 0x51, 0xe2, 0x5f, 0xf2, 0xa1, 0xe4,</div><div class='add'>+	0x2d, 0xba, 0xca, 0x1c, 0x58, 0xef, 0xce, 0x27, 0x35, 0x20, 0x88, 0xa6,</div><div class='add'>+	0x49, 0x43, 0x57, 0x95, 0xff, 0x14, 0x4f, 0x98, 0xe6, 0xfc, 0x76, 0xfa,</div><div class='add'>+	0x83, 0x2f, 0xdb, 0x62, 0xcc, 0x7b, 0x10, 0xf7, 0x9c, 0x08, 0xa9, 0x12,</div><div class='add'>+	0xe7, 0xf5, 0x93, 0x41, 0x84, 0x26, 0x25, 0x0f, 0xb2, 0xe3, 0x11, 0x62,</div><div class='add'>+	0xc4, 0xf2, 0xfc, 0x96, 0xf8, 0x8f, 0x12, 0x17, 0xaa, 0xd2, 0xcd, 0x31,</div><div class='add'>+	0x6a, 0xa6, 0x74, 0xb4, 0x4e, 0x1a, 0x03, 0x27, 0x70, 0x55, 0xbc, 0x11,</div><div class='add'>+	0x33, 0x33, 0x7b, 0x99, 0xff, 0x6d, 0xc9, 0x18, 0xf7, 0x4a, 0xc7, 0xdd,</div><div class='add'>+	0x37, 0xc7, 0x70, 0x39, 0xe1, 0x6c, 0xb1, 0x82, 0x65, 0xaf, 0xad, 0x61,</div><div class='add'>+	0x4b, 0x1e, 0xd8, 0x96, 0xa7, 0xd9, 0x35, 0x3d, 0xab, 0xfc, 0xb8, 0x86,</div><div class='add'>+	0xc3, 0x44, 0x7f, 0xbf, 0xee, 0x30, 0xff, 0x01, 0xea, 0x7d, 0xe9, 0x9d,</div><div class='add'>+	0x92, 0x07, 0xff, 0x79, 0xf9, 0x8c, 0xf9, 0x2b, 0x4f, 0xe9, 0xef, 0xdb,</div><div class='add'>+	0xde, 0xc5, 0x33, 0xe7, 0x16, 0x62, 0xb0, 0x93, 0x18, 0xec, 0x61, 0x8e,</div><div class='add'>+	0xb6, 0x5b, 0xe4, 0x36, 0xf3, 0x99, 0x55, 0x03, 0xf4, 0xd4, 0x4d, 0x7d,</div><div class='add'>+	0xd5, 0xd4, 0xb4, 0x7d, 0xd4, 0xa7, 0x77, 0xcd, 0x4a, 0x7a, 0x70, 0x87,</div><div class='add'>+	0xda, 0xd9, 0x41, 0xdd, 0xec, 0x52, 0x1e, 0x72, 0xb1, 0x95, 0x26, 0x8e,</div><div class='add'>+	0x34, 0x25, 0x4d, 0x5f, 0xeb, 0x63, 0xed, 0x38, 0x14, 0x5e, 0xf4, 0xdf,</div><div class='add'>+	0x32, 0x4e, 0xe9, 0xb9, 0x8d, 0xb8, 0x2c, 0xbf, 0xcf, 0xba, 0x3a, 0xb4,</div><div class='add'>+	0x16, 0xaa, 0xbd, 0x56, 0x51, 0x6d, 0x79, 0xc6, 0x50, 0xf1, 0x03, 0xea,</div><div class='add'>+	0xec, 0xc2, 0x26, 0x79, 0xd6, 0xe0, 0xba, 0xd8, 0x16, 0x31, 0x63, 0xd1,</div><div class='add'>+	0x83, 0xc4, 0xd5, 0xab, 0xdf, 0x39, 0x7b, 0x94, 0xf0, 0x36, 0x9c, 0x57,</div><div class='add'>+	0x6f, 0xfa, 0x68, 0xa9, 0x0f, 0x6b, 0x6f, 0xe2, 0x4d, 0xc3, 0x33, 0x2d,</div><div class='add'>+	0x51, 0xe2, 0x51, 0x62, 0x4d, 0x43, 0xe1, 0x95, 0x4a, 0xbc, 0xf1, 0x4a,</div><div class='add'>+	0x10, 0xaf, 0xbf, 0x22, 0xc4, 0x68, 0x12, 0x3c, 0xe1, 0x08, 0xf1, 0x50,</div><div class='add'>+	0x72, 0x0d, 0x8e, 0xeb, 0xb1, 0xe8, 0x0b, 0xae, 0x8f, 0x75, 0xe8, 0x63,</div><div class='add'>+	0x8d, 0x81, 0xb3, 0xb8, 0x21, 0x0a, 0x2e, 0xa7, 0x13, 0xe4, 0x5b, 0x09,</div><div class='add'>+	0x8b, 0xae, 0xdf, 0xad, 0xd5, 0x70, 0x81, 0xf8, 0x0b, 0x11, 0x7f, 0xbf,</div><div class='add'>+	0xa3, 0xe6, 0x5e, 0x2d, 0x6b, 0xee, 0xaa, 0x02, 0xf9, 0xd8, 0x16, 0x40,</div><div class='add'>+	0x8f, 0x5c, 0x0b, 0x71, 0x38, 0x7c, 0x13, 0x87, 0xac, 0xbd, 0xdc, 0xf3,</div><div class='add'>+	0xb3, 0x96, 0x11, 0xef, 0x24, 0x1e, 0x67, 0x2c, 0xc3, 0xe9, 0xa0, 0x9f,</div><div class='add'>+	0x1d, 0x76, 0x31, 0x49, 0xed, 0x8d, 0x49, 0x5c, 0x12, 0x87, 0xcc, 0xc9,</div><div class='add'>+	0x3e, 0xf6, 0x39, 0xcd, 0x3e, 0x63, 0x65, 0x3f, 0xfb, 0x1e, 0x12, 0x69,</div><div class='add'>+	0xe9, 0x67, 0xa3, 0xc4, 0xe0, 0x3e, 0xd7, 0xcf, 0x4a, 0xff, 0x2a, 0xbd,</div><div class='add'>+	0xab, 0x8c, 0xb3, 0xdd, 0x8d, 0xb3, 0xfb, 0x26, 0x0e, 0xa9, 0x61, 0xb5,</div><div class='add'>+	0x12, 0x7f, 0x0f, 0x60, 0xec, 0xa5, 0x1a, 0x84, 0xcc, 0x3b, 0x71, 0x3e,</div><div class='add'>+	0xf3, 0x80, 0x1a, 0x31, 0xa1, 0xd7, 0xdb, 0x25, 0x3c, 0x6e, 0x2e, 0xa6,</div><div class='add'>+	0x90, 0xcf, 0xbf, 0x23, 0xf2, 0x61, 0xc3, 0x39, 0xeb, 0x7a, 0xd2, 0x01,</div><div class='add'>+	0x7a, 0xc4, 0x1b, 0xc2, 0x13, 0x33, 0xce, 0x6d, 0xa1, 0x2f, 0x6b, 0xf2,</div><div class='add'>+	0x96, 0xfc, 0xdd, 0x9a, 0xc2, 0xfb, 0x02, 0x75, 0xa5, 0x75, 0xaa, 0xf4,</div><div class='add'>+	0x74, 0x23, 0xe4, 0xdc, 0xa8, 0x59, 0xf2, 0x77, 0xb1, 0xc2, 0xa7, 0xaa,</div><div class='add'>+	0xd4, 0x73, 0x4f, 0x9b, 0x1c, 0x37, 0x4d, 0x0d, 0x59, 0x1c, 0xfb, 0x1b,</div><div class='add'>+	0x5d, 0x1e, 0x21, 0x06, 0x87, 0xa5, 0xd7, 0xa2, 0x2f, 0xe1, 0x59, 0x7d,</div><div class='add'>+	0x89, 0xa6, 0xee, 0xf6, 0xc2, 0x94, 0x6d, 0x8e, 0xf2, 0x10, 0xd7, 0xa0,</div><div class='add'>+	0x99, 0x83, 0x4a, 0x9a, 0xb5, 0x79, 0x2f, 0xf1, 0xd5, 0xc3, 0x1a, 0x7c,</div><div class='add'>+	0xd9, 0x6a, 0x26, 0x87, 0x05, 0xeb, 0xd0, 0x0d, 0xb1, 0xcf, 0x5c, 0x3c,</div><div class='add'>+	0xd3, 0xc9, 0xf3, 0x5c, 0x9c, 0x71, 0x57, 0xb3, 0x76, 0xaf, 0x63, 0xbd,</div><div class='add'>+	0xe6, 0x69, 0x91, 0x39, 0xfd, 0x32, 0x26, 0x1a, 0x57, 0xb5, 0x19, 0x03,</div><div class='add'>+	0x1b, 0xbd, 0x01, 0xe4, 0x88, 0xf7, 0x57, 0x59, 0x83, 0xf2, 0xdc, 0xd3,</div><div class='add'>+	0xc9, 0xa2, 0x91, 0xca, 0x62, 0x04, 0x1b, 0xb9, 0xa7, 0x3c, 0x03, 0x39,</div><div class='add'>+	0xff, 0x18, 0x2b, 0x9d, 0x91, 0xb7, 0xb3, 0xb6, 0x8d, 0x97, 0xb9, 0x7d,</div><div class='add'>+	0x05, 0x09, 0x4b, 0x72, 0x7b, 0x9e, 0xb5, 0x6d, 0xdc, 0xe5, 0xb6, 0x91,</div><div class='add'>+	0x92, 0x7c, 0xae, 0x28, 0xd7, 0xb4, 0x4f, 0x20, 0x39, 0x7c, 0x6b, 0x3d,</div><div class='add'>+	0x93, 0x78, 0x5e, 0xeb, 0x93, 0xde, 0x36, 0x9f, 0x97, 0x35, 0x49, 0xd6,</div><div class='add'>+	0xa2, 0xc5, 0xba, 0xa4, 0xc9, 0xfb, 0x84, 0x4c, 0xe3, 0xc4, 0x1e, 0xe1,</div><div class='add'>+	0x29, 0xdd, 0x49, 0x9c, 0xfb, 0xd0, 0x1b, 0x4c, 0xa5, 0xee, 0x43, 0x26,</div><div class='add'>+	0x32, 0xa7, 0x61, 0x53, 0xbe, 0xa1, 0x2f, 0x60, 0x83, 0xef, 0x28, 0xb0,</div><div class='add'>+	0xfe, 0x44, 0x43, 0xe6, 0x96, 0x3b, 0x89, 0x8f, 0x73, 0x9a, 0x16, 0x9a,</div><div class='add'>+	0x58, 0x2e, 0xdf, 0xc1, 0x67, 0xb9, 0xdb, 0xde, 0x49, 0xa4, 0x7f, 0xdf,</div><div class='add'>+	0x9d, 0xc4, 0x0b, 0xe4, 0xc7, 0x58, 0xe9, 0x4e, 0xc2, 0xf9, 0x5e, 0x8b,</div><div class='add'>+	0x17, 0x33, 0x61, 0xec, 0xfe, 0xa8, 0x5d, 0xc5, 0xe5, 0x9c, 0x11, 0x39,</div><div class='add'>+	0x8e, 0xdd, 0xe8, 0x77, 0xef, 0x1f, 0x90, 0xf5, 0xdb, 0xbb, 0xf0, 0x4f,</div><div class='add'>+	0xed, 0xf2, 0xfe, 0x21, 0x25, 0xd7, 0x38, 0xce, 0xe5, 0x43, 0xa3, 0xde,</div><div class='add'>+	0xac, 0x67, 0x2d, 0xd8, 0xb1, 0x46, 0xc1, 0x43, 0xc9, 0x3b, 0x5d, 0x6c,</div><div class='add'>+	0x8f, 0x17, 0x8d, 0x74, 0x94, 0xcf, 0xee, 0x99, 0x90, 0x35, 0xf2, 0x71,</div><div class='add'>+	0x9e, 0x17, 0xa1, 0x35, 0xda, 0xbd, 0xaa, 0xc8, 0x37, 0x45, 0xae, 0x28,</div><div class='add'>+	0x86, 0x73, 0x18, 0xf2, 0x8e, 0x20, 0x71, 0xce, 0xab, 0x18, 0xf3, 0x1f,</div><div class='add'>+	0x7a, 0x8d, 0x54, 0xbd, 0x8b, 0x99, 0xc7, 0x79, 0x76, 0x93, 0x7f, 0x7b,</div><div class='add'>+	0xe5, 0xb9, 0x0f, 0x1b, 0x39, 0xe6, 0x07, 0x6b, 0xe4, 0x59, 0xf4, 0x73,</div><div class='add'>+	0x91, 0x5d, 0x66, 0x38, 0x0b, 0x8a, 0xc6, 0xdc, 0x80, 0xfa, 0x24, 0x35,</div><div class='add'>+	0xfc, 0x71, 0x6a, 0xb8, 0xf4, 0x2c, 0xbd, 0xf4, 0x2c, 0x4d, 0xf3, 0x71,</div><div class='add'>+	0xaf, 0x91, 0xb9, 0x4e, 0xbd, 0xe3, 0x98, 0x7d, 0xbd, 0x8a, 0xd1, 0x7b,</div><div class='add'>+	0x82, 0xfa, 0xbf, 0x53, 0x29, 0x8d, 0xb9, 0xb2, 0x3c, 0xe6, 0xdd, 0x05,</div><div class='add'>+	0x4d, 0xe9, 0xcc, 0x83, 0xba, 0x83, 0xe8, 0x36, 0x8b, 0xda, 0x51, 0xac,</div><div class='add'>+	0x24, 0xc7, 0x4c, 0xb9, 0x66, 0xc6, 0xd6, 0xca, 0xd8, 0x14, 0x5c, 0x69,</div><div class='add'>+	0x91, 0xef, 0xb6, 0xca, 0x38, 0x9c, 0x2a, 0x3b, 0x45, 0xed, 0x7d, 0xc5,</div><div class='add'>+	0x57, 0xd6, 0x2f, 0xcf, 0x16, 0x6b, 0x19, 0x9c, 0x30, 0x42, 0x3e, 0xb3,</div><div class='add'>+	0x0e, 0xa3, 0xb4, 0x81, 0x41, 0xb3, 0x19, 0x39, 0xdd, 0x8f, 0x2d, 0xd6,</div><div class='add'>+	0x17, 0x82, 0x3a, 0xc9, 0xf7, 0x81, 0xa7, 0x5e, 0xe2, 0x19, 0xde, 0xbc,</div><div class='add'>+	0x86, 0x58, 0xf2, 0x39, 0x1c, 0xd3, 0x77, 0xd1, 0x0f, 0x6e, 0xc5, 0xeb,</div><div class='add'>+	0xae, 0x9e, 0xd8, 0xc4, 0xb3, 0x42, 0x0c, 0xd9, 0xb2, 0xd6, 0xdd, 0x32,</div><div class='add'>+	0xb6, 0xbc, 0x93, 0xb8, 0x24, 0xb2, 0xa5, 0x31, 0x9c, 0x6d, 0x56, 0x86,</div><div class='add'>+	0x71, 0x7d, 0xa3, 0xbb, 0x3b, 0xa8, 0xbb, 0x15, 0xa6, 0xe7, 0xae, 0x4a,</div><div class='add'>+	0xea, 0xee, 0x56, 0xeb, 0xcf, 0xf1, 0x14, 0x39, 0x5e, 0x65, 0x7e, 0x26,</div><div class='add'>+	0x9e, 0x0e, 0xcb, 0x31, 0xa9, 0xaf, 0x35, 0x4b, 0xc7, 0xff, 0x90, 0x63,</div><div class='add'>+	0xca, 0x39, 0x64, 0x3d, 0x3c, 0x2f, 0x0e, 0xd5, 0xca, 0x31, 0x07, 0x95,</div><div class='add'>+	0x8d, 0xe4, 0xd4, 0x3c, 0x4b, 0xef, 0x0f, 0xc8, 0xa7, 0x05, 0xe6, 0xa7,</div><div class='add'>+	0xf1, 0x36, 0x7c, 0x6a, 0x24, 0x9f, 0x9e, 0x58, 0xc2, 0xa7, 0x83, 0x79,</div><div class='add'>+	0xe9, 0xbd, 0x14, 0xb4, 0xb4, 0xfd, 0x29, 0x75, 0x45, 0x08, 0x7f, 0xdb,</div><div class='add'>+	0x0d, 0x71, 0xc6, 0xf5, 0xbe, 0xd2, 0xef, 0xa6, 0x95, 0xee, 0x59, 0xa9,</div><div class='add'>+	0x4f, 0xd5, 0x08, 0x92, 0x4f, 0x1b, 0xc8, 0xa7, 0x7e, 0xf2, 0xe9, 0x69,</div><div class='add'>+	0x53, 0x34, 0xee, 0x48, 0x1a, 0xa9, 0x79, 0xfa, 0x9a, 0x75, 0xe4, 0xd4,</div><div class='add'>+	0x3b, 0xe4, 0xd4, 0x48, 0xb1, 0xa4, 0x53, 0xfb, 0xb8, 0xee, 0xfb, 0xa9,</div><div class='add'>+	0x53, 0xeb, 0x8a, 0x52, 0xdb, 0x1c, 0xe2, 0x3f, 0x80, 0xcf, 0xc9, 0xa9,</div><div class='add'>+	0xd9, 0xa4, 0xab, 0x53, 0xd6, 0xef, 0x90, 0xd8, 0x75, 0x5a, 0xf2, 0x89,</div><div class='add'>+	0x3a, 0x95, 0x2f, 0x36, 0x59, 0xa7, 0xb9, 0xa6, 0xf1, 0xbc, 0x71, 0xbd,</div><div class='add'>+	0x87, 0x9c, 0xf2, 0xb5, 0x1b, 0xe7, 0x2e, 0x13, 0xbb, 0x81, 0x18, 0xf4,</div><div class='add'>+	0x88, 0x2d, 0xd7, 0xc4, 0x1a, 0xcb, 0x3a, 0x79, 0x90, 0xf8, 0xef, 0xa1,</div><div class='add'>+	0x66, 0xf4, 0x16, 0x6d, 0xec, 0x2d, 0x2e, 0xdd, 0x53, 0xd6, 0xa1, 0xdb,</div><div class='add'>+	0xee, 0xcb, 0xb8, 0xff, 0xf6, 0xed, 0xac, 0x57, 0xb7, 0x6d, 0x97, 0x7c,</div><div class='add'>+	0x5d, 0xe6, 0x97, 0x7c, 0x1d, 0xce, 0xbf, 0xa6, 0xde, 0xfe, 0x1d, 0x79,</div><div class='add'>+	0xa7, 0x26, 0xc4, 0x51, 0x4b, 0xde, 0x49, 0x48, 0xdf, 0xa3, 0x60, 0xc8,</div><div class='add'>+	0x92, 0xf7, 0x6a, 0x1d, 0x51, 0x15, 0x46, 0xe4, 0xfb, 0xf8, 0x4a, 0x64,</div><div class='add'>+	0xc3, 0x4e, 0xdc, 0xe7, 0xd6, 0x48, 0x43, 0xef, 0x63, 0xad, 0x9b, 0x2f,</div><div class='add'>+	0x9f, 0xfd, 0x66, 0x78, 0x3e, 0x7b, 0x87, 0x75, 0xea, 0x28, 0xcf, 0x79,</div><div class='add'>+	0x43, 0x85, 0xaf, 0xc4, 0x7c, 0x58, 0xc5, 0x88, 0x79, 0xf3, 0x8e, 0xd2,</div><div class='add'>+	0xd5, 0xb1, 0xc3, 0x7c, 0x36, 0x56, 0x58, 0xac, 0x51, 0xd4, 0x4c, 0x53,</div><div class='add'>+	0x88, 0xad, 0xe6, 0x7f, 0x8b, 0x2d, 0xdf, 0x7a, 0x57, 0x88, 0x49, 0xc6,</div><div class='add'>+	0x70, 0xc1, 0xc2, 0x6e, 0x1f, 0x62, 0x7d, 0xd7, 0x59, 0xd7, 0x3f, 0x58,</div><div class='add'>+	0x63, 0x64, 0x0a, 0x4a, 0xa2, 0x77, 0x83, 0x22, 0xbd, 0x9e, 0xa7, 0xab,</div><div class='add'>+	0x82, 0xef, 0xb4, 0xd0, 0x1b, 0x5d, 0x61, 0x06, 0xfd, 0xfc, 0x7e, 0xc6,</div><div class='add'>+	0x32, 0x22, 0x47, 0xf8, 0x77, 0x4b, 0x4a, 0x8e, 0x21, 0x44, 0x87, 0x25,</div><div class='add'>+	0xef, 0xbb, 0x46, 0xd4, 0xdc, 0x44, 0x56, 0x54, 0x99, 0x17, 0xa8, 0x4d,</div><div class='add'>+	0x46, 0x66, 0x44, 0x91, 0x3e, 0x3b, 0x0a, 0x57, 0x67, 0xf9, 0x4c, 0x9b,</div><div class='add'>+	0x88, 0xe0, 0xef, 0x5d, 0xff, 0x1c, 0xa5, 0x66, 0x35, 0xe0, 0x1f, 0x5c,</div><div class='add'>+	0xdd, 0x52, 0xb1, 0xed, 0x25, 0x23, 0xa5, 0x2a, 0x7b, 0x70, 0xc9, 0x32,</div><div class='add'>+	0xf4, 0x9f, 0x32, 0x6e, 0x6a, 0xcd, 0x8b, 0x9d, 0x3c, 0x3f, 0x71, 0x8e,</div><div class='add'>+	0x6c, 0x9f, 0xb7, 0x56, 0xd1, 0x58, 0x3b, 0x7e, 0xdc, 0x22, 0x6b, 0xf7,</div><div class='add'>+	0x2e, 0xf4, 0x34, 0xef, 0xe4, 0x47, 0x45, 0xdd, 0x94, 0xaa, 0x6c, 0xa2,</div><div class='add'>+	0x27, 0x09, 0x4d, 0x85, 0xb0, 0x7d, 0xb5, 0x10, 0xab, 0x56, 0x3b, 0xf8,</div><div class='add'>+	0x3c, 0xd9, 0x14, 0x3f, 0xcb, 0x1a, 0x74, 0xa8, 0xd6, 0x48, 0x03, 0xbf,</div><div class='add'>+	0xc0, 0x66, 0x7a, 0xd9, 0x54, 0x5b, 0x0e, 0xb8, 0x53, 0xae, 0xf1, 0x17,</div><div class='add'>+	0xe8, 0x94, 0x1e, 0xd8, 0x0a, 0x49, 0xbf, 0xe5, 0xe2, 0xb7, 0x74, 0xaf,</div><div class='add'>+	0xc4, 0xd4, 0x1d, 0xc8, 0x8a, 0x4a, 0xd3, 0xe8, 0x9b, 0x65, 0xbd, 0xfd,</div><div class='add'>+	0x20, 0xb6, 0x5c, 0x7f, 0x78, 0x56, 0x7a, 0x60, 0x33, 0xba, 0x5e, 0x11,</div><div class='add'>+	0xcc, 0xc5, 0xf3, 0xcc, 0x45, 0xcc, 0x09, 0xd2, 0x32, 0xf0, 0xac, 0xe5,</div><div class='add'>+	0x84, 0x94, 0x41, 0xe5, 0x51, 0xf2, 0xa1, 0xcf, 0x5f, 0x49, 0x0f, 0xe1,</div><div class='add'>+	0xd0, 0x3f, 0x78, 0x50, 0x7d, 0x40, 0x7a, 0x8a, 0x00, 0xb5, 0xa6, 0xa9,</div><div class='add'>+	0x37, 0xc8, 0xfc, 0xec, 0x48, 0x4a, 0xff, 0x41, 0xac, 0x1f, 0xb8, 0x21,</div><div class='add'>+	0x3a, 0xe9, 0x71, 0x3b, 0xcb, 0x1e, 0xf7, 0x89, 0xe9, 0x34, 0x3d, 0xb0,</div><div class='add'>+	0xa6, 0xc8, 0x3b, 0xb6, 0x54, 0x1b, 0x0f, 0xa4, 0x8f, 0x4a, 0x1f, 0x22,</div><div class='add'>+	0xd7, 0xa0, 0xe3, 0x6a, 0x52, 0x62, 0x57, 0xc7, 0x70, 0xbb, 0x11, 0xc9,</div><div class='add'>+	0x42, 0xde, 0xe9, 0xdc, 0xea, 0x2f, 0xa0, 0xa7, 0xbf, 0xe3, 0x39, 0xa0,</div><div class='add'>+	0x6f, 0x62, 0x2c, 0x86, 0x5f, 0x88, 0xba, 0xa4, 0x17, 0x7d, 0xee, 0x59,</div><div class='add'>+	0x2e, 0xa2, 0xa7, 0xc9, 0xfb, 0x73, 0xf4, 0x09, 0x5e, 0x9e, 0x99, 0xf7,</div><div class='add'>+	0x10, 0x4b, 0x5f, 0xb6, 0x0c, 0xbd, 0x5a, 0x8f, 0xec, 0x78, 0x1d, 0xcf,</div><div class='add'>+	0xa8, 0xf7, 0x53, 0x57, 0x2f, 0xe4, 0x1e, 0x65, 0x3d, 0xf7, 0xb4, 0x47,</div><div class='add'>+	0x78, 0x06, 0x68, 0x9c, 0xca, 0x8a, 0x7a, 0xfa, 0x41, 0x9e, 0x97, 0x51,</div><div class='add'>+	0xdb, 0x16, 0xa7, 0xdf, 0x5e, 0xdc, 0x2b, 0x0f, 0x7e, 0x68, 0x99, 0x70,</div><div class='add'>+	0xdc, 0xdf, 0x41, 0xbd, 0x7b, 0x9a, 0xe7, 0x68, 0x73, 0xb9, 0xde, 0x51,</div><div class='add'>+	0x8a, 0x4b, 0xad, 0xb0, 0x2d, 0xb4, 0xdc, 0x0b, 0xfd, 0xc1, 0xdb, 0xc4,</div><div class='add'>+	0xb4, 0x4e, 0x7a, 0x1f, 0x5f, 0xa9, 0xdf, 0x9f, 0x4d, 0x37, 0xe8, 0x8f,</div><div class='add'>+	0xb0, 0xde, 0xcd, 0x13, 0x2b, 0x4f, 0xac, 0xb6, 0x64, 0x2c, 0xf3, 0x32,</div><div class='add'>+	0x16, 0xfa, 0x4b, 0xe7, 0x7e, 0x0f, 0x7d, 0x49, 0x12, 0x08, 0xcd, 0xfd,</div><div class='add'>+	0x35, 0x79, 0xe5, 0x69, 0x0d, 0x21, 0xbb, 0x8b, 0x31, 0xbe, 0xfa, 0xaf,</div><div class='add'>+	0xdc, 0x9a, 0xfe, 0x49, 0xf4, 0x7b, 0xd8, 0x67, 0xc2, 0x02, 0x9e, 0x39,</div><div class='add'>+	0x01, 0x3c, 0x3d, 0x19, 0xa3, 0x2f, 0xa7, 0x8f, 0x3c, 0xa1, 0xe1, 0xfb,</div><div class='add'>+	0xd3, 0x95, 0xf8, 0xd1, 0x74, 0x10, 0x3b, 0xa6, 0xdd, 0xbb, 0xae, 0x0d,</div><div class='add'>+	0x75, 0x7c, 0xaf, 0x83, 0x67, 0xbb, 0x59, 0x6b, 0x35, 0x3e, 0xa2, 0x87,</div><div class='add'>+	0x5a, 0xa1, 0x78, 0x10, 0x39, 0x00, 0x5d, 0x27, 0x6e, 0x6a, 0x5b, 0x7e,</div><div class='add'>+	0x44, 0x2e, 0x0b, 0x61, 0xae, 0x96, 0x3a, 0xf9, 0xbc, 0xfb, 0x7d, 0x84,</div><div class='add'>+	0xfe, 0x31, 0x23, 0x31, 0x98, 0x27, 0x06, 0xf3, 0xc4, 0xe4, 0x4d, 0x4f,</div><div class='add'>+	0x2d, 0xb1, 0x1c, 0xa7, 0x8f, 0x7e, 0x4e, 0x94, 0xb0, 0xf1, 0xb5, 0x38,</div><div class='add'>+	0x6a, 0x9e, 0x24, 0x7f, 0x55, 0x6a, 0x28, 0xf0, 0xcf, 0xb9, 0x88, 0xbe,</div><div class='add'>+	0xa9, 0x28, 0xf3, 0xff, 0xb7, 0xe5, 0xfc, 0x9f, 0xf1, 0x97, 0xf4, 0xc2,</div><div class='add'>+	0x70, 0x66, 0xd1, 0x80, 0xc9, 0x7c, 0x83, 0xbe, 0x21, 0x3f, 0x34, 0xa8,</div><div class='add'>+	0x21, 0x1b, 0x0d, 0xc1, 0x18, 0x98, 0x84, 0xa7, 0x35, 0x08, 0xb9, 0x76,</div><div class='add'>+	0xa0, 0xe0, 0xae, 0x51, 0x88, 0x31, 0xea, 0x9b, 0xcc, 0xc1, 0xbf, 0xe7,</div><div class='add'>+	0xd0, 0xea, 0x61, 0x3e, 0x1c, 0xc8, 0xb3, 0x35, 0xf0, 0x69, 0x41, 0xde,</div><div class='add'>+	0x7d, 0xc6, 0xd2, 0xdd, 0xf8, 0xc2, 0x1d, 0xf3, 0x93, 0x42, 0x0a, 0xfb,</div><div class='add'>+	0xf3, 0x1f, 0x88, 0xfd, 0xe1, 0x92, 0xc6, 0xa7, 0x79, 0x3e, 0x0a, 0x1d,</div><div class='add'>+	0x28, 0x7b, 0x21, 0x72, 0xb8, 0x9a, 0xeb, 0xbd, 0x9a, 0x74, 0xbd, 0x3f,</div><div class='add'>+	0x6b, 0xe4, 0x80, 0x7a, 0xd4, 0x64, 0xb1, 0xab, 0xb9, 0x21, 0xc6, 0x62,</div><div class='add'>+	0x89, 0x40, 0x29, 0xa6, 0x84, 0x7e, 0x04, 0x15, 0xc4, 0xae, 0x3c, 0x23,</div><div class='add'>+	0x49, 0xfd, 0x90, 0xbf, 0x79, 0x3e, 0x51, 0x9d, 0x88, 0x97, 0xeb, 0x72,</div><div class='add'>+	0x1e, 0x93, 0x6d, 0x81, 0xb2, 0x5f, 0x5d, 0xf4, 0x22, 0x1d, 0x7c, 0x26,</div><div class='add'>+	0xbd, 0xc8, 0x57, 0xa2, 0x2f, 0xdc, 0x71, 0x53, 0x73, 0xb2, 0x7c, 0x63,</div><div class='add'>+	0x34, 0x2f, 0xef, 0xb4, 0x5a, 0xe8, 0x88, 0x15, 0x9c, 0x62, 0xe4, 0x47,</div><div class='add'>+	0x5a, 0x63, 0xfa, 0x30, 0xc7, 0x73, 0x74, 0x9d, 0x5c, 0xde, 0x43, 0xbf,</div><div class='add'>+	0xcc, 0x77, 0x8a, 0x2d, 0xec, 0x23, 0xb5, 0xec, 0x2f, 0xb8, 0xd6, 0x2f,</div><div class='add'>+	0x9a, 0x25, 0xb6, 0x87, 0xf3, 0x6f, 0x79, 0x54, 0x53, 0xae, 0x33, 0x91,</div><div class='add'>+	0x1a, 0x66, 0x3c, 0x0b, 0xba, 0xf4, 0xd6, 0x0e, 0xb5, 0x2d, 0xe1, 0xf6,</div><div class='add'>+	0xcf, 0xaa, 0x32, 0x0e, 0x37, 0x1e, 0xb6, 0x49, 0xcd, 0x32, 0x32, 0xa7,</div><div class='add'>+	0x90, 0x70, 0xfa, 0xa5, 0x39, 0x58, 0x26, 0x63, 0x68, 0x8a, 0xf4, 0x33,</div><div class='add'>+	0x9e, 0x43, 0x61, 0x57, 0x0f, 0xf9, 0x8c, 0xf3, 0xe5, 0x3d, 0x1b, 0x2a,</div><div class='add'>+	0x21, 0xb0, 0x22, 0xe9, 0x9e, 0xf9, 0xcb, 0xff, 0x5f, 0x43, 0xa5, 0x0f,</div><div class='add'>+	0x91, 0x58, 0xfc, 0x5f, 0x69, 0xd7, 0x8a, 0xc0, 0xa8, 0x1a, 0x00, 0x00,</div><div class='add'>+	0x00 };</div><div class='ctx'> </div><div class='ctx'> static const u32 bnx2_TPAT_b06FwData[(0x0/4) + 1] = { 0x0 };</div><div class='ctx'> static const u32 bnx2_TPAT_b06FwRodata[(0x0/4) + 1] = { 0x0 };</div><div class='ctx'> </div><div class='ctx'> static struct fw_info bnx2_tpat_fw_06 = {</div><div class='del'>-	/* Firmware version: 4.0.5 */</div><div class='add'>+	/* Firmware version: 4.4.22 */</div><div class='ctx'> 	.ver_major			= 0x4,</div><div class='del'>-	.ver_minor			= 0x0,</div><div class='del'>-	.ver_fix			= 0x5,</div><div class='add'>+	.ver_minor			= 0x4,</div><div class='add'>+	.ver_fix			= 0x16,</div><div class='ctx'> </div><div class='del'>-	.start_addr			= 0x08000888,</div><div class='add'>+	.start_addr			= 0x08000488,</div><div class='ctx'> </div><div class='del'>-	.text_addr			= 0x08000800,</div><div class='del'>-	.text_len			= 0x1a90,</div><div class='add'>+	.text_addr			= 0x08000400,</div><div class='add'>+	.text_len			= 0x1aa4,</div><div class='ctx'> 	.text_index			= 0x0,</div><div class='ctx'> 	.gz_text			= bnx2_TPAT_b06FwText,</div><div class='ctx'> 	.gz_text_len			= sizeof(bnx2_TPAT_b06FwText),</div><div class='hunk'>@@ -3686,11 +3639,11 @@ static struct fw_info bnx2_tpat_fw_06 = {</div><div class='ctx'> 	.data_index			= 0x0,</div><div class='ctx'> 	.data				= bnx2_TPAT_b06FwData,</div><div class='ctx'> </div><div class='del'>-	.sbss_addr			= 0x080022c0,</div><div class='add'>+	.sbss_addr			= 0x08001ec0,</div><div class='ctx'> 	.sbss_len			= 0x44,</div><div class='ctx'> 	.sbss_index			= 0x0,</div><div class='ctx'> </div><div class='del'>-	.bss_addr			= 0x08002304,</div><div class='add'>+	.bss_addr			= 0x08001f04,</div><div class='ctx'> 	.bss_len			= 0x450,</div><div class='ctx'> 	.bss_index			= 0x0,</div><div class='ctx'> </div><div class='hunk'>@@ -3717,862 +3670,862 @@ static const struct cpu_reg cpu_reg_tpat = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static u8 bnx2_TXP_b06FwText[] = {</div><div class='del'>-	0xad, 0x7b, 0x7f, 0x70, 0x9b, 0x75, 0x7a, 0xe7, 0xe7, 0xd5, 0x0f, 0x5b,</div><div class='del'>-	0xb2, 0x65, 0x59, 0x0e, 0x4a, 0x90, 0x77, 0xbd, 0x8d, 0x5e, 0xf4, 0xca,</div><div class='del'>-	0x16, 0xd8, 0x49, 0x5e, 0x25, 0xce, 0xc6, 0x59, 0xab, 0x44, 0x75, 0x1c,</div><div class='del'>-	0xdb, 0x71, 0x1c, 0x30, 0xc1, 0xdd, 0x3a, 0x3d, 0xae, 0xf1, 0x25, 0x26,</div><div class='del'>-	0x31, 0x10, 0xc0, 0xe9, 0xa6, 0x7b, 0x62, 0x8f, 0xd6, 0xc2, 0x76, 0x82,</div><div class='del'>-	0x43, 0x64, 0xbf, 0xce, 0x2a, 0x59, 0x87, 0x4e, 0x67, 0xd6, 0x60, 0x07,</div><div class='del'>-	0x07, 0x56, 0x8e, 0x60, 0xdb, 0x6b, 0xbb, 0x73, 0xbb, 0x83, 0x8e, 0x40,</div><div class='del'>-	0xf0, 0x72, 0x01, 0xb6, 0xfd, 0xa3, 0x47, 0x6f, 0xee, 0xda, 0xcc, 0x02,</div><div class='del'>-	0x59, 0xa0, 0x4b, 0xa0, 0x3b, 0x7b, 0x53, 0x67, 0x0b, 0xbc, 0xf7, 0x79,</div><div class='del'>-	0xde, 0x57, 0x4a, 0xb2, 0x94, 0x4e, 0x67, 0x3a, 0xe7, 0x19, 0x8f, 0xac,</div><div class='del'>-	0xf7, 0xc7, 0xf3, 0x7d, 0x7e, 0x3f, 0x9f, 0xe7, 0xf9, 0x7e, 0x5d, 0x0f,</div><div class='del'>-	0x54, 0xa0, 0xf8, 0x53, 0xc5, 0xdf, 0xe6, 0xe1, 0xd4, 0xe1, 0x8d, 0x6b,</div><div class='del'>-	0xf5, 0xb5, 0xd6, 0x05, 0x37, 0x5c, 0x72, 0xf3, 0xab, 0x0a, 0x30, 0xf0,</div><div class='del'>-	0x01, 0xfe, 0x5d, 0x3f, 0x5f, 0xf9, 0xf7, 0xbd, 0x66, 0xfd, 0x38, 0x81,</div><div class='del'>-	0x40, 0x89, 0x2f, 0xf9, 0x85, 0xc7, 0x91, 0x40, 0x6b, 0x9b, 0x06, 0x8f,</div><div class='del'>-	0x33, 0xf1, 0x67, 0x89, 0x7d, 0x1a, 0x90, 0xcc, 0x35, 0x86, 0xb7, 0xe2,</div><div class='del'>-	0x53, 0x33, 0x1d, 0x74, 0x41, 0xae, 0x7f, 0x25, 0xf1, 0xc9, 0xc8, 0x8f,</div><div class='del'>-	0x36, 0xa9, 0x1f, 0xcf, 0x3a, 0xe1, 0x09, 0x24, 0x4e, 0x23, 0x50, 0x0f,</div><div class='del'>-	0x4f, 0x1d, 0xdf, 0xf9, 0x93, 0x86, 0x6a, 0x27, 0xfc, 0x25, 0x5a, 0x2d,</div><div class='del'>-	0x18, 0x33, 0x90, 0xf6, 0x24, 0x86, 0x51, 0xbe, 0x11, 0x78, 0x37, 0x13,</div><div class='del'>-	0xd5, 0xc7, 0x80, 0x69, 0x47, 0x22, 0x1a, 0x7e, 0x09, 0x3a, 0x8e, 0xe4,</div><div class='del'>-	0xc3, 0x68, 0xe7, 0xef, 0x76, 0xe3, 0x33, 0x33, 0xec, 0x46, 0xda, 0xc9,</div><div class='del'>-	0xe7, 0xf6, 0x36, 0x03, 0xdb, 0x32, 0x3a, 0x8e, 0x1a, 0xf0, 0xd4, 0x26,</div><div class='del'>-	0x1e, 0xc5, 0x66, 0x7e, 0xfa, 0x13, 0x29, 0xbc, 0x31, 0x19, 0x09, 0x3f,</div><div class='del'>-	0x03, 0xb5, 0x5f, 0x73, 0xaa, 0x29, 0xa0, 0x71, 0x68, 0x50, 0x51, 0x07,</div><div class='del'>-	0xde, 0x54, 0xd4, 0xde, 0x49, 0x05, 0x1e, 0x85, 0xcf, 0x35, 0xe6, 0xe4,</div><div class='del'>-	0x33, 0x85, 0xdb, 0x72, 0x1e, 0x5c, 0x72, 0xca, 0xfa, 0xbf, 0x49, 0x7d,</div><div class='del'>-	0x2b, 0x70, 0x69, 0x2d, 0x18, 0x27, 0x0f, 0xee, 0x84, 0x82, 0xa7, 0x9b,</div><div class='del'>-	0xa3, 0xa1, 0x51, 0xc8, 0xfd, 0x30, 0xb6, 0xe6, 0xe5, 0x53, 0xa5, 0xd4,</div><div class='del'>-	0xa6, 0x39, 0xae, 0x9b, 0xe6, 0x19, 0xbd, 0x1c, 0xe9, 0x80, 0x1a, 0x02,</div><div class='del'>-	0x14, 0x8c, 0xea, 0x0e, 0x24, 0x03, 0x6d, 0x61, 0x17, 0xd4, 0xd0, 0xbd,</div><div class='del'>-	0xf8, 0x67, 0xca, 0x9c, 0x8c, 0xb9, 0x61, 0x3f, 0x3f, 0x80, 0x72, 0x14,</div><div class='del'>-	0x02, 0xb6, 0xd6, 0x9e, 0xce, 0x98, 0xe6, 0x05, 0xcd, 0x85, 0x33, 0xd4,</div><div class='del'>-	0xcf, 0x68, 0xee, 0x9f, 0xcd, 0x02, 0x75, 0x33, 0xae, 0x95, 0xd6, 0xf7,</div><div class='del'>-	0x60, 0x36, 0x60, 0x9a, 0x73, 0xbc, 0x77, 0x34, 0x57, 0xd2, 0xb3, 0x69,</div><div class='del'>-	0x3a, 0x34, 0xd3, 0xdc, 0xa7, 0xfd, 0xca, 0xdc, 0xfb, 0x6b, 0xcf, 0x9a,</div><div class='del'>-	0xe6, 0x13, 0xfa, 0x4d, 0x38, 0x9b, 0x6d, 0x57, 0xba, 0x17, 0x56, 0xf9,</div><div class='del'>-	0xb7, 0xcf, 0x98, 0xb8, 0xa0, 0x23, 0xe0, 0x48, 0x74, 0x28, 0xdb, 0x17,</div><div class='del'>-	0xba, 0x94, 0x6d, 0xf9, 0x5d, 0x4a, 0xc7, 0xdc, 0xef, 0x2a, 0x5d, 0x0b,</div><div class='del'>-	0x03, 0x4a, 0x67, 0x3e, 0x84, 0x79, 0x23, 0x88, 0x39, 0xa3, 0x5f, 0x69,</div><div class='del'>-	0x5f, 0xe8, 0x53, 0x6c, 0x39, 0x52, 0x4a, 0x5b, 0xbe, 0x44, 0xeb, 0xba,</div><div class='del'>-	0x1e, 0xb7, 0x67, 0x12, 0x98, 0x30, 0xca, 0xb9, 0xce, 0xb2, 0xf9, 0xa3,</div><div class='del'>-	0x86, 0x65, 0xca, 0xa9, 0xe3, 0x58, 0xfe, 0x09, 0xec, 0x9c, 0x31, 0xcd,</div><div class='del'>-	0x5c, 0x1c, 0xc8, 0xe5, 0x81, 0xef, 0x19, 0x91, 0xde, 0x21, 0xc5, 0x34,</div><div class='del'>-	0x3b, 0xa3, 0xe6, 0xea, 0xcb, 0x7a, 0x63, 0xec, 0x65, 0xfc, 0x93, 0x39,</div><div class='del'>-	0x1b, 0x44, 0xda, 0x47, 0x1a, 0xc7, 0x69, 0xb3, 0xfb, 0x27, 0xe1, 0x29,</div><div class='del'>-	0x4f, 0x8c, 0xe3, 0x67, 0x19, 0x78, 0xca, 0x12, 0x69, 0x5c, 0xc8, 0x8c,</div><div class='del'>-	0x06, 0x3c, 0x88, 0x84, 0xb6, 0x2b, 0xe9, 0x94, 0x03, 0xea, 0xf0, 0xdb,</div><div class='del'>-	0x50, 0xc3, 0xb4, 0xc7, 0xd2, 0x79, 0x45, 0x2d, 0xbc, 0x0c, 0x35, 0xf9,</div><div class='del'>-	0x2b, 0x45, 0xed, 0xaa, 0x75, 0x22, 0xe9, 0x88, 0x7a, 0xf0, 0xa3, 0x06,</div><div class='del'>-	0xb1, 0xc9, 0x38, 0xd6, 0x5a, 0xb6, 0x49, 0xe3, 0xd6, 0x6b, 0xb6, 0x49,</div><div class='del'>-	0x60, 0x94, 0x7c, 0x1d, 0x25, 0x5f, 0xaf, 0xe8, 0x6a, 0xe8, 0x69, 0x98,</div><div class='del'>-	0xab, 0x07, 0x75, 0xb9, 0x97, 0xc0, 0x78, 0xde, 0x0c, 0xfb, 0x13, 0x97,</div><div class='del'>-	0xc8, 0x2f, 0xd2, 0x5f, 0x4a, 0x78, 0xd2, 0xd5, 0x89, 0x4f, 0xcd, 0xd7,</div><div class='del'>-	0x37, 0x86, 0xf0, 0x62, 0x3e, 0x88, 0x17, 0xf2, 0x01, 0x3c, 0x9f, 0x6f,</div><div class='del'>-	0x87, 0x91, 0x87, 0x7f, 0x67, 0xfe, 0x8b, 0xfc, 0xd8, 0x84, 0x8f, 0xcf,</div><div class='del'>-	0x93, 0x6f, 0xff, 0x8e, 0xbc, 0x6b, 0xa0, 0x2c, 0x81, 0xde, 0x1f, 0x67,</div><div class='del'>-	0x46, 0xcc, 0x0a, 0x0d, 0x03, 0x35, 0x09, 0x2d, 0x79, 0x9b, 0xe2, 0x6b,</div><div class='del'>-	0xa1, 0x1f, 0xf6, 0xbe, 0x9a, 0x6b, 0x71, 0x69, 0x53, 0x5e, 0xb8, 0xa9,</div><div class='del'>-	0xff, 0x6d, 0x79, 0xd3, 0x1c, 0xd3, 0x0f, 0xad, 0xdb, 0xdb, 0xf2, 0xa7,</div><div class='del'>-	0x85, 0x5e, 0xad, 0x07, 0xe9, 0xfc, 0x20, 0xe0, 0x4f, 0xf0, 0x93, 0xa1,</div><div class='del'>-	0xb8, 0xab, 0xa9, 0x3d, 0x7c, 0xee, 0x41, 0x97, 0xed, 0xcf, 0xe4, 0x81,</div><div class='del'>-	0x7a, 0x7f, 0xc1, 0x20, 0x0f, 0xc6, 0xb4, 0x1f, 0x15, 0x61, 0xca, 0xf7,</div><div class='del'>-	0x13, 0xf2, 0x19, 0xc3, 0xf7, 0xf3, 0x1a, 0x79, 0x6b, 0x22, 0x8f, 0x61,</div><div class='del'>-	0xf2, 0xe7, 0xc1, 0xde, 0xac, 0x3a, 0x9d, 0x86, 0x3a, 0x31, 0x8b, 0x35,</div><div class='del'>-	0x48, 0x06, 0x03, 0xf4, 0xc1, 0x3f, 0x86, 0x4d, 0xa3, 0x07, 0x53, 0x06,</div><div class='del'>-	0xd6, 0x07, 0x12, 0xb4, 0x6f, 0x1c, 0x8f, 0x96, 0x21, 0x3a, 0xf0, 0xb1,</div><div class='del'>-	0xa2, 0xe0, 0xf5, 0x68, 0x0f, 0x26, 0x29, 0x4f, 0x4f, 0xce, 0x8b, 0x07,</div><div class='del'>-	0xb2, 0x15, 0xb8, 0x2f, 0x6b, 0xe2, 0xfe, 0x38, 0x12, 0x15, 0x94, 0x27,</div><div class='del'>-	0x16, 0x8f, 0x86, 0xdf, 0x83, 0x0b, 0xed, 0xb9, 0x1e, 0xc6, 0xd2, 0x56,</div><div class='del'>-	0x24, 0xcb, 0x3c, 0xd8, 0x9a, 0xf3, 0x31, 0x1e, 0x93, 0x38, 0x3d, 0xe3,</div><div class='del'>-	0x81, 0x7b, 0x83, 0x03, 0xb3, 0xc1, 0x32, 0xc4, 0xea, 0x1d, 0xfc, 0x0d,</div><div class='del'>-	0xfa, 0xdb, 0x66, 0xea, 0xfc, 0xdb, 0x0c, 0x17, 0x0e, 0x18, 0x0e, 0x8c,</div><div class='del'>-	0x64, 0x4d, 0xb3, 0x5d, 0x37, 0x71, 0x75, 0x43, 0x00, 0x3f, 0xa0, 0xfe,</div><div class='del'>-	0x0e, 0x19, 0x21, 0x9c, 0xcd, 0x3f, 0x4e, 0x5e, 0x82, 0x36, 0xbf, 0x06,</div><div class='del'>-	0x79, 0x37, 0xc8, 0xbb, 0x41, 0xbe, 0x0d, 0xe1, 0xf3, 0x3c, 0x63, 0x46,</div><div class='del'>-	0xa7, 0x5c, 0x5e, 0xf2, 0x50, 0x89, 0x21, 0xf2, 0x11, 0x89, 0x9b, 0x70,</div><div class='del'>-	0xc4, 0xd5, 0xf4, 0x5e, 0x26, 0xaf, 0xd5, 0xf5, 0xa6, 0xf9, 0xf1, 0x06,</div><div class='del'>-	0x91, 0x85, 0x36, 0x77, 0xf4, 0x48, 0x8c, 0xfe, 0x56, 0x15, 0xe3, 0xea,</div><div class='del'>-	0x6f, 0xa9, 0xb7, 0x27, 0xf3, 0x5e, 0xa4, 0xb2, 0x96, 0xdf, 0x1e, 0x2e,</div><div class='del'>-	0x23, 0xdf, 0xc2, 0x57, 0x5e, 0x8b, 0x32, 0x46, 0xa3, 0xfd, 0x8c, 0x51,</div><div class='del'>-	0xec, 0x20, 0xcf, 0xf7, 0x1b, 0xd1, 0x96, 0x5d, 0x8a, 0x0b, 0x9d, 0xb9,</div><div class='del'>-	0xa0, 0xbf, 0xfd, 0x06, 0x3e, 0x29, 0xaf, 0xc4, 0x20, 0x65, 0x0d, 0x90,</div><div class='del'>-	0xbf, 0x20, 0xf6, 0x91, 0xcf, 0x17, 0x8a, 0x7c, 0xce, 0xe5, 0x65, 0xad,</div><div class='del'>-	0xcf, 0xf3, 0x5a, 0xe2, 0x13, 0xe9, 0x15, 0x89, 0xa0, 0x82, 0x0a, 0x1f,</div><div class='del'>-	0x76, 0xe5, 0xde, 0xa2, 0x2d, 0xea, 0xf0, 0xa7, 0xb4, 0xc1, 0x8b, 0x8c,</div><div class='del'>-	0x91, 0xef, 0x5f, 0xf3, 0x17, 0xb1, 0xc7, 0x63, 0xb4, 0x83, 0x7a, 0x3a,</div><div class='del'>-	0x0d, 0x1f, 0x06, 0xf2, 0x49, 0x1c, 0x99, 0x41, 0x72, 0x5e, 0x3f, 0xce,</div><div class='del'>-	0x78, 0x5f, 0x05, 0xa7, 0x56, 0x9e, 0x0c, 0x68, 0x15, 0xd8, 0x37, 0x17,</div><div class='del'>-	0xc4, 0x70, 0xbe, 0x0d, 0x46, 0x36, 0x88, 0x83, 0xf4, 0xcd, 0x2b, 0xf1,</div><div class='del'>-	0xe4, 0xfd, 0x7e, 0x08, 0xef, 0x41, 0x3c, 0xc0, 0x77, 0x9e, 0x98, 0x09,</div><div class='del'>-	0x62, 0x88, 0x3a, 0xda, 0x1e, 0x8f, 0xb6, 0x78, 0x79, 0xed, 0x00, 0xaf,</div><div class='del'>-	0x1d, 0xa5, 0xfe, 0xcf, 0xeb, 0x93, 0x18, 0xe8, 0x55, 0x63, 0x40, 0x10,</div><div class='del'>-	0xfb, 0x0d, 0x04, 0xe8, 0xc2, 0x8f, 0x31, 0xbf, 0xc5, 0xce, 0xf3, 0xfb,</div><div class='del'>-	0xbd, 0xf9, 0x0a, 0xca, 0xe9, 0x47, 0x48, 0xfb, 0xc4, 0x74, 0x37, 0x9b,</div><div class='del'>-	0xe6, 0x77, 0xf5, 0xe8, 0xd2, 0x4f, 0x9d, 0x2e, 0x3c, 0x92, 0x77, 0x20,</div><div class='del'>-	0x35, 0x57, 0x81, 0xdf, 0xcf, 0xba, 0x70, 0x57, 0x7d, 0x05, 0x0e, 0xcd,</div><div class='del'>-	0x25, 0x31, 0x36, 0x53, 0x81, 0xc1, 0x2c, 0x56, 0xef, 0xd7, 0xc7, 0x6a,</div><div class='del'>-	0xca, 0xa0, 0x2e, 0xb7, 0x23, 0x86, 0xab, 0xb4, 0xc3, 0x23, 0x73, 0x3e,</div><div class='del'>-	0x7f, 0xff, 0x4c, 0x00, 0xa9, 0x05, 0x2f, 0x9f, 0x77, 0xf0, 0xf9, 0x72,</div><div class='del'>-	0xe8, 0xeb, 0x23, 0xa9, 0x00, 0x84, 0xc7, 0x4a, 0x3c, 0x34, 0xe7, 0xc5,</div><div class='del'>-	0x83, 0xd9, 0x00, 0x0e, 0xce, 0x34, 0x63, 0xda, 0x48, 0xe2, 0x18, 0x73,</div><div class='del'>-	0xc7, 0xf7, 0xe2, 0x6a, 0xef, 0x41, 0x45, 0x4d, 0x6e, 0x53, 0x92, 0x68,</div><div class='del'>-	0x88, 0xbb, 0x71, 0x89, 0x79, 0xc8, 0x1d, 0x6f, 0x6c, 0x79, 0x9e, 0xb9,</div><div class='del'>-	0xa1, 0x2c, 0x11, 0xe4, 0x77, 0x75, 0x82, 0x31, 0x9b, 0x74, 0x3b, 0x36,</div><div class='del'>-	0x00, 0x2b, 0x25, 0x7e, 0x83, 0xfe, 0x6e, 0x23, 0xe0, 0xef, 0xce, 0xd7,</div><div class='del'>-	0xf9, 0xb7, 0x1b, 0x21, 0xff, 0x76, 0xc6, 0xd7, 0x36, 0xf1, 0x47, 0xc3,</div><div class='del'>-	0x83, 0xe3, 0xf1, 0x4f, 0xcd, 0x81, 0x1a, 0x2b, 0x9f, 0xf9, 0x77, 0xce,</div><div class='del'>-	0xa8, 0xe9, 0x59, 0xa8, 0x3a, 0xab, 0x01, 0x26, 0x17, 0x5c, 0xb4, 0x9f,</div><div class='del'>-	0x82, 0x1a, 0xad, 0x99, 0x79, 0x3c, 0x80, 0x87, 0x98, 0x53, 0xfe, 0x9a,</div><div class='del'>-	0x39, 0x65, 0x70, 0x2a, 0x12, 0x98, 0x86, 0x97, 0xfa, 0x06, 0xf6, 0x9e,</div><div class='del'>-	0x0b, 0xd2, 0xe6, 0x5d, 0x78, 0x9c, 0x7c, 0x6d, 0xdf, 0x18, 0xc4, 0x7d,</div><div class='del'>-	0xf9, 0x80, 0xbf, 0x8b, 0xf6, 0x7b, 0x2f, 0x17, 0xf2, 0x6f, 0xa5, 0x2d,</div><div class='del'>-	0xdf, 0xce, 0xa9, 0xe1, 0x02, 0xfe, 0xaf, 0xf8, 0x53, 0x0c, 0x0e, 0x60,</div><div class='del'>-	0xff, 0x94, 0x1b, 0x85, 0xa0, 0xac, 0x45, 0x9d, 0x1b, 0x2f, 0x9a, 0x3e,</div><div class='del'>-	0x4d, 0x3b, 0x7d, 0x90, 0xba, 0xfe, 0x46, 0xde, 0x87, 0x07, 0x0d, 0x35,</div><div class='del'>-	0xf6, 0x7d, 0xc5, 0x47, 0x9d, 0x7a, 0xa8, 0x07, 0x26, 0x98, 0x55, 0xf2,</div><div class='del'>-	0x5c, 0x1c, 0xe1, 0x55, 0x76, 0xae, 0x3d, 0x34, 0x27, 0x7e, 0x42, 0xdb,</div><div class='del'>-	0x1b, 0xf4, 0x01, 0xfa, 0xcf, 0xf7, 0xaf, 0xc5, 0xaa, 0x1a, 0x48, 0x5b,</div><div class='del'>-	0xb9, 0x3b, 0x46, 0x7f, 0xb1, 0x75, 0x74, 0x62, 0x46, 0xf4, 0xa0, 0x4e,</div><div class='del'>-	0xc3, 0x91, 0xc4, 0xba, 0xf5, 0x7f, 0x6d, 0x5e, 0x5a, 0x29, 0xfa, 0x08,</div><div class='del'>-	0x60, 0x84, 0x3a, 0x3c, 0x6d, 0x98, 0xe6, 0xd5, 0x0d, 0x1f, 0x9a, 0x2d,</div><div class='del'>-	0x37, 0x8b, 0x5e, 0x44, 0xd6, 0x1f, 0x28, 0x52, 0x47, 0x6a, 0x34, 0xff,</div><div class='del'>-	0xff, 0x07, 0x5f, 0xf9, 0xa6, 0x39, 0x60, 0xc9, 0x27, 0xfe, 0xe2, 0xa2,</div><div class='del'>-	0x2f, 0x3e, 0x4e, 0xda, 0x0e, 0x0c, 0x90, 0xde, 0xc3, 0x86, 0xf9, 0x51,</div><div class='del'>-	0x6d, 0xe2, 0x33, 0xb3, 0x65, 0x93, 0x36, 0xbc, 0xac, 0xfc, 0x4f, 0x5e,</div><div class='del'>-	0x0f, 0xe2, 0xa1, 0x7c, 0x0b, 0x75, 0xd7, 0x8e, 0x27, 0xa8, 0xc3, 0xa3,</div><div class='del'>-	0x86, 0xe4, 0xc4, 0x10, 0xfd, 0xb9, 0x8e, 0xfe, 0xed, 0x52, 0xb6, 0x19,</div><div class='del'>-	0x39, 0x6c, 0x9f, 0x4c, 0xa3, 0x93, 0xfe, 0xbe, 0x94, 0x89, 0xb4, 0x3c,</div><div class='del'>-	0x0b, 0x35, 0x4d, 0x19, 0xfc, 0x5d, 0xd4, 0x71, 0xbb, 0xa1, 0x76, 0x89,</div><div class='del'>-	0x4d, 0xdb, 0x99, 0x97, 0x5e, 0xca, 0x84, 0xfc, 0x6d, 0x79, 0xd1, 0x77,</div><div class='del'>-	0x9d, 0x7f, 0x6b, 0xfe, 0xab, 0xb4, 0xbd, 0x82, 0xcd, 0x6b, 0x3c, 0xcc,</div><div class='del'>-	0x33, 0x77, 0xc1, 0xb6, 0xab, 0x6d, 0xbb, 0xd7, 0xe3, 0x8d, 0x03, 0x1f,</div><div class='del'>-	0x32, 0x3f, 0xa5, 0x57, 0xda, 0xd7, 0x52, 0xbc, 0x56, 0xbd, 0x01, 0xfe,</div><div class='del'>-	0x3b, 0xe9, 0x07, 0x7b, 0xe8, 0x07, 0x57, 0x37, 0x7c, 0x6a, 0x86, 0x6f,</div><div class='del'>-	0xb2, 0xfd, 0xa0, 0x6d, 0xc6, 0xe5, 0xef, 0xa0, 0x9e, 0xb6, 0xe9, 0x0a,</div><div class='del'>-	0xe6, 0xf4, 0x0c, 0x06, 0xae, 0x61, 0x87, 0xe4, 0xec, 0x59, 0x3d, 0xc9,</div><div class='del'>-	0x3c, 0xf2, 0x9b, 0x70, 0xd5, 0x60, 0xf6, 0x59, 0xfd, 0x71, 0x84, 0x6d,</div><div class='del'>-	0xdf, 0xc1, 0xc1, 0xac, 0x17, 0xe9, 0xbb, 0x02, 0x98, 0x6f, 0x08, 0xe0,</div><div class='del'>-	0x61, 0xd2, 0xbe, 0x12, 0x6f, 0x1c, 0x7a, 0x83, 0x3a, 0x98, 0xad, 0x91,</div><div class='del'>-	0x6b, 0x49, 0xfc, 0xa5, 0xfe, 0x28, 0x70, 0x93, 0xbd, 0xf6, 0x82, 0xc4,</div><div class='del'>-	0xe8, 0x42, 0x33, 0x8e, 0xe6, 0xfb, 0x15, 0x3b, 0x6f, 0xaa, 0x5d, 0x49,</div><div class='del'>-	0xfc, 0xc4, 0x94, 0x5c, 0xba, 0x60, 0x30, 0xc7, 0x51, 0x1f, 0xe3, 0xf4,</div><div class='del'>-	0xa3, 0xd1, 0x5c, 0x9d, 0xbf, 0x93, 0x7e, 0xf4, 0x78, 0x4e, 0x64, 0x8a,</div><div class='del'>-	0xea, 0xba, 0xb3, 0x96, 0xb5, 0x99, 0xfa, 0x31, 0xac, 0x9a, 0x5f, 0x1d,</div><div class='del'>-	0xd0, 0x8e, 0x61, 0xda, 0xe2, 0x2d, 0xa5, 0xf4, 0x13, 0x63, 0x30, 0x64,</div><div class='del'>-	0xaa, 0xcb, 0xb5, 0x43, 0x78, 0xdc, 0xba, 0x16, 0xf4, 0xef, 0x9e, 0x49,</div><div class='del'>-	0x3a, 0x1c, 0x1a, 0x02, 0x95, 0x89, 0x76, 0x65, 0x37, 0xeb, 0x6e, 0xc7,</div><div class='del'>-	0x4c, 0x87, 0xd2, 0xb1, 0x20, 0x31, 0xd0, 0xa5, 0x6c, 0x67, 0xcd, 0x4d,</div><div class='del'>-	0xb2, 0xe6, 0x26, 0x59, 0x73, 0x93, 0xe4, 0x23, 0xc9, 0x5a, 0xdb, 0x96,</div><div class='del'>-	0x4f, 0x29, 0x3b, 0x44, 0xff, 0xf4, 0xaf, 0xe7, 0x0d, 0x1b, 0x47, 0x30,</div><div class='del'>-	0x07, 0xf9, 0x3b, 0xf3, 0x6b, 0x1d, 0x36, 0xb6, 0x4b, 0x29, 0x45, 0x2c,</div><div class='del'>-	0xe3, 0xa9, 0xd0, 0x58, 0xcb, 0x8c, 0x94, 0xd2, 0xcd, 0x7a, 0xdb, 0x6f,</div><div class='del'>-	0xe9, 0x32, 0x32, 0xfc, 0x0e, 0xeb, 0xec, 0xeb, 0xac, 0xb3, 0xb9, 0x38,</div><div class='del'>-	0xe3, 0x6a, 0xcd, 0x55, 0x73, 0x60, 0xa5, 0x5d, 0x13, 0xc6, 0xc8, 0xef,</div><div class='del'>-	0x77, 0x69, 0xb3, 0x02, 0x6b, 0x69, 0xbb, 0x53, 0xc1, 0x7e, 0x0d, 0xd5,</div><div class='del'>-	0xb5, 0xcc, 0xa9, 0x47, 0xf3, 0xac, 0x03, 0x7a, 0xa4, 0xe5, 0x7d, 0x2a,</div><div class='del'>-	0xf6, 0xa8, 0xe6, 0xc6, 0xd5, 0x9b, 0x08, 0x76, 0xb4, 0x36, 0x1c, 0xcf,</div><div class='del'>-	0x96, 0x63, 0x28, 0x9e, 0x5c, 0xe1, 0x21, 0x56, 0xe9, 0x6a, 0xc6, 0xa3,</div><div class='del'>-	0x5c, 0x5a, 0x09, 0x25, 0xa2, 0xf4, 0x1b, 0x24, 0xa7, 0x58, 0x27, 0x26,</div><div class='del'>-	0x8d, 0xaf, 0x22, 0xc7, 0x7a, 0x3a, 0xaf, 0xbb, 0xf0, 0x7a, 0x6e, 0x2d,</div><div class='del'>-	0xf3, 0x5c, 0x54, 0xf7, 0x29, 0x15, 0x8c, 0xdf, 0x04, 0x32, 0x86, 0xe4,</div><div class='del'>-	0x27, 0xd3, 0x9c, 0x17, 0x1e, 0xa2, 0xd1, 0xe4, 0x28, 0x24, 0x67, 0x99,</div><div class='del'>-	0xab, 0xef, 0x8d, 0x97, 0x61, 0x73, 0xd4, 0x8f, 0xd5, 0xda, 0x80, 0xd2,</div><div class='del'>-	0x95, 0x8f, 0xea, 0xe7, 0xf1, 0xbb, 0xca, 0x9e, 0x85, 0x04, 0x63, 0xbb,</div><div class='del'>-	0x9f, 0xba, 0xa9, 0xc0, 0xa5, 0xa0, 0xf0, 0x88, 0x6a, 0xb7, 0xe6, 0xc0,</div><div class='del'>-	0xbb, 0x77, 0x2b, 0x08, 0x68, 0x49, 0x5c, 0x68, 0x0e, 0xd0, 0xaf, 0xba,</div><div class='del'>-	0x88, 0x31, 0xc2, 0x70, 0x2e, 0x86, 0xfc, 0x3b, 0x68, 0x8b, 0xca, 0xc5,</div><div class='del'>-	0x3a, 0xda, 0x87, 0xbe, 0x47, 0x1d, 0xb6, 0x51, 0x87, 0xdd, 0x73, 0x08,</div><div class='del'>-	0x54, 0x24, 0xfa, 0x94, 0x8e, 0x7c, 0xbb, 0xd2, 0x9e, 0x57, 0xa9, 0x27,</div><div class='del'>-	0xd1, 0xc9, 0x37, 0x89, 0x95, 0xc4, 0x57, 0x4a, 0xb6, 0x14, 0x7f, 0xbd,</div><div class='del'>-	0xd1, 0x9e, 0xfd, 0x0e, 0x89, 0xb9, 0xcd, 0x6b, 0x12, 0x8c, 0x47, 0x07,</div><div class='del'>-	0xf9, 0x12, 0x1e, 0x3c, 0xa8, 0x6e, 0x30, 0x57, 0x5f, 0x89, 0x33, 0x79,</div><div class='del'>-	0x56, 0x24, 0x30, 0x95, 0xef, 0xa1, 0x5d, 0x36, 0x14, 0xfd, 0x2b, 0xe0,</div><div class='del'>-	0xdf, 0x36, 0xd3, 0xae, 0x6c, 0x5b, 0x58, 0xe1, 0xef, 0xa5, 0x0d, 0x7b,</div><div class='del'>-	0x17, 0x42, 0x42, 0x97, 0xeb, 0x8b, 0x6d, 0x93, 0x70, 0x68, 0xff, 0x9a,</div><div class='del'>-	0x2d, 0xbf, 0x41, 0x5a, 0x62, 0x4f, 0x6f, 0xc9, 0x4f, 0xfd, 0x7b, 0x66,</div><div class='del'>-	0x92, 0x78, 0x77, 0x83, 0x9b, 0x35, 0xb5, 0x84, 0x29, 0xaa, 0x8a, 0x9f,</div><div class='del'>-	0xa7, 0x1d, 0xd0, 0x52, 0x4a, 0x97, 0xf8, 0x91, 0xdb, 0x5e, 0xf3, 0xce,</div><div class='del'>-	0x19, 0xb8, 0x09, 0x15, 0xc2, 0x4e, 0x62, 0xba, 0x0f, 0xe3, 0xd1, 0x81,</div><div class='del'>-	0x73, 0x4a, 0x8f, 0xd2, 0x93, 0x97, 0x1a, 0x6c, 0xfb, 0x54, 0x1b, 0x7d,</div><div class='del'>-	0xaa, 0x9d, 0xfc, 0xb4, 0xd3, 0xa7, 0xba, 0xc9, 0x4f, 0xb7, 0xe5, 0x53,</div><div class='del'>-	0xe2, 0x9b, 0xbf, 0xce, 0xcb, 0xd6, 0xfc, 0x1e, 0x4b, 0x2f, 0x3b, 0xf8,</div><div class='del'>-	0x6e, 0x17, 0xe5, 0xe8, 0xe2, 0x7b, 0x7b, 0xf8, 0xde, 0x9e, 0x85, 0xff,</div><div class='del'>-	0x2d, 0xfc, 0x51, 0x16, 0x3b, 0xf6, 0xaf, 0xd7, 0x34, 0xc9, 0x01, 0xaf,</div><div class='del'>-	0x15, 0x31, 0x05, 0xd2, 0x8e, 0x84, 0xe4, 0x88, 0x61, 0xf4, 0x36, 0xc3,</div><div class='del'>-	0xb3, 0x22, 0xf1, 0x93, 0xd6, 0x5d, 0xf5, 0xcc, 0x67, 0xcc, 0xa7, 0x9e,</div><div class='del'>-	0x29, 0x62, 0x69, 0xe6, 0xe8, 0xf9, 0x16, 0x05, 0x63, 0xfa, 0xcd, 0x8c,</div><div class='del'>-	0x53, 0x1d, 0x13, 0x79, 0xb5, 0x2b, 0xcc, 0x7b, 0x4d, 0x93, 0x82, 0xf1,</div><div class='del'>-	0x0f, 0xa2, 0x8d, 0xb8, 0x2e, 0x94, 0x18, 0x42, 0xc8, 0x88, 0x84, 0x26,</div><div class='del'>-	0x14, 0x75, 0x68, 0x2b, 0xd4, 0x25, 0xd6, 0x86, 0xd4, 0x9c, 0xa2, 0x0e,</div><div class='del'>-	0xd7, 0x3a, 0xd5, 0xe4, 0x9b, 0x16, 0xbe, 0x3e, 0x88, 0x35, 0x16, 0x86,</div><div class='del'>-	0x1b, 0x42, 0x8c, 0x58, 0x76, 0x07, 0x69, 0x1e, 0xd8, 0xac, 0xe0, 0xb2,</div><div class='del'>-	0xfe, 0x21, 0xed, 0xa8, 0x26, 0xd3, 0x8a, 0x8e, 0x0c, 0xf3, 0x44, 0x68,</div><div class='del'>-	0x4a, 0xb0, 0xfa, 0x41, 0x62, 0x75, 0x78, 0x7c, 0x7c, 0x36, 0x33, 0x19,</div><div class='del'>-	0x49, 0x79, 0x9c, 0x6a, 0x8c, 0x38, 0x3d, 0x49, 0x9a, 0x7a, 0x9e, 0xf8,</div><div class='del'>-	0x9d, 0x6b, 0x84, 0xf7, 0x17, 0x69, 0x46, 0x8b, 0x34, 0xb5, 0x1c, 0x18,</div><div class='del'>-	0x37, 0x13, 0xe8, 0x8c, 0xb2, 0x56, 0x30, 0xe7, 0x1d, 0x93, 0x9e, 0x80,</div><div class='del'>-	0xf4, 0xca, 0xa7, 0x74, 0x7e, 0x4f, 0x29, 0xbb, 0x25, 0xa6, 0xca, 0x6d,</div><div class='del'>-	0x2b, 0x54, 0x73, 0x8d, 0xaa, 0xc4, 0x61, 0x2c, 0x5a, 0x6b, 0x0c, 0xcb,</div><div class='del'>-	0x1a, 0xc3, 0x3f, 0x53, 0xd4, 0xd8, 0x39, 0x45, 0x72, 0x75, 0x63, 0xff,</div><div class='del'>-	0x39, 0xc6, 0xd0, 0x51, 0x45, 0x6d, 0x39, 0x4e, 0xf1, 0xbd, 0x9a, 0xd0,</div><div class='del'>-	0x3f, 0x5c, 0x5c, 0x67, 0x18, 0x0d, 0x39, 0xc6, 0x67, 0xde, 0xa3, 0x6c,</div><div class='del'>-	0xcd, 0xb6, 0x61, 0x6c, 0xae, 0x0d, 0xa3, 0x59, 0x05, 0x7b, 0xf4, 0x95,</div><div class='del'>-	0xb8, 0x74, 0xb3, 0xd5, 0xa7, 0x54, 0xad, 0xd6, 0x6a, 0x31, 0x12, 0x40,</div><div class='del'>-	0xb5, 0x43, 0xfb, 0x0a, 0xf6, 0x16, 0x31, 0x7e, 0xe7, 0x89, 0x5e, 0xe6,</div><div class='del'>-	0x7d, 0x13, 0xef, 0x33, 0x96, 0x22, 0x35, 0x48, 0xba, 0x13, 0x2d, 0xc4,</div><div class='del'>-	0xe3, 0x75, 0x4e, 0x3b, 0xde, 0xff, 0xc9, 0x63, 0xdb, 0x40, 0xf4, 0xff,</div><div class='del'>-	0xf9, 0x7b, 0x6d, 0x78, 0x32, 0x5b, 0x86, 0x96, 0x0d, 0xb8, 0x2b, 0x84,</div><div class='del'>-	0x2a, 0x07, 0x6b, 0xdc, 0x5b, 0xbb, 0x94, 0x14, 0xef, 0x59, 0xcf, 0x7a,</div><div class='del'>-	0xbe, 0x9c, 0xe8, 0x4d, 0xfc, 0x97, 0x06, 0xb9, 0x6e, 0xe5, 0x8d, 0x1b,</div><div class='del'>-	0xae, 0x0f, 0x7f, 0xc1, 0x75, 0x05, 0xcf, 0x31, 0x91, 0x7d, 0x8f, 0x35,</div><div class='del'>-	0x25, 0x97, 0x31, 0xe1, 0x4c, 0xb8, 0x30, 0x34, 0x19, 0xc6, 0xc1, 0xc5,</div><div class='del'>-	0x20, 0x16, 0x33, 0xea, 0xc0, 0x25, 0xf6, 0x0f, 0x7b, 0x9b, 0x35, 0x3c,</div><div class='del'>-	0xb8, 0x18, 0xc2, 0x42, 0x06, 0xa6, 0x37, 0xa1, 0x15, 0xbc, 0x4a, 0x0c,</div><div class='del'>-	0x07, 0x16, 0xeb, 0x70, 0x2e, 0xa3, 0x2d, 0x8d, 0x2a, 0xd1, 0x54, 0x2d,</div><div class='del'>-	0x71, 0xc7, 0xc3, 0x8b, 0x4d, 0x78, 0x68, 0xd1, 0xc3, 0x77, 0x4c, 0x74,</div><div class='del'>-	0xc7, 0xeb, 0xf8, 0xbc, 0x03, 0xcf, 0x9e, 0x34, 0x4d, 0xc1, 0x5d, 0x43,</div><div class='del'>-	0x8b, 0xc0, 0xc2, 0x34, 0x6b, 0xd1, 0x19, 0xd6, 0xa5, 0xa7, 0x80, 0x03,</div><div class='del'>-	0x4f, 0x39, 0x30, 0x37, 0x6d, 0x62, 0xaf, 0x3e, 0x5a, 0xeb, 0xa0, 0xc3,</div><div class='del'>-	0x0f, 0xb0, 0x6e, 0xb8, 0x59, 0x03, 0xef, 0x0d, 0xd8, 0xf9, 0xfc, 0x12,</div><div class='del'>-	0xf3, 0xd4, 0xfd, 0x4f, 0xc5, 0xf0, 0x56, 0x26, 0x8d, 0x6e, 0xe2, 0xf3,</div><div class='del'>-	0x14, 0x79, 0x79, 0x33, 0xc3, 0x3a, 0xb6, 0xa8, 0xe3, 0x8d, 0x8c, 0x87,</div><div class='del'>-	0xeb, 0x34, 0xe1, 0xe5, 0x8c, 0x3c, 0x23, 0xcf, 0xfa, 0x30, 0x48, 0x5e,</div><div class='del'>-	0x5e, 0xcf, 0x84, 0xb8, 0x66, 0x10, 0x3f, 0xe6, 0x73, 0xf7, 0x2d, 0x6a,</div><div class='del'>-	0xac, 0x5b, 0x1e, 0xae, 0x1b, 0xc6, 0xab, 0x19, 0x1f, 0x79, 0x0d, 0xb2,</div><div class='del'>-	0x56, 0x0d, 0x62, 0x2c, 0xd3, 0xb8, 0xb4, 0x95, 0x89, 0xda, 0xae, 0x35,</div><div class='del'>-	0x72, 0xed, 0x1d, 0xb3, 0xc7, 0x8a, 0x45, 0x59, 0xa7, 0xb4, 0xee, 0x20,</div><div class='del'>-	0x46, 0x33, 0x6f, 0x38, 0x4b, 0xfd, 0xf4, 0x73, 0xd3, 0xcb, 0x16, 0xf6,</div><div class='del'>-	0x7b, 0xd6, 0xe0, 0xdf, 0x73, 0xc0, 0x39, 0x23, 0x6d, 0x56, 0x27, 0x88,</div><div class='del'>-	0x75, 0x59, 0xa3, 0x7e, 0xba, 0xb1, 0x89, 0xeb, 0x6a, 0x03, 0x2f, 0x29,</div><div class='del'>-	0xd2, 0xef, 0xb8, 0x10, 0x7e, 0x4a, 0xf4, 0x45, 0xcc, 0xbc, 0x00, 0xfc,</div><div class='del'>-	0x25, 0xf1, 0x67, 0xc3, 0xa4, 0x2a, 0x7e, 0xdf, 0x4f, 0x5c, 0xd3, 0x5b,</div><div class='del'>-	0x40, 0x7d, 0xec, 0x41, 0x8c, 0x98, 0x65, 0xc4, 0xe7, 0xd5, 0xc4, 0xb5,</div><div class='del'>-	0x8b, 0x4d, 0xac, 0x53, 0x1b, 0x4d, 0xf3, 0x6f, 0x9b, 0x61, 0x3a, 0x12,</div><div class='del'>-	0x9a, 0x5e, 0xeb, 0x2c, 0x7c, 0xa5, 0x0a, 0xda, 0x92, 0x5f, 0xd1, 0x0a,</div><div class='del'>-	0x3f, 0x45, 0x74, 0xf8, 0x3c, 0x44, 0xaf, 0xc0, 0xda, 0x45, 0x17, 0xd6,</div><div class='del'>-	0x51, 0x9e, 0x6d, 0x93, 0x5c, 0x9b, 0xf8, 0x24, 0x4a, 0x99, 0x76, 0x4e,</div><div class='del'>-	0x12, 0x73, 0x69, 0x3e, 0xac, 0xa1, 0x8e, 0x87, 0x4e, 0x99, 0x66, 0x39,</div><div class='del'>-	0x75, 0xdc, 0x40, 0xfb, 0xec, 0x3f, 0x61, 0xe2, 0x25, 0xfd, 0x25, 0xea,</div><div class='del'>-	0x54, 0x21, 0x6e, 0x6c, 0xe6, 0x3b, 0x41, 0x3e, 0xef, 0xc1, 0x81, 0x49,</div><div class='del'>-	0xe9, 0x97, 0xea, 0xf8, 0xcc, 0x45, 0x1c, 0xcf, 0xc4, 0xd0, 0x44, 0xfd,</div><div class='del'>-	0x85, 0x49, 0xb3, 0x91, 0xef, 0x84, 0x49, 0x2f, 0xbc, 0xf8, 0x35, 0x6c,</div><div class='del'>-	0x3f, 0xa5, 0x40, 0x8b, 0x8a, 0x0e, 0xbe, 0x86, 0xf6, 0x33, 0x5f, 0x94,</div><div class='del'>-	0x13, 0x98, 0xa5, 0xa6, 0xd5, 0x89, 0x02, 0xf1, 0x77, 0x55, 0x62, 0x04,</div><div class='del'>-	0xac, 0xdf, 0x78, 0x73, 0x56, 0xc1, 0xd4, 0x34, 0xfb, 0xbd, 0x8d, 0x30,</div><div class='del'>-	0x2b, 0x28, 0xd3, 0x1b, 0xb3, 0xbf, 0x81, 0x67, 0x4e, 0x52, 0x0f, 0x4f,</div><div class='del'>-	0x07, 0xf1, 0xbd, 0x8c, 0x0b, 0xb7, 0x4e, 0x09, 0xa6, 0xd3, 0x62, 0x07,</div><div class='del'>-	0x15, 0xe9, 0x8f, 0xa4, 0x6f, 0x89, 0x86, 0xdd, 0x8a, 0x03, 0xf5, 0xcf,</div><div class='del'>-	0xb8, 0xa0, 0x9d, 0x0b, 0xc3, 0x5d, 0xef, 0x81, 0x56, 0xff, 0xfb, 0xcc,</div><div class='del'>-	0x35, 0x0e, 0x94, 0xb1, 0x97, 0xed, 0xfc, 0x76, 0x8c, 0xd7, 0x82, 0xbc,</div><div class='del'>-	0x86, 0xdf, 0x28, 0x87, 0x73, 0x95, 0x93, 0x35, 0xbc, 0x4c, 0x23, 0x1e,</div><div class='del'>-	0x73, 0x99, 0xa6, 0x93, 0xb5, 0x61, 0xf7, 0x77, 0x4c, 0x33, 0xb2, 0x41,</div><div class='del'>-	0x9e, 0x0f, 0x20, 0x72, 0x4e, 0xe3, 0x73, 0x76, 0xbd, 0xbc, 0x8e, 0xc7,</div><div class='del'>-	0x9c, 0xf4, 0x23, 0x89, 0x55, 0xd6, 0x7b, 0xab, 0x87, 0xb2, 0x71, 0xfb,</div><div class='del'>-	0x0b, 0x79, 0xc1, 0x36, 0x61, 0x4b, 0x86, 0xb3, 0xd3, 0x0a, 0x73, 0x76,</div><div class='del'>-	0x82, 0xcf, 0x6e, 0x81, 0x33, 0xae, 0x4e, 0xa4, 0xe9, 0x07, 0x7b, 0x03,</div><div class='del'>-	0x2d, 0x78, 0xce, 0x70, 0xa3, 0x52, 0x5b, 0x85, 0x07, 0x7a, 0x03, 0x78,</div><div class='del'>-	0x8e, 0x7d, 0x01, 0x6d, 0x16, 0x2b, 0x80, 0x8d, 0xb4, 0x9f, 0xf4, 0x1c,</div><div class='del'>-	0x3f, 0x84, 0xf6, 0x6d, 0x07, 0xf3, 0x9c, 0xd3, 0xca, 0x73, 0x65, 0xf5,</div><div class='del'>-	0x40, 0x21, 0xe7, 0xc2, 0x05, 0xcd, 0xc6, 0x84, 0x2f, 0x58, 0x35, 0x5b,</div><div class='del'>-	0x0d, 0x14, 0xae, 0x61, 0x41, 0xb5, 0x25, 0xa9, 0x90, 0x19, 0xbf, 0xe8,</div><div class='del'>-	0xae, 0xdf, 0x65, 0xfb, 0xd2, 0xdf, 0x38, 0xa5, 0xe7, 0xb8, 0xfe, 0xbd,</div><div class='del'>-	0x02, 0x8e, 0x84, 0x1a, 0x6a, 0x73, 0xc2, 0xe3, 0x4a, 0x0c, 0xb5, 0x8e,</div><div class='del'>-	0x6b, 0x5f, 0xba, 0x81, 0xf7, 0x26, 0x8c, 0xe5, 0xaf, 0xf7, 0xda, 0x5d,</div><div class='del'>-	0x19, 0xcb, 0x87, 0xba, 0x44, 0xf7, 0x4f, 0xe8, 0x92, 0x67, 0x53, 0x4a,</div><div class='del'>-	0x3b, 0xf3, 0x56, 0xda, 0x85, 0x74, 0x15, 0x9f, 0xa1, 0xfe, 0x71, 0x74,</div><div class='del'>-	0x52, 0xe8, 0x1c, 0xc6, 0x78, 0x46, 0x66, 0x1b, 0xc3, 0xd8, 0x6c, 0x44,</div><div class='del'>-	0x62, 0x4b, 0xec, 0xa1, 0x8f, 0x40, 0xe6, 0x10, 0x8d, 0x85, 0x57, 0x14,</div><div class='del'>-	0x35, 0x75, 0x8b, 0x53, 0x1d, 0x5a, 0x56, 0xec, 0xbc, 0xb5, 0xb6, 0x98,</div><div class='del'>-	0xb7, 0xd6, 0xe4, 0x56, 0xf9, 0x7b, 0x58, 0x0f, 0x7a, 0x16, 0x4a, 0xf5,</div><div class='del'>-	0xa1, 0x47, 0xe9, 0xb4, 0x6a, 0x6b, 0xbf, 0xb2, 0x63, 0xc1, 0xa3, 0x74,</div><div class='del'>-	0x64, 0x3d, 0x78, 0x85, 0x58, 0x6c, 0xb6, 0x0f, 0x81, 0x5b, 0x37, 0xc2,</div><div class='del'>-	0xbb, 0x23, 0xdb, 0x8b, 0x72, 0x4d, 0x7a, 0xc8, 0x72, 0x74, 0x5a, 0x75,</div><div class='del'>-	0xad, 0xce, 0xdf, 0xc3, 0xfa, 0xd3, 0x93, 0xef, 0x63, 0xfe, 0x43, 0xc0,</div><div class='del'>-	0x9b, 0xb0, 0x67, 0x06, 0x92, 0x0b, 0xef, 0xe0, 0xbb, 0x4b, 0xf1, 0x15,</div><div class='del'>-	0x80, 0x5d, 0xff, 0x94, 0x7e, 0xf6, 0x12, 0xd5, 0x1b, 0x14, 0x5c, 0xba,</div><div class='del'>-	0xcb, 0x03, 0xd2, 0x62, 0xcf, 0x7f, 0xb1, 0xf5, 0xc2, 0x74, 0xaf, 0xd2,</div><div class='del'>-	0x31, 0x37, 0xef, 0xdd, 0x66, 0xc8, 0x2c, 0x62, 0xd6, 0xdb, 0x4e, 0x1e,</div><div class='del'>-	0xda, 0x17, 0x9e, 0xf6, 0x6e, 0x25, 0x4f, 0x5b, 0x17, 0x3e, 0x4f, 0x53,</div><div class='del'>-	0xea, 0xca, 0x44, 0x6b, 0x1b, 0x63, 0x7b, 0xb7, 0xfe, 0x91, 0x19, 0xfe,</div><div class='del'>-	0x1d, 0xa1, 0xb3, 0x58, 0xd4, 0x67, 0x92, 0x7c, 0x05, 0x3d, 0x9d, 0xf9,</div><div class='del'>-	0x80, 0x27, 0x99, 0x6f, 0xf7, 0xb6, 0x19, 0xbd, 0xde, 0xad, 0x46, 0x9f,</div><div class='del'>-	0xb7, 0xdd, 0xb8, 0x87, 0xb4, 0x7b, 0xbc, 0x1d, 0x06, 0xe3, 0x3a, 0xdf,</div><div class='del'>-	0x47, 0xbd, 0xf6, 0x62, 0x3c, 0x7f, 0x0f, 0xb1, 0x87, 0xd0, 0x1c, 0x20,</div><div class='del'>-	0x0e, 0xf2, 0x52, 0xc6, 0x11, 0xca, 0x58, 0x08, 0xb9, 0x91, 0x54, 0xdd,</div><div class='del'>-	0xd4, 0xd7, 0x98, 0x65, 0xc7, 0x09, 0x6b, 0x16, 0x55, 0x91, 0x98, 0x6c,</div><div class='del'>-	0xed, 0x3e, 0xc1, 0x7c, 0x9f, 0x38, 0xda, 0x7a, 0xeb, 0x29, 0xd4, 0xb8,</div><div class='del'>-	0x13, 0xd2, 0x3b, 0xb3, 0x1f, 0x8e, 0x46, 0xf5, 0xf7, 0x10, 0x0d, 0xbd,</div><div class='del'>-	0xc2, 0x67, 0x47, 0xe9, 0xbb, 0x63, 0xd6, 0xfc, 0x81, 0x06, 0xc9, 0x35,</div><div class='del'>-	0xa1, 0xdb, 0xf0, 0x78, 0x77, 0xb2, 0x37, 0xf3, 0x27, 0xd4, 0x96, 0x3b,</div><div class='del'>-	0x9c, 0x32, 0x0f, 0x29, 0xfc, 0x96, 0x0f, 0x4d, 0xe8, 0xca, 0x7b, 0x28,</div><div class='del'>-	0xd7, 0x97, 0xf0, 0x0f, 0x27, 0x59, 0xd7, 0x20, 0x7e, 0x68, 0x9a, 0xf7,</div><div class='del'>-	0xb1, 0xaf, 0x39, 0x96, 0xab, 0xc3, 0x65, 0xcb, 0xc6, 0x2e, 0x1c, 0xcd,</div><div class='del'>-	0x85, 0xf1, 0x0e, 0xe5, 0x73, 0x2d, 0xd6, 0xe2, 0xed, 0x69, 0x27, 0xf6,</div><div class='del'>-	0xe9, 0xb7, 0x17, 0xeb, 0x85, 0x03, 0xf7, 0xc6, 0x0e, 0x11, 0x3b, 0x38,</div><div class='del'>-	0x50, 0x4d, 0xfc, 0xf6, 0xb0, 0x75, 0xcd, 0xc9, 0xfe, 0xef, 0xb7, 0x91,</div><div class='del'>-	0xb2, 0xeb, 0x09, 0x79, 0x7c, 0x94, 0x3c, 0x36, 0x7b, 0xb7, 0x66, 0x55,</div><div class='del'>-	0xef, 0x9d, 0x59, 0x78, 0xdc, 0x89, 0xd1, 0xd6, 0x33, 0x27, 0x4d, 0x0c,</div><div class='del'>-	0xea, 0xb7, 0xe1, 0xca, 0xc9, 0xd1, 0x21, 0x17, 0xfd, 0xe7, 0xe7, 0xf1,</div><div class='del'>-	0x7e, 0x18, 0x33, 0xb8, 0x40, 0xe4, 0x71, 0xd1, 0xc7, 0xdc, 0xde, 0x10,</div><div class='del'>-	0x8f, 0x06, 0x58, 0x8b, 0xf5, 0x05, 0xc6, 0x66, 0x07, 0xd4, 0x21, 0xd6,</div><div class='del'>-	0xe4, 0xa4, 0x33, 0x11, 0x1d, 0x18, 0x23, 0x78, 0xac, 0x22, 0x3f, 0x5e,</div><div class='del'>-	0xe6, 0x6e, 0xdf, 0x62, 0xd8, 0xbb, 0x9b, 0xf5, 0x26, 0xc4, 0xfe, 0xce,</div><div class='del'>-	0x1b, 0xc5, 0xed, 0xb5, 0x88, 0xc6, 0x96, 0x29, 0xb7, 0x7b, 0xb1, 0xc9,</div><div class='del'>-	0x7b, 0x07, 0xeb, 0xc7, 0xe5, 0xa8, 0x39, 0xf2, 0x92, 0xee, 0x83, 0x7f,</div><div class='del'>-	0x51, 0xa7, 0xbe, 0xfb, 0x31, 0xba, 0xc0, 0x96, 0x2b, 0xca, 0x9e, 0x7f,</div><div class='del'>-	0xb1, 0xc5, 0xbb, 0x93, 0xb1, 0x59, 0x45, 0x13, 0x35, 0x2e, 0x26, 0xbd,</div><div class='del'>-	0xd2, 0xf3, 0x35, 0x2d, 0x6e, 0x22, 0x7f, 0xe2, 0xa3, 0x99, 0xd6, 0xcd,</div><div class='del'>-	0xf4, 0x87, 0xf0, 0x22, 0x3a, 0x99, 0xe6, 0x5e, 0x26, 0xcd, 0xfe, 0x10,</div><div class='del'>-	0x31, 0xec, 0x81, 0x8d, 0x3e, 0xe6, 0x29, 0xd1, 0x25, 0xf5, 0x98, 0x2f,</div><div class='del'>-	0xc9, 0x24, 0x75, 0xf9, 0x68, 0xeb, 0xe2, 0x29, 0xa9, 0xcb, 0xa9, 0xd6,</div><div class='del'>-	0xcc, 0x29, 0x0d, 0xef, 0xb0, 0xb6, 0xac, 0x8d, 0xab, 0xfa, 0x39, 0x25,</div><div class='del'>-	0x12, 0xba, 0x48, 0x59, 0x5c, 0xf8, 0x85, 0xb9, 0x57, 0x8b, 0x16, 0x6e,</div><div class='del'>-	0x61, 0x3c, 0x55, 0x33, 0x37, 0x86, 0x98, 0xf3, 0xab, 0x17, 0xa9, 0x98,</div><div class='del'>-	0x45, 0xa7, 0x1b, 0x15, 0x21, 0x78, 0xa2, 0x1a, 0xde, 0x3d, 0x19, 0xa3,</div><div class='del'>-	0x1e, 0xae, 0xd1, 0x3c, 0x48, 0xa8, 0x35, 0xc8, 0x52, 0xf8, 0xd8, 0x33,</div><div class='del'>-	0xf4, 0xc5, 0x71, 0xae, 0x5b, 0xb6, 0x28, 0x3c, 0xcb, 0xf3, 0x41, 0x3e,</div><div class='del'>-	0x7f, 0x7d, 0xed, 0x6a, 0xae, 0xfd, 0xd1, 0x29, 0xf1, 0xd7, 0x54, 0xeb,</div><div class='del'>-	0x85, 0x93, 0xf6, 0xda, 0xd1, 0x78, 0x0c, 0x1f, 0x9e, 0x54, 0x87, 0xdf,</div><div class='del'>-	0x55, 0x22, 0x03, 0x17, 0x14, 0x59, 0x1f, 0x75, 0x55, 0xb8, 0x62, 0x8e,</div><div class='del'>-	0x46, 0xa3, 0xa9, 0xbd, 0xa4, 0xd9, 0xb2, 0x89, 0xfa, 0xb7, 0xf8, 0xa0,</div><div class='del'>-	0xcf, 0x33, 0xcf, 0xba, 0xc9, 0x8f, 0xcd, 0x4b, 0x1d, 0x69, 0x9f, 0x2c,</div><div class='del'>-	0xf6, 0x6a, 0xec, 0x53, 0xaf, 0xf3, 0x13, 0xa4, 0x1e, 0x3c, 0xbb, 0x9b,</div><div class='del'>-	0x7d, 0xa8, 0xb5, 0x9e, 0x0b, 0xf0, 0x39, 0xd1, 0xc3, 0x2f, 0x15, 0x87,</div><div class='del'>-	0xf6, 0x1e, 0xf3, 0x98, 0xe4, 0x92, 0x20, 0x73, 0xd8, 0x3d, 0xd2, 0xd3,</div><div class='del'>-	0xa6, 0xd3, 0xf4, 0x77, 0x37, 0xfd, 0x7d, 0x9b, 0xf8, 0xb4, 0x41, 0x9f,</div><div class='del'>-	0x36, 0xe8, 0xd3, 0x86, 0x1a, 0x1a, 0x46, 0x24, 0x30, 0x48, 0xbb, 0x25,</div><div class='del'>-	0x43, 0xe2, 0xeb, 0x7d, 0xd8, 0xc7, 0xdf, 0xfd, 0xbc, 0x7f, 0x94, 0x7d,</div><div class='del'>-	0x2e, 0x56, 0xc8, 0x9a, 0x87, 0xd1, 0x6e, 0x3c, 0x86, 0xa1, 0x2c, 0x7e,</div><div class='del'>-	0xe5, 0x6d, 0x2e, 0x47, 0xf9, 0x1a, 0xe9, 0xe1, 0xd5, 0xc0, 0x31, 0x3c,</div><div class='del'>-	0xc6, 0x3e, 0xea, 0x97, 0x4a, 0xa5, 0xe6, 0xea, 0x3d, 0xae, 0xa8, 0x81,</div><div class='del'>-	0x76, 0xf6, 0xc3, 0x7b, 0xf3, 0xf7, 0xd0, 0xbe, 0x91, 0xa1, 0x57, 0x14,</div><div class='del'>-	0xf6, 0x52, 0xb5, 0x5c, 0x9b, 0xb1, 0x74, 0x27, 0xd7, 0x31, 0x84, 0x0f,</div><div class='del'>-	0x2b, 0xdf, 0xfe, 0x1e, 0x44, 0xb7, 0x3f, 0x6a, 0x18, 0xe4, 0xfa, 0x36,</div><div class='del'>-	0x1f, 0xa3, 0xec, 0x29, 0x07, 0x19, 0x63, 0xfb, 0xac, 0xf8, 0xea, 0x23,</div><div class='del'>-	0x8d, 0xeb, 0x79, 0x6c, 0x6b, 0x46, 0x6a, 0xa9, 0x89, 0xc7, 0x75, 0x13,</div><div class='del'>-	0xcf, 0xf2, 0x77, 0x89, 0xb9, 0x6c, 0xec, 0x86, 0x5c, 0xe6, 0xe0, 0x73,</div><div class='del'>-	0xbb, 0xf9, 0x5c, 0x0b, 0x53, 0xe7, 0xc2, 0x9c, 0xcc, 0x06, 0x0f, 0xcb,</div><div class='del'>-	0x6c, 0x10, 0x39, 0x43, 0x74, 0x3f, 0x8c, 0x0b, 0x99, 0x48, 0xca, 0xe9,</div><div class='del'>-	0x34, 0x47, 0x18, 0x57, 0x4b, 0x1f, 0xd1, 0x77, 0x5f, 0xdf, 0xa8, 0xf6,</div><div class='del'>-	0x52, 0x87, 0xb1, 0x49, 0x45, 0x0d, 0xbd, 0x86, 0x42, 0xa7, 0x07, 0x8d,</div><div class='del'>-	0xe1, 0x75, 0xce, 0x68, 0xe0, 0x2c, 0xd4, 0xc2, 0x20, 0x25, 0x7d, 0x3a,</div><div class='del'>-	0x6f, 0xe7, 0xba, 0xcd, 0xc5, 0x5c, 0xd7, 0x92, 0xab, 0x50, 0xee, 0xcc,</div><div class='del'>-	0xb2, 0x3e, 0xcf, 0x99, 0x69, 0x3f, 0xeb, 0x55, 0x7e, 0x4e, 0x68, 0x8f,</div><div class='del'>-	0xa0, 0x31, 0x2e, 0xb4, 0xb4, 0xae, 0x49, 0x05, 0x5f, 0xaf, 0x44, 0x94,</div><div class='del'>-	0xb5, 0x0a, 0x7a, 0xb9, 0x96, 0x36, 0x59, 0x93, 0x02, 0xee, 0x84, 0xd4,</div><div class='del'>-	0xce, 0x1e, 0xf6, 0x2d, 0x7d, 0xcc, 0x8b, 0x82, 0xa9, 0x65, 0x5e, 0x6a,</div><div class='del'>-	0xe7, 0xa3, 0x6d, 0x79, 0xb1, 0x8b, 0xd8, 0x44, 0x6c, 0x73, 0x18, 0x07,</div><div class='del'>-	0xac, 0x79, 0xb4, 0x89, 0x69, 0x5d, 0x72, 0x83, 0xd8, 0xe9, 0x30, 0xf6,</div><div class='del'>-	0xe7, 0xdd, 0xb8, 0x97, 0x79, 0x70, 0xbe, 0x99, 0xba, 0xf2, 0xbb, 0x31,</div><div class='del'>-	0x38, 0x77, 0x3b, 0xf6, 0x65, 0x65, 0x9e, 0xe0, 0xa6, 0xfd, 0x92, 0xc4,</div><div class='del'>-	0x40, 0xcc, 0x3a, 0xc4, 0x3f, 0x65, 0x5a, 0x49, 0xa7, 0x42, 0x5b, 0x74,</div><div class='del'>-	0x5a, 0xfa, 0xbe, 0xe0, 0xb6, 0x75, 0x6c, 0xcf, 0x2d, 0x9d, 0x09, 0x59,</div><div class='del'>-	0xab, 0x34, 0xb3, 0xb4, 0xf5, 0xda, 0x99, 0x91, 0x35, 0x4d, 0x9c, 0xd5,</div><div class='del'>-	0x6d, 0x4c, 0x5b, 0xd2, 0x67, 0x88, 0x32, 0xd7, 0x6c, 0x02, 0xd6, 0xdd,</div><div class='del'>-	0x80, 0x6b, 0x2b, 0x78, 0xad, 0xfb, 0x3a, 0xae, 0xed, 0x17, 0xec, 0x4c,</div><div class='del'>-	0x5c, 0xdb, 0xb5, 0x83, 0xb8, 0xb6, 0x5e, 0x29, 0x61, 0x5a, 0x99, 0x59,</div><div class='del'>-	0x94, 0x70, 0x6d, 0x75, 0x31, 0x7f, 0x1f, 0xc6, 0x5e, 0x62, 0x9e, 0xda,</div><div class='del'>-	0xfa, 0x11, 0x78, 0xd6, 0x3b, 0x3e, 0x73, 0x60, 0x84, 0xbd, 0x4c, 0x19,</div><div class='del'>-	0xb0, 0xd2, 0xc4, 0x2d, 0x1b, 0xd2, 0x66, 0xb9, 0x56, 0x1f, 0x2e, 0x77,</div><div class='del'>-	0xc8, 0x4c, 0x3a, 0x9a, 0x1e, 0x63, 0x9e, 0x71, 0xac, 0x57, 0xd3, 0x49,</div><div class='del'>-	0x78, 0x02, 0x35, 0xda, 0x3d, 0xc5, 0x5e, 0x22, 0xe4, 0xd9, 0x4e, 0x4c,</div><div class='del'>-	0x14, 0x8d, 0x7f, 0x6a, 0xce, 0x06, 0x85, 0x46, 0xa1, 0xe0, 0x41, 0xf2,</div><div class='del'>-	0x11, 0x0f, 0x6b, 0xd4, 0xb2, 0x32, 0x81, 0xd7, 0xa3, 0x21, 0xcf, 0xce,</div><div class='del'>-	0x7c, 0xda, 0xdb, 0xdd, 0x70, 0x0b, 0x7a, 0x4e, 0x49, 0x3d, 0x0a, 0x63,</div><div class='del'>-	0xc7, 0xa9, 0x76, 0xd6, 0x20, 0x0d, 0x1d, 0x93, 0x5d, 0xec, 0xf1, 0x7a,</div><div class='del'>-	0x95, 0xde, 0x39, 0xd1, 0xa1, 0xd8, 0x40, 0x0d, 0x84, 0x1d, 0x37, 0xce,</div><div class='del'>-	0x4c, 0x4b, 0xfd, 0xf2, 0x7b, 0x96, 0x7f, 0x8d, 0xeb, 0x01, 0xea, 0xe7,</div><div class='del'>-	0xaa, 0x1b, 0x7e, 0x13, 0x67, 0x74, 0xf1, 0x4b, 0x7e, 0x37, 0x92, 0xd8,</div><div class='del'>-	0xd6, 0x3c, 0x6d, 0xba, 0x34, 0x99, 0x7d, 0x87, 0x2c, 0x9b, 0x6e, 0x65,</div><div class='del'>-	0x9d, 0x6b, 0x9f, 0xeb, 0xa3, 0x1d, 0x4b, 0x73, 0xee, 0x1b, 0xed, 0xb9,</div><div class='del'>-	0xc5, 0xbb, 0x8d, 0x39, 0x8f, 0x3d, 0xbc, 0xc7, 0xc3, 0x3c, 0xea, 0x39,</div><div class='del'>-	0x65, 0x62, 0x4e, 0x7f, 0xcb, 0x7c, 0x5c, 0x73, 0xd1, 0x6e, 0x5f, 0x65,</div><div class='del'>-	0x4e, 0x16, 0xcc, 0x92, 0xf0, 0xde, 0x31, 0xe3, 0x72, 0x54, 0x25, 0xd0,</div><div class='del'>-	0x5c, 0x46, 0x7f, 0xbc, 0x18, 0xb7, 0xe7, 0x91, 0xc7, 0x73, 0xb7, 0x7b,</div><div class='del'>-	0xbb, 0xb3, 0xec, 0x33, 0xd8, 0x07, 0xdb, 0xbd, 0xdf, 0x57, 0xbd, 0x7b,</div><div class='del'>-	0xb2, 0x4e, 0xa5, 0x36, 0x01, 0x67, 0xcb, 0x26, 0x13, 0x1f, 0x6f, 0x88,</div><div class='del'>-	0xa6, 0x42, 0x0e, 0xe6, 0x4f, 0xd2, 0x32, 0x72, 0xcd, 0xde, 0x7e, 0xe6,</div><div class='del'>-	0xeb, 0x9d, 0x59, 0xba, 0x01, 0x7d, 0xc7, 0xbf, 0x61, 0x74, 0xc0, 0x0f,</div><div class='del'>-	0x99, 0xb3, 0xe1, 0xeb, 0x8c, 0xd8, 0x20, 0xfd, 0x31, 0xd4, 0xa6, 0x44,</div><div class='del'>-	0x97, 0x87, 0x10, 0x5d, 0xfa, 0xd8, 0xf9, 0x96, 0xf9, 0x64, 0x6e, 0x13,</div><div class='del'>-	0x9f, 0xef, 0x62, 0x2e, 0x4d, 0x32, 0xb7, 0x8e, 0xa6, 0xdc, 0x90, 0x77,</div><div class='del'>-	0xd4, 0xfe, 0x37, 0x95, 0x08, 0xe3, 0x00, 0xbf, 0xc3, 0xe7, 0x03, 0x1d,</div><div class='del'>-	0xcc, 0xa3, 0x73, 0x7a, 0x34, 0xb9, 0x15, 0xe9, 0xae, 0x6a, 0xa8, 0x7a,</div><div class='del'>-	0x83, 0x22, 0x73, 0x31, 0xb1, 0x43, 0x0c, 0x3f, 0xe1, 0x9a, 0x2e, 0x4d,</div><div class='del'>-	0xf4, 0xb8, 0x85, 0xbe, 0x48, 0x6c, 0xe0, 0xf8, 0xbc, 0xdf, 0xfd, 0x5e,</div><div class='del'>-	0x19, 0x2a, 0x56, 0x50, 0xb6, 0x9f, 0x58, 0x39, 0xc7, 0xab, 0x69, 0xf8,</div><div class='del'>-	0xaf, 0xc4, 0x4e, 0x7f, 0x96, 0x97, 0xf9, 0x67, 0x09, 0x0f, 0x8a, 0x6f,</div><div class='del'>-	0x64, 0x5a, 0x6f, 0x9d, 0x8d, 0x15, 0xe7, 0xa1, 0x1e, 0x6f, 0xd7, 0x8c,</div><div class='del'>-	0x89, 0xac, 0xee, 0x87, 0xf4, 0xff, 0xe5, 0xf1, 0x02, 0xd1, 0x41, 0x13,</div><div class='del'>-	0x3a, 0x78, 0xbd, 0x7d, 0xa6, 0x52, 0x69, 0xcf, 0x9a, 0xf8, 0x33, 0x5d,</div><div class='del'>-	0x4d, 0xb7, 0x39, 0x19, 0xef, 0xba, 0x7a, 0x16, 0xf8, 0x19, 0x71, 0x94,</div><div class='del'>-	0xf8, 0x98, 0x0b, 0x3e, 0xcd, 0xa6, 0xd5, 0x34, 0x7b, 0x3b, 0xb1, 0x85,</div><div class='del'>-	0xc4, 0x9f, 0x73, 0x6d, 0x05, 0x9a, 0x95, 0x59, 0x97, 0xe8, 0xad, 0x0b,</div><div class='del'>-	0xc9, 0x7c, 0xa5, 0xb2, 0x8b, 0xba, 0xbc, 0x73, 0xbd, 0x17, 0x97, 0x2c,</div><div class='del'>-	0x5d, 0xde, 0x4e, 0x5d, 0xe2, 0x8d, 0xd5, 0x70, 0x5e, 0xa8, 0x05, 0xc1,</div><div class='del'>-	0x44, 0xb9, 0x1a, 0x1e, 0x70, 0x88, 0x4d, 0x18, 0x27, 0x82, 0xd5, 0x50,</div><div class='del'>-	0xc9, 0x7a, 0x9e, 0x24, 0x0e, 0x26, 0x6e, 0x0c, 0xf4, 0xe1, 0xdb, 0xcc,</div><div class='del'>-	0x4b, 0x8f, 0xd3, 0x6f, 0x7f, 0xa1, 0x35, 0xa1, 0xe2, 0x3b, 0xcd, 0xb4,</div><div class='del'>-	0xe9, 0x26, 0xef, 0xf6, 0x6c, 0x3f, 0x9e, 0x58, 0x30, 0xf1, 0x0c, 0x63,</div><div class='del'>-	0xa6, 0x21, 0x9e, 0x0e, 0x94, 0xb3, 0xaf, 0x63, 0xed, 0x5b, 0x3e, 0x61,</div><div class='del'>-	0xf9, 0xfc, 0x68, 0xeb, 0x96, 0xf9, 0x10, 0x9c, 0xdf, 0xb6, 0xf6, 0x7e,</div><div class='del'>-	0x5a, 0xc3, 0xf3, 0xd6, 0xde, 0x0f, 0x3f, 0x4d, 0x0c, 0xeb, 0x6a, 0xf2,</div><div class='del'>-	0x63, 0x67, 0x05, 0x2a, 0xa3, 0xa6, 0x39, 0x1c, 0xb7, 0xf6, 0x1f, 0x5a,</div><div class='del'>-	0x63, 0xd6, 0xfd, 0xa3, 0xfc, 0x2c, 0xcd, 0xae, 0xff, 0x46, 0x30, 0x63,</div><div class='del'>-	0x38, 0x49, 0xf9, 0x77, 0x10, 0x07, 0xf4, 0x13, 0x07, 0xd4, 0x26, 0xd4,</div><div class='del'>-	0xe4, 0x6e, 0xa7, 0xcc, 0x69, 0x0a, 0x87, 0xaa, 0x79, 0xfd, 0x8e, 0x22,</div><div class='del'>-	0x0e, 0xa8, 0x3a, 0x25, 0xb3, 0x3f, 0x62, 0x45, 0xd8, 0x7b, 0x26, 0x3d,</div><div class='del'>-	0xc4, 0x01, 0x15, 0x93, 0x2e, 0x74, 0x13, 0x03, 0xb8, 0x89, 0xd9, 0xb7,</div><div class='del'>-	0xe5, 0x6a, 0xe1, 0x3d, 0xe1, 0x44, 0x24, 0xfe, 0x23, 0x1c, 0xa2, 0xbf,</div><div class='del'>-	0x1d, 0x8a, 0x79, 0x94, 0xf0, 0x2a, 0x07, 0x75, 0xf6, 0x2b, 0x1c, 0x0c,</div><div class='del'>-	0x38, 0x51, 0xa5, 0xbd, 0x86, 0x07, 0xbf, 0xa0, 0xf6, 0xf7, 0x67, 0x25,</div><div class='del'>-	0xce, 0x47, 0x5b, 0xbb, 0x4f, 0xd9, 0xb5, 0xdf, 0x77, 0x6a, 0x74, 0x59,</div><div class='del'>-	0x6a, 0x7f, 0xed, 0x86, 0x7e, 0x9c, 0x9e, 0xc1, 0x37, 0x57, 0x13, 0x64,</div><div class='del'>-	0xd6, 0x72, 0xcd, 0xfa, 0x78, 0x94, 0x3d, 0xb8, 0x3a, 0xd4, 0xa1, 0x44,</div><div class='del'>-	0x27, 0xaa, 0x98, 0x0f, 0x4e, 0xb3, 0xf6, 0x7b, 0x12, 0xd1, 0x40, 0xcc,</div><div class='del'>-	0x81, 0x1e, 0x37, 0x6d, 0xf3, 0x3e, 0xfb, 0xf1, 0x9f, 0xe6, 0xc2, 0xa4,</div><div class='del'>-	0x59, 0x06, 0x17, 0x6b, 0xff, 0xfb, 0x1a, 0x3e, 0x73, 0xd2, 0x0f, 0xdf,</div><div class='del'>-	0x71, 0x7a, 0x70, 0x35, 0x67, 0xd7, 0xfe, 0xea, 0x06, 0x73, 0xe4, 0x72,</div><div class='del'>-	0xdc, 0x87, 0x2b, 0x39, 0x9d, 0xfe, 0xd8, 0x8f, 0xa3, 0xac, 0xfd, 0x97,</div><div class='del'>-	0xb5, 0x00, 0x3e, 0xcc, 0xb5, 0xd0, 0x47, 0x83, 0xf8, 0x39, 0x71, 0xf2,</div><div class='del'>-	0x7a, 0xd6, 0xfe, 0xbb, 0xe8, 0x5f, 0x71, 0xd6, 0xfe, 0x36, 0x0b, 0x97,</div><div class='del'>-	0x64, 0x5a, 0xcf, 0x4c, 0x5b, 0xb5, 0xbf, 0xc1, 0xc1, 0xba, 0xe9, 0x46,</div><div class='del'>-	0x74, 0x99, 0x39, 0xc3, 0xfc, 0xc5, 0x26, 0x1f, 0x9f, 0xa5, 0xde, 0xf2,</div><div class='del'>-	0x1b, 0x30, 0x6b, 0xd5, 0xaa, 0x2d, 0xde, 0x5d, 0x5c, 0x7b, 0xa5, 0x15,</div><div class='del'>-	0x73, 0x26, 0x76, 0xac, 0xff, 0x6b, 0xfc, 0x41, 0x8d, 0x83, 0x3e, 0x99,</div><div class='del'>-	0xf0, 0xde, 0xc9, 0xb8, 0xf3, 0x27, 0x4a, 0xb3, 0x91, 0x18, 0xd7, 0xb9,</div><div class='del'>-	0xdd, 0x7b, 0x17, 0xfd, 0xe4, 0x96, 0xf5, 0xcc, 0x2a, 0x01, 0x3b, 0xe6,</div><div class='del'>-	0xda, 0x19, 0x73, 0x21, 0xc6, 0xdc, 0x6a, 0xc6, 0xdc, 0x93, 0x7a, 0x34,</div><div class='del'>-	0xb6, 0x85, 0xf8, 0xec, 0x95, 0x9c, 0xc4, 0x5d, 0x33, 0xe9, 0xaa, 0x94,</div><div class='del'>-	0x6b, 0x74, 0x40, 0xe2, 0x67, 0xc7, 0xfa, 0xd1, 0xb3, 0x95, 0x10, 0x5d,</div><div class='del'>-	0xe1, 0xb3, 0x95, 0xc4, 0x22, 0xcc, 0x52, 0x4b, 0xcb, 0xce, 0x68, 0xea,</div><div class='del'>-	0x36, 0x67, 0x74, 0xf8, 0x3d, 0xe5, 0x2d, 0xf3, 0x0d, 0xc6, 0xdc, 0x4e,</div><div class='del'>-	0xc6, 0xdc, 0x2e, 0xc6, 0x5c, 0x9b, 0x61, 0xe2, 0x85, 0xb8, 0xda, 0xdf,</div><div class='del'>-	0xe4, 0x88, 0xe8, 0x6d, 0x0e, 0xac, 0xae, 0x64, 0x09, 0xf1, 0x22, 0xda,</div><div class='del'>-	0xf5, 0x07, 0xe4, 0x7f, 0x49, 0x8f, 0xf6, 0xc6, 0x14, 0x89, 0xb3, 0x30,</div><div class='del'>-	0x3e, 0xa0, 0xdc, 0xe5, 0xc5, 0x38, 0x3b, 0x30, 0x77, 0xbe, 0xe8, 0x1b,</div><div class='del'>-	0x25, 0xd9, 0x9d, 0x78, 0x5e, 0x67, 0x5e, 0x5d, 0x21, 0xbe, 0xdb, 0x87,</div><div class='del'>-	0x09, 0xea, 0xd1, 0x1b, 0xed, 0xc3, 0x31, 0xd6, 0xcd, 0xfb, 0x58, 0xaf,</div><div class='del'>-	0xef, 0x37, 0x22, 0x2d, 0xdb, 0xd9, 0x27, 0x5d, 0x0a, 0xa9, 0xe1, 0xb0,</div><div class='del'>-	0xd2, 0x87, 0x41, 0xfa, 0xf0, 0x20, 0xeb, 0x4b, 0x9b, 0xf1, 0x4b, 0xa5,</div><div class='del'>-	0x83, 0x98, 0x62, 0x7f, 0x5e, 0xde, 0x53, 0x63, 0x69, 0xc7, 0x10, 0x06,</div><div class='del'>-	0x16, 0x24, 0xcf, 0x21, 0x70, 0x53, 0xa2, 0x0f, 0x53, 0x46, 0x19, 0xfa,</div><div class='del'>-	0x9a, 0x7b, 0x94, 0x3b, 0xf2, 0x32, 0xa7, 0x63, 0x6c, 0x1a, 0x8c, 0x5d,</div><div class='del'>-	0x8b, 0x5f, 0x05, 0xb9, 0x68, 0x0f, 0x32, 0x12, 0xab, 0xc6, 0x2e, 0xe5,</div><div class='del'>-	0xae, 0x39, 0x89, 0xf7, 0x3e, 0xa5, 0x4f, 0xe2, 0xd9, 0x48, 0x29, 0x77,</div><div class='del'>-	0x4b, 0x7c, 0x5b, 0xb3, 0x6d, 0xc9, 0x01, 0xb2, 0xf7, 0x71, 0x3b, 0xf1,</div><div class='del'>-	0x1e, 0x18, 0x5f, 0xce, 0xef, 0x84, 0x18, 0x83, 0x6d, 0x65, 0x0e, 0xfa,</div><div class='del'>-	0x69, 0x84, 0xb6, 0x73, 0xa0, 0x5d, 0xff, 0xb2, 0x99, 0x0e, 0x0c, 0x30,</div><div class='del'>-	0xa6, 0xfa, 0x70, 0xd4, 0x08, 0x99, 0x97, 0x2d, 0x1c, 0x53, 0xca, 0xf1,</div><div class='del'>-	0x5b, 0x58, 0xeb, 0x56, 0xc1, 0xa3, 0x49, 0x7d, 0xf7, 0x21, 0x56, 0xe3,</div><div class='del'>-	0x41, 0x85, 0x26, 0xb5, 0x27, 0xd3, 0xba, 0x78, 0x42, 0x91, 0x3e, 0xa5,</div><div class='del'>-	0x18, 0xeb, 0x5b, 0xf0, 0x00, 0x73, 0xc2, 0xbe, 0xf8, 0xbd, 0xb8, 0x3f,</div><div class='del'>-	0x50, 0x01, 0x3f, 0xf5, 0xf4, 0x50, 0xc0, 0xc7, 0x5c, 0xfb, 0x7b, 0x45,</div><div class='del'>-	0x3a, 0x7f, 0x51, 0x56, 0xec, 0xbf, 0xaf, 0x61, 0xb0, 0x5a, 0xc6, 0xd8,</div><div class='del'>-	0xe6, 0x19, 0x99, 0x27, 0xa5, 0x5a, 0x43, 0x33, 0x1a, 0xfc, 0xec, 0x7b,</div><div class='del'>-	0xb7, 0xc4, 0xd5, 0xd4, 0x16, 0x67, 0x44, 0x7a, 0x9a, 0x8c, 0x9f, 0xf8,</div><div class='del'>-	0x2f, 0x17, 0x8d, 0xf6, 0x36, 0x89, 0x8e, 0xb5, 0x10, 0x3a, 0xa9, 0xa7,</div><div class='del'>-	0xee, 0x5c, 0x90, 0x31, 0xe4, 0x28, 0x17, 0x2c, 0x95, 0xcc, 0x5d, 0xa7,</div><div class='del'>-	0x15, 0x22, 0xad, 0xd0, 0x8c, 0xe0, 0xba, 0x14, 0x71, 0x9d, 0xc6, 0x38,</div><div class='del'>-	0x34, 0xcd, 0xcd, 0xc4, 0x73, 0xbe, 0x53, 0x32, 0x97, 0x8a, 0x4c, 0x10,</div><div class='del'>-	0x03, 0x37, 0x11, 0x1f, 0xf7, 0xd1, 0xab, 0xcd, 0x5b, 0xea, 0xa3, 0x7a,</div><div class='del'>-	0x9b, 0x82, 0xc7, 0xe6, 0x9b, 0xe1, 0x71, 0x92, 0xe6, 0x3b, 0xb9, 0x00,</div><div class='del'>-	0x2e, 0xe7, 0x42, 0x78, 0x9b, 0xb4, 0x2f, 0x59, 0xb4, 0xeb, 0xf0, 0xb3,</div><div class='del'>-	0x62, 0x0e, 0x8b, 0x33, 0x87, 0x6d, 0xcd, 0x2a, 0xf4, 0xd7, 0x30, 0x46,</div><div class='del'>-	0xf4, 0xbf, 0xfa, 0xec, 0xd2, 0xcd, 0x1e, 0xea, 0x4d, 0x64, 0x71, 0xf1,</div><div class='del'>-	0x73, 0x1c, 0x0f, 0x59, 0x39, 0xfb, 0xb5, 0xcf, 0x66, 0x6b, 0x68, 0x2b,</div><div class='del'>-	0xea, 0xbe, 0xba, 0xf8, 0xde, 0xba, 0xd9, 0x3f, 0x2f, 0xca, 0xdb, 0x53,</div><div class='del'>-	0xb4, 0x35, 0x71, 0x9b, 0x71, 0x9e, 0xd7, 0x04, 0x47, 0x69, 0x70, 0x9c,</div><div class='del'>-	0x8a, 0xa1, 0xec, 0xd4, 0x35, 0xfe, 0x35, 0x89, 0x19, 0x56, 0xde, 0xc7,</div><div class='del'>-	0xbe, 0x4b, 0x9e, 0x1e, 0x21, 0x5e, 0x34, 0xc9, 0xd3, 0x55, 0x8b, 0x97,</div><div class='del'>-	0x20, 0x79, 0xf9, 0xe4, 0xb3, 0x12, 0xb6, 0x0c, 0x5d, 0x7b, 0x27, 0x40,</div><div class='del'>-	0x7d, 0xe0, 0xd1, 0x10, 0xf5, 0x79, 0x65, 0xa3, 0x3c, 0xe7, 0xc3, 0x1d,</div><div class='del'>-	0xb9, 0x44, 0xb9, 0xe4, 0x79, 0xaf, 0xb6, 0x05, 0x7b, 0xe7, 0x3e, 0xaf,</div><div class='del'>-	0xf7, 0x20, 0x6d, 0x11, 0xa0, 0xf1, 0xe4, 0xde, 0x17, 0xd5, 0xd4, 0x3f,</div><div class='del'>-	0x42, 0x8a, 0x3d, 0xd3, 0x23, 0xd9, 0x34, 0x1e, 0xca, 0x7e, 0xcb, 0xda,</div><div class='del'>-	0xcb, 0x5b, 0xb7, 0x01, 0xfb, 0x49, 0xff, 0x60, 0x35, 0xe3, 0xe8, 0x7f,</div><div class='del'>-	0xc4, 0xa3, 0x82, 0xa5, 0x76, 0x55, 0x42, 0xea, 0x6e, 0xb4, 0xe5, 0x36,</div><div class='del'>-	0xc5, 0x44, 0x59, 0x1c, 0xc3, 0xed, 0xcd, 0xd1, 0xd8, 0x65, 0x3c, 0x66,</div><div class='del'>-	0xca, 0x5c, 0xdc, 0x59, 0xac, 0xc1, 0xc4, 0xaf, 0x4a, 0x3b, 0xeb, 0x70,</div><div class='del'>-	0x5b, 0x11, 0x53, 0x6d, 0xcd, 0xbf, 0xf5, 0xb9, 0xd9, 0x83, 0xf4, 0xed,</div><div class='del'>-	0x52, 0x7b, 0xbc, 0x4a, 0x1b, 0xd7, 0x39, 0xca, 0x9c, 0xfd, 0xbc, 0xfe,</div><div class='del'>-	0x52, 0x88, 0x95, 0x19, 0xae, 0xf5, 0x0a, 0x0e, 0x11, 0x3f, 0xa5, 0x83,</div><div class='del'>-	0x26, 0x76, 0xf1, 0xf3, 0x00, 0x71, 0xd6, 0xbb, 0x7a, 0x15, 0x66, 0x03,</div><div class='del'>-	0x01, 0x62, 0x4b, 0xe6, 0x60, 0xc7, 0xdf, 0x49, 0x4d, 0x88, 0x85, 0x1d,</div><div class='del'>-	0xb2, 0x57, 0xff, 0x6f, 0xed, 0xdf, 0xac, 0x27, 0x96, 0x11, 0xd9, 0xbd,</div><div class='del'>-	0x0a, 0x73, 0x68, 0x0c, 0xc4, 0x37, 0x7b, 0xf5, 0x42, 0xd8, 0x81, 0xe4,</div><div class='del'>-	0x55, 0x07, 0xd4, 0xd3, 0xef, 0xb0, 0x1f, 0x7c, 0xa4, 0x5e, 0x3d, 0xdd,</div><div class='del'>-	0xea, 0xd4, 0x90, 0x9a, 0xf2, 0xe0, 0xe1, 0xa9, 0x0e, 0x54, 0x5b, 0x73,</div><div class='del'>-	0xa4, 0x71, 0xda, 0xcc, 0xc1, 0x3e, 0x6c, 0xf4, 0x53, 0x17, 0xfb, 0xb1,</div><div class='del'>-	0xab, 0x1b, 0x1e, 0x45, 0x8b, 0x75, 0x7d, 0x0c, 0xfb, 0xb3, 0x5e, 0xa5,</div><div class='del'>-	0x3b, 0xeb, 0x42, 0xc7, 0x5d, 0x8f, 0xc2, 0xbd, 0x7e, 0x80, 0x7c, 0xc9,</div><div class='del'>-	0x75, 0xf9, 0xfb, 0x6e, 0xf6, 0x71, 0xc2, 0x5f, 0x19, 0xc2, 0xab, 0xc8,</div><div class='del'>-	0xdb, 0x7a, 0x0d, 0x23, 0x53, 0x2e, 0x65, 0xb7, 0xf1, 0x37, 0xe6, 0x55,</div><div class='del'>-	0x6b, 0x6f, 0x48, 0xae, 0x55, 0xc8, 0x99, 0x01, 0x3e, 0x23, 0x39, 0x67,</div><div class='del'>-	0x10, 0x59, 0xc6, 0xf6, 0xdd, 0xd6, 0xfb, 0xa7, 0xca, 0x6c, 0x99, 0x92,</div><div class='del'>-	0xec, 0x6f, 0xdb, 0xe9, 0x1f, 0xf2, 0x4c, 0x5b, 0xf1, 0xda, 0x76, 0x8f,</div><div class='del'>-	0x7d, 0x2e, 0x41, 0xec, 0x3e, 0x88, 0x5b, 0x69, 0x84, 0xfa, 0xa8, 0xf8,</div><div class='del'>-	0xd8, 0x20, 0xea, 0x73, 0x4c, 0xa8, 0xab, 0x6c, 0x7e, 0x1f, 0x34, 0x0a,</div><div class='del'>-	0xec, 0x4d, 0x35, 0xe6, 0x4d, 0xea, 0x6e, 0xa5, 0xbc, 0x4f, 0x47, 0xfd,</div><div class='del'>-	0xb5, 0xf7, 0x4b, 0xf5, 0x54, 0x70, 0xe9, 0x17, 0xdd, 0xff, 0x4d, 0xc8,</div><div class='del'>-	0x3d, 0x97, 0xf6, 0x87, 0x8c, 0xe3, 0x68, 0x6f, 0xa5, 0x43, 0xfc, 0xe7,</div><div class='del'>-	0x0f, 0x71, 0xff, 0x1c, 0x1b, 0xd7, 0x0a, 0xa1, 0x4f, 0xdc, 0x6b, 0xb8,</div><div class='del'>-	0x94, 0x2e, 0xe6, 0x9f, 0x03, 0x53, 0x8e, 0x3b, 0xca, 0xf0, 0xe7, 0x66,</div><div class='del'>-	0xf9, 0xca, 0x11, 0xd4, 0xc7, 0xc7, 0xf8, 0xbc, 0x82, 0x76, 0x62, 0xc8,</div><div class='del'>-	0x27, 0xf4, 0xad, 0xe8, 0xa8, 0x91, 0x1c, 0xf0, 0xbc, 0x39, 0xd8, 0x27,</div><div class='del'>-	0x3a, 0x54, 0xb0, 0x8d, 0xd7, 0x5f, 0xa0, 0x7d, 0x9f, 0xd6, 0x5d, 0xa8,</div><div class='del'>-	0x5f, 0x21, 0x33, 0x41, 0x75, 0x3a, 0x89, 0x3d, 0x1e, 0x7b, 0x8f, 0x2c,</div><div class='del'>-	0x6d, 0x56, 0x6b, 0xda, 0xf0, 0x9d, 0x8e, 0xfa, 0xe9, 0x37, 0xe9, 0x4f,</div><div class='del'>-	0x6d, 0xeb, 0x6f, 0xbc, 0x57, 0xd2, 0x89, 0x8e, 0xd0, 0xfa, 0xe7, 0x4c,</div><div class='del'>-	0xdc, 0x34, 0x8a, 0xc0, 0xfa, 0x1b, 0xed, 0x5f, 0xe2, 0xfb, 0x30, 0x63,</div><div class='del'>-	0x10, 0xe9, 0xea, 0x84, 0xcc, 0x89, 0xa2, 0xa4, 0x73, 0x18, 0xbf, 0x9f,</div><div class='del'>-	0x1f, 0xc3, 0xa1, 0xac, 0xc8, 0xb9, 0x60, 0xf9, 0xb6, 0xb6, 0xfe, 0xba,</div><div class='del'>-	0x6c, 0x0f, 0x66, 0xa3, 0x03, 0x55, 0x45, 0xd9, 0x0e, 0xb2, 0x1f, 0xa9,</div><div class='del'>-	0x64, 0x8e, 0x7d, 0x80, 0x3a, 0x1d, 0xb6, 0x74, 0xda, 0x07, 0x3d, 0x77,</div><div class='del'>-	0x9d, 0xee, 0x10, 0xe9, 0x7a, 0x13, 0xa2, 0x37, 0xd9, 0x97, 0x63, 0x2f,</div><div class='del'>-	0x40, 0xba, 0xfb, 0x6e, 0xa0, 0x3b, 0xa8, 0x5f, 0xa7, 0xbb, 0x37, 0x1b,</div><div class='del'>-	0x3d, 0xed, 0x28, 0xd2, 0xfd, 0xc6, 0x5c, 0x89, 0x46, 0x1a, 0x3b, 0xd7,</div><div class='del'>-	0xa7, 0x91, 0xdb, 0x7c, 0xd0, 0x3c, 0x68, 0xe9, 0xe3, 0xfb, 0xd6, 0xf5,</div><div class='del'>-	0x6d, 0xf5, 0x12, 0x0f, 0xfc, 0x33, 0xa1, 0x59, 0x67, 0x00, 0x6c, 0x1c,</div><div class='del'>-	0x76, 0x63, 0x7c, 0xa8, 0x6f, 0x75, 0x3b, 0x93, 0x8c, 0xe3, 0xa0, 0x67,</div><div class='del'>-	0xfb, 0xe7, 0x66, 0x1f, 0x1d, 0xec, 0xd7, 0x3a, 0x8d, 0x1e, 0x6f, 0x97,</div><div class='del'>-	0xe1, 0x21, 0x06, 0xab, 0x54, 0xb6, 0x65, 0x65, 0x06, 0x22, 0xb1, 0x5c,</div><div class='del'>-	0xc4, 0xc5, 0x79, 0xe9, 0x0b, 0xef, 0x61, 0xcf, 0xb0, 0x81, 0xf6, 0x1d,</div><div class='del'>-	0xc0, 0x44, 0x7e, 0x40, 0x49, 0x06, 0xb9, 0x8e, 0x21, 0x75, 0x05, 0xac,</div><div class='del'>-	0x79, 0xbd, 0xa8, 0xa4, 0x2f, 0x05, 0x13, 0xd3, 0x89, 0x93, 0xf5, 0x26,</div><div class='del'>-	0x88, 0x51, 0x3c, 0x2b, 0x12, 0xb3, 0x89, 0x5d, 0xf5, 0x4e, 0x1c, 0xb7,</div><div class='del'>-	0xb0, 0x98, 0x3a, 0xcb, 0xdf, 0x69, 0x89, 0x99, 0x3b, 0xb3, 0x52, 0xc7,</div><div class='del'>-	0x08, 0x27, 0xb5, 0x11, 0xfc, 0x63, 0xbc, 0x30, 0x5c, 0x83, 0xe4, 0x7d,</div><div class='del'>-	0x35, 0x90, 0x1e, 0x63, 0x02, 0x7f, 0xa9, 0x85, 0x3c, 0xfd, 0x79, 0x97,</div><div class='del'>-	0xd2, 0x6d, 0xcc, 0x7b, 0x77, 0x18, 0x7e, 0xf8, 0xd8, 0xbf, 0xf5, 0x38,</div><div class='del'>-	0x23, 0xec, 0x39, 0xac, 0x19, 0x7d, 0xeb, 0xad, 0xb9, 0x7e, 0x6f, 0xbb,</div><div class='del'>-	0x61, 0xe7, 0xc2, 0x5b, 0x66, 0x3d, 0xde, 0x8e, 0x99, 0x48, 0x68, 0xc2,</div><div class='del'>-	0xc2, 0x62, 0x07, 0x5b, 0x23, 0x39, 0xd3, 0x7c, 0x55, 0x2f, 0x5c, 0x2d,</div><div class='del'>-	0xb7, 0xbe, 0x4f, 0xb7, 0xc6, 0x72, 0x4d, 0xd8, 0x43, 0xfc, 0xd4, 0x36,</div><div class='del'>-	0xd3, 0x04, 0x7d, 0x06, 0x38, 0x31, 0x15, 0xc2, 0xba, 0xac, 0x7a, 0x3a,</div><div class='del'>-	0xe5, 0xec, 0xc7, 0xf4, 0x42, 0x17, 0xb2, 0x79, 0xef, 0x72, 0xd8, 0x41,</div><div class='del'>-	0x8c, 0x1d, 0x77, 0xe0, 0x0e, 0x7d, 0x83, 0x52, 0xb0, 0x62, 0x5a, 0xc1,</div><div class='del'>-	0xdd, 0xfa, 0x2e, 0x65, 0xc0, 0xc2, 0x14, 0xf3, 0xc4, 0x22, 0x0a, 0x6e,</div><div class='del'>-	0xb2, 0x72, 0xef, 0xc9, 0xd6, 0x38, 0xf1, 0xf7, 0x1d, 0x59, 0xa9, 0xef,</div><div class='del'>-	0x26, 0x2e, 0xc6, 0xa9, 0x97, 0x78, 0xba, 0xdf, 0xcd, 0x7e, 0xe8, 0xa0,</div><div class='del'>-	0xa2, 0xf6, 0xea, 0x8a, 0x8d, 0xf1, 0x6e, 0x9b, 0xb7, 0x71, 0xe1, 0xad,</div><div class='del'>-	0xf3, 0xcd, 0x5e, 0xc9, 0x41, 0xed, 0xba, 0x1a, 0x72, 0x39, 0x02, 0x18,</div><div class='del'>-	0xb6, 0x68, 0xa4, 0x5b, 0xf5, 0xf9, 0x32, 0xac, 0xd6, 0xfa, 0x70, 0xda,</div><div class='del'>-	0x92, 0x61, 0xa2, 0x75, 0x0b, 0xb1, 0xf6, 0x93, 0x46, 0x3f, 0x7b, 0x65,</div><div class='del'>-	0xd9, 0x37, 0x8d, 0xc4, 0x5a, 0x9c, 0x6d, 0xc4, 0xb3, 0x91, 0xf0, 0xb2,</div><div class='del'>-	0x92, 0x54, 0xd2, 0xae, 0xc6, 0xe4, 0x3c, 0x58, 0x51, 0x6a, 0xec, 0xfa,</div><div class='del'>-	0x26, 0x32, 0x46, 0x89, 0xb3, 0xda, 0xa6, 0xbc, 0xcb, 0x49, 0xd8, 0x73,</div><div class='del'>-	0x9e, 0x4e, 0xfd, 0xff, 0xe0, 0x52, 0x50, 0x9d, 0x48, 0x92, 0xef, 0x0e,</div><div class='del'>-	0xe6, 0xdd, 0x42, 0x9f, 0x8b, 0xf7, 0x65, 0xbe, 0x37, 0xdc, 0x3a, 0x9e,</div><div class='del'>-	0x41, 0xc1, 0x99, 0x90, 0x1e, 0x0b, 0xfe, 0xde, 0x3c, 0x64, 0xd6, 0xc4,</div><div class='del'>-	0x3e, 0xe3, 0x53, 0xb3, 0xb4, 0xc7, 0xd4, 0x33, 0x63, 0xef, 0x9f, 0x65,</div><div class='del'>-	0x16, 0x5c, 0xfe, 0x1d, 0x46, 0x33, 0x8e, 0xe7, 0x5d, 0x37, 0xd0, 0x8e,</div><div class='del'>-	0x4e, 0xdc, 0xe2, 0x70, 0x20, 0xba, 0xfe, 0x6e, 0xa5, 0xb8, 0x07, 0xc5,</div><div class='del'>-	0x3c, 0x91, 0xb2, 0x6a, 0x62, 0x19, 0xe5, 0xbc, 0x70, 0x52, 0xd6, 0xf8,</div><div class='del'>-	0x56, 0xeb, 0xf8, 0x49, 0xa9, 0x91, 0xc3, 0xad, 0x21, 0x43, 0xed, 0x95,</div><div class='del'>-	0x9e, 0xb0, 0x9a, 0x7a, 0xfa, 0x68, 0x52, 0x6a, 0xf0, 0x14, 0x6b, 0xb0,</div><div class='del'>-	0xba, 0xdc, 0xae, 0x48, 0x1d, 0x53, 0x63, 0x5e, 0xa7, 0x03, 0x57, 0x1a,</div><div class='del'>-	0xd4, 0xfe, 0x1f, 0x40, 0x1d, 0xb0, 0xe7, 0x8a, 0x8f, 0xb6, 0x36, 0x16,</div><div class='del'>-	0xf1, 0xf0, 0x6d, 0xf3, 0x83, 0x72, 0xee, 0xc4, 0xd2, 0x71, 0x53, 0x4e,</div><div class='del'>-	0xb0, 0xb1, 0x69, 0xbe, 0x1c, 0xef, 0x21, 0x6e, 0x10, 0x6c, 0x2c, 0xd7,</div><div class='del'>-	0x27, 0x5b, 0x1b, 0x66, 0x3d, 0xe4, 0x4d, 0xc1, 0x7b, 0x5a, 0x0f, 0x7d,</div><div class='del'>-	0xaf, 0xc4, 0xa3, 0x8d, 0x9b, 0xb7, 0x13, 0x37, 0x3b, 0x13, 0x6a, 0xcb,</div><div class='del'>-	0x56, 0xe2, 0x66, 0x8d, 0xfd, 0x84, 0x0b, 0x7d, 0x78, 0xc2, 0xb0, 0x7b,</div><div class='del'>-	0x0a, 0xc1, 0xce, 0xe6, 0x49, 0x35, 0x29, 0xb8, 0xf9, 0xea, 0x06, 0x60,</div><div class='del'>-	0x37, 0x71, 0xf3, 0x72, 0xc6, 0x85, 0x7e, 0xe2, 0xe6, 0x8f, 0x98, 0x82,</div><div class='del'>-	0xee, 0x24, 0x6e, 0xbe, 0x42, 0x8c, 0x75, 0x3e, 0xfe, 0x73, 0x7c, 0xa3,</div><div class='del'>-	0x38, 0x3b, 0xdb, 0x4b, 0xec, 0x9c, 0x0c, 0xde, 0x88, 0x9d, 0xff, 0xe2,</div><div class='del'>-	0x5f, 0x60, 0xe7, 0x3d, 0xc4, 0x84, 0x3d, 0x59, 0xd9, 0x67, 0x1a, 0x6d,</div><div class='del'>-	0x7d, 0xe3, 0x94, 0x9c, 0x6d, 0xb9, 0x0d, 0xef, 0x9e, 0x1c, 0x1d, 0x22,</div><div class='del'>-	0x56, 0xc6, 0x58, 0xbc, 0x1f, 0x99, 0x19, 0xac, 0x22, 0x2e, 0x78, 0xd9,</div><div class='del'>-	0xc9, 0x75, 0xd7, 0xc5, 0x55, 0xfd, 0x4d, 0x25, 0xda, 0xd5, 0x8f, 0x28,</div><div class='del'>-	0xfb, 0x66, 0x75, 0x99, 0x26, 0x4c, 0xba, 0x12, 0xc4, 0xc6, 0xac, 0x81,</div><div class='del'>-	0xab, 0x89, 0x9d, 0xab, 0x16, 0x81, 0xda, 0x45, 0x1b, 0x3b, 0xcb, 0xdc,</div><div class='del'>-	0xac, 0x2a, 0x8a, 0x3f, 0x22, 0x76, 0x66, 0xaf, 0xcb, 0x50, 0x5b, 0x6c,</div><div class='del'>-	0x62, 0x8c, 0x2a, 0x38, 0x1a, 0xf5, 0xa1, 0x67, 0x8a, 0xb8, 0xc7, 0x9a,</div><div class='del'>-	0x9b, 0x99, 0x23, 0x3f, 0xd6, 0xfb, 0x71, 0x6c, 0xc1, 0x9e, 0x9b, 0x75,</div><div class='del'>-	0x12, 0xbf, 0xb9, 0xa2, 0x41, 0x94, 0x2f, 0xba, 0xf0, 0x1c, 0xf1, 0xf3,</div><div class='del'>-	0x36, 0xda, 0xf9, 0x0c, 0xf1, 0xf3, 0x9e, 0x1b, 0x66, 0x67, 0xb3, 0x8b,</div><div class='del'>-	0x78, 0x95, 0x58, 0xbe, 0xae, 0x16, 0x51, 0x99, 0x8b, 0x98, 0x57, 0x36,</div><div class='del'>-	0xfa, 0x70, 0xce, 0xc2, 0xcf, 0xde, 0xe5, 0xb4, 0x62, 0xcb, 0x56, 0x46,</div><div class='del'>-	0x5b, 0x88, 0x5d, 0x1d, 0xb4, 0x6b, 0xdb, 0x49, 0xb5, 0xeb, 0x25, 0xea,</div><div class='del'>-	0xa2, 0x31, 0x7a, 0xde, 0xb2, 0xc7, 0x60, 0x5c, 0x66, 0x2c, 0x43, 0xad,</div><div class='del'>-	0x72, 0xfe, 0xaa, 0x82, 0xf6, 0xee, 0x9e, 0x8c, 0x24, 0x3f, 0x80, 0x1d,</div><div class='del'>-	0x93, 0xb1, 0x5c, 0x59, 0xb1, 0x1e, 0xca, 0xbd, 0x09, 0xde, 0x4b, 0xa2,</div><div class='del'>-	0x6b, 0xa3, 0xed, 0xdf, 0xb1, 0xdc, 0x71, 0x62, 0x57, 0xd9, 0x5b, 0x0d,</div><div class='del'>-	0xf8, 0x3b, 0x8d, 0x2e, 0x4c, 0x1b, 0x61, 0x94, 0x9f, 0x2b, 0xee, 0xd1,</div><div class='del'>-	0x9e, 0x93, 0x33, 0x7b, 0x8f, 0xb6, 0x06, 0xbe, 0x53, 0xc2, 0x84, 0x49,</div><div class='del'>-	0xe2, 0xbb, 0xa0, 0xe7, 0x8e, 0xbc, 0xe0, 0xc5, 0x5e, 0x1c, 0x33, 0xd4,</div><div class='del'>-	0xd0, 0x4f, 0x18, 0x13, 0xf7, 0xc9, 0xfe, 0xfc, 0x0d, 0x33, 0xaa, 0x87,</div><div class='del'>-	0x79, 0xcf, 0xf8, 0xdc, 0x8c, 0x2a, 0x95, 0xc5, 0xaf, 0x9c, 0xcd, 0xe5,</div><div class='del'>-	0x70, 0xac, 0x93, 0x19, 0x89, 0x1a, 0x1a, 0xc3, 0x63, 0xc4, 0x1c, 0xbf,</div><div class='del'>-	0x54, 0x7c, 0x9a, 0x6b, 0xa8, 0xc9, 0xa9, 0x86, 0xe6, 0x15, 0x1f, 0xdf,</div><div class='del'>-	0xbd, 0x87, 0xf9, 0xed, 0x1e, 0xfa, 0x46, 0x64, 0xb9, 0x42, 0x71, 0xe2,</div><div class='del'>-	0xd2, 0x97, 0x2d, 0x3c, 0xea, 0xed, 0xe5, 0xb5, 0xe9, 0x7c, 0x09, 0xd7,</div><div class='del'>-	0xf4, 0x09, 0xaf, 0xe8, 0x9c, 0xb2, 0x73, 0x88, 0x96, 0xf3, 0x2e, 0x5f,</div><div class='del'>-	0x82, 0x2d, 0x5b, 0x25, 0x65, 0x7d, 0x60, 0x32, 0x60, 0x0e, 0xac, 0x94,</div><div class='del'>-	0x18, 0xd6, 0xb0, 0xd3, 0x10, 0xff, 0x1a, 0x24, 0x9f, 0x7d, 0x38, 0x62,</div><div class='del'>-	0xac, 0x66, 0xef, 0x26, 0xf3, 0xd2, 0x26, 0x62, 0xeb, 0x5e, 0xd6, 0x60,</div><div class='del'>-	0xd3, 0x4c, 0xe9, 0x69, 0xb3, 0x69, 0x93, 0xa6, 0xe7, 0x94, 0x42, 0x4d,</div><div class='del'>-	0x88, 0xf8, 0x66, 0x3d, 0x6b, 0x77, 0x5b, 0xbe, 0x09, 0x6f, 0x9e, 0xd1,</div><div class='del'>-	0xe8, 0x9b, 0xed, 0xc4, 0xef, 0xbd, 0xb8, 0x97, 0xf2, 0x7c, 0x23, 0xff,</div><div class='del'>-	0x4d, 0x24, 0xbf, 0xee, 0xc2, 0xc4, 0x54, 0x12, 0x5b, 0xd6, 0x8f, 0xe0,</div><div class='del'>-	0xd2, 0xef, 0x78, 0x98, 0xab, 0x7c, 0x78, 0x72, 0x4a, 0xf2, 0x6b, 0x09,</div><div class='del'>-	0x6f, 0xdf, 0x88, 0x45, 0x3c, 0x08, 0x5b, 0x38, 0xe4, 0x8b, 0xef, 0xd9,</div><div class='del'>-	0x18, 0xc5, 0xcb, 0x5e, 0xb8, 0xf4, 0x3e, 0xf3, 0xd0, 0xfa, 0x7f, 0x81,</div><div class='del'>-	0x67, 0x88, 0x5b, 0x88, 0x05, 0x2a, 0x62, 0xd6, 0xf9, 0xb8, 0x12, 0xde,</div><div class='del'>-	0x75, 0xd1, 0x07, 0x24, 0xa6, 0x57, 0x33, 0xd6, 0x4d, 0x62, 0xe7, 0xe5,</div><div class='del'>-	0xe2, 0xfc, 0xf2, 0xed, 0x93, 0xea, 0xd2, 0x11, 0x44, 0x88, 0xa1, 0x31,</div><div class='del'>-	0x28, 0xd8, 0xcd, 0x49, 0xbc, 0x7b, 0x25, 0x1a, 0xd5, 0xcf, 0x11, 0xef,</div><div class='del'>-	0x8e, 0xd2, 0xd6, 0x2e, 0x4d, 0x7c, 0x33, 0x80, 0xb2, 0xc5, 0x10, 0x7d,</div><div class='del'>-	0x52, 0xe6, 0x97, 0x7f, 0xe5, 0xb5, 0xe7, 0x97, 0x32, 0x33, 0x97, 0xf3,</div><div class='del'>-	0x23, 0xe8, 0x28, 0x63, 0xef, 0x56, 0xae, 0xa4, 0x99, 0x93, 0x67, 0xbd,</div><div class='del'>-	0xbb, 0x99, 0xdf, 0xfb, 0x8d, 0xa0, 0x7f, 0x77, 0x3e, 0xc0, 0xdf, 0x3a,</div><div class='del'>-	0x7f, 0x7f, 0x7e, 0x07, 0x9f, 0x0f, 0xf1, 0x33, 0x8c, 0x6c, 0x2e, 0x52,</div><div class='del'>-	0x21, 0xcd, 0x40, 0x36, 0x67, 0xe7, 0xbc, 0x70, 0xee, 0x90, 0x57, 0xb0,</div><div class='del'>-	0x66, 0xdb, 0x94, 0xfd, 0x5d, 0xbb, 0xe1, 0xfb, 0xe7, 0x31, 0xbf, 0x9b,</div><div class='del'>-	0x7c, 0x9f, 0x39, 0xa9, 0xe1, 0xa3, 0x93, 0x16, 0xe6, 0x2f, 0x10, 0xf3,</div><div class='del'>-	0x0f, 0xbb, 0x9d, 0x82, 0x35, 0x7f, 0x61, 0x9e, 0x8f, 0x46, 0x07, 0xe6,</div><div class='del'>-	0xe8, 0x07, 0x3d, 0xa4, 0xeb, 0xd0, 0x82, 0x16, 0xbf, 0x36, 0x9f, 0xf6,</div><div class='del'>-	0xcc, 0xf7, 0xf2, 0xc9, 0x18, 0xde, 0xb9, 0x3e, 0x63, 0xfd, 0xa4, 0xcc,</div><div class='del'>-	0x9a, 0x15, 0xe3, 0xb1, 0x77, 0x37, 0xc1, 0xd3, 0xc2, 0x7e, 0xd3, 0xcd,</div><div class='del'>-	0xe7, 0x43, 0xd6, 0xf3, 0x32, 0xf3, 0xbd, 0x8e, 0x9d, 0x3f, 0xba, 0xfe,</div><div class='del'>-	0xce, 0x61, 0x76, 0x6a, 0x9e, 0xf3, 0x8c, 0x2d, 0xa7, 0xf5, 0x9c, 0xcc,</div><div class='del'>-	0x65, 0xbd, 0xcb, 0xb0, 0xe2, 0x6b, 0x88, 0x32, 0x89, 0x7d, 0x0f, 0x99,</div><div class='del'>-	0xb6, 0xdf, 0x06, 0xfd, 0x3b, 0x19, 0x0f, 0xdf, 0xa6, 0x7d, 0x76, 0x9e,</div><div class='del'>-	0xab, 0xf3, 0xdf, 0x6d, 0xec, 0xb2, 0x64, 0xbe, 0xfb, 0x9c, 0xd4, 0x24,</div><div class='del'>-	0xb9, 0xff, 0x40, 0x85, 0x60, 0xef, 0x27, 0x59, 0xb3, 0x46, 0x0d, 0xd9,</div><div class='del'>-	0x03, 0x80, 0xe2, 0x4a, 0x1c, 0x41, 0xe7, 0x74, 0x18, 0x6f, 0xeb, 0xde,</div><div class='del'>-	0xe2, 0x59, 0x17, 0x89, 0xc9, 0x69, 0xc6, 0x64, 0x10, 0x63, 0x46, 0x24,</div><div class='del'>-	0xfc, 0x36, 0xf1, 0x69, 0x9a, 0x0c, 0x1f, 0xcb, 0x3a, 0xf1, 0x36, 0x31,</div><div class='del'>-	0x23, 0x14, 0xfb, 0xac, 0xa8, 0xfd, 0x6e, 0xe9, 0xef, 0x4a, 0x84, 0x6b,</div><div class='del'>-	0x22, 0x2d, 0x07, 0x50, 0x87, 0x0c, 0x73, 0xbe, 0x57, 0xfb, 0x21, 0x8e,</div><div class='del'>-	0x9f, 0x70, 0xe0, 0x7e, 0xf6, 0x7d, 0xc9, 0xbb, 0x74, 0x7e, 0x6f, 0x1c,</div><div class='del'>-	0x7a, 0x1f, 0xff, 0x68, 0xce, 0xca, 0x79, 0x2c, 0x45, 0xce, 0x7c, 0x7c,</div><div class='del'>-	0x62, 0xd6, 0x6a, 0x5a, 0xe1, 0x07, 0xd0, 0x52, 0x57, 0xd1, 0x38, 0xbc,</div><div class='del'>-	0x8c, 0x0f, 0xcc, 0x02, 0xef, 0xbd, 0xc7, 0xf8, 0x79, 0x49, 0x8f, 0x84,</div><div class='del'>-	0x1c, 0x14, 0xa6, 0x10, 0x74, 0xe2, 0x3e, 0x5d, 0xe6, 0x29, 0xea, 0xf0,</div><div class='del'>-	0xb3, 0x50, 0x87, 0x2e, 0x28, 0x72, 0x86, 0xe7, 0x92, 0x99, 0xae, 0x91,</div><div class='del'>-	0x75, 0x15, 0xac, 0x5b, 0xd3, 0xd8, 0x55, 0x06, 0xb5, 0xc5, 0xad, 0x68,</div><div class='del'>-	0xfa, 0xfb, 0xca, 0xff, 0x32, 0x0b, 0xc1, 0x4f, 0xcc, 0x77, 0xb4, 0x12,</div><div class='del'>-	0x5d, 0x35, 0xec, 0x71, 0x96, 0x78, 0xab, 0xc3, 0x71, 0x43, 0xf6, 0xf1,</div><div class='del'>-	0x7e, 0x88, 0xfb, 0x4f, 0xb8, 0xd0, 0x1e, 0xff, 0xb9, 0x99, 0x0e, 0x0a,</div><div class='del'>-	0xcd, 0x50, 0x25, 0x2a, 0x84, 0xbe, 0x3d, 0xdb, 0x7e, 0x31, 0x0f, 0xa5,</div><div class='del'>-	0xc3, 0x10, 0xbc, 0x2c, 0x7e, 0x3a, 0x0d, 0xd3, 0x90, 0x99, 0xa2, 0x89,</div><div class='del'>-	0x3b, 0xe3, 0x23, 0x78, 0x2f, 0x9e, 0xfc, 0x4f, 0x1e, 0xa8, 0x4b, 0x97,</div><div class='del'>-	0x9d, 0x6a, 0xa1, 0xc9, 0x19, 0x56, 0xbc, 0x0d, 0xda, 0x70, 0x83, 0x55,</div><div class='del'>-	0x6f, 0x2e, 0xb2, 0x77, 0xf2, 0x31, 0xb7, 0x48, 0x8f, 0x39, 0x8d, 0xc5,</div><div class='del'>-	0xc9, 0x34, 0x5c, 0xc4, 0x76, 0xa3, 0xcd, 0x6a, 0xff, 0x33, 0x8a, 0x1a,</div><div class='del'>-	0x3a, 0xa8, 0x84, 0x95, 0x7b, 0xb5, 0x14, 0x9e, 0xd3, 0xa3, 0xc9, 0x36,</div><div class='del'>-	0xa5, 0xce, 0xd3, 0x95, 0x2f, 0xd1, 0x6e, 0x27, 0x56, 0x51, 0x0b, 0x97,</div><div class='del'>-	0x9d, 0xe5, 0xa8, 0xdd, 0xa0, 0x75, 0x95, 0x3b, 0xd5, 0xd4, 0xd7, 0x18,</div><div class='del'>-	0x5f, 0xdb, 0xf3, 0x05, 0xef, 0xfb, 0x51, 0x07, 0xd6, 0x5a, 0xfb, 0x0d,</div><div class='del'>-	0x99, 0xe2, 0xbc, 0x74, 0x1a, 0xdd, 0x93, 0xe6, 0x96, 0x8b, 0x71, 0x35,</div><div class='del'>-	0xf4, 0x8c, 0x92, 0xde, 0xed, 0x23, 0xa6, 0x79, 0x00, 0x5a, 0x78, 0x81,</div><div class='del'>-	0x75, 0xaa, 0x3d, 0xef, 0xc0, 0x2d, 0xa7, 0x84, 0x66, 0x86, 0x34, 0x8f,</div><div class='del'>-	0xa0, 0xfc, 0x84, 0xb9, 0x65, 0xb7, 0xae, 0xa6, 0x2e, 0x3b, 0xd3, 0xff,</div><div class='del'>-	0xbd, 0x96, 0x7a, 0xeb, 0x50, 0x64, 0xbf, 0x6d, 0x84, 0xb8, 0x62, 0x44,</div><div class='del'>-	0xce, 0xcd, 0xc5, 0xfe, 0x98, 0x98, 0xe2, 0x5b, 0xf4, 0x55, 0x67, 0xc2,</div><div class='del'>-	0x4f, 0x3e, 0xd5, 0xd8, 0x1c, 0x64, 0xce, 0x1e, 0xc6, 0x65, 0x3d, 0xed,</div><div class='del'>-	0xed, 0x6c, 0x88, 0x11, 0x9b, 0x85, 0x58, 0x07, 0xc3, 0x38, 0x46, 0x8c,</div><div class='del'>-	0x77, 0x24, 0x5f, 0x86, 0x42, 0x40, 0x23, 0x36, 0xeb, 0x85, 0x63, 0xd2,</div><div class='del'>-	0xa7, 0xcc, 0x67, 0x22, 0x7a, 0x3b, 0xfe, 0x33, 0x0a, 0x21, 0x71, 0x91,</div><div class='del'>-	0x23, 0xf0, 0x9d, 0xf8, 0x7b, 0xb3, 0x4a, 0xd3, 0x5a, 0x26, 0x15, 0xae,</div><div class='del'>-	0xfb, 0x54, 0x88, 0x3a, 0xe6, 0x7b, 0x72, 0xbe, 0xc5, 0xe8, 0xc1, 0xbd,</div><div class='del'>-	0x93, 0x41, 0xbe, 0x5f, 0x85, 0x75, 0x27, 0xc2, 0xb8, 0x12, 0xbf, 0x19,</div><div class='del'>-	0x85, 0x1a, 0x1b, 0x03, 0x79, 0x35, 0xfa, 0x11, 0xfb, 0xac, 0x34, 0x7b,</div><div class='del'>-	0x4a, 0xd9, 0x63, 0x3a, 0x62, 0x48, 0x7f, 0xee, 0xe2, 0x77, 0x1f, 0x7f,</div><div class='del'>-	0x45, 0x9f, 0xdf, 0x2a, 0x62, 0x9d, 0xa9, 0xd6, 0xf0, 0xfc, 0xcf, 0x2b,</div><div class='del'>-	0xec, 0x79, 0x5a, 0x98, 0xcf, 0x05, 0xac, 0x19, 0xe1, 0x28, 0x69, 0x9e,</div><div class='del'>-	0x9d, 0x96, 0xbe, 0xad, 0x6d, 0xb3, 0xa7, 0xb8, 0x4f, 0xff, 0x53, 0xdd,</div><div class='del'>-	0x81, 0x2d, 0xec, 0xed, 0x43, 0x9a, 0xd4, 0xcb, 0x51, 0xb5, 0x16, 0x9b,</div><div class='del'>-	0x71, 0x3a, 0xc0, 0x26, 0x5c, 0xfb, 0x0f, 0x98, 0x08, 0xc4, 0x98, 0xf3,</div><div class='del'>-	0x35, 0xbc, 0x9b, 0xf9, 0x32, 0xfb, 0x9d, 0x3a, 0x39, 0xe3, 0x83, 0x5b,</div><div class='del'>-	0x4e, 0xb8, 0xb9, 0xe6, 0x16, 0xe2, 0x9a, 0x4e, 0xbc, 0x16, 0xb0, 0x7b,</div><div class='del'>-	0x8d, 0xa3, 0xbc, 0x3e, 0x3e, 0xe7, 0x23, 0x16, 0xf5, 0xf0, 0xf7, 0x46,</div><div class='del'>-	0xde, 0xbe, 0x88, 0x27, 0x91, 0xe5, 0xdf, 0xe2, 0xc9, 0x43, 0x3c, 0xa0,</div><div class='del'>-	0xe1, 0x6a, 0xe6, 0x65, 0x5c, 0x21, 0xed, 0xf4, 0x9c, 0x4d, 0x73, 0x2a,</div><div class='del'>-	0x2f, 0x74, 0x65, 0xbd, 0x48, 0xaa, 0xd6, 0x29, 0xf4, 0x7d, 0x72, 0xde,</div><div class='del'>-	0xf7, 0xdf, 0xb9, 0x06, 0x91, 0xdd, 0x09, 0xf6, 0xc7, 0x7a, 0x03, 0xda,</div><div class='del'>-	0x03, 0xb4, 0x97, 0x21, 0x6b, 0xa8, 0xec, 0x45, 0xe5, 0xdd, 0x10, 0xd6,</div><div class='del'>-	0x4e, 0x9a, 0x23, 0xa1, 0x84, 0x5c, 0x37, 0xcd, 0xea, 0x4d, 0x5a, 0xe8,</div><div class='del'>-	0x4d, 0xc5, 0xc5, 0x5a, 0xe7, 0xa2, 0x0e, 0xc6, 0x71, 0x36, 0xd3, 0xb8,</div><div class='del'>-	0xf4, 0x1e, 0xb1, 0x53, 0x98, 0xbd, 0xde, 0x25, 0xe7, 0x38, 0xe6, 0x33,</div><div class='del'>-	0x0b, 0x95, 0x32, 0x23, 0x18, 0xcf, 0xfb, 0x94, 0xb9, 0xcc, 0x91, 0x4a,</div><div class='del'>-	0xc9, 0x45, 0x63, 0xf4, 0x85, 0xa6, 0x49, 0xe1, 0xd5, 0x1c, 0xa9, 0x22,</div><div class='del'>-	0x9d, 0x63, 0xa4, 0x33, 0xb7, 0x51, 0xeb, 0x1f, 0x53, 0x44, 0x67, 0x3e,</div><div class='del'>-	0xe2, 0xba, 0x8b, 0x32, 0x3f, 0xa3, 0xde, 0xfe, 0x94, 0xcf, 0x8b, 0xde,</div><div class='del'>-	0x82, 0x78, 0xad, 0x48, 0xe7, 0x89, 0xfc, 0x12, 0xe6, 0x32, 0x1f, 0x58,</div><div class='del'>-	0x7f, 0x8f, 0xe5, 0x63, 0xac, 0x7d, 0x83, 0xc8, 0x31, 0x9f, 0x4c, 0x66,</div><div class='del'>-	0x1a, 0xfb, 0x27, 0xc9, 0x87, 0x7d, 0x36, 0x6f, 0x10, 0x4f, 0x17, 0x9f,</div><div class='del'>-	0x19, 0xe5, 0xbb, 0xa3, 0xd7, 0xfe, 0x16, 0x1d, 0xd9, 0xfb, 0xff, 0xf6,</div><div class='del'>-	0x1e, 0x43, 0x39, 0x6d, 0x67, 0xf7, 0xe1, 0x47, 0x0d, 0xb7, 0xcc, 0xc3,</div><div class='del'>-	0xf1, 0xf2, 0xf4, 0x16, 0x8c, 0xe9, 0x7f, 0x8e, 0xbd, 0x94, 0x7b, 0x9c,</div><div class='del'>-	0xfa, 0x3c, 0x61, 0x58, 0xfb, 0xfc, 0x72, 0xfe, 0x8b, 0xb9, 0xfa, 0x60,</div><div class='del'>-	0xeb, 0x19, 0x62, 0xb1, 0xe3, 0x8c, 0x99, 0xfd, 0xf1, 0xc6, 0xde, 0x57,</div><div class='del'>-	0xe8, 0x77, 0xc9, 0xdf, 0x96, 0xbd, 0x74, 0x60, 0x32, 0xfb, 0x0d, 0xcc,</div><div class='del'>-	0xd6, 0x34, 0x2e, 0x3f, 0xcf, 0x9c, 0x70, 0x9a, 0x79, 0xca, 0xc5, 0x9c,</div><div class='del'>-	0x50, 0x9d, 0x25, 0x86, 0x64, 0x9e, 0x2a, 0x30, 0x4f, 0xb9, 0xb4, 0xc6,</div><div class='del'>-	0xa5, 0x79, 0xfc, 0x15, 0xf5, 0x22, 0xfc, 0x45, 0x62, 0xf3, 0x90, 0x67,</div><div class='del'>-	0xed, 0xf9, 0xab, 0x36, 0x3f, 0x84, 0x4b, 0x37, 0xdb, 0x33, 0x34, 0x27,</div><div class='del'>-	0x6b, 0xf6, 0xbe, 0x4c, 0x63, 0x60, 0x4c, 0x68, 0xf7, 0xa9, 0xa1, 0x34,</div><div class='del'>-	0x6d, 0x35, 0x61, 0x61, 0xef, 0x61, 0xf6, 0x0b, 0x72, 0xde, 0xab, 0x0a,</div><div class='del'>-	0x2e, 0xfa, 0xfe, 0x98, 0x2e, 0xe7, 0x20, 0x42, 0xfe, 0xed, 0xb4, 0xe1,</div><div class='del'>-	0x98, 0xd1, 0xd8, 0x12, 0x51, 0x76, 0xe3, 0x52, 0x31, 0xc7, 0xda, 0x58,</div><div class='del'>-	0x5a, 0xed, 0x3f, 0x86, 0xc6, 0xde, 0x07, 0xf0, 0x75, 0x24, 0x6b, 0x1a,</div><div class='del'>-	0x07, 0xa6, 0x11, 0xd1, 0xef, 0x83, 0x9c, 0x1b, 0xb5, 0x69, 0xd5, 0xe7,</div><div class='del'>-	0x9c, 0xc4, 0x23, 0x9f, 0x98, 0xab, 0xb5, 0x27, 0x30, 0x4d, 0xcc, 0xd8,</div><div class='del'>-	0xb0, 0x5e, 0x5b, 0xfa, 0x6e, 0xf1, 0x9e, 0xbd, 0xa7, 0x24, 0xfe, 0xe2,</div><div class='del'>-	0xa1, 0x0e, 0xca, 0xe1, 0x5a, 0x51, 0xc7, 0x35, 0xa8, 0x0b, 0xeb, 0x4c,</div><div class='del'>-	0xf1, 0x45, 0x1c, 0xa2, 0xbf, 0x4d, 0xe7, 0x15, 0xe8, 0xf5, 0x17, 0x31,</div><div class='del'>-	0x2c, 0xb5, 0x89, 0xef, 0xb4, 0x65, 0x7c, 0xc4, 0x29, 0x21, 0x94, 0x6b,</div><div class='del'>-	0x91, 0xf0, 0x28, 0xe5, 0x6b, 0x63, 0x2e, 0x1f, 0x67, 0x0e, 0x49, 0x07,</div><div class='del'>-	0x7c, 0xd6, 0x39, 0xd7, 0x72, 0x2d, 0x64, 0xfd, 0x6f, 0x82, 0xf4, 0x41,</div><div class='del'>-	0x0d, 0xb3, 0xb2, 0x9f, 0x7d, 0x04, 0x17, 0xa7, 0x0b, 0x38, 0x1e, 0x4f,</div><div class='del'>-	0xe2, 0x40, 0x4d, 0x00, 0x93, 0xc6, 0x4a, 0x6b, 0x6e, 0x20, 0xfd, 0x56,</div><div class='del'>-	0x77, 0xf6, 0xb0, 0x35, 0x8b, 0xdc, 0x16, 0x77, 0xd4, 0xcb, 0x79, 0x8f,</div><div class='del'>-	0x39, 0xf6, 0x5d, 0xd3, 0xfa, 0x08, 0x0e, 0xe9, 0xdf, 0x82, 0xbe, 0x42,</div><div class='del'>-	0x72, 0xe7, 0x18, 0xce, 0xcf, 0x4a, 0x0d, 0x9b, 0x68, 0xbd, 0x75, 0x52,</div><div class='del'>-	0xf4, 0xe3, 0x20, 0xe6, 0xf5, 0xa0, 0xc9, 0xc2, 0x70, 0xaf, 0xb7, 0xae,</div><div class='del'>-	0x99, 0xb5, 0xb1, 0x5c, 0x53, 0x4e, 0xce, 0x66, 0x57, 0xc1, 0x4f, 0x7d,</div><div class='del'>-	0x5d, 0x88, 0xbb, 0x99, 0x73, 0x44, 0x9f, 0x72, 0x16, 0xd0, 0x96, 0x33,</div><div class='del'>-	0x96, 0x53, 0x30, 0xd6, 0x7c, 0xe3, 0x5e, 0x8b, 0xfc, 0x9f, 0xc2, 0xb5,</div><div class='del'>-	0xf3, 0x89, 0xc5, 0xd9, 0xf8, 0x1f, 0x9b, 0x97, 0x6e, 0x12, 0xb9, 0x5b,</div><div class='del'>-	0x7d, 0xcc, 0xe9, 0xe1, 0xd9, 0x6b, 0xfa, 0x15, 0x9d, 0x9e, 0x93, 0x9a,</div><div class='del'>-	0x61, 0xe9, 0xdc, 0x9e, 0xb7, 0xa9, 0xc3, 0xef, 0x28, 0x8d, 0xac, 0x27,</div><div class='del'>-	0xf4, 0xab, 0x1a, 0xfa, 0x5b, 0x13, 0x06, 0x56, 0x27, 0x5c, 0x7d, 0x57,</div><div class='del'>-	0x8d, 0x2d, 0x68, 0xd9, 0xf0, 0xae, 0x89, 0x9b, 0xdb, 0xe0, 0xd4, 0xe4,</div><div class='del'>-	0xfa, 0xac, 0x99, 0x0c, 0xc8, 0xdf, 0x4f, 0xfa, 0xa4, 0x96, 0xbf, 0x68,</div><div class='del'>-	0x14, 0xcc, 0x35, 0x2b, 0x6d, 0x6c, 0xf8, 0xf7, 0x19, 0xd9, 0x07, 0x4b,</div><div class='del'>-	0x9b, 0xec, 0xb5, 0x97, 0xde, 0x76, 0x1e, 0xc6, 0xdf, 0xe6, 0x8e, 0xe0,</div><div class='del'>-	0xad, 0x69, 0x17, 0x71, 0xa6, 0xc8, 0xb2, 0x05, 0xd5, 0x1b, 0xa2, 0xc9,</div><div class='del'>-	0x77, 0x99, 0x17, 0x97, 0x66, 0x4b, 0x7e, 0xf1, 0x7a, 0xeb, 0xda, 0x59,</div><div class='del'>-	0x85, 0xb4, 0xaa, 0x50, 0x46, 0x39, 0x7f, 0xac, 0x3b, 0x11, 0x2e, 0x62,</div><div class='del'>-	0x5b, 0x27, 0xf9, 0xdc, 0x97, 0xb1, 0x31, 0x6f, 0x24, 0x37, 0xed, 0xb3,</div><div class='del'>-	0xe7, 0x5f, 0x3e, 0xe6, 0xd1, 0x71, 0x4c, 0x64, 0x1a, 0x63, 0xef, 0xc9,</div><div class='del'>-	0x79, 0x1e, 0xf6, 0x62, 0x97, 0x30, 0x8e, 0x13, 0x99, 0x52, 0x0e, 0x0d,</div><div class='del'>-	0xc9, 0x39, 0xd8, 0x58, 0xd8, 0x61, 0xe7, 0xc8, 0xb0, 0x43, 0x4d, 0xf3,</div><div class='del'>-	0xd7, 0x27, 0xd8, 0x60, 0x34, 0x1f, 0x09, 0x95, 0xc3, 0x89, 0xfd, 0xba,</div><div class='del'>-	0xed, 0x1f, 0xf5, 0xf3, 0x6e, 0x84, 0x57, 0x48, 0x5d, 0x96, 0x9a, 0xec,</div><div class='del'>-	0x62, 0x4d, 0x5e, 0x89, 0xe4, 0x4a, 0x17, 0x5e, 0xd7, 0x44, 0x1f, 0x53,</div><div class='del'>-	0x25, 0x7d, 0xe8, 0xe7, 0xf0, 0x90, 0x59, 0xe8, 0x15, 0x5f, 0x72, 0xe3,</div><div class='del'>-	0x48, 0xd3, 0x9c, 0x39, 0x1b, 0x14, 0xd9, 0x9d, 0x38, 0xcd, 0xfc, 0x8a,</div><div class='del'>-	0x9b, 0x23, 0xa1, 0xd3, 0xac, 0xd9, 0x63, 0x5a, 0xc9, 0xc7, 0xff, 0x63,</div><div class='del'>-	0x91, 0x4f, 0xad, 0x7f, 0x01, 0x47, 0xf8, 0x77, 0x7d, 0xe8, 0x80, 0x62,</div><div class='del'>-	0xaf, 0xb7, 0x66, 0xfe, 0x43, 0x5f, 0x69, 0x76, 0x2a, 0xcf, 0x86, 0x73,</div><div class='del'>-	0xa7, 0xf9, 0x5d, 0x68, 0xf9, 0xe8, 0x9f, 0xe5, 0x18, 0x08, 0xca, 0x79,</div><div class='del'>-	0x10, 0xd1, 0x8b, 0xec, 0x3f, 0x82, 0xfa, 0x30, 0xf1, 0x32, 0xf5, 0x71,</div><div class='del'>-	0xe4, 0xda, 0xd9, 0x2b, 0x3b, 0x7f, 0x55, 0xf0, 0xfa, 0xf6, 0xf8, 0x4b,</div><div class='del'>-	0x9b, 0xbd, 0xf8, 0x95, 0x79, 0x29, 0x18, 0x62, 0x4e, 0x10, 0x9b, 0xa6,</div><div class='del'>-	0x2c, 0x1c, 0xe9, 0x24, 0x3e, 0xd9, 0x67, 0x9f, 0x33, 0x69, 0x95, 0xff,</div><div class='del'>-	0xa1, 0x29, 0xca, 0x51, 0x18, 0x24, 0xce, 0x5e, 0xcc, 0x58, 0x67, 0xfb,</div><div class='del'>-	0x06, 0xde, 0x54, 0x22, 0xcc, 0x35, 0x5f, 0xc2, 0x40, 0xad, 0xd0, 0x0b,</div><div class='del'>-	0xf8, 0x77, 0xce, 0xc4, 0xa8, 0x83, 0x3a, 0xa1, 0x6b, 0x3e, 0xc3, 0x6e,</div><div class='del'>-	0xee, 0xc8, 0xa4, 0xd0, 0x07, 0xc6, 0x26, 0x23, 0x43, 0x3f, 0x06, 0x36,</div><div class='del'>-	0x57, 0x41, 0x4d, 0x2d, 0x14, 0xff, 0xdf, 0xe3, 0x67, 0x8a, 0xd0, 0x12,</div><div class='del'>-	0x3a, 0x2e, 0x18, 0xcc, 0x71, 0x53, 0x8b, 0x15, 0xd4, 0x9d, 0xda, 0xfb,</div><div class='del'>-	0x3d, 0xa5, 0x02, 0x4f, 0x3c, 0x15, 0x23, 0xef, 0x2b, 0xfc, 0xdb, 0x67,</div><div class='del'>-	0x3c, 0xf0, 0x9e, 0xa9, 0x62, 0xcd, 0xf5, 0xe0, 0x72, 0x33, 0xed, 0xfa,</div><div class='del'>-	0x54, 0x89, 0x77, 0x6b, 0x9f, 0x14, 0x8f, 0x67, 0xc3, 0x30, 0xe8, 0xb3,</div><div class='del'>-	0x8b, 0x86, 0xec, 0x17, 0x7b, 0xac, 0xfc, 0xb9, 0xb4, 0xb1, 0xce, 0xda,</div><div class='del'>-	0xaf, 0x7a, 0x3e, 0xaf, 0x85, 0xce, 0x2a, 0x55, 0xf8, 0xe0, 0x44, 0xe1,</div><div class='del'>-	0xe6, 0x72, 0x98, 0x2f, 0xae, 0x4e, 0x44, 0xfb, 0xf7, 0xd2, 0xe7, 0xd7,</div><div class='del'>-	0xae, 0x09, 0xb2, 0x97, 0x61, 0x4f, 0xb9, 0x49, 0xfa, 0xdf, 0x69, 0xf6,</div><div class='del'>-	0xbf, 0xa5, 0xbd, 0x7f, 0x6d, 0xe8, 0x11, 0x25, 0xdd, 0xe9, 0x87, 0xf9,</div><div class='del'>-	0x51, 0x79, 0xc2, 0xfc, 0xd8, 0x9d, 0x88, 0xf2, 0x7d, 0xd9, 0xdf, 0x33,</div><div class='del'>-	0xcd, 0x9f, 0x36, 0x9b, 0x66, 0xae, 0x39, 0xd2, 0x1f, 0x70, 0x06, 0x70,</div><div class='del'>-	0xa6, 0x41, 0xf6, 0x04, 0x1d, 0xf8, 0x20, 0xaa, 0x85, 0xf6, 0x42, 0xf6,</div><div class='del'>-	0xe8, 0x99, 0xe3, 0x57, 0xca, 0xf9, 0xc4, 0x3a, 0x7f, 0x97, 0xb1, 0x02,</div><div class='del'>-	0xcf, 0x2d, 0x6c, 0xc2, 0x80, 0x1b, 0xd6, 0xf9, 0x19, 0x53, 0xc7, 0x9b,</div><div class='del'>-	0xab, 0x21, 0x75, 0x3b, 0xda, 0xf2, 0x08, 0x82, 0x58, 0xc8, 0x1f, 0xc1,</div><div class='del'>-	0xc3, 0x27, 0x64, 0xaf, 0x71, 0xb2, 0xd5, 0x73, 0xc2, 0xfc, 0xfb, 0x50,</div><div class='del'>-	0xa2, 0xc0, 0xbc, 0x68, 0x9a, 0x15, 0x9b, 0x1a, 0x43, 0x2c, 0x47, 0xc4,</div><div class='del'>-	0x18, 0x69, 0xc1, 0xee, 0x43, 0x1f, 0xa0, 0x06, 0x67, 0xe7, 0x92, 0x37,</div><div class='del'>-	0xb3, 0x97, 0xec, 0x7a, 0x5a, 0x09, 0xe0, 0x07, 0x94, 0xf1, 0xd9, 0xbc,</div><div class='del'>-	0xe0, 0x14, 0xa3, 0xb5, 0xfb, 0xc4, 0x2a, 0xbc, 0xb8, 0x10, 0xc4, 0x59,</div><div class='del'>-	0x43, 0x23, 0x4e, 0x82, 0x52, 0x99, 0x30, 0xab, 0xab, 0xc9, 0x6b, 0xa5,</div><div class='del'>-	0xd3, 0x89, 0xce, 0xb8, 0xf4, 0x87, 0xda, 0x90, 0x4f, 0xc1, 0xaa, 0x72,</div><div class='del'>-	0x68, 0xcb, 0x0f, 0x01, 0xc3, 0x5e, 0xf6, 0xab, 0x4f, 0x2b, 0xd1, 0xfe,</div><div class='del'>-	0xf7, 0x9d, 0x41, 0xfc, 0x80, 0xf9, 0xe7, 0x7b, 0x79, 0x39, 0x5b, 0xc5,</div><div class='del'>-	0x1c, 0x33, 0x17, 0xa6, 0xad, 0x3c, 0x70, 0xd4, 0x57, 0xe1, 0x28, 0xe3,</div><div class='del'>-	0xe5, 0x65, 0xbd, 0x8c, 0x39, 0x4a, 0xce, 0x5a, 0x49, 0x7e, 0x7f, 0x54,</div><div class='del'>-	0xce, 0x94, 0x98, 0xcf, 0x6b, 0x76, 0xbf, 0xaf, 0xcf, 0xdf, 0x78, 0x5e,</div><div class='del'>-	0x39, 0xc0, 0xbc, 0xde, 0xd8, 0x1b, 0x52, 0x5e, 0x35, 0x93, 0xbf, 0xad,</div><div class='del'>-	0x50, 0xce, 0x07, 0xab, 0x50, 0x61, 0xc9, 0x8a, 0xd1, 0x6c, 0xa9, 0xa6,</div><div class='del'>-	0x54, 0x4b, 0x2f, 0xd7, 0x9b, 0x2e, 0xfa, 0x60, 0x25, 0x63, 0xfd, 0x18,</div><div class='del'>-	0x6b, 0x74, 0xf9, 0x09, 0xa9, 0x25, 0xec, 0x5f, 0x94, 0x2d, 0xc4, 0xc2,</div><div class='del'>-	0x82, 0x1b, 0x3c, 0x78, 0x20, 0xa0, 0xb6, 0xc8, 0x99, 0xed, 0x67, 0xf3,</div><div class='del'>-	0x1d, 0x2e, 0x39, 0x3b, 0xf5, 0x5c, 0x5e, 0x6a, 0xb9, 0xe4, 0x82, 0xd2,</div><div class='del'>-	0x7a, 0x21, 0xd4, 0x4e, 0x8a, 0x8d, 0x86, 0x5b, 0x3f, 0x9a, 0xf4, 0xc9,</div><div class='del'>-	0xf9, 0xfa, 0x11, 0x07, 0x7b, 0x6d, 0xcf, 0xa4, 0x69, 0xee, 0x69, 0xd6,</div><div class='del'>-	0x86, 0xb6, 0x38, 0x65, 0x6f, 0x39, 0x32, 0x70, 0x4e, 0x51, 0x5b, 0x26,</div><div class='del'>-	0x94, 0x1b, 0xe9, 0xfc, 0xb7, 0x2a, 0x89, 0x91, 0x34, 0xe5, 0x7c, 0xdc,</div><div class='del'>-	0x92, 0x69, 0x8a, 0x32, 0x95, 0xce, 0x16, 0x55, 0xe1, 0xf2, 0x34, 0x34,</div><div class='del'>-	0x46, 0x2d, 0xce, 0xeb, 0x4c, 0x4e, 0x81, 0x68, 0xb2, 0x1d, 0xe2, 0xff,</div><div class='del'>-	0xea, 0x80, 0x60, 0xa8, 0x4a, 0xe6, 0xe4, 0xb9, 0x69, 0xa9, 0x31, 0x8a,</div><div class='del'>-	0xe0, 0x93, 0x34, 0xd7, 0xc6, 0x95, 0x8d, 0xc0, 0xab, 0x93, 0xf6, 0xde,</div><div class='del'>-	0x7b, 0xf1, 0x2c, 0xb8, 0x75, 0xe6, 0xe1, 0x11, 0xeb, 0x2c, 0x83, 0xd0,</div><div class='del'>-	0x3f, 0x8c, 0x33, 0x19, 0xc1, 0x94, 0xc3, 0xc4, 0x94, 0x91, 0x14, 0xf1,</div><div class='del'>-	0x66, 0x4b, 0xde, 0x3e, 0x97, 0xa5, 0x7f, 0x44, 0x9f, 0x7f, 0x9a, 0x58,</div><div class='del'>-	0xf5, 0x28, 0xec, 0xbd, 0xf7, 0x86, 0xe2, 0x59, 0x85, 0x48, 0xae, 0x4b,</div><div class='del'>-	0xd9, 0x91, 0x97, 0x18, 0x9b, 0x66, 0x8c, 0xb5, 0x2b, 0xdb, 0x17, 0x3a,</div><div class='del'>-	0x94, 0xee, 0x85, 0x1e, 0x65, 0x77, 0x5e, 0x7a, 0xd6, 0xc9, 0xd6, 0x07,</div><div class='del'>-	0x4e, 0xec, 0x52, 0x76, 0xcc, 0xf5, 0x29, 0xc4, 0xb4, 0x01, 0x4f, 0xa2,</div><div class='del'>-	0x5f, 0xe9, 0x59, 0xb0, 0xe7, 0xe7, 0x5d, 0xec, 0xbb, 0x76, 0x18, 0xa5,</div><div class='del'>-	0x7e, 0x5e, 0xfe, 0xdf, 0x2b, 0x28, 0xff, 0x5b, 0x31, 0xb0, 0x4d, 0x31,</div><div class='del'>-	0xcd, 0xdb, 0xe2, 0x7f, 0x27, 0xf6, 0x30, 0x9f, 0x8d, 0xb3, 0x36, 0x1a,</div><div class='del'>-	0x55, 0x18, 0x64, 0xdf, 0x31, 0xaa, 0xdf, 0x5a, 0xdc, 0x2f, 0x13, 0x99,</div><div class='del'>-	0xe4, 0x3c, 0x85, 0xf8, 0x2b, 0xd2, 0xe5, 0xe4, 0xe1, 0x1f, 0xc8, 0xff,</div><div class='del'>-	0x81, 0xa2, 0x5c, 0x3d, 0x72, 0xa6, 0xc0, 0x7d, 0xfd, 0xbc, 0xd9, 0xf1,</div><div class='del'>-	0xc9, 0xeb, 0x72, 0x31, 0xd7, 0x63, 0x9c, 0xf8, 0xf4, 0x80, 0xa2, 0xa6,</div><div class='del'>-	0x9e, 0xb1, 0xe5, 0x5a, 0xba, 0xcc, 0x18, 0x1e, 0xb5, 0x62, 0xd8, 0x96,</div><div class='del'>-	0x6b, 0x5d, 0x51, 0xae, 0xb5, 0xb9, 0x2e, 0xeb, 0x1c, 0x17, 0xf1, 0x7a,</div><div class='del'>-	0xeb, 0xe2, 0xa4, 0x9c, 0x37, 0x93, 0xd9, 0xa5, 0xc8, 0x26, 0x72, 0x9c,</div><div class='del'>-	0x30, 0x2b, 0xb4, 0x1e, 0x65, 0xa7, 0x75, 0xfe, 0x4c, 0xce, 0x7e, 0xc9,</div><div class='del'>-	0x5e, 0x7f, 0x49, 0x2e, 0xa9, 0xe3, 0x2b, 0xfc, 0x1d, 0x33, 0x72, 0x1e,</div><div class='del'>-	0xdb, 0x34, 0x5f, 0xd3, 0x83, 0x7e, 0x91, 0xe5, 0xac, 0x2e, 0xb2, 0xc8,</div><div class='del'>-	0xb9, 0x92, 0x92, 0x3c, 0x5f, 0x2b, 0xca, 0x23, 0xb6, 0xba, 0x6e, 0xa7,</div><div class='del'>-	0xd2, 0xff, 0x09, 0xbe, 0x9d, 0xb1, 0xcf, 0x9c, 0x94, 0xe4, 0xf1, 0x27,</div><div class='del'>-	0x84, 0xff, 0x8b, 0xad, 0xe3, 0xd3, 0xc3, 0x78, 0x95, 0xf7, 0x7f, 0x9e,</div><div class='del'>-	0x29, 0xc9, 0xe5, 0xc4, 0xfc, 0x5c, 0xe9, 0x2c, 0x1d, 0x5b, 0x4a, 0x23,</div><div class='del'>-	0xa2, 0x8f, 0xd1, 0x8f, 0x6c, 0xf9, 0xe4, 0x2c, 0x5d, 0x63, 0xe1, 0xb2,</div><div class='del'>-	0x35, 0xf7, 0x8a, 0x26, 0xd9, 0x2f, 0xe3, 0x6c, 0xfe, 0xd7, 0xed, 0xd7,</div><div class='del'>-	0x94, 0xab, 0x60, 0x8f, 0x2c, 0xb4, 0x5f, 0x27, 0x6d, 0x39, 0x73, 0xa2,</div><div class='del'>-	0xe0, 0x99, 0x39, 0x60, 0xce, 0xe0, 0xb2, 0x89, 0x11, 0x3c, 0xa9, 0x9b,</div><div class='del'>-	0xe6, 0xd3, 0xcd, 0x9a, 0x9c, 0x15, 0xba, 0x50, 0x6b, 0xcd, 0x85, 0xa0,</div><div class='del'>-	0x57, 0x69, 0xb2, 0x77, 0x27, 0xe7, 0x4d, 0xfa, 0xa8, 0x03, 0x91, 0x5d,</div><div class='del'>-	0x7c, 0xa0, 0x64, 0x7b, 0x39, 0x07, 0x97, 0xa6, 0x7e, 0x44, 0x37, 0xa5,</div><div class='del'>-	0xf3, 0x70, 0x32, 0x73, 0xb9, 0x51, 0x27, 0x5d, 0x96, 0x4e, 0x9e, 0xd5,</div><div class='del'>-	0xc5, 0x5f, 0x99, 0x7d, 0xe8, 0xab, 0xf3, 0xc4, 0x0f, 0x63, 0xba, 0xdb,</div><div class='del'>-	0xc2, 0x6a, 0x47, 0x89, 0x4f, 0x26, 0x18, 0x3b, 0x8f, 0x1b, 0x4b, 0x58,</div><div class='del'>-	0xca, 0xbd, 0x8c, 0x57, 0xaf, 0xfd, 0xcf, 0x9c, 0xf8, 0x8b, 0xde, 0xd2,</div><div class='del'>-	0x6d, 0x9d, 0x79, 0xfa, 0xa4, 0xe5, 0xd6, 0xa8, 0xe4, 0xa1, 0x1f, 0x36,</div><div class='del'>-	0xc9, 0x19, 0xa8, 0xf2, 0x44, 0xe0, 0x6b, 0xb2, 0xbf, 0x55, 0x96, 0x98,</div><div class='del'>-	0xfd, 0xea, 0x05, 0x4d, 0x74, 0xa3, 0x35, 0x9f, 0xd1, 0x44, 0xae, 0x1e,</div><div class='del'>-	0x7d, 0xdc, 0xfa, 0x1f, 0xce, 0x96, 0x4d, 0xfb, 0x34, 0x89, 0x1d, 0xdf,</div><div class='del'>-	0xc6, 0x36, 0x2b, 0x27, 0x9c, 0x4e, 0xdc, 0x66, 0xe9, 0xe0, 0x64, 0xe2,</div><div class='del'>-	0x56, 0xeb, 0x73, 0x3a, 0x11, 0xb3, 0x3e, 0xff, 0x24, 0x61, 0xeb, 0x26,</div><div class='del'>-	0x97, 0xa8, 0xb7, 0x3e, 0xe7, 0x13, 0xf6, 0xd9, 0xe9, 0xd9, 0x84, 0x66,</div><div class='del'>-	0x7d, 0x3e, 0x9f, 0x88, 0x58, 0x9f, 0x67, 0x13, 0xb7, 0x5c, 0xe7, 0x8b,</div><div class='del'>-	0x3f, 0xff, 0x0f, 0x4c, 0xd3, 0x85, 0x76, 0xdc, 0x3a, 0x00, 0x00, 0x00 };</div><div class='add'>+	0xad, 0x7b, 0x0d, 0x70, 0x94, 0xf7, 0x79, 0xe7, 0xef, 0xbf, 0x1f, 0xd2,</div><div class='add'>+	0xae, 0xb4, 0x5a, 0xad, 0xf0, 0x82, 0x57, 0x89, 0x52, 0xf6, 0xf5, 0xbe,</div><div class='add'>+	0x2b, 0x2d, 0x96, 0x80, 0x77, 0x41, 0x04, 0x11, 0x6d, 0xcd, 0x56, 0x08,</div><div class='add'>+	0x21, 0x40, 0xd8, 0x32, 0x56, 0x92, 0x25, 0xc7, 0xd4, 0x2a, 0xc8, 0x20,</div><div class='add'>+	0xdb, 0x18, 0x8b, 0x86, 0xe6, 0xe4, 0xd6, 0xad, 0xd6, 0x92, 0xc0, 0x60,</div><div class='add'>+	0x56, 0xbc, 0x22, 0x82, 0x08, 0x77, 0xee, 0x26, 0xb2, 0x25, 0x2c, 0xec,</div><div class='add'>+	0xac, 0x58, 0x3b, 0xbd, 0xeb, 0xc5, 0x33, 0xc9, 0x58, 0x67, 0x6c, 0x4c,</div><div class='add'>+	0x72, 0xfe, 0xc8, 0x75, 0x3a, 0x3d, 0xf7, 0xe6, 0xee, 0xca, 0xf8, 0x83,</div><div class='add'>+	0xd8, 0x6e, 0x8c, 0xdd, 0x4c, 0x3a, 0x27, 0x52, 0xdb, 0xef, 0xfd, 0x9e,</div><div class='add'>+	0xf7, 0xdd, 0x05, 0xe2, 0xba, 0xd3, 0x99, 0xce, 0x69, 0x66, 0x67, 0xa5,</div><div class='add'>+	0xf7, 0xe3, 0xf9, 0x3f, 0xdf, 0xcf, 0xef, 0x79, 0xfe, 0x7f, 0xd5, 0x03,</div><div class='add'>+	0x15, 0x28, 0xfe, 0x54, 0xf1, 0xd3, 0x3c, 0x30, 0x78, 0x70, 0xd5, 0x8a,</div><div class='add'>+	0xe6, 0x15, 0xf6, 0x05, 0x97, 0xc7, 0x23, 0x37, 0xbf, 0xaa, 0x80, 0xde,</div><div class='add'>+	0x0f, 0xf0, 0x6f, 0xfa, 0xf9, 0xca, 0xbf, 0xed, 0x35, 0xfb, 0xc7, 0x0d,</div><div class='add'>+	0x84, 0x4a, 0x7c, 0xc9, 0x07, 0x3e, 0x57, 0xea, 0xd2, 0xd7, 0xda, 0x74,</div><div class='add'>+	0xf8, 0xdc, 0xa9, 0x93, 0xa9, 0xdd, 0x3a, 0x90, 0xce, 0x37, 0x46, 0x37,</div><div class='add'>+	0xe0, 0x53, 0x2b, 0x1b, 0xf6, 0x40, 0xae, 0x7f, 0x25, 0xf5, 0xc9, 0xd0,</div><div class='add'>+	0x4f, 0xd6, 0x6a, 0x1f, 0x4f, 0xb9, 0xe1, 0x0b, 0xa5, 0x4e, 0x23, 0x54,</div><div class='add'>+	0x0f, 0x5f, 0x1d, 0xdf, 0xf9, 0x0f, 0x0d, 0xd5, 0x6e, 0x04, 0x4b, 0xb4,</div><div class='add'>+	0x5a, 0x30, 0x62, 0x22, 0xeb, 0x4b, 0x0d, 0xa0, 0x7c, 0x0d, 0xf0, 0x6e,</div><div class='add'>+	0x2e, 0x6e, 0x8c, 0x00, 0xe3, 0xae, 0x54, 0x3c, 0xfa, 0x22, 0x0c, 0x1c,</div><div class='add'>+	0x2a, 0x44, 0xd1, 0xce, 0xcf, 0x66, 0xf3, 0x33, 0x2b, 0xea, 0x45, 0xd6,</div><div class='add'>+	0xcd, 0xe7, 0x76, 0x35, 0x03, 0x1b, 0x73, 0x06, 0x0e, 0x9b, 0xf0, 0xd5,</div><div class='add'>+	0xa6, 0x1e, 0xc6, 0x3a, 0x7e, 0x07, 0x53, 0x83, 0x78, 0x7d, 0x2c, 0x16,</div><div class='add'>+	0x7d, 0x0a, 0x5a, 0x46, 0x77, 0x6b, 0x83, 0x40, 0x63, 0x7f, 0x9f, 0xd2,</div><div class='add'>+	0x7a, 0xdf, 0x50, 0x5a, 0xf7, 0x98, 0x82, 0x4f, 0xf1, 0xb9, 0xc6, 0xbc,</div><div class='add'>+	0x7c, 0x0f, 0xe2, 0xd6, 0xbc, 0x0f, 0x97, 0xdc, 0xb2, 0xfe, 0xef, 0x52,</div><div class='add'>+	0xdf, 0x0a, 0x1e, 0xbd, 0x05, 0xa3, 0xe4, 0xc1, 0x9b, 0x52, 0x78, 0xb2,</div><div class='add'>+	0x39, 0x1e, 0x19, 0x86, 0xdc, 0x8f, 0x62, 0x43, 0x41, 0xbe, 0x35, 0x4a,</div><div class='add'>+	0x6d, 0x59, 0xa3, 0x86, 0x65, 0x9d, 0x31, 0xca, 0x91, 0x0d, 0x69, 0x11,</div><div class='add'>+	0x40, 0x61, 0xd8, 0x70, 0x21, 0x1d, 0x6a, 0x8b, 0x7a, 0xa0, 0x45, 0xee,</div><div class='add'>+	0xc1, 0x3f, 0x51, 0xe6, 0x74, 0xc2, 0x0b, 0xe7, 0xf9, 0x5e, 0x94, 0x63,</div><div class='add'>+	0x3e, 0xe4, 0x68, 0xed, 0xc9, 0x9c, 0x65, 0x5d, 0xd0, 0x3d, 0x38, 0x43,</div><div class='add'>+	0xfd, 0x0c, 0xe7, 0xff, 0xc9, 0x9a, 0xa7, 0x6e, 0x46, 0xf5, 0xd2, 0xfa,</div><div class='add'>+	0x3e, 0x4c, 0x85, 0x2c, 0x6b, 0x9a, 0xf7, 0x0e, 0xe7, 0x4b, 0x7a, 0xb6,</div><div class='add'>+	0x2c, 0x97, 0x6e, 0x59, 0xbb, 0xf5, 0xdf, 0x58, 0xbb, 0x7e, 0xeb, 0x59,</div><div class='add'>+	0xcb, 0x7a, 0xcc, 0xb8, 0x09, 0x67, 0x27, 0xda, 0xd5, 0x96, 0xd9, 0x25,</div><div class='add'>+	0xc1, 0xcd, 0x93, 0x16, 0x2e, 0x18, 0x08, 0xb9, 0x52, 0x1d, 0x6a, 0xf3,</div><div class='add'>+	0x6c, 0xa7, 0xda, 0x58, 0xd8, 0xae, 0x3a, 0xa6, 0xbf, 0xa5, 0x3a, 0x67,</div><div class='add'>+	0x7b, 0xd5, 0xa6, 0x42, 0x04, 0x33, 0x66, 0x18, 0xd3, 0x66, 0x46, 0xb5,</div><div class='add'>+	0xcf, 0xf6, 0x28, 0x47, 0x8e, 0x41, 0xd5, 0x56, 0x28, 0xd1, 0xba, 0xae,</div><div class='add'>+	0xc7, 0xcd, 0xb9, 0x14, 0x8e, 0x98, 0xe5, 0x5c, 0x67, 0xc1, 0xfa, 0x49,</div><div class='add'>+	0xc3, 0x02, 0xe5, 0x34, 0x70, 0xb4, 0xf0, 0x18, 0xb6, 0x4d, 0x5a, 0x56,</div><div class='add'>+	0x3e, 0x09, 0xe4, 0x0b, 0xc0, 0x0f, 0xcc, 0x58, 0x77, 0xbf, 0xb2, 0xac,</div><div class='add'>+	0x4d, 0x71, 0x6b, 0xe9, 0x65, 0xa3, 0x31, 0xf1, 0x12, 0xfe, 0xaf, 0x35,</div><div class='add'>+	0x15, 0x46, 0x36, 0x40, 0x1a, 0xc7, 0x68, 0xb3, 0xfb, 0xc6, 0xe0, 0x2b,</div><div class='add'>+	0x4f, 0x8d, 0xe2, 0x17, 0x39, 0xf8, 0xca, 0x52, 0x59, 0x5c, 0xc8, 0x0d,</div><div class='add'>+	0x87, 0x7c, 0x88, 0x45, 0x36, 0xab, 0xec, 0xa0, 0x0b, 0xda, 0xc0, 0xdb,</div><div class='add'>+	0xd0, 0xa2, 0xb4, 0xc7, 0xc5, 0xf3, 0x4a, 0x9b, 0x7f, 0x09, 0x5a, 0xfa,</div><div class='add'>+	0x37, 0x4a, 0xeb, 0xac, 0x75, 0x23, 0xed, 0x8a, 0xfb, 0xf0, 0x93, 0x06,</div><div class='add'>+	0xb1, 0xc9, 0x28, 0x56, 0xd8, 0xb6, 0xc9, 0x62, 0xd9, 0x35, 0xdb, 0xa4,</div><div class='add'>+	0x30, 0x4c, 0xbe, 0x0e, 0x93, 0xaf, 0x97, 0x0d, 0x2d, 0xf2, 0x24, 0xac,</div><div class='add'>+	0xa5, 0x7d, 0x86, 0xdc, 0x4b, 0x61, 0xb4, 0x60, 0x45, 0x83, 0xa9, 0x4b,</div><div class='add'>+	0xe4, 0x17, 0xd9, 0x2f, 0xa5, 0x7c, 0xd9, 0xea, 0xd4, 0xa7, 0xd6, 0x6b,</div><div class='add'>+	0x6b, 0x22, 0x78, 0xa1, 0x10, 0xc6, 0x73, 0x85, 0x10, 0x9e, 0x2d, 0xb4,</div><div class='add'>+	0xc3, 0x2c, 0x20, 0xb8, 0xad, 0xf0, 0x45, 0x7e, 0x6c, 0x21, 0xc0, 0xe7,</div><div class='add'>+	0xc9, 0x77, 0x70, 0x6b, 0xc1, 0xd3, 0x5b, 0x96, 0x42, 0xf7, 0x4f, 0x73,</div><div class='add'>+	0x43, 0x56, 0x85, 0x8e, 0xde, 0x9a, 0x94, 0x9e, 0xbe, 0x55, 0x05, 0x5a,</div><div class='add'>+	0xe8, 0x87, 0xdd, 0xaf, 0xe4, 0x5b, 0x3c, 0xfa, 0x71, 0x3f, 0xbc, 0xd4,</div><div class='add'>+	0xff, 0xc6, 0x82, 0x65, 0x8d, 0x18, 0x07, 0x56, 0xee, 0x6a, 0xf9, 0x8b,</div><div class='add'>+	0xf9, 0x6e, 0xbd, 0x0b, 0xd9, 0x42, 0x1f, 0x10, 0x4c, 0xf1, 0x9b, 0xa1,</div><div class='add'>+	0xb8, 0xbd, 0xa9, 0x3d, 0x7a, 0xee, 0x01, 0x8f, 0xe3, 0xcf, 0xe4, 0x81,</div><div class='add'>+	0x7a, 0x7f, 0xce, 0x24, 0x0f, 0xe6, 0xe1, 0x20, 0x2a, 0xa2, 0x94, 0xef,</div><div class='add'>+	0xe7, 0xe4, 0x33, 0x81, 0x1f, 0x16, 0x74, 0xf2, 0xd6, 0x44, 0x1e, 0xa3,</div><div class='add'>+	0xe4, 0xcf, 0x87, 0x5d, 0x13, 0xda, 0x78, 0x16, 0xda, 0x91, 0x29, 0x2c,</div><div class='add'>+	0x47, 0x3a, 0x1c, 0xa2, 0x0f, 0xfe, 0x39, 0x1c, 0x1a, 0x5d, 0x38, 0x6e,</div><div class='add'>+	0x62, 0x55, 0x28, 0x45, 0xfb, 0x26, 0xf1, 0x70, 0x19, 0xe2, 0xbd, 0x1f,</div><div class='add'>+	0x2b, 0x85, 0xd7, 0xe2, 0x5d, 0x18, 0xa3, 0x3c, 0x5d, 0x79, 0x3f, 0xee,</div><div class='add'>+	0x9f, 0xa8, 0xc0, 0xbd, 0x13, 0x16, 0xee, 0x4b, 0x22, 0x55, 0x41, 0x79,</div><div class='add'>+	0x12, 0xc9, 0x78, 0xf4, 0x3d, 0x78, 0xd0, 0x9e, 0xef, 0x62, 0x2c, 0x6d,</div><div class='add'>+	0x40, 0xba, 0xcc, 0x87, 0x0d, 0xf9, 0x00, 0xe3, 0x31, 0x8d, 0xd3, 0x93,</div><div class='add'>+	0x3e, 0x78, 0x57, 0xbb, 0x30, 0x15, 0x2e, 0x43, 0xa2, 0xde, 0xc5, 0x4f,</div><div class='add'>+	0x38, 0xd8, 0x36, 0x59, 0x17, 0xdc, 0x68, 0x7a, 0xb0, 0xd7, 0x74, 0x61,</div><div class='add'>+	0x68, 0xc2, 0xb2, 0xda, 0x0d, 0x0b, 0x57, 0x57, 0x87, 0xf0, 0x3c, 0xf5,</div><div class='add'>+	0x77, 0xc0, 0x8c, 0xe0, 0x6c, 0xe1, 0x51, 0xf2, 0x12, 0x76, 0xf8, 0x35,</div><div class='add'>+	0xc9, 0xbb, 0x49, 0xde, 0x4d, 0xf2, 0x6d, 0x0a, 0x9f, 0xe7, 0x19, 0x33,</div><div class='add'>+	0x06, 0xe5, 0xf2, 0x93, 0x87, 0x4a, 0xf4, 0x93, 0x8f, 0x58, 0xd2, 0x82,</div><div class='add'>+	0x2b, 0xa9, 0x65, 0x77, 0x31, 0x79, 0x2d, 0xad, 0xb7, 0xac, 0x8f, 0x57,</div><div class='add'>+	0x8b, 0x2c, 0xb4, 0xb9, 0xab, 0x4b, 0x62, 0xf4, 0xf7, 0xaa, 0x18, 0x57,</div><div class='add'>+	0x7f, 0x4b, 0xbd, 0x3d, 0x5e, 0xf0, 0x63, 0x70, 0xc2, 0xf6, 0xdb, 0x83,</div><div class='add'>+	0x65, 0xe4, 0x5b, 0xf8, 0x2a, 0xe8, 0x71, 0xc6, 0x68, 0x3c, 0xc3, 0x18,</div><div class='add'>+	0xc5, 0x56, 0xf2, 0x7c, 0x9f, 0x19, 0x6f, 0xd9, 0xae, 0x3c, 0xd8, 0x94,</div><div class='add'>+	0x0f, 0x07, 0xdb, 0x6f, 0xe0, 0x93, 0xf2, 0x4a, 0x0c, 0x52, 0xd6, 0x10,</div><div class='add'>+	0xf9, 0x0b, 0x63, 0x37, 0xf9, 0x7c, 0xae, 0xc8, 0xe7, 0x74, 0x41, 0xd6,</div><div class='add'>+	0xfa, 0x3c, 0xaf, 0x25, 0x3e, 0x91, 0x5d, 0x94, 0x0a, 0x2b, 0x54, 0x04,</div><div class='add'>+	0xb0, 0x3d, 0xff, 0x26, 0x6d, 0x51, 0x87, 0xbf, 0xa0, 0x0d, 0x5e, 0x60,</div><div class='add'>+	0x8c, 0xfc, 0xf0, 0x9a, 0xbf, 0x88, 0x3d, 0x1e, 0xa1, 0x1d, 0xb4, 0xd3,</div><div class='add'>+	0x59, 0x04, 0xd0, 0x5b, 0x48, 0xe3, 0xd0, 0x24, 0xd2, 0x33, 0xc6, 0x31,</div><div class='add'>+	0xc6, 0xfb, 0x12, 0xb8, 0xf5, 0xf2, 0x74, 0x48, 0xaf, 0xc0, 0xee, 0xe9,</div><div class='add'>+	0x30, 0x06, 0x0a, 0x6d, 0x30, 0x27, 0xc2, 0xd8, 0x47, 0xdf, 0xbc, 0x92,</div><div class='add'>+	0x4c, 0xdf, 0x17, 0x84, 0xf0, 0x1e, 0xc6, 0xfd, 0x7c, 0xe7, 0xb1, 0xc9,</div><div class='add'>+	0x30, 0xfa, 0xa9, 0xa3, 0xcd, 0xc9, 0x78, 0x8b, 0x9f, 0xd7, 0xf6, 0xf2,</div><div class='add'>+	0xda, 0x61, 0xea, 0xff, 0xbc, 0x31, 0x86, 0xde, 0x6e, 0x2d, 0x01, 0x84,</div><div class='add'>+	0xb1, 0xc7, 0x44, 0x88, 0x2e, 0xfc, 0x08, 0xf3, 0x5b, 0xe2, 0x3c, 0xff,</div><div class='add'>+	0xbe, 0xa7, 0x50, 0x41, 0x39, 0x83, 0x88, 0xe8, 0x9f, 0x58, 0xde, 0x66,</div><div class='add'>+	0xcb, 0xfa, 0xbe, 0x11, 0xbf, 0xf8, 0x96, 0xdb, 0x83, 0x87, 0x0a, 0x2e,</div><div class='add'>+	0x0c, 0x4e, 0x57, 0xe0, 0x0f, 0x27, 0x3c, 0xb8, 0xb3, 0xbe, 0x02, 0x07,</div><div class='add'>+	0xa6, 0xd3, 0x18, 0x99, 0xac, 0x40, 0xdf, 0x04, 0x96, 0xee, 0x31, 0x46,</div><div class='add'>+	0x6a, 0xca, 0xa0, 0x2d, 0xb4, 0x23, 0x81, 0xab, 0xb4, 0xc3, 0x43, 0xd3,</div><div class='add'>+	0x81, 0x60, 0x66, 0x32, 0x84, 0xc1, 0x59, 0x3f, 0x9f, 0x77, 0xf1, 0xf9,</div><div class='add'>+	0x72, 0x18, 0xab, 0x62, 0x83, 0x21, 0x08, 0x8f, 0x95, 0xd8, 0x3f, 0xed,</div><div class='add'>+	0xc7, 0x03, 0x13, 0x21, 0xec, 0x9b, 0x6c, 0xc6, 0xb8, 0x99, 0xc6, 0x51,</div><div class='add'>+	0xe6, 0x8e, 0x1f, 0x24, 0xb5, 0xee, 0x7d, 0x4a, 0x4b, 0x6f, 0x54, 0x69,</div><div class='add'>+	0x34, 0x24, 0xbd, 0xb8, 0xc4, 0x3c, 0xe4, 0x4d, 0x36, 0xb6, 0x3c, 0xcb,</div><div class='add'>+	0xdc, 0x50, 0x96, 0x0a, 0xf3, 0x6f, 0xed, 0x08, 0x63, 0x36, 0xed, 0x75,</div><div class='add'>+	0xad, 0x06, 0x16, 0x4b, 0xfc, 0x86, 0x83, 0x5b, 0xcc, 0x50, 0x70, 0x4b,</div><div class='add'>+	0xa1, 0x2e, 0xb8, 0xd9, 0x8c, 0x04, 0x37, 0x33, 0xbe, 0x36, 0x8a, 0x3f,</div><div class='add'>+	0x9a, 0x3e, 0x1c, 0x4b, 0x7e, 0x6a, 0xf5, 0xd6, 0xd8, 0xf9, 0x2c, 0xb8,</div><div class='add'>+	0x6d, 0x52, 0xcb, 0x4e, 0x41, 0x33, 0x58, 0x0d, 0x30, 0x36, 0xeb, 0xa1,</div><div class='add'>+	0xfd, 0x14, 0x6a, 0xf4, 0x66, 0xe6, 0xf1, 0x10, 0xf6, 0x33, 0xa7, 0xfc,</div><div class='add'>+	0x15, 0x73, 0x4a, 0xdf, 0xf1, 0x58, 0x68, 0x1c, 0x7e, 0xea, 0x1b, 0xd8,</div><div class='add'>+	0x75, 0x2e, 0x4c, 0x9b, 0x77, 0xe2, 0x51, 0xf2, 0xb5, 0x79, 0x4d, 0x18,</div><div class='add'>+	0xf7, 0x16, 0x42, 0xc1, 0x4e, 0xda, 0xef, 0xbd, 0x7c, 0x24, 0xb8, 0x81,</div><div class='add'>+	0xb6, 0x7c, 0x3b, 0xaf, 0x45, 0xe7, 0xf1, 0x8f, 0xe2, 0x4f, 0x09, 0xb8,</div><div class='add'>+	0x80, 0x3d, 0xc7, 0xbd, 0x98, 0x0f, 0xcb, 0x5a, 0xd4, 0xb9, 0xf9, 0x82,</div><div class='add'>+	0x15, 0xd0, 0xf5, 0xd3, 0xfb, 0xa8, 0xeb, 0x6f, 0x17, 0x02, 0x78, 0xc0,</div><div class='add'>+	0xd4, 0x12, 0x3f, 0x54, 0x01, 0xea, 0xd4, 0x47, 0x3d, 0x30, 0xc1, 0x2c,</div><div class='add'>+	0x91, 0xe7, 0x92, 0x88, 0x2e, 0x71, 0x72, 0xed, 0x81, 0x69, 0xf1, 0x13,</div><div class='add'>+	0xda, 0xde, 0xa4, 0x0f, 0xd0, 0x7f, 0x7e, 0x78, 0x2d, 0x56, 0xb5, 0x50,</div><div class='add'>+	0xd6, 0xce, 0xdd, 0x09, 0xfa, 0x8b, 0xa3, 0xa3, 0x13, 0x93, 0xa2, 0x07,</div><div class='add'>+	0x6d, 0x1c, 0xae, 0x34, 0x56, 0xae, 0xfa, 0x2b, 0xeb, 0xd2, 0x62, 0xd1,</div><div class='add'>+	0x47, 0x08, 0x43, 0xd4, 0xe1, 0x69, 0xd3, 0xb2, 0xae, 0xae, 0xfe, 0xd0,</div><div class='add'>+	0x6a, 0xb9, 0x59, 0xf4, 0x22, 0xb2, 0x3e, 0xaf, 0xa4, 0x8e, 0xd4, 0xe8,</div><div class='add'>+	0xc1, 0xff, 0x0f, 0xbe, 0xf2, 0x1d, 0xab, 0xd7, 0x96, 0x4f, 0xfc, 0xc5,</div><div class='add'>+	0x43, 0x5f, 0x7c, 0x94, 0xb4, 0x5d, 0xe8, 0x25, 0xbd, 0x07, 0x4d, 0xeb,</div><div class='add'>+	0xa3, 0xda, 0xd4, 0x67, 0x56, 0xcb, 0x5a, 0x7d, 0x60, 0x41, 0xfd, 0x0f,</div><div class='add'>+	0x5e, 0x0f, 0x63, 0x7f, 0xa1, 0x85, 0xba, 0x6b, 0xc7, 0x63, 0xd4, 0xe1,</div><div class='add'>+	0x61, 0x53, 0x72, 0x62, 0x84, 0xfe, 0x5c, 0x47, 0xff, 0xf6, 0xa8, 0x8d,</div><div class='add'>+	0x66, 0x1e, 0x9b, 0xc7, 0xb2, 0xd8, 0x44, 0x7f, 0xbf, 0x98, 0x8b, 0xb5,</div><div class='add'>+	0x3c, 0x0d, 0x2d, 0x4b, 0x19, 0x82, 0x9d, 0xd4, 0x71, 0xbb, 0xa9, 0x75,</div><div class='add'>+	0x8a, 0x4d, 0xdb, 0x99, 0x97, 0x5e, 0xcc, 0x45, 0x82, 0x6d, 0x05, 0xd1,</div><div class='add'>+	0x77, 0x5d, 0x70, 0x43, 0xe1, 0xab, 0xb4, 0xbd, 0xc2, 0xba, 0xe5, 0x3e,</div><div class='add'>+	0xe6, 0x99, 0x3b, 0xe1, 0xd8, 0xd5, 0xb1, 0xdd, 0x6b, 0xc9, 0xc6, 0xde,</div><div class='add'>+	0x0f, 0x99, 0x9f, 0xb2, 0x8b, 0x9d, 0x6b, 0x83, 0xbc, 0x56, 0xbd, 0x1a,</div><div class='add'>+	0xc1, 0x3b, 0xe8, 0x07, 0x77, 0xd3, 0x0f, 0xae, 0xae, 0xfe, 0xd4, 0x8a,</div><div class='add'>+	0xde, 0xe4, 0xf8, 0x41, 0xdb, 0xa4, 0x27, 0xd8, 0x41, 0x3d, 0x6d, 0x34,</div><div class='add'>+	0x14, 0xa6, 0x8d, 0x1c, 0x7a, 0xaf, 0x61, 0x87, 0xf4, 0xd4, 0x59, 0x23,</div><div class='add'>+	0xcd, 0x3c, 0xf2, 0xbb, 0xf0, 0xd4, 0x60, 0xea, 0x69, 0xe3, 0x51, 0x44,</div><div class='add'>+	0x1d, 0xdf, 0xc1, 0xbe, 0x09, 0x3f, 0xb2, 0x77, 0x86, 0x30, 0xd3, 0x10,</div><div class='add'>+	0xc2, 0x83, 0xa4, 0x7d, 0x25, 0xd9, 0xd8, 0xff, 0x3a, 0x75, 0x30, 0x55,</div><div class='add'>+	0x23, 0xd7, 0xd2, 0xf8, 0x91, 0xf1, 0x30, 0x70, 0x93, 0xb3, 0xf6, 0xac,</div><div class='add'>+	0xc4, 0xe8, 0x6c, 0x33, 0x0e, 0x17, 0x32, 0xca, 0xc9, 0x9b, 0x5a, 0x67,</div><div class='add'>+	0x1a, 0x3f, 0xb7, 0x24, 0x97, 0xce, 0x9a, 0xcc, 0x71, 0xd4, 0xc7, 0x28,</div><div class='add'>+	0xfd, 0x68, 0x38, 0x5f, 0x17, 0xdc, 0x44, 0x3f, 0x7a, 0x34, 0x2f, 0x32,</div><div class='add'>+	0xc5, 0x0d, 0xc3, 0x5d, 0xcb, 0xda, 0x4c, 0xfd, 0x98, 0x76, 0xcd, 0xaf,</div><div class='add'>+	0x0e, 0xe9, 0x47, 0x31, 0x6e, 0xf3, 0x36, 0xa8, 0x32, 0xc4, 0x18, 0x0c,</div><div class='add'>+	0x99, 0xea, 0x72, 0xfd, 0x00, 0x1e, 0xb5, 0xaf, 0x85, 0x83, 0x3b, 0x26,</div><div class='add'>+	0xd3, 0x2e, 0x97, 0x8e, 0x50, 0x65, 0xaa, 0x5d, 0xed, 0x60, 0xdd, 0xed,</div><div class='add'>+	0x98, 0xec, 0x50, 0x1d, 0xb3, 0x12, 0x03, 0x9d, 0x6a, 0x33, 0x6b, 0x6e,</div><div class='add'>+	0x9a, 0x35, 0x37, 0xcd, 0x9a, 0x9b, 0x26, 0x1f, 0x69, 0xd6, 0xda, 0xb6,</div><div class='add'>+	0xc2, 0xa0, 0xda, 0x2a, 0xfa, 0xa7, 0x7f, 0x3d, 0x6b, 0x3a, 0x38, 0x82,</div><div class='add'>+	0x39, 0x28, 0xb8, 0xa9, 0xb0, 0xc2, 0xe5, 0x60, 0xbb, 0x41, 0x55, 0xc4,</div><div class='add'>+	0x32, 0xbe, 0x0a, 0x9d, 0xb5, 0xcc, 0x1c, 0x54, 0x5b, 0x58, 0x6f, 0x33,</div><div class='add'>+	0xb6, 0x2e, 0x63, 0x03, 0xef, 0xb0, 0xce, 0xbe, 0xc6, 0x3a, 0x9b, 0x4f,</div><div class='add'>+	0x32, 0xae, 0x96, 0x5f, 0xb5, 0x7a, 0x17, 0x3b, 0x35, 0x61, 0x84, 0xfc,</div><div class='add'>+	0x7e, 0x9f, 0x36, 0x9b, 0x67, 0x2d, 0x6d, 0x77, 0x2b, 0xec, 0xd1, 0x51,</div><div class='add'>+	0x5d, 0xcb, 0x9c, 0x7a, 0xb8, 0xc0, 0x3a, 0x60, 0xc4, 0x5a, 0xde, 0xa7,</div><div class='add'>+	0x62, 0x0f, 0xeb, 0x5e, 0x5c, 0xbd, 0x89, 0x60, 0x47, 0x6f, 0xc3, 0xb1,</div><div class='add'>+	0x89, 0x72, 0xf4, 0x27, 0xd3, 0x8b, 0x7c, 0xc4, 0x2a, 0x9d, 0xcd, 0x78,</div><div class='add'>+	0x98, 0x4b, 0xab, 0x48, 0x2a, 0x4e, 0xbf, 0x41, 0xfa, 0x38, 0xeb, 0xc4,</div><div class='add'>+	0x98, 0xf9, 0x55, 0xe4, 0x59, 0x4f, 0x67, 0x0c, 0x0f, 0x5e, 0xcb, 0xaf,</div><div class='add'>+	0x60, 0x9e, 0x8b, 0x1b, 0x01, 0x55, 0xc1, 0xf8, 0x4d, 0x21, 0x67, 0x4a,</div><div class='add'>+	0x7e, 0xb2, 0xac, 0x19, 0xe1, 0x21, 0x1e, 0x4f, 0x0f, 0x43, 0x72, 0x96,</div><div class='add'>+	0xb5, 0xf4, 0x9e, 0x64, 0x19, 0xd6, 0xc5, 0x83, 0x58, 0xaa, 0xf7, 0xaa,</div><div class='add'>+	0xce, 0x42, 0xdc, 0x38, 0x8f, 0x6f, 0xa9, 0xbb, 0x67, 0x53, 0x8c, 0xed,</div><div class='add'>+	0x0c, 0x75, 0x53, 0x81, 0x4b, 0x61, 0xe1, 0x11, 0xd5, 0x5e, 0xdd, 0x85,</div><div class='add'>+	0x77, 0xef, 0x52, 0x08, 0xe9, 0x69, 0x5c, 0x68, 0x0e, 0xd1, 0xaf, 0x3a,</div><div class='add'>+	0x89, 0x31, 0xa2, 0x70, 0xcf, 0x45, 0x82, 0x5b, 0x69, 0x8b, 0xca, 0xb9,</div><div class='add'>+	0x3a, 0xda, 0x87, 0xbe, 0x47, 0x1d, 0xb6, 0x51, 0x87, 0x5b, 0xa6, 0x11,</div><div class='add'>+	0xaa, 0x48, 0xf5, 0xa8, 0x8e, 0x42, 0xbb, 0x6a, 0x2f, 0x68, 0xd4, 0x93,</div><div class='add'>+	0xe8, 0xe4, 0x3b, 0xc4, 0x4a, 0xe2, 0x2b, 0x25, 0x5b, 0x8a, 0xbf, 0xde,</div><div class='add'>+	0x68, 0xcf, 0x8c, 0x4b, 0x62, 0x6e, 0xdd, 0xf2, 0x14, 0xe3, 0xd1, 0x45,</div><div class='add'>+	0xbe, 0x84, 0x07, 0x1f, 0xaa, 0x1b, 0xac, 0xa5, 0x57, 0x92, 0x4c, 0x9e,</div><div class='add'>+	0x15, 0x29, 0x1c, 0x2f, 0x74, 0xd1, 0x2e, 0xab, 0x8b, 0xfe, 0x15, 0x0a,</div><div class='add'>+	0x6e, 0x9c, 0x6c, 0x57, 0x1b, 0x67, 0x17, 0x05, 0xbb, 0x69, 0xc3, 0xee,</div><div class='add'>+	0xd9, 0x88, 0xd0, 0xe5, 0xfa, 0x62, 0xdb, 0x34, 0x5c, 0xfa, 0xbf, 0x64,</div><div class='add'>+	0xcb, 0x6f, 0x93, 0x96, 0xd8, 0xd3, 0x5f, 0xf2, 0xd3, 0xe0, 0xdd, 0x93,</div><div class='add'>+	0x69, 0xbc, 0xbb, 0xda, 0xcb, 0x9a, 0x5a, 0xc2, 0x14, 0x55, 0xc5, 0xef,</div><div class='add'>+	0xd3, 0x2e, 0xe8, 0x83, 0xaa, 0x53, 0xfc, 0xc8, 0xeb, 0xac, 0x79, 0xc7,</div><div class='add'>+	0x24, 0xbc, 0x84, 0x0a, 0x51, 0x37, 0x31, 0xdd, 0x87, 0xc9, 0x78, 0xef,</div><div class='add'>+	0x39, 0xd5, 0xa5, 0xba, 0x0a, 0x52, 0x83, 0x1d, 0x9f, 0x6a, 0xa3, 0x4f,</div><div class='add'>+	0xb5, 0x93, 0x9f, 0x76, 0xfa, 0xd4, 0x16, 0xf2, 0xb3, 0xc5, 0xf6, 0x29,</div><div class='add'>+	0xf1, 0xcd, 0xdf, 0xe6, 0x65, 0x43, 0xe1, 0x6e, 0x5b, 0x2f, 0x5b, 0xf9,</div><div class='add'>+	0x6e, 0x27, 0xe5, 0xe8, 0xe4, 0x7b, 0x77, 0xf3, 0xbd, 0xbb, 0x67, 0xff,</div><div class='add'>+	0x97, 0xf0, 0x47, 0x59, 0x9c, 0xd8, 0xbf, 0x5e, 0xd3, 0x24, 0x07, 0xfc,</div><div class='add'>+	0xac, 0x88, 0x29, 0x90, 0x75, 0xa5, 0x24, 0x47, 0x0c, 0xa0, 0xbb, 0x19,</div><div class='add'>+	0xbe, 0x45, 0xa9, 0x67, 0x5b, 0xb7, 0xd7, 0x33, 0x9f, 0x31, 0x9f, 0xfa,</div><div class='add'>+	0x8e, 0x13, 0x4b, 0x33, 0x47, 0xcf, 0xb4, 0x28, 0x8c, 0x18, 0x37, 0x33,</div><div class='add'>+	0x4e, 0x0d, 0x1c, 0x29, 0x68, 0x9d, 0x51, 0xde, 0x6b, 0x1a, 0x13, 0x8c,</div><div class='add'>+	0xbf, 0x0f, 0x6d, 0xc4, 0x75, 0x91, 0x54, 0x3f, 0x22, 0x66, 0x2c, 0x72,</div><div class='add'>+	0x44, 0x69, 0xfd, 0x1b, 0xa0, 0x5d, 0x64, 0x6d, 0x18, 0x9c, 0x56, 0xda,</div><div class='add'>+	0x40, 0xad, 0x5b, 0x4b, 0xbf, 0x61, 0xe3, 0xeb, 0x7d, 0x58, 0x6e, 0x63,</div><div class='add'>+	0xb8, 0x7e, 0x24, 0x88, 0x65, 0xb7, 0x92, 0xe6, 0xde, 0x75, 0x0a, 0x97,</div><div class='add'>+	0x8d, 0x0f, 0x69, 0x47, 0x2d, 0x9d, 0x55, 0x06, 0x72, 0xcc, 0x13, 0x91,</div><div class='add'>+	0xe3, 0x82, 0xd5, 0xf7, 0x11, 0xab, 0xc3, 0x17, 0xe0, 0xb3, 0xb9, 0xb1,</div><div class='add'>+	0xd8, 0xa0, 0xcf, 0xad, 0x25, 0x88, 0xd3, 0xd3, 0xa4, 0x69, 0x14, 0x88,</div><div class='add'>+	0xdf, 0xb9, 0x46, 0x74, 0x4f, 0x91, 0x66, 0xbc, 0x48, 0x53, 0xcf, 0x83,</div><div class='add'>+	0x71, 0x73, 0x04, 0x9b, 0xe2, 0xac, 0x15, 0xcc, 0x79, 0x47, 0xa5, 0x27,</div><div class='add'>+	0x20, 0xbd, 0xf2, 0xe3, 0x06, 0xff, 0x1e, 0x54, 0x3b, 0x24, 0xa6, 0xca,</div><div class='add'>+	0x1d, 0x2b, 0x54, 0x73, 0x8d, 0xaa, 0xd4, 0x41, 0xcc, 0xd9, 0x6b, 0x0c,</div><div class='add'>+	0xc8, 0x1a, 0x03, 0xbf, 0x50, 0x5a, 0xe2, 0x9c, 0x92, 0x5c, 0xdd, 0x98,</div><div class='add'>+	0x39, 0xc7, 0x18, 0x3a, 0xac, 0xb4, 0x96, 0x63, 0x14, 0xdf, 0xaf, 0x0b,</div><div class='add'>+	0xfd, 0x83, 0xc5, 0x75, 0x06, 0xd0, 0x90, 0x67, 0x7c, 0x16, 0x7c, 0x6a,</div><div class='add'>+	0xc3, 0x44, 0x1b, 0x46, 0xa6, 0xdb, 0x30, 0x3c, 0xa1, 0x70, 0xb7, 0xb1,</div><div class='add'>+	0x18, 0x97, 0x6e, 0xb6, 0xfb, 0x94, 0xaa, 0xa5, 0x7a, 0x2d, 0x86, 0x42,</div><div class='add'>+	0xa8, 0x76, 0xe9, 0x5f, 0xc1, 0xae, 0x22, 0xc6, 0xdf, 0x74, 0xa2, 0x9b,</div><div class='add'>+	0x79, 0xdf, 0xc2, 0xfb, 0x8c, 0xa5, 0x58, 0x0d, 0xd2, 0xde, 0x54, 0x0b,</div><div class='add'>+	0xf1, 0x78, 0x9d, 0xdb, 0x89, 0xf7, 0x0f, 0x7d, 0x8e, 0x0d, 0x44, 0xff,</div><div class='add'>+	0x9f, 0xbf, 0xd7, 0x86, 0xc7, 0x27, 0xca, 0xd0, 0xb2, 0x1a, 0x77, 0x46,</div><div class='add'>+	0x50, 0xe5, 0x62, 0x8d, 0x7b, 0x73, 0xbb, 0x1a, 0xe4, 0x3d, 0xfb, 0x59,</div><div class='add'>+	0xdf, 0x97, 0x53, 0x46, 0xea, 0x4f, 0x1a, 0xe4, 0xba, 0x9d, 0x37, 0x6e,</div><div class='add'>+	0xb8, 0xde, 0xfd, 0x05, 0xd7, 0x15, 0x9e, 0x61, 0x22, 0xfb, 0x01, 0x6b,</div><div class='add'>+	0x4a, 0x3e, 0x67, 0xc1, 0x9d, 0xf2, 0xa0, 0x7f, 0x2c, 0x8a, 0x7d, 0x73,</div><div class='add'>+	0x61, 0xcc, 0xe5, 0xb4, 0xde, 0x4b, 0xec, 0x1f, 0x76, 0x35, 0xeb, 0x78,</div><div class='add'>+	0x60, 0x2e, 0x82, 0xd9, 0x1c, 0x2c, 0x7f, 0x4a, 0x9f, 0xf7, 0xab, 0x04,</div><div class='add'>+	0xf6, 0xce, 0xd5, 0xe1, 0x5c, 0x4e, 0xbf, 0x38, 0xac, 0xe2, 0x83, 0xb5,</div><div class='add'>+	0xc4, 0x1d, 0x0f, 0xce, 0x35, 0x61, 0xff, 0x9c, 0x8f, 0xef, 0x58, 0xd8,</div><div class='add'>+	0x92, 0xac, 0xe3, 0xf3, 0x2e, 0x3c, 0x7d, 0xd2, 0xb2, 0x04, 0x77, 0xf5,</div><div class='add'>+	0xcf, 0x01, 0xb3, 0xe3, 0xac, 0x45, 0x67, 0x58, 0x97, 0x9e, 0x00, 0xf6,</div><div class='add'>+	0x3e, 0xe1, 0xc2, 0xf4, 0xb8, 0x85, 0x5d, 0xc6, 0x70, 0xad, 0x8b, 0x0e,</div><div class='add'>+	0xdf, 0xcb, 0xba, 0xe1, 0x65, 0x0d, 0xbc, 0x27, 0xe4, 0xe4, 0xf3, 0x4b,</div><div class='add'>+	0xcc, 0x53, 0xf7, 0x3d, 0x91, 0xc0, 0x9b, 0xb9, 0x2c, 0xb6, 0x10, 0x9f,</div><div class='add'>+	0x0f, 0x92, 0x97, 0x37, 0x72, 0xac, 0x63, 0x73, 0x06, 0x5e, 0xcf, 0xf9,</div><div class='add'>+	0xb8, 0x4e, 0x13, 0x5e, 0xca, 0xc9, 0x33, 0xf2, 0x6c, 0x00, 0x7d, 0xe4,</div><div class='add'>+	0xe5, 0xb5, 0x5c, 0x84, 0x6b, 0x86, 0xf1, 0x53, 0x3e, 0x77, 0xef, 0x9c,</div><div class='add'>+	0xce, 0xba, 0xe5, 0xe3, 0xba, 0x51, 0xbc, 0x92, 0x0b, 0x90, 0xd7, 0x30,</div><div class='add'>+	0x6b, 0x55, 0x1f, 0x46, 0x72, 0x8d, 0x17, 0x37, 0x30, 0x51, 0x3b, 0xb5,</div><div class='add'>+	0x46, 0xae, 0xbd, 0x63, 0x75, 0xd9, 0xb1, 0x28, 0xeb, 0x94, 0xd6, 0xed,</div><div class='add'>+	0xc3, 0x70, 0xee, 0x75, 0x77, 0xa9, 0x9f, 0x7e, 0x66, 0x7c, 0xc1, 0xc6,</div><div class='add'>+	0x7e, 0x4f, 0x9b, 0xfc, 0x7d, 0x1a, 0x38, 0x67, 0x66, 0xad, 0xea, 0x14,</div><div class='add'>+	0xb1, 0x2e, 0x6b, 0xd4, 0x5b, 0x6b, 0x9a, 0xb8, 0xae, 0xde, 0xfb, 0xa2,</div><div class='add'>+	0x92, 0x7e, 0xc7, 0x83, 0xe8, 0x13, 0xa2, 0x2f, 0x62, 0xe6, 0x59, 0xe0,</div><div class='add'>+	0x47, 0xc4, 0x9f, 0x0d, 0x63, 0x9a, 0xf8, 0x7d, 0x86, 0xb8, 0xa6, 0x7b,</div><div class='add'>+	0x1e, 0xf5, 0x89, 0x07, 0x30, 0x64, 0x95, 0x11, 0x9f, 0x57, 0x13, 0xd7,</div><div class='add'>+	0xce, 0x35, 0xb1, 0x4e, 0xad, 0xb1, 0xac, 0xbf, 0x6d, 0x86, 0xe5, 0x4a,</div><div class='add'>+	0xe9, 0x46, 0xad, 0x7b, 0xfe, 0x2b, 0x55, 0xd0, 0x2f, 0x06, 0x95, 0x3e,</div><div class='add'>+	0xff, 0x16, 0xe2, 0x03, 0xe7, 0x21, 0x7a, 0x05, 0x56, 0xcc, 0x79, 0xb0,</div><div class='add'>+	0x92, 0xf2, 0x6c, 0x1c, 0xe3, 0xda, 0xc4, 0x27, 0x71, 0xca, 0xb4, 0x6d,</div><div class='add'>+	0x8c, 0x98, 0x4b, 0x0f, 0x60, 0x39, 0x75, 0xdc, 0x7f, 0xca, 0xb2, 0xca,</div><div class='add'>+	0xa9, 0xe3, 0x06, 0xda, 0x67, 0xcf, 0x09, 0x0b, 0x2f, 0x1a, 0x2f, 0x52,</div><div class='add'>+	0xa7, 0x8a, 0xb8, 0xb1, 0x99, 0xef, 0x84, 0xf9, 0xbc, 0x0f, 0x7b, 0xc7,</div><div class='add'>+	0xa4, 0x5f, 0xaa, 0xe3, 0x33, 0xaf, 0xe2, 0x58, 0x2e, 0x81, 0x26, 0xea,</div><div class='add'>+	0x2f, 0x4a, 0x9a, 0x8d, 0x7c, 0x27, 0x4a, 0x7a, 0xd1, 0xb9, 0xaf, 0x61,</div><div class='add'>+	0xf3, 0x29, 0x05, 0x3d, 0x2e, 0x3a, 0xf8, 0x1a, 0xda, 0xcf, 0x7c, 0x51,</div><div class='add'>+	0x4e, 0x60, 0x96, 0x1a, 0xd7, 0x8e, 0xcc, 0x13, 0x7f, 0x57, 0xa5, 0x86,</div><div class='add'>+	0xc0, 0xfa, 0x8d, 0x37, 0xa6, 0x14, 0x8e, 0x8f, 0xb3, 0xdf, 0x5b, 0x03,</div><div class='add'>+	0xab, 0x82, 0x32, 0xbd, 0x3e, 0xf5, 0x3b, 0x78, 0xea, 0x24, 0xf5, 0xf0,</div><div class='add'>+	0x64, 0x18, 0x3f, 0xc8, 0x79, 0xb0, 0xec, 0xb8, 0x60, 0x3a, 0x3d, 0xb1,</div><div class='add'>+	0x4f, 0x49, 0x7f, 0x24, 0x7d, 0x4b, 0x3c, 0xea, 0x55, 0x2e, 0xd4, 0x3f,</div><div class='add'>+	0xe5, 0x81, 0x7e, 0x2e, 0x0a, 0x6f, 0xbd, 0x0f, 0x7a, 0xfd, 0x1f, 0x32,</div><div class='add'>+	0xd7, 0xb8, 0x50, 0xc6, 0x5e, 0x76, 0xd3, 0x77, 0x13, 0xbc, 0x16, 0xe6,</div><div class='add'>+	0x35, 0xfc, 0x4e, 0x39, 0xdc, 0x4b, 0xdc, 0xac, 0xe1, 0x65, 0x3a, 0xf1,</div><div class='add'>+	0x98, 0xc7, 0xb2, 0xdc, 0xac, 0x0d, 0x3b, 0xbe, 0x67, 0x59, 0xb1, 0xd5,</div><div class='add'>+	0xf2, 0x7c, 0x08, 0xb1, 0x73, 0x3a, 0x9f, 0x73, 0xea, 0xe5, 0x75, 0x3c,</div><div class='add'>+	0xe6, 0xa6, 0x1f, 0x49, 0xac, 0xb2, 0xde, 0xdb, 0x3d, 0x94, 0x83, 0xdb,</div><div class='add'>+	0x9f, 0x2b, 0x08, 0xb6, 0x89, 0xda, 0x32, 0x9c, 0x1d, 0x57, 0xcc, 0xd9,</div><div class='add'>+	0x29, 0x3e, 0xbb, 0x1e, 0xee, 0xa4, 0x76, 0x24, 0x4b, 0x3f, 0xd8, 0x15,</div><div class='add'>+	0x6a, 0xc1, 0x33, 0xa6, 0x17, 0x95, 0xfa, 0x12, 0xdc, 0xdf, 0x1d, 0xc2,</div><div class='add'>+	0x33, 0xec, 0x0b, 0x68, 0xb3, 0xc4, 0x3c, 0xd8, 0x48, 0x07, 0x49, 0xcf,</div><div class='add'>+	0xf5, 0x63, 0xe8, 0xdf, 0x75, 0x31, 0xcf, 0xb9, 0xed, 0x3c, 0x57, 0x56,</div><div class='add'>+	0x0f, 0xcc, 0xe7, 0x3d, 0xb8, 0xa0, 0x3b, 0x98, 0xf0, 0x39, 0xbb, 0x66,</div><div class='add'>+	0x6b, 0xa1, 0xf9, 0x6b, 0x58, 0x50, 0x6b, 0x49, 0x2b, 0x32, 0x13, 0x14,</div><div class='add'>+	0xdd, 0x65, 0x3c, 0x8e, 0x2f, 0xfd, 0x8d, 0x5b, 0x7a, 0x8e, 0xeb, 0x7f,</div><div class='add'>+	0x57, 0xc0, 0x95, 0xd2, 0x22, 0x6d, 0x6e, 0xf8, 0x3c, 0xa9, 0xce, 0xd6,</div><div class='add'>+	0x51, 0xfd, 0x4b, 0x37, 0xf0, 0xde, 0x84, 0x91, 0xc2, 0xf5, 0x5e, 0xbb,</div><div class='add'>+	0x33, 0x67, 0xfb, 0x50, 0xa7, 0xe8, 0xfe, 0x31, 0x43, 0xf2, 0xec, 0xa0,</div><div class='add'>+	0x6a, 0x67, 0xde, 0xca, 0x7a, 0x90, 0xad, 0xe2, 0x33, 0xd4, 0x3f, 0x0e,</div><div class='add'>+	0x8f, 0x09, 0x9d, 0x83, 0x18, 0xcd, 0xc9, 0x6c, 0x63, 0x00, 0xeb, 0xcc,</div><div class='add'>+	0x58, 0xe2, 0x22, 0x7b, 0xe8, 0x43, 0x90, 0x39, 0x44, 0xe3, 0xfc, 0xcb,</div><div class='add'>+	0x4a, 0x1b, 0xbc, 0xc5, 0xad, 0xf5, 0x2f, 0x28, 0x27, 0x6f, 0xad, 0x28,</div><div class='add'>+	0xe6, 0xad, 0xe5, 0xf9, 0x25, 0xc1, 0x2e, 0xd6, 0x83, 0xae, 0xd9, 0x52,</div><div class='add'>+	0x7d, 0xe8, 0x52, 0x9b, 0xec, 0xda, 0x9a, 0x51, 0x5b, 0x67, 0x7d, 0xaa,</div><div class='add'>+	0x63, 0xc2, 0x87, 0x97, 0x89, 0xc5, 0xa6, 0x7a, 0x10, 0x5a, 0xb6, 0x06,</div><div class='add'>+	0xfe, 0xad, 0x13, 0xdd, 0x28, 0xd7, 0xa5, 0x87, 0x2c, 0xc7, 0x26, 0xbb,</div><div class='add'>+	0xae, 0xd5, 0x05, 0xbb, 0x58, 0x7f, 0xba, 0x0a, 0x3d, 0xcc, 0x7f, 0x08,</div><div class='add'>+	0xf9, 0x53, 0xce, 0xcc, 0x40, 0x72, 0xe1, 0xed, 0x7c, 0xf7, 0x62, 0x72,</div><div class='add'>+	0x11, 0xe0, 0xd4, 0x3f, 0x95, 0x61, 0x2f, 0x51, 0xbd, 0x5a, 0xe1, 0xd2,</div><div class='add'>+	0x9d, 0x3e, 0x90, 0x16, 0x7b, 0xfe, 0x7c, 0xeb, 0x85, 0xf1, 0x6e, 0xd5,</div><div class='add'>+	0x31, 0x3d, 0xe3, 0xdf, 0x68, 0xca, 0x2c, 0x62, 0xca, 0xdf, 0x4e, 0x1e,</div><div class='add'>+	0xda, 0x67, 0x9f, 0xf4, 0x6f, 0x20, 0x4f, 0x1b, 0x66, 0x3f, 0x4f, 0x53,</div><div class='add'>+	0xea, 0x4a, 0x7f, 0x6b, 0x1b, 0x63, 0x7b, 0x87, 0xf1, 0x91, 0x15, 0xfd,</div><div class='add'>+	0xa6, 0xd0, 0x99, 0x2b, 0xea, 0x33, 0x4d, 0xbe, 0xc2, 0xbe, 0x4d, 0x85,</div><div class='add'>+	0x90, 0x2f, 0x5d, 0x68, 0xf7, 0xb7, 0x99, 0xdd, 0xfe, 0x0d, 0x66, 0x8f,</div><div class='add'>+	0xbf, 0xdd, 0xdc, 0x49, 0xda, 0x5d, 0xfe, 0x0e, 0x93, 0x71, 0x5d, 0xe8,</div><div class='add'>+	0xa1, 0x5e, 0xbb, 0x31, 0x5a, 0xd8, 0x49, 0xec, 0x21, 0x34, 0x7b, 0x89,</div><div class='add'>+	0x83, 0xfc, 0x94, 0x71, 0x88, 0x32, 0xce, 0x47, 0xbc, 0x48, 0x6b, 0x5e,</div><div class='add'>+	0xea, 0x6b, 0xc4, 0xb6, 0xe3, 0x11, 0x7b, 0x16, 0x55, 0x91, 0x7a, 0xa0,</div><div class='add'>+	0x75, 0xcb, 0x09, 0xe6, 0xfb, 0xd4, 0x9e, 0xd6, 0x65, 0xa7, 0x50, 0xe3,</div><div class='add'>+	0x4d, 0x49, 0xef, 0xcc, 0x7e, 0x38, 0x1e, 0x37, 0xde, 0x43, 0x3c, 0xf2,</div><div class='add'>+	0x32, 0x9f, 0x1d, 0xa6, 0xef, 0x8e, 0xd8, 0xf3, 0x07, 0x1a, 0x24, 0xdf,</div><div class='add'>+	0x84, 0x2d, 0xa6, 0xcf, 0xbf, 0x8d, 0xbd, 0x59, 0x30, 0xa5, 0xb5, 0xdc,</div><div class='add'>+	0xee, 0x96, 0x79, 0xc8, 0xfc, 0xef, 0x05, 0xd0, 0x84, 0xce, 0x82, 0x8f,</div><div class='add'>+	0x72, 0x7d, 0x09, 0x7f, 0x7f, 0x92, 0x75, 0x0d, 0xe2, 0x87, 0x96, 0x75,</div><div class='add'>+	0x2f, 0xfb, 0x9a, 0xa3, 0xf9, 0x3a, 0x5c, 0xb6, 0x6d, 0xec, 0xc1, 0xe1,</div><div class='add'>+	0x7c, 0x14, 0xef, 0x50, 0x3e, 0xcf, 0x5c, 0x2d, 0xde, 0x1e, 0x77, 0x63,</div><div class='add'>+	0xb7, 0x71, 0x5b, 0xb1, 0x5e, 0xb8, 0x70, 0x4f, 0xe2, 0x00, 0xb1, 0x83,</div><div class='add'>+	0x0b, 0xd5, 0xc4, 0x6f, 0x0f, 0xda, 0xd7, 0xdc, 0xec, 0xff, 0xbe, 0x8e,</div><div class='add'>+	0x41, 0xa7, 0x9e, 0x90, 0xc7, 0x9d, 0xe4, 0xb1, 0xd9, 0xbf, 0x61, 0x42,</div><div class='add'>+	0xf3, 0xdf, 0x31, 0x01, 0x9f, 0x37, 0xb5, 0xab, 0xf5, 0xcc, 0x49, 0x0b,</div><div class='add'>+	0x7d, 0xc6, 0xad, 0xb8, 0x72, 0x72, 0xb8, 0xdf, 0x43, 0xff, 0xf9, 0x65,</div><div class='add'>+	0x32, 0x03, 0x73, 0x12, 0x17, 0x88, 0x3c, 0x5e, 0x0d, 0x30, 0xb7, 0x37,</div><div class='add'>+	0x24, 0xe3, 0x21, 0xd6, 0x62, 0x63, 0x96, 0xb1, 0xd9, 0x01, 0xad, 0x9f,</div><div class='add'>+	0x35, 0x39, 0xed, 0x4e, 0xc5, 0x7b, 0x47, 0x08, 0x1e, 0xab, 0xc8, 0x8f,</div><div class='add'>+	0x9f, 0xb9, 0x3b, 0x30, 0x17, 0xf5, 0xef, 0x60, 0xbd, 0x89, 0xb0, 0xbf,</div><div class='add'>+	0xf3, 0xc7, 0x71, 0x5b, 0x2d, 0xe2, 0x89, 0x05, 0xca, 0xed, 0x9d, 0x6b,</div><div class='add'>+	0xf2, 0xdf, 0xce, 0xfa, 0x71, 0x39, 0x6e, 0x0d, 0xbd, 0x68, 0x04, 0x10,</div><div class='add'>+	0x9c, 0x33, 0xa8, 0xef, 0x0c, 0x86, 0x67, 0xd9, 0x72, 0xc5, 0xd9, 0xf3,</div><div class='add'>+	0xcf, 0xb5, 0xf8, 0xb7, 0x31, 0x36, 0xab, 0x68, 0xa2, 0xc6, 0xb9, 0xb4,</div><div class='add'>+	0x5f, 0x7a, 0xbe, 0xa6, 0xb9, 0xb5, 0xe4, 0x4f, 0x7c, 0x74, 0x5f, 0xeb,</div><div class='add'>+	0x3a, 0xfa, 0x43, 0x74, 0x0e, 0x9b, 0x98, 0xe6, 0x5e, 0x22, 0xcd, 0x4c,</div><div class='add'>+	0x84, 0x18, 0x76, 0xef, 0x9a, 0x00, 0xf3, 0x94, 0xe8, 0x92, 0x7a, 0x2c,</div><div class='add'>+	0x94, 0x64, 0x92, 0xba, 0xbc, 0xa7, 0x75, 0xee, 0x94, 0xd4, 0xe5, 0x4c,</div><div class='add'>+	0x6b, 0xee, 0x94, 0x8e, 0x77, 0x58, 0x5b, 0x56, 0x24, 0x35, 0xe3, 0x9c,</div><div class='add'>+	0x8a, 0x45, 0x5e, 0xa5, 0x2c, 0x1e, 0xfc, 0xca, 0xda, 0xa5, 0xc7, 0xe7,</div><div class='add'>+	0x6f, 0x61, 0x3c, 0x55, 0x33, 0x37, 0x46, 0x98, 0xf3, 0xab, 0xe7, 0xa8,</div><div class='add'>+	0x98, 0x39, 0xb7, 0x17, 0x15, 0x11, 0xf8, 0xe2, 0x3a, 0xde, 0x3d, 0x99,</div><div class='add'>+	0xa0, 0x1e, 0xae, 0xd1, 0xdc, 0x47, 0xa8, 0xd5, 0xc7, 0x52, 0xf8, 0xc8,</div><div class='add'>+	0x53, 0xf4, 0xc5, 0x51, 0xae, 0x5b, 0x36, 0x27, 0x3c, 0xcb, 0xf3, 0x61,</div><div class='add'>+	0x3e, 0x7f, 0x7d, 0xed, 0x6a, 0xae, 0xfd, 0xd1, 0x29, 0xf1, 0xd7, 0x4c,</div><div class='add'>+	0xeb, 0x85, 0x93, 0xce, 0xda, 0xf1, 0x64, 0x02, 0x1f, 0x9e, 0xd4, 0x06,</div><div class='add'>+	0xde, 0x55, 0xb1, 0xde, 0x0b, 0x4a, 0xd6, 0x47, 0x5d, 0x15, 0xae, 0x58,</div><div class='add'>+	0xc3, 0xf1, 0xf8, 0xe0, 0x2e, 0xd2, 0x6c, 0x59, 0x4b, 0xfd, 0xdb, 0x7c,</div><div class='add'>+	0xd0, 0xe7, 0x99, 0x67, 0xbd, 0xe4, 0xc7, 0xe1, 0xa5, 0x8e, 0xb4, 0x4f,</div><div class='add'>+	0x16, 0x7b, 0x35, 0xf6, 0xa9, 0xd7, 0xf9, 0x09, 0x53, 0x0f, 0xbe, 0x1d,</div><div class='add'>+	0xcd, 0x01, 0xd4, 0xda, 0xcf, 0x85, 0xf8, 0x9c, 0xe8, 0xe1, 0xd7, 0xca,</div><div class='add'>+	0xa5, 0xbf, 0xc7, 0x3c, 0x26, 0xb9, 0x24, 0xcc, 0x1c, 0xb6, 0x53, 0x7a,</div><div class='add'>+	0xda, 0x6c, 0x96, 0xfe, 0xee, 0xa5, 0xbf, 0x6f, 0x14, 0x9f, 0x36, 0xe9,</div><div class='add'>+	0xd3, 0x26, 0x7d, 0xda, 0xd4, 0x22, 0x03, 0x88, 0x85, 0xfa, 0x68, 0xb7,</div><div class='add'>+	0x74, 0x44, 0x7c, 0xbd, 0x07, 0xbb, 0xf9, 0xd9, 0xc3, 0xfb, 0x87, 0xd9,</div><div class='add'>+	0xe7, 0x62, 0x91, 0xac, 0x79, 0x10, 0xed, 0xe6, 0x23, 0xe8, 0x9f, 0xc0,</div><div class='add'>+	0x6f, 0xfc, 0xcd, 0xe5, 0x28, 0x5f, 0x2e, 0x3d, 0xbc, 0x16, 0x3a, 0x8a,</div><div class='add'>+	0x47, 0xd8, 0x47, 0xfd, 0x5a, 0x55, 0xea, 0x9e, 0xee, 0x63, 0x4a, 0x0b,</div><div class='add'>+	0xb5, 0xb3, 0x1f, 0xde, 0x55, 0xd8, 0x49, 0xfb, 0xc6, 0xfa, 0x5f, 0x56,</div><div class='add'>+	0xec, 0xa5, 0x6a, 0xb9, 0x36, 0x63, 0xe9, 0x0e, 0xae, 0x63, 0x0a, 0x1f,</div><div class='add'>+	0x76, 0xbe, 0xfd, 0x7d, 0x88, 0x6e, 0x7f, 0xd2, 0xd0, 0xc7, 0xf5, 0x1d,</div><div class='add'>+	0x3e, 0x86, 0xd9, 0x53, 0xf6, 0x31, 0xc6, 0x76, 0xdb, 0xf1, 0xd5, 0x43,</div><div class='add'>+	0x1a, 0xd7, 0xf3, 0xd8, 0x86, 0x9c, 0xd4, 0x52, 0x0b, 0x8f, 0x1a, 0x16,</div><div class='add'>+	0x9e, 0xe6, 0xe7, 0x22, 0x73, 0xd9, 0xc8, 0x0d, 0xb9, 0xcc, 0xc5, 0xe7,</div><div class='add'>+	0x76, 0xf0, 0xb9, 0x16, 0xa6, 0xce, 0xd9, 0x69, 0x99, 0x0d, 0x1e, 0x94,</div><div class='add'>+	0xd9, 0x20, 0xf2, 0xa6, 0xe8, 0x7e, 0x00, 0x17, 0x72, 0xb1, 0x41, 0xb7,</div><div class='add'>+	0xdb, 0x1a, 0x62, 0x5c, 0x5d, 0xfc, 0x88, 0xbe, 0xfb, 0xda, 0x1a, 0xad,</div><div class='add'>+	0x9b, 0x3a, 0x4c, 0x8c, 0x29, 0x2d, 0xf2, 0x33, 0xcc, 0x6f, 0xf2, 0xa1,</div><div class='add'>+	0x31, 0xba, 0xd2, 0x1d, 0x0f, 0x9d, 0x85, 0x36, 0xdf, 0x47, 0x49, 0x9f,</div><div class='add'>+	0x2c, 0x38, 0xb9, 0x6e, 0x5d, 0x31, 0xd7, 0xb5, 0xe4, 0x2b, 0xd4, 0x1d,</div><div class='add'>+	0x13, 0xac, 0xcf, 0xd3, 0x56, 0x36, 0xc8, 0x7a, 0x55, 0x98, 0x16, 0xda,</div><div class='add'>+	0x43, 0x68, 0x4c, 0x0a, 0x2d, 0xbd, 0x73, 0x4c, 0xe1, 0x1b, 0x95, 0x88,</div><div class='add'>+	0xb3, 0x56, 0xc1, 0x28, 0xd7, 0xb3, 0x16, 0x6b, 0x52, 0xc8, 0x9b, 0x92,</div><div class='add'>+	0xda, 0xd9, 0xc5, 0xbe, 0xa5, 0x87, 0x79, 0x51, 0x30, 0xb5, 0xcc, 0x4b,</div><div class='add'>+	0x9d, 0x7c, 0xb4, 0xb1, 0x20, 0x76, 0x11, 0x9b, 0x88, 0x6d, 0x0e, 0xe2,</div><div class='add'>+	0x1e, 0x53, 0x7a, 0x7f, 0x0b, 0xe3, 0x46, 0x3c, 0xfa, 0x14, 0xc4, 0x4e,</div><div class='add'>+	0x07, 0xa9, 0x0b, 0x2f, 0x76, 0x33, 0x0f, 0xee, 0x6a, 0xa6, 0xae, 0x82,</div><div class='add'>+	0x5e, 0xec, 0xb2, 0x67, 0x09, 0x25, 0xfd, 0x79, 0x69, 0x43, 0xc5, 0x1a,</div><div class='add'>+	0x37, 0xeb, 0x75, 0xf4, 0xe8, 0xcc, 0x26, 0xdd, 0x29, 0xa1, 0x57, 0x9a,</div><div class='add'>+	0x4b, 0x3a, 0xba, 0xdb, 0x94, 0x13, 0xba, 0x16, 0xce, 0x1a, 0x0e, 0x6e,</div><div class='add'>+	0x2d, 0xe9, 0x2c, 0x42, 0xb9, 0x6a, 0xd6, 0x02, 0x2b, 0x6f, 0xc0, 0xae,</div><div class='add'>+	0x15, 0xbc, 0xb6, 0xe5, 0x3a, 0x76, 0xcd, 0x08, 0x3e, 0x26, 0x76, 0xed,</div><div class='add'>+	0xdc, 0x4a, 0xec, 0x5a, 0xaf, 0x4a, 0xb8, 0x55, 0xe6, 0x12, 0x25, 0xec,</div><div class='add'>+	0x5a, 0x5d, 0xcc, 0xd1, 0x07, 0xb1, 0x8b, 0xb8, 0xa6, 0xb6, 0x7e, 0x08,</div><div class='add'>+	0xbe, 0x55, 0xae, 0xcf, 0x5c, 0x18, 0x62, 0xbf, 0x52, 0x06, 0x2c, 0xb6,</div><div class='add'>+	0x70, 0xcb, 0xea, 0xac, 0x55, 0xae, 0xd7, 0x47, 0xcb, 0x5d, 0x32, 0x77,</div><div class='add'>+	0x8e, 0x67, 0x47, 0x98, 0x4b, 0x5c, 0xab, 0xb4, 0x6c, 0x1a, 0xbe, 0x50,</div><div class='add'>+	0x8d, 0xbe, 0xb3, 0xd8, 0x2f, 0x44, 0x7c, 0x9b, 0x89, 0x7b, 0xe2, 0xc9,</div><div class='add'>+	0x4f, 0xad, 0xa9, 0xb0, 0xd0, 0x98, 0x9f, 0xf7, 0x21, 0xfd, 0x90, 0x8f,</div><div class='add'>+	0x75, 0x68, 0x41, 0x1d, 0xc1, 0x6b, 0xf1, 0x88, 0x6f, 0x5b, 0x21, 0xeb,</div><div class='add'>+	0xdf, 0xd2, 0x70, 0x0b, 0xba, 0x4e, 0x49, 0xcd, 0x89, 0x62, 0xeb, 0xa9,</div><div class='add'>+	0x76, 0xd6, 0x19, 0x1d, 0x1d, 0x63, 0x9d, 0xec, 0xe3, 0xba, 0x55, 0xf7,</div><div class='add'>+	0xb4, 0xe8, 0x49, 0xf4, 0xac, 0x85, 0xa2, 0xae, 0x1b, 0xe7, 0xa2, 0xa5,</div><div class='add'>+	0x9e, 0xf8, 0x3d, 0xdb, 0x87, 0x46, 0x8d, 0x10, 0xf5, 0xf3, 0x2b, 0x2f,</div><div class='add'>+	0x82, 0x16, 0xce, 0x18, 0xe2, 0x7b, 0xfc, 0xdb, 0x4c, 0x63, 0x63, 0xf3,</div><div class='add'>+	0xb8, 0xe5, 0xd1, 0x65, 0xbe, 0x1d, 0xb1, 0xed, 0xb6, 0x81, 0xb5, 0xac,</div><div class='add'>+	0x7d, 0xba, 0x87, 0xb6, 0x2a, 0xcd, 0xb2, 0x6f, 0xb4, 0xd9, 0x7a, 0xff,</div><div class='add'>+	0x46, 0xe6, 0x35, 0xf6, 0xe9, 0x3e, 0x1f, 0x73, 0xa5, 0xef, 0x94, 0x85,</div><div class='add'>+	0x69, 0xe3, 0x4d, 0xeb, 0x51, 0xdd, 0x43, 0xbb, 0x7c, 0x95, 0x79, 0x57,</div><div class='add'>+	0x70, 0x49, 0xca, 0x7f, 0xfb, 0xa4, 0xc7, 0x55, 0x95, 0x42, 0x73, 0x19,</div><div class='add'>+	0x7d, 0xee, 0xd5, 0xa4, 0x33, 0x73, 0x3c, 0x96, 0xbf, 0xcd, 0xbf, 0x65,</div><div class='add'>+	0x82, 0xbd, 0x04, 0x7b, 0x5d, 0xa7, 0xbf, 0xfb, 0xaa, 0xff, 0xee, 0x09,</div><div class='add'>+	0xb7, 0xaa, 0x4d, 0xc1, 0xdd, 0xb2, 0xd6, 0xc2, 0xc7, 0xab, 0xe3, 0x83,</div><div class='add'>+	0x11, 0x17, 0x73, 0x24, 0x69, 0x99, 0xf9, 0x66, 0x7f, 0x86, 0x39, 0x79,</div><div class='add'>+	0xdb, 0x04, 0xd2, 0x32, 0x9f, 0x0d, 0xae, 0x1e, 0xee, 0x0d, 0x42, 0x66,</div><div class='add'>+	0x69, 0xf8, 0x06, 0xa3, 0x32, 0x4c, 0x9f, 0x8b, 0xb4, 0xa9, 0xf8, 0x42,</div><div class='add'>+	0x3f, 0xe2, 0x17, 0x3f, 0x76, 0xbf, 0x69, 0x3d, 0x9e, 0x5f, 0xcb, 0xe7,</div><div class='add'>+	0x3b, 0x99, 0x2f, 0xd3, 0xcc, 0x9f, 0xc3, 0x83, 0x5e, 0xc8, 0x3b, 0x5a,</div><div class='add'>+	0xe6, 0x0d, 0x15, 0xa3, 0xaf, 0xe3, 0x9b, 0x7c, 0x3e, 0xd4, 0xc1, 0x5c,</div><div class='add'>+	0x39, 0x6d, 0xc4, 0xd3, 0x1b, 0x90, 0xed, 0xac, 0x86, 0x66, 0x34, 0x28,</div><div class='add'>+	0x99, 0x7d, 0x89, 0x1d, 0x12, 0xf8, 0x39, 0xd7, 0xf4, 0xe8, 0xa2, 0xc7,</div><div class='add'>+	0xf5, 0xe8, 0x9b, 0x66, 0xfd, 0xbf, 0xe6, 0x6f, 0xa2, 0x03, 0xd1, 0xcb,</div><div class='add'>+	0x37, 0xcb, 0x50, 0xb1, 0x88, 0xb2, 0xfd, 0xdc, 0xce, 0x2b, 0x7e, 0x5d,</div><div class='add'>+	0xc7, 0x7f, 0x26, 0x3e, 0xfa, 0x4f, 0x05, 0x99, 0x71, 0x96, 0x30, 0x9f,</div><div class='add'>+	0xdd, 0x47, 0xb5, 0x2e, 0x9b, 0x4a, 0x14, 0x67, 0x9e, 0x3e, 0x7f, 0xe7,</div><div class='add'>+	0xa4, 0x85, 0x93, 0x46, 0x10, 0xd2, 0xe3, 0x97, 0x27, 0xe7, 0x89, 0x00,</div><div class='add'>+	0x9a, 0xd0, 0xc1, 0xeb, 0xed, 0x93, 0x95, 0xaa, 0x7d, 0xc2, 0xc2, 0x5f,</div><div class='add'>+	0x18, 0x5a, 0xb6, 0xcd, 0xcd, 0x98, 0x36, 0xb4, 0xb3, 0xc0, 0x3b, 0xc4,</div><div class='add'>+	0x4a, 0xe2, 0x63, 0x1e, 0x04, 0x74, 0x87, 0x56, 0xd3, 0xd4, 0x6d, 0xc4,</div><div class='add'>+	0x0f, 0x12, 0x63, 0xee, 0x15, 0x15, 0x48, 0xaa, 0x29, 0x8f, 0xe8, 0xad,</div><div class='add'>+	0x13, 0xe9, 0x42, 0xa5, 0xda, 0x4e, 0x5d, 0xde, 0xb1, 0xaa, 0x0c, 0x97,</div><div class='add'>+	0x6c, 0x5d, 0xde, 0x46, 0x5d, 0xe2, 0xf5, 0xa5, 0x70, 0x5f, 0xa8, 0x45,</div><div class='add'>+	0xa7, 0x82, 0xdd, 0x9f, 0x55, 0xb2, 0x4e, 0xa7, 0x89, 0x6f, 0x89, 0x07,</div><div class='add'>+	0x43, 0x3d, 0xf8, 0x2e, 0xf3, 0xcd, 0xa3, 0xf4, 0xd5, 0x5f, 0xe9, 0x4d,</div><div class='add'>+	0xa8, 0xf8, 0x5e, 0x33, 0xed, 0xb8, 0xd6, 0xbf, 0x79, 0x22, 0x83, 0xc7,</div><div class='add'>+	0x66, 0x2d, 0x3c, 0xc5, 0x38, 0x69, 0x48, 0x66, 0x43, 0xe5, 0xec, 0xd7,</div><div class='add'>+	0x58, 0xd3, 0x16, 0x4e, 0xd8, 0x7e, 0xbe, 0xab, 0x75, 0xfd, 0x4c, 0x04,</div><div class='add'>+	0xee, 0xef, 0xca, 0xef, 0x3b, 0x5b, 0xa3, 0x33, 0xf2, 0x9d, 0xe1, 0xb7,</div><div class='add'>+	0x85, 0x01, 0x43, 0x4b, 0x7f, 0xec, 0xae, 0x40, 0x65, 0xdc, 0xb2, 0x06,</div><div class='add'>+	0x92, 0x72, 0xbd, 0xaf, 0x35, 0x61, 0xdf, 0xdf, 0xc3, 0xef, 0xd2, 0x4c,</div><div class='add'>+	0xfa, 0x6f, 0x04, 0x0b, 0x46, 0xd3, 0x94, 0x79, 0x2b, 0xeb, 0x7b, 0x86,</div><div class='add'>+	0xf5, 0xbd, 0x36, 0xa5, 0xa5, 0x77, 0xb8, 0x65, 0xfe, 0x32, 0x7f, 0xa0,</div><div class='add'>+	0x9a, 0xd7, 0x6f, 0x2f, 0xd6, 0xf7, 0xaa, 0x53, 0x32, 0xd3, 0x23, 0x06,</div><div class='add'>+	0x84, 0xb3, 0x17, 0xd2, 0xc5, 0xfa, 0x5e, 0x31, 0xe6, 0xc1, 0x16, 0xd6,</div><div class='add'>+	0x76, 0x2f, 0xb1, 0xf8, 0xc6, 0x7c, 0x2d, 0xfc, 0x27, 0xdc, 0x88, 0x25,</div><div class='add'>+	0x7f, 0x82, 0x03, 0xf4, 0xb1, 0x03, 0x09, 0xb7, 0x8a, 0x2e, 0x71, 0x51,</div><div class='add'>+	0x4f, 0xff, 0x88, 0x7d, 0x21, 0x37, 0xaa, 0xf4, 0x9f, 0xe1, 0x81, 0x2f,</div><div class='add'>+	0xa8, 0xe9, 0x99, 0x09, 0x89, 0xed, 0x5d, 0xad, 0x5b, 0x4e, 0x39, 0x35,</div><div class='add'>+	0x3d, 0x70, 0x6a, 0x78, 0x41, 0x6a, 0x7a, 0xed, 0xea, 0x0c, 0x4e, 0x4f,</div><div class='add'>+	0xe2, 0x3b, 0x4b, 0x09, 0x1e, 0x6b, 0xb9, 0x66, 0x7d, 0x32, 0xce, 0xde,</div><div class='add'>+	0x5a, 0xeb, 0xef, 0x50, 0xf1, 0x23, 0x55, 0xcc, 0x01, 0xa7, 0x59, 0xd3,</div><div class='add'>+	0x7d, 0xa9, 0x78, 0x28, 0xe1, 0x42, 0x97, 0x97, 0xf6, 0x78, 0x9f, 0x7d,</div><div class='add'>+	0xf6, 0x5b, 0xf9, 0x28, 0x69, 0x96, 0xc1, 0xc3, 0x9a, 0xfe, 0xbe, 0x8e,</div><div class='add'>+	0xcf, 0xdc, 0xf4, 0xbd, 0x77, 0xdc, 0x3e, 0x5c, 0xcd, 0x3b, 0x35, 0xbd,</div><div class='add'>+	0xba, 0xc1, 0x1a, 0xba, 0x9c, 0x0c, 0xe0, 0x4a, 0xde, 0xa0, 0x0f, 0x66,</div><div class='add'>+	0x70, 0x98, 0x35, 0xfd, 0xb2, 0x1e, 0xc2, 0x87, 0xf9, 0x16, 0xfa, 0x65,</div><div class='add'>+	0x18, 0xbf, 0x24, 0xfe, 0x5d, 0xc5, 0x9a, 0x7e, 0x27, 0x7d, 0x2a, 0xc9,</div><div class='add'>+	0x9a, 0xde, 0x66, 0xe3, 0x8d, 0x7d, 0xad, 0x67, 0xc6, 0xed, 0x9a, 0xde,</div><div class='add'>+	0xe0, 0x62, 0x3d, 0xf4, 0x22, 0xbe, 0xc0, 0x3c, 0x61, 0xfd, 0x6a, 0x6d,</div><div class='add'>+	0x80, 0xcf, 0x52, 0x6f, 0x85, 0xd5, 0x98, 0xb2, 0x6b, 0xd0, 0x7a, 0xff,</div><div class='add'>+	0x76, 0xae, 0xbd, 0xd8, 0x8e, 0x33, 0x0b, 0x5b, 0x57, 0xbd, 0x86, 0x3f,</div><div class='add'>+	0xaa, 0x71, 0xd1, 0x0f, 0x53, 0xfe, 0x3b, 0x18, 0x6b, 0xc1, 0x54, 0x69,</div><div class='add'>+	0xe6, 0x91, 0xe0, 0x3a, 0xb7, 0xf9, 0xef, 0xa4, 0x6f, 0xdc, 0xb2, 0x8a,</div><div class='add'>+	0x99, 0x24, 0xe4, 0xc4, 0x59, 0x3b, 0xe3, 0x2c, 0xc2, 0x38, 0x5b, 0xca,</div><div class='add'>+	0x38, 0x7b, 0xdc, 0x88, 0x27, 0xd6, 0x13, 0x77, 0xbd, 0x9c, 0x97, 0x58,</div><div class='add'>+	0x6b, 0x26, 0x5d, 0x8d, 0x72, 0x0d, 0xf7, 0x4a, 0xcc, 0x6c, 0x5d, 0x35,</div><div class='add'>+	0x7c, 0xb6, 0x12, 0xa2, 0x2b, 0x7c, 0xb6, 0x98, 0x18, 0x83, 0x99, 0xe9,</div><div class='add'>+	0xe2, 0x82, 0x3b, 0x3e, 0x78, 0xab, 0x3b, 0x3e, 0xf0, 0x9e, 0x7a, 0xd3,</div><div class='add'>+	0x7a, 0x9d, 0x71, 0xb6, 0x8d, 0x71, 0xb6, 0x9d, 0x71, 0xd6, 0x66, 0x5a,</div><div class='add'>+	0x78, 0x2e, 0xa9, 0x65, 0x9a, 0x5c, 0x31, 0xa3, 0xcd, 0x85, 0xa5, 0x95,</div><div class='add'>+	0x2c, 0x0d, 0x7e, 0xc4, 0x3b, 0xff, 0x88, 0xfc, 0x5f, 0x34, 0xe2, 0xdd,</div><div class='add'>+	0x09, 0x25, 0xb1, 0x15, 0xc5, 0x07, 0x94, 0xbb, 0xbc, 0x18, 0x5b, 0x7b,</div><div class='add'>+	0xa7, 0xcf, 0x17, 0x7d, 0xa3, 0x24, 0xbb, 0x1b, 0xcf, 0x1a, 0xcc, 0xa5,</div><div class='add'>+	0x8b, 0xb4, 0x68, 0xd6, 0xd5, 0x83, 0x23, 0xd4, 0xa3, 0x3f, 0xde, 0x83,</div><div class='add'>+	0xa3, 0xac, 0x87, 0xf7, 0xb2, 0x0e, 0xdf, 0x67, 0xc6, 0x5a, 0x36, 0xb3,</div><div class='add'>+	0xff, 0xb9, 0x14, 0xd1, 0xa2, 0x51, 0xd5, 0x83, 0x3e, 0xfa, 0x70, 0x1f,</div><div class='add'>+	0xeb, 0x46, 0x9b, 0xf9, 0x6b, 0xd5, 0x41, 0xac, 0xb0, 0xa7, 0x20, 0xef,</div><div class='add'>+	0x69, 0x89, 0x5e, 0x57, 0x3f, 0x7a, 0x67, 0x25, 0xb7, 0x21, 0x74, 0x53,</div><div class='add'>+	0xaa, 0x07, 0xc7, 0xcd, 0x32, 0xf4, 0x34, 0x77, 0xa9, 0xdb, 0x0b, 0x32,</div><div class='add'>+	0x7f, 0x63, 0x3c, 0x9a, 0x8c, 0x57, 0x9b, 0x5f, 0x85, 0x7c, 0xbc, 0x0b,</div><div class='add'>+	0x39, 0x89, 0x4f, 0x73, 0xbb, 0xba, 0x73, 0x5a, 0x62, 0xbc, 0x47, 0xf5,</div><div class='add'>+	0x48, 0x0c, 0x9b, 0x83, 0xea, 0x2e, 0x89, 0x69, 0x7b, 0x66, 0x2d, 0x71,</div><div class='add'>+	0x2f, 0x7b, 0x1a, 0xb7, 0x11, 0xc7, 0x81, 0x31, 0xe5, 0xfe, 0x5e, 0x84,</div><div class='add'>+	0x71, 0xd7, 0x56, 0xe6, 0xa2, 0x9f, 0xc6, 0x68, 0x3b, 0x17, 0xda, 0x8d,</div><div class='add'>+	0xdf, 0xb1, 0xb2, 0xa1, 0x5e, 0xc6, 0x54, 0x0f, 0x0e, 0x9b, 0x5f, 0xb6,</div><div class='add'>+	0x2e, 0xdb, 0xf8, 0xa4, 0x94, 0xd7, 0xd7, 0xe3, 0x9e, 0x89, 0x25, 0xf0,</div><div class='add'>+	0xe9, 0x52, 0xb7, 0x03, 0x48, 0xd4, 0xf8, 0x50, 0xa1, 0x4b, 0xbd, 0xd9,</div><div class='add'>+	0xd7, 0x3a, 0x77, 0x42, 0x49, 0xff, 0x51, 0x8c, 0xef, 0xf5, 0xb8, 0x9f,</div><div class='add'>+	0x79, 0x60, 0x77, 0xf2, 0x1e, 0xdc, 0x17, 0xaa, 0x40, 0x90, 0x7a, 0xda,</div><div class='add'>+	0x1f, 0x0a, 0x30, 0xbf, 0xfe, 0x7e, 0x91, 0xce, 0xb3, 0x65, 0xc5, 0xbe,</div><div class='add'>+	0xfa, 0x1a, 0xb6, 0xaa, 0x65, 0x8c, 0xad, 0x9b, 0x94, 0x39, 0x51, 0xa6,</div><div class='add'>+	0x35, 0x32, 0xa9, 0x23, 0xc8, 0x7e, 0x76, 0x7d, 0x52, 0x1b, 0x5c, 0xef,</div><div class='add'>+	0x8e, 0x49, 0xaf, 0x92, 0x0b, 0x12, 0xd7, 0xe5, 0xe3, 0xf1, 0xee, 0x26,</div><div class='add'>+	0xd1, 0xb1, 0x1e, 0xc1, 0x26, 0xea, 0x69, 0x4b, 0x3e, 0xcc, 0x18, 0x5a,</div><div class='add'>+	0x28, 0x13, 0x8c, 0x94, 0xce, 0x5f, 0xa7, 0x15, 0x21, 0xad, 0xc8, 0xa4,</div><div class='add'>+	0xe0, 0xb5, 0x0c, 0xf1, 0x9a, 0xce, 0x38, 0xb4, 0xac, 0x75, 0xc4, 0x69,</div><div class='add'>+	0x81, 0x53, 0x32, 0x6f, 0x8a, 0x1d, 0x21, 0xb6, 0x6d, 0x22, 0xee, 0xed,</div><div class='add'>+	0xa1, 0x57, 0x5b, 0xb7, 0xd4, 0xc7, 0x8d, 0x36, 0x85, 0x47, 0x66, 0x9a,</div><div class='add'>+	0xe1, 0x73, 0x93, 0xe6, 0x3b, 0xf9, 0x10, 0x2e, 0xe7, 0x23, 0x78, 0x9b,</div><div class='add'>+	0xb4, 0x2f, 0xd9, 0xb4, 0xeb, 0xf0, 0x8b, 0x62, 0xde, 0x4a, 0x32, 0x6f,</div><div class='add'>+	0x6d, 0x98, 0x50, 0xf4, 0xd7, 0x28, 0x86, 0x8c, 0xbf, 0xfe, 0xec, 0xd2,</div><div class='add'>+	0xcd, 0x3e, 0xea, 0x4d, 0x64, 0xf1, 0xf0, 0x7b, 0x14, 0xfb, 0xed, 0x3c,</div><div class='add'>+	0xfd, 0xda, 0x67, 0x53, 0x35, 0xb4, 0x15, 0x75, 0x5f, 0x5d, 0x7c, 0x6f,</div><div class='add'>+	0xe5, 0x54, 0xa1, 0x28, 0xaf, 0x0e, 0xd7, 0xa9, 0x04, 0xca, 0x4e, 0x5d,</div><div class='add'>+	0xe3, 0x55, 0x97, 0xf8, 0x60, 0x65, 0x7d, 0xe4, 0xfb, 0x5c, 0xff, 0x21,</div><div class='add'>+	0x62, 0x3e, 0x8b, 0xeb, 0x5f, 0xb5, 0xd7, 0x0d, 0x73, 0x5d, 0x75, 0x0d,</div><div class='add'>+	0x1f, 0x46, 0xae, 0xbd, 0x13, 0xa2, 0xec, 0x78, 0x38, 0x42, 0xdd, 0x5d,</div><div class='add'>+	0x59, 0x23, 0xcf, 0x05, 0x70, 0x7b, 0x7e, 0x55, 0xb9, 0xe4, 0x71, 0x3f,</div><div class='add'>+	0xfb, 0x01, 0xc7, 0x97, 0x88, 0xf7, 0xcc, 0xe7, 0x79, 0x4f, 0xf0, 0xd7,</div><div class='add'>+	0x7a, 0x62, 0x8d, 0xcf, 0xeb, 0x3d, 0x4c, 0x5b, 0x94, 0xd1, 0x78, 0x72,</div><div class='add'>+	0xef, 0x8b, 0xea, 0xe8, 0x9f, 0x61, 0x90, 0xbd, 0xd0, 0x43, 0x13, 0x59,</div><div class='add'>+	0xec, 0x9f, 0xf8, 0x63, 0x7b, 0x8f, 0x6e, 0xe5, 0x6a, 0xec, 0xe1, 0x9a,</div><div class='add'>+	0xfb, 0xaa, 0x19, 0x47, 0xff, 0x2d, 0x19, 0x17, 0x8c, 0xb4, 0xbd, 0x12,</div><div class='add'>+	0x52, 0x6b, 0xe3, 0x2d, 0xb7, 0x2a, 0x0b, 0x65, 0x49, 0x0c, 0xb4, 0x37,</div><div class='add'>+	0xc7, 0x13, 0x97, 0xf1, 0x88, 0x25, 0xf3, 0x6e, 0x77, 0xb1, 0xee, 0x12,</div><div class='add'>+	0x97, 0xaa, 0x76, 0xd6, 0xde, 0xb6, 0x22, 0x56, 0xda, 0x50, 0x78, 0xf3,</div><div class='add'>+	0x73, 0x33, 0x05, 0xe9, 0xc7, 0xa5, 0xde, 0xf8, 0x55, 0x1b, 0xd7, 0x39,</div><div class='add'>+	0xcc, 0x9c, 0xfd, 0xac, 0xf1, 0x62, 0x84, 0xd5, 0x18, 0x9e, 0x55, 0x0a,</div><div class='add'>+	0x07, 0x0c, 0x2f, 0xb2, 0x61, 0x0b, 0xdb, 0xf9, 0xbd, 0x97, 0xf8, 0xe9,</div><div class='add'>+	0x5d, 0xa3, 0x0a, 0x53, 0xa1, 0x10, 0x31, 0x23, 0x73, 0xb0, 0xeb, 0xff,</div><div class='add'>+	0x78, 0x65, 0x5f, 0x27, 0xea, 0x92, 0x3d, 0xf8, 0x7f, 0x6d, 0x5f, 0x66,</div><div class='add'>+	0x15, 0xf1, 0x8b, 0xc8, 0xee, 0x57, 0xcc, 0xa1, 0x09, 0x10, 0xd3, 0xec,</div><div class='add'>+	0x32, 0xe6, 0xa3, 0x2e, 0xa4, 0xaf, 0xba, 0xa0, 0x9d, 0x7e, 0x87, 0x7d,</div><div class='add'>+	0xde, 0x43, 0xf5, 0xda, 0xe9, 0x56, 0xb7, 0x8e, 0xc1, 0xe3, 0x3e, 0x3c,</div><div class='add'>+	0x78, 0xbc, 0x03, 0xd5, 0xf6, 0x7c, 0x68, 0x94, 0x3a, 0x75, 0xb1, 0xbf,</div><div class='add'>+	0x1a, 0xfe, 0xd4, 0xc3, 0x3e, 0xeb, 0xea, 0xea, 0x87, 0xd1, 0x62, 0x5f,</div><div class='add'>+	0x1f, 0xc1, 0x9e, 0x09, 0xbf, 0xda, 0x32, 0xe1, 0x41, 0xc7, 0x9d, 0x0f,</div><div class='add'>+	0xc3, 0xbb, 0xaa, 0x97, 0x7c, 0xc9, 0x75, 0xf9, 0xfd, 0x2e, 0xf6, 0x67,</div><div class='add'>+	0xc2, 0x5f, 0x19, 0xa2, 0x4b, 0xc8, 0xdb, 0x2a, 0x1d, 0x43, 0xc7, 0x3d,</div><div class='add'>+	0x6a, 0x87, 0xf9, 0x37, 0xd6, 0x55, 0x7b, 0xcf, 0x47, 0xae, 0x55, 0xc8,</div><div class='add'>+	0x59, 0x00, 0x3e, 0x23, 0x39, 0xa7, 0x0f, 0x13, 0x8c, 0xed, 0xbb, 0xec,</div><div class='add'>+	0xf7, 0x8f, 0x97, 0x39, 0x32, 0xa5, 0xd9, 0xb7, 0xb6, 0xd3, 0x7e, 0xf2,</div><div class='add'>+	0x4c, 0x6b, 0xf1, 0xda, 0x7a, 0x9f, 0x73, 0xde, 0x40, 0x7c, 0xa1, 0x0f,</div><div class='add'>+	0xcb, 0x68, 0x84, 0xfa, 0xb8, 0x5d, 0xa7, 0x50, 0x9f, 0x67, 0x42, 0x5d,</div><div class='add'>+	0xe2, 0xf0, 0xfb, 0x80, 0x39, 0xcf, 0x9e, 0x53, 0x67, 0xde, 0xa4, 0xee,</div><div class='add'>+	0x16, 0xcb, 0xfb, 0x55, 0xbe, 0xdf, 0x7e, 0x5f, 0xf2, 0x2d, 0xb1, 0x66,</div><div class='add'>+	0x50, 0x30, 0xe7, 0x17, 0xdd, 0xff, 0x5d, 0xc8, 0x3d, 0x8f, 0xfe, 0xa7,</div><div class='add'>+	0x8c, 0xe3, 0x78, 0x77, 0xa5, 0x4b, 0xfc, 0xe7, 0x4f, 0x71, 0xdf, 0xf4,</div><div class='add'>+	0x30, 0xef, 0x0b, 0xfd, 0x83, 0xec, 0x25, 0x3c, 0xaa, 0x93, 0xf9, 0x67,</div><div class='add'>+	0xef, 0x71, 0xd7, 0xed, 0x65, 0xf8, 0x4b, 0xab, 0x7c, 0xf1, 0x10, 0xea,</div><div class='add'>+	0x93, 0x23, 0x7c, 0x5e, 0xa1, 0x9d, 0xb8, 0xf1, 0x31, 0x63, 0x03, 0x3a,</div><div class='add'>+	0x6a, 0x24, 0x07, 0x3c, 0x6b, 0xf5, 0xf5, 0x88, 0x0e, 0x15, 0x36, 0xf2,</div><div class='add'>+	0xfa, 0x73, 0xb4, 0xef, 0x93, 0x86, 0x07, 0xf5, 0x8b, 0x64, 0xd6, 0xa7,</div><div class='add'>+	0x8d, 0xa7, 0xf1, 0x75, 0x9f, 0xb3, 0xf7, 0x95, 0xb5, 0xaa, 0x75, 0x7d,</div><div class='add'>+	0xe0, 0x0e, 0x57, 0xfd, 0xf8, 0x1b, 0xf4, 0xa7, 0xb6, 0x55, 0x37, 0xde,</div><div class='add'>+	0x2b, 0xe9, 0xc4, 0x40, 0x64, 0xd5, 0x33, 0x16, 0x6e, 0x1a, 0x46, 0x68,</div><div class='add'>+	0xd5, 0x8d, 0xf6, 0x2f, 0xf1, 0x7d, 0x90, 0x31, 0x88, 0x6c, 0x75, 0x4a,</div><div class='add'>+	0xe6, 0x3f, 0x71, 0xd2, 0x39, 0x88, 0x3f, 0x2c, 0x8c, 0xe0, 0xc0, 0x44,</div><div class='add'>+	0x11, 0x5b, 0xd3, 0xb7, 0xf5, 0x55, 0xd7, 0x65, 0x7b, 0x60, 0x22, 0xde,</div><div class='add'>+	0x5b, 0x55, 0x94, 0x6d, 0x1f, 0xfb, 0x8c, 0x4a, 0xe6, 0xd8, 0xfb, 0xa9,</div><div class='add'>+	0xd3, 0x01, 0x5b, 0xa7, 0x3d, 0x30, 0xf2, 0xd7, 0xe9, 0xf6, 0x93, 0xae,</div><div class='add'>+	0x3f, 0x25, 0x7a, 0x93, 0xfd, 0xb6, 0x83, 0xd8, 0x4b, 0xba, 0xbb, 0x6f,</div><div class='add'>+	0xa0, 0xdb, 0x67, 0x5c, 0xa7, 0xbb, 0x6b, 0x22, 0x7e, 0xda, 0x55, 0xa4,</div><div class='add'>+	0xfb, 0xed, 0xe9, 0x12, 0x8d, 0x2c, 0xb6, 0xad, 0xca, 0x22, 0xbf, 0x6e,</div><div class='add'>+	0x9f, 0xb5, 0xcf, 0xd6, 0xc7, 0x59, 0xfb, 0xfa, 0xc6, 0x7a, 0x89, 0x07,</div><div class='add'>+	0xfe, 0x9a, 0xd2, 0xed, 0xbd, 0x7d, 0x07, 0x7b, 0xdd, 0x18, 0x1f, 0xda,</div><div class='add'>+	0x9b, 0x5b, 0xdc, 0x69, 0xc6, 0x76, 0xd8, 0xb7, 0xf9, 0x73, 0x33, 0x8d,</div><div class='add'>+	0x0e, 0xf6, 0x61, 0x9b, 0xcc, 0x2e, 0x7f, 0xa7, 0xe9, 0x23, 0xee, 0xaa,</div><div class='add'>+	0x54, 0x1b, 0x27, 0x64, 0xb6, 0x21, 0xb1, 0x5c, 0xc4, 0xc2, 0x05, 0xe9,</div><div class='add'>+	0xf7, 0x76, 0xb2, 0x4f, 0x58, 0x46, 0xfb, 0xf6, 0xe2, 0x48, 0xa1, 0x57,</div><div class='add'>+	0xa5, 0xc3, 0x5c, 0xc7, 0x94, 0xba, 0x02, 0xd6, 0xbc, 0x6e, 0x54, 0xd2,</div><div class='add'>+	0x97, 0xc2, 0xa9, 0x81, 0xd4, 0xc9, 0x7a, 0x0b, 0xc4, 0x28, 0xbe, 0x45,</div><div class='add'>+	0xa9, 0x6c, 0x6a, 0x7b, 0xbd, 0x1b, 0xc7, 0x6c, 0xfc, 0xa5, 0x4d, 0xf1,</div><div class='add'>+	0x33, 0x2e, 0x31, 0x73, 0xc7, 0x84, 0xd4, 0x31, 0x42, 0x48, 0x7d, 0x08,</div><div class='add'>+	0xff, 0x90, 0x9c, 0x1f, 0xa8, 0x41, 0xfa, 0xde, 0x1a, 0x48, 0x5f, 0x71,</div><div class='add'>+	0x04, 0x3f, 0xd2, 0x23, 0xbe, 0x4c, 0xc1, 0xa3, 0xb6, 0x98, 0x33, 0xfe,</div><div class='add'>+	0xad, 0x66, 0x10, 0x01, 0xf6, 0x65, 0x5d, 0xee, 0x18, 0xfb, 0x0c, 0xd1,</div><div class='add'>+	0x63, 0x67, 0xeb, 0xb2, 0x7c, 0xc6, 0xdf, 0x6e, 0x3a, 0xb9, 0xf0, 0x96,</div><div class='add'>+	0x29, 0x9f, 0xbf, 0x63, 0x32, 0x16, 0x39, 0x62, 0x63, 0xb1, 0xae, 0xd6,</div><div class='add'>+	0x58, 0xde, 0xb2, 0x5e, 0x31, 0xe6, 0xaf, 0x96, 0x3b, 0x3d, 0x48, 0x6b,</div><div class='add'>+	0x22, 0xdf, 0x84, 0xbb, 0x89, 0x9f, 0xda, 0x26, 0x9b, 0x60, 0x4c, 0x02,</div><div class='add'>+	0x27, 0x8e, 0x47, 0xb0, 0x72, 0x42, 0x3b, 0x3d, 0xe8, 0xce, 0x60, 0x7c,</div><div class='add'>+	0xb6, 0x13, 0x13, 0x05, 0xff, 0x42, 0xd4, 0x45, 0x5c, 0x9d, 0x74, 0xe1,</div><div class='add'>+	0x76, 0x63, 0xb5, 0x9a, 0xb7, 0x63, 0x5a, 0xe1, 0x2e, 0x63, 0xbb, 0xea,</div><div class='add'>+	0xb5, 0x31, 0xc5, 0x0c, 0xb1, 0x88, 0xc2, 0x4d, 0xce, 0x5c, 0xbe, 0x35,</div><div class='add'>+	0x49, 0xcc, 0x7d, 0xfb, 0x84, 0xd4, 0x77, 0x0b, 0xaf, 0x26, 0xa9, 0x97,</div><div class='add'>+	0x64, 0x36, 0xe3, 0x65, 0x0f, 0xb4, 0x4f, 0x69, 0xdd, 0x86, 0x72, 0x30,</div><div class='add'>+	0xde, 0xad, 0x33, 0x0e, 0x2e, 0x5c, 0x36, 0xd3, 0xec, 0x97, 0x1c, 0xd4,</div><div class='add'>+	0x6e, 0x68, 0x11, 0x8f, 0x2b, 0x84, 0x01, 0x9b, 0x46, 0x6f, 0xab, 0x31,</div><div class='add'>+	0x53, 0x86, 0xa5, 0x7a, 0x0f, 0x4e, 0xdb, 0x32, 0xf4, 0xb7, 0xae, 0x27,</div><div class='add'>+	0xbe, 0x7e, 0xdc, 0xcc, 0xb0, 0x07, 0x96, 0xfd, 0xd0, 0x58, 0xa2, 0xc5,</div><div class='add'>+	0xdd, 0x46, 0x0c, 0x1b, 0x8b, 0x2e, 0xa8, 0xb4, 0xca, 0x7a, 0x1a, 0xd3,</div><div class='add'>+	0x33, 0x60, 0x45, 0xa9, 0x71, 0xea, 0x9b, 0xc8, 0x18, 0x27, 0xce, 0x6a,</div><div class='add'>+	0x3b, 0xee, 0x5f, 0x48, 0xc3, 0x99, 0xdf, 0x6c, 0x32, 0xfe, 0x37, 0x2e,</div><div class='add'>+	0x85, 0xb5, 0x23, 0x69, 0xf2, 0xdd, 0xc1, 0xbc, 0x3b, 0xdf, 0xe3, 0xe1,</div><div class='add'>+	0x7d, 0x99, 0xdb, 0x75, 0xb7, 0x8e, 0xe6, 0x30, 0xef, 0x4e, 0x49, 0x5f,</div><div class='add'>+	0x85, 0x60, 0x77, 0x01, 0x32, 0x43, 0x62, 0x6f, 0xf1, 0xa9, 0x55, 0xda,</div><div class='add'>+	0x3b, 0xea, 0x9a, 0x74, 0xf6, 0xc5, 0x72, 0xb3, 0x9e, 0xe0, 0x56, 0xb3,</div><div class='add'>+	0x19, 0xc7, 0x0a, 0x9e, 0x1b, 0x68, 0xc7, 0x8f, 0xdc, 0xe2, 0x72, 0x21,</div><div class='add'>+	0xbe, 0xea, 0x2e, 0x55, 0xdc, 0x5b, 0x62, 0x9e, 0xc8, 0xd8, 0x35, 0xb1,</div><div class='add'>+	0x8c, 0x72, 0x5e, 0x38, 0x29, 0x6b, 0x7c, 0xab, 0x75, 0xf4, 0xa4, 0xd4,</div><div class='add'>+	0xc8, 0xee, 0xd6, 0x88, 0xa9, 0x75, 0x4b, 0x1f, 0x58, 0x4d, 0x3d, 0x7d,</div><div class='add'>+	0x34, 0x26, 0x35, 0x78, 0x3f, 0x6b, 0xb0, 0xb6, 0xd0, 0xae, 0xa4, 0x8e,</div><div class='add'>+	0x69, 0x09, 0xbf, 0xdb, 0x85, 0x2b, 0x0d, 0x5a, 0xe6, 0x79, 0x68, 0xbd,</div><div class='add'>+	0xce, 0xbc, 0x70, 0x67, 0x6b, 0x63, 0x11, 0x0f, 0xdf, 0x3a, 0xd3, 0x27,</div><div class='add'>+	0xe7, 0x49, 0x6c, 0x1d, 0x37, 0xe5, 0x05, 0x1b, 0x5b, 0xd6, 0x4b, 0xc9,</div><div class='add'>+	0x2e, 0xe2, 0x06, 0xc1, 0xc6, 0x72, 0xfd, 0x81, 0xd6, 0x86, 0x29, 0x1f,</div><div class='add'>+	0x79, 0x53, 0x78, 0x8f, 0x75, 0xe9, 0x48, 0xa1, 0xc4, 0xa3, 0x83, 0x9b,</div><div class='add'>+	0x37, 0x13, 0x37, 0xbb, 0x53, 0x5a, 0xcb, 0x06, 0xe2, 0x66, 0x9d, 0x3d,</div><div class='add'>+	0x84, 0x07, 0x3d, 0x78, 0xcc, 0x74, 0xfa, 0x08, 0xc1, 0xce, 0xd6, 0x49,</div><div class='add'>+	0x2d, 0x2d, 0xb8, 0xf9, 0xea, 0x6a, 0x60, 0x07, 0x71, 0xf3, 0x42, 0xce,</div><div class='add'>+	0x83, 0x0c, 0x71, 0xf3, 0x47, 0x39, 0x1f, 0xee, 0x20, 0x6e, 0xbe, 0x42,</div><div class='add'>+	0x8c, 0x75, 0x3e, 0xf9, 0x4b, 0x7c, 0xbb, 0x38, 0x13, 0xdb, 0x95, 0xf0,</div><div class='add'>+	0xd1, 0xb7, 0x05, 0x3b, 0xff, 0xa6, 0x88, 0x9d, 0xff, 0xcb, 0x3f, 0xc3,</div><div class='add'>+	0xce, 0x77, 0x13, 0x13, 0x76, 0x4d, 0xc8, 0xfe, 0xd1, 0xae, 0xd6, 0xd7,</div><div class='add'>+	0x4f, 0xc9, 0x99, 0x95, 0x5b, 0xf1, 0xee, 0xc9, 0xe1, 0x7e, 0x62, 0x65,</div><div class='add'>+	0x8c, 0x24, 0x33, 0xc8, 0x4d, 0x62, 0x09, 0x71, 0xc1, 0x4b, 0x6e, 0xae,</div><div class='add'>+	0xbb, 0x32, 0xa9, 0x19, 0x6f, 0xa8, 0x78, 0x67, 0x06, 0x71, 0xf6, 0xca,</div><div class='add'>+	0xda, 0x02, 0x4d, 0x98, 0xf6, 0xa4, 0x88, 0x8d, 0x59, 0x03, 0x97, 0x12,</div><div class='add'>+	0x3b, 0x57, 0xcd, 0x01, 0xb5, 0x73, 0x0e, 0x76, 0x96, 0x79, 0x58, 0x55,</div><div class='add'>+	0x1c, 0x7f, 0x46, 0xec, 0xcc, 0xfe, 0x96, 0xa1, 0x36, 0xd7, 0xc4, 0x18,</div><div class='add'>+	0x55, 0x38, 0x1c, 0x0f, 0xa0, 0xeb, 0x38, 0x71, 0x8f, 0x3d, 0x0f, 0xb3,</div><div class='add'>+	0x86, 0x7e, 0x6a, 0x64, 0x70, 0x74, 0xd6, 0x99, 0x87, 0x6d, 0x22, 0x7e,</div><div class='add'>+	0xf3, 0xc4, 0xc3, 0x28, 0x9f, 0xf3, 0xe0, 0x19, 0xe2, 0xe7, 0x8d, 0xb4,</div><div class='add'>+	0xf3, 0x19, 0xe2, 0xe7, 0xbb, 0x6f, 0x98, 0x89, 0x4d, 0xcd, 0xe1, 0x15,</div><div class='add'>+	0x62, 0xf9, 0xba, 0x5a, 0xc4, 0x65, 0xde, 0x61, 0x5d, 0x59, 0x13, 0xc0,</div><div class='add'>+	0x39, 0x1b, 0x3f, 0xfb, 0x17, 0xb2, 0xca, 0x91, 0xad, 0x8c, 0xb6, 0x10,</div><div class='add'>+	0xbb, 0xba, 0x68, 0xd7, 0xb6, 0x93, 0x5a, 0xe7, 0x8b, 0xd4, 0x45, 0x63,</div><div class='add'>+	0xfc, 0xbc, 0x6d, 0x8f, 0xbe, 0xa4, 0xcc, 0x4e, 0x3a, 0x5b, 0xe5, 0x5c,</div><div class='add'>+	0x55, 0x05, 0xed, 0xbd, 0x65, 0x2c, 0x96, 0xfe, 0x00, 0x4e, 0x4c, 0x26,</div><div class='add'>+	0xf2, 0x65, 0xc5, 0x7a, 0x28, 0xf7, 0xfa, 0x79, 0x2f, 0x8d, 0xce, 0x35,</div><div class='add'>+	0x8e, 0x7f, 0x27, 0xf2, 0xc7, 0x88, 0x5d, 0x65, 0xcf, 0x34, 0x14, 0xdc,</div><div class='add'>+	0x64, 0x76, 0x62, 0xdc, 0x8c, 0xa2, 0xfc, 0x5c, 0x71, 0xef, 0xf5, 0x9c,</div><div class='add'>+	0x9c, 0xc5, 0xdb, 0xd9, 0x1a, 0xfa, 0x5e, 0x09, 0x13, 0xa6, 0x89, 0xef,</div><div class='add'>+	0xc2, 0xbe, 0xdb, 0x0b, 0x82, 0x17, 0xbb, 0x71, 0xd4, 0xd4, 0x22, 0x3f,</div><div class='add'>+	0x67, 0x4c, 0xdc, 0x2b, 0xfb, 0xee, 0x37, 0xcc, 0x9e, 0x1e, 0xe4, 0x3d,</div><div class='add'>+	0xf3, 0x73, 0xb3, 0xa7, 0xc1, 0x09, 0xfc, 0xc6, 0xdd, 0x5c, 0x0e, 0xd7,</div><div class='add'>+	0x4a, 0x2f, 0x31, 0xbd, 0x16, 0x19, 0xc1, 0x23, 0xc4, 0x1c, 0xbf, 0x56,</div><div class='add'>+	0x01, 0xdd, 0xd3, 0xdf, 0xe4, 0xd6, 0x22, 0x33, 0x2a, 0xc0, 0x77, 0x77,</div><div class='add'>+	0x32, 0xbf, 0xed, 0xa4, 0x6f, 0xc4, 0x16, 0x2a, 0x94, 0x1b, 0x97, 0xbe,</div><div class='add'>+	0x6c, 0xe3, 0x51, 0x7f, 0x37, 0xaf, 0x8d, 0x17, 0x4a, 0xb8, 0xa6, 0x47,</div><div class='add'>+	0x78, 0xc5, 0xa6, 0xe3, 0x4e, 0x0e, 0xd1, 0xf3, 0xfe, 0x85, 0x4b, 0x70,</div><div class='add'>+	0x64, 0xab, 0xa4, 0xac, 0xf7, 0x8f, 0x85, 0xac, 0xde, 0xc5, 0x12, 0xc3,</div><div class='add'>+	0x3a, 0xb6, 0x99, 0xe2, 0x5f, 0x7d, 0xe4, 0xb3, 0x07, 0x87, 0xcc, 0xa5,</div><div class='add'>+	0xec, 0xdd, 0x64, 0x0e, 0xda, 0x44, 0x6c, 0xdd, 0xcd, 0x1a, 0x6c, 0x59,</div><div class='add'>+	0x83, 0x46, 0xd6, 0x6a, 0x5a, 0xab, 0x1b, 0x79, 0x35, 0x5f, 0x13, 0x21,</div><div class='add'>+	0xbe, 0x59, 0xc5, 0xda, 0xdd, 0x56, 0x68, 0xc2, 0x1b, 0x67, 0x74, 0xfa,</div><div class='add'>+	0x66, 0x3b, 0xf1, 0x7b, 0x37, 0xee, 0xa1, 0x3c, 0xdf, 0x2e, 0x7c, 0x07,</div><div class='add'>+	0xe9, 0x6f, 0x78, 0x70, 0xe4, 0x78, 0x1a, 0xeb, 0x57, 0x0d, 0xe1, 0xd2,</div><div class='add'>+	0x37, 0x7d, 0xcc, 0x55, 0x01, 0x3c, 0x7e, 0x5c, 0xf2, 0x6b, 0x09, 0x6f,</div><div class='add'>+	0xdf, 0x88, 0x45, 0x7c, 0x88, 0xda, 0x38, 0xe4, 0x8b, 0xef, 0x39, 0x18,</div><div class='add'>+	0xc5, 0xcf, 0xfe, 0xb7, 0xf4, 0x3e, 0xf3, 0xd0, 0xaa, 0x7f, 0x86, 0x67,</div><div class='add'>+	0x88, 0x5b, 0x88, 0x05, 0x2a, 0x12, 0xf6, 0xb9, 0xb7, 0x12, 0xde, 0xf5,</div><div class='add'>+	0xd0, 0x07, 0x24, 0xa6, 0x97, 0x32, 0xd6, 0x2d, 0x62, 0xe7, 0x85, 0xe2,</div><div class='add'>+	0x5c, 0xf2, 0xed, 0x93, 0xda, 0xc5, 0x43, 0x88, 0x11, 0x43, 0xa3, 0x4f,</div><div class='add'>+	0xb0, 0x9b, 0x9b, 0x78, 0xf7, 0x4a, 0x3c, 0x6e, 0x9c, 0x23, 0xde, 0x1d,</div><div class='add'>+	0xa6, 0xad, 0x3d, 0xba, 0xf8, 0x66, 0x08, 0x65, 0x73, 0x11, 0xfa, 0xa4,</div><div class='add'>+	0xcc, 0x25, 0x5f, 0xf1, 0x3b, 0x73, 0x49, 0x99, 0x85, 0xcb, 0xb9, 0x10,</div><div class='add'>+	0x74, 0x94, 0xb1, 0x77, 0x2b, 0x57, 0x59, 0xe6, 0xe4, 0x29, 0xff, 0x0e,</div><div class='add'>+	0xe6, 0xf7, 0x8c, 0x19, 0x0e, 0xee, 0x28, 0x84, 0xf8, 0xa9, 0x0b, 0x66,</div><div class='add'>+	0x0a, 0xbf, 0xc7, 0xe7, 0x23, 0xfc, 0x8e, 0x62, 0x22, 0x5f, 0x5b, 0x21,</div><div class='add'>+	0xcd, 0xc0, 0x44, 0xde, 0xc9, 0x79, 0xd1, 0xfc, 0x5e, 0xbf, 0x60, 0xcd,</div><div class='add'>+	0xb6, 0xe3, 0xce, 0xdf, 0xfa, 0x0d, 0x7f, 0x7f, 0x1e, 0xf3, 0x7b, 0xc9,</div><div class='add'>+	0xf7, 0x99, 0x93, 0x3a, 0x3e, 0x3a, 0x69, 0x63, 0xfe, 0x79, 0x62, 0xfe,</div><div class='add'>+	0x01, 0xaf, 0x5b, 0xb0, 0xe6, 0xaf, 0xac, 0xf3, 0xf1, 0x78, 0xef, 0x34,</div><div class='add'>+	0xfd, 0xa0, 0x8b, 0x74, 0x5d, 0x7a, 0xd8, 0xe6, 0xd7, 0xe1, 0xd3, 0x99,</div><div class='add'>+	0xe5, 0x5e, 0x3e, 0x99, 0xc0, 0x3b, 0xd7, 0x67, 0xa7, 0x9f, 0x94, 0xd9,</div><div class='add'>+	0x33, 0x60, 0x3c, 0xf2, 0xee, 0x5a, 0xf8, 0x5a, 0xd8, 0x6f, 0x7a, 0xf9,</div><div class='add'>+	0x7c, 0xc4, 0x7e, 0x5e, 0x66, 0xb9, 0x9f, 0x7c, 0x56, 0xc2, 0xd3, 0x1f,</div><div class='add'>+	0x5d, 0x7f, 0xe7, 0x20, 0x3b, 0x35, 0xdf, 0x79, 0xc6, 0x96, 0xdb, 0x7e,</div><div class='add'>+	0x4e, 0xe6, 0xad, 0xfe, 0x05, 0xd8, 0xf1, 0xf5, 0xfb, 0x94, 0x49, 0xec,</div><div class='add'>+	0x7b, 0xc0, 0x72, 0xfc, 0x36, 0x1c, 0xdc, 0xc6, 0x78, 0xf8, 0x2e, 0xed,</div><div class='add'>+	0xb3, 0xed, 0x5c, 0x5d, 0xf0, 0x2e, 0xb3, 0xd3, 0x96, 0xf9, 0xae, 0x73,</div><div class='add'>+	0x52, 0x93, 0xe4, 0xfe, 0x1f, 0x54, 0x08, 0x1e, 0x7f, 0x9c, 0x35, 0x6b,</div><div class='add'>+	0xd8, 0x94, 0xd9, 0x3e, 0x94, 0x27, 0x75, 0x08, 0x9b, 0xc6, 0xa3, 0x78,</div><div class='add'>+	0xdb, 0xf0, 0x17, 0xcf, 0xb0, 0x48, 0x4c, 0x0e, 0x30, 0x26, 0xc3, 0x18,</div><div class='add'>+	0x31, 0x63, 0xd1, 0xb7, 0x89, 0x4f, 0xb3, 0x64, 0xf8, 0xe8, 0x84, 0x1b,</div><div class='add'>+	0x6f, 0x13, 0x33, 0x42, 0x39, 0x67, 0x40, 0x9d, 0x77, 0x4b, 0xbf, 0x57,</div><div class='add'>+	0x22, 0x5a, 0x13, 0x6b, 0xd9, 0x8b, 0x3a, 0xe4, 0x98, 0xf3, 0xfd, 0xfa,</div><div class='add'>+	0x8f, 0x71, 0xec, 0x84, 0x0b, 0xf7, 0xb1, 0xef, 0x4b, 0xdf, 0x69, 0xf0,</div><div class='add'>+	0xef, 0xc6, 0xfe, 0xf7, 0xf1, 0x0f, 0xd6, 0x94, 0x9c, 0xb3, 0x52, 0x72,</div><div class='add'>+	0x96, 0xe3, 0x13, 0xab, 0x56, 0xd7, 0xe7, 0x9f, 0x87, 0x3e, 0x78, 0x15,</div><div class='add'>+	0x8d, 0x03, 0x0b, 0xf8, 0xc0, 0x9a, 0xe7, 0xbd, 0xf7, 0x18, 0x3f, 0x2f,</div><div class='add'>+	0x1a, 0xb1, 0x88, 0x8b, 0xc2, 0xcc, 0x87, 0xdd, 0xb8, 0xd7, 0x90, 0x7d,</div><div class='add'>+	0x26, 0x6d, 0xe0, 0x69, 0x68, 0xfd, 0x17, 0x94, 0x9c, 0xcd, 0xb9, 0x64,</div><div class='add'>+	0x65, 0x6b, 0x64, 0x5d, 0x85, 0x95, 0xcb, 0x1b, 0x3b, 0xcb, 0xa0, 0xb5,</div><div class='add'>+	0x78, 0x95, 0x6e, 0xbc, 0xaf, 0xfe, 0xa7, 0x35, 0x1f, 0xfe, 0xc4, 0x7a,</div><div class='add'>+	0x47, 0x2f, 0xd1, 0xd5, 0xa2, 0x3e, 0x77, 0x89, 0xb7, 0x3a, 0x1c, 0x33,</div><div class='add'>+	0x65, 0x7f, 0xee, 0xc7, 0xb8, 0xef, 0x84, 0x07, 0xed, 0xc9, 0x5f, 0x5a,</div><div class='add'>+	0xd9, 0xb0, 0xd0, 0x0c, 0x56, 0xa2, 0x42, 0xe8, 0x3b, 0x33, 0xeb, 0x17,</div><div class='add'>+	0x0a, 0x50, 0x1d, 0xa6, 0xe0, 0x65, 0xf1, 0xd3, 0x71, 0x58, 0xa6, 0xcc,</div><div class='add'>+	0x11, 0x2d, 0xdc, 0x91, 0x1c, 0xc2, 0x7b, 0xc9, 0xf4, 0x1f, 0xf8, 0xa0,</div><div class='add'>+	0x5d, 0xbc, 0xec, 0xd6, 0xe6, 0x9b, 0xdc, 0x51, 0xe5, 0x6f, 0xd0, 0x07,</div><div class='add'>+	0x1a, 0xec, 0x7a, 0x93, 0x67, 0xef, 0x14, 0x60, 0x6e, 0x91, 0x1e, 0x73,</div><div class='add'>+	0x1c, 0x73, 0x63, 0x59, 0x78, 0x88, 0xed, 0x86, 0x9b, 0xb5, 0xcc, 0x53,</div><div class='add'>+	0x4a, 0x8b, 0xec, 0x53, 0x51, 0x75, 0x8f, 0x3e, 0x88, 0x67, 0x8c, 0x78,</div><div class='add'>+	0xba, 0x4d, 0xd5, 0xf9, 0x3a, 0x0b, 0x25, 0xda, 0xed, 0xc4, 0x2a, 0xda,</div><div class='add'>+	0xfc, 0x65, 0x77, 0x39, 0x6a, 0x57, 0xeb, 0x9d, 0xe5, 0x6e, 0x6d, 0xf0,</div><div class='add'>+	0x6b, 0x8c, 0xaf, 0xcd, 0x85, 0x79, 0xff, 0xfb, 0x71, 0x17, 0x56, 0xd8,</div><div class='add'>+	0xfb, 0x08, 0xb9, 0xe2, 0x8c, 0x74, 0x1c, 0x5b, 0xc6, 0xac, 0xf5, 0xaf,</div><div class='add'>+	0x26, 0xb5, 0xc8, 0x53, 0x2a, 0xbb, 0x23, 0x40, 0x4c, 0x73, 0x3f, 0xf4,</div><div class='add'>+	0xe8, 0x2c, 0xeb, 0x54, 0x7b, 0xc1, 0x85, 0x5b, 0x4e, 0x09, 0xcd, 0x1c,</div><div class='add'>+	0x69, 0x1e, 0x42, 0xf9, 0x09, 0x6b, 0xfd, 0x0e, 0x43, 0x1b, 0xbc, 0xec,</div><div class='add'>+	0xce, 0xfe, 0xd7, 0x5a, 0xea, 0xad, 0x43, 0xc9, 0x3e, 0xda, 0x10, 0x71,</div><div class='add'>+	0xc5, 0x90, 0x9c, 0x87, 0x4b, 0xfc, 0x39, 0x31, 0xc5, 0x1f, 0xd3, 0x57,</div><div class='add'>+	0xdd, 0xa9, 0x20, 0xf9, 0xd4, 0x12, 0xd3, 0x90, 0xf9, 0x79, 0x14, 0x97,</div><div class='add'>+	0x8d, 0xac, 0x7f, 0x53, 0x43, 0x82, 0xd8, 0x2c, 0xc2, 0x3a, 0x18, 0xc5,</div><div class='add'>+	0x51, 0x62, 0xbc, 0x43, 0x6c, 0x09, 0xe7, 0x43, 0x3a, 0xb1, 0x59, 0x37,</div><div class='add'>+	0x5c, 0x63, 0x01, 0x35, 0x93, 0x8b, 0x19, 0xed, 0xf8, 0xf7, 0x98, 0x8f,</div><div class='add'>+	0x88, 0x8b, 0x1c, 0x42, 0xe0, 0xc4, 0xdf, 0x59, 0x55, 0xba, 0xde, 0x32,</div><div class='add'>+	0xa6, 0xb8, 0xee, 0x13, 0x11, 0xea, 0x98, 0xef, 0xc9, 0xb9, 0x15, 0xb3,</div><div class='add'>+	0x0b, 0xf7, 0x8c, 0x85, 0xf9, 0x7e, 0x15, 0x56, 0x9e, 0x88, 0xe2, 0x4a,</div><div class='add'>+	0xf2, 0x66, 0xcc, 0xd7, 0x38, 0x18, 0xc8, 0xaf, 0xd3, 0x8f, 0xd8, 0x67,</div><div class='add'>+	0x65, 0x0b, 0xba, 0xbd, 0x77, 0x74, 0xc8, 0x94, 0xfe, 0xdc, 0xc3, 0xbf,</div><div class='add'>+	0x03, 0xfc, 0x88, 0x3e, 0xbf, 0x55, 0xc4, 0x3a, 0xfb, 0x5b, 0xa3, 0x33,</div><div class='add'>+	0x6f, 0x55, 0xd8, 0x7b, 0x9a, 0x88, 0xf2, 0xb9, 0x90, 0x3d, 0x17, 0x1c,</div><div class='add'>+	0x26, 0xcd, 0xb3, 0xe3, 0xd2, 0xb7, 0xb5, 0xad, 0xf3, 0x15, 0xf7, 0xdf,</div><div class='add'>+	0xdf, 0x32, 0x5c, 0x58, 0xcf, 0xde, 0x3e, 0xa2, 0x4b, 0xbd, 0x1c, 0xd6,</div><div class='add'>+	0x6a, 0xb1, 0x0e, 0xa7, 0x43, 0x6c, 0xc2, 0xf5, 0x7f, 0x87, 0x23, 0xa1,</div><div class='add'>+	0x04, 0x73, 0xbe, 0x8e, 0x77, 0x73, 0x5f, 0x66, 0xbf, 0x53, 0x27, 0x67,</div><div class='add'>+	0x77, 0x70, 0xcb, 0x09, 0x2f, 0xd7, 0x5c, 0x4f, 0x5c, 0xb3, 0x09, 0x3f,</div><div class='add'>+	0x0b, 0x39, 0xbd, 0xc6, 0x61, 0x5e, 0x1f, 0x9d, 0x0e, 0x10, 0x8b, 0xfa,</div><div class='add'>+	0xf8, 0xb9, 0x91, 0xb7, 0x2f, 0xe2, 0x49, 0x64, 0xf9, 0xd7, 0x78, 0xf2,</div><div class='add'>+	0x11, 0x0f, 0xe8, 0xb8, 0x9a, 0x7b, 0x09, 0x57, 0x48, 0x3b, 0x3b, 0xed,</div><div class='add'>+	0xd0, 0x3c, 0x5e, 0x10, 0xba, 0xb2, 0x5e, 0x6c, 0xb0, 0xd6, 0x2d, 0xf4,</div><div class='add'>+	0x03, 0x72, 0x8e, 0xf7, 0xdf, 0xb8, 0x06, 0x91, 0xdd, 0x09, 0xf6, 0xc7,</div><div class='add'>+	0x46, 0x03, 0xda, 0x43, 0xb4, 0x97, 0x29, 0x6b, 0x68, 0xec, 0x45, 0xe5,</div><div class='add'>+	0xdd, 0x08, 0x56, 0x8c, 0x59, 0x43, 0x91, 0x94, 0x5c, 0xb7, 0xac, 0xea,</div><div class='add'>+	0xb5, 0x7a, 0xe4, 0x0d, 0xe5, 0x61, 0xad, 0xf3, 0x50, 0x07, 0xa3, 0x38,</div><div class='add'>+	0x9b, 0x6b, 0xbc, 0xf8, 0x1e, 0xb1, 0x53, 0x94, 0xbd, 0xde, 0x25, 0xf7,</div><div class='add'>+	0x28, 0x66, 0x72, 0xff, 0xb1, 0x52, 0x66, 0x04, 0xa3, 0x85, 0x80, 0x9a,</div><div class='add'>+	0xce, 0xfd, 0x49, 0xa5, 0xe4, 0xa2, 0x11, 0xfa, 0x42, 0xd3, 0x98, 0xf0,</div><div class='add'>+	0x6a, 0x0d, 0x55, 0x91, 0xce, 0x51, 0xd2, 0x99, 0x5e, 0xa3, 0x67, 0x46,</div><div class='add'>+	0x94, 0xe8, 0x2c, 0x40, 0x5c, 0xf7, 0xaa, 0xcc, 0xcf, 0xa8, 0xb7, 0xa7,</div><div class='add'>+	0xf9, 0xbc, 0xe8, 0x2d, 0x8c, 0x9f, 0x15, 0xe9, 0x3c, 0x56, 0xb8, 0x88,</div><div class='add'>+	0xe9, 0xdc, 0x25, 0xfb, 0xf7, 0x91, 0x42, 0x82, 0xb5, 0xaf, 0x0f, 0x79,</div><div class='add'>+	0xe6, 0x93, 0xb1, 0x5c, 0x63, 0x66, 0x8c, 0x7c, 0x38, 0x67, 0xee, 0xfa,</div><div class='add'>+	0xf0, 0x64, 0xf1, 0x99, 0x61, 0xbe, 0x3b, 0x7c, 0xed, 0x77, 0xd1, 0x91,</div><div class='add'>+	0xb3, 0xaf, 0xef, 0xec, 0x2b, 0x94, 0xd3, 0x76, 0x4e, 0x1f, 0x7e, 0xd8,</div><div class='add'>+	0xf4, 0xca, 0x0c, 0x1c, 0x2f, 0x8d, 0xaf, 0xc7, 0x88, 0xf1, 0x97, 0xd8,</div><div class='add'>+	0x45, 0xb9, 0x47, 0xa9, 0xcf, 0x13, 0xa6, 0xbd, 0x7f, 0x2f, 0xe7, 0xba,</div><div class='add'>+	0x98, 0xab, 0xbb, 0x5a, 0xcf, 0x10, 0x8b, 0x1d, 0x63, 0xcc, 0xec, 0x49,</div><div class='add'>+	0x36, 0x76, 0xbf, 0x4c, 0xbf, 0x4b, 0x7f, 0x5d, 0xf6, 0xc8, 0x81, 0xb1,</div><div class='add'>+	0x89, 0x6f, 0x63, 0xaa, 0xa6, 0x71, 0xe1, 0x59, 0xe6, 0x84, 0xd3, 0xcc,</div><div class='add'>+	0x53, 0x1e, 0xe6, 0x84, 0xea, 0x09, 0x62, 0x48, 0xe6, 0xa9, 0x79, 0xe6,</div><div class='add'>+	0x29, 0x8f, 0xde, 0x78, 0x71, 0x06, 0xff, 0x9d, 0x7a, 0x11, 0xfe, 0x62,</div><div class='add'>+	0x89, 0x19, 0xc8, 0xb3, 0xce, 0xfc, 0x55, 0x9f, 0xe9, 0xc7, 0xa5, 0x9b,</div><div class='add'>+	0x9d, 0x19, 0x9a, 0x9b, 0x35, 0x7b, 0x77, 0xae, 0x31, 0x34, 0x22, 0xb4,</div><div class='add'>+	0x7b, 0xb4, 0x48, 0x96, 0xb6, 0x3a, 0x62, 0x63, 0xef, 0x6e, 0xf6, 0x0b,</div><div class='add'>+	0x72, 0x8e, 0xab, 0x0a, 0x1e, 0xfa, 0xfe, 0x88, 0x21, 0xe7, 0x1b, 0x22,</div><div class='add'>+	0xc1, 0xcd, 0xb4, 0xe1, 0x88, 0xd9, 0xd8, 0x12, 0x53, 0x3b, 0x70, 0xa9,</div><div class='add'>+	0x98, 0x63, 0x1d, 0x2c, 0xad, 0x65, 0x8e, 0xa2, 0xb1, 0xfb, 0x7e, 0x7c,</div><div class='add'>+	0x03, 0xe9, 0x9a, 0xc6, 0xde, 0x71, 0xc4, 0x8c, 0x7b, 0x21, 0xe7, 0x41,</div><div class='add'>+	0x1d, 0x5a, 0xf5, 0x79, 0x37, 0xf1, 0xc8, 0x27, 0xd6, 0x52, 0xfd, 0x31,</div><div class='add'>+	0x8c, 0x13, 0x33, 0x36, 0xac, 0xd2, 0x2f, 0x7e, 0xbf, 0x78, 0xcf, 0xd9,</div><div class='add'>+	0x2b, 0x12, 0x7f, 0xf1, 0x51, 0x07, 0xe5, 0xf0, 0x2c, 0xaa, 0xe3, 0x1a,</div><div class='add'>+	0xd4, 0x85, 0x7d, 0x56, 0xf8, 0x55, 0x1c, 0xa0, 0xbf, 0x8d, 0x17, 0x14,</div><div class='add'>+	0x8c, 0xfa, 0x57, 0x31, 0x20, 0xb5, 0x89, 0xef, 0xb4, 0xe5, 0x02, 0xc4,</div><div class='add'>+	0x29, 0x11, 0x94, 0xeb, 0xb1, 0xe8, 0x30, 0xe5, 0x6b, 0x63, 0x2e, 0x1f,</div><div class='add'>+	0x65, 0x0e, 0xc9, 0x86, 0x02, 0xf6, 0xf9, 0xd5, 0x72, 0x3d, 0x62, 0xff,</div><div class='add'>+	0xcf, 0x81, 0xf4, 0x41, 0x0d, 0x53, 0xb2, 0x4f, 0x7d, 0x08, 0xaf, 0x8e,</div><div class='add'>+	0xcf, 0xe3, 0x58, 0x32, 0x8d, 0xbd, 0x35, 0x21, 0x8c, 0x99, 0x8b, 0xed,</div><div class='add'>+	0xb9, 0x81, 0xf4, 0x5b, 0x5b, 0x26, 0x0e, 0xda, 0xb3, 0xc8, 0x8d, 0x49,</div><div class='add'>+	0x57, 0xbd, 0x9c, 0xe3, 0x98, 0x66, 0xdf, 0x35, 0x6e, 0x0c, 0xe1, 0x80,</div><div class='add'>+	0xf1, 0xc7, 0x30, 0x16, 0x49, 0xee, 0x1c, 0xc1, 0xf9, 0x29, 0xa9, 0x61,</div><div class='add'>+	0xfd, 0xad, 0xcb, 0xc6, 0x44, 0x3f, 0x2e, 0x62, 0x5e, 0x1f, 0x9a, 0x6c,</div><div class='add'>+	0x0c, 0x37, 0xd7, 0xba, 0x7c, 0xca, 0xc1, 0x72, 0x4d, 0x79, 0x39, 0x73,</div><div class='add'>+	0x5d, 0x85, 0x20, 0xf5, 0x75, 0x21, 0xe9, 0x65, 0xce, 0x11, 0x7d, 0xca,</div><div class='add'>+	0x19, 0x3f, 0x47, 0xce, 0x44, 0x5e, 0x61, 0xa4, 0xf9, 0xc6, 0xfd, 0x15,</div><div class='add'>+	0xf9, 0xff, 0x83, 0x6b, 0xe7, 0x0e, 0x8b, 0xb3, 0xf1, 0x3f, 0xb7, 0x2e,</div><div class='add'>+	0xdd, 0x24, 0x72, 0x27, 0x03, 0xcc, 0xe9, 0xd1, 0xa9, 0x6b, 0xfa, 0x15,</div><div class='add'>+	0x9d, 0x9e, 0x93, 0x9a, 0x61, 0xeb, 0xdc, 0x99, 0xb7, 0x69, 0x03, 0xef,</div><div class='add'>+	0xa8, 0x46, 0xd6, 0x13, 0xfa, 0x55, 0x0d, 0xfd, 0xad, 0x09, 0xbd, 0x4b,</div><div class='add'>+	0x53, 0x9e, 0x9e, 0xab, 0xe6, 0x7a, 0xb4, 0xac, 0x7e, 0xd7, 0xc2, 0xcd,</div><div class='add'>+	0x6d, 0x70, 0xeb, 0x72, 0x7d, 0xca, 0x4a, 0x87, 0xe4, 0x77, 0x33, 0x20,</div><div class='add'>+	0xb5, 0xfc, 0x05, 0x73, 0xde, 0x5a, 0xbe, 0xd8, 0xc1, 0x86, 0x7f, 0x97,</div><div class='add'>+	0x93, 0xbd, 0xaf, 0xac, 0xc5, 0x5e, 0xfb, 0xe2, 0xdb, 0xee, 0x83, 0xf8,</div><div class='add'>+	0xdb, 0xfc, 0x21, 0xbc, 0x39, 0xee, 0x21, 0xce, 0x14, 0x59, 0xd6, 0xa3,</div><div class='add'>+	0x7a, 0x75, 0x3c, 0xfd, 0x2e, 0xf3, 0xe2, 0xc5, 0xa9, 0x92, 0x5f, 0xcc,</div><div class='add'>+	0xb5, 0xae, 0x98, 0x52, 0xa4, 0x55, 0x85, 0x32, 0xca, 0xf9, 0x53, 0xc3,</div><div class='add'>+	0x8d, 0x68, 0x11, 0xdb, 0xba, 0xc9, 0xe7, 0xee, 0x9c, 0x83, 0x79, 0x63,</div><div class='add'>+	0xf9, 0xc3, 0x01, 0x67, 0xfe, 0x15, 0x60, 0x1e, 0x1d, 0xc5, 0x91, 0x5c,</div><div class='add'>+	0x63, 0xe2, 0x3d, 0x39, 0xa7, 0xc3, 0x5e, 0xec, 0x12, 0x46, 0x71, 0x22,</div><div class='add'>+	0x57, 0xca, 0xa1, 0x11, 0x39, 0xdf, 0x9a, 0x88, 0xba, 0x9c, 0x1c, 0x19,</div><div class='add'>+	0x75, 0x69, 0xd9, 0xa8, 0xeb, 0xe6, 0x80, 0x60, 0x83, 0xe1, 0x42, 0x2c,</div><div class='add'>+	0x52, 0x0e, 0x37, 0xf6, 0x18, 0x8e, 0x7f, 0xd4, 0xcf, 0x78, 0x11, 0x5d,</div><div class='add'>+	0x24, 0x75, 0x59, 0x6a, 0xb2, 0x87, 0x35, 0x79, 0x31, 0xd2, 0x8b, 0x3d,</div><div class='add'>+	0x78, 0x4d, 0x17, 0x7d, 0xec, 0x2f, 0xe9, 0xc3, 0x38, 0x87, 0xfd, 0xd6,</div><div class='add'>+	0x7c, 0xb7, 0xf8, 0x92, 0x17, 0x87, 0x9a, 0xa6, 0xad, 0xa9, 0xb0, 0xc8,</div><div class='add'>+	0xee, 0xc6, 0x69, 0xe6, 0x57, 0xdc, 0x1c, 0x8b, 0x9c, 0x66, 0xcd, 0x1e,</div><div class='add'>+	0xd1, 0x4b, 0x3e, 0x7e, 0x57, 0x91, 0x4f, 0x3d, 0x33, 0x8b, 0x3f, 0xe1,</div><div class='add'>+	0xef, 0xf5, 0x91, 0xbd, 0xca, 0x59, 0x6f, 0xf9, 0xcc, 0xdb, 0x81, 0xd2,</div><div class='add'>+	0xec, 0x54, 0x9e, 0x8d, 0xe6, 0x09, 0x3a, 0x2b, 0x84, 0x56, 0x80, 0xfe,</div><div class='add'>+	0x59, 0x8e, 0xde, 0xb0, 0x9c, 0xf3, 0x10, 0xbd, 0xc8, 0x9e, 0x22, 0xa8,</div><div class='add'>+	0x0f, 0x0b, 0x2f, 0x51, 0x1f, 0x87, 0xae, 0x9d, 0xa9, 0x72, 0xf2, 0x57,</div><div class='add'>+	0x05, 0xaf, 0x6f, 0x4e, 0xbe, 0xb8, 0xce, 0x8f, 0xdf, 0x58, 0x97, 0xc2,</div><div class='add'>+	0x11, 0xe6, 0x04, 0xb1, 0x69, 0xc6, 0xc6, 0x91, 0x6e, 0xe2, 0x93, 0xdd,</div><div class='add'>+	0xf6, 0xf9, 0x11, 0xc6, 0x81, 0x79, 0x4d, 0x8e, 0xf9, 0x3e, 0xe2, 0xec,</div><div class='add'>+	0xb9, 0x9c, 0x7d, 0x66, 0xaf, 0xf7, 0x0d, 0x15, 0x63, 0xae, 0xf9, 0x12,</div><div class='add'>+	0x7a, 0x6b, 0x85, 0x5e, 0x28, 0xb8, 0x6d, 0x32, 0x41, 0x1d, 0xd4, 0x09,</div><div class='add'>+	0x5d, 0xeb, 0x29, 0x76, 0x73, 0x87, 0xc6, 0x84, 0x3e, 0x30, 0x32, 0x16,</div><div class='add'>+	0xeb, 0xff, 0x29, 0xb0, 0xae, 0x0a, 0xda, 0xe0, 0x6c, 0xf1, 0xff, 0x38,</div><div class='add'>+	0x7e, 0xa1, 0x84, 0x96, 0xd0, 0xf1, 0xc0, 0x64, 0x8e, 0x3b, 0x3e, 0x57,</div><div class='add'>+	0x41, 0xdd, 0x69, 0xdd, 0x3f, 0x50, 0x15, 0x78, 0xec, 0x89, 0x04, 0x79,</div><div class='add'>+	0x5f, 0x14, 0xdc, 0x3c, 0xe9, 0x83, 0xff, 0x4c, 0x15, 0x6b, 0xae, 0x0f,</div><div class='add'>+	0x97, 0x9b, 0x69, 0xd7, 0x27, 0x4a, 0xbc, 0xdb, 0x7b, 0xa3, 0x78, 0x74,</div><div class='add'>+	0x22, 0x0a, 0x93, 0x3e, 0x3b, 0x67, 0xca, 0x3e, 0xb0, 0xcf, 0xce, 0x9f,</div><div class='add'>+	0x17, 0xd7, 0xd4, 0xd9, 0x7b, 0x54, 0xcf, 0x16, 0xf4, 0xc8, 0x59, 0x55,</div><div class='add'>+	0x85, 0x0f, 0x4e, 0xcc, 0xdf, 0x5c, 0x0e, 0xeb, 0x85, 0xa5, 0xa9, 0x78,</div><div class='add'>+	0x66, 0x17, 0x7d, 0x7e, 0xc5, 0xf2, 0x30, 0x7b, 0x19, 0xf6, 0x94, 0x6b,</div><div class='add'>+	0xa5, 0xff, 0x1d, 0x60, 0xff, 0x5b, 0xda, 0xd3, 0xd7, 0xfb, 0x1f, 0x52,</div><div class='add'>+	0xd9, 0x4d, 0x41, 0x58, 0x1f, 0x95, 0xa7, 0xac, 0x8f, 0xbd, 0xa9, 0x38,</div><div class='add'>+	0xdf, 0x97, 0x3d, 0x3d, 0xcb, 0x7a, 0xab, 0xd9, 0xb2, 0xf2, 0xcd, 0xb1,</div><div class='add'>+	0x4c, 0xc8, 0x1d, 0xc2, 0x99, 0x06, 0xd9, 0x07, 0x74, 0xe1, 0x83, 0xb8,</div><div class='add'>+	0x1e, 0xd9, 0x05, 0xd9, 0x7b, 0x67, 0x8e, 0x5f, 0x2c, 0xe7, 0x0e, 0xeb,</div><div class='add'>+	0x82, 0x9d, 0xe6, 0x22, 0x3c, 0x33, 0xbb, 0x16, 0xbd, 0x5e, 0xd8, 0xe7,</div><div class='add'>+	0x62, 0x2c, 0x03, 0x6f, 0x2c, 0x85, 0xd4, 0xed, 0x78, 0xcb, 0x43, 0x08,</div><div class='add'>+	0x63, 0xb6, 0x70, 0x08, 0x0f, 0x9e, 0x90, 0xfd, 0xc5, 0x07, 0x5a, 0x7d,</div><div class='add'>+	0x27, 0xac, 0xbf, 0x8b, 0xa4, 0xe6, 0x99, 0x17, 0x2d, 0xab, 0x62, 0x6d,</div><div class='add'>+	0x63, 0x84, 0xe5, 0x88, 0x18, 0xa3, 0x57, 0xb0, 0x7b, 0xff, 0x07, 0xa8,</div><div class='add'>+	0xc1, 0xd9, 0xe9, 0xf4, 0xcd, 0xec, 0x25, 0x3b, 0x9f, 0x54, 0x21, 0x3c,</div><div class='add'>+	0x4f, 0x19, 0x9f, 0x2e, 0x08, 0x4e, 0x79, 0xb0, 0x75, 0xcb, 0x89, 0x25,</div><div class='add'>+	0x78, 0x61, 0x36, 0x8c, 0xb3, 0xa6, 0x4e, 0x9c, 0x04, 0x55, 0x99, 0xb2,</div><div class='add'>+	0xaa, 0xab, 0xc9, 0x6b, 0xa5, 0xdb, 0x8d, 0x4d, 0x49, 0xe9, 0x0f, 0xf5,</div><div class='add'>+	0xfe, 0x80, 0xc2, 0x92, 0x72, 0xe8, 0x0b, 0xfb, 0x81, 0x01, 0x3f, 0xfb,</div><div class='add'>+	0xd5, 0x27, 0x55, 0x3c, 0xf3, 0xbe, 0x3b, 0x8c, 0xe7, 0x99, 0x7f, 0x7e,</div><div class='add'>+	0x50, 0x90, 0x33, 0x53, 0xcc, 0x31, 0xd3, 0x51, 0xda, 0xca, 0x07, 0x57,</div><div class='add'>+	0x7d, 0x15, 0x0e, 0x33, 0x5e, 0x5e, 0x32, 0xca, 0x98, 0xa3, 0xe4, 0x0c,</div><div class='add'>+	0x95, 0xe4, 0xf7, 0x9d, 0x72, 0x56, 0xc4, 0x7a, 0x56, 0x77, 0xfa, 0x7d,</div><div class='add'>+	0x63, 0xe6, 0xc6, 0x73, 0xc8, 0x21, 0xe6, 0xf5, 0xc6, 0xee, 0x88, 0x7a,</div><div class='add'>+	0xc5, 0x4a, 0x7f, 0x5d, 0x51, 0xce, 0xdd, 0x55, 0xa8, 0xb0, 0x65, 0xc5,</div><div class='add'>+	0xf0, 0x44, 0xa9, 0xa6, 0x54, 0x4b, 0x2f, 0xd7, 0x9d, 0x2d, 0xfa, 0x60,</div><div class='add'>+	0x25, 0x63, 0xfd, 0x28, 0x6b, 0x74, 0xf9, 0x09, 0xa9, 0x25, 0xec, 0x5f,</div><div class='add'>+	0xd4, 0x7a, 0x62, 0x61, 0xc1, 0x0d, 0x3e, 0xdc, 0x1f, 0xd2, 0x5a, 0xe4,</div><div class='add'>+	0x2c, 0xf6, 0xd3, 0x85, 0x0e, 0x8f, 0x9c, 0x89, 0x7a, 0xa6, 0x20, 0xb5,</div><div class='add'>+	0x5c, 0x72, 0x41, 0x69, 0xbd, 0x08, 0x6a, 0xc7, 0xc4, 0x46, 0xdd, 0xad,</div><div class='add'>+	0x1f, 0x8d, 0x05, 0xe4, 0xdc, 0xfc, 0x90, 0x8b, 0xbd, 0xb6, 0x6f, 0xcc,</div><div class='add'>+	0xb2, 0xee, 0x6e, 0xd6, 0xfb, 0xd7, 0xbb, 0x65, 0x3f, 0x39, 0xd6, 0x7b,</div><div class='add'>+	0x4e, 0x69, 0x2d, 0x47, 0xd4, 0x8d, 0x74, 0x9e, 0xab, 0x92, 0x18, 0xc9,</div><div class='add'>+	0x52, 0xce, 0x47, 0x6d, 0x99, 0xf6, 0x53, 0xa6, 0xd2, 0x99, 0xa1, 0x2a,</div><div class='add'>+	0x5c, 0x1e, 0x87, 0xce, 0xa8, 0xc5, 0x79, 0x83, 0xc9, 0x29, 0x14, 0x4f,</div><div class='add'>+	0xb7, 0x43, 0xfc, 0x5f, 0xeb, 0x15, 0x0c, 0x55, 0xc9, 0x9c, 0x3c, 0x3d,</div><div class='add'>+	0x2e, 0x35, 0x46, 0x09, 0x3e, 0xc9, 0x56, 0xa7, 0x06, 0x70, 0x65, 0x0d,</div><div class='add'>+	0xf0, 0xca, 0x98, 0xb3, 0xdf, 0x5e, 0x3c, 0xe3, 0x6d, 0x9f, 0x65, 0x78,</div><div class='add'>+	0xc8, 0x3e, 0xa3, 0x20, 0xf4, 0x0f, 0xe2, 0x4c, 0x4e, 0x30, 0xe5, 0x00,</div><div class='add'>+	0x31, 0x65, 0x6c, 0x90, 0x78, 0xb3, 0xa5, 0xe0, 0x9c, 0xb7, 0x32, 0x3e,</div><div class='add'>+	0xa2, 0xcf, 0x3f, 0x49, 0xac, 0x7a, 0x18, 0xce, 0x7e, 0x7b, 0x43, 0xf1,</div><div class='add'>+	0x0c, 0x42, 0x2c, 0xdf, 0xa9, 0xb6, 0x16, 0xec, 0x33, 0x5a, 0x8c, 0xb1,</div><div class='add'>+	0x76, 0xb5, 0x79, 0xb6, 0x43, 0x6d, 0x99, 0xed, 0x52, 0x3b, 0x0a, 0xd2,</div><div class='add'>+	0xb3, 0x3e, 0xd0, 0x7a, 0xff, 0x89, 0xed, 0x6a, 0xeb, 0x74, 0x8f, 0x22,</div><div class='add'>+	0xa6, 0x0d, 0xf9, 0x52, 0x19, 0xd5, 0x35, 0xeb, 0xcc, 0xcf, 0x3b, 0xd9,</div><div class='add'>+	0x77, 0x6d, 0x35, 0x4b, 0xfd, 0xbc, 0xfc, 0x1f, 0x57, 0x58, 0xfe, 0x67,</div><div class='add'>+	0xa2, 0x77, 0xa3, 0xb2, 0xac, 0x5b, 0x93, 0x7f, 0x2d, 0xf6, 0xb0, 0x9e,</div><div class='add'>+	0x4e, 0xb2, 0x36, 0x9a, 0x55, 0xe8, 0x63, 0xdf, 0x31, 0x6c, 0x2c, 0x2b,</div><div class='add'>+	0xee, 0x97, 0x89, 0x4c, 0x72, 0x4e, 0x42, 0xfc, 0x15, 0x59, 0xf6, 0x20,</div><div class='add'>+	0xf8, 0x7b, 0xf2, 0xbf, 0xb7, 0x28, 0x57, 0x97, 0x9c, 0x23, 0xf0, 0x5e,</div><div class='add'>+	0x3f, 0x47, 0x76, 0x6c, 0xec, 0xba, 0x5c, 0x1e, 0x5e, 0x1b, 0x25, 0x3e,</div><div class='add'>+	0xdd, 0xab, 0xb4, 0xc1, 0xa7, 0x1c, 0xb9, 0x2e, 0x5e, 0x66, 0x0c, 0x0f,</div><div class='add'>+	0xdb, 0x31, 0xec, 0xc8, 0xb5, 0xb2, 0x28, 0xd7, 0x8a, 0x7c, 0xa7, 0x7d,</div><div class='add'>+	0x3e, 0x8b, 0x74, 0x5a, 0xe7, 0xc6, 0xe4, 0x1c, 0x99, 0xcc, 0x2e, 0x45,</div><div class='add'>+	0x36, 0x91, 0xe3, 0x84, 0x55, 0xa1, 0x77, 0xa9, 0x6d, 0xf6, 0xb9, 0x32,</div><div class='add'>+	0x39, 0xd3, 0x25, 0xfb, 0xfb, 0x25, 0xb9, 0xa4, 0x8e, 0x2f, 0x0a, 0x76,</div><div class='add'>+	0x4c, 0xca, 0x39, 0x6b, 0xcb, 0xfa, 0x99, 0x51, 0x11, 0x14, 0x59, 0xce,</div><div class='add'>+	0x1a, 0x22, 0x8b, 0x9c, 0x17, 0x29, 0xc9, 0xf3, 0xb5, 0xa2, 0x3c, 0x62,</div><div class='add'>+	0xab, 0xeb, 0x76, 0x2a, 0xfd, 0xff, 0xdf, 0xdb, 0x39, 0xe7, 0x2c, 0x49,</div><div class='add'>+	0x49, 0x9e, 0x60, 0x4a, 0xf8, 0xcf, 0xb7, 0x8e, 0x8e, 0x0f, 0xe0, 0x15,</div><div class='add'>+	0xde, 0xff, 0x65, 0xae, 0x24, 0x97, 0x1b, 0x33, 0xd3, 0xa5, 0x33, 0x72,</div><div class='add'>+	0x6c, 0x29, 0xcd, 0x98, 0x31, 0x42, 0x3f, 0x72, 0xe4, 0x93, 0x33, 0x72,</div><div class='add'>+	0x8d, 0xf3, 0x97, 0xed, 0xb9, 0x57, 0x3c, 0xcd, 0x7e, 0x19, 0x67, 0x0b,</div><div class='add'>+	0xbf, 0x6d, 0xbf, 0xa6, 0x7c, 0x05, 0x7b, 0x64, 0xa1, 0x3d, 0x47, 0xda,</div><div class='add'>+	0x72, 0x96, 0x44, 0xe1, 0xa9, 0x69, 0x60, 0xda, 0xe4, 0xb2, 0xa9, 0x21,</div><div class='add'>+	0x3c, 0x6e, 0x58, 0xd6, 0x93, 0xcd, 0xba, 0x9c, 0x01, 0xba, 0x50, 0x6b,</div><div class='add'>+	0xcf, 0x85, 0x60, 0x54, 0xe9, 0xb2, 0x77, 0x27, 0xe7, 0x48, 0x7a, 0xa8,</div><div class='add'>+	0x03, 0x91, 0x5d, 0x7c, 0xa0, 0x64, 0x7b, 0x39, 0xdf, 0x96, 0xa5, 0x7e,</div><div class='add'>+	0x44, 0x37, 0xa5, 0x73, 0x6e, 0x32, 0x73, 0xb9, 0x51, 0x27, 0xb7, 0xd9,</div><div class='add'>+	0x3a, 0x79, 0xda, 0x10, 0x7f, 0x65, 0xf6, 0xa1, 0xaf, 0xce, 0x10, 0x3f,</div><div class='add'>+	0x8c, 0x18, 0x5e, 0x1b, 0xab, 0x1d, 0x26, 0x3e, 0x39, 0xc2, 0xd8, 0x79,</div><div class='add'>+	0xd4, 0xbc, 0x88, 0x8b, 0xf9, 0x97, 0xf0, 0xca, 0xb5, 0xff, 0x85, 0x13,</div><div class='add'>+	0x7f, 0xf1, 0xb5, 0x6c, 0xb1, 0xcf, 0x32, 0xfd, 0x75, 0xcb, 0xb2, 0xb8,</div><div class='add'>+	0xe4, 0xa1, 0x93, 0x4d, 0x72, 0xb6, 0xa9, 0x3c, 0xf5, 0xde, 0x3a, 0xd9,</div><div class='add'>+	0xdf, 0x2a, 0x4b, 0x0d, 0x7e, 0xf5, 0x82, 0x2e, 0xba, 0xf9, 0x64, 0xf5,</div><div class='add'>+	0x19, 0x5d, 0xe4, 0xd2, 0x8d, 0x51, 0xfb, 0x7f, 0x33, 0x43, 0x6b, 0x77,</div><div class='add'>+	0xeb, 0x12, 0x3b, 0xef, 0x34, 0xb7, 0xd9, 0x39, 0x61, 0x30, 0x75, 0xab,</div><div class='add'>+	0xad, 0x83, 0x83, 0xa9, 0x65, 0x8e, 0x2e, 0x52, 0x09, 0xfb, 0xfb, 0xe1,</div><div class='add'>+	0x94, 0xa3, 0x9b, 0x5c, 0xaa, 0xde, 0xfe, 0x1e, 0x4d, 0x39, 0x67, 0xa2,</div><div class='add'>+	0xb3, 0x29, 0xdd, 0xfe, 0x1e, 0x4f, 0xc5, 0xec, 0xef, 0x23, 0xa9, 0x5b,</div><div class='add'>+	0xae, 0xf3, 0xc5, 0x9f, 0xff, 0x07, 0xd8, 0xc4, 0xd3, 0xb4, 0xb4, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x00 };</div><div class='ctx'> </div><div class='ctx'> static const u32 bnx2_TXP_b06FwData[(0x0/4) + 1] = { 0x0 };</div><div class='ctx'> static const u32 bnx2_TXP_b06FwRodata[(0x0/4) + 1] = { 0x0 };</div><div class='ctx'> </div><div class='ctx'> static struct fw_info bnx2_txp_fw_06 = {</div><div class='del'>-	/* Firmware version: 4.0.5 */</div><div class='add'>+	/* Firmware version: 4.4.2 */</div><div class='ctx'> 	.ver_major			= 0x4,</div><div class='del'>-	.ver_minor			= 0x0,</div><div class='del'>-	.ver_fix			= 0x5,</div><div class='add'>+	.ver_minor			= 0x4,</div><div class='add'>+	.ver_fix			= 0x2,</div><div class='ctx'> </div><div class='ctx'> 	.start_addr			= 0x08000098,</div><div class='ctx'> </div><div class='ctx'> 	.text_addr			= 0x08000000,</div><div class='del'>-	.text_len			= 0x3ad8,</div><div class='add'>+	.text_len			= 0x3ab0,</div><div class='ctx'> 	.text_index			= 0x0,</div><div class='ctx'> 	.gz_text			= bnx2_TXP_b06FwText,</div><div class='ctx'> 	.gz_text_len			= sizeof(bnx2_TXP_b06FwText),</div><div class='hunk'>@@ -4582,11 +4535,11 @@ static struct fw_info bnx2_txp_fw_06 = {</div><div class='ctx'> 	.data_index			= 0x0,</div><div class='ctx'> 	.data				= bnx2_TXP_b06FwData,</div><div class='ctx'> </div><div class='del'>-	.sbss_addr			= 0x08003b00,</div><div class='add'>+	.sbss_addr			= 0x08003ae0,</div><div class='ctx'> 	.sbss_len			= 0x68,</div><div class='ctx'> 	.sbss_index			= 0x0,</div><div class='ctx'> </div><div class='del'>-	.bss_addr			= 0x08003b68,</div><div class='add'>+	.bss_addr			= 0x08003b48,</div><div class='ctx'> 	.bss_len			= 0x14c,</div><div class='ctx'> 	.bss_index			= 0x0,</div><div class='ctx'> </div><div class='hunk'>@@ -4611,3 +4564,4 @@ static const struct cpu_reg cpu_reg_txp = {</div><div class='ctx'> 	.spad_base = BNX2_TXP_SCRATCH,</div><div class='ctx'> 	.mips_view_base = 0x8000000,</div><div class='ctx'> };</div><div class='add'>+</div><div class='head'>diff --git a/drivers/net/bnx2x_main.c b/drivers/net/bnx2x_main.c<br/>index a8eb3c4a47c8..fce745148ff9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/bnx2x_main.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/bnx2x_main.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/bnx2x_main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/bnx2x_main.c</a></div><div class='hunk'>@@ -59,8 +59,8 @@</div><div class='ctx'> #include "bnx2x.h"</div><div class='ctx'> #include "bnx2x_init.h"</div><div class='ctx'> </div><div class='del'>-#define DRV_MODULE_VERSION	"1.45.21"</div><div class='del'>-#define DRV_MODULE_RELDATE	"2008/09/03"</div><div class='add'>+#define DRV_MODULE_VERSION	"1.45.22"</div><div class='add'>+#define DRV_MODULE_RELDATE	"2008/09/09"</div><div class='ctx'> #define BNX2X_BC_VER		0x040200</div><div class='ctx'> </div><div class='ctx'> /* Time in jiffies before concluding the transmitter is hung */</div><div class='hunk'>@@ -649,15 +649,16 @@ static void bnx2x_int_disable(struct bnx2x *bp)</div><div class='ctx'> 		BNX2X_ERR("BUG! proper val not read from IGU!\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bnx2x_int_disable_sync(struct bnx2x *bp)</div><div class='add'>+static void bnx2x_int_disable_sync(struct bnx2x *bp, int disable_hw)</div><div class='ctx'> {</div><div class='ctx'> 	int msix = (bp-&gt;flags &amp; USING_MSIX_FLAG) ? 1 : 0;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	/* disable interrupt handling */</div><div class='ctx'> 	atomic_inc(&amp;bp-&gt;intr_sem);</div><div class='del'>-	/* prevent the HW from sending interrupts */</div><div class='del'>-	bnx2x_int_disable(bp);</div><div class='add'>+	if (disable_hw)</div><div class='add'>+		/* prevent the HW from sending interrupts */</div><div class='add'>+		bnx2x_int_disable(bp);</div><div class='ctx'> </div><div class='ctx'> 	/* make sure all ISRs are done */</div><div class='ctx'> 	if (msix) {</div><div class='hunk'>@@ -6086,9 +6087,9 @@ static void bnx2x_netif_start(struct bnx2x *bp)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bnx2x_netif_stop(struct bnx2x *bp)</div><div class='add'>+static void bnx2x_netif_stop(struct bnx2x *bp, int disable_hw)</div><div class='ctx'> {</div><div class='del'>-	bnx2x_int_disable_sync(bp);</div><div class='add'>+	bnx2x_int_disable_sync(bp, disable_hw);</div><div class='ctx'> 	if (netif_running(bp-&gt;dev)) {</div><div class='ctx'> 		bnx2x_napi_disable(bp);</div><div class='ctx'> 		netif_tx_disable(bp-&gt;dev);</div><div class='hunk'>@@ -6475,7 +6476,7 @@ load_rings_free:</div><div class='ctx'> 	for_each_queue(bp, i)</div><div class='ctx'> 		bnx2x_free_rx_sge_range(bp, bp-&gt;fp + i, NUM_RX_SGE);</div><div class='ctx'> load_int_disable:</div><div class='del'>-	bnx2x_int_disable_sync(bp);</div><div class='add'>+	bnx2x_int_disable_sync(bp, 1);</div><div class='ctx'> 	/* Release IRQs */</div><div class='ctx'> 	bnx2x_free_irq(bp);</div><div class='ctx'> load_error:</div><div class='hunk'>@@ -6650,7 +6651,7 @@ static int bnx2x_nic_unload(struct bnx2x *bp, int unload_mode)</div><div class='ctx'> 	bp-&gt;rx_mode = BNX2X_RX_MODE_NONE;</div><div class='ctx'> 	bnx2x_set_storm_rx_mode(bp);</div><div class='ctx'> </div><div class='del'>-	bnx2x_netif_stop(bp);</div><div class='add'>+	bnx2x_netif_stop(bp, 1);</div><div class='ctx'> 	if (!netif_running(bp-&gt;dev))</div><div class='ctx'> 		bnx2x_napi_disable(bp);</div><div class='ctx'> 	del_timer_sync(&amp;bp-&gt;timer);</div><div class='hunk'>@@ -8791,7 +8792,7 @@ static int bnx2x_test_loopback(struct bnx2x *bp, u8 link_up)</div><div class='ctx'> 	if (!netif_running(bp-&gt;dev))</div><div class='ctx'> 		return BNX2X_LOOPBACK_FAILED;</div><div class='ctx'> </div><div class='del'>-	bnx2x_netif_stop(bp);</div><div class='add'>+	bnx2x_netif_stop(bp, 1);</div><div class='ctx'> </div><div class='ctx'> 	if (bnx2x_run_loopback(bp, BNX2X_MAC_LOOPBACK, link_up)) {</div><div class='ctx'> 		DP(NETIF_MSG_PROBE, "MAC loopback failed\n");</div><div class='hunk'>@@ -10346,6 +10347,74 @@ static int bnx2x_resume(struct pci_dev *pdev)</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int bnx2x_eeh_nic_unload(struct bnx2x *bp)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	bp-&gt;state = BNX2X_STATE_ERROR;</div><div class='add'>+</div><div class='add'>+	bp-&gt;rx_mode = BNX2X_RX_MODE_NONE;</div><div class='add'>+</div><div class='add'>+	bnx2x_netif_stop(bp, 0);</div><div class='add'>+</div><div class='add'>+	del_timer_sync(&amp;bp-&gt;timer);</div><div class='add'>+	bp-&gt;stats_state = STATS_STATE_DISABLED;</div><div class='add'>+	DP(BNX2X_MSG_STATS, "stats_state - DISABLED\n");</div><div class='add'>+</div><div class='add'>+	/* Release IRQs */</div><div class='add'>+	bnx2x_free_irq(bp);</div><div class='add'>+</div><div class='add'>+	if (CHIP_IS_E1(bp)) {</div><div class='add'>+		struct mac_configuration_cmd *config =</div><div class='add'>+						bnx2x_sp(bp, mcast_config);</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; config-&gt;hdr.length_6b; i++)</div><div class='add'>+			CAM_INVALIDATE(config-&gt;config_table[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Free SKBs, SGEs, TPA pool and driver internals */</div><div class='add'>+	bnx2x_free_skbs(bp);</div><div class='add'>+	for_each_queue(bp, i)</div><div class='add'>+		bnx2x_free_rx_sge_range(bp, bp-&gt;fp + i, NUM_RX_SGE);</div><div class='add'>+	bnx2x_free_mem(bp);</div><div class='add'>+</div><div class='add'>+	bp-&gt;state = BNX2X_STATE_CLOSED;</div><div class='add'>+</div><div class='add'>+	netif_carrier_off(bp-&gt;dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnx2x_eeh_recover(struct bnx2x *bp)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	mutex_init(&amp;bp-&gt;port.phy_mutex);</div><div class='add'>+</div><div class='add'>+	bp-&gt;common.shmem_base = REG_RD(bp, MISC_REG_SHARED_MEM_ADDR);</div><div class='add'>+	bp-&gt;link_params.shmem_base = bp-&gt;common.shmem_base;</div><div class='add'>+	BNX2X_DEV_INFO("shmem offset is 0x%x\n", bp-&gt;common.shmem_base);</div><div class='add'>+</div><div class='add'>+	if (!bp-&gt;common.shmem_base ||</div><div class='add'>+	    (bp-&gt;common.shmem_base &lt; 0xA0000) ||</div><div class='add'>+	    (bp-&gt;common.shmem_base &gt;= 0xC0000)) {</div><div class='add'>+		BNX2X_DEV_INFO("MCP not active\n");</div><div class='add'>+		bp-&gt;flags |= NO_MCP_FLAG;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	val = SHMEM_RD(bp, validity_map[BP_PORT(bp)]);</div><div class='add'>+	if ((val &amp; (SHR_MEM_VALIDITY_DEV_INFO | SHR_MEM_VALIDITY_MB))</div><div class='add'>+		!= (SHR_MEM_VALIDITY_DEV_INFO | SHR_MEM_VALIDITY_MB))</div><div class='add'>+		BNX2X_ERR("BAD MCP validity signature\n");</div><div class='add'>+</div><div class='add'>+	if (!BP_NOMCP(bp)) {</div><div class='add'>+		bp-&gt;fw_seq = (SHMEM_RD(bp, func_mb[BP_FUNC(bp)].drv_mb_header)</div><div class='add'>+			      &amp; DRV_MSG_SEQ_NUMBER_MASK);</div><div class='add'>+		BNX2X_DEV_INFO("fw_seq 0x%08x\n", bp-&gt;fw_seq);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * bnx2x_io_error_detected - called when PCI error is detected</div><div class='ctx'>  * @pdev: Pointer to PCI device</div><div class='hunk'>@@ -10365,7 +10434,7 @@ static pci_ers_result_t bnx2x_io_error_detected(struct pci_dev *pdev,</div><div class='ctx'> 	netif_device_detach(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (netif_running(dev))</div><div class='del'>-		bnx2x_nic_unload(bp, UNLOAD_CLOSE);</div><div class='add'>+		bnx2x_eeh_nic_unload(bp);</div><div class='ctx'> </div><div class='ctx'> 	pci_disable_device(pdev);</div><div class='ctx'> </div><div class='hunk'>@@ -10420,8 +10489,10 @@ static void bnx2x_io_resume(struct pci_dev *pdev)</div><div class='ctx'> </div><div class='ctx'> 	rtnl_lock();</div><div class='ctx'> </div><div class='add'>+	bnx2x_eeh_recover(bp);</div><div class='add'>+</div><div class='ctx'> 	if (netif_running(dev))</div><div class='del'>-		bnx2x_nic_load(bp, LOAD_OPEN);</div><div class='add'>+		bnx2x_nic_load(bp, LOAD_NORMAL);</div><div class='ctx'> </div><div class='ctx'> 	netif_device_attach(dev);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c<br/>index b211486a0ca3..ade5f3f6693b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/bonding/bond_alb.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/bonding/bond_alb.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/bonding/bond_alb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/bonding/bond_alb.c</a></div><div class='hunk'>@@ -38,6 +38,7 @@</div><div class='ctx'> #include &lt;linux/in.h&gt;</div><div class='ctx'> #include &lt;net/ipx.h&gt;</div><div class='ctx'> #include &lt;net/arp.h&gt;</div><div class='add'>+#include &lt;net/ipv6.h&gt;</div><div class='ctx'> #include &lt;asm/byteorder.h&gt;</div><div class='ctx'> #include "bonding.h"</div><div class='ctx'> #include "bond_alb.h"</div><div class='hunk'>@@ -81,6 +82,7 @@</div><div class='ctx'> #define RLB_PROMISC_TIMEOUT	10*ALB_TIMER_TICKS_PER_SEC</div><div class='ctx'> </div><div class='ctx'> static const u8 mac_bcast[ETH_ALEN] = {0xff,0xff,0xff,0xff,0xff,0xff};</div><div class='add'>+static const u8 mac_v6_allmcast[ETH_ALEN] = {0x33,0x33,0x00,0x00,0x00,0x01};</div><div class='ctx'> static const int alb_delta_in_ticks = HZ / ALB_TIMER_TICKS_PER_SEC;</div><div class='ctx'> </div><div class='ctx'> #pragma pack(1)</div><div class='hunk'>@@ -710,7 +712,7 @@ static struct slave *rlb_arp_xmit(struct sk_buff *skb, struct bonding *bond)</div><div class='ctx'> 	struct arp_pkt *arp = arp_pkt(skb);</div><div class='ctx'> 	struct slave *tx_slave = NULL;</div><div class='ctx'> </div><div class='del'>-	if (arp-&gt;op_code == __constant_htons(ARPOP_REPLY)) {</div><div class='add'>+	if (arp-&gt;op_code == htons(ARPOP_REPLY)) {</div><div class='ctx'> 		/* the arp must be sent on the selected</div><div class='ctx'> 		* rx channel</div><div class='ctx'> 		*/</div><div class='hunk'>@@ -719,7 +721,7 @@ static struct slave *rlb_arp_xmit(struct sk_buff *skb, struct bonding *bond)</div><div class='ctx'> 			memcpy(arp-&gt;mac_src,tx_slave-&gt;dev-&gt;dev_addr, ETH_ALEN);</div><div class='ctx'> 		}</div><div class='ctx'> 		dprintk("Server sent ARP Reply packet\n");</div><div class='del'>-	} else if (arp-&gt;op_code == __constant_htons(ARPOP_REQUEST)) {</div><div class='add'>+	} else if (arp-&gt;op_code == htons(ARPOP_REQUEST)) {</div><div class='ctx'> 		/* Create an entry in the rx_hashtbl for this client as a</div><div class='ctx'> 		 * place holder.</div><div class='ctx'> 		 * When the arp reply is received the entry will be updated</div><div class='hunk'>@@ -1290,6 +1292,7 @@ int bond_alb_xmit(struct sk_buff *skb, struct net_device *bond_dev)</div><div class='ctx'> 	u32 hash_index = 0;</div><div class='ctx'> 	const u8 *hash_start = NULL;</div><div class='ctx'> 	int res = 1;</div><div class='add'>+	struct ipv6hdr *ip6hdr;</div><div class='ctx'> </div><div class='ctx'> 	skb_reset_mac_header(skb);</div><div class='ctx'> 	eth_data = eth_hdr(skb);</div><div class='hunk'>@@ -1319,11 +1322,32 @@ int bond_alb_xmit(struct sk_buff *skb, struct net_device *bond_dev)</div><div class='ctx'> 	}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ETH_P_IPV6:</div><div class='add'>+		/* IPv6 doesn't really use broadcast mac address, but leave</div><div class='add'>+		 * that here just in case.</div><div class='add'>+		 */</div><div class='ctx'> 		if (memcmp(eth_data-&gt;h_dest, mac_bcast, ETH_ALEN) == 0) {</div><div class='ctx'> 			do_tx_balance = 0;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		/* IPv6 uses all-nodes multicast as an equivalent to</div><div class='add'>+		 * broadcasts in IPv4.</div><div class='add'>+		 */</div><div class='add'>+		if (memcmp(eth_data-&gt;h_dest, mac_v6_allmcast, ETH_ALEN) == 0) {</div><div class='add'>+			do_tx_balance = 0;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Additianally, DAD probes should not be tx-balanced as that</div><div class='add'>+		 * will lead to false positives for duplicate addresses and</div><div class='add'>+		 * prevent address configuration from working.</div><div class='add'>+		 */</div><div class='add'>+		ip6hdr = ipv6_hdr(skb);</div><div class='add'>+		if (ipv6_addr_any(&amp;ip6hdr-&gt;saddr)) {</div><div class='add'>+			do_tx_balance = 0;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		hash_start = (char *)&amp;(ipv6_hdr(skb)-&gt;daddr);</div><div class='ctx'> 		hash_size = sizeof(ipv6_hdr(skb)-&gt;daddr);</div><div class='ctx'> 		break;</div><div class='head'>diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c<br/>index c792138511e6..8e2be24f3fe4 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/bonding/bond_main.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/bonding/bond_main.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/bonding/bond_main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/bonding/bond_main.c</a></div><div class='hunk'>@@ -3702,7 +3702,7 @@ static int bond_xmit_hash_policy_l23(struct sk_buff *skb,</div><div class='ctx'> 	struct ethhdr *data = (struct ethhdr *)skb-&gt;data;</div><div class='ctx'> 	struct iphdr *iph = ip_hdr(skb);</div><div class='ctx'> </div><div class='del'>-	if (skb-&gt;protocol == __constant_htons(ETH_P_IP)) {</div><div class='add'>+	if (skb-&gt;protocol == htons(ETH_P_IP)) {</div><div class='ctx'> 		return ((ntohl(iph-&gt;saddr ^ iph-&gt;daddr) &amp; 0xffff) ^</div><div class='ctx'> 			(data-&gt;h_dest[5] ^ bond_dev-&gt;dev_addr[5])) % count;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3723,8 +3723,8 @@ static int bond_xmit_hash_policy_l34(struct sk_buff *skb,</div><div class='ctx'> 	__be16 *layer4hdr = (__be16 *)((u32 *)iph + iph-&gt;ihl);</div><div class='ctx'> 	int layer4_xor = 0;</div><div class='ctx'> </div><div class='del'>-	if (skb-&gt;protocol == __constant_htons(ETH_P_IP)) {</div><div class='del'>-		if (!(iph-&gt;frag_off &amp; __constant_htons(IP_MF|IP_OFFSET)) &amp;&amp;</div><div class='add'>+	if (skb-&gt;protocol == htons(ETH_P_IP)) {</div><div class='add'>+		if (!(iph-&gt;frag_off &amp; htons(IP_MF|IP_OFFSET)) &amp;&amp;</div><div class='ctx'> 		    (iph-&gt;protocol == IPPROTO_TCP ||</div><div class='ctx'> 		     iph-&gt;protocol == IPPROTO_UDP)) {</div><div class='ctx'> 			layer4_xor = ntohs((*layer4hdr ^ *(layer4hdr + 1)));</div><div class='hunk'>@@ -4493,6 +4493,12 @@ static void bond_ethtool_get_drvinfo(struct net_device *bond_dev,</div><div class='ctx'> </div><div class='ctx'> static const struct ethtool_ops bond_ethtool_ops = {</div><div class='ctx'> 	.get_drvinfo		= bond_ethtool_get_drvinfo,</div><div class='add'>+	.get_link		= ethtool_op_get_link,</div><div class='add'>+	.get_tx_csum		= ethtool_op_get_tx_csum,</div><div class='add'>+	.get_sg			= ethtool_op_get_sg,</div><div class='add'>+	.get_tso		= ethtool_op_get_tso,</div><div class='add'>+	.get_ufo		= ethtool_op_get_ufo,</div><div class='add'>+	.get_flags		= ethtool_op_get_flags,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h<br/>index fb730ec0396f..ffb668dd6d3b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/bonding/bonding.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/bonding/bonding.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/bonding/bonding.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/bonding/bonding.h</a></div><div class='hunk'>@@ -32,7 +32,7 @@</div><div class='ctx'> #ifdef BONDING_DEBUG</div><div class='ctx'> #define dprintk(fmt, args...) \</div><div class='ctx'> 	printk(KERN_DEBUG     \</div><div class='del'>-	       DRV_NAME ": %s() %d: " fmt, __FUNCTION__, __LINE__ , ## args )</div><div class='add'>+	       DRV_NAME ": %s() %d: " fmt, __func__, __LINE__ , ## args )</div><div class='ctx'> #else</div><div class='ctx'> #define dprintk(fmt, args...)</div><div class='ctx'> #endif /* BONDING_DEBUG */</div><div class='hunk'>@@ -333,5 +333,13 @@ void bond_change_active_slave(struct bonding *bond, struct slave *new_active);</div><div class='ctx'> void bond_register_arp(struct bonding *);</div><div class='ctx'> void bond_unregister_arp(struct bonding *);</div><div class='ctx'> </div><div class='add'>+/* exported from bond_main.c */</div><div class='add'>+extern struct list_head bond_dev_list;</div><div class='add'>+extern struct bond_parm_tbl bond_lacp_tbl[];</div><div class='add'>+extern struct bond_parm_tbl bond_mode_tbl[];</div><div class='add'>+extern struct bond_parm_tbl xmit_hashtype_tbl[];</div><div class='add'>+extern struct bond_parm_tbl arp_validate_tbl[];</div><div class='add'>+extern struct bond_parm_tbl fail_over_mac_tbl[];</div><div class='add'>+</div><div class='ctx'> #endif /* _LINUX_BONDING_H */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/cassini.c b/drivers/net/cassini.c<br/>index f1936d51b458..86909cfb14de 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/cassini.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/cassini.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/cassini.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/cassini.c</a></div><div class='hunk'>@@ -74,6 +74,7 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='hunk'>@@ -91,6 +92,7 @@</div><div class='ctx'> #include &lt;linux/ip.h&gt;</div><div class='ctx'> #include &lt;linux/tcp.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/firmware.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;net/checksum.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -197,6 +199,7 @@ static int link_mode;</div><div class='ctx'> MODULE_AUTHOR("Adrian Sun (asun@darksunrising.com)");</div><div class='ctx'> MODULE_DESCRIPTION("Sun Cassini(+) ethernet driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_FIRMWARE("sun/cassini.bin");</div><div class='ctx'> module_param(cassini_debug, int, 0);</div><div class='ctx'> MODULE_PARM_DESC(cassini_debug, "Cassini bitmapped debugging message enable value");</div><div class='ctx'> module_param(link_mode, int, 0);</div><div class='hunk'>@@ -812,9 +815,44 @@ static int cas_reset_mii_phy(struct cas *cp)</div><div class='ctx'> 	return (limit &lt;= 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int cas_saturn_firmware_init(struct cas *cp)</div><div class='add'>+{</div><div class='add'>+	const struct firmware *fw;</div><div class='add'>+	const char fw_name[] = "sun/cassini.bin";</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (PHY_NS_DP83065 != cp-&gt;phy_id)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	err = request_firmware(&amp;fw, fw_name, &amp;cp-&gt;pdev-&gt;dev);</div><div class='add'>+	if (err) {</div><div class='add'>+		printk(KERN_ERR "cassini: Failed to load firmware \"%s\"\n",</div><div class='add'>+		       fw_name);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+	if (fw-&gt;size &lt; 2) {</div><div class='add'>+		printk(KERN_ERR "cassini: bogus length %zu in \"%s\"\n",</div><div class='add'>+		       fw-&gt;size, fw_name);</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	cp-&gt;fw_load_addr= fw-&gt;data[1] &lt;&lt; 8 | fw-&gt;data[0];</div><div class='add'>+	cp-&gt;fw_size = fw-&gt;size - 2;</div><div class='add'>+	cp-&gt;fw_data = vmalloc(cp-&gt;fw_size);</div><div class='add'>+	if (!cp-&gt;fw_data) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		printk(KERN_ERR "cassini: \"%s\" Failed %d\n", fw_name, err);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	memcpy(cp-&gt;fw_data, &amp;fw-&gt;data[2], cp-&gt;fw_size);</div><div class='add'>+out:</div><div class='add'>+	release_firmware(fw);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void cas_saturn_firmware_load(struct cas *cp)</div><div class='ctx'> {</div><div class='del'>-	cas_saturn_patch_t *patch = cas_saturn_patch;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	cas_phy_powerdown(cp);</div><div class='ctx'> </div><div class='hunk'>@@ -833,11 +871,9 @@ static void cas_saturn_firmware_load(struct cas *cp)</div><div class='ctx'> </div><div class='ctx'> 	/* download new firmware */</div><div class='ctx'> 	cas_phy_write(cp, DP83065_MII_MEM, 0x1);</div><div class='del'>-	cas_phy_write(cp, DP83065_MII_REGE, patch-&gt;addr);</div><div class='del'>-	while (patch-&gt;addr) {</div><div class='del'>-		cas_phy_write(cp, DP83065_MII_REGD, patch-&gt;val);</div><div class='del'>-		patch++;</div><div class='del'>-	}</div><div class='add'>+	cas_phy_write(cp, DP83065_MII_REGE, cp-&gt;fw_load_addr);</div><div class='add'>+	for (i = 0; i &lt; cp-&gt;fw_size; i++)</div><div class='add'>+		cas_phy_write(cp, DP83065_MII_REGD, cp-&gt;fw_data[i]);</div><div class='ctx'> </div><div class='ctx'> 	/* enable firmware */</div><div class='ctx'> 	cas_phy_write(cp, DP83065_MII_REGE, 0x8ff8);</div><div class='hunk'>@@ -2182,7 +2218,7 @@ static inline void cas_rx_flow_pkt(struct cas *cp, const u64 *words,</div><div class='ctx'> 	 * do any additional locking here. stick the buffer</div><div class='ctx'> 	 * at the end.</div><div class='ctx'> 	 */</div><div class='del'>-	__skb_insert(skb, flow-&gt;prev, (struct sk_buff *) flow, flow);</div><div class='add'>+	__skb_queue_tail(flow, skb);</div><div class='ctx'> 	if (words[0] &amp; RX_COMP1_RELEASE_FLOW) {</div><div class='ctx'> 		while ((skb = __skb_dequeue(flow))) {</div><div class='ctx'> 			cas_skb_release(skb);</div><div class='hunk'>@@ -5108,6 +5144,9 @@ static int __devinit cas_init_one(struct pci_dev *pdev,</div><div class='ctx'> 	cas_reset(cp, 0);</div><div class='ctx'> 	if (cas_check_invariants(cp))</div><div class='ctx'> 		goto err_out_iounmap;</div><div class='add'>+	if (cp-&gt;cas_flags &amp; CAS_FLAG_SATURN)</div><div class='add'>+		if (cas_saturn_firmware_init(cp))</div><div class='add'>+			goto err_out_iounmap;</div><div class='ctx'> </div><div class='ctx'> 	cp-&gt;init_block = (struct cas_init_block *)</div><div class='ctx'> 		pci_alloc_consistent(pdev, sizeof(struct cas_init_block),</div><div class='hunk'>@@ -5217,6 +5256,9 @@ static void __devexit cas_remove_one(struct pci_dev *pdev)</div><div class='ctx'> 	cp = netdev_priv(dev);</div><div class='ctx'> 	unregister_netdev(dev);</div><div class='ctx'> </div><div class='add'>+	if (cp-&gt;fw_data)</div><div class='add'>+		vfree(cp-&gt;fw_data);</div><div class='add'>+</div><div class='ctx'> 	mutex_lock(&amp;cp-&gt;pm_mutex);</div><div class='ctx'> 	flush_scheduled_work();</div><div class='ctx'> 	if (cp-&gt;hw_running)</div><div class='head'>diff --git a/drivers/net/cassini.h b/drivers/net/cassini.h<br/>index 552af89ca1cf..fd17a002b453 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/cassini.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/cassini.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/cassini.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/cassini.h</a></div><div class='hunk'>@@ -2514,1523 +2514,6 @@ static cas_hp_inst_t cas_prog_null[] = { {NULL} };</div><div class='ctx'> #define CAS_HP_FIRMWARE               cas_prog_null</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-/* firmware patch for NS_DP83065 */</div><div class='del'>-typedef struct cas_saturn_patch {</div><div class='del'>-	u16 addr;</div><div class='del'>-	u16 val;</div><div class='del'>-} cas_saturn_patch_t;</div><div class='del'>-</div><div class='del'>-#if 1</div><div class='del'>-cas_saturn_patch_t cas_saturn_patch[] = {</div><div class='del'>-{0x8200,    0x007e}, {0x8201,    0x0082}, {0x8202,    0x0009},</div><div class='del'>-{0x8203,    0x0000}, {0x8204,    0x0000}, {0x8205,    0x0000},</div><div class='del'>-{0x8206,    0x0000}, {0x8207,    0x0000}, {0x8208,    0x0000},</div><div class='del'>-{0x8209,    0x008e}, {0x820a,    0x008e}, {0x820b,    0x00ff},</div><div class='del'>-{0x820c,    0x00ce}, {0x820d,    0x0082}, {0x820e,    0x0025},</div><div class='del'>-{0x820f,    0x00ff}, {0x8210,    0x0001}, {0x8211,    0x000f},</div><div class='del'>-{0x8212,    0x00ce}, {0x8213,    0x0084}, {0x8214,    0x0026},</div><div class='del'>-{0x8215,    0x00ff}, {0x8216,    0x0001}, {0x8217,    0x0011},</div><div class='del'>-{0x8218,    0x00ce}, {0x8219,    0x0085}, {0x821a,    0x003d},</div><div class='del'>-{0x821b,    0x00df}, {0x821c,    0x00e5}, {0x821d,    0x0086},</div><div class='del'>-{0x821e,    0x0039}, {0x821f,    0x00b7}, {0x8220,    0x008f},</div><div class='del'>-{0x8221,    0x00f8}, {0x8222,    0x007e}, {0x8223,    0x00c3},</div><div class='del'>-{0x8224,    0x00c2}, {0x8225,    0x0096}, {0x8226,    0x0047},</div><div class='del'>-{0x8227,    0x0084}, {0x8228,    0x00f3}, {0x8229,    0x008a},</div><div class='del'>-{0x822a,    0x0000}, {0x822b,    0x0097}, {0x822c,    0x0047},</div><div class='del'>-{0x822d,    0x00ce}, {0x822e,    0x0082}, {0x822f,    0x0033},</div><div class='del'>-{0x8230,    0x00ff}, {0x8231,    0x0001}, {0x8232,    0x000f},</div><div class='del'>-{0x8233,    0x0096}, {0x8234,    0x0046}, {0x8235,    0x0084},</div><div class='del'>-{0x8236,    0x000c}, {0x8237,    0x0081}, {0x8238,    0x0004},</div><div class='del'>-{0x8239,    0x0027}, {0x823a,    0x000b}, {0x823b,    0x0096},</div><div class='del'>-{0x823c,    0x0046}, {0x823d,    0x0084}, {0x823e,    0x000c},</div><div class='del'>-{0x823f,    0x0081}, {0x8240,    0x0008}, {0x8241,    0x0027},</div><div class='del'>-{0x8242,    0x0057}, {0x8243,    0x007e}, {0x8244,    0x0084},</div><div class='del'>-{0x8245,    0x0025}, {0x8246,    0x0096}, {0x8247,    0x0047},</div><div class='del'>-{0x8248,    0x0084}, {0x8249,    0x00f3}, {0x824a,    0x008a},</div><div class='del'>-{0x824b,    0x0004}, {0x824c,    0x0097}, {0x824d,    0x0047},</div><div class='del'>-{0x824e,    0x00ce}, {0x824f,    0x0082}, {0x8250,    0x0054},</div><div class='del'>-{0x8251,    0x00ff}, {0x8252,    0x0001}, {0x8253,    0x000f},</div><div class='del'>-{0x8254,    0x0096}, {0x8255,    0x0046}, {0x8256,    0x0084},</div><div class='del'>-{0x8257,    0x000c}, {0x8258,    0x0081}, {0x8259,    0x0004},</div><div class='del'>-{0x825a,    0x0026}, {0x825b,    0x0038}, {0x825c,    0x00b6},</div><div class='del'>-{0x825d,    0x0012}, {0x825e,    0x0020}, {0x825f,    0x0084},</div><div class='del'>-{0x8260,    0x0020}, {0x8261,    0x0026}, {0x8262,    0x0003},</div><div class='del'>-{0x8263,    0x007e}, {0x8264,    0x0084}, {0x8265,    0x0025},</div><div class='del'>-{0x8266,    0x0096}, {0x8267,    0x007b}, {0x8268,    0x00d6},</div><div class='del'>-{0x8269,    0x007c}, {0x826a,    0x00fe}, {0x826b,    0x008f},</div><div class='del'>-{0x826c,    0x0056}, {0x826d,    0x00bd}, {0x826e,    0x00f7},</div><div class='del'>-{0x826f,    0x00b6}, {0x8270,    0x00fe}, {0x8271,    0x008f},</div><div class='del'>-{0x8272,    0x004e}, {0x8273,    0x00bd}, {0x8274,    0x00ec},</div><div class='del'>-{0x8275,    0x008e}, {0x8276,    0x00bd}, {0x8277,    0x00fa},</div><div class='del'>-{0x8278,    0x00f7}, {0x8279,    0x00bd}, {0x827a,    0x00f7},</div><div class='del'>-{0x827b,    0x0028}, {0x827c,    0x00ce}, {0x827d,    0x0082},</div><div class='del'>-{0x827e,    0x0082}, {0x827f,    0x00ff}, {0x8280,    0x0001},</div><div class='del'>-{0x8281,    0x000f}, {0x8282,    0x0096}, {0x8283,    0x0046},</div><div class='del'>-{0x8284,    0x0084}, {0x8285,    0x000c}, {0x8286,    0x0081},</div><div class='del'>-{0x8287,    0x0004}, {0x8288,    0x0026}, {0x8289,    0x000a},</div><div class='del'>-{0x828a,    0x00b6}, {0x828b,    0x0012}, {0x828c,    0x0020},</div><div class='del'>-{0x828d,    0x0084}, {0x828e,    0x0020}, {0x828f,    0x0027},</div><div class='del'>-{0x8290,    0x00b5}, {0x8291,    0x007e}, {0x8292,    0x0084},</div><div class='del'>-{0x8293,    0x0025}, {0x8294,    0x00bd}, {0x8295,    0x00f7},</div><div class='del'>-{0x8296,    0x001f}, {0x8297,    0x007e}, {0x8298,    0x0084},</div><div class='del'>-{0x8299,    0x001f}, {0x829a,    0x0096}, {0x829b,    0x0047},</div><div class='del'>-{0x829c,    0x0084}, {0x829d,    0x00f3}, {0x829e,    0x008a},</div><div class='del'>-{0x829f,    0x0008}, {0x82a0,    0x0097}, {0x82a1,    0x0047},</div><div class='del'>-{0x82a2,    0x00de}, {0x82a3,    0x00e1}, {0x82a4,    0x00ad},</div><div class='del'>-{0x82a5,    0x0000}, {0x82a6,    0x00ce}, {0x82a7,    0x0082},</div><div class='del'>-{0x82a8,    0x00af}, {0x82a9,    0x00ff}, {0x82aa,    0x0001},</div><div class='del'>-{0x82ab,    0x000f}, {0x82ac,    0x007e}, {0x82ad,    0x0084},</div><div class='del'>-{0x82ae,    0x0025}, {0x82af,    0x0096}, {0x82b0,    0x0041},</div><div class='del'>-{0x82b1,    0x0085}, {0x82b2,    0x0010}, {0x82b3,    0x0026},</div><div class='del'>-{0x82b4,    0x0006}, {0x82b5,    0x0096}, {0x82b6,    0x0023},</div><div class='del'>-{0x82b7,    0x0085}, {0x82b8,    0x0040}, {0x82b9,    0x0027},</div><div class='del'>-{0x82ba,    0x0006}, {0x82bb,    0x00bd}, {0x82bc,    0x00ed},</div><div class='del'>-{0x82bd,    0x0000}, {0x82be,    0x007e}, {0x82bf,    0x0083},</div><div class='del'>-{0x82c0,    0x00a2}, {0x82c1,    0x00de}, {0x82c2,    0x0042},</div><div class='del'>-{0x82c3,    0x00bd}, {0x82c4,    0x00eb}, {0x82c5,    0x008e},</div><div class='del'>-{0x82c6,    0x0096}, {0x82c7,    0x0024}, {0x82c8,    0x0084},</div><div class='del'>-{0x82c9,    0x0008}, {0x82ca,    0x0027}, {0x82cb,    0x0003},</div><div class='del'>-{0x82cc,    0x007e}, {0x82cd,    0x0083}, {0x82ce,    0x00df},</div><div class='del'>-{0x82cf,    0x0096}, {0x82d0,    0x007b}, {0x82d1,    0x00d6},</div><div class='del'>-{0x82d2,    0x007c}, {0x82d3,    0x00fe}, {0x82d4,    0x008f},</div><div class='del'>-{0x82d5,    0x0056}, {0x82d6,    0x00bd}, {0x82d7,    0x00f7},</div><div class='del'>-{0x82d8,    0x00b6}, {0x82d9,    0x00fe}, {0x82da,    0x008f},</div><div class='del'>-{0x82db,    0x0050}, {0x82dc,    0x00bd}, {0x82dd,    0x00ec},</div><div class='del'>-{0x82de,    0x008e}, {0x82df,    0x00bd}, {0x82e0,    0x00fa},</div><div class='del'>-{0x82e1,    0x00f7}, {0x82e2,    0x0086}, {0x82e3,    0x0011},</div><div class='del'>-{0x82e4,    0x00c6}, {0x82e5,    0x0049}, {0x82e6,    0x00bd},</div><div class='del'>-{0x82e7,    0x00e4}, {0x82e8,    0x0012}, {0x82e9,    0x00ce},</div><div class='del'>-{0x82ea,    0x0082}, {0x82eb,    0x00ef}, {0x82ec,    0x00ff},</div><div class='del'>-{0x82ed,    0x0001}, {0x82ee,    0x000f}, {0x82ef,    0x0096},</div><div class='del'>-{0x82f0,    0x0046}, {0x82f1,    0x0084}, {0x82f2,    0x000c},</div><div class='del'>-{0x82f3,    0x0081}, {0x82f4,    0x0000}, {0x82f5,    0x0027},</div><div class='del'>-{0x82f6,    0x0017}, {0x82f7,    0x00c6}, {0x82f8,    0x0049},</div><div class='del'>-{0x82f9,    0x00bd}, {0x82fa,    0x00e4}, {0x82fb,    0x0091},</div><div class='del'>-{0x82fc,    0x0024}, {0x82fd,    0x000d}, {0x82fe,    0x00b6},</div><div class='del'>-{0x82ff,    0x0012}, {0x8300,    0x0020}, {0x8301,    0x0085},</div><div class='del'>-{0x8302,    0x0020}, {0x8303,    0x0026}, {0x8304,    0x000c},</div><div class='del'>-{0x8305,    0x00ce}, {0x8306,    0x0082}, {0x8307,    0x00c1},</div><div class='del'>-{0x8308,    0x00ff}, {0x8309,    0x0001}, {0x830a,    0x000f},</div><div class='del'>-{0x830b,    0x007e}, {0x830c,    0x0084}, {0x830d,    0x0025},</div><div class='del'>-{0x830e,    0x007e}, {0x830f,    0x0084}, {0x8310,    0x0016},</div><div class='del'>-{0x8311,    0x00fe}, {0x8312,    0x008f}, {0x8313,    0x0052},</div><div class='del'>-{0x8314,    0x00bd}, {0x8315,    0x00ec}, {0x8316,    0x008e},</div><div class='del'>-{0x8317,    0x00bd}, {0x8318,    0x00fa}, {0x8319,    0x00f7},</div><div class='del'>-{0x831a,    0x0086}, {0x831b,    0x006a}, {0x831c,    0x00c6},</div><div class='del'>-{0x831d,    0x0049}, {0x831e,    0x00bd}, {0x831f,    0x00e4},</div><div class='del'>-{0x8320,    0x0012}, {0x8321,    0x00ce}, {0x8322,    0x0083},</div><div class='del'>-{0x8323,    0x0027}, {0x8324,    0x00ff}, {0x8325,    0x0001},</div><div class='del'>-{0x8326,    0x000f}, {0x8327,    0x0096}, {0x8328,    0x0046},</div><div class='del'>-{0x8329,    0x0084}, {0x832a,    0x000c}, {0x832b,    0x0081},</div><div class='del'>-{0x832c,    0x0000}, {0x832d,    0x0027}, {0x832e,    0x000a},</div><div class='del'>-{0x832f,    0x00c6}, {0x8330,    0x0049}, {0x8331,    0x00bd},</div><div class='del'>-{0x8332,    0x00e4}, {0x8333,    0x0091}, {0x8334,    0x0025},</div><div class='del'>-{0x8335,    0x0006}, {0x8336,    0x007e}, {0x8337,    0x0084},</div><div class='del'>-{0x8338,    0x0025}, {0x8339,    0x007e}, {0x833a,    0x0084},</div><div class='del'>-{0x833b,    0x0016}, {0x833c,    0x00b6}, {0x833d,    0x0018},</div><div class='del'>-{0x833e,    0x0070}, {0x833f,    0x00bb}, {0x8340,    0x0019},</div><div class='del'>-{0x8341,    0x0070}, {0x8342,    0x002a}, {0x8343,    0x0004},</div><div class='del'>-{0x8344,    0x0081}, {0x8345,    0x00af}, {0x8346,    0x002e},</div><div class='del'>-{0x8347,    0x0019}, {0x8348,    0x0096}, {0x8349,    0x007b},</div><div class='del'>-{0x834a,    0x00f6}, {0x834b,    0x0020}, {0x834c,    0x0007},</div><div class='del'>-{0x834d,    0x00fa}, {0x834e,    0x0020}, {0x834f,    0x0027},</div><div class='del'>-{0x8350,    0x00c4}, {0x8351,    0x0038}, {0x8352,    0x0081},</div><div class='del'>-{0x8353,    0x0038}, {0x8354,    0x0027}, {0x8355,    0x000b},</div><div class='del'>-{0x8356,    0x00f6}, {0x8357,    0x0020}, {0x8358,    0x0007},</div><div class='del'>-{0x8359,    0x00fa}, {0x835a,    0x0020}, {0x835b,    0x0027},</div><div class='del'>-{0x835c,    0x00cb}, {0x835d,    0x0008}, {0x835e,    0x007e},</div><div class='del'>-{0x835f,    0x0082}, {0x8360,    0x00d3}, {0x8361,    0x00bd},</div><div class='del'>-{0x8362,    0x00f7}, {0x8363,    0x0066}, {0x8364,    0x0086},</div><div class='del'>-{0x8365,    0x0074}, {0x8366,    0x00c6}, {0x8367,    0x0049},</div><div class='del'>-{0x8368,    0x00bd}, {0x8369,    0x00e4}, {0x836a,    0x0012},</div><div class='del'>-{0x836b,    0x00ce}, {0x836c,    0x0083}, {0x836d,    0x0071},</div><div class='del'>-{0x836e,    0x00ff}, {0x836f,    0x0001}, {0x8370,    0x000f},</div><div class='del'>-{0x8371,    0x0096}, {0x8372,    0x0046}, {0x8373,    0x0084},</div><div class='del'>-{0x8374,    0x000c}, {0x8375,    0x0081}, {0x8376,    0x0008},</div><div class='del'>-{0x8377,    0x0026}, {0x8378,    0x000a}, {0x8379,    0x00c6},</div><div class='del'>-{0x837a,    0x0049}, {0x837b,    0x00bd}, {0x837c,    0x00e4},</div><div class='del'>-{0x837d,    0x0091}, {0x837e,    0x0025}, {0x837f,    0x0006},</div><div class='del'>-{0x8380,    0x007e}, {0x8381,    0x0084}, {0x8382,    0x0025},</div><div class='del'>-{0x8383,    0x007e}, {0x8384,    0x0084}, {0x8385,    0x0016},</div><div class='del'>-{0x8386,    0x00bd}, {0x8387,    0x00f7}, {0x8388,    0x003e},</div><div class='del'>-{0x8389,    0x0026}, {0x838a,    0x000e}, {0x838b,    0x00bd},</div><div class='del'>-{0x838c,    0x00e5}, {0x838d,    0x0009}, {0x838e,    0x0026},</div><div class='del'>-{0x838f,    0x0006}, {0x8390,    0x00ce}, {0x8391,    0x0082},</div><div class='del'>-{0x8392,    0x00c1}, {0x8393,    0x00ff}, {0x8394,    0x0001},</div><div class='del'>-{0x8395,    0x000f}, {0x8396,    0x007e}, {0x8397,    0x0084},</div><div class='del'>-{0x8398,    0x0025}, {0x8399,    0x00fe}, {0x839a,    0x008f},</div><div class='del'>-{0x839b,    0x0054}, {0x839c,    0x00bd}, {0x839d,    0x00ec},</div><div class='del'>-{0x839e,    0x008e}, {0x839f,    0x00bd}, {0x83a0,    0x00fa},</div><div class='del'>-{0x83a1,    0x00f7}, {0x83a2,    0x00bd}, {0x83a3,    0x00f7},</div><div class='del'>-{0x83a4,    0x0033}, {0x83a5,    0x0086}, {0x83a6,    0x000f},</div><div class='del'>-{0x83a7,    0x00c6}, {0x83a8,    0x0051}, {0x83a9,    0x00bd},</div><div class='del'>-{0x83aa,    0x00e4}, {0x83ab,    0x0012}, {0x83ac,    0x00ce},</div><div class='del'>-{0x83ad,    0x0083}, {0x83ae,    0x00b2}, {0x83af,    0x00ff},</div><div class='del'>-{0x83b0,    0x0001}, {0x83b1,    0x000f}, {0x83b2,    0x0096},</div><div class='del'>-{0x83b3,    0x0046}, {0x83b4,    0x0084}, {0x83b5,    0x000c},</div><div class='del'>-{0x83b6,    0x0081}, {0x83b7,    0x0008}, {0x83b8,    0x0026},</div><div class='del'>-{0x83b9,    0x005c}, {0x83ba,    0x00b6}, {0x83bb,    0x0012},</div><div class='del'>-{0x83bc,    0x0020}, {0x83bd,    0x0084}, {0x83be,    0x003f},</div><div class='del'>-{0x83bf,    0x0081}, {0x83c0,    0x003a}, {0x83c1,    0x0027},</div><div class='del'>-{0x83c2,    0x001c}, {0x83c3,    0x0096}, {0x83c4,    0x0023},</div><div class='del'>-{0x83c5,    0x0085}, {0x83c6,    0x0040}, {0x83c7,    0x0027},</div><div class='del'>-{0x83c8,    0x0003}, {0x83c9,    0x007e}, {0x83ca,    0x0084},</div><div class='del'>-{0x83cb,    0x0025}, {0x83cc,    0x00c6}, {0x83cd,    0x0051},</div><div class='del'>-{0x83ce,    0x00bd}, {0x83cf,    0x00e4}, {0x83d0,    0x0091},</div><div class='del'>-{0x83d1,    0x0025}, {0x83d2,    0x0003}, {0x83d3,    0x007e},</div><div class='del'>-{0x83d4,    0x0084}, {0x83d5,    0x0025}, {0x83d6,    0x00ce},</div><div class='del'>-{0x83d7,    0x0082}, {0x83d8,    0x00c1}, {0x83d9,    0x00ff},</div><div class='del'>-{0x83da,    0x0001}, {0x83db,    0x000f}, {0x83dc,    0x007e},</div><div class='del'>-{0x83dd,    0x0084}, {0x83de,    0x0025}, {0x83df,    0x00bd},</div><div class='del'>-{0x83e0,    0x00f8}, {0x83e1,    0x0037}, {0x83e2,    0x007c},</div><div class='del'>-{0x83e3,    0x0000}, {0x83e4,    0x007a}, {0x83e5,    0x00ce},</div><div class='del'>-{0x83e6,    0x0083}, {0x83e7,    0x00ee}, {0x83e8,    0x00ff},</div><div class='del'>-{0x83e9,    0x0001}, {0x83ea,    0x000f}, {0x83eb,    0x007e},</div><div class='del'>-{0x83ec,    0x0084}, {0x83ed,    0x0025}, {0x83ee,    0x0096},</div><div class='del'>-{0x83ef,    0x0046}, {0x83f0,    0x0084}, {0x83f1,    0x000c},</div><div class='del'>-{0x83f2,    0x0081}, {0x83f3,    0x0008}, {0x83f4,    0x0026},</div><div class='del'>-{0x83f5,    0x0020}, {0x83f6,    0x0096}, {0x83f7,    0x0024},</div><div class='del'>-{0x83f8,    0x0084}, {0x83f9,    0x0008}, {0x83fa,    0x0026},</div><div class='del'>-{0x83fb,    0x0029}, {0x83fc,    0x00b6}, {0x83fd,    0x0018},</div><div class='del'>-{0x83fe,    0x0082}, {0x83ff,    0x00bb}, {0x8400,    0x0019},</div><div class='del'>-{0x8401,    0x0082}, {0x8402,    0x00b1}, {0x8403,    0x0001},</div><div class='del'>-{0x8404,    0x003b}, {0x8405,    0x0022}, {0x8406,    0x0009},</div><div class='del'>-{0x8407,    0x00b6}, {0x8408,    0x0012}, {0x8409,    0x0020},</div><div class='del'>-{0x840a,    0x0084}, {0x840b,    0x0037}, {0x840c,    0x0081},</div><div class='del'>-{0x840d,    0x0032}, {0x840e,    0x0027}, {0x840f,    0x0015},</div><div class='del'>-{0x8410,    0x00bd}, {0x8411,    0x00f8}, {0x8412,    0x0044},</div><div class='del'>-{0x8413,    0x007e}, {0x8414,    0x0082}, {0x8415,    0x00c1},</div><div class='del'>-{0x8416,    0x00bd}, {0x8417,    0x00f7}, {0x8418,    0x001f},</div><div class='del'>-{0x8419,    0x00bd}, {0x841a,    0x00f8}, {0x841b,    0x0044},</div><div class='del'>-{0x841c,    0x00bd}, {0x841d,    0x00fc}, {0x841e,    0x0029},</div><div class='del'>-{0x841f,    0x00ce}, {0x8420,    0x0082}, {0x8421,    0x0025},</div><div class='del'>-{0x8422,    0x00ff}, {0x8423,    0x0001}, {0x8424,    0x000f},</div><div class='del'>-{0x8425,    0x0039}, {0x8426,    0x0096}, {0x8427,    0x0047},</div><div class='del'>-{0x8428,    0x0084}, {0x8429,    0x00fc}, {0x842a,    0x008a},</div><div class='del'>-{0x842b,    0x0000}, {0x842c,    0x0097}, {0x842d,    0x0047},</div><div class='del'>-{0x842e,    0x00ce}, {0x842f,    0x0084}, {0x8430,    0x0034},</div><div class='del'>-{0x8431,    0x00ff}, {0x8432,    0x0001}, {0x8433,    0x0011},</div><div class='del'>-{0x8434,    0x0096}, {0x8435,    0x0046}, {0x8436,    0x0084},</div><div class='del'>-{0x8437,    0x0003}, {0x8438,    0x0081}, {0x8439,    0x0002},</div><div class='del'>-{0x843a,    0x0027}, {0x843b,    0x0003}, {0x843c,    0x007e},</div><div class='del'>-{0x843d,    0x0085}, {0x843e,    0x001e}, {0x843f,    0x0096},</div><div class='del'>-{0x8440,    0x0047}, {0x8441,    0x0084}, {0x8442,    0x00fc},</div><div class='del'>-{0x8443,    0x008a}, {0x8444,    0x0002}, {0x8445,    0x0097},</div><div class='del'>-{0x8446,    0x0047}, {0x8447,    0x00de}, {0x8448,    0x00e1},</div><div class='del'>-{0x8449,    0x00ad}, {0x844a,    0x0000}, {0x844b,    0x0086},</div><div class='del'>-{0x844c,    0x0001}, {0x844d,    0x00b7}, {0x844e,    0x0012},</div><div class='del'>-{0x844f,    0x0051}, {0x8450,    0x00bd}, {0x8451,    0x00f7},</div><div class='del'>-{0x8452,    0x0014}, {0x8453,    0x00b6}, {0x8454,    0x0010},</div><div class='del'>-{0x8455,    0x0031}, {0x8456,    0x0084}, {0x8457,    0x00fd},</div><div class='del'>-{0x8458,    0x00b7}, {0x8459,    0x0010}, {0x845a,    0x0031},</div><div class='del'>-{0x845b,    0x00bd}, {0x845c,    0x00f8}, {0x845d,    0x001e},</div><div class='del'>-{0x845e,    0x0096}, {0x845f,    0x0081}, {0x8460,    0x00d6},</div><div class='del'>-{0x8461,    0x0082}, {0x8462,    0x00fe}, {0x8463,    0x008f},</div><div class='del'>-{0x8464,    0x005a}, {0x8465,    0x00bd}, {0x8466,    0x00f7},</div><div class='del'>-{0x8467,    0x00b6}, {0x8468,    0x00fe}, {0x8469,    0x008f},</div><div class='del'>-{0x846a,    0x005c}, {0x846b,    0x00bd}, {0x846c,    0x00ec},</div><div class='del'>-{0x846d,    0x008e}, {0x846e,    0x00bd}, {0x846f,    0x00fa},</div><div class='del'>-{0x8470,    0x00f7}, {0x8471,    0x0086}, {0x8472,    0x0008},</div><div class='del'>-{0x8473,    0x00d6}, {0x8474,    0x0000}, {0x8475,    0x00c5},</div><div class='del'>-{0x8476,    0x0010}, {0x8477,    0x0026}, {0x8478,    0x0002},</div><div class='del'>-{0x8479,    0x008b}, {0x847a,    0x0020}, {0x847b,    0x00c6},</div><div class='del'>-{0x847c,    0x0051}, {0x847d,    0x00bd}, {0x847e,    0x00e4},</div><div class='del'>-{0x847f,    0x0012}, {0x8480,    0x00ce}, {0x8481,    0x0084},</div><div class='del'>-{0x8482,    0x0086}, {0x8483,    0x00ff}, {0x8484,    0x0001},</div><div class='del'>-{0x8485,    0x0011}, {0x8486,    0x0096}, {0x8487,    0x0046},</div><div class='del'>-{0x8488,    0x0084}, {0x8489,    0x0003}, {0x848a,    0x0081},</div><div class='del'>-{0x848b,    0x0002}, {0x848c,    0x0027}, {0x848d,    0x0003},</div><div class='del'>-{0x848e,    0x007e}, {0x848f,    0x0085}, {0x8490,    0x000f},</div><div class='del'>-{0x8491,    0x00c6}, {0x8492,    0x0051}, {0x8493,    0x00bd},</div><div class='del'>-{0x8494,    0x00e4}, {0x8495,    0x0091}, {0x8496,    0x0025},</div><div class='del'>-{0x8497,    0x0003}, {0x8498,    0x007e}, {0x8499,    0x0085},</div><div class='del'>-{0x849a,    0x001e}, {0x849b,    0x0096}, {0x849c,    0x0044},</div><div class='del'>-{0x849d,    0x0085}, {0x849e,    0x0010}, {0x849f,    0x0026},</div><div class='del'>-{0x84a0,    0x000a}, {0x84a1,    0x00b6}, {0x84a2,    0x0012},</div><div class='del'>-{0x84a3,    0x0050}, {0x84a4,    0x00ba}, {0x84a5,    0x0001},</div><div class='del'>-{0x84a6,    0x003c}, {0x84a7,    0x0085}, {0x84a8,    0x0010},</div><div class='del'>-{0x84a9,    0x0027}, {0x84aa,    0x00a8}, {0x84ab,    0x00bd},</div><div class='del'>-{0x84ac,    0x00f7}, {0x84ad,    0x0066}, {0x84ae,    0x00ce},</div><div class='del'>-{0x84af,    0x0084}, {0x84b0,    0x00b7}, {0x84b1,    0x00ff},</div><div class='del'>-{0x84b2,    0x0001}, {0x84b3,    0x0011}, {0x84b4,    0x007e},</div><div class='del'>-{0x84b5,    0x0085}, {0x84b6,    0x001e}, {0x84b7,    0x0096},</div><div class='del'>-{0x84b8,    0x0046}, {0x84b9,    0x0084}, {0x84ba,    0x0003},</div><div class='del'>-{0x84bb,    0x0081}, {0x84bc,    0x0002}, {0x84bd,    0x0026},</div><div class='del'>-{0x84be,    0x0050}, {0x84bf,    0x00b6}, {0x84c0,    0x0012},</div><div class='del'>-{0x84c1,    0x0030}, {0x84c2,    0x0084}, {0x84c3,    0x0003},</div><div class='del'>-{0x84c4,    0x0081}, {0x84c5,    0x0001}, {0x84c6,    0x0027},</div><div class='del'>-{0x84c7,    0x0003}, {0x84c8,    0x007e}, {0x84c9,    0x0085},</div><div class='del'>-{0x84ca,    0x001e}, {0x84cb,    0x0096}, {0x84cc,    0x0044},</div><div class='del'>-{0x84cd,    0x0085}, {0x84ce,    0x0010}, {0x84cf,    0x0026},</div><div class='del'>-{0x84d0,    0x0013}, {0x84d1,    0x00b6}, {0x84d2,    0x0012},</div><div class='del'>-{0x84d3,    0x0050}, {0x84d4,    0x00ba}, {0x84d5,    0x0001},</div><div class='del'>-{0x84d6,    0x003c}, {0x84d7,    0x0085}, {0x84d8,    0x0010},</div><div class='del'>-{0x84d9,    0x0026}, {0x84da,    0x0009}, {0x84db,    0x00ce},</div><div class='del'>-{0x84dc,    0x0084}, {0x84dd,    0x0053}, {0x84de,    0x00ff},</div><div class='del'>-{0x84df,    0x0001}, {0x84e0,    0x0011}, {0x84e1,    0x007e},</div><div class='del'>-{0x84e2,    0x0085}, {0x84e3,    0x001e}, {0x84e4,    0x00b6},</div><div class='del'>-{0x84e5,    0x0010}, {0x84e6,    0x0031}, {0x84e7,    0x008a},</div><div class='del'>-{0x84e8,    0x0002}, {0x84e9,    0x00b7}, {0x84ea,    0x0010},</div><div class='del'>-{0x84eb,    0x0031}, {0x84ec,    0x00bd}, {0x84ed,    0x0085},</div><div class='del'>-{0x84ee,    0x001f}, {0x84ef,    0x00bd}, {0x84f0,    0x00f8},</div><div class='del'>-{0x84f1,    0x0037}, {0x84f2,    0x007c}, {0x84f3,    0x0000},</div><div class='del'>-{0x84f4,    0x0080}, {0x84f5,    0x00ce}, {0x84f6,    0x0084},</div><div class='del'>-{0x84f7,    0x00fe}, {0x84f8,    0x00ff}, {0x84f9,    0x0001},</div><div class='del'>-{0x84fa,    0x0011}, {0x84fb,    0x007e}, {0x84fc,    0x0085},</div><div class='del'>-{0x84fd,    0x001e}, {0x84fe,    0x0096}, {0x84ff,    0x0046},</div><div class='del'>-{0x8500,    0x0084}, {0x8501,    0x0003}, {0x8502,    0x0081},</div><div class='del'>-{0x8503,    0x0002}, {0x8504,    0x0026}, {0x8505,    0x0009},</div><div class='del'>-{0x8506,    0x00b6}, {0x8507,    0x0012}, {0x8508,    0x0030},</div><div class='del'>-{0x8509,    0x0084}, {0x850a,    0x0003}, {0x850b,    0x0081},</div><div class='del'>-{0x850c,    0x0001}, {0x850d,    0x0027}, {0x850e,    0x000f},</div><div class='del'>-{0x850f,    0x00bd}, {0x8510,    0x00f8}, {0x8511,    0x0044},</div><div class='del'>-{0x8512,    0x00bd}, {0x8513,    0x00f7}, {0x8514,    0x000b},</div><div class='del'>-{0x8515,    0x00bd}, {0x8516,    0x00fc}, {0x8517,    0x0029},</div><div class='del'>-{0x8518,    0x00ce}, {0x8519,    0x0084}, {0x851a,    0x0026},</div><div class='del'>-{0x851b,    0x00ff}, {0x851c,    0x0001}, {0x851d,    0x0011},</div><div class='del'>-{0x851e,    0x0039}, {0x851f,    0x00d6}, {0x8520,    0x0022},</div><div class='del'>-{0x8521,    0x00c4}, {0x8522,    0x000f}, {0x8523,    0x00b6},</div><div class='del'>-{0x8524,    0x0012}, {0x8525,    0x0030}, {0x8526,    0x00ba},</div><div class='del'>-{0x8527,    0x0012}, {0x8528,    0x0032}, {0x8529,    0x0084},</div><div class='del'>-{0x852a,    0x0004}, {0x852b,    0x0027}, {0x852c,    0x000d},</div><div class='del'>-{0x852d,    0x0096}, {0x852e,    0x0022}, {0x852f,    0x0085},</div><div class='del'>-{0x8530,    0x0004}, {0x8531,    0x0027}, {0x8532,    0x0005},</div><div class='del'>-{0x8533,    0x00ca}, {0x8534,    0x0010}, {0x8535,    0x007e},</div><div class='del'>-{0x8536,    0x0085}, {0x8537,    0x003a}, {0x8538,    0x00ca},</div><div class='del'>-{0x8539,    0x0020}, {0x853a,    0x00d7}, {0x853b,    0x0022},</div><div class='del'>-{0x853c,    0x0039}, {0x853d,    0x0086}, {0x853e,    0x0000},</div><div class='del'>-{0x853f,    0x0097}, {0x8540,    0x0083}, {0x8541,    0x0018},</div><div class='del'>-{0x8542,    0x00ce}, {0x8543,    0x001c}, {0x8544,    0x0000},</div><div class='del'>-{0x8545,    0x00bd}, {0x8546,    0x00eb}, {0x8547,    0x0046},</div><div class='del'>-{0x8548,    0x0096}, {0x8549,    0x0057}, {0x854a,    0x0085},</div><div class='del'>-{0x854b,    0x0001}, {0x854c,    0x0027}, {0x854d,    0x0002},</div><div class='del'>-{0x854e,    0x004f}, {0x854f,    0x0039}, {0x8550,    0x0085},</div><div class='del'>-{0x8551,    0x0002}, {0x8552,    0x0027}, {0x8553,    0x0001},</div><div class='del'>-{0x8554,    0x0039}, {0x8555,    0x007f}, {0x8556,    0x008f},</div><div class='del'>-{0x8557,    0x007d}, {0x8558,    0x0086}, {0x8559,    0x0004},</div><div class='del'>-{0x855a,    0x00b7}, {0x855b,    0x0012}, {0x855c,    0x0004},</div><div class='del'>-{0x855d,    0x0086}, {0x855e,    0x0008}, {0x855f,    0x00b7},</div><div class='del'>-{0x8560,    0x0012}, {0x8561,    0x0007}, {0x8562,    0x0086},</div><div class='del'>-{0x8563,    0x0010}, {0x8564,    0x00b7}, {0x8565,    0x0012},</div><div class='del'>-{0x8566,    0x000c}, {0x8567,    0x0086}, {0x8568,    0x0007},</div><div class='del'>-{0x8569,    0x00b7}, {0x856a,    0x0012}, {0x856b,    0x0006},</div><div class='del'>-{0x856c,    0x00b6}, {0x856d,    0x008f}, {0x856e,    0x007d},</div><div class='del'>-{0x856f,    0x00b7}, {0x8570,    0x0012}, {0x8571,    0x0070},</div><div class='del'>-{0x8572,    0x0086}, {0x8573,    0x0001}, {0x8574,    0x00ba},</div><div class='del'>-{0x8575,    0x0012}, {0x8576,    0x0004}, {0x8577,    0x00b7},</div><div class='del'>-{0x8578,    0x0012}, {0x8579,    0x0004}, {0x857a,    0x0001},</div><div class='del'>-{0x857b,    0x0001}, {0x857c,    0x0001}, {0x857d,    0x0001},</div><div class='del'>-{0x857e,    0x0001}, {0x857f,    0x0001}, {0x8580,    0x00b6},</div><div class='del'>-{0x8581,    0x0012}, {0x8582,    0x0004}, {0x8583,    0x0084},</div><div class='del'>-{0x8584,    0x00fe}, {0x8585,    0x008a}, {0x8586,    0x0002},</div><div class='del'>-{0x8587,    0x00b7}, {0x8588,    0x0012}, {0x8589,    0x0004},</div><div class='del'>-{0x858a,    0x0001}, {0x858b,    0x0001}, {0x858c,    0x0001},</div><div class='del'>-{0x858d,    0x0001}, {0x858e,    0x0001}, {0x858f,    0x0001},</div><div class='del'>-{0x8590,    0x0086}, {0x8591,    0x00fd}, {0x8592,    0x00b4},</div><div class='del'>-{0x8593,    0x0012}, {0x8594,    0x0004}, {0x8595,    0x00b7},</div><div class='del'>-{0x8596,    0x0012}, {0x8597,    0x0004}, {0x8598,    0x00b6},</div><div class='del'>-{0x8599,    0x0012}, {0x859a,    0x0000}, {0x859b,    0x0084},</div><div class='del'>-{0x859c,    0x0008}, {0x859d,    0x0081}, {0x859e,    0x0008},</div><div class='del'>-{0x859f,    0x0027}, {0x85a0,    0x0016}, {0x85a1,    0x00b6},</div><div class='del'>-{0x85a2,    0x008f}, {0x85a3,    0x007d}, {0x85a4,    0x0081},</div><div class='del'>-{0x85a5,    0x000c}, {0x85a6,    0x0027}, {0x85a7,    0x0008},</div><div class='del'>-{0x85a8,    0x008b}, {0x85a9,    0x0004}, {0x85aa,    0x00b7},</div><div class='del'>-{0x85ab,    0x008f}, {0x85ac,    0x007d}, {0x85ad,    0x007e},</div><div class='del'>-{0x85ae,    0x0085}, {0x85af,    0x006c}, {0x85b0,    0x0086},</div><div class='del'>-{0x85b1,    0x0003}, {0x85b2,    0x0097}, {0x85b3,    0x0040},</div><div class='del'>-{0x85b4,    0x007e}, {0x85b5,    0x0089}, {0x85b6,    0x006e},</div><div class='del'>-{0x85b7,    0x0086}, {0x85b8,    0x0007}, {0x85b9,    0x00b7},</div><div class='del'>-{0x85ba,    0x0012}, {0x85bb,    0x0006}, {0x85bc,    0x005f},</div><div class='del'>-{0x85bd,    0x00f7}, {0x85be,    0x008f}, {0x85bf,    0x0082},</div><div class='del'>-{0x85c0,    0x005f}, {0x85c1,    0x00f7}, {0x85c2,    0x008f},</div><div class='del'>-{0x85c3,    0x007f}, {0x85c4,    0x00f7}, {0x85c5,    0x008f},</div><div class='del'>-{0x85c6,    0x0070}, {0x85c7,    0x00f7}, {0x85c8,    0x008f},</div><div class='del'>-{0x85c9,    0x0071}, {0x85ca,    0x00f7}, {0x85cb,    0x008f},</div><div class='del'>-{0x85cc,    0x0072}, {0x85cd,    0x00f7}, {0x85ce,    0x008f},</div><div class='del'>-{0x85cf,    0x0073}, {0x85d0,    0x00f7}, {0x85d1,    0x008f},</div><div class='del'>-{0x85d2,    0x0074}, {0x85d3,    0x00f7}, {0x85d4,    0x008f},</div><div class='del'>-{0x85d5,    0x0075}, {0x85d6,    0x00f7}, {0x85d7,    0x008f},</div><div class='del'>-{0x85d8,    0x0076}, {0x85d9,    0x00f7}, {0x85da,    0x008f},</div><div class='del'>-{0x85db,    0x0077}, {0x85dc,    0x00f7}, {0x85dd,    0x008f},</div><div class='del'>-{0x85de,    0x0078}, {0x85df,    0x00f7}, {0x85e0,    0x008f},</div><div class='del'>-{0x85e1,    0x0079}, {0x85e2,    0x00f7}, {0x85e3,    0x008f},</div><div class='del'>-{0x85e4,    0x007a}, {0x85e5,    0x00f7}, {0x85e6,    0x008f},</div><div class='del'>-{0x85e7,    0x007b}, {0x85e8,    0x00b6}, {0x85e9,    0x0012},</div><div class='del'>-{0x85ea,    0x0004}, {0x85eb,    0x008a}, {0x85ec,    0x0010},</div><div class='del'>-{0x85ed,    0x00b7}, {0x85ee,    0x0012}, {0x85ef,    0x0004},</div><div class='del'>-{0x85f0,    0x0086}, {0x85f1,    0x00e4}, {0x85f2,    0x00b7},</div><div class='del'>-{0x85f3,    0x0012}, {0x85f4,    0x0070}, {0x85f5,    0x00b7},</div><div class='del'>-{0x85f6,    0x0012}, {0x85f7,    0x0007}, {0x85f8,    0x00f7},</div><div class='del'>-{0x85f9,    0x0012}, {0x85fa,    0x0005}, {0x85fb,    0x00f7},</div><div class='del'>-{0x85fc,    0x0012}, {0x85fd,    0x0009}, {0x85fe,    0x0086},</div><div class='del'>-{0x85ff,    0x0008}, {0x8600,    0x00ba}, {0x8601,    0x0012},</div><div class='del'>-{0x8602,    0x0004}, {0x8603,    0x00b7}, {0x8604,    0x0012},</div><div class='del'>-{0x8605,    0x0004}, {0x8606,    0x0086}, {0x8607,    0x00f7},</div><div class='del'>-{0x8608,    0x00b4}, {0x8609,    0x0012}, {0x860a,    0x0004},</div><div class='del'>-{0x860b,    0x00b7}, {0x860c,    0x0012}, {0x860d,    0x0004},</div><div class='del'>-{0x860e,    0x0001}, {0x860f,    0x0001}, {0x8610,    0x0001},</div><div class='del'>-{0x8611,    0x0001}, {0x8612,    0x0001}, {0x8613,    0x0001},</div><div class='del'>-{0x8614,    0x00b6}, {0x8615,    0x0012}, {0x8616,    0x0008},</div><div class='del'>-{0x8617,    0x0027}, {0x8618,    0x007f}, {0x8619,    0x0081},</div><div class='del'>-{0x861a,    0x0080}, {0x861b,    0x0026}, {0x861c,    0x000b},</div><div class='del'>-{0x861d,    0x0086}, {0x861e,    0x0008}, {0x861f,    0x00ce},</div><div class='del'>-{0x8620,    0x008f}, {0x8621,    0x0079}, {0x8622,    0x00bd},</div><div class='del'>-{0x8623,    0x0089}, {0x8624,    0x007b}, {0x8625,    0x007e},</div><div class='del'>-{0x8626,    0x0086}, {0x8627,    0x008e}, {0x8628,    0x0081},</div><div class='del'>-{0x8629,    0x0040}, {0x862a,    0x0026}, {0x862b,    0x000b},</div><div class='del'>-{0x862c,    0x0086}, {0x862d,    0x0004}, {0x862e,    0x00ce},</div><div class='del'>-{0x862f,    0x008f}, {0x8630,    0x0076}, {0x8631,    0x00bd},</div><div class='del'>-{0x8632,    0x0089}, {0x8633,    0x007b}, {0x8634,    0x007e},</div><div class='del'>-{0x8635,    0x0086}, {0x8636,    0x008e}, {0x8637,    0x0081},</div><div class='del'>-{0x8638,    0x0020}, {0x8639,    0x0026}, {0x863a,    0x000b},</div><div class='del'>-{0x863b,    0x0086}, {0x863c,    0x0002}, {0x863d,    0x00ce},</div><div class='del'>-{0x863e,    0x008f}, {0x863f,    0x0073}, {0x8640,    0x00bd},</div><div class='del'>-{0x8641,    0x0089}, {0x8642,    0x007b}, {0x8643,    0x007e},</div><div class='del'>-{0x8644,    0x0086}, {0x8645,    0x008e}, {0x8646,    0x0081},</div><div class='del'>-{0x8647,    0x0010}, {0x8648,    0x0026}, {0x8649,    0x000b},</div><div class='del'>-{0x864a,    0x0086}, {0x864b,    0x0001}, {0x864c,    0x00ce},</div><div class='del'>-{0x864d,    0x008f}, {0x864e,    0x0070}, {0x864f,    0x00bd},</div><div class='del'>-{0x8650,    0x0089}, {0x8651,    0x007b}, {0x8652,    0x007e},</div><div class='del'>-{0x8653,    0x0086}, {0x8654,    0x008e}, {0x8655,    0x0081},</div><div class='del'>-{0x8656,    0x0008}, {0x8657,    0x0026}, {0x8658,    0x000b},</div><div class='del'>-{0x8659,    0x0086}, {0x865a,    0x0008}, {0x865b,    0x00ce},</div><div class='del'>-{0x865c,    0x008f}, {0x865d,    0x0079}, {0x865e,    0x00bd},</div><div class='del'>-{0x865f,    0x0089}, {0x8660,    0x007f}, {0x8661,    0x007e},</div><div class='del'>-{0x8662,    0x0086}, {0x8663,    0x008e}, {0x8664,    0x0081},</div><div class='del'>-{0x8665,    0x0004}, {0x8666,    0x0026}, {0x8667,    0x000b},</div><div class='del'>-{0x8668,    0x0086}, {0x8669,    0x0004}, {0x866a,    0x00ce},</div><div class='del'>-{0x866b,    0x008f}, {0x866c,    0x0076}, {0x866d,    0x00bd},</div><div class='del'>-{0x866e,    0x0089}, {0x866f,    0x007f}, {0x8670,    0x007e},</div><div class='del'>-{0x8671,    0x0086}, {0x8672,    0x008e}, {0x8673,    0x0081},</div><div class='del'>-{0x8674,    0x0002}, {0x8675,    0x0026}, {0x8676,    0x000b},</div><div class='del'>-{0x8677,    0x008a}, {0x8678,    0x0002}, {0x8679,    0x00ce},</div><div class='del'>-{0x867a,    0x008f}, {0x867b,    0x0073}, {0x867c,    0x00bd},</div><div class='del'>-{0x867d,    0x0089}, {0x867e,    0x007f}, {0x867f,    0x007e},</div><div class='del'>-{0x8680,    0x0086}, {0x8681,    0x008e}, {0x8682,    0x0081},</div><div class='del'>-{0x8683,    0x0001}, {0x8684,    0x0026}, {0x8685,    0x0008},</div><div class='del'>-{0x8686,    0x0086}, {0x8687,    0x0001}, {0x8688,    0x00ce},</div><div class='del'>-{0x8689,    0x008f}, {0x868a,    0x0070}, {0x868b,    0x00bd},</div><div class='del'>-{0x868c,    0x0089}, {0x868d,    0x007f}, {0x868e,    0x00b6},</div><div class='del'>-{0x868f,    0x008f}, {0x8690,    0x007f}, {0x8691,    0x0081},</div><div class='del'>-{0x8692,    0x000f}, {0x8693,    0x0026}, {0x8694,    0x0003},</div><div class='del'>-{0x8695,    0x007e}, {0x8696,    0x0087}, {0x8697,    0x0047},</div><div class='del'>-{0x8698,    0x00b6}, {0x8699,    0x0012}, {0x869a,    0x0009},</div><div class='del'>-{0x869b,    0x0084}, {0x869c,    0x0003}, {0x869d,    0x0081},</div><div class='del'>-{0x869e,    0x0003}, {0x869f,    0x0027}, {0x86a0,    0x0006},</div><div class='del'>-{0x86a1,    0x007c}, {0x86a2,    0x0012}, {0x86a3,    0x0009},</div><div class='del'>-{0x86a4,    0x007e}, {0x86a5,    0x0085}, {0x86a6,    0x00fe},</div><div class='del'>-{0x86a7,    0x00b6}, {0x86a8,    0x0012}, {0x86a9,    0x0006},</div><div class='del'>-{0x86aa,    0x0084}, {0x86ab,    0x0007}, {0x86ac,    0x0081},</div><div class='del'>-{0x86ad,    0x0007}, {0x86ae,    0x0027}, {0x86af,    0x0008},</div><div class='del'>-{0x86b0,    0x008b}, {0x86b1,    0x0001}, {0x86b2,    0x00b7},</div><div class='del'>-{0x86b3,    0x0012}, {0x86b4,    0x0006}, {0x86b5,    0x007e},</div><div class='del'>-{0x86b6,    0x0086}, {0x86b7,    0x00d5}, {0x86b8,    0x00b6},</div><div class='del'>-{0x86b9,    0x008f}, {0x86ba,    0x0082}, {0x86bb,    0x0026},</div><div class='del'>-{0x86bc,    0x000a}, {0x86bd,    0x007c}, {0x86be,    0x008f},</div><div class='del'>-{0x86bf,    0x0082}, {0x86c0,    0x004f}, {0x86c1,    0x00b7},</div><div class='del'>-{0x86c2,    0x0012}, {0x86c3,    0x0006}, {0x86c4,    0x007e},</div><div class='del'>-{0x86c5,    0x0085}, {0x86c6,    0x00c0}, {0x86c7,    0x00b6},</div><div class='del'>-{0x86c8,    0x0012}, {0x86c9,    0x0006}, {0x86ca,    0x0084},</div><div class='del'>-{0x86cb,    0x003f}, {0x86cc,    0x0081}, {0x86cd,    0x003f},</div><div class='del'>-{0x86ce,    0x0027}, {0x86cf,    0x0010}, {0x86d0,    0x008b},</div><div class='del'>-{0x86d1,    0x0008}, {0x86d2,    0x00b7}, {0x86d3,    0x0012},</div><div class='del'>-{0x86d4,    0x0006}, {0x86d5,    0x00b6}, {0x86d6,    0x0012},</div><div class='del'>-{0x86d7,    0x0009}, {0x86d8,    0x0084}, {0x86d9,    0x00fc},</div><div class='del'>-{0x86da,    0x00b7}, {0x86db,    0x0012}, {0x86dc,    0x0009},</div><div class='del'>-{0x86dd,    0x007e}, {0x86de,    0x0085}, {0x86df,    0x00fe},</div><div class='del'>-{0x86e0,    0x00ce}, {0x86e1,    0x008f}, {0x86e2,    0x0070},</div><div class='del'>-{0x86e3,    0x0018}, {0x86e4,    0x00ce}, {0x86e5,    0x008f},</div><div class='del'>-{0x86e6,    0x0084}, {0x86e7,    0x00c6}, {0x86e8,    0x000c},</div><div class='del'>-{0x86e9,    0x00bd}, {0x86ea,    0x0089}, {0x86eb,    0x006f},</div><div class='del'>-{0x86ec,    0x00ce}, {0x86ed,    0x008f}, {0x86ee,    0x0084},</div><div class='del'>-{0x86ef,    0x0018}, {0x86f0,    0x00ce}, {0x86f1,    0x008f},</div><div class='del'>-{0x86f2,    0x0070}, {0x86f3,    0x00c6}, {0x86f4,    0x000c},</div><div class='del'>-{0x86f5,    0x00bd}, {0x86f6,    0x0089}, {0x86f7,    0x006f},</div><div class='del'>-{0x86f8,    0x00d6}, {0x86f9,    0x0083}, {0x86fa,    0x00c1},</div><div class='del'>-{0x86fb,    0x004f}, {0x86fc,    0x002d}, {0x86fd,    0x0003},</div><div class='del'>-{0x86fe,    0x007e}, {0x86ff,    0x0087}, {0x8700,    0x0040},</div><div class='del'>-{0x8701,    0x00b6}, {0x8702,    0x008f}, {0x8703,    0x007f},</div><div class='del'>-{0x8704,    0x0081}, {0x8705,    0x0007}, {0x8706,    0x0027},</div><div class='del'>-{0x8707,    0x000f}, {0x8708,    0x0081}, {0x8709,    0x000b},</div><div class='del'>-{0x870a,    0x0027}, {0x870b,    0x0015}, {0x870c,    0x0081},</div><div class='del'>-{0x870d,    0x000d}, {0x870e,    0x0027}, {0x870f,    0x001b},</div><div class='del'>-{0x8710,    0x0081}, {0x8711,    0x000e}, {0x8712,    0x0027},</div><div class='del'>-{0x8713,    0x0021}, {0x8714,    0x007e}, {0x8715,    0x0087},</div><div class='del'>-{0x8716,    0x0040}, {0x8717,    0x00f7}, {0x8718,    0x008f},</div><div class='del'>-{0x8719,    0x007b}, {0x871a,    0x0086}, {0x871b,    0x0002},</div><div class='del'>-{0x871c,    0x00b7}, {0x871d,    0x008f}, {0x871e,    0x007a},</div><div class='del'>-{0x871f,    0x0020}, {0x8720,    0x001c}, {0x8721,    0x00f7},</div><div class='del'>-{0x8722,    0x008f}, {0x8723,    0x0078}, {0x8724,    0x0086},</div><div class='del'>-{0x8725,    0x0002}, {0x8726,    0x00b7}, {0x8727,    0x008f},</div><div class='del'>-{0x8728,    0x0077}, {0x8729,    0x0020}, {0x872a,    0x0012},</div><div class='del'>-{0x872b,    0x00f7}, {0x872c,    0x008f}, {0x872d,    0x0075},</div><div class='del'>-{0x872e,    0x0086}, {0x872f,    0x0002}, {0x8730,    0x00b7},</div><div class='del'>-{0x8731,    0x008f}, {0x8732,    0x0074}, {0x8733,    0x0020},</div><div class='del'>-{0x8734,    0x0008}, {0x8735,    0x00f7}, {0x8736,    0x008f},</div><div class='del'>-{0x8737,    0x0072}, {0x8738,    0x0086}, {0x8739,    0x0002},</div><div class='del'>-{0x873a,    0x00b7}, {0x873b,    0x008f}, {0x873c,    0x0071},</div><div class='del'>-{0x873d,    0x007e}, {0x873e,    0x0087}, {0x873f,    0x0047},</div><div class='del'>-{0x8740,    0x0086}, {0x8741,    0x0004}, {0x8742,    0x0097},</div><div class='del'>-{0x8743,    0x0040}, {0x8744,    0x007e}, {0x8745,    0x0089},</div><div class='del'>-{0x8746,    0x006e}, {0x8747,    0x00ce}, {0x8748,    0x008f},</div><div class='del'>-{0x8749,    0x0072}, {0x874a,    0x00bd}, {0x874b,    0x0089},</div><div class='del'>-{0x874c,    0x00f7}, {0x874d,    0x00ce}, {0x874e,    0x008f},</div><div class='del'>-{0x874f,    0x0075}, {0x8750,    0x00bd}, {0x8751,    0x0089},</div><div class='del'>-{0x8752,    0x00f7}, {0x8753,    0x00ce}, {0x8754,    0x008f},</div><div class='del'>-{0x8755,    0x0078}, {0x8756,    0x00bd}, {0x8757,    0x0089},</div><div class='del'>-{0x8758,    0x00f7}, {0x8759,    0x00ce}, {0x875a,    0x008f},</div><div class='del'>-{0x875b,    0x007b}, {0x875c,    0x00bd}, {0x875d,    0x0089},</div><div class='del'>-{0x875e,    0x00f7}, {0x875f,    0x004f}, {0x8760,    0x00b7},</div><div class='del'>-{0x8761,    0x008f}, {0x8762,    0x007d}, {0x8763,    0x00b7},</div><div class='del'>-{0x8764,    0x008f}, {0x8765,    0x0081}, {0x8766,    0x00b6},</div><div class='del'>-{0x8767,    0x008f}, {0x8768,    0x0072}, {0x8769,    0x0027},</div><div class='del'>-{0x876a,    0x0047}, {0x876b,    0x007c}, {0x876c,    0x008f},</div><div class='del'>-{0x876d,    0x007d}, {0x876e,    0x00b6}, {0x876f,    0x008f},</div><div class='del'>-{0x8770,    0x0075}, {0x8771,    0x0027}, {0x8772,    0x003f},</div><div class='del'>-{0x8773,    0x007c}, {0x8774,    0x008f}, {0x8775,    0x007d},</div><div class='del'>-{0x8776,    0x00b6}, {0x8777,    0x008f}, {0x8778,    0x0078},</div><div class='del'>-{0x8779,    0x0027}, {0x877a,    0x0037}, {0x877b,    0x007c},</div><div class='del'>-{0x877c,    0x008f}, {0x877d,    0x007d}, {0x877e,    0x00b6},</div><div class='del'>-{0x877f,    0x008f}, {0x8780,    0x007b}, {0x8781,    0x0027},</div><div class='del'>-{0x8782,    0x002f}, {0x8783,    0x007f}, {0x8784,    0x008f},</div><div class='del'>-{0x8785,    0x007d}, {0x8786,    0x007c}, {0x8787,    0x008f},</div><div class='del'>-{0x8788,    0x0081}, {0x8789,    0x007a}, {0x878a,    0x008f},</div><div class='del'>-{0x878b,    0x0072}, {0x878c,    0x0027}, {0x878d,    0x001b},</div><div class='del'>-{0x878e,    0x007c}, {0x878f,    0x008f}, {0x8790,    0x007d},</div><div class='del'>-{0x8791,    0x007a}, {0x8792,    0x008f}, {0x8793,    0x0075},</div><div class='del'>-{0x8794,    0x0027}, {0x8795,    0x0016}, {0x8796,    0x007c},</div><div class='del'>-{0x8797,    0x008f}, {0x8798,    0x007d}, {0x8799,    0x007a},</div><div class='del'>-{0x879a,    0x008f}, {0x879b,    0x0078}, {0x879c,    0x0027},</div><div class='del'>-{0x879d,    0x0011}, {0x879e,    0x007c}, {0x879f,    0x008f},</div><div class='del'>-{0x87a0,    0x007d}, {0x87a1,    0x007a}, {0x87a2,    0x008f},</div><div class='del'>-{0x87a3,    0x007b}, {0x87a4,    0x0027}, {0x87a5,    0x000c},</div><div class='del'>-{0x87a6,    0x007e}, {0x87a7,    0x0087}, {0x87a8,    0x0083},</div><div class='del'>-{0x87a9,    0x007a}, {0x87aa,    0x008f}, {0x87ab,    0x0075},</div><div class='del'>-{0x87ac,    0x007a}, {0x87ad,    0x008f}, {0x87ae,    0x0078},</div><div class='del'>-{0x87af,    0x007a}, {0x87b0,    0x008f}, {0x87b1,    0x007b},</div><div class='del'>-{0x87b2,    0x00ce}, {0x87b3,    0x00c1}, {0x87b4,    0x00fc},</div><div class='del'>-{0x87b5,    0x00f6}, {0x87b6,    0x008f}, {0x87b7,    0x007d},</div><div class='del'>-{0x87b8,    0x003a}, {0x87b9,    0x00a6}, {0x87ba,    0x0000},</div><div class='del'>-{0x87bb,    0x00b7}, {0x87bc,    0x0012}, {0x87bd,    0x0070},</div><div class='del'>-{0x87be,    0x00b6}, {0x87bf,    0x008f}, {0x87c0,    0x0072},</div><div class='del'>-{0x87c1,    0x0026}, {0x87c2,    0x0003}, {0x87c3,    0x007e},</div><div class='del'>-{0x87c4,    0x0087}, {0x87c5,    0x00fa}, {0x87c6,    0x00b6},</div><div class='del'>-{0x87c7,    0x008f}, {0x87c8,    0x0075}, {0x87c9,    0x0026},</div><div class='del'>-{0x87ca,    0x000a}, {0x87cb,    0x0018}, {0x87cc,    0x00ce},</div><div class='del'>-{0x87cd,    0x008f}, {0x87ce,    0x0073}, {0x87cf,    0x00bd},</div><div class='del'>-{0x87d0,    0x0089}, {0x87d1,    0x00d5}, {0x87d2,    0x007e},</div><div class='del'>-{0x87d3,    0x0087}, {0x87d4,    0x00fa}, {0x87d5,    0x00b6},</div><div class='del'>-{0x87d6,    0x008f}, {0x87d7,    0x0078}, {0x87d8,    0x0026},</div><div class='del'>-{0x87d9,    0x000a}, {0x87da,    0x0018}, {0x87db,    0x00ce},</div><div class='del'>-{0x87dc,    0x008f}, {0x87dd,    0x0076}, {0x87de,    0x00bd},</div><div class='del'>-{0x87df,    0x0089}, {0x87e0,    0x00d5}, {0x87e1,    0x007e},</div><div class='del'>-{0x87e2,    0x0087}, {0x87e3,    0x00fa}, {0x87e4,    0x00b6},</div><div class='del'>-{0x87e5,    0x008f}, {0x87e6,    0x007b}, {0x87e7,    0x0026},</div><div class='del'>-{0x87e8,    0x000a}, {0x87e9,    0x0018}, {0x87ea,    0x00ce},</div><div class='del'>-{0x87eb,    0x008f}, {0x87ec,    0x0079}, {0x87ed,    0x00bd},</div><div class='del'>-{0x87ee,    0x0089}, {0x87ef,    0x00d5}, {0x87f0,    0x007e},</div><div class='del'>-{0x87f1,    0x0087}, {0x87f2,    0x00fa}, {0x87f3,    0x0086},</div><div class='del'>-{0x87f4,    0x0005}, {0x87f5,    0x0097}, {0x87f6,    0x0040},</div><div class='del'>-{0x87f7,    0x007e}, {0x87f8,    0x0089}, {0x87f9,    0x0000},</div><div class='del'>-{0x87fa,    0x00b6}, {0x87fb,    0x008f}, {0x87fc,    0x0075},</div><div class='del'>-{0x87fd,    0x0081}, {0x87fe,    0x0007}, {0x87ff,    0x002e},</div><div class='del'>-{0x8800,    0x00f2}, {0x8801,    0x00f6}, {0x8802,    0x0012},</div><div class='del'>-{0x8803,    0x0006}, {0x8804,    0x00c4}, {0x8805,    0x00f8},</div><div class='del'>-{0x8806,    0x001b}, {0x8807,    0x00b7}, {0x8808,    0x0012},</div><div class='del'>-{0x8809,    0x0006}, {0x880a,    0x00b6}, {0x880b,    0x008f},</div><div class='del'>-{0x880c,    0x0078}, {0x880d,    0x0081}, {0x880e,    0x0007},</div><div class='del'>-{0x880f,    0x002e}, {0x8810,    0x00e2}, {0x8811,    0x0048},</div><div class='del'>-{0x8812,    0x0048}, {0x8813,    0x0048}, {0x8814,    0x00f6},</div><div class='del'>-{0x8815,    0x0012}, {0x8816,    0x0006}, {0x8817,    0x00c4},</div><div class='del'>-{0x8818,    0x00c7}, {0x8819,    0x001b}, {0x881a,    0x00b7},</div><div class='del'>-{0x881b,    0x0012}, {0x881c,    0x0006}, {0x881d,    0x00b6},</div><div class='del'>-{0x881e,    0x008f}, {0x881f,    0x007b}, {0x8820,    0x0081},</div><div class='del'>-{0x8821,    0x0007}, {0x8822,    0x002e}, {0x8823,    0x00cf},</div><div class='del'>-{0x8824,    0x00f6}, {0x8825,    0x0012}, {0x8826,    0x0005},</div><div class='del'>-{0x8827,    0x00c4}, {0x8828,    0x00f8}, {0x8829,    0x001b},</div><div class='del'>-{0x882a,    0x00b7}, {0x882b,    0x0012}, {0x882c,    0x0005},</div><div class='del'>-{0x882d,    0x0086}, {0x882e,    0x0000}, {0x882f,    0x00f6},</div><div class='del'>-{0x8830,    0x008f}, {0x8831,    0x0071}, {0x8832,    0x00bd},</div><div class='del'>-{0x8833,    0x0089}, {0x8834,    0x0094}, {0x8835,    0x0086},</div><div class='del'>-{0x8836,    0x0001}, {0x8837,    0x00f6}, {0x8838,    0x008f},</div><div class='del'>-{0x8839,    0x0074}, {0x883a,    0x00bd}, {0x883b,    0x0089},</div><div class='del'>-{0x883c,    0x0094}, {0x883d,    0x0086}, {0x883e,    0x0002},</div><div class='del'>-{0x883f,    0x00f6}, {0x8840,    0x008f}, {0x8841,    0x0077},</div><div class='del'>-{0x8842,    0x00bd}, {0x8843,    0x0089}, {0x8844,    0x0094},</div><div class='del'>-{0x8845,    0x0086}, {0x8846,    0x0003}, {0x8847,    0x00f6},</div><div class='del'>-{0x8848,    0x008f}, {0x8849,    0x007a}, {0x884a,    0x00bd},</div><div class='del'>-{0x884b,    0x0089}, {0x884c,    0x0094}, {0x884d,    0x00ce},</div><div class='del'>-{0x884e,    0x008f}, {0x884f,    0x0070}, {0x8850,    0x00a6},</div><div class='del'>-{0x8851,    0x0001}, {0x8852,    0x0081}, {0x8853,    0x0001},</div><div class='del'>-{0x8854,    0x0027}, {0x8855,    0x0007}, {0x8856,    0x0081},</div><div class='del'>-{0x8857,    0x0003}, {0x8858,    0x0027}, {0x8859,    0x0003},</div><div class='del'>-{0x885a,    0x007e}, {0x885b,    0x0088}, {0x885c,    0x0066},</div><div class='del'>-{0x885d,    0x00a6}, {0x885e,    0x0000}, {0x885f,    0x00b8},</div><div class='del'>-{0x8860,    0x008f}, {0x8861,    0x0081}, {0x8862,    0x0084},</div><div class='del'>-{0x8863,    0x0001}, {0x8864,    0x0026}, {0x8865,    0x000b},</div><div class='del'>-{0x8866,    0x008c}, {0x8867,    0x008f}, {0x8868,    0x0079},</div><div class='del'>-{0x8869,    0x002c}, {0x886a,    0x000e}, {0x886b,    0x0008},</div><div class='del'>-{0x886c,    0x0008}, {0x886d,    0x0008}, {0x886e,    0x007e},</div><div class='del'>-{0x886f,    0x0088}, {0x8870,    0x0050}, {0x8871,    0x00b6},</div><div class='del'>-{0x8872,    0x0012}, {0x8873,    0x0004}, {0x8874,    0x008a},</div><div class='del'>-{0x8875,    0x0040}, {0x8876,    0x00b7}, {0x8877,    0x0012},</div><div class='del'>-{0x8878,    0x0004}, {0x8879,    0x00b6}, {0x887a,    0x0012},</div><div class='del'>-{0x887b,    0x0004}, {0x887c,    0x0084}, {0x887d,    0x00fb},</div><div class='del'>-{0x887e,    0x0084}, {0x887f,    0x00ef}, {0x8880,    0x00b7},</div><div class='del'>-{0x8881,    0x0012}, {0x8882,    0x0004}, {0x8883,    0x00b6},</div><div class='del'>-{0x8884,    0x0012}, {0x8885,    0x0007}, {0x8886,    0x0036},</div><div class='del'>-{0x8887,    0x00b6}, {0x8888,    0x008f}, {0x8889,    0x007c},</div><div class='del'>-{0x888a,    0x0048}, {0x888b,    0x0048}, {0x888c,    0x00b7},</div><div class='del'>-{0x888d,    0x0012}, {0x888e,    0x0007}, {0x888f,    0x0086},</div><div class='del'>-{0x8890,    0x0001}, {0x8891,    0x00ba}, {0x8892,    0x0012},</div><div class='del'>-{0x8893,    0x0004}, {0x8894,    0x00b7}, {0x8895,    0x0012},</div><div class='del'>-{0x8896,    0x0004}, {0x8897,    0x0001}, {0x8898,    0x0001},</div><div class='del'>-{0x8899,    0x0001}, {0x889a,    0x0001}, {0x889b,    0x0001},</div><div class='del'>-{0x889c,    0x0001}, {0x889d,    0x0086}, {0x889e,    0x00fe},</div><div class='del'>-{0x889f,    0x00b4}, {0x88a0,    0x0012}, {0x88a1,    0x0004},</div><div class='del'>-{0x88a2,    0x00b7}, {0x88a3,    0x0012}, {0x88a4,    0x0004},</div><div class='del'>-{0x88a5,    0x0086}, {0x88a6,    0x0002}, {0x88a7,    0x00ba},</div><div class='del'>-{0x88a8,    0x0012}, {0x88a9,    0x0004}, {0x88aa,    0x00b7},</div><div class='del'>-{0x88ab,    0x0012}, {0x88ac,    0x0004}, {0x88ad,    0x0086},</div><div class='del'>-{0x88ae,    0x00fd}, {0x88af,    0x00b4}, {0x88b0,    0x0012},</div><div class='del'>-{0x88b1,    0x0004}, {0x88b2,    0x00b7}, {0x88b3,    0x0012},</div><div class='del'>-{0x88b4,    0x0004}, {0x88b5,    0x0032}, {0x88b6,    0x00b7},</div><div class='del'>-{0x88b7,    0x0012}, {0x88b8,    0x0007}, {0x88b9,    0x00b6},</div><div class='del'>-{0x88ba,    0x0012}, {0x88bb,    0x0000}, {0x88bc,    0x0084},</div><div class='del'>-{0x88bd,    0x0008}, {0x88be,    0x0081}, {0x88bf,    0x0008},</div><div class='del'>-{0x88c0,    0x0027}, {0x88c1,    0x000f}, {0x88c2,    0x007c},</div><div class='del'>-{0x88c3,    0x0082}, {0x88c4,    0x0008}, {0x88c5,    0x0026},</div><div class='del'>-{0x88c6,    0x0007}, {0x88c7,    0x0086}, {0x88c8,    0x0076},</div><div class='del'>-{0x88c9,    0x0097}, {0x88ca,    0x0040}, {0x88cb,    0x007e},</div><div class='del'>-{0x88cc,    0x0089}, {0x88cd,    0x006e}, {0x88ce,    0x007e},</div><div class='del'>-{0x88cf,    0x0086}, {0x88d0,    0x00ec}, {0x88d1,    0x00b6},</div><div class='del'>-{0x88d2,    0x008f}, {0x88d3,    0x007f}, {0x88d4,    0x0081},</div><div class='del'>-{0x88d5,    0x000f}, {0x88d6,    0x0027}, {0x88d7,    0x003c},</div><div class='del'>-{0x88d8,    0x00bd}, {0x88d9,    0x00e6}, {0x88da,    0x00c7},</div><div class='del'>-{0x88db,    0x00b7}, {0x88dc,    0x0012}, {0x88dd,    0x000d},</div><div class='del'>-{0x88de,    0x00bd}, {0x88df,    0x00e6}, {0x88e0,    0x00cb},</div><div class='del'>-{0x88e1,    0x00b6}, {0x88e2,    0x0012}, {0x88e3,    0x0004},</div><div class='del'>-{0x88e4,    0x008a}, {0x88e5,    0x0020}, {0x88e6,    0x00b7},</div><div class='del'>-{0x88e7,    0x0012}, {0x88e8,    0x0004}, {0x88e9,    0x00ce},</div><div class='del'>-{0x88ea,    0x00ff}, {0x88eb,    0x00ff}, {0x88ec,    0x00b6},</div><div class='del'>-{0x88ed,    0x0012}, {0x88ee,    0x0000}, {0x88ef,    0x0081},</div><div class='del'>-{0x88f0,    0x000c}, {0x88f1,    0x0026}, {0x88f2,    0x0005},</div><div class='del'>-{0x88f3,    0x0009}, {0x88f4,    0x0026}, {0x88f5,    0x00f6},</div><div class='del'>-{0x88f6,    0x0027}, {0x88f7,    0x001c}, {0x88f8,    0x00b6},</div><div class='del'>-{0x88f9,    0x0012}, {0x88fa,    0x0004}, {0x88fb,    0x0084},</div><div class='del'>-{0x88fc,    0x00df}, {0x88fd,    0x00b7}, {0x88fe,    0x0012},</div><div class='del'>-{0x88ff,    0x0004}, {0x8900,    0x0096}, {0x8901,    0x0083},</div><div class='del'>-{0x8902,    0x0081}, {0x8903,    0x0007}, {0x8904,    0x002c},</div><div class='del'>-{0x8905,    0x0005}, {0x8906,    0x007c}, {0x8907,    0x0000},</div><div class='del'>-{0x8908,    0x0083}, {0x8909,    0x0020}, {0x890a,    0x0006},</div><div class='del'>-{0x890b,    0x0096}, {0x890c,    0x0083}, {0x890d,    0x008b},</div><div class='del'>-{0x890e,    0x0008}, {0x890f,    0x0097}, {0x8910,    0x0083},</div><div class='del'>-{0x8911,    0x007e}, {0x8912,    0x0085}, {0x8913,    0x0041},</div><div class='del'>-{0x8914,    0x007f}, {0x8915,    0x008f}, {0x8916,    0x007e},</div><div class='del'>-{0x8917,    0x0086}, {0x8918,    0x0080}, {0x8919,    0x00b7},</div><div class='del'>-{0x891a,    0x0012}, {0x891b,    0x000c}, {0x891c,    0x0086},</div><div class='del'>-{0x891d,    0x0001}, {0x891e,    0x00b7}, {0x891f,    0x008f},</div><div class='del'>-{0x8920,    0x007d}, {0x8921,    0x00b6}, {0x8922,    0x0012},</div><div class='del'>-{0x8923,    0x000c}, {0x8924,    0x0084}, {0x8925,    0x007f},</div><div class='del'>-{0x8926,    0x00b7}, {0x8927,    0x0012}, {0x8928,    0x000c},</div><div class='del'>-{0x8929,    0x008a}, {0x892a,    0x0080}, {0x892b,    0x00b7},</div><div class='del'>-{0x892c,    0x0012}, {0x892d,    0x000c}, {0x892e,    0x0086},</div><div class='del'>-{0x892f,    0x000a}, {0x8930,    0x00bd}, {0x8931,    0x008a},</div><div class='del'>-{0x8932,    0x0006}, {0x8933,    0x00b6}, {0x8934,    0x0012},</div><div class='del'>-{0x8935,    0x000a}, {0x8936,    0x002a}, {0x8937,    0x0009},</div><div class='del'>-{0x8938,    0x00b6}, {0x8939,    0x0012}, {0x893a,    0x000c},</div><div class='del'>-{0x893b,    0x00ba}, {0x893c,    0x008f}, {0x893d,    0x007d},</div><div class='del'>-{0x893e,    0x00b7}, {0x893f,    0x0012}, {0x8940,    0x000c},</div><div class='del'>-{0x8941,    0x00b6}, {0x8942,    0x008f}, {0x8943,    0x007e},</div><div class='del'>-{0x8944,    0x0081}, {0x8945,    0x0060}, {0x8946,    0x0027},</div><div class='del'>-{0x8947,    0x001a}, {0x8948,    0x008b}, {0x8949,    0x0020},</div><div class='del'>-{0x894a,    0x00b7}, {0x894b,    0x008f}, {0x894c,    0x007e},</div><div class='del'>-{0x894d,    0x00b6}, {0x894e,    0x0012}, {0x894f,    0x000c},</div><div class='del'>-{0x8950,    0x0084}, {0x8951,    0x009f}, {0x8952,    0x00ba},</div><div class='del'>-{0x8953,    0x008f}, {0x8954,    0x007e}, {0x8955,    0x00b7},</div><div class='del'>-{0x8956,    0x0012}, {0x8957,    0x000c}, {0x8958,    0x00b6},</div><div class='del'>-{0x8959,    0x008f}, {0x895a,    0x007d}, {0x895b,    0x0048},</div><div class='del'>-{0x895c,    0x00b7}, {0x895d,    0x008f}, {0x895e,    0x007d},</div><div class='del'>-{0x895f,    0x007e}, {0x8960,    0x0089}, {0x8961,    0x0021},</div><div class='del'>-{0x8962,    0x00b6}, {0x8963,    0x0012}, {0x8964,    0x0004},</div><div class='del'>-{0x8965,    0x008a}, {0x8966,    0x0020}, {0x8967,    0x00b7},</div><div class='del'>-{0x8968,    0x0012}, {0x8969,    0x0004}, {0x896a,    0x00bd},</div><div class='del'>-{0x896b,    0x008a}, {0x896c,    0x000a}, {0x896d,    0x004f},</div><div class='del'>-{0x896e,    0x0039}, {0x896f,    0x00a6}, {0x8970,    0x0000},</div><div class='del'>-{0x8971,    0x0018}, {0x8972,    0x00a7}, {0x8973,    0x0000},</div><div class='del'>-{0x8974,    0x0008}, {0x8975,    0x0018}, {0x8976,    0x0008},</div><div class='del'>-{0x8977,    0x005a}, {0x8978,    0x0026}, {0x8979,    0x00f5},</div><div class='del'>-{0x897a,    0x0039}, {0x897b,    0x0036}, {0x897c,    0x006c},</div><div class='del'>-{0x897d,    0x0000}, {0x897e,    0x0032}, {0x897f,    0x00ba},</div><div class='del'>-{0x8980,    0x008f}, {0x8981,    0x007f}, {0x8982,    0x00b7},</div><div class='del'>-{0x8983,    0x008f}, {0x8984,    0x007f}, {0x8985,    0x00b6},</div><div class='del'>-{0x8986,    0x0012}, {0x8987,    0x0009}, {0x8988,    0x0084},</div><div class='del'>-{0x8989,    0x0003}, {0x898a,    0x00a7}, {0x898b,    0x0001},</div><div class='del'>-{0x898c,    0x00b6}, {0x898d,    0x0012}, {0x898e,    0x0006},</div><div class='del'>-{0x898f,    0x0084}, {0x8990,    0x003f}, {0x8991,    0x00a7},</div><div class='del'>-{0x8992,    0x0002}, {0x8993,    0x0039}, {0x8994,    0x0036},</div><div class='del'>-{0x8995,    0x0086}, {0x8996,    0x0003}, {0x8997,    0x00b7},</div><div class='del'>-{0x8998,    0x008f}, {0x8999,    0x0080}, {0x899a,    0x0032},</div><div class='del'>-{0x899b,    0x00c1}, {0x899c,    0x0000}, {0x899d,    0x0026},</div><div class='del'>-{0x899e,    0x0006}, {0x899f,    0x00b7}, {0x89a0,    0x008f},</div><div class='del'>-{0x89a1,    0x007c}, {0x89a2,    0x007e}, {0x89a3,    0x0089},</div><div class='del'>-{0x89a4,    0x00c9}, {0x89a5,    0x00c1}, {0x89a6,    0x0001},</div><div class='del'>-{0x89a7,    0x0027}, {0x89a8,    0x0018}, {0x89a9,    0x00c1},</div><div class='del'>-{0x89aa,    0x0002}, {0x89ab,    0x0027}, {0x89ac,    0x000c},</div><div class='del'>-{0x89ad,    0x00c1}, {0x89ae,    0x0003}, {0x89af,    0x0027},</div><div class='del'>-{0x89b0,    0x0000}, {0x89b1,    0x00f6}, {0x89b2,    0x008f},</div><div class='del'>-{0x89b3,    0x0080}, {0x89b4,    0x0005}, {0x89b5,    0x0005},</div><div class='del'>-{0x89b6,    0x00f7}, {0x89b7,    0x008f}, {0x89b8,    0x0080},</div><div class='del'>-{0x89b9,    0x00f6}, {0x89ba,    0x008f}, {0x89bb,    0x0080},</div><div class='del'>-{0x89bc,    0x0005}, {0x89bd,    0x0005}, {0x89be,    0x00f7},</div><div class='del'>-{0x89bf,    0x008f}, {0x89c0,    0x0080}, {0x89c1,    0x00f6},</div><div class='del'>-{0x89c2,    0x008f}, {0x89c3,    0x0080}, {0x89c4,    0x0005},</div><div class='del'>-{0x89c5,    0x0005}, {0x89c6,    0x00f7}, {0x89c7,    0x008f},</div><div class='del'>-{0x89c8,    0x0080}, {0x89c9,    0x00f6}, {0x89ca,    0x008f},</div><div class='del'>-{0x89cb,    0x0080}, {0x89cc,    0x0053}, {0x89cd,    0x00f4},</div><div class='del'>-{0x89ce,    0x0012}, {0x89cf,    0x0007}, {0x89d0,    0x001b},</div><div class='del'>-{0x89d1,    0x00b7}, {0x89d2,    0x0012}, {0x89d3,    0x0007},</div><div class='del'>-{0x89d4,    0x0039}, {0x89d5,    0x00ce}, {0x89d6,    0x008f},</div><div class='del'>-{0x89d7,    0x0070}, {0x89d8,    0x00a6}, {0x89d9,    0x0000},</div><div class='del'>-{0x89da,    0x0018}, {0x89db,    0x00e6}, {0x89dc,    0x0000},</div><div class='del'>-{0x89dd,    0x0018}, {0x89de,    0x00a7}, {0x89df,    0x0000},</div><div class='del'>-{0x89e0,    0x00e7}, {0x89e1,    0x0000}, {0x89e2,    0x00a6},</div><div class='del'>-{0x89e3,    0x0001}, {0x89e4,    0x0018}, {0x89e5,    0x00e6},</div><div class='del'>-{0x89e6,    0x0001}, {0x89e7,    0x0018}, {0x89e8,    0x00a7},</div><div class='del'>-{0x89e9,    0x0001}, {0x89ea,    0x00e7}, {0x89eb,    0x0001},</div><div class='del'>-{0x89ec,    0x00a6}, {0x89ed,    0x0002}, {0x89ee,    0x0018},</div><div class='del'>-{0x89ef,    0x00e6}, {0x89f0,    0x0002}, {0x89f1,    0x0018},</div><div class='del'>-{0x89f2,    0x00a7}, {0x89f3,    0x0002}, {0x89f4,    0x00e7},</div><div class='del'>-{0x89f5,    0x0002}, {0x89f6,    0x0039}, {0x89f7,    0x00a6},</div><div class='del'>-{0x89f8,    0x0000}, {0x89f9,    0x0084}, {0x89fa,    0x0007},</div><div class='del'>-{0x89fb,    0x00e6}, {0x89fc,    0x0000}, {0x89fd,    0x00c4},</div><div class='del'>-{0x89fe,    0x0038}, {0x89ff,    0x0054}, {0x8a00,    0x0054},</div><div class='del'>-{0x8a01,    0x0054}, {0x8a02,    0x001b}, {0x8a03,    0x00a7},</div><div class='del'>-{0x8a04,    0x0000}, {0x8a05,    0x0039}, {0x8a06,    0x004a},</div><div class='del'>-{0x8a07,    0x0026}, {0x8a08,    0x00fd}, {0x8a09,    0x0039},</div><div class='del'>-{0x8a0a,    0x0096}, {0x8a0b,    0x0022}, {0x8a0c,    0x0084},</div><div class='del'>-{0x8a0d,    0x000f}, {0x8a0e,    0x0097}, {0x8a0f,    0x0022},</div><div class='del'>-{0x8a10,    0x0086}, {0x8a11,    0x0001}, {0x8a12,    0x00b7},</div><div class='del'>-{0x8a13,    0x008f}, {0x8a14,    0x0070}, {0x8a15,    0x00b6},</div><div class='del'>-{0x8a16,    0x0012}, {0x8a17,    0x0007}, {0x8a18,    0x00b7},</div><div class='del'>-{0x8a19,    0x008f}, {0x8a1a,    0x0071}, {0x8a1b,    0x00f6},</div><div class='del'>-{0x8a1c,    0x0012}, {0x8a1d,    0x000c}, {0x8a1e,    0x00c4},</div><div class='del'>-{0x8a1f,    0x000f}, {0x8a20,    0x00c8}, {0x8a21,    0x000f},</div><div class='del'>-{0x8a22,    0x00f7}, {0x8a23,    0x008f}, {0x8a24,    0x0072},</div><div class='del'>-{0x8a25,    0x00f6}, {0x8a26,    0x008f}, {0x8a27,    0x0072},</div><div class='del'>-{0x8a28,    0x00b6}, {0x8a29,    0x008f}, {0x8a2a,    0x0071},</div><div class='del'>-{0x8a2b,    0x0084}, {0x8a2c,    0x0003}, {0x8a2d,    0x0027},</div><div class='del'>-{0x8a2e,    0x0014}, {0x8a2f,    0x0081}, {0x8a30,    0x0001},</div><div class='del'>-{0x8a31,    0x0027}, {0x8a32,    0x001c}, {0x8a33,    0x0081},</div><div class='del'>-{0x8a34,    0x0002}, {0x8a35,    0x0027}, {0x8a36,    0x0024},</div><div class='del'>-{0x8a37,    0x00f4}, {0x8a38,    0x008f}, {0x8a39,    0x0070},</div><div class='del'>-{0x8a3a,    0x0027}, {0x8a3b,    0x002a}, {0x8a3c,    0x0096},</div><div class='del'>-{0x8a3d,    0x0022}, {0x8a3e,    0x008a}, {0x8a3f,    0x0080},</div><div class='del'>-{0x8a40,    0x007e}, {0x8a41,    0x008a}, {0x8a42,    0x0064},</div><div class='del'>-{0x8a43,    0x00f4}, {0x8a44,    0x008f}, {0x8a45,    0x0070},</div><div class='del'>-{0x8a46,    0x0027}, {0x8a47,    0x001e}, {0x8a48,    0x0096},</div><div class='del'>-{0x8a49,    0x0022}, {0x8a4a,    0x008a}, {0x8a4b,    0x0010},</div><div class='del'>-{0x8a4c,    0x007e}, {0x8a4d,    0x008a}, {0x8a4e,    0x0064},</div><div class='del'>-{0x8a4f,    0x00f4}, {0x8a50,    0x008f}, {0x8a51,    0x0070},</div><div class='del'>-{0x8a52,    0x0027}, {0x8a53,    0x0012}, {0x8a54,    0x0096},</div><div class='del'>-{0x8a55,    0x0022}, {0x8a56,    0x008a}, {0x8a57,    0x0020},</div><div class='del'>-{0x8a58,    0x007e}, {0x8a59,    0x008a}, {0x8a5a,    0x0064},</div><div class='del'>-{0x8a5b,    0x00f4}, {0x8a5c,    0x008f}, {0x8a5d,    0x0070},</div><div class='del'>-{0x8a5e,    0x0027}, {0x8a5f,    0x0006}, {0x8a60,    0x0096},</div><div class='del'>-{0x8a61,    0x0022}, {0x8a62,    0x008a}, {0x8a63,    0x0040},</div><div class='del'>-{0x8a64,    0x0097}, {0x8a65,    0x0022}, {0x8a66,    0x0074},</div><div class='del'>-{0x8a67,    0x008f}, {0x8a68,    0x0071}, {0x8a69,    0x0074},</div><div class='del'>-{0x8a6a,    0x008f}, {0x8a6b,    0x0071}, {0x8a6c,    0x0078},</div><div class='del'>-{0x8a6d,    0x008f}, {0x8a6e,    0x0070}, {0x8a6f,    0x00b6},</div><div class='del'>-{0x8a70,    0x008f}, {0x8a71,    0x0070}, {0x8a72,    0x0085},</div><div class='del'>-{0x8a73,    0x0010}, {0x8a74,    0x0027}, {0x8a75,    0x00af},</div><div class='del'>-{0x8a76,    0x00d6}, {0x8a77,    0x0022}, {0x8a78,    0x00c4},</div><div class='del'>-{0x8a79,    0x0010}, {0x8a7a,    0x0058}, {0x8a7b,    0x00b6},</div><div class='del'>-{0x8a7c,    0x0012}, {0x8a7d,    0x0070}, {0x8a7e,    0x0081},</div><div class='del'>-{0x8a7f,    0x00e4}, {0x8a80,    0x0027}, {0x8a81,    0x0036},</div><div class='del'>-{0x8a82,    0x0081}, {0x8a83,    0x00e1}, {0x8a84,    0x0026},</div><div class='del'>-{0x8a85,    0x000c}, {0x8a86,    0x0096}, {0x8a87,    0x0022},</div><div class='del'>-{0x8a88,    0x0084}, {0x8a89,    0x0020}, {0x8a8a,    0x0044},</div><div class='del'>-{0x8a8b,    0x001b}, {0x8a8c,    0x00d6}, {0x8a8d,    0x0022},</div><div class='del'>-{0x8a8e,    0x00c4}, {0x8a8f,    0x00cf}, {0x8a90,    0x0020},</div><div class='del'>-{0x8a91,    0x0023}, {0x8a92,    0x0058}, {0x8a93,    0x0081},</div><div class='del'>-{0x8a94,    0x00c6}, {0x8a95,    0x0026}, {0x8a96,    0x000d},</div><div class='del'>-{0x8a97,    0x0096}, {0x8a98,    0x0022}, {0x8a99,    0x0084},</div><div class='del'>-{0x8a9a,    0x0040}, {0x8a9b,    0x0044}, {0x8a9c,    0x0044},</div><div class='del'>-{0x8a9d,    0x001b}, {0x8a9e,    0x00d6}, {0x8a9f,    0x0022},</div><div class='del'>-{0x8aa0,    0x00c4}, {0x8aa1,    0x00af}, {0x8aa2,    0x0020},</div><div class='del'>-{0x8aa3,    0x0011}, {0x8aa4,    0x0058}, {0x8aa5,    0x0081},</div><div class='del'>-{0x8aa6,    0x0027}, {0x8aa7,    0x0026}, {0x8aa8,    0x000f},</div><div class='del'>-{0x8aa9,    0x0096}, {0x8aaa,    0x0022}, {0x8aab,    0x0084},</div><div class='del'>-{0x8aac,    0x0080}, {0x8aad,    0x0044}, {0x8aae,    0x0044},</div><div class='del'>-{0x8aaf,    0x0044}, {0x8ab0,    0x001b}, {0x8ab1,    0x00d6},</div><div class='del'>-{0x8ab2,    0x0022}, {0x8ab3,    0x00c4}, {0x8ab4,    0x006f},</div><div class='del'>-{0x8ab5,    0x001b}, {0x8ab6,    0x0097}, {0x8ab7,    0x0022},</div><div class='del'>-{0x8ab8,    0x0039}, {0x8ab9,    0x0027}, {0x8aba,    0x000c},</div><div class='del'>-{0x8abb,    0x007c}, {0x8abc,    0x0082}, {0x8abd,    0x0006},</div><div class='del'>-{0x8abe,    0x00bd}, {0x8abf,    0x00d9}, {0x8ac0,    0x00ed},</div><div class='del'>-{0x8ac1,    0x00b6}, {0x8ac2,    0x0082}, {0x8ac3,    0x0007},</div><div class='del'>-{0x8ac4,    0x007e}, {0x8ac5,    0x008a}, {0x8ac6,    0x00b9},</div><div class='del'>-{0x8ac7,    0x007f}, {0x8ac8,    0x0082}, {0x8ac9,    0x0006},</div><div class='del'>-{0x8aca,    0x0039}, { 0x0, 0x0 }</div><div class='del'>-};</div><div class='del'>-#else</div><div class='del'>-cas_saturn_patch_t cas_saturn_patch[] = {</div><div class='del'>-{0x8200,    0x007e}, {0x8201,    0x0082}, {0x8202,    0x0009},</div><div class='del'>-{0x8203,    0x0000}, {0x8204,    0x0000}, {0x8205,    0x0000},</div><div class='del'>-{0x8206,    0x0000}, {0x8207,    0x0000}, {0x8208,    0x0000},</div><div class='del'>-{0x8209,    0x008e}, {0x820a,    0x008e}, {0x820b,    0x00ff},</div><div class='del'>-{0x820c,    0x00ce}, {0x820d,    0x0082}, {0x820e,    0x0025},</div><div class='del'>-{0x820f,    0x00ff}, {0x8210,    0x0001}, {0x8211,    0x000f},</div><div class='del'>-{0x8212,    0x00ce}, {0x8213,    0x0084}, {0x8214,    0x0026},</div><div class='del'>-{0x8215,    0x00ff}, {0x8216,    0x0001}, {0x8217,    0x0011},</div><div class='del'>-{0x8218,    0x00ce}, {0x8219,    0x0085}, {0x821a,    0x003d},</div><div class='del'>-{0x821b,    0x00df}, {0x821c,    0x00e5}, {0x821d,    0x0086},</div><div class='del'>-{0x821e,    0x0039}, {0x821f,    0x00b7}, {0x8220,    0x008f},</div><div class='del'>-{0x8221,    0x00f8}, {0x8222,    0x007e}, {0x8223,    0x00c3},</div><div class='del'>-{0x8224,    0x00c2}, {0x8225,    0x0096}, {0x8226,    0x0047},</div><div class='del'>-{0x8227,    0x0084}, {0x8228,    0x00f3}, {0x8229,    0x008a},</div><div class='del'>-{0x822a,    0x0000}, {0x822b,    0x0097}, {0x822c,    0x0047},</div><div class='del'>-{0x822d,    0x00ce}, {0x822e,    0x0082}, {0x822f,    0x0033},</div><div class='del'>-{0x8230,    0x00ff}, {0x8231,    0x0001}, {0x8232,    0x000f},</div><div class='del'>-{0x8233,    0x0096}, {0x8234,    0x0046}, {0x8235,    0x0084},</div><div class='del'>-{0x8236,    0x000c}, {0x8237,    0x0081}, {0x8238,    0x0004},</div><div class='del'>-{0x8239,    0x0027}, {0x823a,    0x000b}, {0x823b,    0x0096},</div><div class='del'>-{0x823c,    0x0046}, {0x823d,    0x0084}, {0x823e,    0x000c},</div><div class='del'>-{0x823f,    0x0081}, {0x8240,    0x0008}, {0x8241,    0x0027},</div><div class='del'>-{0x8242,    0x0057}, {0x8243,    0x007e}, {0x8244,    0x0084},</div><div class='del'>-{0x8245,    0x0025}, {0x8246,    0x0096}, {0x8247,    0x0047},</div><div class='del'>-{0x8248,    0x0084}, {0x8249,    0x00f3}, {0x824a,    0x008a},</div><div class='del'>-{0x824b,    0x0004}, {0x824c,    0x0097}, {0x824d,    0x0047},</div><div class='del'>-{0x824e,    0x00ce}, {0x824f,    0x0082}, {0x8250,    0x0054},</div><div class='del'>-{0x8251,    0x00ff}, {0x8252,    0x0001}, {0x8253,    0x000f},</div><div class='del'>-{0x8254,    0x0096}, {0x8255,    0x0046}, {0x8256,    0x0084},</div><div class='del'>-{0x8257,    0x000c}, {0x8258,    0x0081}, {0x8259,    0x0004},</div><div class='del'>-{0x825a,    0x0026}, {0x825b,    0x0038}, {0x825c,    0x00b6},</div><div class='del'>-{0x825d,    0x0012}, {0x825e,    0x0020}, {0x825f,    0x0084},</div><div class='del'>-{0x8260,    0x0020}, {0x8261,    0x0026}, {0x8262,    0x0003},</div><div class='del'>-{0x8263,    0x007e}, {0x8264,    0x0084}, {0x8265,    0x0025},</div><div class='del'>-{0x8266,    0x0096}, {0x8267,    0x007b}, {0x8268,    0x00d6},</div><div class='del'>-{0x8269,    0x007c}, {0x826a,    0x00fe}, {0x826b,    0x008f},</div><div class='del'>-{0x826c,    0x0056}, {0x826d,    0x00bd}, {0x826e,    0x00f7},</div><div class='del'>-{0x826f,    0x00b6}, {0x8270,    0x00fe}, {0x8271,    0x008f},</div><div class='del'>-{0x8272,    0x004e}, {0x8273,    0x00bd}, {0x8274,    0x00ec},</div><div class='del'>-{0x8275,    0x008e}, {0x8276,    0x00bd}, {0x8277,    0x00fa},</div><div class='del'>-{0x8278,    0x00f7}, {0x8279,    0x00bd}, {0x827a,    0x00f7},</div><div class='del'>-{0x827b,    0x0028}, {0x827c,    0x00ce}, {0x827d,    0x0082},</div><div class='del'>-{0x827e,    0x0082}, {0x827f,    0x00ff}, {0x8280,    0x0001},</div><div class='del'>-{0x8281,    0x000f}, {0x8282,    0x0096}, {0x8283,    0x0046},</div><div class='del'>-{0x8284,    0x0084}, {0x8285,    0x000c}, {0x8286,    0x0081},</div><div class='del'>-{0x8287,    0x0004}, {0x8288,    0x0026}, {0x8289,    0x000a},</div><div class='del'>-{0x828a,    0x00b6}, {0x828b,    0x0012}, {0x828c,    0x0020},</div><div class='del'>-{0x828d,    0x0084}, {0x828e,    0x0020}, {0x828f,    0x0027},</div><div class='del'>-{0x8290,    0x00b5}, {0x8291,    0x007e}, {0x8292,    0x0084},</div><div class='del'>-{0x8293,    0x0025}, {0x8294,    0x00bd}, {0x8295,    0x00f7},</div><div class='del'>-{0x8296,    0x001f}, {0x8297,    0x007e}, {0x8298,    0x0084},</div><div class='del'>-{0x8299,    0x001f}, {0x829a,    0x0096}, {0x829b,    0x0047},</div><div class='del'>-{0x829c,    0x0084}, {0x829d,    0x00f3}, {0x829e,    0x008a},</div><div class='del'>-{0x829f,    0x0008}, {0x82a0,    0x0097}, {0x82a1,    0x0047},</div><div class='del'>-{0x82a2,    0x00de}, {0x82a3,    0x00e1}, {0x82a4,    0x00ad},</div><div class='del'>-{0x82a5,    0x0000}, {0x82a6,    0x00ce}, {0x82a7,    0x0082},</div><div class='del'>-{0x82a8,    0x00af}, {0x82a9,    0x00ff}, {0x82aa,    0x0001},</div><div class='del'>-{0x82ab,    0x000f}, {0x82ac,    0x007e}, {0x82ad,    0x0084},</div><div class='del'>-{0x82ae,    0x0025}, {0x82af,    0x0096}, {0x82b0,    0x0041},</div><div class='del'>-{0x82b1,    0x0085}, {0x82b2,    0x0010}, {0x82b3,    0x0026},</div><div class='del'>-{0x82b4,    0x0006}, {0x82b5,    0x0096}, {0x82b6,    0x0023},</div><div class='del'>-{0x82b7,    0x0085}, {0x82b8,    0x0040}, {0x82b9,    0x0027},</div><div class='del'>-{0x82ba,    0x0006}, {0x82bb,    0x00bd}, {0x82bc,    0x00ed},</div><div class='del'>-{0x82bd,    0x0000}, {0x82be,    0x007e}, {0x82bf,    0x0083},</div><div class='del'>-{0x82c0,    0x00a2}, {0x82c1,    0x00de}, {0x82c2,    0x0042},</div><div class='del'>-{0x82c3,    0x00bd}, {0x82c4,    0x00eb}, {0x82c5,    0x008e},</div><div class='del'>-{0x82c6,    0x0096}, {0x82c7,    0x0024}, {0x82c8,    0x0084},</div><div class='del'>-{0x82c9,    0x0008}, {0x82ca,    0x0027}, {0x82cb,    0x0003},</div><div class='del'>-{0x82cc,    0x007e}, {0x82cd,    0x0083}, {0x82ce,    0x00df},</div><div class='del'>-{0x82cf,    0x0096}, {0x82d0,    0x007b}, {0x82d1,    0x00d6},</div><div class='del'>-{0x82d2,    0x007c}, {0x82d3,    0x00fe}, {0x82d4,    0x008f},</div><div class='del'>-{0x82d5,    0x0056}, {0x82d6,    0x00bd}, {0x82d7,    0x00f7},</div><div class='del'>-{0x82d8,    0x00b6}, {0x82d9,    0x00fe}, {0x82da,    0x008f},</div><div class='del'>-{0x82db,    0x0050}, {0x82dc,    0x00bd}, {0x82dd,    0x00ec},</div><div class='del'>-{0x82de,    0x008e}, {0x82df,    0x00bd}, {0x82e0,    0x00fa},</div><div class='del'>-{0x82e1,    0x00f7}, {0x82e2,    0x0086}, {0x82e3,    0x0011},</div><div class='del'>-{0x82e4,    0x00c6}, {0x82e5,    0x0049}, {0x82e6,    0x00bd},</div><div class='del'>-{0x82e7,    0x00e4}, {0x82e8,    0x0012}, {0x82e9,    0x00ce},</div><div class='del'>-{0x82ea,    0x0082}, {0x82eb,    0x00ef}, {0x82ec,    0x00ff},</div><div class='del'>-{0x82ed,    0x0001}, {0x82ee,    0x000f}, {0x82ef,    0x0096},</div><div class='del'>-{0x82f0,    0x0046}, {0x82f1,    0x0084}, {0x82f2,    0x000c},</div><div class='del'>-{0x82f3,    0x0081}, {0x82f4,    0x0000}, {0x82f5,    0x0027},</div><div class='del'>-{0x82f6,    0x0017}, {0x82f7,    0x00c6}, {0x82f8,    0x0049},</div><div class='del'>-{0x82f9,    0x00bd}, {0x82fa,    0x00e4}, {0x82fb,    0x0091},</div><div class='del'>-{0x82fc,    0x0024}, {0x82fd,    0x000d}, {0x82fe,    0x00b6},</div><div class='del'>-{0x82ff,    0x0012}, {0x8300,    0x0020}, {0x8301,    0x0085},</div><div class='del'>-{0x8302,    0x0020}, {0x8303,    0x0026}, {0x8304,    0x000c},</div><div class='del'>-{0x8305,    0x00ce}, {0x8306,    0x0082}, {0x8307,    0x00c1},</div><div class='del'>-{0x8308,    0x00ff}, {0x8309,    0x0001}, {0x830a,    0x000f},</div><div class='del'>-{0x830b,    0x007e}, {0x830c,    0x0084}, {0x830d,    0x0025},</div><div class='del'>-{0x830e,    0x007e}, {0x830f,    0x0084}, {0x8310,    0x0016},</div><div class='del'>-{0x8311,    0x00fe}, {0x8312,    0x008f}, {0x8313,    0x0052},</div><div class='del'>-{0x8314,    0x00bd}, {0x8315,    0x00ec}, {0x8316,    0x008e},</div><div class='del'>-{0x8317,    0x00bd}, {0x8318,    0x00fa}, {0x8319,    0x00f7},</div><div class='del'>-{0x831a,    0x0086}, {0x831b,    0x006a}, {0x831c,    0x00c6},</div><div class='del'>-{0x831d,    0x0049}, {0x831e,    0x00bd}, {0x831f,    0x00e4},</div><div class='del'>-{0x8320,    0x0012}, {0x8321,    0x00ce}, {0x8322,    0x0083},</div><div class='del'>-{0x8323,    0x0027}, {0x8324,    0x00ff}, {0x8325,    0x0001},</div><div class='del'>-{0x8326,    0x000f}, {0x8327,    0x0096}, {0x8328,    0x0046},</div><div class='del'>-{0x8329,    0x0084}, {0x832a,    0x000c}, {0x832b,    0x0081},</div><div class='del'>-{0x832c,    0x0000}, {0x832d,    0x0027}, {0x832e,    0x000a},</div><div class='del'>-{0x832f,    0x00c6}, {0x8330,    0x0049}, {0x8331,    0x00bd},</div><div class='del'>-{0x8332,    0x00e4}, {0x8333,    0x0091}, {0x8334,    0x0025},</div><div class='del'>-{0x8335,    0x0006}, {0x8336,    0x007e}, {0x8337,    0x0084},</div><div class='del'>-{0x8338,    0x0025}, {0x8339,    0x007e}, {0x833a,    0x0084},</div><div class='del'>-{0x833b,    0x0016}, {0x833c,    0x00b6}, {0x833d,    0x0018},</div><div class='del'>-{0x833e,    0x0070}, {0x833f,    0x00bb}, {0x8340,    0x0019},</div><div class='del'>-{0x8341,    0x0070}, {0x8342,    0x002a}, {0x8343,    0x0004},</div><div class='del'>-{0x8344,    0x0081}, {0x8345,    0x00af}, {0x8346,    0x002e},</div><div class='del'>-{0x8347,    0x0019}, {0x8348,    0x0096}, {0x8349,    0x007b},</div><div class='del'>-{0x834a,    0x00f6}, {0x834b,    0x0020}, {0x834c,    0x0007},</div><div class='del'>-{0x834d,    0x00fa}, {0x834e,    0x0020}, {0x834f,    0x0027},</div><div class='del'>-{0x8350,    0x00c4}, {0x8351,    0x0038}, {0x8352,    0x0081},</div><div class='del'>-{0x8353,    0x0038}, {0x8354,    0x0027}, {0x8355,    0x000b},</div><div class='del'>-{0x8356,    0x00f6}, {0x8357,    0x0020}, {0x8358,    0x0007},</div><div class='del'>-{0x8359,    0x00fa}, {0x835a,    0x0020}, {0x835b,    0x0027},</div><div class='del'>-{0x835c,    0x00cb}, {0x835d,    0x0008}, {0x835e,    0x007e},</div><div class='del'>-{0x835f,    0x0082}, {0x8360,    0x00d3}, {0x8361,    0x00bd},</div><div class='del'>-{0x8362,    0x00f7}, {0x8363,    0x0066}, {0x8364,    0x0086},</div><div class='del'>-{0x8365,    0x0074}, {0x8366,    0x00c6}, {0x8367,    0x0049},</div><div class='del'>-{0x8368,    0x00bd}, {0x8369,    0x00e4}, {0x836a,    0x0012},</div><div class='del'>-{0x836b,    0x00ce}, {0x836c,    0x0083}, {0x836d,    0x0071},</div><div class='del'>-{0x836e,    0x00ff}, {0x836f,    0x0001}, {0x8370,    0x000f},</div><div class='del'>-{0x8371,    0x0096}, {0x8372,    0x0046}, {0x8373,    0x0084},</div><div class='del'>-{0x8374,    0x000c}, {0x8375,    0x0081}, {0x8376,    0x0008},</div><div class='del'>-{0x8377,    0x0026}, {0x8378,    0x000a}, {0x8379,    0x00c6},</div><div class='del'>-{0x837a,    0x0049}, {0x837b,    0x00bd}, {0x837c,    0x00e4},</div><div class='del'>-{0x837d,    0x0091}, {0x837e,    0x0025}, {0x837f,    0x0006},</div><div class='del'>-{0x8380,    0x007e}, {0x8381,    0x0084}, {0x8382,    0x0025},</div><div class='del'>-{0x8383,    0x007e}, {0x8384,    0x0084}, {0x8385,    0x0016},</div><div class='del'>-{0x8386,    0x00bd}, {0x8387,    0x00f7}, {0x8388,    0x003e},</div><div class='del'>-{0x8389,    0x0026}, {0x838a,    0x000e}, {0x838b,    0x00bd},</div><div class='del'>-{0x838c,    0x00e5}, {0x838d,    0x0009}, {0x838e,    0x0026},</div><div class='del'>-{0x838f,    0x0006}, {0x8390,    0x00ce}, {0x8391,    0x0082},</div><div class='del'>-{0x8392,    0x00c1}, {0x8393,    0x00ff}, {0x8394,    0x0001},</div><div class='del'>-{0x8395,    0x000f}, {0x8396,    0x007e}, {0x8397,    0x0084},</div><div class='del'>-{0x8398,    0x0025}, {0x8399,    0x00fe}, {0x839a,    0x008f},</div><div class='del'>-{0x839b,    0x0054}, {0x839c,    0x00bd}, {0x839d,    0x00ec},</div><div class='del'>-{0x839e,    0x008e}, {0x839f,    0x00bd}, {0x83a0,    0x00fa},</div><div class='del'>-{0x83a1,    0x00f7}, {0x83a2,    0x00bd}, {0x83a3,    0x00f7},</div><div class='del'>-{0x83a4,    0x0033}, {0x83a5,    0x0086}, {0x83a6,    0x000f},</div><div class='del'>-{0x83a7,    0x00c6}, {0x83a8,    0x0051}, {0x83a9,    0x00bd},</div><div class='del'>-{0x83aa,    0x00e4}, {0x83ab,    0x0012}, {0x83ac,    0x00ce},</div><div class='del'>-{0x83ad,    0x0083}, {0x83ae,    0x00b2}, {0x83af,    0x00ff},</div><div class='del'>-{0x83b0,    0x0001}, {0x83b1,    0x000f}, {0x83b2,    0x0096},</div><div class='del'>-{0x83b3,    0x0046}, {0x83b4,    0x0084}, {0x83b5,    0x000c},</div><div class='del'>-{0x83b6,    0x0081}, {0x83b7,    0x0008}, {0x83b8,    0x0026},</div><div class='del'>-{0x83b9,    0x005c}, {0x83ba,    0x00b6}, {0x83bb,    0x0012},</div><div class='del'>-{0x83bc,    0x0020}, {0x83bd,    0x0084}, {0x83be,    0x003f},</div><div class='del'>-{0x83bf,    0x0081}, {0x83c0,    0x003a}, {0x83c1,    0x0027},</div><div class='del'>-{0x83c2,    0x001c}, {0x83c3,    0x0096}, {0x83c4,    0x0023},</div><div class='del'>-{0x83c5,    0x0085}, {0x83c6,    0x0040}, {0x83c7,    0x0027},</div><div class='del'>-{0x83c8,    0x0003}, {0x83c9,    0x007e}, {0x83ca,    0x0084},</div><div class='del'>-{0x83cb,    0x0025}, {0x83cc,    0x00c6}, {0x83cd,    0x0051},</div><div class='del'>-{0x83ce,    0x00bd}, {0x83cf,    0x00e4}, {0x83d0,    0x0091},</div><div class='del'>-{0x83d1,    0x0025}, {0x83d2,    0x0003}, {0x83d3,    0x007e},</div><div class='del'>-{0x83d4,    0x0084}, {0x83d5,    0x0025}, {0x83d6,    0x00ce},</div><div class='del'>-{0x83d7,    0x0082}, {0x83d8,    0x00c1}, {0x83d9,    0x00ff},</div><div class='del'>-{0x83da,    0x0001}, {0x83db,    0x000f}, {0x83dc,    0x007e},</div><div class='del'>-{0x83dd,    0x0084}, {0x83de,    0x0025}, {0x83df,    0x00bd},</div><div class='del'>-{0x83e0,    0x00f8}, {0x83e1,    0x0037}, {0x83e2,    0x007c},</div><div class='del'>-{0x83e3,    0x0000}, {0x83e4,    0x007a}, {0x83e5,    0x00ce},</div><div class='del'>-{0x83e6,    0x0083}, {0x83e7,    0x00ee}, {0x83e8,    0x00ff},</div><div class='del'>-{0x83e9,    0x0001}, {0x83ea,    0x000f}, {0x83eb,    0x007e},</div><div class='del'>-{0x83ec,    0x0084}, {0x83ed,    0x0025}, {0x83ee,    0x0096},</div><div class='del'>-{0x83ef,    0x0046}, {0x83f0,    0x0084}, {0x83f1,    0x000c},</div><div class='del'>-{0x83f2,    0x0081}, {0x83f3,    0x0008}, {0x83f4,    0x0026},</div><div class='del'>-{0x83f5,    0x0020}, {0x83f6,    0x0096}, {0x83f7,    0x0024},</div><div class='del'>-{0x83f8,    0x0084}, {0x83f9,    0x0008}, {0x83fa,    0x0026},</div><div class='del'>-{0x83fb,    0x0029}, {0x83fc,    0x00b6}, {0x83fd,    0x0018},</div><div class='del'>-{0x83fe,    0x0082}, {0x83ff,    0x00bb}, {0x8400,    0x0019},</div><div class='del'>-{0x8401,    0x0082}, {0x8402,    0x00b1}, {0x8403,    0x0001},</div><div class='del'>-{0x8404,    0x003b}, {0x8405,    0x0022}, {0x8406,    0x0009},</div><div class='del'>-{0x8407,    0x00b6}, {0x8408,    0x0012}, {0x8409,    0x0020},</div><div class='del'>-{0x840a,    0x0084}, {0x840b,    0x0037}, {0x840c,    0x0081},</div><div class='del'>-{0x840d,    0x0032}, {0x840e,    0x0027}, {0x840f,    0x0015},</div><div class='del'>-{0x8410,    0x00bd}, {0x8411,    0x00f8}, {0x8412,    0x0044},</div><div class='del'>-{0x8413,    0x007e}, {0x8414,    0x0082}, {0x8415,    0x00c1},</div><div class='del'>-{0x8416,    0x00bd}, {0x8417,    0x00f7}, {0x8418,    0x001f},</div><div class='del'>-{0x8419,    0x00bd}, {0x841a,    0x00f8}, {0x841b,    0x0044},</div><div class='del'>-{0x841c,    0x00bd}, {0x841d,    0x00fc}, {0x841e,    0x0029},</div><div class='del'>-{0x841f,    0x00ce}, {0x8420,    0x0082}, {0x8421,    0x0025},</div><div class='del'>-{0x8422,    0x00ff}, {0x8423,    0x0001}, {0x8424,    0x000f},</div><div class='del'>-{0x8425,    0x0039}, {0x8426,    0x0096}, {0x8427,    0x0047},</div><div class='del'>-{0x8428,    0x0084}, {0x8429,    0x00fc}, {0x842a,    0x008a},</div><div class='del'>-{0x842b,    0x0000}, {0x842c,    0x0097}, {0x842d,    0x0047},</div><div class='del'>-{0x842e,    0x00ce}, {0x842f,    0x0084}, {0x8430,    0x0034},</div><div class='del'>-{0x8431,    0x00ff}, {0x8432,    0x0001}, {0x8433,    0x0011},</div><div class='del'>-{0x8434,    0x0096}, {0x8435,    0x0046}, {0x8436,    0x0084},</div><div class='del'>-{0x8437,    0x0003}, {0x8438,    0x0081}, {0x8439,    0x0002},</div><div class='del'>-{0x843a,    0x0027}, {0x843b,    0x0003}, {0x843c,    0x007e},</div><div class='del'>-{0x843d,    0x0085}, {0x843e,    0x001e}, {0x843f,    0x0096},</div><div class='del'>-{0x8440,    0x0047}, {0x8441,    0x0084}, {0x8442,    0x00fc},</div><div class='del'>-{0x8443,    0x008a}, {0x8444,    0x0002}, {0x8445,    0x0097},</div><div class='del'>-{0x8446,    0x0047}, {0x8447,    0x00de}, {0x8448,    0x00e1},</div><div class='del'>-{0x8449,    0x00ad}, {0x844a,    0x0000}, {0x844b,    0x0086},</div><div class='del'>-{0x844c,    0x0001}, {0x844d,    0x00b7}, {0x844e,    0x0012},</div><div class='del'>-{0x844f,    0x0051}, {0x8450,    0x00bd}, {0x8451,    0x00f7},</div><div class='del'>-{0x8452,    0x0014}, {0x8453,    0x00b6}, {0x8454,    0x0010},</div><div class='del'>-{0x8455,    0x0031}, {0x8456,    0x0084}, {0x8457,    0x00fd},</div><div class='del'>-{0x8458,    0x00b7}, {0x8459,    0x0010}, {0x845a,    0x0031},</div><div class='del'>-{0x845b,    0x00bd}, {0x845c,    0x00f8}, {0x845d,    0x001e},</div><div class='del'>-{0x845e,    0x0096}, {0x845f,    0x0081}, {0x8460,    0x00d6},</div><div class='del'>-{0x8461,    0x0082}, {0x8462,    0x00fe}, {0x8463,    0x008f},</div><div class='del'>-{0x8464,    0x005a}, {0x8465,    0x00bd}, {0x8466,    0x00f7},</div><div class='del'>-{0x8467,    0x00b6}, {0x8468,    0x00fe}, {0x8469,    0x008f},</div><div class='del'>-{0x846a,    0x005c}, {0x846b,    0x00bd}, {0x846c,    0x00ec},</div><div class='del'>-{0x846d,    0x008e}, {0x846e,    0x00bd}, {0x846f,    0x00fa},</div><div class='del'>-{0x8470,    0x00f7}, {0x8471,    0x0086}, {0x8472,    0x0008},</div><div class='del'>-{0x8473,    0x00d6}, {0x8474,    0x0000}, {0x8475,    0x00c5},</div><div class='del'>-{0x8476,    0x0010}, {0x8477,    0x0026}, {0x8478,    0x0002},</div><div class='del'>-{0x8479,    0x008b}, {0x847a,    0x0020}, {0x847b,    0x00c6},</div><div class='del'>-{0x847c,    0x0051}, {0x847d,    0x00bd}, {0x847e,    0x00e4},</div><div class='del'>-{0x847f,    0x0012}, {0x8480,    0x00ce}, {0x8481,    0x0084},</div><div class='del'>-{0x8482,    0x0086}, {0x8483,    0x00ff}, {0x8484,    0x0001},</div><div class='del'>-{0x8485,    0x0011}, {0x8486,    0x0096}, {0x8487,    0x0046},</div><div class='del'>-{0x8488,    0x0084}, {0x8489,    0x0003}, {0x848a,    0x0081},</div><div class='del'>-{0x848b,    0x0002}, {0x848c,    0x0027}, {0x848d,    0x0003},</div><div class='del'>-{0x848e,    0x007e}, {0x848f,    0x0085}, {0x8490,    0x000f},</div><div class='del'>-{0x8491,    0x00c6}, {0x8492,    0x0051}, {0x8493,    0x00bd},</div><div class='del'>-{0x8494,    0x00e4}, {0x8495,    0x0091}, {0x8496,    0x0025},</div><div class='del'>-{0x8497,    0x0003}, {0x8498,    0x007e}, {0x8499,    0x0085},</div><div class='del'>-{0x849a,    0x001e}, {0x849b,    0x0096}, {0x849c,    0x0044},</div><div class='del'>-{0x849d,    0x0085}, {0x849e,    0x0010}, {0x849f,    0x0026},</div><div class='del'>-{0x84a0,    0x000a}, {0x84a1,    0x00b6}, {0x84a2,    0x0012},</div><div class='del'>-{0x84a3,    0x0050}, {0x84a4,    0x00ba}, {0x84a5,    0x0001},</div><div class='del'>-{0x84a6,    0x003c}, {0x84a7,    0x0085}, {0x84a8,    0x0010},</div><div class='del'>-{0x84a9,    0x0027}, {0x84aa,    0x00a8}, {0x84ab,    0x00bd},</div><div class='del'>-{0x84ac,    0x00f7}, {0x84ad,    0x0066}, {0x84ae,    0x00ce},</div><div class='del'>-{0x84af,    0x0084}, {0x84b0,    0x00b7}, {0x84b1,    0x00ff},</div><div class='del'>-{0x84b2,    0x0001}, {0x84b3,    0x0011}, {0x84b4,    0x007e},</div><div class='del'>-{0x84b5,    0x0085}, {0x84b6,    0x001e}, {0x84b7,    0x0096},</div><div class='del'>-{0x84b8,    0x0046}, {0x84b9,    0x0084}, {0x84ba,    0x0003},</div><div class='del'>-{0x84bb,    0x0081}, {0x84bc,    0x0002}, {0x84bd,    0x0026},</div><div class='del'>-{0x84be,    0x0050}, {0x84bf,    0x00b6}, {0x84c0,    0x0012},</div><div class='del'>-{0x84c1,    0x0030}, {0x84c2,    0x0084}, {0x84c3,    0x0003},</div><div class='del'>-{0x84c4,    0x0081}, {0x84c5,    0x0001}, {0x84c6,    0x0027},</div><div class='del'>-{0x84c7,    0x0003}, {0x84c8,    0x007e}, {0x84c9,    0x0085},</div><div class='del'>-{0x84ca,    0x001e}, {0x84cb,    0x0096}, {0x84cc,    0x0044},</div><div class='del'>-{0x84cd,    0x0085}, {0x84ce,    0x0010}, {0x84cf,    0x0026},</div><div class='del'>-{0x84d0,    0x0013}, {0x84d1,    0x00b6}, {0x84d2,    0x0012},</div><div class='del'>-{0x84d3,    0x0050}, {0x84d4,    0x00ba}, {0x84d5,    0x0001},</div><div class='del'>-{0x84d6,    0x003c}, {0x84d7,    0x0085}, {0x84d8,    0x0010},</div><div class='del'>-{0x84d9,    0x0026}, {0x84da,    0x0009}, {0x84db,    0x00ce},</div><div class='del'>-{0x84dc,    0x0084}, {0x84dd,    0x0053}, {0x84de,    0x00ff},</div><div class='del'>-{0x84df,    0x0001}, {0x84e0,    0x0011}, {0x84e1,    0x007e},</div><div class='del'>-{0x84e2,    0x0085}, {0x84e3,    0x001e}, {0x84e4,    0x00b6},</div><div class='del'>-{0x84e5,    0x0010}, {0x84e6,    0x0031}, {0x84e7,    0x008a},</div><div class='del'>-{0x84e8,    0x0002}, {0x84e9,    0x00b7}, {0x84ea,    0x0010},</div><div class='del'>-{0x84eb,    0x0031}, {0x84ec,    0x00bd}, {0x84ed,    0x0085},</div><div class='del'>-{0x84ee,    0x001f}, {0x84ef,    0x00bd}, {0x84f0,    0x00f8},</div><div class='del'>-{0x84f1,    0x0037}, {0x84f2,    0x007c}, {0x84f3,    0x0000},</div><div class='del'>-{0x84f4,    0x0080}, {0x84f5,    0x00ce}, {0x84f6,    0x0084},</div><div class='del'>-{0x84f7,    0x00fe}, {0x84f8,    0x00ff}, {0x84f9,    0x0001},</div><div class='del'>-{0x84fa,    0x0011}, {0x84fb,    0x007e}, {0x84fc,    0x0085},</div><div class='del'>-{0x84fd,    0x001e}, {0x84fe,    0x0096}, {0x84ff,    0x0046},</div><div class='del'>-{0x8500,    0x0084}, {0x8501,    0x0003}, {0x8502,    0x0081},</div><div class='del'>-{0x8503,    0x0002}, {0x8504,    0x0026}, {0x8505,    0x0009},</div><div class='del'>-{0x8506,    0x00b6}, {0x8507,    0x0012}, {0x8508,    0x0030},</div><div class='del'>-{0x8509,    0x0084}, {0x850a,    0x0003}, {0x850b,    0x0081},</div><div class='del'>-{0x850c,    0x0001}, {0x850d,    0x0027}, {0x850e,    0x000f},</div><div class='del'>-{0x850f,    0x00bd}, {0x8510,    0x00f8}, {0x8511,    0x0044},</div><div class='del'>-{0x8512,    0x00bd}, {0x8513,    0x00f7}, {0x8514,    0x000b},</div><div class='del'>-{0x8515,    0x00bd}, {0x8516,    0x00fc}, {0x8517,    0x0029},</div><div class='del'>-{0x8518,    0x00ce}, {0x8519,    0x0084}, {0x851a,    0x0026},</div><div class='del'>-{0x851b,    0x00ff}, {0x851c,    0x0001}, {0x851d,    0x0011},</div><div class='del'>-{0x851e,    0x0039}, {0x851f,    0x00d6}, {0x8520,    0x0022},</div><div class='del'>-{0x8521,    0x00c4}, {0x8522,    0x000f}, {0x8523,    0x00b6},</div><div class='del'>-{0x8524,    0x0012}, {0x8525,    0x0030}, {0x8526,    0x00ba},</div><div class='del'>-{0x8527,    0x0012}, {0x8528,    0x0032}, {0x8529,    0x0084},</div><div class='del'>-{0x852a,    0x0004}, {0x852b,    0x0027}, {0x852c,    0x000d},</div><div class='del'>-{0x852d,    0x0096}, {0x852e,    0x0022}, {0x852f,    0x0085},</div><div class='del'>-{0x8530,    0x0004}, {0x8531,    0x0027}, {0x8532,    0x0005},</div><div class='del'>-{0x8533,    0x00ca}, {0x8534,    0x0010}, {0x8535,    0x007e},</div><div class='del'>-{0x8536,    0x0085}, {0x8537,    0x003a}, {0x8538,    0x00ca},</div><div class='del'>-{0x8539,    0x0020}, {0x853a,    0x00d7}, {0x853b,    0x0022},</div><div class='del'>-{0x853c,    0x0039}, {0x853d,    0x0086}, {0x853e,    0x0000},</div><div class='del'>-{0x853f,    0x0097}, {0x8540,    0x0083}, {0x8541,    0x0018},</div><div class='del'>-{0x8542,    0x00ce}, {0x8543,    0x001c}, {0x8544,    0x0000},</div><div class='del'>-{0x8545,    0x00bd}, {0x8546,    0x00eb}, {0x8547,    0x0046},</div><div class='del'>-{0x8548,    0x0096}, {0x8549,    0x0057}, {0x854a,    0x0085},</div><div class='del'>-{0x854b,    0x0001}, {0x854c,    0x0027}, {0x854d,    0x0002},</div><div class='del'>-{0x854e,    0x004f}, {0x854f,    0x0039}, {0x8550,    0x0085},</div><div class='del'>-{0x8551,    0x0002}, {0x8552,    0x0027}, {0x8553,    0x0001},</div><div class='del'>-{0x8554,    0x0039}, {0x8555,    0x007f}, {0x8556,    0x008f},</div><div class='del'>-{0x8557,    0x007d}, {0x8558,    0x0086}, {0x8559,    0x0004},</div><div class='del'>-{0x855a,    0x00b7}, {0x855b,    0x0012}, {0x855c,    0x0004},</div><div class='del'>-{0x855d,    0x0086}, {0x855e,    0x0008}, {0x855f,    0x00b7},</div><div class='del'>-{0x8560,    0x0012}, {0x8561,    0x0007}, {0x8562,    0x0086},</div><div class='del'>-{0x8563,    0x0010}, {0x8564,    0x00b7}, {0x8565,    0x0012},</div><div class='del'>-{0x8566,    0x000c}, {0x8567,    0x0086}, {0x8568,    0x0007},</div><div class='del'>-{0x8569,    0x00b7}, {0x856a,    0x0012}, {0x856b,    0x0006},</div><div class='del'>-{0x856c,    0x00b6}, {0x856d,    0x008f}, {0x856e,    0x007d},</div><div class='del'>-{0x856f,    0x00b7}, {0x8570,    0x0012}, {0x8571,    0x0070},</div><div class='del'>-{0x8572,    0x0086}, {0x8573,    0x0001}, {0x8574,    0x00ba},</div><div class='del'>-{0x8575,    0x0012}, {0x8576,    0x0004}, {0x8577,    0x00b7},</div><div class='del'>-{0x8578,    0x0012}, {0x8579,    0x0004}, {0x857a,    0x0001},</div><div class='del'>-{0x857b,    0x0001}, {0x857c,    0x0001}, {0x857d,    0x0001},</div><div class='del'>-{0x857e,    0x0001}, {0x857f,    0x0001}, {0x8580,    0x00b6},</div><div class='del'>-{0x8581,    0x0012}, {0x8582,    0x0004}, {0x8583,    0x0084},</div><div class='del'>-{0x8584,    0x00fe}, {0x8585,    0x008a}, {0x8586,    0x0002},</div><div class='del'>-{0x8587,    0x00b7}, {0x8588,    0x0012}, {0x8589,    0x0004},</div><div class='del'>-{0x858a,    0x0001}, {0x858b,    0x0001}, {0x858c,    0x0001},</div><div class='del'>-{0x858d,    0x0001}, {0x858e,    0x0001}, {0x858f,    0x0001},</div><div class='del'>-{0x8590,    0x0086}, {0x8591,    0x00fd}, {0x8592,    0x00b4},</div><div class='del'>-{0x8593,    0x0012}, {0x8594,    0x0004}, {0x8595,    0x00b7},</div><div class='del'>-{0x8596,    0x0012}, {0x8597,    0x0004}, {0x8598,    0x00b6},</div><div class='del'>-{0x8599,    0x0012}, {0x859a,    0x0000}, {0x859b,    0x0084},</div><div class='del'>-{0x859c,    0x0008}, {0x859d,    0x0081}, {0x859e,    0x0008},</div><div class='del'>-{0x859f,    0x0027}, {0x85a0,    0x0016}, {0x85a1,    0x00b6},</div><div class='del'>-{0x85a2,    0x008f}, {0x85a3,    0x007d}, {0x85a4,    0x0081},</div><div class='del'>-{0x85a5,    0x000c}, {0x85a6,    0x0027}, {0x85a7,    0x0008},</div><div class='del'>-{0x85a8,    0x008b}, {0x85a9,    0x0004}, {0x85aa,    0x00b7},</div><div class='del'>-{0x85ab,    0x008f}, {0x85ac,    0x007d}, {0x85ad,    0x007e},</div><div class='del'>-{0x85ae,    0x0085}, {0x85af,    0x006c}, {0x85b0,    0x0086},</div><div class='del'>-{0x85b1,    0x0003}, {0x85b2,    0x0097}, {0x85b3,    0x0040},</div><div class='del'>-{0x85b4,    0x007e}, {0x85b5,    0x0089}, {0x85b6,    0x006e},</div><div class='del'>-{0x85b7,    0x0086}, {0x85b8,    0x0007}, {0x85b9,    0x00b7},</div><div class='del'>-{0x85ba,    0x0012}, {0x85bb,    0x0006}, {0x85bc,    0x005f},</div><div class='del'>-{0x85bd,    0x00f7}, {0x85be,    0x008f}, {0x85bf,    0x0082},</div><div class='del'>-{0x85c0,    0x005f}, {0x85c1,    0x00f7}, {0x85c2,    0x008f},</div><div class='del'>-{0x85c3,    0x007f}, {0x85c4,    0x00f7}, {0x85c5,    0x008f},</div><div class='del'>-{0x85c6,    0x0070}, {0x85c7,    0x00f7}, {0x85c8,    0x008f},</div><div class='del'>-{0x85c9,    0x0071}, {0x85ca,    0x00f7}, {0x85cb,    0x008f},</div><div class='del'>-{0x85cc,    0x0072}, {0x85cd,    0x00f7}, {0x85ce,    0x008f},</div><div class='del'>-{0x85cf,    0x0073}, {0x85d0,    0x00f7}, {0x85d1,    0x008f},</div><div class='del'>-{0x85d2,    0x0074}, {0x85d3,    0x00f7}, {0x85d4,    0x008f},</div><div class='del'>-{0x85d5,    0x0075}, {0x85d6,    0x00f7}, {0x85d7,    0x008f},</div><div class='del'>-{0x85d8,    0x0076}, {0x85d9,    0x00f7}, {0x85da,    0x008f},</div><div class='del'>-{0x85db,    0x0077}, {0x85dc,    0x00f7}, {0x85dd,    0x008f},</div><div class='del'>-{0x85de,    0x0078}, {0x85df,    0x00f7}, {0x85e0,    0x008f},</div><div class='del'>-{0x85e1,    0x0079}, {0x85e2,    0x00f7}, {0x85e3,    0x008f},</div><div class='del'>-{0x85e4,    0x007a}, {0x85e5,    0x00f7}, {0x85e6,    0x008f},</div><div class='del'>-{0x85e7,    0x007b}, {0x85e8,    0x00b6}, {0x85e9,    0x0012},</div><div class='del'>-{0x85ea,    0x0004}, {0x85eb,    0x008a}, {0x85ec,    0x0010},</div><div class='del'>-{0x85ed,    0x00b7}, {0x85ee,    0x0012}, {0x85ef,    0x0004},</div><div class='del'>-{0x85f0,    0x0086}, {0x85f1,    0x00e4}, {0x85f2,    0x00b7},</div><div class='del'>-{0x85f3,    0x0012}, {0x85f4,    0x0070}, {0x85f5,    0x00b7},</div><div class='del'>-{0x85f6,    0x0012}, {0x85f7,    0x0007}, {0x85f8,    0x00f7},</div><div class='del'>-{0x85f9,    0x0012}, {0x85fa,    0x0005}, {0x85fb,    0x00f7},</div><div class='del'>-{0x85fc,    0x0012}, {0x85fd,    0x0009}, {0x85fe,    0x0086},</div><div class='del'>-{0x85ff,    0x0008}, {0x8600,    0x00ba}, {0x8601,    0x0012},</div><div class='del'>-{0x8602,    0x0004}, {0x8603,    0x00b7}, {0x8604,    0x0012},</div><div class='del'>-{0x8605,    0x0004}, {0x8606,    0x0086}, {0x8607,    0x00f7},</div><div class='del'>-{0x8608,    0x00b4}, {0x8609,    0x0012}, {0x860a,    0x0004},</div><div class='del'>-{0x860b,    0x00b7}, {0x860c,    0x0012}, {0x860d,    0x0004},</div><div class='del'>-{0x860e,    0x0001}, {0x860f,    0x0001}, {0x8610,    0x0001},</div><div class='del'>-{0x8611,    0x0001}, {0x8612,    0x0001}, {0x8613,    0x0001},</div><div class='del'>-{0x8614,    0x00b6}, {0x8615,    0x0012}, {0x8616,    0x0008},</div><div class='del'>-{0x8617,    0x0027}, {0x8618,    0x007f}, {0x8619,    0x0081},</div><div class='del'>-{0x861a,    0x0080}, {0x861b,    0x0026}, {0x861c,    0x000b},</div><div class='del'>-{0x861d,    0x0086}, {0x861e,    0x0008}, {0x861f,    0x00ce},</div><div class='del'>-{0x8620,    0x008f}, {0x8621,    0x0079}, {0x8622,    0x00bd},</div><div class='del'>-{0x8623,    0x0089}, {0x8624,    0x007b}, {0x8625,    0x007e},</div><div class='del'>-{0x8626,    0x0086}, {0x8627,    0x008e}, {0x8628,    0x0081},</div><div class='del'>-{0x8629,    0x0040}, {0x862a,    0x0026}, {0x862b,    0x000b},</div><div class='del'>-{0x862c,    0x0086}, {0x862d,    0x0004}, {0x862e,    0x00ce},</div><div class='del'>-{0x862f,    0x008f}, {0x8630,    0x0076}, {0x8631,    0x00bd},</div><div class='del'>-{0x8632,    0x0089}, {0x8633,    0x007b}, {0x8634,    0x007e},</div><div class='del'>-{0x8635,    0x0086}, {0x8636,    0x008e}, {0x8637,    0x0081},</div><div class='del'>-{0x8638,    0x0020}, {0x8639,    0x0026}, {0x863a,    0x000b},</div><div class='del'>-{0x863b,    0x0086}, {0x863c,    0x0002}, {0x863d,    0x00ce},</div><div class='del'>-{0x863e,    0x008f}, {0x863f,    0x0073}, {0x8640,    0x00bd},</div><div class='del'>-{0x8641,    0x0089}, {0x8642,    0x007b}, {0x8643,    0x007e},</div><div class='del'>-{0x8644,    0x0086}, {0x8645,    0x008e}, {0x8646,    0x0081},</div><div class='del'>-{0x8647,    0x0010}, {0x8648,    0x0026}, {0x8649,    0x000b},</div><div class='del'>-{0x864a,    0x0086}, {0x864b,    0x0001}, {0x864c,    0x00ce},</div><div class='del'>-{0x864d,    0x008f}, {0x864e,    0x0070}, {0x864f,    0x00bd},</div><div class='del'>-{0x8650,    0x0089}, {0x8651,    0x007b}, {0x8652,    0x007e},</div><div class='del'>-{0x8653,    0x0086}, {0x8654,    0x008e}, {0x8655,    0x0081},</div><div class='del'>-{0x8656,    0x0008}, {0x8657,    0x0026}, {0x8658,    0x000b},</div><div class='del'>-{0x8659,    0x0086}, {0x865a,    0x0008}, {0x865b,    0x00ce},</div><div class='del'>-{0x865c,    0x008f}, {0x865d,    0x0079}, {0x865e,    0x00bd},</div><div class='del'>-{0x865f,    0x0089}, {0x8660,    0x007f}, {0x8661,    0x007e},</div><div class='del'>-{0x8662,    0x0086}, {0x8663,    0x008e}, {0x8664,    0x0081},</div><div class='del'>-{0x8665,    0x0004}, {0x8666,    0x0026}, {0x8667,    0x000b},</div><div class='del'>-{0x8668,    0x0086}, {0x8669,    0x0004}, {0x866a,    0x00ce},</div><div class='del'>-{0x866b,    0x008f}, {0x866c,    0x0076}, {0x866d,    0x00bd},</div><div class='del'>-{0x866e,    0x0089}, {0x866f,    0x007f}, {0x8670,    0x007e},</div><div class='del'>-{0x8671,    0x0086}, {0x8672,    0x008e}, {0x8673,    0x0081},</div><div class='del'>-{0x8674,    0x0002}, {0x8675,    0x0026}, {0x8676,    0x000b},</div><div class='del'>-{0x8677,    0x008a}, {0x8678,    0x0002}, {0x8679,    0x00ce},</div><div class='del'>-{0x867a,    0x008f}, {0x867b,    0x0073}, {0x867c,    0x00bd},</div><div class='del'>-{0x867d,    0x0089}, {0x867e,    0x007f}, {0x867f,    0x007e},</div><div class='del'>-{0x8680,    0x0086}, {0x8681,    0x008e}, {0x8682,    0x0081},</div><div class='del'>-{0x8683,    0x0001}, {0x8684,    0x0026}, {0x8685,    0x0008},</div><div class='del'>-{0x8686,    0x0086}, {0x8687,    0x0001}, {0x8688,    0x00ce},</div><div class='del'>-{0x8689,    0x008f}, {0x868a,    0x0070}, {0x868b,    0x00bd},</div><div class='del'>-{0x868c,    0x0089}, {0x868d,    0x007f}, {0x868e,    0x00b6},</div><div class='del'>-{0x868f,    0x008f}, {0x8690,    0x007f}, {0x8691,    0x0081},</div><div class='del'>-{0x8692,    0x000f}, {0x8693,    0x0026}, {0x8694,    0x0003},</div><div class='del'>-{0x8695,    0x007e}, {0x8696,    0x0087}, {0x8697,    0x0047},</div><div class='del'>-{0x8698,    0x00b6}, {0x8699,    0x0012}, {0x869a,    0x0009},</div><div class='del'>-{0x869b,    0x0084}, {0x869c,    0x0003}, {0x869d,    0x0081},</div><div class='del'>-{0x869e,    0x0003}, {0x869f,    0x0027}, {0x86a0,    0x0006},</div><div class='del'>-{0x86a1,    0x007c}, {0x86a2,    0x0012}, {0x86a3,    0x0009},</div><div class='del'>-{0x86a4,    0x007e}, {0x86a5,    0x0085}, {0x86a6,    0x00fe},</div><div class='del'>-{0x86a7,    0x00b6}, {0x86a8,    0x0012}, {0x86a9,    0x0006},</div><div class='del'>-{0x86aa,    0x0084}, {0x86ab,    0x0007}, {0x86ac,    0x0081},</div><div class='del'>-{0x86ad,    0x0007}, {0x86ae,    0x0027}, {0x86af,    0x0008},</div><div class='del'>-{0x86b0,    0x008b}, {0x86b1,    0x0001}, {0x86b2,    0x00b7},</div><div class='del'>-{0x86b3,    0x0012}, {0x86b4,    0x0006}, {0x86b5,    0x007e},</div><div class='del'>-{0x86b6,    0x0086}, {0x86b7,    0x00d5}, {0x86b8,    0x00b6},</div><div class='del'>-{0x86b9,    0x008f}, {0x86ba,    0x0082}, {0x86bb,    0x0026},</div><div class='del'>-{0x86bc,    0x000a}, {0x86bd,    0x007c}, {0x86be,    0x008f},</div><div class='del'>-{0x86bf,    0x0082}, {0x86c0,    0x004f}, {0x86c1,    0x00b7},</div><div class='del'>-{0x86c2,    0x0012}, {0x86c3,    0x0006}, {0x86c4,    0x007e},</div><div class='del'>-{0x86c5,    0x0085}, {0x86c6,    0x00c0}, {0x86c7,    0x00b6},</div><div class='del'>-{0x86c8,    0x0012}, {0x86c9,    0x0006}, {0x86ca,    0x0084},</div><div class='del'>-{0x86cb,    0x003f}, {0x86cc,    0x0081}, {0x86cd,    0x003f},</div><div class='del'>-{0x86ce,    0x0027}, {0x86cf,    0x0010}, {0x86d0,    0x008b},</div><div class='del'>-{0x86d1,    0x0008}, {0x86d2,    0x00b7}, {0x86d3,    0x0012},</div><div class='del'>-{0x86d4,    0x0006}, {0x86d5,    0x00b6}, {0x86d6,    0x0012},</div><div class='del'>-{0x86d7,    0x0009}, {0x86d8,    0x0084}, {0x86d9,    0x00fc},</div><div class='del'>-{0x86da,    0x00b7}, {0x86db,    0x0012}, {0x86dc,    0x0009},</div><div class='del'>-{0x86dd,    0x007e}, {0x86de,    0x0085}, {0x86df,    0x00fe},</div><div class='del'>-{0x86e0,    0x00ce}, {0x86e1,    0x008f}, {0x86e2,    0x0070},</div><div class='del'>-{0x86e3,    0x0018}, {0x86e4,    0x00ce}, {0x86e5,    0x008f},</div><div class='del'>-{0x86e6,    0x0084}, {0x86e7,    0x00c6}, {0x86e8,    0x000c},</div><div class='del'>-{0x86e9,    0x00bd}, {0x86ea,    0x0089}, {0x86eb,    0x006f},</div><div class='del'>-{0x86ec,    0x00ce}, {0x86ed,    0x008f}, {0x86ee,    0x0084},</div><div class='del'>-{0x86ef,    0x0018}, {0x86f0,    0x00ce}, {0x86f1,    0x008f},</div><div class='del'>-{0x86f2,    0x0070}, {0x86f3,    0x00c6}, {0x86f4,    0x000c},</div><div class='del'>-{0x86f5,    0x00bd}, {0x86f6,    0x0089}, {0x86f7,    0x006f},</div><div class='del'>-{0x86f8,    0x00d6}, {0x86f9,    0x0083}, {0x86fa,    0x00c1},</div><div class='del'>-{0x86fb,    0x004f}, {0x86fc,    0x002d}, {0x86fd,    0x0003},</div><div class='del'>-{0x86fe,    0x007e}, {0x86ff,    0x0087}, {0x8700,    0x0040},</div><div class='del'>-{0x8701,    0x00b6}, {0x8702,    0x008f}, {0x8703,    0x007f},</div><div class='del'>-{0x8704,    0x0081}, {0x8705,    0x0007}, {0x8706,    0x0027},</div><div class='del'>-{0x8707,    0x000f}, {0x8708,    0x0081}, {0x8709,    0x000b},</div><div class='del'>-{0x870a,    0x0027}, {0x870b,    0x0015}, {0x870c,    0x0081},</div><div class='del'>-{0x870d,    0x000d}, {0x870e,    0x0027}, {0x870f,    0x001b},</div><div class='del'>-{0x8710,    0x0081}, {0x8711,    0x000e}, {0x8712,    0x0027},</div><div class='del'>-{0x8713,    0x0021}, {0x8714,    0x007e}, {0x8715,    0x0087},</div><div class='del'>-{0x8716,    0x0040}, {0x8717,    0x00f7}, {0x8718,    0x008f},</div><div class='del'>-{0x8719,    0x007b}, {0x871a,    0x0086}, {0x871b,    0x0002},</div><div class='del'>-{0x871c,    0x00b7}, {0x871d,    0x008f}, {0x871e,    0x007a},</div><div class='del'>-{0x871f,    0x0020}, {0x8720,    0x001c}, {0x8721,    0x00f7},</div><div class='del'>-{0x8722,    0x008f}, {0x8723,    0x0078}, {0x8724,    0x0086},</div><div class='del'>-{0x8725,    0x0002}, {0x8726,    0x00b7}, {0x8727,    0x008f},</div><div class='del'>-{0x8728,    0x0077}, {0x8729,    0x0020}, {0x872a,    0x0012},</div><div class='del'>-{0x872b,    0x00f7}, {0x872c,    0x008f}, {0x872d,    0x0075},</div><div class='del'>-{0x872e,    0x0086}, {0x872f,    0x0002}, {0x8730,    0x00b7},</div><div class='del'>-{0x8731,    0x008f}, {0x8732,    0x0074}, {0x8733,    0x0020},</div><div class='del'>-{0x8734,    0x0008}, {0x8735,    0x00f7}, {0x8736,    0x008f},</div><div class='del'>-{0x8737,    0x0072}, {0x8738,    0x0086}, {0x8739,    0x0002},</div><div class='del'>-{0x873a,    0x00b7}, {0x873b,    0x008f}, {0x873c,    0x0071},</div><div class='del'>-{0x873d,    0x007e}, {0x873e,    0x0087}, {0x873f,    0x0047},</div><div class='del'>-{0x8740,    0x0086}, {0x8741,    0x0004}, {0x8742,    0x0097},</div><div class='del'>-{0x8743,    0x0040}, {0x8744,    0x007e}, {0x8745,    0x0089},</div><div class='del'>-{0x8746,    0x006e}, {0x8747,    0x00ce}, {0x8748,    0x008f},</div><div class='del'>-{0x8749,    0x0072}, {0x874a,    0x00bd}, {0x874b,    0x0089},</div><div class='del'>-{0x874c,    0x00f7}, {0x874d,    0x00ce}, {0x874e,    0x008f},</div><div class='del'>-{0x874f,    0x0075}, {0x8750,    0x00bd}, {0x8751,    0x0089},</div><div class='del'>-{0x8752,    0x00f7}, {0x8753,    0x00ce}, {0x8754,    0x008f},</div><div class='del'>-{0x8755,    0x0078}, {0x8756,    0x00bd}, {0x8757,    0x0089},</div><div class='del'>-{0x8758,    0x00f7}, {0x8759,    0x00ce}, {0x875a,    0x008f},</div><div class='del'>-{0x875b,    0x007b}, {0x875c,    0x00bd}, {0x875d,    0x0089},</div><div class='del'>-{0x875e,    0x00f7}, {0x875f,    0x004f}, {0x8760,    0x00b7},</div><div class='del'>-{0x8761,    0x008f}, {0x8762,    0x007d}, {0x8763,    0x00b7},</div><div class='del'>-{0x8764,    0x008f}, {0x8765,    0x0081}, {0x8766,    0x00b6},</div><div class='del'>-{0x8767,    0x008f}, {0x8768,    0x0072}, {0x8769,    0x0027},</div><div class='del'>-{0x876a,    0x0047}, {0x876b,    0x007c}, {0x876c,    0x008f},</div><div class='del'>-{0x876d,    0x007d}, {0x876e,    0x00b6}, {0x876f,    0x008f},</div><div class='del'>-{0x8770,    0x0075}, {0x8771,    0x0027}, {0x8772,    0x003f},</div><div class='del'>-{0x8773,    0x007c}, {0x8774,    0x008f}, {0x8775,    0x007d},</div><div class='del'>-{0x8776,    0x00b6}, {0x8777,    0x008f}, {0x8778,    0x0078},</div><div class='del'>-{0x8779,    0x0027}, {0x877a,    0x0037}, {0x877b,    0x007c},</div><div class='del'>-{0x877c,    0x008f}, {0x877d,    0x007d}, {0x877e,    0x00b6},</div><div class='del'>-{0x877f,    0x008f}, {0x8780,    0x007b}, {0x8781,    0x0027},</div><div class='del'>-{0x8782,    0x002f}, {0x8783,    0x007f}, {0x8784,    0x008f},</div><div class='del'>-{0x8785,    0x007d}, {0x8786,    0x007c}, {0x8787,    0x008f},</div><div class='del'>-{0x8788,    0x0081}, {0x8789,    0x007a}, {0x878a,    0x008f},</div><div class='del'>-{0x878b,    0x0072}, {0x878c,    0x0027}, {0x878d,    0x001b},</div><div class='del'>-{0x878e,    0x007c}, {0x878f,    0x008f}, {0x8790,    0x007d},</div><div class='del'>-{0x8791,    0x007a}, {0x8792,    0x008f}, {0x8793,    0x0075},</div><div class='del'>-{0x8794,    0x0027}, {0x8795,    0x0016}, {0x8796,    0x007c},</div><div class='del'>-{0x8797,    0x008f}, {0x8798,    0x007d}, {0x8799,    0x007a},</div><div class='del'>-{0x879a,    0x008f}, {0x879b,    0x0078}, {0x879c,    0x0027},</div><div class='del'>-{0x879d,    0x0011}, {0x879e,    0x007c}, {0x879f,    0x008f},</div><div class='del'>-{0x87a0,    0x007d}, {0x87a1,    0x007a}, {0x87a2,    0x008f},</div><div class='del'>-{0x87a3,    0x007b}, {0x87a4,    0x0027}, {0x87a5,    0x000c},</div><div class='del'>-{0x87a6,    0x007e}, {0x87a7,    0x0087}, {0x87a8,    0x0083},</div><div class='del'>-{0x87a9,    0x007a}, {0x87aa,    0x008f}, {0x87ab,    0x0075},</div><div class='del'>-{0x87ac,    0x007a}, {0x87ad,    0x008f}, {0x87ae,    0x0078},</div><div class='del'>-{0x87af,    0x007a}, {0x87b0,    0x008f}, {0x87b1,    0x007b},</div><div class='del'>-{0x87b2,    0x00ce}, {0x87b3,    0x00c1}, {0x87b4,    0x00fc},</div><div class='del'>-{0x87b5,    0x00f6}, {0x87b6,    0x008f}, {0x87b7,    0x007d},</div><div class='del'>-{0x87b8,    0x003a}, {0x87b9,    0x00a6}, {0x87ba,    0x0000},</div><div class='del'>-{0x87bb,    0x00b7}, {0x87bc,    0x0012}, {0x87bd,    0x0070},</div><div class='del'>-{0x87be,    0x00b6}, {0x87bf,    0x008f}, {0x87c0,    0x0072},</div><div class='del'>-{0x87c1,    0x0026}, {0x87c2,    0x0003}, {0x87c3,    0x007e},</div><div class='del'>-{0x87c4,    0x0087}, {0x87c5,    0x00fa}, {0x87c6,    0x00b6},</div><div class='del'>-{0x87c7,    0x008f}, {0x87c8,    0x0075}, {0x87c9,    0x0026},</div><div class='del'>-{0x87ca,    0x000a}, {0x87cb,    0x0018}, {0x87cc,    0x00ce},</div><div class='del'>-{0x87cd,    0x008f}, {0x87ce,    0x0073}, {0x87cf,    0x00bd},</div><div class='del'>-{0x87d0,    0x0089}, {0x87d1,    0x00d5}, {0x87d2,    0x007e},</div><div class='del'>-{0x87d3,    0x0087}, {0x87d4,    0x00fa}, {0x87d5,    0x00b6},</div><div class='del'>-{0x87d6,    0x008f}, {0x87d7,    0x0078}, {0x87d8,    0x0026},</div><div class='del'>-{0x87d9,    0x000a}, {0x87da,    0x0018}, {0x87db,    0x00ce},</div><div class='del'>-{0x87dc,    0x008f}, {0x87dd,    0x0076}, {0x87de,    0x00bd},</div><div class='del'>-{0x87df,    0x0089}, {0x87e0,    0x00d5}, {0x87e1,    0x007e},</div><div class='del'>-{0x87e2,    0x0087}, {0x87e3,    0x00fa}, {0x87e4,    0x00b6},</div><div class='del'>-{0x87e5,    0x008f}, {0x87e6,    0x007b}, {0x87e7,    0x0026},</div><div class='del'>-{0x87e8,    0x000a}, {0x87e9,    0x0018}, {0x87ea,    0x00ce},</div><div class='del'>-{0x87eb,    0x008f}, {0x87ec,    0x0079}, {0x87ed,    0x00bd},</div><div class='del'>-{0x87ee,    0x0089}, {0x87ef,    0x00d5}, {0x87f0,    0x007e},</div><div class='del'>-{0x87f1,    0x0087}, {0x87f2,    0x00fa}, {0x87f3,    0x0086},</div><div class='del'>-{0x87f4,    0x0005}, {0x87f5,    0x0097}, {0x87f6,    0x0040},</div><div class='del'>-{0x87f7,    0x007e}, {0x87f8,    0x0089}, {0x87f9,    0x006e},</div><div class='del'>-{0x87fa,    0x00b6}, {0x87fb,    0x008f}, {0x87fc,    0x0075},</div><div class='del'>-{0x87fd,    0x0081}, {0x87fe,    0x0007}, {0x87ff,    0x002e},</div><div class='del'>-{0x8800,    0x00f2}, {0x8801,    0x00f6}, {0x8802,    0x0012},</div><div class='del'>-{0x8803,    0x0006}, {0x8804,    0x00c4}, {0x8805,    0x00f8},</div><div class='del'>-{0x8806,    0x001b}, {0x8807,    0x00b7}, {0x8808,    0x0012},</div><div class='del'>-{0x8809,    0x0006}, {0x880a,    0x00b6}, {0x880b,    0x008f},</div><div class='del'>-{0x880c,    0x0078}, {0x880d,    0x0081}, {0x880e,    0x0007},</div><div class='del'>-{0x880f,    0x002e}, {0x8810,    0x00e2}, {0x8811,    0x0048},</div><div class='del'>-{0x8812,    0x0048}, {0x8813,    0x0048}, {0x8814,    0x00f6},</div><div class='del'>-{0x8815,    0x0012}, {0x8816,    0x0006}, {0x8817,    0x00c4},</div><div class='del'>-{0x8818,    0x00c7}, {0x8819,    0x001b}, {0x881a,    0x00b7},</div><div class='del'>-{0x881b,    0x0012}, {0x881c,    0x0006}, {0x881d,    0x00b6},</div><div class='del'>-{0x881e,    0x008f}, {0x881f,    0x007b}, {0x8820,    0x0081},</div><div class='del'>-{0x8821,    0x0007}, {0x8822,    0x002e}, {0x8823,    0x00cf},</div><div class='del'>-{0x8824,    0x00f6}, {0x8825,    0x0012}, {0x8826,    0x0005},</div><div class='del'>-{0x8827,    0x00c4}, {0x8828,    0x00f8}, {0x8829,    0x001b},</div><div class='del'>-{0x882a,    0x00b7}, {0x882b,    0x0012}, {0x882c,    0x0005},</div><div class='del'>-{0x882d,    0x0086}, {0x882e,    0x0000}, {0x882f,    0x00f6},</div><div class='del'>-{0x8830,    0x008f}, {0x8831,    0x0071}, {0x8832,    0x00bd},</div><div class='del'>-{0x8833,    0x0089}, {0x8834,    0x0094}, {0x8835,    0x0086},</div><div class='del'>-{0x8836,    0x0001}, {0x8837,    0x00f6}, {0x8838,    0x008f},</div><div class='del'>-{0x8839,    0x0074}, {0x883a,    0x00bd}, {0x883b,    0x0089},</div><div class='del'>-{0x883c,    0x0094}, {0x883d,    0x0086}, {0x883e,    0x0002},</div><div class='del'>-{0x883f,    0x00f6}, {0x8840,    0x008f}, {0x8841,    0x0077},</div><div class='del'>-{0x8842,    0x00bd}, {0x8843,    0x0089}, {0x8844,    0x0094},</div><div class='del'>-{0x8845,    0x0086}, {0x8846,    0x0003}, {0x8847,    0x00f6},</div><div class='del'>-{0x8848,    0x008f}, {0x8849,    0x007a}, {0x884a,    0x00bd},</div><div class='del'>-{0x884b,    0x0089}, {0x884c,    0x0094}, {0x884d,    0x00ce},</div><div class='del'>-{0x884e,    0x008f}, {0x884f,    0x0070}, {0x8850,    0x00a6},</div><div class='del'>-{0x8851,    0x0001}, {0x8852,    0x0081}, {0x8853,    0x0001},</div><div class='del'>-{0x8854,    0x0027}, {0x8855,    0x0007}, {0x8856,    0x0081},</div><div class='del'>-{0x8857,    0x0003}, {0x8858,    0x0027}, {0x8859,    0x0003},</div><div class='del'>-{0x885a,    0x007e}, {0x885b,    0x0088}, {0x885c,    0x0066},</div><div class='del'>-{0x885d,    0x00a6}, {0x885e,    0x0000}, {0x885f,    0x00b8},</div><div class='del'>-{0x8860,    0x008f}, {0x8861,    0x0081}, {0x8862,    0x0084},</div><div class='del'>-{0x8863,    0x0001}, {0x8864,    0x0026}, {0x8865,    0x000b},</div><div class='del'>-{0x8866,    0x008c}, {0x8867,    0x008f}, {0x8868,    0x0079},</div><div class='del'>-{0x8869,    0x002c}, {0x886a,    0x000e}, {0x886b,    0x0008},</div><div class='del'>-{0x886c,    0x0008}, {0x886d,    0x0008}, {0x886e,    0x007e},</div><div class='del'>-{0x886f,    0x0088}, {0x8870,    0x0050}, {0x8871,    0x00b6},</div><div class='del'>-{0x8872,    0x0012}, {0x8873,    0x0004}, {0x8874,    0x008a},</div><div class='del'>-{0x8875,    0x0040}, {0x8876,    0x00b7}, {0x8877,    0x0012},</div><div class='del'>-{0x8878,    0x0004}, {0x8879,    0x00b6}, {0x887a,    0x0012},</div><div class='del'>-{0x887b,    0x0004}, {0x887c,    0x0084}, {0x887d,    0x00fb},</div><div class='del'>-{0x887e,    0x0084}, {0x887f,    0x00ef}, {0x8880,    0x00b7},</div><div class='del'>-{0x8881,    0x0012}, {0x8882,    0x0004}, {0x8883,    0x00b6},</div><div class='del'>-{0x8884,    0x0012}, {0x8885,    0x0007}, {0x8886,    0x0036},</div><div class='del'>-{0x8887,    0x00b6}, {0x8888,    0x008f}, {0x8889,    0x007c},</div><div class='del'>-{0x888a,    0x0048}, {0x888b,    0x0048}, {0x888c,    0x00b7},</div><div class='del'>-{0x888d,    0x0012}, {0x888e,    0x0007}, {0x888f,    0x0086},</div><div class='del'>-{0x8890,    0x0001}, {0x8891,    0x00ba}, {0x8892,    0x0012},</div><div class='del'>-{0x8893,    0x0004}, {0x8894,    0x00b7}, {0x8895,    0x0012},</div><div class='del'>-{0x8896,    0x0004}, {0x8897,    0x0001}, {0x8898,    0x0001},</div><div class='del'>-{0x8899,    0x0001}, {0x889a,    0x0001}, {0x889b,    0x0001},</div><div class='del'>-{0x889c,    0x0001}, {0x889d,    0x0086}, {0x889e,    0x00fe},</div><div class='del'>-{0x889f,    0x00b4}, {0x88a0,    0x0012}, {0x88a1,    0x0004},</div><div class='del'>-{0x88a2,    0x00b7}, {0x88a3,    0x0012}, {0x88a4,    0x0004},</div><div class='del'>-{0x88a5,    0x0086}, {0x88a6,    0x0002}, {0x88a7,    0x00ba},</div><div class='del'>-{0x88a8,    0x0012}, {0x88a9,    0x0004}, {0x88aa,    0x00b7},</div><div class='del'>-{0x88ab,    0x0012}, {0x88ac,    0x0004}, {0x88ad,    0x0086},</div><div class='del'>-{0x88ae,    0x00fd}, {0x88af,    0x00b4}, {0x88b0,    0x0012},</div><div class='del'>-{0x88b1,    0x0004}, {0x88b2,    0x00b7}, {0x88b3,    0x0012},</div><div class='del'>-{0x88b4,    0x0004}, {0x88b5,    0x0032}, {0x88b6,    0x00b7},</div><div class='del'>-{0x88b7,    0x0012}, {0x88b8,    0x0007}, {0x88b9,    0x00b6},</div><div class='del'>-{0x88ba,    0x0012}, {0x88bb,    0x0000}, {0x88bc,    0x0084},</div><div class='del'>-{0x88bd,    0x0008}, {0x88be,    0x0081}, {0x88bf,    0x0008},</div><div class='del'>-{0x88c0,    0x0027}, {0x88c1,    0x000f}, {0x88c2,    0x007c},</div><div class='del'>-{0x88c3,    0x0082}, {0x88c4,    0x0008}, {0x88c5,    0x0026},</div><div class='del'>-{0x88c6,    0x0007}, {0x88c7,    0x0086}, {0x88c8,    0x0076},</div><div class='del'>-{0x88c9,    0x0097}, {0x88ca,    0x0040}, {0x88cb,    0x007e},</div><div class='del'>-{0x88cc,    0x0089}, {0x88cd,    0x006e}, {0x88ce,    0x007e},</div><div class='del'>-{0x88cf,    0x0086}, {0x88d0,    0x00ec}, {0x88d1,    0x00b6},</div><div class='del'>-{0x88d2,    0x008f}, {0x88d3,    0x007f}, {0x88d4,    0x0081},</div><div class='del'>-{0x88d5,    0x000f}, {0x88d6,    0x0027}, {0x88d7,    0x003c},</div><div class='del'>-{0x88d8,    0x00bd}, {0x88d9,    0x00e6}, {0x88da,    0x00c7},</div><div class='del'>-{0x88db,    0x00b7}, {0x88dc,    0x0012}, {0x88dd,    0x000d},</div><div class='del'>-{0x88de,    0x00bd}, {0x88df,    0x00e6}, {0x88e0,    0x00cb},</div><div class='del'>-{0x88e1,    0x00b6}, {0x88e2,    0x0012}, {0x88e3,    0x0004},</div><div class='del'>-{0x88e4,    0x008a}, {0x88e5,    0x0020}, {0x88e6,    0x00b7},</div><div class='del'>-{0x88e7,    0x0012}, {0x88e8,    0x0004}, {0x88e9,    0x00ce},</div><div class='del'>-{0x88ea,    0x00ff}, {0x88eb,    0x00ff}, {0x88ec,    0x00b6},</div><div class='del'>-{0x88ed,    0x0012}, {0x88ee,    0x0000}, {0x88ef,    0x0081},</div><div class='del'>-{0x88f0,    0x000c}, {0x88f1,    0x0026}, {0x88f2,    0x0005},</div><div class='del'>-{0x88f3,    0x0009}, {0x88f4,    0x0026}, {0x88f5,    0x00f6},</div><div class='del'>-{0x88f6,    0x0027}, {0x88f7,    0x001c}, {0x88f8,    0x00b6},</div><div class='del'>-{0x88f9,    0x0012}, {0x88fa,    0x0004}, {0x88fb,    0x0084},</div><div class='del'>-{0x88fc,    0x00df}, {0x88fd,    0x00b7}, {0x88fe,    0x0012},</div><div class='del'>-{0x88ff,    0x0004}, {0x8900,    0x0096}, {0x8901,    0x0083},</div><div class='del'>-{0x8902,    0x0081}, {0x8903,    0x0007}, {0x8904,    0x002c},</div><div class='del'>-{0x8905,    0x0005}, {0x8906,    0x007c}, {0x8907,    0x0000},</div><div class='del'>-{0x8908,    0x0083}, {0x8909,    0x0020}, {0x890a,    0x0006},</div><div class='del'>-{0x890b,    0x0096}, {0x890c,    0x0083}, {0x890d,    0x008b},</div><div class='del'>-{0x890e,    0x0008}, {0x890f,    0x0097}, {0x8910,    0x0083},</div><div class='del'>-{0x8911,    0x007e}, {0x8912,    0x0085}, {0x8913,    0x0041},</div><div class='del'>-{0x8914,    0x007f}, {0x8915,    0x008f}, {0x8916,    0x007e},</div><div class='del'>-{0x8917,    0x0086}, {0x8918,    0x0080}, {0x8919,    0x00b7},</div><div class='del'>-{0x891a,    0x0012}, {0x891b,    0x000c}, {0x891c,    0x0086},</div><div class='del'>-{0x891d,    0x0001}, {0x891e,    0x00b7}, {0x891f,    0x008f},</div><div class='del'>-{0x8920,    0x007d}, {0x8921,    0x00b6}, {0x8922,    0x0012},</div><div class='del'>-{0x8923,    0x000c}, {0x8924,    0x0084}, {0x8925,    0x007f},</div><div class='del'>-{0x8926,    0x00b7}, {0x8927,    0x0012}, {0x8928,    0x000c},</div><div class='del'>-{0x8929,    0x008a}, {0x892a,    0x0080}, {0x892b,    0x00b7},</div><div class='del'>-{0x892c,    0x0012}, {0x892d,    0x000c}, {0x892e,    0x0086},</div><div class='del'>-{0x892f,    0x000a}, {0x8930,    0x00bd}, {0x8931,    0x008a},</div><div class='del'>-{0x8932,    0x0006}, {0x8933,    0x00b6}, {0x8934,    0x0012},</div><div class='del'>-{0x8935,    0x000a}, {0x8936,    0x002a}, {0x8937,    0x0009},</div><div class='del'>-{0x8938,    0x00b6}, {0x8939,    0x0012}, {0x893a,    0x000c},</div><div class='del'>-{0x893b,    0x00ba}, {0x893c,    0x008f}, {0x893d,    0x007d},</div><div class='del'>-{0x893e,    0x00b7}, {0x893f,    0x0012}, {0x8940,    0x000c},</div><div class='del'>-{0x8941,    0x00b6}, {0x8942,    0x008f}, {0x8943,    0x007e},</div><div class='del'>-{0x8944,    0x0081}, {0x8945,    0x0060}, {0x8946,    0x0027},</div><div class='del'>-{0x8947,    0x001a}, {0x8948,    0x008b}, {0x8949,    0x0020},</div><div class='del'>-{0x894a,    0x00b7}, {0x894b,    0x008f}, {0x894c,    0x007e},</div><div class='del'>-{0x894d,    0x00b6}, {0x894e,    0x0012}, {0x894f,    0x000c},</div><div class='del'>-{0x8950,    0x0084}, {0x8951,    0x009f}, {0x8952,    0x00ba},</div><div class='del'>-{0x8953,    0x008f}, {0x8954,    0x007e}, {0x8955,    0x00b7},</div><div class='del'>-{0x8956,    0x0012}, {0x8957,    0x000c}, {0x8958,    0x00b6},</div><div class='del'>-{0x8959,    0x008f}, {0x895a,    0x007d}, {0x895b,    0x0048},</div><div class='del'>-{0x895c,    0x00b7}, {0x895d,    0x008f}, {0x895e,    0x007d},</div><div class='del'>-{0x895f,    0x007e}, {0x8960,    0x0089}, {0x8961,    0x0021},</div><div class='del'>-{0x8962,    0x00b6}, {0x8963,    0x0012}, {0x8964,    0x0004},</div><div class='del'>-{0x8965,    0x008a}, {0x8966,    0x0020}, {0x8967,    0x00b7},</div><div class='del'>-{0x8968,    0x0012}, {0x8969,    0x0004}, {0x896a,    0x00bd},</div><div class='del'>-{0x896b,    0x008a}, {0x896c,    0x000a}, {0x896d,    0x004f},</div><div class='del'>-{0x896e,    0x0039}, {0x896f,    0x00a6}, {0x8970,    0x0000},</div><div class='del'>-{0x8971,    0x0018}, {0x8972,    0x00a7}, {0x8973,    0x0000},</div><div class='del'>-{0x8974,    0x0008}, {0x8975,    0x0018}, {0x8976,    0x0008},</div><div class='del'>-{0x8977,    0x005a}, {0x8978,    0x0026}, {0x8979,    0x00f5},</div><div class='del'>-{0x897a,    0x0039}, {0x897b,    0x0036}, {0x897c,    0x006c},</div><div class='del'>-{0x897d,    0x0000}, {0x897e,    0x0032}, {0x897f,    0x00ba},</div><div class='del'>-{0x8980,    0x008f}, {0x8981,    0x007f}, {0x8982,    0x00b7},</div><div class='del'>-{0x8983,    0x008f}, {0x8984,    0x007f}, {0x8985,    0x00b6},</div><div class='del'>-{0x8986,    0x0012}, {0x8987,    0x0009}, {0x8988,    0x0084},</div><div class='del'>-{0x8989,    0x0003}, {0x898a,    0x00a7}, {0x898b,    0x0001},</div><div class='del'>-{0x898c,    0x00b6}, {0x898d,    0x0012}, {0x898e,    0x0006},</div><div class='del'>-{0x898f,    0x0084}, {0x8990,    0x003f}, {0x8991,    0x00a7},</div><div class='del'>-{0x8992,    0x0002}, {0x8993,    0x0039}, {0x8994,    0x0036},</div><div class='del'>-{0x8995,    0x0086}, {0x8996,    0x0003}, {0x8997,    0x00b7},</div><div class='del'>-{0x8998,    0x008f}, {0x8999,    0x0080}, {0x899a,    0x0032},</div><div class='del'>-{0x899b,    0x00c1}, {0x899c,    0x0000}, {0x899d,    0x0026},</div><div class='del'>-{0x899e,    0x0006}, {0x899f,    0x00b7}, {0x89a0,    0x008f},</div><div class='del'>-{0x89a1,    0x007c}, {0x89a2,    0x007e}, {0x89a3,    0x0089},</div><div class='del'>-{0x89a4,    0x00c9}, {0x89a5,    0x00c1}, {0x89a6,    0x0001},</div><div class='del'>-{0x89a7,    0x0027}, {0x89a8,    0x0018}, {0x89a9,    0x00c1},</div><div class='del'>-{0x89aa,    0x0002}, {0x89ab,    0x0027}, {0x89ac,    0x000c},</div><div class='del'>-{0x89ad,    0x00c1}, {0x89ae,    0x0003}, {0x89af,    0x0027},</div><div class='del'>-{0x89b0,    0x0000}, {0x89b1,    0x00f6}, {0x89b2,    0x008f},</div><div class='del'>-{0x89b3,    0x0080}, {0x89b4,    0x0005}, {0x89b5,    0x0005},</div><div class='del'>-{0x89b6,    0x00f7}, {0x89b7,    0x008f}, {0x89b8,    0x0080},</div><div class='del'>-{0x89b9,    0x00f6}, {0x89ba,    0x008f}, {0x89bb,    0x0080},</div><div class='del'>-{0x89bc,    0x0005}, {0x89bd,    0x0005}, {0x89be,    0x00f7},</div><div class='del'>-{0x89bf,    0x008f}, {0x89c0,    0x0080}, {0x89c1,    0x00f6},</div><div class='del'>-{0x89c2,    0x008f}, {0x89c3,    0x0080}, {0x89c4,    0x0005},</div><div class='del'>-{0x89c5,    0x0005}, {0x89c6,    0x00f7}, {0x89c7,    0x008f},</div><div class='del'>-{0x89c8,    0x0080}, {0x89c9,    0x00f6}, {0x89ca,    0x008f},</div><div class='del'>-{0x89cb,    0x0080}, {0x89cc,    0x0053}, {0x89cd,    0x00f4},</div><div class='del'>-{0x89ce,    0x0012}, {0x89cf,    0x0007}, {0x89d0,    0x001b},</div><div class='del'>-{0x89d1,    0x00b7}, {0x89d2,    0x0012}, {0x89d3,    0x0007},</div><div class='del'>-{0x89d4,    0x0039}, {0x89d5,    0x00ce}, {0x89d6,    0x008f},</div><div class='del'>-{0x89d7,    0x0070}, {0x89d8,    0x00a6}, {0x89d9,    0x0000},</div><div class='del'>-{0x89da,    0x0018}, {0x89db,    0x00e6}, {0x89dc,    0x0000},</div><div class='del'>-{0x89dd,    0x0018}, {0x89de,    0x00a7}, {0x89df,    0x0000},</div><div class='del'>-{0x89e0,    0x00e7}, {0x89e1,    0x0000}, {0x89e2,    0x00a6},</div><div class='del'>-{0x89e3,    0x0001}, {0x89e4,    0x0018}, {0x89e5,    0x00e6},</div><div class='del'>-{0x89e6,    0x0001}, {0x89e7,    0x0018}, {0x89e8,    0x00a7},</div><div class='del'>-{0x89e9,    0x0001}, {0x89ea,    0x00e7}, {0x89eb,    0x0001},</div><div class='del'>-{0x89ec,    0x00a6}, {0x89ed,    0x0002}, {0x89ee,    0x0018},</div><div class='del'>-{0x89ef,    0x00e6}, {0x89f0,    0x0002}, {0x89f1,    0x0018},</div><div class='del'>-{0x89f2,    0x00a7}, {0x89f3,    0x0002}, {0x89f4,    0x00e7},</div><div class='del'>-{0x89f5,    0x0002}, {0x89f6,    0x0039}, {0x89f7,    0x00a6},</div><div class='del'>-{0x89f8,    0x0000}, {0x89f9,    0x0084}, {0x89fa,    0x0007},</div><div class='del'>-{0x89fb,    0x00e6}, {0x89fc,    0x0000}, {0x89fd,    0x00c4},</div><div class='del'>-{0x89fe,    0x0038}, {0x89ff,    0x0054}, {0x8a00,    0x0054},</div><div class='del'>-{0x8a01,    0x0054}, {0x8a02,    0x001b}, {0x8a03,    0x00a7},</div><div class='del'>-{0x8a04,    0x0000}, {0x8a05,    0x0039}, {0x8a06,    0x004a},</div><div class='del'>-{0x8a07,    0x0026}, {0x8a08,    0x00fd}, {0x8a09,    0x0039},</div><div class='del'>-{0x8a0a,    0x0096}, {0x8a0b,    0x0022}, {0x8a0c,    0x0084},</div><div class='del'>-{0x8a0d,    0x000f}, {0x8a0e,    0x0097}, {0x8a0f,    0x0022},</div><div class='del'>-{0x8a10,    0x0086}, {0x8a11,    0x0001}, {0x8a12,    0x00b7},</div><div class='del'>-{0x8a13,    0x008f}, {0x8a14,    0x0070}, {0x8a15,    0x00b6},</div><div class='del'>-{0x8a16,    0x0012}, {0x8a17,    0x0007}, {0x8a18,    0x00b7},</div><div class='del'>-{0x8a19,    0x008f}, {0x8a1a,    0x0071}, {0x8a1b,    0x00f6},</div><div class='del'>-{0x8a1c,    0x0012}, {0x8a1d,    0x000c}, {0x8a1e,    0x00c4},</div><div class='del'>-{0x8a1f,    0x000f}, {0x8a20,    0x00c8}, {0x8a21,    0x000f},</div><div class='del'>-{0x8a22,    0x00f7}, {0x8a23,    0x008f}, {0x8a24,    0x0072},</div><div class='del'>-{0x8a25,    0x00f6}, {0x8a26,    0x008f}, {0x8a27,    0x0072},</div><div class='del'>-{0x8a28,    0x00b6}, {0x8a29,    0x008f}, {0x8a2a,    0x0071},</div><div class='del'>-{0x8a2b,    0x0084}, {0x8a2c,    0x0003}, {0x8a2d,    0x0027},</div><div class='del'>-{0x8a2e,    0x0014}, {0x8a2f,    0x0081}, {0x8a30,    0x0001},</div><div class='del'>-{0x8a31,    0x0027}, {0x8a32,    0x001c}, {0x8a33,    0x0081},</div><div class='del'>-{0x8a34,    0x0002}, {0x8a35,    0x0027}, {0x8a36,    0x0024},</div><div class='del'>-{0x8a37,    0x00f4}, {0x8a38,    0x008f}, {0x8a39,    0x0070},</div><div class='del'>-{0x8a3a,    0x0027}, {0x8a3b,    0x002a}, {0x8a3c,    0x0096},</div><div class='del'>-{0x8a3d,    0x0022}, {0x8a3e,    0x008a}, {0x8a3f,    0x0080},</div><div class='del'>-{0x8a40,    0x007e}, {0x8a41,    0x008a}, {0x8a42,    0x0064},</div><div class='del'>-{0x8a43,    0x00f4}, {0x8a44,    0x008f}, {0x8a45,    0x0070},</div><div class='del'>-{0x8a46,    0x0027}, {0x8a47,    0x001e}, {0x8a48,    0x0096},</div><div class='del'>-{0x8a49,    0x0022}, {0x8a4a,    0x008a}, {0x8a4b,    0x0010},</div><div class='del'>-{0x8a4c,    0x007e}, {0x8a4d,    0x008a}, {0x8a4e,    0x0064},</div><div class='del'>-{0x8a4f,    0x00f4}, {0x8a50,    0x008f}, {0x8a51,    0x0070},</div><div class='del'>-{0x8a52,    0x0027}, {0x8a53,    0x0012}, {0x8a54,    0x0096},</div><div class='del'>-{0x8a55,    0x0022}, {0x8a56,    0x008a}, {0x8a57,    0x0020},</div><div class='del'>-{0x8a58,    0x007e}, {0x8a59,    0x008a}, {0x8a5a,    0x0064},</div><div class='del'>-{0x8a5b,    0x00f4}, {0x8a5c,    0x008f}, {0x8a5d,    0x0070},</div><div class='del'>-{0x8a5e,    0x0027}, {0x8a5f,    0x0006}, {0x8a60,    0x0096},</div><div class='del'>-{0x8a61,    0x0022}, {0x8a62,    0x008a}, {0x8a63,    0x0040},</div><div class='del'>-{0x8a64,    0x0097}, {0x8a65,    0x0022}, {0x8a66,    0x0074},</div><div class='del'>-{0x8a67,    0x008f}, {0x8a68,    0x0071}, {0x8a69,    0x0074},</div><div class='del'>-{0x8a6a,    0x008f}, {0x8a6b,    0x0071}, {0x8a6c,    0x0078},</div><div class='del'>-{0x8a6d,    0x008f}, {0x8a6e,    0x0070}, {0x8a6f,    0x00b6},</div><div class='del'>-{0x8a70,    0x008f}, {0x8a71,    0x0070}, {0x8a72,    0x0085},</div><div class='del'>-{0x8a73,    0x0010}, {0x8a74,    0x0027}, {0x8a75,    0x00af},</div><div class='del'>-{0x8a76,    0x00d6}, {0x8a77,    0x0022}, {0x8a78,    0x00c4},</div><div class='del'>-{0x8a79,    0x0010}, {0x8a7a,    0x0058}, {0x8a7b,    0x00b6},</div><div class='del'>-{0x8a7c,    0x0012}, {0x8a7d,    0x0070}, {0x8a7e,    0x0081},</div><div class='del'>-{0x8a7f,    0x00e4}, {0x8a80,    0x0027}, {0x8a81,    0x0036},</div><div class='del'>-{0x8a82,    0x0081}, {0x8a83,    0x00e1}, {0x8a84,    0x0026},</div><div class='del'>-{0x8a85,    0x000c}, {0x8a86,    0x0096}, {0x8a87,    0x0022},</div><div class='del'>-{0x8a88,    0x0084}, {0x8a89,    0x0020}, {0x8a8a,    0x0044},</div><div class='del'>-{0x8a8b,    0x001b}, {0x8a8c,    0x00d6}, {0x8a8d,    0x0022},</div><div class='del'>-{0x8a8e,    0x00c4}, {0x8a8f,    0x00cf}, {0x8a90,    0x0020},</div><div class='del'>-{0x8a91,    0x0023}, {0x8a92,    0x0058}, {0x8a93,    0x0081},</div><div class='del'>-{0x8a94,    0x00c6}, {0x8a95,    0x0026}, {0x8a96,    0x000d},</div><div class='del'>-{0x8a97,    0x0096}, {0x8a98,    0x0022}, {0x8a99,    0x0084},</div><div class='del'>-{0x8a9a,    0x0040}, {0x8a9b,    0x0044}, {0x8a9c,    0x0044},</div><div class='del'>-{0x8a9d,    0x001b}, {0x8a9e,    0x00d6}, {0x8a9f,    0x0022},</div><div class='del'>-{0x8aa0,    0x00c4}, {0x8aa1,    0x00af}, {0x8aa2,    0x0020},</div><div class='del'>-{0x8aa3,    0x0011}, {0x8aa4,    0x0058}, {0x8aa5,    0x0081},</div><div class='del'>-{0x8aa6,    0x0027}, {0x8aa7,    0x0026}, {0x8aa8,    0x000f},</div><div class='del'>-{0x8aa9,    0x0096}, {0x8aaa,    0x0022}, {0x8aab,    0x0084},</div><div class='del'>-{0x8aac,    0x0080}, {0x8aad,    0x0044}, {0x8aae,    0x0044},</div><div class='del'>-{0x8aaf,    0x0044}, {0x8ab0,    0x001b}, {0x8ab1,    0x00d6},</div><div class='del'>-{0x8ab2,    0x0022}, {0x8ab3,    0x00c4}, {0x8ab4,    0x006f},</div><div class='del'>-{0x8ab5,    0x001b}, {0x8ab6,    0x0097}, {0x8ab7,    0x0022},</div><div class='del'>-{0x8ab8,    0x0039}, {0x8ab9,    0x0027}, {0x8aba,    0x000c},</div><div class='del'>-{0x8abb,    0x007c}, {0x8abc,    0x0082}, {0x8abd,    0x0006},</div><div class='del'>-{0x8abe,    0x00bd}, {0x8abf,    0x00d9}, {0x8ac0,    0x00ed},</div><div class='del'>-{0x8ac1,    0x00b6}, {0x8ac2,    0x0082}, {0x8ac3,    0x0007},</div><div class='del'>-{0x8ac4,    0x007e}, {0x8ac5,    0x008a}, {0x8ac6,    0x00b9},</div><div class='del'>-{0x8ac7,    0x007f}, {0x8ac8,    0x0082}, {0x8ac9,    0x0006},</div><div class='del'>-{0x8aca,    0x0039}, { 0x0, 0x0 }</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> /* phy types */</div><div class='ctx'> #define   CAS_PHY_UNKNOWN       0x00</div><div class='ctx'> #define   CAS_PHY_SERDES        0x01</div><div class='hunk'>@@ -4389,6 +2872,11 @@ struct cas {</div><div class='ctx'> 	dma_addr_t block_dvma, tx_tiny_dvma[N_TX_RINGS];</div><div class='ctx'> 	struct pci_dev *pdev;</div><div class='ctx'> 	struct net_device *dev;</div><div class='add'>+</div><div class='add'>+	/* Firmware Info */</div><div class='add'>+	u16			fw_load_addr;</div><div class='add'>+	u32			fw_size;</div><div class='add'>+	u8			*fw_data;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define TX_DESC_NEXT(r, x)  (((x) + 1) &amp; (TX_DESC_RINGN_SIZE(r) - 1))</div><div class='head'>diff --git a/drivers/net/cpmac.c b/drivers/net/cpmac.c<br/>index ec6b0af3d46b..017a5361b980 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/cpmac.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/cpmac.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/cpmac.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/cpmac.c</a></div><div class='hunk'>@@ -302,13 +302,7 @@ static int cpmac_mdio_reset(struct mii_bus *bus)</div><div class='ctx'> </div><div class='ctx'> static int mii_irqs[PHY_MAX_ADDR] = { PHY_POLL, };</div><div class='ctx'> </div><div class='del'>-static struct mii_bus cpmac_mii = {</div><div class='del'>-	.name = "cpmac-mii",</div><div class='del'>-	.read = cpmac_mdio_read,</div><div class='del'>-	.write = cpmac_mdio_write,</div><div class='del'>-	.reset = cpmac_mdio_reset,</div><div class='del'>-	.irq = mii_irqs,</div><div class='del'>-};</div><div class='add'>+static struct mii_bus *cpmac_mii;</div><div class='ctx'> </div><div class='ctx'> static int cpmac_config(struct net_device *dev, struct ifmap *map)</div><div class='ctx'> {</div><div class='hunk'>@@ -1116,7 +1110,7 @@ static int __devinit cpmac_probe(struct platform_device *pdev)</div><div class='ctx'> 	for (phy_id = 0; phy_id &lt; PHY_MAX_ADDR; phy_id++) {</div><div class='ctx'> 		if (!(pdata-&gt;phy_mask &amp; (1 &lt;&lt; phy_id)))</div><div class='ctx'> 			continue;</div><div class='del'>-		if (!cpmac_mii.phy_map[phy_id])</div><div class='add'>+		if (!cpmac_mii-&gt;phy_map[phy_id])</div><div class='ctx'> 			continue;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1168,7 +1162,7 @@ static int __devinit cpmac_probe(struct platform_device *pdev)</div><div class='ctx'> 	priv-&gt;msg_enable = netif_msg_init(debug_level, 0xff);</div><div class='ctx'> 	memcpy(dev-&gt;dev_addr, pdata-&gt;dev_addr, sizeof(dev-&gt;dev_addr));</div><div class='ctx'> </div><div class='del'>-	priv-&gt;phy = phy_connect(dev, cpmac_mii.phy_map[phy_id]-&gt;dev.bus_id,</div><div class='add'>+	priv-&gt;phy = phy_connect(dev, cpmac_mii-&gt;phy_map[phy_id]-&gt;dev.bus_id,</div><div class='ctx'> 				&amp;cpmac_adjust_link, 0, PHY_INTERFACE_MODE_MII);</div><div class='ctx'> 	if (IS_ERR(priv-&gt;phy)) {</div><div class='ctx'> 		if (netif_msg_drv(priv))</div><div class='hunk'>@@ -1216,11 +1210,22 @@ int __devinit cpmac_init(void)</div><div class='ctx'> 	u32 mask;</div><div class='ctx'> 	int i, res;</div><div class='ctx'> </div><div class='del'>-	cpmac_mii.priv = ioremap(AR7_REGS_MDIO, 256);</div><div class='add'>+	cpmac_mii = mdiobus_alloc();</div><div class='add'>+	if (cpmac_mii == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cpmac_mii-&gt;name = "cpmac-mii";</div><div class='add'>+	cpmac_mii-&gt;read = cpmac_mdio_read;</div><div class='add'>+	cpmac_mii-&gt;write = cpmac_mdio_write;</div><div class='add'>+	cpmac_mii-&gt;reset = cpmac_mdio_reset;</div><div class='add'>+	cpmac_mii-&gt;irq = mii_irqs;</div><div class='add'>+</div><div class='add'>+	cpmac_mii-&gt;priv = ioremap(AR7_REGS_MDIO, 256);</div><div class='ctx'> </div><div class='del'>-	if (!cpmac_mii.priv) {</div><div class='add'>+	if (!cpmac_mii-&gt;priv) {</div><div class='ctx'> 		printk(KERN_ERR "Can't ioremap mdio registers\n");</div><div class='del'>-		return -ENXIO;</div><div class='add'>+		res = -ENXIO;</div><div class='add'>+		goto fail_alloc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> #warning FIXME: unhardcode gpio&amp;reset bits</div><div class='hunk'>@@ -1230,10 +1235,10 @@ int __devinit cpmac_init(void)</div><div class='ctx'> 	ar7_device_reset(AR7_RESET_BIT_CPMAC_HI);</div><div class='ctx'> 	ar7_device_reset(AR7_RESET_BIT_EPHY);</div><div class='ctx'> </div><div class='del'>-	cpmac_mii.reset(&amp;cpmac_mii);</div><div class='add'>+	cpmac_mii-&gt;reset(cpmac_mii);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 300000; i++)</div><div class='del'>-		if ((mask = cpmac_read(cpmac_mii.priv, CPMAC_MDIO_ALIVE)))</div><div class='add'>+		if ((mask = cpmac_read(cpmac_mii-&gt;priv, CPMAC_MDIO_ALIVE)))</div><div class='ctx'> 			break;</div><div class='ctx'> 		else</div><div class='ctx'> 			cpu_relax();</div><div class='hunk'>@@ -1244,10 +1249,10 @@ int __devinit cpmac_init(void)</div><div class='ctx'> 		mask = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	cpmac_mii.phy_mask = ~(mask | 0x80000000);</div><div class='del'>-	snprintf(cpmac_mii.id, MII_BUS_ID_SIZE, "0");</div><div class='add'>+	cpmac_mii-&gt;phy_mask = ~(mask | 0x80000000);</div><div class='add'>+	snprintf(cpmac_mii-&gt;id, MII_BUS_ID_SIZE, "0");</div><div class='ctx'> </div><div class='del'>-	res = mdiobus_register(&amp;cpmac_mii);</div><div class='add'>+	res = mdiobus_register(cpmac_mii);</div><div class='ctx'> 	if (res)</div><div class='ctx'> 		goto fail_mii;</div><div class='ctx'> </div><div class='hunk'>@@ -1258,10 +1263,13 @@ int __devinit cpmac_init(void)</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> fail_cpmac:</div><div class='del'>-	mdiobus_unregister(&amp;cpmac_mii);</div><div class='add'>+	mdiobus_unregister(cpmac_mii);</div><div class='ctx'> </div><div class='ctx'> fail_mii:</div><div class='del'>-	iounmap(cpmac_mii.priv);</div><div class='add'>+	iounmap(cpmac_mii-&gt;priv);</div><div class='add'>+</div><div class='add'>+fail_alloc:</div><div class='add'>+	mdiobus_free(cpmac_mii);</div><div class='ctx'> </div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='hunk'>@@ -1269,8 +1277,9 @@ fail_mii:</div><div class='ctx'> void __devexit cpmac_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	platform_driver_unregister(&amp;cpmac_driver);</div><div class='del'>-	mdiobus_unregister(&amp;cpmac_mii);</div><div class='del'>-	iounmap(cpmac_mii.priv);</div><div class='add'>+	mdiobus_unregister(cpmac_mii);</div><div class='add'>+	mdiobus_free(cpmac_mii);</div><div class='add'>+	iounmap(cpmac_mii-&gt;priv);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(cpmac_init);</div><div class='head'>diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c<br/>index ea6144a9565e..7107620f615d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/cs89x0.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/cs89x0.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/cs89x0.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/cs89x0.c</a></div><div class='hunk'>@@ -36,8 +36,7 @@</div><div class='ctx'> </div><div class='ctx'>   Alan Cox          : Removed 1.2 support, added 2.1 extra counters.</div><div class='ctx'> </div><div class='del'>-  Andrew Morton     : andrewm@uow.edu.au</div><div class='del'>-                    : Kernel 2.3.48</div><div class='add'>+  Andrew Morton     : Kernel 2.3.48</div><div class='ctx'>                     : Handle kmalloc() failures</div><div class='ctx'>                     : Other resource allocation fixes</div><div class='ctx'>                     : Add SMP locks</div><div class='hunk'>@@ -49,7 +48,7 @@</div><div class='ctx'>                     : Fixed an out-of-mem bug in dma_rx()</div><div class='ctx'>                     : Updated Documentation/networking/cs89x0.txt</div><div class='ctx'> </div><div class='del'>-  Andrew Morton     : andrewm@uow.edu.au / Kernel 2.3.99-pre1</div><div class='add'>+  Andrew Morton     : Kernel 2.3.99-pre1</div><div class='ctx'>                     : Use skb_reserve to longword align IP header (two places)</div><div class='ctx'>                     : Remove a delay loop from dma_rx()</div><div class='ctx'>                     : Replace '100' with HZ</div><div class='hunk'>@@ -57,11 +56,11 @@</div><div class='ctx'>                     : Added 'cs89x0_dma=N' kernel boot option</div><div class='ctx'>                     : Correctly initialise lp-&gt;lock in non-module compile</div><div class='ctx'> </div><div class='del'>-  Andrew Morton     : andrewm@uow.edu.au / Kernel 2.3.99-pre4-1</div><div class='add'>+  Andrew Morton     : Kernel 2.3.99-pre4-1</div><div class='ctx'>                     : MOD_INC/DEC race fix (see</div><div class='ctx'>                     : http://www.uwsg.indiana.edu/hypermail/linux/kernel/0003.3/1532.html)</div><div class='ctx'> </div><div class='del'>-  Andrew Morton     : andrewm@uow.edu.au / Kernel 2.4.0-test7-pre2</div><div class='add'>+  Andrew Morton     : Kernel 2.4.0-test7-pre2</div><div class='ctx'>                     : Enhanced EEPROM support to cover more devices,</div><div class='ctx'>                     :   abstracted IRQ mapping to support CONFIG_ARCH_CLPS7500 arch</div><div class='ctx'>                     :   (Jason Gunthorpe &lt;jgg@ualberta.ca&gt;)</div><div class='hunk'>@@ -156,7 +155,7 @@</div><div class='ctx'> #include "cs89x0.h"</div><div class='ctx'> </div><div class='ctx'> static char version[] __initdata =</div><div class='del'>-"cs89x0.c: v2.4.3-pre1 Russell Nelson &lt;nelson@crynwr.com&gt;, Andrew Morton &lt;andrewm@uow.edu.au&gt;\n";</div><div class='add'>+"cs89x0.c: v2.4.3-pre1 Russell Nelson &lt;nelson@crynwr.com&gt;, Andrew Morton\n";</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME "cs89x0"</div><div class='ctx'> </div><div class='hunk'>@@ -194,6 +193,12 @@ static unsigned int cs8900_irq_map[] = {IRQ_IXDP2X01_CS8900, 0, 0, 0};</div><div class='ctx'> #define CIRRUS_DEFAULT_IRQ	VH_INTC_INT_NUM_CASCADED_INTERRUPT_1 /* Event inputs bank 1 - ID 35/bit 3 */</div><div class='ctx'> static unsigned int netcard_portlist[] __used __initdata = {CIRRUS_DEFAULT_BASE, 0};</div><div class='ctx'> static unsigned int cs8900_irq_map[] = {CIRRUS_DEFAULT_IRQ, 0, 0, 0};</div><div class='add'>+#elif defined(CONFIG_MACH_MX31ADS)</div><div class='add'>+#include &lt;mach/board-mx31ads.h&gt;</div><div class='add'>+static unsigned int netcard_portlist[] __used __initdata = {</div><div class='add'>+	PBC_BASE_ADDRESS + PBC_CS8900A_IOBASE + 0x300, 0</div><div class='add'>+};</div><div class='add'>+static unsigned cs8900_irq_map[] = {EXPIO_INT_ENET_INT, 0, 0, 0};</div><div class='ctx'> #else</div><div class='ctx'> static unsigned int netcard_portlist[] __used __initdata =</div><div class='ctx'>    { 0x300, 0x320, 0x340, 0x360, 0x200, 0x220, 0x240, 0x260, 0x280, 0x2a0, 0x2c0, 0x2e0, 0};</div><div class='hunk'>@@ -802,7 +807,7 @@ cs89x0_probe1(struct net_device *dev, int ioaddr, int modular)</div><div class='ctx'> 	} else {</div><div class='ctx'> 		i = lp-&gt;isa_config &amp; INT_NO_MASK;</div><div class='ctx'> 		if (lp-&gt;chip_type == CS8900) {</div><div class='del'>-#if defined(CONFIG_MACH_IXDP2351) || defined(CONFIG_ARCH_IXDP2X01) || defined(CONFIG_ARCH_PNX010X)</div><div class='add'>+#ifdef CONFIG_CS89x0_NONISA_IRQ</div><div class='ctx'> 		        i = cs8900_irq_map[0];</div><div class='ctx'> #else</div><div class='ctx'> 			/* Translate the IRQ using the IRQ mapping table. */</div><div class='hunk'>@@ -1029,6 +1034,7 @@ skip_this_frame:</div><div class='ctx'> </div><div class='ctx'> void  __init reset_chip(struct net_device *dev)</div><div class='ctx'> {</div><div class='add'>+#if !defined(CONFIG_MACH_MX31ADS)</div><div class='ctx'> #if !defined(CONFIG_MACH_IXDP2351) &amp;&amp; !defined(CONFIG_ARCH_IXDP2X01)</div><div class='ctx'> 	struct net_local *lp = netdev_priv(dev);</div><div class='ctx'> 	int ioaddr = dev-&gt;base_addr;</div><div class='hunk'>@@ -1057,6 +1063,7 @@ void  __init reset_chip(struct net_device *dev)</div><div class='ctx'> 	reset_start_time = jiffies;</div><div class='ctx'> 	while( (readreg(dev, PP_SelfST) &amp; INIT_DONE) == 0 &amp;&amp; jiffies - reset_start_time &lt; 2)</div><div class='ctx'> 		;</div><div class='add'>+#endif /* !CONFIG_MACH_MX31ADS */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -1304,7 +1311,7 @@ net_open(struct net_device *dev)</div><div class='ctx'> 	else</div><div class='ctx'> #endif</div><div class='ctx'> 	{</div><div class='del'>-#if !defined(CONFIG_MACH_IXDP2351) &amp;&amp; !defined(CONFIG_ARCH_IXDP2X01) &amp;&amp; !defined(CONFIG_ARCH_PNX010X)</div><div class='add'>+#ifndef CONFIG_CS89x0_NONISA_IRQ</div><div class='ctx'> 		if (((1 &lt;&lt; dev-&gt;irq) &amp; lp-&gt;irq_map) == 0) {</div><div class='ctx'> 			printk(KERN_ERR "%s: IRQ %d is not in our map of allowable IRQs, which is %x\n",</div><div class='ctx'>                                dev-&gt;name, dev-&gt;irq, lp-&gt;irq_map);</div><div class='hunk'>@@ -1397,9 +1404,7 @@ net_open(struct net_device *dev)</div><div class='ctx'> release_dma:</div><div class='ctx'> #if ALLOW_DMA</div><div class='ctx'> 		free_dma(dev-&gt;dma);</div><div class='del'>-#endif</div><div class='ctx'> release_irq:</div><div class='del'>-#if ALLOW_DMA</div><div class='ctx'> 		release_dma_buff(lp);</div><div class='ctx'> #endif</div><div class='ctx'>                 writereg(dev, PP_LineCTL, readreg(dev, PP_LineCTL) &amp; ~(SERIAL_TX_ON | SERIAL_RX_ON));</div><div class='hunk'>@@ -1871,7 +1876,7 @@ MODULE_PARM_DESC(dmasize , "(ignored)");</div><div class='ctx'> MODULE_PARM_DESC(use_dma , "(ignored)");</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-MODULE_AUTHOR("Mike Cruse, Russwll Nelson &lt;nelson@crynwr.com&gt;, Andrew Morton &lt;andrewm@uow.edu.au&gt;");</div><div class='add'>+MODULE_AUTHOR("Mike Cruse, Russwll Nelson &lt;nelson@crynwr.com&gt;, Andrew Morton");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/cxgb3/adapter.h b/drivers/net/cxgb3/adapter.h<br/>index 271140433b09..bc8e2413abd2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/cxgb3/adapter.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/cxgb3/adapter.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/cxgb3/adapter.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/cxgb3/adapter.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * Copyright (c) 2003-2007 Chelsio, Inc. All rights reserved.</div><div class='add'>+ * Copyright (c) 2003-2008 Chelsio, Inc. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * This software is available to you under a choice of one of two</div><div class='ctx'>  * licenses.  You may choose to be licensed under the terms of the GNU</div><div class='hunk'>@@ -54,7 +54,6 @@ struct port_info {</div><div class='ctx'> 	struct adapter *adapter;</div><div class='ctx'> 	struct vlan_group *vlan_grp;</div><div class='ctx'> 	struct sge_qset *qs;</div><div class='del'>-	const struct port_type_info *port_type;</div><div class='ctx'> 	u8 port_id;</div><div class='ctx'> 	u8 rx_csum_offload;</div><div class='ctx'> 	u8 nqsets;</div><div class='hunk'>@@ -124,8 +123,7 @@ struct sge_rspq {		/* state for an SGE response queue */</div><div class='ctx'> 	dma_addr_t phys_addr;	/* physical address of the ring */</div><div class='ctx'> 	unsigned int cntxt_id;	/* SGE context id for the response q */</div><div class='ctx'> 	spinlock_t lock;	/* guards response processing */</div><div class='del'>-	struct sk_buff *rx_head;	/* offload packet receive queue head */</div><div class='del'>-	struct sk_buff *rx_tail;	/* offload packet receive queue tail */</div><div class='add'>+	struct sk_buff_head rx_queue; /* offload packet receive queue */</div><div class='ctx'> 	struct sk_buff *pg_skb; /* used to build frag list in napi handler */</div><div class='ctx'> </div><div class='ctx'> 	unsigned long offload_pkts;</div><div class='hunk'>@@ -241,6 +239,7 @@ struct adapter {</div><div class='ctx'> 	unsigned int check_task_cnt;</div><div class='ctx'> 	struct delayed_work adap_check_task;</div><div class='ctx'> 	struct work_struct ext_intr_handler_task;</div><div class='add'>+	struct work_struct fatal_error_handler_task;</div><div class='ctx'> </div><div class='ctx'> 	struct dentry *debugfs_root;</div><div class='ctx'> </div><div class='hunk'>@@ -282,9 +281,11 @@ int t3_offload_tx(struct t3cdev *tdev, struct sk_buff *skb);</div><div class='ctx'> void t3_os_ext_intr_handler(struct adapter *adapter);</div><div class='ctx'> void t3_os_link_changed(struct adapter *adapter, int port_id, int link_status,</div><div class='ctx'> 			int speed, int duplex, int fc);</div><div class='add'>+void t3_os_phymod_changed(struct adapter *adap, int port_id);</div><div class='ctx'> </div><div class='ctx'> void t3_sge_start(struct adapter *adap);</div><div class='ctx'> void t3_sge_stop(struct adapter *adap);</div><div class='add'>+void t3_stop_sge_timers(struct adapter *adap);</div><div class='ctx'> void t3_free_sge_resources(struct adapter *adap);</div><div class='ctx'> void t3_sge_err_intr_handler(struct adapter *adapter);</div><div class='ctx'> irq_handler_t t3_intr_handler(struct adapter *adap, int polling);</div><div class='head'>diff --git a/drivers/net/cxgb3/ael1002.c b/drivers/net/cxgb3/ael1002.c<br/>index ee140e63ddc5..5c3c05da4d96 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/cxgb3/ael1002.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/cxgb3/ael1002.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/cxgb3/ael1002.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/cxgb3/ael1002.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * Copyright (c) 2005-2007 Chelsio, Inc. All rights reserved.</div><div class='add'>+ * Copyright (c) 2005-2008 Chelsio, Inc. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * This software is available to you under a choice of one of two</div><div class='ctx'>  * licenses.  You may choose to be licensed under the terms of the GNU</div><div class='hunk'>@@ -33,17 +33,57 @@</div><div class='ctx'> #include "regs.h"</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='add'>+	PMD_RSD     = 10,   /* PMA/PMD receive signal detect register */</div><div class='add'>+	PCS_STAT1_X = 24,   /* 10GBASE-X PCS status 1 register */</div><div class='add'>+	PCS_STAT1_R = 32,   /* 10GBASE-R PCS status 1 register */</div><div class='add'>+	XS_LN_STAT  = 24    /* XS lane status register */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='ctx'> 	AEL100X_TX_DISABLE = 9,</div><div class='ctx'> 	AEL100X_TX_CONFIG1 = 0xc002,</div><div class='ctx'> 	AEL1002_PWR_DOWN_HI = 0xc011,</div><div class='ctx'> 	AEL1002_PWR_DOWN_LO = 0xc012,</div><div class='ctx'> 	AEL1002_XFI_EQL = 0xc015,</div><div class='ctx'> 	AEL1002_LB_EN = 0xc017,</div><div class='add'>+	AEL_OPT_SETTINGS = 0xc017,</div><div class='add'>+	AEL_I2C_CTRL = 0xc30a,</div><div class='add'>+	AEL_I2C_DATA = 0xc30b,</div><div class='add'>+	AEL_I2C_STAT = 0xc30c,</div><div class='add'>+	AEL2005_GPIO_CTRL = 0xc214,</div><div class='add'>+	AEL2005_GPIO_STAT = 0xc215,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum { edc_none, edc_sr, edc_twinax };</div><div class='ctx'> </div><div class='del'>-	LASI_CTRL = 0x9002,</div><div class='del'>-	LASI_STAT = 0x9005</div><div class='add'>+/* PHY module I2C device address */</div><div class='add'>+#define MODULE_DEV_ADDR 0xa0</div><div class='add'>+</div><div class='add'>+#define AEL2005_MODDET_IRQ 4</div><div class='add'>+</div><div class='add'>+struct reg_val {</div><div class='add'>+	unsigned short mmd_addr;</div><div class='add'>+	unsigned short reg_addr;</div><div class='add'>+	unsigned short clear_bits;</div><div class='add'>+	unsigned short set_bits;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static int set_phy_regs(struct cphy *phy, const struct reg_val *rv)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	for (err = 0; rv-&gt;mmd_addr &amp;&amp; !err; rv++) {</div><div class='add'>+		if (rv-&gt;clear_bits == 0xffff)</div><div class='add'>+			err = mdio_write(phy, rv-&gt;mmd_addr, rv-&gt;reg_addr,</div><div class='add'>+					 rv-&gt;set_bits);</div><div class='add'>+		else</div><div class='add'>+			err = t3_mdio_change_bits(phy, rv-&gt;mmd_addr,</div><div class='add'>+						  rv-&gt;reg_addr, rv-&gt;clear_bits,</div><div class='add'>+						  rv-&gt;set_bits);</div><div class='add'>+	}</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void ael100x_txon(struct cphy *phy)</div><div class='ctx'> {</div><div class='ctx'> 	int tx_on_gpio = phy-&gt;addr == 0 ? F_GPIO7_OUT_VAL : F_GPIO2_OUT_VAL;</div><div class='hunk'>@@ -84,23 +124,23 @@ static int ael1002_intr_noop(struct cphy *phy)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ael100x_get_link_status(struct cphy *phy, int *link_ok,</div><div class='del'>-				   int *speed, int *duplex, int *fc)</div><div class='add'>+/*</div><div class='add'>+ * Get link status for a 10GBASE-R device.</div><div class='add'>+ */</div><div class='add'>+static int get_link_status_r(struct cphy *phy, int *link_ok, int *speed,</div><div class='add'>+			     int *duplex, int *fc)</div><div class='ctx'> {</div><div class='ctx'> 	if (link_ok) {</div><div class='del'>-		unsigned int status;</div><div class='del'>-		int err = mdio_read(phy, MDIO_DEV_PMA_PMD, MII_BMSR, &amp;status);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * BMSR_LSTATUS is latch-low, so if it is 0 we need to read it</div><div class='del'>-		 * once more to get the current link state.</div><div class='del'>-		 */</div><div class='del'>-		if (!err &amp;&amp; !(status &amp; BMSR_LSTATUS))</div><div class='del'>-			err = mdio_read(phy, MDIO_DEV_PMA_PMD, MII_BMSR,</div><div class='del'>-					&amp;status);</div><div class='add'>+		unsigned int stat0, stat1, stat2;</div><div class='add'>+		int err = mdio_read(phy, MDIO_DEV_PMA_PMD, PMD_RSD, &amp;stat0);</div><div class='add'>+</div><div class='add'>+		if (!err)</div><div class='add'>+			err = mdio_read(phy, MDIO_DEV_PCS, PCS_STAT1_R, &amp;stat1);</div><div class='add'>+		if (!err)</div><div class='add'>+			err = mdio_read(phy, MDIO_DEV_XGXS, XS_LN_STAT, &amp;stat2);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='del'>-		*link_ok = !!(status &amp; BMSR_LSTATUS);</div><div class='add'>+		*link_ok = (stat0 &amp; stat1 &amp; (stat2 &gt;&gt; 12)) &amp; 1;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (speed)</div><div class='ctx'> 		*speed = SPEED_10000;</div><div class='hunk'>@@ -115,15 +155,18 @@ static struct cphy_ops ael1002_ops = {</div><div class='ctx'> 	.intr_disable = ael1002_intr_noop,</div><div class='ctx'> 	.intr_clear = ael1002_intr_noop,</div><div class='ctx'> 	.intr_handler = ael1002_intr_noop,</div><div class='del'>-	.get_link_status = ael100x_get_link_status,</div><div class='add'>+	.get_link_status = get_link_status_r,</div><div class='ctx'> 	.power_down = ael1002_power_down,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-void t3_ael1002_phy_prep(struct cphy *phy, struct adapter *adapter,</div><div class='del'>-			 int phy_addr, const struct mdio_ops *mdio_ops)</div><div class='add'>+int t3_ael1002_phy_prep(struct cphy *phy, struct adapter *adapter,</div><div class='add'>+			int phy_addr, const struct mdio_ops *mdio_ops)</div><div class='ctx'> {</div><div class='del'>-	cphy_init(phy, adapter, phy_addr, &amp;ael1002_ops, mdio_ops);</div><div class='add'>+	cphy_init(phy, adapter, phy_addr, &amp;ael1002_ops, mdio_ops,</div><div class='add'>+		  SUPPORTED_10000baseT_Full | SUPPORTED_AUI | SUPPORTED_FIBRE,</div><div class='add'>+		   "10GBASE-R");</div><div class='ctx'> 	ael100x_txon(phy);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ael1006_reset(struct cphy *phy, int wait)</div><div class='hunk'>@@ -131,72 +174,985 @@ static int ael1006_reset(struct cphy *phy, int wait)</div><div class='ctx'> 	return t3_phy_reset(phy, MDIO_DEV_PMA_PMD, wait);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ael1006_intr_enable(struct cphy *phy)</div><div class='add'>+static int ael1006_power_down(struct cphy *phy, int enable)</div><div class='ctx'> {</div><div class='del'>-	return mdio_write(phy, MDIO_DEV_PMA_PMD, LASI_CTRL, 1);</div><div class='add'>+	return t3_mdio_change_bits(phy, MDIO_DEV_PMA_PMD, MII_BMCR,</div><div class='add'>+				   BMCR_PDOWN, enable ? BMCR_PDOWN : 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ael1006_intr_disable(struct cphy *phy)</div><div class='add'>+static struct cphy_ops ael1006_ops = {</div><div class='add'>+	.reset = ael1006_reset,</div><div class='add'>+	.intr_enable = t3_phy_lasi_intr_enable,</div><div class='add'>+	.intr_disable = t3_phy_lasi_intr_disable,</div><div class='add'>+	.intr_clear = t3_phy_lasi_intr_clear,</div><div class='add'>+	.intr_handler = t3_phy_lasi_intr_handler,</div><div class='add'>+	.get_link_status = get_link_status_r,</div><div class='add'>+	.power_down = ael1006_power_down,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int t3_ael1006_phy_prep(struct cphy *phy, struct adapter *adapter,</div><div class='add'>+			     int phy_addr, const struct mdio_ops *mdio_ops)</div><div class='ctx'> {</div><div class='del'>-	return mdio_write(phy, MDIO_DEV_PMA_PMD, LASI_CTRL, 0);</div><div class='add'>+	cphy_init(phy, adapter, phy_addr, &amp;ael1006_ops, mdio_ops,</div><div class='add'>+		  SUPPORTED_10000baseT_Full | SUPPORTED_AUI | SUPPORTED_FIBRE,</div><div class='add'>+		   "10GBASE-SR");</div><div class='add'>+	ael100x_txon(phy);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ael1006_intr_clear(struct cphy *phy)</div><div class='add'>+static int ael2005_setup_sr_edc(struct cphy *phy)</div><div class='ctx'> {</div><div class='del'>-	u32 val;</div><div class='add'>+	static struct reg_val regs[] = {</div><div class='add'>+		{ MDIO_DEV_PMA_PMD, 0xc003, 0xffff, 0x181 },</div><div class='add'>+		{ MDIO_DEV_PMA_PMD, 0xc010, 0xffff, 0x448a },</div><div class='add'>+		{ MDIO_DEV_PMA_PMD, 0xc04a, 0xffff, 0x5200 },</div><div class='add'>+		{ 0, 0, 0, 0 }</div><div class='add'>+	};</div><div class='add'>+	static u16 sr_edc[] = {</div><div class='add'>+		0xcc00, 0x2ff4,</div><div class='add'>+		0xcc01, 0x3cd4,</div><div class='add'>+		0xcc02, 0x2015,</div><div class='add'>+		0xcc03, 0x3105,</div><div class='add'>+		0xcc04, 0x6524,</div><div class='add'>+		0xcc05, 0x27ff,</div><div class='add'>+		0xcc06, 0x300f,</div><div class='add'>+		0xcc07, 0x2c8b,</div><div class='add'>+		0xcc08, 0x300b,</div><div class='add'>+		0xcc09, 0x4009,</div><div class='add'>+		0xcc0a, 0x400e,</div><div class='add'>+		0xcc0b, 0x2f72,</div><div class='add'>+		0xcc0c, 0x3002,</div><div class='add'>+		0xcc0d, 0x1002,</div><div class='add'>+		0xcc0e, 0x2172,</div><div class='add'>+		0xcc0f, 0x3012,</div><div class='add'>+		0xcc10, 0x1002,</div><div class='add'>+		0xcc11, 0x25d2,</div><div class='add'>+		0xcc12, 0x3012,</div><div class='add'>+		0xcc13, 0x1002,</div><div class='add'>+		0xcc14, 0xd01e,</div><div class='add'>+		0xcc15, 0x27d2,</div><div class='add'>+		0xcc16, 0x3012,</div><div class='add'>+		0xcc17, 0x1002,</div><div class='add'>+		0xcc18, 0x2004,</div><div class='add'>+		0xcc19, 0x3c84,</div><div class='add'>+		0xcc1a, 0x6436,</div><div class='add'>+		0xcc1b, 0x2007,</div><div class='add'>+		0xcc1c, 0x3f87,</div><div class='add'>+		0xcc1d, 0x8676,</div><div class='add'>+		0xcc1e, 0x40b7,</div><div class='add'>+		0xcc1f, 0xa746,</div><div class='add'>+		0xcc20, 0x4047,</div><div class='add'>+		0xcc21, 0x5673,</div><div class='add'>+		0xcc22, 0x2982,</div><div class='add'>+		0xcc23, 0x3002,</div><div class='add'>+		0xcc24, 0x13d2,</div><div class='add'>+		0xcc25, 0x8bbd,</div><div class='add'>+		0xcc26, 0x2862,</div><div class='add'>+		0xcc27, 0x3012,</div><div class='add'>+		0xcc28, 0x1002,</div><div class='add'>+		0xcc29, 0x2092,</div><div class='add'>+		0xcc2a, 0x3012,</div><div class='add'>+		0xcc2b, 0x1002,</div><div class='add'>+		0xcc2c, 0x5cc3,</div><div class='add'>+		0xcc2d, 0x314,</div><div class='add'>+		0xcc2e, 0x2942,</div><div class='add'>+		0xcc2f, 0x3002,</div><div class='add'>+		0xcc30, 0x1002,</div><div class='add'>+		0xcc31, 0xd019,</div><div class='add'>+		0xcc32, 0x2032,</div><div class='add'>+		0xcc33, 0x3012,</div><div class='add'>+		0xcc34, 0x1002,</div><div class='add'>+		0xcc35, 0x2a04,</div><div class='add'>+		0xcc36, 0x3c74,</div><div class='add'>+		0xcc37, 0x6435,</div><div class='add'>+		0xcc38, 0x2fa4,</div><div class='add'>+		0xcc39, 0x3cd4,</div><div class='add'>+		0xcc3a, 0x6624,</div><div class='add'>+		0xcc3b, 0x5563,</div><div class='add'>+		0xcc3c, 0x2d42,</div><div class='add'>+		0xcc3d, 0x3002,</div><div class='add'>+		0xcc3e, 0x13d2,</div><div class='add'>+		0xcc3f, 0x464d,</div><div class='add'>+		0xcc40, 0x2862,</div><div class='add'>+		0xcc41, 0x3012,</div><div class='add'>+		0xcc42, 0x1002,</div><div class='add'>+		0xcc43, 0x2032,</div><div class='add'>+		0xcc44, 0x3012,</div><div class='add'>+		0xcc45, 0x1002,</div><div class='add'>+		0xcc46, 0x2fb4,</div><div class='add'>+		0xcc47, 0x3cd4,</div><div class='add'>+		0xcc48, 0x6624,</div><div class='add'>+		0xcc49, 0x5563,</div><div class='add'>+		0xcc4a, 0x2d42,</div><div class='add'>+		0xcc4b, 0x3002,</div><div class='add'>+		0xcc4c, 0x13d2,</div><div class='add'>+		0xcc4d, 0x2ed2,</div><div class='add'>+		0xcc4e, 0x3002,</div><div class='add'>+		0xcc4f, 0x1002,</div><div class='add'>+		0xcc50, 0x2fd2,</div><div class='add'>+		0xcc51, 0x3002,</div><div class='add'>+		0xcc52, 0x1002,</div><div class='add'>+		0xcc53, 0x004,</div><div class='add'>+		0xcc54, 0x2942,</div><div class='add'>+		0xcc55, 0x3002,</div><div class='add'>+		0xcc56, 0x1002,</div><div class='add'>+		0xcc57, 0x2092,</div><div class='add'>+		0xcc58, 0x3012,</div><div class='add'>+		0xcc59, 0x1002,</div><div class='add'>+		0xcc5a, 0x5cc3,</div><div class='add'>+		0xcc5b, 0x317,</div><div class='add'>+		0xcc5c, 0x2f72,</div><div class='add'>+		0xcc5d, 0x3002,</div><div class='add'>+		0xcc5e, 0x1002,</div><div class='add'>+		0xcc5f, 0x2942,</div><div class='add'>+		0xcc60, 0x3002,</div><div class='add'>+		0xcc61, 0x1002,</div><div class='add'>+		0xcc62, 0x22cd,</div><div class='add'>+		0xcc63, 0x301d,</div><div class='add'>+		0xcc64, 0x2862,</div><div class='add'>+		0xcc65, 0x3012,</div><div class='add'>+		0xcc66, 0x1002,</div><div class='add'>+		0xcc67, 0x2ed2,</div><div class='add'>+		0xcc68, 0x3002,</div><div class='add'>+		0xcc69, 0x1002,</div><div class='add'>+		0xcc6a, 0x2d72,</div><div class='add'>+		0xcc6b, 0x3002,</div><div class='add'>+		0xcc6c, 0x1002,</div><div class='add'>+		0xcc6d, 0x628f,</div><div class='add'>+		0xcc6e, 0x2112,</div><div class='add'>+		0xcc6f, 0x3012,</div><div class='add'>+		0xcc70, 0x1002,</div><div class='add'>+		0xcc71, 0x5aa3,</div><div class='add'>+		0xcc72, 0x2dc2,</div><div class='add'>+		0xcc73, 0x3002,</div><div class='add'>+		0xcc74, 0x1312,</div><div class='add'>+		0xcc75, 0x6f72,</div><div class='add'>+		0xcc76, 0x1002,</div><div class='add'>+		0xcc77, 0x2807,</div><div class='add'>+		0xcc78, 0x31a7,</div><div class='add'>+		0xcc79, 0x20c4,</div><div class='add'>+		0xcc7a, 0x3c24,</div><div class='add'>+		0xcc7b, 0x6724,</div><div class='add'>+		0xcc7c, 0x1002,</div><div class='add'>+		0xcc7d, 0x2807,</div><div class='add'>+		0xcc7e, 0x3187,</div><div class='add'>+		0xcc7f, 0x20c4,</div><div class='add'>+		0xcc80, 0x3c24,</div><div class='add'>+		0xcc81, 0x6724,</div><div class='add'>+		0xcc82, 0x1002,</div><div class='add'>+		0xcc83, 0x2514,</div><div class='add'>+		0xcc84, 0x3c64,</div><div class='add'>+		0xcc85, 0x6436,</div><div class='add'>+		0xcc86, 0xdff4,</div><div class='add'>+		0xcc87, 0x6436,</div><div class='add'>+		0xcc88, 0x1002,</div><div class='add'>+		0xcc89, 0x40a4,</div><div class='add'>+		0xcc8a, 0x643c,</div><div class='add'>+		0xcc8b, 0x4016,</div><div class='add'>+		0xcc8c, 0x8c6c,</div><div class='add'>+		0xcc8d, 0x2b24,</div><div class='add'>+		0xcc8e, 0x3c24,</div><div class='add'>+		0xcc8f, 0x6435,</div><div class='add'>+		0xcc90, 0x1002,</div><div class='add'>+		0xcc91, 0x2b24,</div><div class='add'>+		0xcc92, 0x3c24,</div><div class='add'>+		0xcc93, 0x643a,</div><div class='add'>+		0xcc94, 0x4025,</div><div class='add'>+		0xcc95, 0x8a5a,</div><div class='add'>+		0xcc96, 0x1002,</div><div class='add'>+		0xcc97, 0x2731,</div><div class='add'>+		0xcc98, 0x3011,</div><div class='add'>+		0xcc99, 0x1001,</div><div class='add'>+		0xcc9a, 0xc7a0,</div><div class='add'>+		0xcc9b, 0x100,</div><div class='add'>+		0xcc9c, 0xc502,</div><div class='add'>+		0xcc9d, 0x53ac,</div><div class='add'>+		0xcc9e, 0xc503,</div><div class='add'>+		0xcc9f, 0xd5d5,</div><div class='add'>+		0xcca0, 0xc600,</div><div class='add'>+		0xcca1, 0x2a6d,</div><div class='add'>+		0xcca2, 0xc601,</div><div class='add'>+		0xcca3, 0x2a4c,</div><div class='add'>+		0xcca4, 0xc602,</div><div class='add'>+		0xcca5, 0x111,</div><div class='add'>+		0xcca6, 0xc60c,</div><div class='add'>+		0xcca7, 0x5900,</div><div class='add'>+		0xcca8, 0xc710,</div><div class='add'>+		0xcca9, 0x700,</div><div class='add'>+		0xccaa, 0xc718,</div><div class='add'>+		0xccab, 0x700,</div><div class='add'>+		0xccac, 0xc720,</div><div class='add'>+		0xccad, 0x4700,</div><div class='add'>+		0xccae, 0xc801,</div><div class='add'>+		0xccaf, 0x7f50,</div><div class='add'>+		0xccb0, 0xc802,</div><div class='add'>+		0xccb1, 0x7760,</div><div class='add'>+		0xccb2, 0xc803,</div><div class='add'>+		0xccb3, 0x7fce,</div><div class='add'>+		0xccb4, 0xc804,</div><div class='add'>+		0xccb5, 0x5700,</div><div class='add'>+		0xccb6, 0xc805,</div><div class='add'>+		0xccb7, 0x5f11,</div><div class='add'>+		0xccb8, 0xc806,</div><div class='add'>+		0xccb9, 0x4751,</div><div class='add'>+		0xccba, 0xc807,</div><div class='add'>+		0xccbb, 0x57e1,</div><div class='add'>+		0xccbc, 0xc808,</div><div class='add'>+		0xccbd, 0x2700,</div><div class='add'>+		0xccbe, 0xc809,</div><div class='add'>+		0xccbf, 0x000,</div><div class='add'>+		0xccc0, 0xc821,</div><div class='add'>+		0xccc1, 0x002,</div><div class='add'>+		0xccc2, 0xc822,</div><div class='add'>+		0xccc3, 0x014,</div><div class='add'>+		0xccc4, 0xc832,</div><div class='add'>+		0xccc5, 0x1186,</div><div class='add'>+		0xccc6, 0xc847,</div><div class='add'>+		0xccc7, 0x1e02,</div><div class='add'>+		0xccc8, 0xc013,</div><div class='add'>+		0xccc9, 0xf341,</div><div class='add'>+		0xccca, 0xc01a,</div><div class='add'>+		0xcccb, 0x446,</div><div class='add'>+		0xcccc, 0xc024,</div><div class='add'>+		0xcccd, 0x1000,</div><div class='add'>+		0xccce, 0xc025,</div><div class='add'>+		0xcccf, 0xa00,</div><div class='add'>+		0xccd0, 0xc026,</div><div class='add'>+		0xccd1, 0xc0c,</div><div class='add'>+		0xccd2, 0xc027,</div><div class='add'>+		0xccd3, 0xc0c,</div><div class='add'>+		0xccd4, 0xc029,</div><div class='add'>+		0xccd5, 0x0a0,</div><div class='add'>+		0xccd6, 0xc030,</div><div class='add'>+		0xccd7, 0xa00,</div><div class='add'>+		0xccd8, 0xc03c,</div><div class='add'>+		0xccd9, 0x01c,</div><div class='add'>+		0xccda, 0xc005,</div><div class='add'>+		0xccdb, 0x7a06,</div><div class='add'>+		0xccdc, 0x000,</div><div class='add'>+		0xccdd, 0x2731,</div><div class='add'>+		0xccde, 0x3011,</div><div class='add'>+		0xccdf, 0x1001,</div><div class='add'>+		0xcce0, 0xc620,</div><div class='add'>+		0xcce1, 0x000,</div><div class='add'>+		0xcce2, 0xc621,</div><div class='add'>+		0xcce3, 0x03f,</div><div class='add'>+		0xcce4, 0xc622,</div><div class='add'>+		0xcce5, 0x000,</div><div class='add'>+		0xcce6, 0xc623,</div><div class='add'>+		0xcce7, 0x000,</div><div class='add'>+		0xcce8, 0xc624,</div><div class='add'>+		0xcce9, 0x000,</div><div class='add'>+		0xccea, 0xc625,</div><div class='add'>+		0xcceb, 0x000,</div><div class='add'>+		0xccec, 0xc627,</div><div class='add'>+		0xcced, 0x000,</div><div class='add'>+		0xccee, 0xc628,</div><div class='add'>+		0xccef, 0x000,</div><div class='add'>+		0xccf0, 0xc62c,</div><div class='add'>+		0xccf1, 0x000,</div><div class='add'>+		0xccf2, 0x000,</div><div class='add'>+		0xccf3, 0x2806,</div><div class='add'>+		0xccf4, 0x3cb6,</div><div class='add'>+		0xccf5, 0xc161,</div><div class='add'>+		0xccf6, 0x6134,</div><div class='add'>+		0xccf7, 0x6135,</div><div class='add'>+		0xccf8, 0x5443,</div><div class='add'>+		0xccf9, 0x303,</div><div class='add'>+		0xccfa, 0x6524,</div><div class='add'>+		0xccfb, 0x00b,</div><div class='add'>+		0xccfc, 0x1002,</div><div class='add'>+		0xccfd, 0x2104,</div><div class='add'>+		0xccfe, 0x3c24,</div><div class='add'>+		0xccff, 0x2105,</div><div class='add'>+		0xcd00, 0x3805,</div><div class='add'>+		0xcd01, 0x6524,</div><div class='add'>+		0xcd02, 0xdff4,</div><div class='add'>+		0xcd03, 0x4005,</div><div class='add'>+		0xcd04, 0x6524,</div><div class='add'>+		0xcd05, 0x1002,</div><div class='add'>+		0xcd06, 0x5dd3,</div><div class='add'>+		0xcd07, 0x306,</div><div class='add'>+		0xcd08, 0x2ff7,</div><div class='add'>+		0xcd09, 0x38f7,</div><div class='add'>+		0xcd0a, 0x60b7,</div><div class='add'>+		0xcd0b, 0xdffd,</div><div class='add'>+		0xcd0c, 0x00a,</div><div class='add'>+		0xcd0d, 0x1002,</div><div class='add'>+		0xcd0e, 0</div><div class='add'>+	};</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	err = set_phy_regs(phy, regs);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	return mdio_read(phy, MDIO_DEV_PMA_PMD, LASI_STAT, &amp;val);</div><div class='add'>+	msleep(50);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(sr_edc) &amp;&amp; !err; i += 2)</div><div class='add'>+		err = mdio_write(phy, MDIO_DEV_PMA_PMD, sr_edc[i],</div><div class='add'>+				 sr_edc[i + 1]);</div><div class='add'>+	if (!err)</div><div class='add'>+		phy-&gt;priv = edc_sr;</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ael1006_intr_handler(struct cphy *phy)</div><div class='add'>+static int ael2005_setup_twinax_edc(struct cphy *phy, int modtype)</div><div class='ctx'> {</div><div class='del'>-	unsigned int status;</div><div class='del'>-	int err = mdio_read(phy, MDIO_DEV_PMA_PMD, LASI_STAT, &amp;status);</div><div class='add'>+	static struct reg_val regs[] = {</div><div class='add'>+		{ MDIO_DEV_PMA_PMD, 0xc04a, 0xffff, 0x5a00 },</div><div class='add'>+		{ 0, 0, 0, 0 }</div><div class='add'>+	};</div><div class='add'>+	static struct reg_val preemphasis[] = {</div><div class='add'>+		{ MDIO_DEV_PMA_PMD, 0xc014, 0xffff, 0xfe16 },</div><div class='add'>+		{ MDIO_DEV_PMA_PMD, 0xc015, 0xffff, 0xa000 },</div><div class='add'>+		{ 0, 0, 0, 0 }</div><div class='add'>+	};</div><div class='add'>+	static u16 twinax_edc[] = {</div><div class='add'>+		0xcc00, 0x4009,</div><div class='add'>+		0xcc01, 0x27ff,</div><div class='add'>+		0xcc02, 0x300f,</div><div class='add'>+		0xcc03, 0x40aa,</div><div class='add'>+		0xcc04, 0x401c,</div><div class='add'>+		0xcc05, 0x401e,</div><div class='add'>+		0xcc06, 0x2ff4,</div><div class='add'>+		0xcc07, 0x3cd4,</div><div class='add'>+		0xcc08, 0x2035,</div><div class='add'>+		0xcc09, 0x3145,</div><div class='add'>+		0xcc0a, 0x6524,</div><div class='add'>+		0xcc0b, 0x26a2,</div><div class='add'>+		0xcc0c, 0x3012,</div><div class='add'>+		0xcc0d, 0x1002,</div><div class='add'>+		0xcc0e, 0x29c2,</div><div class='add'>+		0xcc0f, 0x3002,</div><div class='add'>+		0xcc10, 0x1002,</div><div class='add'>+		0xcc11, 0x2072,</div><div class='add'>+		0xcc12, 0x3012,</div><div class='add'>+		0xcc13, 0x1002,</div><div class='add'>+		0xcc14, 0x22cd,</div><div class='add'>+		0xcc15, 0x301d,</div><div class='add'>+		0xcc16, 0x2e52,</div><div class='add'>+		0xcc17, 0x3012,</div><div class='add'>+		0xcc18, 0x1002,</div><div class='add'>+		0xcc19, 0x28e2,</div><div class='add'>+		0xcc1a, 0x3002,</div><div class='add'>+		0xcc1b, 0x1002,</div><div class='add'>+		0xcc1c, 0x628f,</div><div class='add'>+		0xcc1d, 0x2ac2,</div><div class='add'>+		0xcc1e, 0x3012,</div><div class='add'>+		0xcc1f, 0x1002,</div><div class='add'>+		0xcc20, 0x5553,</div><div class='add'>+		0xcc21, 0x2ae2,</div><div class='add'>+		0xcc22, 0x3002,</div><div class='add'>+		0xcc23, 0x1302,</div><div class='add'>+		0xcc24, 0x401e,</div><div class='add'>+		0xcc25, 0x2be2,</div><div class='add'>+		0xcc26, 0x3012,</div><div class='add'>+		0xcc27, 0x1002,</div><div class='add'>+		0xcc28, 0x2da2,</div><div class='add'>+		0xcc29, 0x3012,</div><div class='add'>+		0xcc2a, 0x1002,</div><div class='add'>+		0xcc2b, 0x2ba2,</div><div class='add'>+		0xcc2c, 0x3002,</div><div class='add'>+		0xcc2d, 0x1002,</div><div class='add'>+		0xcc2e, 0x5ee3,</div><div class='add'>+		0xcc2f, 0x305,</div><div class='add'>+		0xcc30, 0x400e,</div><div class='add'>+		0xcc31, 0x2bc2,</div><div class='add'>+		0xcc32, 0x3002,</div><div class='add'>+		0xcc33, 0x1002,</div><div class='add'>+		0xcc34, 0x2b82,</div><div class='add'>+		0xcc35, 0x3012,</div><div class='add'>+		0xcc36, 0x1002,</div><div class='add'>+		0xcc37, 0x5663,</div><div class='add'>+		0xcc38, 0x302,</div><div class='add'>+		0xcc39, 0x401e,</div><div class='add'>+		0xcc3a, 0x6f72,</div><div class='add'>+		0xcc3b, 0x1002,</div><div class='add'>+		0xcc3c, 0x628f,</div><div class='add'>+		0xcc3d, 0x2be2,</div><div class='add'>+		0xcc3e, 0x3012,</div><div class='add'>+		0xcc3f, 0x1002,</div><div class='add'>+		0xcc40, 0x22cd,</div><div class='add'>+		0xcc41, 0x301d,</div><div class='add'>+		0xcc42, 0x2e52,</div><div class='add'>+		0xcc43, 0x3012,</div><div class='add'>+		0xcc44, 0x1002,</div><div class='add'>+		0xcc45, 0x2522,</div><div class='add'>+		0xcc46, 0x3012,</div><div class='add'>+		0xcc47, 0x1002,</div><div class='add'>+		0xcc48, 0x2da2,</div><div class='add'>+		0xcc49, 0x3012,</div><div class='add'>+		0xcc4a, 0x1002,</div><div class='add'>+		0xcc4b, 0x2ca2,</div><div class='add'>+		0xcc4c, 0x3012,</div><div class='add'>+		0xcc4d, 0x1002,</div><div class='add'>+		0xcc4e, 0x2fa4,</div><div class='add'>+		0xcc4f, 0x3cd4,</div><div class='add'>+		0xcc50, 0x6624,</div><div class='add'>+		0xcc51, 0x410b,</div><div class='add'>+		0xcc52, 0x56b3,</div><div class='add'>+		0xcc53, 0x3c4,</div><div class='add'>+		0xcc54, 0x2fb2,</div><div class='add'>+		0xcc55, 0x3002,</div><div class='add'>+		0xcc56, 0x1002,</div><div class='add'>+		0xcc57, 0x220b,</div><div class='add'>+		0xcc58, 0x303b,</div><div class='add'>+		0xcc59, 0x56b3,</div><div class='add'>+		0xcc5a, 0x3c3,</div><div class='add'>+		0xcc5b, 0x866b,</div><div class='add'>+		0xcc5c, 0x400c,</div><div class='add'>+		0xcc5d, 0x23a2,</div><div class='add'>+		0xcc5e, 0x3012,</div><div class='add'>+		0xcc5f, 0x1002,</div><div class='add'>+		0xcc60, 0x2da2,</div><div class='add'>+		0xcc61, 0x3012,</div><div class='add'>+		0xcc62, 0x1002,</div><div class='add'>+		0xcc63, 0x2ca2,</div><div class='add'>+		0xcc64, 0x3012,</div><div class='add'>+		0xcc65, 0x1002,</div><div class='add'>+		0xcc66, 0x2fb4,</div><div class='add'>+		0xcc67, 0x3cd4,</div><div class='add'>+		0xcc68, 0x6624,</div><div class='add'>+		0xcc69, 0x56b3,</div><div class='add'>+		0xcc6a, 0x3c3,</div><div class='add'>+		0xcc6b, 0x866b,</div><div class='add'>+		0xcc6c, 0x401c,</div><div class='add'>+		0xcc6d, 0x2205,</div><div class='add'>+		0xcc6e, 0x3035,</div><div class='add'>+		0xcc6f, 0x5b53,</div><div class='add'>+		0xcc70, 0x2c52,</div><div class='add'>+		0xcc71, 0x3002,</div><div class='add'>+		0xcc72, 0x13c2,</div><div class='add'>+		0xcc73, 0x5cc3,</div><div class='add'>+		0xcc74, 0x317,</div><div class='add'>+		0xcc75, 0x2522,</div><div class='add'>+		0xcc76, 0x3012,</div><div class='add'>+		0xcc77, 0x1002,</div><div class='add'>+		0xcc78, 0x2da2,</div><div class='add'>+		0xcc79, 0x3012,</div><div class='add'>+		0xcc7a, 0x1002,</div><div class='add'>+		0xcc7b, 0x2b82,</div><div class='add'>+		0xcc7c, 0x3012,</div><div class='add'>+		0xcc7d, 0x1002,</div><div class='add'>+		0xcc7e, 0x5663,</div><div class='add'>+		0xcc7f, 0x303,</div><div class='add'>+		0xcc80, 0x401e,</div><div class='add'>+		0xcc81, 0x004,</div><div class='add'>+		0xcc82, 0x2c42,</div><div class='add'>+		0xcc83, 0x3012,</div><div class='add'>+		0xcc84, 0x1002,</div><div class='add'>+		0xcc85, 0x6f72,</div><div class='add'>+		0xcc86, 0x1002,</div><div class='add'>+		0xcc87, 0x628f,</div><div class='add'>+		0xcc88, 0x2304,</div><div class='add'>+		0xcc89, 0x3c84,</div><div class='add'>+		0xcc8a, 0x6436,</div><div class='add'>+		0xcc8b, 0xdff4,</div><div class='add'>+		0xcc8c, 0x6436,</div><div class='add'>+		0xcc8d, 0x2ff5,</div><div class='add'>+		0xcc8e, 0x3005,</div><div class='add'>+		0xcc8f, 0x8656,</div><div class='add'>+		0xcc90, 0xdfba,</div><div class='add'>+		0xcc91, 0x56a3,</div><div class='add'>+		0xcc92, 0xd05a,</div><div class='add'>+		0xcc93, 0x21c2,</div><div class='add'>+		0xcc94, 0x3012,</div><div class='add'>+		0xcc95, 0x1392,</div><div class='add'>+		0xcc96, 0xd05a,</div><div class='add'>+		0xcc97, 0x56a3,</div><div class='add'>+		0xcc98, 0xdfba,</div><div class='add'>+		0xcc99, 0x383,</div><div class='add'>+		0xcc9a, 0x6f72,</div><div class='add'>+		0xcc9b, 0x1002,</div><div class='add'>+		0xcc9c, 0x28c5,</div><div class='add'>+		0xcc9d, 0x3005,</div><div class='add'>+		0xcc9e, 0x4178,</div><div class='add'>+		0xcc9f, 0x5653,</div><div class='add'>+		0xcca0, 0x384,</div><div class='add'>+		0xcca1, 0x22b2,</div><div class='add'>+		0xcca2, 0x3012,</div><div class='add'>+		0xcca3, 0x1002,</div><div class='add'>+		0xcca4, 0x2be5,</div><div class='add'>+		0xcca5, 0x3005,</div><div class='add'>+		0xcca6, 0x41e8,</div><div class='add'>+		0xcca7, 0x5653,</div><div class='add'>+		0xcca8, 0x382,</div><div class='add'>+		0xcca9, 0x002,</div><div class='add'>+		0xccaa, 0x4258,</div><div class='add'>+		0xccab, 0x2474,</div><div class='add'>+		0xccac, 0x3c84,</div><div class='add'>+		0xccad, 0x6437,</div><div class='add'>+		0xccae, 0xdff4,</div><div class='add'>+		0xccaf, 0x6437,</div><div class='add'>+		0xccb0, 0x2ff5,</div><div class='add'>+		0xccb1, 0x3c05,</div><div class='add'>+		0xccb2, 0x8757,</div><div class='add'>+		0xccb3, 0xb888,</div><div class='add'>+		0xccb4, 0x9787,</div><div class='add'>+		0xccb5, 0xdff4,</div><div class='add'>+		0xccb6, 0x6724,</div><div class='add'>+		0xccb7, 0x866a,</div><div class='add'>+		0xccb8, 0x6f72,</div><div class='add'>+		0xccb9, 0x1002,</div><div class='add'>+		0xccba, 0x2d01,</div><div class='add'>+		0xccbb, 0x3011,</div><div class='add'>+		0xccbc, 0x1001,</div><div class='add'>+		0xccbd, 0xc620,</div><div class='add'>+		0xccbe, 0x14e5,</div><div class='add'>+		0xccbf, 0xc621,</div><div class='add'>+		0xccc0, 0xc53d,</div><div class='add'>+		0xccc1, 0xc622,</div><div class='add'>+		0xccc2, 0x3cbe,</div><div class='add'>+		0xccc3, 0xc623,</div><div class='add'>+		0xccc4, 0x4452,</div><div class='add'>+		0xccc5, 0xc624,</div><div class='add'>+		0xccc6, 0xc5c5,</div><div class='add'>+		0xccc7, 0xc625,</div><div class='add'>+		0xccc8, 0xe01e,</div><div class='add'>+		0xccc9, 0xc627,</div><div class='add'>+		0xccca, 0x000,</div><div class='add'>+		0xcccb, 0xc628,</div><div class='add'>+		0xcccc, 0x000,</div><div class='add'>+		0xcccd, 0xc62b,</div><div class='add'>+		0xccce, 0x000,</div><div class='add'>+		0xcccf, 0xc62c,</div><div class='add'>+		0xccd0, 0x000,</div><div class='add'>+		0xccd1, 0x000,</div><div class='add'>+		0xccd2, 0x2d01,</div><div class='add'>+		0xccd3, 0x3011,</div><div class='add'>+		0xccd4, 0x1001,</div><div class='add'>+		0xccd5, 0xc620,</div><div class='add'>+		0xccd6, 0x000,</div><div class='add'>+		0xccd7, 0xc621,</div><div class='add'>+		0xccd8, 0x000,</div><div class='add'>+		0xccd9, 0xc622,</div><div class='add'>+		0xccda, 0x0ce,</div><div class='add'>+		0xccdb, 0xc623,</div><div class='add'>+		0xccdc, 0x07f,</div><div class='add'>+		0xccdd, 0xc624,</div><div class='add'>+		0xccde, 0x032,</div><div class='add'>+		0xccdf, 0xc625,</div><div class='add'>+		0xcce0, 0x000,</div><div class='add'>+		0xcce1, 0xc627,</div><div class='add'>+		0xcce2, 0x000,</div><div class='add'>+		0xcce3, 0xc628,</div><div class='add'>+		0xcce4, 0x000,</div><div class='add'>+		0xcce5, 0xc62b,</div><div class='add'>+		0xcce6, 0x000,</div><div class='add'>+		0xcce7, 0xc62c,</div><div class='add'>+		0xcce8, 0x000,</div><div class='add'>+		0xcce9, 0x000,</div><div class='add'>+		0xccea, 0x2d01,</div><div class='add'>+		0xcceb, 0x3011,</div><div class='add'>+		0xccec, 0x1001,</div><div class='add'>+		0xcced, 0xc502,</div><div class='add'>+		0xccee, 0x609f,</div><div class='add'>+		0xccef, 0xc600,</div><div class='add'>+		0xccf0, 0x2a6e,</div><div class='add'>+		0xccf1, 0xc601,</div><div class='add'>+		0xccf2, 0x2a2c,</div><div class='add'>+		0xccf3, 0xc60c,</div><div class='add'>+		0xccf4, 0x5400,</div><div class='add'>+		0xccf5, 0xc710,</div><div class='add'>+		0xccf6, 0x700,</div><div class='add'>+		0xccf7, 0xc718,</div><div class='add'>+		0xccf8, 0x700,</div><div class='add'>+		0xccf9, 0xc720,</div><div class='add'>+		0xccfa, 0x4700,</div><div class='add'>+		0xccfb, 0xc728,</div><div class='add'>+		0xccfc, 0x700,</div><div class='add'>+		0xccfd, 0xc729,</div><div class='add'>+		0xccfe, 0x1207,</div><div class='add'>+		0xccff, 0xc801,</div><div class='add'>+		0xcd00, 0x7f50,</div><div class='add'>+		0xcd01, 0xc802,</div><div class='add'>+		0xcd02, 0x7760,</div><div class='add'>+		0xcd03, 0xc803,</div><div class='add'>+		0xcd04, 0x7fce,</div><div class='add'>+		0xcd05, 0xc804,</div><div class='add'>+		0xcd06, 0x520e,</div><div class='add'>+		0xcd07, 0xc805,</div><div class='add'>+		0xcd08, 0x5c11,</div><div class='add'>+		0xcd09, 0xc806,</div><div class='add'>+		0xcd0a, 0x3c51,</div><div class='add'>+		0xcd0b, 0xc807,</div><div class='add'>+		0xcd0c, 0x4061,</div><div class='add'>+		0xcd0d, 0xc808,</div><div class='add'>+		0xcd0e, 0x49c1,</div><div class='add'>+		0xcd0f, 0xc809,</div><div class='add'>+		0xcd10, 0x3840,</div><div class='add'>+		0xcd11, 0xc80a,</div><div class='add'>+		0xcd12, 0x000,</div><div class='add'>+		0xcd13, 0xc821,</div><div class='add'>+		0xcd14, 0x002,</div><div class='add'>+		0xcd15, 0xc822,</div><div class='add'>+		0xcd16, 0x046,</div><div class='add'>+		0xcd17, 0xc844,</div><div class='add'>+		0xcd18, 0x182f,</div><div class='add'>+		0xcd19, 0xc013,</div><div class='add'>+		0xcd1a, 0xf341,</div><div class='add'>+		0xcd1b, 0xc01a,</div><div class='add'>+		0xcd1c, 0x446,</div><div class='add'>+		0xcd1d, 0xc024,</div><div class='add'>+		0xcd1e, 0x1000,</div><div class='add'>+		0xcd1f, 0xc025,</div><div class='add'>+		0xcd20, 0xa00,</div><div class='add'>+		0xcd21, 0xc026,</div><div class='add'>+		0xcd22, 0xc0c,</div><div class='add'>+		0xcd23, 0xc027,</div><div class='add'>+		0xcd24, 0xc0c,</div><div class='add'>+		0xcd25, 0xc029,</div><div class='add'>+		0xcd26, 0x0a0,</div><div class='add'>+		0xcd27, 0xc030,</div><div class='add'>+		0xcd28, 0xa00,</div><div class='add'>+		0xcd29, 0xc03c,</div><div class='add'>+		0xcd2a, 0x01c,</div><div class='add'>+		0xcd2b, 0x000,</div><div class='add'>+		0xcd2c, 0x2b84,</div><div class='add'>+		0xcd2d, 0x3c74,</div><div class='add'>+		0xcd2e, 0x6435,</div><div class='add'>+		0xcd2f, 0xdff4,</div><div class='add'>+		0xcd30, 0x6435,</div><div class='add'>+		0xcd31, 0x2806,</div><div class='add'>+		0xcd32, 0x3006,</div><div class='add'>+		0xcd33, 0x8565,</div><div class='add'>+		0xcd34, 0x2b24,</div><div class='add'>+		0xcd35, 0x3c24,</div><div class='add'>+		0xcd36, 0x6436,</div><div class='add'>+		0xcd37, 0x1002,</div><div class='add'>+		0xcd38, 0x2b24,</div><div class='add'>+		0xcd39, 0x3c24,</div><div class='add'>+		0xcd3a, 0x6436,</div><div class='add'>+		0xcd3b, 0x4045,</div><div class='add'>+		0xcd3c, 0x8656,</div><div class='add'>+		0xcd3d, 0x1002,</div><div class='add'>+		0xcd3e, 0x2807,</div><div class='add'>+		0xcd3f, 0x31a7,</div><div class='add'>+		0xcd40, 0x20c4,</div><div class='add'>+		0xcd41, 0x3c24,</div><div class='add'>+		0xcd42, 0x6724,</div><div class='add'>+		0xcd43, 0x1002,</div><div class='add'>+		0xcd44, 0x2807,</div><div class='add'>+		0xcd45, 0x3187,</div><div class='add'>+		0xcd46, 0x20c4,</div><div class='add'>+		0xcd47, 0x3c24,</div><div class='add'>+		0xcd48, 0x6724,</div><div class='add'>+		0xcd49, 0x1002,</div><div class='add'>+		0xcd4a, 0x2514,</div><div class='add'>+		0xcd4b, 0x3c64,</div><div class='add'>+		0xcd4c, 0x6436,</div><div class='add'>+		0xcd4d, 0xdff4,</div><div class='add'>+		0xcd4e, 0x6436,</div><div class='add'>+		0xcd4f, 0x1002,</div><div class='add'>+		0xcd50, 0x2806,</div><div class='add'>+		0xcd51, 0x3cb6,</div><div class='add'>+		0xcd52, 0xc161,</div><div class='add'>+		0xcd53, 0x6134,</div><div class='add'>+		0xcd54, 0x6135,</div><div class='add'>+		0xcd55, 0x5443,</div><div class='add'>+		0xcd56, 0x303,</div><div class='add'>+		0xcd57, 0x6524,</div><div class='add'>+		0xcd58, 0x00b,</div><div class='add'>+		0xcd59, 0x1002,</div><div class='add'>+		0xcd5a, 0xd019,</div><div class='add'>+		0xcd5b, 0x2104,</div><div class='add'>+		0xcd5c, 0x3c24,</div><div class='add'>+		0xcd5d, 0x2105,</div><div class='add'>+		0xcd5e, 0x3805,</div><div class='add'>+		0xcd5f, 0x6524,</div><div class='add'>+		0xcd60, 0xdff4,</div><div class='add'>+		0xcd61, 0x4005,</div><div class='add'>+		0xcd62, 0x6524,</div><div class='add'>+		0xcd63, 0x2e8d,</div><div class='add'>+		0xcd64, 0x303d,</div><div class='add'>+		0xcd65, 0x5dd3,</div><div class='add'>+		0xcd66, 0x306,</div><div class='add'>+		0xcd67, 0x2ff7,</div><div class='add'>+		0xcd68, 0x38f7,</div><div class='add'>+		0xcd69, 0x60b7,</div><div class='add'>+		0xcd6a, 0xdffd,</div><div class='add'>+		0xcd6b, 0x00a,</div><div class='add'>+		0xcd6c, 0x1002,</div><div class='add'>+		0xcd6d, 0</div><div class='add'>+	};</div><div class='add'>+	int i, err;</div><div class='ctx'> </div><div class='add'>+	err = set_phy_regs(phy, regs);</div><div class='add'>+	if (!err &amp;&amp; modtype == phy_modtype_twinax_long)</div><div class='add'>+		err = set_phy_regs(phy, preemphasis);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='del'>-	return (status &amp; 1) ? cphy_cause_link_change : 0;</div><div class='add'>+</div><div class='add'>+	msleep(50);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(twinax_edc) &amp;&amp; !err; i += 2)</div><div class='add'>+		err = mdio_write(phy, MDIO_DEV_PMA_PMD, twinax_edc[i],</div><div class='add'>+				 twinax_edc[i + 1]);</div><div class='add'>+	if (!err)</div><div class='add'>+		phy-&gt;priv = edc_twinax;</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ael1006_power_down(struct cphy *phy, int enable)</div><div class='add'>+static int ael2005_i2c_rd(struct cphy *phy, int dev_addr, int word_addr)</div><div class='ctx'> {</div><div class='del'>-	return t3_mdio_change_bits(phy, MDIO_DEV_PMA_PMD, MII_BMCR,</div><div class='del'>-				   BMCR_PDOWN, enable ? BMCR_PDOWN : 0);</div><div class='add'>+	int i, err;</div><div class='add'>+	unsigned int stat, data;</div><div class='add'>+</div><div class='add'>+	err = mdio_write(phy, MDIO_DEV_PMA_PMD, AEL_I2C_CTRL,</div><div class='add'>+			 (dev_addr &lt;&lt; 8) | (1 &lt;&lt; 8) | word_addr);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 5; i++) {</div><div class='add'>+		msleep(1);</div><div class='add'>+		err = mdio_read(phy, MDIO_DEV_PMA_PMD, AEL_I2C_STAT, &amp;stat);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+		if ((stat &amp; 3) == 1) {</div><div class='add'>+			err = mdio_read(phy, MDIO_DEV_PMA_PMD, AEL_I2C_DATA,</div><div class='add'>+					&amp;data);</div><div class='add'>+			if (err)</div><div class='add'>+				return err;</div><div class='add'>+			return data &gt;&gt; 8;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	CH_WARN(phy-&gt;adapter, "PHY %u I2C read of addr %u timed out\n",</div><div class='add'>+		phy-&gt;addr, word_addr);</div><div class='add'>+	return -ETIMEDOUT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct cphy_ops ael1006_ops = {</div><div class='del'>-	.reset = ael1006_reset,</div><div class='del'>-	.intr_enable = ael1006_intr_enable,</div><div class='del'>-	.intr_disable = ael1006_intr_disable,</div><div class='del'>-	.intr_clear = ael1006_intr_clear,</div><div class='del'>-	.intr_handler = ael1006_intr_handler,</div><div class='del'>-	.get_link_status = ael100x_get_link_status,</div><div class='del'>-	.power_down = ael1006_power_down,</div><div class='add'>+static int get_module_type(struct cphy *phy, int delay_ms)</div><div class='add'>+{</div><div class='add'>+	int v;</div><div class='add'>+	unsigned int stat;</div><div class='add'>+</div><div class='add'>+	v = mdio_read(phy, MDIO_DEV_PMA_PMD, AEL2005_GPIO_CTRL, &amp;stat);</div><div class='add'>+	if (v)</div><div class='add'>+		return v;</div><div class='add'>+</div><div class='add'>+	if (stat &amp; (1 &lt;&lt; 8))			/* module absent */</div><div class='add'>+		return phy_modtype_none;</div><div class='add'>+</div><div class='add'>+	if (delay_ms)</div><div class='add'>+		msleep(delay_ms);</div><div class='add'>+</div><div class='add'>+	/* see SFF-8472 for below */</div><div class='add'>+	v = ael2005_i2c_rd(phy, MODULE_DEV_ADDR, 3);</div><div class='add'>+	if (v &lt; 0)</div><div class='add'>+		return v;</div><div class='add'>+</div><div class='add'>+	if (v == 0x10)</div><div class='add'>+		return phy_modtype_sr;</div><div class='add'>+	if (v == 0x20)</div><div class='add'>+		return phy_modtype_lr;</div><div class='add'>+	if (v == 0x40)</div><div class='add'>+		return phy_modtype_lrm;</div><div class='add'>+</div><div class='add'>+	v = ael2005_i2c_rd(phy, MODULE_DEV_ADDR, 6);</div><div class='add'>+	if (v &lt; 0)</div><div class='add'>+		return v;</div><div class='add'>+	if (v != 4)</div><div class='add'>+		goto unknown;</div><div class='add'>+</div><div class='add'>+	v = ael2005_i2c_rd(phy, MODULE_DEV_ADDR, 10);</div><div class='add'>+	if (v &lt; 0)</div><div class='add'>+		return v;</div><div class='add'>+</div><div class='add'>+	if (v &amp; 0x80) {</div><div class='add'>+		v = ael2005_i2c_rd(phy, MODULE_DEV_ADDR, 0x12);</div><div class='add'>+		if (v &lt; 0)</div><div class='add'>+			return v;</div><div class='add'>+		return v &gt; 10 ? phy_modtype_twinax_long : phy_modtype_twinax;</div><div class='add'>+	}</div><div class='add'>+unknown:</div><div class='add'>+	return phy_modtype_unknown;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ael2005_intr_enable(struct cphy *phy)</div><div class='add'>+{</div><div class='add'>+	int err = mdio_write(phy, MDIO_DEV_PMA_PMD, AEL2005_GPIO_CTRL, 0x200);</div><div class='add'>+	return err ? err : t3_phy_lasi_intr_enable(phy);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ael2005_intr_disable(struct cphy *phy)</div><div class='add'>+{</div><div class='add'>+	int err = mdio_write(phy, MDIO_DEV_PMA_PMD, AEL2005_GPIO_CTRL, 0x100);</div><div class='add'>+	return err ? err : t3_phy_lasi_intr_disable(phy);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ael2005_intr_clear(struct cphy *phy)</div><div class='add'>+{</div><div class='add'>+	int err = mdio_write(phy, MDIO_DEV_PMA_PMD, AEL2005_GPIO_CTRL, 0xd00);</div><div class='add'>+	return err ? err : t3_phy_lasi_intr_clear(phy);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ael2005_reset(struct cphy *phy, int wait)</div><div class='add'>+{</div><div class='add'>+	static struct reg_val regs0[] = {</div><div class='add'>+		{ MDIO_DEV_PMA_PMD, 0xc001, 0, 1 &lt;&lt; 5 },</div><div class='add'>+		{ MDIO_DEV_PMA_PMD, 0xc017, 0, 1 &lt;&lt; 5 },</div><div class='add'>+		{ MDIO_DEV_PMA_PMD, 0xc013, 0xffff, 0xf341 },</div><div class='add'>+		{ MDIO_DEV_PMA_PMD, 0xc210, 0xffff, 0x8000 },</div><div class='add'>+		{ MDIO_DEV_PMA_PMD, 0xc210, 0xffff, 0x8100 },</div><div class='add'>+		{ MDIO_DEV_PMA_PMD, 0xc210, 0xffff, 0x8000 },</div><div class='add'>+		{ MDIO_DEV_PMA_PMD, 0xc210, 0xffff, 0 },</div><div class='add'>+		{ 0, 0, 0, 0 }</div><div class='add'>+	};</div><div class='add'>+	static struct reg_val regs1[] = {</div><div class='add'>+		{ MDIO_DEV_PMA_PMD, 0xca00, 0xffff, 0x0080 },</div><div class='add'>+		{ MDIO_DEV_PMA_PMD, 0xca12, 0xffff, 0 },</div><div class='add'>+		{ 0, 0, 0, 0 }</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	int err, lasi_ctrl;</div><div class='add'>+</div><div class='add'>+	err = mdio_read(phy, MDIO_DEV_PMA_PMD, LASI_CTRL, &amp;lasi_ctrl);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = t3_phy_reset(phy, MDIO_DEV_PMA_PMD, 0);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	msleep(125);</div><div class='add'>+	phy-&gt;priv = edc_none;</div><div class='add'>+	err = set_phy_regs(phy, regs0);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	msleep(50);</div><div class='add'>+</div><div class='add'>+	err = get_module_type(phy, 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	phy-&gt;modtype = err;</div><div class='add'>+</div><div class='add'>+	if (err == phy_modtype_twinax || err == phy_modtype_twinax_long)</div><div class='add'>+		err = ael2005_setup_twinax_edc(phy, err);</div><div class='add'>+	else</div><div class='add'>+		err = ael2005_setup_sr_edc(phy);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = set_phy_regs(phy, regs1);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* reset wipes out interrupts, reenable them if they were on */</div><div class='add'>+	if (lasi_ctrl &amp; 1)</div><div class='add'>+		err = ael2005_intr_enable(phy);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ael2005_intr_handler(struct cphy *phy)</div><div class='add'>+{</div><div class='add'>+	unsigned int stat;</div><div class='add'>+	int ret, edc_needed, cause = 0;</div><div class='add'>+</div><div class='add'>+	ret = mdio_read(phy, MDIO_DEV_PMA_PMD, AEL2005_GPIO_STAT, &amp;stat);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (stat &amp; AEL2005_MODDET_IRQ) {</div><div class='add'>+		ret = mdio_write(phy, MDIO_DEV_PMA_PMD, AEL2005_GPIO_CTRL,</div><div class='add'>+				 0xd00);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		/* modules have max 300 ms init time after hot plug */</div><div class='add'>+		ret = get_module_type(phy, 300);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		phy-&gt;modtype = ret;</div><div class='add'>+		if (ret == phy_modtype_none)</div><div class='add'>+			edc_needed = phy-&gt;priv;       /* on unplug retain EDC */</div><div class='add'>+		else if (ret == phy_modtype_twinax ||</div><div class='add'>+			 ret == phy_modtype_twinax_long)</div><div class='add'>+			edc_needed = edc_twinax;</div><div class='add'>+		else</div><div class='add'>+			edc_needed = edc_sr;</div><div class='add'>+</div><div class='add'>+		if (edc_needed != phy-&gt;priv) {</div><div class='add'>+			ret = ael2005_reset(phy, 0);</div><div class='add'>+			return ret ? ret : cphy_cause_module_change;</div><div class='add'>+		}</div><div class='add'>+		cause = cphy_cause_module_change;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = t3_phy_lasi_intr_handler(phy);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret |= cause;</div><div class='add'>+	return ret ? ret : cphy_cause_link_change;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct cphy_ops ael2005_ops = {</div><div class='add'>+	.reset           = ael2005_reset,</div><div class='add'>+	.intr_enable     = ael2005_intr_enable,</div><div class='add'>+	.intr_disable    = ael2005_intr_disable,</div><div class='add'>+	.intr_clear      = ael2005_intr_clear,</div><div class='add'>+	.intr_handler    = ael2005_intr_handler,</div><div class='add'>+	.get_link_status = get_link_status_r,</div><div class='add'>+	.power_down      = ael1002_power_down,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-void t3_ael1006_phy_prep(struct cphy *phy, struct adapter *adapter,</div><div class='del'>-			 int phy_addr, const struct mdio_ops *mdio_ops)</div><div class='add'>+int t3_ael2005_phy_prep(struct cphy *phy, struct adapter *adapter,</div><div class='add'>+			int phy_addr, const struct mdio_ops *mdio_ops)</div><div class='ctx'> {</div><div class='del'>-	cphy_init(phy, adapter, phy_addr, &amp;ael1006_ops, mdio_ops);</div><div class='del'>-	ael100x_txon(phy);</div><div class='add'>+	cphy_init(phy, adapter, phy_addr, &amp;ael2005_ops, mdio_ops,</div><div class='add'>+		  SUPPORTED_10000baseT_Full | SUPPORTED_AUI | SUPPORTED_FIBRE |</div><div class='add'>+		  SUPPORTED_IRQ, "10GBASE-R");</div><div class='add'>+	msleep(125);</div><div class='add'>+	return t3_mdio_change_bits(phy, MDIO_DEV_PMA_PMD, AEL_OPT_SETTINGS, 0,</div><div class='add'>+				   1 &lt;&lt; 5);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Get link status for a 10GBASE-X device.</div><div class='add'>+ */</div><div class='add'>+static int get_link_status_x(struct cphy *phy, int *link_ok, int *speed,</div><div class='add'>+			     int *duplex, int *fc)</div><div class='add'>+{</div><div class='add'>+	if (link_ok) {</div><div class='add'>+		unsigned int stat0, stat1, stat2;</div><div class='add'>+		int err = mdio_read(phy, MDIO_DEV_PMA_PMD, PMD_RSD, &amp;stat0);</div><div class='add'>+</div><div class='add'>+		if (!err)</div><div class='add'>+			err = mdio_read(phy, MDIO_DEV_PCS, PCS_STAT1_X, &amp;stat1);</div><div class='add'>+		if (!err)</div><div class='add'>+			err = mdio_read(phy, MDIO_DEV_XGXS, XS_LN_STAT, &amp;stat2);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+		*link_ok = (stat0 &amp; (stat1 &gt;&gt; 12) &amp; (stat2 &gt;&gt; 12)) &amp; 1;</div><div class='add'>+	}</div><div class='add'>+	if (speed)</div><div class='add'>+		*speed = SPEED_10000;</div><div class='add'>+	if (duplex)</div><div class='add'>+		*duplex = DUPLEX_FULL;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct cphy_ops qt2045_ops = {</div><div class='ctx'> 	.reset = ael1006_reset,</div><div class='del'>-	.intr_enable = ael1006_intr_enable,</div><div class='del'>-	.intr_disable = ael1006_intr_disable,</div><div class='del'>-	.intr_clear = ael1006_intr_clear,</div><div class='del'>-	.intr_handler = ael1006_intr_handler,</div><div class='del'>-	.get_link_status = ael100x_get_link_status,</div><div class='add'>+	.intr_enable = t3_phy_lasi_intr_enable,</div><div class='add'>+	.intr_disable = t3_phy_lasi_intr_disable,</div><div class='add'>+	.intr_clear = t3_phy_lasi_intr_clear,</div><div class='add'>+	.intr_handler = t3_phy_lasi_intr_handler,</div><div class='add'>+	.get_link_status = get_link_status_x,</div><div class='ctx'> 	.power_down = ael1006_power_down,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-void t3_qt2045_phy_prep(struct cphy *phy, struct adapter *adapter,</div><div class='del'>-			int phy_addr, const struct mdio_ops *mdio_ops)</div><div class='add'>+int t3_qt2045_phy_prep(struct cphy *phy, struct adapter *adapter,</div><div class='add'>+		       int phy_addr, const struct mdio_ops *mdio_ops)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int stat;</div><div class='ctx'> </div><div class='del'>-	cphy_init(phy, adapter, phy_addr, &amp;qt2045_ops, mdio_ops);</div><div class='add'>+	cphy_init(phy, adapter, phy_addr, &amp;qt2045_ops, mdio_ops,</div><div class='add'>+		  SUPPORTED_10000baseT_Full | SUPPORTED_AUI | SUPPORTED_TP,</div><div class='add'>+		  "10GBASE-CX4");</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Some cards where the PHY is supposed to be at address 0 actually</div><div class='hunk'>@@ -205,6 +1161,7 @@ void t3_qt2045_phy_prep(struct cphy *phy, struct adapter *adapter,</div><div class='ctx'> 	if (!phy_addr &amp;&amp; !mdio_read(phy, MDIO_DEV_PMA_PMD, MII_BMSR, &amp;stat) &amp;&amp;</div><div class='ctx'> 	    stat == 0xffff)</div><div class='ctx'> 		phy-&gt;addr = 1;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int xaui_direct_reset(struct cphy *phy, int wait)</div><div class='hunk'>@@ -250,8 +1207,11 @@ static struct cphy_ops xaui_direct_ops = {</div><div class='ctx'> 	.power_down = xaui_direct_power_down,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-void t3_xaui_direct_phy_prep(struct cphy *phy, struct adapter *adapter,</div><div class='del'>-			     int phy_addr, const struct mdio_ops *mdio_ops)</div><div class='add'>+int t3_xaui_direct_phy_prep(struct cphy *phy, struct adapter *adapter,</div><div class='add'>+			    int phy_addr, const struct mdio_ops *mdio_ops)</div><div class='ctx'> {</div><div class='del'>-	cphy_init(phy, adapter, phy_addr, &amp;xaui_direct_ops, mdio_ops);</div><div class='add'>+	cphy_init(phy, adapter, phy_addr, &amp;xaui_direct_ops, mdio_ops,</div><div class='add'>+		  SUPPORTED_10000baseT_Full | SUPPORTED_AUI | SUPPORTED_TP,</div><div class='add'>+		  "10GBASE-CX4");</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/cxgb3/common.h b/drivers/net/cxgb3/common.h<br/>index 9ecf8a6dc97f..e312d315a42d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/cxgb3/common.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/cxgb3/common.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/cxgb3/common.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/cxgb3/common.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * Copyright (c) 2005-2007 Chelsio, Inc. All rights reserved.</div><div class='add'>+ * Copyright (c) 2005-2008 Chelsio, Inc. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * This software is available to you under a choice of one of two</div><div class='ctx'>  * licenses.  You may choose to be licensed under the terms of the GNU</div><div class='hunk'>@@ -193,22 +193,13 @@ struct mdio_ops {</div><div class='ctx'> struct adapter_info {</div><div class='ctx'> 	unsigned char nports;	/* # of ports */</div><div class='ctx'> 	unsigned char phy_base_addr;	/* MDIO PHY base address */</div><div class='del'>-	unsigned char mdien;</div><div class='del'>-	unsigned char mdiinv;</div><div class='ctx'> 	unsigned int gpio_out;	/* GPIO output settings */</div><div class='del'>-	unsigned int gpio_intr;	/* GPIO IRQ enable mask */</div><div class='add'>+	unsigned char gpio_intr[MAX_NPORTS]; /* GPIO PHY IRQ pins */</div><div class='ctx'> 	unsigned long caps;	/* adapter capabilities */</div><div class='ctx'> 	const struct mdio_ops *mdio_ops;	/* MDIO operations */</div><div class='ctx'> 	const char *desc;	/* product description */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct port_type_info {</div><div class='del'>-	void (*phy_prep)(struct cphy *phy, struct adapter *adapter,</div><div class='del'>-			 int phy_addr, const struct mdio_ops *ops);</div><div class='del'>-	unsigned int caps;</div><div class='del'>-	const char *desc;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> struct mc5_stats {</div><div class='ctx'> 	unsigned long parity_err;</div><div class='ctx'> 	unsigned long active_rgn_full;</div><div class='hunk'>@@ -358,6 +349,7 @@ struct qset_params {		/* SGE queue set parameters */</div><div class='ctx'> 	unsigned int jumbo_size;	/* # of entries in jumbo free list */</div><div class='ctx'> 	unsigned int txq_size[SGE_TXQ_PER_SET];	/* Tx queue sizes */</div><div class='ctx'> 	unsigned int cong_thres;	/* FL congestion threshold */</div><div class='add'>+	unsigned int vector;		/* Interrupt (line or vector) number */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct sge_params {</div><div class='hunk'>@@ -525,12 +517,25 @@ enum {</div><div class='ctx'> 	MAC_RXFIFO_SIZE = 32768</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* IEEE 802.3ae specified MDIO devices */</div><div class='add'>+/* IEEE 802.3 specified MDIO devices */</div><div class='ctx'> enum {</div><div class='ctx'> 	MDIO_DEV_PMA_PMD = 1,</div><div class='ctx'> 	MDIO_DEV_WIS = 2,</div><div class='ctx'> 	MDIO_DEV_PCS = 3,</div><div class='del'>-	MDIO_DEV_XGXS = 4</div><div class='add'>+	MDIO_DEV_XGXS = 4,</div><div class='add'>+	MDIO_DEV_ANEG = 7,</div><div class='add'>+	MDIO_DEV_VEND1 = 30,</div><div class='add'>+	MDIO_DEV_VEND2 = 31</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* LASI control and status registers */</div><div class='add'>+enum {</div><div class='add'>+	RX_ALARM_CTRL = 0x9000,</div><div class='add'>+	TX_ALARM_CTRL = 0x9001,</div><div class='add'>+	LASI_CTRL = 0x9002,</div><div class='add'>+	RX_ALARM_STAT = 0x9003,</div><div class='add'>+	TX_ALARM_STAT = 0x9004,</div><div class='add'>+	LASI_STAT = 0x9005</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* PHY loopback direction */</div><div class='hunk'>@@ -542,12 +547,23 @@ enum {</div><div class='ctx'> /* PHY interrupt types */</div><div class='ctx'> enum {</div><div class='ctx'> 	cphy_cause_link_change = 1,</div><div class='del'>-	cphy_cause_fifo_error = 2</div><div class='add'>+	cphy_cause_fifo_error = 2,</div><div class='add'>+	cphy_cause_module_change = 4,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* PHY module types */</div><div class='add'>+enum {</div><div class='add'>+	phy_modtype_none,</div><div class='add'>+	phy_modtype_sr,</div><div class='add'>+	phy_modtype_lr,</div><div class='add'>+	phy_modtype_lrm,</div><div class='add'>+	phy_modtype_twinax,</div><div class='add'>+	phy_modtype_twinax_long,</div><div class='add'>+	phy_modtype_unknown</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* PHY operations */</div><div class='ctx'> struct cphy_ops {</div><div class='del'>-	void (*destroy)(struct cphy *phy);</div><div class='ctx'> 	int (*reset)(struct cphy *phy, int wait);</div><div class='ctx'> </div><div class='ctx'> 	int (*intr_enable)(struct cphy *phy);</div><div class='hunk'>@@ -568,8 +584,12 @@ struct cphy_ops {</div><div class='ctx'> </div><div class='ctx'> /* A PHY instance */</div><div class='ctx'> struct cphy {</div><div class='del'>-	int addr;		/* PHY address */</div><div class='add'>+	u8 addr;			/* PHY address */</div><div class='add'>+	u8 modtype;			/* PHY module type */</div><div class='add'>+	short priv;			/* scratch pad */</div><div class='add'>+	unsigned int caps;		/* PHY capabilities */</div><div class='ctx'> 	struct adapter *adapter;	/* associated adapter */</div><div class='add'>+	const char *desc;		/* PHY description */</div><div class='ctx'> 	unsigned long fifo_errors;	/* FIFO over/under-flows */</div><div class='ctx'> 	const struct cphy_ops *ops;	/* PHY operations */</div><div class='ctx'> 	int (*mdio_read)(struct adapter *adapter, int phy_addr, int mmd_addr,</div><div class='hunk'>@@ -594,10 +614,13 @@ static inline int mdio_write(struct cphy *phy, int mmd, int reg,</div><div class='ctx'> /* Convenience initializer */</div><div class='ctx'> static inline void cphy_init(struct cphy *phy, struct adapter *adapter,</div><div class='ctx'> 			     int phy_addr, struct cphy_ops *phy_ops,</div><div class='del'>-			     const struct mdio_ops *mdio_ops)</div><div class='add'>+			     const struct mdio_ops *mdio_ops,</div><div class='add'>+			      unsigned int caps, const char *desc)</div><div class='ctx'> {</div><div class='del'>-	phy-&gt;adapter = adapter;</div><div class='ctx'> 	phy-&gt;addr = phy_addr;</div><div class='add'>+	phy-&gt;caps = caps;</div><div class='add'>+	phy-&gt;adapter = adapter;</div><div class='add'>+	phy-&gt;desc = desc;</div><div class='ctx'> 	phy-&gt;ops = phy_ops;</div><div class='ctx'> 	if (mdio_ops) {</div><div class='ctx'> 		phy-&gt;mdio_read = mdio_ops-&gt;read;</div><div class='hunk'>@@ -668,7 +691,12 @@ int t3_mdio_change_bits(struct cphy *phy, int mmd, int reg, unsigned int clear,</div><div class='ctx'> 			unsigned int set);</div><div class='ctx'> int t3_phy_reset(struct cphy *phy, int mmd, int wait);</div><div class='ctx'> int t3_phy_advertise(struct cphy *phy, unsigned int advert);</div><div class='add'>+int t3_phy_advertise_fiber(struct cphy *phy, unsigned int advert);</div><div class='ctx'> int t3_set_phy_speed_duplex(struct cphy *phy, int speed, int duplex);</div><div class='add'>+int t3_phy_lasi_intr_enable(struct cphy *phy);</div><div class='add'>+int t3_phy_lasi_intr_disable(struct cphy *phy);</div><div class='add'>+int t3_phy_lasi_intr_clear(struct cphy *phy);</div><div class='add'>+int t3_phy_lasi_intr_handler(struct cphy *phy);</div><div class='ctx'> </div><div class='ctx'> void t3_intr_enable(struct adapter *adapter);</div><div class='ctx'> void t3_intr_disable(struct adapter *adapter);</div><div class='hunk'>@@ -698,6 +726,7 @@ int t3_check_fw_version(struct adapter *adapter, int *must_load);</div><div class='ctx'> int t3_init_hw(struct adapter *adapter, u32 fw_params);</div><div class='ctx'> void mac_prep(struct cmac *mac, struct adapter *adapter, int index);</div><div class='ctx'> void early_hw_init(struct adapter *adapter, const struct adapter_info *ai);</div><div class='add'>+int t3_reset_adapter(struct adapter *adapter);</div><div class='ctx'> int t3_prep_adapter(struct adapter *adapter, const struct adapter_info *ai,</div><div class='ctx'> 		    int reset);</div><div class='ctx'> int t3_replay_prep_adapter(struct adapter *adapter);</div><div class='hunk'>@@ -774,14 +803,16 @@ int t3_sge_read_rspq(struct adapter *adapter, unsigned int id, u32 data[4]);</div><div class='ctx'> int t3_sge_cqcntxt_op(struct adapter *adapter, unsigned int id, unsigned int op,</div><div class='ctx'> 		      unsigned int credits);</div><div class='ctx'> </div><div class='del'>-void t3_vsc8211_phy_prep(struct cphy *phy, struct adapter *adapter,</div><div class='del'>-			 int phy_addr, const struct mdio_ops *mdio_ops);</div><div class='del'>-void t3_ael1002_phy_prep(struct cphy *phy, struct adapter *adapter,</div><div class='del'>-			 int phy_addr, const struct mdio_ops *mdio_ops);</div><div class='del'>-void t3_ael1006_phy_prep(struct cphy *phy, struct adapter *adapter,</div><div class='del'>-			 int phy_addr, const struct mdio_ops *mdio_ops);</div><div class='del'>-void t3_qt2045_phy_prep(struct cphy *phy, struct adapter *adapter, int phy_addr,</div><div class='del'>-			const struct mdio_ops *mdio_ops);</div><div class='del'>-void t3_xaui_direct_phy_prep(struct cphy *phy, struct adapter *adapter,</div><div class='del'>-			     int phy_addr, const struct mdio_ops *mdio_ops);</div><div class='add'>+int t3_vsc8211_phy_prep(struct cphy *phy, struct adapter *adapter,</div><div class='add'>+			int phy_addr, const struct mdio_ops *mdio_ops);</div><div class='add'>+int t3_ael1002_phy_prep(struct cphy *phy, struct adapter *adapter,</div><div class='add'>+			int phy_addr, const struct mdio_ops *mdio_ops);</div><div class='add'>+int t3_ael1006_phy_prep(struct cphy *phy, struct adapter *adapter,</div><div class='add'>+			int phy_addr, const struct mdio_ops *mdio_ops);</div><div class='add'>+int t3_ael2005_phy_prep(struct cphy *phy, struct adapter *adapter,</div><div class='add'>+			int phy_addr, const struct mdio_ops *mdio_ops);</div><div class='add'>+int t3_qt2045_phy_prep(struct cphy *phy, struct adapter *adapter, int phy_addr,</div><div class='add'>+		       const struct mdio_ops *mdio_ops);</div><div class='add'>+int t3_xaui_direct_phy_prep(struct cphy *phy, struct adapter *adapter,</div><div class='add'>+			    int phy_addr, const struct mdio_ops *mdio_ops);</div><div class='ctx'> #endif				/* __CHELSIO_COMMON_H */</div><div class='head'>diff --git a/drivers/net/cxgb3/cxgb3_ctl_defs.h b/drivers/net/cxgb3/cxgb3_ctl_defs.h<br/>index 6ad92405d9a0..1d8d46eb3c96 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/cxgb3/cxgb3_ctl_defs.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/cxgb3/cxgb3_ctl_defs.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/cxgb3/cxgb3_ctl_defs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/cxgb3/cxgb3_ctl_defs.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * Copyright (c) 2003-2007 Chelsio, Inc. All rights reserved.</div><div class='add'>+ * Copyright (c) 2003-2008 Chelsio, Inc. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * This software is available to you under a choice of one of two</div><div class='ctx'>  * licenses.  You may choose to be licensed under the terms of the GNU</div><div class='head'>diff --git a/drivers/net/cxgb3/cxgb3_defs.h b/drivers/net/cxgb3/cxgb3_defs.h<br/>index 45e92164c260..47e53769af5b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/cxgb3/cxgb3_defs.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/cxgb3/cxgb3_defs.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/cxgb3/cxgb3_defs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/cxgb3/cxgb3_defs.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * Copyright (c) 2006-2007 Chelsio, Inc. All rights reserved.</div><div class='add'>+ * Copyright (c) 2006-2008 Chelsio, Inc. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * This software is available to you under a choice of one of two</div><div class='ctx'>  * licenses.  You may choose to be licensed under the terms of the GNU</div><div class='head'>diff --git a/drivers/net/cxgb3/cxgb3_ioctl.h b/drivers/net/cxgb3/cxgb3_ioctl.h<br/>index 68200a14065e..b19e4376ba76 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/cxgb3/cxgb3_ioctl.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/cxgb3/cxgb3_ioctl.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/cxgb3/cxgb3_ioctl.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/cxgb3/cxgb3_ioctl.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * Copyright (c) 2003-2007 Chelsio, Inc. All rights reserved.</div><div class='add'>+ * Copyright (c) 2003-2008 Chelsio, Inc. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * This software is available to you under a choice of one of two</div><div class='ctx'>  * licenses.  You may choose to be licensed under the terms of the GNU</div><div class='hunk'>@@ -92,6 +92,8 @@ struct ch_qset_params {</div><div class='ctx'> 	int32_t polling;</div><div class='ctx'> 	int32_t lro;</div><div class='ctx'> 	int32_t cong_thres;</div><div class='add'>+	int32_t  vector;</div><div class='add'>+	int32_t  qnum;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ch_pktsched_params {</div><div class='head'>diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c<br/>index 5447f3e60f07..1ace41a13ac3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/cxgb3/cxgb3_main.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/cxgb3/cxgb3_main.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/cxgb3/cxgb3_main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/cxgb3/cxgb3_main.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * Copyright (c) 2003-2007 Chelsio, Inc. All rights reserved.</div><div class='add'>+ * Copyright (c) 2003-2008 Chelsio, Inc. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * This software is available to you under a choice of one of two</div><div class='ctx'>  * licenses.  You may choose to be licensed under the terms of the GNU</div><div class='hunk'>@@ -208,6 +208,31 @@ void t3_os_link_changed(struct adapter *adapter, int port_id, int link_stat,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ *	t3_os_phymod_changed - handle PHY module changes</div><div class='add'>+ *	@phy: the PHY reporting the module change</div><div class='add'>+ *	@mod_type: new module type</div><div class='add'>+ *</div><div class='add'>+ *	This is the OS-dependent handler for PHY module changes.  It is</div><div class='add'>+ *	invoked when a PHY module is removed or inserted for any OS-specific</div><div class='add'>+ *	processing.</div><div class='add'>+ */</div><div class='add'>+void t3_os_phymod_changed(struct adapter *adap, int port_id)</div><div class='add'>+{</div><div class='add'>+	static const char *mod_str[] = {</div><div class='add'>+		NULL, "SR", "LR", "LRM", "TWINAX", "TWINAX", "unknown"</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	const struct net_device *dev = adap-&gt;port[port_id];</div><div class='add'>+	const struct port_info *pi = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	if (pi-&gt;phy.modtype == phy_modtype_none)</div><div class='add'>+		printk(KERN_INFO "%s: PHY module unplugged\n", dev-&gt;name);</div><div class='add'>+	else</div><div class='add'>+		printk(KERN_INFO "%s: %s PHY module inserted\n", dev-&gt;name,</div><div class='add'>+		       mod_str[pi-&gt;phy.modtype]);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void cxgb_set_rxmode(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct t3_rx_mode rm;</div><div class='hunk'>@@ -274,10 +299,10 @@ static void name_msix_vecs(struct adapter *adap)</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; i &lt; pi-&gt;nqsets; i++, msi_idx++) {</div><div class='ctx'> 			snprintf(adap-&gt;msix_info[msi_idx].desc, n,</div><div class='del'>-				 "%s (queue %d)", d-&gt;name, i);</div><div class='add'>+				 "%s-%d", d-&gt;name, pi-&gt;first_qset + i);</div><div class='ctx'> 			adap-&gt;msix_info[msi_idx].desc[n] = 0;</div><div class='ctx'> 		}</div><div class='del'>- 	}</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int request_msix_data_irqs(struct adapter *adap)</div><div class='hunk'>@@ -306,6 +331,22 @@ static int request_msix_data_irqs(struct adapter *adap)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void free_irq_resources(struct adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	if (adapter-&gt;flags &amp; USING_MSIX) {</div><div class='add'>+		int i, n = 0;</div><div class='add'>+</div><div class='add'>+		free_irq(adapter-&gt;msix_info[0].vec, adapter);</div><div class='add'>+		for_each_port(adapter, i)</div><div class='add'>+		    n += adap2pinfo(adapter, i)-&gt;nqsets;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; n; ++i)</div><div class='add'>+			free_irq(adapter-&gt;msix_info[i + 1].vec,</div><div class='add'>+				 &amp;adapter-&gt;sge.qs[i]);</div><div class='add'>+	} else</div><div class='add'>+		free_irq(adapter-&gt;pdev-&gt;irq, adapter);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int await_mgmt_replies(struct adapter *adap, unsigned long init_cnt,</div><div class='ctx'> 			      unsigned long n)</div><div class='ctx'> {</div><div class='hunk'>@@ -473,12 +514,16 @@ static int setup_sge_qsets(struct adapter *adap)</div><div class='ctx'> 		struct port_info *pi = netdev_priv(dev);</div><div class='ctx'> </div><div class='ctx'> 		pi-&gt;qs = &amp;adap-&gt;sge.qs[pi-&gt;first_qset];</div><div class='del'>-		for (j = 0; j &lt; pi-&gt;nqsets; ++j, ++qset_idx) {</div><div class='add'>+		for (j = pi-&gt;first_qset; j &lt; pi-&gt;first_qset + pi-&gt;nqsets;</div><div class='add'>+		     ++j, ++qset_idx) {</div><div class='add'>+			if (!pi-&gt;rx_csum_offload)</div><div class='add'>+				adap-&gt;params.sge.qset[qset_idx].lro = 0;</div><div class='ctx'> 			err = t3_sge_alloc_qset(adap, qset_idx, 1,</div><div class='ctx'> 				(adap-&gt;flags &amp; USING_MSIX) ? qset_idx + 1 :</div><div class='ctx'> 							     irq_idx,</div><div class='ctx'> 				&amp;adap-&gt;params.sge.qset[qset_idx], ntxq, dev);</div><div class='ctx'> 			if (err) {</div><div class='add'>+				t3_stop_sge_timers(adap);</div><div class='ctx'> 				t3_free_sge_resources(adap);</div><div class='ctx'> 				return err;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -739,11 +784,12 @@ static void init_port_mtus(struct adapter *adapter)</div><div class='ctx'> 	t3_write_reg(adapter, A_TP_MTU_PORT_TABLE, mtus);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void send_pktsched_cmd(struct adapter *adap, int sched, int qidx, int lo,</div><div class='add'>+static int send_pktsched_cmd(struct adapter *adap, int sched, int qidx, int lo,</div><div class='ctx'> 			      int hi, int port)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	struct mngt_pktsched_wr *req;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	skb = alloc_skb(sizeof(*req), GFP_KERNEL | __GFP_NOFAIL);</div><div class='ctx'> 	req = (struct mngt_pktsched_wr *)skb_put(skb, sizeof(*req));</div><div class='hunk'>@@ -754,20 +800,28 @@ static void send_pktsched_cmd(struct adapter *adap, int sched, int qidx, int lo,</div><div class='ctx'> 	req-&gt;min = lo;</div><div class='ctx'> 	req-&gt;max = hi;</div><div class='ctx'> 	req-&gt;binding = port;</div><div class='del'>-	t3_mgmt_tx(adap, skb);</div><div class='add'>+	ret = t3_mgmt_tx(adap, skb);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bind_qsets(struct adapter *adap)</div><div class='add'>+static int bind_qsets(struct adapter *adap)</div><div class='ctx'> {</div><div class='del'>-	int i, j;</div><div class='add'>+	int i, j, err = 0;</div><div class='ctx'> </div><div class='ctx'> 	for_each_port(adap, i) {</div><div class='ctx'> 		const struct port_info *pi = adap2pinfo(adap, i);</div><div class='ctx'> </div><div class='del'>-		for (j = 0; j &lt; pi-&gt;nqsets; ++j)</div><div class='del'>-			send_pktsched_cmd(adap, 1, pi-&gt;first_qset + j, -1,</div><div class='del'>-					  -1, i);</div><div class='add'>+		for (j = 0; j &lt; pi-&gt;nqsets; ++j) {</div><div class='add'>+			int ret = send_pktsched_cmd(adap, 1,</div><div class='add'>+						    pi-&gt;first_qset + j, -1,</div><div class='add'>+						    -1, i);</div><div class='add'>+			if (ret)</div><div class='add'>+				err = ret;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define FW_FNAME "t3fw-%d.%d.%d.bin"</div><div class='hunk'>@@ -891,6 +945,13 @@ static int cxgb_up(struct adapter *adap)</div><div class='ctx'> 				goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		/*</div><div class='add'>+		 * Clear interrupts now to catch errors if t3_init_hw fails.</div><div class='add'>+		 * We clear them again later as initialization may trigger</div><div class='add'>+		 * conditions that can interrupt.</div><div class='add'>+		 */</div><div class='add'>+		t3_intr_clear(adap);</div><div class='add'>+</div><div class='ctx'> 		err = t3_init_hw(adap, 0);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto out;</div><div class='hunk'>@@ -946,9 +1007,16 @@ static int cxgb_up(struct adapter *adap)</div><div class='ctx'> 		t3_write_reg(adap, A_TP_INT_ENABLE, 0x7fbfffff);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((adap-&gt;flags &amp; (USING_MSIX | QUEUES_BOUND)) == USING_MSIX)</div><div class='del'>-		bind_qsets(adap);</div><div class='del'>-	adap-&gt;flags |= QUEUES_BOUND;</div><div class='add'>+	if (!(adap-&gt;flags &amp; QUEUES_BOUND)) {</div><div class='add'>+		err = bind_qsets(adap);</div><div class='add'>+		if (err) {</div><div class='add'>+			CH_ERR(adap, "failed to bind qsets, err %d\n", err);</div><div class='add'>+			t3_intr_disable(adap);</div><div class='add'>+			free_irq_resources(adap);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		adap-&gt;flags |= QUEUES_BOUND;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -967,19 +1035,7 @@ static void cxgb_down(struct adapter *adapter)</div><div class='ctx'> 	t3_intr_disable(adapter);</div><div class='ctx'> 	spin_unlock_irq(&amp;adapter-&gt;work_lock);</div><div class='ctx'> </div><div class='del'>-	if (adapter-&gt;flags &amp; USING_MSIX) {</div><div class='del'>-		int i, n = 0;</div><div class='del'>-</div><div class='del'>-		free_irq(adapter-&gt;msix_info[0].vec, adapter);</div><div class='del'>-		for_each_port(adapter, i)</div><div class='del'>-		    n += adap2pinfo(adapter, i)-&gt;nqsets;</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; n; ++i)</div><div class='del'>-			free_irq(adapter-&gt;msix_info[i + 1].vec,</div><div class='del'>-				 &amp;adapter-&gt;sge.qs[i]);</div><div class='del'>-	} else</div><div class='del'>-		free_irq(adapter-&gt;pdev-&gt;irq, adapter);</div><div class='del'>-</div><div class='add'>+	free_irq_resources(adapter);</div><div class='ctx'> 	flush_workqueue(cxgb3_wq);	/* wait for external IRQ handler */</div><div class='ctx'> 	quiesce_rx(adapter);</div><div class='ctx'> }</div><div class='hunk'>@@ -1100,9 +1156,9 @@ static int cxgb_close(struct net_device *dev)</div><div class='ctx'> 	netif_carrier_off(dev);</div><div class='ctx'> 	t3_mac_disable(&amp;pi-&gt;mac, MAC_DIRECTION_TX | MAC_DIRECTION_RX);</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;adapter-&gt;work_lock);	/* sync with update task */</div><div class='add'>+	spin_lock_irq(&amp;adapter-&gt;work_lock);	/* sync with update task */</div><div class='ctx'> 	clear_bit(pi-&gt;port_id, &amp;adapter-&gt;open_device_map);</div><div class='del'>-	spin_unlock(&amp;adapter-&gt;work_lock);</div><div class='add'>+	spin_unlock_irq(&amp;adapter-&gt;work_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (!(adapter-&gt;open_device_map &amp; PORT_MASK))</div><div class='ctx'> 		cancel_rearming_delayed_workqueue(cxgb3_wq,</div><div class='hunk'>@@ -1284,8 +1340,8 @@ static unsigned long collect_sge_port_stats(struct adapter *adapter,</div><div class='ctx'> 	int i;</div><div class='ctx'> 	unsigned long tot = 0;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; p-&gt;nqsets; ++i)</div><div class='del'>-		tot += adapter-&gt;sge.qs[i + p-&gt;first_qset].port_stats[idx];</div><div class='add'>+	for (i = p-&gt;first_qset; i &lt; p-&gt;first_qset + p-&gt;nqsets; ++i)</div><div class='add'>+		tot += adapter-&gt;sge.qs[i].port_stats[idx];</div><div class='ctx'> 	return tot;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1485,11 +1541,22 @@ static int speed_duplex_to_caps(int speed, int duplex)</div><div class='ctx'> </div><div class='ctx'> static int set_settings(struct net_device *dev, struct ethtool_cmd *cmd)</div><div class='ctx'> {</div><div class='add'>+	int cap;</div><div class='ctx'> 	struct port_info *p = netdev_priv(dev);</div><div class='ctx'> 	struct link_config *lc = &amp;p-&gt;link_config;</div><div class='ctx'> </div><div class='del'>-	if (!(lc-&gt;supported &amp; SUPPORTED_Autoneg))</div><div class='del'>-		return -EOPNOTSUPP;	/* can't change speed/duplex */</div><div class='add'>+	if (!(lc-&gt;supported &amp; SUPPORTED_Autoneg)) {</div><div class='add'>+		/*</div><div class='add'>+		 * PHY offers a single speed/duplex.  See if that's what's</div><div class='add'>+		 * being requested.</div><div class='add'>+		 */</div><div class='add'>+		if (cmd-&gt;autoneg == AUTONEG_DISABLE) {</div><div class='add'>+			cap = speed_duplex_to_caps(cmd-&gt;speed, cmd-&gt;duplex);</div><div class='add'>+			if (lc-&gt;supported &amp; cap)</div><div class='add'>+				return 0;</div><div class='add'>+		}</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (cmd-&gt;autoneg == AUTONEG_DISABLE) {</div><div class='ctx'> 		int cap = speed_duplex_to_caps(cmd-&gt;speed, cmd-&gt;duplex);</div><div class='hunk'>@@ -1568,8 +1635,10 @@ static int set_rx_csum(struct net_device *dev, u32 data)</div><div class='ctx'> 		struct adapter *adap = p-&gt;adapter;</div><div class='ctx'> 		int i;</div><div class='ctx'> </div><div class='del'>-		for (i = p-&gt;first_qset; i &lt; p-&gt;first_qset + p-&gt;nqsets; i++)</div><div class='add'>+		for (i = p-&gt;first_qset; i &lt; p-&gt;first_qset + p-&gt;nqsets; i++) {</div><div class='add'>+			adap-&gt;params.sge.qset[i].lro = 0;</div><div class='ctx'> 			adap-&gt;sge.qs[i].lro_enabled = 0;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1775,6 +1844,8 @@ static int cxgb_extension_ioctl(struct net_device *dev, void __user *useraddr)</div><div class='ctx'> 		int i;</div><div class='ctx'> 		struct qset_params *q;</div><div class='ctx'> 		struct ch_qset_params t;</div><div class='add'>+		int q1 = pi-&gt;first_qset;</div><div class='add'>+		int nqsets = pi-&gt;nqsets;</div><div class='ctx'> </div><div class='ctx'> 		if (!capable(CAP_NET_ADMIN))</div><div class='ctx'> 			return -EPERM;</div><div class='hunk'>@@ -1797,6 +1868,16 @@ static int cxgb_extension_ioctl(struct net_device *dev, void __user *useraddr)</div><div class='ctx'> 			|| !in_range(t.rspq_size, MIN_RSPQ_ENTRIES,</div><div class='ctx'> 					MAX_RSPQ_ENTRIES))</div><div class='ctx'> 			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		if ((adapter-&gt;flags &amp; FULL_INIT_DONE) &amp;&amp; t.lro &gt; 0)</div><div class='add'>+			for_each_port(adapter, i) {</div><div class='add'>+				pi = adap2pinfo(adapter, i);</div><div class='add'>+				if (t.qset_idx &gt;= pi-&gt;first_qset &amp;&amp;</div><div class='add'>+				    t.qset_idx &lt; pi-&gt;first_qset + pi-&gt;nqsets &amp;&amp;</div><div class='add'>+				    !pi-&gt;rx_csum_offload)</div><div class='add'>+					return -EINVAL;</div><div class='add'>+			}</div><div class='add'>+</div><div class='ctx'> 		if ((adapter-&gt;flags &amp; FULL_INIT_DONE) &amp;&amp;</div><div class='ctx'> 			(t.rspq_size &gt;= 0 || t.fl_size[0] &gt;= 0 ||</div><div class='ctx'> 			t.fl_size[1] &gt;= 0 || t.txq_size[0] &gt;= 0 ||</div><div class='hunk'>@@ -1804,6 +1885,20 @@ static int cxgb_extension_ioctl(struct net_device *dev, void __user *useraddr)</div><div class='ctx'> 			t.polling &gt;= 0 || t.cong_thres &gt;= 0))</div><div class='ctx'> 			return -EBUSY;</div><div class='ctx'> </div><div class='add'>+		/* Allow setting of any available qset when offload enabled */</div><div class='add'>+		if (test_bit(OFFLOAD_DEVMAP_BIT, &amp;adapter-&gt;open_device_map)) {</div><div class='add'>+			q1 = 0;</div><div class='add'>+			for_each_port(adapter, i) {</div><div class='add'>+				pi = adap2pinfo(adapter, i);</div><div class='add'>+				nqsets += pi-&gt;first_qset + pi-&gt;nqsets;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (t.qset_idx &lt; q1)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (t.qset_idx &gt; q1 + nqsets - 1)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 		q = &amp;adapter-&gt;params.sge.qset[t.qset_idx];</div><div class='ctx'> </div><div class='ctx'> 		if (t.rspq_size &gt;= 0)</div><div class='hunk'>@@ -1853,13 +1948,26 @@ static int cxgb_extension_ioctl(struct net_device *dev, void __user *useraddr)</div><div class='ctx'> 	case CHELSIO_GET_QSET_PARAMS:{</div><div class='ctx'> 		struct qset_params *q;</div><div class='ctx'> 		struct ch_qset_params t;</div><div class='add'>+		int q1 = pi-&gt;first_qset;</div><div class='add'>+		int nqsets = pi-&gt;nqsets;</div><div class='add'>+		int i;</div><div class='ctx'> </div><div class='ctx'> 		if (copy_from_user(&amp;t, useraddr, sizeof(t)))</div><div class='ctx'> 			return -EFAULT;</div><div class='del'>-		if (t.qset_idx &gt;= SGE_QSETS)</div><div class='add'>+</div><div class='add'>+		/* Display qsets for all ports when offload enabled */</div><div class='add'>+		if (test_bit(OFFLOAD_DEVMAP_BIT, &amp;adapter-&gt;open_device_map)) {</div><div class='add'>+			q1 = 0;</div><div class='add'>+			for_each_port(adapter, i) {</div><div class='add'>+				pi = adap2pinfo(adapter, i);</div><div class='add'>+				nqsets = pi-&gt;first_qset + pi-&gt;nqsets;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (t.qset_idx &gt;= nqsets)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='del'>-		q = &amp;adapter-&gt;params.sge.qset[t.qset_idx];</div><div class='add'>+		q = &amp;adapter-&gt;params.sge.qset[q1 + t.qset_idx];</div><div class='ctx'> 		t.rspq_size = q-&gt;rspq_size;</div><div class='ctx'> 		t.txq_size[0] = q-&gt;txq_size[0];</div><div class='ctx'> 		t.txq_size[1] = q-&gt;txq_size[1];</div><div class='hunk'>@@ -1870,6 +1978,12 @@ static int cxgb_extension_ioctl(struct net_device *dev, void __user *useraddr)</div><div class='ctx'> 		t.lro = q-&gt;lro;</div><div class='ctx'> 		t.intr_lat = q-&gt;coalesce_usecs;</div><div class='ctx'> 		t.cong_thres = q-&gt;cong_thres;</div><div class='add'>+		t.qnum = q1;</div><div class='add'>+</div><div class='add'>+		if (adapter-&gt;flags &amp; USING_MSIX)</div><div class='add'>+			t.vector = adapter-&gt;msix_info[q1 + t.qset_idx + 1].vec;</div><div class='add'>+		else</div><div class='add'>+			t.vector = adapter-&gt;pdev-&gt;irq;</div><div class='ctx'> </div><div class='ctx'> 		if (copy_to_user(useraddr, &amp;t, sizeof(t)))</div><div class='ctx'> 			return -EFAULT;</div><div class='hunk'>@@ -2117,7 +2231,7 @@ static int cxgb_ioctl(struct net_device *dev, struct ifreq *req, int cmd)</div><div class='ctx'> 			mmd = data-&gt;phy_id &gt;&gt; 8;</div><div class='ctx'> 			if (!mmd)</div><div class='ctx'> 				mmd = MDIO_DEV_PCS;</div><div class='del'>-			else if (mmd &gt; MDIO_DEV_XGXS)</div><div class='add'>+			else if (mmd &gt; MDIO_DEV_VEND2)</div><div class='ctx'> 				return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 			ret =</div><div class='hunk'>@@ -2143,7 +2257,7 @@ static int cxgb_ioctl(struct net_device *dev, struct ifreq *req, int cmd)</div><div class='ctx'> 			mmd = data-&gt;phy_id &gt;&gt; 8;</div><div class='ctx'> 			if (!mmd)</div><div class='ctx'> 				mmd = MDIO_DEV_PCS;</div><div class='del'>-			else if (mmd &gt; MDIO_DEV_XGXS)</div><div class='add'>+			else if (mmd &gt; MDIO_DEV_VEND2)</div><div class='ctx'> 				return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 			ret =</div><div class='hunk'>@@ -2215,8 +2329,8 @@ static void t3_synchronize_rx(struct adapter *adap, const struct port_info *p)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; p-&gt;nqsets; i++) {</div><div class='del'>-		struct sge_rspq *q = &amp;adap-&gt;sge.qs[i + p-&gt;first_qset].rspq;</div><div class='add'>+	for (i = p-&gt;first_qset; i &lt; p-&gt;first_qset + p-&gt;nqsets; i++) {</div><div class='add'>+		struct sge_rspq *q = &amp;adap-&gt;sge.qs[i].rspq;</div><div class='ctx'> </div><div class='ctx'> 		spin_lock_irq(&amp;q-&gt;lock);</div><div class='ctx'> 		spin_unlock_irq(&amp;q-&gt;lock);</div><div class='hunk'>@@ -2290,7 +2404,7 @@ static void check_link_status(struct adapter *adapter)</div><div class='ctx'> 		struct net_device *dev = adapter-&gt;port[i];</div><div class='ctx'> 		struct port_info *p = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-		if (!(p-&gt;port_type-&gt;caps &amp; SUPPORTED_IRQ) &amp;&amp; netif_running(dev))</div><div class='add'>+		if (!(p-&gt;phy.caps &amp; SUPPORTED_IRQ) &amp;&amp; netif_running(dev))</div><div class='ctx'> 			t3_link_changed(adapter, i);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -2355,10 +2469,10 @@ static void t3_adap_check_task(struct work_struct *work)</div><div class='ctx'> 		check_t3b2_mac(adapter);</div><div class='ctx'> </div><div class='ctx'> 	/* Schedule the next check update if any port is active. */</div><div class='del'>-	spin_lock(&amp;adapter-&gt;work_lock);</div><div class='add'>+	spin_lock_irq(&amp;adapter-&gt;work_lock);</div><div class='ctx'> 	if (adapter-&gt;open_device_map &amp; PORT_MASK)</div><div class='ctx'> 		schedule_chk_task(adapter);</div><div class='del'>-	spin_unlock(&amp;adapter-&gt;work_lock);</div><div class='add'>+	spin_unlock_irq(&amp;adapter-&gt;work_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -2403,6 +2517,96 @@ void t3_os_ext_intr_handler(struct adapter *adapter)</div><div class='ctx'> 	spin_unlock(&amp;adapter-&gt;work_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int t3_adapter_error(struct adapter *adapter, int reset)</div><div class='add'>+{</div><div class='add'>+	int i, ret = 0;</div><div class='add'>+</div><div class='add'>+	/* Stop all ports */</div><div class='add'>+	for_each_port(adapter, i) {</div><div class='add'>+		struct net_device *netdev = adapter-&gt;port[i];</div><div class='add'>+</div><div class='add'>+		if (netif_running(netdev))</div><div class='add'>+			cxgb_close(netdev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (is_offload(adapter) &amp;&amp;</div><div class='add'>+	    test_bit(OFFLOAD_DEVMAP_BIT, &amp;adapter-&gt;open_device_map))</div><div class='add'>+		offload_close(&amp;adapter-&gt;tdev);</div><div class='add'>+</div><div class='add'>+	/* Stop SGE timers */</div><div class='add'>+	t3_stop_sge_timers(adapter);</div><div class='add'>+</div><div class='add'>+	adapter-&gt;flags &amp;= ~FULL_INIT_DONE;</div><div class='add'>+</div><div class='add'>+	if (reset)</div><div class='add'>+		ret = t3_reset_adapter(adapter);</div><div class='add'>+</div><div class='add'>+	pci_disable_device(adapter-&gt;pdev);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int t3_reenable_adapter(struct adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	if (pci_enable_device(adapter-&gt;pdev)) {</div><div class='add'>+		dev_err(&amp;adapter-&gt;pdev-&gt;dev,</div><div class='add'>+			"Cannot re-enable PCI device after reset.\n");</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+	pci_set_master(adapter-&gt;pdev);</div><div class='add'>+	pci_restore_state(adapter-&gt;pdev);</div><div class='add'>+</div><div class='add'>+	/* Free sge resources */</div><div class='add'>+	t3_free_sge_resources(adapter);</div><div class='add'>+</div><div class='add'>+	if (t3_replay_prep_adapter(adapter))</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+err:</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void t3_resume_ports(struct adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* Restart the ports */</div><div class='add'>+	for_each_port(adapter, i) {</div><div class='add'>+		struct net_device *netdev = adapter-&gt;port[i];</div><div class='add'>+</div><div class='add'>+		if (netif_running(netdev)) {</div><div class='add'>+			if (cxgb_open(netdev)) {</div><div class='add'>+				dev_err(&amp;adapter-&gt;pdev-&gt;dev,</div><div class='add'>+					"can't bring device back up"</div><div class='add'>+					" after reset\n");</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * processes a fatal error.</div><div class='add'>+ * Bring the ports down, reset the chip, bring the ports back up.</div><div class='add'>+ */</div><div class='add'>+static void fatal_error_task(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct adapter *adapter = container_of(work, struct adapter,</div><div class='add'>+					       fatal_error_handler_task);</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	rtnl_lock();</div><div class='add'>+	err = t3_adapter_error(adapter, 1);</div><div class='add'>+	if (!err)</div><div class='add'>+		err = t3_reenable_adapter(adapter);</div><div class='add'>+	if (!err)</div><div class='add'>+		t3_resume_ports(adapter);</div><div class='add'>+</div><div class='add'>+	CH_ALERT(adapter, "adapter reset %s\n", err ? "failed" : "succeeded");</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void t3_fatal_err(struct adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int fw_status[4];</div><div class='hunk'>@@ -2413,7 +2617,11 @@ void t3_fatal_err(struct adapter *adapter)</div><div class='ctx'> 		t3_write_reg(adapter, A_XGM_RX_CTRL, 0);</div><div class='ctx'> 		t3_write_reg(adapter, XGM_REG(A_XGM_TX_CTRL, 1), 0);</div><div class='ctx'> 		t3_write_reg(adapter, XGM_REG(A_XGM_RX_CTRL, 1), 0);</div><div class='add'>+</div><div class='add'>+		spin_lock(&amp;adapter-&gt;work_lock);</div><div class='ctx'> 		t3_intr_disable(adapter);</div><div class='add'>+		queue_work(cxgb3_wq, &amp;adapter-&gt;fatal_error_handler_task);</div><div class='add'>+		spin_unlock(&amp;adapter-&gt;work_lock);</div><div class='ctx'> 	}</div><div class='ctx'> 	CH_ALERT(adapter, "encountered fatal error, operation suspended\n");</div><div class='ctx'> 	if (!t3_cim_ctl_blk_read(adapter, 0xa0, 4, fw_status))</div><div class='hunk'>@@ -2435,23 +2643,9 @@ static pci_ers_result_t t3_io_error_detected(struct pci_dev *pdev,</div><div class='ctx'> 					     pci_channel_state_t state)</div><div class='ctx'> {</div><div class='ctx'> 	struct adapter *adapter = pci_get_drvdata(pdev);</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* Stop all ports */</div><div class='del'>-	for_each_port(adapter, i) {</div><div class='del'>-		struct net_device *netdev = adapter-&gt;port[i];</div><div class='del'>-</div><div class='del'>-		if (netif_running(netdev))</div><div class='del'>-			cxgb_close(netdev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (is_offload(adapter) &amp;&amp;</div><div class='del'>-	    test_bit(OFFLOAD_DEVMAP_BIT, &amp;adapter-&gt;open_device_map))</div><div class='del'>-		offload_close(&amp;adapter-&gt;tdev);</div><div class='del'>-</div><div class='del'>-	adapter-&gt;flags &amp;= ~FULL_INIT_DONE;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	pci_disable_device(pdev);</div><div class='add'>+	ret = t3_adapter_error(adapter, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* Request a slot reset. */</div><div class='ctx'> 	return PCI_ERS_RESULT_NEED_RESET;</div><div class='hunk'>@@ -2467,22 +2661,9 @@ static pci_ers_result_t t3_io_slot_reset(struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct adapter *adapter = pci_get_drvdata(pdev);</div><div class='ctx'> </div><div class='del'>-	if (pci_enable_device(pdev)) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev,</div><div class='del'>-			"Cannot re-enable PCI device after reset.\n");</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-	pci_set_master(pdev);</div><div class='del'>-	pci_restore_state(pdev);</div><div class='del'>-</div><div class='del'>-	/* Free sge resources */</div><div class='del'>-	t3_free_sge_resources(adapter);</div><div class='del'>-</div><div class='del'>-	if (t3_replay_prep_adapter(adapter))</div><div class='del'>-		goto err;</div><div class='add'>+	if (!t3_reenable_adapter(adapter))</div><div class='add'>+		return PCI_ERS_RESULT_RECOVERED;</div><div class='ctx'> </div><div class='del'>-	return PCI_ERS_RESULT_RECOVERED;</div><div class='del'>-err:</div><div class='ctx'> 	return PCI_ERS_RESULT_DISCONNECT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2496,22 +2677,8 @@ err:</div><div class='ctx'> static void t3_io_resume(struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct adapter *adapter = pci_get_drvdata(pdev);</div><div class='del'>-	int i;</div><div class='ctx'> </div><div class='del'>-	/* Restart the ports */</div><div class='del'>-	for_each_port(adapter, i) {</div><div class='del'>-		struct net_device *netdev = adapter-&gt;port[i];</div><div class='del'>-</div><div class='del'>-		if (netif_running(netdev)) {</div><div class='del'>-			if (cxgb_open(netdev)) {</div><div class='del'>-				dev_err(&amp;pdev-&gt;dev,</div><div class='del'>-					"can't bring device back up"</div><div class='del'>-					" after reset\n");</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-			netif_device_attach(netdev);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	t3_resume_ports(adapter);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct pci_error_handlers t3_err_handler = {</div><div class='hunk'>@@ -2520,6 +2687,42 @@ static struct pci_error_handlers t3_err_handler = {</div><div class='ctx'> 	.resume = t3_io_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Set the number of qsets based on the number of CPUs and the number of ports,</div><div class='add'>+ * not to exceed the number of available qsets, assuming there are enough qsets</div><div class='add'>+ * per port in HW.</div><div class='add'>+ */</div><div class='add'>+static void set_nqsets(struct adapter *adap)</div><div class='add'>+{</div><div class='add'>+	int i, j = 0;</div><div class='add'>+	int num_cpus = num_online_cpus();</div><div class='add'>+	int hwports = adap-&gt;params.nports;</div><div class='add'>+	int nqsets = SGE_QSETS;</div><div class='add'>+</div><div class='add'>+	if (adap-&gt;params.rev &gt; 0) {</div><div class='add'>+		if (hwports == 2 &amp;&amp;</div><div class='add'>+		    (hwports * nqsets &gt; SGE_QSETS ||</div><div class='add'>+		     num_cpus &gt;= nqsets / hwports))</div><div class='add'>+			nqsets /= hwports;</div><div class='add'>+		if (nqsets &gt; num_cpus)</div><div class='add'>+			nqsets = num_cpus;</div><div class='add'>+		if (nqsets &lt; 1 || hwports == 4)</div><div class='add'>+			nqsets = 1;</div><div class='add'>+	} else</div><div class='add'>+		nqsets = 1;</div><div class='add'>+</div><div class='add'>+	for_each_port(adap, i) {</div><div class='add'>+		struct port_info *pi = adap2pinfo(adap, i);</div><div class='add'>+</div><div class='add'>+		pi-&gt;first_qset = j;</div><div class='add'>+		pi-&gt;nqsets = nqsets;</div><div class='add'>+		j = pi-&gt;first_qset + nqsets;</div><div class='add'>+</div><div class='add'>+		dev_info(&amp;adap-&gt;pdev-&gt;dev,</div><div class='add'>+			 "Port %d using %d queue sets.\n", i, nqsets);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int __devinit cxgb_enable_msix(struct adapter *adap)</div><div class='ctx'> {</div><div class='ctx'> 	struct msix_entry entries[SGE_QSETS + 1];</div><div class='hunk'>@@ -2564,7 +2767,7 @@ static void __devinit print_port_info(struct adapter *adap,</div><div class='ctx'> 		if (!test_bit(i, &amp;adap-&gt;registered_device_map))</div><div class='ctx'> 			continue;</div><div class='ctx'> 		printk(KERN_INFO "%s: %s %s %sNIC (rev %d) %s%s\n",</div><div class='del'>-		       dev-&gt;name, ai-&gt;desc, pi-&gt;port_type-&gt;desc,</div><div class='add'>+		       dev-&gt;name, ai-&gt;desc, pi-&gt;phy.desc,</div><div class='ctx'> 		       is_offload(adap) ? "R" : "", adap-&gt;params.rev, buf,</div><div class='ctx'> 		       (adap-&gt;flags &amp; USING_MSIX) ? " MSI-X" :</div><div class='ctx'> 		       (adap-&gt;flags &amp; USING_MSI) ? " MSI" : "");</div><div class='hunk'>@@ -2660,6 +2863,7 @@ static int __devinit init_one(struct pci_dev *pdev,</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;adapter-&gt;adapter_list);</div><div class='ctx'> 	INIT_WORK(&amp;adapter-&gt;ext_intr_handler_task, ext_intr_task);</div><div class='add'>+	INIT_WORK(&amp;adapter-&gt;fatal_error_handler_task, fatal_error_task);</div><div class='ctx'> 	INIT_DELAYED_WORK(&amp;adapter-&gt;adap_check_task, t3_adap_check_task);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ai-&gt;nports; ++i) {</div><div class='hunk'>@@ -2677,9 +2881,6 @@ static int __devinit init_one(struct pci_dev *pdev,</div><div class='ctx'> 		pi = netdev_priv(netdev);</div><div class='ctx'> 		pi-&gt;adapter = adapter;</div><div class='ctx'> 		pi-&gt;rx_csum_offload = 1;</div><div class='del'>-		pi-&gt;nqsets = 1;</div><div class='del'>-		pi-&gt;first_qset = i;</div><div class='del'>-		pi-&gt;activity = 0;</div><div class='ctx'> 		pi-&gt;port_id = i;</div><div class='ctx'> 		netif_carrier_off(netdev);</div><div class='ctx'> 		netdev-&gt;irq = pdev-&gt;irq;</div><div class='hunk'>@@ -2756,6 +2957,8 @@ static int __devinit init_one(struct pci_dev *pdev,</div><div class='ctx'> 	else if (msi &gt; 0 &amp;&amp; pci_enable_msi(pdev) == 0)</div><div class='ctx'> 		adapter-&gt;flags |= USING_MSI;</div><div class='ctx'> </div><div class='add'>+	set_nqsets(adapter);</div><div class='add'>+</div><div class='ctx'> 	err = sysfs_create_group(&amp;adapter-&gt;port[0]-&gt;dev.kobj,</div><div class='ctx'> 				 &amp;cxgb3_attr_group);</div><div class='ctx'> </div><div class='hunk'>@@ -2801,6 +3004,7 @@ static void __devexit remove_one(struct pci_dev *pdev)</div><div class='ctx'> 		    if (test_bit(i, &amp;adapter-&gt;registered_device_map))</div><div class='ctx'> 			unregister_netdev(adapter-&gt;port[i]);</div><div class='ctx'> </div><div class='add'>+		t3_stop_sge_timers(adapter);</div><div class='ctx'> 		t3_free_sge_resources(adapter);</div><div class='ctx'> 		cxgb_disable_msi(adapter);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/cxgb3/cxgb3_offload.c b/drivers/net/cxgb3/cxgb3_offload.c<br/>index c5b3de1bb456..265aa8a15afa 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/cxgb3/cxgb3_offload.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/cxgb3/cxgb3_offload.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/cxgb3/cxgb3_offload.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/cxgb3/cxgb3_offload.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * Copyright (c) 2006-2007 Chelsio, Inc. All rights reserved.</div><div class='add'>+ * Copyright (c) 2006-2008 Chelsio, Inc. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * This software is available to you under a choice of one of two</div><div class='ctx'>  * licenses.  You may choose to be licensed under the terms of the GNU</div><div class='hunk'>@@ -1018,7 +1018,7 @@ static void set_l2t_ix(struct t3cdev *tdev, u32 tid, struct l2t_entry *e)</div><div class='ctx'> </div><div class='ctx'> 	skb = alloc_skb(sizeof(*req), GFP_ATOMIC);</div><div class='ctx'> 	if (!skb) {</div><div class='del'>-		printk(KERN_ERR "%s: cannot allocate skb!\n", __FUNCTION__);</div><div class='add'>+		printk(KERN_ERR "%s: cannot allocate skb!\n", __func__);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	skb-&gt;priority = CPL_PRIORITY_CONTROL;</div><div class='hunk'>@@ -1049,14 +1049,14 @@ void cxgb_redirect(struct dst_entry *old, struct dst_entry *new)</div><div class='ctx'> 		return;</div><div class='ctx'> 	if (!is_offloading(newdev)) {</div><div class='ctx'> 		printk(KERN_WARNING "%s: Redirect to non-offload "</div><div class='del'>-		       "device ignored.\n", __FUNCTION__);</div><div class='add'>+		       "device ignored.\n", __func__);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	tdev = dev2t3cdev(olddev);</div><div class='ctx'> 	BUG_ON(!tdev);</div><div class='ctx'> 	if (tdev != dev2t3cdev(newdev)) {</div><div class='ctx'> 		printk(KERN_WARNING "%s: Redirect to different "</div><div class='del'>-		       "offload device ignored.\n", __FUNCTION__);</div><div class='add'>+		       "offload device ignored.\n", __func__);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1064,7 +1064,7 @@ void cxgb_redirect(struct dst_entry *old, struct dst_entry *new)</div><div class='ctx'> 	e = t3_l2t_get(tdev, new-&gt;neighbour, newdev);</div><div class='ctx'> 	if (!e) {</div><div class='ctx'> 		printk(KERN_ERR "%s: couldn't allocate new l2t entry!\n",</div><div class='del'>-		       __FUNCTION__);</div><div class='add'>+		       __func__);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/cxgb3/cxgb3_offload.h b/drivers/net/cxgb3/cxgb3_offload.h<br/>index 7a379138b5a6..d514e5019dfc 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/cxgb3/cxgb3_offload.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/cxgb3/cxgb3_offload.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/cxgb3/cxgb3_offload.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/cxgb3/cxgb3_offload.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * Copyright (c) 2006-2007 Chelsio, Inc. All rights reserved.</div><div class='add'>+ * Copyright (c) 2006-2008 Chelsio, Inc. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * This software is available to you under a choice of one of two</div><div class='ctx'>  * licenses.  You may choose to be licensed under the terms of the GNU</div><div class='head'>diff --git a/drivers/net/cxgb3/firmware_exports.h b/drivers/net/cxgb3/firmware_exports.h<br/>index b75ddd8777fe..0d9b0e6dccff 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/cxgb3/firmware_exports.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/cxgb3/firmware_exports.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/cxgb3/firmware_exports.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/cxgb3/firmware_exports.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * Copyright (c) 2004-2007 Chelsio, Inc. All rights reserved.</div><div class='add'>+ * Copyright (c) 2004-2008 Chelsio, Inc. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * This software is available to you under a choice of one of two</div><div class='ctx'>  * licenses.  You may choose to be licensed under the terms of the GNU</div><div class='head'>diff --git a/drivers/net/cxgb3/l2t.c b/drivers/net/cxgb3/l2t.c<br/>index 825e510bd9ed..4407ac9bb555 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/cxgb3/l2t.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/cxgb3/l2t.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/cxgb3/l2t.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/cxgb3/l2t.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * Copyright (c) 2003-2007 Chelsio, Inc. All rights reserved.</div><div class='add'>+ * Copyright (c) 2003-2008 Chelsio, Inc. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * This software is available to you under a choice of one of two</div><div class='ctx'>  * licenses.  You may choose to be licensed under the terms of the GNU</div><div class='hunk'>@@ -86,6 +86,7 @@ static int setup_l2e_send_pending(struct t3cdev *dev, struct sk_buff *skb,</div><div class='ctx'> 				  struct l2t_entry *e)</div><div class='ctx'> {</div><div class='ctx'> 	struct cpl_l2t_write_req *req;</div><div class='add'>+	struct sk_buff *tmp;</div><div class='ctx'> </div><div class='ctx'> 	if (!skb) {</div><div class='ctx'> 		skb = alloc_skb(sizeof(*req), GFP_ATOMIC);</div><div class='hunk'>@@ -103,13 +104,11 @@ static int setup_l2e_send_pending(struct t3cdev *dev, struct sk_buff *skb,</div><div class='ctx'> 	memcpy(req-&gt;dst_mac, e-&gt;dmac, sizeof(req-&gt;dst_mac));</div><div class='ctx'> 	skb-&gt;priority = CPL_PRIORITY_CONTROL;</div><div class='ctx'> 	cxgb3_ofld_send(dev, skb);</div><div class='del'>-	while (e-&gt;arpq_head) {</div><div class='del'>-		skb = e-&gt;arpq_head;</div><div class='del'>-		e-&gt;arpq_head = skb-&gt;next;</div><div class='del'>-		skb-&gt;next = NULL;</div><div class='add'>+</div><div class='add'>+	skb_queue_walk_safe(&amp;e-&gt;arpq, skb, tmp) {</div><div class='add'>+		__skb_unlink(skb, &amp;e-&gt;arpq);</div><div class='ctx'> 		cxgb3_ofld_send(dev, skb);</div><div class='ctx'> 	}</div><div class='del'>-	e-&gt;arpq_tail = NULL;</div><div class='ctx'> 	e-&gt;state = L2T_STATE_VALID;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -121,12 +120,7 @@ static int setup_l2e_send_pending(struct t3cdev *dev, struct sk_buff *skb,</div><div class='ctx'>  */</div><div class='ctx'> static inline void arpq_enqueue(struct l2t_entry *e, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	skb-&gt;next = NULL;</div><div class='del'>-	if (e-&gt;arpq_head)</div><div class='del'>-		e-&gt;arpq_tail-&gt;next = skb;</div><div class='del'>-	else</div><div class='del'>-		e-&gt;arpq_head = skb;</div><div class='del'>-	e-&gt;arpq_tail = skb;</div><div class='add'>+	__skb_queue_tail(&amp;e-&gt;arpq, skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int t3_l2t_send_slow(struct t3cdev *dev, struct sk_buff *skb,</div><div class='hunk'>@@ -167,7 +161,7 @@ again:</div><div class='ctx'> 				break;</div><div class='ctx'> </div><div class='ctx'> 			spin_lock_bh(&amp;e-&gt;lock);</div><div class='del'>-			if (e-&gt;arpq_head)</div><div class='add'>+			if (!skb_queue_empty(&amp;e-&gt;arpq))</div><div class='ctx'> 				setup_l2e_send_pending(dev, skb, e);</div><div class='ctx'> 			else	/* we lost the race */</div><div class='ctx'> 				__kfree_skb(skb);</div><div class='hunk'>@@ -357,14 +351,14 @@ EXPORT_SYMBOL(t3_l2t_get);</div><div class='ctx'>  * XXX: maybe we should abandon the latter behavior and just require a failure</div><div class='ctx'>  * handler.</div><div class='ctx'>  */</div><div class='del'>-static void handle_failed_resolution(struct t3cdev *dev, struct sk_buff *arpq)</div><div class='add'>+static void handle_failed_resolution(struct t3cdev *dev, struct sk_buff_head *arpq)</div><div class='ctx'> {</div><div class='del'>-	while (arpq) {</div><div class='del'>-		struct sk_buff *skb = arpq;</div><div class='add'>+	struct sk_buff *skb, *tmp;</div><div class='add'>+</div><div class='add'>+	skb_queue_walk_safe(arpq, skb, tmp) {</div><div class='ctx'> 		struct l2t_skb_cb *cb = L2T_SKB_CB(skb);</div><div class='ctx'> </div><div class='del'>-		arpq = skb-&gt;next;</div><div class='del'>-		skb-&gt;next = NULL;</div><div class='add'>+		__skb_unlink(skb, arpq);</div><div class='ctx'> 		if (cb-&gt;arp_failure_handler)</div><div class='ctx'> 			cb-&gt;arp_failure_handler(dev, skb);</div><div class='ctx'> 		else</div><div class='hunk'>@@ -378,8 +372,8 @@ static void handle_failed_resolution(struct t3cdev *dev, struct sk_buff *arpq)</div><div class='ctx'>  */</div><div class='ctx'> void t3_l2t_update(struct t3cdev *dev, struct neighbour *neigh)</div><div class='ctx'> {</div><div class='add'>+	struct sk_buff_head arpq;</div><div class='ctx'> 	struct l2t_entry *e;</div><div class='del'>-	struct sk_buff *arpq = NULL;</div><div class='ctx'> 	struct l2t_data *d = L2DATA(dev);</div><div class='ctx'> 	u32 addr = *(u32 *) neigh-&gt;primary_key;</div><div class='ctx'> 	int ifidx = neigh-&gt;dev-&gt;ifindex;</div><div class='hunk'>@@ -395,6 +389,8 @@ void t3_l2t_update(struct t3cdev *dev, struct neighbour *neigh)</div><div class='ctx'> 	return;</div><div class='ctx'> </div><div class='ctx'> found:</div><div class='add'>+	__skb_queue_head_init(&amp;arpq);</div><div class='add'>+</div><div class='ctx'> 	read_unlock(&amp;d-&gt;lock);</div><div class='ctx'> 	if (atomic_read(&amp;e-&gt;refcnt)) {</div><div class='ctx'> 		if (neigh != e-&gt;neigh)</div><div class='hunk'>@@ -402,8 +398,7 @@ found:</div><div class='ctx'> </div><div class='ctx'> 		if (e-&gt;state == L2T_STATE_RESOLVING) {</div><div class='ctx'> 			if (neigh-&gt;nud_state &amp; NUD_FAILED) {</div><div class='del'>-				arpq = e-&gt;arpq_head;</div><div class='del'>-				e-&gt;arpq_head = e-&gt;arpq_tail = NULL;</div><div class='add'>+				skb_queue_splice_init(&amp;e-&gt;arpq, &amp;arpq);</div><div class='ctx'> 			} else if (neigh-&gt;nud_state &amp; (NUD_CONNECTED|NUD_STALE))</div><div class='ctx'> 				setup_l2e_send_pending(dev, NULL, e);</div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -415,8 +410,8 @@ found:</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_bh(&amp;e-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	if (arpq)</div><div class='del'>-		handle_failed_resolution(dev, arpq);</div><div class='add'>+	if (!skb_queue_empty(&amp;arpq))</div><div class='add'>+		handle_failed_resolution(dev, &amp;arpq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct l2t_data *t3_init_l2t(unsigned int l2t_capacity)</div><div class='head'>diff --git a/drivers/net/cxgb3/l2t.h b/drivers/net/cxgb3/l2t.h<br/>index d79001336cfd..fd3eb07e3f40 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/cxgb3/l2t.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/cxgb3/l2t.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/cxgb3/l2t.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/cxgb3/l2t.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * Copyright (c) 2003-2007 Chelsio, Inc. All rights reserved.</div><div class='add'>+ * Copyright (c) 2003-2008 Chelsio, Inc. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * This software is available to you under a choice of one of two</div><div class='ctx'>  * licenses.  You may choose to be licensed under the terms of the GNU</div><div class='hunk'>@@ -64,8 +64,7 @@ struct l2t_entry {</div><div class='ctx'> 	struct neighbour *neigh;	/* associated neighbour */</div><div class='ctx'> 	struct l2t_entry *first;	/* start of hash chain */</div><div class='ctx'> 	struct l2t_entry *next;	/* next l2t_entry on chain */</div><div class='del'>-	struct sk_buff *arpq_head;	/* queue of packets awaiting resolution */</div><div class='del'>-	struct sk_buff *arpq_tail;</div><div class='add'>+	struct sk_buff_head arpq;	/* queue of packets awaiting resolution */</div><div class='ctx'> 	spinlock_t lock;</div><div class='ctx'> 	atomic_t refcnt;	/* entry reference count */</div><div class='ctx'> 	u8 dmac[6];		/* neighbour's MAC address */</div><div class='head'>diff --git a/drivers/net/cxgb3/mc5.c b/drivers/net/cxgb3/mc5.c<br/>index 4c4d6e877ea6..3b5517b8fbde 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/cxgb3/mc5.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/cxgb3/mc5.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/cxgb3/mc5.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/cxgb3/mc5.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * Copyright (c) 2003-2007 Chelsio, Inc. All rights reserved.</div><div class='add'>+ * Copyright (c) 2003-2008 Chelsio, Inc. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * This software is available to you under a choice of one of two</div><div class='ctx'>  * licenses.  You may choose to be licensed under the terms of the GNU</div><div class='head'>diff --git a/drivers/net/cxgb3/regs.h b/drivers/net/cxgb3/regs.h<br/>index 4bda27c551c9..a035d5c24442 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/cxgb3/regs.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/cxgb3/regs.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/cxgb3/regs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/cxgb3/regs.h</a></div><div class='hunk'>@@ -573,6 +573,10 @@</div><div class='ctx'> #define V_GPIO10(x) ((x) &lt;&lt; S_GPIO10)</div><div class='ctx'> #define F_GPIO10    V_GPIO10(1U)</div><div class='ctx'> </div><div class='add'>+#define S_GPIO9    9</div><div class='add'>+#define V_GPIO9(x) ((x) &lt;&lt; S_GPIO9)</div><div class='add'>+#define F_GPIO9    V_GPIO9(1U)</div><div class='add'>+</div><div class='ctx'> #define S_GPIO7    7</div><div class='ctx'> #define V_GPIO7(x) ((x) &lt;&lt; S_GPIO7)</div><div class='ctx'> #define F_GPIO7    V_GPIO7(1U)</div><div class='head'>diff --git a/drivers/net/cxgb3/sge.c b/drivers/net/cxgb3/sge.c<br/>index 1b0861d73ab7..c6480be0bc1f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/cxgb3/sge.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/cxgb3/sge.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/cxgb3/sge.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/cxgb3/sge.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * Copyright (c) 2005-2007 Chelsio, Inc. All rights reserved.</div><div class='add'>+ * Copyright (c) 2005-2008 Chelsio, Inc. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * This software is available to you under a choice of one of two</div><div class='ctx'>  * licenses.  You may choose to be licensed under the terms of the GNU</div><div class='hunk'>@@ -351,7 +351,8 @@ static void free_rx_bufs(struct pci_dev *pdev, struct sge_fl *q)</div><div class='ctx'> 		pci_unmap_single(pdev, pci_unmap_addr(d, dma_addr),</div><div class='ctx'> 				 q-&gt;buf_size, PCI_DMA_FROMDEVICE);</div><div class='ctx'> 		if (q-&gt;use_pages) {</div><div class='del'>-			put_page(d-&gt;pg_chunk.page);</div><div class='add'>+			if (d-&gt;pg_chunk.page)</div><div class='add'>+				put_page(d-&gt;pg_chunk.page);</div><div class='ctx'> 			d-&gt;pg_chunk.page = NULL;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			kfree_skb(d-&gt;skb);</div><div class='hunk'>@@ -583,7 +584,7 @@ static void t3_reset_qset(struct sge_qset *q)</div><div class='ctx'> 	memset(q-&gt;fl, 0, sizeof(struct sge_fl) * SGE_RXQ_PER_SET);</div><div class='ctx'> 	memset(q-&gt;txq, 0, sizeof(struct sge_txq) * SGE_TXQ_PER_SET);</div><div class='ctx'> 	q-&gt;txq_stopped = 0;</div><div class='del'>-	memset(&amp;q-&gt;tx_reclaim_timer, 0, sizeof(q-&gt;tx_reclaim_timer));</div><div class='add'>+	q-&gt;tx_reclaim_timer.function = NULL; /* for t3_stop_sge_timers() */</div><div class='ctx'> 	kfree(q-&gt;lro_frag_tbl);</div><div class='ctx'> 	q-&gt;lro_nfrags = q-&gt;lro_frag_len = 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -603,9 +604,6 @@ static void t3_free_qset(struct adapter *adapter, struct sge_qset *q)</div><div class='ctx'> 	int i;</div><div class='ctx'> 	struct pci_dev *pdev = adapter-&gt;pdev;</div><div class='ctx'> </div><div class='del'>-	if (q-&gt;tx_reclaim_timer.function)</div><div class='del'>-		del_timer_sync(&amp;q-&gt;tx_reclaim_timer);</div><div class='del'>-</div><div class='ctx'> 	for (i = 0; i &lt; SGE_RXQ_PER_SET; ++i)</div><div class='ctx'> 		if (q-&gt;fl[i].desc) {</div><div class='ctx'> 			spin_lock_irq(&amp;adapter-&gt;sge.reg_lock);</div><div class='hunk'>@@ -1704,16 +1702,15 @@ int t3_offload_tx(struct t3cdev *tdev, struct sk_buff *skb)</div><div class='ctx'>  */</div><div class='ctx'> static inline void offload_enqueue(struct sge_rspq *q, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	skb-&gt;next = skb-&gt;prev = NULL;</div><div class='del'>-	if (q-&gt;rx_tail)</div><div class='del'>-		q-&gt;rx_tail-&gt;next = skb;</div><div class='del'>-	else {</div><div class='add'>+	int was_empty = skb_queue_empty(&amp;q-&gt;rx_queue);</div><div class='add'>+</div><div class='add'>+	__skb_queue_tail(&amp;q-&gt;rx_queue, skb);</div><div class='add'>+</div><div class='add'>+	if (was_empty) {</div><div class='ctx'> 		struct sge_qset *qs = rspq_to_qset(q);</div><div class='ctx'> </div><div class='ctx'> 		napi_schedule(&amp;qs-&gt;napi);</div><div class='del'>-		q-&gt;rx_head = skb;</div><div class='ctx'> 	}</div><div class='del'>-	q-&gt;rx_tail = skb;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1754,26 +1751,29 @@ static int ofld_poll(struct napi_struct *napi, int budget)</div><div class='ctx'> 	int work_done = 0;</div><div class='ctx'> </div><div class='ctx'> 	while (work_done &lt; budget) {</div><div class='del'>-		struct sk_buff *head, *tail, *skbs[RX_BUNDLE_SIZE];</div><div class='add'>+		struct sk_buff *skb, *tmp, *skbs[RX_BUNDLE_SIZE];</div><div class='add'>+		struct sk_buff_head queue;</div><div class='ctx'> 		int ngathered;</div><div class='ctx'> </div><div class='ctx'> 		spin_lock_irq(&amp;q-&gt;lock);</div><div class='del'>-		head = q-&gt;rx_head;</div><div class='del'>-		if (!head) {</div><div class='add'>+		__skb_queue_head_init(&amp;queue);</div><div class='add'>+		skb_queue_splice_init(&amp;q-&gt;rx_queue, &amp;queue);</div><div class='add'>+		if (skb_queue_empty(&amp;queue)) {</div><div class='ctx'> 			napi_complete(napi);</div><div class='ctx'> 			spin_unlock_irq(&amp;q-&gt;lock);</div><div class='ctx'> 			return work_done;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		tail = q-&gt;rx_tail;</div><div class='del'>-		q-&gt;rx_head = q-&gt;rx_tail = NULL;</div><div class='ctx'> 		spin_unlock_irq(&amp;q-&gt;lock);</div><div class='ctx'> </div><div class='del'>-		for (ngathered = 0; work_done &lt; budget &amp;&amp; head; work_done++) {</div><div class='del'>-			prefetch(head-&gt;data);</div><div class='del'>-			skbs[ngathered] = head;</div><div class='del'>-			head = head-&gt;next;</div><div class='del'>-			skbs[ngathered]-&gt;next = NULL;</div><div class='add'>+		ngathered = 0;</div><div class='add'>+		skb_queue_walk_safe(&amp;queue, skb, tmp) {</div><div class='add'>+			if (work_done &gt;= budget)</div><div class='add'>+				break;</div><div class='add'>+			work_done++;</div><div class='add'>+</div><div class='add'>+			__skb_unlink(skb, &amp;queue);</div><div class='add'>+			prefetch(skb-&gt;data);</div><div class='add'>+			skbs[ngathered] = skb;</div><div class='ctx'> 			if (++ngathered == RX_BUNDLE_SIZE) {</div><div class='ctx'> 				q-&gt;offload_bundles++;</div><div class='ctx'> 				adapter-&gt;tdev.recv(&amp;adapter-&gt;tdev, skbs,</div><div class='hunk'>@@ -1781,12 +1781,10 @@ static int ofld_poll(struct napi_struct *napi, int budget)</div><div class='ctx'> 				ngathered = 0;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		if (head) {	/* splice remaining packets back onto Rx queue */</div><div class='add'>+		if (!skb_queue_empty(&amp;queue)) {</div><div class='add'>+			/* splice remaining packets back onto Rx queue */</div><div class='ctx'> 			spin_lock_irq(&amp;q-&gt;lock);</div><div class='del'>-			tail-&gt;next = q-&gt;rx_head;</div><div class='del'>-			if (!q-&gt;rx_head)</div><div class='del'>-				q-&gt;rx_tail = tail;</div><div class='del'>-			q-&gt;rx_head = head;</div><div class='add'>+			skb_queue_splice(&amp;queue, &amp;q-&gt;rx_queue);</div><div class='ctx'> 			spin_unlock_irq(&amp;q-&gt;lock);</div><div class='ctx'> 		}</div><div class='ctx'> 		deliver_partial_bundle(&amp;adapter-&gt;tdev, q, skbs, ngathered);</div><div class='hunk'>@@ -1937,38 +1935,6 @@ static inline int lro_frame_ok(const struct cpl_rx_pkt *p)</div><div class='ctx'> 		eh-&gt;h_proto == htons(ETH_P_IP) &amp;&amp; ih-&gt;ihl == (sizeof(*ih) &gt;&gt; 2);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define TCP_FLAG_MASK (TCP_FLAG_CWR | TCP_FLAG_ECE | TCP_FLAG_URG |\</div><div class='del'>-                       TCP_FLAG_ACK | TCP_FLAG_PSH | TCP_FLAG_RST |\</div><div class='del'>-		                       TCP_FLAG_SYN | TCP_FLAG_FIN)</div><div class='del'>-#define TSTAMP_WORD ((TCPOPT_NOP &lt;&lt; 24) | (TCPOPT_NOP &lt;&lt; 16) |\</div><div class='del'>-                     (TCPOPT_TIMESTAMP &lt;&lt; 8) | TCPOLEN_TIMESTAMP)</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	lro_segment_ok - check if a TCP segment is eligible for LRO</div><div class='del'>- *	@tcph: the TCP header of the packet</div><div class='del'>- *</div><div class='del'>- *	Returns true if a TCP packet is eligible for LRO.  This requires that</div><div class='del'>- *	the packet have only the ACK flag set and no TCP options besides</div><div class='del'>- *	time stamps.</div><div class='del'>- */</div><div class='del'>-static inline int lro_segment_ok(const struct tcphdr *tcph)</div><div class='del'>-{</div><div class='del'>-	int optlen;</div><div class='del'>-</div><div class='del'>-	if (unlikely((tcp_flag_word(tcph) &amp; TCP_FLAG_MASK) != TCP_FLAG_ACK))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	optlen = (tcph-&gt;doff &lt;&lt; 2) - sizeof(*tcph);</div><div class='del'>-	if (optlen) {</div><div class='del'>-		const u32 *opt = (const u32 *)(tcph + 1);</div><div class='del'>-</div><div class='del'>-		if (optlen != TCPOLEN_TSTAMP_ALIGNED ||</div><div class='del'>-		    *opt != htonl(TSTAMP_WORD) || !opt[2])</div><div class='del'>-			return 0;</div><div class='del'>-	}</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int t3_get_lro_header(void **eh,  void **iph, void **tcph,</div><div class='ctx'> 			     u64 *hdr_flags, void *priv)</div><div class='ctx'> {</div><div class='hunk'>@@ -1981,9 +1947,6 @@ static int t3_get_lro_header(void **eh,  void **iph, void **tcph,</div><div class='ctx'> 	*iph = (struct iphdr *)((struct ethhdr *)*eh + 1);</div><div class='ctx'> 	*tcph = (struct tcphdr *)((struct iphdr *)*iph + 1);</div><div class='ctx'> </div><div class='del'>-	 if (!lro_segment_ok(*tcph))</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='ctx'> 	*hdr_flags = LRO_IPV4 | LRO_TCP;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -2878,9 +2841,7 @@ int t3_sge_alloc_qset(struct adapter *adapter, unsigned int id, int nports,</div><div class='ctx'> 	struct net_lro_mgr *lro_mgr = &amp;q-&gt;lro_mgr;</div><div class='ctx'> </div><div class='ctx'> 	init_qset_cntxt(q, id);</div><div class='del'>-	init_timer(&amp;q-&gt;tx_reclaim_timer);</div><div class='del'>-	q-&gt;tx_reclaim_timer.data = (unsigned long)q;</div><div class='del'>-	q-&gt;tx_reclaim_timer.function = sge_timer_cb;</div><div class='add'>+	setup_timer(&amp;q-&gt;tx_reclaim_timer, sge_timer_cb, (unsigned long)q);</div><div class='ctx'> </div><div class='ctx'> 	q-&gt;fl[0].desc = alloc_ring(adapter-&gt;pdev, p-&gt;fl_size,</div><div class='ctx'> 				   sizeof(struct rx_desc),</div><div class='hunk'>@@ -2934,6 +2895,7 @@ int t3_sge_alloc_qset(struct adapter *adapter, unsigned int id, int nports,</div><div class='ctx'> 	q-&gt;rspq.gen = 1;</div><div class='ctx'> 	q-&gt;rspq.size = p-&gt;rspq_size;</div><div class='ctx'> 	spin_lock_init(&amp;q-&gt;rspq.lock);</div><div class='add'>+	skb_queue_head_init(&amp;q-&gt;rspq.rx_queue);</div><div class='ctx'> </div><div class='ctx'> 	q-&gt;txq[TXQ_ETH].stop_thres = nports *</div><div class='ctx'> 	    flits_to_desc(sgl_len(MAX_SKB_FRAGS + 1) + 3);</div><div class='hunk'>@@ -3043,6 +3005,24 @@ err:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ *	t3_stop_sge_timers - stop SGE timer call backs</div><div class='add'>+ *	@adap: the adapter</div><div class='add'>+ *</div><div class='add'>+ *	Stops each SGE queue set's timer call back</div><div class='add'>+ */</div><div class='add'>+void t3_stop_sge_timers(struct adapter *adap)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; SGE_QSETS; ++i) {</div><div class='add'>+		struct sge_qset *q = &amp;adap-&gt;sge.qs[i];</div><div class='add'>+</div><div class='add'>+		if (q-&gt;tx_reclaim_timer.function)</div><div class='add'>+			del_timer_sync(&amp;q-&gt;tx_reclaim_timer);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  *	t3_free_sge_resources - free SGE resources</div><div class='ctx'>  *	@adap: the adapter</div><div class='ctx'>  *</div><div class='head'>diff --git a/drivers/net/cxgb3/t3_cpl.h b/drivers/net/cxgb3/t3_cpl.h<br/>index 917970ed24a1..852c399a8b0a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/cxgb3/t3_cpl.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/cxgb3/t3_cpl.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/cxgb3/t3_cpl.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/cxgb3/t3_cpl.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * Copyright (c) 2004-2007 Chelsio, Inc. All rights reserved.</div><div class='add'>+ * Copyright (c) 2004-2008 Chelsio, Inc. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * This software is available to you under a choice of one of two</div><div class='ctx'>  * licenses.  You may choose to be licensed under the terms of the GNU</div><div class='head'>diff --git a/drivers/net/cxgb3/t3_hw.c b/drivers/net/cxgb3/t3_hw.c<br/>index 04c0e90119af..968f64be3743 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/cxgb3/t3_hw.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/cxgb3/t3_hw.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/cxgb3/t3_hw.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/cxgb3/t3_hw.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * Copyright (c) 2003-2007 Chelsio, Inc. All rights reserved.</div><div class='add'>+ * Copyright (c) 2003-2008 Chelsio, Inc. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * This software is available to you under a choice of one of two</div><div class='ctx'>  * licenses.  You may choose to be licensed under the terms of the GNU</div><div class='hunk'>@@ -194,21 +194,18 @@ int t3_mc7_bd_read(struct mc7 *mc7, unsigned int start, unsigned int n,</div><div class='ctx'> static void mi1_init(struct adapter *adap, const struct adapter_info *ai)</div><div class='ctx'> {</div><div class='ctx'> 	u32 clkdiv = adap-&gt;params.vpd.cclk / (2 * adap-&gt;params.vpd.mdc) - 1;</div><div class='del'>-	u32 val = F_PREEN | V_MDIINV(ai-&gt;mdiinv) | V_MDIEN(ai-&gt;mdien) |</div><div class='del'>-	    V_CLKDIV(clkdiv);</div><div class='add'>+	u32 val = F_PREEN | V_CLKDIV(clkdiv);</div><div class='ctx'> </div><div class='del'>-	if (!(ai-&gt;caps &amp; SUPPORTED_10000baseT_Full))</div><div class='del'>-		val |= V_ST(1);</div><div class='ctx'> 	t3_write_reg(adap, A_MI1_CFG, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define MDIO_ATTEMPTS 10</div><div class='add'>+#define MDIO_ATTEMPTS 20</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * MI1 read/write operations for direct-addressed PHYs.</div><div class='add'>+ * MI1 read/write operations for clause 22 PHYs.</div><div class='ctx'>  */</div><div class='del'>-static int mi1_read(struct adapter *adapter, int phy_addr, int mmd_addr,</div><div class='del'>-		    int reg_addr, unsigned int *valp)</div><div class='add'>+static int t3_mi1_read(struct adapter *adapter, int phy_addr, int mmd_addr,</div><div class='add'>+		       int reg_addr, unsigned int *valp)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	u32 addr = V_REGADDR(reg_addr) | V_PHYADDR(phy_addr);</div><div class='hunk'>@@ -217,16 +214,17 @@ static int mi1_read(struct adapter *adapter, int phy_addr, int mmd_addr,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;adapter-&gt;mdio_lock);</div><div class='add'>+	t3_set_reg_field(adapter, A_MI1_CFG, V_ST(M_ST), V_ST(1));</div><div class='ctx'> 	t3_write_reg(adapter, A_MI1_ADDR, addr);</div><div class='ctx'> 	t3_write_reg(adapter, A_MI1_OP, V_MDI_OP(2));</div><div class='del'>-	ret = t3_wait_op_done(adapter, A_MI1_OP, F_BUSY, 0, MDIO_ATTEMPTS, 20);</div><div class='add'>+	ret = t3_wait_op_done(adapter, A_MI1_OP, F_BUSY, 0, MDIO_ATTEMPTS, 10);</div><div class='ctx'> 	if (!ret)</div><div class='ctx'> 		*valp = t3_read_reg(adapter, A_MI1_DATA);</div><div class='ctx'> 	mutex_unlock(&amp;adapter-&gt;mdio_lock);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mi1_write(struct adapter *adapter, int phy_addr, int mmd_addr,</div><div class='add'>+static int t3_mi1_write(struct adapter *adapter, int phy_addr, int mmd_addr,</div><div class='ctx'> 		     int reg_addr, unsigned int val)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -236,37 +234,51 @@ static int mi1_write(struct adapter *adapter, int phy_addr, int mmd_addr,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;adapter-&gt;mdio_lock);</div><div class='add'>+	t3_set_reg_field(adapter, A_MI1_CFG, V_ST(M_ST), V_ST(1));</div><div class='ctx'> 	t3_write_reg(adapter, A_MI1_ADDR, addr);</div><div class='ctx'> 	t3_write_reg(adapter, A_MI1_DATA, val);</div><div class='ctx'> 	t3_write_reg(adapter, A_MI1_OP, V_MDI_OP(1));</div><div class='del'>-	ret = t3_wait_op_done(adapter, A_MI1_OP, F_BUSY, 0, MDIO_ATTEMPTS, 20);</div><div class='add'>+	ret = t3_wait_op_done(adapter, A_MI1_OP, F_BUSY, 0, MDIO_ATTEMPTS, 10);</div><div class='ctx'> 	mutex_unlock(&amp;adapter-&gt;mdio_lock);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct mdio_ops mi1_mdio_ops = {</div><div class='del'>-	mi1_read,</div><div class='del'>-	mi1_write</div><div class='add'>+	t3_mi1_read,</div><div class='add'>+	t3_mi1_write</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Performs the address cycle for clause 45 PHYs.</div><div class='add'>+ * Must be called with the MDIO_LOCK held.</div><div class='add'>+ */</div><div class='add'>+static int mi1_wr_addr(struct adapter *adapter, int phy_addr, int mmd_addr,</div><div class='add'>+		       int reg_addr)</div><div class='add'>+{</div><div class='add'>+	u32 addr = V_REGADDR(mmd_addr) | V_PHYADDR(phy_addr);</div><div class='add'>+</div><div class='add'>+	t3_set_reg_field(adapter, A_MI1_CFG, V_ST(M_ST), 0);</div><div class='add'>+	t3_write_reg(adapter, A_MI1_ADDR, addr);</div><div class='add'>+	t3_write_reg(adapter, A_MI1_DATA, reg_addr);</div><div class='add'>+	t3_write_reg(adapter, A_MI1_OP, V_MDI_OP(0));</div><div class='add'>+	return t3_wait_op_done(adapter, A_MI1_OP, F_BUSY, 0,</div><div class='add'>+			       MDIO_ATTEMPTS, 10);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * MI1 read/write operations for indirect-addressed PHYs.</div><div class='ctx'>  */</div><div class='ctx'> static int mi1_ext_read(struct adapter *adapter, int phy_addr, int mmd_addr,</div><div class='ctx'> 			int reg_addr, unsigned int *valp)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	u32 addr = V_REGADDR(mmd_addr) | V_PHYADDR(phy_addr);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;adapter-&gt;mdio_lock);</div><div class='del'>-	t3_write_reg(adapter, A_MI1_ADDR, addr);</div><div class='del'>-	t3_write_reg(adapter, A_MI1_DATA, reg_addr);</div><div class='del'>-	t3_write_reg(adapter, A_MI1_OP, V_MDI_OP(0));</div><div class='del'>-	ret = t3_wait_op_done(adapter, A_MI1_OP, F_BUSY, 0, MDIO_ATTEMPTS, 20);</div><div class='add'>+	ret = mi1_wr_addr(adapter, phy_addr, mmd_addr, reg_addr);</div><div class='ctx'> 	if (!ret) {</div><div class='ctx'> 		t3_write_reg(adapter, A_MI1_OP, V_MDI_OP(3));</div><div class='ctx'> 		ret = t3_wait_op_done(adapter, A_MI1_OP, F_BUSY, 0,</div><div class='del'>-				      MDIO_ATTEMPTS, 20);</div><div class='add'>+				      MDIO_ATTEMPTS, 10);</div><div class='ctx'> 		if (!ret)</div><div class='ctx'> 			*valp = t3_read_reg(adapter, A_MI1_DATA);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -278,18 +290,14 @@ static int mi1_ext_write(struct adapter *adapter, int phy_addr, int mmd_addr,</div><div class='ctx'> 			 int reg_addr, unsigned int val)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	u32 addr = V_REGADDR(mmd_addr) | V_PHYADDR(phy_addr);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;adapter-&gt;mdio_lock);</div><div class='del'>-	t3_write_reg(adapter, A_MI1_ADDR, addr);</div><div class='del'>-	t3_write_reg(adapter, A_MI1_DATA, reg_addr);</div><div class='del'>-	t3_write_reg(adapter, A_MI1_OP, V_MDI_OP(0));</div><div class='del'>-	ret = t3_wait_op_done(adapter, A_MI1_OP, F_BUSY, 0, MDIO_ATTEMPTS, 20);</div><div class='add'>+	ret = mi1_wr_addr(adapter, phy_addr, mmd_addr, reg_addr);</div><div class='ctx'> 	if (!ret) {</div><div class='ctx'> 		t3_write_reg(adapter, A_MI1_DATA, val);</div><div class='ctx'> 		t3_write_reg(adapter, A_MI1_OP, V_MDI_OP(1));</div><div class='ctx'> 		ret = t3_wait_op_done(adapter, A_MI1_OP, F_BUSY, 0,</div><div class='del'>-				      MDIO_ATTEMPTS, 20);</div><div class='add'>+				      MDIO_ATTEMPTS, 10);</div><div class='ctx'> 	}</div><div class='ctx'> 	mutex_unlock(&amp;adapter-&gt;mdio_lock);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -400,6 +408,29 @@ int t3_phy_advertise(struct cphy *phy, unsigned int advert)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ *	t3_phy_advertise_fiber - set fiber PHY advertisement register</div><div class='add'>+ *	@phy: the PHY to operate on</div><div class='add'>+ *	@advert: bitmap of capabilities the PHY should advertise</div><div class='add'>+ *</div><div class='add'>+ *	Sets a fiber PHY's advertisement register to advertise the</div><div class='add'>+ *	requested capabilities.</div><div class='add'>+ */</div><div class='add'>+int t3_phy_advertise_fiber(struct cphy *phy, unsigned int advert)</div><div class='add'>+{</div><div class='add'>+	unsigned int val = 0;</div><div class='add'>+</div><div class='add'>+	if (advert &amp; ADVERTISED_1000baseT_Half)</div><div class='add'>+		val |= ADVERTISE_1000XHALF;</div><div class='add'>+	if (advert &amp; ADVERTISED_1000baseT_Full)</div><div class='add'>+		val |= ADVERTISE_1000XFULL;</div><div class='add'>+	if (advert &amp; ADVERTISED_Pause)</div><div class='add'>+		val |= ADVERTISE_1000XPAUSE;</div><div class='add'>+	if (advert &amp; ADVERTISED_Asym_Pause)</div><div class='add'>+		val |= ADVERTISE_1000XPSE_ASYM;</div><div class='add'>+	return mdio_write(phy, 0, MII_ADVERTISE, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  *	t3_set_phy_speed_duplex - force PHY speed and duplex</div><div class='ctx'>  *	@phy: the PHY to operate on</div><div class='ctx'>  *	@speed: requested PHY speed</div><div class='hunk'>@@ -434,27 +465,52 @@ int t3_set_phy_speed_duplex(struct cphy *phy, int speed, int duplex)</div><div class='ctx'> 	return mdio_write(phy, 0, MII_BMCR, ctl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int t3_phy_lasi_intr_enable(struct cphy *phy)</div><div class='add'>+{</div><div class='add'>+	return mdio_write(phy, MDIO_DEV_PMA_PMD, LASI_CTRL, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int t3_phy_lasi_intr_disable(struct cphy *phy)</div><div class='add'>+{</div><div class='add'>+	return mdio_write(phy, MDIO_DEV_PMA_PMD, LASI_CTRL, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int t3_phy_lasi_intr_clear(struct cphy *phy)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	return mdio_read(phy, MDIO_DEV_PMA_PMD, LASI_STAT, &amp;val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int t3_phy_lasi_intr_handler(struct cphy *phy)</div><div class='add'>+{</div><div class='add'>+	unsigned int status;</div><div class='add'>+	int err = mdio_read(phy, MDIO_DEV_PMA_PMD, LASI_STAT, &amp;status);</div><div class='add'>+</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+	return (status &amp; 1) ?  cphy_cause_link_change : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct adapter_info t3_adap_info[] = {</div><div class='del'>-	{2, 0, 0, 0,</div><div class='add'>+	{2, 0,</div><div class='ctx'> 	 F_GPIO2_OEN | F_GPIO4_OEN |</div><div class='del'>-	 F_GPIO2_OUT_VAL | F_GPIO4_OUT_VAL, F_GPIO3 | F_GPIO5,</div><div class='del'>-	 0,</div><div class='add'>+	 F_GPIO2_OUT_VAL | F_GPIO4_OUT_VAL, { S_GPIO3, S_GPIO5 }, 0,</div><div class='ctx'> 	 &amp;mi1_mdio_ops, "Chelsio PE9000"},</div><div class='del'>-	{2, 0, 0, 0,</div><div class='add'>+	{2, 0,</div><div class='ctx'> 	 F_GPIO2_OEN | F_GPIO4_OEN |</div><div class='del'>-	 F_GPIO2_OUT_VAL | F_GPIO4_OUT_VAL, F_GPIO3 | F_GPIO5,</div><div class='del'>-	 0,</div><div class='add'>+	 F_GPIO2_OUT_VAL | F_GPIO4_OUT_VAL, { S_GPIO3, S_GPIO5 }, 0,</div><div class='ctx'> 	 &amp;mi1_mdio_ops, "Chelsio T302"},</div><div class='del'>-	{1, 0, 0, 0,</div><div class='add'>+	{1, 0,</div><div class='ctx'> 	 F_GPIO1_OEN | F_GPIO6_OEN | F_GPIO7_OEN | F_GPIO10_OEN |</div><div class='ctx'> 	 F_GPIO11_OEN | F_GPIO1_OUT_VAL | F_GPIO6_OUT_VAL | F_GPIO10_OUT_VAL,</div><div class='del'>-	 0, SUPPORTED_10000baseT_Full | SUPPORTED_AUI,</div><div class='add'>+	 { 0 }, SUPPORTED_10000baseT_Full | SUPPORTED_AUI,</div><div class='ctx'> 	 &amp;mi1_mdio_ext_ops, "Chelsio T310"},</div><div class='del'>-	{2, 0, 0, 0,</div><div class='add'>+	{2, 0,</div><div class='ctx'> 	 F_GPIO1_OEN | F_GPIO2_OEN | F_GPIO4_OEN | F_GPIO5_OEN | F_GPIO6_OEN |</div><div class='ctx'> 	 F_GPIO7_OEN | F_GPIO10_OEN | F_GPIO11_OEN | F_GPIO1_OUT_VAL |</div><div class='del'>-	 F_GPIO5_OUT_VAL | F_GPIO6_OUT_VAL | F_GPIO10_OUT_VAL, 0,</div><div class='del'>-	 SUPPORTED_10000baseT_Full | SUPPORTED_AUI,</div><div class='add'>+	 F_GPIO5_OUT_VAL | F_GPIO6_OUT_VAL | F_GPIO10_OUT_VAL,</div><div class='add'>+	 { S_GPIO9, S_GPIO3 }, SUPPORTED_10000baseT_Full | SUPPORTED_AUI,</div><div class='ctx'> 	 &amp;mi1_mdio_ext_ops, "Chelsio T320"},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -467,29 +523,23 @@ const struct adapter_info *t3_get_adapter_info(unsigned int id)</div><div class='ctx'> 	return id &lt; ARRAY_SIZE(t3_adap_info) ? &amp;t3_adap_info[id] : NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define CAPS_1G (SUPPORTED_10baseT_Full | SUPPORTED_100baseT_Full | \</div><div class='del'>-		 SUPPORTED_1000baseT_Full | SUPPORTED_Autoneg | SUPPORTED_MII)</div><div class='del'>-#define CAPS_10G (SUPPORTED_10000baseT_Full | SUPPORTED_AUI)</div><div class='add'>+struct port_type_info {</div><div class='add'>+	int (*phy_prep)(struct cphy *phy, struct adapter *adapter,</div><div class='add'>+			int phy_addr, const struct mdio_ops *ops);</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> static const struct port_type_info port_types[] = {</div><div class='del'>-	{NULL},</div><div class='del'>-	{t3_ael1002_phy_prep, CAPS_10G | SUPPORTED_FIBRE,</div><div class='del'>-	 "10GBASE-XR"},</div><div class='del'>-	{t3_vsc8211_phy_prep, CAPS_1G | SUPPORTED_TP | SUPPORTED_IRQ,</div><div class='del'>-	 "10/100/1000BASE-T"},</div><div class='del'>-	{NULL, CAPS_1G | SUPPORTED_TP | SUPPORTED_IRQ,</div><div class='del'>-	 "10/100/1000BASE-T"},</div><div class='del'>-	{t3_xaui_direct_phy_prep, CAPS_10G | SUPPORTED_TP, "10GBASE-CX4"},</div><div class='del'>-	{NULL, CAPS_10G, "10GBASE-KX4"},</div><div class='del'>-	{t3_qt2045_phy_prep, CAPS_10G | SUPPORTED_TP, "10GBASE-CX4"},</div><div class='del'>-	{t3_ael1006_phy_prep, CAPS_10G | SUPPORTED_FIBRE,</div><div class='del'>-	 "10GBASE-SR"},</div><div class='del'>-	{NULL, CAPS_10G | SUPPORTED_TP, "10GBASE-CX4"},</div><div class='add'>+	{ NULL },</div><div class='add'>+	{ t3_ael1002_phy_prep },</div><div class='add'>+	{ t3_vsc8211_phy_prep },</div><div class='add'>+	{ NULL},</div><div class='add'>+	{ t3_xaui_direct_phy_prep },</div><div class='add'>+	{ t3_ael2005_phy_prep },</div><div class='add'>+	{ t3_qt2045_phy_prep },</div><div class='add'>+	{ t3_ael1006_phy_prep },</div><div class='add'>+	{ NULL },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#undef CAPS_1G</div><div class='del'>-#undef CAPS_10G</div><div class='del'>-</div><div class='ctx'> #define VPD_ENTRY(name, len) \</div><div class='ctx'> 	u8 name##_kword[2]; u8 name##_len; u8 name##_data[len]</div><div class='ctx'> </div><div class='hunk'>@@ -1132,6 +1182,15 @@ void t3_link_changed(struct adapter *adapter, int port_id)</div><div class='ctx'> </div><div class='ctx'> 	phy-&gt;ops-&gt;get_link_status(phy, &amp;link_ok, &amp;speed, &amp;duplex, &amp;fc);</div><div class='ctx'> </div><div class='add'>+	if (lc-&gt;requested_fc &amp; PAUSE_AUTONEG)</div><div class='add'>+		fc &amp;= lc-&gt;requested_fc;</div><div class='add'>+	else</div><div class='add'>+		fc = lc-&gt;requested_fc &amp; (PAUSE_RX | PAUSE_TX);</div><div class='add'>+</div><div class='add'>+	if (link_ok == lc-&gt;link_ok &amp;&amp; speed == lc-&gt;speed &amp;&amp;</div><div class='add'>+	    duplex == lc-&gt;duplex &amp;&amp; fc == lc-&gt;fc)</div><div class='add'>+		return;                            /* nothing changed */</div><div class='add'>+</div><div class='ctx'> 	if (link_ok != lc-&gt;link_ok &amp;&amp; adapter-&gt;params.rev &gt; 0 &amp;&amp;</div><div class='ctx'> 	    uses_xaui(adapter)) {</div><div class='ctx'> 		if (link_ok)</div><div class='hunk'>@@ -1142,10 +1201,6 @@ void t3_link_changed(struct adapter *adapter, int port_id)</div><div class='ctx'> 	lc-&gt;link_ok = link_ok;</div><div class='ctx'> 	lc-&gt;speed = speed &lt; 0 ? SPEED_INVALID : speed;</div><div class='ctx'> 	lc-&gt;duplex = duplex &lt; 0 ? DUPLEX_INVALID : duplex;</div><div class='del'>-	if (lc-&gt;requested_fc &amp; PAUSE_AUTONEG)</div><div class='del'>-		fc &amp;= lc-&gt;requested_fc;</div><div class='del'>-	else</div><div class='del'>-		fc = lc-&gt;requested_fc &amp; (PAUSE_RX | PAUSE_TX);</div><div class='ctx'> </div><div class='ctx'> 	if (link_ok &amp;&amp; speed &gt;= 0 &amp;&amp; lc-&gt;autoneg == AUTONEG_ENABLE) {</div><div class='ctx'> 		/* Set MAC speed, duplex, and flow control to match PHY. */</div><div class='hunk'>@@ -1191,7 +1246,6 @@ int t3_link_start(struct cphy *phy, struct cmac *mac, struct link_config *lc)</div><div class='ctx'> 						   fc);</div><div class='ctx'> 			/* Also disables autoneg */</div><div class='ctx'> 			phy-&gt;ops-&gt;set_speed_duplex(phy, lc-&gt;speed, lc-&gt;duplex);</div><div class='del'>-			phy-&gt;ops-&gt;reset(phy, 0);</div><div class='ctx'> 		} else</div><div class='ctx'> 			phy-&gt;ops-&gt;autoneg_enable(phy);</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -1221,7 +1275,7 @@ struct intr_info {</div><div class='ctx'> 	unsigned int mask;	/* bits to check in interrupt status */</div><div class='ctx'> 	const char *msg;	/* message to print or NULL */</div><div class='ctx'> 	short stat_idx;		/* stat counter to increment or -1 */</div><div class='del'>-	unsigned short fatal:1;	/* whether the condition reported is fatal */</div><div class='add'>+	unsigned short fatal;	/* whether the condition reported is fatal */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1682,25 +1736,23 @@ static int mac_intr_handler(struct adapter *adap, unsigned int idx)</div><div class='ctx'>  */</div><div class='ctx'> int t3_phy_intr_handler(struct adapter *adapter)</div><div class='ctx'> {</div><div class='del'>-	u32 mask, gpi = adapter_info(adapter)-&gt;gpio_intr;</div><div class='ctx'> 	u32 i, cause = t3_read_reg(adapter, A_T3DBG_INT_CAUSE);</div><div class='ctx'> </div><div class='ctx'> 	for_each_port(adapter, i) {</div><div class='ctx'> 		struct port_info *p = adap2pinfo(adapter, i);</div><div class='ctx'> </div><div class='del'>-		mask = gpi - (gpi &amp; (gpi - 1));</div><div class='del'>-		gpi -= mask;</div><div class='del'>-</div><div class='del'>-		if (!(p-&gt;port_type-&gt;caps &amp; SUPPORTED_IRQ))</div><div class='add'>+		if (!(p-&gt;phy.caps &amp; SUPPORTED_IRQ))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (cause &amp; mask) {</div><div class='add'>+		if (cause &amp; (1 &lt;&lt; adapter_info(adapter)-&gt;gpio_intr[i])) {</div><div class='ctx'> 			int phy_cause = p-&gt;phy.ops-&gt;intr_handler(&amp;p-&gt;phy);</div><div class='ctx'> </div><div class='ctx'> 			if (phy_cause &amp; cphy_cause_link_change)</div><div class='ctx'> 				t3_link_changed(adapter, i);</div><div class='ctx'> 			if (phy_cause &amp; cphy_cause_fifo_error)</div><div class='ctx'> 				p-&gt;phy.fifo_errors++;</div><div class='add'>+			if (phy_cause &amp; cphy_cause_module_change)</div><div class='add'>+				t3_os_phymod_changed(adapter, i);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1763,6 +1815,17 @@ int t3_slow_intr_handler(struct adapter *adapter)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static unsigned int calc_gpio_intr(struct adapter *adap)</div><div class='add'>+{</div><div class='add'>+	unsigned int i, gpi_intr = 0;</div><div class='add'>+</div><div class='add'>+	for_each_port(adap, i)</div><div class='add'>+		if ((adap2pinfo(adap, i)-&gt;phy.caps &amp; SUPPORTED_IRQ) &amp;&amp;</div><div class='add'>+		    adapter_info(adap)-&gt;gpio_intr[i])</div><div class='add'>+			gpi_intr |= 1 &lt;&lt; adapter_info(adap)-&gt;gpio_intr[i];</div><div class='add'>+	return gpi_intr;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  *	t3_intr_enable - enable interrupts</div><div class='ctx'>  *	@adapter: the adapter whose interrupts should be enabled</div><div class='hunk'>@@ -1805,10 +1868,8 @@ void t3_intr_enable(struct adapter *adapter)</div><div class='ctx'> 		t3_write_reg(adapter, A_ULPTX_INT_ENABLE, ULPTX_INTR_MASK);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	t3_write_reg(adapter, A_T3DBG_GPIO_ACT_LOW,</div><div class='del'>-		     adapter_info(adapter)-&gt;gpio_intr);</div><div class='del'>-	t3_write_reg(adapter, A_T3DBG_INT_ENABLE,</div><div class='del'>-		     adapter_info(adapter)-&gt;gpio_intr);</div><div class='add'>+	t3_write_reg(adapter, A_T3DBG_INT_ENABLE, calc_gpio_intr(adapter));</div><div class='add'>+</div><div class='ctx'> 	if (is_pcie(adapter))</div><div class='ctx'> 		t3_write_reg(adapter, A_PCIE_INT_ENABLE, PCIE_INTR_MASK);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -3329,6 +3390,8 @@ int t3_init_hw(struct adapter *adapter, u32 fw_params)</div><div class='ctx'> 	init_hw_for_avail_ports(adapter, adapter-&gt;params.nports);</div><div class='ctx'> 	t3_sge_init(adapter, &amp;adapter-&gt;params.sge);</div><div class='ctx'> </div><div class='add'>+	t3_write_reg(adapter, A_T3DBG_GPIO_ACT_LOW, calc_gpio_intr(adapter));</div><div class='add'>+</div><div class='ctx'> 	t3_write_reg(adapter, A_CIM_HOST_ACC_DATA, vpd-&gt;uclk | fw_params);</div><div class='ctx'> 	t3_write_reg(adapter, A_CIM_BOOT_CFG,</div><div class='ctx'> 		     V_BOOTADDR(FW_FLASH_BOOT_ADDR &gt;&gt; 2));</div><div class='hunk'>@@ -3488,7 +3551,7 @@ void early_hw_init(struct adapter *adapter, const struct adapter_info *ai)</div><div class='ctx'>  * Older PCIe cards lose their config space during reset, PCI-X</div><div class='ctx'>  * ones don't.</div><div class='ctx'>  */</div><div class='del'>-static int t3_reset_adapter(struct adapter *adapter)</div><div class='add'>+int t3_reset_adapter(struct adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	int i, save_and_restore_pcie =</div><div class='ctx'> 	    adapter-&gt;params.rev &lt; T3_REV_B2 &amp;&amp; is_pcie(adapter);</div><div class='hunk'>@@ -3556,7 +3619,7 @@ int t3_prep_adapter(struct adapter *adapter, const struct adapter_info *ai,</div><div class='ctx'> 		    int reset)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	unsigned int i, j = 0;</div><div class='add'>+	unsigned int i, j = -1;</div><div class='ctx'> </div><div class='ctx'> 	get_pci_mode(adapter, &amp;adapter-&gt;params.pci);</div><div class='ctx'> </div><div class='hunk'>@@ -3620,16 +3683,18 @@ int t3_prep_adapter(struct adapter *adapter, const struct adapter_info *ai,</div><div class='ctx'> </div><div class='ctx'> 	for_each_port(adapter, i) {</div><div class='ctx'> 		u8 hw_addr[6];</div><div class='add'>+		const struct port_type_info *pti;</div><div class='ctx'> 		struct port_info *p = adap2pinfo(adapter, i);</div><div class='ctx'> </div><div class='del'>-		while (!adapter-&gt;params.vpd.port_type[j])</div><div class='del'>-			++j;</div><div class='add'>+		while (!adapter-&gt;params.vpd.port_type[++j])</div><div class='add'>+			;</div><div class='ctx'> </div><div class='del'>-		p-&gt;port_type = &amp;port_types[adapter-&gt;params.vpd.port_type[j]];</div><div class='del'>-		p-&gt;port_type-&gt;phy_prep(&amp;p-&gt;phy, adapter, ai-&gt;phy_base_addr + j,</div><div class='del'>-				       ai-&gt;mdio_ops);</div><div class='add'>+		pti = &amp;port_types[adapter-&gt;params.vpd.port_type[j]];</div><div class='add'>+		ret = pti-&gt;phy_prep(&amp;p-&gt;phy, adapter, ai-&gt;phy_base_addr + j,</div><div class='add'>+				    ai-&gt;mdio_ops);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='ctx'> 		mac_prep(&amp;p-&gt;mac, adapter, j);</div><div class='del'>-		++j;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * The VPD EEPROM stores the base Ethernet address for the</div><div class='hunk'>@@ -3643,9 +3708,9 @@ int t3_prep_adapter(struct adapter *adapter, const struct adapter_info *ai,</div><div class='ctx'> 		       ETH_ALEN);</div><div class='ctx'> 		memcpy(adapter-&gt;port[i]-&gt;perm_addr, hw_addr,</div><div class='ctx'> 		       ETH_ALEN);</div><div class='del'>-		init_link_config(&amp;p-&gt;link_config, p-&gt;port_type-&gt;caps);</div><div class='add'>+		init_link_config(&amp;p-&gt;link_config, p-&gt;phy.caps);</div><div class='ctx'> 		p-&gt;phy.ops-&gt;power_down(&amp;p-&gt;phy, 1);</div><div class='del'>-		if (!(p-&gt;port_type-&gt;caps &amp; SUPPORTED_IRQ))</div><div class='add'>+		if (!(p-&gt;phy.caps &amp; SUPPORTED_IRQ))</div><div class='ctx'> 			adapter-&gt;params.linkpoll_period = 10;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3661,7 +3726,7 @@ void t3_led_ready(struct adapter *adapter)</div><div class='ctx'> int t3_replay_prep_adapter(struct adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	const struct adapter_info *ai = adapter-&gt;params.info;</div><div class='del'>-	unsigned int i, j = 0;</div><div class='add'>+	unsigned int i, j = -1;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	early_hw_init(adapter, ai);</div><div class='hunk'>@@ -3670,15 +3735,17 @@ int t3_replay_prep_adapter(struct adapter *adapter)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	for_each_port(adapter, i) {</div><div class='add'>+		const struct port_type_info *pti;</div><div class='ctx'> 		struct port_info *p = adap2pinfo(adapter, i);</div><div class='del'>-		while (!adapter-&gt;params.vpd.port_type[j])</div><div class='del'>-			++j;</div><div class='ctx'> </div><div class='del'>-		p-&gt;port_type-&gt;phy_prep(&amp;p-&gt;phy, adapter, ai-&gt;phy_base_addr + j,</div><div class='del'>-					ai-&gt;mdio_ops);</div><div class='add'>+		while (!adapter-&gt;params.vpd.port_type[++j])</div><div class='add'>+			;</div><div class='ctx'> </div><div class='add'>+		pti = &amp;port_types[adapter-&gt;params.vpd.port_type[j]];</div><div class='add'>+		ret = pti-&gt;phy_prep(&amp;p-&gt;phy, adapter, p-&gt;phy.addr, NULL);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='ctx'> 		p-&gt;phy.ops-&gt;power_down(&amp;p-&gt;phy, 1);</div><div class='del'>-		++j;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> return 0;</div><div class='head'>diff --git a/drivers/net/cxgb3/t3cdev.h b/drivers/net/cxgb3/t3cdev.h<br/>index 0a21cfbd2b21..be55e9ae74d1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/cxgb3/t3cdev.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/cxgb3/t3cdev.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/cxgb3/t3cdev.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/cxgb3/t3cdev.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2006-2007 Chelsio Communications.  All rights reserved.</div><div class='add'>+ * Copyright (C) 2006-2008 Chelsio Communications.  All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * This software is available to you under a choice of one of two</div><div class='ctx'>  * licenses.  You may choose to be licensed under the terms of the GNU</div><div class='head'>diff --git a/drivers/net/cxgb3/version.h b/drivers/net/cxgb3/version.h<br/>index 29db711303b9..bb8698a86754 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/cxgb3/version.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/cxgb3/version.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/cxgb3/version.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/cxgb3/version.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * Copyright (c) 2003-2007 Chelsio, Inc. All rights reserved.</div><div class='add'>+ * Copyright (c) 2003-2008 Chelsio, Inc. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * This software is available to you under a choice of one of two</div><div class='ctx'>  * licenses.  You may choose to be licensed under the terms of the GNU</div><div class='hunk'>@@ -35,7 +35,7 @@</div><div class='ctx'> #define DRV_DESC "Chelsio T3 Network Driver"</div><div class='ctx'> #define DRV_NAME "cxgb3"</div><div class='ctx'> /* Driver version */</div><div class='del'>-#define DRV_VERSION "1.0-ko"</div><div class='add'>+#define DRV_VERSION "1.1.0-ko"</div><div class='ctx'> </div><div class='ctx'> /* Firmware version */</div><div class='ctx'> #define FW_VERSION_MAJOR 7</div><div class='head'>diff --git a/drivers/net/cxgb3/vsc8211.c b/drivers/net/cxgb3/vsc8211.c<br/>index eee4285b31be..33f956bd6b59 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/cxgb3/vsc8211.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/cxgb3/vsc8211.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/cxgb3/vsc8211.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/cxgb3/vsc8211.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * Copyright (c) 2005-2007 Chelsio, Inc. All rights reserved.</div><div class='add'>+ * Copyright (c) 2005-2008 Chelsio, Inc. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * This software is available to you under a choice of one of two</div><div class='ctx'>  * licenses.  You may choose to be licensed under the terms of the GNU</div><div class='hunk'>@@ -33,28 +33,40 @@</div><div class='ctx'> </div><div class='ctx'> /* VSC8211 PHY specific registers. */</div><div class='ctx'> enum {</div><div class='add'>+	VSC8211_SIGDET_CTRL = 19,</div><div class='add'>+	VSC8211_EXT_CTRL = 23,</div><div class='ctx'> 	VSC8211_INTR_ENABLE = 25,</div><div class='ctx'> 	VSC8211_INTR_STATUS = 26,</div><div class='add'>+	VSC8211_LED_CTRL = 27,</div><div class='ctx'> 	VSC8211_AUX_CTRL_STAT = 28,</div><div class='add'>+	VSC8211_EXT_PAGE_AXS = 31,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='ctx'> 	VSC_INTR_RX_ERR = 1 &lt;&lt; 0,</div><div class='del'>-	VSC_INTR_MS_ERR = 1 &lt;&lt; 1,	/* master/slave resolution error */</div><div class='del'>-	VSC_INTR_CABLE = 1 &lt;&lt; 2,	/* cable impairment */</div><div class='del'>-	VSC_INTR_FALSE_CARR = 1 &lt;&lt; 3,	/* false carrier */</div><div class='del'>-	VSC_INTR_MEDIA_CHG = 1 &lt;&lt; 4,	/* AMS media change */</div><div class='del'>-	VSC_INTR_RX_FIFO = 1 &lt;&lt; 5,	/* Rx FIFO over/underflow */</div><div class='del'>-	VSC_INTR_TX_FIFO = 1 &lt;&lt; 6,	/* Tx FIFO over/underflow */</div><div class='del'>-	VSC_INTR_DESCRAMBL = 1 &lt;&lt; 7,	/* descrambler lock-lost */</div><div class='del'>-	VSC_INTR_SYMBOL_ERR = 1 &lt;&lt; 8,	/* symbol error */</div><div class='del'>-	VSC_INTR_NEG_DONE = 1 &lt;&lt; 10,	/* autoneg done */</div><div class='del'>-	VSC_INTR_NEG_ERR = 1 &lt;&lt; 11,	/* autoneg error */</div><div class='del'>-	VSC_INTR_LINK_CHG = 1 &lt;&lt; 13,	/* link change */</div><div class='del'>-	VSC_INTR_ENABLE = 1 &lt;&lt; 15,	/* interrupt enable */</div><div class='add'>+	VSC_INTR_MS_ERR = 1 &lt;&lt; 1,  /* master/slave resolution error */</div><div class='add'>+	VSC_INTR_CABLE = 1 &lt;&lt; 2,  /* cable impairment */</div><div class='add'>+	VSC_INTR_FALSE_CARR = 1 &lt;&lt; 3,  /* false carrier */</div><div class='add'>+	VSC_INTR_MEDIA_CHG = 1 &lt;&lt; 4,  /* AMS media change */</div><div class='add'>+	VSC_INTR_RX_FIFO = 1 &lt;&lt; 5,  /* Rx FIFO over/underflow */</div><div class='add'>+	VSC_INTR_TX_FIFO = 1 &lt;&lt; 6,  /* Tx FIFO over/underflow */</div><div class='add'>+	VSC_INTR_DESCRAMBL = 1 &lt;&lt; 7,  /* descrambler lock-lost */</div><div class='add'>+	VSC_INTR_SYMBOL_ERR = 1 &lt;&lt; 8,  /* symbol error */</div><div class='add'>+	VSC_INTR_NEG_DONE = 1 &lt;&lt; 10, /* autoneg done */</div><div class='add'>+	VSC_INTR_NEG_ERR = 1 &lt;&lt; 11, /* autoneg error */</div><div class='add'>+	VSC_INTR_DPLX_CHG = 1 &lt;&lt; 12, /* duplex change */</div><div class='add'>+	VSC_INTR_LINK_CHG = 1 &lt;&lt; 13, /* link change */</div><div class='add'>+	VSC_INTR_SPD_CHG = 1 &lt;&lt; 14, /* speed change */</div><div class='add'>+	VSC_INTR_ENABLE = 1 &lt;&lt; 15, /* interrupt enable */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	VSC_CTRL_CLAUSE37_VIEW = 1 &lt;&lt; 4,   /* Switch to Clause 37 view */</div><div class='add'>+	VSC_CTRL_MEDIA_MODE_HI = 0xf000    /* High part of media mode select */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define CFG_CHG_INTR_MASK (VSC_INTR_LINK_CHG | VSC_INTR_NEG_ERR | \</div><div class='add'>+			   VSC_INTR_DPLX_CHG | VSC_INTR_SPD_CHG | \</div><div class='ctx'> 	 		   VSC_INTR_NEG_DONE)</div><div class='ctx'> #define INTR_MASK (CFG_CHG_INTR_MASK | VSC_INTR_TX_FIFO | VSC_INTR_RX_FIFO | \</div><div class='ctx'> 		   VSC_INTR_ENABLE)</div><div class='hunk'>@@ -184,6 +196,112 @@ static int vsc8211_get_link_status(struct cphy *cphy, int *link_ok,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int vsc8211_get_link_status_fiber(struct cphy *cphy, int *link_ok,</div><div class='add'>+					 int *speed, int *duplex, int *fc)</div><div class='add'>+{</div><div class='add'>+	unsigned int bmcr, status, lpa, adv;</div><div class='add'>+	int err, sp = -1, dplx = -1, pause = 0;</div><div class='add'>+</div><div class='add'>+	err = mdio_read(cphy, 0, MII_BMCR, &amp;bmcr);</div><div class='add'>+	if (!err)</div><div class='add'>+		err = mdio_read(cphy, 0, MII_BMSR, &amp;status);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (link_ok) {</div><div class='add'>+		/*</div><div class='add'>+		 * BMSR_LSTATUS is latch-low, so if it is 0 we need to read it</div><div class='add'>+		 * once more to get the current link state.</div><div class='add'>+		 */</div><div class='add'>+		if (!(status &amp; BMSR_LSTATUS))</div><div class='add'>+			err = mdio_read(cphy, 0, MII_BMSR, &amp;status);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+		*link_ok = (status &amp; BMSR_LSTATUS) != 0;</div><div class='add'>+	}</div><div class='add'>+	if (!(bmcr &amp; BMCR_ANENABLE)) {</div><div class='add'>+		dplx = (bmcr &amp; BMCR_FULLDPLX) ? DUPLEX_FULL : DUPLEX_HALF;</div><div class='add'>+		if (bmcr &amp; BMCR_SPEED1000)</div><div class='add'>+			sp = SPEED_1000;</div><div class='add'>+		else if (bmcr &amp; BMCR_SPEED100)</div><div class='add'>+			sp = SPEED_100;</div><div class='add'>+		else</div><div class='add'>+			sp = SPEED_10;</div><div class='add'>+	} else if (status &amp; BMSR_ANEGCOMPLETE) {</div><div class='add'>+		err = mdio_read(cphy, 0, MII_LPA, &amp;lpa);</div><div class='add'>+		if (!err)</div><div class='add'>+			err = mdio_read(cphy, 0, MII_ADVERTISE, &amp;adv);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		if (adv &amp; lpa &amp; ADVERTISE_1000XFULL) {</div><div class='add'>+			dplx = DUPLEX_FULL;</div><div class='add'>+			sp = SPEED_1000;</div><div class='add'>+		} else if (adv &amp; lpa &amp; ADVERTISE_1000XHALF) {</div><div class='add'>+			dplx = DUPLEX_HALF;</div><div class='add'>+			sp = SPEED_1000;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (fc &amp;&amp; dplx == DUPLEX_FULL) {</div><div class='add'>+			if (lpa &amp; adv &amp; ADVERTISE_1000XPAUSE)</div><div class='add'>+				pause = PAUSE_RX | PAUSE_TX;</div><div class='add'>+			else if ((lpa &amp; ADVERTISE_1000XPAUSE) &amp;&amp;</div><div class='add'>+				 (adv &amp; lpa &amp; ADVERTISE_1000XPSE_ASYM))</div><div class='add'>+				pause = PAUSE_TX;</div><div class='add'>+			else if ((lpa &amp; ADVERTISE_1000XPSE_ASYM) &amp;&amp;</div><div class='add'>+				 (adv &amp; ADVERTISE_1000XPAUSE))</div><div class='add'>+				pause = PAUSE_RX;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (speed)</div><div class='add'>+		*speed = sp;</div><div class='add'>+	if (duplex)</div><div class='add'>+		*duplex = dplx;</div><div class='add'>+	if (fc)</div><div class='add'>+		*fc = pause;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Enable/disable auto MDI/MDI-X in forced link speed mode.</div><div class='add'>+ */</div><div class='add'>+static int vsc8211_set_automdi(struct cphy *phy, int enable)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = mdio_write(phy, 0, VSC8211_EXT_PAGE_AXS, 0x52b5);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = mdio_write(phy, 0, 18, 0x12);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = mdio_write(phy, 0, 17, enable ? 0x2803 : 0x3003);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = mdio_write(phy, 0, 16, 0x87fa);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = mdio_write(phy, 0, VSC8211_EXT_PAGE_AXS, 0);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int vsc8211_set_speed_duplex(struct cphy *phy, int speed, int duplex)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = t3_set_phy_speed_duplex(phy, speed, duplex);</div><div class='add'>+	if (!err)</div><div class='add'>+		err = vsc8211_set_automdi(phy, 1);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int vsc8211_power_down(struct cphy *cphy, int enable)</div><div class='ctx'> {</div><div class='ctx'> 	return t3_mdio_change_bits(cphy, 0, MII_BMCR, BMCR_PDOWN,</div><div class='hunk'>@@ -221,8 +339,66 @@ static struct cphy_ops vsc8211_ops = {</div><div class='ctx'> 	.power_down = vsc8211_power_down,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-void t3_vsc8211_phy_prep(struct cphy *phy, struct adapter *adapter,</div><div class='del'>-			 int phy_addr, const struct mdio_ops *mdio_ops)</div><div class='add'>+static struct cphy_ops vsc8211_fiber_ops = {</div><div class='add'>+	.reset = vsc8211_reset,</div><div class='add'>+	.intr_enable = vsc8211_intr_enable,</div><div class='add'>+	.intr_disable = vsc8211_intr_disable,</div><div class='add'>+	.intr_clear = vsc8211_intr_clear,</div><div class='add'>+	.intr_handler = vsc8211_intr_handler,</div><div class='add'>+	.autoneg_enable = vsc8211_autoneg_enable,</div><div class='add'>+	.autoneg_restart = vsc8211_autoneg_restart,</div><div class='add'>+	.advertise = t3_phy_advertise_fiber,</div><div class='add'>+	.set_speed_duplex = t3_set_phy_speed_duplex,</div><div class='add'>+	.get_link_status = vsc8211_get_link_status_fiber,</div><div class='add'>+	.power_down = vsc8211_power_down,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int t3_vsc8211_phy_prep(struct cphy *phy, struct adapter *adapter,</div><div class='add'>+			int phy_addr, const struct mdio_ops *mdio_ops)</div><div class='ctx'> {</div><div class='del'>-	cphy_init(phy, adapter, phy_addr, &amp;vsc8211_ops, mdio_ops);</div><div class='add'>+	int err;</div><div class='add'>+	unsigned int val;</div><div class='add'>+</div><div class='add'>+	cphy_init(phy, adapter, phy_addr, &amp;vsc8211_ops, mdio_ops,</div><div class='add'>+		  SUPPORTED_10baseT_Full | SUPPORTED_100baseT_Full |</div><div class='add'>+		  SUPPORTED_1000baseT_Full | SUPPORTED_Autoneg | SUPPORTED_MII |</div><div class='add'>+		  SUPPORTED_TP | SUPPORTED_IRQ, "10/100/1000BASE-T");</div><div class='add'>+	msleep(20);       /* PHY needs ~10ms to start responding to MDIO */</div><div class='add'>+</div><div class='add'>+	err = mdio_read(phy, 0, VSC8211_EXT_CTRL, &amp;val);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+	if (val &amp; VSC_CTRL_MEDIA_MODE_HI) {</div><div class='add'>+		/* copper interface, just need to configure the LEDs */</div><div class='add'>+		return mdio_write(phy, 0, VSC8211_LED_CTRL, 0x100);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	phy-&gt;caps = SUPPORTED_1000baseT_Full | SUPPORTED_Autoneg |</div><div class='add'>+		    SUPPORTED_MII | SUPPORTED_FIBRE | SUPPORTED_IRQ;</div><div class='add'>+	phy-&gt;desc = "1000BASE-X";</div><div class='add'>+	phy-&gt;ops = &amp;vsc8211_fiber_ops;</div><div class='add'>+</div><div class='add'>+	err = mdio_write(phy, 0, VSC8211_EXT_PAGE_AXS, 1);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = mdio_write(phy, 0, VSC8211_SIGDET_CTRL, 1);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = mdio_write(phy, 0, VSC8211_EXT_PAGE_AXS, 0);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = mdio_write(phy, 0, VSC8211_EXT_CTRL,</div><div class='add'>+			 val | VSC_CTRL_CLAUSE37_VIEW);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = vsc8211_reset(phy, 0);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	udelay(5); /* delay after reset before next SMI */</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/cxgb3/xgmac.c b/drivers/net/cxgb3/xgmac.c<br/>index ffdc0a1892bd..9d7786937aad 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/cxgb3/xgmac.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/cxgb3/xgmac.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/cxgb3/xgmac.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/cxgb3/xgmac.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * Copyright (c) 2005-2007 Chelsio, Inc. All rights reserved.</div><div class='add'>+ * Copyright (c) 2005-2008 Chelsio, Inc. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * This software is available to you under a choice of one of two</div><div class='ctx'>  * licenses.  You may choose to be licensed under the terms of the GNU</div><div class='head'>diff --git a/drivers/net/e100.c b/drivers/net/e100.c<br/>index 5cf78d612c45..3d69fae781cf 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/e100.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/e100.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/e100.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/e100.c</a></div><div class='hunk'>@@ -191,7 +191,7 @@ MODULE_PARM_DESC(use_io, "Force use of i/o access mode");</div><div class='ctx'> #define DPRINTK(nlevel, klevel, fmt, args...) \</div><div class='ctx'> 	(void)((NETIF_MSG_##nlevel &amp; nic-&gt;msg_enable) &amp;&amp; \</div><div class='ctx'> 	printk(KERN_##klevel PFX "%s: %s: " fmt, nic-&gt;netdev-&gt;name, \</div><div class='del'>-		__FUNCTION__ , ## args))</div><div class='add'>+		__func__ , ## args))</div><div class='ctx'> </div><div class='ctx'> #define INTEL_8255X_ETHERNET_DEVICE(device_id, ich) {\</div><div class='ctx'> 	PCI_VENDOR_ID_INTEL, device_id, PCI_ANY_ID, PCI_ANY_ID, \</div><div class='head'>diff --git a/drivers/net/e1000/e1000.h b/drivers/net/e1000/e1000.h<br/>index 19e317eaf5bc..62f62970f978 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/e1000/e1000.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/e1000/e1000.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/e1000/e1000.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/e1000/e1000.h</a></div><div class='hunk'>@@ -155,8 +155,6 @@ do {									\</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #define E1000_MNG_VLAN_NONE (-1)</div><div class='del'>-/* Number of packet split data buffers (not including the header buffer) */</div><div class='del'>-#define PS_PAGE_BUFFERS (MAX_PS_BUFFERS - 1)</div><div class='ctx'> </div><div class='ctx'> /* wrapper around a pointer to a socket buffer,</div><div class='ctx'>  * so a DMA handle can be stored along with the buffer */</div><div class='hunk'>@@ -168,14 +166,6 @@ struct e1000_buffer {</div><div class='ctx'> 	u16 next_to_watch;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct e1000_ps_page {</div><div class='del'>-	struct page *ps_page[PS_PAGE_BUFFERS];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct e1000_ps_page_dma {</div><div class='del'>-	u64 ps_page_dma[PS_PAGE_BUFFERS];</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> struct e1000_tx_ring {</div><div class='ctx'> 	/* pointer to the descriptor ring memory */</div><div class='ctx'> 	void *desc;</div><div class='hunk'>@@ -213,9 +203,6 @@ struct e1000_rx_ring {</div><div class='ctx'> 	unsigned int next_to_clean;</div><div class='ctx'> 	/* array of buffer information structs */</div><div class='ctx'> 	struct e1000_buffer *buffer_info;</div><div class='del'>-	/* arrays of page information for packet split */</div><div class='del'>-	struct e1000_ps_page *ps_page;</div><div class='del'>-	struct e1000_ps_page_dma *ps_page_dma;</div><div class='ctx'> </div><div class='ctx'> 	/* cpu for rx queue */</div><div class='ctx'> 	int cpu;</div><div class='hunk'>@@ -228,8 +215,6 @@ struct e1000_rx_ring {</div><div class='ctx'> 	((((R)-&gt;next_to_clean &gt; (R)-&gt;next_to_use)			\</div><div class='ctx'> 	  ? 0 : (R)-&gt;count) + (R)-&gt;next_to_clean - (R)-&gt;next_to_use - 1)</div><div class='ctx'> </div><div class='del'>-#define E1000_RX_DESC_PS(R, i)						\</div><div class='del'>-	(&amp;(((union e1000_rx_desc_packet_split *)((R).desc))[i]))</div><div class='ctx'> #define E1000_RX_DESC_EXT(R, i)						\</div><div class='ctx'> 	(&amp;(((union e1000_rx_desc_extended *)((R).desc))[i]))</div><div class='ctx'> #define E1000_GET_DESC(R, i, type)	(&amp;(((struct type *)((R).desc))[i]))</div><div class='hunk'>@@ -311,10 +296,8 @@ struct e1000_adapter {</div><div class='ctx'> 	u32 rx_int_delay;</div><div class='ctx'> 	u32 rx_abs_int_delay;</div><div class='ctx'> 	bool rx_csum;</div><div class='del'>-	unsigned int rx_ps_pages;</div><div class='ctx'> 	u32 gorcl;</div><div class='ctx'> 	u64 gorcl_old;</div><div class='del'>-	u16 rx_ps_bsize0;</div><div class='ctx'> </div><div class='ctx'> 	/* OS defined structs */</div><div class='ctx'> 	struct net_device *netdev;</div><div class='head'>diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c<br/>index ad6da7b67e55..fac82152e4c8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/e1000/e1000_main.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/e1000/e1000_main.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/e1000/e1000_main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/e1000/e1000_main.c</a></div><div class='hunk'>@@ -137,15 +137,9 @@ static int e1000_clean(struct napi_struct *napi, int budget);</div><div class='ctx'> static bool e1000_clean_rx_irq(struct e1000_adapter *adapter,</div><div class='ctx'> 			       struct e1000_rx_ring *rx_ring,</div><div class='ctx'> 			       int *work_done, int work_to_do);</div><div class='del'>-static bool e1000_clean_rx_irq_ps(struct e1000_adapter *adapter,</div><div class='del'>-				  struct e1000_rx_ring *rx_ring,</div><div class='del'>-				  int *work_done, int work_to_do);</div><div class='ctx'> static void e1000_alloc_rx_buffers(struct e1000_adapter *adapter,</div><div class='ctx'>                                    struct e1000_rx_ring *rx_ring,</div><div class='ctx'> 				   int cleaned_count);</div><div class='del'>-static void e1000_alloc_rx_buffers_ps(struct e1000_adapter *adapter,</div><div class='del'>-                                      struct e1000_rx_ring *rx_ring,</div><div class='del'>-				      int cleaned_count);</div><div class='ctx'> static int e1000_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd);</div><div class='ctx'> static int e1000_mii_ioctl(struct net_device *netdev, struct ifreq *ifr,</div><div class='ctx'> 			   int cmd);</div><div class='hunk'>@@ -1053,6 +1047,11 @@ static int __devinit e1000_probe(struct pci_dev *pdev,</div><div class='ctx'> </div><div class='ctx'> 	netdev-&gt;features |= NETIF_F_LLTX;</div><div class='ctx'> </div><div class='add'>+	netdev-&gt;vlan_features |= NETIF_F_TSO;</div><div class='add'>+	netdev-&gt;vlan_features |= NETIF_F_TSO6;</div><div class='add'>+	netdev-&gt;vlan_features |= NETIF_F_HW_CSUM;</div><div class='add'>+	netdev-&gt;vlan_features |= NETIF_F_SG;</div><div class='add'>+</div><div class='ctx'> 	adapter-&gt;en_mng_pt = e1000_enable_mng_pass_thru(hw);</div><div class='ctx'> </div><div class='ctx'> 	/* initialize eeprom parameters */</div><div class='hunk'>@@ -1331,7 +1330,6 @@ static int __devinit e1000_sw_init(struct e1000_adapter *adapter)</div><div class='ctx'> 	pci_read_config_word(pdev, PCI_COMMAND, &amp;hw-&gt;pci_cmd_word);</div><div class='ctx'> </div><div class='ctx'> 	adapter-&gt;rx_buffer_len = MAXIMUM_ETHERNET_VLAN_SIZE;</div><div class='del'>-	adapter-&gt;rx_ps_bsize0 = E1000_RXBUFFER_128;</div><div class='ctx'> 	hw-&gt;max_frame_size = netdev-&gt;mtu +</div><div class='ctx'> 			     ENET_HEADER_SIZE + ETHERNET_FCS_SIZE;</div><div class='ctx'> 	hw-&gt;min_frame_size = MINIMUM_ETHERNET_FRAME_SIZE;</div><div class='hunk'>@@ -1815,26 +1813,6 @@ static int e1000_setup_rx_resources(struct e1000_adapter *adapter,</div><div class='ctx'> 	}</div><div class='ctx'> 	memset(rxdr-&gt;buffer_info, 0, size);</div><div class='ctx'> </div><div class='del'>-	rxdr-&gt;ps_page = kcalloc(rxdr-&gt;count, sizeof(struct e1000_ps_page),</div><div class='del'>-	                        GFP_KERNEL);</div><div class='del'>-	if (!rxdr-&gt;ps_page) {</div><div class='del'>-		vfree(rxdr-&gt;buffer_info);</div><div class='del'>-		DPRINTK(PROBE, ERR,</div><div class='del'>-		"Unable to allocate memory for the receive descriptor ring\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rxdr-&gt;ps_page_dma = kcalloc(rxdr-&gt;count,</div><div class='del'>-	                            sizeof(struct e1000_ps_page_dma),</div><div class='del'>-	                            GFP_KERNEL);</div><div class='del'>-	if (!rxdr-&gt;ps_page_dma) {</div><div class='del'>-		vfree(rxdr-&gt;buffer_info);</div><div class='del'>-		kfree(rxdr-&gt;ps_page);</div><div class='del'>-		DPRINTK(PROBE, ERR,</div><div class='del'>-		"Unable to allocate memory for the receive descriptor ring\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if (hw-&gt;mac_type &lt;= e1000_82547_rev_2)</div><div class='ctx'> 		desc_len = sizeof(struct e1000_rx_desc);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -1852,8 +1830,6 @@ static int e1000_setup_rx_resources(struct e1000_adapter *adapter,</div><div class='ctx'> 		"Unable to allocate memory for the receive descriptor ring\n");</div><div class='ctx'> setup_rx_desc_die:</div><div class='ctx'> 		vfree(rxdr-&gt;buffer_info);</div><div class='del'>-		kfree(rxdr-&gt;ps_page);</div><div class='del'>-		kfree(rxdr-&gt;ps_page_dma);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1932,11 +1908,7 @@ int e1000_setup_all_rx_resources(struct e1000_adapter *adapter)</div><div class='ctx'> static void e1000_setup_rctl(struct e1000_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	struct e1000_hw *hw = &amp;adapter-&gt;hw;</div><div class='del'>-	u32 rctl, rfctl;</div><div class='del'>-	u32 psrctl = 0;</div><div class='del'>-#ifndef CONFIG_E1000_DISABLE_PACKET_SPLIT</div><div class='del'>-	u32 pages = 0;</div><div class='del'>-#endif</div><div class='add'>+	u32 rctl;</div><div class='ctx'> </div><div class='ctx'> 	rctl = er32(RCTL);</div><div class='ctx'> </div><div class='hunk'>@@ -1988,55 +1960,6 @@ static void e1000_setup_rctl(struct e1000_adapter *adapter)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-#ifndef CONFIG_E1000_DISABLE_PACKET_SPLIT</div><div class='del'>-	/* 82571 and greater support packet-split where the protocol</div><div class='del'>-	 * header is placed in skb-&gt;data and the packet data is</div><div class='del'>-	 * placed in pages hanging off of skb_shinfo(skb)-&gt;nr_frags.</div><div class='del'>-	 * In the case of a non-split, skb-&gt;data is linearly filled,</div><div class='del'>-	 * followed by the page buffers.  Therefore, skb-&gt;data is</div><div class='del'>-	 * sized to hold the largest protocol header.</div><div class='del'>-	 */</div><div class='del'>-	/* allocations using alloc_page take too long for regular MTU</div><div class='del'>-	 * so only enable packet split for jumbo frames */</div><div class='del'>-	pages = PAGE_USE_COUNT(adapter-&gt;netdev-&gt;mtu);</div><div class='del'>-	if ((hw-&gt;mac_type &gt;= e1000_82571) &amp;&amp; (pages &lt;= 3) &amp;&amp;</div><div class='del'>-	    PAGE_SIZE &lt;= 16384 &amp;&amp; (rctl &amp; E1000_RCTL_LPE))</div><div class='del'>-		adapter-&gt;rx_ps_pages = pages;</div><div class='del'>-	else</div><div class='del'>-		adapter-&gt;rx_ps_pages = 0;</div><div class='del'>-#endif</div><div class='del'>-	if (adapter-&gt;rx_ps_pages) {</div><div class='del'>-		/* Configure extra packet-split registers */</div><div class='del'>-		rfctl = er32(RFCTL);</div><div class='del'>-		rfctl |= E1000_RFCTL_EXTEN;</div><div class='del'>-		/* disable packet split support for IPv6 extension headers,</div><div class='del'>-		 * because some malformed IPv6 headers can hang the RX */</div><div class='del'>-		rfctl |= (E1000_RFCTL_IPV6_EX_DIS |</div><div class='del'>-		          E1000_RFCTL_NEW_IPV6_EXT_DIS);</div><div class='del'>-</div><div class='del'>-		ew32(RFCTL, rfctl);</div><div class='del'>-</div><div class='del'>-		rctl |= E1000_RCTL_DTYP_PS;</div><div class='del'>-</div><div class='del'>-		psrctl |= adapter-&gt;rx_ps_bsize0 &gt;&gt;</div><div class='del'>-			E1000_PSRCTL_BSIZE0_SHIFT;</div><div class='del'>-</div><div class='del'>-		switch (adapter-&gt;rx_ps_pages) {</div><div class='del'>-		case 3:</div><div class='del'>-			psrctl |= PAGE_SIZE &lt;&lt;</div><div class='del'>-				E1000_PSRCTL_BSIZE3_SHIFT;</div><div class='del'>-		case 2:</div><div class='del'>-			psrctl |= PAGE_SIZE &lt;&lt;</div><div class='del'>-				E1000_PSRCTL_BSIZE2_SHIFT;</div><div class='del'>-		case 1:</div><div class='del'>-			psrctl |= PAGE_SIZE &gt;&gt;</div><div class='del'>-				E1000_PSRCTL_BSIZE1_SHIFT;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ew32(PSRCTL, psrctl);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	ew32(RCTL, rctl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2053,18 +1976,10 @@ static void e1000_configure_rx(struct e1000_adapter *adapter)</div><div class='ctx'> 	struct e1000_hw *hw = &amp;adapter-&gt;hw;</div><div class='ctx'> 	u32 rdlen, rctl, rxcsum, ctrl_ext;</div><div class='ctx'> </div><div class='del'>-	if (adapter-&gt;rx_ps_pages) {</div><div class='del'>-		/* this is a 32 byte descriptor */</div><div class='del'>-		rdlen = adapter-&gt;rx_ring[0].count *</div><div class='del'>-			sizeof(union e1000_rx_desc_packet_split);</div><div class='del'>-		adapter-&gt;clean_rx = e1000_clean_rx_irq_ps;</div><div class='del'>-		adapter-&gt;alloc_rx_buf = e1000_alloc_rx_buffers_ps;</div><div class='del'>-	} else {</div><div class='del'>-		rdlen = adapter-&gt;rx_ring[0].count *</div><div class='del'>-			sizeof(struct e1000_rx_desc);</div><div class='del'>-		adapter-&gt;clean_rx = e1000_clean_rx_irq;</div><div class='del'>-		adapter-&gt;alloc_rx_buf = e1000_alloc_rx_buffers;</div><div class='del'>-	}</div><div class='add'>+	rdlen = adapter-&gt;rx_ring[0].count *</div><div class='add'>+		sizeof(struct e1000_rx_desc);</div><div class='add'>+	adapter-&gt;clean_rx = e1000_clean_rx_irq;</div><div class='add'>+	adapter-&gt;alloc_rx_buf = e1000_alloc_rx_buffers;</div><div class='ctx'> </div><div class='ctx'> 	/* disable receives while setting up the descriptors */</div><div class='ctx'> 	rctl = er32(RCTL);</div><div class='hunk'>@@ -2109,28 +2024,14 @@ static void e1000_configure_rx(struct e1000_adapter *adapter)</div><div class='ctx'> 	/* Enable 82543 Receive Checksum Offload for TCP and UDP */</div><div class='ctx'> 	if (hw-&gt;mac_type &gt;= e1000_82543) {</div><div class='ctx'> 		rxcsum = er32(RXCSUM);</div><div class='del'>-		if (adapter-&gt;rx_csum) {</div><div class='add'>+		if (adapter-&gt;rx_csum)</div><div class='ctx'> 			rxcsum |= E1000_RXCSUM_TUOFL;</div><div class='del'>-</div><div class='del'>-			/* Enable 82571 IPv4 payload checksum for UDP fragments</div><div class='del'>-			 * Must be used in conjunction with packet-split. */</div><div class='del'>-			if ((hw-&gt;mac_type &gt;= e1000_82571) &amp;&amp;</div><div class='del'>-			    (adapter-&gt;rx_ps_pages)) {</div><div class='del'>-				rxcsum |= E1000_RXCSUM_IPPCSE;</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			rxcsum &amp;= ~E1000_RXCSUM_TUOFL;</div><div class='add'>+		else</div><div class='ctx'> 			/* don't need to clear IPPCSE as it defaults to 0 */</div><div class='del'>-		}</div><div class='add'>+			rxcsum &amp;= ~E1000_RXCSUM_TUOFL;</div><div class='ctx'> 		ew32(RXCSUM, rxcsum);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* enable early receives on 82573, only takes effect if using &gt; 2048</div><div class='del'>-	 * byte total frame size.  for example only for jumbo frames */</div><div class='del'>-#define E1000_ERT_2048 0x100</div><div class='del'>-	if (hw-&gt;mac_type == e1000_82573)</div><div class='del'>-		ew32(ERT, E1000_ERT_2048);</div><div class='del'>-</div><div class='ctx'> 	/* Enable Receives */</div><div class='ctx'> 	ew32(RCTL, rctl);</div><div class='ctx'> }</div><div class='hunk'>@@ -2256,10 +2157,6 @@ static void e1000_free_rx_resources(struct e1000_adapter *adapter,</div><div class='ctx'> </div><div class='ctx'> 	vfree(rx_ring-&gt;buffer_info);</div><div class='ctx'> 	rx_ring-&gt;buffer_info = NULL;</div><div class='del'>-	kfree(rx_ring-&gt;ps_page);</div><div class='del'>-	rx_ring-&gt;ps_page = NULL;</div><div class='del'>-	kfree(rx_ring-&gt;ps_page_dma);</div><div class='del'>-	rx_ring-&gt;ps_page_dma = NULL;</div><div class='ctx'> </div><div class='ctx'> 	pci_free_consistent(pdev, rx_ring-&gt;size, rx_ring-&gt;desc, rx_ring-&gt;dma);</div><div class='ctx'> </div><div class='hunk'>@@ -2292,11 +2189,9 @@ static void e1000_clean_rx_ring(struct e1000_adapter *adapter,</div><div class='ctx'> {</div><div class='ctx'> 	struct e1000_hw *hw = &amp;adapter-&gt;hw;</div><div class='ctx'> 	struct e1000_buffer *buffer_info;</div><div class='del'>-	struct e1000_ps_page *ps_page;</div><div class='del'>-	struct e1000_ps_page_dma *ps_page_dma;</div><div class='ctx'> 	struct pci_dev *pdev = adapter-&gt;pdev;</div><div class='ctx'> 	unsigned long size;</div><div class='del'>-	unsigned int i, j;</div><div class='add'>+	unsigned int i;</div><div class='ctx'> </div><div class='ctx'> 	/* Free all the Rx ring sk_buffs */</div><div class='ctx'> 	for (i = 0; i &lt; rx_ring-&gt;count; i++) {</div><div class='hunk'>@@ -2310,25 +2205,10 @@ static void e1000_clean_rx_ring(struct e1000_adapter *adapter,</div><div class='ctx'> 			dev_kfree_skb(buffer_info-&gt;skb);</div><div class='ctx'> 			buffer_info-&gt;skb = NULL;</div><div class='ctx'> 		}</div><div class='del'>-		ps_page = &amp;rx_ring-&gt;ps_page[i];</div><div class='del'>-		ps_page_dma = &amp;rx_ring-&gt;ps_page_dma[i];</div><div class='del'>-		for (j = 0; j &lt; adapter-&gt;rx_ps_pages; j++) {</div><div class='del'>-			if (!ps_page-&gt;ps_page[j]) break;</div><div class='del'>-			pci_unmap_page(pdev,</div><div class='del'>-				       ps_page_dma-&gt;ps_page_dma[j],</div><div class='del'>-				       PAGE_SIZE, PCI_DMA_FROMDEVICE);</div><div class='del'>-			ps_page_dma-&gt;ps_page_dma[j] = 0;</div><div class='del'>-			put_page(ps_page-&gt;ps_page[j]);</div><div class='del'>-			ps_page-&gt;ps_page[j] = NULL;</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	size = sizeof(struct e1000_buffer) * rx_ring-&gt;count;</div><div class='ctx'> 	memset(rx_ring-&gt;buffer_info, 0, size);</div><div class='del'>-	size = sizeof(struct e1000_ps_page) * rx_ring-&gt;count;</div><div class='del'>-	memset(rx_ring-&gt;ps_page, 0, size);</div><div class='del'>-	size = sizeof(struct e1000_ps_page_dma) * rx_ring-&gt;count;</div><div class='del'>-	memset(rx_ring-&gt;ps_page_dma, 0, size);</div><div class='ctx'> </div><div class='ctx'> 	/* Zero out the descriptor ring */</div><div class='ctx'> </div><div class='hunk'>@@ -2998,32 +2878,49 @@ static bool e1000_tx_csum(struct e1000_adapter *adapter,</div><div class='ctx'> 	struct e1000_buffer *buffer_info;</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	u8 css;</div><div class='add'>+	u32 cmd_len = E1000_TXD_CMD_DEXT;</div><div class='ctx'> </div><div class='del'>-	if (likely(skb-&gt;ip_summed == CHECKSUM_PARTIAL)) {</div><div class='del'>-		css = skb_transport_offset(skb);</div><div class='add'>+	if (skb-&gt;ip_summed != CHECKSUM_PARTIAL)</div><div class='add'>+		return false;</div><div class='ctx'> </div><div class='del'>-		i = tx_ring-&gt;next_to_use;</div><div class='del'>-		buffer_info = &amp;tx_ring-&gt;buffer_info[i];</div><div class='del'>-		context_desc = E1000_CONTEXT_DESC(*tx_ring, i);</div><div class='add'>+	switch (skb-&gt;protocol) {</div><div class='add'>+	case __constant_htons(ETH_P_IP):</div><div class='add'>+		if (ip_hdr(skb)-&gt;protocol == IPPROTO_TCP)</div><div class='add'>+			cmd_len |= E1000_TXD_CMD_TCP;</div><div class='add'>+		break;</div><div class='add'>+	case __constant_htons(ETH_P_IPV6):</div><div class='add'>+		/* XXX not handling all IPV6 headers */</div><div class='add'>+		if (ipv6_hdr(skb)-&gt;nexthdr == IPPROTO_TCP)</div><div class='add'>+			cmd_len |= E1000_TXD_CMD_TCP;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		if (unlikely(net_ratelimit()))</div><div class='add'>+			DPRINTK(DRV, WARNING,</div><div class='add'>+			        "checksum_partial proto=%x!\n", skb-&gt;protocol);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		context_desc-&gt;lower_setup.ip_config = 0;</div><div class='del'>-		context_desc-&gt;upper_setup.tcp_fields.tucss = css;</div><div class='del'>-		context_desc-&gt;upper_setup.tcp_fields.tucso =</div><div class='del'>-			css + skb-&gt;csum_offset;</div><div class='del'>-		context_desc-&gt;upper_setup.tcp_fields.tucse = 0;</div><div class='del'>-		context_desc-&gt;tcp_seg_setup.data = 0;</div><div class='del'>-		context_desc-&gt;cmd_and_length = cpu_to_le32(E1000_TXD_CMD_DEXT);</div><div class='add'>+	css = skb_transport_offset(skb);</div><div class='ctx'> </div><div class='del'>-		buffer_info-&gt;time_stamp = jiffies;</div><div class='del'>-		buffer_info-&gt;next_to_watch = i;</div><div class='add'>+	i = tx_ring-&gt;next_to_use;</div><div class='add'>+	buffer_info = &amp;tx_ring-&gt;buffer_info[i];</div><div class='add'>+	context_desc = E1000_CONTEXT_DESC(*tx_ring, i);</div><div class='ctx'> </div><div class='del'>-		if (unlikely(++i == tx_ring-&gt;count)) i = 0;</div><div class='del'>-		tx_ring-&gt;next_to_use = i;</div><div class='add'>+	context_desc-&gt;lower_setup.ip_config = 0;</div><div class='add'>+	context_desc-&gt;upper_setup.tcp_fields.tucss = css;</div><div class='add'>+	context_desc-&gt;upper_setup.tcp_fields.tucso =</div><div class='add'>+		css + skb-&gt;csum_offset;</div><div class='add'>+	context_desc-&gt;upper_setup.tcp_fields.tucse = 0;</div><div class='add'>+	context_desc-&gt;tcp_seg_setup.data = 0;</div><div class='add'>+	context_desc-&gt;cmd_and_length = cpu_to_le32(cmd_len);</div><div class='ctx'> </div><div class='del'>-		return true;</div><div class='del'>-	}</div><div class='add'>+	buffer_info-&gt;time_stamp = jiffies;</div><div class='add'>+	buffer_info-&gt;next_to_watch = i;</div><div class='ctx'> </div><div class='del'>-	return false;</div><div class='add'>+	if (unlikely(++i == tx_ring-&gt;count)) i = 0;</div><div class='add'>+	tx_ring-&gt;next_to_use = i;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define E1000_MAX_TXD_PWR	12</div><div class='hunk'>@@ -4235,181 +4132,6 @@ next_desc:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * e1000_clean_rx_irq_ps - Send received data up the network stack; packet split</div><div class='del'>- * @adapter: board private structure</div><div class='del'>- **/</div><div class='del'>-</div><div class='del'>-static bool e1000_clean_rx_irq_ps(struct e1000_adapter *adapter,</div><div class='del'>-				  struct e1000_rx_ring *rx_ring,</div><div class='del'>-				  int *work_done, int work_to_do)</div><div class='del'>-{</div><div class='del'>-	union e1000_rx_desc_packet_split *rx_desc, *next_rxd;</div><div class='del'>-	struct net_device *netdev = adapter-&gt;netdev;</div><div class='del'>-	struct pci_dev *pdev = adapter-&gt;pdev;</div><div class='del'>-	struct e1000_buffer *buffer_info, *next_buffer;</div><div class='del'>-	struct e1000_ps_page *ps_page;</div><div class='del'>-	struct e1000_ps_page_dma *ps_page_dma;</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	unsigned int i, j;</div><div class='del'>-	u32 length, staterr;</div><div class='del'>-	int cleaned_count = 0;</div><div class='del'>-	bool cleaned = false;</div><div class='del'>-	unsigned int total_rx_bytes=0, total_rx_packets=0;</div><div class='del'>-</div><div class='del'>-	i = rx_ring-&gt;next_to_clean;</div><div class='del'>-	rx_desc = E1000_RX_DESC_PS(*rx_ring, i);</div><div class='del'>-	staterr = le32_to_cpu(rx_desc-&gt;wb.middle.status_error);</div><div class='del'>-	buffer_info = &amp;rx_ring-&gt;buffer_info[i];</div><div class='del'>-</div><div class='del'>-	while (staterr &amp; E1000_RXD_STAT_DD) {</div><div class='del'>-		ps_page = &amp;rx_ring-&gt;ps_page[i];</div><div class='del'>-		ps_page_dma = &amp;rx_ring-&gt;ps_page_dma[i];</div><div class='del'>-</div><div class='del'>-		if (unlikely(*work_done &gt;= work_to_do))</div><div class='del'>-			break;</div><div class='del'>-		(*work_done)++;</div><div class='del'>-</div><div class='del'>-		skb = buffer_info-&gt;skb;</div><div class='del'>-</div><div class='del'>-		/* in the packet split case this is header only */</div><div class='del'>-		prefetch(skb-&gt;data - NET_IP_ALIGN);</div><div class='del'>-</div><div class='del'>-		if (++i == rx_ring-&gt;count) i = 0;</div><div class='del'>-		next_rxd = E1000_RX_DESC_PS(*rx_ring, i);</div><div class='del'>-		prefetch(next_rxd);</div><div class='del'>-</div><div class='del'>-		next_buffer = &amp;rx_ring-&gt;buffer_info[i];</div><div class='del'>-</div><div class='del'>-		cleaned = true;</div><div class='del'>-		cleaned_count++;</div><div class='del'>-		pci_unmap_single(pdev, buffer_info-&gt;dma,</div><div class='del'>-				 buffer_info-&gt;length,</div><div class='del'>-				 PCI_DMA_FROMDEVICE);</div><div class='del'>-</div><div class='del'>-		if (unlikely(!(staterr &amp; E1000_RXD_STAT_EOP))) {</div><div class='del'>-			E1000_DBG("%s: Packet Split buffers didn't pick up"</div><div class='del'>-				  " the full packet\n", netdev-&gt;name);</div><div class='del'>-			dev_kfree_skb_irq(skb);</div><div class='del'>-			goto next_desc;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (unlikely(staterr &amp; E1000_RXDEXT_ERR_FRAME_ERR_MASK)) {</div><div class='del'>-			dev_kfree_skb_irq(skb);</div><div class='del'>-			goto next_desc;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		length = le16_to_cpu(rx_desc-&gt;wb.middle.length0);</div><div class='del'>-</div><div class='del'>-		if (unlikely(!length)) {</div><div class='del'>-			E1000_DBG("%s: Last part of the packet spanning"</div><div class='del'>-				  " multiple descriptors\n", netdev-&gt;name);</div><div class='del'>-			dev_kfree_skb_irq(skb);</div><div class='del'>-			goto next_desc;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Good Receive */</div><div class='del'>-		skb_put(skb, length);</div><div class='del'>-</div><div class='del'>-		{</div><div class='del'>-		/* this looks ugly, but it seems compiler issues make it</div><div class='del'>-		   more efficient than reusing j */</div><div class='del'>-		int l1 = le16_to_cpu(rx_desc-&gt;wb.upper.length[0]);</div><div class='del'>-</div><div class='del'>-		/* page alloc/put takes too long and effects small packet</div><div class='del'>-		 * throughput, so unsplit small packets and save the alloc/put*/</div><div class='del'>-		if (l1 &amp;&amp; (l1 &lt;= copybreak) &amp;&amp; ((length + l1) &lt;= adapter-&gt;rx_ps_bsize0)) {</div><div class='del'>-			u8 *vaddr;</div><div class='del'>-			/* there is no documentation about how to call</div><div class='del'>-			 * kmap_atomic, so we can't hold the mapping</div><div class='del'>-			 * very long */</div><div class='del'>-			pci_dma_sync_single_for_cpu(pdev,</div><div class='del'>-				ps_page_dma-&gt;ps_page_dma[0],</div><div class='del'>-				PAGE_SIZE,</div><div class='del'>-				PCI_DMA_FROMDEVICE);</div><div class='del'>-			vaddr = kmap_atomic(ps_page-&gt;ps_page[0],</div><div class='del'>-			                    KM_SKB_DATA_SOFTIRQ);</div><div class='del'>-			memcpy(skb_tail_pointer(skb), vaddr, l1);</div><div class='del'>-			kunmap_atomic(vaddr, KM_SKB_DATA_SOFTIRQ);</div><div class='del'>-			pci_dma_sync_single_for_device(pdev,</div><div class='del'>-				ps_page_dma-&gt;ps_page_dma[0],</div><div class='del'>-				PAGE_SIZE, PCI_DMA_FROMDEVICE);</div><div class='del'>-			/* remove the CRC */</div><div class='del'>-			l1 -= 4;</div><div class='del'>-			skb_put(skb, l1);</div><div class='del'>-			goto copydone;</div><div class='del'>-		} /* if */</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		for (j = 0; j &lt; adapter-&gt;rx_ps_pages; j++) {</div><div class='del'>-			length = le16_to_cpu(rx_desc-&gt;wb.upper.length[j]);</div><div class='del'>-			if (!length)</div><div class='del'>-				break;</div><div class='del'>-			pci_unmap_page(pdev, ps_page_dma-&gt;ps_page_dma[j],</div><div class='del'>-					PAGE_SIZE, PCI_DMA_FROMDEVICE);</div><div class='del'>-			ps_page_dma-&gt;ps_page_dma[j] = 0;</div><div class='del'>-			skb_fill_page_desc(skb, j, ps_page-&gt;ps_page[j], 0,</div><div class='del'>-			                   length);</div><div class='del'>-			ps_page-&gt;ps_page[j] = NULL;</div><div class='del'>-			skb-&gt;len += length;</div><div class='del'>-			skb-&gt;data_len += length;</div><div class='del'>-			skb-&gt;truesize += length;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* strip the ethernet crc, problem is we're using pages now so</div><div class='del'>-		 * this whole operation can get a little cpu intensive */</div><div class='del'>-		pskb_trim(skb, skb-&gt;len - 4);</div><div class='del'>-</div><div class='del'>-copydone:</div><div class='del'>-		total_rx_bytes += skb-&gt;len;</div><div class='del'>-		total_rx_packets++;</div><div class='del'>-</div><div class='del'>-		e1000_rx_checksum(adapter, staterr,</div><div class='del'>-				  le16_to_cpu(rx_desc-&gt;wb.lower.hi_dword.csum_ip.csum), skb);</div><div class='del'>-		skb-&gt;protocol = eth_type_trans(skb, netdev);</div><div class='del'>-</div><div class='del'>-		if (likely(rx_desc-&gt;wb.upper.header_status &amp;</div><div class='del'>-			   cpu_to_le16(E1000_RXDPS_HDRSTAT_HDRSP)))</div><div class='del'>-			adapter-&gt;rx_hdr_split++;</div><div class='del'>-</div><div class='del'>-		if (unlikely(adapter-&gt;vlgrp &amp;&amp; (staterr &amp; E1000_RXD_STAT_VP))) {</div><div class='del'>-			vlan_hwaccel_receive_skb(skb, adapter-&gt;vlgrp,</div><div class='del'>-				le16_to_cpu(rx_desc-&gt;wb.middle.vlan));</div><div class='del'>-		} else {</div><div class='del'>-			netif_receive_skb(skb);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		netdev-&gt;last_rx = jiffies;</div><div class='del'>-</div><div class='del'>-next_desc:</div><div class='del'>-		rx_desc-&gt;wb.middle.status_error &amp;= cpu_to_le32(~0xFF);</div><div class='del'>-		buffer_info-&gt;skb = NULL;</div><div class='del'>-</div><div class='del'>-		/* return some buffers to hardware, one at a time is too slow */</div><div class='del'>-		if (unlikely(cleaned_count &gt;= E1000_RX_BUFFER_WRITE)) {</div><div class='del'>-			adapter-&gt;alloc_rx_buf(adapter, rx_ring, cleaned_count);</div><div class='del'>-			cleaned_count = 0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* use prefetched values */</div><div class='del'>-		rx_desc = next_rxd;</div><div class='del'>-		buffer_info = next_buffer;</div><div class='del'>-</div><div class='del'>-		staterr = le32_to_cpu(rx_desc-&gt;wb.middle.status_error);</div><div class='del'>-	}</div><div class='del'>-	rx_ring-&gt;next_to_clean = i;</div><div class='del'>-</div><div class='del'>-	cleaned_count = E1000_DESC_UNUSED(rx_ring);</div><div class='del'>-	if (cleaned_count)</div><div class='del'>-		adapter-&gt;alloc_rx_buf(adapter, rx_ring, cleaned_count);</div><div class='del'>-</div><div class='del'>-	adapter-&gt;total_rx_packets += total_rx_packets;</div><div class='del'>-	adapter-&gt;total_rx_bytes += total_rx_bytes;</div><div class='del'>-	adapter-&gt;net_stats.rx_bytes += total_rx_bytes;</div><div class='del'>-	adapter-&gt;net_stats.rx_packets += total_rx_packets;</div><div class='del'>-	return cleaned;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * e1000_alloc_rx_buffers - Replace used receive buffers; legacy &amp; extended</div><div class='ctx'>  * @adapter: address of board private structure</div><div class='ctx'>  **/</div><div class='hunk'>@@ -4521,104 +4243,6 @@ map_skb:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * e1000_alloc_rx_buffers_ps - Replace used receive buffers; packet split</div><div class='del'>- * @adapter: address of board private structure</div><div class='del'>- **/</div><div class='del'>-</div><div class='del'>-static void e1000_alloc_rx_buffers_ps(struct e1000_adapter *adapter,</div><div class='del'>-				      struct e1000_rx_ring *rx_ring,</div><div class='del'>-				      int cleaned_count)</div><div class='del'>-{</div><div class='del'>-	struct e1000_hw *hw = &amp;adapter-&gt;hw;</div><div class='del'>-	struct net_device *netdev = adapter-&gt;netdev;</div><div class='del'>-	struct pci_dev *pdev = adapter-&gt;pdev;</div><div class='del'>-	union e1000_rx_desc_packet_split *rx_desc;</div><div class='del'>-	struct e1000_buffer *buffer_info;</div><div class='del'>-	struct e1000_ps_page *ps_page;</div><div class='del'>-	struct e1000_ps_page_dma *ps_page_dma;</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	unsigned int i, j;</div><div class='del'>-</div><div class='del'>-	i = rx_ring-&gt;next_to_use;</div><div class='del'>-	buffer_info = &amp;rx_ring-&gt;buffer_info[i];</div><div class='del'>-	ps_page = &amp;rx_ring-&gt;ps_page[i];</div><div class='del'>-	ps_page_dma = &amp;rx_ring-&gt;ps_page_dma[i];</div><div class='del'>-</div><div class='del'>-	while (cleaned_count--) {</div><div class='del'>-		rx_desc = E1000_RX_DESC_PS(*rx_ring, i);</div><div class='del'>-</div><div class='del'>-		for (j = 0; j &lt; PS_PAGE_BUFFERS; j++) {</div><div class='del'>-			if (j &lt; adapter-&gt;rx_ps_pages) {</div><div class='del'>-				if (likely(!ps_page-&gt;ps_page[j])) {</div><div class='del'>-					ps_page-&gt;ps_page[j] =</div><div class='del'>-						alloc_page(GFP_ATOMIC);</div><div class='del'>-					if (unlikely(!ps_page-&gt;ps_page[j])) {</div><div class='del'>-						adapter-&gt;alloc_rx_buff_failed++;</div><div class='del'>-						goto no_buffers;</div><div class='del'>-					}</div><div class='del'>-					ps_page_dma-&gt;ps_page_dma[j] =</div><div class='del'>-						pci_map_page(pdev,</div><div class='del'>-							    ps_page-&gt;ps_page[j],</div><div class='del'>-							    0, PAGE_SIZE,</div><div class='del'>-							    PCI_DMA_FROMDEVICE);</div><div class='del'>-				}</div><div class='del'>-				/* Refresh the desc even if buffer_addrs didn't</div><div class='del'>-				 * change because each write-back erases</div><div class='del'>-				 * this info.</div><div class='del'>-				 */</div><div class='del'>-				rx_desc-&gt;read.buffer_addr[j+1] =</div><div class='del'>-				     cpu_to_le64(ps_page_dma-&gt;ps_page_dma[j]);</div><div class='del'>-			} else</div><div class='del'>-				rx_desc-&gt;read.buffer_addr[j+1] = ~cpu_to_le64(0);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		skb = netdev_alloc_skb(netdev,</div><div class='del'>-		                       adapter-&gt;rx_ps_bsize0 + NET_IP_ALIGN);</div><div class='del'>-</div><div class='del'>-		if (unlikely(!skb)) {</div><div class='del'>-			adapter-&gt;alloc_rx_buff_failed++;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Make buffer alignment 2 beyond a 16 byte boundary</div><div class='del'>-		 * this will result in a 16 byte aligned IP header after</div><div class='del'>-		 * the 14 byte MAC header is removed</div><div class='del'>-		 */</div><div class='del'>-		skb_reserve(skb, NET_IP_ALIGN);</div><div class='del'>-</div><div class='del'>-		buffer_info-&gt;skb = skb;</div><div class='del'>-		buffer_info-&gt;length = adapter-&gt;rx_ps_bsize0;</div><div class='del'>-		buffer_info-&gt;dma = pci_map_single(pdev, skb-&gt;data,</div><div class='del'>-						  adapter-&gt;rx_ps_bsize0,</div><div class='del'>-						  PCI_DMA_FROMDEVICE);</div><div class='del'>-</div><div class='del'>-		rx_desc-&gt;read.buffer_addr[0] = cpu_to_le64(buffer_info-&gt;dma);</div><div class='del'>-</div><div class='del'>-		if (unlikely(++i == rx_ring-&gt;count)) i = 0;</div><div class='del'>-		buffer_info = &amp;rx_ring-&gt;buffer_info[i];</div><div class='del'>-		ps_page = &amp;rx_ring-&gt;ps_page[i];</div><div class='del'>-		ps_page_dma = &amp;rx_ring-&gt;ps_page_dma[i];</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-no_buffers:</div><div class='del'>-	if (likely(rx_ring-&gt;next_to_use != i)) {</div><div class='del'>-		rx_ring-&gt;next_to_use = i;</div><div class='del'>-		if (unlikely(i-- == 0)) i = (rx_ring-&gt;count - 1);</div><div class='del'>-</div><div class='del'>-		/* Force memory writes to complete before letting h/w</div><div class='del'>-		 * know there are new descriptors to fetch.  (Only</div><div class='del'>-		 * applicable for weak-ordered memory model archs,</div><div class='del'>-		 * such as IA-64). */</div><div class='del'>-		wmb();</div><div class='del'>-		/* Hardware increments by 16 bytes, but packet split</div><div class='del'>-		 * descriptors are 32 bytes...so we increment tail</div><div class='del'>-		 * twice as much.</div><div class='del'>-		 */</div><div class='del'>-		writel(i&lt;&lt;1, hw-&gt;hw_addr + rx_ring-&gt;rdt);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * e1000_smartspeed - Workaround for SmartSpeed on 82541 and 82547 controllers.</div><div class='ctx'>  * @adapter:</div><div class='ctx'>  **/</div><div class='head'>diff --git a/drivers/net/e1000e/82571.c b/drivers/net/e1000e/82571.c<br/>index 462351ca2c81..b2c910c52df9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/e1000e/82571.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/e1000e/82571.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/e1000e/82571.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/e1000e/82571.c</a></div><div class='hunk'>@@ -38,6 +38,7 @@</div><div class='ctx'>  * 82573V Gigabit Ethernet Controller (Copper)</div><div class='ctx'>  * 82573E Gigabit Ethernet Controller (Copper)</div><div class='ctx'>  * 82573L Gigabit Ethernet Controller</div><div class='add'>+ * 82574L Gigabit Network Connection</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='hunk'>@@ -54,6 +55,8 @@</div><div class='ctx'> </div><div class='ctx'> #define E1000_GCR_L1_ACT_WITHOUT_L0S_RX 0x08000000</div><div class='ctx'> </div><div class='add'>+#define E1000_NVM_INIT_CTRL2_MNGM 0x6000 /* Manageability Operation Mode mask */</div><div class='add'>+</div><div class='ctx'> static s32 e1000_get_phy_id_82571(struct e1000_hw *hw);</div><div class='ctx'> static s32 e1000_setup_copper_link_82571(struct e1000_hw *hw);</div><div class='ctx'> static s32 e1000_setup_fiber_serdes_link_82571(struct e1000_hw *hw);</div><div class='hunk'>@@ -63,6 +66,8 @@ static s32 e1000_fix_nvm_checksum_82571(struct e1000_hw *hw);</div><div class='ctx'> static void e1000_initialize_hw_bits_82571(struct e1000_hw *hw);</div><div class='ctx'> static s32 e1000_setup_link_82571(struct e1000_hw *hw);</div><div class='ctx'> static void e1000_clear_hw_cntrs_82571(struct e1000_hw *hw);</div><div class='add'>+static bool e1000_check_mng_mode_82574(struct e1000_hw *hw);</div><div class='add'>+static s32 e1000_led_on_82574(struct e1000_hw *hw);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *  e1000_init_phy_params_82571 - Init PHY func ptrs.</div><div class='hunk'>@@ -92,6 +97,9 @@ static s32 e1000_init_phy_params_82571(struct e1000_hw *hw)</div><div class='ctx'> 	case e1000_82573:</div><div class='ctx'> 		phy-&gt;type		 = e1000_phy_m88;</div><div class='ctx'> 		break;</div><div class='add'>+	case e1000_82574:</div><div class='add'>+		phy-&gt;type		 = e1000_phy_bm;</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -E1000_ERR_PHY;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -111,6 +119,10 @@ static s32 e1000_init_phy_params_82571(struct e1000_hw *hw)</div><div class='ctx'> 		if (phy-&gt;id != M88E1111_I_PHY_ID)</div><div class='ctx'> 			return -E1000_ERR_PHY;</div><div class='ctx'> 		break;</div><div class='add'>+	case e1000_82574:</div><div class='add'>+		if (phy-&gt;id != BME1000_E_PHY_ID_R2)</div><div class='add'>+			return -E1000_ERR_PHY;</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -E1000_ERR_PHY;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -150,6 +162,7 @@ static s32 e1000_init_nvm_params_82571(struct e1000_hw *hw)</div><div class='ctx'> </div><div class='ctx'> 	switch (hw-&gt;mac.type) {</div><div class='ctx'> 	case e1000_82573:</div><div class='add'>+	case e1000_82574:</div><div class='ctx'> 		if (((eecd &gt;&gt; 15) &amp; 0x3) == 0x3) {</div><div class='ctx'> 			nvm-&gt;type = e1000_nvm_flash_hw;</div><div class='ctx'> 			nvm-&gt;word_size = 2048;</div><div class='hunk'>@@ -245,6 +258,17 @@ static s32 e1000_init_mac_params_82571(struct e1000_adapter *adapter)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	switch (hw-&gt;mac.type) {</div><div class='add'>+	case e1000_82574:</div><div class='add'>+		func-&gt;check_mng_mode = e1000_check_mng_mode_82574;</div><div class='add'>+		func-&gt;led_on = e1000_led_on_82574;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		func-&gt;check_mng_mode = e1000e_check_mng_mode_generic;</div><div class='add'>+		func-&gt;led_on = e1000e_led_on_generic;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -330,6 +354,8 @@ static s32 e1000_get_variants_82571(struct e1000_adapter *adapter)</div><div class='ctx'> static s32 e1000_get_phy_id_82571(struct e1000_hw *hw)</div><div class='ctx'> {</div><div class='ctx'> 	struct e1000_phy_info *phy = &amp;hw-&gt;phy;</div><div class='add'>+	s32 ret_val;</div><div class='add'>+	u16 phy_id = 0;</div><div class='ctx'> </div><div class='ctx'> 	switch (hw-&gt;mac.type) {</div><div class='ctx'> 	case e1000_82571:</div><div class='hunk'>@@ -345,6 +371,20 @@ static s32 e1000_get_phy_id_82571(struct e1000_hw *hw)</div><div class='ctx'> 	case e1000_82573:</div><div class='ctx'> 		return e1000e_get_phy_id(hw);</div><div class='ctx'> 		break;</div><div class='add'>+	case e1000_82574:</div><div class='add'>+		ret_val = e1e_rphy(hw, PHY_ID1, &amp;phy_id);</div><div class='add'>+		if (ret_val)</div><div class='add'>+			return ret_val;</div><div class='add'>+</div><div class='add'>+		phy-&gt;id = (u32)(phy_id &lt;&lt; 16);</div><div class='add'>+		udelay(20);</div><div class='add'>+		ret_val = e1e_rphy(hw, PHY_ID2, &amp;phy_id);</div><div class='add'>+		if (ret_val)</div><div class='add'>+			return ret_val;</div><div class='add'>+</div><div class='add'>+		phy-&gt;id |= (u32)(phy_id);</div><div class='add'>+		phy-&gt;revision = (u32)(phy_id &amp; ~PHY_REVISION_MASK);</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -E1000_ERR_PHY;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -421,7 +461,7 @@ static s32 e1000_acquire_nvm_82571(struct e1000_hw *hw)</div><div class='ctx'> 	if (ret_val)</div><div class='ctx'> 		return ret_val;</div><div class='ctx'> </div><div class='del'>-	if (hw-&gt;mac.type != e1000_82573)</div><div class='add'>+	if (hw-&gt;mac.type != e1000_82573 &amp;&amp; hw-&gt;mac.type != e1000_82574)</div><div class='ctx'> 		ret_val = e1000e_acquire_nvm(hw);</div><div class='ctx'> </div><div class='ctx'> 	if (ret_val)</div><div class='hunk'>@@ -461,6 +501,7 @@ static s32 e1000_write_nvm_82571(struct e1000_hw *hw, u16 offset, u16 words,</div><div class='ctx'> </div><div class='ctx'> 	switch (hw-&gt;mac.type) {</div><div class='ctx'> 	case e1000_82573:</div><div class='add'>+	case e1000_82574:</div><div class='ctx'> 		ret_val = e1000_write_nvm_eewr_82571(hw, offset, words, data);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case e1000_82571:</div><div class='hunk'>@@ -735,7 +776,7 @@ static s32 e1000_reset_hw_82571(struct e1000_hw *hw)</div><div class='ctx'> 	 * Must acquire the MDIO ownership before MAC reset.</div><div class='ctx'> 	 * Ownership defaults to firmware after a reset.</div><div class='ctx'> 	 */</div><div class='del'>-	if (hw-&gt;mac.type == e1000_82573) {</div><div class='add'>+	if (hw-&gt;mac.type == e1000_82573 || hw-&gt;mac.type == e1000_82574) {</div><div class='ctx'> 		extcnf_ctrl = er32(EXTCNF_CTRL);</div><div class='ctx'> 		extcnf_ctrl |= E1000_EXTCNF_CTRL_MDIO_SW_OWNERSHIP;</div><div class='ctx'> </div><div class='hunk'>@@ -776,7 +817,7 @@ static s32 e1000_reset_hw_82571(struct e1000_hw *hw)</div><div class='ctx'> 	 * Need to wait for Phy configuration completion before accessing</div><div class='ctx'> 	 * NVM and Phy.</div><div class='ctx'> 	 */</div><div class='del'>-	if (hw-&gt;mac.type == e1000_82573)</div><div class='add'>+	if (hw-&gt;mac.type == e1000_82573 || hw-&gt;mac.type == e1000_82574)</div><div class='ctx'> 		msleep(25);</div><div class='ctx'> </div><div class='ctx'> 	/* Clear any pending interrupt events. */</div><div class='hunk'>@@ -843,7 +884,7 @@ static s32 e1000_init_hw_82571(struct e1000_hw *hw)</div><div class='ctx'> 	ew32(TXDCTL(0), reg_data);</div><div class='ctx'> </div><div class='ctx'> 	/* ...for both queues. */</div><div class='del'>-	if (mac-&gt;type != e1000_82573) {</div><div class='add'>+	if (mac-&gt;type != e1000_82573 &amp;&amp; mac-&gt;type != e1000_82574) {</div><div class='ctx'> 		reg_data = er32(TXDCTL(1));</div><div class='ctx'> 		reg_data = (reg_data &amp; ~E1000_TXDCTL_WTHRESH) |</div><div class='ctx'> 			   E1000_TXDCTL_FULL_TX_DESC_WB |</div><div class='hunk'>@@ -918,19 +959,28 @@ static void e1000_initialize_hw_bits_82571(struct e1000_hw *hw)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Device Control */</div><div class='del'>-	if (hw-&gt;mac.type == e1000_82573) {</div><div class='add'>+	if (hw-&gt;mac.type == e1000_82573 || hw-&gt;mac.type == e1000_82574) {</div><div class='ctx'> 		reg = er32(CTRL);</div><div class='ctx'> 		reg &amp;= ~(1 &lt;&lt; 29);</div><div class='ctx'> 		ew32(CTRL, reg);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Extended Device Control */</div><div class='del'>-	if (hw-&gt;mac.type == e1000_82573) {</div><div class='add'>+	if (hw-&gt;mac.type == e1000_82573 || hw-&gt;mac.type == e1000_82574) {</div><div class='ctx'> 		reg = er32(CTRL_EXT);</div><div class='ctx'> 		reg &amp;= ~(1 &lt;&lt; 23);</div><div class='ctx'> 		reg |= (1 &lt;&lt; 22);</div><div class='ctx'> 		ew32(CTRL_EXT, reg);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	/* PCI-Ex Control Register */</div><div class='add'>+	if (hw-&gt;mac.type == e1000_82574) {</div><div class='add'>+		reg = er32(GCR);</div><div class='add'>+		reg |= (1 &lt;&lt; 22);</div><div class='add'>+		ew32(GCR, reg);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -947,7 +997,7 @@ void e1000e_clear_vfta(struct e1000_hw *hw)</div><div class='ctx'> 	u32 vfta_offset = 0;</div><div class='ctx'> 	u32 vfta_bit_in_reg = 0;</div><div class='ctx'> </div><div class='del'>-	if (hw-&gt;mac.type == e1000_82573) {</div><div class='add'>+	if (hw-&gt;mac.type == e1000_82573 || hw-&gt;mac.type == e1000_82574) {</div><div class='ctx'> 		if (hw-&gt;mng_cookie.vlan_id != 0) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * The VFTA is a 4096b bit-field, each identifying</div><div class='hunk'>@@ -976,6 +1026,48 @@ void e1000e_clear_vfta(struct e1000_hw *hw)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ *  e1000_check_mng_mode_82574 - Check manageability is enabled</div><div class='add'>+ *  @hw: pointer to the HW structure</div><div class='add'>+ *</div><div class='add'>+ *  Reads the NVM Initialization Control Word 2 and returns true</div><div class='add'>+ *  (&gt;0) if any manageability is enabled, else false (0).</div><div class='add'>+ **/</div><div class='add'>+static bool e1000_check_mng_mode_82574(struct e1000_hw *hw)</div><div class='add'>+{</div><div class='add'>+	u16 data;</div><div class='add'>+</div><div class='add'>+	e1000_read_nvm(hw, NVM_INIT_CONTROL2_REG, 1, &amp;data);</div><div class='add'>+	return (data &amp; E1000_NVM_INIT_CTRL2_MNGM) != 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *  e1000_led_on_82574 - Turn LED on</div><div class='add'>+ *  @hw: pointer to the HW structure</div><div class='add'>+ *</div><div class='add'>+ *  Turn LED on.</div><div class='add'>+ **/</div><div class='add'>+static s32 e1000_led_on_82574(struct e1000_hw *hw)</div><div class='add'>+{</div><div class='add'>+	u32 ctrl;</div><div class='add'>+	u32 i;</div><div class='add'>+</div><div class='add'>+	ctrl = hw-&gt;mac.ledctl_mode2;</div><div class='add'>+	if (!(E1000_STATUS_LU &amp; er32(STATUS))) {</div><div class='add'>+		/*</div><div class='add'>+		 * If no link, then turn LED on by setting the invert bit</div><div class='add'>+		 * for each LED that's "on" (0x0E) in ledctl_mode2.</div><div class='add'>+		 */</div><div class='add'>+		for (i = 0; i &lt; 4; i++)</div><div class='add'>+			if (((hw-&gt;mac.ledctl_mode2 &gt;&gt; (i * 8)) &amp; 0xFF) ==</div><div class='add'>+			    E1000_LEDCTL_MODE_LED_ON)</div><div class='add'>+				ctrl |= (E1000_LEDCTL_LED0_IVRT &lt;&lt; (i * 8));</div><div class='add'>+	}</div><div class='add'>+	ew32(LEDCTL, ctrl);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  *  e1000_update_mc_addr_list_82571 - Update Multicast addresses</div><div class='ctx'>  *  @hw: pointer to the HW structure</div><div class='ctx'>  *  @mc_addr_list: array of multicast addresses to program</div><div class='hunk'>@@ -1018,7 +1110,8 @@ static s32 e1000_setup_link_82571(struct e1000_hw *hw)</div><div class='ctx'> 	 * the default flow control setting, so we explicitly</div><div class='ctx'> 	 * set it to full.</div><div class='ctx'> 	 */</div><div class='del'>-	if (hw-&gt;mac.type == e1000_82573)</div><div class='add'>+	if ((hw-&gt;mac.type == e1000_82573 || hw-&gt;mac.type == e1000_82574) &amp;&amp;</div><div class='add'>+	    hw-&gt;fc.type == e1000_fc_default)</div><div class='ctx'> 		hw-&gt;fc.type = e1000_fc_full;</div><div class='ctx'> </div><div class='ctx'> 	return e1000e_setup_link(hw);</div><div class='hunk'>@@ -1045,6 +1138,7 @@ static s32 e1000_setup_copper_link_82571(struct e1000_hw *hw)</div><div class='ctx'> </div><div class='ctx'> 	switch (hw-&gt;phy.type) {</div><div class='ctx'> 	case e1000_phy_m88:</div><div class='add'>+	case e1000_phy_bm:</div><div class='ctx'> 		ret_val = e1000e_copper_link_setup_m88(hw);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case e1000_phy_igp_2:</div><div class='hunk'>@@ -1114,11 +1208,10 @@ static s32 e1000_valid_led_default_82571(struct e1000_hw *hw, u16 *data)</div><div class='ctx'> 		return ret_val;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (hw-&gt;mac.type == e1000_82573 &amp;&amp;</div><div class='add'>+	if ((hw-&gt;mac.type == e1000_82573 || hw-&gt;mac.type == e1000_82574) &amp;&amp;</div><div class='ctx'> 	    *data == ID_LED_RESERVED_F746)</div><div class='ctx'> 		*data = ID_LED_DEFAULT_82573;</div><div class='del'>-	else if (*data == ID_LED_RESERVED_0000 ||</div><div class='del'>-		 *data == ID_LED_RESERVED_FFFF)</div><div class='add'>+	else if (*data == ID_LED_RESERVED_0000 || *data == ID_LED_RESERVED_FFFF)</div><div class='ctx'> 		*data = ID_LED_DEFAULT;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1265,13 +1358,13 @@ static void e1000_clear_hw_cntrs_82571(struct e1000_hw *hw)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct e1000_mac_operations e82571_mac_ops = {</div><div class='del'>-	.mng_mode_enab		= E1000_MNG_IAMT_MODE &lt;&lt; E1000_FWSM_MODE_SHIFT,</div><div class='add'>+	/* .check_mng_mode: mac type dependent */</div><div class='ctx'> 	/* .check_for_link: media type dependent */</div><div class='ctx'> 	.cleanup_led		= e1000e_cleanup_led_generic,</div><div class='ctx'> 	.clear_hw_cntrs		= e1000_clear_hw_cntrs_82571,</div><div class='ctx'> 	.get_bus_info		= e1000e_get_bus_info_pcie,</div><div class='ctx'> 	/* .get_link_up_info: media type dependent */</div><div class='del'>-	.led_on			= e1000e_led_on_generic,</div><div class='add'>+	/* .led_on: mac type dependent */</div><div class='ctx'> 	.led_off		= e1000e_led_off_generic,</div><div class='ctx'> 	.update_mc_addr_list	= e1000_update_mc_addr_list_82571,</div><div class='ctx'> 	.reset_hw		= e1000_reset_hw_82571,</div><div class='hunk'>@@ -1312,6 +1405,22 @@ static struct e1000_phy_operations e82_phy_ops_m88 = {</div><div class='ctx'> 	.write_phy_reg		= e1000e_write_phy_reg_m88,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct e1000_phy_operations e82_phy_ops_bm = {</div><div class='add'>+	.acquire_phy		= e1000_get_hw_semaphore_82571,</div><div class='add'>+	.check_reset_block	= e1000e_check_reset_block_generic,</div><div class='add'>+	.commit_phy		= e1000e_phy_sw_reset,</div><div class='add'>+	.force_speed_duplex	= e1000e_phy_force_speed_duplex_m88,</div><div class='add'>+	.get_cfg_done		= e1000e_get_cfg_done,</div><div class='add'>+	.get_cable_length	= e1000e_get_cable_length_m88,</div><div class='add'>+	.get_phy_info		= e1000e_get_phy_info_m88,</div><div class='add'>+	.read_phy_reg		= e1000e_read_phy_reg_bm2,</div><div class='add'>+	.release_phy		= e1000_put_hw_semaphore_82571,</div><div class='add'>+	.reset_phy		= e1000e_phy_hw_reset_generic,</div><div class='add'>+	.set_d0_lplu_state	= e1000_set_d0_lplu_state_82571,</div><div class='add'>+	.set_d3_lplu_state	= e1000e_set_d3_lplu_state,</div><div class='add'>+	.write_phy_reg		= e1000e_write_phy_reg_bm2,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct e1000_nvm_operations e82571_nvm_ops = {</div><div class='ctx'> 	.acquire_nvm		= e1000_acquire_nvm_82571,</div><div class='ctx'> 	.read_nvm		= e1000e_read_nvm_eerd,</div><div class='hunk'>@@ -1375,3 +1484,21 @@ struct e1000_info e1000_82573_info = {</div><div class='ctx'> 	.nvm_ops		= &amp;e82571_nvm_ops,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct e1000_info e1000_82574_info = {</div><div class='add'>+	.mac			= e1000_82574,</div><div class='add'>+	.flags			= FLAG_HAS_HW_VLAN_FILTER</div><div class='add'>+				  | FLAG_HAS_MSIX</div><div class='add'>+				  | FLAG_HAS_JUMBO_FRAMES</div><div class='add'>+				  | FLAG_HAS_WOL</div><div class='add'>+				  | FLAG_APME_IN_CTRL3</div><div class='add'>+				  | FLAG_RX_CSUM_ENABLED</div><div class='add'>+				  | FLAG_HAS_SMART_POWER_DOWN</div><div class='add'>+				  | FLAG_HAS_AMT</div><div class='add'>+				  | FLAG_HAS_CTRLEXT_ON_LOAD,</div><div class='add'>+	.pba			= 20,</div><div class='add'>+	.get_variants		= e1000_get_variants_82571,</div><div class='add'>+	.mac_ops		= &amp;e82571_mac_ops,</div><div class='add'>+	.phy_ops		= &amp;e82_phy_ops_bm,</div><div class='add'>+	.nvm_ops		= &amp;e82571_nvm_ops,</div><div class='add'>+};</div><div class='add'>+</div><div class='head'>diff --git a/drivers/net/e1000e/defines.h b/drivers/net/e1000e/defines.h<br/>index 14b0e6cd3b8d..48f79ecb82a0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/e1000e/defines.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/e1000e/defines.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/e1000e/defines.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/e1000e/defines.h</a></div><div class='hunk'>@@ -71,9 +71,11 @@</div><div class='ctx'> #define E1000_CTRL_EXT_RO_DIS    0x00020000 /* Relaxed Ordering disable */</div><div class='ctx'> #define E1000_CTRL_EXT_LINK_MODE_MASK 0x00C00000</div><div class='ctx'> #define E1000_CTRL_EXT_LINK_MODE_PCIE_SERDES  0x00C00000</div><div class='add'>+#define E1000_CTRL_EXT_EIAME          0x01000000</div><div class='ctx'> #define E1000_CTRL_EXT_DRV_LOAD       0x10000000 /* Driver loaded bit for FW */</div><div class='ctx'> #define E1000_CTRL_EXT_IAME           0x08000000 /* Interrupt acknowledge Auto-mask */</div><div class='ctx'> #define E1000_CTRL_EXT_INT_TIMER_CLR  0x20000000 /* Clear Interrupt timers after IMS clear */</div><div class='add'>+#define E1000_CTRL_EXT_PBA_CLR        0x80000000 /* PBA Clear */</div><div class='ctx'> </div><div class='ctx'> /* Receive Descriptor bit definitions */</div><div class='ctx'> #define E1000_RXD_STAT_DD       0x01    /* Descriptor Done */</div><div class='hunk'>@@ -299,6 +301,7 @@</div><div class='ctx'> #define E1000_RXCSUM_IPPCSE    0x00001000   /* IP payload checksum enable */</div><div class='ctx'> </div><div class='ctx'> /* Header split receive */</div><div class='add'>+#define E1000_RFCTL_ACK_DIS             0x00001000</div><div class='ctx'> #define E1000_RFCTL_EXTEN               0x00008000</div><div class='ctx'> #define E1000_RFCTL_IPV6_EX_DIS         0x00010000</div><div class='ctx'> #define E1000_RFCTL_NEW_IPV6_EXT_DIS    0x00020000</div><div class='hunk'>@@ -363,6 +366,11 @@</div><div class='ctx'> #define E1000_ICR_RXDMT0        0x00000010 /* Rx desc min. threshold (0) */</div><div class='ctx'> #define E1000_ICR_RXT0          0x00000080 /* Rx timer intr (ring 0) */</div><div class='ctx'> #define E1000_ICR_INT_ASSERTED  0x80000000 /* If this bit asserted, the driver should claim the interrupt */</div><div class='add'>+#define E1000_ICR_RXQ0          0x00100000 /* Rx Queue 0 Interrupt */</div><div class='add'>+#define E1000_ICR_RXQ1          0x00200000 /* Rx Queue 1 Interrupt */</div><div class='add'>+#define E1000_ICR_TXQ0          0x00400000 /* Tx Queue 0 Interrupt */</div><div class='add'>+#define E1000_ICR_TXQ1          0x00800000 /* Tx Queue 1 Interrupt */</div><div class='add'>+#define E1000_ICR_OTHER         0x01000000 /* Other Interrupts */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * This defines the bits that are set in the Interrupt Mask</div><div class='hunk'>@@ -386,6 +394,11 @@</div><div class='ctx'> #define E1000_IMS_RXSEQ     E1000_ICR_RXSEQ     /* Rx sequence error */</div><div class='ctx'> #define E1000_IMS_RXDMT0    E1000_ICR_RXDMT0    /* Rx desc min. threshold */</div><div class='ctx'> #define E1000_IMS_RXT0      E1000_ICR_RXT0      /* Rx timer intr */</div><div class='add'>+#define E1000_IMS_RXQ0      E1000_ICR_RXQ0      /* Rx Queue 0 Interrupt */</div><div class='add'>+#define E1000_IMS_RXQ1      E1000_ICR_RXQ1      /* Rx Queue 1 Interrupt */</div><div class='add'>+#define E1000_IMS_TXQ0      E1000_ICR_TXQ0      /* Tx Queue 0 Interrupt */</div><div class='add'>+#define E1000_IMS_TXQ1      E1000_ICR_TXQ1      /* Tx Queue 1 Interrupt */</div><div class='add'>+#define E1000_IMS_OTHER     E1000_ICR_OTHER     /* Other Interrupts */</div><div class='ctx'> </div><div class='ctx'> /* Interrupt Cause Set */</div><div class='ctx'> #define E1000_ICS_LSC       E1000_ICR_LSC       /* Link Status Change */</div><div class='hunk'>@@ -505,6 +518,7 @@</div><div class='ctx'> #define NWAY_LPAR_ASM_DIR        0x0800 /* LP Asymmetric Pause Direction bit */</div><div class='ctx'> </div><div class='ctx'> /* Autoneg Expansion Register */</div><div class='add'>+#define NWAY_ER_LP_NWAY_CAPS     0x0001 /* LP has Auto Neg Capability */</div><div class='ctx'> </div><div class='ctx'> /* 1000BASE-T Control Register */</div><div class='ctx'> #define CR_1000T_HD_CAPS         0x0100 /* Advertise 1000T HD capability */</div><div class='hunk'>@@ -540,6 +554,7 @@</div><div class='ctx'> #define E1000_EECD_DO        0x00000008 /* NVM Data Out */</div><div class='ctx'> #define E1000_EECD_REQ       0x00000040 /* NVM Access Request */</div><div class='ctx'> #define E1000_EECD_GNT       0x00000080 /* NVM Access Grant */</div><div class='add'>+#define E1000_EECD_PRES      0x00000100 /* NVM Present */</div><div class='ctx'> #define E1000_EECD_SIZE      0x00000200 /* NVM Size (0=64 word 1=256 word) */</div><div class='ctx'> /* NVM Addressing bits based on type (0-small, 1-large) */</div><div class='ctx'> #define E1000_EECD_ADDR_BITS 0x00000400</div><div class='head'>diff --git a/drivers/net/e1000e/e1000.h b/drivers/net/e1000e/e1000.h<br/>index 5ea6b60fa377..c55de1c027af 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/e1000e/e1000.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/e1000e/e1000.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/e1000e/e1000.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/e1000e/e1000.h</a></div><div class='hunk'>@@ -62,6 +62,11 @@ struct e1000_info;</div><div class='ctx'> 	e_printk(KERN_NOTICE, adapter, format, ## arg)</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+/* Interrupt modes, as used by the IntMode paramter */</div><div class='add'>+#define E1000E_INT_MODE_LEGACY		0</div><div class='add'>+#define E1000E_INT_MODE_MSI		1</div><div class='add'>+#define E1000E_INT_MODE_MSIX		2</div><div class='add'>+</div><div class='ctx'> /* Tx/Rx descriptor defines */</div><div class='ctx'> #define E1000_DEFAULT_TXD		256</div><div class='ctx'> #define E1000_MAX_TXD			4096</div><div class='hunk'>@@ -95,9 +100,11 @@ enum e1000_boards {</div><div class='ctx'> 	board_82571,</div><div class='ctx'> 	board_82572,</div><div class='ctx'> 	board_82573,</div><div class='add'>+	board_82574,</div><div class='ctx'> 	board_80003es2lan,</div><div class='ctx'> 	board_ich8lan,</div><div class='ctx'> 	board_ich9lan,</div><div class='add'>+	board_ich10lan,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct e1000_queue_stats {</div><div class='hunk'>@@ -146,6 +153,12 @@ struct e1000_ring {</div><div class='ctx'> 	/* array of buffer information structs */</div><div class='ctx'> 	struct e1000_buffer *buffer_info;</div><div class='ctx'> </div><div class='add'>+	char name[IFNAMSIZ + 5];</div><div class='add'>+	u32 ims_val;</div><div class='add'>+	u32 itr_val;</div><div class='add'>+	u16 itr_register;</div><div class='add'>+	int set_itr;</div><div class='add'>+</div><div class='ctx'> 	struct sk_buff *rx_skb_top;</div><div class='ctx'> </div><div class='ctx'> 	struct e1000_queue_stats stats;</div><div class='hunk'>@@ -273,6 +286,9 @@ struct e1000_adapter {</div><div class='ctx'> 	u32 test_icr;</div><div class='ctx'> </div><div class='ctx'> 	u32 msg_enable;</div><div class='add'>+	struct msix_entry *msix_entries;</div><div class='add'>+	int int_mode;</div><div class='add'>+	u32 eiac_mask;</div><div class='ctx'> </div><div class='ctx'> 	u32 eeprom_wol;</div><div class='ctx'> 	u32 wol;</div><div class='hunk'>@@ -308,6 +324,7 @@ struct e1000_info {</div><div class='ctx'> #define FLAG_HAS_JUMBO_FRAMES             (1 &lt;&lt; 7)</div><div class='ctx'> #define FLAG_READ_ONLY_NVM                (1 &lt;&lt; 8)</div><div class='ctx'> #define FLAG_IS_ICH                       (1 &lt;&lt; 9)</div><div class='add'>+#define FLAG_HAS_MSIX                     (1 &lt;&lt; 10)</div><div class='ctx'> #define FLAG_HAS_SMART_POWER_DOWN         (1 &lt;&lt; 11)</div><div class='ctx'> #define FLAG_IS_QUAD_PORT_A               (1 &lt;&lt; 12)</div><div class='ctx'> #define FLAG_IS_QUAD_PORT                 (1 &lt;&lt; 13)</div><div class='hunk'>@@ -366,6 +383,8 @@ extern int e1000e_setup_tx_resources(struct e1000_adapter *adapter);</div><div class='ctx'> extern void e1000e_free_rx_resources(struct e1000_adapter *adapter);</div><div class='ctx'> extern void e1000e_free_tx_resources(struct e1000_adapter *adapter);</div><div class='ctx'> extern void e1000e_update_stats(struct e1000_adapter *adapter);</div><div class='add'>+extern void e1000e_set_interrupt_capability(struct e1000_adapter *adapter);</div><div class='add'>+extern void e1000e_reset_interrupt_capability(struct e1000_adapter *adapter);</div><div class='ctx'> </div><div class='ctx'> extern unsigned int copybreak;</div><div class='ctx'> </div><div class='hunk'>@@ -374,8 +393,10 @@ extern char *e1000e_get_hw_dev_name(struct e1000_hw *hw);</div><div class='ctx'> extern struct e1000_info e1000_82571_info;</div><div class='ctx'> extern struct e1000_info e1000_82572_info;</div><div class='ctx'> extern struct e1000_info e1000_82573_info;</div><div class='add'>+extern struct e1000_info e1000_82574_info;</div><div class='ctx'> extern struct e1000_info e1000_ich8_info;</div><div class='ctx'> extern struct e1000_info e1000_ich9_info;</div><div class='add'>+extern struct e1000_info e1000_ich10_info;</div><div class='ctx'> extern struct e1000_info e1000_es2_info;</div><div class='ctx'> </div><div class='ctx'> extern s32 e1000e_read_pba_num(struct e1000_hw *hw, u32 *pba_num);</div><div class='hunk'>@@ -449,10 +470,13 @@ extern s32 e1000e_get_cable_length_m88(struct e1000_hw *hw);</div><div class='ctx'> extern s32 e1000e_get_phy_info_m88(struct e1000_hw *hw);</div><div class='ctx'> extern s32 e1000e_read_phy_reg_m88(struct e1000_hw *hw, u32 offset, u16 *data);</div><div class='ctx'> extern s32 e1000e_write_phy_reg_m88(struct e1000_hw *hw, u32 offset, u16 data);</div><div class='add'>+extern s32 e1000e_phy_init_script_igp3(struct e1000_hw *hw);</div><div class='ctx'> extern enum e1000_phy_type e1000e_get_phy_type_from_id(u32 phy_id);</div><div class='ctx'> extern s32 e1000e_determine_phy_address(struct e1000_hw *hw);</div><div class='ctx'> extern s32 e1000e_write_phy_reg_bm(struct e1000_hw *hw, u32 offset, u16 data);</div><div class='ctx'> extern s32 e1000e_read_phy_reg_bm(struct e1000_hw *hw, u32 offset, u16 *data);</div><div class='add'>+extern s32 e1000e_read_phy_reg_bm2(struct e1000_hw *hw, u32 offset, u16 *data);</div><div class='add'>+extern s32 e1000e_write_phy_reg_bm2(struct e1000_hw *hw, u32 offset, u16 data);</div><div class='ctx'> extern void e1000e_phy_force_speed_duplex_setup(struct e1000_hw *hw, u16 *phy_ctrl);</div><div class='ctx'> extern s32 e1000e_write_kmrn_reg(struct e1000_hw *hw, u32 offset, u16 data);</div><div class='ctx'> extern s32 e1000e_read_kmrn_reg(struct e1000_hw *hw, u32 offset, u16 *data);</div><div class='hunk'>@@ -523,7 +547,12 @@ static inline s32 e1000_get_phy_info(struct e1000_hw *hw)</div><div class='ctx'> 	return hw-&gt;phy.ops.get_phy_info(hw);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-extern bool e1000e_check_mng_mode(struct e1000_hw *hw);</div><div class='add'>+static inline s32 e1000e_check_mng_mode(struct e1000_hw *hw)</div><div class='add'>+{</div><div class='add'>+	return hw-&gt;mac.ops.check_mng_mode(hw);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+extern bool e1000e_check_mng_mode_generic(struct e1000_hw *hw);</div><div class='ctx'> extern bool e1000e_enable_tx_pkt_filtering(struct e1000_hw *hw);</div><div class='ctx'> extern s32 e1000e_mng_write_dhcp_info(struct e1000_hw *hw, u8 *buffer, u16 length);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/e1000e/es2lan.c b/drivers/net/e1000e/es2lan.c<br/>index dc552d7d6fac..da9c09c248ed 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/e1000e/es2lan.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/e1000e/es2lan.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/e1000e/es2lan.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/e1000e/es2lan.c</a></div><div class='hunk'>@@ -1247,7 +1247,7 @@ static void e1000_clear_hw_cntrs_80003es2lan(struct e1000_hw *hw)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct e1000_mac_operations es2_mac_ops = {</div><div class='del'>-	.mng_mode_enab		= E1000_MNG_IAMT_MODE &lt;&lt; E1000_FWSM_MODE_SHIFT,</div><div class='add'>+	.check_mng_mode		= e1000e_check_mng_mode_generic,</div><div class='ctx'> 	/* check_for_link dependent on media type */</div><div class='ctx'> 	.cleanup_led		= e1000e_cleanup_led_generic,</div><div class='ctx'> 	.clear_hw_cntrs		= e1000_clear_hw_cntrs_80003es2lan,</div><div class='head'>diff --git a/drivers/net/e1000e/ethtool.c b/drivers/net/e1000e/ethtool.c<br/>index 33a3ff17b5d0..70c11c811a08 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/e1000e/ethtool.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/e1000e/ethtool.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/e1000e/ethtool.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/e1000e/ethtool.c</a></div><div class='hunk'>@@ -575,6 +575,7 @@ static int e1000_set_eeprom(struct net_device *netdev,</div><div class='ctx'> 	 * and flush shadow RAM for 82573 controllers</div><div class='ctx'> 	 */</div><div class='ctx'> 	if ((ret_val == 0) &amp;&amp; ((first_word &lt;= NVM_CHECKSUM_REG) ||</div><div class='add'>+			       (hw-&gt;mac.type == e1000_82574) ||</div><div class='ctx'> 			       (hw-&gt;mac.type == e1000_82573)))</div><div class='ctx'> 		e1000e_update_nvm_checksum(hw);</div><div class='ctx'> </div><div class='hunk'>@@ -786,8 +787,10 @@ static int e1000_reg_test(struct e1000_adapter *adapter, u64 *data)</div><div class='ctx'> 		toggle = 0x7FFFF3FF;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case e1000_82573:</div><div class='add'>+	case e1000_82574:</div><div class='ctx'> 	case e1000_ich8lan:</div><div class='ctx'> 	case e1000_ich9lan:</div><div class='add'>+	case e1000_ich10lan:</div><div class='ctx'> 		toggle = 0x7FFFF033;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -840,7 +843,9 @@ static int e1000_reg_test(struct e1000_adapter *adapter, u64 *data)</div><div class='ctx'> 	REG_PATTERN_TEST(E1000_TIDV, 0x0000FFFF, 0x0000FFFF);</div><div class='ctx'> 	for (i = 0; i &lt; mac-&gt;rar_entry_count; i++)</div><div class='ctx'> 		REG_PATTERN_TEST_ARRAY(E1000_RA, ((i &lt;&lt; 1) + 1),</div><div class='del'>-				       0x8003FFFF, 0xFFFFFFFF);</div><div class='add'>+				       ((mac-&gt;type == e1000_ich10lan) ?</div><div class='add'>+					   0x8007FFFF : 0x8003FFFF),</div><div class='add'>+				       0xFFFFFFFF);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; mac-&gt;mta_reg_count; i++)</div><div class='ctx'> 		REG_PATTERN_TEST_ARRAY(E1000_MTA, i, 0xFFFFFFFF, 0xFFFFFFFF);</div><div class='hunk'>@@ -891,10 +896,18 @@ static int e1000_intr_test(struct e1000_adapter *adapter, u64 *data)</div><div class='ctx'> 	u32 shared_int = 1;</div><div class='ctx'> 	u32 irq = adapter-&gt;pdev-&gt;irq;</div><div class='ctx'> 	int i;</div><div class='add'>+	int ret_val = 0;</div><div class='add'>+	int int_mode = E1000E_INT_MODE_LEGACY;</div><div class='ctx'> </div><div class='ctx'> 	*data = 0;</div><div class='ctx'> </div><div class='del'>-	/* NOTE: we don't test MSI interrupts here, yet */</div><div class='add'>+	/* NOTE: we don't test MSI/MSI-X interrupts here, yet */</div><div class='add'>+	if (adapter-&gt;int_mode == E1000E_INT_MODE_MSIX) {</div><div class='add'>+		int_mode = adapter-&gt;int_mode;</div><div class='add'>+		e1000e_reset_interrupt_capability(adapter);</div><div class='add'>+		adapter-&gt;int_mode = E1000E_INT_MODE_LEGACY;</div><div class='add'>+		e1000e_set_interrupt_capability(adapter);</div><div class='add'>+	}</div><div class='ctx'> 	/* Hook up test interrupt handler just for this test */</div><div class='ctx'> 	if (!request_irq(irq, &amp;e1000_test_intr, IRQF_PROBE_SHARED, netdev-&gt;name,</div><div class='ctx'> 			 netdev)) {</div><div class='hunk'>@@ -902,7 +915,8 @@ static int e1000_intr_test(struct e1000_adapter *adapter, u64 *data)</div><div class='ctx'> 	} else if (request_irq(irq, &amp;e1000_test_intr, IRQF_SHARED,</div><div class='ctx'> 		 netdev-&gt;name, netdev)) {</div><div class='ctx'> 		*data = 1;</div><div class='del'>-		return -1;</div><div class='add'>+		ret_val = -1;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	e_info("testing %s interrupt\n", (shared_int ? "shared" : "unshared"));</div><div class='ctx'> </div><div class='hunk'>@@ -912,12 +926,23 @@ static int e1000_intr_test(struct e1000_adapter *adapter, u64 *data)</div><div class='ctx'> </div><div class='ctx'> 	/* Test each interrupt */</div><div class='ctx'> 	for (i = 0; i &lt; 10; i++) {</div><div class='del'>-		if ((adapter-&gt;flags &amp; FLAG_IS_ICH) &amp;&amp; (i == 8))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='ctx'> 		/* Interrupt to test */</div><div class='ctx'> 		mask = 1 &lt;&lt; i;</div><div class='ctx'> </div><div class='add'>+		if (adapter-&gt;flags &amp; FLAG_IS_ICH) {</div><div class='add'>+			switch (mask) {</div><div class='add'>+			case E1000_ICR_RXSEQ:</div><div class='add'>+				continue;</div><div class='add'>+			case 0x00000100:</div><div class='add'>+				if (adapter-&gt;hw.mac.type == e1000_ich8lan ||</div><div class='add'>+				    adapter-&gt;hw.mac.type == e1000_ich9lan)</div><div class='add'>+					continue;</div><div class='add'>+				break;</div><div class='add'>+			default:</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		if (!shared_int) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Disable the interrupt to be reported in</div><div class='hunk'>@@ -981,7 +1006,14 @@ static int e1000_intr_test(struct e1000_adapter *adapter, u64 *data)</div><div class='ctx'> 	/* Unhook test interrupt handler */</div><div class='ctx'> 	free_irq(irq, netdev);</div><div class='ctx'> </div><div class='del'>-	return *data;</div><div class='add'>+out:</div><div class='add'>+	if (int_mode == E1000E_INT_MODE_MSIX) {</div><div class='add'>+		e1000e_reset_interrupt_capability(adapter);</div><div class='add'>+		adapter-&gt;int_mode = int_mode;</div><div class='add'>+		e1000e_set_interrupt_capability(adapter);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret_val;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void e1000_free_desc_rings(struct e1000_adapter *adapter)</div><div class='hunk'>@@ -1762,11 +1794,13 @@ static void e1000_led_blink_callback(unsigned long data)</div><div class='ctx'> static int e1000_phys_id(struct net_device *netdev, u32 data)</div><div class='ctx'> {</div><div class='ctx'> 	struct e1000_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+	struct e1000_hw *hw = &amp;adapter-&gt;hw;</div><div class='ctx'> </div><div class='ctx'> 	if (!data)</div><div class='ctx'> 		data = INT_MAX;</div><div class='ctx'> </div><div class='del'>-	if (adapter-&gt;hw.phy.type == e1000_phy_ife) {</div><div class='add'>+	if ((hw-&gt;phy.type == e1000_phy_ife) ||</div><div class='add'>+	    (hw-&gt;mac.type == e1000_82574)) {</div><div class='ctx'> 		if (!adapter-&gt;blink_timer.function) {</div><div class='ctx'> 			init_timer(&amp;adapter-&gt;blink_timer);</div><div class='ctx'> 			adapter-&gt;blink_timer.function =</div><div class='hunk'>@@ -1776,16 +1810,16 @@ static int e1000_phys_id(struct net_device *netdev, u32 data)</div><div class='ctx'> 		mod_timer(&amp;adapter-&gt;blink_timer, jiffies);</div><div class='ctx'> 		msleep_interruptible(data * 1000);</div><div class='ctx'> 		del_timer_sync(&amp;adapter-&gt;blink_timer);</div><div class='del'>-		e1e_wphy(&amp;adapter-&gt;hw,</div><div class='del'>-				    IFE_PHY_SPECIAL_CONTROL_LED, 0);</div><div class='add'>+		if (hw-&gt;phy.type == e1000_phy_ife)</div><div class='add'>+			e1e_wphy(hw, IFE_PHY_SPECIAL_CONTROL_LED, 0);</div><div class='ctx'> 	} else {</div><div class='del'>-		e1000e_blink_led(&amp;adapter-&gt;hw);</div><div class='add'>+		e1000e_blink_led(hw);</div><div class='ctx'> 		msleep_interruptible(data * 1000);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	adapter-&gt;hw.mac.ops.led_off(&amp;adapter-&gt;hw);</div><div class='add'>+	hw-&gt;mac.ops.led_off(hw);</div><div class='ctx'> 	clear_bit(E1000_LED_ON, &amp;adapter-&gt;led_status);</div><div class='del'>-	adapter-&gt;hw.mac.ops.cleanup_led(&amp;adapter-&gt;hw);</div><div class='add'>+	hw-&gt;mac.ops.cleanup_led(hw);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/e1000e/hw.h b/drivers/net/e1000e/hw.h<br/>index 74f263acb172..f66ed37a7f76 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/e1000e/hw.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/e1000e/hw.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/e1000e/hw.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/e1000e/hw.h</a></div><div class='hunk'>@@ -65,7 +65,11 @@ enum e1e_registers {</div><div class='ctx'> 	E1000_ICS      = 0x000C8, /* Interrupt Cause Set - WO */</div><div class='ctx'> 	E1000_IMS      = 0x000D0, /* Interrupt Mask Set - RW */</div><div class='ctx'> 	E1000_IMC      = 0x000D8, /* Interrupt Mask Clear - WO */</div><div class='add'>+	E1000_EIAC_82574 = 0x000DC, /* Ext. Interrupt Auto Clear - RW */</div><div class='ctx'> 	E1000_IAM      = 0x000E0, /* Interrupt Acknowledge Auto Mask */</div><div class='add'>+	E1000_IVAR     = 0x000E4, /* Interrupt Vector Allocation - RW */</div><div class='add'>+	E1000_EITR_82574_BASE = 0x000E8, /* Interrupt Throttling - RW */</div><div class='add'>+#define E1000_EITR_82574(_n) (E1000_EITR_82574_BASE + (_n &lt;&lt; 2))</div><div class='ctx'> 	E1000_RCTL     = 0x00100, /* Rx Control - RW */</div><div class='ctx'> 	E1000_FCTTV    = 0x00170, /* Flow Control Transmit Timer Value - RW */</div><div class='ctx'> 	E1000_TXCW     = 0x00178, /* Tx Configuration Word - RW */</div><div class='hunk'>@@ -332,6 +336,7 @@ enum e1e_registers {</div><div class='ctx'> #define E1000_DEV_ID_82573E			0x108B</div><div class='ctx'> #define E1000_DEV_ID_82573E_IAMT		0x108C</div><div class='ctx'> #define E1000_DEV_ID_82573L			0x109A</div><div class='add'>+#define E1000_DEV_ID_82574L			0x10D3</div><div class='ctx'> </div><div class='ctx'> #define E1000_DEV_ID_80003ES2LAN_COPPER_DPT	0x1096</div><div class='ctx'> #define E1000_DEV_ID_80003ES2LAN_SERDES_DPT	0x1098</div><div class='hunk'>@@ -346,6 +351,7 @@ enum e1e_registers {</div><div class='ctx'> #define E1000_DEV_ID_ICH8_IFE_G			0x10C5</div><div class='ctx'> #define E1000_DEV_ID_ICH8_IGP_M			0x104D</div><div class='ctx'> #define E1000_DEV_ID_ICH9_IGP_AMT		0x10BD</div><div class='add'>+#define E1000_DEV_ID_ICH9_BM			0x10E5</div><div class='ctx'> #define E1000_DEV_ID_ICH9_IGP_M_AMT		0x10F5</div><div class='ctx'> #define E1000_DEV_ID_ICH9_IGP_M			0x10BF</div><div class='ctx'> #define E1000_DEV_ID_ICH9_IGP_M_V		0x10CB</div><div class='hunk'>@@ -356,6 +362,10 @@ enum e1e_registers {</div><div class='ctx'> #define E1000_DEV_ID_ICH10_R_BM_LM		0x10CC</div><div class='ctx'> #define E1000_DEV_ID_ICH10_R_BM_LF		0x10CD</div><div class='ctx'> #define E1000_DEV_ID_ICH10_R_BM_V		0x10CE</div><div class='add'>+#define E1000_DEV_ID_ICH10_D_BM_LM		0x10DE</div><div class='add'>+#define E1000_DEV_ID_ICH10_D_BM_LF		0x10DF</div><div class='add'>+</div><div class='add'>+#define E1000_REVISION_4 4</div><div class='ctx'> </div><div class='ctx'> #define E1000_FUNC_1 1</div><div class='ctx'> </div><div class='hunk'>@@ -363,9 +373,11 @@ enum e1000_mac_type {</div><div class='ctx'> 	e1000_82571,</div><div class='ctx'> 	e1000_82572,</div><div class='ctx'> 	e1000_82573,</div><div class='add'>+	e1000_82574,</div><div class='ctx'> 	e1000_80003es2lan,</div><div class='ctx'> 	e1000_ich8lan,</div><div class='ctx'> 	e1000_ich9lan,</div><div class='add'>+	e1000_ich10lan,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum e1000_media_type {</div><div class='hunk'>@@ -696,8 +708,7 @@ struct e1000_host_mng_command_info {</div><div class='ctx'> </div><div class='ctx'> /* Function pointers and static data for the MAC. */</div><div class='ctx'> struct e1000_mac_operations {</div><div class='del'>-	u32			mng_mode_enab;</div><div class='del'>-</div><div class='add'>+	bool (*check_mng_mode)(struct e1000_hw *);</div><div class='ctx'> 	s32  (*check_for_link)(struct e1000_hw *);</div><div class='ctx'> 	s32  (*cleanup_led)(struct e1000_hw *);</div><div class='ctx'> 	void (*clear_hw_cntrs)(struct e1000_hw *);</div><div class='head'>diff --git a/drivers/net/e1000e/ich8lan.c b/drivers/net/e1000e/ich8lan.c<br/>index bcd2bc477af2..523b9716a543 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/e1000e/ich8lan.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/e1000e/ich8lan.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/e1000e/ich8lan.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/e1000e/ich8lan.c</a></div><div class='hunk'>@@ -43,7 +43,9 @@</div><div class='ctx'>  * 82567LM-2 Gigabit Network Connection</div><div class='ctx'>  * 82567LF-2 Gigabit Network Connection</div><div class='ctx'>  * 82567V-2 Gigabit Network Connection</div><div class='del'>- * 82562GT-3 10/100 Network Connection</div><div class='add'>+ * 82567LF-3 Gigabit Network Connection</div><div class='add'>+ * 82567LM-3 Gigabit Network Connection</div><div class='add'>+ * 82567LM-4 Gigabit Network Connection</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='hunk'>@@ -171,12 +173,15 @@ static s32 e1000_check_polarity_ife_ich8lan(struct e1000_hw *hw);</div><div class='ctx'> static s32 e1000_erase_flash_bank_ich8lan(struct e1000_hw *hw, u32 bank);</div><div class='ctx'> static s32 e1000_retry_write_flash_byte_ich8lan(struct e1000_hw *hw,</div><div class='ctx'> 						u32 offset, u8 byte);</div><div class='add'>+static s32 e1000_read_flash_byte_ich8lan(struct e1000_hw *hw, u32 offset,</div><div class='add'>+					 u8 *data);</div><div class='ctx'> static s32 e1000_read_flash_word_ich8lan(struct e1000_hw *hw, u32 offset,</div><div class='ctx'> 					 u16 *data);</div><div class='ctx'> static s32 e1000_read_flash_data_ich8lan(struct e1000_hw *hw, u32 offset,</div><div class='ctx'> 					 u8 size, u16 *data);</div><div class='ctx'> static s32 e1000_setup_copper_link_ich8lan(struct e1000_hw *hw);</div><div class='ctx'> static s32 e1000_kmrn_lock_loss_workaround_ich8lan(struct e1000_hw *hw);</div><div class='add'>+static s32 e1000_get_cfg_done_ich8lan(struct e1000_hw *hw);</div><div class='ctx'> </div><div class='ctx'> static inline u16 __er16flash(struct e1000_hw *hw, unsigned long reg)</div><div class='ctx'> {</div><div class='hunk'>@@ -419,6 +424,8 @@ static s32 e1000_acquire_swflag_ich8lan(struct e1000_hw *hw)</div><div class='ctx'> </div><div class='ctx'> 	if (!timeout) {</div><div class='ctx'> 		hw_dbg(hw, "FW or HW has locked the resource for too long.\n");</div><div class='add'>+		extcnf_ctrl &amp;= ~E1000_EXTCNF_CTRL_SWFLAG;</div><div class='add'>+		ew32(EXTCNF_CTRL, extcnf_ctrl);</div><div class='ctx'> 		nvm_owner = -1;</div><div class='ctx'> 		mutex_unlock(&amp;nvm_mutex);</div><div class='ctx'> 		return -E1000_ERR_CONFIG;</div><div class='hunk'>@@ -448,6 +455,22 @@ static void e1000_release_swflag_ich8lan(struct e1000_hw *hw)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ *  e1000_check_mng_mode_ich8lan - Checks management mode</div><div class='add'>+ *  @hw: pointer to the HW structure</div><div class='add'>+ *</div><div class='add'>+ *  This checks if the adapter has manageability enabled.</div><div class='add'>+ *  This is a function pointer entry point only called by read/write</div><div class='add'>+ *  routines for the PHY and NVM parts.</div><div class='add'>+ **/</div><div class='add'>+static bool e1000_check_mng_mode_ich8lan(struct e1000_hw *hw)</div><div class='add'>+{</div><div class='add'>+	u32 fwsm = er32(FWSM);</div><div class='add'>+</div><div class='add'>+	return (fwsm &amp; E1000_FWSM_MODE_MASK) ==</div><div class='add'>+		(E1000_ICH_MNG_IAMT_MODE &lt;&lt; E1000_FWSM_MODE_SHIFT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  *  e1000_check_reset_block_ich8lan - Check if PHY reset is blocked</div><div class='ctx'>  *  @hw: pointer to the HW structure</div><div class='ctx'>  *</div><div class='hunk'>@@ -928,6 +951,56 @@ static s32 e1000_set_d3_lplu_state_ich8lan(struct e1000_hw *hw, bool active)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ *  e1000_valid_nvm_bank_detect_ich8lan - finds out the valid bank 0 or 1</div><div class='add'>+ *  @hw: pointer to the HW structure</div><div class='add'>+ *  @bank:  pointer to the variable that returns the active bank</div><div class='add'>+ *</div><div class='add'>+ *  Reads signature byte from the NVM using the flash access registers.</div><div class='add'>+ **/</div><div class='add'>+static s32 e1000_valid_nvm_bank_detect_ich8lan(struct e1000_hw *hw, u32 *bank)</div><div class='add'>+{</div><div class='add'>+	struct e1000_nvm_info *nvm = &amp;hw-&gt;nvm;</div><div class='add'>+	/* flash bank size is in words */</div><div class='add'>+	u32 bank1_offset = nvm-&gt;flash_bank_size * sizeof(u16);</div><div class='add'>+	u32 act_offset = E1000_ICH_NVM_SIG_WORD * 2 + 1;</div><div class='add'>+	u8 bank_high_byte = 0;</div><div class='add'>+</div><div class='add'>+	if (hw-&gt;mac.type != e1000_ich10lan) {</div><div class='add'>+		if (er32(EECD) &amp; E1000_EECD_SEC1VAL)</div><div class='add'>+			*bank = 1;</div><div class='add'>+		else</div><div class='add'>+			*bank = 0;</div><div class='add'>+	} else {</div><div class='add'>+		/*</div><div class='add'>+		 * Make sure the signature for bank 0 is valid,</div><div class='add'>+		 * if not check for bank1</div><div class='add'>+		 */</div><div class='add'>+		e1000_read_flash_byte_ich8lan(hw, act_offset, &amp;bank_high_byte);</div><div class='add'>+		if ((bank_high_byte &amp; 0xC0) == 0x80) {</div><div class='add'>+			*bank = 0;</div><div class='add'>+		} else {</div><div class='add'>+			/*</div><div class='add'>+			 * find if segment 1 is valid by verifying</div><div class='add'>+			 * bit 15:14 = 10b in word 0x13</div><div class='add'>+			 */</div><div class='add'>+			e1000_read_flash_byte_ich8lan(hw,</div><div class='add'>+						      act_offset + bank1_offset,</div><div class='add'>+						      &amp;bank_high_byte);</div><div class='add'>+</div><div class='add'>+			/* bank1 has a valid signature equivalent to SEC1V */</div><div class='add'>+			if ((bank_high_byte &amp; 0xC0) == 0x80) {</div><div class='add'>+				*bank = 1;</div><div class='add'>+			} else {</div><div class='add'>+				hw_dbg(hw, "ERROR: EEPROM not present\n");</div><div class='add'>+				return -E1000_ERR_NVM;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  *  e1000_read_nvm_ich8lan - Read word(s) from the NVM</div><div class='ctx'>  *  @hw: pointer to the HW structure</div><div class='ctx'>  *  @offset: The offset (in bytes) of the word(s) to read.</div><div class='hunk'>@@ -943,6 +1016,7 @@ static s32 e1000_read_nvm_ich8lan(struct e1000_hw *hw, u16 offset, u16 words,</div><div class='ctx'> 	struct e1000_dev_spec_ich8lan *dev_spec = &amp;hw-&gt;dev_spec.ich8lan;</div><div class='ctx'> 	u32 act_offset;</div><div class='ctx'> 	s32 ret_val;</div><div class='add'>+	u32 bank = 0;</div><div class='ctx'> 	u16 i, word;</div><div class='ctx'> </div><div class='ctx'> 	if ((offset &gt;= nvm-&gt;word_size) || (words &gt; nvm-&gt;word_size - offset) ||</div><div class='hunk'>@@ -955,10 +1029,11 @@ static s32 e1000_read_nvm_ich8lan(struct e1000_hw *hw, u16 offset, u16 words,</div><div class='ctx'> 	if (ret_val)</div><div class='ctx'> 		return ret_val;</div><div class='ctx'> </div><div class='del'>-	/* Start with the bank offset, then add the relative offset. */</div><div class='del'>-	act_offset = (er32(EECD) &amp; E1000_EECD_SEC1VAL)</div><div class='del'>-		     ? nvm-&gt;flash_bank_size</div><div class='del'>-		     : 0;</div><div class='add'>+	ret_val = e1000_valid_nvm_bank_detect_ich8lan(hw, &amp;bank);</div><div class='add'>+	if (ret_val)</div><div class='add'>+		return ret_val;</div><div class='add'>+</div><div class='add'>+	act_offset = (bank) ? nvm-&gt;flash_bank_size : 0;</div><div class='ctx'> 	act_offset += offset;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; words; i++) {</div><div class='hunk'>@@ -1106,6 +1181,29 @@ static s32 e1000_read_flash_word_ich8lan(struct e1000_hw *hw, u32 offset,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ *  e1000_read_flash_byte_ich8lan - Read byte from flash</div><div class='add'>+ *  @hw: pointer to the HW structure</div><div class='add'>+ *  @offset: The offset of the byte to read.</div><div class='add'>+ *  @data: Pointer to a byte to store the value read.</div><div class='add'>+ *</div><div class='add'>+ *  Reads a single byte from the NVM using the flash access registers.</div><div class='add'>+ **/</div><div class='add'>+static s32 e1000_read_flash_byte_ich8lan(struct e1000_hw *hw, u32 offset,</div><div class='add'>+					 u8 *data)</div><div class='add'>+{</div><div class='add'>+	s32 ret_val;</div><div class='add'>+	u16 word = 0;</div><div class='add'>+</div><div class='add'>+	ret_val = e1000_read_flash_data_ich8lan(hw, offset, 1, &amp;word);</div><div class='add'>+	if (ret_val)</div><div class='add'>+		return ret_val;</div><div class='add'>+</div><div class='add'>+	*data = (u8)word;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  *  e1000_read_flash_data_ich8lan - Read byte or word from NVM</div><div class='ctx'>  *  @hw: pointer to the HW structure</div><div class='ctx'>  *  @offset: The offset (in bytes) of the byte or word to read.</div><div class='hunk'>@@ -1236,7 +1334,7 @@ static s32 e1000_update_nvm_checksum_ich8lan(struct e1000_hw *hw)</div><div class='ctx'> {</div><div class='ctx'> 	struct e1000_nvm_info *nvm = &amp;hw-&gt;nvm;</div><div class='ctx'> 	struct e1000_dev_spec_ich8lan *dev_spec = &amp;hw-&gt;dev_spec.ich8lan;</div><div class='del'>-	u32 i, act_offset, new_bank_offset, old_bank_offset;</div><div class='add'>+	u32 i, act_offset, new_bank_offset, old_bank_offset, bank;</div><div class='ctx'> 	s32 ret_val;</div><div class='ctx'> 	u16 data;</div><div class='ctx'> </div><div class='hunk'>@@ -1256,7 +1354,11 @@ static s32 e1000_update_nvm_checksum_ich8lan(struct e1000_hw *hw)</div><div class='ctx'> 	 * write to bank 0 etc.  We also need to erase the segment that</div><div class='ctx'> 	 * is going to be written</div><div class='ctx'> 	 */</div><div class='del'>-	if (!(er32(EECD) &amp; E1000_EECD_SEC1VAL)) {</div><div class='add'>+	ret_val =  e1000_valid_nvm_bank_detect_ich8lan(hw, &amp;bank);</div><div class='add'>+	if (ret_val)</div><div class='add'>+		return ret_val;</div><div class='add'>+</div><div class='add'>+	if (bank == 0) {</div><div class='ctx'> 		new_bank_offset = nvm-&gt;flash_bank_size;</div><div class='ctx'> 		old_bank_offset = 0;</div><div class='ctx'> 		e1000_erase_flash_bank_ich8lan(hw, 1);</div><div class='hunk'>@@ -2267,13 +2369,14 @@ void e1000e_gig_downshift_workaround_ich8lan(struct e1000_hw *hw)</div><div class='ctx'>  *  'LPLU Enabled' and 'Gig Disable' to force link speed negotiation</div><div class='ctx'>  *  to a lower speed.</div><div class='ctx'>  *</div><div class='del'>- *  Should only be called for ICH9 devices.</div><div class='add'>+ *  Should only be called for ICH9 and ICH10 devices.</div><div class='ctx'>  **/</div><div class='ctx'> void e1000e_disable_gig_wol_ich8lan(struct e1000_hw *hw)</div><div class='ctx'> {</div><div class='ctx'> 	u32 phy_ctrl;</div><div class='ctx'> </div><div class='del'>-	if (hw-&gt;mac.type == e1000_ich9lan) {</div><div class='add'>+	if ((hw-&gt;mac.type == e1000_ich10lan) ||</div><div class='add'>+	    (hw-&gt;mac.type == e1000_ich9lan)) {</div><div class='ctx'> 		phy_ctrl = er32(PHY_CTRL);</div><div class='ctx'> 		phy_ctrl |= E1000_PHY_CTRL_D0A_LPLU |</div><div class='ctx'> 		            E1000_PHY_CTRL_GBE_DISABLE;</div><div class='hunk'>@@ -2331,6 +2434,39 @@ static s32 e1000_led_off_ich8lan(struct e1000_hw *hw)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ *  e1000_get_cfg_done_ich8lan - Read config done bit</div><div class='add'>+ *  @hw: pointer to the HW structure</div><div class='add'>+ *</div><div class='add'>+ *  Read the management control register for the config done bit for</div><div class='add'>+ *  completion status.  NOTE: silicon which is EEPROM-less will fail trying</div><div class='add'>+ *  to read the config done bit, so an error is *ONLY* logged and returns</div><div class='add'>+ *  E1000_SUCCESS.  If we were to return with error, EEPROM-less silicon</div><div class='add'>+ *  would not be able to be reset or change link.</div><div class='add'>+ **/</div><div class='add'>+static s32 e1000_get_cfg_done_ich8lan(struct e1000_hw *hw)</div><div class='add'>+{</div><div class='add'>+	u32 bank = 0;</div><div class='add'>+</div><div class='add'>+	e1000e_get_cfg_done(hw);</div><div class='add'>+</div><div class='add'>+	/* If EEPROM is not marked present, init the IGP 3 PHY manually */</div><div class='add'>+	if (hw-&gt;mac.type != e1000_ich10lan) {</div><div class='add'>+		if (((er32(EECD) &amp; E1000_EECD_PRES) == 0) &amp;&amp;</div><div class='add'>+		    (hw-&gt;phy.type == e1000_phy_igp_3)) {</div><div class='add'>+			e1000e_phy_init_script_igp3(hw);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		if (e1000_valid_nvm_bank_detect_ich8lan(hw, &amp;bank)) {</div><div class='add'>+			/* Maybe we should do a basic PHY config */</div><div class='add'>+			hw_dbg(hw, "EEPROM not present\n");</div><div class='add'>+			return -E1000_ERR_CONFIG;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  *  e1000_clear_hw_cntrs_ich8lan - Clear statistical counters</div><div class='ctx'>  *  @hw: pointer to the HW structure</div><div class='ctx'>  *</div><div class='hunk'>@@ -2360,7 +2496,7 @@ static void e1000_clear_hw_cntrs_ich8lan(struct e1000_hw *hw)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct e1000_mac_operations ich8_mac_ops = {</div><div class='del'>-	.mng_mode_enab		= E1000_ICH_MNG_IAMT_MODE &lt;&lt; E1000_FWSM_MODE_SHIFT,</div><div class='add'>+	.check_mng_mode		= e1000_check_mng_mode_ich8lan,</div><div class='ctx'> 	.check_for_link		= e1000e_check_for_copper_link,</div><div class='ctx'> 	.cleanup_led		= e1000_cleanup_led_ich8lan,</div><div class='ctx'> 	.clear_hw_cntrs		= e1000_clear_hw_cntrs_ich8lan,</div><div class='hunk'>@@ -2380,7 +2516,7 @@ static struct e1000_phy_operations ich8_phy_ops = {</div><div class='ctx'> 	.check_reset_block	= e1000_check_reset_block_ich8lan,</div><div class='ctx'> 	.commit_phy		= NULL,</div><div class='ctx'> 	.force_speed_duplex	= e1000_phy_force_speed_duplex_ich8lan,</div><div class='del'>-	.get_cfg_done		= e1000e_get_cfg_done,</div><div class='add'>+	.get_cfg_done		= e1000_get_cfg_done_ich8lan,</div><div class='ctx'> 	.get_cable_length	= e1000e_get_cable_length_igp_2,</div><div class='ctx'> 	.get_phy_info		= e1000_get_phy_info_ich8lan,</div><div class='ctx'> 	.read_phy_reg		= e1000e_read_phy_reg_igp,</div><div class='hunk'>@@ -2435,3 +2571,20 @@ struct e1000_info e1000_ich9_info = {</div><div class='ctx'> 	.nvm_ops		= &amp;ich8_nvm_ops,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct e1000_info e1000_ich10_info = {</div><div class='add'>+	.mac			= e1000_ich10lan,</div><div class='add'>+	.flags			= FLAG_HAS_JUMBO_FRAMES</div><div class='add'>+				  | FLAG_IS_ICH</div><div class='add'>+				  | FLAG_HAS_WOL</div><div class='add'>+				  | FLAG_RX_CSUM_ENABLED</div><div class='add'>+				  | FLAG_HAS_CTRLEXT_ON_LOAD</div><div class='add'>+				  | FLAG_HAS_AMT</div><div class='add'>+				  | FLAG_HAS_ERT</div><div class='add'>+				  | FLAG_HAS_FLASH</div><div class='add'>+				  | FLAG_APME_IN_WUC,</div><div class='add'>+	.pba			= 10,</div><div class='add'>+	.get_variants		= e1000_get_variants_ich8lan,</div><div class='add'>+	.mac_ops		= &amp;ich8_mac_ops,</div><div class='add'>+	.phy_ops		= &amp;ich8_phy_ops,</div><div class='add'>+	.nvm_ops		= &amp;ich8_nvm_ops,</div><div class='add'>+};</div><div class='head'>diff --git a/drivers/net/e1000e/lib.c b/drivers/net/e1000e/lib.c<br/>index f1f4e9dfd0a0..089578f6855a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/e1000e/lib.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/e1000e/lib.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/e1000e/lib.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/e1000e/lib.c</a></div><div class='hunk'>@@ -2012,6 +2012,7 @@ s32 e1000e_write_nvm_spi(struct e1000_hw *hw, u16 offset, u16 words, u16 *data)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	msleep(10);</div><div class='add'>+	nvm-&gt;ops.release_nvm(hw);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2222,17 +2223,18 @@ static s32 e1000_mng_enable_host_if(struct e1000_hw *hw)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *  e1000e_check_mng_mode - check management mode</div><div class='add'>+ *  e1000e_check_mng_mode_generic - check management mode</div><div class='ctx'>  *  @hw: pointer to the HW structure</div><div class='ctx'>  *</div><div class='ctx'>  *  Reads the firmware semaphore register and returns true (&gt;0) if</div><div class='ctx'>  *  manageability is enabled, else false (0).</div><div class='ctx'>  **/</div><div class='del'>-bool e1000e_check_mng_mode(struct e1000_hw *hw)</div><div class='add'>+bool e1000e_check_mng_mode_generic(struct e1000_hw *hw)</div><div class='ctx'> {</div><div class='ctx'> 	u32 fwsm = er32(FWSM);</div><div class='ctx'> </div><div class='del'>-	return (fwsm &amp; E1000_FWSM_MODE_MASK) == hw-&gt;mac.ops.mng_mode_enab;</div><div class='add'>+	return (fwsm &amp; E1000_FWSM_MODE_MASK) ==</div><div class='add'>+		(E1000_MNG_IAMT_MODE &lt;&lt; E1000_FWSM_MODE_SHIFT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c<br/>index b81c4237b5d3..abd492b7336d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/e1000e/netdev.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/e1000e/netdev.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/e1000e/netdev.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/e1000e/netdev.c</a></div><div class='hunk'>@@ -55,9 +55,11 @@ static const struct e1000_info *e1000_info_tbl[] = {</div><div class='ctx'> 	[board_82571]		= &amp;e1000_82571_info,</div><div class='ctx'> 	[board_82572]		= &amp;e1000_82572_info,</div><div class='ctx'> 	[board_82573]		= &amp;e1000_82573_info,</div><div class='add'>+	[board_82574]		= &amp;e1000_82574_info,</div><div class='ctx'> 	[board_80003es2lan]	= &amp;e1000_es2_info,</div><div class='ctx'> 	[board_ich8lan]		= &amp;e1000_ich8_info,</div><div class='ctx'> 	[board_ich9lan]		= &amp;e1000_ich9_info,</div><div class='add'>+	[board_ich10lan]	= &amp;e1000_ich10_info,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='hunk'>@@ -1187,8 +1189,8 @@ static irqreturn_t e1000_intr(int irq, void *data)</div><div class='ctx'> 	struct net_device *netdev = data;</div><div class='ctx'> 	struct e1000_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> 	struct e1000_hw *hw = &amp;adapter-&gt;hw;</div><div class='del'>-</div><div class='ctx'> 	u32 rctl, icr = er32(ICR);</div><div class='add'>+</div><div class='ctx'> 	if (!icr)</div><div class='ctx'> 		return IRQ_NONE;  /* Not our interrupt */</div><div class='ctx'> </div><div class='hunk'>@@ -1244,6 +1246,263 @@ static irqreturn_t e1000_intr(int irq, void *data)</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static irqreturn_t e1000_msix_other(int irq, void *data)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev = data;</div><div class='add'>+	struct e1000_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+	struct e1000_hw *hw = &amp;adapter-&gt;hw;</div><div class='add'>+	u32 icr = er32(ICR);</div><div class='add'>+</div><div class='add'>+	if (!(icr &amp; E1000_ICR_INT_ASSERTED)) {</div><div class='add'>+		ew32(IMS, E1000_IMS_OTHER);</div><div class='add'>+		return IRQ_NONE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (icr &amp; adapter-&gt;eiac_mask)</div><div class='add'>+		ew32(ICS, (icr &amp; adapter-&gt;eiac_mask));</div><div class='add'>+</div><div class='add'>+	if (icr &amp; E1000_ICR_OTHER) {</div><div class='add'>+		if (!(icr &amp; E1000_ICR_LSC))</div><div class='add'>+			goto no_link_interrupt;</div><div class='add'>+		hw-&gt;mac.get_link_status = 1;</div><div class='add'>+		/* guard against interrupt when we're going down */</div><div class='add'>+		if (!test_bit(__E1000_DOWN, &amp;adapter-&gt;state))</div><div class='add'>+			mod_timer(&amp;adapter-&gt;watchdog_timer, jiffies + 1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+no_link_interrupt:</div><div class='add'>+	ew32(IMS, E1000_IMS_LSC | E1000_IMS_OTHER);</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static irqreturn_t e1000_intr_msix_tx(int irq, void *data)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev = data;</div><div class='add'>+	struct e1000_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+	struct e1000_hw *hw = &amp;adapter-&gt;hw;</div><div class='add'>+	struct e1000_ring *tx_ring = adapter-&gt;tx_ring;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	adapter-&gt;total_tx_bytes = 0;</div><div class='add'>+	adapter-&gt;total_tx_packets = 0;</div><div class='add'>+</div><div class='add'>+	if (!e1000_clean_tx_irq(adapter))</div><div class='add'>+		/* Ring was not completely cleaned, so fire another interrupt */</div><div class='add'>+		ew32(ICS, tx_ring-&gt;ims_val);</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t e1000_intr_msix_rx(int irq, void *data)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev = data;</div><div class='add'>+	struct e1000_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	/* Write the ITR value calculated at the end of the</div><div class='add'>+	 * previous interrupt.</div><div class='add'>+	 */</div><div class='add'>+	if (adapter-&gt;rx_ring-&gt;set_itr) {</div><div class='add'>+		writel(1000000000 / (adapter-&gt;rx_ring-&gt;itr_val * 256),</div><div class='add'>+		       adapter-&gt;hw.hw_addr + adapter-&gt;rx_ring-&gt;itr_register);</div><div class='add'>+		adapter-&gt;rx_ring-&gt;set_itr = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (netif_rx_schedule_prep(netdev, &amp;adapter-&gt;napi)) {</div><div class='add'>+		adapter-&gt;total_rx_bytes = 0;</div><div class='add'>+		adapter-&gt;total_rx_packets = 0;</div><div class='add'>+		__netif_rx_schedule(netdev, &amp;adapter-&gt;napi);</div><div class='add'>+	}</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * e1000_configure_msix - Configure MSI-X hardware</div><div class='add'>+ *</div><div class='add'>+ * e1000_configure_msix sets up the hardware to properly</div><div class='add'>+ * generate MSI-X interrupts.</div><div class='add'>+ **/</div><div class='add'>+static void e1000_configure_msix(struct e1000_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	struct e1000_hw *hw = &amp;adapter-&gt;hw;</div><div class='add'>+	struct e1000_ring *rx_ring = adapter-&gt;rx_ring;</div><div class='add'>+	struct e1000_ring *tx_ring = adapter-&gt;tx_ring;</div><div class='add'>+	int vector = 0;</div><div class='add'>+	u32 ctrl_ext, ivar = 0;</div><div class='add'>+</div><div class='add'>+	adapter-&gt;eiac_mask = 0;</div><div class='add'>+</div><div class='add'>+	/* Workaround issue with spurious interrupts on 82574 in MSI-X mode */</div><div class='add'>+	if (hw-&gt;mac.type == e1000_82574) {</div><div class='add'>+		u32 rfctl = er32(RFCTL);</div><div class='add'>+		rfctl |= E1000_RFCTL_ACK_DIS;</div><div class='add'>+		ew32(RFCTL, rfctl);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#define E1000_IVAR_INT_ALLOC_VALID	0x8</div><div class='add'>+	/* Configure Rx vector */</div><div class='add'>+	rx_ring-&gt;ims_val = E1000_IMS_RXQ0;</div><div class='add'>+	adapter-&gt;eiac_mask |= rx_ring-&gt;ims_val;</div><div class='add'>+	if (rx_ring-&gt;itr_val)</div><div class='add'>+		writel(1000000000 / (rx_ring-&gt;itr_val * 256),</div><div class='add'>+		       hw-&gt;hw_addr + rx_ring-&gt;itr_register);</div><div class='add'>+	else</div><div class='add'>+		writel(1, hw-&gt;hw_addr + rx_ring-&gt;itr_register);</div><div class='add'>+	ivar = E1000_IVAR_INT_ALLOC_VALID | vector;</div><div class='add'>+</div><div class='add'>+	/* Configure Tx vector */</div><div class='add'>+	tx_ring-&gt;ims_val = E1000_IMS_TXQ0;</div><div class='add'>+	vector++;</div><div class='add'>+	if (tx_ring-&gt;itr_val)</div><div class='add'>+		writel(1000000000 / (tx_ring-&gt;itr_val * 256),</div><div class='add'>+		       hw-&gt;hw_addr + tx_ring-&gt;itr_register);</div><div class='add'>+	else</div><div class='add'>+		writel(1, hw-&gt;hw_addr + tx_ring-&gt;itr_register);</div><div class='add'>+	adapter-&gt;eiac_mask |= tx_ring-&gt;ims_val;</div><div class='add'>+	ivar |= ((E1000_IVAR_INT_ALLOC_VALID | vector) &lt;&lt; 8);</div><div class='add'>+</div><div class='add'>+	/* set vector for Other Causes, e.g. link changes */</div><div class='add'>+	vector++;</div><div class='add'>+	ivar |= ((E1000_IVAR_INT_ALLOC_VALID | vector) &lt;&lt; 16);</div><div class='add'>+	if (rx_ring-&gt;itr_val)</div><div class='add'>+		writel(1000000000 / (rx_ring-&gt;itr_val * 256),</div><div class='add'>+		       hw-&gt;hw_addr + E1000_EITR_82574(vector));</div><div class='add'>+	else</div><div class='add'>+		writel(1, hw-&gt;hw_addr + E1000_EITR_82574(vector));</div><div class='add'>+</div><div class='add'>+	/* Cause Tx interrupts on every write back */</div><div class='add'>+	ivar |= (1 &lt;&lt; 31);</div><div class='add'>+</div><div class='add'>+	ew32(IVAR, ivar);</div><div class='add'>+</div><div class='add'>+	/* enable MSI-X PBA support */</div><div class='add'>+	ctrl_ext = er32(CTRL_EXT);</div><div class='add'>+	ctrl_ext |= E1000_CTRL_EXT_PBA_CLR;</div><div class='add'>+</div><div class='add'>+	/* Auto-Mask Other interrupts upon ICR read */</div><div class='add'>+#define E1000_EIAC_MASK_82574   0x01F00000</div><div class='add'>+	ew32(IAM, ~E1000_EIAC_MASK_82574 | E1000_IMS_OTHER);</div><div class='add'>+	ctrl_ext |= E1000_CTRL_EXT_EIAME;</div><div class='add'>+	ew32(CTRL_EXT, ctrl_ext);</div><div class='add'>+	e1e_flush();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void e1000e_reset_interrupt_capability(struct e1000_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	if (adapter-&gt;msix_entries) {</div><div class='add'>+		pci_disable_msix(adapter-&gt;pdev);</div><div class='add'>+		kfree(adapter-&gt;msix_entries);</div><div class='add'>+		adapter-&gt;msix_entries = NULL;</div><div class='add'>+	} else if (adapter-&gt;flags &amp; FLAG_MSI_ENABLED) {</div><div class='add'>+		pci_disable_msi(adapter-&gt;pdev);</div><div class='add'>+		adapter-&gt;flags &amp;= ~FLAG_MSI_ENABLED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * e1000e_set_interrupt_capability - set MSI or MSI-X if supported</div><div class='add'>+ *</div><div class='add'>+ * Attempt to configure interrupts using the best available</div><div class='add'>+ * capabilities of the hardware and kernel.</div><div class='add'>+ **/</div><div class='add'>+void e1000e_set_interrupt_capability(struct e1000_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	int numvecs, i;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	switch (adapter-&gt;int_mode) {</div><div class='add'>+	case E1000E_INT_MODE_MSIX:</div><div class='add'>+		if (adapter-&gt;flags &amp; FLAG_HAS_MSIX) {</div><div class='add'>+			numvecs = 3; /* RxQ0, TxQ0 and other */</div><div class='add'>+			adapter-&gt;msix_entries = kcalloc(numvecs,</div><div class='add'>+						      sizeof(struct msix_entry),</div><div class='add'>+						      GFP_KERNEL);</div><div class='add'>+			if (adapter-&gt;msix_entries) {</div><div class='add'>+				for (i = 0; i &lt; numvecs; i++)</div><div class='add'>+					adapter-&gt;msix_entries[i].entry = i;</div><div class='add'>+</div><div class='add'>+				err = pci_enable_msix(adapter-&gt;pdev,</div><div class='add'>+						      adapter-&gt;msix_entries,</div><div class='add'>+						      numvecs);</div><div class='add'>+				if (err == 0)</div><div class='add'>+					return;</div><div class='add'>+			}</div><div class='add'>+			/* MSI-X failed, so fall through and try MSI */</div><div class='add'>+			e_err("Failed to initialize MSI-X interrupts.  "</div><div class='add'>+			      "Falling back to MSI interrupts.\n");</div><div class='add'>+			e1000e_reset_interrupt_capability(adapter);</div><div class='add'>+		}</div><div class='add'>+		adapter-&gt;int_mode = E1000E_INT_MODE_MSI;</div><div class='add'>+		/* Fall through */</div><div class='add'>+	case E1000E_INT_MODE_MSI:</div><div class='add'>+		if (!pci_enable_msi(adapter-&gt;pdev)) {</div><div class='add'>+			adapter-&gt;flags |= FLAG_MSI_ENABLED;</div><div class='add'>+		} else {</div><div class='add'>+			adapter-&gt;int_mode = E1000E_INT_MODE_LEGACY;</div><div class='add'>+			e_err("Failed to initialize MSI interrupts.  Falling "</div><div class='add'>+			      "back to legacy interrupts.\n");</div><div class='add'>+		}</div><div class='add'>+		/* Fall through */</div><div class='add'>+	case E1000E_INT_MODE_LEGACY:</div><div class='add'>+		/* Don't do anything; this is the system default */</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * e1000_request_msix - Initialize MSI-X interrupts</div><div class='add'>+ *</div><div class='add'>+ * e1000_request_msix allocates MSI-X vectors and requests interrupts from the</div><div class='add'>+ * kernel.</div><div class='add'>+ **/</div><div class='add'>+static int e1000_request_msix(struct e1000_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev = adapter-&gt;netdev;</div><div class='add'>+	int err = 0, vector = 0;</div><div class='add'>+</div><div class='add'>+	if (strlen(netdev-&gt;name) &lt; (IFNAMSIZ - 5))</div><div class='add'>+		sprintf(adapter-&gt;rx_ring-&gt;name, "%s-rx0", netdev-&gt;name);</div><div class='add'>+	else</div><div class='add'>+		memcpy(adapter-&gt;rx_ring-&gt;name, netdev-&gt;name, IFNAMSIZ);</div><div class='add'>+	err = request_irq(adapter-&gt;msix_entries[vector].vector,</div><div class='add'>+			  &amp;e1000_intr_msix_rx, 0, adapter-&gt;rx_ring-&gt;name,</div><div class='add'>+			  netdev);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+	adapter-&gt;rx_ring-&gt;itr_register = E1000_EITR_82574(vector);</div><div class='add'>+	adapter-&gt;rx_ring-&gt;itr_val = adapter-&gt;itr;</div><div class='add'>+	vector++;</div><div class='add'>+</div><div class='add'>+	if (strlen(netdev-&gt;name) &lt; (IFNAMSIZ - 5))</div><div class='add'>+		sprintf(adapter-&gt;tx_ring-&gt;name, "%s-tx0", netdev-&gt;name);</div><div class='add'>+	else</div><div class='add'>+		memcpy(adapter-&gt;tx_ring-&gt;name, netdev-&gt;name, IFNAMSIZ);</div><div class='add'>+	err = request_irq(adapter-&gt;msix_entries[vector].vector,</div><div class='add'>+			  &amp;e1000_intr_msix_tx, 0, adapter-&gt;tx_ring-&gt;name,</div><div class='add'>+			  netdev);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+	adapter-&gt;tx_ring-&gt;itr_register = E1000_EITR_82574(vector);</div><div class='add'>+	adapter-&gt;tx_ring-&gt;itr_val = adapter-&gt;itr;</div><div class='add'>+	vector++;</div><div class='add'>+</div><div class='add'>+	err = request_irq(adapter-&gt;msix_entries[vector].vector,</div><div class='add'>+			  &amp;e1000_msix_other, 0, netdev-&gt;name, netdev);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	e1000_configure_msix(adapter);</div><div class='add'>+	return 0;</div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * e1000_request_irq - initialize interrupts</div><div class='ctx'>  *</div><div class='hunk'>@@ -1253,29 +1512,33 @@ static irqreturn_t e1000_intr(int irq, void *data)</div><div class='ctx'> static int e1000_request_irq(struct e1000_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *netdev = adapter-&gt;netdev;</div><div class='del'>-	int irq_flags = IRQF_SHARED;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (!(adapter-&gt;flags &amp; FLAG_MSI_TEST_FAILED)) {</div><div class='del'>-		err = pci_enable_msi(adapter-&gt;pdev);</div><div class='del'>-		if (!err) {</div><div class='del'>-			adapter-&gt;flags |= FLAG_MSI_ENABLED;</div><div class='del'>-			irq_flags = 0;</div><div class='del'>-		}</div><div class='add'>+	if (adapter-&gt;msix_entries) {</div><div class='add'>+		err = e1000_request_msix(adapter);</div><div class='add'>+		if (!err)</div><div class='add'>+			return err;</div><div class='add'>+		/* fall back to MSI */</div><div class='add'>+		e1000e_reset_interrupt_capability(adapter);</div><div class='add'>+		adapter-&gt;int_mode = E1000E_INT_MODE_MSI;</div><div class='add'>+		e1000e_set_interrupt_capability(adapter);</div><div class='ctx'> 	}</div><div class='add'>+	if (adapter-&gt;flags &amp; FLAG_MSI_ENABLED) {</div><div class='add'>+		err = request_irq(adapter-&gt;pdev-&gt;irq, &amp;e1000_intr_msi, 0,</div><div class='add'>+				  netdev-&gt;name, netdev);</div><div class='add'>+		if (!err)</div><div class='add'>+			return err;</div><div class='ctx'> </div><div class='del'>-	err = request_irq(adapter-&gt;pdev-&gt;irq,</div><div class='del'>-			  ((adapter-&gt;flags &amp; FLAG_MSI_ENABLED) ?</div><div class='del'>-				&amp;e1000_intr_msi : &amp;e1000_intr),</div><div class='del'>-			  irq_flags, netdev-&gt;name, netdev);</div><div class='del'>-	if (err) {</div><div class='del'>-		if (adapter-&gt;flags &amp; FLAG_MSI_ENABLED) {</div><div class='del'>-			pci_disable_msi(adapter-&gt;pdev);</div><div class='del'>-			adapter-&gt;flags &amp;= ~FLAG_MSI_ENABLED;</div><div class='del'>-		}</div><div class='del'>-		e_err("Unable to allocate interrupt, Error: %d\n", err);</div><div class='add'>+		/* fall back to legacy interrupt */</div><div class='add'>+		e1000e_reset_interrupt_capability(adapter);</div><div class='add'>+		adapter-&gt;int_mode = E1000E_INT_MODE_LEGACY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	err = request_irq(adapter-&gt;pdev-&gt;irq, &amp;e1000_intr, IRQF_SHARED,</div><div class='add'>+			  netdev-&gt;name, netdev);</div><div class='add'>+	if (err)</div><div class='add'>+		e_err("Unable to allocate interrupt, Error: %d\n", err);</div><div class='add'>+</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1283,11 +1546,21 @@ static void e1000_free_irq(struct e1000_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *netdev = adapter-&gt;netdev;</div><div class='ctx'> </div><div class='del'>-	free_irq(adapter-&gt;pdev-&gt;irq, netdev);</div><div class='del'>-	if (adapter-&gt;flags &amp; FLAG_MSI_ENABLED) {</div><div class='del'>-		pci_disable_msi(adapter-&gt;pdev);</div><div class='del'>-		adapter-&gt;flags &amp;= ~FLAG_MSI_ENABLED;</div><div class='add'>+	if (adapter-&gt;msix_entries) {</div><div class='add'>+		int vector = 0;</div><div class='add'>+</div><div class='add'>+		free_irq(adapter-&gt;msix_entries[vector].vector, netdev);</div><div class='add'>+		vector++;</div><div class='add'>+</div><div class='add'>+		free_irq(adapter-&gt;msix_entries[vector].vector, netdev);</div><div class='add'>+		vector++;</div><div class='add'>+</div><div class='add'>+		/* Other Causes interrupt vector */</div><div class='add'>+		free_irq(adapter-&gt;msix_entries[vector].vector, netdev);</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	free_irq(adapter-&gt;pdev-&gt;irq, netdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1298,6 +1571,8 @@ static void e1000_irq_disable(struct e1000_adapter *adapter)</div><div class='ctx'> 	struct e1000_hw *hw = &amp;adapter-&gt;hw;</div><div class='ctx'> </div><div class='ctx'> 	ew32(IMC, ~0);</div><div class='add'>+	if (adapter-&gt;msix_entries)</div><div class='add'>+		ew32(EIAC_82574, 0);</div><div class='ctx'> 	e1e_flush();</div><div class='ctx'> 	synchronize_irq(adapter-&gt;pdev-&gt;irq);</div><div class='ctx'> }</div><div class='hunk'>@@ -1309,7 +1584,12 @@ static void e1000_irq_enable(struct e1000_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	struct e1000_hw *hw = &amp;adapter-&gt;hw;</div><div class='ctx'> </div><div class='del'>-	ew32(IMS, IMS_ENABLE_MASK);</div><div class='add'>+	if (adapter-&gt;msix_entries) {</div><div class='add'>+		ew32(EIAC_82574, adapter-&gt;eiac_mask &amp; E1000_EIAC_MASK_82574);</div><div class='add'>+		ew32(IMS, adapter-&gt;eiac_mask | E1000_IMS_OTHER | E1000_IMS_LSC);</div><div class='add'>+	} else {</div><div class='add'>+		ew32(IMS, IMS_ENABLE_MASK);</div><div class='add'>+	}</div><div class='ctx'> 	e1e_flush();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1559,9 +1839,8 @@ void e1000e_free_rx_resources(struct e1000_adapter *adapter)</div><div class='ctx'>  *      traffic pattern.  Constants in this function were computed</div><div class='ctx'>  *      based on theoretical maximum wire speed and thresholds were set based</div><div class='ctx'>  *      on testing data as well as attempting to minimize response time</div><div class='del'>- *      while increasing bulk throughput.</div><div class='del'>- *      this functionality is controlled by the InterruptThrottleRate module</div><div class='del'>- *      parameter (see e1000_param.c)</div><div class='add'>+ *      while increasing bulk throughput.  This functionality is controlled</div><div class='add'>+ *      by the InterruptThrottleRate module parameter.</div><div class='ctx'>  **/</div><div class='ctx'> static unsigned int e1000_update_itr(struct e1000_adapter *adapter,</div><div class='ctx'> 				     u16 itr_setting, int packets,</div><div class='hunk'>@@ -1669,11 +1948,37 @@ set_itr_now:</div><div class='ctx'> 			     min(adapter-&gt;itr + (new_itr &gt;&gt; 2), new_itr) :</div><div class='ctx'> 			     new_itr;</div><div class='ctx'> 		adapter-&gt;itr = new_itr;</div><div class='del'>-		ew32(ITR, 1000000000 / (new_itr * 256));</div><div class='add'>+		adapter-&gt;rx_ring-&gt;itr_val = new_itr;</div><div class='add'>+		if (adapter-&gt;msix_entries)</div><div class='add'>+			adapter-&gt;rx_ring-&gt;set_itr = 1;</div><div class='add'>+		else</div><div class='add'>+			ew32(ITR, 1000000000 / (new_itr * 256));</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * e1000_alloc_queues - Allocate memory for all rings</div><div class='add'>+ * @adapter: board private structure to initialize</div><div class='add'>+ **/</div><div class='add'>+static int __devinit e1000_alloc_queues(struct e1000_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	adapter-&gt;tx_ring = kzalloc(sizeof(struct e1000_ring), GFP_KERNEL);</div><div class='add'>+	if (!adapter-&gt;tx_ring)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	adapter-&gt;rx_ring = kzalloc(sizeof(struct e1000_ring), GFP_KERNEL);</div><div class='add'>+	if (!adapter-&gt;rx_ring)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+err:</div><div class='add'>+	e_err("Unable to allocate memory for queues\n");</div><div class='add'>+	kfree(adapter-&gt;rx_ring);</div><div class='add'>+	kfree(adapter-&gt;tx_ring);</div><div class='add'>+	return -ENOMEM;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * e1000_clean - NAPI Rx polling callback</div><div class='ctx'>  * @napi: struct associated with this polling callback</div><div class='ctx'>  * @budget: amount of packets driver is allowed to process this poll</div><div class='hunk'>@@ -1681,12 +1986,17 @@ set_itr_now:</div><div class='ctx'> static int e1000_clean(struct napi_struct *napi, int budget)</div><div class='ctx'> {</div><div class='ctx'> 	struct e1000_adapter *adapter = container_of(napi, struct e1000_adapter, napi);</div><div class='add'>+	struct e1000_hw *hw = &amp;adapter-&gt;hw;</div><div class='ctx'> 	struct net_device *poll_dev = adapter-&gt;netdev;</div><div class='ctx'> 	int tx_cleaned = 0, work_done = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Must NOT use netdev_priv macro here. */</div><div class='ctx'> 	adapter = poll_dev-&gt;priv;</div><div class='ctx'> </div><div class='add'>+	if (adapter-&gt;msix_entries &amp;&amp;</div><div class='add'>+	    !(adapter-&gt;rx_ring-&gt;ims_val &amp; adapter-&gt;tx_ring-&gt;ims_val))</div><div class='add'>+		goto clean_rx;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * e1000_clean is called per-cpu.  This lock protects</div><div class='ctx'> 	 * tx_ring from being cleaned by multiple cpus</div><div class='hunk'>@@ -1698,6 +2008,7 @@ static int e1000_clean(struct napi_struct *napi, int budget)</div><div class='ctx'> 		spin_unlock(&amp;adapter-&gt;tx_queue_lock);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+clean_rx:</div><div class='ctx'> 	adapter-&gt;clean_rx(adapter, &amp;work_done, budget);</div><div class='ctx'> </div><div class='ctx'> 	if (tx_cleaned)</div><div class='hunk'>@@ -1708,7 +2019,10 @@ static int e1000_clean(struct napi_struct *napi, int budget)</div><div class='ctx'> 		if (adapter-&gt;itr_setting &amp; 3)</div><div class='ctx'> 			e1000_set_itr(adapter);</div><div class='ctx'> 		netif_rx_complete(poll_dev, napi);</div><div class='del'>-		e1000_irq_enable(adapter);</div><div class='add'>+		if (adapter-&gt;msix_entries)</div><div class='add'>+			ew32(IMS, adapter-&gt;rx_ring-&gt;ims_val);</div><div class='add'>+		else</div><div class='add'>+			e1000_irq_enable(adapter);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return work_done;</div><div class='hunk'>@@ -2504,6 +2818,8 @@ int e1000e_up(struct e1000_adapter *adapter)</div><div class='ctx'> 	clear_bit(__E1000_DOWN, &amp;adapter-&gt;state);</div><div class='ctx'> </div><div class='ctx'> 	napi_enable(&amp;adapter-&gt;napi);</div><div class='add'>+	if (adapter-&gt;msix_entries)</div><div class='add'>+		e1000_configure_msix(adapter);</div><div class='ctx'> 	e1000_irq_enable(adapter);</div><div class='ctx'> </div><div class='ctx'> 	/* fire a link change interrupt to start the watchdog */</div><div class='hunk'>@@ -2587,13 +2903,10 @@ static int __devinit e1000_sw_init(struct e1000_adapter *adapter)</div><div class='ctx'> 	adapter-&gt;max_frame_size = netdev-&gt;mtu + ETH_HLEN + ETH_FCS_LEN;</div><div class='ctx'> 	adapter-&gt;min_frame_size = ETH_ZLEN + ETH_FCS_LEN;</div><div class='ctx'> </div><div class='del'>-	adapter-&gt;tx_ring = kzalloc(sizeof(struct e1000_ring), GFP_KERNEL);</div><div class='del'>-	if (!adapter-&gt;tx_ring)</div><div class='del'>-		goto err;</div><div class='add'>+	e1000e_set_interrupt_capability(adapter);</div><div class='ctx'> </div><div class='del'>-	adapter-&gt;rx_ring = kzalloc(sizeof(struct e1000_ring), GFP_KERNEL);</div><div class='del'>-	if (!adapter-&gt;rx_ring)</div><div class='del'>-		goto err;</div><div class='add'>+	if (e1000_alloc_queues(adapter))</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;adapter-&gt;tx_queue_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -2602,12 +2915,6 @@ static int __devinit e1000_sw_init(struct e1000_adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> 	set_bit(__E1000_DOWN, &amp;adapter-&gt;state);</div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='del'>-err:</div><div class='del'>-	e_err("Unable to allocate memory for queues\n");</div><div class='del'>-	kfree(adapter-&gt;rx_ring);</div><div class='del'>-	kfree(adapter-&gt;tx_ring);</div><div class='del'>-	return -ENOMEM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -2649,6 +2956,7 @@ static int e1000_test_msi_interrupt(struct e1000_adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> 	/* free the real vector and request a test handler */</div><div class='ctx'> 	e1000_free_irq(adapter);</div><div class='add'>+	e1000e_reset_interrupt_capability(adapter);</div><div class='ctx'> </div><div class='ctx'> 	/* Assume that the test fails, if it succeeds then the test</div><div class='ctx'> 	 * MSI irq handler will unset this flag */</div><div class='hunk'>@@ -2679,6 +2987,7 @@ static int e1000_test_msi_interrupt(struct e1000_adapter *adapter)</div><div class='ctx'> 	rmb();</div><div class='ctx'> </div><div class='ctx'> 	if (adapter-&gt;flags &amp; FLAG_MSI_TEST_FAILED) {</div><div class='add'>+		adapter-&gt;int_mode = E1000E_INT_MODE_LEGACY;</div><div class='ctx'> 		err = -EIO;</div><div class='ctx'> 		e_info("MSI interrupt test failed!\n");</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2692,7 +3001,7 @@ static int e1000_test_msi_interrupt(struct e1000_adapter *adapter)</div><div class='ctx'> 	/* okay so the test worked, restore settings */</div><div class='ctx'> 	e_dbg("%s: MSI interrupt test succeeded!\n", netdev-&gt;name);</div><div class='ctx'> msi_test_failed:</div><div class='del'>-	/* restore the original vector, even if it failed */</div><div class='add'>+	e1000e_set_interrupt_capability(adapter);</div><div class='ctx'> 	e1000_request_irq(adapter);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -2802,7 +3111,7 @@ static int e1000_open(struct net_device *netdev)</div><div class='ctx'> 	 * ignore e1000e MSI messages, which means we need to test our MSI</div><div class='ctx'> 	 * interrupt now</div><div class='ctx'> 	 */</div><div class='del'>-	{</div><div class='add'>+	if (adapter-&gt;int_mode != E1000E_INT_MODE_LEGACY) {</div><div class='ctx'> 		err = e1000_test_msi(adapter);</div><div class='ctx'> 		if (err) {</div><div class='ctx'> 			e_err("Interrupt allocation failed\n");</div><div class='hunk'>@@ -2997,7 +3306,8 @@ void e1000e_update_stats(struct e1000_adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> 	adapter-&gt;stats.algnerrc += er32(ALGNERRC);</div><div class='ctx'> 	adapter-&gt;stats.rxerrc += er32(RXERRC);</div><div class='del'>-	adapter-&gt;stats.tncrs += er32(TNCRS);</div><div class='add'>+	if (hw-&gt;mac.type != e1000_82574)</div><div class='add'>+		adapter-&gt;stats.tncrs += er32(TNCRS);</div><div class='ctx'> 	adapter-&gt;stats.cexterr += er32(CEXTERR);</div><div class='ctx'> 	adapter-&gt;stats.tsctc += er32(TSCTC);</div><div class='ctx'> 	adapter-&gt;stats.tsctfc += er32(TSCTFC);</div><div class='hunk'>@@ -3193,6 +3503,27 @@ static void e1000_watchdog_task(struct work_struct *work)</div><div class='ctx'> 						   &amp;adapter-&gt;link_duplex);</div><div class='ctx'> 			e1000_print_link_info(adapter);</div><div class='ctx'> 			/*</div><div class='add'>+			 * On supported PHYs, check for duplex mismatch only</div><div class='add'>+			 * if link has autonegotiated at 10/100 half</div><div class='add'>+			 */</div><div class='add'>+			if ((hw-&gt;phy.type == e1000_phy_igp_3 ||</div><div class='add'>+			     hw-&gt;phy.type == e1000_phy_bm) &amp;&amp;</div><div class='add'>+			    (hw-&gt;mac.autoneg == true) &amp;&amp;</div><div class='add'>+			    (adapter-&gt;link_speed == SPEED_10 ||</div><div class='add'>+			     adapter-&gt;link_speed == SPEED_100) &amp;&amp;</div><div class='add'>+			    (adapter-&gt;link_duplex == HALF_DUPLEX)) {</div><div class='add'>+				u16 autoneg_exp;</div><div class='add'>+</div><div class='add'>+				e1e_rphy(hw, PHY_AUTONEG_EXP, &amp;autoneg_exp);</div><div class='add'>+</div><div class='add'>+				if (!(autoneg_exp &amp; NWAY_ER_LP_NWAY_CAPS))</div><div class='add'>+					e_info("Autonegotiated half duplex but"</div><div class='add'>+					       " link partner cannot autoneg. "</div><div class='add'>+					       " Try forcing full duplex if "</div><div class='add'>+					       "link gets many collisions.\n");</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/*</div><div class='ctx'> 			 * tweak tx_queue_len according to speed/duplex</div><div class='ctx'> 			 * and adjust the timeout factor</div><div class='ctx'> 			 */</div><div class='hunk'>@@ -3307,7 +3638,10 @@ link_up:</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Cause software interrupt to ensure Rx ring is cleaned */</div><div class='del'>-	ew32(ICS, E1000_ICS_RXDMT0);</div><div class='add'>+	if (adapter-&gt;msix_entries)</div><div class='add'>+		ew32(ICS, adapter-&gt;rx_ring-&gt;ims_val);</div><div class='add'>+	else</div><div class='add'>+		ew32(ICS, E1000_ICS_RXDMT0);</div><div class='ctx'> </div><div class='ctx'> 	/* Force detection of hung controller every watchdog period */</div><div class='ctx'> 	adapter-&gt;detect_tx_hung = 1;</div><div class='hunk'>@@ -3415,34 +3749,50 @@ static bool e1000_tx_csum(struct e1000_adapter *adapter, struct sk_buff *skb)</div><div class='ctx'> 	struct e1000_buffer *buffer_info;</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	u8 css;</div><div class='add'>+	u32 cmd_len = E1000_TXD_CMD_DEXT;</div><div class='ctx'> </div><div class='del'>-	if (skb-&gt;ip_summed == CHECKSUM_PARTIAL) {</div><div class='del'>-		css = skb_transport_offset(skb);</div><div class='del'>-</div><div class='del'>-		i = tx_ring-&gt;next_to_use;</div><div class='del'>-		buffer_info = &amp;tx_ring-&gt;buffer_info[i];</div><div class='del'>-		context_desc = E1000_CONTEXT_DESC(*tx_ring, i);</div><div class='del'>-</div><div class='del'>-		context_desc-&gt;lower_setup.ip_config = 0;</div><div class='del'>-		context_desc-&gt;upper_setup.tcp_fields.tucss = css;</div><div class='del'>-		context_desc-&gt;upper_setup.tcp_fields.tucso =</div><div class='del'>-					css + skb-&gt;csum_offset;</div><div class='del'>-		context_desc-&gt;upper_setup.tcp_fields.tucse = 0;</div><div class='del'>-		context_desc-&gt;tcp_seg_setup.data = 0;</div><div class='del'>-		context_desc-&gt;cmd_and_length = cpu_to_le32(E1000_TXD_CMD_DEXT);</div><div class='add'>+	if (skb-&gt;ip_summed != CHECKSUM_PARTIAL)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-		buffer_info-&gt;time_stamp = jiffies;</div><div class='del'>-		buffer_info-&gt;next_to_watch = i;</div><div class='add'>+	switch (skb-&gt;protocol) {</div><div class='add'>+	case __constant_htons(ETH_P_IP):</div><div class='add'>+		if (ip_hdr(skb)-&gt;protocol == IPPROTO_TCP)</div><div class='add'>+			cmd_len |= E1000_TXD_CMD_TCP;</div><div class='add'>+		break;</div><div class='add'>+	case __constant_htons(ETH_P_IPV6):</div><div class='add'>+		/* XXX not handling all IPV6 headers */</div><div class='add'>+		if (ipv6_hdr(skb)-&gt;nexthdr == IPPROTO_TCP)</div><div class='add'>+			cmd_len |= E1000_TXD_CMD_TCP;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		if (unlikely(net_ratelimit()))</div><div class='add'>+			e_warn("checksum_partial proto=%x!\n", skb-&gt;protocol);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		i++;</div><div class='del'>-		if (i == tx_ring-&gt;count)</div><div class='del'>-			i = 0;</div><div class='del'>-		tx_ring-&gt;next_to_use = i;</div><div class='add'>+	css = skb_transport_offset(skb);</div><div class='ctx'> </div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='add'>+	i = tx_ring-&gt;next_to_use;</div><div class='add'>+	buffer_info = &amp;tx_ring-&gt;buffer_info[i];</div><div class='add'>+	context_desc = E1000_CONTEXT_DESC(*tx_ring, i);</div><div class='add'>+</div><div class='add'>+	context_desc-&gt;lower_setup.ip_config = 0;</div><div class='add'>+	context_desc-&gt;upper_setup.tcp_fields.tucss = css;</div><div class='add'>+	context_desc-&gt;upper_setup.tcp_fields.tucso =</div><div class='add'>+				css + skb-&gt;csum_offset;</div><div class='add'>+	context_desc-&gt;upper_setup.tcp_fields.tucse = 0;</div><div class='add'>+	context_desc-&gt;tcp_seg_setup.data = 0;</div><div class='add'>+	context_desc-&gt;cmd_and_length = cpu_to_le32(cmd_len);</div><div class='add'>+</div><div class='add'>+	buffer_info-&gt;time_stamp = jiffies;</div><div class='add'>+	buffer_info-&gt;next_to_watch = i;</div><div class='add'>+</div><div class='add'>+	i++;</div><div class='add'>+	if (i == tx_ring-&gt;count)</div><div class='add'>+		i = 0;</div><div class='add'>+	tx_ring-&gt;next_to_use = i;</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define E1000_MAX_PER_TXD	8192</div><div class='hunk'>@@ -4024,6 +4374,7 @@ static int e1000_suspend(struct pci_dev *pdev, pm_message_t state)</div><div class='ctx'> 		e1000e_down(adapter);</div><div class='ctx'> 		e1000_free_irq(adapter);</div><div class='ctx'> 	}</div><div class='add'>+	e1000e_reset_interrupt_capability(adapter);</div><div class='ctx'> </div><div class='ctx'> 	retval = pci_save_state(pdev);</div><div class='ctx'> 	if (retval)</div><div class='hunk'>@@ -4150,6 +4501,7 @@ static int e1000_resume(struct pci_dev *pdev)</div><div class='ctx'> 	pci_enable_wake(pdev, PCI_D3hot, 0);</div><div class='ctx'> 	pci_enable_wake(pdev, PCI_D3cold, 0);</div><div class='ctx'> </div><div class='add'>+	e1000e_set_interrupt_capability(adapter);</div><div class='ctx'> 	if (netif_running(netdev)) {</div><div class='ctx'> 		err = e1000_request_irq(adapter);</div><div class='ctx'> 		if (err)</div><div class='hunk'>@@ -4327,13 +4679,15 @@ static void e1000_eeprom_checks(struct e1000_adapter *adapter)</div><div class='ctx'> 	ret_val = e1000_read_nvm(hw, NVM_INIT_CONTROL2_REG, 1, &amp;buf);</div><div class='ctx'> 	if (!(le16_to_cpu(buf) &amp; (1 &lt;&lt; 0))) {</div><div class='ctx'> 		/* Deep Smart Power Down (DSPD) */</div><div class='del'>-		e_warn("Warning: detected DSPD enabled in EEPROM\n");</div><div class='add'>+		dev_warn(&amp;adapter-&gt;pdev-&gt;dev,</div><div class='add'>+			 "Warning: detected DSPD enabled in EEPROM\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret_val = e1000_read_nvm(hw, NVM_INIT_3GIO_3, 1, &amp;buf);</div><div class='ctx'> 	if (le16_to_cpu(buf) &amp; (3 &lt;&lt; 2)) {</div><div class='ctx'> 		/* ASPM enable */</div><div class='del'>-		e_warn("Warning: detected ASPM enabled in EEPROM\n");</div><div class='add'>+		dev_warn(&amp;adapter-&gt;pdev-&gt;dev,</div><div class='add'>+			 "Warning: detected ASPM enabled in EEPROM\n");</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4702,6 +5056,7 @@ static void __devexit e1000_remove(struct pci_dev *pdev)</div><div class='ctx'> 	if (!e1000_check_reset_block(&amp;adapter-&gt;hw))</div><div class='ctx'> 		e1000_phy_hw_reset(&amp;adapter-&gt;hw);</div><div class='ctx'> </div><div class='add'>+	e1000e_reset_interrupt_capability(adapter);</div><div class='ctx'> 	kfree(adapter-&gt;tx_ring);</div><div class='ctx'> 	kfree(adapter-&gt;rx_ring);</div><div class='ctx'> </div><div class='hunk'>@@ -4743,6 +5098,8 @@ static struct pci_device_id e1000_pci_tbl[] = {</div><div class='ctx'> 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82573E_IAMT), board_82573 },</div><div class='ctx'> 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82573L), board_82573 },</div><div class='ctx'> </div><div class='add'>+	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82574L), board_82574 },</div><div class='add'>+</div><div class='ctx'> 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_80003ES2LAN_COPPER_DPT),</div><div class='ctx'> 	  board_80003es2lan },</div><div class='ctx'> 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_80003ES2LAN_COPPER_SPT),</div><div class='hunk'>@@ -4765,6 +5122,7 @@ static struct pci_device_id e1000_pci_tbl[] = {</div><div class='ctx'> 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IFE_GT), board_ich9lan },</div><div class='ctx'> 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IGP_AMT), board_ich9lan },</div><div class='ctx'> 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IGP_C), board_ich9lan },</div><div class='add'>+	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_BM), board_ich9lan },</div><div class='ctx'> 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IGP_M), board_ich9lan },</div><div class='ctx'> 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IGP_M_AMT), board_ich9lan },</div><div class='ctx'> 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IGP_M_V), board_ich9lan },</div><div class='hunk'>@@ -4773,6 +5131,9 @@ static struct pci_device_id e1000_pci_tbl[] = {</div><div class='ctx'> 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH10_R_BM_LF), board_ich9lan },</div><div class='ctx'> 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH10_R_BM_V), board_ich9lan },</div><div class='ctx'> </div><div class='add'>+	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH10_D_BM_LM), board_ich10lan },</div><div class='add'>+	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH10_D_BM_LF), board_ich10lan },</div><div class='add'>+</div><div class='ctx'> 	{ }	/* terminate list */</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, e1000_pci_tbl);</div><div class='head'>diff --git a/drivers/net/e1000e/param.c b/drivers/net/e1000e/param.c<br/>index d91dbf7ba434..77a3d7207a5f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/e1000e/param.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/e1000e/param.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/e1000e/param.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/e1000e/param.c</a></div><div class='hunk'>@@ -114,6 +114,15 @@ E1000_PARAM(InterruptThrottleRate, "Interrupt Throttling Rate");</div><div class='ctx'> #define DEFAULT_ITR 3</div><div class='ctx'> #define MAX_ITR 100000</div><div class='ctx'> #define MIN_ITR 100</div><div class='add'>+/* IntMode (Interrupt Mode)</div><div class='add'>+ *</div><div class='add'>+ * Valid Range: 0 - 2</div><div class='add'>+ *</div><div class='add'>+ * Default Value: 2 (MSI-X)</div><div class='add'>+ */</div><div class='add'>+E1000_PARAM(IntMode, "Interrupt Mode");</div><div class='add'>+#define MAX_INTMODE	2</div><div class='add'>+#define MIN_INTMODE	0</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Enable Smart Power Down of the PHY</div><div class='hunk'>@@ -361,6 +370,24 @@ void __devinit e1000e_check_options(struct e1000_adapter *adapter)</div><div class='ctx'> 			adapter-&gt;itr = 20000;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+	{ /* Interrupt Mode */</div><div class='add'>+		struct e1000_option opt = {</div><div class='add'>+			.type = range_option,</div><div class='add'>+			.name = "Interrupt Mode",</div><div class='add'>+			.err  = "defaulting to 2 (MSI-X)",</div><div class='add'>+			.def  = E1000E_INT_MODE_MSIX,</div><div class='add'>+			.arg  = { .r = { .min = MIN_INTMODE,</div><div class='add'>+					 .max = MAX_INTMODE } }</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		if (num_IntMode &gt; bd) {</div><div class='add'>+			unsigned int int_mode = IntMode[bd];</div><div class='add'>+			e1000_validate_option(&amp;int_mode, &amp;opt, adapter);</div><div class='add'>+			adapter-&gt;int_mode = int_mode;</div><div class='add'>+		} else {</div><div class='add'>+			adapter-&gt;int_mode = opt.def;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> 	{ /* Smart Power Down */</div><div class='ctx'> 		const struct e1000_option opt = {</div><div class='ctx'> 			.type = enable_option,</div><div class='head'>diff --git a/drivers/net/e1000e/phy.c b/drivers/net/e1000e/phy.c<br/>index b133dcf0e950..6cd333ae61d0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/e1000e/phy.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/e1000e/phy.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/e1000e/phy.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/e1000e/phy.c</a></div><div class='hunk'>@@ -476,7 +476,9 @@ s32 e1000e_copper_link_setup_m88(struct e1000_hw *hw)</div><div class='ctx'> 	if (ret_val)</div><div class='ctx'> 		return ret_val;</div><div class='ctx'> </div><div class='del'>-	if ((phy-&gt;type == e1000_phy_m88) &amp;&amp; (phy-&gt;revision &lt; 4)) {</div><div class='add'>+	if ((phy-&gt;type == e1000_phy_m88) &amp;&amp;</div><div class='add'>+	    (phy-&gt;revision &lt; E1000_REVISION_4) &amp;&amp;</div><div class='add'>+	    (phy-&gt;id != BME1000_E_PHY_ID_R2)) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Force TX_CLK in the Extended PHY Specific Control Register</div><div class='ctx'> 		 * to 25MHz clock.</div><div class='hunk'>@@ -504,6 +506,18 @@ s32 e1000e_copper_link_setup_m88(struct e1000_hw *hw)</div><div class='ctx'> 			return ret_val;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if ((phy-&gt;type == e1000_phy_bm) &amp;&amp; (phy-&gt;id == BME1000_E_PHY_ID_R2)) {</div><div class='add'>+		/* Set PHY page 0, register 29 to 0x0003 */</div><div class='add'>+		ret_val = e1e_wphy(hw, 29, 0x0003);</div><div class='add'>+		if (ret_val)</div><div class='add'>+			return ret_val;</div><div class='add'>+</div><div class='add'>+		/* Set PHY page 0, register 30 to 0x0000 */</div><div class='add'>+		ret_val = e1e_wphy(hw, 30, 0x0000);</div><div class='add'>+		if (ret_val)</div><div class='add'>+			return ret_val;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Commit the changes. */</div><div class='ctx'> 	ret_val = e1000e_commit_phy(hw);</div><div class='ctx'> 	if (ret_val)</div><div class='hunk'>@@ -1720,6 +1734,91 @@ s32 e1000e_get_cfg_done(struct e1000_hw *hw)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ *  e1000e_phy_init_script_igp3 - Inits the IGP3 PHY</div><div class='add'>+ *  @hw: pointer to the HW structure</div><div class='add'>+ *</div><div class='add'>+ *  Initializes a Intel Gigabit PHY3 when an EEPROM is not present.</div><div class='add'>+ **/</div><div class='add'>+s32 e1000e_phy_init_script_igp3(struct e1000_hw *hw)</div><div class='add'>+{</div><div class='add'>+	hw_dbg(hw, "Running IGP 3 PHY init script\n");</div><div class='add'>+</div><div class='add'>+	/* PHY init IGP 3 */</div><div class='add'>+	/* Enable rise/fall, 10-mode work in class-A */</div><div class='add'>+	e1e_wphy(hw, 0x2F5B, 0x9018);</div><div class='add'>+	/* Remove all caps from Replica path filter */</div><div class='add'>+	e1e_wphy(hw, 0x2F52, 0x0000);</div><div class='add'>+	/* Bias trimming for ADC, AFE and Driver (Default) */</div><div class='add'>+	e1e_wphy(hw, 0x2FB1, 0x8B24);</div><div class='add'>+	/* Increase Hybrid poly bias */</div><div class='add'>+	e1e_wphy(hw, 0x2FB2, 0xF8F0);</div><div class='add'>+	/* Add 4% to Tx amplitude in Gig mode */</div><div class='add'>+	e1e_wphy(hw, 0x2010, 0x10B0);</div><div class='add'>+	/* Disable trimming (TTT) */</div><div class='add'>+	e1e_wphy(hw, 0x2011, 0x0000);</div><div class='add'>+	/* Poly DC correction to 94.6% + 2% for all channels */</div><div class='add'>+	e1e_wphy(hw, 0x20DD, 0x249A);</div><div class='add'>+	/* ABS DC correction to 95.9% */</div><div class='add'>+	e1e_wphy(hw, 0x20DE, 0x00D3);</div><div class='add'>+	/* BG temp curve trim */</div><div class='add'>+	e1e_wphy(hw, 0x28B4, 0x04CE);</div><div class='add'>+	/* Increasing ADC OPAMP stage 1 currents to max */</div><div class='add'>+	e1e_wphy(hw, 0x2F70, 0x29E4);</div><div class='add'>+	/* Force 1000 ( required for enabling PHY regs configuration) */</div><div class='add'>+	e1e_wphy(hw, 0x0000, 0x0140);</div><div class='add'>+	/* Set upd_freq to 6 */</div><div class='add'>+	e1e_wphy(hw, 0x1F30, 0x1606);</div><div class='add'>+	/* Disable NPDFE */</div><div class='add'>+	e1e_wphy(hw, 0x1F31, 0xB814);</div><div class='add'>+	/* Disable adaptive fixed FFE (Default) */</div><div class='add'>+	e1e_wphy(hw, 0x1F35, 0x002A);</div><div class='add'>+	/* Enable FFE hysteresis */</div><div class='add'>+	e1e_wphy(hw, 0x1F3E, 0x0067);</div><div class='add'>+	/* Fixed FFE for short cable lengths */</div><div class='add'>+	e1e_wphy(hw, 0x1F54, 0x0065);</div><div class='add'>+	/* Fixed FFE for medium cable lengths */</div><div class='add'>+	e1e_wphy(hw, 0x1F55, 0x002A);</div><div class='add'>+	/* Fixed FFE for long cable lengths */</div><div class='add'>+	e1e_wphy(hw, 0x1F56, 0x002A);</div><div class='add'>+	/* Enable Adaptive Clip Threshold */</div><div class='add'>+	e1e_wphy(hw, 0x1F72, 0x3FB0);</div><div class='add'>+	/* AHT reset limit to 1 */</div><div class='add'>+	e1e_wphy(hw, 0x1F76, 0xC0FF);</div><div class='add'>+	/* Set AHT master delay to 127 msec */</div><div class='add'>+	e1e_wphy(hw, 0x1F77, 0x1DEC);</div><div class='add'>+	/* Set scan bits for AHT */</div><div class='add'>+	e1e_wphy(hw, 0x1F78, 0xF9EF);</div><div class='add'>+	/* Set AHT Preset bits */</div><div class='add'>+	e1e_wphy(hw, 0x1F79, 0x0210);</div><div class='add'>+	/* Change integ_factor of channel A to 3 */</div><div class='add'>+	e1e_wphy(hw, 0x1895, 0x0003);</div><div class='add'>+	/* Change prop_factor of channels BCD to 8 */</div><div class='add'>+	e1e_wphy(hw, 0x1796, 0x0008);</div><div class='add'>+	/* Change cg_icount + enable integbp for channels BCD */</div><div class='add'>+	e1e_wphy(hw, 0x1798, 0xD008);</div><div class='add'>+	/*</div><div class='add'>+	 * Change cg_icount + enable integbp + change prop_factor_master</div><div class='add'>+	 * to 8 for channel A</div><div class='add'>+	 */</div><div class='add'>+	e1e_wphy(hw, 0x1898, 0xD918);</div><div class='add'>+	/* Disable AHT in Slave mode on channel A */</div><div class='add'>+	e1e_wphy(hw, 0x187A, 0x0800);</div><div class='add'>+	/*</div><div class='add'>+	 * Enable LPLU and disable AN to 1000 in non-D0a states,</div><div class='add'>+	 * Enable SPD+B2B</div><div class='add'>+	 */</div><div class='add'>+	e1e_wphy(hw, 0x0019, 0x008D);</div><div class='add'>+	/* Enable restart AN on an1000_dis change */</div><div class='add'>+	e1e_wphy(hw, 0x001B, 0x2080);</div><div class='add'>+	/* Enable wh_fifo read clock in 10/100 modes */</div><div class='add'>+	e1e_wphy(hw, 0x0014, 0x0045);</div><div class='add'>+	/* Restart AN, Speed selection is 1000 */</div><div class='add'>+	e1e_wphy(hw, 0x0000, 0x1340);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Internal function pointers */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1969,6 +2068,99 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ *  e1000e_read_phy_reg_bm2 - Read BM PHY register</div><div class='add'>+ *  @hw: pointer to the HW structure</div><div class='add'>+ *  @offset: register offset to be read</div><div class='add'>+ *  @data: pointer to the read data</div><div class='add'>+ *</div><div class='add'>+ *  Acquires semaphore, if necessary, then reads the PHY register at offset</div><div class='add'>+ *  and storing the retrieved information in data.  Release any acquired</div><div class='add'>+ *  semaphores before exiting.</div><div class='add'>+ **/</div><div class='add'>+s32 e1000e_read_phy_reg_bm2(struct e1000_hw *hw, u32 offset, u16 *data)</div><div class='add'>+{</div><div class='add'>+	s32 ret_val;</div><div class='add'>+	u16 page = (u16)(offset &gt;&gt; IGP_PAGE_SHIFT);</div><div class='add'>+</div><div class='add'>+	/* Page 800 works differently than the rest so it has its own func */</div><div class='add'>+	if (page == BM_WUC_PAGE) {</div><div class='add'>+		ret_val = e1000_access_phy_wakeup_reg_bm(hw, offset, data,</div><div class='add'>+							 true);</div><div class='add'>+		return ret_val;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret_val = hw-&gt;phy.ops.acquire_phy(hw);</div><div class='add'>+	if (ret_val)</div><div class='add'>+		return ret_val;</div><div class='add'>+</div><div class='add'>+	hw-&gt;phy.addr = 1;</div><div class='add'>+</div><div class='add'>+	if (offset &gt; MAX_PHY_MULTI_PAGE_REG) {</div><div class='add'>+</div><div class='add'>+		/* Page is shifted left, PHY expects (page x 32) */</div><div class='add'>+		ret_val = e1000e_write_phy_reg_mdic(hw, BM_PHY_PAGE_SELECT,</div><div class='add'>+						    page);</div><div class='add'>+</div><div class='add'>+		if (ret_val) {</div><div class='add'>+			hw-&gt;phy.ops.release_phy(hw);</div><div class='add'>+			return ret_val;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret_val = e1000e_read_phy_reg_mdic(hw, MAX_PHY_REG_ADDRESS &amp; offset,</div><div class='add'>+					   data);</div><div class='add'>+	hw-&gt;phy.ops.release_phy(hw);</div><div class='add'>+</div><div class='add'>+	return ret_val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *  e1000e_write_phy_reg_bm2 - Write BM PHY register</div><div class='add'>+ *  @hw: pointer to the HW structure</div><div class='add'>+ *  @offset: register offset to write to</div><div class='add'>+ *  @data: data to write at register offset</div><div class='add'>+ *</div><div class='add'>+ *  Acquires semaphore, if necessary, then writes the data to PHY register</div><div class='add'>+ *  at the offset.  Release any acquired semaphores before exiting.</div><div class='add'>+ **/</div><div class='add'>+s32 e1000e_write_phy_reg_bm2(struct e1000_hw *hw, u32 offset, u16 data)</div><div class='add'>+{</div><div class='add'>+	s32 ret_val;</div><div class='add'>+	u16 page = (u16)(offset &gt;&gt; IGP_PAGE_SHIFT);</div><div class='add'>+</div><div class='add'>+	/* Page 800 works differently than the rest so it has its own func */</div><div class='add'>+	if (page == BM_WUC_PAGE) {</div><div class='add'>+		ret_val = e1000_access_phy_wakeup_reg_bm(hw, offset, &amp;data,</div><div class='add'>+							 false);</div><div class='add'>+		return ret_val;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret_val = hw-&gt;phy.ops.acquire_phy(hw);</div><div class='add'>+	if (ret_val)</div><div class='add'>+		return ret_val;</div><div class='add'>+</div><div class='add'>+	hw-&gt;phy.addr = 1;</div><div class='add'>+</div><div class='add'>+	if (offset &gt; MAX_PHY_MULTI_PAGE_REG) {</div><div class='add'>+		/* Page is shifted left, PHY expects (page x 32) */</div><div class='add'>+		ret_val = e1000e_write_phy_reg_mdic(hw, BM_PHY_PAGE_SELECT,</div><div class='add'>+						    page);</div><div class='add'>+</div><div class='add'>+		if (ret_val) {</div><div class='add'>+			hw-&gt;phy.ops.release_phy(hw);</div><div class='add'>+			return ret_val;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret_val = e1000e_write_phy_reg_mdic(hw, MAX_PHY_REG_ADDRESS &amp; offset,</div><div class='add'>+					    data);</div><div class='add'>+</div><div class='add'>+	hw-&gt;phy.ops.release_phy(hw);</div><div class='add'>+</div><div class='add'>+	return ret_val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  *  e1000_access_phy_wakeup_reg_bm - Read BM PHY wakeup register</div><div class='ctx'>  *  @hw: pointer to the HW structure</div><div class='ctx'>  *  @offset: register offset to be read or written</div><div class='head'>diff --git a/drivers/net/eexpress.c b/drivers/net/eexpress.c<br/>index 795c594a4b7c..b751c1b96cfa 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/eexpress.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/eexpress.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/eexpress.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/eexpress.c</a></div><div class='hunk'>@@ -8,7 +8,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Many modifications, and currently maintained, by</div><div class='ctx'>  *  Philip Blundell &lt;philb@gnu.org&gt;</div><div class='del'>- * Added the Compaq LTE  Alan Cox &lt;alan@redhat.com&gt;</div><div class='add'>+ * Added the Compaq LTE  Alan Cox &lt;alan@lxorguk.ukuu.org.uk&gt;</div><div class='ctx'>  * Added MCA support Adam Fritzler</div><div class='ctx'>  *</div><div class='ctx'>  * Note - this driver is experimental still - it has problems on faster</div><div class='head'>diff --git a/drivers/net/ehea/ehea.h b/drivers/net/ehea/ehea.h<br/>index e01926b7b5b7..5524271eedca 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/ehea/ehea.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/ehea/ehea.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/ehea/ehea.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/ehea/ehea.h</a></div><div class='hunk'>@@ -40,13 +40,13 @@</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME	"ehea"</div><div class='del'>-#define DRV_VERSION	"EHEA_0092"</div><div class='add'>+#define DRV_VERSION	"EHEA_0093"</div><div class='ctx'> </div><div class='ctx'> /* eHEA capability flags */</div><div class='ctx'> #define DLPAR_PORT_ADD_REM 1</div><div class='ctx'> #define DLPAR_MEM_ADD      2</div><div class='ctx'> #define DLPAR_MEM_REM      4</div><div class='del'>-#define EHEA_CAPABILITIES  (DLPAR_PORT_ADD_REM | DLPAR_MEM_ADD)</div><div class='add'>+#define EHEA_CAPABILITIES  (DLPAR_PORT_ADD_REM | DLPAR_MEM_ADD | DLPAR_MEM_REM)</div><div class='ctx'> </div><div class='ctx'> #define EHEA_MSG_DEFAULT (NETIF_MSG_LINK | NETIF_MSG_TIMER \</div><div class='ctx'> 	| NETIF_MSG_RX_ERR | NETIF_MSG_TX_ERR)</div><div class='head'>diff --git a/drivers/net/ehea/ehea_phyp.c b/drivers/net/ehea/ehea_phyp.c<br/>index 156eb6320b4e..2a33a613d9e6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/ehea/ehea_phyp.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/ehea/ehea_phyp.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/ehea/ehea_phyp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/ehea/ehea_phyp.c</a></div><div class='hunk'>@@ -535,7 +535,7 @@ u64 ehea_h_query_ehea(const u64 adapter_handle, void *cb_addr)</div><div class='ctx'> 				       cb_logaddr,		/* R5 */</div><div class='ctx'> 				       0, 0, 0, 0, 0);		/* R6-R10 */</div><div class='ctx'> #ifdef DEBUG</div><div class='del'>-	ehea_dmp(cb_addr, sizeof(struct hcp_query_ehea), "hcp_query_ehea");</div><div class='add'>+	ehea_dump(cb_addr, sizeof(struct hcp_query_ehea), "hcp_query_ehea");</div><div class='ctx'> #endif</div><div class='ctx'> 	return hret;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/ehea/ehea_qmr.c b/drivers/net/ehea/ehea_qmr.c<br/>index 140f05baafd8..db8a9257e680 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/ehea/ehea_qmr.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/ehea/ehea_qmr.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/ehea/ehea_qmr.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/ehea/ehea_qmr.c</a></div><div class='hunk'>@@ -595,7 +595,8 @@ static int ehea_create_busmap_callback(unsigned long pfn,</div><div class='ctx'> 	end_section = start_section + ((nr_pages * PAGE_SIZE) / EHEA_SECTSIZE);</div><div class='ctx'> 	mr_len = *(unsigned long *)arg;</div><div class='ctx'> </div><div class='del'>-	ehea_bmap = kzalloc(sizeof(struct ehea_bmap), GFP_KERNEL);</div><div class='add'>+	if (!ehea_bmap)</div><div class='add'>+		ehea_bmap = kzalloc(sizeof(struct ehea_bmap), GFP_KERNEL);</div><div class='ctx'> 	if (!ehea_bmap)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/enc28j60.c b/drivers/net/enc28j60.c<br/>index aa0bf6e1c694..e1b441effbbe 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/enc28j60.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/enc28j60.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/enc28j60.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/enc28j60.c</a></div><div class='hunk'>@@ -110,7 +110,7 @@ spi_read_buf(struct enc28j60_net *priv, int len, u8 *data)</div><div class='ctx'> 	}</div><div class='ctx'> 	if (ret &amp;&amp; netif_msg_drv(priv))</div><div class='ctx'> 		printk(KERN_DEBUG DRV_NAME ": %s() failed: ret = %d\n",</div><div class='del'>-			__FUNCTION__, ret);</div><div class='add'>+			__func__, ret);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -131,7 +131,7 @@ static int spi_write_buf(struct enc28j60_net *priv, int len,</div><div class='ctx'> 		ret = spi_write(priv-&gt;spi, priv-&gt;spi_transfer_buf, len + 1);</div><div class='ctx'> 		if (ret &amp;&amp; netif_msg_drv(priv))</div><div class='ctx'> 			printk(KERN_DEBUG DRV_NAME ": %s() failed: ret = %d\n",</div><div class='del'>-				__FUNCTION__, ret);</div><div class='add'>+				__func__, ret);</div><div class='ctx'> 	}</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -156,7 +156,7 @@ static u8 spi_read_op(struct enc28j60_net *priv, u8 op,</div><div class='ctx'> 	ret = spi_write_then_read(priv-&gt;spi, tx_buf, 1, rx_buf, slen);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		printk(KERN_DEBUG DRV_NAME ": %s() failed: ret = %d\n",</div><div class='del'>-			__FUNCTION__, ret);</div><div class='add'>+			__func__, ret);</div><div class='ctx'> 	else</div><div class='ctx'> 		val = rx_buf[slen - 1];</div><div class='ctx'> </div><div class='hunk'>@@ -176,14 +176,14 @@ static int spi_write_op(struct enc28j60_net *priv, u8 op,</div><div class='ctx'> 	ret = spi_write(priv-&gt;spi, priv-&gt;spi_transfer_buf, 2);</div><div class='ctx'> 	if (ret &amp;&amp; netif_msg_drv(priv))</div><div class='ctx'> 		printk(KERN_DEBUG DRV_NAME ": %s() failed: ret = %d\n",</div><div class='del'>-			__FUNCTION__, ret);</div><div class='add'>+			__func__, ret);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void enc28j60_soft_reset(struct enc28j60_net *priv)</div><div class='ctx'> {</div><div class='ctx'> 	if (netif_msg_hw(priv))</div><div class='del'>-		printk(KERN_DEBUG DRV_NAME ": %s() enter\n", __FUNCTION__);</div><div class='add'>+		printk(KERN_DEBUG DRV_NAME ": %s() enter\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	spi_write_op(priv, ENC28J60_SOFT_RESET, 0, ENC28J60_SOFT_RESET);</div><div class='ctx'> 	/* Errata workaround #1, CLKRDY check is unreliable,</div><div class='hunk'>@@ -357,7 +357,7 @@ static void enc28j60_mem_read(struct enc28j60_net *priv,</div><div class='ctx'> 		reg = nolock_regw_read(priv, ERDPTL);</div><div class='ctx'> 		if (reg != addr)</div><div class='ctx'> 			printk(KERN_DEBUG DRV_NAME ": %s() error writing ERDPT "</div><div class='del'>-				"(0x%04x - 0x%04x)\n", __FUNCTION__, reg, addr);</div><div class='add'>+				"(0x%04x - 0x%04x)\n", __func__, reg, addr);</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> 	spi_read_buf(priv, len, data);</div><div class='hunk'>@@ -380,7 +380,7 @@ enc28j60_packet_write(struct enc28j60_net *priv, int len, const u8 *data)</div><div class='ctx'> 		if (reg != TXSTART_INIT)</div><div class='ctx'> 			printk(KERN_DEBUG DRV_NAME</div><div class='ctx'> 				": %s() ERWPT:0x%04x != 0x%04x\n",</div><div class='del'>-				__FUNCTION__, reg, TXSTART_INIT);</div><div class='add'>+				__func__, reg, TXSTART_INIT);</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> 	/* Set the TXND pointer to correspond to the packet size given */</div><div class='hunk'>@@ -390,13 +390,13 @@ enc28j60_packet_write(struct enc28j60_net *priv, int len, const u8 *data)</div><div class='ctx'> 	if (netif_msg_hw(priv))</div><div class='ctx'> 		printk(KERN_DEBUG DRV_NAME</div><div class='ctx'> 			": %s() after control byte ERWPT:0x%04x\n",</div><div class='del'>-			__FUNCTION__, nolock_regw_read(priv, EWRPTL));</div><div class='add'>+			__func__, nolock_regw_read(priv, EWRPTL));</div><div class='ctx'> 	/* copy the packet into the transmit buffer */</div><div class='ctx'> 	spi_write_buf(priv, len, data);</div><div class='ctx'> 	if (netif_msg_hw(priv))</div><div class='ctx'> 		printk(KERN_DEBUG DRV_NAME</div><div class='ctx'> 			 ": %s() after write packet ERWPT:0x%04x, len=%d\n",</div><div class='del'>-			 __FUNCTION__, nolock_regw_read(priv, EWRPTL), len);</div><div class='add'>+			 __func__, nolock_regw_read(priv, EWRPTL), len);</div><div class='ctx'> 	mutex_unlock(&amp;priv-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -495,7 +495,7 @@ static int enc28j60_set_hw_macaddr(struct net_device *ndev)</div><div class='ctx'> 		if (netif_msg_drv(priv))</div><div class='ctx'> 			printk(KERN_DEBUG DRV_NAME</div><div class='ctx'> 				": %s() Hardware must be disabled to set "</div><div class='del'>-				"Mac address\n", __FUNCTION__);</div><div class='add'>+				"Mac address\n", __func__);</div><div class='ctx'> 		ret = -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> 	mutex_unlock(&amp;priv-&gt;lock);</div><div class='hunk'>@@ -575,7 +575,7 @@ static void nolock_rxfifo_init(struct enc28j60_net *priv, u16 start, u16 end)</div><div class='ctx'> 	if (start &gt; 0x1FFF || end &gt; 0x1FFF || start &gt; end) {</div><div class='ctx'> 		if (netif_msg_drv(priv))</div><div class='ctx'> 			printk(KERN_ERR DRV_NAME ": %s(%d, %d) RXFIFO "</div><div class='del'>-				"bad parameters!\n", __FUNCTION__, start, end);</div><div class='add'>+				"bad parameters!\n", __func__, start, end);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* set receive buffer start + end */</div><div class='hunk'>@@ -591,7 +591,7 @@ static void nolock_txfifo_init(struct enc28j60_net *priv, u16 start, u16 end)</div><div class='ctx'> 	if (start &gt; 0x1FFF || end &gt; 0x1FFF || start &gt; end) {</div><div class='ctx'> 		if (netif_msg_drv(priv))</div><div class='ctx'> 			printk(KERN_ERR DRV_NAME ": %s(%d, %d) TXFIFO "</div><div class='del'>-				"bad parameters!\n", __FUNCTION__, start, end);</div><div class='add'>+				"bad parameters!\n", __func__, start, end);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* set transmit buffer start + end */</div><div class='hunk'>@@ -630,7 +630,7 @@ static int enc28j60_hw_init(struct enc28j60_net *priv)</div><div class='ctx'> 	u8 reg;</div><div class='ctx'> </div><div class='ctx'> 	if (netif_msg_drv(priv))</div><div class='del'>-		printk(KERN_DEBUG DRV_NAME ": %s() - %s\n", __FUNCTION__,</div><div class='add'>+		printk(KERN_DEBUG DRV_NAME ": %s() - %s\n", __func__,</div><div class='ctx'> 			priv-&gt;full_duplex ? "FullDuplex" : "HalfDuplex");</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;priv-&gt;lock);</div><div class='hunk'>@@ -661,7 +661,7 @@ static int enc28j60_hw_init(struct enc28j60_net *priv)</div><div class='ctx'> 	if (reg == 0x00 || reg == 0xff) {</div><div class='ctx'> 		if (netif_msg_drv(priv))</div><div class='ctx'> 			printk(KERN_DEBUG DRV_NAME ": %s() Invalid RevId %d\n",</div><div class='del'>-				__FUNCTION__, reg);</div><div class='add'>+				__func__, reg);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -724,7 +724,7 @@ static void enc28j60_hw_enable(struct enc28j60_net *priv)</div><div class='ctx'> 	/* enable interrupts */</div><div class='ctx'> 	if (netif_msg_hw(priv))</div><div class='ctx'> 		printk(KERN_DEBUG DRV_NAME ": %s() enabling interrupts.\n",</div><div class='del'>-			__FUNCTION__);</div><div class='add'>+			__func__);</div><div class='ctx'> </div><div class='ctx'> 	enc28j60_phy_write(priv, PHIE, PHIE_PGEIE | PHIE_PLNKIE);</div><div class='ctx'> </div><div class='hunk'>@@ -888,7 +888,7 @@ static void enc28j60_hw_rx(struct net_device *ndev)</div><div class='ctx'> 		if (netif_msg_rx_err(priv))</div><div class='ctx'> 			dev_err(&amp;ndev-&gt;dev,</div><div class='ctx'> 				"%s() Invalid packet address!! 0x%04x\n",</div><div class='del'>-				__FUNCTION__, priv-&gt;next_pk_ptr);</div><div class='add'>+				__func__, priv-&gt;next_pk_ptr);</div><div class='ctx'> 		/* packet address corrupted: reset RX logic */</div><div class='ctx'> 		mutex_lock(&amp;priv-&gt;lock);</div><div class='ctx'> 		nolock_reg_bfclr(priv, ECON1, ECON1_RXEN);</div><div class='hunk'>@@ -917,7 +917,7 @@ static void enc28j60_hw_rx(struct net_device *ndev)</div><div class='ctx'> 	rxstat |= rsv[4];</div><div class='ctx'> </div><div class='ctx'> 	if (netif_msg_rx_status(priv))</div><div class='del'>-		enc28j60_dump_rsv(priv, __FUNCTION__, next_packet, len, rxstat);</div><div class='add'>+		enc28j60_dump_rsv(priv, __func__, next_packet, len, rxstat);</div><div class='ctx'> </div><div class='ctx'> 	if (!RSV_GETBIT(rxstat, RSV_RXOK)) {</div><div class='ctx'> 		if (netif_msg_rx_err(priv))</div><div class='hunk'>@@ -941,7 +941,7 @@ static void enc28j60_hw_rx(struct net_device *ndev)</div><div class='ctx'> 			enc28j60_mem_read(priv, priv-&gt;next_pk_ptr + sizeof(rsv),</div><div class='ctx'> 					len, skb_put(skb, len));</div><div class='ctx'> 			if (netif_msg_pktdata(priv))</div><div class='del'>-				dump_packet(__FUNCTION__, skb-&gt;len, skb-&gt;data);</div><div class='add'>+				dump_packet(__func__, skb-&gt;len, skb-&gt;data);</div><div class='ctx'> 			skb-&gt;protocol = eth_type_trans(skb, ndev);</div><div class='ctx'> 			/* update statistics */</div><div class='ctx'> 			ndev-&gt;stats.rx_packets++;</div><div class='hunk'>@@ -958,7 +958,7 @@ static void enc28j60_hw_rx(struct net_device *ndev)</div><div class='ctx'> 	erxrdpt = erxrdpt_workaround(next_packet, RXSTART_INIT, RXEND_INIT);</div><div class='ctx'> 	if (netif_msg_hw(priv))</div><div class='ctx'> 		printk(KERN_DEBUG DRV_NAME ": %s() ERXRDPT:0x%04x\n",</div><div class='del'>-			__FUNCTION__, erxrdpt);</div><div class='add'>+			__func__, erxrdpt);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;priv-&gt;lock);</div><div class='ctx'> 	nolock_regw_write(priv, ERXRDPTL, erxrdpt);</div><div class='hunk'>@@ -968,7 +968,7 @@ static void enc28j60_hw_rx(struct net_device *ndev)</div><div class='ctx'> 		reg = nolock_regw_read(priv, ERXRDPTL);</div><div class='ctx'> 		if (reg != erxrdpt)</div><div class='ctx'> 			printk(KERN_DEBUG DRV_NAME ": %s() ERXRDPT verify "</div><div class='del'>-				"error (0x%04x - 0x%04x)\n", __FUNCTION__,</div><div class='add'>+				"error (0x%04x - 0x%04x)\n", __func__,</div><div class='ctx'> 				reg, erxrdpt);</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='hunk'>@@ -1006,7 +1006,7 @@ static int enc28j60_get_free_rxfifo(struct enc28j60_net *priv)</div><div class='ctx'> 	mutex_unlock(&amp;priv-&gt;lock);</div><div class='ctx'> 	if (netif_msg_rx_status(priv))</div><div class='ctx'> 		printk(KERN_DEBUG DRV_NAME ": %s() free_space = %d\n",</div><div class='del'>-			__FUNCTION__, free_space);</div><div class='add'>+			__func__, free_space);</div><div class='ctx'> 	return free_space;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1022,7 +1022,7 @@ static void enc28j60_check_link_status(struct net_device *ndev)</div><div class='ctx'> 	reg = enc28j60_phy_read(priv, PHSTAT2);</div><div class='ctx'> 	if (netif_msg_hw(priv))</div><div class='ctx'> 		printk(KERN_DEBUG DRV_NAME ": %s() PHSTAT1: %04x, "</div><div class='del'>-			"PHSTAT2: %04x\n", __FUNCTION__,</div><div class='add'>+			"PHSTAT2: %04x\n", __func__,</div><div class='ctx'> 			enc28j60_phy_read(priv, PHSTAT1), reg);</div><div class='ctx'> 	duplex = reg &amp; PHSTAT2_DPXSTAT;</div><div class='ctx'> </div><div class='hunk'>@@ -1095,7 +1095,7 @@ static void enc28j60_irq_work_handler(struct work_struct *work)</div><div class='ctx'> 	int intflags, loop;</div><div class='ctx'> </div><div class='ctx'> 	if (netif_msg_intr(priv))</div><div class='del'>-		printk(KERN_DEBUG DRV_NAME ": %s() enter\n", __FUNCTION__);</div><div class='add'>+		printk(KERN_DEBUG DRV_NAME ": %s() enter\n", __func__);</div><div class='ctx'> 	/* disable further interrupts */</div><div class='ctx'> 	locked_reg_bfclr(priv, EIE, EIE_INTIE);</div><div class='ctx'> </div><div class='hunk'>@@ -1198,7 +1198,7 @@ static void enc28j60_irq_work_handler(struct work_struct *work)</div><div class='ctx'> 	/* re-enable interrupts */</div><div class='ctx'> 	locked_reg_bfset(priv, EIE, EIE_INTIE);</div><div class='ctx'> 	if (netif_msg_intr(priv))</div><div class='del'>-		printk(KERN_DEBUG DRV_NAME ": %s() exit\n", __FUNCTION__);</div><div class='add'>+		printk(KERN_DEBUG DRV_NAME ": %s() exit\n", __func__);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1213,7 +1213,7 @@ static void enc28j60_hw_tx(struct enc28j60_net *priv)</div><div class='ctx'> 			": Tx Packet Len:%d\n", priv-&gt;tx_skb-&gt;len);</div><div class='ctx'> </div><div class='ctx'> 	if (netif_msg_pktdata(priv))</div><div class='del'>-		dump_packet(__FUNCTION__,</div><div class='add'>+		dump_packet(__func__,</div><div class='ctx'> 			    priv-&gt;tx_skb-&gt;len, priv-&gt;tx_skb-&gt;data);</div><div class='ctx'> 	enc28j60_packet_write(priv, priv-&gt;tx_skb-&gt;len, priv-&gt;tx_skb-&gt;data);</div><div class='ctx'> </div><div class='hunk'>@@ -1254,7 +1254,7 @@ static int enc28j60_send_packet(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	struct enc28j60_net *priv = netdev_priv(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (netif_msg_tx_queued(priv))</div><div class='del'>-		printk(KERN_DEBUG DRV_NAME ": %s() enter\n", __FUNCTION__);</div><div class='add'>+		printk(KERN_DEBUG DRV_NAME ": %s() enter\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	/* If some error occurs while trying to transmit this</div><div class='ctx'> 	 * packet, you should return '1' from this function.</div><div class='hunk'>@@ -1325,7 +1325,7 @@ static int enc28j60_net_open(struct net_device *dev)</div><div class='ctx'> 	struct enc28j60_net *priv = netdev_priv(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (netif_msg_drv(priv))</div><div class='del'>-		printk(KERN_DEBUG DRV_NAME ": %s() enter\n", __FUNCTION__);</div><div class='add'>+		printk(KERN_DEBUG DRV_NAME ": %s() enter\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	if (!is_valid_ether_addr(dev-&gt;dev_addr)) {</div><div class='ctx'> 		if (netif_msg_ifup(priv)) {</div><div class='hunk'>@@ -1363,7 +1363,7 @@ static int enc28j60_net_close(struct net_device *dev)</div><div class='ctx'> 	struct enc28j60_net *priv = netdev_priv(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (netif_msg_drv(priv))</div><div class='del'>-		printk(KERN_DEBUG DRV_NAME ": %s() enter\n", __FUNCTION__);</div><div class='add'>+		printk(KERN_DEBUG DRV_NAME ": %s() enter\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	enc28j60_hw_disable(priv);</div><div class='ctx'> 	enc28j60_lowpower(priv, true);</div><div class='head'>diff --git a/drivers/net/enic/Makefile b/drivers/net/enic/Makefile<br/>new file mode 100644<br/>index 000000000000..391c3bce5b79<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/enic/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/enic/Makefile</a></div><div class='hunk'>@@ -0,0 +1,5 @@</div><div class='add'>+obj-$(CONFIG_ENIC) := enic.o</div><div class='add'>+</div><div class='add'>+enic-y := enic_main.o vnic_cq.o vnic_intr.o vnic_wq.o \</div><div class='add'>+	enic_res.o vnic_dev.o vnic_rq.o</div><div class='add'>+</div><div class='head'>diff --git a/drivers/net/enic/cq_desc.h b/drivers/net/enic/cq_desc.h<br/>new file mode 100644<br/>index 000000000000..c036a8bfd043<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/enic/cq_desc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/enic/cq_desc.h</a></div><div class='hunk'>@@ -0,0 +1,79 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2008 Cisco Systems, Inc.  All rights reserved.</div><div class='add'>+ * Copyright 2007 Nuova Systems, Inc.  All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you may redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; version 2 of the License.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='add'>+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='add'>+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='add'>+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='add'>+ * SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _CQ_DESC_H_</div><div class='add'>+#define _CQ_DESC_H_</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Completion queue descriptor types</div><div class='add'>+ */</div><div class='add'>+enum cq_desc_types {</div><div class='add'>+	CQ_DESC_TYPE_WQ_ENET = 0,</div><div class='add'>+	CQ_DESC_TYPE_DESC_COPY = 1,</div><div class='add'>+	CQ_DESC_TYPE_WQ_EXCH = 2,</div><div class='add'>+	CQ_DESC_TYPE_RQ_ENET = 3,</div><div class='add'>+	CQ_DESC_TYPE_RQ_FCP = 4,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Completion queue descriptor: 16B</div><div class='add'>+ *</div><div class='add'>+ * All completion queues have this basic layout.  The</div><div class='add'>+ * type_specfic area is unique for each completion</div><div class='add'>+ * queue type.</div><div class='add'>+ */</div><div class='add'>+struct cq_desc {</div><div class='add'>+	__le16 completed_index;</div><div class='add'>+	__le16 q_number;</div><div class='add'>+	u8 type_specfic[11];</div><div class='add'>+	u8 type_color;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define CQ_DESC_TYPE_BITS        7</div><div class='add'>+#define CQ_DESC_TYPE_MASK        ((1 &lt;&lt; CQ_DESC_TYPE_BITS) - 1)</div><div class='add'>+#define CQ_DESC_COLOR_MASK       1</div><div class='add'>+#define CQ_DESC_Q_NUM_BITS       10</div><div class='add'>+#define CQ_DESC_Q_NUM_MASK       ((1 &lt;&lt; CQ_DESC_Q_NUM_BITS) - 1)</div><div class='add'>+#define CQ_DESC_COMP_NDX_BITS    12</div><div class='add'>+#define CQ_DESC_COMP_NDX_MASK    ((1 &lt;&lt; CQ_DESC_COMP_NDX_BITS) - 1)</div><div class='add'>+</div><div class='add'>+static inline void cq_desc_dec(const struct cq_desc *desc_arg,</div><div class='add'>+	u8 *type, u8 *color, u16 *q_number, u16 *completed_index)</div><div class='add'>+{</div><div class='add'>+	const struct cq_desc *desc = desc_arg;</div><div class='add'>+	const u8 type_color = desc-&gt;type_color;</div><div class='add'>+</div><div class='add'>+	*color = (type_color &gt;&gt; CQ_DESC_TYPE_BITS) &amp; CQ_DESC_COLOR_MASK;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Make sure color bit is read from desc *before* other fields</div><div class='add'>+	 * are read from desc.  Hardware guarantees color bit is last</div><div class='add'>+	 * bit (byte) written.  Adding the rmb() prevents the compiler</div><div class='add'>+	 * and/or CPU from reordering the reads which would potentially</div><div class='add'>+	 * result in reading stale values.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	rmb();</div><div class='add'>+</div><div class='add'>+	*type = type_color &amp; CQ_DESC_TYPE_MASK;</div><div class='add'>+	*q_number = le16_to_cpu(desc-&gt;q_number) &amp; CQ_DESC_Q_NUM_MASK;</div><div class='add'>+	*completed_index = le16_to_cpu(desc-&gt;completed_index) &amp;</div><div class='add'>+		CQ_DESC_COMP_NDX_MASK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* _CQ_DESC_H_ */</div><div class='head'>diff --git a/drivers/net/enic/cq_enet_desc.h b/drivers/net/enic/cq_enet_desc.h<br/>new file mode 100644<br/>index 000000000000..03dce9ed612c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/enic/cq_enet_desc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/enic/cq_enet_desc.h</a></div><div class='hunk'>@@ -0,0 +1,169 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2008 Cisco Systems, Inc.  All rights reserved.</div><div class='add'>+ * Copyright 2007 Nuova Systems, Inc.  All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you may redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; version 2 of the License.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='add'>+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='add'>+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='add'>+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='add'>+ * SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _CQ_ENET_DESC_H_</div><div class='add'>+#define _CQ_ENET_DESC_H_</div><div class='add'>+</div><div class='add'>+#include "cq_desc.h"</div><div class='add'>+</div><div class='add'>+/* Ethernet completion queue descriptor: 16B */</div><div class='add'>+struct cq_enet_wq_desc {</div><div class='add'>+	__le16 completed_index;</div><div class='add'>+	__le16 q_number;</div><div class='add'>+	u8 reserved[11];</div><div class='add'>+	u8 type_color;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline void cq_enet_wq_desc_dec(struct cq_enet_wq_desc *desc,</div><div class='add'>+	u8 *type, u8 *color, u16 *q_number, u16 *completed_index)</div><div class='add'>+{</div><div class='add'>+	cq_desc_dec((struct cq_desc *)desc, type,</div><div class='add'>+		color, q_number, completed_index);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Completion queue descriptor: Ethernet receive queue, 16B */</div><div class='add'>+struct cq_enet_rq_desc {</div><div class='add'>+	__le16 completed_index_flags;</div><div class='add'>+	__le16 q_number_rss_type_flags;</div><div class='add'>+	__le32 rss_hash;</div><div class='add'>+	__le16 bytes_written_flags;</div><div class='add'>+	__le16 vlan;</div><div class='add'>+	__le16 checksum_fcoe;</div><div class='add'>+	u8 flags;</div><div class='add'>+	u8 type_color;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define CQ_ENET_RQ_DESC_FLAGS_INGRESS_PORT          (0x1 &lt;&lt; 12)</div><div class='add'>+#define CQ_ENET_RQ_DESC_FLAGS_FCOE                  (0x1 &lt;&lt; 13)</div><div class='add'>+#define CQ_ENET_RQ_DESC_FLAGS_EOP                   (0x1 &lt;&lt; 14)</div><div class='add'>+#define CQ_ENET_RQ_DESC_FLAGS_SOP                   (0x1 &lt;&lt; 15)</div><div class='add'>+</div><div class='add'>+#define CQ_ENET_RQ_DESC_RSS_TYPE_BITS               4</div><div class='add'>+#define CQ_ENET_RQ_DESC_RSS_TYPE_MASK \</div><div class='add'>+	((1 &lt;&lt; CQ_ENET_RQ_DESC_RSS_TYPE_BITS) - 1)</div><div class='add'>+#define CQ_ENET_RQ_DESC_RSS_TYPE_NONE               0</div><div class='add'>+#define CQ_ENET_RQ_DESC_RSS_TYPE_IPv4               1</div><div class='add'>+#define CQ_ENET_RQ_DESC_RSS_TYPE_TCP_IPv4           2</div><div class='add'>+#define CQ_ENET_RQ_DESC_RSS_TYPE_IPv6               3</div><div class='add'>+#define CQ_ENET_RQ_DESC_RSS_TYPE_TCP_IPv6           4</div><div class='add'>+#define CQ_ENET_RQ_DESC_RSS_TYPE_IPv6_EX            5</div><div class='add'>+#define CQ_ENET_RQ_DESC_RSS_TYPE_TCP_IPv6_EX        6</div><div class='add'>+</div><div class='add'>+#define CQ_ENET_RQ_DESC_FLAGS_CSUM_NOT_CALC         (0x1 &lt;&lt; 14)</div><div class='add'>+</div><div class='add'>+#define CQ_ENET_RQ_DESC_BYTES_WRITTEN_BITS          14</div><div class='add'>+#define CQ_ENET_RQ_DESC_BYTES_WRITTEN_MASK \</div><div class='add'>+	((1 &lt;&lt; CQ_ENET_RQ_DESC_BYTES_WRITTEN_BITS) - 1)</div><div class='add'>+#define CQ_ENET_RQ_DESC_FLAGS_TRUNCATED             (0x1 &lt;&lt; 14)</div><div class='add'>+#define CQ_ENET_RQ_DESC_FLAGS_VLAN_STRIPPED         (0x1 &lt;&lt; 15)</div><div class='add'>+</div><div class='add'>+#define CQ_ENET_RQ_DESC_FCOE_SOF_BITS               4</div><div class='add'>+#define CQ_ENET_RQ_DESC_FCOE_SOF_MASK \</div><div class='add'>+	((1 &lt;&lt; CQ_ENET_RQ_DESC_FCOE_SOF_BITS) - 1)</div><div class='add'>+#define CQ_ENET_RQ_DESC_FCOE_EOF_BITS               8</div><div class='add'>+#define CQ_ENET_RQ_DESC_FCOE_EOF_MASK \</div><div class='add'>+	((1 &lt;&lt; CQ_ENET_RQ_DESC_FCOE_EOF_BITS) - 1)</div><div class='add'>+#define CQ_ENET_RQ_DESC_FCOE_EOF_SHIFT              8</div><div class='add'>+</div><div class='add'>+#define CQ_ENET_RQ_DESC_FLAGS_TCP_UDP_CSUM_OK       (0x1 &lt;&lt; 0)</div><div class='add'>+#define CQ_ENET_RQ_DESC_FCOE_FC_CRC_OK              (0x1 &lt;&lt; 0)</div><div class='add'>+#define CQ_ENET_RQ_DESC_FLAGS_UDP                   (0x1 &lt;&lt; 1)</div><div class='add'>+#define CQ_ENET_RQ_DESC_FCOE_ENC_ERROR              (0x1 &lt;&lt; 1)</div><div class='add'>+#define CQ_ENET_RQ_DESC_FLAGS_TCP                   (0x1 &lt;&lt; 2)</div><div class='add'>+#define CQ_ENET_RQ_DESC_FLAGS_IPV4_CSUM_OK          (0x1 &lt;&lt; 3)</div><div class='add'>+#define CQ_ENET_RQ_DESC_FLAGS_IPV6                  (0x1 &lt;&lt; 4)</div><div class='add'>+#define CQ_ENET_RQ_DESC_FLAGS_IPV4                  (0x1 &lt;&lt; 5)</div><div class='add'>+#define CQ_ENET_RQ_DESC_FLAGS_IPV4_FRAGMENT         (0x1 &lt;&lt; 6)</div><div class='add'>+#define CQ_ENET_RQ_DESC_FLAGS_FCS_OK                (0x1 &lt;&lt; 7)</div><div class='add'>+</div><div class='add'>+static inline void cq_enet_rq_desc_dec(struct cq_enet_rq_desc *desc,</div><div class='add'>+	u8 *type, u8 *color, u16 *q_number, u16 *completed_index,</div><div class='add'>+	u8 *ingress_port, u8 *fcoe, u8 *eop, u8 *sop, u8 *rss_type,</div><div class='add'>+	u8 *csum_not_calc, u32 *rss_hash, u16 *bytes_written, u8 *packet_error,</div><div class='add'>+	u8 *vlan_stripped, u16 *vlan, u16 *checksum, u8 *fcoe_sof,</div><div class='add'>+	u8 *fcoe_fc_crc_ok, u8 *fcoe_enc_error, u8 *fcoe_eof,</div><div class='add'>+	u8 *tcp_udp_csum_ok, u8 *udp, u8 *tcp, u8 *ipv4_csum_ok,</div><div class='add'>+	u8 *ipv6, u8 *ipv4, u8 *ipv4_fragment, u8 *fcs_ok)</div><div class='add'>+{</div><div class='add'>+	u16 completed_index_flags = le16_to_cpu(desc-&gt;completed_index_flags);</div><div class='add'>+	u16 q_number_rss_type_flags =</div><div class='add'>+		le16_to_cpu(desc-&gt;q_number_rss_type_flags);</div><div class='add'>+	u16 bytes_written_flags = le16_to_cpu(desc-&gt;bytes_written_flags);</div><div class='add'>+</div><div class='add'>+	cq_desc_dec((struct cq_desc *)desc, type,</div><div class='add'>+		color, q_number, completed_index);</div><div class='add'>+</div><div class='add'>+	*ingress_port = (completed_index_flags &amp;</div><div class='add'>+		CQ_ENET_RQ_DESC_FLAGS_INGRESS_PORT) ? 1 : 0;</div><div class='add'>+	*fcoe = (completed_index_flags &amp; CQ_ENET_RQ_DESC_FLAGS_FCOE) ?</div><div class='add'>+		1 : 0;</div><div class='add'>+	*eop = (completed_index_flags &amp; CQ_ENET_RQ_DESC_FLAGS_EOP) ?</div><div class='add'>+		1 : 0;</div><div class='add'>+	*sop = (completed_index_flags &amp; CQ_ENET_RQ_DESC_FLAGS_SOP) ?</div><div class='add'>+		1 : 0;</div><div class='add'>+</div><div class='add'>+	*rss_type = (u8)((q_number_rss_type_flags &gt;&gt; CQ_DESC_Q_NUM_BITS) &amp;</div><div class='add'>+		CQ_ENET_RQ_DESC_RSS_TYPE_MASK);</div><div class='add'>+	*csum_not_calc = (q_number_rss_type_flags &amp;</div><div class='add'>+		CQ_ENET_RQ_DESC_FLAGS_CSUM_NOT_CALC) ? 1 : 0;</div><div class='add'>+</div><div class='add'>+	*rss_hash = le32_to_cpu(desc-&gt;rss_hash);</div><div class='add'>+</div><div class='add'>+	*bytes_written = bytes_written_flags &amp;</div><div class='add'>+		CQ_ENET_RQ_DESC_BYTES_WRITTEN_MASK;</div><div class='add'>+	*packet_error = (bytes_written_flags &amp;</div><div class='add'>+		CQ_ENET_RQ_DESC_FLAGS_TRUNCATED) ? 1 : 0;</div><div class='add'>+	*vlan_stripped = (bytes_written_flags &amp;</div><div class='add'>+		CQ_ENET_RQ_DESC_FLAGS_VLAN_STRIPPED) ? 1 : 0;</div><div class='add'>+</div><div class='add'>+	*vlan = le16_to_cpu(desc-&gt;vlan);</div><div class='add'>+</div><div class='add'>+	if (*fcoe) {</div><div class='add'>+		*fcoe_sof = (u8)(le16_to_cpu(desc-&gt;checksum_fcoe) &amp;</div><div class='add'>+			CQ_ENET_RQ_DESC_FCOE_SOF_MASK);</div><div class='add'>+		*fcoe_fc_crc_ok = (desc-&gt;flags &amp;</div><div class='add'>+			CQ_ENET_RQ_DESC_FCOE_FC_CRC_OK) ? 1 : 0;</div><div class='add'>+		*fcoe_enc_error = (desc-&gt;flags &amp;</div><div class='add'>+			CQ_ENET_RQ_DESC_FCOE_ENC_ERROR) ? 1 : 0;</div><div class='add'>+		*fcoe_eof = (u8)((desc-&gt;checksum_fcoe &gt;&gt;</div><div class='add'>+			CQ_ENET_RQ_DESC_FCOE_EOF_SHIFT) &amp;</div><div class='add'>+			CQ_ENET_RQ_DESC_FCOE_EOF_MASK);</div><div class='add'>+		*checksum = 0;</div><div class='add'>+	} else {</div><div class='add'>+		*fcoe_sof = 0;</div><div class='add'>+		*fcoe_fc_crc_ok = 0;</div><div class='add'>+		*fcoe_enc_error = 0;</div><div class='add'>+		*fcoe_eof = 0;</div><div class='add'>+		*checksum = le16_to_cpu(desc-&gt;checksum_fcoe);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*tcp_udp_csum_ok =</div><div class='add'>+		(desc-&gt;flags &amp; CQ_ENET_RQ_DESC_FLAGS_TCP_UDP_CSUM_OK) ? 1 : 0;</div><div class='add'>+	*udp = (desc-&gt;flags &amp; CQ_ENET_RQ_DESC_FLAGS_UDP) ? 1 : 0;</div><div class='add'>+	*tcp = (desc-&gt;flags &amp; CQ_ENET_RQ_DESC_FLAGS_TCP) ? 1 : 0;</div><div class='add'>+	*ipv4_csum_ok =</div><div class='add'>+		(desc-&gt;flags &amp; CQ_ENET_RQ_DESC_FLAGS_IPV4_CSUM_OK) ? 1 : 0;</div><div class='add'>+	*ipv6 = (desc-&gt;flags &amp; CQ_ENET_RQ_DESC_FLAGS_IPV6) ? 1 : 0;</div><div class='add'>+	*ipv4 = (desc-&gt;flags &amp; CQ_ENET_RQ_DESC_FLAGS_IPV4) ? 1 : 0;</div><div class='add'>+	*ipv4_fragment =</div><div class='add'>+		(desc-&gt;flags &amp; CQ_ENET_RQ_DESC_FLAGS_IPV4_FRAGMENT) ? 1 : 0;</div><div class='add'>+	*fcs_ok = (desc-&gt;flags &amp; CQ_ENET_RQ_DESC_FLAGS_FCS_OK) ? 1 : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* _CQ_ENET_DESC_H_ */</div><div class='head'>diff --git a/drivers/net/enic/enic.h b/drivers/net/enic/enic.h<br/>new file mode 100644<br/>index 000000000000..7f677e89a788<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/enic/enic.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/enic/enic.h</a></div><div class='hunk'>@@ -0,0 +1,114 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2008 Cisco Systems, Inc.  All rights reserved.</div><div class='add'>+ * Copyright 2007 Nuova Systems, Inc.  All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you may redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; version 2 of the License.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='add'>+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='add'>+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='add'>+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='add'>+ * SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _ENIC_H_</div><div class='add'>+#define _ENIC_H_</div><div class='add'>+</div><div class='add'>+#include &lt;linux/inet_lro.h&gt;</div><div class='add'>+</div><div class='add'>+#include "vnic_enet.h"</div><div class='add'>+#include "vnic_dev.h"</div><div class='add'>+#include "vnic_wq.h"</div><div class='add'>+#include "vnic_rq.h"</div><div class='add'>+#include "vnic_cq.h"</div><div class='add'>+#include "vnic_intr.h"</div><div class='add'>+#include "vnic_stats.h"</div><div class='add'>+#include "vnic_rss.h"</div><div class='add'>+</div><div class='add'>+#define DRV_NAME		"enic"</div><div class='add'>+#define DRV_DESCRIPTION		"Cisco 10G Ethernet Driver"</div><div class='add'>+#define DRV_VERSION		"0.0.1-18163.472-k1"</div><div class='add'>+#define DRV_COPYRIGHT		"Copyright 2008 Cisco Systems, Inc"</div><div class='add'>+#define PFX			DRV_NAME ": "</div><div class='add'>+</div><div class='add'>+#define ENIC_LRO_MAX_DESC	8</div><div class='add'>+#define ENIC_LRO_MAX_AGGR	64</div><div class='add'>+</div><div class='add'>+enum enic_cq_index {</div><div class='add'>+	ENIC_CQ_RQ,</div><div class='add'>+	ENIC_CQ_WQ,</div><div class='add'>+	ENIC_CQ_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum enic_intx_intr_index {</div><div class='add'>+	ENIC_INTX_WQ_RQ,</div><div class='add'>+	ENIC_INTX_ERR,</div><div class='add'>+	ENIC_INTX_NOTIFY,</div><div class='add'>+	ENIC_INTX_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum enic_msix_intr_index {</div><div class='add'>+	ENIC_MSIX_RQ,</div><div class='add'>+	ENIC_MSIX_WQ,</div><div class='add'>+	ENIC_MSIX_ERR,</div><div class='add'>+	ENIC_MSIX_NOTIFY,</div><div class='add'>+	ENIC_MSIX_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct enic_msix_entry {</div><div class='add'>+	int requested;</div><div class='add'>+	char devname[IFNAMSIZ];</div><div class='add'>+	irqreturn_t (*isr)(int, void *);</div><div class='add'>+	void *devid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Per-instance private data structure */</div><div class='add'>+struct enic {</div><div class='add'>+	struct net_device *netdev;</div><div class='add'>+	struct pci_dev *pdev;</div><div class='add'>+	struct vnic_enet_config config;</div><div class='add'>+	struct vnic_dev_bar bar0;</div><div class='add'>+	struct vnic_dev *vdev;</div><div class='add'>+	struct timer_list notify_timer;</div><div class='add'>+	struct work_struct reset;</div><div class='add'>+	struct msix_entry msix_entry[ENIC_MSIX_MAX];</div><div class='add'>+	struct enic_msix_entry msix[ENIC_MSIX_MAX];</div><div class='add'>+	u32 msg_enable;</div><div class='add'>+	spinlock_t devcmd_lock;</div><div class='add'>+	u8 mac_addr[ETH_ALEN];</div><div class='add'>+	u8 mc_addr[ENIC_MULTICAST_PERFECT_FILTERS][ETH_ALEN];</div><div class='add'>+	unsigned int mc_count;</div><div class='add'>+	int csum_rx_enabled;</div><div class='add'>+	u32 port_mtu;</div><div class='add'>+</div><div class='add'>+	/* work queue cache line section */</div><div class='add'>+	____cacheline_aligned struct vnic_wq wq[1];</div><div class='add'>+	spinlock_t wq_lock[1];</div><div class='add'>+	unsigned int wq_count;</div><div class='add'>+	struct vlan_group *vlan_group;</div><div class='add'>+</div><div class='add'>+	/* receive queue cache line section */</div><div class='add'>+	____cacheline_aligned struct vnic_rq rq[1];</div><div class='add'>+	unsigned int rq_count;</div><div class='add'>+	int (*rq_alloc_buf)(struct vnic_rq *rq);</div><div class='add'>+	struct napi_struct napi;</div><div class='add'>+	struct net_lro_mgr lro_mgr;</div><div class='add'>+	struct net_lro_desc lro_desc[ENIC_LRO_MAX_DESC];</div><div class='add'>+</div><div class='add'>+	/* interrupt resource cache line section */</div><div class='add'>+	____cacheline_aligned struct vnic_intr intr[ENIC_MSIX_MAX];</div><div class='add'>+	unsigned int intr_count;</div><div class='add'>+	u32 __iomem *legacy_pba;		/* memory-mapped */</div><div class='add'>+</div><div class='add'>+	/* completion queue cache line section */</div><div class='add'>+	____cacheline_aligned struct vnic_cq cq[ENIC_CQ_MAX];</div><div class='add'>+	unsigned int cq_count;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif /* _ENIC_H_ */</div><div class='head'>diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c<br/>new file mode 100644<br/>index 000000000000..180e968dc54d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/enic/enic_main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/enic/enic_main.c</a></div><div class='hunk'>@@ -0,0 +1,1935 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2008 Cisco Systems, Inc.  All rights reserved.</div><div class='add'>+ * Copyright 2007 Nuova Systems, Inc.  All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you may redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; version 2 of the License.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='add'>+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='add'>+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='add'>+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='add'>+ * SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/workqueue.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/if_ether.h&gt;</div><div class='add'>+#include &lt;linux/if_vlan.h&gt;</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='add'>+#include &lt;linux/in.h&gt;</div><div class='add'>+#include &lt;linux/ip.h&gt;</div><div class='add'>+#include &lt;linux/ipv6.h&gt;</div><div class='add'>+#include &lt;linux/tcp.h&gt;</div><div class='add'>+#include &lt;net/ip6_checksum.h&gt;</div><div class='add'>+</div><div class='add'>+#include "cq_enet_desc.h"</div><div class='add'>+#include "vnic_dev.h"</div><div class='add'>+#include "vnic_intr.h"</div><div class='add'>+#include "vnic_stats.h"</div><div class='add'>+#include "enic_res.h"</div><div class='add'>+#include "enic.h"</div><div class='add'>+</div><div class='add'>+#define ENIC_NOTIFY_TIMER_PERIOD	(2 * HZ)</div><div class='add'>+</div><div class='add'>+/* Supported devices */</div><div class='add'>+static struct pci_device_id enic_id_table[] = {</div><div class='add'>+	{ PCI_VDEVICE(CISCO, 0x0043) },</div><div class='add'>+	{ 0, }	/* end of table */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION(DRV_DESCRIPTION);</div><div class='add'>+MODULE_AUTHOR("Scott Feldman &lt;scofeldm@cisco.com&gt;");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_VERSION(DRV_VERSION);</div><div class='add'>+MODULE_DEVICE_TABLE(pci, enic_id_table);</div><div class='add'>+</div><div class='add'>+struct enic_stat {</div><div class='add'>+	char name[ETH_GSTRING_LEN];</div><div class='add'>+	unsigned int offset;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define ENIC_TX_STAT(stat)	\</div><div class='add'>+	{ .name = #stat, .offset = offsetof(struct vnic_tx_stats, stat) / 8 }</div><div class='add'>+#define ENIC_RX_STAT(stat)	\</div><div class='add'>+	{ .name = #stat, .offset = offsetof(struct vnic_rx_stats, stat) / 8 }</div><div class='add'>+</div><div class='add'>+static const struct enic_stat enic_tx_stats[] = {</div><div class='add'>+	ENIC_TX_STAT(tx_frames_ok),</div><div class='add'>+	ENIC_TX_STAT(tx_unicast_frames_ok),</div><div class='add'>+	ENIC_TX_STAT(tx_multicast_frames_ok),</div><div class='add'>+	ENIC_TX_STAT(tx_broadcast_frames_ok),</div><div class='add'>+	ENIC_TX_STAT(tx_bytes_ok),</div><div class='add'>+	ENIC_TX_STAT(tx_unicast_bytes_ok),</div><div class='add'>+	ENIC_TX_STAT(tx_multicast_bytes_ok),</div><div class='add'>+	ENIC_TX_STAT(tx_broadcast_bytes_ok),</div><div class='add'>+	ENIC_TX_STAT(tx_drops),</div><div class='add'>+	ENIC_TX_STAT(tx_errors),</div><div class='add'>+	ENIC_TX_STAT(tx_tso),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct enic_stat enic_rx_stats[] = {</div><div class='add'>+	ENIC_RX_STAT(rx_frames_ok),</div><div class='add'>+	ENIC_RX_STAT(rx_frames_total),</div><div class='add'>+	ENIC_RX_STAT(rx_unicast_frames_ok),</div><div class='add'>+	ENIC_RX_STAT(rx_multicast_frames_ok),</div><div class='add'>+	ENIC_RX_STAT(rx_broadcast_frames_ok),</div><div class='add'>+	ENIC_RX_STAT(rx_bytes_ok),</div><div class='add'>+	ENIC_RX_STAT(rx_unicast_bytes_ok),</div><div class='add'>+	ENIC_RX_STAT(rx_multicast_bytes_ok),</div><div class='add'>+	ENIC_RX_STAT(rx_broadcast_bytes_ok),</div><div class='add'>+	ENIC_RX_STAT(rx_drop),</div><div class='add'>+	ENIC_RX_STAT(rx_no_bufs),</div><div class='add'>+	ENIC_RX_STAT(rx_errors),</div><div class='add'>+	ENIC_RX_STAT(rx_rss),</div><div class='add'>+	ENIC_RX_STAT(rx_crc_errors),</div><div class='add'>+	ENIC_RX_STAT(rx_frames_64),</div><div class='add'>+	ENIC_RX_STAT(rx_frames_127),</div><div class='add'>+	ENIC_RX_STAT(rx_frames_255),</div><div class='add'>+	ENIC_RX_STAT(rx_frames_511),</div><div class='add'>+	ENIC_RX_STAT(rx_frames_1023),</div><div class='add'>+	ENIC_RX_STAT(rx_frames_1518),</div><div class='add'>+	ENIC_RX_STAT(rx_frames_to_max),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const unsigned int enic_n_tx_stats = ARRAY_SIZE(enic_tx_stats);</div><div class='add'>+static const unsigned int enic_n_rx_stats = ARRAY_SIZE(enic_rx_stats);</div><div class='add'>+</div><div class='add'>+static int enic_get_settings(struct net_device *netdev,</div><div class='add'>+	struct ethtool_cmd *ecmd)</div><div class='add'>+{</div><div class='add'>+	struct enic *enic = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	ecmd-&gt;supported = (SUPPORTED_10000baseT_Full | SUPPORTED_FIBRE);</div><div class='add'>+	ecmd-&gt;advertising = (ADVERTISED_10000baseT_Full | ADVERTISED_FIBRE);</div><div class='add'>+	ecmd-&gt;port = PORT_FIBRE;</div><div class='add'>+	ecmd-&gt;transceiver = XCVR_EXTERNAL;</div><div class='add'>+</div><div class='add'>+	if (netif_carrier_ok(netdev)) {</div><div class='add'>+		ecmd-&gt;speed = vnic_dev_port_speed(enic-&gt;vdev);</div><div class='add'>+		ecmd-&gt;duplex = DUPLEX_FULL;</div><div class='add'>+	} else {</div><div class='add'>+		ecmd-&gt;speed = -1;</div><div class='add'>+		ecmd-&gt;duplex = -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ecmd-&gt;autoneg = AUTONEG_DISABLE;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void enic_get_drvinfo(struct net_device *netdev,</div><div class='add'>+	struct ethtool_drvinfo *drvinfo)</div><div class='add'>+{</div><div class='add'>+	struct enic *enic = netdev_priv(netdev);</div><div class='add'>+	struct vnic_devcmd_fw_info *fw_info;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;enic-&gt;devcmd_lock);</div><div class='add'>+	vnic_dev_fw_info(enic-&gt;vdev, &amp;fw_info);</div><div class='add'>+	spin_unlock(&amp;enic-&gt;devcmd_lock);</div><div class='add'>+</div><div class='add'>+	strncpy(drvinfo-&gt;driver, DRV_NAME, sizeof(drvinfo-&gt;driver));</div><div class='add'>+	strncpy(drvinfo-&gt;version, DRV_VERSION, sizeof(drvinfo-&gt;version));</div><div class='add'>+	strncpy(drvinfo-&gt;fw_version, fw_info-&gt;fw_version,</div><div class='add'>+		sizeof(drvinfo-&gt;fw_version));</div><div class='add'>+	strncpy(drvinfo-&gt;bus_info, pci_name(enic-&gt;pdev),</div><div class='add'>+		sizeof(drvinfo-&gt;bus_info));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void enic_get_strings(struct net_device *netdev, u32 stringset, u8 *data)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	switch (stringset) {</div><div class='add'>+	case ETH_SS_STATS:</div><div class='add'>+		for (i = 0; i &lt; enic_n_tx_stats; i++) {</div><div class='add'>+			memcpy(data, enic_tx_stats[i].name, ETH_GSTRING_LEN);</div><div class='add'>+			data += ETH_GSTRING_LEN;</div><div class='add'>+		}</div><div class='add'>+		for (i = 0; i &lt; enic_n_rx_stats; i++) {</div><div class='add'>+			memcpy(data, enic_rx_stats[i].name, ETH_GSTRING_LEN);</div><div class='add'>+			data += ETH_GSTRING_LEN;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int enic_get_sset_count(struct net_device *netdev, int sset)</div><div class='add'>+{</div><div class='add'>+	switch (sset) {</div><div class='add'>+	case ETH_SS_STATS:</div><div class='add'>+		return enic_n_tx_stats + enic_n_rx_stats;</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void enic_get_ethtool_stats(struct net_device *netdev,</div><div class='add'>+	struct ethtool_stats *stats, u64 *data)</div><div class='add'>+{</div><div class='add'>+	struct enic *enic = netdev_priv(netdev);</div><div class='add'>+	struct vnic_stats *vstats;</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;enic-&gt;devcmd_lock);</div><div class='add'>+	vnic_dev_stats_dump(enic-&gt;vdev, &amp;vstats);</div><div class='add'>+	spin_unlock(&amp;enic-&gt;devcmd_lock);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; enic_n_tx_stats; i++)</div><div class='add'>+		*(data++) = ((u64 *)&amp;vstats-&gt;tx)[enic_tx_stats[i].offset];</div><div class='add'>+	for (i = 0; i &lt; enic_n_rx_stats; i++)</div><div class='add'>+		*(data++) = ((u64 *)&amp;vstats-&gt;rx)[enic_rx_stats[i].offset];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 enic_get_rx_csum(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct enic *enic = netdev_priv(netdev);</div><div class='add'>+	return enic-&gt;csum_rx_enabled;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int enic_set_rx_csum(struct net_device *netdev, u32 data)</div><div class='add'>+{</div><div class='add'>+	struct enic *enic = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	if (data &amp;&amp; !ENIC_SETTING(enic, RXCSUM))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	enic-&gt;csum_rx_enabled = !!data;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int enic_set_tx_csum(struct net_device *netdev, u32 data)</div><div class='add'>+{</div><div class='add'>+	struct enic *enic = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	if (data &amp;&amp; !ENIC_SETTING(enic, TXCSUM))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (data)</div><div class='add'>+		netdev-&gt;features |= NETIF_F_HW_CSUM;</div><div class='add'>+	else</div><div class='add'>+		netdev-&gt;features &amp;= ~NETIF_F_HW_CSUM;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int enic_set_tso(struct net_device *netdev, u32 data)</div><div class='add'>+{</div><div class='add'>+	struct enic *enic = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	if (data &amp;&amp; !ENIC_SETTING(enic, TSO))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (data)</div><div class='add'>+		netdev-&gt;features |=</div><div class='add'>+			NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_TSO_ECN;</div><div class='add'>+	else</div><div class='add'>+		netdev-&gt;features &amp;=</div><div class='add'>+			~(NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_TSO_ECN);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 enic_get_msglevel(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct enic *enic = netdev_priv(netdev);</div><div class='add'>+	return enic-&gt;msg_enable;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void enic_set_msglevel(struct net_device *netdev, u32 value)</div><div class='add'>+{</div><div class='add'>+	struct enic *enic = netdev_priv(netdev);</div><div class='add'>+	enic-&gt;msg_enable = value;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct ethtool_ops enic_ethtool_ops = {</div><div class='add'>+	.get_settings = enic_get_settings,</div><div class='add'>+	.get_drvinfo = enic_get_drvinfo,</div><div class='add'>+	.get_msglevel = enic_get_msglevel,</div><div class='add'>+	.set_msglevel = enic_set_msglevel,</div><div class='add'>+	.get_link = ethtool_op_get_link,</div><div class='add'>+	.get_strings = enic_get_strings,</div><div class='add'>+	.get_sset_count = enic_get_sset_count,</div><div class='add'>+	.get_ethtool_stats = enic_get_ethtool_stats,</div><div class='add'>+	.get_rx_csum = enic_get_rx_csum,</div><div class='add'>+	.set_rx_csum = enic_set_rx_csum,</div><div class='add'>+	.get_tx_csum = ethtool_op_get_tx_csum,</div><div class='add'>+	.set_tx_csum = enic_set_tx_csum,</div><div class='add'>+	.get_sg = ethtool_op_get_sg,</div><div class='add'>+	.set_sg = ethtool_op_set_sg,</div><div class='add'>+	.get_tso = ethtool_op_get_tso,</div><div class='add'>+	.set_tso = enic_set_tso,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void enic_free_wq_buf(struct vnic_wq *wq, struct vnic_wq_buf *buf)</div><div class='add'>+{</div><div class='add'>+	struct enic *enic = vnic_dev_priv(wq-&gt;vdev);</div><div class='add'>+</div><div class='add'>+	if (buf-&gt;sop)</div><div class='add'>+		pci_unmap_single(enic-&gt;pdev, buf-&gt;dma_addr,</div><div class='add'>+			buf-&gt;len, PCI_DMA_TODEVICE);</div><div class='add'>+	else</div><div class='add'>+		pci_unmap_page(enic-&gt;pdev, buf-&gt;dma_addr,</div><div class='add'>+			buf-&gt;len, PCI_DMA_TODEVICE);</div><div class='add'>+</div><div class='add'>+	if (buf-&gt;os_buf)</div><div class='add'>+		dev_kfree_skb_any(buf-&gt;os_buf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void enic_wq_free_buf(struct vnic_wq *wq,</div><div class='add'>+	struct cq_desc *cq_desc, struct vnic_wq_buf *buf, void *opaque)</div><div class='add'>+{</div><div class='add'>+	enic_free_wq_buf(wq, buf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int enic_wq_service(struct vnic_dev *vdev, struct cq_desc *cq_desc,</div><div class='add'>+	u8 type, u16 q_number, u16 completed_index, void *opaque)</div><div class='add'>+{</div><div class='add'>+	struct enic *enic = vnic_dev_priv(vdev);</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;enic-&gt;wq_lock[q_number]);</div><div class='add'>+</div><div class='add'>+	vnic_wq_service(&amp;enic-&gt;wq[q_number], cq_desc,</div><div class='add'>+		completed_index, enic_wq_free_buf,</div><div class='add'>+		opaque);</div><div class='add'>+</div><div class='add'>+	if (netif_queue_stopped(enic-&gt;netdev) &amp;&amp;</div><div class='add'>+	    vnic_wq_desc_avail(&amp;enic-&gt;wq[q_number]) &gt;= MAX_SKB_FRAGS + 1)</div><div class='add'>+		netif_wake_queue(enic-&gt;netdev);</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;enic-&gt;wq_lock[q_number]);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void enic_log_q_error(struct enic *enic)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+	u32 error_status;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; enic-&gt;wq_count; i++) {</div><div class='add'>+		error_status = vnic_wq_error_status(&amp;enic-&gt;wq[i]);</div><div class='add'>+		if (error_status)</div><div class='add'>+			printk(KERN_ERR PFX "%s: WQ[%d] error_status %d\n",</div><div class='add'>+				enic-&gt;netdev-&gt;name, i, error_status);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; enic-&gt;rq_count; i++) {</div><div class='add'>+		error_status = vnic_rq_error_status(&amp;enic-&gt;rq[i]);</div><div class='add'>+		if (error_status)</div><div class='add'>+			printk(KERN_ERR PFX "%s: RQ[%d] error_status %d\n",</div><div class='add'>+				enic-&gt;netdev-&gt;name, i, error_status);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void enic_link_check(struct enic *enic)</div><div class='add'>+{</div><div class='add'>+	int link_status = vnic_dev_link_status(enic-&gt;vdev);</div><div class='add'>+	int carrier_ok = netif_carrier_ok(enic-&gt;netdev);</div><div class='add'>+</div><div class='add'>+	if (link_status &amp;&amp; !carrier_ok) {</div><div class='add'>+		printk(KERN_INFO PFX "%s: Link UP\n", enic-&gt;netdev-&gt;name);</div><div class='add'>+		netif_carrier_on(enic-&gt;netdev);</div><div class='add'>+	} else if (!link_status &amp;&amp; carrier_ok) {</div><div class='add'>+		printk(KERN_INFO PFX "%s: Link DOWN\n", enic-&gt;netdev-&gt;name);</div><div class='add'>+		netif_carrier_off(enic-&gt;netdev);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void enic_mtu_check(struct enic *enic)</div><div class='add'>+{</div><div class='add'>+	u32 mtu = vnic_dev_mtu(enic-&gt;vdev);</div><div class='add'>+</div><div class='add'>+	if (mtu != enic-&gt;port_mtu) {</div><div class='add'>+		if (mtu &lt; enic-&gt;netdev-&gt;mtu)</div><div class='add'>+			printk(KERN_WARNING PFX</div><div class='add'>+				"%s: interface MTU (%d) set higher "</div><div class='add'>+				"than switch port MTU (%d)\n",</div><div class='add'>+				enic-&gt;netdev-&gt;name, enic-&gt;netdev-&gt;mtu, mtu);</div><div class='add'>+		enic-&gt;port_mtu = mtu;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void enic_msglvl_check(struct enic *enic)</div><div class='add'>+{</div><div class='add'>+	u32 msg_enable = vnic_dev_msg_lvl(enic-&gt;vdev);</div><div class='add'>+</div><div class='add'>+	if (msg_enable != enic-&gt;msg_enable) {</div><div class='add'>+		printk(KERN_INFO PFX "%s: msg lvl changed from 0x%x to 0x%x\n",</div><div class='add'>+			enic-&gt;netdev-&gt;name, enic-&gt;msg_enable, msg_enable);</div><div class='add'>+		enic-&gt;msg_enable = msg_enable;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void enic_notify_check(struct enic *enic)</div><div class='add'>+{</div><div class='add'>+	enic_msglvl_check(enic);</div><div class='add'>+	enic_mtu_check(enic);</div><div class='add'>+	enic_link_check(enic);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define ENIC_TEST_INTR(pba, i) (pba &amp; (1 &lt;&lt; i))</div><div class='add'>+</div><div class='add'>+static irqreturn_t enic_isr_legacy(int irq, void *data)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev = data;</div><div class='add'>+	struct enic *enic = netdev_priv(netdev);</div><div class='add'>+	u32 pba;</div><div class='add'>+</div><div class='add'>+	vnic_intr_mask(&amp;enic-&gt;intr[ENIC_INTX_WQ_RQ]);</div><div class='add'>+</div><div class='add'>+	pba = vnic_intr_legacy_pba(enic-&gt;legacy_pba);</div><div class='add'>+	if (!pba) {</div><div class='add'>+		vnic_intr_unmask(&amp;enic-&gt;intr[ENIC_INTX_WQ_RQ]);</div><div class='add'>+		return IRQ_NONE;	/* not our interrupt */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ENIC_TEST_INTR(pba, ENIC_INTX_NOTIFY))</div><div class='add'>+		enic_notify_check(enic);</div><div class='add'>+</div><div class='add'>+	if (ENIC_TEST_INTR(pba, ENIC_INTX_ERR)) {</div><div class='add'>+		enic_log_q_error(enic);</div><div class='add'>+		/* schedule recovery from WQ/RQ error */</div><div class='add'>+		schedule_work(&amp;enic-&gt;reset);</div><div class='add'>+		return IRQ_HANDLED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ENIC_TEST_INTR(pba, ENIC_INTX_WQ_RQ)) {</div><div class='add'>+		if (netif_rx_schedule_prep(netdev, &amp;enic-&gt;napi))</div><div class='add'>+			__netif_rx_schedule(netdev, &amp;enic-&gt;napi);</div><div class='add'>+	} else {</div><div class='add'>+		vnic_intr_unmask(&amp;enic-&gt;intr[ENIC_INTX_WQ_RQ]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t enic_isr_msi(int irq, void *data)</div><div class='add'>+{</div><div class='add'>+	struct enic *enic = data;</div><div class='add'>+</div><div class='add'>+	/* With MSI, there is no sharing of interrupts, so this is</div><div class='add'>+	 * our interrupt and there is no need to ack it.  The device</div><div class='add'>+	 * is not providing per-vector masking, so the OS will not</div><div class='add'>+	 * write to PCI config space to mask/unmask the interrupt.</div><div class='add'>+	 * We're using mask_on_assertion for MSI, so the device</div><div class='add'>+	 * automatically masks the interrupt when the interrupt is</div><div class='add'>+	 * generated.  Later, when exiting polling, the interrupt</div><div class='add'>+	 * will be unmasked (see enic_poll).</div><div class='add'>+	 *</div><div class='add'>+	 * Also, the device uses the same PCIe Traffic Class (TC)</div><div class='add'>+	 * for Memory Write data and MSI, so there are no ordering</div><div class='add'>+	 * issues; the MSI will always arrive at the Root Complex</div><div class='add'>+	 * _after_ corresponding Memory Writes (i.e. descriptor</div><div class='add'>+	 * writes).</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	netif_rx_schedule(enic-&gt;netdev, &amp;enic-&gt;napi);</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t enic_isr_msix_rq(int irq, void *data)</div><div class='add'>+{</div><div class='add'>+	struct enic *enic = data;</div><div class='add'>+</div><div class='add'>+	/* schedule NAPI polling for RQ cleanup */</div><div class='add'>+	netif_rx_schedule(enic-&gt;netdev, &amp;enic-&gt;napi);</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t enic_isr_msix_wq(int irq, void *data)</div><div class='add'>+{</div><div class='add'>+	struct enic *enic = data;</div><div class='add'>+	unsigned int wq_work_to_do = -1; /* no limit */</div><div class='add'>+	unsigned int wq_work_done;</div><div class='add'>+</div><div class='add'>+	wq_work_done = vnic_cq_service(&amp;enic-&gt;cq[ENIC_CQ_WQ],</div><div class='add'>+		wq_work_to_do, enic_wq_service, NULL);</div><div class='add'>+</div><div class='add'>+	vnic_intr_return_credits(&amp;enic-&gt;intr[ENIC_MSIX_WQ],</div><div class='add'>+		wq_work_done,</div><div class='add'>+		1 /* unmask intr */,</div><div class='add'>+		1 /* reset intr timer */);</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t enic_isr_msix_err(int irq, void *data)</div><div class='add'>+{</div><div class='add'>+	struct enic *enic = data;</div><div class='add'>+</div><div class='add'>+	enic_log_q_error(enic);</div><div class='add'>+</div><div class='add'>+	/* schedule recovery from WQ/RQ error */</div><div class='add'>+	schedule_work(&amp;enic-&gt;reset);</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t enic_isr_msix_notify(int irq, void *data)</div><div class='add'>+{</div><div class='add'>+	struct enic *enic = data;</div><div class='add'>+</div><div class='add'>+	enic_notify_check(enic);</div><div class='add'>+	vnic_intr_unmask(&amp;enic-&gt;intr[ENIC_MSIX_NOTIFY]);</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void enic_queue_wq_skb_cont(struct enic *enic,</div><div class='add'>+	struct vnic_wq *wq, struct sk_buff *skb,</div><div class='add'>+	unsigned int len_left)</div><div class='add'>+{</div><div class='add'>+	skb_frag_t *frag;</div><div class='add'>+</div><div class='add'>+	/* Queue additional data fragments */</div><div class='add'>+	for (frag = skb_shinfo(skb)-&gt;frags; len_left; frag++) {</div><div class='add'>+		len_left -= frag-&gt;size;</div><div class='add'>+		enic_queue_wq_desc_cont(wq, skb,</div><div class='add'>+			pci_map_page(enic-&gt;pdev, frag-&gt;page,</div><div class='add'>+				frag-&gt;page_offset, frag-&gt;size,</div><div class='add'>+				PCI_DMA_TODEVICE),</div><div class='add'>+			frag-&gt;size,</div><div class='add'>+			(len_left == 0));	/* EOP? */</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void enic_queue_wq_skb_vlan(struct enic *enic,</div><div class='add'>+	struct vnic_wq *wq, struct sk_buff *skb,</div><div class='add'>+	int vlan_tag_insert, unsigned int vlan_tag)</div><div class='add'>+{</div><div class='add'>+	unsigned int head_len = skb_headlen(skb);</div><div class='add'>+	unsigned int len_left = skb-&gt;len - head_len;</div><div class='add'>+	int eop = (len_left == 0);</div><div class='add'>+</div><div class='add'>+	/* Queue the main skb fragment */</div><div class='add'>+	enic_queue_wq_desc(wq, skb,</div><div class='add'>+		pci_map_single(enic-&gt;pdev, skb-&gt;data,</div><div class='add'>+			head_len, PCI_DMA_TODEVICE),</div><div class='add'>+		head_len,</div><div class='add'>+		vlan_tag_insert, vlan_tag,</div><div class='add'>+		eop);</div><div class='add'>+</div><div class='add'>+	if (!eop)</div><div class='add'>+		enic_queue_wq_skb_cont(enic, wq, skb, len_left);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void enic_queue_wq_skb_csum_l4(struct enic *enic,</div><div class='add'>+	struct vnic_wq *wq, struct sk_buff *skb,</div><div class='add'>+	int vlan_tag_insert, unsigned int vlan_tag)</div><div class='add'>+{</div><div class='add'>+	unsigned int head_len = skb_headlen(skb);</div><div class='add'>+	unsigned int len_left = skb-&gt;len - head_len;</div><div class='add'>+	unsigned int hdr_len = skb_transport_offset(skb);</div><div class='add'>+	unsigned int csum_offset = hdr_len + skb-&gt;csum_offset;</div><div class='add'>+	int eop = (len_left == 0);</div><div class='add'>+</div><div class='add'>+	/* Queue the main skb fragment */</div><div class='add'>+	enic_queue_wq_desc_csum_l4(wq, skb,</div><div class='add'>+		pci_map_single(enic-&gt;pdev, skb-&gt;data,</div><div class='add'>+			head_len, PCI_DMA_TODEVICE),</div><div class='add'>+		head_len,</div><div class='add'>+		csum_offset,</div><div class='add'>+		hdr_len,</div><div class='add'>+		vlan_tag_insert, vlan_tag,</div><div class='add'>+		eop);</div><div class='add'>+</div><div class='add'>+	if (!eop)</div><div class='add'>+		enic_queue_wq_skb_cont(enic, wq, skb, len_left);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void enic_queue_wq_skb_tso(struct enic *enic,</div><div class='add'>+	struct vnic_wq *wq, struct sk_buff *skb, unsigned int mss,</div><div class='add'>+	int vlan_tag_insert, unsigned int vlan_tag)</div><div class='add'>+{</div><div class='add'>+	unsigned int head_len = skb_headlen(skb);</div><div class='add'>+	unsigned int len_left = skb-&gt;len - head_len;</div><div class='add'>+	unsigned int hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb);</div><div class='add'>+	int eop = (len_left == 0);</div><div class='add'>+</div><div class='add'>+	/* Preload TCP csum field with IP pseudo hdr calculated</div><div class='add'>+	 * with IP length set to zero.  HW will later add in length</div><div class='add'>+	 * to each TCP segment resulting from the TSO.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;protocol == __constant_htons(ETH_P_IP)) {</div><div class='add'>+		ip_hdr(skb)-&gt;check = 0;</div><div class='add'>+		tcp_hdr(skb)-&gt;check = ~csum_tcpudp_magic(ip_hdr(skb)-&gt;saddr,</div><div class='add'>+			ip_hdr(skb)-&gt;daddr, 0, IPPROTO_TCP, 0);</div><div class='add'>+	} else if (skb-&gt;protocol == __constant_htons(ETH_P_IPV6)) {</div><div class='add'>+		tcp_hdr(skb)-&gt;check = ~csum_ipv6_magic(&amp;ipv6_hdr(skb)-&gt;saddr,</div><div class='add'>+			&amp;ipv6_hdr(skb)-&gt;daddr, 0, IPPROTO_TCP, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Queue the main skb fragment */</div><div class='add'>+	enic_queue_wq_desc_tso(wq, skb,</div><div class='add'>+		pci_map_single(enic-&gt;pdev, skb-&gt;data,</div><div class='add'>+			head_len, PCI_DMA_TODEVICE),</div><div class='add'>+		head_len,</div><div class='add'>+		mss, hdr_len,</div><div class='add'>+		vlan_tag_insert, vlan_tag,</div><div class='add'>+		eop);</div><div class='add'>+</div><div class='add'>+	if (!eop)</div><div class='add'>+		enic_queue_wq_skb_cont(enic, wq, skb, len_left);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void enic_queue_wq_skb(struct enic *enic,</div><div class='add'>+	struct vnic_wq *wq, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	unsigned int mss = skb_shinfo(skb)-&gt;gso_size;</div><div class='add'>+	unsigned int vlan_tag = 0;</div><div class='add'>+	int vlan_tag_insert = 0;</div><div class='add'>+</div><div class='add'>+	if (enic-&gt;vlan_group &amp;&amp; vlan_tx_tag_present(skb)) {</div><div class='add'>+		/* VLAN tag from trunking driver */</div><div class='add'>+		vlan_tag_insert = 1;</div><div class='add'>+		vlan_tag = vlan_tx_tag_get(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (mss)</div><div class='add'>+		enic_queue_wq_skb_tso(enic, wq, skb, mss,</div><div class='add'>+			vlan_tag_insert, vlan_tag);</div><div class='add'>+	else if	(skb-&gt;ip_summed == CHECKSUM_PARTIAL)</div><div class='add'>+		enic_queue_wq_skb_csum_l4(enic, wq, skb,</div><div class='add'>+			vlan_tag_insert, vlan_tag);</div><div class='add'>+	else</div><div class='add'>+		enic_queue_wq_skb_vlan(enic, wq, skb,</div><div class='add'>+			vlan_tag_insert, vlan_tag);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* netif_tx_lock held, process context with BHs disabled */</div><div class='add'>+static int enic_hard_start_xmit(struct sk_buff *skb, struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct enic *enic = netdev_priv(netdev);</div><div class='add'>+	struct vnic_wq *wq = &amp;enic-&gt;wq[0];</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;len &lt;= 0) {</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+		return NETDEV_TX_OK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Non-TSO sends must fit within ENIC_NON_TSO_MAX_DESC descs,</div><div class='add'>+	 * which is very likely.  In the off chance it's going to take</div><div class='add'>+	 * more than * ENIC_NON_TSO_MAX_DESC, linearize the skb.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	if (skb_shinfo(skb)-&gt;gso_size == 0 &amp;&amp;</div><div class='add'>+	    skb_shinfo(skb)-&gt;nr_frags + 1 &gt; ENIC_NON_TSO_MAX_DESC &amp;&amp;</div><div class='add'>+	    skb_linearize(skb)) {</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+		return NETDEV_TX_OK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;enic-&gt;wq_lock[0], flags);</div><div class='add'>+</div><div class='add'>+	if (vnic_wq_desc_avail(wq) &lt; skb_shinfo(skb)-&gt;nr_frags + 1) {</div><div class='add'>+		netif_stop_queue(netdev);</div><div class='add'>+		/* This is a hard error, log it */</div><div class='add'>+		printk(KERN_ERR PFX "%s: BUG! Tx ring full when "</div><div class='add'>+			"queue awake!\n", netdev-&gt;name);</div><div class='add'>+		spin_unlock_irqrestore(&amp;enic-&gt;wq_lock[0], flags);</div><div class='add'>+		return NETDEV_TX_BUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	enic_queue_wq_skb(enic, wq, skb);</div><div class='add'>+</div><div class='add'>+	if (vnic_wq_desc_avail(wq) &lt; MAX_SKB_FRAGS + 1)</div><div class='add'>+		netif_stop_queue(netdev);</div><div class='add'>+</div><div class='add'>+	netdev-&gt;trans_start = jiffies;</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;enic-&gt;wq_lock[0], flags);</div><div class='add'>+</div><div class='add'>+	return NETDEV_TX_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* dev_base_lock rwlock held, nominally process context */</div><div class='add'>+static struct net_device_stats *enic_get_stats(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct enic *enic = netdev_priv(netdev);</div><div class='add'>+	struct net_device_stats *net_stats = &amp;netdev-&gt;stats;</div><div class='add'>+	struct vnic_stats *stats;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;enic-&gt;devcmd_lock);</div><div class='add'>+	vnic_dev_stats_dump(enic-&gt;vdev, &amp;stats);</div><div class='add'>+	spin_unlock(&amp;enic-&gt;devcmd_lock);</div><div class='add'>+</div><div class='add'>+	net_stats-&gt;tx_packets = stats-&gt;tx.tx_frames_ok;</div><div class='add'>+	net_stats-&gt;tx_bytes = stats-&gt;tx.tx_bytes_ok;</div><div class='add'>+	net_stats-&gt;tx_errors = stats-&gt;tx.tx_errors;</div><div class='add'>+	net_stats-&gt;tx_dropped = stats-&gt;tx.tx_drops;</div><div class='add'>+</div><div class='add'>+	net_stats-&gt;rx_packets = stats-&gt;rx.rx_frames_ok;</div><div class='add'>+	net_stats-&gt;rx_bytes = stats-&gt;rx.rx_bytes_ok;</div><div class='add'>+	net_stats-&gt;rx_errors = stats-&gt;rx.rx_errors;</div><div class='add'>+	net_stats-&gt;multicast = stats-&gt;rx.rx_multicast_frames_ok;</div><div class='add'>+	net_stats-&gt;rx_crc_errors = stats-&gt;rx.rx_crc_errors;</div><div class='add'>+	net_stats-&gt;rx_dropped = stats-&gt;rx.rx_no_bufs;</div><div class='add'>+</div><div class='add'>+	return net_stats;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void enic_reset_mcaddrs(struct enic *enic)</div><div class='add'>+{</div><div class='add'>+	enic-&gt;mc_count = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int enic_set_mac_addr(struct net_device *netdev, char *addr)</div><div class='add'>+{</div><div class='add'>+	if (!is_valid_ether_addr(addr))</div><div class='add'>+		return -EADDRNOTAVAIL;</div><div class='add'>+</div><div class='add'>+	memcpy(netdev-&gt;dev_addr, addr, netdev-&gt;addr_len);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* netif_tx_lock held, BHs disabled */</div><div class='add'>+static void enic_set_multicast_list(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct enic *enic = netdev_priv(netdev);</div><div class='add'>+	struct dev_mc_list *list = netdev-&gt;mc_list;</div><div class='add'>+	int directed = 1;</div><div class='add'>+	int multicast = (netdev-&gt;flags &amp; IFF_MULTICAST) ? 1 : 0;</div><div class='add'>+	int broadcast = (netdev-&gt;flags &amp; IFF_BROADCAST) ? 1 : 0;</div><div class='add'>+	int promisc = (netdev-&gt;flags &amp; IFF_PROMISC) ? 1 : 0;</div><div class='add'>+	int allmulti = (netdev-&gt;flags &amp; IFF_ALLMULTI) ||</div><div class='add'>+	    (netdev-&gt;mc_count &gt; ENIC_MULTICAST_PERFECT_FILTERS);</div><div class='add'>+	u8 mc_addr[ENIC_MULTICAST_PERFECT_FILTERS][ETH_ALEN];</div><div class='add'>+	unsigned int mc_count = netdev-&gt;mc_count;</div><div class='add'>+	unsigned int i, j;</div><div class='add'>+</div><div class='add'>+	if (mc_count &gt; ENIC_MULTICAST_PERFECT_FILTERS)</div><div class='add'>+		mc_count = ENIC_MULTICAST_PERFECT_FILTERS;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;enic-&gt;devcmd_lock);</div><div class='add'>+</div><div class='add'>+	vnic_dev_packet_filter(enic-&gt;vdev, directed,</div><div class='add'>+		multicast, broadcast, promisc, allmulti);</div><div class='add'>+</div><div class='add'>+	/* Is there an easier way?  Trying to minimize to</div><div class='add'>+	 * calls to add/del multicast addrs.  We keep the</div><div class='add'>+	 * addrs from the last call in enic-&gt;mc_addr and</div><div class='add'>+	 * look for changes to add/del.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	for (i = 0; list &amp;&amp; i &lt; mc_count; i++) {</div><div class='add'>+		memcpy(mc_addr[i], list-&gt;dmi_addr, ETH_ALEN);</div><div class='add'>+		list = list-&gt;next;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; enic-&gt;mc_count; i++) {</div><div class='add'>+		for (j = 0; j &lt; mc_count; j++)</div><div class='add'>+			if (compare_ether_addr(enic-&gt;mc_addr[i],</div><div class='add'>+				mc_addr[j]) == 0)</div><div class='add'>+				break;</div><div class='add'>+		if (j == mc_count)</div><div class='add'>+			enic_del_multicast_addr(enic, enic-&gt;mc_addr[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; mc_count; i++) {</div><div class='add'>+		for (j = 0; j &lt; enic-&gt;mc_count; j++)</div><div class='add'>+			if (compare_ether_addr(mc_addr[i],</div><div class='add'>+				enic-&gt;mc_addr[j]) == 0)</div><div class='add'>+				break;</div><div class='add'>+		if (j == enic-&gt;mc_count)</div><div class='add'>+			enic_add_multicast_addr(enic, mc_addr[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Save the list to compare against next time</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; mc_count; i++)</div><div class='add'>+		memcpy(enic-&gt;mc_addr[i], mc_addr[i], ETH_ALEN);</div><div class='add'>+</div><div class='add'>+	enic-&gt;mc_count = mc_count;</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;enic-&gt;devcmd_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* rtnl lock is held */</div><div class='add'>+static void enic_vlan_rx_register(struct net_device *netdev,</div><div class='add'>+	struct vlan_group *vlan_group)</div><div class='add'>+{</div><div class='add'>+	struct enic *enic = netdev_priv(netdev);</div><div class='add'>+	enic-&gt;vlan_group = vlan_group;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* rtnl lock is held */</div><div class='add'>+static void enic_vlan_rx_add_vid(struct net_device *netdev, u16 vid)</div><div class='add'>+{</div><div class='add'>+	struct enic *enic = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;enic-&gt;devcmd_lock);</div><div class='add'>+	enic_add_vlan(enic, vid);</div><div class='add'>+	spin_unlock(&amp;enic-&gt;devcmd_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* rtnl lock is held */</div><div class='add'>+static void enic_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)</div><div class='add'>+{</div><div class='add'>+	struct enic *enic = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;enic-&gt;devcmd_lock);</div><div class='add'>+	enic_del_vlan(enic, vid);</div><div class='add'>+	spin_unlock(&amp;enic-&gt;devcmd_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* netif_tx_lock held, BHs disabled */</div><div class='add'>+static void enic_tx_timeout(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct enic *enic = netdev_priv(netdev);</div><div class='add'>+	schedule_work(&amp;enic-&gt;reset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void enic_free_rq_buf(struct vnic_rq *rq, struct vnic_rq_buf *buf)</div><div class='add'>+{</div><div class='add'>+	struct enic *enic = vnic_dev_priv(rq-&gt;vdev);</div><div class='add'>+</div><div class='add'>+	if (!buf-&gt;os_buf)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	pci_unmap_single(enic-&gt;pdev, buf-&gt;dma_addr,</div><div class='add'>+		buf-&gt;len, PCI_DMA_FROMDEVICE);</div><div class='add'>+	dev_kfree_skb_any(buf-&gt;os_buf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct sk_buff *enic_rq_alloc_skb(unsigned int size)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	skb = dev_alloc_skb(size + NET_IP_ALIGN);</div><div class='add'>+</div><div class='add'>+	if (skb)</div><div class='add'>+		skb_reserve(skb, NET_IP_ALIGN);</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int enic_rq_alloc_buf(struct vnic_rq *rq)</div><div class='add'>+{</div><div class='add'>+	struct enic *enic = vnic_dev_priv(rq-&gt;vdev);</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	unsigned int len = enic-&gt;netdev-&gt;mtu + ETH_HLEN;</div><div class='add'>+	unsigned int os_buf_index = 0;</div><div class='add'>+	dma_addr_t dma_addr;</div><div class='add'>+</div><div class='add'>+	skb = enic_rq_alloc_skb(len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	dma_addr = pci_map_single(enic-&gt;pdev, skb-&gt;data,</div><div class='add'>+		len, PCI_DMA_FROMDEVICE);</div><div class='add'>+</div><div class='add'>+	enic_queue_rq_desc(rq, skb, os_buf_index,</div><div class='add'>+		dma_addr, len);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int enic_get_skb_header(struct sk_buff *skb, void **iphdr,</div><div class='add'>+	void **tcph, u64 *hdr_flags, void *priv)</div><div class='add'>+{</div><div class='add'>+	struct cq_enet_rq_desc *cq_desc = priv;</div><div class='add'>+	unsigned int ip_len;</div><div class='add'>+	struct iphdr *iph;</div><div class='add'>+</div><div class='add'>+	u8 type, color, eop, sop, ingress_port, vlan_stripped;</div><div class='add'>+	u8 fcoe, fcoe_sof, fcoe_fc_crc_ok, fcoe_enc_error, fcoe_eof;</div><div class='add'>+	u8 tcp_udp_csum_ok, udp, tcp, ipv4_csum_ok;</div><div class='add'>+	u8 ipv6, ipv4, ipv4_fragment, fcs_ok, rss_type, csum_not_calc;</div><div class='add'>+	u8 packet_error;</div><div class='add'>+	u16 q_number, completed_index, bytes_written, vlan, checksum;</div><div class='add'>+	u32 rss_hash;</div><div class='add'>+</div><div class='add'>+	cq_enet_rq_desc_dec(cq_desc,</div><div class='add'>+		&amp;type, &amp;color, &amp;q_number, &amp;completed_index,</div><div class='add'>+		&amp;ingress_port, &amp;fcoe, &amp;eop, &amp;sop, &amp;rss_type,</div><div class='add'>+		&amp;csum_not_calc, &amp;rss_hash, &amp;bytes_written,</div><div class='add'>+		&amp;packet_error, &amp;vlan_stripped, &amp;vlan, &amp;checksum,</div><div class='add'>+		&amp;fcoe_sof, &amp;fcoe_fc_crc_ok, &amp;fcoe_enc_error,</div><div class='add'>+		&amp;fcoe_eof, &amp;tcp_udp_csum_ok, &amp;udp, &amp;tcp,</div><div class='add'>+		&amp;ipv4_csum_ok, &amp;ipv6, &amp;ipv4, &amp;ipv4_fragment,</div><div class='add'>+		&amp;fcs_ok);</div><div class='add'>+</div><div class='add'>+	if (!(ipv4 &amp;&amp; tcp &amp;&amp; !ipv4_fragment))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	skb_reset_network_header(skb);</div><div class='add'>+	iph = ip_hdr(skb);</div><div class='add'>+</div><div class='add'>+	ip_len = ip_hdrlen(skb);</div><div class='add'>+	skb_set_transport_header(skb, ip_len);</div><div class='add'>+</div><div class='add'>+	/* check if ip header and tcp header are complete */</div><div class='add'>+	if (ntohs(iph-&gt;tot_len) &lt; ip_len + tcp_hdrlen(skb))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	*hdr_flags = LRO_IPV4 | LRO_TCP;</div><div class='add'>+	*tcph = tcp_hdr(skb);</div><div class='add'>+	*iphdr = iph;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void enic_rq_indicate_buf(struct vnic_rq *rq,</div><div class='add'>+	struct cq_desc *cq_desc, struct vnic_rq_buf *buf,</div><div class='add'>+	int skipped, void *opaque)</div><div class='add'>+{</div><div class='add'>+	struct enic *enic = vnic_dev_priv(rq-&gt;vdev);</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	u8 type, color, eop, sop, ingress_port, vlan_stripped;</div><div class='add'>+	u8 fcoe, fcoe_sof, fcoe_fc_crc_ok, fcoe_enc_error, fcoe_eof;</div><div class='add'>+	u8 tcp_udp_csum_ok, udp, tcp, ipv4_csum_ok;</div><div class='add'>+	u8 ipv6, ipv4, ipv4_fragment, fcs_ok, rss_type, csum_not_calc;</div><div class='add'>+	u8 packet_error;</div><div class='add'>+	u16 q_number, completed_index, bytes_written, vlan, checksum;</div><div class='add'>+	u32 rss_hash;</div><div class='add'>+</div><div class='add'>+	if (skipped)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	skb = buf-&gt;os_buf;</div><div class='add'>+	prefetch(skb-&gt;data - NET_IP_ALIGN);</div><div class='add'>+	pci_unmap_single(enic-&gt;pdev, buf-&gt;dma_addr,</div><div class='add'>+		buf-&gt;len, PCI_DMA_FROMDEVICE);</div><div class='add'>+</div><div class='add'>+	cq_enet_rq_desc_dec((struct cq_enet_rq_desc *)cq_desc,</div><div class='add'>+		&amp;type, &amp;color, &amp;q_number, &amp;completed_index,</div><div class='add'>+		&amp;ingress_port, &amp;fcoe, &amp;eop, &amp;sop, &amp;rss_type,</div><div class='add'>+		&amp;csum_not_calc, &amp;rss_hash, &amp;bytes_written,</div><div class='add'>+		&amp;packet_error, &amp;vlan_stripped, &amp;vlan, &amp;checksum,</div><div class='add'>+		&amp;fcoe_sof, &amp;fcoe_fc_crc_ok, &amp;fcoe_enc_error,</div><div class='add'>+		&amp;fcoe_eof, &amp;tcp_udp_csum_ok, &amp;udp, &amp;tcp,</div><div class='add'>+		&amp;ipv4_csum_ok, &amp;ipv6, &amp;ipv4, &amp;ipv4_fragment,</div><div class='add'>+		&amp;fcs_ok);</div><div class='add'>+</div><div class='add'>+	if (packet_error) {</div><div class='add'>+</div><div class='add'>+		if (bytes_written &gt; 0 &amp;&amp; !fcs_ok) {</div><div class='add'>+			if (net_ratelimit())</div><div class='add'>+				printk(KERN_ERR PFX</div><div class='add'>+					"%s: packet error: bad FCS\n",</div><div class='add'>+					enic-&gt;netdev-&gt;name);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		dev_kfree_skb_any(skb);</div><div class='add'>+</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (eop &amp;&amp; bytes_written &gt; 0) {</div><div class='add'>+</div><div class='add'>+		/* Good receive</div><div class='add'>+		 */</div><div class='add'>+</div><div class='add'>+		skb_put(skb, bytes_written);</div><div class='add'>+		skb-&gt;protocol = eth_type_trans(skb, enic-&gt;netdev);</div><div class='add'>+</div><div class='add'>+		if (enic-&gt;csum_rx_enabled &amp;&amp; !csum_not_calc) {</div><div class='add'>+			skb-&gt;csum = htons(checksum);</div><div class='add'>+			skb-&gt;ip_summed = CHECKSUM_COMPLETE;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		skb-&gt;dev = enic-&gt;netdev;</div><div class='add'>+		enic-&gt;netdev-&gt;last_rx = jiffies;</div><div class='add'>+</div><div class='add'>+		if (enic-&gt;vlan_group &amp;&amp; vlan_stripped) {</div><div class='add'>+</div><div class='add'>+			if (ENIC_SETTING(enic, LRO) &amp;&amp; ipv4)</div><div class='add'>+				lro_vlan_hwaccel_receive_skb(&amp;enic-&gt;lro_mgr,</div><div class='add'>+					skb, enic-&gt;vlan_group,</div><div class='add'>+					vlan, cq_desc);</div><div class='add'>+			else</div><div class='add'>+				vlan_hwaccel_receive_skb(skb,</div><div class='add'>+					enic-&gt;vlan_group, vlan);</div><div class='add'>+</div><div class='add'>+		} else {</div><div class='add'>+</div><div class='add'>+			if (ENIC_SETTING(enic, LRO) &amp;&amp; ipv4)</div><div class='add'>+				lro_receive_skb(&amp;enic-&gt;lro_mgr, skb, cq_desc);</div><div class='add'>+			else</div><div class='add'>+				netif_receive_skb(skb);</div><div class='add'>+</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	} else {</div><div class='add'>+</div><div class='add'>+		/* Buffer overflow</div><div class='add'>+		 */</div><div class='add'>+</div><div class='add'>+		dev_kfree_skb_any(skb);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int enic_rq_service(struct vnic_dev *vdev, struct cq_desc *cq_desc,</div><div class='add'>+	u8 type, u16 q_number, u16 completed_index, void *opaque)</div><div class='add'>+{</div><div class='add'>+	struct enic *enic = vnic_dev_priv(vdev);</div><div class='add'>+</div><div class='add'>+	vnic_rq_service(&amp;enic-&gt;rq[q_number], cq_desc,</div><div class='add'>+		completed_index, VNIC_RQ_RETURN_DESC,</div><div class='add'>+		enic_rq_indicate_buf, opaque);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void enic_rq_drop_buf(struct vnic_rq *rq,</div><div class='add'>+	struct cq_desc *cq_desc, struct vnic_rq_buf *buf,</div><div class='add'>+	int skipped, void *opaque)</div><div class='add'>+{</div><div class='add'>+	struct enic *enic = vnic_dev_priv(rq-&gt;vdev);</div><div class='add'>+	struct sk_buff *skb = buf-&gt;os_buf;</div><div class='add'>+</div><div class='add'>+	if (skipped)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	pci_unmap_single(enic-&gt;pdev, buf-&gt;dma_addr,</div><div class='add'>+		buf-&gt;len, PCI_DMA_FROMDEVICE);</div><div class='add'>+</div><div class='add'>+	dev_kfree_skb_any(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int enic_rq_service_drop(struct vnic_dev *vdev, struct cq_desc *cq_desc,</div><div class='add'>+	u8 type, u16 q_number, u16 completed_index, void *opaque)</div><div class='add'>+{</div><div class='add'>+	struct enic *enic = vnic_dev_priv(vdev);</div><div class='add'>+</div><div class='add'>+	vnic_rq_service(&amp;enic-&gt;rq[q_number], cq_desc,</div><div class='add'>+		completed_index, VNIC_RQ_RETURN_DESC,</div><div class='add'>+		enic_rq_drop_buf, opaque);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int enic_poll(struct napi_struct *napi, int budget)</div><div class='add'>+{</div><div class='add'>+	struct enic *enic = container_of(napi, struct enic, napi);</div><div class='add'>+	struct net_device *netdev = enic-&gt;netdev;</div><div class='add'>+	unsigned int rq_work_to_do = budget;</div><div class='add'>+	unsigned int wq_work_to_do = -1; /* no limit */</div><div class='add'>+	unsigned int  work_done, rq_work_done, wq_work_done;</div><div class='add'>+</div><div class='add'>+	/* Service RQ (first) and WQ</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	rq_work_done = vnic_cq_service(&amp;enic-&gt;cq[ENIC_CQ_RQ],</div><div class='add'>+		rq_work_to_do, enic_rq_service, NULL);</div><div class='add'>+</div><div class='add'>+	wq_work_done = vnic_cq_service(&amp;enic-&gt;cq[ENIC_CQ_WQ],</div><div class='add'>+		wq_work_to_do, enic_wq_service, NULL);</div><div class='add'>+</div><div class='add'>+	/* Accumulate intr event credits for this polling</div><div class='add'>+	 * cycle.  An intr event is the completion of a</div><div class='add'>+	 * a WQ or RQ packet.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	work_done = rq_work_done + wq_work_done;</div><div class='add'>+</div><div class='add'>+	if (work_done &gt; 0)</div><div class='add'>+		vnic_intr_return_credits(&amp;enic-&gt;intr[ENIC_INTX_WQ_RQ],</div><div class='add'>+			work_done,</div><div class='add'>+			0 /* don't unmask intr */,</div><div class='add'>+			0 /* don't reset intr timer */);</div><div class='add'>+</div><div class='add'>+	if (rq_work_done &gt; 0) {</div><div class='add'>+</div><div class='add'>+		/* Replenish RQ</div><div class='add'>+		 */</div><div class='add'>+</div><div class='add'>+		vnic_rq_fill(&amp;enic-&gt;rq[0], enic_rq_alloc_buf);</div><div class='add'>+</div><div class='add'>+	} else {</div><div class='add'>+</div><div class='add'>+		/* If no work done, flush all LROs and exit polling</div><div class='add'>+		 */</div><div class='add'>+</div><div class='add'>+		if (ENIC_SETTING(enic, LRO))</div><div class='add'>+			lro_flush_all(&amp;enic-&gt;lro_mgr);</div><div class='add'>+</div><div class='add'>+		netif_rx_complete(netdev, napi);</div><div class='add'>+		vnic_intr_unmask(&amp;enic-&gt;intr[ENIC_MSIX_RQ]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return rq_work_done;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int enic_poll_msix(struct napi_struct *napi, int budget)</div><div class='add'>+{</div><div class='add'>+	struct enic *enic = container_of(napi, struct enic, napi);</div><div class='add'>+	struct net_device *netdev = enic-&gt;netdev;</div><div class='add'>+	unsigned int work_to_do = budget;</div><div class='add'>+	unsigned int work_done;</div><div class='add'>+</div><div class='add'>+	/* Service RQ</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	work_done = vnic_cq_service(&amp;enic-&gt;cq[ENIC_CQ_RQ],</div><div class='add'>+		work_to_do, enic_rq_service, NULL);</div><div class='add'>+</div><div class='add'>+	if (work_done &gt; 0) {</div><div class='add'>+</div><div class='add'>+		/* Replenish RQ</div><div class='add'>+		 */</div><div class='add'>+</div><div class='add'>+		vnic_rq_fill(&amp;enic-&gt;rq[0], enic_rq_alloc_buf);</div><div class='add'>+</div><div class='add'>+		/* Accumulate intr event credits for this polling</div><div class='add'>+		 * cycle.  An intr event is the completion of a</div><div class='add'>+		 * a WQ or RQ packet.</div><div class='add'>+		 */</div><div class='add'>+</div><div class='add'>+		vnic_intr_return_credits(&amp;enic-&gt;intr[ENIC_MSIX_RQ],</div><div class='add'>+			work_done,</div><div class='add'>+			0 /* don't unmask intr */,</div><div class='add'>+			0 /* don't reset intr timer */);</div><div class='add'>+	} else {</div><div class='add'>+</div><div class='add'>+		/* If no work done, flush all LROs and exit polling</div><div class='add'>+		 */</div><div class='add'>+</div><div class='add'>+		if (ENIC_SETTING(enic, LRO))</div><div class='add'>+			lro_flush_all(&amp;enic-&gt;lro_mgr);</div><div class='add'>+</div><div class='add'>+		netif_rx_complete(netdev, napi);</div><div class='add'>+		vnic_intr_unmask(&amp;enic-&gt;intr[ENIC_MSIX_RQ]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return work_done;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void enic_notify_timer(unsigned long data)</div><div class='add'>+{</div><div class='add'>+	struct enic *enic = (struct enic *)data;</div><div class='add'>+</div><div class='add'>+	enic_notify_check(enic);</div><div class='add'>+</div><div class='add'>+	mod_timer(&amp;enic-&gt;notify_timer,</div><div class='add'>+		round_jiffies(jiffies + ENIC_NOTIFY_TIMER_PERIOD));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void enic_free_intr(struct enic *enic)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev = enic-&gt;netdev;</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	switch (vnic_dev_get_intr_mode(enic-&gt;vdev)) {</div><div class='add'>+	case VNIC_DEV_INTR_MODE_INTX:</div><div class='add'>+		free_irq(enic-&gt;pdev-&gt;irq, netdev);</div><div class='add'>+		break;</div><div class='add'>+	case VNIC_DEV_INTR_MODE_MSI:</div><div class='add'>+		free_irq(enic-&gt;pdev-&gt;irq, enic);</div><div class='add'>+		break;</div><div class='add'>+	case VNIC_DEV_INTR_MODE_MSIX:</div><div class='add'>+		for (i = 0; i &lt; ARRAY_SIZE(enic-&gt;msix); i++)</div><div class='add'>+			if (enic-&gt;msix[i].requested)</div><div class='add'>+				free_irq(enic-&gt;msix_entry[i].vector,</div><div class='add'>+					enic-&gt;msix[i].devid);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int enic_request_intr(struct enic *enic)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev = enic-&gt;netdev;</div><div class='add'>+	unsigned int i;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	switch (vnic_dev_get_intr_mode(enic-&gt;vdev)) {</div><div class='add'>+</div><div class='add'>+	case VNIC_DEV_INTR_MODE_INTX:</div><div class='add'>+</div><div class='add'>+		err = request_irq(enic-&gt;pdev-&gt;irq, enic_isr_legacy,</div><div class='add'>+			IRQF_SHARED, netdev-&gt;name, netdev);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case VNIC_DEV_INTR_MODE_MSI:</div><div class='add'>+</div><div class='add'>+		err = request_irq(enic-&gt;pdev-&gt;irq, enic_isr_msi,</div><div class='add'>+			0, netdev-&gt;name, enic);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case VNIC_DEV_INTR_MODE_MSIX:</div><div class='add'>+</div><div class='add'>+		sprintf(enic-&gt;msix[ENIC_MSIX_RQ].devname,</div><div class='add'>+			"%.11s-rx-0", netdev-&gt;name);</div><div class='add'>+		enic-&gt;msix[ENIC_MSIX_RQ].isr = enic_isr_msix_rq;</div><div class='add'>+		enic-&gt;msix[ENIC_MSIX_RQ].devid = enic;</div><div class='add'>+</div><div class='add'>+		sprintf(enic-&gt;msix[ENIC_MSIX_WQ].devname,</div><div class='add'>+			"%.11s-tx-0", netdev-&gt;name);</div><div class='add'>+		enic-&gt;msix[ENIC_MSIX_WQ].isr = enic_isr_msix_wq;</div><div class='add'>+		enic-&gt;msix[ENIC_MSIX_WQ].devid = enic;</div><div class='add'>+</div><div class='add'>+		sprintf(enic-&gt;msix[ENIC_MSIX_ERR].devname,</div><div class='add'>+			"%.11s-err", netdev-&gt;name);</div><div class='add'>+		enic-&gt;msix[ENIC_MSIX_ERR].isr = enic_isr_msix_err;</div><div class='add'>+		enic-&gt;msix[ENIC_MSIX_ERR].devid = enic;</div><div class='add'>+</div><div class='add'>+		sprintf(enic-&gt;msix[ENIC_MSIX_NOTIFY].devname,</div><div class='add'>+			"%.11s-notify", netdev-&gt;name);</div><div class='add'>+		enic-&gt;msix[ENIC_MSIX_NOTIFY].isr = enic_isr_msix_notify;</div><div class='add'>+		enic-&gt;msix[ENIC_MSIX_NOTIFY].devid = enic;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; ARRAY_SIZE(enic-&gt;msix); i++) {</div><div class='add'>+			err = request_irq(enic-&gt;msix_entry[i].vector,</div><div class='add'>+				enic-&gt;msix[i].isr, 0,</div><div class='add'>+				enic-&gt;msix[i].devname,</div><div class='add'>+				enic-&gt;msix[i].devid);</div><div class='add'>+			if (err) {</div><div class='add'>+				enic_free_intr(enic);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			enic-&gt;msix[i].requested = 1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int enic_notify_set(struct enic *enic)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	switch (vnic_dev_get_intr_mode(enic-&gt;vdev)) {</div><div class='add'>+	case VNIC_DEV_INTR_MODE_INTX:</div><div class='add'>+		err = vnic_dev_notify_set(enic-&gt;vdev, ENIC_INTX_NOTIFY);</div><div class='add'>+		break;</div><div class='add'>+	case VNIC_DEV_INTR_MODE_MSIX:</div><div class='add'>+		err = vnic_dev_notify_set(enic-&gt;vdev, ENIC_MSIX_NOTIFY);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		err = vnic_dev_notify_set(enic-&gt;vdev, -1 /* no intr */);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void enic_notify_timer_start(struct enic *enic)</div><div class='add'>+{</div><div class='add'>+	switch (vnic_dev_get_intr_mode(enic-&gt;vdev)) {</div><div class='add'>+	case VNIC_DEV_INTR_MODE_MSI:</div><div class='add'>+		mod_timer(&amp;enic-&gt;notify_timer, jiffies);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		/* Using intr for notification for INTx/MSI-X */</div><div class='add'>+		break;</div><div class='add'>+	};</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* rtnl lock is held, process context */</div><div class='add'>+static int enic_open(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct enic *enic = netdev_priv(netdev);</div><div class='add'>+	unsigned int i;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = enic_request_intr(enic);</div><div class='add'>+	if (err) {</div><div class='add'>+		printk(KERN_ERR PFX "%s: Unable to request irq.\n",</div><div class='add'>+			netdev-&gt;name);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = enic_notify_set(enic);</div><div class='add'>+	if (err) {</div><div class='add'>+		printk(KERN_ERR PFX</div><div class='add'>+			"%s: Failed to alloc notify buffer, aborting.\n",</div><div class='add'>+			netdev-&gt;name);</div><div class='add'>+		goto err_out_free_intr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; enic-&gt;rq_count; i++) {</div><div class='add'>+		err = vnic_rq_fill(&amp;enic-&gt;rq[i], enic_rq_alloc_buf);</div><div class='add'>+		if (err) {</div><div class='add'>+			printk(KERN_ERR PFX</div><div class='add'>+				"%s: Unable to alloc receive buffers.\n",</div><div class='add'>+				netdev-&gt;name);</div><div class='add'>+			goto err_out_notify_unset;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; enic-&gt;wq_count; i++)</div><div class='add'>+		vnic_wq_enable(&amp;enic-&gt;wq[i]);</div><div class='add'>+	for (i = 0; i &lt; enic-&gt;rq_count; i++)</div><div class='add'>+		vnic_rq_enable(&amp;enic-&gt;rq[i]);</div><div class='add'>+</div><div class='add'>+	enic_add_station_addr(enic);</div><div class='add'>+	enic_set_multicast_list(netdev);</div><div class='add'>+</div><div class='add'>+	netif_wake_queue(netdev);</div><div class='add'>+	napi_enable(&amp;enic-&gt;napi);</div><div class='add'>+	vnic_dev_enable(enic-&gt;vdev);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; enic-&gt;intr_count; i++)</div><div class='add'>+		vnic_intr_unmask(&amp;enic-&gt;intr[i]);</div><div class='add'>+</div><div class='add'>+	enic_notify_timer_start(enic);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_out_notify_unset:</div><div class='add'>+	vnic_dev_notify_unset(enic-&gt;vdev);</div><div class='add'>+err_out_free_intr:</div><div class='add'>+	enic_free_intr(enic);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* rtnl lock is held, process context */</div><div class='add'>+static int enic_stop(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct enic *enic = netdev_priv(netdev);</div><div class='add'>+	unsigned int i;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	del_timer_sync(&amp;enic-&gt;notify_timer);</div><div class='add'>+</div><div class='add'>+	vnic_dev_disable(enic-&gt;vdev);</div><div class='add'>+	napi_disable(&amp;enic-&gt;napi);</div><div class='add'>+	netif_stop_queue(netdev);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; enic-&gt;intr_count; i++)</div><div class='add'>+		vnic_intr_mask(&amp;enic-&gt;intr[i]);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; enic-&gt;wq_count; i++) {</div><div class='add'>+		err = vnic_wq_disable(&amp;enic-&gt;wq[i]);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+	for (i = 0; i &lt; enic-&gt;rq_count; i++) {</div><div class='add'>+		err = vnic_rq_disable(&amp;enic-&gt;rq[i]);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	vnic_dev_notify_unset(enic-&gt;vdev);</div><div class='add'>+	enic_free_intr(enic);</div><div class='add'>+</div><div class='add'>+	(void)vnic_cq_service(&amp;enic-&gt;cq[ENIC_CQ_RQ],</div><div class='add'>+		-1, enic_rq_service_drop, NULL);</div><div class='add'>+	(void)vnic_cq_service(&amp;enic-&gt;cq[ENIC_CQ_WQ],</div><div class='add'>+		-1, enic_wq_service, NULL);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; enic-&gt;wq_count; i++)</div><div class='add'>+		vnic_wq_clean(&amp;enic-&gt;wq[i], enic_free_wq_buf);</div><div class='add'>+	for (i = 0; i &lt; enic-&gt;rq_count; i++)</div><div class='add'>+		vnic_rq_clean(&amp;enic-&gt;rq[i], enic_free_rq_buf);</div><div class='add'>+	for (i = 0; i &lt; enic-&gt;cq_count; i++)</div><div class='add'>+		vnic_cq_clean(&amp;enic-&gt;cq[i]);</div><div class='add'>+	for (i = 0; i &lt; enic-&gt;intr_count; i++)</div><div class='add'>+		vnic_intr_clean(&amp;enic-&gt;intr[i]);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int enic_change_mtu(struct net_device *netdev, int new_mtu)</div><div class='add'>+{</div><div class='add'>+	struct enic *enic = netdev_priv(netdev);</div><div class='add'>+	int running = netif_running(netdev);</div><div class='add'>+</div><div class='add'>+	if (new_mtu &lt; ENIC_MIN_MTU || new_mtu &gt; ENIC_MAX_MTU)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (running)</div><div class='add'>+		enic_stop(netdev);</div><div class='add'>+</div><div class='add'>+	netdev-&gt;mtu = new_mtu;</div><div class='add'>+</div><div class='add'>+	if (netdev-&gt;mtu &gt; enic-&gt;port_mtu)</div><div class='add'>+		printk(KERN_WARNING PFX</div><div class='add'>+			"%s: interface MTU (%d) set higher "</div><div class='add'>+			"than port MTU (%d)\n",</div><div class='add'>+			netdev-&gt;name, netdev-&gt;mtu, enic-&gt;port_mtu);</div><div class='add'>+</div><div class='add'>+	if (running)</div><div class='add'>+		enic_open(netdev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_NET_POLL_CONTROLLER</div><div class='add'>+static void enic_poll_controller(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct enic *enic = netdev_priv(netdev);</div><div class='add'>+	struct vnic_dev *vdev = enic-&gt;vdev;</div><div class='add'>+</div><div class='add'>+	switch (vnic_dev_get_intr_mode(vdev)) {</div><div class='add'>+	case VNIC_DEV_INTR_MODE_MSIX:</div><div class='add'>+		enic_isr_msix_rq(enic-&gt;pdev-&gt;irq, enic);</div><div class='add'>+		enic_isr_msix_wq(enic-&gt;pdev-&gt;irq, enic);</div><div class='add'>+		break;</div><div class='add'>+	case VNIC_DEV_INTR_MODE_MSI:</div><div class='add'>+		enic_isr_msi(enic-&gt;pdev-&gt;irq, enic);</div><div class='add'>+		break;</div><div class='add'>+	case VNIC_DEV_INTR_MODE_INTX:</div><div class='add'>+		enic_isr_legacy(enic-&gt;pdev-&gt;irq, netdev);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static int enic_dev_wait(struct vnic_dev *vdev,</div><div class='add'>+	int (*start)(struct vnic_dev *, int),</div><div class='add'>+	int (*finished)(struct vnic_dev *, int *),</div><div class='add'>+	int arg)</div><div class='add'>+{</div><div class='add'>+	unsigned long time;</div><div class='add'>+	int done;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	BUG_ON(in_interrupt());</div><div class='add'>+</div><div class='add'>+	err = start(vdev, arg);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* Wait for func to complete...2 seconds max</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	time = jiffies + (HZ * 2);</div><div class='add'>+	do {</div><div class='add'>+</div><div class='add'>+		err = finished(vdev, &amp;done);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		if (done)</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		schedule_timeout_uninterruptible(HZ / 10);</div><div class='add'>+</div><div class='add'>+	} while (time_after(time, jiffies));</div><div class='add'>+</div><div class='add'>+	return -ETIMEDOUT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int enic_dev_open(struct enic *enic)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = enic_dev_wait(enic-&gt;vdev, vnic_dev_open,</div><div class='add'>+		vnic_dev_open_done, 0);</div><div class='add'>+	if (err)</div><div class='add'>+		printk(KERN_ERR PFX</div><div class='add'>+			"vNIC device open failed, err %d.\n", err);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int enic_dev_soft_reset(struct enic *enic)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = enic_dev_wait(enic-&gt;vdev, vnic_dev_soft_reset,</div><div class='add'>+		vnic_dev_soft_reset_done, 0);</div><div class='add'>+	if (err)</div><div class='add'>+		printk(KERN_ERR PFX</div><div class='add'>+			"vNIC soft reset failed, err %d.\n", err);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void enic_reset(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct enic *enic = container_of(work, struct enic, reset);</div><div class='add'>+</div><div class='add'>+	if (!netif_running(enic-&gt;netdev))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	rtnl_lock();</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;enic-&gt;devcmd_lock);</div><div class='add'>+	vnic_dev_hang_notify(enic-&gt;vdev);</div><div class='add'>+	spin_unlock(&amp;enic-&gt;devcmd_lock);</div><div class='add'>+</div><div class='add'>+	enic_stop(enic-&gt;netdev);</div><div class='add'>+	enic_dev_soft_reset(enic);</div><div class='add'>+	enic_reset_mcaddrs(enic);</div><div class='add'>+	enic_init_vnic_resources(enic);</div><div class='add'>+	enic_open(enic-&gt;netdev);</div><div class='add'>+</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int enic_set_intr_mode(struct enic *enic)</div><div class='add'>+{</div><div class='add'>+	unsigned int n = ARRAY_SIZE(enic-&gt;rq);</div><div class='add'>+	unsigned int m = ARRAY_SIZE(enic-&gt;wq);</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	/* Set interrupt mode (INTx, MSI, MSI-X) depending</div><div class='add'>+	 * system capabilities.</div><div class='add'>+	 *</div><div class='add'>+	 * Try MSI-X first</div><div class='add'>+	 *</div><div class='add'>+	 * We need n RQs, m WQs, n+m CQs, and n+m+2 INTRs</div><div class='add'>+	 * (the second to last INTR is used for WQ/RQ errors)</div><div class='add'>+	 * (the last INTR is used for notifications)</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	BUG_ON(ARRAY_SIZE(enic-&gt;msix_entry) &lt; n + m + 2);</div><div class='add'>+	for (i = 0; i &lt; n + m + 2; i++)</div><div class='add'>+		enic-&gt;msix_entry[i].entry = i;</div><div class='add'>+</div><div class='add'>+	if (enic-&gt;config.intr_mode &lt; 1 &amp;&amp;</div><div class='add'>+	    enic-&gt;rq_count &gt;= n &amp;&amp;</div><div class='add'>+	    enic-&gt;wq_count &gt;= m &amp;&amp;</div><div class='add'>+	    enic-&gt;cq_count &gt;= n + m &amp;&amp;</div><div class='add'>+	    enic-&gt;intr_count &gt;= n + m + 2 &amp;&amp;</div><div class='add'>+	    !pci_enable_msix(enic-&gt;pdev, enic-&gt;msix_entry, n + m + 2)) {</div><div class='add'>+</div><div class='add'>+		enic-&gt;rq_count = n;</div><div class='add'>+		enic-&gt;wq_count = m;</div><div class='add'>+		enic-&gt;cq_count = n + m;</div><div class='add'>+		enic-&gt;intr_count = n + m + 2;</div><div class='add'>+</div><div class='add'>+		vnic_dev_set_intr_mode(enic-&gt;vdev, VNIC_DEV_INTR_MODE_MSIX);</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Next try MSI</div><div class='add'>+	 *</div><div class='add'>+	 * We need 1 RQ, 1 WQ, 2 CQs, and 1 INTR</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	if (enic-&gt;config.intr_mode &lt; 2 &amp;&amp;</div><div class='add'>+	    enic-&gt;rq_count &gt;= 1 &amp;&amp;</div><div class='add'>+	    enic-&gt;wq_count &gt;= 1 &amp;&amp;</div><div class='add'>+	    enic-&gt;cq_count &gt;= 2 &amp;&amp;</div><div class='add'>+	    enic-&gt;intr_count &gt;= 1 &amp;&amp;</div><div class='add'>+	    !pci_enable_msi(enic-&gt;pdev)) {</div><div class='add'>+</div><div class='add'>+		enic-&gt;rq_count = 1;</div><div class='add'>+		enic-&gt;wq_count = 1;</div><div class='add'>+		enic-&gt;cq_count = 2;</div><div class='add'>+		enic-&gt;intr_count = 1;</div><div class='add'>+</div><div class='add'>+		vnic_dev_set_intr_mode(enic-&gt;vdev, VNIC_DEV_INTR_MODE_MSI);</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Next try INTx</div><div class='add'>+	 *</div><div class='add'>+	 * We need 1 RQ, 1 WQ, 2 CQs, and 3 INTRs</div><div class='add'>+	 * (the first INTR is used for WQ/RQ)</div><div class='add'>+	 * (the second INTR is used for WQ/RQ errors)</div><div class='add'>+	 * (the last INTR is used for notifications)</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	if (enic-&gt;config.intr_mode &lt; 3 &amp;&amp;</div><div class='add'>+	    enic-&gt;rq_count &gt;= 1 &amp;&amp;</div><div class='add'>+	    enic-&gt;wq_count &gt;= 1 &amp;&amp;</div><div class='add'>+	    enic-&gt;cq_count &gt;= 2 &amp;&amp;</div><div class='add'>+	    enic-&gt;intr_count &gt;= 3) {</div><div class='add'>+</div><div class='add'>+		enic-&gt;rq_count = 1;</div><div class='add'>+		enic-&gt;wq_count = 1;</div><div class='add'>+		enic-&gt;cq_count = 2;</div><div class='add'>+		enic-&gt;intr_count = 3;</div><div class='add'>+</div><div class='add'>+		vnic_dev_set_intr_mode(enic-&gt;vdev, VNIC_DEV_INTR_MODE_INTX);</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	vnic_dev_set_intr_mode(enic-&gt;vdev, VNIC_DEV_INTR_MODE_UNKNOWN);</div><div class='add'>+</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void enic_clear_intr_mode(struct enic *enic)</div><div class='add'>+{</div><div class='add'>+	switch (vnic_dev_get_intr_mode(enic-&gt;vdev)) {</div><div class='add'>+	case VNIC_DEV_INTR_MODE_MSIX:</div><div class='add'>+		pci_disable_msix(enic-&gt;pdev);</div><div class='add'>+		break;</div><div class='add'>+	case VNIC_DEV_INTR_MODE_MSI:</div><div class='add'>+		pci_disable_msi(enic-&gt;pdev);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	vnic_dev_set_intr_mode(enic-&gt;vdev, VNIC_DEV_INTR_MODE_UNKNOWN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void enic_iounmap(struct enic *enic)</div><div class='add'>+{</div><div class='add'>+	if (enic-&gt;bar0.vaddr)</div><div class='add'>+		iounmap(enic-&gt;bar0.vaddr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devinit enic_probe(struct pci_dev *pdev,</div><div class='add'>+	const struct pci_device_id *ent)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev;</div><div class='add'>+	struct enic *enic;</div><div class='add'>+	int using_dac = 0;</div><div class='add'>+	unsigned int i;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	const u8 rss_default_cpu = 0;</div><div class='add'>+	const u8 rss_hash_type = 0;</div><div class='add'>+	const u8 rss_hash_bits = 0;</div><div class='add'>+	const u8 rss_base_cpu = 0;</div><div class='add'>+	const u8 rss_enable = 0;</div><div class='add'>+	const u8 tso_ipid_split_en = 0;</div><div class='add'>+	const u8 ig_vlan_strip_en = 1;</div><div class='add'>+</div><div class='add'>+	/* Allocate net device structure and initialize.  Private</div><div class='add'>+	 * instance data is initialized to zero.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	netdev = alloc_etherdev(sizeof(struct enic));</div><div class='add'>+	if (!netdev) {</div><div class='add'>+		printk(KERN_ERR PFX "Etherdev alloc failed, aborting.\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pci_set_drvdata(pdev, netdev);</div><div class='add'>+</div><div class='add'>+	SET_NETDEV_DEV(netdev, &amp;pdev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	enic = netdev_priv(netdev);</div><div class='add'>+	enic-&gt;netdev = netdev;</div><div class='add'>+	enic-&gt;pdev = pdev;</div><div class='add'>+</div><div class='add'>+	/* Setup PCI resources</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	err = pci_enable_device(pdev);</div><div class='add'>+	if (err) {</div><div class='add'>+		printk(KERN_ERR PFX</div><div class='add'>+			"Cannot enable PCI device, aborting.\n");</div><div class='add'>+		goto err_out_free_netdev;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = pci_request_regions(pdev, DRV_NAME);</div><div class='add'>+	if (err) {</div><div class='add'>+		printk(KERN_ERR PFX</div><div class='add'>+			"Cannot request PCI regions, aborting.\n");</div><div class='add'>+		goto err_out_disable_device;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pci_set_master(pdev);</div><div class='add'>+</div><div class='add'>+	/* Query PCI controller on system for DMA addressing</div><div class='add'>+	 * limitation for the device.  Try 40-bit first, and</div><div class='add'>+	 * fail to 32-bit.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	err = pci_set_dma_mask(pdev, DMA_40BIT_MASK);</div><div class='add'>+	if (err) {</div><div class='add'>+		err = pci_set_dma_mask(pdev, DMA_32BIT_MASK);</div><div class='add'>+		if (err) {</div><div class='add'>+			printk(KERN_ERR PFX</div><div class='add'>+				"No usable DMA configuration, aborting.\n");</div><div class='add'>+			goto err_out_release_regions;</div><div class='add'>+		}</div><div class='add'>+		err = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);</div><div class='add'>+		if (err) {</div><div class='add'>+			printk(KERN_ERR PFX</div><div class='add'>+				"Unable to obtain 32-bit DMA "</div><div class='add'>+				"for consistent allocations, aborting.\n");</div><div class='add'>+			goto err_out_release_regions;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		err = pci_set_consistent_dma_mask(pdev, DMA_40BIT_MASK);</div><div class='add'>+		if (err) {</div><div class='add'>+			printk(KERN_ERR PFX</div><div class='add'>+				"Unable to obtain 40-bit DMA "</div><div class='add'>+				"for consistent allocations, aborting.\n");</div><div class='add'>+			goto err_out_release_regions;</div><div class='add'>+		}</div><div class='add'>+		using_dac = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Map vNIC resources from BAR0</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	if (!(pci_resource_flags(pdev, 0) &amp; IORESOURCE_MEM)) {</div><div class='add'>+		printk(KERN_ERR PFX</div><div class='add'>+			"BAR0 not memory-map'able, aborting.\n");</div><div class='add'>+		err = -ENODEV;</div><div class='add'>+		goto err_out_release_regions;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	enic-&gt;bar0.vaddr = pci_iomap(pdev, 0, enic-&gt;bar0.len);</div><div class='add'>+	enic-&gt;bar0.bus_addr = pci_resource_start(pdev, 0);</div><div class='add'>+	enic-&gt;bar0.len = pci_resource_len(pdev, 0);</div><div class='add'>+</div><div class='add'>+	if (!enic-&gt;bar0.vaddr) {</div><div class='add'>+		printk(KERN_ERR PFX</div><div class='add'>+			"Cannot memory-map BAR0 res hdr, aborting.\n");</div><div class='add'>+		err = -ENODEV;</div><div class='add'>+		goto err_out_release_regions;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Register vNIC device</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	enic-&gt;vdev = vnic_dev_register(NULL, enic, pdev, &amp;enic-&gt;bar0);</div><div class='add'>+	if (!enic-&gt;vdev) {</div><div class='add'>+		printk(KERN_ERR PFX</div><div class='add'>+			"vNIC registration failed, aborting.\n");</div><div class='add'>+		err = -ENODEV;</div><div class='add'>+		goto err_out_iounmap;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Issue device open to get device in known state</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	err = enic_dev_open(enic);</div><div class='add'>+	if (err) {</div><div class='add'>+		printk(KERN_ERR PFX</div><div class='add'>+			"vNIC dev open failed, aborting.\n");</div><div class='add'>+		goto err_out_vnic_unregister;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Issue device init to initialize the vnic-to-switch link.</div><div class='add'>+	 * We'll start with carrier off and wait for link UP</div><div class='add'>+	 * notification later to turn on carrier.  We don't need</div><div class='add'>+	 * to wait here for the vnic-to-switch link initialization</div><div class='add'>+	 * to complete; link UP notification is the indication that</div><div class='add'>+	 * the process is complete.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	netif_carrier_off(netdev);</div><div class='add'>+</div><div class='add'>+	err = vnic_dev_init(enic-&gt;vdev, 0);</div><div class='add'>+	if (err) {</div><div class='add'>+		printk(KERN_ERR PFX</div><div class='add'>+			"vNIC dev init failed, aborting.\n");</div><div class='add'>+		goto err_out_dev_close;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Get vNIC configuration</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	err = enic_get_vnic_config(enic);</div><div class='add'>+	if (err) {</div><div class='add'>+		printk(KERN_ERR PFX</div><div class='add'>+			"Get vNIC configuration failed, aborting.\n");</div><div class='add'>+		goto err_out_dev_close;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Get available resource counts</div><div class='add'>+	*/</div><div class='add'>+</div><div class='add'>+	enic_get_res_counts(enic);</div><div class='add'>+</div><div class='add'>+	/* Set interrupt mode based on resource counts and system</div><div class='add'>+	 * capabilities</div><div class='add'>+	*/</div><div class='add'>+</div><div class='add'>+	err = enic_set_intr_mode(enic);</div><div class='add'>+	if (err) {</div><div class='add'>+		printk(KERN_ERR PFX</div><div class='add'>+			"Failed to set intr mode, aborting.\n");</div><div class='add'>+		goto err_out_dev_close;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Allocate and configure vNIC resources</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	err = enic_alloc_vnic_resources(enic);</div><div class='add'>+	if (err) {</div><div class='add'>+		printk(KERN_ERR PFX</div><div class='add'>+			"Failed to alloc vNIC resources, aborting.\n");</div><div class='add'>+		goto err_out_free_vnic_resources;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	enic_init_vnic_resources(enic);</div><div class='add'>+</div><div class='add'>+	/* Enable VLAN tag stripping.  RSS not enabled (yet).</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	err = enic_set_nic_cfg(enic,</div><div class='add'>+		rss_default_cpu, rss_hash_type,</div><div class='add'>+		rss_hash_bits, rss_base_cpu,</div><div class='add'>+		rss_enable, tso_ipid_split_en,</div><div class='add'>+		ig_vlan_strip_en);</div><div class='add'>+	if (err) {</div><div class='add'>+		printk(KERN_ERR PFX</div><div class='add'>+			"Failed to config nic, aborting.\n");</div><div class='add'>+		goto err_out_free_vnic_resources;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Setup notification timer, HW reset task, and locks</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	init_timer(&amp;enic-&gt;notify_timer);</div><div class='add'>+	enic-&gt;notify_timer.function = enic_notify_timer;</div><div class='add'>+	enic-&gt;notify_timer.data = (unsigned long)enic;</div><div class='add'>+</div><div class='add'>+	INIT_WORK(&amp;enic-&gt;reset, enic_reset);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; enic-&gt;wq_count; i++)</div><div class='add'>+		spin_lock_init(&amp;enic-&gt;wq_lock[i]);</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;enic-&gt;devcmd_lock);</div><div class='add'>+</div><div class='add'>+	/* Register net device</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	enic-&gt;port_mtu = enic-&gt;config.mtu;</div><div class='add'>+	(void)enic_change_mtu(netdev, enic-&gt;port_mtu);</div><div class='add'>+</div><div class='add'>+	err = enic_set_mac_addr(netdev, enic-&gt;mac_addr);</div><div class='add'>+	if (err) {</div><div class='add'>+		printk(KERN_ERR PFX</div><div class='add'>+			"Invalid MAC address, aborting.\n");</div><div class='add'>+		goto err_out_free_vnic_resources;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netdev-&gt;open = enic_open;</div><div class='add'>+	netdev-&gt;stop = enic_stop;</div><div class='add'>+	netdev-&gt;hard_start_xmit = enic_hard_start_xmit;</div><div class='add'>+	netdev-&gt;get_stats = enic_get_stats;</div><div class='add'>+	netdev-&gt;set_multicast_list = enic_set_multicast_list;</div><div class='add'>+	netdev-&gt;change_mtu = enic_change_mtu;</div><div class='add'>+	netdev-&gt;vlan_rx_register = enic_vlan_rx_register;</div><div class='add'>+	netdev-&gt;vlan_rx_add_vid = enic_vlan_rx_add_vid;</div><div class='add'>+	netdev-&gt;vlan_rx_kill_vid = enic_vlan_rx_kill_vid;</div><div class='add'>+	netdev-&gt;tx_timeout = enic_tx_timeout;</div><div class='add'>+	netdev-&gt;watchdog_timeo = 2 * HZ;</div><div class='add'>+	netdev-&gt;ethtool_ops = &amp;enic_ethtool_ops;</div><div class='add'>+#ifdef CONFIG_NET_POLL_CONTROLLER</div><div class='add'>+	netdev-&gt;poll_controller = enic_poll_controller;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	switch (vnic_dev_get_intr_mode(enic-&gt;vdev)) {</div><div class='add'>+	default:</div><div class='add'>+		netif_napi_add(netdev, &amp;enic-&gt;napi, enic_poll, 64);</div><div class='add'>+		break;</div><div class='add'>+	case VNIC_DEV_INTR_MODE_MSIX:</div><div class='add'>+		netif_napi_add(netdev, &amp;enic-&gt;napi, enic_poll_msix, 64);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netdev-&gt;features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;</div><div class='add'>+	if (ENIC_SETTING(enic, TXCSUM))</div><div class='add'>+		netdev-&gt;features |= NETIF_F_SG | NETIF_F_HW_CSUM;</div><div class='add'>+	if (ENIC_SETTING(enic, TSO))</div><div class='add'>+		netdev-&gt;features |= NETIF_F_TSO |</div><div class='add'>+			NETIF_F_TSO6 | NETIF_F_TSO_ECN;</div><div class='add'>+	if (using_dac)</div><div class='add'>+		netdev-&gt;features |= NETIF_F_HIGHDMA;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	enic-&gt;csum_rx_enabled = ENIC_SETTING(enic, RXCSUM);</div><div class='add'>+</div><div class='add'>+	if (ENIC_SETTING(enic, LRO)) {</div><div class='add'>+		enic-&gt;lro_mgr.max_aggr = ENIC_LRO_MAX_AGGR;</div><div class='add'>+		enic-&gt;lro_mgr.max_desc = ENIC_LRO_MAX_DESC;</div><div class='add'>+		enic-&gt;lro_mgr.lro_arr = enic-&gt;lro_desc;</div><div class='add'>+		enic-&gt;lro_mgr.get_skb_header = enic_get_skb_header;</div><div class='add'>+		enic-&gt;lro_mgr.features	= LRO_F_NAPI | LRO_F_EXTRACT_VLAN_ID;</div><div class='add'>+		enic-&gt;lro_mgr.dev = netdev;</div><div class='add'>+		enic-&gt;lro_mgr.ip_summed = CHECKSUM_COMPLETE;</div><div class='add'>+		enic-&gt;lro_mgr.ip_summed_aggr = CHECKSUM_UNNECESSARY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = register_netdev(netdev);</div><div class='add'>+	if (err) {</div><div class='add'>+		printk(KERN_ERR PFX</div><div class='add'>+			"Cannot register net device, aborting.\n");</div><div class='add'>+		goto err_out_free_vnic_resources;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_out_free_vnic_resources:</div><div class='add'>+	enic_free_vnic_resources(enic);</div><div class='add'>+err_out_dev_close:</div><div class='add'>+	vnic_dev_close(enic-&gt;vdev);</div><div class='add'>+err_out_vnic_unregister:</div><div class='add'>+	enic_clear_intr_mode(enic);</div><div class='add'>+	vnic_dev_unregister(enic-&gt;vdev);</div><div class='add'>+err_out_iounmap:</div><div class='add'>+	enic_iounmap(enic);</div><div class='add'>+err_out_release_regions:</div><div class='add'>+	pci_release_regions(pdev);</div><div class='add'>+err_out_disable_device:</div><div class='add'>+	pci_disable_device(pdev);</div><div class='add'>+err_out_free_netdev:</div><div class='add'>+	pci_set_drvdata(pdev, NULL);</div><div class='add'>+	free_netdev(netdev);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __devexit enic_remove(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev = pci_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	if (netdev) {</div><div class='add'>+		struct enic *enic = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+		flush_scheduled_work();</div><div class='add'>+		unregister_netdev(netdev);</div><div class='add'>+		enic_free_vnic_resources(enic);</div><div class='add'>+		vnic_dev_close(enic-&gt;vdev);</div><div class='add'>+		enic_clear_intr_mode(enic);</div><div class='add'>+		vnic_dev_unregister(enic-&gt;vdev);</div><div class='add'>+		enic_iounmap(enic);</div><div class='add'>+		pci_release_regions(pdev);</div><div class='add'>+		pci_disable_device(pdev);</div><div class='add'>+		pci_set_drvdata(pdev, NULL);</div><div class='add'>+		free_netdev(netdev);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct pci_driver enic_driver = {</div><div class='add'>+	.name = DRV_NAME,</div><div class='add'>+	.id_table = enic_id_table,</div><div class='add'>+	.probe = enic_probe,</div><div class='add'>+	.remove = __devexit_p(enic_remove),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init enic_init_module(void)</div><div class='add'>+{</div><div class='add'>+	printk(KERN_INFO PFX "%s, ver %s\n", DRV_DESCRIPTION, DRV_VERSION);</div><div class='add'>+</div><div class='add'>+	return pci_register_driver(&amp;enic_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit enic_cleanup_module(void)</div><div class='add'>+{</div><div class='add'>+	pci_unregister_driver(&amp;enic_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(enic_init_module);</div><div class='add'>+module_exit(enic_cleanup_module);</div><div class='head'>diff --git a/drivers/net/enic/enic_res.c b/drivers/net/enic/enic_res.c<br/>new file mode 100644<br/>index 000000000000..95184b9108ef<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/enic/enic_res.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/enic/enic_res.c</a></div><div class='hunk'>@@ -0,0 +1,370 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2008 Cisco Systems, Inc.  All rights reserved.</div><div class='add'>+ * Copyright 2007 Nuova Systems, Inc.  All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you may redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; version 2 of the License.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='add'>+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='add'>+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='add'>+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='add'>+ * SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+</div><div class='add'>+#include "wq_enet_desc.h"</div><div class='add'>+#include "rq_enet_desc.h"</div><div class='add'>+#include "cq_enet_desc.h"</div><div class='add'>+#include "vnic_resource.h"</div><div class='add'>+#include "vnic_enet.h"</div><div class='add'>+#include "vnic_dev.h"</div><div class='add'>+#include "vnic_wq.h"</div><div class='add'>+#include "vnic_rq.h"</div><div class='add'>+#include "vnic_cq.h"</div><div class='add'>+#include "vnic_intr.h"</div><div class='add'>+#include "vnic_stats.h"</div><div class='add'>+#include "vnic_nic.h"</div><div class='add'>+#include "vnic_rss.h"</div><div class='add'>+#include "enic_res.h"</div><div class='add'>+#include "enic.h"</div><div class='add'>+</div><div class='add'>+int enic_get_vnic_config(struct enic *enic)</div><div class='add'>+{</div><div class='add'>+	struct vnic_enet_config *c = &amp;enic-&gt;config;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = vnic_dev_mac_addr(enic-&gt;vdev, enic-&gt;mac_addr);</div><div class='add'>+	if (err) {</div><div class='add'>+		printk(KERN_ERR PFX "Error getting MAC addr, %d\n", err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#define GET_CONFIG(m) \</div><div class='add'>+	do { \</div><div class='add'>+		err = vnic_dev_spec(enic-&gt;vdev, \</div><div class='add'>+			offsetof(struct vnic_enet_config, m), \</div><div class='add'>+			sizeof(c-&gt;m), &amp;c-&gt;m); \</div><div class='add'>+		if (err) { \</div><div class='add'>+			printk(KERN_ERR PFX \</div><div class='add'>+				"Error getting %s, %d\n", #m, err); \</div><div class='add'>+			return err; \</div><div class='add'>+		} \</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+	GET_CONFIG(flags);</div><div class='add'>+	GET_CONFIG(wq_desc_count);</div><div class='add'>+	GET_CONFIG(rq_desc_count);</div><div class='add'>+	GET_CONFIG(mtu);</div><div class='add'>+	GET_CONFIG(intr_timer);</div><div class='add'>+	GET_CONFIG(intr_timer_type);</div><div class='add'>+	GET_CONFIG(intr_mode);</div><div class='add'>+</div><div class='add'>+	c-&gt;wq_desc_count =</div><div class='add'>+		min_t(u32, ENIC_MAX_WQ_DESCS,</div><div class='add'>+		max_t(u32, ENIC_MIN_WQ_DESCS,</div><div class='add'>+		c-&gt;wq_desc_count));</div><div class='add'>+	c-&gt;wq_desc_count &amp;= 0xfffffff0; /* must be aligned to groups of 16 */</div><div class='add'>+</div><div class='add'>+	c-&gt;rq_desc_count =</div><div class='add'>+		min_t(u32, ENIC_MAX_RQ_DESCS,</div><div class='add'>+		max_t(u32, ENIC_MIN_RQ_DESCS,</div><div class='add'>+		c-&gt;rq_desc_count));</div><div class='add'>+	c-&gt;rq_desc_count &amp;= 0xfffffff0; /* must be aligned to groups of 16 */</div><div class='add'>+</div><div class='add'>+	if (c-&gt;mtu == 0)</div><div class='add'>+		c-&gt;mtu = 1500;</div><div class='add'>+	c-&gt;mtu = min_t(u16, ENIC_MAX_MTU,</div><div class='add'>+		max_t(u16, ENIC_MIN_MTU,</div><div class='add'>+		c-&gt;mtu));</div><div class='add'>+</div><div class='add'>+	c-&gt;intr_timer = min_t(u16, VNIC_INTR_TIMER_MAX, c-&gt;intr_timer);</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO PFX "vNIC MAC addr %02x:%02x:%02x:%02x:%02x:%02x "</div><div class='add'>+		"wq/rq %d/%d\n",</div><div class='add'>+		enic-&gt;mac_addr[0], enic-&gt;mac_addr[1], enic-&gt;mac_addr[2],</div><div class='add'>+		enic-&gt;mac_addr[3], enic-&gt;mac_addr[4], enic-&gt;mac_addr[5],</div><div class='add'>+		c-&gt;wq_desc_count, c-&gt;rq_desc_count);</div><div class='add'>+	printk(KERN_INFO PFX "vNIC mtu %d csum tx/rx %d/%d tso/lro %d/%d "</div><div class='add'>+		"intr timer %d\n",</div><div class='add'>+		c-&gt;mtu, ENIC_SETTING(enic, TXCSUM),</div><div class='add'>+		ENIC_SETTING(enic, RXCSUM), ENIC_SETTING(enic, TSO),</div><div class='add'>+		ENIC_SETTING(enic, LRO), c-&gt;intr_timer);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void enic_add_station_addr(struct enic *enic)</div><div class='add'>+{</div><div class='add'>+	vnic_dev_add_addr(enic-&gt;vdev, enic-&gt;mac_addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void enic_add_multicast_addr(struct enic *enic, u8 *addr)</div><div class='add'>+{</div><div class='add'>+	vnic_dev_add_addr(enic-&gt;vdev, addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void enic_del_multicast_addr(struct enic *enic, u8 *addr)</div><div class='add'>+{</div><div class='add'>+	vnic_dev_del_addr(enic-&gt;vdev, addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void enic_add_vlan(struct enic *enic, u16 vlanid)</div><div class='add'>+{</div><div class='add'>+	u64 a0 = vlanid, a1 = 0;</div><div class='add'>+	int wait = 1000;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = vnic_dev_cmd(enic-&gt;vdev, CMD_VLAN_ADD, &amp;a0, &amp;a1, wait);</div><div class='add'>+	if (err)</div><div class='add'>+		printk(KERN_ERR PFX "Can't add vlan id, %d\n", err);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void enic_del_vlan(struct enic *enic, u16 vlanid)</div><div class='add'>+{</div><div class='add'>+	u64 a0 = vlanid, a1 = 0;</div><div class='add'>+	int wait = 1000;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = vnic_dev_cmd(enic-&gt;vdev, CMD_VLAN_DEL, &amp;a0, &amp;a1, wait);</div><div class='add'>+	if (err)</div><div class='add'>+		printk(KERN_ERR PFX "Can't delete vlan id, %d\n", err);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int enic_set_nic_cfg(struct enic *enic, u8 rss_default_cpu, u8 rss_hash_type,</div><div class='add'>+	u8 rss_hash_bits, u8 rss_base_cpu, u8 rss_enable, u8 tso_ipid_split_en,</div><div class='add'>+	u8 ig_vlan_strip_en)</div><div class='add'>+{</div><div class='add'>+	u64 a0, a1;</div><div class='add'>+	u32 nic_cfg;</div><div class='add'>+	int wait = 1000;</div><div class='add'>+</div><div class='add'>+	vnic_set_nic_cfg(&amp;nic_cfg, rss_default_cpu,</div><div class='add'>+		rss_hash_type, rss_hash_bits, rss_base_cpu,</div><div class='add'>+		rss_enable, tso_ipid_split_en, ig_vlan_strip_en);</div><div class='add'>+</div><div class='add'>+	a0 = nic_cfg;</div><div class='add'>+	a1 = 0;</div><div class='add'>+</div><div class='add'>+	return vnic_dev_cmd(enic-&gt;vdev, CMD_NIC_CFG, &amp;a0, &amp;a1, wait);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void enic_free_vnic_resources(struct enic *enic)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; enic-&gt;wq_count; i++)</div><div class='add'>+		vnic_wq_free(&amp;enic-&gt;wq[i]);</div><div class='add'>+	for (i = 0; i &lt; enic-&gt;rq_count; i++)</div><div class='add'>+		vnic_rq_free(&amp;enic-&gt;rq[i]);</div><div class='add'>+	for (i = 0; i &lt; enic-&gt;cq_count; i++)</div><div class='add'>+		vnic_cq_free(&amp;enic-&gt;cq[i]);</div><div class='add'>+	for (i = 0; i &lt; enic-&gt;intr_count; i++)</div><div class='add'>+		vnic_intr_free(&amp;enic-&gt;intr[i]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void enic_get_res_counts(struct enic *enic)</div><div class='add'>+{</div><div class='add'>+	enic-&gt;wq_count = vnic_dev_get_res_count(enic-&gt;vdev, RES_TYPE_WQ);</div><div class='add'>+	enic-&gt;rq_count = vnic_dev_get_res_count(enic-&gt;vdev, RES_TYPE_RQ);</div><div class='add'>+	enic-&gt;cq_count = vnic_dev_get_res_count(enic-&gt;vdev, RES_TYPE_CQ);</div><div class='add'>+	enic-&gt;intr_count = vnic_dev_get_res_count(enic-&gt;vdev,</div><div class='add'>+		RES_TYPE_INTR_CTRL);</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO PFX "vNIC resources avail: "</div><div class='add'>+		"wq %d rq %d cq %d intr %d\n",</div><div class='add'>+		enic-&gt;wq_count, enic-&gt;rq_count,</div><div class='add'>+		enic-&gt;cq_count, enic-&gt;intr_count);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void enic_init_vnic_resources(struct enic *enic)</div><div class='add'>+{</div><div class='add'>+	enum vnic_dev_intr_mode intr_mode;</div><div class='add'>+	unsigned int mask_on_assertion;</div><div class='add'>+	unsigned int interrupt_offset;</div><div class='add'>+	unsigned int error_interrupt_enable;</div><div class='add'>+	unsigned int error_interrupt_offset;</div><div class='add'>+	unsigned int cq_index;</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	intr_mode = vnic_dev_get_intr_mode(enic-&gt;vdev);</div><div class='add'>+</div><div class='add'>+	/* Init RQ/WQ resources.</div><div class='add'>+	 *</div><div class='add'>+	 * RQ[0 - n-1] point to CQ[0 - n-1]</div><div class='add'>+	 * WQ[0 - m-1] point to CQ[n - n+m-1]</div><div class='add'>+	 *</div><div class='add'>+	 * Error interrupt is not enabled for MSI.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	switch (intr_mode) {</div><div class='add'>+	case VNIC_DEV_INTR_MODE_INTX:</div><div class='add'>+	case VNIC_DEV_INTR_MODE_MSIX:</div><div class='add'>+		error_interrupt_enable = 1;</div><div class='add'>+		error_interrupt_offset = enic-&gt;intr_count - 2;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		error_interrupt_enable = 0;</div><div class='add'>+		error_interrupt_offset = 0;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; enic-&gt;rq_count; i++) {</div><div class='add'>+		cq_index = i;</div><div class='add'>+		vnic_rq_init(&amp;enic-&gt;rq[i],</div><div class='add'>+			cq_index,</div><div class='add'>+			error_interrupt_enable,</div><div class='add'>+			error_interrupt_offset);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; enic-&gt;wq_count; i++) {</div><div class='add'>+		cq_index = enic-&gt;rq_count + i;</div><div class='add'>+		vnic_wq_init(&amp;enic-&gt;wq[i],</div><div class='add'>+			cq_index,</div><div class='add'>+			error_interrupt_enable,</div><div class='add'>+			error_interrupt_offset);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Init CQ resources</div><div class='add'>+	 *</div><div class='add'>+	 * CQ[0 - n+m-1] point to INTR[0] for INTx, MSI</div><div class='add'>+	 * CQ[0 - n+m-1] point to INTR[0 - n+m-1] for MSI-X</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; enic-&gt;cq_count; i++) {</div><div class='add'>+</div><div class='add'>+		switch (intr_mode) {</div><div class='add'>+		case VNIC_DEV_INTR_MODE_MSIX:</div><div class='add'>+			interrupt_offset = i;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			interrupt_offset = 0;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		vnic_cq_init(&amp;enic-&gt;cq[i],</div><div class='add'>+			0 /* flow_control_enable */,</div><div class='add'>+			1 /* color_enable */,</div><div class='add'>+			0 /* cq_head */,</div><div class='add'>+			0 /* cq_tail */,</div><div class='add'>+			1 /* cq_tail_color */,</div><div class='add'>+			1 /* interrupt_enable */,</div><div class='add'>+			1 /* cq_entry_enable */,</div><div class='add'>+			0 /* cq_message_enable */,</div><div class='add'>+			interrupt_offset,</div><div class='add'>+			0 /* cq_message_addr */);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Init INTR resources</div><div class='add'>+	 *</div><div class='add'>+	 * mask_on_assertion is not used for INTx due to the level-</div><div class='add'>+	 * triggered nature of INTx</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	switch (intr_mode) {</div><div class='add'>+	case VNIC_DEV_INTR_MODE_MSI:</div><div class='add'>+	case VNIC_DEV_INTR_MODE_MSIX:</div><div class='add'>+		mask_on_assertion = 1;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		mask_on_assertion = 0;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; enic-&gt;intr_count; i++) {</div><div class='add'>+		vnic_intr_init(&amp;enic-&gt;intr[i],</div><div class='add'>+			enic-&gt;config.intr_timer,</div><div class='add'>+			enic-&gt;config.intr_timer_type,</div><div class='add'>+			mask_on_assertion);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Clear LIF stats</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	vnic_dev_stats_clear(enic-&gt;vdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int enic_alloc_vnic_resources(struct enic *enic)</div><div class='add'>+{</div><div class='add'>+	enum vnic_dev_intr_mode intr_mode;</div><div class='add'>+	unsigned int i;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	intr_mode = vnic_dev_get_intr_mode(enic-&gt;vdev);</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO PFX "vNIC resources used:  "</div><div class='add'>+		"wq %d rq %d cq %d intr %d intr mode %s\n",</div><div class='add'>+		enic-&gt;wq_count, enic-&gt;rq_count,</div><div class='add'>+		enic-&gt;cq_count, enic-&gt;intr_count,</div><div class='add'>+		intr_mode == VNIC_DEV_INTR_MODE_INTX ? "legacy PCI INTx" :</div><div class='add'>+		intr_mode == VNIC_DEV_INTR_MODE_MSI ? "MSI" :</div><div class='add'>+		intr_mode == VNIC_DEV_INTR_MODE_MSIX ? "MSI-X" :</div><div class='add'>+		"unknown"</div><div class='add'>+		);</div><div class='add'>+</div><div class='add'>+	/* Allocate queue resources</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; enic-&gt;wq_count; i++) {</div><div class='add'>+		err = vnic_wq_alloc(enic-&gt;vdev, &amp;enic-&gt;wq[i], i,</div><div class='add'>+			enic-&gt;config.wq_desc_count,</div><div class='add'>+			sizeof(struct wq_enet_desc));</div><div class='add'>+		if (err)</div><div class='add'>+			goto err_out_cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; enic-&gt;rq_count; i++) {</div><div class='add'>+		err = vnic_rq_alloc(enic-&gt;vdev, &amp;enic-&gt;rq[i], i,</div><div class='add'>+			enic-&gt;config.rq_desc_count,</div><div class='add'>+			sizeof(struct rq_enet_desc));</div><div class='add'>+		if (err)</div><div class='add'>+			goto err_out_cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; enic-&gt;cq_count; i++) {</div><div class='add'>+		if (i &lt; enic-&gt;rq_count)</div><div class='add'>+			err = vnic_cq_alloc(enic-&gt;vdev, &amp;enic-&gt;cq[i], i,</div><div class='add'>+				enic-&gt;config.rq_desc_count,</div><div class='add'>+				sizeof(struct cq_enet_rq_desc));</div><div class='add'>+		else</div><div class='add'>+			err = vnic_cq_alloc(enic-&gt;vdev, &amp;enic-&gt;cq[i], i,</div><div class='add'>+				enic-&gt;config.wq_desc_count,</div><div class='add'>+				sizeof(struct cq_enet_wq_desc));</div><div class='add'>+		if (err)</div><div class='add'>+			goto err_out_cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; enic-&gt;intr_count; i++) {</div><div class='add'>+		err = vnic_intr_alloc(enic-&gt;vdev, &amp;enic-&gt;intr[i], i);</div><div class='add'>+		if (err)</div><div class='add'>+			goto err_out_cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Hook remaining resource</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	enic-&gt;legacy_pba = vnic_dev_get_res(enic-&gt;vdev,</div><div class='add'>+		RES_TYPE_INTR_PBA_LEGACY, 0);</div><div class='add'>+	if (!enic-&gt;legacy_pba &amp;&amp; intr_mode == VNIC_DEV_INTR_MODE_INTX) {</div><div class='add'>+		printk(KERN_ERR PFX "Failed to hook legacy pba resource\n");</div><div class='add'>+		err = -ENODEV;</div><div class='add'>+		goto err_out_cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_out_cleanup:</div><div class='add'>+	enic_free_vnic_resources(enic);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/enic/enic_res.h b/drivers/net/enic/enic_res.h<br/>new file mode 100644<br/>index 000000000000..68534a29b7ac<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/enic/enic_res.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/enic/enic_res.h</a></div><div class='hunk'>@@ -0,0 +1,151 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2008 Cisco Systems, Inc.  All rights reserved.</div><div class='add'>+ * Copyright 2007 Nuova Systems, Inc.  All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you may redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; version 2 of the License.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='add'>+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='add'>+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='add'>+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='add'>+ * SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _ENIC_RES_H_</div><div class='add'>+#define _ENIC_RES_H_</div><div class='add'>+</div><div class='add'>+#include "wq_enet_desc.h"</div><div class='add'>+#include "rq_enet_desc.h"</div><div class='add'>+#include "vnic_wq.h"</div><div class='add'>+#include "vnic_rq.h"</div><div class='add'>+</div><div class='add'>+#define ENIC_MIN_WQ_DESCS		64</div><div class='add'>+#define ENIC_MAX_WQ_DESCS		4096</div><div class='add'>+#define ENIC_MIN_RQ_DESCS		64</div><div class='add'>+#define ENIC_MAX_RQ_DESCS		4096</div><div class='add'>+</div><div class='add'>+#define ENIC_MIN_MTU			576  /* minimum for IPv4 */</div><div class='add'>+#define ENIC_MAX_MTU			9000</div><div class='add'>+</div><div class='add'>+#define ENIC_MULTICAST_PERFECT_FILTERS	32</div><div class='add'>+</div><div class='add'>+#define ENIC_NON_TSO_MAX_DESC		16</div><div class='add'>+</div><div class='add'>+#define ENIC_SETTING(enic, f) ((enic-&gt;config.flags &amp; VENETF_##f) ? 1 : 0)</div><div class='add'>+</div><div class='add'>+static inline void enic_queue_wq_desc_ex(struct vnic_wq *wq,</div><div class='add'>+	void *os_buf, dma_addr_t dma_addr, unsigned int len,</div><div class='add'>+	unsigned int mss_or_csum_offset, unsigned int hdr_len,</div><div class='add'>+	int vlan_tag_insert, unsigned int vlan_tag,</div><div class='add'>+	int offload_mode, int cq_entry, int sop, int eop)</div><div class='add'>+{</div><div class='add'>+	struct wq_enet_desc *desc = vnic_wq_next_desc(wq);</div><div class='add'>+</div><div class='add'>+	wq_enet_desc_enc(desc,</div><div class='add'>+		(u64)dma_addr | VNIC_PADDR_TARGET,</div><div class='add'>+		(u16)len,</div><div class='add'>+		(u16)mss_or_csum_offset,</div><div class='add'>+		(u16)hdr_len, (u8)offload_mode,</div><div class='add'>+		(u8)eop, (u8)cq_entry,</div><div class='add'>+		0, /* fcoe_encap */</div><div class='add'>+		(u8)vlan_tag_insert,</div><div class='add'>+		(u16)vlan_tag,</div><div class='add'>+		0 /* loopback */);</div><div class='add'>+</div><div class='add'>+	wmb();</div><div class='add'>+</div><div class='add'>+	vnic_wq_post(wq, os_buf, dma_addr, len, sop, eop);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void enic_queue_wq_desc_cont(struct vnic_wq *wq,</div><div class='add'>+	void *os_buf, dma_addr_t dma_addr, unsigned int len, int eop)</div><div class='add'>+{</div><div class='add'>+	enic_queue_wq_desc_ex(wq, os_buf, dma_addr, len,</div><div class='add'>+		0, 0, 0, 0, 0,</div><div class='add'>+		eop, 0 /* !SOP */, eop);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void enic_queue_wq_desc(struct vnic_wq *wq, void *os_buf,</div><div class='add'>+	dma_addr_t dma_addr, unsigned int len, int vlan_tag_insert,</div><div class='add'>+	unsigned int vlan_tag, int eop)</div><div class='add'>+{</div><div class='add'>+	enic_queue_wq_desc_ex(wq, os_buf, dma_addr, len,</div><div class='add'>+		0, 0, vlan_tag_insert, vlan_tag,</div><div class='add'>+		WQ_ENET_OFFLOAD_MODE_CSUM,</div><div class='add'>+		eop, 1 /* SOP */, eop);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void enic_queue_wq_desc_csum(struct vnic_wq *wq,</div><div class='add'>+	void *os_buf, dma_addr_t dma_addr, unsigned int len,</div><div class='add'>+	int ip_csum, int tcpudp_csum, int vlan_tag_insert,</div><div class='add'>+	unsigned int vlan_tag, int eop)</div><div class='add'>+{</div><div class='add'>+	enic_queue_wq_desc_ex(wq, os_buf, dma_addr, len,</div><div class='add'>+		(ip_csum ? 1 : 0) + (tcpudp_csum ? 2 : 0),</div><div class='add'>+		0, vlan_tag_insert, vlan_tag,</div><div class='add'>+		WQ_ENET_OFFLOAD_MODE_CSUM,</div><div class='add'>+		eop, 1 /* SOP */, eop);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void enic_queue_wq_desc_csum_l4(struct vnic_wq *wq,</div><div class='add'>+	void *os_buf, dma_addr_t dma_addr, unsigned int len,</div><div class='add'>+	unsigned int csum_offset, unsigned int hdr_len,</div><div class='add'>+	int vlan_tag_insert, unsigned int vlan_tag, int eop)</div><div class='add'>+{</div><div class='add'>+	enic_queue_wq_desc_ex(wq, os_buf, dma_addr, len,</div><div class='add'>+		csum_offset, hdr_len, vlan_tag_insert, vlan_tag,</div><div class='add'>+		WQ_ENET_OFFLOAD_MODE_CSUM_L4,</div><div class='add'>+		eop, 1 /* SOP */, eop);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void enic_queue_wq_desc_tso(struct vnic_wq *wq,</div><div class='add'>+	void *os_buf, dma_addr_t dma_addr, unsigned int len,</div><div class='add'>+	unsigned int mss, unsigned int hdr_len, int vlan_tag_insert,</div><div class='add'>+	unsigned int vlan_tag, int eop)</div><div class='add'>+{</div><div class='add'>+	enic_queue_wq_desc_ex(wq, os_buf, dma_addr, len,</div><div class='add'>+		mss, hdr_len, vlan_tag_insert, vlan_tag,</div><div class='add'>+		WQ_ENET_OFFLOAD_MODE_TSO,</div><div class='add'>+		eop, 1 /* SOP */, eop);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void enic_queue_rq_desc(struct vnic_rq *rq,</div><div class='add'>+	void *os_buf, unsigned int os_buf_index,</div><div class='add'>+	dma_addr_t dma_addr, unsigned int len)</div><div class='add'>+{</div><div class='add'>+	struct rq_enet_desc *desc = vnic_rq_next_desc(rq);</div><div class='add'>+	u8 type = os_buf_index ?</div><div class='add'>+		RQ_ENET_TYPE_NOT_SOP : RQ_ENET_TYPE_ONLY_SOP;</div><div class='add'>+</div><div class='add'>+	rq_enet_desc_enc(desc,</div><div class='add'>+		(u64)dma_addr | VNIC_PADDR_TARGET,</div><div class='add'>+		type, (u16)len);</div><div class='add'>+</div><div class='add'>+	wmb();</div><div class='add'>+</div><div class='add'>+	vnic_rq_post(rq, os_buf, os_buf_index, dma_addr, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct enic;</div><div class='add'>+</div><div class='add'>+int enic_get_vnic_config(struct enic *);</div><div class='add'>+void enic_add_station_addr(struct enic *enic);</div><div class='add'>+void enic_add_multicast_addr(struct enic *enic, u8 *addr);</div><div class='add'>+void enic_del_multicast_addr(struct enic *enic, u8 *addr);</div><div class='add'>+void enic_add_vlan(struct enic *enic, u16 vlanid);</div><div class='add'>+void enic_del_vlan(struct enic *enic, u16 vlanid);</div><div class='add'>+int enic_set_nic_cfg(struct enic *enic, u8 rss_default_cpu, u8 rss_hash_type,</div><div class='add'>+	u8 rss_hash_bits, u8 rss_base_cpu, u8 rss_enable, u8 tso_ipid_split_en,</div><div class='add'>+	u8 ig_vlan_strip_en);</div><div class='add'>+void enic_get_res_counts(struct enic *enic);</div><div class='add'>+void enic_init_vnic_resources(struct enic *enic);</div><div class='add'>+int enic_alloc_vnic_resources(struct enic *);</div><div class='add'>+void enic_free_vnic_resources(struct enic *);</div><div class='add'>+</div><div class='add'>+#endif /* _ENIC_RES_H_ */</div><div class='head'>diff --git a/drivers/net/enic/rq_enet_desc.h b/drivers/net/enic/rq_enet_desc.h<br/>new file mode 100644<br/>index 000000000000..a06e649010ce<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/enic/rq_enet_desc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/enic/rq_enet_desc.h</a></div><div class='hunk'>@@ -0,0 +1,60 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2008 Cisco Systems, Inc.  All rights reserved.</div><div class='add'>+ * Copyright 2007 Nuova Systems, Inc.  All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you may redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; version 2 of the License.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='add'>+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='add'>+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='add'>+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='add'>+ * SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _RQ_ENET_DESC_H_</div><div class='add'>+#define _RQ_ENET_DESC_H_</div><div class='add'>+</div><div class='add'>+/* Ethernet receive queue descriptor: 16B */</div><div class='add'>+struct rq_enet_desc {</div><div class='add'>+	__le64 address;</div><div class='add'>+	__le16 length_type;</div><div class='add'>+	u8 reserved[6];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum rq_enet_type_types {</div><div class='add'>+	RQ_ENET_TYPE_ONLY_SOP = 0,</div><div class='add'>+	RQ_ENET_TYPE_NOT_SOP = 1,</div><div class='add'>+	RQ_ENET_TYPE_RESV2 = 2,</div><div class='add'>+	RQ_ENET_TYPE_RESV3 = 3,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define RQ_ENET_ADDR_BITS		64</div><div class='add'>+#define RQ_ENET_LEN_BITS		14</div><div class='add'>+#define RQ_ENET_LEN_MASK		((1 &lt;&lt; RQ_ENET_LEN_BITS) - 1)</div><div class='add'>+#define RQ_ENET_TYPE_BITS		2</div><div class='add'>+#define RQ_ENET_TYPE_MASK		((1 &lt;&lt; RQ_ENET_TYPE_BITS) - 1)</div><div class='add'>+</div><div class='add'>+static inline void rq_enet_desc_enc(struct rq_enet_desc *desc,</div><div class='add'>+	u64 address, u8 type, u16 length)</div><div class='add'>+{</div><div class='add'>+	desc-&gt;address = cpu_to_le64(address);</div><div class='add'>+	desc-&gt;length_type = cpu_to_le16((length &amp; RQ_ENET_LEN_MASK) |</div><div class='add'>+		((type &amp; RQ_ENET_TYPE_MASK) &lt;&lt; RQ_ENET_LEN_BITS));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void rq_enet_desc_dec(struct rq_enet_desc *desc,</div><div class='add'>+	u64 *address, u8 *type, u16 *length)</div><div class='add'>+{</div><div class='add'>+	*address = le64_to_cpu(desc-&gt;address);</div><div class='add'>+	*length = le16_to_cpu(desc-&gt;length_type) &amp; RQ_ENET_LEN_MASK;</div><div class='add'>+	*type = (u8)((le16_to_cpu(desc-&gt;length_type) &gt;&gt; RQ_ENET_LEN_BITS) &amp;</div><div class='add'>+		RQ_ENET_TYPE_MASK);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* _RQ_ENET_DESC_H_ */</div><div class='head'>diff --git a/drivers/net/enic/vnic_cq.c b/drivers/net/enic/vnic_cq.c<br/>new file mode 100644<br/>index 000000000000..020ae6c3f3d9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/enic/vnic_cq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/enic/vnic_cq.c</a></div><div class='hunk'>@@ -0,0 +1,89 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2008 Cisco Systems, Inc.  All rights reserved.</div><div class='add'>+ * Copyright 2007 Nuova Systems, Inc.  All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you may redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; version 2 of the License.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='add'>+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='add'>+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='add'>+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='add'>+ * SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+</div><div class='add'>+#include "vnic_dev.h"</div><div class='add'>+#include "vnic_cq.h"</div><div class='add'>+</div><div class='add'>+void vnic_cq_free(struct vnic_cq *cq)</div><div class='add'>+{</div><div class='add'>+	vnic_dev_free_desc_ring(cq-&gt;vdev, &amp;cq-&gt;ring);</div><div class='add'>+</div><div class='add'>+	cq-&gt;ctrl = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int vnic_cq_alloc(struct vnic_dev *vdev, struct vnic_cq *cq, unsigned int index,</div><div class='add'>+	unsigned int desc_count, unsigned int desc_size)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	cq-&gt;index = index;</div><div class='add'>+	cq-&gt;vdev = vdev;</div><div class='add'>+</div><div class='add'>+	cq-&gt;ctrl = vnic_dev_get_res(vdev, RES_TYPE_CQ, index);</div><div class='add'>+	if (!cq-&gt;ctrl) {</div><div class='add'>+		printk(KERN_ERR "Failed to hook CQ[%d] resource\n", index);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = vnic_dev_alloc_desc_ring(vdev, &amp;cq-&gt;ring, desc_count, desc_size);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void vnic_cq_init(struct vnic_cq *cq, unsigned int flow_control_enable,</div><div class='add'>+	unsigned int color_enable, unsigned int cq_head, unsigned int cq_tail,</div><div class='add'>+	unsigned int cq_tail_color, unsigned int interrupt_enable,</div><div class='add'>+	unsigned int cq_entry_enable, unsigned int cq_message_enable,</div><div class='add'>+	unsigned int interrupt_offset, u64 cq_message_addr)</div><div class='add'>+{</div><div class='add'>+	u64 paddr;</div><div class='add'>+</div><div class='add'>+	paddr = (u64)cq-&gt;ring.base_addr | VNIC_PADDR_TARGET;</div><div class='add'>+	writeq(paddr, &amp;cq-&gt;ctrl-&gt;ring_base);</div><div class='add'>+	iowrite32(cq-&gt;ring.desc_count, &amp;cq-&gt;ctrl-&gt;ring_size);</div><div class='add'>+	iowrite32(flow_control_enable, &amp;cq-&gt;ctrl-&gt;flow_control_enable);</div><div class='add'>+	iowrite32(color_enable, &amp;cq-&gt;ctrl-&gt;color_enable);</div><div class='add'>+	iowrite32(cq_head, &amp;cq-&gt;ctrl-&gt;cq_head);</div><div class='add'>+	iowrite32(cq_tail, &amp;cq-&gt;ctrl-&gt;cq_tail);</div><div class='add'>+	iowrite32(cq_tail_color, &amp;cq-&gt;ctrl-&gt;cq_tail_color);</div><div class='add'>+	iowrite32(interrupt_enable, &amp;cq-&gt;ctrl-&gt;interrupt_enable);</div><div class='add'>+	iowrite32(cq_entry_enable, &amp;cq-&gt;ctrl-&gt;cq_entry_enable);</div><div class='add'>+	iowrite32(cq_message_enable, &amp;cq-&gt;ctrl-&gt;cq_message_enable);</div><div class='add'>+	iowrite32(interrupt_offset, &amp;cq-&gt;ctrl-&gt;interrupt_offset);</div><div class='add'>+	writeq(cq_message_addr, &amp;cq-&gt;ctrl-&gt;cq_message_addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void vnic_cq_clean(struct vnic_cq *cq)</div><div class='add'>+{</div><div class='add'>+	cq-&gt;to_clean = 0;</div><div class='add'>+	cq-&gt;last_color = 0;</div><div class='add'>+</div><div class='add'>+	iowrite32(0, &amp;cq-&gt;ctrl-&gt;cq_head);</div><div class='add'>+	iowrite32(0, &amp;cq-&gt;ctrl-&gt;cq_tail);</div><div class='add'>+	iowrite32(1, &amp;cq-&gt;ctrl-&gt;cq_tail_color);</div><div class='add'>+</div><div class='add'>+	vnic_dev_clear_desc_ring(&amp;cq-&gt;ring);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/enic/vnic_cq.h b/drivers/net/enic/vnic_cq.h<br/>new file mode 100644<br/>index 000000000000..114763cbc2f8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/enic/vnic_cq.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/enic/vnic_cq.h</a></div><div class='hunk'>@@ -0,0 +1,113 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2008 Cisco Systems, Inc.  All rights reserved.</div><div class='add'>+ * Copyright 2007 Nuova Systems, Inc.  All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you may redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; version 2 of the License.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='add'>+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='add'>+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='add'>+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='add'>+ * SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _VNIC_CQ_H_</div><div class='add'>+#define _VNIC_CQ_H_</div><div class='add'>+</div><div class='add'>+#include "cq_desc.h"</div><div class='add'>+#include "vnic_dev.h"</div><div class='add'>+</div><div class='add'>+/* Completion queue control */</div><div class='add'>+struct vnic_cq_ctrl {</div><div class='add'>+	u64 ring_base;			/* 0x00 */</div><div class='add'>+	u32 ring_size;			/* 0x08 */</div><div class='add'>+	u32 pad0;</div><div class='add'>+	u32 flow_control_enable;	/* 0x10 */</div><div class='add'>+	u32 pad1;</div><div class='add'>+	u32 color_enable;		/* 0x18 */</div><div class='add'>+	u32 pad2;</div><div class='add'>+	u32 cq_head;			/* 0x20 */</div><div class='add'>+	u32 pad3;</div><div class='add'>+	u32 cq_tail;			/* 0x28 */</div><div class='add'>+	u32 pad4;</div><div class='add'>+	u32 cq_tail_color;		/* 0x30 */</div><div class='add'>+	u32 pad5;</div><div class='add'>+	u32 interrupt_enable;		/* 0x38 */</div><div class='add'>+	u32 pad6;</div><div class='add'>+	u32 cq_entry_enable;		/* 0x40 */</div><div class='add'>+	u32 pad7;</div><div class='add'>+	u32 cq_message_enable;		/* 0x48 */</div><div class='add'>+	u32 pad8;</div><div class='add'>+	u32 interrupt_offset;		/* 0x50 */</div><div class='add'>+	u32 pad9;</div><div class='add'>+	u64 cq_message_addr;		/* 0x58 */</div><div class='add'>+	u32 pad10;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct vnic_cq {</div><div class='add'>+	unsigned int index;</div><div class='add'>+	struct vnic_dev *vdev;</div><div class='add'>+	struct vnic_cq_ctrl __iomem *ctrl;              /* memory-mapped */</div><div class='add'>+	struct vnic_dev_ring ring;</div><div class='add'>+	unsigned int to_clean;</div><div class='add'>+	unsigned int last_color;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline unsigned int vnic_cq_service(struct vnic_cq *cq,</div><div class='add'>+	unsigned int work_to_do,</div><div class='add'>+	int (*q_service)(struct vnic_dev *vdev, struct cq_desc *cq_desc,</div><div class='add'>+	u8 type, u16 q_number, u16 completed_index, void *opaque),</div><div class='add'>+	void *opaque)</div><div class='add'>+{</div><div class='add'>+	struct cq_desc *cq_desc;</div><div class='add'>+	unsigned int work_done = 0;</div><div class='add'>+	u16 q_number, completed_index;</div><div class='add'>+	u8 type, color;</div><div class='add'>+</div><div class='add'>+	cq_desc = (struct cq_desc *)((u8 *)cq-&gt;ring.descs +</div><div class='add'>+		cq-&gt;ring.desc_size * cq-&gt;to_clean);</div><div class='add'>+	cq_desc_dec(cq_desc, &amp;type, &amp;color,</div><div class='add'>+		&amp;q_number, &amp;completed_index);</div><div class='add'>+</div><div class='add'>+	while (color != cq-&gt;last_color) {</div><div class='add'>+</div><div class='add'>+		if ((*q_service)(cq-&gt;vdev, cq_desc, type,</div><div class='add'>+			q_number, completed_index, opaque))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		cq-&gt;to_clean++;</div><div class='add'>+		if (cq-&gt;to_clean == cq-&gt;ring.desc_count) {</div><div class='add'>+			cq-&gt;to_clean = 0;</div><div class='add'>+			cq-&gt;last_color = cq-&gt;last_color ? 0 : 1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		cq_desc = (struct cq_desc *)((u8 *)cq-&gt;ring.descs +</div><div class='add'>+			cq-&gt;ring.desc_size * cq-&gt;to_clean);</div><div class='add'>+		cq_desc_dec(cq_desc, &amp;type, &amp;color,</div><div class='add'>+			&amp;q_number, &amp;completed_index);</div><div class='add'>+</div><div class='add'>+		work_done++;</div><div class='add'>+		if (work_done &gt;= work_to_do)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return work_done;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void vnic_cq_free(struct vnic_cq *cq);</div><div class='add'>+int vnic_cq_alloc(struct vnic_dev *vdev, struct vnic_cq *cq, unsigned int index,</div><div class='add'>+	unsigned int desc_count, unsigned int desc_size);</div><div class='add'>+void vnic_cq_init(struct vnic_cq *cq, unsigned int flow_control_enable,</div><div class='add'>+	unsigned int color_enable, unsigned int cq_head, unsigned int cq_tail,</div><div class='add'>+	unsigned int cq_tail_color, unsigned int interrupt_enable,</div><div class='add'>+	unsigned int cq_entry_enable, unsigned int message_enable,</div><div class='add'>+	unsigned int interrupt_offset, u64 message_addr);</div><div class='add'>+void vnic_cq_clean(struct vnic_cq *cq);</div><div class='add'>+</div><div class='add'>+#endif /* _VNIC_CQ_H_ */</div><div class='head'>diff --git a/drivers/net/enic/vnic_dev.c b/drivers/net/enic/vnic_dev.c<br/>new file mode 100644<br/>index 000000000000..4d104f5c30f9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/enic/vnic_dev.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/enic/vnic_dev.c</a></div><div class='hunk'>@@ -0,0 +1,674 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2008 Cisco Systems, Inc.  All rights reserved.</div><div class='add'>+ * Copyright 2007 Nuova Systems, Inc.  All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you may redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; version 2 of the License.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='add'>+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='add'>+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='add'>+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='add'>+ * SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/if_ether.h&gt;</div><div class='add'>+</div><div class='add'>+#include "vnic_resource.h"</div><div class='add'>+#include "vnic_devcmd.h"</div><div class='add'>+#include "vnic_dev.h"</div><div class='add'>+#include "vnic_stats.h"</div><div class='add'>+</div><div class='add'>+struct vnic_res {</div><div class='add'>+	void __iomem *vaddr;</div><div class='add'>+	unsigned int count;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct vnic_dev {</div><div class='add'>+	void *priv;</div><div class='add'>+	struct pci_dev *pdev;</div><div class='add'>+	struct vnic_res res[RES_TYPE_MAX];</div><div class='add'>+	enum vnic_dev_intr_mode intr_mode;</div><div class='add'>+	struct vnic_devcmd __iomem *devcmd;</div><div class='add'>+	struct vnic_devcmd_notify *notify;</div><div class='add'>+	struct vnic_devcmd_notify notify_copy;</div><div class='add'>+	dma_addr_t notify_pa;</div><div class='add'>+	u32 *linkstatus;</div><div class='add'>+	dma_addr_t linkstatus_pa;</div><div class='add'>+	struct vnic_stats *stats;</div><div class='add'>+	dma_addr_t stats_pa;</div><div class='add'>+	struct vnic_devcmd_fw_info *fw_info;</div><div class='add'>+	dma_addr_t fw_info_pa;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define VNIC_MAX_RES_HDR_SIZE \</div><div class='add'>+	(sizeof(struct vnic_resource_header) + \</div><div class='add'>+	sizeof(struct vnic_resource) * RES_TYPE_MAX)</div><div class='add'>+#define VNIC_RES_STRIDE	128</div><div class='add'>+</div><div class='add'>+void *vnic_dev_priv(struct vnic_dev *vdev)</div><div class='add'>+{</div><div class='add'>+	return vdev-&gt;priv;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vnic_dev_discover_res(struct vnic_dev *vdev,</div><div class='add'>+	struct vnic_dev_bar *bar)</div><div class='add'>+{</div><div class='add'>+	struct vnic_resource_header __iomem *rh;</div><div class='add'>+	struct vnic_resource __iomem *r;</div><div class='add'>+	u8 type;</div><div class='add'>+</div><div class='add'>+	if (bar-&gt;len &lt; VNIC_MAX_RES_HDR_SIZE) {</div><div class='add'>+		printk(KERN_ERR "vNIC BAR0 res hdr length error\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rh = bar-&gt;vaddr;</div><div class='add'>+	if (!rh) {</div><div class='add'>+		printk(KERN_ERR "vNIC BAR0 res hdr not mem-mapped\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ioread32(&amp;rh-&gt;magic) != VNIC_RES_MAGIC ||</div><div class='add'>+	    ioread32(&amp;rh-&gt;version) != VNIC_RES_VERSION) {</div><div class='add'>+		printk(KERN_ERR "vNIC BAR0 res magic/version error "</div><div class='add'>+			"exp (%lx/%lx) curr (%x/%x)\n",</div><div class='add'>+			VNIC_RES_MAGIC, VNIC_RES_VERSION,</div><div class='add'>+			ioread32(&amp;rh-&gt;magic), ioread32(&amp;rh-&gt;version));</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	r = (struct vnic_resource __iomem *)(rh + 1);</div><div class='add'>+</div><div class='add'>+	while ((type = ioread8(&amp;r-&gt;type)) != RES_TYPE_EOL) {</div><div class='add'>+</div><div class='add'>+		u8 bar_num = ioread8(&amp;r-&gt;bar);</div><div class='add'>+		u32 bar_offset = ioread32(&amp;r-&gt;bar_offset);</div><div class='add'>+		u32 count = ioread32(&amp;r-&gt;count);</div><div class='add'>+		u32 len;</div><div class='add'>+</div><div class='add'>+		r++;</div><div class='add'>+</div><div class='add'>+		if (bar_num != 0)  /* only mapping in BAR0 resources */</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		switch (type) {</div><div class='add'>+		case RES_TYPE_WQ:</div><div class='add'>+		case RES_TYPE_RQ:</div><div class='add'>+		case RES_TYPE_CQ:</div><div class='add'>+		case RES_TYPE_INTR_CTRL:</div><div class='add'>+			/* each count is stride bytes long */</div><div class='add'>+			len = count * VNIC_RES_STRIDE;</div><div class='add'>+			if (len + bar_offset &gt; bar-&gt;len) {</div><div class='add'>+				printk(KERN_ERR "vNIC BAR0 resource %d "</div><div class='add'>+					"out-of-bounds, offset 0x%x + "</div><div class='add'>+					"size 0x%x &gt; bar len 0x%lx\n",</div><div class='add'>+					type, bar_offset,</div><div class='add'>+					len,</div><div class='add'>+					bar-&gt;len);</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		case RES_TYPE_INTR_PBA_LEGACY:</div><div class='add'>+		case RES_TYPE_DEVCMD:</div><div class='add'>+			len = count;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		vdev-&gt;res[type].count = count;</div><div class='add'>+		vdev-&gt;res[type].vaddr = (char __iomem *)bar-&gt;vaddr + bar_offset;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+unsigned int vnic_dev_get_res_count(struct vnic_dev *vdev,</div><div class='add'>+	enum vnic_res_type type)</div><div class='add'>+{</div><div class='add'>+	return vdev-&gt;res[type].count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __iomem *vnic_dev_get_res(struct vnic_dev *vdev, enum vnic_res_type type,</div><div class='add'>+	unsigned int index)</div><div class='add'>+{</div><div class='add'>+	if (!vdev-&gt;res[type].vaddr)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	switch (type) {</div><div class='add'>+	case RES_TYPE_WQ:</div><div class='add'>+	case RES_TYPE_RQ:</div><div class='add'>+	case RES_TYPE_CQ:</div><div class='add'>+	case RES_TYPE_INTR_CTRL:</div><div class='add'>+		return (char __iomem *)vdev-&gt;res[type].vaddr +</div><div class='add'>+			index * VNIC_RES_STRIDE;</div><div class='add'>+	default:</div><div class='add'>+		return (char __iomem *)vdev-&gt;res[type].vaddr;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+unsigned int vnic_dev_desc_ring_size(struct vnic_dev_ring *ring,</div><div class='add'>+	unsigned int desc_count, unsigned int desc_size)</div><div class='add'>+{</div><div class='add'>+	/* The base address of the desc rings must be 512 byte aligned.</div><div class='add'>+	 * Descriptor count is aligned to groups of 32 descriptors.  A</div><div class='add'>+	 * count of 0 means the maximum 4096 descriptors.  Descriptor</div><div class='add'>+	 * size is aligned to 16 bytes.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	unsigned int count_align = 32;</div><div class='add'>+	unsigned int desc_align = 16;</div><div class='add'>+</div><div class='add'>+	ring-&gt;base_align = 512;</div><div class='add'>+</div><div class='add'>+	if (desc_count == 0)</div><div class='add'>+		desc_count = 4096;</div><div class='add'>+</div><div class='add'>+	ring-&gt;desc_count = ALIGN(desc_count, count_align);</div><div class='add'>+</div><div class='add'>+	ring-&gt;desc_size = ALIGN(desc_size, desc_align);</div><div class='add'>+</div><div class='add'>+	ring-&gt;size = ring-&gt;desc_count * ring-&gt;desc_size;</div><div class='add'>+	ring-&gt;size_unaligned = ring-&gt;size + ring-&gt;base_align;</div><div class='add'>+</div><div class='add'>+	return ring-&gt;size_unaligned;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void vnic_dev_clear_desc_ring(struct vnic_dev_ring *ring)</div><div class='add'>+{</div><div class='add'>+	memset(ring-&gt;descs, 0, ring-&gt;size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int vnic_dev_alloc_desc_ring(struct vnic_dev *vdev, struct vnic_dev_ring *ring,</div><div class='add'>+	unsigned int desc_count, unsigned int desc_size)</div><div class='add'>+{</div><div class='add'>+	vnic_dev_desc_ring_size(ring, desc_count, desc_size);</div><div class='add'>+</div><div class='add'>+	ring-&gt;descs_unaligned = pci_alloc_consistent(vdev-&gt;pdev,</div><div class='add'>+		ring-&gt;size_unaligned,</div><div class='add'>+		&amp;ring-&gt;base_addr_unaligned);</div><div class='add'>+</div><div class='add'>+	if (!ring-&gt;descs_unaligned) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		  "Failed to allocate ring (size=%d), aborting\n",</div><div class='add'>+			(int)ring-&gt;size);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ring-&gt;base_addr = ALIGN(ring-&gt;base_addr_unaligned,</div><div class='add'>+		ring-&gt;base_align);</div><div class='add'>+	ring-&gt;descs = (u8 *)ring-&gt;descs_unaligned +</div><div class='add'>+		(ring-&gt;base_addr - ring-&gt;base_addr_unaligned);</div><div class='add'>+</div><div class='add'>+	vnic_dev_clear_desc_ring(ring);</div><div class='add'>+</div><div class='add'>+	ring-&gt;desc_avail = ring-&gt;desc_count - 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void vnic_dev_free_desc_ring(struct vnic_dev *vdev, struct vnic_dev_ring *ring)</div><div class='add'>+{</div><div class='add'>+	if (ring-&gt;descs) {</div><div class='add'>+		pci_free_consistent(vdev-&gt;pdev,</div><div class='add'>+			ring-&gt;size_unaligned,</div><div class='add'>+			ring-&gt;descs_unaligned,</div><div class='add'>+			ring-&gt;base_addr_unaligned);</div><div class='add'>+		ring-&gt;descs = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int vnic_dev_cmd(struct vnic_dev *vdev, enum vnic_devcmd_cmd cmd,</div><div class='add'>+	u64 *a0, u64 *a1, int wait)</div><div class='add'>+{</div><div class='add'>+	struct vnic_devcmd __iomem *devcmd = vdev-&gt;devcmd;</div><div class='add'>+	int delay;</div><div class='add'>+	u32 status;</div><div class='add'>+	int dev_cmd_err[] = {</div><div class='add'>+		/* convert from fw's version of error.h to host's version */</div><div class='add'>+		0,	/* ERR_SUCCESS */</div><div class='add'>+		EINVAL,	/* ERR_EINVAL */</div><div class='add'>+		EFAULT,	/* ERR_EFAULT */</div><div class='add'>+		EPERM,	/* ERR_EPERM */</div><div class='add'>+		EBUSY,  /* ERR_EBUSY */</div><div class='add'>+	};</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	status = ioread32(&amp;devcmd-&gt;status);</div><div class='add'>+	if (status &amp; STAT_BUSY) {</div><div class='add'>+		printk(KERN_ERR "Busy devcmd %d\n", _CMD_N(cmd));</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (_CMD_DIR(cmd) &amp; _CMD_DIR_WRITE) {</div><div class='add'>+		writeq(*a0, &amp;devcmd-&gt;args[0]);</div><div class='add'>+		writeq(*a1, &amp;devcmd-&gt;args[1]);</div><div class='add'>+		wmb();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iowrite32(cmd, &amp;devcmd-&gt;cmd);</div><div class='add'>+</div><div class='add'>+	if ((_CMD_FLAGS(cmd) &amp; _CMD_FLAGS_NOWAIT))</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+	for (delay = 0; delay &lt; wait; delay++) {</div><div class='add'>+</div><div class='add'>+		udelay(100);</div><div class='add'>+</div><div class='add'>+		status = ioread32(&amp;devcmd-&gt;status);</div><div class='add'>+		if (!(status &amp; STAT_BUSY)) {</div><div class='add'>+</div><div class='add'>+			if (status &amp; STAT_ERROR) {</div><div class='add'>+				err = dev_cmd_err[(int)readq(&amp;devcmd-&gt;args[0])];</div><div class='add'>+				printk(KERN_ERR "Error %d devcmd %d\n",</div><div class='add'>+					err, _CMD_N(cmd));</div><div class='add'>+				return -err;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (_CMD_DIR(cmd) &amp; _CMD_DIR_READ) {</div><div class='add'>+				rmb();</div><div class='add'>+				*a0 = readq(&amp;devcmd-&gt;args[0]);</div><div class='add'>+				*a1 = readq(&amp;devcmd-&gt;args[1]);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	printk(KERN_ERR "Timedout devcmd %d\n", _CMD_N(cmd));</div><div class='add'>+	return -ETIMEDOUT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int vnic_dev_fw_info(struct vnic_dev *vdev,</div><div class='add'>+	struct vnic_devcmd_fw_info **fw_info)</div><div class='add'>+{</div><div class='add'>+	u64 a0, a1 = 0;</div><div class='add'>+	int wait = 1000;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (!vdev-&gt;fw_info) {</div><div class='add'>+		vdev-&gt;fw_info = pci_alloc_consistent(vdev-&gt;pdev,</div><div class='add'>+			sizeof(struct vnic_devcmd_fw_info),</div><div class='add'>+			&amp;vdev-&gt;fw_info_pa);</div><div class='add'>+		if (!vdev-&gt;fw_info)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		a0 = vdev-&gt;fw_info_pa;</div><div class='add'>+</div><div class='add'>+		/* only get fw_info once and cache it */</div><div class='add'>+		err = vnic_dev_cmd(vdev, CMD_MCPU_FW_INFO, &amp;a0, &amp;a1, wait);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*fw_info = vdev-&gt;fw_info;</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int vnic_dev_spec(struct vnic_dev *vdev, unsigned int offset, unsigned int size,</div><div class='add'>+	void *value)</div><div class='add'>+{</div><div class='add'>+	u64 a0, a1;</div><div class='add'>+	int wait = 1000;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	a0 = offset;</div><div class='add'>+	a1 = size;</div><div class='add'>+</div><div class='add'>+	err = vnic_dev_cmd(vdev, CMD_DEV_SPEC, &amp;a0, &amp;a1, wait);</div><div class='add'>+</div><div class='add'>+	switch (size) {</div><div class='add'>+	case 1: *(u8 *)value = (u8)a0; break;</div><div class='add'>+	case 2: *(u16 *)value = (u16)a0; break;</div><div class='add'>+	case 4: *(u32 *)value = (u32)a0; break;</div><div class='add'>+	case 8: *(u64 *)value = a0; break;</div><div class='add'>+	default: BUG(); break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int vnic_dev_stats_clear(struct vnic_dev *vdev)</div><div class='add'>+{</div><div class='add'>+	u64 a0 = 0, a1 = 0;</div><div class='add'>+	int wait = 1000;</div><div class='add'>+	return vnic_dev_cmd(vdev, CMD_STATS_CLEAR, &amp;a0, &amp;a1, wait);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int vnic_dev_stats_dump(struct vnic_dev *vdev, struct vnic_stats **stats)</div><div class='add'>+{</div><div class='add'>+	u64 a0, a1;</div><div class='add'>+	int wait = 1000;</div><div class='add'>+</div><div class='add'>+	if (!vdev-&gt;stats) {</div><div class='add'>+		vdev-&gt;stats = pci_alloc_consistent(vdev-&gt;pdev,</div><div class='add'>+			sizeof(struct vnic_stats), &amp;vdev-&gt;stats_pa);</div><div class='add'>+		if (!vdev-&gt;stats)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*stats = vdev-&gt;stats;</div><div class='add'>+	a0 = vdev-&gt;stats_pa;</div><div class='add'>+	a1 = sizeof(struct vnic_stats);</div><div class='add'>+</div><div class='add'>+	return vnic_dev_cmd(vdev, CMD_STATS_DUMP, &amp;a0, &amp;a1, wait);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int vnic_dev_close(struct vnic_dev *vdev)</div><div class='add'>+{</div><div class='add'>+	u64 a0 = 0, a1 = 0;</div><div class='add'>+	int wait = 1000;</div><div class='add'>+	return vnic_dev_cmd(vdev, CMD_CLOSE, &amp;a0, &amp;a1, wait);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int vnic_dev_enable(struct vnic_dev *vdev)</div><div class='add'>+{</div><div class='add'>+	u64 a0 = 0, a1 = 0;</div><div class='add'>+	int wait = 1000;</div><div class='add'>+	return vnic_dev_cmd(vdev, CMD_ENABLE, &amp;a0, &amp;a1, wait);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int vnic_dev_disable(struct vnic_dev *vdev)</div><div class='add'>+{</div><div class='add'>+	u64 a0 = 0, a1 = 0;</div><div class='add'>+	int wait = 1000;</div><div class='add'>+	return vnic_dev_cmd(vdev, CMD_DISABLE, &amp;a0, &amp;a1, wait);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int vnic_dev_open(struct vnic_dev *vdev, int arg)</div><div class='add'>+{</div><div class='add'>+	u64 a0 = (u32)arg, a1 = 0;</div><div class='add'>+	int wait = 1000;</div><div class='add'>+	return vnic_dev_cmd(vdev, CMD_OPEN, &amp;a0, &amp;a1, wait);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int vnic_dev_open_done(struct vnic_dev *vdev, int *done)</div><div class='add'>+{</div><div class='add'>+	u64 a0 = 0, a1 = 0;</div><div class='add'>+	int wait = 1000;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	*done = 0;</div><div class='add'>+</div><div class='add'>+	err = vnic_dev_cmd(vdev, CMD_OPEN_STATUS, &amp;a0, &amp;a1, wait);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	*done = (a0 == 0);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int vnic_dev_soft_reset(struct vnic_dev *vdev, int arg)</div><div class='add'>+{</div><div class='add'>+	u64 a0 = (u32)arg, a1 = 0;</div><div class='add'>+	int wait = 1000;</div><div class='add'>+	return vnic_dev_cmd(vdev, CMD_SOFT_RESET, &amp;a0, &amp;a1, wait);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int vnic_dev_soft_reset_done(struct vnic_dev *vdev, int *done)</div><div class='add'>+{</div><div class='add'>+	u64 a0 = 0, a1 = 0;</div><div class='add'>+	int wait = 1000;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	*done = 0;</div><div class='add'>+</div><div class='add'>+	err = vnic_dev_cmd(vdev, CMD_SOFT_RESET_STATUS, &amp;a0, &amp;a1, wait);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	*done = (a0 == 0);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int vnic_dev_hang_notify(struct vnic_dev *vdev)</div><div class='add'>+{</div><div class='add'>+	u64 a0, a1;</div><div class='add'>+	int wait = 1000;</div><div class='add'>+	return vnic_dev_cmd(vdev, CMD_HANG_NOTIFY, &amp;a0, &amp;a1, wait);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int vnic_dev_mac_addr(struct vnic_dev *vdev, u8 *mac_addr)</div><div class='add'>+{</div><div class='add'>+	u64 a0, a1;</div><div class='add'>+	int wait = 1000;</div><div class='add'>+	int err, i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ETH_ALEN; i++)</div><div class='add'>+		mac_addr[i] = 0;</div><div class='add'>+</div><div class='add'>+	err = vnic_dev_cmd(vdev, CMD_MAC_ADDR, &amp;a0, &amp;a1, wait);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ETH_ALEN; i++)</div><div class='add'>+		mac_addr[i] = ((u8 *)&amp;a0)[i];</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void vnic_dev_packet_filter(struct vnic_dev *vdev, int directed, int multicast,</div><div class='add'>+	int broadcast, int promisc, int allmulti)</div><div class='add'>+{</div><div class='add'>+	u64 a0, a1 = 0;</div><div class='add'>+	int wait = 1000;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	a0 = (directed ? CMD_PFILTER_DIRECTED : 0) |</div><div class='add'>+	     (multicast ? CMD_PFILTER_MULTICAST : 0) |</div><div class='add'>+	     (broadcast ? CMD_PFILTER_BROADCAST : 0) |</div><div class='add'>+	     (promisc ? CMD_PFILTER_PROMISCUOUS : 0) |</div><div class='add'>+	     (allmulti ? CMD_PFILTER_ALL_MULTICAST : 0);</div><div class='add'>+</div><div class='add'>+	err = vnic_dev_cmd(vdev, CMD_PACKET_FILTER, &amp;a0, &amp;a1, wait);</div><div class='add'>+	if (err)</div><div class='add'>+		printk(KERN_ERR "Can't set packet filter\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void vnic_dev_add_addr(struct vnic_dev *vdev, u8 *addr)</div><div class='add'>+{</div><div class='add'>+	u64 a0 = 0, a1 = 0;</div><div class='add'>+	int wait = 1000;</div><div class='add'>+	int err;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ETH_ALEN; i++)</div><div class='add'>+		((u8 *)&amp;a0)[i] = addr[i];</div><div class='add'>+</div><div class='add'>+	err = vnic_dev_cmd(vdev, CMD_ADDR_ADD, &amp;a0, &amp;a1, wait);</div><div class='add'>+	if (err)</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+			"Can't add addr [%02x:%02x:%02x:%02x:%02x:%02x], %d\n",</div><div class='add'>+			addr[0], addr[1], addr[2], addr[3], addr[4], addr[5],</div><div class='add'>+			err);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void vnic_dev_del_addr(struct vnic_dev *vdev, u8 *addr)</div><div class='add'>+{</div><div class='add'>+	u64 a0 = 0, a1 = 0;</div><div class='add'>+	int wait = 1000;</div><div class='add'>+	int err;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ETH_ALEN; i++)</div><div class='add'>+		((u8 *)&amp;a0)[i] = addr[i];</div><div class='add'>+</div><div class='add'>+	err = vnic_dev_cmd(vdev, CMD_ADDR_DEL, &amp;a0, &amp;a1, wait);</div><div class='add'>+	if (err)</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+			"Can't del addr [%02x:%02x:%02x:%02x:%02x:%02x], %d\n",</div><div class='add'>+			addr[0], addr[1], addr[2], addr[3], addr[4], addr[5],</div><div class='add'>+			err);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int vnic_dev_notify_set(struct vnic_dev *vdev, u16 intr)</div><div class='add'>+{</div><div class='add'>+	u64 a0, a1;</div><div class='add'>+	int wait = 1000;</div><div class='add'>+</div><div class='add'>+	if (!vdev-&gt;notify) {</div><div class='add'>+		vdev-&gt;notify = pci_alloc_consistent(vdev-&gt;pdev,</div><div class='add'>+			sizeof(struct vnic_devcmd_notify),</div><div class='add'>+			&amp;vdev-&gt;notify_pa);</div><div class='add'>+		if (!vdev-&gt;notify)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	a0 = vdev-&gt;notify_pa;</div><div class='add'>+	a1 = ((u64)intr &lt;&lt; 32) &amp; 0x0000ffff00000000ULL;</div><div class='add'>+	a1 += sizeof(struct vnic_devcmd_notify);</div><div class='add'>+</div><div class='add'>+	return vnic_dev_cmd(vdev, CMD_NOTIFY, &amp;a0, &amp;a1, wait);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void vnic_dev_notify_unset(struct vnic_dev *vdev)</div><div class='add'>+{</div><div class='add'>+	u64 a0, a1;</div><div class='add'>+	int wait = 1000;</div><div class='add'>+</div><div class='add'>+	a0 = 0;  /* paddr = 0 to unset notify buffer */</div><div class='add'>+	a1 = 0x0000ffff00000000ULL; /* intr num = -1 to unreg for intr */</div><div class='add'>+	a1 += sizeof(struct vnic_devcmd_notify);</div><div class='add'>+</div><div class='add'>+	vnic_dev_cmd(vdev, CMD_NOTIFY, &amp;a0, &amp;a1, wait);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vnic_dev_notify_ready(struct vnic_dev *vdev)</div><div class='add'>+{</div><div class='add'>+	u32 *words;</div><div class='add'>+	unsigned int nwords = sizeof(struct vnic_devcmd_notify) / 4;</div><div class='add'>+	unsigned int i;</div><div class='add'>+	u32 csum;</div><div class='add'>+</div><div class='add'>+	if (!vdev-&gt;notify)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		csum = 0;</div><div class='add'>+		memcpy(&amp;vdev-&gt;notify_copy, vdev-&gt;notify,</div><div class='add'>+			sizeof(struct vnic_devcmd_notify));</div><div class='add'>+		words = (u32 *)&amp;vdev-&gt;notify_copy;</div><div class='add'>+		for (i = 1; i &lt; nwords; i++)</div><div class='add'>+			csum += words[i];</div><div class='add'>+	} while (csum != words[0]);</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int vnic_dev_init(struct vnic_dev *vdev, int arg)</div><div class='add'>+{</div><div class='add'>+	u64 a0 = (u32)arg, a1 = 0;</div><div class='add'>+	int wait = 1000;</div><div class='add'>+	return vnic_dev_cmd(vdev, CMD_INIT, &amp;a0, &amp;a1, wait);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int vnic_dev_link_status(struct vnic_dev *vdev)</div><div class='add'>+{</div><div class='add'>+	if (vdev-&gt;linkstatus)</div><div class='add'>+		return *vdev-&gt;linkstatus;</div><div class='add'>+</div><div class='add'>+	if (!vnic_dev_notify_ready(vdev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return vdev-&gt;notify_copy.link_state;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 vnic_dev_port_speed(struct vnic_dev *vdev)</div><div class='add'>+{</div><div class='add'>+	if (!vnic_dev_notify_ready(vdev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return vdev-&gt;notify_copy.port_speed;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 vnic_dev_msg_lvl(struct vnic_dev *vdev)</div><div class='add'>+{</div><div class='add'>+	if (!vnic_dev_notify_ready(vdev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return vdev-&gt;notify_copy.msglvl;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 vnic_dev_mtu(struct vnic_dev *vdev)</div><div class='add'>+{</div><div class='add'>+	if (!vnic_dev_notify_ready(vdev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return vdev-&gt;notify_copy.mtu;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void vnic_dev_set_intr_mode(struct vnic_dev *vdev,</div><div class='add'>+	enum vnic_dev_intr_mode intr_mode)</div><div class='add'>+{</div><div class='add'>+	vdev-&gt;intr_mode = intr_mode;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+enum vnic_dev_intr_mode vnic_dev_get_intr_mode(</div><div class='add'>+	struct vnic_dev *vdev)</div><div class='add'>+{</div><div class='add'>+	return vdev-&gt;intr_mode;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void vnic_dev_unregister(struct vnic_dev *vdev)</div><div class='add'>+{</div><div class='add'>+	if (vdev) {</div><div class='add'>+		if (vdev-&gt;notify)</div><div class='add'>+			pci_free_consistent(vdev-&gt;pdev,</div><div class='add'>+				sizeof(struct vnic_devcmd_notify),</div><div class='add'>+				vdev-&gt;notify,</div><div class='add'>+				vdev-&gt;notify_pa);</div><div class='add'>+		if (vdev-&gt;linkstatus)</div><div class='add'>+			pci_free_consistent(vdev-&gt;pdev,</div><div class='add'>+				sizeof(u32),</div><div class='add'>+				vdev-&gt;linkstatus,</div><div class='add'>+				vdev-&gt;linkstatus_pa);</div><div class='add'>+		if (vdev-&gt;stats)</div><div class='add'>+			pci_free_consistent(vdev-&gt;pdev,</div><div class='add'>+				sizeof(struct vnic_dev),</div><div class='add'>+				vdev-&gt;stats, vdev-&gt;stats_pa);</div><div class='add'>+		if (vdev-&gt;fw_info)</div><div class='add'>+			pci_free_consistent(vdev-&gt;pdev,</div><div class='add'>+				sizeof(struct vnic_devcmd_fw_info),</div><div class='add'>+				vdev-&gt;fw_info, vdev-&gt;fw_info_pa);</div><div class='add'>+		kfree(vdev);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct vnic_dev *vnic_dev_register(struct vnic_dev *vdev,</div><div class='add'>+	void *priv, struct pci_dev *pdev, struct vnic_dev_bar *bar)</div><div class='add'>+{</div><div class='add'>+	if (!vdev) {</div><div class='add'>+		vdev = kzalloc(sizeof(struct vnic_dev), GFP_ATOMIC);</div><div class='add'>+		if (!vdev)</div><div class='add'>+			return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	vdev-&gt;priv = priv;</div><div class='add'>+	vdev-&gt;pdev = pdev;</div><div class='add'>+</div><div class='add'>+	if (vnic_dev_discover_res(vdev, bar))</div><div class='add'>+		goto err_out;</div><div class='add'>+</div><div class='add'>+	vdev-&gt;devcmd = vnic_dev_get_res(vdev, RES_TYPE_DEVCMD, 0);</div><div class='add'>+	if (!vdev-&gt;devcmd)</div><div class='add'>+		goto err_out;</div><div class='add'>+</div><div class='add'>+	return vdev;</div><div class='add'>+</div><div class='add'>+err_out:</div><div class='add'>+	vnic_dev_unregister(vdev);</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='head'>diff --git a/drivers/net/enic/vnic_dev.h b/drivers/net/enic/vnic_dev.h<br/>new file mode 100644<br/>index 000000000000..b9dc1821c805<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/enic/vnic_dev.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/enic/vnic_dev.h</a></div><div class='hunk'>@@ -0,0 +1,120 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2008 Cisco Systems, Inc.  All rights reserved.</div><div class='add'>+ * Copyright 2007 Nuova Systems, Inc.  All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you may redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; version 2 of the License.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='add'>+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='add'>+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='add'>+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='add'>+ * SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _VNIC_DEV_H_</div><div class='add'>+#define _VNIC_DEV_H_</div><div class='add'>+</div><div class='add'>+#include "vnic_resource.h"</div><div class='add'>+#include "vnic_devcmd.h"</div><div class='add'>+</div><div class='add'>+#ifndef VNIC_PADDR_TARGET</div><div class='add'>+#define VNIC_PADDR_TARGET	0x0000000000000000ULL</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef readq</div><div class='add'>+static inline u64 readq(void __iomem *reg)</div><div class='add'>+{</div><div class='add'>+	return (((u64)readl(reg + 0x4UL) &lt;&lt; 32) |</div><div class='add'>+		(u64)readl(reg));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void writeq(u64 val, void __iomem *reg)</div><div class='add'>+{</div><div class='add'>+	writel(val &amp; 0xffffffff, reg);</div><div class='add'>+	writel(val &gt;&gt; 32, reg + 0x4UL);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+enum vnic_dev_intr_mode {</div><div class='add'>+	VNIC_DEV_INTR_MODE_UNKNOWN,</div><div class='add'>+	VNIC_DEV_INTR_MODE_INTX,</div><div class='add'>+	VNIC_DEV_INTR_MODE_MSI,</div><div class='add'>+	VNIC_DEV_INTR_MODE_MSIX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct vnic_dev_bar {</div><div class='add'>+	void __iomem *vaddr;</div><div class='add'>+	dma_addr_t bus_addr;</div><div class='add'>+	unsigned long len;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct vnic_dev_ring {</div><div class='add'>+	void *descs;</div><div class='add'>+	size_t size;</div><div class='add'>+	dma_addr_t base_addr;</div><div class='add'>+	size_t base_align;</div><div class='add'>+	void *descs_unaligned;</div><div class='add'>+	size_t size_unaligned;</div><div class='add'>+	dma_addr_t base_addr_unaligned;</div><div class='add'>+	unsigned int desc_size;</div><div class='add'>+	unsigned int desc_count;</div><div class='add'>+	unsigned int desc_avail;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct vnic_dev;</div><div class='add'>+struct vnic_stats;</div><div class='add'>+</div><div class='add'>+void *vnic_dev_priv(struct vnic_dev *vdev);</div><div class='add'>+unsigned int vnic_dev_get_res_count(struct vnic_dev *vdev,</div><div class='add'>+	enum vnic_res_type type);</div><div class='add'>+void __iomem *vnic_dev_get_res(struct vnic_dev *vdev, enum vnic_res_type type,</div><div class='add'>+	unsigned int index);</div><div class='add'>+unsigned int vnic_dev_desc_ring_size(struct vnic_dev_ring *ring,</div><div class='add'>+	unsigned int desc_count, unsigned int desc_size);</div><div class='add'>+void vnic_dev_clear_desc_ring(struct vnic_dev_ring *ring);</div><div class='add'>+int vnic_dev_alloc_desc_ring(struct vnic_dev *vdev, struct vnic_dev_ring *ring,</div><div class='add'>+	unsigned int desc_count, unsigned int desc_size);</div><div class='add'>+void vnic_dev_free_desc_ring(struct vnic_dev *vdev,</div><div class='add'>+	struct vnic_dev_ring *ring);</div><div class='add'>+int vnic_dev_cmd(struct vnic_dev *vdev, enum vnic_devcmd_cmd cmd,</div><div class='add'>+	u64 *a0, u64 *a1, int wait);</div><div class='add'>+int vnic_dev_fw_info(struct vnic_dev *vdev,</div><div class='add'>+	struct vnic_devcmd_fw_info **fw_info);</div><div class='add'>+int vnic_dev_spec(struct vnic_dev *vdev, unsigned int offset, unsigned int size,</div><div class='add'>+	void *value);</div><div class='add'>+int vnic_dev_stats_clear(struct vnic_dev *vdev);</div><div class='add'>+int vnic_dev_stats_dump(struct vnic_dev *vdev, struct vnic_stats **stats);</div><div class='add'>+int vnic_dev_hang_notify(struct vnic_dev *vdev);</div><div class='add'>+void vnic_dev_packet_filter(struct vnic_dev *vdev, int directed, int multicast,</div><div class='add'>+	int broadcast, int promisc, int allmulti);</div><div class='add'>+void vnic_dev_add_addr(struct vnic_dev *vdev, u8 *addr);</div><div class='add'>+void vnic_dev_del_addr(struct vnic_dev *vdev, u8 *addr);</div><div class='add'>+int vnic_dev_mac_addr(struct vnic_dev *vdev, u8 *mac_addr);</div><div class='add'>+int vnic_dev_notify_set(struct vnic_dev *vdev, u16 intr);</div><div class='add'>+void vnic_dev_notify_unset(struct vnic_dev *vdev);</div><div class='add'>+int vnic_dev_link_status(struct vnic_dev *vdev);</div><div class='add'>+u32 vnic_dev_port_speed(struct vnic_dev *vdev);</div><div class='add'>+u32 vnic_dev_msg_lvl(struct vnic_dev *vdev);</div><div class='add'>+u32 vnic_dev_mtu(struct vnic_dev *vdev);</div><div class='add'>+int vnic_dev_close(struct vnic_dev *vdev);</div><div class='add'>+int vnic_dev_enable(struct vnic_dev *vdev);</div><div class='add'>+int vnic_dev_disable(struct vnic_dev *vdev);</div><div class='add'>+int vnic_dev_open(struct vnic_dev *vdev, int arg);</div><div class='add'>+int vnic_dev_open_done(struct vnic_dev *vdev, int *done);</div><div class='add'>+int vnic_dev_init(struct vnic_dev *vdev, int arg);</div><div class='add'>+int vnic_dev_soft_reset(struct vnic_dev *vdev, int arg);</div><div class='add'>+int vnic_dev_soft_reset_done(struct vnic_dev *vdev, int *done);</div><div class='add'>+void vnic_dev_set_intr_mode(struct vnic_dev *vdev,</div><div class='add'>+	enum vnic_dev_intr_mode intr_mode);</div><div class='add'>+enum vnic_dev_intr_mode vnic_dev_get_intr_mode(struct vnic_dev *vdev);</div><div class='add'>+void vnic_dev_unregister(struct vnic_dev *vdev);</div><div class='add'>+struct vnic_dev *vnic_dev_register(struct vnic_dev *vdev,</div><div class='add'>+	void *priv, struct pci_dev *pdev, struct vnic_dev_bar *bar);</div><div class='add'>+</div><div class='add'>+#endif /* _VNIC_DEV_H_ */</div><div class='head'>diff --git a/drivers/net/enic/vnic_devcmd.h b/drivers/net/enic/vnic_devcmd.h<br/>new file mode 100644<br/>index 000000000000..d8617a3373b1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/enic/vnic_devcmd.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/enic/vnic_devcmd.h</a></div><div class='hunk'>@@ -0,0 +1,282 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2008 Cisco Systems, Inc.  All rights reserved.</div><div class='add'>+ * Copyright 2007 Nuova Systems, Inc.  All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you may redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; version 2 of the License.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='add'>+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='add'>+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='add'>+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='add'>+ * SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _VNIC_DEVCMD_H_</div><div class='add'>+#define _VNIC_DEVCMD_H_</div><div class='add'>+</div><div class='add'>+#define _CMD_NBITS      14</div><div class='add'>+#define _CMD_VTYPEBITS	10</div><div class='add'>+#define _CMD_FLAGSBITS  6</div><div class='add'>+#define _CMD_DIRBITS	2</div><div class='add'>+</div><div class='add'>+#define _CMD_NMASK      ((1 &lt;&lt; _CMD_NBITS)-1)</div><div class='add'>+#define _CMD_VTYPEMASK  ((1 &lt;&lt; _CMD_VTYPEBITS)-1)</div><div class='add'>+#define _CMD_FLAGSMASK  ((1 &lt;&lt; _CMD_FLAGSBITS)-1)</div><div class='add'>+#define _CMD_DIRMASK    ((1 &lt;&lt; _CMD_DIRBITS)-1)</div><div class='add'>+</div><div class='add'>+#define _CMD_NSHIFT     0</div><div class='add'>+#define _CMD_VTYPESHIFT (_CMD_NSHIFT+_CMD_NBITS)</div><div class='add'>+#define _CMD_FLAGSSHIFT (_CMD_VTYPESHIFT+_CMD_VTYPEBITS)</div><div class='add'>+#define _CMD_DIRSHIFT   (_CMD_FLAGSSHIFT+_CMD_FLAGSBITS)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Direction bits (from host perspective).</div><div class='add'>+ */</div><div class='add'>+#define _CMD_DIR_NONE   0U</div><div class='add'>+#define _CMD_DIR_WRITE  1U</div><div class='add'>+#define _CMD_DIR_READ   2U</div><div class='add'>+#define _CMD_DIR_RW     (_CMD_DIR_WRITE | _CMD_DIR_READ)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Flag bits.</div><div class='add'>+ */</div><div class='add'>+#define _CMD_FLAGS_NONE 0U</div><div class='add'>+#define _CMD_FLAGS_NOWAIT 1U</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * vNIC type bits.</div><div class='add'>+ */</div><div class='add'>+#define _CMD_VTYPE_NONE  0U</div><div class='add'>+#define _CMD_VTYPE_ENET  1U</div><div class='add'>+#define _CMD_VTYPE_FC    2U</div><div class='add'>+#define _CMD_VTYPE_SCSI  4U</div><div class='add'>+#define _CMD_VTYPE_ALL   (_CMD_VTYPE_ENET | _CMD_VTYPE_FC | _CMD_VTYPE_SCSI)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Used to create cmds..</div><div class='add'>+*/</div><div class='add'>+#define _CMDCF(dir, flags, vtype, nr)  \</div><div class='add'>+	(((dir)   &lt;&lt; _CMD_DIRSHIFT) | \</div><div class='add'>+	((flags) &lt;&lt; _CMD_FLAGSSHIFT) | \</div><div class='add'>+	((vtype) &lt;&lt; _CMD_VTYPESHIFT) | \</div><div class='add'>+	((nr)    &lt;&lt; _CMD_NSHIFT))</div><div class='add'>+#define _CMDC(dir, vtype, nr)    _CMDCF(dir, 0, vtype, nr)</div><div class='add'>+#define _CMDCNW(dir, vtype, nr)  _CMDCF(dir, _CMD_FLAGS_NOWAIT, vtype, nr)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Used to decode cmds..</div><div class='add'>+*/</div><div class='add'>+#define _CMD_DIR(cmd)            (((cmd) &gt;&gt; _CMD_DIRSHIFT) &amp; _CMD_DIRMASK)</div><div class='add'>+#define _CMD_FLAGS(cmd)          (((cmd) &gt;&gt; _CMD_FLAGSSHIFT) &amp; _CMD_FLAGSMASK)</div><div class='add'>+#define _CMD_VTYPE(cmd)          (((cmd) &gt;&gt; _CMD_VTYPESHIFT) &amp; _CMD_VTYPEMASK)</div><div class='add'>+#define _CMD_N(cmd)              (((cmd) &gt;&gt; _CMD_NSHIFT) &amp; _CMD_NMASK)</div><div class='add'>+</div><div class='add'>+enum vnic_devcmd_cmd {</div><div class='add'>+	CMD_NONE                = _CMDC(_CMD_DIR_NONE, _CMD_VTYPE_NONE, 0),</div><div class='add'>+</div><div class='add'>+	/* mcpu fw info in mem: (u64)a0=paddr to struct vnic_devcmd_fw_info */</div><div class='add'>+	CMD_MCPU_FW_INFO        = _CMDC(_CMD_DIR_WRITE, _CMD_VTYPE_ALL, 1),</div><div class='add'>+</div><div class='add'>+	/* dev-specific block member:</div><div class='add'>+	 *    in: (u16)a0=offset,(u8)a1=size</div><div class='add'>+	 *    out: a0=value */</div><div class='add'>+	CMD_DEV_SPEC            = _CMDC(_CMD_DIR_RW, _CMD_VTYPE_ALL, 2),</div><div class='add'>+</div><div class='add'>+	/* stats clear */</div><div class='add'>+	CMD_STATS_CLEAR         = _CMDCNW(_CMD_DIR_NONE, _CMD_VTYPE_ALL, 3),</div><div class='add'>+</div><div class='add'>+	/* stats dump in mem: (u64)a0=paddr to stats area,</div><div class='add'>+	 *                    (u16)a1=sizeof stats area */</div><div class='add'>+	CMD_STATS_DUMP          = _CMDC(_CMD_DIR_WRITE, _CMD_VTYPE_ALL, 4),</div><div class='add'>+</div><div class='add'>+	/* set Rx packet filter: (u32)a0=filters (see CMD_PFILTER_*) */</div><div class='add'>+	CMD_PACKET_FILTER	= _CMDCNW(_CMD_DIR_WRITE, _CMD_VTYPE_ENET, 7),</div><div class='add'>+</div><div class='add'>+	/* hang detection notification */</div><div class='add'>+	CMD_HANG_NOTIFY         = _CMDC(_CMD_DIR_NONE, _CMD_VTYPE_ALL, 8),</div><div class='add'>+</div><div class='add'>+	/* MAC address in (u48)a0 */</div><div class='add'>+	CMD_MAC_ADDR            = _CMDC(_CMD_DIR_READ,</div><div class='add'>+					_CMD_VTYPE_ENET | _CMD_VTYPE_FC, 9),</div><div class='add'>+</div><div class='add'>+	/* disable/enable promisc mode: (u8)a0=0/1 */</div><div class='add'>+/***** XXX DEPRECATED *****/</div><div class='add'>+	CMD_PROMISC_MODE        = _CMDCNW(_CMD_DIR_WRITE, _CMD_VTYPE_ENET, 10),</div><div class='add'>+</div><div class='add'>+	/* disable/enable all-multi mode: (u8)a0=0/1 */</div><div class='add'>+/***** XXX DEPRECATED *****/</div><div class='add'>+	CMD_ALLMULTI_MODE       = _CMDCNW(_CMD_DIR_WRITE, _CMD_VTYPE_ENET, 11),</div><div class='add'>+</div><div class='add'>+	/* add addr from (u48)a0 */</div><div class='add'>+	CMD_ADDR_ADD            = _CMDCNW(_CMD_DIR_WRITE,</div><div class='add'>+					_CMD_VTYPE_ENET | _CMD_VTYPE_FC, 12),</div><div class='add'>+</div><div class='add'>+	/* del addr from (u48)a0 */</div><div class='add'>+	CMD_ADDR_DEL            = _CMDCNW(_CMD_DIR_WRITE,</div><div class='add'>+					_CMD_VTYPE_ENET | _CMD_VTYPE_FC, 13),</div><div class='add'>+</div><div class='add'>+	/* add VLAN id in (u16)a0 */</div><div class='add'>+	CMD_VLAN_ADD            = _CMDCNW(_CMD_DIR_WRITE, _CMD_VTYPE_ENET, 14),</div><div class='add'>+</div><div class='add'>+	/* del VLAN id in (u16)a0 */</div><div class='add'>+	CMD_VLAN_DEL            = _CMDCNW(_CMD_DIR_WRITE, _CMD_VTYPE_ENET, 15),</div><div class='add'>+</div><div class='add'>+	/* nic_cfg in (u32)a0 */</div><div class='add'>+	CMD_NIC_CFG             = _CMDCNW(_CMD_DIR_WRITE, _CMD_VTYPE_ALL, 16),</div><div class='add'>+</div><div class='add'>+	/* union vnic_rss_key in mem: (u64)a0=paddr, (u16)a1=len */</div><div class='add'>+	CMD_RSS_KEY             = _CMDC(_CMD_DIR_WRITE, _CMD_VTYPE_ENET, 17),</div><div class='add'>+</div><div class='add'>+	/* union vnic_rss_cpu in mem: (u64)a0=paddr, (u16)a1=len */</div><div class='add'>+	CMD_RSS_CPU             = _CMDC(_CMD_DIR_WRITE, _CMD_VTYPE_ENET, 18),</div><div class='add'>+</div><div class='add'>+	/* initiate softreset */</div><div class='add'>+	CMD_SOFT_RESET          = _CMDCNW(_CMD_DIR_NONE, _CMD_VTYPE_ALL, 19),</div><div class='add'>+</div><div class='add'>+	/* softreset status:</div><div class='add'>+	 *    out: a0=0 reset complete, a0=1 reset in progress */</div><div class='add'>+	CMD_SOFT_RESET_STATUS   = _CMDC(_CMD_DIR_READ, _CMD_VTYPE_ALL, 20),</div><div class='add'>+</div><div class='add'>+	/* set struct vnic_devcmd_notify buffer in mem:</div><div class='add'>+	 * in:</div><div class='add'>+	 *   (u64)a0=paddr to notify (set paddr=0 to unset)</div><div class='add'>+	 *   (u32)a1 &amp; 0x00000000ffffffff=sizeof(struct vnic_devcmd_notify)</div><div class='add'>+	 *   (u16)a1 &amp; 0x0000ffff00000000=intr num (-1 for no intr)</div><div class='add'>+	 * out:</div><div class='add'>+	 *   (u32)a1 = effective size</div><div class='add'>+	 */</div><div class='add'>+	CMD_NOTIFY              = _CMDC(_CMD_DIR_RW, _CMD_VTYPE_ALL, 21),</div><div class='add'>+</div><div class='add'>+	/* UNDI API: (u64)a0=paddr to s_PXENV_UNDI_ struct,</div><div class='add'>+	 *           (u8)a1=PXENV_UNDI_xxx */</div><div class='add'>+	CMD_UNDI                = _CMDC(_CMD_DIR_WRITE, _CMD_VTYPE_ENET, 22),</div><div class='add'>+</div><div class='add'>+	/* initiate open sequence (u32)a0=flags (see CMD_OPENF_*) */</div><div class='add'>+	CMD_OPEN		= _CMDCNW(_CMD_DIR_WRITE, _CMD_VTYPE_ALL, 23),</div><div class='add'>+</div><div class='add'>+	/* open status:</div><div class='add'>+	 *    out: a0=0 open complete, a0=1 open in progress */</div><div class='add'>+	CMD_OPEN_STATUS		= _CMDC(_CMD_DIR_READ, _CMD_VTYPE_ALL, 24),</div><div class='add'>+</div><div class='add'>+	/* close vnic */</div><div class='add'>+	CMD_CLOSE		= _CMDC(_CMD_DIR_NONE, _CMD_VTYPE_ALL, 25),</div><div class='add'>+</div><div class='add'>+	/* initialize virtual link: (u32)a0=flags (see CMD_INITF_*) */</div><div class='add'>+	CMD_INIT		= _CMDCNW(_CMD_DIR_READ, _CMD_VTYPE_ALL, 26),</div><div class='add'>+</div><div class='add'>+	/* variant of CMD_INIT, with provisioning info</div><div class='add'>+	 *     (u64)a0=paddr of vnic_devcmd_provinfo</div><div class='add'>+	 *     (u32)a1=sizeof provision info */</div><div class='add'>+	CMD_INIT_PROV_INFO	= _CMDC(_CMD_DIR_WRITE, _CMD_VTYPE_ENET, 27),</div><div class='add'>+</div><div class='add'>+	/* enable virtual link */</div><div class='add'>+	CMD_ENABLE		= _CMDCNW(_CMD_DIR_WRITE, _CMD_VTYPE_ALL, 28),</div><div class='add'>+</div><div class='add'>+	/* disable virtual link */</div><div class='add'>+	CMD_DISABLE		= _CMDC(_CMD_DIR_NONE, _CMD_VTYPE_ALL, 29),</div><div class='add'>+</div><div class='add'>+	/* stats dump all vnics on uplink in mem: (u64)a0=paddr (u32)a1=uif */</div><div class='add'>+	CMD_STATS_DUMP_ALL	= _CMDC(_CMD_DIR_WRITE, _CMD_VTYPE_ALL, 30),</div><div class='add'>+</div><div class='add'>+	/* init status:</div><div class='add'>+	 *    out: a0=0 init complete, a0=1 init in progress</div><div class='add'>+	 *         if a0=0, a1=errno */</div><div class='add'>+	CMD_INIT_STATUS		= _CMDC(_CMD_DIR_READ, _CMD_VTYPE_ALL, 31),</div><div class='add'>+</div><div class='add'>+	/* INT13 API: (u64)a0=paddr to vnic_int13_params struct</div><div class='add'>+	 *            (u8)a1=INT13_CMD_xxx */</div><div class='add'>+	CMD_INT13               = _CMDC(_CMD_DIR_WRITE, _CMD_VTYPE_FC, 32),</div><div class='add'>+</div><div class='add'>+	/* logical uplink enable/disable: (u64)a0: 0/1=disable/enable */</div><div class='add'>+	CMD_LOGICAL_UPLINK      = _CMDCNW(_CMD_DIR_WRITE, _CMD_VTYPE_ENET, 33),</div><div class='add'>+</div><div class='add'>+	/* undo initialize of virtual link */</div><div class='add'>+	CMD_DEINIT		= _CMDCNW(_CMD_DIR_NONE, _CMD_VTYPE_ALL, 34),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* flags for CMD_OPEN */</div><div class='add'>+#define CMD_OPENF_OPROM		0x1	/* open coming from option rom */</div><div class='add'>+</div><div class='add'>+/* flags for CMD_INIT */</div><div class='add'>+#define CMD_INITF_DEFAULT_MAC	0x1	/* init with default mac addr */</div><div class='add'>+</div><div class='add'>+/* flags for CMD_PACKET_FILTER */</div><div class='add'>+#define CMD_PFILTER_DIRECTED		0x01</div><div class='add'>+#define CMD_PFILTER_MULTICAST		0x02</div><div class='add'>+#define CMD_PFILTER_BROADCAST		0x04</div><div class='add'>+#define CMD_PFILTER_PROMISCUOUS		0x08</div><div class='add'>+#define CMD_PFILTER_ALL_MULTICAST	0x10</div><div class='add'>+</div><div class='add'>+enum vnic_devcmd_status {</div><div class='add'>+	STAT_NONE = 0,</div><div class='add'>+	STAT_BUSY = 1 &lt;&lt; 0,	/* cmd in progress */</div><div class='add'>+	STAT_ERROR = 1 &lt;&lt; 1,	/* last cmd caused error (code in a0) */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum vnic_devcmd_error {</div><div class='add'>+	ERR_SUCCESS = 0,</div><div class='add'>+	ERR_EINVAL = 1,</div><div class='add'>+	ERR_EFAULT = 2,</div><div class='add'>+	ERR_EPERM = 3,</div><div class='add'>+	ERR_EBUSY = 4,</div><div class='add'>+	ERR_ECMDUNKNOWN = 5,</div><div class='add'>+	ERR_EBADSTATE = 6,</div><div class='add'>+	ERR_ENOMEM = 7,</div><div class='add'>+	ERR_ETIMEDOUT = 8,</div><div class='add'>+	ERR_ELINKDOWN = 9,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct vnic_devcmd_fw_info {</div><div class='add'>+	char fw_version[32];</div><div class='add'>+	char fw_build[32];</div><div class='add'>+	char hw_version[32];</div><div class='add'>+	char hw_serial_number[32];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct vnic_devcmd_notify {</div><div class='add'>+	u32 csum;		/* checksum over following words */</div><div class='add'>+</div><div class='add'>+	u32 link_state;		/* link up == 1 */</div><div class='add'>+	u32 port_speed;		/* effective port speed (rate limit) */</div><div class='add'>+	u32 mtu;		/* MTU */</div><div class='add'>+	u32 msglvl;		/* requested driver msg lvl */</div><div class='add'>+	u32 uif;		/* uplink interface */</div><div class='add'>+	u32 status;		/* status bits (see VNIC_STF_*) */</div><div class='add'>+	u32 error;		/* error code (see ERR_*) for first ERR */</div><div class='add'>+};</div><div class='add'>+#define VNIC_STF_FATAL_ERR	0x0001	/* fatal fw error */</div><div class='add'>+</div><div class='add'>+struct vnic_devcmd_provinfo {</div><div class='add'>+	u8 oui[3];</div><div class='add'>+	u8 type;</div><div class='add'>+	u8 data[0];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Writing cmd register causes STAT_BUSY to get set in status register.</div><div class='add'>+ * When cmd completes, STAT_BUSY will be cleared.</div><div class='add'>+ *</div><div class='add'>+ * If cmd completed successfully STAT_ERROR will be clear</div><div class='add'>+ * and args registers contain cmd-specific results.</div><div class='add'>+ *</div><div class='add'>+ * If cmd error, STAT_ERROR will be set and args[0] contains error code.</div><div class='add'>+ *</div><div class='add'>+ * status register is read-only.  While STAT_BUSY is set,</div><div class='add'>+ * all other register contents are read-only.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* Make sizeof(vnic_devcmd) a power-of-2 for I/O BAR. */</div><div class='add'>+#define VNIC_DEVCMD_NARGS 15</div><div class='add'>+struct vnic_devcmd {</div><div class='add'>+	u32 status;			/* RO */</div><div class='add'>+	u32 cmd;			/* RW */</div><div class='add'>+	u64 args[VNIC_DEVCMD_NARGS];	/* RW cmd args (little-endian) */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif /* _VNIC_DEVCMD_H_ */</div><div class='head'>diff --git a/drivers/net/enic/vnic_enet.h b/drivers/net/enic/vnic_enet.h<br/>new file mode 100644<br/>index 000000000000..6332ac9391b8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/enic/vnic_enet.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/enic/vnic_enet.h</a></div><div class='hunk'>@@ -0,0 +1,47 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2008 Cisco Systems, Inc.  All rights reserved.</div><div class='add'>+ * Copyright 2007 Nuova Systems, Inc.  All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you may redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; version 2 of the License.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='add'>+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='add'>+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='add'>+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='add'>+ * SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _VNIC_ENIC_H_</div><div class='add'>+#define _VNIC_ENIC_H_</div><div class='add'>+</div><div class='add'>+/* Device-specific region: enet configuration */</div><div class='add'>+struct vnic_enet_config {</div><div class='add'>+	u32 flags;</div><div class='add'>+	u32 wq_desc_count;</div><div class='add'>+	u32 rq_desc_count;</div><div class='add'>+	u16 mtu;</div><div class='add'>+	u16 intr_timer;</div><div class='add'>+	u8 intr_timer_type;</div><div class='add'>+	u8 intr_mode;</div><div class='add'>+	char devname[16];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define VENETF_TSO		0x1	/* TSO enabled */</div><div class='add'>+#define VENETF_LRO		0x2	/* LRO enabled */</div><div class='add'>+#define VENETF_RXCSUM		0x4	/* RX csum enabled */</div><div class='add'>+#define VENETF_TXCSUM		0x8	/* TX csum enabled */</div><div class='add'>+#define VENETF_RSS		0x10	/* RSS enabled */</div><div class='add'>+#define VENETF_RSSHASH_IPV4	0x20	/* Hash on IPv4 fields */</div><div class='add'>+#define VENETF_RSSHASH_TCPIPV4	0x40	/* Hash on TCP + IPv4 fields */</div><div class='add'>+#define VENETF_RSSHASH_IPV6	0x80	/* Hash on IPv6 fields */</div><div class='add'>+#define VENETF_RSSHASH_TCPIPV6	0x100	/* Hash on TCP + IPv6 fields */</div><div class='add'>+#define VENETF_RSSHASH_IPV6_EX	0x200	/* Hash on IPv6 extended fields */</div><div class='add'>+#define VENETF_RSSHASH_TCPIPV6_EX 0x400	/* Hash on TCP + IPv6 ext. fields */</div><div class='add'>+</div><div class='add'>+#endif /* _VNIC_ENIC_H_ */</div><div class='head'>diff --git a/drivers/net/enic/vnic_intr.c b/drivers/net/enic/vnic_intr.c<br/>new file mode 100644<br/>index 000000000000..ddc38f8f4656<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/enic/vnic_intr.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/enic/vnic_intr.c</a></div><div class='hunk'>@@ -0,0 +1,62 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2008 Cisco Systems, Inc.  All rights reserved.</div><div class='add'>+ * Copyright 2007 Nuova Systems, Inc.  All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you may redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; version 2 of the License.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='add'>+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='add'>+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='add'>+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='add'>+ * SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+</div><div class='add'>+#include "vnic_dev.h"</div><div class='add'>+#include "vnic_intr.h"</div><div class='add'>+</div><div class='add'>+void vnic_intr_free(struct vnic_intr *intr)</div><div class='add'>+{</div><div class='add'>+	intr-&gt;ctrl = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int vnic_intr_alloc(struct vnic_dev *vdev, struct vnic_intr *intr,</div><div class='add'>+	unsigned int index)</div><div class='add'>+{</div><div class='add'>+	intr-&gt;index = index;</div><div class='add'>+	intr-&gt;vdev = vdev;</div><div class='add'>+</div><div class='add'>+	intr-&gt;ctrl = vnic_dev_get_res(vdev, RES_TYPE_INTR_CTRL, index);</div><div class='add'>+	if (!intr-&gt;ctrl) {</div><div class='add'>+		printk(KERN_ERR "Failed to hook INTR[%d].ctrl resource\n",</div><div class='add'>+			index);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void vnic_intr_init(struct vnic_intr *intr, unsigned int coalescing_timer,</div><div class='add'>+	unsigned int coalescing_type, unsigned int mask_on_assertion)</div><div class='add'>+{</div><div class='add'>+	iowrite32(coalescing_timer, &amp;intr-&gt;ctrl-&gt;coalescing_timer);</div><div class='add'>+	iowrite32(coalescing_type, &amp;intr-&gt;ctrl-&gt;coalescing_type);</div><div class='add'>+	iowrite32(mask_on_assertion, &amp;intr-&gt;ctrl-&gt;mask_on_assertion);</div><div class='add'>+	iowrite32(0, &amp;intr-&gt;ctrl-&gt;int_credits);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void vnic_intr_clean(struct vnic_intr *intr)</div><div class='add'>+{</div><div class='add'>+	iowrite32(0, &amp;intr-&gt;ctrl-&gt;int_credits);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/enic/vnic_intr.h b/drivers/net/enic/vnic_intr.h<br/>new file mode 100644<br/>index 000000000000..ccc408116af8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/enic/vnic_intr.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/enic/vnic_intr.h</a></div><div class='hunk'>@@ -0,0 +1,92 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2008 Cisco Systems, Inc.  All rights reserved.</div><div class='add'>+ * Copyright 2007 Nuova Systems, Inc.  All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you may redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; version 2 of the License.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='add'>+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='add'>+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='add'>+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='add'>+ * SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _VNIC_INTR_H_</div><div class='add'>+#define _VNIC_INTR_H_</div><div class='add'>+</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+</div><div class='add'>+#include "vnic_dev.h"</div><div class='add'>+</div><div class='add'>+#define VNIC_INTR_TIMER_MAX		0xffff</div><div class='add'>+</div><div class='add'>+#define VNIC_INTR_TIMER_TYPE_ABS	0</div><div class='add'>+#define VNIC_INTR_TIMER_TYPE_QUIET	1</div><div class='add'>+</div><div class='add'>+/* Interrupt control */</div><div class='add'>+struct vnic_intr_ctrl {</div><div class='add'>+	u32 coalescing_timer;		/* 0x00 */</div><div class='add'>+	u32 pad0;</div><div class='add'>+	u32 coalescing_value;		/* 0x08 */</div><div class='add'>+	u32 pad1;</div><div class='add'>+	u32 coalescing_type;		/* 0x10 */</div><div class='add'>+	u32 pad2;</div><div class='add'>+	u32 mask_on_assertion;		/* 0x18 */</div><div class='add'>+	u32 pad3;</div><div class='add'>+	u32 mask;			/* 0x20 */</div><div class='add'>+	u32 pad4;</div><div class='add'>+	u32 int_credits;		/* 0x28 */</div><div class='add'>+	u32 pad5;</div><div class='add'>+	u32 int_credit_return;		/* 0x30 */</div><div class='add'>+	u32 pad6;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct vnic_intr {</div><div class='add'>+	unsigned int index;</div><div class='add'>+	struct vnic_dev *vdev;</div><div class='add'>+	struct vnic_intr_ctrl __iomem *ctrl;		/* memory-mapped */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline void vnic_intr_unmask(struct vnic_intr *intr)</div><div class='add'>+{</div><div class='add'>+	iowrite32(0, &amp;intr-&gt;ctrl-&gt;mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void vnic_intr_mask(struct vnic_intr *intr)</div><div class='add'>+{</div><div class='add'>+	iowrite32(1, &amp;intr-&gt;ctrl-&gt;mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void vnic_intr_return_credits(struct vnic_intr *intr,</div><div class='add'>+	unsigned int credits, int unmask, int reset_timer)</div><div class='add'>+{</div><div class='add'>+#define VNIC_INTR_UNMASK_SHIFT		16</div><div class='add'>+#define VNIC_INTR_RESET_TIMER_SHIFT	17</div><div class='add'>+</div><div class='add'>+	u32 int_credit_return = (credits &amp; 0xffff) |</div><div class='add'>+		(unmask ? (1 &lt;&lt; VNIC_INTR_UNMASK_SHIFT) : 0) |</div><div class='add'>+		(reset_timer ? (1 &lt;&lt; VNIC_INTR_RESET_TIMER_SHIFT) : 0);</div><div class='add'>+</div><div class='add'>+	iowrite32(int_credit_return, &amp;intr-&gt;ctrl-&gt;int_credit_return);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32 vnic_intr_legacy_pba(u32 __iomem *legacy_pba)</div><div class='add'>+{</div><div class='add'>+	/* get and ack interrupt in one read (clear-and-ack-on-read) */</div><div class='add'>+	return ioread32(legacy_pba);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void vnic_intr_free(struct vnic_intr *intr);</div><div class='add'>+int vnic_intr_alloc(struct vnic_dev *vdev, struct vnic_intr *intr,</div><div class='add'>+	unsigned int index);</div><div class='add'>+void vnic_intr_init(struct vnic_intr *intr, unsigned int coalescing_timer,</div><div class='add'>+	unsigned int coalescing_type, unsigned int mask_on_assertion);</div><div class='add'>+void vnic_intr_clean(struct vnic_intr *intr);</div><div class='add'>+</div><div class='add'>+#endif /* _VNIC_INTR_H_ */</div><div class='head'>diff --git a/drivers/net/enic/vnic_nic.h b/drivers/net/enic/vnic_nic.h<br/>new file mode 100644<br/>index 000000000000..dadf26fae69a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/enic/vnic_nic.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/enic/vnic_nic.h</a></div><div class='hunk'>@@ -0,0 +1,65 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2008 Cisco Systems, Inc.  All rights reserved.</div><div class='add'>+ * Copyright 2007 Nuova Systems, Inc.  All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you may redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; version 2 of the License.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='add'>+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='add'>+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='add'>+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='add'>+ * SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _VNIC_NIC_H_</div><div class='add'>+#define _VNIC_NIC_H_</div><div class='add'>+</div><div class='add'>+#define NIC_CFG_RSS_DEFAULT_CPU_MASK_FIELD	0xffUL</div><div class='add'>+#define NIC_CFG_RSS_DEFAULT_CPU_SHIFT		0</div><div class='add'>+#define NIC_CFG_RSS_HASH_TYPE			(0xffUL &lt;&lt; 8)</div><div class='add'>+#define NIC_CFG_RSS_HASH_TYPE_MASK_FIELD	0xffUL</div><div class='add'>+#define NIC_CFG_RSS_HASH_TYPE_SHIFT		8</div><div class='add'>+#define NIC_CFG_RSS_HASH_BITS			(7UL &lt;&lt; 16)</div><div class='add'>+#define NIC_CFG_RSS_HASH_BITS_MASK_FIELD	7UL</div><div class='add'>+#define NIC_CFG_RSS_HASH_BITS_SHIFT		16</div><div class='add'>+#define NIC_CFG_RSS_BASE_CPU			(7UL &lt;&lt; 19)</div><div class='add'>+#define NIC_CFG_RSS_BASE_CPU_MASK_FIELD		7UL</div><div class='add'>+#define NIC_CFG_RSS_BASE_CPU_SHIFT		19</div><div class='add'>+#define NIC_CFG_RSS_ENABLE			(1UL &lt;&lt; 22)</div><div class='add'>+#define NIC_CFG_RSS_ENABLE_MASK_FIELD		1UL</div><div class='add'>+#define NIC_CFG_RSS_ENABLE_SHIFT		22</div><div class='add'>+#define NIC_CFG_TSO_IPID_SPLIT_EN		(1UL &lt;&lt; 23)</div><div class='add'>+#define NIC_CFG_TSO_IPID_SPLIT_EN_MASK_FIELD	1UL</div><div class='add'>+#define NIC_CFG_TSO_IPID_SPLIT_EN_SHIFT		23</div><div class='add'>+#define NIC_CFG_IG_VLAN_STRIP_EN		(1UL &lt;&lt; 24)</div><div class='add'>+#define NIC_CFG_IG_VLAN_STRIP_EN_MASK_FIELD	1UL</div><div class='add'>+#define NIC_CFG_IG_VLAN_STRIP_EN_SHIFT		24</div><div class='add'>+</div><div class='add'>+static inline void vnic_set_nic_cfg(u32 *nic_cfg,</div><div class='add'>+	u8 rss_default_cpu, u8 rss_hash_type,</div><div class='add'>+	u8 rss_hash_bits, u8 rss_base_cpu,</div><div class='add'>+	u8 rss_enable, u8 tso_ipid_split_en,</div><div class='add'>+	u8 ig_vlan_strip_en)</div><div class='add'>+{</div><div class='add'>+	*nic_cfg = (rss_default_cpu &amp; NIC_CFG_RSS_DEFAULT_CPU_MASK_FIELD) |</div><div class='add'>+		((rss_hash_type &amp; NIC_CFG_RSS_HASH_TYPE_MASK_FIELD)</div><div class='add'>+			&lt;&lt; NIC_CFG_RSS_HASH_TYPE_SHIFT) |</div><div class='add'>+		((rss_hash_bits &amp; NIC_CFG_RSS_HASH_BITS_MASK_FIELD)</div><div class='add'>+			&lt;&lt; NIC_CFG_RSS_HASH_BITS_SHIFT) |</div><div class='add'>+		((rss_base_cpu &amp; NIC_CFG_RSS_BASE_CPU_MASK_FIELD)</div><div class='add'>+			&lt;&lt; NIC_CFG_RSS_BASE_CPU_SHIFT) |</div><div class='add'>+		((rss_enable &amp; NIC_CFG_RSS_ENABLE_MASK_FIELD)</div><div class='add'>+			&lt;&lt; NIC_CFG_RSS_ENABLE_SHIFT) |</div><div class='add'>+		((tso_ipid_split_en &amp; NIC_CFG_TSO_IPID_SPLIT_EN_MASK_FIELD)</div><div class='add'>+			&lt;&lt; NIC_CFG_TSO_IPID_SPLIT_EN_SHIFT) |</div><div class='add'>+		((ig_vlan_strip_en &amp; NIC_CFG_IG_VLAN_STRIP_EN_MASK_FIELD)</div><div class='add'>+			&lt;&lt; NIC_CFG_IG_VLAN_STRIP_EN_SHIFT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* _VNIC_NIC_H_ */</div><div class='head'>diff --git a/drivers/net/enic/vnic_resource.h b/drivers/net/enic/vnic_resource.h<br/>new file mode 100644<br/>index 000000000000..144d2812f081<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/enic/vnic_resource.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/enic/vnic_resource.h</a></div><div class='hunk'>@@ -0,0 +1,63 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2008 Cisco Systems, Inc.  All rights reserved.</div><div class='add'>+ * Copyright 2007 Nuova Systems, Inc.  All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you may redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; version 2 of the License.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='add'>+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='add'>+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='add'>+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='add'>+ * SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _VNIC_RESOURCE_H_</div><div class='add'>+#define _VNIC_RESOURCE_H_</div><div class='add'>+</div><div class='add'>+#define VNIC_RES_MAGIC		0x766E6963L	/* 'vnic' */</div><div class='add'>+#define VNIC_RES_VERSION	0x00000000L</div><div class='add'>+</div><div class='add'>+/* vNIC resource types */</div><div class='add'>+enum vnic_res_type {</div><div class='add'>+	RES_TYPE_EOL,			/* End-of-list */</div><div class='add'>+	RES_TYPE_WQ,			/* Work queues */</div><div class='add'>+	RES_TYPE_RQ,			/* Receive queues */</div><div class='add'>+	RES_TYPE_CQ,			/* Completion queues */</div><div class='add'>+	RES_TYPE_RSVD1,</div><div class='add'>+	RES_TYPE_NIC_CFG,		/* Enet NIC config registers */</div><div class='add'>+	RES_TYPE_RSVD2,</div><div class='add'>+	RES_TYPE_RSVD3,</div><div class='add'>+	RES_TYPE_RSVD4,</div><div class='add'>+	RES_TYPE_RSVD5,</div><div class='add'>+	RES_TYPE_INTR_CTRL,		/* Interrupt ctrl table */</div><div class='add'>+	RES_TYPE_INTR_TABLE,		/* MSI/MSI-X Interrupt table */</div><div class='add'>+	RES_TYPE_INTR_PBA,		/* MSI/MSI-X PBA table */</div><div class='add'>+	RES_TYPE_INTR_PBA_LEGACY,	/* Legacy intr status, r2c */</div><div class='add'>+	RES_TYPE_RSVD6,</div><div class='add'>+	RES_TYPE_RSVD7,</div><div class='add'>+	RES_TYPE_DEVCMD,		/* Device command region */</div><div class='add'>+	RES_TYPE_PASS_THRU_PAGE,	/* Pass-thru page */</div><div class='add'>+</div><div class='add'>+	RES_TYPE_MAX,			/* Count of resource types */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct vnic_resource_header {</div><div class='add'>+	u32 magic;</div><div class='add'>+	u32 version;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct vnic_resource {</div><div class='add'>+	u8 type;</div><div class='add'>+	u8 bar;</div><div class='add'>+	u8 pad[2];</div><div class='add'>+	u32 bar_offset;</div><div class='add'>+	u32 count;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif /* _VNIC_RESOURCE_H_ */</div><div class='head'>diff --git a/drivers/net/enic/vnic_rq.c b/drivers/net/enic/vnic_rq.c<br/>new file mode 100644<br/>index 000000000000..9365e63e821a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/enic/vnic_rq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/enic/vnic_rq.c</a></div><div class='hunk'>@@ -0,0 +1,199 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2008 Cisco Systems, Inc.  All rights reserved.</div><div class='add'>+ * Copyright 2007 Nuova Systems, Inc.  All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you may redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; version 2 of the License.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='add'>+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='add'>+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='add'>+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='add'>+ * SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+</div><div class='add'>+#include "vnic_dev.h"</div><div class='add'>+#include "vnic_rq.h"</div><div class='add'>+</div><div class='add'>+static int vnic_rq_alloc_bufs(struct vnic_rq *rq)</div><div class='add'>+{</div><div class='add'>+	struct vnic_rq_buf *buf;</div><div class='add'>+	struct vnic_dev *vdev;</div><div class='add'>+	unsigned int i, j, count = rq-&gt;ring.desc_count;</div><div class='add'>+	unsigned int blks = VNIC_RQ_BUF_BLKS_NEEDED(count);</div><div class='add'>+</div><div class='add'>+	vdev = rq-&gt;vdev;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; blks; i++) {</div><div class='add'>+		rq-&gt;bufs[i] = kzalloc(VNIC_RQ_BUF_BLK_SZ, GFP_ATOMIC);</div><div class='add'>+		if (!rq-&gt;bufs[i]) {</div><div class='add'>+			printk(KERN_ERR "Failed to alloc rq_bufs\n");</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; blks; i++) {</div><div class='add'>+		buf = rq-&gt;bufs[i];</div><div class='add'>+		for (j = 0; j &lt; VNIC_RQ_BUF_BLK_ENTRIES; j++) {</div><div class='add'>+			buf-&gt;index = i * VNIC_RQ_BUF_BLK_ENTRIES + j;</div><div class='add'>+			buf-&gt;desc = (u8 *)rq-&gt;ring.descs +</div><div class='add'>+				rq-&gt;ring.desc_size * buf-&gt;index;</div><div class='add'>+			if (buf-&gt;index + 1 == count) {</div><div class='add'>+				buf-&gt;next = rq-&gt;bufs[0];</div><div class='add'>+				break;</div><div class='add'>+			} else if (j + 1 == VNIC_RQ_BUF_BLK_ENTRIES) {</div><div class='add'>+				buf-&gt;next = rq-&gt;bufs[i + 1];</div><div class='add'>+			} else {</div><div class='add'>+				buf-&gt;next = buf + 1;</div><div class='add'>+				buf++;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rq-&gt;to_use = rq-&gt;to_clean = rq-&gt;bufs[0];</div><div class='add'>+	rq-&gt;buf_index = 0;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void vnic_rq_free(struct vnic_rq *rq)</div><div class='add'>+{</div><div class='add'>+	struct vnic_dev *vdev;</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	vdev = rq-&gt;vdev;</div><div class='add'>+</div><div class='add'>+	vnic_dev_free_desc_ring(vdev, &amp;rq-&gt;ring);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; VNIC_RQ_BUF_BLKS_MAX; i++) {</div><div class='add'>+		kfree(rq-&gt;bufs[i]);</div><div class='add'>+		rq-&gt;bufs[i] = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rq-&gt;ctrl = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int vnic_rq_alloc(struct vnic_dev *vdev, struct vnic_rq *rq, unsigned int index,</div><div class='add'>+	unsigned int desc_count, unsigned int desc_size)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	rq-&gt;index = index;</div><div class='add'>+	rq-&gt;vdev = vdev;</div><div class='add'>+</div><div class='add'>+	rq-&gt;ctrl = vnic_dev_get_res(vdev, RES_TYPE_RQ, index);</div><div class='add'>+	if (!rq-&gt;ctrl) {</div><div class='add'>+		printk(KERN_ERR "Failed to hook RQ[%d] resource\n", index);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	vnic_rq_disable(rq);</div><div class='add'>+</div><div class='add'>+	err = vnic_dev_alloc_desc_ring(vdev, &amp;rq-&gt;ring, desc_count, desc_size);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = vnic_rq_alloc_bufs(rq);</div><div class='add'>+	if (err) {</div><div class='add'>+		vnic_rq_free(rq);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void vnic_rq_init(struct vnic_rq *rq, unsigned int cq_index,</div><div class='add'>+	unsigned int error_interrupt_enable,</div><div class='add'>+	unsigned int error_interrupt_offset)</div><div class='add'>+{</div><div class='add'>+	u64 paddr;</div><div class='add'>+	u32 fetch_index;</div><div class='add'>+</div><div class='add'>+	paddr = (u64)rq-&gt;ring.base_addr | VNIC_PADDR_TARGET;</div><div class='add'>+	writeq(paddr, &amp;rq-&gt;ctrl-&gt;ring_base);</div><div class='add'>+	iowrite32(rq-&gt;ring.desc_count, &amp;rq-&gt;ctrl-&gt;ring_size);</div><div class='add'>+	iowrite32(cq_index, &amp;rq-&gt;ctrl-&gt;cq_index);</div><div class='add'>+	iowrite32(error_interrupt_enable, &amp;rq-&gt;ctrl-&gt;error_interrupt_enable);</div><div class='add'>+	iowrite32(error_interrupt_offset, &amp;rq-&gt;ctrl-&gt;error_interrupt_offset);</div><div class='add'>+	iowrite32(0, &amp;rq-&gt;ctrl-&gt;dropped_packet_count);</div><div class='add'>+	iowrite32(0, &amp;rq-&gt;ctrl-&gt;error_status);</div><div class='add'>+</div><div class='add'>+	/* Use current fetch_index as the ring starting point */</div><div class='add'>+	fetch_index = ioread32(&amp;rq-&gt;ctrl-&gt;fetch_index);</div><div class='add'>+	rq-&gt;to_use = rq-&gt;to_clean =</div><div class='add'>+		&amp;rq-&gt;bufs[fetch_index / VNIC_RQ_BUF_BLK_ENTRIES]</div><div class='add'>+			[fetch_index % VNIC_RQ_BUF_BLK_ENTRIES];</div><div class='add'>+	iowrite32(fetch_index, &amp;rq-&gt;ctrl-&gt;posted_index);</div><div class='add'>+</div><div class='add'>+	rq-&gt;buf_index = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+unsigned int vnic_rq_error_status(struct vnic_rq *rq)</div><div class='add'>+{</div><div class='add'>+	return ioread32(&amp;rq-&gt;ctrl-&gt;error_status);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void vnic_rq_enable(struct vnic_rq *rq)</div><div class='add'>+{</div><div class='add'>+	iowrite32(1, &amp;rq-&gt;ctrl-&gt;enable);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int vnic_rq_disable(struct vnic_rq *rq)</div><div class='add'>+{</div><div class='add'>+	unsigned int wait;</div><div class='add'>+</div><div class='add'>+	iowrite32(0, &amp;rq-&gt;ctrl-&gt;enable);</div><div class='add'>+</div><div class='add'>+	/* Wait for HW to ACK disable request */</div><div class='add'>+	for (wait = 0; wait &lt; 100; wait++) {</div><div class='add'>+		if (!(ioread32(&amp;rq-&gt;ctrl-&gt;running)))</div><div class='add'>+			return 0;</div><div class='add'>+		udelay(1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	printk(KERN_ERR "Failed to disable RQ[%d]\n", rq-&gt;index);</div><div class='add'>+</div><div class='add'>+	return -ETIMEDOUT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void vnic_rq_clean(struct vnic_rq *rq,</div><div class='add'>+	void (*buf_clean)(struct vnic_rq *rq, struct vnic_rq_buf *buf))</div><div class='add'>+{</div><div class='add'>+	struct vnic_rq_buf *buf;</div><div class='add'>+	u32 fetch_index;</div><div class='add'>+</div><div class='add'>+	BUG_ON(ioread32(&amp;rq-&gt;ctrl-&gt;enable));</div><div class='add'>+</div><div class='add'>+	buf = rq-&gt;to_clean;</div><div class='add'>+</div><div class='add'>+	while (vnic_rq_desc_used(rq) &gt; 0) {</div><div class='add'>+</div><div class='add'>+		(*buf_clean)(rq, buf);</div><div class='add'>+</div><div class='add'>+		buf = rq-&gt;to_clean = buf-&gt;next;</div><div class='add'>+		rq-&gt;ring.desc_avail++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Use current fetch_index as the ring starting point */</div><div class='add'>+	fetch_index = ioread32(&amp;rq-&gt;ctrl-&gt;fetch_index);</div><div class='add'>+	rq-&gt;to_use = rq-&gt;to_clean =</div><div class='add'>+		&amp;rq-&gt;bufs[fetch_index / VNIC_RQ_BUF_BLK_ENTRIES]</div><div class='add'>+			[fetch_index % VNIC_RQ_BUF_BLK_ENTRIES];</div><div class='add'>+	iowrite32(fetch_index, &amp;rq-&gt;ctrl-&gt;posted_index);</div><div class='add'>+</div><div class='add'>+	rq-&gt;buf_index = 0;</div><div class='add'>+</div><div class='add'>+	vnic_dev_clear_desc_ring(&amp;rq-&gt;ring);</div><div class='add'>+}</div><div class='add'>+</div><div class='head'>diff --git a/drivers/net/enic/vnic_rq.h b/drivers/net/enic/vnic_rq.h<br/>new file mode 100644<br/>index 000000000000..82bfca67cc4d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/enic/vnic_rq.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/enic/vnic_rq.h</a></div><div class='hunk'>@@ -0,0 +1,204 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2008 Cisco Systems, Inc.  All rights reserved.</div><div class='add'>+ * Copyright 2007 Nuova Systems, Inc.  All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you may redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; version 2 of the License.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='add'>+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='add'>+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='add'>+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='add'>+ * SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _VNIC_RQ_H_</div><div class='add'>+#define _VNIC_RQ_H_</div><div class='add'>+</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+</div><div class='add'>+#include "vnic_dev.h"</div><div class='add'>+#include "vnic_cq.h"</div><div class='add'>+</div><div class='add'>+/* Receive queue control */</div><div class='add'>+struct vnic_rq_ctrl {</div><div class='add'>+	u64 ring_base;			/* 0x00 */</div><div class='add'>+	u32 ring_size;			/* 0x08 */</div><div class='add'>+	u32 pad0;</div><div class='add'>+	u32 posted_index;		/* 0x10 */</div><div class='add'>+	u32 pad1;</div><div class='add'>+	u32 cq_index;			/* 0x18 */</div><div class='add'>+	u32 pad2;</div><div class='add'>+	u32 enable;			/* 0x20 */</div><div class='add'>+	u32 pad3;</div><div class='add'>+	u32 running;			/* 0x28 */</div><div class='add'>+	u32 pad4;</div><div class='add'>+	u32 fetch_index;		/* 0x30 */</div><div class='add'>+	u32 pad5;</div><div class='add'>+	u32 error_interrupt_enable;	/* 0x38 */</div><div class='add'>+	u32 pad6;</div><div class='add'>+	u32 error_interrupt_offset;	/* 0x40 */</div><div class='add'>+	u32 pad7;</div><div class='add'>+	u32 error_status;		/* 0x48 */</div><div class='add'>+	u32 pad8;</div><div class='add'>+	u32 dropped_packet_count;	/* 0x50 */</div><div class='add'>+	u32 pad9;</div><div class='add'>+	u32 dropped_packet_count_rc;	/* 0x58 */</div><div class='add'>+	u32 pad10;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Break the vnic_rq_buf allocations into blocks of 64 entries */</div><div class='add'>+#define VNIC_RQ_BUF_BLK_ENTRIES 64</div><div class='add'>+#define VNIC_RQ_BUF_BLK_SZ \</div><div class='add'>+	(VNIC_RQ_BUF_BLK_ENTRIES * sizeof(struct vnic_rq_buf))</div><div class='add'>+#define VNIC_RQ_BUF_BLKS_NEEDED(entries) \</div><div class='add'>+	DIV_ROUND_UP(entries, VNIC_RQ_BUF_BLK_ENTRIES)</div><div class='add'>+#define VNIC_RQ_BUF_BLKS_MAX VNIC_RQ_BUF_BLKS_NEEDED(4096)</div><div class='add'>+</div><div class='add'>+struct vnic_rq_buf {</div><div class='add'>+	struct vnic_rq_buf *next;</div><div class='add'>+	dma_addr_t dma_addr;</div><div class='add'>+	void *os_buf;</div><div class='add'>+	unsigned int os_buf_index;</div><div class='add'>+	unsigned int len;</div><div class='add'>+	unsigned int index;</div><div class='add'>+	void *desc;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct vnic_rq {</div><div class='add'>+	unsigned int index;</div><div class='add'>+	struct vnic_dev *vdev;</div><div class='add'>+	struct vnic_rq_ctrl __iomem *ctrl;              /* memory-mapped */</div><div class='add'>+	struct vnic_dev_ring ring;</div><div class='add'>+	struct vnic_rq_buf *bufs[VNIC_RQ_BUF_BLKS_MAX];</div><div class='add'>+	struct vnic_rq_buf *to_use;</div><div class='add'>+	struct vnic_rq_buf *to_clean;</div><div class='add'>+	void *os_buf_head;</div><div class='add'>+	unsigned int buf_index;</div><div class='add'>+	unsigned int pkts_outstanding;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline unsigned int vnic_rq_desc_avail(struct vnic_rq *rq)</div><div class='add'>+{</div><div class='add'>+	/* how many does SW own? */</div><div class='add'>+	return rq-&gt;ring.desc_avail;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned int vnic_rq_desc_used(struct vnic_rq *rq)</div><div class='add'>+{</div><div class='add'>+	/* how many does HW own? */</div><div class='add'>+	return rq-&gt;ring.desc_count - rq-&gt;ring.desc_avail - 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void *vnic_rq_next_desc(struct vnic_rq *rq)</div><div class='add'>+{</div><div class='add'>+	return rq-&gt;to_use-&gt;desc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned int vnic_rq_next_index(struct vnic_rq *rq)</div><div class='add'>+{</div><div class='add'>+	return rq-&gt;to_use-&gt;index;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned int vnic_rq_next_buf_index(struct vnic_rq *rq)</div><div class='add'>+{</div><div class='add'>+	return rq-&gt;buf_index++;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void vnic_rq_post(struct vnic_rq *rq,</div><div class='add'>+	void *os_buf, unsigned int os_buf_index,</div><div class='add'>+	dma_addr_t dma_addr, unsigned int len)</div><div class='add'>+{</div><div class='add'>+	struct vnic_rq_buf *buf = rq-&gt;to_use;</div><div class='add'>+</div><div class='add'>+	buf-&gt;os_buf = os_buf;</div><div class='add'>+	buf-&gt;os_buf_index = os_buf_index;</div><div class='add'>+	buf-&gt;dma_addr = dma_addr;</div><div class='add'>+	buf-&gt;len = len;</div><div class='add'>+</div><div class='add'>+	buf = buf-&gt;next;</div><div class='add'>+	rq-&gt;to_use = buf;</div><div class='add'>+	rq-&gt;ring.desc_avail--;</div><div class='add'>+</div><div class='add'>+	/* Move the posted_index every nth descriptor</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+#ifndef VNIC_RQ_RETURN_RATE</div><div class='add'>+#define VNIC_RQ_RETURN_RATE		0xf	/* keep 2^n - 1 */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	if ((buf-&gt;index &amp; VNIC_RQ_RETURN_RATE) == 0)</div><div class='add'>+		iowrite32(buf-&gt;index, &amp;rq-&gt;ctrl-&gt;posted_index);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void vnic_rq_return_descs(struct vnic_rq *rq, unsigned int count)</div><div class='add'>+{</div><div class='add'>+	rq-&gt;ring.desc_avail += count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+enum desc_return_options {</div><div class='add'>+	VNIC_RQ_RETURN_DESC,</div><div class='add'>+	VNIC_RQ_DEFER_RETURN_DESC,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline void vnic_rq_service(struct vnic_rq *rq,</div><div class='add'>+	struct cq_desc *cq_desc, u16 completed_index,</div><div class='add'>+	int desc_return, void (*buf_service)(struct vnic_rq *rq,</div><div class='add'>+	struct cq_desc *cq_desc, struct vnic_rq_buf *buf,</div><div class='add'>+	int skipped, void *opaque), void *opaque)</div><div class='add'>+{</div><div class='add'>+	struct vnic_rq_buf *buf;</div><div class='add'>+	int skipped;</div><div class='add'>+</div><div class='add'>+	buf = rq-&gt;to_clean;</div><div class='add'>+	while (1) {</div><div class='add'>+</div><div class='add'>+		skipped = (buf-&gt;index != completed_index);</div><div class='add'>+</div><div class='add'>+		(*buf_service)(rq, cq_desc, buf, skipped, opaque);</div><div class='add'>+</div><div class='add'>+		if (desc_return == VNIC_RQ_RETURN_DESC)</div><div class='add'>+			rq-&gt;ring.desc_avail++;</div><div class='add'>+</div><div class='add'>+		rq-&gt;to_clean = buf-&gt;next;</div><div class='add'>+</div><div class='add'>+		if (!skipped)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		buf = rq-&gt;to_clean;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int vnic_rq_fill(struct vnic_rq *rq,</div><div class='add'>+	int (*buf_fill)(struct vnic_rq *rq))</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	while (vnic_rq_desc_avail(rq) &gt; 1) {</div><div class='add'>+</div><div class='add'>+		err = (*buf_fill)(rq);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void vnic_rq_free(struct vnic_rq *rq);</div><div class='add'>+int vnic_rq_alloc(struct vnic_dev *vdev, struct vnic_rq *rq, unsigned int index,</div><div class='add'>+	unsigned int desc_count, unsigned int desc_size);</div><div class='add'>+void vnic_rq_init(struct vnic_rq *rq, unsigned int cq_index,</div><div class='add'>+	unsigned int error_interrupt_enable,</div><div class='add'>+	unsigned int error_interrupt_offset);</div><div class='add'>+unsigned int vnic_rq_error_status(struct vnic_rq *rq);</div><div class='add'>+void vnic_rq_enable(struct vnic_rq *rq);</div><div class='add'>+int vnic_rq_disable(struct vnic_rq *rq);</div><div class='add'>+void vnic_rq_clean(struct vnic_rq *rq,</div><div class='add'>+	void (*buf_clean)(struct vnic_rq *rq, struct vnic_rq_buf *buf));</div><div class='add'>+</div><div class='add'>+#endif /* _VNIC_RQ_H_ */</div><div class='head'>diff --git a/drivers/net/enic/vnic_rss.h b/drivers/net/enic/vnic_rss.h<br/>new file mode 100644<br/>index 000000000000..e325d65d7c34<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/enic/vnic_rss.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/enic/vnic_rss.h</a></div><div class='hunk'>@@ -0,0 +1,32 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2008 Cisco Systems, Inc.  All rights reserved.</div><div class='add'>+ * Copyright 2007 Nuova Systems, Inc.  All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _VNIC_RSS_H_</div><div class='add'>+#define _VNIC_RSS_H_</div><div class='add'>+</div><div class='add'>+/* RSS key array */</div><div class='add'>+union vnic_rss_key {</div><div class='add'>+	struct {</div><div class='add'>+		u8 b[10];</div><div class='add'>+		u8 b_pad[6];</div><div class='add'>+	} key[4];</div><div class='add'>+	u64 raw[8];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* RSS cpu array */</div><div class='add'>+union vnic_rss_cpu {</div><div class='add'>+	struct {</div><div class='add'>+		u8 b[4] ;</div><div class='add'>+		u8 b_pad[4];</div><div class='add'>+	} cpu[32];</div><div class='add'>+	u64 raw[32];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void vnic_set_rss_key(union vnic_rss_key *rss_key, u8 *key);</div><div class='add'>+void vnic_set_rss_cpu(union vnic_rss_cpu *rss_cpu, u8 *cpu);</div><div class='add'>+void vnic_get_rss_key(union vnic_rss_key *rss_key, u8 *key);</div><div class='add'>+void vnic_get_rss_cpu(union vnic_rss_cpu *rss_cpu, u8 *cpu);</div><div class='add'>+</div><div class='add'>+#endif /* _VNIC_RSS_H_ */</div><div class='head'>diff --git a/drivers/net/enic/vnic_stats.h b/drivers/net/enic/vnic_stats.h<br/>new file mode 100644<br/>index 000000000000..9ff9614d89b1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/enic/vnic_stats.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/enic/vnic_stats.h</a></div><div class='hunk'>@@ -0,0 +1,70 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2008 Cisco Systems, Inc.  All rights reserved.</div><div class='add'>+ * Copyright 2007 Nuova Systems, Inc.  All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you may redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; version 2 of the License.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='add'>+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='add'>+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='add'>+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='add'>+ * SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _VNIC_STATS_H_</div><div class='add'>+#define _VNIC_STATS_H_</div><div class='add'>+</div><div class='add'>+/* Tx statistics */</div><div class='add'>+struct vnic_tx_stats {</div><div class='add'>+	u64 tx_frames_ok;</div><div class='add'>+	u64 tx_unicast_frames_ok;</div><div class='add'>+	u64 tx_multicast_frames_ok;</div><div class='add'>+	u64 tx_broadcast_frames_ok;</div><div class='add'>+	u64 tx_bytes_ok;</div><div class='add'>+	u64 tx_unicast_bytes_ok;</div><div class='add'>+	u64 tx_multicast_bytes_ok;</div><div class='add'>+	u64 tx_broadcast_bytes_ok;</div><div class='add'>+	u64 tx_drops;</div><div class='add'>+	u64 tx_errors;</div><div class='add'>+	u64 tx_tso;</div><div class='add'>+	u64 rsvd[16];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Rx statistics */</div><div class='add'>+struct vnic_rx_stats {</div><div class='add'>+	u64 rx_frames_ok;</div><div class='add'>+	u64 rx_frames_total;</div><div class='add'>+	u64 rx_unicast_frames_ok;</div><div class='add'>+	u64 rx_multicast_frames_ok;</div><div class='add'>+	u64 rx_broadcast_frames_ok;</div><div class='add'>+	u64 rx_bytes_ok;</div><div class='add'>+	u64 rx_unicast_bytes_ok;</div><div class='add'>+	u64 rx_multicast_bytes_ok;</div><div class='add'>+	u64 rx_broadcast_bytes_ok;</div><div class='add'>+	u64 rx_drop;</div><div class='add'>+	u64 rx_no_bufs;</div><div class='add'>+	u64 rx_errors;</div><div class='add'>+	u64 rx_rss;</div><div class='add'>+	u64 rx_crc_errors;</div><div class='add'>+	u64 rx_frames_64;</div><div class='add'>+	u64 rx_frames_127;</div><div class='add'>+	u64 rx_frames_255;</div><div class='add'>+	u64 rx_frames_511;</div><div class='add'>+	u64 rx_frames_1023;</div><div class='add'>+	u64 rx_frames_1518;</div><div class='add'>+	u64 rx_frames_to_max;</div><div class='add'>+	u64 rsvd[16];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct vnic_stats {</div><div class='add'>+	struct vnic_tx_stats tx;</div><div class='add'>+	struct vnic_rx_stats rx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif /* _VNIC_STATS_H_ */</div><div class='head'>diff --git a/drivers/net/enic/vnic_wq.c b/drivers/net/enic/vnic_wq.c<br/>new file mode 100644<br/>index 000000000000..a576d04708ef<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/enic/vnic_wq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/enic/vnic_wq.c</a></div><div class='hunk'>@@ -0,0 +1,184 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2008 Cisco Systems, Inc.  All rights reserved.</div><div class='add'>+ * Copyright 2007 Nuova Systems, Inc.  All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you may redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; version 2 of the License.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='add'>+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='add'>+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='add'>+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='add'>+ * SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+</div><div class='add'>+#include "vnic_dev.h"</div><div class='add'>+#include "vnic_wq.h"</div><div class='add'>+</div><div class='add'>+static int vnic_wq_alloc_bufs(struct vnic_wq *wq)</div><div class='add'>+{</div><div class='add'>+	struct vnic_wq_buf *buf;</div><div class='add'>+	struct vnic_dev *vdev;</div><div class='add'>+	unsigned int i, j, count = wq-&gt;ring.desc_count;</div><div class='add'>+	unsigned int blks = VNIC_WQ_BUF_BLKS_NEEDED(count);</div><div class='add'>+</div><div class='add'>+	vdev = wq-&gt;vdev;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; blks; i++) {</div><div class='add'>+		wq-&gt;bufs[i] = kzalloc(VNIC_WQ_BUF_BLK_SZ, GFP_ATOMIC);</div><div class='add'>+		if (!wq-&gt;bufs[i]) {</div><div class='add'>+			printk(KERN_ERR "Failed to alloc wq_bufs\n");</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; blks; i++) {</div><div class='add'>+		buf = wq-&gt;bufs[i];</div><div class='add'>+		for (j = 0; j &lt; VNIC_WQ_BUF_BLK_ENTRIES; j++) {</div><div class='add'>+			buf-&gt;index = i * VNIC_WQ_BUF_BLK_ENTRIES + j;</div><div class='add'>+			buf-&gt;desc = (u8 *)wq-&gt;ring.descs +</div><div class='add'>+				wq-&gt;ring.desc_size * buf-&gt;index;</div><div class='add'>+			if (buf-&gt;index + 1 == count) {</div><div class='add'>+				buf-&gt;next = wq-&gt;bufs[0];</div><div class='add'>+				break;</div><div class='add'>+			} else if (j + 1 == VNIC_WQ_BUF_BLK_ENTRIES) {</div><div class='add'>+				buf-&gt;next = wq-&gt;bufs[i + 1];</div><div class='add'>+			} else {</div><div class='add'>+				buf-&gt;next = buf + 1;</div><div class='add'>+				buf++;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	wq-&gt;to_use = wq-&gt;to_clean = wq-&gt;bufs[0];</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void vnic_wq_free(struct vnic_wq *wq)</div><div class='add'>+{</div><div class='add'>+	struct vnic_dev *vdev;</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	vdev = wq-&gt;vdev;</div><div class='add'>+</div><div class='add'>+	vnic_dev_free_desc_ring(vdev, &amp;wq-&gt;ring);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; VNIC_WQ_BUF_BLKS_MAX; i++) {</div><div class='add'>+		kfree(wq-&gt;bufs[i]);</div><div class='add'>+		wq-&gt;bufs[i] = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	wq-&gt;ctrl = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int vnic_wq_alloc(struct vnic_dev *vdev, struct vnic_wq *wq, unsigned int index,</div><div class='add'>+	unsigned int desc_count, unsigned int desc_size)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	wq-&gt;index = index;</div><div class='add'>+	wq-&gt;vdev = vdev;</div><div class='add'>+</div><div class='add'>+	wq-&gt;ctrl = vnic_dev_get_res(vdev, RES_TYPE_WQ, index);</div><div class='add'>+	if (!wq-&gt;ctrl) {</div><div class='add'>+		printk(KERN_ERR "Failed to hook WQ[%d] resource\n", index);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	vnic_wq_disable(wq);</div><div class='add'>+</div><div class='add'>+	err = vnic_dev_alloc_desc_ring(vdev, &amp;wq-&gt;ring, desc_count, desc_size);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = vnic_wq_alloc_bufs(wq);</div><div class='add'>+	if (err) {</div><div class='add'>+		vnic_wq_free(wq);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void vnic_wq_init(struct vnic_wq *wq, unsigned int cq_index,</div><div class='add'>+	unsigned int error_interrupt_enable,</div><div class='add'>+	unsigned int error_interrupt_offset)</div><div class='add'>+{</div><div class='add'>+	u64 paddr;</div><div class='add'>+</div><div class='add'>+	paddr = (u64)wq-&gt;ring.base_addr | VNIC_PADDR_TARGET;</div><div class='add'>+	writeq(paddr, &amp;wq-&gt;ctrl-&gt;ring_base);</div><div class='add'>+	iowrite32(wq-&gt;ring.desc_count, &amp;wq-&gt;ctrl-&gt;ring_size);</div><div class='add'>+	iowrite32(0, &amp;wq-&gt;ctrl-&gt;fetch_index);</div><div class='add'>+	iowrite32(0, &amp;wq-&gt;ctrl-&gt;posted_index);</div><div class='add'>+	iowrite32(cq_index, &amp;wq-&gt;ctrl-&gt;cq_index);</div><div class='add'>+	iowrite32(error_interrupt_enable, &amp;wq-&gt;ctrl-&gt;error_interrupt_enable);</div><div class='add'>+	iowrite32(error_interrupt_offset, &amp;wq-&gt;ctrl-&gt;error_interrupt_offset);</div><div class='add'>+	iowrite32(0, &amp;wq-&gt;ctrl-&gt;error_status);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+unsigned int vnic_wq_error_status(struct vnic_wq *wq)</div><div class='add'>+{</div><div class='add'>+	return ioread32(&amp;wq-&gt;ctrl-&gt;error_status);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void vnic_wq_enable(struct vnic_wq *wq)</div><div class='add'>+{</div><div class='add'>+	iowrite32(1, &amp;wq-&gt;ctrl-&gt;enable);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int vnic_wq_disable(struct vnic_wq *wq)</div><div class='add'>+{</div><div class='add'>+	unsigned int wait;</div><div class='add'>+</div><div class='add'>+	iowrite32(0, &amp;wq-&gt;ctrl-&gt;enable);</div><div class='add'>+</div><div class='add'>+	/* Wait for HW to ACK disable request */</div><div class='add'>+	for (wait = 0; wait &lt; 100; wait++) {</div><div class='add'>+		if (!(ioread32(&amp;wq-&gt;ctrl-&gt;running)))</div><div class='add'>+			return 0;</div><div class='add'>+		udelay(1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	printk(KERN_ERR "Failed to disable WQ[%d]\n", wq-&gt;index);</div><div class='add'>+</div><div class='add'>+	return -ETIMEDOUT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void vnic_wq_clean(struct vnic_wq *wq,</div><div class='add'>+	void (*buf_clean)(struct vnic_wq *wq, struct vnic_wq_buf *buf))</div><div class='add'>+{</div><div class='add'>+	struct vnic_wq_buf *buf;</div><div class='add'>+</div><div class='add'>+	BUG_ON(ioread32(&amp;wq-&gt;ctrl-&gt;enable));</div><div class='add'>+</div><div class='add'>+	buf = wq-&gt;to_clean;</div><div class='add'>+</div><div class='add'>+	while (vnic_wq_desc_used(wq) &gt; 0) {</div><div class='add'>+</div><div class='add'>+		(*buf_clean)(wq, buf);</div><div class='add'>+</div><div class='add'>+		buf = wq-&gt;to_clean = buf-&gt;next;</div><div class='add'>+		wq-&gt;ring.desc_avail++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	wq-&gt;to_use = wq-&gt;to_clean = wq-&gt;bufs[0];</div><div class='add'>+</div><div class='add'>+	iowrite32(0, &amp;wq-&gt;ctrl-&gt;fetch_index);</div><div class='add'>+	iowrite32(0, &amp;wq-&gt;ctrl-&gt;posted_index);</div><div class='add'>+	iowrite32(0, &amp;wq-&gt;ctrl-&gt;error_status);</div><div class='add'>+</div><div class='add'>+	vnic_dev_clear_desc_ring(&amp;wq-&gt;ring);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/enic/vnic_wq.h b/drivers/net/enic/vnic_wq.h<br/>new file mode 100644<br/>index 000000000000..7081828d8a42<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/enic/vnic_wq.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/enic/vnic_wq.h</a></div><div class='hunk'>@@ -0,0 +1,154 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2008 Cisco Systems, Inc.  All rights reserved.</div><div class='add'>+ * Copyright 2007 Nuova Systems, Inc.  All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you may redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; version 2 of the License.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='add'>+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='add'>+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='add'>+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='add'>+ * SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _VNIC_WQ_H_</div><div class='add'>+#define _VNIC_WQ_H_</div><div class='add'>+</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+</div><div class='add'>+#include "vnic_dev.h"</div><div class='add'>+#include "vnic_cq.h"</div><div class='add'>+</div><div class='add'>+/* Work queue control */</div><div class='add'>+struct vnic_wq_ctrl {</div><div class='add'>+	u64 ring_base;			/* 0x00 */</div><div class='add'>+	u32 ring_size;			/* 0x08 */</div><div class='add'>+	u32 pad0;</div><div class='add'>+	u32 posted_index;		/* 0x10 */</div><div class='add'>+	u32 pad1;</div><div class='add'>+	u32 cq_index;			/* 0x18 */</div><div class='add'>+	u32 pad2;</div><div class='add'>+	u32 enable;			/* 0x20 */</div><div class='add'>+	u32 pad3;</div><div class='add'>+	u32 running;			/* 0x28 */</div><div class='add'>+	u32 pad4;</div><div class='add'>+	u32 fetch_index;		/* 0x30 */</div><div class='add'>+	u32 pad5;</div><div class='add'>+	u32 dca_value;			/* 0x38 */</div><div class='add'>+	u32 pad6;</div><div class='add'>+	u32 error_interrupt_enable;	/* 0x40 */</div><div class='add'>+	u32 pad7;</div><div class='add'>+	u32 error_interrupt_offset;	/* 0x48 */</div><div class='add'>+	u32 pad8;</div><div class='add'>+	u32 error_status;		/* 0x50 */</div><div class='add'>+	u32 pad9;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct vnic_wq_buf {</div><div class='add'>+	struct vnic_wq_buf *next;</div><div class='add'>+	dma_addr_t dma_addr;</div><div class='add'>+	void *os_buf;</div><div class='add'>+	unsigned int len;</div><div class='add'>+	unsigned int index;</div><div class='add'>+	int sop;</div><div class='add'>+	void *desc;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Break the vnic_wq_buf allocations into blocks of 64 entries */</div><div class='add'>+#define VNIC_WQ_BUF_BLK_ENTRIES 64</div><div class='add'>+#define VNIC_WQ_BUF_BLK_SZ \</div><div class='add'>+	(VNIC_WQ_BUF_BLK_ENTRIES * sizeof(struct vnic_wq_buf))</div><div class='add'>+#define VNIC_WQ_BUF_BLKS_NEEDED(entries) \</div><div class='add'>+	DIV_ROUND_UP(entries, VNIC_WQ_BUF_BLK_ENTRIES)</div><div class='add'>+#define VNIC_WQ_BUF_BLKS_MAX VNIC_WQ_BUF_BLKS_NEEDED(4096)</div><div class='add'>+</div><div class='add'>+struct vnic_wq {</div><div class='add'>+	unsigned int index;</div><div class='add'>+	struct vnic_dev *vdev;</div><div class='add'>+	struct vnic_wq_ctrl __iomem *ctrl;              /* memory-mapped */</div><div class='add'>+	struct vnic_dev_ring ring;</div><div class='add'>+	struct vnic_wq_buf *bufs[VNIC_WQ_BUF_BLKS_MAX];</div><div class='add'>+	struct vnic_wq_buf *to_use;</div><div class='add'>+	struct vnic_wq_buf *to_clean;</div><div class='add'>+	unsigned int pkts_outstanding;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline unsigned int vnic_wq_desc_avail(struct vnic_wq *wq)</div><div class='add'>+{</div><div class='add'>+	/* how many does SW own? */</div><div class='add'>+	return wq-&gt;ring.desc_avail;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned int vnic_wq_desc_used(struct vnic_wq *wq)</div><div class='add'>+{</div><div class='add'>+	/* how many does HW own? */</div><div class='add'>+	return wq-&gt;ring.desc_count - wq-&gt;ring.desc_avail - 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void *vnic_wq_next_desc(struct vnic_wq *wq)</div><div class='add'>+{</div><div class='add'>+	return wq-&gt;to_use-&gt;desc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void vnic_wq_post(struct vnic_wq *wq,</div><div class='add'>+	void *os_buf, dma_addr_t dma_addr,</div><div class='add'>+	unsigned int len, int sop, int eop)</div><div class='add'>+{</div><div class='add'>+	struct vnic_wq_buf *buf = wq-&gt;to_use;</div><div class='add'>+</div><div class='add'>+	buf-&gt;sop = sop;</div><div class='add'>+	buf-&gt;os_buf = eop ? os_buf : NULL;</div><div class='add'>+	buf-&gt;dma_addr = dma_addr;</div><div class='add'>+	buf-&gt;len = len;</div><div class='add'>+</div><div class='add'>+	buf = buf-&gt;next;</div><div class='add'>+	if (eop)</div><div class='add'>+		iowrite32(buf-&gt;index, &amp;wq-&gt;ctrl-&gt;posted_index);</div><div class='add'>+	wq-&gt;to_use = buf;</div><div class='add'>+</div><div class='add'>+	wq-&gt;ring.desc_avail--;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void vnic_wq_service(struct vnic_wq *wq,</div><div class='add'>+	struct cq_desc *cq_desc, u16 completed_index,</div><div class='add'>+	void (*buf_service)(struct vnic_wq *wq,</div><div class='add'>+	struct cq_desc *cq_desc, struct vnic_wq_buf *buf, void *opaque),</div><div class='add'>+	void *opaque)</div><div class='add'>+{</div><div class='add'>+	struct vnic_wq_buf *buf;</div><div class='add'>+</div><div class='add'>+	buf = wq-&gt;to_clean;</div><div class='add'>+	while (1) {</div><div class='add'>+</div><div class='add'>+		(*buf_service)(wq, cq_desc, buf, opaque);</div><div class='add'>+</div><div class='add'>+		wq-&gt;ring.desc_avail++;</div><div class='add'>+</div><div class='add'>+		wq-&gt;to_clean = buf-&gt;next;</div><div class='add'>+</div><div class='add'>+		if (buf-&gt;index == completed_index)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		buf = wq-&gt;to_clean;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void vnic_wq_free(struct vnic_wq *wq);</div><div class='add'>+int vnic_wq_alloc(struct vnic_dev *vdev, struct vnic_wq *wq, unsigned int index,</div><div class='add'>+	unsigned int desc_count, unsigned int desc_size);</div><div class='add'>+void vnic_wq_init(struct vnic_wq *wq, unsigned int cq_index,</div><div class='add'>+	unsigned int error_interrupt_enable,</div><div class='add'>+	unsigned int error_interrupt_offset);</div><div class='add'>+unsigned int vnic_wq_error_status(struct vnic_wq *wq);</div><div class='add'>+void vnic_wq_enable(struct vnic_wq *wq);</div><div class='add'>+int vnic_wq_disable(struct vnic_wq *wq);</div><div class='add'>+void vnic_wq_clean(struct vnic_wq *wq,</div><div class='add'>+	void (*buf_clean)(struct vnic_wq *wq, struct vnic_wq_buf *buf));</div><div class='add'>+</div><div class='add'>+#endif /* _VNIC_WQ_H_ */</div><div class='head'>diff --git a/drivers/net/enic/wq_enet_desc.h b/drivers/net/enic/wq_enet_desc.h<br/>new file mode 100644<br/>index 000000000000..483596c2d8bf<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/enic/wq_enet_desc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/enic/wq_enet_desc.h</a></div><div class='hunk'>@@ -0,0 +1,98 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2008 Cisco Systems, Inc.  All rights reserved.</div><div class='add'>+ * Copyright 2007 Nuova Systems, Inc.  All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you may redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; version 2 of the License.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='add'>+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='add'>+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='add'>+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='add'>+ * SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _WQ_ENET_DESC_H_</div><div class='add'>+#define _WQ_ENET_DESC_H_</div><div class='add'>+</div><div class='add'>+/* Ethernet work queue descriptor: 16B */</div><div class='add'>+struct wq_enet_desc {</div><div class='add'>+	__le64 address;</div><div class='add'>+	__le16 length;</div><div class='add'>+	__le16 mss_loopback;</div><div class='add'>+	__le16 header_length_flags;</div><div class='add'>+	__le16 vlan_tag;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define WQ_ENET_ADDR_BITS		64</div><div class='add'>+#define WQ_ENET_LEN_BITS		14</div><div class='add'>+#define WQ_ENET_LEN_MASK		((1 &lt;&lt; WQ_ENET_LEN_BITS) - 1)</div><div class='add'>+#define WQ_ENET_MSS_BITS		14</div><div class='add'>+#define WQ_ENET_MSS_MASK		((1 &lt;&lt; WQ_ENET_MSS_BITS) - 1)</div><div class='add'>+#define WQ_ENET_MSS_SHIFT		2</div><div class='add'>+#define WQ_ENET_LOOPBACK_SHIFT		1</div><div class='add'>+#define WQ_ENET_HDRLEN_BITS		10</div><div class='add'>+#define WQ_ENET_HDRLEN_MASK		((1 &lt;&lt; WQ_ENET_HDRLEN_BITS) - 1)</div><div class='add'>+#define WQ_ENET_FLAGS_OM_BITS		2</div><div class='add'>+#define WQ_ENET_FLAGS_OM_MASK		((1 &lt;&lt; WQ_ENET_FLAGS_OM_BITS) - 1)</div><div class='add'>+#define WQ_ENET_FLAGS_EOP_SHIFT		12</div><div class='add'>+#define WQ_ENET_FLAGS_CQ_ENTRY_SHIFT	13</div><div class='add'>+#define WQ_ENET_FLAGS_FCOE_ENCAP_SHIFT	14</div><div class='add'>+#define WQ_ENET_FLAGS_VLAN_TAG_INSERT_SHIFT	15</div><div class='add'>+</div><div class='add'>+#define WQ_ENET_OFFLOAD_MODE_CSUM	0</div><div class='add'>+#define WQ_ENET_OFFLOAD_MODE_RESERVED	1</div><div class='add'>+#define WQ_ENET_OFFLOAD_MODE_CSUM_L4	2</div><div class='add'>+#define WQ_ENET_OFFLOAD_MODE_TSO	3</div><div class='add'>+</div><div class='add'>+static inline void wq_enet_desc_enc(struct wq_enet_desc *desc,</div><div class='add'>+	u64 address, u16 length, u16 mss, u16 header_length,</div><div class='add'>+	u8 offload_mode, u8 eop, u8 cq_entry, u8 fcoe_encap,</div><div class='add'>+	u8 vlan_tag_insert, u16 vlan_tag, u8 loopback)</div><div class='add'>+{</div><div class='add'>+	desc-&gt;address = cpu_to_le64(address);</div><div class='add'>+	desc-&gt;length = cpu_to_le16(length &amp; WQ_ENET_LEN_MASK);</div><div class='add'>+	desc-&gt;mss_loopback = cpu_to_le16((mss &amp; WQ_ENET_MSS_MASK) &lt;&lt;</div><div class='add'>+		WQ_ENET_MSS_SHIFT | (loopback &amp; 1) &lt;&lt; WQ_ENET_LOOPBACK_SHIFT);</div><div class='add'>+	desc-&gt;header_length_flags = cpu_to_le16(</div><div class='add'>+		(header_length &amp; WQ_ENET_HDRLEN_MASK) |</div><div class='add'>+		(offload_mode &amp; WQ_ENET_FLAGS_OM_MASK) &lt;&lt; WQ_ENET_HDRLEN_BITS |</div><div class='add'>+		(eop &amp; 1) &lt;&lt; WQ_ENET_FLAGS_EOP_SHIFT |</div><div class='add'>+		(cq_entry &amp; 1) &lt;&lt; WQ_ENET_FLAGS_CQ_ENTRY_SHIFT |</div><div class='add'>+		(fcoe_encap &amp; 1) &lt;&lt; WQ_ENET_FLAGS_FCOE_ENCAP_SHIFT |</div><div class='add'>+		(vlan_tag_insert &amp; 1) &lt;&lt; WQ_ENET_FLAGS_VLAN_TAG_INSERT_SHIFT);</div><div class='add'>+	desc-&gt;vlan_tag = cpu_to_le16(vlan_tag);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void wq_enet_desc_dec(struct wq_enet_desc *desc,</div><div class='add'>+	u64 *address, u16 *length, u16 *mss, u16 *header_length,</div><div class='add'>+	u8 *offload_mode, u8 *eop, u8 *cq_entry, u8 *fcoe_encap,</div><div class='add'>+	u8 *vlan_tag_insert, u16 *vlan_tag, u8 *loopback)</div><div class='add'>+{</div><div class='add'>+	*address = le64_to_cpu(desc-&gt;address);</div><div class='add'>+	*length = le16_to_cpu(desc-&gt;length) &amp; WQ_ENET_LEN_MASK;</div><div class='add'>+	*mss = (le16_to_cpu(desc-&gt;mss_loopback) &gt;&gt; WQ_ENET_MSS_SHIFT) &amp;</div><div class='add'>+		WQ_ENET_MSS_MASK;</div><div class='add'>+	*loopback = (u8)((le16_to_cpu(desc-&gt;mss_loopback) &gt;&gt;</div><div class='add'>+		WQ_ENET_LOOPBACK_SHIFT) &amp; 1);</div><div class='add'>+	*header_length = le16_to_cpu(desc-&gt;header_length_flags) &amp;</div><div class='add'>+		WQ_ENET_HDRLEN_MASK;</div><div class='add'>+	*offload_mode = (u8)((le16_to_cpu(desc-&gt;header_length_flags) &gt;&gt;</div><div class='add'>+		WQ_ENET_HDRLEN_BITS) &amp; WQ_ENET_FLAGS_OM_MASK);</div><div class='add'>+	*eop = (u8)((le16_to_cpu(desc-&gt;header_length_flags) &gt;&gt;</div><div class='add'>+		WQ_ENET_FLAGS_EOP_SHIFT) &amp; 1);</div><div class='add'>+	*cq_entry = (u8)((le16_to_cpu(desc-&gt;header_length_flags) &gt;&gt;</div><div class='add'>+		WQ_ENET_FLAGS_CQ_ENTRY_SHIFT) &amp; 1);</div><div class='add'>+	*fcoe_encap = (u8)((le16_to_cpu(desc-&gt;header_length_flags) &gt;&gt;</div><div class='add'>+		WQ_ENET_FLAGS_FCOE_ENCAP_SHIFT) &amp; 1);</div><div class='add'>+	*vlan_tag_insert = (u8)((le16_to_cpu(desc-&gt;header_length_flags) &gt;&gt;</div><div class='add'>+		WQ_ENET_FLAGS_VLAN_TAG_INSERT_SHIFT) &amp; 1);</div><div class='add'>+	*vlan_tag = le16_to_cpu(desc-&gt;vlan_tag);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* _WQ_ENET_DESC_H_ */</div><div class='head'>diff --git a/drivers/net/fealnx.c b/drivers/net/fealnx.c<br/>index 3c1364de2b66..b455ae931f7a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/fealnx.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/fealnx.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/fealnx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/fealnx.c</a></div><div class='hunk'>@@ -431,7 +431,7 @@ static void getlinktype(struct net_device *dev);</div><div class='ctx'> static void getlinkstatus(struct net_device *dev);</div><div class='ctx'> static void netdev_timer(unsigned long data);</div><div class='ctx'> static void reset_timer(unsigned long data);</div><div class='del'>-static void tx_timeout(struct net_device *dev);</div><div class='add'>+static void fealnx_tx_timeout(struct net_device *dev);</div><div class='ctx'> static void init_ring(struct net_device *dev);</div><div class='ctx'> static int start_tx(struct sk_buff *skb, struct net_device *dev);</div><div class='ctx'> static irqreturn_t intr_handler(int irq, void *dev_instance);</div><div class='hunk'>@@ -658,7 +658,7 @@ static int __devinit fealnx_init_one(struct pci_dev *pdev,</div><div class='ctx'> 	dev-&gt;set_multicast_list = &amp;set_rx_mode;</div><div class='ctx'> 	dev-&gt;do_ioctl = &amp;mii_ioctl;</div><div class='ctx'> 	dev-&gt;ethtool_ops = &amp;netdev_ethtool_ops;</div><div class='del'>-	dev-&gt;tx_timeout = &amp;tx_timeout;</div><div class='add'>+	dev-&gt;tx_timeout = &amp;fealnx_tx_timeout;</div><div class='ctx'> 	dev-&gt;watchdog_timeo = TX_TIMEOUT;</div><div class='ctx'> </div><div class='ctx'> 	err = register_netdev(dev);</div><div class='hunk'>@@ -1198,7 +1198,7 @@ static void reset_timer(unsigned long data)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static void tx_timeout(struct net_device *dev)</div><div class='add'>+static void fealnx_tx_timeout(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct netdev_private *np = netdev_priv(dev);</div><div class='ctx'> 	void __iomem *ioaddr = np-&gt;mem;</div><div class='head'>diff --git a/drivers/net/fec_mpc52xx_phy.c b/drivers/net/fec_mpc52xx_phy.c<br/>index f5634447276d..08e18bcb970f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/fec_mpc52xx_phy.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/fec_mpc52xx_phy.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/fec_mpc52xx_phy.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/fec_mpc52xx_phy.c</a></div><div class='hunk'>@@ -83,7 +83,7 @@ static int mpc52xx_fec_mdio_probe(struct of_device *of, const struct of_device_i</div><div class='ctx'> 	int err;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	bus = kzalloc(sizeof(*bus), GFP_KERNEL);</div><div class='add'>+	bus = mdiobus_alloc();</div><div class='ctx'> 	if (bus == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	priv = kzalloc(sizeof(*priv), GFP_KERNEL);</div><div class='hunk'>@@ -127,7 +127,7 @@ static int mpc52xx_fec_mdio_probe(struct of_device *of, const struct of_device_i</div><div class='ctx'> 	snprintf(bus-&gt;id, MII_BUS_ID_SIZE, "%x", res.start);</div><div class='ctx'> 	bus-&gt;priv = priv;</div><div class='ctx'> </div><div class='del'>-	bus-&gt;dev = dev;</div><div class='add'>+	bus-&gt;parent = dev;</div><div class='ctx'> 	dev_set_drvdata(dev, bus);</div><div class='ctx'> </div><div class='ctx'> 	/* set MII speed */</div><div class='hunk'>@@ -150,7 +150,7 @@ static int mpc52xx_fec_mdio_probe(struct of_device *of, const struct of_device_i</div><div class='ctx'> 			irq_dispose_mapping(bus-&gt;irq[i]);</div><div class='ctx'> 	kfree(bus-&gt;irq);</div><div class='ctx'> 	kfree(priv);</div><div class='del'>-	kfree(bus);</div><div class='add'>+	mdiobus_free(bus);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -171,7 +171,7 @@ static int mpc52xx_fec_mdio_remove(struct of_device *of)</div><div class='ctx'> 			irq_dispose_mapping(bus-&gt;irq[i]);</div><div class='ctx'> 	kfree(priv);</div><div class='ctx'> 	kfree(bus-&gt;irq);</div><div class='del'>-	kfree(bus);</div><div class='add'>+	mdiobus_free(bus);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c<br/>index eeb55ed2152d..cc7328b15521 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/forcedeth.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/forcedeth.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/forcedeth.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/forcedeth.c</a></div><div class='hunk'>@@ -337,7 +337,7 @@ enum {</div><div class='ctx'> 	NvRegMSIXIrqStatus = 0x3f0,</div><div class='ctx'> </div><div class='ctx'> 	NvRegPowerState2 = 0x600,</div><div class='del'>-#define NVREG_POWERSTATE2_POWERUP_MASK		0x0F11</div><div class='add'>+#define NVREG_POWERSTATE2_POWERUP_MASK		0x0F15</div><div class='ctx'> #define NVREG_POWERSTATE2_POWERUP_REV_A3	0x0001</div><div class='ctx'> #define NVREG_POWERSTATE2_PHY_RESET		0x0004</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/net/fs_enet/fs_enet-main.c b/drivers/net/fs_enet/fs_enet-main.c<br/>index 9d461825bf4c..cb51c1fb0338 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/fs_enet/fs_enet-main.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/fs_enet/fs_enet-main.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/fs_enet/fs_enet-main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/fs_enet/fs_enet-main.c</a></div><div class='hunk'>@@ -664,23 +664,6 @@ static int fs_enet_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int fs_request_irq(struct net_device *dev, int irq, const char *name,</div><div class='del'>-		irq_handler_t irqf)</div><div class='del'>-{</div><div class='del'>-	struct fs_enet_private *fep = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	(*fep-&gt;ops-&gt;pre_request_irq)(dev, irq);</div><div class='del'>-	return request_irq(irq, irqf, IRQF_SHARED, name, dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void fs_free_irq(struct net_device *dev, int irq)</div><div class='del'>-{</div><div class='del'>-	struct fs_enet_private *fep = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	free_irq(irq, dev);</div><div class='del'>-	(*fep-&gt;ops-&gt;post_free_irq)(dev, irq);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void fs_timeout(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct fs_enet_private *fep = netdev_priv(dev);</div><div class='hunk'>@@ -800,7 +783,8 @@ static int fs_enet_open(struct net_device *dev)</div><div class='ctx'> 		napi_enable(&amp;fep-&gt;napi);</div><div class='ctx'> </div><div class='ctx'> 	/* Install our interrupt handler. */</div><div class='del'>-	r = fs_request_irq(dev, fep-&gt;interrupt, "fs_enet-mac", fs_enet_interrupt);</div><div class='add'>+	r = request_irq(fep-&gt;interrupt, fs_enet_interrupt, IRQF_SHARED,</div><div class='add'>+			"fs_enet-mac", dev);</div><div class='ctx'> 	if (r != 0) {</div><div class='ctx'> 		printk(KERN_ERR DRV_MODULE_NAME</div><div class='ctx'> 		       ": %s Could not allocate FS_ENET IRQ!", dev-&gt;name);</div><div class='hunk'>@@ -842,7 +826,7 @@ static int fs_enet_close(struct net_device *dev)</div><div class='ctx'> 	/* release any irqs */</div><div class='ctx'> 	phy_disconnect(fep-&gt;phydev);</div><div class='ctx'> 	fep-&gt;phydev = NULL;</div><div class='del'>-	fs_free_irq(dev, fep-&gt;interrupt);</div><div class='add'>+	free_irq(fep-&gt;interrupt, dev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/fs_enet/fs_enet.h b/drivers/net/fs_enet/fs_enet.h<br/>index db46d2e72329..85a4bab7f630 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/fs_enet/fs_enet.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/fs_enet/fs_enet.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/fs_enet/fs_enet.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/fs_enet/fs_enet.h</a></div><div class='hunk'>@@ -34,8 +34,6 @@ struct fs_ops {</div><div class='ctx'> 	void (*adjust_link)(struct net_device *dev);</div><div class='ctx'> 	void (*restart)(struct net_device *dev);</div><div class='ctx'> 	void (*stop)(struct net_device *dev);</div><div class='del'>-	void (*pre_request_irq)(struct net_device *dev, int irq);</div><div class='del'>-	void (*post_free_irq)(struct net_device *dev, int irq);</div><div class='ctx'> 	void (*napi_clear_rx_event)(struct net_device *dev);</div><div class='ctx'> 	void (*napi_enable_rx)(struct net_device *dev);</div><div class='ctx'> 	void (*napi_disable_rx)(struct net_device *dev);</div><div class='head'>diff --git a/drivers/net/fs_enet/mac-fcc.c b/drivers/net/fs_enet/mac-fcc.c<br/>index 1c7ef812a8e3..22e5a847a588 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/fs_enet/mac-fcc.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/fs_enet/mac-fcc.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/fs_enet/mac-fcc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/fs_enet/mac-fcc.c</a></div><div class='hunk'>@@ -421,16 +421,6 @@ static void stop(struct net_device *dev)</div><div class='ctx'> 	fs_cleanup_bds(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void pre_request_irq(struct net_device *dev, int irq)</div><div class='del'>-{</div><div class='del'>-	/* nothing */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void post_free_irq(struct net_device *dev, int irq)</div><div class='del'>-{</div><div class='del'>-	/* nothing */</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void napi_clear_rx_event(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct fs_enet_private *fep = netdev_priv(dev);</div><div class='hunk'>@@ -540,8 +530,6 @@ const struct fs_ops fs_fcc_ops = {</div><div class='ctx'> 	.set_multicast_list	= set_multicast_list,</div><div class='ctx'> 	.restart		= restart,</div><div class='ctx'> 	.stop			= stop,</div><div class='del'>-	.pre_request_irq	= pre_request_irq,</div><div class='del'>-	.post_free_irq		= post_free_irq,</div><div class='ctx'> 	.napi_clear_rx_event	= napi_clear_rx_event,</div><div class='ctx'> 	.napi_enable_rx		= napi_enable_rx,</div><div class='ctx'> 	.napi_disable_rx	= napi_disable_rx,</div><div class='head'>diff --git a/drivers/net/fs_enet/mac-fec.c b/drivers/net/fs_enet/mac-fec.c<br/>index 0a7d1c5c6524..14e575313c89 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/fs_enet/mac-fec.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/fs_enet/mac-fec.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/fs_enet/mac-fec.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/fs_enet/mac-fec.c</a></div><div class='hunk'>@@ -313,11 +313,7 @@ static void restart(struct net_device *dev)</div><div class='ctx'> 	 * Clear any outstanding interrupt.</div><div class='ctx'> 	 */</div><div class='ctx'> 	FW(fecp, ievent, 0xffc0);</div><div class='del'>-#ifndef CONFIG_PPC_MERGE</div><div class='del'>-	FW(fecp, ivec, (fep-&gt;interrupt / 2) &lt;&lt; 29);</div><div class='del'>-#else</div><div class='ctx'> 	FW(fecp, ivec, (virq_to_hw(fep-&gt;interrupt) / 2) &lt;&lt; 29);</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * adjust to speed (only for DUET &amp; RMII)</div><div class='hunk'>@@ -413,30 +409,6 @@ static void stop(struct net_device *dev)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void pre_request_irq(struct net_device *dev, int irq)</div><div class='del'>-{</div><div class='del'>-#ifndef CONFIG_PPC_MERGE</div><div class='del'>-	immap_t *immap = fs_enet_immap;</div><div class='del'>-	u32 siel;</div><div class='del'>-</div><div class='del'>-	/* SIU interrupt */</div><div class='del'>-	if (irq &gt;= SIU_IRQ0 &amp;&amp; irq &lt; SIU_LEVEL7) {</div><div class='del'>-</div><div class='del'>-		siel = in_be32(&amp;immap-&gt;im_siu_conf.sc_siel);</div><div class='del'>-		if ((irq &amp; 1) == 0)</div><div class='del'>-			siel |= (0x80000000 &gt;&gt; irq);</div><div class='del'>-		else</div><div class='del'>-			siel &amp;= ~(0x80000000 &gt;&gt; (irq &amp; ~1));</div><div class='del'>-		out_be32(&amp;immap-&gt;im_siu_conf.sc_siel, siel);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void post_free_irq(struct net_device *dev, int irq)</div><div class='del'>-{</div><div class='del'>-	/* nothing */</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void napi_clear_rx_event(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct fs_enet_private *fep = netdev_priv(dev);</div><div class='hunk'>@@ -529,8 +501,6 @@ const struct fs_ops fs_fec_ops = {</div><div class='ctx'> 	.set_multicast_list	= set_multicast_list,</div><div class='ctx'> 	.restart		= restart,</div><div class='ctx'> 	.stop			= stop,</div><div class='del'>-	.pre_request_irq	= pre_request_irq,</div><div class='del'>-	.post_free_irq		= post_free_irq,</div><div class='ctx'> 	.napi_clear_rx_event	= napi_clear_rx_event,</div><div class='ctx'> 	.napi_enable_rx		= napi_enable_rx,</div><div class='ctx'> 	.napi_disable_rx	= napi_disable_rx,</div><div class='head'>diff --git a/drivers/net/fs_enet/mac-scc.c b/drivers/net/fs_enet/mac-scc.c<br/>index 22f50dd8b277..008cdd9cc536 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/fs_enet/mac-scc.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/fs_enet/mac-scc.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/fs_enet/mac-scc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/fs_enet/mac-scc.c</a></div><div class='hunk'>@@ -377,30 +377,6 @@ static void stop(struct net_device *dev)</div><div class='ctx'> 	fs_cleanup_bds(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void pre_request_irq(struct net_device *dev, int irq)</div><div class='del'>-{</div><div class='del'>-#ifndef CONFIG_PPC_MERGE</div><div class='del'>-	immap_t *immap = fs_enet_immap;</div><div class='del'>-	u32 siel;</div><div class='del'>-</div><div class='del'>-	/* SIU interrupt */</div><div class='del'>-	if (irq &gt;= SIU_IRQ0 &amp;&amp; irq &lt; SIU_LEVEL7) {</div><div class='del'>-</div><div class='del'>-		siel = in_be32(&amp;immap-&gt;im_siu_conf.sc_siel);</div><div class='del'>-		if ((irq &amp; 1) == 0)</div><div class='del'>-			siel |= (0x80000000 &gt;&gt; irq);</div><div class='del'>-		else</div><div class='del'>-			siel &amp;= ~(0x80000000 &gt;&gt; (irq &amp; ~1));</div><div class='del'>-		out_be32(&amp;immap-&gt;im_siu_conf.sc_siel, siel);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void post_free_irq(struct net_device *dev, int irq)</div><div class='del'>-{</div><div class='del'>-	/* nothing */</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void napi_clear_rx_event(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct fs_enet_private *fep = netdev_priv(dev);</div><div class='hunk'>@@ -494,8 +470,6 @@ const struct fs_ops fs_scc_ops = {</div><div class='ctx'> 	.set_multicast_list	= set_multicast_list,</div><div class='ctx'> 	.restart		= restart,</div><div class='ctx'> 	.stop			= stop,</div><div class='del'>-	.pre_request_irq	= pre_request_irq,</div><div class='del'>-	.post_free_irq		= post_free_irq,</div><div class='ctx'> 	.napi_clear_rx_event	= napi_clear_rx_event,</div><div class='ctx'> 	.napi_enable_rx		= napi_enable_rx,</div><div class='ctx'> 	.napi_disable_rx	= napi_disable_rx,</div><div class='head'>diff --git a/drivers/net/fs_enet/mii-bitbang.c b/drivers/net/fs_enet/mii-bitbang.c<br/>index be4b72f4f49a..49b6645d7e0c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/fs_enet/mii-bitbang.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/fs_enet/mii-bitbang.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/fs_enet/mii-bitbang.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/fs_enet/mii-bitbang.c</a></div><div class='hunk'>@@ -203,7 +203,7 @@ static int __devinit fs_enet_mdio_probe(struct of_device *ofdev,</div><div class='ctx'> 		if (!strcmp(np-&gt;type, "ethernet-phy"))</div><div class='ctx'> 			add_phy(new_bus, np);</div><div class='ctx'> </div><div class='del'>-	new_bus-&gt;dev = &amp;ofdev-&gt;dev;</div><div class='add'>+	new_bus-&gt;parent = &amp;ofdev-&gt;dev;</div><div class='ctx'> 	dev_set_drvdata(&amp;ofdev-&gt;dev, new_bus);</div><div class='ctx'> </div><div class='ctx'> 	ret = mdiobus_register(new_bus);</div><div class='hunk'>@@ -218,9 +218,9 @@ out_free_irqs:</div><div class='ctx'> out_unmap_regs:</div><div class='ctx'> 	iounmap(bitbang-&gt;dir);</div><div class='ctx'> out_free_bus:</div><div class='del'>-	kfree(new_bus);</div><div class='del'>-out_free_priv:</div><div class='ctx'> 	free_mdio_bitbang(new_bus);</div><div class='add'>+out_free_priv:</div><div class='add'>+	kfree(bitbang);</div><div class='ctx'> out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -231,12 +231,11 @@ static int fs_enet_mdio_remove(struct of_device *ofdev)</div><div class='ctx'> 	struct bb_info *bitbang = bus-&gt;priv;</div><div class='ctx'> </div><div class='ctx'> 	mdiobus_unregister(bus);</div><div class='del'>-	free_mdio_bitbang(bus);</div><div class='ctx'> 	dev_set_drvdata(&amp;ofdev-&gt;dev, NULL);</div><div class='ctx'> 	kfree(bus-&gt;irq);</div><div class='add'>+	free_mdio_bitbang(bus);</div><div class='ctx'> 	iounmap(bitbang-&gt;dir);</div><div class='ctx'> 	kfree(bitbang);</div><div class='del'>-	kfree(bus);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/fs_enet/mii-fec.c b/drivers/net/fs_enet/mii-fec.c<br/>index 695f74cc4398..28077cc1b949 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/fs_enet/mii-fec.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/fs_enet/mii-fec.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/fs_enet/mii-fec.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/fs_enet/mii-fec.c</a></div><div class='hunk'>@@ -128,7 +128,7 @@ static int __devinit fs_enet_mdio_probe(struct of_device *ofdev,</div><div class='ctx'> 	struct fec_info *fec;</div><div class='ctx'> 	int ret = -ENOMEM, i;</div><div class='ctx'> </div><div class='del'>-	new_bus = kzalloc(sizeof(struct mii_bus), GFP_KERNEL);</div><div class='add'>+	new_bus = mdiobus_alloc();</div><div class='ctx'> 	if (!new_bus)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -172,7 +172,7 @@ static int __devinit fs_enet_mdio_probe(struct of_device *ofdev,</div><div class='ctx'> 		if (!strcmp(np-&gt;type, "ethernet-phy"))</div><div class='ctx'> 			add_phy(new_bus, np);</div><div class='ctx'> </div><div class='del'>-	new_bus-&gt;dev = &amp;ofdev-&gt;dev;</div><div class='add'>+	new_bus-&gt;parent = &amp;ofdev-&gt;dev;</div><div class='ctx'> 	dev_set_drvdata(&amp;ofdev-&gt;dev, new_bus);</div><div class='ctx'> </div><div class='ctx'> 	ret = mdiobus_register(new_bus);</div><div class='hunk'>@@ -190,7 +190,7 @@ out_res:</div><div class='ctx'> out_fec:</div><div class='ctx'> 	kfree(fec);</div><div class='ctx'> out_mii:</div><div class='del'>-	kfree(new_bus);</div><div class='add'>+	mdiobus_free(new_bus);</div><div class='ctx'> out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -205,7 +205,7 @@ static int fs_enet_mdio_remove(struct of_device *ofdev)</div><div class='ctx'> 	kfree(bus-&gt;irq);</div><div class='ctx'> 	iounmap(fec-&gt;fecp);</div><div class='ctx'> 	kfree(fec);</div><div class='del'>-	kfree(bus);</div><div class='add'>+	mdiobus_free(bus);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c<br/>index 4320a983a588..b5bb7ae2817f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/gianfar.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/gianfar.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/gianfar.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/gianfar.c</a></div><div class='hunk'>@@ -339,6 +339,9 @@ static int gfar_probe(struct platform_device *pdev)</div><div class='ctx'> 	/* Enable most messages by default */</div><div class='ctx'> 	priv-&gt;msg_enable = (NETIF_MSG_IFUP &lt;&lt; 1 ) - 1;</div><div class='ctx'> </div><div class='add'>+	/* Carrier starts down, phylib will bring it up */</div><div class='add'>+	netif_carrier_off(dev);</div><div class='add'>+</div><div class='ctx'> 	err = register_netdev(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (err) {</div><div class='head'>diff --git a/drivers/net/gianfar_mii.c b/drivers/net/gianfar_mii.c<br/>index ebcfb27a904e..bf73eea98010 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/gianfar_mii.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/gianfar_mii.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/gianfar_mii.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/gianfar_mii.c</a></div><div class='hunk'>@@ -136,12 +136,12 @@ static int gfar_mdio_reset(struct mii_bus *bus)</div><div class='ctx'> </div><div class='ctx'> 	/* Wait until the bus is free */</div><div class='ctx'> 	while ((gfar_read(&amp;regs-&gt;miimind) &amp; MIIMIND_BUSY) &amp;&amp;</div><div class='del'>-			timeout--)</div><div class='add'>+			--timeout)</div><div class='ctx'> 		cpu_relax();</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;bus-&gt;mdio_lock);</div><div class='ctx'> </div><div class='del'>-	if(timeout &lt;= 0) {</div><div class='add'>+	if(timeout == 0) {</div><div class='ctx'> 		printk(KERN_ERR "%s: The MII Bus is stuck!\n",</div><div class='ctx'> 				bus-&gt;name);</div><div class='ctx'> 		return -EBUSY;</div><div class='hunk'>@@ -164,8 +164,7 @@ static int gfar_mdio_probe(struct device *dev)</div><div class='ctx'> 	if (NULL == dev)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	new_bus = kzalloc(sizeof(struct mii_bus), GFP_KERNEL);</div><div class='del'>-</div><div class='add'>+	new_bus = mdiobus_alloc();</div><div class='ctx'> 	if (NULL == new_bus)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -196,7 +195,7 @@ static int gfar_mdio_probe(struct device *dev)</div><div class='ctx'> </div><div class='ctx'> 	new_bus-&gt;irq = pdata-&gt;irq;</div><div class='ctx'> </div><div class='del'>-	new_bus-&gt;dev = dev;</div><div class='add'>+	new_bus-&gt;parent = dev;</div><div class='ctx'> 	dev_set_drvdata(dev, new_bus);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -211,19 +210,21 @@ static int gfar_mdio_probe(struct device *dev)</div><div class='ctx'> 	gfar_write(&amp;enet_regs-&gt;tbipa, 0);</div><div class='ctx'> 	for (i = PHY_MAX_ADDR; i &gt; 0; i--) {</div><div class='ctx'> 		u32 phy_id;</div><div class='del'>-		int r;</div><div class='ctx'> </div><div class='del'>-		r = get_phy_id(new_bus, i, &amp;phy_id);</div><div class='del'>-		if (r)</div><div class='del'>-			return r;</div><div class='add'>+		err = get_phy_id(new_bus, i, &amp;phy_id);</div><div class='add'>+		if (err)</div><div class='add'>+			goto bus_register_fail;</div><div class='ctx'> </div><div class='ctx'> 		if (phy_id == 0xffffffff)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* The bus is full.  We don't support using 31 PHYs, sorry */</div><div class='del'>-	if (i == 0)</div><div class='del'>-		return -EBUSY;</div><div class='add'>+	if (i == 0) {</div><div class='add'>+		err = -EBUSY;</div><div class='add'>+</div><div class='add'>+		goto bus_register_fail;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	gfar_write(&amp;enet_regs-&gt;tbipa, i);</div><div class='ctx'> </div><div class='hunk'>@@ -240,7 +241,7 @@ static int gfar_mdio_probe(struct device *dev)</div><div class='ctx'> bus_register_fail:</div><div class='ctx'> 	iounmap(regs);</div><div class='ctx'> reg_map_fail:</div><div class='del'>-	kfree(new_bus);</div><div class='add'>+	mdiobus_free(new_bus);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -256,7 +257,7 @@ static int gfar_mdio_remove(struct device *dev)</div><div class='ctx'> </div><div class='ctx'> 	iounmap((void __iomem *)bus-&gt;priv);</div><div class='ctx'> 	bus-&gt;priv = NULL;</div><div class='del'>-	kfree(bus);</div><div class='add'>+	mdiobus_free(bus);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/ibm_newemac/Kconfig b/drivers/net/ibm_newemac/Kconfig<br/>index 70a3272ee998..78a1628c9892 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/ibm_newemac/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/ibm_newemac/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/ibm_newemac/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/ibm_newemac/Kconfig</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> config IBM_NEW_EMAC</div><div class='ctx'> 	tristate "IBM EMAC Ethernet support"</div><div class='del'>-	depends on PPC_DCR &amp;&amp; PPC_MERGE</div><div class='add'>+	depends on PPC_DCR</div><div class='ctx'> 	select CRC32</div><div class='ctx'> 	help</div><div class='ctx'> 	  This driver supports the IBM EMAC family of Ethernet controllers</div><div class='hunk'>@@ -62,3 +62,15 @@ config IBM_NEW_EMAC_TAH</div><div class='ctx'> config IBM_NEW_EMAC_EMAC4</div><div class='ctx'> 	bool</div><div class='ctx'> 	default n</div><div class='add'>+</div><div class='add'>+config IBM_NEW_EMAC_NO_FLOW_CTRL</div><div class='add'>+	bool</div><div class='add'>+	default n</div><div class='add'>+</div><div class='add'>+config IBM_NEW_EMAC_MAL_CLR_ICINTSTAT</div><div class='add'>+	bool</div><div class='add'>+	default n</div><div class='add'>+</div><div class='add'>+config IBM_NEW_EMAC_MAL_COMMON_ERR</div><div class='add'>+	bool</div><div class='add'>+	default n</div><div class='head'>diff --git a/drivers/net/ibm_newemac/core.c b/drivers/net/ibm_newemac/core.c<br/>index ccd9d9058f6d..efcf21c9f5c7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/ibm_newemac/core.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/ibm_newemac/core.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/ibm_newemac/core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/ibm_newemac/core.c</a></div><div class='hunk'>@@ -130,6 +130,7 @@ static inline void emac_report_timeout_error(struct emac_instance *dev,</div><div class='ctx'> 					     const char *error)</div><div class='ctx'> {</div><div class='ctx'> 	if (emac_has_feature(dev, EMAC_FTR_440GX_PHY_CLK_FIX |</div><div class='add'>+				  EMAC_FTR_460EX_PHY_CLK_FIX |</div><div class='ctx'> 				  EMAC_FTR_440EP_PHY_CLK_FIX))</div><div class='ctx'> 		DBG(dev, "%s" NL, error);</div><div class='ctx'> 	else if (net_ratelimit())</div><div class='hunk'>@@ -201,13 +202,15 @@ static inline int emac_phy_supports_gige(int phy_mode)</div><div class='ctx'> {</div><div class='ctx'> 	return  phy_mode == PHY_MODE_GMII ||</div><div class='ctx'> 		phy_mode == PHY_MODE_RGMII ||</div><div class='add'>+		phy_mode == PHY_MODE_SGMII ||</div><div class='ctx'> 		phy_mode == PHY_MODE_TBI ||</div><div class='ctx'> 		phy_mode == PHY_MODE_RTBI;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int emac_phy_gpcs(int phy_mode)</div><div class='ctx'> {</div><div class='del'>-	return  phy_mode == PHY_MODE_TBI ||</div><div class='add'>+	return  phy_mode == PHY_MODE_SGMII ||</div><div class='add'>+		phy_mode == PHY_MODE_TBI ||</div><div class='ctx'> 		phy_mode == PHY_MODE_RTBI;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -351,10 +354,24 @@ static int emac_reset(struct emac_instance *dev)</div><div class='ctx'> 		emac_tx_disable(dev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PPC_DCR_NATIVE</div><div class='add'>+	/* Enable internal clock source */</div><div class='add'>+	if (emac_has_feature(dev, EMAC_FTR_460EX_PHY_CLK_FIX))</div><div class='add'>+		dcri_clrset(SDR0, SDR0_ETH_CFG,</div><div class='add'>+			    0, SDR0_ETH_CFG_ECS &lt;&lt; dev-&gt;cell_index);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	out_be32(&amp;p-&gt;mr0, EMAC_MR0_SRST);</div><div class='ctx'> 	while ((in_be32(&amp;p-&gt;mr0) &amp; EMAC_MR0_SRST) &amp;&amp; n)</div><div class='ctx'> 		--n;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PPC_DCR_NATIVE</div><div class='add'>+	 /* Enable external clock source */</div><div class='add'>+	if (emac_has_feature(dev, EMAC_FTR_460EX_PHY_CLK_FIX))</div><div class='add'>+		dcri_clrset(SDR0, SDR0_ETH_CFG,</div><div class='add'>+			    SDR0_ETH_CFG_ECS &lt;&lt; dev-&gt;cell_index, 0);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	if (n) {</div><div class='ctx'> 		dev-&gt;reset_failed = 0;</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -547,8 +564,9 @@ static int emac_configure(struct emac_instance *dev)</div><div class='ctx'> 	switch (dev-&gt;phy.speed) {</div><div class='ctx'> 	case SPEED_1000:</div><div class='ctx'> 		if (emac_phy_gpcs(dev-&gt;phy.mode)) {</div><div class='del'>-			mr1 |= EMAC_MR1_MF_1000GPCS |</div><div class='del'>-				EMAC_MR1_MF_IPPA(dev-&gt;phy.address);</div><div class='add'>+			mr1 |= EMAC_MR1_MF_1000GPCS | EMAC_MR1_MF_IPPA(</div><div class='add'>+				(dev-&gt;phy.gpcs_address != 0xffffffff) ?</div><div class='add'>+				 dev-&gt;phy.gpcs_address : dev-&gt;phy.address);</div><div class='ctx'> </div><div class='ctx'> 			/* Put some arbitrary OUI, Manuf &amp; Rev IDs so we can</div><div class='ctx'> 			 * identify this GPCS PHY later.</div><div class='hunk'>@@ -660,8 +678,12 @@ static int emac_configure(struct emac_instance *dev)</div><div class='ctx'> 	out_be32(&amp;p-&gt;iser,  r);</div><div class='ctx'> </div><div class='ctx'> 	/* We need to take GPCS PHY out of isolate mode after EMAC reset */</div><div class='del'>-	if (emac_phy_gpcs(dev-&gt;phy.mode))</div><div class='del'>-		emac_mii_reset_phy(&amp;dev-&gt;phy);</div><div class='add'>+	if (emac_phy_gpcs(dev-&gt;phy.mode)) {</div><div class='add'>+		if (dev-&gt;phy.gpcs_address != 0xffffffff)</div><div class='add'>+			emac_mii_reset_gpcs(&amp;dev-&gt;phy);</div><div class='add'>+		else</div><div class='add'>+			emac_mii_reset_phy(&amp;dev-&gt;phy);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -866,7 +888,9 @@ static int emac_mdio_read(struct net_device *ndev, int id, int reg)</div><div class='ctx'> 	struct emac_instance *dev = netdev_priv(ndev);</div><div class='ctx'> 	int res;</div><div class='ctx'> </div><div class='del'>-	res = __emac_mdio_read(dev-&gt;mdio_instance ? dev-&gt;mdio_instance : dev,</div><div class='add'>+	res = __emac_mdio_read((dev-&gt;mdio_instance &amp;&amp;</div><div class='add'>+				dev-&gt;phy.gpcs_address != id) ?</div><div class='add'>+				dev-&gt;mdio_instance : dev,</div><div class='ctx'> 			       (u8) id, (u8) reg);</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='hunk'>@@ -875,7 +899,9 @@ static void emac_mdio_write(struct net_device *ndev, int id, int reg, int val)</div><div class='ctx'> {</div><div class='ctx'> 	struct emac_instance *dev = netdev_priv(ndev);</div><div class='ctx'> </div><div class='del'>-	__emac_mdio_write(dev-&gt;mdio_instance ? dev-&gt;mdio_instance : dev,</div><div class='add'>+	__emac_mdio_write((dev-&gt;mdio_instance &amp;&amp;</div><div class='add'>+			   dev-&gt;phy.gpcs_address != id) ?</div><div class='add'>+			   dev-&gt;mdio_instance : dev,</div><div class='ctx'> 			  (u8) id, (u8) reg, (u16) val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2367,7 +2393,11 @@ static int __devinit emac_init_phy(struct emac_instance *dev)</div><div class='ctx'> 		 * XXX I probably should move these settings to the dev tree</div><div class='ctx'> 		 */</div><div class='ctx'> 		dev-&gt;phy.address = -1;</div><div class='del'>-		dev-&gt;phy.features = SUPPORTED_100baseT_Full | SUPPORTED_MII;</div><div class='add'>+		dev-&gt;phy.features = SUPPORTED_MII;</div><div class='add'>+		if (emac_phy_supports_gige(dev-&gt;phy_mode))</div><div class='add'>+			dev-&gt;phy.features |= SUPPORTED_1000baseT_Full;</div><div class='add'>+		else</div><div class='add'>+			dev-&gt;phy.features |= SUPPORTED_100baseT_Full;</div><div class='ctx'> 		dev-&gt;phy.pause = 1;</div><div class='ctx'> </div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -2406,7 +2436,9 @@ static int __devinit emac_init_phy(struct emac_instance *dev)</div><div class='ctx'> 		 * Note that the busy_phy_map is currently global</div><div class='ctx'> 		 * while it should probably be per-ASIC...</div><div class='ctx'> 		 */</div><div class='del'>-		dev-&gt;phy.address = dev-&gt;cell_index;</div><div class='add'>+		dev-&gt;phy.gpcs_address = dev-&gt;gpcs_address;</div><div class='add'>+		if (dev-&gt;phy.gpcs_address == 0xffffffff)</div><div class='add'>+			dev-&gt;phy.address = dev-&gt;cell_index;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	emac_configure(dev);</div><div class='hunk'>@@ -2516,6 +2548,8 @@ static int __devinit emac_init_config(struct emac_instance *dev)</div><div class='ctx'> 		dev-&gt;phy_address = 0xffffffff;</div><div class='ctx'> 	if (emac_read_uint_prop(np, "phy-map", &amp;dev-&gt;phy_map, 0))</div><div class='ctx'> 		dev-&gt;phy_map = 0xffffffff;</div><div class='add'>+	if (emac_read_uint_prop(np, "gpcs-address", &amp;dev-&gt;gpcs_address, 0))</div><div class='add'>+		dev-&gt;gpcs_address = 0xffffffff;</div><div class='ctx'> 	if (emac_read_uint_prop(np-&gt;parent, "clock-frequency", &amp;dev-&gt;opb_bus_freq, 1))</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> 	if (emac_read_uint_prop(np, "tah-device", &amp;dev-&gt;tah_ph, 0))</div><div class='hunk'>@@ -2559,6 +2593,9 @@ static int __devinit emac_init_config(struct emac_instance *dev)</div><div class='ctx'> 	/* Check EMAC version */</div><div class='ctx'> 	if (of_device_is_compatible(np, "ibm,emac4sync")) {</div><div class='ctx'> 		dev-&gt;features |= (EMAC_FTR_EMAC4 | EMAC_FTR_EMAC4SYNC);</div><div class='add'>+		if (of_device_is_compatible(np, "ibm,emac-460ex") ||</div><div class='add'>+		    of_device_is_compatible(np, "ibm,emac-460gt"))</div><div class='add'>+			dev-&gt;features |= EMAC_FTR_460EX_PHY_CLK_FIX;</div><div class='ctx'> 	} else if (of_device_is_compatible(np, "ibm,emac4")) {</div><div class='ctx'> 		dev-&gt;features |= EMAC_FTR_EMAC4;</div><div class='ctx'> 		if (of_device_is_compatible(np, "ibm,emac-440gx"))</div><div class='hunk'>@@ -2567,6 +2604,8 @@ static int __devinit emac_init_config(struct emac_instance *dev)</div><div class='ctx'> 		if (of_device_is_compatible(np, "ibm,emac-440ep") ||</div><div class='ctx'> 		    of_device_is_compatible(np, "ibm,emac-440gr"))</div><div class='ctx'> 			dev-&gt;features |= EMAC_FTR_440EP_PHY_CLK_FIX;</div><div class='add'>+		if (of_device_is_compatible(np, "ibm,emac-405ez"))</div><div class='add'>+			dev-&gt;features |= EMAC_FTR_NO_FLOW_CONTROL_40x;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Fixup some feature bits based on the device tree */</div><div class='hunk'>@@ -2824,6 +2863,9 @@ static int __devinit emac_probe(struct of_device *ofdev,</div><div class='ctx'> 	       ndev-&gt;dev_addr[0], ndev-&gt;dev_addr[1], ndev-&gt;dev_addr[2],</div><div class='ctx'> 	       ndev-&gt;dev_addr[3], ndev-&gt;dev_addr[4], ndev-&gt;dev_addr[5]);</div><div class='ctx'> </div><div class='add'>+	if (dev-&gt;phy_mode == PHY_MODE_SGMII)</div><div class='add'>+		printk(KERN_NOTICE "%s: in SGMII mode\n", ndev-&gt;name);</div><div class='add'>+</div><div class='ctx'> 	if (dev-&gt;phy.address &gt;= 0)</div><div class='ctx'> 		printk("%s: found %s PHY (0x%02x)\n", ndev-&gt;name,</div><div class='ctx'> 		       dev-&gt;phy.def-&gt;name, dev-&gt;phy.address);</div><div class='head'>diff --git a/drivers/net/ibm_newemac/core.h b/drivers/net/ibm_newemac/core.h<br/>index 6545e69d12c3..18d56c6c4238 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/ibm_newemac/core.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/ibm_newemac/core.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/ibm_newemac/core.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/ibm_newemac/core.h</a></div><div class='hunk'>@@ -190,6 +190,9 @@ struct emac_instance {</div><div class='ctx'> 	struct delayed_work		link_work;</div><div class='ctx'> 	int				link_polling;</div><div class='ctx'> </div><div class='add'>+	/* GPCS PHY infos */</div><div class='add'>+	u32				gpcs_address;</div><div class='add'>+</div><div class='ctx'> 	/* Shared MDIO if any */</div><div class='ctx'> 	u32				mdio_ph;</div><div class='ctx'> 	struct of_device		*mdio_dev;</div><div class='hunk'>@@ -317,6 +320,10 @@ struct emac_instance {</div><div class='ctx'>  * The 405EX and 460EX contain the EMAC4SYNC core</div><div class='ctx'>  */</div><div class='ctx'> #define EMAC_FTR_EMAC4SYNC		0x00000200</div><div class='add'>+/*</div><div class='add'>+ * Set if we need phy clock workaround for 460ex or 460gt</div><div class='add'>+ */</div><div class='add'>+#define EMAC_FTR_460EX_PHY_CLK_FIX	0x00000400</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* Right now, we don't quite handle the always/possible masks on the</div><div class='hunk'>@@ -341,6 +348,10 @@ enum {</div><div class='ctx'> #ifdef CONFIG_IBM_NEW_EMAC_RGMII</div><div class='ctx'> 	    EMAC_FTR_HAS_RGMII	|</div><div class='ctx'> #endif</div><div class='add'>+#ifdef CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL</div><div class='add'>+	    EMAC_FTR_NO_FLOW_CONTROL_40x |</div><div class='add'>+#endif</div><div class='add'>+	EMAC_FTR_460EX_PHY_CLK_FIX |</div><div class='ctx'> 	EMAC_FTR_440EP_PHY_CLK_FIX,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ibm_newemac/mal.c b/drivers/net/ibm_newemac/mal.c<br/>index 10c267b2b961..1839d3f154a3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/ibm_newemac/mal.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/ibm_newemac/mal.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/ibm_newemac/mal.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/ibm_newemac/mal.c</a></div><div class='hunk'>@@ -28,6 +28,7 @@</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "core.h"</div><div class='add'>+#include &lt;asm/dcr-regs.h&gt;</div><div class='ctx'> </div><div class='ctx'> static int mal_count;</div><div class='ctx'> </div><div class='hunk'>@@ -279,6 +280,10 @@ static irqreturn_t mal_txeob(int irq, void *dev_instance)</div><div class='ctx'> 	mal_schedule_poll(mal);</div><div class='ctx'> 	set_mal_dcrn(mal, MAL_TXEOBISR, r);</div><div class='ctx'> </div><div class='add'>+	if (mal_has_feature(mal, MAL_FTR_CLEAR_ICINTSTAT))</div><div class='add'>+		mtdcri(SDR0, DCRN_SDR_ICINTSTAT,</div><div class='add'>+				(mfdcri(SDR0, DCRN_SDR_ICINTSTAT) | ICINTSTAT_ICTX));</div><div class='add'>+</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -293,6 +298,10 @@ static irqreturn_t mal_rxeob(int irq, void *dev_instance)</div><div class='ctx'> 	mal_schedule_poll(mal);</div><div class='ctx'> 	set_mal_dcrn(mal, MAL_RXEOBISR, r);</div><div class='ctx'> </div><div class='add'>+	if (mal_has_feature(mal, MAL_FTR_CLEAR_ICINTSTAT))</div><div class='add'>+		mtdcri(SDR0, DCRN_SDR_ICINTSTAT,</div><div class='add'>+				(mfdcri(SDR0, DCRN_SDR_ICINTSTAT) | ICINTSTAT_ICRX));</div><div class='add'>+</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -336,6 +345,25 @@ static irqreturn_t mal_rxde(int irq, void *dev_instance)</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static irqreturn_t mal_int(int irq, void *dev_instance)</div><div class='add'>+{</div><div class='add'>+	struct mal_instance *mal = dev_instance;</div><div class='add'>+	u32 esr = get_mal_dcrn(mal, MAL_ESR);</div><div class='add'>+</div><div class='add'>+	if (esr &amp; MAL_ESR_EVB) {</div><div class='add'>+		/* descriptor error */</div><div class='add'>+		if (esr &amp; MAL_ESR_DE) {</div><div class='add'>+			if (esr &amp; MAL_ESR_CIDT)</div><div class='add'>+				return mal_rxde(irq, dev_instance);</div><div class='add'>+			else</div><div class='add'>+				return mal_txde(irq, dev_instance);</div><div class='add'>+		} else { /* SERR */</div><div class='add'>+			return mal_serr(irq, dev_instance);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void mal_poll_disable(struct mal_instance *mal, struct mal_commac *commac)</div><div class='ctx'> {</div><div class='ctx'> 	/* Spinlock-type semantics: only one caller disable poll at a time */</div><div class='hunk'>@@ -493,6 +521,8 @@ static int __devinit mal_probe(struct of_device *ofdev,</div><div class='ctx'> 	unsigned int dcr_base;</div><div class='ctx'> 	const u32 *prop;</div><div class='ctx'> 	u32 cfg;</div><div class='add'>+	unsigned long irqflags;</div><div class='add'>+	irq_handler_t hdlr_serr, hdlr_txde, hdlr_rxde;</div><div class='ctx'> </div><div class='ctx'> 	mal = kzalloc(sizeof(struct mal_instance), GFP_KERNEL);</div><div class='ctx'> 	if (!mal) {</div><div class='hunk'>@@ -542,11 +572,21 @@ static int __devinit mal_probe(struct of_device *ofdev,</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (of_device_is_compatible(ofdev-&gt;node, "ibm,mcmal-405ez"))</div><div class='add'>+		mal-&gt;features |= (MAL_FTR_CLEAR_ICINTSTAT |</div><div class='add'>+				MAL_FTR_COMMON_ERR_INT);</div><div class='add'>+</div><div class='ctx'> 	mal-&gt;txeob_irq = irq_of_parse_and_map(ofdev-&gt;node, 0);</div><div class='ctx'> 	mal-&gt;rxeob_irq = irq_of_parse_and_map(ofdev-&gt;node, 1);</div><div class='ctx'> 	mal-&gt;serr_irq = irq_of_parse_and_map(ofdev-&gt;node, 2);</div><div class='del'>-	mal-&gt;txde_irq = irq_of_parse_and_map(ofdev-&gt;node, 3);</div><div class='del'>-	mal-&gt;rxde_irq = irq_of_parse_and_map(ofdev-&gt;node, 4);</div><div class='add'>+</div><div class='add'>+	if (mal_has_feature(mal, MAL_FTR_COMMON_ERR_INT)) {</div><div class='add'>+		mal-&gt;txde_irq = mal-&gt;rxde_irq = mal-&gt;serr_irq;</div><div class='add'>+	} else {</div><div class='add'>+		mal-&gt;txde_irq = irq_of_parse_and_map(ofdev-&gt;node, 3);</div><div class='add'>+		mal-&gt;rxde_irq = irq_of_parse_and_map(ofdev-&gt;node, 4);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (mal-&gt;txeob_irq == NO_IRQ || mal-&gt;rxeob_irq == NO_IRQ ||</div><div class='ctx'> 	    mal-&gt;serr_irq == NO_IRQ || mal-&gt;txde_irq == NO_IRQ ||</div><div class='ctx'> 	    mal-&gt;rxde_irq == NO_IRQ) {</div><div class='hunk'>@@ -608,16 +648,26 @@ static int __devinit mal_probe(struct of_device *ofdev,</div><div class='ctx'> 			     sizeof(struct mal_descriptor) *</div><div class='ctx'> 			     mal_rx_bd_offset(mal, i));</div><div class='ctx'> </div><div class='del'>-	err = request_irq(mal-&gt;serr_irq, mal_serr, 0, "MAL SERR", mal);</div><div class='add'>+	if (mal_has_feature(mal, MAL_FTR_COMMON_ERR_INT)) {</div><div class='add'>+		irqflags = IRQF_SHARED;</div><div class='add'>+		hdlr_serr = hdlr_txde = hdlr_rxde = mal_int;</div><div class='add'>+	} else {</div><div class='add'>+		irqflags = 0;</div><div class='add'>+		hdlr_serr = mal_serr;</div><div class='add'>+		hdlr_txde = mal_txde;</div><div class='add'>+		hdlr_rxde = mal_rxde;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = request_irq(mal-&gt;serr_irq, hdlr_serr, irqflags, "MAL SERR", mal);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto fail2;</div><div class='del'>-	err = request_irq(mal-&gt;txde_irq, mal_txde, 0, "MAL TX DE", mal);</div><div class='add'>+	err = request_irq(mal-&gt;txde_irq, hdlr_txde, irqflags, "MAL TX DE", mal);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto fail3;</div><div class='ctx'> 	err = request_irq(mal-&gt;txeob_irq, mal_txeob, 0, "MAL TX EOB", mal);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto fail4;</div><div class='del'>-	err = request_irq(mal-&gt;rxde_irq, mal_rxde, 0, "MAL RX DE", mal);</div><div class='add'>+	err = request_irq(mal-&gt;rxde_irq, hdlr_rxde, irqflags, "MAL RX DE", mal);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto fail5;</div><div class='ctx'> 	err = request_irq(mal-&gt;rxeob_irq, mal_rxeob, 0, "MAL RX EOB", mal);</div><div class='head'>diff --git a/drivers/net/ibm_newemac/mal.h b/drivers/net/ibm_newemac/mal.h<br/>index eaa7262dc079..2f0a87360844 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/ibm_newemac/mal.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/ibm_newemac/mal.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/ibm_newemac/mal.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/ibm_newemac/mal.h</a></div><div class='hunk'>@@ -102,7 +102,7 @@</div><div class='ctx'> /* MAL V1 IER bits */</div><div class='ctx'> #define   MAL1_IER_NWE		0x00000008</div><div class='ctx'> #define   MAL1_IER_SOC_EVENTS	MAL1_IER_NWE</div><div class='del'>-#define   MAL1_IER_EVENTS	(MAL1_IER_SOC_EVENTS | MAL_IER_OTE | \</div><div class='add'>+#define   MAL1_IER_EVENTS	(MAL1_IER_SOC_EVENTS | MAL_IER_DE | \</div><div class='ctx'> 				 MAL_IER_OTE | MAL_IER_OE | MAL_IER_PE)</div><div class='ctx'> </div><div class='ctx'> /* MAL V2 IER bits */</div><div class='hunk'>@@ -110,7 +110,7 @@</div><div class='ctx'> #define   MAL2_IER_PRE		0x00000040</div><div class='ctx'> #define   MAL2_IER_PWE		0x00000020</div><div class='ctx'> #define   MAL2_IER_SOC_EVENTS	(MAL2_IER_PT | MAL2_IER_PRE | MAL2_IER_PWE)</div><div class='del'>-#define   MAL2_IER_EVENTS	(MAL2_IER_SOC_EVENTS | MAL_IER_OTE | \</div><div class='add'>+#define   MAL2_IER_EVENTS	(MAL2_IER_SOC_EVENTS | MAL_IER_DE | \</div><div class='ctx'> 				 MAL_IER_OTE | MAL_IER_OE | MAL_IER_PE)</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -213,6 +213,8 @@ struct mal_instance {</div><div class='ctx'> 	struct of_device	*ofdev;</div><div class='ctx'> 	int			index;</div><div class='ctx'> 	spinlock_t		lock;</div><div class='add'>+</div><div class='add'>+	unsigned int features;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline u32 get_mal_dcrn(struct mal_instance *mal, int reg)</div><div class='hunk'>@@ -225,6 +227,38 @@ static inline void set_mal_dcrn(struct mal_instance *mal, int reg, u32 val)</div><div class='ctx'> 	dcr_write(mal-&gt;dcr_host, reg, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Features of various MAL implementations */</div><div class='add'>+</div><div class='add'>+/* Set if you have interrupt coalescing and you have to clear the SDR</div><div class='add'>+ * register for TXEOB and RXEOB interrupts to work</div><div class='add'>+ */</div><div class='add'>+#define MAL_FTR_CLEAR_ICINTSTAT	0x00000001</div><div class='add'>+</div><div class='add'>+/* Set if your MAL has SERR, TXDE, and RXDE OR'd into a single UIC</div><div class='add'>+ * interrupt</div><div class='add'>+ */</div><div class='add'>+#define MAL_FTR_COMMON_ERR_INT	0x00000002</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	MAL_FTRS_ALWAYS = 0,</div><div class='add'>+</div><div class='add'>+	MAL_FTRS_POSSIBLE =</div><div class='add'>+#ifdef CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT</div><div class='add'>+		MAL_FTR_CLEAR_ICINTSTAT |</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR</div><div class='add'>+		MAL_FTR_COMMON_ERR_INT |</div><div class='add'>+#endif</div><div class='add'>+		0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline int mal_has_feature(struct mal_instance *dev,</div><div class='add'>+		unsigned long feature)</div><div class='add'>+{</div><div class='add'>+	return (MAL_FTRS_ALWAYS &amp; feature) ||</div><div class='add'>+		(MAL_FTRS_POSSIBLE &amp; dev-&gt;features &amp; feature);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Register MAL devices */</div><div class='ctx'> int mal_init(void);</div><div class='ctx'> void mal_exit(void);</div><div class='head'>diff --git a/drivers/net/ibm_newemac/phy.c b/drivers/net/ibm_newemac/phy.c<br/>index 37bfeea8788a..c40cd8df2212 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/ibm_newemac/phy.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/ibm_newemac/phy.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/ibm_newemac/phy.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/ibm_newemac/phy.c</a></div><div class='hunk'>@@ -38,6 +38,16 @@ static inline void phy_write(struct mii_phy *phy, int reg, int val)</div><div class='ctx'> 	phy-&gt;mdio_write(phy-&gt;dev, phy-&gt;address, reg, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int gpcs_phy_read(struct mii_phy *phy, int reg)</div><div class='add'>+{</div><div class='add'>+	return phy-&gt;mdio_read(phy-&gt;dev, phy-&gt;gpcs_address, reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void gpcs_phy_write(struct mii_phy *phy, int reg, int val)</div><div class='add'>+{</div><div class='add'>+	phy-&gt;mdio_write(phy-&gt;dev, phy-&gt;gpcs_address, reg, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int emac_mii_reset_phy(struct mii_phy *phy)</div><div class='ctx'> {</div><div class='ctx'> 	int val;</div><div class='hunk'>@@ -62,6 +72,37 @@ int emac_mii_reset_phy(struct mii_phy *phy)</div><div class='ctx'> 	return limit &lt;= 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int emac_mii_reset_gpcs(struct mii_phy *phy)</div><div class='add'>+{</div><div class='add'>+	int val;</div><div class='add'>+	int limit = 10000;</div><div class='add'>+</div><div class='add'>+	val = gpcs_phy_read(phy, MII_BMCR);</div><div class='add'>+	val &amp;= ~(BMCR_ISOLATE | BMCR_ANENABLE);</div><div class='add'>+	val |= BMCR_RESET;</div><div class='add'>+	gpcs_phy_write(phy, MII_BMCR, val);</div><div class='add'>+</div><div class='add'>+	udelay(300);</div><div class='add'>+</div><div class='add'>+	while (limit--) {</div><div class='add'>+		val = gpcs_phy_read(phy, MII_BMCR);</div><div class='add'>+		if (val &gt;= 0 &amp;&amp; (val &amp; BMCR_RESET) == 0)</div><div class='add'>+			break;</div><div class='add'>+		udelay(10);</div><div class='add'>+	}</div><div class='add'>+	if ((val &amp; BMCR_ISOLATE) &amp;&amp; limit &gt; 0)</div><div class='add'>+		gpcs_phy_write(phy, MII_BMCR, val &amp; ~BMCR_ISOLATE);</div><div class='add'>+</div><div class='add'>+	if (limit &gt; 0 &amp;&amp; phy-&gt;mode == PHY_MODE_SGMII) {</div><div class='add'>+		/* Configure GPCS interface to recommended setting for SGMII */</div><div class='add'>+		gpcs_phy_write(phy, 0x04, 0x8120); /* AsymPause, FDX */</div><div class='add'>+		gpcs_phy_write(phy, 0x07, 0x2801); /* msg_pg, toggle */</div><div class='add'>+		gpcs_phy_write(phy, 0x00, 0x0140); /* 1Gbps, FDX     */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return limit &lt;= 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int genmii_setup_aneg(struct mii_phy *phy, u32 advertise)</div><div class='ctx'> {</div><div class='ctx'> 	int ctl, adv;</div><div class='hunk'>@@ -321,7 +362,7 @@ static struct mii_phy_def bcm5248_phy_def = {</div><div class='ctx'> </div><div class='ctx'> static int m88e1111_init(struct mii_phy *phy)</div><div class='ctx'> {</div><div class='del'>-	pr_debug("%s: Marvell 88E1111 Ethernet\n", __FUNCTION__);</div><div class='add'>+	pr_debug("%s: Marvell 88E1111 Ethernet\n", __func__);</div><div class='ctx'> 	phy_write(phy, 0x14, 0x0ce3);</div><div class='ctx'> 	phy_write(phy, 0x18, 0x4101);</div><div class='ctx'> 	phy_write(phy, 0x09, 0x0e00);</div><div class='hunk'>@@ -332,6 +373,33 @@ static int m88e1111_init(struct mii_phy *phy)</div><div class='ctx'> 	return  0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int m88e1112_init(struct mii_phy *phy)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Marvell 88E1112 PHY needs to have the SGMII MAC</div><div class='add'>+	 * interace (page 2) properly configured to</div><div class='add'>+	 * communicate with the 460EX/GT GPCS interface.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	u16 reg_short;</div><div class='add'>+</div><div class='add'>+	pr_debug("%s: Marvell 88E1112 Ethernet\n", __func__);</div><div class='add'>+</div><div class='add'>+	/* Set access to Page 2 */</div><div class='add'>+	phy_write(phy, 0x16, 0x0002);</div><div class='add'>+</div><div class='add'>+	phy_write(phy, 0x00, 0x0040); /* 1Gbps */</div><div class='add'>+	reg_short = (u16)(phy_read(phy, 0x1a));</div><div class='add'>+	reg_short |= 0x8000; /* bypass Auto-Negotiation */</div><div class='add'>+	phy_write(phy, 0x1a, reg_short);</div><div class='add'>+	emac_mii_reset_phy(phy); /* reset MAC interface */</div><div class='add'>+</div><div class='add'>+	/* Reset access to Page 0 */</div><div class='add'>+	phy_write(phy, 0x16, 0x0000);</div><div class='add'>+</div><div class='add'>+	return  0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int et1011c_init(struct mii_phy *phy)</div><div class='ctx'> {</div><div class='ctx'> 	u16 reg_short;</div><div class='hunk'>@@ -384,11 +452,27 @@ static struct mii_phy_def m88e1111_phy_def = {</div><div class='ctx'> 	.ops		= &amp;m88e1111_phy_ops,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct mii_phy_ops m88e1112_phy_ops = {</div><div class='add'>+	.init		= m88e1112_init,</div><div class='add'>+	.setup_aneg	= genmii_setup_aneg,</div><div class='add'>+	.setup_forced	= genmii_setup_forced,</div><div class='add'>+	.poll_link	= genmii_poll_link,</div><div class='add'>+	.read_link	= genmii_read_link</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct mii_phy_def m88e1112_phy_def = {</div><div class='add'>+	.phy_id		= 0x01410C90,</div><div class='add'>+	.phy_id_mask	= 0x0ffffff0,</div><div class='add'>+	.name		= "Marvell 88E1112 Ethernet",</div><div class='add'>+	.ops		= &amp;m88e1112_phy_ops,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct mii_phy_def *mii_phy_table[] = {</div><div class='ctx'> 	&amp;et1011c_phy_def,</div><div class='ctx'> 	&amp;cis8201_phy_def,</div><div class='ctx'> 	&amp;bcm5248_phy_def,</div><div class='ctx'> 	&amp;m88e1111_phy_def,</div><div class='add'>+	&amp;m88e1112_phy_def,</div><div class='ctx'> 	&amp;genmii_phy_def,</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/net/ibm_newemac/phy.h b/drivers/net/ibm_newemac/phy.h<br/>index 1b65c81f6557..5d2bf4cbe50b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/ibm_newemac/phy.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/ibm_newemac/phy.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/ibm_newemac/phy.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/ibm_newemac/phy.h</a></div><div class='hunk'>@@ -57,6 +57,7 @@ struct mii_phy {</div><div class='ctx'> 				   or determined automaticaly */</div><div class='ctx'> 	int address;		/* PHY address */</div><div class='ctx'> 	int mode;		/* PHY mode */</div><div class='add'>+	int gpcs_address;	/* GPCS PHY address */</div><div class='ctx'> </div><div class='ctx'> 	/* 1: autoneg enabled, 0: disabled */</div><div class='ctx'> 	int autoneg;</div><div class='hunk'>@@ -81,5 +82,6 @@ struct mii_phy {</div><div class='ctx'>  */</div><div class='ctx'> int emac_mii_phy_probe(struct mii_phy *phy, int address);</div><div class='ctx'> int emac_mii_reset_phy(struct mii_phy *phy);</div><div class='add'>+int emac_mii_reset_gpcs(struct mii_phy *phy);</div><div class='ctx'> </div><div class='ctx'> #endif /* __IBM_NEWEMAC_PHY_H */</div><div class='head'>diff --git a/drivers/net/ibmlana.c b/drivers/net/ibmlana.c<br/>index 95e3464068db..f02764725a22 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/ibmlana.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/ibmlana.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/ibmlana.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/ibmlana.c</a></div><div class='hunk'>@@ -71,7 +71,7 @@ History:</div><div class='ctx'>   June 1st, 2000</div><div class='ctx'> 	corrected version codes, added support for the latest 2.3 changes</div><div class='ctx'>   Oct 28th, 2002</div><div class='del'>-  	cleaned up for the 2.5 tree &lt;alan@redhat.com&gt;</div><div class='add'>+	cleaned up for the 2.5 tree &lt;alan@lxorguk.ukuu.org.uk&gt;</div><div class='ctx'> </div><div class='ctx'>  *************************************************************************/</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c<br/>index 634c4c9d87be..93d02efa9a0a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/igb/igb_main.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/igb/igb_main.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/igb/igb_main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/igb/igb_main.c</a></div><div class='hunk'>@@ -3563,10 +3563,6 @@ static int igb_clean_rx_ring_msix(struct napi_struct *napi, int budget)</div><div class='ctx'> 	struct net_device *netdev = adapter-&gt;netdev;</div><div class='ctx'> 	int work_done = 0;</div><div class='ctx'> </div><div class='del'>-	/* Keep link state information with original netdev */</div><div class='del'>-	if (!netif_carrier_ok(netdev))</div><div class='del'>-		goto quit_polling;</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_DCA</div><div class='ctx'> 	if (adapter-&gt;flags &amp; IGB_FLAG_DCA_ENABLED)</div><div class='ctx'> 		igb_update_rx_dca(rx_ring);</div><div class='hunk'>@@ -3576,7 +3572,6 @@ static int igb_clean_rx_ring_msix(struct napi_struct *napi, int budget)</div><div class='ctx'> </div><div class='ctx'> 	/* If not enough Rx work done, exit the polling mode */</div><div class='ctx'> 	if ((work_done == 0) || !netif_running(netdev)) {</div><div class='del'>-quit_polling:</div><div class='ctx'> 		netif_rx_complete(netdev, napi);</div><div class='ctx'> </div><div class='ctx'> 		if (adapter-&gt;itr_setting &amp; 3) {</div><div class='hunk'>@@ -3617,16 +3612,14 @@ static bool igb_clean_tx_irq(struct igb_ring *tx_ring)</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	u32 head, oldhead;</div><div class='ctx'> 	unsigned int count = 0;</div><div class='del'>-	bool cleaned = false;</div><div class='del'>-	bool retval = true;</div><div class='ctx'> 	unsigned int total_bytes = 0, total_packets = 0;</div><div class='add'>+	bool retval = true;</div><div class='ctx'> </div><div class='ctx'> 	rmb();</div><div class='ctx'> 	head = get_head(tx_ring);</div><div class='ctx'> 	i = tx_ring-&gt;next_to_clean;</div><div class='ctx'> 	while (1) {</div><div class='ctx'> 		while (i != head) {</div><div class='del'>-			cleaned = true;</div><div class='ctx'> 			tx_desc = E1000_TX_DESC(*tx_ring, i);</div><div class='ctx'> 			buffer_info = &amp;tx_ring-&gt;buffer_info[i];</div><div class='ctx'> 			skb = buffer_info-&gt;skb;</div><div class='hunk'>@@ -3643,7 +3636,6 @@ static bool igb_clean_tx_irq(struct igb_ring *tx_ring)</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			igb_unmap_and_free_tx_resource(adapter, buffer_info);</div><div class='del'>-			tx_desc-&gt;upper.data = 0;</div><div class='ctx'> </div><div class='ctx'> 			i++;</div><div class='ctx'> 			if (i == tx_ring-&gt;count)</div><div class='hunk'>@@ -3665,7 +3657,7 @@ static bool igb_clean_tx_irq(struct igb_ring *tx_ring)</div><div class='ctx'> done_cleaning:</div><div class='ctx'> 	tx_ring-&gt;next_to_clean = i;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(cleaned &amp;&amp;</div><div class='add'>+	if (unlikely(count &amp;&amp;</div><div class='ctx'> 		     netif_carrier_ok(netdev) &amp;&amp;</div><div class='ctx'> 		     IGB_DESC_UNUSED(tx_ring) &gt;= IGB_TX_QUEUE_WAKE)) {</div><div class='ctx'> 		/* Make sure that anybody stopping the queue after this</div><div class='head'>diff --git a/drivers/net/irda/kingsun-sir.c b/drivers/net/irda/kingsun-sir.c<br/>index 73fe83be34fe..e1429fc6d050 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/irda/kingsun-sir.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/irda/kingsun-sir.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/irda/kingsun-sir.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/irda/kingsun-sir.c</a></div><div class='hunk'>@@ -540,7 +540,8 @@ static int kingsun_probe(struct usb_interface *intf,</div><div class='ctx'> 	if (ret != 0)</div><div class='ctx'> 		goto free_mem;</div><div class='ctx'> </div><div class='del'>-	info("IrDA: Registered KingSun/DonShine device %s", net-&gt;name);</div><div class='add'>+	dev_info(&amp;net-&gt;dev, "IrDA: Registered KingSun/DonShine device %s\n",</div><div class='add'>+		 net-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	usb_set_intfdata(intf, kingsun);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/irda/ks959-sir.c b/drivers/net/irda/ks959-sir.c<br/>index 8c257a51341a..2482d61662a2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/irda/ks959-sir.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/irda/ks959-sir.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/irda/ks959-sir.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/irda/ks959-sir.c</a></div><div class='hunk'>@@ -801,7 +801,8 @@ static int ks959_probe(struct usb_interface *intf,</div><div class='ctx'> 	if (ret != 0)</div><div class='ctx'> 		goto free_mem;</div><div class='ctx'> </div><div class='del'>-	info("IrDA: Registered KingSun KS-959 device %s", net-&gt;name);</div><div class='add'>+	dev_info(&amp;net-&gt;dev, "IrDA: Registered KingSun KS-959 device %s\n",</div><div class='add'>+		 net-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	usb_set_intfdata(intf, kingsun);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/irda/ksdazzle-sir.c b/drivers/net/irda/ksdazzle-sir.c<br/>index d01a28593ce2..1e0de93fd618 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/irda/ksdazzle-sir.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/irda/ksdazzle-sir.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/irda/ksdazzle-sir.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/irda/ksdazzle-sir.c</a></div><div class='hunk'>@@ -705,7 +705,8 @@ static int ksdazzle_probe(struct usb_interface *intf,</div><div class='ctx'> 	if (ret != 0)</div><div class='ctx'> 		goto free_mem;</div><div class='ctx'> </div><div class='del'>-	info("IrDA: Registered KingSun/Dazzle device %s", net-&gt;name);</div><div class='add'>+	dev_info(&amp;net-&gt;dev, "IrDA: Registered KingSun/Dazzle device %s\n",</div><div class='add'>+		 net-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	usb_set_intfdata(intf, kingsun);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/irda/pxaficp_ir.c b/drivers/net/irda/pxaficp_ir.c<br/>index 4aa61a1a3d55..c5b02b66f756 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/irda/pxaficp_ir.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/irda/pxaficp_ir.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/irda/pxaficp_ir.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/irda/pxaficp_ir.c</a></div><div class='hunk'>@@ -572,8 +572,8 @@ static void pxa_irda_startup(struct pxa_irda *si)</div><div class='ctx'> 	ICCR2 = ICCR2_TXP | ICCR2_TRIG_32;</div><div class='ctx'> </div><div class='ctx'> 	/* configure DMAC */</div><div class='del'>-	DRCMR17 = si-&gt;rxdma | DRCMR_MAPVLD;</div><div class='del'>-	DRCMR18 = si-&gt;txdma | DRCMR_MAPVLD;</div><div class='add'>+	DRCMR(17) = si-&gt;rxdma | DRCMR_MAPVLD;</div><div class='add'>+	DRCMR(18) = si-&gt;txdma | DRCMR_MAPVLD;</div><div class='ctx'> </div><div class='ctx'> 	/* force SIR reinitialization */</div><div class='ctx'> 	si-&gt;speed = 4000000;</div><div class='hunk'>@@ -602,8 +602,8 @@ static void pxa_irda_shutdown(struct pxa_irda *si)</div><div class='ctx'> 	/* disable the STUART or FICP clocks */</div><div class='ctx'> 	pxa_irda_disable_clk(si);</div><div class='ctx'> </div><div class='del'>-	DRCMR17 = 0;</div><div class='del'>-	DRCMR18 = 0;</div><div class='add'>+	DRCMR(17) = 0;</div><div class='add'>+	DRCMR(18) = 0;</div><div class='ctx'> </div><div class='ctx'> 	local_irq_restore(flags);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/irda/sir_dongle.c b/drivers/net/irda/sir_dongle.c<br/>index 36030241f7a9..2a9930e6e2af 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/irda/sir_dongle.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/irda/sir_dongle.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/irda/sir_dongle.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/irda/sir_dongle.c</a></div><div class='hunk'>@@ -67,9 +67,7 @@ int sirdev_get_dongle(struct sir_dev *dev, IRDA_DONGLE type)</div><div class='ctx'> 	const struct dongle_driver *drv = NULL;</div><div class='ctx'> 	int err = -EINVAL;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_KMOD</div><div class='ctx'> 	request_module("irda-dongle-%d", type);</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;dongle_drv != NULL)</div><div class='ctx'> 		return -EBUSY;</div><div class='head'>diff --git a/drivers/net/irda/stir4200.c b/drivers/net/irda/stir4200.c<br/>index 051963782749..3575804fd7c6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/irda/stir4200.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/irda/stir4200.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/irda/stir4200.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/irda/stir4200.c</a></div><div class='hunk'>@@ -506,7 +506,7 @@ static int change_speed(struct stir_cb *stir, unsigned speed)</div><div class='ctx'> 			goto found;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	warn("%s: invalid speed %d", stir-&gt;netdev-&gt;name, speed);</div><div class='add'>+	dev_warn(&amp;stir-&gt;netdev-&gt;dev, "invalid speed %d\n", speed);</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> </div><div class='ctx'>  found:</div><div class='hunk'>@@ -598,8 +598,8 @@ static int fifo_txwait(struct stir_cb *stir, int space)</div><div class='ctx'> 		err = read_reg(stir, REG_FIFOCTL, stir-&gt;fifo_status, </div><div class='ctx'> 				   FIFO_REGS_SIZE);</div><div class='ctx'> 		if (unlikely(err != FIFO_REGS_SIZE)) {</div><div class='del'>-			warn("%s: FIFO register read error: %d", </div><div class='del'>-			     stir-&gt;netdev-&gt;name, err);</div><div class='add'>+			dev_warn(&amp;stir-&gt;netdev-&gt;dev,</div><div class='add'>+				 "FIFO register read error: %d\n", err);</div><div class='ctx'> </div><div class='ctx'> 			return err;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -783,8 +783,9 @@ static int stir_transmit_thread(void *arg)</div><div class='ctx'> </div><div class='ctx'> 			if (unlikely(receive_start(stir))) {</div><div class='ctx'> 				if (net_ratelimit())</div><div class='del'>-					info("%s: receive usb submit failed",</div><div class='del'>-					     stir-&gt;netdev-&gt;name);</div><div class='add'>+					dev_info(&amp;dev-&gt;dev,</div><div class='add'>+						 "%s: receive usb submit failed\n",</div><div class='add'>+						 stir-&gt;netdev-&gt;name);</div><div class='ctx'> 				stir-&gt;receiving = 0;</div><div class='ctx'> 				msleep(10);</div><div class='ctx'> 				continue;</div><div class='hunk'>@@ -836,8 +837,8 @@ static void stir_rcv_irq(struct urb *urb)</div><div class='ctx'> </div><div class='ctx'> 	/* in case of error, the kernel thread will restart us */</div><div class='ctx'> 	if (err) {</div><div class='del'>-		warn("%s: usb receive submit error: %d",</div><div class='del'>-			stir-&gt;netdev-&gt;name, err);</div><div class='add'>+		dev_warn(&amp;stir-&gt;netdev-&gt;dev, "usb receive submit error: %d\n",</div><div class='add'>+			 err);</div><div class='ctx'> 		stir-&gt;receiving = 0;</div><div class='ctx'> 		wake_up_process(stir-&gt;thread);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1073,7 +1074,8 @@ static int stir_probe(struct usb_interface *intf,</div><div class='ctx'> 	if (ret != 0)</div><div class='ctx'> 		goto err_out2;</div><div class='ctx'> </div><div class='del'>-	info("IrDA: Registered SigmaTel device %s", net-&gt;name);</div><div class='add'>+	dev_info(&amp;intf-&gt;dev, "IrDA: Registered SigmaTel device %s\n",</div><div class='add'>+		 net-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	usb_set_intfdata(intf, stir);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/irda/vlsi_ir.c b/drivers/net/irda/vlsi_ir.c<br/>index 18f4b3a96aed..9c926d205de9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/irda/vlsi_ir.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/irda/vlsi_ir.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/irda/vlsi_ir.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/irda/vlsi_ir.c</a></div><div class='hunk'>@@ -165,7 +165,7 @@ static void vlsi_proc_pdev(struct seq_file *seq, struct pci_dev *pdev)</div><div class='ctx'> 	unsigned iobase = pci_resource_start(pdev, 0);</div><div class='ctx'> 	unsigned i;</div><div class='ctx'> </div><div class='del'>-	seq_printf(seq, "\n%s (vid/did: %04x/%04x)\n",</div><div class='add'>+	seq_printf(seq, "\n%s (vid/did: [%04x:%04x])\n",</div><div class='ctx'> 		   pci_name(pdev), (int)pdev-&gt;vendor, (int)pdev-&gt;device);</div><div class='ctx'> 	seq_printf(seq, "pci-power-state: %u\n", (unsigned) pdev-&gt;current_state);</div><div class='ctx'> 	seq_printf(seq, "resources: irq=%u / io=0x%04x / dma_mask=0x%016Lx\n",</div><div class='head'>diff --git a/drivers/net/ixgb/ixgb.h b/drivers/net/ixgb/ixgb.h<br/>index 804698fc6a8f..d85717e3022a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/ixgb/ixgb.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/ixgb/ixgb.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/ixgb/ixgb.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/ixgb/ixgb.h</a></div><div class='hunk'>@@ -85,7 +85,7 @@ struct ixgb_adapter;</div><div class='ctx'> #define DPRINTK(nlevel, klevel, fmt, args...) \</div><div class='ctx'> 	(void)((NETIF_MSG_##nlevel &amp; adapter-&gt;msg_enable) &amp;&amp; \</div><div class='ctx'> 	printk(KERN_##klevel PFX "%s: %s: " fmt, adapter-&gt;netdev-&gt;name, \</div><div class='del'>-		__FUNCTION__ , ## args))</div><div class='add'>+		__func__ , ## args))</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* TX/RX descriptor defines */</div><div class='head'>diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c<br/>index aa75385cd6c7..be3c7dc96f63 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/ixgb/ixgb_main.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/ixgb/ixgb_main.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/ixgb/ixgb_main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/ixgb/ixgb_main.c</a></div><div class='hunk'>@@ -977,15 +977,17 @@ ixgb_clean_rx_ring(struct ixgb_adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; rx_ring-&gt;count; i++) {</div><div class='ctx'> 		buffer_info = &amp;rx_ring-&gt;buffer_info[i];</div><div class='del'>-		if (buffer_info-&gt;skb) {</div><div class='del'>-</div><div class='add'>+		if (buffer_info-&gt;dma) {</div><div class='ctx'> 			pci_unmap_single(pdev,</div><div class='ctx'> 					 buffer_info-&gt;dma,</div><div class='ctx'> 					 buffer_info-&gt;length,</div><div class='ctx'> 					 PCI_DMA_FROMDEVICE);</div><div class='add'>+			buffer_info-&gt;dma = 0;</div><div class='add'>+			buffer_info-&gt;length = 0;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='add'>+		if (buffer_info-&gt;skb) {</div><div class='ctx'> 			dev_kfree_skb(buffer_info-&gt;skb);</div><div class='del'>-</div><div class='ctx'> 			buffer_info-&gt;skb = NULL;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/net/ixgbe/ixgbe.h b/drivers/net/ixgbe/ixgbe.h<br/>index 956914a5028d..e116d340dcc6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/ixgbe/ixgbe.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/ixgbe/ixgbe.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/ixgbe/ixgbe.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/ixgbe/ixgbe.h</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*******************************************************************************</div><div class='ctx'> </div><div class='ctx'>   Intel 10 Gigabit PCI Express Linux driver</div><div class='del'>-  Copyright(c) 1999 - 2007 Intel Corporation.</div><div class='add'>+  Copyright(c) 1999 - 2008 Intel Corporation.</div><div class='ctx'> </div><div class='ctx'>   This program is free software; you can redistribute it and/or modify it</div><div class='ctx'>   under the terms and conditions of the GNU General Public License,</div><div class='hunk'>@@ -20,7 +20,6 @@</div><div class='ctx'>   the file called "COPYING".</div><div class='ctx'> </div><div class='ctx'>   Contact Information:</div><div class='del'>-  Linux NICS &lt;linux.nics@intel.com&gt;</div><div class='ctx'>   e1000-devel Mailing List &lt;e1000-devel@lists.sourceforge.net&gt;</div><div class='ctx'>   Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='ctx'> </div><div class='hunk'>@@ -37,17 +36,15 @@</div><div class='ctx'> #include "ixgbe_type.h"</div><div class='ctx'> #include "ixgbe_common.h"</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_DCA</div><div class='add'>+#ifdef CONFIG_IXGBE_DCA</div><div class='ctx'> #include &lt;linux/dca.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#define IXGBE_ERR(args...) printk(KERN_ERR "ixgbe: " args)</div><div class='del'>-</div><div class='ctx'> #define PFX "ixgbe: "</div><div class='ctx'> #define DPRINTK(nlevel, klevel, fmt, args...) \</div><div class='ctx'> 	((void)((NETIF_MSG_##nlevel &amp; adapter-&gt;msg_enable) &amp;&amp; \</div><div class='ctx'> 	printk(KERN_##klevel PFX "%s: %s: " fmt, adapter-&gt;netdev-&gt;name, \</div><div class='del'>-		__FUNCTION__ , ## args)))</div><div class='add'>+		__func__ , ## args)))</div><div class='ctx'> </div><div class='ctx'> /* TX/RX descriptor defines */</div><div class='ctx'> #define IXGBE_DEFAULT_TXD		   1024</div><div class='hunk'>@@ -58,23 +55,14 @@</div><div class='ctx'> #define IXGBE_MAX_RXD			   4096</div><div class='ctx'> #define IXGBE_MIN_RXD			     64</div><div class='ctx'> </div><div class='del'>-#define IXGBE_DEFAULT_RXQ			   1</div><div class='del'>-#define IXGBE_MAX_RXQ				   1</div><div class='del'>-#define IXGBE_MIN_RXQ				   1</div><div class='del'>-</div><div class='del'>-#define IXGBE_DEFAULT_ITR_RX_USECS	    125  /*   8k irqs/sec */</div><div class='del'>-#define IXGBE_DEFAULT_ITR_TX_USECS	    250  /*   4k irqs/sec */</div><div class='del'>-#define IXGBE_MIN_ITR_USECS		    100  /* 500k irqs/sec */</div><div class='del'>-#define IXGBE_MAX_ITR_USECS		  10000  /* 100  irqs/sec */</div><div class='del'>-</div><div class='ctx'> /* flow control */</div><div class='ctx'> #define IXGBE_DEFAULT_FCRTL		0x10000</div><div class='del'>-#define IXGBE_MIN_FCRTL			      0</div><div class='add'>+#define IXGBE_MIN_FCRTL			   0x40</div><div class='ctx'> #define IXGBE_MAX_FCRTL			0x7FF80</div><div class='ctx'> #define IXGBE_DEFAULT_FCRTH		0x20000</div><div class='del'>-#define IXGBE_MIN_FCRTH			      0</div><div class='add'>+#define IXGBE_MIN_FCRTH			  0x600</div><div class='ctx'> #define IXGBE_MAX_FCRTH			0x7FFF0</div><div class='del'>-#define IXGBE_DEFAULT_FCPAUSE		 0x6800  /* may be too long */</div><div class='add'>+#define IXGBE_DEFAULT_FCPAUSE		 0xFFFF</div><div class='ctx'> #define IXGBE_MIN_FCPAUSE		      0</div><div class='ctx'> #define IXGBE_MAX_FCPAUSE		 0xFFFF</div><div class='ctx'> </div><div class='hunk'>@@ -88,9 +76,6 @@</div><div class='ctx'> </div><div class='ctx'> #define MAXIMUM_ETHERNET_VLAN_SIZE (ETH_FRAME_LEN + ETH_FCS_LEN + VLAN_HLEN)</div><div class='ctx'> </div><div class='del'>-/* How many Tx Descriptors do we need to call netif_wake_queue? */</div><div class='del'>-#define IXGBE_TX_QUEUE_WAKE 16</div><div class='del'>-</div><div class='ctx'> /* How many Rx Buffers do we bundle into one write to the hardware ? */</div><div class='ctx'> #define IXGBE_RX_BUFFER_WRITE	16	/* Must be power of 2 */</div><div class='ctx'> </div><div class='hunk'>@@ -119,6 +104,7 @@ struct ixgbe_rx_buffer {</div><div class='ctx'> 	dma_addr_t dma;</div><div class='ctx'> 	struct page *page;</div><div class='ctx'> 	dma_addr_t page_dma;</div><div class='add'>+	unsigned int page_offset;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ixgbe_queue_stats {</div><div class='hunk'>@@ -150,22 +136,20 @@ struct ixgbe_ring {</div><div class='ctx'> 		      * offset associated with this ring, which is different</div><div class='ctx'> 		      * for DCE and RSS modes */</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_DCA</div><div class='add'>+#ifdef CONFIG_IXGBE_DCA</div><div class='ctx'> 	/* cpu for tx queue */</div><div class='ctx'> 	int cpu;</div><div class='ctx'> #endif</div><div class='ctx'> 	struct net_lro_mgr lro_mgr;</div><div class='ctx'> 	bool lro_used;</div><div class='ctx'> 	struct ixgbe_queue_stats stats;</div><div class='del'>-	u8 v_idx; /* maps directly to the index for this ring in the hardware</div><div class='del'>-		   * vector array, can also be used for finding the bit in EICR</div><div class='del'>-		   * and friends that represents the vector for this ring */</div><div class='add'>+	u16 v_idx; /* maps directly to the index for this ring in the hardware</div><div class='add'>+	           * vector array, can also be used for finding the bit in EICR</div><div class='add'>+	           * and friends that represents the vector for this ring */</div><div class='ctx'> </div><div class='del'>-	u32 eims_value;</div><div class='del'>-	u16 itr_register;</div><div class='ctx'> </div><div class='del'>-	char name[IFNAMSIZ + 5];</div><div class='ctx'> 	u16 work_limit;                /* max work per interrupt */</div><div class='add'>+	u16 rx_buf_len;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define RING_F_VMDQ 1</div><div class='hunk'>@@ -190,8 +174,8 @@ struct ixgbe_q_vector {</div><div class='ctx'> 	DECLARE_BITMAP(txr_idx, MAX_TX_QUEUES); /* Tx ring indices */</div><div class='ctx'> 	u8 rxr_count;     /* Rx ring count assigned to this vector */</div><div class='ctx'> 	u8 txr_count;     /* Tx ring count assigned to this vector */</div><div class='del'>-	u8 tx_eitr;</div><div class='del'>-	u8 rx_eitr;</div><div class='add'>+	u8 tx_itr;</div><div class='add'>+	u8 rx_itr;</div><div class='ctx'> 	u32 eitr;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -228,7 +212,6 @@ struct ixgbe_adapter {</div><div class='ctx'> 	struct timer_list watchdog_timer;</div><div class='ctx'> 	struct vlan_group *vlgrp;</div><div class='ctx'> 	u16 bd_number;</div><div class='del'>-	u16 rx_buf_len;</div><div class='ctx'> 	struct work_struct reset_task;</div><div class='ctx'> 	struct ixgbe_q_vector q_vector[MAX_MSIX_Q_VECTORS];</div><div class='ctx'> 	char name[MAX_MSIX_COUNT][IFNAMSIZ + 5];</div><div class='hunk'>@@ -240,7 +223,9 @@ struct ixgbe_adapter {</div><div class='ctx'> </div><div class='ctx'> 	/* TX */</div><div class='ctx'> 	struct ixgbe_ring *tx_ring;	/* One per active queue */</div><div class='add'>+	int num_tx_queues;</div><div class='ctx'> 	u64 restart_queue;</div><div class='add'>+	u64 hw_csum_tx_good;</div><div class='ctx'> 	u64 lsc_int;</div><div class='ctx'> 	u64 hw_tso_ctxt;</div><div class='ctx'> 	u64 hw_tso6_ctxt;</div><div class='hunk'>@@ -249,12 +234,10 @@ struct ixgbe_adapter {</div><div class='ctx'> </div><div class='ctx'> 	/* RX */</div><div class='ctx'> 	struct ixgbe_ring *rx_ring;	/* One per active queue */</div><div class='del'>-	u64 hw_csum_tx_good;</div><div class='add'>+	int num_rx_queues;</div><div class='ctx'> 	u64 hw_csum_rx_error;</div><div class='ctx'> 	u64 hw_csum_rx_good;</div><div class='ctx'> 	u64 non_eop_descs;</div><div class='del'>-	int num_tx_queues;</div><div class='del'>-	int num_rx_queues;</div><div class='ctx'> 	int num_msix_vectors;</div><div class='ctx'> 	struct ixgbe_ring_feature ring_feature[3];</div><div class='ctx'> 	struct msix_entry *msix_entries;</div><div class='hunk'>@@ -267,15 +250,28 @@ struct ixgbe_adapter {</div><div class='ctx'> 	 * thus the additional *_CAPABLE flags.</div><div class='ctx'> 	 */</div><div class='ctx'> 	u32 flags;</div><div class='del'>-#define IXGBE_FLAG_RX_CSUM_ENABLED              (u32)(1 &lt;&lt; 0)</div><div class='del'>-#define IXGBE_FLAG_MSI_ENABLED                  (u32)(1 &lt;&lt; 1)</div><div class='del'>-#define IXGBE_FLAG_MSIX_ENABLED                 (u32)(1 &lt;&lt; 2)</div><div class='del'>-#define IXGBE_FLAG_RX_PS_ENABLED                (u32)(1 &lt;&lt; 3)</div><div class='del'>-#define IXGBE_FLAG_IN_NETPOLL                   (u32)(1 &lt;&lt; 4)</div><div class='del'>-#define IXGBE_FLAG_IMIR_ENABLED                 (u32)(1 &lt;&lt; 5)</div><div class='del'>-#define IXGBE_FLAG_RSS_ENABLED                  (u32)(1 &lt;&lt; 6)</div><div class='del'>-#define IXGBE_FLAG_VMDQ_ENABLED                 (u32)(1 &lt;&lt; 7)</div><div class='del'>-#define IXGBE_FLAG_DCA_ENABLED                  (u32)(1 &lt;&lt; 8)</div><div class='add'>+#define IXGBE_FLAG_RX_CSUM_ENABLED              (u32)(1)</div><div class='add'>+#define IXGBE_FLAG_MSI_CAPABLE                  (u32)(1 &lt;&lt; 1)</div><div class='add'>+#define IXGBE_FLAG_MSI_ENABLED                  (u32)(1 &lt;&lt; 2)</div><div class='add'>+#define IXGBE_FLAG_MSIX_CAPABLE                 (u32)(1 &lt;&lt; 3)</div><div class='add'>+#define IXGBE_FLAG_MSIX_ENABLED                 (u32)(1 &lt;&lt; 4)</div><div class='add'>+#define IXGBE_FLAG_RX_1BUF_CAPABLE              (u32)(1 &lt;&lt; 6)</div><div class='add'>+#define IXGBE_FLAG_RX_PS_CAPABLE                (u32)(1 &lt;&lt; 7)</div><div class='add'>+#define IXGBE_FLAG_RX_PS_ENABLED                (u32)(1 &lt;&lt; 8)</div><div class='add'>+#define IXGBE_FLAG_IN_NETPOLL                   (u32)(1 &lt;&lt; 9)</div><div class='add'>+#define IXGBE_FLAG_DCA_ENABLED                  (u32)(1 &lt;&lt; 10)</div><div class='add'>+#define IXGBE_FLAG_DCA_CAPABLE                  (u32)(1 &lt;&lt; 11)</div><div class='add'>+#define IXGBE_FLAG_IMIR_ENABLED                 (u32)(1 &lt;&lt; 12)</div><div class='add'>+#define IXGBE_FLAG_MQ_CAPABLE                   (u32)(1 &lt;&lt; 13)</div><div class='add'>+#define IXGBE_FLAG_RSS_ENABLED                  (u32)(1 &lt;&lt; 16)</div><div class='add'>+#define IXGBE_FLAG_RSS_CAPABLE                  (u32)(1 &lt;&lt; 17)</div><div class='add'>+#define IXGBE_FLAG_VMDQ_CAPABLE                 (u32)(1 &lt;&lt; 18)</div><div class='add'>+#define IXGBE_FLAG_VMDQ_ENABLED                 (u32)(1 &lt;&lt; 19)</div><div class='add'>+#define IXGBE_FLAG_NEED_LINK_UPDATE             (u32)(1 &lt;&lt; 22)</div><div class='add'>+#define IXGBE_FLAG_IN_WATCHDOG_TASK             (u32)(1 &lt;&lt; 23)</div><div class='add'>+</div><div class='add'>+/* default to trying for four seconds */</div><div class='add'>+#define IXGBE_TRY_LINK_TIMEOUT (4 * HZ)</div><div class='ctx'> </div><div class='ctx'> 	/* OS defined structs */</div><div class='ctx'> 	struct net_device *netdev;</div><div class='hunk'>@@ -288,14 +284,21 @@ struct ixgbe_adapter {</div><div class='ctx'> 	struct ixgbe_hw_stats stats;</div><div class='ctx'> </div><div class='ctx'> 	/* Interrupt Throttle Rate */</div><div class='del'>-	u32 rx_eitr;</div><div class='del'>-	u32 tx_eitr;</div><div class='add'>+	u32 eitr_param;</div><div class='ctx'> </div><div class='ctx'> 	unsigned long state;</div><div class='ctx'> 	u64 tx_busy;</div><div class='ctx'> 	u64 lro_aggregated;</div><div class='ctx'> 	u64 lro_flushed;</div><div class='ctx'> 	u64 lro_no_desc;</div><div class='add'>+	unsigned int tx_ring_count;</div><div class='add'>+	unsigned int rx_ring_count;</div><div class='add'>+</div><div class='add'>+	u32 link_speed;</div><div class='add'>+	bool link_up;</div><div class='add'>+	unsigned long link_check_timeout;</div><div class='add'>+</div><div class='add'>+	struct work_struct watchdog_task;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum ixbge_state_t {</div><div class='hunk'>@@ -317,11 +320,11 @@ extern int ixgbe_up(struct ixgbe_adapter *adapter);</div><div class='ctx'> extern void ixgbe_down(struct ixgbe_adapter *adapter);</div><div class='ctx'> extern void ixgbe_reinit_locked(struct ixgbe_adapter *adapter);</div><div class='ctx'> extern void ixgbe_reset(struct ixgbe_adapter *adapter);</div><div class='del'>-extern void ixgbe_update_stats(struct ixgbe_adapter *adapter);</div><div class='ctx'> extern void ixgbe_set_ethtool_ops(struct net_device *netdev);</div><div class='del'>-extern int ixgbe_setup_rx_resources(struct ixgbe_adapter *adapter,</div><div class='del'>-				    struct ixgbe_ring *rxdr);</div><div class='del'>-extern int ixgbe_setup_tx_resources(struct ixgbe_adapter *adapter,</div><div class='del'>-				    struct ixgbe_ring *txdr);</div><div class='add'>+extern int ixgbe_setup_rx_resources(struct ixgbe_adapter *, struct ixgbe_ring *);</div><div class='add'>+extern int ixgbe_setup_tx_resources(struct ixgbe_adapter *, struct ixgbe_ring *);</div><div class='add'>+extern void ixgbe_free_rx_resources(struct ixgbe_adapter *, struct ixgbe_ring *);</div><div class='add'>+extern void ixgbe_free_tx_resources(struct ixgbe_adapter *, struct ixgbe_ring *);</div><div class='add'>+extern void ixgbe_update_stats(struct ixgbe_adapter *adapter);</div><div class='ctx'> </div><div class='ctx'> #endif /* _IXGBE_H_ */</div><div class='head'>diff --git a/drivers/net/ixgbe/ixgbe_82598.c b/drivers/net/ixgbe/ixgbe_82598.c<br/>index f96358b641af..7cddcfba809e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/ixgbe/ixgbe_82598.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/ixgbe/ixgbe_82598.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/ixgbe/ixgbe_82598.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/ixgbe/ixgbe_82598.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*******************************************************************************</div><div class='ctx'> </div><div class='ctx'>   Intel 10 Gigabit PCI Express Linux driver</div><div class='del'>-  Copyright(c) 1999 - 2007 Intel Corporation.</div><div class='add'>+  Copyright(c) 1999 - 2008 Intel Corporation.</div><div class='ctx'> </div><div class='ctx'>   This program is free software; you can redistribute it and/or modify it</div><div class='ctx'>   under the terms and conditions of the GNU General Public License,</div><div class='hunk'>@@ -20,7 +20,6 @@</div><div class='ctx'>   the file called "COPYING".</div><div class='ctx'> </div><div class='ctx'>   Contact Information:</div><div class='del'>-  Linux NICS &lt;linux.nics@intel.com&gt;</div><div class='ctx'>   e1000-devel Mailing List &lt;e1000-devel@lists.sourceforge.net&gt;</div><div class='ctx'>   Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='ctx'> </div><div class='hunk'>@@ -36,67 +35,62 @@</div><div class='ctx'> #define IXGBE_82598_MAX_TX_QUEUES 32</div><div class='ctx'> #define IXGBE_82598_MAX_RX_QUEUES 64</div><div class='ctx'> #define IXGBE_82598_RAR_ENTRIES   16</div><div class='add'>+#define IXGBE_82598_MC_TBL_SIZE  128</div><div class='add'>+#define IXGBE_82598_VFT_TBL_SIZE 128</div><div class='ctx'> </div><div class='del'>-static s32 ixgbe_get_invariants_82598(struct ixgbe_hw *hw);</div><div class='del'>-static s32 ixgbe_get_link_settings_82598(struct ixgbe_hw *hw, u32 *speed,</div><div class='del'>-					 bool *autoneg);</div><div class='del'>-static s32 ixgbe_get_copper_link_settings_82598(struct ixgbe_hw *hw,</div><div class='del'>-						u32 *speed, bool *autoneg);</div><div class='del'>-static enum ixgbe_media_type ixgbe_get_media_type_82598(struct ixgbe_hw *hw);</div><div class='del'>-static s32 ixgbe_setup_mac_link_82598(struct ixgbe_hw *hw);</div><div class='del'>-static s32 ixgbe_check_mac_link_82598(struct ixgbe_hw *hw, u32 *speed,</div><div class='del'>-				      bool *link_up);</div><div class='del'>-static s32 ixgbe_setup_mac_link_speed_82598(struct ixgbe_hw *hw, u32 speed,</div><div class='del'>-					    bool autoneg,</div><div class='del'>-					    bool autoneg_wait_to_complete);</div><div class='add'>+static s32 ixgbe_get_copper_link_capabilities_82598(struct ixgbe_hw *hw,</div><div class='add'>+                                             ixgbe_link_speed *speed,</div><div class='add'>+                                             bool *autoneg);</div><div class='ctx'> static s32 ixgbe_setup_copper_link_82598(struct ixgbe_hw *hw);</div><div class='del'>-static s32 ixgbe_setup_copper_link_speed_82598(struct ixgbe_hw *hw, u32 speed,</div><div class='del'>-					       bool autoneg,</div><div class='del'>-					       bool autoneg_wait_to_complete);</div><div class='del'>-static s32 ixgbe_reset_hw_82598(struct ixgbe_hw *hw);</div><div class='del'>-</div><div class='add'>+static s32 ixgbe_setup_copper_link_speed_82598(struct ixgbe_hw *hw,</div><div class='add'>+                                               ixgbe_link_speed speed,</div><div class='add'>+                                               bool autoneg,</div><div class='add'>+                                               bool autoneg_wait_to_complete);</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ */</div><div class='ctx'> static s32 ixgbe_get_invariants_82598(struct ixgbe_hw *hw)</div><div class='ctx'> {</div><div class='del'>-	hw-&gt;mac.num_rx_queues = IXGBE_82598_MAX_RX_QUEUES;</div><div class='del'>-	hw-&gt;mac.num_tx_queues = IXGBE_82598_MAX_TX_QUEUES;</div><div class='del'>-	hw-&gt;mac.num_rx_addrs = IXGBE_82598_RAR_ENTRIES;</div><div class='del'>-</div><div class='del'>-	/* PHY ops are filled in by default properly for Fiber only */</div><div class='del'>-	if (hw-&gt;mac.ops.get_media_type(hw) == ixgbe_media_type_copper) {</div><div class='del'>-		hw-&gt;mac.ops.setup_link = &amp;ixgbe_setup_copper_link_82598;</div><div class='del'>-		hw-&gt;mac.ops.setup_link_speed = &amp;ixgbe_setup_copper_link_speed_82598;</div><div class='del'>-		hw-&gt;mac.ops.get_link_settings =</div><div class='del'>-				&amp;ixgbe_get_copper_link_settings_82598;</div><div class='del'>-</div><div class='del'>-		/* Call PHY identify routine to get the phy type */</div><div class='del'>-		ixgbe_identify_phy(hw);</div><div class='del'>-</div><div class='del'>-		switch (hw-&gt;phy.type) {</div><div class='del'>-		case ixgbe_phy_tn:</div><div class='del'>-			hw-&gt;phy.ops.setup_link = &amp;ixgbe_setup_tnx_phy_link;</div><div class='del'>-			hw-&gt;phy.ops.check_link = &amp;ixgbe_check_tnx_phy_link;</div><div class='del'>-			hw-&gt;phy.ops.setup_link_speed =</div><div class='del'>-					&amp;ixgbe_setup_tnx_phy_link_speed;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='add'>+	struct ixgbe_mac_info *mac = &amp;hw-&gt;mac;</div><div class='add'>+	struct ixgbe_phy_info *phy = &amp;hw-&gt;phy;</div><div class='add'>+</div><div class='add'>+	/* Call PHY identify routine to get the phy type */</div><div class='add'>+	ixgbe_identify_phy_generic(hw);</div><div class='add'>+</div><div class='add'>+	/* PHY Init */</div><div class='add'>+	switch (phy-&gt;type) {</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (mac-&gt;ops.get_media_type(hw) == ixgbe_media_type_copper) {</div><div class='add'>+		mac-&gt;ops.setup_link = &amp;ixgbe_setup_copper_link_82598;</div><div class='add'>+		mac-&gt;ops.setup_link_speed =</div><div class='add'>+		                     &amp;ixgbe_setup_copper_link_speed_82598;</div><div class='add'>+		mac-&gt;ops.get_link_capabilities =</div><div class='add'>+		                     &amp;ixgbe_get_copper_link_capabilities_82598;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mac-&gt;mcft_size = IXGBE_82598_MC_TBL_SIZE;</div><div class='add'>+	mac-&gt;vft_size = IXGBE_82598_VFT_TBL_SIZE;</div><div class='add'>+	mac-&gt;num_rar_entries = IXGBE_82598_RAR_ENTRIES;</div><div class='add'>+	mac-&gt;max_rx_queues = IXGBE_82598_MAX_RX_QUEUES;</div><div class='add'>+	mac-&gt;max_tx_queues = IXGBE_82598_MAX_TX_QUEUES;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *  ixgbe_get_link_settings_82598 - Determines default link settings</div><div class='add'>+ *  ixgbe_get_link_capabilities_82598 - Determines link capabilities</div><div class='ctx'>  *  @hw: pointer to hardware structure</div><div class='ctx'>  *  @speed: pointer to link speed</div><div class='ctx'>  *  @autoneg: boolean auto-negotiation value</div><div class='ctx'>  *</div><div class='del'>- *  Determines the default link settings by reading the AUTOC register.</div><div class='add'>+ *  Determines the link capabilities by reading the AUTOC register.</div><div class='ctx'>  **/</div><div class='del'>-static s32 ixgbe_get_link_settings_82598(struct ixgbe_hw *hw, u32 *speed,</div><div class='del'>-					 bool *autoneg)</div><div class='add'>+static s32 ixgbe_get_link_capabilities_82598(struct ixgbe_hw *hw,</div><div class='add'>+                                             ixgbe_link_speed *speed,</div><div class='add'>+                                             bool *autoneg)</div><div class='ctx'> {</div><div class='ctx'> 	s32 status = 0;</div><div class='ctx'> 	s32 autoc_reg;</div><div class='hunk'>@@ -145,15 +139,16 @@ static s32 ixgbe_get_link_settings_82598(struct ixgbe_hw *hw, u32 *speed,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *  ixgbe_get_copper_link_settings_82598 - Determines default link settings</div><div class='add'>+ *  ixgbe_get_copper_link_capabilities_82598 - Determines link capabilities</div><div class='ctx'>  *  @hw: pointer to hardware structure</div><div class='ctx'>  *  @speed: pointer to link speed</div><div class='ctx'>  *  @autoneg: boolean auto-negotiation value</div><div class='ctx'>  *</div><div class='del'>- *  Determines the default link settings by reading the AUTOC register.</div><div class='add'>+ *  Determines the link capabilities by reading the AUTOC register.</div><div class='ctx'>  **/</div><div class='del'>-static s32 ixgbe_get_copper_link_settings_82598(struct ixgbe_hw *hw,</div><div class='del'>-						u32 *speed, bool *autoneg)</div><div class='add'>+s32 ixgbe_get_copper_link_capabilities_82598(struct ixgbe_hw *hw,</div><div class='add'>+                                             ixgbe_link_speed *speed,</div><div class='add'>+                                             bool *autoneg)</div><div class='ctx'> {</div><div class='ctx'> 	s32 status = IXGBE_ERR_LINK_SETUP;</div><div class='ctx'> 	u16 speed_ability;</div><div class='hunk'>@@ -161,9 +156,9 @@ static s32 ixgbe_get_copper_link_settings_82598(struct ixgbe_hw *hw,</div><div class='ctx'> 	*speed = 0;</div><div class='ctx'> 	*autoneg = true;</div><div class='ctx'> </div><div class='del'>-	status = ixgbe_read_phy_reg(hw, IXGBE_MDIO_PHY_SPEED_ABILITY,</div><div class='del'>-				    IXGBE_MDIO_PMA_PMD_DEV_TYPE,</div><div class='del'>-				    &amp;speed_ability);</div><div class='add'>+	status = hw-&gt;phy.ops.read_reg(hw, IXGBE_MDIO_PHY_SPEED_ABILITY,</div><div class='add'>+	                              IXGBE_MDIO_PMA_PMD_DEV_TYPE,</div><div class='add'>+	                              &amp;speed_ability);</div><div class='ctx'> </div><div class='ctx'> 	if (status == 0) {</div><div class='ctx'> 		if (speed_ability &amp; IXGBE_MDIO_PHY_SPEED_10G)</div><div class='hunk'>@@ -191,11 +186,9 @@ static enum ixgbe_media_type ixgbe_get_media_type_82598(struct ixgbe_hw *hw)</div><div class='ctx'> 	case IXGBE_DEV_ID_82598AF_SINGLE_PORT:</div><div class='ctx'> 	case IXGBE_DEV_ID_82598EB_CX4:</div><div class='ctx'> 	case IXGBE_DEV_ID_82598_CX4_DUAL_PORT:</div><div class='add'>+	case IXGBE_DEV_ID_82598EB_XF_LR:</div><div class='ctx'> 		media_type = ixgbe_media_type_fiber;</div><div class='ctx'> 		break;</div><div class='del'>-	case IXGBE_DEV_ID_82598AT_DUAL_PORT:</div><div class='del'>-		media_type = ixgbe_media_type_copper;</div><div class='del'>-		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		media_type = ixgbe_media_type_unknown;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -205,6 +198,122 @@ static enum ixgbe_media_type ixgbe_get_media_type_82598(struct ixgbe_hw *hw)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ *  ixgbe_setup_fc_82598 - Configure flow control settings</div><div class='add'>+ *  @hw: pointer to hardware structure</div><div class='add'>+ *  @packetbuf_num: packet buffer number (0-7)</div><div class='add'>+ *</div><div class='add'>+ *  Configures the flow control settings based on SW configuration.  This</div><div class='add'>+ *  function is used for 802.3x flow control configuration only.</div><div class='add'>+ **/</div><div class='add'>+s32 ixgbe_setup_fc_82598(struct ixgbe_hw *hw, s32 packetbuf_num)</div><div class='add'>+{</div><div class='add'>+	u32 frctl_reg;</div><div class='add'>+	u32 rmcs_reg;</div><div class='add'>+</div><div class='add'>+	if (packetbuf_num &lt; 0 || packetbuf_num &gt; 7) {</div><div class='add'>+		hw_dbg(hw, "Invalid packet buffer number [%d], expected range is"</div><div class='add'>+		          " 0-7\n", packetbuf_num);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	frctl_reg = IXGBE_READ_REG(hw, IXGBE_FCTRL);</div><div class='add'>+	frctl_reg &amp;= ~(IXGBE_FCTRL_RFCE | IXGBE_FCTRL_RPFCE);</div><div class='add'>+</div><div class='add'>+	rmcs_reg = IXGBE_READ_REG(hw, IXGBE_RMCS);</div><div class='add'>+	rmcs_reg &amp;= ~(IXGBE_RMCS_TFCE_PRIORITY | IXGBE_RMCS_TFCE_802_3X);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * 10 gig parts do not have a word in the EEPROM to determine the</div><div class='add'>+	 * default flow control setting, so we explicitly set it to full.</div><div class='add'>+	 */</div><div class='add'>+	if (hw-&gt;fc.type == ixgbe_fc_default)</div><div class='add'>+		hw-&gt;fc.type = ixgbe_fc_full;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We want to save off the original Flow Control configuration just in</div><div class='add'>+	 * case we get disconnected and then reconnected into a different hub</div><div class='add'>+	 * or switch with different Flow Control capabilities.</div><div class='add'>+	 */</div><div class='add'>+	hw-&gt;fc.original_type = hw-&gt;fc.type;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The possible values of the "flow_control" parameter are:</div><div class='add'>+	 * 0: Flow control is completely disabled</div><div class='add'>+	 * 1: Rx flow control is enabled (we can receive pause frames but not</div><div class='add'>+	 *    send pause frames).</div><div class='add'>+	 * 2: Tx flow control is enabled (we can send pause frames but we do not</div><div class='add'>+	 *    support receiving pause frames)</div><div class='add'>+	 * 3: Both Rx and Tx flow control (symmetric) are enabled.</div><div class='add'>+	 * other: Invalid.</div><div class='add'>+	 */</div><div class='add'>+	switch (hw-&gt;fc.type) {</div><div class='add'>+	case ixgbe_fc_none:</div><div class='add'>+		break;</div><div class='add'>+	case ixgbe_fc_rx_pause:</div><div class='add'>+		/*</div><div class='add'>+		 * Rx Flow control is enabled,</div><div class='add'>+		 * and Tx Flow control is disabled.</div><div class='add'>+		 */</div><div class='add'>+		frctl_reg |= IXGBE_FCTRL_RFCE;</div><div class='add'>+		break;</div><div class='add'>+	case ixgbe_fc_tx_pause:</div><div class='add'>+		/*</div><div class='add'>+		 * Tx Flow control is enabled, and Rx Flow control is disabled,</div><div class='add'>+		 * by a software over-ride.</div><div class='add'>+		 */</div><div class='add'>+		rmcs_reg |= IXGBE_RMCS_TFCE_802_3X;</div><div class='add'>+		break;</div><div class='add'>+	case ixgbe_fc_full:</div><div class='add'>+		/*</div><div class='add'>+		 * Flow control (both Rx and Tx) is enabled by a software</div><div class='add'>+		 * over-ride.</div><div class='add'>+		 */</div><div class='add'>+		frctl_reg |= IXGBE_FCTRL_RFCE;</div><div class='add'>+		rmcs_reg |= IXGBE_RMCS_TFCE_802_3X;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		/* We should never get here.  The value should be 0-3. */</div><div class='add'>+		hw_dbg(hw, "Flow control param set incorrectly\n");</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Enable 802.3x based flow control settings. */</div><div class='add'>+	IXGBE_WRITE_REG(hw, IXGBE_FCTRL, frctl_reg);</div><div class='add'>+	IXGBE_WRITE_REG(hw, IXGBE_RMCS, rmcs_reg);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Check for invalid software configuration, zeros are completely</div><div class='add'>+	 * invalid for all parameters used past this point, and if we enable</div><div class='add'>+	 * flow control with zero water marks, we blast flow control packets.</div><div class='add'>+	 */</div><div class='add'>+	if (!hw-&gt;fc.low_water || !hw-&gt;fc.high_water || !hw-&gt;fc.pause_time) {</div><div class='add'>+		hw_dbg(hw, "Flow control structure initialized incorrectly\n");</div><div class='add'>+		return IXGBE_ERR_INVALID_LINK_SETTINGS;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We need to set up the Receive Threshold high and low water</div><div class='add'>+	 * marks as well as (optionally) enabling the transmission of</div><div class='add'>+	 * XON frames.</div><div class='add'>+	 */</div><div class='add'>+	if (hw-&gt;fc.type &amp; ixgbe_fc_tx_pause) {</div><div class='add'>+		if (hw-&gt;fc.send_xon) {</div><div class='add'>+			IXGBE_WRITE_REG(hw, IXGBE_FCRTL(packetbuf_num),</div><div class='add'>+			                (hw-&gt;fc.low_water | IXGBE_FCRTL_XONE));</div><div class='add'>+		} else {</div><div class='add'>+			IXGBE_WRITE_REG(hw, IXGBE_FCRTL(packetbuf_num),</div><div class='add'>+			                hw-&gt;fc.low_water);</div><div class='add'>+		}</div><div class='add'>+		IXGBE_WRITE_REG(hw, IXGBE_FCRTH(packetbuf_num),</div><div class='add'>+		                (hw-&gt;fc.high_water)|IXGBE_FCRTH_FCEN);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	IXGBE_WRITE_REG(hw, IXGBE_FCTTV(0), hw-&gt;fc.pause_time);</div><div class='add'>+	IXGBE_WRITE_REG(hw, IXGBE_FCRTV, (hw-&gt;fc.pause_time &gt;&gt; 1));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  *  ixgbe_setup_mac_link_82598 - Configures MAC link settings</div><div class='ctx'>  *  @hw: pointer to hardware structure</div><div class='ctx'>  *</div><div class='hunk'>@@ -248,8 +357,7 @@ static s32 ixgbe_setup_mac_link_82598(struct ixgbe_hw *hw)</div><div class='ctx'> 			}</div><div class='ctx'> 			if (!(links_reg &amp; IXGBE_LINKS_KX_AN_COMP)) {</div><div class='ctx'> 				status = IXGBE_ERR_AUTONEG_NOT_COMPLETE;</div><div class='del'>-				hw_dbg(hw,</div><div class='del'>-				       "Autonegotiation did not complete.\n");</div><div class='add'>+				hw_dbg(hw, "Autonegotiation did not complete.\n");</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -259,8 +367,8 @@ static s32 ixgbe_setup_mac_link_82598(struct ixgbe_hw *hw)</div><div class='ctx'> 	 * case we get disconnected and then reconnected into a different hub</div><div class='ctx'> 	 * or switch with different Flow Control capabilities.</div><div class='ctx'> 	 */</div><div class='del'>-	hw-&gt;fc.type = hw-&gt;fc.original_type;</div><div class='del'>-	ixgbe_setup_fc(hw, 0);</div><div class='add'>+	hw-&gt;fc.original_type = hw-&gt;fc.type;</div><div class='add'>+	ixgbe_setup_fc_82598(hw, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* Add delay to filter out noises during initial link setup */</div><div class='ctx'> 	msleep(50);</div><div class='hunk'>@@ -273,20 +381,35 @@ static s32 ixgbe_setup_mac_link_82598(struct ixgbe_hw *hw)</div><div class='ctx'>  *  @hw: pointer to hardware structure</div><div class='ctx'>  *  @speed: pointer to link speed</div><div class='ctx'>  *  @link_up: true is link is up, false otherwise</div><div class='add'>+ *  @link_up_wait_to_complete: bool used to wait for link up or not</div><div class='ctx'>  *</div><div class='ctx'>  *  Reads the links register to determine if link is up and the current speed</div><div class='ctx'>  **/</div><div class='del'>-static s32 ixgbe_check_mac_link_82598(struct ixgbe_hw *hw, u32 *speed,</div><div class='del'>-				      bool *link_up)</div><div class='add'>+static s32 ixgbe_check_mac_link_82598(struct ixgbe_hw *hw,</div><div class='add'>+                                      ixgbe_link_speed *speed, bool *link_up,</div><div class='add'>+                                      bool link_up_wait_to_complete)</div><div class='ctx'> {</div><div class='ctx'> 	u32 links_reg;</div><div class='add'>+	u32 i;</div><div class='ctx'> </div><div class='ctx'> 	links_reg = IXGBE_READ_REG(hw, IXGBE_LINKS);</div><div class='del'>-</div><div class='del'>-	if (links_reg &amp; IXGBE_LINKS_UP)</div><div class='del'>-		*link_up = true;</div><div class='del'>-	else</div><div class='del'>-		*link_up = false;</div><div class='add'>+	if (link_up_wait_to_complete) {</div><div class='add'>+		for (i = 0; i &lt; IXGBE_LINK_UP_TIME; i++) {</div><div class='add'>+			if (links_reg &amp; IXGBE_LINKS_UP) {</div><div class='add'>+				*link_up = true;</div><div class='add'>+				break;</div><div class='add'>+			} else {</div><div class='add'>+				*link_up = false;</div><div class='add'>+			}</div><div class='add'>+			msleep(100);</div><div class='add'>+			links_reg = IXGBE_READ_REG(hw, IXGBE_LINKS);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		if (links_reg &amp; IXGBE_LINKS_UP)</div><div class='add'>+			*link_up = true;</div><div class='add'>+		else</div><div class='add'>+			*link_up = false;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (links_reg &amp; IXGBE_LINKS_SPEED)</div><div class='ctx'> 		*speed = IXGBE_LINK_SPEED_10GB_FULL;</div><div class='hunk'>@@ -296,6 +419,7 @@ static s32 ixgbe_check_mac_link_82598(struct ixgbe_hw *hw, u32 *speed,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  *  ixgbe_setup_mac_link_speed_82598 - Set MAC link speed</div><div class='ctx'>  *  @hw: pointer to hardware structure</div><div class='hunk'>@@ -306,18 +430,18 @@ static s32 ixgbe_check_mac_link_82598(struct ixgbe_hw *hw, u32 *speed,</div><div class='ctx'>  *  Set the link speed in the AUTOC register and restarts link.</div><div class='ctx'>  **/</div><div class='ctx'> static s32 ixgbe_setup_mac_link_speed_82598(struct ixgbe_hw *hw,</div><div class='del'>-					    u32 speed, bool autoneg,</div><div class='del'>-					    bool autoneg_wait_to_complete)</div><div class='add'>+                                            ixgbe_link_speed speed, bool autoneg,</div><div class='add'>+                                            bool autoneg_wait_to_complete)</div><div class='ctx'> {</div><div class='ctx'> 	s32 status = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* If speed is 10G, then check for CX4 or XAUI. */</div><div class='ctx'> 	if ((speed == IXGBE_LINK_SPEED_10GB_FULL) &amp;&amp;</div><div class='del'>-	    (!(hw-&gt;mac.link_attach_type &amp; IXGBE_AUTOC_10G_KX4)))</div><div class='add'>+	    (!(hw-&gt;mac.link_attach_type &amp; IXGBE_AUTOC_10G_KX4))) {</div><div class='ctx'> 		hw-&gt;mac.link_mode_select = IXGBE_AUTOC_LMS_10G_LINK_NO_AN;</div><div class='del'>-	else if ((speed == IXGBE_LINK_SPEED_1GB_FULL) &amp;&amp; (!autoneg))</div><div class='add'>+	} else if ((speed == IXGBE_LINK_SPEED_1GB_FULL) &amp;&amp; (!autoneg)) {</div><div class='ctx'> 		hw-&gt;mac.link_mode_select = IXGBE_AUTOC_LMS_1G_LINK_NO_AN;</div><div class='del'>-	else if (autoneg) {</div><div class='add'>+	} else if (autoneg) {</div><div class='ctx'> 		/* BX mode - Autonegotiate 1G */</div><div class='ctx'> 		if (!(hw-&gt;mac.link_attach_type &amp; IXGBE_AUTOC_1G_PMA_PMD))</div><div class='ctx'> 			hw-&gt;mac.link_mode_select = IXGBE_AUTOC_LMS_1G_AN;</div><div class='hunk'>@@ -336,7 +460,7 @@ static s32 ixgbe_setup_mac_link_speed_82598(struct ixgbe_hw *hw,</div><div class='ctx'> 		 * ixgbe_hw This will write the AUTOC register based on the new</div><div class='ctx'> 		 * stored values</div><div class='ctx'> 		 */</div><div class='del'>-		hw-&gt;mac.ops.setup_link(hw);</div><div class='add'>+		ixgbe_setup_mac_link_82598(hw);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return status;</div><div class='hunk'>@@ -354,18 +478,17 @@ static s32 ixgbe_setup_mac_link_speed_82598(struct ixgbe_hw *hw,</div><div class='ctx'>  **/</div><div class='ctx'> static s32 ixgbe_setup_copper_link_82598(struct ixgbe_hw *hw)</div><div class='ctx'> {</div><div class='del'>-	s32 status = 0;</div><div class='add'>+	s32 status;</div><div class='ctx'> </div><div class='ctx'> 	/* Restart autonegotiation on PHY */</div><div class='del'>-	if (hw-&gt;phy.ops.setup_link)</div><div class='del'>-		status = hw-&gt;phy.ops.setup_link(hw);</div><div class='add'>+	status = hw-&gt;phy.ops.setup_link(hw);</div><div class='ctx'> </div><div class='del'>-	/* Set MAC to KX/KX4 autoneg, which defaultis to Parallel detection */</div><div class='add'>+	/* Set MAC to KX/KX4 autoneg, which defaults to Parallel detection */</div><div class='ctx'> 	hw-&gt;mac.link_attach_type = (IXGBE_AUTOC_10G_KX4 | IXGBE_AUTOC_1G_KX);</div><div class='ctx'> 	hw-&gt;mac.link_mode_select = IXGBE_AUTOC_LMS_KX4_AN;</div><div class='ctx'> </div><div class='ctx'> 	/* Set up MAC */</div><div class='del'>-	hw-&gt;mac.ops.setup_link(hw);</div><div class='add'>+	ixgbe_setup_mac_link_82598(hw);</div><div class='ctx'> </div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='hunk'>@@ -379,23 +502,23 @@ static s32 ixgbe_setup_copper_link_82598(struct ixgbe_hw *hw)</div><div class='ctx'>  *</div><div class='ctx'>  *  Sets the link speed in the AUTOC register in the MAC and restarts link.</div><div class='ctx'>  **/</div><div class='del'>-static s32 ixgbe_setup_copper_link_speed_82598(struct ixgbe_hw *hw, u32 speed,</div><div class='del'>-					       bool autoneg,</div><div class='del'>-					       bool autoneg_wait_to_complete)</div><div class='add'>+static s32 ixgbe_setup_copper_link_speed_82598(struct ixgbe_hw *hw,</div><div class='add'>+                                               ixgbe_link_speed speed,</div><div class='add'>+                                               bool autoneg,</div><div class='add'>+                                               bool autoneg_wait_to_complete)</div><div class='ctx'> {</div><div class='del'>-	s32 status = 0;</div><div class='add'>+	s32 status;</div><div class='ctx'> </div><div class='ctx'> 	/* Setup the PHY according to input speed */</div><div class='del'>-	if (hw-&gt;phy.ops.setup_link_speed)</div><div class='del'>-		status = hw-&gt;phy.ops.setup_link_speed(hw, speed, autoneg,</div><div class='del'>-						autoneg_wait_to_complete);</div><div class='add'>+	status = hw-&gt;phy.ops.setup_link_speed(hw, speed, autoneg,</div><div class='add'>+	                                      autoneg_wait_to_complete);</div><div class='ctx'> </div><div class='ctx'> 	/* Set MAC to KX/KX4 autoneg, which defaults to Parallel detection */</div><div class='ctx'> 	hw-&gt;mac.link_attach_type = (IXGBE_AUTOC_10G_KX4 | IXGBE_AUTOC_1G_KX);</div><div class='ctx'> 	hw-&gt;mac.link_mode_select = IXGBE_AUTOC_LMS_KX4_AN;</div><div class='ctx'> </div><div class='ctx'> 	/* Set up MAC */</div><div class='del'>-	hw-&gt;mac.ops.setup_link(hw);</div><div class='add'>+	ixgbe_setup_mac_link_82598(hw);</div><div class='ctx'> </div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='hunk'>@@ -404,7 +527,7 @@ static s32 ixgbe_setup_copper_link_speed_82598(struct ixgbe_hw *hw, u32 speed,</div><div class='ctx'>  *  ixgbe_reset_hw_82598 - Performs hardware reset</div><div class='ctx'>  *  @hw: pointer to hardware structure</div><div class='ctx'>  *</div><div class='del'>- *  Resets the hardware by reseting the transmit and receive units, masks and</div><div class='add'>+ *  Resets the hardware by resetting the transmit and receive units, masks and</div><div class='ctx'>  *  clears all interrupts, performing a PHY reset, and performing a link (MAC)</div><div class='ctx'>  *  reset.</div><div class='ctx'>  **/</div><div class='hunk'>@@ -418,35 +541,44 @@ static s32 ixgbe_reset_hw_82598(struct ixgbe_hw *hw)</div><div class='ctx'> 	u8  analog_val;</div><div class='ctx'> </div><div class='ctx'> 	/* Call adapter stop to disable tx/rx and clear interrupts */</div><div class='del'>-	ixgbe_stop_adapter(hw);</div><div class='add'>+	hw-&gt;mac.ops.stop_adapter(hw);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Power up the Atlas TX lanes if they are currently powered down.</div><div class='del'>-	 * Atlas TX lanes are powered down for MAC loopback tests, but</div><div class='add'>+	 * Power up the Atlas Tx lanes if they are currently powered down.</div><div class='add'>+	 * Atlas Tx lanes are powered down for MAC loopback tests, but</div><div class='ctx'> 	 * they are not automatically restored on reset.</div><div class='ctx'> 	 */</div><div class='del'>-	ixgbe_read_analog_reg8(hw, IXGBE_ATLAS_PDN_LPBK, &amp;analog_val);</div><div class='add'>+	hw-&gt;mac.ops.read_analog_reg8(hw, IXGBE_ATLAS_PDN_LPBK, &amp;analog_val);</div><div class='ctx'> 	if (analog_val &amp; IXGBE_ATLAS_PDN_TX_REG_EN) {</div><div class='del'>-		/* Enable TX Atlas so packets can be transmitted again */</div><div class='del'>-		ixgbe_read_analog_reg8(hw, IXGBE_ATLAS_PDN_LPBK, &amp;analog_val);</div><div class='add'>+		/* Enable Tx Atlas so packets can be transmitted again */</div><div class='add'>+		hw-&gt;mac.ops.read_analog_reg8(hw, IXGBE_ATLAS_PDN_LPBK,</div><div class='add'>+		                             &amp;analog_val);</div><div class='ctx'> 		analog_val &amp;= ~IXGBE_ATLAS_PDN_TX_REG_EN;</div><div class='del'>-		ixgbe_write_analog_reg8(hw, IXGBE_ATLAS_PDN_LPBK, analog_val);</div><div class='add'>+		hw-&gt;mac.ops.write_analog_reg8(hw, IXGBE_ATLAS_PDN_LPBK,</div><div class='add'>+		                              analog_val);</div><div class='ctx'> </div><div class='del'>-		ixgbe_read_analog_reg8(hw, IXGBE_ATLAS_PDN_10G, &amp;analog_val);</div><div class='add'>+		hw-&gt;mac.ops.read_analog_reg8(hw, IXGBE_ATLAS_PDN_10G,</div><div class='add'>+		                             &amp;analog_val);</div><div class='ctx'> 		analog_val &amp;= ~IXGBE_ATLAS_PDN_TX_10G_QL_ALL;</div><div class='del'>-		ixgbe_write_analog_reg8(hw, IXGBE_ATLAS_PDN_10G, analog_val);</div><div class='add'>+		hw-&gt;mac.ops.write_analog_reg8(hw, IXGBE_ATLAS_PDN_10G,</div><div class='add'>+		                              analog_val);</div><div class='ctx'> </div><div class='del'>-		ixgbe_read_analog_reg8(hw, IXGBE_ATLAS_PDN_1G, &amp;analog_val);</div><div class='add'>+		hw-&gt;mac.ops.read_analog_reg8(hw, IXGBE_ATLAS_PDN_1G,</div><div class='add'>+		                             &amp;analog_val);</div><div class='ctx'> 		analog_val &amp;= ~IXGBE_ATLAS_PDN_TX_1G_QL_ALL;</div><div class='del'>-		ixgbe_write_analog_reg8(hw, IXGBE_ATLAS_PDN_1G, analog_val);</div><div class='add'>+		hw-&gt;mac.ops.write_analog_reg8(hw, IXGBE_ATLAS_PDN_1G,</div><div class='add'>+		                              analog_val);</div><div class='ctx'> </div><div class='del'>-		ixgbe_read_analog_reg8(hw, IXGBE_ATLAS_PDN_AN, &amp;analog_val);</div><div class='add'>+		hw-&gt;mac.ops.read_analog_reg8(hw, IXGBE_ATLAS_PDN_AN,</div><div class='add'>+		                             &amp;analog_val);</div><div class='ctx'> 		analog_val &amp;= ~IXGBE_ATLAS_PDN_TX_AN_QL_ALL;</div><div class='del'>-		ixgbe_write_analog_reg8(hw, IXGBE_ATLAS_PDN_AN, analog_val);</div><div class='add'>+		hw-&gt;mac.ops.write_analog_reg8(hw, IXGBE_ATLAS_PDN_AN,</div><div class='add'>+		                              analog_val);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Reset PHY */</div><div class='del'>-	ixgbe_reset_phy(hw);</div><div class='add'>+	if (hw-&gt;phy.reset_disable == false)</div><div class='add'>+		hw-&gt;phy.ops.reset(hw);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Prevent the PCI-E bus from from hanging by disabling PCI-E master</div><div class='hunk'>@@ -499,29 +631,311 @@ static s32 ixgbe_reset_hw_82598(struct ixgbe_hw *hw)</div><div class='ctx'> 		IXGBE_WRITE_REG(hw, IXGBE_AUTOC, autoc);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		hw-&gt;mac.link_attach_type =</div><div class='del'>-					 (autoc &amp; IXGBE_AUTOC_LMS_ATTACH_TYPE);</div><div class='add'>+		                         (autoc &amp; IXGBE_AUTOC_LMS_ATTACH_TYPE);</div><div class='ctx'> 		hw-&gt;mac.link_mode_select = (autoc &amp; IXGBE_AUTOC_LMS_MASK);</div><div class='ctx'> 		hw-&gt;mac.link_settings_loaded = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Store the permanent mac address */</div><div class='del'>-	ixgbe_get_mac_addr(hw, hw-&gt;mac.perm_addr);</div><div class='add'>+	hw-&gt;mac.ops.get_mac_addr(hw, hw-&gt;mac.perm_addr);</div><div class='ctx'> </div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ *  ixgbe_set_vmdq_82598 - Associate a VMDq set index with a rx address</div><div class='add'>+ *  @hw: pointer to hardware struct</div><div class='add'>+ *  @rar: receive address register index to associate with a VMDq index</div><div class='add'>+ *  @vmdq: VMDq set index</div><div class='add'>+ **/</div><div class='add'>+s32 ixgbe_set_vmdq_82598(struct ixgbe_hw *hw, u32 rar, u32 vmdq)</div><div class='add'>+{</div><div class='add'>+	u32 rar_high;</div><div class='add'>+</div><div class='add'>+	rar_high = IXGBE_READ_REG(hw, IXGBE_RAH(rar));</div><div class='add'>+	rar_high &amp;= ~IXGBE_RAH_VIND_MASK;</div><div class='add'>+	rar_high |= ((vmdq &lt;&lt; IXGBE_RAH_VIND_SHIFT) &amp; IXGBE_RAH_VIND_MASK);</div><div class='add'>+	IXGBE_WRITE_REG(hw, IXGBE_RAH(rar), rar_high);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *  ixgbe_clear_vmdq_82598 - Disassociate a VMDq set index from an rx address</div><div class='add'>+ *  @hw: pointer to hardware struct</div><div class='add'>+ *  @rar: receive address register index to associate with a VMDq index</div><div class='add'>+ *  @vmdq: VMDq clear index (not used in 82598, but elsewhere)</div><div class='add'>+ **/</div><div class='add'>+static s32 ixgbe_clear_vmdq_82598(struct ixgbe_hw *hw, u32 rar, u32 vmdq)</div><div class='add'>+{</div><div class='add'>+	u32 rar_high;</div><div class='add'>+	u32 rar_entries = hw-&gt;mac.num_rar_entries;</div><div class='add'>+</div><div class='add'>+	if (rar &lt; rar_entries) {</div><div class='add'>+		rar_high = IXGBE_READ_REG(hw, IXGBE_RAH(rar));</div><div class='add'>+		if (rar_high &amp; IXGBE_RAH_VIND_MASK) {</div><div class='add'>+			rar_high &amp;= ~IXGBE_RAH_VIND_MASK;</div><div class='add'>+			IXGBE_WRITE_REG(hw, IXGBE_RAH(rar), rar_high);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		hw_dbg(hw, "RAR index %d is out of range.\n", rar);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *  ixgbe_set_vfta_82598 - Set VLAN filter table</div><div class='add'>+ *  @hw: pointer to hardware structure</div><div class='add'>+ *  @vlan: VLAN id to write to VLAN filter</div><div class='add'>+ *  @vind: VMDq output index that maps queue to VLAN id in VFTA</div><div class='add'>+ *  @vlan_on: boolean flag to turn on/off VLAN in VFTA</div><div class='add'>+ *</div><div class='add'>+ *  Turn on/off specified VLAN in the VLAN filter table.</div><div class='add'>+ **/</div><div class='add'>+s32 ixgbe_set_vfta_82598(struct ixgbe_hw *hw, u32 vlan, u32 vind,</div><div class='add'>+                         bool vlan_on)</div><div class='add'>+{</div><div class='add'>+	u32 regindex;</div><div class='add'>+	u32 bitindex;</div><div class='add'>+	u32 bits;</div><div class='add'>+	u32 vftabyte;</div><div class='add'>+</div><div class='add'>+	if (vlan &gt; 4095)</div><div class='add'>+		return IXGBE_ERR_PARAM;</div><div class='add'>+</div><div class='add'>+	/* Determine 32-bit word position in array */</div><div class='add'>+	regindex = (vlan &gt;&gt; 5) &amp; 0x7F;   /* upper seven bits */</div><div class='add'>+</div><div class='add'>+	/* Determine the location of the (VMD) queue index */</div><div class='add'>+	vftabyte =  ((vlan &gt;&gt; 3) &amp; 0x03); /* bits (4:3) indicating byte array */</div><div class='add'>+	bitindex = (vlan &amp; 0x7) &lt;&lt; 2;    /* lower 3 bits indicate nibble */</div><div class='add'>+</div><div class='add'>+	/* Set the nibble for VMD queue index */</div><div class='add'>+	bits = IXGBE_READ_REG(hw, IXGBE_VFTAVIND(vftabyte, regindex));</div><div class='add'>+	bits &amp;= (~(0x0F &lt;&lt; bitindex));</div><div class='add'>+	bits |= (vind &lt;&lt; bitindex);</div><div class='add'>+	IXGBE_WRITE_REG(hw, IXGBE_VFTAVIND(vftabyte, regindex), bits);</div><div class='add'>+</div><div class='add'>+	/* Determine the location of the bit for this VLAN id */</div><div class='add'>+	bitindex = vlan &amp; 0x1F;   /* lower five bits */</div><div class='add'>+</div><div class='add'>+	bits = IXGBE_READ_REG(hw, IXGBE_VFTA(regindex));</div><div class='add'>+	if (vlan_on)</div><div class='add'>+		/* Turn on this VLAN id */</div><div class='add'>+		bits |= (1 &lt;&lt; bitindex);</div><div class='add'>+	else</div><div class='add'>+		/* Turn off this VLAN id */</div><div class='add'>+		bits &amp;= ~(1 &lt;&lt; bitindex);</div><div class='add'>+	IXGBE_WRITE_REG(hw, IXGBE_VFTA(regindex), bits);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *  ixgbe_clear_vfta_82598 - Clear VLAN filter table</div><div class='add'>+ *  @hw: pointer to hardware structure</div><div class='add'>+ *</div><div class='add'>+ *  Clears the VLAN filer table, and the VMDq index associated with the filter</div><div class='add'>+ **/</div><div class='add'>+static s32 ixgbe_clear_vfta_82598(struct ixgbe_hw *hw)</div><div class='add'>+{</div><div class='add'>+	u32 offset;</div><div class='add'>+	u32 vlanbyte;</div><div class='add'>+</div><div class='add'>+	for (offset = 0; offset &lt; hw-&gt;mac.vft_size; offset++)</div><div class='add'>+		IXGBE_WRITE_REG(hw, IXGBE_VFTA(offset), 0);</div><div class='add'>+</div><div class='add'>+	for (vlanbyte = 0; vlanbyte &lt; 4; vlanbyte++)</div><div class='add'>+		for (offset = 0; offset &lt; hw-&gt;mac.vft_size; offset++)</div><div class='add'>+			IXGBE_WRITE_REG(hw, IXGBE_VFTAVIND(vlanbyte, offset),</div><div class='add'>+			                0);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *  ixgbe_blink_led_start_82598 - Blink LED based on index.</div><div class='add'>+ *  @hw: pointer to hardware structure</div><div class='add'>+ *  @index: led number to blink</div><div class='add'>+ **/</div><div class='add'>+static s32 ixgbe_blink_led_start_82598(struct ixgbe_hw *hw, u32 index)</div><div class='add'>+{</div><div class='add'>+	ixgbe_link_speed speed = 0;</div><div class='add'>+	bool link_up = 0;</div><div class='add'>+	u32 autoc_reg = IXGBE_READ_REG(hw, IXGBE_AUTOC);</div><div class='add'>+	u32 led_reg = IXGBE_READ_REG(hw, IXGBE_LEDCTL);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Link must be up to auto-blink the LEDs on the 82598EB MAC;</div><div class='add'>+	 * force it if link is down.</div><div class='add'>+	 */</div><div class='add'>+	hw-&gt;mac.ops.check_link(hw, &amp;speed, &amp;link_up, false);</div><div class='add'>+</div><div class='add'>+	if (!link_up) {</div><div class='add'>+		autoc_reg |= IXGBE_AUTOC_FLU;</div><div class='add'>+		IXGBE_WRITE_REG(hw, IXGBE_AUTOC, autoc_reg);</div><div class='add'>+		msleep(10);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	led_reg &amp;= ~IXGBE_LED_MODE_MASK(index);</div><div class='add'>+	led_reg |= IXGBE_LED_BLINK(index);</div><div class='add'>+	IXGBE_WRITE_REG(hw, IXGBE_LEDCTL, led_reg);</div><div class='add'>+	IXGBE_WRITE_FLUSH(hw);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *  ixgbe_blink_led_stop_82598 - Stop blinking LED based on index.</div><div class='add'>+ *  @hw: pointer to hardware structure</div><div class='add'>+ *  @index: led number to stop blinking</div><div class='add'>+ **/</div><div class='add'>+static s32 ixgbe_blink_led_stop_82598(struct ixgbe_hw *hw, u32 index)</div><div class='add'>+{</div><div class='add'>+	u32 autoc_reg = IXGBE_READ_REG(hw, IXGBE_AUTOC);</div><div class='add'>+	u32 led_reg = IXGBE_READ_REG(hw, IXGBE_LEDCTL);</div><div class='add'>+</div><div class='add'>+	autoc_reg &amp;= ~IXGBE_AUTOC_FLU;</div><div class='add'>+	autoc_reg |= IXGBE_AUTOC_AN_RESTART;</div><div class='add'>+	IXGBE_WRITE_REG(hw, IXGBE_AUTOC, autoc_reg);</div><div class='add'>+</div><div class='add'>+	led_reg &amp;= ~IXGBE_LED_MODE_MASK(index);</div><div class='add'>+	led_reg &amp;= ~IXGBE_LED_BLINK(index);</div><div class='add'>+	led_reg |= IXGBE_LED_LINK_ACTIVE &lt;&lt; IXGBE_LED_MODE_SHIFT(index);</div><div class='add'>+	IXGBE_WRITE_REG(hw, IXGBE_LEDCTL, led_reg);</div><div class='add'>+	IXGBE_WRITE_FLUSH(hw);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *  ixgbe_read_analog_reg8_82598 - Reads 8 bit Atlas analog register</div><div class='add'>+ *  @hw: pointer to hardware structure</div><div class='add'>+ *  @reg: analog register to read</div><div class='add'>+ *  @val: read value</div><div class='add'>+ *</div><div class='add'>+ *  Performs read operation to Atlas analog register specified.</div><div class='add'>+ **/</div><div class='add'>+s32 ixgbe_read_analog_reg8_82598(struct ixgbe_hw *hw, u32 reg, u8 *val)</div><div class='add'>+{</div><div class='add'>+	u32  atlas_ctl;</div><div class='add'>+</div><div class='add'>+	IXGBE_WRITE_REG(hw, IXGBE_ATLASCTL,</div><div class='add'>+	                IXGBE_ATLASCTL_WRITE_CMD | (reg &lt;&lt; 8));</div><div class='add'>+	IXGBE_WRITE_FLUSH(hw);</div><div class='add'>+	udelay(10);</div><div class='add'>+	atlas_ctl = IXGBE_READ_REG(hw, IXGBE_ATLASCTL);</div><div class='add'>+	*val = (u8)atlas_ctl;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *  ixgbe_write_analog_reg8_82598 - Writes 8 bit Atlas analog register</div><div class='add'>+ *  @hw: pointer to hardware structure</div><div class='add'>+ *  @reg: atlas register to write</div><div class='add'>+ *  @val: value to write</div><div class='add'>+ *</div><div class='add'>+ *  Performs write operation to Atlas analog register specified.</div><div class='add'>+ **/</div><div class='add'>+s32 ixgbe_write_analog_reg8_82598(struct ixgbe_hw *hw, u32 reg, u8 val)</div><div class='add'>+{</div><div class='add'>+	u32  atlas_ctl;</div><div class='add'>+</div><div class='add'>+	atlas_ctl = (reg &lt;&lt; 8) | val;</div><div class='add'>+	IXGBE_WRITE_REG(hw, IXGBE_ATLASCTL, atlas_ctl);</div><div class='add'>+	IXGBE_WRITE_FLUSH(hw);</div><div class='add'>+	udelay(10);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *  ixgbe_get_supported_physical_layer_82598 - Returns physical layer type</div><div class='add'>+ *  @hw: pointer to hardware structure</div><div class='add'>+ *</div><div class='add'>+ *  Determines physical layer capabilities of the current configuration.</div><div class='add'>+ **/</div><div class='add'>+s32 ixgbe_get_supported_physical_layer_82598(struct ixgbe_hw *hw)</div><div class='add'>+{</div><div class='add'>+	s32 physical_layer = IXGBE_PHYSICAL_LAYER_UNKNOWN;</div><div class='add'>+</div><div class='add'>+	switch (hw-&gt;device_id) {</div><div class='add'>+	case IXGBE_DEV_ID_82598EB_CX4:</div><div class='add'>+	case IXGBE_DEV_ID_82598_CX4_DUAL_PORT:</div><div class='add'>+		physical_layer = IXGBE_PHYSICAL_LAYER_10GBASE_CX4;</div><div class='add'>+		break;</div><div class='add'>+	case IXGBE_DEV_ID_82598AF_DUAL_PORT:</div><div class='add'>+	case IXGBE_DEV_ID_82598AF_SINGLE_PORT:</div><div class='add'>+		physical_layer = IXGBE_PHYSICAL_LAYER_10GBASE_SR;</div><div class='add'>+		break;</div><div class='add'>+	case IXGBE_DEV_ID_82598EB_XF_LR:</div><div class='add'>+		physical_layer = IXGBE_PHYSICAL_LAYER_10GBASE_LR;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		physical_layer = IXGBE_PHYSICAL_LAYER_UNKNOWN;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return physical_layer;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct ixgbe_mac_operations mac_ops_82598 = {</div><div class='del'>-	.reset			= &amp;ixgbe_reset_hw_82598,</div><div class='add'>+	.init_hw		= &amp;ixgbe_init_hw_generic,</div><div class='add'>+	.reset_hw		= &amp;ixgbe_reset_hw_82598,</div><div class='add'>+	.start_hw		= &amp;ixgbe_start_hw_generic,</div><div class='add'>+	.clear_hw_cntrs		= &amp;ixgbe_clear_hw_cntrs_generic,</div><div class='ctx'> 	.get_media_type		= &amp;ixgbe_get_media_type_82598,</div><div class='add'>+	.get_supported_physical_layer = &amp;ixgbe_get_supported_physical_layer_82598,</div><div class='add'>+	.get_mac_addr		= &amp;ixgbe_get_mac_addr_generic,</div><div class='add'>+	.stop_adapter		= &amp;ixgbe_stop_adapter_generic,</div><div class='add'>+	.read_analog_reg8	= &amp;ixgbe_read_analog_reg8_82598,</div><div class='add'>+	.write_analog_reg8	= &amp;ixgbe_write_analog_reg8_82598,</div><div class='ctx'> 	.setup_link		= &amp;ixgbe_setup_mac_link_82598,</div><div class='del'>-	.check_link		= &amp;ixgbe_check_mac_link_82598,</div><div class='ctx'> 	.setup_link_speed	= &amp;ixgbe_setup_mac_link_speed_82598,</div><div class='del'>-	.get_link_settings	= &amp;ixgbe_get_link_settings_82598,</div><div class='add'>+	.check_link		= &amp;ixgbe_check_mac_link_82598,</div><div class='add'>+	.get_link_capabilities	= &amp;ixgbe_get_link_capabilities_82598,</div><div class='add'>+	.led_on			= &amp;ixgbe_led_on_generic,</div><div class='add'>+	.led_off		= &amp;ixgbe_led_off_generic,</div><div class='add'>+	.blink_led_start	= &amp;ixgbe_blink_led_start_82598,</div><div class='add'>+	.blink_led_stop		= &amp;ixgbe_blink_led_stop_82598,</div><div class='add'>+	.set_rar		= &amp;ixgbe_set_rar_generic,</div><div class='add'>+	.clear_rar		= &amp;ixgbe_clear_rar_generic,</div><div class='add'>+	.set_vmdq		= &amp;ixgbe_set_vmdq_82598,</div><div class='add'>+	.clear_vmdq		= &amp;ixgbe_clear_vmdq_82598,</div><div class='add'>+	.init_rx_addrs		= &amp;ixgbe_init_rx_addrs_generic,</div><div class='add'>+	.update_uc_addr_list	= &amp;ixgbe_update_uc_addr_list_generic,</div><div class='add'>+	.update_mc_addr_list	= &amp;ixgbe_update_mc_addr_list_generic,</div><div class='add'>+	.enable_mc		= &amp;ixgbe_enable_mc_generic,</div><div class='add'>+	.disable_mc		= &amp;ixgbe_disable_mc_generic,</div><div class='add'>+	.clear_vfta		= &amp;ixgbe_clear_vfta_82598,</div><div class='add'>+	.set_vfta		= &amp;ixgbe_set_vfta_82598,</div><div class='add'>+	.setup_fc		= &amp;ixgbe_setup_fc_82598,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct ixgbe_eeprom_operations eeprom_ops_82598 = {</div><div class='add'>+	.init_params		= &amp;ixgbe_init_eeprom_params_generic,</div><div class='add'>+	.read			= &amp;ixgbe_read_eeprom_generic,</div><div class='add'>+	.validate_checksum	= &amp;ixgbe_validate_eeprom_checksum_generic,</div><div class='add'>+	.update_checksum	= &amp;ixgbe_update_eeprom_checksum_generic,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct ixgbe_phy_operations phy_ops_82598 = {</div><div class='add'>+	.identify		= &amp;ixgbe_identify_phy_generic,</div><div class='add'>+	/* .identify_sfp	= &amp;ixgbe_identify_sfp_module_generic, */</div><div class='add'>+	.reset			= &amp;ixgbe_reset_phy_generic,</div><div class='add'>+	.read_reg		= &amp;ixgbe_read_phy_reg_generic,</div><div class='add'>+	.write_reg		= &amp;ixgbe_write_phy_reg_generic,</div><div class='add'>+	.setup_link		= &amp;ixgbe_setup_phy_link_generic,</div><div class='add'>+	.setup_link_speed	= &amp;ixgbe_setup_phy_link_speed_generic,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ixgbe_info ixgbe_82598_info = {</div><div class='ctx'> 	.mac			= ixgbe_mac_82598EB,</div><div class='ctx'> 	.get_invariants		= &amp;ixgbe_get_invariants_82598,</div><div class='ctx'> 	.mac_ops		= &amp;mac_ops_82598,</div><div class='add'>+	.eeprom_ops		= &amp;eeprom_ops_82598,</div><div class='add'>+	.phy_ops		= &amp;phy_ops_82598,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ixgbe/ixgbe_common.c b/drivers/net/ixgbe/ixgbe_common.c<br/>index 7fd6aeb1b021..f67c68404bb3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/ixgbe/ixgbe_common.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/ixgbe/ixgbe_common.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/ixgbe/ixgbe_common.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/ixgbe/ixgbe_common.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*******************************************************************************</div><div class='ctx'> </div><div class='ctx'>   Intel 10 Gigabit PCI Express Linux driver</div><div class='del'>-  Copyright(c) 1999 - 2007 Intel Corporation.</div><div class='add'>+  Copyright(c) 1999 - 2008 Intel Corporation.</div><div class='ctx'> </div><div class='ctx'>   This program is free software; you can redistribute it and/or modify it</div><div class='ctx'>   under the terms and conditions of the GNU General Public License,</div><div class='hunk'>@@ -20,7 +20,6 @@</div><div class='ctx'>   the file called "COPYING".</div><div class='ctx'> </div><div class='ctx'>   Contact Information:</div><div class='del'>-  Linux NICS &lt;linux.nics@intel.com&gt;</div><div class='ctx'>   e1000-devel Mailing List &lt;e1000-devel@lists.sourceforge.net&gt;</div><div class='ctx'>   Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='ctx'> </div><div class='hunk'>@@ -33,20 +32,28 @@</div><div class='ctx'> #include "ixgbe_common.h"</div><div class='ctx'> #include "ixgbe_phy.h"</div><div class='ctx'> </div><div class='del'>-static s32 ixgbe_clear_hw_cntrs(struct ixgbe_hw *hw);</div><div class='del'>-</div><div class='ctx'> static s32 ixgbe_poll_eeprom_eerd_done(struct ixgbe_hw *hw);</div><div class='add'>+static s32 ixgbe_acquire_eeprom(struct ixgbe_hw *hw);</div><div class='ctx'> static s32 ixgbe_get_eeprom_semaphore(struct ixgbe_hw *hw);</div><div class='ctx'> static void ixgbe_release_eeprom_semaphore(struct ixgbe_hw *hw);</div><div class='add'>+static s32 ixgbe_ready_eeprom(struct ixgbe_hw *hw);</div><div class='add'>+static void ixgbe_standby_eeprom(struct ixgbe_hw *hw);</div><div class='add'>+static void ixgbe_shift_out_eeprom_bits(struct ixgbe_hw *hw, u16 data,</div><div class='add'>+                                        u16 count);</div><div class='add'>+static u16 ixgbe_shift_in_eeprom_bits(struct ixgbe_hw *hw, u16 count);</div><div class='add'>+static void ixgbe_raise_eeprom_clk(struct ixgbe_hw *hw, u32 *eec);</div><div class='add'>+static void ixgbe_lower_eeprom_clk(struct ixgbe_hw *hw, u32 *eec);</div><div class='add'>+static void ixgbe_release_eeprom(struct ixgbe_hw *hw);</div><div class='ctx'> static u16 ixgbe_calc_eeprom_checksum(struct ixgbe_hw *hw);</div><div class='ctx'> </div><div class='del'>-static s32 ixgbe_clear_vfta(struct ixgbe_hw *hw);</div><div class='del'>-static s32 ixgbe_init_rx_addrs(struct ixgbe_hw *hw);</div><div class='add'>+static void ixgbe_enable_rar(struct ixgbe_hw *hw, u32 index);</div><div class='add'>+static void ixgbe_disable_rar(struct ixgbe_hw *hw, u32 index);</div><div class='ctx'> static s32 ixgbe_mta_vector(struct ixgbe_hw *hw, u8 *mc_addr);</div><div class='ctx'> static void ixgbe_add_mc_addr(struct ixgbe_hw *hw, u8 *mc_addr);</div><div class='add'>+static void ixgbe_add_uc_addr(struct ixgbe_hw *hw, u8 *addr, u32 vmdq);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *  ixgbe_start_hw - Prepare hardware for TX/RX</div><div class='add'>+ *  ixgbe_start_hw_generic - Prepare hardware for Tx/Rx</div><div class='ctx'>  *  @hw: pointer to hardware structure</div><div class='ctx'>  *</div><div class='ctx'>  *  Starts the hardware by filling the bus info structure and media type, clears</div><div class='hunk'>@@ -54,7 +61,7 @@ static void ixgbe_add_mc_addr(struct ixgbe_hw *hw, u8 *mc_addr);</div><div class='ctx'>  *  table, VLAN filter table, calls routine to set up link and flow control</div><div class='ctx'>  *  settings, and leaves transmit and receive units disabled and uninitialized</div><div class='ctx'>  **/</div><div class='del'>-s32 ixgbe_start_hw(struct ixgbe_hw *hw)</div><div class='add'>+s32 ixgbe_start_hw_generic(struct ixgbe_hw *hw)</div><div class='ctx'> {</div><div class='ctx'> 	u32 ctrl_ext;</div><div class='ctx'> </div><div class='hunk'>@@ -62,22 +69,22 @@ s32 ixgbe_start_hw(struct ixgbe_hw *hw)</div><div class='ctx'> 	hw-&gt;phy.media_type = hw-&gt;mac.ops.get_media_type(hw);</div><div class='ctx'> </div><div class='ctx'> 	/* Identify the PHY */</div><div class='del'>-	ixgbe_identify_phy(hw);</div><div class='add'>+	hw-&gt;phy.ops.identify(hw);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Store MAC address from RAR0, clear receive address registers, and</div><div class='ctx'> 	 * clear the multicast table</div><div class='ctx'> 	 */</div><div class='del'>-	ixgbe_init_rx_addrs(hw);</div><div class='add'>+	hw-&gt;mac.ops.init_rx_addrs(hw);</div><div class='ctx'> </div><div class='ctx'> 	/* Clear the VLAN filter table */</div><div class='del'>-	ixgbe_clear_vfta(hw);</div><div class='add'>+	hw-&gt;mac.ops.clear_vfta(hw);</div><div class='ctx'> </div><div class='ctx'> 	/* Set up link */</div><div class='ctx'> 	hw-&gt;mac.ops.setup_link(hw);</div><div class='ctx'> </div><div class='ctx'> 	/* Clear statistics registers */</div><div class='del'>-	ixgbe_clear_hw_cntrs(hw);</div><div class='add'>+	hw-&gt;mac.ops.clear_hw_cntrs(hw);</div><div class='ctx'> </div><div class='ctx'> 	/* Set No Snoop Disable */</div><div class='ctx'> 	ctrl_ext = IXGBE_READ_REG(hw, IXGBE_CTRL_EXT);</div><div class='hunk'>@@ -92,34 +99,34 @@ s32 ixgbe_start_hw(struct ixgbe_hw *hw)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *  ixgbe_init_hw - Generic hardware initialization</div><div class='add'>+ *  ixgbe_init_hw_generic - Generic hardware initialization</div><div class='ctx'>  *  @hw: pointer to hardware structure</div><div class='ctx'>  *</div><div class='del'>- *  Initialize the hardware by reseting the hardware, filling the bus info</div><div class='add'>+ *  Initialize the hardware by resetting the hardware, filling the bus info</div><div class='ctx'>  *  structure and media type, clears all on chip counters, initializes receive</div><div class='ctx'>  *  address registers, multicast table, VLAN filter table, calls routine to set</div><div class='ctx'>  *  up link and flow control settings, and leaves transmit and receive units</div><div class='ctx'>  *  disabled and uninitialized</div><div class='ctx'>  **/</div><div class='del'>-s32 ixgbe_init_hw(struct ixgbe_hw *hw)</div><div class='add'>+s32 ixgbe_init_hw_generic(struct ixgbe_hw *hw)</div><div class='ctx'> {</div><div class='ctx'> 	/* Reset the hardware */</div><div class='del'>-	hw-&gt;mac.ops.reset(hw);</div><div class='add'>+	hw-&gt;mac.ops.reset_hw(hw);</div><div class='ctx'> </div><div class='ctx'> 	/* Start the HW */</div><div class='del'>-	ixgbe_start_hw(hw);</div><div class='add'>+	hw-&gt;mac.ops.start_hw(hw);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *  ixgbe_clear_hw_cntrs - Generic clear hardware counters</div><div class='add'>+ *  ixgbe_clear_hw_cntrs_generic - Generic clear hardware counters</div><div class='ctx'>  *  @hw: pointer to hardware structure</div><div class='ctx'>  *</div><div class='ctx'>  *  Clears all hardware statistics counters by reading them from the hardware</div><div class='ctx'>  *  Statistics counters are clear on read.</div><div class='ctx'>  **/</div><div class='del'>-static s32 ixgbe_clear_hw_cntrs(struct ixgbe_hw *hw)</div><div class='add'>+s32 ixgbe_clear_hw_cntrs_generic(struct ixgbe_hw *hw)</div><div class='ctx'> {</div><div class='ctx'> 	u16 i = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -191,7 +198,36 @@ static s32 ixgbe_clear_hw_cntrs(struct ixgbe_hw *hw)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *  ixgbe_get_mac_addr - Generic get MAC address</div><div class='add'>+ *  ixgbe_read_pba_num_generic - Reads part number from EEPROM</div><div class='add'>+ *  @hw: pointer to hardware structure</div><div class='add'>+ *  @pba_num: stores the part number from the EEPROM</div><div class='add'>+ *</div><div class='add'>+ *  Reads the part number from the EEPROM.</div><div class='add'>+ **/</div><div class='add'>+s32 ixgbe_read_pba_num_generic(struct ixgbe_hw *hw, u32 *pba_num)</div><div class='add'>+{</div><div class='add'>+	s32 ret_val;</div><div class='add'>+	u16 data;</div><div class='add'>+</div><div class='add'>+	ret_val = hw-&gt;eeprom.ops.read(hw, IXGBE_PBANUM0_PTR, &amp;data);</div><div class='add'>+	if (ret_val) {</div><div class='add'>+		hw_dbg(hw, "NVM Read Error\n");</div><div class='add'>+		return ret_val;</div><div class='add'>+	}</div><div class='add'>+	*pba_num = (u32)(data &lt;&lt; 16);</div><div class='add'>+</div><div class='add'>+	ret_val = hw-&gt;eeprom.ops.read(hw, IXGBE_PBANUM1_PTR, &amp;data);</div><div class='add'>+	if (ret_val) {</div><div class='add'>+		hw_dbg(hw, "NVM Read Error\n");</div><div class='add'>+		return ret_val;</div><div class='add'>+	}</div><div class='add'>+	*pba_num |= data;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *  ixgbe_get_mac_addr_generic - Generic get MAC address</div><div class='ctx'>  *  @hw: pointer to hardware structure</div><div class='ctx'>  *  @mac_addr: Adapter MAC address</div><div class='ctx'>  *</div><div class='hunk'>@@ -199,7 +235,7 @@ static s32 ixgbe_clear_hw_cntrs(struct ixgbe_hw *hw)</div><div class='ctx'>  *  A reset of the adapter must be performed prior to calling this function</div><div class='ctx'>  *  in order for the MAC address to have been loaded from the EEPROM into RAR0</div><div class='ctx'>  **/</div><div class='del'>-s32 ixgbe_get_mac_addr(struct ixgbe_hw *hw, u8 *mac_addr)</div><div class='add'>+s32 ixgbe_get_mac_addr_generic(struct ixgbe_hw *hw, u8 *mac_addr)</div><div class='ctx'> {</div><div class='ctx'> 	u32 rar_high;</div><div class='ctx'> 	u32 rar_low;</div><div class='hunk'>@@ -217,30 +253,8 @@ s32 ixgbe_get_mac_addr(struct ixgbe_hw *hw, u8 *mac_addr)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-s32 ixgbe_read_part_num(struct ixgbe_hw *hw, u32 *part_num)</div><div class='del'>-{</div><div class='del'>-	s32 ret_val;</div><div class='del'>-	u16 data;</div><div class='del'>-</div><div class='del'>-	ret_val = ixgbe_read_eeprom(hw, IXGBE_PBANUM0_PTR, &amp;data);</div><div class='del'>-	if (ret_val) {</div><div class='del'>-		hw_dbg(hw, "NVM Read Error\n");</div><div class='del'>-		return ret_val;</div><div class='del'>-	}</div><div class='del'>-	*part_num = (u32)(data &lt;&lt; 16);</div><div class='del'>-</div><div class='del'>-	ret_val = ixgbe_read_eeprom(hw, IXGBE_PBANUM1_PTR, &amp;data);</div><div class='del'>-	if (ret_val) {</div><div class='del'>-		hw_dbg(hw, "NVM Read Error\n");</div><div class='del'>-		return ret_val;</div><div class='del'>-	}</div><div class='del'>-	*part_num |= data;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /**</div><div class='del'>- *  ixgbe_stop_adapter - Generic stop TX/RX units</div><div class='add'>+ *  ixgbe_stop_adapter_generic - Generic stop Tx/Rx units</div><div class='ctx'>  *  @hw: pointer to hardware structure</div><div class='ctx'>  *</div><div class='ctx'>  *  Sets the adapter_stopped flag within ixgbe_hw struct. Clears interrupts,</div><div class='hunk'>@@ -248,7 +262,7 @@ s32 ixgbe_read_part_num(struct ixgbe_hw *hw, u32 *part_num)</div><div class='ctx'>  *  the shared code and drivers to determine if the adapter is in a stopped</div><div class='ctx'>  *  state and should not touch the hardware.</div><div class='ctx'>  **/</div><div class='del'>-s32 ixgbe_stop_adapter(struct ixgbe_hw *hw)</div><div class='add'>+s32 ixgbe_stop_adapter_generic(struct ixgbe_hw *hw)</div><div class='ctx'> {</div><div class='ctx'> 	u32 number_of_queues;</div><div class='ctx'> 	u32 reg_val;</div><div class='hunk'>@@ -264,6 +278,7 @@ s32 ixgbe_stop_adapter(struct ixgbe_hw *hw)</div><div class='ctx'> 	reg_val = IXGBE_READ_REG(hw, IXGBE_RXCTRL);</div><div class='ctx'> 	reg_val &amp;= ~(IXGBE_RXCTRL_RXEN);</div><div class='ctx'> 	IXGBE_WRITE_REG(hw, IXGBE_RXCTRL, reg_val);</div><div class='add'>+	IXGBE_WRITE_FLUSH(hw);</div><div class='ctx'> 	msleep(2);</div><div class='ctx'> </div><div class='ctx'> 	/* Clear interrupt mask to stop from interrupts being generated */</div><div class='hunk'>@@ -273,7 +288,7 @@ s32 ixgbe_stop_adapter(struct ixgbe_hw *hw)</div><div class='ctx'> 	IXGBE_READ_REG(hw, IXGBE_EICR);</div><div class='ctx'> </div><div class='ctx'> 	/* Disable the transmit unit.  Each queue must be disabled. */</div><div class='del'>-	number_of_queues = hw-&gt;mac.num_tx_queues;</div><div class='add'>+	number_of_queues = hw-&gt;mac.max_tx_queues;</div><div class='ctx'> 	for (i = 0; i &lt; number_of_queues; i++) {</div><div class='ctx'> 		reg_val = IXGBE_READ_REG(hw, IXGBE_TXDCTL(i));</div><div class='ctx'> 		if (reg_val &amp; IXGBE_TXDCTL_ENABLE) {</div><div class='hunk'>@@ -282,15 +297,22 @@ s32 ixgbe_stop_adapter(struct ixgbe_hw *hw)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Prevent the PCI-E bus from from hanging by disabling PCI-E master</div><div class='add'>+	 * access and verify no pending requests</div><div class='add'>+	 */</div><div class='add'>+	if (ixgbe_disable_pcie_master(hw) != 0)</div><div class='add'>+		hw_dbg(hw, "PCI-E Master disable polling has failed.\n");</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *  ixgbe_led_on - Turns on the software controllable LEDs.</div><div class='add'>+ *  ixgbe_led_on_generic - Turns on the software controllable LEDs.</div><div class='ctx'>  *  @hw: pointer to hardware structure</div><div class='ctx'>  *  @index: led number to turn on</div><div class='ctx'>  **/</div><div class='del'>-s32 ixgbe_led_on(struct ixgbe_hw *hw, u32 index)</div><div class='add'>+s32 ixgbe_led_on_generic(struct ixgbe_hw *hw, u32 index)</div><div class='ctx'> {</div><div class='ctx'> 	u32 led_reg = IXGBE_READ_REG(hw, IXGBE_LEDCTL);</div><div class='ctx'> </div><div class='hunk'>@@ -304,11 +326,11 @@ s32 ixgbe_led_on(struct ixgbe_hw *hw, u32 index)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *  ixgbe_led_off - Turns off the software controllable LEDs.</div><div class='add'>+ *  ixgbe_led_off_generic - Turns off the software controllable LEDs.</div><div class='ctx'>  *  @hw: pointer to hardware structure</div><div class='ctx'>  *  @index: led number to turn off</div><div class='ctx'>  **/</div><div class='del'>-s32 ixgbe_led_off(struct ixgbe_hw *hw, u32 index)</div><div class='add'>+s32 ixgbe_led_off_generic(struct ixgbe_hw *hw, u32 index)</div><div class='ctx'> {</div><div class='ctx'> 	u32 led_reg = IXGBE_READ_REG(hw, IXGBE_LEDCTL);</div><div class='ctx'> </div><div class='hunk'>@@ -321,15 +343,14 @@ s32 ixgbe_led_off(struct ixgbe_hw *hw, u32 index)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /**</div><div class='del'>- *  ixgbe_init_eeprom - Initialize EEPROM params</div><div class='add'>+ *  ixgbe_init_eeprom_params_generic - Initialize EEPROM params</div><div class='ctx'>  *  @hw: pointer to hardware structure</div><div class='ctx'>  *</div><div class='ctx'>  *  Initializes the EEPROM parameters ixgbe_eeprom_info within the</div><div class='ctx'>  *  ixgbe_hw struct in order to set up EEPROM access.</div><div class='ctx'>  **/</div><div class='del'>-s32 ixgbe_init_eeprom(struct ixgbe_hw *hw)</div><div class='add'>+s32 ixgbe_init_eeprom_params_generic(struct ixgbe_hw *hw)</div><div class='ctx'> {</div><div class='ctx'> 	struct ixgbe_eeprom_info *eeprom = &amp;hw-&gt;eeprom;</div><div class='ctx'> 	u32 eec;</div><div class='hunk'>@@ -337,6 +358,9 @@ s32 ixgbe_init_eeprom(struct ixgbe_hw *hw)</div><div class='ctx'> </div><div class='ctx'> 	if (eeprom-&gt;type == ixgbe_eeprom_uninitialized) {</div><div class='ctx'> 		eeprom-&gt;type = ixgbe_eeprom_none;</div><div class='add'>+		/* Set default semaphore delay to 10ms which is a well</div><div class='add'>+		 * tested value */</div><div class='add'>+		eeprom-&gt;semaphore_delay = 10;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Check for EEPROM present first.</div><div class='hunk'>@@ -369,18 +393,85 @@ s32 ixgbe_init_eeprom(struct ixgbe_hw *hw)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *  ixgbe_read_eeprom - Read EEPROM word using EERD</div><div class='add'>+ *  ixgbe_read_eeprom_bit_bang_generic - Read EEPROM word using bit-bang</div><div class='add'>+ *  @hw: pointer to hardware structure</div><div class='add'>+ *  @offset: offset within the EEPROM to be read</div><div class='add'>+ *  @data: read 16 bit value from EEPROM</div><div class='add'>+ *</div><div class='add'>+ *  Reads 16 bit value from EEPROM through bit-bang method</div><div class='add'>+ **/</div><div class='add'>+s32 ixgbe_read_eeprom_bit_bang_generic(struct ixgbe_hw *hw, u16 offset,</div><div class='add'>+                                       u16 *data)</div><div class='add'>+{</div><div class='add'>+	s32 status;</div><div class='add'>+	u16 word_in;</div><div class='add'>+	u8 read_opcode = IXGBE_EEPROM_READ_OPCODE_SPI;</div><div class='add'>+</div><div class='add'>+	hw-&gt;eeprom.ops.init_params(hw);</div><div class='add'>+</div><div class='add'>+	if (offset &gt;= hw-&gt;eeprom.word_size) {</div><div class='add'>+		status = IXGBE_ERR_EEPROM;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Prepare the EEPROM for reading  */</div><div class='add'>+	status = ixgbe_acquire_eeprom(hw);</div><div class='add'>+</div><div class='add'>+	if (status == 0) {</div><div class='add'>+		if (ixgbe_ready_eeprom(hw) != 0) {</div><div class='add'>+			ixgbe_release_eeprom(hw);</div><div class='add'>+			status = IXGBE_ERR_EEPROM;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (status == 0) {</div><div class='add'>+		ixgbe_standby_eeprom(hw);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Some SPI eeproms use the 8th address bit embedded in the</div><div class='add'>+		 * opcode</div><div class='add'>+		 */</div><div class='add'>+		if ((hw-&gt;eeprom.address_bits == 8) &amp;&amp; (offset &gt;= 128))</div><div class='add'>+			read_opcode |= IXGBE_EEPROM_A8_OPCODE_SPI;</div><div class='add'>+</div><div class='add'>+		/* Send the READ command (opcode + addr) */</div><div class='add'>+		ixgbe_shift_out_eeprom_bits(hw, read_opcode,</div><div class='add'>+		                            IXGBE_EEPROM_OPCODE_BITS);</div><div class='add'>+		ixgbe_shift_out_eeprom_bits(hw, (u16)(offset*2),</div><div class='add'>+		                            hw-&gt;eeprom.address_bits);</div><div class='add'>+</div><div class='add'>+		/* Read the data. */</div><div class='add'>+		word_in = ixgbe_shift_in_eeprom_bits(hw, 16);</div><div class='add'>+		*data = (word_in &gt;&gt; 8) | (word_in &lt;&lt; 8);</div><div class='add'>+</div><div class='add'>+		/* End this read operation */</div><div class='add'>+		ixgbe_release_eeprom(hw);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *  ixgbe_read_eeprom_generic - Read EEPROM word using EERD</div><div class='ctx'>  *  @hw: pointer to hardware structure</div><div class='ctx'>  *  @offset: offset of  word in the EEPROM to read</div><div class='ctx'>  *  @data: word read from the EEPROM</div><div class='ctx'>  *</div><div class='ctx'>  *  Reads a 16 bit word from the EEPROM using the EERD register.</div><div class='ctx'>  **/</div><div class='del'>-s32 ixgbe_read_eeprom(struct ixgbe_hw *hw, u16 offset, u16 *data)</div><div class='add'>+s32 ixgbe_read_eeprom_generic(struct ixgbe_hw *hw, u16 offset, u16 *data)</div><div class='ctx'> {</div><div class='ctx'> 	u32 eerd;</div><div class='ctx'> 	s32 status;</div><div class='ctx'> </div><div class='add'>+	hw-&gt;eeprom.ops.init_params(hw);</div><div class='add'>+</div><div class='add'>+	if (offset &gt;= hw-&gt;eeprom.word_size) {</div><div class='add'>+		status = IXGBE_ERR_EEPROM;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	eerd = (offset &lt;&lt; IXGBE_EEPROM_READ_ADDR_SHIFT) +</div><div class='ctx'> 	       IXGBE_EEPROM_READ_REG_START;</div><div class='ctx'> </div><div class='hunk'>@@ -389,10 +480,11 @@ s32 ixgbe_read_eeprom(struct ixgbe_hw *hw, u16 offset, u16 *data)</div><div class='ctx'> </div><div class='ctx'> 	if (status == 0)</div><div class='ctx'> 		*data = (IXGBE_READ_REG(hw, IXGBE_EERD) &gt;&gt;</div><div class='del'>-			IXGBE_EEPROM_READ_REG_DATA);</div><div class='add'>+		         IXGBE_EEPROM_READ_REG_DATA);</div><div class='ctx'> 	else</div><div class='ctx'> 		hw_dbg(hw, "Eeprom read timed out\n");</div><div class='ctx'> </div><div class='add'>+out:</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -420,6 +512,58 @@ static s32 ixgbe_poll_eeprom_eerd_done(struct ixgbe_hw *hw)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ *  ixgbe_acquire_eeprom - Acquire EEPROM using bit-bang</div><div class='add'>+ *  @hw: pointer to hardware structure</div><div class='add'>+ *</div><div class='add'>+ *  Prepares EEPROM for access using bit-bang method. This function should</div><div class='add'>+ *  be called before issuing a command to the EEPROM.</div><div class='add'>+ **/</div><div class='add'>+static s32 ixgbe_acquire_eeprom(struct ixgbe_hw *hw)</div><div class='add'>+{</div><div class='add'>+	s32 status = 0;</div><div class='add'>+	u32 eec;</div><div class='add'>+	u32 i;</div><div class='add'>+</div><div class='add'>+	if (ixgbe_acquire_swfw_sync(hw, IXGBE_GSSR_EEP_SM) != 0)</div><div class='add'>+		status = IXGBE_ERR_SWFW_SYNC;</div><div class='add'>+</div><div class='add'>+	if (status == 0) {</div><div class='add'>+		eec = IXGBE_READ_REG(hw, IXGBE_EEC);</div><div class='add'>+</div><div class='add'>+		/* Request EEPROM Access */</div><div class='add'>+		eec |= IXGBE_EEC_REQ;</div><div class='add'>+		IXGBE_WRITE_REG(hw, IXGBE_EEC, eec);</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; IXGBE_EEPROM_GRANT_ATTEMPTS; i++) {</div><div class='add'>+			eec = IXGBE_READ_REG(hw, IXGBE_EEC);</div><div class='add'>+			if (eec &amp; IXGBE_EEC_GNT)</div><div class='add'>+				break;</div><div class='add'>+			udelay(5);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Release if grant not acquired */</div><div class='add'>+		if (!(eec &amp; IXGBE_EEC_GNT)) {</div><div class='add'>+			eec &amp;= ~IXGBE_EEC_REQ;</div><div class='add'>+			IXGBE_WRITE_REG(hw, IXGBE_EEC, eec);</div><div class='add'>+			hw_dbg(hw, "Could not acquire EEPROM grant\n");</div><div class='add'>+</div><div class='add'>+			ixgbe_release_swfw_sync(hw, IXGBE_GSSR_EEP_SM);</div><div class='add'>+			status = IXGBE_ERR_EEPROM;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Setup EEPROM for Read/Write */</div><div class='add'>+	if (status == 0) {</div><div class='add'>+		/* Clear CS and SK */</div><div class='add'>+		eec &amp;= ~(IXGBE_EEC_CS | IXGBE_EEC_SK);</div><div class='add'>+		IXGBE_WRITE_REG(hw, IXGBE_EEC, eec);</div><div class='add'>+		IXGBE_WRITE_FLUSH(hw);</div><div class='add'>+		udelay(1);</div><div class='add'>+	}</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  *  ixgbe_get_eeprom_semaphore - Get hardware semaphore</div><div class='ctx'>  *  @hw: pointer to hardware structure</div><div class='ctx'>  *</div><div class='hunk'>@@ -475,7 +619,7 @@ static s32 ixgbe_get_eeprom_semaphore(struct ixgbe_hw *hw)</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (i &gt;= timeout) {</div><div class='ctx'> 			hw_dbg(hw, "Driver can't access the Eeprom - Semaphore "</div><div class='del'>-				 "not granted.\n");</div><div class='add'>+			       "not granted.\n");</div><div class='ctx'> 			ixgbe_release_eeprom_semaphore(hw);</div><div class='ctx'> 			status = IXGBE_ERR_EEPROM;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -503,6 +647,217 @@ static void ixgbe_release_eeprom_semaphore(struct ixgbe_hw *hw)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ *  ixgbe_ready_eeprom - Polls for EEPROM ready</div><div class='add'>+ *  @hw: pointer to hardware structure</div><div class='add'>+ **/</div><div class='add'>+static s32 ixgbe_ready_eeprom(struct ixgbe_hw *hw)</div><div class='add'>+{</div><div class='add'>+	s32 status = 0;</div><div class='add'>+	u16 i;</div><div class='add'>+	u8 spi_stat_reg;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Read "Status Register" repeatedly until the LSB is cleared.  The</div><div class='add'>+	 * EEPROM will signal that the command has been completed by clearing</div><div class='add'>+	 * bit 0 of the internal status register.  If it's not cleared within</div><div class='add'>+	 * 5 milliseconds, then error out.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; IXGBE_EEPROM_MAX_RETRY_SPI; i += 5) {</div><div class='add'>+		ixgbe_shift_out_eeprom_bits(hw, IXGBE_EEPROM_RDSR_OPCODE_SPI,</div><div class='add'>+		                            IXGBE_EEPROM_OPCODE_BITS);</div><div class='add'>+		spi_stat_reg = (u8)ixgbe_shift_in_eeprom_bits(hw, 8);</div><div class='add'>+		if (!(spi_stat_reg &amp; IXGBE_EEPROM_STATUS_RDY_SPI))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		udelay(5);</div><div class='add'>+		ixgbe_standby_eeprom(hw);</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * On some parts, SPI write time could vary from 0-20mSec on 3.3V</div><div class='add'>+	 * devices (and only 0-5mSec on 5V devices)</div><div class='add'>+	 */</div><div class='add'>+	if (i &gt;= IXGBE_EEPROM_MAX_RETRY_SPI) {</div><div class='add'>+		hw_dbg(hw, "SPI EEPROM Status error\n");</div><div class='add'>+		status = IXGBE_ERR_EEPROM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *  ixgbe_standby_eeprom - Returns EEPROM to a "standby" state</div><div class='add'>+ *  @hw: pointer to hardware structure</div><div class='add'>+ **/</div><div class='add'>+static void ixgbe_standby_eeprom(struct ixgbe_hw *hw)</div><div class='add'>+{</div><div class='add'>+	u32 eec;</div><div class='add'>+</div><div class='add'>+	eec = IXGBE_READ_REG(hw, IXGBE_EEC);</div><div class='add'>+</div><div class='add'>+	/* Toggle CS to flush commands */</div><div class='add'>+	eec |= IXGBE_EEC_CS;</div><div class='add'>+	IXGBE_WRITE_REG(hw, IXGBE_EEC, eec);</div><div class='add'>+	IXGBE_WRITE_FLUSH(hw);</div><div class='add'>+	udelay(1);</div><div class='add'>+	eec &amp;= ~IXGBE_EEC_CS;</div><div class='add'>+	IXGBE_WRITE_REG(hw, IXGBE_EEC, eec);</div><div class='add'>+	IXGBE_WRITE_FLUSH(hw);</div><div class='add'>+	udelay(1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *  ixgbe_shift_out_eeprom_bits - Shift data bits out to the EEPROM.</div><div class='add'>+ *  @hw: pointer to hardware structure</div><div class='add'>+ *  @data: data to send to the EEPROM</div><div class='add'>+ *  @count: number of bits to shift out</div><div class='add'>+ **/</div><div class='add'>+static void ixgbe_shift_out_eeprom_bits(struct ixgbe_hw *hw, u16 data,</div><div class='add'>+                                        u16 count)</div><div class='add'>+{</div><div class='add'>+	u32 eec;</div><div class='add'>+	u32 mask;</div><div class='add'>+	u32 i;</div><div class='add'>+</div><div class='add'>+	eec = IXGBE_READ_REG(hw, IXGBE_EEC);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Mask is used to shift "count" bits of "data" out to the EEPROM</div><div class='add'>+	 * one bit at a time.  Determine the starting bit based on count</div><div class='add'>+	 */</div><div class='add'>+	mask = 0x01 &lt;&lt; (count - 1);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; count; i++) {</div><div class='add'>+		/*</div><div class='add'>+		 * A "1" is shifted out to the EEPROM by setting bit "DI" to a</div><div class='add'>+		 * "1", and then raising and then lowering the clock (the SK</div><div class='add'>+		 * bit controls the clock input to the EEPROM).  A "0" is</div><div class='add'>+		 * shifted out to the EEPROM by setting "DI" to "0" and then</div><div class='add'>+		 * raising and then lowering the clock.</div><div class='add'>+		 */</div><div class='add'>+		if (data &amp; mask)</div><div class='add'>+			eec |= IXGBE_EEC_DI;</div><div class='add'>+		else</div><div class='add'>+			eec &amp;= ~IXGBE_EEC_DI;</div><div class='add'>+</div><div class='add'>+		IXGBE_WRITE_REG(hw, IXGBE_EEC, eec);</div><div class='add'>+		IXGBE_WRITE_FLUSH(hw);</div><div class='add'>+</div><div class='add'>+		udelay(1);</div><div class='add'>+</div><div class='add'>+		ixgbe_raise_eeprom_clk(hw, &amp;eec);</div><div class='add'>+		ixgbe_lower_eeprom_clk(hw, &amp;eec);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Shift mask to signify next bit of data to shift in to the</div><div class='add'>+		 * EEPROM</div><div class='add'>+		 */</div><div class='add'>+		mask = mask &gt;&gt; 1;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/* We leave the "DI" bit set to "0" when we leave this routine. */</div><div class='add'>+	eec &amp;= ~IXGBE_EEC_DI;</div><div class='add'>+	IXGBE_WRITE_REG(hw, IXGBE_EEC, eec);</div><div class='add'>+	IXGBE_WRITE_FLUSH(hw);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *  ixgbe_shift_in_eeprom_bits - Shift data bits in from the EEPROM</div><div class='add'>+ *  @hw: pointer to hardware structure</div><div class='add'>+ **/</div><div class='add'>+static u16 ixgbe_shift_in_eeprom_bits(struct ixgbe_hw *hw, u16 count)</div><div class='add'>+{</div><div class='add'>+	u32 eec;</div><div class='add'>+	u32 i;</div><div class='add'>+	u16 data = 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * In order to read a register from the EEPROM, we need to shift</div><div class='add'>+	 * 'count' bits in from the EEPROM. Bits are "shifted in" by raising</div><div class='add'>+	 * the clock input to the EEPROM (setting the SK bit), and then reading</div><div class='add'>+	 * the value of the "DO" bit.  During this "shifting in" process the</div><div class='add'>+	 * "DI" bit should always be clear.</div><div class='add'>+	 */</div><div class='add'>+	eec = IXGBE_READ_REG(hw, IXGBE_EEC);</div><div class='add'>+</div><div class='add'>+	eec &amp;= ~(IXGBE_EEC_DO | IXGBE_EEC_DI);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; count; i++) {</div><div class='add'>+		data = data &lt;&lt; 1;</div><div class='add'>+		ixgbe_raise_eeprom_clk(hw, &amp;eec);</div><div class='add'>+</div><div class='add'>+		eec = IXGBE_READ_REG(hw, IXGBE_EEC);</div><div class='add'>+</div><div class='add'>+		eec &amp;= ~(IXGBE_EEC_DI);</div><div class='add'>+		if (eec &amp; IXGBE_EEC_DO)</div><div class='add'>+			data |= 1;</div><div class='add'>+</div><div class='add'>+		ixgbe_lower_eeprom_clk(hw, &amp;eec);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return data;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *  ixgbe_raise_eeprom_clk - Raises the EEPROM's clock input.</div><div class='add'>+ *  @hw: pointer to hardware structure</div><div class='add'>+ *  @eec: EEC register's current value</div><div class='add'>+ **/</div><div class='add'>+static void ixgbe_raise_eeprom_clk(struct ixgbe_hw *hw, u32 *eec)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Raise the clock input to the EEPROM</div><div class='add'>+	 * (setting the SK bit), then delay</div><div class='add'>+	 */</div><div class='add'>+	*eec = *eec | IXGBE_EEC_SK;</div><div class='add'>+	IXGBE_WRITE_REG(hw, IXGBE_EEC, *eec);</div><div class='add'>+	IXGBE_WRITE_FLUSH(hw);</div><div class='add'>+	udelay(1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *  ixgbe_lower_eeprom_clk - Lowers the EEPROM's clock input.</div><div class='add'>+ *  @hw: pointer to hardware structure</div><div class='add'>+ *  @eecd: EECD's current value</div><div class='add'>+ **/</div><div class='add'>+static void ixgbe_lower_eeprom_clk(struct ixgbe_hw *hw, u32 *eec)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Lower the clock input to the EEPROM (clearing the SK bit), then</div><div class='add'>+	 * delay</div><div class='add'>+	 */</div><div class='add'>+	*eec = *eec &amp; ~IXGBE_EEC_SK;</div><div class='add'>+	IXGBE_WRITE_REG(hw, IXGBE_EEC, *eec);</div><div class='add'>+	IXGBE_WRITE_FLUSH(hw);</div><div class='add'>+	udelay(1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *  ixgbe_release_eeprom - Release EEPROM, release semaphores</div><div class='add'>+ *  @hw: pointer to hardware structure</div><div class='add'>+ **/</div><div class='add'>+static void ixgbe_release_eeprom(struct ixgbe_hw *hw)</div><div class='add'>+{</div><div class='add'>+	u32 eec;</div><div class='add'>+</div><div class='add'>+	eec = IXGBE_READ_REG(hw, IXGBE_EEC);</div><div class='add'>+</div><div class='add'>+	eec |= IXGBE_EEC_CS;  /* Pull CS high */</div><div class='add'>+	eec &amp;= ~IXGBE_EEC_SK; /* Lower SCK */</div><div class='add'>+</div><div class='add'>+	IXGBE_WRITE_REG(hw, IXGBE_EEC, eec);</div><div class='add'>+	IXGBE_WRITE_FLUSH(hw);</div><div class='add'>+</div><div class='add'>+	udelay(1);</div><div class='add'>+</div><div class='add'>+	/* Stop requesting EEPROM access */</div><div class='add'>+	eec &amp;= ~IXGBE_EEC_REQ;</div><div class='add'>+	IXGBE_WRITE_REG(hw, IXGBE_EEC, eec);</div><div class='add'>+</div><div class='add'>+	ixgbe_release_swfw_sync(hw, IXGBE_GSSR_EEP_SM);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  *  ixgbe_calc_eeprom_checksum - Calculates and returns the checksum</div><div class='ctx'>  *  @hw: pointer to hardware structure</div><div class='ctx'>  **/</div><div class='hunk'>@@ -517,7 +872,7 @@ static u16 ixgbe_calc_eeprom_checksum(struct ixgbe_hw *hw)</div><div class='ctx'> </div><div class='ctx'> 	/* Include 0x0-0x3F in the checksum */</div><div class='ctx'> 	for (i = 0; i &lt; IXGBE_EEPROM_CHECKSUM; i++) {</div><div class='del'>-		if (ixgbe_read_eeprom(hw, i, &amp;word) != 0) {</div><div class='add'>+		if (hw-&gt;eeprom.ops.read(hw, i, &amp;word) != 0) {</div><div class='ctx'> 			hw_dbg(hw, "EEPROM read failed\n");</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -526,15 +881,15 @@ static u16 ixgbe_calc_eeprom_checksum(struct ixgbe_hw *hw)</div><div class='ctx'> </div><div class='ctx'> 	/* Include all data from pointers except for the fw pointer */</div><div class='ctx'> 	for (i = IXGBE_PCIE_ANALOG_PTR; i &lt; IXGBE_FW_PTR; i++) {</div><div class='del'>-		ixgbe_read_eeprom(hw, i, &amp;pointer);</div><div class='add'>+		hw-&gt;eeprom.ops.read(hw, i, &amp;pointer);</div><div class='ctx'> </div><div class='ctx'> 		/* Make sure the pointer seems valid */</div><div class='ctx'> 		if (pointer != 0xFFFF &amp;&amp; pointer != 0) {</div><div class='del'>-			ixgbe_read_eeprom(hw, pointer, &amp;length);</div><div class='add'>+			hw-&gt;eeprom.ops.read(hw, pointer, &amp;length);</div><div class='ctx'> </div><div class='ctx'> 			if (length != 0xFFFF &amp;&amp; length != 0) {</div><div class='ctx'> 				for (j = pointer+1; j &lt;= pointer+length; j++) {</div><div class='del'>-					ixgbe_read_eeprom(hw, j, &amp;word);</div><div class='add'>+					hw-&gt;eeprom.ops.read(hw, j, &amp;word);</div><div class='ctx'> 					checksum += word;</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='hunk'>@@ -547,14 +902,15 @@ static u16 ixgbe_calc_eeprom_checksum(struct ixgbe_hw *hw)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *  ixgbe_validate_eeprom_checksum - Validate EEPROM checksum</div><div class='add'>+ *  ixgbe_validate_eeprom_checksum_generic - Validate EEPROM checksum</div><div class='ctx'>  *  @hw: pointer to hardware structure</div><div class='ctx'>  *  @checksum_val: calculated checksum</div><div class='ctx'>  *</div><div class='ctx'>  *  Performs checksum calculation and validates the EEPROM checksum.  If the</div><div class='ctx'>  *  caller does not need checksum_val, the value can be NULL.</div><div class='ctx'>  **/</div><div class='del'>-s32 ixgbe_validate_eeprom_checksum(struct ixgbe_hw *hw, u16 *checksum_val)</div><div class='add'>+s32 ixgbe_validate_eeprom_checksum_generic(struct ixgbe_hw *hw,</div><div class='add'>+                                           u16 *checksum_val)</div><div class='ctx'> {</div><div class='ctx'> 	s32 status;</div><div class='ctx'> 	u16 checksum;</div><div class='hunk'>@@ -565,12 +921,12 @@ s32 ixgbe_validate_eeprom_checksum(struct ixgbe_hw *hw, u16 *checksum_val)</div><div class='ctx'> 	 * not continue or we could be in for a very long wait while every</div><div class='ctx'> 	 * EEPROM read fails</div><div class='ctx'> 	 */</div><div class='del'>-	status = ixgbe_read_eeprom(hw, 0, &amp;checksum);</div><div class='add'>+	status = hw-&gt;eeprom.ops.read(hw, 0, &amp;checksum);</div><div class='ctx'> </div><div class='ctx'> 	if (status == 0) {</div><div class='ctx'> 		checksum = ixgbe_calc_eeprom_checksum(hw);</div><div class='ctx'> </div><div class='del'>-		ixgbe_read_eeprom(hw, IXGBE_EEPROM_CHECKSUM, &amp;read_checksum);</div><div class='add'>+		hw-&gt;eeprom.ops.read(hw, IXGBE_EEPROM_CHECKSUM, &amp;read_checksum);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Verify read checksum from EEPROM is the same as</div><div class='hunk'>@@ -590,6 +946,33 @@ s32 ixgbe_validate_eeprom_checksum(struct ixgbe_hw *hw, u16 *checksum_val)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ *  ixgbe_update_eeprom_checksum_generic - Updates the EEPROM checksum</div><div class='add'>+ *  @hw: pointer to hardware structure</div><div class='add'>+ **/</div><div class='add'>+s32 ixgbe_update_eeprom_checksum_generic(struct ixgbe_hw *hw)</div><div class='add'>+{</div><div class='add'>+	s32 status;</div><div class='add'>+	u16 checksum;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Read the first word from the EEPROM. If this times out or fails, do</div><div class='add'>+	 * not continue or we could be in for a very long wait while every</div><div class='add'>+	 * EEPROM read fails</div><div class='add'>+	 */</div><div class='add'>+	status = hw-&gt;eeprom.ops.read(hw, 0, &amp;checksum);</div><div class='add'>+</div><div class='add'>+	if (status == 0) {</div><div class='add'>+		checksum = ixgbe_calc_eeprom_checksum(hw);</div><div class='add'>+		status = hw-&gt;eeprom.ops.write(hw, IXGBE_EEPROM_CHECKSUM,</div><div class='add'>+		                            checksum);</div><div class='add'>+	} else {</div><div class='add'>+		hw_dbg(hw, "EEPROM read failed\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  *  ixgbe_validate_mac_addr - Validate MAC address</div><div class='ctx'>  *  @mac_addr: pointer to MAC address.</div><div class='ctx'>  *</div><div class='hunk'>@@ -607,61 +990,140 @@ s32 ixgbe_validate_mac_addr(u8 *mac_addr)</div><div class='ctx'> 		status = IXGBE_ERR_INVALID_MAC_ADDR;</div><div class='ctx'> 	/* Reject the zero address */</div><div class='ctx'> 	else if (mac_addr[0] == 0 &amp;&amp; mac_addr[1] == 0 &amp;&amp; mac_addr[2] == 0 &amp;&amp;</div><div class='del'>-		 mac_addr[3] == 0 &amp;&amp; mac_addr[4] == 0 &amp;&amp; mac_addr[5] == 0)</div><div class='add'>+	         mac_addr[3] == 0 &amp;&amp; mac_addr[4] == 0 &amp;&amp; mac_addr[5] == 0)</div><div class='ctx'> 		status = IXGBE_ERR_INVALID_MAC_ADDR;</div><div class='ctx'> </div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *  ixgbe_set_rar - Set RX address register</div><div class='add'>+ *  ixgbe_set_rar_generic - Set Rx address register</div><div class='ctx'>  *  @hw: pointer to hardware structure</div><div class='del'>- *  @addr: Address to put into receive address register</div><div class='ctx'>  *  @index: Receive address register to write</div><div class='del'>- *  @vind: Vind to set RAR to</div><div class='add'>+ *  @addr: Address to put into receive address register</div><div class='add'>+ *  @vmdq: VMDq "set" or "pool" index</div><div class='ctx'>  *  @enable_addr: set flag that address is active</div><div class='ctx'>  *</div><div class='ctx'>  *  Puts an ethernet address into a receive address register.</div><div class='ctx'>  **/</div><div class='del'>-s32 ixgbe_set_rar(struct ixgbe_hw *hw, u32 index, u8 *addr, u32 vind,</div><div class='del'>-		  u32 enable_addr)</div><div class='add'>+s32 ixgbe_set_rar_generic(struct ixgbe_hw *hw, u32 index, u8 *addr, u32 vmdq,</div><div class='add'>+                          u32 enable_addr)</div><div class='ctx'> {</div><div class='ctx'> 	u32 rar_low, rar_high;</div><div class='add'>+	u32 rar_entries = hw-&gt;mac.num_rar_entries;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * HW expects these in little endian so we reverse the byte order from</div><div class='del'>-	 * network order (big endian) to little endian</div><div class='del'>-	 */</div><div class='del'>-	rar_low = ((u32)addr[0] |</div><div class='del'>-		   ((u32)addr[1] &lt;&lt; 8) |</div><div class='del'>-		   ((u32)addr[2] &lt;&lt; 16) |</div><div class='del'>-		   ((u32)addr[3] &lt;&lt; 24));</div><div class='add'>+	/* setup VMDq pool selection before this RAR gets enabled */</div><div class='add'>+	hw-&gt;mac.ops.set_vmdq(hw, index, vmdq);</div><div class='ctx'> </div><div class='del'>-	rar_high = ((u32)addr[4] |</div><div class='del'>-		    ((u32)addr[5] &lt;&lt; 8) |</div><div class='del'>-		    ((vind &lt;&lt; IXGBE_RAH_VIND_SHIFT) &amp; IXGBE_RAH_VIND_MASK));</div><div class='add'>+	/* Make sure we are using a valid rar index range */</div><div class='add'>+	if (index &lt; rar_entries) {</div><div class='add'>+		/*</div><div class='add'>+		 * HW expects these in little endian so we reverse the byte</div><div class='add'>+		 * order from network order (big endian) to little endian</div><div class='add'>+		 */</div><div class='add'>+		rar_low = ((u32)addr[0] |</div><div class='add'>+		           ((u32)addr[1] &lt;&lt; 8) |</div><div class='add'>+		           ((u32)addr[2] &lt;&lt; 16) |</div><div class='add'>+		           ((u32)addr[3] &lt;&lt; 24));</div><div class='add'>+		/*</div><div class='add'>+		 * Some parts put the VMDq setting in the extra RAH bits,</div><div class='add'>+		 * so save everything except the lower 16 bits that hold part</div><div class='add'>+		 * of the address and the address valid bit.</div><div class='add'>+		 */</div><div class='add'>+		rar_high = IXGBE_READ_REG(hw, IXGBE_RAH(index));</div><div class='add'>+		rar_high &amp;= ~(0x0000FFFF | IXGBE_RAH_AV);</div><div class='add'>+		rar_high |= ((u32)addr[4] | ((u32)addr[5] &lt;&lt; 8));</div><div class='ctx'> </div><div class='del'>-	if (enable_addr != 0)</div><div class='del'>-		rar_high |= IXGBE_RAH_AV;</div><div class='add'>+		if (enable_addr != 0)</div><div class='add'>+			rar_high |= IXGBE_RAH_AV;</div><div class='ctx'> </div><div class='del'>-	IXGBE_WRITE_REG(hw, IXGBE_RAL(index), rar_low);</div><div class='del'>-	IXGBE_WRITE_REG(hw, IXGBE_RAH(index), rar_high);</div><div class='add'>+		IXGBE_WRITE_REG(hw, IXGBE_RAL(index), rar_low);</div><div class='add'>+		IXGBE_WRITE_REG(hw, IXGBE_RAH(index), rar_high);</div><div class='add'>+	} else {</div><div class='add'>+		hw_dbg(hw, "RAR index %d is out of range.\n", index);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *  ixgbe_init_rx_addrs - Initializes receive address filters.</div><div class='add'>+ *  ixgbe_clear_rar_generic - Remove Rx address register</div><div class='add'>+ *  @hw: pointer to hardware structure</div><div class='add'>+ *  @index: Receive address register to write</div><div class='add'>+ *</div><div class='add'>+ *  Clears an ethernet address from a receive address register.</div><div class='add'>+ **/</div><div class='add'>+s32 ixgbe_clear_rar_generic(struct ixgbe_hw *hw, u32 index)</div><div class='add'>+{</div><div class='add'>+	u32 rar_high;</div><div class='add'>+	u32 rar_entries = hw-&gt;mac.num_rar_entries;</div><div class='add'>+</div><div class='add'>+	/* Make sure we are using a valid rar index range */</div><div class='add'>+	if (index &lt; rar_entries) {</div><div class='add'>+		/*</div><div class='add'>+		 * Some parts put the VMDq setting in the extra RAH bits,</div><div class='add'>+		 * so save everything except the lower 16 bits that hold part</div><div class='add'>+		 * of the address and the address valid bit.</div><div class='add'>+		 */</div><div class='add'>+		rar_high = IXGBE_READ_REG(hw, IXGBE_RAH(index));</div><div class='add'>+		rar_high &amp;= ~(0x0000FFFF | IXGBE_RAH_AV);</div><div class='add'>+</div><div class='add'>+		IXGBE_WRITE_REG(hw, IXGBE_RAL(index), 0);</div><div class='add'>+		IXGBE_WRITE_REG(hw, IXGBE_RAH(index), rar_high);</div><div class='add'>+	} else {</div><div class='add'>+		hw_dbg(hw, "RAR index %d is out of range.\n", index);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* clear VMDq pool/queue selection for this RAR */</div><div class='add'>+	hw-&gt;mac.ops.clear_vmdq(hw, index, IXGBE_CLEAR_VMDQ_ALL);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *  ixgbe_enable_rar - Enable Rx address register</div><div class='add'>+ *  @hw: pointer to hardware structure</div><div class='add'>+ *  @index: index into the RAR table</div><div class='add'>+ *</div><div class='add'>+ *  Enables the select receive address register.</div><div class='add'>+ **/</div><div class='add'>+static void ixgbe_enable_rar(struct ixgbe_hw *hw, u32 index)</div><div class='add'>+{</div><div class='add'>+	u32 rar_high;</div><div class='add'>+</div><div class='add'>+	rar_high = IXGBE_READ_REG(hw, IXGBE_RAH(index));</div><div class='add'>+	rar_high |= IXGBE_RAH_AV;</div><div class='add'>+	IXGBE_WRITE_REG(hw, IXGBE_RAH(index), rar_high);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *  ixgbe_disable_rar - Disable Rx address register</div><div class='add'>+ *  @hw: pointer to hardware structure</div><div class='add'>+ *  @index: index into the RAR table</div><div class='add'>+ *</div><div class='add'>+ *  Disables the select receive address register.</div><div class='add'>+ **/</div><div class='add'>+static void ixgbe_disable_rar(struct ixgbe_hw *hw, u32 index)</div><div class='add'>+{</div><div class='add'>+	u32 rar_high;</div><div class='add'>+</div><div class='add'>+	rar_high = IXGBE_READ_REG(hw, IXGBE_RAH(index));</div><div class='add'>+	rar_high &amp;= (~IXGBE_RAH_AV);</div><div class='add'>+	IXGBE_WRITE_REG(hw, IXGBE_RAH(index), rar_high);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *  ixgbe_init_rx_addrs_generic - Initializes receive address filters.</div><div class='ctx'>  *  @hw: pointer to hardware structure</div><div class='ctx'>  *</div><div class='ctx'>  *  Places the MAC address in receive address register 0 and clears the rest</div><div class='del'>- *  of the receive addresss registers. Clears the multicast table. Assumes</div><div class='add'>+ *  of the receive address registers. Clears the multicast table. Assumes</div><div class='ctx'>  *  the receiver is in reset when the routine is called.</div><div class='ctx'>  **/</div><div class='del'>-static s32 ixgbe_init_rx_addrs(struct ixgbe_hw *hw)</div><div class='add'>+s32 ixgbe_init_rx_addrs_generic(struct ixgbe_hw *hw)</div><div class='ctx'> {</div><div class='ctx'> 	u32 i;</div><div class='del'>-	u32 rar_entries = hw-&gt;mac.num_rx_addrs;</div><div class='add'>+	u32 rar_entries = hw-&gt;mac.num_rar_entries;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If the current mac address is valid, assume it is a software override</div><div class='hunk'>@@ -671,29 +1133,30 @@ static s32 ixgbe_init_rx_addrs(struct ixgbe_hw *hw)</div><div class='ctx'> 	if (ixgbe_validate_mac_addr(hw-&gt;mac.addr) ==</div><div class='ctx'> 	    IXGBE_ERR_INVALID_MAC_ADDR) {</div><div class='ctx'> 		/* Get the MAC address from the RAR0 for later reference */</div><div class='del'>-		ixgbe_get_mac_addr(hw, hw-&gt;mac.addr);</div><div class='add'>+		hw-&gt;mac.ops.get_mac_addr(hw, hw-&gt;mac.addr);</div><div class='ctx'> </div><div class='ctx'> 		hw_dbg(hw, " Keeping Current RAR0 Addr =%.2X %.2X %.2X ",</div><div class='del'>-			  hw-&gt;mac.addr[0], hw-&gt;mac.addr[1],</div><div class='del'>-			  hw-&gt;mac.addr[2]);</div><div class='add'>+		       hw-&gt;mac.addr[0], hw-&gt;mac.addr[1],</div><div class='add'>+		       hw-&gt;mac.addr[2]);</div><div class='ctx'> 		hw_dbg(hw, "%.2X %.2X %.2X\n", hw-&gt;mac.addr[3],</div><div class='del'>-			  hw-&gt;mac.addr[4], hw-&gt;mac.addr[5]);</div><div class='add'>+		       hw-&gt;mac.addr[4], hw-&gt;mac.addr[5]);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* Setup the receive address. */</div><div class='ctx'> 		hw_dbg(hw, "Overriding MAC Address in RAR[0]\n");</div><div class='ctx'> 		hw_dbg(hw, " New MAC Addr =%.2X %.2X %.2X ",</div><div class='del'>-			  hw-&gt;mac.addr[0], hw-&gt;mac.addr[1],</div><div class='del'>-			  hw-&gt;mac.addr[2]);</div><div class='add'>+		       hw-&gt;mac.addr[0], hw-&gt;mac.addr[1],</div><div class='add'>+		       hw-&gt;mac.addr[2]);</div><div class='ctx'> 		hw_dbg(hw, "%.2X %.2X %.2X\n", hw-&gt;mac.addr[3],</div><div class='del'>-			  hw-&gt;mac.addr[4], hw-&gt;mac.addr[5]);</div><div class='add'>+		       hw-&gt;mac.addr[4], hw-&gt;mac.addr[5]);</div><div class='ctx'> </div><div class='del'>-		ixgbe_set_rar(hw, 0, hw-&gt;mac.addr, 0, IXGBE_RAH_AV);</div><div class='add'>+		hw-&gt;mac.ops.set_rar(hw, 0, hw-&gt;mac.addr, 0, IXGBE_RAH_AV);</div><div class='ctx'> 	}</div><div class='add'>+	hw-&gt;addr_ctrl.overflow_promisc = 0;</div><div class='ctx'> </div><div class='ctx'> 	hw-&gt;addr_ctrl.rar_used_count = 1;</div><div class='ctx'> </div><div class='ctx'> 	/* Zero out the other receive addresses. */</div><div class='del'>-	hw_dbg(hw, "Clearing RAR[1-15]\n");</div><div class='add'>+	hw_dbg(hw, "Clearing RAR[1-%d]\n", rar_entries - 1);</div><div class='ctx'> 	for (i = 1; i &lt; rar_entries; i++) {</div><div class='ctx'> 		IXGBE_WRITE_REG(hw, IXGBE_RAL(i), 0);</div><div class='ctx'> 		IXGBE_WRITE_REG(hw, IXGBE_RAH(i), 0);</div><div class='hunk'>@@ -705,9 +1168,113 @@ static s32 ixgbe_init_rx_addrs(struct ixgbe_hw *hw)</div><div class='ctx'> 	IXGBE_WRITE_REG(hw, IXGBE_MCSTCTRL, hw-&gt;mac.mc_filter_type);</div><div class='ctx'> </div><div class='ctx'> 	hw_dbg(hw, " Clearing MTA\n");</div><div class='del'>-	for (i = 0; i &lt; IXGBE_MC_TBL_SIZE; i++)</div><div class='add'>+	for (i = 0; i &lt; hw-&gt;mac.mcft_size; i++)</div><div class='ctx'> 		IXGBE_WRITE_REG(hw, IXGBE_MTA(i), 0);</div><div class='ctx'> </div><div class='add'>+	if (hw-&gt;mac.ops.init_uta_tables)</div><div class='add'>+		hw-&gt;mac.ops.init_uta_tables(hw);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *  ixgbe_add_uc_addr - Adds a secondary unicast address.</div><div class='add'>+ *  @hw: pointer to hardware structure</div><div class='add'>+ *  @addr: new address</div><div class='add'>+ *</div><div class='add'>+ *  Adds it to unused receive address register or goes into promiscuous mode.</div><div class='add'>+ **/</div><div class='add'>+static void ixgbe_add_uc_addr(struct ixgbe_hw *hw, u8 *addr, u32 vmdq)</div><div class='add'>+{</div><div class='add'>+	u32 rar_entries = hw-&gt;mac.num_rar_entries;</div><div class='add'>+	u32 rar;</div><div class='add'>+</div><div class='add'>+	hw_dbg(hw, " UC Addr = %.2X %.2X %.2X %.2X %.2X %.2X\n",</div><div class='add'>+	          addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Place this address in the RAR if there is room,</div><div class='add'>+	 * else put the controller into promiscuous mode</div><div class='add'>+	 */</div><div class='add'>+	if (hw-&gt;addr_ctrl.rar_used_count &lt; rar_entries) {</div><div class='add'>+		rar = hw-&gt;addr_ctrl.rar_used_count -</div><div class='add'>+		      hw-&gt;addr_ctrl.mc_addr_in_rar_count;</div><div class='add'>+		hw-&gt;mac.ops.set_rar(hw, rar, addr, vmdq, IXGBE_RAH_AV);</div><div class='add'>+		hw_dbg(hw, "Added a secondary address to RAR[%d]\n", rar);</div><div class='add'>+		hw-&gt;addr_ctrl.rar_used_count++;</div><div class='add'>+	} else {</div><div class='add'>+		hw-&gt;addr_ctrl.overflow_promisc++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hw_dbg(hw, "ixgbe_add_uc_addr Complete\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *  ixgbe_update_uc_addr_list_generic - Updates MAC list of secondary addresses</div><div class='add'>+ *  @hw: pointer to hardware structure</div><div class='add'>+ *  @addr_list: the list of new addresses</div><div class='add'>+ *  @addr_count: number of addresses</div><div class='add'>+ *  @next: iterator function to walk the address list</div><div class='add'>+ *</div><div class='add'>+ *  The given list replaces any existing list.  Clears the secondary addrs from</div><div class='add'>+ *  receive address registers.  Uses unused receive address registers for the</div><div class='add'>+ *  first secondary addresses, and falls back to promiscuous mode as needed.</div><div class='add'>+ *</div><div class='add'>+ *  Drivers using secondary unicast addresses must set user_set_promisc when</div><div class='add'>+ *  manually putting the device into promiscuous mode.</div><div class='add'>+ **/</div><div class='add'>+s32 ixgbe_update_uc_addr_list_generic(struct ixgbe_hw *hw, u8 *addr_list,</div><div class='add'>+                              u32 addr_count, ixgbe_mc_addr_itr next)</div><div class='add'>+{</div><div class='add'>+	u8 *addr;</div><div class='add'>+	u32 i;</div><div class='add'>+	u32 old_promisc_setting = hw-&gt;addr_ctrl.overflow_promisc;</div><div class='add'>+	u32 uc_addr_in_use;</div><div class='add'>+	u32 fctrl;</div><div class='add'>+	u32 vmdq;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Clear accounting of old secondary address list,</div><div class='add'>+	 * don't count RAR[0]</div><div class='add'>+	 */</div><div class='add'>+	uc_addr_in_use = hw-&gt;addr_ctrl.rar_used_count -</div><div class='add'>+	                 hw-&gt;addr_ctrl.mc_addr_in_rar_count - 1;</div><div class='add'>+	hw-&gt;addr_ctrl.rar_used_count -= uc_addr_in_use;</div><div class='add'>+	hw-&gt;addr_ctrl.overflow_promisc = 0;</div><div class='add'>+</div><div class='add'>+	/* Zero out the other receive addresses */</div><div class='add'>+	hw_dbg(hw, "Clearing RAR[1-%d]\n", uc_addr_in_use);</div><div class='add'>+	for (i = 1; i &lt;= uc_addr_in_use; i++) {</div><div class='add'>+		IXGBE_WRITE_REG(hw, IXGBE_RAL(i), 0);</div><div class='add'>+		IXGBE_WRITE_REG(hw, IXGBE_RAH(i), 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Add the new addresses */</div><div class='add'>+	for (i = 0; i &lt; addr_count; i++) {</div><div class='add'>+		hw_dbg(hw, " Adding the secondary addresses:\n");</div><div class='add'>+		addr = next(hw, &amp;addr_list, &amp;vmdq);</div><div class='add'>+		ixgbe_add_uc_addr(hw, addr, vmdq);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (hw-&gt;addr_ctrl.overflow_promisc) {</div><div class='add'>+		/* enable promisc if not already in overflow or set by user */</div><div class='add'>+		if (!old_promisc_setting &amp;&amp; !hw-&gt;addr_ctrl.user_set_promisc) {</div><div class='add'>+			hw_dbg(hw, " Entering address overflow promisc mode\n");</div><div class='add'>+			fctrl = IXGBE_READ_REG(hw, IXGBE_FCTRL);</div><div class='add'>+			fctrl |= IXGBE_FCTRL_UPE;</div><div class='add'>+			IXGBE_WRITE_REG(hw, IXGBE_FCTRL, fctrl);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		/* only disable if set by overflow, not by user */</div><div class='add'>+		if (old_promisc_setting &amp;&amp; !hw-&gt;addr_ctrl.user_set_promisc) {</div><div class='add'>+			hw_dbg(hw, " Leaving address overflow promisc mode\n");</div><div class='add'>+			fctrl = IXGBE_READ_REG(hw, IXGBE_FCTRL);</div><div class='add'>+			fctrl &amp;= ~IXGBE_FCTRL_UPE;</div><div class='add'>+			IXGBE_WRITE_REG(hw, IXGBE_FCTRL, fctrl);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hw_dbg(hw, "ixgbe_update_uc_addr_list_generic Complete\n");</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -720,7 +1287,7 @@ static s32 ixgbe_init_rx_addrs(struct ixgbe_hw *hw)</div><div class='ctx'>  *  bit-vector to set in the multicast table. The hardware uses 12 bits, from</div><div class='ctx'>  *  incoming rx multicast addresses, to determine the bit-vector to check in</div><div class='ctx'>  *  the MTA. Which of the 4 combination, of 12-bits, the hardware uses is set</div><div class='del'>- *  by the MO field of the MCSTCTRL. The MO field is set during initalization</div><div class='add'>+ *  by the MO field of the MCSTCTRL. The MO field is set during initialization</div><div class='ctx'>  *  to mc_filter_type.</div><div class='ctx'>  **/</div><div class='ctx'> static s32 ixgbe_mta_vector(struct ixgbe_hw *hw, u8 *mc_addr)</div><div class='hunk'>@@ -728,19 +1295,19 @@ static s32 ixgbe_mta_vector(struct ixgbe_hw *hw, u8 *mc_addr)</div><div class='ctx'> 	u32 vector = 0;</div><div class='ctx'> </div><div class='ctx'> 	switch (hw-&gt;mac.mc_filter_type) {</div><div class='del'>-	case 0:	  /* use bits [47:36] of the address */</div><div class='add'>+	case 0:   /* use bits [47:36] of the address */</div><div class='ctx'> 		vector = ((mc_addr[4] &gt;&gt; 4) | (((u16)mc_addr[5]) &lt;&lt; 4));</div><div class='ctx'> 		break;</div><div class='del'>-	case 1:	  /* use bits [46:35] of the address */</div><div class='add'>+	case 1:   /* use bits [46:35] of the address */</div><div class='ctx'> 		vector = ((mc_addr[4] &gt;&gt; 3) | (((u16)mc_addr[5]) &lt;&lt; 5));</div><div class='ctx'> 		break;</div><div class='del'>-	case 2:	  /* use bits [45:34] of the address */</div><div class='add'>+	case 2:   /* use bits [45:34] of the address */</div><div class='ctx'> 		vector = ((mc_addr[4] &gt;&gt; 2) | (((u16)mc_addr[5]) &lt;&lt; 6));</div><div class='ctx'> 		break;</div><div class='del'>-	case 3:	  /* use bits [43:32] of the address */</div><div class='add'>+	case 3:   /* use bits [43:32] of the address */</div><div class='ctx'> 		vector = ((mc_addr[4]) | (((u16)mc_addr[5]) &lt;&lt; 8));</div><div class='ctx'> 		break;</div><div class='del'>-	default:	 /* Invalid mc_filter_type */</div><div class='add'>+	default:  /* Invalid mc_filter_type */</div><div class='ctx'> 		hw_dbg(hw, "MC filter type param set incorrectly\n");</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -794,21 +1361,22 @@ static void ixgbe_set_mta(struct ixgbe_hw *hw, u8 *mc_addr)</div><div class='ctx'>  **/</div><div class='ctx'> static void ixgbe_add_mc_addr(struct ixgbe_hw *hw, u8 *mc_addr)</div><div class='ctx'> {</div><div class='del'>-	u32 rar_entries = hw-&gt;mac.num_rx_addrs;</div><div class='add'>+	u32 rar_entries = hw-&gt;mac.num_rar_entries;</div><div class='add'>+	u32 rar;</div><div class='ctx'> </div><div class='ctx'> 	hw_dbg(hw, " MC Addr =%.2X %.2X %.2X %.2X %.2X %.2X\n",</div><div class='del'>-		  mc_addr[0], mc_addr[1], mc_addr[2],</div><div class='del'>-		  mc_addr[3], mc_addr[4], mc_addr[5]);</div><div class='add'>+	       mc_addr[0], mc_addr[1], mc_addr[2],</div><div class='add'>+	       mc_addr[3], mc_addr[4], mc_addr[5]);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Place this multicast address in the RAR if there is room,</div><div class='ctx'> 	 * else put it in the MTA</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (hw-&gt;addr_ctrl.rar_used_count &lt; rar_entries) {</div><div class='del'>-		ixgbe_set_rar(hw, hw-&gt;addr_ctrl.rar_used_count,</div><div class='del'>-			      mc_addr, 0, IXGBE_RAH_AV);</div><div class='del'>-		hw_dbg(hw, "Added a multicast address to RAR[%d]\n",</div><div class='del'>-			  hw-&gt;addr_ctrl.rar_used_count);</div><div class='add'>+		/* use RAR from the end up for multicast */</div><div class='add'>+		rar = rar_entries - hw-&gt;addr_ctrl.mc_addr_in_rar_count - 1;</div><div class='add'>+		hw-&gt;mac.ops.set_rar(hw, rar, mc_addr, 0, IXGBE_RAH_AV);</div><div class='add'>+		hw_dbg(hw, "Added a multicast address to RAR[%d]\n", rar);</div><div class='ctx'> 		hw-&gt;addr_ctrl.rar_used_count++;</div><div class='ctx'> 		hw-&gt;addr_ctrl.mc_addr_in_rar_count++;</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -819,22 +1387,23 @@ static void ixgbe_add_mc_addr(struct ixgbe_hw *hw, u8 *mc_addr)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *  ixgbe_update_mc_addr_list - Updates MAC list of multicast addresses</div><div class='add'>+ *  ixgbe_update_mc_addr_list_generic - Updates MAC list of multicast addresses</div><div class='ctx'>  *  @hw: pointer to hardware structure</div><div class='ctx'>  *  @mc_addr_list: the list of new multicast addresses</div><div class='ctx'>  *  @mc_addr_count: number of addresses</div><div class='del'>- *  @pad: number of bytes between addresses in the list</div><div class='add'>+ *  @next: iterator function to walk the multicast address list</div><div class='ctx'>  *</div><div class='ctx'>  *  The given list replaces any existing list. Clears the MC addrs from receive</div><div class='del'>- *  address registers and the multicast table. Uses unsed receive address</div><div class='add'>+ *  address registers and the multicast table. Uses unused receive address</div><div class='ctx'>  *  registers for the first multicast addresses, and hashes the rest into the</div><div class='ctx'>  *  multicast table.</div><div class='ctx'>  **/</div><div class='del'>-s32 ixgbe_update_mc_addr_list(struct ixgbe_hw *hw, u8 *mc_addr_list,</div><div class='del'>-			      u32 mc_addr_count, u32 pad)</div><div class='add'>+s32 ixgbe_update_mc_addr_list_generic(struct ixgbe_hw *hw, u8 *mc_addr_list,</div><div class='add'>+                                      u32 mc_addr_count, ixgbe_mc_addr_itr next)</div><div class='ctx'> {</div><div class='ctx'> 	u32 i;</div><div class='del'>-	u32 rar_entries = hw-&gt;mac.num_rx_addrs;</div><div class='add'>+	u32 rar_entries = hw-&gt;mac.num_rar_entries;</div><div class='add'>+	u32 vmdq;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Set the new number of MC addresses that we are being requested to</div><div class='hunk'>@@ -846,7 +1415,8 @@ s32 ixgbe_update_mc_addr_list(struct ixgbe_hw *hw, u8 *mc_addr_list,</div><div class='ctx'> 	hw-&gt;addr_ctrl.mta_in_use = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Zero out the other receive addresses. */</div><div class='del'>-	hw_dbg(hw, "Clearing RAR[1-15]\n");</div><div class='add'>+	hw_dbg(hw, "Clearing RAR[%d-%d]\n", hw-&gt;addr_ctrl.rar_used_count,</div><div class='add'>+	          rar_entries - 1);</div><div class='ctx'> 	for (i = hw-&gt;addr_ctrl.rar_used_count; i &lt; rar_entries; i++) {</div><div class='ctx'> 		IXGBE_WRITE_REG(hw, IXGBE_RAL(i), 0);</div><div class='ctx'> 		IXGBE_WRITE_REG(hw, IXGBE_RAH(i), 0);</div><div class='hunk'>@@ -854,186 +1424,67 @@ s32 ixgbe_update_mc_addr_list(struct ixgbe_hw *hw, u8 *mc_addr_list,</div><div class='ctx'> </div><div class='ctx'> 	/* Clear the MTA */</div><div class='ctx'> 	hw_dbg(hw, " Clearing MTA\n");</div><div class='del'>-	for (i = 0; i &lt; IXGBE_MC_TBL_SIZE; i++)</div><div class='add'>+	for (i = 0; i &lt; hw-&gt;mac.mcft_size; i++)</div><div class='ctx'> 		IXGBE_WRITE_REG(hw, IXGBE_MTA(i), 0);</div><div class='ctx'> </div><div class='ctx'> 	/* Add the new addresses */</div><div class='ctx'> 	for (i = 0; i &lt; mc_addr_count; i++) {</div><div class='ctx'> 		hw_dbg(hw, " Adding the multicast addresses:\n");</div><div class='del'>-		ixgbe_add_mc_addr(hw, mc_addr_list +</div><div class='del'>-				  (i * (IXGBE_ETH_LENGTH_OF_ADDRESS + pad)));</div><div class='add'>+		ixgbe_add_mc_addr(hw, next(hw, &amp;mc_addr_list, &amp;vmdq));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Enable mta */</div><div class='ctx'> 	if (hw-&gt;addr_ctrl.mta_in_use &gt; 0)</div><div class='ctx'> 		IXGBE_WRITE_REG(hw, IXGBE_MCSTCTRL,</div><div class='del'>-				IXGBE_MCSTCTRL_MFE | hw-&gt;mac.mc_filter_type);</div><div class='add'>+		                IXGBE_MCSTCTRL_MFE | hw-&gt;mac.mc_filter_type);</div><div class='ctx'> </div><div class='del'>-	hw_dbg(hw, "ixgbe_update_mc_addr_list Complete\n");</div><div class='add'>+	hw_dbg(hw, "ixgbe_update_mc_addr_list_generic Complete\n");</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *  ixgbe_clear_vfta - Clear VLAN filter table</div><div class='add'>+ *  ixgbe_enable_mc_generic - Enable multicast address in RAR</div><div class='ctx'>  *  @hw: pointer to hardware structure</div><div class='ctx'>  *</div><div class='del'>- *  Clears the VLAN filer table, and the VMDq index associated with the filter</div><div class='add'>+ *  Enables multicast address in RAR and the use of the multicast hash table.</div><div class='ctx'>  **/</div><div class='del'>-static s32 ixgbe_clear_vfta(struct ixgbe_hw *hw)</div><div class='add'>+s32 ixgbe_enable_mc_generic(struct ixgbe_hw *hw)</div><div class='ctx'> {</div><div class='del'>-	u32 offset;</div><div class='del'>-	u32 vlanbyte;</div><div class='del'>-</div><div class='del'>-	for (offset = 0; offset &lt; IXGBE_VLAN_FILTER_TBL_SIZE; offset++)</div><div class='del'>-		IXGBE_WRITE_REG(hw, IXGBE_VFTA(offset), 0);</div><div class='del'>-</div><div class='del'>-	for (vlanbyte = 0; vlanbyte &lt; 4; vlanbyte++)</div><div class='del'>-		for (offset = 0; offset &lt; IXGBE_VLAN_FILTER_TBL_SIZE; offset++)</div><div class='del'>-			IXGBE_WRITE_REG(hw, IXGBE_VFTAVIND(vlanbyte, offset),</div><div class='del'>-					0);</div><div class='add'>+	u32 i;</div><div class='add'>+	u32 rar_entries = hw-&gt;mac.num_rar_entries;</div><div class='add'>+	struct ixgbe_addr_filter_info *a = &amp;hw-&gt;addr_ctrl;</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='add'>+	if (a-&gt;mc_addr_in_rar_count &gt; 0)</div><div class='add'>+		for (i = (rar_entries - a-&gt;mc_addr_in_rar_count);</div><div class='add'>+		     i &lt; rar_entries; i++)</div><div class='add'>+			ixgbe_enable_rar(hw, i);</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- *  ixgbe_set_vfta - Set VLAN filter table</div><div class='del'>- *  @hw: pointer to hardware structure</div><div class='del'>- *  @vlan: VLAN id to write to VLAN filter</div><div class='del'>- *  @vind: VMDq output index that maps queue to VLAN id in VFTA</div><div class='del'>- *  @vlan_on: boolean flag to turn on/off VLAN in VFTA</div><div class='del'>- *</div><div class='del'>- *  Turn on/off specified VLAN in the VLAN filter table.</div><div class='del'>- **/</div><div class='del'>-s32 ixgbe_set_vfta(struct ixgbe_hw *hw, u32 vlan, u32 vind,</div><div class='del'>-		   bool vlan_on)</div><div class='del'>-{</div><div class='del'>-	u32 VftaIndex;</div><div class='del'>-	u32 BitOffset;</div><div class='del'>-	u32 VftaReg;</div><div class='del'>-	u32 VftaByte;</div><div class='del'>-</div><div class='del'>-	/* Determine 32-bit word position in array */</div><div class='del'>-	VftaIndex = (vlan &gt;&gt; 5) &amp; 0x7F;   /* upper seven bits */</div><div class='del'>-</div><div class='del'>-	/* Determine the location of the (VMD) queue index */</div><div class='del'>-	VftaByte =  ((vlan &gt;&gt; 3) &amp; 0x03); /* bits (4:3) indicating byte array */</div><div class='del'>-	BitOffset = (vlan &amp; 0x7) &lt;&lt; 2;    /* lower 3 bits indicate nibble */</div><div class='del'>-</div><div class='del'>-	/* Set the nibble for VMD queue index */</div><div class='del'>-	VftaReg = IXGBE_READ_REG(hw, IXGBE_VFTAVIND(VftaByte, VftaIndex));</div><div class='del'>-	VftaReg &amp;= (~(0x0F &lt;&lt; BitOffset));</div><div class='del'>-	VftaReg |= (vind &lt;&lt; BitOffset);</div><div class='del'>-	IXGBE_WRITE_REG(hw, IXGBE_VFTAVIND(VftaByte, VftaIndex), VftaReg);</div><div class='del'>-</div><div class='del'>-	/* Determine the location of the bit for this VLAN id */</div><div class='del'>-	BitOffset = vlan &amp; 0x1F;	   /* lower five bits */</div><div class='del'>-</div><div class='del'>-	VftaReg = IXGBE_READ_REG(hw, IXGBE_VFTA(VftaIndex));</div><div class='del'>-	if (vlan_on)</div><div class='del'>-		/* Turn on this VLAN id */</div><div class='del'>-		VftaReg |= (1 &lt;&lt; BitOffset);</div><div class='del'>-	else</div><div class='del'>-		/* Turn off this VLAN id */</div><div class='del'>-		VftaReg &amp;= ~(1 &lt;&lt; BitOffset);</div><div class='del'>-	IXGBE_WRITE_REG(hw, IXGBE_VFTA(VftaIndex), VftaReg);</div><div class='add'>+	if (a-&gt;mta_in_use &gt; 0)</div><div class='add'>+		IXGBE_WRITE_REG(hw, IXGBE_MCSTCTRL, IXGBE_MCSTCTRL_MFE |</div><div class='add'>+		                hw-&gt;mac.mc_filter_type);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *  ixgbe_setup_fc - Configure flow control settings</div><div class='add'>+ *  ixgbe_disable_mc_generic - Disable multicast address in RAR</div><div class='ctx'>  *  @hw: pointer to hardware structure</div><div class='del'>- *  @packetbuf_num: packet buffer number (0-7)</div><div class='ctx'>  *</div><div class='del'>- *  Configures the flow control settings based on SW configuration.</div><div class='del'>- *  This function is used for 802.3x flow control configuration only.</div><div class='add'>+ *  Disables multicast address in RAR and the use of the multicast hash table.</div><div class='ctx'>  **/</div><div class='del'>-s32 ixgbe_setup_fc(struct ixgbe_hw *hw, s32 packetbuf_num)</div><div class='add'>+s32 ixgbe_disable_mc_generic(struct ixgbe_hw *hw)</div><div class='ctx'> {</div><div class='del'>-	u32 frctl_reg;</div><div class='del'>-	u32 rmcs_reg;</div><div class='del'>-</div><div class='del'>-	if (packetbuf_num &lt; 0 || packetbuf_num &gt; 7)</div><div class='del'>-		hw_dbg(hw, "Invalid packet buffer number [%d], expected range "</div><div class='del'>-		       "is 0-7\n", packetbuf_num);</div><div class='del'>-</div><div class='del'>-	frctl_reg = IXGBE_READ_REG(hw, IXGBE_FCTRL);</div><div class='del'>-	frctl_reg &amp;= ~(IXGBE_FCTRL_RFCE | IXGBE_FCTRL_RPFCE);</div><div class='del'>-</div><div class='del'>-	rmcs_reg = IXGBE_READ_REG(hw, IXGBE_RMCS);</div><div class='del'>-	rmcs_reg &amp;= ~(IXGBE_RMCS_TFCE_PRIORITY | IXGBE_RMCS_TFCE_802_3X);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We want to save off the original Flow Control configuration just in</div><div class='del'>-	 * case we get disconnected and then reconnected into a different hub</div><div class='del'>-	 * or switch with different Flow Control capabilities.</div><div class='del'>-	 */</div><div class='del'>-	hw-&gt;fc.type = hw-&gt;fc.original_type;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * The possible values of the "flow_control" parameter are:</div><div class='del'>-	 * 0: Flow control is completely disabled</div><div class='del'>-	 * 1: Rx flow control is enabled (we can receive pause frames but not</div><div class='del'>-	 *    send pause frames).</div><div class='del'>-	 * 2: Tx flow control is enabled (we can send pause frames but we do not</div><div class='del'>-	 *    support receiving pause frames)</div><div class='del'>-	 * 3: Both Rx and TX flow control (symmetric) are enabled.</div><div class='del'>-	 * other: Invalid.</div><div class='del'>-	 */</div><div class='del'>-	switch (hw-&gt;fc.type) {</div><div class='del'>-	case ixgbe_fc_none:</div><div class='del'>-		break;</div><div class='del'>-	case ixgbe_fc_rx_pause:</div><div class='del'>-		/*</div><div class='del'>-		 * RX Flow control is enabled,</div><div class='del'>-		 * and TX Flow control is disabled.</div><div class='del'>-		 */</div><div class='del'>-		frctl_reg |= IXGBE_FCTRL_RFCE;</div><div class='del'>-		break;</div><div class='del'>-	case ixgbe_fc_tx_pause:</div><div class='del'>-		/*</div><div class='del'>-		 * TX Flow control is enabled, and RX Flow control is disabled,</div><div class='del'>-		 * by a software over-ride.</div><div class='del'>-		 */</div><div class='del'>-		rmcs_reg |= IXGBE_RMCS_TFCE_802_3X;</div><div class='del'>-		break;</div><div class='del'>-	case ixgbe_fc_full:</div><div class='del'>-		/*</div><div class='del'>-		 * Flow control (both RX and TX) is enabled by a software</div><div class='del'>-		 * over-ride.</div><div class='del'>-		 */</div><div class='del'>-		frctl_reg |= IXGBE_FCTRL_RFCE;</div><div class='del'>-		rmcs_reg |= IXGBE_RMCS_TFCE_802_3X;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		/* We should never get here.  The value should be 0-3. */</div><div class='del'>-		hw_dbg(hw, "Flow control param set incorrectly\n");</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Enable 802.3x based flow control settings. */</div><div class='del'>-	IXGBE_WRITE_REG(hw, IXGBE_FCTRL, frctl_reg);</div><div class='del'>-	IXGBE_WRITE_REG(hw, IXGBE_RMCS, rmcs_reg);</div><div class='add'>+	u32 i;</div><div class='add'>+	u32 rar_entries = hw-&gt;mac.num_rar_entries;</div><div class='add'>+	struct ixgbe_addr_filter_info *a = &amp;hw-&gt;addr_ctrl;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * We need to set up the Receive Threshold high and low water</div><div class='del'>-	 * marks as well as (optionally) enabling the transmission of</div><div class='del'>-	 * XON frames.</div><div class='del'>-	 */</div><div class='del'>-	if (hw-&gt;fc.type &amp; ixgbe_fc_tx_pause) {</div><div class='del'>-		if (hw-&gt;fc.send_xon) {</div><div class='del'>-			IXGBE_WRITE_REG(hw, IXGBE_FCRTL(packetbuf_num),</div><div class='del'>-					(hw-&gt;fc.low_water | IXGBE_FCRTL_XONE));</div><div class='del'>-		} else {</div><div class='del'>-			IXGBE_WRITE_REG(hw, IXGBE_FCRTL(packetbuf_num),</div><div class='del'>-					hw-&gt;fc.low_water);</div><div class='del'>-		}</div><div class='del'>-		IXGBE_WRITE_REG(hw, IXGBE_FCRTH(packetbuf_num),</div><div class='del'>-				(hw-&gt;fc.high_water)|IXGBE_FCRTH_FCEN);</div><div class='del'>-	}</div><div class='add'>+	if (a-&gt;mc_addr_in_rar_count &gt; 0)</div><div class='add'>+		for (i = (rar_entries - a-&gt;mc_addr_in_rar_count);</div><div class='add'>+		     i &lt; rar_entries; i++)</div><div class='add'>+			ixgbe_disable_rar(hw, i);</div><div class='ctx'> </div><div class='del'>-	IXGBE_WRITE_REG(hw, IXGBE_FCTTV(0), hw-&gt;fc.pause_time);</div><div class='del'>-	IXGBE_WRITE_REG(hw, IXGBE_FCRTV, (hw-&gt;fc.pause_time &gt;&gt; 1));</div><div class='add'>+	if (a-&gt;mta_in_use &gt; 0)</div><div class='add'>+		IXGBE_WRITE_REG(hw, IXGBE_MCSTCTRL, hw-&gt;mac.mc_filter_type);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1049,13 +1500,24 @@ s32 ixgbe_setup_fc(struct ixgbe_hw *hw, s32 packetbuf_num)</div><div class='ctx'>  **/</div><div class='ctx'> s32 ixgbe_disable_pcie_master(struct ixgbe_hw *hw)</div><div class='ctx'> {</div><div class='del'>-	u32 ctrl;</div><div class='del'>-	s32 i;</div><div class='add'>+	u32 i;</div><div class='add'>+	u32 reg_val;</div><div class='add'>+	u32 number_of_queues;</div><div class='ctx'> 	s32 status = IXGBE_ERR_MASTER_REQUESTS_PENDING;</div><div class='ctx'> </div><div class='del'>-	ctrl = IXGBE_READ_REG(hw, IXGBE_CTRL);</div><div class='del'>-	ctrl |= IXGBE_CTRL_GIO_DIS;</div><div class='del'>-	IXGBE_WRITE_REG(hw, IXGBE_CTRL, ctrl);</div><div class='add'>+	/* Disable the receive unit by stopping each queue */</div><div class='add'>+	number_of_queues = hw-&gt;mac.max_rx_queues;</div><div class='add'>+	for (i = 0; i &lt; number_of_queues; i++) {</div><div class='add'>+		reg_val = IXGBE_READ_REG(hw, IXGBE_RXDCTL(i));</div><div class='add'>+		if (reg_val &amp; IXGBE_RXDCTL_ENABLE) {</div><div class='add'>+			reg_val &amp;= ~IXGBE_RXDCTL_ENABLE;</div><div class='add'>+			IXGBE_WRITE_REG(hw, IXGBE_RXDCTL(i), reg_val);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	reg_val = IXGBE_READ_REG(hw, IXGBE_CTRL);</div><div class='add'>+	reg_val |= IXGBE_CTRL_GIO_DIS;</div><div class='add'>+	IXGBE_WRITE_REG(hw, IXGBE_CTRL, reg_val);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; IXGBE_PCI_MASTER_DISABLE_TIMEOUT; i++) {</div><div class='ctx'> 		if (!(IXGBE_READ_REG(hw, IXGBE_STATUS) &amp; IXGBE_STATUS_GIO)) {</div><div class='hunk'>@@ -1070,11 +1532,11 @@ s32 ixgbe_disable_pcie_master(struct ixgbe_hw *hw)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *  ixgbe_acquire_swfw_sync - Aquire SWFW semaphore</div><div class='add'>+ *  ixgbe_acquire_swfw_sync - Acquire SWFW semaphore</div><div class='ctx'>  *  @hw: pointer to hardware structure</div><div class='del'>- *  @mask: Mask to specify wich semaphore to acquire</div><div class='add'>+ *  @mask: Mask to specify which semaphore to acquire</div><div class='ctx'>  *</div><div class='del'>- *  Aquires the SWFW semaphore throught the GSSR register for the specified</div><div class='add'>+ *  Acquires the SWFW semaphore thought the GSSR register for the specified</div><div class='ctx'>  *  function (CSR, PHY0, PHY1, EEPROM, Flash)</div><div class='ctx'>  **/</div><div class='ctx'> s32 ixgbe_acquire_swfw_sync(struct ixgbe_hw *hw, u16 mask)</div><div class='hunk'>@@ -1116,9 +1578,9 @@ s32 ixgbe_acquire_swfw_sync(struct ixgbe_hw *hw, u16 mask)</div><div class='ctx'> /**</div><div class='ctx'>  *  ixgbe_release_swfw_sync - Release SWFW semaphore</div><div class='ctx'>  *  @hw: pointer to hardware structure</div><div class='del'>- *  @mask: Mask to specify wich semaphore to release</div><div class='add'>+ *  @mask: Mask to specify which semaphore to release</div><div class='ctx'>  *</div><div class='del'>- *  Releases the SWFW semaphore throught the GSSR register for the specified</div><div class='add'>+ *  Releases the SWFW semaphore thought the GSSR register for the specified</div><div class='ctx'>  *  function (CSR, PHY0, PHY1, EEPROM, Flash)</div><div class='ctx'>  **/</div><div class='ctx'> void ixgbe_release_swfw_sync(struct ixgbe_hw *hw, u16 mask)</div><div class='hunk'>@@ -1135,45 +1597,3 @@ void ixgbe_release_swfw_sync(struct ixgbe_hw *hw, u16 mask)</div><div class='ctx'> 	ixgbe_release_eeprom_semaphore(hw);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- *  ixgbe_read_analog_reg8 - Reads 8 bit Atlas analog register</div><div class='del'>- *  @hw: pointer to hardware structure</div><div class='del'>- *  @reg: analog register to read</div><div class='del'>- *  @val: read value</div><div class='del'>- *</div><div class='del'>- *  Performs write operation to analog register specified.</div><div class='del'>- **/</div><div class='del'>-s32 ixgbe_read_analog_reg8(struct ixgbe_hw *hw, u32 reg, u8 *val)</div><div class='del'>-{</div><div class='del'>-	u32  atlas_ctl;</div><div class='del'>-</div><div class='del'>-	IXGBE_WRITE_REG(hw, IXGBE_ATLASCTL,</div><div class='del'>-			IXGBE_ATLASCTL_WRITE_CMD | (reg &lt;&lt; 8));</div><div class='del'>-	IXGBE_WRITE_FLUSH(hw);</div><div class='del'>-	udelay(10);</div><div class='del'>-	atlas_ctl = IXGBE_READ_REG(hw, IXGBE_ATLASCTL);</div><div class='del'>-	*val = (u8)atlas_ctl;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *  ixgbe_write_analog_reg8 - Writes 8 bit Atlas analog register</div><div class='del'>- *  @hw: pointer to hardware structure</div><div class='del'>- *  @reg: atlas register to write</div><div class='del'>- *  @val: value to write</div><div class='del'>- *</div><div class='del'>- *  Performs write operation to Atlas analog register specified.</div><div class='del'>- **/</div><div class='del'>-s32 ixgbe_write_analog_reg8(struct ixgbe_hw *hw, u32 reg, u8 val)</div><div class='del'>-{</div><div class='del'>-	u32  atlas_ctl;</div><div class='del'>-</div><div class='del'>-	atlas_ctl = (reg &lt;&lt; 8) | val;</div><div class='del'>-	IXGBE_WRITE_REG(hw, IXGBE_ATLASCTL, atlas_ctl);</div><div class='del'>-	IXGBE_WRITE_FLUSH(hw);</div><div class='del'>-	udelay(10);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/drivers/net/ixgbe/ixgbe_common.h b/drivers/net/ixgbe/ixgbe_common.h<br/>index de6ddd5d04ad..192f8d012911 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/ixgbe/ixgbe_common.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/ixgbe/ixgbe_common.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/ixgbe/ixgbe_common.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/ixgbe/ixgbe_common.h</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*******************************************************************************</div><div class='ctx'> </div><div class='ctx'>   Intel 10 Gigabit PCI Express Linux driver</div><div class='del'>-  Copyright(c) 1999 - 2007 Intel Corporation.</div><div class='add'>+  Copyright(c) 1999 - 2008 Intel Corporation.</div><div class='ctx'> </div><div class='ctx'>   This program is free software; you can redistribute it and/or modify it</div><div class='ctx'>   under the terms and conditions of the GNU General Public License,</div><div class='hunk'>@@ -20,7 +20,6 @@</div><div class='ctx'>   the file called "COPYING".</div><div class='ctx'> </div><div class='ctx'>   Contact Information:</div><div class='del'>-  Linux NICS &lt;linux.nics@intel.com&gt;</div><div class='ctx'>   e1000-devel Mailing List &lt;e1000-devel@lists.sourceforge.net&gt;</div><div class='ctx'>   Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='ctx'> </div><div class='hunk'>@@ -31,34 +30,45 @@</div><div class='ctx'> </div><div class='ctx'> #include "ixgbe_type.h"</div><div class='ctx'> </div><div class='del'>-s32 ixgbe_init_hw(struct ixgbe_hw *hw);</div><div class='del'>-s32 ixgbe_start_hw(struct ixgbe_hw *hw);</div><div class='del'>-s32 ixgbe_get_mac_addr(struct ixgbe_hw *hw, u8 *mac_addr);</div><div class='del'>-s32 ixgbe_stop_adapter(struct ixgbe_hw *hw);</div><div class='del'>-s32 ixgbe_read_part_num(struct ixgbe_hw *hw, u32 *part_num);</div><div class='add'>+s32 ixgbe_init_ops_generic(struct ixgbe_hw *hw);</div><div class='add'>+s32 ixgbe_init_hw_generic(struct ixgbe_hw *hw);</div><div class='add'>+s32 ixgbe_start_hw_generic(struct ixgbe_hw *hw);</div><div class='add'>+s32 ixgbe_clear_hw_cntrs_generic(struct ixgbe_hw *hw);</div><div class='add'>+s32 ixgbe_read_pba_num_generic(struct ixgbe_hw *hw, u32 *pba_num);</div><div class='add'>+s32 ixgbe_get_mac_addr_generic(struct ixgbe_hw *hw, u8 *mac_addr);</div><div class='add'>+s32 ixgbe_get_bus_info_generic(struct ixgbe_hw *hw);</div><div class='add'>+s32 ixgbe_stop_adapter_generic(struct ixgbe_hw *hw);</div><div class='add'>+</div><div class='add'>+s32 ixgbe_led_on_generic(struct ixgbe_hw *hw, u32 index);</div><div class='add'>+s32 ixgbe_led_off_generic(struct ixgbe_hw *hw, u32 index);</div><div class='add'>+</div><div class='add'>+s32 ixgbe_init_eeprom_params_generic(struct ixgbe_hw *hw);</div><div class='add'>+s32 ixgbe_read_eeprom_generic(struct ixgbe_hw *hw, u16 offset, u16 *data);</div><div class='add'>+s32 ixgbe_read_eeprom_bit_bang_generic(struct ixgbe_hw *hw, u16 offset,</div><div class='add'>+                                       u16 *data);</div><div class='add'>+s32 ixgbe_validate_eeprom_checksum_generic(struct ixgbe_hw *hw,</div><div class='add'>+                                           u16 *checksum_val);</div><div class='add'>+s32 ixgbe_update_eeprom_checksum_generic(struct ixgbe_hw *hw);</div><div class='add'>+</div><div class='add'>+s32 ixgbe_set_rar_generic(struct ixgbe_hw *hw, u32 index, u8 *addr, u32 vmdq,</div><div class='add'>+                          u32 enable_addr);</div><div class='add'>+s32 ixgbe_clear_rar_generic(struct ixgbe_hw *hw, u32 index);</div><div class='add'>+s32 ixgbe_init_rx_addrs_generic(struct ixgbe_hw *hw);</div><div class='add'>+s32 ixgbe_update_mc_addr_list_generic(struct ixgbe_hw *hw, u8 *mc_addr_list,</div><div class='add'>+                                      u32 mc_addr_count,</div><div class='add'>+                                      ixgbe_mc_addr_itr func);</div><div class='add'>+s32 ixgbe_update_uc_addr_list_generic(struct ixgbe_hw *hw, u8 *addr_list,</div><div class='add'>+                                      u32 addr_count, ixgbe_mc_addr_itr func);</div><div class='add'>+s32 ixgbe_enable_mc_generic(struct ixgbe_hw *hw);</div><div class='add'>+s32 ixgbe_disable_mc_generic(struct ixgbe_hw *hw);</div><div class='ctx'> </div><div class='del'>-s32 ixgbe_led_on(struct ixgbe_hw *hw, u32 index);</div><div class='del'>-s32 ixgbe_led_off(struct ixgbe_hw *hw, u32 index);</div><div class='del'>-</div><div class='del'>-s32 ixgbe_init_eeprom(struct ixgbe_hw *hw);</div><div class='del'>-s32 ixgbe_read_eeprom(struct ixgbe_hw *hw, u16 offset, u16 *data);</div><div class='del'>-s32 ixgbe_validate_eeprom_checksum(struct ixgbe_hw *hw, u16 *checksum_val);</div><div class='del'>-</div><div class='del'>-s32 ixgbe_set_rar(struct ixgbe_hw *hw, u32 index, u8 *addr, u32 vind,</div><div class='del'>-		  u32 enable_addr);</div><div class='del'>-s32 ixgbe_update_mc_addr_list(struct ixgbe_hw *hw, u8 *mc_addr_list,</div><div class='del'>-			      u32 mc_addr_count, u32 pad);</div><div class='del'>-s32 ixgbe_set_vfta(struct ixgbe_hw *hw, u32 vlan, u32 vind, bool vlan_on);</div><div class='ctx'> s32 ixgbe_validate_mac_addr(u8 *mac_addr);</div><div class='del'>-</div><div class='del'>-s32 ixgbe_setup_fc(struct ixgbe_hw *hw, s32 packtetbuf_num);</div><div class='del'>-</div><div class='ctx'> s32 ixgbe_acquire_swfw_sync(struct ixgbe_hw *hw, u16 mask);</div><div class='ctx'> void ixgbe_release_swfw_sync(struct ixgbe_hw *hw, u16 mask);</div><div class='ctx'> s32 ixgbe_disable_pcie_master(struct ixgbe_hw *hw);</div><div class='ctx'> </div><div class='del'>-s32 ixgbe_read_analog_reg8(struct ixgbe_hw *hw, u32 reg, u8 *val);</div><div class='del'>-s32 ixgbe_write_analog_reg8(struct ixgbe_hw *hw, u32 reg, u8 val);</div><div class='add'>+s32 ixgbe_read_analog_reg8_generic(struct ixgbe_hw *hw, u32 reg, u8 *val);</div><div class='add'>+s32 ixgbe_write_analog_reg8_generic(struct ixgbe_hw *hw, u32 reg, u8 val);</div><div class='ctx'> </div><div class='ctx'> #define IXGBE_WRITE_REG(a, reg, value) writel((value), ((a)-&gt;hw_addr + (reg)))</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ixgbe/ixgbe_ethtool.c b/drivers/net/ixgbe/ixgbe_ethtool.c<br/>index 3efe5dda10af..81a9c4b86726 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/ixgbe/ixgbe_ethtool.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/ixgbe/ixgbe_ethtool.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/ixgbe/ixgbe_ethtool.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/ixgbe/ixgbe_ethtool.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*******************************************************************************</div><div class='ctx'> </div><div class='ctx'>   Intel 10 Gigabit PCI Express Linux driver</div><div class='del'>-  Copyright(c) 1999 - 2007 Intel Corporation.</div><div class='add'>+  Copyright(c) 1999 - 2008 Intel Corporation.</div><div class='ctx'> </div><div class='ctx'>   This program is free software; you can redistribute it and/or modify it</div><div class='ctx'>   under the terms and conditions of the GNU General Public License,</div><div class='hunk'>@@ -20,7 +20,6 @@</div><div class='ctx'>   the file called "COPYING".</div><div class='ctx'> </div><div class='ctx'>   Contact Information:</div><div class='del'>-  Linux NICS &lt;linux.nics@intel.com&gt;</div><div class='ctx'>   e1000-devel Mailing List &lt;e1000-devel@lists.sourceforge.net&gt;</div><div class='ctx'>   Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='ctx'> </div><div class='hunk'>@@ -48,7 +47,7 @@ struct ixgbe_stats {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define IXGBE_STAT(m) sizeof(((struct ixgbe_adapter *)0)-&gt;m), \</div><div class='del'>-		      offsetof(struct ixgbe_adapter, m)</div><div class='add'>+                             offsetof(struct ixgbe_adapter, m)</div><div class='ctx'> static struct ixgbe_stats ixgbe_gstrings_stats[] = {</div><div class='ctx'> 	{"rx_packets", IXGBE_STAT(net_stats.rx_packets)},</div><div class='ctx'> 	{"tx_packets", IXGBE_STAT(net_stats.tx_packets)},</div><div class='hunk'>@@ -95,14 +94,15 @@ static struct ixgbe_stats ixgbe_gstrings_stats[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define IXGBE_QUEUE_STATS_LEN \</div><div class='del'>-		((((struct ixgbe_adapter *)netdev-&gt;priv)-&gt;num_tx_queues + \</div><div class='del'>-		 ((struct ixgbe_adapter *)netdev-&gt;priv)-&gt;num_rx_queues) * \</div><div class='del'>-		 (sizeof(struct ixgbe_queue_stats) / sizeof(u64)))</div><div class='del'>-#define IXGBE_GLOBAL_STATS_LEN	ARRAY_SIZE(ixgbe_gstrings_stats)</div><div class='add'>+                ((((struct ixgbe_adapter *)netdev-&gt;priv)-&gt;num_tx_queues + \</div><div class='add'>+                 ((struct ixgbe_adapter *)netdev-&gt;priv)-&gt;num_rx_queues) * \</div><div class='add'>+                 (sizeof(struct ixgbe_queue_stats) / sizeof(u64)))</div><div class='add'>+#define IXGBE_STATS_LEN (IXGBE_GLOBAL_STATS_LEN + IXGBE_QUEUE_STATS_LEN)</div><div class='add'>+#define IXGBE_GLOBAL_STATS_LEN ARRAY_SIZE(ixgbe_gstrings_stats)</div><div class='ctx'> #define IXGBE_STATS_LEN (IXGBE_GLOBAL_STATS_LEN + IXGBE_QUEUE_STATS_LEN)</div><div class='ctx'> </div><div class='ctx'> static int ixgbe_get_settings(struct net_device *netdev,</div><div class='del'>-			      struct ethtool_cmd *ecmd)</div><div class='add'>+                              struct ethtool_cmd *ecmd)</div><div class='ctx'> {</div><div class='ctx'> 	struct ixgbe_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> 	struct ixgbe_hw *hw = &amp;adapter-&gt;hw;</div><div class='hunk'>@@ -114,7 +114,7 @@ static int ixgbe_get_settings(struct net_device *netdev,</div><div class='ctx'> 	ecmd-&gt;transceiver = XCVR_EXTERNAL;</div><div class='ctx'> 	if (hw-&gt;phy.media_type == ixgbe_media_type_copper) {</div><div class='ctx'> 		ecmd-&gt;supported |= (SUPPORTED_1000baseT_Full |</div><div class='del'>-				    SUPPORTED_TP | SUPPORTED_Autoneg);</div><div class='add'>+		                    SUPPORTED_TP | SUPPORTED_Autoneg);</div><div class='ctx'> </div><div class='ctx'> 		ecmd-&gt;advertising = (ADVERTISED_TP | ADVERTISED_Autoneg);</div><div class='ctx'> 		if (hw-&gt;phy.autoneg_advertised &amp; IXGBE_LINK_SPEED_10GB_FULL)</div><div class='hunk'>@@ -126,14 +126,15 @@ static int ixgbe_get_settings(struct net_device *netdev,</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ecmd-&gt;supported |= SUPPORTED_FIBRE;</div><div class='ctx'> 		ecmd-&gt;advertising = (ADVERTISED_10000baseT_Full |</div><div class='del'>-				     ADVERTISED_FIBRE);</div><div class='add'>+		                     ADVERTISED_FIBRE);</div><div class='ctx'> 		ecmd-&gt;port = PORT_FIBRE;</div><div class='add'>+		ecmd-&gt;autoneg = AUTONEG_DISABLE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	adapter-&gt;hw.mac.ops.check_link(hw, &amp;(link_speed), &amp;link_up);</div><div class='add'>+	hw-&gt;mac.ops.check_link(hw, &amp;link_speed, &amp;link_up, false);</div><div class='ctx'> 	if (link_up) {</div><div class='ctx'> 		ecmd-&gt;speed = (link_speed == IXGBE_LINK_SPEED_10GB_FULL) ?</div><div class='del'>-				SPEED_10000 : SPEED_1000;</div><div class='add'>+		               SPEED_10000 : SPEED_1000;</div><div class='ctx'> 		ecmd-&gt;duplex = DUPLEX_FULL;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ecmd-&gt;speed = -1;</div><div class='hunk'>@@ -144,7 +145,7 @@ static int ixgbe_get_settings(struct net_device *netdev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ixgbe_set_settings(struct net_device *netdev,</div><div class='del'>-			      struct ethtool_cmd *ecmd)</div><div class='add'>+                              struct ethtool_cmd *ecmd)</div><div class='ctx'> {</div><div class='ctx'> 	struct ixgbe_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> 	struct ixgbe_hw *hw = &amp;adapter-&gt;hw;</div><div class='hunk'>@@ -164,7 +165,7 @@ static int ixgbe_set_settings(struct net_device *netdev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ixgbe_get_pauseparam(struct net_device *netdev,</div><div class='del'>-				 struct ethtool_pauseparam *pause)</div><div class='add'>+                                 struct ethtool_pauseparam *pause)</div><div class='ctx'> {</div><div class='ctx'> 	struct ixgbe_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> 	struct ixgbe_hw *hw = &amp;adapter-&gt;hw;</div><div class='hunk'>@@ -182,7 +183,7 @@ static void ixgbe_get_pauseparam(struct net_device *netdev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ixgbe_set_pauseparam(struct net_device *netdev,</div><div class='del'>-				struct ethtool_pauseparam *pause)</div><div class='add'>+                                struct ethtool_pauseparam *pause)</div><div class='ctx'> {</div><div class='ctx'> 	struct ixgbe_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> 	struct ixgbe_hw *hw = &amp;adapter-&gt;hw;</div><div class='hunk'>@@ -233,15 +234,15 @@ static int ixgbe_set_rx_csum(struct net_device *netdev, u32 data)</div><div class='ctx'> </div><div class='ctx'> static u32 ixgbe_get_tx_csum(struct net_device *netdev)</div><div class='ctx'> {</div><div class='del'>-	return (netdev-&gt;features &amp; NETIF_F_HW_CSUM) != 0;</div><div class='add'>+	return (netdev-&gt;features &amp; NETIF_F_IP_CSUM) != 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ixgbe_set_tx_csum(struct net_device *netdev, u32 data)</div><div class='ctx'> {</div><div class='ctx'> 	if (data)</div><div class='del'>-		netdev-&gt;features |= NETIF_F_HW_CSUM;</div><div class='add'>+		netdev-&gt;features |= (NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM);</div><div class='ctx'> 	else</div><div class='del'>-		netdev-&gt;features &amp;= ~NETIF_F_HW_CSUM;</div><div class='add'>+		netdev-&gt;features &amp;= ~(NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -281,7 +282,7 @@ static int ixgbe_get_regs_len(struct net_device *netdev)</div><div class='ctx'> #define IXGBE_GET_STAT(_A_, _R_) _A_-&gt;stats._R_</div><div class='ctx'> </div><div class='ctx'> static void ixgbe_get_regs(struct net_device *netdev,</div><div class='del'>-			   struct ethtool_regs *regs, void *p)</div><div class='add'>+                           struct ethtool_regs *regs, void *p)</div><div class='ctx'> {</div><div class='ctx'> 	struct ixgbe_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> 	struct ixgbe_hw *hw = &amp;adapter-&gt;hw;</div><div class='hunk'>@@ -315,7 +316,9 @@ static void ixgbe_get_regs(struct net_device *netdev,</div><div class='ctx'> 	regs_buff[17] = IXGBE_READ_REG(hw, IXGBE_GRC);</div><div class='ctx'> </div><div class='ctx'> 	/* Interrupt */</div><div class='del'>-	regs_buff[18] = IXGBE_READ_REG(hw, IXGBE_EICR);</div><div class='add'>+	/* don't read EICR because it can clear interrupt causes, instead</div><div class='add'>+	 * read EICS which is a shadow but doesn't clear EICR */</div><div class='add'>+	regs_buff[18] = IXGBE_READ_REG(hw, IXGBE_EICS);</div><div class='ctx'> 	regs_buff[19] = IXGBE_READ_REG(hw, IXGBE_EICS);</div><div class='ctx'> 	regs_buff[20] = IXGBE_READ_REG(hw, IXGBE_EIMS);</div><div class='ctx'> 	regs_buff[21] = IXGBE_READ_REG(hw, IXGBE_EIMC);</div><div class='hunk'>@@ -325,7 +328,7 @@ static void ixgbe_get_regs(struct net_device *netdev,</div><div class='ctx'> 	regs_buff[25] = IXGBE_READ_REG(hw, IXGBE_IVAR(0));</div><div class='ctx'> 	regs_buff[26] = IXGBE_READ_REG(hw, IXGBE_MSIXT);</div><div class='ctx'> 	regs_buff[27] = IXGBE_READ_REG(hw, IXGBE_MSIXPBA);</div><div class='del'>-	regs_buff[28] = IXGBE_READ_REG(hw, IXGBE_PBACL);</div><div class='add'>+	regs_buff[28] = IXGBE_READ_REG(hw, IXGBE_PBACL(0));</div><div class='ctx'> 	regs_buff[29] = IXGBE_READ_REG(hw, IXGBE_GPIE);</div><div class='ctx'> </div><div class='ctx'> 	/* Flow Control */</div><div class='hunk'>@@ -371,7 +374,7 @@ static void ixgbe_get_regs(struct net_device *netdev,</div><div class='ctx'> 		regs_buff[482 + i] = IXGBE_READ_REG(hw, IXGBE_RAL(i));</div><div class='ctx'> 	for (i = 0; i &lt; 16; i++)</div><div class='ctx'> 		regs_buff[498 + i] = IXGBE_READ_REG(hw, IXGBE_RAH(i));</div><div class='del'>-	regs_buff[514] = IXGBE_READ_REG(hw, IXGBE_PSRTYPE);</div><div class='add'>+	regs_buff[514] = IXGBE_READ_REG(hw, IXGBE_PSRTYPE(0));</div><div class='ctx'> 	regs_buff[515] = IXGBE_READ_REG(hw, IXGBE_FCTRL);</div><div class='ctx'> 	regs_buff[516] = IXGBE_READ_REG(hw, IXGBE_VLNCTRL);</div><div class='ctx'> 	regs_buff[517] = IXGBE_READ_REG(hw, IXGBE_MCSTCTRL);</div><div class='hunk'>@@ -419,7 +422,6 @@ static void ixgbe_get_regs(struct net_device *netdev,</div><div class='ctx'> 	regs_buff[827] = IXGBE_READ_REG(hw, IXGBE_WUPM);</div><div class='ctx'> 	regs_buff[828] = IXGBE_READ_REG(hw, IXGBE_FHFT);</div><div class='ctx'> </div><div class='del'>-	/* DCE */</div><div class='ctx'> 	regs_buff[829] = IXGBE_READ_REG(hw, IXGBE_RMCS);</div><div class='ctx'> 	regs_buff[830] = IXGBE_READ_REG(hw, IXGBE_DPMCS);</div><div class='ctx'> 	regs_buff[831] = IXGBE_READ_REG(hw, IXGBE_PDPMCS);</div><div class='hunk'>@@ -539,21 +541,17 @@ static void ixgbe_get_regs(struct net_device *netdev,</div><div class='ctx'> 	/* Diagnostic */</div><div class='ctx'> 	regs_buff[1071] = IXGBE_READ_REG(hw, IXGBE_RDSTATCTL);</div><div class='ctx'> 	for (i = 0; i &lt; 8; i++)</div><div class='del'>-		regs_buff[1072] = IXGBE_READ_REG(hw, IXGBE_RDSTAT(i));</div><div class='add'>+		regs_buff[1072 + i] = IXGBE_READ_REG(hw, IXGBE_RDSTAT(i));</div><div class='ctx'> 	regs_buff[1080] = IXGBE_READ_REG(hw, IXGBE_RDHMPN);</div><div class='del'>-	regs_buff[1081] = IXGBE_READ_REG(hw, IXGBE_RIC_DW0);</div><div class='del'>-	regs_buff[1082] = IXGBE_READ_REG(hw, IXGBE_RIC_DW1);</div><div class='del'>-	regs_buff[1083] = IXGBE_READ_REG(hw, IXGBE_RIC_DW2);</div><div class='del'>-	regs_buff[1084] = IXGBE_READ_REG(hw, IXGBE_RIC_DW3);</div><div class='add'>+	for (i = 0; i &lt; 4; i++)</div><div class='add'>+		regs_buff[1081 + i] = IXGBE_READ_REG(hw, IXGBE_RIC_DW(i));</div><div class='ctx'> 	regs_buff[1085] = IXGBE_READ_REG(hw, IXGBE_RDPROBE);</div><div class='ctx'> 	regs_buff[1086] = IXGBE_READ_REG(hw, IXGBE_TDSTATCTL);</div><div class='ctx'> 	for (i = 0; i &lt; 8; i++)</div><div class='del'>-		regs_buff[1087] = IXGBE_READ_REG(hw, IXGBE_TDSTAT(i));</div><div class='add'>+		regs_buff[1087 + i] = IXGBE_READ_REG(hw, IXGBE_TDSTAT(i));</div><div class='ctx'> 	regs_buff[1095] = IXGBE_READ_REG(hw, IXGBE_TDHMPN);</div><div class='del'>-	regs_buff[1096] = IXGBE_READ_REG(hw, IXGBE_TIC_DW0);</div><div class='del'>-	regs_buff[1097] = IXGBE_READ_REG(hw, IXGBE_TIC_DW1);</div><div class='del'>-	regs_buff[1098] = IXGBE_READ_REG(hw, IXGBE_TIC_DW2);</div><div class='del'>-	regs_buff[1099] = IXGBE_READ_REG(hw, IXGBE_TIC_DW3);</div><div class='add'>+	for (i = 0; i &lt; 4; i++)</div><div class='add'>+		regs_buff[1096 + i] = IXGBE_READ_REG(hw, IXGBE_TIC_DW(i));</div><div class='ctx'> 	regs_buff[1100] = IXGBE_READ_REG(hw, IXGBE_TDPROBE);</div><div class='ctx'> 	regs_buff[1101] = IXGBE_READ_REG(hw, IXGBE_TXBUFCTRL);</div><div class='ctx'> 	regs_buff[1102] = IXGBE_READ_REG(hw, IXGBE_TXBUFDATA0);</div><div class='hunk'>@@ -566,7 +564,7 @@ static void ixgbe_get_regs(struct net_device *netdev,</div><div class='ctx'> 	regs_buff[1109] = IXGBE_READ_REG(hw, IXGBE_RXBUFDATA2);</div><div class='ctx'> 	regs_buff[1110] = IXGBE_READ_REG(hw, IXGBE_RXBUFDATA3);</div><div class='ctx'> 	for (i = 0; i &lt; 8; i++)</div><div class='del'>-		regs_buff[1111] = IXGBE_READ_REG(hw, IXGBE_PCIE_DIAG(i));</div><div class='add'>+		regs_buff[1111 + i] = IXGBE_READ_REG(hw, IXGBE_PCIE_DIAG(i));</div><div class='ctx'> 	regs_buff[1119] = IXGBE_READ_REG(hw, IXGBE_RFVAL);</div><div class='ctx'> 	regs_buff[1120] = IXGBE_READ_REG(hw, IXGBE_MDFTC1);</div><div class='ctx'> 	regs_buff[1121] = IXGBE_READ_REG(hw, IXGBE_MDFTC2);</div><div class='hunk'>@@ -585,7 +583,7 @@ static int ixgbe_get_eeprom_len(struct net_device *netdev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ixgbe_get_eeprom(struct net_device *netdev,</div><div class='del'>-			    struct ethtool_eeprom *eeprom, u8 *bytes)</div><div class='add'>+                            struct ethtool_eeprom *eeprom, u8 *bytes)</div><div class='ctx'> {</div><div class='ctx'> 	struct ixgbe_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> 	struct ixgbe_hw *hw = &amp;adapter-&gt;hw;</div><div class='hunk'>@@ -608,8 +606,8 @@ static int ixgbe_get_eeprom(struct net_device *netdev,</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; eeprom_len; i++) {</div><div class='del'>-		if ((ret_val = ixgbe_read_eeprom(hw, first_word + i,</div><div class='del'>-						 &amp;eeprom_buff[i])))</div><div class='add'>+		if ((ret_val = hw-&gt;eeprom.ops.read(hw, first_word + i,</div><div class='add'>+		    &amp;eeprom_buff[i])))</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -624,7 +622,7 @@ static int ixgbe_get_eeprom(struct net_device *netdev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ixgbe_get_drvinfo(struct net_device *netdev,</div><div class='del'>-			      struct ethtool_drvinfo *drvinfo)</div><div class='add'>+                              struct ethtool_drvinfo *drvinfo)</div><div class='ctx'> {</div><div class='ctx'> 	struct ixgbe_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> </div><div class='hunk'>@@ -637,7 +635,7 @@ static void ixgbe_get_drvinfo(struct net_device *netdev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ixgbe_get_ringparam(struct net_device *netdev,</div><div class='del'>-				struct ethtool_ringparam *ring)</div><div class='add'>+                                struct ethtool_ringparam *ring)</div><div class='ctx'> {</div><div class='ctx'> 	struct ixgbe_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> 	struct ixgbe_ring *tx_ring = adapter-&gt;tx_ring;</div><div class='hunk'>@@ -654,15 +652,12 @@ static void ixgbe_get_ringparam(struct net_device *netdev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ixgbe_set_ringparam(struct net_device *netdev,</div><div class='del'>-			       struct ethtool_ringparam *ring)</div><div class='add'>+                               struct ethtool_ringparam *ring)</div><div class='ctx'> {</div><div class='ctx'> 	struct ixgbe_adapter *adapter = netdev_priv(netdev);</div><div class='del'>-	struct ixgbe_tx_buffer *old_buf;</div><div class='del'>-	struct ixgbe_rx_buffer *old_rx_buf;</div><div class='del'>-	void *old_desc;</div><div class='add'>+	struct ixgbe_ring *temp_ring;</div><div class='ctx'> 	int i, err;</div><div class='del'>-	u32 new_rx_count, new_tx_count, old_size;</div><div class='del'>-	dma_addr_t old_dma;</div><div class='add'>+	u32 new_rx_count, new_tx_count;</div><div class='ctx'> </div><div class='ctx'> 	if ((ring-&gt;rx_mini_pending) || (ring-&gt;rx_jumbo_pending))</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -681,6 +676,15 @@ static int ixgbe_set_ringparam(struct net_device *netdev,</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (adapter-&gt;num_tx_queues &gt; adapter-&gt;num_rx_queues)</div><div class='add'>+		temp_ring = vmalloc(adapter-&gt;num_tx_queues *</div><div class='add'>+		                    sizeof(struct ixgbe_ring));</div><div class='add'>+	else</div><div class='add'>+		temp_ring = vmalloc(adapter-&gt;num_rx_queues *</div><div class='add'>+		                    sizeof(struct ixgbe_ring));</div><div class='add'>+	if (!temp_ring)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='ctx'> 	while (test_and_set_bit(__IXGBE_RESETTING, &amp;adapter-&gt;state))</div><div class='ctx'> 		msleep(1);</div><div class='ctx'> </div><div class='hunk'>@@ -693,66 +697,61 @@ static int ixgbe_set_ringparam(struct net_device *netdev,</div><div class='ctx'> 	 * to the tx and rx ring structs.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (new_tx_count != adapter-&gt;tx_ring-&gt;count) {</div><div class='add'>+		memcpy(temp_ring, adapter-&gt;tx_ring,</div><div class='add'>+		       adapter-&gt;num_tx_queues * sizeof(struct ixgbe_ring));</div><div class='add'>+</div><div class='ctx'> 		for (i = 0; i &lt; adapter-&gt;num_tx_queues; i++) {</div><div class='del'>-			/* Save existing descriptor ring */</div><div class='del'>-			old_buf = adapter-&gt;tx_ring[i].tx_buffer_info;</div><div class='del'>-			old_desc = adapter-&gt;tx_ring[i].desc;</div><div class='del'>-			old_size = adapter-&gt;tx_ring[i].size;</div><div class='del'>-			old_dma = adapter-&gt;tx_ring[i].dma;</div><div class='del'>-			/* Try to allocate a new one */</div><div class='del'>-			adapter-&gt;tx_ring[i].tx_buffer_info = NULL;</div><div class='del'>-			adapter-&gt;tx_ring[i].desc = NULL;</div><div class='del'>-			adapter-&gt;tx_ring[i].count = new_tx_count;</div><div class='del'>-			err = ixgbe_setup_tx_resources(adapter,</div><div class='del'>-						       &amp;adapter-&gt;tx_ring[i]);</div><div class='add'>+			temp_ring[i].count = new_tx_count;</div><div class='add'>+			err = ixgbe_setup_tx_resources(adapter, &amp;temp_ring[i]);</div><div class='ctx'> 			if (err) {</div><div class='del'>-				/* Restore the old one so at least</div><div class='del'>-				   the adapter still works, even if</div><div class='del'>-				   we failed the request */</div><div class='del'>-				adapter-&gt;tx_ring[i].tx_buffer_info = old_buf;</div><div class='del'>-				adapter-&gt;tx_ring[i].desc = old_desc;</div><div class='del'>-				adapter-&gt;tx_ring[i].size = old_size;</div><div class='del'>-				adapter-&gt;tx_ring[i].dma = old_dma;</div><div class='add'>+				while (i) {</div><div class='add'>+					i--;</div><div class='add'>+					ixgbe_free_tx_resources(adapter,</div><div class='add'>+					                        &amp;temp_ring[i]);</div><div class='add'>+				}</div><div class='ctx'> 				goto err_setup;</div><div class='ctx'> 			}</div><div class='del'>-			/* Free the old buffer manually */</div><div class='del'>-			vfree(old_buf);</div><div class='del'>-			pci_free_consistent(adapter-&gt;pdev, old_size,</div><div class='del'>-					    old_desc, old_dma);</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; adapter-&gt;num_tx_queues; i++)</div><div class='add'>+			ixgbe_free_tx_resources(adapter, &amp;adapter-&gt;tx_ring[i]);</div><div class='add'>+</div><div class='add'>+		memcpy(adapter-&gt;tx_ring, temp_ring,</div><div class='add'>+		       adapter-&gt;num_tx_queues * sizeof(struct ixgbe_ring));</div><div class='add'>+</div><div class='add'>+		adapter-&gt;tx_ring_count = new_tx_count;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (new_rx_count != adapter-&gt;rx_ring-&gt;count) {</div><div class='del'>-		for (i = 0; i &lt; adapter-&gt;num_rx_queues; i++) {</div><div class='add'>+		memcpy(temp_ring, adapter-&gt;rx_ring,</div><div class='add'>+		       adapter-&gt;num_rx_queues * sizeof(struct ixgbe_ring));</div><div class='ctx'> </div><div class='del'>-			old_rx_buf = adapter-&gt;rx_ring[i].rx_buffer_info;</div><div class='del'>-			old_desc = adapter-&gt;rx_ring[i].desc;</div><div class='del'>-			old_size = adapter-&gt;rx_ring[i].size;</div><div class='del'>-			old_dma = adapter-&gt;rx_ring[i].dma;</div><div class='del'>-</div><div class='del'>-			adapter-&gt;rx_ring[i].rx_buffer_info = NULL;</div><div class='del'>-			adapter-&gt;rx_ring[i].desc = NULL;</div><div class='del'>-			adapter-&gt;rx_ring[i].dma = 0;</div><div class='del'>-			adapter-&gt;rx_ring[i].count = new_rx_count;</div><div class='del'>-			err = ixgbe_setup_rx_resources(adapter,</div><div class='del'>-						       &amp;adapter-&gt;rx_ring[i]);</div><div class='add'>+		for (i = 0; i &lt; adapter-&gt;num_rx_queues; i++) {</div><div class='add'>+			temp_ring[i].count = new_rx_count;</div><div class='add'>+			err = ixgbe_setup_rx_resources(adapter, &amp;temp_ring[i]);</div><div class='ctx'> 			if (err) {</div><div class='del'>-				adapter-&gt;rx_ring[i].rx_buffer_info = old_rx_buf;</div><div class='del'>-				adapter-&gt;rx_ring[i].desc = old_desc;</div><div class='del'>-				adapter-&gt;rx_ring[i].size = old_size;</div><div class='del'>-				adapter-&gt;rx_ring[i].dma = old_dma;</div><div class='add'>+				while (i) {</div><div class='add'>+					i--;</div><div class='add'>+					ixgbe_free_rx_resources(adapter,</div><div class='add'>+					                        &amp;temp_ring[i]);</div><div class='add'>+				}</div><div class='ctx'> 				goto err_setup;</div><div class='ctx'> 			}</div><div class='del'>-</div><div class='del'>-			vfree(old_rx_buf);</div><div class='del'>-			pci_free_consistent(adapter-&gt;pdev, old_size, old_desc,</div><div class='del'>-					    old_dma);</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; adapter-&gt;num_rx_queues; i++)</div><div class='add'>+			ixgbe_free_rx_resources(adapter, &amp;adapter-&gt;rx_ring[i]);</div><div class='add'>+</div><div class='add'>+		memcpy(adapter-&gt;rx_ring, temp_ring,</div><div class='add'>+		       adapter-&gt;num_rx_queues * sizeof(struct ixgbe_ring));</div><div class='add'>+</div><div class='add'>+		adapter-&gt;rx_ring_count = new_rx_count;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* success! */</div><div class='ctx'> 	err = 0;</div><div class='ctx'> err_setup:</div><div class='del'>-	if (netif_running(adapter-&gt;netdev))</div><div class='add'>+	if (netif_running(netdev))</div><div class='ctx'> 		ixgbe_up(adapter);</div><div class='ctx'> </div><div class='ctx'> 	clear_bit(__IXGBE_RESETTING, &amp;adapter-&gt;state);</div><div class='hunk'>@@ -770,7 +769,7 @@ static int ixgbe_get_sset_count(struct net_device *netdev, int sset)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ixgbe_get_ethtool_stats(struct net_device *netdev,</div><div class='del'>-				    struct ethtool_stats *stats, u64 *data)</div><div class='add'>+                                    struct ethtool_stats *stats, u64 *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct ixgbe_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> 	u64 *queue_stat;</div><div class='hunk'>@@ -778,12 +777,20 @@ static void ixgbe_get_ethtool_stats(struct net_device *netdev,</div><div class='ctx'> 	int j, k;</div><div class='ctx'> 	int i;</div><div class='ctx'> 	u64 aggregated = 0, flushed = 0, no_desc = 0;</div><div class='add'>+	for (i = 0; i &lt; adapter-&gt;num_rx_queues; i++) {</div><div class='add'>+		aggregated += adapter-&gt;rx_ring[i].lro_mgr.stats.aggregated;</div><div class='add'>+		flushed += adapter-&gt;rx_ring[i].lro_mgr.stats.flushed;</div><div class='add'>+		no_desc += adapter-&gt;rx_ring[i].lro_mgr.stats.no_desc;</div><div class='add'>+	}</div><div class='add'>+	adapter-&gt;lro_aggregated = aggregated;</div><div class='add'>+	adapter-&gt;lro_flushed = flushed;</div><div class='add'>+	adapter-&gt;lro_no_desc = no_desc;</div><div class='ctx'> </div><div class='ctx'> 	ixgbe_update_stats(adapter);</div><div class='ctx'> 	for (i = 0; i &lt; IXGBE_GLOBAL_STATS_LEN; i++) {</div><div class='ctx'> 		char *p = (char *)adapter + ixgbe_gstrings_stats[i].stat_offset;</div><div class='ctx'> 		data[i] = (ixgbe_gstrings_stats[i].sizeof_stat ==</div><div class='del'>-			   sizeof(u64)) ? *(u64 *)p : *(u32 *)p;</div><div class='add'>+		           sizeof(u64)) ? *(u64 *)p : *(u32 *)p;</div><div class='ctx'> 	}</div><div class='ctx'> 	for (j = 0; j &lt; adapter-&gt;num_tx_queues; j++) {</div><div class='ctx'> 		queue_stat = (u64 *)&amp;adapter-&gt;tx_ring[j].stats;</div><div class='hunk'>@@ -792,24 +799,18 @@ static void ixgbe_get_ethtool_stats(struct net_device *netdev,</div><div class='ctx'> 		i += k;</div><div class='ctx'> 	}</div><div class='ctx'> 	for (j = 0; j &lt; adapter-&gt;num_rx_queues; j++) {</div><div class='del'>-		aggregated += adapter-&gt;rx_ring[j].lro_mgr.stats.aggregated;</div><div class='del'>-		flushed += adapter-&gt;rx_ring[j].lro_mgr.stats.flushed;</div><div class='del'>-		no_desc += adapter-&gt;rx_ring[j].lro_mgr.stats.no_desc;</div><div class='ctx'> 		queue_stat = (u64 *)&amp;adapter-&gt;rx_ring[j].stats;</div><div class='ctx'> 		for (k = 0; k &lt; stat_count; k++)</div><div class='ctx'> 			data[i + k] = queue_stat[k];</div><div class='ctx'> 		i += k;</div><div class='ctx'> 	}</div><div class='del'>-	adapter-&gt;lro_aggregated = aggregated;</div><div class='del'>-	adapter-&gt;lro_flushed = flushed;</div><div class='del'>-	adapter-&gt;lro_no_desc = no_desc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ixgbe_get_strings(struct net_device *netdev, u32 stringset,</div><div class='del'>-			      u8 *data)</div><div class='add'>+                              u8 *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct ixgbe_adapter *adapter = netdev_priv(netdev);</div><div class='del'>-	u8 *p = data;</div><div class='add'>+	char *p = (char *)data;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	switch (stringset) {</div><div class='hunk'>@@ -831,14 +832,14 @@ static void ixgbe_get_strings(struct net_device *netdev, u32 stringset,</div><div class='ctx'> 			sprintf(p, "rx_queue_%u_bytes", i);</div><div class='ctx'> 			p += ETH_GSTRING_LEN;</div><div class='ctx'> 		}</div><div class='del'>-/*		BUG_ON(p - data != IXGBE_STATS_LEN * ETH_GSTRING_LEN); */</div><div class='add'>+		/* BUG_ON(p - data != IXGBE_STATS_LEN * ETH_GSTRING_LEN); */</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static void ixgbe_get_wol(struct net_device *netdev,</div><div class='del'>-			  struct ethtool_wolinfo *wol)</div><div class='add'>+                          struct ethtool_wolinfo *wol)</div><div class='ctx'> {</div><div class='ctx'> 	wol-&gt;supported = 0;</div><div class='ctx'> 	wol-&gt;wolopts = 0;</div><div class='hunk'>@@ -859,16 +860,17 @@ static int ixgbe_nway_reset(struct net_device *netdev)</div><div class='ctx'> static int ixgbe_phys_id(struct net_device *netdev, u32 data)</div><div class='ctx'> {</div><div class='ctx'> 	struct ixgbe_adapter *adapter = netdev_priv(netdev);</div><div class='del'>-	u32 led_reg = IXGBE_READ_REG(&amp;adapter-&gt;hw, IXGBE_LEDCTL);</div><div class='add'>+	struct ixgbe_hw *hw = &amp;adapter-&gt;hw;</div><div class='add'>+	u32 led_reg = IXGBE_READ_REG(hw, IXGBE_LEDCTL);</div><div class='ctx'> 	u32 i;</div><div class='ctx'> </div><div class='ctx'> 	if (!data || data &gt; 300)</div><div class='ctx'> 		data = 300;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; (data * 1000); i += 400) {</div><div class='del'>-		ixgbe_led_on(&amp;adapter-&gt;hw, IXGBE_LED_ON);</div><div class='add'>+		hw-&gt;mac.ops.led_on(hw, IXGBE_LED_ON);</div><div class='ctx'> 		msleep_interruptible(200);</div><div class='del'>-		ixgbe_led_off(&amp;adapter-&gt;hw, IXGBE_LED_ON);</div><div class='add'>+		hw-&gt;mac.ops.led_off(hw, IXGBE_LED_ON);</div><div class='ctx'> 		msleep_interruptible(200);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -879,67 +881,75 @@ static int ixgbe_phys_id(struct net_device *netdev, u32 data)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ixgbe_get_coalesce(struct net_device *netdev,</div><div class='del'>-			      struct ethtool_coalesce *ec)</div><div class='add'>+                              struct ethtool_coalesce *ec)</div><div class='ctx'> {</div><div class='ctx'> 	struct ixgbe_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> </div><div class='del'>-	if (adapter-&gt;rx_eitr &lt; IXGBE_MIN_ITR_USECS)</div><div class='del'>-		ec-&gt;rx_coalesce_usecs = adapter-&gt;rx_eitr;</div><div class='del'>-	else</div><div class='del'>-		ec-&gt;rx_coalesce_usecs = 1000000 / adapter-&gt;rx_eitr;</div><div class='del'>-</div><div class='del'>-	if (adapter-&gt;tx_eitr &lt; IXGBE_MIN_ITR_USECS)</div><div class='del'>-		ec-&gt;tx_coalesce_usecs = adapter-&gt;tx_eitr;</div><div class='del'>-	else</div><div class='del'>-		ec-&gt;tx_coalesce_usecs = 1000000 / adapter-&gt;tx_eitr;</div><div class='del'>-</div><div class='ctx'> 	ec-&gt;tx_max_coalesced_frames_irq = adapter-&gt;tx_ring[0].work_limit;</div><div class='add'>+</div><div class='add'>+	/* only valid if in constant ITR mode */</div><div class='add'>+	switch (adapter-&gt;itr_setting) {</div><div class='add'>+	case 0:</div><div class='add'>+		/* throttling disabled */</div><div class='add'>+		ec-&gt;rx_coalesce_usecs = 0;</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		/* dynamic ITR mode */</div><div class='add'>+		ec-&gt;rx_coalesce_usecs = 1;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		/* fixed interrupt rate mode */</div><div class='add'>+		ec-&gt;rx_coalesce_usecs = 1000000/adapter-&gt;eitr_param;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ixgbe_set_coalesce(struct net_device *netdev,</div><div class='del'>-			      struct ethtool_coalesce *ec)</div><div class='add'>+                              struct ethtool_coalesce *ec)</div><div class='ctx'> {</div><div class='ctx'> 	struct ixgbe_adapter *adapter = netdev_priv(netdev);</div><div class='del'>-</div><div class='del'>-	if ((ec-&gt;rx_coalesce_usecs &gt; IXGBE_MAX_ITR_USECS) ||</div><div class='del'>-	    ((ec-&gt;rx_coalesce_usecs != 0) &amp;&amp;</div><div class='del'>-	     (ec-&gt;rx_coalesce_usecs != 1) &amp;&amp;</div><div class='del'>-	     (ec-&gt;rx_coalesce_usecs != 3) &amp;&amp;</div><div class='del'>-	     (ec-&gt;rx_coalesce_usecs &lt; IXGBE_MIN_ITR_USECS)))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	if ((ec-&gt;tx_coalesce_usecs &gt; IXGBE_MAX_ITR_USECS) ||</div><div class='del'>-	    ((ec-&gt;tx_coalesce_usecs != 0) &amp;&amp;</div><div class='del'>-	     (ec-&gt;tx_coalesce_usecs != 1) &amp;&amp;</div><div class='del'>-	     (ec-&gt;tx_coalesce_usecs != 3) &amp;&amp;</div><div class='del'>-	     (ec-&gt;tx_coalesce_usecs &lt; IXGBE_MIN_ITR_USECS)))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	/* convert to rate of irq's per second */</div><div class='del'>-	if (ec-&gt;rx_coalesce_usecs &lt; IXGBE_MIN_ITR_USECS)</div><div class='del'>-		adapter-&gt;rx_eitr = ec-&gt;rx_coalesce_usecs;</div><div class='del'>-	else</div><div class='del'>-		adapter-&gt;rx_eitr = (1000000 / ec-&gt;rx_coalesce_usecs);</div><div class='del'>-</div><div class='del'>-	if (ec-&gt;tx_coalesce_usecs &lt; IXGBE_MIN_ITR_USECS)</div><div class='del'>-		adapter-&gt;tx_eitr = ec-&gt;rx_coalesce_usecs;</div><div class='del'>-	else</div><div class='del'>-		adapter-&gt;tx_eitr = (1000000 / ec-&gt;tx_coalesce_usecs);</div><div class='add'>+	struct ixgbe_hw *hw = &amp;adapter-&gt;hw;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (ec-&gt;tx_max_coalesced_frames_irq)</div><div class='del'>-		adapter-&gt;tx_ring[0].work_limit =</div><div class='del'>-					ec-&gt;tx_max_coalesced_frames_irq;</div><div class='add'>+		adapter-&gt;tx_ring[0].work_limit = ec-&gt;tx_max_coalesced_frames_irq;</div><div class='add'>+</div><div class='add'>+	if (ec-&gt;rx_coalesce_usecs &gt; 1) {</div><div class='add'>+		/* store the value in ints/second */</div><div class='add'>+		adapter-&gt;eitr_param = 1000000/ec-&gt;rx_coalesce_usecs;</div><div class='add'>+</div><div class='add'>+		/* static value of interrupt rate */</div><div class='add'>+		adapter-&gt;itr_setting = adapter-&gt;eitr_param;</div><div class='add'>+		/* clear the lower bit */</div><div class='add'>+		adapter-&gt;itr_setting &amp;= ~1;</div><div class='add'>+	} else if (ec-&gt;rx_coalesce_usecs == 1) {</div><div class='add'>+		/* 1 means dynamic mode */</div><div class='add'>+		adapter-&gt;eitr_param = 20000;</div><div class='add'>+		adapter-&gt;itr_setting = 1;</div><div class='add'>+	} else {</div><div class='add'>+		/* any other value means disable eitr, which is best</div><div class='add'>+		 * served by setting the interrupt rate very high */</div><div class='add'>+		adapter-&gt;eitr_param = 3000000;</div><div class='add'>+		adapter-&gt;itr_setting = 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (netif_running(netdev)) {</div><div class='del'>-		ixgbe_down(adapter);</div><div class='del'>-		ixgbe_up(adapter);</div><div class='add'>+	for (i = 0; i &lt; adapter-&gt;num_msix_vectors - NON_Q_VECTORS; i++) {</div><div class='add'>+		struct ixgbe_q_vector *q_vector = &amp;adapter-&gt;q_vector[i];</div><div class='add'>+		if (q_vector-&gt;txr_count &amp;&amp; !q_vector-&gt;rxr_count)</div><div class='add'>+			q_vector-&gt;eitr = (adapter-&gt;eitr_param &gt;&gt; 1);</div><div class='add'>+		else</div><div class='add'>+			/* rx only or mixed */</div><div class='add'>+			q_vector-&gt;eitr = adapter-&gt;eitr_param;</div><div class='add'>+		IXGBE_WRITE_REG(hw, IXGBE_EITR(i),</div><div class='add'>+		                EITR_INTS_PER_SEC_TO_REG(q_vector-&gt;eitr));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static struct ethtool_ops ixgbe_ethtool_ops = {</div><div class='add'>+static const struct ethtool_ops ixgbe_ethtool_ops = {</div><div class='ctx'> 	.get_settings           = ixgbe_get_settings,</div><div class='ctx'> 	.set_settings           = ixgbe_set_settings,</div><div class='ctx'> 	.get_drvinfo            = ixgbe_get_drvinfo,</div><div class='hunk'>@@ -966,7 +976,7 @@ static struct ethtool_ops ixgbe_ethtool_ops = {</div><div class='ctx'> 	.set_tso                = ixgbe_set_tso,</div><div class='ctx'> 	.get_strings            = ixgbe_get_strings,</div><div class='ctx'> 	.phys_id                = ixgbe_phys_id,</div><div class='del'>-	.get_sset_count		= ixgbe_get_sset_count,</div><div class='add'>+	.get_sset_count         = ixgbe_get_sset_count,</div><div class='ctx'> 	.get_ethtool_stats      = ixgbe_get_ethtool_stats,</div><div class='ctx'> 	.get_coalesce           = ixgbe_get_coalesce,</div><div class='ctx'> 	.set_coalesce           = ixgbe_set_coalesce,</div><div class='head'>diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c<br/>index a417be7f8be5..7548fb7360d9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/ixgbe/ixgbe_main.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/ixgbe/ixgbe_main.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/ixgbe/ixgbe_main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/ixgbe/ixgbe_main.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*******************************************************************************</div><div class='ctx'> </div><div class='ctx'>   Intel 10 Gigabit PCI Express Linux driver</div><div class='del'>-  Copyright(c) 1999 - 2007 Intel Corporation.</div><div class='add'>+  Copyright(c) 1999 - 2008 Intel Corporation.</div><div class='ctx'> </div><div class='ctx'>   This program is free software; you can redistribute it and/or modify it</div><div class='ctx'>   under the terms and conditions of the GNU General Public License,</div><div class='hunk'>@@ -20,7 +20,6 @@</div><div class='ctx'>   the file called "COPYING".</div><div class='ctx'> </div><div class='ctx'>   Contact Information:</div><div class='del'>-  Linux NICS &lt;linux.nics@intel.com&gt;</div><div class='ctx'>   e1000-devel Mailing List &lt;e1000-devel@lists.sourceforge.net&gt;</div><div class='ctx'>   Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='ctx'> </div><div class='hunk'>@@ -46,15 +45,14 @@</div><div class='ctx'> </div><div class='ctx'> char ixgbe_driver_name[] = "ixgbe";</div><div class='ctx'> static const char ixgbe_driver_string[] =</div><div class='del'>-	"Intel(R) 10 Gigabit PCI Express Network Driver";</div><div class='add'>+                              "Intel(R) 10 Gigabit PCI Express Network Driver";</div><div class='ctx'> </div><div class='del'>-#define DRV_VERSION "1.3.18-k4"</div><div class='add'>+#define DRV_VERSION "1.3.30-k2"</div><div class='ctx'> const char ixgbe_driver_version[] = DRV_VERSION;</div><div class='del'>-static const char ixgbe_copyright[] =</div><div class='del'>-	 "Copyright (c) 1999-2007 Intel Corporation.";</div><div class='add'>+static char ixgbe_copyright[] = "Copyright (c) 1999-2007 Intel Corporation.";</div><div class='ctx'> </div><div class='ctx'> static const struct ixgbe_info *ixgbe_info_tbl[] = {</div><div class='del'>-	[board_82598]			= &amp;ixgbe_82598_info,</div><div class='add'>+	[board_82598] = &amp;ixgbe_82598_info,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* ixgbe_pci_tbl - PCI Device ID Table</div><div class='hunk'>@@ -74,15 +72,17 @@ static struct pci_device_id ixgbe_pci_tbl[] = {</div><div class='ctx'> 	 board_82598 },</div><div class='ctx'> 	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598_CX4_DUAL_PORT),</div><div class='ctx'> 	 board_82598 },</div><div class='add'>+	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598EB_XF_LR),</div><div class='add'>+	 board_82598 },</div><div class='ctx'> </div><div class='ctx'> 	/* required last entry */</div><div class='ctx'> 	{0, }</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, ixgbe_pci_tbl);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_DCA</div><div class='add'>+#ifdef CONFIG_IXGBE_DCA</div><div class='ctx'> static int ixgbe_notify_dca(struct notifier_block *, unsigned long event,</div><div class='del'>-			    void *p);</div><div class='add'>+                            void *p);</div><div class='ctx'> static struct notifier_block dca_notifier = {</div><div class='ctx'> 	.notifier_call = ixgbe_notify_dca,</div><div class='ctx'> 	.next          = NULL,</div><div class='hunk'>@@ -104,7 +104,7 @@ static void ixgbe_release_hw_control(struct ixgbe_adapter *adapter)</div><div class='ctx'> 	/* Let firmware take over control of h/w */</div><div class='ctx'> 	ctrl_ext = IXGBE_READ_REG(&amp;adapter-&gt;hw, IXGBE_CTRL_EXT);</div><div class='ctx'> 	IXGBE_WRITE_REG(&amp;adapter-&gt;hw, IXGBE_CTRL_EXT,</div><div class='del'>-			ctrl_ext &amp; ~IXGBE_CTRL_EXT_DRV_LOAD);</div><div class='add'>+	                ctrl_ext &amp; ~IXGBE_CTRL_EXT_DRV_LOAD);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ixgbe_get_hw_control(struct ixgbe_adapter *adapter)</div><div class='hunk'>@@ -114,24 +114,11 @@ static void ixgbe_get_hw_control(struct ixgbe_adapter *adapter)</div><div class='ctx'> 	/* Let firmware know the driver has taken over */</div><div class='ctx'> 	ctrl_ext = IXGBE_READ_REG(&amp;adapter-&gt;hw, IXGBE_CTRL_EXT);</div><div class='ctx'> 	IXGBE_WRITE_REG(&amp;adapter-&gt;hw, IXGBE_CTRL_EXT,</div><div class='del'>-			ctrl_ext | IXGBE_CTRL_EXT_DRV_LOAD);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-/**</div><div class='del'>- * ixgbe_get_hw_dev_name - return device name string</div><div class='del'>- * used by hardware layer to print debugging information</div><div class='del'>- **/</div><div class='del'>-char *ixgbe_get_hw_dev_name(struct ixgbe_hw *hw)</div><div class='del'>-{</div><div class='del'>-	struct ixgbe_adapter *adapter = hw-&gt;back;</div><div class='del'>-	struct net_device *netdev = adapter-&gt;netdev;</div><div class='del'>-	return netdev-&gt;name;</div><div class='add'>+	                ctrl_ext | IXGBE_CTRL_EXT_DRV_LOAD);</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> static void ixgbe_set_ivar(struct ixgbe_adapter *adapter, u16 int_alloc_entry,</div><div class='del'>-			   u8 msix_vector)</div><div class='add'>+                           u8 msix_vector)</div><div class='ctx'> {</div><div class='ctx'> 	u32 ivar, index;</div><div class='ctx'> </div><div class='hunk'>@@ -144,13 +131,12 @@ static void ixgbe_set_ivar(struct ixgbe_adapter *adapter, u16 int_alloc_entry,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ixgbe_unmap_and_free_tx_resource(struct ixgbe_adapter *adapter,</div><div class='del'>-					     struct ixgbe_tx_buffer</div><div class='del'>-					     *tx_buffer_info)</div><div class='add'>+                                             struct ixgbe_tx_buffer</div><div class='add'>+                                             *tx_buffer_info)</div><div class='ctx'> {</div><div class='ctx'> 	if (tx_buffer_info-&gt;dma) {</div><div class='del'>-		pci_unmap_page(adapter-&gt;pdev,</div><div class='del'>-			       tx_buffer_info-&gt;dma,</div><div class='del'>-			       tx_buffer_info-&gt;length, PCI_DMA_TODEVICE);</div><div class='add'>+		pci_unmap_page(adapter-&gt;pdev, tx_buffer_info-&gt;dma,</div><div class='add'>+		               tx_buffer_info-&gt;length, PCI_DMA_TODEVICE);</div><div class='ctx'> 		tx_buffer_info-&gt;dma = 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (tx_buffer_info-&gt;skb) {</div><div class='hunk'>@@ -161,107 +147,120 @@ static void ixgbe_unmap_and_free_tx_resource(struct ixgbe_adapter *adapter,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool ixgbe_check_tx_hang(struct ixgbe_adapter *adapter,</div><div class='del'>-				       struct ixgbe_ring *tx_ring,</div><div class='del'>-				       unsigned int eop,</div><div class='del'>-				       union ixgbe_adv_tx_desc *eop_desc)</div><div class='add'>+                                       struct ixgbe_ring *tx_ring,</div><div class='add'>+                                       unsigned int eop)</div><div class='ctx'> {</div><div class='add'>+	struct ixgbe_hw *hw = &amp;adapter-&gt;hw;</div><div class='add'>+	u32 head, tail;</div><div class='add'>+</div><div class='ctx'> 	/* Detect a transmit hang in hardware, this serializes the</div><div class='del'>-	 * check with the clearing of time_stamp and movement of i */</div><div class='add'>+	 * check with the clearing of time_stamp and movement of eop */</div><div class='add'>+	head = IXGBE_READ_REG(hw, tx_ring-&gt;head);</div><div class='add'>+	tail = IXGBE_READ_REG(hw, tx_ring-&gt;tail);</div><div class='ctx'> 	adapter-&gt;detect_tx_hung = false;</div><div class='del'>-	if (tx_ring-&gt;tx_buffer_info[eop].dma &amp;&amp;</div><div class='add'>+	if ((head != tail) &amp;&amp;</div><div class='add'>+	    tx_ring-&gt;tx_buffer_info[eop].time_stamp &amp;&amp;</div><div class='ctx'> 	    time_after(jiffies, tx_ring-&gt;tx_buffer_info[eop].time_stamp + HZ) &amp;&amp;</div><div class='ctx'> 	    !(IXGBE_READ_REG(&amp;adapter-&gt;hw, IXGBE_TFCS) &amp; IXGBE_TFCS_TXOFF)) {</div><div class='ctx'> 		/* detected Tx unit hang */</div><div class='add'>+		union ixgbe_adv_tx_desc *tx_desc;</div><div class='add'>+		tx_desc = IXGBE_TX_DESC_ADV(*tx_ring, eop);</div><div class='ctx'> 		DPRINTK(DRV, ERR, "Detected Tx Unit Hang\n"</div><div class='del'>-			"  TDH                  &lt;%x&gt;\n"</div><div class='del'>-			"  TDT                  &lt;%x&gt;\n"</div><div class='add'>+			"  Tx Queue             &lt;%d&gt;\n"</div><div class='add'>+			"  TDH, TDT             &lt;%x&gt;, &lt;%x&gt;\n"</div><div class='ctx'> 			"  next_to_use          &lt;%x&gt;\n"</div><div class='ctx'> 			"  next_to_clean        &lt;%x&gt;\n"</div><div class='ctx'> 			"tx_buffer_info[next_to_clean]\n"</div><div class='ctx'> 			"  time_stamp           &lt;%lx&gt;\n"</div><div class='del'>-			"  next_to_watch        &lt;%x&gt;\n"</div><div class='del'>-			"  jiffies              &lt;%lx&gt;\n"</div><div class='del'>-			"  next_to_watch.status &lt;%x&gt;\n",</div><div class='del'>-			readl(adapter-&gt;hw.hw_addr + tx_ring-&gt;head),</div><div class='del'>-			readl(adapter-&gt;hw.hw_addr + tx_ring-&gt;tail),</div><div class='del'>-			tx_ring-&gt;next_to_use,</div><div class='del'>-			tx_ring-&gt;next_to_clean,</div><div class='del'>-			tx_ring-&gt;tx_buffer_info[eop].time_stamp,</div><div class='del'>-			eop, jiffies, eop_desc-&gt;wb.status);</div><div class='add'>+			"  jiffies              &lt;%lx&gt;\n",</div><div class='add'>+			tx_ring-&gt;queue_index,</div><div class='add'>+			head, tail,</div><div class='add'>+			tx_ring-&gt;next_to_use, eop,</div><div class='add'>+			tx_ring-&gt;tx_buffer_info[eop].time_stamp, jiffies);</div><div class='ctx'> 		return true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define IXGBE_MAX_TXD_PWR	14</div><div class='del'>-#define IXGBE_MAX_DATA_PER_TXD	(1 &lt;&lt; IXGBE_MAX_TXD_PWR)</div><div class='add'>+#define IXGBE_MAX_TXD_PWR       14</div><div class='add'>+#define IXGBE_MAX_DATA_PER_TXD  (1 &lt;&lt; IXGBE_MAX_TXD_PWR)</div><div class='ctx'> </div><div class='ctx'> /* Tx Descriptors needed, worst case */</div><div class='ctx'> #define TXD_USE_COUNT(S) (((S) &gt;&gt; IXGBE_MAX_TXD_PWR) + \</div><div class='ctx'> 			 (((S) &amp; (IXGBE_MAX_DATA_PER_TXD - 1)) ? 1 : 0))</div><div class='ctx'> #define DESC_NEEDED (TXD_USE_COUNT(IXGBE_MAX_DATA_PER_TXD) /* skb-&gt;data */ + \</div><div class='del'>-	MAX_SKB_FRAGS * TXD_USE_COUNT(PAGE_SIZE) + 1)	/* for context */</div><div class='add'>+	MAX_SKB_FRAGS * TXD_USE_COUNT(PAGE_SIZE) + 1) /* for context */</div><div class='add'>+</div><div class='add'>+#define GET_TX_HEAD_FROM_RING(ring) (\</div><div class='add'>+	*(volatile u32 *) \</div><div class='add'>+	((union ixgbe_adv_tx_desc *)(ring)-&gt;desc + (ring)-&gt;count))</div><div class='add'>+static void ixgbe_tx_timeout(struct net_device *netdev);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ixgbe_clean_tx_irq - Reclaim resources after transmit completes</div><div class='ctx'>  * @adapter: board private structure</div><div class='add'>+ * @tx_ring: tx ring to clean</div><div class='ctx'>  **/</div><div class='ctx'> static bool ixgbe_clean_tx_irq(struct ixgbe_adapter *adapter,</div><div class='del'>-				    struct ixgbe_ring *tx_ring)</div><div class='add'>+                               struct ixgbe_ring *tx_ring)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *netdev = adapter-&gt;netdev;</div><div class='del'>-	union ixgbe_adv_tx_desc *tx_desc, *eop_desc;</div><div class='add'>+	union ixgbe_adv_tx_desc *tx_desc;</div><div class='ctx'> 	struct ixgbe_tx_buffer *tx_buffer_info;</div><div class='del'>-	unsigned int i, eop;</div><div class='del'>-	bool cleaned = false;</div><div class='del'>-	unsigned int total_tx_bytes = 0, total_tx_packets = 0;</div><div class='add'>+	struct net_device *netdev = adapter-&gt;netdev;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	unsigned int i;</div><div class='add'>+	u32 head, oldhead;</div><div class='add'>+	unsigned int count = 0;</div><div class='add'>+	unsigned int total_bytes = 0, total_packets = 0;</div><div class='ctx'> </div><div class='add'>+	rmb();</div><div class='add'>+	head = GET_TX_HEAD_FROM_RING(tx_ring);</div><div class='add'>+	head = le32_to_cpu(head);</div><div class='ctx'> 	i = tx_ring-&gt;next_to_clean;</div><div class='del'>-	eop = tx_ring-&gt;tx_buffer_info[i].next_to_watch;</div><div class='del'>-	eop_desc = IXGBE_TX_DESC_ADV(*tx_ring, eop);</div><div class='del'>-	while (eop_desc-&gt;wb.status &amp; cpu_to_le32(IXGBE_TXD_STAT_DD)) {</div><div class='del'>-		cleaned = false;</div><div class='del'>-		while (!cleaned) {</div><div class='add'>+	while (1) {</div><div class='add'>+		while (i != head) {</div><div class='ctx'> 			tx_desc = IXGBE_TX_DESC_ADV(*tx_ring, i);</div><div class='ctx'> 			tx_buffer_info = &amp;tx_ring-&gt;tx_buffer_info[i];</div><div class='del'>-			cleaned = (i == eop);</div><div class='add'>+			skb = tx_buffer_info-&gt;skb;</div><div class='ctx'> </div><div class='del'>-			tx_ring-&gt;stats.bytes += tx_buffer_info-&gt;length;</div><div class='del'>-			if (cleaned) {</div><div class='del'>-				struct sk_buff *skb = tx_buffer_info-&gt;skb;</div><div class='add'>+			if (skb) {</div><div class='ctx'> 				unsigned int segs, bytecount;</div><div class='add'>+</div><div class='add'>+				/* gso_segs is currently only valid for tcp */</div><div class='ctx'> 				segs = skb_shinfo(skb)-&gt;gso_segs ?: 1;</div><div class='ctx'> 				/* multiply data chunks by size of headers */</div><div class='ctx'> 				bytecount = ((segs - 1) * skb_headlen(skb)) +</div><div class='del'>-					    skb-&gt;len;</div><div class='del'>-				total_tx_packets += segs;</div><div class='del'>-				total_tx_bytes += bytecount;</div><div class='add'>+				            skb-&gt;len;</div><div class='add'>+				total_packets += segs;</div><div class='add'>+				total_bytes += bytecount;</div><div class='ctx'> 			}</div><div class='add'>+</div><div class='ctx'> 			ixgbe_unmap_and_free_tx_resource(adapter,</div><div class='del'>-							 tx_buffer_info);</div><div class='del'>-			tx_desc-&gt;wb.status = 0;</div><div class='add'>+			                                 tx_buffer_info);</div><div class='ctx'> </div><div class='ctx'> 			i++;</div><div class='ctx'> 			if (i == tx_ring-&gt;count)</div><div class='ctx'> 				i = 0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		tx_ring-&gt;stats.packets++;</div><div class='del'>-</div><div class='del'>-		eop = tx_ring-&gt;tx_buffer_info[i].next_to_watch;</div><div class='del'>-		eop_desc = IXGBE_TX_DESC_ADV(*tx_ring, eop);</div><div class='del'>-</div><div class='del'>-		/* weight of a sort for tx, avoid endless transmit cleanup */</div><div class='del'>-		if (total_tx_packets &gt;= tx_ring-&gt;work_limit)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='add'>+			count++;</div><div class='add'>+			if (count == tx_ring-&gt;count)</div><div class='add'>+				goto done_cleaning;</div><div class='add'>+		}</div><div class='add'>+		oldhead = head;</div><div class='add'>+		rmb();</div><div class='add'>+		head = GET_TX_HEAD_FROM_RING(tx_ring);</div><div class='add'>+		head = le32_to_cpu(head);</div><div class='add'>+		if (head == oldhead)</div><div class='add'>+			goto done_cleaning;</div><div class='add'>+	} /* while (1) */</div><div class='add'>+</div><div class='add'>+done_cleaning:</div><div class='ctx'> 	tx_ring-&gt;next_to_clean = i;</div><div class='ctx'> </div><div class='ctx'> #define TX_WAKE_THRESHOLD (DESC_NEEDED * 2)</div><div class='del'>-	if (total_tx_packets &amp;&amp; netif_carrier_ok(netdev) &amp;&amp;</div><div class='del'>-	    (IXGBE_DESC_UNUSED(tx_ring) &gt;= TX_WAKE_THRESHOLD)) {</div><div class='add'>+	if (unlikely(count &amp;&amp; netif_carrier_ok(netdev) &amp;&amp;</div><div class='add'>+	             (IXGBE_DESC_UNUSED(tx_ring) &gt;= TX_WAKE_THRESHOLD))) {</div><div class='ctx'> 		/* Make sure that anybody stopping the queue after this</div><div class='ctx'> 		 * sees the new next_to_clean.</div><div class='ctx'> 		 */</div><div class='hunk'>@@ -269,59 +268,68 @@ static bool ixgbe_clean_tx_irq(struct ixgbe_adapter *adapter,</div><div class='ctx'> 		if (__netif_subqueue_stopped(netdev, tx_ring-&gt;queue_index) &amp;&amp;</div><div class='ctx'> 		    !test_bit(__IXGBE_DOWN, &amp;adapter-&gt;state)) {</div><div class='ctx'> 			netif_wake_subqueue(netdev, tx_ring-&gt;queue_index);</div><div class='del'>-			adapter-&gt;restart_queue++;</div><div class='add'>+			++adapter-&gt;restart_queue;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (adapter-&gt;detect_tx_hung)</div><div class='del'>-		if (ixgbe_check_tx_hang(adapter, tx_ring, eop, eop_desc))</div><div class='del'>-			netif_stop_subqueue(netdev, tx_ring-&gt;queue_index);</div><div class='del'>-</div><div class='del'>-	if (total_tx_packets &gt;= tx_ring-&gt;work_limit)</div><div class='del'>-		IXGBE_WRITE_REG(&amp;adapter-&gt;hw, IXGBE_EICS, tx_ring-&gt;eims_value);</div><div class='add'>+	if (adapter-&gt;detect_tx_hung) {</div><div class='add'>+		if (ixgbe_check_tx_hang(adapter, tx_ring, i)) {</div><div class='add'>+			/* schedule immediate reset if we believe we hung */</div><div class='add'>+			DPRINTK(PROBE, INFO,</div><div class='add'>+			        "tx hang %d detected, resetting adapter\n",</div><div class='add'>+			        adapter-&gt;tx_timeout_count + 1);</div><div class='add'>+			ixgbe_tx_timeout(adapter-&gt;netdev);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	tx_ring-&gt;total_bytes += total_tx_bytes;</div><div class='del'>-	tx_ring-&gt;total_packets += total_tx_packets;</div><div class='del'>-	adapter-&gt;net_stats.tx_bytes += total_tx_bytes;</div><div class='del'>-	adapter-&gt;net_stats.tx_packets += total_tx_packets;</div><div class='del'>-	cleaned = total_tx_packets ? true : false;</div><div class='del'>-	return cleaned;</div><div class='add'>+	/* re-arm the interrupt */</div><div class='add'>+	if ((total_packets &gt;= tx_ring-&gt;work_limit) ||</div><div class='add'>+	    (count == tx_ring-&gt;count))</div><div class='add'>+		IXGBE_WRITE_REG(&amp;adapter-&gt;hw, IXGBE_EICS, tx_ring-&gt;v_idx);</div><div class='add'>+</div><div class='add'>+	tx_ring-&gt;total_bytes += total_bytes;</div><div class='add'>+	tx_ring-&gt;total_packets += total_packets;</div><div class='add'>+	tx_ring-&gt;stats.bytes += total_bytes;</div><div class='add'>+	tx_ring-&gt;stats.packets += total_packets;</div><div class='add'>+	adapter-&gt;net_stats.tx_bytes += total_bytes;</div><div class='add'>+	adapter-&gt;net_stats.tx_packets += total_packets;</div><div class='add'>+	return (total_packets ? true : false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_DCA</div><div class='add'>+#ifdef CONFIG_IXGBE_DCA</div><div class='ctx'> static void ixgbe_update_rx_dca(struct ixgbe_adapter *adapter,</div><div class='del'>-				struct ixgbe_ring *rxr)</div><div class='add'>+                                struct ixgbe_ring *rx_ring)</div><div class='ctx'> {</div><div class='ctx'> 	u32 rxctrl;</div><div class='ctx'> 	int cpu = get_cpu();</div><div class='del'>-	int q = rxr - adapter-&gt;rx_ring;</div><div class='add'>+	int q = rx_ring - adapter-&gt;rx_ring;</div><div class='ctx'> </div><div class='del'>-	if (rxr-&gt;cpu != cpu) {</div><div class='add'>+	if (rx_ring-&gt;cpu != cpu) {</div><div class='ctx'> 		rxctrl = IXGBE_READ_REG(&amp;adapter-&gt;hw, IXGBE_DCA_RXCTRL(q));</div><div class='ctx'> 		rxctrl &amp;= ~IXGBE_DCA_RXCTRL_CPUID_MASK;</div><div class='del'>-		rxctrl |= dca_get_tag(cpu);</div><div class='add'>+		rxctrl |= dca3_get_tag(&amp;adapter-&gt;pdev-&gt;dev, cpu);</div><div class='ctx'> 		rxctrl |= IXGBE_DCA_RXCTRL_DESC_DCA_EN;</div><div class='ctx'> 		rxctrl |= IXGBE_DCA_RXCTRL_HEAD_DCA_EN;</div><div class='ctx'> 		IXGBE_WRITE_REG(&amp;adapter-&gt;hw, IXGBE_DCA_RXCTRL(q), rxctrl);</div><div class='del'>-		rxr-&gt;cpu = cpu;</div><div class='add'>+		rx_ring-&gt;cpu = cpu;</div><div class='ctx'> 	}</div><div class='ctx'> 	put_cpu();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ixgbe_update_tx_dca(struct ixgbe_adapter *adapter,</div><div class='del'>-				struct ixgbe_ring *txr)</div><div class='add'>+                                struct ixgbe_ring *tx_ring)</div><div class='ctx'> {</div><div class='ctx'> 	u32 txctrl;</div><div class='ctx'> 	int cpu = get_cpu();</div><div class='del'>-	int q = txr - adapter-&gt;tx_ring;</div><div class='add'>+	int q = tx_ring - adapter-&gt;tx_ring;</div><div class='ctx'> </div><div class='del'>-	if (txr-&gt;cpu != cpu) {</div><div class='add'>+	if (tx_ring-&gt;cpu != cpu) {</div><div class='ctx'> 		txctrl = IXGBE_READ_REG(&amp;adapter-&gt;hw, IXGBE_DCA_TXCTRL(q));</div><div class='ctx'> 		txctrl &amp;= ~IXGBE_DCA_TXCTRL_CPUID_MASK;</div><div class='del'>-		txctrl |= dca_get_tag(cpu);</div><div class='add'>+		txctrl |= dca3_get_tag(&amp;adapter-&gt;pdev-&gt;dev, cpu);</div><div class='ctx'> 		txctrl |= IXGBE_DCA_TXCTRL_DESC_DCA_EN;</div><div class='ctx'> 		IXGBE_WRITE_REG(&amp;adapter-&gt;hw, IXGBE_DCA_TXCTRL(q), txctrl);</div><div class='del'>-		txr-&gt;cpu = cpu;</div><div class='add'>+		tx_ring-&gt;cpu = cpu;</div><div class='ctx'> 	}</div><div class='ctx'> 	put_cpu();</div><div class='ctx'> }</div><div class='hunk'>@@ -351,11 +359,14 @@ static int __ixgbe_notify_dca(struct device *dev, void *data)</div><div class='ctx'> </div><div class='ctx'> 	switch (event) {</div><div class='ctx'> 	case DCA_PROVIDER_ADD:</div><div class='del'>-		adapter-&gt;flags |= IXGBE_FLAG_DCA_ENABLED;</div><div class='add'>+		/* if we're already enabled, don't do it again */</div><div class='add'>+		if (adapter-&gt;flags &amp; IXGBE_FLAG_DCA_ENABLED)</div><div class='add'>+			break;</div><div class='ctx'> 		/* Always use CB2 mode, difference is masked</div><div class='ctx'> 		 * in the CB driver. */</div><div class='ctx'> 		IXGBE_WRITE_REG(&amp;adapter-&gt;hw, IXGBE_DCA_CTRL, 2);</div><div class='ctx'> 		if (dca_add_requester(dev) == 0) {</div><div class='add'>+			adapter-&gt;flags |= IXGBE_FLAG_DCA_ENABLED;</div><div class='ctx'> 			ixgbe_setup_dca(adapter);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -372,7 +383,7 @@ static int __ixgbe_notify_dca(struct device *dev, void *data)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#endif /* CONFIG_DCA */</div><div class='add'>+#endif /* CONFIG_IXGBE_DCA */</div><div class='ctx'> /**</div><div class='ctx'>  * ixgbe_receive_skb - Send a completed packet up the stack</div><div class='ctx'>  * @adapter: board private structure</div><div class='hunk'>@@ -382,8 +393,8 @@ static int __ixgbe_notify_dca(struct device *dev, void *data)</div><div class='ctx'>  * @rx_desc: rx descriptor</div><div class='ctx'>  **/</div><div class='ctx'> static void ixgbe_receive_skb(struct ixgbe_adapter *adapter,</div><div class='del'>-			      struct sk_buff *skb, u8 status,</div><div class='del'>-			      struct ixgbe_ring *ring,</div><div class='add'>+                              struct sk_buff *skb, u8 status,</div><div class='add'>+                              struct ixgbe_ring *ring,</div><div class='ctx'>                               union ixgbe_adv_rx_desc *rx_desc)</div><div class='ctx'> {</div><div class='ctx'> 	bool is_vlan = (status &amp; IXGBE_RXD_STAT_VP);</div><div class='hunk'>@@ -420,14 +431,12 @@ static void ixgbe_receive_skb(struct ixgbe_adapter *adapter,</div><div class='ctx'>  * @skb: skb currently being received and modified</div><div class='ctx'>  **/</div><div class='ctx'> static inline void ixgbe_rx_checksum(struct ixgbe_adapter *adapter,</div><div class='del'>-					 u32 status_err,</div><div class='del'>-					 struct sk_buff *skb)</div><div class='add'>+                                     u32 status_err, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	skb-&gt;ip_summed = CHECKSUM_NONE;</div><div class='ctx'> </div><div class='del'>-	/* Ignore Checksum bit is set, or rx csum disabled */</div><div class='del'>-	if ((status_err &amp; IXGBE_RXD_STAT_IXSM) ||</div><div class='del'>-	    !(adapter-&gt;flags &amp; IXGBE_FLAG_RX_CSUM_ENABLED))</div><div class='add'>+	/* Rx csum disabled */</div><div class='add'>+	if (!(adapter-&gt;flags &amp; IXGBE_FLAG_RX_CSUM_ENABLED))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/* if IP and error */</div><div class='hunk'>@@ -455,37 +464,44 @@ static inline void ixgbe_rx_checksum(struct ixgbe_adapter *adapter,</div><div class='ctx'>  * @adapter: address of board private structure</div><div class='ctx'>  **/</div><div class='ctx'> static void ixgbe_alloc_rx_buffers(struct ixgbe_adapter *adapter,</div><div class='del'>-				       struct ixgbe_ring *rx_ring,</div><div class='del'>-				       int cleaned_count)</div><div class='add'>+                                   struct ixgbe_ring *rx_ring,</div><div class='add'>+                                   int cleaned_count)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *netdev = adapter-&gt;netdev;</div><div class='ctx'> 	struct pci_dev *pdev = adapter-&gt;pdev;</div><div class='ctx'> 	union ixgbe_adv_rx_desc *rx_desc;</div><div class='del'>-	struct ixgbe_rx_buffer *rx_buffer_info;</div><div class='del'>-	struct sk_buff *skb;</div><div class='add'>+	struct ixgbe_rx_buffer *bi;</div><div class='ctx'> 	unsigned int i;</div><div class='del'>-	unsigned int bufsz = adapter-&gt;rx_buf_len + NET_IP_ALIGN;</div><div class='add'>+	unsigned int bufsz = rx_ring-&gt;rx_buf_len + NET_IP_ALIGN;</div><div class='ctx'> </div><div class='ctx'> 	i = rx_ring-&gt;next_to_use;</div><div class='del'>-	rx_buffer_info = &amp;rx_ring-&gt;rx_buffer_info[i];</div><div class='add'>+	bi = &amp;rx_ring-&gt;rx_buffer_info[i];</div><div class='ctx'> </div><div class='ctx'> 	while (cleaned_count--) {</div><div class='ctx'> 		rx_desc = IXGBE_RX_DESC_ADV(*rx_ring, i);</div><div class='ctx'> </div><div class='del'>-		if (!rx_buffer_info-&gt;page &amp;&amp;</div><div class='del'>-				(adapter-&gt;flags &amp; IXGBE_FLAG_RX_PS_ENABLED)) {</div><div class='del'>-			rx_buffer_info-&gt;page = alloc_page(GFP_ATOMIC);</div><div class='del'>-			if (!rx_buffer_info-&gt;page) {</div><div class='del'>-				adapter-&gt;alloc_rx_page_failed++;</div><div class='del'>-				goto no_buffers;</div><div class='add'>+		if (!bi-&gt;page_dma &amp;&amp;</div><div class='add'>+		    (adapter-&gt;flags &amp; IXGBE_FLAG_RX_PS_ENABLED)) {</div><div class='add'>+			if (!bi-&gt;page) {</div><div class='add'>+				bi-&gt;page = alloc_page(GFP_ATOMIC);</div><div class='add'>+				if (!bi-&gt;page) {</div><div class='add'>+					adapter-&gt;alloc_rx_page_failed++;</div><div class='add'>+					goto no_buffers;</div><div class='add'>+				}</div><div class='add'>+				bi-&gt;page_offset = 0;</div><div class='add'>+			} else {</div><div class='add'>+				/* use a half page if we're re-using */</div><div class='add'>+				bi-&gt;page_offset ^= (PAGE_SIZE / 2);</div><div class='ctx'> 			}</div><div class='del'>-			rx_buffer_info-&gt;page_dma =</div><div class='del'>-			    pci_map_page(pdev, rx_buffer_info-&gt;page,</div><div class='del'>-					 0, PAGE_SIZE, PCI_DMA_FROMDEVICE);</div><div class='add'>+</div><div class='add'>+			bi-&gt;page_dma = pci_map_page(pdev, bi-&gt;page,</div><div class='add'>+			                            bi-&gt;page_offset,</div><div class='add'>+			                            (PAGE_SIZE / 2),</div><div class='add'>+			                            PCI_DMA_FROMDEVICE);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (!rx_buffer_info-&gt;skb) {</div><div class='del'>-			skb = netdev_alloc_skb(netdev, bufsz);</div><div class='add'>+		if (!bi-&gt;skb) {</div><div class='add'>+			struct sk_buff *skb = netdev_alloc_skb(adapter-&gt;netdev,</div><div class='add'>+			                                       bufsz);</div><div class='ctx'> </div><div class='ctx'> 			if (!skb) {</div><div class='ctx'> 				adapter-&gt;alloc_rx_buff_failed++;</div><div class='hunk'>@@ -499,28 +515,25 @@ static void ixgbe_alloc_rx_buffers(struct ixgbe_adapter *adapter,</div><div class='ctx'> 			 */</div><div class='ctx'> 			skb_reserve(skb, NET_IP_ALIGN);</div><div class='ctx'> </div><div class='del'>-			rx_buffer_info-&gt;skb = skb;</div><div class='del'>-			rx_buffer_info-&gt;dma = pci_map_single(pdev, skb-&gt;data,</div><div class='del'>-							  bufsz,</div><div class='del'>-							  PCI_DMA_FROMDEVICE);</div><div class='add'>+			bi-&gt;skb = skb;</div><div class='add'>+			bi-&gt;dma = pci_map_single(pdev, skb-&gt;data, bufsz,</div><div class='add'>+			                         PCI_DMA_FROMDEVICE);</div><div class='ctx'> 		}</div><div class='ctx'> 		/* Refresh the desc even if buffer_addrs didn't change because</div><div class='ctx'> 		 * each write-back erases this info. */</div><div class='ctx'> 		if (adapter-&gt;flags &amp; IXGBE_FLAG_RX_PS_ENABLED) {</div><div class='del'>-			rx_desc-&gt;read.pkt_addr =</div><div class='del'>-			    cpu_to_le64(rx_buffer_info-&gt;page_dma);</div><div class='del'>-			rx_desc-&gt;read.hdr_addr =</div><div class='del'>-					cpu_to_le64(rx_buffer_info-&gt;dma);</div><div class='add'>+			rx_desc-&gt;read.pkt_addr = cpu_to_le64(bi-&gt;page_dma);</div><div class='add'>+			rx_desc-&gt;read.hdr_addr = cpu_to_le64(bi-&gt;dma);</div><div class='ctx'> 		} else {</div><div class='del'>-			rx_desc-&gt;read.pkt_addr =</div><div class='del'>-					cpu_to_le64(rx_buffer_info-&gt;dma);</div><div class='add'>+			rx_desc-&gt;read.pkt_addr = cpu_to_le64(bi-&gt;dma);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		i++;</div><div class='ctx'> 		if (i == rx_ring-&gt;count)</div><div class='ctx'> 			i = 0;</div><div class='del'>-		rx_buffer_info = &amp;rx_ring-&gt;rx_buffer_info[i];</div><div class='add'>+		bi = &amp;rx_ring-&gt;rx_buffer_info[i];</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> no_buffers:</div><div class='ctx'> 	if (rx_ring-&gt;next_to_use != i) {</div><div class='ctx'> 		rx_ring-&gt;next_to_use = i;</div><div class='hunk'>@@ -538,46 +551,54 @@ no_buffers:</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline u16 ixgbe_get_hdr_info(union ixgbe_adv_rx_desc *rx_desc)</div><div class='add'>+{</div><div class='add'>+	return rx_desc-&gt;wb.lower.lo_dword.hs_rss.hdr_info;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u16 ixgbe_get_pkt_info(union ixgbe_adv_rx_desc *rx_desc)</div><div class='add'>+{</div><div class='add'>+	return rx_desc-&gt;wb.lower.lo_dword.hs_rss.pkt_info;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static bool ixgbe_clean_rx_irq(struct ixgbe_adapter *adapter,</div><div class='del'>-			       struct ixgbe_ring *rx_ring,</div><div class='del'>-			       int *work_done, int work_to_do)</div><div class='add'>+                               struct ixgbe_ring *rx_ring,</div><div class='add'>+                               int *work_done, int work_to_do)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *netdev = adapter-&gt;netdev;</div><div class='ctx'> 	struct pci_dev *pdev = adapter-&gt;pdev;</div><div class='ctx'> 	union ixgbe_adv_rx_desc *rx_desc, *next_rxd;</div><div class='ctx'> 	struct ixgbe_rx_buffer *rx_buffer_info, *next_buffer;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	unsigned int i;</div><div class='del'>-	u32 upper_len, len, staterr;</div><div class='add'>+	u32 len, staterr;</div><div class='ctx'> 	u16 hdr_info;</div><div class='ctx'> 	bool cleaned = false;</div><div class='ctx'> 	int cleaned_count = 0;</div><div class='ctx'> 	unsigned int total_rx_bytes = 0, total_rx_packets = 0;</div><div class='ctx'> </div><div class='ctx'> 	i = rx_ring-&gt;next_to_clean;</div><div class='del'>-	upper_len = 0;</div><div class='ctx'> 	rx_desc = IXGBE_RX_DESC_ADV(*rx_ring, i);</div><div class='ctx'> 	staterr = le32_to_cpu(rx_desc-&gt;wb.upper.status_error);</div><div class='ctx'> 	rx_buffer_info = &amp;rx_ring-&gt;rx_buffer_info[i];</div><div class='ctx'> </div><div class='ctx'> 	while (staterr &amp; IXGBE_RXD_STAT_DD) {</div><div class='add'>+		u32 upper_len = 0;</div><div class='ctx'> 		if (*work_done &gt;= work_to_do)</div><div class='ctx'> 			break;</div><div class='ctx'> 		(*work_done)++;</div><div class='ctx'> </div><div class='ctx'> 		if (adapter-&gt;flags &amp; IXGBE_FLAG_RX_PS_ENABLED) {</div><div class='del'>-			hdr_info =</div><div class='del'>-			    le16_to_cpu(rx_desc-&gt;wb.lower.lo_dword.hdr_info);</div><div class='del'>-			len =</div><div class='del'>-			    ((hdr_info &amp; IXGBE_RXDADV_HDRBUFLEN_MASK) &gt;&gt;</div><div class='del'>-			     IXGBE_RXDADV_HDRBUFLEN_SHIFT);</div><div class='add'>+			hdr_info = le16_to_cpu(ixgbe_get_hdr_info(rx_desc));</div><div class='add'>+			len = (hdr_info &amp; IXGBE_RXDADV_HDRBUFLEN_MASK) &gt;&gt;</div><div class='add'>+			       IXGBE_RXDADV_HDRBUFLEN_SHIFT;</div><div class='ctx'> 			if (hdr_info &amp; IXGBE_RXDADV_SPH)</div><div class='ctx'> 				adapter-&gt;rx_hdr_split++;</div><div class='ctx'> 			if (len &gt; IXGBE_RX_HDR_SIZE)</div><div class='ctx'> 				len = IXGBE_RX_HDR_SIZE;</div><div class='ctx'> 			upper_len = le16_to_cpu(rx_desc-&gt;wb.upper.length);</div><div class='del'>-		} else</div><div class='add'>+		} else {</div><div class='ctx'> 			len = le16_to_cpu(rx_desc-&gt;wb.upper.length);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		cleaned = true;</div><div class='ctx'> 		skb = rx_buffer_info-&gt;skb;</div><div class='hunk'>@@ -586,18 +607,25 @@ static bool ixgbe_clean_rx_irq(struct ixgbe_adapter *adapter,</div><div class='ctx'> </div><div class='ctx'> 		if (len &amp;&amp; !skb_shinfo(skb)-&gt;nr_frags) {</div><div class='ctx'> 			pci_unmap_single(pdev, rx_buffer_info-&gt;dma,</div><div class='del'>-					 adapter-&gt;rx_buf_len + NET_IP_ALIGN,</div><div class='del'>-					 PCI_DMA_FROMDEVICE);</div><div class='add'>+			                 rx_ring-&gt;rx_buf_len + NET_IP_ALIGN,</div><div class='add'>+			                 PCI_DMA_FROMDEVICE);</div><div class='ctx'> 			skb_put(skb, len);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (upper_len) {</div><div class='ctx'> 			pci_unmap_page(pdev, rx_buffer_info-&gt;page_dma,</div><div class='del'>-				       PAGE_SIZE, PCI_DMA_FROMDEVICE);</div><div class='add'>+			               PAGE_SIZE / 2, PCI_DMA_FROMDEVICE);</div><div class='ctx'> 			rx_buffer_info-&gt;page_dma = 0;</div><div class='ctx'> 			skb_fill_page_desc(skb, skb_shinfo(skb)-&gt;nr_frags,</div><div class='del'>-					   rx_buffer_info-&gt;page, 0, upper_len);</div><div class='del'>-			rx_buffer_info-&gt;page = NULL;</div><div class='add'>+			                   rx_buffer_info-&gt;page,</div><div class='add'>+			                   rx_buffer_info-&gt;page_offset,</div><div class='add'>+			                   upper_len);</div><div class='add'>+</div><div class='add'>+			if ((rx_ring-&gt;rx_buf_len &gt; (PAGE_SIZE / 2)) ||</div><div class='add'>+			    (page_count(rx_buffer_info-&gt;page) != 1))</div><div class='add'>+				rx_buffer_info-&gt;page = NULL;</div><div class='add'>+			else</div><div class='add'>+				get_page(rx_buffer_info-&gt;page);</div><div class='ctx'> </div><div class='ctx'> 			skb-&gt;len += upper_len;</div><div class='ctx'> 			skb-&gt;data_len += upper_len;</div><div class='hunk'>@@ -620,6 +648,7 @@ static bool ixgbe_clean_rx_irq(struct ixgbe_adapter *adapter,</div><div class='ctx'> 			rx_buffer_info-&gt;skb = next_buffer-&gt;skb;</div><div class='ctx'> 			rx_buffer_info-&gt;dma = next_buffer-&gt;dma;</div><div class='ctx'> 			next_buffer-&gt;skb = skb;</div><div class='add'>+			next_buffer-&gt;dma = 0;</div><div class='ctx'> 			adapter-&gt;non_eop_descs++;</div><div class='ctx'> 			goto next_desc;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -635,9 +664,9 @@ static bool ixgbe_clean_rx_irq(struct ixgbe_adapter *adapter,</div><div class='ctx'> 		total_rx_bytes += skb-&gt;len;</div><div class='ctx'> 		total_rx_packets++;</div><div class='ctx'> </div><div class='del'>-		skb-&gt;protocol = eth_type_trans(skb, netdev);</div><div class='add'>+		skb-&gt;protocol = eth_type_trans(skb, adapter-&gt;netdev);</div><div class='ctx'> 		ixgbe_receive_skb(adapter, skb, staterr, rx_ring, rx_desc);</div><div class='del'>-		netdev-&gt;last_rx = jiffies;</div><div class='add'>+		adapter-&gt;netdev-&gt;last_rx = jiffies;</div><div class='ctx'> </div><div class='ctx'> next_desc:</div><div class='ctx'> 		rx_desc-&gt;wb.upper.status_error = 0;</div><div class='hunk'>@@ -666,9 +695,6 @@ next_desc:</div><div class='ctx'> 	if (cleaned_count)</div><div class='ctx'> 		ixgbe_alloc_rx_buffers(adapter, rx_ring, cleaned_count);</div><div class='ctx'> </div><div class='del'>-	adapter-&gt;net_stats.rx_bytes += total_rx_bytes;</div><div class='del'>-	adapter-&gt;net_stats.rx_packets += total_rx_packets;</div><div class='del'>-</div><div class='ctx'> 	rx_ring-&gt;total_packets += total_rx_packets;</div><div class='ctx'> 	rx_ring-&gt;total_bytes += total_rx_bytes;</div><div class='ctx'> 	adapter-&gt;net_stats.rx_bytes += total_rx_bytes;</div><div class='hunk'>@@ -700,43 +726,43 @@ static void ixgbe_configure_msix(struct ixgbe_adapter *adapter)</div><div class='ctx'> 		q_vector = &amp;adapter-&gt;q_vector[v_idx];</div><div class='ctx'> 		/* XXX for_each_bit(...) */</div><div class='ctx'> 		r_idx = find_first_bit(q_vector-&gt;rxr_idx,</div><div class='del'>-				      adapter-&gt;num_rx_queues);</div><div class='add'>+		                       adapter-&gt;num_rx_queues);</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; i &lt; q_vector-&gt;rxr_count; i++) {</div><div class='ctx'> 			j = adapter-&gt;rx_ring[r_idx].reg_idx;</div><div class='ctx'> 			ixgbe_set_ivar(adapter, IXGBE_IVAR_RX_QUEUE(j), v_idx);</div><div class='ctx'> 			r_idx = find_next_bit(q_vector-&gt;rxr_idx,</div><div class='del'>-					      adapter-&gt;num_rx_queues,</div><div class='del'>-					      r_idx + 1);</div><div class='add'>+			                      adapter-&gt;num_rx_queues,</div><div class='add'>+			                      r_idx + 1);</div><div class='ctx'> 		}</div><div class='ctx'> 		r_idx = find_first_bit(q_vector-&gt;txr_idx,</div><div class='del'>-				       adapter-&gt;num_tx_queues);</div><div class='add'>+		                       adapter-&gt;num_tx_queues);</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; i &lt; q_vector-&gt;txr_count; i++) {</div><div class='ctx'> 			j = adapter-&gt;tx_ring[r_idx].reg_idx;</div><div class='ctx'> 			ixgbe_set_ivar(adapter, IXGBE_IVAR_TX_QUEUE(j), v_idx);</div><div class='ctx'> 			r_idx = find_next_bit(q_vector-&gt;txr_idx,</div><div class='del'>-					      adapter-&gt;num_tx_queues,</div><div class='del'>-					      r_idx + 1);</div><div class='add'>+			                      adapter-&gt;num_tx_queues,</div><div class='add'>+			                      r_idx + 1);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/* if this is a tx only vector use half the irq (tx) rate */</div><div class='add'>+		/* if this is a tx only vector halve the interrupt rate */</div><div class='ctx'> 		if (q_vector-&gt;txr_count &amp;&amp; !q_vector-&gt;rxr_count)</div><div class='del'>-			q_vector-&gt;eitr = adapter-&gt;tx_eitr;</div><div class='add'>+			q_vector-&gt;eitr = (adapter-&gt;eitr_param &gt;&gt; 1);</div><div class='ctx'> 		else</div><div class='del'>-			/* rx only or mixed */</div><div class='del'>-			q_vector-&gt;eitr = adapter-&gt;rx_eitr;</div><div class='add'>+			/* rx only */</div><div class='add'>+			q_vector-&gt;eitr = adapter-&gt;eitr_param;</div><div class='ctx'> </div><div class='ctx'> 		IXGBE_WRITE_REG(&amp;adapter-&gt;hw, IXGBE_EITR(v_idx),</div><div class='del'>-				EITR_INTS_PER_SEC_TO_REG(q_vector-&gt;eitr));</div><div class='add'>+		                EITR_INTS_PER_SEC_TO_REG(q_vector-&gt;eitr));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ixgbe_set_ivar(adapter, IXGBE_IVAR_OTHER_CAUSES_INDEX, v_idx);</div><div class='ctx'> 	IXGBE_WRITE_REG(&amp;adapter-&gt;hw, IXGBE_EITR(v_idx), 1950);</div><div class='ctx'> </div><div class='del'>-	/* set up to autoclear timer, lsc, and the vectors */</div><div class='add'>+	/* set up to autoclear timer, and the vectors */</div><div class='ctx'> 	mask = IXGBE_EIMS_ENABLE_MASK;</div><div class='del'>-	mask &amp;= ~IXGBE_EIMS_OTHER;</div><div class='add'>+	mask &amp;= ~(IXGBE_EIMS_OTHER | IXGBE_EIMS_LSC);</div><div class='ctx'> 	IXGBE_WRITE_REG(&amp;adapter-&gt;hw, IXGBE_EIAC, mask);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -766,8 +792,8 @@ enum latency_range {</div><div class='ctx'>  *      parameter (see ixgbe_param.c)</div><div class='ctx'>  **/</div><div class='ctx'> static u8 ixgbe_update_itr(struct ixgbe_adapter *adapter,</div><div class='del'>-			   u32 eitr, u8 itr_setting,</div><div class='del'>-			   int packets, int bytes)</div><div class='add'>+                           u32 eitr, u8 itr_setting,</div><div class='add'>+                           int packets, int bytes)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int retval = itr_setting;</div><div class='ctx'> 	u32 timepassed_us;</div><div class='hunk'>@@ -814,40 +840,40 @@ static void ixgbe_set_itr_msix(struct ixgbe_q_vector *q_vector)</div><div class='ctx'> 	u32 new_itr;</div><div class='ctx'> 	u8 current_itr, ret_itr;</div><div class='ctx'> 	int i, r_idx, v_idx = ((void *)q_vector - (void *)(adapter-&gt;q_vector)) /</div><div class='del'>-			      sizeof(struct ixgbe_q_vector);</div><div class='add'>+	                       sizeof(struct ixgbe_q_vector);</div><div class='ctx'> 	struct ixgbe_ring *rx_ring, *tx_ring;</div><div class='ctx'> </div><div class='ctx'> 	r_idx = find_first_bit(q_vector-&gt;txr_idx, adapter-&gt;num_tx_queues);</div><div class='ctx'> 	for (i = 0; i &lt; q_vector-&gt;txr_count; i++) {</div><div class='ctx'> 		tx_ring = &amp;(adapter-&gt;tx_ring[r_idx]);</div><div class='ctx'> 		ret_itr = ixgbe_update_itr(adapter, q_vector-&gt;eitr,</div><div class='del'>-					   q_vector-&gt;tx_eitr,</div><div class='del'>-					   tx_ring-&gt;total_packets,</div><div class='del'>-					   tx_ring-&gt;total_bytes);</div><div class='add'>+		                           q_vector-&gt;tx_itr,</div><div class='add'>+		                           tx_ring-&gt;total_packets,</div><div class='add'>+		                           tx_ring-&gt;total_bytes);</div><div class='ctx'> 		/* if the result for this queue would decrease interrupt</div><div class='ctx'> 		 * rate for this vector then use that result */</div><div class='del'>-		q_vector-&gt;tx_eitr = ((q_vector-&gt;tx_eitr &gt; ret_itr) ?</div><div class='del'>-				    q_vector-&gt;tx_eitr - 1 : ret_itr);</div><div class='add'>+		q_vector-&gt;tx_itr = ((q_vector-&gt;tx_itr &gt; ret_itr) ?</div><div class='add'>+		                    q_vector-&gt;tx_itr - 1 : ret_itr);</div><div class='ctx'> 		r_idx = find_next_bit(q_vector-&gt;txr_idx, adapter-&gt;num_tx_queues,</div><div class='del'>-				      r_idx + 1);</div><div class='add'>+		                      r_idx + 1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	r_idx = find_first_bit(q_vector-&gt;rxr_idx, adapter-&gt;num_rx_queues);</div><div class='ctx'> 	for (i = 0; i &lt; q_vector-&gt;rxr_count; i++) {</div><div class='ctx'> 		rx_ring = &amp;(adapter-&gt;rx_ring[r_idx]);</div><div class='ctx'> 		ret_itr = ixgbe_update_itr(adapter, q_vector-&gt;eitr,</div><div class='del'>-					   q_vector-&gt;rx_eitr,</div><div class='del'>-					   rx_ring-&gt;total_packets,</div><div class='del'>-					   rx_ring-&gt;total_bytes);</div><div class='add'>+		                           q_vector-&gt;rx_itr,</div><div class='add'>+		                           rx_ring-&gt;total_packets,</div><div class='add'>+		                           rx_ring-&gt;total_bytes);</div><div class='ctx'> 		/* if the result for this queue would decrease interrupt</div><div class='ctx'> 		 * rate for this vector then use that result */</div><div class='del'>-		q_vector-&gt;rx_eitr = ((q_vector-&gt;rx_eitr &gt; ret_itr) ?</div><div class='del'>-				    q_vector-&gt;rx_eitr - 1 : ret_itr);</div><div class='add'>+		q_vector-&gt;rx_itr = ((q_vector-&gt;rx_itr &gt; ret_itr) ?</div><div class='add'>+		                    q_vector-&gt;rx_itr - 1 : ret_itr);</div><div class='ctx'> 		r_idx = find_next_bit(q_vector-&gt;rxr_idx, adapter-&gt;num_rx_queues,</div><div class='del'>-				      r_idx + 1);</div><div class='add'>+		                      r_idx + 1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	current_itr = max(q_vector-&gt;rx_eitr, q_vector-&gt;tx_eitr);</div><div class='add'>+	current_itr = max(q_vector-&gt;rx_itr, q_vector-&gt;tx_itr);</div><div class='ctx'> </div><div class='ctx'> 	switch (current_itr) {</div><div class='ctx'> 	/* counts and packets in update_itr are dependent on these numbers */</div><div class='hunk'>@@ -871,13 +897,27 @@ static void ixgbe_set_itr_msix(struct ixgbe_q_vector *q_vector)</div><div class='ctx'> 		itr_reg = EITR_INTS_PER_SEC_TO_REG(new_itr);</div><div class='ctx'> 		/* must write high and low 16 bits to reset counter */</div><div class='ctx'> 		DPRINTK(TX_ERR, DEBUG, "writing eitr(%d): %08X\n", v_idx,</div><div class='del'>-			itr_reg);</div><div class='add'>+		        itr_reg);</div><div class='ctx'> 		IXGBE_WRITE_REG(hw, IXGBE_EITR(v_idx), itr_reg | (itr_reg)&lt;&lt;16);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+static void ixgbe_check_lsc(struct ixgbe_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	struct ixgbe_hw *hw = &amp;adapter-&gt;hw;</div><div class='add'>+</div><div class='add'>+	adapter-&gt;lsc_int++;</div><div class='add'>+	adapter-&gt;flags |= IXGBE_FLAG_NEED_LINK_UPDATE;</div><div class='add'>+	adapter-&gt;link_check_timeout = jiffies;</div><div class='add'>+	if (!test_bit(__IXGBE_DOWN, &amp;adapter-&gt;state)) {</div><div class='add'>+		IXGBE_WRITE_REG(hw, IXGBE_EIMC, IXGBE_EIMC_LSC);</div><div class='add'>+		schedule_work(&amp;adapter-&gt;watchdog_task);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static irqreturn_t ixgbe_msix_lsc(int irq, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *netdev = data;</div><div class='hunk'>@@ -885,11 +925,8 @@ static irqreturn_t ixgbe_msix_lsc(int irq, void *data)</div><div class='ctx'> 	struct ixgbe_hw *hw = &amp;adapter-&gt;hw;</div><div class='ctx'> 	u32 eicr = IXGBE_READ_REG(hw, IXGBE_EICR);</div><div class='ctx'> </div><div class='del'>-	if (eicr &amp; IXGBE_EICR_LSC) {</div><div class='del'>-		adapter-&gt;lsc_int++;</div><div class='del'>-		if (!test_bit(__IXGBE_DOWN, &amp;adapter-&gt;state))</div><div class='del'>-			mod_timer(&amp;adapter-&gt;watchdog_timer, jiffies);</div><div class='del'>-	}</div><div class='add'>+	if (eicr &amp; IXGBE_EICR_LSC)</div><div class='add'>+		ixgbe_check_lsc(adapter);</div><div class='ctx'> </div><div class='ctx'> 	if (!test_bit(__IXGBE_DOWN, &amp;adapter-&gt;state))</div><div class='ctx'> 		IXGBE_WRITE_REG(hw, IXGBE_EIMS, IXGBE_EIMS_OTHER);</div><div class='hunk'>@@ -901,7 +938,7 @@ static irqreturn_t ixgbe_msix_clean_tx(int irq, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct ixgbe_q_vector *q_vector = data;</div><div class='ctx'> 	struct ixgbe_adapter  *adapter = q_vector-&gt;adapter;</div><div class='del'>-	struct ixgbe_ring     *txr;</div><div class='add'>+	struct ixgbe_ring     *tx_ring;</div><div class='ctx'> 	int i, r_idx;</div><div class='ctx'> </div><div class='ctx'> 	if (!q_vector-&gt;txr_count)</div><div class='hunk'>@@ -909,16 +946,16 @@ static irqreturn_t ixgbe_msix_clean_tx(int irq, void *data)</div><div class='ctx'> </div><div class='ctx'> 	r_idx = find_first_bit(q_vector-&gt;txr_idx, adapter-&gt;num_tx_queues);</div><div class='ctx'> 	for (i = 0; i &lt; q_vector-&gt;txr_count; i++) {</div><div class='del'>-		txr = &amp;(adapter-&gt;tx_ring[r_idx]);</div><div class='del'>-#ifdef CONFIG_DCA</div><div class='add'>+		tx_ring = &amp;(adapter-&gt;tx_ring[r_idx]);</div><div class='add'>+#ifdef CONFIG_IXGBE_DCA</div><div class='ctx'> 		if (adapter-&gt;flags &amp; IXGBE_FLAG_DCA_ENABLED)</div><div class='del'>-			ixgbe_update_tx_dca(adapter, txr);</div><div class='add'>+			ixgbe_update_tx_dca(adapter, tx_ring);</div><div class='ctx'> #endif</div><div class='del'>-		txr-&gt;total_bytes = 0;</div><div class='del'>-		txr-&gt;total_packets = 0;</div><div class='del'>-		ixgbe_clean_tx_irq(adapter, txr);</div><div class='add'>+		tx_ring-&gt;total_bytes = 0;</div><div class='add'>+		tx_ring-&gt;total_packets = 0;</div><div class='add'>+		ixgbe_clean_tx_irq(adapter, tx_ring);</div><div class='ctx'> 		r_idx = find_next_bit(q_vector-&gt;txr_idx, adapter-&gt;num_tx_queues,</div><div class='del'>-				      r_idx + 1);</div><div class='add'>+		                      r_idx + 1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='hunk'>@@ -933,18 +970,26 @@ static irqreturn_t ixgbe_msix_clean_rx(int irq, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct ixgbe_q_vector *q_vector = data;</div><div class='ctx'> 	struct ixgbe_adapter  *adapter = q_vector-&gt;adapter;</div><div class='del'>-	struct ixgbe_ring  *rxr;</div><div class='add'>+	struct ixgbe_ring  *rx_ring;</div><div class='ctx'> 	int r_idx;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	r_idx = find_first_bit(q_vector-&gt;rxr_idx, adapter-&gt;num_rx_queues);</div><div class='add'>+	for (i = 0;  i &lt; q_vector-&gt;rxr_count; i++) {</div><div class='add'>+		rx_ring = &amp;(adapter-&gt;rx_ring[r_idx]);</div><div class='add'>+		rx_ring-&gt;total_bytes = 0;</div><div class='add'>+		rx_ring-&gt;total_packets = 0;</div><div class='add'>+		r_idx = find_next_bit(q_vector-&gt;rxr_idx, adapter-&gt;num_rx_queues,</div><div class='add'>+		                      r_idx + 1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (!q_vector-&gt;rxr_count)</div><div class='ctx'> 		return IRQ_HANDLED;</div><div class='ctx'> </div><div class='del'>-	rxr = &amp;(adapter-&gt;rx_ring[r_idx]);</div><div class='add'>+	r_idx = find_first_bit(q_vector-&gt;rxr_idx, adapter-&gt;num_rx_queues);</div><div class='add'>+	rx_ring = &amp;(adapter-&gt;rx_ring[r_idx]);</div><div class='ctx'> 	/* disable interrupts on this vector only */</div><div class='del'>-	IXGBE_WRITE_REG(&amp;adapter-&gt;hw, IXGBE_EIMC, rxr-&gt;v_idx);</div><div class='del'>-	rxr-&gt;total_bytes = 0;</div><div class='del'>-	rxr-&gt;total_packets = 0;</div><div class='add'>+	IXGBE_WRITE_REG(&amp;adapter-&gt;hw, IXGBE_EIMC, rx_ring-&gt;v_idx);</div><div class='ctx'> 	netif_rx_schedule(adapter-&gt;netdev, &amp;q_vector-&gt;napi);</div><div class='ctx'> </div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='hunk'>@@ -963,39 +1008,90 @@ static irqreturn_t ixgbe_msix_clean_many(int irq, void *data)</div><div class='ctx'>  * @napi: napi struct with our devices info in it</div><div class='ctx'>  * @budget: amount of work driver is allowed to do this pass, in packets</div><div class='ctx'>  *</div><div class='add'>+ * This function is optimized for cleaning one queue only on a single</div><div class='add'>+ * q_vector!!!</div><div class='ctx'>  **/</div><div class='ctx'> static int ixgbe_clean_rxonly(struct napi_struct *napi, int budget)</div><div class='ctx'> {</div><div class='ctx'> 	struct ixgbe_q_vector *q_vector =</div><div class='del'>-			       container_of(napi, struct ixgbe_q_vector, napi);</div><div class='add'>+	                       container_of(napi, struct ixgbe_q_vector, napi);</div><div class='ctx'> 	struct ixgbe_adapter *adapter = q_vector-&gt;adapter;</div><div class='del'>-	struct ixgbe_ring *rxr;</div><div class='add'>+	struct ixgbe_ring *rx_ring = NULL;</div><div class='ctx'> 	int work_done = 0;</div><div class='ctx'> 	long r_idx;</div><div class='ctx'> </div><div class='ctx'> 	r_idx = find_first_bit(q_vector-&gt;rxr_idx, adapter-&gt;num_rx_queues);</div><div class='del'>-	rxr = &amp;(adapter-&gt;rx_ring[r_idx]);</div><div class='del'>-#ifdef CONFIG_DCA</div><div class='add'>+	rx_ring = &amp;(adapter-&gt;rx_ring[r_idx]);</div><div class='add'>+#ifdef CONFIG_IXGBE_DCA</div><div class='ctx'> 	if (adapter-&gt;flags &amp; IXGBE_FLAG_DCA_ENABLED)</div><div class='del'>-		ixgbe_update_rx_dca(adapter, rxr);</div><div class='add'>+		ixgbe_update_rx_dca(adapter, rx_ring);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	ixgbe_clean_rx_irq(adapter, rxr, &amp;work_done, budget);</div><div class='add'>+	ixgbe_clean_rx_irq(adapter, rx_ring, &amp;work_done, budget);</div><div class='ctx'> </div><div class='ctx'> 	/* If all Rx work done, exit the polling mode */</div><div class='ctx'> 	if (work_done &lt; budget) {</div><div class='ctx'> 		netif_rx_complete(adapter-&gt;netdev, napi);</div><div class='del'>-		if (adapter-&gt;rx_eitr &lt; IXGBE_MIN_ITR_USECS)</div><div class='add'>+		if (adapter-&gt;itr_setting &amp; 3)</div><div class='ctx'> 			ixgbe_set_itr_msix(q_vector);</div><div class='ctx'> 		if (!test_bit(__IXGBE_DOWN, &amp;adapter-&gt;state))</div><div class='del'>-			IXGBE_WRITE_REG(&amp;adapter-&gt;hw, IXGBE_EIMS, rxr-&gt;v_idx);</div><div class='add'>+			IXGBE_WRITE_REG(&amp;adapter-&gt;hw, IXGBE_EIMS, rx_ring-&gt;v_idx);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return work_done;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * ixgbe_clean_rxonly_many - msix (aka one shot) rx clean routine</div><div class='add'>+ * @napi: napi struct with our devices info in it</div><div class='add'>+ * @budget: amount of work driver is allowed to do this pass, in packets</div><div class='add'>+ *</div><div class='add'>+ * This function will clean more than one rx queue associated with a</div><div class='add'>+ * q_vector.</div><div class='add'>+ **/</div><div class='add'>+static int ixgbe_clean_rxonly_many(struct napi_struct *napi, int budget)</div><div class='add'>+{</div><div class='add'>+	struct ixgbe_q_vector *q_vector =</div><div class='add'>+	                       container_of(napi, struct ixgbe_q_vector, napi);</div><div class='add'>+	struct ixgbe_adapter *adapter = q_vector-&gt;adapter;</div><div class='add'>+	struct ixgbe_ring *rx_ring = NULL;</div><div class='add'>+	int work_done = 0, i;</div><div class='add'>+	long r_idx;</div><div class='add'>+	u16 enable_mask = 0;</div><div class='add'>+</div><div class='add'>+	/* attempt to distribute budget to each queue fairly, but don't allow</div><div class='add'>+	 * the budget to go below 1 because we'll exit polling */</div><div class='add'>+	budget /= (q_vector-&gt;rxr_count ?: 1);</div><div class='add'>+	budget = max(budget, 1);</div><div class='add'>+	r_idx = find_first_bit(q_vector-&gt;rxr_idx, adapter-&gt;num_rx_queues);</div><div class='add'>+	for (i = 0; i &lt; q_vector-&gt;rxr_count; i++) {</div><div class='add'>+		rx_ring = &amp;(adapter-&gt;rx_ring[r_idx]);</div><div class='add'>+#ifdef CONFIG_IXGBE_DCA</div><div class='add'>+		if (adapter-&gt;flags &amp; IXGBE_FLAG_DCA_ENABLED)</div><div class='add'>+			ixgbe_update_rx_dca(adapter, rx_ring);</div><div class='add'>+#endif</div><div class='add'>+		ixgbe_clean_rx_irq(adapter, rx_ring, &amp;work_done, budget);</div><div class='add'>+		enable_mask |= rx_ring-&gt;v_idx;</div><div class='add'>+		r_idx = find_next_bit(q_vector-&gt;rxr_idx, adapter-&gt;num_rx_queues,</div><div class='add'>+		                      r_idx + 1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	r_idx = find_first_bit(q_vector-&gt;rxr_idx, adapter-&gt;num_rx_queues);</div><div class='add'>+	rx_ring = &amp;(adapter-&gt;rx_ring[r_idx]);</div><div class='add'>+	/* If all Rx work done, exit the polling mode */</div><div class='add'>+	if (work_done &lt; budget) {</div><div class='add'>+		netif_rx_complete(adapter-&gt;netdev, napi);</div><div class='add'>+		if (adapter-&gt;itr_setting &amp; 3)</div><div class='add'>+			ixgbe_set_itr_msix(q_vector);</div><div class='add'>+		if (!test_bit(__IXGBE_DOWN, &amp;adapter-&gt;state))</div><div class='add'>+			IXGBE_WRITE_REG(&amp;adapter-&gt;hw, IXGBE_EIMS, enable_mask);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return work_done;</div><div class='add'>+}</div><div class='ctx'> static inline void map_vector_to_rxq(struct ixgbe_adapter *a, int v_idx,</div><div class='del'>-				     int r_idx)</div><div class='add'>+                                     int r_idx)</div><div class='ctx'> {</div><div class='ctx'> 	a-&gt;q_vector[v_idx].adapter = a;</div><div class='ctx'> 	set_bit(r_idx, a-&gt;q_vector[v_idx].rxr_idx);</div><div class='hunk'>@@ -1004,7 +1100,7 @@ static inline void map_vector_to_rxq(struct ixgbe_adapter *a, int v_idx,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void map_vector_to_txq(struct ixgbe_adapter *a, int v_idx,</div><div class='del'>-				     int r_idx)</div><div class='add'>+                                     int r_idx)</div><div class='ctx'> {</div><div class='ctx'> 	a-&gt;q_vector[v_idx].adapter = a;</div><div class='ctx'> 	set_bit(r_idx, a-&gt;q_vector[v_idx].txr_idx);</div><div class='hunk'>@@ -1024,7 +1120,7 @@ static inline void map_vector_to_txq(struct ixgbe_adapter *a, int v_idx,</div><div class='ctx'>  * mapping configurations in here.</div><div class='ctx'>  **/</div><div class='ctx'> static int ixgbe_map_rings_to_vectors(struct ixgbe_adapter *adapter,</div><div class='del'>-				      int vectors)</div><div class='add'>+                                      int vectors)</div><div class='ctx'> {</div><div class='ctx'> 	int v_start = 0;</div><div class='ctx'> 	int rxr_idx = 0, txr_idx = 0;</div><div class='hunk'>@@ -1101,28 +1197,28 @@ static int ixgbe_request_msix_irqs(struct ixgbe_adapter *adapter)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> #define SET_HANDLER(_v) ((!(_v)-&gt;rxr_count) ? &amp;ixgbe_msix_clean_tx : \</div><div class='del'>-			 (!(_v)-&gt;txr_count) ? &amp;ixgbe_msix_clean_rx : \</div><div class='del'>-			 &amp;ixgbe_msix_clean_many)</div><div class='add'>+                         (!(_v)-&gt;txr_count) ? &amp;ixgbe_msix_clean_rx : \</div><div class='add'>+                         &amp;ixgbe_msix_clean_many)</div><div class='ctx'> 	for (vector = 0; vector &lt; q_vectors; vector++) {</div><div class='ctx'> 		handler = SET_HANDLER(&amp;adapter-&gt;q_vector[vector]);</div><div class='ctx'> 		sprintf(adapter-&gt;name[vector], "%s:v%d-%s",</div><div class='del'>-			netdev-&gt;name, vector,</div><div class='del'>-			(handler == &amp;ixgbe_msix_clean_rx) ? "Rx" :</div><div class='del'>-			 ((handler == &amp;ixgbe_msix_clean_tx) ? "Tx" : "TxRx"));</div><div class='add'>+		        netdev-&gt;name, vector,</div><div class='add'>+		        (handler == &amp;ixgbe_msix_clean_rx) ? "Rx" :</div><div class='add'>+		         ((handler == &amp;ixgbe_msix_clean_tx) ? "Tx" : "TxRx"));</div><div class='ctx'> 		err = request_irq(adapter-&gt;msix_entries[vector].vector,</div><div class='del'>-				  handler, 0, adapter-&gt;name[vector],</div><div class='del'>-				  &amp;(adapter-&gt;q_vector[vector]));</div><div class='add'>+		                  handler, 0, adapter-&gt;name[vector],</div><div class='add'>+		                  &amp;(adapter-&gt;q_vector[vector]));</div><div class='ctx'> 		if (err) {</div><div class='ctx'> 			DPRINTK(PROBE, ERR,</div><div class='del'>-				"request_irq failed for MSIX interrupt "</div><div class='del'>-				"Error: %d\n", err);</div><div class='add'>+			        "request_irq failed for MSIX interrupt "</div><div class='add'>+			        "Error: %d\n", err);</div><div class='ctx'> 			goto free_queue_irqs;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	sprintf(adapter-&gt;name[vector], "%s:lsc", netdev-&gt;name);</div><div class='ctx'> 	err = request_irq(adapter-&gt;msix_entries[vector].vector,</div><div class='del'>-			  &amp;ixgbe_msix_lsc, 0, adapter-&gt;name[vector], netdev);</div><div class='add'>+	                  &amp;ixgbe_msix_lsc, 0, adapter-&gt;name[vector], netdev);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		DPRINTK(PROBE, ERR,</div><div class='ctx'> 			"request_irq for msix_lsc failed: %d\n", err);</div><div class='hunk'>@@ -1134,7 +1230,7 @@ static int ixgbe_request_msix_irqs(struct ixgbe_adapter *adapter)</div><div class='ctx'> free_queue_irqs:</div><div class='ctx'> 	for (i = vector - 1; i &gt;= 0; i--)</div><div class='ctx'> 		free_irq(adapter-&gt;msix_entries[--vector].vector,</div><div class='del'>-			 &amp;(adapter-&gt;q_vector[i]));</div><div class='add'>+		         &amp;(adapter-&gt;q_vector[i]));</div><div class='ctx'> 	adapter-&gt;flags &amp;= ~IXGBE_FLAG_MSIX_ENABLED;</div><div class='ctx'> 	pci_disable_msix(adapter-&gt;pdev);</div><div class='ctx'> 	kfree(adapter-&gt;msix_entries);</div><div class='hunk'>@@ -1152,16 +1248,16 @@ static void ixgbe_set_itr(struct ixgbe_adapter *adapter)</div><div class='ctx'> 	struct ixgbe_ring *rx_ring = &amp;adapter-&gt;rx_ring[0];</div><div class='ctx'> 	struct ixgbe_ring *tx_ring = &amp;adapter-&gt;tx_ring[0];</div><div class='ctx'> </div><div class='del'>-	q_vector-&gt;tx_eitr = ixgbe_update_itr(adapter, new_itr,</div><div class='del'>-					     q_vector-&gt;tx_eitr,</div><div class='del'>-					     tx_ring-&gt;total_packets,</div><div class='del'>-					     tx_ring-&gt;total_bytes);</div><div class='del'>-	q_vector-&gt;rx_eitr = ixgbe_update_itr(adapter, new_itr,</div><div class='del'>-					     q_vector-&gt;rx_eitr,</div><div class='del'>-					     rx_ring-&gt;total_packets,</div><div class='del'>-					     rx_ring-&gt;total_bytes);</div><div class='add'>+	q_vector-&gt;tx_itr = ixgbe_update_itr(adapter, new_itr,</div><div class='add'>+	                                    q_vector-&gt;tx_itr,</div><div class='add'>+	                                    tx_ring-&gt;total_packets,</div><div class='add'>+	                                    tx_ring-&gt;total_bytes);</div><div class='add'>+	q_vector-&gt;rx_itr = ixgbe_update_itr(adapter, new_itr,</div><div class='add'>+	                                    q_vector-&gt;rx_itr,</div><div class='add'>+	                                    rx_ring-&gt;total_packets,</div><div class='add'>+	                                    rx_ring-&gt;total_bytes);</div><div class='ctx'> </div><div class='del'>-	current_itr = max(q_vector-&gt;rx_eitr, q_vector-&gt;tx_eitr);</div><div class='add'>+	current_itr = max(q_vector-&gt;rx_itr, q_vector-&gt;tx_itr);</div><div class='ctx'> </div><div class='ctx'> 	switch (current_itr) {</div><div class='ctx'> 	/* counts and packets in update_itr are dependent on these numbers */</div><div class='hunk'>@@ -1206,19 +1302,19 @@ static irqreturn_t ixgbe_intr(int irq, void *data)</div><div class='ctx'> 	struct ixgbe_hw *hw = &amp;adapter-&gt;hw;</div><div class='ctx'> 	u32 eicr;</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> 	/* for NAPI, using EIAM to auto-mask tx/rx interrupt bits on read</div><div class='ctx'> 	 * therefore no explict interrupt disable is necessary */</div><div class='ctx'> 	eicr = IXGBE_READ_REG(hw, IXGBE_EICR);</div><div class='del'>-	if (!eicr)</div><div class='add'>+	if (!eicr) {</div><div class='add'>+		/* shared interrupt alert!</div><div class='add'>+		 * make sure interrupts are enabled because the read will</div><div class='add'>+		 * have disabled interrupts due to EIAM */</div><div class='add'>+		ixgbe_irq_enable(adapter);</div><div class='ctx'> 		return IRQ_NONE;	/* Not our interrupt */</div><div class='del'>-</div><div class='del'>-	if (eicr &amp; IXGBE_EICR_LSC) {</div><div class='del'>-		adapter-&gt;lsc_int++;</div><div class='del'>-		if (!test_bit(__IXGBE_DOWN, &amp;adapter-&gt;state))</div><div class='del'>-			mod_timer(&amp;adapter-&gt;watchdog_timer, jiffies);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (eicr &amp; IXGBE_EICR_LSC)</div><div class='add'>+		ixgbe_check_lsc(adapter);</div><div class='ctx'> </div><div class='ctx'> 	if (netif_rx_schedule_prep(netdev, &amp;adapter-&gt;q_vector[0].napi)) {</div><div class='ctx'> 		adapter-&gt;tx_ring[0].total_packets = 0;</div><div class='hunk'>@@ -1261,10 +1357,10 @@ static int ixgbe_request_irq(struct ixgbe_adapter *adapter)</div><div class='ctx'> 		err = ixgbe_request_msix_irqs(adapter);</div><div class='ctx'> 	} else if (adapter-&gt;flags &amp; IXGBE_FLAG_MSI_ENABLED) {</div><div class='ctx'> 		err = request_irq(adapter-&gt;pdev-&gt;irq, &amp;ixgbe_intr, 0,</div><div class='del'>-				  netdev-&gt;name, netdev);</div><div class='add'>+		                  netdev-&gt;name, netdev);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		err = request_irq(adapter-&gt;pdev-&gt;irq, &amp;ixgbe_intr, IRQF_SHARED,</div><div class='del'>-				  netdev-&gt;name, netdev);</div><div class='add'>+		                  netdev-&gt;name, netdev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (err)</div><div class='hunk'>@@ -1288,7 +1384,7 @@ static void ixgbe_free_irq(struct ixgbe_adapter *adapter)</div><div class='ctx'> 		i--;</div><div class='ctx'> 		for (; i &gt;= 0; i--) {</div><div class='ctx'> 			free_irq(adapter-&gt;msix_entries[i].vector,</div><div class='del'>-				 &amp;(adapter-&gt;q_vector[i]));</div><div class='add'>+			         &amp;(adapter-&gt;q_vector[i]));</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		ixgbe_reset_q_vectors(adapter);</div><div class='hunk'>@@ -1335,7 +1431,7 @@ static void ixgbe_configure_msi_and_legacy(struct ixgbe_adapter *adapter)</div><div class='ctx'> 	struct ixgbe_hw *hw = &amp;adapter-&gt;hw;</div><div class='ctx'> </div><div class='ctx'> 	IXGBE_WRITE_REG(hw, IXGBE_EITR(0),</div><div class='del'>-			EITR_INTS_PER_SEC_TO_REG(adapter-&gt;rx_eitr));</div><div class='add'>+	                EITR_INTS_PER_SEC_TO_REG(adapter-&gt;eitr_param));</div><div class='ctx'> </div><div class='ctx'> 	ixgbe_set_ivar(adapter, IXGBE_IVAR_RX_QUEUE(0), 0);</div><div class='ctx'> 	ixgbe_set_ivar(adapter, IXGBE_IVAR_TX_QUEUE(0), 0);</div><div class='hunk'>@@ -1347,26 +1443,31 @@ static void ixgbe_configure_msi_and_legacy(struct ixgbe_adapter *adapter)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ixgbe_configure_tx - Configure 8254x Transmit Unit after Reset</div><div class='add'>+ * ixgbe_configure_tx - Configure 8259x Transmit Unit after Reset</div><div class='ctx'>  * @adapter: board private structure</div><div class='ctx'>  *</div><div class='ctx'>  * Configure the Tx unit of the MAC after a reset.</div><div class='ctx'>  **/</div><div class='ctx'> static void ixgbe_configure_tx(struct ixgbe_adapter *adapter)</div><div class='ctx'> {</div><div class='del'>-	u64 tdba;</div><div class='add'>+	u64 tdba, tdwba;</div><div class='ctx'> 	struct ixgbe_hw *hw = &amp;adapter-&gt;hw;</div><div class='ctx'> 	u32 i, j, tdlen, txctrl;</div><div class='ctx'> </div><div class='ctx'> 	/* Setup the HW Tx Head and Tail descriptor pointers */</div><div class='ctx'> 	for (i = 0; i &lt; adapter-&gt;num_tx_queues; i++) {</div><div class='del'>-		j = adapter-&gt;tx_ring[i].reg_idx;</div><div class='del'>-		tdba = adapter-&gt;tx_ring[i].dma;</div><div class='del'>-		tdlen = adapter-&gt;tx_ring[i].count *</div><div class='del'>-			sizeof(union ixgbe_adv_tx_desc);</div><div class='add'>+		struct ixgbe_ring *ring = &amp;adapter-&gt;tx_ring[i];</div><div class='add'>+		j = ring-&gt;reg_idx;</div><div class='add'>+		tdba = ring-&gt;dma;</div><div class='add'>+		tdlen = ring-&gt;count * sizeof(union ixgbe_adv_tx_desc);</div><div class='ctx'> 		IXGBE_WRITE_REG(hw, IXGBE_TDBAL(j),</div><div class='del'>-				(tdba &amp; DMA_32BIT_MASK));</div><div class='add'>+		                (tdba &amp; DMA_32BIT_MASK));</div><div class='ctx'> 		IXGBE_WRITE_REG(hw, IXGBE_TDBAH(j), (tdba &gt;&gt; 32));</div><div class='add'>+		tdwba = ring-&gt;dma +</div><div class='add'>+		        (ring-&gt;count * sizeof(union ixgbe_adv_tx_desc));</div><div class='add'>+		tdwba |= IXGBE_TDWBAL_HEAD_WB_ENABLE;</div><div class='add'>+		IXGBE_WRITE_REG(hw, IXGBE_TDWBAL(j), tdwba &amp; DMA_32BIT_MASK);</div><div class='add'>+		IXGBE_WRITE_REG(hw, IXGBE_TDWBAH(j), (tdwba &gt;&gt; 32));</div><div class='ctx'> 		IXGBE_WRITE_REG(hw, IXGBE_TDLEN(j), tdlen);</div><div class='ctx'> 		IXGBE_WRITE_REG(hw, IXGBE_TDH(j), 0);</div><div class='ctx'> 		IXGBE_WRITE_REG(hw, IXGBE_TDT(j), 0);</div><div class='hunk'>@@ -1375,20 +1476,66 @@ static void ixgbe_configure_tx(struct ixgbe_adapter *adapter)</div><div class='ctx'> 		/* Disable Tx Head Writeback RO bit, since this hoses</div><div class='ctx'> 		 * bookkeeping if things aren't delivered in order.</div><div class='ctx'> 		 */</div><div class='del'>-		txctrl = IXGBE_READ_REG(hw, IXGBE_DCA_TXCTRL(i));</div><div class='add'>+		txctrl = IXGBE_READ_REG(hw, IXGBE_DCA_TXCTRL(j));</div><div class='ctx'> 		txctrl &amp;= ~IXGBE_DCA_TXCTRL_TX_WB_RO_EN;</div><div class='del'>-		IXGBE_WRITE_REG(hw, IXGBE_DCA_TXCTRL(i), txctrl);</div><div class='add'>+		IXGBE_WRITE_REG(hw, IXGBE_DCA_TXCTRL(j), txctrl);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define PAGE_USE_COUNT(S) (((S) &gt;&gt; PAGE_SHIFT) + \</div><div class='del'>-			(((S) &amp; (PAGE_SIZE - 1)) ? 1 : 0))</div><div class='add'>+#define IXGBE_SRRCTL_BSIZEHDRSIZE_SHIFT	2</div><div class='add'>+</div><div class='add'>+static void ixgbe_configure_srrctl(struct ixgbe_adapter *adapter, int index)</div><div class='add'>+{</div><div class='add'>+	struct ixgbe_ring *rx_ring;</div><div class='add'>+	u32 srrctl;</div><div class='add'>+	int queue0;</div><div class='add'>+	unsigned long mask;</div><div class='add'>+</div><div class='add'>+	/* program one srrctl register per VMDq index */</div><div class='add'>+	if (adapter-&gt;flags &amp; IXGBE_FLAG_VMDQ_ENABLED) {</div><div class='add'>+		long shift, len;</div><div class='add'>+		mask = (unsigned long) adapter-&gt;ring_feature[RING_F_RSS].mask;</div><div class='add'>+		len = sizeof(adapter-&gt;ring_feature[RING_F_VMDQ].mask) * 8;</div><div class='add'>+		shift = find_first_bit(&amp;mask, len);</div><div class='add'>+		queue0 = index &amp; mask;</div><div class='add'>+		index = (index &amp; mask) &gt;&gt; shift;</div><div class='add'>+	/* program one srrctl per RSS queue since RDRXCTL.MVMEN is enabled */</div><div class='add'>+	} else {</div><div class='add'>+		mask = (unsigned long) adapter-&gt;ring_feature[RING_F_RSS].mask;</div><div class='add'>+		queue0 = index &amp; mask;</div><div class='add'>+		index = index &amp; mask;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rx_ring = &amp;adapter-&gt;rx_ring[queue0];</div><div class='add'>+</div><div class='add'>+	srrctl = IXGBE_READ_REG(&amp;adapter-&gt;hw, IXGBE_SRRCTL(index));</div><div class='add'>+</div><div class='add'>+	srrctl &amp;= ~IXGBE_SRRCTL_BSIZEHDR_MASK;</div><div class='add'>+	srrctl &amp;= ~IXGBE_SRRCTL_BSIZEPKT_MASK;</div><div class='add'>+</div><div class='add'>+	if (adapter-&gt;flags &amp; IXGBE_FLAG_RX_PS_ENABLED) {</div><div class='add'>+		srrctl |= IXGBE_RXBUFFER_2048 &gt;&gt; IXGBE_SRRCTL_BSIZEPKT_SHIFT;</div><div class='add'>+		srrctl |= IXGBE_SRRCTL_DESCTYPE_HDR_SPLIT_ALWAYS;</div><div class='add'>+		srrctl |= ((IXGBE_RX_HDR_SIZE &lt;&lt;</div><div class='add'>+		            IXGBE_SRRCTL_BSIZEHDRSIZE_SHIFT) &amp;</div><div class='add'>+		           IXGBE_SRRCTL_BSIZEHDR_MASK);</div><div class='add'>+	} else {</div><div class='add'>+		srrctl |= IXGBE_SRRCTL_DESCTYPE_ADV_ONEBUF;</div><div class='add'>+</div><div class='add'>+		if (rx_ring-&gt;rx_buf_len == MAXIMUM_ETHERNET_VLAN_SIZE)</div><div class='add'>+			srrctl |= IXGBE_RXBUFFER_2048 &gt;&gt;</div><div class='add'>+			          IXGBE_SRRCTL_BSIZEPKT_SHIFT;</div><div class='add'>+		else</div><div class='add'>+			srrctl |= rx_ring-&gt;rx_buf_len &gt;&gt;</div><div class='add'>+			          IXGBE_SRRCTL_BSIZEPKT_SHIFT;</div><div class='add'>+	}</div><div class='add'>+	IXGBE_WRITE_REG(&amp;adapter-&gt;hw, IXGBE_SRRCTL(index), srrctl);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-#define IXGBE_SRRCTL_BSIZEHDRSIZE_SHIFT			2</div><div class='ctx'> /**</div><div class='ctx'>  * ixgbe_get_skb_hdr - helper function for LRO header processing</div><div class='ctx'>  * @skb: pointer to sk_buff to be added to LRO packet</div><div class='del'>- * @iphdr: pointer to tcp header structure</div><div class='add'>+ * @iphdr: pointer to ip header structure</div><div class='ctx'>  * @tcph: pointer to tcp header structure</div><div class='ctx'>  * @hdr_flags: pointer to header flags</div><div class='ctx'>  * @priv: private data</div><div class='hunk'>@@ -1399,8 +1546,8 @@ static int ixgbe_get_skb_hdr(struct sk_buff *skb, void **iphdr, void **tcph,</div><div class='ctx'> 	union ixgbe_adv_rx_desc *rx_desc = priv;</div><div class='ctx'> </div><div class='ctx'> 	/* Verify that this is a valid IPv4 TCP packet */</div><div class='del'>-	if (!(rx_desc-&gt;wb.lower.lo_dword.pkt_info &amp;</div><div class='del'>-	    (IXGBE_RXDADV_PKTTYPE_IPV4 | IXGBE_RXDADV_PKTTYPE_TCP)))</div><div class='add'>+	if (!((ixgbe_get_pkt_info(rx_desc) &amp; IXGBE_RXDADV_PKTTYPE_IPV4) &amp;&amp;</div><div class='add'>+	     (ixgbe_get_pkt_info(rx_desc) &amp; IXGBE_RXDADV_PKTTYPE_TCP)))</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='ctx'> 	/* Set network headers */</div><div class='hunk'>@@ -1412,8 +1559,11 @@ static int ixgbe_get_skb_hdr(struct sk_buff *skb, void **iphdr, void **tcph,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define PAGE_USE_COUNT(S) (((S) &gt;&gt; PAGE_SHIFT) + \</div><div class='add'>+                           (((S) &amp; (PAGE_SIZE - 1)) ? 1 : 0))</div><div class='add'>+</div><div class='ctx'> /**</div><div class='del'>- * ixgbe_configure_rx - Configure 8254x Receive Unit after Reset</div><div class='add'>+ * ixgbe_configure_rx - Configure 8259x Receive Unit after Reset</div><div class='ctx'>  * @adapter: board private structure</div><div class='ctx'>  *</div><div class='ctx'>  * Configure the Rx unit of the MAC after a reset.</div><div class='hunk'>@@ -1426,25 +1576,26 @@ static void ixgbe_configure_rx(struct ixgbe_adapter *adapter)</div><div class='ctx'> 	int max_frame = netdev-&gt;mtu + ETH_HLEN + ETH_FCS_LEN;</div><div class='ctx'> 	int i, j;</div><div class='ctx'> 	u32 rdlen, rxctrl, rxcsum;</div><div class='del'>-	u32 random[10];</div><div class='add'>+	static const u32 seed[10] = { 0xE291D73D, 0x1805EC6C, 0x2A94B30D,</div><div class='add'>+	                  0xA54F2BEC, 0xEA49AF7C, 0xE214AD3D, 0xB855AABE,</div><div class='add'>+	                  0x6A3E67EA, 0x14364D17, 0x3BED200D};</div><div class='ctx'> 	u32 fctrl, hlreg0;</div><div class='ctx'> 	u32 pages;</div><div class='del'>-	u32 reta = 0, mrqc, srrctl;</div><div class='add'>+	u32 reta = 0, mrqc;</div><div class='add'>+	u32 rdrxctl;</div><div class='add'>+	int rx_buf_len;</div><div class='ctx'> </div><div class='ctx'> 	/* Decide whether to use packet split mode or not */</div><div class='del'>-	if (netdev-&gt;mtu &gt; ETH_DATA_LEN)</div><div class='del'>-		adapter-&gt;flags |= IXGBE_FLAG_RX_PS_ENABLED;</div><div class='del'>-	else</div><div class='del'>-		adapter-&gt;flags &amp;= ~IXGBE_FLAG_RX_PS_ENABLED;</div><div class='add'>+	adapter-&gt;flags |= IXGBE_FLAG_RX_PS_ENABLED;</div><div class='ctx'> </div><div class='ctx'> 	/* Set the RX buffer length according to the mode */</div><div class='ctx'> 	if (adapter-&gt;flags &amp; IXGBE_FLAG_RX_PS_ENABLED) {</div><div class='del'>-		adapter-&gt;rx_buf_len = IXGBE_RX_HDR_SIZE;</div><div class='add'>+		rx_buf_len = IXGBE_RX_HDR_SIZE;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (netdev-&gt;mtu &lt;= ETH_DATA_LEN)</div><div class='del'>-			adapter-&gt;rx_buf_len = MAXIMUM_ETHERNET_VLAN_SIZE;</div><div class='add'>+			rx_buf_len = MAXIMUM_ETHERNET_VLAN_SIZE;</div><div class='ctx'> 		else</div><div class='del'>-			adapter-&gt;rx_buf_len = ALIGN(max_frame, 1024);</div><div class='add'>+			rx_buf_len = ALIGN(max_frame, 1024);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	fctrl = IXGBE_READ_REG(&amp;adapter-&gt;hw, IXGBE_FCTRL);</div><div class='hunk'>@@ -1461,28 +1612,6 @@ static void ixgbe_configure_rx(struct ixgbe_adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> 	pages = PAGE_USE_COUNT(adapter-&gt;netdev-&gt;mtu);</div><div class='ctx'> </div><div class='del'>-	srrctl = IXGBE_READ_REG(&amp;adapter-&gt;hw, IXGBE_SRRCTL(0));</div><div class='del'>-	srrctl &amp;= ~IXGBE_SRRCTL_BSIZEHDR_MASK;</div><div class='del'>-	srrctl &amp;= ~IXGBE_SRRCTL_BSIZEPKT_MASK;</div><div class='del'>-</div><div class='del'>-	if (adapter-&gt;flags &amp; IXGBE_FLAG_RX_PS_ENABLED) {</div><div class='del'>-		srrctl |= PAGE_SIZE &gt;&gt; IXGBE_SRRCTL_BSIZEPKT_SHIFT;</div><div class='del'>-		srrctl |= IXGBE_SRRCTL_DESCTYPE_HDR_SPLIT_ALWAYS;</div><div class='del'>-		srrctl |= ((IXGBE_RX_HDR_SIZE &lt;&lt;</div><div class='del'>-			    IXGBE_SRRCTL_BSIZEHDRSIZE_SHIFT) &amp;</div><div class='del'>-			   IXGBE_SRRCTL_BSIZEHDR_MASK);</div><div class='del'>-	} else {</div><div class='del'>-		srrctl |= IXGBE_SRRCTL_DESCTYPE_ADV_ONEBUF;</div><div class='del'>-</div><div class='del'>-		if (adapter-&gt;rx_buf_len == MAXIMUM_ETHERNET_VLAN_SIZE)</div><div class='del'>-			srrctl |=</div><div class='del'>-			     IXGBE_RXBUFFER_2048 &gt;&gt; IXGBE_SRRCTL_BSIZEPKT_SHIFT;</div><div class='del'>-		else</div><div class='del'>-			srrctl |=</div><div class='del'>-			     adapter-&gt;rx_buf_len &gt;&gt; IXGBE_SRRCTL_BSIZEPKT_SHIFT;</div><div class='del'>-	}</div><div class='del'>-	IXGBE_WRITE_REG(&amp;adapter-&gt;hw, IXGBE_SRRCTL(0), srrctl);</div><div class='del'>-</div><div class='ctx'> 	rdlen = adapter-&gt;rx_ring[0].count * sizeof(union ixgbe_adv_rx_desc);</div><div class='ctx'> 	/* disable receives while setting up the descriptors */</div><div class='ctx'> 	rxctrl = IXGBE_READ_REG(hw, IXGBE_RXCTRL);</div><div class='hunk'>@@ -1492,25 +1621,43 @@ static void ixgbe_configure_rx(struct ixgbe_adapter *adapter)</div><div class='ctx'> 	 * the Base and Length of the Rx Descriptor Ring */</div><div class='ctx'> 	for (i = 0; i &lt; adapter-&gt;num_rx_queues; i++) {</div><div class='ctx'> 		rdba = adapter-&gt;rx_ring[i].dma;</div><div class='del'>-		IXGBE_WRITE_REG(hw, IXGBE_RDBAL(i), (rdba &amp; DMA_32BIT_MASK));</div><div class='del'>-		IXGBE_WRITE_REG(hw, IXGBE_RDBAH(i), (rdba &gt;&gt; 32));</div><div class='del'>-		IXGBE_WRITE_REG(hw, IXGBE_RDLEN(i), rdlen);</div><div class='del'>-		IXGBE_WRITE_REG(hw, IXGBE_RDH(i), 0);</div><div class='del'>-		IXGBE_WRITE_REG(hw, IXGBE_RDT(i), 0);</div><div class='del'>-		adapter-&gt;rx_ring[i].head = IXGBE_RDH(i);</div><div class='del'>-		adapter-&gt;rx_ring[i].tail = IXGBE_RDT(i);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Intitial LRO Settings */</div><div class='del'>-	adapter-&gt;rx_ring[i].lro_mgr.max_aggr = IXGBE_MAX_LRO_AGGREGATE;</div><div class='del'>-	adapter-&gt;rx_ring[i].lro_mgr.max_desc = IXGBE_MAX_LRO_DESCRIPTORS;</div><div class='del'>-	adapter-&gt;rx_ring[i].lro_mgr.get_skb_header = ixgbe_get_skb_hdr;</div><div class='del'>-	adapter-&gt;rx_ring[i].lro_mgr.features = LRO_F_EXTRACT_VLAN_ID;</div><div class='del'>-	if (!(adapter-&gt;flags &amp; IXGBE_FLAG_IN_NETPOLL))</div><div class='del'>-		adapter-&gt;rx_ring[i].lro_mgr.features |= LRO_F_NAPI;</div><div class='del'>-	adapter-&gt;rx_ring[i].lro_mgr.dev = adapter-&gt;netdev;</div><div class='del'>-	adapter-&gt;rx_ring[i].lro_mgr.ip_summed = CHECKSUM_UNNECESSARY;</div><div class='del'>-	adapter-&gt;rx_ring[i].lro_mgr.ip_summed_aggr = CHECKSUM_UNNECESSARY;</div><div class='add'>+		j = adapter-&gt;rx_ring[i].reg_idx;</div><div class='add'>+		IXGBE_WRITE_REG(hw, IXGBE_RDBAL(j), (rdba &amp; DMA_32BIT_MASK));</div><div class='add'>+		IXGBE_WRITE_REG(hw, IXGBE_RDBAH(j), (rdba &gt;&gt; 32));</div><div class='add'>+		IXGBE_WRITE_REG(hw, IXGBE_RDLEN(j), rdlen);</div><div class='add'>+		IXGBE_WRITE_REG(hw, IXGBE_RDH(j), 0);</div><div class='add'>+		IXGBE_WRITE_REG(hw, IXGBE_RDT(j), 0);</div><div class='add'>+		adapter-&gt;rx_ring[i].head = IXGBE_RDH(j);</div><div class='add'>+		adapter-&gt;rx_ring[i].tail = IXGBE_RDT(j);</div><div class='add'>+		adapter-&gt;rx_ring[i].rx_buf_len = rx_buf_len;</div><div class='add'>+		/* Intitial LRO Settings */</div><div class='add'>+		adapter-&gt;rx_ring[i].lro_mgr.max_aggr = IXGBE_MAX_LRO_AGGREGATE;</div><div class='add'>+		adapter-&gt;rx_ring[i].lro_mgr.max_desc = IXGBE_MAX_LRO_DESCRIPTORS;</div><div class='add'>+		adapter-&gt;rx_ring[i].lro_mgr.get_skb_header = ixgbe_get_skb_hdr;</div><div class='add'>+		adapter-&gt;rx_ring[i].lro_mgr.features = LRO_F_EXTRACT_VLAN_ID;</div><div class='add'>+		if (!(adapter-&gt;flags &amp; IXGBE_FLAG_IN_NETPOLL))</div><div class='add'>+			adapter-&gt;rx_ring[i].lro_mgr.features |= LRO_F_NAPI;</div><div class='add'>+		adapter-&gt;rx_ring[i].lro_mgr.dev = adapter-&gt;netdev;</div><div class='add'>+		adapter-&gt;rx_ring[i].lro_mgr.ip_summed = CHECKSUM_UNNECESSARY;</div><div class='add'>+		adapter-&gt;rx_ring[i].lro_mgr.ip_summed_aggr = CHECKSUM_UNNECESSARY;</div><div class='add'>+</div><div class='add'>+		ixgbe_configure_srrctl(adapter, j);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * For VMDq support of different descriptor types or</div><div class='add'>+	 * buffer sizes through the use of multiple SRRCTL</div><div class='add'>+	 * registers, RDRXCTL.MVMEN must be set to 1</div><div class='add'>+	 *</div><div class='add'>+	 * also, the manual doesn't mention it clearly but DCA hints</div><div class='add'>+	 * will only use queue 0's tags unless this bit is set.  Side</div><div class='add'>+	 * effects of setting this bit are only that SRRCTL must be</div><div class='add'>+	 * fully programmed [0..15]</div><div class='add'>+	 */</div><div class='add'>+	rdrxctl = IXGBE_READ_REG(hw, IXGBE_RDRXCTL);</div><div class='add'>+	rdrxctl |= IXGBE_RDRXCTL_MVMEN;</div><div class='add'>+	IXGBE_WRITE_REG(hw, IXGBE_RDRXCTL, rdrxctl);</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> 	if (adapter-&gt;flags &amp; IXGBE_FLAG_RSS_ENABLED) {</div><div class='ctx'> 		/* Fill out redirection table */</div><div class='hunk'>@@ -1525,22 +1672,20 @@ static void ixgbe_configure_rx(struct ixgbe_adapter *adapter)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Fill out hash function seeds */</div><div class='del'>-		/* XXX use a random constant here to glue certain flows */</div><div class='del'>-		get_random_bytes(&amp;random[0], 40);</div><div class='ctx'> 		for (i = 0; i &lt; 10; i++)</div><div class='del'>-			IXGBE_WRITE_REG(hw, IXGBE_RSSRK(i), random[i]);</div><div class='add'>+			IXGBE_WRITE_REG(hw, IXGBE_RSSRK(i), seed[i]);</div><div class='ctx'> </div><div class='ctx'> 		mrqc = IXGBE_MRQC_RSSEN</div><div class='ctx'> 		    /* Perform hash on these packet types */</div><div class='del'>-		    | IXGBE_MRQC_RSS_FIELD_IPV4</div><div class='del'>-		    | IXGBE_MRQC_RSS_FIELD_IPV4_TCP</div><div class='del'>-		    | IXGBE_MRQC_RSS_FIELD_IPV4_UDP</div><div class='del'>-		    | IXGBE_MRQC_RSS_FIELD_IPV6_EX_TCP</div><div class='del'>-		    | IXGBE_MRQC_RSS_FIELD_IPV6_EX</div><div class='del'>-		    | IXGBE_MRQC_RSS_FIELD_IPV6</div><div class='del'>-		    | IXGBE_MRQC_RSS_FIELD_IPV6_TCP</div><div class='del'>-		    | IXGBE_MRQC_RSS_FIELD_IPV6_UDP</div><div class='del'>-		    | IXGBE_MRQC_RSS_FIELD_IPV6_EX_UDP;</div><div class='add'>+		       | IXGBE_MRQC_RSS_FIELD_IPV4</div><div class='add'>+		       | IXGBE_MRQC_RSS_FIELD_IPV4_TCP</div><div class='add'>+		       | IXGBE_MRQC_RSS_FIELD_IPV4_UDP</div><div class='add'>+		       | IXGBE_MRQC_RSS_FIELD_IPV6_EX_TCP</div><div class='add'>+		       | IXGBE_MRQC_RSS_FIELD_IPV6_EX</div><div class='add'>+		       | IXGBE_MRQC_RSS_FIELD_IPV6</div><div class='add'>+		       | IXGBE_MRQC_RSS_FIELD_IPV6_TCP</div><div class='add'>+		       | IXGBE_MRQC_RSS_FIELD_IPV6_UDP</div><div class='add'>+		       | IXGBE_MRQC_RSS_FIELD_IPV6_EX_UDP;</div><div class='ctx'> 		IXGBE_WRITE_REG(hw, IXGBE_MRQC, mrqc);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1562,7 +1707,7 @@ static void ixgbe_configure_rx(struct ixgbe_adapter *adapter)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ixgbe_vlan_rx_register(struct net_device *netdev,</div><div class='del'>-				   struct vlan_group *grp)</div><div class='add'>+                                   struct vlan_group *grp)</div><div class='ctx'> {</div><div class='ctx'> 	struct ixgbe_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> 	u32 ctrl;</div><div class='hunk'>@@ -1586,14 +1731,16 @@ static void ixgbe_vlan_rx_register(struct net_device *netdev,</div><div class='ctx'> static void ixgbe_vlan_rx_add_vid(struct net_device *netdev, u16 vid)</div><div class='ctx'> {</div><div class='ctx'> 	struct ixgbe_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+	struct ixgbe_hw *hw = &amp;adapter-&gt;hw;</div><div class='ctx'> </div><div class='ctx'> 	/* add VID to filter table */</div><div class='del'>-	ixgbe_set_vfta(&amp;adapter-&gt;hw, vid, 0, true);</div><div class='add'>+	hw-&gt;mac.ops.set_vfta(&amp;adapter-&gt;hw, vid, 0, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ixgbe_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)</div><div class='ctx'> {</div><div class='ctx'> 	struct ixgbe_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+	struct ixgbe_hw *hw = &amp;adapter-&gt;hw;</div><div class='ctx'> </div><div class='ctx'> 	if (!test_bit(__IXGBE_DOWN, &amp;adapter-&gt;state))</div><div class='ctx'> 		ixgbe_irq_disable(adapter);</div><div class='hunk'>@@ -1604,7 +1751,7 @@ static void ixgbe_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)</div><div class='ctx'> 		ixgbe_irq_enable(adapter);</div><div class='ctx'> </div><div class='ctx'> 	/* remove VID from filter table */</div><div class='del'>-	ixgbe_set_vfta(&amp;adapter-&gt;hw, vid, 0, false);</div><div class='add'>+	hw-&gt;mac.ops.set_vfta(&amp;adapter-&gt;hw, vid, 0, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ixgbe_restore_vlan(struct ixgbe_adapter *adapter)</div><div class='hunk'>@@ -1621,23 +1768,37 @@ static void ixgbe_restore_vlan(struct ixgbe_adapter *adapter)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static u8 *ixgbe_addr_list_itr(struct ixgbe_hw *hw, u8 **mc_addr_ptr, u32 *vmdq)</div><div class='add'>+{</div><div class='add'>+	struct dev_mc_list *mc_ptr;</div><div class='add'>+	u8 *addr = *mc_addr_ptr;</div><div class='add'>+	*vmdq = 0;</div><div class='add'>+</div><div class='add'>+	mc_ptr = container_of(addr, struct dev_mc_list, dmi_addr[0]);</div><div class='add'>+	if (mc_ptr-&gt;next)</div><div class='add'>+		*mc_addr_ptr = mc_ptr-&gt;next-&gt;dmi_addr;</div><div class='add'>+	else</div><div class='add'>+		*mc_addr_ptr = NULL;</div><div class='add'>+</div><div class='add'>+	return addr;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='del'>- * ixgbe_set_multi - Multicast and Promiscuous mode set</div><div class='add'>+ * ixgbe_set_rx_mode - Unicast, Multicast and Promiscuous mode set</div><div class='ctx'>  * @netdev: network interface device structure</div><div class='ctx'>  *</div><div class='del'>- * The set_multi entry point is called whenever the multicast address</div><div class='del'>- * list or the network interface flags are updated.  This routine is</div><div class='del'>- * responsible for configuring the hardware for proper multicast,</div><div class='del'>- * promiscuous mode, and all-multi behavior.</div><div class='add'>+ * The set_rx_method entry point is called whenever the unicast/multicast</div><div class='add'>+ * address list or the network interface flags are updated.  This routine is</div><div class='add'>+ * responsible for configuring the hardware for proper unicast, multicast and</div><div class='add'>+ * promiscuous mode.</div><div class='ctx'>  **/</div><div class='del'>-static void ixgbe_set_multi(struct net_device *netdev)</div><div class='add'>+static void ixgbe_set_rx_mode(struct net_device *netdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ixgbe_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> 	struct ixgbe_hw *hw = &amp;adapter-&gt;hw;</div><div class='del'>-	struct dev_mc_list *mc_ptr;</div><div class='del'>-	u8 *mta_list;</div><div class='ctx'> 	u32 fctrl, vlnctrl;</div><div class='del'>-	int i;</div><div class='add'>+	u8 *addr_list = NULL;</div><div class='add'>+	int addr_count = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Check for Promiscuous and All Multicast modes */</div><div class='ctx'> </div><div class='hunk'>@@ -1645,6 +1806,7 @@ static void ixgbe_set_multi(struct net_device *netdev)</div><div class='ctx'> 	vlnctrl = IXGBE_READ_REG(hw, IXGBE_VLNCTRL);</div><div class='ctx'> </div><div class='ctx'> 	if (netdev-&gt;flags &amp; IFF_PROMISC) {</div><div class='add'>+		hw-&gt;addr_ctrl.user_set_promisc = 1;</div><div class='ctx'> 		fctrl |= (IXGBE_FCTRL_UPE | IXGBE_FCTRL_MPE);</div><div class='ctx'> 		vlnctrl &amp;= ~IXGBE_VLNCTRL_VFE;</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -1655,33 +1817,25 @@ static void ixgbe_set_multi(struct net_device *netdev)</div><div class='ctx'> 			fctrl &amp;= ~(IXGBE_FCTRL_UPE | IXGBE_FCTRL_MPE);</div><div class='ctx'> 		}</div><div class='ctx'> 		vlnctrl |= IXGBE_VLNCTRL_VFE;</div><div class='add'>+		hw-&gt;addr_ctrl.user_set_promisc = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	IXGBE_WRITE_REG(hw, IXGBE_FCTRL, fctrl);</div><div class='ctx'> 	IXGBE_WRITE_REG(hw, IXGBE_VLNCTRL, vlnctrl);</div><div class='ctx'> </div><div class='del'>-	if (netdev-&gt;mc_count) {</div><div class='del'>-		mta_list = kcalloc(netdev-&gt;mc_count, ETH_ALEN, GFP_ATOMIC);</div><div class='del'>-		if (!mta_list)</div><div class='del'>-			return;</div><div class='del'>-</div><div class='del'>-		/* Shared function expects packed array of only addresses. */</div><div class='del'>-		mc_ptr = netdev-&gt;mc_list;</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; netdev-&gt;mc_count; i++) {</div><div class='del'>-			if (!mc_ptr)</div><div class='del'>-				break;</div><div class='del'>-			memcpy(mta_list + (i * ETH_ALEN), mc_ptr-&gt;dmi_addr,</div><div class='del'>-			       ETH_ALEN);</div><div class='del'>-			mc_ptr = mc_ptr-&gt;next;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ixgbe_update_mc_addr_list(hw, mta_list, i, 0);</div><div class='del'>-		kfree(mta_list);</div><div class='del'>-	} else {</div><div class='del'>-		ixgbe_update_mc_addr_list(hw, NULL, 0, 0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='add'>+	/* reprogram secondary unicast list */</div><div class='add'>+	addr_count = netdev-&gt;uc_count;</div><div class='add'>+	if (addr_count)</div><div class='add'>+		addr_list = netdev-&gt;uc_list-&gt;dmi_addr;</div><div class='add'>+	hw-&gt;mac.ops.update_uc_addr_list(hw, addr_list, addr_count,</div><div class='add'>+	                                  ixgbe_addr_list_itr);</div><div class='add'>+</div><div class='add'>+	/* reprogram multicast list */</div><div class='add'>+	addr_count = netdev-&gt;mc_count;</div><div class='add'>+	if (addr_count)</div><div class='add'>+		addr_list = netdev-&gt;mc_list-&gt;dmi_addr;</div><div class='add'>+	hw-&gt;mac.ops.update_mc_addr_list(hw, addr_list, addr_count,</div><div class='add'>+	                                ixgbe_addr_list_itr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ixgbe_napi_enable_all(struct ixgbe_adapter *adapter)</div><div class='hunk'>@@ -1695,10 +1849,16 @@ static void ixgbe_napi_enable_all(struct ixgbe_adapter *adapter)</div><div class='ctx'> 		q_vectors = 1;</div><div class='ctx'> </div><div class='ctx'> 	for (q_idx = 0; q_idx &lt; q_vectors; q_idx++) {</div><div class='add'>+		struct napi_struct *napi;</div><div class='ctx'> 		q_vector = &amp;adapter-&gt;q_vector[q_idx];</div><div class='ctx'> 		if (!q_vector-&gt;rxr_count)</div><div class='ctx'> 			continue;</div><div class='del'>-		napi_enable(&amp;q_vector-&gt;napi);</div><div class='add'>+		napi = &amp;q_vector-&gt;napi;</div><div class='add'>+		if ((adapter-&gt;flags &amp; IXGBE_FLAG_MSIX_ENABLED) &amp;&amp;</div><div class='add'>+		    (q_vector-&gt;rxr_count &gt; 1))</div><div class='add'>+			napi-&gt;poll = &amp;ixgbe_clean_rxonly_many;</div><div class='add'>+</div><div class='add'>+		napi_enable(napi);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1725,7 +1885,7 @@ static void ixgbe_configure(struct ixgbe_adapter *adapter)</div><div class='ctx'> 	struct net_device *netdev = adapter-&gt;netdev;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	ixgbe_set_multi(netdev);</div><div class='add'>+	ixgbe_set_rx_mode(netdev);</div><div class='ctx'> </div><div class='ctx'> 	ixgbe_restore_vlan(adapter);</div><div class='ctx'> </div><div class='hunk'>@@ -1733,7 +1893,7 @@ static void ixgbe_configure(struct ixgbe_adapter *adapter)</div><div class='ctx'> 	ixgbe_configure_rx(adapter);</div><div class='ctx'> 	for (i = 0; i &lt; adapter-&gt;num_rx_queues; i++)</div><div class='ctx'> 		ixgbe_alloc_rx_buffers(adapter, &amp;adapter-&gt;rx_ring[i],</div><div class='del'>-					   (adapter-&gt;rx_ring[i].count - 1));</div><div class='add'>+		                       (adapter-&gt;rx_ring[i].count - 1));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ixgbe_up_complete(struct ixgbe_adapter *adapter)</div><div class='hunk'>@@ -1751,7 +1911,7 @@ static int ixgbe_up_complete(struct ixgbe_adapter *adapter)</div><div class='ctx'> 	    (adapter-&gt;flags &amp; IXGBE_FLAG_MSI_ENABLED)) {</div><div class='ctx'> 		if (adapter-&gt;flags &amp; IXGBE_FLAG_MSIX_ENABLED) {</div><div class='ctx'> 			gpie = (IXGBE_GPIE_MSIX_MODE | IXGBE_GPIE_EIAME |</div><div class='del'>-				IXGBE_GPIE_PBA_SUPPORT | IXGBE_GPIE_OCD);</div><div class='add'>+			        IXGBE_GPIE_PBA_SUPPORT | IXGBE_GPIE_OCD);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* MSI only */</div><div class='ctx'> 			gpie = 0;</div><div class='hunk'>@@ -1778,6 +1938,8 @@ static int ixgbe_up_complete(struct ixgbe_adapter *adapter)</div><div class='ctx'> 	for (i = 0; i &lt; adapter-&gt;num_tx_queues; i++) {</div><div class='ctx'> 		j = adapter-&gt;tx_ring[i].reg_idx;</div><div class='ctx'> 		txdctl = IXGBE_READ_REG(hw, IXGBE_TXDCTL(j));</div><div class='add'>+		/* enable WTHRESH=8 descriptors, to encourage burst writeback */</div><div class='add'>+		txdctl |= (8 &lt;&lt; 16);</div><div class='ctx'> 		txdctl |= IXGBE_TXDCTL_ENABLE;</div><div class='ctx'> 		IXGBE_WRITE_REG(hw, IXGBE_TXDCTL(j), txdctl);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1812,6 +1974,8 @@ static int ixgbe_up_complete(struct ixgbe_adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> 	/* bring the link up in the watchdog, this could race with our first</div><div class='ctx'> 	 * link up interrupt but shouldn't be a problem */</div><div class='add'>+	adapter-&gt;flags |= IXGBE_FLAG_NEED_LINK_UPDATE;</div><div class='add'>+	adapter-&gt;link_check_timeout = jiffies;</div><div class='ctx'> 	mod_timer(&amp;adapter-&gt;watchdog_timer, jiffies);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1836,50 +2000,14 @@ int ixgbe_up(struct ixgbe_adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> void ixgbe_reset(struct ixgbe_adapter *adapter)</div><div class='ctx'> {</div><div class='del'>-	if (ixgbe_init_hw(&amp;adapter-&gt;hw))</div><div class='del'>-		DPRINTK(PROBE, ERR, "Hardware Error\n");</div><div class='add'>+	struct ixgbe_hw *hw = &amp;adapter-&gt;hw;</div><div class='add'>+	if (hw-&gt;mac.ops.init_hw(hw))</div><div class='add'>+		dev_err(&amp;adapter-&gt;pdev-&gt;dev, "Hardware Error\n");</div><div class='ctx'> </div><div class='ctx'> 	/* reprogram the RAR[0] in case user changed it. */</div><div class='del'>-	ixgbe_set_rar(&amp;adapter-&gt;hw, 0, adapter-&gt;hw.mac.addr, 0, IXGBE_RAH_AV);</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-static int ixgbe_resume(struct pci_dev *pdev)</div><div class='del'>-{</div><div class='del'>-	struct net_device *netdev = pci_get_drvdata(pdev);</div><div class='del'>-	struct ixgbe_adapter *adapter = netdev_priv(netdev);</div><div class='del'>-	u32 err;</div><div class='del'>-</div><div class='del'>-	pci_set_power_state(pdev, PCI_D0);</div><div class='del'>-	pci_restore_state(pdev);</div><div class='del'>-	err = pci_enable_device(pdev);</div><div class='del'>-	if (err) {</div><div class='del'>-		printk(KERN_ERR "ixgbe: Cannot enable PCI device from " \</div><div class='del'>-				"suspend\n");</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-	pci_set_master(pdev);</div><div class='add'>+	hw-&gt;mac.ops.set_rar(hw, 0, hw-&gt;mac.addr, 0, IXGBE_RAH_AV);</div><div class='ctx'> </div><div class='del'>-	pci_enable_wake(pdev, PCI_D3hot, 0);</div><div class='del'>-	pci_enable_wake(pdev, PCI_D3cold, 0);</div><div class='del'>-</div><div class='del'>-	if (netif_running(netdev)) {</div><div class='del'>-		err = ixgbe_request_irq(adapter);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ixgbe_reset(adapter);</div><div class='del'>-</div><div class='del'>-	if (netif_running(netdev))</div><div class='del'>-		ixgbe_up(adapter);</div><div class='del'>-</div><div class='del'>-	netif_device_attach(netdev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ixgbe_clean_rx_ring - Free Rx Buffers per Queue</div><div class='hunk'>@@ -1887,7 +2015,7 @@ static int ixgbe_resume(struct pci_dev *pdev)</div><div class='ctx'>  * @rx_ring: ring to free buffers from</div><div class='ctx'>  **/</div><div class='ctx'> static void ixgbe_clean_rx_ring(struct ixgbe_adapter *adapter,</div><div class='del'>-				struct ixgbe_ring *rx_ring)</div><div class='add'>+                                struct ixgbe_ring *rx_ring)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev *pdev = adapter-&gt;pdev;</div><div class='ctx'> 	unsigned long size;</div><div class='hunk'>@@ -1901,8 +2029,8 @@ static void ixgbe_clean_rx_ring(struct ixgbe_adapter *adapter,</div><div class='ctx'> 		rx_buffer_info = &amp;rx_ring-&gt;rx_buffer_info[i];</div><div class='ctx'> 		if (rx_buffer_info-&gt;dma) {</div><div class='ctx'> 			pci_unmap_single(pdev, rx_buffer_info-&gt;dma,</div><div class='del'>-					 adapter-&gt;rx_buf_len,</div><div class='del'>-					 PCI_DMA_FROMDEVICE);</div><div class='add'>+			                 rx_ring-&gt;rx_buf_len,</div><div class='add'>+			                 PCI_DMA_FROMDEVICE);</div><div class='ctx'> 			rx_buffer_info-&gt;dma = 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (rx_buffer_info-&gt;skb) {</div><div class='hunk'>@@ -1911,12 +2039,12 @@ static void ixgbe_clean_rx_ring(struct ixgbe_adapter *adapter,</div><div class='ctx'> 		}</div><div class='ctx'> 		if (!rx_buffer_info-&gt;page)</div><div class='ctx'> 			continue;</div><div class='del'>-		pci_unmap_page(pdev, rx_buffer_info-&gt;page_dma, PAGE_SIZE,</div><div class='del'>-			       PCI_DMA_FROMDEVICE);</div><div class='add'>+		pci_unmap_page(pdev, rx_buffer_info-&gt;page_dma, PAGE_SIZE / 2,</div><div class='add'>+		               PCI_DMA_FROMDEVICE);</div><div class='ctx'> 		rx_buffer_info-&gt;page_dma = 0;</div><div class='del'>-</div><div class='ctx'> 		put_page(rx_buffer_info-&gt;page);</div><div class='ctx'> 		rx_buffer_info-&gt;page = NULL;</div><div class='add'>+		rx_buffer_info-&gt;page_offset = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	size = sizeof(struct ixgbe_rx_buffer) * rx_ring-&gt;count;</div><div class='hunk'>@@ -1938,7 +2066,7 @@ static void ixgbe_clean_rx_ring(struct ixgbe_adapter *adapter,</div><div class='ctx'>  * @tx_ring: ring to be cleaned</div><div class='ctx'>  **/</div><div class='ctx'> static void ixgbe_clean_tx_ring(struct ixgbe_adapter *adapter,</div><div class='del'>-				struct ixgbe_ring *tx_ring)</div><div class='add'>+                                struct ixgbe_ring *tx_ring)</div><div class='ctx'> {</div><div class='ctx'> 	struct ixgbe_tx_buffer *tx_buffer_info;</div><div class='ctx'> 	unsigned long size;</div><div class='hunk'>@@ -1991,75 +2119,64 @@ static void ixgbe_clean_all_tx_rings(struct ixgbe_adapter *adapter)</div><div class='ctx'> void ixgbe_down(struct ixgbe_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *netdev = adapter-&gt;netdev;</div><div class='add'>+	struct ixgbe_hw *hw = &amp;adapter-&gt;hw;</div><div class='ctx'> 	u32 rxctrl;</div><div class='add'>+	u32 txdctl;</div><div class='add'>+	int i, j;</div><div class='ctx'> </div><div class='ctx'> 	/* signal that we are down to the interrupt handler */</div><div class='ctx'> 	set_bit(__IXGBE_DOWN, &amp;adapter-&gt;state);</div><div class='ctx'> </div><div class='ctx'> 	/* disable receives */</div><div class='del'>-	rxctrl = IXGBE_READ_REG(&amp;adapter-&gt;hw, IXGBE_RXCTRL);</div><div class='del'>-	IXGBE_WRITE_REG(&amp;adapter-&gt;hw, IXGBE_RXCTRL,</div><div class='del'>-			rxctrl &amp; ~IXGBE_RXCTRL_RXEN);</div><div class='add'>+	rxctrl = IXGBE_READ_REG(hw, IXGBE_RXCTRL);</div><div class='add'>+	IXGBE_WRITE_REG(hw, IXGBE_RXCTRL, rxctrl &amp; ~IXGBE_RXCTRL_RXEN);</div><div class='ctx'> </div><div class='ctx'> 	netif_tx_disable(netdev);</div><div class='ctx'> </div><div class='del'>-	/* disable transmits in the hardware */</div><div class='del'>-</div><div class='del'>-	/* flush both disables */</div><div class='del'>-	IXGBE_WRITE_FLUSH(&amp;adapter-&gt;hw);</div><div class='add'>+	IXGBE_WRITE_FLUSH(hw);</div><div class='ctx'> 	msleep(10);</div><div class='ctx'> </div><div class='add'>+	netif_tx_stop_all_queues(netdev);</div><div class='add'>+</div><div class='ctx'> 	ixgbe_irq_disable(adapter);</div><div class='ctx'> </div><div class='ctx'> 	ixgbe_napi_disable_all(adapter);</div><div class='add'>+</div><div class='ctx'> 	del_timer_sync(&amp;adapter-&gt;watchdog_timer);</div><div class='add'>+	cancel_work_sync(&amp;adapter-&gt;watchdog_task);</div><div class='add'>+</div><div class='add'>+	/* disable transmits in the hardware now that interrupts are off */</div><div class='add'>+	for (i = 0; i &lt; adapter-&gt;num_tx_queues; i++) {</div><div class='add'>+		j = adapter-&gt;tx_ring[i].reg_idx;</div><div class='add'>+		txdctl = IXGBE_READ_REG(hw, IXGBE_TXDCTL(j));</div><div class='add'>+		IXGBE_WRITE_REG(hw, IXGBE_TXDCTL(j),</div><div class='add'>+		                (txdctl &amp; ~IXGBE_TXDCTL_ENABLE));</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	netif_carrier_off(netdev);</div><div class='del'>-	netif_tx_stop_all_queues(netdev);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_IXGBE_DCA</div><div class='add'>+	if (adapter-&gt;flags &amp; IXGBE_FLAG_DCA_ENABLED) {</div><div class='add'>+		adapter-&gt;flags &amp;= ~IXGBE_FLAG_DCA_ENABLED;</div><div class='add'>+		dca_remove_requester(&amp;adapter-&gt;pdev-&gt;dev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='ctx'> 	if (!pci_channel_offline(adapter-&gt;pdev))</div><div class='ctx'> 		ixgbe_reset(adapter);</div><div class='ctx'> 	ixgbe_clean_all_tx_rings(adapter);</div><div class='ctx'> 	ixgbe_clean_all_rx_rings(adapter);</div><div class='ctx'> </div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ixgbe_suspend(struct pci_dev *pdev, pm_message_t state)</div><div class='del'>-{</div><div class='del'>-	struct net_device *netdev = pci_get_drvdata(pdev);</div><div class='del'>-	struct ixgbe_adapter *adapter = netdev_priv(netdev);</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-	int retval = 0;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	netif_device_detach(netdev);</div><div class='del'>-</div><div class='del'>-	if (netif_running(netdev)) {</div><div class='del'>-		ixgbe_down(adapter);</div><div class='del'>-		ixgbe_free_irq(adapter);</div><div class='add'>+#ifdef CONFIG_IXGBE_DCA</div><div class='add'>+	/* since we reset the hardware DCA settings were cleared */</div><div class='add'>+	if (dca_add_requester(&amp;adapter-&gt;pdev-&gt;dev) == 0) {</div><div class='add'>+		adapter-&gt;flags |= IXGBE_FLAG_DCA_ENABLED;</div><div class='add'>+		/* always use CB2 mode, difference is masked</div><div class='add'>+		 * in the CB driver */</div><div class='add'>+		IXGBE_WRITE_REG(hw, IXGBE_DCA_CTRL, 2);</div><div class='add'>+		ixgbe_setup_dca(adapter);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-	retval = pci_save_state(pdev);</div><div class='del'>-	if (retval)</div><div class='del'>-		return retval;</div><div class='ctx'> #endif</div><div class='del'>-</div><div class='del'>-	pci_enable_wake(pdev, PCI_D3hot, 0);</div><div class='del'>-	pci_enable_wake(pdev, PCI_D3cold, 0);</div><div class='del'>-</div><div class='del'>-	ixgbe_release_hw_control(adapter);</div><div class='del'>-</div><div class='del'>-	pci_disable_device(pdev);</div><div class='del'>-</div><div class='del'>-	pci_set_power_state(pdev, pci_choose_state(pdev, state));</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ixgbe_shutdown(struct pci_dev *pdev)</div><div class='del'>-{</div><div class='del'>-	ixgbe_suspend(pdev, PMSG_SUSPEND);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -2072,11 +2189,11 @@ static void ixgbe_shutdown(struct pci_dev *pdev)</div><div class='ctx'> static int ixgbe_poll(struct napi_struct *napi, int budget)</div><div class='ctx'> {</div><div class='ctx'> 	struct ixgbe_q_vector *q_vector = container_of(napi,</div><div class='del'>-					  struct ixgbe_q_vector, napi);</div><div class='add'>+	                                          struct ixgbe_q_vector, napi);</div><div class='ctx'> 	struct ixgbe_adapter *adapter = q_vector-&gt;adapter;</div><div class='del'>-	int tx_cleaned = 0, work_done = 0;</div><div class='add'>+	int tx_cleaned, work_done = 0;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_DCA</div><div class='add'>+#ifdef CONFIG_IXGBE_DCA</div><div class='ctx'> 	if (adapter-&gt;flags &amp; IXGBE_FLAG_DCA_ENABLED) {</div><div class='ctx'> 		ixgbe_update_tx_dca(adapter, adapter-&gt;tx_ring);</div><div class='ctx'> 		ixgbe_update_rx_dca(adapter, adapter-&gt;rx_ring);</div><div class='hunk'>@@ -2092,12 +2209,11 @@ static int ixgbe_poll(struct napi_struct *napi, int budget)</div><div class='ctx'> 	/* If budget not fully consumed, exit the polling mode */</div><div class='ctx'> 	if (work_done &lt; budget) {</div><div class='ctx'> 		netif_rx_complete(adapter-&gt;netdev, napi);</div><div class='del'>-		if (adapter-&gt;rx_eitr &lt; IXGBE_MIN_ITR_USECS)</div><div class='add'>+		if (adapter-&gt;itr_setting &amp; 3)</div><div class='ctx'> 			ixgbe_set_itr(adapter);</div><div class='ctx'> 		if (!test_bit(__IXGBE_DOWN, &amp;adapter-&gt;state))</div><div class='ctx'> 			ixgbe_irq_enable(adapter);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> 	return work_done;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2123,8 +2239,48 @@ static void ixgbe_reset_task(struct work_struct *work)</div><div class='ctx'> 	ixgbe_reinit_locked(adapter);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void ixgbe_set_num_queues(struct ixgbe_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	int nrq = 1, ntq = 1;</div><div class='add'>+	int feature_mask = 0, rss_i, rss_m;</div><div class='add'>+</div><div class='add'>+	/* Number of supported queues */</div><div class='add'>+	switch (adapter-&gt;hw.mac.type) {</div><div class='add'>+	case ixgbe_mac_82598EB:</div><div class='add'>+		rss_i = adapter-&gt;ring_feature[RING_F_RSS].indices;</div><div class='add'>+		rss_m = 0;</div><div class='add'>+		feature_mask |= IXGBE_FLAG_RSS_ENABLED;</div><div class='add'>+</div><div class='add'>+		switch (adapter-&gt;flags &amp; feature_mask) {</div><div class='add'>+		case (IXGBE_FLAG_RSS_ENABLED):</div><div class='add'>+			rss_m = 0xF;</div><div class='add'>+			nrq = rss_i;</div><div class='add'>+			ntq = rss_i;</div><div class='add'>+			break;</div><div class='add'>+		case 0:</div><div class='add'>+		default:</div><div class='add'>+			rss_i = 0;</div><div class='add'>+			rss_m = 0;</div><div class='add'>+			nrq = 1;</div><div class='add'>+			ntq = 1;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		adapter-&gt;ring_feature[RING_F_RSS].indices = rss_i;</div><div class='add'>+		adapter-&gt;ring_feature[RING_F_RSS].mask = rss_m;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		nrq = 1;</div><div class='add'>+		ntq = 1;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	adapter-&gt;num_rx_queues = nrq;</div><div class='add'>+	adapter-&gt;num_tx_queues = ntq;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void ixgbe_acquire_msix_vectors(struct ixgbe_adapter *adapter,</div><div class='del'>-				       int vectors)</div><div class='add'>+                                       int vectors)</div><div class='ctx'> {</div><div class='ctx'> 	int err, vector_threshold;</div><div class='ctx'> </div><div class='hunk'>@@ -2143,7 +2299,7 @@ static void ixgbe_acquire_msix_vectors(struct ixgbe_adapter *adapter,</div><div class='ctx'> 	 */</div><div class='ctx'> 	while (vectors &gt;= vector_threshold) {</div><div class='ctx'> 		err = pci_enable_msix(adapter-&gt;pdev, adapter-&gt;msix_entries,</div><div class='del'>-				      vectors);</div><div class='add'>+		                      vectors);</div><div class='ctx'> 		if (!err) /* Success in acquiring all requested vectors. */</div><div class='ctx'> 			break;</div><div class='ctx'> 		else if (err &lt; 0)</div><div class='hunk'>@@ -2162,54 +2318,13 @@ static void ixgbe_acquire_msix_vectors(struct ixgbe_adapter *adapter,</div><div class='ctx'> 		kfree(adapter-&gt;msix_entries);</div><div class='ctx'> 		adapter-&gt;msix_entries = NULL;</div><div class='ctx'> 		adapter-&gt;flags &amp;= ~IXGBE_FLAG_RSS_ENABLED;</div><div class='del'>-		adapter-&gt;num_tx_queues = 1;</div><div class='del'>-		adapter-&gt;num_rx_queues = 1;</div><div class='add'>+		ixgbe_set_num_queues(adapter);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		adapter-&gt;flags |= IXGBE_FLAG_MSIX_ENABLED; /* Woot! */</div><div class='ctx'> 		adapter-&gt;num_msix_vectors = vectors;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devinit ixgbe_set_num_queues(struct ixgbe_adapter *adapter)</div><div class='del'>-{</div><div class='del'>-	int nrq, ntq;</div><div class='del'>-	int feature_mask = 0, rss_i, rss_m;</div><div class='del'>-</div><div class='del'>-	/* Number of supported queues */</div><div class='del'>-	switch (adapter-&gt;hw.mac.type) {</div><div class='del'>-	case ixgbe_mac_82598EB:</div><div class='del'>-		rss_i = adapter-&gt;ring_feature[RING_F_RSS].indices;</div><div class='del'>-		rss_m = 0;</div><div class='del'>-		feature_mask |= IXGBE_FLAG_RSS_ENABLED;</div><div class='del'>-</div><div class='del'>-		switch (adapter-&gt;flags &amp; feature_mask) {</div><div class='del'>-		case (IXGBE_FLAG_RSS_ENABLED):</div><div class='del'>-			rss_m = 0xF;</div><div class='del'>-			nrq = rss_i;</div><div class='del'>-			ntq = rss_i;</div><div class='del'>-			break;</div><div class='del'>-		case 0:</div><div class='del'>-		default:</div><div class='del'>-			rss_i = 0;</div><div class='del'>-			rss_m = 0;</div><div class='del'>-			nrq = 1;</div><div class='del'>-			ntq = 1;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		adapter-&gt;ring_feature[RING_F_RSS].indices = rss_i;</div><div class='del'>-		adapter-&gt;ring_feature[RING_F_RSS].mask = rss_m;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		nrq = 1;</div><div class='del'>-		ntq = 1;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	adapter-&gt;num_rx_queues = nrq;</div><div class='del'>-	adapter-&gt;num_tx_queues = ntq;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * ixgbe_cache_ring_register - Descriptor ring to register mapping</div><div class='ctx'>  * @adapter: board private structure to initialize</div><div class='hunk'>@@ -2219,9 +2334,6 @@ static void __devinit ixgbe_set_num_queues(struct ixgbe_adapter *adapter)</div><div class='ctx'>  **/</div><div class='ctx'> static void __devinit ixgbe_cache_ring_register(struct ixgbe_adapter *adapter)</div><div class='ctx'> {</div><div class='del'>-	/* TODO: Remove all uses of the indices in the cases where multiple</div><div class='del'>-	 *       features are OR'd together, if the feature set makes sense.</div><div class='del'>-	 */</div><div class='ctx'> 	int feature_mask = 0, rss_i;</div><div class='ctx'> 	int i, txr_idx, rxr_idx;</div><div class='ctx'> </div><div class='hunk'>@@ -2262,21 +2374,22 @@ static int __devinit ixgbe_alloc_queues(struct ixgbe_adapter *adapter)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	adapter-&gt;tx_ring = kcalloc(adapter-&gt;num_tx_queues,</div><div class='del'>-				   sizeof(struct ixgbe_ring), GFP_KERNEL);</div><div class='add'>+	                           sizeof(struct ixgbe_ring), GFP_KERNEL);</div><div class='ctx'> 	if (!adapter-&gt;tx_ring)</div><div class='ctx'> 		goto err_tx_ring_allocation;</div><div class='ctx'> </div><div class='ctx'> 	adapter-&gt;rx_ring = kcalloc(adapter-&gt;num_rx_queues,</div><div class='del'>-				   sizeof(struct ixgbe_ring), GFP_KERNEL);</div><div class='add'>+	                           sizeof(struct ixgbe_ring), GFP_KERNEL);</div><div class='ctx'> 	if (!adapter-&gt;rx_ring)</div><div class='ctx'> 		goto err_rx_ring_allocation;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; adapter-&gt;num_tx_queues; i++) {</div><div class='del'>-		adapter-&gt;tx_ring[i].count = IXGBE_DEFAULT_TXD;</div><div class='add'>+		adapter-&gt;tx_ring[i].count = adapter-&gt;tx_ring_count;</div><div class='ctx'> 		adapter-&gt;tx_ring[i].queue_index = i;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; adapter-&gt;num_rx_queues; i++) {</div><div class='del'>-		adapter-&gt;rx_ring[i].count = IXGBE_DEFAULT_RXD;</div><div class='add'>+		adapter-&gt;rx_ring[i].count = adapter-&gt;rx_ring_count;</div><div class='ctx'> 		adapter-&gt;rx_ring[i].queue_index = i;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2298,25 +2411,19 @@ err_tx_ring_allocation:</div><div class='ctx'>  * capabilities of the hardware and the kernel.</div><div class='ctx'>  **/</div><div class='ctx'> static int __devinit ixgbe_set_interrupt_capability(struct ixgbe_adapter</div><div class='del'>-						    *adapter)</div><div class='add'>+                                                    *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	int vector, v_budget;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Set the default interrupt throttle rate.</div><div class='del'>-	 */</div><div class='del'>-	adapter-&gt;rx_eitr = (1000000 / IXGBE_DEFAULT_ITR_RX_USECS);</div><div class='del'>-	adapter-&gt;tx_eitr = (1000000 / IXGBE_DEFAULT_ITR_TX_USECS);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='ctx'> 	 * It's easy to be greedy for MSI-X vectors, but it really</div><div class='ctx'> 	 * doesn't do us much good if we have a lot more vectors</div><div class='ctx'> 	 * than CPU's.  So let's be conservative and only ask for</div><div class='ctx'> 	 * (roughly) twice the number of vectors as there are CPU's.</div><div class='ctx'> 	 */</div><div class='ctx'> 	v_budget = min(adapter-&gt;num_rx_queues + adapter-&gt;num_tx_queues,</div><div class='del'>-		       (int)(num_online_cpus() * 2)) + NON_Q_VECTORS;</div><div class='add'>+	               (int)(num_online_cpus() * 2)) + NON_Q_VECTORS;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * At the same time, hardware can only support a maximum of</div><div class='hunk'>@@ -2330,7 +2437,7 @@ static int __devinit ixgbe_set_interrupt_capability(struct ixgbe_adapter</div><div class='ctx'> 	/* A failure in MSI-X entry allocation isn't fatal, but it does</div><div class='ctx'> 	 * mean we disable MSI-X capabilities of the adapter. */</div><div class='ctx'> 	adapter-&gt;msix_entries = kcalloc(v_budget,</div><div class='del'>-					sizeof(struct msix_entry), GFP_KERNEL);</div><div class='add'>+	                                sizeof(struct msix_entry), GFP_KERNEL);</div><div class='ctx'> 	if (!adapter-&gt;msix_entries) {</div><div class='ctx'> 		adapter-&gt;flags &amp;= ~IXGBE_FLAG_RSS_ENABLED;</div><div class='ctx'> 		ixgbe_set_num_queues(adapter);</div><div class='hunk'>@@ -2339,7 +2446,7 @@ static int __devinit ixgbe_set_interrupt_capability(struct ixgbe_adapter</div><div class='ctx'> 		err = ixgbe_alloc_queues(adapter);</div><div class='ctx'> 		if (err) {</div><div class='ctx'> 			DPRINTK(PROBE, ERR, "Unable to allocate memory "</div><div class='del'>-					    "for queues\n");</div><div class='add'>+			        "for queues\n");</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -2360,7 +2467,7 @@ try_msi:</div><div class='ctx'> 		adapter-&gt;flags |= IXGBE_FLAG_MSI_ENABLED;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		DPRINTK(HW, DEBUG, "Unable to allocate MSI interrupt, "</div><div class='del'>-				   "falling back to legacy.  Error: %d\n", err);</div><div class='add'>+		        "falling back to legacy.  Error: %d\n", err);</div><div class='ctx'> 		/* reset err */</div><div class='ctx'> 		err = 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2416,9 +2523,9 @@ static int __devinit ixgbe_init_interrupt_scheme(struct ixgbe_adapter *adapter)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	DPRINTK(DRV, INFO, "Multiqueue %s: Rx Queue count = %u, "</div><div class='del'>-			   "Tx Queue count = %u\n",</div><div class='del'>-		(adapter-&gt;num_rx_queues &gt; 1) ? "Enabled" :</div><div class='del'>-		"Disabled", adapter-&gt;num_rx_queues, adapter-&gt;num_tx_queues);</div><div class='add'>+	        "Tx Queue count = %u\n",</div><div class='add'>+	        (adapter-&gt;num_rx_queues &gt; 1) ? "Enabled" :</div><div class='add'>+	        "Disabled", adapter-&gt;num_rx_queues, adapter-&gt;num_tx_queues);</div><div class='ctx'> </div><div class='ctx'> 	set_bit(__IXGBE_DOWN, &amp;adapter-&gt;state);</div><div class='ctx'> </div><div class='hunk'>@@ -2445,33 +2552,44 @@ static int __devinit ixgbe_sw_init(struct ixgbe_adapter *adapter)</div><div class='ctx'> 	struct pci_dev *pdev = adapter-&gt;pdev;</div><div class='ctx'> 	unsigned int rss;</div><div class='ctx'> </div><div class='add'>+	/* PCI config space info */</div><div class='add'>+</div><div class='add'>+	hw-&gt;vendor_id = pdev-&gt;vendor;</div><div class='add'>+	hw-&gt;device_id = pdev-&gt;device;</div><div class='add'>+	hw-&gt;revision_id = pdev-&gt;revision;</div><div class='add'>+	hw-&gt;subsystem_vendor_id = pdev-&gt;subsystem_vendor;</div><div class='add'>+	hw-&gt;subsystem_device_id = pdev-&gt;subsystem_device;</div><div class='add'>+</div><div class='ctx'> 	/* Set capability flags */</div><div class='ctx'> 	rss = min(IXGBE_MAX_RSS_INDICES, (int)num_online_cpus());</div><div class='ctx'> 	adapter-&gt;ring_feature[RING_F_RSS].indices = rss;</div><div class='ctx'> 	adapter-&gt;flags |= IXGBE_FLAG_RSS_ENABLED;</div><div class='ctx'> </div><div class='del'>-	/* Enable Dynamic interrupt throttling by default */</div><div class='del'>-	adapter-&gt;rx_eitr = 1;</div><div class='del'>-	adapter-&gt;tx_eitr = 1;</div><div class='del'>-</div><div class='ctx'> 	/* default flow control settings */</div><div class='del'>-	hw-&gt;fc.original_type = ixgbe_fc_full;</div><div class='del'>-	hw-&gt;fc.type = ixgbe_fc_full;</div><div class='add'>+	hw-&gt;fc.original_type = ixgbe_fc_none;</div><div class='add'>+	hw-&gt;fc.type = ixgbe_fc_none;</div><div class='add'>+	hw-&gt;fc.high_water = IXGBE_DEFAULT_FCRTH;</div><div class='add'>+	hw-&gt;fc.low_water = IXGBE_DEFAULT_FCRTL;</div><div class='add'>+	hw-&gt;fc.pause_time = IXGBE_DEFAULT_FCPAUSE;</div><div class='add'>+	hw-&gt;fc.send_xon = true;</div><div class='ctx'> </div><div class='ctx'> 	/* select 10G link by default */</div><div class='ctx'> 	hw-&gt;mac.link_mode_select = IXGBE_AUTOC_LMS_10G_LINK_NO_AN;</div><div class='del'>-	if (hw-&gt;mac.ops.reset(hw)) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "HW Init failed\n");</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-	if (hw-&gt;mac.ops.setup_link_speed(hw, IXGBE_LINK_SPEED_10GB_FULL, true,</div><div class='del'>-					 false)) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "Link Speed setup failed\n");</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='add'>+</div><div class='add'>+	/* enable itr by default in dynamic mode */</div><div class='add'>+	adapter-&gt;itr_setting = 1;</div><div class='add'>+	adapter-&gt;eitr_param = 20000;</div><div class='add'>+</div><div class='add'>+	/* set defaults for eitr in MegaBytes */</div><div class='add'>+	adapter-&gt;eitr_low = 10;</div><div class='add'>+	adapter-&gt;eitr_high = 20;</div><div class='add'>+</div><div class='add'>+	/* set default ring sizes */</div><div class='add'>+	adapter-&gt;tx_ring_count = IXGBE_DEFAULT_TXD;</div><div class='add'>+	adapter-&gt;rx_ring_count = IXGBE_DEFAULT_RXD;</div><div class='ctx'> </div><div class='ctx'> 	/* initialize eeprom parameters */</div><div class='del'>-	if (ixgbe_init_eeprom(hw)) {</div><div class='add'>+	if (ixgbe_init_eeprom_params_generic(hw)) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "EEPROM initialization failed\n");</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2487,105 +2605,157 @@ static int __devinit ixgbe_sw_init(struct ixgbe_adapter *adapter)</div><div class='ctx'> /**</div><div class='ctx'>  * ixgbe_setup_tx_resources - allocate Tx resources (Descriptors)</div><div class='ctx'>  * @adapter: board private structure</div><div class='del'>- * @txdr:    tx descriptor ring (for a specific queue) to setup</div><div class='add'>+ * @tx_ring:    tx descriptor ring (for a specific queue) to setup</div><div class='ctx'>  *</div><div class='ctx'>  * Return 0 on success, negative on failure</div><div class='ctx'>  **/</div><div class='ctx'> int ixgbe_setup_tx_resources(struct ixgbe_adapter *adapter,</div><div class='del'>-			     struct ixgbe_ring *txdr)</div><div class='add'>+                             struct ixgbe_ring *tx_ring)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev *pdev = adapter-&gt;pdev;</div><div class='ctx'> 	int size;</div><div class='ctx'> </div><div class='del'>-	size = sizeof(struct ixgbe_tx_buffer) * txdr-&gt;count;</div><div class='del'>-	txdr-&gt;tx_buffer_info = vmalloc(size);</div><div class='del'>-	if (!txdr-&gt;tx_buffer_info) {</div><div class='del'>-		DPRINTK(PROBE, ERR,</div><div class='del'>-		"Unable to allocate memory for the transmit descriptor ring\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-	memset(txdr-&gt;tx_buffer_info, 0, size);</div><div class='add'>+	size = sizeof(struct ixgbe_tx_buffer) * tx_ring-&gt;count;</div><div class='add'>+	tx_ring-&gt;tx_buffer_info = vmalloc(size);</div><div class='add'>+	if (!tx_ring-&gt;tx_buffer_info)</div><div class='add'>+		goto err;</div><div class='add'>+	memset(tx_ring-&gt;tx_buffer_info, 0, size);</div><div class='ctx'> </div><div class='ctx'> 	/* round up to nearest 4K */</div><div class='del'>-	txdr-&gt;size = txdr-&gt;count * sizeof(union ixgbe_adv_tx_desc);</div><div class='del'>-	txdr-&gt;size = ALIGN(txdr-&gt;size, 4096);</div><div class='add'>+	tx_ring-&gt;size = tx_ring-&gt;count * sizeof(union ixgbe_adv_tx_desc) +</div><div class='add'>+	                sizeof(u32);</div><div class='add'>+	tx_ring-&gt;size = ALIGN(tx_ring-&gt;size, 4096);</div><div class='ctx'> </div><div class='del'>-	txdr-&gt;desc = pci_alloc_consistent(pdev, txdr-&gt;size, &amp;txdr-&gt;dma);</div><div class='del'>-	if (!txdr-&gt;desc) {</div><div class='del'>-		vfree(txdr-&gt;tx_buffer_info);</div><div class='del'>-		DPRINTK(PROBE, ERR,</div><div class='del'>-			"Memory allocation failed for the tx desc ring\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	txdr-&gt;next_to_use = 0;</div><div class='del'>-	txdr-&gt;next_to_clean = 0;</div><div class='del'>-	txdr-&gt;work_limit = txdr-&gt;count;</div><div class='add'>+	tx_ring-&gt;desc = pci_alloc_consistent(pdev, tx_ring-&gt;size,</div><div class='add'>+	                                     &amp;tx_ring-&gt;dma);</div><div class='add'>+	if (!tx_ring-&gt;desc)</div><div class='add'>+		goto err;</div><div class='ctx'> </div><div class='add'>+	tx_ring-&gt;next_to_use = 0;</div><div class='add'>+	tx_ring-&gt;next_to_clean = 0;</div><div class='add'>+	tx_ring-&gt;work_limit = tx_ring-&gt;count;</div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	vfree(tx_ring-&gt;tx_buffer_info);</div><div class='add'>+	tx_ring-&gt;tx_buffer_info = NULL;</div><div class='add'>+	DPRINTK(PROBE, ERR, "Unable to allocate memory for the transmit "</div><div class='add'>+	                    "descriptor ring\n");</div><div class='add'>+	return -ENOMEM;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ixgbe_setup_all_tx_resources - allocate all queues Tx resources</div><div class='add'>+ * @adapter: board private structure</div><div class='add'>+ *</div><div class='add'>+ * If this function returns with an error, then it's possible one or</div><div class='add'>+ * more of the rings is populated (while the rest are not).  It is the</div><div class='add'>+ * callers duty to clean those orphaned rings.</div><div class='add'>+ *</div><div class='add'>+ * Return 0 on success, negative on failure</div><div class='add'>+ **/</div><div class='add'>+static int ixgbe_setup_all_tx_resources(struct ixgbe_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	int i, err = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; adapter-&gt;num_tx_queues; i++) {</div><div class='add'>+		err = ixgbe_setup_tx_resources(adapter, &amp;adapter-&gt;tx_ring[i]);</div><div class='add'>+		if (!err)</div><div class='add'>+			continue;</div><div class='add'>+		DPRINTK(PROBE, ERR, "Allocation for Tx Queue %u failed\n", i);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ixgbe_setup_rx_resources - allocate Rx resources (Descriptors)</div><div class='ctx'>  * @adapter: board private structure</div><div class='del'>- * @rxdr:    rx descriptor ring (for a specific queue) to setup</div><div class='add'>+ * @rx_ring:    rx descriptor ring (for a specific queue) to setup</div><div class='ctx'>  *</div><div class='ctx'>  * Returns 0 on success, negative on failure</div><div class='ctx'>  **/</div><div class='ctx'> int ixgbe_setup_rx_resources(struct ixgbe_adapter *adapter,</div><div class='del'>-			     struct ixgbe_ring *rxdr)</div><div class='add'>+                             struct ixgbe_ring *rx_ring)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev *pdev = adapter-&gt;pdev;</div><div class='ctx'> 	int size;</div><div class='ctx'> </div><div class='ctx'> 	size = sizeof(struct net_lro_desc) * IXGBE_MAX_LRO_DESCRIPTORS;</div><div class='del'>-	rxdr-&gt;lro_mgr.lro_arr = vmalloc(size);</div><div class='del'>-	if (!rxdr-&gt;lro_mgr.lro_arr)</div><div class='add'>+	rx_ring-&gt;lro_mgr.lro_arr = vmalloc(size);</div><div class='add'>+	if (!rx_ring-&gt;lro_mgr.lro_arr)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	memset(rxdr-&gt;lro_mgr.lro_arr, 0, size);</div><div class='add'>+	memset(rx_ring-&gt;lro_mgr.lro_arr, 0, size);</div><div class='ctx'> </div><div class='del'>-	size = sizeof(struct ixgbe_rx_buffer) * rxdr-&gt;count;</div><div class='del'>-	rxdr-&gt;rx_buffer_info = vmalloc(size);</div><div class='del'>-	if (!rxdr-&gt;rx_buffer_info) {</div><div class='add'>+	size = sizeof(struct ixgbe_rx_buffer) * rx_ring-&gt;count;</div><div class='add'>+	rx_ring-&gt;rx_buffer_info = vmalloc(size);</div><div class='add'>+	if (!rx_ring-&gt;rx_buffer_info) {</div><div class='ctx'> 		DPRINTK(PROBE, ERR,</div><div class='del'>-			"vmalloc allocation failed for the rx desc ring\n");</div><div class='add'>+		        "vmalloc allocation failed for the rx desc ring\n");</div><div class='ctx'> 		goto alloc_failed;</div><div class='ctx'> 	}</div><div class='del'>-	memset(rxdr-&gt;rx_buffer_info, 0, size);</div><div class='add'>+	memset(rx_ring-&gt;rx_buffer_info, 0, size);</div><div class='ctx'> </div><div class='ctx'> 	/* Round up to nearest 4K */</div><div class='del'>-	rxdr-&gt;size = rxdr-&gt;count * sizeof(union ixgbe_adv_rx_desc);</div><div class='del'>-	rxdr-&gt;size = ALIGN(rxdr-&gt;size, 4096);</div><div class='add'>+	rx_ring-&gt;size = rx_ring-&gt;count * sizeof(union ixgbe_adv_rx_desc);</div><div class='add'>+	rx_ring-&gt;size = ALIGN(rx_ring-&gt;size, 4096);</div><div class='ctx'> </div><div class='del'>-	rxdr-&gt;desc = pci_alloc_consistent(pdev, rxdr-&gt;size, &amp;rxdr-&gt;dma);</div><div class='add'>+	rx_ring-&gt;desc = pci_alloc_consistent(pdev, rx_ring-&gt;size, &amp;rx_ring-&gt;dma);</div><div class='ctx'> </div><div class='del'>-	if (!rxdr-&gt;desc) {</div><div class='add'>+	if (!rx_ring-&gt;desc) {</div><div class='ctx'> 		DPRINTK(PROBE, ERR,</div><div class='del'>-			"Memory allocation failed for the rx desc ring\n");</div><div class='del'>-		vfree(rxdr-&gt;rx_buffer_info);</div><div class='add'>+		        "Memory allocation failed for the rx desc ring\n");</div><div class='add'>+		vfree(rx_ring-&gt;rx_buffer_info);</div><div class='ctx'> 		goto alloc_failed;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rxdr-&gt;next_to_clean = 0;</div><div class='del'>-	rxdr-&gt;next_to_use = 0;</div><div class='add'>+	rx_ring-&gt;next_to_clean = 0;</div><div class='add'>+	rx_ring-&gt;next_to_use = 0;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> alloc_failed:</div><div class='del'>-	vfree(rxdr-&gt;lro_mgr.lro_arr);</div><div class='del'>-	rxdr-&gt;lro_mgr.lro_arr = NULL;</div><div class='add'>+	vfree(rx_ring-&gt;lro_mgr.lro_arr);</div><div class='add'>+	rx_ring-&gt;lro_mgr.lro_arr = NULL;</div><div class='ctx'> 	return -ENOMEM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * ixgbe_setup_all_rx_resources - allocate all queues Rx resources</div><div class='add'>+ * @adapter: board private structure</div><div class='add'>+ *</div><div class='add'>+ * If this function returns with an error, then it's possible one or</div><div class='add'>+ * more of the rings is populated (while the rest are not).  It is the</div><div class='add'>+ * callers duty to clean those orphaned rings.</div><div class='add'>+ *</div><div class='add'>+ * Return 0 on success, negative on failure</div><div class='add'>+ **/</div><div class='add'>+</div><div class='add'>+static int ixgbe_setup_all_rx_resources(struct ixgbe_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	int i, err = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; adapter-&gt;num_rx_queues; i++) {</div><div class='add'>+		err = ixgbe_setup_rx_resources(adapter, &amp;adapter-&gt;rx_ring[i]);</div><div class='add'>+		if (!err)</div><div class='add'>+			continue;</div><div class='add'>+		DPRINTK(PROBE, ERR, "Allocation for Rx Queue %u failed\n", i);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * ixgbe_free_tx_resources - Free Tx Resources per Queue</div><div class='ctx'>  * @adapter: board private structure</div><div class='ctx'>  * @tx_ring: Tx descriptor ring for a specific queue</div><div class='ctx'>  *</div><div class='ctx'>  * Free all transmit software resources</div><div class='ctx'>  **/</div><div class='del'>-static void ixgbe_free_tx_resources(struct ixgbe_adapter *adapter,</div><div class='del'>-				    struct ixgbe_ring *tx_ring)</div><div class='add'>+void ixgbe_free_tx_resources(struct ixgbe_adapter *adapter,</div><div class='add'>+                             struct ixgbe_ring *tx_ring)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev *pdev = adapter-&gt;pdev;</div><div class='ctx'> </div><div class='hunk'>@@ -2620,8 +2790,8 @@ static void ixgbe_free_all_tx_resources(struct ixgbe_adapter *adapter)</div><div class='ctx'>  *</div><div class='ctx'>  * Free all receive software resources</div><div class='ctx'>  **/</div><div class='del'>-static void ixgbe_free_rx_resources(struct ixgbe_adapter *adapter,</div><div class='del'>-				    struct ixgbe_ring *rx_ring)</div><div class='add'>+void ixgbe_free_rx_resources(struct ixgbe_adapter *adapter,</div><div class='add'>+                             struct ixgbe_ring *rx_ring)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev *pdev = adapter-&gt;pdev;</div><div class='ctx'> </div><div class='hunk'>@@ -2653,59 +2823,6 @@ static void ixgbe_free_all_rx_resources(struct ixgbe_adapter *adapter)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ixgbe_setup_all_tx_resources - allocate all queues Tx resources</div><div class='del'>- * @adapter: board private structure</div><div class='del'>- *</div><div class='del'>- * If this function returns with an error, then it's possible one or</div><div class='del'>- * more of the rings is populated (while the rest are not).  It is the</div><div class='del'>- * callers duty to clean those orphaned rings.</div><div class='del'>- *</div><div class='del'>- * Return 0 on success, negative on failure</div><div class='del'>- **/</div><div class='del'>-static int ixgbe_setup_all_tx_resources(struct ixgbe_adapter *adapter)</div><div class='del'>-{</div><div class='del'>-	int i, err = 0;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; adapter-&gt;num_tx_queues; i++) {</div><div class='del'>-		err = ixgbe_setup_tx_resources(adapter, &amp;adapter-&gt;tx_ring[i]);</div><div class='del'>-		if (err) {</div><div class='del'>-			DPRINTK(PROBE, ERR,</div><div class='del'>-				"Allocation for Tx Queue %u failed\n", i);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ixgbe_setup_all_rx_resources - allocate all queues Rx resources</div><div class='del'>- * @adapter: board private structure</div><div class='del'>- *</div><div class='del'>- * If this function returns with an error, then it's possible one or</div><div class='del'>- * more of the rings is populated (while the rest are not).  It is the</div><div class='del'>- * callers duty to clean those orphaned rings.</div><div class='del'>- *</div><div class='del'>- * Return 0 on success, negative on failure</div><div class='del'>- **/</div><div class='del'>-</div><div class='del'>-static int ixgbe_setup_all_rx_resources(struct ixgbe_adapter *adapter)</div><div class='del'>-{</div><div class='del'>-	int i, err = 0;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; adapter-&gt;num_rx_queues; i++) {</div><div class='del'>-		err = ixgbe_setup_rx_resources(adapter, &amp;adapter-&gt;rx_ring[i]);</div><div class='del'>-		if (err) {</div><div class='del'>-			DPRINTK(PROBE, ERR,</div><div class='del'>-				"Allocation for Rx Queue %u failed\n", i);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * ixgbe_change_mtu - Change the Maximum Transfer Unit</div><div class='ctx'>  * @netdev: network interface device structure</div><div class='ctx'>  * @new_mtu: new value for maximum frame size</div><div class='hunk'>@@ -2717,12 +2834,12 @@ static int ixgbe_change_mtu(struct net_device *netdev, int new_mtu)</div><div class='ctx'> 	struct ixgbe_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> 	int max_frame = new_mtu + ETH_HLEN + ETH_FCS_LEN;</div><div class='ctx'> </div><div class='del'>-	if ((max_frame &lt; (ETH_ZLEN + ETH_FCS_LEN)) ||</div><div class='del'>-	    (max_frame &gt; IXGBE_MAX_JUMBO_FRAME_SIZE))</div><div class='add'>+	/* MTU &lt; 68 is an error and causes problems on some kernels */</div><div class='add'>+	if ((new_mtu &lt; 68) || (max_frame &gt; IXGBE_MAX_JUMBO_FRAME_SIZE))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	DPRINTK(PROBE, INFO, "changing MTU from %d to %d\n",</div><div class='del'>-		netdev-&gt;mtu, new_mtu);</div><div class='add'>+	        netdev-&gt;mtu, new_mtu);</div><div class='ctx'> 	/* must set new MTU before calling down or up */</div><div class='ctx'> 	netdev-&gt;mtu = new_mtu;</div><div class='ctx'> </div><div class='hunk'>@@ -2817,6 +2934,135 @@ static int ixgbe_close(struct net_device *netdev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * ixgbe_napi_add_all - prep napi structs for use</div><div class='add'>+ * @adapter: private struct</div><div class='add'>+ * helper function to napi_add each possible q_vector-&gt;napi</div><div class='add'>+ */</div><div class='add'>+static void ixgbe_napi_add_all(struct ixgbe_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	int q_idx, q_vectors;</div><div class='add'>+	int (*poll)(struct napi_struct *, int);</div><div class='add'>+</div><div class='add'>+	if (adapter-&gt;flags &amp; IXGBE_FLAG_MSIX_ENABLED) {</div><div class='add'>+		poll = &amp;ixgbe_clean_rxonly;</div><div class='add'>+		/* Only enable as many vectors as we have rx queues. */</div><div class='add'>+		q_vectors = adapter-&gt;num_rx_queues;</div><div class='add'>+	} else {</div><div class='add'>+		poll = &amp;ixgbe_poll;</div><div class='add'>+		/* only one q_vector for legacy modes */</div><div class='add'>+		q_vectors = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (q_idx = 0; q_idx &lt; q_vectors; q_idx++) {</div><div class='add'>+		struct ixgbe_q_vector *q_vector = &amp;adapter-&gt;q_vector[q_idx];</div><div class='add'>+		netif_napi_add(adapter-&gt;netdev, &amp;q_vector-&gt;napi, (*poll), 64);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ixgbe_napi_del_all(struct ixgbe_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	int q_idx;</div><div class='add'>+	int q_vectors = adapter-&gt;num_msix_vectors - NON_Q_VECTORS;</div><div class='add'>+</div><div class='add'>+	/* legacy and MSI only use one vector */</div><div class='add'>+	if (!(adapter-&gt;flags &amp; IXGBE_FLAG_MSIX_ENABLED))</div><div class='add'>+		q_vectors = 1;</div><div class='add'>+</div><div class='add'>+	for (q_idx = 0; q_idx &lt; q_vectors; q_idx++) {</div><div class='add'>+		struct ixgbe_q_vector *q_vector = &amp;adapter-&gt;q_vector[q_idx];</div><div class='add'>+		if (!q_vector-&gt;rxr_count)</div><div class='add'>+			continue;</div><div class='add'>+		netif_napi_del(&amp;q_vector-&gt;napi);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+static int ixgbe_resume(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev = pci_get_drvdata(pdev);</div><div class='add'>+	struct ixgbe_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+	u32 err;</div><div class='add'>+</div><div class='add'>+	pci_set_power_state(pdev, PCI_D0);</div><div class='add'>+	pci_restore_state(pdev);</div><div class='add'>+	err = pci_enable_device(pdev);</div><div class='add'>+	if (err) {</div><div class='add'>+		printk(KERN_ERR "ixgbe: Cannot enable PCI device from "</div><div class='add'>+				"suspend\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+	pci_set_master(pdev);</div><div class='add'>+</div><div class='add'>+	pci_enable_wake(pdev, PCI_D3hot, 0);</div><div class='add'>+	pci_enable_wake(pdev, PCI_D3cold, 0);</div><div class='add'>+</div><div class='add'>+	err = ixgbe_init_interrupt_scheme(adapter);</div><div class='add'>+	if (err) {</div><div class='add'>+		printk(KERN_ERR "ixgbe: Cannot initialize interrupts for "</div><div class='add'>+		                "device\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ixgbe_napi_add_all(adapter);</div><div class='add'>+	ixgbe_reset(adapter);</div><div class='add'>+</div><div class='add'>+	if (netif_running(netdev)) {</div><div class='add'>+		err = ixgbe_open(adapter-&gt;netdev);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netif_device_attach(netdev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_PM */</div><div class='add'>+static int ixgbe_suspend(struct pci_dev *pdev, pm_message_t state)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev = pci_get_drvdata(pdev);</div><div class='add'>+	struct ixgbe_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+	int retval = 0;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	netif_device_detach(netdev);</div><div class='add'>+</div><div class='add'>+	if (netif_running(netdev)) {</div><div class='add'>+		ixgbe_down(adapter);</div><div class='add'>+		ixgbe_free_irq(adapter);</div><div class='add'>+		ixgbe_free_all_tx_resources(adapter);</div><div class='add'>+		ixgbe_free_all_rx_resources(adapter);</div><div class='add'>+	}</div><div class='add'>+	ixgbe_reset_interrupt_capability(adapter);</div><div class='add'>+	ixgbe_napi_del_all(adapter);</div><div class='add'>+	kfree(adapter-&gt;tx_ring);</div><div class='add'>+	kfree(adapter-&gt;rx_ring);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+	retval = pci_save_state(pdev);</div><div class='add'>+	if (retval)</div><div class='add'>+		return retval;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	pci_enable_wake(pdev, PCI_D3hot, 0);</div><div class='add'>+	pci_enable_wake(pdev, PCI_D3cold, 0);</div><div class='add'>+</div><div class='add'>+	ixgbe_release_hw_control(adapter);</div><div class='add'>+</div><div class='add'>+	pci_disable_device(pdev);</div><div class='add'>+</div><div class='add'>+	pci_set_power_state(pdev, pci_choose_state(pdev, state));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ixgbe_shutdown(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	ixgbe_suspend(pdev, PMSG_SUSPEND);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * ixgbe_update_stats - Update the board statistics counters.</div><div class='ctx'>  * @adapter: board private structure</div><div class='ctx'>  **/</div><div class='hunk'>@@ -2889,7 +3135,7 @@ void ixgbe_update_stats(struct ixgbe_adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> 	/* Rx Errors */</div><div class='ctx'> 	adapter-&gt;net_stats.rx_errors = adapter-&gt;stats.crcerrs +</div><div class='del'>-						adapter-&gt;stats.rlec;</div><div class='add'>+	                               adapter-&gt;stats.rlec;</div><div class='ctx'> 	adapter-&gt;net_stats.rx_dropped = 0;</div><div class='ctx'> 	adapter-&gt;net_stats.rx_length_errors = adapter-&gt;stats.rlec;</div><div class='ctx'> 	adapter-&gt;net_stats.rx_crc_errors = adapter-&gt;stats.crcerrs;</div><div class='hunk'>@@ -2903,27 +3149,74 @@ void ixgbe_update_stats(struct ixgbe_adapter *adapter)</div><div class='ctx'> static void ixgbe_watchdog(unsigned long data)</div><div class='ctx'> {</div><div class='ctx'> 	struct ixgbe_adapter *adapter = (struct ixgbe_adapter *)data;</div><div class='del'>-	struct net_device *netdev = adapter-&gt;netdev;</div><div class='del'>-	bool link_up;</div><div class='del'>-	u32 link_speed = 0;</div><div class='add'>+	struct ixgbe_hw *hw = &amp;adapter-&gt;hw;</div><div class='add'>+</div><div class='add'>+	/* Do the watchdog outside of interrupt context due to the lovely</div><div class='add'>+	 * delays that some of the newer hardware requires */</div><div class='add'>+	if (!test_bit(__IXGBE_DOWN, &amp;adapter-&gt;state)) {</div><div class='add'>+		/* Cause software interrupt to ensure rx rings are cleaned */</div><div class='add'>+		if (adapter-&gt;flags &amp; IXGBE_FLAG_MSIX_ENABLED) {</div><div class='add'>+			u32 eics =</div><div class='add'>+			 (1 &lt;&lt; (adapter-&gt;num_msix_vectors - NON_Q_VECTORS)) - 1;</div><div class='add'>+			IXGBE_WRITE_REG(hw, IXGBE_EICS, eics);</div><div class='add'>+		} else {</div><div class='add'>+			/* For legacy and MSI interrupts don't set any bits that</div><div class='add'>+			 * are enabled for EIAM, because this operation would</div><div class='add'>+			 * set *both* EIMS and EICS for any bit in EIAM */</div><div class='add'>+			IXGBE_WRITE_REG(hw, IXGBE_EICS,</div><div class='add'>+                                    (IXGBE_EICS_TCP_TIMER | IXGBE_EICS_OTHER));</div><div class='add'>+		}</div><div class='add'>+		/* Reset the timer */</div><div class='add'>+		mod_timer(&amp;adapter-&gt;watchdog_timer,</div><div class='add'>+		          round_jiffies(jiffies + 2 * HZ));</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	adapter-&gt;hw.mac.ops.check_link(&amp;adapter-&gt;hw, &amp;(link_speed), &amp;link_up);</div><div class='add'>+	schedule_work(&amp;adapter-&gt;watchdog_task);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ixgbe_watchdog_task - worker thread to bring link up</div><div class='add'>+ * @work: pointer to work_struct containing our data</div><div class='add'>+ **/</div><div class='add'>+static void ixgbe_watchdog_task(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct ixgbe_adapter *adapter = container_of(work,</div><div class='add'>+	                                             struct ixgbe_adapter,</div><div class='add'>+	                                             watchdog_task);</div><div class='add'>+	struct net_device *netdev = adapter-&gt;netdev;</div><div class='add'>+	struct ixgbe_hw *hw = &amp;adapter-&gt;hw;</div><div class='add'>+	u32 link_speed = adapter-&gt;link_speed;</div><div class='add'>+	bool link_up = adapter-&gt;link_up;</div><div class='add'>+</div><div class='add'>+	adapter-&gt;flags |= IXGBE_FLAG_IN_WATCHDOG_TASK;</div><div class='add'>+</div><div class='add'>+	if (adapter-&gt;flags &amp; IXGBE_FLAG_NEED_LINK_UPDATE) {</div><div class='add'>+		hw-&gt;mac.ops.check_link(hw, &amp;link_speed, &amp;link_up, false);</div><div class='add'>+		if (link_up ||</div><div class='add'>+		    time_after(jiffies, (adapter-&gt;link_check_timeout +</div><div class='add'>+		                         IXGBE_TRY_LINK_TIMEOUT))) {</div><div class='add'>+			IXGBE_WRITE_REG(hw, IXGBE_EIMS, IXGBE_EIMC_LSC);</div><div class='add'>+			adapter-&gt;flags &amp;= ~IXGBE_FLAG_NEED_LINK_UPDATE;</div><div class='add'>+		}</div><div class='add'>+		adapter-&gt;link_up = link_up;</div><div class='add'>+		adapter-&gt;link_speed = link_speed;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (link_up) {</div><div class='ctx'> 		if (!netif_carrier_ok(netdev)) {</div><div class='del'>-			u32 frctl = IXGBE_READ_REG(&amp;adapter-&gt;hw, IXGBE_FCTRL);</div><div class='del'>-			u32 rmcs = IXGBE_READ_REG(&amp;adapter-&gt;hw, IXGBE_RMCS);</div><div class='add'>+			u32 frctl = IXGBE_READ_REG(hw, IXGBE_FCTRL);</div><div class='add'>+			u32 rmcs = IXGBE_READ_REG(hw, IXGBE_RMCS);</div><div class='ctx'> #define FLOW_RX (frctl &amp; IXGBE_FCTRL_RFCE)</div><div class='ctx'> #define FLOW_TX (rmcs &amp; IXGBE_RMCS_TFCE_802_3X)</div><div class='ctx'> 			DPRINTK(LINK, INFO, "NIC Link is Up %s, "</div><div class='del'>-				"Flow Control: %s\n",</div><div class='del'>-				(link_speed == IXGBE_LINK_SPEED_10GB_FULL ?</div><div class='del'>-				 "10 Gbps" :</div><div class='del'>-				 (link_speed == IXGBE_LINK_SPEED_1GB_FULL ?</div><div class='del'>-				  "1 Gbps" : "unknown speed")),</div><div class='del'>-				((FLOW_RX &amp;&amp; FLOW_TX) ? "RX/TX" :</div><div class='del'>-				 (FLOW_RX ? "RX" :</div><div class='del'>-				 (FLOW_TX ? "TX" : "None"))));</div><div class='add'>+			        "Flow Control: %s\n",</div><div class='add'>+			        (link_speed == IXGBE_LINK_SPEED_10GB_FULL ?</div><div class='add'>+			         "10 Gbps" :</div><div class='add'>+			         (link_speed == IXGBE_LINK_SPEED_1GB_FULL ?</div><div class='add'>+			          "1 Gbps" : "unknown speed")),</div><div class='add'>+			        ((FLOW_RX &amp;&amp; FLOW_TX) ? "RX/TX" :</div><div class='add'>+			         (FLOW_RX ? "RX" :</div><div class='add'>+			         (FLOW_TX ? "TX" : "None"))));</div><div class='ctx'> </div><div class='ctx'> 			netif_carrier_on(netdev);</div><div class='ctx'> 			netif_tx_wake_all_queues(netdev);</div><div class='hunk'>@@ -2932,6 +3225,8 @@ static void ixgbe_watchdog(unsigned long data)</div><div class='ctx'> 			adapter-&gt;detect_tx_hung = true;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='add'>+		adapter-&gt;link_up = false;</div><div class='add'>+		adapter-&gt;link_speed = 0;</div><div class='ctx'> 		if (netif_carrier_ok(netdev)) {</div><div class='ctx'> 			DPRINTK(LINK, INFO, "NIC Link is Down\n");</div><div class='ctx'> 			netif_carrier_off(netdev);</div><div class='hunk'>@@ -2940,36 +3235,19 @@ static void ixgbe_watchdog(unsigned long data)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ixgbe_update_stats(adapter);</div><div class='del'>-</div><div class='del'>-	if (!test_bit(__IXGBE_DOWN, &amp;adapter-&gt;state)) {</div><div class='del'>-		/* Cause software interrupt to ensure rx rings are cleaned */</div><div class='del'>-		if (adapter-&gt;flags &amp; IXGBE_FLAG_MSIX_ENABLED) {</div><div class='del'>-			u32 eics =</div><div class='del'>-			 (1 &lt;&lt; (adapter-&gt;num_msix_vectors - NON_Q_VECTORS)) - 1;</div><div class='del'>-			IXGBE_WRITE_REG(&amp;adapter-&gt;hw, IXGBE_EICS, eics);</div><div class='del'>-		} else {</div><div class='del'>-			/* for legacy and MSI interrupts don't set any bits that</div><div class='del'>-			 * are enabled for EIAM, because this operation would</div><div class='del'>-			 * set *both* EIMS and EICS for any bit in EIAM */</div><div class='del'>-			IXGBE_WRITE_REG(&amp;adapter-&gt;hw, IXGBE_EICS,</div><div class='del'>-				     (IXGBE_EICS_TCP_TIMER | IXGBE_EICS_OTHER));</div><div class='del'>-		}</div><div class='del'>-		/* Reset the timer */</div><div class='del'>-		mod_timer(&amp;adapter-&gt;watchdog_timer,</div><div class='del'>-			  round_jiffies(jiffies + 2 * HZ));</div><div class='del'>-	}</div><div class='add'>+	adapter-&gt;flags &amp;= ~IXGBE_FLAG_IN_WATCHDOG_TASK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ixgbe_tso(struct ixgbe_adapter *adapter,</div><div class='del'>-			 struct ixgbe_ring *tx_ring, struct sk_buff *skb,</div><div class='del'>-			 u32 tx_flags, u8 *hdr_len)</div><div class='add'>+                     struct ixgbe_ring *tx_ring, struct sk_buff *skb,</div><div class='add'>+                     u32 tx_flags, u8 *hdr_len)</div><div class='ctx'> {</div><div class='ctx'> 	struct ixgbe_adv_tx_context_desc *context_desc;</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct ixgbe_tx_buffer *tx_buffer_info;</div><div class='del'>-	u32 vlan_macip_lens = 0, type_tucmd_mlhl = 0;</div><div class='del'>-	u32 mss_l4len_idx = 0, l4len;</div><div class='add'>+	u32 vlan_macip_lens = 0, type_tucmd_mlhl;</div><div class='add'>+	u32 mss_l4len_idx, l4len;</div><div class='ctx'> </div><div class='ctx'> 	if (skb_is_gso(skb)) {</div><div class='ctx'> 		if (skb_header_cloned(skb)) {</div><div class='hunk'>@@ -2985,16 +3263,16 @@ static int ixgbe_tso(struct ixgbe_adapter *adapter,</div><div class='ctx'> 			iph-&gt;tot_len = 0;</div><div class='ctx'> 			iph-&gt;check = 0;</div><div class='ctx'> 			tcp_hdr(skb)-&gt;check = ~csum_tcpudp_magic(iph-&gt;saddr,</div><div class='del'>-								 iph-&gt;daddr, 0,</div><div class='del'>-								 IPPROTO_TCP,</div><div class='del'>-								 0);</div><div class='add'>+			                                         iph-&gt;daddr, 0,</div><div class='add'>+			                                         IPPROTO_TCP,</div><div class='add'>+			                                         0);</div><div class='ctx'> 			adapter-&gt;hw_tso_ctxt++;</div><div class='ctx'> 		} else if (skb_shinfo(skb)-&gt;gso_type == SKB_GSO_TCPV6) {</div><div class='ctx'> 			ipv6_hdr(skb)-&gt;payload_len = 0;</div><div class='ctx'> 			tcp_hdr(skb)-&gt;check =</div><div class='ctx'> 			    ~csum_ipv6_magic(&amp;ipv6_hdr(skb)-&gt;saddr,</div><div class='del'>-					     &amp;ipv6_hdr(skb)-&gt;daddr,</div><div class='del'>-					     0, IPPROTO_TCP, 0);</div><div class='add'>+			                     &amp;ipv6_hdr(skb)-&gt;daddr,</div><div class='add'>+			                     0, IPPROTO_TCP, 0);</div><div class='ctx'> 			adapter-&gt;hw_tso6_ctxt++;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -3008,7 +3286,7 @@ static int ixgbe_tso(struct ixgbe_adapter *adapter,</div><div class='ctx'> 			vlan_macip_lens |=</div><div class='ctx'> 			    (tx_flags &amp; IXGBE_TX_FLAGS_VLAN_MASK);</div><div class='ctx'> 		vlan_macip_lens |= ((skb_network_offset(skb)) &lt;&lt;</div><div class='del'>-				    IXGBE_ADVTXD_MACLEN_SHIFT);</div><div class='add'>+		                    IXGBE_ADVTXD_MACLEN_SHIFT);</div><div class='ctx'> 		*hdr_len += skb_network_offset(skb);</div><div class='ctx'> 		vlan_macip_lens |=</div><div class='ctx'> 		    (skb_transport_header(skb) - skb_network_header(skb));</div><div class='hunk'>@@ -3018,8 +3296,8 @@ static int ixgbe_tso(struct ixgbe_adapter *adapter,</div><div class='ctx'> 		context_desc-&gt;seqnum_seed = 0;</div><div class='ctx'> </div><div class='ctx'> 		/* ADV DTYP TUCMD MKRLOC/ISCSIHEDLEN */</div><div class='del'>-		type_tucmd_mlhl |= (IXGBE_TXD_CMD_DEXT |</div><div class='del'>-				    IXGBE_ADVTXD_DTYP_CTXT);</div><div class='add'>+		type_tucmd_mlhl = (IXGBE_TXD_CMD_DEXT |</div><div class='add'>+		                   IXGBE_ADVTXD_DTYP_CTXT);</div><div class='ctx'> </div><div class='ctx'> 		if (skb-&gt;protocol == htons(ETH_P_IP))</div><div class='ctx'> 			type_tucmd_mlhl |= IXGBE_ADVTXD_TUCMD_IPV4;</div><div class='hunk'>@@ -3027,9 +3305,11 @@ static int ixgbe_tso(struct ixgbe_adapter *adapter,</div><div class='ctx'> 		context_desc-&gt;type_tucmd_mlhl = cpu_to_le32(type_tucmd_mlhl);</div><div class='ctx'> </div><div class='ctx'> 		/* MSS L4LEN IDX */</div><div class='del'>-		mss_l4len_idx |=</div><div class='add'>+		mss_l4len_idx =</div><div class='ctx'> 		    (skb_shinfo(skb)-&gt;gso_size &lt;&lt; IXGBE_ADVTXD_MSS_SHIFT);</div><div class='ctx'> 		mss_l4len_idx |= (l4len &lt;&lt; IXGBE_ADVTXD_L4LEN_SHIFT);</div><div class='add'>+		/* use index 1 for TSO */</div><div class='add'>+		mss_l4len_idx |= (1 &lt;&lt; IXGBE_ADVTXD_IDX_SHIFT);</div><div class='ctx'> 		context_desc-&gt;mss_l4len_idx = cpu_to_le32(mss_l4len_idx);</div><div class='ctx'> </div><div class='ctx'> 		tx_buffer_info-&gt;time_stamp = jiffies;</div><div class='hunk'>@@ -3046,8 +3326,8 @@ static int ixgbe_tso(struct ixgbe_adapter *adapter,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool ixgbe_tx_csum(struct ixgbe_adapter *adapter,</div><div class='del'>-				   struct ixgbe_ring *tx_ring,</div><div class='del'>-				   struct sk_buff *skb, u32 tx_flags)</div><div class='add'>+                          struct ixgbe_ring *tx_ring,</div><div class='add'>+                          struct sk_buff *skb, u32 tx_flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct ixgbe_adv_tx_context_desc *context_desc;</div><div class='ctx'> 	unsigned int i;</div><div class='hunk'>@@ -3064,16 +3344,16 @@ static bool ixgbe_tx_csum(struct ixgbe_adapter *adapter,</div><div class='ctx'> 			vlan_macip_lens |=</div><div class='ctx'> 			    (tx_flags &amp; IXGBE_TX_FLAGS_VLAN_MASK);</div><div class='ctx'> 		vlan_macip_lens |= (skb_network_offset(skb) &lt;&lt;</div><div class='del'>-				    IXGBE_ADVTXD_MACLEN_SHIFT);</div><div class='add'>+		                    IXGBE_ADVTXD_MACLEN_SHIFT);</div><div class='ctx'> 		if (skb-&gt;ip_summed == CHECKSUM_PARTIAL)</div><div class='ctx'> 			vlan_macip_lens |= (skb_transport_header(skb) -</div><div class='del'>-					    skb_network_header(skb));</div><div class='add'>+			                    skb_network_header(skb));</div><div class='ctx'> </div><div class='ctx'> 		context_desc-&gt;vlan_macip_lens = cpu_to_le32(vlan_macip_lens);</div><div class='ctx'> 		context_desc-&gt;seqnum_seed = 0;</div><div class='ctx'> </div><div class='ctx'> 		type_tucmd_mlhl |= (IXGBE_TXD_CMD_DEXT |</div><div class='del'>-				    IXGBE_ADVTXD_DTYP_CTXT);</div><div class='add'>+		                    IXGBE_ADVTXD_DTYP_CTXT);</div><div class='ctx'> </div><div class='ctx'> 		if (skb-&gt;ip_summed == CHECKSUM_PARTIAL) {</div><div class='ctx'> 			switch (skb-&gt;protocol) {</div><div class='hunk'>@@ -3081,16 +3361,14 @@ static bool ixgbe_tx_csum(struct ixgbe_adapter *adapter,</div><div class='ctx'> 				type_tucmd_mlhl |= IXGBE_ADVTXD_TUCMD_IPV4;</div><div class='ctx'> 				if (ip_hdr(skb)-&gt;protocol == IPPROTO_TCP)</div><div class='ctx'> 					type_tucmd_mlhl |=</div><div class='del'>-						IXGBE_ADVTXD_TUCMD_L4T_TCP;</div><div class='add'>+					        IXGBE_ADVTXD_TUCMD_L4T_TCP;</div><div class='ctx'> 				break;</div><div class='del'>-</div><div class='ctx'> 			case __constant_htons(ETH_P_IPV6):</div><div class='ctx'> 				/* XXX what about other V6 headers?? */</div><div class='ctx'> 				if (ipv6_hdr(skb)-&gt;nexthdr == IPPROTO_TCP)</div><div class='ctx'> 					type_tucmd_mlhl |=</div><div class='del'>-						IXGBE_ADVTXD_TUCMD_L4T_TCP;</div><div class='add'>+					        IXGBE_ADVTXD_TUCMD_L4T_TCP;</div><div class='ctx'> 				break;</div><div class='del'>-</div><div class='ctx'> 			default:</div><div class='ctx'> 				if (unlikely(net_ratelimit())) {</div><div class='ctx'> 					DPRINTK(PROBE, WARNING,</div><div class='hunk'>@@ -3102,10 +3380,12 @@ static bool ixgbe_tx_csum(struct ixgbe_adapter *adapter,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		context_desc-&gt;type_tucmd_mlhl = cpu_to_le32(type_tucmd_mlhl);</div><div class='add'>+		/* use index zero for tx checksum offload */</div><div class='ctx'> 		context_desc-&gt;mss_l4len_idx = 0;</div><div class='ctx'> </div><div class='ctx'> 		tx_buffer_info-&gt;time_stamp = jiffies;</div><div class='ctx'> 		tx_buffer_info-&gt;next_to_watch = i;</div><div class='add'>+</div><div class='ctx'> 		adapter-&gt;hw_csum_tx_good++;</div><div class='ctx'> 		i++;</div><div class='ctx'> 		if (i == tx_ring-&gt;count)</div><div class='hunk'>@@ -3114,12 +3394,13 @@ static bool ixgbe_tx_csum(struct ixgbe_adapter *adapter,</div><div class='ctx'> </div><div class='ctx'> 		return true;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ixgbe_tx_map(struct ixgbe_adapter *adapter,</div><div class='del'>-			struct ixgbe_ring *tx_ring,</div><div class='del'>-			struct sk_buff *skb, unsigned int first)</div><div class='add'>+                        struct ixgbe_ring *tx_ring,</div><div class='add'>+                        struct sk_buff *skb, unsigned int first)</div><div class='ctx'> {</div><div class='ctx'> 	struct ixgbe_tx_buffer *tx_buffer_info;</div><div class='ctx'> 	unsigned int len = skb-&gt;len;</div><div class='hunk'>@@ -3137,8 +3418,8 @@ static int ixgbe_tx_map(struct ixgbe_adapter *adapter,</div><div class='ctx'> </div><div class='ctx'> 		tx_buffer_info-&gt;length = size;</div><div class='ctx'> 		tx_buffer_info-&gt;dma = pci_map_single(adapter-&gt;pdev,</div><div class='del'>-						  skb-&gt;data + offset,</div><div class='del'>-						  size, PCI_DMA_TODEVICE);</div><div class='add'>+		                                     skb-&gt;data + offset,</div><div class='add'>+		                                     size, PCI_DMA_TODEVICE);</div><div class='ctx'> 		tx_buffer_info-&gt;time_stamp = jiffies;</div><div class='ctx'> 		tx_buffer_info-&gt;next_to_watch = i;</div><div class='ctx'> </div><div class='hunk'>@@ -3163,9 +3444,10 @@ static int ixgbe_tx_map(struct ixgbe_adapter *adapter,</div><div class='ctx'> </div><div class='ctx'> 			tx_buffer_info-&gt;length = size;</div><div class='ctx'> 			tx_buffer_info-&gt;dma = pci_map_page(adapter-&gt;pdev,</div><div class='del'>-							frag-&gt;page,</div><div class='del'>-							offset,</div><div class='del'>-							size, PCI_DMA_TODEVICE);</div><div class='add'>+			                                   frag-&gt;page,</div><div class='add'>+			                                   offset,</div><div class='add'>+			                                   size,</div><div class='add'>+			                                   PCI_DMA_TODEVICE);</div><div class='ctx'> 			tx_buffer_info-&gt;time_stamp = jiffies;</div><div class='ctx'> 			tx_buffer_info-&gt;next_to_watch = i;</div><div class='ctx'> </div><div class='hunk'>@@ -3188,8 +3470,8 @@ static int ixgbe_tx_map(struct ixgbe_adapter *adapter,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ixgbe_tx_queue(struct ixgbe_adapter *adapter,</div><div class='del'>-			       struct ixgbe_ring *tx_ring,</div><div class='del'>-			       int tx_flags, int count, u32 paylen, u8 hdr_len)</div><div class='add'>+                           struct ixgbe_ring *tx_ring,</div><div class='add'>+                           int tx_flags, int count, u32 paylen, u8 hdr_len)</div><div class='ctx'> {</div><div class='ctx'> 	union ixgbe_adv_tx_desc *tx_desc = NULL;</div><div class='ctx'> 	struct ixgbe_tx_buffer *tx_buffer_info;</div><div class='hunk'>@@ -3208,15 +3490,17 @@ static void ixgbe_tx_queue(struct ixgbe_adapter *adapter,</div><div class='ctx'> 		cmd_type_len |= IXGBE_ADVTXD_DCMD_TSE;</div><div class='ctx'> </div><div class='ctx'> 		olinfo_status |= IXGBE_TXD_POPTS_TXSM &lt;&lt;</div><div class='del'>-						IXGBE_ADVTXD_POPTS_SHIFT;</div><div class='add'>+		                 IXGBE_ADVTXD_POPTS_SHIFT;</div><div class='ctx'> </div><div class='add'>+		/* use index 1 context for tso */</div><div class='add'>+		olinfo_status |= (1 &lt;&lt; IXGBE_ADVTXD_IDX_SHIFT);</div><div class='ctx'> 		if (tx_flags &amp; IXGBE_TX_FLAGS_IPV4)</div><div class='ctx'> 			olinfo_status |= IXGBE_TXD_POPTS_IXSM &lt;&lt;</div><div class='del'>-						IXGBE_ADVTXD_POPTS_SHIFT;</div><div class='add'>+			                 IXGBE_ADVTXD_POPTS_SHIFT;</div><div class='ctx'> </div><div class='ctx'> 	} else if (tx_flags &amp; IXGBE_TX_FLAGS_CSUM)</div><div class='ctx'> 		olinfo_status |= IXGBE_TXD_POPTS_TXSM &lt;&lt;</div><div class='del'>-						IXGBE_ADVTXD_POPTS_SHIFT;</div><div class='add'>+		                 IXGBE_ADVTXD_POPTS_SHIFT;</div><div class='ctx'> </div><div class='ctx'> 	olinfo_status |= ((paylen - hdr_len) &lt;&lt; IXGBE_ADVTXD_PAYLEN_SHIFT);</div><div class='ctx'> </div><div class='hunk'>@@ -3226,9 +3510,8 @@ static void ixgbe_tx_queue(struct ixgbe_adapter *adapter,</div><div class='ctx'> 		tx_desc = IXGBE_TX_DESC_ADV(*tx_ring, i);</div><div class='ctx'> 		tx_desc-&gt;read.buffer_addr = cpu_to_le64(tx_buffer_info-&gt;dma);</div><div class='ctx'> 		tx_desc-&gt;read.cmd_type_len =</div><div class='del'>-			cpu_to_le32(cmd_type_len | tx_buffer_info-&gt;length);</div><div class='add'>+		        cpu_to_le32(cmd_type_len | tx_buffer_info-&gt;length);</div><div class='ctx'> 		tx_desc-&gt;read.olinfo_status = cpu_to_le32(olinfo_status);</div><div class='del'>-</div><div class='ctx'> 		i++;</div><div class='ctx'> 		if (i == tx_ring-&gt;count)</div><div class='ctx'> 			i = 0;</div><div class='hunk'>@@ -3249,7 +3532,7 @@ static void ixgbe_tx_queue(struct ixgbe_adapter *adapter,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __ixgbe_maybe_stop_tx(struct net_device *netdev,</div><div class='del'>-				 struct ixgbe_ring *tx_ring, int size)</div><div class='add'>+                                 struct ixgbe_ring *tx_ring, int size)</div><div class='ctx'> {</div><div class='ctx'> 	struct ixgbe_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> </div><div class='hunk'>@@ -3265,61 +3548,52 @@ static int __ixgbe_maybe_stop_tx(struct net_device *netdev,</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='ctx'> 	/* A reprieve! - use start_queue because it doesn't call schedule */</div><div class='del'>-	netif_wake_subqueue(netdev, tx_ring-&gt;queue_index);</div><div class='add'>+	netif_start_subqueue(netdev, tx_ring-&gt;queue_index);</div><div class='ctx'> 	++adapter-&gt;restart_queue;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ixgbe_maybe_stop_tx(struct net_device *netdev,</div><div class='del'>-			       struct ixgbe_ring *tx_ring, int size)</div><div class='add'>+                              struct ixgbe_ring *tx_ring, int size)</div><div class='ctx'> {</div><div class='ctx'> 	if (likely(IXGBE_DESC_UNUSED(tx_ring) &gt;= size))</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	return __ixgbe_maybe_stop_tx(netdev, tx_ring, size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> static int ixgbe_xmit_frame(struct sk_buff *skb, struct net_device *netdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ixgbe_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> 	struct ixgbe_ring *tx_ring;</div><div class='del'>-	unsigned int len = skb-&gt;len;</div><div class='ctx'> 	unsigned int first;</div><div class='ctx'> 	unsigned int tx_flags = 0;</div><div class='ctx'> 	u8 hdr_len = 0;</div><div class='ctx'> 	int r_idx = 0, tso;</div><div class='del'>-	unsigned int mss = 0;</div><div class='ctx'> 	int count = 0;</div><div class='ctx'> 	unsigned int f;</div><div class='del'>-	unsigned int nr_frags = skb_shinfo(skb)-&gt;nr_frags;</div><div class='del'>-	len -= skb-&gt;data_len;</div><div class='add'>+</div><div class='ctx'> 	r_idx = (adapter-&gt;num_tx_queues - 1) &amp; skb-&gt;queue_mapping;</div><div class='ctx'> 	tx_ring = &amp;adapter-&gt;tx_ring[r_idx];</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-	if (skb-&gt;len &lt;= 0) {</div><div class='del'>-		dev_kfree_skb(skb);</div><div class='del'>-		return NETDEV_TX_OK;</div><div class='add'>+	if (adapter-&gt;vlgrp &amp;&amp; vlan_tx_tag_present(skb)) {</div><div class='add'>+		tx_flags |= vlan_tx_tag_get(skb);</div><div class='add'>+		tx_flags &lt;&lt;= IXGBE_TX_FLAGS_VLAN_SHIFT;</div><div class='add'>+		tx_flags |= IXGBE_TX_FLAGS_VLAN;</div><div class='ctx'> 	}</div><div class='del'>-	mss = skb_shinfo(skb)-&gt;gso_size;</div><div class='del'>-</div><div class='del'>-	if (mss)</div><div class='del'>-		count++;</div><div class='del'>-	else if (skb-&gt;ip_summed == CHECKSUM_PARTIAL)</div><div class='add'>+	/* three things can cause us to need a context descriptor */</div><div class='add'>+	if (skb_is_gso(skb) ||</div><div class='add'>+	    (skb-&gt;ip_summed == CHECKSUM_PARTIAL) ||</div><div class='add'>+	    (tx_flags &amp; IXGBE_TX_FLAGS_VLAN))</div><div class='ctx'> 		count++;</div><div class='ctx'> </div><div class='del'>-	count += TXD_USE_COUNT(len);</div><div class='del'>-	for (f = 0; f &lt; nr_frags; f++)</div><div class='add'>+	count += TXD_USE_COUNT(skb_headlen(skb));</div><div class='add'>+	for (f = 0; f &lt; skb_shinfo(skb)-&gt;nr_frags; f++)</div><div class='ctx'> 		count += TXD_USE_COUNT(skb_shinfo(skb)-&gt;frags[f].size);</div><div class='ctx'> </div><div class='ctx'> 	if (ixgbe_maybe_stop_tx(netdev, tx_ring, count)) {</div><div class='ctx'> 		adapter-&gt;tx_busy++;</div><div class='ctx'> 		return NETDEV_TX_BUSY;</div><div class='ctx'> 	}</div><div class='del'>-	if (adapter-&gt;vlgrp &amp;&amp; vlan_tx_tag_present(skb)) {</div><div class='del'>-		tx_flags |= IXGBE_TX_FLAGS_VLAN;</div><div class='del'>-		tx_flags |= (vlan_tx_tag_get(skb) &lt;&lt; IXGBE_TX_FLAGS_VLAN_SHIFT);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	if (skb-&gt;protocol == htons(ETH_P_IP))</div><div class='ctx'> 		tx_flags |= IXGBE_TX_FLAGS_IPV4;</div><div class='hunk'>@@ -3333,12 +3607,12 @@ static int ixgbe_xmit_frame(struct sk_buff *skb, struct net_device *netdev)</div><div class='ctx'> 	if (tso)</div><div class='ctx'> 		tx_flags |= IXGBE_TX_FLAGS_TSO;</div><div class='ctx'> 	else if (ixgbe_tx_csum(adapter, tx_ring, skb, tx_flags) &amp;&amp;</div><div class='del'>-		 (skb-&gt;ip_summed == CHECKSUM_PARTIAL))</div><div class='add'>+	         (skb-&gt;ip_summed == CHECKSUM_PARTIAL))</div><div class='ctx'> 		tx_flags |= IXGBE_TX_FLAGS_CSUM;</div><div class='ctx'> </div><div class='ctx'> 	ixgbe_tx_queue(adapter, tx_ring, tx_flags,</div><div class='del'>-			   ixgbe_tx_map(adapter, tx_ring, skb, first),</div><div class='del'>-			   skb-&gt;len, hdr_len);</div><div class='add'>+	               ixgbe_tx_map(adapter, tx_ring, skb, first),</div><div class='add'>+	               skb-&gt;len, hdr_len);</div><div class='ctx'> </div><div class='ctx'> 	netdev-&gt;trans_start = jiffies;</div><div class='ctx'> </div><div class='hunk'>@@ -3372,15 +3646,16 @@ static struct net_device_stats *ixgbe_get_stats(struct net_device *netdev)</div><div class='ctx'> static int ixgbe_set_mac(struct net_device *netdev, void *p)</div><div class='ctx'> {</div><div class='ctx'> 	struct ixgbe_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+	struct ixgbe_hw *hw = &amp;adapter-&gt;hw;</div><div class='ctx'> 	struct sockaddr *addr = p;</div><div class='ctx'> </div><div class='ctx'> 	if (!is_valid_ether_addr(addr-&gt;sa_data))</div><div class='ctx'> 		return -EADDRNOTAVAIL;</div><div class='ctx'> </div><div class='ctx'> 	memcpy(netdev-&gt;dev_addr, addr-&gt;sa_data, netdev-&gt;addr_len);</div><div class='del'>-	memcpy(adapter-&gt;hw.mac.addr, addr-&gt;sa_data, netdev-&gt;addr_len);</div><div class='add'>+	memcpy(hw-&gt;mac.addr, addr-&gt;sa_data, netdev-&gt;addr_len);</div><div class='ctx'> </div><div class='del'>-	ixgbe_set_rar(&amp;adapter-&gt;hw, 0, adapter-&gt;hw.mac.addr, 0, IXGBE_RAH_AV);</div><div class='add'>+	hw-&gt;mac.ops.set_rar(hw, 0, hw-&gt;mac.addr, 0, IXGBE_RAH_AV);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -3404,28 +3679,19 @@ static void ixgbe_netpoll(struct net_device *netdev)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ixgbe_napi_add_all - prep napi structs for use</div><div class='del'>- * @adapter: private struct</div><div class='del'>- * helper function to napi_add each possible q_vector-&gt;napi</div><div class='del'>- */</div><div class='del'>-static void ixgbe_napi_add_all(struct ixgbe_adapter *adapter)</div><div class='add'>+ * ixgbe_link_config - set up initial link with default speed and duplex</div><div class='add'>+ * @hw: pointer to private hardware struct</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 on success, negative on failure</div><div class='add'>+ **/</div><div class='add'>+static int ixgbe_link_config(struct ixgbe_hw *hw)</div><div class='ctx'> {</div><div class='del'>-	int i, q_vectors = adapter-&gt;num_msix_vectors - NON_Q_VECTORS;</div><div class='del'>-	int (*poll)(struct napi_struct *, int);</div><div class='add'>+	u32 autoneg = IXGBE_LINK_SPEED_10GB_FULL;</div><div class='ctx'> </div><div class='del'>-	if (adapter-&gt;flags &amp; IXGBE_FLAG_MSIX_ENABLED) {</div><div class='del'>-		poll = &amp;ixgbe_clean_rxonly;</div><div class='del'>-	} else {</div><div class='del'>-		poll = &amp;ixgbe_poll;</div><div class='del'>-		/* only one q_vector for legacy modes */</div><div class='del'>-		q_vectors = 1;</div><div class='del'>-	}</div><div class='add'>+	/* must always autoneg for both 1G and 10G link */</div><div class='add'>+	hw-&gt;mac.autoneg = true;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; q_vectors; i++) {</div><div class='del'>-		struct ixgbe_q_vector *q_vector = &amp;adapter-&gt;q_vector[i];</div><div class='del'>-		netif_napi_add(adapter-&gt;netdev, &amp;q_vector-&gt;napi,</div><div class='del'>-			       (*poll), 64);</div><div class='del'>-	}</div><div class='add'>+	return hw-&gt;mac.ops.setup_link_speed(hw, autoneg, true, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -3440,17 +3706,16 @@ static void ixgbe_napi_add_all(struct ixgbe_adapter *adapter)</div><div class='ctx'>  * and a hardware reset occur.</div><div class='ctx'>  **/</div><div class='ctx'> static int __devinit ixgbe_probe(struct pci_dev *pdev,</div><div class='del'>-				 const struct pci_device_id *ent)</div><div class='add'>+                                 const struct pci_device_id *ent)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *netdev;</div><div class='ctx'> 	struct ixgbe_adapter *adapter = NULL;</div><div class='ctx'> 	struct ixgbe_hw *hw;</div><div class='ctx'> 	const struct ixgbe_info *ii = ixgbe_info_tbl[ent-&gt;driver_data];</div><div class='del'>-	unsigned long mmio_start, mmio_len;</div><div class='ctx'> 	static int cards_found;</div><div class='ctx'> 	int i, err, pci_using_dac;</div><div class='ctx'> 	u16 link_status, link_speed, link_width;</div><div class='del'>-	u32 part_num;</div><div class='add'>+	u32 part_num, eec;</div><div class='ctx'> </div><div class='ctx'> 	err = pci_enable_device(pdev);</div><div class='ctx'> 	if (err)</div><div class='hunk'>@@ -3465,7 +3730,7 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,</div><div class='ctx'> 			err = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);</div><div class='ctx'> 			if (err) {</div><div class='ctx'> 				dev_err(&amp;pdev-&gt;dev, "No usable DMA "</div><div class='del'>-					"configuration, aborting\n");</div><div class='add'>+				        "configuration, aborting\n");</div><div class='ctx'> 				goto err_dma;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -3498,10 +3763,8 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,</div><div class='ctx'> 	hw-&gt;back = adapter;</div><div class='ctx'> 	adapter-&gt;msg_enable = (1 &lt;&lt; DEFAULT_DEBUG_LEVEL_SHIFT) - 1;</div><div class='ctx'> </div><div class='del'>-	mmio_start = pci_resource_start(pdev, 0);</div><div class='del'>-	mmio_len = pci_resource_len(pdev, 0);</div><div class='del'>-</div><div class='del'>-	hw-&gt;hw_addr = ioremap(mmio_start, mmio_len);</div><div class='add'>+	hw-&gt;hw_addr = ioremap(pci_resource_start(pdev, 0),</div><div class='add'>+	                      pci_resource_len(pdev, 0));</div><div class='ctx'> 	if (!hw-&gt;hw_addr) {</div><div class='ctx'> 		err = -EIO;</div><div class='ctx'> 		goto err_ioremap;</div><div class='hunk'>@@ -3516,7 +3779,8 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,</div><div class='ctx'> 	netdev-&gt;stop = &amp;ixgbe_close;</div><div class='ctx'> 	netdev-&gt;hard_start_xmit = &amp;ixgbe_xmit_frame;</div><div class='ctx'> 	netdev-&gt;get_stats = &amp;ixgbe_get_stats;</div><div class='del'>-	netdev-&gt;set_multicast_list = &amp;ixgbe_set_multi;</div><div class='add'>+	netdev-&gt;set_rx_mode = &amp;ixgbe_set_rx_mode;</div><div class='add'>+	netdev-&gt;set_multicast_list = &amp;ixgbe_set_rx_mode;</div><div class='ctx'> 	netdev-&gt;set_mac_address = &amp;ixgbe_set_mac;</div><div class='ctx'> 	netdev-&gt;change_mtu = &amp;ixgbe_change_mtu;</div><div class='ctx'> 	ixgbe_set_ethtool_ops(netdev);</div><div class='hunk'>@@ -3530,22 +3794,23 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,</div><div class='ctx'> #endif</div><div class='ctx'> 	strcpy(netdev-&gt;name, pci_name(pdev));</div><div class='ctx'> </div><div class='del'>-	netdev-&gt;mem_start = mmio_start;</div><div class='del'>-	netdev-&gt;mem_end = mmio_start + mmio_len;</div><div class='del'>-</div><div class='ctx'> 	adapter-&gt;bd_number = cards_found;</div><div class='ctx'> </div><div class='del'>-	/* PCI config space info */</div><div class='del'>-	hw-&gt;vendor_id = pdev-&gt;vendor;</div><div class='del'>-	hw-&gt;device_id = pdev-&gt;device;</div><div class='del'>-	hw-&gt;revision_id = pdev-&gt;revision;</div><div class='del'>-	hw-&gt;subsystem_vendor_id = pdev-&gt;subsystem_vendor;</div><div class='del'>-	hw-&gt;subsystem_device_id = pdev-&gt;subsystem_device;</div><div class='del'>-</div><div class='ctx'> 	/* Setup hw api */</div><div class='ctx'> 	memcpy(&amp;hw-&gt;mac.ops, ii-&gt;mac_ops, sizeof(hw-&gt;mac.ops));</div><div class='ctx'> 	hw-&gt;mac.type  = ii-&gt;mac;</div><div class='ctx'> </div><div class='add'>+	/* EEPROM */</div><div class='add'>+	memcpy(&amp;hw-&gt;eeprom.ops, ii-&gt;eeprom_ops, sizeof(hw-&gt;eeprom.ops));</div><div class='add'>+	eec = IXGBE_READ_REG(hw, IXGBE_EEC);</div><div class='add'>+	/* If EEPROM is valid (bit 8 = 1), use default otherwise use bit bang */</div><div class='add'>+	if (!(eec &amp; (1 &lt;&lt; 8)))</div><div class='add'>+		hw-&gt;eeprom.ops.read = &amp;ixgbe_read_eeprom_bit_bang_generic;</div><div class='add'>+</div><div class='add'>+	/* PHY */</div><div class='add'>+	memcpy(&amp;hw-&gt;phy.ops, ii-&gt;phy_ops, sizeof(hw-&gt;phy.ops));</div><div class='add'>+	/* phy-&gt;sfp_type = ixgbe_sfp_type_unknown; */</div><div class='add'>+</div><div class='ctx'> 	err = ii-&gt;get_invariants(hw);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err_hw_init;</div><div class='hunk'>@@ -3555,26 +3820,34 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err_sw_init;</div><div class='ctx'> </div><div class='add'>+	/* reset_hw fills in the perm_addr as well */</div><div class='add'>+	err = hw-&gt;mac.ops.reset_hw(hw);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(&amp;adapter-&gt;pdev-&gt;dev, "HW Init failed: %d\n", err);</div><div class='add'>+		goto err_sw_init;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	netdev-&gt;features = NETIF_F_SG |</div><div class='del'>-			   NETIF_F_HW_CSUM |</div><div class='del'>-			   NETIF_F_HW_VLAN_TX |</div><div class='del'>-			   NETIF_F_HW_VLAN_RX |</div><div class='del'>-			   NETIF_F_HW_VLAN_FILTER;</div><div class='add'>+	                   NETIF_F_IP_CSUM |</div><div class='add'>+	                   NETIF_F_HW_VLAN_TX |</div><div class='add'>+	                   NETIF_F_HW_VLAN_RX |</div><div class='add'>+	                   NETIF_F_HW_VLAN_FILTER;</div><div class='ctx'> </div><div class='del'>-	netdev-&gt;features |= NETIF_F_LRO;</div><div class='add'>+	netdev-&gt;features |= NETIF_F_IPV6_CSUM;</div><div class='ctx'> 	netdev-&gt;features |= NETIF_F_TSO;</div><div class='ctx'> 	netdev-&gt;features |= NETIF_F_TSO6;</div><div class='add'>+	netdev-&gt;features |= NETIF_F_LRO;</div><div class='ctx'> </div><div class='ctx'> 	netdev-&gt;vlan_features |= NETIF_F_TSO;</div><div class='ctx'> 	netdev-&gt;vlan_features |= NETIF_F_TSO6;</div><div class='del'>-	netdev-&gt;vlan_features |= NETIF_F_HW_CSUM;</div><div class='add'>+	netdev-&gt;vlan_features |= NETIF_F_IP_CSUM;</div><div class='ctx'> 	netdev-&gt;vlan_features |= NETIF_F_SG;</div><div class='ctx'> </div><div class='ctx'> 	if (pci_using_dac)</div><div class='ctx'> 		netdev-&gt;features |= NETIF_F_HIGHDMA;</div><div class='ctx'> </div><div class='ctx'> 	/* make sure the EEPROM is good */</div><div class='del'>-	if (ixgbe_validate_eeprom_checksum(hw, NULL) &lt; 0) {</div><div class='add'>+	if (hw-&gt;eeprom.ops.validate_checksum(hw, NULL) &lt; 0) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "The EEPROM Checksum Is Not Valid\n");</div><div class='ctx'> 		err = -EIO;</div><div class='ctx'> 		goto err_eeprom;</div><div class='hunk'>@@ -3583,7 +3856,8 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,</div><div class='ctx'> 	memcpy(netdev-&gt;dev_addr, hw-&gt;mac.perm_addr, netdev-&gt;addr_len);</div><div class='ctx'> 	memcpy(netdev-&gt;perm_addr, hw-&gt;mac.perm_addr, netdev-&gt;addr_len);</div><div class='ctx'> </div><div class='del'>-	if (ixgbe_validate_mac_addr(netdev-&gt;dev_addr)) {</div><div class='add'>+	if (ixgbe_validate_mac_addr(netdev-&gt;perm_addr)) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "invalid MAC address\n");</div><div class='ctx'> 		err = -EIO;</div><div class='ctx'> 		goto err_eeprom;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3593,13 +3867,7 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,</div><div class='ctx'> 	adapter-&gt;watchdog_timer.data = (unsigned long)adapter;</div><div class='ctx'> </div><div class='ctx'> 	INIT_WORK(&amp;adapter-&gt;reset_task, ixgbe_reset_task);</div><div class='del'>-</div><div class='del'>-	/* initialize default flow control settings */</div><div class='del'>-	hw-&gt;fc.original_type = ixgbe_fc_full;</div><div class='del'>-	hw-&gt;fc.type = ixgbe_fc_full;</div><div class='del'>-	hw-&gt;fc.high_water = IXGBE_DEFAULT_FCRTH;</div><div class='del'>-	hw-&gt;fc.low_water = IXGBE_DEFAULT_FCRTL;</div><div class='del'>-	hw-&gt;fc.pause_time = IXGBE_DEFAULT_FCPAUSE;</div><div class='add'>+	INIT_WORK(&amp;adapter-&gt;watchdog_task, ixgbe_watchdog_task);</div><div class='ctx'> </div><div class='ctx'> 	err = ixgbe_init_interrupt_scheme(adapter);</div><div class='ctx'> 	if (err)</div><div class='hunk'>@@ -3610,32 +3878,39 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,</div><div class='ctx'> 	link_speed = link_status &amp; IXGBE_PCI_LINK_SPEED;</div><div class='ctx'> 	link_width = link_status &amp; IXGBE_PCI_LINK_WIDTH;</div><div class='ctx'> 	dev_info(&amp;pdev-&gt;dev, "(PCI Express:%s:%s) "</div><div class='del'>-		 "%02x:%02x:%02x:%02x:%02x:%02x\n",</div><div class='del'>-		((link_speed == IXGBE_PCI_LINK_SPEED_5000) ? "5.0Gb/s" :</div><div class='del'>-		 (link_speed == IXGBE_PCI_LINK_SPEED_2500) ? "2.5Gb/s" :</div><div class='del'>-		 "Unknown"),</div><div class='del'>-		((link_width == IXGBE_PCI_LINK_WIDTH_8) ? "Width x8" :</div><div class='del'>-		 (link_width == IXGBE_PCI_LINK_WIDTH_4) ? "Width x4" :</div><div class='del'>-		 (link_width == IXGBE_PCI_LINK_WIDTH_2) ? "Width x2" :</div><div class='del'>-		 (link_width == IXGBE_PCI_LINK_WIDTH_1) ? "Width x1" :</div><div class='del'>-		 "Unknown"),</div><div class='del'>-		netdev-&gt;dev_addr[0], netdev-&gt;dev_addr[1], netdev-&gt;dev_addr[2],</div><div class='del'>-		netdev-&gt;dev_addr[3], netdev-&gt;dev_addr[4], netdev-&gt;dev_addr[5]);</div><div class='del'>-	ixgbe_read_part_num(hw, &amp;part_num);</div><div class='add'>+	         "%02x:%02x:%02x:%02x:%02x:%02x\n",</div><div class='add'>+	        ((link_speed == IXGBE_PCI_LINK_SPEED_5000) ? "5.0Gb/s" :</div><div class='add'>+	         (link_speed == IXGBE_PCI_LINK_SPEED_2500) ? "2.5Gb/s" :</div><div class='add'>+	         "Unknown"),</div><div class='add'>+	        ((link_width == IXGBE_PCI_LINK_WIDTH_8) ? "Width x8" :</div><div class='add'>+	         (link_width == IXGBE_PCI_LINK_WIDTH_4) ? "Width x4" :</div><div class='add'>+	         (link_width == IXGBE_PCI_LINK_WIDTH_2) ? "Width x2" :</div><div class='add'>+	         (link_width == IXGBE_PCI_LINK_WIDTH_1) ? "Width x1" :</div><div class='add'>+	         "Unknown"),</div><div class='add'>+	        netdev-&gt;dev_addr[0], netdev-&gt;dev_addr[1], netdev-&gt;dev_addr[2],</div><div class='add'>+	        netdev-&gt;dev_addr[3], netdev-&gt;dev_addr[4], netdev-&gt;dev_addr[5]);</div><div class='add'>+	ixgbe_read_pba_num_generic(hw, &amp;part_num);</div><div class='ctx'> 	dev_info(&amp;pdev-&gt;dev, "MAC: %d, PHY: %d, PBA No: %06x-%03x\n",</div><div class='del'>-		 hw-&gt;mac.type, hw-&gt;phy.type,</div><div class='del'>-		 (part_num &gt;&gt; 8), (part_num &amp; 0xff));</div><div class='add'>+	         hw-&gt;mac.type, hw-&gt;phy.type,</div><div class='add'>+	         (part_num &gt;&gt; 8), (part_num &amp; 0xff));</div><div class='ctx'> </div><div class='ctx'> 	if (link_width &lt;= IXGBE_PCI_LINK_WIDTH_4) {</div><div class='ctx'> 		dev_warn(&amp;pdev-&gt;dev, "PCI-Express bandwidth available for "</div><div class='del'>-			 "this card is not sufficient for optimal "</div><div class='del'>-			 "performance.\n");</div><div class='add'>+		         "this card is not sufficient for optimal "</div><div class='add'>+		         "performance.\n");</div><div class='ctx'> 		dev_warn(&amp;pdev-&gt;dev, "For optimal performance a x8 "</div><div class='del'>-			 "PCI-Express slot is required.\n");</div><div class='add'>+		         "PCI-Express slot is required.\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* reset the hardware with the new settings */</div><div class='del'>-	ixgbe_start_hw(hw);</div><div class='add'>+	hw-&gt;mac.ops.start_hw(hw);</div><div class='add'>+</div><div class='add'>+	/* link_config depends on start_hw being called at least once */</div><div class='add'>+	err = ixgbe_link_config(hw);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "setup_link_speed FAILED %d\n", err);</div><div class='add'>+		goto err_register;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	netif_carrier_off(netdev);</div><div class='ctx'> 	netif_tx_stop_all_queues(netdev);</div><div class='hunk'>@@ -3647,7 +3922,7 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err_register;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_DCA</div><div class='add'>+#ifdef CONFIG_IXGBE_DCA</div><div class='ctx'> 	if (dca_add_requester(&amp;pdev-&gt;dev) == 0) {</div><div class='ctx'> 		adapter-&gt;flags |= IXGBE_FLAG_DCA_ENABLED;</div><div class='ctx'> 		/* always use CB2 mode, difference is masked</div><div class='hunk'>@@ -3697,7 +3972,7 @@ static void __devexit ixgbe_remove(struct pci_dev *pdev)</div><div class='ctx'> </div><div class='ctx'> 	flush_scheduled_work();</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_DCA</div><div class='add'>+#ifdef CONFIG_IXGBE_DCA</div><div class='ctx'> 	if (adapter-&gt;flags &amp; IXGBE_FLAG_DCA_ENABLED) {</div><div class='ctx'> 		adapter-&gt;flags &amp;= ~IXGBE_FLAG_DCA_ENABLED;</div><div class='ctx'> 		dca_remove_requester(&amp;pdev-&gt;dev);</div><div class='hunk'>@@ -3715,6 +3990,7 @@ static void __devexit ixgbe_remove(struct pci_dev *pdev)</div><div class='ctx'> 	pci_release_regions(pdev);</div><div class='ctx'> </div><div class='ctx'> 	DPRINTK(PROBE, INFO, "complete\n");</div><div class='add'>+	ixgbe_napi_del_all(adapter);</div><div class='ctx'> 	kfree(adapter-&gt;tx_ring);</div><div class='ctx'> 	kfree(adapter-&gt;rx_ring);</div><div class='ctx'> </div><div class='hunk'>@@ -3732,7 +4008,7 @@ static void __devexit ixgbe_remove(struct pci_dev *pdev)</div><div class='ctx'>  * this device has been detected.</div><div class='ctx'>  */</div><div class='ctx'> static pci_ers_result_t ixgbe_io_error_detected(struct pci_dev *pdev,</div><div class='del'>-						pci_channel_state_t state)</div><div class='add'>+                                                pci_channel_state_t state)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *netdev = pci_get_drvdata(pdev);</div><div class='ctx'> 	struct ixgbe_adapter *adapter = netdev-&gt;priv;</div><div class='hunk'>@@ -3743,7 +4019,7 @@ static pci_ers_result_t ixgbe_io_error_detected(struct pci_dev *pdev,</div><div class='ctx'> 		ixgbe_down(adapter);</div><div class='ctx'> 	pci_disable_device(pdev);</div><div class='ctx'> </div><div class='del'>-	/* Request a slot slot reset. */</div><div class='add'>+	/* Request a slot reset. */</div><div class='ctx'> 	return PCI_ERS_RESULT_NEED_RESET;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3760,7 +4036,7 @@ static pci_ers_result_t ixgbe_io_slot_reset(struct pci_dev *pdev)</div><div class='ctx'> </div><div class='ctx'> 	if (pci_enable_device(pdev)) {</div><div class='ctx'> 		DPRINTK(PROBE, ERR,</div><div class='del'>-			"Cannot re-enable PCI device after reset.\n");</div><div class='add'>+		        "Cannot re-enable PCI device after reset.\n");</div><div class='ctx'> 		return PCI_ERS_RESULT_DISCONNECT;</div><div class='ctx'> 	}</div><div class='ctx'> 	pci_set_master(pdev);</div><div class='hunk'>@@ -3794,7 +4070,6 @@ static void ixgbe_io_resume(struct pci_dev *pdev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	netif_device_attach(netdev);</div><div class='del'>-</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct pci_error_handlers ixgbe_err_handler = {</div><div class='hunk'>@@ -3830,13 +4105,14 @@ static int __init ixgbe_init_module(void)</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_INFO "%s: %s\n", ixgbe_driver_name, ixgbe_copyright);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_DCA</div><div class='add'>+#ifdef CONFIG_IXGBE_DCA</div><div class='ctx'> 	dca_register_notify(&amp;dca_notifier);</div><div class='del'>-</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> 	ret = pci_register_driver(&amp;ixgbe_driver);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='add'>+</div><div class='ctx'> module_init(ixgbe_init_module);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -3847,24 +4123,24 @@ module_init(ixgbe_init_module);</div><div class='ctx'>  **/</div><div class='ctx'> static void __exit ixgbe_exit_module(void)</div><div class='ctx'> {</div><div class='del'>-#ifdef CONFIG_DCA</div><div class='add'>+#ifdef CONFIG_IXGBE_DCA</div><div class='ctx'> 	dca_unregister_notify(&amp;dca_notifier);</div><div class='ctx'> #endif</div><div class='ctx'> 	pci_unregister_driver(&amp;ixgbe_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_DCA</div><div class='add'>+#ifdef CONFIG_IXGBE_DCA</div><div class='ctx'> static int ixgbe_notify_dca(struct notifier_block *nb, unsigned long event,</div><div class='del'>-			    void *p)</div><div class='add'>+                            void *p)</div><div class='ctx'> {</div><div class='ctx'> 	int ret_val;</div><div class='ctx'> </div><div class='ctx'> 	ret_val = driver_for_each_device(&amp;ixgbe_driver.driver, NULL, &amp;event,</div><div class='del'>-					 __ixgbe_notify_dca);</div><div class='add'>+	                                 __ixgbe_notify_dca);</div><div class='ctx'> </div><div class='ctx'> 	return ret_val ? NOTIFY_BAD : NOTIFY_DONE;</div><div class='ctx'> }</div><div class='del'>-#endif /* CONFIG_DCA */</div><div class='add'>+#endif /* CONFIG_IXGBE_DCA */</div><div class='ctx'> </div><div class='ctx'> module_exit(ixgbe_exit_module);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ixgbe/ixgbe_phy.c b/drivers/net/ixgbe/ixgbe_phy.c<br/>index 8002931ae823..764035a8c9a1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/ixgbe/ixgbe_phy.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/ixgbe/ixgbe_phy.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/ixgbe/ixgbe_phy.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/ixgbe/ixgbe_phy.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*******************************************************************************</div><div class='ctx'> </div><div class='ctx'>   Intel 10 Gigabit PCI Express Linux driver</div><div class='del'>-  Copyright(c) 1999 - 2007 Intel Corporation.</div><div class='add'>+  Copyright(c) 1999 - 2008 Intel Corporation.</div><div class='ctx'> </div><div class='ctx'>   This program is free software; you can redistribute it and/or modify it</div><div class='ctx'>   under the terms and conditions of the GNU General Public License,</div><div class='hunk'>@@ -20,7 +20,6 @@</div><div class='ctx'>   the file called "COPYING".</div><div class='ctx'> </div><div class='ctx'>   Contact Information:</div><div class='del'>-  Linux NICS &lt;linux.nics@intel.com&gt;</div><div class='ctx'>   e1000-devel Mailing List &lt;e1000-devel@lists.sourceforge.net&gt;</div><div class='ctx'>   Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='ctx'> </div><div class='hunk'>@@ -33,32 +32,36 @@</div><div class='ctx'> #include "ixgbe_common.h"</div><div class='ctx'> #include "ixgbe_phy.h"</div><div class='ctx'> </div><div class='add'>+static bool ixgbe_validate_phy_addr(struct ixgbe_hw *hw, u32 phy_addr);</div><div class='ctx'> static enum ixgbe_phy_type ixgbe_get_phy_type_from_id(u32 phy_id);</div><div class='ctx'> static s32 ixgbe_get_phy_id(struct ixgbe_hw *hw);</div><div class='del'>-static bool ixgbe_validate_phy_addr(struct ixgbe_hw *hw, u32 phy_addr);</div><div class='del'>-static s32 ixgbe_write_phy_reg(struct ixgbe_hw *hw, u32 reg_addr,</div><div class='del'>-			       u32 device_type, u16 phy_data);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *  ixgbe_identify_phy - Get physical layer module</div><div class='add'>+ *  ixgbe_identify_phy_generic - Get physical layer module</div><div class='ctx'>  *  @hw: pointer to hardware structure</div><div class='ctx'>  *</div><div class='ctx'>  *  Determines the physical layer module found on the current adapter.</div><div class='ctx'>  **/</div><div class='del'>-s32 ixgbe_identify_phy(struct ixgbe_hw *hw)</div><div class='add'>+s32 ixgbe_identify_phy_generic(struct ixgbe_hw *hw)</div><div class='ctx'> {</div><div class='ctx'> 	s32 status = IXGBE_ERR_PHY_ADDR_INVALID;</div><div class='ctx'> 	u32 phy_addr;</div><div class='ctx'> </div><div class='del'>-	for (phy_addr = 0; phy_addr &lt; IXGBE_MAX_PHY_ADDR; phy_addr++) {</div><div class='del'>-		if (ixgbe_validate_phy_addr(hw, phy_addr)) {</div><div class='del'>-			hw-&gt;phy.addr = phy_addr;</div><div class='del'>-			ixgbe_get_phy_id(hw);</div><div class='del'>-			hw-&gt;phy.type = ixgbe_get_phy_type_from_id(hw-&gt;phy.id);</div><div class='del'>-			status = 0;</div><div class='del'>-			break;</div><div class='add'>+	if (hw-&gt;phy.type == ixgbe_phy_unknown) {</div><div class='add'>+		for (phy_addr = 0; phy_addr &lt; IXGBE_MAX_PHY_ADDR; phy_addr++) {</div><div class='add'>+			if (ixgbe_validate_phy_addr(hw, phy_addr)) {</div><div class='add'>+				hw-&gt;phy.addr = phy_addr;</div><div class='add'>+				ixgbe_get_phy_id(hw);</div><div class='add'>+				hw-&gt;phy.type =</div><div class='add'>+				        ixgbe_get_phy_type_from_id(hw-&gt;phy.id);</div><div class='add'>+				status = 0;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='add'>+	} else {</div><div class='add'>+		status = 0;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -73,10 +76,8 @@ static bool ixgbe_validate_phy_addr(struct ixgbe_hw *hw, u32 phy_addr)</div><div class='ctx'> 	bool valid = false;</div><div class='ctx'> </div><div class='ctx'> 	hw-&gt;phy.addr = phy_addr;</div><div class='del'>-	ixgbe_read_phy_reg(hw,</div><div class='del'>-			   IXGBE_MDIO_PHY_ID_HIGH,</div><div class='del'>-			   IXGBE_MDIO_PMA_PMD_DEV_TYPE,</div><div class='del'>-			   &amp;phy_id);</div><div class='add'>+	hw-&gt;phy.ops.read_reg(hw, IXGBE_MDIO_PHY_ID_HIGH,</div><div class='add'>+	                     IXGBE_MDIO_PMA_PMD_DEV_TYPE, &amp;phy_id);</div><div class='ctx'> </div><div class='ctx'> 	if (phy_id != 0xFFFF &amp;&amp; phy_id != 0x0)</div><div class='ctx'> 		valid = true;</div><div class='hunk'>@@ -95,21 +96,18 @@ static s32 ixgbe_get_phy_id(struct ixgbe_hw *hw)</div><div class='ctx'> 	u16 phy_id_high = 0;</div><div class='ctx'> 	u16 phy_id_low = 0;</div><div class='ctx'> </div><div class='del'>-	status = ixgbe_read_phy_reg(hw,</div><div class='del'>-				   IXGBE_MDIO_PHY_ID_HIGH,</div><div class='del'>-				   IXGBE_MDIO_PMA_PMD_DEV_TYPE,</div><div class='del'>-				   &amp;phy_id_high);</div><div class='add'>+	status = hw-&gt;phy.ops.read_reg(hw, IXGBE_MDIO_PHY_ID_HIGH,</div><div class='add'>+	                              IXGBE_MDIO_PMA_PMD_DEV_TYPE,</div><div class='add'>+	                              &amp;phy_id_high);</div><div class='ctx'> </div><div class='ctx'> 	if (status == 0) {</div><div class='ctx'> 		hw-&gt;phy.id = (u32)(phy_id_high &lt;&lt; 16);</div><div class='del'>-		status = ixgbe_read_phy_reg(hw,</div><div class='del'>-					   IXGBE_MDIO_PHY_ID_LOW,</div><div class='del'>-					   IXGBE_MDIO_PMA_PMD_DEV_TYPE,</div><div class='del'>-					   &amp;phy_id_low);</div><div class='add'>+		status = hw-&gt;phy.ops.read_reg(hw, IXGBE_MDIO_PHY_ID_LOW,</div><div class='add'>+		                              IXGBE_MDIO_PMA_PMD_DEV_TYPE,</div><div class='add'>+		                              &amp;phy_id_low);</div><div class='ctx'> 		hw-&gt;phy.id |= (u32)(phy_id_low &amp; IXGBE_PHY_REVISION_MASK);</div><div class='ctx'> 		hw-&gt;phy.revision = (u32)(phy_id_low &amp; ~IXGBE_PHY_REVISION_MASK);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -123,9 +121,6 @@ static enum ixgbe_phy_type ixgbe_get_phy_type_from_id(u32 phy_id)</div><div class='ctx'> 	enum ixgbe_phy_type phy_type;</div><div class='ctx'> </div><div class='ctx'> 	switch (phy_id) {</div><div class='del'>-	case TN1010_PHY_ID:</div><div class='del'>-		phy_type = ixgbe_phy_tn;</div><div class='del'>-		break;</div><div class='ctx'> 	case QT2022_PHY_ID:</div><div class='ctx'> 		phy_type = ixgbe_phy_qt;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -138,32 +133,31 @@ static enum ixgbe_phy_type ixgbe_get_phy_type_from_id(u32 phy_id)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *  ixgbe_reset_phy - Performs a PHY reset</div><div class='add'>+ *  ixgbe_reset_phy_generic - Performs a PHY reset</div><div class='ctx'>  *  @hw: pointer to hardware structure</div><div class='ctx'>  **/</div><div class='del'>-s32 ixgbe_reset_phy(struct ixgbe_hw *hw)</div><div class='add'>+s32 ixgbe_reset_phy_generic(struct ixgbe_hw *hw)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Perform soft PHY reset to the PHY_XS.</div><div class='ctx'> 	 * This will cause a soft reset to the PHY</div><div class='ctx'> 	 */</div><div class='del'>-	return ixgbe_write_phy_reg(hw, IXGBE_MDIO_PHY_XS_CONTROL,</div><div class='del'>-				   IXGBE_MDIO_PHY_XS_DEV_TYPE,</div><div class='del'>-				   IXGBE_MDIO_PHY_XS_RESET);</div><div class='add'>+	return hw-&gt;phy.ops.write_reg(hw, IXGBE_MDIO_PHY_XS_CONTROL,</div><div class='add'>+	                             IXGBE_MDIO_PHY_XS_DEV_TYPE,</div><div class='add'>+	                             IXGBE_MDIO_PHY_XS_RESET);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *  ixgbe_read_phy_reg - Reads a value from a specified PHY register</div><div class='add'>+ *  ixgbe_read_phy_reg_generic - Reads a value from a specified PHY register</div><div class='ctx'>  *  @hw: pointer to hardware structure</div><div class='ctx'>  *  @reg_addr: 32 bit address of PHY register to read</div><div class='ctx'>  *  @phy_data: Pointer to read data from PHY register</div><div class='ctx'>  **/</div><div class='del'>-s32 ixgbe_read_phy_reg(struct ixgbe_hw *hw, u32 reg_addr,</div><div class='del'>-		       u32 device_type, u16 *phy_data)</div><div class='add'>+s32 ixgbe_read_phy_reg_generic(struct ixgbe_hw *hw, u32 reg_addr,</div><div class='add'>+                               u32 device_type, u16 *phy_data)</div><div class='ctx'> {</div><div class='ctx'> 	u32 command;</div><div class='ctx'> 	u32 i;</div><div class='del'>-	u32 timeout = 10;</div><div class='ctx'> 	u32 data;</div><div class='ctx'> 	s32 status = 0;</div><div class='ctx'> 	u16 gssr;</div><div class='hunk'>@@ -179,9 +173,9 @@ s32 ixgbe_read_phy_reg(struct ixgbe_hw *hw, u32 reg_addr,</div><div class='ctx'> 	if (status == 0) {</div><div class='ctx'> 		/* Setup and write the address cycle command */</div><div class='ctx'> 		command = ((reg_addr &lt;&lt; IXGBE_MSCA_NP_ADDR_SHIFT)  |</div><div class='del'>-			   (device_type &lt;&lt; IXGBE_MSCA_DEV_TYPE_SHIFT) |</div><div class='del'>-			   (hw-&gt;phy.addr &lt;&lt; IXGBE_MSCA_PHY_ADDR_SHIFT) |</div><div class='del'>-			   (IXGBE_MSCA_ADDR_CYCLE | IXGBE_MSCA_MDI_COMMAND));</div><div class='add'>+		           (device_type &lt;&lt; IXGBE_MSCA_DEV_TYPE_SHIFT) |</div><div class='add'>+		           (hw-&gt;phy.addr &lt;&lt; IXGBE_MSCA_PHY_ADDR_SHIFT) |</div><div class='add'>+		           (IXGBE_MSCA_ADDR_CYCLE | IXGBE_MSCA_MDI_COMMAND));</div><div class='ctx'> </div><div class='ctx'> 		IXGBE_WRITE_REG(hw, IXGBE_MSCA, command);</div><div class='ctx'> </div><div class='hunk'>@@ -190,7 +184,7 @@ s32 ixgbe_read_phy_reg(struct ixgbe_hw *hw, u32 reg_addr,</div><div class='ctx'> 		 * The MDI Command bit will clear when the operation is</div><div class='ctx'> 		 * complete</div><div class='ctx'> 		 */</div><div class='del'>-		for (i = 0; i &lt; timeout; i++) {</div><div class='add'>+		for (i = 0; i &lt; IXGBE_MDIO_COMMAND_TIMEOUT; i++) {</div><div class='ctx'> 			udelay(10);</div><div class='ctx'> </div><div class='ctx'> 			command = IXGBE_READ_REG(hw, IXGBE_MSCA);</div><div class='hunk'>@@ -210,9 +204,9 @@ s32 ixgbe_read_phy_reg(struct ixgbe_hw *hw, u32 reg_addr,</div><div class='ctx'> 			 * command</div><div class='ctx'> 			 */</div><div class='ctx'> 			command = ((reg_addr &lt;&lt; IXGBE_MSCA_NP_ADDR_SHIFT)  |</div><div class='del'>-				   (device_type &lt;&lt; IXGBE_MSCA_DEV_TYPE_SHIFT) |</div><div class='del'>-				   (hw-&gt;phy.addr &lt;&lt; IXGBE_MSCA_PHY_ADDR_SHIFT) |</div><div class='del'>-				   (IXGBE_MSCA_READ | IXGBE_MSCA_MDI_COMMAND));</div><div class='add'>+			           (device_type &lt;&lt; IXGBE_MSCA_DEV_TYPE_SHIFT) |</div><div class='add'>+			           (hw-&gt;phy.addr &lt;&lt; IXGBE_MSCA_PHY_ADDR_SHIFT) |</div><div class='add'>+			           (IXGBE_MSCA_READ | IXGBE_MSCA_MDI_COMMAND));</div><div class='ctx'> </div><div class='ctx'> 			IXGBE_WRITE_REG(hw, IXGBE_MSCA, command);</div><div class='ctx'> </div><div class='hunk'>@@ -221,7 +215,7 @@ s32 ixgbe_read_phy_reg(struct ixgbe_hw *hw, u32 reg_addr,</div><div class='ctx'> 			 * completed. The MDI Command bit will clear when the</div><div class='ctx'> 			 * operation is complete</div><div class='ctx'> 			 */</div><div class='del'>-			for (i = 0; i &lt; timeout; i++) {</div><div class='add'>+			for (i = 0; i &lt; IXGBE_MDIO_COMMAND_TIMEOUT; i++) {</div><div class='ctx'> 				udelay(10);</div><div class='ctx'> </div><div class='ctx'> 				command = IXGBE_READ_REG(hw, IXGBE_MSCA);</div><div class='hunk'>@@ -231,8 +225,7 @@ s32 ixgbe_read_phy_reg(struct ixgbe_hw *hw, u32 reg_addr,</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			if ((command &amp; IXGBE_MSCA_MDI_COMMAND) != 0) {</div><div class='del'>-				hw_dbg(hw,</div><div class='del'>-				       "PHY read command didn't complete\n");</div><div class='add'>+				hw_dbg(hw, "PHY read command didn't complete\n");</div><div class='ctx'> 				status = IXGBE_ERR_PHY;</div><div class='ctx'> 			} else {</div><div class='ctx'> 				/*</div><div class='hunk'>@@ -247,22 +240,22 @@ s32 ixgbe_read_phy_reg(struct ixgbe_hw *hw, u32 reg_addr,</div><div class='ctx'> </div><div class='ctx'> 		ixgbe_release_swfw_sync(hw, gssr);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *  ixgbe_write_phy_reg - Writes a value to specified PHY register</div><div class='add'>+ *  ixgbe_write_phy_reg_generic - Writes a value to specified PHY register</div><div class='ctx'>  *  @hw: pointer to hardware structure</div><div class='ctx'>  *  @reg_addr: 32 bit PHY register to write</div><div class='ctx'>  *  @device_type: 5 bit device type</div><div class='ctx'>  *  @phy_data: Data to write to the PHY register</div><div class='ctx'>  **/</div><div class='del'>-static s32 ixgbe_write_phy_reg(struct ixgbe_hw *hw, u32 reg_addr,</div><div class='del'>-			       u32 device_type, u16 phy_data)</div><div class='add'>+s32 ixgbe_write_phy_reg_generic(struct ixgbe_hw *hw, u32 reg_addr,</div><div class='add'>+                                u32 device_type, u16 phy_data)</div><div class='ctx'> {</div><div class='ctx'> 	u32 command;</div><div class='ctx'> 	u32 i;</div><div class='del'>-	u32 timeout = 10;</div><div class='ctx'> 	s32 status = 0;</div><div class='ctx'> 	u16 gssr;</div><div class='ctx'> </div><div class='hunk'>@@ -280,9 +273,9 @@ static s32 ixgbe_write_phy_reg(struct ixgbe_hw *hw, u32 reg_addr,</div><div class='ctx'> </div><div class='ctx'> 		/* Setup and write the address cycle command */</div><div class='ctx'> 		command = ((reg_addr &lt;&lt; IXGBE_MSCA_NP_ADDR_SHIFT)  |</div><div class='del'>-			   (device_type &lt;&lt; IXGBE_MSCA_DEV_TYPE_SHIFT) |</div><div class='del'>-			   (hw-&gt;phy.addr &lt;&lt; IXGBE_MSCA_PHY_ADDR_SHIFT) |</div><div class='del'>-			   (IXGBE_MSCA_ADDR_CYCLE | IXGBE_MSCA_MDI_COMMAND));</div><div class='add'>+		           (device_type &lt;&lt; IXGBE_MSCA_DEV_TYPE_SHIFT) |</div><div class='add'>+		           (hw-&gt;phy.addr &lt;&lt; IXGBE_MSCA_PHY_ADDR_SHIFT) |</div><div class='add'>+		           (IXGBE_MSCA_ADDR_CYCLE | IXGBE_MSCA_MDI_COMMAND));</div><div class='ctx'> </div><div class='ctx'> 		IXGBE_WRITE_REG(hw, IXGBE_MSCA, command);</div><div class='ctx'> </div><div class='hunk'>@@ -291,19 +284,19 @@ static s32 ixgbe_write_phy_reg(struct ixgbe_hw *hw, u32 reg_addr,</div><div class='ctx'> 		 * The MDI Command bit will clear when the operation is</div><div class='ctx'> 		 * complete</div><div class='ctx'> 		 */</div><div class='del'>-		for (i = 0; i &lt; timeout; i++) {</div><div class='add'>+		for (i = 0; i &lt; IXGBE_MDIO_COMMAND_TIMEOUT; i++) {</div><div class='ctx'> 			udelay(10);</div><div class='ctx'> </div><div class='ctx'> 			command = IXGBE_READ_REG(hw, IXGBE_MSCA);</div><div class='ctx'> </div><div class='del'>-			if ((command &amp; IXGBE_MSCA_MDI_COMMAND) == 0) {</div><div class='del'>-				hw_dbg(hw, "PHY address cmd didn't complete\n");</div><div class='add'>+			if ((command &amp; IXGBE_MSCA_MDI_COMMAND) == 0)</div><div class='ctx'> 				break;</div><div class='del'>-			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if ((command &amp; IXGBE_MSCA_MDI_COMMAND) != 0)</div><div class='add'>+		if ((command &amp; IXGBE_MSCA_MDI_COMMAND) != 0) {</div><div class='add'>+			hw_dbg(hw, "PHY address cmd didn't complete\n");</div><div class='ctx'> 			status = IXGBE_ERR_PHY;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		if (status == 0) {</div><div class='ctx'> 			/*</div><div class='hunk'>@@ -311,9 +304,9 @@ static s32 ixgbe_write_phy_reg(struct ixgbe_hw *hw, u32 reg_addr,</div><div class='ctx'> 			 * command</div><div class='ctx'> 			 */</div><div class='ctx'> 			command = ((reg_addr &lt;&lt; IXGBE_MSCA_NP_ADDR_SHIFT)  |</div><div class='del'>-				   (device_type &lt;&lt; IXGBE_MSCA_DEV_TYPE_SHIFT) |</div><div class='del'>-				   (hw-&gt;phy.addr &lt;&lt; IXGBE_MSCA_PHY_ADDR_SHIFT) |</div><div class='del'>-				   (IXGBE_MSCA_WRITE | IXGBE_MSCA_MDI_COMMAND));</div><div class='add'>+			           (device_type &lt;&lt; IXGBE_MSCA_DEV_TYPE_SHIFT) |</div><div class='add'>+			           (hw-&gt;phy.addr &lt;&lt; IXGBE_MSCA_PHY_ADDR_SHIFT) |</div><div class='add'>+			           (IXGBE_MSCA_WRITE | IXGBE_MSCA_MDI_COMMAND));</div><div class='ctx'> </div><div class='ctx'> 			IXGBE_WRITE_REG(hw, IXGBE_MSCA, command);</div><div class='ctx'> </div><div class='hunk'>@@ -322,20 +315,19 @@ static s32 ixgbe_write_phy_reg(struct ixgbe_hw *hw, u32 reg_addr,</div><div class='ctx'> 			 * completed. The MDI Command bit will clear when the</div><div class='ctx'> 			 * operation is complete</div><div class='ctx'> 			 */</div><div class='del'>-			for (i = 0; i &lt; timeout; i++) {</div><div class='add'>+			for (i = 0; i &lt; IXGBE_MDIO_COMMAND_TIMEOUT; i++) {</div><div class='ctx'> 				udelay(10);</div><div class='ctx'> </div><div class='ctx'> 				command = IXGBE_READ_REG(hw, IXGBE_MSCA);</div><div class='ctx'> </div><div class='del'>-				if ((command &amp; IXGBE_MSCA_MDI_COMMAND) == 0) {</div><div class='del'>-					hw_dbg(hw, "PHY write command did not "</div><div class='del'>-						  "complete.\n");</div><div class='add'>+				if ((command &amp; IXGBE_MSCA_MDI_COMMAND) == 0)</div><div class='ctx'> 					break;</div><div class='del'>-				}</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			if ((command &amp; IXGBE_MSCA_MDI_COMMAND) != 0)</div><div class='add'>+			if ((command &amp; IXGBE_MSCA_MDI_COMMAND) != 0) {</div><div class='add'>+				hw_dbg(hw, "PHY address cmd didn't complete\n");</div><div class='ctx'> 				status = IXGBE_ERR_PHY;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		ixgbe_release_swfw_sync(hw, gssr);</div><div class='hunk'>@@ -345,67 +337,54 @@ static s32 ixgbe_write_phy_reg(struct ixgbe_hw *hw, u32 reg_addr,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *  ixgbe_setup_tnx_phy_link - Set and restart autoneg</div><div class='add'>+ *  ixgbe_setup_phy_link_generic - Set and restart autoneg</div><div class='ctx'>  *  @hw: pointer to hardware structure</div><div class='ctx'>  *</div><div class='ctx'>  *  Restart autonegotiation and PHY and waits for completion.</div><div class='ctx'>  **/</div><div class='del'>-s32 ixgbe_setup_tnx_phy_link(struct ixgbe_hw *hw)</div><div class='add'>+s32 ixgbe_setup_phy_link_generic(struct ixgbe_hw *hw)</div><div class='ctx'> {</div><div class='ctx'> 	s32 status = IXGBE_NOT_IMPLEMENTED;</div><div class='ctx'> 	u32 time_out;</div><div class='ctx'> 	u32 max_time_out = 10;</div><div class='del'>-	u16 autoneg_speed_selection_register = 0x10;</div><div class='del'>-	u16 autoneg_restart_mask = 0x0200;</div><div class='del'>-	u16 autoneg_complete_mask = 0x0020;</div><div class='del'>-	u16 autoneg_reg = 0;</div><div class='add'>+	u16 autoneg_reg = IXGBE_MII_AUTONEG_REG;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Set advertisement settings in PHY based on autoneg_advertised</div><div class='ctx'> 	 * settings. If autoneg_advertised = 0, then advertise default values</div><div class='del'>-	 * txn devices cannot be "forced" to a autoneg 10G and fail.  But can</div><div class='add'>+	 * tnx devices cannot be "forced" to a autoneg 10G and fail.  But can</div><div class='ctx'> 	 * for a 1G.</div><div class='ctx'> 	 */</div><div class='del'>-	ixgbe_read_phy_reg(hw,</div><div class='del'>-		  autoneg_speed_selection_register,</div><div class='del'>-		  IXGBE_MDIO_AUTO_NEG_DEV_TYPE,</div><div class='del'>-		  &amp;autoneg_reg);</div><div class='add'>+	hw-&gt;phy.ops.read_reg(hw, IXGBE_MII_SPEED_SELECTION_REG,</div><div class='add'>+	                     IXGBE_MDIO_AUTO_NEG_DEV_TYPE, &amp;autoneg_reg);</div><div class='ctx'> </div><div class='ctx'> 	if (hw-&gt;phy.autoneg_advertised == IXGBE_LINK_SPEED_1GB_FULL)</div><div class='ctx'> 		autoneg_reg &amp;= 0xEFFF; /* 0 in bit 12 is 1G operation */</div><div class='ctx'> 	else</div><div class='ctx'> 		autoneg_reg |= 0x1000; /* 1 in bit 12 is 10G/1G operation */</div><div class='ctx'> </div><div class='del'>-	ixgbe_write_phy_reg(hw,</div><div class='del'>-		  autoneg_speed_selection_register,</div><div class='del'>-		  IXGBE_MDIO_AUTO_NEG_DEV_TYPE,</div><div class='del'>-		  autoneg_reg);</div><div class='del'>-</div><div class='add'>+	hw-&gt;phy.ops.write_reg(hw, IXGBE_MII_SPEED_SELECTION_REG,</div><div class='add'>+	                      IXGBE_MDIO_AUTO_NEG_DEV_TYPE, autoneg_reg);</div><div class='ctx'> </div><div class='ctx'> 	/* Restart PHY autonegotiation and wait for completion */</div><div class='del'>-	ixgbe_read_phy_reg(hw,</div><div class='del'>-		  IXGBE_MDIO_AUTO_NEG_CONTROL,</div><div class='del'>-		  IXGBE_MDIO_AUTO_NEG_DEV_TYPE,</div><div class='del'>-		  &amp;autoneg_reg);</div><div class='add'>+	hw-&gt;phy.ops.read_reg(hw, IXGBE_MDIO_AUTO_NEG_CONTROL,</div><div class='add'>+	                     IXGBE_MDIO_AUTO_NEG_DEV_TYPE, &amp;autoneg_reg);</div><div class='ctx'> </div><div class='del'>-	autoneg_reg |= autoneg_restart_mask;</div><div class='add'>+	autoneg_reg |= IXGBE_MII_RESTART;</div><div class='ctx'> </div><div class='del'>-	ixgbe_write_phy_reg(hw,</div><div class='del'>-		  IXGBE_MDIO_AUTO_NEG_CONTROL,</div><div class='del'>-		  IXGBE_MDIO_AUTO_NEG_DEV_TYPE,</div><div class='del'>-		  autoneg_reg);</div><div class='add'>+	hw-&gt;phy.ops.write_reg(hw, IXGBE_MDIO_AUTO_NEG_CONTROL,</div><div class='add'>+	                      IXGBE_MDIO_AUTO_NEG_DEV_TYPE, autoneg_reg);</div><div class='ctx'> </div><div class='ctx'> 	/* Wait for autonegotiation to finish */</div><div class='ctx'> 	for (time_out = 0; time_out &lt; max_time_out; time_out++) {</div><div class='ctx'> 		udelay(10);</div><div class='ctx'> 		/* Restart PHY autonegotiation and wait for completion */</div><div class='del'>-		status = ixgbe_read_phy_reg(hw,</div><div class='del'>-					    IXGBE_MDIO_AUTO_NEG_STATUS,</div><div class='del'>-					    IXGBE_MDIO_AUTO_NEG_DEV_TYPE,</div><div class='del'>-					    &amp;autoneg_reg);</div><div class='add'>+		status = hw-&gt;phy.ops.read_reg(hw, IXGBE_MDIO_AUTO_NEG_STATUS,</div><div class='add'>+		                              IXGBE_MDIO_AUTO_NEG_DEV_TYPE,</div><div class='add'>+		                              &amp;autoneg_reg);</div><div class='ctx'> </div><div class='del'>-		autoneg_reg &amp;= autoneg_complete_mask;</div><div class='del'>-		if (autoneg_reg == autoneg_complete_mask) {</div><div class='add'>+		autoneg_reg &amp;= IXGBE_MII_AUTONEG_COMPLETE;</div><div class='add'>+		if (autoneg_reg == IXGBE_MII_AUTONEG_COMPLETE) {</div><div class='ctx'> 			status = 0;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -418,64 +397,17 @@ s32 ixgbe_setup_tnx_phy_link(struct ixgbe_hw *hw)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *  ixgbe_check_tnx_phy_link - Determine link and speed status</div><div class='del'>- *  @hw: pointer to hardware structure</div><div class='del'>- *</div><div class='del'>- *  Reads the VS1 register to determine if link is up and the current speed for</div><div class='del'>- *  the PHY.</div><div class='del'>- **/</div><div class='del'>-s32 ixgbe_check_tnx_phy_link(struct ixgbe_hw *hw, u32 *speed,</div><div class='del'>-			     bool *link_up)</div><div class='del'>-{</div><div class='del'>-	s32 status = 0;</div><div class='del'>-	u32 time_out;</div><div class='del'>-	u32 max_time_out = 10;</div><div class='del'>-	u16 phy_link = 0;</div><div class='del'>-	u16 phy_speed = 0;</div><div class='del'>-	u16 phy_data = 0;</div><div class='del'>-</div><div class='del'>-	/* Initialize speed and link to default case */</div><div class='del'>-	*link_up = false;</div><div class='del'>-	*speed = IXGBE_LINK_SPEED_10GB_FULL;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Check current speed and link status of the PHY register.</div><div class='del'>-	 * This is a vendor specific register and may have to</div><div class='del'>-	 * be changed for other copper PHYs.</div><div class='del'>-	 */</div><div class='del'>-	for (time_out = 0; time_out &lt; max_time_out; time_out++) {</div><div class='del'>-		udelay(10);</div><div class='del'>-		if (phy_link == IXGBE_MDIO_VENDOR_SPECIFIC_1_LINK_STATUS) {</div><div class='del'>-			*link_up = true;</div><div class='del'>-			if (phy_speed ==</div><div class='del'>-			    IXGBE_MDIO_VENDOR_SPECIFIC_1_SPEED_STATUS)</div><div class='del'>-				*speed = IXGBE_LINK_SPEED_1GB_FULL;</div><div class='del'>-			break;</div><div class='del'>-		} else {</div><div class='del'>-			status = ixgbe_read_phy_reg(hw,</div><div class='del'>-				     IXGBE_MDIO_VENDOR_SPECIFIC_1_STATUS,</div><div class='del'>-				     IXGBE_MDIO_VENDOR_SPECIFIC_1_DEV_TYPE,</div><div class='del'>-				     &amp;phy_data);</div><div class='del'>-			phy_link = phy_data &amp;</div><div class='del'>-				IXGBE_MDIO_VENDOR_SPECIFIC_1_LINK_STATUS;</div><div class='del'>-			phy_speed = phy_data &amp;</div><div class='del'>-				IXGBE_MDIO_VENDOR_SPECIFIC_1_SPEED_STATUS;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return status;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *  ixgbe_setup_tnx_phy_link_speed - Sets the auto advertised capabilities</div><div class='add'>+ *  ixgbe_setup_phy_link_speed_generic - Sets the auto advertised capabilities</div><div class='ctx'>  *  @hw: pointer to hardware structure</div><div class='ctx'>  *  @speed: new link speed</div><div class='ctx'>  *  @autoneg: true if autonegotiation enabled</div><div class='ctx'>  **/</div><div class='del'>-s32 ixgbe_setup_tnx_phy_link_speed(struct ixgbe_hw *hw, u32 speed,</div><div class='del'>-				   bool autoneg,</div><div class='del'>-				   bool autoneg_wait_to_complete)</div><div class='add'>+s32 ixgbe_setup_phy_link_speed_generic(struct ixgbe_hw *hw,</div><div class='add'>+                                       ixgbe_link_speed speed,</div><div class='add'>+                                       bool autoneg,</div><div class='add'>+                                       bool autoneg_wait_to_complete)</div><div class='ctx'> {</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Clear autoneg_advertised and set new values based on input link</div><div class='ctx'> 	 * speed.</div><div class='hunk'>@@ -484,11 +416,13 @@ s32 ixgbe_setup_tnx_phy_link_speed(struct ixgbe_hw *hw, u32 speed,</div><div class='ctx'> </div><div class='ctx'> 	if (speed &amp; IXGBE_LINK_SPEED_10GB_FULL)</div><div class='ctx'> 		hw-&gt;phy.autoneg_advertised |= IXGBE_LINK_SPEED_10GB_FULL;</div><div class='add'>+</div><div class='ctx'> 	if (speed &amp; IXGBE_LINK_SPEED_1GB_FULL)</div><div class='ctx'> 		hw-&gt;phy.autoneg_advertised |= IXGBE_LINK_SPEED_1GB_FULL;</div><div class='ctx'> </div><div class='ctx'> 	/* Setup link based on the new speed settings */</div><div class='del'>-	ixgbe_setup_tnx_phy_link(hw);</div><div class='add'>+	hw-&gt;phy.ops.setup_link(hw);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+</div><div class='head'>diff --git a/drivers/net/ixgbe/ixgbe_phy.h b/drivers/net/ixgbe/ixgbe_phy.h<br/>index aa3ea72e678e..9bfe3f2b1d8f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/ixgbe/ixgbe_phy.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/ixgbe/ixgbe_phy.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/ixgbe/ixgbe_phy.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/ixgbe/ixgbe_phy.h</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*******************************************************************************</div><div class='ctx'> </div><div class='ctx'>   Intel 10 Gigabit PCI Express Linux driver</div><div class='del'>-  Copyright(c) 1999 - 2007 Intel Corporation.</div><div class='add'>+  Copyright(c) 1999 - 2008 Intel Corporation.</div><div class='ctx'> </div><div class='ctx'>   This program is free software; you can redistribute it and/or modify it</div><div class='ctx'>   under the terms and conditions of the GNU General Public License,</div><div class='hunk'>@@ -20,7 +20,6 @@</div><div class='ctx'>   the file called "COPYING".</div><div class='ctx'> </div><div class='ctx'>   Contact Information:</div><div class='del'>-  Linux NICS &lt;linux.nics@intel.com&gt;</div><div class='ctx'>   e1000-devel Mailing List &lt;e1000-devel@lists.sourceforge.net&gt;</div><div class='ctx'>   Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='ctx'> </div><div class='hunk'>@@ -30,20 +29,52 @@</div><div class='ctx'> #define _IXGBE_PHY_H_</div><div class='ctx'> </div><div class='ctx'> #include "ixgbe_type.h"</div><div class='add'>+#define IXGBE_I2C_EEPROM_DEV_ADDR    0xA0</div><div class='ctx'> </div><div class='del'>-s32 ixgbe_setup_phy_link(struct ixgbe_hw *hw);</div><div class='del'>-s32 ixgbe_check_phy_link(struct ixgbe_hw *hw, u32 *speed, bool *link_up);</div><div class='del'>-s32 ixgbe_setup_phy_link_speed(struct ixgbe_hw *hw, u32 speed, bool autoneg,</div><div class='del'>-			       bool autoneg_wait_to_complete);</div><div class='del'>-s32 ixgbe_identify_phy(struct ixgbe_hw *hw);</div><div class='del'>-s32 ixgbe_reset_phy(struct ixgbe_hw *hw);</div><div class='del'>-s32 ixgbe_read_phy_reg(struct ixgbe_hw *hw, u32 reg_addr,</div><div class='del'>-			       u32 device_type, u16 *phy_data);</div><div class='del'>-</div><div class='del'>-/* PHY specific */</div><div class='del'>-s32 ixgbe_setup_tnx_phy_link(struct ixgbe_hw *hw);</div><div class='del'>-s32 ixgbe_check_tnx_phy_link(struct ixgbe_hw *hw, u32 *speed, bool *link_up);</div><div class='del'>-s32 ixgbe_setup_tnx_phy_link_speed(struct ixgbe_hw *hw, u32 speed, bool autoneg,</div><div class='del'>-				  bool autoneg_wait_to_complete);</div><div class='add'>+/* EEPROM byte offsets */</div><div class='add'>+#define IXGBE_SFF_IDENTIFIER         0x0</div><div class='add'>+#define IXGBE_SFF_IDENTIFIER_SFP     0x3</div><div class='add'>+#define IXGBE_SFF_VENDOR_OUI_BYTE0   0x25</div><div class='add'>+#define IXGBE_SFF_VENDOR_OUI_BYTE1   0x26</div><div class='add'>+#define IXGBE_SFF_VENDOR_OUI_BYTE2   0x27</div><div class='add'>+#define IXGBE_SFF_1GBE_COMP_CODES    0x6</div><div class='add'>+#define IXGBE_SFF_10GBE_COMP_CODES   0x3</div><div class='add'>+#define IXGBE_SFF_TRANSMISSION_MEDIA 0x9</div><div class='add'>+</div><div class='add'>+/* Bitmasks */</div><div class='add'>+#define IXGBE_SFF_TWIN_AX_CAPABLE            0x80</div><div class='add'>+#define IXGBE_SFF_1GBASESX_CAPABLE           0x1</div><div class='add'>+#define IXGBE_SFF_10GBASESR_CAPABLE          0x10</div><div class='add'>+#define IXGBE_SFF_10GBASELR_CAPABLE          0x20</div><div class='add'>+#define IXGBE_I2C_EEPROM_READ_MASK           0x100</div><div class='add'>+#define IXGBE_I2C_EEPROM_STATUS_MASK         0x3</div><div class='add'>+#define IXGBE_I2C_EEPROM_STATUS_NO_OPERATION 0x0</div><div class='add'>+#define IXGBE_I2C_EEPROM_STATUS_PASS         0x1</div><div class='add'>+#define IXGBE_I2C_EEPROM_STATUS_FAIL         0x2</div><div class='add'>+#define IXGBE_I2C_EEPROM_STATUS_IN_PROGRESS  0x3</div><div class='add'>+</div><div class='add'>+/* Bit-shift macros */</div><div class='add'>+#define IXGBE_SFF_VENDOR_OUI_BYTE0_SHIFT    12</div><div class='add'>+#define IXGBE_SFF_VENDOR_OUI_BYTE1_SHIFT    8</div><div class='add'>+#define IXGBE_SFF_VENDOR_OUI_BYTE2_SHIFT    4</div><div class='add'>+</div><div class='add'>+/* Vendor OUIs: format of OUI is 0x[byte0][byte1][byte2][00] */</div><div class='add'>+#define IXGBE_SFF_VENDOR_OUI_TYCO     0x00407600</div><div class='add'>+#define IXGBE_SFF_VENDOR_OUI_FTL      0x00906500</div><div class='add'>+#define IXGBE_SFF_VENDOR_OUI_AVAGO    0x00176A00</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+s32 ixgbe_init_phy_ops_generic(struct ixgbe_hw *hw);</div><div class='add'>+s32 ixgbe_identify_phy_generic(struct ixgbe_hw *hw);</div><div class='add'>+s32 ixgbe_reset_phy_generic(struct ixgbe_hw *hw);</div><div class='add'>+s32 ixgbe_read_phy_reg_generic(struct ixgbe_hw *hw, u32 reg_addr,</div><div class='add'>+                               u32 device_type, u16 *phy_data);</div><div class='add'>+s32 ixgbe_write_phy_reg_generic(struct ixgbe_hw *hw, u32 reg_addr,</div><div class='add'>+                                u32 device_type, u16 phy_data);</div><div class='add'>+s32 ixgbe_setup_phy_link_generic(struct ixgbe_hw *hw);</div><div class='add'>+s32 ixgbe_setup_phy_link_speed_generic(struct ixgbe_hw *hw,</div><div class='add'>+                                       ixgbe_link_speed speed,</div><div class='add'>+                                       bool autoneg,</div><div class='add'>+                                       bool autoneg_wait_to_complete);</div><div class='ctx'> </div><div class='ctx'> #endif /* _IXGBE_PHY_H_ */</div><div class='head'>diff --git a/drivers/net/ixgbe/ixgbe_type.h b/drivers/net/ixgbe/ixgbe_type.h<br/>index c0282a223df3..c6f8fa1c4e59 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/ixgbe/ixgbe_type.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/ixgbe/ixgbe_type.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/ixgbe/ixgbe_type.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/ixgbe/ixgbe_type.h</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*******************************************************************************</div><div class='ctx'> </div><div class='ctx'>   Intel 10 Gigabit PCI Express Linux driver</div><div class='del'>-  Copyright(c) 1999 - 2007 Intel Corporation.</div><div class='add'>+  Copyright(c) 1999 - 2008 Intel Corporation.</div><div class='ctx'> </div><div class='ctx'>   This program is free software; you can redistribute it and/or modify it</div><div class='ctx'>   under the terms and conditions of the GNU General Public License,</div><div class='hunk'>@@ -20,7 +20,6 @@</div><div class='ctx'>   the file called "COPYING".</div><div class='ctx'> </div><div class='ctx'>   Contact Information:</div><div class='del'>-  Linux NICS &lt;linux.nics@intel.com&gt;</div><div class='ctx'>   e1000-devel Mailing List &lt;e1000-devel@lists.sourceforge.net&gt;</div><div class='ctx'>   Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='ctx'> </div><div class='hunk'>@@ -37,9 +36,9 @@</div><div class='ctx'> /* Device IDs */</div><div class='ctx'> #define IXGBE_DEV_ID_82598AF_DUAL_PORT   0x10C6</div><div class='ctx'> #define IXGBE_DEV_ID_82598AF_SINGLE_PORT 0x10C7</div><div class='del'>-#define IXGBE_DEV_ID_82598AT_DUAL_PORT   0x10C8</div><div class='ctx'> #define IXGBE_DEV_ID_82598EB_CX4         0x10DD</div><div class='ctx'> #define IXGBE_DEV_ID_82598_CX4_DUAL_PORT 0x10EC</div><div class='add'>+#define IXGBE_DEV_ID_82598EB_XF_LR       0x10F4</div><div class='ctx'> </div><div class='ctx'> /* General Registers */</div><div class='ctx'> #define IXGBE_CTRL      0x00000</div><div class='hunk'>@@ -70,11 +69,11 @@</div><div class='ctx'> #define IXGBE_EIMC      0x00888</div><div class='ctx'> #define IXGBE_EIAC      0x00810</div><div class='ctx'> #define IXGBE_EIAM      0x00890</div><div class='del'>-#define IXGBE_EITR(_i) (0x00820 + ((_i) * 4)) /* 0x820-0x86c */</div><div class='del'>-#define IXGBE_IVAR(_i) (0x00900 + ((_i) * 4)) /* 24 at 0x900-0x960 */</div><div class='add'>+#define IXGBE_EITR(_i)  (((_i) &lt;= 23) ? (0x00820 + ((_i) * 4)) : (0x012300 + ((_i) * 4)))</div><div class='add'>+#define IXGBE_IVAR(_i)  (0x00900 + ((_i) * 4)) /* 24 at 0x900-0x960 */</div><div class='ctx'> #define IXGBE_MSIXT     0x00000 /* MSI-X Table. 0x0000 - 0x01C */</div><div class='ctx'> #define IXGBE_MSIXPBA   0x02000 /* MSI-X Pending bit array */</div><div class='del'>-#define IXGBE_PBACL     0x11068</div><div class='add'>+#define IXGBE_PBACL(_i) (((_i) == 0) ? (0x11068) : (0x110C0 + ((_i) * 4)))</div><div class='ctx'> #define IXGBE_GPIE      0x00898</div><div class='ctx'> </div><div class='ctx'> /* Flow Control Registers */</div><div class='hunk'>@@ -86,20 +85,33 @@</div><div class='ctx'> #define IXGBE_TFCS      0x0CE00</div><div class='ctx'> </div><div class='ctx'> /* Receive DMA Registers */</div><div class='del'>-#define IXGBE_RDBAL(_i) (0x01000 + ((_i) * 0x40)) /* 64 of each (0-63)*/</div><div class='del'>-#define IXGBE_RDBAH(_i) (0x01004 + ((_i) * 0x40))</div><div class='del'>-#define IXGBE_RDLEN(_i) (0x01008 + ((_i) * 0x40))</div><div class='del'>-#define IXGBE_RDH(_i)   (0x01010 + ((_i) * 0x40))</div><div class='del'>-#define IXGBE_RDT(_i)   (0x01018 + ((_i) * 0x40))</div><div class='del'>-#define IXGBE_RXDCTL(_i) (0x01028 + ((_i) * 0x40))</div><div class='del'>-#define IXGBE_RSCCTL(_i) (0x0102C + ((_i) * 0x40))</div><div class='del'>-#define IXGBE_SRRCTL(_i) (0x02100 + ((_i) * 4))</div><div class='del'>-					     /* array of 16 (0x02100-0x0213C) */</div><div class='del'>-#define IXGBE_DCA_RXCTRL(_i)    (0x02200 + ((_i) * 4))</div><div class='del'>-					     /* array of 16 (0x02200-0x0223C) */</div><div class='del'>-#define IXGBE_RDRXCTL    0x02F00</div><div class='add'>+#define IXGBE_RDBAL(_i) (((_i) &lt; 64) ? (0x01000 + ((_i) * 0x40)) : (0x0D000 + ((_i - 64) * 0x40)))</div><div class='add'>+#define IXGBE_RDBAH(_i) (((_i) &lt; 64) ? (0x01004 + ((_i) * 0x40)) : (0x0D004 + ((_i - 64) * 0x40)))</div><div class='add'>+#define IXGBE_RDLEN(_i) (((_i) &lt; 64) ? (0x01008 + ((_i) * 0x40)) : (0x0D008 + ((_i - 64) * 0x40)))</div><div class='add'>+#define IXGBE_RDH(_i)   (((_i) &lt; 64) ? (0x01010 + ((_i) * 0x40)) : (0x0D010 + ((_i - 64) * 0x40)))</div><div class='add'>+#define IXGBE_RDT(_i)   (((_i) &lt; 64) ? (0x01018 + ((_i) * 0x40)) : (0x0D018 + ((_i - 64) * 0x40)))</div><div class='add'>+#define IXGBE_RXDCTL(_i) (((_i) &lt; 64) ? (0x01028 + ((_i) * 0x40)) : (0x0D028 + ((_i - 64) * 0x40)))</div><div class='add'>+/*</div><div class='add'>+ * Split and Replication Receive Control Registers</div><div class='add'>+ * 00-15 : 0x02100 + n*4</div><div class='add'>+ * 16-64 : 0x01014 + n*0x40</div><div class='add'>+ * 64-127: 0x0D014 + (n-64)*0x40</div><div class='add'>+ */</div><div class='add'>+#define IXGBE_SRRCTL(_i) (((_i) &lt;= 15) ? (0x02100 + ((_i) * 4)) : \</div><div class='add'>+                          (((_i) &lt; 64) ? (0x01014 + ((_i) * 0x40)) : \</div><div class='add'>+                          (0x0D014 + ((_i - 64) * 0x40))))</div><div class='add'>+/*</div><div class='add'>+ * Rx DCA Control Register:</div><div class='add'>+ * 00-15 : 0x02200 + n*4</div><div class='add'>+ * 16-64 : 0x0100C + n*0x40</div><div class='add'>+ * 64-127: 0x0D00C + (n-64)*0x40</div><div class='add'>+ */</div><div class='add'>+#define IXGBE_DCA_RXCTRL(_i)    (((_i) &lt;= 15) ? (0x02200 + ((_i) * 4)) : \</div><div class='add'>+                                 (((_i) &lt; 64) ? (0x0100C + ((_i) * 0x40)) : \</div><div class='add'>+                                 (0x0D00C + ((_i - 64) * 0x40))))</div><div class='add'>+#define IXGBE_RDRXCTL           0x02F00</div><div class='ctx'> #define IXGBE_RXPBSIZE(_i)      (0x03C00 + ((_i) * 4))</div><div class='del'>-					     /* 8 of these 0x03C00 - 0x03C1C */</div><div class='add'>+                                             /* 8 of these 0x03C00 - 0x03C1C */</div><div class='ctx'> #define IXGBE_RXCTRL    0x03000</div><div class='ctx'> #define IXGBE_DROPEN    0x03D04</div><div class='ctx'> #define IXGBE_RXPBSIZE_SHIFT 10</div><div class='hunk'>@@ -107,29 +119,32 @@</div><div class='ctx'> /* Receive Registers */</div><div class='ctx'> #define IXGBE_RXCSUM    0x05000</div><div class='ctx'> #define IXGBE_RFCTL     0x05008</div><div class='add'>+#define IXGBE_DRECCCTL  0x02F08</div><div class='add'>+#define IXGBE_DRECCCTL_DISABLE 0</div><div class='add'>+/* Multicast Table Array - 128 entries */</div><div class='ctx'> #define IXGBE_MTA(_i)   (0x05200 + ((_i) * 4))</div><div class='del'>-				   /* Multicast Table Array - 128 entries */</div><div class='del'>-#define IXGBE_RAL(_i)   (0x05400 + ((_i) * 8)) /* 16 of these (0-15) */</div><div class='del'>-#define IXGBE_RAH(_i)   (0x05404 + ((_i) * 8)) /* 16 of these (0-15) */</div><div class='del'>-#define IXGBE_PSRTYPE   0x05480</div><div class='del'>-				   /* 0x5480-0x54BC Packet split receive type */</div><div class='add'>+#define IXGBE_RAL(_i)   (((_i) &lt;= 15) ? (0x05400 + ((_i) * 8)) : (0x0A200 + ((_i) * 8)))</div><div class='add'>+#define IXGBE_RAH(_i)   (((_i) &lt;= 15) ? (0x05404 + ((_i) * 8)) : (0x0A204 + ((_i) * 8)))</div><div class='add'>+/* Packet split receive type */</div><div class='add'>+#define IXGBE_PSRTYPE(_i)    (((_i) &lt;= 15) ? (0x05480 + ((_i) * 4)) : (0x0EA00 + ((_i) * 4)))</div><div class='add'>+/* array of 4096 1-bit vlan filters */</div><div class='ctx'> #define IXGBE_VFTA(_i)  (0x0A000 + ((_i) * 4))</div><div class='del'>-					 /* array of 4096 1-bit vlan filters */</div><div class='add'>+/*array of 4096 4-bit vlan vmdq indices */</div><div class='ctx'> #define IXGBE_VFTAVIND(_j, _i)  (0x0A200 + ((_j) * 0x200) + ((_i) * 4))</div><div class='del'>-				     /*array of 4096 4-bit vlan vmdq indicies */</div><div class='ctx'> #define IXGBE_FCTRL     0x05080</div><div class='ctx'> #define IXGBE_VLNCTRL   0x05088</div><div class='ctx'> #define IXGBE_MCSTCTRL  0x05090</div><div class='ctx'> #define IXGBE_MRQC      0x05818</div><div class='del'>-#define IXGBE_VMD_CTL   0x0581C</div><div class='ctx'> #define IXGBE_IMIR(_i)  (0x05A80 + ((_i) * 4))  /* 8 of these (0-7) */</div><div class='ctx'> #define IXGBE_IMIREXT(_i)       (0x05AA0 + ((_i) * 4))  /* 8 of these (0-7) */</div><div class='ctx'> #define IXGBE_IMIRVP    0x05AC0</div><div class='add'>+#define IXGBE_VMD_CTL   0x0581C</div><div class='ctx'> #define IXGBE_RETA(_i)  (0x05C00 + ((_i) * 4))  /* 32 of these (0-31) */</div><div class='ctx'> #define IXGBE_RSSRK(_i) (0x05C80 + ((_i) * 4))  /* 10 of these (0-9) */</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> /* Transmit DMA registers */</div><div class='del'>-#define IXGBE_TDBAL(_i) (0x06000 + ((_i) * 0x40))/* 32 of these (0-31)*/</div><div class='add'>+#define IXGBE_TDBAL(_i) (0x06000 + ((_i) * 0x40)) /* 32 of these (0-31)*/</div><div class='ctx'> #define IXGBE_TDBAH(_i) (0x06004 + ((_i) * 0x40))</div><div class='ctx'> #define IXGBE_TDLEN(_i) (0x06008 + ((_i) * 0x40))</div><div class='ctx'> #define IXGBE_TDH(_i)   (0x06010 + ((_i) * 0x40))</div><div class='hunk'>@@ -138,11 +153,10 @@</div><div class='ctx'> #define IXGBE_TDWBAL(_i) (0x06038 + ((_i) * 0x40))</div><div class='ctx'> #define IXGBE_TDWBAH(_i) (0x0603C + ((_i) * 0x40))</div><div class='ctx'> #define IXGBE_DTXCTL    0x07E00</div><div class='del'>-#define IXGBE_DCA_TXCTRL(_i)    (0x07200 + ((_i) * 4))</div><div class='del'>-					      /* there are 16 of these (0-15) */</div><div class='add'>+</div><div class='add'>+#define IXGBE_DCA_TXCTRL(_i)    (0x07200 + ((_i) * 4)) /* 16 of these (0-15) */</div><div class='ctx'> #define IXGBE_TIPG      0x0CB00</div><div class='del'>-#define IXGBE_TXPBSIZE(_i)      (0x0CC00 + ((_i) *0x04))</div><div class='del'>-						      /* there are 8 of these */</div><div class='add'>+#define IXGBE_TXPBSIZE(_i)      (0x0CC00 + ((_i) * 4)) /* 8 of these */</div><div class='ctx'> #define IXGBE_MNGTXMAP  0x0CD10</div><div class='ctx'> #define IXGBE_TIPG_FIBER_DEFAULT 3</div><div class='ctx'> #define IXGBE_TXPBSIZE_SHIFT    10</div><div class='hunk'>@@ -154,6 +168,7 @@</div><div class='ctx'> #define IXGBE_IPAV      0x05838</div><div class='ctx'> #define IXGBE_IP4AT     0x05840 /* IPv4 table 0x5840-0x5858 */</div><div class='ctx'> #define IXGBE_IP6AT     0x05880 /* IPv6 table 0x5880-0x588F */</div><div class='add'>+</div><div class='ctx'> #define IXGBE_WUPL      0x05900</div><div class='ctx'> #define IXGBE_WUPM      0x05A00 /* wake up pkt memory 0x5A00-0x5A7C */</div><div class='ctx'> #define IXGBE_FHFT      0x09000 /* Flex host filter table 9000-93FC */</div><div class='hunk'>@@ -170,6 +185,8 @@</div><div class='ctx'> #define IXGBE_TDPT2TCCR(_i)     (0x0CD20 + ((_i) * 4)) /* 8 of these (0-7) */</div><div class='ctx'> #define IXGBE_TDPT2TCSR(_i)     (0x0CD40 + ((_i) * 4)) /* 8 of these (0-7) */</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> /* Stats registers */</div><div class='ctx'> #define IXGBE_CRCERRS   0x04000</div><div class='ctx'> #define IXGBE_ILLERRC   0x04004</div><div class='hunk'>@@ -224,7 +241,7 @@</div><div class='ctx'> #define IXGBE_XEC       0x04120</div><div class='ctx'> </div><div class='ctx'> #define IXGBE_RQSMR(_i) (0x02300 + ((_i) * 4)) /* 16 of these */</div><div class='del'>-#define IXGBE_TQSMR(_i) (0x07300 + ((_i) * 4)) /* 8 of these */</div><div class='add'>+#define IXGBE_TQSMR(_i) (((_i) &lt;= 7) ? (0x07300 + ((_i) * 4)) : (0x08600 + ((_i) * 4)))</div><div class='ctx'> </div><div class='ctx'> #define IXGBE_QPRC(_i) (0x01030 + ((_i) * 0x40)) /* 16 of these */</div><div class='ctx'> #define IXGBE_QPTC(_i) (0x06030 + ((_i) * 0x40)) /* 16 of these */</div><div class='hunk'>@@ -275,23 +292,17 @@</div><div class='ctx'> #define IXGBE_DCA_CTRL  0x11074</div><div class='ctx'> </div><div class='ctx'> /* Diagnostic Registers */</div><div class='del'>-#define IXGBE_RDSTATCTL 0x02C20</div><div class='del'>-#define IXGBE_RDSTAT(_i) (0x02C00 + ((_i) * 4)) /* 0x02C00-0x02C1C */</div><div class='del'>-#define IXGBE_RDHMPN    0x02F08</div><div class='del'>-#define IXGBE_RIC_DW0   0x02F10</div><div class='del'>-#define IXGBE_RIC_DW1   0x02F14</div><div class='del'>-#define IXGBE_RIC_DW2   0x02F18</div><div class='del'>-#define IXGBE_RIC_DW3   0x02F1C</div><div class='del'>-#define IXGBE_RDPROBE   0x02F20</div><div class='del'>-#define IXGBE_TDSTATCTL 0x07C20</div><div class='del'>-#define IXGBE_TDSTAT(_i) (0x07C00 + ((_i) * 4)) /* 0x07C00 - 0x07C1C */</div><div class='del'>-#define IXGBE_TDHMPN    0x07F08</div><div class='del'>-#define IXGBE_TIC_DW0   0x07F10</div><div class='del'>-#define IXGBE_TIC_DW1   0x07F14</div><div class='del'>-#define IXGBE_TIC_DW2   0x07F18</div><div class='del'>-#define IXGBE_TIC_DW3   0x07F1C</div><div class='del'>-#define IXGBE_TDPROBE   0x07F20</div><div class='del'>-#define IXGBE_TXBUFCTRL 0x0C600</div><div class='add'>+#define IXGBE_RDSTATCTL   0x02C20</div><div class='add'>+#define IXGBE_RDSTAT(_i)  (0x02C00 + ((_i) * 4)) /* 0x02C00-0x02C1C */</div><div class='add'>+#define IXGBE_RDHMPN      0x02F08</div><div class='add'>+#define IXGBE_RIC_DW(_i)  (0x02F10 + ((_i) * 4))</div><div class='add'>+#define IXGBE_RDPROBE     0x02F20</div><div class='add'>+#define IXGBE_TDSTATCTL   0x07C20</div><div class='add'>+#define IXGBE_TDSTAT(_i)  (0x07C00 + ((_i) * 4)) /* 0x07C00 - 0x07C1C */</div><div class='add'>+#define IXGBE_TDHMPN      0x07F08</div><div class='add'>+#define IXGBE_TIC_DW(_i)  (0x07F10 + ((_i) * 4))</div><div class='add'>+#define IXGBE_TDPROBE     0x07F20</div><div class='add'>+#define IXGBE_TXBUFCTRL   0x0C600</div><div class='ctx'> #define IXGBE_TXBUFDATA0  0x0C610</div><div class='ctx'> #define IXGBE_TXBUFDATA1  0x0C614</div><div class='ctx'> #define IXGBE_TXBUFDATA2  0x0C618</div><div class='hunk'>@@ -356,12 +367,10 @@</div><div class='ctx'> #define IXGBE_ANLP2     0x042B4</div><div class='ctx'> #define IXGBE_ATLASCTL  0x04800</div><div class='ctx'> </div><div class='del'>-/* RSCCTL Bit Masks */</div><div class='del'>-#define IXGBE_RSCCTL_RSCEN          0x01</div><div class='del'>-#define IXGBE_RSCCTL_MAXDESC_1      0x00</div><div class='del'>-#define IXGBE_RSCCTL_MAXDESC_4      0x04</div><div class='del'>-#define IXGBE_RSCCTL_MAXDESC_8      0x08</div><div class='del'>-#define IXGBE_RSCCTL_MAXDESC_16     0x0C</div><div class='add'>+/* RDRXCTL Bit Masks */</div><div class='add'>+#define IXGBE_RDRXCTL_RDMTS_1_2     0x00000000 /* Rx Desc Min Threshold Size */</div><div class='add'>+#define IXGBE_RDRXCTL_MVMEN         0x00000020</div><div class='add'>+#define IXGBE_RDRXCTL_DMAIDONE      0x00000008 /* DMA init cycle done */</div><div class='ctx'> </div><div class='ctx'> /* CTRL Bit Masks */</div><div class='ctx'> #define IXGBE_CTRL_GIO_DIS      0x00000004 /* Global IO Master Disable bit */</div><div class='hunk'>@@ -394,7 +403,7 @@</div><div class='ctx'> </div><div class='ctx'> #define IXGBE_DCA_TXCTRL_CPUID_MASK 0x0000001F /* Tx CPUID Mask */</div><div class='ctx'> #define IXGBE_DCA_TXCTRL_DESC_DCA_EN (1 &lt;&lt; 5) /* DCA Tx Desc enable */</div><div class='del'>-#define IXGBE_DCA_TXCTRL_TX_WB_RO_EN (1 &lt;&lt; 11) /* TX Desc writeback RO bit */</div><div class='add'>+#define IXGBE_DCA_TXCTRL_TX_WB_RO_EN (1 &lt;&lt; 11) /* Tx Desc writeback RO bit */</div><div class='ctx'> #define IXGBE_DCA_MAX_QUEUES_82598   16 /* DCA regs only on 16 queues */</div><div class='ctx'> </div><div class='ctx'> /* MSCA Bit Masks */</div><div class='hunk'>@@ -418,10 +427,10 @@</div><div class='ctx'> #define IXGBE_MSCA_MDI_IN_PROG_EN    0x80000000 /* MDI in progress enable */</div><div class='ctx'> </div><div class='ctx'> /* MSRWD bit masks */</div><div class='del'>-#define IXGBE_MSRWD_WRITE_DATA_MASK  0x0000FFFF</div><div class='del'>-#define IXGBE_MSRWD_WRITE_DATA_SHIFT 0</div><div class='del'>-#define IXGBE_MSRWD_READ_DATA_MASK   0xFFFF0000</div><div class='del'>-#define IXGBE_MSRWD_READ_DATA_SHIFT  16</div><div class='add'>+#define IXGBE_MSRWD_WRITE_DATA_MASK     0x0000FFFF</div><div class='add'>+#define IXGBE_MSRWD_WRITE_DATA_SHIFT    0</div><div class='add'>+#define IXGBE_MSRWD_READ_DATA_MASK      0xFFFF0000</div><div class='add'>+#define IXGBE_MSRWD_READ_DATA_SHIFT     16</div><div class='ctx'> </div><div class='ctx'> /* Atlas registers */</div><div class='ctx'> #define IXGBE_ATLAS_PDN_LPBK    0x24</div><div class='hunk'>@@ -436,6 +445,7 @@</div><div class='ctx'> #define IXGBE_ATLAS_PDN_TX_1G_QL_ALL    0xF0</div><div class='ctx'> #define IXGBE_ATLAS_PDN_TX_AN_QL_ALL    0xF0</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> /* Device Type definitions for new protocol MDIO commands */</div><div class='ctx'> #define IXGBE_MDIO_PMA_PMD_DEV_TYPE               0x1</div><div class='ctx'> #define IXGBE_MDIO_PCS_DEV_TYPE                   0x3</div><div class='hunk'>@@ -443,6 +453,8 @@</div><div class='ctx'> #define IXGBE_MDIO_AUTO_NEG_DEV_TYPE              0x7</div><div class='ctx'> #define IXGBE_MDIO_VENDOR_SPECIFIC_1_DEV_TYPE     0x1E   /* Device 30 */</div><div class='ctx'> </div><div class='add'>+#define IXGBE_MDIO_COMMAND_TIMEOUT     100 /* PHY Timeout for 1 GB mode */</div><div class='add'>+</div><div class='ctx'> #define IXGBE_MDIO_VENDOR_SPECIFIC_1_CONTROL      0x0    /* VS1 Control Reg */</div><div class='ctx'> #define IXGBE_MDIO_VENDOR_SPECIFIC_1_STATUS       0x1    /* VS1 Status Reg */</div><div class='ctx'> #define IXGBE_MDIO_VENDOR_SPECIFIC_1_LINK_STATUS  0x0008 /* 1 = Link Up */</div><div class='hunk'>@@ -456,23 +468,39 @@</div><div class='ctx'> #define IXGBE_MDIO_PHY_XS_RESET        0x8000 /* PHY_XS Reset */</div><div class='ctx'> #define IXGBE_MDIO_PHY_ID_HIGH         0x2 /* PHY ID High Reg*/</div><div class='ctx'> #define IXGBE_MDIO_PHY_ID_LOW          0x3 /* PHY ID Low Reg*/</div><div class='del'>-#define IXGBE_MDIO_PHY_SPEED_ABILITY   0x4 /* Speed Abilty Reg */</div><div class='add'>+#define IXGBE_MDIO_PHY_SPEED_ABILITY   0x4 /* Speed Ability Reg */</div><div class='ctx'> #define IXGBE_MDIO_PHY_SPEED_10G       0x0001 /* 10G capable */</div><div class='ctx'> #define IXGBE_MDIO_PHY_SPEED_1G        0x0010 /* 1G capable */</div><div class='ctx'> </div><div class='add'>+#define IXGBE_MDIO_PMA_PMD_SDA_SCL_ADDR     0xC30A /* PHY_XS SDA/SCL Address Reg */</div><div class='add'>+#define IXGBE_MDIO_PMA_PMD_SDA_SCL_DATA     0xC30B /* PHY_XS SDA/SCL Data Reg */</div><div class='add'>+#define IXGBE_MDIO_PMA_PMD_SDA_SCL_STAT     0xC30C /* PHY_XS SDA/SCL Status Reg */</div><div class='add'>+</div><div class='add'>+/* MII clause 22/28 definitions */</div><div class='add'>+#define IXGBE_MDIO_PHY_LOW_POWER_MODE  0x0800</div><div class='add'>+</div><div class='add'>+#define IXGBE_MII_SPEED_SELECTION_REG  0x10</div><div class='add'>+#define IXGBE_MII_RESTART              0x200</div><div class='add'>+#define IXGBE_MII_AUTONEG_COMPLETE     0x20</div><div class='add'>+#define IXGBE_MII_AUTONEG_REG          0x0</div><div class='add'>+</div><div class='ctx'> #define IXGBE_PHY_REVISION_MASK        0xFFFFFFF0</div><div class='ctx'> #define IXGBE_MAX_PHY_ADDR             32</div><div class='ctx'> </div><div class='ctx'> /* PHY IDs*/</div><div class='del'>-#define TN1010_PHY_ID    0x00A19410</div><div class='ctx'> #define QT2022_PHY_ID    0x0043A400</div><div class='ctx'> </div><div class='add'>+/* PHY Types */</div><div class='add'>+#define IXGBE_M88E1145_E_PHY_ID  0x01410CD0</div><div class='add'>+</div><div class='ctx'> /* General purpose Interrupt Enable */</div><div class='del'>-#define IXGBE_GPIE_MSIX_MODE      0x00000010 /* MSI-X mode */</div><div class='del'>-#define IXGBE_GPIE_OCD            0x00000020 /* Other Clear Disable */</div><div class='del'>-#define IXGBE_GPIE_EIMEN          0x00000040 /* Immediate Interrupt Enable */</div><div class='del'>-#define IXGBE_GPIE_EIAME          0x40000000</div><div class='del'>-#define IXGBE_GPIE_PBA_SUPPORT    0x80000000</div><div class='add'>+#define IXGBE_SDP0_GPIEN         0x00000001 /* SDP0 */</div><div class='add'>+#define IXGBE_SDP1_GPIEN         0x00000002 /* SDP1 */</div><div class='add'>+#define IXGBE_GPIE_MSIX_MODE     0x00000010 /* MSI-X mode */</div><div class='add'>+#define IXGBE_GPIE_OCD           0x00000020 /* Other Clear Disable */</div><div class='add'>+#define IXGBE_GPIE_EIMEN         0x00000040 /* Immediate Interrupt Enable */</div><div class='add'>+#define IXGBE_GPIE_EIAME         0x40000000</div><div class='add'>+#define IXGBE_GPIE_PBA_SUPPORT   0x80000000</div><div class='ctx'> </div><div class='ctx'> /* Transmit Flow Control status */</div><div class='ctx'> #define IXGBE_TFCS_TXOFF         0x00000001</div><div class='hunk'>@@ -533,7 +561,7 @@</div><div class='ctx'> #define IXGBE_PAP_TXPAUSECNT_MASK   0x0000FFFF /* Pause counter mask */</div><div class='ctx'> </div><div class='ctx'> /* RMCS Bit Masks */</div><div class='del'>-#define IXGBE_RMCS_RRM          0x00000002 /* Receive Recylce Mode enable */</div><div class='add'>+#define IXGBE_RMCS_RRM          0x00000002 /* Receive Recycle Mode enable */</div><div class='ctx'> /* Receive Arbitration Control: 0 Round Robin, 1 DFP */</div><div class='ctx'> #define IXGBE_RMCS_RAC          0x00000004</div><div class='ctx'> #define IXGBE_RMCS_DFP          IXGBE_RMCS_RAC /* Deficit Fixed Priority ena */</div><div class='hunk'>@@ -541,12 +569,15 @@</div><div class='ctx'> #define IXGBE_RMCS_TFCE_PRIORITY 0x00000010 /* Tx Priority flow control ena */</div><div class='ctx'> #define IXGBE_RMCS_ARBDIS       0x00000040 /* Arbitration disable bit */</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> /* Interrupt register bitmasks */</div><div class='ctx'> </div><div class='ctx'> /* Extended Interrupt Cause Read */</div><div class='ctx'> #define IXGBE_EICR_RTX_QUEUE    0x0000FFFF /* RTx Queue Interrupt */</div><div class='ctx'> #define IXGBE_EICR_LSC          0x00100000 /* Link Status Change */</div><div class='del'>-#define IXGBE_EICR_MNG          0x00400000 /* Managability Event Interrupt */</div><div class='add'>+#define IXGBE_EICR_MNG          0x00400000 /* Manageability Event Interrupt */</div><div class='add'>+#define IXGBE_EICR_GPI_SDP0     0x01000000 /* Gen Purpose Interrupt on SDP0 */</div><div class='add'>+#define IXGBE_EICR_GPI_SDP1     0x02000000 /* Gen Purpose Interrupt on SDP1 */</div><div class='ctx'> #define IXGBE_EICR_PBUR         0x10000000 /* Packet Buffer Handler Error */</div><div class='ctx'> #define IXGBE_EICR_DHER         0x20000000 /* Descriptor Handler Error */</div><div class='ctx'> #define IXGBE_EICR_TCP_TIMER    0x40000000 /* TCP Timer */</div><div class='hunk'>@@ -554,11 +585,12 @@</div><div class='ctx'> </div><div class='ctx'> /* Extended Interrupt Cause Set */</div><div class='ctx'> #define IXGBE_EICS_RTX_QUEUE    IXGBE_EICR_RTX_QUEUE /* RTx Queue Interrupt */</div><div class='del'>-#define IXGBE_EICS_LSC          IXGBE_EICR_LSC /* Link Status Change */</div><div class='del'>-#define IXGBE_EICR_GPI_SDP0     0x01000000 /* Gen Purpose Interrupt on SDP0 */</div><div class='del'>-#define IXGBE_EICS_MNG          IXGBE_EICR_MNG /* MNG Event Interrupt */</div><div class='del'>-#define IXGBE_EICS_PBUR         IXGBE_EICR_PBUR /* Pkt Buf Handler Error */</div><div class='del'>-#define IXGBE_EICS_DHER         IXGBE_EICR_DHER /* Desc Handler Error */</div><div class='add'>+#define IXGBE_EICS_LSC          IXGBE_EICR_LSC       /* Link Status Change */</div><div class='add'>+#define IXGBE_EICS_MNG          IXGBE_EICR_MNG       /* MNG Event Interrupt */</div><div class='add'>+#define IXGBE_EICS_GPI_SDP0     IXGBE_EICR_GPI_SDP0  /* SDP0 Gen Purpose Int */</div><div class='add'>+#define IXGBE_EICS_GPI_SDP1     IXGBE_EICR_GPI_SDP1  /* SDP1 Gen Purpose Int */</div><div class='add'>+#define IXGBE_EICS_PBUR         IXGBE_EICR_PBUR      /* Pkt Buf Handler Err */</div><div class='add'>+#define IXGBE_EICS_DHER         IXGBE_EICR_DHER      /* Desc Handler Error */</div><div class='ctx'> #define IXGBE_EICS_TCP_TIMER    IXGBE_EICR_TCP_TIMER /* TCP Timer */</div><div class='ctx'> #define IXGBE_EICS_OTHER        IXGBE_EICR_OTHER     /* INT Cause Active */</div><div class='ctx'> </div><div class='hunk'>@@ -566,7 +598,9 @@</div><div class='ctx'> #define IXGBE_EIMS_RTX_QUEUE    IXGBE_EICR_RTX_QUEUE /* RTx Queue Interrupt */</div><div class='ctx'> #define IXGBE_EIMS_LSC          IXGBE_EICR_LSC       /* Link Status Change */</div><div class='ctx'> #define IXGBE_EIMS_MNG          IXGBE_EICR_MNG       /* MNG Event Interrupt */</div><div class='del'>-#define IXGBE_EIMS_PBUR         IXGBE_EICR_PBUR      /* Pkt Buf Handler Error */</div><div class='add'>+#define IXGBE_EIMS_GPI_SDP0     IXGBE_EICR_GPI_SDP0  /* SDP0 Gen Purpose Int */</div><div class='add'>+#define IXGBE_EIMS_GPI_SDP1     IXGBE_EICR_GPI_SDP1  /* SDP1 Gen Purpose Int */</div><div class='add'>+#define IXGBE_EIMS_PBUR         IXGBE_EICR_PBUR      /* Pkt Buf Handler Err */</div><div class='ctx'> #define IXGBE_EIMS_DHER         IXGBE_EICR_DHER      /* Descr Handler Error */</div><div class='ctx'> #define IXGBE_EIMS_TCP_TIMER    IXGBE_EICR_TCP_TIMER /* TCP Timer */</div><div class='ctx'> #define IXGBE_EIMS_OTHER        IXGBE_EICR_OTHER     /* INT Cause Active */</div><div class='hunk'>@@ -575,18 +609,20 @@</div><div class='ctx'> #define IXGBE_EIMC_RTX_QUEUE    IXGBE_EICR_RTX_QUEUE /* RTx Queue Interrupt */</div><div class='ctx'> #define IXGBE_EIMC_LSC          IXGBE_EICR_LSC       /* Link Status Change */</div><div class='ctx'> #define IXGBE_EIMC_MNG          IXGBE_EICR_MNG       /* MNG Event Interrupt */</div><div class='del'>-#define IXGBE_EIMC_PBUR         IXGBE_EICR_PBUR      /* Pkt Buf Handler Error */</div><div class='del'>-#define IXGBE_EIMC_DHER         IXGBE_EICR_DHER      /* Desc Handler Error */</div><div class='add'>+#define IXGBE_EIMC_GPI_SDP0     IXGBE_EICR_GPI_SDP0  /* SDP0 Gen Purpose Int */</div><div class='add'>+#define IXGBE_EIMC_GPI_SDP1     IXGBE_EICR_GPI_SDP1  /* SDP1 Gen Purpose Int */</div><div class='add'>+#define IXGBE_EIMC_PBUR         IXGBE_EICR_PBUR      /* Pkt Buf Handler Err */</div><div class='add'>+#define IXGBE_EIMC_DHER         IXGBE_EICR_DHER      /* Desc Handler Err */</div><div class='ctx'> #define IXGBE_EIMC_TCP_TIMER    IXGBE_EICR_TCP_TIMER /* TCP Timer */</div><div class='ctx'> #define IXGBE_EIMC_OTHER        IXGBE_EICR_OTHER     /* INT Cause Active */</div><div class='ctx'> </div><div class='del'>-#define IXGBE_EIMS_ENABLE_MASK (\</div><div class='del'>-				IXGBE_EIMS_RTX_QUEUE       | \</div><div class='del'>-				IXGBE_EIMS_LSC             | \</div><div class='del'>-				IXGBE_EIMS_TCP_TIMER       | \</div><div class='del'>-				IXGBE_EIMS_OTHER)</div><div class='add'>+#define IXGBE_EIMS_ENABLE_MASK ( \</div><div class='add'>+                                IXGBE_EIMS_RTX_QUEUE       | \</div><div class='add'>+                                IXGBE_EIMS_LSC             | \</div><div class='add'>+                                IXGBE_EIMS_TCP_TIMER       | \</div><div class='add'>+                                IXGBE_EIMS_OTHER)</div><div class='ctx'> </div><div class='del'>-/* Immediate Interrupt RX (A.K.A. Low Latency Interrupt) */</div><div class='add'>+/* Immediate Interrupt Rx (A.K.A. Low Latency Interrupt) */</div><div class='ctx'> #define IXGBE_IMIR_PORT_IM_EN     0x00010000  /* TCP port enable */</div><div class='ctx'> #define IXGBE_IMIR_PORT_BP        0x00020000  /* TCP port check bypass */</div><div class='ctx'> #define IXGBE_IMIREXT_SIZE_BP     0x00001000  /* Packet size bypass */</div><div class='hunk'>@@ -623,6 +659,7 @@</div><div class='ctx'> #define IXGBE_VLNCTRL_VFE       0x40000000  /* bit 30 */</div><div class='ctx'> #define IXGBE_VLNCTRL_VME       0x80000000  /* bit 31 */</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> #define IXGBE_ETHERNET_IEEE_VLAN_TYPE 0x8100  /* 802.1q protocol */</div><div class='ctx'> </div><div class='ctx'> /* STATUS Bit Masks */</div><div class='hunk'>@@ -670,16 +707,16 @@</div><div class='ctx'> #define IXGBE_AUTOC_AN_RESTART  0x00001000</div><div class='ctx'> #define IXGBE_AUTOC_FLU         0x00000001</div><div class='ctx'> #define IXGBE_AUTOC_LMS_SHIFT   13</div><div class='del'>-#define IXGBE_AUTOC_LMS_MASK   (0x7 &lt;&lt; IXGBE_AUTOC_LMS_SHIFT)</div><div class='del'>-#define IXGBE_AUTOC_LMS_1G_LINK_NO_AN  (0x0 &lt;&lt; IXGBE_AUTOC_LMS_SHIFT)</div><div class='del'>-#define IXGBE_AUTOC_LMS_10G_LINK_NO_AN (0x1 &lt;&lt; IXGBE_AUTOC_LMS_SHIFT)</div><div class='del'>-#define IXGBE_AUTOC_LMS_1G_AN  (0x2 &lt;&lt; IXGBE_AUTOC_LMS_SHIFT)</div><div class='del'>-#define IXGBE_AUTOC_LMS_KX4_AN (0x4 &lt;&lt; IXGBE_AUTOC_LMS_SHIFT)</div><div class='del'>-#define IXGBE_AUTOC_LMS_KX4_AN_1G_AN   (0x6 &lt;&lt; IXGBE_AUTOC_LMS_SHIFT)</div><div class='del'>-#define IXGBE_AUTOC_LMS_ATTACH_TYPE    (0x7 &lt;&lt; IXGBE_AUTOC_10G_PMA_PMD_SHIFT)</div><div class='del'>-</div><div class='del'>-#define IXGBE_AUTOC_1G_PMA_PMD      0x00000200</div><div class='del'>-#define IXGBE_AUTOC_10G_PMA_PMD     0x00000180</div><div class='add'>+#define IXGBE_AUTOC_LMS_MASK            (0x7 &lt;&lt; IXGBE_AUTOC_LMS_SHIFT)</div><div class='add'>+#define IXGBE_AUTOC_LMS_1G_LINK_NO_AN   (0x0 &lt;&lt; IXGBE_AUTOC_LMS_SHIFT)</div><div class='add'>+#define IXGBE_AUTOC_LMS_10G_LINK_NO_AN  (0x1 &lt;&lt; IXGBE_AUTOC_LMS_SHIFT)</div><div class='add'>+#define IXGBE_AUTOC_LMS_1G_AN           (0x2 &lt;&lt; IXGBE_AUTOC_LMS_SHIFT)</div><div class='add'>+#define IXGBE_AUTOC_LMS_KX4_AN          (0x4 &lt;&lt; IXGBE_AUTOC_LMS_SHIFT)</div><div class='add'>+#define IXGBE_AUTOC_LMS_KX4_AN_1G_AN    (0x6 &lt;&lt; IXGBE_AUTOC_LMS_SHIFT)</div><div class='add'>+#define IXGBE_AUTOC_LMS_ATTACH_TYPE     (0x7 &lt;&lt; IXGBE_AUTOC_10G_PMA_PMD_SHIFT)</div><div class='add'>+</div><div class='add'>+#define IXGBE_AUTOC_1G_PMA_PMD         0x00000200</div><div class='add'>+#define IXGBE_AUTOC_10G_PMA_PMD        0x00000180</div><div class='ctx'> #define IXGBE_AUTOC_10G_PMA_PMD_SHIFT 7</div><div class='ctx'> #define IXGBE_AUTOC_1G_PMA_PMD_SHIFT 9</div><div class='ctx'> #define IXGBE_AUTOC_10G_XAUI   (0x0 &lt;&lt; IXGBE_AUTOC_10G_PMA_PMD_SHIFT)</div><div class='hunk'>@@ -705,6 +742,7 @@</div><div class='ctx'> #define IXGBE_LINKS_TL_FAULT    0x00001000</div><div class='ctx'> #define IXGBE_LINKS_SIGNAL      0x00000F00</div><div class='ctx'> </div><div class='add'>+#define IXGBE_LINK_UP_TIME      90 /* 9.0 Seconds */</div><div class='ctx'> #define IXGBE_AUTO_NEG_TIME     45 /* 4.5 Seconds */</div><div class='ctx'> </div><div class='ctx'> /* SW Semaphore Register bitmasks */</div><div class='hunk'>@@ -759,6 +797,11 @@</div><div class='ctx'> #define IXGBE_PBANUM0_PTR       0x15</div><div class='ctx'> #define IXGBE_PBANUM1_PTR       0x16</div><div class='ctx'> </div><div class='add'>+/* Legacy EEPROM word offsets */</div><div class='add'>+#define IXGBE_ISCSI_BOOT_CAPS           0x0033</div><div class='add'>+#define IXGBE_ISCSI_SETUP_PORT_0        0x0030</div><div class='add'>+#define IXGBE_ISCSI_SETUP_PORT_1        0x0034</div><div class='add'>+</div><div class='ctx'> /* EEPROM Commands - SPI */</div><div class='ctx'> #define IXGBE_EEPROM_MAX_RETRY_SPI      5000 /* Max wait 5ms for RDY signal */</div><div class='ctx'> #define IXGBE_EEPROM_STATUS_RDY_SPI     0x01</div><div class='hunk'>@@ -766,7 +809,7 @@</div><div class='ctx'> #define IXGBE_EEPROM_WRITE_OPCODE_SPI   0x02  /* EEPROM write opcode */</div><div class='ctx'> #define IXGBE_EEPROM_A8_OPCODE_SPI      0x08  /* opcode bit-3 = addr bit-8 */</div><div class='ctx'> #define IXGBE_EEPROM_WREN_OPCODE_SPI    0x06  /* EEPROM set Write Ena latch */</div><div class='del'>-/* EEPROM reset Write Enbale latch */</div><div class='add'>+/* EEPROM reset Write Enable latch */</div><div class='ctx'> #define IXGBE_EEPROM_WRDI_OPCODE_SPI    0x04</div><div class='ctx'> #define IXGBE_EEPROM_RDSR_OPCODE_SPI    0x05  /* EEPROM read Status reg */</div><div class='ctx'> #define IXGBE_EEPROM_WRSR_OPCODE_SPI    0x01  /* EEPROM write Status reg */</div><div class='hunk'>@@ -805,26 +848,20 @@</div><div class='ctx'> /* Number of 100 microseconds we wait for PCI Express master disable */</div><div class='ctx'> #define IXGBE_PCI_MASTER_DISABLE_TIMEOUT 800</div><div class='ctx'> </div><div class='del'>-/* PHY Types */</div><div class='del'>-#define IXGBE_M88E1145_E_PHY_ID  0x01410CD0</div><div class='del'>-</div><div class='ctx'> /* Check whether address is multicast.  This is little-endian specific check.*/</div><div class='ctx'> #define IXGBE_IS_MULTICAST(Address) \</div><div class='del'>-		(bool)(((u8 *)(Address))[0] &amp; ((u8)0x01))</div><div class='add'>+                (bool)(((u8 *)(Address))[0] &amp; ((u8)0x01))</div><div class='ctx'> </div><div class='ctx'> /* Check whether an address is broadcast. */</div><div class='ctx'> #define IXGBE_IS_BROADCAST(Address)                      \</div><div class='del'>-		((((u8 *)(Address))[0] == ((u8)0xff)) &amp;&amp; \</div><div class='del'>-		(((u8 *)(Address))[1] == ((u8)0xff)))</div><div class='add'>+                ((((u8 *)(Address))[0] == ((u8)0xff)) &amp;&amp; \</div><div class='add'>+                (((u8 *)(Address))[1] == ((u8)0xff)))</div><div class='ctx'> </div><div class='ctx'> /* RAH */</div><div class='ctx'> #define IXGBE_RAH_VIND_MASK     0x003C0000</div><div class='ctx'> #define IXGBE_RAH_VIND_SHIFT    18</div><div class='ctx'> #define IXGBE_RAH_AV            0x80000000</div><div class='del'>-</div><div class='del'>-/* Filters */</div><div class='del'>-#define IXGBE_MC_TBL_SIZE       128  /* Multicast Filter Table (4096 bits) */</div><div class='del'>-#define IXGBE_VLAN_FILTER_TBL_SIZE 128  /* VLAN Filter Table (4096 bits) */</div><div class='add'>+#define IXGBE_CLEAR_VMDQ_ALL    0xFFFFFFFF</div><div class='ctx'> </div><div class='ctx'> /* Header split receive */</div><div class='ctx'> #define IXGBE_RFCTL_ISCSI_DIS       0x00000001</div><div class='hunk'>@@ -853,7 +890,7 @@</div><div class='ctx'> #define IXGBE_MAX_FRAME_SZ      0x40040000</div><div class='ctx'> </div><div class='ctx'> #define IXGBE_TDWBAL_HEAD_WB_ENABLE   0x1      /* Tx head write-back enable */</div><div class='del'>-#define IXGBE_TDWBAL_SEQNUM_WB_ENABLE 0x2      /* Tx seq. # write-back enable */</div><div class='add'>+#define IXGBE_TDWBAL_SEQNUM_WB_ENABLE 0x2      /* Tx seq# write-back enable */</div><div class='ctx'> </div><div class='ctx'> /* Receive Config masks */</div><div class='ctx'> #define IXGBE_RXCTRL_RXEN       0x00000001  /* Enable Receiver */</div><div class='hunk'>@@ -866,7 +903,7 @@</div><div class='ctx'> #define IXGBE_FCTRL_BAM 0x00000400 /* Broadcast Accept Mode */</div><div class='ctx'> #define IXGBE_FCTRL_PMCF 0x00001000 /* Pass MAC Control Frames */</div><div class='ctx'> #define IXGBE_FCTRL_DPF 0x00002000 /* Discard Pause Frame */</div><div class='del'>-/* Receive Priority Flow Control Enbale */</div><div class='add'>+/* Receive Priority Flow Control Enable */</div><div class='ctx'> #define IXGBE_FCTRL_RPFCE 0x00004000</div><div class='ctx'> #define IXGBE_FCTRL_RFCE 0x00008000 /* Receive Flow Control Ena */</div><div class='ctx'> </div><div class='hunk'>@@ -896,9 +933,8 @@</div><div class='ctx'> /* Receive Descriptor bit definitions */</div><div class='ctx'> #define IXGBE_RXD_STAT_DD       0x01    /* Descriptor Done */</div><div class='ctx'> #define IXGBE_RXD_STAT_EOP      0x02    /* End of Packet */</div><div class='del'>-#define IXGBE_RXD_STAT_IXSM     0x04    /* Ignore checksum */</div><div class='ctx'> #define IXGBE_RXD_STAT_VP       0x08    /* IEEE VLAN Packet */</div><div class='del'>-#define IXGBE_RXD_STAT_UDPCS    0x10    /* UDP xsum caculated */</div><div class='add'>+#define IXGBE_RXD_STAT_UDPCS    0x10    /* UDP xsum calculated */</div><div class='ctx'> #define IXGBE_RXD_STAT_L4CS     0x20    /* L4 xsum calculated */</div><div class='ctx'> #define IXGBE_RXD_STAT_IPCS     0x40    /* IP xsum calculated */</div><div class='ctx'> #define IXGBE_RXD_STAT_PIF      0x80    /* passed in-exact filter */</div><div class='hunk'>@@ -914,7 +950,7 @@</div><div class='ctx'> #define IXGBE_RXD_ERR_USE       0x20    /* Undersize Error */</div><div class='ctx'> #define IXGBE_RXD_ERR_TCPE      0x40    /* TCP/UDP Checksum Error */</div><div class='ctx'> #define IXGBE_RXD_ERR_IPE       0x80    /* IP Checksum Error */</div><div class='del'>-#define IXGBE_RXDADV_HBO        0x00800000</div><div class='add'>+#define IXGBE_RXDADV_ERR_HBO    0x00800000 /*Header Buffer Overflow */</div><div class='ctx'> #define IXGBE_RXDADV_ERR_CE     0x01000000 /* CRC Error */</div><div class='ctx'> #define IXGBE_RXDADV_ERR_LE     0x02000000 /* Length Error */</div><div class='ctx'> #define IXGBE_RXDADV_ERR_PE     0x08000000 /* Packet Error */</div><div class='hunk'>@@ -928,15 +964,17 @@</div><div class='ctx'> #define IXGBE_RXD_CFI_MASK      0x1000  /* CFI is bit 12 */</div><div class='ctx'> #define IXGBE_RXD_CFI_SHIFT     12</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> /* SRRCTL bit definitions */</div><div class='del'>-#define IXGBE_SRRCTL_BSIZEPKT_SHIFT 10     /* so many KBs */</div><div class='del'>-#define IXGBE_SRRCTL_BSIZEPKT_MASK  0x0000007F</div><div class='del'>-#define IXGBE_SRRCTL_BSIZEHDR_MASK  0x00003F00</div><div class='del'>-#define IXGBE_SRRCTL_DESCTYPE_LEGACY 0x00000000</div><div class='add'>+#define IXGBE_SRRCTL_BSIZEPKT_SHIFT     10     /* so many KBs */</div><div class='add'>+#define IXGBE_SRRCTL_BSIZEPKT_MASK      0x0000007F</div><div class='add'>+#define IXGBE_SRRCTL_BSIZEHDR_MASK      0x00003F00</div><div class='add'>+#define IXGBE_SRRCTL_DESCTYPE_LEGACY    0x00000000</div><div class='ctx'> #define IXGBE_SRRCTL_DESCTYPE_ADV_ONEBUF 0x02000000</div><div class='ctx'> #define IXGBE_SRRCTL_DESCTYPE_HDR_SPLIT  0x04000000</div><div class='ctx'> #define IXGBE_SRRCTL_DESCTYPE_HDR_REPLICATION_LARGE_PKT 0x08000000</div><div class='ctx'> #define IXGBE_SRRCTL_DESCTYPE_HDR_SPLIT_ALWAYS 0x0A000000</div><div class='add'>+#define IXGBE_SRRCTL_DESCTYPE_MASK      0x0E000000</div><div class='ctx'> </div><div class='ctx'> #define IXGBE_RXDPS_HDRSTAT_HDRSP       0x00008000</div><div class='ctx'> #define IXGBE_RXDPS_HDRSTAT_HDRLEN_MASK 0x000003FF</div><div class='hunk'>@@ -970,21 +1008,20 @@</div><div class='ctx'> #define IXGBE_RXDADV_PKTTYPE_UDP        0x00000200 /* UDP hdr present */</div><div class='ctx'> #define IXGBE_RXDADV_PKTTYPE_SCTP       0x00000400 /* SCTP hdr present */</div><div class='ctx'> #define IXGBE_RXDADV_PKTTYPE_NFS        0x00000800 /* NFS hdr present */</div><div class='del'>-</div><div class='ctx'> /* Masks to determine if packets should be dropped due to frame errors */</div><div class='del'>-#define IXGBE_RXD_ERR_FRAME_ERR_MASK (\</div><div class='del'>-				      IXGBE_RXD_ERR_CE | \</div><div class='del'>-				      IXGBE_RXD_ERR_LE | \</div><div class='del'>-				      IXGBE_RXD_ERR_PE | \</div><div class='del'>-				      IXGBE_RXD_ERR_OSE | \</div><div class='del'>-				      IXGBE_RXD_ERR_USE)</div><div class='del'>-</div><div class='del'>-#define IXGBE_RXDADV_ERR_FRAME_ERR_MASK (\</div><div class='del'>-				      IXGBE_RXDADV_ERR_CE | \</div><div class='del'>-				      IXGBE_RXDADV_ERR_LE | \</div><div class='del'>-				      IXGBE_RXDADV_ERR_PE | \</div><div class='del'>-				      IXGBE_RXDADV_ERR_OSE | \</div><div class='del'>-				      IXGBE_RXDADV_ERR_USE)</div><div class='add'>+#define IXGBE_RXD_ERR_FRAME_ERR_MASK ( \</div><div class='add'>+                                      IXGBE_RXD_ERR_CE | \</div><div class='add'>+                                      IXGBE_RXD_ERR_LE | \</div><div class='add'>+                                      IXGBE_RXD_ERR_PE | \</div><div class='add'>+                                      IXGBE_RXD_ERR_OSE | \</div><div class='add'>+                                      IXGBE_RXD_ERR_USE)</div><div class='add'>+</div><div class='add'>+#define IXGBE_RXDADV_ERR_FRAME_ERR_MASK ( \</div><div class='add'>+                                      IXGBE_RXDADV_ERR_CE | \</div><div class='add'>+                                      IXGBE_RXDADV_ERR_LE | \</div><div class='add'>+                                      IXGBE_RXDADV_ERR_PE | \</div><div class='add'>+                                      IXGBE_RXDADV_ERR_OSE | \</div><div class='add'>+                                      IXGBE_RXDADV_ERR_USE)</div><div class='ctx'> </div><div class='ctx'> /* Multicast bit mask */</div><div class='ctx'> #define IXGBE_MCSTCTRL_MFE      0x4</div><div class='hunk'>@@ -1000,6 +1037,7 @@</div><div class='ctx'> #define IXGBE_RX_DESC_SPECIAL_PRI_SHIFT  0x000D /* Priority in upper 3 of 16 */</div><div class='ctx'> #define IXGBE_TX_DESC_SPECIAL_PRI_SHIFT  IXGBE_RX_DESC_SPECIAL_PRI_SHIFT</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> /* Transmit Descriptor - Legacy */</div><div class='ctx'> struct ixgbe_legacy_tx_desc {</div><div class='ctx'> 	u64 buffer_addr;       /* Address of the descriptor's data buffer */</div><div class='hunk'>@@ -1007,15 +1045,15 @@ struct ixgbe_legacy_tx_desc {</div><div class='ctx'> 		__le32 data;</div><div class='ctx'> 		struct {</div><div class='ctx'> 			__le16 length;    /* Data buffer length */</div><div class='del'>-			u8 cso; /* Checksum offset */</div><div class='del'>-			u8 cmd; /* Descriptor control */</div><div class='add'>+			u8 cso;           /* Checksum offset */</div><div class='add'>+			u8 cmd;           /* Descriptor control */</div><div class='ctx'> 		} flags;</div><div class='ctx'> 	} lower;</div><div class='ctx'> 	union {</div><div class='ctx'> 		__le32 data;</div><div class='ctx'> 		struct {</div><div class='del'>-			u8 status;     /* Descriptor status */</div><div class='del'>-			u8 css; /* Checksum start */</div><div class='add'>+			u8 status;        /* Descriptor status */</div><div class='add'>+			u8 css;           /* Checksum start */</div><div class='ctx'> 			__le16 vlan;</div><div class='ctx'> 		} fields;</div><div class='ctx'> 	} upper;</div><div class='hunk'>@@ -1024,7 +1062,7 @@ struct ixgbe_legacy_tx_desc {</div><div class='ctx'> /* Transmit Descriptor - Advanced */</div><div class='ctx'> union ixgbe_adv_tx_desc {</div><div class='ctx'> 	struct {</div><div class='del'>-		__le64 buffer_addr;       /* Address of descriptor's data buf */</div><div class='add'>+		__le64 buffer_addr;      /* Address of descriptor's data buf */</div><div class='ctx'> 		__le32 cmd_type_len;</div><div class='ctx'> 		__le32 olinfo_status;</div><div class='ctx'> 	} read;</div><div class='hunk'>@@ -1039,9 +1077,9 @@ union ixgbe_adv_tx_desc {</div><div class='ctx'> struct ixgbe_legacy_rx_desc {</div><div class='ctx'> 	__le64 buffer_addr; /* Address of the descriptor's data buffer */</div><div class='ctx'> 	__le16 length;      /* Length of data DMAed into data buffer */</div><div class='del'>-	u16 csum;        /* Packet checksum */</div><div class='del'>-	u8 status;       /* Descriptor status */</div><div class='del'>-	u8 errors;       /* Descriptor Errors */</div><div class='add'>+	__le16 csum;        /* Packet checksum */</div><div class='add'>+	u8 status;          /* Descriptor status */</div><div class='add'>+	u8 errors;          /* Descriptor Errors */</div><div class='ctx'> 	__le16 vlan;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1053,15 +1091,18 @@ union ixgbe_adv_rx_desc {</div><div class='ctx'> 	} read;</div><div class='ctx'> 	struct {</div><div class='ctx'> 		struct {</div><div class='del'>-			struct {</div><div class='del'>-				__le16 pkt_info; /* RSS type, Packet type */</div><div class='del'>-				__le16 hdr_info; /* Split Header, header len */</div><div class='add'>+			union {</div><div class='add'>+				__le32 data;</div><div class='add'>+				struct {</div><div class='add'>+					__le16 pkt_info; /* RSS, Pkt type */</div><div class='add'>+					__le16 hdr_info; /* Splithdr, hdrlen */</div><div class='add'>+				} hs_rss;</div><div class='ctx'> 			} lo_dword;</div><div class='ctx'> 			union {</div><div class='ctx'> 				__le32 rss; /* RSS Hash */</div><div class='ctx'> 				struct {</div><div class='ctx'> 					__le16 ip_id; /* IP id */</div><div class='del'>-					u16 csum; /* Packet Checksum */</div><div class='add'>+					__le16 csum; /* Packet Checksum */</div><div class='ctx'> 				} csum_ip;</div><div class='ctx'> 			} hi_dword;</div><div class='ctx'> 		} lower;</div><div class='hunk'>@@ -1082,49 +1123,69 @@ struct ixgbe_adv_tx_context_desc {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Adv Transmit Descriptor Config Masks */</div><div class='del'>-#define IXGBE_ADVTXD_DTALEN_MASK      0x0000FFFF /* Data buffer length(bytes) */</div><div class='add'>+#define IXGBE_ADVTXD_DTALEN_MASK      0x0000FFFF /* Data buf length(bytes) */</div><div class='ctx'> #define IXGBE_ADVTXD_DTYP_MASK  0x00F00000 /* DTYP mask */</div><div class='ctx'> #define IXGBE_ADVTXD_DTYP_CTXT  0x00200000 /* Advanced Context Desc */</div><div class='ctx'> #define IXGBE_ADVTXD_DTYP_DATA  0x00300000 /* Advanced Data Descriptor */</div><div class='ctx'> #define IXGBE_ADVTXD_DCMD_EOP   IXGBE_TXD_CMD_EOP  /* End of Packet */</div><div class='ctx'> #define IXGBE_ADVTXD_DCMD_IFCS  IXGBE_TXD_CMD_IFCS /* Insert FCS */</div><div class='del'>-#define IXGBE_ADVTXD_DCMD_RDMA  0x04000000 /* RDMA */</div><div class='ctx'> #define IXGBE_ADVTXD_DCMD_RS    IXGBE_TXD_CMD_RS   /* Report Status */</div><div class='del'>-#define IXGBE_ADVTXD_DCMD_DDTYP_ISCSI 0x10000000     /* DDP hdr type or iSCSI */</div><div class='add'>+#define IXGBE_ADVTXD_DCMD_DDTYP_ISCSI 0x10000000    /* DDP hdr type or iSCSI */</div><div class='ctx'> #define IXGBE_ADVTXD_DCMD_DEXT  IXGBE_TXD_CMD_DEXT /* Desc ext (1=Adv) */</div><div class='ctx'> #define IXGBE_ADVTXD_DCMD_VLE   IXGBE_TXD_CMD_VLE  /* VLAN pkt enable */</div><div class='ctx'> #define IXGBE_ADVTXD_DCMD_TSE   0x80000000 /* TCP Seg enable */</div><div class='ctx'> #define IXGBE_ADVTXD_STAT_DD    IXGBE_TXD_STAT_DD  /* Descriptor Done */</div><div class='del'>-#define IXGBE_ADVTXD_STAT_SN_CRC      0x00000002 /* NXTSEQ/SEED present in WB */</div><div class='add'>+#define IXGBE_ADVTXD_STAT_SN_CRC      0x00000002 /* NXTSEQ/SEED pres in WB */</div><div class='ctx'> #define IXGBE_ADVTXD_STAT_RSV   0x0000000C /* STA Reserved */</div><div class='ctx'> #define IXGBE_ADVTXD_IDX_SHIFT  4 /* Adv desc Index shift */</div><div class='add'>+#define IXGBE_ADVTXD_CC         0x00000080 /* Check Context */</div><div class='ctx'> #define IXGBE_ADVTXD_POPTS_SHIFT      8  /* Adv desc POPTS shift */</div><div class='ctx'> #define IXGBE_ADVTXD_POPTS_IXSM (IXGBE_TXD_POPTS_IXSM &lt;&lt; \</div><div class='del'>-				IXGBE_ADVTXD_POPTS_SHIFT)</div><div class='add'>+                                 IXGBE_ADVTXD_POPTS_SHIFT)</div><div class='ctx'> #define IXGBE_ADVTXD_POPTS_TXSM (IXGBE_TXD_POPTS_TXSM &lt;&lt; \</div><div class='del'>-				IXGBE_ADVTXD_POPTS_SHIFT)</div><div class='del'>-#define IXGBE_ADVTXD_POPTS_EOM  0x00000400 /* Enable L bit-RDMA DDP hdr */</div><div class='del'>-#define IXGBE_ADVTXD_POPTS_ISCO_1ST   0x00000000 /* 1st TSO of iSCSI PDU */</div><div class='del'>-#define IXGBE_ADVTXD_POPTS_ISCO_MDL   0x00000800 /* Middle TSO of iSCSI PDU */</div><div class='del'>-#define IXGBE_ADVTXD_POPTS_ISCO_LAST  0x00001000 /* Last TSO of iSCSI PDU */</div><div class='del'>-#define IXGBE_ADVTXD_POPTS_ISCO_FULL 0x00001800 /* 1st&amp;Last TSO-full iSCSI PDU*/</div><div class='del'>-#define IXGBE_ADVTXD_POPTS_RSV  0x00002000 /* POPTS Reserved */</div><div class='del'>-#define IXGBE_ADVTXD_PAYLEN_SHIFT  14 /* Adv desc PAYLEN shift */</div><div class='del'>-#define IXGBE_ADVTXD_MACLEN_SHIFT  9  /* Adv ctxt desc mac len shift */</div><div class='del'>-#define IXGBE_ADVTXD_VLAN_SHIFT    16  /* Adv ctxt vlan tag shift */</div><div class='del'>-#define IXGBE_ADVTXD_TUCMD_IPV4    0x00000400  /* IP Packet Type: 1=IPv4 */</div><div class='del'>-#define IXGBE_ADVTXD_TUCMD_IPV6    0x00000000  /* IP Packet Type: 0=IPv6 */</div><div class='del'>-#define IXGBE_ADVTXD_TUCMD_L4T_UDP 0x00000000  /* L4 Packet TYPE of UDP */</div><div class='del'>-#define IXGBE_ADVTXD_TUCMD_L4T_TCP 0x00000800  /* L4 Packet TYPE of TCP */</div><div class='del'>-#define IXGBE_ADVTXD_TUCMD_MKRREQ  0x00002000 /* Req requires Markers and CRC */</div><div class='del'>-#define IXGBE_ADVTXD_L4LEN_SHIFT   8  /* Adv ctxt L4LEN shift */</div><div class='del'>-#define IXGBE_ADVTXD_MSS_SHIFT     16  /* Adv ctxt MSS shift */</div><div class='del'>-</div><div class='add'>+                                 IXGBE_ADVTXD_POPTS_SHIFT)</div><div class='add'>+#define IXGBE_ADVTXD_POPTS_ISCO_1ST  0x00000000 /* 1st TSO of iSCSI PDU */</div><div class='add'>+#define IXGBE_ADVTXD_POPTS_ISCO_MDL  0x00000800 /* Middle TSO of iSCSI PDU */</div><div class='add'>+#define IXGBE_ADVTXD_POPTS_ISCO_LAST 0x00001000 /* Last TSO of iSCSI PDU */</div><div class='add'>+#define IXGBE_ADVTXD_POPTS_ISCO_FULL 0x00001800 /* 1st&amp;Last TSO-full iSCSI PDU */</div><div class='add'>+#define IXGBE_ADVTXD_POPTS_RSV       0x00002000 /* POPTS Reserved */</div><div class='add'>+#define IXGBE_ADVTXD_PAYLEN_SHIFT    14 /* Adv desc PAYLEN shift */</div><div class='add'>+#define IXGBE_ADVTXD_MACLEN_SHIFT    9  /* Adv ctxt desc mac len shift */</div><div class='add'>+#define IXGBE_ADVTXD_VLAN_SHIFT      16  /* Adv ctxt vlan tag shift */</div><div class='add'>+#define IXGBE_ADVTXD_TUCMD_IPV4      0x00000400  /* IP Packet Type: 1=IPv4 */</div><div class='add'>+#define IXGBE_ADVTXD_TUCMD_IPV6      0x00000000  /* IP Packet Type: 0=IPv6 */</div><div class='add'>+#define IXGBE_ADVTXD_TUCMD_L4T_UDP   0x00000000  /* L4 Packet TYPE of UDP */</div><div class='add'>+#define IXGBE_ADVTXD_TUCMD_L4T_TCP   0x00000800  /* L4 Packet TYPE of TCP */</div><div class='add'>+#define IXGBE_ADVTXD_TUCMD_L4T_SCTP  0x00001000  /* L4 Packet TYPE of SCTP */</div><div class='add'>+#define IXGBE_ADVTXD_TUCMD_MKRREQ    0x00002000 /*Req requires Markers and CRC*/</div><div class='add'>+#define IXGBE_ADVTXD_L4LEN_SHIFT     8  /* Adv ctxt L4LEN shift */</div><div class='add'>+#define IXGBE_ADVTXD_MSS_SHIFT       16  /* Adv ctxt MSS shift */</div><div class='add'>+</div><div class='add'>+/* Autonegotiation advertised speeds */</div><div class='add'>+typedef u32 ixgbe_autoneg_advertised;</div><div class='ctx'> /* Link speed */</div><div class='add'>+typedef u32 ixgbe_link_speed;</div><div class='ctx'> #define IXGBE_LINK_SPEED_UNKNOWN   0</div><div class='ctx'> #define IXGBE_LINK_SPEED_100_FULL  0x0008</div><div class='ctx'> #define IXGBE_LINK_SPEED_1GB_FULL  0x0020</div><div class='ctx'> #define IXGBE_LINK_SPEED_10GB_FULL 0x0080</div><div class='add'>+#define IXGBE_LINK_SPEED_82598_AUTONEG (IXGBE_LINK_SPEED_1GB_FULL | \</div><div class='add'>+                                        IXGBE_LINK_SPEED_10GB_FULL)</div><div class='add'>+</div><div class='add'>+/* Physical layer type */</div><div class='add'>+typedef u32 ixgbe_physical_layer;</div><div class='add'>+#define IXGBE_PHYSICAL_LAYER_UNKNOWN      0</div><div class='add'>+#define IXGBE_PHYSICAL_LAYER_10GBASE_T    0x0001</div><div class='add'>+#define IXGBE_PHYSICAL_LAYER_1000BASE_T   0x0002</div><div class='add'>+#define IXGBE_PHYSICAL_LAYER_100BASE_T    0x0004</div><div class='add'>+#define IXGBE_PHYSICAL_LAYER_SFP_PLUS_CU  0x0008</div><div class='add'>+#define IXGBE_PHYSICAL_LAYER_10GBASE_LR   0x0010</div><div class='add'>+#define IXGBE_PHYSICAL_LAYER_10GBASE_LRM  0x0020</div><div class='add'>+#define IXGBE_PHYSICAL_LAYER_10GBASE_SR   0x0040</div><div class='add'>+#define IXGBE_PHYSICAL_LAYER_10GBASE_KX4  0x0080</div><div class='add'>+#define IXGBE_PHYSICAL_LAYER_10GBASE_CX4  0x0100</div><div class='add'>+#define IXGBE_PHYSICAL_LAYER_1000BASE_KX  0x0200</div><div class='add'>+#define IXGBE_PHYSICAL_LAYER_1000BASE_BX  0x0400</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> enum ixgbe_eeprom_type {</div><div class='hunk'>@@ -1141,16 +1202,38 @@ enum ixgbe_mac_type {</div><div class='ctx'> </div><div class='ctx'> enum ixgbe_phy_type {</div><div class='ctx'> 	ixgbe_phy_unknown = 0,</div><div class='del'>-	ixgbe_phy_tn,</div><div class='ctx'> 	ixgbe_phy_qt,</div><div class='del'>-	ixgbe_phy_xaui</div><div class='add'>+	ixgbe_phy_xaui,</div><div class='add'>+	ixgbe_phy_tw_tyco,</div><div class='add'>+	ixgbe_phy_tw_unknown,</div><div class='add'>+	ixgbe_phy_sfp_avago,</div><div class='add'>+	ixgbe_phy_sfp_ftl,</div><div class='add'>+	ixgbe_phy_sfp_unknown,</div><div class='add'>+	ixgbe_phy_generic</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * SFP+ module type IDs:</div><div class='add'>+ *</div><div class='add'>+ * ID	Module Type</div><div class='add'>+ * =============</div><div class='add'>+ * 0	SFP_DA_CU</div><div class='add'>+ * 1	SFP_SR</div><div class='add'>+ * 2	SFP_LR</div><div class='add'>+ */</div><div class='add'>+enum ixgbe_sfp_type {</div><div class='add'>+	ixgbe_sfp_type_da_cu = 0,</div><div class='add'>+	ixgbe_sfp_type_sr = 1,</div><div class='add'>+	ixgbe_sfp_type_lr = 2,</div><div class='add'>+	ixgbe_sfp_type_unknown = 0xFFFF</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum ixgbe_media_type {</div><div class='ctx'> 	ixgbe_media_type_unknown = 0,</div><div class='ctx'> 	ixgbe_media_type_fiber,</div><div class='ctx'> 	ixgbe_media_type_copper,</div><div class='del'>-	ixgbe_media_type_backplane</div><div class='add'>+	ixgbe_media_type_backplane,</div><div class='add'>+	ixgbe_media_type_virtual</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Flow Control Settings */</div><div class='hunk'>@@ -1167,6 +1250,8 @@ struct ixgbe_addr_filter_info {</div><div class='ctx'> 	u32 rar_used_count;</div><div class='ctx'> 	u32 mc_addr_in_rar_count;</div><div class='ctx'> 	u32 mta_in_use;</div><div class='add'>+	u32 overflow_promisc;</div><div class='add'>+	bool user_set_promisc;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Flow control parameters */</div><div class='hunk'>@@ -1242,57 +1327,118 @@ struct ixgbe_hw_stats {</div><div class='ctx'> /* forward declaration */</div><div class='ctx'> struct ixgbe_hw;</div><div class='ctx'> </div><div class='add'>+/* iterator type for walking multicast address lists */</div><div class='add'>+typedef u8* (*ixgbe_mc_addr_itr) (struct ixgbe_hw *hw, u8 **mc_addr_ptr,</div><div class='add'>+                                  u32 *vmdq);</div><div class='add'>+</div><div class='add'>+/* Function pointer table */</div><div class='add'>+struct ixgbe_eeprom_operations {</div><div class='add'>+	s32 (*init_params)(struct ixgbe_hw *);</div><div class='add'>+	s32 (*read)(struct ixgbe_hw *, u16, u16 *);</div><div class='add'>+	s32 (*write)(struct ixgbe_hw *, u16, u16);</div><div class='add'>+	s32 (*validate_checksum)(struct ixgbe_hw *, u16 *);</div><div class='add'>+	s32 (*update_checksum)(struct ixgbe_hw *);</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct ixgbe_mac_operations {</div><div class='del'>-	s32 (*reset)(struct ixgbe_hw *);</div><div class='add'>+	s32 (*init_hw)(struct ixgbe_hw *);</div><div class='add'>+	s32 (*reset_hw)(struct ixgbe_hw *);</div><div class='add'>+	s32 (*start_hw)(struct ixgbe_hw *);</div><div class='add'>+	s32 (*clear_hw_cntrs)(struct ixgbe_hw *);</div><div class='ctx'> 	enum ixgbe_media_type (*get_media_type)(struct ixgbe_hw *);</div><div class='add'>+	s32 (*get_supported_physical_layer)(struct ixgbe_hw *);</div><div class='add'>+	s32 (*get_mac_addr)(struct ixgbe_hw *, u8 *);</div><div class='add'>+	s32 (*stop_adapter)(struct ixgbe_hw *);</div><div class='add'>+	s32 (*get_bus_info)(struct ixgbe_hw *);</div><div class='add'>+	s32 (*read_analog_reg8)(struct ixgbe_hw*, u32, u8*);</div><div class='add'>+	s32 (*write_analog_reg8)(struct ixgbe_hw*, u32, u8);</div><div class='add'>+</div><div class='add'>+	/* Link */</div><div class='ctx'> 	s32 (*setup_link)(struct ixgbe_hw *);</div><div class='del'>-	s32 (*check_link)(struct ixgbe_hw *, u32 *, bool *);</div><div class='del'>-	s32 (*setup_link_speed)(struct ixgbe_hw *, u32, bool, bool);</div><div class='del'>-	s32 (*get_link_settings)(struct ixgbe_hw *, u32 *, bool *);</div><div class='add'>+	s32 (*setup_link_speed)(struct ixgbe_hw *, ixgbe_link_speed, bool,</div><div class='add'>+	                        bool);</div><div class='add'>+	s32 (*check_link)(struct ixgbe_hw *, ixgbe_link_speed *, bool *, bool);</div><div class='add'>+	s32 (*get_link_capabilities)(struct ixgbe_hw *, ixgbe_link_speed *,</div><div class='add'>+	                             bool *);</div><div class='add'>+</div><div class='add'>+	/* LED */</div><div class='add'>+	s32 (*led_on)(struct ixgbe_hw *, u32);</div><div class='add'>+	s32 (*led_off)(struct ixgbe_hw *, u32);</div><div class='add'>+	s32 (*blink_led_start)(struct ixgbe_hw *, u32);</div><div class='add'>+	s32 (*blink_led_stop)(struct ixgbe_hw *, u32);</div><div class='add'>+</div><div class='add'>+	/* RAR, Multicast, VLAN */</div><div class='add'>+	s32 (*set_rar)(struct ixgbe_hw *, u32, u8 *, u32, u32);</div><div class='add'>+	s32 (*clear_rar)(struct ixgbe_hw *, u32);</div><div class='add'>+	s32 (*set_vmdq)(struct ixgbe_hw *, u32, u32);</div><div class='add'>+	s32 (*clear_vmdq)(struct ixgbe_hw *, u32, u32);</div><div class='add'>+	s32 (*init_rx_addrs)(struct ixgbe_hw *);</div><div class='add'>+	s32 (*update_uc_addr_list)(struct ixgbe_hw *, u8 *, u32,</div><div class='add'>+	                           ixgbe_mc_addr_itr);</div><div class='add'>+	s32 (*update_mc_addr_list)(struct ixgbe_hw *, u8 *, u32,</div><div class='add'>+	                           ixgbe_mc_addr_itr);</div><div class='add'>+	s32 (*enable_mc)(struct ixgbe_hw *);</div><div class='add'>+	s32 (*disable_mc)(struct ixgbe_hw *);</div><div class='add'>+	s32 (*clear_vfta)(struct ixgbe_hw *);</div><div class='add'>+	s32 (*set_vfta)(struct ixgbe_hw *, u32, u32, bool);</div><div class='add'>+	s32 (*init_uta_tables)(struct ixgbe_hw *);</div><div class='add'>+</div><div class='add'>+	/* Flow Control */</div><div class='add'>+	s32 (*setup_fc)(struct ixgbe_hw *, s32);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ixgbe_phy_operations {</div><div class='add'>+	s32 (*identify)(struct ixgbe_hw *);</div><div class='add'>+	s32 (*identify_sfp)(struct ixgbe_hw *);</div><div class='add'>+	s32 (*reset)(struct ixgbe_hw *);</div><div class='add'>+	s32 (*read_reg)(struct ixgbe_hw *, u32, u32, u16 *);</div><div class='add'>+	s32 (*write_reg)(struct ixgbe_hw *, u32, u32, u16);</div><div class='ctx'> 	s32 (*setup_link)(struct ixgbe_hw *);</div><div class='del'>-	s32 (*check_link)(struct ixgbe_hw *, u32 *, bool *);</div><div class='del'>-	s32 (*setup_link_speed)(struct ixgbe_hw *, u32, bool, bool);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct ixgbe_mac_info {</div><div class='del'>-	struct ixgbe_mac_operations	ops;</div><div class='del'>-	enum ixgbe_mac_type		type;</div><div class='del'>-	u8				addr[IXGBE_ETH_LENGTH_OF_ADDRESS];</div><div class='del'>-	u8				perm_addr[IXGBE_ETH_LENGTH_OF_ADDRESS];</div><div class='del'>-	s32				mc_filter_type;</div><div class='del'>-	u32				num_rx_queues;</div><div class='del'>-	u32				num_tx_queues;</div><div class='del'>-	u32				num_rx_addrs;</div><div class='del'>-	u32				link_attach_type;</div><div class='del'>-	u32				link_mode_select;</div><div class='del'>-	bool				link_settings_loaded;</div><div class='add'>+	s32 (*setup_link_speed)(struct ixgbe_hw *, ixgbe_link_speed, bool,</div><div class='add'>+	                        bool);</div><div class='add'>+	s32 (*read_i2c_byte)(struct ixgbe_hw *, u8, u8, u8 *);</div><div class='add'>+	s32 (*write_i2c_byte)(struct ixgbe_hw *, u8, u8, u8);</div><div class='add'>+	s32 (*read_i2c_eeprom)(struct ixgbe_hw *, u8 , u8 *);</div><div class='add'>+	s32 (*write_i2c_eeprom)(struct ixgbe_hw *, u8, u8);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ixgbe_eeprom_info {</div><div class='del'>-	enum ixgbe_eeprom_type		type;</div><div class='del'>-	u16				word_size;</div><div class='del'>-	u16				address_bits;</div><div class='add'>+	struct ixgbe_eeprom_operations  ops;</div><div class='add'>+	enum ixgbe_eeprom_type          type;</div><div class='add'>+	u32				semaphore_delay;</div><div class='add'>+	u16                             word_size;</div><div class='add'>+	u16                             address_bits;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct ixgbe_phy_info {</div><div class='del'>-	struct ixgbe_phy_operations	ops;</div><div class='del'>-</div><div class='del'>-	enum ixgbe_phy_type		type;</div><div class='del'>-	u32				addr;</div><div class='del'>-	u32				id;</div><div class='del'>-	u32				revision;</div><div class='del'>-	enum ixgbe_media_type		media_type;</div><div class='del'>-	u32				autoneg_advertised;</div><div class='del'>-	bool				autoneg_wait_to_complete;</div><div class='add'>+struct ixgbe_mac_info {</div><div class='add'>+	struct ixgbe_mac_operations     ops;</div><div class='add'>+	enum ixgbe_mac_type             type;</div><div class='add'>+	u8                              addr[IXGBE_ETH_LENGTH_OF_ADDRESS];</div><div class='add'>+	u8                              perm_addr[IXGBE_ETH_LENGTH_OF_ADDRESS];</div><div class='add'>+	s32                             mc_filter_type;</div><div class='add'>+	u32                             mcft_size;</div><div class='add'>+	u32                             vft_size;</div><div class='add'>+	u32                             num_rar_entries;</div><div class='add'>+	u32                             max_tx_queues;</div><div class='add'>+	u32                             max_rx_queues;</div><div class='add'>+	u32                             link_attach_type;</div><div class='add'>+	u32                             link_mode_select;</div><div class='add'>+	bool                            link_settings_loaded;</div><div class='add'>+	bool                            autoneg;</div><div class='add'>+	bool                            autoneg_failed;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct ixgbe_info {</div><div class='del'>-	enum ixgbe_mac_type		mac;</div><div class='del'>-	s32 				(*get_invariants)(struct ixgbe_hw *);</div><div class='del'>-	struct ixgbe_mac_operations	*mac_ops;</div><div class='add'>+struct ixgbe_phy_info {</div><div class='add'>+	struct ixgbe_phy_operations     ops;</div><div class='add'>+	enum ixgbe_phy_type             type;</div><div class='add'>+	u32                             addr;</div><div class='add'>+	u32                             id;</div><div class='add'>+	enum ixgbe_sfp_type             sfp_type;</div><div class='add'>+	u32                             revision;</div><div class='add'>+	enum ixgbe_media_type           media_type;</div><div class='add'>+	bool                            reset_disable;</div><div class='add'>+	ixgbe_autoneg_advertised        autoneg_advertised;</div><div class='add'>+	bool                            autoneg_wait_to_complete;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ixgbe_hw {</div><div class='hunk'>@@ -1311,6 +1457,15 @@ struct ixgbe_hw {</div><div class='ctx'> 	bool				adapter_stopped;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct ixgbe_info {</div><div class='add'>+	enum ixgbe_mac_type		mac;</div><div class='add'>+	s32 				(*get_invariants)(struct ixgbe_hw *);</div><div class='add'>+	struct ixgbe_mac_operations	*mac_ops;</div><div class='add'>+	struct ixgbe_eeprom_operations	*eeprom_ops;</div><div class='add'>+	struct ixgbe_phy_operations	*phy_ops;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> /* Error Codes */</div><div class='ctx'> #define IXGBE_ERR_EEPROM                        -1</div><div class='ctx'> #define IXGBE_ERR_EEPROM_CHECKSUM               -2</div><div class='hunk'>@@ -1329,6 +1484,8 @@ struct ixgbe_hw {</div><div class='ctx'> #define IXGBE_ERR_RESET_FAILED                  -15</div><div class='ctx'> #define IXGBE_ERR_SWFW_SYNC                     -16</div><div class='ctx'> #define IXGBE_ERR_PHY_ADDR_INVALID              -17</div><div class='add'>+#define IXGBE_ERR_I2C                           -18</div><div class='add'>+#define IXGBE_ERR_SFP_NOT_SUPPORTED             -19</div><div class='ctx'> #define IXGBE_NOT_IMPLEMENTED                   0x7FFFFFFF</div><div class='ctx'> </div><div class='ctx'> #endif /* _IXGBE_TYPE_H_ */</div><div class='head'>diff --git a/drivers/net/jme.c b/drivers/net/jme.c<br/>new file mode 100644<br/>index 000000000000..81c6cdc3851f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/jme.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/jme.c</a></div><div class='hunk'>@@ -0,0 +1,3038 @@</div><div class='add'>+/*</div><div class='add'>+ * JMicron JMC2x0 series PCIe Ethernet Linux Device Driver</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2008 JMicron Technology Corporation</div><div class='add'>+ * http://www.jmicron.com/</div><div class='add'>+ *</div><div class='add'>+ * Author: Guo-Fu Tseng &lt;cooldavid@cooldavid.org&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='add'>+#include &lt;linux/mii.h&gt;</div><div class='add'>+#include &lt;linux/crc32.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/in.h&gt;</div><div class='add'>+#include &lt;linux/ip.h&gt;</div><div class='add'>+#include &lt;linux/ipv6.h&gt;</div><div class='add'>+#include &lt;linux/tcp.h&gt;</div><div class='add'>+#include &lt;linux/udp.h&gt;</div><div class='add'>+#include &lt;linux/if_vlan.h&gt;</div><div class='add'>+#include &lt;net/ip6_checksum.h&gt;</div><div class='add'>+#include "jme.h"</div><div class='add'>+</div><div class='add'>+static int force_pseudohp = -1;</div><div class='add'>+static int no_pseudohp = -1;</div><div class='add'>+static int no_extplug = -1;</div><div class='add'>+module_param(force_pseudohp, int, 0);</div><div class='add'>+MODULE_PARM_DESC(force_pseudohp,</div><div class='add'>+	"Enable pseudo hot-plug feature manually by driver instead of BIOS.");</div><div class='add'>+module_param(no_pseudohp, int, 0);</div><div class='add'>+MODULE_PARM_DESC(no_pseudohp, "Disable pseudo hot-plug feature.");</div><div class='add'>+module_param(no_extplug, int, 0);</div><div class='add'>+MODULE_PARM_DESC(no_extplug,</div><div class='add'>+	"Do not use external plug signal for pseudo hot-plug.");</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+jme_mdio_read(struct net_device *netdev, int phy, int reg)</div><div class='add'>+{</div><div class='add'>+	struct jme_adapter *jme = netdev_priv(netdev);</div><div class='add'>+	int i, val, again = (reg == MII_BMSR) ? 1 : 0;</div><div class='add'>+</div><div class='add'>+read_again:</div><div class='add'>+	jwrite32(jme, JME_SMI, SMI_OP_REQ |</div><div class='add'>+				smi_phy_addr(phy) |</div><div class='add'>+				smi_reg_addr(reg));</div><div class='add'>+</div><div class='add'>+	wmb();</div><div class='add'>+	for (i = JME_PHY_TIMEOUT * 50 ; i &gt; 0 ; --i) {</div><div class='add'>+		udelay(20);</div><div class='add'>+		val = jread32(jme, JME_SMI);</div><div class='add'>+		if ((val &amp; SMI_OP_REQ) == 0)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (i == 0) {</div><div class='add'>+		jeprintk(jme-&gt;pdev, "phy(%d) read timeout : %d\n", phy, reg);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (again--)</div><div class='add'>+		goto read_again;</div><div class='add'>+</div><div class='add'>+	return (val &amp; SMI_DATA_MASK) &gt;&gt; SMI_DATA_SHIFT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+jme_mdio_write(struct net_device *netdev,</div><div class='add'>+				int phy, int reg, int val)</div><div class='add'>+{</div><div class='add'>+	struct jme_adapter *jme = netdev_priv(netdev);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	jwrite32(jme, JME_SMI, SMI_OP_WRITE | SMI_OP_REQ |</div><div class='add'>+		((val &lt;&lt; SMI_DATA_SHIFT) &amp; SMI_DATA_MASK) |</div><div class='add'>+		smi_phy_addr(phy) | smi_reg_addr(reg));</div><div class='add'>+</div><div class='add'>+	wmb();</div><div class='add'>+	for (i = JME_PHY_TIMEOUT * 50 ; i &gt; 0 ; --i) {</div><div class='add'>+		udelay(20);</div><div class='add'>+		if ((jread32(jme, JME_SMI) &amp; SMI_OP_REQ) == 0)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (i == 0)</div><div class='add'>+		jeprintk(jme-&gt;pdev, "phy(%d) write timeout : %d\n", phy, reg);</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+jme_reset_phy_processor(struct jme_adapter *jme)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	jme_mdio_write(jme-&gt;dev,</div><div class='add'>+			jme-&gt;mii_if.phy_id,</div><div class='add'>+			MII_ADVERTISE, ADVERTISE_ALL |</div><div class='add'>+			ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM);</div><div class='add'>+</div><div class='add'>+	if (jme-&gt;pdev-&gt;device == PCI_DEVICE_ID_JMICRON_JMC250)</div><div class='add'>+		jme_mdio_write(jme-&gt;dev,</div><div class='add'>+				jme-&gt;mii_if.phy_id,</div><div class='add'>+				MII_CTRL1000,</div><div class='add'>+				ADVERTISE_1000FULL | ADVERTISE_1000HALF);</div><div class='add'>+</div><div class='add'>+	val = jme_mdio_read(jme-&gt;dev,</div><div class='add'>+				jme-&gt;mii_if.phy_id,</div><div class='add'>+				MII_BMCR);</div><div class='add'>+</div><div class='add'>+	jme_mdio_write(jme-&gt;dev,</div><div class='add'>+			jme-&gt;mii_if.phy_id,</div><div class='add'>+			MII_BMCR, val | BMCR_RESET);</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+jme_setup_wakeup_frame(struct jme_adapter *jme,</div><div class='add'>+		u32 *mask, u32 crc, int fnr)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Setup CRC pattern</div><div class='add'>+	 */</div><div class='add'>+	jwrite32(jme, JME_WFOI, WFOI_CRC_SEL | (fnr &amp; WFOI_FRAME_SEL));</div><div class='add'>+	wmb();</div><div class='add'>+	jwrite32(jme, JME_WFODP, crc);</div><div class='add'>+	wmb();</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Setup Mask</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0 ; i &lt; WAKEUP_FRAME_MASK_DWNR ; ++i) {</div><div class='add'>+		jwrite32(jme, JME_WFOI,</div><div class='add'>+				((i &lt;&lt; WFOI_MASK_SHIFT) &amp; WFOI_MASK_SEL) |</div><div class='add'>+				(fnr &amp; WFOI_FRAME_SEL));</div><div class='add'>+		wmb();</div><div class='add'>+		jwrite32(jme, JME_WFODP, mask[i]);</div><div class='add'>+		wmb();</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+jme_reset_mac_processor(struct jme_adapter *jme)</div><div class='add'>+{</div><div class='add'>+	u32 mask[WAKEUP_FRAME_MASK_DWNR] = {0, 0, 0, 0};</div><div class='add'>+	u32 crc = 0xCDCDCDCD;</div><div class='add'>+	u32 gpreg0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	jwrite32(jme, JME_GHC, jme-&gt;reg_ghc | GHC_SWRST);</div><div class='add'>+	udelay(2);</div><div class='add'>+	jwrite32(jme, JME_GHC, jme-&gt;reg_ghc);</div><div class='add'>+</div><div class='add'>+	jwrite32(jme, JME_RXDBA_LO, 0x00000000);</div><div class='add'>+	jwrite32(jme, JME_RXDBA_HI, 0x00000000);</div><div class='add'>+	jwrite32(jme, JME_RXQDC, 0x00000000);</div><div class='add'>+	jwrite32(jme, JME_RXNDA, 0x00000000);</div><div class='add'>+	jwrite32(jme, JME_TXDBA_LO, 0x00000000);</div><div class='add'>+	jwrite32(jme, JME_TXDBA_HI, 0x00000000);</div><div class='add'>+	jwrite32(jme, JME_TXQDC, 0x00000000);</div><div class='add'>+	jwrite32(jme, JME_TXNDA, 0x00000000);</div><div class='add'>+</div><div class='add'>+	jwrite32(jme, JME_RXMCHT_LO, 0x00000000);</div><div class='add'>+	jwrite32(jme, JME_RXMCHT_HI, 0x00000000);</div><div class='add'>+	for (i = 0 ; i &lt; WAKEUP_FRAME_NR ; ++i)</div><div class='add'>+		jme_setup_wakeup_frame(jme, mask, crc, i);</div><div class='add'>+	if (jme-&gt;fpgaver)</div><div class='add'>+		gpreg0 = GPREG0_DEFAULT | GPREG0_LNKINTPOLL;</div><div class='add'>+	else</div><div class='add'>+		gpreg0 = GPREG0_DEFAULT;</div><div class='add'>+	jwrite32(jme, JME_GPREG0, gpreg0);</div><div class='add'>+	jwrite32(jme, JME_GPREG1, GPREG1_DEFAULT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+jme_reset_ghc_speed(struct jme_adapter *jme)</div><div class='add'>+{</div><div class='add'>+	jme-&gt;reg_ghc &amp;= ~(GHC_SPEED_1000M | GHC_DPX);</div><div class='add'>+	jwrite32(jme, JME_GHC, jme-&gt;reg_ghc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+jme_clear_pm(struct jme_adapter *jme)</div><div class='add'>+{</div><div class='add'>+	jwrite32(jme, JME_PMCS, 0xFFFF0000 | jme-&gt;reg_pmcs);</div><div class='add'>+	pci_set_power_state(jme-&gt;pdev, PCI_D0);</div><div class='add'>+	pci_enable_wake(jme-&gt;pdev, PCI_D0, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+jme_reload_eeprom(struct jme_adapter *jme)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	val = jread32(jme, JME_SMBCSR);</div><div class='add'>+</div><div class='add'>+	if (val &amp; SMBCSR_EEPROMD) {</div><div class='add'>+		val |= SMBCSR_CNACK;</div><div class='add'>+		jwrite32(jme, JME_SMBCSR, val);</div><div class='add'>+		val |= SMBCSR_RELOAD;</div><div class='add'>+		jwrite32(jme, JME_SMBCSR, val);</div><div class='add'>+		mdelay(12);</div><div class='add'>+</div><div class='add'>+		for (i = JME_EEPROM_RELOAD_TIMEOUT; i &gt; 0; --i) {</div><div class='add'>+			mdelay(1);</div><div class='add'>+			if ((jread32(jme, JME_SMBCSR) &amp; SMBCSR_RELOAD) == 0)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (i == 0) {</div><div class='add'>+			jeprintk(jme-&gt;pdev, "eeprom reload timeout\n");</div><div class='add'>+			return -EIO;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+jme_load_macaddr(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct jme_adapter *jme = netdev_priv(netdev);</div><div class='add'>+	unsigned char macaddr[6];</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;jme-&gt;macaddr_lock);</div><div class='add'>+	val = jread32(jme, JME_RXUMA_LO);</div><div class='add'>+	macaddr[0] = (val &gt;&gt;  0) &amp; 0xFF;</div><div class='add'>+	macaddr[1] = (val &gt;&gt;  8) &amp; 0xFF;</div><div class='add'>+	macaddr[2] = (val &gt;&gt; 16) &amp; 0xFF;</div><div class='add'>+	macaddr[3] = (val &gt;&gt; 24) &amp; 0xFF;</div><div class='add'>+	val = jread32(jme, JME_RXUMA_HI);</div><div class='add'>+	macaddr[4] = (val &gt;&gt;  0) &amp; 0xFF;</div><div class='add'>+	macaddr[5] = (val &gt;&gt;  8) &amp; 0xFF;</div><div class='add'>+	memcpy(netdev-&gt;dev_addr, macaddr, 6);</div><div class='add'>+	spin_unlock_bh(&amp;jme-&gt;macaddr_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+jme_set_rx_pcc(struct jme_adapter *jme, int p)</div><div class='add'>+{</div><div class='add'>+	switch (p) {</div><div class='add'>+	case PCC_OFF:</div><div class='add'>+		jwrite32(jme, JME_PCCRX0,</div><div class='add'>+			((PCC_OFF_TO &lt;&lt; PCCRXTO_SHIFT) &amp; PCCRXTO_MASK) |</div><div class='add'>+			((PCC_OFF_CNT &lt;&lt; PCCRX_SHIFT) &amp; PCCRX_MASK));</div><div class='add'>+		break;</div><div class='add'>+	case PCC_P1:</div><div class='add'>+		jwrite32(jme, JME_PCCRX0,</div><div class='add'>+			((PCC_P1_TO &lt;&lt; PCCRXTO_SHIFT) &amp; PCCRXTO_MASK) |</div><div class='add'>+			((PCC_P1_CNT &lt;&lt; PCCRX_SHIFT) &amp; PCCRX_MASK));</div><div class='add'>+		break;</div><div class='add'>+	case PCC_P2:</div><div class='add'>+		jwrite32(jme, JME_PCCRX0,</div><div class='add'>+			((PCC_P2_TO &lt;&lt; PCCRXTO_SHIFT) &amp; PCCRXTO_MASK) |</div><div class='add'>+			((PCC_P2_CNT &lt;&lt; PCCRX_SHIFT) &amp; PCCRX_MASK));</div><div class='add'>+		break;</div><div class='add'>+	case PCC_P3:</div><div class='add'>+		jwrite32(jme, JME_PCCRX0,</div><div class='add'>+			((PCC_P3_TO &lt;&lt; PCCRXTO_SHIFT) &amp; PCCRXTO_MASK) |</div><div class='add'>+			((PCC_P3_CNT &lt;&lt; PCCRX_SHIFT) &amp; PCCRX_MASK));</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	wmb();</div><div class='add'>+</div><div class='add'>+	if (!(test_bit(JME_FLAG_POLL, &amp;jme-&gt;flags)))</div><div class='add'>+		msg_rx_status(jme, "Switched to PCC_P%d\n", p);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+jme_start_irq(struct jme_adapter *jme)</div><div class='add'>+{</div><div class='add'>+	register struct dynpcc_info *dpi = &amp;(jme-&gt;dpi);</div><div class='add'>+</div><div class='add'>+	jme_set_rx_pcc(jme, PCC_P1);</div><div class='add'>+	dpi-&gt;cur		= PCC_P1;</div><div class='add'>+	dpi-&gt;attempt		= PCC_P1;</div><div class='add'>+	dpi-&gt;cnt		= 0;</div><div class='add'>+</div><div class='add'>+	jwrite32(jme, JME_PCCTX,</div><div class='add'>+			((PCC_TX_TO &lt;&lt; PCCTXTO_SHIFT) &amp; PCCTXTO_MASK) |</div><div class='add'>+			((PCC_TX_CNT &lt;&lt; PCCTX_SHIFT) &amp; PCCTX_MASK) |</div><div class='add'>+			PCCTXQ0_EN</div><div class='add'>+		);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Enable Interrupts</div><div class='add'>+	 */</div><div class='add'>+	jwrite32(jme, JME_IENS, INTR_ENABLE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+jme_stop_irq(struct jme_adapter *jme)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Disable Interrupts</div><div class='add'>+	 */</div><div class='add'>+	jwrite32f(jme, JME_IENC, INTR_ENABLE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+jme_enable_shadow(struct jme_adapter *jme)</div><div class='add'>+{</div><div class='add'>+	jwrite32(jme,</div><div class='add'>+		 JME_SHBA_LO,</div><div class='add'>+		 ((u32)jme-&gt;shadow_dma &amp; ~((u32)0x1F)) | SHBA_POSTEN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+jme_disable_shadow(struct jme_adapter *jme)</div><div class='add'>+{</div><div class='add'>+	jwrite32(jme, JME_SHBA_LO, 0x0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32</div><div class='add'>+jme_linkstat_from_phy(struct jme_adapter *jme)</div><div class='add'>+{</div><div class='add'>+	u32 phylink, bmsr;</div><div class='add'>+</div><div class='add'>+	phylink = jme_mdio_read(jme-&gt;dev, jme-&gt;mii_if.phy_id, 17);</div><div class='add'>+	bmsr = jme_mdio_read(jme-&gt;dev, jme-&gt;mii_if.phy_id, MII_BMSR);</div><div class='add'>+	if (bmsr &amp; BMSR_ANCOMP)</div><div class='add'>+		phylink |= PHY_LINK_AUTONEG_COMPLETE;</div><div class='add'>+</div><div class='add'>+	return phylink;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+jme_set_phyfifoa(struct jme_adapter *jme)</div><div class='add'>+{</div><div class='add'>+	jme_mdio_write(jme-&gt;dev, jme-&gt;mii_if.phy_id, 27, 0x0004);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+jme_set_phyfifob(struct jme_adapter *jme)</div><div class='add'>+{</div><div class='add'>+	jme_mdio_write(jme-&gt;dev, jme-&gt;mii_if.phy_id, 27, 0x0000);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+jme_check_link(struct net_device *netdev, int testonly)</div><div class='add'>+{</div><div class='add'>+	struct jme_adapter *jme = netdev_priv(netdev);</div><div class='add'>+	u32 phylink, ghc, cnt = JME_SPDRSV_TIMEOUT, bmcr, gpreg1;</div><div class='add'>+	char linkmsg[64];</div><div class='add'>+	int rc = 0;</div><div class='add'>+</div><div class='add'>+	linkmsg[0] = '\0';</div><div class='add'>+</div><div class='add'>+	if (jme-&gt;fpgaver)</div><div class='add'>+		phylink = jme_linkstat_from_phy(jme);</div><div class='add'>+	else</div><div class='add'>+		phylink = jread32(jme, JME_PHY_LINK);</div><div class='add'>+</div><div class='add'>+	if (phylink &amp; PHY_LINK_UP) {</div><div class='add'>+		if (!(phylink &amp; PHY_LINK_AUTONEG_COMPLETE)) {</div><div class='add'>+			/*</div><div class='add'>+			 * If we did not enable AN</div><div class='add'>+			 * Speed/Duplex Info should be obtained from SMI</div><div class='add'>+			 */</div><div class='add'>+			phylink = PHY_LINK_UP;</div><div class='add'>+</div><div class='add'>+			bmcr = jme_mdio_read(jme-&gt;dev,</div><div class='add'>+						jme-&gt;mii_if.phy_id,</div><div class='add'>+						MII_BMCR);</div><div class='add'>+</div><div class='add'>+			phylink |= ((bmcr &amp; BMCR_SPEED1000) &amp;&amp;</div><div class='add'>+					(bmcr &amp; BMCR_SPEED100) == 0) ?</div><div class='add'>+					PHY_LINK_SPEED_1000M :</div><div class='add'>+					(bmcr &amp; BMCR_SPEED100) ?</div><div class='add'>+					PHY_LINK_SPEED_100M :</div><div class='add'>+					PHY_LINK_SPEED_10M;</div><div class='add'>+</div><div class='add'>+			phylink |= (bmcr &amp; BMCR_FULLDPLX) ?</div><div class='add'>+					 PHY_LINK_DUPLEX : 0;</div><div class='add'>+</div><div class='add'>+			strcat(linkmsg, "Forced: ");</div><div class='add'>+		} else {</div><div class='add'>+			/*</div><div class='add'>+			 * Keep polling for speed/duplex resolve complete</div><div class='add'>+			 */</div><div class='add'>+			while (!(phylink &amp; PHY_LINK_SPEEDDPU_RESOLVED) &amp;&amp;</div><div class='add'>+				--cnt) {</div><div class='add'>+</div><div class='add'>+				udelay(1);</div><div class='add'>+</div><div class='add'>+				if (jme-&gt;fpgaver)</div><div class='add'>+					phylink = jme_linkstat_from_phy(jme);</div><div class='add'>+				else</div><div class='add'>+					phylink = jread32(jme, JME_PHY_LINK);</div><div class='add'>+			}</div><div class='add'>+			if (!cnt)</div><div class='add'>+				jeprintk(jme-&gt;pdev,</div><div class='add'>+					"Waiting speed resolve timeout.\n");</div><div class='add'>+</div><div class='add'>+			strcat(linkmsg, "ANed: ");</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (jme-&gt;phylink == phylink) {</div><div class='add'>+			rc = 1;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		if (testonly)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		jme-&gt;phylink = phylink;</div><div class='add'>+</div><div class='add'>+		ghc = jme-&gt;reg_ghc &amp; ~(GHC_SPEED_10M |</div><div class='add'>+					GHC_SPEED_100M |</div><div class='add'>+					GHC_SPEED_1000M |</div><div class='add'>+					GHC_DPX);</div><div class='add'>+		switch (phylink &amp; PHY_LINK_SPEED_MASK) {</div><div class='add'>+		case PHY_LINK_SPEED_10M:</div><div class='add'>+			ghc |= GHC_SPEED_10M;</div><div class='add'>+			strcat(linkmsg, "10 Mbps, ");</div><div class='add'>+			break;</div><div class='add'>+		case PHY_LINK_SPEED_100M:</div><div class='add'>+			ghc |= GHC_SPEED_100M;</div><div class='add'>+			strcat(linkmsg, "100 Mbps, ");</div><div class='add'>+			break;</div><div class='add'>+		case PHY_LINK_SPEED_1000M:</div><div class='add'>+			ghc |= GHC_SPEED_1000M;</div><div class='add'>+			strcat(linkmsg, "1000 Mbps, ");</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (phylink &amp; PHY_LINK_DUPLEX) {</div><div class='add'>+			jwrite32(jme, JME_TXMCS, TXMCS_DEFAULT);</div><div class='add'>+			ghc |= GHC_DPX;</div><div class='add'>+		} else {</div><div class='add'>+			jwrite32(jme, JME_TXMCS, TXMCS_DEFAULT |</div><div class='add'>+						TXMCS_BACKOFF |</div><div class='add'>+						TXMCS_CARRIERSENSE |</div><div class='add'>+						TXMCS_COLLISION);</div><div class='add'>+			jwrite32(jme, JME_TXTRHD, TXTRHD_TXPEN |</div><div class='add'>+				((0x2000 &lt;&lt; TXTRHD_TXP_SHIFT) &amp; TXTRHD_TXP) |</div><div class='add'>+				TXTRHD_TXREN |</div><div class='add'>+				((8 &lt;&lt; TXTRHD_TXRL_SHIFT) &amp; TXTRHD_TXRL));</div><div class='add'>+		}</div><div class='add'>+		strcat(linkmsg, (phylink &amp; PHY_LINK_DUPLEX) ?</div><div class='add'>+					"Full-Duplex, " :</div><div class='add'>+					"Half-Duplex, ");</div><div class='add'>+</div><div class='add'>+		if (phylink &amp; PHY_LINK_MDI_STAT)</div><div class='add'>+			strcat(linkmsg, "MDI-X");</div><div class='add'>+		else</div><div class='add'>+			strcat(linkmsg, "MDI");</div><div class='add'>+</div><div class='add'>+		gpreg1 = GPREG1_DEFAULT;</div><div class='add'>+		if (is_buggy250(jme-&gt;pdev-&gt;device, jme-&gt;chiprev)) {</div><div class='add'>+			if (!(phylink &amp; PHY_LINK_DUPLEX))</div><div class='add'>+				gpreg1 |= GPREG1_HALFMODEPATCH;</div><div class='add'>+			switch (phylink &amp; PHY_LINK_SPEED_MASK) {</div><div class='add'>+			case PHY_LINK_SPEED_10M:</div><div class='add'>+				jme_set_phyfifoa(jme);</div><div class='add'>+				gpreg1 |= GPREG1_RSSPATCH;</div><div class='add'>+				break;</div><div class='add'>+			case PHY_LINK_SPEED_100M:</div><div class='add'>+				jme_set_phyfifob(jme);</div><div class='add'>+				gpreg1 |= GPREG1_RSSPATCH;</div><div class='add'>+				break;</div><div class='add'>+			case PHY_LINK_SPEED_1000M:</div><div class='add'>+				jme_set_phyfifoa(jme);</div><div class='add'>+				break;</div><div class='add'>+			default:</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		jwrite32(jme, JME_GPREG1, gpreg1);</div><div class='add'>+</div><div class='add'>+		jme-&gt;reg_ghc = ghc;</div><div class='add'>+		jwrite32(jme, JME_GHC, ghc);</div><div class='add'>+</div><div class='add'>+		msg_link(jme, "Link is up at %s.\n", linkmsg);</div><div class='add'>+		netif_carrier_on(netdev);</div><div class='add'>+	} else {</div><div class='add'>+		if (testonly)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		msg_link(jme, "Link is down.\n");</div><div class='add'>+		jme-&gt;phylink = 0;</div><div class='add'>+		netif_carrier_off(netdev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+jme_setup_tx_resources(struct jme_adapter *jme)</div><div class='add'>+{</div><div class='add'>+	struct jme_ring *txring = &amp;(jme-&gt;txring[0]);</div><div class='add'>+</div><div class='add'>+	txring-&gt;alloc = dma_alloc_coherent(&amp;(jme-&gt;pdev-&gt;dev),</div><div class='add'>+				   TX_RING_ALLOC_SIZE(jme-&gt;tx_ring_size),</div><div class='add'>+				   &amp;(txring-&gt;dmaalloc),</div><div class='add'>+				   GFP_ATOMIC);</div><div class='add'>+</div><div class='add'>+	if (!txring-&gt;alloc) {</div><div class='add'>+		txring-&gt;desc = NULL;</div><div class='add'>+		txring-&gt;dmaalloc = 0;</div><div class='add'>+		txring-&gt;dma = 0;</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * 16 Bytes align</div><div class='add'>+	 */</div><div class='add'>+	txring-&gt;desc		= (void *)ALIGN((unsigned long)(txring-&gt;alloc),</div><div class='add'>+						RING_DESC_ALIGN);</div><div class='add'>+	txring-&gt;dma		= ALIGN(txring-&gt;dmaalloc, RING_DESC_ALIGN);</div><div class='add'>+	txring-&gt;next_to_use	= 0;</div><div class='add'>+	atomic_set(&amp;txring-&gt;next_to_clean, 0);</div><div class='add'>+	atomic_set(&amp;txring-&gt;nr_free, jme-&gt;tx_ring_size);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Initialize Transmit Descriptors</div><div class='add'>+	 */</div><div class='add'>+	memset(txring-&gt;alloc, 0, TX_RING_ALLOC_SIZE(jme-&gt;tx_ring_size));</div><div class='add'>+	memset(txring-&gt;bufinf, 0,</div><div class='add'>+		sizeof(struct jme_buffer_info) * jme-&gt;tx_ring_size);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+jme_free_tx_resources(struct jme_adapter *jme)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	struct jme_ring *txring = &amp;(jme-&gt;txring[0]);</div><div class='add'>+	struct jme_buffer_info *txbi = txring-&gt;bufinf;</div><div class='add'>+</div><div class='add'>+	if (txring-&gt;alloc) {</div><div class='add'>+		for (i = 0 ; i &lt; jme-&gt;tx_ring_size ; ++i) {</div><div class='add'>+			txbi = txring-&gt;bufinf + i;</div><div class='add'>+			if (txbi-&gt;skb) {</div><div class='add'>+				dev_kfree_skb(txbi-&gt;skb);</div><div class='add'>+				txbi-&gt;skb = NULL;</div><div class='add'>+			}</div><div class='add'>+			txbi-&gt;mapping		= 0;</div><div class='add'>+			txbi-&gt;len		= 0;</div><div class='add'>+			txbi-&gt;nr_desc		= 0;</div><div class='add'>+			txbi-&gt;start_xmit	= 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		dma_free_coherent(&amp;(jme-&gt;pdev-&gt;dev),</div><div class='add'>+				  TX_RING_ALLOC_SIZE(jme-&gt;tx_ring_size),</div><div class='add'>+				  txring-&gt;alloc,</div><div class='add'>+				  txring-&gt;dmaalloc);</div><div class='add'>+</div><div class='add'>+		txring-&gt;alloc		= NULL;</div><div class='add'>+		txring-&gt;desc		= NULL;</div><div class='add'>+		txring-&gt;dmaalloc	= 0;</div><div class='add'>+		txring-&gt;dma		= 0;</div><div class='add'>+	}</div><div class='add'>+	txring-&gt;next_to_use	= 0;</div><div class='add'>+	atomic_set(&amp;txring-&gt;next_to_clean, 0);</div><div class='add'>+	atomic_set(&amp;txring-&gt;nr_free, 0);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+jme_enable_tx_engine(struct jme_adapter *jme)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Select Queue 0</div><div class='add'>+	 */</div><div class='add'>+	jwrite32(jme, JME_TXCS, TXCS_DEFAULT | TXCS_SELECT_QUEUE0);</div><div class='add'>+	wmb();</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Setup TX Queue 0 DMA Bass Address</div><div class='add'>+	 */</div><div class='add'>+	jwrite32(jme, JME_TXDBA_LO, (__u64)jme-&gt;txring[0].dma &amp; 0xFFFFFFFFUL);</div><div class='add'>+	jwrite32(jme, JME_TXDBA_HI, (__u64)(jme-&gt;txring[0].dma) &gt;&gt; 32);</div><div class='add'>+	jwrite32(jme, JME_TXNDA, (__u64)jme-&gt;txring[0].dma &amp; 0xFFFFFFFFUL);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Setup TX Descptor Count</div><div class='add'>+	 */</div><div class='add'>+	jwrite32(jme, JME_TXQDC, jme-&gt;tx_ring_size);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Enable TX Engine</div><div class='add'>+	 */</div><div class='add'>+	wmb();</div><div class='add'>+	jwrite32(jme, JME_TXCS, jme-&gt;reg_txcs |</div><div class='add'>+				TXCS_SELECT_QUEUE0 |</div><div class='add'>+				TXCS_ENABLE);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+jme_restart_tx_engine(struct jme_adapter *jme)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Restart TX Engine</div><div class='add'>+	 */</div><div class='add'>+	jwrite32(jme, JME_TXCS, jme-&gt;reg_txcs |</div><div class='add'>+				TXCS_SELECT_QUEUE0 |</div><div class='add'>+				TXCS_ENABLE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+jme_disable_tx_engine(struct jme_adapter *jme)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Disable TX Engine</div><div class='add'>+	 */</div><div class='add'>+	jwrite32(jme, JME_TXCS, jme-&gt;reg_txcs | TXCS_SELECT_QUEUE0);</div><div class='add'>+	wmb();</div><div class='add'>+</div><div class='add'>+	val = jread32(jme, JME_TXCS);</div><div class='add'>+	for (i = JME_TX_DISABLE_TIMEOUT ; (val &amp; TXCS_ENABLE) &amp;&amp; i &gt; 0 ; --i) {</div><div class='add'>+		mdelay(1);</div><div class='add'>+		val = jread32(jme, JME_TXCS);</div><div class='add'>+		rmb();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!i)</div><div class='add'>+		jeprintk(jme-&gt;pdev, "Disable TX engine timeout.\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+jme_set_clean_rxdesc(struct jme_adapter *jme, int i)</div><div class='add'>+{</div><div class='add'>+	struct jme_ring *rxring = jme-&gt;rxring;</div><div class='add'>+	register struct rxdesc *rxdesc = rxring-&gt;desc;</div><div class='add'>+	struct jme_buffer_info *rxbi = rxring-&gt;bufinf;</div><div class='add'>+	rxdesc += i;</div><div class='add'>+	rxbi += i;</div><div class='add'>+</div><div class='add'>+	rxdesc-&gt;dw[0] = 0;</div><div class='add'>+	rxdesc-&gt;dw[1] = 0;</div><div class='add'>+	rxdesc-&gt;desc1.bufaddrh	= cpu_to_le32((__u64)rxbi-&gt;mapping &gt;&gt; 32);</div><div class='add'>+	rxdesc-&gt;desc1.bufaddrl	= cpu_to_le32(</div><div class='add'>+					(__u64)rxbi-&gt;mapping &amp; 0xFFFFFFFFUL);</div><div class='add'>+	rxdesc-&gt;desc1.datalen	= cpu_to_le16(rxbi-&gt;len);</div><div class='add'>+	if (jme-&gt;dev-&gt;features &amp; NETIF_F_HIGHDMA)</div><div class='add'>+		rxdesc-&gt;desc1.flags = RXFLAG_64BIT;</div><div class='add'>+	wmb();</div><div class='add'>+	rxdesc-&gt;desc1.flags	|= RXFLAG_OWN | RXFLAG_INT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+jme_make_new_rx_buf(struct jme_adapter *jme, int i)</div><div class='add'>+{</div><div class='add'>+	struct jme_ring *rxring = &amp;(jme-&gt;rxring[0]);</div><div class='add'>+	struct jme_buffer_info *rxbi = rxring-&gt;bufinf + i;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	skb = netdev_alloc_skb(jme-&gt;dev,</div><div class='add'>+		jme-&gt;dev-&gt;mtu + RX_EXTRA_LEN);</div><div class='add'>+	if (unlikely(!skb))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	rxbi-&gt;skb = skb;</div><div class='add'>+	rxbi-&gt;len = skb_tailroom(skb);</div><div class='add'>+	rxbi-&gt;mapping = pci_map_page(jme-&gt;pdev,</div><div class='add'>+					virt_to_page(skb-&gt;data),</div><div class='add'>+					offset_in_page(skb-&gt;data),</div><div class='add'>+					rxbi-&gt;len,</div><div class='add'>+					PCI_DMA_FROMDEVICE);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+jme_free_rx_buf(struct jme_adapter *jme, int i)</div><div class='add'>+{</div><div class='add'>+	struct jme_ring *rxring = &amp;(jme-&gt;rxring[0]);</div><div class='add'>+	struct jme_buffer_info *rxbi = rxring-&gt;bufinf;</div><div class='add'>+	rxbi += i;</div><div class='add'>+</div><div class='add'>+	if (rxbi-&gt;skb) {</div><div class='add'>+		pci_unmap_page(jme-&gt;pdev,</div><div class='add'>+				 rxbi-&gt;mapping,</div><div class='add'>+				 rxbi-&gt;len,</div><div class='add'>+				 PCI_DMA_FROMDEVICE);</div><div class='add'>+		dev_kfree_skb(rxbi-&gt;skb);</div><div class='add'>+		rxbi-&gt;skb = NULL;</div><div class='add'>+		rxbi-&gt;mapping = 0;</div><div class='add'>+		rxbi-&gt;len = 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+jme_free_rx_resources(struct jme_adapter *jme)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	struct jme_ring *rxring = &amp;(jme-&gt;rxring[0]);</div><div class='add'>+</div><div class='add'>+	if (rxring-&gt;alloc) {</div><div class='add'>+		for (i = 0 ; i &lt; jme-&gt;rx_ring_size ; ++i)</div><div class='add'>+			jme_free_rx_buf(jme, i);</div><div class='add'>+</div><div class='add'>+		dma_free_coherent(&amp;(jme-&gt;pdev-&gt;dev),</div><div class='add'>+				  RX_RING_ALLOC_SIZE(jme-&gt;rx_ring_size),</div><div class='add'>+				  rxring-&gt;alloc,</div><div class='add'>+				  rxring-&gt;dmaalloc);</div><div class='add'>+		rxring-&gt;alloc    = NULL;</div><div class='add'>+		rxring-&gt;desc     = NULL;</div><div class='add'>+		rxring-&gt;dmaalloc = 0;</div><div class='add'>+		rxring-&gt;dma      = 0;</div><div class='add'>+	}</div><div class='add'>+	rxring-&gt;next_to_use   = 0;</div><div class='add'>+	atomic_set(&amp;rxring-&gt;next_to_clean, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+jme_setup_rx_resources(struct jme_adapter *jme)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	struct jme_ring *rxring = &amp;(jme-&gt;rxring[0]);</div><div class='add'>+</div><div class='add'>+	rxring-&gt;alloc = dma_alloc_coherent(&amp;(jme-&gt;pdev-&gt;dev),</div><div class='add'>+				   RX_RING_ALLOC_SIZE(jme-&gt;rx_ring_size),</div><div class='add'>+				   &amp;(rxring-&gt;dmaalloc),</div><div class='add'>+				   GFP_ATOMIC);</div><div class='add'>+	if (!rxring-&gt;alloc) {</div><div class='add'>+		rxring-&gt;desc = NULL;</div><div class='add'>+		rxring-&gt;dmaalloc = 0;</div><div class='add'>+		rxring-&gt;dma = 0;</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * 16 Bytes align</div><div class='add'>+	 */</div><div class='add'>+	rxring-&gt;desc		= (void *)ALIGN((unsigned long)(rxring-&gt;alloc),</div><div class='add'>+						RING_DESC_ALIGN);</div><div class='add'>+	rxring-&gt;dma		= ALIGN(rxring-&gt;dmaalloc, RING_DESC_ALIGN);</div><div class='add'>+	rxring-&gt;next_to_use	= 0;</div><div class='add'>+	atomic_set(&amp;rxring-&gt;next_to_clean, 0);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Initiallize Receive Descriptors</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0 ; i &lt; jme-&gt;rx_ring_size ; ++i) {</div><div class='add'>+		if (unlikely(jme_make_new_rx_buf(jme, i))) {</div><div class='add'>+			jme_free_rx_resources(jme);</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		jme_set_clean_rxdesc(jme, i);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+jme_enable_rx_engine(struct jme_adapter *jme)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Select Queue 0</div><div class='add'>+	 */</div><div class='add'>+	jwrite32(jme, JME_RXCS, jme-&gt;reg_rxcs |</div><div class='add'>+				RXCS_QUEUESEL_Q0);</div><div class='add'>+	wmb();</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Setup RX DMA Bass Address</div><div class='add'>+	 */</div><div class='add'>+	jwrite32(jme, JME_RXDBA_LO, (__u64)jme-&gt;rxring[0].dma &amp; 0xFFFFFFFFUL);</div><div class='add'>+	jwrite32(jme, JME_RXDBA_HI, (__u64)(jme-&gt;rxring[0].dma) &gt;&gt; 32);</div><div class='add'>+	jwrite32(jme, JME_RXNDA, (__u64)jme-&gt;rxring[0].dma &amp; 0xFFFFFFFFUL);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Setup RX Descriptor Count</div><div class='add'>+	 */</div><div class='add'>+	jwrite32(jme, JME_RXQDC, jme-&gt;rx_ring_size);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Setup Unicast Filter</div><div class='add'>+	 */</div><div class='add'>+	jme_set_multi(jme-&gt;dev);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Enable RX Engine</div><div class='add'>+	 */</div><div class='add'>+	wmb();</div><div class='add'>+	jwrite32(jme, JME_RXCS, jme-&gt;reg_rxcs |</div><div class='add'>+				RXCS_QUEUESEL_Q0 |</div><div class='add'>+				RXCS_ENABLE |</div><div class='add'>+				RXCS_QST);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+jme_restart_rx_engine(struct jme_adapter *jme)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Start RX Engine</div><div class='add'>+	 */</div><div class='add'>+	jwrite32(jme, JME_RXCS, jme-&gt;reg_rxcs |</div><div class='add'>+				RXCS_QUEUESEL_Q0 |</div><div class='add'>+				RXCS_ENABLE |</div><div class='add'>+				RXCS_QST);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+jme_disable_rx_engine(struct jme_adapter *jme)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Disable RX Engine</div><div class='add'>+	 */</div><div class='add'>+	jwrite32(jme, JME_RXCS, jme-&gt;reg_rxcs);</div><div class='add'>+	wmb();</div><div class='add'>+</div><div class='add'>+	val = jread32(jme, JME_RXCS);</div><div class='add'>+	for (i = JME_RX_DISABLE_TIMEOUT ; (val &amp; RXCS_ENABLE) &amp;&amp; i &gt; 0 ; --i) {</div><div class='add'>+		mdelay(1);</div><div class='add'>+		val = jread32(jme, JME_RXCS);</div><div class='add'>+		rmb();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!i)</div><div class='add'>+		jeprintk(jme-&gt;pdev, "Disable RX engine timeout.\n");</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+jme_rxsum_ok(struct jme_adapter *jme, u16 flags)</div><div class='add'>+{</div><div class='add'>+	if (!(flags &amp; (RXWBFLAG_TCPON | RXWBFLAG_UDPON | RXWBFLAG_IPV4)))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (unlikely(!(flags &amp; RXWBFLAG_MF) &amp;&amp;</div><div class='add'>+	(flags &amp; RXWBFLAG_TCPON) &amp;&amp; !(flags &amp; RXWBFLAG_TCPCS))) {</div><div class='add'>+		msg_rx_err(jme, "TCP Checksum error.\n");</div><div class='add'>+		goto out_sumerr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (unlikely(!(flags &amp; RXWBFLAG_MF) &amp;&amp;</div><div class='add'>+	(flags &amp; RXWBFLAG_UDPON) &amp;&amp; !(flags &amp; RXWBFLAG_UDPCS))) {</div><div class='add'>+		msg_rx_err(jme, "UDP Checksum error.\n");</div><div class='add'>+		goto out_sumerr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (unlikely((flags &amp; RXWBFLAG_IPV4) &amp;&amp; !(flags &amp; RXWBFLAG_IPCS))) {</div><div class='add'>+		msg_rx_err(jme, "IPv4 Checksum error.\n");</div><div class='add'>+		goto out_sumerr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+</div><div class='add'>+out_sumerr:</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+jme_alloc_and_feed_skb(struct jme_adapter *jme, int idx)</div><div class='add'>+{</div><div class='add'>+	struct jme_ring *rxring = &amp;(jme-&gt;rxring[0]);</div><div class='add'>+	struct rxdesc *rxdesc = rxring-&gt;desc;</div><div class='add'>+	struct jme_buffer_info *rxbi = rxring-&gt;bufinf;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int framesize;</div><div class='add'>+</div><div class='add'>+	rxdesc += idx;</div><div class='add'>+	rxbi += idx;</div><div class='add'>+</div><div class='add'>+	skb = rxbi-&gt;skb;</div><div class='add'>+	pci_dma_sync_single_for_cpu(jme-&gt;pdev,</div><div class='add'>+					rxbi-&gt;mapping,</div><div class='add'>+					rxbi-&gt;len,</div><div class='add'>+					PCI_DMA_FROMDEVICE);</div><div class='add'>+</div><div class='add'>+	if (unlikely(jme_make_new_rx_buf(jme, idx))) {</div><div class='add'>+		pci_dma_sync_single_for_device(jme-&gt;pdev,</div><div class='add'>+						rxbi-&gt;mapping,</div><div class='add'>+						rxbi-&gt;len,</div><div class='add'>+						PCI_DMA_FROMDEVICE);</div><div class='add'>+</div><div class='add'>+		++(NET_STAT(jme).rx_dropped);</div><div class='add'>+	} else {</div><div class='add'>+		framesize = le16_to_cpu(rxdesc-&gt;descwb.framesize)</div><div class='add'>+				- RX_PREPAD_SIZE;</div><div class='add'>+</div><div class='add'>+		skb_reserve(skb, RX_PREPAD_SIZE);</div><div class='add'>+		skb_put(skb, framesize);</div><div class='add'>+		skb-&gt;protocol = eth_type_trans(skb, jme-&gt;dev);</div><div class='add'>+</div><div class='add'>+		if (jme_rxsum_ok(jme, rxdesc-&gt;descwb.flags))</div><div class='add'>+			skb-&gt;ip_summed = CHECKSUM_UNNECESSARY;</div><div class='add'>+		else</div><div class='add'>+			skb-&gt;ip_summed = CHECKSUM_NONE;</div><div class='add'>+</div><div class='add'>+		if (rxdesc-&gt;descwb.flags &amp; RXWBFLAG_TAGON) {</div><div class='add'>+			if (jme-&gt;vlgrp) {</div><div class='add'>+				jme-&gt;jme_vlan_rx(skb, jme-&gt;vlgrp,</div><div class='add'>+					le32_to_cpu(rxdesc-&gt;descwb.vlan));</div><div class='add'>+				NET_STAT(jme).rx_bytes += 4;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			jme-&gt;jme_rx(skb);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if ((le16_to_cpu(rxdesc-&gt;descwb.flags) &amp; RXWBFLAG_DEST) ==</div><div class='add'>+				RXWBFLAG_DEST_MUL)</div><div class='add'>+			++(NET_STAT(jme).multicast);</div><div class='add'>+</div><div class='add'>+		jme-&gt;dev-&gt;last_rx = jiffies;</div><div class='add'>+		NET_STAT(jme).rx_bytes += framesize;</div><div class='add'>+		++(NET_STAT(jme).rx_packets);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	jme_set_clean_rxdesc(jme, idx);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+jme_process_receive(struct jme_adapter *jme, int limit)</div><div class='add'>+{</div><div class='add'>+	struct jme_ring *rxring = &amp;(jme-&gt;rxring[0]);</div><div class='add'>+	struct rxdesc *rxdesc = rxring-&gt;desc;</div><div class='add'>+	int i, j, ccnt, desccnt, mask = jme-&gt;rx_ring_mask;</div><div class='add'>+</div><div class='add'>+	if (unlikely(!atomic_dec_and_test(&amp;jme-&gt;rx_cleaning)))</div><div class='add'>+		goto out_inc;</div><div class='add'>+</div><div class='add'>+	if (unlikely(atomic_read(&amp;jme-&gt;link_changing) != 1))</div><div class='add'>+		goto out_inc;</div><div class='add'>+</div><div class='add'>+	if (unlikely(!netif_carrier_ok(jme-&gt;dev)))</div><div class='add'>+		goto out_inc;</div><div class='add'>+</div><div class='add'>+	i = atomic_read(&amp;rxring-&gt;next_to_clean);</div><div class='add'>+	while (limit-- &gt; 0) {</div><div class='add'>+		rxdesc = rxring-&gt;desc;</div><div class='add'>+		rxdesc += i;</div><div class='add'>+</div><div class='add'>+		if ((rxdesc-&gt;descwb.flags &amp; RXWBFLAG_OWN) ||</div><div class='add'>+		!(rxdesc-&gt;descwb.desccnt &amp; RXWBDCNT_WBCPL))</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		desccnt = rxdesc-&gt;descwb.desccnt &amp; RXWBDCNT_DCNT;</div><div class='add'>+</div><div class='add'>+		if (unlikely(desccnt &gt; 1 ||</div><div class='add'>+		rxdesc-&gt;descwb.errstat &amp; RXWBERR_ALLERR)) {</div><div class='add'>+</div><div class='add'>+			if (rxdesc-&gt;descwb.errstat &amp; RXWBERR_CRCERR)</div><div class='add'>+				++(NET_STAT(jme).rx_crc_errors);</div><div class='add'>+			else if (rxdesc-&gt;descwb.errstat &amp; RXWBERR_OVERUN)</div><div class='add'>+				++(NET_STAT(jme).rx_fifo_errors);</div><div class='add'>+			else</div><div class='add'>+				++(NET_STAT(jme).rx_errors);</div><div class='add'>+</div><div class='add'>+			if (desccnt &gt; 1)</div><div class='add'>+				limit -= desccnt - 1;</div><div class='add'>+</div><div class='add'>+			for (j = i, ccnt = desccnt ; ccnt-- ; ) {</div><div class='add'>+				jme_set_clean_rxdesc(jme, j);</div><div class='add'>+				j = (j + 1) &amp; (mask);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+		} else {</div><div class='add'>+			jme_alloc_and_feed_skb(jme, i);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		i = (i + desccnt) &amp; (mask);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	atomic_set(&amp;rxring-&gt;next_to_clean, i);</div><div class='add'>+</div><div class='add'>+out_inc:</div><div class='add'>+	atomic_inc(&amp;jme-&gt;rx_cleaning);</div><div class='add'>+</div><div class='add'>+	return limit &gt; 0 ? limit : 0;</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+jme_attempt_pcc(struct dynpcc_info *dpi, int atmp)</div><div class='add'>+{</div><div class='add'>+	if (likely(atmp == dpi-&gt;cur)) {</div><div class='add'>+		dpi-&gt;cnt = 0;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dpi-&gt;attempt == atmp) {</div><div class='add'>+		++(dpi-&gt;cnt);</div><div class='add'>+	} else {</div><div class='add'>+		dpi-&gt;attempt = atmp;</div><div class='add'>+		dpi-&gt;cnt = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+jme_dynamic_pcc(struct jme_adapter *jme)</div><div class='add'>+{</div><div class='add'>+	register struct dynpcc_info *dpi = &amp;(jme-&gt;dpi);</div><div class='add'>+</div><div class='add'>+	if ((NET_STAT(jme).rx_bytes - dpi-&gt;last_bytes) &gt; PCC_P3_THRESHOLD)</div><div class='add'>+		jme_attempt_pcc(dpi, PCC_P3);</div><div class='add'>+	else if ((NET_STAT(jme).rx_packets - dpi-&gt;last_pkts) &gt; PCC_P2_THRESHOLD</div><div class='add'>+	|| dpi-&gt;intr_cnt &gt; PCC_INTR_THRESHOLD)</div><div class='add'>+		jme_attempt_pcc(dpi, PCC_P2);</div><div class='add'>+	else</div><div class='add'>+		jme_attempt_pcc(dpi, PCC_P1);</div><div class='add'>+</div><div class='add'>+	if (unlikely(dpi-&gt;attempt != dpi-&gt;cur &amp;&amp; dpi-&gt;cnt &gt; 5)) {</div><div class='add'>+		if (dpi-&gt;attempt &lt; dpi-&gt;cur)</div><div class='add'>+			tasklet_schedule(&amp;jme-&gt;rxclean_task);</div><div class='add'>+		jme_set_rx_pcc(jme, dpi-&gt;attempt);</div><div class='add'>+		dpi-&gt;cur = dpi-&gt;attempt;</div><div class='add'>+		dpi-&gt;cnt = 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+jme_start_pcc_timer(struct jme_adapter *jme)</div><div class='add'>+{</div><div class='add'>+	struct dynpcc_info *dpi = &amp;(jme-&gt;dpi);</div><div class='add'>+	dpi-&gt;last_bytes		= NET_STAT(jme).rx_bytes;</div><div class='add'>+	dpi-&gt;last_pkts		= NET_STAT(jme).rx_packets;</div><div class='add'>+	dpi-&gt;intr_cnt		= 0;</div><div class='add'>+	jwrite32(jme, JME_TMCSR,</div><div class='add'>+		TMCSR_EN | ((0xFFFFFF - PCC_INTERVAL_US) &amp; TMCSR_CNT));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+jme_stop_pcc_timer(struct jme_adapter *jme)</div><div class='add'>+{</div><div class='add'>+	jwrite32(jme, JME_TMCSR, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+jme_shutdown_nic(struct jme_adapter *jme)</div><div class='add'>+{</div><div class='add'>+	u32 phylink;</div><div class='add'>+</div><div class='add'>+	phylink = jme_linkstat_from_phy(jme);</div><div class='add'>+</div><div class='add'>+	if (!(phylink &amp; PHY_LINK_UP)) {</div><div class='add'>+		/*</div><div class='add'>+		 * Disable all interrupt before issue timer</div><div class='add'>+		 */</div><div class='add'>+		jme_stop_irq(jme);</div><div class='add'>+		jwrite32(jme, JME_TIMER2, TMCSR_EN | 0xFFFFFE);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+jme_pcc_tasklet(unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	struct jme_adapter *jme = (struct jme_adapter *)arg;</div><div class='add'>+	struct net_device *netdev = jme-&gt;dev;</div><div class='add'>+</div><div class='add'>+	if (unlikely(test_bit(JME_FLAG_SHUTDOWN, &amp;jme-&gt;flags))) {</div><div class='add'>+		jme_shutdown_nic(jme);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (unlikely(!netif_carrier_ok(netdev) ||</div><div class='add'>+		(atomic_read(&amp;jme-&gt;link_changing) != 1)</div><div class='add'>+	)) {</div><div class='add'>+		jme_stop_pcc_timer(jme);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!(test_bit(JME_FLAG_POLL, &amp;jme-&gt;flags)))</div><div class='add'>+		jme_dynamic_pcc(jme);</div><div class='add'>+</div><div class='add'>+	jme_start_pcc_timer(jme);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+jme_polling_mode(struct jme_adapter *jme)</div><div class='add'>+{</div><div class='add'>+	jme_set_rx_pcc(jme, PCC_OFF);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+jme_interrupt_mode(struct jme_adapter *jme)</div><div class='add'>+{</div><div class='add'>+	jme_set_rx_pcc(jme, PCC_P1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+jme_pseudo_hotplug_enabled(struct jme_adapter *jme)</div><div class='add'>+{</div><div class='add'>+	u32 apmc;</div><div class='add'>+	apmc = jread32(jme, JME_APMC);</div><div class='add'>+	return apmc &amp; JME_APMC_PSEUDO_HP_EN;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+jme_start_shutdown_timer(struct jme_adapter *jme)</div><div class='add'>+{</div><div class='add'>+	u32 apmc;</div><div class='add'>+</div><div class='add'>+	apmc = jread32(jme, JME_APMC) | JME_APMC_PCIE_SD_EN;</div><div class='add'>+	apmc &amp;= ~JME_APMC_EPIEN_CTRL;</div><div class='add'>+	if (!no_extplug) {</div><div class='add'>+		jwrite32f(jme, JME_APMC, apmc | JME_APMC_EPIEN_CTRL_EN);</div><div class='add'>+		wmb();</div><div class='add'>+	}</div><div class='add'>+	jwrite32f(jme, JME_APMC, apmc);</div><div class='add'>+</div><div class='add'>+	jwrite32f(jme, JME_TIMER2, 0);</div><div class='add'>+	set_bit(JME_FLAG_SHUTDOWN, &amp;jme-&gt;flags);</div><div class='add'>+	jwrite32(jme, JME_TMCSR,</div><div class='add'>+		TMCSR_EN | ((0xFFFFFF - APMC_PHP_SHUTDOWN_DELAY) &amp; TMCSR_CNT));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+jme_stop_shutdown_timer(struct jme_adapter *jme)</div><div class='add'>+{</div><div class='add'>+	u32 apmc;</div><div class='add'>+</div><div class='add'>+	jwrite32f(jme, JME_TMCSR, 0);</div><div class='add'>+	jwrite32f(jme, JME_TIMER2, 0);</div><div class='add'>+	clear_bit(JME_FLAG_SHUTDOWN, &amp;jme-&gt;flags);</div><div class='add'>+</div><div class='add'>+	apmc = jread32(jme, JME_APMC);</div><div class='add'>+	apmc &amp;= ~(JME_APMC_PCIE_SD_EN | JME_APMC_EPIEN_CTRL);</div><div class='add'>+	jwrite32f(jme, JME_APMC, apmc | JME_APMC_EPIEN_CTRL_DIS);</div><div class='add'>+	wmb();</div><div class='add'>+	jwrite32f(jme, JME_APMC, apmc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+jme_link_change_tasklet(unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	struct jme_adapter *jme = (struct jme_adapter *)arg;</div><div class='add'>+	struct net_device *netdev = jme-&gt;dev;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	while (!atomic_dec_and_test(&amp;jme-&gt;link_changing)) {</div><div class='add'>+		atomic_inc(&amp;jme-&gt;link_changing);</div><div class='add'>+		msg_intr(jme, "Get link change lock failed.\n");</div><div class='add'>+		while (atomic_read(&amp;jme-&gt;link_changing) != 1)</div><div class='add'>+			msg_intr(jme, "Waiting link change lock.\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (jme_check_link(netdev, 1) &amp;&amp; jme-&gt;old_mtu == netdev-&gt;mtu)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	jme-&gt;old_mtu = netdev-&gt;mtu;</div><div class='add'>+	netif_stop_queue(netdev);</div><div class='add'>+	if (jme_pseudo_hotplug_enabled(jme))</div><div class='add'>+		jme_stop_shutdown_timer(jme);</div><div class='add'>+</div><div class='add'>+	jme_stop_pcc_timer(jme);</div><div class='add'>+	tasklet_disable(&amp;jme-&gt;txclean_task);</div><div class='add'>+	tasklet_disable(&amp;jme-&gt;rxclean_task);</div><div class='add'>+	tasklet_disable(&amp;jme-&gt;rxempty_task);</div><div class='add'>+</div><div class='add'>+	if (netif_carrier_ok(netdev)) {</div><div class='add'>+		jme_reset_ghc_speed(jme);</div><div class='add'>+		jme_disable_rx_engine(jme);</div><div class='add'>+		jme_disable_tx_engine(jme);</div><div class='add'>+		jme_reset_mac_processor(jme);</div><div class='add'>+		jme_free_rx_resources(jme);</div><div class='add'>+		jme_free_tx_resources(jme);</div><div class='add'>+</div><div class='add'>+		if (test_bit(JME_FLAG_POLL, &amp;jme-&gt;flags))</div><div class='add'>+			jme_polling_mode(jme);</div><div class='add'>+</div><div class='add'>+		netif_carrier_off(netdev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	jme_check_link(netdev, 0);</div><div class='add'>+	if (netif_carrier_ok(netdev)) {</div><div class='add'>+		rc = jme_setup_rx_resources(jme);</div><div class='add'>+		if (rc) {</div><div class='add'>+			jeprintk(jme-&gt;pdev, "Allocating resources for RX error"</div><div class='add'>+				", Device STOPPED!\n");</div><div class='add'>+			goto out_enable_tasklet;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		rc = jme_setup_tx_resources(jme);</div><div class='add'>+		if (rc) {</div><div class='add'>+			jeprintk(jme-&gt;pdev, "Allocating resources for TX error"</div><div class='add'>+				", Device STOPPED!\n");</div><div class='add'>+			goto err_out_free_rx_resources;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		jme_enable_rx_engine(jme);</div><div class='add'>+		jme_enable_tx_engine(jme);</div><div class='add'>+</div><div class='add'>+		netif_start_queue(netdev);</div><div class='add'>+</div><div class='add'>+		if (test_bit(JME_FLAG_POLL, &amp;jme-&gt;flags))</div><div class='add'>+			jme_interrupt_mode(jme);</div><div class='add'>+</div><div class='add'>+		jme_start_pcc_timer(jme);</div><div class='add'>+	} else if (jme_pseudo_hotplug_enabled(jme)) {</div><div class='add'>+		jme_start_shutdown_timer(jme);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	goto out_enable_tasklet;</div><div class='add'>+</div><div class='add'>+err_out_free_rx_resources:</div><div class='add'>+	jme_free_rx_resources(jme);</div><div class='add'>+out_enable_tasklet:</div><div class='add'>+	tasklet_enable(&amp;jme-&gt;txclean_task);</div><div class='add'>+	tasklet_hi_enable(&amp;jme-&gt;rxclean_task);</div><div class='add'>+	tasklet_hi_enable(&amp;jme-&gt;rxempty_task);</div><div class='add'>+out:</div><div class='add'>+	atomic_inc(&amp;jme-&gt;link_changing);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+jme_rx_clean_tasklet(unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	struct jme_adapter *jme = (struct jme_adapter *)arg;</div><div class='add'>+	struct dynpcc_info *dpi = &amp;(jme-&gt;dpi);</div><div class='add'>+</div><div class='add'>+	jme_process_receive(jme, jme-&gt;rx_ring_size);</div><div class='add'>+	++(dpi-&gt;intr_cnt);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+jme_poll(JME_NAPI_HOLDER(holder), JME_NAPI_WEIGHT(budget))</div><div class='add'>+{</div><div class='add'>+	struct jme_adapter *jme = jme_napi_priv(holder);</div><div class='add'>+	struct net_device *netdev = jme-&gt;dev;</div><div class='add'>+	int rest;</div><div class='add'>+</div><div class='add'>+	rest = jme_process_receive(jme, JME_NAPI_WEIGHT_VAL(budget));</div><div class='add'>+</div><div class='add'>+	while (atomic_read(&amp;jme-&gt;rx_empty) &gt; 0) {</div><div class='add'>+		atomic_dec(&amp;jme-&gt;rx_empty);</div><div class='add'>+		++(NET_STAT(jme).rx_dropped);</div><div class='add'>+		jme_restart_rx_engine(jme);</div><div class='add'>+	}</div><div class='add'>+	atomic_inc(&amp;jme-&gt;rx_empty);</div><div class='add'>+</div><div class='add'>+	if (rest) {</div><div class='add'>+		JME_RX_COMPLETE(netdev, holder);</div><div class='add'>+		jme_interrupt_mode(jme);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	JME_NAPI_WEIGHT_SET(budget, rest);</div><div class='add'>+	return JME_NAPI_WEIGHT_VAL(budget) - rest;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+jme_rx_empty_tasklet(unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	struct jme_adapter *jme = (struct jme_adapter *)arg;</div><div class='add'>+</div><div class='add'>+	if (unlikely(atomic_read(&amp;jme-&gt;link_changing) != 1))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (unlikely(!netif_carrier_ok(jme-&gt;dev)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	msg_rx_status(jme, "RX Queue Full!\n");</div><div class='add'>+</div><div class='add'>+	jme_rx_clean_tasklet(arg);</div><div class='add'>+</div><div class='add'>+	while (atomic_read(&amp;jme-&gt;rx_empty) &gt; 0) {</div><div class='add'>+		atomic_dec(&amp;jme-&gt;rx_empty);</div><div class='add'>+		++(NET_STAT(jme).rx_dropped);</div><div class='add'>+		jme_restart_rx_engine(jme);</div><div class='add'>+	}</div><div class='add'>+	atomic_inc(&amp;jme-&gt;rx_empty);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+jme_wake_queue_if_stopped(struct jme_adapter *jme)</div><div class='add'>+{</div><div class='add'>+	struct jme_ring *txring = jme-&gt;txring;</div><div class='add'>+</div><div class='add'>+	smp_wmb();</div><div class='add'>+	if (unlikely(netif_queue_stopped(jme-&gt;dev) &amp;&amp;</div><div class='add'>+	atomic_read(&amp;txring-&gt;nr_free) &gt;= (jme-&gt;tx_wake_threshold))) {</div><div class='add'>+		msg_tx_done(jme, "TX Queue Waked.\n");</div><div class='add'>+		netif_wake_queue(jme-&gt;dev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+jme_tx_clean_tasklet(unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	struct jme_adapter *jme = (struct jme_adapter *)arg;</div><div class='add'>+	struct jme_ring *txring = &amp;(jme-&gt;txring[0]);</div><div class='add'>+	struct txdesc *txdesc = txring-&gt;desc;</div><div class='add'>+	struct jme_buffer_info *txbi = txring-&gt;bufinf, *ctxbi, *ttxbi;</div><div class='add'>+	int i, j, cnt = 0, max, err, mask;</div><div class='add'>+</div><div class='add'>+	tx_dbg(jme, "Into txclean.\n");</div><div class='add'>+</div><div class='add'>+	if (unlikely(!atomic_dec_and_test(&amp;jme-&gt;tx_cleaning)))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (unlikely(atomic_read(&amp;jme-&gt;link_changing) != 1))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (unlikely(!netif_carrier_ok(jme-&gt;dev)))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	max = jme-&gt;tx_ring_size - atomic_read(&amp;txring-&gt;nr_free);</div><div class='add'>+	mask = jme-&gt;tx_ring_mask;</div><div class='add'>+</div><div class='add'>+	for (i = atomic_read(&amp;txring-&gt;next_to_clean) ; cnt &lt; max ; ) {</div><div class='add'>+</div><div class='add'>+		ctxbi = txbi + i;</div><div class='add'>+</div><div class='add'>+		if (likely(ctxbi-&gt;skb &amp;&amp;</div><div class='add'>+		!(txdesc[i].descwb.flags &amp; TXWBFLAG_OWN))) {</div><div class='add'>+</div><div class='add'>+			tx_dbg(jme, "txclean: %d+%d@%lu\n",</div><div class='add'>+					i, ctxbi-&gt;nr_desc, jiffies);</div><div class='add'>+</div><div class='add'>+			err = txdesc[i].descwb.flags &amp; TXWBFLAG_ALLERR;</div><div class='add'>+</div><div class='add'>+			for (j = 1 ; j &lt; ctxbi-&gt;nr_desc ; ++j) {</div><div class='add'>+				ttxbi = txbi + ((i + j) &amp; (mask));</div><div class='add'>+				txdesc[(i + j) &amp; (mask)].dw[0] = 0;</div><div class='add'>+</div><div class='add'>+				pci_unmap_page(jme-&gt;pdev,</div><div class='add'>+						 ttxbi-&gt;mapping,</div><div class='add'>+						 ttxbi-&gt;len,</div><div class='add'>+						 PCI_DMA_TODEVICE);</div><div class='add'>+</div><div class='add'>+				ttxbi-&gt;mapping = 0;</div><div class='add'>+				ttxbi-&gt;len = 0;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			dev_kfree_skb(ctxbi-&gt;skb);</div><div class='add'>+</div><div class='add'>+			cnt += ctxbi-&gt;nr_desc;</div><div class='add'>+</div><div class='add'>+			if (unlikely(err)) {</div><div class='add'>+				++(NET_STAT(jme).tx_carrier_errors);</div><div class='add'>+			} else {</div><div class='add'>+				++(NET_STAT(jme).tx_packets);</div><div class='add'>+				NET_STAT(jme).tx_bytes += ctxbi-&gt;len;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			ctxbi-&gt;skb = NULL;</div><div class='add'>+			ctxbi-&gt;len = 0;</div><div class='add'>+			ctxbi-&gt;start_xmit = 0;</div><div class='add'>+</div><div class='add'>+		} else {</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		i = (i + ctxbi-&gt;nr_desc) &amp; mask;</div><div class='add'>+</div><div class='add'>+		ctxbi-&gt;nr_desc = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tx_dbg(jme, "txclean: done %d@%lu.\n", i, jiffies);</div><div class='add'>+	atomic_set(&amp;txring-&gt;next_to_clean, i);</div><div class='add'>+	atomic_add(cnt, &amp;txring-&gt;nr_free);</div><div class='add'>+</div><div class='add'>+	jme_wake_queue_if_stopped(jme);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	atomic_inc(&amp;jme-&gt;tx_cleaning);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+jme_intr_msi(struct jme_adapter *jme, u32 intrstat)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Disable interrupt</div><div class='add'>+	 */</div><div class='add'>+	jwrite32f(jme, JME_IENC, INTR_ENABLE);</div><div class='add'>+</div><div class='add'>+	if (intrstat &amp; (INTR_LINKCH | INTR_SWINTR)) {</div><div class='add'>+		/*</div><div class='add'>+		 * Link change event is critical</div><div class='add'>+		 * all other events are ignored</div><div class='add'>+		 */</div><div class='add'>+		jwrite32(jme, JME_IEVE, intrstat);</div><div class='add'>+		tasklet_schedule(&amp;jme-&gt;linkch_task);</div><div class='add'>+		goto out_reenable;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (intrstat &amp; INTR_TMINTR) {</div><div class='add'>+		jwrite32(jme, JME_IEVE, INTR_TMINTR);</div><div class='add'>+		tasklet_schedule(&amp;jme-&gt;pcc_task);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (intrstat &amp; (INTR_PCCTXTO | INTR_PCCTX)) {</div><div class='add'>+		jwrite32(jme, JME_IEVE, INTR_PCCTXTO | INTR_PCCTX | INTR_TX0);</div><div class='add'>+		tasklet_schedule(&amp;jme-&gt;txclean_task);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((intrstat &amp; (INTR_PCCRX0TO | INTR_PCCRX0 | INTR_RX0EMP))) {</div><div class='add'>+		jwrite32(jme, JME_IEVE, (intrstat &amp; (INTR_PCCRX0TO |</div><div class='add'>+						     INTR_PCCRX0 |</div><div class='add'>+						     INTR_RX0EMP)) |</div><div class='add'>+					INTR_RX0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (test_bit(JME_FLAG_POLL, &amp;jme-&gt;flags)) {</div><div class='add'>+		if (intrstat &amp; INTR_RX0EMP)</div><div class='add'>+			atomic_inc(&amp;jme-&gt;rx_empty);</div><div class='add'>+</div><div class='add'>+		if ((intrstat &amp; (INTR_PCCRX0TO | INTR_PCCRX0 | INTR_RX0EMP))) {</div><div class='add'>+			if (likely(JME_RX_SCHEDULE_PREP(jme))) {</div><div class='add'>+				jme_polling_mode(jme);</div><div class='add'>+				JME_RX_SCHEDULE(jme);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		if (intrstat &amp; INTR_RX0EMP) {</div><div class='add'>+			atomic_inc(&amp;jme-&gt;rx_empty);</div><div class='add'>+			tasklet_hi_schedule(&amp;jme-&gt;rxempty_task);</div><div class='add'>+		} else if (intrstat &amp; (INTR_PCCRX0TO | INTR_PCCRX0)) {</div><div class='add'>+			tasklet_hi_schedule(&amp;jme-&gt;rxclean_task);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out_reenable:</div><div class='add'>+	/*</div><div class='add'>+	 * Re-enable interrupt</div><div class='add'>+	 */</div><div class='add'>+	jwrite32f(jme, JME_IENS, INTR_ENABLE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t</div><div class='add'>+jme_intr(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev = dev_id;</div><div class='add'>+	struct jme_adapter *jme = netdev_priv(netdev);</div><div class='add'>+	u32 intrstat;</div><div class='add'>+</div><div class='add'>+	intrstat = jread32(jme, JME_IEVE);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Check if it's really an interrupt for us</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely((intrstat &amp; INTR_ENABLE) == 0))</div><div class='add'>+		return IRQ_NONE;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Check if the device still exist</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(intrstat == ~((typeof(intrstat))0)))</div><div class='add'>+		return IRQ_NONE;</div><div class='add'>+</div><div class='add'>+	jme_intr_msi(jme, intrstat);</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t</div><div class='add'>+jme_msi(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev = dev_id;</div><div class='add'>+	struct jme_adapter *jme = netdev_priv(netdev);</div><div class='add'>+	u32 intrstat;</div><div class='add'>+</div><div class='add'>+	pci_dma_sync_single_for_cpu(jme-&gt;pdev,</div><div class='add'>+				    jme-&gt;shadow_dma,</div><div class='add'>+				    sizeof(u32) * SHADOW_REG_NR,</div><div class='add'>+				    PCI_DMA_FROMDEVICE);</div><div class='add'>+	intrstat = jme-&gt;shadow_regs[SHADOW_IEVE];</div><div class='add'>+	jme-&gt;shadow_regs[SHADOW_IEVE] = 0;</div><div class='add'>+</div><div class='add'>+	jme_intr_msi(jme, intrstat);</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+jme_reset_link(struct jme_adapter *jme)</div><div class='add'>+{</div><div class='add'>+	jwrite32(jme, JME_TMCSR, TMCSR_SWIT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+jme_restart_an(struct jme_adapter *jme)</div><div class='add'>+{</div><div class='add'>+	u32 bmcr;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;jme-&gt;phy_lock);</div><div class='add'>+	bmcr = jme_mdio_read(jme-&gt;dev, jme-&gt;mii_if.phy_id, MII_BMCR);</div><div class='add'>+	bmcr |= (BMCR_ANENABLE | BMCR_ANRESTART);</div><div class='add'>+	jme_mdio_write(jme-&gt;dev, jme-&gt;mii_if.phy_id, MII_BMCR, bmcr);</div><div class='add'>+	spin_unlock_bh(&amp;jme-&gt;phy_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+jme_request_irq(struct jme_adapter *jme)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+	struct net_device *netdev = jme-&gt;dev;</div><div class='add'>+	irq_handler_t handler = jme_intr;</div><div class='add'>+	int irq_flags = IRQF_SHARED;</div><div class='add'>+</div><div class='add'>+	if (!pci_enable_msi(jme-&gt;pdev)) {</div><div class='add'>+		set_bit(JME_FLAG_MSI, &amp;jme-&gt;flags);</div><div class='add'>+		handler = jme_msi;</div><div class='add'>+		irq_flags = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = request_irq(jme-&gt;pdev-&gt;irq, handler, irq_flags, netdev-&gt;name,</div><div class='add'>+			  netdev);</div><div class='add'>+	if (rc) {</div><div class='add'>+		jeprintk(jme-&gt;pdev,</div><div class='add'>+			"Unable to request %s interrupt (return: %d)\n",</div><div class='add'>+			test_bit(JME_FLAG_MSI, &amp;jme-&gt;flags) ? "MSI" : "INTx",</div><div class='add'>+			rc);</div><div class='add'>+</div><div class='add'>+		if (test_bit(JME_FLAG_MSI, &amp;jme-&gt;flags)) {</div><div class='add'>+			pci_disable_msi(jme-&gt;pdev);</div><div class='add'>+			clear_bit(JME_FLAG_MSI, &amp;jme-&gt;flags);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		netdev-&gt;irq = jme-&gt;pdev-&gt;irq;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+jme_free_irq(struct jme_adapter *jme)</div><div class='add'>+{</div><div class='add'>+	free_irq(jme-&gt;pdev-&gt;irq, jme-&gt;dev);</div><div class='add'>+	if (test_bit(JME_FLAG_MSI, &amp;jme-&gt;flags)) {</div><div class='add'>+		pci_disable_msi(jme-&gt;pdev);</div><div class='add'>+		clear_bit(JME_FLAG_MSI, &amp;jme-&gt;flags);</div><div class='add'>+		jme-&gt;dev-&gt;irq = jme-&gt;pdev-&gt;irq;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+jme_open(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct jme_adapter *jme = netdev_priv(netdev);</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	jme_clear_pm(jme);</div><div class='add'>+	JME_NAPI_ENABLE(jme);</div><div class='add'>+</div><div class='add'>+	tasklet_enable(&amp;jme-&gt;txclean_task);</div><div class='add'>+	tasklet_hi_enable(&amp;jme-&gt;rxclean_task);</div><div class='add'>+	tasklet_hi_enable(&amp;jme-&gt;rxempty_task);</div><div class='add'>+</div><div class='add'>+	rc = jme_request_irq(jme);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto err_out;</div><div class='add'>+</div><div class='add'>+	jme_enable_shadow(jme);</div><div class='add'>+	jme_start_irq(jme);</div><div class='add'>+</div><div class='add'>+	if (test_bit(JME_FLAG_SSET, &amp;jme-&gt;flags))</div><div class='add'>+		jme_set_settings(netdev, &amp;jme-&gt;old_ecmd);</div><div class='add'>+	else</div><div class='add'>+		jme_reset_phy_processor(jme);</div><div class='add'>+</div><div class='add'>+	jme_reset_link(jme);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_out:</div><div class='add'>+	netif_stop_queue(netdev);</div><div class='add'>+	netif_carrier_off(netdev);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+static void</div><div class='add'>+jme_set_100m_half(struct jme_adapter *jme)</div><div class='add'>+{</div><div class='add'>+	u32 bmcr, tmp;</div><div class='add'>+</div><div class='add'>+	bmcr = jme_mdio_read(jme-&gt;dev, jme-&gt;mii_if.phy_id, MII_BMCR);</div><div class='add'>+	tmp = bmcr &amp; ~(BMCR_ANENABLE | BMCR_SPEED100 |</div><div class='add'>+		       BMCR_SPEED1000 | BMCR_FULLDPLX);</div><div class='add'>+	tmp |= BMCR_SPEED100;</div><div class='add'>+</div><div class='add'>+	if (bmcr != tmp)</div><div class='add'>+		jme_mdio_write(jme-&gt;dev, jme-&gt;mii_if.phy_id, MII_BMCR, tmp);</div><div class='add'>+</div><div class='add'>+	if (jme-&gt;fpgaver)</div><div class='add'>+		jwrite32(jme, JME_GHC, GHC_SPEED_100M | GHC_LINK_POLL);</div><div class='add'>+	else</div><div class='add'>+		jwrite32(jme, JME_GHC, GHC_SPEED_100M);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define JME_WAIT_LINK_TIME 2000 /* 2000ms */</div><div class='add'>+static void</div><div class='add'>+jme_wait_link(struct jme_adapter *jme)</div><div class='add'>+{</div><div class='add'>+	u32 phylink, to = JME_WAIT_LINK_TIME;</div><div class='add'>+</div><div class='add'>+	mdelay(1000);</div><div class='add'>+	phylink = jme_linkstat_from_phy(jme);</div><div class='add'>+	while (!(phylink &amp; PHY_LINK_UP) &amp;&amp; (to -= 10) &gt; 0) {</div><div class='add'>+		mdelay(10);</div><div class='add'>+		phylink = jme_linkstat_from_phy(jme);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+jme_phy_off(struct jme_adapter *jme)</div><div class='add'>+{</div><div class='add'>+	jme_mdio_write(jme-&gt;dev, jme-&gt;mii_if.phy_id, MII_BMCR, BMCR_PDOWN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+jme_close(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct jme_adapter *jme = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	netif_stop_queue(netdev);</div><div class='add'>+	netif_carrier_off(netdev);</div><div class='add'>+</div><div class='add'>+	jme_stop_irq(jme);</div><div class='add'>+	jme_disable_shadow(jme);</div><div class='add'>+	jme_free_irq(jme);</div><div class='add'>+</div><div class='add'>+	JME_NAPI_DISABLE(jme);</div><div class='add'>+</div><div class='add'>+	tasklet_kill(&amp;jme-&gt;linkch_task);</div><div class='add'>+	tasklet_kill(&amp;jme-&gt;txclean_task);</div><div class='add'>+	tasklet_kill(&amp;jme-&gt;rxclean_task);</div><div class='add'>+	tasklet_kill(&amp;jme-&gt;rxempty_task);</div><div class='add'>+</div><div class='add'>+	jme_reset_ghc_speed(jme);</div><div class='add'>+	jme_disable_rx_engine(jme);</div><div class='add'>+	jme_disable_tx_engine(jme);</div><div class='add'>+	jme_reset_mac_processor(jme);</div><div class='add'>+	jme_free_rx_resources(jme);</div><div class='add'>+	jme_free_tx_resources(jme);</div><div class='add'>+	jme-&gt;phylink = 0;</div><div class='add'>+	jme_phy_off(jme);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+jme_alloc_txdesc(struct jme_adapter *jme,</div><div class='add'>+			struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct jme_ring *txring = jme-&gt;txring;</div><div class='add'>+	int idx, nr_alloc, mask = jme-&gt;tx_ring_mask;</div><div class='add'>+</div><div class='add'>+	idx = txring-&gt;next_to_use;</div><div class='add'>+	nr_alloc = skb_shinfo(skb)-&gt;nr_frags + 2;</div><div class='add'>+</div><div class='add'>+	if (unlikely(atomic_read(&amp;txring-&gt;nr_free) &lt; nr_alloc))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	atomic_sub(nr_alloc, &amp;txring-&gt;nr_free);</div><div class='add'>+</div><div class='add'>+	txring-&gt;next_to_use = (txring-&gt;next_to_use + nr_alloc) &amp; mask;</div><div class='add'>+</div><div class='add'>+	return idx;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+jme_fill_tx_map(struct pci_dev *pdev,</div><div class='add'>+		struct txdesc *txdesc,</div><div class='add'>+		struct jme_buffer_info *txbi,</div><div class='add'>+		struct page *page,</div><div class='add'>+		u32 page_offset,</div><div class='add'>+		u32 len,</div><div class='add'>+		u8 hidma)</div><div class='add'>+{</div><div class='add'>+	dma_addr_t dmaaddr;</div><div class='add'>+</div><div class='add'>+	dmaaddr = pci_map_page(pdev,</div><div class='add'>+				page,</div><div class='add'>+				page_offset,</div><div class='add'>+				len,</div><div class='add'>+				PCI_DMA_TODEVICE);</div><div class='add'>+</div><div class='add'>+	pci_dma_sync_single_for_device(pdev,</div><div class='add'>+				       dmaaddr,</div><div class='add'>+				       len,</div><div class='add'>+				       PCI_DMA_TODEVICE);</div><div class='add'>+</div><div class='add'>+	txdesc-&gt;dw[0] = 0;</div><div class='add'>+	txdesc-&gt;dw[1] = 0;</div><div class='add'>+	txdesc-&gt;desc2.flags	= TXFLAG_OWN;</div><div class='add'>+	txdesc-&gt;desc2.flags	|= (hidma) ? TXFLAG_64BIT : 0;</div><div class='add'>+	txdesc-&gt;desc2.datalen	= cpu_to_le16(len);</div><div class='add'>+	txdesc-&gt;desc2.bufaddrh	= cpu_to_le32((__u64)dmaaddr &gt;&gt; 32);</div><div class='add'>+	txdesc-&gt;desc2.bufaddrl	= cpu_to_le32(</div><div class='add'>+					(__u64)dmaaddr &amp; 0xFFFFFFFFUL);</div><div class='add'>+</div><div class='add'>+	txbi-&gt;mapping = dmaaddr;</div><div class='add'>+	txbi-&gt;len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+jme_map_tx_skb(struct jme_adapter *jme, struct sk_buff *skb, int idx)</div><div class='add'>+{</div><div class='add'>+	struct jme_ring *txring = jme-&gt;txring;</div><div class='add'>+	struct txdesc *txdesc = txring-&gt;desc, *ctxdesc;</div><div class='add'>+	struct jme_buffer_info *txbi = txring-&gt;bufinf, *ctxbi;</div><div class='add'>+	u8 hidma = jme-&gt;dev-&gt;features &amp; NETIF_F_HIGHDMA;</div><div class='add'>+	int i, nr_frags = skb_shinfo(skb)-&gt;nr_frags;</div><div class='add'>+	int mask = jme-&gt;tx_ring_mask;</div><div class='add'>+	struct skb_frag_struct *frag;</div><div class='add'>+	u32 len;</div><div class='add'>+</div><div class='add'>+	for (i = 0 ; i &lt; nr_frags ; ++i) {</div><div class='add'>+		frag = &amp;skb_shinfo(skb)-&gt;frags[i];</div><div class='add'>+		ctxdesc = txdesc + ((idx + i + 2) &amp; (mask));</div><div class='add'>+		ctxbi = txbi + ((idx + i + 2) &amp; (mask));</div><div class='add'>+</div><div class='add'>+		jme_fill_tx_map(jme-&gt;pdev, ctxdesc, ctxbi, frag-&gt;page,</div><div class='add'>+				 frag-&gt;page_offset, frag-&gt;size, hidma);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	len = skb_is_nonlinear(skb) ? skb_headlen(skb) : skb-&gt;len;</div><div class='add'>+	ctxdesc = txdesc + ((idx + 1) &amp; (mask));</div><div class='add'>+	ctxbi = txbi + ((idx + 1) &amp; (mask));</div><div class='add'>+	jme_fill_tx_map(jme-&gt;pdev, ctxdesc, ctxbi, virt_to_page(skb-&gt;data),</div><div class='add'>+			offset_in_page(skb-&gt;data), len, hidma);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+jme_expand_header(struct jme_adapter *jme, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	if (unlikely(skb_shinfo(skb)-&gt;gso_size &amp;&amp;</div><div class='add'>+			skb_header_cloned(skb) &amp;&amp;</div><div class='add'>+			pskb_expand_head(skb, 0, 0, GFP_ATOMIC))) {</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+jme_tx_tso(struct sk_buff *skb,</div><div class='add'>+		u16 *mss, u8 *flags)</div><div class='add'>+{</div><div class='add'>+	*mss = skb_shinfo(skb)-&gt;gso_size &lt;&lt; TXDESC_MSS_SHIFT;</div><div class='add'>+	if (*mss) {</div><div class='add'>+		*flags |= TXFLAG_LSEN;</div><div class='add'>+</div><div class='add'>+		if (skb-&gt;protocol == htons(ETH_P_IP)) {</div><div class='add'>+			struct iphdr *iph = ip_hdr(skb);</div><div class='add'>+</div><div class='add'>+			iph-&gt;check = 0;</div><div class='add'>+			tcp_hdr(skb)-&gt;check = ~csum_tcpudp_magic(iph-&gt;saddr,</div><div class='add'>+								iph-&gt;daddr, 0,</div><div class='add'>+								IPPROTO_TCP,</div><div class='add'>+								0);</div><div class='add'>+		} else {</div><div class='add'>+			struct ipv6hdr *ip6h = ipv6_hdr(skb);</div><div class='add'>+</div><div class='add'>+			tcp_hdr(skb)-&gt;check = ~csum_ipv6_magic(&amp;ip6h-&gt;saddr,</div><div class='add'>+								&amp;ip6h-&gt;daddr, 0,</div><div class='add'>+								IPPROTO_TCP,</div><div class='add'>+								0);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+jme_tx_csum(struct jme_adapter *jme, struct sk_buff *skb, u8 *flags)</div><div class='add'>+{</div><div class='add'>+	if (skb-&gt;ip_summed == CHECKSUM_PARTIAL) {</div><div class='add'>+		u8 ip_proto;</div><div class='add'>+</div><div class='add'>+		switch (skb-&gt;protocol) {</div><div class='add'>+		case htons(ETH_P_IP):</div><div class='add'>+			ip_proto = ip_hdr(skb)-&gt;protocol;</div><div class='add'>+			break;</div><div class='add'>+		case htons(ETH_P_IPV6):</div><div class='add'>+			ip_proto = ipv6_hdr(skb)-&gt;nexthdr;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			ip_proto = 0;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		switch (ip_proto) {</div><div class='add'>+		case IPPROTO_TCP:</div><div class='add'>+			*flags |= TXFLAG_TCPCS;</div><div class='add'>+			break;</div><div class='add'>+		case IPPROTO_UDP:</div><div class='add'>+			*flags |= TXFLAG_UDPCS;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			msg_tx_err(jme, "Error upper layer protocol.\n");</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+jme_tx_vlan(struct sk_buff *skb, u16 *vlan, u8 *flags)</div><div class='add'>+{</div><div class='add'>+	if (vlan_tx_tag_present(skb)) {</div><div class='add'>+		*flags |= TXFLAG_TAGON;</div><div class='add'>+		*vlan = vlan_tx_tag_get(skb);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+jme_fill_first_tx_desc(struct jme_adapter *jme, struct sk_buff *skb, int idx)</div><div class='add'>+{</div><div class='add'>+	struct jme_ring *txring = jme-&gt;txring;</div><div class='add'>+	struct txdesc *txdesc;</div><div class='add'>+	struct jme_buffer_info *txbi;</div><div class='add'>+	u8 flags;</div><div class='add'>+</div><div class='add'>+	txdesc = (struct txdesc *)txring-&gt;desc + idx;</div><div class='add'>+	txbi = txring-&gt;bufinf + idx;</div><div class='add'>+</div><div class='add'>+	txdesc-&gt;dw[0] = 0;</div><div class='add'>+	txdesc-&gt;dw[1] = 0;</div><div class='add'>+	txdesc-&gt;dw[2] = 0;</div><div class='add'>+	txdesc-&gt;dw[3] = 0;</div><div class='add'>+	txdesc-&gt;desc1.pktsize = cpu_to_le16(skb-&gt;len);</div><div class='add'>+	/*</div><div class='add'>+	 * Set OWN bit at final.</div><div class='add'>+	 * When kernel transmit faster than NIC.</div><div class='add'>+	 * And NIC trying to send this descriptor before we tell</div><div class='add'>+	 * it to start sending this TX queue.</div><div class='add'>+	 * Other fields are already filled correctly.</div><div class='add'>+	 */</div><div class='add'>+	wmb();</div><div class='add'>+	flags = TXFLAG_OWN | TXFLAG_INT;</div><div class='add'>+	/*</div><div class='add'>+	 * Set checksum flags while not tso</div><div class='add'>+	 */</div><div class='add'>+	if (jme_tx_tso(skb, &amp;txdesc-&gt;desc1.mss, &amp;flags))</div><div class='add'>+		jme_tx_csum(jme, skb, &amp;flags);</div><div class='add'>+	jme_tx_vlan(skb, &amp;txdesc-&gt;desc1.vlan, &amp;flags);</div><div class='add'>+	txdesc-&gt;desc1.flags = flags;</div><div class='add'>+	/*</div><div class='add'>+	 * Set tx buffer info after telling NIC to send</div><div class='add'>+	 * For better tx_clean timing</div><div class='add'>+	 */</div><div class='add'>+	wmb();</div><div class='add'>+	txbi-&gt;nr_desc = skb_shinfo(skb)-&gt;nr_frags + 2;</div><div class='add'>+	txbi-&gt;skb = skb;</div><div class='add'>+	txbi-&gt;len = skb-&gt;len;</div><div class='add'>+	txbi-&gt;start_xmit = jiffies;</div><div class='add'>+	if (!txbi-&gt;start_xmit)</div><div class='add'>+		txbi-&gt;start_xmit = (0UL-1);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+jme_stop_queue_if_full(struct jme_adapter *jme)</div><div class='add'>+{</div><div class='add'>+	struct jme_ring *txring = jme-&gt;txring;</div><div class='add'>+	struct jme_buffer_info *txbi = txring-&gt;bufinf;</div><div class='add'>+	int idx = atomic_read(&amp;txring-&gt;next_to_clean);</div><div class='add'>+</div><div class='add'>+	txbi += idx;</div><div class='add'>+</div><div class='add'>+	smp_wmb();</div><div class='add'>+	if (unlikely(atomic_read(&amp;txring-&gt;nr_free) &lt; (MAX_SKB_FRAGS+2))) {</div><div class='add'>+		netif_stop_queue(jme-&gt;dev);</div><div class='add'>+		msg_tx_queued(jme, "TX Queue Paused.\n");</div><div class='add'>+		smp_wmb();</div><div class='add'>+		if (atomic_read(&amp;txring-&gt;nr_free)</div><div class='add'>+			&gt;= (jme-&gt;tx_wake_threshold)) {</div><div class='add'>+			netif_wake_queue(jme-&gt;dev);</div><div class='add'>+			msg_tx_queued(jme, "TX Queue Fast Waked.\n");</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (unlikely(txbi-&gt;start_xmit &amp;&amp;</div><div class='add'>+			(jiffies - txbi-&gt;start_xmit) &gt;= TX_TIMEOUT &amp;&amp;</div><div class='add'>+			txbi-&gt;skb)) {</div><div class='add'>+		netif_stop_queue(jme-&gt;dev);</div><div class='add'>+		msg_tx_queued(jme, "TX Queue Stopped %d@%lu.\n", idx, jiffies);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This function is already protected by netif_tx_lock()</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+jme_start_xmit(struct sk_buff *skb, struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct jme_adapter *jme = netdev_priv(netdev);</div><div class='add'>+	int idx;</div><div class='add'>+</div><div class='add'>+	if (unlikely(jme_expand_header(jme, skb))) {</div><div class='add'>+		++(NET_STAT(jme).tx_dropped);</div><div class='add'>+		return NETDEV_TX_OK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	idx = jme_alloc_txdesc(jme, skb);</div><div class='add'>+</div><div class='add'>+	if (unlikely(idx &lt; 0)) {</div><div class='add'>+		netif_stop_queue(netdev);</div><div class='add'>+		msg_tx_err(jme, "BUG! Tx ring full when queue awake!\n");</div><div class='add'>+</div><div class='add'>+		return NETDEV_TX_BUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	jme_map_tx_skb(jme, skb, idx);</div><div class='add'>+	jme_fill_first_tx_desc(jme, skb, idx);</div><div class='add'>+</div><div class='add'>+	jwrite32(jme, JME_TXCS, jme-&gt;reg_txcs |</div><div class='add'>+				TXCS_SELECT_QUEUE0 |</div><div class='add'>+				TXCS_QUEUE0S |</div><div class='add'>+				TXCS_ENABLE);</div><div class='add'>+	netdev-&gt;trans_start = jiffies;</div><div class='add'>+</div><div class='add'>+	tx_dbg(jme, "xmit: %d+%d@%lu\n", idx,</div><div class='add'>+			skb_shinfo(skb)-&gt;nr_frags + 2,</div><div class='add'>+			jiffies);</div><div class='add'>+	jme_stop_queue_if_full(jme);</div><div class='add'>+</div><div class='add'>+	return NETDEV_TX_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+jme_set_macaddr(struct net_device *netdev, void *p)</div><div class='add'>+{</div><div class='add'>+	struct jme_adapter *jme = netdev_priv(netdev);</div><div class='add'>+	struct sockaddr *addr = p;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	if (netif_running(netdev))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;jme-&gt;macaddr_lock);</div><div class='add'>+	memcpy(netdev-&gt;dev_addr, addr-&gt;sa_data, netdev-&gt;addr_len);</div><div class='add'>+</div><div class='add'>+	val = (addr-&gt;sa_data[3] &amp; 0xff) &lt;&lt; 24 |</div><div class='add'>+	      (addr-&gt;sa_data[2] &amp; 0xff) &lt;&lt; 16 |</div><div class='add'>+	      (addr-&gt;sa_data[1] &amp; 0xff) &lt;&lt;  8 |</div><div class='add'>+	      (addr-&gt;sa_data[0] &amp; 0xff);</div><div class='add'>+	jwrite32(jme, JME_RXUMA_LO, val);</div><div class='add'>+	val = (addr-&gt;sa_data[5] &amp; 0xff) &lt;&lt; 8 |</div><div class='add'>+	      (addr-&gt;sa_data[4] &amp; 0xff);</div><div class='add'>+	jwrite32(jme, JME_RXUMA_HI, val);</div><div class='add'>+	spin_unlock_bh(&amp;jme-&gt;macaddr_lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+jme_set_multi(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct jme_adapter *jme = netdev_priv(netdev);</div><div class='add'>+	u32 mc_hash[2] = {};</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;jme-&gt;rxmcs_lock);</div><div class='add'>+</div><div class='add'>+	jme-&gt;reg_rxmcs |= RXMCS_BRDFRAME | RXMCS_UNIFRAME;</div><div class='add'>+</div><div class='add'>+	if (netdev-&gt;flags &amp; IFF_PROMISC) {</div><div class='add'>+		jme-&gt;reg_rxmcs |= RXMCS_ALLFRAME;</div><div class='add'>+	} else if (netdev-&gt;flags &amp; IFF_ALLMULTI) {</div><div class='add'>+		jme-&gt;reg_rxmcs |= RXMCS_ALLMULFRAME;</div><div class='add'>+	} else if (netdev-&gt;flags &amp; IFF_MULTICAST) {</div><div class='add'>+		struct dev_mc_list *mclist;</div><div class='add'>+		int bit_nr;</div><div class='add'>+</div><div class='add'>+		jme-&gt;reg_rxmcs |= RXMCS_MULFRAME | RXMCS_MULFILTERED;</div><div class='add'>+		for (i = 0, mclist = netdev-&gt;mc_list;</div><div class='add'>+			mclist &amp;&amp; i &lt; netdev-&gt;mc_count;</div><div class='add'>+			++i, mclist = mclist-&gt;next) {</div><div class='add'>+</div><div class='add'>+			bit_nr = ether_crc(ETH_ALEN, mclist-&gt;dmi_addr) &amp; 0x3F;</div><div class='add'>+			mc_hash[bit_nr &gt;&gt; 5] |= 1 &lt;&lt; (bit_nr &amp; 0x1F);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		jwrite32(jme, JME_RXMCHT_LO, mc_hash[0]);</div><div class='add'>+		jwrite32(jme, JME_RXMCHT_HI, mc_hash[1]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	wmb();</div><div class='add'>+	jwrite32(jme, JME_RXMCS, jme-&gt;reg_rxmcs);</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;jme-&gt;rxmcs_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+jme_change_mtu(struct net_device *netdev, int new_mtu)</div><div class='add'>+{</div><div class='add'>+	struct jme_adapter *jme = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	if (new_mtu == jme-&gt;old_mtu)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (((new_mtu + ETH_HLEN) &gt; MAX_ETHERNET_JUMBO_PACKET_SIZE) ||</div><div class='add'>+		((new_mtu) &lt; IPV6_MIN_MTU))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (new_mtu &gt; 4000) {</div><div class='add'>+		jme-&gt;reg_rxcs &amp;= ~RXCS_FIFOTHNP;</div><div class='add'>+		jme-&gt;reg_rxcs |= RXCS_FIFOTHNP_64QW;</div><div class='add'>+		jme_restart_rx_engine(jme);</div><div class='add'>+	} else {</div><div class='add'>+		jme-&gt;reg_rxcs &amp;= ~RXCS_FIFOTHNP;</div><div class='add'>+		jme-&gt;reg_rxcs |= RXCS_FIFOTHNP_128QW;</div><div class='add'>+		jme_restart_rx_engine(jme);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (new_mtu &gt; 1900) {</div><div class='add'>+		netdev-&gt;features &amp;= ~(NETIF_F_HW_CSUM |</div><div class='add'>+				NETIF_F_TSO |</div><div class='add'>+				NETIF_F_TSO6);</div><div class='add'>+	} else {</div><div class='add'>+		if (test_bit(JME_FLAG_TXCSUM, &amp;jme-&gt;flags))</div><div class='add'>+			netdev-&gt;features |= NETIF_F_HW_CSUM;</div><div class='add'>+		if (test_bit(JME_FLAG_TSO, &amp;jme-&gt;flags))</div><div class='add'>+			netdev-&gt;features |= NETIF_F_TSO | NETIF_F_TSO6;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netdev-&gt;mtu = new_mtu;</div><div class='add'>+	jme_reset_link(jme);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+jme_tx_timeout(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct jme_adapter *jme = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	jme-&gt;phylink = 0;</div><div class='add'>+	jme_reset_phy_processor(jme);</div><div class='add'>+	if (test_bit(JME_FLAG_SSET, &amp;jme-&gt;flags))</div><div class='add'>+		jme_set_settings(netdev, &amp;jme-&gt;old_ecmd);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Force to Reset the link again</div><div class='add'>+	 */</div><div class='add'>+	jme_reset_link(jme);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+jme_vlan_rx_register(struct net_device *netdev, struct vlan_group *grp)</div><div class='add'>+{</div><div class='add'>+	struct jme_adapter *jme = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	jme-&gt;vlgrp = grp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+jme_get_drvinfo(struct net_device *netdev,</div><div class='add'>+		     struct ethtool_drvinfo *info)</div><div class='add'>+{</div><div class='add'>+	struct jme_adapter *jme = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	strcpy(info-&gt;driver, DRV_NAME);</div><div class='add'>+	strcpy(info-&gt;version, DRV_VERSION);</div><div class='add'>+	strcpy(info-&gt;bus_info, pci_name(jme-&gt;pdev));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+jme_get_regs_len(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	return JME_REG_LEN;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mmapio_memcpy(struct jme_adapter *jme, u32 *p, u32 reg, int len)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0 ; i &lt; len ; i += 4)</div><div class='add'>+		p[i &gt;&gt; 2] = jread32(jme, reg + i);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mdio_memcpy(struct jme_adapter *jme, u32 *p, int reg_nr)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	u16 *p16 = (u16 *)p;</div><div class='add'>+</div><div class='add'>+	for (i = 0 ; i &lt; reg_nr ; ++i)</div><div class='add'>+		p16[i] = jme_mdio_read(jme-&gt;dev, jme-&gt;mii_if.phy_id, i);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+jme_get_regs(struct net_device *netdev, struct ethtool_regs *regs, void *p)</div><div class='add'>+{</div><div class='add'>+	struct jme_adapter *jme = netdev_priv(netdev);</div><div class='add'>+	u32 *p32 = (u32 *)p;</div><div class='add'>+</div><div class='add'>+	memset(p, 0xFF, JME_REG_LEN);</div><div class='add'>+</div><div class='add'>+	regs-&gt;version = 1;</div><div class='add'>+	mmapio_memcpy(jme, p32, JME_MAC, JME_MAC_LEN);</div><div class='add'>+</div><div class='add'>+	p32 += 0x100 &gt;&gt; 2;</div><div class='add'>+	mmapio_memcpy(jme, p32, JME_PHY, JME_PHY_LEN);</div><div class='add'>+</div><div class='add'>+	p32 += 0x100 &gt;&gt; 2;</div><div class='add'>+	mmapio_memcpy(jme, p32, JME_MISC, JME_MISC_LEN);</div><div class='add'>+</div><div class='add'>+	p32 += 0x100 &gt;&gt; 2;</div><div class='add'>+	mmapio_memcpy(jme, p32, JME_RSS, JME_RSS_LEN);</div><div class='add'>+</div><div class='add'>+	p32 += 0x100 &gt;&gt; 2;</div><div class='add'>+	mdio_memcpy(jme, p32, JME_PHY_REG_NR);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+jme_get_coalesce(struct net_device *netdev, struct ethtool_coalesce *ecmd)</div><div class='add'>+{</div><div class='add'>+	struct jme_adapter *jme = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	ecmd-&gt;tx_coalesce_usecs = PCC_TX_TO;</div><div class='add'>+	ecmd-&gt;tx_max_coalesced_frames = PCC_TX_CNT;</div><div class='add'>+</div><div class='add'>+	if (test_bit(JME_FLAG_POLL, &amp;jme-&gt;flags)) {</div><div class='add'>+		ecmd-&gt;use_adaptive_rx_coalesce = false;</div><div class='add'>+		ecmd-&gt;rx_coalesce_usecs = 0;</div><div class='add'>+		ecmd-&gt;rx_max_coalesced_frames = 0;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ecmd-&gt;use_adaptive_rx_coalesce = true;</div><div class='add'>+</div><div class='add'>+	switch (jme-&gt;dpi.cur) {</div><div class='add'>+	case PCC_P1:</div><div class='add'>+		ecmd-&gt;rx_coalesce_usecs = PCC_P1_TO;</div><div class='add'>+		ecmd-&gt;rx_max_coalesced_frames = PCC_P1_CNT;</div><div class='add'>+		break;</div><div class='add'>+	case PCC_P2:</div><div class='add'>+		ecmd-&gt;rx_coalesce_usecs = PCC_P2_TO;</div><div class='add'>+		ecmd-&gt;rx_max_coalesced_frames = PCC_P2_CNT;</div><div class='add'>+		break;</div><div class='add'>+	case PCC_P3:</div><div class='add'>+		ecmd-&gt;rx_coalesce_usecs = PCC_P3_TO;</div><div class='add'>+		ecmd-&gt;rx_max_coalesced_frames = PCC_P3_CNT;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+jme_set_coalesce(struct net_device *netdev, struct ethtool_coalesce *ecmd)</div><div class='add'>+{</div><div class='add'>+	struct jme_adapter *jme = netdev_priv(netdev);</div><div class='add'>+	struct dynpcc_info *dpi = &amp;(jme-&gt;dpi);</div><div class='add'>+</div><div class='add'>+	if (netif_running(netdev))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	if (ecmd-&gt;use_adaptive_rx_coalesce</div><div class='add'>+	&amp;&amp; test_bit(JME_FLAG_POLL, &amp;jme-&gt;flags)) {</div><div class='add'>+		clear_bit(JME_FLAG_POLL, &amp;jme-&gt;flags);</div><div class='add'>+		jme-&gt;jme_rx = netif_rx;</div><div class='add'>+		jme-&gt;jme_vlan_rx = vlan_hwaccel_rx;</div><div class='add'>+		dpi-&gt;cur		= PCC_P1;</div><div class='add'>+		dpi-&gt;attempt		= PCC_P1;</div><div class='add'>+		dpi-&gt;cnt		= 0;</div><div class='add'>+		jme_set_rx_pcc(jme, PCC_P1);</div><div class='add'>+		jme_interrupt_mode(jme);</div><div class='add'>+	} else if (!(ecmd-&gt;use_adaptive_rx_coalesce)</div><div class='add'>+	&amp;&amp; !(test_bit(JME_FLAG_POLL, &amp;jme-&gt;flags))) {</div><div class='add'>+		set_bit(JME_FLAG_POLL, &amp;jme-&gt;flags);</div><div class='add'>+		jme-&gt;jme_rx = netif_receive_skb;</div><div class='add'>+		jme-&gt;jme_vlan_rx = vlan_hwaccel_receive_skb;</div><div class='add'>+		jme_interrupt_mode(jme);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+jme_get_pauseparam(struct net_device *netdev,</div><div class='add'>+			struct ethtool_pauseparam *ecmd)</div><div class='add'>+{</div><div class='add'>+	struct jme_adapter *jme = netdev_priv(netdev);</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	ecmd-&gt;tx_pause = (jme-&gt;reg_txpfc &amp; TXPFC_PF_EN) != 0;</div><div class='add'>+	ecmd-&gt;rx_pause = (jme-&gt;reg_rxmcs &amp; RXMCS_FLOWCTRL) != 0;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;jme-&gt;phy_lock);</div><div class='add'>+	val = jme_mdio_read(jme-&gt;dev, jme-&gt;mii_if.phy_id, MII_ADVERTISE);</div><div class='add'>+	spin_unlock_bh(&amp;jme-&gt;phy_lock);</div><div class='add'>+</div><div class='add'>+	ecmd-&gt;autoneg =</div><div class='add'>+		(val &amp; (ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM)) != 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+jme_set_pauseparam(struct net_device *netdev,</div><div class='add'>+			struct ethtool_pauseparam *ecmd)</div><div class='add'>+{</div><div class='add'>+	struct jme_adapter *jme = netdev_priv(netdev);</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	if (((jme-&gt;reg_txpfc &amp; TXPFC_PF_EN) != 0) ^</div><div class='add'>+		(ecmd-&gt;tx_pause != 0)) {</div><div class='add'>+</div><div class='add'>+		if (ecmd-&gt;tx_pause)</div><div class='add'>+			jme-&gt;reg_txpfc |= TXPFC_PF_EN;</div><div class='add'>+		else</div><div class='add'>+			jme-&gt;reg_txpfc &amp;= ~TXPFC_PF_EN;</div><div class='add'>+</div><div class='add'>+		jwrite32(jme, JME_TXPFC, jme-&gt;reg_txpfc);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;jme-&gt;rxmcs_lock);</div><div class='add'>+	if (((jme-&gt;reg_rxmcs &amp; RXMCS_FLOWCTRL) != 0) ^</div><div class='add'>+		(ecmd-&gt;rx_pause != 0)) {</div><div class='add'>+</div><div class='add'>+		if (ecmd-&gt;rx_pause)</div><div class='add'>+			jme-&gt;reg_rxmcs |= RXMCS_FLOWCTRL;</div><div class='add'>+		else</div><div class='add'>+			jme-&gt;reg_rxmcs &amp;= ~RXMCS_FLOWCTRL;</div><div class='add'>+</div><div class='add'>+		jwrite32(jme, JME_RXMCS, jme-&gt;reg_rxmcs);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(&amp;jme-&gt;rxmcs_lock);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;jme-&gt;phy_lock);</div><div class='add'>+	val = jme_mdio_read(jme-&gt;dev, jme-&gt;mii_if.phy_id, MII_ADVERTISE);</div><div class='add'>+	if (((val &amp; (ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM)) != 0) ^</div><div class='add'>+		(ecmd-&gt;autoneg != 0)) {</div><div class='add'>+</div><div class='add'>+		if (ecmd-&gt;autoneg)</div><div class='add'>+			val |= (ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM);</div><div class='add'>+		else</div><div class='add'>+			val &amp;= ~(ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM);</div><div class='add'>+</div><div class='add'>+		jme_mdio_write(jme-&gt;dev, jme-&gt;mii_if.phy_id,</div><div class='add'>+				MII_ADVERTISE, val);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(&amp;jme-&gt;phy_lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+jme_get_wol(struct net_device *netdev,</div><div class='add'>+		struct ethtool_wolinfo *wol)</div><div class='add'>+{</div><div class='add'>+	struct jme_adapter *jme = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	wol-&gt;supported = WAKE_MAGIC | WAKE_PHY;</div><div class='add'>+</div><div class='add'>+	wol-&gt;wolopts = 0;</div><div class='add'>+</div><div class='add'>+	if (jme-&gt;reg_pmcs &amp; (PMCS_LFEN | PMCS_LREN))</div><div class='add'>+		wol-&gt;wolopts |= WAKE_PHY;</div><div class='add'>+</div><div class='add'>+	if (jme-&gt;reg_pmcs &amp; PMCS_MFEN)</div><div class='add'>+		wol-&gt;wolopts |= WAKE_MAGIC;</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+jme_set_wol(struct net_device *netdev,</div><div class='add'>+		struct ethtool_wolinfo *wol)</div><div class='add'>+{</div><div class='add'>+	struct jme_adapter *jme = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	if (wol-&gt;wolopts &amp; (WAKE_MAGICSECURE |</div><div class='add'>+				WAKE_UCAST |</div><div class='add'>+				WAKE_MCAST |</div><div class='add'>+				WAKE_BCAST |</div><div class='add'>+				WAKE_ARP))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	jme-&gt;reg_pmcs = 0;</div><div class='add'>+</div><div class='add'>+	if (wol-&gt;wolopts &amp; WAKE_PHY)</div><div class='add'>+		jme-&gt;reg_pmcs |= PMCS_LFEN | PMCS_LREN;</div><div class='add'>+</div><div class='add'>+	if (wol-&gt;wolopts &amp; WAKE_MAGIC)</div><div class='add'>+		jme-&gt;reg_pmcs |= PMCS_MFEN;</div><div class='add'>+</div><div class='add'>+	jwrite32(jme, JME_PMCS, jme-&gt;reg_pmcs);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+jme_get_settings(struct net_device *netdev,</div><div class='add'>+		     struct ethtool_cmd *ecmd)</div><div class='add'>+{</div><div class='add'>+	struct jme_adapter *jme = netdev_priv(netdev);</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;jme-&gt;phy_lock);</div><div class='add'>+	rc = mii_ethtool_gset(&amp;(jme-&gt;mii_if), ecmd);</div><div class='add'>+	spin_unlock_bh(&amp;jme-&gt;phy_lock);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+jme_set_settings(struct net_device *netdev,</div><div class='add'>+		     struct ethtool_cmd *ecmd)</div><div class='add'>+{</div><div class='add'>+	struct jme_adapter *jme = netdev_priv(netdev);</div><div class='add'>+	int rc, fdc = 0;</div><div class='add'>+</div><div class='add'>+	if (ecmd-&gt;speed == SPEED_1000 &amp;&amp; ecmd-&gt;autoneg != AUTONEG_ENABLE)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (jme-&gt;mii_if.force_media &amp;&amp;</div><div class='add'>+	ecmd-&gt;autoneg != AUTONEG_ENABLE &amp;&amp;</div><div class='add'>+	(jme-&gt;mii_if.full_duplex != ecmd-&gt;duplex))</div><div class='add'>+		fdc = 1;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;jme-&gt;phy_lock);</div><div class='add'>+	rc = mii_ethtool_sset(&amp;(jme-&gt;mii_if), ecmd);</div><div class='add'>+	spin_unlock_bh(&amp;jme-&gt;phy_lock);</div><div class='add'>+</div><div class='add'>+	if (!rc &amp;&amp; fdc)</div><div class='add'>+		jme_reset_link(jme);</div><div class='add'>+</div><div class='add'>+	if (!rc) {</div><div class='add'>+		set_bit(JME_FLAG_SSET, &amp;jme-&gt;flags);</div><div class='add'>+		jme-&gt;old_ecmd = *ecmd;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32</div><div class='add'>+jme_get_link(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct jme_adapter *jme = netdev_priv(netdev);</div><div class='add'>+	return jread32(jme, JME_PHY_LINK) &amp; PHY_LINK_UP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32</div><div class='add'>+jme_get_msglevel(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct jme_adapter *jme = netdev_priv(netdev);</div><div class='add'>+	return jme-&gt;msg_enable;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+jme_set_msglevel(struct net_device *netdev, u32 value)</div><div class='add'>+{</div><div class='add'>+	struct jme_adapter *jme = netdev_priv(netdev);</div><div class='add'>+	jme-&gt;msg_enable = value;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32</div><div class='add'>+jme_get_rx_csum(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct jme_adapter *jme = netdev_priv(netdev);</div><div class='add'>+	return jme-&gt;reg_rxmcs &amp; RXMCS_CHECKSUM;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+jme_set_rx_csum(struct net_device *netdev, u32 on)</div><div class='add'>+{</div><div class='add'>+	struct jme_adapter *jme = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;jme-&gt;rxmcs_lock);</div><div class='add'>+	if (on)</div><div class='add'>+		jme-&gt;reg_rxmcs |= RXMCS_CHECKSUM;</div><div class='add'>+	else</div><div class='add'>+		jme-&gt;reg_rxmcs &amp;= ~RXMCS_CHECKSUM;</div><div class='add'>+	jwrite32(jme, JME_RXMCS, jme-&gt;reg_rxmcs);</div><div class='add'>+	spin_unlock_bh(&amp;jme-&gt;rxmcs_lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+jme_set_tx_csum(struct net_device *netdev, u32 on)</div><div class='add'>+{</div><div class='add'>+	struct jme_adapter *jme = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	if (on) {</div><div class='add'>+		set_bit(JME_FLAG_TXCSUM, &amp;jme-&gt;flags);</div><div class='add'>+		if (netdev-&gt;mtu &lt;= 1900)</div><div class='add'>+			netdev-&gt;features |= NETIF_F_HW_CSUM;</div><div class='add'>+	} else {</div><div class='add'>+		clear_bit(JME_FLAG_TXCSUM, &amp;jme-&gt;flags);</div><div class='add'>+		netdev-&gt;features &amp;= ~NETIF_F_HW_CSUM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+jme_set_tso(struct net_device *netdev, u32 on)</div><div class='add'>+{</div><div class='add'>+	struct jme_adapter *jme = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	if (on) {</div><div class='add'>+		set_bit(JME_FLAG_TSO, &amp;jme-&gt;flags);</div><div class='add'>+		if (netdev-&gt;mtu &lt;= 1900)</div><div class='add'>+			netdev-&gt;features |= NETIF_F_TSO | NETIF_F_TSO6;</div><div class='add'>+	} else {</div><div class='add'>+		clear_bit(JME_FLAG_TSO, &amp;jme-&gt;flags);</div><div class='add'>+		netdev-&gt;features &amp;= ~(NETIF_F_TSO | NETIF_F_TSO6);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+jme_nway_reset(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct jme_adapter *jme = netdev_priv(netdev);</div><div class='add'>+	jme_restart_an(jme);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8</div><div class='add'>+jme_smb_read(struct jme_adapter *jme, unsigned int addr)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+	int to;</div><div class='add'>+</div><div class='add'>+	val = jread32(jme, JME_SMBCSR);</div><div class='add'>+	to = JME_SMB_BUSY_TIMEOUT;</div><div class='add'>+	while ((val &amp; SMBCSR_BUSY) &amp;&amp; --to) {</div><div class='add'>+		msleep(1);</div><div class='add'>+		val = jread32(jme, JME_SMBCSR);</div><div class='add'>+	}</div><div class='add'>+	if (!to) {</div><div class='add'>+		msg_hw(jme, "SMB Bus Busy.\n");</div><div class='add'>+		return 0xFF;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	jwrite32(jme, JME_SMBINTF,</div><div class='add'>+		((addr &lt;&lt; SMBINTF_HWADDR_SHIFT) &amp; SMBINTF_HWADDR) |</div><div class='add'>+		SMBINTF_HWRWN_READ |</div><div class='add'>+		SMBINTF_HWCMD);</div><div class='add'>+</div><div class='add'>+	val = jread32(jme, JME_SMBINTF);</div><div class='add'>+	to = JME_SMB_BUSY_TIMEOUT;</div><div class='add'>+	while ((val &amp; SMBINTF_HWCMD) &amp;&amp; --to) {</div><div class='add'>+		msleep(1);</div><div class='add'>+		val = jread32(jme, JME_SMBINTF);</div><div class='add'>+	}</div><div class='add'>+	if (!to) {</div><div class='add'>+		msg_hw(jme, "SMB Bus Busy.\n");</div><div class='add'>+		return 0xFF;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return (val &amp; SMBINTF_HWDATR) &gt;&gt; SMBINTF_HWDATR_SHIFT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+jme_smb_write(struct jme_adapter *jme, unsigned int addr, u8 data)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+	int to;</div><div class='add'>+</div><div class='add'>+	val = jread32(jme, JME_SMBCSR);</div><div class='add'>+	to = JME_SMB_BUSY_TIMEOUT;</div><div class='add'>+	while ((val &amp; SMBCSR_BUSY) &amp;&amp; --to) {</div><div class='add'>+		msleep(1);</div><div class='add'>+		val = jread32(jme, JME_SMBCSR);</div><div class='add'>+	}</div><div class='add'>+	if (!to) {</div><div class='add'>+		msg_hw(jme, "SMB Bus Busy.\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	jwrite32(jme, JME_SMBINTF,</div><div class='add'>+		((data &lt;&lt; SMBINTF_HWDATW_SHIFT) &amp; SMBINTF_HWDATW) |</div><div class='add'>+		((addr &lt;&lt; SMBINTF_HWADDR_SHIFT) &amp; SMBINTF_HWADDR) |</div><div class='add'>+		SMBINTF_HWRWN_WRITE |</div><div class='add'>+		SMBINTF_HWCMD);</div><div class='add'>+</div><div class='add'>+	val = jread32(jme, JME_SMBINTF);</div><div class='add'>+	to = JME_SMB_BUSY_TIMEOUT;</div><div class='add'>+	while ((val &amp; SMBINTF_HWCMD) &amp;&amp; --to) {</div><div class='add'>+		msleep(1);</div><div class='add'>+		val = jread32(jme, JME_SMBINTF);</div><div class='add'>+	}</div><div class='add'>+	if (!to) {</div><div class='add'>+		msg_hw(jme, "SMB Bus Busy.\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mdelay(2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+jme_get_eeprom_len(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct jme_adapter *jme = netdev_priv(netdev);</div><div class='add'>+	u32 val;</div><div class='add'>+	val = jread32(jme, JME_SMBCSR);</div><div class='add'>+	return (val &amp; SMBCSR_EEPROMD) ? JME_SMB_LEN : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+jme_get_eeprom(struct net_device *netdev,</div><div class='add'>+		struct ethtool_eeprom *eeprom, u8 *data)</div><div class='add'>+{</div><div class='add'>+	struct jme_adapter *jme = netdev_priv(netdev);</div><div class='add'>+	int i, offset = eeprom-&gt;offset, len = eeprom-&gt;len;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * ethtool will check the boundary for us</div><div class='add'>+	 */</div><div class='add'>+	eeprom-&gt;magic = JME_EEPROM_MAGIC;</div><div class='add'>+	for (i = 0 ; i &lt; len ; ++i)</div><div class='add'>+		data[i] = jme_smb_read(jme, i + offset);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+jme_set_eeprom(struct net_device *netdev,</div><div class='add'>+		struct ethtool_eeprom *eeprom, u8 *data)</div><div class='add'>+{</div><div class='add'>+	struct jme_adapter *jme = netdev_priv(netdev);</div><div class='add'>+	int i, offset = eeprom-&gt;offset, len = eeprom-&gt;len;</div><div class='add'>+</div><div class='add'>+	if (eeprom-&gt;magic != JME_EEPROM_MAGIC)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * ethtool will check the boundary for us</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0 ; i &lt; len ; ++i)</div><div class='add'>+		jme_smb_write(jme, i + offset, data[i]);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct ethtool_ops jme_ethtool_ops = {</div><div class='add'>+	.get_drvinfo            = jme_get_drvinfo,</div><div class='add'>+	.get_regs_len		= jme_get_regs_len,</div><div class='add'>+	.get_regs		= jme_get_regs,</div><div class='add'>+	.get_coalesce		= jme_get_coalesce,</div><div class='add'>+	.set_coalesce		= jme_set_coalesce,</div><div class='add'>+	.get_pauseparam		= jme_get_pauseparam,</div><div class='add'>+	.set_pauseparam		= jme_set_pauseparam,</div><div class='add'>+	.get_wol		= jme_get_wol,</div><div class='add'>+	.set_wol		= jme_set_wol,</div><div class='add'>+	.get_settings		= jme_get_settings,</div><div class='add'>+	.set_settings		= jme_set_settings,</div><div class='add'>+	.get_link		= jme_get_link,</div><div class='add'>+	.get_msglevel           = jme_get_msglevel,</div><div class='add'>+	.set_msglevel           = jme_set_msglevel,</div><div class='add'>+	.get_rx_csum		= jme_get_rx_csum,</div><div class='add'>+	.set_rx_csum		= jme_set_rx_csum,</div><div class='add'>+	.set_tx_csum		= jme_set_tx_csum,</div><div class='add'>+	.set_tso		= jme_set_tso,</div><div class='add'>+	.set_sg			= ethtool_op_set_sg,</div><div class='add'>+	.nway_reset             = jme_nway_reset,</div><div class='add'>+	.get_eeprom_len		= jme_get_eeprom_len,</div><div class='add'>+	.get_eeprom		= jme_get_eeprom,</div><div class='add'>+	.set_eeprom		= jme_set_eeprom,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+jme_pci_dma64(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	if (!pci_set_dma_mask(pdev, DMA_64BIT_MASK))</div><div class='add'>+		if (!pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK))</div><div class='add'>+			return 1;</div><div class='add'>+</div><div class='add'>+	if (!pci_set_dma_mask(pdev, DMA_40BIT_MASK))</div><div class='add'>+		if (!pci_set_consistent_dma_mask(pdev, DMA_40BIT_MASK))</div><div class='add'>+			return 1;</div><div class='add'>+</div><div class='add'>+	if (!pci_set_dma_mask(pdev, DMA_32BIT_MASK))</div><div class='add'>+		if (!pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK))</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+jme_phy_init(struct jme_adapter *jme)</div><div class='add'>+{</div><div class='add'>+	u16 reg26;</div><div class='add'>+</div><div class='add'>+	reg26 = jme_mdio_read(jme-&gt;dev, jme-&gt;mii_if.phy_id, 26);</div><div class='add'>+	jme_mdio_write(jme-&gt;dev, jme-&gt;mii_if.phy_id, 26, reg26 | 0x1000);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+jme_check_hw_ver(struct jme_adapter *jme)</div><div class='add'>+{</div><div class='add'>+	u32 chipmode;</div><div class='add'>+</div><div class='add'>+	chipmode = jread32(jme, JME_CHIPMODE);</div><div class='add'>+</div><div class='add'>+	jme-&gt;fpgaver = (chipmode &amp; CM_FPGAVER_MASK) &gt;&gt; CM_FPGAVER_SHIFT;</div><div class='add'>+	jme-&gt;chiprev = (chipmode &amp; CM_CHIPREV_MASK) &gt;&gt; CM_CHIPREV_SHIFT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devinit</div><div class='add'>+jme_init_one(struct pci_dev *pdev,</div><div class='add'>+	     const struct pci_device_id *ent)</div><div class='add'>+{</div><div class='add'>+	int rc = 0, using_dac, i;</div><div class='add'>+	struct net_device *netdev;</div><div class='add'>+	struct jme_adapter *jme;</div><div class='add'>+	u16 bmcr, bmsr;</div><div class='add'>+	u32 apmc;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * set up PCI device basics</div><div class='add'>+	 */</div><div class='add'>+	rc = pci_enable_device(pdev);</div><div class='add'>+	if (rc) {</div><div class='add'>+		jeprintk(pdev, "Cannot enable PCI device.\n");</div><div class='add'>+		goto err_out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	using_dac = jme_pci_dma64(pdev);</div><div class='add'>+	if (using_dac &lt; 0) {</div><div class='add'>+		jeprintk(pdev, "Cannot set PCI DMA Mask.\n");</div><div class='add'>+		rc = -EIO;</div><div class='add'>+		goto err_out_disable_pdev;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!(pci_resource_flags(pdev, 0) &amp; IORESOURCE_MEM)) {</div><div class='add'>+		jeprintk(pdev, "No PCI resource region found.\n");</div><div class='add'>+		rc = -ENOMEM;</div><div class='add'>+		goto err_out_disable_pdev;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = pci_request_regions(pdev, DRV_NAME);</div><div class='add'>+	if (rc) {</div><div class='add'>+		jeprintk(pdev, "Cannot obtain PCI resource region.\n");</div><div class='add'>+		goto err_out_disable_pdev;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pci_set_master(pdev);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * alloc and init net device</div><div class='add'>+	 */</div><div class='add'>+	netdev = alloc_etherdev(sizeof(*jme));</div><div class='add'>+	if (!netdev) {</div><div class='add'>+		jeprintk(pdev, "Cannot allocate netdev structure.\n");</div><div class='add'>+		rc = -ENOMEM;</div><div class='add'>+		goto err_out_release_regions;</div><div class='add'>+	}</div><div class='add'>+	netdev-&gt;open			= jme_open;</div><div class='add'>+	netdev-&gt;stop			= jme_close;</div><div class='add'>+	netdev-&gt;hard_start_xmit		= jme_start_xmit;</div><div class='add'>+	netdev-&gt;set_mac_address		= jme_set_macaddr;</div><div class='add'>+	netdev-&gt;set_multicast_list	= jme_set_multi;</div><div class='add'>+	netdev-&gt;change_mtu		= jme_change_mtu;</div><div class='add'>+	netdev-&gt;ethtool_ops		= &amp;jme_ethtool_ops;</div><div class='add'>+	netdev-&gt;tx_timeout		= jme_tx_timeout;</div><div class='add'>+	netdev-&gt;watchdog_timeo		= TX_TIMEOUT;</div><div class='add'>+	netdev-&gt;vlan_rx_register	= jme_vlan_rx_register;</div><div class='add'>+	NETDEV_GET_STATS(netdev, &amp;jme_get_stats);</div><div class='add'>+	netdev-&gt;features		=	NETIF_F_HW_CSUM |</div><div class='add'>+						NETIF_F_SG |</div><div class='add'>+						NETIF_F_TSO |</div><div class='add'>+						NETIF_F_TSO6 |</div><div class='add'>+						NETIF_F_HW_VLAN_TX |</div><div class='add'>+						NETIF_F_HW_VLAN_RX;</div><div class='add'>+	if (using_dac)</div><div class='add'>+		netdev-&gt;features	|=	NETIF_F_HIGHDMA;</div><div class='add'>+</div><div class='add'>+	SET_NETDEV_DEV(netdev, &amp;pdev-&gt;dev);</div><div class='add'>+	pci_set_drvdata(pdev, netdev);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * init adapter info</div><div class='add'>+	 */</div><div class='add'>+	jme = netdev_priv(netdev);</div><div class='add'>+	jme-&gt;pdev = pdev;</div><div class='add'>+	jme-&gt;dev = netdev;</div><div class='add'>+	jme-&gt;jme_rx = netif_rx;</div><div class='add'>+	jme-&gt;jme_vlan_rx = vlan_hwaccel_rx;</div><div class='add'>+	jme-&gt;old_mtu = netdev-&gt;mtu = 1500;</div><div class='add'>+	jme-&gt;phylink = 0;</div><div class='add'>+	jme-&gt;tx_ring_size = 1 &lt;&lt; 10;</div><div class='add'>+	jme-&gt;tx_ring_mask = jme-&gt;tx_ring_size - 1;</div><div class='add'>+	jme-&gt;tx_wake_threshold = 1 &lt;&lt; 9;</div><div class='add'>+	jme-&gt;rx_ring_size = 1 &lt;&lt; 9;</div><div class='add'>+	jme-&gt;rx_ring_mask = jme-&gt;rx_ring_size - 1;</div><div class='add'>+	jme-&gt;msg_enable = JME_DEF_MSG_ENABLE;</div><div class='add'>+	jme-&gt;regs = ioremap(pci_resource_start(pdev, 0),</div><div class='add'>+			     pci_resource_len(pdev, 0));</div><div class='add'>+	if (!(jme-&gt;regs)) {</div><div class='add'>+		jeprintk(pdev, "Mapping PCI resource region error.\n");</div><div class='add'>+		rc = -ENOMEM;</div><div class='add'>+		goto err_out_free_netdev;</div><div class='add'>+	}</div><div class='add'>+	jme-&gt;shadow_regs = pci_alloc_consistent(pdev,</div><div class='add'>+						sizeof(u32) * SHADOW_REG_NR,</div><div class='add'>+						&amp;(jme-&gt;shadow_dma));</div><div class='add'>+	if (!(jme-&gt;shadow_regs)) {</div><div class='add'>+		jeprintk(pdev, "Allocating shadow register mapping error.\n");</div><div class='add'>+		rc = -ENOMEM;</div><div class='add'>+		goto err_out_unmap;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (no_pseudohp) {</div><div class='add'>+		apmc = jread32(jme, JME_APMC) &amp; ~JME_APMC_PSEUDO_HP_EN;</div><div class='add'>+		jwrite32(jme, JME_APMC, apmc);</div><div class='add'>+	} else if (force_pseudohp) {</div><div class='add'>+		apmc = jread32(jme, JME_APMC) | JME_APMC_PSEUDO_HP_EN;</div><div class='add'>+		jwrite32(jme, JME_APMC, apmc);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	NETIF_NAPI_SET(netdev, &amp;jme-&gt;napi, jme_poll, jme-&gt;rx_ring_size &gt;&gt; 2)</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;jme-&gt;phy_lock);</div><div class='add'>+	spin_lock_init(&amp;jme-&gt;macaddr_lock);</div><div class='add'>+	spin_lock_init(&amp;jme-&gt;rxmcs_lock);</div><div class='add'>+</div><div class='add'>+	atomic_set(&amp;jme-&gt;link_changing, 1);</div><div class='add'>+	atomic_set(&amp;jme-&gt;rx_cleaning, 1);</div><div class='add'>+	atomic_set(&amp;jme-&gt;tx_cleaning, 1);</div><div class='add'>+	atomic_set(&amp;jme-&gt;rx_empty, 1);</div><div class='add'>+</div><div class='add'>+	tasklet_init(&amp;jme-&gt;pcc_task,</div><div class='add'>+		     &amp;jme_pcc_tasklet,</div><div class='add'>+		     (unsigned long) jme);</div><div class='add'>+	tasklet_init(&amp;jme-&gt;linkch_task,</div><div class='add'>+		     &amp;jme_link_change_tasklet,</div><div class='add'>+		     (unsigned long) jme);</div><div class='add'>+	tasklet_init(&amp;jme-&gt;txclean_task,</div><div class='add'>+		     &amp;jme_tx_clean_tasklet,</div><div class='add'>+		     (unsigned long) jme);</div><div class='add'>+	tasklet_init(&amp;jme-&gt;rxclean_task,</div><div class='add'>+		     &amp;jme_rx_clean_tasklet,</div><div class='add'>+		     (unsigned long) jme);</div><div class='add'>+	tasklet_init(&amp;jme-&gt;rxempty_task,</div><div class='add'>+		     &amp;jme_rx_empty_tasklet,</div><div class='add'>+		     (unsigned long) jme);</div><div class='add'>+	tasklet_disable_nosync(&amp;jme-&gt;txclean_task);</div><div class='add'>+	tasklet_disable_nosync(&amp;jme-&gt;rxclean_task);</div><div class='add'>+	tasklet_disable_nosync(&amp;jme-&gt;rxempty_task);</div><div class='add'>+	jme-&gt;dpi.cur = PCC_P1;</div><div class='add'>+</div><div class='add'>+	jme-&gt;reg_ghc = 0;</div><div class='add'>+	jme-&gt;reg_rxcs = RXCS_DEFAULT;</div><div class='add'>+	jme-&gt;reg_rxmcs = RXMCS_DEFAULT;</div><div class='add'>+	jme-&gt;reg_txpfc = 0;</div><div class='add'>+	jme-&gt;reg_pmcs = PMCS_MFEN;</div><div class='add'>+	set_bit(JME_FLAG_TXCSUM, &amp;jme-&gt;flags);</div><div class='add'>+	set_bit(JME_FLAG_TSO, &amp;jme-&gt;flags);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Get Max Read Req Size from PCI Config Space</div><div class='add'>+	 */</div><div class='add'>+	pci_read_config_byte(pdev, PCI_DCSR_MRRS, &amp;jme-&gt;mrrs);</div><div class='add'>+	jme-&gt;mrrs &amp;= PCI_DCSR_MRRS_MASK;</div><div class='add'>+	switch (jme-&gt;mrrs) {</div><div class='add'>+	case MRRS_128B:</div><div class='add'>+		jme-&gt;reg_txcs = TXCS_DEFAULT | TXCS_DMASIZE_128B;</div><div class='add'>+		break;</div><div class='add'>+	case MRRS_256B:</div><div class='add'>+		jme-&gt;reg_txcs = TXCS_DEFAULT | TXCS_DMASIZE_256B;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		jme-&gt;reg_txcs = TXCS_DEFAULT | TXCS_DMASIZE_512B;</div><div class='add'>+		break;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Must check before reset_mac_processor</div><div class='add'>+	 */</div><div class='add'>+	jme_check_hw_ver(jme);</div><div class='add'>+	jme-&gt;mii_if.dev = netdev;</div><div class='add'>+	if (jme-&gt;fpgaver) {</div><div class='add'>+		jme-&gt;mii_if.phy_id = 0;</div><div class='add'>+		for (i = 1 ; i &lt; 32 ; ++i) {</div><div class='add'>+			bmcr = jme_mdio_read(netdev, i, MII_BMCR);</div><div class='add'>+			bmsr = jme_mdio_read(netdev, i, MII_BMSR);</div><div class='add'>+			if (bmcr != 0xFFFFU &amp;&amp; (bmcr != 0 || bmsr != 0)) {</div><div class='add'>+				jme-&gt;mii_if.phy_id = i;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!jme-&gt;mii_if.phy_id) {</div><div class='add'>+			rc = -EIO;</div><div class='add'>+			jeprintk(pdev, "Can not find phy_id.\n");</div><div class='add'>+			 goto err_out_free_shadow;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		jme-&gt;reg_ghc |= GHC_LINK_POLL;</div><div class='add'>+	} else {</div><div class='add'>+		jme-&gt;mii_if.phy_id = 1;</div><div class='add'>+	}</div><div class='add'>+	if (pdev-&gt;device == PCI_DEVICE_ID_JMICRON_JMC250)</div><div class='add'>+		jme-&gt;mii_if.supports_gmii = true;</div><div class='add'>+	else</div><div class='add'>+		jme-&gt;mii_if.supports_gmii = false;</div><div class='add'>+	jme-&gt;mii_if.mdio_read = jme_mdio_read;</div><div class='add'>+	jme-&gt;mii_if.mdio_write = jme_mdio_write;</div><div class='add'>+</div><div class='add'>+	jme_clear_pm(jme);</div><div class='add'>+	jme_set_phyfifoa(jme);</div><div class='add'>+	pci_read_config_byte(pdev, PCI_REVISION_ID, &amp;jme-&gt;rev);</div><div class='add'>+	if (!jme-&gt;fpgaver)</div><div class='add'>+		jme_phy_init(jme);</div><div class='add'>+	jme_phy_off(jme);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Reset MAC processor and reload EEPROM for MAC Address</div><div class='add'>+	 */</div><div class='add'>+	jme_reset_mac_processor(jme);</div><div class='add'>+	rc = jme_reload_eeprom(jme);</div><div class='add'>+	if (rc) {</div><div class='add'>+		jeprintk(pdev,</div><div class='add'>+			"Reload eeprom for reading MAC Address error.\n");</div><div class='add'>+		goto err_out_free_shadow;</div><div class='add'>+	}</div><div class='add'>+	jme_load_macaddr(netdev);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Tell stack that we are not ready to work until open()</div><div class='add'>+	 */</div><div class='add'>+	netif_carrier_off(netdev);</div><div class='add'>+	netif_stop_queue(netdev);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Register netdev</div><div class='add'>+	 */</div><div class='add'>+	rc = register_netdev(netdev);</div><div class='add'>+	if (rc) {</div><div class='add'>+		jeprintk(pdev, "Cannot register net device.\n");</div><div class='add'>+		goto err_out_free_shadow;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	msg_probe(jme,</div><div class='add'>+		"JMC250 gigabit%s ver:%x rev:%x "</div><div class='add'>+		"macaddr:%02x:%02x:%02x:%02x:%02x:%02x\n",</div><div class='add'>+		(jme-&gt;fpgaver != 0) ? " (FPGA)" : "",</div><div class='add'>+		(jme-&gt;fpgaver != 0) ? jme-&gt;fpgaver : jme-&gt;chiprev,</div><div class='add'>+		jme-&gt;rev,</div><div class='add'>+		netdev-&gt;dev_addr[0],</div><div class='add'>+		netdev-&gt;dev_addr[1],</div><div class='add'>+		netdev-&gt;dev_addr[2],</div><div class='add'>+		netdev-&gt;dev_addr[3],</div><div class='add'>+		netdev-&gt;dev_addr[4],</div><div class='add'>+		netdev-&gt;dev_addr[5]);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_out_free_shadow:</div><div class='add'>+	pci_free_consistent(pdev,</div><div class='add'>+			    sizeof(u32) * SHADOW_REG_NR,</div><div class='add'>+			    jme-&gt;shadow_regs,</div><div class='add'>+			    jme-&gt;shadow_dma);</div><div class='add'>+err_out_unmap:</div><div class='add'>+	iounmap(jme-&gt;regs);</div><div class='add'>+err_out_free_netdev:</div><div class='add'>+	pci_set_drvdata(pdev, NULL);</div><div class='add'>+	free_netdev(netdev);</div><div class='add'>+err_out_release_regions:</div><div class='add'>+	pci_release_regions(pdev);</div><div class='add'>+err_out_disable_pdev:</div><div class='add'>+	pci_disable_device(pdev);</div><div class='add'>+err_out:</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __devexit</div><div class='add'>+jme_remove_one(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev = pci_get_drvdata(pdev);</div><div class='add'>+	struct jme_adapter *jme = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	unregister_netdev(netdev);</div><div class='add'>+	pci_free_consistent(pdev,</div><div class='add'>+			    sizeof(u32) * SHADOW_REG_NR,</div><div class='add'>+			    jme-&gt;shadow_regs,</div><div class='add'>+			    jme-&gt;shadow_dma);</div><div class='add'>+	iounmap(jme-&gt;regs);</div><div class='add'>+	pci_set_drvdata(pdev, NULL);</div><div class='add'>+	free_netdev(netdev);</div><div class='add'>+	pci_release_regions(pdev);</div><div class='add'>+	pci_disable_device(pdev);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+static int</div><div class='add'>+jme_suspend(struct pci_dev *pdev, pm_message_t state)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev = pci_get_drvdata(pdev);</div><div class='add'>+	struct jme_adapter *jme = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	atomic_dec(&amp;jme-&gt;link_changing);</div><div class='add'>+</div><div class='add'>+	netif_device_detach(netdev);</div><div class='add'>+	netif_stop_queue(netdev);</div><div class='add'>+	jme_stop_irq(jme);</div><div class='add'>+</div><div class='add'>+	tasklet_disable(&amp;jme-&gt;txclean_task);</div><div class='add'>+	tasklet_disable(&amp;jme-&gt;rxclean_task);</div><div class='add'>+	tasklet_disable(&amp;jme-&gt;rxempty_task);</div><div class='add'>+</div><div class='add'>+	jme_disable_shadow(jme);</div><div class='add'>+</div><div class='add'>+	if (netif_carrier_ok(netdev)) {</div><div class='add'>+		if (test_bit(JME_FLAG_POLL, &amp;jme-&gt;flags))</div><div class='add'>+			jme_polling_mode(jme);</div><div class='add'>+</div><div class='add'>+		jme_stop_pcc_timer(jme);</div><div class='add'>+		jme_reset_ghc_speed(jme);</div><div class='add'>+		jme_disable_rx_engine(jme);</div><div class='add'>+		jme_disable_tx_engine(jme);</div><div class='add'>+		jme_reset_mac_processor(jme);</div><div class='add'>+		jme_free_rx_resources(jme);</div><div class='add'>+		jme_free_tx_resources(jme);</div><div class='add'>+		netif_carrier_off(netdev);</div><div class='add'>+		jme-&gt;phylink = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tasklet_enable(&amp;jme-&gt;txclean_task);</div><div class='add'>+	tasklet_hi_enable(&amp;jme-&gt;rxclean_task);</div><div class='add'>+	tasklet_hi_enable(&amp;jme-&gt;rxempty_task);</div><div class='add'>+</div><div class='add'>+	pci_save_state(pdev);</div><div class='add'>+	if (jme-&gt;reg_pmcs) {</div><div class='add'>+		jme_set_100m_half(jme);</div><div class='add'>+</div><div class='add'>+		if (jme-&gt;reg_pmcs &amp; (PMCS_LFEN | PMCS_LREN))</div><div class='add'>+			jme_wait_link(jme);</div><div class='add'>+</div><div class='add'>+		jwrite32(jme, JME_PMCS, jme-&gt;reg_pmcs);</div><div class='add'>+</div><div class='add'>+		pci_enable_wake(pdev, PCI_D3cold, true);</div><div class='add'>+	} else {</div><div class='add'>+		jme_phy_off(jme);</div><div class='add'>+	}</div><div class='add'>+	pci_set_power_state(pdev, PCI_D3cold);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+jme_resume(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev = pci_get_drvdata(pdev);</div><div class='add'>+	struct jme_adapter *jme = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	jme_clear_pm(jme);</div><div class='add'>+	pci_restore_state(pdev);</div><div class='add'>+</div><div class='add'>+	if (test_bit(JME_FLAG_SSET, &amp;jme-&gt;flags))</div><div class='add'>+		jme_set_settings(netdev, &amp;jme-&gt;old_ecmd);</div><div class='add'>+	else</div><div class='add'>+		jme_reset_phy_processor(jme);</div><div class='add'>+</div><div class='add'>+	jme_enable_shadow(jme);</div><div class='add'>+	jme_start_irq(jme);</div><div class='add'>+	netif_device_attach(netdev);</div><div class='add'>+</div><div class='add'>+	atomic_inc(&amp;jme-&gt;link_changing);</div><div class='add'>+</div><div class='add'>+	jme_reset_link(jme);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static struct pci_device_id jme_pci_tbl[] = {</div><div class='add'>+	{ PCI_VDEVICE(JMICRON, PCI_DEVICE_ID_JMICRON_JMC250) },</div><div class='add'>+	{ PCI_VDEVICE(JMICRON, PCI_DEVICE_ID_JMICRON_JMC260) },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct pci_driver jme_driver = {</div><div class='add'>+	.name           = DRV_NAME,</div><div class='add'>+	.id_table       = jme_pci_tbl,</div><div class='add'>+	.probe          = jme_init_one,</div><div class='add'>+	.remove         = __devexit_p(jme_remove_one),</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+	.suspend        = jme_suspend,</div><div class='add'>+	.resume         = jme_resume,</div><div class='add'>+#endif /* CONFIG_PM */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init</div><div class='add'>+jme_init_module(void)</div><div class='add'>+{</div><div class='add'>+	printk(KERN_INFO PFX "JMicron JMC250 gigabit ethernet "</div><div class='add'>+	       "driver version %s\n", DRV_VERSION);</div><div class='add'>+	return pci_register_driver(&amp;jme_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit</div><div class='add'>+jme_cleanup_module(void)</div><div class='add'>+{</div><div class='add'>+	pci_unregister_driver(&amp;jme_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(jme_init_module);</div><div class='add'>+module_exit(jme_cleanup_module);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Guo-Fu Tseng &lt;cooldavid@cooldavid.org&gt;");</div><div class='add'>+MODULE_DESCRIPTION("JMicron JMC2x0 PCI Express Ethernet driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_VERSION(DRV_VERSION);</div><div class='add'>+MODULE_DEVICE_TABLE(pci, jme_pci_tbl);</div><div class='add'>+</div><div class='head'>diff --git a/drivers/net/jme.h b/drivers/net/jme.h<br/>new file mode 100644<br/>index 000000000000..f863aee6648b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/jme.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/jme.h</a></div><div class='hunk'>@@ -0,0 +1,1229 @@</div><div class='add'>+/*</div><div class='add'>+ * JMicron JMC2x0 series PCIe Ethernet Linux Device Driver</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2008 JMicron Technology Corporation</div><div class='add'>+ * http://www.jmicron.com/</div><div class='add'>+ *</div><div class='add'>+ * Author: Guo-Fu Tseng &lt;cooldavid@cooldavid.org&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __JME_H_INCLUDED__</div><div class='add'>+#define __JME_H_INCLUDEE__</div><div class='add'>+</div><div class='add'>+#define DRV_NAME	"jme"</div><div class='add'>+#define DRV_VERSION	"1.0.3"</div><div class='add'>+#define PFX		DRV_NAME ": "</div><div class='add'>+</div><div class='add'>+#define PCI_DEVICE_ID_JMICRON_JMC250	0x0250</div><div class='add'>+#define PCI_DEVICE_ID_JMICRON_JMC260	0x0260</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Message related definitions</div><div class='add'>+ */</div><div class='add'>+#define JME_DEF_MSG_ENABLE \</div><div class='add'>+	(NETIF_MSG_PROBE | \</div><div class='add'>+	NETIF_MSG_LINK | \</div><div class='add'>+	NETIF_MSG_RX_ERR | \</div><div class='add'>+	NETIF_MSG_TX_ERR | \</div><div class='add'>+	NETIF_MSG_HW)</div><div class='add'>+</div><div class='add'>+#define jeprintk(pdev, fmt, args...) \</div><div class='add'>+	printk(KERN_ERR PFX fmt, ## args)</div><div class='add'>+</div><div class='add'>+#ifdef TX_DEBUG</div><div class='add'>+#define tx_dbg(priv, fmt, args...) \</div><div class='add'>+	printk(KERN_DEBUG "%s: " fmt, (priv)-&gt;dev-&gt;name, ## args)</div><div class='add'>+#else</div><div class='add'>+#define tx_dbg(priv, fmt, args...)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define jme_msg(msglvl, type, priv, fmt, args...) \</div><div class='add'>+	if (netif_msg_##type(priv)) \</div><div class='add'>+		printk(msglvl "%s: " fmt, (priv)-&gt;dev-&gt;name, ## args)</div><div class='add'>+</div><div class='add'>+#define msg_probe(priv, fmt, args...) \</div><div class='add'>+	jme_msg(KERN_INFO, probe, priv, fmt, ## args)</div><div class='add'>+</div><div class='add'>+#define msg_link(priv, fmt, args...) \</div><div class='add'>+	jme_msg(KERN_INFO, link, priv, fmt, ## args)</div><div class='add'>+</div><div class='add'>+#define msg_intr(priv, fmt, args...) \</div><div class='add'>+	jme_msg(KERN_INFO, intr, priv, fmt, ## args)</div><div class='add'>+</div><div class='add'>+#define msg_rx_err(priv, fmt, args...) \</div><div class='add'>+	jme_msg(KERN_ERR, rx_err, priv, fmt, ## args)</div><div class='add'>+</div><div class='add'>+#define msg_rx_status(priv, fmt, args...) \</div><div class='add'>+	jme_msg(KERN_INFO, rx_status, priv, fmt, ## args)</div><div class='add'>+</div><div class='add'>+#define msg_tx_err(priv, fmt, args...) \</div><div class='add'>+	jme_msg(KERN_ERR, tx_err, priv, fmt, ## args)</div><div class='add'>+</div><div class='add'>+#define msg_tx_done(priv, fmt, args...) \</div><div class='add'>+	jme_msg(KERN_INFO, tx_done, priv, fmt, ## args)</div><div class='add'>+</div><div class='add'>+#define msg_tx_queued(priv, fmt, args...) \</div><div class='add'>+	jme_msg(KERN_INFO, tx_queued, priv, fmt, ## args)</div><div class='add'>+</div><div class='add'>+#define msg_hw(priv, fmt, args...) \</div><div class='add'>+	jme_msg(KERN_ERR, hw, priv, fmt, ## args)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Extra PCI Configuration space interface</div><div class='add'>+ */</div><div class='add'>+#define PCI_DCSR_MRRS		0x59</div><div class='add'>+#define PCI_DCSR_MRRS_MASK	0x70</div><div class='add'>+</div><div class='add'>+enum pci_dcsr_mrrs_vals {</div><div class='add'>+	MRRS_128B	= 0x00,</div><div class='add'>+	MRRS_256B	= 0x10,</div><div class='add'>+	MRRS_512B	= 0x20,</div><div class='add'>+	MRRS_1024B	= 0x30,</div><div class='add'>+	MRRS_2048B	= 0x40,</div><div class='add'>+	MRRS_4096B	= 0x50,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define PCI_SPI			0xB0</div><div class='add'>+</div><div class='add'>+enum pci_spi_bits {</div><div class='add'>+	SPI_EN		= 0x10,</div><div class='add'>+	SPI_MISO	= 0x08,</div><div class='add'>+	SPI_MOSI	= 0x04,</div><div class='add'>+	SPI_SCLK	= 0x02,</div><div class='add'>+	SPI_CS		= 0x01,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct jme_spi_op {</div><div class='add'>+	void __user *uwbuf;</div><div class='add'>+	void __user *urbuf;</div><div class='add'>+	__u8	wn;	/* Number of write actions */</div><div class='add'>+	__u8	rn;	/* Number of read actions */</div><div class='add'>+	__u8	bitn;	/* Number of bits per action */</div><div class='add'>+	__u8	spd;	/* The maxim acceptable speed of controller, in MHz.*/</div><div class='add'>+	__u8	mode;	/* CPOL, CPHA, and Duplex mode of SPI */</div><div class='add'>+</div><div class='add'>+	/* Internal use only */</div><div class='add'>+	u8	*kwbuf;</div><div class='add'>+	u8	*krbuf;</div><div class='add'>+	u8	sr;</div><div class='add'>+	u16	halfclk; /* Half of clock cycle calculated from spd, in ns */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum jme_spi_op_bits {</div><div class='add'>+	SPI_MODE_CPHA	= 0x01,</div><div class='add'>+	SPI_MODE_CPOL	= 0x02,</div><div class='add'>+	SPI_MODE_DUP	= 0x80,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define HALF_US 500	/* 500 ns */</div><div class='add'>+#define JMESPIIOCTL	SIOCDEVPRIVATE</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Dynamic(adaptive)/Static PCC values</div><div class='add'>+ */</div><div class='add'>+enum dynamic_pcc_values {</div><div class='add'>+	PCC_OFF		= 0,</div><div class='add'>+	PCC_P1		= 1,</div><div class='add'>+	PCC_P2		= 2,</div><div class='add'>+	PCC_P3		= 3,</div><div class='add'>+</div><div class='add'>+	PCC_OFF_TO	= 0,</div><div class='add'>+	PCC_P1_TO	= 1,</div><div class='add'>+	PCC_P2_TO	= 64,</div><div class='add'>+	PCC_P3_TO	= 128,</div><div class='add'>+</div><div class='add'>+	PCC_OFF_CNT	= 0,</div><div class='add'>+	PCC_P1_CNT	= 1,</div><div class='add'>+	PCC_P2_CNT	= 16,</div><div class='add'>+	PCC_P3_CNT	= 32,</div><div class='add'>+};</div><div class='add'>+struct dynpcc_info {</div><div class='add'>+	unsigned long	last_bytes;</div><div class='add'>+	unsigned long	last_pkts;</div><div class='add'>+	unsigned long	intr_cnt;</div><div class='add'>+	unsigned char	cur;</div><div class='add'>+	unsigned char	attempt;</div><div class='add'>+	unsigned char	cnt;</div><div class='add'>+};</div><div class='add'>+#define PCC_INTERVAL_US	100000</div><div class='add'>+#define PCC_INTERVAL (HZ / (1000000 / PCC_INTERVAL_US))</div><div class='add'>+#define PCC_P3_THRESHOLD (2 * 1024 * 1024)</div><div class='add'>+#define PCC_P2_THRESHOLD 800</div><div class='add'>+#define PCC_INTR_THRESHOLD 800</div><div class='add'>+#define PCC_TX_TO 1000</div><div class='add'>+#define PCC_TX_CNT 8</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * TX/RX Descriptors</div><div class='add'>+ *</div><div class='add'>+ * TX/RX Ring DESC Count Must be multiple of 16 and &lt;= 1024</div><div class='add'>+ */</div><div class='add'>+#define RING_DESC_ALIGN		16	/* Descriptor alignment */</div><div class='add'>+#define TX_DESC_SIZE		16</div><div class='add'>+#define TX_RING_NR		8</div><div class='add'>+#define TX_RING_ALLOC_SIZE(s)	((s * TX_DESC_SIZE) + RING_DESC_ALIGN)</div><div class='add'>+</div><div class='add'>+struct txdesc {</div><div class='add'>+	union {</div><div class='add'>+		__u8	all[16];</div><div class='add'>+		__le32	dw[4];</div><div class='add'>+		struct {</div><div class='add'>+			/* DW0 */</div><div class='add'>+			__le16	vlan;</div><div class='add'>+			__u8	rsv1;</div><div class='add'>+			__u8	flags;</div><div class='add'>+</div><div class='add'>+			/* DW1 */</div><div class='add'>+			__le16	datalen;</div><div class='add'>+			__le16	mss;</div><div class='add'>+</div><div class='add'>+			/* DW2 */</div><div class='add'>+			__le16	pktsize;</div><div class='add'>+			__le16	rsv2;</div><div class='add'>+</div><div class='add'>+			/* DW3 */</div><div class='add'>+			__le32	bufaddr;</div><div class='add'>+		} desc1;</div><div class='add'>+		struct {</div><div class='add'>+			/* DW0 */</div><div class='add'>+			__le16	rsv1;</div><div class='add'>+			__u8	rsv2;</div><div class='add'>+			__u8	flags;</div><div class='add'>+</div><div class='add'>+			/* DW1 */</div><div class='add'>+			__le16	datalen;</div><div class='add'>+			__le16	rsv3;</div><div class='add'>+</div><div class='add'>+			/* DW2 */</div><div class='add'>+			__le32	bufaddrh;</div><div class='add'>+</div><div class='add'>+			/* DW3 */</div><div class='add'>+			__le32	bufaddrl;</div><div class='add'>+		} desc2;</div><div class='add'>+		struct {</div><div class='add'>+			/* DW0 */</div><div class='add'>+			__u8	ehdrsz;</div><div class='add'>+			__u8	rsv1;</div><div class='add'>+			__u8	rsv2;</div><div class='add'>+			__u8	flags;</div><div class='add'>+</div><div class='add'>+			/* DW1 */</div><div class='add'>+			__le16	trycnt;</div><div class='add'>+			__le16	segcnt;</div><div class='add'>+</div><div class='add'>+			/* DW2 */</div><div class='add'>+			__le16	pktsz;</div><div class='add'>+			__le16	rsv3;</div><div class='add'>+</div><div class='add'>+			/* DW3 */</div><div class='add'>+			__le32	bufaddrl;</div><div class='add'>+		} descwb;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum jme_txdesc_flags_bits {</div><div class='add'>+	TXFLAG_OWN	= 0x80,</div><div class='add'>+	TXFLAG_INT	= 0x40,</div><div class='add'>+	TXFLAG_64BIT	= 0x20,</div><div class='add'>+	TXFLAG_TCPCS	= 0x10,</div><div class='add'>+	TXFLAG_UDPCS	= 0x08,</div><div class='add'>+	TXFLAG_IPCS	= 0x04,</div><div class='add'>+	TXFLAG_LSEN	= 0x02,</div><div class='add'>+	TXFLAG_TAGON	= 0x01,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define TXDESC_MSS_SHIFT	2</div><div class='add'>+enum jme_rxdescwb_flags_bits {</div><div class='add'>+	TXWBFLAG_OWN	= 0x80,</div><div class='add'>+	TXWBFLAG_INT	= 0x40,</div><div class='add'>+	TXWBFLAG_TMOUT	= 0x20,</div><div class='add'>+	TXWBFLAG_TRYOUT	= 0x10,</div><div class='add'>+	TXWBFLAG_COL	= 0x08,</div><div class='add'>+</div><div class='add'>+	TXWBFLAG_ALLERR	= TXWBFLAG_TMOUT |</div><div class='add'>+			  TXWBFLAG_TRYOUT |</div><div class='add'>+			  TXWBFLAG_COL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define RX_DESC_SIZE		16</div><div class='add'>+#define RX_RING_NR		4</div><div class='add'>+#define RX_RING_ALLOC_SIZE(s)	((s * RX_DESC_SIZE) + RING_DESC_ALIGN)</div><div class='add'>+#define RX_BUF_DMA_ALIGN	8</div><div class='add'>+#define RX_PREPAD_SIZE		10</div><div class='add'>+#define ETH_CRC_LEN		2</div><div class='add'>+#define RX_VLANHDR_LEN		2</div><div class='add'>+#define RX_EXTRA_LEN		(RX_PREPAD_SIZE + \</div><div class='add'>+				ETH_HLEN + \</div><div class='add'>+				ETH_CRC_LEN + \</div><div class='add'>+				RX_VLANHDR_LEN + \</div><div class='add'>+				RX_BUF_DMA_ALIGN)</div><div class='add'>+</div><div class='add'>+struct rxdesc {</div><div class='add'>+	union {</div><div class='add'>+		__u8	all[16];</div><div class='add'>+		__le32	dw[4];</div><div class='add'>+		struct {</div><div class='add'>+			/* DW0 */</div><div class='add'>+			__le16	rsv2;</div><div class='add'>+			__u8	rsv1;</div><div class='add'>+			__u8	flags;</div><div class='add'>+</div><div class='add'>+			/* DW1 */</div><div class='add'>+			__le16	datalen;</div><div class='add'>+			__le16	wbcpl;</div><div class='add'>+</div><div class='add'>+			/* DW2 */</div><div class='add'>+			__le32	bufaddrh;</div><div class='add'>+</div><div class='add'>+			/* DW3 */</div><div class='add'>+			__le32	bufaddrl;</div><div class='add'>+		} desc1;</div><div class='add'>+		struct {</div><div class='add'>+			/* DW0 */</div><div class='add'>+			__le16	vlan;</div><div class='add'>+			__le16	flags;</div><div class='add'>+</div><div class='add'>+			/* DW1 */</div><div class='add'>+			__le16	framesize;</div><div class='add'>+			__u8	errstat;</div><div class='add'>+			__u8	desccnt;</div><div class='add'>+</div><div class='add'>+			/* DW2 */</div><div class='add'>+			__le32	rsshash;</div><div class='add'>+</div><div class='add'>+			/* DW3 */</div><div class='add'>+			__u8	hashfun;</div><div class='add'>+			__u8	hashtype;</div><div class='add'>+			__le16	resrv;</div><div class='add'>+		} descwb;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum jme_rxdesc_flags_bits {</div><div class='add'>+	RXFLAG_OWN	= 0x80,</div><div class='add'>+	RXFLAG_INT	= 0x40,</div><div class='add'>+	RXFLAG_64BIT	= 0x20,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum jme_rxwbdesc_flags_bits {</div><div class='add'>+	RXWBFLAG_OWN		= 0x8000,</div><div class='add'>+	RXWBFLAG_INT		= 0x4000,</div><div class='add'>+	RXWBFLAG_MF		= 0x2000,</div><div class='add'>+	RXWBFLAG_64BIT		= 0x2000,</div><div class='add'>+	RXWBFLAG_TCPON		= 0x1000,</div><div class='add'>+	RXWBFLAG_UDPON		= 0x0800,</div><div class='add'>+	RXWBFLAG_IPCS		= 0x0400,</div><div class='add'>+	RXWBFLAG_TCPCS		= 0x0200,</div><div class='add'>+	RXWBFLAG_UDPCS		= 0x0100,</div><div class='add'>+	RXWBFLAG_TAGON		= 0x0080,</div><div class='add'>+	RXWBFLAG_IPV4		= 0x0040,</div><div class='add'>+	RXWBFLAG_IPV6		= 0x0020,</div><div class='add'>+	RXWBFLAG_PAUSE		= 0x0010,</div><div class='add'>+	RXWBFLAG_MAGIC		= 0x0008,</div><div class='add'>+	RXWBFLAG_WAKEUP		= 0x0004,</div><div class='add'>+	RXWBFLAG_DEST		= 0x0003,</div><div class='add'>+	RXWBFLAG_DEST_UNI	= 0x0001,</div><div class='add'>+	RXWBFLAG_DEST_MUL	= 0x0002,</div><div class='add'>+	RXWBFLAG_DEST_BRO	= 0x0003,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum jme_rxwbdesc_desccnt_mask {</div><div class='add'>+	RXWBDCNT_WBCPL	= 0x80,</div><div class='add'>+	RXWBDCNT_DCNT	= 0x7F,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum jme_rxwbdesc_errstat_bits {</div><div class='add'>+	RXWBERR_LIMIT	= 0x80,</div><div class='add'>+	RXWBERR_MIIER	= 0x40,</div><div class='add'>+	RXWBERR_NIBON	= 0x20,</div><div class='add'>+	RXWBERR_COLON	= 0x10,</div><div class='add'>+	RXWBERR_ABORT	= 0x08,</div><div class='add'>+	RXWBERR_SHORT	= 0x04,</div><div class='add'>+	RXWBERR_OVERUN	= 0x02,</div><div class='add'>+	RXWBERR_CRCERR	= 0x01,</div><div class='add'>+	RXWBERR_ALLERR	= 0xFF,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Buffer information corresponding to ring descriptors.</div><div class='add'>+ */</div><div class='add'>+struct jme_buffer_info {</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	dma_addr_t mapping;</div><div class='add'>+	int len;</div><div class='add'>+	int nr_desc;</div><div class='add'>+	unsigned long start_xmit;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The structure holding buffer information and ring descriptors all together.</div><div class='add'>+ */</div><div class='add'>+#define MAX_RING_DESC_NR	1024</div><div class='add'>+struct jme_ring {</div><div class='add'>+	void *alloc;		/* pointer to allocated memory */</div><div class='add'>+	void *desc;		/* pointer to ring memory  */</div><div class='add'>+	dma_addr_t dmaalloc;	/* phys address of ring alloc */</div><div class='add'>+	dma_addr_t dma;		/* phys address for ring dma */</div><div class='add'>+</div><div class='add'>+	/* Buffer information corresponding to each descriptor */</div><div class='add'>+	struct jme_buffer_info bufinf[MAX_RING_DESC_NR];</div><div class='add'>+</div><div class='add'>+	int next_to_use;</div><div class='add'>+	atomic_t next_to_clean;</div><div class='add'>+	atomic_t nr_free;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define NET_STAT(priv) (priv-&gt;dev-&gt;stats)</div><div class='add'>+#define NETDEV_GET_STATS(netdev, fun_ptr)</div><div class='add'>+#define DECLARE_NET_DEVICE_STATS</div><div class='add'>+</div><div class='add'>+#define DECLARE_NAPI_STRUCT struct napi_struct napi;</div><div class='add'>+#define NETIF_NAPI_SET(dev, napis, pollfn, q) \</div><div class='add'>+	netif_napi_add(dev, napis, pollfn, q);</div><div class='add'>+#define JME_NAPI_HOLDER(holder) struct napi_struct *holder</div><div class='add'>+#define JME_NAPI_WEIGHT(w) int w</div><div class='add'>+#define JME_NAPI_WEIGHT_VAL(w) w</div><div class='add'>+#define JME_NAPI_WEIGHT_SET(w, r)</div><div class='add'>+#define JME_RX_COMPLETE(dev, napis) netif_rx_complete(dev, napis)</div><div class='add'>+#define JME_NAPI_ENABLE(priv) napi_enable(&amp;priv-&gt;napi);</div><div class='add'>+#define JME_NAPI_DISABLE(priv) \</div><div class='add'>+	if (!napi_disable_pending(&amp;priv-&gt;napi)) \</div><div class='add'>+		napi_disable(&amp;priv-&gt;napi);</div><div class='add'>+#define JME_RX_SCHEDULE_PREP(priv) \</div><div class='add'>+	netif_rx_schedule_prep(priv-&gt;dev, &amp;priv-&gt;napi)</div><div class='add'>+#define JME_RX_SCHEDULE(priv) \</div><div class='add'>+	__netif_rx_schedule(priv-&gt;dev, &amp;priv-&gt;napi);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Jmac Adapter Private data</div><div class='add'>+ */</div><div class='add'>+#define SHADOW_REG_NR 8</div><div class='add'>+struct jme_adapter {</div><div class='add'>+	struct pci_dev          *pdev;</div><div class='add'>+	struct net_device       *dev;</div><div class='add'>+	void __iomem            *regs;</div><div class='add'>+	dma_addr_t		shadow_dma;</div><div class='add'>+	u32			*shadow_regs;</div><div class='add'>+	struct mii_if_info	mii_if;</div><div class='add'>+	struct jme_ring		rxring[RX_RING_NR];</div><div class='add'>+	struct jme_ring		txring[TX_RING_NR];</div><div class='add'>+	spinlock_t		phy_lock;</div><div class='add'>+	spinlock_t		macaddr_lock;</div><div class='add'>+	spinlock_t		rxmcs_lock;</div><div class='add'>+	struct tasklet_struct	rxempty_task;</div><div class='add'>+	struct tasklet_struct	rxclean_task;</div><div class='add'>+	struct tasklet_struct	txclean_task;</div><div class='add'>+	struct tasklet_struct	linkch_task;</div><div class='add'>+	struct tasklet_struct	pcc_task;</div><div class='add'>+	unsigned long		flags;</div><div class='add'>+	u32			reg_txcs;</div><div class='add'>+	u32			reg_txpfc;</div><div class='add'>+	u32			reg_rxcs;</div><div class='add'>+	u32			reg_rxmcs;</div><div class='add'>+	u32			reg_ghc;</div><div class='add'>+	u32			reg_pmcs;</div><div class='add'>+	u32			phylink;</div><div class='add'>+	u32			tx_ring_size;</div><div class='add'>+	u32			tx_ring_mask;</div><div class='add'>+	u32			tx_wake_threshold;</div><div class='add'>+	u32			rx_ring_size;</div><div class='add'>+	u32			rx_ring_mask;</div><div class='add'>+	u8			mrrs;</div><div class='add'>+	unsigned int		fpgaver;</div><div class='add'>+	unsigned int		chiprev;</div><div class='add'>+	u8			rev;</div><div class='add'>+	u32			msg_enable;</div><div class='add'>+	struct ethtool_cmd	old_ecmd;</div><div class='add'>+	unsigned int		old_mtu;</div><div class='add'>+	struct vlan_group	*vlgrp;</div><div class='add'>+	struct dynpcc_info	dpi;</div><div class='add'>+	atomic_t		intr_sem;</div><div class='add'>+	atomic_t		link_changing;</div><div class='add'>+	atomic_t		tx_cleaning;</div><div class='add'>+	atomic_t		rx_cleaning;</div><div class='add'>+	atomic_t		rx_empty;</div><div class='add'>+	int			(*jme_rx)(struct sk_buff *skb);</div><div class='add'>+	int			(*jme_vlan_rx)(struct sk_buff *skb,</div><div class='add'>+					  struct vlan_group *grp,</div><div class='add'>+					  unsigned short vlan_tag);</div><div class='add'>+	DECLARE_NAPI_STRUCT</div><div class='add'>+	DECLARE_NET_DEVICE_STATS</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum shadow_reg_val {</div><div class='add'>+	SHADOW_IEVE = 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum jme_flags_bits {</div><div class='add'>+	JME_FLAG_MSI		= 1,</div><div class='add'>+	JME_FLAG_SSET		= 2,</div><div class='add'>+	JME_FLAG_TXCSUM		= 3,</div><div class='add'>+	JME_FLAG_TSO		= 4,</div><div class='add'>+	JME_FLAG_POLL		= 5,</div><div class='add'>+	JME_FLAG_SHUTDOWN	= 6,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define TX_TIMEOUT		(5 * HZ)</div><div class='add'>+#define JME_REG_LEN		0x500</div><div class='add'>+#define MAX_ETHERNET_JUMBO_PACKET_SIZE 9216</div><div class='add'>+</div><div class='add'>+static inline struct jme_adapter*</div><div class='add'>+jme_napi_priv(struct napi_struct *napi)</div><div class='add'>+{</div><div class='add'>+	struct jme_adapter *jme;</div><div class='add'>+	jme = container_of(napi, struct jme_adapter, napi);</div><div class='add'>+	return jme;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * MMaped I/O Resters</div><div class='add'>+ */</div><div class='add'>+enum jme_iomap_offsets {</div><div class='add'>+	JME_MAC		= 0x0000,</div><div class='add'>+	JME_PHY		= 0x0400,</div><div class='add'>+	JME_MISC	= 0x0800,</div><div class='add'>+	JME_RSS		= 0x0C00,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum jme_iomap_lens {</div><div class='add'>+	JME_MAC_LEN	= 0x80,</div><div class='add'>+	JME_PHY_LEN	= 0x58,</div><div class='add'>+	JME_MISC_LEN	= 0x98,</div><div class='add'>+	JME_RSS_LEN	= 0xFF,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum jme_iomap_regs {</div><div class='add'>+	JME_TXCS	= JME_MAC | 0x00, /* Transmit Control and Status */</div><div class='add'>+	JME_TXDBA_LO	= JME_MAC | 0x04, /* Transmit Queue Desc Base Addr */</div><div class='add'>+	JME_TXDBA_HI	= JME_MAC | 0x08, /* Transmit Queue Desc Base Addr */</div><div class='add'>+	JME_TXQDC	= JME_MAC | 0x0C, /* Transmit Queue Desc Count */</div><div class='add'>+	JME_TXNDA	= JME_MAC | 0x10, /* Transmit Queue Next Desc Addr */</div><div class='add'>+	JME_TXMCS	= JME_MAC | 0x14, /* Transmit MAC Control Status */</div><div class='add'>+	JME_TXPFC	= JME_MAC | 0x18, /* Transmit Pause Frame Control */</div><div class='add'>+	JME_TXTRHD	= JME_MAC | 0x1C, /* Transmit Timer/Retry@Half-Dup */</div><div class='add'>+</div><div class='add'>+	JME_RXCS	= JME_MAC | 0x20, /* Receive Control and Status */</div><div class='add'>+	JME_RXDBA_LO	= JME_MAC | 0x24, /* Receive Queue Desc Base Addr */</div><div class='add'>+	JME_RXDBA_HI	= JME_MAC | 0x28, /* Receive Queue Desc Base Addr */</div><div class='add'>+	JME_RXQDC	= JME_MAC | 0x2C, /* Receive Queue Desc Count */</div><div class='add'>+	JME_RXNDA	= JME_MAC | 0x30, /* Receive Queue Next Desc Addr */</div><div class='add'>+	JME_RXMCS	= JME_MAC | 0x34, /* Receive MAC Control Status */</div><div class='add'>+	JME_RXUMA_LO	= JME_MAC | 0x38, /* Receive Unicast MAC Address */</div><div class='add'>+	JME_RXUMA_HI	= JME_MAC | 0x3C, /* Receive Unicast MAC Address */</div><div class='add'>+	JME_RXMCHT_LO	= JME_MAC | 0x40, /* Recv Multicast Addr HashTable */</div><div class='add'>+	JME_RXMCHT_HI	= JME_MAC | 0x44, /* Recv Multicast Addr HashTable */</div><div class='add'>+	JME_WFODP	= JME_MAC | 0x48, /* Wakeup Frame Output Data Port */</div><div class='add'>+	JME_WFOI	= JME_MAC | 0x4C, /* Wakeup Frame Output Interface */</div><div class='add'>+</div><div class='add'>+	JME_SMI		= JME_MAC | 0x50, /* Station Management Interface */</div><div class='add'>+	JME_GHC		= JME_MAC | 0x54, /* Global Host Control */</div><div class='add'>+	JME_PMCS	= JME_MAC | 0x60, /* Power Management Control/Stat */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	JME_PHY_CS	= JME_PHY | 0x28, /* PHY Ctrl and Status Register */</div><div class='add'>+	JME_PHY_LINK	= JME_PHY | 0x30, /* PHY Link Status Register */</div><div class='add'>+	JME_SMBCSR	= JME_PHY | 0x40, /* SMB Control and Status */</div><div class='add'>+	JME_SMBINTF	= JME_PHY | 0x44, /* SMB Interface */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	JME_TMCSR	= JME_MISC | 0x00, /* Timer Control/Status Register */</div><div class='add'>+	JME_GPREG0	= JME_MISC | 0x08, /* General purpose REG-0 */</div><div class='add'>+	JME_GPREG1	= JME_MISC | 0x0C, /* General purpose REG-1 */</div><div class='add'>+	JME_IEVE	= JME_MISC | 0x20, /* Interrupt Event Status */</div><div class='add'>+	JME_IREQ	= JME_MISC | 0x24, /* Intr Req Status(For Debug) */</div><div class='add'>+	JME_IENS	= JME_MISC | 0x28, /* Intr Enable - Setting Port */</div><div class='add'>+	JME_IENC	= JME_MISC | 0x2C, /* Interrupt Enable - Clear Port */</div><div class='add'>+	JME_PCCRX0	= JME_MISC | 0x30, /* PCC Control for RX Queue 0 */</div><div class='add'>+	JME_PCCTX	= JME_MISC | 0x40, /* PCC Control for TX Queues */</div><div class='add'>+	JME_CHIPMODE	= JME_MISC | 0x44, /* Identify FPGA Version */</div><div class='add'>+	JME_SHBA_HI	= JME_MISC | 0x48, /* Shadow Register Base HI */</div><div class='add'>+	JME_SHBA_LO	= JME_MISC | 0x4C, /* Shadow Register Base LO */</div><div class='add'>+	JME_TIMER1	= JME_MISC | 0x70, /* Timer1 */</div><div class='add'>+	JME_TIMER2	= JME_MISC | 0x74, /* Timer2 */</div><div class='add'>+	JME_APMC	= JME_MISC | 0x7C, /* Aggressive Power Mode Control */</div><div class='add'>+	JME_PCCSRX0	= JME_MISC | 0x80, /* PCC Status of RX0 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * TX Control/Status Bits</div><div class='add'>+ */</div><div class='add'>+enum jme_txcs_bits {</div><div class='add'>+	TXCS_QUEUE7S	= 0x00008000,</div><div class='add'>+	TXCS_QUEUE6S	= 0x00004000,</div><div class='add'>+	TXCS_QUEUE5S	= 0x00002000,</div><div class='add'>+	TXCS_QUEUE4S	= 0x00001000,</div><div class='add'>+	TXCS_QUEUE3S	= 0x00000800,</div><div class='add'>+	TXCS_QUEUE2S	= 0x00000400,</div><div class='add'>+	TXCS_QUEUE1S	= 0x00000200,</div><div class='add'>+	TXCS_QUEUE0S	= 0x00000100,</div><div class='add'>+	TXCS_FIFOTH	= 0x000000C0,</div><div class='add'>+	TXCS_DMASIZE	= 0x00000030,</div><div class='add'>+	TXCS_BURST	= 0x00000004,</div><div class='add'>+	TXCS_ENABLE	= 0x00000001,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum jme_txcs_value {</div><div class='add'>+	TXCS_FIFOTH_16QW	= 0x000000C0,</div><div class='add'>+	TXCS_FIFOTH_12QW	= 0x00000080,</div><div class='add'>+	TXCS_FIFOTH_8QW		= 0x00000040,</div><div class='add'>+	TXCS_FIFOTH_4QW		= 0x00000000,</div><div class='add'>+</div><div class='add'>+	TXCS_DMASIZE_64B	= 0x00000000,</div><div class='add'>+	TXCS_DMASIZE_128B	= 0x00000010,</div><div class='add'>+	TXCS_DMASIZE_256B	= 0x00000020,</div><div class='add'>+	TXCS_DMASIZE_512B	= 0x00000030,</div><div class='add'>+</div><div class='add'>+	TXCS_SELECT_QUEUE0	= 0x00000000,</div><div class='add'>+	TXCS_SELECT_QUEUE1	= 0x00010000,</div><div class='add'>+	TXCS_SELECT_QUEUE2	= 0x00020000,</div><div class='add'>+	TXCS_SELECT_QUEUE3	= 0x00030000,</div><div class='add'>+	TXCS_SELECT_QUEUE4	= 0x00040000,</div><div class='add'>+	TXCS_SELECT_QUEUE5	= 0x00050000,</div><div class='add'>+	TXCS_SELECT_QUEUE6	= 0x00060000,</div><div class='add'>+	TXCS_SELECT_QUEUE7	= 0x00070000,</div><div class='add'>+</div><div class='add'>+	TXCS_DEFAULT		= TXCS_FIFOTH_4QW |</div><div class='add'>+				  TXCS_BURST,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define JME_TX_DISABLE_TIMEOUT 10 /* 10 msec */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * TX MAC Control/Status Bits</div><div class='add'>+ */</div><div class='add'>+enum jme_txmcs_bit_masks {</div><div class='add'>+	TXMCS_IFG2		= 0xC0000000,</div><div class='add'>+	TXMCS_IFG1		= 0x30000000,</div><div class='add'>+	TXMCS_TTHOLD		= 0x00000300,</div><div class='add'>+	TXMCS_FBURST		= 0x00000080,</div><div class='add'>+	TXMCS_CARRIEREXT	= 0x00000040,</div><div class='add'>+	TXMCS_DEFER		= 0x00000020,</div><div class='add'>+	TXMCS_BACKOFF		= 0x00000010,</div><div class='add'>+	TXMCS_CARRIERSENSE	= 0x00000008,</div><div class='add'>+	TXMCS_COLLISION		= 0x00000004,</div><div class='add'>+	TXMCS_CRC		= 0x00000002,</div><div class='add'>+	TXMCS_PADDING		= 0x00000001,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum jme_txmcs_values {</div><div class='add'>+	TXMCS_IFG2_6_4		= 0x00000000,</div><div class='add'>+	TXMCS_IFG2_8_5		= 0x40000000,</div><div class='add'>+	TXMCS_IFG2_10_6		= 0x80000000,</div><div class='add'>+	TXMCS_IFG2_12_7		= 0xC0000000,</div><div class='add'>+</div><div class='add'>+	TXMCS_IFG1_8_4		= 0x00000000,</div><div class='add'>+	TXMCS_IFG1_12_6		= 0x10000000,</div><div class='add'>+	TXMCS_IFG1_16_8		= 0x20000000,</div><div class='add'>+	TXMCS_IFG1_20_10	= 0x30000000,</div><div class='add'>+</div><div class='add'>+	TXMCS_TTHOLD_1_8	= 0x00000000,</div><div class='add'>+	TXMCS_TTHOLD_1_4	= 0x00000100,</div><div class='add'>+	TXMCS_TTHOLD_1_2	= 0x00000200,</div><div class='add'>+	TXMCS_TTHOLD_FULL	= 0x00000300,</div><div class='add'>+</div><div class='add'>+	TXMCS_DEFAULT		= TXMCS_IFG2_8_5 |</div><div class='add'>+				  TXMCS_IFG1_16_8 |</div><div class='add'>+				  TXMCS_TTHOLD_FULL |</div><div class='add'>+				  TXMCS_DEFER |</div><div class='add'>+				  TXMCS_CRC |</div><div class='add'>+				  TXMCS_PADDING,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum jme_txpfc_bits_masks {</div><div class='add'>+	TXPFC_VLAN_TAG		= 0xFFFF0000,</div><div class='add'>+	TXPFC_VLAN_EN		= 0x00008000,</div><div class='add'>+	TXPFC_PF_EN		= 0x00000001,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum jme_txtrhd_bits_masks {</div><div class='add'>+	TXTRHD_TXPEN		= 0x80000000,</div><div class='add'>+	TXTRHD_TXP		= 0x7FFFFF00,</div><div class='add'>+	TXTRHD_TXREN		= 0x00000080,</div><div class='add'>+	TXTRHD_TXRL		= 0x0000007F,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum jme_txtrhd_shifts {</div><div class='add'>+	TXTRHD_TXP_SHIFT	= 8,</div><div class='add'>+	TXTRHD_TXRL_SHIFT	= 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * RX Control/Status Bits</div><div class='add'>+ */</div><div class='add'>+enum jme_rxcs_bit_masks {</div><div class='add'>+	/* FIFO full threshold for transmitting Tx Pause Packet */</div><div class='add'>+	RXCS_FIFOTHTP	= 0x30000000,</div><div class='add'>+	/* FIFO threshold for processing next packet */</div><div class='add'>+	RXCS_FIFOTHNP	= 0x0C000000,</div><div class='add'>+	RXCS_DMAREQSZ	= 0x03000000, /* DMA Request Size */</div><div class='add'>+	RXCS_QUEUESEL	= 0x00030000, /* Queue selection */</div><div class='add'>+	RXCS_RETRYGAP	= 0x0000F000, /* RX Desc full retry gap */</div><div class='add'>+	RXCS_RETRYCNT	= 0x00000F00, /* RX Desc full retry counter */</div><div class='add'>+	RXCS_WAKEUP	= 0x00000040, /* Enable receive wakeup packet */</div><div class='add'>+	RXCS_MAGIC	= 0x00000020, /* Enable receive magic packet */</div><div class='add'>+	RXCS_SHORT	= 0x00000010, /* Enable receive short packet */</div><div class='add'>+	RXCS_ABORT	= 0x00000008, /* Enable receive errorr packet */</div><div class='add'>+	RXCS_QST	= 0x00000004, /* Receive queue start */</div><div class='add'>+	RXCS_SUSPEND	= 0x00000002,</div><div class='add'>+	RXCS_ENABLE	= 0x00000001,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum jme_rxcs_values {</div><div class='add'>+	RXCS_FIFOTHTP_16T	= 0x00000000,</div><div class='add'>+	RXCS_FIFOTHTP_32T	= 0x10000000,</div><div class='add'>+	RXCS_FIFOTHTP_64T	= 0x20000000,</div><div class='add'>+	RXCS_FIFOTHTP_128T	= 0x30000000,</div><div class='add'>+</div><div class='add'>+	RXCS_FIFOTHNP_16QW	= 0x00000000,</div><div class='add'>+	RXCS_FIFOTHNP_32QW	= 0x04000000,</div><div class='add'>+	RXCS_FIFOTHNP_64QW	= 0x08000000,</div><div class='add'>+	RXCS_FIFOTHNP_128QW	= 0x0C000000,</div><div class='add'>+</div><div class='add'>+	RXCS_DMAREQSZ_16B	= 0x00000000,</div><div class='add'>+	RXCS_DMAREQSZ_32B	= 0x01000000,</div><div class='add'>+	RXCS_DMAREQSZ_64B	= 0x02000000,</div><div class='add'>+	RXCS_DMAREQSZ_128B	= 0x03000000,</div><div class='add'>+</div><div class='add'>+	RXCS_QUEUESEL_Q0	= 0x00000000,</div><div class='add'>+	RXCS_QUEUESEL_Q1	= 0x00010000,</div><div class='add'>+	RXCS_QUEUESEL_Q2	= 0x00020000,</div><div class='add'>+	RXCS_QUEUESEL_Q3	= 0x00030000,</div><div class='add'>+</div><div class='add'>+	RXCS_RETRYGAP_256ns	= 0x00000000,</div><div class='add'>+	RXCS_RETRYGAP_512ns	= 0x00001000,</div><div class='add'>+	RXCS_RETRYGAP_1024ns	= 0x00002000,</div><div class='add'>+	RXCS_RETRYGAP_2048ns	= 0x00003000,</div><div class='add'>+	RXCS_RETRYGAP_4096ns	= 0x00004000,</div><div class='add'>+	RXCS_RETRYGAP_8192ns	= 0x00005000,</div><div class='add'>+	RXCS_RETRYGAP_16384ns	= 0x00006000,</div><div class='add'>+	RXCS_RETRYGAP_32768ns	= 0x00007000,</div><div class='add'>+</div><div class='add'>+	RXCS_RETRYCNT_0		= 0x00000000,</div><div class='add'>+	RXCS_RETRYCNT_4		= 0x00000100,</div><div class='add'>+	RXCS_RETRYCNT_8		= 0x00000200,</div><div class='add'>+	RXCS_RETRYCNT_12	= 0x00000300,</div><div class='add'>+	RXCS_RETRYCNT_16	= 0x00000400,</div><div class='add'>+	RXCS_RETRYCNT_20	= 0x00000500,</div><div class='add'>+	RXCS_RETRYCNT_24	= 0x00000600,</div><div class='add'>+	RXCS_RETRYCNT_28	= 0x00000700,</div><div class='add'>+	RXCS_RETRYCNT_32	= 0x00000800,</div><div class='add'>+	RXCS_RETRYCNT_36	= 0x00000900,</div><div class='add'>+	RXCS_RETRYCNT_40	= 0x00000A00,</div><div class='add'>+	RXCS_RETRYCNT_44	= 0x00000B00,</div><div class='add'>+	RXCS_RETRYCNT_48	= 0x00000C00,</div><div class='add'>+	RXCS_RETRYCNT_52	= 0x00000D00,</div><div class='add'>+	RXCS_RETRYCNT_56	= 0x00000E00,</div><div class='add'>+	RXCS_RETRYCNT_60	= 0x00000F00,</div><div class='add'>+</div><div class='add'>+	RXCS_DEFAULT		= RXCS_FIFOTHTP_128T |</div><div class='add'>+				  RXCS_FIFOTHNP_128QW |</div><div class='add'>+				  RXCS_DMAREQSZ_128B |</div><div class='add'>+				  RXCS_RETRYGAP_256ns |</div><div class='add'>+				  RXCS_RETRYCNT_32,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define JME_RX_DISABLE_TIMEOUT 10 /* 10 msec */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * RX MAC Control/Status Bits</div><div class='add'>+ */</div><div class='add'>+enum jme_rxmcs_bits {</div><div class='add'>+	RXMCS_ALLFRAME		= 0x00000800,</div><div class='add'>+	RXMCS_BRDFRAME		= 0x00000400,</div><div class='add'>+	RXMCS_MULFRAME		= 0x00000200,</div><div class='add'>+	RXMCS_UNIFRAME		= 0x00000100,</div><div class='add'>+	RXMCS_ALLMULFRAME	= 0x00000080,</div><div class='add'>+	RXMCS_MULFILTERED	= 0x00000040,</div><div class='add'>+	RXMCS_RXCOLLDEC		= 0x00000020,</div><div class='add'>+	RXMCS_FLOWCTRL		= 0x00000008,</div><div class='add'>+	RXMCS_VTAGRM		= 0x00000004,</div><div class='add'>+	RXMCS_PREPAD		= 0x00000002,</div><div class='add'>+	RXMCS_CHECKSUM		= 0x00000001,</div><div class='add'>+</div><div class='add'>+	RXMCS_DEFAULT		= RXMCS_VTAGRM |</div><div class='add'>+				  RXMCS_PREPAD |</div><div class='add'>+				  RXMCS_FLOWCTRL |</div><div class='add'>+				  RXMCS_CHECKSUM,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Wakeup Frame setup interface registers</div><div class='add'>+ */</div><div class='add'>+#define WAKEUP_FRAME_NR	8</div><div class='add'>+#define WAKEUP_FRAME_MASK_DWNR	4</div><div class='add'>+</div><div class='add'>+enum jme_wfoi_bit_masks {</div><div class='add'>+	WFOI_MASK_SEL		= 0x00000070,</div><div class='add'>+	WFOI_CRC_SEL		= 0x00000008,</div><div class='add'>+	WFOI_FRAME_SEL		= 0x00000007,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum jme_wfoi_shifts {</div><div class='add'>+	WFOI_MASK_SHIFT		= 4,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * SMI Related definitions</div><div class='add'>+ */</div><div class='add'>+enum jme_smi_bit_mask {</div><div class='add'>+	SMI_DATA_MASK		= 0xFFFF0000,</div><div class='add'>+	SMI_REG_ADDR_MASK	= 0x0000F800,</div><div class='add'>+	SMI_PHY_ADDR_MASK	= 0x000007C0,</div><div class='add'>+	SMI_OP_WRITE		= 0x00000020,</div><div class='add'>+	/* Set to 1, after req done it'll be cleared to 0 */</div><div class='add'>+	SMI_OP_REQ		= 0x00000010,</div><div class='add'>+	SMI_OP_MDIO		= 0x00000008, /* Software assess In/Out */</div><div class='add'>+	SMI_OP_MDOE		= 0x00000004, /* Software Output Enable */</div><div class='add'>+	SMI_OP_MDC		= 0x00000002, /* Software CLK Control */</div><div class='add'>+	SMI_OP_MDEN		= 0x00000001, /* Software access Enable */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum jme_smi_bit_shift {</div><div class='add'>+	SMI_DATA_SHIFT		= 16,</div><div class='add'>+	SMI_REG_ADDR_SHIFT	= 11,</div><div class='add'>+	SMI_PHY_ADDR_SHIFT	= 6,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline u32 smi_reg_addr(int x)</div><div class='add'>+{</div><div class='add'>+	return (x &lt;&lt; SMI_REG_ADDR_SHIFT) &amp; SMI_REG_ADDR_MASK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32 smi_phy_addr(int x)</div><div class='add'>+{</div><div class='add'>+	return (x &lt;&lt; SMI_PHY_ADDR_SHIFT) &amp; SMI_PHY_ADDR_MASK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define JME_PHY_TIMEOUT 100 /* 100 msec */</div><div class='add'>+#define JME_PHY_REG_NR 32</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Global Host Control</div><div class='add'>+ */</div><div class='add'>+enum jme_ghc_bit_mask {</div><div class='add'>+	GHC_SWRST	= 0x40000000,</div><div class='add'>+	GHC_DPX		= 0x00000040,</div><div class='add'>+	GHC_SPEED	= 0x00000030,</div><div class='add'>+	GHC_LINK_POLL	= 0x00000001,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum jme_ghc_speed_val {</div><div class='add'>+	GHC_SPEED_10M	= 0x00000010,</div><div class='add'>+	GHC_SPEED_100M	= 0x00000020,</div><div class='add'>+	GHC_SPEED_1000M	= 0x00000030,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Power management control and status register</div><div class='add'>+ */</div><div class='add'>+enum jme_pmcs_bit_masks {</div><div class='add'>+	PMCS_WF7DET	= 0x80000000,</div><div class='add'>+	PMCS_WF6DET	= 0x40000000,</div><div class='add'>+	PMCS_WF5DET	= 0x20000000,</div><div class='add'>+	PMCS_WF4DET	= 0x10000000,</div><div class='add'>+	PMCS_WF3DET	= 0x08000000,</div><div class='add'>+	PMCS_WF2DET	= 0x04000000,</div><div class='add'>+	PMCS_WF1DET	= 0x02000000,</div><div class='add'>+	PMCS_WF0DET	= 0x01000000,</div><div class='add'>+	PMCS_LFDET	= 0x00040000,</div><div class='add'>+	PMCS_LRDET	= 0x00020000,</div><div class='add'>+	PMCS_MFDET	= 0x00010000,</div><div class='add'>+	PMCS_WF7EN	= 0x00008000,</div><div class='add'>+	PMCS_WF6EN	= 0x00004000,</div><div class='add'>+	PMCS_WF5EN	= 0x00002000,</div><div class='add'>+	PMCS_WF4EN	= 0x00001000,</div><div class='add'>+	PMCS_WF3EN	= 0x00000800,</div><div class='add'>+	PMCS_WF2EN	= 0x00000400,</div><div class='add'>+	PMCS_WF1EN	= 0x00000200,</div><div class='add'>+	PMCS_WF0EN	= 0x00000100,</div><div class='add'>+	PMCS_LFEN	= 0x00000004,</div><div class='add'>+	PMCS_LREN	= 0x00000002,</div><div class='add'>+	PMCS_MFEN	= 0x00000001,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Giga PHY Status Registers</div><div class='add'>+ */</div><div class='add'>+enum jme_phy_link_bit_mask {</div><div class='add'>+	PHY_LINK_SPEED_MASK		= 0x0000C000,</div><div class='add'>+	PHY_LINK_DUPLEX			= 0x00002000,</div><div class='add'>+	PHY_LINK_SPEEDDPU_RESOLVED	= 0x00000800,</div><div class='add'>+	PHY_LINK_UP			= 0x00000400,</div><div class='add'>+	PHY_LINK_AUTONEG_COMPLETE	= 0x00000200,</div><div class='add'>+	PHY_LINK_MDI_STAT		= 0x00000040,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum jme_phy_link_speed_val {</div><div class='add'>+	PHY_LINK_SPEED_10M		= 0x00000000,</div><div class='add'>+	PHY_LINK_SPEED_100M		= 0x00004000,</div><div class='add'>+	PHY_LINK_SPEED_1000M		= 0x00008000,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define JME_SPDRSV_TIMEOUT	500	/* 500 us */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * SMB Control and Status</div><div class='add'>+ */</div><div class='add'>+enum jme_smbcsr_bit_mask {</div><div class='add'>+	SMBCSR_CNACK	= 0x00020000,</div><div class='add'>+	SMBCSR_RELOAD	= 0x00010000,</div><div class='add'>+	SMBCSR_EEPROMD	= 0x00000020,</div><div class='add'>+	SMBCSR_INITDONE	= 0x00000010,</div><div class='add'>+	SMBCSR_BUSY	= 0x0000000F,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum jme_smbintf_bit_mask {</div><div class='add'>+	SMBINTF_HWDATR	= 0xFF000000,</div><div class='add'>+	SMBINTF_HWDATW	= 0x00FF0000,</div><div class='add'>+	SMBINTF_HWADDR	= 0x0000FF00,</div><div class='add'>+	SMBINTF_HWRWN	= 0x00000020,</div><div class='add'>+	SMBINTF_HWCMD	= 0x00000010,</div><div class='add'>+	SMBINTF_FASTM	= 0x00000008,</div><div class='add'>+	SMBINTF_GPIOSCL	= 0x00000004,</div><div class='add'>+	SMBINTF_GPIOSDA	= 0x00000002,</div><div class='add'>+	SMBINTF_GPIOEN	= 0x00000001,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum jme_smbintf_vals {</div><div class='add'>+	SMBINTF_HWRWN_READ	= 0x00000020,</div><div class='add'>+	SMBINTF_HWRWN_WRITE	= 0x00000000,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum jme_smbintf_shifts {</div><div class='add'>+	SMBINTF_HWDATR_SHIFT	= 24,</div><div class='add'>+	SMBINTF_HWDATW_SHIFT	= 16,</div><div class='add'>+	SMBINTF_HWADDR_SHIFT	= 8,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define JME_EEPROM_RELOAD_TIMEOUT 2000 /* 2000 msec */</div><div class='add'>+#define JME_SMB_BUSY_TIMEOUT 20 /* 20 msec */</div><div class='add'>+#define JME_SMB_LEN 256</div><div class='add'>+#define JME_EEPROM_MAGIC 0x250</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Timer Control/Status Register</div><div class='add'>+ */</div><div class='add'>+enum jme_tmcsr_bit_masks {</div><div class='add'>+	TMCSR_SWIT	= 0x80000000,</div><div class='add'>+	TMCSR_EN	= 0x01000000,</div><div class='add'>+	TMCSR_CNT	= 0x00FFFFFF,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * General Purpose REG-0</div><div class='add'>+ */</div><div class='add'>+enum jme_gpreg0_masks {</div><div class='add'>+	GPREG0_DISSH		= 0xFF000000,</div><div class='add'>+	GPREG0_PCIRLMT		= 0x00300000,</div><div class='add'>+	GPREG0_PCCNOMUTCLR	= 0x00040000,</div><div class='add'>+	GPREG0_LNKINTPOLL	= 0x00001000,</div><div class='add'>+	GPREG0_PCCTMR		= 0x00000300,</div><div class='add'>+	GPREG0_PHYADDR		= 0x0000001F,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum jme_gpreg0_vals {</div><div class='add'>+	GPREG0_DISSH_DW7	= 0x80000000,</div><div class='add'>+	GPREG0_DISSH_DW6	= 0x40000000,</div><div class='add'>+	GPREG0_DISSH_DW5	= 0x20000000,</div><div class='add'>+	GPREG0_DISSH_DW4	= 0x10000000,</div><div class='add'>+	GPREG0_DISSH_DW3	= 0x08000000,</div><div class='add'>+	GPREG0_DISSH_DW2	= 0x04000000,</div><div class='add'>+	GPREG0_DISSH_DW1	= 0x02000000,</div><div class='add'>+	GPREG0_DISSH_DW0	= 0x01000000,</div><div class='add'>+	GPREG0_DISSH_ALL	= 0xFF000000,</div><div class='add'>+</div><div class='add'>+	GPREG0_PCIRLMT_8	= 0x00000000,</div><div class='add'>+	GPREG0_PCIRLMT_6	= 0x00100000,</div><div class='add'>+	GPREG0_PCIRLMT_5	= 0x00200000,</div><div class='add'>+	GPREG0_PCIRLMT_4	= 0x00300000,</div><div class='add'>+</div><div class='add'>+	GPREG0_PCCTMR_16ns	= 0x00000000,</div><div class='add'>+	GPREG0_PCCTMR_256ns	= 0x00000100,</div><div class='add'>+	GPREG0_PCCTMR_1us	= 0x00000200,</div><div class='add'>+	GPREG0_PCCTMR_1ms	= 0x00000300,</div><div class='add'>+</div><div class='add'>+	GPREG0_PHYADDR_1	= 0x00000001,</div><div class='add'>+</div><div class='add'>+	GPREG0_DEFAULT		= GPREG0_PCIRLMT_4 |</div><div class='add'>+				  GPREG0_PCCTMR_1us |</div><div class='add'>+				  GPREG0_PHYADDR_1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * General Purpose REG-1</div><div class='add'>+ * Note: All theses bits defined here are for</div><div class='add'>+ *       Chip mode revision 0x11 only</div><div class='add'>+ */</div><div class='add'>+enum jme_gpreg1_masks {</div><div class='add'>+	GPREG1_INTRDELAYUNIT	= 0x00000018,</div><div class='add'>+	GPREG1_INTRDELAYENABLE	= 0x00000007,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum jme_gpreg1_vals {</div><div class='add'>+	GPREG1_RSSPATCH		= 0x00000040,</div><div class='add'>+	GPREG1_HALFMODEPATCH	= 0x00000020,</div><div class='add'>+</div><div class='add'>+	GPREG1_INTDLYUNIT_16NS	= 0x00000000,</div><div class='add'>+	GPREG1_INTDLYUNIT_256NS	= 0x00000008,</div><div class='add'>+	GPREG1_INTDLYUNIT_1US	= 0x00000010,</div><div class='add'>+	GPREG1_INTDLYUNIT_16US	= 0x00000018,</div><div class='add'>+</div><div class='add'>+	GPREG1_INTDLYEN_1U	= 0x00000001,</div><div class='add'>+	GPREG1_INTDLYEN_2U	= 0x00000002,</div><div class='add'>+	GPREG1_INTDLYEN_3U	= 0x00000003,</div><div class='add'>+	GPREG1_INTDLYEN_4U	= 0x00000004,</div><div class='add'>+	GPREG1_INTDLYEN_5U	= 0x00000005,</div><div class='add'>+	GPREG1_INTDLYEN_6U	= 0x00000006,</div><div class='add'>+	GPREG1_INTDLYEN_7U	= 0x00000007,</div><div class='add'>+</div><div class='add'>+	GPREG1_DEFAULT		= 0x00000000,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Interrupt Status Bits</div><div class='add'>+ */</div><div class='add'>+enum jme_interrupt_bits {</div><div class='add'>+	INTR_SWINTR	= 0x80000000,</div><div class='add'>+	INTR_TMINTR	= 0x40000000,</div><div class='add'>+	INTR_LINKCH	= 0x20000000,</div><div class='add'>+	INTR_PAUSERCV	= 0x10000000,</div><div class='add'>+	INTR_MAGICRCV	= 0x08000000,</div><div class='add'>+	INTR_WAKERCV	= 0x04000000,</div><div class='add'>+	INTR_PCCRX0TO	= 0x02000000,</div><div class='add'>+	INTR_PCCRX1TO	= 0x01000000,</div><div class='add'>+	INTR_PCCRX2TO	= 0x00800000,</div><div class='add'>+	INTR_PCCRX3TO	= 0x00400000,</div><div class='add'>+	INTR_PCCTXTO	= 0x00200000,</div><div class='add'>+	INTR_PCCRX0	= 0x00100000,</div><div class='add'>+	INTR_PCCRX1	= 0x00080000,</div><div class='add'>+	INTR_PCCRX2	= 0x00040000,</div><div class='add'>+	INTR_PCCRX3	= 0x00020000,</div><div class='add'>+	INTR_PCCTX	= 0x00010000,</div><div class='add'>+	INTR_RX3EMP	= 0x00008000,</div><div class='add'>+	INTR_RX2EMP	= 0x00004000,</div><div class='add'>+	INTR_RX1EMP	= 0x00002000,</div><div class='add'>+	INTR_RX0EMP	= 0x00001000,</div><div class='add'>+	INTR_RX3	= 0x00000800,</div><div class='add'>+	INTR_RX2	= 0x00000400,</div><div class='add'>+	INTR_RX1	= 0x00000200,</div><div class='add'>+	INTR_RX0	= 0x00000100,</div><div class='add'>+	INTR_TX7	= 0x00000080,</div><div class='add'>+	INTR_TX6	= 0x00000040,</div><div class='add'>+	INTR_TX5	= 0x00000020,</div><div class='add'>+	INTR_TX4	= 0x00000010,</div><div class='add'>+	INTR_TX3	= 0x00000008,</div><div class='add'>+	INTR_TX2	= 0x00000004,</div><div class='add'>+	INTR_TX1	= 0x00000002,</div><div class='add'>+	INTR_TX0	= 0x00000001,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u32 INTR_ENABLE = INTR_SWINTR |</div><div class='add'>+				 INTR_TMINTR |</div><div class='add'>+				 INTR_LINKCH |</div><div class='add'>+				 INTR_PCCRX0TO |</div><div class='add'>+				 INTR_PCCRX0 |</div><div class='add'>+				 INTR_PCCTXTO |</div><div class='add'>+				 INTR_PCCTX |</div><div class='add'>+				 INTR_RX0EMP;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * PCC Control Registers</div><div class='add'>+ */</div><div class='add'>+enum jme_pccrx_masks {</div><div class='add'>+	PCCRXTO_MASK	= 0xFFFF0000,</div><div class='add'>+	PCCRX_MASK	= 0x0000FF00,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum jme_pcctx_masks {</div><div class='add'>+	PCCTXTO_MASK	= 0xFFFF0000,</div><div class='add'>+	PCCTX_MASK	= 0x0000FF00,</div><div class='add'>+	PCCTX_QS_MASK	= 0x000000FF,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum jme_pccrx_shifts {</div><div class='add'>+	PCCRXTO_SHIFT	= 16,</div><div class='add'>+	PCCRX_SHIFT	= 8,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum jme_pcctx_shifts {</div><div class='add'>+	PCCTXTO_SHIFT	= 16,</div><div class='add'>+	PCCTX_SHIFT	= 8,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum jme_pcctx_bits {</div><div class='add'>+	PCCTXQ0_EN	= 0x00000001,</div><div class='add'>+	PCCTXQ1_EN	= 0x00000002,</div><div class='add'>+	PCCTXQ2_EN	= 0x00000004,</div><div class='add'>+	PCCTXQ3_EN	= 0x00000008,</div><div class='add'>+	PCCTXQ4_EN	= 0x00000010,</div><div class='add'>+	PCCTXQ5_EN	= 0x00000020,</div><div class='add'>+	PCCTXQ6_EN	= 0x00000040,</div><div class='add'>+	PCCTXQ7_EN	= 0x00000080,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Chip Mode Register</div><div class='add'>+ */</div><div class='add'>+enum jme_chipmode_bit_masks {</div><div class='add'>+	CM_FPGAVER_MASK		= 0xFFFF0000,</div><div class='add'>+	CM_CHIPREV_MASK		= 0x0000FF00,</div><div class='add'>+	CM_CHIPMODE_MASK	= 0x0000000F,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum jme_chipmode_shifts {</div><div class='add'>+	CM_FPGAVER_SHIFT	= 16,</div><div class='add'>+	CM_CHIPREV_SHIFT	= 8,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Shadow base address register bits</div><div class='add'>+ */</div><div class='add'>+enum jme_shadow_base_address_bits {</div><div class='add'>+	SHBA_POSTEN	= 0x1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Aggressive Power Mode Control</div><div class='add'>+ */</div><div class='add'>+enum jme_apmc_bits {</div><div class='add'>+	JME_APMC_PCIE_SD_EN	= 0x40000000,</div><div class='add'>+	JME_APMC_PSEUDO_HP_EN	= 0x20000000,</div><div class='add'>+	JME_APMC_EPIEN		= 0x04000000,</div><div class='add'>+	JME_APMC_EPIEN_CTRL	= 0x03000000,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum jme_apmc_values {</div><div class='add'>+	JME_APMC_EPIEN_CTRL_EN	= 0x02000000,</div><div class='add'>+	JME_APMC_EPIEN_CTRL_DIS	= 0x01000000,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define APMC_PHP_SHUTDOWN_DELAY	(10 * 1000 * 1000)</div><div class='add'>+</div><div class='add'>+#ifdef REG_DEBUG</div><div class='add'>+static char *MAC_REG_NAME[] = {</div><div class='add'>+	"JME_TXCS",      "JME_TXDBA_LO",  "JME_TXDBA_HI", "JME_TXQDC",</div><div class='add'>+	"JME_TXNDA",     "JME_TXMCS",     "JME_TXPFC",    "JME_TXTRHD",</div><div class='add'>+	"JME_RXCS",      "JME_RXDBA_LO",  "JME_RXDBA_HI", "JME_RXQDC",</div><div class='add'>+	"JME_RXNDA",     "JME_RXMCS",     "JME_RXUMA_LO", "JME_RXUMA_HI",</div><div class='add'>+	"JME_RXMCHT_LO", "JME_RXMCHT_HI", "JME_WFODP",    "JME_WFOI",</div><div class='add'>+	"JME_SMI",       "JME_GHC",       "UNKNOWN",      "UNKNOWN",</div><div class='add'>+	"JME_PMCS"};</div><div class='add'>+</div><div class='add'>+static char *PE_REG_NAME[] = {</div><div class='add'>+	"UNKNOWN",      "UNKNOWN",     "UNKNOWN",    "UNKNOWN",</div><div class='add'>+	"UNKNOWN",      "UNKNOWN",     "UNKNOWN",    "UNKNOWN",</div><div class='add'>+	"UNKNOWN",      "UNKNOWN",     "JME_PHY_CS", "UNKNOWN",</div><div class='add'>+	"JME_PHY_LINK", "UNKNOWN",     "UNKNOWN",    "UNKNOWN",</div><div class='add'>+	"JME_SMBCSR",   "JME_SMBINTF"};</div><div class='add'>+</div><div class='add'>+static char *MISC_REG_NAME[] = {</div><div class='add'>+	"JME_TMCSR",  "JME_GPIO",     "JME_GPREG0",  "JME_GPREG1",</div><div class='add'>+	"JME_IEVE",   "JME_IREQ",     "JME_IENS",    "JME_IENC",</div><div class='add'>+	"JME_PCCRX0", "JME_PCCRX1",   "JME_PCCRX2",  "JME_PCCRX3",</div><div class='add'>+	"JME_PCCTX0", "JME_CHIPMODE", "JME_SHBA_HI", "JME_SHBA_LO",</div><div class='add'>+	"UNKNOWN",    "UNKNOWN",      "UNKNOWN",     "UNKNOWN",</div><div class='add'>+	"UNKNOWN",    "UNKNOWN",      "UNKNOWN",     "UNKNOWN",</div><div class='add'>+	"UNKNOWN",    "UNKNOWN",      "UNKNOWN",     "UNKNOWN",</div><div class='add'>+	"JME_TIMER1", "JME_TIMER2",   "UNKNOWN",     "JME_APMC",</div><div class='add'>+	"JME_PCCSRX0"};</div><div class='add'>+</div><div class='add'>+static inline void reg_dbg(const struct jme_adapter *jme,</div><div class='add'>+		const char *msg, u32 val, u32 reg)</div><div class='add'>+{</div><div class='add'>+	const char *regname;</div><div class='add'>+	switch (reg &amp; 0xF00) {</div><div class='add'>+	case 0x000:</div><div class='add'>+		regname = MAC_REG_NAME[(reg &amp; 0xFF) &gt;&gt; 2];</div><div class='add'>+		break;</div><div class='add'>+	case 0x400:</div><div class='add'>+		regname = PE_REG_NAME[(reg &amp; 0xFF) &gt;&gt; 2];</div><div class='add'>+		break;</div><div class='add'>+	case 0x800:</div><div class='add'>+		regname = MISC_REG_NAME[(reg &amp; 0xFF) &gt;&gt; 2];</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		regname = PE_REG_NAME[0];</div><div class='add'>+	}</div><div class='add'>+	printk(KERN_DEBUG "%s: %-20s %08x@%s\n", jme-&gt;dev-&gt;name,</div><div class='add'>+			msg, val, regname);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline void reg_dbg(const struct jme_adapter *jme,</div><div class='add'>+		const char *msg, u32 val, u32 reg) {}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Read/Write MMaped I/O Registers</div><div class='add'>+ */</div><div class='add'>+static inline u32 jread32(struct jme_adapter *jme, u32 reg)</div><div class='add'>+{</div><div class='add'>+	return readl(jme-&gt;regs + reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void jwrite32(struct jme_adapter *jme, u32 reg, u32 val)</div><div class='add'>+{</div><div class='add'>+	reg_dbg(jme, "REG WRITE", val, reg);</div><div class='add'>+	writel(val, jme-&gt;regs + reg);</div><div class='add'>+	reg_dbg(jme, "VAL AFTER WRITE", readl(jme-&gt;regs + reg), reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void jwrite32f(struct jme_adapter *jme, u32 reg, u32 val)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Read after write should cause flush</div><div class='add'>+	 */</div><div class='add'>+	reg_dbg(jme, "REG WRITE FLUSH", val, reg);</div><div class='add'>+	writel(val, jme-&gt;regs + reg);</div><div class='add'>+	readl(jme-&gt;regs + reg);</div><div class='add'>+	reg_dbg(jme, "VAL AFTER WRITE", readl(jme-&gt;regs + reg), reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * PHY Regs</div><div class='add'>+ */</div><div class='add'>+enum jme_phy_reg17_bit_masks {</div><div class='add'>+	PREG17_SPEED		= 0xC000,</div><div class='add'>+	PREG17_DUPLEX		= 0x2000,</div><div class='add'>+	PREG17_SPDRSV		= 0x0800,</div><div class='add'>+	PREG17_LNKUP		= 0x0400,</div><div class='add'>+	PREG17_MDI		= 0x0040,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum jme_phy_reg17_vals {</div><div class='add'>+	PREG17_SPEED_10M	= 0x0000,</div><div class='add'>+	PREG17_SPEED_100M	= 0x4000,</div><div class='add'>+	PREG17_SPEED_1000M	= 0x8000,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define BMSR_ANCOMP               0x0020</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Workaround</div><div class='add'>+ */</div><div class='add'>+static inline int is_buggy250(unsigned short device, unsigned int chiprev)</div><div class='add'>+{</div><div class='add'>+	return device == PCI_DEVICE_ID_JMICRON_JMC250 &amp;&amp; chiprev == 0x11;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Function prototypes</div><div class='add'>+ */</div><div class='add'>+static int jme_set_settings(struct net_device *netdev,</div><div class='add'>+				struct ethtool_cmd *ecmd);</div><div class='add'>+static void jme_set_multi(struct net_device *netdev);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/lib8390.c b/drivers/net/lib8390.c<br/>index 00d59ab2f8ac..f80dcc11fe26 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/lib8390.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/lib8390.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/lib8390.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/lib8390.c</a></div><div class='hunk'>@@ -530,9 +530,9 @@ static irqreturn_t __ei_interrupt(int irq, void *dev_id)</div><div class='ctx'> #ifdef CONFIG_NET_POLL_CONTROLLER</div><div class='ctx'> static void __ei_poll(struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	disable_irq_lockdep(dev-&gt;irq);</div><div class='add'>+	disable_irq(dev-&gt;irq);</div><div class='ctx'> 	__ei_interrupt(dev-&gt;irq, dev);</div><div class='del'>-	enable_irq_lockdep(dev-&gt;irq);</div><div class='add'>+	enable_irq(dev-&gt;irq);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/macb.c b/drivers/net/macb.c<br/>index 84c77f1f9a5c..01f7a31bac76 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/macb.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/macb.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/macb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/macb.c</a></div><div class='hunk'>@@ -195,8 +195,8 @@ static int macb_mii_probe(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	/* find the first phy */</div><div class='ctx'> 	for (phy_addr = 0; phy_addr &lt; PHY_MAX_ADDR; phy_addr++) {</div><div class='del'>-		if (bp-&gt;mii_bus.phy_map[phy_addr]) {</div><div class='del'>-			phydev = bp-&gt;mii_bus.phy_map[phy_addr];</div><div class='add'>+		if (bp-&gt;mii_bus-&gt;phy_map[phy_addr]) {</div><div class='add'>+			phydev = bp-&gt;mii_bus-&gt;phy_map[phy_addr];</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -244,30 +244,36 @@ static int macb_mii_init(struct macb *bp)</div><div class='ctx'> 	/* Enable managment port */</div><div class='ctx'> 	macb_writel(bp, NCR, MACB_BIT(MPE));</div><div class='ctx'> </div><div class='del'>-	bp-&gt;mii_bus.name = "MACB_mii_bus";</div><div class='del'>-	bp-&gt;mii_bus.read = &amp;macb_mdio_read;</div><div class='del'>-	bp-&gt;mii_bus.write = &amp;macb_mdio_write;</div><div class='del'>-	bp-&gt;mii_bus.reset = &amp;macb_mdio_reset;</div><div class='del'>-	snprintf(bp-&gt;mii_bus.id, MII_BUS_ID_SIZE, "%x", bp-&gt;pdev-&gt;id);</div><div class='del'>-	bp-&gt;mii_bus.priv = bp;</div><div class='del'>-	bp-&gt;mii_bus.dev = &amp;bp-&gt;dev-&gt;dev;</div><div class='add'>+	bp-&gt;mii_bus = mdiobus_alloc();</div><div class='add'>+	if (bp-&gt;mii_bus == NULL) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto err_out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bp-&gt;mii_bus-&gt;name = "MACB_mii_bus";</div><div class='add'>+	bp-&gt;mii_bus-&gt;read = &amp;macb_mdio_read;</div><div class='add'>+	bp-&gt;mii_bus-&gt;write = &amp;macb_mdio_write;</div><div class='add'>+	bp-&gt;mii_bus-&gt;reset = &amp;macb_mdio_reset;</div><div class='add'>+	snprintf(bp-&gt;mii_bus-&gt;id, MII_BUS_ID_SIZE, "%x", bp-&gt;pdev-&gt;id);</div><div class='add'>+	bp-&gt;mii_bus-&gt;priv = bp;</div><div class='add'>+	bp-&gt;mii_bus-&gt;parent = &amp;bp-&gt;dev-&gt;dev;</div><div class='ctx'> 	pdata = bp-&gt;pdev-&gt;dev.platform_data;</div><div class='ctx'> </div><div class='ctx'> 	if (pdata)</div><div class='del'>-		bp-&gt;mii_bus.phy_mask = pdata-&gt;phy_mask;</div><div class='add'>+		bp-&gt;mii_bus-&gt;phy_mask = pdata-&gt;phy_mask;</div><div class='ctx'> </div><div class='del'>-	bp-&gt;mii_bus.irq = kmalloc(sizeof(int)*PHY_MAX_ADDR, GFP_KERNEL);</div><div class='del'>-	if (!bp-&gt;mii_bus.irq) {</div><div class='add'>+	bp-&gt;mii_bus-&gt;irq = kmalloc(sizeof(int)*PHY_MAX_ADDR, GFP_KERNEL);</div><div class='add'>+	if (!bp-&gt;mii_bus-&gt;irq) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='del'>-		goto err_out;</div><div class='add'>+		goto err_out_free_mdiobus;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; PHY_MAX_ADDR; i++)</div><div class='del'>-		bp-&gt;mii_bus.irq[i] = PHY_POLL;</div><div class='add'>+		bp-&gt;mii_bus-&gt;irq[i] = PHY_POLL;</div><div class='ctx'> </div><div class='del'>-	platform_set_drvdata(bp-&gt;dev, &amp;bp-&gt;mii_bus);</div><div class='add'>+	platform_set_drvdata(bp-&gt;dev, bp-&gt;mii_bus);</div><div class='ctx'> </div><div class='del'>-	if (mdiobus_register(&amp;bp-&gt;mii_bus))</div><div class='add'>+	if (mdiobus_register(bp-&gt;mii_bus))</div><div class='ctx'> 		goto err_out_free_mdio_irq;</div><div class='ctx'> </div><div class='ctx'> 	if (macb_mii_probe(bp-&gt;dev) != 0) {</div><div class='hunk'>@@ -277,9 +283,11 @@ static int macb_mii_init(struct macb *bp)</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err_out_unregister_bus:</div><div class='del'>-	mdiobus_unregister(&amp;bp-&gt;mii_bus);</div><div class='add'>+	mdiobus_unregister(bp-&gt;mii_bus);</div><div class='ctx'> err_out_free_mdio_irq:</div><div class='del'>-	kfree(bp-&gt;mii_bus.irq);</div><div class='add'>+	kfree(bp-&gt;mii_bus-&gt;irq);</div><div class='add'>+err_out_free_mdiobus:</div><div class='add'>+	mdiobus_free(bp-&gt;mii_bus);</div><div class='ctx'> err_out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -1261,8 +1269,9 @@ static int __exit macb_remove(struct platform_device *pdev)</div><div class='ctx'> 		bp = netdev_priv(dev);</div><div class='ctx'> 		if (bp-&gt;phy_dev)</div><div class='ctx'> 			phy_disconnect(bp-&gt;phy_dev);</div><div class='del'>-		mdiobus_unregister(&amp;bp-&gt;mii_bus);</div><div class='del'>-		kfree(bp-&gt;mii_bus.irq);</div><div class='add'>+		mdiobus_unregister(bp-&gt;mii_bus);</div><div class='add'>+		kfree(bp-&gt;mii_bus-&gt;irq);</div><div class='add'>+		mdiobus_free(bp-&gt;mii_bus);</div><div class='ctx'> 		unregister_netdev(dev);</div><div class='ctx'> 		free_irq(dev-&gt;irq, dev);</div><div class='ctx'> 		iounmap(bp-&gt;regs);</div><div class='head'>diff --git a/drivers/net/macb.h b/drivers/net/macb.h<br/>index 57b85acf0d16..d3212f6db703 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/macb.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/macb.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/macb.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/macb.h</a></div><div class='hunk'>@@ -384,7 +384,7 @@ struct macb {</div><div class='ctx'> </div><div class='ctx'> 	unsigned int		rx_pending, tx_pending;</div><div class='ctx'> </div><div class='del'>-	struct mii_bus		mii_bus;</div><div class='add'>+	struct mii_bus		*mii_bus;</div><div class='ctx'> 	struct phy_device	*phy_dev;</div><div class='ctx'> 	unsigned int 		link;</div><div class='ctx'> 	unsigned int 		speed;</div><div class='head'>diff --git a/drivers/net/macmace.c b/drivers/net/macmace.c<br/>index 51ad3765e075..85587a6667b9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/macmace.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/macmace.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/macmace.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/macmace.c</a></div><div class='hunk'>@@ -9,7 +9,7 @@</div><div class='ctx'>  *	2 of the License, or (at your option) any later version.</div><div class='ctx'>  *</div><div class='ctx'>  *	Copyright (C) 1996 Paul Mackerras.</div><div class='del'>- *	Copyright (C) 1998 Alan Cox &lt;alan@redhat.com&gt;</div><div class='add'>+ *	Copyright (C) 1998 Alan Cox &lt;alan@lxorguk.ukuu.org.uk&gt;</div><div class='ctx'>  *</div><div class='ctx'>  *	Modified heavily by Joshua M. Thompson based on Dave Huang's NetBSD driver</div><div class='ctx'>  *</div><div class='head'>diff --git a/drivers/net/meth.c b/drivers/net/meth.c<br/>index 0a97c26df6ab..a1e22ed1f6ee 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/meth.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/meth.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/meth.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/meth.c</a></div><div class='hunk'>@@ -41,7 +41,7 @@</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #if MFE_DEBUG&gt;=1</div><div class='del'>-#define DPRINTK(str,args...) printk(KERN_DEBUG "meth: %s: " str, __FUNCTION__ , ## args)</div><div class='add'>+#define DPRINTK(str,args...) printk(KERN_DEBUG "meth: %s: " str, __func__ , ## args)</div><div class='ctx'> #define MFE_RX_DEBUG 2</div><div class='ctx'> #else</div><div class='ctx'> #define DPRINTK(str,args...)</div><div class='head'>diff --git a/drivers/net/mipsnet.c b/drivers/net/mipsnet.c<br/>index 6d343efb2717..4e7a5faf0351 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/mipsnet.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/mipsnet.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/mipsnet.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/mipsnet.c</a></div><div class='hunk'>@@ -203,7 +203,7 @@ static irqreturn_t mipsnet_interrupt(int irq, void *dev_id)</div><div class='ctx'> </div><div class='ctx'> out_badirq:</div><div class='ctx'> 	printk(KERN_INFO "%s: %s(): irq %d for unknown device\n",</div><div class='del'>-	       dev-&gt;name, __FUNCTION__, irq);</div><div class='add'>+	       dev-&gt;name, __func__, irq);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/mlx4/alloc.c b/drivers/net/mlx4/alloc.c<br/>index 096bca54bcf7..b411b79d72ad 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/mlx4/alloc.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/mlx4/alloc.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/mlx4/alloc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/mlx4/alloc.c</a></div><div class='hunk'>@@ -33,6 +33,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/bitmap.h&gt;</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='head'>diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c<br/>index 0a18b9e96da1..a9c8c08044b1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/mv643xx_eth.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/mv643xx_eth.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/mv643xx_eth.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/mv643xx_eth.c</a></div><div class='hunk'>@@ -38,6 +38,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> #include &lt;linux/in.h&gt;</div><div class='add'>+#include &lt;linux/ip.h&gt;</div><div class='ctx'> #include &lt;linux/tcp.h&gt;</div><div class='ctx'> #include &lt;linux/udp.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='hunk'>@@ -48,30 +49,28 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='del'>-#include &lt;linux/mii.h&gt;</div><div class='add'>+#include &lt;linux/phy.h&gt;</div><div class='ctx'> #include &lt;linux/mv643xx_eth.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/types.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> </div><div class='ctx'> static char mv643xx_eth_driver_name[] = "mv643xx_eth";</div><div class='del'>-static char mv643xx_eth_driver_version[] = "1.3";</div><div class='add'>+static char mv643xx_eth_driver_version[] = "1.4";</div><div class='ctx'> </div><div class='del'>-#define MV643XX_ETH_CHECKSUM_OFFLOAD_TX</div><div class='del'>-#define MV643XX_ETH_NAPI</div><div class='del'>-#define MV643XX_ETH_TX_FAST_REFILL</div><div class='del'>-</div><div class='del'>-#ifdef MV643XX_ETH_CHECKSUM_OFFLOAD_TX</div><div class='del'>-#define MAX_DESCS_PER_SKB	(MAX_SKB_FRAGS + 1)</div><div class='del'>-#else</div><div class='del'>-#define MAX_DESCS_PER_SKB	1</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Registers shared between all ports.</div><div class='ctx'>  */</div><div class='ctx'> #define PHY_ADDR			0x0000</div><div class='ctx'> #define SMI_REG				0x0004</div><div class='add'>+#define  SMI_BUSY			0x10000000</div><div class='add'>+#define  SMI_READ_VALID			0x08000000</div><div class='add'>+#define  SMI_OPCODE_READ		0x04000000</div><div class='add'>+#define  SMI_OPCODE_WRITE		0x00000000</div><div class='add'>+#define ERR_INT_CAUSE			0x0080</div><div class='add'>+#define  ERR_INT_SMI_DONE		0x00000010</div><div class='add'>+#define ERR_INT_MASK			0x0084</div><div class='ctx'> #define WINDOW_BASE(w)			(0x0200 + ((w) &lt;&lt; 3))</div><div class='ctx'> #define WINDOW_SIZE(w)			(0x0204 + ((w) &lt;&lt; 3))</div><div class='ctx'> #define WINDOW_REMAP_HIGH(w)		(0x0280 + ((w) &lt;&lt; 2))</div><div class='hunk'>@@ -104,16 +103,12 @@ static char mv643xx_eth_driver_version[] = "1.3";</div><div class='ctx'> #define TX_BW_MTU(p)			(0x0458 + ((p) &lt;&lt; 10))</div><div class='ctx'> #define TX_BW_BURST(p)			(0x045c + ((p) &lt;&lt; 10))</div><div class='ctx'> #define INT_CAUSE(p)			(0x0460 + ((p) &lt;&lt; 10))</div><div class='del'>-#define  INT_TX_END_0			0x00080000</div><div class='ctx'> #define  INT_TX_END			0x07f80000</div><div class='del'>-#define  INT_RX				0x0007fbfc</div><div class='add'>+#define  INT_RX				0x000003fc</div><div class='ctx'> #define  INT_EXT			0x00000002</div><div class='ctx'> #define INT_CAUSE_EXT(p)		(0x0464 + ((p) &lt;&lt; 10))</div><div class='del'>-#define  INT_EXT_LINK			0x00100000</div><div class='del'>-#define  INT_EXT_PHY			0x00010000</div><div class='del'>-#define  INT_EXT_TX_ERROR_0		0x00000100</div><div class='del'>-#define  INT_EXT_TX_0			0x00000001</div><div class='del'>-#define  INT_EXT_TX			0x0000ffff</div><div class='add'>+#define  INT_EXT_LINK_PHY		0x00110000</div><div class='add'>+#define  INT_EXT_TX			0x000000ff</div><div class='ctx'> #define INT_MASK(p)			(0x0468 + ((p) &lt;&lt; 10))</div><div class='ctx'> #define INT_MASK_EXT(p)			(0x046c + ((p) &lt;&lt; 10))</div><div class='ctx'> #define TX_FIFO_URGENT_THRESHOLD(p)	(0x0474 + ((p) &lt;&lt; 10))</div><div class='hunk'>@@ -171,8 +166,8 @@ static char mv643xx_eth_driver_version[] = "1.3";</div><div class='ctx'> #define FORCE_LINK_PASS				(1 &lt;&lt; 1)</div><div class='ctx'> #define SERIAL_PORT_ENABLE			(1 &lt;&lt; 0)</div><div class='ctx'> </div><div class='del'>-#define DEFAULT_RX_QUEUE_SIZE		400</div><div class='del'>-#define DEFAULT_TX_QUEUE_SIZE		800</div><div class='add'>+#define DEFAULT_RX_QUEUE_SIZE		128</div><div class='add'>+#define DEFAULT_TX_QUEUE_SIZE		256</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -249,9 +244,23 @@ struct mv643xx_eth_shared_private {</div><div class='ctx'> 	void __iomem *base;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Protects access to SMI_REG, which is shared between ports.</div><div class='add'>+	 * Points at the right SMI instance to use.</div><div class='add'>+	 */</div><div class='add'>+	struct mv643xx_eth_shared_private *smi;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Provides access to local SMI interface.</div><div class='add'>+	 */</div><div class='add'>+	struct mii_bus *smi_bus;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If we have access to the error interrupt pin (which is</div><div class='add'>+	 * somewhat misnamed as it not only reflects internal errors</div><div class='add'>+	 * but also reflects SMI completion), use that to wait for</div><div class='add'>+	 * SMI access completion instead of polling the SMI busy bit.</div><div class='ctx'> 	 */</div><div class='del'>-	spinlock_t phy_lock;</div><div class='add'>+	int err_interrupt;</div><div class='add'>+	wait_queue_head_t smi_busy_wait;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Per-port MBUS window access register value.</div><div class='hunk'>@@ -263,9 +272,13 @@ struct mv643xx_eth_shared_private {</div><div class='ctx'> 	 */</div><div class='ctx'> 	unsigned int t_clk;</div><div class='ctx'> 	int extended_rx_coal_limit;</div><div class='del'>-	int tx_bw_control_moved;</div><div class='add'>+	int tx_bw_control;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define TX_BW_CONTROL_ABSENT		0</div><div class='add'>+#define TX_BW_CONTROL_OLD_LAYOUT	1</div><div class='add'>+#define TX_BW_CONTROL_NEW_LAYOUT	2</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> /* per-port *****************************************************************/</div><div class='ctx'> struct mib_counters {</div><div class='hunk'>@@ -314,8 +327,6 @@ struct rx_queue {</div><div class='ctx'> 	dma_addr_t rx_desc_dma;</div><div class='ctx'> 	int rx_desc_area_size;</div><div class='ctx'> 	struct sk_buff **rx_skb;</div><div class='del'>-</div><div class='del'>-	struct timer_list rx_oom;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct tx_queue {</div><div class='hunk'>@@ -330,7 +341,12 @@ struct tx_queue {</div><div class='ctx'> 	struct tx_desc *tx_desc_area;</div><div class='ctx'> 	dma_addr_t tx_desc_dma;</div><div class='ctx'> 	int tx_desc_area_size;</div><div class='del'>-	struct sk_buff **tx_skb;</div><div class='add'>+</div><div class='add'>+	struct sk_buff_head tx_skb;</div><div class='add'>+</div><div class='add'>+	unsigned long tx_packets;</div><div class='add'>+	unsigned long tx_bytes;</div><div class='add'>+	unsigned long tx_dropped;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mv643xx_eth_private {</div><div class='hunk'>@@ -339,14 +355,24 @@ struct mv643xx_eth_private {</div><div class='ctx'> </div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> </div><div class='del'>-	struct mv643xx_eth_shared_private *shared_smi;</div><div class='del'>-	int phy_addr;</div><div class='del'>-</div><div class='del'>-	spinlock_t lock;</div><div class='add'>+	struct phy_device *phy;</div><div class='ctx'> </div><div class='add'>+	struct timer_list mib_counters_timer;</div><div class='add'>+	spinlock_t mib_counters_lock;</div><div class='ctx'> 	struct mib_counters mib_counters;</div><div class='add'>+</div><div class='ctx'> 	struct work_struct tx_timeout_task;</div><div class='del'>-	struct mii_if_info mii;</div><div class='add'>+</div><div class='add'>+	struct napi_struct napi;</div><div class='add'>+	u8 work_link;</div><div class='add'>+	u8 work_tx;</div><div class='add'>+	u8 work_tx_end;</div><div class='add'>+	u8 work_rx;</div><div class='add'>+	u8 work_rx_refill;</div><div class='add'>+	u8 work_rx_oom;</div><div class='add'>+</div><div class='add'>+	int skb_size;</div><div class='add'>+	struct sk_buff_head rx_recycle;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * RX state.</div><div class='hunk'>@@ -354,9 +380,8 @@ struct mv643xx_eth_private {</div><div class='ctx'> 	int default_rx_ring_size;</div><div class='ctx'> 	unsigned long rx_desc_sram_addr;</div><div class='ctx'> 	int rx_desc_sram_size;</div><div class='del'>-	u8 rxq_mask;</div><div class='del'>-	int rxq_primary;</div><div class='del'>-	struct napi_struct napi;</div><div class='add'>+	int rxq_count;</div><div class='add'>+	struct timer_list rx_oom;</div><div class='ctx'> 	struct rx_queue rxq[8];</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -365,12 +390,8 @@ struct mv643xx_eth_private {</div><div class='ctx'> 	int default_tx_ring_size;</div><div class='ctx'> 	unsigned long tx_desc_sram_addr;</div><div class='ctx'> 	int tx_desc_sram_size;</div><div class='del'>-	u8 txq_mask;</div><div class='del'>-	int txq_primary;</div><div class='add'>+	int txq_count;</div><div class='ctx'> 	struct tx_queue txq[8];</div><div class='del'>-#ifdef MV643XX_ETH_TX_FAST_REFILL</div><div class='del'>-	int tx_clean_threshold;</div><div class='del'>-#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -440,94 +461,21 @@ static void txq_disable(struct tx_queue *txq)</div><div class='ctx'> 		udelay(10);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __txq_maybe_wake(struct tx_queue *txq)</div><div class='add'>+static void txq_maybe_wake(struct tx_queue *txq)</div><div class='ctx'> {</div><div class='ctx'> 	struct mv643xx_eth_private *mp = txq_to_mp(txq);</div><div class='add'>+	struct netdev_queue *nq = netdev_get_tx_queue(mp-&gt;dev, txq-&gt;index);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * netif_{stop,wake}_queue() flow control only applies to</div><div class='del'>-	 * the primary queue.</div><div class='del'>-	 */</div><div class='del'>-	BUG_ON(txq-&gt;index != mp-&gt;txq_primary);</div><div class='del'>-</div><div class='del'>-	if (txq-&gt;tx_ring_size - txq-&gt;tx_desc_count &gt;= MAX_DESCS_PER_SKB)</div><div class='del'>-		netif_wake_queue(mp-&gt;dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* rx ***********************************************************************/</div><div class='del'>-static void txq_reclaim(struct tx_queue *txq, int force);</div><div class='del'>-</div><div class='del'>-static void rxq_refill(struct rx_queue *rxq)</div><div class='del'>-{</div><div class='del'>-	struct mv643xx_eth_private *mp = rxq_to_mp(rxq);</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;mp-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	while (rxq-&gt;rx_desc_count &lt; rxq-&gt;rx_ring_size) {</div><div class='del'>-		int skb_size;</div><div class='del'>-		struct sk_buff *skb;</div><div class='del'>-		int unaligned;</div><div class='del'>-		int rx;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Reserve 2+14 bytes for an ethernet header (the</div><div class='del'>-		 * hardware automatically prepends 2 bytes of dummy</div><div class='del'>-		 * data to each received packet), 16 bytes for up to</div><div class='del'>-		 * four VLAN tags, and 4 bytes for the trailing FCS</div><div class='del'>-		 * -- 36 bytes total.</div><div class='del'>-		 */</div><div class='del'>-		skb_size = mp-&gt;dev-&gt;mtu + 36;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Make sure that the skb size is a multiple of 8</div><div class='del'>-		 * bytes, as the lower three bits of the receive</div><div class='del'>-		 * descriptor's buffer size field are ignored by</div><div class='del'>-		 * the hardware.</div><div class='del'>-		 */</div><div class='del'>-		skb_size = (skb_size + 7) &amp; ~7;</div><div class='del'>-</div><div class='del'>-		skb = dev_alloc_skb(skb_size + dma_get_cache_alignment() - 1);</div><div class='del'>-		if (skb == NULL)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		unaligned = (u32)skb-&gt;data &amp; (dma_get_cache_alignment() - 1);</div><div class='del'>-		if (unaligned)</div><div class='del'>-			skb_reserve(skb, dma_get_cache_alignment() - unaligned);</div><div class='del'>-</div><div class='del'>-		rxq-&gt;rx_desc_count++;</div><div class='del'>-		rx = rxq-&gt;rx_used_desc;</div><div class='del'>-		rxq-&gt;rx_used_desc = (rx + 1) % rxq-&gt;rx_ring_size;</div><div class='del'>-</div><div class='del'>-		rxq-&gt;rx_desc_area[rx].buf_ptr = dma_map_single(NULL, skb-&gt;data,</div><div class='del'>-						skb_size, DMA_FROM_DEVICE);</div><div class='del'>-		rxq-&gt;rx_desc_area[rx].buf_size = skb_size;</div><div class='del'>-		rxq-&gt;rx_skb[rx] = skb;</div><div class='del'>-		wmb();</div><div class='del'>-		rxq-&gt;rx_desc_area[rx].cmd_sts = BUFFER_OWNED_BY_DMA |</div><div class='del'>-						RX_ENABLE_INTERRUPT;</div><div class='del'>-		wmb();</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * The hardware automatically prepends 2 bytes of</div><div class='del'>-		 * dummy data to each received packet, so that the</div><div class='del'>-		 * IP header ends up 16-byte aligned.</div><div class='del'>-		 */</div><div class='del'>-		skb_reserve(skb, 2);</div><div class='add'>+	if (netif_tx_queue_stopped(nq)) {</div><div class='add'>+		__netif_tx_lock(nq, smp_processor_id());</div><div class='add'>+		if (txq-&gt;tx_ring_size - txq-&gt;tx_desc_count &gt;= MAX_SKB_FRAGS + 1)</div><div class='add'>+			netif_tx_wake_queue(nq);</div><div class='add'>+		__netif_tx_unlock(nq);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	if (rxq-&gt;rx_desc_count != rxq-&gt;rx_ring_size)</div><div class='del'>-		mod_timer(&amp;rxq-&gt;rx_oom, jiffies + (HZ / 10));</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;mp-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void rxq_refill_timer_wrapper(unsigned long data)</div><div class='del'>-{</div><div class='del'>-	rxq_refill((struct rx_queue *)data);</div><div class='del'>-}</div><div class='ctx'> </div><div class='add'>+/* rx napi ******************************************************************/</div><div class='ctx'> static int rxq_process(struct rx_queue *rxq, int budget)</div><div class='ctx'> {</div><div class='ctx'> 	struct mv643xx_eth_private *mp = rxq_to_mp(rxq);</div><div class='hunk'>@@ -539,31 +487,31 @@ static int rxq_process(struct rx_queue *rxq, int budget)</div><div class='ctx'> 		struct rx_desc *rx_desc;</div><div class='ctx'> 		unsigned int cmd_sts;</div><div class='ctx'> 		struct sk_buff *skb;</div><div class='del'>-		unsigned long flags;</div><div class='del'>-</div><div class='del'>-		spin_lock_irqsave(&amp;mp-&gt;lock, flags);</div><div class='add'>+		u16 byte_cnt;</div><div class='ctx'> </div><div class='ctx'> 		rx_desc = &amp;rxq-&gt;rx_desc_area[rxq-&gt;rx_curr_desc];</div><div class='ctx'> </div><div class='ctx'> 		cmd_sts = rx_desc-&gt;cmd_sts;</div><div class='del'>-		if (cmd_sts &amp; BUFFER_OWNED_BY_DMA) {</div><div class='del'>-			spin_unlock_irqrestore(&amp;mp-&gt;lock, flags);</div><div class='add'>+		if (cmd_sts &amp; BUFFER_OWNED_BY_DMA)</div><div class='ctx'> 			break;</div><div class='del'>-		}</div><div class='ctx'> 		rmb();</div><div class='ctx'> </div><div class='ctx'> 		skb = rxq-&gt;rx_skb[rxq-&gt;rx_curr_desc];</div><div class='ctx'> 		rxq-&gt;rx_skb[rxq-&gt;rx_curr_desc] = NULL;</div><div class='ctx'> </div><div class='del'>-		rxq-&gt;rx_curr_desc = (rxq-&gt;rx_curr_desc + 1) % rxq-&gt;rx_ring_size;</div><div class='del'>-</div><div class='del'>-		spin_unlock_irqrestore(&amp;mp-&gt;lock, flags);</div><div class='add'>+		rxq-&gt;rx_curr_desc++;</div><div class='add'>+		if (rxq-&gt;rx_curr_desc == rxq-&gt;rx_ring_size)</div><div class='add'>+			rxq-&gt;rx_curr_desc = 0;</div><div class='ctx'> </div><div class='del'>-		dma_unmap_single(NULL, rx_desc-&gt;buf_ptr + 2,</div><div class='add'>+		dma_unmap_single(NULL, rx_desc-&gt;buf_ptr,</div><div class='ctx'> 				 rx_desc-&gt;buf_size, DMA_FROM_DEVICE);</div><div class='ctx'> 		rxq-&gt;rx_desc_count--;</div><div class='ctx'> 		rx++;</div><div class='ctx'> </div><div class='add'>+		mp-&gt;work_rx_refill |= 1 &lt;&lt; rxq-&gt;index;</div><div class='add'>+</div><div class='add'>+		byte_cnt = rx_desc-&gt;byte_cnt;</div><div class='add'>+</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Update statistics.</div><div class='ctx'> 		 *</div><div class='hunk'>@@ -573,7 +521,7 @@ static int rxq_process(struct rx_queue *rxq, int budget)</div><div class='ctx'> 		 * byte CRC at the end of the packet (which we do count).</div><div class='ctx'> 		 */</div><div class='ctx'> 		stats-&gt;rx_packets++;</div><div class='del'>-		stats-&gt;rx_bytes += rx_desc-&gt;byte_cnt - 2;</div><div class='add'>+		stats-&gt;rx_bytes += byte_cnt - 2;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * In case we received a packet without first / last bits</div><div class='hunk'>@@ -596,72 +544,84 @@ static int rxq_process(struct rx_queue *rxq, int budget)</div><div class='ctx'> 			if (cmd_sts &amp; ERROR_SUMMARY)</div><div class='ctx'> 				stats-&gt;rx_errors++;</div><div class='ctx'> </div><div class='del'>-			dev_kfree_skb_irq(skb);</div><div class='add'>+			dev_kfree_skb(skb);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * The -4 is for the CRC in the trailer of the</div><div class='ctx'> 			 * received packet</div><div class='ctx'> 			 */</div><div class='del'>-			skb_put(skb, rx_desc-&gt;byte_cnt - 2 - 4);</div><div class='add'>+			skb_put(skb, byte_cnt - 2 - 4);</div><div class='ctx'> </div><div class='del'>-			if (cmd_sts &amp; LAYER_4_CHECKSUM_OK) {</div><div class='add'>+			if (cmd_sts &amp; LAYER_4_CHECKSUM_OK)</div><div class='ctx'> 				skb-&gt;ip_summed = CHECKSUM_UNNECESSARY;</div><div class='del'>-				skb-&gt;csum = htons(</div><div class='del'>-					(cmd_sts &amp; 0x0007fff8) &gt;&gt; 3);</div><div class='del'>-			}</div><div class='ctx'> 			skb-&gt;protocol = eth_type_trans(skb, mp-&gt;dev);</div><div class='del'>-#ifdef MV643XX_ETH_NAPI</div><div class='ctx'> 			netif_receive_skb(skb);</div><div class='del'>-#else</div><div class='del'>-			netif_rx(skb);</div><div class='del'>-#endif</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		mp-&gt;dev-&gt;last_rx = jiffies;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rxq_refill(rxq);</div><div class='add'>+	if (rx &lt; budget)</div><div class='add'>+		mp-&gt;work_rx &amp;= ~(1 &lt;&lt; rxq-&gt;index);</div><div class='ctx'> </div><div class='ctx'> 	return rx;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef MV643XX_ETH_NAPI</div><div class='del'>-static int mv643xx_eth_poll(struct napi_struct *napi, int budget)</div><div class='add'>+static int rxq_refill(struct rx_queue *rxq, int budget)</div><div class='ctx'> {</div><div class='del'>-	struct mv643xx_eth_private *mp;</div><div class='del'>-	int rx;</div><div class='del'>-	int i;</div><div class='add'>+	struct mv643xx_eth_private *mp = rxq_to_mp(rxq);</div><div class='add'>+	int refilled;</div><div class='ctx'> </div><div class='del'>-	mp = container_of(napi, struct mv643xx_eth_private, napi);</div><div class='add'>+	refilled = 0;</div><div class='add'>+	while (refilled &lt; budget &amp;&amp; rxq-&gt;rx_desc_count &lt; rxq-&gt;rx_ring_size) {</div><div class='add'>+		struct sk_buff *skb;</div><div class='add'>+		int unaligned;</div><div class='add'>+		int rx;</div><div class='add'>+</div><div class='add'>+		skb = __skb_dequeue(&amp;mp-&gt;rx_recycle);</div><div class='add'>+		if (skb == NULL)</div><div class='add'>+			skb = dev_alloc_skb(mp-&gt;skb_size +</div><div class='add'>+					    dma_get_cache_alignment() - 1);</div><div class='ctx'> </div><div class='del'>-#ifdef MV643XX_ETH_TX_FAST_REFILL</div><div class='del'>-	if (++mp-&gt;tx_clean_threshold &gt; 5) {</div><div class='del'>-		mp-&gt;tx_clean_threshold = 0;</div><div class='del'>-		for (i = 0; i &lt; 8; i++)</div><div class='del'>-			if (mp-&gt;txq_mask &amp; (1 &lt;&lt; i))</div><div class='del'>-				txq_reclaim(mp-&gt;txq + i, 0);</div><div class='del'>-</div><div class='del'>-		if (netif_carrier_ok(mp-&gt;dev)) {</div><div class='del'>-			spin_lock_irq(&amp;mp-&gt;lock);</div><div class='del'>-			__txq_maybe_wake(mp-&gt;txq + mp-&gt;txq_primary);</div><div class='del'>-			spin_unlock_irq(&amp;mp-&gt;lock);</div><div class='add'>+		if (skb == NULL) {</div><div class='add'>+			mp-&gt;work_rx_oom |= 1 &lt;&lt; rxq-&gt;index;</div><div class='add'>+			goto oom;</div><div class='ctx'> 		}</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='del'>-	rx = 0;</div><div class='del'>-	for (i = 7; rx &lt; budget &amp;&amp; i &gt;= 0; i--)</div><div class='del'>-		if (mp-&gt;rxq_mask &amp; (1 &lt;&lt; i))</div><div class='del'>-			rx += rxq_process(mp-&gt;rxq + i, budget - rx);</div><div class='add'>+		unaligned = (u32)skb-&gt;data &amp; (dma_get_cache_alignment() - 1);</div><div class='add'>+		if (unaligned)</div><div class='add'>+			skb_reserve(skb, dma_get_cache_alignment() - unaligned);</div><div class='ctx'> </div><div class='del'>-	if (rx &lt; budget) {</div><div class='del'>-		netif_rx_complete(mp-&gt;dev, napi);</div><div class='del'>-		wrl(mp, INT_MASK(mp-&gt;port_num), INT_TX_END | INT_RX | INT_EXT);</div><div class='add'>+		refilled++;</div><div class='add'>+		rxq-&gt;rx_desc_count++;</div><div class='add'>+</div><div class='add'>+		rx = rxq-&gt;rx_used_desc++;</div><div class='add'>+		if (rxq-&gt;rx_used_desc == rxq-&gt;rx_ring_size)</div><div class='add'>+			rxq-&gt;rx_used_desc = 0;</div><div class='add'>+</div><div class='add'>+		rxq-&gt;rx_desc_area[rx].buf_ptr = dma_map_single(NULL, skb-&gt;data,</div><div class='add'>+						mp-&gt;skb_size, DMA_FROM_DEVICE);</div><div class='add'>+		rxq-&gt;rx_desc_area[rx].buf_size = mp-&gt;skb_size;</div><div class='add'>+		rxq-&gt;rx_skb[rx] = skb;</div><div class='add'>+		wmb();</div><div class='add'>+		rxq-&gt;rx_desc_area[rx].cmd_sts = BUFFER_OWNED_BY_DMA |</div><div class='add'>+						RX_ENABLE_INTERRUPT;</div><div class='add'>+		wmb();</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * The hardware automatically prepends 2 bytes of</div><div class='add'>+		 * dummy data to each received packet, so that the</div><div class='add'>+		 * IP header ends up 16-byte aligned.</div><div class='add'>+		 */</div><div class='add'>+		skb_reserve(skb, 2);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return rx;</div><div class='add'>+	if (refilled &lt; budget)</div><div class='add'>+		mp-&gt;work_rx_refill &amp;= ~(1 &lt;&lt; rxq-&gt;index);</div><div class='add'>+</div><div class='add'>+oom:</div><div class='add'>+	return refilled;</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* tx ***********************************************************************/</div><div class='hunk'>@@ -684,8 +644,9 @@ static int txq_alloc_desc_index(struct tx_queue *txq)</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(txq-&gt;tx_desc_count &gt;= txq-&gt;tx_ring_size);</div><div class='ctx'> </div><div class='del'>-	tx_desc_curr = txq-&gt;tx_curr_desc;</div><div class='del'>-	txq-&gt;tx_curr_desc = (tx_desc_curr + 1) % txq-&gt;tx_ring_size;</div><div class='add'>+	tx_desc_curr = txq-&gt;tx_curr_desc++;</div><div class='add'>+	if (txq-&gt;tx_curr_desc == txq-&gt;tx_ring_size)</div><div class='add'>+		txq-&gt;tx_curr_desc = 0;</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(txq-&gt;tx_curr_desc == txq-&gt;tx_used_desc);</div><div class='ctx'> </div><div class='hunk'>@@ -714,10 +675,8 @@ static void txq_submit_frag_skb(struct tx_queue *txq, struct sk_buff *skb)</div><div class='ctx'> 			desc-&gt;cmd_sts = BUFFER_OWNED_BY_DMA |</div><div class='ctx'> 					ZERO_PADDING | TX_LAST_DESC |</div><div class='ctx'> 					TX_ENABLE_INTERRUPT;</div><div class='del'>-			txq-&gt;tx_skb[tx_index] = skb;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			desc-&gt;cmd_sts = BUFFER_OWNED_BY_DMA;</div><div class='del'>-			txq-&gt;tx_skb[tx_index] = NULL;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		desc-&gt;l4i_chk = 0;</div><div class='hunk'>@@ -734,144 +693,228 @@ static inline __be16 sum16_as_be(__sum16 sum)</div><div class='ctx'> 	return (__force __be16)sum;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void txq_submit_skb(struct tx_queue *txq, struct sk_buff *skb)</div><div class='add'>+static int txq_submit_skb(struct tx_queue *txq, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct mv643xx_eth_private *mp = txq_to_mp(txq);</div><div class='ctx'> 	int nr_frags = skb_shinfo(skb)-&gt;nr_frags;</div><div class='ctx'> 	int tx_index;</div><div class='ctx'> 	struct tx_desc *desc;</div><div class='ctx'> 	u32 cmd_sts;</div><div class='add'>+	u16 l4i_chk;</div><div class='ctx'> 	int length;</div><div class='ctx'> </div><div class='ctx'> 	cmd_sts = TX_FIRST_DESC | GEN_CRC | BUFFER_OWNED_BY_DMA;</div><div class='del'>-</div><div class='del'>-	tx_index = txq_alloc_desc_index(txq);</div><div class='del'>-	desc = &amp;txq-&gt;tx_desc_area[tx_index];</div><div class='del'>-</div><div class='del'>-	if (nr_frags) {</div><div class='del'>-		txq_submit_frag_skb(txq, skb);</div><div class='del'>-</div><div class='del'>-		length = skb_headlen(skb);</div><div class='del'>-		txq-&gt;tx_skb[tx_index] = NULL;</div><div class='del'>-	} else {</div><div class='del'>-		cmd_sts |= ZERO_PADDING | TX_LAST_DESC | TX_ENABLE_INTERRUPT;</div><div class='del'>-		length = skb-&gt;len;</div><div class='del'>-		txq-&gt;tx_skb[tx_index] = skb;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	desc-&gt;byte_cnt = length;</div><div class='del'>-	desc-&gt;buf_ptr = dma_map_single(NULL, skb-&gt;data, length, DMA_TO_DEVICE);</div><div class='add'>+	l4i_chk = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (skb-&gt;ip_summed == CHECKSUM_PARTIAL) {</div><div class='del'>-		int mac_hdr_len;</div><div class='add'>+		int tag_bytes;</div><div class='ctx'> </div><div class='ctx'> 		BUG_ON(skb-&gt;protocol != htons(ETH_P_IP) &amp;&amp;</div><div class='ctx'> 		       skb-&gt;protocol != htons(ETH_P_8021Q));</div><div class='ctx'> </div><div class='del'>-		cmd_sts |= GEN_TCP_UDP_CHECKSUM |</div><div class='del'>-			   GEN_IP_V4_CHECKSUM   |</div><div class='del'>-			   ip_hdr(skb)-&gt;ihl &lt;&lt; TX_IHL_SHIFT;</div><div class='add'>+		tag_bytes = (void *)ip_hdr(skb) - (void *)skb-&gt;data - ETH_HLEN;</div><div class='add'>+		if (unlikely(tag_bytes &amp; ~12)) {</div><div class='add'>+			if (skb_checksum_help(skb) == 0)</div><div class='add'>+				goto no_csum;</div><div class='add'>+			kfree_skb(skb);</div><div class='add'>+			return 1;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		mac_hdr_len = (void *)ip_hdr(skb) - (void *)skb-&gt;data;</div><div class='del'>-		switch (mac_hdr_len - ETH_HLEN) {</div><div class='del'>-		case 0:</div><div class='del'>-			break;</div><div class='del'>-		case 4:</div><div class='del'>-			cmd_sts |= MAC_HDR_EXTRA_4_BYTES;</div><div class='del'>-			break;</div><div class='del'>-		case 8:</div><div class='del'>-			cmd_sts |= MAC_HDR_EXTRA_8_BYTES;</div><div class='del'>-			break;</div><div class='del'>-		case 12:</div><div class='add'>+		if (tag_bytes &amp; 4)</div><div class='ctx'> 			cmd_sts |= MAC_HDR_EXTRA_4_BYTES;</div><div class='add'>+		if (tag_bytes &amp; 8)</div><div class='ctx'> 			cmd_sts |= MAC_HDR_EXTRA_8_BYTES;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			if (net_ratelimit())</div><div class='del'>-				dev_printk(KERN_ERR, &amp;txq_to_mp(txq)-&gt;dev-&gt;dev,</div><div class='del'>-				   "mac header length is %d?!\n", mac_hdr_len);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='add'>+</div><div class='add'>+		cmd_sts |= GEN_TCP_UDP_CHECKSUM |</div><div class='add'>+			   GEN_IP_V4_CHECKSUM   |</div><div class='add'>+			   ip_hdr(skb)-&gt;ihl &lt;&lt; TX_IHL_SHIFT;</div><div class='ctx'> </div><div class='ctx'> 		switch (ip_hdr(skb)-&gt;protocol) {</div><div class='ctx'> 		case IPPROTO_UDP:</div><div class='ctx'> 			cmd_sts |= UDP_FRAME;</div><div class='del'>-			desc-&gt;l4i_chk = ntohs(sum16_as_be(udp_hdr(skb)-&gt;check));</div><div class='add'>+			l4i_chk = ntohs(sum16_as_be(udp_hdr(skb)-&gt;check));</div><div class='ctx'> 			break;</div><div class='ctx'> 		case IPPROTO_TCP:</div><div class='del'>-			desc-&gt;l4i_chk = ntohs(sum16_as_be(tcp_hdr(skb)-&gt;check));</div><div class='add'>+			l4i_chk = ntohs(sum16_as_be(tcp_hdr(skb)-&gt;check));</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			BUG();</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='add'>+no_csum:</div><div class='ctx'> 		/* Errata BTS #50, IHL must be 5 if no HW checksum */</div><div class='ctx'> 		cmd_sts |= 5 &lt;&lt; TX_IHL_SHIFT;</div><div class='del'>-		desc-&gt;l4i_chk = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	tx_index = txq_alloc_desc_index(txq);</div><div class='add'>+	desc = &amp;txq-&gt;tx_desc_area[tx_index];</div><div class='add'>+</div><div class='add'>+	if (nr_frags) {</div><div class='add'>+		txq_submit_frag_skb(txq, skb);</div><div class='add'>+		length = skb_headlen(skb);</div><div class='add'>+	} else {</div><div class='add'>+		cmd_sts |= ZERO_PADDING | TX_LAST_DESC | TX_ENABLE_INTERRUPT;</div><div class='add'>+		length = skb-&gt;len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	desc-&gt;l4i_chk = l4i_chk;</div><div class='add'>+	desc-&gt;byte_cnt = length;</div><div class='add'>+	desc-&gt;buf_ptr = dma_map_single(NULL, skb-&gt;data, length, DMA_TO_DEVICE);</div><div class='add'>+</div><div class='add'>+	__skb_queue_tail(&amp;txq-&gt;tx_skb, skb);</div><div class='add'>+</div><div class='ctx'> 	/* ensure all other descriptors are written before first cmd_sts */</div><div class='ctx'> 	wmb();</div><div class='ctx'> 	desc-&gt;cmd_sts = cmd_sts;</div><div class='ctx'> </div><div class='del'>-	/* clear TX_END interrupt status */</div><div class='del'>-	wrl(mp, INT_CAUSE(mp-&gt;port_num), ~(INT_TX_END_0 &lt;&lt; txq-&gt;index));</div><div class='del'>-	rdl(mp, INT_CAUSE(mp-&gt;port_num));</div><div class='add'>+	/* clear TX_END status */</div><div class='add'>+	mp-&gt;work_tx_end &amp;= ~(1 &lt;&lt; txq-&gt;index);</div><div class='ctx'> </div><div class='ctx'> 	/* ensure all descriptors are written before poking hardware */</div><div class='ctx'> 	wmb();</div><div class='ctx'> 	txq_enable(txq);</div><div class='ctx'> </div><div class='ctx'> 	txq-&gt;tx_desc_count += nr_frags + 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mv643xx_eth_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct mv643xx_eth_private *mp = netdev_priv(dev);</div><div class='del'>-	struct net_device_stats *stats = &amp;dev-&gt;stats;</div><div class='add'>+	int queue;</div><div class='ctx'> 	struct tx_queue *txq;</div><div class='del'>-	unsigned long flags;</div><div class='add'>+	struct netdev_queue *nq;</div><div class='add'>+</div><div class='add'>+	queue = skb_get_queue_mapping(skb);</div><div class='add'>+	txq = mp-&gt;txq + queue;</div><div class='add'>+	nq = netdev_get_tx_queue(dev, queue);</div><div class='ctx'> </div><div class='ctx'> 	if (has_tiny_unaligned_frags(skb) &amp;&amp; __skb_linearize(skb)) {</div><div class='del'>-		stats-&gt;tx_dropped++;</div><div class='add'>+		txq-&gt;tx_dropped++;</div><div class='ctx'> 		dev_printk(KERN_DEBUG, &amp;dev-&gt;dev,</div><div class='ctx'> 			   "failed to linearize skb with tiny "</div><div class='ctx'> 			   "unaligned fragment\n");</div><div class='ctx'> 		return NETDEV_TX_BUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;mp-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	txq = mp-&gt;txq + mp-&gt;txq_primary;</div><div class='del'>-</div><div class='del'>-	if (txq-&gt;tx_ring_size - txq-&gt;tx_desc_count &lt; MAX_DESCS_PER_SKB) {</div><div class='del'>-		spin_unlock_irqrestore(&amp;mp-&gt;lock, flags);</div><div class='del'>-		if (txq-&gt;index == mp-&gt;txq_primary &amp;&amp; net_ratelimit())</div><div class='del'>-			dev_printk(KERN_ERR, &amp;dev-&gt;dev,</div><div class='del'>-				   "primary tx queue full?!\n");</div><div class='add'>+	if (txq-&gt;tx_ring_size - txq-&gt;tx_desc_count &lt; MAX_SKB_FRAGS + 1) {</div><div class='add'>+		if (net_ratelimit())</div><div class='add'>+			dev_printk(KERN_ERR, &amp;dev-&gt;dev, "tx queue full?!\n");</div><div class='ctx'> 		kfree_skb(skb);</div><div class='ctx'> 		return NETDEV_TX_OK;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	txq_submit_skb(txq, skb);</div><div class='del'>-	stats-&gt;tx_bytes += skb-&gt;len;</div><div class='del'>-	stats-&gt;tx_packets++;</div><div class='del'>-	dev-&gt;trans_start = jiffies;</div><div class='del'>-</div><div class='del'>-	if (txq-&gt;index == mp-&gt;txq_primary) {</div><div class='add'>+	if (!txq_submit_skb(txq, skb)) {</div><div class='ctx'> 		int entries_left;</div><div class='ctx'> </div><div class='add'>+		txq-&gt;tx_bytes += skb-&gt;len;</div><div class='add'>+		txq-&gt;tx_packets++;</div><div class='add'>+		dev-&gt;trans_start = jiffies;</div><div class='add'>+</div><div class='ctx'> 		entries_left = txq-&gt;tx_ring_size - txq-&gt;tx_desc_count;</div><div class='del'>-		if (entries_left &lt; MAX_DESCS_PER_SKB)</div><div class='del'>-			netif_stop_queue(dev);</div><div class='add'>+		if (entries_left &lt; MAX_SKB_FRAGS + 1)</div><div class='add'>+			netif_tx_stop_queue(nq);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irqrestore(&amp;mp-&gt;lock, flags);</div><div class='del'>-</div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+/* tx napi ******************************************************************/</div><div class='add'>+static void txq_kick(struct tx_queue *txq)</div><div class='add'>+{</div><div class='add'>+	struct mv643xx_eth_private *mp = txq_to_mp(txq);</div><div class='add'>+	struct netdev_queue *nq = netdev_get_tx_queue(mp-&gt;dev, txq-&gt;index);</div><div class='add'>+	u32 hw_desc_ptr;</div><div class='add'>+	u32 expected_ptr;</div><div class='add'>+</div><div class='add'>+	__netif_tx_lock(nq, smp_processor_id());</div><div class='add'>+</div><div class='add'>+	if (rdl(mp, TXQ_COMMAND(mp-&gt;port_num)) &amp; (1 &lt;&lt; txq-&gt;index))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	hw_desc_ptr = rdl(mp, TXQ_CURRENT_DESC_PTR(mp-&gt;port_num, txq-&gt;index));</div><div class='add'>+	expected_ptr = (u32)txq-&gt;tx_desc_dma +</div><div class='add'>+				txq-&gt;tx_curr_desc * sizeof(struct tx_desc);</div><div class='add'>+</div><div class='add'>+	if (hw_desc_ptr != expected_ptr)</div><div class='add'>+		txq_enable(txq);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	__netif_tx_unlock(nq);</div><div class='add'>+</div><div class='add'>+	mp-&gt;work_tx_end &amp;= ~(1 &lt;&lt; txq-&gt;index);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int txq_reclaim(struct tx_queue *txq, int budget, int force)</div><div class='add'>+{</div><div class='add'>+	struct mv643xx_eth_private *mp = txq_to_mp(txq);</div><div class='add'>+	struct netdev_queue *nq = netdev_get_tx_queue(mp-&gt;dev, txq-&gt;index);</div><div class='add'>+	int reclaimed;</div><div class='add'>+</div><div class='add'>+	__netif_tx_lock(nq, smp_processor_id());</div><div class='add'>+</div><div class='add'>+	reclaimed = 0;</div><div class='add'>+	while (reclaimed &lt; budget &amp;&amp; txq-&gt;tx_desc_count &gt; 0) {</div><div class='add'>+		int tx_index;</div><div class='add'>+		struct tx_desc *desc;</div><div class='add'>+		u32 cmd_sts;</div><div class='add'>+		struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+		tx_index = txq-&gt;tx_used_desc;</div><div class='add'>+		desc = &amp;txq-&gt;tx_desc_area[tx_index];</div><div class='add'>+		cmd_sts = desc-&gt;cmd_sts;</div><div class='add'>+</div><div class='add'>+		if (cmd_sts &amp; BUFFER_OWNED_BY_DMA) {</div><div class='add'>+			if (!force)</div><div class='add'>+				break;</div><div class='add'>+			desc-&gt;cmd_sts = cmd_sts &amp; ~BUFFER_OWNED_BY_DMA;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		txq-&gt;tx_used_desc = tx_index + 1;</div><div class='add'>+		if (txq-&gt;tx_used_desc == txq-&gt;tx_ring_size)</div><div class='add'>+			txq-&gt;tx_used_desc = 0;</div><div class='add'>+</div><div class='add'>+		reclaimed++;</div><div class='add'>+		txq-&gt;tx_desc_count--;</div><div class='add'>+</div><div class='add'>+		skb = NULL;</div><div class='add'>+		if (cmd_sts &amp; TX_LAST_DESC)</div><div class='add'>+			skb = __skb_dequeue(&amp;txq-&gt;tx_skb);</div><div class='add'>+</div><div class='add'>+		if (cmd_sts &amp; ERROR_SUMMARY) {</div><div class='add'>+			dev_printk(KERN_INFO, &amp;mp-&gt;dev-&gt;dev, "tx error\n");</div><div class='add'>+			mp-&gt;dev-&gt;stats.tx_errors++;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (cmd_sts &amp; TX_FIRST_DESC) {</div><div class='add'>+			dma_unmap_single(NULL, desc-&gt;buf_ptr,</div><div class='add'>+					 desc-&gt;byte_cnt, DMA_TO_DEVICE);</div><div class='add'>+		} else {</div><div class='add'>+			dma_unmap_page(NULL, desc-&gt;buf_ptr,</div><div class='add'>+				       desc-&gt;byte_cnt, DMA_TO_DEVICE);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (skb != NULL) {</div><div class='add'>+			if (skb_queue_len(&amp;mp-&gt;rx_recycle) &lt;</div><div class='add'>+					mp-&gt;default_rx_ring_size &amp;&amp;</div><div class='add'>+			    skb_recycle_check(skb, mp-&gt;skb_size))</div><div class='add'>+				__skb_queue_head(&amp;mp-&gt;rx_recycle, skb);</div><div class='add'>+			else</div><div class='add'>+				dev_kfree_skb(skb);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	__netif_tx_unlock(nq);</div><div class='add'>+</div><div class='add'>+	if (reclaimed &lt; budget)</div><div class='add'>+		mp-&gt;work_tx &amp;= ~(1 &lt;&lt; txq-&gt;index);</div><div class='add'>+</div><div class='add'>+	return reclaimed;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> /* tx rate control **********************************************************/</div><div class='ctx'> /*</div><div class='ctx'>  * Set total maximum TX rate (shared by all TX queues for this port)</div><div class='hunk'>@@ -895,14 +938,17 @@ static void tx_set_rate(struct mv643xx_eth_private *mp, int rate, int burst)</div><div class='ctx'> 	if (bucket_size &gt; 65535)</div><div class='ctx'> 		bucket_size = 65535;</div><div class='ctx'> </div><div class='del'>-	if (mp-&gt;shared-&gt;tx_bw_control_moved) {</div><div class='del'>-		wrl(mp, TX_BW_RATE_MOVED(mp-&gt;port_num), token_rate);</div><div class='del'>-		wrl(mp, TX_BW_MTU_MOVED(mp-&gt;port_num), mtu);</div><div class='del'>-		wrl(mp, TX_BW_BURST_MOVED(mp-&gt;port_num), bucket_size);</div><div class='del'>-	} else {</div><div class='add'>+	switch (mp-&gt;shared-&gt;tx_bw_control) {</div><div class='add'>+	case TX_BW_CONTROL_OLD_LAYOUT:</div><div class='ctx'> 		wrl(mp, TX_BW_RATE(mp-&gt;port_num), token_rate);</div><div class='ctx'> 		wrl(mp, TX_BW_MTU(mp-&gt;port_num), mtu);</div><div class='ctx'> 		wrl(mp, TX_BW_BURST(mp-&gt;port_num), bucket_size);</div><div class='add'>+		break;</div><div class='add'>+	case TX_BW_CONTROL_NEW_LAYOUT:</div><div class='add'>+		wrl(mp, TX_BW_RATE_MOVED(mp-&gt;port_num), token_rate);</div><div class='add'>+		wrl(mp, TX_BW_MTU_MOVED(mp-&gt;port_num), mtu);</div><div class='add'>+		wrl(mp, TX_BW_BURST_MOVED(mp-&gt;port_num), bucket_size);</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -934,14 +980,21 @@ static void txq_set_fixed_prio_mode(struct tx_queue *txq)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Turn on fixed priority mode.</div><div class='ctx'> 	 */</div><div class='del'>-	if (mp-&gt;shared-&gt;tx_bw_control_moved)</div><div class='del'>-		off = TXQ_FIX_PRIO_CONF_MOVED(mp-&gt;port_num);</div><div class='del'>-	else</div><div class='add'>+	off = 0;</div><div class='add'>+	switch (mp-&gt;shared-&gt;tx_bw_control) {</div><div class='add'>+	case TX_BW_CONTROL_OLD_LAYOUT:</div><div class='ctx'> 		off = TXQ_FIX_PRIO_CONF(mp-&gt;port_num);</div><div class='add'>+		break;</div><div class='add'>+	case TX_BW_CONTROL_NEW_LAYOUT:</div><div class='add'>+		off = TXQ_FIX_PRIO_CONF_MOVED(mp-&gt;port_num);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	val = rdl(mp, off);</div><div class='del'>-	val |= 1 &lt;&lt; txq-&gt;index;</div><div class='del'>-	wrl(mp, off, val);</div><div class='add'>+	if (off) {</div><div class='add'>+		val = rdl(mp, off);</div><div class='add'>+		val |= 1 &lt;&lt; txq-&gt;index;</div><div class='add'>+		wrl(mp, off, val);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void txq_set_wrr(struct tx_queue *txq, int weight)</div><div class='hunk'>@@ -953,95 +1006,147 @@ static void txq_set_wrr(struct tx_queue *txq, int weight)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Turn off fixed priority mode.</div><div class='ctx'> 	 */</div><div class='del'>-	if (mp-&gt;shared-&gt;tx_bw_control_moved)</div><div class='del'>-		off = TXQ_FIX_PRIO_CONF_MOVED(mp-&gt;port_num);</div><div class='del'>-	else</div><div class='add'>+	off = 0;</div><div class='add'>+	switch (mp-&gt;shared-&gt;tx_bw_control) {</div><div class='add'>+	case TX_BW_CONTROL_OLD_LAYOUT:</div><div class='ctx'> 		off = TXQ_FIX_PRIO_CONF(mp-&gt;port_num);</div><div class='add'>+		break;</div><div class='add'>+	case TX_BW_CONTROL_NEW_LAYOUT:</div><div class='add'>+		off = TXQ_FIX_PRIO_CONF_MOVED(mp-&gt;port_num);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	val = rdl(mp, off);</div><div class='del'>-	val &amp;= ~(1 &lt;&lt; txq-&gt;index);</div><div class='del'>-	wrl(mp, off, val);</div><div class='add'>+	if (off) {</div><div class='add'>+		val = rdl(mp, off);</div><div class='add'>+		val &amp;= ~(1 &lt;&lt; txq-&gt;index);</div><div class='add'>+		wrl(mp, off, val);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Configure WRR weight for this queue.</div><div class='del'>-	 */</div><div class='del'>-	off = TXQ_BW_WRR_CONF(mp-&gt;port_num, txq-&gt;index);</div><div class='add'>+		/*</div><div class='add'>+		 * Configure WRR weight for this queue.</div><div class='add'>+		 */</div><div class='add'>+		off = TXQ_BW_WRR_CONF(mp-&gt;port_num, txq-&gt;index);</div><div class='ctx'> </div><div class='del'>-	val = rdl(mp, off);</div><div class='del'>-	val = (val &amp; ~0xff) | (weight &amp; 0xff);</div><div class='del'>-	wrl(mp, off, val);</div><div class='add'>+		val = rdl(mp, off);</div><div class='add'>+		val = (val &amp; ~0xff) | (weight &amp; 0xff);</div><div class='add'>+		wrl(mp, off, val);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* mii management interface *************************************************/</div><div class='del'>-#define SMI_BUSY		0x10000000</div><div class='del'>-#define SMI_READ_VALID		0x08000000</div><div class='del'>-#define SMI_OPCODE_READ		0x04000000</div><div class='del'>-#define SMI_OPCODE_WRITE	0x00000000</div><div class='add'>+static irqreturn_t mv643xx_eth_err_irq(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	struct mv643xx_eth_shared_private *msp = dev_id;</div><div class='ctx'> </div><div class='del'>-static void smi_reg_read(struct mv643xx_eth_private *mp, unsigned int addr,</div><div class='del'>-			 unsigned int reg, unsigned int *value)</div><div class='add'>+	if (readl(msp-&gt;base + ERR_INT_CAUSE) &amp; ERR_INT_SMI_DONE) {</div><div class='add'>+		writel(~ERR_INT_SMI_DONE, msp-&gt;base + ERR_INT_CAUSE);</div><div class='add'>+		wake_up(&amp;msp-&gt;smi_busy_wait);</div><div class='add'>+		return IRQ_HANDLED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return IRQ_NONE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int smi_is_done(struct mv643xx_eth_shared_private *msp)</div><div class='ctx'> {</div><div class='del'>-	void __iomem *smi_reg = mp-&gt;shared_smi-&gt;base + SMI_REG;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int i;</div><div class='add'>+	return !(readl(msp-&gt;base + SMI_REG) &amp; SMI_BUSY);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	/* the SMI register is a shared resource */</div><div class='del'>-	spin_lock_irqsave(&amp;mp-&gt;shared_smi-&gt;phy_lock, flags);</div><div class='add'>+static int smi_wait_ready(struct mv643xx_eth_shared_private *msp)</div><div class='add'>+{</div><div class='add'>+	if (msp-&gt;err_interrupt == NO_IRQ) {</div><div class='add'>+		int i;</div><div class='ctx'> </div><div class='del'>-	/* wait for the SMI register to become available */</div><div class='del'>-	for (i = 0; readl(smi_reg) &amp; SMI_BUSY; i++) {</div><div class='del'>-		if (i == 1000) {</div><div class='del'>-			printk("%s: PHY busy timeout\n", mp-&gt;dev-&gt;name);</div><div class='del'>-			goto out;</div><div class='add'>+		for (i = 0; !smi_is_done(msp); i++) {</div><div class='add'>+			if (i == 10)</div><div class='add'>+				return -ETIMEDOUT;</div><div class='add'>+			msleep(10);</div><div class='ctx'> 		}</div><div class='del'>-		udelay(10);</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!wait_event_timeout(msp-&gt;smi_busy_wait, smi_is_done(msp),</div><div class='add'>+				msecs_to_jiffies(100)))</div><div class='add'>+		return -ETIMEDOUT;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int smi_bus_read(struct mii_bus *bus, int addr, int reg)</div><div class='add'>+{</div><div class='add'>+	struct mv643xx_eth_shared_private *msp = bus-&gt;priv;</div><div class='add'>+	void __iomem *smi_reg = msp-&gt;base + SMI_REG;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (smi_wait_ready(msp)) {</div><div class='add'>+		printk("mv643xx_eth: SMI bus busy timeout\n");</div><div class='add'>+		return -ETIMEDOUT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	writel(SMI_OPCODE_READ | (reg &lt;&lt; 21) | (addr &lt;&lt; 16), smi_reg);</div><div class='ctx'> </div><div class='del'>-	/* now wait for the data to be valid */</div><div class='del'>-	for (i = 0; !(readl(smi_reg) &amp; SMI_READ_VALID); i++) {</div><div class='del'>-		if (i == 1000) {</div><div class='del'>-			printk("%s: PHY read timeout\n", mp-&gt;dev-&gt;name);</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-		udelay(10);</div><div class='add'>+	if (smi_wait_ready(msp)) {</div><div class='add'>+		printk("mv643xx_eth: SMI bus busy timeout\n");</div><div class='add'>+		return -ETIMEDOUT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	*value = readl(smi_reg) &amp; 0xffff;</div><div class='del'>-out:</div><div class='del'>-	spin_unlock_irqrestore(&amp;mp-&gt;shared_smi-&gt;phy_lock, flags);</div><div class='add'>+	ret = readl(smi_reg);</div><div class='add'>+	if (!(ret &amp; SMI_READ_VALID)) {</div><div class='add'>+		printk("mv643xx_eth: SMI bus read not valid\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret &amp; 0xffff;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void smi_reg_write(struct mv643xx_eth_private *mp,</div><div class='del'>-			  unsigned int addr,</div><div class='del'>-			  unsigned int reg, unsigned int value)</div><div class='add'>+static int smi_bus_write(struct mii_bus *bus, int addr, int reg, u16 val)</div><div class='ctx'> {</div><div class='del'>-	void __iomem *smi_reg = mp-&gt;shared_smi-&gt;base + SMI_REG;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int i;</div><div class='add'>+	struct mv643xx_eth_shared_private *msp = bus-&gt;priv;</div><div class='add'>+	void __iomem *smi_reg = msp-&gt;base + SMI_REG;</div><div class='ctx'> </div><div class='del'>-	/* the SMI register is a shared resource */</div><div class='del'>-	spin_lock_irqsave(&amp;mp-&gt;shared_smi-&gt;phy_lock, flags);</div><div class='del'>-</div><div class='del'>-	/* wait for the SMI register to become available */</div><div class='del'>-	for (i = 0; readl(smi_reg) &amp; SMI_BUSY; i++) {</div><div class='del'>-		if (i == 1000) {</div><div class='del'>-			printk("%s: PHY busy timeout\n", mp-&gt;dev-&gt;name);</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-		udelay(10);</div><div class='add'>+	if (smi_wait_ready(msp)) {</div><div class='add'>+		printk("mv643xx_eth: SMI bus busy timeout\n");</div><div class='add'>+		return -ETIMEDOUT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	writel(SMI_OPCODE_WRITE | (reg &lt;&lt; 21) |</div><div class='del'>-		(addr &lt;&lt; 16) | (value &amp; 0xffff), smi_reg);</div><div class='del'>-out:</div><div class='del'>-	spin_unlock_irqrestore(&amp;mp-&gt;shared_smi-&gt;phy_lock, flags);</div><div class='add'>+		(addr &lt;&lt; 16) | (val &amp; 0xffff), smi_reg);</div><div class='add'>+</div><div class='add'>+	if (smi_wait_ready(msp)) {</div><div class='add'>+		printk("mv643xx_eth: SMI bus busy timeout\n");</div><div class='add'>+		return -ETIMEDOUT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-/* mib counters *************************************************************/</div><div class='add'>+/* statistics ***************************************************************/</div><div class='add'>+static struct net_device_stats *mv643xx_eth_get_stats(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct mv643xx_eth_private *mp = netdev_priv(dev);</div><div class='add'>+	struct net_device_stats *stats = &amp;dev-&gt;stats;</div><div class='add'>+	unsigned long tx_packets = 0;</div><div class='add'>+	unsigned long tx_bytes = 0;</div><div class='add'>+	unsigned long tx_dropped = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; mp-&gt;txq_count; i++) {</div><div class='add'>+		struct tx_queue *txq = mp-&gt;txq + i;</div><div class='add'>+</div><div class='add'>+		tx_packets += txq-&gt;tx_packets;</div><div class='add'>+		tx_bytes += txq-&gt;tx_bytes;</div><div class='add'>+		tx_dropped += txq-&gt;tx_dropped;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	stats-&gt;tx_packets = tx_packets;</div><div class='add'>+	stats-&gt;tx_bytes = tx_bytes;</div><div class='add'>+	stats-&gt;tx_dropped = tx_dropped;</div><div class='add'>+</div><div class='add'>+	return stats;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline u32 mib_read(struct mv643xx_eth_private *mp, int offset)</div><div class='ctx'> {</div><div class='ctx'> 	return rdl(mp, MIB_COUNTERS(mp-&gt;port_num) + offset);</div><div class='hunk'>@@ -1059,6 +1164,7 @@ static void mib_counters_update(struct mv643xx_eth_private *mp)</div><div class='ctx'> {</div><div class='ctx'> 	struct mib_counters *p = &amp;mp-&gt;mib_counters;</div><div class='ctx'> </div><div class='add'>+	spin_lock(&amp;mp-&gt;mib_counters_lock);</div><div class='ctx'> 	p-&gt;good_octets_received += mib_read(mp, 0x00);</div><div class='ctx'> 	p-&gt;good_octets_received += (u64)mib_read(mp, 0x04) &lt;&lt; 32;</div><div class='ctx'> 	p-&gt;bad_octets_received += mib_read(mp, 0x08);</div><div class='hunk'>@@ -1091,6 +1197,16 @@ static void mib_counters_update(struct mv643xx_eth_private *mp)</div><div class='ctx'> 	p-&gt;bad_crc_event += mib_read(mp, 0x74);</div><div class='ctx'> 	p-&gt;collision += mib_read(mp, 0x78);</div><div class='ctx'> 	p-&gt;late_collision += mib_read(mp, 0x7c);</div><div class='add'>+	spin_unlock(&amp;mp-&gt;mib_counters_lock);</div><div class='add'>+</div><div class='add'>+	mod_timer(&amp;mp-&gt;mib_counters_timer, jiffies + 30 * HZ);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mib_counters_timer_wrapper(unsigned long _mp)</div><div class='add'>+{</div><div class='add'>+	struct mv643xx_eth_private *mp = (void *)_mp;</div><div class='add'>+</div><div class='add'>+	mib_counters_update(mp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -1156,9 +1272,9 @@ static int mv643xx_eth_get_settings(struct net_device *dev, struct ethtool_cmd *</div><div class='ctx'> 	struct mv643xx_eth_private *mp = netdev_priv(dev);</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;mp-&gt;lock);</div><div class='del'>-	err = mii_ethtool_gset(&amp;mp-&gt;mii, cmd);</div><div class='del'>-	spin_unlock_irq(&amp;mp-&gt;lock);</div><div class='add'>+	err = phy_read_status(mp-&gt;phy);</div><div class='add'>+	if (err == 0)</div><div class='add'>+		err = phy_ethtool_gset(mp-&gt;phy, cmd);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The MAC does not support 1000baseT_Half.</div><div class='hunk'>@@ -1206,18 +1322,13 @@ static int mv643xx_eth_get_settings_phyless(struct net_device *dev, struct ethto</div><div class='ctx'> static int mv643xx_eth_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)</div><div class='ctx'> {</div><div class='ctx'> 	struct mv643xx_eth_private *mp = netdev_priv(dev);</div><div class='del'>-	int err;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The MAC does not support 1000baseT_Half.</div><div class='ctx'> 	 */</div><div class='ctx'> 	cmd-&gt;advertising &amp;= ~ADVERTISED_1000baseT_Half;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;mp-&gt;lock);</div><div class='del'>-	err = mii_ethtool_sset(&amp;mp-&gt;mii, cmd);</div><div class='del'>-	spin_unlock_irq(&amp;mp-&gt;lock);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='add'>+	return phy_ethtool_sset(mp-&gt;phy, cmd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mv643xx_eth_set_settings_phyless(struct net_device *dev, struct ethtool_cmd *cmd)</div><div class='hunk'>@@ -1239,7 +1350,7 @@ static int mv643xx_eth_nway_reset(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct mv643xx_eth_private *mp = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	return mii_nway_restart(&amp;mp-&gt;mii);</div><div class='add'>+	return genphy_restart_aneg(mp-&gt;phy);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mv643xx_eth_nway_reset_phyless(struct net_device *dev)</div><div class='hunk'>@@ -1249,14 +1360,7 @@ static int mv643xx_eth_nway_reset_phyless(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> static u32 mv643xx_eth_get_link(struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct mv643xx_eth_private *mp = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	return mii_link_ok(&amp;mp-&gt;mii);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u32 mv643xx_eth_get_link_phyless(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	return 1;</div><div class='add'>+	return !!netif_carrier_ok(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void mv643xx_eth_get_strings(struct net_device *dev,</div><div class='hunk'>@@ -1277,9 +1381,10 @@ static void mv643xx_eth_get_ethtool_stats(struct net_device *dev,</div><div class='ctx'> 					  struct ethtool_stats *stats,</div><div class='ctx'> 					  uint64_t *data)</div><div class='ctx'> {</div><div class='del'>-	struct mv643xx_eth_private *mp = dev-&gt;priv;</div><div class='add'>+	struct mv643xx_eth_private *mp = netdev_priv(dev);</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	mv643xx_eth_get_stats(dev);</div><div class='ctx'> 	mib_counters_update(mp);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(mv643xx_eth_stats); i++) {</div><div class='hunk'>@@ -1323,7 +1428,7 @@ static const struct ethtool_ops mv643xx_eth_ethtool_ops_phyless = {</div><div class='ctx'> 	.set_settings		= mv643xx_eth_set_settings_phyless,</div><div class='ctx'> 	.get_drvinfo		= mv643xx_eth_get_drvinfo,</div><div class='ctx'> 	.nway_reset		= mv643xx_eth_nway_reset_phyless,</div><div class='del'>-	.get_link		= mv643xx_eth_get_link_phyless,</div><div class='add'>+	.get_link		= mv643xx_eth_get_link,</div><div class='ctx'> 	.set_sg			= ethtool_op_set_sg,</div><div class='ctx'> 	.get_strings		= mv643xx_eth_get_strings,</div><div class='ctx'> 	.get_ethtool_stats	= mv643xx_eth_get_ethtool_stats,</div><div class='hunk'>@@ -1487,7 +1592,7 @@ static int rxq_init(struct mv643xx_eth_private *mp, int index)</div><div class='ctx'> </div><div class='ctx'> 	size = rxq-&gt;rx_ring_size * sizeof(struct rx_desc);</div><div class='ctx'> </div><div class='del'>-	if (index == mp-&gt;rxq_primary &amp;&amp; size &lt;= mp-&gt;rx_desc_sram_size) {</div><div class='add'>+	if (index == 0 &amp;&amp; size &lt;= mp-&gt;rx_desc_sram_size) {</div><div class='ctx'> 		rxq-&gt;rx_desc_area = ioremap(mp-&gt;rx_desc_sram_addr,</div><div class='ctx'> 						mp-&gt;rx_desc_sram_size);</div><div class='ctx'> 		rxq-&gt;rx_desc_dma = mp-&gt;rx_desc_sram_addr;</div><div class='hunk'>@@ -1515,20 +1620,21 @@ static int rxq_init(struct mv643xx_eth_private *mp, int index)</div><div class='ctx'> </div><div class='ctx'> 	rx_desc = (struct rx_desc *)rxq-&gt;rx_desc_area;</div><div class='ctx'> 	for (i = 0; i &lt; rxq-&gt;rx_ring_size; i++) {</div><div class='del'>-		int nexti = (i + 1) % rxq-&gt;rx_ring_size;</div><div class='add'>+		int nexti;</div><div class='add'>+</div><div class='add'>+		nexti = i + 1;</div><div class='add'>+		if (nexti == rxq-&gt;rx_ring_size)</div><div class='add'>+			nexti = 0;</div><div class='add'>+</div><div class='ctx'> 		rx_desc[i].next_desc_ptr = rxq-&gt;rx_desc_dma +</div><div class='ctx'> 					nexti * sizeof(struct rx_desc);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	init_timer(&amp;rxq-&gt;rx_oom);</div><div class='del'>-	rxq-&gt;rx_oom.data = (unsigned long)rxq;</div><div class='del'>-	rxq-&gt;rx_oom.function = rxq_refill_timer_wrapper;</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> out_free:</div><div class='del'>-	if (index == mp-&gt;rxq_primary &amp;&amp; size &lt;= mp-&gt;rx_desc_sram_size)</div><div class='add'>+	if (index == 0 &amp;&amp; size &lt;= mp-&gt;rx_desc_sram_size)</div><div class='ctx'> 		iounmap(rxq-&gt;rx_desc_area);</div><div class='ctx'> 	else</div><div class='ctx'> 		dma_free_coherent(NULL, size,</div><div class='hunk'>@@ -1546,8 +1652,6 @@ static void rxq_deinit(struct rx_queue *rxq)</div><div class='ctx'> </div><div class='ctx'> 	rxq_disable(rxq);</div><div class='ctx'> </div><div class='del'>-	del_timer_sync(&amp;rxq-&gt;rx_oom);</div><div class='del'>-</div><div class='ctx'> 	for (i = 0; i &lt; rxq-&gt;rx_ring_size; i++) {</div><div class='ctx'> 		if (rxq-&gt;rx_skb[i]) {</div><div class='ctx'> 			dev_kfree_skb(rxq-&gt;rx_skb[i]);</div><div class='hunk'>@@ -1561,7 +1665,7 @@ static void rxq_deinit(struct rx_queue *rxq)</div><div class='ctx'> 			   rxq-&gt;rx_desc_count);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (rxq-&gt;index == mp-&gt;rxq_primary &amp;&amp;</div><div class='add'>+	if (rxq-&gt;index == 0 &amp;&amp;</div><div class='ctx'> 	    rxq-&gt;rx_desc_area_size &lt;= mp-&gt;rx_desc_sram_size)</div><div class='ctx'> 		iounmap(rxq-&gt;rx_desc_area);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -1588,7 +1692,7 @@ static int txq_init(struct mv643xx_eth_private *mp, int index)</div><div class='ctx'> </div><div class='ctx'> 	size = txq-&gt;tx_ring_size * sizeof(struct tx_desc);</div><div class='ctx'> </div><div class='del'>-	if (index == mp-&gt;txq_primary &amp;&amp; size &lt;= mp-&gt;tx_desc_sram_size) {</div><div class='add'>+	if (index == 0 &amp;&amp; size &lt;= mp-&gt;tx_desc_sram_size) {</div><div class='ctx'> 		txq-&gt;tx_desc_area = ioremap(mp-&gt;tx_desc_sram_addr,</div><div class='ctx'> 						mp-&gt;tx_desc_sram_size);</div><div class='ctx'> 		txq-&gt;tx_desc_dma = mp-&gt;tx_desc_sram_addr;</div><div class='hunk'>@@ -1601,120 +1705,97 @@ static int txq_init(struct mv643xx_eth_private *mp, int index)</div><div class='ctx'> 	if (txq-&gt;tx_desc_area == NULL) {</div><div class='ctx'> 		dev_printk(KERN_ERR, &amp;mp-&gt;dev-&gt;dev,</div><div class='ctx'> 			   "can't allocate tx ring (%d bytes)\n", size);</div><div class='del'>-		goto out;</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> 	memset(txq-&gt;tx_desc_area, 0, size);</div><div class='ctx'> </div><div class='ctx'> 	txq-&gt;tx_desc_area_size = size;</div><div class='del'>-	txq-&gt;tx_skb = kmalloc(txq-&gt;tx_ring_size * sizeof(*txq-&gt;tx_skb),</div><div class='del'>-								GFP_KERNEL);</div><div class='del'>-	if (txq-&gt;tx_skb == NULL) {</div><div class='del'>-		dev_printk(KERN_ERR, &amp;mp-&gt;dev-&gt;dev,</div><div class='del'>-			   "can't allocate tx skb ring\n");</div><div class='del'>-		goto out_free;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	tx_desc = (struct tx_desc *)txq-&gt;tx_desc_area;</div><div class='ctx'> 	for (i = 0; i &lt; txq-&gt;tx_ring_size; i++) {</div><div class='ctx'> 		struct tx_desc *txd = tx_desc + i;</div><div class='del'>-		int nexti = (i + 1) % txq-&gt;tx_ring_size;</div><div class='add'>+		int nexti;</div><div class='add'>+</div><div class='add'>+		nexti = i + 1;</div><div class='add'>+		if (nexti == txq-&gt;tx_ring_size)</div><div class='add'>+			nexti = 0;</div><div class='ctx'> </div><div class='ctx'> 		txd-&gt;cmd_sts = 0;</div><div class='ctx'> 		txd-&gt;next_desc_ptr = txq-&gt;tx_desc_dma +</div><div class='ctx'> 					nexti * sizeof(struct tx_desc);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-out_free:</div><div class='del'>-	if (index == mp-&gt;txq_primary &amp;&amp; size &lt;= mp-&gt;tx_desc_sram_size)</div><div class='del'>-		iounmap(txq-&gt;tx_desc_area);</div><div class='del'>-	else</div><div class='del'>-		dma_free_coherent(NULL, size,</div><div class='del'>-				  txq-&gt;tx_desc_area,</div><div class='del'>-				  txq-&gt;tx_desc_dma);</div><div class='add'>+	skb_queue_head_init(&amp;txq-&gt;tx_skb);</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	return -ENOMEM;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void txq_reclaim(struct tx_queue *txq, int force)</div><div class='add'>+static void txq_deinit(struct tx_queue *txq)</div><div class='ctx'> {</div><div class='ctx'> 	struct mv643xx_eth_private *mp = txq_to_mp(txq);</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;mp-&gt;lock, flags);</div><div class='del'>-	while (txq-&gt;tx_desc_count &gt; 0) {</div><div class='del'>-		int tx_index;</div><div class='del'>-		struct tx_desc *desc;</div><div class='del'>-		u32 cmd_sts;</div><div class='del'>-		struct sk_buff *skb;</div><div class='del'>-		dma_addr_t addr;</div><div class='del'>-		int count;</div><div class='ctx'> </div><div class='del'>-		tx_index = txq-&gt;tx_used_desc;</div><div class='del'>-		desc = &amp;txq-&gt;tx_desc_area[tx_index];</div><div class='del'>-		cmd_sts = desc-&gt;cmd_sts;</div><div class='add'>+	txq_disable(txq);</div><div class='add'>+	txq_reclaim(txq, txq-&gt;tx_ring_size, 1);</div><div class='ctx'> </div><div class='del'>-		if (cmd_sts &amp; BUFFER_OWNED_BY_DMA) {</div><div class='del'>-			if (!force)</div><div class='del'>-				break;</div><div class='del'>-			desc-&gt;cmd_sts = cmd_sts &amp; ~BUFFER_OWNED_BY_DMA;</div><div class='del'>-		}</div><div class='add'>+	BUG_ON(txq-&gt;tx_used_desc != txq-&gt;tx_curr_desc);</div><div class='ctx'> </div><div class='del'>-		txq-&gt;tx_used_desc = (tx_index + 1) % txq-&gt;tx_ring_size;</div><div class='del'>-		txq-&gt;tx_desc_count--;</div><div class='add'>+	if (txq-&gt;index == 0 &amp;&amp;</div><div class='add'>+	    txq-&gt;tx_desc_area_size &lt;= mp-&gt;tx_desc_sram_size)</div><div class='add'>+		iounmap(txq-&gt;tx_desc_area);</div><div class='add'>+	else</div><div class='add'>+		dma_free_coherent(NULL, txq-&gt;tx_desc_area_size,</div><div class='add'>+				  txq-&gt;tx_desc_area, txq-&gt;tx_desc_dma);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		addr = desc-&gt;buf_ptr;</div><div class='del'>-		count = desc-&gt;byte_cnt;</div><div class='del'>-		skb = txq-&gt;tx_skb[tx_index];</div><div class='del'>-		txq-&gt;tx_skb[tx_index] = NULL;</div><div class='ctx'> </div><div class='del'>-		if (cmd_sts &amp; ERROR_SUMMARY) {</div><div class='del'>-			dev_printk(KERN_INFO, &amp;mp-&gt;dev-&gt;dev, "tx error\n");</div><div class='del'>-			mp-&gt;dev-&gt;stats.tx_errors++;</div><div class='del'>-		}</div><div class='add'>+/* netdev ops and related ***************************************************/</div><div class='add'>+static int mv643xx_eth_collect_events(struct mv643xx_eth_private *mp)</div><div class='add'>+{</div><div class='add'>+	u32 int_cause;</div><div class='add'>+	u32 int_cause_ext;</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * Drop mp-&gt;lock while we free the skb.</div><div class='del'>-		 */</div><div class='del'>-		spin_unlock_irqrestore(&amp;mp-&gt;lock, flags);</div><div class='add'>+	int_cause = rdl(mp, INT_CAUSE(mp-&gt;port_num)) &amp;</div><div class='add'>+			(INT_TX_END | INT_RX | INT_EXT);</div><div class='add'>+	if (int_cause == 0)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-		if (cmd_sts &amp; TX_FIRST_DESC)</div><div class='del'>-			dma_unmap_single(NULL, addr, count, DMA_TO_DEVICE);</div><div class='del'>-		else</div><div class='del'>-			dma_unmap_page(NULL, addr, count, DMA_TO_DEVICE);</div><div class='add'>+	int_cause_ext = 0;</div><div class='add'>+	if (int_cause &amp; INT_EXT)</div><div class='add'>+		int_cause_ext = rdl(mp, INT_CAUSE_EXT(mp-&gt;port_num));</div><div class='ctx'> </div><div class='del'>-		if (skb)</div><div class='del'>-			dev_kfree_skb_irq(skb);</div><div class='add'>+	int_cause &amp;= INT_TX_END | INT_RX;</div><div class='add'>+	if (int_cause) {</div><div class='add'>+		wrl(mp, INT_CAUSE(mp-&gt;port_num), ~int_cause);</div><div class='add'>+		mp-&gt;work_tx_end |= ((int_cause &amp; INT_TX_END) &gt;&gt; 19) &amp;</div><div class='add'>+				~(rdl(mp, TXQ_COMMAND(mp-&gt;port_num)) &amp; 0xff);</div><div class='add'>+		mp-&gt;work_rx |= (int_cause &amp; INT_RX) &gt;&gt; 2;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		spin_lock_irqsave(&amp;mp-&gt;lock, flags);</div><div class='add'>+	int_cause_ext &amp;= INT_EXT_LINK_PHY | INT_EXT_TX;</div><div class='add'>+	if (int_cause_ext) {</div><div class='add'>+		wrl(mp, INT_CAUSE_EXT(mp-&gt;port_num), ~int_cause_ext);</div><div class='add'>+		if (int_cause_ext &amp; INT_EXT_LINK_PHY)</div><div class='add'>+			mp-&gt;work_link = 1;</div><div class='add'>+		mp-&gt;work_tx |= int_cause_ext &amp; INT_EXT_TX;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;mp-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void txq_deinit(struct tx_queue *txq)</div><div class='add'>+static irqreturn_t mv643xx_eth_irq(int irq, void *dev_id)</div><div class='ctx'> {</div><div class='del'>-	struct mv643xx_eth_private *mp = txq_to_mp(txq);</div><div class='del'>-</div><div class='del'>-	txq_disable(txq);</div><div class='del'>-	txq_reclaim(txq, 1);</div><div class='add'>+	struct net_device *dev = (struct net_device *)dev_id;</div><div class='add'>+	struct mv643xx_eth_private *mp = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	BUG_ON(txq-&gt;tx_used_desc != txq-&gt;tx_curr_desc);</div><div class='add'>+	if (unlikely(!mv643xx_eth_collect_events(mp)))</div><div class='add'>+		return IRQ_NONE;</div><div class='ctx'> </div><div class='del'>-	if (txq-&gt;index == mp-&gt;txq_primary &amp;&amp;</div><div class='del'>-	    txq-&gt;tx_desc_area_size &lt;= mp-&gt;tx_desc_sram_size)</div><div class='del'>-		iounmap(txq-&gt;tx_desc_area);</div><div class='del'>-	else</div><div class='del'>-		dma_free_coherent(NULL, txq-&gt;tx_desc_area_size,</div><div class='del'>-				  txq-&gt;tx_desc_area, txq-&gt;tx_desc_dma);</div><div class='add'>+	wrl(mp, INT_MASK(mp-&gt;port_num), 0);</div><div class='add'>+	napi_schedule(&amp;mp-&gt;napi);</div><div class='ctx'> </div><div class='del'>-	kfree(txq-&gt;tx_skb);</div><div class='add'>+	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-/* netdev ops and related ***************************************************/</div><div class='ctx'> static void handle_link_event(struct mv643xx_eth_private *mp)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = mp-&gt;dev;</div><div class='hunk'>@@ -1731,15 +1812,12 @@ static void handle_link_event(struct mv643xx_eth_private *mp)</div><div class='ctx'> 			printk(KERN_INFO "%s: link down\n", dev-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 			netif_carrier_off(dev);</div><div class='del'>-			netif_stop_queue(dev);</div><div class='ctx'> </div><div class='del'>-			for (i = 0; i &lt; 8; i++) {</div><div class='add'>+			for (i = 0; i &lt; mp-&gt;txq_count; i++) {</div><div class='ctx'> 				struct tx_queue *txq = mp-&gt;txq + i;</div><div class='ctx'> </div><div class='del'>-				if (mp-&gt;txq_mask &amp; (1 &lt;&lt; i)) {</div><div class='del'>-					txq_reclaim(txq, 1);</div><div class='del'>-					txq_reset_hw_ptr(txq);</div><div class='del'>-				}</div><div class='add'>+				txq_reclaim(txq, txq-&gt;tx_ring_size, 1);</div><div class='add'>+				txq_reset_hw_ptr(txq);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -1767,119 +1845,93 @@ static void handle_link_event(struct mv643xx_eth_private *mp)</div><div class='ctx'> 			 speed, duplex ? "full" : "half",</div><div class='ctx'> 			 fc ? "en" : "dis");</div><div class='ctx'> </div><div class='del'>-	if (!netif_carrier_ok(dev)) {</div><div class='add'>+	if (!netif_carrier_ok(dev))</div><div class='ctx'> 		netif_carrier_on(dev);</div><div class='del'>-		netif_wake_queue(dev);</div><div class='del'>-	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static irqreturn_t mv643xx_eth_irq(int irq, void *dev_id)</div><div class='add'>+static int mv643xx_eth_poll(struct napi_struct *napi, int budget)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev = (struct net_device *)dev_id;</div><div class='del'>-	struct mv643xx_eth_private *mp = netdev_priv(dev);</div><div class='del'>-	u32 int_cause;</div><div class='del'>-	u32 int_cause_ext;</div><div class='del'>-</div><div class='del'>-	int_cause = rdl(mp, INT_CAUSE(mp-&gt;port_num)) &amp;</div><div class='del'>-			(INT_TX_END | INT_RX | INT_EXT);</div><div class='del'>-	if (int_cause == 0)</div><div class='del'>-		return IRQ_NONE;</div><div class='del'>-</div><div class='del'>-	int_cause_ext = 0;</div><div class='del'>-	if (int_cause &amp; INT_EXT) {</div><div class='del'>-		int_cause_ext = rdl(mp, INT_CAUSE_EXT(mp-&gt;port_num))</div><div class='del'>-				&amp; (INT_EXT_LINK | INT_EXT_PHY | INT_EXT_TX);</div><div class='del'>-		wrl(mp, INT_CAUSE_EXT(mp-&gt;port_num), ~int_cause_ext);</div><div class='del'>-	}</div><div class='add'>+	struct mv643xx_eth_private *mp;</div><div class='add'>+	int work_done;</div><div class='ctx'> </div><div class='del'>-	if (int_cause_ext &amp; (INT_EXT_PHY | INT_EXT_LINK))</div><div class='del'>-		handle_link_event(mp);</div><div class='add'>+	mp = container_of(napi, struct mv643xx_eth_private, napi);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * RxBuffer or RxError set for any of the 8 queues?</div><div class='del'>-	 */</div><div class='del'>-#ifdef MV643XX_ETH_NAPI</div><div class='del'>-	if (int_cause &amp; INT_RX) {</div><div class='del'>-		wrl(mp, INT_CAUSE(mp-&gt;port_num), ~(int_cause &amp; INT_RX));</div><div class='del'>-		wrl(mp, INT_MASK(mp-&gt;port_num), 0x00000000);</div><div class='del'>-		rdl(mp, INT_MASK(mp-&gt;port_num));</div><div class='add'>+	mp-&gt;work_rx_refill |= mp-&gt;work_rx_oom;</div><div class='add'>+	mp-&gt;work_rx_oom = 0;</div><div class='ctx'> </div><div class='del'>-		netif_rx_schedule(dev, &amp;mp-&gt;napi);</div><div class='del'>-	}</div><div class='del'>-#else</div><div class='del'>-	if (int_cause &amp; INT_RX) {</div><div class='del'>-		int i;</div><div class='add'>+	work_done = 0;</div><div class='add'>+	while (work_done &lt; budget) {</div><div class='add'>+		u8 queue_mask;</div><div class='add'>+		int queue;</div><div class='add'>+		int work_tbd;</div><div class='ctx'> </div><div class='del'>-		for (i = 7; i &gt;= 0; i--)</div><div class='del'>-			if (mp-&gt;rxq_mask &amp; (1 &lt;&lt; i))</div><div class='del'>-				rxq_process(mp-&gt;rxq + i, INT_MAX);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * TxBuffer or TxError set for any of the 8 queues?</div><div class='del'>-	 */</div><div class='del'>-	if (int_cause_ext &amp; INT_EXT_TX) {</div><div class='del'>-		int i;</div><div class='add'>+		if (mp-&gt;work_link) {</div><div class='add'>+			mp-&gt;work_link = 0;</div><div class='add'>+			handle_link_event(mp);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		for (i = 0; i &lt; 8; i++)</div><div class='del'>-			if (mp-&gt;txq_mask &amp; (1 &lt;&lt; i))</div><div class='del'>-				txq_reclaim(mp-&gt;txq + i, 0);</div><div class='add'>+		queue_mask = mp-&gt;work_tx | mp-&gt;work_tx_end |</div><div class='add'>+				mp-&gt;work_rx | mp-&gt;work_rx_refill;</div><div class='add'>+		if (!queue_mask) {</div><div class='add'>+			if (mv643xx_eth_collect_events(mp))</div><div class='add'>+				continue;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * Enough space again in the primary TX queue for a</div><div class='del'>-		 * full packet?</div><div class='del'>-		 */</div><div class='del'>-		if (netif_carrier_ok(dev)) {</div><div class='del'>-			spin_lock(&amp;mp-&gt;lock);</div><div class='del'>-			__txq_maybe_wake(mp-&gt;txq + mp-&gt;txq_primary);</div><div class='del'>-			spin_unlock(&amp;mp-&gt;lock);</div><div class='add'>+		queue = fls(queue_mask) - 1;</div><div class='add'>+		queue_mask = 1 &lt;&lt; queue;</div><div class='add'>+</div><div class='add'>+		work_tbd = budget - work_done;</div><div class='add'>+		if (work_tbd &gt; 16)</div><div class='add'>+			work_tbd = 16;</div><div class='add'>+</div><div class='add'>+		if (mp-&gt;work_tx_end &amp; queue_mask) {</div><div class='add'>+			txq_kick(mp-&gt;txq + queue);</div><div class='add'>+		} else if (mp-&gt;work_tx &amp; queue_mask) {</div><div class='add'>+			work_done += txq_reclaim(mp-&gt;txq + queue, work_tbd, 0);</div><div class='add'>+			txq_maybe_wake(mp-&gt;txq + queue);</div><div class='add'>+		} else if (mp-&gt;work_rx &amp; queue_mask) {</div><div class='add'>+			work_done += rxq_process(mp-&gt;rxq + queue, work_tbd);</div><div class='add'>+		} else if (mp-&gt;work_rx_refill &amp; queue_mask) {</div><div class='add'>+			work_done += rxq_refill(mp-&gt;rxq + queue, work_tbd);</div><div class='add'>+		} else {</div><div class='add'>+			BUG();</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Any TxEnd interrupts?</div><div class='del'>-	 */</div><div class='del'>-	if (int_cause &amp; INT_TX_END) {</div><div class='del'>-		int i;</div><div class='del'>-</div><div class='del'>-		wrl(mp, INT_CAUSE(mp-&gt;port_num), ~(int_cause &amp; INT_TX_END));</div><div class='del'>-</div><div class='del'>-		spin_lock(&amp;mp-&gt;lock);</div><div class='del'>-		for (i = 0; i &lt; 8; i++) {</div><div class='del'>-			struct tx_queue *txq = mp-&gt;txq + i;</div><div class='del'>-			u32 hw_desc_ptr;</div><div class='del'>-			u32 expected_ptr;</div><div class='del'>-</div><div class='del'>-			if ((int_cause &amp; (INT_TX_END_0 &lt;&lt; i)) == 0)</div><div class='del'>-				continue;</div><div class='add'>+	if (work_done &lt; budget) {</div><div class='add'>+		if (mp-&gt;work_rx_oom)</div><div class='add'>+			mod_timer(&amp;mp-&gt;rx_oom, jiffies + (HZ / 10));</div><div class='add'>+		napi_complete(napi);</div><div class='add'>+		wrl(mp, INT_MASK(mp-&gt;port_num), INT_TX_END | INT_RX | INT_EXT);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-			hw_desc_ptr =</div><div class='del'>-				rdl(mp, TXQ_CURRENT_DESC_PTR(mp-&gt;port_num, i));</div><div class='del'>-			expected_ptr = (u32)txq-&gt;tx_desc_dma +</div><div class='del'>-				txq-&gt;tx_curr_desc * sizeof(struct tx_desc);</div><div class='add'>+	return work_done;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-			if (hw_desc_ptr != expected_ptr)</div><div class='del'>-				txq_enable(txq);</div><div class='del'>-		}</div><div class='del'>-		spin_unlock(&amp;mp-&gt;lock);</div><div class='del'>-	}</div><div class='add'>+static inline void oom_timer_wrapper(unsigned long data)</div><div class='add'>+{</div><div class='add'>+	struct mv643xx_eth_private *mp = (void *)data;</div><div class='ctx'> </div><div class='del'>-	return IRQ_HANDLED;</div><div class='add'>+	napi_schedule(&amp;mp-&gt;napi);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void phy_reset(struct mv643xx_eth_private *mp)</div><div class='ctx'> {</div><div class='del'>-	unsigned int data;</div><div class='add'>+	int data;</div><div class='add'>+</div><div class='add'>+	data = phy_read(mp-&gt;phy, MII_BMCR);</div><div class='add'>+	if (data &lt; 0)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	smi_reg_read(mp, mp-&gt;phy_addr, MII_BMCR, &amp;data);</div><div class='ctx'> 	data |= BMCR_RESET;</div><div class='del'>-	smi_reg_write(mp, mp-&gt;phy_addr, MII_BMCR, data);</div><div class='add'>+	if (phy_write(mp-&gt;phy, MII_BMCR, data) &lt; 0)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='del'>-		udelay(1);</div><div class='del'>-		smi_reg_read(mp, mp-&gt;phy_addr, MII_BMCR, &amp;data);</div><div class='del'>-	} while (data &amp; BMCR_RESET);</div><div class='add'>+		data = phy_read(mp-&gt;phy, MII_BMCR);</div><div class='add'>+	} while (data &gt;= 0 &amp;&amp; data &amp; BMCR_RESET);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void port_start(struct mv643xx_eth_private *mp)</div><div class='hunk'>@@ -1890,7 +1942,7 @@ static void port_start(struct mv643xx_eth_private *mp)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Perform PHY reset, if there is a PHY.</div><div class='ctx'> 	 */</div><div class='del'>-	if (mp-&gt;phy_addr != -1) {</div><div class='add'>+	if (mp-&gt;phy != NULL) {</div><div class='ctx'> 		struct ethtool_cmd cmd;</div><div class='ctx'> </div><div class='ctx'> 		mv643xx_eth_get_settings(mp-&gt;dev, &amp;cmd);</div><div class='hunk'>@@ -1907,7 +1959,7 @@ static void port_start(struct mv643xx_eth_private *mp)</div><div class='ctx'> 	wrl(mp, PORT_SERIAL_CONTROL(mp-&gt;port_num), pscr);</div><div class='ctx'> </div><div class='ctx'> 	pscr |= DO_NOT_FORCE_LINK_FAIL;</div><div class='del'>-	if (mp-&gt;phy_addr == -1)</div><div class='add'>+	if (mp-&gt;phy == NULL)</div><div class='ctx'> 		pscr |= FORCE_LINK_PASS;</div><div class='ctx'> 	wrl(mp, PORT_SERIAL_CONTROL(mp-&gt;port_num), pscr);</div><div class='ctx'> </div><div class='hunk'>@@ -1917,12 +1969,9 @@ static void port_start(struct mv643xx_eth_private *mp)</div><div class='ctx'> 	 * Configure TX path and queues.</div><div class='ctx'> 	 */</div><div class='ctx'> 	tx_set_rate(mp, 1000000000, 16777216);</div><div class='del'>-	for (i = 0; i &lt; 8; i++) {</div><div class='add'>+	for (i = 0; i &lt; mp-&gt;txq_count; i++) {</div><div class='ctx'> 		struct tx_queue *txq = mp-&gt;txq + i;</div><div class='ctx'> </div><div class='del'>-		if ((mp-&gt;txq_mask &amp; (1 &lt;&lt; i)) == 0)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='ctx'> 		txq_reset_hw_ptr(txq);</div><div class='ctx'> 		txq_set_rate(txq, 1000000000, 16777216);</div><div class='ctx'> 		txq_set_fixed_prio_mode(txq);</div><div class='hunk'>@@ -1935,9 +1984,10 @@ static void port_start(struct mv643xx_eth_private *mp)</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Receive all unmatched unicast, TCP, UDP, BPDU and broadcast</div><div class='del'>-	 * frames to RX queue #0.</div><div class='add'>+	 * frames to RX queue #0, and include the pseudo-header when</div><div class='add'>+	 * calculating receive checksums.</div><div class='ctx'> 	 */</div><div class='del'>-	wrl(mp, PORT_CONFIG(mp-&gt;port_num), 0x00000000);</div><div class='add'>+	wrl(mp, PORT_CONFIG(mp-&gt;port_num), 0x02000000);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Treat BPDUs as normal multicasts, and disable partition mode.</div><div class='hunk'>@@ -1947,14 +1997,11 @@ static void port_start(struct mv643xx_eth_private *mp)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Enable the receive queues.</div><div class='ctx'> 	 */</div><div class='del'>-	for (i = 0; i &lt; 8; i++) {</div><div class='add'>+	for (i = 0; i &lt; mp-&gt;rxq_count; i++) {</div><div class='ctx'> 		struct rx_queue *rxq = mp-&gt;rxq + i;</div><div class='ctx'> 		int off = RXQ_CURRENT_DESC_PTR(mp-&gt;port_num, i);</div><div class='ctx'> 		u32 addr;</div><div class='ctx'> </div><div class='del'>-		if ((mp-&gt;rxq_mask &amp; (1 &lt;&lt; i)) == 0)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='ctx'> 		addr = (u32)rxq-&gt;rx_desc_dma;</div><div class='ctx'> 		addr += rxq-&gt;rx_curr_desc * sizeof(struct rx_desc);</div><div class='ctx'> 		wrl(mp, off, addr);</div><div class='hunk'>@@ -1993,6 +2040,26 @@ static void set_tx_coal(struct mv643xx_eth_private *mp, unsigned int delay)</div><div class='ctx'> 	wrl(mp, TX_FIFO_URGENT_THRESHOLD(mp-&gt;port_num), (coal &amp; 0x3fff) &lt;&lt; 4);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void mv643xx_eth_recalc_skb_size(struct mv643xx_eth_private *mp)</div><div class='add'>+{</div><div class='add'>+	int skb_size;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Reserve 2+14 bytes for an ethernet header (the hardware</div><div class='add'>+	 * automatically prepends 2 bytes of dummy data to each</div><div class='add'>+	 * received packet), 16 bytes for up to four VLAN tags, and</div><div class='add'>+	 * 4 bytes for the trailing FCS -- 36 bytes total.</div><div class='add'>+	 */</div><div class='add'>+	skb_size = mp-&gt;dev-&gt;mtu + 36;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Make sure that the skb size is a multiple of 8 bytes, as</div><div class='add'>+	 * the lower three bits of the receive descriptor's buffer</div><div class='add'>+	 * size field are ignored by the hardware.</div><div class='add'>+	 */</div><div class='add'>+	mp-&gt;skb_size = (skb_size + 7) &amp; ~7;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int mv643xx_eth_open(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct mv643xx_eth_private *mp = netdev_priv(dev);</div><div class='hunk'>@@ -2004,8 +2071,7 @@ static int mv643xx_eth_open(struct net_device *dev)</div><div class='ctx'> 	rdl(mp, INT_CAUSE_EXT(mp-&gt;port_num));</div><div class='ctx'> </div><div class='ctx'> 	err = request_irq(dev-&gt;irq, mv643xx_eth_irq,</div><div class='del'>-			  IRQF_SHARED | IRQF_SAMPLE_RANDOM,</div><div class='del'>-			  dev-&gt;name, dev);</div><div class='add'>+			  IRQF_SHARED, dev-&gt;name, dev);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		dev_printk(KERN_ERR, &amp;dev-&gt;dev, "can't assign irq\n");</div><div class='ctx'> 		return -EAGAIN;</div><div class='hunk'>@@ -2013,58 +2079,53 @@ static int mv643xx_eth_open(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	init_mac_tables(mp);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; 8; i++) {</div><div class='del'>-		if ((mp-&gt;rxq_mask &amp; (1 &lt;&lt; i)) == 0)</div><div class='del'>-			continue;</div><div class='add'>+	mv643xx_eth_recalc_skb_size(mp);</div><div class='add'>+</div><div class='add'>+	napi_enable(&amp;mp-&gt;napi);</div><div class='ctx'> </div><div class='add'>+	skb_queue_head_init(&amp;mp-&gt;rx_recycle);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; mp-&gt;rxq_count; i++) {</div><div class='ctx'> 		err = rxq_init(mp, i);</div><div class='ctx'> 		if (err) {</div><div class='ctx'> 			while (--i &gt;= 0)</div><div class='del'>-				if (mp-&gt;rxq_mask &amp; (1 &lt;&lt; i))</div><div class='del'>-					rxq_deinit(mp-&gt;rxq + i);</div><div class='add'>+				rxq_deinit(mp-&gt;rxq + i);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		rxq_refill(mp-&gt;rxq + i);</div><div class='add'>+		rxq_refill(mp-&gt;rxq + i, INT_MAX);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; 8; i++) {</div><div class='del'>-		if ((mp-&gt;txq_mask &amp; (1 &lt;&lt; i)) == 0)</div><div class='del'>-			continue;</div><div class='add'>+	if (mp-&gt;work_rx_oom) {</div><div class='add'>+		mp-&gt;rx_oom.expires = jiffies + (HZ / 10);</div><div class='add'>+		add_timer(&amp;mp-&gt;rx_oom);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	for (i = 0; i &lt; mp-&gt;txq_count; i++) {</div><div class='ctx'> 		err = txq_init(mp, i);</div><div class='ctx'> 		if (err) {</div><div class='ctx'> 			while (--i &gt;= 0)</div><div class='del'>-				if (mp-&gt;txq_mask &amp; (1 &lt;&lt; i))</div><div class='del'>-					txq_deinit(mp-&gt;txq + i);</div><div class='add'>+				txq_deinit(mp-&gt;txq + i);</div><div class='ctx'> 			goto out_free;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-#ifdef MV643XX_ETH_NAPI</div><div class='del'>-	napi_enable(&amp;mp-&gt;napi);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	netif_carrier_off(dev);</div><div class='del'>-	netif_stop_queue(dev);</div><div class='ctx'> </div><div class='ctx'> 	port_start(mp);</div><div class='ctx'> </div><div class='ctx'> 	set_rx_coal(mp, 0);</div><div class='ctx'> 	set_tx_coal(mp, 0);</div><div class='ctx'> </div><div class='del'>-	wrl(mp, INT_MASK_EXT(mp-&gt;port_num),</div><div class='del'>-	    INT_EXT_LINK | INT_EXT_PHY | INT_EXT_TX);</div><div class='del'>-</div><div class='add'>+	wrl(mp, INT_MASK_EXT(mp-&gt;port_num), INT_EXT_LINK_PHY | INT_EXT_TX);</div><div class='ctx'> 	wrl(mp, INT_MASK(mp-&gt;port_num), INT_TX_END | INT_RX | INT_EXT);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> out_free:</div><div class='del'>-	for (i = 0; i &lt; 8; i++)</div><div class='del'>-		if (mp-&gt;rxq_mask &amp; (1 &lt;&lt; i))</div><div class='del'>-			rxq_deinit(mp-&gt;rxq + i);</div><div class='add'>+	for (i = 0; i &lt; mp-&gt;rxq_count; i++)</div><div class='add'>+		rxq_deinit(mp-&gt;rxq + i);</div><div class='ctx'> out:</div><div class='ctx'> 	free_irq(dev-&gt;irq, dev);</div><div class='ctx'> </div><div class='hunk'>@@ -2076,12 +2137,10 @@ static void port_reset(struct mv643xx_eth_private *mp)</div><div class='ctx'> 	unsigned int data;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; 8; i++) {</div><div class='del'>-		if (mp-&gt;rxq_mask &amp; (1 &lt;&lt; i))</div><div class='del'>-			rxq_disable(mp-&gt;rxq + i);</div><div class='del'>-		if (mp-&gt;txq_mask &amp; (1 &lt;&lt; i))</div><div class='del'>-			txq_disable(mp-&gt;txq + i);</div><div class='del'>-	}</div><div class='add'>+	for (i = 0; i &lt; mp-&gt;rxq_count; i++)</div><div class='add'>+		rxq_disable(mp-&gt;rxq + i);</div><div class='add'>+	for (i = 0; i &lt; mp-&gt;txq_count; i++)</div><div class='add'>+		txq_disable(mp-&gt;txq + i);</div><div class='ctx'> </div><div class='ctx'> 	while (1) {</div><div class='ctx'> 		u32 ps = rdl(mp, PORT_STATUS(mp-&gt;port_num));</div><div class='hunk'>@@ -2107,23 +2166,26 @@ static int mv643xx_eth_stop(struct net_device *dev)</div><div class='ctx'> 	wrl(mp, INT_MASK(mp-&gt;port_num), 0x00000000);</div><div class='ctx'> 	rdl(mp, INT_MASK(mp-&gt;port_num));</div><div class='ctx'> </div><div class='del'>-#ifdef MV643XX_ETH_NAPI</div><div class='add'>+	del_timer_sync(&amp;mp-&gt;mib_counters_timer);</div><div class='add'>+</div><div class='ctx'> 	napi_disable(&amp;mp-&gt;napi);</div><div class='del'>-#endif</div><div class='add'>+</div><div class='add'>+	del_timer_sync(&amp;mp-&gt;rx_oom);</div><div class='add'>+</div><div class='ctx'> 	netif_carrier_off(dev);</div><div class='del'>-	netif_stop_queue(dev);</div><div class='ctx'> </div><div class='ctx'> 	free_irq(dev-&gt;irq, dev);</div><div class='ctx'> </div><div class='ctx'> 	port_reset(mp);</div><div class='add'>+	mv643xx_eth_get_stats(dev);</div><div class='ctx'> 	mib_counters_update(mp);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; 8; i++) {</div><div class='del'>-		if (mp-&gt;rxq_mask &amp; (1 &lt;&lt; i))</div><div class='del'>-			rxq_deinit(mp-&gt;rxq + i);</div><div class='del'>-		if (mp-&gt;txq_mask &amp; (1 &lt;&lt; i))</div><div class='del'>-			txq_deinit(mp-&gt;txq + i);</div><div class='del'>-	}</div><div class='add'>+	skb_queue_purge(&amp;mp-&gt;rx_recycle);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; mp-&gt;rxq_count; i++)</div><div class='add'>+		rxq_deinit(mp-&gt;rxq + i);</div><div class='add'>+	for (i = 0; i &lt; mp-&gt;txq_count; i++)</div><div class='add'>+		txq_deinit(mp-&gt;txq + i);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -2132,8 +2194,8 @@ static int mv643xx_eth_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)</div><div class='ctx'> {</div><div class='ctx'> 	struct mv643xx_eth_private *mp = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	if (mp-&gt;phy_addr != -1)</div><div class='del'>-		return generic_mii_ioctl(&amp;mp-&gt;mii, if_mii(ifr), cmd, NULL);</div><div class='add'>+	if (mp-&gt;phy != NULL)</div><div class='add'>+		return phy_mii_ioctl(mp-&gt;phy, if_mii(ifr), cmd);</div><div class='ctx'> </div><div class='ctx'> 	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='hunk'>@@ -2146,6 +2208,7 @@ static int mv643xx_eth_change_mtu(struct net_device *dev, int new_mtu)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;mtu = new_mtu;</div><div class='add'>+	mv643xx_eth_recalc_skb_size(mp);</div><div class='ctx'> 	tx_set_rate(mp, 1000000000, 16777216);</div><div class='ctx'> </div><div class='ctx'> 	if (!netif_running(dev))</div><div class='hunk'>@@ -2173,12 +2236,10 @@ static void tx_timeout_task(struct work_struct *ugly)</div><div class='ctx'> </div><div class='ctx'> 	mp = container_of(ugly, struct mv643xx_eth_private, tx_timeout_task);</div><div class='ctx'> 	if (netif_running(mp-&gt;dev)) {</div><div class='del'>-		netif_stop_queue(mp-&gt;dev);</div><div class='del'>-</div><div class='add'>+		netif_tx_stop_all_queues(mp-&gt;dev);</div><div class='ctx'> 		port_reset(mp);</div><div class='ctx'> 		port_start(mp);</div><div class='del'>-</div><div class='del'>-		__txq_maybe_wake(mp-&gt;txq + mp-&gt;txq_primary);</div><div class='add'>+		netif_tx_wake_all_queues(mp-&gt;dev);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2205,22 +2266,6 @@ static void mv643xx_eth_netpoll(struct net_device *dev)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static int mv643xx_eth_mdio_read(struct net_device *dev, int addr, int reg)</div><div class='del'>-{</div><div class='del'>-	struct mv643xx_eth_private *mp = netdev_priv(dev);</div><div class='del'>-	int val;</div><div class='del'>-</div><div class='del'>-	smi_reg_read(mp, addr, reg, &amp;val);</div><div class='del'>-</div><div class='del'>-	return val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mv643xx_eth_mdio_write(struct net_device *dev, int addr, int reg, int val)</div><div class='del'>-{</div><div class='del'>-	struct mv643xx_eth_private *mp = netdev_priv(dev);</div><div class='del'>-	smi_reg_write(mp, addr, reg, val);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> </div><div class='ctx'> /* platform glue ************************************************************/</div><div class='ctx'> static void</div><div class='hunk'>@@ -2272,14 +2317,20 @@ static void infer_hw_params(struct mv643xx_eth_shared_private *msp)</div><div class='ctx'> 		msp-&gt;extended_rx_coal_limit = 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Check whether the TX rate control registers are in the</div><div class='del'>-	 * old or the new place.</div><div class='add'>+	 * Check whether the MAC supports TX rate control, and if</div><div class='add'>+	 * yes, whether its associated registers are in the old or</div><div class='add'>+	 * the new place.</div><div class='ctx'> 	 */</div><div class='ctx'> 	writel(1, msp-&gt;base + TX_BW_MTU_MOVED(0));</div><div class='del'>-	if (readl(msp-&gt;base + TX_BW_MTU_MOVED(0)) &amp; 1)</div><div class='del'>-		msp-&gt;tx_bw_control_moved = 1;</div><div class='del'>-	else</div><div class='del'>-		msp-&gt;tx_bw_control_moved = 0;</div><div class='add'>+	if (readl(msp-&gt;base + TX_BW_MTU_MOVED(0)) &amp; 1) {</div><div class='add'>+		msp-&gt;tx_bw_control = TX_BW_CONTROL_NEW_LAYOUT;</div><div class='add'>+	} else {</div><div class='add'>+		writel(7, msp-&gt;base + TX_BW_RATE(0));</div><div class='add'>+		if (readl(msp-&gt;base + TX_BW_RATE(0)) &amp; 7)</div><div class='add'>+			msp-&gt;tx_bw_control = TX_BW_CONTROL_OLD_LAYOUT;</div><div class='add'>+		else</div><div class='add'>+			msp-&gt;tx_bw_control = TX_BW_CONTROL_ABSENT;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mv643xx_eth_shared_probe(struct platform_device *pdev)</div><div class='hunk'>@@ -2309,7 +2360,45 @@ static int mv643xx_eth_shared_probe(struct platform_device *pdev)</div><div class='ctx'> 	if (msp-&gt;base == NULL)</div><div class='ctx'> 		goto out_free;</div><div class='ctx'> </div><div class='del'>-	spin_lock_init(&amp;msp-&gt;phy_lock);</div><div class='add'>+	/*</div><div class='add'>+	 * Set up and register SMI bus.</div><div class='add'>+	 */</div><div class='add'>+	if (pd == NULL || pd-&gt;shared_smi == NULL) {</div><div class='add'>+		msp-&gt;smi_bus = mdiobus_alloc();</div><div class='add'>+		if (msp-&gt;smi_bus == NULL)</div><div class='add'>+			goto out_unmap;</div><div class='add'>+</div><div class='add'>+		msp-&gt;smi_bus-&gt;priv = msp;</div><div class='add'>+		msp-&gt;smi_bus-&gt;name = "mv643xx_eth smi";</div><div class='add'>+		msp-&gt;smi_bus-&gt;read = smi_bus_read;</div><div class='add'>+		msp-&gt;smi_bus-&gt;write = smi_bus_write,</div><div class='add'>+		snprintf(msp-&gt;smi_bus-&gt;id, MII_BUS_ID_SIZE, "%d", pdev-&gt;id);</div><div class='add'>+		msp-&gt;smi_bus-&gt;parent = &amp;pdev-&gt;dev;</div><div class='add'>+		msp-&gt;smi_bus-&gt;phy_mask = 0xffffffff;</div><div class='add'>+		if (mdiobus_register(msp-&gt;smi_bus) &lt; 0)</div><div class='add'>+			goto out_free_mii_bus;</div><div class='add'>+		msp-&gt;smi = msp;</div><div class='add'>+	} else {</div><div class='add'>+		msp-&gt;smi = platform_get_drvdata(pd-&gt;shared_smi);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	msp-&gt;err_interrupt = NO_IRQ;</div><div class='add'>+	init_waitqueue_head(&amp;msp-&gt;smi_busy_wait);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Check whether the error interrupt is hooked up.</div><div class='add'>+	 */</div><div class='add'>+	res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);</div><div class='add'>+	if (res != NULL) {</div><div class='add'>+		int err;</div><div class='add'>+</div><div class='add'>+		err = request_irq(res-&gt;start, mv643xx_eth_err_irq,</div><div class='add'>+				  IRQF_SHARED, "mv643xx_eth", msp);</div><div class='add'>+		if (!err) {</div><div class='add'>+			writel(ERR_INT_SMI_DONE, msp-&gt;base + ERR_INT_MASK);</div><div class='add'>+			msp-&gt;err_interrupt = res-&gt;start;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * (Re-)program MBUS remapping windows if we are asked to.</div><div class='hunk'>@@ -2327,6 +2416,10 @@ static int mv643xx_eth_shared_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='add'>+out_free_mii_bus:</div><div class='add'>+	mdiobus_free(msp-&gt;smi_bus);</div><div class='add'>+out_unmap:</div><div class='add'>+	iounmap(msp-&gt;base);</div><div class='ctx'> out_free:</div><div class='ctx'> 	kfree(msp);</div><div class='ctx'> out:</div><div class='hunk'>@@ -2336,7 +2429,14 @@ out:</div><div class='ctx'> static int mv643xx_eth_shared_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct mv643xx_eth_shared_private *msp = platform_get_drvdata(pdev);</div><div class='add'>+	struct mv643xx_eth_shared_platform_data *pd = pdev-&gt;dev.platform_data;</div><div class='ctx'> </div><div class='add'>+	if (pd == NULL || pd-&gt;shared_smi == NULL) {</div><div class='add'>+		mdiobus_free(msp-&gt;smi_bus);</div><div class='add'>+		mdiobus_unregister(msp-&gt;smi_bus);</div><div class='add'>+	}</div><div class='add'>+	if (msp-&gt;err_interrupt != NO_IRQ)</div><div class='add'>+		free_irq(msp-&gt;err_interrupt, msp);</div><div class='ctx'> 	iounmap(msp-&gt;base);</div><div class='ctx'> 	kfree(msp);</div><div class='ctx'> </div><div class='hunk'>@@ -2382,33 +2482,13 @@ static void set_params(struct mv643xx_eth_private *mp,</div><div class='ctx'> 	else</div><div class='ctx'> 		uc_addr_get(mp, dev-&gt;dev_addr);</div><div class='ctx'> </div><div class='del'>-	if (pd-&gt;phy_addr == -1) {</div><div class='del'>-		mp-&gt;shared_smi = NULL;</div><div class='del'>-		mp-&gt;phy_addr = -1;</div><div class='del'>-	} else {</div><div class='del'>-		mp-&gt;shared_smi = mp-&gt;shared;</div><div class='del'>-		if (pd-&gt;shared_smi != NULL)</div><div class='del'>-			mp-&gt;shared_smi = platform_get_drvdata(pd-&gt;shared_smi);</div><div class='del'>-</div><div class='del'>-		if (pd-&gt;force_phy_addr || pd-&gt;phy_addr) {</div><div class='del'>-			mp-&gt;phy_addr = pd-&gt;phy_addr &amp; 0x3f;</div><div class='del'>-			phy_addr_set(mp, mp-&gt;phy_addr);</div><div class='del'>-		} else {</div><div class='del'>-			mp-&gt;phy_addr = phy_addr_get(mp);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	mp-&gt;default_rx_ring_size = DEFAULT_RX_QUEUE_SIZE;</div><div class='ctx'> 	if (pd-&gt;rx_queue_size)</div><div class='ctx'> 		mp-&gt;default_rx_ring_size = pd-&gt;rx_queue_size;</div><div class='ctx'> 	mp-&gt;rx_desc_sram_addr = pd-&gt;rx_sram_addr;</div><div class='ctx'> 	mp-&gt;rx_desc_sram_size = pd-&gt;rx_sram_size;</div><div class='ctx'> </div><div class='del'>-	if (pd-&gt;rx_queue_mask)</div><div class='del'>-		mp-&gt;rxq_mask = pd-&gt;rx_queue_mask;</div><div class='del'>-	else</div><div class='del'>-		mp-&gt;rxq_mask = 0x01;</div><div class='del'>-	mp-&gt;rxq_primary = fls(mp-&gt;rxq_mask) - 1;</div><div class='add'>+	mp-&gt;rxq_count = pd-&gt;rx_queue_count ? : 1;</div><div class='ctx'> </div><div class='ctx'> 	mp-&gt;default_tx_ring_size = DEFAULT_TX_QUEUE_SIZE;</div><div class='ctx'> 	if (pd-&gt;tx_queue_size)</div><div class='hunk'>@@ -2416,76 +2496,63 @@ static void set_params(struct mv643xx_eth_private *mp,</div><div class='ctx'> 	mp-&gt;tx_desc_sram_addr = pd-&gt;tx_sram_addr;</div><div class='ctx'> 	mp-&gt;tx_desc_sram_size = pd-&gt;tx_sram_size;</div><div class='ctx'> </div><div class='del'>-	if (pd-&gt;tx_queue_mask)</div><div class='del'>-		mp-&gt;txq_mask = pd-&gt;tx_queue_mask;</div><div class='del'>-	else</div><div class='del'>-		mp-&gt;txq_mask = 0x01;</div><div class='del'>-	mp-&gt;txq_primary = fls(mp-&gt;txq_mask) - 1;</div><div class='add'>+	mp-&gt;txq_count = pd-&gt;tx_queue_count ? : 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int phy_detect(struct mv643xx_eth_private *mp)</div><div class='add'>+static struct phy_device *phy_scan(struct mv643xx_eth_private *mp,</div><div class='add'>+				   int phy_addr)</div><div class='ctx'> {</div><div class='del'>-	unsigned int data;</div><div class='del'>-	unsigned int data2;</div><div class='add'>+	struct mii_bus *bus = mp-&gt;shared-&gt;smi-&gt;smi_bus;</div><div class='add'>+	struct phy_device *phydev;</div><div class='add'>+	int start;</div><div class='add'>+	int num;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (phy_addr == MV643XX_ETH_PHY_ADDR_DEFAULT) {</div><div class='add'>+		start = phy_addr_get(mp) &amp; 0x1f;</div><div class='add'>+		num = 32;</div><div class='add'>+	} else {</div><div class='add'>+		start = phy_addr &amp; 0x1f;</div><div class='add'>+		num = 1;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	smi_reg_read(mp, mp-&gt;phy_addr, MII_BMCR, &amp;data);</div><div class='del'>-	smi_reg_write(mp, mp-&gt;phy_addr, MII_BMCR, data ^ BMCR_ANENABLE);</div><div class='add'>+	phydev = NULL;</div><div class='add'>+	for (i = 0; i &lt; num; i++) {</div><div class='add'>+		int addr = (start + i) &amp; 0x1f;</div><div class='ctx'> </div><div class='del'>-	smi_reg_read(mp, mp-&gt;phy_addr, MII_BMCR, &amp;data2);</div><div class='del'>-	if (((data ^ data2) &amp; BMCR_ANENABLE) == 0)</div><div class='del'>-		return -ENODEV;</div><div class='add'>+		if (bus-&gt;phy_map[addr] == NULL)</div><div class='add'>+			mdiobus_scan(bus, addr);</div><div class='ctx'> </div><div class='del'>-	smi_reg_write(mp, mp-&gt;phy_addr, MII_BMCR, data);</div><div class='add'>+		if (phydev == NULL) {</div><div class='add'>+			phydev = bus-&gt;phy_map[addr];</div><div class='add'>+			if (phydev != NULL)</div><div class='add'>+				phy_addr_set(mp, addr);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return phydev;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int phy_init(struct mv643xx_eth_private *mp,</div><div class='del'>-		    struct mv643xx_eth_platform_data *pd)</div><div class='add'>+static void phy_init(struct mv643xx_eth_private *mp, int speed, int duplex)</div><div class='ctx'> {</div><div class='del'>-	struct ethtool_cmd cmd;</div><div class='del'>-	int err;</div><div class='add'>+	struct phy_device *phy = mp-&gt;phy;</div><div class='ctx'> </div><div class='del'>-	err = phy_detect(mp);</div><div class='del'>-	if (err) {</div><div class='del'>-		dev_printk(KERN_INFO, &amp;mp-&gt;dev-&gt;dev,</div><div class='del'>-			   "no PHY detected at addr %d\n", mp-&gt;phy_addr);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='ctx'> 	phy_reset(mp);</div><div class='ctx'> </div><div class='del'>-	mp-&gt;mii.phy_id = mp-&gt;phy_addr;</div><div class='del'>-	mp-&gt;mii.phy_id_mask = 0x3f;</div><div class='del'>-	mp-&gt;mii.reg_num_mask = 0x1f;</div><div class='del'>-	mp-&gt;mii.dev = mp-&gt;dev;</div><div class='del'>-	mp-&gt;mii.mdio_read = mv643xx_eth_mdio_read;</div><div class='del'>-	mp-&gt;mii.mdio_write = mv643xx_eth_mdio_write;</div><div class='del'>-</div><div class='del'>-	mp-&gt;mii.supports_gmii = mii_check_gmii_support(&amp;mp-&gt;mii);</div><div class='del'>-</div><div class='del'>-	memset(&amp;cmd, 0, sizeof(cmd));</div><div class='del'>-</div><div class='del'>-	cmd.port = PORT_MII;</div><div class='del'>-	cmd.transceiver = XCVR_INTERNAL;</div><div class='del'>-	cmd.phy_address = mp-&gt;phy_addr;</div><div class='del'>-	if (pd-&gt;speed == 0) {</div><div class='del'>-		cmd.autoneg = AUTONEG_ENABLE;</div><div class='del'>-		cmd.speed = SPEED_100;</div><div class='del'>-		cmd.advertising = ADVERTISED_10baseT_Half  |</div><div class='del'>-				  ADVERTISED_10baseT_Full  |</div><div class='del'>-				  ADVERTISED_100baseT_Half |</div><div class='del'>-				  ADVERTISED_100baseT_Full;</div><div class='del'>-		if (mp-&gt;mii.supports_gmii)</div><div class='del'>-			cmd.advertising |= ADVERTISED_1000baseT_Full;</div><div class='add'>+	phy_attach(mp-&gt;dev, phy-&gt;dev.bus_id, 0, PHY_INTERFACE_MODE_GMII);</div><div class='add'>+</div><div class='add'>+	if (speed == 0) {</div><div class='add'>+		phy-&gt;autoneg = AUTONEG_ENABLE;</div><div class='add'>+		phy-&gt;speed = 0;</div><div class='add'>+		phy-&gt;duplex = 0;</div><div class='add'>+		phy-&gt;advertising = phy-&gt;supported | ADVERTISED_Autoneg;</div><div class='ctx'> 	} else {</div><div class='del'>-		cmd.autoneg = AUTONEG_DISABLE;</div><div class='del'>-		cmd.speed = pd-&gt;speed;</div><div class='del'>-		cmd.duplex = pd-&gt;duplex;</div><div class='add'>+		phy-&gt;autoneg = AUTONEG_DISABLE;</div><div class='add'>+		phy-&gt;advertising = 0;</div><div class='add'>+		phy-&gt;speed = speed;</div><div class='add'>+		phy-&gt;duplex = duplex;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	mv643xx_eth_set_settings(mp-&gt;dev, &amp;cmd);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	phy_start_aneg(phy);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void init_pscr(struct mv643xx_eth_private *mp, int speed, int duplex)</div><div class='hunk'>@@ -2499,7 +2566,7 @@ static void init_pscr(struct mv643xx_eth_private *mp, int speed, int duplex)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	pscr = MAX_RX_PACKET_9700BYTE | SERIAL_PORT_CONTROL_RESERVED;</div><div class='del'>-	if (mp-&gt;phy_addr == -1) {</div><div class='add'>+	if (mp-&gt;phy == NULL) {</div><div class='ctx'> 		pscr |= DISABLE_AUTO_NEG_SPEED_GMII;</div><div class='ctx'> 		if (speed == SPEED_1000)</div><div class='ctx'> 			pscr |= SET_GMII_SPEED_TO_1000;</div><div class='hunk'>@@ -2538,7 +2605,7 @@ static int mv643xx_eth_probe(struct platform_device *pdev)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dev = alloc_etherdev(sizeof(struct mv643xx_eth_private));</div><div class='add'>+	dev = alloc_etherdev_mq(sizeof(struct mv643xx_eth_private), 8);</div><div class='ctx'> 	if (!dev)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -2549,33 +2616,47 @@ static int mv643xx_eth_probe(struct platform_device *pdev)</div><div class='ctx'> 	mp-&gt;port_num = pd-&gt;port_number;</div><div class='ctx'> </div><div class='ctx'> 	mp-&gt;dev = dev;</div><div class='del'>-#ifdef MV643XX_ETH_NAPI</div><div class='del'>-	netif_napi_add(dev, &amp;mp-&gt;napi, mv643xx_eth_poll, 64);</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> 	set_params(mp, pd);</div><div class='add'>+	dev-&gt;real_num_tx_queues = mp-&gt;txq_count;</div><div class='ctx'> </div><div class='del'>-	spin_lock_init(&amp;mp-&gt;lock);</div><div class='del'>-</div><div class='del'>-	mib_counters_clear(mp);</div><div class='del'>-	INIT_WORK(&amp;mp-&gt;tx_timeout_task, tx_timeout_task);</div><div class='del'>-</div><div class='del'>-	if (mp-&gt;phy_addr != -1) {</div><div class='del'>-		err = phy_init(mp, pd);</div><div class='del'>-		if (err)</div><div class='del'>-			goto out;</div><div class='add'>+	if (pd-&gt;phy_addr != MV643XX_ETH_PHY_NONE)</div><div class='add'>+		mp-&gt;phy = phy_scan(mp, pd-&gt;phy_addr);</div><div class='ctx'> </div><div class='add'>+	if (mp-&gt;phy != NULL) {</div><div class='add'>+		phy_init(mp, pd-&gt;speed, pd-&gt;duplex);</div><div class='ctx'> 		SET_ETHTOOL_OPS(dev, &amp;mv643xx_eth_ethtool_ops);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		SET_ETHTOOL_OPS(dev, &amp;mv643xx_eth_ethtool_ops_phyless);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	init_pscr(mp, pd-&gt;speed, pd-&gt;duplex);</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+	mib_counters_clear(mp);</div><div class='add'>+</div><div class='add'>+	init_timer(&amp;mp-&gt;mib_counters_timer);</div><div class='add'>+	mp-&gt;mib_counters_timer.data = (unsigned long)mp;</div><div class='add'>+	mp-&gt;mib_counters_timer.function = mib_counters_timer_wrapper;</div><div class='add'>+	mp-&gt;mib_counters_timer.expires = jiffies + 30 * HZ;</div><div class='add'>+	add_timer(&amp;mp-&gt;mib_counters_timer);</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;mp-&gt;mib_counters_lock);</div><div class='add'>+</div><div class='add'>+	INIT_WORK(&amp;mp-&gt;tx_timeout_task, tx_timeout_task);</div><div class='add'>+</div><div class='add'>+	netif_napi_add(dev, &amp;mp-&gt;napi, mv643xx_eth_poll, 128);</div><div class='add'>+</div><div class='add'>+	init_timer(&amp;mp-&gt;rx_oom);</div><div class='add'>+	mp-&gt;rx_oom.data = (unsigned long)mp;</div><div class='add'>+	mp-&gt;rx_oom.function = oom_timer_wrapper;</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> 	res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);</div><div class='ctx'> 	BUG_ON(!res);</div><div class='ctx'> 	dev-&gt;irq = res-&gt;start;</div><div class='ctx'> </div><div class='add'>+	dev-&gt;get_stats = mv643xx_eth_get_stats;</div><div class='ctx'> 	dev-&gt;hard_start_xmit = mv643xx_eth_xmit;</div><div class='ctx'> 	dev-&gt;open = mv643xx_eth_open;</div><div class='ctx'> 	dev-&gt;stop = mv643xx_eth_stop;</div><div class='hunk'>@@ -2590,14 +2671,8 @@ static int mv643xx_eth_probe(struct platform_device *pdev)</div><div class='ctx'> 	dev-&gt;watchdog_timeo = 2 * HZ;</div><div class='ctx'> 	dev-&gt;base_addr = 0;</div><div class='ctx'> </div><div class='del'>-#ifdef MV643XX_ETH_CHECKSUM_OFFLOAD_TX</div><div class='del'>-	/*</div><div class='del'>-	 * Zero copy can only work if we use Discovery II memory. Else, we will</div><div class='del'>-	 * have to map the buffers to ISA memory which is only 16 MB</div><div class='del'>-	 */</div><div class='ctx'> 	dev-&gt;features = NETIF_F_SG | NETIF_F_IP_CSUM;</div><div class='ctx'> 	dev-&gt;vlan_features = NETIF_F_SG | NETIF_F_IP_CSUM;</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> 	SET_NETDEV_DEV(dev, &amp;pdev-&gt;dev);</div><div class='ctx'> </div><div class='hunk'>@@ -2611,16 +2686,6 @@ static int mv643xx_eth_probe(struct platform_device *pdev)</div><div class='ctx'> 	dev_printk(KERN_NOTICE, &amp;dev-&gt;dev, "port %d with MAC address %s\n",</div><div class='ctx'> 		   mp-&gt;port_num, print_mac(mac, dev-&gt;dev_addr));</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;features &amp; NETIF_F_SG)</div><div class='del'>-		dev_printk(KERN_NOTICE, &amp;dev-&gt;dev, "scatter/gather enabled\n");</div><div class='del'>-</div><div class='del'>-	if (dev-&gt;features &amp; NETIF_F_IP_CSUM)</div><div class='del'>-		dev_printk(KERN_NOTICE, &amp;dev-&gt;dev, "tx checksum offload\n");</div><div class='del'>-</div><div class='del'>-#ifdef MV643XX_ETH_NAPI</div><div class='del'>-	dev_printk(KERN_NOTICE, &amp;dev-&gt;dev, "napi enabled\n");</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	if (mp-&gt;tx_desc_sram_size &gt; 0)</div><div class='ctx'> 		dev_printk(KERN_NOTICE, &amp;dev-&gt;dev, "configured with sram\n");</div><div class='ctx'> </div><div class='hunk'>@@ -2637,6 +2702,8 @@ static int mv643xx_eth_remove(struct platform_device *pdev)</div><div class='ctx'> 	struct mv643xx_eth_private *mp = platform_get_drvdata(pdev);</div><div class='ctx'> </div><div class='ctx'> 	unregister_netdev(mp-&gt;dev);</div><div class='add'>+	if (mp-&gt;phy != NULL)</div><div class='add'>+		phy_detach(mp-&gt;phy);</div><div class='ctx'> 	flush_scheduled_work();</div><div class='ctx'> 	free_netdev(mp-&gt;dev);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c<br/>index d6524db321af..a9aebad52652 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/myri10ge/myri10ge.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/myri10ge/myri10ge.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/myri10ge/myri10ge.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/myri10ge/myri10ge.c</a></div><div class='hunk'>@@ -75,7 +75,7 @@</div><div class='ctx'> #include "myri10ge_mcp.h"</div><div class='ctx'> #include "myri10ge_mcp_gen_header.h"</div><div class='ctx'> </div><div class='del'>-#define MYRI10GE_VERSION_STR "1.4.3-1.358"</div><div class='add'>+#define MYRI10GE_VERSION_STR "1.4.3-1.369"</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("Myricom 10G driver (10GbE)");</div><div class='ctx'> MODULE_AUTHOR("Maintainer: help@myri.com");</div><div class='hunk'>@@ -102,6 +102,8 @@ MODULE_LICENSE("Dual BSD/GPL");</div><div class='ctx'> #define MYRI10GE_ALLOC_SIZE ((1 &lt;&lt; MYRI10GE_ALLOC_ORDER) * PAGE_SIZE)</div><div class='ctx'> #define MYRI10GE_MAX_FRAGS_PER_FRAME (MYRI10GE_MAX_ETHER_MTU/MYRI10GE_ALLOC_SIZE + 1)</div><div class='ctx'> </div><div class='add'>+#define MYRI10GE_MAX_SLICES 32</div><div class='add'>+</div><div class='ctx'> struct myri10ge_rx_buffer_state {</div><div class='ctx'> 	struct page *page;</div><div class='ctx'> 	int page_offset;</div><div class='hunk'>@@ -138,6 +140,8 @@ struct myri10ge_rx_buf {</div><div class='ctx'> </div><div class='ctx'> struct myri10ge_tx_buf {</div><div class='ctx'> 	struct mcp_kreq_ether_send __iomem *lanai;	/* lanai ptr for sendq */</div><div class='add'>+	__be32 __iomem *send_go;	/* "go" doorbell ptr */</div><div class='add'>+	__be32 __iomem *send_stop;	/* "stop" doorbell ptr */</div><div class='ctx'> 	struct mcp_kreq_ether_send *req_list;	/* host shadow of sendq */</div><div class='ctx'> 	char *req_bytes;</div><div class='ctx'> 	struct myri10ge_tx_buffer_state *info;</div><div class='hunk'>@@ -149,6 +153,7 @@ struct myri10ge_tx_buf {</div><div class='ctx'> 	int done ____cacheline_aligned;	/* transmit slots completed     */</div><div class='ctx'> 	int pkt_done;		/* packets completed */</div><div class='ctx'> 	int wake_queue;</div><div class='add'>+	int queue_active;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct myri10ge_rx_done {</div><div class='hunk'>@@ -183,7 +188,7 @@ struct myri10ge_slice_state {</div><div class='ctx'> 	dma_addr_t fw_stats_bus;</div><div class='ctx'> 	int watchdog_tx_done;</div><div class='ctx'> 	int watchdog_tx_req;</div><div class='del'>-#ifdef CONFIG_DCA</div><div class='add'>+#ifdef CONFIG_MYRI10GE_DCA</div><div class='ctx'> 	int cached_dca_tag;</div><div class='ctx'> 	int cpu;</div><div class='ctx'> 	__be32 __iomem *dca_tag;</div><div class='hunk'>@@ -215,7 +220,7 @@ struct myri10ge_priv {</div><div class='ctx'> 	int msi_enabled;</div><div class='ctx'> 	int msix_enabled;</div><div class='ctx'> 	struct msix_entry *msix_vectors;</div><div class='del'>-#ifdef CONFIG_DCA</div><div class='add'>+#ifdef CONFIG_MYRI10GE_DCA</div><div class='ctx'> 	int dca_enabled;</div><div class='ctx'> #endif</div><div class='ctx'> 	u32 link_state;</div><div class='hunk'>@@ -418,6 +423,12 @@ myri10ge_send_cmd(struct myri10ge_priv *mgp, u32 cmd,</div><div class='ctx'> 			return -ENOSYS;</div><div class='ctx'> 		} else if (result == MXGEFW_CMD_ERROR_UNALIGNED) {</div><div class='ctx'> 			return -E2BIG;</div><div class='add'>+		} else if (result == MXGEFW_CMD_ERROR_RANGE &amp;&amp;</div><div class='add'>+			   cmd == MXGEFW_CMD_ENABLE_RSS_QUEUES &amp;&amp;</div><div class='add'>+			   (data-&gt;</div><div class='add'>+			    data1 &amp; MXGEFW_SLICE_ENABLE_MULTIPLE_TX_QUEUES) !=</div><div class='add'>+			   0) {</div><div class='add'>+			return -ERANGE;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			dev_err(&amp;mgp-&gt;pdev-&gt;dev,</div><div class='ctx'> 				"command %d failed, result = %d\n",</div><div class='hunk'>@@ -891,7 +902,7 @@ static int myri10ge_reset(struct myri10ge_priv *mgp)</div><div class='ctx'> 	struct myri10ge_slice_state *ss;</div><div class='ctx'> 	int i, status;</div><div class='ctx'> 	size_t bytes;</div><div class='del'>-#ifdef CONFIG_DCA</div><div class='add'>+#ifdef CONFIG_MYRI10GE_DCA</div><div class='ctx'> 	unsigned long dca_tag_off;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -947,9 +958,24 @@ static int myri10ge_reset(struct myri10ge_priv *mgp)</div><div class='ctx'> 		 */</div><div class='ctx'> </div><div class='ctx'> 		cmd.data0 = mgp-&gt;num_slices;</div><div class='del'>-		cmd.data1 = 1;	/* use MSI-X */</div><div class='add'>+		cmd.data1 = MXGEFW_SLICE_INTR_MODE_ONE_PER_SLICE;</div><div class='add'>+		if (mgp-&gt;dev-&gt;real_num_tx_queues &gt; 1)</div><div class='add'>+			cmd.data1 |= MXGEFW_SLICE_ENABLE_MULTIPLE_TX_QUEUES;</div><div class='ctx'> 		status = myri10ge_send_cmd(mgp, MXGEFW_CMD_ENABLE_RSS_QUEUES,</div><div class='ctx'> 					   &amp;cmd, 0);</div><div class='add'>+</div><div class='add'>+		/* Firmware older than 1.4.32 only supports multiple</div><div class='add'>+		 * RX queues, so if we get an error, first retry using a</div><div class='add'>+		 * single TX queue before giving up */</div><div class='add'>+		if (status != 0 &amp;&amp; mgp-&gt;dev-&gt;real_num_tx_queues &gt; 1) {</div><div class='add'>+			mgp-&gt;dev-&gt;real_num_tx_queues = 1;</div><div class='add'>+			cmd.data0 = mgp-&gt;num_slices;</div><div class='add'>+			cmd.data1 = MXGEFW_SLICE_INTR_MODE_ONE_PER_SLICE;</div><div class='add'>+			status = myri10ge_send_cmd(mgp,</div><div class='add'>+						   MXGEFW_CMD_ENABLE_RSS_QUEUES,</div><div class='add'>+						   &amp;cmd, 0);</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		if (status != 0) {</div><div class='ctx'> 			dev_err(&amp;mgp-&gt;pdev-&gt;dev,</div><div class='ctx'> 				"failed to set number of slices\n");</div><div class='hunk'>@@ -986,7 +1012,7 @@ static int myri10ge_reset(struct myri10ge_priv *mgp)</div><div class='ctx'> 	}</div><div class='ctx'> 	put_be32(htonl(mgp-&gt;intr_coal_delay), mgp-&gt;intr_coal_delay_ptr);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_DCA</div><div class='add'>+#ifdef CONFIG_MYRI10GE_DCA</div><div class='ctx'> 	status = myri10ge_send_cmd(mgp, MXGEFW_CMD_GET_DCA_OFFSET, &amp;cmd, 0);</div><div class='ctx'> 	dca_tag_off = cmd.data0;</div><div class='ctx'> 	for (i = 0; i &lt; mgp-&gt;num_slices; i++) {</div><div class='hunk'>@@ -1025,7 +1051,7 @@ static int myri10ge_reset(struct myri10ge_priv *mgp)</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_DCA</div><div class='add'>+#ifdef CONFIG_MYRI10GE_DCA</div><div class='ctx'> static void</div><div class='ctx'> myri10ge_write_dca(struct myri10ge_slice_state *ss, int cpu, int tag)</div><div class='ctx'> {</div><div class='hunk'>@@ -1060,8 +1086,9 @@ static void myri10ge_setup_dca(struct myri10ge_priv *mgp)</div><div class='ctx'> 	}</div><div class='ctx'> 	err = dca_add_requester(&amp;pdev-&gt;dev);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev,</div><div class='del'>-			"dca_add_requester() failed, err=%d\n", err);</div><div class='add'>+		if (err != -ENODEV)</div><div class='add'>+			dev_err(&amp;pdev-&gt;dev,</div><div class='add'>+				"dca_add_requester() failed, err=%d\n", err);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	mgp-&gt;dca_enabled = 1;</div><div class='hunk'>@@ -1316,6 +1343,7 @@ myri10ge_tx_done(struct myri10ge_slice_state *ss, int mcp_index)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev *pdev = ss-&gt;mgp-&gt;pdev;</div><div class='ctx'> 	struct myri10ge_tx_buf *tx = &amp;ss-&gt;tx;</div><div class='add'>+	struct netdev_queue *dev_queue;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	int idx, len;</div><div class='ctx'> </div><div class='hunk'>@@ -1349,11 +1377,31 @@ myri10ge_tx_done(struct myri10ge_slice_state *ss, int mcp_index)</div><div class='ctx'> 					       PCI_DMA_TODEVICE);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	dev_queue = netdev_get_tx_queue(ss-&gt;dev, ss - ss-&gt;mgp-&gt;ss);</div><div class='add'>+	/*</div><div class='add'>+	 * Make a minimal effort to prevent the NIC from polling an</div><div class='add'>+	 * idle tx queue.  If we can't get the lock we leave the queue</div><div class='add'>+	 * active. In this case, either a thread was about to start</div><div class='add'>+	 * using the queue anyway, or we lost a race and the NIC will</div><div class='add'>+	 * waste some of its resources polling an inactive queue for a</div><div class='add'>+	 * while.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	if ((ss-&gt;mgp-&gt;dev-&gt;real_num_tx_queues &gt; 1) &amp;&amp;</div><div class='add'>+	    __netif_tx_trylock(dev_queue)) {</div><div class='add'>+		if (tx-&gt;req == tx-&gt;done) {</div><div class='add'>+			tx-&gt;queue_active = 0;</div><div class='add'>+			put_be32(htonl(1), tx-&gt;send_stop);</div><div class='add'>+		}</div><div class='add'>+		__netif_tx_unlock(dev_queue);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* start the queue if we've stopped it */</div><div class='del'>-	if (netif_queue_stopped(ss-&gt;dev)</div><div class='add'>+	if (netif_tx_queue_stopped(dev_queue)</div><div class='ctx'> 	    &amp;&amp; tx-&gt;req - tx-&gt;done &lt; (tx-&gt;mask &gt;&gt; 1)) {</div><div class='ctx'> 		tx-&gt;wake_queue++;</div><div class='del'>-		netif_wake_queue(ss-&gt;dev);</div><div class='add'>+		netif_tx_wake_queue(dev_queue);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1457,7 +1505,7 @@ static int myri10ge_poll(struct napi_struct *napi, int budget)</div><div class='ctx'> 	struct net_device *netdev = ss-&gt;mgp-&gt;dev;</div><div class='ctx'> 	int work_done;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_DCA</div><div class='add'>+#ifdef CONFIG_MYRI10GE_DCA</div><div class='ctx'> 	if (ss-&gt;mgp-&gt;dca_enabled)</div><div class='ctx'> 		myri10ge_update_dca(ss);</div><div class='ctx'> #endif</div><div class='hunk'>@@ -1481,9 +1529,9 @@ static irqreturn_t myri10ge_intr(int irq, void *arg)</div><div class='ctx'> 	u32 send_done_count;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	/* an interrupt on a non-zero slice is implicitly valid</div><div class='del'>-	 * since MSI-X irqs are not shared */</div><div class='del'>-	if (ss != mgp-&gt;ss) {</div><div class='add'>+	/* an interrupt on a non-zero receive-only slice is implicitly</div><div class='add'>+	 * valid  since MSI-X irqs are not shared */</div><div class='add'>+	if ((mgp-&gt;dev-&gt;real_num_tx_queues == 1) &amp;&amp; (ss != mgp-&gt;ss)) {</div><div class='ctx'> 		netif_rx_schedule(ss-&gt;dev, &amp;ss-&gt;napi);</div><div class='ctx'> 		return (IRQ_HANDLED);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1525,7 +1573,9 @@ static irqreturn_t myri10ge_intr(int irq, void *arg)</div><div class='ctx'> 		barrier();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	myri10ge_check_statblock(mgp);</div><div class='add'>+	/* Only slice 0 updates stats */</div><div class='add'>+	if (ss == mgp-&gt;ss)</div><div class='add'>+		myri10ge_check_statblock(mgp);</div><div class='ctx'> </div><div class='ctx'> 	put_be32(htonl(3), ss-&gt;irq_claim + 1);</div><div class='ctx'> 	return (IRQ_HANDLED);</div><div class='hunk'>@@ -1686,8 +1736,8 @@ static const char myri10ge_gstrings_main_stats[][ETH_GSTRING_LEN] = {</div><div class='ctx'> 	"tx_boundary", "WC", "irq", "MSI", "MSIX",</div><div class='ctx'> 	"read_dma_bw_MBs", "write_dma_bw_MBs", "read_write_dma_bw_MBs",</div><div class='ctx'> 	"serial_number", "watchdog_resets",</div><div class='del'>-#ifdef CONFIG_DCA</div><div class='del'>-	"dca_capable", "dca_enabled",</div><div class='add'>+#ifdef CONFIG_MYRI10GE_DCA</div><div class='add'>+	"dca_capable_firmware", "dca_device_present",</div><div class='ctx'> #endif</div><div class='ctx'> 	"link_changes", "link_up", "dropped_link_overflow",</div><div class='ctx'> 	"dropped_link_error_or_filtered",</div><div class='hunk'>@@ -1765,7 +1815,7 @@ myri10ge_get_ethtool_stats(struct net_device *netdev,</div><div class='ctx'> 	data[i++] = (unsigned int)mgp-&gt;read_write_dma;</div><div class='ctx'> 	data[i++] = (unsigned int)mgp-&gt;serial_number;</div><div class='ctx'> 	data[i++] = (unsigned int)mgp-&gt;watchdog_resets;</div><div class='del'>-#ifdef CONFIG_DCA</div><div class='add'>+#ifdef CONFIG_MYRI10GE_DCA</div><div class='ctx'> 	data[i++] = (unsigned int)(mgp-&gt;ss[0].dca_tag != NULL);</div><div class='ctx'> 	data[i++] = (unsigned int)(mgp-&gt;dca_enabled);</div><div class='ctx'> #endif</div><div class='hunk'>@@ -1883,6 +1933,7 @@ static int myri10ge_allocate_rings(struct myri10ge_slice_state *ss)</div><div class='ctx'> 	/* ensure req_list entries are aligned to 8 bytes */</div><div class='ctx'> 	ss-&gt;tx.req_list = (struct mcp_kreq_ether_send *)</div><div class='ctx'> 	    ALIGN((unsigned long)ss-&gt;tx.req_bytes, 8);</div><div class='add'>+	ss-&gt;tx.queue_active = 0;</div><div class='ctx'> </div><div class='ctx'> 	bytes = rx_ring_entries * sizeof(*ss-&gt;rx_small.shadow);</div><div class='ctx'> 	ss-&gt;rx_small.shadow = kzalloc(bytes, GFP_KERNEL);</div><div class='hunk'>@@ -2200,11 +2251,14 @@ static int myri10ge_get_txrx(struct myri10ge_priv *mgp, int slice)</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='ctx'> 	ss = &amp;mgp-&gt;ss[slice];</div><div class='del'>-	cmd.data0 = 0;		/* single slice for now */</div><div class='del'>-	status = myri10ge_send_cmd(mgp, MXGEFW_CMD_GET_SEND_OFFSET, &amp;cmd, 0);</div><div class='del'>-	ss-&gt;tx.lanai = (struct mcp_kreq_ether_send __iomem *)</div><div class='del'>-	    (mgp-&gt;sram + cmd.data0);</div><div class='del'>-</div><div class='add'>+	status = 0;</div><div class='add'>+	if (slice == 0 || (mgp-&gt;dev-&gt;real_num_tx_queues &gt; 1)) {</div><div class='add'>+		cmd.data0 = slice;</div><div class='add'>+		status = myri10ge_send_cmd(mgp, MXGEFW_CMD_GET_SEND_OFFSET,</div><div class='add'>+					   &amp;cmd, 0);</div><div class='add'>+		ss-&gt;tx.lanai = (struct mcp_kreq_ether_send __iomem *)</div><div class='add'>+		    (mgp-&gt;sram + cmd.data0);</div><div class='add'>+	}</div><div class='ctx'> 	cmd.data0 = slice;</div><div class='ctx'> 	status |= myri10ge_send_cmd(mgp, MXGEFW_CMD_GET_SMALL_RX_OFFSET,</div><div class='ctx'> 				    &amp;cmd, 0);</div><div class='hunk'>@@ -2216,6 +2270,10 @@ static int myri10ge_get_txrx(struct myri10ge_priv *mgp, int slice)</div><div class='ctx'> 	ss-&gt;rx_big.lanai = (struct mcp_kreq_ether_recv __iomem *)</div><div class='ctx'> 	    (mgp-&gt;sram + cmd.data0);</div><div class='ctx'> </div><div class='add'>+	ss-&gt;tx.send_go = (__iomem __be32 *)</div><div class='add'>+	    (mgp-&gt;sram + MXGEFW_ETH_SEND_GO + 64 * slice);</div><div class='add'>+	ss-&gt;tx.send_stop = (__iomem __be32 *)</div><div class='add'>+	    (mgp-&gt;sram + MXGEFW_ETH_SEND_STOP + 64 * slice);</div><div class='ctx'> 	return status;</div><div class='ctx'> </div><div class='ctx'> }</div><div class='hunk'>@@ -2229,7 +2287,7 @@ static int myri10ge_set_stats(struct myri10ge_priv *mgp, int slice)</div><div class='ctx'> 	ss = &amp;mgp-&gt;ss[slice];</div><div class='ctx'> 	cmd.data0 = MYRI10GE_LOWPART_TO_U32(ss-&gt;fw_stats_bus);</div><div class='ctx'> 	cmd.data1 = MYRI10GE_HIGHPART_TO_U32(ss-&gt;fw_stats_bus);</div><div class='del'>-	cmd.data2 = sizeof(struct mcp_irq_data);</div><div class='add'>+	cmd.data2 = sizeof(struct mcp_irq_data) | (slice &lt;&lt; 16);</div><div class='ctx'> 	status = myri10ge_send_cmd(mgp, MXGEFW_CMD_SET_STATS_DMA_V2, &amp;cmd, 0);</div><div class='ctx'> 	if (status == -ENOSYS) {</div><div class='ctx'> 		dma_addr_t bus = ss-&gt;fw_stats_bus;</div><div class='hunk'>@@ -2270,7 +2328,9 @@ static int myri10ge_open(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	if (mgp-&gt;num_slices &gt; 1) {</div><div class='ctx'> 		cmd.data0 = mgp-&gt;num_slices;</div><div class='del'>-		cmd.data1 = 1;	/* use MSI-X */</div><div class='add'>+		cmd.data1 = MXGEFW_SLICE_INTR_MODE_ONE_PER_SLICE;</div><div class='add'>+		if (mgp-&gt;dev-&gt;real_num_tx_queues &gt; 1)</div><div class='add'>+			cmd.data1 |= MXGEFW_SLICE_ENABLE_MULTIPLE_TX_QUEUES;</div><div class='ctx'> 		status = myri10ge_send_cmd(mgp, MXGEFW_CMD_ENABLE_RSS_QUEUES,</div><div class='ctx'> 					   &amp;cmd, 0);</div><div class='ctx'> 		if (status != 0) {</div><div class='hunk'>@@ -2291,6 +2351,7 @@ static int myri10ge_open(struct net_device *dev)</div><div class='ctx'> 			printk(KERN_ERR</div><div class='ctx'> 			       "myri10ge: %s: failed to setup rss tables\n",</div><div class='ctx'> 			       dev-&gt;name);</div><div class='add'>+			goto abort_with_nothing;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* just enable an identity mapping */</div><div class='hunk'>@@ -2361,7 +2422,11 @@ static int myri10ge_open(struct net_device *dev)</div><div class='ctx'> 		status = myri10ge_allocate_rings(ss);</div><div class='ctx'> 		if (status != 0)</div><div class='ctx'> 			goto abort_with_rings;</div><div class='del'>-		if (slice == 0)</div><div class='add'>+</div><div class='add'>+		/* only firmware which supports multiple TX queues</div><div class='add'>+		 * supports setting up the tx stats on non-zero</div><div class='add'>+		 * slices */</div><div class='add'>+		if (slice == 0 || mgp-&gt;dev-&gt;real_num_tx_queues &gt; 1)</div><div class='ctx'> 			status = myri10ge_set_stats(mgp, slice);</div><div class='ctx'> 		if (status) {</div><div class='ctx'> 			printk(KERN_ERR</div><div class='hunk'>@@ -2427,7 +2492,8 @@ static int myri10ge_open(struct net_device *dev)</div><div class='ctx'> 	mgp-&gt;running = MYRI10GE_ETH_RUNNING;</div><div class='ctx'> 	mgp-&gt;watchdog_timer.expires = jiffies + myri10ge_watchdog_timeout * HZ;</div><div class='ctx'> 	add_timer(&amp;mgp-&gt;watchdog_timer);</div><div class='del'>-	netif_wake_queue(dev);</div><div class='add'>+	netif_tx_wake_all_queues(dev);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> abort_with_rings:</div><div class='hunk'>@@ -2460,7 +2526,8 @@ static int myri10ge_close(struct net_device *dev)</div><div class='ctx'> 		napi_disable(&amp;mgp-&gt;ss[i].napi);</div><div class='ctx'> 	}</div><div class='ctx'> 	netif_carrier_off(dev);</div><div class='del'>-	netif_stop_queue(dev);</div><div class='add'>+</div><div class='add'>+	netif_tx_stop_all_queues(dev);</div><div class='ctx'> 	old_down_cnt = mgp-&gt;down_cnt;</div><div class='ctx'> 	mb();</div><div class='ctx'> 	status = myri10ge_send_cmd(mgp, MXGEFW_CMD_ETHERNET_DOWN, &amp;cmd, 0);</div><div class='hunk'>@@ -2565,18 +2632,21 @@ static int myri10ge_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	struct mcp_kreq_ether_send *req;</div><div class='ctx'> 	struct myri10ge_tx_buf *tx;</div><div class='ctx'> 	struct skb_frag_struct *frag;</div><div class='add'>+	struct netdev_queue *netdev_queue;</div><div class='ctx'> 	dma_addr_t bus;</div><div class='ctx'> 	u32 low;</div><div class='ctx'> 	__be32 high_swapped;</div><div class='ctx'> 	unsigned int len;</div><div class='ctx'> 	int idx, last_idx, avail, frag_cnt, frag_idx, count, mss, max_segments;</div><div class='del'>-	u16 pseudo_hdr_offset, cksum_offset;</div><div class='add'>+	u16 pseudo_hdr_offset, cksum_offset, queue;</div><div class='ctx'> 	int cum_len, seglen, boundary, rdma_count;</div><div class='ctx'> 	u8 flags, odd_flag;</div><div class='ctx'> </div><div class='del'>-	/* always transmit through slot 0 */</div><div class='del'>-	ss = mgp-&gt;ss;</div><div class='add'>+	queue = skb_get_queue_mapping(skb);</div><div class='add'>+	ss = &amp;mgp-&gt;ss[queue];</div><div class='add'>+	netdev_queue = netdev_get_tx_queue(mgp-&gt;dev, queue);</div><div class='ctx'> 	tx = &amp;ss-&gt;tx;</div><div class='add'>+</div><div class='ctx'> again:</div><div class='ctx'> 	req = tx-&gt;req_list;</div><div class='ctx'> 	avail = tx-&gt;mask - 1 - (tx-&gt;req - tx-&gt;done);</div><div class='hunk'>@@ -2592,7 +2662,7 @@ again:</div><div class='ctx'> 	if ((unlikely(avail &lt; max_segments))) {</div><div class='ctx'> 		/* we are out of transmit resources */</div><div class='ctx'> 		tx-&gt;stop_queue++;</div><div class='del'>-		netif_stop_queue(dev);</div><div class='add'>+		netif_tx_stop_queue(netdev_queue);</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2785,10 +2855,16 @@ again:</div><div class='ctx'> 	idx = ((count - 1) + tx-&gt;req) &amp; tx-&gt;mask;</div><div class='ctx'> 	tx-&gt;info[idx].last = 1;</div><div class='ctx'> 	myri10ge_submit_req(tx, tx-&gt;req_list, count);</div><div class='add'>+	/* if using multiple tx queues, make sure NIC polls the</div><div class='add'>+	 * current slice */</div><div class='add'>+	if ((mgp-&gt;dev-&gt;real_num_tx_queues &gt; 1) &amp;&amp; tx-&gt;queue_active == 0) {</div><div class='add'>+		tx-&gt;queue_active = 1;</div><div class='add'>+		put_be32(htonl(1), tx-&gt;send_go);</div><div class='add'>+	}</div><div class='ctx'> 	tx-&gt;pkt_start++;</div><div class='ctx'> 	if ((avail - count) &lt; MXGEFW_MAX_SEND_DESC) {</div><div class='ctx'> 		tx-&gt;stop_queue++;</div><div class='del'>-		netif_stop_queue(dev);</div><div class='add'>+		netif_tx_stop_queue(netdev_queue);</div><div class='ctx'> 	}</div><div class='ctx'> 	dev-&gt;trans_start = jiffies;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -3366,20 +3442,21 @@ static void myri10ge_watchdog(struct work_struct *work)</div><div class='ctx'> 		for (i = 0; i &lt; mgp-&gt;num_slices; i++) {</div><div class='ctx'> 			tx = &amp;mgp-&gt;ss[i].tx;</div><div class='ctx'> 			printk(KERN_INFO</div><div class='del'>-			       "myri10ge: %s: (%d): %d %d %d %d %d\n",</div><div class='del'>-			       mgp-&gt;dev-&gt;name, i, tx-&gt;req, tx-&gt;done,</div><div class='del'>-			       tx-&gt;pkt_start, tx-&gt;pkt_done,</div><div class='add'>+			       "myri10ge: %s: (%d): %d %d %d %d %d %d\n",</div><div class='add'>+			       mgp-&gt;dev-&gt;name, i, tx-&gt;queue_active, tx-&gt;req,</div><div class='add'>+			       tx-&gt;done, tx-&gt;pkt_start, tx-&gt;pkt_done,</div><div class='ctx'> 			       (int)ntohl(mgp-&gt;ss[i].fw_stats-&gt;</div><div class='ctx'> 					  send_done_count));</div><div class='ctx'> 			msleep(2000);</div><div class='ctx'> 			printk(KERN_INFO</div><div class='del'>-			       "myri10ge: %s: (%d): %d %d %d %d %d\n",</div><div class='del'>-			       mgp-&gt;dev-&gt;name, i, tx-&gt;req, tx-&gt;done,</div><div class='del'>-			       tx-&gt;pkt_start, tx-&gt;pkt_done,</div><div class='add'>+			       "myri10ge: %s: (%d): %d %d %d %d %d %d\n",</div><div class='add'>+			       mgp-&gt;dev-&gt;name, i, tx-&gt;queue_active, tx-&gt;req,</div><div class='add'>+			       tx-&gt;done, tx-&gt;pkt_start, tx-&gt;pkt_done,</div><div class='ctx'> 			       (int)ntohl(mgp-&gt;ss[i].fw_stats-&gt;</div><div class='ctx'> 					  send_done_count));</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	rtnl_lock();</div><div class='ctx'> 	myri10ge_close(mgp-&gt;dev);</div><div class='ctx'> 	status = myri10ge_load_firmware(mgp, 1);</div><div class='hunk'>@@ -3434,10 +3511,14 @@ static void myri10ge_watchdog_timer(unsigned long arg)</div><div class='ctx'> 			/* nic seems like it might be stuck.. */</div><div class='ctx'> 			if (rx_pause_cnt != mgp-&gt;watchdog_pause) {</div><div class='ctx'> 				if (net_ratelimit())</div><div class='del'>-					printk(KERN_WARNING "myri10ge %s:"</div><div class='add'>+					printk(KERN_WARNING</div><div class='add'>+					       "myri10ge %s slice %d:"</div><div class='ctx'> 					       "TX paused, check link partner\n",</div><div class='del'>-					       mgp-&gt;dev-&gt;name);</div><div class='add'>+					       mgp-&gt;dev-&gt;name, i);</div><div class='ctx'> 			} else {</div><div class='add'>+				printk(KERN_WARNING</div><div class='add'>+				       "myri10ge %s slice %d stuck:",</div><div class='add'>+				       mgp-&gt;dev-&gt;name, i);</div><div class='ctx'> 				reset_needed = 1;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -3652,7 +3733,7 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	int status = -ENXIO;</div><div class='ctx'> 	int dac_enabled;</div><div class='ctx'> </div><div class='del'>-	netdev = alloc_etherdev(sizeof(*mgp));</div><div class='add'>+	netdev = alloc_etherdev_mq(sizeof(*mgp), MYRI10GE_MAX_SLICES);</div><div class='ctx'> 	if (netdev == NULL) {</div><div class='ctx'> 		dev_err(dev, "Could not allocate ethernet device\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -3757,13 +3838,13 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "failed to alloc slice state\n");</div><div class='ctx'> 		goto abort_with_firmware;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='add'>+	netdev-&gt;real_num_tx_queues = mgp-&gt;num_slices;</div><div class='ctx'> 	status = myri10ge_reset(mgp);</div><div class='ctx'> 	if (status != 0) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "failed reset\n");</div><div class='ctx'> 		goto abort_with_slices;</div><div class='ctx'> 	}</div><div class='del'>-#ifdef CONFIG_DCA</div><div class='add'>+#ifdef CONFIG_MYRI10GE_DCA</div><div class='ctx'> 	myri10ge_setup_dca(mgp);</div><div class='ctx'> #endif</div><div class='ctx'> 	pci_set_drvdata(pdev, mgp);</div><div class='hunk'>@@ -3781,6 +3862,7 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	netdev-&gt;set_multicast_list = myri10ge_set_multicast_list;</div><div class='ctx'> 	netdev-&gt;set_mac_address = myri10ge_set_mac_address;</div><div class='ctx'> 	netdev-&gt;features = mgp-&gt;features;</div><div class='add'>+</div><div class='ctx'> 	if (dac_enabled)</div><div class='ctx'> 		netdev-&gt;features |= NETIF_F_HIGHDMA;</div><div class='ctx'> </div><div class='hunk'>@@ -3866,7 +3948,7 @@ static void myri10ge_remove(struct pci_dev *pdev)</div><div class='ctx'> 	netdev = mgp-&gt;dev;</div><div class='ctx'> 	unregister_netdev(netdev);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_DCA</div><div class='add'>+#ifdef CONFIG_MYRI10GE_DCA</div><div class='ctx'> 	myri10ge_teardown_dca(mgp);</div><div class='ctx'> #endif</div><div class='ctx'> 	myri10ge_dummy_rdma(mgp, 0);</div><div class='hunk'>@@ -3911,7 +3993,7 @@ static struct pci_driver myri10ge_driver = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_DCA</div><div class='add'>+#ifdef CONFIG_MYRI10GE_DCA</div><div class='ctx'> static int</div><div class='ctx'> myri10ge_notify_dca(struct notifier_block *nb, unsigned long event, void *p)</div><div class='ctx'> {</div><div class='hunk'>@@ -3936,16 +4018,17 @@ static __init int myri10ge_init_module(void)</div><div class='ctx'> 	printk(KERN_INFO "%s: Version %s\n", myri10ge_driver.name,</div><div class='ctx'> 	       MYRI10GE_VERSION_STR);</div><div class='ctx'> </div><div class='del'>-	if (myri10ge_rss_hash &gt; MXGEFW_RSS_HASH_TYPE_SRC_PORT ||</div><div class='del'>-	    myri10ge_rss_hash &lt; MXGEFW_RSS_HASH_TYPE_IPV4) {</div><div class='add'>+	if (myri10ge_rss_hash &gt; MXGEFW_RSS_HASH_TYPE_MAX) {</div><div class='ctx'> 		printk(KERN_ERR</div><div class='ctx'> 		       "%s: Illegal rssh hash type %d, defaulting to source port\n",</div><div class='ctx'> 		       myri10ge_driver.name, myri10ge_rss_hash);</div><div class='ctx'> 		myri10ge_rss_hash = MXGEFW_RSS_HASH_TYPE_SRC_PORT;</div><div class='ctx'> 	}</div><div class='del'>-#ifdef CONFIG_DCA</div><div class='add'>+#ifdef CONFIG_MYRI10GE_DCA</div><div class='ctx'> 	dca_register_notify(&amp;myri10ge_dca_notifier);</div><div class='ctx'> #endif</div><div class='add'>+	if (myri10ge_max_slices &gt; MYRI10GE_MAX_SLICES)</div><div class='add'>+		myri10ge_max_slices = MYRI10GE_MAX_SLICES;</div><div class='ctx'> </div><div class='ctx'> 	return pci_register_driver(&amp;myri10ge_driver);</div><div class='ctx'> }</div><div class='hunk'>@@ -3954,7 +4037,7 @@ module_init(myri10ge_init_module);</div><div class='ctx'> </div><div class='ctx'> static __exit void myri10ge_cleanup_module(void)</div><div class='ctx'> {</div><div class='del'>-#ifdef CONFIG_DCA</div><div class='add'>+#ifdef CONFIG_MYRI10GE_DCA</div><div class='ctx'> 	dca_unregister_notify(&amp;myri10ge_dca_notifier);</div><div class='ctx'> #endif</div><div class='ctx'> 	pci_unregister_driver(&amp;myri10ge_driver);</div><div class='head'>diff --git a/drivers/net/myri_sbus.c b/drivers/net/myri_sbus.c<br/>index 656a260fc956..3ad7589d6a1c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/myri_sbus.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/myri_sbus.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/myri_sbus.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/myri_sbus.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /* myri_sbus.c: MyriCOM MyriNET SBUS card driver.</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 1996, 1999, 2006 David S. Miller (davem@davemloft.net)</div><div class='add'>+ * Copyright (C) 1996, 1999, 2006, 2008 David S. Miller (davem@davemloft.net)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static char version[] =</div><div class='hunk'>@@ -22,6 +22,9 @@ static char version[] =</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;net/dst.h&gt;</div><div class='ctx'> #include &lt;net/arp.h&gt;</div><div class='hunk'>@@ -33,7 +36,6 @@ static char version[] =</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='ctx'> #include &lt;asm/byteorder.h&gt;</div><div class='ctx'> #include &lt;asm/idprom.h&gt;</div><div class='del'>-#include &lt;asm/sbus.h&gt;</div><div class='ctx'> #include &lt;asm/openprom.h&gt;</div><div class='ctx'> #include &lt;asm/oplib.h&gt;</div><div class='ctx'> #include &lt;asm/auxio.h&gt;</div><div class='hunk'>@@ -243,7 +245,8 @@ static void myri_clean_rings(struct myri_eth *mp)</div><div class='ctx'> 			u32 dma_addr;</div><div class='ctx'> </div><div class='ctx'> 			dma_addr = sbus_readl(&amp;rxd-&gt;myri_scatters[0].addr);</div><div class='del'>-			sbus_unmap_single(mp-&gt;myri_sdev, dma_addr, RX_ALLOC_SIZE, SBUS_DMA_FROMDEVICE);</div><div class='add'>+			dma_unmap_single(&amp;mp-&gt;myri_op-&gt;dev, dma_addr,</div><div class='add'>+					 RX_ALLOC_SIZE, DMA_FROM_DEVICE);</div><div class='ctx'> 			dev_kfree_skb(mp-&gt;rx_skbs[i]);</div><div class='ctx'> 			mp-&gt;rx_skbs[i] = NULL;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -259,7 +262,9 @@ static void myri_clean_rings(struct myri_eth *mp)</div><div class='ctx'> 			u32 dma_addr;</div><div class='ctx'> </div><div class='ctx'> 			dma_addr = sbus_readl(&amp;txd-&gt;myri_gathers[0].addr);</div><div class='del'>-			sbus_unmap_single(mp-&gt;myri_sdev, dma_addr, (skb-&gt;len + 3) &amp; ~3, SBUS_DMA_TODEVICE);</div><div class='add'>+			dma_unmap_single(&amp;mp-&gt;myri_op-&gt;dev, dma_addr,</div><div class='add'>+					 (skb-&gt;len + 3) &amp; ~3,</div><div class='add'>+					 DMA_TO_DEVICE);</div><div class='ctx'> 			dev_kfree_skb(mp-&gt;tx_skbs[i]);</div><div class='ctx'> 			mp-&gt;tx_skbs[i] = NULL;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -288,7 +293,9 @@ static void myri_init_rings(struct myri_eth *mp, int from_irq)</div><div class='ctx'> 		skb-&gt;dev = dev;</div><div class='ctx'> 		skb_put(skb, RX_ALLOC_SIZE);</div><div class='ctx'> </div><div class='del'>-		dma_addr = sbus_map_single(mp-&gt;myri_sdev, skb-&gt;data, RX_ALLOC_SIZE, SBUS_DMA_FROMDEVICE);</div><div class='add'>+		dma_addr = dma_map_single(&amp;mp-&gt;myri_op-&gt;dev,</div><div class='add'>+					  skb-&gt;data, RX_ALLOC_SIZE,</div><div class='add'>+					  DMA_FROM_DEVICE);</div><div class='ctx'> 		sbus_writel(dma_addr, &amp;rxd[i].myri_scatters[0].addr);</div><div class='ctx'> 		sbus_writel(RX_ALLOC_SIZE, &amp;rxd[i].myri_scatters[0].len);</div><div class='ctx'> 		sbus_writel(i, &amp;rxd[i].ctx);</div><div class='hunk'>@@ -344,7 +351,8 @@ static void myri_tx(struct myri_eth *mp, struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 		DTX(("SKB[%d] ", entry));</div><div class='ctx'> 		dma_addr = sbus_readl(&amp;sq-&gt;myri_txd[entry].myri_gathers[0].addr);</div><div class='del'>-		sbus_unmap_single(mp-&gt;myri_sdev, dma_addr, skb-&gt;len, SBUS_DMA_TODEVICE);</div><div class='add'>+		dma_unmap_single(&amp;mp-&gt;myri_op-&gt;dev, dma_addr,</div><div class='add'>+				 skb-&gt;len, DMA_TO_DEVICE);</div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='ctx'> 		mp-&gt;tx_skbs[entry] = NULL;</div><div class='ctx'> 		dev-&gt;stats.tx_packets++;</div><div class='hunk'>@@ -423,9 +431,9 @@ static void myri_rx(struct myri_eth *mp, struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 		/* Check for errors. */</div><div class='ctx'> 		DRX(("rxd[%d]: %p len[%d] csum[%08x] ", entry, rxd, len, csum));</div><div class='del'>-		sbus_dma_sync_single_for_cpu(mp-&gt;myri_sdev,</div><div class='del'>-					     sbus_readl(&amp;rxd-&gt;myri_scatters[0].addr),</div><div class='del'>-					     RX_ALLOC_SIZE, SBUS_DMA_FROMDEVICE);</div><div class='add'>+		dma_sync_single_for_cpu(&amp;mp-&gt;myri_op-&gt;dev,</div><div class='add'>+					sbus_readl(&amp;rxd-&gt;myri_scatters[0].addr),</div><div class='add'>+					RX_ALLOC_SIZE, DMA_FROM_DEVICE);</div><div class='ctx'> 		if (len &lt; (ETH_HLEN + MYRI_PAD_LEN) || (skb-&gt;data[0] != MYRI_PAD_LEN)) {</div><div class='ctx'> 			DRX(("ERROR["));</div><div class='ctx'> 			dev-&gt;stats.rx_errors++;</div><div class='hunk'>@@ -442,10 +450,10 @@ static void myri_rx(struct myri_eth *mp, struct net_device *dev)</div><div class='ctx'> 			drops++;</div><div class='ctx'> 			DRX(("DROP "));</div><div class='ctx'> 			dev-&gt;stats.rx_dropped++;</div><div class='del'>-			sbus_dma_sync_single_for_device(mp-&gt;myri_sdev,</div><div class='del'>-							sbus_readl(&amp;rxd-&gt;myri_scatters[0].addr),</div><div class='del'>-							RX_ALLOC_SIZE,</div><div class='del'>-							SBUS_DMA_FROMDEVICE);</div><div class='add'>+			dma_sync_single_for_device(&amp;mp-&gt;myri_op-&gt;dev,</div><div class='add'>+						   sbus_readl(&amp;rxd-&gt;myri_scatters[0].addr),</div><div class='add'>+						   RX_ALLOC_SIZE,</div><div class='add'>+						   DMA_FROM_DEVICE);</div><div class='ctx'> 			sbus_writel(RX_ALLOC_SIZE, &amp;rxd-&gt;myri_scatters[0].len);</div><div class='ctx'> 			sbus_writel(index, &amp;rxd-&gt;ctx);</div><div class='ctx'> 			sbus_writel(1, &amp;rxd-&gt;num_sg);</div><div class='hunk'>@@ -464,17 +472,17 @@ static void myri_rx(struct myri_eth *mp, struct net_device *dev)</div><div class='ctx'> 				DRX(("skb_alloc(FAILED) "));</div><div class='ctx'> 				goto drop_it;</div><div class='ctx'> 			}</div><div class='del'>-			sbus_unmap_single(mp-&gt;myri_sdev,</div><div class='del'>-					  sbus_readl(&amp;rxd-&gt;myri_scatters[0].addr),</div><div class='del'>-					  RX_ALLOC_SIZE,</div><div class='del'>-					  SBUS_DMA_FROMDEVICE);</div><div class='add'>+			dma_unmap_single(&amp;mp-&gt;myri_op-&gt;dev,</div><div class='add'>+					 sbus_readl(&amp;rxd-&gt;myri_scatters[0].addr),</div><div class='add'>+					 RX_ALLOC_SIZE,</div><div class='add'>+					 DMA_FROM_DEVICE);</div><div class='ctx'> 			mp-&gt;rx_skbs[index] = new_skb;</div><div class='ctx'> 			new_skb-&gt;dev = dev;</div><div class='ctx'> 			skb_put(new_skb, RX_ALLOC_SIZE);</div><div class='del'>-			dma_addr = sbus_map_single(mp-&gt;myri_sdev,</div><div class='del'>-						   new_skb-&gt;data,</div><div class='del'>-						   RX_ALLOC_SIZE,</div><div class='del'>-						   SBUS_DMA_FROMDEVICE);</div><div class='add'>+			dma_addr = dma_map_single(&amp;mp-&gt;myri_op-&gt;dev,</div><div class='add'>+						  new_skb-&gt;data,</div><div class='add'>+						  RX_ALLOC_SIZE,</div><div class='add'>+						  DMA_FROM_DEVICE);</div><div class='ctx'> 			sbus_writel(dma_addr, &amp;rxd-&gt;myri_scatters[0].addr);</div><div class='ctx'> 			sbus_writel(RX_ALLOC_SIZE, &amp;rxd-&gt;myri_scatters[0].len);</div><div class='ctx'> 			sbus_writel(index, &amp;rxd-&gt;ctx);</div><div class='hunk'>@@ -500,10 +508,10 @@ static void myri_rx(struct myri_eth *mp, struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 			/* Reuse original ring buffer. */</div><div class='ctx'> 			DRX(("reuse "));</div><div class='del'>-			sbus_dma_sync_single_for_device(mp-&gt;myri_sdev,</div><div class='del'>-							sbus_readl(&amp;rxd-&gt;myri_scatters[0].addr),</div><div class='del'>-							RX_ALLOC_SIZE,</div><div class='del'>-							SBUS_DMA_FROMDEVICE);</div><div class='add'>+			dma_sync_single_for_device(&amp;mp-&gt;myri_op-&gt;dev,</div><div class='add'>+						   sbus_readl(&amp;rxd-&gt;myri_scatters[0].addr),</div><div class='add'>+						   RX_ALLOC_SIZE,</div><div class='add'>+						   DMA_FROM_DEVICE);</div><div class='ctx'> 			sbus_writel(RX_ALLOC_SIZE, &amp;rxd-&gt;myri_scatters[0].len);</div><div class='ctx'> 			sbus_writel(index, &amp;rxd-&gt;ctx);</div><div class='ctx'> 			sbus_writel(1, &amp;rxd-&gt;num_sg);</div><div class='hunk'>@@ -652,7 +660,8 @@ static int myri_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 		sbus_writew((skb-&gt;data[4] &lt;&lt; 8) | skb-&gt;data[5], &amp;txd-&gt;addr[3]);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dma_addr = sbus_map_single(mp-&gt;myri_sdev, skb-&gt;data, len, SBUS_DMA_TODEVICE);</div><div class='add'>+	dma_addr = dma_map_single(&amp;mp-&gt;myri_op-&gt;dev, skb-&gt;data,</div><div class='add'>+				  len, DMA_TO_DEVICE);</div><div class='ctx'> 	sbus_writel(dma_addr, &amp;txd-&gt;myri_gathers[0].addr);</div><div class='ctx'> 	sbus_writel(len, &amp;txd-&gt;myri_gathers[0].len);</div><div class='ctx'> 	sbus_writel(1, &amp;txd-&gt;num_sg);</div><div class='hunk'>@@ -891,30 +900,30 @@ static const struct header_ops myri_header_ops = {</div><div class='ctx'> 	.cache_update	= myri_header_cache_update,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __devinit myri_ether_init(struct sbus_dev *sdev)</div><div class='add'>+static int __devinit myri_sbus_probe(struct of_device *op, const struct of_device_id *match)</div><div class='ctx'> {</div><div class='del'>-	static int num;</div><div class='add'>+	struct device_node *dp = op-&gt;node;</div><div class='ctx'> 	static unsigned version_printed;</div><div class='ctx'> 	struct net_device *dev;</div><div class='del'>-	struct myri_eth *mp;</div><div class='del'>-	unsigned char prop_buf[32];</div><div class='del'>-	int i;</div><div class='ctx'> 	DECLARE_MAC_BUF(mac);</div><div class='add'>+	struct myri_eth *mp;</div><div class='add'>+	const void *prop;</div><div class='add'>+	static int num;</div><div class='add'>+	int i, len;</div><div class='ctx'> </div><div class='del'>-	DET(("myri_ether_init(%p,%d):\n", sdev, num));</div><div class='add'>+	DET(("myri_ether_init(%p,%d):\n", op, num));</div><div class='ctx'> 	dev = alloc_etherdev(sizeof(struct myri_eth));</div><div class='del'>-</div><div class='ctx'> 	if (!dev)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	if (version_printed++ == 0)</div><div class='ctx'> 		printk(version);</div><div class='ctx'> </div><div class='del'>-	SET_NETDEV_DEV(dev, &amp;sdev-&gt;ofdev.dev);</div><div class='add'>+	SET_NETDEV_DEV(dev, &amp;op-&gt;dev);</div><div class='ctx'> </div><div class='del'>-	mp = (struct myri_eth *) dev-&gt;priv;</div><div class='add'>+	mp = netdev_priv(dev);</div><div class='ctx'> 	spin_lock_init(&amp;mp-&gt;irq_lock);</div><div class='del'>-	mp-&gt;myri_sdev = sdev;</div><div class='add'>+	mp-&gt;myri_op = op;</div><div class='ctx'> </div><div class='ctx'> 	/* Clean out skb arrays. */</div><div class='ctx'> 	for (i = 0; i &lt; (RX_RING_SIZE + 1); i++)</div><div class='hunk'>@@ -924,55 +933,44 @@ static int __devinit myri_ether_init(struct sbus_dev *sdev)</div><div class='ctx'> 		mp-&gt;tx_skbs[i] = NULL;</div><div class='ctx'> </div><div class='ctx'> 	/* First check for EEPROM information. */</div><div class='del'>-	i = prom_getproperty(sdev-&gt;prom_node, "myrinet-eeprom-info",</div><div class='del'>-			     (char *)&amp;mp-&gt;eeprom, sizeof(struct myri_eeprom));</div><div class='del'>-	DET(("prom_getprop(myrinet-eeprom-info) returns %d\n", i));</div><div class='del'>-	if (i == 0 || i == -1) {</div><div class='add'>+	prop = of_get_property(dp, "myrinet-eeprom-info", &amp;len);</div><div class='add'>+</div><div class='add'>+	if (prop)</div><div class='add'>+		memcpy(&amp;mp-&gt;eeprom, prop, sizeof(struct myri_eeprom));</div><div class='add'>+	if (!prop) {</div><div class='ctx'> 		/* No eeprom property, must cook up the values ourselves. */</div><div class='ctx'> 		DET(("No EEPROM: "));</div><div class='ctx'> 		mp-&gt;eeprom.bus_type = BUS_TYPE_SBUS;</div><div class='del'>-		mp-&gt;eeprom.cpuvers = prom_getintdefault(sdev-&gt;prom_node,"cpu_version",0);</div><div class='del'>-		mp-&gt;eeprom.cval = prom_getintdefault(sdev-&gt;prom_node,"clock_value",0);</div><div class='del'>-		mp-&gt;eeprom.ramsz = prom_getintdefault(sdev-&gt;prom_node,"sram_size",0);</div><div class='del'>-		DET(("cpuvers[%d] cval[%d] ramsz[%d]\n", mp-&gt;eeprom.cpuvers,</div><div class='del'>-		     mp-&gt;eeprom.cval, mp-&gt;eeprom.ramsz));</div><div class='del'>-		if (mp-&gt;eeprom.cpuvers == 0) {</div><div class='del'>-			DET(("EEPROM: cpuvers was zero, setting to %04x\n",CPUVERS_2_3));</div><div class='add'>+		mp-&gt;eeprom.cpuvers =</div><div class='add'>+			of_getintprop_default(dp, "cpu_version", 0);</div><div class='add'>+		mp-&gt;eeprom.cval =</div><div class='add'>+			of_getintprop_default(dp, "clock_value", 0);</div><div class='add'>+		mp-&gt;eeprom.ramsz = of_getintprop_default(dp, "sram_size", 0);</div><div class='add'>+		if (!mp-&gt;eeprom.cpuvers)</div><div class='ctx'> 			mp-&gt;eeprom.cpuvers = CPUVERS_2_3;</div><div class='del'>-		}</div><div class='del'>-		if (mp-&gt;eeprom.cpuvers &lt; CPUVERS_3_0) {</div><div class='del'>-			DET(("EEPROM: cpuvers &lt; CPUVERS_3_0, clockval set to zero.\n"));</div><div class='add'>+		if (mp-&gt;eeprom.cpuvers &lt; CPUVERS_3_0)</div><div class='ctx'> 			mp-&gt;eeprom.cval = 0;</div><div class='del'>-		}</div><div class='del'>-		if (mp-&gt;eeprom.ramsz == 0) {</div><div class='del'>-			DET(("EEPROM: ramsz == 0, setting to 128k\n"));</div><div class='add'>+		if (!mp-&gt;eeprom.ramsz)</div><div class='ctx'> 			mp-&gt;eeprom.ramsz = (128 * 1024);</div><div class='del'>-		}</div><div class='del'>-		i = prom_getproperty(sdev-&gt;prom_node, "myrinet-board-id",</div><div class='del'>-				     &amp;prop_buf[0], 10);</div><div class='del'>-		DET(("EEPROM: prom_getprop(myrinet-board-id) returns %d\n", i));</div><div class='del'>-		if ((i != 0) &amp;&amp; (i != -1))</div><div class='del'>-			memcpy(&amp;mp-&gt;eeprom.id[0], &amp;prop_buf[0], 6);</div><div class='add'>+</div><div class='add'>+		prop = of_get_property(dp, "myrinet-board-id", &amp;len);</div><div class='add'>+		if (prop)</div><div class='add'>+			memcpy(&amp;mp-&gt;eeprom.id[0], prop, 6);</div><div class='ctx'> 		else</div><div class='ctx'> 			set_boardid_from_idprom(mp, num);</div><div class='del'>-		i = prom_getproperty(sdev-&gt;prom_node, "fpga_version",</div><div class='del'>-				     &amp;mp-&gt;eeprom.fvers[0], 32);</div><div class='del'>-		DET(("EEPROM: prom_getprop(fpga_version) returns %d\n", i));</div><div class='del'>-		if (i == 0 || i == -1)</div><div class='add'>+</div><div class='add'>+		prop = of_get_property(dp, "fpga_version", &amp;len);</div><div class='add'>+		if (prop)</div><div class='add'>+			memcpy(&amp;mp-&gt;eeprom.fvers[0], prop, 32);</div><div class='add'>+		else</div><div class='ctx'> 			memset(&amp;mp-&gt;eeprom.fvers[0], 0, 32);</div><div class='ctx'> </div><div class='ctx'> 		if (mp-&gt;eeprom.cpuvers == CPUVERS_4_1) {</div><div class='del'>-			DET(("EEPROM: cpuvers CPUVERS_4_1, "));</div><div class='del'>-			if (mp-&gt;eeprom.ramsz == (128 * 1024)) {</div><div class='del'>-				DET(("ramsize 128k, setting to 256k, "));</div><div class='add'>+			if (mp-&gt;eeprom.ramsz == (128 * 1024))</div><div class='ctx'> 				mp-&gt;eeprom.ramsz = (256 * 1024);</div><div class='del'>-			}</div><div class='del'>-			if ((mp-&gt;eeprom.cval==0x40414041)||(mp-&gt;eeprom.cval==0x90449044)){</div><div class='del'>-				DET(("changing cval from %08x to %08x ",</div><div class='del'>-				     mp-&gt;eeprom.cval, 0x50e450e4));</div><div class='add'>+			if ((mp-&gt;eeprom.cval == 0x40414041) ||</div><div class='add'>+			    (mp-&gt;eeprom.cval == 0x90449044))</div><div class='ctx'> 				mp-&gt;eeprom.cval = 0x50e450e4;</div><div class='del'>-			}</div><div class='del'>-			DET(("\n"));</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> #ifdef DEBUG_DETECT</div><div class='hunk'>@@ -991,8 +989,8 @@ static int __devinit myri_ether_init(struct sbus_dev *sdev)</div><div class='ctx'> 		 * XXX only a valid version for PCI cards?  Ask feldy...</div><div class='ctx'> 		 */</div><div class='ctx'> 		DET(("Mapping regs for cpuvers &lt; CPUVERS_4_0\n"));</div><div class='del'>-		mp-&gt;regs = sbus_ioremap(&amp;sdev-&gt;resource[0], 0,</div><div class='del'>-					mp-&gt;reg_size, "MyriCOM Regs");</div><div class='add'>+		mp-&gt;regs = of_ioremap(&amp;op-&gt;resource[0], 0,</div><div class='add'>+				      mp-&gt;reg_size, "MyriCOM Regs");</div><div class='ctx'> 		if (!mp-&gt;regs) {</div><div class='ctx'> 			printk("MyriCOM: Cannot map MyriCOM registers.\n");</div><div class='ctx'> 			goto err;</div><div class='hunk'>@@ -1001,13 +999,12 @@ static int __devinit myri_ether_init(struct sbus_dev *sdev)</div><div class='ctx'> 		mp-&gt;lregs = mp-&gt;lanai + (0x10000 * 2);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		DET(("Mapping regs for cpuvers &gt;= CPUVERS_4_0\n"));</div><div class='del'>-		mp-&gt;cregs = sbus_ioremap(&amp;sdev-&gt;resource[0], 0,</div><div class='del'>-					 PAGE_SIZE, "MyriCOM Control Regs");</div><div class='del'>-		mp-&gt;lregs = sbus_ioremap(&amp;sdev-&gt;resource[0], (256 * 1024),</div><div class='add'>+		mp-&gt;cregs = of_ioremap(&amp;op-&gt;resource[0], 0,</div><div class='add'>+				       PAGE_SIZE, "MyriCOM Control Regs");</div><div class='add'>+		mp-&gt;lregs = of_ioremap(&amp;op-&gt;resource[0], (256 * 1024),</div><div class='ctx'> 					 PAGE_SIZE, "MyriCOM LANAI Regs");</div><div class='del'>-		mp-&gt;lanai =</div><div class='del'>-			sbus_ioremap(&amp;sdev-&gt;resource[0], (512 * 1024),</div><div class='del'>-				     mp-&gt;eeprom.ramsz, "MyriCOM SRAM");</div><div class='add'>+		mp-&gt;lanai = of_ioremap(&amp;op-&gt;resource[0], (512 * 1024),</div><div class='add'>+				       mp-&gt;eeprom.ramsz, "MyriCOM SRAM");</div><div class='ctx'> 	}</div><div class='ctx'> 	DET(("Registers mapped: cregs[%p] lregs[%p] lanai[%p]\n",</div><div class='ctx'> 	     mp-&gt;cregs, mp-&gt;lregs, mp-&gt;lanai));</div><div class='hunk'>@@ -1039,16 +1036,15 @@ static int __devinit myri_ether_init(struct sbus_dev *sdev)</div><div class='ctx'> 	myri_reset_on(mp-&gt;cregs);</div><div class='ctx'> </div><div class='ctx'> 	/* Get the supported DVMA burst sizes from our SBUS. */</div><div class='del'>-	mp-&gt;myri_bursts = prom_getintdefault(mp-&gt;myri_sdev-&gt;bus-&gt;prom_node,</div><div class='del'>-					     "burst-sizes", 0x00);</div><div class='del'>-</div><div class='del'>-	if (!sbus_can_burst64(sdev))</div><div class='add'>+	mp-&gt;myri_bursts = of_getintprop_default(dp-&gt;parent,</div><div class='add'>+						"burst-sizes", 0x00);</div><div class='add'>+	if (!sbus_can_burst64())</div><div class='ctx'> 		mp-&gt;myri_bursts &amp;= ~(DMA_BURST64);</div><div class='ctx'> </div><div class='ctx'> 	DET(("MYRI bursts %02x\n", mp-&gt;myri_bursts));</div><div class='ctx'> </div><div class='ctx'> 	/* Encode SBUS interrupt level in second control register. */</div><div class='del'>-	i = prom_getint(sdev-&gt;prom_node, "interrupts");</div><div class='add'>+	i = of_getintprop_default(dp, "interrupts", 0);</div><div class='ctx'> 	if (i == 0)</div><div class='ctx'> 		i = 4;</div><div class='ctx'> 	DET(("prom_getint(interrupts)==%d, irqlvl set to %04x\n",</div><div class='hunk'>@@ -1063,7 +1059,7 @@ static int __devinit myri_ether_init(struct sbus_dev *sdev)</div><div class='ctx'> 	dev-&gt;tx_timeout = &amp;myri_tx_timeout;</div><div class='ctx'> 	dev-&gt;watchdog_timeo = 5*HZ;</div><div class='ctx'> 	dev-&gt;set_multicast_list = &amp;myri_set_multicast;</div><div class='del'>-	dev-&gt;irq = sdev-&gt;irqs[0];</div><div class='add'>+	dev-&gt;irq = op-&gt;irqs[0];</div><div class='ctx'> </div><div class='ctx'> 	/* Register interrupt handler now. */</div><div class='ctx'> 	DET(("Requesting MYRIcom IRQ line.\n"));</div><div class='hunk'>@@ -1088,7 +1084,7 @@ static int __devinit myri_ether_init(struct sbus_dev *sdev)</div><div class='ctx'> 		goto err_free_irq;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dev_set_drvdata(&amp;sdev-&gt;ofdev.dev, mp);</div><div class='add'>+	dev_set_drvdata(&amp;op-&gt;dev, mp);</div><div class='ctx'> </div><div class='ctx'> 	num++;</div><div class='ctx'> </div><div class='hunk'>@@ -1105,39 +1101,31 @@ err:</div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static int __devinit myri_sbus_probe(struct of_device *dev, const struct of_device_id *match)</div><div class='del'>-{</div><div class='del'>-	struct sbus_dev *sdev = to_sbus_device(&amp;dev-&gt;dev);</div><div class='del'>-</div><div class='del'>-	return myri_ether_init(sdev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __devexit myri_sbus_remove(struct of_device *dev)</div><div class='add'>+static int __devexit myri_sbus_remove(struct of_device *op)</div><div class='ctx'> {</div><div class='del'>-	struct myri_eth *mp = dev_get_drvdata(&amp;dev-&gt;dev);</div><div class='add'>+	struct myri_eth *mp = dev_get_drvdata(&amp;op-&gt;dev);</div><div class='ctx'> 	struct net_device *net_dev = mp-&gt;dev;</div><div class='ctx'> </div><div class='del'>-	unregister_netdevice(net_dev);</div><div class='add'>+	unregister_netdev(net_dev);</div><div class='ctx'> </div><div class='ctx'> 	free_irq(net_dev-&gt;irq, net_dev);</div><div class='ctx'> </div><div class='ctx'> 	if (mp-&gt;eeprom.cpuvers &lt; CPUVERS_4_0) {</div><div class='del'>-		sbus_iounmap(mp-&gt;regs, mp-&gt;reg_size);</div><div class='add'>+		of_iounmap(&amp;op-&gt;resource[0], mp-&gt;regs, mp-&gt;reg_size);</div><div class='ctx'> 	} else {</div><div class='del'>-		sbus_iounmap(mp-&gt;cregs, PAGE_SIZE);</div><div class='del'>-		sbus_iounmap(mp-&gt;lregs, (256 * 1024));</div><div class='del'>-		sbus_iounmap(mp-&gt;lanai, (512 * 1024));</div><div class='add'>+		of_iounmap(&amp;op-&gt;resource[0], mp-&gt;cregs, PAGE_SIZE);</div><div class='add'>+		of_iounmap(&amp;op-&gt;resource[0], mp-&gt;lregs, (256 * 1024));</div><div class='add'>+		of_iounmap(&amp;op-&gt;resource[0], mp-&gt;lanai, (512 * 1024));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	free_netdev(net_dev);</div><div class='ctx'> </div><div class='del'>-	dev_set_drvdata(&amp;dev-&gt;dev, NULL);</div><div class='add'>+	dev_set_drvdata(&amp;op-&gt;dev, NULL);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct of_device_id myri_sbus_match[] = {</div><div class='add'>+static const struct of_device_id myri_sbus_match[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.name = "MYRICOM,mlanai",</div><div class='ctx'> 	},</div><div class='hunk'>@@ -1158,7 +1146,7 @@ static struct of_platform_driver myri_sbus_driver = {</div><div class='ctx'> </div><div class='ctx'> static int __init myri_sbus_init(void)</div><div class='ctx'> {</div><div class='del'>-	return of_register_driver(&amp;myri_sbus_driver, &amp;sbus_bus_type);</div><div class='add'>+	return of_register_driver(&amp;myri_sbus_driver, &amp;of_bus_type);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit myri_sbus_exit(void)</div><div class='head'>diff --git a/drivers/net/myri_sbus.h b/drivers/net/myri_sbus.h<br/>index 5d93fcc95d55..ff363e95d9cf 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/myri_sbus.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/myri_sbus.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/myri_sbus.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/myri_sbus.h</a></div><div class='hunk'>@@ -288,7 +288,7 @@ struct myri_eth {</div><div class='ctx'> 	struct myri_eeprom		eeprom;		/* Local copy of EEPROM.      */</div><div class='ctx'> 	unsigned int			reg_size;	/* Size of register space.    */</div><div class='ctx'> 	unsigned int			shmem_base;	/* Offset to shared ram.      */</div><div class='del'>-	struct sbus_dev			*myri_sdev;	/* Our SBUS device struct.    */</div><div class='add'>+	struct of_device		*myri_op;	/* Our OF device struct.    */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* We use this to acquire receive skb's that we can DMA directly into. */</div><div class='head'>diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c<br/>index b238ed0e8ace..f7fa3944659b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/natsemi.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/natsemi.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/natsemi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/natsemi.c</a></div><div class='hunk'>@@ -612,7 +612,7 @@ static void undo_cable_magic(struct net_device *dev);</div><div class='ctx'> static void check_link(struct net_device *dev);</div><div class='ctx'> static void netdev_timer(unsigned long data);</div><div class='ctx'> static void dump_ring(struct net_device *dev);</div><div class='del'>-static void tx_timeout(struct net_device *dev);</div><div class='add'>+static void ns_tx_timeout(struct net_device *dev);</div><div class='ctx'> static int alloc_ring(struct net_device *dev);</div><div class='ctx'> static void refill_rx(struct net_device *dev);</div><div class='ctx'> static void init_ring(struct net_device *dev);</div><div class='hunk'>@@ -920,7 +920,7 @@ static int __devinit natsemi_probe1 (struct pci_dev *pdev,</div><div class='ctx'> 	dev-&gt;set_multicast_list = &amp;set_rx_mode;</div><div class='ctx'> 	dev-&gt;change_mtu = &amp;natsemi_change_mtu;</div><div class='ctx'> 	dev-&gt;do_ioctl = &amp;netdev_ioctl;</div><div class='del'>-	dev-&gt;tx_timeout = &amp;tx_timeout;</div><div class='add'>+	dev-&gt;tx_timeout = &amp;ns_tx_timeout;</div><div class='ctx'> 	dev-&gt;watchdog_timeo = TX_TIMEOUT;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_NET_POLL_CONTROLLER</div><div class='hunk'>@@ -1875,7 +1875,7 @@ static void dump_ring(struct net_device *dev)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void tx_timeout(struct net_device *dev)</div><div class='add'>+static void ns_tx_timeout(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct netdev_private *np = netdev_priv(dev);</div><div class='ctx'> 	void __iomem * ioaddr = ns_ioaddr(dev);</div><div class='hunk'>@@ -3232,7 +3232,7 @@ static void __devexit natsemi_remove1 (struct pci_dev *pdev)</div><div class='ctx'>  * suspend/resume synchronization:</div><div class='ctx'>  * entry points:</div><div class='ctx'>  *   netdev_open, netdev_close, netdev_ioctl, set_rx_mode, intr_handler,</div><div class='del'>- *   start_tx, tx_timeout</div><div class='add'>+ *   start_tx, ns_tx_timeout</div><div class='ctx'>  *</div><div class='ctx'>  * No function accesses the hardware without checking np-&gt;hands_off.</div><div class='ctx'>  *	the check occurs under spin_lock_irq(&amp;np-&gt;lock);</div><div class='head'>diff --git a/drivers/net/ne.c b/drivers/net/ne.c<br/>index fa3ceca4e15c..eb681c0d51ba 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/ne.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/ne.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/ne.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/ne.c</a></div><div class='hunk'>@@ -64,6 +64,25 @@ static const char version2[] =</div><div class='ctx'> </div><div class='ctx'> /* Do we support clones that don't adhere to 14,15 of the SAprom ? */</div><div class='ctx'> #define SUPPORT_NE_BAD_CLONES</div><div class='add'>+/* 0xbad = bad sig or no reset ack */</div><div class='add'>+#define BAD 0xbad</div><div class='add'>+</div><div class='add'>+#define MAX_NE_CARDS	4	/* Max number of NE cards per module */</div><div class='add'>+static struct platform_device *pdev_ne[MAX_NE_CARDS];</div><div class='add'>+static int io[MAX_NE_CARDS];</div><div class='add'>+static int irq[MAX_NE_CARDS];</div><div class='add'>+static int bad[MAX_NE_CARDS];</div><div class='add'>+</div><div class='add'>+#ifdef MODULE</div><div class='add'>+module_param_array(io, int, NULL, 0);</div><div class='add'>+module_param_array(irq, int, NULL, 0);</div><div class='add'>+module_param_array(bad, int, NULL, 0);</div><div class='add'>+MODULE_PARM_DESC(io, "I/O base address(es),required");</div><div class='add'>+MODULE_PARM_DESC(irq, "IRQ number(s)");</div><div class='add'>+MODULE_PARM_DESC(bad, "Accept card(s) with bad signatures");</div><div class='add'>+MODULE_DESCRIPTION("NE1000/NE2000 ISA/PnP Ethernet driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+#endif /* MODULE */</div><div class='ctx'> </div><div class='ctx'> /* Do we perform extra sanity checks on stuff ? */</div><div class='ctx'> /* #define NE_SANITY_CHECK */</div><div class='hunk'>@@ -74,6 +93,10 @@ static const char version2[] =</div><div class='ctx'> /* Do we have a non std. amount of memory? (in units of 256 byte pages) */</div><div class='ctx'> /* #define PACKETBUF_MEMSIZE	0x40 */</div><div class='ctx'> </div><div class='add'>+/* This is set up so that no ISA autoprobe takes place. We can't guarantee</div><div class='add'>+that the ne2k probe is the last 8390 based probe to take place (as it</div><div class='add'>+is at boot) and so the probe will get confused by any other 8390 cards.</div><div class='add'>+ISA device autoprobes on a running machine are not recommended anyway. */</div><div class='ctx'> #if !defined(MODULE) &amp;&amp; (defined(CONFIG_ISA) || defined(CONFIG_M32R))</div><div class='ctx'> /* Do we need a portlist for the ISA auto-probe ? */</div><div class='ctx'> #define NEEDS_PORTLIST</div><div class='hunk'>@@ -192,8 +215,13 @@ static int __init do_ne_probe(struct net_device *dev)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	/* First check any supplied i/o locations. User knows best. &lt;cough&gt; */</div><div class='del'>-	if (base_addr &gt; 0x1ff)	/* Check a single specified location. */</div><div class='del'>-		return ne_probe1(dev, base_addr);</div><div class='add'>+	if (base_addr &gt; 0x1ff) {	/* Check a single specified location. */</div><div class='add'>+		int ret = ne_probe1(dev, base_addr);</div><div class='add'>+		if (ret)</div><div class='add'>+			printk(KERN_WARNING "ne.c: No NE*000 card found at "</div><div class='add'>+				"i/o = %#lx\n", base_addr);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='ctx'> 	else if (base_addr != 0)	/* Don't probe at all. */</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> </div><div class='hunk'>@@ -214,28 +242,6 @@ static int __init do_ne_probe(struct net_device *dev)</div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifndef MODULE</div><div class='del'>-struct net_device * __init ne_probe(int unit)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = alloc_eip_netdev();</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (!dev)</div><div class='del'>-		return ERR_PTR(-ENOMEM);</div><div class='del'>-</div><div class='del'>-	sprintf(dev-&gt;name, "eth%d", unit);</div><div class='del'>-	netdev_boot_setup_check(dev);</div><div class='del'>-</div><div class='del'>-	err = do_ne_probe(dev);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out;</div><div class='del'>-	return dev;</div><div class='del'>-out:</div><div class='del'>-	free_netdev(dev);</div><div class='del'>-	return ERR_PTR(err);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> static int __init ne_probe_isapnp(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -329,7 +335,7 @@ static int __init ne_probe1(struct net_device *dev, unsigned long ioaddr)</div><div class='ctx'> 	   with an otherwise unused dev-&gt;mem_end value of "0xBAD" will</div><div class='ctx'> 	   cause the driver to skip these parts of the probe. */</div><div class='ctx'> </div><div class='del'>-	bad_card = ((dev-&gt;base_addr != 0) &amp;&amp; (dev-&gt;mem_end == 0xbad));</div><div class='add'>+	bad_card = ((dev-&gt;base_addr != 0) &amp;&amp; (dev-&gt;mem_end == BAD));</div><div class='ctx'> </div><div class='ctx'> 	/* Reset card. Who knows what dain-bramaged state it was left in. */</div><div class='ctx'> </div><div class='hunk'>@@ -806,46 +812,95 @@ retry:</div><div class='ctx'> static int __init ne_drv_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev;</div><div class='add'>+	int err, this_dev = pdev-&gt;id;</div><div class='ctx'> 	struct resource *res;</div><div class='del'>-	int err, irq;</div><div class='del'>-</div><div class='del'>-	res = platform_get_resource(pdev, IORESOURCE_IO, 0);</div><div class='del'>-	irq = platform_get_irq(pdev, 0);</div><div class='del'>-	if (!res || irq &lt; 0)</div><div class='del'>-		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	dev = alloc_eip_netdev();</div><div class='ctx'> 	if (!dev)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	dev-&gt;irq = irq;</div><div class='del'>-	dev-&gt;base_addr = res-&gt;start;</div><div class='add'>+</div><div class='add'>+	/* ne.c doesn't populate resources in platform_device, but</div><div class='add'>+	 * rbtx4927_ne_init and rbtx4938_ne_init do register devices</div><div class='add'>+	 * with resources.</div><div class='add'>+	 */</div><div class='add'>+	res = platform_get_resource(pdev, IORESOURCE_IO, 0);</div><div class='add'>+	if (res) {</div><div class='add'>+		dev-&gt;base_addr = res-&gt;start;</div><div class='add'>+		dev-&gt;irq = platform_get_irq(pdev, 0);</div><div class='add'>+	} else {</div><div class='add'>+		if (this_dev &lt; 0 || this_dev &gt;= MAX_NE_CARDS)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		dev-&gt;base_addr = io[this_dev];</div><div class='add'>+		dev-&gt;irq = irq[this_dev];</div><div class='add'>+		dev-&gt;mem_end = bad[this_dev];</div><div class='add'>+	}</div><div class='ctx'> 	err = do_ne_probe(dev);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		free_netdev(dev);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	platform_set_drvdata(pdev, dev);</div><div class='add'>+</div><div class='add'>+	/* Update with any values found by probing, don't update if</div><div class='add'>+	 * resources were specified.</div><div class='add'>+	 */</div><div class='add'>+	if (!res) {</div><div class='add'>+		io[this_dev] = dev-&gt;base_addr;</div><div class='add'>+		irq[this_dev] = dev-&gt;irq;</div><div class='add'>+	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __exit ne_drv_remove(struct platform_device *pdev)</div><div class='add'>+static int ne_drv_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = platform_get_drvdata(pdev);</div><div class='ctx'> </div><div class='del'>-	unregister_netdev(dev);</div><div class='del'>-	free_irq(dev-&gt;irq, dev);</div><div class='del'>-	release_region(dev-&gt;base_addr, NE_IO_EXTENT);</div><div class='del'>-	free_netdev(dev);</div><div class='add'>+	if (dev) {</div><div class='add'>+		struct pnp_dev *idev = (struct pnp_dev *)ei_status.priv;</div><div class='add'>+		netif_device_detach(dev);</div><div class='add'>+		unregister_netdev(dev);</div><div class='add'>+		if (idev)</div><div class='add'>+			pnp_device_detach(idev);</div><div class='add'>+		/* Careful ne_drv_remove can be called twice, once from</div><div class='add'>+		 * the platform_driver.remove and again when the</div><div class='add'>+		 * platform_device is being removed.</div><div class='add'>+		 */</div><div class='add'>+		ei_status.priv = 0;</div><div class='add'>+		free_irq(dev-&gt;irq, dev);</div><div class='add'>+		release_region(dev-&gt;base_addr, NE_IO_EXTENT);</div><div class='add'>+		free_netdev(dev);</div><div class='add'>+		platform_set_drvdata(pdev, NULL);</div><div class='add'>+	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Remove unused devices or all if true. */</div><div class='add'>+static void ne_loop_rm_unreg(int all)</div><div class='add'>+{</div><div class='add'>+	int this_dev;</div><div class='add'>+	struct platform_device *pdev;</div><div class='add'>+	for (this_dev = 0; this_dev &lt; MAX_NE_CARDS; this_dev++) {</div><div class='add'>+		pdev = pdev_ne[this_dev];</div><div class='add'>+		/* No network device == unused */</div><div class='add'>+		if (pdev &amp;&amp; (!platform_get_drvdata(pdev) || all)) {</div><div class='add'>+			ne_drv_remove(pdev);</div><div class='add'>+			platform_device_unregister(pdev);</div><div class='add'>+			pdev_ne[this_dev] = NULL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> static int ne_drv_suspend(struct platform_device *pdev, pm_message_t state)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = platform_get_drvdata(pdev);</div><div class='ctx'> </div><div class='del'>-	if (netif_running(dev))</div><div class='add'>+	if (netif_running(dev)) {</div><div class='add'>+		struct pnp_dev *idev = (struct pnp_dev *)ei_status.priv;</div><div class='ctx'> 		netif_device_detach(dev);</div><div class='add'>+		if (idev)</div><div class='add'>+			pnp_stop_dev(idev);</div><div class='add'>+	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -854,6 +909,9 @@ static int ne_drv_resume(struct platform_device *pdev)</div><div class='ctx'> 	struct net_device *dev = platform_get_drvdata(pdev);</div><div class='ctx'> </div><div class='ctx'> 	if (netif_running(dev)) {</div><div class='add'>+		struct pnp_dev *idev = (struct pnp_dev *)ei_status.priv;</div><div class='add'>+		if (idev)</div><div class='add'>+			pnp_start_dev(idev);</div><div class='ctx'> 		ne_reset_8390(dev);</div><div class='ctx'> 		NS8390p_init(dev, 1);</div><div class='ctx'> 		netif_device_attach(dev);</div><div class='hunk'>@@ -866,7 +924,7 @@ static int ne_drv_resume(struct platform_device *pdev)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static struct platform_driver ne_driver = {</div><div class='del'>-	.remove		= __exit_p(ne_drv_remove),</div><div class='add'>+	.remove		= ne_drv_remove,</div><div class='ctx'> 	.suspend	= ne_drv_suspend,</div><div class='ctx'> 	.resume		= ne_drv_resume,</div><div class='ctx'> 	.driver		= {</div><div class='hunk'>@@ -875,91 +933,96 @@ static struct platform_driver ne_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init ne_init(void)</div><div class='add'>+static void __init ne_add_devices(void)</div><div class='ctx'> {</div><div class='del'>-	return platform_driver_probe(&amp;ne_driver, ne_drv_probe);</div><div class='del'>-}</div><div class='add'>+	int this_dev;</div><div class='add'>+	struct platform_device *pdev;</div><div class='ctx'> </div><div class='del'>-static void __exit ne_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;ne_driver);</div><div class='add'>+	for (this_dev = 0; this_dev &lt; MAX_NE_CARDS; this_dev++) {</div><div class='add'>+		if (pdev_ne[this_dev])</div><div class='add'>+			continue;</div><div class='add'>+		pdev = platform_device_register_simple(</div><div class='add'>+			DRV_NAME, this_dev, NULL, 0);</div><div class='add'>+		if (IS_ERR(pdev))</div><div class='add'>+			continue;</div><div class='add'>+		pdev_ne[this_dev] = pdev;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef MODULE</div><div class='del'>-#define MAX_NE_CARDS	4	/* Max number of NE cards per module */</div><div class='del'>-static struct net_device *dev_ne[MAX_NE_CARDS];</div><div class='del'>-static int io[MAX_NE_CARDS];</div><div class='del'>-static int irq[MAX_NE_CARDS];</div><div class='del'>-static int bad[MAX_NE_CARDS];	/* 0xbad = bad sig or no reset ack */</div><div class='del'>-</div><div class='del'>-module_param_array(io, int, NULL, 0);</div><div class='del'>-module_param_array(irq, int, NULL, 0);</div><div class='del'>-module_param_array(bad, int, NULL, 0);</div><div class='del'>-MODULE_PARM_DESC(io, "I/O base address(es),required");</div><div class='del'>-MODULE_PARM_DESC(irq, "IRQ number(s)");</div><div class='del'>-MODULE_PARM_DESC(bad, "Accept card(s) with bad signatures");</div><div class='del'>-MODULE_DESCRIPTION("NE1000/NE2000 ISA/PnP Ethernet driver");</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-</div><div class='del'>-/* This is set up so that no ISA autoprobe takes place. We can't guarantee</div><div class='del'>-that the ne2k probe is the last 8390 based probe to take place (as it</div><div class='del'>-is at boot) and so the probe will get confused by any other 8390 cards.</div><div class='del'>-ISA device autoprobes on a running machine are not recommended anyway. */</div><div class='del'>-</div><div class='del'>-int __init init_module(void)</div><div class='add'>+int __init init_module()</div><div class='ctx'> {</div><div class='del'>-	int this_dev, found = 0;</div><div class='del'>-	int plat_found = !ne_init();</div><div class='del'>-</div><div class='del'>-	for (this_dev = 0; this_dev &lt; MAX_NE_CARDS; this_dev++) {</div><div class='del'>-		struct net_device *dev = alloc_eip_netdev();</div><div class='del'>-		if (!dev)</div><div class='del'>-			break;</div><div class='del'>-		dev-&gt;irq = irq[this_dev];</div><div class='del'>-		dev-&gt;mem_end = bad[this_dev];</div><div class='del'>-		dev-&gt;base_addr = io[this_dev];</div><div class='del'>-		if (do_ne_probe(dev) == 0) {</div><div class='del'>-			dev_ne[found++] = dev;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		free_netdev(dev);</div><div class='del'>-		if (found || plat_found)</div><div class='del'>-			break;</div><div class='del'>-		if (io[this_dev] != 0)</div><div class='del'>-			printk(KERN_WARNING "ne.c: No NE*000 card found at i/o = %#x\n", io[this_dev]);</div><div class='del'>-		else</div><div class='del'>-			printk(KERN_NOTICE "ne.c: You must supply \"io=0xNNN\" value(s) for ISA cards.\n");</div><div class='del'>-		return -ENXIO;</div><div class='add'>+	int retval;</div><div class='add'>+	ne_add_devices();</div><div class='add'>+	retval = platform_driver_probe(&amp;ne_driver, ne_drv_probe);</div><div class='add'>+	if (retval) {</div><div class='add'>+		if (io[0] == 0)</div><div class='add'>+			printk(KERN_NOTICE "ne.c: You must supply \"io=0xNNN\""</div><div class='add'>+				" value(s) for ISA cards.\n");</div><div class='add'>+		ne_loop_rm_unreg(1);</div><div class='add'>+		return retval;</div><div class='ctx'> 	}</div><div class='del'>-	if (found || plat_found)</div><div class='del'>-		return 0;</div><div class='del'>-	return -ENODEV;</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-static void cleanup_card(struct net_device *dev)</div><div class='add'>+	/* Unregister unused platform_devices. */</div><div class='add'>+	ne_loop_rm_unreg(0);</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+#else /* MODULE */</div><div class='add'>+static int __init ne_init(void)</div><div class='ctx'> {</div><div class='del'>-	struct pnp_dev *idev = (struct pnp_dev *)ei_status.priv;</div><div class='del'>-	if (idev)</div><div class='del'>-		pnp_device_detach(idev);</div><div class='del'>-	free_irq(dev-&gt;irq, dev);</div><div class='del'>-	release_region(dev-&gt;base_addr, NE_IO_EXTENT);</div><div class='add'>+	int retval = platform_driver_probe(&amp;ne_driver, ne_drv_probe);</div><div class='add'>+</div><div class='add'>+	/* Unregister unused platform_devices. */</div><div class='add'>+	ne_loop_rm_unreg(0);</div><div class='add'>+	return retval;</div><div class='ctx'> }</div><div class='add'>+module_init(ne_init);</div><div class='ctx'> </div><div class='del'>-void __exit cleanup_module(void)</div><div class='add'>+struct net_device * __init ne_probe(int unit)</div><div class='ctx'> {</div><div class='ctx'> 	int this_dev;</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+</div><div class='add'>+	/* Find an empty slot, that is no net_device and zero io port. */</div><div class='add'>+	this_dev = 0;</div><div class='add'>+	while ((pdev_ne[this_dev] &amp;&amp; platform_get_drvdata(pdev_ne[this_dev])) ||</div><div class='add'>+		io[this_dev]) {</div><div class='add'>+		if (++this_dev == MAX_NE_CARDS)</div><div class='add'>+			return ERR_PTR(-ENOMEM);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Get irq, io from kernel command line */</div><div class='add'>+	dev = alloc_eip_netdev();</div><div class='add'>+	if (!dev)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='del'>-	ne_exit();</div><div class='add'>+	sprintf(dev-&gt;name, "eth%d", unit);</div><div class='add'>+	netdev_boot_setup_check(dev);</div><div class='add'>+</div><div class='add'>+	io[this_dev] = dev-&gt;base_addr;</div><div class='add'>+	irq[this_dev] = dev-&gt;irq;</div><div class='add'>+	bad[this_dev] = dev-&gt;mem_end;</div><div class='add'>+</div><div class='add'>+	free_netdev(dev);</div><div class='add'>+</div><div class='add'>+	ne_add_devices();</div><div class='add'>+</div><div class='add'>+	/* return the first device found */</div><div class='ctx'> 	for (this_dev = 0; this_dev &lt; MAX_NE_CARDS; this_dev++) {</div><div class='del'>-		struct net_device *dev = dev_ne[this_dev];</div><div class='del'>-		if (dev) {</div><div class='del'>-			unregister_netdev(dev);</div><div class='del'>-			cleanup_card(dev);</div><div class='del'>-			free_netdev(dev);</div><div class='add'>+		if (pdev_ne[this_dev]) {</div><div class='add'>+			dev = platform_get_drvdata(pdev_ne[this_dev]);</div><div class='add'>+			if (dev)</div><div class='add'>+				return dev;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	return ERR_PTR(-ENODEV);</div><div class='ctx'> }</div><div class='del'>-#else /* MODULE */</div><div class='del'>-module_init(ne_init);</div><div class='del'>-module_exit(ne_exit);</div><div class='ctx'> #endif /* MODULE */</div><div class='add'>+</div><div class='add'>+static void __exit ne_exit(void)</div><div class='add'>+{</div><div class='add'>+	platform_driver_unregister(&amp;ne_driver);</div><div class='add'>+	ne_loop_rm_unreg(1);</div><div class='add'>+}</div><div class='add'>+module_exit(ne_exit);</div><div class='head'>diff --git a/drivers/net/netx-eth.c b/drivers/net/netx-eth.c<br/>index 3f9af759cb90..b9bed82e1d21 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/netx-eth.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/netx-eth.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/netx-eth.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/netx-eth.c</a></div><div class='hunk'>@@ -189,7 +189,7 @@ netx_eth_interrupt(int irq, void *dev_id)</div><div class='ctx'> </div><div class='ctx'> 		if ((status &amp; ISR_CON_HI) || (status &amp; ISR_IND_HI))</div><div class='ctx'> 			printk("%s: unexpected status: 0x%08x\n",</div><div class='del'>-			    __FUNCTION__, status);</div><div class='add'>+			    __func__, status);</div><div class='ctx'> </div><div class='ctx'> 		fill_level =</div><div class='ctx'> 		    readl(NETX_PFIFO_FILL_LEVEL(IND_FIFO_PORT_LO(priv-&gt;id)));</div><div class='head'>diff --git a/drivers/net/netxen/netxen_nic.h b/drivers/net/netxen/netxen_nic.h<br/>index 244ab49c4337..f8e601c51da7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/netxen/netxen_nic.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/netxen/netxen_nic.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/netxen/netxen_nic.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/netxen/netxen_nic.h</a></div><div class='hunk'>@@ -742,7 +742,7 @@ extern char netxen_nic_driver_name[];</div><div class='ctx'> 	} while (0)</div><div class='ctx'> #else</div><div class='ctx'> #define DPRINTK(klevel, fmt, args...)	do { \</div><div class='del'>-	printk(KERN_##klevel PFX "%s: %s: " fmt, __FUNCTION__,\</div><div class='add'>+	printk(KERN_##klevel PFX "%s: %s: " fmt, __func__,\</div><div class='ctx'> 		(adapter != NULL &amp;&amp; adapter-&gt;netdev != NULL) ? \</div><div class='ctx'> 		adapter-&gt;netdev-&gt;name : NULL, \</div><div class='ctx'> 		## args); } while(0)</div><div class='head'>diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c<br/>index 008fd6618a5f..6ef3f0d84bcf 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/netxen/netxen_nic_main.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/netxen/netxen_nic_main.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/netxen/netxen_nic_main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/netxen/netxen_nic_main.c</a></div><div class='hunk'>@@ -77,18 +77,18 @@ static irqreturn_t netxen_msi_intr(int irq, void *data);</div><div class='ctx'> </div><div class='ctx'> /*  PCI Device ID Table  */</div><div class='ctx'> #define ENTRY(device) \</div><div class='del'>-	{PCI_DEVICE(0x4040, (device)), \</div><div class='add'>+	{PCI_DEVICE(PCI_VENDOR_ID_NETXEN, (device)), \</div><div class='ctx'> 	.class = PCI_CLASS_NETWORK_ETHERNET &lt;&lt; 8, .class_mask = ~0}</div><div class='ctx'> </div><div class='ctx'> static struct pci_device_id netxen_pci_tbl[] __devinitdata = {</div><div class='del'>-	ENTRY(0x0001),</div><div class='del'>-	ENTRY(0x0002),</div><div class='del'>-	ENTRY(0x0003),</div><div class='del'>-	ENTRY(0x0004),</div><div class='del'>-	ENTRY(0x0005),</div><div class='del'>-	ENTRY(0x0024),</div><div class='del'>-	ENTRY(0x0025),</div><div class='del'>-	ENTRY(0x0100),</div><div class='add'>+	ENTRY(PCI_DEVICE_ID_NX2031_10GXSR),</div><div class='add'>+	ENTRY(PCI_DEVICE_ID_NX2031_10GCX4),</div><div class='add'>+	ENTRY(PCI_DEVICE_ID_NX2031_4GCU),</div><div class='add'>+	ENTRY(PCI_DEVICE_ID_NX2031_IMEZ),</div><div class='add'>+	ENTRY(PCI_DEVICE_ID_NX2031_HMEZ),</div><div class='add'>+	ENTRY(PCI_DEVICE_ID_NX2031_XG_MGMT),</div><div class='add'>+	ENTRY(PCI_DEVICE_ID_NX2031_XG_MGMT2),</div><div class='add'>+	ENTRY(PCI_DEVICE_ID_NX3031),</div><div class='ctx'> 	{0,}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -241,7 +241,7 @@ static void netxen_check_options(struct netxen_adapter *adapter)</div><div class='ctx'> 	case NETXEN_BRDTYPE_P3_REF_QG:</div><div class='ctx'> 	case NETXEN_BRDTYPE_P3_4_GB:</div><div class='ctx'> 	case NETXEN_BRDTYPE_P3_4_GB_MM:</div><div class='del'>-		adapter-&gt;msix_supported = 0;</div><div class='add'>+		adapter-&gt;msix_supported = !!use_msi_x;</div><div class='ctx'> 		adapter-&gt;max_rx_desc_count = MAX_RCV_DESCRIPTORS_10G;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/niu.c b/drivers/net/niu.c<br/>index e3be81eba8a4..ebc812702903 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/niu.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/niu.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/niu.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/niu.c</a></div><div class='hunk'>@@ -9130,7 +9130,7 @@ static int __devexit niu_of_remove(struct of_device *op)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct of_device_id niu_match[] = {</div><div class='add'>+static const struct of_device_id niu_match[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.name = "network",</div><div class='ctx'> 		.compatible = "SUNW,niusl",</div><div class='head'>diff --git a/drivers/net/pci-skeleton.c b/drivers/net/pci-skeleton.c<br/>index 53451c3b2c0d..0a575fef29e6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/pci-skeleton.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/pci-skeleton.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/pci-skeleton.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/pci-skeleton.c</a></div><div class='hunk'>@@ -119,7 +119,7 @@ KERN_INFO "  Support available from http://foo.com/bar/baz.html\n";</div><div class='ctx'> </div><div class='ctx'> #ifdef NETDRV_DEBUG</div><div class='ctx'> /* note: prints function name for you */</div><div class='del'>-#  define DPRINTK(fmt, args...) printk(KERN_DEBUG "%s: " fmt, __FUNCTION__ , ## args)</div><div class='add'>+#  define DPRINTK(fmt, args...) printk(KERN_DEBUG "%s: " fmt, __func__ , ## args)</div><div class='ctx'> #else</div><div class='ctx'> #  define DPRINTK(fmt, args...)</div><div class='ctx'> #endif</div><div class='hunk'>@@ -130,7 +130,7 @@ KERN_INFO "  Support available from http://foo.com/bar/baz.html\n";</div><div class='ctx'> #  define assert(expr) \</div><div class='ctx'>         if(!(expr)) {					\</div><div class='ctx'>         printk( "Assertion failed! %s,%s,%s,line=%d\n",	\</div><div class='del'>-        #expr,__FILE__,__FUNCTION__,__LINE__);		\</div><div class='add'>+        #expr,__FILE__,__func__,__LINE__);		\</div><div class='ctx'>         }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/pcmcia/3c574_cs.c b/drivers/net/pcmcia/3c574_cs.c<br/>index 7112fd5e0e1b..08c4dd896077 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/pcmcia/3c574_cs.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/pcmcia/3c574_cs.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/pcmcia/3c574_cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/pcmcia/3c574_cs.c</a></div><div class='hunk'>@@ -355,9 +355,10 @@ static int tc574_config(struct pcmcia_device *link)</div><div class='ctx'> 	for (i = j = 0; j &lt; 0x400; j += 0x20) {</div><div class='ctx'> 		link-&gt;io.BasePort1 = j ^ 0x300;</div><div class='ctx'> 		i = pcmcia_request_io(link, &amp;link-&gt;io);</div><div class='del'>-		if (i == CS_SUCCESS) break;</div><div class='add'>+		if (i == 0)</div><div class='add'>+			break;</div><div class='ctx'> 	}</div><div class='del'>-	if (i != CS_SUCCESS) {</div><div class='add'>+	if (i != 0) {</div><div class='ctx'> 		cs_error(link, RequestIO, i);</div><div class='ctx'> 		goto failed;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -377,7 +378,7 @@ static int tc574_config(struct pcmcia_device *link)</div><div class='ctx'> 	tuple.TupleDataMax = 64;</div><div class='ctx'> 	tuple.TupleOffset = 0;</div><div class='ctx'> 	tuple.DesiredTuple = 0x88;</div><div class='del'>-	if (pcmcia_get_first_tuple(link, &amp;tuple) == CS_SUCCESS) {</div><div class='add'>+	if (pcmcia_get_first_tuple(link, &amp;tuple) == 0) {</div><div class='ctx'> 		pcmcia_get_tuple_data(link, &amp;tuple);</div><div class='ctx'> 		for (i = 0; i &lt; 3; i++)</div><div class='ctx'> 			phys_addr[i] = htons(le16_to_cpu(buf[i]));</div><div class='head'>diff --git a/drivers/net/pcmcia/3c589_cs.c b/drivers/net/pcmcia/3c589_cs.c<br/>index 549a64558420..c235cdba69c6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/pcmcia/3c589_cs.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/pcmcia/3c589_cs.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/pcmcia/3c589_cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/pcmcia/3c589_cs.c</a></div><div class='hunk'>@@ -15,7 +15,7 @@</div><div class='ctx'>     incorporated herein by reference.</div><div class='ctx'>     Donald Becker may be reached at becker@scyld.com</div><div class='ctx'>     </div><div class='del'>-    Updated for 2.5.x by Alan Cox &lt;alan@redhat.com&gt;</div><div class='add'>+    Updated for 2.5.x by Alan Cox &lt;alan@lxorguk.ukuu.org.uk&gt;</div><div class='ctx'> </div><div class='ctx'> ======================================================================*/</div><div class='ctx'> </div><div class='hunk'>@@ -278,9 +278,10 @@ static int tc589_config(struct pcmcia_device *link)</div><div class='ctx'> 	if (multi &amp;&amp; (j &amp; 0x80)) continue;</div><div class='ctx'> 	link-&gt;io.BasePort1 = j ^ 0x300;</div><div class='ctx'> 	i = pcmcia_request_io(link, &amp;link-&gt;io);</div><div class='del'>-	if (i == CS_SUCCESS) break;</div><div class='add'>+	if (i == 0)</div><div class='add'>+		break;</div><div class='ctx'>     }</div><div class='del'>-    if (i != CS_SUCCESS) {</div><div class='add'>+    if (i != 0) {</div><div class='ctx'> 	cs_error(link, RequestIO, i);</div><div class='ctx'> 	goto failed;</div><div class='ctx'>     }</div><div class='hunk'>@@ -295,7 +296,7 @@ static int tc589_config(struct pcmcia_device *link)</div><div class='ctx'>     /* The 3c589 has an extra EEPROM for configuration info, including</div><div class='ctx'>        the hardware address.  The 3c562 puts the address in the CIS. */</div><div class='ctx'>     tuple.DesiredTuple = 0x88;</div><div class='del'>-    if (pcmcia_get_first_tuple(link, &amp;tuple) == CS_SUCCESS) {</div><div class='add'>+    if (pcmcia_get_first_tuple(link, &amp;tuple) == 0) {</div><div class='ctx'> 	pcmcia_get_tuple_data(link, &amp;tuple);</div><div class='ctx'> 	for (i = 0; i &lt; 3; i++)</div><div class='ctx'> 	    phys_addr[i] = htons(le16_to_cpu(buf[i]));</div><div class='head'>diff --git a/drivers/net/pcmcia/Kconfig b/drivers/net/pcmcia/Kconfig<br/>index e8f55d8ed7a9..9b8f793b1cc8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/pcmcia/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/pcmcia/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/pcmcia/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/pcmcia/Kconfig</a></div><div class='hunk'>@@ -111,7 +111,7 @@ config ARCNET_COM20020_CS</div><div class='ctx'> </div><div class='ctx'> config PCMCIA_IBMTR</div><div class='ctx'> 	tristate "IBM PCMCIA tokenring adapter support"</div><div class='del'>-	depends on IBMTR!=y &amp;&amp; TR &amp;&amp; !64BIT</div><div class='add'>+	depends on IBMTR!=y &amp;&amp; TR</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say Y here if you intend to attach this type of Token Ring PCMCIA</div><div class='ctx'> 	  card to your computer. You then also need to say Y to "Token Ring</div><div class='head'>diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c<br/>index 52bf11b73c6e..b37a498939ae 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/pcmcia/axnet_cs.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/pcmcia/axnet_cs.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/pcmcia/axnet_cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/pcmcia/axnet_cs.c</a></div><div class='hunk'>@@ -262,7 +262,7 @@ static int try_io_port(struct pcmcia_device *link)</div><div class='ctx'> 	if (link-&gt;io.NumPorts2 &gt; 0) {</div><div class='ctx'> 	    /* for master/slave multifunction cards */</div><div class='ctx'> 	    link-&gt;io.Attributes2 = IO_DATA_PATH_WIDTH_8;</div><div class='del'>-	    link-&gt;irq.Attributes = </div><div class='add'>+	    link-&gt;irq.Attributes =</div><div class='ctx'> 		IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED;</div><div class='ctx'> 	}</div><div class='ctx'>     } else {</div><div class='hunk'>@@ -276,7 +276,8 @@ static int try_io_port(struct pcmcia_device *link)</div><div class='ctx'> 	    link-&gt;io.BasePort1 = j ^ 0x300;</div><div class='ctx'> 	    link-&gt;io.BasePort2 = (j ^ 0x300) + 0x10;</div><div class='ctx'> 	    ret = pcmcia_request_io(link, &amp;link-&gt;io);</div><div class='del'>-	    if (ret == CS_SUCCESS) return ret;</div><div class='add'>+	    if (ret == 0)</div><div class='add'>+		    return ret;</div><div class='ctx'> 	}</div><div class='ctx'> 	return ret;</div><div class='ctx'>     } else {</div><div class='hunk'>@@ -284,59 +285,50 @@ static int try_io_port(struct pcmcia_device *link)</div><div class='ctx'>     }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int axnet_configcheck(struct pcmcia_device *p_dev,</div><div class='add'>+			     cistpl_cftable_entry_t *cfg,</div><div class='add'>+			     cistpl_cftable_entry_t *dflt,</div><div class='add'>+			     unsigned int vcc,</div><div class='add'>+			     void *priv_data)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	cistpl_io_t *io = &amp;cfg-&gt;io;</div><div class='add'>+</div><div class='add'>+	if (cfg-&gt;index == 0 || cfg-&gt;io.nwin == 0)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	p_dev-&gt;conf.ConfigIndex = 0x05;</div><div class='add'>+	/* For multifunction cards, by convention, we configure the</div><div class='add'>+	   network function with window 0, and serial with window 1 */</div><div class='add'>+	if (io-&gt;nwin &gt; 1) {</div><div class='add'>+		i = (io-&gt;win[1].len &gt; io-&gt;win[0].len);</div><div class='add'>+		p_dev-&gt;io.BasePort2 = io-&gt;win[1-i].base;</div><div class='add'>+		p_dev-&gt;io.NumPorts2 = io-&gt;win[1-i].len;</div><div class='add'>+	} else {</div><div class='add'>+		i = p_dev-&gt;io.NumPorts2 = 0;</div><div class='add'>+	}</div><div class='add'>+	p_dev-&gt;io.BasePort1 = io-&gt;win[i].base;</div><div class='add'>+	p_dev-&gt;io.NumPorts1 = io-&gt;win[i].len;</div><div class='add'>+	p_dev-&gt;io.IOAddrLines = io-&gt;flags &amp; CISTPL_IO_LINES_MASK;</div><div class='add'>+	if (p_dev-&gt;io.NumPorts1 + p_dev-&gt;io.NumPorts2 &gt;= 32)</div><div class='add'>+		return try_io_port(p_dev);</div><div class='add'>+</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int axnet_config(struct pcmcia_device *link)</div><div class='ctx'> {</div><div class='ctx'>     struct net_device *dev = link-&gt;priv;</div><div class='ctx'>     axnet_dev_t *info = PRIV(dev);</div><div class='del'>-    tuple_t tuple;</div><div class='del'>-    cisparse_t parse;</div><div class='ctx'>     int i, j, last_ret, last_fn;</div><div class='del'>-    u_short buf[64];</div><div class='ctx'>     DECLARE_MAC_BUF(mac);</div><div class='ctx'> </div><div class='ctx'>     DEBUG(0, "axnet_config(0x%p)\n", link);</div><div class='ctx'> </div><div class='del'>-    tuple.Attributes = 0;</div><div class='del'>-    tuple.TupleData = (cisdata_t *)buf;</div><div class='del'>-    tuple.TupleDataMax = sizeof(buf);</div><div class='del'>-    tuple.TupleOffset = 0;</div><div class='del'>-</div><div class='ctx'>     /* don't trust the CIS on this; Linksys got it wrong */</div><div class='ctx'>     link-&gt;conf.Present = 0x63;</div><div class='del'>-</div><div class='del'>-    tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;</div><div class='del'>-    tuple.Attributes = 0;</div><div class='del'>-    CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &amp;tuple));</div><div class='del'>-    while (last_ret == CS_SUCCESS) {</div><div class='del'>-	cistpl_cftable_entry_t *cfg = &amp;(parse.cftable_entry);</div><div class='del'>-	cistpl_io_t *io = &amp;(parse.cftable_entry.io);</div><div class='del'>-	</div><div class='del'>-	if (pcmcia_get_tuple_data(link, &amp;tuple) != 0 ||</div><div class='del'>-		pcmcia_parse_tuple(link, &amp;tuple, &amp;parse) != 0 ||</div><div class='del'>-		cfg-&gt;index == 0 || cfg-&gt;io.nwin == 0)</div><div class='del'>-	    goto next_entry;</div><div class='del'>-	</div><div class='del'>-	link-&gt;conf.ConfigIndex = 0x05;</div><div class='del'>-	/* For multifunction cards, by convention, we configure the</div><div class='del'>-	   network function with window 0, and serial with window 1 */</div><div class='del'>-	if (io-&gt;nwin &gt; 1) {</div><div class='del'>-	    i = (io-&gt;win[1].len &gt; io-&gt;win[0].len);</div><div class='del'>-	    link-&gt;io.BasePort2 = io-&gt;win[1-i].base;</div><div class='del'>-	    link-&gt;io.NumPorts2 = io-&gt;win[1-i].len;</div><div class='del'>-	} else {</div><div class='del'>-	    i = link-&gt;io.NumPorts2 = 0;</div><div class='del'>-	}</div><div class='del'>-	link-&gt;io.BasePort1 = io-&gt;win[i].base;</div><div class='del'>-	link-&gt;io.NumPorts1 = io-&gt;win[i].len;</div><div class='del'>-	link-&gt;io.IOAddrLines = io-&gt;flags &amp; CISTPL_IO_LINES_MASK;</div><div class='del'>-	if (link-&gt;io.NumPorts1 + link-&gt;io.NumPorts2 &gt;= 32) {</div><div class='del'>-	    last_ret = try_io_port(link);</div><div class='del'>-	    if (last_ret == CS_SUCCESS) break;</div><div class='del'>-	}</div><div class='del'>-    next_entry:</div><div class='del'>-	last_ret = pcmcia_get_next_tuple(link, &amp;tuple);</div><div class='del'>-    }</div><div class='del'>-    if (last_ret != CS_SUCCESS) {</div><div class='add'>+    last_ret = pcmcia_loop_config(link, axnet_configcheck, NULL);</div><div class='add'>+    if (last_ret != 0) {</div><div class='ctx'> 	cs_error(link, RequestIO, last_ret);</div><div class='ctx'> 	goto failed;</div><div class='ctx'>     }</div><div class='head'>diff --git a/drivers/net/pcmcia/com20020_cs.c b/drivers/net/pcmcia/com20020_cs.c<br/>index ea9414c4d900..831090c75622 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/pcmcia/com20020_cs.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/pcmcia/com20020_cs.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/pcmcia/com20020_cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/pcmcia/com20020_cs.c</a></div><div class='hunk'>@@ -260,21 +260,21 @@ static int com20020_config(struct pcmcia_device *link)</div><div class='ctx'>     DEBUG(0, "com20020_config(0x%p)\n", link);</div><div class='ctx'> </div><div class='ctx'>     DEBUG(1,"arcnet: baseport1 is %Xh\n", link-&gt;io.BasePort1);</div><div class='del'>-    i = !CS_SUCCESS;</div><div class='add'>+    i = -ENODEV;</div><div class='ctx'>     if (!link-&gt;io.BasePort1)</div><div class='ctx'>     {</div><div class='ctx'> 	for (ioaddr = 0x100; ioaddr &lt; 0x400; ioaddr += 0x10)</div><div class='ctx'> 	{</div><div class='ctx'> 	    link-&gt;io.BasePort1 = ioaddr;</div><div class='ctx'> 	    i = pcmcia_request_io(link, &amp;link-&gt;io);</div><div class='del'>-	    if (i == CS_SUCCESS)</div><div class='add'>+	    if (i == 0)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'>     }</div><div class='ctx'>     else</div><div class='ctx'> 	i = pcmcia_request_io(link, &amp;link-&gt;io);</div><div class='ctx'>     </div><div class='del'>-    if (i != CS_SUCCESS)</div><div class='add'>+    if (i != 0)</div><div class='ctx'>     {</div><div class='ctx'> 	DEBUG(1,"arcnet: requestIO failed totally!\n");</div><div class='ctx'> 	goto failed;</div><div class='hunk'>@@ -287,7 +287,7 @@ static int com20020_config(struct pcmcia_device *link)</div><div class='ctx'> 	   link-&gt;irq.AssignedIRQ,</div><div class='ctx'> 	   link-&gt;irq.IRQInfo1, link-&gt;irq.IRQInfo2);</div><div class='ctx'>     i = pcmcia_request_irq(link, &amp;link-&gt;irq);</div><div class='del'>-    if (i != CS_SUCCESS)</div><div class='add'>+    if (i != 0)</div><div class='ctx'>     {</div><div class='ctx'> 	DEBUG(1,"arcnet: requestIRQ failed totally!\n");</div><div class='ctx'> 	goto failed;</div><div class='head'>diff --git a/drivers/net/pcmcia/fmvj18x_cs.c b/drivers/net/pcmcia/fmvj18x_cs.c<br/>index a550c9bd126f..69d916daa7bb 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/pcmcia/fmvj18x_cs.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/pcmcia/fmvj18x_cs.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/pcmcia/fmvj18x_cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/pcmcia/fmvj18x_cs.c</a></div><div class='hunk'>@@ -309,7 +309,8 @@ static int mfc_try_io_port(struct pcmcia_device *link)</div><div class='ctx'> 	    printk(KERN_NOTICE "fmvj18x_cs: out of resource for serial\n");</div><div class='ctx'> 	}</div><div class='ctx'> 	ret = pcmcia_request_io(link, &amp;link-&gt;io);</div><div class='del'>-	if (ret == CS_SUCCESS) return ret;</div><div class='add'>+	if (ret == 0)</div><div class='add'>+		return ret;</div><div class='ctx'>     }</div><div class='ctx'>     return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -325,7 +326,7 @@ static int ungermann_try_io_port(struct pcmcia_device *link)</div><div class='ctx'>     for (ioaddr = 0x300; ioaddr &lt; 0x3e0; ioaddr += 0x20) {</div><div class='ctx'> 	link-&gt;io.BasePort1 = ioaddr;</div><div class='ctx'> 	ret = pcmcia_request_io(link, &amp;link-&gt;io);</div><div class='del'>-	if (ret == CS_SUCCESS) {</div><div class='add'>+	if (ret == 0) {</div><div class='ctx'> 	    /* calculate ConfigIndex value */</div><div class='ctx'> 	    link-&gt;conf.ConfigIndex = </div><div class='ctx'> 		((link-&gt;io.BasePort1 &amp; 0x0f0) &gt;&gt; 3) | 0x22;</div><div class='hunk'>@@ -356,12 +357,12 @@ static int fmvj18x_config(struct pcmcia_device *link)</div><div class='ctx'>     tuple.TupleOffset = 0;</div><div class='ctx'>     tuple.DesiredTuple = CISTPL_FUNCE;</div><div class='ctx'>     tuple.TupleOffset = 0;</div><div class='del'>-    if (pcmcia_get_first_tuple(link, &amp;tuple) == CS_SUCCESS) {</div><div class='add'>+    if (pcmcia_get_first_tuple(link, &amp;tuple) == 0) {</div><div class='ctx'> 	/* Yes, I have CISTPL_FUNCE. Let's check CISTPL_MANFID */</div><div class='ctx'> 	tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;</div><div class='ctx'> 	CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &amp;tuple));</div><div class='ctx'> 	CS_CHECK(GetTupleData, pcmcia_get_tuple_data(link, &amp;tuple));</div><div class='del'>-	CS_CHECK(ParseTuple, pcmcia_parse_tuple(link, &amp;tuple, &amp;parse));</div><div class='add'>+	CS_CHECK(ParseTuple, pcmcia_parse_tuple(&amp;tuple, &amp;parse));</div><div class='ctx'> 	link-&gt;conf.ConfigIndex = parse.cftable_entry.index;</div><div class='ctx'> 	switch (link-&gt;manf_id) {</div><div class='ctx'> 	case MANFID_TDK:</div><div class='hunk'>@@ -430,10 +431,10 @@ static int fmvj18x_config(struct pcmcia_device *link)</div><div class='ctx'>     	link-&gt;irq.Attributes =</div><div class='ctx'> 		IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED|IRQ_HANDLE_PRESENT;</div><div class='ctx'> 	ret = mfc_try_io_port(link);</div><div class='del'>-	if (ret != CS_SUCCESS) goto cs_failed;</div><div class='add'>+	if (ret != 0) goto cs_failed;</div><div class='ctx'>     } else if (cardtype == UNGERMANN) {</div><div class='ctx'> 	ret = ungermann_try_io_port(link);</div><div class='del'>-	if (ret != CS_SUCCESS) goto cs_failed;</div><div class='add'>+	if (ret != 0) goto cs_failed;</div><div class='ctx'>     } else { </div><div class='ctx'> 	CS_CHECK(RequestIO, pcmcia_request_io(link, &amp;link-&gt;io));</div><div class='ctx'>     }</div><div class='hunk'>@@ -565,7 +566,7 @@ static int fmvj18x_get_hwinfo(struct pcmcia_device *link, u_char *node_id)</div><div class='ctx'>     req.Base = 0; req.Size = 0;</div><div class='ctx'>     req.AccessSpeed = 0;</div><div class='ctx'>     i = pcmcia_request_window(&amp;link, &amp;req, &amp;link-&gt;win);</div><div class='del'>-    if (i != CS_SUCCESS) {</div><div class='add'>+    if (i != 0) {</div><div class='ctx'> 	cs_error(link, RequestWindow, i);</div><div class='ctx'> 	return -1;</div><div class='ctx'>     }</div><div class='hunk'>@@ -599,7 +600,7 @@ static int fmvj18x_get_hwinfo(struct pcmcia_device *link, u_char *node_id)</div><div class='ctx'> </div><div class='ctx'>     iounmap(base);</div><div class='ctx'>     j = pcmcia_release_window(link-&gt;win);</div><div class='del'>-    if (j != CS_SUCCESS)</div><div class='add'>+    if (j != 0)</div><div class='ctx'> 	cs_error(link, ReleaseWindow, j);</div><div class='ctx'>     return (i != 0x200) ? 0 : -1;</div><div class='ctx'> </div><div class='hunk'>@@ -620,7 +621,7 @@ static int fmvj18x_setup_mfc(struct pcmcia_device *link)</div><div class='ctx'>     req.Base = 0; req.Size = 0;</div><div class='ctx'>     req.AccessSpeed = 0;</div><div class='ctx'>     i = pcmcia_request_window(&amp;link, &amp;req, &amp;link-&gt;win);</div><div class='del'>-    if (i != CS_SUCCESS) {</div><div class='add'>+    if (i != 0) {</div><div class='ctx'> 	cs_error(link, RequestWindow, i);</div><div class='ctx'> 	return -1;</div><div class='ctx'>     }</div><div class='hunk'>@@ -642,7 +643,7 @@ static int fmvj18x_setup_mfc(struct pcmcia_device *link)</div><div class='ctx'> </div><div class='ctx'>     iounmap(base);</div><div class='ctx'>     j = pcmcia_release_window(link-&gt;win);</div><div class='del'>-    if (j != CS_SUCCESS)</div><div class='add'>+    if (j != 0)</div><div class='ctx'> 	cs_error(link, ReleaseWindow, j);</div><div class='ctx'>     return 0;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/pcmcia/ibmtr_cs.c b/drivers/net/pcmcia/ibmtr_cs.c<br/>index 4eafa4f42cff..cf3cca4642f2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/pcmcia/ibmtr_cs.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/pcmcia/ibmtr_cs.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/pcmcia/ibmtr_cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/pcmcia/ibmtr_cs.c</a></div><div class='hunk'>@@ -238,7 +238,7 @@ static int __devinit ibmtr_config(struct pcmcia_device *link)</div><div class='ctx'>     /* Try PRIMARY card at 0xA20-0xA23 */</div><div class='ctx'>     link-&gt;io.BasePort1 = 0xA20;</div><div class='ctx'>     i = pcmcia_request_io(link, &amp;link-&gt;io);</div><div class='del'>-    if (i != CS_SUCCESS) {</div><div class='add'>+    if (i != 0) {</div><div class='ctx'> 	/* Couldn't get 0xA20-0xA23.  Try ALTERNATE at 0xA24-0xA27. */</div><div class='ctx'> 	link-&gt;io.BasePort1 = 0xA24;</div><div class='ctx'> 	CS_CHECK(RequestIO, pcmcia_request_io(link, &amp;link-&gt;io));</div><div class='head'>diff --git a/drivers/net/pcmcia/nmclan_cs.c b/drivers/net/pcmcia/nmclan_cs.c<br/>index cfcbea9b7e2e..448cd40aeba5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/pcmcia/nmclan_cs.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/pcmcia/nmclan_cs.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/pcmcia/nmclan_cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/pcmcia/nmclan_cs.c</a></div><div class='hunk'>@@ -69,7 +69,7 @@ Driver Notes and Issues</div><div class='ctx'> History</div><div class='ctx'> -------------------------------------------------------------------------------</div><div class='ctx'> Log: nmclan_cs.c,v</div><div class='del'>- * 2.5.75-ac1 2003/07/11 Alan Cox &lt;alan@redhat.com&gt;</div><div class='add'>+ * 2.5.75-ac1 2003/07/11 Alan Cox &lt;alan@lxorguk.ukuu.org.uk&gt;</div><div class='ctx'>  * Fixed hang on card eject as we probe it</div><div class='ctx'>  * Cleaned up to use new style locking.</div><div class='ctx'>  *</div><div class='hunk'>@@ -925,7 +925,7 @@ static void mace_tx_timeout(struct net_device *dev)</div><div class='ctx'>   printk(KERN_NOTICE "%s: transmit timed out -- ", dev-&gt;name);</div><div class='ctx'> #if RESET_ON_TIMEOUT</div><div class='ctx'>   printk("resetting card\n");</div><div class='del'>-  pcmcia_reset_card(link, NULL);</div><div class='add'>+  pcmcia_reset_card(link-&gt;socket);</div><div class='ctx'> #else /* #if RESET_ON_TIMEOUT */</div><div class='ctx'>   printk("NOT resetting card\n");</div><div class='ctx'> #endif /* #if RESET_ON_TIMEOUT */</div><div class='head'>diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/pcmcia/pcnet_cs.c<br/>index ebc1ae6bcbe5..e40d6301aa7a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/pcmcia/pcnet_cs.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/pcmcia/pcnet_cs.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/pcmcia/pcnet_cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/pcmcia/pcnet_cs.c</a></div><div class='hunk'>@@ -310,7 +310,7 @@ static hw_info_t *get_hwinfo(struct pcmcia_device *link)</div><div class='ctx'>     req.Base = 0; req.Size = 0;</div><div class='ctx'>     req.AccessSpeed = 0;</div><div class='ctx'>     i = pcmcia_request_window(&amp;link, &amp;req, &amp;link-&gt;win);</div><div class='del'>-    if (i != CS_SUCCESS) {</div><div class='add'>+    if (i != 0) {</div><div class='ctx'> 	cs_error(link, RequestWindow, i);</div><div class='ctx'> 	return NULL;</div><div class='ctx'>     }</div><div class='hunk'>@@ -333,7 +333,7 @@ static hw_info_t *get_hwinfo(struct pcmcia_device *link)</div><div class='ctx'> </div><div class='ctx'>     iounmap(virt);</div><div class='ctx'>     j = pcmcia_release_window(link-&gt;win);</div><div class='del'>-    if (j != CS_SUCCESS)</div><div class='add'>+    if (j != 0)</div><div class='ctx'> 	cs_error(link, ReleaseWindow, j);</div><div class='ctx'>     return (i &lt; NR_INFO) ? hw_info+i : NULL;</div><div class='ctx'> } /* get_hwinfo */</div><div class='hunk'>@@ -504,7 +504,8 @@ static int try_io_port(struct pcmcia_device *link)</div><div class='ctx'> 	    link-&gt;io.BasePort1 = j ^ 0x300;</div><div class='ctx'> 	    link-&gt;io.BasePort2 = (j ^ 0x300) + 0x10;</div><div class='ctx'> 	    ret = pcmcia_request_io(link, &amp;link-&gt;io);</div><div class='del'>-	    if (ret == CS_SUCCESS) return ret;</div><div class='add'>+	    if (ret == 0)</div><div class='add'>+		    return ret;</div><div class='ctx'> 	}</div><div class='ctx'> 	return ret;</div><div class='ctx'>     } else {</div><div class='hunk'>@@ -512,58 +513,53 @@ static int try_io_port(struct pcmcia_device *link)</div><div class='ctx'>     }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int pcnet_confcheck(struct pcmcia_device *p_dev,</div><div class='add'>+			   cistpl_cftable_entry_t *cfg,</div><div class='add'>+			   cistpl_cftable_entry_t *dflt,</div><div class='add'>+			   unsigned int vcc,</div><div class='add'>+			   void *priv_data)</div><div class='add'>+{</div><div class='add'>+	int *has_shmem = priv_data;</div><div class='add'>+	int i;</div><div class='add'>+	cistpl_io_t *io = &amp;cfg-&gt;io;</div><div class='add'>+</div><div class='add'>+	if (cfg-&gt;index == 0 || cfg-&gt;io.nwin == 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* For multifunction cards, by convention, we configure the</div><div class='add'>+	   network function with window 0, and serial with window 1 */</div><div class='add'>+	if (io-&gt;nwin &gt; 1) {</div><div class='add'>+		i = (io-&gt;win[1].len &gt; io-&gt;win[0].len);</div><div class='add'>+		p_dev-&gt;io.BasePort2 = io-&gt;win[1-i].base;</div><div class='add'>+		p_dev-&gt;io.NumPorts2 = io-&gt;win[1-i].len;</div><div class='add'>+	} else {</div><div class='add'>+		i = p_dev-&gt;io.NumPorts2 = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*has_shmem = ((cfg-&gt;mem.nwin == 1) &amp;&amp;</div><div class='add'>+		      (cfg-&gt;mem.win[0].len &gt;= 0x4000));</div><div class='add'>+	p_dev-&gt;io.BasePort1 = io-&gt;win[i].base;</div><div class='add'>+	p_dev-&gt;io.NumPorts1 = io-&gt;win[i].len;</div><div class='add'>+	p_dev-&gt;io.IOAddrLines = io-&gt;flags &amp; CISTPL_IO_LINES_MASK;</div><div class='add'>+	if (p_dev-&gt;io.NumPorts1 + p_dev-&gt;io.NumPorts2 &gt;= 32)</div><div class='add'>+		return try_io_port(p_dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int pcnet_config(struct pcmcia_device *link)</div><div class='ctx'> {</div><div class='ctx'>     struct net_device *dev = link-&gt;priv;</div><div class='ctx'>     pcnet_dev_t *info = PRIV(dev);</div><div class='del'>-    tuple_t tuple;</div><div class='del'>-    cisparse_t parse;</div><div class='del'>-    int i, last_ret, last_fn, start_pg, stop_pg, cm_offset;</div><div class='add'>+    int last_ret, last_fn, start_pg, stop_pg, cm_offset;</div><div class='ctx'>     int has_shmem = 0;</div><div class='del'>-    u_short buf[64];</div><div class='ctx'>     hw_info_t *local_hw_info;</div><div class='ctx'>     DECLARE_MAC_BUF(mac);</div><div class='ctx'> </div><div class='ctx'>     DEBUG(0, "pcnet_config(0x%p)\n", link);</div><div class='ctx'> </div><div class='del'>-    tuple.TupleData = (cisdata_t *)buf;</div><div class='del'>-    tuple.TupleDataMax = sizeof(buf);</div><div class='del'>-    tuple.TupleOffset = 0;</div><div class='del'>-    tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;</div><div class='del'>-    tuple.Attributes = 0;</div><div class='del'>-    CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &amp;tuple));</div><div class='del'>-    while (last_ret == CS_SUCCESS) {</div><div class='del'>-	cistpl_cftable_entry_t *cfg = &amp;(parse.cftable_entry);</div><div class='del'>-	cistpl_io_t *io = &amp;(parse.cftable_entry.io);</div><div class='del'>-</div><div class='del'>-	if (pcmcia_get_tuple_data(link, &amp;tuple) != 0 ||</div><div class='del'>-			pcmcia_parse_tuple(link, &amp;tuple, &amp;parse) != 0 ||</div><div class='del'>-			cfg-&gt;index == 0 || cfg-&gt;io.nwin == 0)</div><div class='del'>-		goto next_entry;</div><div class='del'>-</div><div class='del'>-	link-&gt;conf.ConfigIndex = cfg-&gt;index;</div><div class='del'>-	/* For multifunction cards, by convention, we configure the</div><div class='del'>-	   network function with window 0, and serial with window 1 */</div><div class='del'>-	if (io-&gt;nwin &gt; 1) {</div><div class='del'>-	    i = (io-&gt;win[1].len &gt; io-&gt;win[0].len);</div><div class='del'>-	    link-&gt;io.BasePort2 = io-&gt;win[1-i].base;</div><div class='del'>-	    link-&gt;io.NumPorts2 = io-&gt;win[1-i].len;</div><div class='del'>-	} else {</div><div class='del'>-	    i = link-&gt;io.NumPorts2 = 0;</div><div class='del'>-	}</div><div class='del'>-	has_shmem = ((cfg-&gt;mem.nwin == 1) &amp;&amp;</div><div class='del'>-		     (cfg-&gt;mem.win[0].len &gt;= 0x4000));</div><div class='del'>-	link-&gt;io.BasePort1 = io-&gt;win[i].base;</div><div class='del'>-	link-&gt;io.NumPorts1 = io-&gt;win[i].len;</div><div class='del'>-	link-&gt;io.IOAddrLines = io-&gt;flags &amp; CISTPL_IO_LINES_MASK;</div><div class='del'>-	if (link-&gt;io.NumPorts1 + link-&gt;io.NumPorts2 &gt;= 32) {</div><div class='del'>-	    last_ret = try_io_port(link);</div><div class='del'>-	    if (last_ret == CS_SUCCESS) break;</div><div class='del'>-	}</div><div class='del'>-    next_entry:</div><div class='del'>-	last_ret = pcmcia_get_next_tuple(link, &amp;tuple);</div><div class='del'>-    }</div><div class='del'>-    if (last_ret != CS_SUCCESS) {</div><div class='add'>+    last_ret = pcmcia_loop_config(link, pcnet_confcheck, &amp;has_shmem);</div><div class='add'>+    if (last_ret) {</div><div class='ctx'> 	cs_error(link, RequestIO, last_ret);</div><div class='ctx'> 	goto failed;</div><div class='ctx'>     }</div><div class='head'>diff --git a/drivers/net/pcmcia/smc91c92_cs.c b/drivers/net/pcmcia/smc91c92_cs.c<br/>index 250eb1954c34..c74d6656d266 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/pcmcia/smc91c92_cs.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/pcmcia/smc91c92_cs.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/pcmcia/smc91c92_cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/pcmcia/smc91c92_cs.c</a></div><div class='hunk'>@@ -409,10 +409,13 @@ static int first_tuple(struct pcmcia_device *handle, tuple_t *tuple,</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	if ((i = pcmcia_get_first_tuple(handle, tuple)) != CS_SUCCESS ||</div><div class='del'>-			(i = pcmcia_get_tuple_data(handle, tuple)) != CS_SUCCESS)</div><div class='add'>+	i = pcmcia_get_first_tuple(handle, tuple);</div><div class='add'>+	if (i != 0)</div><div class='ctx'> 		return i;</div><div class='del'>-	return pcmcia_parse_tuple(handle, tuple, parse);</div><div class='add'>+	i = pcmcia_get_tuple_data(handle, tuple);</div><div class='add'>+	if (i != 0)</div><div class='add'>+		return i;</div><div class='add'>+	return pcmcia_parse_tuple(tuple, parse);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int next_tuple(struct pcmcia_device *handle, tuple_t *tuple,</div><div class='hunk'>@@ -420,10 +423,10 @@ static int next_tuple(struct pcmcia_device *handle, tuple_t *tuple,</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	if ((i = pcmcia_get_next_tuple(handle, tuple)) != CS_SUCCESS ||</div><div class='del'>-			(i = pcmcia_get_tuple_data(handle, tuple)) != CS_SUCCESS)</div><div class='add'>+	if ((i = pcmcia_get_next_tuple(handle, tuple)) != 0 ||</div><div class='add'>+			(i = pcmcia_get_tuple_data(handle, tuple)) != 0)</div><div class='ctx'> 		return i;</div><div class='del'>-	return pcmcia_parse_tuple(handle, tuple, parse);</div><div class='add'>+	return pcmcia_parse_tuple(tuple, parse);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*======================================================================</div><div class='hunk'>@@ -459,27 +462,36 @@ static int mhz_3288_power(struct pcmcia_device *link)</div><div class='ctx'>     return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int mhz_mfc_config_check(struct pcmcia_device *p_dev,</div><div class='add'>+				cistpl_cftable_entry_t *cf,</div><div class='add'>+				cistpl_cftable_entry_t *dflt,</div><div class='add'>+				unsigned int vcc,</div><div class='add'>+				void *priv_data)</div><div class='add'>+{</div><div class='add'>+	int k;</div><div class='add'>+	p_dev-&gt;io.BasePort2 = cf-&gt;io.win[0].base;</div><div class='add'>+	for (k = 0; k &lt; 0x400; k += 0x10) {</div><div class='add'>+		if (k &amp; 0x80)</div><div class='add'>+			continue;</div><div class='add'>+		p_dev-&gt;io.BasePort1 = k ^ 0x300;</div><div class='add'>+		if (!pcmcia_request_io(p_dev, &amp;p_dev-&gt;io))</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int mhz_mfc_config(struct pcmcia_device *link)</div><div class='ctx'> {</div><div class='ctx'>     struct net_device *dev = link-&gt;priv;</div><div class='ctx'>     struct smc_private *smc = netdev_priv(dev);</div><div class='ctx'>     struct smc_cfg_mem *cfg_mem;</div><div class='del'>-    tuple_t *tuple;</div><div class='del'>-    cisparse_t *parse;</div><div class='del'>-    cistpl_cftable_entry_t *cf;</div><div class='del'>-    u_char *buf;</div><div class='ctx'>     win_req_t req;</div><div class='ctx'>     memreq_t mem;</div><div class='del'>-    int i, k;</div><div class='add'>+    int i;</div><div class='ctx'> </div><div class='ctx'>     cfg_mem = kmalloc(sizeof(struct smc_cfg_mem), GFP_KERNEL);</div><div class='ctx'>     if (!cfg_mem)</div><div class='del'>-        return CS_OUT_OF_RESOURCE;</div><div class='del'>-</div><div class='del'>-    tuple = &amp;cfg_mem-&gt;tuple;</div><div class='del'>-    parse = &amp;cfg_mem-&gt;parse;</div><div class='del'>-    cf = &amp;parse-&gt;cftable_entry;</div><div class='del'>-    buf = cfg_mem-&gt;buf;</div><div class='add'>+	    return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'>     link-&gt;conf.Attributes |= CONF_ENABLE_SPKR;</div><div class='ctx'>     link-&gt;conf.Status = CCSR_AUDIO_ENA;</div><div class='hunk'>@@ -489,27 +501,9 @@ static int mhz_mfc_config(struct pcmcia_device *link)</div><div class='ctx'>     link-&gt;io.Attributes2 = IO_DATA_PATH_WIDTH_8;</div><div class='ctx'>     link-&gt;io.NumPorts2 = 8;</div><div class='ctx'> </div><div class='del'>-    tuple-&gt;Attributes = tuple-&gt;TupleOffset = 0;</div><div class='del'>-    tuple-&gt;TupleData = (cisdata_t *)buf;</div><div class='del'>-    tuple-&gt;TupleDataMax = 255;</div><div class='del'>-    tuple-&gt;DesiredTuple = CISTPL_CFTABLE_ENTRY;</div><div class='del'>-</div><div class='del'>-    i = first_tuple(link, tuple, parse);</div><div class='ctx'>     /* The Megahertz combo cards have modem-like CIS entries, so</div><div class='ctx'>        we have to explicitly try a bunch of port combinations. */</div><div class='del'>-    while (i == CS_SUCCESS) {</div><div class='del'>-	link-&gt;conf.ConfigIndex = cf-&gt;index;</div><div class='del'>-	link-&gt;io.BasePort2 = cf-&gt;io.win[0].base;</div><div class='del'>-	for (k = 0; k &lt; 0x400; k += 0x10) {</div><div class='del'>-	    if (k &amp; 0x80) continue;</div><div class='del'>-	    link-&gt;io.BasePort1 = k ^ 0x300;</div><div class='del'>-	    i = pcmcia_request_io(link, &amp;link-&gt;io);</div><div class='del'>-	    if (i == CS_SUCCESS) break;</div><div class='del'>-	}</div><div class='del'>-	if (i == CS_SUCCESS) break;</div><div class='del'>-	i = next_tuple(link, tuple, parse);</div><div class='del'>-    }</div><div class='del'>-    if (i != CS_SUCCESS)</div><div class='add'>+    if (pcmcia_loop_config(link, mhz_mfc_config_check, NULL))</div><div class='ctx'> 	goto free_cfg_mem;</div><div class='ctx'>     dev-&gt;base_addr = link-&gt;io.BasePort1;</div><div class='ctx'> </div><div class='hunk'>@@ -518,7 +512,7 @@ static int mhz_mfc_config(struct pcmcia_device *link)</div><div class='ctx'>     req.Base = req.Size = 0;</div><div class='ctx'>     req.AccessSpeed = 0;</div><div class='ctx'>     i = pcmcia_request_window(&amp;link, &amp;req, &amp;link-&gt;win);</div><div class='del'>-    if (i != CS_SUCCESS)</div><div class='add'>+    if (i != 0)</div><div class='ctx'> 	goto free_cfg_mem;</div><div class='ctx'>     smc-&gt;base = ioremap(req.Base, req.Size);</div><div class='ctx'>     mem.CardOffset = mem.Page = 0;</div><div class='hunk'>@@ -526,14 +520,14 @@ static int mhz_mfc_config(struct pcmcia_device *link)</div><div class='ctx'> 	mem.CardOffset = link-&gt;conf.ConfigBase;</div><div class='ctx'>     i = pcmcia_map_mem_page(link-&gt;win, &amp;mem);</div><div class='ctx'> </div><div class='del'>-    if ((i == CS_SUCCESS)</div><div class='add'>+    if ((i == 0)</div><div class='ctx'> 	&amp;&amp; (smc-&gt;manfid == MANFID_MEGAHERTZ)</div><div class='ctx'> 	&amp;&amp; (smc-&gt;cardid == PRODID_MEGAHERTZ_EM3288))</div><div class='ctx'> 	mhz_3288_power(link);</div><div class='ctx'> </div><div class='ctx'> free_cfg_mem:</div><div class='ctx'>     kfree(cfg_mem);</div><div class='del'>-    return i;</div><div class='add'>+    return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mhz_setup(struct pcmcia_device *link)</div><div class='hunk'>@@ -560,12 +554,12 @@ static int mhz_setup(struct pcmcia_device *link)</div><div class='ctx'>     /* Read the station address from the CIS.  It is stored as the last</div><div class='ctx'>        (fourth) string in the Version 1 Version/ID tuple. */</div><div class='ctx'>     tuple-&gt;DesiredTuple = CISTPL_VERS_1;</div><div class='del'>-    if (first_tuple(link, tuple, parse) != CS_SUCCESS) {</div><div class='add'>+    if (first_tuple(link, tuple, parse) != 0) {</div><div class='ctx'> 	rc = -1;</div><div class='ctx'> 	goto free_cfg_mem;</div><div class='ctx'>     }</div><div class='ctx'>     /* Ugh -- the EM1144 card has two VERS_1 tuples!?! */</div><div class='del'>-    if (next_tuple(link, tuple, parse) != CS_SUCCESS)</div><div class='add'>+    if (next_tuple(link, tuple, parse) != 0)</div><div class='ctx'> 	first_tuple(link, tuple, parse);</div><div class='ctx'>     if (parse-&gt;version_1.ns &gt; 3) {</div><div class='ctx'> 	station_addr = parse-&gt;version_1.str + parse-&gt;version_1.ofs[3];</div><div class='hunk'>@@ -577,11 +571,11 @@ static int mhz_setup(struct pcmcia_device *link)</div><div class='ctx'> </div><div class='ctx'>     /* Another possibility: for the EM3288, in a special tuple */</div><div class='ctx'>     tuple-&gt;DesiredTuple = 0x81;</div><div class='del'>-    if (pcmcia_get_first_tuple(link, tuple) != CS_SUCCESS) {</div><div class='add'>+    if (pcmcia_get_first_tuple(link, tuple) != 0) {</div><div class='ctx'> 	rc = -1;</div><div class='ctx'> 	goto free_cfg_mem;</div><div class='ctx'>     }</div><div class='del'>-    if (pcmcia_get_tuple_data(link, tuple) != CS_SUCCESS) {</div><div class='add'>+    if (pcmcia_get_tuple_data(link, tuple) != 0) {</div><div class='ctx'> 	rc = -1;</div><div class='ctx'> 	goto free_cfg_mem;</div><div class='ctx'>     }</div><div class='hunk'>@@ -660,46 +654,27 @@ static int mot_setup(struct pcmcia_device *link)</div><div class='ctx'> </div><div class='ctx'> /*====================================================================*/</div><div class='ctx'> </div><div class='add'>+static int smc_configcheck(struct pcmcia_device *p_dev,</div><div class='add'>+			   cistpl_cftable_entry_t *cf,</div><div class='add'>+			   cistpl_cftable_entry_t *dflt,</div><div class='add'>+			   unsigned int vcc,</div><div class='add'>+			   void *priv_data)</div><div class='add'>+{</div><div class='add'>+	p_dev-&gt;io.BasePort1 = cf-&gt;io.win[0].base;</div><div class='add'>+	p_dev-&gt;io.IOAddrLines = cf-&gt;io.flags &amp; CISTPL_IO_LINES_MASK;</div><div class='add'>+	return pcmcia_request_io(p_dev, &amp;p_dev-&gt;io);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int smc_config(struct pcmcia_device *link)</div><div class='ctx'> {</div><div class='ctx'>     struct net_device *dev = link-&gt;priv;</div><div class='del'>-    struct smc_cfg_mem *cfg_mem;</div><div class='del'>-    tuple_t *tuple;</div><div class='del'>-    cisparse_t *parse;</div><div class='del'>-    cistpl_cftable_entry_t *cf;</div><div class='del'>-    u_char *buf;</div><div class='ctx'>     int i;</div><div class='ctx'> </div><div class='del'>-    cfg_mem = kmalloc(sizeof(struct smc_cfg_mem), GFP_KERNEL);</div><div class='del'>-    if (!cfg_mem)</div><div class='del'>-	return CS_OUT_OF_RESOURCE;</div><div class='del'>-</div><div class='del'>-    tuple = &amp;cfg_mem-&gt;tuple;</div><div class='del'>-    parse = &amp;cfg_mem-&gt;parse;</div><div class='del'>-    cf = &amp;parse-&gt;cftable_entry;</div><div class='del'>-    buf = cfg_mem-&gt;buf;</div><div class='del'>-</div><div class='del'>-    tuple-&gt;Attributes = tuple-&gt;TupleOffset = 0;</div><div class='del'>-    tuple-&gt;TupleData = (cisdata_t *)buf;</div><div class='del'>-    tuple-&gt;TupleDataMax = 255;</div><div class='del'>-    tuple-&gt;DesiredTuple = CISTPL_CFTABLE_ENTRY;</div><div class='del'>-</div><div class='ctx'>     link-&gt;io.NumPorts1 = 16;</div><div class='del'>-    i = first_tuple(link, tuple, parse);</div><div class='del'>-    while (i != CS_NO_MORE_ITEMS) {</div><div class='del'>-	if (i == CS_SUCCESS) {</div><div class='del'>-	    link-&gt;conf.ConfigIndex = cf-&gt;index;</div><div class='del'>-	    link-&gt;io.BasePort1 = cf-&gt;io.win[0].base;</div><div class='del'>-	    link-&gt;io.IOAddrLines = cf-&gt;io.flags &amp; CISTPL_IO_LINES_MASK;</div><div class='del'>-	    i = pcmcia_request_io(link, &amp;link-&gt;io);</div><div class='del'>-	    if (i == CS_SUCCESS) break;</div><div class='del'>-	}</div><div class='del'>-	i = next_tuple(link, tuple, parse);</div><div class='del'>-    }</div><div class='del'>-    if (i == CS_SUCCESS)</div><div class='del'>-	dev-&gt;base_addr = link-&gt;io.BasePort1;</div><div class='add'>+    i = pcmcia_loop_config(link, smc_configcheck, NULL);</div><div class='add'>+    if (!i)</div><div class='add'>+	    dev-&gt;base_addr = link-&gt;io.BasePort1;</div><div class='ctx'> </div><div class='del'>-    kfree(cfg_mem);</div><div class='ctx'>     return i;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -715,7 +690,7 @@ static int smc_setup(struct pcmcia_device *link)</div><div class='ctx'> </div><div class='ctx'>     cfg_mem = kmalloc(sizeof(struct smc_cfg_mem), GFP_KERNEL);</div><div class='ctx'>     if (!cfg_mem)</div><div class='del'>-	return CS_OUT_OF_RESOURCE;</div><div class='add'>+	    return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'>     tuple = &amp;cfg_mem-&gt;tuple;</div><div class='ctx'>     parse = &amp;cfg_mem-&gt;parse;</div><div class='hunk'>@@ -728,12 +703,12 @@ static int smc_setup(struct pcmcia_device *link)</div><div class='ctx'>     /* Check for a LAN function extension tuple */</div><div class='ctx'>     tuple-&gt;DesiredTuple = CISTPL_FUNCE;</div><div class='ctx'>     i = first_tuple(link, tuple, parse);</div><div class='del'>-    while (i == CS_SUCCESS) {</div><div class='add'>+    while (i == 0) {</div><div class='ctx'> 	if (parse-&gt;funce.type == CISTPL_FUNCE_LAN_NODE_ID)</div><div class='ctx'> 	    break;</div><div class='ctx'> 	i = next_tuple(link, tuple, parse);</div><div class='ctx'>     }</div><div class='del'>-    if (i == CS_SUCCESS) {</div><div class='add'>+    if (i == 0) {</div><div class='ctx'> 	node_id = (cistpl_lan_node_id_t *)parse-&gt;funce.data;</div><div class='ctx'> 	if (node_id-&gt;nb == 6) {</div><div class='ctx'> 	    for (i = 0; i &lt; 6; i++)</div><div class='hunk'>@@ -780,9 +755,10 @@ static int osi_config(struct pcmcia_device *link)</div><div class='ctx'>     for (i = j = 0; j &lt; 4; j++) {</div><div class='ctx'> 	link-&gt;io.BasePort2 = com[j];</div><div class='ctx'> 	i = pcmcia_request_io(link, &amp;link-&gt;io);</div><div class='del'>-	if (i == CS_SUCCESS) break;</div><div class='add'>+	if (i == 0)</div><div class='add'>+		break;</div><div class='ctx'>     }</div><div class='del'>-    if (i != CS_SUCCESS) {</div><div class='add'>+    if (i != 0) {</div><div class='ctx'> 	/* Fallback: turn off hard decode */</div><div class='ctx'> 	link-&gt;conf.ConfigIndex = 0x03;</div><div class='ctx'> 	link-&gt;io.NumPorts2 = 0;</div><div class='hunk'>@@ -815,13 +791,13 @@ static int osi_setup(struct pcmcia_device *link, u_short manfid, u_short cardid)</div><div class='ctx'>     /* Read the station address from tuple 0x90, subtuple 0x04 */</div><div class='ctx'>     tuple-&gt;DesiredTuple = 0x90;</div><div class='ctx'>     i = pcmcia_get_first_tuple(link, tuple);</div><div class='del'>-    while (i == CS_SUCCESS) {</div><div class='add'>+    while (i == 0) {</div><div class='ctx'> 	i = pcmcia_get_tuple_data(link, tuple);</div><div class='del'>-	if ((i != CS_SUCCESS) || (buf[0] == 0x04))</div><div class='add'>+	if ((i != 0) || (buf[0] == 0x04))</div><div class='ctx'> 	    break;</div><div class='ctx'> 	i = pcmcia_get_next_tuple(link, tuple);</div><div class='ctx'>     }</div><div class='del'>-    if (i != CS_SUCCESS) {</div><div class='add'>+    if (i != 0) {</div><div class='ctx'> 	rc = -1;</div><div class='ctx'> 	goto free_cfg_mem;</div><div class='ctx'>     }</div><div class='hunk'>@@ -959,8 +935,11 @@ static int check_sig(struct pcmcia_device *link)</div><div class='ctx'> </div><div class='ctx'> ======================================================================*/</div><div class='ctx'> </div><div class='del'>-#define CS_EXIT_TEST(ret, svc, label) \</div><div class='del'>-if (ret != CS_SUCCESS) { cs_error(link, svc, ret); goto label; }</div><div class='add'>+#define CS_EXIT_TEST(ret, svc, label)	\</div><div class='add'>+if (ret != 0) {				\</div><div class='add'>+	cs_error(link, svc, ret);	\</div><div class='add'>+	goto label; 			\</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static int smc91c92_config(struct pcmcia_device *link)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/net/pcmcia/xirc2ps_cs.c b/drivers/net/pcmcia/xirc2ps_cs.c<br/>index f6c4698ce738..e1fd585e7131 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/pcmcia/xirc2ps_cs.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/pcmcia/xirc2ps_cs.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/pcmcia/xirc2ps_cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/pcmcia/xirc2ps_cs.c</a></div><div class='hunk'>@@ -353,7 +353,7 @@ typedef struct local_info_t {</div><div class='ctx'>  * Some more prototypes</div><div class='ctx'>  */</div><div class='ctx'> static int do_start_xmit(struct sk_buff *skb, struct net_device *dev);</div><div class='del'>-static void do_tx_timeout(struct net_device *dev);</div><div class='add'>+static void xirc_tx_timeout(struct net_device *dev);</div><div class='ctx'> static void xirc2ps_tx_timeout_task(struct work_struct *work);</div><div class='ctx'> static struct net_device_stats *do_get_stats(struct net_device *dev);</div><div class='ctx'> static void set_addresses(struct net_device *dev);</div><div class='hunk'>@@ -377,7 +377,7 @@ first_tuple(struct pcmcia_device *handle, tuple_t *tuple, cisparse_t *parse)</div><div class='ctx'> </div><div class='ctx'> 	if ((err = pcmcia_get_first_tuple(handle, tuple)) == 0 &amp;&amp;</div><div class='ctx'> 			(err = pcmcia_get_tuple_data(handle, tuple)) == 0)</div><div class='del'>-		err = pcmcia_parse_tuple(handle, tuple, parse);</div><div class='add'>+		err = pcmcia_parse_tuple(tuple, parse);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -388,7 +388,7 @@ next_tuple(struct pcmcia_device *handle, tuple_t *tuple, cisparse_t *parse)</div><div class='ctx'> </div><div class='ctx'> 	if ((err = pcmcia_get_next_tuple(handle, tuple)) == 0 &amp;&amp;</div><div class='ctx'> 			(err = pcmcia_get_tuple_data(handle, tuple)) == 0)</div><div class='del'>-		err = pcmcia_parse_tuple(handle, tuple, parse);</div><div class='add'>+		err = pcmcia_parse_tuple(tuple, parse);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -590,7 +590,7 @@ xirc2ps_probe(struct pcmcia_device *link)</div><div class='ctx'>     dev-&gt;open = &amp;do_open;</div><div class='ctx'>     dev-&gt;stop = &amp;do_stop;</div><div class='ctx'> #ifdef HAVE_TX_TIMEOUT</div><div class='del'>-    dev-&gt;tx_timeout = do_tx_timeout;</div><div class='add'>+    dev-&gt;tx_timeout = xirc_tx_timeout;</div><div class='ctx'>     dev-&gt;watchdog_timeo = TX_TIMEOUT;</div><div class='ctx'>     INIT_WORK(&amp;local-&gt;tx_timeout_task, xirc2ps_tx_timeout_task);</div><div class='ctx'> #endif</div><div class='hunk'>@@ -715,6 +715,47 @@ has_ce2_string(struct pcmcia_device * p_dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int</div><div class='add'>+xirc2ps_config_modem(struct pcmcia_device *p_dev,</div><div class='add'>+		     cistpl_cftable_entry_t *cf,</div><div class='add'>+		     cistpl_cftable_entry_t *dflt,</div><div class='add'>+		     unsigned int vcc,</div><div class='add'>+		     void *priv_data)</div><div class='add'>+{</div><div class='add'>+	unsigned int ioaddr;</div><div class='add'>+</div><div class='add'>+	if (cf-&gt;io.nwin &gt; 0  &amp;&amp;  (cf-&gt;io.win[0].base &amp; 0xf) == 8) {</div><div class='add'>+		for (ioaddr = 0x300; ioaddr &lt; 0x400; ioaddr += 0x10) {</div><div class='add'>+			p_dev-&gt;io.BasePort2 = cf-&gt;io.win[0].base;</div><div class='add'>+			p_dev-&gt;io.BasePort1 = ioaddr;</div><div class='add'>+			if (!pcmcia_request_io(p_dev, &amp;p_dev-&gt;io))</div><div class='add'>+				return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+xirc2ps_config_check(struct pcmcia_device *p_dev,</div><div class='add'>+		     cistpl_cftable_entry_t *cf,</div><div class='add'>+		     cistpl_cftable_entry_t *dflt,</div><div class='add'>+		     unsigned int vcc,</div><div class='add'>+		     void *priv_data)</div><div class='add'>+{</div><div class='add'>+	int *pass = priv_data;</div><div class='add'>+</div><div class='add'>+	if (cf-&gt;io.nwin &gt; 0 &amp;&amp; (cf-&gt;io.win[0].base &amp; 0xf) == 8) {</div><div class='add'>+		p_dev-&gt;io.BasePort2 = cf-&gt;io.win[0].base;</div><div class='add'>+		p_dev-&gt;io.BasePort1 = p_dev-&gt;io.BasePort2</div><div class='add'>+			+ (*pass ? (cf-&gt;index &amp; 0x20 ? -24:8)</div><div class='add'>+			   : (cf-&gt;index &amp; 0x20 ?   8:-24));</div><div class='add'>+		if (!pcmcia_request_io(p_dev, &amp;p_dev-&gt;io))</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='add'>+	return -ENODEV;</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /****************</div><div class='ctx'>  * xirc2ps_config() is scheduled to run after a CARD_INSERTION event</div><div class='ctx'>  * is received, to configure the PCMCIA socket, and to make the</div><div class='hunk'>@@ -725,13 +766,12 @@ xirc2ps_config(struct pcmcia_device * link)</div><div class='ctx'> {</div><div class='ctx'>     struct net_device *dev = link-&gt;priv;</div><div class='ctx'>     local_info_t *local = netdev_priv(dev);</div><div class='add'>+    unsigned int ioaddr;</div><div class='ctx'>     tuple_t tuple;</div><div class='ctx'>     cisparse_t parse;</div><div class='del'>-    unsigned int ioaddr;</div><div class='ctx'>     int err, i;</div><div class='ctx'>     u_char buf[64];</div><div class='ctx'>     cistpl_lan_node_id_t *node_id = (cistpl_lan_node_id_t*)parse.funce.data;</div><div class='del'>-    cistpl_cftable_entry_t *cf = &amp;parse.cftable_entry;</div><div class='ctx'>     DECLARE_MAC_BUF(mac);</div><div class='ctx'> </div><div class='ctx'>     local-&gt;dingo_ccr = NULL;</div><div class='hunk'>@@ -846,19 +886,8 @@ xirc2ps_config(struct pcmcia_device * link)</div><div class='ctx'> 	    /* Take the Modem IO port from the CIS and scan for a free</div><div class='ctx'> 	     * Ethernet port */</div><div class='ctx'> 	    link-&gt;io.NumPorts1 = 16; /* no Mako stuff anymore */</div><div class='del'>-	    tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;</div><div class='del'>-	    for (err = first_tuple(link, &amp;tuple, &amp;parse); !err;</div><div class='del'>-				 err = next_tuple(link, &amp;tuple, &amp;parse)) {</div><div class='del'>-		if (cf-&gt;io.nwin &gt; 0  &amp;&amp;  (cf-&gt;io.win[0].base &amp; 0xf) == 8) {</div><div class='del'>-		    for (ioaddr = 0x300; ioaddr &lt; 0x400; ioaddr += 0x10) {</div><div class='del'>-			link-&gt;conf.ConfigIndex = cf-&gt;index ;</div><div class='del'>-			link-&gt;io.BasePort2 = cf-&gt;io.win[0].base;</div><div class='del'>-			link-&gt;io.BasePort1 = ioaddr;</div><div class='del'>-			if (!(err=pcmcia_request_io(link, &amp;link-&gt;io)))</div><div class='del'>-			    goto port_found;</div><div class='del'>-		    }</div><div class='del'>-		}</div><div class='del'>-	    }</div><div class='add'>+	    if (!pcmcia_loop_config(link, xirc2ps_config_modem, NULL))</div><div class='add'>+		    goto port_found;</div><div class='ctx'> 	} else {</div><div class='ctx'> 	    link-&gt;io.NumPorts1 = 18;</div><div class='ctx'> 	    /* We do 2 passes here: The first one uses the regular mapping and</div><div class='hunk'>@@ -866,21 +895,9 @@ xirc2ps_config(struct pcmcia_device * link)</div><div class='ctx'> 	     * mirrored every 32 bytes. Actually we use a mirrored port for</div><div class='ctx'> 	     * the Mako if (on the first pass) the COR bit 5 is set.</div><div class='ctx'> 	     */</div><div class='del'>-	    for (pass=0; pass &lt; 2; pass++) {</div><div class='del'>-		tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;</div><div class='del'>-		for (err = first_tuple(link, &amp;tuple, &amp;parse); !err;</div><div class='del'>-				     err = next_tuple(link, &amp;tuple, &amp;parse)){</div><div class='del'>-		    if (cf-&gt;io.nwin &gt; 0  &amp;&amp;  (cf-&gt;io.win[0].base &amp; 0xf) == 8){</div><div class='del'>-			link-&gt;conf.ConfigIndex = cf-&gt;index ;</div><div class='del'>-			link-&gt;io.BasePort2 = cf-&gt;io.win[0].base;</div><div class='del'>-			link-&gt;io.BasePort1 = link-&gt;io.BasePort2</div><div class='del'>-				    + (pass ? (cf-&gt;index &amp; 0x20 ? -24:8)</div><div class='del'>-					    : (cf-&gt;index &amp; 0x20 ?   8:-24));</div><div class='del'>-			if (!(err=pcmcia_request_io(link, &amp;link-&gt;io)))</div><div class='add'>+	    for (pass=0; pass &lt; 2; pass++)</div><div class='add'>+		    if (!pcmcia_loop_config(link, xirc2ps_config_check, &amp;pass))</div><div class='ctx'> 			    goto port_found;</div><div class='del'>-		    }</div><div class='del'>-		}</div><div class='del'>-	    }</div><div class='ctx'> 	    /* if special option:</div><div class='ctx'> 	     * try to configure as Ethernet only.</div><div class='ctx'> 	     * .... */</div><div class='hunk'>@@ -1335,7 +1352,7 @@ xirc2ps_tx_timeout_task(struct work_struct *work)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-do_tx_timeout(struct net_device *dev)</div><div class='add'>+xirc_tx_timeout(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'>     local_info_t *lp = netdev_priv(dev);</div><div class='ctx'>     lp-&gt;stats.tx_errors++;</div><div class='head'>diff --git a/drivers/net/phy/fixed.c b/drivers/net/phy/fixed.c<br/>index 4e07956a483b..cf24cc34debe 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/phy/fixed.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/phy/fixed.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/phy/fixed.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/phy/fixed.c</a></div><div class='hunk'>@@ -24,7 +24,7 @@</div><div class='ctx'> </div><div class='ctx'> struct fixed_mdio_bus {</div><div class='ctx'> 	int irqs[PHY_MAX_ADDR];</div><div class='del'>-	struct mii_bus mii_bus;</div><div class='add'>+	struct mii_bus *mii_bus;</div><div class='ctx'> 	struct list_head phys;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -115,8 +115,7 @@ static int fixed_phy_update_regs(struct fixed_phy *fp)</div><div class='ctx'> </div><div class='ctx'> static int fixed_mdio_read(struct mii_bus *bus, int phy_id, int reg_num)</div><div class='ctx'> {</div><div class='del'>-	struct fixed_mdio_bus *fmb = container_of(bus, struct fixed_mdio_bus,</div><div class='del'>-						  mii_bus);</div><div class='add'>+	struct fixed_mdio_bus *fmb = bus-&gt;priv;</div><div class='ctx'> 	struct fixed_phy *fp;</div><div class='ctx'> </div><div class='ctx'> 	if (reg_num &gt;= MII_REGS_NUM)</div><div class='hunk'>@@ -213,19 +212,28 @@ static int __init fixed_mdio_bus_init(void)</div><div class='ctx'> 		goto err_pdev;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	snprintf(fmb-&gt;mii_bus.id, MII_BUS_ID_SIZE, "0");</div><div class='del'>-	fmb-&gt;mii_bus.name = "Fixed MDIO Bus";</div><div class='del'>-	fmb-&gt;mii_bus.dev = &amp;pdev-&gt;dev;</div><div class='del'>-	fmb-&gt;mii_bus.read = &amp;fixed_mdio_read;</div><div class='del'>-	fmb-&gt;mii_bus.write = &amp;fixed_mdio_write;</div><div class='del'>-	fmb-&gt;mii_bus.irq = fmb-&gt;irqs;</div><div class='add'>+	fmb-&gt;mii_bus = mdiobus_alloc();</div><div class='add'>+	if (fmb-&gt;mii_bus == NULL) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto err_mdiobus_reg;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	ret = mdiobus_register(&amp;fmb-&gt;mii_bus);</div><div class='add'>+	snprintf(fmb-&gt;mii_bus-&gt;id, MII_BUS_ID_SIZE, "0");</div><div class='add'>+	fmb-&gt;mii_bus-&gt;name = "Fixed MDIO Bus";</div><div class='add'>+	fmb-&gt;mii_bus-&gt;priv = fmb;</div><div class='add'>+	fmb-&gt;mii_bus-&gt;parent = &amp;pdev-&gt;dev;</div><div class='add'>+	fmb-&gt;mii_bus-&gt;read = &amp;fixed_mdio_read;</div><div class='add'>+	fmb-&gt;mii_bus-&gt;write = &amp;fixed_mdio_write;</div><div class='add'>+	fmb-&gt;mii_bus-&gt;irq = fmb-&gt;irqs;</div><div class='add'>+</div><div class='add'>+	ret = mdiobus_register(fmb-&gt;mii_bus);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto err_mdiobus_reg;</div><div class='add'>+		goto err_mdiobus_alloc;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='add'>+err_mdiobus_alloc:</div><div class='add'>+	mdiobus_free(fmb-&gt;mii_bus);</div><div class='ctx'> err_mdiobus_reg:</div><div class='ctx'> 	platform_device_unregister(pdev);</div><div class='ctx'> err_pdev:</div><div class='hunk'>@@ -238,7 +246,8 @@ static void __exit fixed_mdio_bus_exit(void)</div><div class='ctx'> 	struct fixed_mdio_bus *fmb = &amp;platform_fmb;</div><div class='ctx'> 	struct fixed_phy *fp, *tmp;</div><div class='ctx'> </div><div class='del'>-	mdiobus_unregister(&amp;fmb-&gt;mii_bus);</div><div class='add'>+	mdiobus_unregister(fmb-&gt;mii_bus);</div><div class='add'>+	mdiobus_free(fmb-&gt;mii_bus);</div><div class='ctx'> 	platform_device_unregister(pdev);</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry_safe(fp, tmp, &amp;fmb-&gt;phys, node) {</div><div class='head'>diff --git a/drivers/net/phy/mdio-bitbang.c b/drivers/net/phy/mdio-bitbang.c<br/>index c01b78013ddc..2576055b350b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/phy/mdio-bitbang.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/phy/mdio-bitbang.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/phy/mdio-bitbang.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/phy/mdio-bitbang.c</a></div><div class='hunk'>@@ -165,7 +165,7 @@ struct mii_bus *alloc_mdio_bitbang(struct mdiobb_ctrl *ctrl)</div><div class='ctx'> {</div><div class='ctx'> 	struct mii_bus *bus;</div><div class='ctx'> </div><div class='del'>-	bus = kzalloc(sizeof(struct mii_bus), GFP_KERNEL);</div><div class='add'>+	bus = mdiobus_alloc();</div><div class='ctx'> 	if (!bus)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -184,7 +184,7 @@ void free_mdio_bitbang(struct mii_bus *bus)</div><div class='ctx'> 	struct mdiobb_ctrl *ctrl = bus-&gt;priv;</div><div class='ctx'> </div><div class='ctx'> 	module_put(ctrl-&gt;ops-&gt;owner);</div><div class='del'>-	kfree(bus);</div><div class='add'>+	mdiobus_free(bus);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(free_mdio_bitbang);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/phy/mdio-ofgpio.c b/drivers/net/phy/mdio-ofgpio.c<br/>index 7edfc0c34835..2ff97754e574 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/phy/mdio-ofgpio.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/phy/mdio-ofgpio.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/phy/mdio-ofgpio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/phy/mdio-ofgpio.c</a></div><div class='hunk'>@@ -122,7 +122,7 @@ static int __devinit mdio_ofgpio_probe(struct of_device *ofdev,</div><div class='ctx'> </div><div class='ctx'> 	new_bus = alloc_mdio_bitbang(&amp;bitbang-&gt;ctrl);</div><div class='ctx'> 	if (!new_bus)</div><div class='del'>-		goto out_free_priv;</div><div class='add'>+		goto out_free_bitbang;</div><div class='ctx'> </div><div class='ctx'> 	new_bus-&gt;name = "GPIO Bitbanged MII",</div><div class='ctx'> </div><div class='hunk'>@@ -142,7 +142,7 @@ static int __devinit mdio_ofgpio_probe(struct of_device *ofdev,</div><div class='ctx'> 		if (!strcmp(np-&gt;type, "ethernet-phy"))</div><div class='ctx'> 			add_phy(new_bus, np);</div><div class='ctx'> </div><div class='del'>-	new_bus-&gt;dev = &amp;ofdev-&gt;dev;</div><div class='add'>+	new_bus-&gt;parent = &amp;ofdev-&gt;dev;</div><div class='ctx'> 	dev_set_drvdata(&amp;ofdev-&gt;dev, new_bus);</div><div class='ctx'> </div><div class='ctx'> 	ret = mdiobus_register(new_bus);</div><div class='hunk'>@@ -155,9 +155,9 @@ out_free_irqs:</div><div class='ctx'> 	dev_set_drvdata(&amp;ofdev-&gt;dev, NULL);</div><div class='ctx'> 	kfree(new_bus-&gt;irq);</div><div class='ctx'> out_free_bus:</div><div class='del'>-	kfree(new_bus);</div><div class='del'>-out_free_priv:</div><div class='ctx'> 	free_mdio_bitbang(new_bus);</div><div class='add'>+out_free_bitbang:</div><div class='add'>+	kfree(bitbang);</div><div class='ctx'> out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -168,11 +168,10 @@ static int mdio_ofgpio_remove(struct of_device *ofdev)</div><div class='ctx'> 	struct mdio_gpio_info *bitbang = bus-&gt;priv;</div><div class='ctx'> </div><div class='ctx'> 	mdiobus_unregister(bus);</div><div class='add'>+	kfree(bus-&gt;irq);</div><div class='ctx'> 	free_mdio_bitbang(bus);</div><div class='ctx'> 	dev_set_drvdata(&amp;ofdev-&gt;dev, NULL);</div><div class='del'>-	kfree(bus-&gt;irq);</div><div class='ctx'> 	kfree(bitbang);</div><div class='del'>-	kfree(bus);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c<br/>index 94e0b7ed76f1..d0ed1ef284a8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/phy/mdio_bus.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/phy/mdio_bus.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/phy/mdio_bus.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/phy/mdio_bus.c</a></div><div class='hunk'>@@ -36,6 +36,43 @@</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * mdiobus_alloc - allocate a mii_bus structure</div><div class='add'>+ *</div><div class='add'>+ * Description: called by a bus driver to allocate an mii_bus</div><div class='add'>+ * structure to fill in.</div><div class='add'>+ */</div><div class='add'>+struct mii_bus *mdiobus_alloc(void)</div><div class='add'>+{</div><div class='add'>+	struct mii_bus *bus;</div><div class='add'>+</div><div class='add'>+	bus = kzalloc(sizeof(*bus), GFP_KERNEL);</div><div class='add'>+	if (bus != NULL)</div><div class='add'>+		bus-&gt;state = MDIOBUS_ALLOCATED;</div><div class='add'>+</div><div class='add'>+	return bus;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(mdiobus_alloc);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * mdiobus_release - mii_bus device release callback</div><div class='add'>+ * @d: the target struct device that contains the mii_bus</div><div class='add'>+ *</div><div class='add'>+ * Description: called when the last reference to an mii_bus is</div><div class='add'>+ * dropped, to free the underlying memory.</div><div class='add'>+ */</div><div class='add'>+static void mdiobus_release(struct device *d)</div><div class='add'>+{</div><div class='add'>+	struct mii_bus *bus = to_mii_bus(d);</div><div class='add'>+	BUG_ON(bus-&gt;state != MDIOBUS_RELEASED);</div><div class='add'>+	kfree(bus);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct class mdio_bus_class = {</div><div class='add'>+	.name		= "mdio_bus",</div><div class='add'>+	.dev_release	= mdiobus_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * mdiobus_register - bring up all the PHYs on a given bus and attach them to bus</div><div class='ctx'>  * @bus: target mii_bus</div><div class='ctx'>  *</div><div class='hunk'>@@ -54,55 +91,36 @@ int mdiobus_register(struct mii_bus *bus)</div><div class='ctx'> 			NULL == bus-&gt;write)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	mutex_init(&amp;bus-&gt;mdio_lock);</div><div class='del'>-</div><div class='del'>-	if (bus-&gt;reset)</div><div class='del'>-		bus-&gt;reset(bus);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; PHY_MAX_ADDR; i++) {</div><div class='del'>-		struct phy_device *phydev;</div><div class='del'>-</div><div class='del'>-		if (bus-&gt;phy_mask &amp; (1 &lt;&lt; i)) {</div><div class='del'>-			bus-&gt;phy_map[i] = NULL;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		phydev = get_phy_device(bus, i);</div><div class='add'>+	BUG_ON(bus-&gt;state != MDIOBUS_ALLOCATED &amp;&amp;</div><div class='add'>+	       bus-&gt;state != MDIOBUS_UNREGISTERED);</div><div class='ctx'> </div><div class='del'>-		if (IS_ERR(phydev))</div><div class='del'>-			return PTR_ERR(phydev);</div><div class='add'>+	bus-&gt;dev.parent = bus-&gt;parent;</div><div class='add'>+	bus-&gt;dev.class = &amp;mdio_bus_class;</div><div class='add'>+	bus-&gt;dev.groups = NULL;</div><div class='add'>+	memcpy(bus-&gt;dev.bus_id, bus-&gt;id, MII_BUS_ID_SIZE);</div><div class='ctx'> </div><div class='del'>-		/* There's a PHY at this address</div><div class='del'>-		 * We need to set:</div><div class='del'>-		 * 1) IRQ</div><div class='del'>-		 * 2) bus_id</div><div class='del'>-		 * 3) parent</div><div class='del'>-		 * 4) bus</div><div class='del'>-		 * 5) mii_bus</div><div class='del'>-		 * And, we need to register it */</div><div class='del'>-		if (phydev) {</div><div class='del'>-			phydev-&gt;irq = bus-&gt;irq[i];</div><div class='add'>+	err = device_register(&amp;bus-&gt;dev);</div><div class='add'>+	if (err) {</div><div class='add'>+		printk(KERN_ERR "mii_bus %s failed to register\n", bus-&gt;id);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-			phydev-&gt;dev.parent = bus-&gt;dev;</div><div class='del'>-			phydev-&gt;dev.bus = &amp;mdio_bus_type;</div><div class='del'>-			snprintf(phydev-&gt;dev.bus_id, BUS_ID_SIZE, PHY_ID_FMT, bus-&gt;id, i);</div><div class='add'>+	bus-&gt;state = MDIOBUS_REGISTERED;</div><div class='ctx'> </div><div class='del'>-			phydev-&gt;bus = bus;</div><div class='add'>+	mutex_init(&amp;bus-&gt;mdio_lock);</div><div class='ctx'> </div><div class='del'>-			/* Run all of the fixups for this PHY */</div><div class='del'>-			phy_scan_fixups(phydev);</div><div class='add'>+	if (bus-&gt;reset)</div><div class='add'>+		bus-&gt;reset(bus);</div><div class='ctx'> </div><div class='del'>-			err = device_register(&amp;phydev-&gt;dev);</div><div class='add'>+	for (i = 0; i &lt; PHY_MAX_ADDR; i++) {</div><div class='add'>+		bus-&gt;phy_map[i] = NULL;</div><div class='add'>+		if ((bus-&gt;phy_mask &amp; (1 &lt;&lt; i)) == 0) {</div><div class='add'>+			struct phy_device *phydev;</div><div class='ctx'> </div><div class='del'>-			if (err) {</div><div class='del'>-				printk(KERN_ERR "phy %d failed to register\n",</div><div class='del'>-						i);</div><div class='del'>-				phy_device_free(phydev);</div><div class='del'>-				phydev = NULL;</div><div class='del'>-			}</div><div class='add'>+			phydev = mdiobus_scan(bus, i);</div><div class='add'>+			if (IS_ERR(phydev))</div><div class='add'>+				err = PTR_ERR(phydev);</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		bus-&gt;phy_map[i] = phydev;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	pr_info("%s: probed\n", bus-&gt;name);</div><div class='hunk'>@@ -115,6 +133,10 @@ void mdiobus_unregister(struct mii_bus *bus)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	BUG_ON(bus-&gt;state != MDIOBUS_REGISTERED);</div><div class='add'>+	bus-&gt;state = MDIOBUS_UNREGISTERED;</div><div class='add'>+</div><div class='add'>+	device_unregister(&amp;bus-&gt;dev);</div><div class='ctx'> 	for (i = 0; i &lt; PHY_MAX_ADDR; i++) {</div><div class='ctx'> 		if (bus-&gt;phy_map[i])</div><div class='ctx'> 			device_unregister(&amp;bus-&gt;phy_map[i]-&gt;dev);</div><div class='hunk'>@@ -123,6 +145,122 @@ void mdiobus_unregister(struct mii_bus *bus)</div><div class='ctx'> EXPORT_SYMBOL(mdiobus_unregister);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * mdiobus_free - free a struct mii_bus</div><div class='add'>+ * @bus: mii_bus to free</div><div class='add'>+ *</div><div class='add'>+ * This function releases the reference to the underlying device</div><div class='add'>+ * object in the mii_bus.  If this is the last reference, the mii_bus</div><div class='add'>+ * will be freed.</div><div class='add'>+ */</div><div class='add'>+void mdiobus_free(struct mii_bus *bus)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * For compatibility with error handling in drivers.</div><div class='add'>+	 */</div><div class='add'>+	if (bus-&gt;state == MDIOBUS_ALLOCATED) {</div><div class='add'>+		kfree(bus);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	BUG_ON(bus-&gt;state != MDIOBUS_UNREGISTERED);</div><div class='add'>+	bus-&gt;state = MDIOBUS_RELEASED;</div><div class='add'>+</div><div class='add'>+	put_device(&amp;bus-&gt;dev);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(mdiobus_free);</div><div class='add'>+</div><div class='add'>+struct phy_device *mdiobus_scan(struct mii_bus *bus, int addr)</div><div class='add'>+{</div><div class='add'>+	struct phy_device *phydev;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	phydev = get_phy_device(bus, addr);</div><div class='add'>+	if (IS_ERR(phydev) || phydev == NULL)</div><div class='add'>+		return phydev;</div><div class='add'>+</div><div class='add'>+	/* There's a PHY at this address</div><div class='add'>+	 * We need to set:</div><div class='add'>+	 * 1) IRQ</div><div class='add'>+	 * 2) bus_id</div><div class='add'>+	 * 3) parent</div><div class='add'>+	 * 4) bus</div><div class='add'>+	 * 5) mii_bus</div><div class='add'>+	 * And, we need to register it */</div><div class='add'>+</div><div class='add'>+	phydev-&gt;irq = bus-&gt;irq != NULL ? bus-&gt;irq[addr] : PHY_POLL;</div><div class='add'>+</div><div class='add'>+	phydev-&gt;dev.parent = bus-&gt;parent;</div><div class='add'>+	phydev-&gt;dev.bus = &amp;mdio_bus_type;</div><div class='add'>+	snprintf(phydev-&gt;dev.bus_id, BUS_ID_SIZE, PHY_ID_FMT, bus-&gt;id, addr);</div><div class='add'>+</div><div class='add'>+	phydev-&gt;bus = bus;</div><div class='add'>+</div><div class='add'>+	/* Run all of the fixups for this PHY */</div><div class='add'>+	phy_scan_fixups(phydev);</div><div class='add'>+</div><div class='add'>+	err = device_register(&amp;phydev-&gt;dev);</div><div class='add'>+	if (err) {</div><div class='add'>+		printk(KERN_ERR "phy %d failed to register\n", addr);</div><div class='add'>+		phy_device_free(phydev);</div><div class='add'>+		phydev = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bus-&gt;phy_map[addr] = phydev;</div><div class='add'>+</div><div class='add'>+	return phydev;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(mdiobus_scan);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * mdiobus_read - Convenience function for reading a given MII mgmt register</div><div class='add'>+ * @bus: the mii_bus struct</div><div class='add'>+ * @addr: the phy address</div><div class='add'>+ * @regnum: register number to read</div><div class='add'>+ *</div><div class='add'>+ * NOTE: MUST NOT be called from interrupt context,</div><div class='add'>+ * because the bus read/write functions may wait for an interrupt</div><div class='add'>+ * to conclude the operation.</div><div class='add'>+ */</div><div class='add'>+int mdiobus_read(struct mii_bus *bus, int addr, u16 regnum)</div><div class='add'>+{</div><div class='add'>+	int retval;</div><div class='add'>+</div><div class='add'>+	BUG_ON(in_interrupt());</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;bus-&gt;mdio_lock);</div><div class='add'>+	retval = bus-&gt;read(bus, addr, regnum);</div><div class='add'>+	mutex_unlock(&amp;bus-&gt;mdio_lock);</div><div class='add'>+</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(mdiobus_read);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * mdiobus_write - Convenience function for writing a given MII mgmt register</div><div class='add'>+ * @bus: the mii_bus struct</div><div class='add'>+ * @addr: the phy address</div><div class='add'>+ * @regnum: register number to write</div><div class='add'>+ * @val: value to write to @regnum</div><div class='add'>+ *</div><div class='add'>+ * NOTE: MUST NOT be called from interrupt context,</div><div class='add'>+ * because the bus read/write functions may wait for an interrupt</div><div class='add'>+ * to conclude the operation.</div><div class='add'>+ */</div><div class='add'>+int mdiobus_write(struct mii_bus *bus, int addr, u16 regnum, u16 val)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	BUG_ON(in_interrupt());</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;bus-&gt;mdio_lock);</div><div class='add'>+	err = bus-&gt;write(bus, addr, regnum, val);</div><div class='add'>+	mutex_unlock(&amp;bus-&gt;mdio_lock);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(mdiobus_write);</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * mdio_bus_match - determine if given PHY driver supports the given PHY device</div><div class='ctx'>  * @dev: target PHY device</div><div class='ctx'>  * @drv: given PHY driver</div><div class='hunk'>@@ -174,10 +312,20 @@ EXPORT_SYMBOL(mdio_bus_type);</div><div class='ctx'> </div><div class='ctx'> int __init mdio_bus_init(void)</div><div class='ctx'> {</div><div class='del'>-	return bus_register(&amp;mdio_bus_type);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = class_register(&amp;mdio_bus_class);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		ret = bus_register(&amp;mdio_bus_type);</div><div class='add'>+		if (ret)</div><div class='add'>+			class_unregister(&amp;mdio_bus_class);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void mdio_bus_exit(void)</div><div class='ctx'> {</div><div class='add'>+	class_unregister(&amp;mdio_bus_class);</div><div class='ctx'> 	bus_unregister(&amp;mdio_bus_type);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c<br/>index 45cc2914d347..df4e6257d4a7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/phy/phy.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/phy/phy.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/phy/phy.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/phy/phy.c</a></div><div class='hunk'>@@ -58,55 +58,6 @@ EXPORT_SYMBOL(phy_print_status);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * phy_read - Convenience function for reading a given PHY register</div><div class='del'>- * @phydev: the phy_device struct</div><div class='del'>- * @regnum: register number to read</div><div class='del'>- *</div><div class='del'>- * NOTE: MUST NOT be called from interrupt context,</div><div class='del'>- * because the bus read/write functions may wait for an interrupt</div><div class='del'>- * to conclude the operation.</div><div class='del'>- */</div><div class='del'>-int phy_read(struct phy_device *phydev, u16 regnum)</div><div class='del'>-{</div><div class='del'>-	int retval;</div><div class='del'>-	struct mii_bus *bus = phydev-&gt;bus;</div><div class='del'>-</div><div class='del'>-	BUG_ON(in_interrupt());</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;bus-&gt;mdio_lock);</div><div class='del'>-	retval = bus-&gt;read(bus, phydev-&gt;addr, regnum);</div><div class='del'>-	mutex_unlock(&amp;bus-&gt;mdio_lock);</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(phy_read);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * phy_write - Convenience function for writing a given PHY register</div><div class='del'>- * @phydev: the phy_device struct</div><div class='del'>- * @regnum: register number to write</div><div class='del'>- * @val: value to write to @regnum</div><div class='del'>- *</div><div class='del'>- * NOTE: MUST NOT be called from interrupt context,</div><div class='del'>- * because the bus read/write functions may wait for an interrupt</div><div class='del'>- * to conclude the operation.</div><div class='del'>- */</div><div class='del'>-int phy_write(struct phy_device *phydev, u16 regnum, u16 val)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-	struct mii_bus *bus = phydev-&gt;bus;</div><div class='del'>-</div><div class='del'>-	BUG_ON(in_interrupt());</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;bus-&gt;mdio_lock);</div><div class='del'>-	err = bus-&gt;write(bus, phydev-&gt;addr, regnum, val);</div><div class='del'>-	mutex_unlock(&amp;bus-&gt;mdio_lock);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(phy_write);</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * phy_clear_interrupt - Ack the phy device's interrupt</div><div class='ctx'>  * @phydev: the phy_device struct</div><div class='ctx'>  *</div><div class='hunk'>@@ -366,7 +317,8 @@ int phy_mii_ioctl(struct phy_device *phydev,</div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case SIOCGMIIPHY:</div><div class='ctx'> 		mii_data-&gt;phy_id = phydev-&gt;addr;</div><div class='del'>-		break;</div><div class='add'>+		/* fall through */</div><div class='add'>+</div><div class='ctx'> 	case SIOCGMIIREG:</div><div class='ctx'> 		mii_data-&gt;val_out = phy_read(phydev, mii_data-&gt;reg_num);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -413,7 +365,7 @@ int phy_mii_ioctl(struct phy_device *phydev,</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='del'>-		return -ENOTTY;</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -728,6 +680,12 @@ static void phy_change(struct work_struct *work)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto irq_enable_err;</div><div class='ctx'> </div><div class='add'>+	/* Stop timer and run the state queue now.  The work function for</div><div class='add'>+	 * state_queue will start the timer up again.</div><div class='add'>+	 */</div><div class='add'>+	del_timer(&amp;phydev-&gt;phy_timer);</div><div class='add'>+	schedule_work(&amp;phydev-&gt;state_queue);</div><div class='add'>+</div><div class='ctx'> 	return;</div><div class='ctx'> </div><div class='ctx'> irq_enable_err:</div><div class='head'>diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c<br/>index 16a0e7de5888..e11b03b2b25a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/phy/phy_device.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/phy/phy_device.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/phy/phy_device.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/phy/phy_device.c</a></div><div class='hunk'>@@ -309,11 +309,6 @@ void phy_disconnect(struct phy_device *phydev)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(phy_disconnect);</div><div class='ctx'> </div><div class='del'>-static int phy_compare_id(struct device *dev, void *data)</div><div class='del'>-{</div><div class='del'>-	return strcmp((char *)data, dev-&gt;bus_id) ? 0 : 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * phy_attach - attach a network device to a particular PHY device</div><div class='ctx'>  * @dev: network device to attach</div><div class='hunk'>@@ -337,8 +332,7 @@ struct phy_device *phy_attach(struct net_device *dev,</div><div class='ctx'> </div><div class='ctx'> 	/* Search the list of PHY devices on the mdio bus for the</div><div class='ctx'> 	 * PHY with the requested name */</div><div class='del'>-	d = bus_find_device(bus, NULL, (void *)bus_id, phy_compare_id);</div><div class='del'>-</div><div class='add'>+	d = bus_find_device_by_name(bus, NULL, bus_id);</div><div class='ctx'> 	if (d) {</div><div class='ctx'> 		phydev = to_phy_device(d);</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -419,13 +413,14 @@ EXPORT_SYMBOL(phy_detach);</div><div class='ctx'>  *</div><div class='ctx'>  * Description: Writes MII_ADVERTISE with the appropriate values,</div><div class='ctx'>  *   after sanitizing the values to make sure we only advertise</div><div class='del'>- *   what is supported.</div><div class='add'>+ *   what is supported.  Returns &lt; 0 on error, 0 if the PHY's advertisement</div><div class='add'>+ *   hasn't changed, and &gt; 0 if it has changed.</div><div class='ctx'>  */</div><div class='ctx'> int genphy_config_advert(struct phy_device *phydev)</div><div class='ctx'> {</div><div class='ctx'> 	u32 advertise;</div><div class='del'>-	int adv;</div><div class='del'>-	int err;</div><div class='add'>+	int oldadv, adv;</div><div class='add'>+	int err, changed = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Only allow advertising what</div><div class='ctx'> 	 * this PHY supports */</div><div class='hunk'>@@ -433,7 +428,7 @@ int genphy_config_advert(struct phy_device *phydev)</div><div class='ctx'> 	advertise = phydev-&gt;advertising;</div><div class='ctx'> </div><div class='ctx'> 	/* Setup standard advertisement */</div><div class='del'>-	adv = phy_read(phydev, MII_ADVERTISE);</div><div class='add'>+	oldadv = adv = phy_read(phydev, MII_ADVERTISE);</div><div class='ctx'> </div><div class='ctx'> 	if (adv &lt; 0)</div><div class='ctx'> 		return adv;</div><div class='hunk'>@@ -453,15 +448,18 @@ int genphy_config_advert(struct phy_device *phydev)</div><div class='ctx'> 	if (advertise &amp; ADVERTISED_Asym_Pause)</div><div class='ctx'> 		adv |= ADVERTISE_PAUSE_ASYM;</div><div class='ctx'> </div><div class='del'>-	err = phy_write(phydev, MII_ADVERTISE, adv);</div><div class='add'>+	if (adv != oldadv) {</div><div class='add'>+		err = phy_write(phydev, MII_ADVERTISE, adv);</div><div class='ctx'> </div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+		changed = 1;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Configure gigabit if it's supported */</div><div class='ctx'> 	if (phydev-&gt;supported &amp; (SUPPORTED_1000baseT_Half |</div><div class='ctx'> 				SUPPORTED_1000baseT_Full)) {</div><div class='del'>-		adv = phy_read(phydev, MII_CTRL1000);</div><div class='add'>+		oldadv = adv = phy_read(phydev, MII_CTRL1000);</div><div class='ctx'> </div><div class='ctx'> 		if (adv &lt; 0)</div><div class='ctx'> 			return adv;</div><div class='hunk'>@@ -471,13 +469,17 @@ int genphy_config_advert(struct phy_device *phydev)</div><div class='ctx'> 			adv |= ADVERTISE_1000HALF;</div><div class='ctx'> 		if (advertise &amp; SUPPORTED_1000baseT_Full)</div><div class='ctx'> 			adv |= ADVERTISE_1000FULL;</div><div class='del'>-		err = phy_write(phydev, MII_CTRL1000, adv);</div><div class='ctx'> </div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='add'>+		if (adv != oldadv) {</div><div class='add'>+			err = phy_write(phydev, MII_CTRL1000, adv);</div><div class='add'>+</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				return err;</div><div class='add'>+			changed = 1;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return adv;</div><div class='add'>+	return changed;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(genphy_config_advert);</div><div class='ctx'> </div><div class='hunk'>@@ -549,6 +551,7 @@ int genphy_restart_aneg(struct phy_device *phydev)</div><div class='ctx'> </div><div class='ctx'> 	return ctl;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(genphy_restart_aneg);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -561,19 +564,22 @@ int genphy_restart_aneg(struct phy_device *phydev)</div><div class='ctx'>  */</div><div class='ctx'> int genphy_config_aneg(struct phy_device *phydev)</div><div class='ctx'> {</div><div class='del'>-	int err = 0;</div><div class='add'>+	int result = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (AUTONEG_ENABLE == phydev-&gt;autoneg) {</div><div class='del'>-		err = genphy_config_advert(phydev);</div><div class='add'>+		int result = genphy_config_advert(phydev);</div><div class='ctx'> </div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='add'>+		if (result &lt; 0) /* error */</div><div class='add'>+			return result;</div><div class='ctx'> </div><div class='del'>-		err = genphy_restart_aneg(phydev);</div><div class='add'>+		/* Only restart aneg if we are advertising something different</div><div class='add'>+		 * than we were before.	 */</div><div class='add'>+		if (result &gt; 0)</div><div class='add'>+			result = genphy_restart_aneg(phydev);</div><div class='ctx'> 	} else</div><div class='del'>-		err = genphy_setup_forced(phydev);</div><div class='add'>+		result = genphy_setup_forced(phydev);</div><div class='ctx'> </div><div class='del'>-	return err;</div><div class='add'>+	return result;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(genphy_config_aneg);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c<br/>index ddccc074a76a..7e857e938adb 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/ppp_generic.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/ppp_generic.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/ppp_generic.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/ppp_generic.c</a></div><div class='hunk'>@@ -866,8 +866,8 @@ static int __init ppp_init(void)</div><div class='ctx'> 			err = PTR_ERR(ppp_class);</div><div class='ctx'> 			goto out_chrdev;</div><div class='ctx'> 		}</div><div class='del'>-		device_create_drvdata(ppp_class, NULL, MKDEV(PPP_MAJOR, 0),</div><div class='del'>-				      NULL, "ppp");</div><div class='add'>+		device_create(ppp_class, NULL, MKDEV(PPP_MAJOR, 0), NULL,</div><div class='add'>+			      "ppp");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='hunk'>@@ -1833,9 +1833,11 @@ ppp_receive_mp_frame(struct ppp *ppp, struct sk_buff *skb, struct channel *pch)</div><div class='ctx'> </div><div class='ctx'> 	/* If the queue is getting long, don't wait any longer for packets</div><div class='ctx'> 	   before the start of the queue. */</div><div class='del'>-	if (skb_queue_len(&amp;ppp-&gt;mrq) &gt;= PPP_MP_MAX_QLEN</div><div class='del'>-	    &amp;&amp; seq_before(ppp-&gt;minseq, ppp-&gt;mrq.next-&gt;sequence))</div><div class='del'>-		ppp-&gt;minseq = ppp-&gt;mrq.next-&gt;sequence;</div><div class='add'>+	if (skb_queue_len(&amp;ppp-&gt;mrq) &gt;= PPP_MP_MAX_QLEN) {</div><div class='add'>+		struct sk_buff *skb = skb_peek(&amp;ppp-&gt;mrq);</div><div class='add'>+		if (seq_before(ppp-&gt;minseq, skb-&gt;sequence))</div><div class='add'>+			ppp-&gt;minseq = skb-&gt;sequence;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Pull completed packets off the queue and receive them. */</div><div class='ctx'> 	while ((skb = ppp_mp_reconstruct(ppp)))</div><div class='hunk'>@@ -1861,10 +1863,11 @@ ppp_mp_insert(struct ppp *ppp, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	/* N.B. we don't need to lock the list lock because we have the</div><div class='ctx'> 	   ppp unit receive-side lock. */</div><div class='del'>-	for (p = list-&gt;next; p != (struct sk_buff *)list; p = p-&gt;next)</div><div class='add'>+	skb_queue_walk(list, p) {</div><div class='ctx'> 		if (seq_before(seq, p-&gt;sequence))</div><div class='ctx'> 			break;</div><div class='del'>-	__skb_insert(skb, p-&gt;prev, p, list);</div><div class='add'>+	}</div><div class='add'>+	__skb_queue_before(list, p, skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -2124,13 +2127,9 @@ ppp_set_compress(struct ppp *ppp, unsigned long arg)</div><div class='ctx'> 	    || ccp_option[1] &lt; 2 || ccp_option[1] &gt; data.length)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	cp = find_compressor(ccp_option[0]);</div><div class='del'>-#ifdef CONFIG_KMOD</div><div class='del'>-	if (!cp) {</div><div class='del'>-		request_module("ppp-compress-%d", ccp_option[0]);</div><div class='del'>-		cp = find_compressor(ccp_option[0]);</div><div class='del'>-	}</div><div class='del'>-#endif /* CONFIG_KMOD */</div><div class='add'>+	cp = try_then_request_module(</div><div class='add'>+		find_compressor(ccp_option[0]),</div><div class='add'>+		"ppp-compress-%d", ccp_option[0]);</div><div class='ctx'> 	if (!cp)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/pppol2tp.c b/drivers/net/pppol2tp.c<br/>index ff175e8f36b2..185b1dff10a8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/pppol2tp.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/pppol2tp.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/pppol2tp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/pppol2tp.c</a></div><div class='hunk'>@@ -353,7 +353,7 @@ static void pppol2tp_recv_queue_skb(struct pppol2tp_session *session, struct sk_</div><div class='ctx'> 	spin_lock_bh(&amp;session-&gt;reorder_q.lock);</div><div class='ctx'> 	skb_queue_walk_safe(&amp;session-&gt;reorder_q, skbp, tmp) {</div><div class='ctx'> 		if (PPPOL2TP_SKB_CB(skbp)-&gt;ns &gt; ns) {</div><div class='del'>-			__skb_insert(skb, skbp-&gt;prev, skbp, &amp;session-&gt;reorder_q);</div><div class='add'>+			__skb_queue_before(&amp;session-&gt;reorder_q, skbp, skb);</div><div class='ctx'> 			PRINTK(session-&gt;debug, PPPOL2TP_MSG_SEQ, KERN_DEBUG,</div><div class='ctx'> 			       "%s: pkt %hu, inserted before %hu, reorder_q len=%d\n",</div><div class='ctx'> 			       session-&gt;name, ns, PPPOL2TP_SKB_CB(skbp)-&gt;ns,</div><div class='head'>diff --git a/drivers/net/pppox.c b/drivers/net/pppox.c<br/>index c6898c1fc54d..03aecc97fb45 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/pppox.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/pppox.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/pppox.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/pppox.c</a></div><div class='hunk'>@@ -115,13 +115,8 @@ static int pppox_create(struct net *net, struct socket *sock, int protocol)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	rc = -EPROTONOSUPPORT;</div><div class='del'>-#ifdef CONFIG_KMOD</div><div class='del'>-	if (!pppox_protos[protocol]) {</div><div class='del'>-		char buffer[32];</div><div class='del'>-		sprintf(buffer, "pppox-proto-%d", protocol);</div><div class='del'>-		request_module(buffer);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='add'>+	if (!pppox_protos[protocol])</div><div class='add'>+		request_module("pppox-proto-%d", protocol);</div><div class='ctx'> 	if (!pppox_protos[protocol] ||</div><div class='ctx'> 	    !try_module_get(pppox_protos[protocol]-&gt;owner))</div><div class='ctx'> 		goto out;</div><div class='head'>diff --git a/drivers/net/qlge/Makefile b/drivers/net/qlge/Makefile<br/>new file mode 100644<br/>index 000000000000..8a197658d76f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/qlge/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/qlge/Makefile</a></div><div class='hunk'>@@ -0,0 +1,7 @@</div><div class='add'>+#</div><div class='add'>+# Makefile for the Qlogic 10GbE PCI Express ethernet driver</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_QLGE) += qlge.o</div><div class='add'>+</div><div class='add'>+qlge-objs := qlge_main.o qlge_dbg.o qlge_mpi.o qlge_ethtool.o</div><div class='head'>diff --git a/drivers/net/qlge/qlge.h b/drivers/net/qlge/qlge.h<br/>new file mode 100644<br/>index 000000000000..38116f9d4163<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/qlge/qlge.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/qlge/qlge.h</a></div><div class='hunk'>@@ -0,0 +1,1593 @@</div><div class='add'>+/*</div><div class='add'>+ * QLogic QLA41xx NIC HBA Driver</div><div class='add'>+ * Copyright (c)  2003-2006 QLogic Corporation</div><div class='add'>+ *</div><div class='add'>+ * See LICENSE.qlge for copyright and licensing details.</div><div class='add'>+ */</div><div class='add'>+#ifndef _QLGE_H_</div><div class='add'>+#define _QLGE_H_</div><div class='add'>+</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * General definitions...</div><div class='add'>+ */</div><div class='add'>+#define DRV_NAME  	"qlge"</div><div class='add'>+#define DRV_STRING 	"QLogic 10 Gigabit PCI-E Ethernet Driver "</div><div class='add'>+#define DRV_VERSION	"v1.00.00-b3"</div><div class='add'>+</div><div class='add'>+#define PFX "qlge: "</div><div class='add'>+#define QPRINTK(qdev, nlevel, klevel, fmt, args...)     \</div><div class='add'>+       do {       \</div><div class='add'>+	if (!((qdev)-&gt;msg_enable &amp; NETIF_MSG_##nlevel))		\</div><div class='add'>+		;						\</div><div class='add'>+	else							\</div><div class='add'>+		dev_printk(KERN_##klevel, &amp;((qdev)-&gt;pdev-&gt;dev),	\</div><div class='add'>+			   "%s: " fmt, __func__, ##args);  \</div><div class='add'>+       } while (0)</div><div class='add'>+</div><div class='add'>+#define QLGE_VENDOR_ID    0x1077</div><div class='add'>+#define QLGE_DEVICE_ID1    0x8012</div><div class='add'>+#define QLGE_DEVICE_ID   0x8000</div><div class='add'>+</div><div class='add'>+#define MAX_RX_RINGS 128</div><div class='add'>+#define MAX_TX_RINGS 128</div><div class='add'>+</div><div class='add'>+#define NUM_TX_RING_ENTRIES	256</div><div class='add'>+#define NUM_RX_RING_ENTRIES	256</div><div class='add'>+</div><div class='add'>+#define NUM_SMALL_BUFFERS   512</div><div class='add'>+#define NUM_LARGE_BUFFERS   512</div><div class='add'>+</div><div class='add'>+#define SMALL_BUFFER_SIZE 256</div><div class='add'>+#define LARGE_BUFFER_SIZE	PAGE_SIZE</div><div class='add'>+#define MAX_SPLIT_SIZE 1023</div><div class='add'>+#define QLGE_SB_PAD 32</div><div class='add'>+</div><div class='add'>+#define DFLT_COALESCE_WAIT 100	/* 100 usec wait for coalescing */</div><div class='add'>+#define MAX_INTER_FRAME_WAIT 10	/* 10 usec max interframe-wait for coalescing */</div><div class='add'>+#define DFLT_INTER_FRAME_WAIT (MAX_INTER_FRAME_WAIT/2)</div><div class='add'>+#define UDELAY_COUNT 3</div><div class='add'>+#define UDELAY_DELAY 10</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define TX_DESC_PER_IOCB 8</div><div class='add'>+/* The maximum number of frags we handle is based</div><div class='add'>+ * on PAGE_SIZE...</div><div class='add'>+ */</div><div class='add'>+#if (PAGE_SHIFT == 12) || (PAGE_SHIFT == 13)	/* 4k &amp; 8k pages */</div><div class='add'>+#define TX_DESC_PER_OAL ((MAX_SKB_FRAGS - TX_DESC_PER_IOCB) + 2)</div><div class='add'>+#else /* all other page sizes */</div><div class='add'>+#define TX_DESC_PER_OAL 0</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define DB_PAGE_SIZE 4096</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Processor Address Register (PROC_ADDR) bit definitions.</div><div class='add'>+ */</div><div class='add'>+enum {</div><div class='add'>+</div><div class='add'>+	/* Misc. stuff */</div><div class='add'>+	MAILBOX_COUNT = 16,</div><div class='add'>+</div><div class='add'>+	PROC_ADDR_RDY = (1 &lt;&lt; 31),</div><div class='add'>+	PROC_ADDR_R = (1 &lt;&lt; 30),</div><div class='add'>+	PROC_ADDR_ERR = (1 &lt;&lt; 29),</div><div class='add'>+	PROC_ADDR_DA = (1 &lt;&lt; 28),</div><div class='add'>+	PROC_ADDR_FUNC0_MBI = 0x00001180,</div><div class='add'>+	PROC_ADDR_FUNC0_MBO = (PROC_ADDR_FUNC0_MBI + MAILBOX_COUNT),</div><div class='add'>+	PROC_ADDR_FUNC0_CTL = 0x000011a1,</div><div class='add'>+	PROC_ADDR_FUNC2_MBI = 0x00001280,</div><div class='add'>+	PROC_ADDR_FUNC2_MBO = (PROC_ADDR_FUNC2_MBI + MAILBOX_COUNT),</div><div class='add'>+	PROC_ADDR_FUNC2_CTL = 0x000012a1,</div><div class='add'>+	PROC_ADDR_MPI_RISC = 0x00000000,</div><div class='add'>+	PROC_ADDR_MDE = 0x00010000,</div><div class='add'>+	PROC_ADDR_REGBLOCK = 0x00020000,</div><div class='add'>+	PROC_ADDR_RISC_REG = 0x00030000,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * System Register (SYS) bit definitions.</div><div class='add'>+ */</div><div class='add'>+enum {</div><div class='add'>+	SYS_EFE = (1 &lt;&lt; 0),</div><div class='add'>+	SYS_FAE = (1 &lt;&lt; 1),</div><div class='add'>+	SYS_MDC = (1 &lt;&lt; 2),</div><div class='add'>+	SYS_DST = (1 &lt;&lt; 3),</div><div class='add'>+	SYS_DWC = (1 &lt;&lt; 4),</div><div class='add'>+	SYS_EVW = (1 &lt;&lt; 5),</div><div class='add'>+	SYS_OMP_DLY_MASK = 0x3f000000,</div><div class='add'>+	/*</div><div class='add'>+	 * There are no values defined as of edit #15.</div><div class='add'>+	 */</div><div class='add'>+	SYS_ODI = (1 &lt;&lt; 14),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  Reset/Failover Register (RST_FO) bit definitions.</div><div class='add'>+ */</div><div class='add'>+enum {</div><div class='add'>+	RST_FO_TFO = (1 &lt;&lt; 0),</div><div class='add'>+	RST_FO_RR_MASK = 0x00060000,</div><div class='add'>+	RST_FO_RR_CQ_CAM = 0x00000000,</div><div class='add'>+	RST_FO_RR_DROP = 0x00000001,</div><div class='add'>+	RST_FO_RR_DQ = 0x00000002,</div><div class='add'>+	RST_FO_RR_RCV_FUNC_CQ = 0x00000003,</div><div class='add'>+	RST_FO_FRB = (1 &lt;&lt; 12),</div><div class='add'>+	RST_FO_MOP = (1 &lt;&lt; 13),</div><div class='add'>+	RST_FO_REG = (1 &lt;&lt; 14),</div><div class='add'>+	RST_FO_FR = (1 &lt;&lt; 15),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Function Specific Control Register (FSC) bit definitions.</div><div class='add'>+ */</div><div class='add'>+enum {</div><div class='add'>+	FSC_DBRST_MASK = 0x00070000,</div><div class='add'>+	FSC_DBRST_256 = 0x00000000,</div><div class='add'>+	FSC_DBRST_512 = 0x00000001,</div><div class='add'>+	FSC_DBRST_768 = 0x00000002,</div><div class='add'>+	FSC_DBRST_1024 = 0x00000003,</div><div class='add'>+	FSC_DBL_MASK = 0x00180000,</div><div class='add'>+	FSC_DBL_DBRST = 0x00000000,</div><div class='add'>+	FSC_DBL_MAX_PLD = 0x00000008,</div><div class='add'>+	FSC_DBL_MAX_BRST = 0x00000010,</div><div class='add'>+	FSC_DBL_128_BYTES = 0x00000018,</div><div class='add'>+	FSC_EC = (1 &lt;&lt; 5),</div><div class='add'>+	FSC_EPC_MASK = 0x00c00000,</div><div class='add'>+	FSC_EPC_INBOUND = (1 &lt;&lt; 6),</div><div class='add'>+	FSC_EPC_OUTBOUND = (1 &lt;&lt; 7),</div><div class='add'>+	FSC_VM_PAGESIZE_MASK = 0x07000000,</div><div class='add'>+	FSC_VM_PAGE_2K = 0x00000100,</div><div class='add'>+	FSC_VM_PAGE_4K = 0x00000200,</div><div class='add'>+	FSC_VM_PAGE_8K = 0x00000300,</div><div class='add'>+	FSC_VM_PAGE_64K = 0x00000600,</div><div class='add'>+	FSC_SH = (1 &lt;&lt; 11),</div><div class='add'>+	FSC_DSB = (1 &lt;&lt; 12),</div><div class='add'>+	FSC_STE = (1 &lt;&lt; 13),</div><div class='add'>+	FSC_FE = (1 &lt;&lt; 15),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  Host Command Status Register (CSR) bit definitions.</div><div class='add'>+ */</div><div class='add'>+enum {</div><div class='add'>+	CSR_ERR_STS_MASK = 0x0000003f,</div><div class='add'>+	/*</div><div class='add'>+	 * There are no valued defined as of edit #15.</div><div class='add'>+	 */</div><div class='add'>+	CSR_RR = (1 &lt;&lt; 8),</div><div class='add'>+	CSR_HRI = (1 &lt;&lt; 9),</div><div class='add'>+	CSR_RP = (1 &lt;&lt; 10),</div><div class='add'>+	CSR_CMD_PARM_SHIFT = 22,</div><div class='add'>+	CSR_CMD_NOP = 0x00000000,</div><div class='add'>+	CSR_CMD_SET_RST = 0x1000000,</div><div class='add'>+	CSR_CMD_CLR_RST = 0x20000000,</div><div class='add'>+	CSR_CMD_SET_PAUSE = 0x30000000,</div><div class='add'>+	CSR_CMD_CLR_PAUSE = 0x40000000,</div><div class='add'>+	CSR_CMD_SET_H2R_INT = 0x50000000,</div><div class='add'>+	CSR_CMD_CLR_H2R_INT = 0x60000000,</div><div class='add'>+	CSR_CMD_PAR_EN = 0x70000000,</div><div class='add'>+	CSR_CMD_SET_BAD_PAR = 0x80000000,</div><div class='add'>+	CSR_CMD_CLR_BAD_PAR = 0x90000000,</div><div class='add'>+	CSR_CMD_CLR_R2PCI_INT = 0xa0000000,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  Configuration Register (CFG) bit definitions.</div><div class='add'>+ */</div><div class='add'>+enum {</div><div class='add'>+	CFG_LRQ = (1 &lt;&lt; 0),</div><div class='add'>+	CFG_DRQ = (1 &lt;&lt; 1),</div><div class='add'>+	CFG_LR = (1 &lt;&lt; 2),</div><div class='add'>+	CFG_DR = (1 &lt;&lt; 3),</div><div class='add'>+	CFG_LE = (1 &lt;&lt; 5),</div><div class='add'>+	CFG_LCQ = (1 &lt;&lt; 6),</div><div class='add'>+	CFG_DCQ = (1 &lt;&lt; 7),</div><div class='add'>+	CFG_Q_SHIFT = 8,</div><div class='add'>+	CFG_Q_MASK = 0x7f000000,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  Status Register (STS) bit definitions.</div><div class='add'>+ */</div><div class='add'>+enum {</div><div class='add'>+	STS_FE = (1 &lt;&lt; 0),</div><div class='add'>+	STS_PI = (1 &lt;&lt; 1),</div><div class='add'>+	STS_PL0 = (1 &lt;&lt; 2),</div><div class='add'>+	STS_PL1 = (1 &lt;&lt; 3),</div><div class='add'>+	STS_PI0 = (1 &lt;&lt; 4),</div><div class='add'>+	STS_PI1 = (1 &lt;&lt; 5),</div><div class='add'>+	STS_FUNC_ID_MASK = 0x000000c0,</div><div class='add'>+	STS_FUNC_ID_SHIFT = 6,</div><div class='add'>+	STS_F0E = (1 &lt;&lt; 8),</div><div class='add'>+	STS_F1E = (1 &lt;&lt; 9),</div><div class='add'>+	STS_F2E = (1 &lt;&lt; 10),</div><div class='add'>+	STS_F3E = (1 &lt;&lt; 11),</div><div class='add'>+	STS_NFE = (1 &lt;&lt; 12),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Interrupt Enable Register (INTR_EN) bit definitions.</div><div class='add'>+ */</div><div class='add'>+enum {</div><div class='add'>+	INTR_EN_INTR_MASK = 0x007f0000,</div><div class='add'>+	INTR_EN_TYPE_MASK = 0x03000000,</div><div class='add'>+	INTR_EN_TYPE_ENABLE = 0x00000100,</div><div class='add'>+	INTR_EN_TYPE_DISABLE = 0x00000200,</div><div class='add'>+	INTR_EN_TYPE_READ = 0x00000300,</div><div class='add'>+	INTR_EN_IHD = (1 &lt;&lt; 13),</div><div class='add'>+	INTR_EN_IHD_MASK = (INTR_EN_IHD &lt;&lt; 16),</div><div class='add'>+	INTR_EN_EI = (1 &lt;&lt; 14),</div><div class='add'>+	INTR_EN_EN = (1 &lt;&lt; 15),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Interrupt Mask Register (INTR_MASK) bit definitions.</div><div class='add'>+ */</div><div class='add'>+enum {</div><div class='add'>+	INTR_MASK_PI = (1 &lt;&lt; 0),</div><div class='add'>+	INTR_MASK_HL0 = (1 &lt;&lt; 1),</div><div class='add'>+	INTR_MASK_LH0 = (1 &lt;&lt; 2),</div><div class='add'>+	INTR_MASK_HL1 = (1 &lt;&lt; 3),</div><div class='add'>+	INTR_MASK_LH1 = (1 &lt;&lt; 4),</div><div class='add'>+	INTR_MASK_SE = (1 &lt;&lt; 5),</div><div class='add'>+	INTR_MASK_LSC = (1 &lt;&lt; 6),</div><div class='add'>+	INTR_MASK_MC = (1 &lt;&lt; 7),</div><div class='add'>+	INTR_MASK_LINK_IRQS = INTR_MASK_LSC | INTR_MASK_SE | INTR_MASK_MC,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  Register (REV_ID) bit definitions.</div><div class='add'>+ */</div><div class='add'>+enum {</div><div class='add'>+	REV_ID_MASK = 0x0000000f,</div><div class='add'>+	REV_ID_NICROLL_SHIFT = 0,</div><div class='add'>+	REV_ID_NICREV_SHIFT = 4,</div><div class='add'>+	REV_ID_XGROLL_SHIFT = 8,</div><div class='add'>+	REV_ID_XGREV_SHIFT = 12,</div><div class='add'>+	REV_ID_CHIPREV_SHIFT = 28,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  Force ECC Error Register (FRC_ECC_ERR) bit definitions.</div><div class='add'>+ */</div><div class='add'>+enum {</div><div class='add'>+	FRC_ECC_ERR_VW = (1 &lt;&lt; 12),</div><div class='add'>+	FRC_ECC_ERR_VB = (1 &lt;&lt; 13),</div><div class='add'>+	FRC_ECC_ERR_NI = (1 &lt;&lt; 14),</div><div class='add'>+	FRC_ECC_ERR_NO = (1 &lt;&lt; 15),</div><div class='add'>+	FRC_ECC_PFE_SHIFT = 16,</div><div class='add'>+	FRC_ECC_ERR_DO = (1 &lt;&lt; 18),</div><div class='add'>+	FRC_ECC_P14 = (1 &lt;&lt; 19),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  Error Status Register (ERR_STS) bit definitions.</div><div class='add'>+ */</div><div class='add'>+enum {</div><div class='add'>+	ERR_STS_NOF = (1 &lt;&lt; 0),</div><div class='add'>+	ERR_STS_NIF = (1 &lt;&lt; 1),</div><div class='add'>+	ERR_STS_DRP = (1 &lt;&lt; 2),</div><div class='add'>+	ERR_STS_XGP = (1 &lt;&lt; 3),</div><div class='add'>+	ERR_STS_FOU = (1 &lt;&lt; 4),</div><div class='add'>+	ERR_STS_FOC = (1 &lt;&lt; 5),</div><div class='add'>+	ERR_STS_FOF = (1 &lt;&lt; 6),</div><div class='add'>+	ERR_STS_FIU = (1 &lt;&lt; 7),</div><div class='add'>+	ERR_STS_FIC = (1 &lt;&lt; 8),</div><div class='add'>+	ERR_STS_FIF = (1 &lt;&lt; 9),</div><div class='add'>+	ERR_STS_MOF = (1 &lt;&lt; 10),</div><div class='add'>+	ERR_STS_TA = (1 &lt;&lt; 11),</div><div class='add'>+	ERR_STS_MA = (1 &lt;&lt; 12),</div><div class='add'>+	ERR_STS_MPE = (1 &lt;&lt; 13),</div><div class='add'>+	ERR_STS_SCE = (1 &lt;&lt; 14),</div><div class='add'>+	ERR_STS_STE = (1 &lt;&lt; 15),</div><div class='add'>+	ERR_STS_FOW = (1 &lt;&lt; 16),</div><div class='add'>+	ERR_STS_UE = (1 &lt;&lt; 17),</div><div class='add'>+	ERR_STS_MCH = (1 &lt;&lt; 26),</div><div class='add'>+	ERR_STS_LOC_SHIFT = 27,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  RAM Debug Address Register (RAM_DBG_ADDR) bit definitions.</div><div class='add'>+ */</div><div class='add'>+enum {</div><div class='add'>+	RAM_DBG_ADDR_FW = (1 &lt;&lt; 30),</div><div class='add'>+	RAM_DBG_ADDR_FR = (1 &lt;&lt; 31),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Semaphore Register (SEM) bit definitions.</div><div class='add'>+ */</div><div class='add'>+enum {</div><div class='add'>+	/*</div><div class='add'>+	 * Example:</div><div class='add'>+	 * reg = SEM_XGMAC0_MASK | (SEM_SET &lt;&lt; SEM_XGMAC0_SHIFT)</div><div class='add'>+	 */</div><div class='add'>+	SEM_CLEAR = 0,</div><div class='add'>+	SEM_SET = 1,</div><div class='add'>+	SEM_FORCE = 3,</div><div class='add'>+	SEM_XGMAC0_SHIFT = 0,</div><div class='add'>+	SEM_XGMAC1_SHIFT = 2,</div><div class='add'>+	SEM_ICB_SHIFT = 4,</div><div class='add'>+	SEM_MAC_ADDR_SHIFT = 6,</div><div class='add'>+	SEM_FLASH_SHIFT = 8,</div><div class='add'>+	SEM_PROBE_SHIFT = 10,</div><div class='add'>+	SEM_RT_IDX_SHIFT = 12,</div><div class='add'>+	SEM_PROC_REG_SHIFT = 14,</div><div class='add'>+	SEM_XGMAC0_MASK = 0x00030000,</div><div class='add'>+	SEM_XGMAC1_MASK = 0x000c0000,</div><div class='add'>+	SEM_ICB_MASK = 0x00300000,</div><div class='add'>+	SEM_MAC_ADDR_MASK = 0x00c00000,</div><div class='add'>+	SEM_FLASH_MASK = 0x03000000,</div><div class='add'>+	SEM_PROBE_MASK = 0x0c000000,</div><div class='add'>+	SEM_RT_IDX_MASK = 0x30000000,</div><div class='add'>+	SEM_PROC_REG_MASK = 0xc0000000,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  10G MAC Address  Register (XGMAC_ADDR) bit definitions.</div><div class='add'>+ */</div><div class='add'>+enum {</div><div class='add'>+	XGMAC_ADDR_RDY = (1 &lt;&lt; 31),</div><div class='add'>+	XGMAC_ADDR_R = (1 &lt;&lt; 30),</div><div class='add'>+	XGMAC_ADDR_XME = (1 &lt;&lt; 29),</div><div class='add'>+</div><div class='add'>+	/* XGMAC control registers */</div><div class='add'>+	PAUSE_SRC_LO = 0x00000100,</div><div class='add'>+	PAUSE_SRC_HI = 0x00000104,</div><div class='add'>+	GLOBAL_CFG = 0x00000108,</div><div class='add'>+	GLOBAL_CFG_RESET = (1 &lt;&lt; 0),</div><div class='add'>+	GLOBAL_CFG_JUMBO = (1 &lt;&lt; 6),</div><div class='add'>+	GLOBAL_CFG_TX_STAT_EN = (1 &lt;&lt; 10),</div><div class='add'>+	GLOBAL_CFG_RX_STAT_EN = (1 &lt;&lt; 11),</div><div class='add'>+	TX_CFG = 0x0000010c,</div><div class='add'>+	TX_CFG_RESET = (1 &lt;&lt; 0),</div><div class='add'>+	TX_CFG_EN = (1 &lt;&lt; 1),</div><div class='add'>+	TX_CFG_PREAM = (1 &lt;&lt; 2),</div><div class='add'>+	RX_CFG = 0x00000110,</div><div class='add'>+	RX_CFG_RESET = (1 &lt;&lt; 0),</div><div class='add'>+	RX_CFG_EN = (1 &lt;&lt; 1),</div><div class='add'>+	RX_CFG_PREAM = (1 &lt;&lt; 2),</div><div class='add'>+	FLOW_CTL = 0x0000011c,</div><div class='add'>+	PAUSE_OPCODE = 0x00000120,</div><div class='add'>+	PAUSE_TIMER = 0x00000124,</div><div class='add'>+	PAUSE_FRM_DEST_LO = 0x00000128,</div><div class='add'>+	PAUSE_FRM_DEST_HI = 0x0000012c,</div><div class='add'>+	MAC_TX_PARAMS = 0x00000134,</div><div class='add'>+	MAC_TX_PARAMS_JUMBO = (1 &lt;&lt; 31),</div><div class='add'>+	MAC_TX_PARAMS_SIZE_SHIFT = 16,</div><div class='add'>+	MAC_RX_PARAMS = 0x00000138,</div><div class='add'>+	MAC_SYS_INT = 0x00000144,</div><div class='add'>+	MAC_SYS_INT_MASK = 0x00000148,</div><div class='add'>+	MAC_MGMT_INT = 0x0000014c,</div><div class='add'>+	MAC_MGMT_IN_MASK = 0x00000150,</div><div class='add'>+	EXT_ARB_MODE = 0x000001fc,</div><div class='add'>+</div><div class='add'>+	/* XGMAC TX statistics  registers */</div><div class='add'>+	TX_PKTS = 0x00000200,</div><div class='add'>+	TX_BYTES = 0x00000208,</div><div class='add'>+	TX_MCAST_PKTS = 0x00000210,</div><div class='add'>+	TX_BCAST_PKTS = 0x00000218,</div><div class='add'>+	TX_UCAST_PKTS = 0x00000220,</div><div class='add'>+	TX_CTL_PKTS = 0x00000228,</div><div class='add'>+	TX_PAUSE_PKTS = 0x00000230,</div><div class='add'>+	TX_64_PKT = 0x00000238,</div><div class='add'>+	TX_65_TO_127_PKT = 0x00000240,</div><div class='add'>+	TX_128_TO_255_PKT = 0x00000248,</div><div class='add'>+	TX_256_511_PKT = 0x00000250,</div><div class='add'>+	TX_512_TO_1023_PKT = 0x00000258,</div><div class='add'>+	TX_1024_TO_1518_PKT = 0x00000260,</div><div class='add'>+	TX_1519_TO_MAX_PKT = 0x00000268,</div><div class='add'>+	TX_UNDERSIZE_PKT = 0x00000270,</div><div class='add'>+	TX_OVERSIZE_PKT = 0x00000278,</div><div class='add'>+</div><div class='add'>+	/* XGMAC statistics control registers */</div><div class='add'>+	RX_HALF_FULL_DET = 0x000002a0,</div><div class='add'>+	TX_HALF_FULL_DET = 0x000002a4,</div><div class='add'>+	RX_OVERFLOW_DET = 0x000002a8,</div><div class='add'>+	TX_OVERFLOW_DET = 0x000002ac,</div><div class='add'>+	RX_HALF_FULL_MASK = 0x000002b0,</div><div class='add'>+	TX_HALF_FULL_MASK = 0x000002b4,</div><div class='add'>+	RX_OVERFLOW_MASK = 0x000002b8,</div><div class='add'>+	TX_OVERFLOW_MASK = 0x000002bc,</div><div class='add'>+	STAT_CNT_CTL = 0x000002c0,</div><div class='add'>+	STAT_CNT_CTL_CLEAR_TX = (1 &lt;&lt; 0),</div><div class='add'>+	STAT_CNT_CTL_CLEAR_RX = (1 &lt;&lt; 1),</div><div class='add'>+	AUX_RX_HALF_FULL_DET = 0x000002d0,</div><div class='add'>+	AUX_TX_HALF_FULL_DET = 0x000002d4,</div><div class='add'>+	AUX_RX_OVERFLOW_DET = 0x000002d8,</div><div class='add'>+	AUX_TX_OVERFLOW_DET = 0x000002dc,</div><div class='add'>+	AUX_RX_HALF_FULL_MASK = 0x000002f0,</div><div class='add'>+	AUX_TX_HALF_FULL_MASK = 0x000002f4,</div><div class='add'>+	AUX_RX_OVERFLOW_MASK = 0x000002f8,</div><div class='add'>+	AUX_TX_OVERFLOW_MASK = 0x000002fc,</div><div class='add'>+</div><div class='add'>+	/* XGMAC RX statistics  registers */</div><div class='add'>+	RX_BYTES = 0x00000300,</div><div class='add'>+	RX_BYTES_OK = 0x00000308,</div><div class='add'>+	RX_PKTS = 0x00000310,</div><div class='add'>+	RX_PKTS_OK = 0x00000318,</div><div class='add'>+	RX_BCAST_PKTS = 0x00000320,</div><div class='add'>+	RX_MCAST_PKTS = 0x00000328,</div><div class='add'>+	RX_UCAST_PKTS = 0x00000330,</div><div class='add'>+	RX_UNDERSIZE_PKTS = 0x00000338,</div><div class='add'>+	RX_OVERSIZE_PKTS = 0x00000340,</div><div class='add'>+	RX_JABBER_PKTS = 0x00000348,</div><div class='add'>+	RX_UNDERSIZE_FCERR_PKTS = 0x00000350,</div><div class='add'>+	RX_DROP_EVENTS = 0x00000358,</div><div class='add'>+	RX_FCERR_PKTS = 0x00000360,</div><div class='add'>+	RX_ALIGN_ERR = 0x00000368,</div><div class='add'>+	RX_SYMBOL_ERR = 0x00000370,</div><div class='add'>+	RX_MAC_ERR = 0x00000378,</div><div class='add'>+	RX_CTL_PKTS = 0x00000380,</div><div class='add'>+	RX_PAUSE_PKTS = 0x00000384,</div><div class='add'>+	RX_64_PKTS = 0x00000390,</div><div class='add'>+	RX_65_TO_127_PKTS = 0x00000398,</div><div class='add'>+	RX_128_255_PKTS = 0x000003a0,</div><div class='add'>+	RX_256_511_PKTS = 0x000003a8,</div><div class='add'>+	RX_512_TO_1023_PKTS = 0x000003b0,</div><div class='add'>+	RX_1024_TO_1518_PKTS = 0x000003b8,</div><div class='add'>+	RX_1519_TO_MAX_PKTS = 0x000003c0,</div><div class='add'>+	RX_LEN_ERR_PKTS = 0x000003c8,</div><div class='add'>+</div><div class='add'>+	/* XGMAC MDIO control registers */</div><div class='add'>+	MDIO_TX_DATA = 0x00000400,</div><div class='add'>+	MDIO_RX_DATA = 0x00000410,</div><div class='add'>+	MDIO_CMD = 0x00000420,</div><div class='add'>+	MDIO_PHY_ADDR = 0x00000430,</div><div class='add'>+	MDIO_PORT = 0x00000440,</div><div class='add'>+	MDIO_STATUS = 0x00000450,</div><div class='add'>+</div><div class='add'>+	/* XGMAC AUX statistics  registers */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  Enhanced Transmission Schedule Registers (NIC_ETS,CNA_ETS) bit definitions.</div><div class='add'>+ */</div><div class='add'>+enum {</div><div class='add'>+	ETS_QUEUE_SHIFT = 29,</div><div class='add'>+	ETS_REF = (1 &lt;&lt; 26),</div><div class='add'>+	ETS_RS = (1 &lt;&lt; 27),</div><div class='add'>+	ETS_P = (1 &lt;&lt; 28),</div><div class='add'>+	ETS_FC_COS_SHIFT = 23,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  Flash Address Register (FLASH_ADDR) bit definitions.</div><div class='add'>+ */</div><div class='add'>+enum {</div><div class='add'>+	FLASH_ADDR_RDY = (1 &lt;&lt; 31),</div><div class='add'>+	FLASH_ADDR_R = (1 &lt;&lt; 30),</div><div class='add'>+	FLASH_ADDR_ERR = (1 &lt;&lt; 29),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  Stop CQ Processing Register (CQ_STOP) bit definitions.</div><div class='add'>+ */</div><div class='add'>+enum {</div><div class='add'>+	CQ_STOP_QUEUE_MASK = (0x007f0000),</div><div class='add'>+	CQ_STOP_TYPE_MASK = (0x03000000),</div><div class='add'>+	CQ_STOP_TYPE_START = 0x00000100,</div><div class='add'>+	CQ_STOP_TYPE_STOP = 0x00000200,</div><div class='add'>+	CQ_STOP_TYPE_READ = 0x00000300,</div><div class='add'>+	CQ_STOP_EN = (1 &lt;&lt; 15),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  MAC Protocol Address Index Register (MAC_ADDR_IDX) bit definitions.</div><div class='add'>+ */</div><div class='add'>+enum {</div><div class='add'>+	MAC_ADDR_IDX_SHIFT = 4,</div><div class='add'>+	MAC_ADDR_TYPE_SHIFT = 16,</div><div class='add'>+	MAC_ADDR_TYPE_MASK = 0x000f0000,</div><div class='add'>+	MAC_ADDR_TYPE_CAM_MAC = 0x00000000,</div><div class='add'>+	MAC_ADDR_TYPE_MULTI_MAC = 0x00010000,</div><div class='add'>+	MAC_ADDR_TYPE_VLAN = 0x00020000,</div><div class='add'>+	MAC_ADDR_TYPE_MULTI_FLTR = 0x00030000,</div><div class='add'>+	MAC_ADDR_TYPE_FC_MAC = 0x00040000,</div><div class='add'>+	MAC_ADDR_TYPE_MGMT_MAC = 0x00050000,</div><div class='add'>+	MAC_ADDR_TYPE_MGMT_VLAN = 0x00060000,</div><div class='add'>+	MAC_ADDR_TYPE_MGMT_V4 = 0x00070000,</div><div class='add'>+	MAC_ADDR_TYPE_MGMT_V6 = 0x00080000,</div><div class='add'>+	MAC_ADDR_TYPE_MGMT_TU_DP = 0x00090000,</div><div class='add'>+	MAC_ADDR_ADR = (1 &lt;&lt; 25),</div><div class='add'>+	MAC_ADDR_RS = (1 &lt;&lt; 26),</div><div class='add'>+	MAC_ADDR_E = (1 &lt;&lt; 27),</div><div class='add'>+	MAC_ADDR_MR = (1 &lt;&lt; 30),</div><div class='add'>+	MAC_ADDR_MW = (1 &lt;&lt; 31),</div><div class='add'>+	MAX_MULTICAST_ENTRIES = 32,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  MAC Protocol Address Index Register (SPLT_HDR) bit definitions.</div><div class='add'>+ */</div><div class='add'>+enum {</div><div class='add'>+	SPLT_HDR_EP = (1 &lt;&lt; 31),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  FCoE Receive Configuration Register (FC_RCV_CFG) bit definitions.</div><div class='add'>+ */</div><div class='add'>+enum {</div><div class='add'>+	FC_RCV_CFG_ECT = (1 &lt;&lt; 15),</div><div class='add'>+	FC_RCV_CFG_DFH = (1 &lt;&lt; 20),</div><div class='add'>+	FC_RCV_CFG_DVF = (1 &lt;&lt; 21),</div><div class='add'>+	FC_RCV_CFG_RCE = (1 &lt;&lt; 27),</div><div class='add'>+	FC_RCV_CFG_RFE = (1 &lt;&lt; 28),</div><div class='add'>+	FC_RCV_CFG_TEE = (1 &lt;&lt; 29),</div><div class='add'>+	FC_RCV_CFG_TCE = (1 &lt;&lt; 30),</div><div class='add'>+	FC_RCV_CFG_TFE = (1 &lt;&lt; 31),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  NIC Receive Configuration Register (NIC_RCV_CFG) bit definitions.</div><div class='add'>+ */</div><div class='add'>+enum {</div><div class='add'>+	NIC_RCV_CFG_PPE = (1 &lt;&lt; 0),</div><div class='add'>+	NIC_RCV_CFG_VLAN_MASK = 0x00060000,</div><div class='add'>+	NIC_RCV_CFG_VLAN_ALL = 0x00000000,</div><div class='add'>+	NIC_RCV_CFG_VLAN_MATCH_ONLY = 0x00000002,</div><div class='add'>+	NIC_RCV_CFG_VLAN_MATCH_AND_NON = 0x00000004,</div><div class='add'>+	NIC_RCV_CFG_VLAN_NONE_AND_NON = 0x00000006,</div><div class='add'>+	NIC_RCV_CFG_RV = (1 &lt;&lt; 3),</div><div class='add'>+	NIC_RCV_CFG_DFQ_MASK = (0x7f000000),</div><div class='add'>+	NIC_RCV_CFG_DFQ_SHIFT = 8,</div><div class='add'>+	NIC_RCV_CFG_DFQ = 0,	/* HARDCODE default queue to 0. */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *   Mgmt Receive Configuration Register (MGMT_RCV_CFG) bit definitions.</div><div class='add'>+ */</div><div class='add'>+enum {</div><div class='add'>+	MGMT_RCV_CFG_ARP = (1 &lt;&lt; 0),</div><div class='add'>+	MGMT_RCV_CFG_DHC = (1 &lt;&lt; 1),</div><div class='add'>+	MGMT_RCV_CFG_DHS = (1 &lt;&lt; 2),</div><div class='add'>+	MGMT_RCV_CFG_NP = (1 &lt;&lt; 3),</div><div class='add'>+	MGMT_RCV_CFG_I6N = (1 &lt;&lt; 4),</div><div class='add'>+	MGMT_RCV_CFG_I6R = (1 &lt;&lt; 5),</div><div class='add'>+	MGMT_RCV_CFG_DH6 = (1 &lt;&lt; 6),</div><div class='add'>+	MGMT_RCV_CFG_UD1 = (1 &lt;&lt; 7),</div><div class='add'>+	MGMT_RCV_CFG_UD0 = (1 &lt;&lt; 8),</div><div class='add'>+	MGMT_RCV_CFG_BCT = (1 &lt;&lt; 9),</div><div class='add'>+	MGMT_RCV_CFG_MCT = (1 &lt;&lt; 10),</div><div class='add'>+	MGMT_RCV_CFG_DM = (1 &lt;&lt; 11),</div><div class='add'>+	MGMT_RCV_CFG_RM = (1 &lt;&lt; 12),</div><div class='add'>+	MGMT_RCV_CFG_STL = (1 &lt;&lt; 13),</div><div class='add'>+	MGMT_RCV_CFG_VLAN_MASK = 0xc0000000,</div><div class='add'>+	MGMT_RCV_CFG_VLAN_ALL = 0x00000000,</div><div class='add'>+	MGMT_RCV_CFG_VLAN_MATCH_ONLY = 0x00004000,</div><div class='add'>+	MGMT_RCV_CFG_VLAN_MATCH_AND_NON = 0x00008000,</div><div class='add'>+	MGMT_RCV_CFG_VLAN_NONE_AND_NON = 0x0000c000,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  Routing Index Register (RT_IDX) bit definitions.</div><div class='add'>+ */</div><div class='add'>+enum {</div><div class='add'>+	RT_IDX_IDX_SHIFT = 8,</div><div class='add'>+	RT_IDX_TYPE_MASK = 0x000f0000,</div><div class='add'>+	RT_IDX_TYPE_RT = 0x00000000,</div><div class='add'>+	RT_IDX_TYPE_RT_INV = 0x00010000,</div><div class='add'>+	RT_IDX_TYPE_NICQ = 0x00020000,</div><div class='add'>+	RT_IDX_TYPE_NICQ_INV = 0x00030000,</div><div class='add'>+	RT_IDX_DST_MASK = 0x00700000,</div><div class='add'>+	RT_IDX_DST_RSS = 0x00000000,</div><div class='add'>+	RT_IDX_DST_CAM_Q = 0x00100000,</div><div class='add'>+	RT_IDX_DST_COS_Q = 0x00200000,</div><div class='add'>+	RT_IDX_DST_DFLT_Q = 0x00300000,</div><div class='add'>+	RT_IDX_DST_DEST_Q = 0x00400000,</div><div class='add'>+	RT_IDX_RS = (1 &lt;&lt; 26),</div><div class='add'>+	RT_IDX_E = (1 &lt;&lt; 27),</div><div class='add'>+	RT_IDX_MR = (1 &lt;&lt; 30),</div><div class='add'>+	RT_IDX_MW = (1 &lt;&lt; 31),</div><div class='add'>+</div><div class='add'>+	/* Nic Queue format - type 2 bits */</div><div class='add'>+	RT_IDX_BCAST = (1 &lt;&lt; 0),</div><div class='add'>+	RT_IDX_MCAST = (1 &lt;&lt; 1),</div><div class='add'>+	RT_IDX_MCAST_MATCH = (1 &lt;&lt; 2),</div><div class='add'>+	RT_IDX_MCAST_REG_MATCH = (1 &lt;&lt; 3),</div><div class='add'>+	RT_IDX_MCAST_HASH_MATCH = (1 &lt;&lt; 4),</div><div class='add'>+	RT_IDX_FC_MACH = (1 &lt;&lt; 5),</div><div class='add'>+	RT_IDX_ETH_FCOE = (1 &lt;&lt; 6),</div><div class='add'>+	RT_IDX_CAM_HIT = (1 &lt;&lt; 7),</div><div class='add'>+	RT_IDX_CAM_BIT0 = (1 &lt;&lt; 8),</div><div class='add'>+	RT_IDX_CAM_BIT1 = (1 &lt;&lt; 9),</div><div class='add'>+	RT_IDX_VLAN_TAG = (1 &lt;&lt; 10),</div><div class='add'>+	RT_IDX_VLAN_MATCH = (1 &lt;&lt; 11),</div><div class='add'>+	RT_IDX_VLAN_FILTER = (1 &lt;&lt; 12),</div><div class='add'>+	RT_IDX_ETH_SKIP1 = (1 &lt;&lt; 13),</div><div class='add'>+	RT_IDX_ETH_SKIP2 = (1 &lt;&lt; 14),</div><div class='add'>+	RT_IDX_BCAST_MCAST_MATCH = (1 &lt;&lt; 15),</div><div class='add'>+	RT_IDX_802_3 = (1 &lt;&lt; 16),</div><div class='add'>+	RT_IDX_LLDP = (1 &lt;&lt; 17),</div><div class='add'>+	RT_IDX_UNUSED018 = (1 &lt;&lt; 18),</div><div class='add'>+	RT_IDX_UNUSED019 = (1 &lt;&lt; 19),</div><div class='add'>+	RT_IDX_UNUSED20 = (1 &lt;&lt; 20),</div><div class='add'>+	RT_IDX_UNUSED21 = (1 &lt;&lt; 21),</div><div class='add'>+	RT_IDX_ERR = (1 &lt;&lt; 22),</div><div class='add'>+	RT_IDX_VALID = (1 &lt;&lt; 23),</div><div class='add'>+	RT_IDX_TU_CSUM_ERR = (1 &lt;&lt; 24),</div><div class='add'>+	RT_IDX_IP_CSUM_ERR = (1 &lt;&lt; 25),</div><div class='add'>+	RT_IDX_MAC_ERR = (1 &lt;&lt; 26),</div><div class='add'>+	RT_IDX_RSS_TCP6 = (1 &lt;&lt; 27),</div><div class='add'>+	RT_IDX_RSS_TCP4 = (1 &lt;&lt; 28),</div><div class='add'>+	RT_IDX_RSS_IPV6 = (1 &lt;&lt; 29),</div><div class='add'>+	RT_IDX_RSS_IPV4 = (1 &lt;&lt; 30),</div><div class='add'>+	RT_IDX_RSS_MATCH = (1 &lt;&lt; 31),</div><div class='add'>+</div><div class='add'>+	/* Hierarchy for the NIC Queue Mask */</div><div class='add'>+	RT_IDX_ALL_ERR_SLOT = 0,</div><div class='add'>+	RT_IDX_MAC_ERR_SLOT = 0,</div><div class='add'>+	RT_IDX_IP_CSUM_ERR_SLOT = 1,</div><div class='add'>+	RT_IDX_TCP_UDP_CSUM_ERR_SLOT = 2,</div><div class='add'>+	RT_IDX_BCAST_SLOT = 3,</div><div class='add'>+	RT_IDX_MCAST_MATCH_SLOT = 4,</div><div class='add'>+	RT_IDX_ALLMULTI_SLOT = 5,</div><div class='add'>+	RT_IDX_UNUSED6_SLOT = 6,</div><div class='add'>+	RT_IDX_UNUSED7_SLOT = 7,</div><div class='add'>+	RT_IDX_RSS_MATCH_SLOT = 8,</div><div class='add'>+	RT_IDX_RSS_IPV4_SLOT = 8,</div><div class='add'>+	RT_IDX_RSS_IPV6_SLOT = 9,</div><div class='add'>+	RT_IDX_RSS_TCP4_SLOT = 10,</div><div class='add'>+	RT_IDX_RSS_TCP6_SLOT = 11,</div><div class='add'>+	RT_IDX_CAM_HIT_SLOT = 12,</div><div class='add'>+	RT_IDX_UNUSED013 = 13,</div><div class='add'>+	RT_IDX_UNUSED014 = 14,</div><div class='add'>+	RT_IDX_PROMISCUOUS_SLOT = 15,</div><div class='add'>+	RT_IDX_MAX_SLOTS = 16,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Control Register Set Map</div><div class='add'>+ */</div><div class='add'>+enum {</div><div class='add'>+	PROC_ADDR = 0,		/* Use semaphore */</div><div class='add'>+	PROC_DATA = 0x04,	/* Use semaphore */</div><div class='add'>+	SYS = 0x08,</div><div class='add'>+	RST_FO = 0x0c,</div><div class='add'>+	FSC = 0x10,</div><div class='add'>+	CSR = 0x14,</div><div class='add'>+	LED = 0x18,</div><div class='add'>+	ICB_RID = 0x1c,		/* Use semaphore */</div><div class='add'>+	ICB_L = 0x20,		/* Use semaphore */</div><div class='add'>+	ICB_H = 0x24,		/* Use semaphore */</div><div class='add'>+	CFG = 0x28,</div><div class='add'>+	BIOS_ADDR = 0x2c,</div><div class='add'>+	STS = 0x30,</div><div class='add'>+	INTR_EN = 0x34,</div><div class='add'>+	INTR_MASK = 0x38,</div><div class='add'>+	ISR1 = 0x3c,</div><div class='add'>+	ISR2 = 0x40,</div><div class='add'>+	ISR3 = 0x44,</div><div class='add'>+	ISR4 = 0x48,</div><div class='add'>+	REV_ID = 0x4c,</div><div class='add'>+	FRC_ECC_ERR = 0x50,</div><div class='add'>+	ERR_STS = 0x54,</div><div class='add'>+	RAM_DBG_ADDR = 0x58,</div><div class='add'>+	RAM_DBG_DATA = 0x5c,</div><div class='add'>+	ECC_ERR_CNT = 0x60,</div><div class='add'>+	SEM = 0x64,</div><div class='add'>+	GPIO_1 = 0x68,		/* Use semaphore */</div><div class='add'>+	GPIO_2 = 0x6c,		/* Use semaphore */</div><div class='add'>+	GPIO_3 = 0x70,		/* Use semaphore */</div><div class='add'>+	RSVD2 = 0x74,</div><div class='add'>+	XGMAC_ADDR = 0x78,	/* Use semaphore */</div><div class='add'>+	XGMAC_DATA = 0x7c,	/* Use semaphore */</div><div class='add'>+	NIC_ETS = 0x80,</div><div class='add'>+	CNA_ETS = 0x84,</div><div class='add'>+	FLASH_ADDR = 0x88,	/* Use semaphore */</div><div class='add'>+	FLASH_DATA = 0x8c,	/* Use semaphore */</div><div class='add'>+	CQ_STOP = 0x90,</div><div class='add'>+	PAGE_TBL_RID = 0x94,</div><div class='add'>+	WQ_PAGE_TBL_LO = 0x98,</div><div class='add'>+	WQ_PAGE_TBL_HI = 0x9c,</div><div class='add'>+	CQ_PAGE_TBL_LO = 0xa0,</div><div class='add'>+	CQ_PAGE_TBL_HI = 0xa4,</div><div class='add'>+	MAC_ADDR_IDX = 0xa8,	/* Use semaphore */</div><div class='add'>+	MAC_ADDR_DATA = 0xac,	/* Use semaphore */</div><div class='add'>+	COS_DFLT_CQ1 = 0xb0,</div><div class='add'>+	COS_DFLT_CQ2 = 0xb4,</div><div class='add'>+	ETYPE_SKIP1 = 0xb8,</div><div class='add'>+	ETYPE_SKIP2 = 0xbc,</div><div class='add'>+	SPLT_HDR = 0xc0,</div><div class='add'>+	FC_PAUSE_THRES = 0xc4,</div><div class='add'>+	NIC_PAUSE_THRES = 0xc8,</div><div class='add'>+	FC_ETHERTYPE = 0xcc,</div><div class='add'>+	FC_RCV_CFG = 0xd0,</div><div class='add'>+	NIC_RCV_CFG = 0xd4,</div><div class='add'>+	FC_COS_TAGS = 0xd8,</div><div class='add'>+	NIC_COS_TAGS = 0xdc,</div><div class='add'>+	MGMT_RCV_CFG = 0xe0,</div><div class='add'>+	RT_IDX = 0xe4,</div><div class='add'>+	RT_DATA = 0xe8,</div><div class='add'>+	RSVD7 = 0xec,</div><div class='add'>+	XG_SERDES_ADDR = 0xf0,</div><div class='add'>+	XG_SERDES_DATA = 0xf4,</div><div class='add'>+	PRB_MX_ADDR = 0xf8,	/* Use semaphore */</div><div class='add'>+	PRB_MX_DATA = 0xfc,	/* Use semaphore */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * CAM output format.</div><div class='add'>+ */</div><div class='add'>+enum {</div><div class='add'>+	CAM_OUT_ROUTE_FC = 0,</div><div class='add'>+	CAM_OUT_ROUTE_NIC = 1,</div><div class='add'>+	CAM_OUT_FUNC_SHIFT = 2,</div><div class='add'>+	CAM_OUT_RV = (1 &lt;&lt; 4),</div><div class='add'>+	CAM_OUT_SH = (1 &lt;&lt; 15),</div><div class='add'>+	CAM_OUT_CQ_ID_SHIFT = 5,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Mailbox  definitions</div><div class='add'>+ */</div><div class='add'>+enum {</div><div class='add'>+	/* Asynchronous Event Notifications */</div><div class='add'>+	AEN_SYS_ERR = 0x00008002,</div><div class='add'>+	AEN_LINK_UP = 0x00008011,</div><div class='add'>+	AEN_LINK_DOWN = 0x00008012,</div><div class='add'>+	AEN_IDC_CMPLT = 0x00008100,</div><div class='add'>+	AEN_IDC_REQ = 0x00008101,</div><div class='add'>+	AEN_FW_INIT_DONE = 0x00008400,</div><div class='add'>+	AEN_FW_INIT_FAIL = 0x00008401,</div><div class='add'>+</div><div class='add'>+	/* Mailbox Command Opcodes. */</div><div class='add'>+	MB_CMD_NOP = 0x00000000,</div><div class='add'>+	MB_CMD_EX_FW = 0x00000002,</div><div class='add'>+	MB_CMD_MB_TEST = 0x00000006,</div><div class='add'>+	MB_CMD_CSUM_TEST = 0x00000007,	/* Verify Checksum */</div><div class='add'>+	MB_CMD_ABOUT_FW = 0x00000008,</div><div class='add'>+	MB_CMD_LOAD_RISC_RAM = 0x0000000b,</div><div class='add'>+	MB_CMD_DUMP_RISC_RAM = 0x0000000c,</div><div class='add'>+	MB_CMD_WRITE_RAM = 0x0000000d,</div><div class='add'>+	MB_CMD_READ_RAM = 0x0000000f,</div><div class='add'>+	MB_CMD_STOP_FW = 0x00000014,</div><div class='add'>+	MB_CMD_MAKE_SYS_ERR = 0x0000002a,</div><div class='add'>+	MB_CMD_INIT_FW = 0x00000060,</div><div class='add'>+	MB_CMD_GET_INIT_CB = 0x00000061,</div><div class='add'>+	MB_CMD_GET_FW_STATE = 0x00000069,</div><div class='add'>+	MB_CMD_IDC_REQ = 0x00000100,	/* Inter-Driver Communication */</div><div class='add'>+	MB_CMD_IDC_ACK = 0x00000101,	/* Inter-Driver Communication */</div><div class='add'>+	MB_CMD_SET_WOL_MODE = 0x00000110,	/* Wake On Lan */</div><div class='add'>+	MB_WOL_DISABLE = 0x00000000,</div><div class='add'>+	MB_WOL_MAGIC_PKT = 0x00000001,</div><div class='add'>+	MB_WOL_FLTR = 0x00000002,</div><div class='add'>+	MB_WOL_UCAST = 0x00000004,</div><div class='add'>+	MB_WOL_MCAST = 0x00000008,</div><div class='add'>+	MB_WOL_BCAST = 0x00000010,</div><div class='add'>+	MB_WOL_LINK_UP = 0x00000020,</div><div class='add'>+	MB_WOL_LINK_DOWN = 0x00000040,</div><div class='add'>+	MB_CMD_SET_WOL_FLTR = 0x00000111,	/* Wake On Lan Filter */</div><div class='add'>+	MB_CMD_CLEAR_WOL_FLTR = 0x00000112,	/* Wake On Lan Filter */</div><div class='add'>+	MB_CMD_SET_WOL_MAGIC = 0x00000113,	/* Wake On Lan Magic Packet */</div><div class='add'>+	MB_CMD_CLEAR_WOL_MAGIC = 0x00000114,	/* Wake On Lan Magic Packet */</div><div class='add'>+	MB_CMD_PORT_RESET = 0x00000120,</div><div class='add'>+	MB_CMD_SET_PORT_CFG = 0x00000122,</div><div class='add'>+	MB_CMD_GET_PORT_CFG = 0x00000123,</div><div class='add'>+	MB_CMD_SET_ASIC_VOLTS = 0x00000130,</div><div class='add'>+	MB_CMD_GET_SNS_DATA = 0x00000131,	/* Temp and Volt Sense data. */</div><div class='add'>+</div><div class='add'>+	/* Mailbox Command Status. */</div><div class='add'>+	MB_CMD_STS_GOOD = 0x00004000,	/* Success. */</div><div class='add'>+	MB_CMD_STS_INTRMDT = 0x00001000,	/* Intermediate Complete. */</div><div class='add'>+	MB_CMD_STS_ERR = 0x00004005,	/* Error. */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mbox_params {</div><div class='add'>+	u32 mbox_in[MAILBOX_COUNT];</div><div class='add'>+	u32 mbox_out[MAILBOX_COUNT];</div><div class='add'>+	int in_count;</div><div class='add'>+	int out_count;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct flash_params {</div><div class='add'>+	u8 dev_id_str[4];</div><div class='add'>+	u16 size;</div><div class='add'>+	u16 csum;</div><div class='add'>+	u16 ver;</div><div class='add'>+	u16 sub_dev_id;</div><div class='add'>+	u8 mac_addr[6];</div><div class='add'>+	u16 res;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * doorbell space for the rx ring context</div><div class='add'>+ */</div><div class='add'>+struct rx_doorbell_context {</div><div class='add'>+	u32 cnsmr_idx;		/* 0x00 */</div><div class='add'>+	u32 valid;		/* 0x04 */</div><div class='add'>+	u32 reserved[4];	/* 0x08-0x14 */</div><div class='add'>+	u32 lbq_prod_idx;	/* 0x18 */</div><div class='add'>+	u32 sbq_prod_idx;	/* 0x1c */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * doorbell space for the tx ring context</div><div class='add'>+ */</div><div class='add'>+struct tx_doorbell_context {</div><div class='add'>+	u32 prod_idx;		/* 0x00 */</div><div class='add'>+	u32 valid;		/* 0x04 */</div><div class='add'>+	u32 reserved[4];	/* 0x08-0x14 */</div><div class='add'>+	u32 lbq_prod_idx;	/* 0x18 */</div><div class='add'>+	u32 sbq_prod_idx;	/* 0x1c */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DATA STRUCTURES SHARED WITH HARDWARE. */</div><div class='add'>+</div><div class='add'>+struct bq_element {</div><div class='add'>+	u32 addr_lo;</div><div class='add'>+#define BQ_END	0x00000001</div><div class='add'>+#define BQ_CONT	0x00000002</div><div class='add'>+#define BQ_MASK	0x00000003</div><div class='add'>+	u32 addr_hi;</div><div class='add'>+} __attribute((packed));</div><div class='add'>+</div><div class='add'>+struct tx_buf_desc {</div><div class='add'>+	__le64 addr;</div><div class='add'>+	__le32 len;</div><div class='add'>+#define TX_DESC_LEN_MASK	0x000fffff</div><div class='add'>+#define TX_DESC_C	0x40000000</div><div class='add'>+#define TX_DESC_E	0x80000000</div><div class='add'>+} __attribute((packed));</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * IOCB Definitions...</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define OPCODE_OB_MAC_IOCB 			0x01</div><div class='add'>+#define OPCODE_OB_MAC_TSO_IOCB		0x02</div><div class='add'>+#define OPCODE_IB_MAC_IOCB			0x20</div><div class='add'>+#define OPCODE_IB_MPI_IOCB			0x21</div><div class='add'>+#define OPCODE_IB_AE_IOCB			0x3f</div><div class='add'>+</div><div class='add'>+struct ob_mac_iocb_req {</div><div class='add'>+	u8 opcode;</div><div class='add'>+	u8 flags1;</div><div class='add'>+#define OB_MAC_IOCB_REQ_OI	0x01</div><div class='add'>+#define OB_MAC_IOCB_REQ_I	0x02</div><div class='add'>+#define OB_MAC_IOCB_REQ_D	0x08</div><div class='add'>+#define OB_MAC_IOCB_REQ_F	0x10</div><div class='add'>+	u8 flags2;</div><div class='add'>+	u8 flags3;</div><div class='add'>+#define OB_MAC_IOCB_DFP	0x02</div><div class='add'>+#define OB_MAC_IOCB_V	0x04</div><div class='add'>+	__le32 reserved1[2];</div><div class='add'>+	__le16 frame_len;</div><div class='add'>+#define OB_MAC_IOCB_LEN_MASK 0x3ffff</div><div class='add'>+	__le16 reserved2;</div><div class='add'>+	__le32 tid;</div><div class='add'>+	__le32 txq_idx;</div><div class='add'>+	__le32 reserved3;</div><div class='add'>+	__le16 vlan_tci;</div><div class='add'>+	__le16 reserved4;</div><div class='add'>+	struct tx_buf_desc tbd[TX_DESC_PER_IOCB];</div><div class='add'>+} __attribute((packed));</div><div class='add'>+</div><div class='add'>+struct ob_mac_iocb_rsp {</div><div class='add'>+	u8 opcode;		/* */</div><div class='add'>+	u8 flags1;		/* */</div><div class='add'>+#define OB_MAC_IOCB_RSP_OI	0x01	/* */</div><div class='add'>+#define OB_MAC_IOCB_RSP_I	0x02	/* */</div><div class='add'>+#define OB_MAC_IOCB_RSP_E	0x08	/* */</div><div class='add'>+#define OB_MAC_IOCB_RSP_S	0x10	/* too Short */</div><div class='add'>+#define OB_MAC_IOCB_RSP_L	0x20	/* too Large */</div><div class='add'>+#define OB_MAC_IOCB_RSP_P	0x40	/* Padded */</div><div class='add'>+	u8 flags2;		/* */</div><div class='add'>+	u8 flags3;		/* */</div><div class='add'>+#define OB_MAC_IOCB_RSP_B	0x80	/* */</div><div class='add'>+	__le32 tid;</div><div class='add'>+	__le32 txq_idx;</div><div class='add'>+	__le32 reserved[13];</div><div class='add'>+} __attribute((packed));</div><div class='add'>+</div><div class='add'>+struct ob_mac_tso_iocb_req {</div><div class='add'>+	u8 opcode;</div><div class='add'>+	u8 flags1;</div><div class='add'>+#define OB_MAC_TSO_IOCB_OI	0x01</div><div class='add'>+#define OB_MAC_TSO_IOCB_I	0x02</div><div class='add'>+#define OB_MAC_TSO_IOCB_D	0x08</div><div class='add'>+#define OB_MAC_TSO_IOCB_IP4	0x40</div><div class='add'>+#define OB_MAC_TSO_IOCB_IP6	0x80</div><div class='add'>+	u8 flags2;</div><div class='add'>+#define OB_MAC_TSO_IOCB_LSO	0x20</div><div class='add'>+#define OB_MAC_TSO_IOCB_UC	0x40</div><div class='add'>+#define OB_MAC_TSO_IOCB_TC	0x80</div><div class='add'>+	u8 flags3;</div><div class='add'>+#define OB_MAC_TSO_IOCB_IC	0x01</div><div class='add'>+#define OB_MAC_TSO_IOCB_DFP	0x02</div><div class='add'>+#define OB_MAC_TSO_IOCB_V	0x04</div><div class='add'>+	__le32 reserved1[2];</div><div class='add'>+	__le32 frame_len;</div><div class='add'>+	__le32 tid;</div><div class='add'>+	__le32 txq_idx;</div><div class='add'>+	__le16 total_hdrs_len;</div><div class='add'>+	__le16 net_trans_offset;</div><div class='add'>+#define OB_MAC_TRANSPORT_HDR_SHIFT 6</div><div class='add'>+	__le16 vlan_tci;</div><div class='add'>+	__le16 mss;</div><div class='add'>+	struct tx_buf_desc tbd[TX_DESC_PER_IOCB];</div><div class='add'>+} __attribute((packed));</div><div class='add'>+</div><div class='add'>+struct ob_mac_tso_iocb_rsp {</div><div class='add'>+	u8 opcode;</div><div class='add'>+	u8 flags1;</div><div class='add'>+#define OB_MAC_TSO_IOCB_RSP_OI	0x01</div><div class='add'>+#define OB_MAC_TSO_IOCB_RSP_I	0x02</div><div class='add'>+#define OB_MAC_TSO_IOCB_RSP_E	0x08</div><div class='add'>+#define OB_MAC_TSO_IOCB_RSP_S	0x10</div><div class='add'>+#define OB_MAC_TSO_IOCB_RSP_L	0x20</div><div class='add'>+#define OB_MAC_TSO_IOCB_RSP_P	0x40</div><div class='add'>+	u8 flags2;		/* */</div><div class='add'>+	u8 flags3;		/* */</div><div class='add'>+#define OB_MAC_TSO_IOCB_RSP_B	0x8000</div><div class='add'>+	__le32 tid;</div><div class='add'>+	__le32 txq_idx;</div><div class='add'>+	__le32 reserved2[13];</div><div class='add'>+} __attribute((packed));</div><div class='add'>+</div><div class='add'>+struct ib_mac_iocb_rsp {</div><div class='add'>+	u8 opcode;		/* 0x20 */</div><div class='add'>+	u8 flags1;</div><div class='add'>+#define IB_MAC_IOCB_RSP_OI	0x01	/* Overide intr delay */</div><div class='add'>+#define IB_MAC_IOCB_RSP_I	0x02	/* Disble Intr Generation */</div><div class='add'>+#define IB_MAC_IOCB_RSP_TE	0x04	/* Checksum error */</div><div class='add'>+#define IB_MAC_IOCB_RSP_NU	0x08	/* No checksum rcvd */</div><div class='add'>+#define IB_MAC_IOCB_RSP_IE	0x10	/* IPv4 checksum error */</div><div class='add'>+#define IB_MAC_IOCB_RSP_M_MASK	0x60	/* Multicast info */</div><div class='add'>+#define IB_MAC_IOCB_RSP_M_NONE	0x00	/* Not mcast frame */</div><div class='add'>+#define IB_MAC_IOCB_RSP_M_HASH	0x20	/* HASH mcast frame */</div><div class='add'>+#define IB_MAC_IOCB_RSP_M_REG 	0x40	/* Registered mcast frame */</div><div class='add'>+#define IB_MAC_IOCB_RSP_M_PROM 	0x60	/* Promiscuous mcast frame */</div><div class='add'>+#define IB_MAC_IOCB_RSP_B	0x80	/* Broadcast frame */</div><div class='add'>+	u8 flags2;</div><div class='add'>+#define IB_MAC_IOCB_RSP_P	0x01	/* Promiscuous frame */</div><div class='add'>+#define IB_MAC_IOCB_RSP_V	0x02	/* Vlan tag present */</div><div class='add'>+#define IB_MAC_IOCB_RSP_ERR_MASK	0x1c	/*  */</div><div class='add'>+#define IB_MAC_IOCB_RSP_ERR_CODE_ERR	0x04</div><div class='add'>+#define IB_MAC_IOCB_RSP_ERR_OVERSIZE	0x08</div><div class='add'>+#define IB_MAC_IOCB_RSP_ERR_UNDERSIZE	0x10</div><div class='add'>+#define IB_MAC_IOCB_RSP_ERR_PREAMBLE	0x14</div><div class='add'>+#define IB_MAC_IOCB_RSP_ERR_FRAME_LEN	0x18</div><div class='add'>+#define IB_MAC_IOCB_RSP_ERR_CRC		0x1c</div><div class='add'>+#define IB_MAC_IOCB_RSP_U	0x20	/* UDP packet */</div><div class='add'>+#define IB_MAC_IOCB_RSP_T	0x40	/* TCP packet */</div><div class='add'>+#define IB_MAC_IOCB_RSP_FO	0x80	/* Failover port */</div><div class='add'>+	u8 flags3;</div><div class='add'>+#define IB_MAC_IOCB_RSP_RSS_MASK	0x07	/* RSS mask */</div><div class='add'>+#define IB_MAC_IOCB_RSP_M_NONE	0x00	/* No RSS match */</div><div class='add'>+#define IB_MAC_IOCB_RSP_M_IPV4	0x04	/* IPv4 RSS match */</div><div class='add'>+#define IB_MAC_IOCB_RSP_M_IPV6	0x02	/* IPv6 RSS match */</div><div class='add'>+#define IB_MAC_IOCB_RSP_M_TCP_V4 	0x05	/* TCP with IPv4 */</div><div class='add'>+#define IB_MAC_IOCB_RSP_M_TCP_V6 	0x03	/* TCP with IPv6 */</div><div class='add'>+#define IB_MAC_IOCB_RSP_V4	0x08	/* IPV4 */</div><div class='add'>+#define IB_MAC_IOCB_RSP_V6	0x10	/* IPV6 */</div><div class='add'>+#define IB_MAC_IOCB_RSP_IH	0x20	/* Split after IP header */</div><div class='add'>+#define IB_MAC_IOCB_RSP_DS	0x40	/* data is in small buffer */</div><div class='add'>+#define IB_MAC_IOCB_RSP_DL	0x80	/* data is in large buffer */</div><div class='add'>+	__le32 data_len;	/* */</div><div class='add'>+	__le32 data_addr_lo;	/* */</div><div class='add'>+	__le32 data_addr_hi;	/* */</div><div class='add'>+	__le32 rss;		/* */</div><div class='add'>+	__le16 vlan_id;		/* 12 bits */</div><div class='add'>+#define IB_MAC_IOCB_RSP_C	0x1000	/* VLAN CFI bit */</div><div class='add'>+#define IB_MAC_IOCB_RSP_COS_SHIFT	12	/* class of service value */</div><div class='add'>+</div><div class='add'>+	__le16 reserved1;</div><div class='add'>+	__le32 reserved2[6];</div><div class='add'>+	__le32 flags4;</div><div class='add'>+#define IB_MAC_IOCB_RSP_HV	0x20000000	/* */</div><div class='add'>+#define IB_MAC_IOCB_RSP_HS	0x40000000	/* */</div><div class='add'>+#define IB_MAC_IOCB_RSP_HL	0x80000000	/* */</div><div class='add'>+	__le32 hdr_len;		/* */</div><div class='add'>+	__le32 hdr_addr_lo;	/* */</div><div class='add'>+	__le32 hdr_addr_hi;	/* */</div><div class='add'>+} __attribute((packed));</div><div class='add'>+</div><div class='add'>+struct ib_ae_iocb_rsp {</div><div class='add'>+	u8 opcode;</div><div class='add'>+	u8 flags1;</div><div class='add'>+#define IB_AE_IOCB_RSP_OI		0x01</div><div class='add'>+#define IB_AE_IOCB_RSP_I		0x02</div><div class='add'>+	u8 event;</div><div class='add'>+#define LINK_UP_EVENT              0x00</div><div class='add'>+#define LINK_DOWN_EVENT            0x01</div><div class='add'>+#define CAM_LOOKUP_ERR_EVENT       0x06</div><div class='add'>+#define SOFT_ECC_ERROR_EVENT       0x07</div><div class='add'>+#define MGMT_ERR_EVENT             0x08</div><div class='add'>+#define TEN_GIG_MAC_EVENT          0x09</div><div class='add'>+#define GPI0_H2L_EVENT       	0x10</div><div class='add'>+#define GPI0_L2H_EVENT       	0x20</div><div class='add'>+#define GPI1_H2L_EVENT       	0x11</div><div class='add'>+#define GPI1_L2H_EVENT       	0x21</div><div class='add'>+#define PCI_ERR_ANON_BUF_RD        0x40</div><div class='add'>+	u8 q_id;</div><div class='add'>+	__le32 reserved[15];</div><div class='add'>+} __attribute((packed));</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * These three structures are for generic</div><div class='add'>+ * handling of ib and ob iocbs.</div><div class='add'>+ */</div><div class='add'>+struct ql_net_rsp_iocb {</div><div class='add'>+	u8 opcode;</div><div class='add'>+	u8 flags0;</div><div class='add'>+	__le16 length;</div><div class='add'>+	__le32 tid;</div><div class='add'>+	__le32 reserved[14];</div><div class='add'>+} __attribute((packed));</div><div class='add'>+</div><div class='add'>+struct net_req_iocb {</div><div class='add'>+	u8 opcode;</div><div class='add'>+	u8 flags0;</div><div class='add'>+	__le16 flags1;</div><div class='add'>+	__le32 tid;</div><div class='add'>+	__le32 reserved1[30];</div><div class='add'>+} __attribute((packed));</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * tx ring initialization control block for chip.</div><div class='add'>+ * It is defined as:</div><div class='add'>+ * "Work Queue Initialization Control Block"</div><div class='add'>+ */</div><div class='add'>+struct wqicb {</div><div class='add'>+	__le16 len;</div><div class='add'>+#define Q_LEN_V		(1 &lt;&lt; 4)</div><div class='add'>+#define Q_LEN_CPP_CONT	0x0000</div><div class='add'>+#define Q_LEN_CPP_16	0x0001</div><div class='add'>+#define Q_LEN_CPP_32	0x0002</div><div class='add'>+#define Q_LEN_CPP_64	0x0003</div><div class='add'>+	__le16 flags;</div><div class='add'>+#define Q_PRI_SHIFT	1</div><div class='add'>+#define Q_FLAGS_LC	0x1000</div><div class='add'>+#define Q_FLAGS_LB	0x2000</div><div class='add'>+#define Q_FLAGS_LI	0x4000</div><div class='add'>+#define Q_FLAGS_LO	0x8000</div><div class='add'>+	__le16 cq_id_rss;</div><div class='add'>+#define Q_CQ_ID_RSS_RV 0x8000</div><div class='add'>+	__le16 rid;</div><div class='add'>+	__le32 addr_lo;</div><div class='add'>+	__le32 addr_hi;</div><div class='add'>+	__le32 cnsmr_idx_addr_lo;</div><div class='add'>+	__le32 cnsmr_idx_addr_hi;</div><div class='add'>+} __attribute((packed));</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * rx ring initialization control block for chip.</div><div class='add'>+ * It is defined as:</div><div class='add'>+ * "Completion Queue Initialization Control Block"</div><div class='add'>+ */</div><div class='add'>+struct cqicb {</div><div class='add'>+	u8 msix_vect;</div><div class='add'>+	u8 reserved1;</div><div class='add'>+	u8 reserved2;</div><div class='add'>+	u8 flags;</div><div class='add'>+#define FLAGS_LV	0x08</div><div class='add'>+#define FLAGS_LS	0x10</div><div class='add'>+#define FLAGS_LL	0x20</div><div class='add'>+#define FLAGS_LI	0x40</div><div class='add'>+#define FLAGS_LC	0x80</div><div class='add'>+	__le16 len;</div><div class='add'>+#define LEN_V		(1 &lt;&lt; 4)</div><div class='add'>+#define LEN_CPP_CONT	0x0000</div><div class='add'>+#define LEN_CPP_32	0x0001</div><div class='add'>+#define LEN_CPP_64	0x0002</div><div class='add'>+#define LEN_CPP_128	0x0003</div><div class='add'>+	__le16 rid;</div><div class='add'>+	__le32 addr_lo;</div><div class='add'>+	__le32 addr_hi;</div><div class='add'>+	__le32 prod_idx_addr_lo;</div><div class='add'>+	__le32 prod_idx_addr_hi;</div><div class='add'>+	__le16 pkt_delay;</div><div class='add'>+	__le16 irq_delay;</div><div class='add'>+	__le32 lbq_addr_lo;</div><div class='add'>+	__le32 lbq_addr_hi;</div><div class='add'>+	__le16 lbq_buf_size;</div><div class='add'>+	__le16 lbq_len;		/* entry count */</div><div class='add'>+	__le32 sbq_addr_lo;</div><div class='add'>+	__le32 sbq_addr_hi;</div><div class='add'>+	__le16 sbq_buf_size;</div><div class='add'>+	__le16 sbq_len;		/* entry count */</div><div class='add'>+} __attribute((packed));</div><div class='add'>+</div><div class='add'>+struct ricb {</div><div class='add'>+	u8 base_cq;</div><div class='add'>+#define RSS_L4K 0x80</div><div class='add'>+	u8 flags;</div><div class='add'>+#define RSS_L6K 0x01</div><div class='add'>+#define RSS_LI  0x02</div><div class='add'>+#define RSS_LB  0x04</div><div class='add'>+#define RSS_LM  0x08</div><div class='add'>+#define RSS_RI4 0x10</div><div class='add'>+#define RSS_RT4 0x20</div><div class='add'>+#define RSS_RI6 0x40</div><div class='add'>+#define RSS_RT6 0x80</div><div class='add'>+	__le16 mask;</div><div class='add'>+	__le32 hash_cq_id[256];</div><div class='add'>+	__le32 ipv6_hash_key[10];</div><div class='add'>+	__le32 ipv4_hash_key[4];</div><div class='add'>+} __attribute((packed));</div><div class='add'>+</div><div class='add'>+/* SOFTWARE/DRIVER DATA STRUCTURES. */</div><div class='add'>+</div><div class='add'>+struct oal {</div><div class='add'>+	struct tx_buf_desc oal[TX_DESC_PER_OAL];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct map_list {</div><div class='add'>+	DECLARE_PCI_UNMAP_ADDR(mapaddr);</div><div class='add'>+	DECLARE_PCI_UNMAP_LEN(maplen);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct tx_ring_desc {</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct ob_mac_iocb_req *queue_entry;</div><div class='add'>+	int index;</div><div class='add'>+	struct oal oal;</div><div class='add'>+	struct map_list map[MAX_SKB_FRAGS + 1];</div><div class='add'>+	int map_cnt;</div><div class='add'>+	struct tx_ring_desc *next;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct bq_desc {</div><div class='add'>+	union {</div><div class='add'>+		struct page *lbq_page;</div><div class='add'>+		struct sk_buff *skb;</div><div class='add'>+	} p;</div><div class='add'>+	struct bq_element *bq;</div><div class='add'>+	int index;</div><div class='add'>+	 DECLARE_PCI_UNMAP_ADDR(mapaddr);</div><div class='add'>+	 DECLARE_PCI_UNMAP_LEN(maplen);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define QL_TXQ_IDX(qdev, skb) (smp_processor_id()%(qdev-&gt;tx_ring_count))</div><div class='add'>+</div><div class='add'>+struct tx_ring {</div><div class='add'>+	/*</div><div class='add'>+	 * queue info.</div><div class='add'>+	 */</div><div class='add'>+	struct wqicb wqicb;	/* structure used to inform chip of new queue */</div><div class='add'>+	void *wq_base;		/* pci_alloc:virtual addr for tx */</div><div class='add'>+	dma_addr_t wq_base_dma;	/* pci_alloc:dma addr for tx */</div><div class='add'>+	u32 *cnsmr_idx_sh_reg;	/* shadow copy of consumer idx */</div><div class='add'>+	dma_addr_t cnsmr_idx_sh_reg_dma;	/* dma-shadow copy of consumer */</div><div class='add'>+	u32 wq_size;		/* size in bytes of queue area */</div><div class='add'>+	u32 wq_len;		/* number of entries in queue */</div><div class='add'>+	void __iomem *prod_idx_db_reg;	/* doorbell area index reg at offset 0x00 */</div><div class='add'>+	void __iomem *valid_db_reg;	/* doorbell area valid reg at offset 0x04 */</div><div class='add'>+	u16 prod_idx;		/* current value for prod idx */</div><div class='add'>+	u16 cq_id;		/* completion (rx) queue for tx completions */</div><div class='add'>+	u8 wq_id;		/* queue id for this entry */</div><div class='add'>+	u8 reserved1[3];</div><div class='add'>+	struct tx_ring_desc *q;	/* descriptor list for the queue */</div><div class='add'>+	spinlock_t lock;</div><div class='add'>+	atomic_t tx_count;	/* counts down for every outstanding IO */</div><div class='add'>+	atomic_t queue_stopped;	/* Turns queue off when full. */</div><div class='add'>+	struct delayed_work tx_work;</div><div class='add'>+	struct ql_adapter *qdev;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Type of inbound queue.</div><div class='add'>+ */</div><div class='add'>+enum {</div><div class='add'>+	DEFAULT_Q = 2,		/* Handles slow queue and chip/MPI events. */</div><div class='add'>+	TX_Q = 3,		/* Handles outbound completions. */</div><div class='add'>+	RX_Q = 4,		/* Handles inbound completions. */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rx_ring {</div><div class='add'>+	struct cqicb cqicb;	/* The chip's completion queue init control block. */</div><div class='add'>+</div><div class='add'>+	/* Completion queue elements. */</div><div class='add'>+	void *cq_base;</div><div class='add'>+	dma_addr_t cq_base_dma;</div><div class='add'>+	u32 cq_size;</div><div class='add'>+	u32 cq_len;</div><div class='add'>+	u16 cq_id;</div><div class='add'>+	u32 *prod_idx_sh_reg;	/* Shadowed producer register. */</div><div class='add'>+	dma_addr_t prod_idx_sh_reg_dma;</div><div class='add'>+	void __iomem *cnsmr_idx_db_reg;	/* PCI doorbell mem area + 0 */</div><div class='add'>+	u32 cnsmr_idx;		/* current sw idx */</div><div class='add'>+	struct ql_net_rsp_iocb *curr_entry;	/* next entry on queue */</div><div class='add'>+	void __iomem *valid_db_reg;	/* PCI doorbell mem area + 0x04 */</div><div class='add'>+</div><div class='add'>+	/* Large buffer queue elements. */</div><div class='add'>+	u32 lbq_len;		/* entry count */</div><div class='add'>+	u32 lbq_size;		/* size in bytes of queue */</div><div class='add'>+	u32 lbq_buf_size;</div><div class='add'>+	void *lbq_base;</div><div class='add'>+	dma_addr_t lbq_base_dma;</div><div class='add'>+	void *lbq_base_indirect;</div><div class='add'>+	dma_addr_t lbq_base_indirect_dma;</div><div class='add'>+	struct bq_desc *lbq;	/* array of control blocks */</div><div class='add'>+	void __iomem *lbq_prod_idx_db_reg;	/* PCI doorbell mem area + 0x18 */</div><div class='add'>+	u32 lbq_prod_idx;	/* current sw prod idx */</div><div class='add'>+	u32 lbq_curr_idx;	/* next entry we expect */</div><div class='add'>+	u32 lbq_clean_idx;	/* beginning of new descs */</div><div class='add'>+	u32 lbq_free_cnt;	/* free buffer desc cnt */</div><div class='add'>+</div><div class='add'>+	/* Small buffer queue elements. */</div><div class='add'>+	u32 sbq_len;		/* entry count */</div><div class='add'>+	u32 sbq_size;		/* size in bytes of queue */</div><div class='add'>+	u32 sbq_buf_size;</div><div class='add'>+	void *sbq_base;</div><div class='add'>+	dma_addr_t sbq_base_dma;</div><div class='add'>+	void *sbq_base_indirect;</div><div class='add'>+	dma_addr_t sbq_base_indirect_dma;</div><div class='add'>+	struct bq_desc *sbq;	/* array of control blocks */</div><div class='add'>+	void __iomem *sbq_prod_idx_db_reg; /* PCI doorbell mem area + 0x1c */</div><div class='add'>+	u32 sbq_prod_idx;	/* current sw prod idx */</div><div class='add'>+	u32 sbq_curr_idx;	/* next entry we expect */</div><div class='add'>+	u32 sbq_clean_idx;	/* beginning of new descs */</div><div class='add'>+	u32 sbq_free_cnt;	/* free buffer desc cnt */</div><div class='add'>+</div><div class='add'>+	/* Misc. handler elements. */</div><div class='add'>+	u32 type;		/* Type of queue, tx, rx, or default. */</div><div class='add'>+	u32 irq;		/* Which vector this ring is assigned. */</div><div class='add'>+	u32 cpu;		/* Which CPU this should run on. */</div><div class='add'>+	char name[IFNAMSIZ + 5];</div><div class='add'>+	struct napi_struct napi;</div><div class='add'>+	struct delayed_work rx_work;</div><div class='add'>+	u8 reserved;</div><div class='add'>+	struct ql_adapter *qdev;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * RSS Initialization Control Block</div><div class='add'>+ */</div><div class='add'>+struct hash_id {</div><div class='add'>+	u8 value[4];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct nic_stats {</div><div class='add'>+	/*</div><div class='add'>+	 * These stats come from offset 200h to 278h</div><div class='add'>+	 * in the XGMAC register.</div><div class='add'>+	 */</div><div class='add'>+	u64 tx_pkts;</div><div class='add'>+	u64 tx_bytes;</div><div class='add'>+	u64 tx_mcast_pkts;</div><div class='add'>+	u64 tx_bcast_pkts;</div><div class='add'>+	u64 tx_ucast_pkts;</div><div class='add'>+	u64 tx_ctl_pkts;</div><div class='add'>+	u64 tx_pause_pkts;</div><div class='add'>+	u64 tx_64_pkt;</div><div class='add'>+	u64 tx_65_to_127_pkt;</div><div class='add'>+	u64 tx_128_to_255_pkt;</div><div class='add'>+	u64 tx_256_511_pkt;</div><div class='add'>+	u64 tx_512_to_1023_pkt;</div><div class='add'>+	u64 tx_1024_to_1518_pkt;</div><div class='add'>+	u64 tx_1519_to_max_pkt;</div><div class='add'>+	u64 tx_undersize_pkt;</div><div class='add'>+	u64 tx_oversize_pkt;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * These stats come from offset 300h to 3C8h</div><div class='add'>+	 * in the XGMAC register.</div><div class='add'>+	 */</div><div class='add'>+	u64 rx_bytes;</div><div class='add'>+	u64 rx_bytes_ok;</div><div class='add'>+	u64 rx_pkts;</div><div class='add'>+	u64 rx_pkts_ok;</div><div class='add'>+	u64 rx_bcast_pkts;</div><div class='add'>+	u64 rx_mcast_pkts;</div><div class='add'>+	u64 rx_ucast_pkts;</div><div class='add'>+	u64 rx_undersize_pkts;</div><div class='add'>+	u64 rx_oversize_pkts;</div><div class='add'>+	u64 rx_jabber_pkts;</div><div class='add'>+	u64 rx_undersize_fcerr_pkts;</div><div class='add'>+	u64 rx_drop_events;</div><div class='add'>+	u64 rx_fcerr_pkts;</div><div class='add'>+	u64 rx_align_err;</div><div class='add'>+	u64 rx_symbol_err;</div><div class='add'>+	u64 rx_mac_err;</div><div class='add'>+	u64 rx_ctl_pkts;</div><div class='add'>+	u64 rx_pause_pkts;</div><div class='add'>+	u64 rx_64_pkts;</div><div class='add'>+	u64 rx_65_to_127_pkts;</div><div class='add'>+	u64 rx_128_255_pkts;</div><div class='add'>+	u64 rx_256_511_pkts;</div><div class='add'>+	u64 rx_512_to_1023_pkts;</div><div class='add'>+	u64 rx_1024_to_1518_pkts;</div><div class='add'>+	u64 rx_1519_to_max_pkts;</div><div class='add'>+	u64 rx_len_err_pkts;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * intr_context structure is used during initialization</div><div class='add'>+ * to hook the interrupts.  It is also used in a single</div><div class='add'>+ * irq environment as a context to the ISR.</div><div class='add'>+ */</div><div class='add'>+struct intr_context {</div><div class='add'>+	struct ql_adapter *qdev;</div><div class='add'>+	u32 intr;</div><div class='add'>+	u32 hooked;</div><div class='add'>+	u32 intr_en_mask;	/* value/mask used to enable this intr */</div><div class='add'>+	u32 intr_dis_mask;	/* value/mask used to disable this intr */</div><div class='add'>+	u32 intr_read_mask;	/* value/mask used to read this intr */</div><div class='add'>+	char name[IFNAMSIZ * 2];</div><div class='add'>+	atomic_t irq_cnt;	/* irq_cnt is used in single vector</div><div class='add'>+				 * environment.  It's incremented for each</div><div class='add'>+				 * irq handler that is scheduled.  When each</div><div class='add'>+				 * handler finishes it decrements irq_cnt and</div><div class='add'>+				 * enables interrupts if it's zero. */</div><div class='add'>+	irq_handler_t handler;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* adapter flags definitions. */</div><div class='add'>+enum {</div><div class='add'>+	QL_ADAPTER_UP = (1 &lt;&lt; 0),	/* Adapter has been brought up. */</div><div class='add'>+	QL_LEGACY_ENABLED = (1 &lt;&lt; 3),</div><div class='add'>+	QL_MSI_ENABLED = (1 &lt;&lt; 3),</div><div class='add'>+	QL_MSIX_ENABLED = (1 &lt;&lt; 4),</div><div class='add'>+	QL_DMA64 = (1 &lt;&lt; 5),</div><div class='add'>+	QL_PROMISCUOUS = (1 &lt;&lt; 6),</div><div class='add'>+	QL_ALLMULTI = (1 &lt;&lt; 7),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* link_status bit definitions */</div><div class='add'>+enum {</div><div class='add'>+	LOOPBACK_MASK = 0x00000700,</div><div class='add'>+	LOOPBACK_PCS = 0x00000100,</div><div class='add'>+	LOOPBACK_HSS = 0x00000200,</div><div class='add'>+	LOOPBACK_EXT = 0x00000300,</div><div class='add'>+	PAUSE_MASK = 0x000000c0,</div><div class='add'>+	PAUSE_STD = 0x00000040,</div><div class='add'>+	PAUSE_PRI = 0x00000080,</div><div class='add'>+	SPEED_MASK = 0x00000038,</div><div class='add'>+	SPEED_100Mb = 0x00000000,</div><div class='add'>+	SPEED_1Gb = 0x00000008,</div><div class='add'>+	SPEED_10Gb = 0x00000010,</div><div class='add'>+	LINK_TYPE_MASK = 0x00000007,</div><div class='add'>+	LINK_TYPE_XFI = 0x00000001,</div><div class='add'>+	LINK_TYPE_XAUI = 0x00000002,</div><div class='add'>+	LINK_TYPE_XFI_BP = 0x00000003,</div><div class='add'>+	LINK_TYPE_XAUI_BP = 0x00000004,</div><div class='add'>+	LINK_TYPE_10GBASET = 0x00000005,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The main Adapter structure definition.</div><div class='add'>+ * This structure has all fields relevant to the hardware.</div><div class='add'>+ */</div><div class='add'>+struct ql_adapter {</div><div class='add'>+	struct ricb ricb;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u32 wol;</div><div class='add'>+</div><div class='add'>+	struct nic_stats nic_stats;</div><div class='add'>+</div><div class='add'>+	struct vlan_group *vlgrp;</div><div class='add'>+</div><div class='add'>+	/* PCI Configuration information for this device */</div><div class='add'>+	struct pci_dev *pdev;</div><div class='add'>+	struct net_device *ndev;	/* Parent NET device */</div><div class='add'>+</div><div class='add'>+	/* Hardware information */</div><div class='add'>+	u32 chip_rev_id;</div><div class='add'>+	u32 func;		/* PCI function for this adapter */</div><div class='add'>+</div><div class='add'>+	spinlock_t adapter_lock;</div><div class='add'>+	spinlock_t hw_lock;</div><div class='add'>+	spinlock_t stats_lock;</div><div class='add'>+	spinlock_t legacy_lock;	/* used for maintaining legacy intr sync */</div><div class='add'>+</div><div class='add'>+	/* PCI Bus Relative Register Addresses */</div><div class='add'>+	void __iomem *reg_base;</div><div class='add'>+	void __iomem *doorbell_area;</div><div class='add'>+	u32 doorbell_area_size;</div><div class='add'>+</div><div class='add'>+	u32 msg_enable;</div><div class='add'>+</div><div class='add'>+	/* Page for Shadow Registers */</div><div class='add'>+	void *rx_ring_shadow_reg_area;</div><div class='add'>+	dma_addr_t rx_ring_shadow_reg_dma;</div><div class='add'>+	void *tx_ring_shadow_reg_area;</div><div class='add'>+	dma_addr_t tx_ring_shadow_reg_dma;</div><div class='add'>+</div><div class='add'>+	u32 mailbox_in;</div><div class='add'>+	u32 mailbox_out;</div><div class='add'>+</div><div class='add'>+	int tx_ring_size;</div><div class='add'>+	int rx_ring_size;</div><div class='add'>+	u32 intr_count;</div><div class='add'>+	struct msix_entry *msi_x_entry;</div><div class='add'>+	struct intr_context intr_context[MAX_RX_RINGS];</div><div class='add'>+</div><div class='add'>+	int (*legacy_check) (struct ql_adapter *);</div><div class='add'>+</div><div class='add'>+	int tx_ring_count;	/* One per online CPU. */</div><div class='add'>+	u32 rss_ring_first_cq_id;/* index of first inbound (rss) rx_ring */</div><div class='add'>+	u32 rss_ring_count;	/* One per online CPU.  */</div><div class='add'>+	/*</div><div class='add'>+	 * rx_ring_count =</div><div class='add'>+	 *  one default queue +</div><div class='add'>+	 *  (CPU count * outbound completion rx_ring) +</div><div class='add'>+	 *  (CPU count * inbound (RSS) completion rx_ring)</div><div class='add'>+	 */</div><div class='add'>+	int rx_ring_count;</div><div class='add'>+	int ring_mem_size;</div><div class='add'>+	void *ring_mem;</div><div class='add'>+	struct rx_ring *rx_ring;</div><div class='add'>+	int rx_csum;</div><div class='add'>+	struct tx_ring *tx_ring;</div><div class='add'>+	u32 default_rx_queue;</div><div class='add'>+</div><div class='add'>+	u16 rx_coalesce_usecs;	/* cqicb-&gt;int_delay */</div><div class='add'>+	u16 rx_max_coalesced_frames;	/* cqicb-&gt;pkt_int_delay */</div><div class='add'>+	u16 tx_coalesce_usecs;	/* cqicb-&gt;int_delay */</div><div class='add'>+	u16 tx_max_coalesced_frames;	/* cqicb-&gt;pkt_int_delay */</div><div class='add'>+</div><div class='add'>+	u32 xg_sem_mask;</div><div class='add'>+	u32 port_link_up;</div><div class='add'>+	u32 port_init;</div><div class='add'>+	u32 link_status;</div><div class='add'>+</div><div class='add'>+	struct flash_params flash;</div><div class='add'>+</div><div class='add'>+	struct net_device_stats stats;</div><div class='add'>+	struct workqueue_struct *q_workqueue;</div><div class='add'>+	struct workqueue_struct *workqueue;</div><div class='add'>+	struct delayed_work asic_reset_work;</div><div class='add'>+	struct delayed_work mpi_reset_work;</div><div class='add'>+	struct delayed_work mpi_work;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Typical Register accessor for memory mapped device.</div><div class='add'>+ */</div><div class='add'>+static inline u32 ql_read32(const struct ql_adapter *qdev, int reg)</div><div class='add'>+{</div><div class='add'>+	return readl(qdev-&gt;reg_base + reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Typical Register accessor for memory mapped device.</div><div class='add'>+ */</div><div class='add'>+static inline void ql_write32(const struct ql_adapter *qdev, int reg, u32 val)</div><div class='add'>+{</div><div class='add'>+	writel(val, qdev-&gt;reg_base + reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Doorbell Registers:</div><div class='add'>+ * Doorbell registers are virtual registers in the PCI memory space.</div><div class='add'>+ * The space is allocated by the chip during PCI initialization.  The</div><div class='add'>+ * device driver finds the doorbell address in BAR 3 in PCI config space.</div><div class='add'>+ * The registers are used to control outbound and inbound queues. For</div><div class='add'>+ * example, the producer index for an outbound queue.  Each queue uses</div><div class='add'>+ * 1 4k chunk of memory.  The lower half of the space is for outbound</div><div class='add'>+ * queues. The upper half is for inbound queues.</div><div class='add'>+ */</div><div class='add'>+static inline void ql_write_db_reg(u32 val, void __iomem *addr)</div><div class='add'>+{</div><div class='add'>+	writel(val, addr);</div><div class='add'>+	mmiowb();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Shadow Registers:</div><div class='add'>+ * Outbound queues have a consumer index that is maintained by the chip.</div><div class='add'>+ * Inbound queues have a producer index that is maintained by the chip.</div><div class='add'>+ * For lower overhead, these registers are "shadowed" to host memory</div><div class='add'>+ * which allows the device driver to track the queue progress without</div><div class='add'>+ * PCI reads. When an entry is placed on an inbound queue, the chip will</div><div class='add'>+ * update the relevant index register and then copy the value to the</div><div class='add'>+ * shadow register in host memory.</div><div class='add'>+ */</div><div class='add'>+static inline unsigned int ql_read_sh_reg(const volatile void  *addr)</div><div class='add'>+{</div><div class='add'>+	return *(volatile unsigned int __force *)addr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+extern char qlge_driver_name[];</div><div class='add'>+extern const char qlge_driver_version[];</div><div class='add'>+extern const struct ethtool_ops qlge_ethtool_ops;</div><div class='add'>+</div><div class='add'>+extern int ql_sem_spinlock(struct ql_adapter *qdev, u32 sem_mask);</div><div class='add'>+extern void ql_sem_unlock(struct ql_adapter *qdev, u32 sem_mask);</div><div class='add'>+extern int ql_read_xgmac_reg(struct ql_adapter *qdev, u32 reg, u32 *data);</div><div class='add'>+extern int ql_get_mac_addr_reg(struct ql_adapter *qdev, u32 type, u16 index,</div><div class='add'>+			       u32 *value);</div><div class='add'>+extern int ql_get_routing_reg(struct ql_adapter *qdev, u32 index, u32 *value);</div><div class='add'>+extern int ql_write_cfg(struct ql_adapter *qdev, void *ptr, int size, u32 bit,</div><div class='add'>+			u16 q_id);</div><div class='add'>+void ql_queue_fw_error(struct ql_adapter *qdev);</div><div class='add'>+void ql_mpi_work(struct work_struct *work);</div><div class='add'>+void ql_mpi_reset_work(struct work_struct *work);</div><div class='add'>+int ql_wait_reg_rdy(struct ql_adapter *qdev, u32 reg, u32 bit, u32 ebit);</div><div class='add'>+void ql_queue_asic_error(struct ql_adapter *qdev);</div><div class='add'>+void ql_enable_completion_interrupt(struct ql_adapter *qdev, u32 intr);</div><div class='add'>+void ql_set_ethtool_ops(struct net_device *ndev);</div><div class='add'>+int ql_read_xgmac_reg64(struct ql_adapter *qdev, u32 reg, u64 *data);</div><div class='add'>+</div><div class='add'>+#if 1</div><div class='add'>+#define QL_ALL_DUMP</div><div class='add'>+#define QL_REG_DUMP</div><div class='add'>+#define QL_DEV_DUMP</div><div class='add'>+#define QL_CB_DUMP</div><div class='add'>+/* #define QL_IB_DUMP */</div><div class='add'>+/* #define QL_OB_DUMP */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef QL_REG_DUMP</div><div class='add'>+extern void ql_dump_xgmac_control_regs(struct ql_adapter *qdev);</div><div class='add'>+extern void ql_dump_routing_entries(struct ql_adapter *qdev);</div><div class='add'>+extern void ql_dump_regs(struct ql_adapter *qdev);</div><div class='add'>+#define QL_DUMP_REGS(qdev) ql_dump_regs(qdev)</div><div class='add'>+#define QL_DUMP_ROUTE(qdev) ql_dump_routing_entries(qdev)</div><div class='add'>+#define QL_DUMP_XGMAC_CONTROL_REGS(qdev) ql_dump_xgmac_control_regs(qdev)</div><div class='add'>+#else</div><div class='add'>+#define QL_DUMP_REGS(qdev)</div><div class='add'>+#define QL_DUMP_ROUTE(qdev)</div><div class='add'>+#define QL_DUMP_XGMAC_CONTROL_REGS(qdev)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef QL_STAT_DUMP</div><div class='add'>+extern void ql_dump_stat(struct ql_adapter *qdev);</div><div class='add'>+#define QL_DUMP_STAT(qdev) ql_dump_stat(qdev)</div><div class='add'>+#else</div><div class='add'>+#define QL_DUMP_STAT(qdev)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef QL_DEV_DUMP</div><div class='add'>+extern void ql_dump_qdev(struct ql_adapter *qdev);</div><div class='add'>+#define QL_DUMP_QDEV(qdev) ql_dump_qdev(qdev)</div><div class='add'>+#else</div><div class='add'>+#define QL_DUMP_QDEV(qdev)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef QL_CB_DUMP</div><div class='add'>+extern void ql_dump_wqicb(struct wqicb *wqicb);</div><div class='add'>+extern void ql_dump_tx_ring(struct tx_ring *tx_ring);</div><div class='add'>+extern void ql_dump_ricb(struct ricb *ricb);</div><div class='add'>+extern void ql_dump_cqicb(struct cqicb *cqicb);</div><div class='add'>+extern void ql_dump_rx_ring(struct rx_ring *rx_ring);</div><div class='add'>+extern void ql_dump_hw_cb(struct ql_adapter *qdev, int size, u32 bit, u16 q_id);</div><div class='add'>+#define QL_DUMP_RICB(ricb) ql_dump_ricb(ricb)</div><div class='add'>+#define QL_DUMP_WQICB(wqicb) ql_dump_wqicb(wqicb)</div><div class='add'>+#define QL_DUMP_TX_RING(tx_ring) ql_dump_tx_ring(tx_ring)</div><div class='add'>+#define QL_DUMP_CQICB(cqicb) ql_dump_cqicb(cqicb)</div><div class='add'>+#define QL_DUMP_RX_RING(rx_ring) ql_dump_rx_ring(rx_ring)</div><div class='add'>+#define QL_DUMP_HW_CB(qdev, size, bit, q_id) \</div><div class='add'>+		ql_dump_hw_cb(qdev, size, bit, q_id)</div><div class='add'>+#else</div><div class='add'>+#define QL_DUMP_RICB(ricb)</div><div class='add'>+#define QL_DUMP_WQICB(wqicb)</div><div class='add'>+#define QL_DUMP_TX_RING(tx_ring)</div><div class='add'>+#define QL_DUMP_CQICB(cqicb)</div><div class='add'>+#define QL_DUMP_RX_RING(rx_ring)</div><div class='add'>+#define QL_DUMP_HW_CB(qdev, size, bit, q_id)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef QL_OB_DUMP</div><div class='add'>+extern void ql_dump_tx_desc(struct tx_buf_desc *tbd);</div><div class='add'>+extern void ql_dump_ob_mac_iocb(struct ob_mac_iocb_req *ob_mac_iocb);</div><div class='add'>+extern void ql_dump_ob_mac_rsp(struct ob_mac_iocb_rsp *ob_mac_rsp);</div><div class='add'>+#define QL_DUMP_OB_MAC_IOCB(ob_mac_iocb) ql_dump_ob_mac_iocb(ob_mac_iocb)</div><div class='add'>+#define QL_DUMP_OB_MAC_RSP(ob_mac_rsp) ql_dump_ob_mac_rsp(ob_mac_rsp)</div><div class='add'>+#else</div><div class='add'>+#define QL_DUMP_OB_MAC_IOCB(ob_mac_iocb)</div><div class='add'>+#define QL_DUMP_OB_MAC_RSP(ob_mac_rsp)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef QL_IB_DUMP</div><div class='add'>+extern void ql_dump_ib_mac_rsp(struct ib_mac_iocb_rsp *ib_mac_rsp);</div><div class='add'>+#define QL_DUMP_IB_MAC_RSP(ib_mac_rsp) ql_dump_ib_mac_rsp(ib_mac_rsp)</div><div class='add'>+#else</div><div class='add'>+#define QL_DUMP_IB_MAC_RSP(ib_mac_rsp)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef	QL_ALL_DUMP</div><div class='add'>+extern void ql_dump_all(struct ql_adapter *qdev);</div><div class='add'>+#define QL_DUMP_ALL(qdev) ql_dump_all(qdev)</div><div class='add'>+#else</div><div class='add'>+#define QL_DUMP_ALL(qdev)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif /* _QLGE_H_ */</div><div class='head'>diff --git a/drivers/net/qlge/qlge_dbg.c b/drivers/net/qlge/qlge_dbg.c<br/>new file mode 100644<br/>index 000000000000..47df304a02c8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/qlge/qlge_dbg.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/qlge/qlge_dbg.c</a></div><div class='hunk'>@@ -0,0 +1,858 @@</div><div class='add'>+#include "qlge.h"</div><div class='add'>+</div><div class='add'>+#ifdef QL_REG_DUMP</div><div class='add'>+static void ql_dump_intr_states(struct ql_adapter *qdev)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	u32 value;</div><div class='add'>+	for (i = 0; i &lt; qdev-&gt;intr_count; i++) {</div><div class='add'>+		ql_write32(qdev, INTR_EN, qdev-&gt;intr_context[i].intr_read_mask);</div><div class='add'>+		value = ql_read32(qdev, INTR_EN);</div><div class='add'>+		printk(KERN_ERR PFX</div><div class='add'>+		       "%s: Interrupt %d is %s.\n",</div><div class='add'>+		       qdev-&gt;ndev-&gt;name, i,</div><div class='add'>+		       (value &amp; INTR_EN_EN ? "enabled" : "disabled"));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ql_dump_xgmac_control_regs(struct ql_adapter *qdev)</div><div class='add'>+{</div><div class='add'>+	u32 data;</div><div class='add'>+	if (ql_sem_spinlock(qdev, qdev-&gt;xg_sem_mask)) {</div><div class='add'>+		printk(KERN_ERR "%s: Couldn't get xgmac sem.\n", __func__);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	ql_read_xgmac_reg(qdev, PAUSE_SRC_LO, &amp;data);</div><div class='add'>+	printk(KERN_ERR PFX "%s: PAUSE_SRC_LO = 0x%.08x.\n", qdev-&gt;ndev-&gt;name,</div><div class='add'>+	       data);</div><div class='add'>+	ql_read_xgmac_reg(qdev, PAUSE_SRC_HI, &amp;data);</div><div class='add'>+	printk(KERN_ERR PFX "%s: PAUSE_SRC_HI = 0x%.08x.\n", qdev-&gt;ndev-&gt;name,</div><div class='add'>+	       data);</div><div class='add'>+	ql_read_xgmac_reg(qdev, GLOBAL_CFG, &amp;data);</div><div class='add'>+	printk(KERN_ERR PFX "%s: GLOBAL_CFG = 0x%.08x.\n", qdev-&gt;ndev-&gt;name,</div><div class='add'>+	       data);</div><div class='add'>+	ql_read_xgmac_reg(qdev, TX_CFG, &amp;data);</div><div class='add'>+	printk(KERN_ERR PFX "%s: TX_CFG = 0x%.08x.\n", qdev-&gt;ndev-&gt;name, data);</div><div class='add'>+	ql_read_xgmac_reg(qdev, RX_CFG, &amp;data);</div><div class='add'>+	printk(KERN_ERR PFX "%s: RX_CFG = 0x%.08x.\n", qdev-&gt;ndev-&gt;name, data);</div><div class='add'>+	ql_read_xgmac_reg(qdev, FLOW_CTL, &amp;data);</div><div class='add'>+	printk(KERN_ERR PFX "%s: FLOW_CTL = 0x%.08x.\n", qdev-&gt;ndev-&gt;name,</div><div class='add'>+	       data);</div><div class='add'>+	ql_read_xgmac_reg(qdev, PAUSE_OPCODE, &amp;data);</div><div class='add'>+	printk(KERN_ERR PFX "%s: PAUSE_OPCODE = 0x%.08x.\n", qdev-&gt;ndev-&gt;name,</div><div class='add'>+	       data);</div><div class='add'>+	ql_read_xgmac_reg(qdev, PAUSE_TIMER, &amp;data);</div><div class='add'>+	printk(KERN_ERR PFX "%s: PAUSE_TIMER = 0x%.08x.\n", qdev-&gt;ndev-&gt;name,</div><div class='add'>+	       data);</div><div class='add'>+	ql_read_xgmac_reg(qdev, PAUSE_FRM_DEST_LO, &amp;data);</div><div class='add'>+	printk(KERN_ERR PFX "%s: PAUSE_FRM_DEST_LO = 0x%.08x.\n",</div><div class='add'>+	       qdev-&gt;ndev-&gt;name, data);</div><div class='add'>+	ql_read_xgmac_reg(qdev, PAUSE_FRM_DEST_HI, &amp;data);</div><div class='add'>+	printk(KERN_ERR PFX "%s: PAUSE_FRM_DEST_HI = 0x%.08x.\n",</div><div class='add'>+	       qdev-&gt;ndev-&gt;name, data);</div><div class='add'>+	ql_read_xgmac_reg(qdev, MAC_TX_PARAMS, &amp;data);</div><div class='add'>+	printk(KERN_ERR PFX "%s: MAC_TX_PARAMS = 0x%.08x.\n", qdev-&gt;ndev-&gt;name,</div><div class='add'>+	       data);</div><div class='add'>+	ql_read_xgmac_reg(qdev, MAC_RX_PARAMS, &amp;data);</div><div class='add'>+	printk(KERN_ERR PFX "%s: MAC_RX_PARAMS = 0x%.08x.\n", qdev-&gt;ndev-&gt;name,</div><div class='add'>+	       data);</div><div class='add'>+	ql_read_xgmac_reg(qdev, MAC_SYS_INT, &amp;data);</div><div class='add'>+	printk(KERN_ERR PFX "%s: MAC_SYS_INT = 0x%.08x.\n", qdev-&gt;ndev-&gt;name,</div><div class='add'>+	       data);</div><div class='add'>+	ql_read_xgmac_reg(qdev, MAC_SYS_INT_MASK, &amp;data);</div><div class='add'>+	printk(KERN_ERR PFX "%s: MAC_SYS_INT_MASK = 0x%.08x.\n",</div><div class='add'>+	       qdev-&gt;ndev-&gt;name, data);</div><div class='add'>+	ql_read_xgmac_reg(qdev, MAC_MGMT_INT, &amp;data);</div><div class='add'>+	printk(KERN_ERR PFX "%s: MAC_MGMT_INT = 0x%.08x.\n", qdev-&gt;ndev-&gt;name,</div><div class='add'>+	       data);</div><div class='add'>+	ql_read_xgmac_reg(qdev, MAC_MGMT_IN_MASK, &amp;data);</div><div class='add'>+	printk(KERN_ERR PFX "%s: MAC_MGMT_IN_MASK = 0x%.08x.\n",</div><div class='add'>+	       qdev-&gt;ndev-&gt;name, data);</div><div class='add'>+	ql_read_xgmac_reg(qdev, EXT_ARB_MODE, &amp;data);</div><div class='add'>+	printk(KERN_ERR PFX "%s: EXT_ARB_MODE = 0x%.08x.\n", qdev-&gt;ndev-&gt;name,</div><div class='add'>+	       data);</div><div class='add'>+	ql_sem_unlock(qdev, qdev-&gt;xg_sem_mask);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ql_dump_ets_regs(struct ql_adapter *qdev)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ql_dump_cam_entries(struct ql_adapter *qdev)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	u32 value[3];</div><div class='add'>+	for (i = 0; i &lt; 4; i++) {</div><div class='add'>+		if (ql_get_mac_addr_reg(qdev, MAC_ADDR_TYPE_CAM_MAC, i, value)) {</div><div class='add'>+			printk(KERN_ERR PFX</div><div class='add'>+			       "%s: Failed read of mac index register.\n",</div><div class='add'>+			       __func__);</div><div class='add'>+			return;</div><div class='add'>+		} else {</div><div class='add'>+			if (value[0])</div><div class='add'>+				printk(KERN_ERR PFX</div><div class='add'>+				       "%s: CAM index %d CAM Lookup Lower = 0x%.08x:%.08x, Output = 0x%.08x.\n",</div><div class='add'>+				       qdev-&gt;ndev-&gt;name, i, value[1], value[0],</div><div class='add'>+				       value[2]);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	for (i = 0; i &lt; 32; i++) {</div><div class='add'>+		if (ql_get_mac_addr_reg</div><div class='add'>+		    (qdev, MAC_ADDR_TYPE_MULTI_MAC, i, value)) {</div><div class='add'>+			printk(KERN_ERR PFX</div><div class='add'>+			       "%s: Failed read of mac index register.\n",</div><div class='add'>+			       __func__);</div><div class='add'>+			return;</div><div class='add'>+		} else {</div><div class='add'>+			if (value[0])</div><div class='add'>+				printk(KERN_ERR PFX</div><div class='add'>+				       "%s: MCAST index %d CAM Lookup Lower = 0x%.08x:%.08x.\n",</div><div class='add'>+				       qdev-&gt;ndev-&gt;name, i, value[1], value[0]);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ql_dump_routing_entries(struct ql_adapter *qdev)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	u32 value;</div><div class='add'>+	for (i = 0; i &lt; 16; i++) {</div><div class='add'>+		value = 0;</div><div class='add'>+		if (ql_get_routing_reg(qdev, i, &amp;value)) {</div><div class='add'>+			printk(KERN_ERR PFX</div><div class='add'>+			       "%s: Failed read of routing index register.\n",</div><div class='add'>+			       __func__);</div><div class='add'>+			return;</div><div class='add'>+		} else {</div><div class='add'>+			if (value)</div><div class='add'>+				printk(KERN_ERR PFX</div><div class='add'>+				       "%s: Routing Mask %d = 0x%.08x.\n",</div><div class='add'>+				       qdev-&gt;ndev-&gt;name, i, value);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ql_dump_regs(struct ql_adapter *qdev)</div><div class='add'>+{</div><div class='add'>+	printk(KERN_ERR PFX "reg dump for function #%d.\n", qdev-&gt;func);</div><div class='add'>+	printk(KERN_ERR PFX "SYS	 			= 0x%x.\n",</div><div class='add'>+	       ql_read32(qdev, SYS));</div><div class='add'>+	printk(KERN_ERR PFX "RST_FO 			= 0x%x.\n",</div><div class='add'>+	       ql_read32(qdev, RST_FO));</div><div class='add'>+	printk(KERN_ERR PFX "FSC 				= 0x%x.\n",</div><div class='add'>+	       ql_read32(qdev, FSC));</div><div class='add'>+	printk(KERN_ERR PFX "CSR 				= 0x%x.\n",</div><div class='add'>+	       ql_read32(qdev, CSR));</div><div class='add'>+	printk(KERN_ERR PFX "ICB_RID 			= 0x%x.\n",</div><div class='add'>+	       ql_read32(qdev, ICB_RID));</div><div class='add'>+	printk(KERN_ERR PFX "ICB_L 				= 0x%x.\n",</div><div class='add'>+	       ql_read32(qdev, ICB_L));</div><div class='add'>+	printk(KERN_ERR PFX "ICB_H 				= 0x%x.\n",</div><div class='add'>+	       ql_read32(qdev, ICB_H));</div><div class='add'>+	printk(KERN_ERR PFX "CFG 				= 0x%x.\n",</div><div class='add'>+	       ql_read32(qdev, CFG));</div><div class='add'>+	printk(KERN_ERR PFX "BIOS_ADDR 			= 0x%x.\n",</div><div class='add'>+	       ql_read32(qdev, BIOS_ADDR));</div><div class='add'>+	printk(KERN_ERR PFX "STS 				= 0x%x.\n",</div><div class='add'>+	       ql_read32(qdev, STS));</div><div class='add'>+	printk(KERN_ERR PFX "INTR_EN			= 0x%x.\n",</div><div class='add'>+	       ql_read32(qdev, INTR_EN));</div><div class='add'>+	printk(KERN_ERR PFX "INTR_MASK 			= 0x%x.\n",</div><div class='add'>+	       ql_read32(qdev, INTR_MASK));</div><div class='add'>+	printk(KERN_ERR PFX "ISR1 				= 0x%x.\n",</div><div class='add'>+	       ql_read32(qdev, ISR1));</div><div class='add'>+	printk(KERN_ERR PFX "ISR2 				= 0x%x.\n",</div><div class='add'>+	       ql_read32(qdev, ISR2));</div><div class='add'>+	printk(KERN_ERR PFX "ISR3 				= 0x%x.\n",</div><div class='add'>+	       ql_read32(qdev, ISR3));</div><div class='add'>+	printk(KERN_ERR PFX "ISR4 				= 0x%x.\n",</div><div class='add'>+	       ql_read32(qdev, ISR4));</div><div class='add'>+	printk(KERN_ERR PFX "REV_ID 			= 0x%x.\n",</div><div class='add'>+	       ql_read32(qdev, REV_ID));</div><div class='add'>+	printk(KERN_ERR PFX "FRC_ECC_ERR 			= 0x%x.\n",</div><div class='add'>+	       ql_read32(qdev, FRC_ECC_ERR));</div><div class='add'>+	printk(KERN_ERR PFX "ERR_STS 			= 0x%x.\n",</div><div class='add'>+	       ql_read32(qdev, ERR_STS));</div><div class='add'>+	printk(KERN_ERR PFX "RAM_DBG_ADDR 			= 0x%x.\n",</div><div class='add'>+	       ql_read32(qdev, RAM_DBG_ADDR));</div><div class='add'>+	printk(KERN_ERR PFX "RAM_DBG_DATA 			= 0x%x.\n",</div><div class='add'>+	       ql_read32(qdev, RAM_DBG_DATA));</div><div class='add'>+	printk(KERN_ERR PFX "ECC_ERR_CNT 			= 0x%x.\n",</div><div class='add'>+	       ql_read32(qdev, ECC_ERR_CNT));</div><div class='add'>+	printk(KERN_ERR PFX "SEM 				= 0x%x.\n",</div><div class='add'>+	       ql_read32(qdev, SEM));</div><div class='add'>+	printk(KERN_ERR PFX "GPIO_1 			= 0x%x.\n",</div><div class='add'>+	       ql_read32(qdev, GPIO_1));</div><div class='add'>+	printk(KERN_ERR PFX "GPIO_2 			= 0x%x.\n",</div><div class='add'>+	       ql_read32(qdev, GPIO_2));</div><div class='add'>+	printk(KERN_ERR PFX "GPIO_3 			= 0x%x.\n",</div><div class='add'>+	       ql_read32(qdev, GPIO_3));</div><div class='add'>+	printk(KERN_ERR PFX "XGMAC_ADDR 			= 0x%x.\n",</div><div class='add'>+	       ql_read32(qdev, XGMAC_ADDR));</div><div class='add'>+	printk(KERN_ERR PFX "XGMAC_DATA 			= 0x%x.\n",</div><div class='add'>+	       ql_read32(qdev, XGMAC_DATA));</div><div class='add'>+	printk(KERN_ERR PFX "NIC_ETS 			= 0x%x.\n",</div><div class='add'>+	       ql_read32(qdev, NIC_ETS));</div><div class='add'>+	printk(KERN_ERR PFX "CNA_ETS 			= 0x%x.\n",</div><div class='add'>+	       ql_read32(qdev, CNA_ETS));</div><div class='add'>+	printk(KERN_ERR PFX "FLASH_ADDR 			= 0x%x.\n",</div><div class='add'>+	       ql_read32(qdev, FLASH_ADDR));</div><div class='add'>+	printk(KERN_ERR PFX "FLASH_DATA 			= 0x%x.\n",</div><div class='add'>+	       ql_read32(qdev, FLASH_DATA));</div><div class='add'>+	printk(KERN_ERR PFX "CQ_STOP 			= 0x%x.\n",</div><div class='add'>+	       ql_read32(qdev, CQ_STOP));</div><div class='add'>+	printk(KERN_ERR PFX "PAGE_TBL_RID 			= 0x%x.\n",</div><div class='add'>+	       ql_read32(qdev, PAGE_TBL_RID));</div><div class='add'>+	printk(KERN_ERR PFX "WQ_PAGE_TBL_LO 		= 0x%x.\n",</div><div class='add'>+	       ql_read32(qdev, WQ_PAGE_TBL_LO));</div><div class='add'>+	printk(KERN_ERR PFX "WQ_PAGE_TBL_HI 		= 0x%x.\n",</div><div class='add'>+	       ql_read32(qdev, WQ_PAGE_TBL_HI));</div><div class='add'>+	printk(KERN_ERR PFX "CQ_PAGE_TBL_LO 		= 0x%x.\n",</div><div class='add'>+	       ql_read32(qdev, CQ_PAGE_TBL_LO));</div><div class='add'>+	printk(KERN_ERR PFX "CQ_PAGE_TBL_HI 		= 0x%x.\n",</div><div class='add'>+	       ql_read32(qdev, CQ_PAGE_TBL_HI));</div><div class='add'>+	printk(KERN_ERR PFX "COS_DFLT_CQ1 			= 0x%x.\n",</div><div class='add'>+	       ql_read32(qdev, COS_DFLT_CQ1));</div><div class='add'>+	printk(KERN_ERR PFX "COS_DFLT_CQ2 			= 0x%x.\n",</div><div class='add'>+	       ql_read32(qdev, COS_DFLT_CQ2));</div><div class='add'>+	printk(KERN_ERR PFX "SPLT_HDR 			= 0x%x.\n",</div><div class='add'>+	       ql_read32(qdev, SPLT_HDR));</div><div class='add'>+	printk(KERN_ERR PFX "FC_PAUSE_THRES 		= 0x%x.\n",</div><div class='add'>+	       ql_read32(qdev, FC_PAUSE_THRES));</div><div class='add'>+	printk(KERN_ERR PFX "NIC_PAUSE_THRES 		= 0x%x.\n",</div><div class='add'>+	       ql_read32(qdev, NIC_PAUSE_THRES));</div><div class='add'>+	printk(KERN_ERR PFX "FC_ETHERTYPE 			= 0x%x.\n",</div><div class='add'>+	       ql_read32(qdev, FC_ETHERTYPE));</div><div class='add'>+	printk(KERN_ERR PFX "FC_RCV_CFG 			= 0x%x.\n",</div><div class='add'>+	       ql_read32(qdev, FC_RCV_CFG));</div><div class='add'>+	printk(KERN_ERR PFX "NIC_RCV_CFG 			= 0x%x.\n",</div><div class='add'>+	       ql_read32(qdev, NIC_RCV_CFG));</div><div class='add'>+	printk(KERN_ERR PFX "FC_COS_TAGS 			= 0x%x.\n",</div><div class='add'>+	       ql_read32(qdev, FC_COS_TAGS));</div><div class='add'>+	printk(KERN_ERR PFX "NIC_COS_TAGS 			= 0x%x.\n",</div><div class='add'>+	       ql_read32(qdev, NIC_COS_TAGS));</div><div class='add'>+	printk(KERN_ERR PFX "MGMT_RCV_CFG 			= 0x%x.\n",</div><div class='add'>+	       ql_read32(qdev, MGMT_RCV_CFG));</div><div class='add'>+	printk(KERN_ERR PFX "XG_SERDES_ADDR 		= 0x%x.\n",</div><div class='add'>+	       ql_read32(qdev, XG_SERDES_ADDR));</div><div class='add'>+	printk(KERN_ERR PFX "XG_SERDES_DATA 		= 0x%x.\n",</div><div class='add'>+	       ql_read32(qdev, XG_SERDES_DATA));</div><div class='add'>+	printk(KERN_ERR PFX "PRB_MX_ADDR 			= 0x%x.\n",</div><div class='add'>+	       ql_read32(qdev, PRB_MX_ADDR));</div><div class='add'>+	printk(KERN_ERR PFX "PRB_MX_DATA 			= 0x%x.\n",</div><div class='add'>+	       ql_read32(qdev, PRB_MX_DATA));</div><div class='add'>+	ql_dump_intr_states(qdev);</div><div class='add'>+	ql_dump_xgmac_control_regs(qdev);</div><div class='add'>+	ql_dump_ets_regs(qdev);</div><div class='add'>+	ql_dump_cam_entries(qdev);</div><div class='add'>+	ql_dump_routing_entries(qdev);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef QL_STAT_DUMP</div><div class='add'>+void ql_dump_stat(struct ql_adapter *qdev)</div><div class='add'>+{</div><div class='add'>+	printk(KERN_ERR "%s: Enter.\n", __func__);</div><div class='add'>+	printk(KERN_ERR "tx_pkts = %ld\n",</div><div class='add'>+	       (unsigned long)qdev-&gt;nic_stats.tx_pkts);</div><div class='add'>+	printk(KERN_ERR "tx_bytes = %ld\n",</div><div class='add'>+	       (unsigned long)qdev-&gt;nic_stats.tx_bytes);</div><div class='add'>+	printk(KERN_ERR "tx_mcast_pkts = %ld.\n",</div><div class='add'>+	       (unsigned long)qdev-&gt;nic_stats.tx_mcast_pkts);</div><div class='add'>+	printk(KERN_ERR "tx_bcast_pkts = %ld.\n",</div><div class='add'>+	       (unsigned long)qdev-&gt;nic_stats.tx_bcast_pkts);</div><div class='add'>+	printk(KERN_ERR "tx_ucast_pkts = %ld.\n",</div><div class='add'>+	       (unsigned long)qdev-&gt;nic_stats.tx_ucast_pkts);</div><div class='add'>+	printk(KERN_ERR "tx_ctl_pkts = %ld.\n",</div><div class='add'>+	       (unsigned long)qdev-&gt;nic_stats.tx_ctl_pkts);</div><div class='add'>+	printk(KERN_ERR "tx_pause_pkts = %ld.\n",</div><div class='add'>+	       (unsigned long)qdev-&gt;nic_stats.tx_pause_pkts);</div><div class='add'>+	printk(KERN_ERR "tx_64_pkt = %ld.\n",</div><div class='add'>+	       (unsigned long)qdev-&gt;nic_stats.tx_64_pkt);</div><div class='add'>+	printk(KERN_ERR "tx_65_to_127_pkt = %ld.\n",</div><div class='add'>+	       (unsigned long)qdev-&gt;nic_stats.tx_65_to_127_pkt);</div><div class='add'>+	printk(KERN_ERR "tx_128_to_255_pkt = %ld.\n",</div><div class='add'>+	       (unsigned long)qdev-&gt;nic_stats.tx_128_to_255_pkt);</div><div class='add'>+	printk(KERN_ERR "tx_256_511_pkt = %ld.\n",</div><div class='add'>+	       (unsigned long)qdev-&gt;nic_stats.tx_256_511_pkt);</div><div class='add'>+	printk(KERN_ERR "tx_512_to_1023_pkt = %ld.\n",</div><div class='add'>+	       (unsigned long)qdev-&gt;nic_stats.tx_512_to_1023_pkt);</div><div class='add'>+	printk(KERN_ERR "tx_1024_to_1518_pkt = %ld.\n",</div><div class='add'>+	       (unsigned long)qdev-&gt;nic_stats.tx_1024_to_1518_pkt);</div><div class='add'>+	printk(KERN_ERR "tx_1519_to_max_pkt = %ld.\n",</div><div class='add'>+	       (unsigned long)qdev-&gt;nic_stats.tx_1519_to_max_pkt);</div><div class='add'>+	printk(KERN_ERR "tx_undersize_pkt = %ld.\n",</div><div class='add'>+	       (unsigned long)qdev-&gt;nic_stats.tx_undersize_pkt);</div><div class='add'>+	printk(KERN_ERR "tx_oversize_pkt = %ld.\n",</div><div class='add'>+	       (unsigned long)qdev-&gt;nic_stats.tx_oversize_pkt);</div><div class='add'>+	printk(KERN_ERR "rx_bytes = %ld.\n",</div><div class='add'>+	       (unsigned long)qdev-&gt;nic_stats.rx_bytes);</div><div class='add'>+	printk(KERN_ERR "rx_bytes_ok = %ld.\n",</div><div class='add'>+	       (unsigned long)qdev-&gt;nic_stats.rx_bytes_ok);</div><div class='add'>+	printk(KERN_ERR "rx_pkts = %ld.\n",</div><div class='add'>+	       (unsigned long)qdev-&gt;nic_stats.rx_pkts);</div><div class='add'>+	printk(KERN_ERR "rx_pkts_ok = %ld.\n",</div><div class='add'>+	       (unsigned long)qdev-&gt;nic_stats.rx_pkts_ok);</div><div class='add'>+	printk(KERN_ERR "rx_bcast_pkts = %ld.\n",</div><div class='add'>+	       (unsigned long)qdev-&gt;nic_stats.rx_bcast_pkts);</div><div class='add'>+	printk(KERN_ERR "rx_mcast_pkts = %ld.\n",</div><div class='add'>+	       (unsigned long)qdev-&gt;nic_stats.rx_mcast_pkts);</div><div class='add'>+	printk(KERN_ERR "rx_ucast_pkts = %ld.\n",</div><div class='add'>+	       (unsigned long)qdev-&gt;nic_stats.rx_ucast_pkts);</div><div class='add'>+	printk(KERN_ERR "rx_undersize_pkts = %ld.\n",</div><div class='add'>+	       (unsigned long)qdev-&gt;nic_stats.rx_undersize_pkts);</div><div class='add'>+	printk(KERN_ERR "rx_oversize_pkts = %ld.\n",</div><div class='add'>+	       (unsigned long)qdev-&gt;nic_stats.rx_oversize_pkts);</div><div class='add'>+	printk(KERN_ERR "rx_jabber_pkts = %ld.\n",</div><div class='add'>+	       (unsigned long)qdev-&gt;nic_stats.rx_jabber_pkts);</div><div class='add'>+	printk(KERN_ERR "rx_undersize_fcerr_pkts = %ld.\n",</div><div class='add'>+	       (unsigned long)qdev-&gt;nic_stats.rx_undersize_fcerr_pkts);</div><div class='add'>+	printk(KERN_ERR "rx_drop_events = %ld.\n",</div><div class='add'>+	       (unsigned long)qdev-&gt;nic_stats.rx_drop_events);</div><div class='add'>+	printk(KERN_ERR "rx_fcerr_pkts = %ld.\n",</div><div class='add'>+	       (unsigned long)qdev-&gt;nic_stats.rx_fcerr_pkts);</div><div class='add'>+	printk(KERN_ERR "rx_align_err = %ld.\n",</div><div class='add'>+	       (unsigned long)qdev-&gt;nic_stats.rx_align_err);</div><div class='add'>+	printk(KERN_ERR "rx_symbol_err = %ld.\n",</div><div class='add'>+	       (unsigned long)qdev-&gt;nic_stats.rx_symbol_err);</div><div class='add'>+	printk(KERN_ERR "rx_mac_err = %ld.\n",</div><div class='add'>+	       (unsigned long)qdev-&gt;nic_stats.rx_mac_err);</div><div class='add'>+	printk(KERN_ERR "rx_ctl_pkts = %ld.\n",</div><div class='add'>+	       (unsigned long)qdev-&gt;nic_stats.rx_ctl_pkts);</div><div class='add'>+	printk(KERN_ERR "rx_pause_pkts = %ld.\n",</div><div class='add'>+	       (unsigned long)qdev-&gt;nic_stats.rx_pause_pkts);</div><div class='add'>+	printk(KERN_ERR "rx_64_pkts = %ld.\n",</div><div class='add'>+	       (unsigned long)qdev-&gt;nic_stats.rx_64_pkts);</div><div class='add'>+	printk(KERN_ERR "rx_65_to_127_pkts = %ld.\n",</div><div class='add'>+	       (unsigned long)qdev-&gt;nic_stats.rx_65_to_127_pkts);</div><div class='add'>+	printk(KERN_ERR "rx_128_255_pkts = %ld.\n",</div><div class='add'>+	       (unsigned long)qdev-&gt;nic_stats.rx_128_255_pkts);</div><div class='add'>+	printk(KERN_ERR "rx_256_511_pkts = %ld.\n",</div><div class='add'>+	       (unsigned long)qdev-&gt;nic_stats.rx_256_511_pkts);</div><div class='add'>+	printk(KERN_ERR "rx_512_to_1023_pkts = %ld.\n",</div><div class='add'>+	       (unsigned long)qdev-&gt;nic_stats.rx_512_to_1023_pkts);</div><div class='add'>+	printk(KERN_ERR "rx_1024_to_1518_pkts = %ld.\n",</div><div class='add'>+	       (unsigned long)qdev-&gt;nic_stats.rx_1024_to_1518_pkts);</div><div class='add'>+	printk(KERN_ERR "rx_1519_to_max_pkts = %ld.\n",</div><div class='add'>+	       (unsigned long)qdev-&gt;nic_stats.rx_1519_to_max_pkts);</div><div class='add'>+	printk(KERN_ERR "rx_len_err_pkts = %ld.\n",</div><div class='add'>+	       (unsigned long)qdev-&gt;nic_stats.rx_len_err_pkts);</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef QL_DEV_DUMP</div><div class='add'>+void ql_dump_qdev(struct ql_adapter *qdev)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	printk(KERN_ERR PFX "qdev-&gt;flags 			= %lx.\n",</div><div class='add'>+	       qdev-&gt;flags);</div><div class='add'>+	printk(KERN_ERR PFX "qdev-&gt;vlgrp 			= %p.\n",</div><div class='add'>+	       qdev-&gt;vlgrp);</div><div class='add'>+	printk(KERN_ERR PFX "qdev-&gt;pdev 			= %p.\n",</div><div class='add'>+	       qdev-&gt;pdev);</div><div class='add'>+	printk(KERN_ERR PFX "qdev-&gt;ndev 			= %p.\n",</div><div class='add'>+	       qdev-&gt;ndev);</div><div class='add'>+	printk(KERN_ERR PFX "qdev-&gt;chip_rev_id 		= %d.\n",</div><div class='add'>+	       qdev-&gt;chip_rev_id);</div><div class='add'>+	printk(KERN_ERR PFX "qdev-&gt;reg_base 		= %p.\n",</div><div class='add'>+	       qdev-&gt;reg_base);</div><div class='add'>+	printk(KERN_ERR PFX "qdev-&gt;doorbell_area 	= %p.\n",</div><div class='add'>+	       qdev-&gt;doorbell_area);</div><div class='add'>+	printk(KERN_ERR PFX "qdev-&gt;doorbell_area_size 	= %d.\n",</div><div class='add'>+	       qdev-&gt;doorbell_area_size);</div><div class='add'>+	printk(KERN_ERR PFX "msg_enable 		= %x.\n",</div><div class='add'>+	       qdev-&gt;msg_enable);</div><div class='add'>+	printk(KERN_ERR PFX "qdev-&gt;rx_ring_shadow_reg_area	= %p.\n",</div><div class='add'>+	       qdev-&gt;rx_ring_shadow_reg_area);</div><div class='add'>+	printk(KERN_ERR PFX "qdev-&gt;rx_ring_shadow_reg_dma 	= %llx.\n",</div><div class='add'>+	       (unsigned long long) qdev-&gt;rx_ring_shadow_reg_dma);</div><div class='add'>+	printk(KERN_ERR PFX "qdev-&gt;tx_ring_shadow_reg_area	= %p.\n",</div><div class='add'>+	       qdev-&gt;tx_ring_shadow_reg_area);</div><div class='add'>+	printk(KERN_ERR PFX "qdev-&gt;tx_ring_shadow_reg_dma	= %llx.\n",</div><div class='add'>+	       (unsigned long long) qdev-&gt;tx_ring_shadow_reg_dma);</div><div class='add'>+	printk(KERN_ERR PFX "qdev-&gt;intr_count 		= %d.\n",</div><div class='add'>+	       qdev-&gt;intr_count);</div><div class='add'>+	if (qdev-&gt;msi_x_entry)</div><div class='add'>+		for (i = 0; i &lt; qdev-&gt;intr_count; i++) {</div><div class='add'>+			printk(KERN_ERR PFX</div><div class='add'>+			       "msi_x_entry.[%d]vector	= %d.\n", i,</div><div class='add'>+			       qdev-&gt;msi_x_entry[i].vector);</div><div class='add'>+			printk(KERN_ERR PFX</div><div class='add'>+			       "msi_x_entry.[%d]entry	= %d.\n", i,</div><div class='add'>+			       qdev-&gt;msi_x_entry[i].entry);</div><div class='add'>+		}</div><div class='add'>+	for (i = 0; i &lt; qdev-&gt;intr_count; i++) {</div><div class='add'>+		printk(KERN_ERR PFX</div><div class='add'>+		       "intr_context[%d].qdev		= %p.\n", i,</div><div class='add'>+		       qdev-&gt;intr_context[i].qdev);</div><div class='add'>+		printk(KERN_ERR PFX</div><div class='add'>+		       "intr_context[%d].intr		= %d.\n", i,</div><div class='add'>+		       qdev-&gt;intr_context[i].intr);</div><div class='add'>+		printk(KERN_ERR PFX</div><div class='add'>+		       "intr_context[%d].hooked		= %d.\n", i,</div><div class='add'>+		       qdev-&gt;intr_context[i].hooked);</div><div class='add'>+		printk(KERN_ERR PFX</div><div class='add'>+		       "intr_context[%d].intr_en_mask	= 0x%08x.\n", i,</div><div class='add'>+		       qdev-&gt;intr_context[i].intr_en_mask);</div><div class='add'>+		printk(KERN_ERR PFX</div><div class='add'>+		       "intr_context[%d].intr_dis_mask	= 0x%08x.\n", i,</div><div class='add'>+		       qdev-&gt;intr_context[i].intr_dis_mask);</div><div class='add'>+		printk(KERN_ERR PFX</div><div class='add'>+		       "intr_context[%d].intr_read_mask	= 0x%08x.\n", i,</div><div class='add'>+		       qdev-&gt;intr_context[i].intr_read_mask);</div><div class='add'>+	}</div><div class='add'>+	printk(KERN_ERR PFX "qdev-&gt;tx_ring_count = %d.\n", qdev-&gt;tx_ring_count);</div><div class='add'>+	printk(KERN_ERR PFX "qdev-&gt;rx_ring_count = %d.\n", qdev-&gt;rx_ring_count);</div><div class='add'>+	printk(KERN_ERR PFX "qdev-&gt;ring_mem_size = %d.\n", qdev-&gt;ring_mem_size);</div><div class='add'>+	printk(KERN_ERR PFX "qdev-&gt;ring_mem 	= %p.\n", qdev-&gt;ring_mem);</div><div class='add'>+	printk(KERN_ERR PFX "qdev-&gt;intr_count 	= %d.\n", qdev-&gt;intr_count);</div><div class='add'>+	printk(KERN_ERR PFX "qdev-&gt;tx_ring		= %p.\n",</div><div class='add'>+	       qdev-&gt;tx_ring);</div><div class='add'>+	printk(KERN_ERR PFX "qdev-&gt;rss_ring_first_cq_id 	= %d.\n",</div><div class='add'>+	       qdev-&gt;rss_ring_first_cq_id);</div><div class='add'>+	printk(KERN_ERR PFX "qdev-&gt;rss_ring_count 	= %d.\n",</div><div class='add'>+	       qdev-&gt;rss_ring_count);</div><div class='add'>+	printk(KERN_ERR PFX "qdev-&gt;rx_ring	= %p.\n", qdev-&gt;rx_ring);</div><div class='add'>+	printk(KERN_ERR PFX "qdev-&gt;default_rx_queue	= %d.\n",</div><div class='add'>+	       qdev-&gt;default_rx_queue);</div><div class='add'>+	printk(KERN_ERR PFX "qdev-&gt;xg_sem_mask		= 0x%08x.\n",</div><div class='add'>+	       qdev-&gt;xg_sem_mask);</div><div class='add'>+	printk(KERN_ERR PFX "qdev-&gt;port_link_up		= 0x%08x.\n",</div><div class='add'>+	       qdev-&gt;port_link_up);</div><div class='add'>+	printk(KERN_ERR PFX "qdev-&gt;port_init		= 0x%08x.\n",</div><div class='add'>+	       qdev-&gt;port_init);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef QL_CB_DUMP</div><div class='add'>+void ql_dump_wqicb(struct wqicb *wqicb)</div><div class='add'>+{</div><div class='add'>+	printk(KERN_ERR PFX "Dumping wqicb stuff...\n");</div><div class='add'>+	printk(KERN_ERR PFX "wqicb-&gt;len = 0x%x.\n", le16_to_cpu(wqicb-&gt;len));</div><div class='add'>+	printk(KERN_ERR PFX "wqicb-&gt;flags = %x.\n", le16_to_cpu(wqicb-&gt;flags));</div><div class='add'>+	printk(KERN_ERR PFX "wqicb-&gt;cq_id_rss = %d.\n",</div><div class='add'>+	       le16_to_cpu(wqicb-&gt;cq_id_rss));</div><div class='add'>+	printk(KERN_ERR PFX "wqicb-&gt;rid = 0x%x.\n", le16_to_cpu(wqicb-&gt;rid));</div><div class='add'>+	printk(KERN_ERR PFX "wqicb-&gt;wq_addr_lo = 0x%.08x.\n",</div><div class='add'>+	       le32_to_cpu(wqicb-&gt;addr_lo));</div><div class='add'>+	printk(KERN_ERR PFX "wqicb-&gt;wq_addr_hi = 0x%.08x.\n",</div><div class='add'>+	       le32_to_cpu(wqicb-&gt;addr_hi));</div><div class='add'>+	printk(KERN_ERR PFX "wqicb-&gt;wq_cnsmr_idx_addr_lo = 0x%.08x.\n",</div><div class='add'>+	       le32_to_cpu(wqicb-&gt;cnsmr_idx_addr_lo));</div><div class='add'>+	printk(KERN_ERR PFX "wqicb-&gt;wq_cnsmr_idx_addr_hi = 0x%.08x.\n",</div><div class='add'>+	       le32_to_cpu(wqicb-&gt;cnsmr_idx_addr_hi));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ql_dump_tx_ring(struct tx_ring *tx_ring)</div><div class='add'>+{</div><div class='add'>+	if (tx_ring == NULL)</div><div class='add'>+		return;</div><div class='add'>+	printk(KERN_ERR PFX</div><div class='add'>+	       "===================== Dumping tx_ring %d ===============.\n",</div><div class='add'>+	       tx_ring-&gt;wq_id);</div><div class='add'>+	printk(KERN_ERR PFX "tx_ring-&gt;base = %p.\n", tx_ring-&gt;wq_base);</div><div class='add'>+	printk(KERN_ERR PFX "tx_ring-&gt;base_dma = 0x%llx.\n",</div><div class='add'>+	       (unsigned long long) tx_ring-&gt;wq_base_dma);</div><div class='add'>+	printk(KERN_ERR PFX "tx_ring-&gt;cnsmr_idx_sh_reg = %p.\n",</div><div class='add'>+	       tx_ring-&gt;cnsmr_idx_sh_reg);</div><div class='add'>+	printk(KERN_ERR PFX "tx_ring-&gt;cnsmr_idx_sh_reg_dma = 0x%llx.\n",</div><div class='add'>+	       (unsigned long long) tx_ring-&gt;cnsmr_idx_sh_reg_dma);</div><div class='add'>+	printk(KERN_ERR PFX "tx_ring-&gt;size = %d.\n", tx_ring-&gt;wq_size);</div><div class='add'>+	printk(KERN_ERR PFX "tx_ring-&gt;len = %d.\n", tx_ring-&gt;wq_len);</div><div class='add'>+	printk(KERN_ERR PFX "tx_ring-&gt;prod_idx_db_reg = %p.\n",</div><div class='add'>+	       tx_ring-&gt;prod_idx_db_reg);</div><div class='add'>+	printk(KERN_ERR PFX "tx_ring-&gt;valid_db_reg = %p.\n",</div><div class='add'>+	       tx_ring-&gt;valid_db_reg);</div><div class='add'>+	printk(KERN_ERR PFX "tx_ring-&gt;prod_idx = %d.\n", tx_ring-&gt;prod_idx);</div><div class='add'>+	printk(KERN_ERR PFX "tx_ring-&gt;cq_id = %d.\n", tx_ring-&gt;cq_id);</div><div class='add'>+	printk(KERN_ERR PFX "tx_ring-&gt;wq_id = %d.\n", tx_ring-&gt;wq_id);</div><div class='add'>+	printk(KERN_ERR PFX "tx_ring-&gt;q = %p.\n", tx_ring-&gt;q);</div><div class='add'>+	printk(KERN_ERR PFX "tx_ring-&gt;tx_count = %d.\n",</div><div class='add'>+	       atomic_read(&amp;tx_ring-&gt;tx_count));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ql_dump_ricb(struct ricb *ricb)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	printk(KERN_ERR PFX</div><div class='add'>+	       "===================== Dumping ricb ===============.\n");</div><div class='add'>+	printk(KERN_ERR PFX "Dumping ricb stuff...\n");</div><div class='add'>+</div><div class='add'>+	printk(KERN_ERR PFX "ricb-&gt;base_cq = %d.\n", ricb-&gt;base_cq &amp; 0x1f);</div><div class='add'>+	printk(KERN_ERR PFX "ricb-&gt;flags = %s%s%s%s%s%s%s%s%s.\n",</div><div class='add'>+	       ricb-&gt;base_cq &amp; RSS_L4K ? "RSS_L4K " : "",</div><div class='add'>+	       ricb-&gt;flags &amp; RSS_L6K ? "RSS_L6K " : "",</div><div class='add'>+	       ricb-&gt;flags &amp; RSS_LI ? "RSS_LI " : "",</div><div class='add'>+	       ricb-&gt;flags &amp; RSS_LB ? "RSS_LB " : "",</div><div class='add'>+	       ricb-&gt;flags &amp; RSS_LM ? "RSS_LM " : "",</div><div class='add'>+	       ricb-&gt;flags &amp; RSS_RI4 ? "RSS_RI4 " : "",</div><div class='add'>+	       ricb-&gt;flags &amp; RSS_RT4 ? "RSS_RT4 " : "",</div><div class='add'>+	       ricb-&gt;flags &amp; RSS_RI6 ? "RSS_RI6 " : "",</div><div class='add'>+	       ricb-&gt;flags &amp; RSS_RT6 ? "RSS_RT6 " : "");</div><div class='add'>+	printk(KERN_ERR PFX "ricb-&gt;mask = 0x%.04x.\n", le16_to_cpu(ricb-&gt;mask));</div><div class='add'>+	for (i = 0; i &lt; 16; i++)</div><div class='add'>+		printk(KERN_ERR PFX "ricb-&gt;hash_cq_id[%d] = 0x%.08x.\n", i,</div><div class='add'>+		       le32_to_cpu(ricb-&gt;hash_cq_id[i]));</div><div class='add'>+	for (i = 0; i &lt; 10; i++)</div><div class='add'>+		printk(KERN_ERR PFX "ricb-&gt;ipv6_hash_key[%d] = 0x%.08x.\n", i,</div><div class='add'>+		       le32_to_cpu(ricb-&gt;ipv6_hash_key[i]));</div><div class='add'>+	for (i = 0; i &lt; 4; i++)</div><div class='add'>+		printk(KERN_ERR PFX "ricb-&gt;ipv4_hash_key[%d] = 0x%.08x.\n", i,</div><div class='add'>+		       le32_to_cpu(ricb-&gt;ipv4_hash_key[i]));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ql_dump_cqicb(struct cqicb *cqicb)</div><div class='add'>+{</div><div class='add'>+	printk(KERN_ERR PFX "Dumping cqicb stuff...\n");</div><div class='add'>+</div><div class='add'>+	printk(KERN_ERR PFX "cqicb-&gt;msix_vect = %d.\n", cqicb-&gt;msix_vect);</div><div class='add'>+	printk(KERN_ERR PFX "cqicb-&gt;flags = %x.\n", cqicb-&gt;flags);</div><div class='add'>+	printk(KERN_ERR PFX "cqicb-&gt;len = %d.\n", le16_to_cpu(cqicb-&gt;len));</div><div class='add'>+	printk(KERN_ERR PFX "cqicb-&gt;addr_lo = %x.\n",</div><div class='add'>+	       le32_to_cpu(cqicb-&gt;addr_lo));</div><div class='add'>+	printk(KERN_ERR PFX "cqicb-&gt;addr_hi = %x.\n",</div><div class='add'>+	       le32_to_cpu(cqicb-&gt;addr_hi));</div><div class='add'>+	printk(KERN_ERR PFX "cqicb-&gt;prod_idx_addr_lo = %x.\n",</div><div class='add'>+	       le32_to_cpu(cqicb-&gt;prod_idx_addr_lo));</div><div class='add'>+	printk(KERN_ERR PFX "cqicb-&gt;prod_idx_addr_hi = %x.\n",</div><div class='add'>+	       le32_to_cpu(cqicb-&gt;prod_idx_addr_hi));</div><div class='add'>+	printk(KERN_ERR PFX "cqicb-&gt;pkt_delay = 0x%.04x.\n",</div><div class='add'>+	       le16_to_cpu(cqicb-&gt;pkt_delay));</div><div class='add'>+	printk(KERN_ERR PFX "cqicb-&gt;irq_delay = 0x%.04x.\n",</div><div class='add'>+	       le16_to_cpu(cqicb-&gt;irq_delay));</div><div class='add'>+	printk(KERN_ERR PFX "cqicb-&gt;lbq_addr_lo = %x.\n",</div><div class='add'>+	       le32_to_cpu(cqicb-&gt;lbq_addr_lo));</div><div class='add'>+	printk(KERN_ERR PFX "cqicb-&gt;lbq_addr_hi = %x.\n",</div><div class='add'>+	       le32_to_cpu(cqicb-&gt;lbq_addr_hi));</div><div class='add'>+	printk(KERN_ERR PFX "cqicb-&gt;lbq_buf_size = 0x%.04x.\n",</div><div class='add'>+	       le16_to_cpu(cqicb-&gt;lbq_buf_size));</div><div class='add'>+	printk(KERN_ERR PFX "cqicb-&gt;lbq_len = 0x%.04x.\n",</div><div class='add'>+	       le16_to_cpu(cqicb-&gt;lbq_len));</div><div class='add'>+	printk(KERN_ERR PFX "cqicb-&gt;sbq_addr_lo = %x.\n",</div><div class='add'>+	       le32_to_cpu(cqicb-&gt;sbq_addr_lo));</div><div class='add'>+	printk(KERN_ERR PFX "cqicb-&gt;sbq_addr_hi = %x.\n",</div><div class='add'>+	       le32_to_cpu(cqicb-&gt;sbq_addr_hi));</div><div class='add'>+	printk(KERN_ERR PFX "cqicb-&gt;sbq_buf_size = 0x%.04x.\n",</div><div class='add'>+	       le16_to_cpu(cqicb-&gt;sbq_buf_size));</div><div class='add'>+	printk(KERN_ERR PFX "cqicb-&gt;sbq_len = 0x%.04x.\n",</div><div class='add'>+	       le16_to_cpu(cqicb-&gt;sbq_len));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ql_dump_rx_ring(struct rx_ring *rx_ring)</div><div class='add'>+{</div><div class='add'>+	if (rx_ring == NULL)</div><div class='add'>+		return;</div><div class='add'>+	printk(KERN_ERR PFX</div><div class='add'>+	       "===================== Dumping rx_ring %d ===============.\n",</div><div class='add'>+	       rx_ring-&gt;cq_id);</div><div class='add'>+	printk(KERN_ERR PFX "Dumping rx_ring %d, type = %s%s%s.\n",</div><div class='add'>+	       rx_ring-&gt;cq_id, rx_ring-&gt;type == DEFAULT_Q ? "DEFAULT" : "",</div><div class='add'>+	       rx_ring-&gt;type == TX_Q ? "OUTBOUND COMPLETIONS" : "",</div><div class='add'>+	       rx_ring-&gt;type == RX_Q ? "INBOUND_COMPLETIONS" : "");</div><div class='add'>+	printk(KERN_ERR PFX "rx_ring-&gt;cqicb = %p.\n", &amp;rx_ring-&gt;cqicb);</div><div class='add'>+	printk(KERN_ERR PFX "rx_ring-&gt;cq_base = %p.\n", rx_ring-&gt;cq_base);</div><div class='add'>+	printk(KERN_ERR PFX "rx_ring-&gt;cq_base_dma = %llx.\n",</div><div class='add'>+	       (unsigned long long) rx_ring-&gt;cq_base_dma);</div><div class='add'>+	printk(KERN_ERR PFX "rx_ring-&gt;cq_size = %d.\n", rx_ring-&gt;cq_size);</div><div class='add'>+	printk(KERN_ERR PFX "rx_ring-&gt;cq_len = %d.\n", rx_ring-&gt;cq_len);</div><div class='add'>+	printk(KERN_ERR PFX</div><div class='add'>+	       "rx_ring-&gt;prod_idx_sh_reg, addr = %p, value = %d.\n",</div><div class='add'>+	       rx_ring-&gt;prod_idx_sh_reg,</div><div class='add'>+	       rx_ring-&gt;prod_idx_sh_reg ? *(rx_ring-&gt;prod_idx_sh_reg) : 0);</div><div class='add'>+	printk(KERN_ERR PFX "rx_ring-&gt;prod_idx_sh_reg_dma = %llx.\n",</div><div class='add'>+	       (unsigned long long) rx_ring-&gt;prod_idx_sh_reg_dma);</div><div class='add'>+	printk(KERN_ERR PFX "rx_ring-&gt;cnsmr_idx_db_reg = %p.\n",</div><div class='add'>+	       rx_ring-&gt;cnsmr_idx_db_reg);</div><div class='add'>+	printk(KERN_ERR PFX "rx_ring-&gt;cnsmr_idx = %d.\n", rx_ring-&gt;cnsmr_idx);</div><div class='add'>+	printk(KERN_ERR PFX "rx_ring-&gt;curr_entry = %p.\n", rx_ring-&gt;curr_entry);</div><div class='add'>+	printk(KERN_ERR PFX "rx_ring-&gt;valid_db_reg = %p.\n",</div><div class='add'>+	       rx_ring-&gt;valid_db_reg);</div><div class='add'>+</div><div class='add'>+	printk(KERN_ERR PFX "rx_ring-&gt;lbq_base = %p.\n", rx_ring-&gt;lbq_base);</div><div class='add'>+	printk(KERN_ERR PFX "rx_ring-&gt;lbq_base_dma = %llx.\n",</div><div class='add'>+	       (unsigned long long) rx_ring-&gt;lbq_base_dma);</div><div class='add'>+	printk(KERN_ERR PFX "rx_ring-&gt;lbq_base_indirect = %p.\n",</div><div class='add'>+	       rx_ring-&gt;lbq_base_indirect);</div><div class='add'>+	printk(KERN_ERR PFX "rx_ring-&gt;lbq_base_indirect_dma = %llx.\n",</div><div class='add'>+	       (unsigned long long) rx_ring-&gt;lbq_base_indirect_dma);</div><div class='add'>+	printk(KERN_ERR PFX "rx_ring-&gt;lbq = %p.\n", rx_ring-&gt;lbq);</div><div class='add'>+	printk(KERN_ERR PFX "rx_ring-&gt;lbq_len = %d.\n", rx_ring-&gt;lbq_len);</div><div class='add'>+	printk(KERN_ERR PFX "rx_ring-&gt;lbq_size = %d.\n", rx_ring-&gt;lbq_size);</div><div class='add'>+	printk(KERN_ERR PFX "rx_ring-&gt;lbq_prod_idx_db_reg = %p.\n",</div><div class='add'>+	       rx_ring-&gt;lbq_prod_idx_db_reg);</div><div class='add'>+	printk(KERN_ERR PFX "rx_ring-&gt;lbq_prod_idx = %d.\n",</div><div class='add'>+	       rx_ring-&gt;lbq_prod_idx);</div><div class='add'>+	printk(KERN_ERR PFX "rx_ring-&gt;lbq_curr_idx = %d.\n",</div><div class='add'>+	       rx_ring-&gt;lbq_curr_idx);</div><div class='add'>+	printk(KERN_ERR PFX "rx_ring-&gt;lbq_clean_idx = %d.\n",</div><div class='add'>+	       rx_ring-&gt;lbq_clean_idx);</div><div class='add'>+	printk(KERN_ERR PFX "rx_ring-&gt;lbq_free_cnt = %d.\n",</div><div class='add'>+	       rx_ring-&gt;lbq_free_cnt);</div><div class='add'>+	printk(KERN_ERR PFX "rx_ring-&gt;lbq_buf_size = %d.\n",</div><div class='add'>+	       rx_ring-&gt;lbq_buf_size);</div><div class='add'>+</div><div class='add'>+	printk(KERN_ERR PFX "rx_ring-&gt;sbq_base = %p.\n", rx_ring-&gt;sbq_base);</div><div class='add'>+	printk(KERN_ERR PFX "rx_ring-&gt;sbq_base_dma = %llx.\n",</div><div class='add'>+	       (unsigned long long) rx_ring-&gt;sbq_base_dma);</div><div class='add'>+	printk(KERN_ERR PFX "rx_ring-&gt;sbq_base_indirect = %p.\n",</div><div class='add'>+	       rx_ring-&gt;sbq_base_indirect);</div><div class='add'>+	printk(KERN_ERR PFX "rx_ring-&gt;sbq_base_indirect_dma = %llx.\n",</div><div class='add'>+	       (unsigned long long) rx_ring-&gt;sbq_base_indirect_dma);</div><div class='add'>+	printk(KERN_ERR PFX "rx_ring-&gt;sbq = %p.\n", rx_ring-&gt;sbq);</div><div class='add'>+	printk(KERN_ERR PFX "rx_ring-&gt;sbq_len = %d.\n", rx_ring-&gt;sbq_len);</div><div class='add'>+	printk(KERN_ERR PFX "rx_ring-&gt;sbq_size = %d.\n", rx_ring-&gt;sbq_size);</div><div class='add'>+	printk(KERN_ERR PFX "rx_ring-&gt;sbq_prod_idx_db_reg addr = %p.\n",</div><div class='add'>+	       rx_ring-&gt;sbq_prod_idx_db_reg);</div><div class='add'>+	printk(KERN_ERR PFX "rx_ring-&gt;sbq_prod_idx = %d.\n",</div><div class='add'>+	       rx_ring-&gt;sbq_prod_idx);</div><div class='add'>+	printk(KERN_ERR PFX "rx_ring-&gt;sbq_curr_idx = %d.\n",</div><div class='add'>+	       rx_ring-&gt;sbq_curr_idx);</div><div class='add'>+	printk(KERN_ERR PFX "rx_ring-&gt;sbq_clean_idx = %d.\n",</div><div class='add'>+	       rx_ring-&gt;sbq_clean_idx);</div><div class='add'>+	printk(KERN_ERR PFX "rx_ring-&gt;sbq_free_cnt = %d.\n",</div><div class='add'>+	       rx_ring-&gt;sbq_free_cnt);</div><div class='add'>+	printk(KERN_ERR PFX "rx_ring-&gt;sbq_buf_size = %d.\n",</div><div class='add'>+	       rx_ring-&gt;sbq_buf_size);</div><div class='add'>+	printk(KERN_ERR PFX "rx_ring-&gt;cq_id = %d.\n", rx_ring-&gt;cq_id);</div><div class='add'>+	printk(KERN_ERR PFX "rx_ring-&gt;irq = %d.\n", rx_ring-&gt;irq);</div><div class='add'>+	printk(KERN_ERR PFX "rx_ring-&gt;cpu = %d.\n", rx_ring-&gt;cpu);</div><div class='add'>+	printk(KERN_ERR PFX "rx_ring-&gt;qdev = %p.\n", rx_ring-&gt;qdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ql_dump_hw_cb(struct ql_adapter *qdev, int size, u32 bit, u16 q_id)</div><div class='add'>+{</div><div class='add'>+	void *ptr;</div><div class='add'>+</div><div class='add'>+	printk(KERN_ERR PFX "%s: Enter.\n", __func__);</div><div class='add'>+</div><div class='add'>+	ptr = kmalloc(size, GFP_ATOMIC);</div><div class='add'>+	if (ptr == NULL) {</div><div class='add'>+		printk(KERN_ERR PFX "%s: Couldn't allocate a buffer.\n",</div><div class='add'>+		       __func__);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ql_write_cfg(qdev, ptr, size, bit, q_id)) {</div><div class='add'>+		printk(KERN_ERR "%s: Failed to upload control block!\n",</div><div class='add'>+		       __func__);</div><div class='add'>+		goto fail_it;</div><div class='add'>+	}</div><div class='add'>+	switch (bit) {</div><div class='add'>+	case CFG_DRQ:</div><div class='add'>+		ql_dump_wqicb((struct wqicb *)ptr);</div><div class='add'>+		break;</div><div class='add'>+	case CFG_DCQ:</div><div class='add'>+		ql_dump_cqicb((struct cqicb *)ptr);</div><div class='add'>+		break;</div><div class='add'>+	case CFG_DR:</div><div class='add'>+		ql_dump_ricb((struct ricb *)ptr);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		printk(KERN_ERR PFX "%s: Invalid bit value = %x.\n",</div><div class='add'>+		       __func__, bit);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+fail_it:</div><div class='add'>+	kfree(ptr);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef QL_OB_DUMP</div><div class='add'>+void ql_dump_tx_desc(struct tx_buf_desc *tbd)</div><div class='add'>+{</div><div class='add'>+	printk(KERN_ERR PFX "tbd-&gt;addr  = 0x%llx\n",</div><div class='add'>+	       le64_to_cpu((u64) tbd-&gt;addr));</div><div class='add'>+	printk(KERN_ERR PFX "tbd-&gt;len   = %d\n",</div><div class='add'>+	       le32_to_cpu(tbd-&gt;len &amp; TX_DESC_LEN_MASK));</div><div class='add'>+	printk(KERN_ERR PFX "tbd-&gt;flags = %s %s\n",</div><div class='add'>+	       tbd-&gt;len &amp; TX_DESC_C ? "C" : ".",</div><div class='add'>+	       tbd-&gt;len &amp; TX_DESC_E ? "E" : ".");</div><div class='add'>+	tbd++;</div><div class='add'>+	printk(KERN_ERR PFX "tbd-&gt;addr  = 0x%llx\n",</div><div class='add'>+	       le64_to_cpu((u64) tbd-&gt;addr));</div><div class='add'>+	printk(KERN_ERR PFX "tbd-&gt;len   = %d\n",</div><div class='add'>+	       le32_to_cpu(tbd-&gt;len &amp; TX_DESC_LEN_MASK));</div><div class='add'>+	printk(KERN_ERR PFX "tbd-&gt;flags = %s %s\n",</div><div class='add'>+	       tbd-&gt;len &amp; TX_DESC_C ? "C" : ".",</div><div class='add'>+	       tbd-&gt;len &amp; TX_DESC_E ? "E" : ".");</div><div class='add'>+	tbd++;</div><div class='add'>+	printk(KERN_ERR PFX "tbd-&gt;addr  = 0x%llx\n",</div><div class='add'>+	       le64_to_cpu((u64) tbd-&gt;addr));</div><div class='add'>+	printk(KERN_ERR PFX "tbd-&gt;len   = %d\n",</div><div class='add'>+	       le32_to_cpu(tbd-&gt;len &amp; TX_DESC_LEN_MASK));</div><div class='add'>+	printk(KERN_ERR PFX "tbd-&gt;flags = %s %s\n",</div><div class='add'>+	       tbd-&gt;len &amp; TX_DESC_C ? "C" : ".",</div><div class='add'>+	       tbd-&gt;len &amp; TX_DESC_E ? "E" : ".");</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ql_dump_ob_mac_iocb(struct ob_mac_iocb_req *ob_mac_iocb)</div><div class='add'>+{</div><div class='add'>+	struct ob_mac_tso_iocb_req *ob_mac_tso_iocb =</div><div class='add'>+	    (struct ob_mac_tso_iocb_req *)ob_mac_iocb;</div><div class='add'>+	struct tx_buf_desc *tbd;</div><div class='add'>+	u16 frame_len;</div><div class='add'>+</div><div class='add'>+	printk(KERN_ERR PFX "%s\n", __func__);</div><div class='add'>+	printk(KERN_ERR PFX "opcode         = %s\n",</div><div class='add'>+	       (ob_mac_iocb-&gt;opcode == OPCODE_OB_MAC_IOCB) ? "MAC" : "TSO");</div><div class='add'>+	printk(KERN_ERR PFX "flags1          = %s %s %s %s %s\n",</div><div class='add'>+	       ob_mac_tso_iocb-&gt;flags1 &amp; OB_MAC_TSO_IOCB_OI ? "OI" : "",</div><div class='add'>+	       ob_mac_tso_iocb-&gt;flags1 &amp; OB_MAC_TSO_IOCB_I ? "I" : "",</div><div class='add'>+	       ob_mac_tso_iocb-&gt;flags1 &amp; OB_MAC_TSO_IOCB_D ? "D" : "",</div><div class='add'>+	       ob_mac_tso_iocb-&gt;flags1 &amp; OB_MAC_TSO_IOCB_IP4 ? "IP4" : "",</div><div class='add'>+	       ob_mac_tso_iocb-&gt;flags1 &amp; OB_MAC_TSO_IOCB_IP6 ? "IP6" : "");</div><div class='add'>+	printk(KERN_ERR PFX "flags2          = %s %s %s\n",</div><div class='add'>+	       ob_mac_tso_iocb-&gt;flags2 &amp; OB_MAC_TSO_IOCB_LSO ? "LSO" : "",</div><div class='add'>+	       ob_mac_tso_iocb-&gt;flags2 &amp; OB_MAC_TSO_IOCB_UC ? "UC" : "",</div><div class='add'>+	       ob_mac_tso_iocb-&gt;flags2 &amp; OB_MAC_TSO_IOCB_TC ? "TC" : "");</div><div class='add'>+	printk(KERN_ERR PFX "flags3          = %s %s %s \n",</div><div class='add'>+	       ob_mac_tso_iocb-&gt;flags3 &amp; OB_MAC_TSO_IOCB_IC ? "IC" : "",</div><div class='add'>+	       ob_mac_tso_iocb-&gt;flags3 &amp; OB_MAC_TSO_IOCB_DFP ? "DFP" : "",</div><div class='add'>+	       ob_mac_tso_iocb-&gt;flags3 &amp; OB_MAC_TSO_IOCB_V ? "V" : "");</div><div class='add'>+	printk(KERN_ERR PFX "tid = %x\n", ob_mac_iocb-&gt;tid);</div><div class='add'>+	printk(KERN_ERR PFX "txq_idx = %d\n", ob_mac_iocb-&gt;txq_idx);</div><div class='add'>+	printk(KERN_ERR PFX "vlan_tci      = %x\n", ob_mac_tso_iocb-&gt;vlan_tci);</div><div class='add'>+	if (ob_mac_iocb-&gt;opcode == OPCODE_OB_MAC_TSO_IOCB) {</div><div class='add'>+		printk(KERN_ERR PFX "frame_len      = %d\n",</div><div class='add'>+		       le32_to_cpu(ob_mac_tso_iocb-&gt;frame_len));</div><div class='add'>+		printk(KERN_ERR PFX "mss      = %d\n",</div><div class='add'>+		       le16_to_cpu(ob_mac_tso_iocb-&gt;mss));</div><div class='add'>+		printk(KERN_ERR PFX "prot_hdr_len   = %d\n",</div><div class='add'>+		       le16_to_cpu(ob_mac_tso_iocb-&gt;total_hdrs_len));</div><div class='add'>+		printk(KERN_ERR PFX "hdr_offset     = 0x%.04x\n",</div><div class='add'>+		       le16_to_cpu(ob_mac_tso_iocb-&gt;net_trans_offset));</div><div class='add'>+		frame_len = le32_to_cpu(ob_mac_tso_iocb-&gt;frame_len);</div><div class='add'>+	} else {</div><div class='add'>+		printk(KERN_ERR PFX "frame_len      = %d\n",</div><div class='add'>+		       le16_to_cpu(ob_mac_iocb-&gt;frame_len));</div><div class='add'>+		frame_len = le16_to_cpu(ob_mac_iocb-&gt;frame_len);</div><div class='add'>+	}</div><div class='add'>+	tbd = &amp;ob_mac_iocb-&gt;tbd[0];</div><div class='add'>+	ql_dump_tx_desc(tbd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ql_dump_ob_mac_rsp(struct ob_mac_iocb_rsp *ob_mac_rsp)</div><div class='add'>+{</div><div class='add'>+	printk(KERN_ERR PFX "%s\n", __func__);</div><div class='add'>+	printk(KERN_ERR PFX "opcode         = %d\n", ob_mac_rsp-&gt;opcode);</div><div class='add'>+	printk(KERN_ERR PFX "flags          = %s %s %s %s %s %s %s\n",</div><div class='add'>+	       ob_mac_rsp-&gt;flags1 &amp; OB_MAC_IOCB_RSP_OI ? "OI" : ".",</div><div class='add'>+	       ob_mac_rsp-&gt;flags1 &amp; OB_MAC_IOCB_RSP_I ? "I" : ".",</div><div class='add'>+	       ob_mac_rsp-&gt;flags1 &amp; OB_MAC_IOCB_RSP_E ? "E" : ".",</div><div class='add'>+	       ob_mac_rsp-&gt;flags1 &amp; OB_MAC_IOCB_RSP_S ? "S" : ".",</div><div class='add'>+	       ob_mac_rsp-&gt;flags1 &amp; OB_MAC_IOCB_RSP_L ? "L" : ".",</div><div class='add'>+	       ob_mac_rsp-&gt;flags1 &amp; OB_MAC_IOCB_RSP_P ? "P" : ".",</div><div class='add'>+	       ob_mac_rsp-&gt;flags2 &amp; OB_MAC_IOCB_RSP_B ? "B" : ".");</div><div class='add'>+	printk(KERN_ERR PFX "tid = %x\n", ob_mac_rsp-&gt;tid);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef QL_IB_DUMP</div><div class='add'>+void ql_dump_ib_mac_rsp(struct ib_mac_iocb_rsp *ib_mac_rsp)</div><div class='add'>+{</div><div class='add'>+	printk(KERN_ERR PFX "%s\n", __func__);</div><div class='add'>+	printk(KERN_ERR PFX "opcode         = 0x%x\n", ib_mac_rsp-&gt;opcode);</div><div class='add'>+	printk(KERN_ERR PFX "flags1 = %s%s%s%s%s%s\n",</div><div class='add'>+	       ib_mac_rsp-&gt;flags1 &amp; IB_MAC_IOCB_RSP_OI ? "OI " : "",</div><div class='add'>+	       ib_mac_rsp-&gt;flags1 &amp; IB_MAC_IOCB_RSP_I ? "I " : "",</div><div class='add'>+	       ib_mac_rsp-&gt;flags1 &amp; IB_MAC_IOCB_RSP_TE ? "TE " : "",</div><div class='add'>+	       ib_mac_rsp-&gt;flags1 &amp; IB_MAC_IOCB_RSP_NU ? "NU " : "",</div><div class='add'>+	       ib_mac_rsp-&gt;flags1 &amp; IB_MAC_IOCB_RSP_IE ? "IE " : "",</div><div class='add'>+	       ib_mac_rsp-&gt;flags1 &amp; IB_MAC_IOCB_RSP_B ? "B " : "");</div><div class='add'>+</div><div class='add'>+	if (ib_mac_rsp-&gt;flags1 &amp; IB_MAC_IOCB_RSP_M_MASK)</div><div class='add'>+		printk(KERN_ERR PFX "%s%s%s Multicast.\n",</div><div class='add'>+		       (ib_mac_rsp-&gt;flags1 &amp; IB_MAC_IOCB_RSP_M_MASK) ==</div><div class='add'>+		       IB_MAC_IOCB_RSP_M_HASH ? "Hash" : "",</div><div class='add'>+		       (ib_mac_rsp-&gt;flags1 &amp; IB_MAC_IOCB_RSP_M_MASK) ==</div><div class='add'>+		       IB_MAC_IOCB_RSP_M_REG ? "Registered" : "",</div><div class='add'>+		       (ib_mac_rsp-&gt;flags1 &amp; IB_MAC_IOCB_RSP_M_MASK) ==</div><div class='add'>+		       IB_MAC_IOCB_RSP_M_PROM ? "Promiscuous" : "");</div><div class='add'>+</div><div class='add'>+	printk(KERN_ERR PFX "flags2 = %s%s%s%s%s\n",</div><div class='add'>+	       (ib_mac_rsp-&gt;flags2 &amp; IB_MAC_IOCB_RSP_P) ? "P " : "",</div><div class='add'>+	       (ib_mac_rsp-&gt;flags2 &amp; IB_MAC_IOCB_RSP_V) ? "V " : "",</div><div class='add'>+	       (ib_mac_rsp-&gt;flags2 &amp; IB_MAC_IOCB_RSP_U) ? "U " : "",</div><div class='add'>+	       (ib_mac_rsp-&gt;flags2 &amp; IB_MAC_IOCB_RSP_T) ? "T " : "",</div><div class='add'>+	       (ib_mac_rsp-&gt;flags2 &amp; IB_MAC_IOCB_RSP_FO) ? "FO " : "");</div><div class='add'>+</div><div class='add'>+	if (ib_mac_rsp-&gt;flags2 &amp; IB_MAC_IOCB_RSP_ERR_MASK)</div><div class='add'>+		printk(KERN_ERR PFX "%s%s%s%s%s error.\n",</div><div class='add'>+		       (ib_mac_rsp-&gt;flags2 &amp; IB_MAC_IOCB_RSP_ERR_MASK) ==</div><div class='add'>+		       IB_MAC_IOCB_RSP_ERR_OVERSIZE ? "oversize" : "",</div><div class='add'>+		       (ib_mac_rsp-&gt;flags2 &amp; IB_MAC_IOCB_RSP_ERR_MASK) ==</div><div class='add'>+		       IB_MAC_IOCB_RSP_ERR_UNDERSIZE ? "undersize" : "",</div><div class='add'>+		       (ib_mac_rsp-&gt;flags2 &amp; IB_MAC_IOCB_RSP_ERR_MASK) ==</div><div class='add'>+		       IB_MAC_IOCB_RSP_ERR_PREAMBLE ? "preamble" : "",</div><div class='add'>+		       (ib_mac_rsp-&gt;flags2 &amp; IB_MAC_IOCB_RSP_ERR_MASK) ==</div><div class='add'>+		       IB_MAC_IOCB_RSP_ERR_FRAME_LEN ? "frame length" : "",</div><div class='add'>+		       (ib_mac_rsp-&gt;flags2 &amp; IB_MAC_IOCB_RSP_ERR_MASK) ==</div><div class='add'>+		       IB_MAC_IOCB_RSP_ERR_CRC ? "CRC" : "");</div><div class='add'>+</div><div class='add'>+	printk(KERN_ERR PFX "flags3 = %s%s.\n",</div><div class='add'>+	       ib_mac_rsp-&gt;flags3 &amp; IB_MAC_IOCB_RSP_DS ? "DS " : "",</div><div class='add'>+	       ib_mac_rsp-&gt;flags3 &amp; IB_MAC_IOCB_RSP_DL ? "DL " : "");</div><div class='add'>+</div><div class='add'>+	if (ib_mac_rsp-&gt;flags3 &amp; IB_MAC_IOCB_RSP_RSS_MASK)</div><div class='add'>+		printk(KERN_ERR PFX "RSS flags = %s%s%s%s.\n",</div><div class='add'>+		       ((ib_mac_rsp-&gt;flags3 &amp; IB_MAC_IOCB_RSP_RSS_MASK) ==</div><div class='add'>+			IB_MAC_IOCB_RSP_M_IPV4) ? "IPv4 RSS" : "",</div><div class='add'>+		       ((ib_mac_rsp-&gt;flags3 &amp; IB_MAC_IOCB_RSP_RSS_MASK) ==</div><div class='add'>+			IB_MAC_IOCB_RSP_M_IPV6) ? "IPv6 RSS " : "",</div><div class='add'>+		       ((ib_mac_rsp-&gt;flags3 &amp; IB_MAC_IOCB_RSP_RSS_MASK) ==</div><div class='add'>+			IB_MAC_IOCB_RSP_M_TCP_V4) ? "TCP/IPv4 RSS" : "",</div><div class='add'>+		       ((ib_mac_rsp-&gt;flags3 &amp; IB_MAC_IOCB_RSP_RSS_MASK) ==</div><div class='add'>+			IB_MAC_IOCB_RSP_M_TCP_V6) ? "TCP/IPv6 RSS" : "");</div><div class='add'>+</div><div class='add'>+	printk(KERN_ERR PFX "data_len	= %d\n",</div><div class='add'>+	       le32_to_cpu(ib_mac_rsp-&gt;data_len));</div><div class='add'>+	printk(KERN_ERR PFX "data_addr_hi    = 0x%x\n",</div><div class='add'>+	       le32_to_cpu(ib_mac_rsp-&gt;data_addr_hi));</div><div class='add'>+	printk(KERN_ERR PFX "data_addr_lo    = 0x%x\n",</div><div class='add'>+	       le32_to_cpu(ib_mac_rsp-&gt;data_addr_lo));</div><div class='add'>+	if (ib_mac_rsp-&gt;flags3 &amp; IB_MAC_IOCB_RSP_RSS_MASK)</div><div class='add'>+		printk(KERN_ERR PFX "rss    = %x\n",</div><div class='add'>+		       le32_to_cpu(ib_mac_rsp-&gt;rss));</div><div class='add'>+	if (ib_mac_rsp-&gt;flags2 &amp; IB_MAC_IOCB_RSP_V)</div><div class='add'>+		printk(KERN_ERR PFX "vlan_id    = %x\n",</div><div class='add'>+		       le16_to_cpu(ib_mac_rsp-&gt;vlan_id));</div><div class='add'>+</div><div class='add'>+	printk(KERN_ERR PFX "flags4 = %s%s%s.\n",</div><div class='add'>+	       le32_to_cpu(ib_mac_rsp-&gt;</div><div class='add'>+			   flags4) &amp; IB_MAC_IOCB_RSP_HV ? "HV " : "",</div><div class='add'>+	       le32_to_cpu(ib_mac_rsp-&gt;</div><div class='add'>+			   flags4) &amp; IB_MAC_IOCB_RSP_HS ? "HS " : "",</div><div class='add'>+	       le32_to_cpu(ib_mac_rsp-&gt;</div><div class='add'>+			   flags4) &amp; IB_MAC_IOCB_RSP_HL ? "HL " : "");</div><div class='add'>+</div><div class='add'>+	if (le32_to_cpu(ib_mac_rsp-&gt;flags4) &amp; IB_MAC_IOCB_RSP_HV) {</div><div class='add'>+		printk(KERN_ERR PFX "hdr length	= %d.\n",</div><div class='add'>+		       le32_to_cpu(ib_mac_rsp-&gt;hdr_len));</div><div class='add'>+		printk(KERN_ERR PFX "hdr addr_hi    = 0x%x.\n",</div><div class='add'>+		       le32_to_cpu(ib_mac_rsp-&gt;hdr_addr_hi));</div><div class='add'>+		printk(KERN_ERR PFX "hdr addr_lo    = 0x%x.\n",</div><div class='add'>+		       le32_to_cpu(ib_mac_rsp-&gt;hdr_addr_lo));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef QL_ALL_DUMP</div><div class='add'>+void ql_dump_all(struct ql_adapter *qdev)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	QL_DUMP_REGS(qdev);</div><div class='add'>+	QL_DUMP_QDEV(qdev);</div><div class='add'>+	for (i = 0; i &lt; qdev-&gt;tx_ring_count; i++) {</div><div class='add'>+		QL_DUMP_TX_RING(&amp;qdev-&gt;tx_ring[i]);</div><div class='add'>+		QL_DUMP_WQICB((struct wqicb *)&amp;qdev-&gt;tx_ring[i]);</div><div class='add'>+	}</div><div class='add'>+	for (i = 0; i &lt; qdev-&gt;rx_ring_count; i++) {</div><div class='add'>+		QL_DUMP_RX_RING(&amp;qdev-&gt;rx_ring[i]);</div><div class='add'>+		QL_DUMP_CQICB((struct cqicb *)&amp;qdev-&gt;rx_ring[i]);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/qlge/qlge_ethtool.c b/drivers/net/qlge/qlge_ethtool.c<br/>new file mode 100644<br/>index 000000000000..b62fbd4bf00f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/qlge/qlge_ethtool.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/qlge/qlge_ethtool.c</a></div><div class='hunk'>@@ -0,0 +1,414 @@</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/pagemap.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/dmapool.h&gt;</div><div class='add'>+#include &lt;linux/mempool.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/kthread.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/ioport.h&gt;</div><div class='add'>+#include &lt;linux/in.h&gt;</div><div class='add'>+#include &lt;linux/ip.h&gt;</div><div class='add'>+#include &lt;linux/ipv6.h&gt;</div><div class='add'>+#include &lt;net/ipv6.h&gt;</div><div class='add'>+#include &lt;linux/tcp.h&gt;</div><div class='add'>+#include &lt;linux/udp.h&gt;</div><div class='add'>+#include &lt;linux/if_arp.h&gt;</div><div class='add'>+#include &lt;linux/if_ether.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/rtnetlink.h&gt;</div><div class='add'>+#include &lt;linux/if_vlan.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/vmalloc.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/version.h&gt;</div><div class='add'>+</div><div class='add'>+#include "qlge.h"</div><div class='add'>+</div><div class='add'>+static int ql_update_ring_coalescing(struct ql_adapter *qdev)</div><div class='add'>+{</div><div class='add'>+	int i, status = 0;</div><div class='add'>+	struct rx_ring *rx_ring;</div><div class='add'>+	struct cqicb *cqicb;</div><div class='add'>+</div><div class='add'>+	if (!netif_running(qdev-&gt;ndev))</div><div class='add'>+		return status;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;qdev-&gt;hw_lock);</div><div class='add'>+	/* Skip the default queue, and update the outbound handler</div><div class='add'>+	 * queues if they changed.</div><div class='add'>+	 */</div><div class='add'>+	cqicb = (struct cqicb *)&amp;qdev-&gt;rx_ring[1];</div><div class='add'>+	if (le16_to_cpu(cqicb-&gt;irq_delay) != qdev-&gt;tx_coalesce_usecs ||</div><div class='add'>+	    le16_to_cpu(cqicb-&gt;pkt_delay) != qdev-&gt;tx_max_coalesced_frames) {</div><div class='add'>+		for (i = 1; i &lt; qdev-&gt;rss_ring_first_cq_id; i++, rx_ring++) {</div><div class='add'>+			rx_ring = &amp;qdev-&gt;rx_ring[i];</div><div class='add'>+			cqicb = (struct cqicb *)rx_ring;</div><div class='add'>+			cqicb-&gt;irq_delay = le16_to_cpu(qdev-&gt;tx_coalesce_usecs);</div><div class='add'>+			cqicb-&gt;pkt_delay =</div><div class='add'>+			    le16_to_cpu(qdev-&gt;tx_max_coalesced_frames);</div><div class='add'>+			cqicb-&gt;flags = FLAGS_LI;</div><div class='add'>+			status = ql_write_cfg(qdev, cqicb, sizeof(cqicb),</div><div class='add'>+						CFG_LCQ, rx_ring-&gt;cq_id);</div><div class='add'>+			if (status) {</div><div class='add'>+				QPRINTK(qdev, IFUP, ERR,</div><div class='add'>+					"Failed to load CQICB.\n");</div><div class='add'>+				goto exit;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Update the inbound (RSS) handler queues if they changed. */</div><div class='add'>+	cqicb = (struct cqicb *)&amp;qdev-&gt;rx_ring[qdev-&gt;rss_ring_first_cq_id];</div><div class='add'>+	if (le16_to_cpu(cqicb-&gt;irq_delay) != qdev-&gt;rx_coalesce_usecs ||</div><div class='add'>+	    le16_to_cpu(cqicb-&gt;pkt_delay) != qdev-&gt;rx_max_coalesced_frames) {</div><div class='add'>+		for (i = qdev-&gt;rss_ring_first_cq_id;</div><div class='add'>+		     i &lt;= qdev-&gt;rss_ring_first_cq_id + qdev-&gt;rss_ring_count;</div><div class='add'>+		     i++) {</div><div class='add'>+			rx_ring = &amp;qdev-&gt;rx_ring[i];</div><div class='add'>+			cqicb = (struct cqicb *)rx_ring;</div><div class='add'>+			cqicb-&gt;irq_delay = le16_to_cpu(qdev-&gt;rx_coalesce_usecs);</div><div class='add'>+			cqicb-&gt;pkt_delay =</div><div class='add'>+			    le16_to_cpu(qdev-&gt;rx_max_coalesced_frames);</div><div class='add'>+			cqicb-&gt;flags = FLAGS_LI;</div><div class='add'>+			status = ql_write_cfg(qdev, cqicb, sizeof(cqicb),</div><div class='add'>+						CFG_LCQ, rx_ring-&gt;cq_id);</div><div class='add'>+			if (status) {</div><div class='add'>+				QPRINTK(qdev, IFUP, ERR,</div><div class='add'>+					"Failed to load CQICB.\n");</div><div class='add'>+				goto exit;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+exit:</div><div class='add'>+	spin_unlock(&amp;qdev-&gt;hw_lock);</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ql_update_stats(struct ql_adapter *qdev)</div><div class='add'>+{</div><div class='add'>+	u32 i;</div><div class='add'>+	u64 data;</div><div class='add'>+	u64 *iter = &amp;qdev-&gt;nic_stats.tx_pkts;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;qdev-&gt;stats_lock);</div><div class='add'>+	if (ql_sem_spinlock(qdev, qdev-&gt;xg_sem_mask)) {</div><div class='add'>+			QPRINTK(qdev, DRV, ERR,</div><div class='add'>+				"Couldn't get xgmac sem.\n");</div><div class='add'>+		goto quit;</div><div class='add'>+	}</div><div class='add'>+	/*</div><div class='add'>+	 * Get TX statistics.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0x200; i &lt; 0x280; i += 8) {</div><div class='add'>+		if (ql_read_xgmac_reg64(qdev, i, &amp;data)) {</div><div class='add'>+			QPRINTK(qdev, DRV, ERR,</div><div class='add'>+				"Error reading status register 0x%.04x.\n", i);</div><div class='add'>+			goto end;</div><div class='add'>+		} else</div><div class='add'>+			*iter = data;</div><div class='add'>+		iter++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Get RX statistics.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0x300; i &lt; 0x3d0; i += 8) {</div><div class='add'>+		if (ql_read_xgmac_reg64(qdev, i, &amp;data)) {</div><div class='add'>+			QPRINTK(qdev, DRV, ERR,</div><div class='add'>+				"Error reading status register 0x%.04x.\n", i);</div><div class='add'>+			goto end;</div><div class='add'>+		} else</div><div class='add'>+			*iter = data;</div><div class='add'>+		iter++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+end:</div><div class='add'>+	ql_sem_unlock(qdev, qdev-&gt;xg_sem_mask);</div><div class='add'>+quit:</div><div class='add'>+	spin_unlock(&amp;qdev-&gt;stats_lock);</div><div class='add'>+</div><div class='add'>+	QL_DUMP_STAT(qdev);</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static char ql_stats_str_arr[][ETH_GSTRING_LEN] = {</div><div class='add'>+	{"tx_pkts"},</div><div class='add'>+	{"tx_bytes"},</div><div class='add'>+	{"tx_mcast_pkts"},</div><div class='add'>+	{"tx_bcast_pkts"},</div><div class='add'>+	{"tx_ucast_pkts"},</div><div class='add'>+	{"tx_ctl_pkts"},</div><div class='add'>+	{"tx_pause_pkts"},</div><div class='add'>+	{"tx_64_pkts"},</div><div class='add'>+	{"tx_65_to_127_pkts"},</div><div class='add'>+	{"tx_128_to_255_pkts"},</div><div class='add'>+	{"tx_256_511_pkts"},</div><div class='add'>+	{"tx_512_to_1023_pkts"},</div><div class='add'>+	{"tx_1024_to_1518_pkts"},</div><div class='add'>+	{"tx_1519_to_max_pkts"},</div><div class='add'>+	{"tx_undersize_pkts"},</div><div class='add'>+	{"tx_oversize_pkts"},</div><div class='add'>+	{"rx_bytes"},</div><div class='add'>+	{"rx_bytes_ok"},</div><div class='add'>+	{"rx_pkts"},</div><div class='add'>+	{"rx_pkts_ok"},</div><div class='add'>+	{"rx_bcast_pkts"},</div><div class='add'>+	{"rx_mcast_pkts"},</div><div class='add'>+	{"rx_ucast_pkts"},</div><div class='add'>+	{"rx_undersize_pkts"},</div><div class='add'>+	{"rx_oversize_pkts"},</div><div class='add'>+	{"rx_jabber_pkts"},</div><div class='add'>+	{"rx_undersize_fcerr_pkts"},</div><div class='add'>+	{"rx_drop_events"},</div><div class='add'>+	{"rx_fcerr_pkts"},</div><div class='add'>+	{"rx_align_err"},</div><div class='add'>+	{"rx_symbol_err"},</div><div class='add'>+	{"rx_mac_err"},</div><div class='add'>+	{"rx_ctl_pkts"},</div><div class='add'>+	{"rx_pause_pkts"},</div><div class='add'>+	{"rx_64_pkts"},</div><div class='add'>+	{"rx_65_to_127_pkts"},</div><div class='add'>+	{"rx_128_255_pkts"},</div><div class='add'>+	{"rx_256_511_pkts"},</div><div class='add'>+	{"rx_512_to_1023_pkts"},</div><div class='add'>+	{"rx_1024_to_1518_pkts"},</div><div class='add'>+	{"rx_1519_to_max_pkts"},</div><div class='add'>+	{"rx_len_err_pkts"},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void ql_get_strings(struct net_device *dev, u32 stringset, u8 *buf)</div><div class='add'>+{</div><div class='add'>+	switch (stringset) {</div><div class='add'>+	case ETH_SS_STATS:</div><div class='add'>+		memcpy(buf, ql_stats_str_arr, sizeof(ql_stats_str_arr));</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ql_get_sset_count(struct net_device *dev, int sset)</div><div class='add'>+{</div><div class='add'>+	switch (sset) {</div><div class='add'>+	case ETH_SS_STATS:</div><div class='add'>+		return ARRAY_SIZE(ql_stats_str_arr);</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ql_get_ethtool_stats(struct net_device *ndev,</div><div class='add'>+		     struct ethtool_stats *stats, u64 *data)</div><div class='add'>+{</div><div class='add'>+	struct ql_adapter *qdev = netdev_priv(ndev);</div><div class='add'>+	struct nic_stats *s = &amp;qdev-&gt;nic_stats;</div><div class='add'>+</div><div class='add'>+	ql_update_stats(qdev);</div><div class='add'>+</div><div class='add'>+	*data++ = s-&gt;tx_pkts;</div><div class='add'>+	*data++ = s-&gt;tx_bytes;</div><div class='add'>+	*data++ = s-&gt;tx_mcast_pkts;</div><div class='add'>+	*data++ = s-&gt;tx_bcast_pkts;</div><div class='add'>+	*data++ = s-&gt;tx_ucast_pkts;</div><div class='add'>+	*data++ = s-&gt;tx_ctl_pkts;</div><div class='add'>+	*data++ = s-&gt;tx_pause_pkts;</div><div class='add'>+	*data++ = s-&gt;tx_64_pkt;</div><div class='add'>+	*data++ = s-&gt;tx_65_to_127_pkt;</div><div class='add'>+	*data++ = s-&gt;tx_128_to_255_pkt;</div><div class='add'>+	*data++ = s-&gt;tx_256_511_pkt;</div><div class='add'>+	*data++ = s-&gt;tx_512_to_1023_pkt;</div><div class='add'>+	*data++ = s-&gt;tx_1024_to_1518_pkt;</div><div class='add'>+	*data++ = s-&gt;tx_1519_to_max_pkt;</div><div class='add'>+	*data++ = s-&gt;tx_undersize_pkt;</div><div class='add'>+	*data++ = s-&gt;tx_oversize_pkt;</div><div class='add'>+	*data++ = s-&gt;rx_bytes;</div><div class='add'>+	*data++ = s-&gt;rx_bytes_ok;</div><div class='add'>+	*data++ = s-&gt;rx_pkts;</div><div class='add'>+	*data++ = s-&gt;rx_pkts_ok;</div><div class='add'>+	*data++ = s-&gt;rx_bcast_pkts;</div><div class='add'>+	*data++ = s-&gt;rx_mcast_pkts;</div><div class='add'>+	*data++ = s-&gt;rx_ucast_pkts;</div><div class='add'>+	*data++ = s-&gt;rx_undersize_pkts;</div><div class='add'>+	*data++ = s-&gt;rx_oversize_pkts;</div><div class='add'>+	*data++ = s-&gt;rx_jabber_pkts;</div><div class='add'>+	*data++ = s-&gt;rx_undersize_fcerr_pkts;</div><div class='add'>+	*data++ = s-&gt;rx_drop_events;</div><div class='add'>+	*data++ = s-&gt;rx_fcerr_pkts;</div><div class='add'>+	*data++ = s-&gt;rx_align_err;</div><div class='add'>+	*data++ = s-&gt;rx_symbol_err;</div><div class='add'>+	*data++ = s-&gt;rx_mac_err;</div><div class='add'>+	*data++ = s-&gt;rx_ctl_pkts;</div><div class='add'>+	*data++ = s-&gt;rx_pause_pkts;</div><div class='add'>+	*data++ = s-&gt;rx_64_pkts;</div><div class='add'>+	*data++ = s-&gt;rx_65_to_127_pkts;</div><div class='add'>+	*data++ = s-&gt;rx_128_255_pkts;</div><div class='add'>+	*data++ = s-&gt;rx_256_511_pkts;</div><div class='add'>+	*data++ = s-&gt;rx_512_to_1023_pkts;</div><div class='add'>+	*data++ = s-&gt;rx_1024_to_1518_pkts;</div><div class='add'>+	*data++ = s-&gt;rx_1519_to_max_pkts;</div><div class='add'>+	*data++ = s-&gt;rx_len_err_pkts;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ql_get_settings(struct net_device *ndev,</div><div class='add'>+			      struct ethtool_cmd *ecmd)</div><div class='add'>+{</div><div class='add'>+	struct ql_adapter *qdev = netdev_priv(ndev);</div><div class='add'>+</div><div class='add'>+	ecmd-&gt;supported = SUPPORTED_10000baseT_Full;</div><div class='add'>+	ecmd-&gt;advertising = ADVERTISED_10000baseT_Full;</div><div class='add'>+	ecmd-&gt;autoneg = AUTONEG_ENABLE;</div><div class='add'>+	ecmd-&gt;transceiver = XCVR_EXTERNAL;</div><div class='add'>+	if ((qdev-&gt;link_status &amp; LINK_TYPE_MASK) == LINK_TYPE_10GBASET) {</div><div class='add'>+		ecmd-&gt;supported |= (SUPPORTED_TP | SUPPORTED_Autoneg);</div><div class='add'>+		ecmd-&gt;advertising |= (ADVERTISED_TP | ADVERTISED_Autoneg);</div><div class='add'>+		ecmd-&gt;port = PORT_TP;</div><div class='add'>+	} else {</div><div class='add'>+		ecmd-&gt;supported |= SUPPORTED_FIBRE;</div><div class='add'>+		ecmd-&gt;advertising |= ADVERTISED_FIBRE;</div><div class='add'>+		ecmd-&gt;port = PORT_FIBRE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ecmd-&gt;speed = SPEED_10000;</div><div class='add'>+	ecmd-&gt;duplex = DUPLEX_FULL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ql_get_drvinfo(struct net_device *ndev,</div><div class='add'>+			   struct ethtool_drvinfo *drvinfo)</div><div class='add'>+{</div><div class='add'>+	struct ql_adapter *qdev = netdev_priv(ndev);</div><div class='add'>+	strncpy(drvinfo-&gt;driver, qlge_driver_name, 32);</div><div class='add'>+	strncpy(drvinfo-&gt;version, qlge_driver_version, 32);</div><div class='add'>+	strncpy(drvinfo-&gt;fw_version, "N/A", 32);</div><div class='add'>+	strncpy(drvinfo-&gt;bus_info, pci_name(qdev-&gt;pdev), 32);</div><div class='add'>+	drvinfo-&gt;n_stats = 0;</div><div class='add'>+	drvinfo-&gt;testinfo_len = 0;</div><div class='add'>+	drvinfo-&gt;regdump_len = 0;</div><div class='add'>+	drvinfo-&gt;eedump_len = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ql_get_coalesce(struct net_device *dev, struct ethtool_coalesce *c)</div><div class='add'>+{</div><div class='add'>+	struct ql_adapter *qdev = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	c-&gt;rx_coalesce_usecs = qdev-&gt;rx_coalesce_usecs;</div><div class='add'>+	c-&gt;tx_coalesce_usecs = qdev-&gt;tx_coalesce_usecs;</div><div class='add'>+</div><div class='add'>+	/* This chip coalesces as follows:</div><div class='add'>+	 * If a packet arrives, hold off interrupts until</div><div class='add'>+	 * cqicb-&gt;int_delay expires, but if no other packets arrive don't</div><div class='add'>+	 * wait longer than cqicb-&gt;pkt_int_delay. But ethtool doesn't use a</div><div class='add'>+	 * timer to coalesce on a frame basis.  So, we have to take ethtool's</div><div class='add'>+	 * max_coalesced_frames value and convert it to a delay in microseconds.</div><div class='add'>+	 * We do this by using a basic thoughput of 1,000,000 frames per</div><div class='add'>+	 * second @ (1024 bytes).  This means one frame per usec. So it's a</div><div class='add'>+	 * simple one to one ratio.</div><div class='add'>+	 */</div><div class='add'>+	c-&gt;rx_max_coalesced_frames = qdev-&gt;rx_max_coalesced_frames;</div><div class='add'>+	c-&gt;tx_max_coalesced_frames = qdev-&gt;tx_max_coalesced_frames;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ql_set_coalesce(struct net_device *ndev, struct ethtool_coalesce *c)</div><div class='add'>+{</div><div class='add'>+	struct ql_adapter *qdev = netdev_priv(ndev);</div><div class='add'>+</div><div class='add'>+	/* Validate user parameters. */</div><div class='add'>+	if (c-&gt;rx_coalesce_usecs &gt; qdev-&gt;rx_ring_size / 2)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+       /* Don't wait more than 10 usec. */</div><div class='add'>+	if (c-&gt;rx_max_coalesced_frames &gt; MAX_INTER_FRAME_WAIT)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (c-&gt;tx_coalesce_usecs &gt; qdev-&gt;tx_ring_size / 2)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (c-&gt;tx_max_coalesced_frames &gt; MAX_INTER_FRAME_WAIT)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Verify a change took place before updating the hardware. */</div><div class='add'>+	if (qdev-&gt;rx_coalesce_usecs == c-&gt;rx_coalesce_usecs &amp;&amp;</div><div class='add'>+	    qdev-&gt;tx_coalesce_usecs == c-&gt;tx_coalesce_usecs &amp;&amp;</div><div class='add'>+	    qdev-&gt;rx_max_coalesced_frames == c-&gt;rx_max_coalesced_frames &amp;&amp;</div><div class='add'>+	    qdev-&gt;tx_max_coalesced_frames == c-&gt;tx_max_coalesced_frames)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	qdev-&gt;rx_coalesce_usecs = c-&gt;rx_coalesce_usecs;</div><div class='add'>+	qdev-&gt;tx_coalesce_usecs = c-&gt;tx_coalesce_usecs;</div><div class='add'>+	qdev-&gt;rx_max_coalesced_frames = c-&gt;rx_max_coalesced_frames;</div><div class='add'>+	qdev-&gt;tx_max_coalesced_frames = c-&gt;tx_max_coalesced_frames;</div><div class='add'>+</div><div class='add'>+	return ql_update_ring_coalescing(qdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 ql_get_rx_csum(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct ql_adapter *qdev = netdev_priv(netdev);</div><div class='add'>+	return qdev-&gt;rx_csum;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ql_set_rx_csum(struct net_device *netdev, uint32_t data)</div><div class='add'>+{</div><div class='add'>+	struct ql_adapter *qdev = netdev_priv(netdev);</div><div class='add'>+	qdev-&gt;rx_csum = data;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ql_set_tso(struct net_device *ndev, uint32_t data)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	if (data) {</div><div class='add'>+		ndev-&gt;features |= NETIF_F_TSO;</div><div class='add'>+		ndev-&gt;features |= NETIF_F_TSO6;</div><div class='add'>+	} else {</div><div class='add'>+		ndev-&gt;features &amp;= ~NETIF_F_TSO;</div><div class='add'>+		ndev-&gt;features &amp;= ~NETIF_F_TSO6;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 ql_get_msglevel(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct ql_adapter *qdev = netdev_priv(ndev);</div><div class='add'>+	return qdev-&gt;msg_enable;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ql_set_msglevel(struct net_device *ndev, u32 value)</div><div class='add'>+{</div><div class='add'>+	struct ql_adapter *qdev = netdev_priv(ndev);</div><div class='add'>+	qdev-&gt;msg_enable = value;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct ethtool_ops qlge_ethtool_ops = {</div><div class='add'>+	.get_settings = ql_get_settings,</div><div class='add'>+	.get_drvinfo = ql_get_drvinfo,</div><div class='add'>+	.get_msglevel = ql_get_msglevel,</div><div class='add'>+	.set_msglevel = ql_set_msglevel,</div><div class='add'>+	.get_link = ethtool_op_get_link,</div><div class='add'>+	.get_rx_csum = ql_get_rx_csum,</div><div class='add'>+	.set_rx_csum = ql_set_rx_csum,</div><div class='add'>+	.get_tx_csum = ethtool_op_get_tx_csum,</div><div class='add'>+	.get_sg = ethtool_op_get_sg,</div><div class='add'>+	.set_sg = ethtool_op_set_sg,</div><div class='add'>+	.get_tso = ethtool_op_get_tso,</div><div class='add'>+	.set_tso = ql_set_tso,</div><div class='add'>+	.get_coalesce = ql_get_coalesce,</div><div class='add'>+	.set_coalesce = ql_set_coalesce,</div><div class='add'>+	.get_sset_count = ql_get_sset_count,</div><div class='add'>+	.get_strings = ql_get_strings,</div><div class='add'>+	.get_ethtool_stats = ql_get_ethtool_stats,</div><div class='add'>+};</div><div class='add'>+</div><div class='head'>diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c<br/>new file mode 100644<br/>index 000000000000..4b2caa6b7ac5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/qlge/qlge_main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/qlge/qlge_main.c</a></div><div class='hunk'>@@ -0,0 +1,3956 @@</div><div class='add'>+/*</div><div class='add'>+ * QLogic qlge NIC HBA Driver</div><div class='add'>+ * Copyright (c)  2003-2008 QLogic Corporation</div><div class='add'>+ * See LICENSE.qlge for copyright and licensing details.</div><div class='add'>+ * Author:     Linux qlge network device driver by</div><div class='add'>+ *                      Ron Mercer &lt;ron.mercer@qlogic.com&gt;</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/pagemap.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/dmapool.h&gt;</div><div class='add'>+#include &lt;linux/mempool.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/kthread.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/ioport.h&gt;</div><div class='add'>+#include &lt;linux/in.h&gt;</div><div class='add'>+#include &lt;linux/ip.h&gt;</div><div class='add'>+#include &lt;linux/ipv6.h&gt;</div><div class='add'>+#include &lt;net/ipv6.h&gt;</div><div class='add'>+#include &lt;linux/tcp.h&gt;</div><div class='add'>+#include &lt;linux/udp.h&gt;</div><div class='add'>+#include &lt;linux/if_arp.h&gt;</div><div class='add'>+#include &lt;linux/if_ether.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/rtnetlink.h&gt;</div><div class='add'>+#include &lt;linux/if_vlan.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/vmalloc.h&gt;</div><div class='add'>+#include &lt;net/ip6_checksum.h&gt;</div><div class='add'>+</div><div class='add'>+#include "qlge.h"</div><div class='add'>+</div><div class='add'>+char qlge_driver_name[] = DRV_NAME;</div><div class='add'>+const char qlge_driver_version[] = DRV_VERSION;</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Ron Mercer &lt;ron.mercer@qlogic.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION(DRV_STRING " ");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_VERSION(DRV_VERSION);</div><div class='add'>+</div><div class='add'>+static const u32 default_msg =</div><div class='add'>+    NETIF_MSG_DRV | NETIF_MSG_PROBE | NETIF_MSG_LINK |</div><div class='add'>+/* NETIF_MSG_TIMER |	*/</div><div class='add'>+    NETIF_MSG_IFDOWN |</div><div class='add'>+    NETIF_MSG_IFUP |</div><div class='add'>+    NETIF_MSG_RX_ERR |</div><div class='add'>+    NETIF_MSG_TX_ERR |</div><div class='add'>+    NETIF_MSG_TX_QUEUED |</div><div class='add'>+    NETIF_MSG_INTR | NETIF_MSG_TX_DONE | NETIF_MSG_RX_STATUS |</div><div class='add'>+/* NETIF_MSG_PKTDATA | */</div><div class='add'>+    NETIF_MSG_HW | NETIF_MSG_WOL | 0;</div><div class='add'>+</div><div class='add'>+static int debug = 0x00007fff;	/* defaults above */</div><div class='add'>+module_param(debug, int, 0);</div><div class='add'>+MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all)");</div><div class='add'>+</div><div class='add'>+#define MSIX_IRQ 0</div><div class='add'>+#define MSI_IRQ 1</div><div class='add'>+#define LEG_IRQ 2</div><div class='add'>+static int irq_type = MSIX_IRQ;</div><div class='add'>+module_param(irq_type, int, MSIX_IRQ);</div><div class='add'>+MODULE_PARM_DESC(irq_type, "0 = MSI-X, 1 = MSI, 2 = Legacy.");</div><div class='add'>+</div><div class='add'>+static struct pci_device_id qlge_pci_tbl[] __devinitdata = {</div><div class='add'>+	{PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, QLGE_DEVICE_ID)},</div><div class='add'>+	{PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, QLGE_DEVICE_ID1)},</div><div class='add'>+	/* required last entry */</div><div class='add'>+	{0,}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_DEVICE_TABLE(pci, qlge_pci_tbl);</div><div class='add'>+</div><div class='add'>+/* This hardware semaphore causes exclusive access to</div><div class='add'>+ * resources shared between the NIC driver, MPI firmware,</div><div class='add'>+ * FCOE firmware and the FC driver.</div><div class='add'>+ */</div><div class='add'>+static int ql_sem_trylock(struct ql_adapter *qdev, u32 sem_mask)</div><div class='add'>+{</div><div class='add'>+	u32 sem_bits = 0;</div><div class='add'>+</div><div class='add'>+	switch (sem_mask) {</div><div class='add'>+	case SEM_XGMAC0_MASK:</div><div class='add'>+		sem_bits = SEM_SET &lt;&lt; SEM_XGMAC0_SHIFT;</div><div class='add'>+		break;</div><div class='add'>+	case SEM_XGMAC1_MASK:</div><div class='add'>+		sem_bits = SEM_SET &lt;&lt; SEM_XGMAC1_SHIFT;</div><div class='add'>+		break;</div><div class='add'>+	case SEM_ICB_MASK:</div><div class='add'>+		sem_bits = SEM_SET &lt;&lt; SEM_ICB_SHIFT;</div><div class='add'>+		break;</div><div class='add'>+	case SEM_MAC_ADDR_MASK:</div><div class='add'>+		sem_bits = SEM_SET &lt;&lt; SEM_MAC_ADDR_SHIFT;</div><div class='add'>+		break;</div><div class='add'>+	case SEM_FLASH_MASK:</div><div class='add'>+		sem_bits = SEM_SET &lt;&lt; SEM_FLASH_SHIFT;</div><div class='add'>+		break;</div><div class='add'>+	case SEM_PROBE_MASK:</div><div class='add'>+		sem_bits = SEM_SET &lt;&lt; SEM_PROBE_SHIFT;</div><div class='add'>+		break;</div><div class='add'>+	case SEM_RT_IDX_MASK:</div><div class='add'>+		sem_bits = SEM_SET &lt;&lt; SEM_RT_IDX_SHIFT;</div><div class='add'>+		break;</div><div class='add'>+	case SEM_PROC_REG_MASK:</div><div class='add'>+		sem_bits = SEM_SET &lt;&lt; SEM_PROC_REG_SHIFT;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		QPRINTK(qdev, PROBE, ALERT, "Bad Semaphore mask!.\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ql_write32(qdev, SEM, sem_bits | sem_mask);</div><div class='add'>+	return !(ql_read32(qdev, SEM) &amp; sem_bits);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ql_sem_spinlock(struct ql_adapter *qdev, u32 sem_mask)</div><div class='add'>+{</div><div class='add'>+	unsigned int seconds = 3;</div><div class='add'>+	do {</div><div class='add'>+		if (!ql_sem_trylock(qdev, sem_mask))</div><div class='add'>+			return 0;</div><div class='add'>+		ssleep(1);</div><div class='add'>+	} while (--seconds);</div><div class='add'>+	return -ETIMEDOUT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ql_sem_unlock(struct ql_adapter *qdev, u32 sem_mask)</div><div class='add'>+{</div><div class='add'>+	ql_write32(qdev, SEM, sem_mask);</div><div class='add'>+	ql_read32(qdev, SEM);	/* flush */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This function waits for a specific bit to come ready</div><div class='add'>+ * in a given register.  It is used mostly by the initialize</div><div class='add'>+ * process, but is also used in kernel thread API such as</div><div class='add'>+ * netdev-&gt;set_multi, netdev-&gt;set_mac_address, netdev-&gt;vlan_rx_add_vid.</div><div class='add'>+ */</div><div class='add'>+int ql_wait_reg_rdy(struct ql_adapter *qdev, u32 reg, u32 bit, u32 err_bit)</div><div class='add'>+{</div><div class='add'>+	u32 temp;</div><div class='add'>+	int count = UDELAY_COUNT;</div><div class='add'>+</div><div class='add'>+	while (count) {</div><div class='add'>+		temp = ql_read32(qdev, reg);</div><div class='add'>+</div><div class='add'>+		/* check for errors */</div><div class='add'>+		if (temp &amp; err_bit) {</div><div class='add'>+			QPRINTK(qdev, PROBE, ALERT,</div><div class='add'>+				"register 0x%.08x access error, value = 0x%.08x!.\n",</div><div class='add'>+				reg, temp);</div><div class='add'>+			return -EIO;</div><div class='add'>+		} else if (temp &amp; bit)</div><div class='add'>+			return 0;</div><div class='add'>+		udelay(UDELAY_DELAY);</div><div class='add'>+		count--;</div><div class='add'>+	}</div><div class='add'>+	QPRINTK(qdev, PROBE, ALERT,</div><div class='add'>+		"Timed out waiting for reg %x to come ready.\n", reg);</div><div class='add'>+	return -ETIMEDOUT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* The CFG register is used to download TX and RX control blocks</div><div class='add'>+ * to the chip. This function waits for an operation to complete.</div><div class='add'>+ */</div><div class='add'>+static int ql_wait_cfg(struct ql_adapter *qdev, u32 bit)</div><div class='add'>+{</div><div class='add'>+	int count = UDELAY_COUNT;</div><div class='add'>+	u32 temp;</div><div class='add'>+</div><div class='add'>+	while (count) {</div><div class='add'>+		temp = ql_read32(qdev, CFG);</div><div class='add'>+		if (temp &amp; CFG_LE)</div><div class='add'>+			return -EIO;</div><div class='add'>+		if (!(temp &amp; bit))</div><div class='add'>+			return 0;</div><div class='add'>+		udelay(UDELAY_DELAY);</div><div class='add'>+		count--;</div><div class='add'>+	}</div><div class='add'>+	return -ETIMEDOUT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Used to issue init control blocks to hw. Maps control block,</div><div class='add'>+ * sets address, triggers download, waits for completion.</div><div class='add'>+ */</div><div class='add'>+int ql_write_cfg(struct ql_adapter *qdev, void *ptr, int size, u32 bit,</div><div class='add'>+		 u16 q_id)</div><div class='add'>+{</div><div class='add'>+	u64 map;</div><div class='add'>+	int status = 0;</div><div class='add'>+	int direction;</div><div class='add'>+	u32 mask;</div><div class='add'>+	u32 value;</div><div class='add'>+</div><div class='add'>+	direction =</div><div class='add'>+	    (bit &amp; (CFG_LRQ | CFG_LR | CFG_LCQ)) ? PCI_DMA_TODEVICE :</div><div class='add'>+	    PCI_DMA_FROMDEVICE;</div><div class='add'>+</div><div class='add'>+	map = pci_map_single(qdev-&gt;pdev, ptr, size, direction);</div><div class='add'>+	if (pci_dma_mapping_error(qdev-&gt;pdev, map)) {</div><div class='add'>+		QPRINTK(qdev, IFUP, ERR, "Couldn't map DMA area.\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	status = ql_wait_cfg(qdev, bit);</div><div class='add'>+	if (status) {</div><div class='add'>+		QPRINTK(qdev, IFUP, ERR,</div><div class='add'>+			"Timed out waiting for CFG to come ready.\n");</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	status = ql_sem_spinlock(qdev, SEM_ICB_MASK);</div><div class='add'>+	if (status)</div><div class='add'>+		goto exit;</div><div class='add'>+	ql_write32(qdev, ICB_L, (u32) map);</div><div class='add'>+	ql_write32(qdev, ICB_H, (u32) (map &gt;&gt; 32));</div><div class='add'>+	ql_sem_unlock(qdev, SEM_ICB_MASK);	/* does flush too */</div><div class='add'>+</div><div class='add'>+	mask = CFG_Q_MASK | (bit &lt;&lt; 16);</div><div class='add'>+	value = bit | (q_id &lt;&lt; CFG_Q_SHIFT);</div><div class='add'>+	ql_write32(qdev, CFG, (mask | value));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Wait for the bit to clear after signaling hw.</div><div class='add'>+	 */</div><div class='add'>+	status = ql_wait_cfg(qdev, bit);</div><div class='add'>+exit:</div><div class='add'>+	pci_unmap_single(qdev-&gt;pdev, map, size, direction);</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Get a specific MAC address from the CAM.  Used for debug and reg dump. */</div><div class='add'>+int ql_get_mac_addr_reg(struct ql_adapter *qdev, u32 type, u16 index,</div><div class='add'>+			u32 *value)</div><div class='add'>+{</div><div class='add'>+	u32 offset = 0;</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	status = ql_sem_spinlock(qdev, SEM_MAC_ADDR_MASK);</div><div class='add'>+	if (status)</div><div class='add'>+		return status;</div><div class='add'>+	switch (type) {</div><div class='add'>+	case MAC_ADDR_TYPE_MULTI_MAC:</div><div class='add'>+	case MAC_ADDR_TYPE_CAM_MAC:</div><div class='add'>+		{</div><div class='add'>+			status =</div><div class='add'>+			    ql_wait_reg_rdy(qdev,</div><div class='add'>+				MAC_ADDR_IDX, MAC_ADDR_MW, MAC_ADDR_E);</div><div class='add'>+			if (status)</div><div class='add'>+				goto exit;</div><div class='add'>+			ql_write32(qdev, MAC_ADDR_IDX, (offset++) | /* offset */</div><div class='add'>+				   (index &lt;&lt; MAC_ADDR_IDX_SHIFT) | /* index */</div><div class='add'>+				   MAC_ADDR_ADR | MAC_ADDR_RS | type); /* type */</div><div class='add'>+			status =</div><div class='add'>+			    ql_wait_reg_rdy(qdev,</div><div class='add'>+				MAC_ADDR_IDX, MAC_ADDR_MR, MAC_ADDR_E);</div><div class='add'>+			if (status)</div><div class='add'>+				goto exit;</div><div class='add'>+			*value++ = ql_read32(qdev, MAC_ADDR_DATA);</div><div class='add'>+			status =</div><div class='add'>+			    ql_wait_reg_rdy(qdev,</div><div class='add'>+				MAC_ADDR_IDX, MAC_ADDR_MW, MAC_ADDR_E);</div><div class='add'>+			if (status)</div><div class='add'>+				goto exit;</div><div class='add'>+			ql_write32(qdev, MAC_ADDR_IDX, (offset++) | /* offset */</div><div class='add'>+				   (index &lt;&lt; MAC_ADDR_IDX_SHIFT) | /* index */</div><div class='add'>+				   MAC_ADDR_ADR | MAC_ADDR_RS | type); /* type */</div><div class='add'>+			status =</div><div class='add'>+			    ql_wait_reg_rdy(qdev,</div><div class='add'>+				MAC_ADDR_IDX, MAC_ADDR_MR, MAC_ADDR_E);</div><div class='add'>+			if (status)</div><div class='add'>+				goto exit;</div><div class='add'>+			*value++ = ql_read32(qdev, MAC_ADDR_DATA);</div><div class='add'>+			if (type == MAC_ADDR_TYPE_CAM_MAC) {</div><div class='add'>+				status =</div><div class='add'>+				    ql_wait_reg_rdy(qdev,</div><div class='add'>+					MAC_ADDR_IDX, MAC_ADDR_MW, MAC_ADDR_E);</div><div class='add'>+				if (status)</div><div class='add'>+					goto exit;</div><div class='add'>+				ql_write32(qdev, MAC_ADDR_IDX, (offset++) | /* offset */</div><div class='add'>+					   (index &lt;&lt; MAC_ADDR_IDX_SHIFT) | /* index */</div><div class='add'>+					   MAC_ADDR_ADR | MAC_ADDR_RS | type); /* type */</div><div class='add'>+				status =</div><div class='add'>+				    ql_wait_reg_rdy(qdev, MAC_ADDR_IDX,</div><div class='add'>+						    MAC_ADDR_MR, MAC_ADDR_E);</div><div class='add'>+				if (status)</div><div class='add'>+					goto exit;</div><div class='add'>+				*value++ = ql_read32(qdev, MAC_ADDR_DATA);</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	case MAC_ADDR_TYPE_VLAN:</div><div class='add'>+	case MAC_ADDR_TYPE_MULTI_FLTR:</div><div class='add'>+	default:</div><div class='add'>+		QPRINTK(qdev, IFUP, CRIT,</div><div class='add'>+			"Address type %d not yet supported.\n", type);</div><div class='add'>+		status = -EPERM;</div><div class='add'>+	}</div><div class='add'>+exit:</div><div class='add'>+	ql_sem_unlock(qdev, SEM_MAC_ADDR_MASK);</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Set up a MAC, multicast or VLAN address for the</div><div class='add'>+ * inbound frame matching.</div><div class='add'>+ */</div><div class='add'>+static int ql_set_mac_addr_reg(struct ql_adapter *qdev, u8 *addr, u32 type,</div><div class='add'>+			       u16 index)</div><div class='add'>+{</div><div class='add'>+	u32 offset = 0;</div><div class='add'>+	int status = 0;</div><div class='add'>+</div><div class='add'>+	status = ql_sem_spinlock(qdev, SEM_MAC_ADDR_MASK);</div><div class='add'>+	if (status)</div><div class='add'>+		return status;</div><div class='add'>+	switch (type) {</div><div class='add'>+	case MAC_ADDR_TYPE_MULTI_MAC:</div><div class='add'>+	case MAC_ADDR_TYPE_CAM_MAC:</div><div class='add'>+		{</div><div class='add'>+			u32 cam_output;</div><div class='add'>+			u32 upper = (addr[0] &lt;&lt; 8) | addr[1];</div><div class='add'>+			u32 lower =</div><div class='add'>+			    (addr[2] &lt;&lt; 24) | (addr[3] &lt;&lt; 16) | (addr[4] &lt;&lt; 8) |</div><div class='add'>+			    (addr[5]);</div><div class='add'>+</div><div class='add'>+			QPRINTK(qdev, IFUP, INFO,</div><div class='add'>+				"Adding %s address %02x:%02x:%02x:%02x:%02x:%02x"</div><div class='add'>+				" at index %d in the CAM.\n",</div><div class='add'>+				((type ==</div><div class='add'>+				  MAC_ADDR_TYPE_MULTI_MAC) ? "MULTICAST" :</div><div class='add'>+				 "UNICAST"), addr[0], addr[1], addr[2], addr[3],</div><div class='add'>+				addr[4], addr[5], index);</div><div class='add'>+</div><div class='add'>+			status =</div><div class='add'>+			    ql_wait_reg_rdy(qdev,</div><div class='add'>+				MAC_ADDR_IDX, MAC_ADDR_MW, MAC_ADDR_E);</div><div class='add'>+			if (status)</div><div class='add'>+				goto exit;</div><div class='add'>+			ql_write32(qdev, MAC_ADDR_IDX, (offset++) | /* offset */</div><div class='add'>+				   (index &lt;&lt; MAC_ADDR_IDX_SHIFT) | /* index */</div><div class='add'>+				   type);	/* type */</div><div class='add'>+			ql_write32(qdev, MAC_ADDR_DATA, lower);</div><div class='add'>+			status =</div><div class='add'>+			    ql_wait_reg_rdy(qdev,</div><div class='add'>+				MAC_ADDR_IDX, MAC_ADDR_MW, MAC_ADDR_E);</div><div class='add'>+			if (status)</div><div class='add'>+				goto exit;</div><div class='add'>+			ql_write32(qdev, MAC_ADDR_IDX, (offset++) | /* offset */</div><div class='add'>+				   (index &lt;&lt; MAC_ADDR_IDX_SHIFT) | /* index */</div><div class='add'>+				   type);	/* type */</div><div class='add'>+			ql_write32(qdev, MAC_ADDR_DATA, upper);</div><div class='add'>+			status =</div><div class='add'>+			    ql_wait_reg_rdy(qdev,</div><div class='add'>+				MAC_ADDR_IDX, MAC_ADDR_MW, MAC_ADDR_E);</div><div class='add'>+			if (status)</div><div class='add'>+				goto exit;</div><div class='add'>+			ql_write32(qdev, MAC_ADDR_IDX, (offset) |	/* offset */</div><div class='add'>+				   (index &lt;&lt; MAC_ADDR_IDX_SHIFT) |	/* index */</div><div class='add'>+				   type);	/* type */</div><div class='add'>+			/* This field should also include the queue id</div><div class='add'>+			   and possibly the function id.  Right now we hardcode</div><div class='add'>+			   the route field to NIC core.</div><div class='add'>+			 */</div><div class='add'>+			if (type == MAC_ADDR_TYPE_CAM_MAC) {</div><div class='add'>+				cam_output = (CAM_OUT_ROUTE_NIC |</div><div class='add'>+					      (qdev-&gt;</div><div class='add'>+					       func &lt;&lt; CAM_OUT_FUNC_SHIFT) |</div><div class='add'>+					      (qdev-&gt;</div><div class='add'>+					       rss_ring_first_cq_id &lt;&lt;</div><div class='add'>+					       CAM_OUT_CQ_ID_SHIFT));</div><div class='add'>+				if (qdev-&gt;vlgrp)</div><div class='add'>+					cam_output |= CAM_OUT_RV;</div><div class='add'>+				/* route to NIC core */</div><div class='add'>+				ql_write32(qdev, MAC_ADDR_DATA, cam_output);</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	case MAC_ADDR_TYPE_VLAN:</div><div class='add'>+		{</div><div class='add'>+			u32 enable_bit = *((u32 *) &amp;addr[0]);</div><div class='add'>+			/* For VLAN, the addr actually holds a bit that</div><div class='add'>+			 * either enables or disables the vlan id we are</div><div class='add'>+			 * addressing. It's either MAC_ADDR_E on or off.</div><div class='add'>+			 * That's bit-27 we're talking about.</div><div class='add'>+			 */</div><div class='add'>+			QPRINTK(qdev, IFUP, INFO, "%s VLAN ID %d %s the CAM.\n",</div><div class='add'>+				(enable_bit ? "Adding" : "Removing"),</div><div class='add'>+				index, (enable_bit ? "to" : "from"));</div><div class='add'>+</div><div class='add'>+			status =</div><div class='add'>+			    ql_wait_reg_rdy(qdev,</div><div class='add'>+				MAC_ADDR_IDX, MAC_ADDR_MW, MAC_ADDR_E);</div><div class='add'>+			if (status)</div><div class='add'>+				goto exit;</div><div class='add'>+			ql_write32(qdev, MAC_ADDR_IDX, offset |	/* offset */</div><div class='add'>+				   (index &lt;&lt; MAC_ADDR_IDX_SHIFT) |	/* index */</div><div class='add'>+				   type |	/* type */</div><div class='add'>+				   enable_bit);	/* enable/disable */</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	case MAC_ADDR_TYPE_MULTI_FLTR:</div><div class='add'>+	default:</div><div class='add'>+		QPRINTK(qdev, IFUP, CRIT,</div><div class='add'>+			"Address type %d not yet supported.\n", type);</div><div class='add'>+		status = -EPERM;</div><div class='add'>+	}</div><div class='add'>+exit:</div><div class='add'>+	ql_sem_unlock(qdev, SEM_MAC_ADDR_MASK);</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Get a specific frame routing value from the CAM.</div><div class='add'>+ * Used for debug and reg dump.</div><div class='add'>+ */</div><div class='add'>+int ql_get_routing_reg(struct ql_adapter *qdev, u32 index, u32 *value)</div><div class='add'>+{</div><div class='add'>+	int status = 0;</div><div class='add'>+</div><div class='add'>+	status = ql_sem_spinlock(qdev, SEM_RT_IDX_MASK);</div><div class='add'>+	if (status)</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	status = ql_wait_reg_rdy(qdev, RT_IDX, RT_IDX_MW, RT_IDX_E);</div><div class='add'>+	if (status)</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	ql_write32(qdev, RT_IDX,</div><div class='add'>+		   RT_IDX_TYPE_NICQ | RT_IDX_RS | (index &lt;&lt; RT_IDX_IDX_SHIFT));</div><div class='add'>+	status = ql_wait_reg_rdy(qdev, RT_IDX, RT_IDX_MR, RT_IDX_E);</div><div class='add'>+	if (status)</div><div class='add'>+		goto exit;</div><div class='add'>+	*value = ql_read32(qdev, RT_DATA);</div><div class='add'>+exit:</div><div class='add'>+	ql_sem_unlock(qdev, SEM_RT_IDX_MASK);</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* The NIC function for this chip has 16 routing indexes.  Each one can be used</div><div class='add'>+ * to route different frame types to various inbound queues.  We send broadcast/</div><div class='add'>+ * multicast/error frames to the default queue for slow handling,</div><div class='add'>+ * and CAM hit/RSS frames to the fast handling queues.</div><div class='add'>+ */</div><div class='add'>+static int ql_set_routing_reg(struct ql_adapter *qdev, u32 index, u32 mask,</div><div class='add'>+			      int enable)</div><div class='add'>+{</div><div class='add'>+	int status;</div><div class='add'>+	u32 value = 0;</div><div class='add'>+</div><div class='add'>+	status = ql_sem_spinlock(qdev, SEM_RT_IDX_MASK);</div><div class='add'>+	if (status)</div><div class='add'>+		return status;</div><div class='add'>+</div><div class='add'>+	QPRINTK(qdev, IFUP, DEBUG,</div><div class='add'>+		"%s %s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s mask %s the routing reg.\n",</div><div class='add'>+		(enable ? "Adding" : "Removing"),</div><div class='add'>+		((index == RT_IDX_ALL_ERR_SLOT) ? "MAC ERROR/ALL ERROR" : ""),</div><div class='add'>+		((index == RT_IDX_IP_CSUM_ERR_SLOT) ? "IP CSUM ERROR" : ""),</div><div class='add'>+		((index ==</div><div class='add'>+		  RT_IDX_TCP_UDP_CSUM_ERR_SLOT) ? "TCP/UDP CSUM ERROR" : ""),</div><div class='add'>+		((index == RT_IDX_BCAST_SLOT) ? "BROADCAST" : ""),</div><div class='add'>+		((index == RT_IDX_MCAST_MATCH_SLOT) ? "MULTICAST MATCH" : ""),</div><div class='add'>+		((index == RT_IDX_ALLMULTI_SLOT) ? "ALL MULTICAST MATCH" : ""),</div><div class='add'>+		((index == RT_IDX_UNUSED6_SLOT) ? "UNUSED6" : ""),</div><div class='add'>+		((index == RT_IDX_UNUSED7_SLOT) ? "UNUSED7" : ""),</div><div class='add'>+		((index == RT_IDX_RSS_MATCH_SLOT) ? "RSS ALL/IPV4 MATCH" : ""),</div><div class='add'>+		((index == RT_IDX_RSS_IPV6_SLOT) ? "RSS IPV6" : ""),</div><div class='add'>+		((index == RT_IDX_RSS_TCP4_SLOT) ? "RSS TCP4" : ""),</div><div class='add'>+		((index == RT_IDX_RSS_TCP6_SLOT) ? "RSS TCP6" : ""),</div><div class='add'>+		((index == RT_IDX_CAM_HIT_SLOT) ? "CAM HIT" : ""),</div><div class='add'>+		((index == RT_IDX_UNUSED013) ? "UNUSED13" : ""),</div><div class='add'>+		((index == RT_IDX_UNUSED014) ? "UNUSED14" : ""),</div><div class='add'>+		((index == RT_IDX_PROMISCUOUS_SLOT) ? "PROMISCUOUS" : ""),</div><div class='add'>+		(enable ? "to" : "from"));</div><div class='add'>+</div><div class='add'>+	switch (mask) {</div><div class='add'>+	case RT_IDX_CAM_HIT:</div><div class='add'>+		{</div><div class='add'>+			value = RT_IDX_DST_CAM_Q |	/* dest */</div><div class='add'>+			    RT_IDX_TYPE_NICQ |	/* type */</div><div class='add'>+			    (RT_IDX_CAM_HIT_SLOT &lt;&lt; RT_IDX_IDX_SHIFT);/* index */</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	case RT_IDX_VALID:	/* Promiscuous Mode frames. */</div><div class='add'>+		{</div><div class='add'>+			value = RT_IDX_DST_DFLT_Q |	/* dest */</div><div class='add'>+			    RT_IDX_TYPE_NICQ |	/* type */</div><div class='add'>+			    (RT_IDX_PROMISCUOUS_SLOT &lt;&lt; RT_IDX_IDX_SHIFT);/* index */</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	case RT_IDX_ERR:	/* Pass up MAC,IP,TCP/UDP error frames. */</div><div class='add'>+		{</div><div class='add'>+			value = RT_IDX_DST_DFLT_Q |	/* dest */</div><div class='add'>+			    RT_IDX_TYPE_NICQ |	/* type */</div><div class='add'>+			    (RT_IDX_ALL_ERR_SLOT &lt;&lt; RT_IDX_IDX_SHIFT);/* index */</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	case RT_IDX_BCAST:	/* Pass up Broadcast frames to default Q. */</div><div class='add'>+		{</div><div class='add'>+			value = RT_IDX_DST_DFLT_Q |	/* dest */</div><div class='add'>+			    RT_IDX_TYPE_NICQ |	/* type */</div><div class='add'>+			    (RT_IDX_BCAST_SLOT &lt;&lt; RT_IDX_IDX_SHIFT);/* index */</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	case RT_IDX_MCAST:	/* Pass up All Multicast frames. */</div><div class='add'>+		{</div><div class='add'>+			value = RT_IDX_DST_CAM_Q |	/* dest */</div><div class='add'>+			    RT_IDX_TYPE_NICQ |	/* type */</div><div class='add'>+			    (RT_IDX_ALLMULTI_SLOT &lt;&lt; RT_IDX_IDX_SHIFT);/* index */</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	case RT_IDX_MCAST_MATCH:	/* Pass up matched Multicast frames. */</div><div class='add'>+		{</div><div class='add'>+			value = RT_IDX_DST_CAM_Q |	/* dest */</div><div class='add'>+			    RT_IDX_TYPE_NICQ |	/* type */</div><div class='add'>+			    (RT_IDX_MCAST_MATCH_SLOT &lt;&lt; RT_IDX_IDX_SHIFT);/* index */</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	case RT_IDX_RSS_MATCH:	/* Pass up matched RSS frames. */</div><div class='add'>+		{</div><div class='add'>+			value = RT_IDX_DST_RSS |	/* dest */</div><div class='add'>+			    RT_IDX_TYPE_NICQ |	/* type */</div><div class='add'>+			    (RT_IDX_RSS_MATCH_SLOT &lt;&lt; RT_IDX_IDX_SHIFT);/* index */</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	case 0:		/* Clear the E-bit on an entry. */</div><div class='add'>+		{</div><div class='add'>+			value = RT_IDX_DST_DFLT_Q |	/* dest */</div><div class='add'>+			    RT_IDX_TYPE_NICQ |	/* type */</div><div class='add'>+			    (index &lt;&lt; RT_IDX_IDX_SHIFT);/* index */</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	default:</div><div class='add'>+		QPRINTK(qdev, IFUP, ERR, "Mask type %d not yet supported.\n",</div><div class='add'>+			mask);</div><div class='add'>+		status = -EPERM;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (value) {</div><div class='add'>+		status = ql_wait_reg_rdy(qdev, RT_IDX, RT_IDX_MW, 0);</div><div class='add'>+		if (status)</div><div class='add'>+			goto exit;</div><div class='add'>+		value |= (enable ? RT_IDX_E : 0);</div><div class='add'>+		ql_write32(qdev, RT_IDX, value);</div><div class='add'>+		ql_write32(qdev, RT_DATA, enable ? mask : 0);</div><div class='add'>+	}</div><div class='add'>+exit:</div><div class='add'>+	ql_sem_unlock(qdev, SEM_RT_IDX_MASK);</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ql_enable_interrupts(struct ql_adapter *qdev)</div><div class='add'>+{</div><div class='add'>+	ql_write32(qdev, INTR_EN, (INTR_EN_EI &lt;&lt; 16) | INTR_EN_EI);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ql_disable_interrupts(struct ql_adapter *qdev)</div><div class='add'>+{</div><div class='add'>+	ql_write32(qdev, INTR_EN, (INTR_EN_EI &lt;&lt; 16));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* If we're running with multiple MSI-X vectors then we enable on the fly.</div><div class='add'>+ * Otherwise, we may have multiple outstanding workers and don't want to</div><div class='add'>+ * enable until the last one finishes. In this case, the irq_cnt gets</div><div class='add'>+ * incremented everytime we queue a worker and decremented everytime</div><div class='add'>+ * a worker finishes.  Once it hits zero we enable the interrupt.</div><div class='add'>+ */</div><div class='add'>+void ql_enable_completion_interrupt(struct ql_adapter *qdev, u32 intr)</div><div class='add'>+{</div><div class='add'>+	if (likely(test_bit(QL_MSIX_ENABLED, &amp;qdev-&gt;flags)))</div><div class='add'>+		ql_write32(qdev, INTR_EN,</div><div class='add'>+			   qdev-&gt;intr_context[intr].intr_en_mask);</div><div class='add'>+	else {</div><div class='add'>+		if (qdev-&gt;legacy_check)</div><div class='add'>+			spin_lock(&amp;qdev-&gt;legacy_lock);</div><div class='add'>+		if (atomic_dec_and_test(&amp;qdev-&gt;intr_context[intr].irq_cnt)) {</div><div class='add'>+			QPRINTK(qdev, INTR, ERR, "Enabling interrupt %d.\n",</div><div class='add'>+				intr);</div><div class='add'>+			ql_write32(qdev, INTR_EN,</div><div class='add'>+				   qdev-&gt;intr_context[intr].intr_en_mask);</div><div class='add'>+		} else {</div><div class='add'>+			QPRINTK(qdev, INTR, ERR,</div><div class='add'>+				"Skip enable, other queue(s) are active.\n");</div><div class='add'>+		}</div><div class='add'>+		if (qdev-&gt;legacy_check)</div><div class='add'>+			spin_unlock(&amp;qdev-&gt;legacy_lock);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 ql_disable_completion_interrupt(struct ql_adapter *qdev, u32 intr)</div><div class='add'>+{</div><div class='add'>+	u32 var = 0;</div><div class='add'>+</div><div class='add'>+	if (likely(test_bit(QL_MSIX_ENABLED, &amp;qdev-&gt;flags)))</div><div class='add'>+		goto exit;</div><div class='add'>+	else if (!atomic_read(&amp;qdev-&gt;intr_context[intr].irq_cnt)) {</div><div class='add'>+		ql_write32(qdev, INTR_EN,</div><div class='add'>+			   qdev-&gt;intr_context[intr].intr_dis_mask);</div><div class='add'>+		var = ql_read32(qdev, STS);</div><div class='add'>+	}</div><div class='add'>+	atomic_inc(&amp;qdev-&gt;intr_context[intr].irq_cnt);</div><div class='add'>+exit:</div><div class='add'>+	return var;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ql_enable_all_completion_interrupts(struct ql_adapter *qdev)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	for (i = 0; i &lt; qdev-&gt;intr_count; i++) {</div><div class='add'>+		/* The enable call does a atomic_dec_and_test</div><div class='add'>+		 * and enables only if the result is zero.</div><div class='add'>+		 * So we precharge it here.</div><div class='add'>+		 */</div><div class='add'>+		atomic_set(&amp;qdev-&gt;intr_context[i].irq_cnt, 1);</div><div class='add'>+		ql_enable_completion_interrupt(qdev, i);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ql_read_flash_word(struct ql_adapter *qdev, int offset, u32 *data)</div><div class='add'>+{</div><div class='add'>+	int status = 0;</div><div class='add'>+	/* wait for reg to come ready */</div><div class='add'>+	status = ql_wait_reg_rdy(qdev,</div><div class='add'>+			FLASH_ADDR, FLASH_ADDR_RDY, FLASH_ADDR_ERR);</div><div class='add'>+	if (status)</div><div class='add'>+		goto exit;</div><div class='add'>+	/* set up for reg read */</div><div class='add'>+	ql_write32(qdev, FLASH_ADDR, FLASH_ADDR_R | offset);</div><div class='add'>+	/* wait for reg to come ready */</div><div class='add'>+	status = ql_wait_reg_rdy(qdev,</div><div class='add'>+			FLASH_ADDR, FLASH_ADDR_RDY, FLASH_ADDR_ERR);</div><div class='add'>+	if (status)</div><div class='add'>+		goto exit;</div><div class='add'>+	/* get the data */</div><div class='add'>+	*data = ql_read32(qdev, FLASH_DATA);</div><div class='add'>+exit:</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ql_get_flash_params(struct ql_adapter *qdev)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	int status;</div><div class='add'>+	u32 *p = (u32 *)&amp;qdev-&gt;flash;</div><div class='add'>+</div><div class='add'>+	if (ql_sem_spinlock(qdev, SEM_FLASH_MASK))</div><div class='add'>+		return -ETIMEDOUT;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; sizeof(qdev-&gt;flash) / sizeof(u32); i++, p++) {</div><div class='add'>+		status = ql_read_flash_word(qdev, i, p);</div><div class='add'>+		if (status) {</div><div class='add'>+			QPRINTK(qdev, IFUP, ERR, "Error reading flash.\n");</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+exit:</div><div class='add'>+	ql_sem_unlock(qdev, SEM_FLASH_MASK);</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* xgmac register are located behind the xgmac_addr and xgmac_data</div><div class='add'>+ * register pair.  Each read/write requires us to wait for the ready</div><div class='add'>+ * bit before reading/writing the data.</div><div class='add'>+ */</div><div class='add'>+static int ql_write_xgmac_reg(struct ql_adapter *qdev, u32 reg, u32 data)</div><div class='add'>+{</div><div class='add'>+	int status;</div><div class='add'>+	/* wait for reg to come ready */</div><div class='add'>+	status = ql_wait_reg_rdy(qdev,</div><div class='add'>+			XGMAC_ADDR, XGMAC_ADDR_RDY, XGMAC_ADDR_XME);</div><div class='add'>+	if (status)</div><div class='add'>+		return status;</div><div class='add'>+	/* write the data to the data reg */</div><div class='add'>+	ql_write32(qdev, XGMAC_DATA, data);</div><div class='add'>+	/* trigger the write */</div><div class='add'>+	ql_write32(qdev, XGMAC_ADDR, reg);</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* xgmac register are located behind the xgmac_addr and xgmac_data</div><div class='add'>+ * register pair.  Each read/write requires us to wait for the ready</div><div class='add'>+ * bit before reading/writing the data.</div><div class='add'>+ */</div><div class='add'>+int ql_read_xgmac_reg(struct ql_adapter *qdev, u32 reg, u32 *data)</div><div class='add'>+{</div><div class='add'>+	int status = 0;</div><div class='add'>+	/* wait for reg to come ready */</div><div class='add'>+	status = ql_wait_reg_rdy(qdev,</div><div class='add'>+			XGMAC_ADDR, XGMAC_ADDR_RDY, XGMAC_ADDR_XME);</div><div class='add'>+	if (status)</div><div class='add'>+		goto exit;</div><div class='add'>+	/* set up for reg read */</div><div class='add'>+	ql_write32(qdev, XGMAC_ADDR, reg | XGMAC_ADDR_R);</div><div class='add'>+	/* wait for reg to come ready */</div><div class='add'>+	status = ql_wait_reg_rdy(qdev,</div><div class='add'>+			XGMAC_ADDR, XGMAC_ADDR_RDY, XGMAC_ADDR_XME);</div><div class='add'>+	if (status)</div><div class='add'>+		goto exit;</div><div class='add'>+	/* get the data */</div><div class='add'>+	*data = ql_read32(qdev, XGMAC_DATA);</div><div class='add'>+exit:</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This is used for reading the 64-bit statistics regs. */</div><div class='add'>+int ql_read_xgmac_reg64(struct ql_adapter *qdev, u32 reg, u64 *data)</div><div class='add'>+{</div><div class='add'>+	int status = 0;</div><div class='add'>+	u32 hi = 0;</div><div class='add'>+	u32 lo = 0;</div><div class='add'>+</div><div class='add'>+	status = ql_read_xgmac_reg(qdev, reg, &amp;lo);</div><div class='add'>+	if (status)</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	status = ql_read_xgmac_reg(qdev, reg + 4, &amp;hi);</div><div class='add'>+	if (status)</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	*data = (u64) lo | ((u64) hi &lt;&lt; 32);</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Take the MAC Core out of reset.</div><div class='add'>+ * Enable statistics counting.</div><div class='add'>+ * Take the transmitter/receiver out of reset.</div><div class='add'>+ * This functionality may be done in the MPI firmware at a</div><div class='add'>+ * later date.</div><div class='add'>+ */</div><div class='add'>+static int ql_port_initialize(struct ql_adapter *qdev)</div><div class='add'>+{</div><div class='add'>+	int status = 0;</div><div class='add'>+	u32 data;</div><div class='add'>+</div><div class='add'>+	if (ql_sem_trylock(qdev, qdev-&gt;xg_sem_mask)) {</div><div class='add'>+		/* Another function has the semaphore, so</div><div class='add'>+		 * wait for the port init bit to come ready.</div><div class='add'>+		 */</div><div class='add'>+		QPRINTK(qdev, LINK, INFO,</div><div class='add'>+			"Another function has the semaphore, so wait for the port init bit to come ready.\n");</div><div class='add'>+		status = ql_wait_reg_rdy(qdev, STS, qdev-&gt;port_init, 0);</div><div class='add'>+		if (status) {</div><div class='add'>+			QPRINTK(qdev, LINK, CRIT,</div><div class='add'>+				"Port initialize timed out.\n");</div><div class='add'>+		}</div><div class='add'>+		return status;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	QPRINTK(qdev, LINK, INFO, "Got xgmac semaphore!.\n");</div><div class='add'>+	/* Set the core reset. */</div><div class='add'>+	status = ql_read_xgmac_reg(qdev, GLOBAL_CFG, &amp;data);</div><div class='add'>+	if (status)</div><div class='add'>+		goto end;</div><div class='add'>+	data |= GLOBAL_CFG_RESET;</div><div class='add'>+	status = ql_write_xgmac_reg(qdev, GLOBAL_CFG, data);</div><div class='add'>+	if (status)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	/* Clear the core reset and turn on jumbo for receiver. */</div><div class='add'>+	data &amp;= ~GLOBAL_CFG_RESET;	/* Clear core reset. */</div><div class='add'>+	data |= GLOBAL_CFG_JUMBO;	/* Turn on jumbo. */</div><div class='add'>+	data |= GLOBAL_CFG_TX_STAT_EN;</div><div class='add'>+	data |= GLOBAL_CFG_RX_STAT_EN;</div><div class='add'>+	status = ql_write_xgmac_reg(qdev, GLOBAL_CFG, data);</div><div class='add'>+	if (status)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	/* Enable transmitter, and clear it's reset. */</div><div class='add'>+	status = ql_read_xgmac_reg(qdev, TX_CFG, &amp;data);</div><div class='add'>+	if (status)</div><div class='add'>+		goto end;</div><div class='add'>+	data &amp;= ~TX_CFG_RESET;	/* Clear the TX MAC reset. */</div><div class='add'>+	data |= TX_CFG_EN;	/* Enable the transmitter. */</div><div class='add'>+	status = ql_write_xgmac_reg(qdev, TX_CFG, data);</div><div class='add'>+	if (status)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	/* Enable receiver and clear it's reset. */</div><div class='add'>+	status = ql_read_xgmac_reg(qdev, RX_CFG, &amp;data);</div><div class='add'>+	if (status)</div><div class='add'>+		goto end;</div><div class='add'>+	data &amp;= ~RX_CFG_RESET;	/* Clear the RX MAC reset. */</div><div class='add'>+	data |= RX_CFG_EN;	/* Enable the receiver. */</div><div class='add'>+	status = ql_write_xgmac_reg(qdev, RX_CFG, data);</div><div class='add'>+	if (status)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	/* Turn on jumbo. */</div><div class='add'>+	status =</div><div class='add'>+	    ql_write_xgmac_reg(qdev, MAC_TX_PARAMS, MAC_TX_PARAMS_JUMBO | (0x2580 &lt;&lt; 16));</div><div class='add'>+	if (status)</div><div class='add'>+		goto end;</div><div class='add'>+	status =</div><div class='add'>+	    ql_write_xgmac_reg(qdev, MAC_RX_PARAMS, 0x2580);</div><div class='add'>+	if (status)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	/* Signal to the world that the port is enabled.        */</div><div class='add'>+	ql_write32(qdev, STS, ((qdev-&gt;port_init &lt;&lt; 16) | qdev-&gt;port_init));</div><div class='add'>+end:</div><div class='add'>+	ql_sem_unlock(qdev, qdev-&gt;xg_sem_mask);</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Get the next large buffer. */</div><div class='add'>+struct bq_desc *ql_get_curr_lbuf(struct rx_ring *rx_ring)</div><div class='add'>+{</div><div class='add'>+	struct bq_desc *lbq_desc = &amp;rx_ring-&gt;lbq[rx_ring-&gt;lbq_curr_idx];</div><div class='add'>+	rx_ring-&gt;lbq_curr_idx++;</div><div class='add'>+	if (rx_ring-&gt;lbq_curr_idx == rx_ring-&gt;lbq_len)</div><div class='add'>+		rx_ring-&gt;lbq_curr_idx = 0;</div><div class='add'>+	rx_ring-&gt;lbq_free_cnt++;</div><div class='add'>+	return lbq_desc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Get the next small buffer. */</div><div class='add'>+struct bq_desc *ql_get_curr_sbuf(struct rx_ring *rx_ring)</div><div class='add'>+{</div><div class='add'>+	struct bq_desc *sbq_desc = &amp;rx_ring-&gt;sbq[rx_ring-&gt;sbq_curr_idx];</div><div class='add'>+	rx_ring-&gt;sbq_curr_idx++;</div><div class='add'>+	if (rx_ring-&gt;sbq_curr_idx == rx_ring-&gt;sbq_len)</div><div class='add'>+		rx_ring-&gt;sbq_curr_idx = 0;</div><div class='add'>+	rx_ring-&gt;sbq_free_cnt++;</div><div class='add'>+	return sbq_desc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Update an rx ring index. */</div><div class='add'>+static void ql_update_cq(struct rx_ring *rx_ring)</div><div class='add'>+{</div><div class='add'>+	rx_ring-&gt;cnsmr_idx++;</div><div class='add'>+	rx_ring-&gt;curr_entry++;</div><div class='add'>+	if (unlikely(rx_ring-&gt;cnsmr_idx == rx_ring-&gt;cq_len)) {</div><div class='add'>+		rx_ring-&gt;cnsmr_idx = 0;</div><div class='add'>+		rx_ring-&gt;curr_entry = rx_ring-&gt;cq_base;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ql_write_cq_idx(struct rx_ring *rx_ring)</div><div class='add'>+{</div><div class='add'>+	ql_write_db_reg(rx_ring-&gt;cnsmr_idx, rx_ring-&gt;cnsmr_idx_db_reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Process (refill) a large buffer queue. */</div><div class='add'>+static void ql_update_lbq(struct ql_adapter *qdev, struct rx_ring *rx_ring)</div><div class='add'>+{</div><div class='add'>+	int clean_idx = rx_ring-&gt;lbq_clean_idx;</div><div class='add'>+	struct bq_desc *lbq_desc;</div><div class='add'>+	struct bq_element *bq;</div><div class='add'>+	u64 map;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	while (rx_ring-&gt;lbq_free_cnt &gt; 16) {</div><div class='add'>+		for (i = 0; i &lt; 16; i++) {</div><div class='add'>+			QPRINTK(qdev, RX_STATUS, DEBUG,</div><div class='add'>+				"lbq: try cleaning clean_idx = %d.\n",</div><div class='add'>+				clean_idx);</div><div class='add'>+			lbq_desc = &amp;rx_ring-&gt;lbq[clean_idx];</div><div class='add'>+			bq = lbq_desc-&gt;bq;</div><div class='add'>+			if (lbq_desc-&gt;p.lbq_page == NULL) {</div><div class='add'>+				QPRINTK(qdev, RX_STATUS, DEBUG,</div><div class='add'>+					"lbq: getting new page for index %d.\n",</div><div class='add'>+					lbq_desc-&gt;index);</div><div class='add'>+				lbq_desc-&gt;p.lbq_page = alloc_page(GFP_ATOMIC);</div><div class='add'>+				if (lbq_desc-&gt;p.lbq_page == NULL) {</div><div class='add'>+					QPRINTK(qdev, RX_STATUS, ERR,</div><div class='add'>+						"Couldn't get a page.\n");</div><div class='add'>+					return;</div><div class='add'>+				}</div><div class='add'>+				map = pci_map_page(qdev-&gt;pdev,</div><div class='add'>+						   lbq_desc-&gt;p.lbq_page,</div><div class='add'>+						   0, PAGE_SIZE,</div><div class='add'>+						   PCI_DMA_FROMDEVICE);</div><div class='add'>+				if (pci_dma_mapping_error(qdev-&gt;pdev, map)) {</div><div class='add'>+					QPRINTK(qdev, RX_STATUS, ERR,</div><div class='add'>+						"PCI mapping failed.\n");</div><div class='add'>+					return;</div><div class='add'>+				}</div><div class='add'>+				pci_unmap_addr_set(lbq_desc, mapaddr, map);</div><div class='add'>+				pci_unmap_len_set(lbq_desc, maplen, PAGE_SIZE);</div><div class='add'>+				bq-&gt;addr_lo =	/*lbq_desc-&gt;addr_lo = */</div><div class='add'>+				    cpu_to_le32(map);</div><div class='add'>+				bq-&gt;addr_hi =	/*lbq_desc-&gt;addr_hi = */</div><div class='add'>+				    cpu_to_le32(map &gt;&gt; 32);</div><div class='add'>+			}</div><div class='add'>+			clean_idx++;</div><div class='add'>+			if (clean_idx == rx_ring-&gt;lbq_len)</div><div class='add'>+				clean_idx = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		rx_ring-&gt;lbq_clean_idx = clean_idx;</div><div class='add'>+		rx_ring-&gt;lbq_prod_idx += 16;</div><div class='add'>+		if (rx_ring-&gt;lbq_prod_idx == rx_ring-&gt;lbq_len)</div><div class='add'>+			rx_ring-&gt;lbq_prod_idx = 0;</div><div class='add'>+		QPRINTK(qdev, RX_STATUS, DEBUG,</div><div class='add'>+			"lbq: updating prod idx = %d.\n",</div><div class='add'>+			rx_ring-&gt;lbq_prod_idx);</div><div class='add'>+		ql_write_db_reg(rx_ring-&gt;lbq_prod_idx,</div><div class='add'>+				rx_ring-&gt;lbq_prod_idx_db_reg);</div><div class='add'>+		rx_ring-&gt;lbq_free_cnt -= 16;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Process (refill) a small buffer queue. */</div><div class='add'>+static void ql_update_sbq(struct ql_adapter *qdev, struct rx_ring *rx_ring)</div><div class='add'>+{</div><div class='add'>+	int clean_idx = rx_ring-&gt;sbq_clean_idx;</div><div class='add'>+	struct bq_desc *sbq_desc;</div><div class='add'>+	struct bq_element *bq;</div><div class='add'>+	u64 map;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	while (rx_ring-&gt;sbq_free_cnt &gt; 16) {</div><div class='add'>+		for (i = 0; i &lt; 16; i++) {</div><div class='add'>+			sbq_desc = &amp;rx_ring-&gt;sbq[clean_idx];</div><div class='add'>+			QPRINTK(qdev, RX_STATUS, DEBUG,</div><div class='add'>+				"sbq: try cleaning clean_idx = %d.\n",</div><div class='add'>+				clean_idx);</div><div class='add'>+			bq = sbq_desc-&gt;bq;</div><div class='add'>+			if (sbq_desc-&gt;p.skb == NULL) {</div><div class='add'>+				QPRINTK(qdev, RX_STATUS, DEBUG,</div><div class='add'>+					"sbq: getting new skb for index %d.\n",</div><div class='add'>+					sbq_desc-&gt;index);</div><div class='add'>+				sbq_desc-&gt;p.skb =</div><div class='add'>+				    netdev_alloc_skb(qdev-&gt;ndev,</div><div class='add'>+						     rx_ring-&gt;sbq_buf_size);</div><div class='add'>+				if (sbq_desc-&gt;p.skb == NULL) {</div><div class='add'>+					QPRINTK(qdev, PROBE, ERR,</div><div class='add'>+						"Couldn't get an skb.\n");</div><div class='add'>+					rx_ring-&gt;sbq_clean_idx = clean_idx;</div><div class='add'>+					return;</div><div class='add'>+				}</div><div class='add'>+				skb_reserve(sbq_desc-&gt;p.skb, QLGE_SB_PAD);</div><div class='add'>+				map = pci_map_single(qdev-&gt;pdev,</div><div class='add'>+						     sbq_desc-&gt;p.skb-&gt;data,</div><div class='add'>+						     rx_ring-&gt;sbq_buf_size /</div><div class='add'>+						     2, PCI_DMA_FROMDEVICE);</div><div class='add'>+				pci_unmap_addr_set(sbq_desc, mapaddr, map);</div><div class='add'>+				pci_unmap_len_set(sbq_desc, maplen,</div><div class='add'>+						  rx_ring-&gt;sbq_buf_size / 2);</div><div class='add'>+				bq-&gt;addr_lo = cpu_to_le32(map);</div><div class='add'>+				bq-&gt;addr_hi = cpu_to_le32(map &gt;&gt; 32);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			clean_idx++;</div><div class='add'>+			if (clean_idx == rx_ring-&gt;sbq_len)</div><div class='add'>+				clean_idx = 0;</div><div class='add'>+		}</div><div class='add'>+		rx_ring-&gt;sbq_clean_idx = clean_idx;</div><div class='add'>+		rx_ring-&gt;sbq_prod_idx += 16;</div><div class='add'>+		if (rx_ring-&gt;sbq_prod_idx == rx_ring-&gt;sbq_len)</div><div class='add'>+			rx_ring-&gt;sbq_prod_idx = 0;</div><div class='add'>+		QPRINTK(qdev, RX_STATUS, DEBUG,</div><div class='add'>+			"sbq: updating prod idx = %d.\n",</div><div class='add'>+			rx_ring-&gt;sbq_prod_idx);</div><div class='add'>+		ql_write_db_reg(rx_ring-&gt;sbq_prod_idx,</div><div class='add'>+				rx_ring-&gt;sbq_prod_idx_db_reg);</div><div class='add'>+</div><div class='add'>+		rx_ring-&gt;sbq_free_cnt -= 16;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ql_update_buffer_queues(struct ql_adapter *qdev,</div><div class='add'>+				    struct rx_ring *rx_ring)</div><div class='add'>+{</div><div class='add'>+	ql_update_sbq(qdev, rx_ring);</div><div class='add'>+	ql_update_lbq(qdev, rx_ring);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Unmaps tx buffers.  Can be called from send() if a pci mapping</div><div class='add'>+ * fails at some stage, or from the interrupt when a tx completes.</div><div class='add'>+ */</div><div class='add'>+static void ql_unmap_send(struct ql_adapter *qdev,</div><div class='add'>+			  struct tx_ring_desc *tx_ring_desc, int mapped)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	for (i = 0; i &lt; mapped; i++) {</div><div class='add'>+		if (i == 0 || (i == 7 &amp;&amp; mapped &gt; 7)) {</div><div class='add'>+			/*</div><div class='add'>+			 * Unmap the skb-&gt;data area, or the</div><div class='add'>+			 * external sglist (AKA the Outbound</div><div class='add'>+			 * Address List (OAL)).</div><div class='add'>+			 * If its the zeroeth element, then it's</div><div class='add'>+			 * the skb-&gt;data area.  If it's the 7th</div><div class='add'>+			 * element and there is more than 6 frags,</div><div class='add'>+			 * then its an OAL.</div><div class='add'>+			 */</div><div class='add'>+			if (i == 7) {</div><div class='add'>+				QPRINTK(qdev, TX_DONE, DEBUG,</div><div class='add'>+					"unmapping OAL area.\n");</div><div class='add'>+			}</div><div class='add'>+			pci_unmap_single(qdev-&gt;pdev,</div><div class='add'>+					 pci_unmap_addr(&amp;tx_ring_desc-&gt;map[i],</div><div class='add'>+							mapaddr),</div><div class='add'>+					 pci_unmap_len(&amp;tx_ring_desc-&gt;map[i],</div><div class='add'>+						       maplen),</div><div class='add'>+					 PCI_DMA_TODEVICE);</div><div class='add'>+		} else {</div><div class='add'>+			QPRINTK(qdev, TX_DONE, DEBUG, "unmapping frag %d.\n",</div><div class='add'>+				i);</div><div class='add'>+			pci_unmap_page(qdev-&gt;pdev,</div><div class='add'>+				       pci_unmap_addr(&amp;tx_ring_desc-&gt;map[i],</div><div class='add'>+						      mapaddr),</div><div class='add'>+				       pci_unmap_len(&amp;tx_ring_desc-&gt;map[i],</div><div class='add'>+						     maplen), PCI_DMA_TODEVICE);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Map the buffers for this transmit.  This will return</div><div class='add'>+ * NETDEV_TX_BUSY or NETDEV_TX_OK based on success.</div><div class='add'>+ */</div><div class='add'>+static int ql_map_send(struct ql_adapter *qdev,</div><div class='add'>+		       struct ob_mac_iocb_req *mac_iocb_ptr,</div><div class='add'>+		       struct sk_buff *skb, struct tx_ring_desc *tx_ring_desc)</div><div class='add'>+{</div><div class='add'>+	int len = skb_headlen(skb);</div><div class='add'>+	dma_addr_t map;</div><div class='add'>+	int frag_idx, err, map_idx = 0;</div><div class='add'>+	struct tx_buf_desc *tbd = mac_iocb_ptr-&gt;tbd;</div><div class='add'>+	int frag_cnt = skb_shinfo(skb)-&gt;nr_frags;</div><div class='add'>+</div><div class='add'>+	if (frag_cnt) {</div><div class='add'>+		QPRINTK(qdev, TX_QUEUED, DEBUG, "frag_cnt = %d.\n", frag_cnt);</div><div class='add'>+	}</div><div class='add'>+	/*</div><div class='add'>+	 * Map the skb buffer first.</div><div class='add'>+	 */</div><div class='add'>+	map = pci_map_single(qdev-&gt;pdev, skb-&gt;data, len, PCI_DMA_TODEVICE);</div><div class='add'>+</div><div class='add'>+	err = pci_dma_mapping_error(qdev-&gt;pdev, map);</div><div class='add'>+	if (err) {</div><div class='add'>+		QPRINTK(qdev, TX_QUEUED, ERR,</div><div class='add'>+			"PCI mapping failed with error: %d\n", err);</div><div class='add'>+</div><div class='add'>+		return NETDEV_TX_BUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tbd-&gt;len = cpu_to_le32(len);</div><div class='add'>+	tbd-&gt;addr = cpu_to_le64(map);</div><div class='add'>+	pci_unmap_addr_set(&amp;tx_ring_desc-&gt;map[map_idx], mapaddr, map);</div><div class='add'>+	pci_unmap_len_set(&amp;tx_ring_desc-&gt;map[map_idx], maplen, len);</div><div class='add'>+	map_idx++;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * This loop fills the remainder of the 8 address descriptors</div><div class='add'>+	 * in the IOCB.  If there are more than 7 fragments, then the</div><div class='add'>+	 * eighth address desc will point to an external list (OAL).</div><div class='add'>+	 * When this happens, the remainder of the frags will be stored</div><div class='add'>+	 * in this list.</div><div class='add'>+	 */</div><div class='add'>+	for (frag_idx = 0; frag_idx &lt; frag_cnt; frag_idx++, map_idx++) {</div><div class='add'>+		skb_frag_t *frag = &amp;skb_shinfo(skb)-&gt;frags[frag_idx];</div><div class='add'>+		tbd++;</div><div class='add'>+		if (frag_idx == 6 &amp;&amp; frag_cnt &gt; 7) {</div><div class='add'>+			/* Let's tack on an sglist.</div><div class='add'>+			 * Our control block will now</div><div class='add'>+			 * look like this:</div><div class='add'>+			 * iocb-&gt;seg[0] = skb-&gt;data</div><div class='add'>+			 * iocb-&gt;seg[1] = frag[0]</div><div class='add'>+			 * iocb-&gt;seg[2] = frag[1]</div><div class='add'>+			 * iocb-&gt;seg[3] = frag[2]</div><div class='add'>+			 * iocb-&gt;seg[4] = frag[3]</div><div class='add'>+			 * iocb-&gt;seg[5] = frag[4]</div><div class='add'>+			 * iocb-&gt;seg[6] = frag[5]</div><div class='add'>+			 * iocb-&gt;seg[7] = ptr to OAL (external sglist)</div><div class='add'>+			 * oal-&gt;seg[0] = frag[6]</div><div class='add'>+			 * oal-&gt;seg[1] = frag[7]</div><div class='add'>+			 * oal-&gt;seg[2] = frag[8]</div><div class='add'>+			 * oal-&gt;seg[3] = frag[9]</div><div class='add'>+			 * oal-&gt;seg[4] = frag[10]</div><div class='add'>+			 *      etc...</div><div class='add'>+			 */</div><div class='add'>+			/* Tack on the OAL in the eighth segment of IOCB. */</div><div class='add'>+			map = pci_map_single(qdev-&gt;pdev, &amp;tx_ring_desc-&gt;oal,</div><div class='add'>+					     sizeof(struct oal),</div><div class='add'>+					     PCI_DMA_TODEVICE);</div><div class='add'>+			err = pci_dma_mapping_error(qdev-&gt;pdev, map);</div><div class='add'>+			if (err) {</div><div class='add'>+				QPRINTK(qdev, TX_QUEUED, ERR,</div><div class='add'>+					"PCI mapping outbound address list with error: %d\n",</div><div class='add'>+					err);</div><div class='add'>+				goto map_error;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			tbd-&gt;addr = cpu_to_le64(map);</div><div class='add'>+			/*</div><div class='add'>+			 * The length is the number of fragments</div><div class='add'>+			 * that remain to be mapped times the length</div><div class='add'>+			 * of our sglist (OAL).</div><div class='add'>+			 */</div><div class='add'>+			tbd-&gt;len =</div><div class='add'>+			    cpu_to_le32((sizeof(struct tx_buf_desc) *</div><div class='add'>+					 (frag_cnt - frag_idx)) | TX_DESC_C);</div><div class='add'>+			pci_unmap_addr_set(&amp;tx_ring_desc-&gt;map[map_idx], mapaddr,</div><div class='add'>+					   map);</div><div class='add'>+			pci_unmap_len_set(&amp;tx_ring_desc-&gt;map[map_idx], maplen,</div><div class='add'>+					  sizeof(struct oal));</div><div class='add'>+			tbd = (struct tx_buf_desc *)&amp;tx_ring_desc-&gt;oal;</div><div class='add'>+			map_idx++;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		map =</div><div class='add'>+		    pci_map_page(qdev-&gt;pdev, frag-&gt;page,</div><div class='add'>+				 frag-&gt;page_offset, frag-&gt;size,</div><div class='add'>+				 PCI_DMA_TODEVICE);</div><div class='add'>+</div><div class='add'>+		err = pci_dma_mapping_error(qdev-&gt;pdev, map);</div><div class='add'>+		if (err) {</div><div class='add'>+			QPRINTK(qdev, TX_QUEUED, ERR,</div><div class='add'>+				"PCI mapping frags failed with error: %d.\n",</div><div class='add'>+				err);</div><div class='add'>+			goto map_error;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		tbd-&gt;addr = cpu_to_le64(map);</div><div class='add'>+		tbd-&gt;len = cpu_to_le32(frag-&gt;size);</div><div class='add'>+		pci_unmap_addr_set(&amp;tx_ring_desc-&gt;map[map_idx], mapaddr, map);</div><div class='add'>+		pci_unmap_len_set(&amp;tx_ring_desc-&gt;map[map_idx], maplen,</div><div class='add'>+				  frag-&gt;size);</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+	/* Save the number of segments we've mapped. */</div><div class='add'>+	tx_ring_desc-&gt;map_cnt = map_idx;</div><div class='add'>+	/* Terminate the last segment. */</div><div class='add'>+	tbd-&gt;len = cpu_to_le32(le32_to_cpu(tbd-&gt;len) | TX_DESC_E);</div><div class='add'>+	return NETDEV_TX_OK;</div><div class='add'>+</div><div class='add'>+map_error:</div><div class='add'>+	/*</div><div class='add'>+	 * If the first frag mapping failed, then i will be zero.</div><div class='add'>+	 * This causes the unmap of the skb-&gt;data area.  Otherwise</div><div class='add'>+	 * we pass in the number of frags that mapped successfully</div><div class='add'>+	 * so they can be umapped.</div><div class='add'>+	 */</div><div class='add'>+	ql_unmap_send(qdev, tx_ring_desc, map_idx);</div><div class='add'>+	return NETDEV_TX_BUSY;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ql_realign_skb(struct sk_buff *skb, int len)</div><div class='add'>+{</div><div class='add'>+	void *temp_addr = skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	/* Undo the skb_reserve(skb,32) we did before</div><div class='add'>+	 * giving to hardware, and realign data on</div><div class='add'>+	 * a 2-byte boundary.</div><div class='add'>+	 */</div><div class='add'>+	skb-&gt;data -= QLGE_SB_PAD - NET_IP_ALIGN;</div><div class='add'>+	skb-&gt;tail -= QLGE_SB_PAD - NET_IP_ALIGN;</div><div class='add'>+	skb_copy_to_linear_data(skb, temp_addr,</div><div class='add'>+		(unsigned int)len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This function builds an skb for the given inbound</div><div class='add'>+ * completion.  It will be rewritten for readability in the near</div><div class='add'>+ * future, but for not it works well.</div><div class='add'>+ */</div><div class='add'>+static struct sk_buff *ql_build_rx_skb(struct ql_adapter *qdev,</div><div class='add'>+				       struct rx_ring *rx_ring,</div><div class='add'>+				       struct ib_mac_iocb_rsp *ib_mac_rsp)</div><div class='add'>+{</div><div class='add'>+	struct bq_desc *lbq_desc;</div><div class='add'>+	struct bq_desc *sbq_desc;</div><div class='add'>+	struct sk_buff *skb = NULL;</div><div class='add'>+	u32 length = le32_to_cpu(ib_mac_rsp-&gt;data_len);</div><div class='add'>+       u32 hdr_len = le32_to_cpu(ib_mac_rsp-&gt;hdr_len);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Handle the header buffer if present.</div><div class='add'>+	 */</div><div class='add'>+	if (ib_mac_rsp-&gt;flags4 &amp; IB_MAC_IOCB_RSP_HV &amp;&amp;</div><div class='add'>+	    ib_mac_rsp-&gt;flags4 &amp; IB_MAC_IOCB_RSP_HS) {</div><div class='add'>+		QPRINTK(qdev, RX_STATUS, DEBUG, "Header of %d bytes in small buffer.\n", hdr_len);</div><div class='add'>+		/*</div><div class='add'>+		 * Headers fit nicely into a small buffer.</div><div class='add'>+		 */</div><div class='add'>+		sbq_desc = ql_get_curr_sbuf(rx_ring);</div><div class='add'>+		pci_unmap_single(qdev-&gt;pdev,</div><div class='add'>+				pci_unmap_addr(sbq_desc, mapaddr),</div><div class='add'>+				pci_unmap_len(sbq_desc, maplen),</div><div class='add'>+				PCI_DMA_FROMDEVICE);</div><div class='add'>+		skb = sbq_desc-&gt;p.skb;</div><div class='add'>+		ql_realign_skb(skb, hdr_len);</div><div class='add'>+		skb_put(skb, hdr_len);</div><div class='add'>+		sbq_desc-&gt;p.skb = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Handle the data buffer(s).</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(!length)) {	/* Is there data too? */</div><div class='add'>+		QPRINTK(qdev, RX_STATUS, DEBUG,</div><div class='add'>+			"No Data buffer in this packet.\n");</div><div class='add'>+		return skb;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ib_mac_rsp-&gt;flags3 &amp; IB_MAC_IOCB_RSP_DS) {</div><div class='add'>+		if (ib_mac_rsp-&gt;flags4 &amp; IB_MAC_IOCB_RSP_HS) {</div><div class='add'>+			QPRINTK(qdev, RX_STATUS, DEBUG,</div><div class='add'>+				"Headers in small, data of %d bytes in small, combine them.\n", length);</div><div class='add'>+			/*</div><div class='add'>+			 * Data is less than small buffer size so it's</div><div class='add'>+			 * stuffed in a small buffer.</div><div class='add'>+			 * For this case we append the data</div><div class='add'>+			 * from the "data" small buffer to the "header" small</div><div class='add'>+			 * buffer.</div><div class='add'>+			 */</div><div class='add'>+			sbq_desc = ql_get_curr_sbuf(rx_ring);</div><div class='add'>+			pci_dma_sync_single_for_cpu(qdev-&gt;pdev,</div><div class='add'>+						    pci_unmap_addr</div><div class='add'>+						    (sbq_desc, mapaddr),</div><div class='add'>+						    pci_unmap_len</div><div class='add'>+						    (sbq_desc, maplen),</div><div class='add'>+						    PCI_DMA_FROMDEVICE);</div><div class='add'>+			memcpy(skb_put(skb, length),</div><div class='add'>+			       sbq_desc-&gt;p.skb-&gt;data, length);</div><div class='add'>+			pci_dma_sync_single_for_device(qdev-&gt;pdev,</div><div class='add'>+						       pci_unmap_addr</div><div class='add'>+						       (sbq_desc,</div><div class='add'>+							mapaddr),</div><div class='add'>+						       pci_unmap_len</div><div class='add'>+						       (sbq_desc,</div><div class='add'>+							maplen),</div><div class='add'>+						       PCI_DMA_FROMDEVICE);</div><div class='add'>+		} else {</div><div class='add'>+			QPRINTK(qdev, RX_STATUS, DEBUG,</div><div class='add'>+				"%d bytes in a single small buffer.\n", length);</div><div class='add'>+			sbq_desc = ql_get_curr_sbuf(rx_ring);</div><div class='add'>+			skb = sbq_desc-&gt;p.skb;</div><div class='add'>+			ql_realign_skb(skb, length);</div><div class='add'>+			skb_put(skb, length);</div><div class='add'>+			pci_unmap_single(qdev-&gt;pdev,</div><div class='add'>+					 pci_unmap_addr(sbq_desc,</div><div class='add'>+							mapaddr),</div><div class='add'>+					 pci_unmap_len(sbq_desc,</div><div class='add'>+						       maplen),</div><div class='add'>+					 PCI_DMA_FROMDEVICE);</div><div class='add'>+			sbq_desc-&gt;p.skb = NULL;</div><div class='add'>+		}</div><div class='add'>+	} else if (ib_mac_rsp-&gt;flags3 &amp; IB_MAC_IOCB_RSP_DL) {</div><div class='add'>+		if (ib_mac_rsp-&gt;flags4 &amp; IB_MAC_IOCB_RSP_HS) {</div><div class='add'>+			QPRINTK(qdev, RX_STATUS, DEBUG,</div><div class='add'>+				"Header in small, %d bytes in large. Chain large to small!\n", length);</div><div class='add'>+			/*</div><div class='add'>+			 * The data is in a single large buffer.  We</div><div class='add'>+			 * chain it to the header buffer's skb and let</div><div class='add'>+			 * it rip.</div><div class='add'>+			 */</div><div class='add'>+			lbq_desc = ql_get_curr_lbuf(rx_ring);</div><div class='add'>+			pci_unmap_page(qdev-&gt;pdev,</div><div class='add'>+				       pci_unmap_addr(lbq_desc,</div><div class='add'>+						      mapaddr),</div><div class='add'>+				       pci_unmap_len(lbq_desc, maplen),</div><div class='add'>+				       PCI_DMA_FROMDEVICE);</div><div class='add'>+			QPRINTK(qdev, RX_STATUS, DEBUG,</div><div class='add'>+				"Chaining page to skb.\n");</div><div class='add'>+			skb_fill_page_desc(skb, 0, lbq_desc-&gt;p.lbq_page,</div><div class='add'>+					   0, length);</div><div class='add'>+			skb-&gt;len += length;</div><div class='add'>+			skb-&gt;data_len += length;</div><div class='add'>+			skb-&gt;truesize += length;</div><div class='add'>+			lbq_desc-&gt;p.lbq_page = NULL;</div><div class='add'>+		} else {</div><div class='add'>+			/*</div><div class='add'>+			 * The headers and data are in a single large buffer. We</div><div class='add'>+			 * copy it to a new skb and let it go. This can happen with</div><div class='add'>+			 * jumbo mtu on a non-TCP/UDP frame.</div><div class='add'>+			 */</div><div class='add'>+			lbq_desc = ql_get_curr_lbuf(rx_ring);</div><div class='add'>+			skb = netdev_alloc_skb(qdev-&gt;ndev, length);</div><div class='add'>+			if (skb == NULL) {</div><div class='add'>+				QPRINTK(qdev, PROBE, DEBUG,</div><div class='add'>+					"No skb available, drop the packet.\n");</div><div class='add'>+				return NULL;</div><div class='add'>+			}</div><div class='add'>+			skb_reserve(skb, NET_IP_ALIGN);</div><div class='add'>+			QPRINTK(qdev, RX_STATUS, DEBUG,</div><div class='add'>+				"%d bytes of headers and data in large. Chain page to new skb and pull tail.\n", length);</div><div class='add'>+			skb_fill_page_desc(skb, 0, lbq_desc-&gt;p.lbq_page,</div><div class='add'>+					   0, length);</div><div class='add'>+			skb-&gt;len += length;</div><div class='add'>+			skb-&gt;data_len += length;</div><div class='add'>+			skb-&gt;truesize += length;</div><div class='add'>+			length -= length;</div><div class='add'>+			lbq_desc-&gt;p.lbq_page = NULL;</div><div class='add'>+			__pskb_pull_tail(skb,</div><div class='add'>+				(ib_mac_rsp-&gt;flags2 &amp; IB_MAC_IOCB_RSP_V) ?</div><div class='add'>+				VLAN_ETH_HLEN : ETH_HLEN);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		/*</div><div class='add'>+		 * The data is in a chain of large buffers</div><div class='add'>+		 * pointed to by a small buffer.  We loop</div><div class='add'>+		 * thru and chain them to the our small header</div><div class='add'>+		 * buffer's skb.</div><div class='add'>+		 * frags:  There are 18 max frags and our small</div><div class='add'>+		 *         buffer will hold 32 of them. The thing is,</div><div class='add'>+		 *         we'll use 3 max for our 9000 byte jumbo</div><div class='add'>+		 *         frames.  If the MTU goes up we could</div><div class='add'>+		 *          eventually be in trouble.</div><div class='add'>+		 */</div><div class='add'>+		int size, offset, i = 0;</div><div class='add'>+		struct bq_element *bq, bq_array[8];</div><div class='add'>+		sbq_desc = ql_get_curr_sbuf(rx_ring);</div><div class='add'>+		pci_unmap_single(qdev-&gt;pdev,</div><div class='add'>+				 pci_unmap_addr(sbq_desc, mapaddr),</div><div class='add'>+				 pci_unmap_len(sbq_desc, maplen),</div><div class='add'>+				 PCI_DMA_FROMDEVICE);</div><div class='add'>+		if (!(ib_mac_rsp-&gt;flags4 &amp; IB_MAC_IOCB_RSP_HS)) {</div><div class='add'>+			/*</div><div class='add'>+			 * This is an non TCP/UDP IP frame, so</div><div class='add'>+			 * the headers aren't split into a small</div><div class='add'>+			 * buffer.  We have to use the small buffer</div><div class='add'>+			 * that contains our sg list as our skb to</div><div class='add'>+			 * send upstairs. Copy the sg list here to</div><div class='add'>+			 * a local buffer and use it to find the</div><div class='add'>+			 * pages to chain.</div><div class='add'>+			 */</div><div class='add'>+			QPRINTK(qdev, RX_STATUS, DEBUG,</div><div class='add'>+				"%d bytes of headers &amp; data in chain of large.\n", length);</div><div class='add'>+			skb = sbq_desc-&gt;p.skb;</div><div class='add'>+			bq = &amp;bq_array[0];</div><div class='add'>+			memcpy(bq, skb-&gt;data, sizeof(bq_array));</div><div class='add'>+			sbq_desc-&gt;p.skb = NULL;</div><div class='add'>+			skb_reserve(skb, NET_IP_ALIGN);</div><div class='add'>+		} else {</div><div class='add'>+			QPRINTK(qdev, RX_STATUS, DEBUG,</div><div class='add'>+				"Headers in small, %d bytes of data in chain of large.\n", length);</div><div class='add'>+			bq = (struct bq_element *)sbq_desc-&gt;p.skb-&gt;data;</div><div class='add'>+		}</div><div class='add'>+		while (length &gt; 0) {</div><div class='add'>+			lbq_desc = ql_get_curr_lbuf(rx_ring);</div><div class='add'>+			if ((bq-&gt;addr_lo &amp; ~BQ_MASK) != lbq_desc-&gt;bq-&gt;addr_lo) {</div><div class='add'>+				QPRINTK(qdev, RX_STATUS, ERR,</div><div class='add'>+					"Panic!!! bad large buffer address, expected 0x%.08x, got 0x%.08x.\n",</div><div class='add'>+					lbq_desc-&gt;bq-&gt;addr_lo, bq-&gt;addr_lo);</div><div class='add'>+				return NULL;</div><div class='add'>+			}</div><div class='add'>+			pci_unmap_page(qdev-&gt;pdev,</div><div class='add'>+				       pci_unmap_addr(lbq_desc,</div><div class='add'>+						      mapaddr),</div><div class='add'>+				       pci_unmap_len(lbq_desc,</div><div class='add'>+						     maplen),</div><div class='add'>+				       PCI_DMA_FROMDEVICE);</div><div class='add'>+			size = (length &lt; PAGE_SIZE) ? length : PAGE_SIZE;</div><div class='add'>+			offset = 0;</div><div class='add'>+</div><div class='add'>+			QPRINTK(qdev, RX_STATUS, DEBUG,</div><div class='add'>+				"Adding page %d to skb for %d bytes.\n",</div><div class='add'>+				i, size);</div><div class='add'>+			skb_fill_page_desc(skb, i, lbq_desc-&gt;p.lbq_page,</div><div class='add'>+					   offset, size);</div><div class='add'>+			skb-&gt;len += size;</div><div class='add'>+			skb-&gt;data_len += size;</div><div class='add'>+			skb-&gt;truesize += size;</div><div class='add'>+			length -= size;</div><div class='add'>+			lbq_desc-&gt;p.lbq_page = NULL;</div><div class='add'>+			bq++;</div><div class='add'>+			i++;</div><div class='add'>+		}</div><div class='add'>+		__pskb_pull_tail(skb, (ib_mac_rsp-&gt;flags2 &amp; IB_MAC_IOCB_RSP_V) ?</div><div class='add'>+				VLAN_ETH_HLEN : ETH_HLEN);</div><div class='add'>+	}</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Process an inbound completion from an rx ring. */</div><div class='add'>+static void ql_process_mac_rx_intr(struct ql_adapter *qdev,</div><div class='add'>+				   struct rx_ring *rx_ring,</div><div class='add'>+				   struct ib_mac_iocb_rsp *ib_mac_rsp)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ndev = qdev-&gt;ndev;</div><div class='add'>+	struct sk_buff *skb = NULL;</div><div class='add'>+</div><div class='add'>+	QL_DUMP_IB_MAC_RSP(ib_mac_rsp);</div><div class='add'>+</div><div class='add'>+	skb = ql_build_rx_skb(qdev, rx_ring, ib_mac_rsp);</div><div class='add'>+	if (unlikely(!skb)) {</div><div class='add'>+		QPRINTK(qdev, RX_STATUS, DEBUG,</div><div class='add'>+			"No skb available, drop packet.\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	prefetch(skb-&gt;data);</div><div class='add'>+	skb-&gt;dev = ndev;</div><div class='add'>+	if (ib_mac_rsp-&gt;flags1 &amp; IB_MAC_IOCB_RSP_M_MASK) {</div><div class='add'>+		QPRINTK(qdev, RX_STATUS, DEBUG, "%s%s%s Multicast.\n",</div><div class='add'>+			(ib_mac_rsp-&gt;flags1 &amp; IB_MAC_IOCB_RSP_M_MASK) ==</div><div class='add'>+			IB_MAC_IOCB_RSP_M_HASH ? "Hash" : "",</div><div class='add'>+			(ib_mac_rsp-&gt;flags1 &amp; IB_MAC_IOCB_RSP_M_MASK) ==</div><div class='add'>+			IB_MAC_IOCB_RSP_M_REG ? "Registered" : "",</div><div class='add'>+			(ib_mac_rsp-&gt;flags1 &amp; IB_MAC_IOCB_RSP_M_MASK) ==</div><div class='add'>+			IB_MAC_IOCB_RSP_M_PROM ? "Promiscuous" : "");</div><div class='add'>+	}</div><div class='add'>+	if (ib_mac_rsp-&gt;flags2 &amp; IB_MAC_IOCB_RSP_P) {</div><div class='add'>+		QPRINTK(qdev, RX_STATUS, DEBUG, "Promiscuous Packet.\n");</div><div class='add'>+	}</div><div class='add'>+	if (ib_mac_rsp-&gt;flags1 &amp; (IB_MAC_IOCB_RSP_IE | IB_MAC_IOCB_RSP_TE)) {</div><div class='add'>+		QPRINTK(qdev, RX_STATUS, ERR,</div><div class='add'>+			"Bad checksum for this %s packet.\n",</div><div class='add'>+			((ib_mac_rsp-&gt;</div><div class='add'>+			  flags2 &amp; IB_MAC_IOCB_RSP_T) ? "TCP" : "UDP"));</div><div class='add'>+		skb-&gt;ip_summed = CHECKSUM_NONE;</div><div class='add'>+	} else if (qdev-&gt;rx_csum &amp;&amp;</div><div class='add'>+		   ((ib_mac_rsp-&gt;flags2 &amp; IB_MAC_IOCB_RSP_T) ||</div><div class='add'>+		    ((ib_mac_rsp-&gt;flags2 &amp; IB_MAC_IOCB_RSP_U) &amp;&amp;</div><div class='add'>+		     !(ib_mac_rsp-&gt;flags1 &amp; IB_MAC_IOCB_RSP_NU)))) {</div><div class='add'>+		QPRINTK(qdev, RX_STATUS, DEBUG, "RX checksum done!\n");</div><div class='add'>+		skb-&gt;ip_summed = CHECKSUM_UNNECESSARY;</div><div class='add'>+	}</div><div class='add'>+	qdev-&gt;stats.rx_packets++;</div><div class='add'>+	qdev-&gt;stats.rx_bytes += skb-&gt;len;</div><div class='add'>+	skb-&gt;protocol = eth_type_trans(skb, ndev);</div><div class='add'>+	if (qdev-&gt;vlgrp &amp;&amp; (ib_mac_rsp-&gt;flags2 &amp; IB_MAC_IOCB_RSP_V)) {</div><div class='add'>+		QPRINTK(qdev, RX_STATUS, DEBUG,</div><div class='add'>+			"Passing a VLAN packet upstream.\n");</div><div class='add'>+		vlan_hwaccel_rx(skb, qdev-&gt;vlgrp,</div><div class='add'>+				le16_to_cpu(ib_mac_rsp-&gt;vlan_id));</div><div class='add'>+	} else {</div><div class='add'>+		QPRINTK(qdev, RX_STATUS, DEBUG,</div><div class='add'>+			"Passing a normal packet upstream.\n");</div><div class='add'>+		netif_rx(skb);</div><div class='add'>+	}</div><div class='add'>+	ndev-&gt;last_rx = jiffies;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Process an outbound completion from an rx ring. */</div><div class='add'>+static void ql_process_mac_tx_intr(struct ql_adapter *qdev,</div><div class='add'>+				   struct ob_mac_iocb_rsp *mac_rsp)</div><div class='add'>+{</div><div class='add'>+	struct tx_ring *tx_ring;</div><div class='add'>+	struct tx_ring_desc *tx_ring_desc;</div><div class='add'>+</div><div class='add'>+	QL_DUMP_OB_MAC_RSP(mac_rsp);</div><div class='add'>+	tx_ring = &amp;qdev-&gt;tx_ring[mac_rsp-&gt;txq_idx];</div><div class='add'>+	tx_ring_desc = &amp;tx_ring-&gt;q[mac_rsp-&gt;tid];</div><div class='add'>+	ql_unmap_send(qdev, tx_ring_desc, tx_ring_desc-&gt;map_cnt);</div><div class='add'>+	qdev-&gt;stats.tx_bytes += tx_ring_desc-&gt;map_cnt;</div><div class='add'>+	qdev-&gt;stats.tx_packets++;</div><div class='add'>+	dev_kfree_skb(tx_ring_desc-&gt;skb);</div><div class='add'>+	tx_ring_desc-&gt;skb = NULL;</div><div class='add'>+</div><div class='add'>+	if (unlikely(mac_rsp-&gt;flags1 &amp; (OB_MAC_IOCB_RSP_E |</div><div class='add'>+					OB_MAC_IOCB_RSP_S |</div><div class='add'>+					OB_MAC_IOCB_RSP_L |</div><div class='add'>+					OB_MAC_IOCB_RSP_P | OB_MAC_IOCB_RSP_B))) {</div><div class='add'>+		if (mac_rsp-&gt;flags1 &amp; OB_MAC_IOCB_RSP_E) {</div><div class='add'>+			QPRINTK(qdev, TX_DONE, WARNING,</div><div class='add'>+				"Total descriptor length did not match transfer length.\n");</div><div class='add'>+		}</div><div class='add'>+		if (mac_rsp-&gt;flags1 &amp; OB_MAC_IOCB_RSP_S) {</div><div class='add'>+			QPRINTK(qdev, TX_DONE, WARNING,</div><div class='add'>+				"Frame too short to be legal, not sent.\n");</div><div class='add'>+		}</div><div class='add'>+		if (mac_rsp-&gt;flags1 &amp; OB_MAC_IOCB_RSP_L) {</div><div class='add'>+			QPRINTK(qdev, TX_DONE, WARNING,</div><div class='add'>+				"Frame too long, but sent anyway.\n");</div><div class='add'>+		}</div><div class='add'>+		if (mac_rsp-&gt;flags1 &amp; OB_MAC_IOCB_RSP_B) {</div><div class='add'>+			QPRINTK(qdev, TX_DONE, WARNING,</div><div class='add'>+				"PCI backplane error. Frame not sent.\n");</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	atomic_inc(&amp;tx_ring-&gt;tx_count);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Fire up a handler to reset the MPI processor. */</div><div class='add'>+void ql_queue_fw_error(struct ql_adapter *qdev)</div><div class='add'>+{</div><div class='add'>+	netif_stop_queue(qdev-&gt;ndev);</div><div class='add'>+	netif_carrier_off(qdev-&gt;ndev);</div><div class='add'>+	queue_delayed_work(qdev-&gt;workqueue, &amp;qdev-&gt;mpi_reset_work, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ql_queue_asic_error(struct ql_adapter *qdev)</div><div class='add'>+{</div><div class='add'>+	netif_stop_queue(qdev-&gt;ndev);</div><div class='add'>+	netif_carrier_off(qdev-&gt;ndev);</div><div class='add'>+	ql_disable_interrupts(qdev);</div><div class='add'>+	queue_delayed_work(qdev-&gt;workqueue, &amp;qdev-&gt;asic_reset_work, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ql_process_chip_ae_intr(struct ql_adapter *qdev,</div><div class='add'>+				    struct ib_ae_iocb_rsp *ib_ae_rsp)</div><div class='add'>+{</div><div class='add'>+	switch (ib_ae_rsp-&gt;event) {</div><div class='add'>+	case MGMT_ERR_EVENT:</div><div class='add'>+		QPRINTK(qdev, RX_ERR, ERR,</div><div class='add'>+			"Management Processor Fatal Error.\n");</div><div class='add'>+		ql_queue_fw_error(qdev);</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	case CAM_LOOKUP_ERR_EVENT:</div><div class='add'>+		QPRINTK(qdev, LINK, ERR,</div><div class='add'>+			"Multiple CAM hits lookup occurred.\n");</div><div class='add'>+		QPRINTK(qdev, DRV, ERR, "This event shouldn't occur.\n");</div><div class='add'>+		ql_queue_asic_error(qdev);</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	case SOFT_ECC_ERROR_EVENT:</div><div class='add'>+		QPRINTK(qdev, RX_ERR, ERR, "Soft ECC error detected.\n");</div><div class='add'>+		ql_queue_asic_error(qdev);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case PCI_ERR_ANON_BUF_RD:</div><div class='add'>+		QPRINTK(qdev, RX_ERR, ERR,</div><div class='add'>+			"PCI error occurred when reading anonymous buffers from rx_ring %d.\n",</div><div class='add'>+			ib_ae_rsp-&gt;q_id);</div><div class='add'>+		ql_queue_asic_error(qdev);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		QPRINTK(qdev, DRV, ERR, "Unexpected event %d.\n",</div><div class='add'>+			ib_ae_rsp-&gt;event);</div><div class='add'>+		ql_queue_asic_error(qdev);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ql_clean_outbound_rx_ring(struct rx_ring *rx_ring)</div><div class='add'>+{</div><div class='add'>+	struct ql_adapter *qdev = rx_ring-&gt;qdev;</div><div class='add'>+	u32 prod = ql_read_sh_reg(rx_ring-&gt;prod_idx_sh_reg);</div><div class='add'>+	struct ob_mac_iocb_rsp *net_rsp = NULL;</div><div class='add'>+	int count = 0;</div><div class='add'>+</div><div class='add'>+	/* While there are entries in the completion queue. */</div><div class='add'>+	while (prod != rx_ring-&gt;cnsmr_idx) {</div><div class='add'>+</div><div class='add'>+		QPRINTK(qdev, RX_STATUS, DEBUG,</div><div class='add'>+			"cq_id = %d, prod = %d, cnsmr = %d.\n.", rx_ring-&gt;cq_id,</div><div class='add'>+			prod, rx_ring-&gt;cnsmr_idx);</div><div class='add'>+</div><div class='add'>+		net_rsp = (struct ob_mac_iocb_rsp *)rx_ring-&gt;curr_entry;</div><div class='add'>+		rmb();</div><div class='add'>+		switch (net_rsp-&gt;opcode) {</div><div class='add'>+</div><div class='add'>+		case OPCODE_OB_MAC_TSO_IOCB:</div><div class='add'>+		case OPCODE_OB_MAC_IOCB:</div><div class='add'>+			ql_process_mac_tx_intr(qdev, net_rsp);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			QPRINTK(qdev, RX_STATUS, DEBUG,</div><div class='add'>+				"Hit default case, not handled! dropping the packet, opcode = %x.\n",</div><div class='add'>+				net_rsp-&gt;opcode);</div><div class='add'>+		}</div><div class='add'>+		count++;</div><div class='add'>+		ql_update_cq(rx_ring);</div><div class='add'>+		prod = ql_read_sh_reg(rx_ring-&gt;prod_idx_sh_reg);</div><div class='add'>+	}</div><div class='add'>+	ql_write_cq_idx(rx_ring);</div><div class='add'>+	if (netif_queue_stopped(qdev-&gt;ndev) &amp;&amp; net_rsp != NULL) {</div><div class='add'>+		struct tx_ring *tx_ring = &amp;qdev-&gt;tx_ring[net_rsp-&gt;txq_idx];</div><div class='add'>+		if (atomic_read(&amp;tx_ring-&gt;queue_stopped) &amp;&amp;</div><div class='add'>+		    (atomic_read(&amp;tx_ring-&gt;tx_count) &gt; (tx_ring-&gt;wq_len / 4)))</div><div class='add'>+			/*</div><div class='add'>+			 * The queue got stopped because the tx_ring was full.</div><div class='add'>+			 * Wake it up, because it's now at least 25% empty.</div><div class='add'>+			 */</div><div class='add'>+			netif_wake_queue(qdev-&gt;ndev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ql_clean_inbound_rx_ring(struct rx_ring *rx_ring, int budget)</div><div class='add'>+{</div><div class='add'>+	struct ql_adapter *qdev = rx_ring-&gt;qdev;</div><div class='add'>+	u32 prod = ql_read_sh_reg(rx_ring-&gt;prod_idx_sh_reg);</div><div class='add'>+	struct ql_net_rsp_iocb *net_rsp;</div><div class='add'>+	int count = 0;</div><div class='add'>+</div><div class='add'>+	/* While there are entries in the completion queue. */</div><div class='add'>+	while (prod != rx_ring-&gt;cnsmr_idx) {</div><div class='add'>+</div><div class='add'>+		QPRINTK(qdev, RX_STATUS, DEBUG,</div><div class='add'>+			"cq_id = %d, prod = %d, cnsmr = %d.\n.", rx_ring-&gt;cq_id,</div><div class='add'>+			prod, rx_ring-&gt;cnsmr_idx);</div><div class='add'>+</div><div class='add'>+		net_rsp = rx_ring-&gt;curr_entry;</div><div class='add'>+		rmb();</div><div class='add'>+		switch (net_rsp-&gt;opcode) {</div><div class='add'>+		case OPCODE_IB_MAC_IOCB:</div><div class='add'>+			ql_process_mac_rx_intr(qdev, rx_ring,</div><div class='add'>+					       (struct ib_mac_iocb_rsp *)</div><div class='add'>+					       net_rsp);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case OPCODE_IB_AE_IOCB:</div><div class='add'>+			ql_process_chip_ae_intr(qdev, (struct ib_ae_iocb_rsp *)</div><div class='add'>+						net_rsp);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			{</div><div class='add'>+				QPRINTK(qdev, RX_STATUS, DEBUG,</div><div class='add'>+					"Hit default case, not handled! dropping the packet, opcode = %x.\n",</div><div class='add'>+					net_rsp-&gt;opcode);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		count++;</div><div class='add'>+		ql_update_cq(rx_ring);</div><div class='add'>+		prod = ql_read_sh_reg(rx_ring-&gt;prod_idx_sh_reg);</div><div class='add'>+		if (count == budget)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	ql_update_buffer_queues(qdev, rx_ring);</div><div class='add'>+	ql_write_cq_idx(rx_ring);</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ql_napi_poll_msix(struct napi_struct *napi, int budget)</div><div class='add'>+{</div><div class='add'>+	struct rx_ring *rx_ring = container_of(napi, struct rx_ring, napi);</div><div class='add'>+	struct ql_adapter *qdev = rx_ring-&gt;qdev;</div><div class='add'>+	int work_done = ql_clean_inbound_rx_ring(rx_ring, budget);</div><div class='add'>+</div><div class='add'>+	QPRINTK(qdev, RX_STATUS, DEBUG, "Enter, NAPI POLL cq_id = %d.\n",</div><div class='add'>+		rx_ring-&gt;cq_id);</div><div class='add'>+</div><div class='add'>+	if (work_done &lt; budget) {</div><div class='add'>+		__netif_rx_complete(qdev-&gt;ndev, napi);</div><div class='add'>+		ql_enable_completion_interrupt(qdev, rx_ring-&gt;irq);</div><div class='add'>+	}</div><div class='add'>+	return work_done;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ql_vlan_rx_register(struct net_device *ndev, struct vlan_group *grp)</div><div class='add'>+{</div><div class='add'>+	struct ql_adapter *qdev = netdev_priv(ndev);</div><div class='add'>+</div><div class='add'>+	qdev-&gt;vlgrp = grp;</div><div class='add'>+	if (grp) {</div><div class='add'>+		QPRINTK(qdev, IFUP, DEBUG, "Turning on VLAN in NIC_RCV_CFG.\n");</div><div class='add'>+		ql_write32(qdev, NIC_RCV_CFG, NIC_RCV_CFG_VLAN_MASK |</div><div class='add'>+			   NIC_RCV_CFG_VLAN_MATCH_AND_NON);</div><div class='add'>+	} else {</div><div class='add'>+		QPRINTK(qdev, IFUP, DEBUG,</div><div class='add'>+			"Turning off VLAN in NIC_RCV_CFG.\n");</div><div class='add'>+		ql_write32(qdev, NIC_RCV_CFG, NIC_RCV_CFG_VLAN_MASK);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ql_vlan_rx_add_vid(struct net_device *ndev, u16 vid)</div><div class='add'>+{</div><div class='add'>+	struct ql_adapter *qdev = netdev_priv(ndev);</div><div class='add'>+	u32 enable_bit = MAC_ADDR_E;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;qdev-&gt;hw_lock);</div><div class='add'>+	if (ql_set_mac_addr_reg</div><div class='add'>+	    (qdev, (u8 *) &amp;enable_bit, MAC_ADDR_TYPE_VLAN, vid)) {</div><div class='add'>+		QPRINTK(qdev, IFUP, ERR, "Failed to init vlan address.\n");</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;qdev-&gt;hw_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ql_vlan_rx_kill_vid(struct net_device *ndev, u16 vid)</div><div class='add'>+{</div><div class='add'>+	struct ql_adapter *qdev = netdev_priv(ndev);</div><div class='add'>+	u32 enable_bit = 0;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;qdev-&gt;hw_lock);</div><div class='add'>+	if (ql_set_mac_addr_reg</div><div class='add'>+	    (qdev, (u8 *) &amp;enable_bit, MAC_ADDR_TYPE_VLAN, vid)) {</div><div class='add'>+		QPRINTK(qdev, IFUP, ERR, "Failed to clear vlan address.\n");</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;qdev-&gt;hw_lock);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Worker thread to process a given rx_ring that is dedicated</div><div class='add'>+ * to outbound completions.</div><div class='add'>+ */</div><div class='add'>+static void ql_tx_clean(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct rx_ring *rx_ring =</div><div class='add'>+	    container_of(work, struct rx_ring, rx_work.work);</div><div class='add'>+	ql_clean_outbound_rx_ring(rx_ring);</div><div class='add'>+	ql_enable_completion_interrupt(rx_ring-&gt;qdev, rx_ring-&gt;irq);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Worker thread to process a given rx_ring that is dedicated</div><div class='add'>+ * to inbound completions.</div><div class='add'>+ */</div><div class='add'>+static void ql_rx_clean(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct rx_ring *rx_ring =</div><div class='add'>+	    container_of(work, struct rx_ring, rx_work.work);</div><div class='add'>+	ql_clean_inbound_rx_ring(rx_ring, 64);</div><div class='add'>+	ql_enable_completion_interrupt(rx_ring-&gt;qdev, rx_ring-&gt;irq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* MSI-X Multiple Vector Interrupt Handler for outbound completions. */</div><div class='add'>+static irqreturn_t qlge_msix_tx_isr(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	struct rx_ring *rx_ring = dev_id;</div><div class='add'>+	queue_delayed_work_on(rx_ring-&gt;cpu, rx_ring-&gt;qdev-&gt;q_workqueue,</div><div class='add'>+			      &amp;rx_ring-&gt;rx_work, 0);</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* MSI-X Multiple Vector Interrupt Handler for inbound completions. */</div><div class='add'>+static irqreturn_t qlge_msix_rx_isr(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	struct rx_ring *rx_ring = dev_id;</div><div class='add'>+	struct ql_adapter *qdev = rx_ring-&gt;qdev;</div><div class='add'>+	netif_rx_schedule(qdev-&gt;ndev, &amp;rx_ring-&gt;napi);</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* We check here to see if we're already handling a legacy</div><div class='add'>+ * interrupt.  If we are, then it must belong to another</div><div class='add'>+ * chip with which we're sharing the interrupt line.</div><div class='add'>+ */</div><div class='add'>+int ql_legacy_check(struct ql_adapter *qdev)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	spin_lock(&amp;qdev-&gt;legacy_lock);</div><div class='add'>+	err = atomic_read(&amp;qdev-&gt;intr_context[0].irq_cnt);</div><div class='add'>+	spin_unlock(&amp;qdev-&gt;legacy_lock);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This handles a fatal error, MPI activity, and the default</div><div class='add'>+ * rx_ring in an MSI-X multiple vector environment.</div><div class='add'>+ * In MSI/Legacy environment it also process the rest of</div><div class='add'>+ * the rx_rings.</div><div class='add'>+ */</div><div class='add'>+static irqreturn_t qlge_isr(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	struct rx_ring *rx_ring = dev_id;</div><div class='add'>+	struct ql_adapter *qdev = rx_ring-&gt;qdev;</div><div class='add'>+	struct intr_context *intr_context = &amp;qdev-&gt;intr_context[0];</div><div class='add'>+	u32 var;</div><div class='add'>+	int i;</div><div class='add'>+	int work_done = 0;</div><div class='add'>+</div><div class='add'>+	if (qdev-&gt;legacy_check &amp;&amp; qdev-&gt;legacy_check(qdev)) {</div><div class='add'>+		QPRINTK(qdev, INTR, INFO, "Already busy, not our interrupt.\n");</div><div class='add'>+		return IRQ_NONE;	/* Not our interrupt */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	var = ql_read32(qdev, STS);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Check for fatal error.</div><div class='add'>+	 */</div><div class='add'>+	if (var &amp; STS_FE) {</div><div class='add'>+		ql_queue_asic_error(qdev);</div><div class='add'>+		QPRINTK(qdev, INTR, ERR, "Got fatal error, STS = %x.\n", var);</div><div class='add'>+		var = ql_read32(qdev, ERR_STS);</div><div class='add'>+		QPRINTK(qdev, INTR, ERR,</div><div class='add'>+			"Resetting chip. Error Status Register = 0x%x\n", var);</div><div class='add'>+		return IRQ_HANDLED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Check MPI processor activity.</div><div class='add'>+	 */</div><div class='add'>+	if (var &amp; STS_PI) {</div><div class='add'>+		/*</div><div class='add'>+		 * We've got an async event or mailbox completion.</div><div class='add'>+		 * Handle it and clear the source of the interrupt.</div><div class='add'>+		 */</div><div class='add'>+		QPRINTK(qdev, INTR, ERR, "Got MPI processor interrupt.\n");</div><div class='add'>+		ql_disable_completion_interrupt(qdev, intr_context-&gt;intr);</div><div class='add'>+		queue_delayed_work_on(smp_processor_id(), qdev-&gt;workqueue,</div><div class='add'>+				      &amp;qdev-&gt;mpi_work, 0);</div><div class='add'>+		work_done++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Check the default queue and wake handler if active.</div><div class='add'>+	 */</div><div class='add'>+	rx_ring = &amp;qdev-&gt;rx_ring[0];</div><div class='add'>+	if (ql_read_sh_reg(rx_ring-&gt;prod_idx_sh_reg) != rx_ring-&gt;cnsmr_idx) {</div><div class='add'>+		QPRINTK(qdev, INTR, INFO, "Waking handler for rx_ring[0].\n");</div><div class='add'>+		ql_disable_completion_interrupt(qdev, intr_context-&gt;intr);</div><div class='add'>+		queue_delayed_work_on(smp_processor_id(), qdev-&gt;q_workqueue,</div><div class='add'>+				      &amp;rx_ring-&gt;rx_work, 0);</div><div class='add'>+		work_done++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!test_bit(QL_MSIX_ENABLED, &amp;qdev-&gt;flags)) {</div><div class='add'>+		/*</div><div class='add'>+		 * Start the DPC for each active queue.</div><div class='add'>+		 */</div><div class='add'>+		for (i = 1; i &lt; qdev-&gt;rx_ring_count; i++) {</div><div class='add'>+			rx_ring = &amp;qdev-&gt;rx_ring[i];</div><div class='add'>+			if (ql_read_sh_reg(rx_ring-&gt;prod_idx_sh_reg) !=</div><div class='add'>+			    rx_ring-&gt;cnsmr_idx) {</div><div class='add'>+				QPRINTK(qdev, INTR, INFO,</div><div class='add'>+					"Waking handler for rx_ring[%d].\n", i);</div><div class='add'>+				ql_disable_completion_interrupt(qdev,</div><div class='add'>+								intr_context-&gt;</div><div class='add'>+								intr);</div><div class='add'>+				if (i &lt; qdev-&gt;rss_ring_first_cq_id)</div><div class='add'>+					queue_delayed_work_on(rx_ring-&gt;cpu,</div><div class='add'>+							      qdev-&gt;q_workqueue,</div><div class='add'>+							      &amp;rx_ring-&gt;rx_work,</div><div class='add'>+							      0);</div><div class='add'>+				else</div><div class='add'>+					netif_rx_schedule(qdev-&gt;ndev,</div><div class='add'>+							  &amp;rx_ring-&gt;napi);</div><div class='add'>+				work_done++;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return work_done ? IRQ_HANDLED : IRQ_NONE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ql_tso(struct sk_buff *skb, struct ob_mac_tso_iocb_req *mac_iocb_ptr)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	if (skb_is_gso(skb)) {</div><div class='add'>+		int err;</div><div class='add'>+		if (skb_header_cloned(skb)) {</div><div class='add'>+			err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC);</div><div class='add'>+			if (err)</div><div class='add'>+				return err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		mac_iocb_ptr-&gt;opcode = OPCODE_OB_MAC_TSO_IOCB;</div><div class='add'>+		mac_iocb_ptr-&gt;flags3 |= OB_MAC_TSO_IOCB_IC;</div><div class='add'>+		mac_iocb_ptr-&gt;frame_len = cpu_to_le32((u32) skb-&gt;len);</div><div class='add'>+		mac_iocb_ptr-&gt;total_hdrs_len =</div><div class='add'>+		    cpu_to_le16(skb_transport_offset(skb) + tcp_hdrlen(skb));</div><div class='add'>+		mac_iocb_ptr-&gt;net_trans_offset =</div><div class='add'>+		    cpu_to_le16(skb_network_offset(skb) |</div><div class='add'>+				skb_transport_offset(skb)</div><div class='add'>+				&lt;&lt; OB_MAC_TRANSPORT_HDR_SHIFT);</div><div class='add'>+		mac_iocb_ptr-&gt;mss = cpu_to_le16(skb_shinfo(skb)-&gt;gso_size);</div><div class='add'>+		mac_iocb_ptr-&gt;flags2 |= OB_MAC_TSO_IOCB_LSO;</div><div class='add'>+		if (likely(skb-&gt;protocol == htons(ETH_P_IP))) {</div><div class='add'>+			struct iphdr *iph = ip_hdr(skb);</div><div class='add'>+			iph-&gt;check = 0;</div><div class='add'>+			mac_iocb_ptr-&gt;flags1 |= OB_MAC_TSO_IOCB_IP4;</div><div class='add'>+			tcp_hdr(skb)-&gt;check = ~csum_tcpudp_magic(iph-&gt;saddr,</div><div class='add'>+								 iph-&gt;daddr, 0,</div><div class='add'>+								 IPPROTO_TCP,</div><div class='add'>+								 0);</div><div class='add'>+		} else if (skb-&gt;protocol == htons(ETH_P_IPV6)) {</div><div class='add'>+			mac_iocb_ptr-&gt;flags1 |= OB_MAC_TSO_IOCB_IP6;</div><div class='add'>+			tcp_hdr(skb)-&gt;check =</div><div class='add'>+			    ~csum_ipv6_magic(&amp;ipv6_hdr(skb)-&gt;saddr,</div><div class='add'>+					     &amp;ipv6_hdr(skb)-&gt;daddr,</div><div class='add'>+					     0, IPPROTO_TCP, 0);</div><div class='add'>+		}</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ql_hw_csum_setup(struct sk_buff *skb,</div><div class='add'>+			     struct ob_mac_tso_iocb_req *mac_iocb_ptr)</div><div class='add'>+{</div><div class='add'>+	int len;</div><div class='add'>+	struct iphdr *iph = ip_hdr(skb);</div><div class='add'>+	u16 *check;</div><div class='add'>+	mac_iocb_ptr-&gt;opcode = OPCODE_OB_MAC_TSO_IOCB;</div><div class='add'>+	mac_iocb_ptr-&gt;frame_len = cpu_to_le32((u32) skb-&gt;len);</div><div class='add'>+	mac_iocb_ptr-&gt;net_trans_offset =</div><div class='add'>+		cpu_to_le16(skb_network_offset(skb) |</div><div class='add'>+		skb_transport_offset(skb) &lt;&lt; OB_MAC_TRANSPORT_HDR_SHIFT);</div><div class='add'>+</div><div class='add'>+	mac_iocb_ptr-&gt;flags1 |= OB_MAC_TSO_IOCB_IP4;</div><div class='add'>+	len = (ntohs(iph-&gt;tot_len) - (iph-&gt;ihl &lt;&lt; 2));</div><div class='add'>+	if (likely(iph-&gt;protocol == IPPROTO_TCP)) {</div><div class='add'>+		check = &amp;(tcp_hdr(skb)-&gt;check);</div><div class='add'>+		mac_iocb_ptr-&gt;flags2 |= OB_MAC_TSO_IOCB_TC;</div><div class='add'>+		mac_iocb_ptr-&gt;total_hdrs_len =</div><div class='add'>+		    cpu_to_le16(skb_transport_offset(skb) +</div><div class='add'>+				(tcp_hdr(skb)-&gt;doff &lt;&lt; 2));</div><div class='add'>+	} else {</div><div class='add'>+		check = &amp;(udp_hdr(skb)-&gt;check);</div><div class='add'>+		mac_iocb_ptr-&gt;flags2 |= OB_MAC_TSO_IOCB_UC;</div><div class='add'>+		mac_iocb_ptr-&gt;total_hdrs_len =</div><div class='add'>+		    cpu_to_le16(skb_transport_offset(skb) +</div><div class='add'>+				sizeof(struct udphdr));</div><div class='add'>+	}</div><div class='add'>+	*check = ~csum_tcpudp_magic(iph-&gt;saddr,</div><div class='add'>+				    iph-&gt;daddr, len, iph-&gt;protocol, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qlge_send(struct sk_buff *skb, struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct tx_ring_desc *tx_ring_desc;</div><div class='add'>+	struct ob_mac_iocb_req *mac_iocb_ptr;</div><div class='add'>+	struct ql_adapter *qdev = netdev_priv(ndev);</div><div class='add'>+	int tso;</div><div class='add'>+	struct tx_ring *tx_ring;</div><div class='add'>+	u32 tx_ring_idx = (u32) QL_TXQ_IDX(qdev, skb);</div><div class='add'>+</div><div class='add'>+	tx_ring = &amp;qdev-&gt;tx_ring[tx_ring_idx];</div><div class='add'>+</div><div class='add'>+	if (unlikely(atomic_read(&amp;tx_ring-&gt;tx_count) &lt; 2)) {</div><div class='add'>+		QPRINTK(qdev, TX_QUEUED, INFO,</div><div class='add'>+			"%s: shutting down tx queue %d du to lack of resources.\n",</div><div class='add'>+			__func__, tx_ring_idx);</div><div class='add'>+		netif_stop_queue(ndev);</div><div class='add'>+		atomic_inc(&amp;tx_ring-&gt;queue_stopped);</div><div class='add'>+		return NETDEV_TX_BUSY;</div><div class='add'>+	}</div><div class='add'>+	tx_ring_desc = &amp;tx_ring-&gt;q[tx_ring-&gt;prod_idx];</div><div class='add'>+	mac_iocb_ptr = tx_ring_desc-&gt;queue_entry;</div><div class='add'>+	memset((void *)mac_iocb_ptr, 0, sizeof(mac_iocb_ptr));</div><div class='add'>+	if (ql_map_send(qdev, mac_iocb_ptr, skb, tx_ring_desc) != NETDEV_TX_OK) {</div><div class='add'>+		QPRINTK(qdev, TX_QUEUED, ERR, "Could not map the segments.\n");</div><div class='add'>+		return NETDEV_TX_BUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mac_iocb_ptr-&gt;opcode = OPCODE_OB_MAC_IOCB;</div><div class='add'>+	mac_iocb_ptr-&gt;tid = tx_ring_desc-&gt;index;</div><div class='add'>+	/* We use the upper 32-bits to store the tx queue for this IO.</div><div class='add'>+	 * When we get the completion we can use it to establish the context.</div><div class='add'>+	 */</div><div class='add'>+	mac_iocb_ptr-&gt;txq_idx = tx_ring_idx;</div><div class='add'>+	tx_ring_desc-&gt;skb = skb;</div><div class='add'>+</div><div class='add'>+	mac_iocb_ptr-&gt;frame_len = cpu_to_le16((u16) skb-&gt;len);</div><div class='add'>+</div><div class='add'>+	if (qdev-&gt;vlgrp &amp;&amp; vlan_tx_tag_present(skb)) {</div><div class='add'>+		QPRINTK(qdev, TX_QUEUED, DEBUG, "Adding a vlan tag %d.\n",</div><div class='add'>+			vlan_tx_tag_get(skb));</div><div class='add'>+		mac_iocb_ptr-&gt;flags3 |= OB_MAC_IOCB_V;</div><div class='add'>+		mac_iocb_ptr-&gt;vlan_tci = cpu_to_le16(vlan_tx_tag_get(skb));</div><div class='add'>+	}</div><div class='add'>+	tso = ql_tso(skb, (struct ob_mac_tso_iocb_req *)mac_iocb_ptr);</div><div class='add'>+	if (tso &lt; 0) {</div><div class='add'>+		dev_kfree_skb_any(skb);</div><div class='add'>+		return NETDEV_TX_OK;</div><div class='add'>+	} else if (unlikely(!tso) &amp;&amp; (skb-&gt;ip_summed == CHECKSUM_PARTIAL)) {</div><div class='add'>+		ql_hw_csum_setup(skb,</div><div class='add'>+				 (struct ob_mac_tso_iocb_req *)mac_iocb_ptr);</div><div class='add'>+	}</div><div class='add'>+	QL_DUMP_OB_MAC_IOCB(mac_iocb_ptr);</div><div class='add'>+	tx_ring-&gt;prod_idx++;</div><div class='add'>+	if (tx_ring-&gt;prod_idx == tx_ring-&gt;wq_len)</div><div class='add'>+		tx_ring-&gt;prod_idx = 0;</div><div class='add'>+	wmb();</div><div class='add'>+</div><div class='add'>+	ql_write_db_reg(tx_ring-&gt;prod_idx, tx_ring-&gt;prod_idx_db_reg);</div><div class='add'>+	ndev-&gt;trans_start = jiffies;</div><div class='add'>+	QPRINTK(qdev, TX_QUEUED, DEBUG, "tx queued, slot %d, len %d\n",</div><div class='add'>+		tx_ring-&gt;prod_idx, skb-&gt;len);</div><div class='add'>+</div><div class='add'>+	atomic_dec(&amp;tx_ring-&gt;tx_count);</div><div class='add'>+	return NETDEV_TX_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ql_free_shadow_space(struct ql_adapter *qdev)</div><div class='add'>+{</div><div class='add'>+	if (qdev-&gt;rx_ring_shadow_reg_area) {</div><div class='add'>+		pci_free_consistent(qdev-&gt;pdev,</div><div class='add'>+				    PAGE_SIZE,</div><div class='add'>+				    qdev-&gt;rx_ring_shadow_reg_area,</div><div class='add'>+				    qdev-&gt;rx_ring_shadow_reg_dma);</div><div class='add'>+		qdev-&gt;rx_ring_shadow_reg_area = NULL;</div><div class='add'>+	}</div><div class='add'>+	if (qdev-&gt;tx_ring_shadow_reg_area) {</div><div class='add'>+		pci_free_consistent(qdev-&gt;pdev,</div><div class='add'>+				    PAGE_SIZE,</div><div class='add'>+				    qdev-&gt;tx_ring_shadow_reg_area,</div><div class='add'>+				    qdev-&gt;tx_ring_shadow_reg_dma);</div><div class='add'>+		qdev-&gt;tx_ring_shadow_reg_area = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ql_alloc_shadow_space(struct ql_adapter *qdev)</div><div class='add'>+{</div><div class='add'>+	qdev-&gt;rx_ring_shadow_reg_area =</div><div class='add'>+	    pci_alloc_consistent(qdev-&gt;pdev,</div><div class='add'>+				 PAGE_SIZE, &amp;qdev-&gt;rx_ring_shadow_reg_dma);</div><div class='add'>+	if (qdev-&gt;rx_ring_shadow_reg_area == NULL) {</div><div class='add'>+		QPRINTK(qdev, IFUP, ERR,</div><div class='add'>+			"Allocation of RX shadow space failed.\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	qdev-&gt;tx_ring_shadow_reg_area =</div><div class='add'>+	    pci_alloc_consistent(qdev-&gt;pdev, PAGE_SIZE,</div><div class='add'>+				 &amp;qdev-&gt;tx_ring_shadow_reg_dma);</div><div class='add'>+	if (qdev-&gt;tx_ring_shadow_reg_area == NULL) {</div><div class='add'>+		QPRINTK(qdev, IFUP, ERR,</div><div class='add'>+			"Allocation of TX shadow space failed.\n");</div><div class='add'>+		goto err_wqp_sh_area;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_wqp_sh_area:</div><div class='add'>+	pci_free_consistent(qdev-&gt;pdev,</div><div class='add'>+			    PAGE_SIZE,</div><div class='add'>+			    qdev-&gt;rx_ring_shadow_reg_area,</div><div class='add'>+			    qdev-&gt;rx_ring_shadow_reg_dma);</div><div class='add'>+	return -ENOMEM;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ql_init_tx_ring(struct ql_adapter *qdev, struct tx_ring *tx_ring)</div><div class='add'>+{</div><div class='add'>+	struct tx_ring_desc *tx_ring_desc;</div><div class='add'>+	int i;</div><div class='add'>+	struct ob_mac_iocb_req *mac_iocb_ptr;</div><div class='add'>+</div><div class='add'>+	mac_iocb_ptr = tx_ring-&gt;wq_base;</div><div class='add'>+	tx_ring_desc = tx_ring-&gt;q;</div><div class='add'>+	for (i = 0; i &lt; tx_ring-&gt;wq_len; i++) {</div><div class='add'>+		tx_ring_desc-&gt;index = i;</div><div class='add'>+		tx_ring_desc-&gt;skb = NULL;</div><div class='add'>+		tx_ring_desc-&gt;queue_entry = mac_iocb_ptr;</div><div class='add'>+		mac_iocb_ptr++;</div><div class='add'>+		tx_ring_desc++;</div><div class='add'>+	}</div><div class='add'>+	atomic_set(&amp;tx_ring-&gt;tx_count, tx_ring-&gt;wq_len);</div><div class='add'>+	atomic_set(&amp;tx_ring-&gt;queue_stopped, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ql_free_tx_resources(struct ql_adapter *qdev,</div><div class='add'>+				 struct tx_ring *tx_ring)</div><div class='add'>+{</div><div class='add'>+	if (tx_ring-&gt;wq_base) {</div><div class='add'>+		pci_free_consistent(qdev-&gt;pdev, tx_ring-&gt;wq_size,</div><div class='add'>+				    tx_ring-&gt;wq_base, tx_ring-&gt;wq_base_dma);</div><div class='add'>+		tx_ring-&gt;wq_base = NULL;</div><div class='add'>+	}</div><div class='add'>+	kfree(tx_ring-&gt;q);</div><div class='add'>+	tx_ring-&gt;q = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ql_alloc_tx_resources(struct ql_adapter *qdev,</div><div class='add'>+				 struct tx_ring *tx_ring)</div><div class='add'>+{</div><div class='add'>+	tx_ring-&gt;wq_base =</div><div class='add'>+	    pci_alloc_consistent(qdev-&gt;pdev, tx_ring-&gt;wq_size,</div><div class='add'>+				 &amp;tx_ring-&gt;wq_base_dma);</div><div class='add'>+</div><div class='add'>+	if ((tx_ring-&gt;wq_base == NULL)</div><div class='add'>+	    || tx_ring-&gt;wq_base_dma &amp; (tx_ring-&gt;wq_size - 1)) {</div><div class='add'>+		QPRINTK(qdev, IFUP, ERR, "tx_ring alloc failed.\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	tx_ring-&gt;q =</div><div class='add'>+	    kmalloc(tx_ring-&gt;wq_len * sizeof(struct tx_ring_desc), GFP_KERNEL);</div><div class='add'>+	if (tx_ring-&gt;q == NULL)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+err:</div><div class='add'>+	pci_free_consistent(qdev-&gt;pdev, tx_ring-&gt;wq_size,</div><div class='add'>+			    tx_ring-&gt;wq_base, tx_ring-&gt;wq_base_dma);</div><div class='add'>+	return -ENOMEM;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ql_free_lbq_buffers(struct ql_adapter *qdev, struct rx_ring *rx_ring)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	struct bq_desc *lbq_desc;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; rx_ring-&gt;lbq_len; i++) {</div><div class='add'>+		lbq_desc = &amp;rx_ring-&gt;lbq[i];</div><div class='add'>+		if (lbq_desc-&gt;p.lbq_page) {</div><div class='add'>+			pci_unmap_page(qdev-&gt;pdev,</div><div class='add'>+				       pci_unmap_addr(lbq_desc, mapaddr),</div><div class='add'>+				       pci_unmap_len(lbq_desc, maplen),</div><div class='add'>+				       PCI_DMA_FROMDEVICE);</div><div class='add'>+</div><div class='add'>+			put_page(lbq_desc-&gt;p.lbq_page);</div><div class='add'>+			lbq_desc-&gt;p.lbq_page = NULL;</div><div class='add'>+		}</div><div class='add'>+		lbq_desc-&gt;bq-&gt;addr_lo = 0;</div><div class='add'>+		lbq_desc-&gt;bq-&gt;addr_hi = 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Allocate and map a page for each element of the lbq.</div><div class='add'>+ */</div><div class='add'>+static int ql_alloc_lbq_buffers(struct ql_adapter *qdev,</div><div class='add'>+				struct rx_ring *rx_ring)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	struct bq_desc *lbq_desc;</div><div class='add'>+	u64 map;</div><div class='add'>+	struct bq_element *bq = rx_ring-&gt;lbq_base;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; rx_ring-&gt;lbq_len; i++) {</div><div class='add'>+		lbq_desc = &amp;rx_ring-&gt;lbq[i];</div><div class='add'>+		memset(lbq_desc, 0, sizeof(lbq_desc));</div><div class='add'>+		lbq_desc-&gt;bq = bq;</div><div class='add'>+		lbq_desc-&gt;index = i;</div><div class='add'>+		lbq_desc-&gt;p.lbq_page = alloc_page(GFP_ATOMIC);</div><div class='add'>+		if (unlikely(!lbq_desc-&gt;p.lbq_page)) {</div><div class='add'>+			QPRINTK(qdev, IFUP, ERR, "failed alloc_page().\n");</div><div class='add'>+			goto mem_error;</div><div class='add'>+		} else {</div><div class='add'>+			map = pci_map_page(qdev-&gt;pdev,</div><div class='add'>+					   lbq_desc-&gt;p.lbq_page,</div><div class='add'>+					   0, PAGE_SIZE, PCI_DMA_FROMDEVICE);</div><div class='add'>+			if (pci_dma_mapping_error(qdev-&gt;pdev, map)) {</div><div class='add'>+				QPRINTK(qdev, IFUP, ERR,</div><div class='add'>+					"PCI mapping failed.\n");</div><div class='add'>+				goto mem_error;</div><div class='add'>+			}</div><div class='add'>+			pci_unmap_addr_set(lbq_desc, mapaddr, map);</div><div class='add'>+			pci_unmap_len_set(lbq_desc, maplen, PAGE_SIZE);</div><div class='add'>+			bq-&gt;addr_lo = cpu_to_le32(map);</div><div class='add'>+			bq-&gt;addr_hi = cpu_to_le32(map &gt;&gt; 32);</div><div class='add'>+		}</div><div class='add'>+		bq++;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+mem_error:</div><div class='add'>+	ql_free_lbq_buffers(qdev, rx_ring);</div><div class='add'>+	return -ENOMEM;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ql_free_sbq_buffers(struct ql_adapter *qdev, struct rx_ring *rx_ring)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	struct bq_desc *sbq_desc;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; rx_ring-&gt;sbq_len; i++) {</div><div class='add'>+		sbq_desc = &amp;rx_ring-&gt;sbq[i];</div><div class='add'>+		if (sbq_desc == NULL) {</div><div class='add'>+			QPRINTK(qdev, IFUP, ERR, "sbq_desc %d is NULL.\n", i);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+		if (sbq_desc-&gt;p.skb) {</div><div class='add'>+			pci_unmap_single(qdev-&gt;pdev,</div><div class='add'>+					 pci_unmap_addr(sbq_desc, mapaddr),</div><div class='add'>+					 pci_unmap_len(sbq_desc, maplen),</div><div class='add'>+					 PCI_DMA_FROMDEVICE);</div><div class='add'>+			dev_kfree_skb(sbq_desc-&gt;p.skb);</div><div class='add'>+			sbq_desc-&gt;p.skb = NULL;</div><div class='add'>+		}</div><div class='add'>+		if (sbq_desc-&gt;bq == NULL) {</div><div class='add'>+			QPRINTK(qdev, IFUP, ERR, "sbq_desc-&gt;bq %d is NULL.\n",</div><div class='add'>+				i);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+		sbq_desc-&gt;bq-&gt;addr_lo = 0;</div><div class='add'>+		sbq_desc-&gt;bq-&gt;addr_hi = 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Allocate and map an skb for each element of the sbq. */</div><div class='add'>+static int ql_alloc_sbq_buffers(struct ql_adapter *qdev,</div><div class='add'>+				struct rx_ring *rx_ring)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	struct bq_desc *sbq_desc;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	u64 map;</div><div class='add'>+	struct bq_element *bq = rx_ring-&gt;sbq_base;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; rx_ring-&gt;sbq_len; i++) {</div><div class='add'>+		sbq_desc = &amp;rx_ring-&gt;sbq[i];</div><div class='add'>+		memset(sbq_desc, 0, sizeof(sbq_desc));</div><div class='add'>+		sbq_desc-&gt;index = i;</div><div class='add'>+		sbq_desc-&gt;bq = bq;</div><div class='add'>+		skb = netdev_alloc_skb(qdev-&gt;ndev, rx_ring-&gt;sbq_buf_size);</div><div class='add'>+		if (unlikely(!skb)) {</div><div class='add'>+			/* Better luck next round */</div><div class='add'>+			QPRINTK(qdev, IFUP, ERR,</div><div class='add'>+				"small buff alloc failed for %d bytes at index %d.\n",</div><div class='add'>+				rx_ring-&gt;sbq_buf_size, i);</div><div class='add'>+			goto mem_err;</div><div class='add'>+		}</div><div class='add'>+		skb_reserve(skb, QLGE_SB_PAD);</div><div class='add'>+		sbq_desc-&gt;p.skb = skb;</div><div class='add'>+		/*</div><div class='add'>+		 * Map only half the buffer. Because the</div><div class='add'>+		 * other half may get some data copied to it</div><div class='add'>+		 * when the completion arrives.</div><div class='add'>+		 */</div><div class='add'>+		map = pci_map_single(qdev-&gt;pdev,</div><div class='add'>+				     skb-&gt;data,</div><div class='add'>+				     rx_ring-&gt;sbq_buf_size / 2,</div><div class='add'>+				     PCI_DMA_FROMDEVICE);</div><div class='add'>+		if (pci_dma_mapping_error(qdev-&gt;pdev, map)) {</div><div class='add'>+			QPRINTK(qdev, IFUP, ERR, "PCI mapping failed.\n");</div><div class='add'>+			goto mem_err;</div><div class='add'>+		}</div><div class='add'>+		pci_unmap_addr_set(sbq_desc, mapaddr, map);</div><div class='add'>+		pci_unmap_len_set(sbq_desc, maplen, rx_ring-&gt;sbq_buf_size / 2);</div><div class='add'>+		bq-&gt;addr_lo =	/*sbq_desc-&gt;addr_lo = */</div><div class='add'>+		    cpu_to_le32(map);</div><div class='add'>+		bq-&gt;addr_hi =	/*sbq_desc-&gt;addr_hi = */</div><div class='add'>+		    cpu_to_le32(map &gt;&gt; 32);</div><div class='add'>+		bq++;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+mem_err:</div><div class='add'>+	ql_free_sbq_buffers(qdev, rx_ring);</div><div class='add'>+	return -ENOMEM;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ql_free_rx_resources(struct ql_adapter *qdev,</div><div class='add'>+				 struct rx_ring *rx_ring)</div><div class='add'>+{</div><div class='add'>+	if (rx_ring-&gt;sbq_len)</div><div class='add'>+		ql_free_sbq_buffers(qdev, rx_ring);</div><div class='add'>+	if (rx_ring-&gt;lbq_len)</div><div class='add'>+		ql_free_lbq_buffers(qdev, rx_ring);</div><div class='add'>+</div><div class='add'>+	/* Free the small buffer queue. */</div><div class='add'>+	if (rx_ring-&gt;sbq_base) {</div><div class='add'>+		pci_free_consistent(qdev-&gt;pdev,</div><div class='add'>+				    rx_ring-&gt;sbq_size,</div><div class='add'>+				    rx_ring-&gt;sbq_base, rx_ring-&gt;sbq_base_dma);</div><div class='add'>+		rx_ring-&gt;sbq_base = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Free the small buffer queue control blocks. */</div><div class='add'>+	kfree(rx_ring-&gt;sbq);</div><div class='add'>+	rx_ring-&gt;sbq = NULL;</div><div class='add'>+</div><div class='add'>+	/* Free the large buffer queue. */</div><div class='add'>+	if (rx_ring-&gt;lbq_base) {</div><div class='add'>+		pci_free_consistent(qdev-&gt;pdev,</div><div class='add'>+				    rx_ring-&gt;lbq_size,</div><div class='add'>+				    rx_ring-&gt;lbq_base, rx_ring-&gt;lbq_base_dma);</div><div class='add'>+		rx_ring-&gt;lbq_base = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Free the large buffer queue control blocks. */</div><div class='add'>+	kfree(rx_ring-&gt;lbq);</div><div class='add'>+	rx_ring-&gt;lbq = NULL;</div><div class='add'>+</div><div class='add'>+	/* Free the rx queue. */</div><div class='add'>+	if (rx_ring-&gt;cq_base) {</div><div class='add'>+		pci_free_consistent(qdev-&gt;pdev,</div><div class='add'>+				    rx_ring-&gt;cq_size,</div><div class='add'>+				    rx_ring-&gt;cq_base, rx_ring-&gt;cq_base_dma);</div><div class='add'>+		rx_ring-&gt;cq_base = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Allocate queues and buffers for this completions queue based</div><div class='add'>+ * on the values in the parameter structure. */</div><div class='add'>+static int ql_alloc_rx_resources(struct ql_adapter *qdev,</div><div class='add'>+				 struct rx_ring *rx_ring)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Allocate the completion queue for this rx_ring.</div><div class='add'>+	 */</div><div class='add'>+	rx_ring-&gt;cq_base =</div><div class='add'>+	    pci_alloc_consistent(qdev-&gt;pdev, rx_ring-&gt;cq_size,</div><div class='add'>+				 &amp;rx_ring-&gt;cq_base_dma);</div><div class='add'>+</div><div class='add'>+	if (rx_ring-&gt;cq_base == NULL) {</div><div class='add'>+		QPRINTK(qdev, IFUP, ERR, "rx_ring alloc failed.\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rx_ring-&gt;sbq_len) {</div><div class='add'>+		/*</div><div class='add'>+		 * Allocate small buffer queue.</div><div class='add'>+		 */</div><div class='add'>+		rx_ring-&gt;sbq_base =</div><div class='add'>+		    pci_alloc_consistent(qdev-&gt;pdev, rx_ring-&gt;sbq_size,</div><div class='add'>+					 &amp;rx_ring-&gt;sbq_base_dma);</div><div class='add'>+</div><div class='add'>+		if (rx_ring-&gt;sbq_base == NULL) {</div><div class='add'>+			QPRINTK(qdev, IFUP, ERR,</div><div class='add'>+				"Small buffer queue allocation failed.\n");</div><div class='add'>+			goto err_mem;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Allocate small buffer queue control blocks.</div><div class='add'>+		 */</div><div class='add'>+		rx_ring-&gt;sbq =</div><div class='add'>+		    kmalloc(rx_ring-&gt;sbq_len * sizeof(struct bq_desc),</div><div class='add'>+			    GFP_KERNEL);</div><div class='add'>+		if (rx_ring-&gt;sbq == NULL) {</div><div class='add'>+			QPRINTK(qdev, IFUP, ERR,</div><div class='add'>+				"Small buffer queue control block allocation failed.\n");</div><div class='add'>+			goto err_mem;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (ql_alloc_sbq_buffers(qdev, rx_ring)) {</div><div class='add'>+			QPRINTK(qdev, IFUP, ERR,</div><div class='add'>+				"Small buffer allocation failed.\n");</div><div class='add'>+			goto err_mem;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rx_ring-&gt;lbq_len) {</div><div class='add'>+		/*</div><div class='add'>+		 * Allocate large buffer queue.</div><div class='add'>+		 */</div><div class='add'>+		rx_ring-&gt;lbq_base =</div><div class='add'>+		    pci_alloc_consistent(qdev-&gt;pdev, rx_ring-&gt;lbq_size,</div><div class='add'>+					 &amp;rx_ring-&gt;lbq_base_dma);</div><div class='add'>+</div><div class='add'>+		if (rx_ring-&gt;lbq_base == NULL) {</div><div class='add'>+			QPRINTK(qdev, IFUP, ERR,</div><div class='add'>+				"Large buffer queue allocation failed.\n");</div><div class='add'>+			goto err_mem;</div><div class='add'>+		}</div><div class='add'>+		/*</div><div class='add'>+		 * Allocate large buffer queue control blocks.</div><div class='add'>+		 */</div><div class='add'>+		rx_ring-&gt;lbq =</div><div class='add'>+		    kmalloc(rx_ring-&gt;lbq_len * sizeof(struct bq_desc),</div><div class='add'>+			    GFP_KERNEL);</div><div class='add'>+		if (rx_ring-&gt;lbq == NULL) {</div><div class='add'>+			QPRINTK(qdev, IFUP, ERR,</div><div class='add'>+				"Large buffer queue control block allocation failed.\n");</div><div class='add'>+			goto err_mem;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Allocate the buffers.</div><div class='add'>+		 */</div><div class='add'>+		if (ql_alloc_lbq_buffers(qdev, rx_ring)) {</div><div class='add'>+			QPRINTK(qdev, IFUP, ERR,</div><div class='add'>+				"Large buffer allocation failed.\n");</div><div class='add'>+			goto err_mem;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_mem:</div><div class='add'>+	ql_free_rx_resources(qdev, rx_ring);</div><div class='add'>+	return -ENOMEM;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ql_tx_ring_clean(struct ql_adapter *qdev)</div><div class='add'>+{</div><div class='add'>+	struct tx_ring *tx_ring;</div><div class='add'>+	struct tx_ring_desc *tx_ring_desc;</div><div class='add'>+	int i, j;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Loop through all queues and free</div><div class='add'>+	 * any resources.</div><div class='add'>+	 */</div><div class='add'>+	for (j = 0; j &lt; qdev-&gt;tx_ring_count; j++) {</div><div class='add'>+		tx_ring = &amp;qdev-&gt;tx_ring[j];</div><div class='add'>+		for (i = 0; i &lt; tx_ring-&gt;wq_len; i++) {</div><div class='add'>+			tx_ring_desc = &amp;tx_ring-&gt;q[i];</div><div class='add'>+			if (tx_ring_desc &amp;&amp; tx_ring_desc-&gt;skb) {</div><div class='add'>+				QPRINTK(qdev, IFDOWN, ERR,</div><div class='add'>+				"Freeing lost SKB %p, from queue %d, index %d.\n",</div><div class='add'>+					tx_ring_desc-&gt;skb, j,</div><div class='add'>+					tx_ring_desc-&gt;index);</div><div class='add'>+				ql_unmap_send(qdev, tx_ring_desc,</div><div class='add'>+					      tx_ring_desc-&gt;map_cnt);</div><div class='add'>+				dev_kfree_skb(tx_ring_desc-&gt;skb);</div><div class='add'>+				tx_ring_desc-&gt;skb = NULL;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ql_free_ring_cb(struct ql_adapter *qdev)</div><div class='add'>+{</div><div class='add'>+	kfree(qdev-&gt;ring_mem);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ql_alloc_ring_cb(struct ql_adapter *qdev)</div><div class='add'>+{</div><div class='add'>+	/* Allocate space for tx/rx ring control blocks. */</div><div class='add'>+	qdev-&gt;ring_mem_size =</div><div class='add'>+	    (qdev-&gt;tx_ring_count * sizeof(struct tx_ring)) +</div><div class='add'>+	    (qdev-&gt;rx_ring_count * sizeof(struct rx_ring));</div><div class='add'>+	qdev-&gt;ring_mem = kmalloc(qdev-&gt;ring_mem_size, GFP_KERNEL);</div><div class='add'>+	if (qdev-&gt;ring_mem == NULL) {</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	} else {</div><div class='add'>+		qdev-&gt;rx_ring = qdev-&gt;ring_mem;</div><div class='add'>+		qdev-&gt;tx_ring = qdev-&gt;ring_mem +</div><div class='add'>+		    (qdev-&gt;rx_ring_count * sizeof(struct rx_ring));</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ql_free_mem_resources(struct ql_adapter *qdev)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; qdev-&gt;tx_ring_count; i++)</div><div class='add'>+		ql_free_tx_resources(qdev, &amp;qdev-&gt;tx_ring[i]);</div><div class='add'>+	for (i = 0; i &lt; qdev-&gt;rx_ring_count; i++)</div><div class='add'>+		ql_free_rx_resources(qdev, &amp;qdev-&gt;rx_ring[i]);</div><div class='add'>+	ql_free_shadow_space(qdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ql_alloc_mem_resources(struct ql_adapter *qdev)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* Allocate space for our shadow registers and such. */</div><div class='add'>+	if (ql_alloc_shadow_space(qdev))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; qdev-&gt;rx_ring_count; i++) {</div><div class='add'>+		if (ql_alloc_rx_resources(qdev, &amp;qdev-&gt;rx_ring[i]) != 0) {</div><div class='add'>+			QPRINTK(qdev, IFUP, ERR,</div><div class='add'>+				"RX resource allocation failed.\n");</div><div class='add'>+			goto err_mem;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	/* Allocate tx queue resources */</div><div class='add'>+	for (i = 0; i &lt; qdev-&gt;tx_ring_count; i++) {</div><div class='add'>+		if (ql_alloc_tx_resources(qdev, &amp;qdev-&gt;tx_ring[i]) != 0) {</div><div class='add'>+			QPRINTK(qdev, IFUP, ERR,</div><div class='add'>+				"TX resource allocation failed.\n");</div><div class='add'>+			goto err_mem;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_mem:</div><div class='add'>+	ql_free_mem_resources(qdev);</div><div class='add'>+	return -ENOMEM;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Set up the rx ring control block and pass it to the chip.</div><div class='add'>+ * The control block is defined as</div><div class='add'>+ * "Completion Queue Initialization Control Block", or cqicb.</div><div class='add'>+ */</div><div class='add'>+static int ql_start_rx_ring(struct ql_adapter *qdev, struct rx_ring *rx_ring)</div><div class='add'>+{</div><div class='add'>+	struct cqicb *cqicb = &amp;rx_ring-&gt;cqicb;</div><div class='add'>+	void *shadow_reg = qdev-&gt;rx_ring_shadow_reg_area +</div><div class='add'>+	    (rx_ring-&gt;cq_id * sizeof(u64) * 4);</div><div class='add'>+	u64 shadow_reg_dma = qdev-&gt;rx_ring_shadow_reg_dma +</div><div class='add'>+	    (rx_ring-&gt;cq_id * sizeof(u64) * 4);</div><div class='add'>+	void __iomem *doorbell_area =</div><div class='add'>+	    qdev-&gt;doorbell_area + (DB_PAGE_SIZE * (128 + rx_ring-&gt;cq_id));</div><div class='add'>+	int err = 0;</div><div class='add'>+	u16 bq_len;</div><div class='add'>+</div><div class='add'>+	/* Set up the shadow registers for this ring. */</div><div class='add'>+	rx_ring-&gt;prod_idx_sh_reg = shadow_reg;</div><div class='add'>+	rx_ring-&gt;prod_idx_sh_reg_dma = shadow_reg_dma;</div><div class='add'>+	shadow_reg += sizeof(u64);</div><div class='add'>+	shadow_reg_dma += sizeof(u64);</div><div class='add'>+	rx_ring-&gt;lbq_base_indirect = shadow_reg;</div><div class='add'>+	rx_ring-&gt;lbq_base_indirect_dma = shadow_reg_dma;</div><div class='add'>+	shadow_reg += sizeof(u64);</div><div class='add'>+	shadow_reg_dma += sizeof(u64);</div><div class='add'>+	rx_ring-&gt;sbq_base_indirect = shadow_reg;</div><div class='add'>+	rx_ring-&gt;sbq_base_indirect_dma = shadow_reg_dma;</div><div class='add'>+</div><div class='add'>+	/* PCI doorbell mem area + 0x00 for consumer index register */</div><div class='add'>+	rx_ring-&gt;cnsmr_idx_db_reg = (u32 *) doorbell_area;</div><div class='add'>+	rx_ring-&gt;cnsmr_idx = 0;</div><div class='add'>+	rx_ring-&gt;curr_entry = rx_ring-&gt;cq_base;</div><div class='add'>+</div><div class='add'>+	/* PCI doorbell mem area + 0x04 for valid register */</div><div class='add'>+	rx_ring-&gt;valid_db_reg = doorbell_area + 0x04;</div><div class='add'>+</div><div class='add'>+	/* PCI doorbell mem area + 0x18 for large buffer consumer */</div><div class='add'>+	rx_ring-&gt;lbq_prod_idx_db_reg = (u32 *) (doorbell_area + 0x18);</div><div class='add'>+</div><div class='add'>+	/* PCI doorbell mem area + 0x1c */</div><div class='add'>+	rx_ring-&gt;sbq_prod_idx_db_reg = (u32 *) (doorbell_area + 0x1c);</div><div class='add'>+</div><div class='add'>+	memset((void *)cqicb, 0, sizeof(struct cqicb));</div><div class='add'>+	cqicb-&gt;msix_vect = rx_ring-&gt;irq;</div><div class='add'>+</div><div class='add'>+	cqicb-&gt;len = cpu_to_le16(rx_ring-&gt;cq_len | LEN_V | LEN_CPP_CONT);</div><div class='add'>+</div><div class='add'>+	cqicb-&gt;addr_lo = cpu_to_le32(rx_ring-&gt;cq_base_dma);</div><div class='add'>+	cqicb-&gt;addr_hi = cpu_to_le32((u64) rx_ring-&gt;cq_base_dma &gt;&gt; 32);</div><div class='add'>+</div><div class='add'>+	cqicb-&gt;prod_idx_addr_lo = cpu_to_le32(rx_ring-&gt;prod_idx_sh_reg_dma);</div><div class='add'>+	cqicb-&gt;prod_idx_addr_hi =</div><div class='add'>+	    cpu_to_le32((u64) rx_ring-&gt;prod_idx_sh_reg_dma &gt;&gt; 32);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Set up the control block load flags.</div><div class='add'>+	 */</div><div class='add'>+	cqicb-&gt;flags = FLAGS_LC |	/* Load queue base address */</div><div class='add'>+	    FLAGS_LV |		/* Load MSI-X vector */</div><div class='add'>+	    FLAGS_LI;		/* Load irq delay values */</div><div class='add'>+	if (rx_ring-&gt;lbq_len) {</div><div class='add'>+		cqicb-&gt;flags |= FLAGS_LL;	/* Load lbq values */</div><div class='add'>+		*((u64 *) rx_ring-&gt;lbq_base_indirect) = rx_ring-&gt;lbq_base_dma;</div><div class='add'>+		cqicb-&gt;lbq_addr_lo =</div><div class='add'>+		    cpu_to_le32(rx_ring-&gt;lbq_base_indirect_dma);</div><div class='add'>+		cqicb-&gt;lbq_addr_hi =</div><div class='add'>+		    cpu_to_le32((u64) rx_ring-&gt;lbq_base_indirect_dma &gt;&gt; 32);</div><div class='add'>+		cqicb-&gt;lbq_buf_size = cpu_to_le32(rx_ring-&gt;lbq_buf_size);</div><div class='add'>+		bq_len = (u16) rx_ring-&gt;lbq_len;</div><div class='add'>+		cqicb-&gt;lbq_len = cpu_to_le16(bq_len);</div><div class='add'>+		rx_ring-&gt;lbq_prod_idx = rx_ring-&gt;lbq_len - 16;</div><div class='add'>+		rx_ring-&gt;lbq_curr_idx = 0;</div><div class='add'>+		rx_ring-&gt;lbq_clean_idx = rx_ring-&gt;lbq_prod_idx;</div><div class='add'>+		rx_ring-&gt;lbq_free_cnt = 16;</div><div class='add'>+	}</div><div class='add'>+	if (rx_ring-&gt;sbq_len) {</div><div class='add'>+		cqicb-&gt;flags |= FLAGS_LS;	/* Load sbq values */</div><div class='add'>+		*((u64 *) rx_ring-&gt;sbq_base_indirect) = rx_ring-&gt;sbq_base_dma;</div><div class='add'>+		cqicb-&gt;sbq_addr_lo =</div><div class='add'>+		    cpu_to_le32(rx_ring-&gt;sbq_base_indirect_dma);</div><div class='add'>+		cqicb-&gt;sbq_addr_hi =</div><div class='add'>+		    cpu_to_le32((u64) rx_ring-&gt;sbq_base_indirect_dma &gt;&gt; 32);</div><div class='add'>+		cqicb-&gt;sbq_buf_size =</div><div class='add'>+		    cpu_to_le16(((rx_ring-&gt;sbq_buf_size / 2) + 8) &amp; 0xfffffff8);</div><div class='add'>+		bq_len = (u16) rx_ring-&gt;sbq_len;</div><div class='add'>+		cqicb-&gt;sbq_len = cpu_to_le16(bq_len);</div><div class='add'>+		rx_ring-&gt;sbq_prod_idx = rx_ring-&gt;sbq_len - 16;</div><div class='add'>+		rx_ring-&gt;sbq_curr_idx = 0;</div><div class='add'>+		rx_ring-&gt;sbq_clean_idx = rx_ring-&gt;sbq_prod_idx;</div><div class='add'>+		rx_ring-&gt;sbq_free_cnt = 16;</div><div class='add'>+	}</div><div class='add'>+	switch (rx_ring-&gt;type) {</div><div class='add'>+	case TX_Q:</div><div class='add'>+		/* If there's only one interrupt, then we use</div><div class='add'>+		 * worker threads to process the outbound</div><div class='add'>+		 * completion handling rx_rings. We do this so</div><div class='add'>+		 * they can be run on multiple CPUs. There is</div><div class='add'>+		 * room to play with this more where we would only</div><div class='add'>+		 * run in a worker if there are more than x number</div><div class='add'>+		 * of outbound completions on the queue and more</div><div class='add'>+		 * than one queue active.  Some threshold that</div><div class='add'>+		 * would indicate a benefit in spite of the cost</div><div class='add'>+		 * of a context switch.</div><div class='add'>+		 * If there's more than one interrupt, then the</div><div class='add'>+		 * outbound completions are processed in the ISR.</div><div class='add'>+		 */</div><div class='add'>+		if (!test_bit(QL_MSIX_ENABLED, &amp;qdev-&gt;flags))</div><div class='add'>+			INIT_DELAYED_WORK(&amp;rx_ring-&gt;rx_work, ql_tx_clean);</div><div class='add'>+		else {</div><div class='add'>+			/* With all debug warnings on we see a WARN_ON message</div><div class='add'>+			 * when we free the skb in the interrupt context.</div><div class='add'>+			 */</div><div class='add'>+			INIT_DELAYED_WORK(&amp;rx_ring-&gt;rx_work, ql_tx_clean);</div><div class='add'>+		}</div><div class='add'>+		cqicb-&gt;irq_delay = cpu_to_le16(qdev-&gt;tx_coalesce_usecs);</div><div class='add'>+		cqicb-&gt;pkt_delay = cpu_to_le16(qdev-&gt;tx_max_coalesced_frames);</div><div class='add'>+		break;</div><div class='add'>+	case DEFAULT_Q:</div><div class='add'>+		INIT_DELAYED_WORK(&amp;rx_ring-&gt;rx_work, ql_rx_clean);</div><div class='add'>+		cqicb-&gt;irq_delay = 0;</div><div class='add'>+		cqicb-&gt;pkt_delay = 0;</div><div class='add'>+		break;</div><div class='add'>+	case RX_Q:</div><div class='add'>+		/* Inbound completion handling rx_rings run in</div><div class='add'>+		 * separate NAPI contexts.</div><div class='add'>+		 */</div><div class='add'>+		netif_napi_add(qdev-&gt;ndev, &amp;rx_ring-&gt;napi, ql_napi_poll_msix,</div><div class='add'>+			       64);</div><div class='add'>+		cqicb-&gt;irq_delay = cpu_to_le16(qdev-&gt;rx_coalesce_usecs);</div><div class='add'>+		cqicb-&gt;pkt_delay = cpu_to_le16(qdev-&gt;rx_max_coalesced_frames);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		QPRINTK(qdev, IFUP, DEBUG, "Invalid rx_ring-&gt;type = %d.\n",</div><div class='add'>+			rx_ring-&gt;type);</div><div class='add'>+	}</div><div class='add'>+	QPRINTK(qdev, IFUP, INFO, "Initializing rx work queue.\n");</div><div class='add'>+	err = ql_write_cfg(qdev, cqicb, sizeof(struct cqicb),</div><div class='add'>+			   CFG_LCQ, rx_ring-&gt;cq_id);</div><div class='add'>+	if (err) {</div><div class='add'>+		QPRINTK(qdev, IFUP, ERR, "Failed to load CQICB.\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+	QPRINTK(qdev, IFUP, INFO, "Successfully loaded CQICB.\n");</div><div class='add'>+	/*</div><div class='add'>+	 * Advance the producer index for the buffer queues.</div><div class='add'>+	 */</div><div class='add'>+	wmb();</div><div class='add'>+	if (rx_ring-&gt;lbq_len)</div><div class='add'>+		ql_write_db_reg(rx_ring-&gt;lbq_prod_idx,</div><div class='add'>+				rx_ring-&gt;lbq_prod_idx_db_reg);</div><div class='add'>+	if (rx_ring-&gt;sbq_len)</div><div class='add'>+		ql_write_db_reg(rx_ring-&gt;sbq_prod_idx,</div><div class='add'>+				rx_ring-&gt;sbq_prod_idx_db_reg);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ql_start_tx_ring(struct ql_adapter *qdev, struct tx_ring *tx_ring)</div><div class='add'>+{</div><div class='add'>+	struct wqicb *wqicb = (struct wqicb *)tx_ring;</div><div class='add'>+	void __iomem *doorbell_area =</div><div class='add'>+	    qdev-&gt;doorbell_area + (DB_PAGE_SIZE * tx_ring-&gt;wq_id);</div><div class='add'>+	void *shadow_reg = qdev-&gt;tx_ring_shadow_reg_area +</div><div class='add'>+	    (tx_ring-&gt;wq_id * sizeof(u64));</div><div class='add'>+	u64 shadow_reg_dma = qdev-&gt;tx_ring_shadow_reg_dma +</div><div class='add'>+	    (tx_ring-&gt;wq_id * sizeof(u64));</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Assign doorbell registers for this tx_ring.</div><div class='add'>+	 */</div><div class='add'>+	/* TX PCI doorbell mem area for tx producer index */</div><div class='add'>+	tx_ring-&gt;prod_idx_db_reg = (u32 *) doorbell_area;</div><div class='add'>+	tx_ring-&gt;prod_idx = 0;</div><div class='add'>+	/* TX PCI doorbell mem area + 0x04 */</div><div class='add'>+	tx_ring-&gt;valid_db_reg = doorbell_area + 0x04;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Assign shadow registers for this tx_ring.</div><div class='add'>+	 */</div><div class='add'>+	tx_ring-&gt;cnsmr_idx_sh_reg = shadow_reg;</div><div class='add'>+	tx_ring-&gt;cnsmr_idx_sh_reg_dma = shadow_reg_dma;</div><div class='add'>+</div><div class='add'>+	wqicb-&gt;len = cpu_to_le16(tx_ring-&gt;wq_len | Q_LEN_V | Q_LEN_CPP_CONT);</div><div class='add'>+	wqicb-&gt;flags = cpu_to_le16(Q_FLAGS_LC |</div><div class='add'>+				   Q_FLAGS_LB | Q_FLAGS_LI | Q_FLAGS_LO);</div><div class='add'>+	wqicb-&gt;cq_id_rss = cpu_to_le16(tx_ring-&gt;cq_id);</div><div class='add'>+	wqicb-&gt;rid = 0;</div><div class='add'>+	wqicb-&gt;addr_lo = cpu_to_le32(tx_ring-&gt;wq_base_dma);</div><div class='add'>+	wqicb-&gt;addr_hi = cpu_to_le32((u64) tx_ring-&gt;wq_base_dma &gt;&gt; 32);</div><div class='add'>+</div><div class='add'>+	wqicb-&gt;cnsmr_idx_addr_lo = cpu_to_le32(tx_ring-&gt;cnsmr_idx_sh_reg_dma);</div><div class='add'>+	wqicb-&gt;cnsmr_idx_addr_hi =</div><div class='add'>+	    cpu_to_le32((u64) tx_ring-&gt;cnsmr_idx_sh_reg_dma &gt;&gt; 32);</div><div class='add'>+</div><div class='add'>+	ql_init_tx_ring(qdev, tx_ring);</div><div class='add'>+</div><div class='add'>+	err = ql_write_cfg(qdev, wqicb, sizeof(wqicb), CFG_LRQ,</div><div class='add'>+			   (u16) tx_ring-&gt;wq_id);</div><div class='add'>+	if (err) {</div><div class='add'>+		QPRINTK(qdev, IFUP, ERR, "Failed to load tx_ring.\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+	QPRINTK(qdev, IFUP, INFO, "Successfully loaded WQICB.\n");</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ql_disable_msix(struct ql_adapter *qdev)</div><div class='add'>+{</div><div class='add'>+	if (test_bit(QL_MSIX_ENABLED, &amp;qdev-&gt;flags)) {</div><div class='add'>+		pci_disable_msix(qdev-&gt;pdev);</div><div class='add'>+		clear_bit(QL_MSIX_ENABLED, &amp;qdev-&gt;flags);</div><div class='add'>+		kfree(qdev-&gt;msi_x_entry);</div><div class='add'>+		qdev-&gt;msi_x_entry = NULL;</div><div class='add'>+	} else if (test_bit(QL_MSI_ENABLED, &amp;qdev-&gt;flags)) {</div><div class='add'>+		pci_disable_msi(qdev-&gt;pdev);</div><div class='add'>+		clear_bit(QL_MSI_ENABLED, &amp;qdev-&gt;flags);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ql_enable_msix(struct ql_adapter *qdev)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	qdev-&gt;intr_count = 1;</div><div class='add'>+	/* Get the MSIX vectors. */</div><div class='add'>+	if (irq_type == MSIX_IRQ) {</div><div class='add'>+		/* Try to alloc space for the msix struct,</div><div class='add'>+		 * if it fails then go to MSI/legacy.</div><div class='add'>+		 */</div><div class='add'>+		qdev-&gt;msi_x_entry = kcalloc(qdev-&gt;rx_ring_count,</div><div class='add'>+					    sizeof(struct msix_entry),</div><div class='add'>+					    GFP_KERNEL);</div><div class='add'>+		if (!qdev-&gt;msi_x_entry) {</div><div class='add'>+			irq_type = MSI_IRQ;</div><div class='add'>+			goto msi;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; qdev-&gt;rx_ring_count; i++)</div><div class='add'>+			qdev-&gt;msi_x_entry[i].entry = i;</div><div class='add'>+</div><div class='add'>+		if (!pci_enable_msix</div><div class='add'>+		    (qdev-&gt;pdev, qdev-&gt;msi_x_entry, qdev-&gt;rx_ring_count)) {</div><div class='add'>+			set_bit(QL_MSIX_ENABLED, &amp;qdev-&gt;flags);</div><div class='add'>+			qdev-&gt;intr_count = qdev-&gt;rx_ring_count;</div><div class='add'>+			QPRINTK(qdev, IFUP, INFO,</div><div class='add'>+				"MSI-X Enabled, got %d vectors.\n",</div><div class='add'>+				qdev-&gt;intr_count);</div><div class='add'>+			return;</div><div class='add'>+		} else {</div><div class='add'>+			kfree(qdev-&gt;msi_x_entry);</div><div class='add'>+			qdev-&gt;msi_x_entry = NULL;</div><div class='add'>+			QPRINTK(qdev, IFUP, WARNING,</div><div class='add'>+				"MSI-X Enable failed, trying MSI.\n");</div><div class='add'>+			irq_type = MSI_IRQ;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+msi:</div><div class='add'>+	if (irq_type == MSI_IRQ) {</div><div class='add'>+		if (!pci_enable_msi(qdev-&gt;pdev)) {</div><div class='add'>+			set_bit(QL_MSI_ENABLED, &amp;qdev-&gt;flags);</div><div class='add'>+			QPRINTK(qdev, IFUP, INFO,</div><div class='add'>+				"Running with MSI interrupts.\n");</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	irq_type = LEG_IRQ;</div><div class='add'>+	spin_lock_init(&amp;qdev-&gt;legacy_lock);</div><div class='add'>+	qdev-&gt;legacy_check = ql_legacy_check;</div><div class='add'>+	QPRINTK(qdev, IFUP, DEBUG, "Running with legacy interrupts.\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Here we build the intr_context structures based on</div><div class='add'>+ * our rx_ring count and intr vector count.</div><div class='add'>+ * The intr_context structure is used to hook each vector</div><div class='add'>+ * to possibly different handlers.</div><div class='add'>+ */</div><div class='add'>+static void ql_resolve_queues_to_irqs(struct ql_adapter *qdev)</div><div class='add'>+{</div><div class='add'>+	int i = 0;</div><div class='add'>+	struct intr_context *intr_context = &amp;qdev-&gt;intr_context[0];</div><div class='add'>+</div><div class='add'>+	ql_enable_msix(qdev);</div><div class='add'>+</div><div class='add'>+	if (likely(test_bit(QL_MSIX_ENABLED, &amp;qdev-&gt;flags))) {</div><div class='add'>+		/* Each rx_ring has it's</div><div class='add'>+		 * own intr_context since we have separate</div><div class='add'>+		 * vectors for each queue.</div><div class='add'>+		 * This only true when MSI-X is enabled.</div><div class='add'>+		 */</div><div class='add'>+		for (i = 0; i &lt; qdev-&gt;intr_count; i++, intr_context++) {</div><div class='add'>+			qdev-&gt;rx_ring[i].irq = i;</div><div class='add'>+			intr_context-&gt;intr = i;</div><div class='add'>+			intr_context-&gt;qdev = qdev;</div><div class='add'>+			/*</div><div class='add'>+			 * We set up each vectors enable/disable/read bits so</div><div class='add'>+			 * there's no bit/mask calculations in the critical path.</div><div class='add'>+			 */</div><div class='add'>+			intr_context-&gt;intr_en_mask =</div><div class='add'>+			    INTR_EN_TYPE_MASK | INTR_EN_INTR_MASK |</div><div class='add'>+			    INTR_EN_TYPE_ENABLE | INTR_EN_IHD_MASK | INTR_EN_IHD</div><div class='add'>+			    | i;</div><div class='add'>+			intr_context-&gt;intr_dis_mask =</div><div class='add'>+			    INTR_EN_TYPE_MASK | INTR_EN_INTR_MASK |</div><div class='add'>+			    INTR_EN_TYPE_DISABLE | INTR_EN_IHD_MASK |</div><div class='add'>+			    INTR_EN_IHD | i;</div><div class='add'>+			intr_context-&gt;intr_read_mask =</div><div class='add'>+			    INTR_EN_TYPE_MASK | INTR_EN_INTR_MASK |</div><div class='add'>+			    INTR_EN_TYPE_READ | INTR_EN_IHD_MASK | INTR_EN_IHD |</div><div class='add'>+			    i;</div><div class='add'>+</div><div class='add'>+			if (i == 0) {</div><div class='add'>+				/*</div><div class='add'>+				 * Default queue handles bcast/mcast plus</div><div class='add'>+				 * async events.  Needs buffers.</div><div class='add'>+				 */</div><div class='add'>+				intr_context-&gt;handler = qlge_isr;</div><div class='add'>+				sprintf(intr_context-&gt;name, "%s-default-queue",</div><div class='add'>+					qdev-&gt;ndev-&gt;name);</div><div class='add'>+			} else if (i &lt; qdev-&gt;rss_ring_first_cq_id) {</div><div class='add'>+				/*</div><div class='add'>+				 * Outbound queue is for outbound completions only.</div><div class='add'>+				 */</div><div class='add'>+				intr_context-&gt;handler = qlge_msix_tx_isr;</div><div class='add'>+				sprintf(intr_context-&gt;name, "%s-txq-%d",</div><div class='add'>+					qdev-&gt;ndev-&gt;name, i);</div><div class='add'>+			} else {</div><div class='add'>+				/*</div><div class='add'>+				 * Inbound queues handle unicast frames only.</div><div class='add'>+				 */</div><div class='add'>+				intr_context-&gt;handler = qlge_msix_rx_isr;</div><div class='add'>+				sprintf(intr_context-&gt;name, "%s-rxq-%d",</div><div class='add'>+					qdev-&gt;ndev-&gt;name, i);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		/*</div><div class='add'>+		 * All rx_rings use the same intr_context since</div><div class='add'>+		 * there is only one vector.</div><div class='add'>+		 */</div><div class='add'>+		intr_context-&gt;intr = 0;</div><div class='add'>+		intr_context-&gt;qdev = qdev;</div><div class='add'>+		/*</div><div class='add'>+		 * We set up each vectors enable/disable/read bits so</div><div class='add'>+		 * there's no bit/mask calculations in the critical path.</div><div class='add'>+		 */</div><div class='add'>+		intr_context-&gt;intr_en_mask =</div><div class='add'>+		    INTR_EN_TYPE_MASK | INTR_EN_INTR_MASK | INTR_EN_TYPE_ENABLE;</div><div class='add'>+		intr_context-&gt;intr_dis_mask =</div><div class='add'>+		    INTR_EN_TYPE_MASK | INTR_EN_INTR_MASK |</div><div class='add'>+		    INTR_EN_TYPE_DISABLE;</div><div class='add'>+		intr_context-&gt;intr_read_mask =</div><div class='add'>+		    INTR_EN_TYPE_MASK | INTR_EN_INTR_MASK | INTR_EN_TYPE_READ;</div><div class='add'>+		/*</div><div class='add'>+		 * Single interrupt means one handler for all rings.</div><div class='add'>+		 */</div><div class='add'>+		intr_context-&gt;handler = qlge_isr;</div><div class='add'>+		sprintf(intr_context-&gt;name, "%s-single_irq", qdev-&gt;ndev-&gt;name);</div><div class='add'>+		for (i = 0; i &lt; qdev-&gt;rx_ring_count; i++)</div><div class='add'>+			qdev-&gt;rx_ring[i].irq = 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ql_free_irq(struct ql_adapter *qdev)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	struct intr_context *intr_context = &amp;qdev-&gt;intr_context[0];</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; qdev-&gt;intr_count; i++, intr_context++) {</div><div class='add'>+		if (intr_context-&gt;hooked) {</div><div class='add'>+			if (test_bit(QL_MSIX_ENABLED, &amp;qdev-&gt;flags)) {</div><div class='add'>+				free_irq(qdev-&gt;msi_x_entry[i].vector,</div><div class='add'>+					 &amp;qdev-&gt;rx_ring[i]);</div><div class='add'>+				QPRINTK(qdev, IFDOWN, ERR,</div><div class='add'>+					"freeing msix interrupt %d.\n", i);</div><div class='add'>+			} else {</div><div class='add'>+				free_irq(qdev-&gt;pdev-&gt;irq, &amp;qdev-&gt;rx_ring[0]);</div><div class='add'>+				QPRINTK(qdev, IFDOWN, ERR,</div><div class='add'>+					"freeing msi interrupt %d.\n", i);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	ql_disable_msix(qdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ql_request_irq(struct ql_adapter *qdev)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	int status = 0;</div><div class='add'>+	struct pci_dev *pdev = qdev-&gt;pdev;</div><div class='add'>+	struct intr_context *intr_context = &amp;qdev-&gt;intr_context[0];</div><div class='add'>+</div><div class='add'>+	ql_resolve_queues_to_irqs(qdev);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; qdev-&gt;intr_count; i++, intr_context++) {</div><div class='add'>+		atomic_set(&amp;intr_context-&gt;irq_cnt, 0);</div><div class='add'>+		if (test_bit(QL_MSIX_ENABLED, &amp;qdev-&gt;flags)) {</div><div class='add'>+			status = request_irq(qdev-&gt;msi_x_entry[i].vector,</div><div class='add'>+					     intr_context-&gt;handler,</div><div class='add'>+					     0,</div><div class='add'>+					     intr_context-&gt;name,</div><div class='add'>+					     &amp;qdev-&gt;rx_ring[i]);</div><div class='add'>+			if (status) {</div><div class='add'>+				QPRINTK(qdev, IFUP, ERR,</div><div class='add'>+					"Failed request for MSIX interrupt %d.\n",</div><div class='add'>+					i);</div><div class='add'>+				goto err_irq;</div><div class='add'>+			} else {</div><div class='add'>+				QPRINTK(qdev, IFUP, INFO,</div><div class='add'>+					"Hooked intr %d, queue type %s%s%s, with name %s.\n",</div><div class='add'>+					i,</div><div class='add'>+					qdev-&gt;rx_ring[i].type ==</div><div class='add'>+					DEFAULT_Q ? "DEFAULT_Q" : "",</div><div class='add'>+					qdev-&gt;rx_ring[i].type ==</div><div class='add'>+					TX_Q ? "TX_Q" : "",</div><div class='add'>+					qdev-&gt;rx_ring[i].type ==</div><div class='add'>+					RX_Q ? "RX_Q" : "", intr_context-&gt;name);</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			QPRINTK(qdev, IFUP, DEBUG,</div><div class='add'>+				"trying msi or legacy interrupts.\n");</div><div class='add'>+			QPRINTK(qdev, IFUP, DEBUG,</div><div class='add'>+				"%s: irq = %d.\n", __func__, pdev-&gt;irq);</div><div class='add'>+			QPRINTK(qdev, IFUP, DEBUG,</div><div class='add'>+				"%s: context-&gt;name = %s.\n", __func__,</div><div class='add'>+			       intr_context-&gt;name);</div><div class='add'>+			QPRINTK(qdev, IFUP, DEBUG,</div><div class='add'>+				"%s: dev_id = 0x%p.\n", __func__,</div><div class='add'>+			       &amp;qdev-&gt;rx_ring[0]);</div><div class='add'>+			status =</div><div class='add'>+			    request_irq(pdev-&gt;irq, qlge_isr,</div><div class='add'>+					test_bit(QL_MSI_ENABLED,</div><div class='add'>+						 &amp;qdev-&gt;</div><div class='add'>+						 flags) ? 0 : IRQF_SHARED,</div><div class='add'>+					intr_context-&gt;name, &amp;qdev-&gt;rx_ring[0]);</div><div class='add'>+			if (status)</div><div class='add'>+				goto err_irq;</div><div class='add'>+</div><div class='add'>+			QPRINTK(qdev, IFUP, ERR,</div><div class='add'>+				"Hooked intr %d, queue type %s%s%s, with name %s.\n",</div><div class='add'>+				i,</div><div class='add'>+				qdev-&gt;rx_ring[0].type ==</div><div class='add'>+				DEFAULT_Q ? "DEFAULT_Q" : "",</div><div class='add'>+				qdev-&gt;rx_ring[0].type == TX_Q ? "TX_Q" : "",</div><div class='add'>+				qdev-&gt;rx_ring[0].type == RX_Q ? "RX_Q" : "",</div><div class='add'>+				intr_context-&gt;name);</div><div class='add'>+		}</div><div class='add'>+		intr_context-&gt;hooked = 1;</div><div class='add'>+	}</div><div class='add'>+	return status;</div><div class='add'>+err_irq:</div><div class='add'>+	QPRINTK(qdev, IFUP, ERR, "Failed to get the interrupts!!!/n");</div><div class='add'>+	ql_free_irq(qdev);</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ql_start_rss(struct ql_adapter *qdev)</div><div class='add'>+{</div><div class='add'>+	struct ricb *ricb = &amp;qdev-&gt;ricb;</div><div class='add'>+	int status = 0;</div><div class='add'>+	int i;</div><div class='add'>+	u8 *hash_id = (u8 *) ricb-&gt;hash_cq_id;</div><div class='add'>+</div><div class='add'>+	memset((void *)ricb, 0, sizeof(ricb));</div><div class='add'>+</div><div class='add'>+	ricb-&gt;base_cq = qdev-&gt;rss_ring_first_cq_id | RSS_L4K;</div><div class='add'>+	ricb-&gt;flags =</div><div class='add'>+	    (RSS_L6K | RSS_LI | RSS_LB | RSS_LM | RSS_RI4 | RSS_RI6 | RSS_RT4 |</div><div class='add'>+	     RSS_RT6);</div><div class='add'>+	ricb-&gt;mask = cpu_to_le16(qdev-&gt;rss_ring_count - 1);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Fill out the Indirection Table.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; 32; i++)</div><div class='add'>+		hash_id[i] = i &amp; 1;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Random values for the IPv6 and IPv4 Hash Keys.</div><div class='add'>+	 */</div><div class='add'>+	get_random_bytes((void *)&amp;ricb-&gt;ipv6_hash_key[0], 40);</div><div class='add'>+	get_random_bytes((void *)&amp;ricb-&gt;ipv4_hash_key[0], 16);</div><div class='add'>+</div><div class='add'>+	QPRINTK(qdev, IFUP, INFO, "Initializing RSS.\n");</div><div class='add'>+</div><div class='add'>+	status = ql_write_cfg(qdev, ricb, sizeof(ricb), CFG_LR, 0);</div><div class='add'>+	if (status) {</div><div class='add'>+		QPRINTK(qdev, IFUP, ERR, "Failed to load RICB.\n");</div><div class='add'>+		return status;</div><div class='add'>+	}</div><div class='add'>+	QPRINTK(qdev, IFUP, INFO, "Successfully loaded RICB.\n");</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Initialize the frame-to-queue routing. */</div><div class='add'>+static int ql_route_initialize(struct ql_adapter *qdev)</div><div class='add'>+{</div><div class='add'>+	int status = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* Clear all the entries in the routing table. */</div><div class='add'>+	for (i = 0; i &lt; 16; i++) {</div><div class='add'>+		status = ql_set_routing_reg(qdev, i, 0, 0);</div><div class='add'>+		if (status) {</div><div class='add'>+			QPRINTK(qdev, IFUP, ERR,</div><div class='add'>+				"Failed to init routing register for CAM packets.\n");</div><div class='add'>+			return status;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	status = ql_set_routing_reg(qdev, RT_IDX_ALL_ERR_SLOT, RT_IDX_ERR, 1);</div><div class='add'>+	if (status) {</div><div class='add'>+		QPRINTK(qdev, IFUP, ERR,</div><div class='add'>+			"Failed to init routing register for error packets.\n");</div><div class='add'>+		return status;</div><div class='add'>+	}</div><div class='add'>+	status = ql_set_routing_reg(qdev, RT_IDX_BCAST_SLOT, RT_IDX_BCAST, 1);</div><div class='add'>+	if (status) {</div><div class='add'>+		QPRINTK(qdev, IFUP, ERR,</div><div class='add'>+			"Failed to init routing register for broadcast packets.\n");</div><div class='add'>+		return status;</div><div class='add'>+	}</div><div class='add'>+	/* If we have more than one inbound queue, then turn on RSS in the</div><div class='add'>+	 * routing block.</div><div class='add'>+	 */</div><div class='add'>+	if (qdev-&gt;rss_ring_count &gt; 1) {</div><div class='add'>+		status = ql_set_routing_reg(qdev, RT_IDX_RSS_MATCH_SLOT,</div><div class='add'>+					RT_IDX_RSS_MATCH, 1);</div><div class='add'>+		if (status) {</div><div class='add'>+			QPRINTK(qdev, IFUP, ERR,</div><div class='add'>+				"Failed to init routing register for MATCH RSS packets.\n");</div><div class='add'>+			return status;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	status = ql_set_routing_reg(qdev, RT_IDX_CAM_HIT_SLOT,</div><div class='add'>+				    RT_IDX_CAM_HIT, 1);</div><div class='add'>+	if (status) {</div><div class='add'>+		QPRINTK(qdev, IFUP, ERR,</div><div class='add'>+			"Failed to init routing register for CAM packets.\n");</div><div class='add'>+		return status;</div><div class='add'>+	}</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ql_adapter_initialize(struct ql_adapter *qdev)</div><div class='add'>+{</div><div class='add'>+	u32 value, mask;</div><div class='add'>+	int i;</div><div class='add'>+	int status = 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Set up the System register to halt on errors.</div><div class='add'>+	 */</div><div class='add'>+	value = SYS_EFE | SYS_FAE;</div><div class='add'>+	mask = value &lt;&lt; 16;</div><div class='add'>+	ql_write32(qdev, SYS, mask | value);</div><div class='add'>+</div><div class='add'>+	/* Set the default queue. */</div><div class='add'>+	value = NIC_RCV_CFG_DFQ;</div><div class='add'>+	mask = NIC_RCV_CFG_DFQ_MASK;</div><div class='add'>+	ql_write32(qdev, NIC_RCV_CFG, (mask | value));</div><div class='add'>+</div><div class='add'>+	/* Set the MPI interrupt to enabled. */</div><div class='add'>+	ql_write32(qdev, INTR_MASK, (INTR_MASK_PI &lt;&lt; 16) | INTR_MASK_PI);</div><div class='add'>+</div><div class='add'>+	/* Enable the function, set pagesize, enable error checking. */</div><div class='add'>+	value = FSC_FE | FSC_EPC_INBOUND | FSC_EPC_OUTBOUND |</div><div class='add'>+	    FSC_EC | FSC_VM_PAGE_4K | FSC_SH;</div><div class='add'>+</div><div class='add'>+	/* Set/clear header splitting. */</div><div class='add'>+	mask = FSC_VM_PAGESIZE_MASK |</div><div class='add'>+	    FSC_DBL_MASK | FSC_DBRST_MASK | (value &lt;&lt; 16);</div><div class='add'>+	ql_write32(qdev, FSC, mask | value);</div><div class='add'>+</div><div class='add'>+	ql_write32(qdev, SPLT_HDR, SPLT_HDR_EP |</div><div class='add'>+		min(SMALL_BUFFER_SIZE, MAX_SPLIT_SIZE));</div><div class='add'>+</div><div class='add'>+	/* Start up the rx queues. */</div><div class='add'>+	for (i = 0; i &lt; qdev-&gt;rx_ring_count; i++) {</div><div class='add'>+		status = ql_start_rx_ring(qdev, &amp;qdev-&gt;rx_ring[i]);</div><div class='add'>+		if (status) {</div><div class='add'>+			QPRINTK(qdev, IFUP, ERR,</div><div class='add'>+				"Failed to start rx ring[%d].\n", i);</div><div class='add'>+			return status;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If there is more than one inbound completion queue</div><div class='add'>+	 * then download a RICB to configure RSS.</div><div class='add'>+	 */</div><div class='add'>+	if (qdev-&gt;rss_ring_count &gt; 1) {</div><div class='add'>+		status = ql_start_rss(qdev);</div><div class='add'>+		if (status) {</div><div class='add'>+			QPRINTK(qdev, IFUP, ERR, "Failed to start RSS.\n");</div><div class='add'>+			return status;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Start up the tx queues. */</div><div class='add'>+	for (i = 0; i &lt; qdev-&gt;tx_ring_count; i++) {</div><div class='add'>+		status = ql_start_tx_ring(qdev, &amp;qdev-&gt;tx_ring[i]);</div><div class='add'>+		if (status) {</div><div class='add'>+			QPRINTK(qdev, IFUP, ERR,</div><div class='add'>+				"Failed to start tx ring[%d].\n", i);</div><div class='add'>+			return status;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	status = ql_port_initialize(qdev);</div><div class='add'>+	if (status) {</div><div class='add'>+		QPRINTK(qdev, IFUP, ERR, "Failed to start port.\n");</div><div class='add'>+		return status;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	status = ql_set_mac_addr_reg(qdev, (u8 *) qdev-&gt;ndev-&gt;perm_addr,</div><div class='add'>+				     MAC_ADDR_TYPE_CAM_MAC, qdev-&gt;func);</div><div class='add'>+	if (status) {</div><div class='add'>+		QPRINTK(qdev, IFUP, ERR, "Failed to init mac address.\n");</div><div class='add'>+		return status;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	status = ql_route_initialize(qdev);</div><div class='add'>+	if (status) {</div><div class='add'>+		QPRINTK(qdev, IFUP, ERR, "Failed to init routing table.\n");</div><div class='add'>+		return status;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Start NAPI for the RSS queues. */</div><div class='add'>+	for (i = qdev-&gt;rss_ring_first_cq_id; i &lt; qdev-&gt;rx_ring_count; i++) {</div><div class='add'>+		QPRINTK(qdev, IFUP, INFO, "Enabling NAPI for rx_ring[%d].\n",</div><div class='add'>+			i);</div><div class='add'>+		napi_enable(&amp;qdev-&gt;rx_ring[i].napi);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Issue soft reset to chip. */</div><div class='add'>+static int ql_adapter_reset(struct ql_adapter *qdev)</div><div class='add'>+{</div><div class='add'>+	u32 value;</div><div class='add'>+	int max_wait_time;</div><div class='add'>+	int status = 0;</div><div class='add'>+	int resetCnt = 0;</div><div class='add'>+</div><div class='add'>+#define MAX_RESET_CNT   1</div><div class='add'>+issueReset:</div><div class='add'>+	resetCnt++;</div><div class='add'>+	QPRINTK(qdev, IFDOWN, DEBUG, "Issue soft reset to chip.\n");</div><div class='add'>+	ql_write32(qdev, RST_FO, (RST_FO_FR &lt;&lt; 16) | RST_FO_FR);</div><div class='add'>+	/* Wait for reset to complete. */</div><div class='add'>+	max_wait_time = 3;</div><div class='add'>+	QPRINTK(qdev, IFDOWN, DEBUG, "Wait %d seconds for reset to complete.\n",</div><div class='add'>+		max_wait_time);</div><div class='add'>+	do {</div><div class='add'>+		value = ql_read32(qdev, RST_FO);</div><div class='add'>+		if ((value &amp; RST_FO_FR) == 0)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		ssleep(1);</div><div class='add'>+	} while ((--max_wait_time));</div><div class='add'>+	if (value &amp; RST_FO_FR) {</div><div class='add'>+		QPRINTK(qdev, IFDOWN, ERR,</div><div class='add'>+			"Stuck in SoftReset:  FSC_SR:0x%08x\n", value);</div><div class='add'>+		if (resetCnt &lt; MAX_RESET_CNT)</div><div class='add'>+			goto issueReset;</div><div class='add'>+	}</div><div class='add'>+	if (max_wait_time == 0) {</div><div class='add'>+		status = -ETIMEDOUT;</div><div class='add'>+		QPRINTK(qdev, IFDOWN, ERR,</div><div class='add'>+			"ETIMEOUT!!! errored out of resetting the chip!\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ql_display_dev_info(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct ql_adapter *qdev = (struct ql_adapter *)netdev_priv(ndev);</div><div class='add'>+</div><div class='add'>+	QPRINTK(qdev, PROBE, INFO,</div><div class='add'>+		"Function #%d, NIC Roll %d, NIC Rev = %d, "</div><div class='add'>+		"XG Roll = %d, XG Rev = %d.\n",</div><div class='add'>+		qdev-&gt;func,</div><div class='add'>+		qdev-&gt;chip_rev_id &amp; 0x0000000f,</div><div class='add'>+		qdev-&gt;chip_rev_id &gt;&gt; 4 &amp; 0x0000000f,</div><div class='add'>+		qdev-&gt;chip_rev_id &gt;&gt; 8 &amp; 0x0000000f,</div><div class='add'>+		qdev-&gt;chip_rev_id &gt;&gt; 12 &amp; 0x0000000f);</div><div class='add'>+	QPRINTK(qdev, PROBE, INFO,</div><div class='add'>+		"MAC address %02x:%02x:%02x:%02x:%02x:%02x\n",</div><div class='add'>+		ndev-&gt;dev_addr[0], ndev-&gt;dev_addr[1],</div><div class='add'>+		ndev-&gt;dev_addr[2], ndev-&gt;dev_addr[3], ndev-&gt;dev_addr[4],</div><div class='add'>+		ndev-&gt;dev_addr[5]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ql_adapter_down(struct ql_adapter *qdev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ndev = qdev-&gt;ndev;</div><div class='add'>+	int i, status = 0;</div><div class='add'>+	struct rx_ring *rx_ring;</div><div class='add'>+</div><div class='add'>+	netif_stop_queue(ndev);</div><div class='add'>+	netif_carrier_off(ndev);</div><div class='add'>+</div><div class='add'>+	cancel_delayed_work_sync(&amp;qdev-&gt;asic_reset_work);</div><div class='add'>+	cancel_delayed_work_sync(&amp;qdev-&gt;mpi_reset_work);</div><div class='add'>+	cancel_delayed_work_sync(&amp;qdev-&gt;mpi_work);</div><div class='add'>+</div><div class='add'>+	/* The default queue at index 0 is always processed in</div><div class='add'>+	 * a workqueue.</div><div class='add'>+	 */</div><div class='add'>+	cancel_delayed_work_sync(&amp;qdev-&gt;rx_ring[0].rx_work);</div><div class='add'>+</div><div class='add'>+	/* The rest of the rx_rings are processed in</div><div class='add'>+	 * a workqueue only if it's a single interrupt</div><div class='add'>+	 * environment (MSI/Legacy).</div><div class='add'>+	 */</div><div class='add'>+	for (i = 1; i &gt; qdev-&gt;rx_ring_count; i++) {</div><div class='add'>+		rx_ring = &amp;qdev-&gt;rx_ring[i];</div><div class='add'>+		/* Only the RSS rings use NAPI on multi irq</div><div class='add'>+		 * environment.  Outbound completion processing</div><div class='add'>+		 * is done in interrupt context.</div><div class='add'>+		 */</div><div class='add'>+		if (i &gt;= qdev-&gt;rss_ring_first_cq_id) {</div><div class='add'>+			napi_disable(&amp;rx_ring-&gt;napi);</div><div class='add'>+		} else {</div><div class='add'>+			cancel_delayed_work_sync(&amp;rx_ring-&gt;rx_work);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	clear_bit(QL_ADAPTER_UP, &amp;qdev-&gt;flags);</div><div class='add'>+</div><div class='add'>+	ql_disable_interrupts(qdev);</div><div class='add'>+</div><div class='add'>+	ql_tx_ring_clean(qdev);</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;qdev-&gt;hw_lock);</div><div class='add'>+	status = ql_adapter_reset(qdev);</div><div class='add'>+	if (status)</div><div class='add'>+		QPRINTK(qdev, IFDOWN, ERR, "reset(func #%d) FAILED!\n",</div><div class='add'>+			qdev-&gt;func);</div><div class='add'>+	spin_unlock(&amp;qdev-&gt;hw_lock);</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ql_adapter_up(struct ql_adapter *qdev)</div><div class='add'>+{</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;qdev-&gt;hw_lock);</div><div class='add'>+	err = ql_adapter_initialize(qdev);</div><div class='add'>+	if (err) {</div><div class='add'>+		QPRINTK(qdev, IFUP, INFO, "Unable to initialize adapter.\n");</div><div class='add'>+		spin_unlock(&amp;qdev-&gt;hw_lock);</div><div class='add'>+		goto err_init;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;qdev-&gt;hw_lock);</div><div class='add'>+	set_bit(QL_ADAPTER_UP, &amp;qdev-&gt;flags);</div><div class='add'>+	ql_enable_interrupts(qdev);</div><div class='add'>+	ql_enable_all_completion_interrupts(qdev);</div><div class='add'>+	if ((ql_read32(qdev, STS) &amp; qdev-&gt;port_init)) {</div><div class='add'>+		netif_carrier_on(qdev-&gt;ndev);</div><div class='add'>+		netif_start_queue(qdev-&gt;ndev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+err_init:</div><div class='add'>+	ql_adapter_reset(qdev);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ql_cycle_adapter(struct ql_adapter *qdev)</div><div class='add'>+{</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	status = ql_adapter_down(qdev);</div><div class='add'>+	if (status)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	status = ql_adapter_up(qdev);</div><div class='add'>+	if (status)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	return status;</div><div class='add'>+error:</div><div class='add'>+	QPRINTK(qdev, IFUP, ALERT,</div><div class='add'>+		"Driver up/down cycle failed, closing device\n");</div><div class='add'>+	rtnl_lock();</div><div class='add'>+	dev_close(qdev-&gt;ndev);</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ql_release_adapter_resources(struct ql_adapter *qdev)</div><div class='add'>+{</div><div class='add'>+	ql_free_mem_resources(qdev);</div><div class='add'>+	ql_free_irq(qdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ql_get_adapter_resources(struct ql_adapter *qdev)</div><div class='add'>+{</div><div class='add'>+	int status = 0;</div><div class='add'>+</div><div class='add'>+	if (ql_alloc_mem_resources(qdev)) {</div><div class='add'>+		QPRINTK(qdev, IFUP, ERR, "Unable to  allocate memory.\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	status = ql_request_irq(qdev);</div><div class='add'>+	if (status)</div><div class='add'>+		goto err_irq;</div><div class='add'>+	return status;</div><div class='add'>+err_irq:</div><div class='add'>+	ql_free_mem_resources(qdev);</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qlge_close(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct ql_adapter *qdev = netdev_priv(ndev);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Wait for device to recover from a reset.</div><div class='add'>+	 * (Rarely happens, but possible.)</div><div class='add'>+	 */</div><div class='add'>+	while (!test_bit(QL_ADAPTER_UP, &amp;qdev-&gt;flags))</div><div class='add'>+		msleep(1);</div><div class='add'>+	ql_adapter_down(qdev);</div><div class='add'>+	ql_release_adapter_resources(qdev);</div><div class='add'>+	ql_free_ring_cb(qdev);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ql_configure_rings(struct ql_adapter *qdev)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	struct rx_ring *rx_ring;</div><div class='add'>+	struct tx_ring *tx_ring;</div><div class='add'>+	int cpu_cnt = num_online_cpus();</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * For each processor present we allocate one</div><div class='add'>+	 * rx_ring for outbound completions, and one</div><div class='add'>+	 * rx_ring for inbound completions.  Plus there is</div><div class='add'>+	 * always the one default queue.  For the CPU</div><div class='add'>+	 * counts we end up with the following rx_rings:</div><div class='add'>+	 * rx_ring count =</div><div class='add'>+	 *  one default queue +</div><div class='add'>+	 *  (CPU count * outbound completion rx_ring) +</div><div class='add'>+	 *  (CPU count * inbound (RSS) completion rx_ring)</div><div class='add'>+	 * To keep it simple we limit the total number of</div><div class='add'>+	 * queues to &lt; 32, so we truncate CPU to 8.</div><div class='add'>+	 * This limitation can be removed when requested.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	if (cpu_cnt &gt; 8)</div><div class='add'>+		cpu_cnt = 8;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * rx_ring[0] is always the default queue.</div><div class='add'>+	 */</div><div class='add'>+	/* Allocate outbound completion ring for each CPU. */</div><div class='add'>+	qdev-&gt;tx_ring_count = cpu_cnt;</div><div class='add'>+	/* Allocate inbound completion (RSS) ring for each CPU. */</div><div class='add'>+	qdev-&gt;rss_ring_count = cpu_cnt;</div><div class='add'>+	/* cq_id for the first inbound ring handler. */</div><div class='add'>+	qdev-&gt;rss_ring_first_cq_id = cpu_cnt + 1;</div><div class='add'>+	/*</div><div class='add'>+	 * qdev-&gt;rx_ring_count:</div><div class='add'>+	 * Total number of rx_rings.  This includes the one</div><div class='add'>+	 * default queue, a number of outbound completion</div><div class='add'>+	 * handler rx_rings, and the number of inbound</div><div class='add'>+	 * completion handler rx_rings.</div><div class='add'>+	 */</div><div class='add'>+	qdev-&gt;rx_ring_count = qdev-&gt;tx_ring_count + qdev-&gt;rss_ring_count + 1;</div><div class='add'>+</div><div class='add'>+	if (ql_alloc_ring_cb(qdev))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; qdev-&gt;tx_ring_count; i++) {</div><div class='add'>+		tx_ring = &amp;qdev-&gt;tx_ring[i];</div><div class='add'>+		memset((void *)tx_ring, 0, sizeof(tx_ring));</div><div class='add'>+		tx_ring-&gt;qdev = qdev;</div><div class='add'>+		tx_ring-&gt;wq_id = i;</div><div class='add'>+		tx_ring-&gt;wq_len = qdev-&gt;tx_ring_size;</div><div class='add'>+		tx_ring-&gt;wq_size =</div><div class='add'>+		    tx_ring-&gt;wq_len * sizeof(struct ob_mac_iocb_req);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * The completion queue ID for the tx rings start</div><div class='add'>+		 * immediately after the default Q ID, which is zero.</div><div class='add'>+		 */</div><div class='add'>+		tx_ring-&gt;cq_id = i + 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; qdev-&gt;rx_ring_count; i++) {</div><div class='add'>+		rx_ring = &amp;qdev-&gt;rx_ring[i];</div><div class='add'>+		memset((void *)rx_ring, 0, sizeof(rx_ring));</div><div class='add'>+		rx_ring-&gt;qdev = qdev;</div><div class='add'>+		rx_ring-&gt;cq_id = i;</div><div class='add'>+		rx_ring-&gt;cpu = i % cpu_cnt;	/* CPU to run handler on. */</div><div class='add'>+		if (i == 0) {	/* Default queue at index 0. */</div><div class='add'>+			/*</div><div class='add'>+			 * Default queue handles bcast/mcast plus</div><div class='add'>+			 * async events.  Needs buffers.</div><div class='add'>+			 */</div><div class='add'>+			rx_ring-&gt;cq_len = qdev-&gt;rx_ring_size;</div><div class='add'>+			rx_ring-&gt;cq_size =</div><div class='add'>+			    rx_ring-&gt;cq_len * sizeof(struct ql_net_rsp_iocb);</div><div class='add'>+			rx_ring-&gt;lbq_len = NUM_LARGE_BUFFERS;</div><div class='add'>+			rx_ring-&gt;lbq_size =</div><div class='add'>+			    rx_ring-&gt;lbq_len * sizeof(struct bq_element);</div><div class='add'>+			rx_ring-&gt;lbq_buf_size = LARGE_BUFFER_SIZE;</div><div class='add'>+			rx_ring-&gt;sbq_len = NUM_SMALL_BUFFERS;</div><div class='add'>+			rx_ring-&gt;sbq_size =</div><div class='add'>+			    rx_ring-&gt;sbq_len * sizeof(struct bq_element);</div><div class='add'>+			rx_ring-&gt;sbq_buf_size = SMALL_BUFFER_SIZE * 2;</div><div class='add'>+			rx_ring-&gt;type = DEFAULT_Q;</div><div class='add'>+		} else if (i &lt; qdev-&gt;rss_ring_first_cq_id) {</div><div class='add'>+			/*</div><div class='add'>+			 * Outbound queue handles outbound completions only.</div><div class='add'>+			 */</div><div class='add'>+			/* outbound cq is same size as tx_ring it services. */</div><div class='add'>+			rx_ring-&gt;cq_len = qdev-&gt;tx_ring_size;</div><div class='add'>+			rx_ring-&gt;cq_size =</div><div class='add'>+			    rx_ring-&gt;cq_len * sizeof(struct ql_net_rsp_iocb);</div><div class='add'>+			rx_ring-&gt;lbq_len = 0;</div><div class='add'>+			rx_ring-&gt;lbq_size = 0;</div><div class='add'>+			rx_ring-&gt;lbq_buf_size = 0;</div><div class='add'>+			rx_ring-&gt;sbq_len = 0;</div><div class='add'>+			rx_ring-&gt;sbq_size = 0;</div><div class='add'>+			rx_ring-&gt;sbq_buf_size = 0;</div><div class='add'>+			rx_ring-&gt;type = TX_Q;</div><div class='add'>+		} else {	/* Inbound completions (RSS) queues */</div><div class='add'>+			/*</div><div class='add'>+			 * Inbound queues handle unicast frames only.</div><div class='add'>+			 */</div><div class='add'>+			rx_ring-&gt;cq_len = qdev-&gt;rx_ring_size;</div><div class='add'>+			rx_ring-&gt;cq_size =</div><div class='add'>+			    rx_ring-&gt;cq_len * sizeof(struct ql_net_rsp_iocb);</div><div class='add'>+			rx_ring-&gt;lbq_len = NUM_LARGE_BUFFERS;</div><div class='add'>+			rx_ring-&gt;lbq_size =</div><div class='add'>+			    rx_ring-&gt;lbq_len * sizeof(struct bq_element);</div><div class='add'>+			rx_ring-&gt;lbq_buf_size = LARGE_BUFFER_SIZE;</div><div class='add'>+			rx_ring-&gt;sbq_len = NUM_SMALL_BUFFERS;</div><div class='add'>+			rx_ring-&gt;sbq_size =</div><div class='add'>+			    rx_ring-&gt;sbq_len * sizeof(struct bq_element);</div><div class='add'>+			rx_ring-&gt;sbq_buf_size = SMALL_BUFFER_SIZE * 2;</div><div class='add'>+			rx_ring-&gt;type = RX_Q;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qlge_open(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	int err = 0;</div><div class='add'>+	struct ql_adapter *qdev = netdev_priv(ndev);</div><div class='add'>+</div><div class='add'>+	err = ql_configure_rings(qdev);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = ql_get_adapter_resources(qdev);</div><div class='add'>+	if (err)</div><div class='add'>+		goto error_up;</div><div class='add'>+</div><div class='add'>+	err = ql_adapter_up(qdev);</div><div class='add'>+	if (err)</div><div class='add'>+		goto error_up;</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+</div><div class='add'>+error_up:</div><div class='add'>+	ql_release_adapter_resources(qdev);</div><div class='add'>+	ql_free_ring_cb(qdev);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qlge_change_mtu(struct net_device *ndev, int new_mtu)</div><div class='add'>+{</div><div class='add'>+	struct ql_adapter *qdev = netdev_priv(ndev);</div><div class='add'>+</div><div class='add'>+	if (ndev-&gt;mtu == 1500 &amp;&amp; new_mtu == 9000) {</div><div class='add'>+		QPRINTK(qdev, IFUP, ERR, "Changing to jumbo MTU.\n");</div><div class='add'>+	} else if (ndev-&gt;mtu == 9000 &amp;&amp; new_mtu == 1500) {</div><div class='add'>+		QPRINTK(qdev, IFUP, ERR, "Changing to normal MTU.\n");</div><div class='add'>+	} else if ((ndev-&gt;mtu == 1500 &amp;&amp; new_mtu == 1500) ||</div><div class='add'>+		   (ndev-&gt;mtu == 9000 &amp;&amp; new_mtu == 9000)) {</div><div class='add'>+		return 0;</div><div class='add'>+	} else</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	ndev-&gt;mtu = new_mtu;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct net_device_stats *qlge_get_stats(struct net_device</div><div class='add'>+					       *ndev)</div><div class='add'>+{</div><div class='add'>+	struct ql_adapter *qdev = netdev_priv(ndev);</div><div class='add'>+	return &amp;qdev-&gt;stats;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void qlge_set_multicast_list(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct ql_adapter *qdev = (struct ql_adapter *)netdev_priv(ndev);</div><div class='add'>+	struct dev_mc_list *mc_ptr;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;qdev-&gt;hw_lock);</div><div class='add'>+	/*</div><div class='add'>+	 * Set or clear promiscuous mode if a</div><div class='add'>+	 * transition is taking place.</div><div class='add'>+	 */</div><div class='add'>+	if (ndev-&gt;flags &amp; IFF_PROMISC) {</div><div class='add'>+		if (!test_bit(QL_PROMISCUOUS, &amp;qdev-&gt;flags)) {</div><div class='add'>+			if (ql_set_routing_reg</div><div class='add'>+			    (qdev, RT_IDX_PROMISCUOUS_SLOT, RT_IDX_VALID, 1)) {</div><div class='add'>+				QPRINTK(qdev, HW, ERR,</div><div class='add'>+					"Failed to set promiscous mode.\n");</div><div class='add'>+			} else {</div><div class='add'>+				set_bit(QL_PROMISCUOUS, &amp;qdev-&gt;flags);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		if (test_bit(QL_PROMISCUOUS, &amp;qdev-&gt;flags)) {</div><div class='add'>+			if (ql_set_routing_reg</div><div class='add'>+			    (qdev, RT_IDX_PROMISCUOUS_SLOT, RT_IDX_VALID, 0)) {</div><div class='add'>+				QPRINTK(qdev, HW, ERR,</div><div class='add'>+					"Failed to clear promiscous mode.\n");</div><div class='add'>+			} else {</div><div class='add'>+				clear_bit(QL_PROMISCUOUS, &amp;qdev-&gt;flags);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Set or clear all multicast mode if a</div><div class='add'>+	 * transition is taking place.</div><div class='add'>+	 */</div><div class='add'>+	if ((ndev-&gt;flags &amp; IFF_ALLMULTI) ||</div><div class='add'>+	    (ndev-&gt;mc_count &gt; MAX_MULTICAST_ENTRIES)) {</div><div class='add'>+		if (!test_bit(QL_ALLMULTI, &amp;qdev-&gt;flags)) {</div><div class='add'>+			if (ql_set_routing_reg</div><div class='add'>+			    (qdev, RT_IDX_ALLMULTI_SLOT, RT_IDX_MCAST, 1)) {</div><div class='add'>+				QPRINTK(qdev, HW, ERR,</div><div class='add'>+					"Failed to set all-multi mode.\n");</div><div class='add'>+			} else {</div><div class='add'>+				set_bit(QL_ALLMULTI, &amp;qdev-&gt;flags);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		if (test_bit(QL_ALLMULTI, &amp;qdev-&gt;flags)) {</div><div class='add'>+			if (ql_set_routing_reg</div><div class='add'>+			    (qdev, RT_IDX_ALLMULTI_SLOT, RT_IDX_MCAST, 0)) {</div><div class='add'>+				QPRINTK(qdev, HW, ERR,</div><div class='add'>+					"Failed to clear all-multi mode.\n");</div><div class='add'>+			} else {</div><div class='add'>+				clear_bit(QL_ALLMULTI, &amp;qdev-&gt;flags);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ndev-&gt;mc_count) {</div><div class='add'>+		for (i = 0, mc_ptr = ndev-&gt;mc_list; mc_ptr;</div><div class='add'>+		     i++, mc_ptr = mc_ptr-&gt;next)</div><div class='add'>+			if (ql_set_mac_addr_reg(qdev, (u8 *) mc_ptr-&gt;dmi_addr,</div><div class='add'>+						MAC_ADDR_TYPE_MULTI_MAC, i)) {</div><div class='add'>+				QPRINTK(qdev, HW, ERR,</div><div class='add'>+					"Failed to loadmulticast address.\n");</div><div class='add'>+				goto exit;</div><div class='add'>+			}</div><div class='add'>+		if (ql_set_routing_reg</div><div class='add'>+		    (qdev, RT_IDX_MCAST_MATCH_SLOT, RT_IDX_MCAST_MATCH, 1)) {</div><div class='add'>+			QPRINTK(qdev, HW, ERR,</div><div class='add'>+				"Failed to set multicast match mode.\n");</div><div class='add'>+		} else {</div><div class='add'>+			set_bit(QL_ALLMULTI, &amp;qdev-&gt;flags);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+exit:</div><div class='add'>+	spin_unlock(&amp;qdev-&gt;hw_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qlge_set_mac_address(struct net_device *ndev, void *p)</div><div class='add'>+{</div><div class='add'>+	struct ql_adapter *qdev = (struct ql_adapter *)netdev_priv(ndev);</div><div class='add'>+	struct sockaddr *addr = p;</div><div class='add'>+</div><div class='add'>+	if (netif_running(ndev))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	if (!is_valid_ether_addr(addr-&gt;sa_data))</div><div class='add'>+		return -EADDRNOTAVAIL;</div><div class='add'>+	memcpy(ndev-&gt;dev_addr, addr-&gt;sa_data, ndev-&gt;addr_len);</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;qdev-&gt;hw_lock);</div><div class='add'>+	if (ql_set_mac_addr_reg(qdev, (u8 *) ndev-&gt;dev_addr,</div><div class='add'>+			MAC_ADDR_TYPE_CAM_MAC, qdev-&gt;func)) {/* Unicast */</div><div class='add'>+		QPRINTK(qdev, HW, ERR, "Failed to load MAC address.\n");</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;qdev-&gt;hw_lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void qlge_tx_timeout(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct ql_adapter *qdev = (struct ql_adapter *)netdev_priv(ndev);</div><div class='add'>+	queue_delayed_work(qdev-&gt;workqueue, &amp;qdev-&gt;asic_reset_work, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ql_asic_reset_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct ql_adapter *qdev =</div><div class='add'>+	    container_of(work, struct ql_adapter, asic_reset_work.work);</div><div class='add'>+	ql_cycle_adapter(qdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ql_get_board_info(struct ql_adapter *qdev)</div><div class='add'>+{</div><div class='add'>+	qdev-&gt;func =</div><div class='add'>+	    (ql_read32(qdev, STS) &amp; STS_FUNC_ID_MASK) &gt;&gt; STS_FUNC_ID_SHIFT;</div><div class='add'>+	if (qdev-&gt;func) {</div><div class='add'>+		qdev-&gt;xg_sem_mask = SEM_XGMAC1_MASK;</div><div class='add'>+		qdev-&gt;port_link_up = STS_PL1;</div><div class='add'>+		qdev-&gt;port_init = STS_PI1;</div><div class='add'>+		qdev-&gt;mailbox_in = PROC_ADDR_MPI_RISC | PROC_ADDR_FUNC2_MBI;</div><div class='add'>+		qdev-&gt;mailbox_out = PROC_ADDR_MPI_RISC | PROC_ADDR_FUNC2_MBO;</div><div class='add'>+	} else {</div><div class='add'>+		qdev-&gt;xg_sem_mask = SEM_XGMAC0_MASK;</div><div class='add'>+		qdev-&gt;port_link_up = STS_PL0;</div><div class='add'>+		qdev-&gt;port_init = STS_PI0;</div><div class='add'>+		qdev-&gt;mailbox_in = PROC_ADDR_MPI_RISC | PROC_ADDR_FUNC0_MBI;</div><div class='add'>+		qdev-&gt;mailbox_out = PROC_ADDR_MPI_RISC | PROC_ADDR_FUNC0_MBO;</div><div class='add'>+	}</div><div class='add'>+	qdev-&gt;chip_rev_id = ql_read32(qdev, REV_ID);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ql_release_all(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ndev = pci_get_drvdata(pdev);</div><div class='add'>+	struct ql_adapter *qdev = netdev_priv(ndev);</div><div class='add'>+</div><div class='add'>+	if (qdev-&gt;workqueue) {</div><div class='add'>+		destroy_workqueue(qdev-&gt;workqueue);</div><div class='add'>+		qdev-&gt;workqueue = NULL;</div><div class='add'>+	}</div><div class='add'>+	if (qdev-&gt;q_workqueue) {</div><div class='add'>+		destroy_workqueue(qdev-&gt;q_workqueue);</div><div class='add'>+		qdev-&gt;q_workqueue = NULL;</div><div class='add'>+	}</div><div class='add'>+	if (qdev-&gt;reg_base)</div><div class='add'>+		iounmap((void *)qdev-&gt;reg_base);</div><div class='add'>+	if (qdev-&gt;doorbell_area)</div><div class='add'>+		iounmap(qdev-&gt;doorbell_area);</div><div class='add'>+	pci_release_regions(pdev);</div><div class='add'>+	pci_set_drvdata(pdev, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devinit ql_init_device(struct pci_dev *pdev,</div><div class='add'>+				    struct net_device *ndev, int cards_found)</div><div class='add'>+{</div><div class='add'>+	struct ql_adapter *qdev = netdev_priv(ndev);</div><div class='add'>+	int pos, err = 0;</div><div class='add'>+	u16 val16;</div><div class='add'>+</div><div class='add'>+	memset((void *)qdev, 0, sizeof(qdev));</div><div class='add'>+	err = pci_enable_device(pdev);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "PCI device enable failed.\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pos = pci_find_capability(pdev, PCI_CAP_ID_EXP);</div><div class='add'>+	if (pos &lt;= 0) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, PFX "Cannot find PCI Express capability, "</div><div class='add'>+			"aborting.\n");</div><div class='add'>+		goto err_out;</div><div class='add'>+	} else {</div><div class='add'>+		pci_read_config_word(pdev, pos + PCI_EXP_DEVCTL, &amp;val16);</div><div class='add'>+		val16 &amp;= ~PCI_EXP_DEVCTL_NOSNOOP_EN;</div><div class='add'>+		val16 |= (PCI_EXP_DEVCTL_CERE |</div><div class='add'>+			  PCI_EXP_DEVCTL_NFERE |</div><div class='add'>+			  PCI_EXP_DEVCTL_FERE | PCI_EXP_DEVCTL_URRE);</div><div class='add'>+		pci_write_config_word(pdev, pos + PCI_EXP_DEVCTL, val16);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = pci_request_regions(pdev, DRV_NAME);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "PCI region request failed.\n");</div><div class='add'>+		goto err_out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pci_set_master(pdev);</div><div class='add'>+	if (!pci_set_dma_mask(pdev, DMA_64BIT_MASK)) {</div><div class='add'>+		set_bit(QL_DMA64, &amp;qdev-&gt;flags);</div><div class='add'>+		err = pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK);</div><div class='add'>+	} else {</div><div class='add'>+		err = pci_set_dma_mask(pdev, DMA_32BIT_MASK);</div><div class='add'>+		if (!err)</div><div class='add'>+		       err = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "No usable DMA configuration.\n");</div><div class='add'>+		goto err_out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pci_set_drvdata(pdev, ndev);</div><div class='add'>+	qdev-&gt;reg_base =</div><div class='add'>+	    ioremap_nocache(pci_resource_start(pdev, 1),</div><div class='add'>+			    pci_resource_len(pdev, 1));</div><div class='add'>+	if (!qdev-&gt;reg_base) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Register mapping failed.\n");</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto err_out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	qdev-&gt;doorbell_area_size = pci_resource_len(pdev, 3);</div><div class='add'>+	qdev-&gt;doorbell_area =</div><div class='add'>+	    ioremap_nocache(pci_resource_start(pdev, 3),</div><div class='add'>+			    pci_resource_len(pdev, 3));</div><div class='add'>+	if (!qdev-&gt;doorbell_area) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Doorbell register mapping failed.\n");</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto err_out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ql_get_board_info(qdev);</div><div class='add'>+	qdev-&gt;ndev = ndev;</div><div class='add'>+	qdev-&gt;pdev = pdev;</div><div class='add'>+	qdev-&gt;msg_enable = netif_msg_init(debug, default_msg);</div><div class='add'>+	spin_lock_init(&amp;qdev-&gt;hw_lock);</div><div class='add'>+	spin_lock_init(&amp;qdev-&gt;stats_lock);</div><div class='add'>+</div><div class='add'>+	/* make sure the EEPROM is good */</div><div class='add'>+	err = ql_get_flash_params(qdev);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Invalid FLASH.\n");</div><div class='add'>+		goto err_out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!is_valid_ether_addr(qdev-&gt;flash.mac_addr))</div><div class='add'>+		goto err_out;</div><div class='add'>+</div><div class='add'>+	memcpy(ndev-&gt;dev_addr, qdev-&gt;flash.mac_addr, ndev-&gt;addr_len);</div><div class='add'>+	memcpy(ndev-&gt;perm_addr, ndev-&gt;dev_addr, ndev-&gt;addr_len);</div><div class='add'>+</div><div class='add'>+	/* Set up the default ring sizes. */</div><div class='add'>+	qdev-&gt;tx_ring_size = NUM_TX_RING_ENTRIES;</div><div class='add'>+	qdev-&gt;rx_ring_size = NUM_RX_RING_ENTRIES;</div><div class='add'>+</div><div class='add'>+	/* Set up the coalescing parameters. */</div><div class='add'>+	qdev-&gt;rx_coalesce_usecs = DFLT_COALESCE_WAIT;</div><div class='add'>+	qdev-&gt;tx_coalesce_usecs = DFLT_COALESCE_WAIT;</div><div class='add'>+	qdev-&gt;rx_max_coalesced_frames = DFLT_INTER_FRAME_WAIT;</div><div class='add'>+	qdev-&gt;tx_max_coalesced_frames = DFLT_INTER_FRAME_WAIT;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Set up the operating parameters.</div><div class='add'>+	 */</div><div class='add'>+	qdev-&gt;rx_csum = 1;</div><div class='add'>+</div><div class='add'>+	qdev-&gt;q_workqueue = create_workqueue(ndev-&gt;name);</div><div class='add'>+	qdev-&gt;workqueue = create_singlethread_workqueue(ndev-&gt;name);</div><div class='add'>+	INIT_DELAYED_WORK(&amp;qdev-&gt;asic_reset_work, ql_asic_reset_work);</div><div class='add'>+	INIT_DELAYED_WORK(&amp;qdev-&gt;mpi_reset_work, ql_mpi_reset_work);</div><div class='add'>+	INIT_DELAYED_WORK(&amp;qdev-&gt;mpi_work, ql_mpi_work);</div><div class='add'>+</div><div class='add'>+	if (!cards_found) {</div><div class='add'>+		dev_info(&amp;pdev-&gt;dev, "%s\n", DRV_STRING);</div><div class='add'>+		dev_info(&amp;pdev-&gt;dev, "Driver name: %s, Version: %s.\n",</div><div class='add'>+			 DRV_NAME, DRV_VERSION);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+err_out:</div><div class='add'>+	ql_release_all(pdev);</div><div class='add'>+	pci_disable_device(pdev);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devinit qlge_probe(struct pci_dev *pdev,</div><div class='add'>+				const struct pci_device_id *pci_entry)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ndev = NULL;</div><div class='add'>+	struct ql_adapter *qdev = NULL;</div><div class='add'>+	static int cards_found = 0;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	ndev = alloc_etherdev(sizeof(struct ql_adapter));</div><div class='add'>+	if (!ndev)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	err = ql_init_device(pdev, ndev, cards_found);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		free_netdev(ndev);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	qdev = netdev_priv(ndev);</div><div class='add'>+	SET_NETDEV_DEV(ndev, &amp;pdev-&gt;dev);</div><div class='add'>+	ndev-&gt;features = (0</div><div class='add'>+			  | NETIF_F_IP_CSUM</div><div class='add'>+			  | NETIF_F_SG</div><div class='add'>+			  | NETIF_F_TSO</div><div class='add'>+			  | NETIF_F_TSO6</div><div class='add'>+			  | NETIF_F_TSO_ECN</div><div class='add'>+			  | NETIF_F_HW_VLAN_TX</div><div class='add'>+			  | NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_FILTER);</div><div class='add'>+</div><div class='add'>+	if (test_bit(QL_DMA64, &amp;qdev-&gt;flags))</div><div class='add'>+		ndev-&gt;features |= NETIF_F_HIGHDMA;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Set up net_device structure.</div><div class='add'>+	 */</div><div class='add'>+	ndev-&gt;tx_queue_len = qdev-&gt;tx_ring_size;</div><div class='add'>+	ndev-&gt;irq = pdev-&gt;irq;</div><div class='add'>+	ndev-&gt;open = qlge_open;</div><div class='add'>+	ndev-&gt;stop = qlge_close;</div><div class='add'>+	ndev-&gt;hard_start_xmit = qlge_send;</div><div class='add'>+	SET_ETHTOOL_OPS(ndev, &amp;qlge_ethtool_ops);</div><div class='add'>+	ndev-&gt;change_mtu = qlge_change_mtu;</div><div class='add'>+	ndev-&gt;get_stats = qlge_get_stats;</div><div class='add'>+	ndev-&gt;set_multicast_list = qlge_set_multicast_list;</div><div class='add'>+	ndev-&gt;set_mac_address = qlge_set_mac_address;</div><div class='add'>+	ndev-&gt;tx_timeout = qlge_tx_timeout;</div><div class='add'>+	ndev-&gt;watchdog_timeo = 10 * HZ;</div><div class='add'>+	ndev-&gt;vlan_rx_register = ql_vlan_rx_register;</div><div class='add'>+	ndev-&gt;vlan_rx_add_vid = ql_vlan_rx_add_vid;</div><div class='add'>+	ndev-&gt;vlan_rx_kill_vid = ql_vlan_rx_kill_vid;</div><div class='add'>+	err = register_netdev(ndev);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "net device registration failed.\n");</div><div class='add'>+		ql_release_all(pdev);</div><div class='add'>+		pci_disable_device(pdev);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+	netif_carrier_off(ndev);</div><div class='add'>+	netif_stop_queue(ndev);</div><div class='add'>+	ql_display_dev_info(ndev);</div><div class='add'>+	cards_found++;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __devexit qlge_remove(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ndev = pci_get_drvdata(pdev);</div><div class='add'>+	unregister_netdev(ndev);</div><div class='add'>+	ql_release_all(pdev);</div><div class='add'>+	pci_disable_device(pdev);</div><div class='add'>+	free_netdev(ndev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This callback is called by the PCI subsystem whenever</div><div class='add'>+ * a PCI bus error is detected.</div><div class='add'>+ */</div><div class='add'>+static pci_ers_result_t qlge_io_error_detected(struct pci_dev *pdev,</div><div class='add'>+					       enum pci_channel_state state)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ndev = pci_get_drvdata(pdev);</div><div class='add'>+	struct ql_adapter *qdev = netdev_priv(ndev);</div><div class='add'>+</div><div class='add'>+	if (netif_running(ndev))</div><div class='add'>+		ql_adapter_down(qdev);</div><div class='add'>+</div><div class='add'>+	pci_disable_device(pdev);</div><div class='add'>+</div><div class='add'>+	/* Request a slot reset. */</div><div class='add'>+	return PCI_ERS_RESULT_NEED_RESET;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This callback is called after the PCI buss has been reset.</div><div class='add'>+ * Basically, this tries to restart the card from scratch.</div><div class='add'>+ * This is a shortened version of the device probe/discovery code,</div><div class='add'>+ * it resembles the first-half of the () routine.</div><div class='add'>+ */</div><div class='add'>+static pci_ers_result_t qlge_io_slot_reset(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ndev = pci_get_drvdata(pdev);</div><div class='add'>+	struct ql_adapter *qdev = netdev_priv(ndev);</div><div class='add'>+</div><div class='add'>+	if (pci_enable_device(pdev)) {</div><div class='add'>+		QPRINTK(qdev, IFUP, ERR,</div><div class='add'>+			"Cannot re-enable PCI device after reset.\n");</div><div class='add'>+		return PCI_ERS_RESULT_DISCONNECT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pci_set_master(pdev);</div><div class='add'>+</div><div class='add'>+	netif_carrier_off(ndev);</div><div class='add'>+	netif_stop_queue(ndev);</div><div class='add'>+	ql_adapter_reset(qdev);</div><div class='add'>+</div><div class='add'>+	/* Make sure the EEPROM is good */</div><div class='add'>+	memcpy(ndev-&gt;perm_addr, ndev-&gt;dev_addr, ndev-&gt;addr_len);</div><div class='add'>+</div><div class='add'>+	if (!is_valid_ether_addr(ndev-&gt;perm_addr)) {</div><div class='add'>+		QPRINTK(qdev, IFUP, ERR, "After reset, invalid MAC address.\n");</div><div class='add'>+		return PCI_ERS_RESULT_DISCONNECT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return PCI_ERS_RESULT_RECOVERED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void qlge_io_resume(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ndev = pci_get_drvdata(pdev);</div><div class='add'>+	struct ql_adapter *qdev = netdev_priv(ndev);</div><div class='add'>+</div><div class='add'>+	pci_set_master(pdev);</div><div class='add'>+</div><div class='add'>+	if (netif_running(ndev)) {</div><div class='add'>+		if (ql_adapter_up(qdev)) {</div><div class='add'>+			QPRINTK(qdev, IFUP, ERR,</div><div class='add'>+				"Device initialization failed after reset.\n");</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netif_device_attach(ndev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct pci_error_handlers qlge_err_handler = {</div><div class='add'>+	.error_detected = qlge_io_error_detected,</div><div class='add'>+	.slot_reset = qlge_io_slot_reset,</div><div class='add'>+	.resume = qlge_io_resume,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int qlge_suspend(struct pci_dev *pdev, pm_message_t state)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ndev = pci_get_drvdata(pdev);</div><div class='add'>+	struct ql_adapter *qdev = netdev_priv(ndev);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	netif_device_detach(ndev);</div><div class='add'>+</div><div class='add'>+	if (netif_running(ndev)) {</div><div class='add'>+		err = ql_adapter_down(qdev);</div><div class='add'>+		if (!err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = pci_save_state(pdev);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	pci_disable_device(pdev);</div><div class='add'>+</div><div class='add'>+	pci_set_power_state(pdev, pci_choose_state(pdev, state));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+static int qlge_resume(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ndev = pci_get_drvdata(pdev);</div><div class='add'>+	struct ql_adapter *qdev = netdev_priv(ndev);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	pci_set_power_state(pdev, PCI_D0);</div><div class='add'>+	pci_restore_state(pdev);</div><div class='add'>+	err = pci_enable_device(pdev);</div><div class='add'>+	if (err) {</div><div class='add'>+		QPRINTK(qdev, IFUP, ERR, "Cannot enable PCI device from suspend\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+	pci_set_master(pdev);</div><div class='add'>+</div><div class='add'>+	pci_enable_wake(pdev, PCI_D3hot, 0);</div><div class='add'>+	pci_enable_wake(pdev, PCI_D3cold, 0);</div><div class='add'>+</div><div class='add'>+	if (netif_running(ndev)) {</div><div class='add'>+		err = ql_adapter_up(qdev);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netif_device_attach(ndev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_PM */</div><div class='add'>+</div><div class='add'>+static void qlge_shutdown(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	qlge_suspend(pdev, PMSG_SUSPEND);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct pci_driver qlge_driver = {</div><div class='add'>+	.name = DRV_NAME,</div><div class='add'>+	.id_table = qlge_pci_tbl,</div><div class='add'>+	.probe = qlge_probe,</div><div class='add'>+	.remove = __devexit_p(qlge_remove),</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+	.suspend = qlge_suspend,</div><div class='add'>+	.resume = qlge_resume,</div><div class='add'>+#endif</div><div class='add'>+	.shutdown = qlge_shutdown,</div><div class='add'>+	.err_handler = &amp;qlge_err_handler</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init qlge_init_module(void)</div><div class='add'>+{</div><div class='add'>+	return pci_register_driver(&amp;qlge_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit qlge_exit(void)</div><div class='add'>+{</div><div class='add'>+	pci_unregister_driver(&amp;qlge_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(qlge_init_module);</div><div class='add'>+module_exit(qlge_exit);</div><div class='head'>diff --git a/drivers/net/qlge/qlge_mpi.c b/drivers/net/qlge/qlge_mpi.c<br/>new file mode 100644<br/>index 000000000000..24fe344bcf1f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/qlge/qlge_mpi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/qlge/qlge_mpi.c</a></div><div class='hunk'>@@ -0,0 +1,150 @@</div><div class='add'>+#include "qlge.h"</div><div class='add'>+</div><div class='add'>+static int ql_read_mbox_reg(struct ql_adapter *qdev, u32 reg, u32 *data)</div><div class='add'>+{</div><div class='add'>+	int status;</div><div class='add'>+	/* wait for reg to come ready */</div><div class='add'>+	status = ql_wait_reg_rdy(qdev, PROC_ADDR, PROC_ADDR_RDY, PROC_ADDR_ERR);</div><div class='add'>+	if (status)</div><div class='add'>+		goto exit;</div><div class='add'>+	/* set up for reg read */</div><div class='add'>+	ql_write32(qdev, PROC_ADDR, reg | PROC_ADDR_R);</div><div class='add'>+	/* wait for reg to come ready */</div><div class='add'>+	status = ql_wait_reg_rdy(qdev, PROC_ADDR, PROC_ADDR_RDY, PROC_ADDR_ERR);</div><div class='add'>+	if (status)</div><div class='add'>+		goto exit;</div><div class='add'>+	/* get the data */</div><div class='add'>+	*data = ql_read32(qdev, PROC_DATA);</div><div class='add'>+exit:</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ql_get_mb_sts(struct ql_adapter *qdev, struct mbox_params *mbcp)</div><div class='add'>+{</div><div class='add'>+	int i, status;</div><div class='add'>+</div><div class='add'>+	status = ql_sem_spinlock(qdev, SEM_PROC_REG_MASK);</div><div class='add'>+	if (status)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	for (i = 0; i &lt; mbcp-&gt;out_count; i++) {</div><div class='add'>+		status =</div><div class='add'>+		    ql_read_mbox_reg(qdev, qdev-&gt;mailbox_out + i,</div><div class='add'>+				     &amp;mbcp-&gt;mbox_out[i]);</div><div class='add'>+		if (status) {</div><div class='add'>+			QPRINTK(qdev, DRV, ERR, "Failed mailbox read.\n");</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	ql_sem_unlock(qdev, SEM_PROC_REG_MASK);	/* does flush too */</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ql_link_up(struct ql_adapter *qdev, struct mbox_params *mbcp)</div><div class='add'>+{</div><div class='add'>+	mbcp-&gt;out_count = 2;</div><div class='add'>+</div><div class='add'>+	if (ql_get_mb_sts(qdev, mbcp))</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	qdev-&gt;link_status = mbcp-&gt;mbox_out[1];</div><div class='add'>+	QPRINTK(qdev, DRV, ERR, "Link Up.\n");</div><div class='add'>+	QPRINTK(qdev, DRV, INFO, "Link Status = 0x%.08x.\n", mbcp-&gt;mbox_out[1]);</div><div class='add'>+	if (!netif_carrier_ok(qdev-&gt;ndev)) {</div><div class='add'>+		QPRINTK(qdev, LINK, INFO, "Link is Up.\n");</div><div class='add'>+		netif_carrier_on(qdev-&gt;ndev);</div><div class='add'>+		netif_wake_queue(qdev-&gt;ndev);</div><div class='add'>+	}</div><div class='add'>+exit:</div><div class='add'>+	/* Clear the MPI firmware status. */</div><div class='add'>+	ql_write32(qdev, CSR, CSR_CMD_CLR_R2PCI_INT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ql_link_down(struct ql_adapter *qdev, struct mbox_params *mbcp)</div><div class='add'>+{</div><div class='add'>+	mbcp-&gt;out_count = 3;</div><div class='add'>+</div><div class='add'>+	if (ql_get_mb_sts(qdev, mbcp)) {</div><div class='add'>+		QPRINTK(qdev, DRV, ERR, "Firmware did not initialize!\n");</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (netif_carrier_ok(qdev-&gt;ndev)) {</div><div class='add'>+		QPRINTK(qdev, LINK, INFO, "Link is Down.\n");</div><div class='add'>+		netif_carrier_off(qdev-&gt;ndev);</div><div class='add'>+		netif_stop_queue(qdev-&gt;ndev);</div><div class='add'>+	}</div><div class='add'>+	QPRINTK(qdev, DRV, ERR, "Link Down.\n");</div><div class='add'>+	QPRINTK(qdev, DRV, ERR, "Link Status = 0x%.08x.\n", mbcp-&gt;mbox_out[1]);</div><div class='add'>+exit:</div><div class='add'>+	/* Clear the MPI firmware status. */</div><div class='add'>+	ql_write32(qdev, CSR, CSR_CMD_CLR_R2PCI_INT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ql_init_fw_done(struct ql_adapter *qdev, struct mbox_params *mbcp)</div><div class='add'>+{</div><div class='add'>+	mbcp-&gt;out_count = 2;</div><div class='add'>+</div><div class='add'>+	if (ql_get_mb_sts(qdev, mbcp)) {</div><div class='add'>+		QPRINTK(qdev, DRV, ERR, "Firmware did not initialize!\n");</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+	QPRINTK(qdev, DRV, ERR, "Firmware initialized!\n");</div><div class='add'>+	QPRINTK(qdev, DRV, ERR, "Firmware status = 0x%.08x.\n",</div><div class='add'>+		mbcp-&gt;mbox_out[0]);</div><div class='add'>+	QPRINTK(qdev, DRV, ERR, "Firmware Revision  = 0x%.08x.\n",</div><div class='add'>+		mbcp-&gt;mbox_out[1]);</div><div class='add'>+exit:</div><div class='add'>+	/* Clear the MPI firmware status. */</div><div class='add'>+	ql_write32(qdev, CSR, CSR_CMD_CLR_R2PCI_INT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ql_mpi_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct ql_adapter *qdev =</div><div class='add'>+	    container_of(work, struct ql_adapter, mpi_work.work);</div><div class='add'>+	struct mbox_params mbc;</div><div class='add'>+	struct mbox_params *mbcp = &amp;mbc;</div><div class='add'>+	mbcp-&gt;out_count = 1;</div><div class='add'>+</div><div class='add'>+	while (ql_read32(qdev, STS) &amp; STS_PI) {</div><div class='add'>+		if (ql_get_mb_sts(qdev, mbcp)) {</div><div class='add'>+			QPRINTK(qdev, DRV, ERR,</div><div class='add'>+				"Could not read MPI, resetting ASIC!\n");</div><div class='add'>+			ql_queue_asic_error(qdev);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		switch (mbcp-&gt;mbox_out[0]) {</div><div class='add'>+		case AEN_LINK_UP:</div><div class='add'>+			ql_link_up(qdev, mbcp);</div><div class='add'>+			break;</div><div class='add'>+		case AEN_LINK_DOWN:</div><div class='add'>+			ql_link_down(qdev, mbcp);</div><div class='add'>+			break;</div><div class='add'>+		case AEN_FW_INIT_DONE:</div><div class='add'>+			ql_init_fw_done(qdev, mbcp);</div><div class='add'>+			break;</div><div class='add'>+		case MB_CMD_STS_GOOD:</div><div class='add'>+			break;</div><div class='add'>+		case AEN_FW_INIT_FAIL:</div><div class='add'>+		case AEN_SYS_ERR:</div><div class='add'>+		case MB_CMD_STS_ERR:</div><div class='add'>+			ql_queue_fw_error(qdev);</div><div class='add'>+		default:</div><div class='add'>+			/* Clear the MPI firmware status. */</div><div class='add'>+			ql_write32(qdev, CSR, CSR_CMD_CLR_R2PCI_INT);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	ql_enable_completion_interrupt(qdev, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ql_mpi_reset_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct ql_adapter *qdev =</div><div class='add'>+	    container_of(work, struct ql_adapter, mpi_reset_work.work);</div><div class='add'>+	QPRINTK(qdev, DRV, ERR,</div><div class='add'>+		"Enter, qdev = %p..\n", qdev);</div><div class='add'>+	ql_write32(qdev, CSR, CSR_CMD_SET_RST);</div><div class='add'>+	msleep(50);</div><div class='add'>+	ql_write32(qdev, CSR, CSR_CMD_CLR_RST);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/r6040.c b/drivers/net/r6040.c<br/>index 5d86281d9363..34fe7ef8e5ed 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/r6040.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/r6040.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/r6040.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/r6040.c</a></div><div class='hunk'>@@ -265,7 +265,7 @@ static void r6040_free_txbufs(struct net_device *dev)</div><div class='ctx'> 				le32_to_cpu(lp-&gt;tx_insert_ptr-&gt;buf),</div><div class='ctx'> 				MAX_BUF_SIZE, PCI_DMA_TODEVICE);</div><div class='ctx'> 			dev_kfree_skb(lp-&gt;tx_insert_ptr-&gt;skb_ptr);</div><div class='del'>-			lp-&gt;rx_insert_ptr-&gt;skb_ptr = NULL;</div><div class='add'>+			lp-&gt;tx_insert_ptr-&gt;skb_ptr = NULL;</div><div class='ctx'> 		}</div><div class='ctx'> 		lp-&gt;tx_insert_ptr = lp-&gt;tx_insert_ptr-&gt;vndescp;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -370,7 +370,7 @@ static void r6040_init_mac_regs(struct net_device *dev)</div><div class='ctx'> 	/* Reset internal state machine */</div><div class='ctx'> 	iowrite16(2, ioaddr + MAC_SM);</div><div class='ctx'> 	iowrite16(0, ioaddr + MAC_SM);</div><div class='del'>-	udelay(5000);</div><div class='add'>+	mdelay(5);</div><div class='ctx'> </div><div class='ctx'> 	/* MAC Bus Control Register */</div><div class='ctx'> 	iowrite16(MBCR_DEFAULT, ioaddr + MBCR);</div><div class='hunk'>@@ -806,7 +806,7 @@ static void r6040_mac_address(struct net_device *dev)</div><div class='ctx'> 	iowrite16(0x01, ioaddr + MCR1); /* Reset MAC */</div><div class='ctx'> 	iowrite16(2, ioaddr + MAC_SM); /* Reset internal state machine */</div><div class='ctx'> 	iowrite16(0, ioaddr + MAC_SM);</div><div class='del'>-	udelay(5000);</div><div class='add'>+	mdelay(5);</div><div class='ctx'> </div><div class='ctx'> 	/* Restore MAC Address */</div><div class='ctx'> 	adrp = (u16 *) dev-&gt;dev_addr;</div><div class='head'>diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c<br/>index 0f6f9747d255..c821da21d8eb 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/r8169.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/r8169.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/r8169.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/r8169.c</a></div><div class='hunk'>@@ -36,7 +36,7 @@</div><div class='ctx'> #define assert(expr) \</div><div class='ctx'> 	if (!(expr)) {					\</div><div class='ctx'> 		printk( "Assertion failed! %s,%s,%s,line=%d\n",	\</div><div class='del'>-		#expr,__FILE__,__FUNCTION__,__LINE__);		\</div><div class='add'>+		#expr,__FILE__,__func__,__LINE__);		\</div><div class='ctx'> 	}</div><div class='ctx'> #define dprintk(fmt, args...) \</div><div class='ctx'> 	do { printk(KERN_DEBUG PFX fmt, ## args); } while (0)</div><div class='hunk'>@@ -61,6 +61,7 @@ static const int multicast_filter_limit = 32;</div><div class='ctx'> /* MAC address length */</div><div class='ctx'> #define MAC_ADDR_LEN	6</div><div class='ctx'> </div><div class='add'>+#define MAX_READ_REQUEST_SHIFT	12</div><div class='ctx'> #define RX_FIFO_THRESH	7	/* 7 means NO threshold, Rx buffer level before first PCI xfer. */</div><div class='ctx'> #define RX_DMA_BURST	6	/* Maximum PCI burst, '6' is 1024 */</div><div class='ctx'> #define TX_DMA_BURST	6	/* Maximum PCI burst, '6' is 1024 */</div><div class='hunk'>@@ -95,6 +96,10 @@ enum mac_version {</div><div class='ctx'> 	RTL_GIGA_MAC_VER_04 = 0x04, // 8169SB</div><div class='ctx'> 	RTL_GIGA_MAC_VER_05 = 0x05, // 8110SCd</div><div class='ctx'> 	RTL_GIGA_MAC_VER_06 = 0x06, // 8110SCe</div><div class='add'>+	RTL_GIGA_MAC_VER_07 = 0x07, // 8102e</div><div class='add'>+	RTL_GIGA_MAC_VER_08 = 0x08, // 8102e</div><div class='add'>+	RTL_GIGA_MAC_VER_09 = 0x09, // 8102e</div><div class='add'>+	RTL_GIGA_MAC_VER_10 = 0x0a, // 8101e</div><div class='ctx'> 	RTL_GIGA_MAC_VER_11 = 0x0b, // 8168Bb</div><div class='ctx'> 	RTL_GIGA_MAC_VER_12 = 0x0c, // 8168Be</div><div class='ctx'> 	RTL_GIGA_MAC_VER_13 = 0x0d, // 8101Eb</div><div class='hunk'>@@ -104,7 +109,12 @@ enum mac_version {</div><div class='ctx'> 	RTL_GIGA_MAC_VER_17 = 0x10, // 8168Bf</div><div class='ctx'> 	RTL_GIGA_MAC_VER_18 = 0x12, // 8168CP</div><div class='ctx'> 	RTL_GIGA_MAC_VER_19 = 0x13, // 8168C</div><div class='del'>-	RTL_GIGA_MAC_VER_20 = 0x14  // 8168C</div><div class='add'>+	RTL_GIGA_MAC_VER_20 = 0x14, // 8168C</div><div class='add'>+	RTL_GIGA_MAC_VER_21 = 0x15, // 8168C</div><div class='add'>+	RTL_GIGA_MAC_VER_22 = 0x16, // 8168C</div><div class='add'>+	RTL_GIGA_MAC_VER_23 = 0x17, // 8168CP</div><div class='add'>+	RTL_GIGA_MAC_VER_24 = 0x18, // 8168CP</div><div class='add'>+	RTL_GIGA_MAC_VER_25 = 0x19  // 8168D</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define _R(NAME,MAC,MASK) \</div><div class='hunk'>@@ -121,6 +131,10 @@ static const struct {</div><div class='ctx'> 	_R("RTL8169sb/8110sb",	RTL_GIGA_MAC_VER_04, 0xff7e1880), // 8169SB</div><div class='ctx'> 	_R("RTL8169sc/8110sc",	RTL_GIGA_MAC_VER_05, 0xff7e1880), // 8110SCd</div><div class='ctx'> 	_R("RTL8169sc/8110sc",	RTL_GIGA_MAC_VER_06, 0xff7e1880), // 8110SCe</div><div class='add'>+	_R("RTL8102e",		RTL_GIGA_MAC_VER_07, 0xff7e1880), // PCI-E</div><div class='add'>+	_R("RTL8102e",		RTL_GIGA_MAC_VER_08, 0xff7e1880), // PCI-E</div><div class='add'>+	_R("RTL8102e",		RTL_GIGA_MAC_VER_09, 0xff7e1880), // PCI-E</div><div class='add'>+	_R("RTL8101e",		RTL_GIGA_MAC_VER_10, 0xff7e1880), // PCI-E</div><div class='ctx'> 	_R("RTL8168b/8111b",	RTL_GIGA_MAC_VER_11, 0xff7e1880), // PCI-E</div><div class='ctx'> 	_R("RTL8168b/8111b",	RTL_GIGA_MAC_VER_12, 0xff7e1880), // PCI-E</div><div class='ctx'> 	_R("RTL8101e",		RTL_GIGA_MAC_VER_13, 0xff7e1880), // PCI-E 8139</div><div class='hunk'>@@ -130,7 +144,12 @@ static const struct {</div><div class='ctx'> 	_R("RTL8101e",		RTL_GIGA_MAC_VER_16, 0xff7e1880), // PCI-E</div><div class='ctx'> 	_R("RTL8168cp/8111cp",	RTL_GIGA_MAC_VER_18, 0xff7e1880), // PCI-E</div><div class='ctx'> 	_R("RTL8168c/8111c",	RTL_GIGA_MAC_VER_19, 0xff7e1880), // PCI-E</div><div class='del'>-	_R("RTL8168c/8111c",	RTL_GIGA_MAC_VER_20, 0xff7e1880)  // PCI-E</div><div class='add'>+	_R("RTL8168c/8111c",	RTL_GIGA_MAC_VER_20, 0xff7e1880), // PCI-E</div><div class='add'>+	_R("RTL8168c/8111c",	RTL_GIGA_MAC_VER_21, 0xff7e1880), // PCI-E</div><div class='add'>+	_R("RTL8168c/8111c",	RTL_GIGA_MAC_VER_22, 0xff7e1880), // PCI-E</div><div class='add'>+	_R("RTL8168cp/8111cp",	RTL_GIGA_MAC_VER_23, 0xff7e1880), // PCI-E</div><div class='add'>+	_R("RTL8168cp/8111cp",	RTL_GIGA_MAC_VER_24, 0xff7e1880), // PCI-E</div><div class='add'>+	_R("RTL8168d/8111d",	RTL_GIGA_MAC_VER_25, 0xff7e1880)  // PCI-E</div><div class='ctx'> };</div><div class='ctx'> #undef _R</div><div class='ctx'> </div><div class='hunk'>@@ -196,9 +215,6 @@ enum rtl_registers {</div><div class='ctx'> 	Config5		= 0x56,</div><div class='ctx'> 	MultiIntr	= 0x5c,</div><div class='ctx'> 	PHYAR		= 0x60,</div><div class='del'>-	TBICSR		= 0x64,</div><div class='del'>-	TBI_ANAR	= 0x68,</div><div class='del'>-	TBI_LPAR	= 0x6a,</div><div class='ctx'> 	PHYstatus	= 0x6c,</div><div class='ctx'> 	RxMaxSize	= 0xda,</div><div class='ctx'> 	CPlusCmd	= 0xe0,</div><div class='hunk'>@@ -212,6 +228,32 @@ enum rtl_registers {</div><div class='ctx'> 	FuncForceEvent	= 0xfc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum rtl8110_registers {</div><div class='add'>+	TBICSR			= 0x64,</div><div class='add'>+	TBI_ANAR		= 0x68,</div><div class='add'>+	TBI_LPAR		= 0x6a,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum rtl8168_8101_registers {</div><div class='add'>+	CSIDR			= 0x64,</div><div class='add'>+	CSIAR			= 0x68,</div><div class='add'>+#define	CSIAR_FLAG			0x80000000</div><div class='add'>+#define	CSIAR_WRITE_CMD			0x80000000</div><div class='add'>+#define	CSIAR_BYTE_ENABLE		0x0f</div><div class='add'>+#define	CSIAR_BYTE_ENABLE_SHIFT		12</div><div class='add'>+#define	CSIAR_ADDR_MASK			0x0fff</div><div class='add'>+</div><div class='add'>+	EPHYAR			= 0x80,</div><div class='add'>+#define	EPHYAR_FLAG			0x80000000</div><div class='add'>+#define	EPHYAR_WRITE_CMD		0x80000000</div><div class='add'>+#define	EPHYAR_REG_MASK			0x1f</div><div class='add'>+#define	EPHYAR_REG_SHIFT		16</div><div class='add'>+#define	EPHYAR_DATA_MASK		0xffff</div><div class='add'>+	DBG_REG			= 0xd1,</div><div class='add'>+#define	FIX_NAK_1			(1 &lt;&lt; 4)</div><div class='add'>+#define	FIX_NAK_2			(1 &lt;&lt; 3)</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> enum rtl_register_content {</div><div class='ctx'> 	/* InterruptStatusBits */</div><div class='ctx'> 	SYSErr		= 0x8000,</div><div class='hunk'>@@ -265,7 +307,13 @@ enum rtl_register_content {</div><div class='ctx'> 	TxDMAShift = 8,	/* DMA burst value (0-7) is shift this many bits */</div><div class='ctx'> </div><div class='ctx'> 	/* Config1 register p.24 */</div><div class='add'>+	LEDS1		= (1 &lt;&lt; 7),</div><div class='add'>+	LEDS0		= (1 &lt;&lt; 6),</div><div class='ctx'> 	MSIEnable	= (1 &lt;&lt; 5),	/* Enable Message Signaled Interrupt */</div><div class='add'>+	Speed_down	= (1 &lt;&lt; 4),</div><div class='add'>+	MEMMAP		= (1 &lt;&lt; 3),</div><div class='add'>+	IOMAP		= (1 &lt;&lt; 2),</div><div class='add'>+	VPD		= (1 &lt;&lt; 1),</div><div class='ctx'> 	PMEnable	= (1 &lt;&lt; 0),	/* Power Management Enable */</div><div class='ctx'> </div><div class='ctx'> 	/* Config2 register p. 25 */</div><div class='hunk'>@@ -275,6 +323,7 @@ enum rtl_register_content {</div><div class='ctx'> 	/* Config3 register p.25 */</div><div class='ctx'> 	MagicPacket	= (1 &lt;&lt; 5),	/* Wake up when receives a Magic Packet */</div><div class='ctx'> 	LinkUp		= (1 &lt;&lt; 4),	/* Wake up when the cable connection is re-established */</div><div class='add'>+	Beacon_en	= (1 &lt;&lt; 0),	/* 8168 only. Reserved in the 8168b */</div><div class='ctx'> </div><div class='ctx'> 	/* Config5 register p.27 */</div><div class='ctx'> 	BWF		= (1 &lt;&lt; 6),	/* Accept Broadcast wakeup frame */</div><div class='hunk'>@@ -292,7 +341,16 @@ enum rtl_register_content {</div><div class='ctx'> 	TBINwComplete	= 0x01000000,</div><div class='ctx'> </div><div class='ctx'> 	/* CPlusCmd p.31 */</div><div class='del'>-	PktCntrDisable	= (1 &lt;&lt; 7),	// 8168</div><div class='add'>+	EnableBist	= (1 &lt;&lt; 15),	// 8168 8101</div><div class='add'>+	Mac_dbgo_oe	= (1 &lt;&lt; 14),	// 8168 8101</div><div class='add'>+	Normal_mode	= (1 &lt;&lt; 13),	// unused</div><div class='add'>+	Force_half_dup	= (1 &lt;&lt; 12),	// 8168 8101</div><div class='add'>+	Force_rxflow_en	= (1 &lt;&lt; 11),	// 8168 8101</div><div class='add'>+	Force_txflow_en	= (1 &lt;&lt; 10),	// 8168 8101</div><div class='add'>+	Cxpl_dbg_sel	= (1 &lt;&lt; 9),	// 8168 8101</div><div class='add'>+	ASF		= (1 &lt;&lt; 8),	// 8168 8101</div><div class='add'>+	PktCntrDisable	= (1 &lt;&lt; 7),	// 8168 8101</div><div class='add'>+	Mac_dbgo_sel	= 0x001c,	// 8168</div><div class='ctx'> 	RxVlan		= (1 &lt;&lt; 6),</div><div class='ctx'> 	RxChkSum	= (1 &lt;&lt; 5),</div><div class='ctx'> 	PCIDAC		= (1 &lt;&lt; 4),</div><div class='hunk'>@@ -370,8 +428,9 @@ struct ring_info {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum features {</div><div class='del'>-	RTL_FEATURE_WOL	= (1 &lt;&lt; 0),</div><div class='del'>-	RTL_FEATURE_MSI	= (1 &lt;&lt; 1),</div><div class='add'>+	RTL_FEATURE_WOL		= (1 &lt;&lt; 0),</div><div class='add'>+	RTL_FEATURE_MSI		= (1 &lt;&lt; 1),</div><div class='add'>+	RTL_FEATURE_GMII	= (1 &lt;&lt; 2),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct rtl8169_private {</div><div class='hunk'>@@ -406,13 +465,16 @@ struct rtl8169_private {</div><div class='ctx'> 	struct vlan_group *vlgrp;</div><div class='ctx'> #endif</div><div class='ctx'> 	int (*set_speed)(struct net_device *, u8 autoneg, u16 speed, u8 duplex);</div><div class='del'>-	void (*get_settings)(struct net_device *, struct ethtool_cmd *);</div><div class='add'>+	int (*get_settings)(struct net_device *, struct ethtool_cmd *);</div><div class='ctx'> 	void (*phy_reset_enable)(void __iomem *);</div><div class='ctx'> 	void (*hw_start)(struct net_device *);</div><div class='ctx'> 	unsigned int (*phy_reset_pending)(void __iomem *);</div><div class='ctx'> 	unsigned int (*link_ok)(void __iomem *);</div><div class='add'>+	int pcie_cap;</div><div class='ctx'> 	struct delayed_work task;</div><div class='ctx'> 	unsigned features;</div><div class='add'>+</div><div class='add'>+	struct mii_if_info mii;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Realtek and the Linux r8169 crew &lt;netdev@vger.kernel.org&gt;");</div><div class='hunk'>@@ -482,6 +544,94 @@ static int mdio_read(void __iomem *ioaddr, int reg_addr)</div><div class='ctx'> 	return value;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void mdio_patch(void __iomem *ioaddr, int reg_addr, int value)</div><div class='add'>+{</div><div class='add'>+	mdio_write(ioaddr, reg_addr, mdio_read(ioaddr, reg_addr) | value);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtl_mdio_write(struct net_device *dev, int phy_id, int location,</div><div class='add'>+			   int val)</div><div class='add'>+{</div><div class='add'>+	struct rtl8169_private *tp = netdev_priv(dev);</div><div class='add'>+	void __iomem *ioaddr = tp-&gt;mmio_addr;</div><div class='add'>+</div><div class='add'>+	mdio_write(ioaddr, location, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtl_mdio_read(struct net_device *dev, int phy_id, int location)</div><div class='add'>+{</div><div class='add'>+	struct rtl8169_private *tp = netdev_priv(dev);</div><div class='add'>+	void __iomem *ioaddr = tp-&gt;mmio_addr;</div><div class='add'>+</div><div class='add'>+	return mdio_read(ioaddr, location);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtl_ephy_write(void __iomem *ioaddr, int reg_addr, int value)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	RTL_W32(EPHYAR, EPHYAR_WRITE_CMD | (value &amp; EPHYAR_DATA_MASK) |</div><div class='add'>+		(reg_addr &amp; EPHYAR_REG_MASK) &lt;&lt; EPHYAR_REG_SHIFT);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 100; i++) {</div><div class='add'>+		if (!(RTL_R32(EPHYAR) &amp; EPHYAR_FLAG))</div><div class='add'>+			break;</div><div class='add'>+		udelay(10);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 rtl_ephy_read(void __iomem *ioaddr, int reg_addr)</div><div class='add'>+{</div><div class='add'>+	u16 value = 0xffff;</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	RTL_W32(EPHYAR, (reg_addr &amp; EPHYAR_REG_MASK) &lt;&lt; EPHYAR_REG_SHIFT);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 100; i++) {</div><div class='add'>+		if (RTL_R32(EPHYAR) &amp; EPHYAR_FLAG) {</div><div class='add'>+			value = RTL_R32(EPHYAR) &amp; EPHYAR_DATA_MASK;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		udelay(10);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return value;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtl_csi_write(void __iomem *ioaddr, int addr, int value)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	RTL_W32(CSIDR, value);</div><div class='add'>+	RTL_W32(CSIAR, CSIAR_WRITE_CMD | (addr &amp; CSIAR_ADDR_MASK) |</div><div class='add'>+		CSIAR_BYTE_ENABLE &lt;&lt; CSIAR_BYTE_ENABLE_SHIFT);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 100; i++) {</div><div class='add'>+		if (!(RTL_R32(CSIAR) &amp; CSIAR_FLAG))</div><div class='add'>+			break;</div><div class='add'>+		udelay(10);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 rtl_csi_read(void __iomem *ioaddr, int addr)</div><div class='add'>+{</div><div class='add'>+	u32 value = ~0x00;</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	RTL_W32(CSIAR, (addr &amp; CSIAR_ADDR_MASK) |</div><div class='add'>+		CSIAR_BYTE_ENABLE &lt;&lt; CSIAR_BYTE_ENABLE_SHIFT);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 100; i++) {</div><div class='add'>+		if (RTL_R32(CSIAR) &amp; CSIAR_FLAG) {</div><div class='add'>+			value = RTL_R32(CSIDR);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		udelay(10);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return value;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void rtl8169_irq_mask_and_ack(void __iomem *ioaddr)</div><div class='ctx'> {</div><div class='ctx'> 	RTL_W16(IntrMask, 0x0000);</div><div class='hunk'>@@ -619,6 +769,7 @@ static int rtl8169_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)</div><div class='ctx'> 		tp-&gt;features |= RTL_FEATURE_WOL;</div><div class='ctx'> 	else</div><div class='ctx'> 		tp-&gt;features &amp;= ~RTL_FEATURE_WOL;</div><div class='add'>+	device_set_wakeup_enable(&amp;tp-&gt;pci_dev-&gt;dev, wol-&gt;wolopts);</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irq(&amp;tp-&gt;lock);</div><div class='ctx'> </div><div class='hunk'>@@ -705,8 +856,12 @@ static int rtl8169_set_speed_xmii(struct net_device *dev,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* The 8100e/8101e do Fast Ethernet only. */</div><div class='del'>-	if ((tp-&gt;mac_version == RTL_GIGA_MAC_VER_13) ||</div><div class='add'>+	/* The 8100e/8101e/8102e do Fast Ethernet only. */</div><div class='add'>+	if ((tp-&gt;mac_version == RTL_GIGA_MAC_VER_07) ||</div><div class='add'>+	    (tp-&gt;mac_version == RTL_GIGA_MAC_VER_08) ||</div><div class='add'>+	    (tp-&gt;mac_version == RTL_GIGA_MAC_VER_09) ||</div><div class='add'>+	    (tp-&gt;mac_version == RTL_GIGA_MAC_VER_10) ||</div><div class='add'>+	    (tp-&gt;mac_version == RTL_GIGA_MAC_VER_13) ||</div><div class='ctx'> 	    (tp-&gt;mac_version == RTL_GIGA_MAC_VER_14) ||</div><div class='ctx'> 	    (tp-&gt;mac_version == RTL_GIGA_MAC_VER_15) ||</div><div class='ctx'> 	    (tp-&gt;mac_version == RTL_GIGA_MAC_VER_16)) {</div><div class='hunk'>@@ -720,9 +875,13 @@ static int rtl8169_set_speed_xmii(struct net_device *dev,</div><div class='ctx'> </div><div class='ctx'> 	auto_nego |= ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM;</div><div class='ctx'> </div><div class='del'>-	if ((tp-&gt;mac_version == RTL_GIGA_MAC_VER_12) ||</div><div class='del'>-	    (tp-&gt;mac_version == RTL_GIGA_MAC_VER_17)) {</div><div class='del'>-		/* Vendor specific (0x1f) and reserved (0x0e) MII registers. */</div><div class='add'>+	if ((tp-&gt;mac_version == RTL_GIGA_MAC_VER_11) ||</div><div class='add'>+	    (tp-&gt;mac_version == RTL_GIGA_MAC_VER_12) ||</div><div class='add'>+	    (tp-&gt;mac_version &gt;= RTL_GIGA_MAC_VER_17)) {</div><div class='add'>+		/*</div><div class='add'>+		 * Wake up the PHY.</div><div class='add'>+		 * Vendor specific (0x1f) and reserved (0x0e) MII registers.</div><div class='add'>+		 */</div><div class='ctx'> 		mdio_write(ioaddr, 0x1f, 0x0000);</div><div class='ctx'> 		mdio_write(ioaddr, 0x0e, 0x0000);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -850,7 +1009,7 @@ static int rtl8169_rx_vlan_skb(struct rtl8169_private *tp, struct RxDesc *desc,</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static void rtl8169_gset_tbi(struct net_device *dev, struct ethtool_cmd *cmd)</div><div class='add'>+static int rtl8169_gset_tbi(struct net_device *dev, struct ethtool_cmd *cmd)</div><div class='ctx'> {</div><div class='ctx'> 	struct rtl8169_private *tp = netdev_priv(dev);</div><div class='ctx'> 	void __iomem *ioaddr = tp-&gt;mmio_addr;</div><div class='hunk'>@@ -867,65 +1026,29 @@ static void rtl8169_gset_tbi(struct net_device *dev, struct ethtool_cmd *cmd)</div><div class='ctx'> </div><div class='ctx'> 	cmd-&gt;speed = SPEED_1000;</div><div class='ctx'> 	cmd-&gt;duplex = DUPLEX_FULL; /* Always set */</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void rtl8169_gset_xmii(struct net_device *dev, struct ethtool_cmd *cmd)</div><div class='add'>+static int rtl8169_gset_xmii(struct net_device *dev, struct ethtool_cmd *cmd)</div><div class='ctx'> {</div><div class='ctx'> 	struct rtl8169_private *tp = netdev_priv(dev);</div><div class='del'>-	void __iomem *ioaddr = tp-&gt;mmio_addr;</div><div class='del'>-	u8 status;</div><div class='del'>-</div><div class='del'>-	cmd-&gt;supported = SUPPORTED_10baseT_Half |</div><div class='del'>-			 SUPPORTED_10baseT_Full |</div><div class='del'>-			 SUPPORTED_100baseT_Half |</div><div class='del'>-			 SUPPORTED_100baseT_Full |</div><div class='del'>-			 SUPPORTED_1000baseT_Full |</div><div class='del'>-			 SUPPORTED_Autoneg |</div><div class='del'>-			 SUPPORTED_TP;</div><div class='del'>-</div><div class='del'>-	cmd-&gt;autoneg = 1;</div><div class='del'>-	cmd-&gt;advertising = ADVERTISED_TP | ADVERTISED_Autoneg;</div><div class='del'>-</div><div class='del'>-	if (tp-&gt;phy_auto_nego_reg &amp; ADVERTISE_10HALF)</div><div class='del'>-		cmd-&gt;advertising |= ADVERTISED_10baseT_Half;</div><div class='del'>-	if (tp-&gt;phy_auto_nego_reg &amp; ADVERTISE_10FULL)</div><div class='del'>-		cmd-&gt;advertising |= ADVERTISED_10baseT_Full;</div><div class='del'>-	if (tp-&gt;phy_auto_nego_reg &amp; ADVERTISE_100HALF)</div><div class='del'>-		cmd-&gt;advertising |= ADVERTISED_100baseT_Half;</div><div class='del'>-	if (tp-&gt;phy_auto_nego_reg &amp; ADVERTISE_100FULL)</div><div class='del'>-		cmd-&gt;advertising |= ADVERTISED_100baseT_Full;</div><div class='del'>-	if (tp-&gt;phy_1000_ctrl_reg &amp; ADVERTISE_1000FULL)</div><div class='del'>-		cmd-&gt;advertising |= ADVERTISED_1000baseT_Full;</div><div class='del'>-</div><div class='del'>-	status = RTL_R8(PHYstatus);</div><div class='del'>-</div><div class='del'>-	if (status &amp; _1000bpsF)</div><div class='del'>-		cmd-&gt;speed = SPEED_1000;</div><div class='del'>-	else if (status &amp; _100bps)</div><div class='del'>-		cmd-&gt;speed = SPEED_100;</div><div class='del'>-	else if (status &amp; _10bps)</div><div class='del'>-		cmd-&gt;speed = SPEED_10;</div><div class='del'>-</div><div class='del'>-	if (status &amp; TxFlowCtrl)</div><div class='del'>-		cmd-&gt;advertising |= ADVERTISED_Asym_Pause;</div><div class='del'>-	if (status &amp; RxFlowCtrl)</div><div class='del'>-		cmd-&gt;advertising |= ADVERTISED_Pause;</div><div class='del'>-</div><div class='del'>-	cmd-&gt;duplex = ((status &amp; _1000bpsF) || (status &amp; FullDup)) ?</div><div class='del'>-		      DUPLEX_FULL : DUPLEX_HALF;</div><div class='add'>+</div><div class='add'>+	return mii_ethtool_gset(&amp;tp-&gt;mii, cmd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int rtl8169_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)</div><div class='ctx'> {</div><div class='ctx'> 	struct rtl8169_private *tp = netdev_priv(dev);</div><div class='ctx'> 	unsigned long flags;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;tp-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-	tp-&gt;get_settings(dev, cmd);</div><div class='add'>+	rc = tp-&gt;get_settings(dev, cmd);</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;tp-&gt;lock, flags);</div><div class='del'>-	return 0;</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void rtl8169_get_regs(struct net_device *dev, struct ethtool_regs *regs,</div><div class='hunk'>@@ -1103,11 +1226,19 @@ static void rtl8169_get_mac_version(struct rtl8169_private *tp,</div><div class='ctx'> 		u32 val;</div><div class='ctx'> 		int mac_version;</div><div class='ctx'> 	} mac_info[] = {</div><div class='del'>-		/* 8168B family. */</div><div class='del'>-		{ 0x7c800000, 0x3c800000,	RTL_GIGA_MAC_VER_18 },</div><div class='add'>+		/* 8168D family. */</div><div class='add'>+		{ 0x7c800000, 0x28000000,	RTL_GIGA_MAC_VER_25 },</div><div class='add'>+</div><div class='add'>+		/* 8168C family. */</div><div class='add'>+		{ 0x7cf00000, 0x3ca00000,	RTL_GIGA_MAC_VER_24 },</div><div class='add'>+		{ 0x7cf00000, 0x3c900000,	RTL_GIGA_MAC_VER_23 },</div><div class='add'>+		{ 0x7cf00000, 0x3c800000,	RTL_GIGA_MAC_VER_18 },</div><div class='add'>+		{ 0x7c800000, 0x3c800000,	RTL_GIGA_MAC_VER_24 },</div><div class='ctx'> 		{ 0x7cf00000, 0x3c000000,	RTL_GIGA_MAC_VER_19 },</div><div class='ctx'> 		{ 0x7cf00000, 0x3c200000,	RTL_GIGA_MAC_VER_20 },</div><div class='del'>-		{ 0x7c800000, 0x3c000000,	RTL_GIGA_MAC_VER_20 },</div><div class='add'>+		{ 0x7cf00000, 0x3c300000,	RTL_GIGA_MAC_VER_21 },</div><div class='add'>+		{ 0x7cf00000, 0x3c400000,	RTL_GIGA_MAC_VER_22 },</div><div class='add'>+		{ 0x7c800000, 0x3c000000,	RTL_GIGA_MAC_VER_22 },</div><div class='ctx'> </div><div class='ctx'> 		/* 8168B family. */</div><div class='ctx'> 		{ 0x7cf00000, 0x38000000,	RTL_GIGA_MAC_VER_12 },</div><div class='hunk'>@@ -1116,8 +1247,17 @@ static void rtl8169_get_mac_version(struct rtl8169_private *tp,</div><div class='ctx'> 		{ 0x7c800000, 0x30000000,	RTL_GIGA_MAC_VER_11 },</div><div class='ctx'> </div><div class='ctx'> 		/* 8101 family. */</div><div class='add'>+		{ 0x7cf00000, 0x34a00000,	RTL_GIGA_MAC_VER_09 },</div><div class='add'>+		{ 0x7cf00000, 0x24a00000,	RTL_GIGA_MAC_VER_09 },</div><div class='add'>+		{ 0x7cf00000, 0x34900000,	RTL_GIGA_MAC_VER_08 },</div><div class='add'>+		{ 0x7cf00000, 0x24900000,	RTL_GIGA_MAC_VER_08 },</div><div class='add'>+		{ 0x7cf00000, 0x34800000,	RTL_GIGA_MAC_VER_07 },</div><div class='add'>+		{ 0x7cf00000, 0x24800000,	RTL_GIGA_MAC_VER_07 },</div><div class='ctx'> 		{ 0x7cf00000, 0x34000000,	RTL_GIGA_MAC_VER_13 },</div><div class='add'>+		{ 0x7cf00000, 0x34300000,	RTL_GIGA_MAC_VER_10 },</div><div class='ctx'> 		{ 0x7cf00000, 0x34200000,	RTL_GIGA_MAC_VER_16 },</div><div class='add'>+		{ 0x7c800000, 0x34800000,	RTL_GIGA_MAC_VER_09 },</div><div class='add'>+		{ 0x7c800000, 0x24800000,	RTL_GIGA_MAC_VER_09 },</div><div class='ctx'> 		{ 0x7c800000, 0x34000000,	RTL_GIGA_MAC_VER_16 },</div><div class='ctx'> 		/* FIXME: where did these entries come from ? -- FR */</div><div class='ctx'> 		{ 0xfc800000, 0x38800000,	RTL_GIGA_MAC_VER_15 },</div><div class='hunk'>@@ -1228,7 +1368,31 @@ static void rtl8169sb_hw_phy_config(void __iomem *ioaddr)</div><div class='ctx'> 	rtl_phy_write(ioaddr, phy_reg_init, ARRAY_SIZE(phy_reg_init));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void rtl8168cp_hw_phy_config(void __iomem *ioaddr)</div><div class='add'>+static void rtl8168bb_hw_phy_config(void __iomem *ioaddr)</div><div class='add'>+{</div><div class='add'>+	struct phy_reg phy_reg_init[] = {</div><div class='add'>+		{ 0x10, 0xf41b },</div><div class='add'>+		{ 0x1f, 0x0000 }</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	mdio_write(ioaddr, 0x1f, 0x0001);</div><div class='add'>+	mdio_patch(ioaddr, 0x16, 1 &lt;&lt; 0);</div><div class='add'>+</div><div class='add'>+	rtl_phy_write(ioaddr, phy_reg_init, ARRAY_SIZE(phy_reg_init));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtl8168bef_hw_phy_config(void __iomem *ioaddr)</div><div class='add'>+{</div><div class='add'>+	struct phy_reg phy_reg_init[] = {</div><div class='add'>+		{ 0x1f, 0x0001 },</div><div class='add'>+		{ 0x10, 0xf41b },</div><div class='add'>+		{ 0x1f, 0x0000 }</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	rtl_phy_write(ioaddr, phy_reg_init, ARRAY_SIZE(phy_reg_init));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtl8168cp_1_hw_phy_config(void __iomem *ioaddr)</div><div class='ctx'> {</div><div class='ctx'> 	struct phy_reg phy_reg_init[] = {</div><div class='ctx'> 		{ 0x1f, 0x0000 },</div><div class='hunk'>@@ -1241,7 +1405,22 @@ static void rtl8168cp_hw_phy_config(void __iomem *ioaddr)</div><div class='ctx'> 	rtl_phy_write(ioaddr, phy_reg_init, ARRAY_SIZE(phy_reg_init));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void rtl8168c_hw_phy_config(void __iomem *ioaddr)</div><div class='add'>+static void rtl8168cp_2_hw_phy_config(void __iomem *ioaddr)</div><div class='add'>+{</div><div class='add'>+	struct phy_reg phy_reg_init[] = {</div><div class='add'>+		{ 0x1f, 0x0001 },</div><div class='add'>+		{ 0x1d, 0x3d98 },</div><div class='add'>+		{ 0x1f, 0x0000 }</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	mdio_write(ioaddr, 0x1f, 0x0000);</div><div class='add'>+	mdio_patch(ioaddr, 0x14, 1 &lt;&lt; 5);</div><div class='add'>+	mdio_patch(ioaddr, 0x0d, 1 &lt;&lt; 5);</div><div class='add'>+</div><div class='add'>+	rtl_phy_write(ioaddr, phy_reg_init, ARRAY_SIZE(phy_reg_init));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtl8168c_1_hw_phy_config(void __iomem *ioaddr)</div><div class='ctx'> {</div><div class='ctx'> 	struct phy_reg phy_reg_init[] = {</div><div class='ctx'> 		{ 0x1f, 0x0001 },</div><div class='hunk'>@@ -1257,25 +1436,157 @@ static void rtl8168c_hw_phy_config(void __iomem *ioaddr)</div><div class='ctx'> 		{ 0x1f, 0x0003 },</div><div class='ctx'> 		{ 0x12, 0xc096 },</div><div class='ctx'> 		{ 0x16, 0x000a },</div><div class='del'>-		{ 0x1f, 0x0000 }</div><div class='add'>+		{ 0x1f, 0x0000 },</div><div class='add'>+		{ 0x1f, 0x0000 },</div><div class='add'>+		{ 0x09, 0x2000 },</div><div class='add'>+		{ 0x09, 0x0000 }</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	rtl_phy_write(ioaddr, phy_reg_init, ARRAY_SIZE(phy_reg_init));</div><div class='add'>+</div><div class='add'>+	mdio_patch(ioaddr, 0x14, 1 &lt;&lt; 5);</div><div class='add'>+	mdio_patch(ioaddr, 0x0d, 1 &lt;&lt; 5);</div><div class='add'>+	mdio_write(ioaddr, 0x1f, 0x0000);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void rtl8168cx_hw_phy_config(void __iomem *ioaddr)</div><div class='add'>+static void rtl8168c_2_hw_phy_config(void __iomem *ioaddr)</div><div class='ctx'> {</div><div class='ctx'> 	struct phy_reg phy_reg_init[] = {</div><div class='del'>-		{ 0x1f, 0x0000 },</div><div class='add'>+		{ 0x1f, 0x0001 },</div><div class='ctx'> 		{ 0x12, 0x2300 },</div><div class='add'>+		{ 0x03, 0x802f },</div><div class='add'>+		{ 0x02, 0x4f02 },</div><div class='add'>+		{ 0x01, 0x0409 },</div><div class='add'>+		{ 0x00, 0xf099 },</div><div class='add'>+		{ 0x04, 0x9800 },</div><div class='add'>+		{ 0x04, 0x9000 },</div><div class='add'>+		{ 0x1d, 0x3d98 },</div><div class='add'>+		{ 0x1f, 0x0002 },</div><div class='add'>+		{ 0x0c, 0x7eb8 },</div><div class='add'>+		{ 0x06, 0x0761 },</div><div class='ctx'> 		{ 0x1f, 0x0003 },</div><div class='ctx'> 		{ 0x16, 0x0f0a },</div><div class='del'>-		{ 0x1f, 0x0000 },</div><div class='add'>+		{ 0x1f, 0x0000 }</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	rtl_phy_write(ioaddr, phy_reg_init, ARRAY_SIZE(phy_reg_init));</div><div class='add'>+</div><div class='add'>+	mdio_patch(ioaddr, 0x16, 1 &lt;&lt; 0);</div><div class='add'>+	mdio_patch(ioaddr, 0x14, 1 &lt;&lt; 5);</div><div class='add'>+	mdio_patch(ioaddr, 0x0d, 1 &lt;&lt; 5);</div><div class='add'>+	mdio_write(ioaddr, 0x1f, 0x0000);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtl8168c_3_hw_phy_config(void __iomem *ioaddr)</div><div class='add'>+{</div><div class='add'>+	struct phy_reg phy_reg_init[] = {</div><div class='add'>+		{ 0x1f, 0x0001 },</div><div class='add'>+		{ 0x12, 0x2300 },</div><div class='add'>+		{ 0x1d, 0x3d98 },</div><div class='ctx'> 		{ 0x1f, 0x0002 },</div><div class='ctx'> 		{ 0x0c, 0x7eb8 },</div><div class='add'>+		{ 0x06, 0x5461 },</div><div class='add'>+		{ 0x1f, 0x0003 },</div><div class='add'>+		{ 0x16, 0x0f0a },</div><div class='add'>+		{ 0x1f, 0x0000 }</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	rtl_phy_write(ioaddr, phy_reg_init, ARRAY_SIZE(phy_reg_init));</div><div class='add'>+</div><div class='add'>+	mdio_patch(ioaddr, 0x16, 1 &lt;&lt; 0);</div><div class='add'>+	mdio_patch(ioaddr, 0x14, 1 &lt;&lt; 5);</div><div class='add'>+	mdio_patch(ioaddr, 0x0d, 1 &lt;&lt; 5);</div><div class='add'>+	mdio_write(ioaddr, 0x1f, 0x0000);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtl8168c_4_hw_phy_config(void __iomem *ioaddr)</div><div class='add'>+{</div><div class='add'>+	rtl8168c_3_hw_phy_config(ioaddr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtl8168d_hw_phy_config(void __iomem *ioaddr)</div><div class='add'>+{</div><div class='add'>+	struct phy_reg phy_reg_init_0[] = {</div><div class='add'>+		{ 0x1f, 0x0001 },</div><div class='add'>+		{ 0x09, 0x2770 },</div><div class='add'>+		{ 0x08, 0x04d0 },</div><div class='add'>+		{ 0x0b, 0xad15 },</div><div class='add'>+		{ 0x0c, 0x5bf0 },</div><div class='add'>+		{ 0x1c, 0xf101 },</div><div class='add'>+		{ 0x1f, 0x0003 },</div><div class='add'>+		{ 0x14, 0x94d7 },</div><div class='add'>+		{ 0x12, 0xf4d6 },</div><div class='add'>+		{ 0x09, 0xca0f },</div><div class='add'>+		{ 0x1f, 0x0002 },</div><div class='add'>+		{ 0x0b, 0x0b10 },</div><div class='add'>+		{ 0x0c, 0xd1f7 },</div><div class='add'>+		{ 0x1f, 0x0002 },</div><div class='add'>+		{ 0x06, 0x5461 },</div><div class='add'>+		{ 0x1f, 0x0002 },</div><div class='add'>+		{ 0x05, 0x6662 },</div><div class='add'>+		{ 0x1f, 0x0000 },</div><div class='add'>+		{ 0x14, 0x0060 },</div><div class='add'>+		{ 0x1f, 0x0000 },</div><div class='add'>+		{ 0x0d, 0xf8a0 },</div><div class='add'>+		{ 0x1f, 0x0005 },</div><div class='add'>+		{ 0x05, 0xffc2 }</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	rtl_phy_write(ioaddr, phy_reg_init_0, ARRAY_SIZE(phy_reg_init_0));</div><div class='add'>+</div><div class='add'>+	if (mdio_read(ioaddr, 0x06) == 0xc400) {</div><div class='add'>+		struct phy_reg phy_reg_init_1[] = {</div><div class='add'>+			{ 0x1f, 0x0005 },</div><div class='add'>+			{ 0x01, 0x0300 },</div><div class='add'>+			{ 0x1f, 0x0000 },</div><div class='add'>+			{ 0x11, 0x401c },</div><div class='add'>+			{ 0x16, 0x4100 },</div><div class='add'>+			{ 0x1f, 0x0005 },</div><div class='add'>+			{ 0x07, 0x0010 },</div><div class='add'>+			{ 0x05, 0x83dc },</div><div class='add'>+			{ 0x06, 0x087d },</div><div class='add'>+			{ 0x05, 0x8300 },</div><div class='add'>+			{ 0x06, 0x0101 },</div><div class='add'>+			{ 0x06, 0x05f8 },</div><div class='add'>+			{ 0x06, 0xf9fa },</div><div class='add'>+			{ 0x06, 0xfbef },</div><div class='add'>+			{ 0x06, 0x79e2 },</div><div class='add'>+			{ 0x06, 0x835f },</div><div class='add'>+			{ 0x06, 0xe0f8 },</div><div class='add'>+			{ 0x06, 0x9ae1 },</div><div class='add'>+			{ 0x06, 0xf89b },</div><div class='add'>+			{ 0x06, 0xef31 },</div><div class='add'>+			{ 0x06, 0x3b65 },</div><div class='add'>+			{ 0x06, 0xaa07 },</div><div class='add'>+			{ 0x06, 0x81e4 },</div><div class='add'>+			{ 0x06, 0xf89a },</div><div class='add'>+			{ 0x06, 0xe5f8 },</div><div class='add'>+			{ 0x06, 0x9baf },</div><div class='add'>+			{ 0x06, 0x06ae },</div><div class='add'>+			{ 0x05, 0x83dc },</div><div class='add'>+			{ 0x06, 0x8300 },</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		rtl_phy_write(ioaddr, phy_reg_init_1,</div><div class='add'>+			      ARRAY_SIZE(phy_reg_init_1));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mdio_write(ioaddr, 0x1f, 0x0000);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtl8102e_hw_phy_config(void __iomem *ioaddr)</div><div class='add'>+{</div><div class='add'>+	struct phy_reg phy_reg_init[] = {</div><div class='add'>+		{ 0x1f, 0x0003 },</div><div class='add'>+		{ 0x08, 0x441d },</div><div class='add'>+		{ 0x01, 0x9100 },</div><div class='ctx'> 		{ 0x1f, 0x0000 }</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	mdio_write(ioaddr, 0x1f, 0x0000);</div><div class='add'>+	mdio_patch(ioaddr, 0x11, 1 &lt;&lt; 12);</div><div class='add'>+	mdio_patch(ioaddr, 0x19, 1 &lt;&lt; 13);</div><div class='add'>+</div><div class='ctx'> 	rtl_phy_write(ioaddr, phy_reg_init, ARRAY_SIZE(phy_reg_init));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1296,15 +1607,43 @@ static void rtl_hw_phy_config(struct net_device *dev)</div><div class='ctx'> 	case RTL_GIGA_MAC_VER_04:</div><div class='ctx'> 		rtl8169sb_hw_phy_config(ioaddr);</div><div class='ctx'> 		break;</div><div class='add'>+	case RTL_GIGA_MAC_VER_07:</div><div class='add'>+	case RTL_GIGA_MAC_VER_08:</div><div class='add'>+	case RTL_GIGA_MAC_VER_09:</div><div class='add'>+		rtl8102e_hw_phy_config(ioaddr);</div><div class='add'>+		break;</div><div class='add'>+	case RTL_GIGA_MAC_VER_11:</div><div class='add'>+		rtl8168bb_hw_phy_config(ioaddr);</div><div class='add'>+		break;</div><div class='add'>+	case RTL_GIGA_MAC_VER_12:</div><div class='add'>+		rtl8168bef_hw_phy_config(ioaddr);</div><div class='add'>+		break;</div><div class='add'>+	case RTL_GIGA_MAC_VER_17:</div><div class='add'>+		rtl8168bef_hw_phy_config(ioaddr);</div><div class='add'>+		break;</div><div class='ctx'> 	case RTL_GIGA_MAC_VER_18:</div><div class='del'>-		rtl8168cp_hw_phy_config(ioaddr);</div><div class='add'>+		rtl8168cp_1_hw_phy_config(ioaddr);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case RTL_GIGA_MAC_VER_19:</div><div class='del'>-		rtl8168c_hw_phy_config(ioaddr);</div><div class='add'>+		rtl8168c_1_hw_phy_config(ioaddr);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case RTL_GIGA_MAC_VER_20:</div><div class='del'>-		rtl8168cx_hw_phy_config(ioaddr);</div><div class='add'>+		rtl8168c_2_hw_phy_config(ioaddr);</div><div class='add'>+		break;</div><div class='add'>+	case RTL_GIGA_MAC_VER_21:</div><div class='add'>+		rtl8168c_3_hw_phy_config(ioaddr);</div><div class='add'>+		break;</div><div class='add'>+	case RTL_GIGA_MAC_VER_22:</div><div class='add'>+		rtl8168c_4_hw_phy_config(ioaddr);</div><div class='ctx'> 		break;</div><div class='add'>+	case RTL_GIGA_MAC_VER_23:</div><div class='add'>+	case RTL_GIGA_MAC_VER_24:</div><div class='add'>+		rtl8168cp_2_hw_phy_config(ioaddr);</div><div class='add'>+		break;</div><div class='add'>+	case RTL_GIGA_MAC_VER_25:</div><div class='add'>+		rtl8168d_hw_phy_config(ioaddr);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1513,7 +1852,7 @@ static const struct rtl_cfg_info {</div><div class='ctx'> 	unsigned int align;</div><div class='ctx'> 	u16 intr_event;</div><div class='ctx'> 	u16 napi_event;</div><div class='del'>-	unsigned msi;</div><div class='add'>+	unsigned features;</div><div class='ctx'> } rtl_cfg_infos [] = {</div><div class='ctx'> 	[RTL_CFG_0] = {</div><div class='ctx'> 		.hw_start	= rtl_hw_start_8169,</div><div class='hunk'>@@ -1522,7 +1861,7 @@ static const struct rtl_cfg_info {</div><div class='ctx'> 		.intr_event	= SYSErr | LinkChg | RxOverflow |</div><div class='ctx'> 				  RxFIFOOver | TxErr | TxOK | RxOK | RxErr,</div><div class='ctx'> 		.napi_event	= RxFIFOOver | TxErr | TxOK | RxOK | RxOverflow,</div><div class='del'>-		.msi		= 0</div><div class='add'>+		.features	= RTL_FEATURE_GMII</div><div class='ctx'> 	},</div><div class='ctx'> 	[RTL_CFG_1] = {</div><div class='ctx'> 		.hw_start	= rtl_hw_start_8168,</div><div class='hunk'>@@ -1531,7 +1870,7 @@ static const struct rtl_cfg_info {</div><div class='ctx'> 		.intr_event	= SYSErr | LinkChg | RxOverflow |</div><div class='ctx'> 				  TxErr | TxOK | RxOK | RxErr,</div><div class='ctx'> 		.napi_event	= TxErr | TxOK | RxOK | RxOverflow,</div><div class='del'>-		.msi		= RTL_FEATURE_MSI</div><div class='add'>+		.features	= RTL_FEATURE_GMII | RTL_FEATURE_MSI</div><div class='ctx'> 	},</div><div class='ctx'> 	[RTL_CFG_2] = {</div><div class='ctx'> 		.hw_start	= rtl_hw_start_8101,</div><div class='hunk'>@@ -1540,7 +1879,7 @@ static const struct rtl_cfg_info {</div><div class='ctx'> 		.intr_event	= SYSErr | LinkChg | RxOverflow | PCSTimeout |</div><div class='ctx'> 				  RxFIFOOver | TxErr | TxOK | RxOK | RxErr,</div><div class='ctx'> 		.napi_event	= RxFIFOOver | TxErr | TxOK | RxOK | RxOverflow,</div><div class='del'>-		.msi		= RTL_FEATURE_MSI</div><div class='add'>+		.features	= RTL_FEATURE_MSI</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1552,7 +1891,7 @@ static unsigned rtl_try_msi(struct pci_dev *pdev, void __iomem *ioaddr,</div><div class='ctx'> 	u8 cfg2;</div><div class='ctx'> </div><div class='ctx'> 	cfg2 = RTL_R8(Config2) &amp; ~MSIEnable;</div><div class='del'>-	if (cfg-&gt;msi) {</div><div class='add'>+	if (cfg-&gt;features &amp; RTL_FEATURE_MSI) {</div><div class='ctx'> 		if (pci_enable_msi(pdev)) {</div><div class='ctx'> 			dev_info(&amp;pdev-&gt;dev, "no MSI. Back to INTx.\n");</div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -1572,12 +1911,81 @@ static void rtl_disable_msi(struct pci_dev *pdev, struct rtl8169_private *tp)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int rtl_eeprom_read(struct pci_dev *pdev, int cap, int addr, __le32 *val)</div><div class='add'>+{</div><div class='add'>+	int ret, count = 100;</div><div class='add'>+	u16 status = 0;</div><div class='add'>+	u32 value;</div><div class='add'>+</div><div class='add'>+	ret = pci_write_config_word(pdev, cap + PCI_VPD_ADDR, addr);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		udelay(10);</div><div class='add'>+		ret = pci_read_config_word(pdev, cap + PCI_VPD_ADDR, &amp;status);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+	} while (!(status &amp; PCI_VPD_ADDR_F) &amp;&amp; --count);</div><div class='add'>+</div><div class='add'>+	if (!(status &amp; PCI_VPD_ADDR_F))</div><div class='add'>+		return -ETIMEDOUT;</div><div class='add'>+</div><div class='add'>+	ret = pci_read_config_dword(pdev, cap + PCI_VPD_DATA, &amp;value);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	*val = cpu_to_le32(value);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtl_init_mac_address(struct rtl8169_private *tp,</div><div class='add'>+				 void __iomem *ioaddr)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pdev = tp-&gt;pci_dev;</div><div class='add'>+	u8 cfg1;</div><div class='add'>+	int vpd_cap;</div><div class='add'>+	u8 mac[8];</div><div class='add'>+	DECLARE_MAC_BUF(buf);</div><div class='add'>+</div><div class='add'>+	cfg1 = RTL_R8(Config1);</div><div class='add'>+	if (!(cfg1  &amp; VPD)) {</div><div class='add'>+		dprintk("VPD access not enabled, enabling\n");</div><div class='add'>+		RTL_W8(Cfg9346, Cfg9346_Unlock);</div><div class='add'>+		RTL_W8(Config1, cfg1 | VPD);</div><div class='add'>+		RTL_W8(Cfg9346, Cfg9346_Lock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	vpd_cap = pci_find_capability(pdev, PCI_CAP_ID_VPD);</div><div class='add'>+	if (!vpd_cap)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* MAC address is stored in EEPROM at offset 0x0e</div><div class='add'>+	 * Realtek says: "The VPD address does not have to be a DWORD-aligned</div><div class='add'>+	 * address as defined in the PCI 2.2 Specifications, but the VPD data</div><div class='add'>+	 * is always consecutive 4-byte data starting from the VPD address</div><div class='add'>+	 * specified."</div><div class='add'>+	 */</div><div class='add'>+	if (rtl_eeprom_read(pdev, vpd_cap, 0x000e, (__le32*)&amp;mac[0]) &lt; 0 ||</div><div class='add'>+	    rtl_eeprom_read(pdev, vpd_cap, 0x0012, (__le32*)&amp;mac[4]) &lt; 0) {</div><div class='add'>+		dprintk("Reading MAC address from EEPROM failed\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dprintk("MAC address found in EEPROM: %s\n", print_mac(buf, mac));</div><div class='add'>+</div><div class='add'>+	/* Write MAC address */</div><div class='add'>+	rtl_rar_set(tp, mac);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int __devinit</div><div class='ctx'> rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> {</div><div class='ctx'> 	const struct rtl_cfg_info *cfg = rtl_cfg_infos + ent-&gt;driver_data;</div><div class='ctx'> 	const unsigned int region = cfg-&gt;region;</div><div class='ctx'> 	struct rtl8169_private *tp;</div><div class='add'>+	struct mii_if_info *mii;</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	void __iomem *ioaddr;</div><div class='ctx'> 	unsigned int i;</div><div class='hunk'>@@ -1602,6 +2010,14 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	tp-&gt;pci_dev = pdev;</div><div class='ctx'> 	tp-&gt;msg_enable = netif_msg_init(debug.msg_enable, R8169_MSG_DEFAULT);</div><div class='ctx'> </div><div class='add'>+	mii = &amp;tp-&gt;mii;</div><div class='add'>+	mii-&gt;dev = dev;</div><div class='add'>+	mii-&gt;mdio_read = rtl_mdio_read;</div><div class='add'>+	mii-&gt;mdio_write = rtl_mdio_write;</div><div class='add'>+	mii-&gt;phy_id_mask = 0x1f;</div><div class='add'>+	mii-&gt;reg_num_mask = 0x1f;</div><div class='add'>+	mii-&gt;supports_gmii = !!(cfg-&gt;features &amp; RTL_FEATURE_GMII);</div><div class='add'>+</div><div class='ctx'> 	/* enable device (incl. PCI PM wakeup and hotplug setup) */</div><div class='ctx'> 	rc = pci_enable_device(pdev);</div><div class='ctx'> 	if (rc &lt; 0) {</div><div class='hunk'>@@ -1670,6 +2086,10 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 		goto err_out_free_res_4;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	tp-&gt;pcie_cap = pci_find_capability(pdev, PCI_CAP_ID_EXP);</div><div class='add'>+	if (!tp-&gt;pcie_cap &amp;&amp; netif_msg_probe(tp))</div><div class='add'>+		dev_info(&amp;pdev-&gt;dev, "no PCI Express capability\n");</div><div class='add'>+</div><div class='ctx'> 	/* Unneeded ? Don't mess with Mrs. Murphy. */</div><div class='ctx'> 	rtl8169_irq_mask_and_ack(ioaddr);</div><div class='ctx'> </div><div class='hunk'>@@ -1706,6 +2126,10 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	RTL_W8(Cfg9346, Cfg9346_Unlock);</div><div class='ctx'> 	RTL_W8(Config1, RTL_R8(Config1) | PMEnable);</div><div class='ctx'> 	RTL_W8(Config5, RTL_R8(Config5) &amp; PMEStatus);</div><div class='add'>+	if ((RTL_R8(Config3) &amp; (LinkUp | MagicPacket)) != 0)</div><div class='add'>+		tp-&gt;features |= RTL_FEATURE_WOL;</div><div class='add'>+	if ((RTL_R8(Config5) &amp; (UWF | BWF | MWF)) != 0)</div><div class='add'>+		tp-&gt;features |= RTL_FEATURE_WOL;</div><div class='ctx'> 	tp-&gt;features |= rtl_try_msi(pdev, ioaddr, cfg);</div><div class='ctx'> 	RTL_W8(Cfg9346, Cfg9346_Lock);</div><div class='ctx'> </div><div class='hunk'>@@ -1728,7 +2152,13 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 		dev-&gt;do_ioctl = rtl8169_ioctl;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Get MAC address.  FIXME: read EEPROM */</div><div class='add'>+	spin_lock_init(&amp;tp-&gt;lock);</div><div class='add'>+</div><div class='add'>+	tp-&gt;mmio_addr = ioaddr;</div><div class='add'>+</div><div class='add'>+	rtl_init_mac_address(tp, ioaddr);</div><div class='add'>+</div><div class='add'>+	/* Get MAC address */</div><div class='ctx'> 	for (i = 0; i &lt; MAC_ADDR_LEN; i++)</div><div class='ctx'> 		dev-&gt;dev_addr[i] = RTL_R8(MAC0 + i);</div><div class='ctx'> 	memcpy(dev-&gt;perm_addr, dev-&gt;dev_addr, dev-&gt;addr_len);</div><div class='hunk'>@@ -1758,7 +2188,6 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	tp-&gt;intr_mask = 0xffff;</div><div class='del'>-	tp-&gt;mmio_addr = ioaddr;</div><div class='ctx'> 	tp-&gt;align = cfg-&gt;align;</div><div class='ctx'> 	tp-&gt;hw_start = cfg-&gt;hw_start;</div><div class='ctx'> 	tp-&gt;intr_event = cfg-&gt;intr_event;</div><div class='hunk'>@@ -1768,8 +2197,6 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	tp-&gt;timer.data = (unsigned long) dev;</div><div class='ctx'> 	tp-&gt;timer.function = rtl8169_phy_timer;</div><div class='ctx'> </div><div class='del'>-	spin_lock_init(&amp;tp-&gt;lock);</div><div class='del'>-</div><div class='ctx'> 	rc = register_netdev(dev);</div><div class='ctx'> 	if (rc &lt; 0)</div><div class='ctx'> 		goto err_out_msi_5;</div><div class='hunk'>@@ -1791,6 +2218,7 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	rtl8169_init_phy(dev, tp);</div><div class='add'>+	device_set_wakeup_enable(&amp;pdev-&gt;dev, tp-&gt;features &amp; RTL_FEATURE_WOL);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	return rc;</div><div class='hunk'>@@ -2061,12 +2489,209 @@ static void rtl_hw_start_8169(struct net_device *dev)</div><div class='ctx'> 	RTL_W16(IntrMask, tp-&gt;intr_event);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void rtl_tx_performance_tweak(struct pci_dev *pdev, u16 force)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = pci_get_drvdata(pdev);</div><div class='add'>+	struct rtl8169_private *tp = netdev_priv(dev);</div><div class='add'>+	int cap = tp-&gt;pcie_cap;</div><div class='add'>+</div><div class='add'>+	if (cap) {</div><div class='add'>+		u16 ctl;</div><div class='add'>+</div><div class='add'>+		pci_read_config_word(pdev, cap + PCI_EXP_DEVCTL, &amp;ctl);</div><div class='add'>+		ctl = (ctl &amp; ~PCI_EXP_DEVCTL_READRQ) | force;</div><div class='add'>+		pci_write_config_word(pdev, cap + PCI_EXP_DEVCTL, ctl);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtl_csi_access_enable(void __iomem *ioaddr)</div><div class='add'>+{</div><div class='add'>+	u32 csi;</div><div class='add'>+</div><div class='add'>+	csi = rtl_csi_read(ioaddr, 0x070c) &amp; 0x00ffffff;</div><div class='add'>+	rtl_csi_write(ioaddr, 0x070c, csi | 0x27000000);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct ephy_info {</div><div class='add'>+	unsigned int offset;</div><div class='add'>+	u16 mask;</div><div class='add'>+	u16 bits;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void rtl_ephy_init(void __iomem *ioaddr, struct ephy_info *e, int len)</div><div class='add'>+{</div><div class='add'>+	u16 w;</div><div class='add'>+</div><div class='add'>+	while (len-- &gt; 0) {</div><div class='add'>+		w = (rtl_ephy_read(ioaddr, e-&gt;offset) &amp; ~e-&gt;mask) | e-&gt;bits;</div><div class='add'>+		rtl_ephy_write(ioaddr, e-&gt;offset, w);</div><div class='add'>+		e++;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtl_disable_clock_request(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = pci_get_drvdata(pdev);</div><div class='add'>+	struct rtl8169_private *tp = netdev_priv(dev);</div><div class='add'>+	int cap = tp-&gt;pcie_cap;</div><div class='add'>+</div><div class='add'>+	if (cap) {</div><div class='add'>+		u16 ctl;</div><div class='add'>+</div><div class='add'>+		pci_read_config_word(pdev, cap + PCI_EXP_LNKCTL, &amp;ctl);</div><div class='add'>+		ctl &amp;= ~PCI_EXP_LNKCTL_CLKREQ_EN;</div><div class='add'>+		pci_write_config_word(pdev, cap + PCI_EXP_LNKCTL, ctl);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define R8168_CPCMD_QUIRK_MASK (\</div><div class='add'>+	EnableBist | \</div><div class='add'>+	Mac_dbgo_oe | \</div><div class='add'>+	Force_half_dup | \</div><div class='add'>+	Force_rxflow_en | \</div><div class='add'>+	Force_txflow_en | \</div><div class='add'>+	Cxpl_dbg_sel | \</div><div class='add'>+	ASF | \</div><div class='add'>+	PktCntrDisable | \</div><div class='add'>+	Mac_dbgo_sel)</div><div class='add'>+</div><div class='add'>+static void rtl_hw_start_8168bb(void __iomem *ioaddr, struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	RTL_W8(Config3, RTL_R8(Config3) &amp; ~Beacon_en);</div><div class='add'>+</div><div class='add'>+	RTL_W16(CPlusCmd, RTL_R16(CPlusCmd) &amp; ~R8168_CPCMD_QUIRK_MASK);</div><div class='add'>+</div><div class='add'>+	rtl_tx_performance_tweak(pdev,</div><div class='add'>+		(0x5 &lt;&lt; MAX_READ_REQUEST_SHIFT) | PCI_EXP_DEVCTL_NOSNOOP_EN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtl_hw_start_8168bef(void __iomem *ioaddr, struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	rtl_hw_start_8168bb(ioaddr, pdev);</div><div class='add'>+</div><div class='add'>+	RTL_W8(EarlyTxThres, EarlyTxThld);</div><div class='add'>+</div><div class='add'>+	RTL_W8(Config4, RTL_R8(Config4) &amp; ~(1 &lt;&lt; 0));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __rtl_hw_start_8168cp(void __iomem *ioaddr, struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	RTL_W8(Config1, RTL_R8(Config1) | Speed_down);</div><div class='add'>+</div><div class='add'>+	RTL_W8(Config3, RTL_R8(Config3) &amp; ~Beacon_en);</div><div class='add'>+</div><div class='add'>+	rtl_tx_performance_tweak(pdev, 0x5 &lt;&lt; MAX_READ_REQUEST_SHIFT);</div><div class='add'>+</div><div class='add'>+	rtl_disable_clock_request(pdev);</div><div class='add'>+</div><div class='add'>+	RTL_W16(CPlusCmd, RTL_R16(CPlusCmd) &amp; ~R8168_CPCMD_QUIRK_MASK);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtl_hw_start_8168cp_1(void __iomem *ioaddr, struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	static struct ephy_info e_info_8168cp[] = {</div><div class='add'>+		{ 0x01, 0,	0x0001 },</div><div class='add'>+		{ 0x02, 0x0800,	0x1000 },</div><div class='add'>+		{ 0x03, 0,	0x0042 },</div><div class='add'>+		{ 0x06, 0x0080,	0x0000 },</div><div class='add'>+		{ 0x07, 0,	0x2000 }</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	rtl_csi_access_enable(ioaddr);</div><div class='add'>+</div><div class='add'>+	rtl_ephy_init(ioaddr, e_info_8168cp, ARRAY_SIZE(e_info_8168cp));</div><div class='add'>+</div><div class='add'>+	__rtl_hw_start_8168cp(ioaddr, pdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtl_hw_start_8168cp_2(void __iomem *ioaddr, struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	rtl_csi_access_enable(ioaddr);</div><div class='add'>+</div><div class='add'>+	RTL_W8(Config3, RTL_R8(Config3) &amp; ~Beacon_en);</div><div class='add'>+</div><div class='add'>+	rtl_tx_performance_tweak(pdev, 0x5 &lt;&lt; MAX_READ_REQUEST_SHIFT);</div><div class='add'>+</div><div class='add'>+	RTL_W16(CPlusCmd, RTL_R16(CPlusCmd) &amp; ~R8168_CPCMD_QUIRK_MASK);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtl_hw_start_8168cp_3(void __iomem *ioaddr, struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	rtl_csi_access_enable(ioaddr);</div><div class='add'>+</div><div class='add'>+	RTL_W8(Config3, RTL_R8(Config3) &amp; ~Beacon_en);</div><div class='add'>+</div><div class='add'>+	/* Magic. */</div><div class='add'>+	RTL_W8(DBG_REG, 0x20);</div><div class='add'>+</div><div class='add'>+	RTL_W8(EarlyTxThres, EarlyTxThld);</div><div class='add'>+</div><div class='add'>+	rtl_tx_performance_tweak(pdev, 0x5 &lt;&lt; MAX_READ_REQUEST_SHIFT);</div><div class='add'>+</div><div class='add'>+	RTL_W16(CPlusCmd, RTL_R16(CPlusCmd) &amp; ~R8168_CPCMD_QUIRK_MASK);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtl_hw_start_8168c_1(void __iomem *ioaddr, struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	static struct ephy_info e_info_8168c_1[] = {</div><div class='add'>+		{ 0x02, 0x0800,	0x1000 },</div><div class='add'>+		{ 0x03, 0,	0x0002 },</div><div class='add'>+		{ 0x06, 0x0080,	0x0000 }</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	rtl_csi_access_enable(ioaddr);</div><div class='add'>+</div><div class='add'>+	RTL_W8(DBG_REG, 0x06 | FIX_NAK_1 | FIX_NAK_2);</div><div class='add'>+</div><div class='add'>+	rtl_ephy_init(ioaddr, e_info_8168c_1, ARRAY_SIZE(e_info_8168c_1));</div><div class='add'>+</div><div class='add'>+	__rtl_hw_start_8168cp(ioaddr, pdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtl_hw_start_8168c_2(void __iomem *ioaddr, struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	static struct ephy_info e_info_8168c_2[] = {</div><div class='add'>+		{ 0x01, 0,	0x0001 },</div><div class='add'>+		{ 0x03, 0x0400,	0x0220 }</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	rtl_csi_access_enable(ioaddr);</div><div class='add'>+</div><div class='add'>+	rtl_ephy_init(ioaddr, e_info_8168c_2, ARRAY_SIZE(e_info_8168c_2));</div><div class='add'>+</div><div class='add'>+	__rtl_hw_start_8168cp(ioaddr, pdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtl_hw_start_8168c_3(void __iomem *ioaddr, struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	rtl_hw_start_8168c_2(ioaddr, pdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtl_hw_start_8168c_4(void __iomem *ioaddr, struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	rtl_csi_access_enable(ioaddr);</div><div class='add'>+</div><div class='add'>+	__rtl_hw_start_8168cp(ioaddr, pdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtl_hw_start_8168d(void __iomem *ioaddr, struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	rtl_csi_access_enable(ioaddr);</div><div class='add'>+</div><div class='add'>+	rtl_disable_clock_request(pdev);</div><div class='add'>+</div><div class='add'>+	RTL_W8(EarlyTxThres, EarlyTxThld);</div><div class='add'>+</div><div class='add'>+	rtl_tx_performance_tweak(pdev, 0x5 &lt;&lt; MAX_READ_REQUEST_SHIFT);</div><div class='add'>+</div><div class='add'>+	RTL_W16(CPlusCmd, RTL_R16(CPlusCmd) &amp; ~R8168_CPCMD_QUIRK_MASK);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void rtl_hw_start_8168(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct rtl8169_private *tp = netdev_priv(dev);</div><div class='ctx'> 	void __iomem *ioaddr = tp-&gt;mmio_addr;</div><div class='ctx'> 	struct pci_dev *pdev = tp-&gt;pci_dev;</div><div class='del'>-	u8 ctl;</div><div class='ctx'> </div><div class='ctx'> 	RTL_W8(Cfg9346, Cfg9346_Unlock);</div><div class='ctx'> </div><div class='hunk'>@@ -2074,17 +2699,10 @@ static void rtl_hw_start_8168(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	rtl_set_rx_max_size(ioaddr);</div><div class='ctx'> </div><div class='del'>-	rtl_set_rx_tx_config_registers(tp);</div><div class='del'>-</div><div class='ctx'> 	tp-&gt;cp_cmd |= RTL_R16(CPlusCmd) | PktCntrDisable | INTT_1;</div><div class='ctx'> </div><div class='ctx'> 	RTL_W16(CPlusCmd, tp-&gt;cp_cmd);</div><div class='ctx'> </div><div class='del'>-	/* Tx performance tweak. */</div><div class='del'>-	pci_read_config_byte(pdev, 0x69, &amp;ctl);</div><div class='del'>-	ctl = (ctl &amp; ~0x70) | 0x50;</div><div class='del'>-	pci_write_config_byte(pdev, 0x69, ctl);</div><div class='del'>-</div><div class='ctx'> 	RTL_W16(IntrMitigate, 0x5151);</div><div class='ctx'> </div><div class='ctx'> 	/* Work around for RxFIFO overflow. */</div><div class='hunk'>@@ -2095,21 +2713,134 @@ static void rtl_hw_start_8168(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	rtl_set_rx_tx_desc_registers(tp, ioaddr);</div><div class='ctx'> </div><div class='del'>-	RTL_W8(Cfg9346, Cfg9346_Lock);</div><div class='add'>+	rtl_set_rx_mode(dev);</div><div class='add'>+</div><div class='add'>+	RTL_W32(TxConfig, (TX_DMA_BURST &lt;&lt; TxDMAShift) |</div><div class='add'>+		(InterFrameGap &lt;&lt; TxInterFrameGapShift));</div><div class='ctx'> </div><div class='ctx'> 	RTL_R8(IntrMask);</div><div class='ctx'> </div><div class='del'>-	RTL_W32(RxMissed, 0);</div><div class='add'>+	switch (tp-&gt;mac_version) {</div><div class='add'>+	case RTL_GIGA_MAC_VER_11:</div><div class='add'>+		rtl_hw_start_8168bb(ioaddr, pdev);</div><div class='add'>+	break;</div><div class='ctx'> </div><div class='del'>-	rtl_set_rx_mode(dev);</div><div class='add'>+	case RTL_GIGA_MAC_VER_12:</div><div class='add'>+	case RTL_GIGA_MAC_VER_17:</div><div class='add'>+		rtl_hw_start_8168bef(ioaddr, pdev);</div><div class='add'>+	break;</div><div class='add'>+</div><div class='add'>+	case RTL_GIGA_MAC_VER_18:</div><div class='add'>+		rtl_hw_start_8168cp_1(ioaddr, pdev);</div><div class='add'>+	break;</div><div class='add'>+</div><div class='add'>+	case RTL_GIGA_MAC_VER_19:</div><div class='add'>+		rtl_hw_start_8168c_1(ioaddr, pdev);</div><div class='add'>+	break;</div><div class='add'>+</div><div class='add'>+	case RTL_GIGA_MAC_VER_20:</div><div class='add'>+		rtl_hw_start_8168c_2(ioaddr, pdev);</div><div class='add'>+	break;</div><div class='add'>+</div><div class='add'>+	case RTL_GIGA_MAC_VER_21:</div><div class='add'>+		rtl_hw_start_8168c_3(ioaddr, pdev);</div><div class='add'>+	break;</div><div class='add'>+</div><div class='add'>+	case RTL_GIGA_MAC_VER_22:</div><div class='add'>+		rtl_hw_start_8168c_4(ioaddr, pdev);</div><div class='add'>+	break;</div><div class='add'>+</div><div class='add'>+	case RTL_GIGA_MAC_VER_23:</div><div class='add'>+		rtl_hw_start_8168cp_2(ioaddr, pdev);</div><div class='add'>+	break;</div><div class='add'>+</div><div class='add'>+	case RTL_GIGA_MAC_VER_24:</div><div class='add'>+		rtl_hw_start_8168cp_3(ioaddr, pdev);</div><div class='add'>+	break;</div><div class='add'>+</div><div class='add'>+	case RTL_GIGA_MAC_VER_25:</div><div class='add'>+		rtl_hw_start_8168d(ioaddr, pdev);</div><div class='add'>+	break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		printk(KERN_ERR PFX "%s: unknown chipset (mac_version = %d).\n",</div><div class='add'>+			dev-&gt;name, tp-&gt;mac_version);</div><div class='add'>+	break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	RTL_W8(ChipCmd, CmdTxEnb | CmdRxEnb);</div><div class='ctx'> </div><div class='add'>+	RTL_W8(Cfg9346, Cfg9346_Lock);</div><div class='add'>+</div><div class='ctx'> 	RTL_W16(MultiIntr, RTL_R16(MultiIntr) &amp; 0xF000);</div><div class='ctx'> </div><div class='ctx'> 	RTL_W16(IntrMask, tp-&gt;intr_event);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define R810X_CPCMD_QUIRK_MASK (\</div><div class='add'>+	EnableBist | \</div><div class='add'>+	Mac_dbgo_oe | \</div><div class='add'>+	Force_half_dup | \</div><div class='add'>+	Force_half_dup | \</div><div class='add'>+	Force_txflow_en | \</div><div class='add'>+	Cxpl_dbg_sel | \</div><div class='add'>+	ASF | \</div><div class='add'>+	PktCntrDisable | \</div><div class='add'>+	PCIDAC | \</div><div class='add'>+	PCIMulRW)</div><div class='add'>+</div><div class='add'>+static void rtl_hw_start_8102e_1(void __iomem *ioaddr, struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	static struct ephy_info e_info_8102e_1[] = {</div><div class='add'>+		{ 0x01,	0, 0x6e65 },</div><div class='add'>+		{ 0x02,	0, 0x091f },</div><div class='add'>+		{ 0x03,	0, 0xc2f9 },</div><div class='add'>+		{ 0x06,	0, 0xafb5 },</div><div class='add'>+		{ 0x07,	0, 0x0e00 },</div><div class='add'>+		{ 0x19,	0, 0xec80 },</div><div class='add'>+		{ 0x01,	0, 0x2e65 },</div><div class='add'>+		{ 0x01,	0, 0x6e65 }</div><div class='add'>+	};</div><div class='add'>+	u8 cfg1;</div><div class='add'>+</div><div class='add'>+	rtl_csi_access_enable(ioaddr);</div><div class='add'>+</div><div class='add'>+	RTL_W8(DBG_REG, FIX_NAK_1);</div><div class='add'>+</div><div class='add'>+	rtl_tx_performance_tweak(pdev, 0x5 &lt;&lt; MAX_READ_REQUEST_SHIFT);</div><div class='add'>+</div><div class='add'>+	RTL_W8(Config1,</div><div class='add'>+	       LEDS1 | LEDS0 | Speed_down | MEMMAP | IOMAP | VPD | PMEnable);</div><div class='add'>+	RTL_W8(Config3, RTL_R8(Config3) &amp; ~Beacon_en);</div><div class='add'>+</div><div class='add'>+	cfg1 = RTL_R8(Config1);</div><div class='add'>+	if ((cfg1 &amp; LEDS0) &amp;&amp; (cfg1 &amp; LEDS1))</div><div class='add'>+		RTL_W8(Config1, cfg1 &amp; ~LEDS0);</div><div class='add'>+</div><div class='add'>+	RTL_W16(CPlusCmd, RTL_R16(CPlusCmd) &amp; ~R810X_CPCMD_QUIRK_MASK);</div><div class='add'>+</div><div class='add'>+	rtl_ephy_init(ioaddr, e_info_8102e_1, ARRAY_SIZE(e_info_8102e_1));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtl_hw_start_8102e_2(void __iomem *ioaddr, struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	rtl_csi_access_enable(ioaddr);</div><div class='add'>+</div><div class='add'>+	rtl_tx_performance_tweak(pdev, 0x5 &lt;&lt; MAX_READ_REQUEST_SHIFT);</div><div class='add'>+</div><div class='add'>+	RTL_W8(Config1, MEMMAP | IOMAP | VPD | PMEnable);</div><div class='add'>+	RTL_W8(Config3, RTL_R8(Config3) &amp; ~Beacon_en);</div><div class='add'>+</div><div class='add'>+	RTL_W16(CPlusCmd, RTL_R16(CPlusCmd) &amp; ~R810X_CPCMD_QUIRK_MASK);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtl_hw_start_8102e_3(void __iomem *ioaddr, struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	rtl_hw_start_8102e_2(ioaddr, pdev);</div><div class='add'>+</div><div class='add'>+	rtl_ephy_write(ioaddr, 0x03, 0xc2f9);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void rtl_hw_start_8101(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct rtl8169_private *tp = netdev_priv(dev);</div><div class='hunk'>@@ -2118,8 +2849,26 @@ static void rtl_hw_start_8101(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	if ((tp-&gt;mac_version == RTL_GIGA_MAC_VER_13) ||</div><div class='ctx'> 	    (tp-&gt;mac_version == RTL_GIGA_MAC_VER_16)) {</div><div class='del'>-		pci_write_config_word(pdev, 0x68, 0x00);</div><div class='del'>-		pci_write_config_word(pdev, 0x69, 0x08);</div><div class='add'>+		int cap = tp-&gt;pcie_cap;</div><div class='add'>+</div><div class='add'>+		if (cap) {</div><div class='add'>+			pci_write_config_word(pdev, cap + PCI_EXP_DEVCTL,</div><div class='add'>+					      PCI_EXP_DEVCTL_NOSNOOP_EN);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (tp-&gt;mac_version) {</div><div class='add'>+	case RTL_GIGA_MAC_VER_07:</div><div class='add'>+		rtl_hw_start_8102e_1(ioaddr, pdev);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case RTL_GIGA_MAC_VER_08:</div><div class='add'>+		rtl_hw_start_8102e_3(ioaddr, pdev);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case RTL_GIGA_MAC_VER_09:</div><div class='add'>+		rtl_hw_start_8102e_2(ioaddr, pdev);</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	RTL_W8(Cfg9346, Cfg9346_Unlock);</div><div class='hunk'>@@ -2143,8 +2892,6 @@ static void rtl_hw_start_8101(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	RTL_R8(IntrMask);</div><div class='ctx'> </div><div class='del'>-	RTL_W32(RxMissed, 0);</div><div class='del'>-</div><div class='ctx'> 	rtl_set_rx_mode(dev);</div><div class='ctx'> </div><div class='ctx'> 	RTL_W8(ChipCmd, CmdTxEnb | CmdRxEnb);</div><div class='hunk'>@@ -2922,6 +3669,17 @@ static int rtl8169_poll(struct napi_struct *napi, int budget)</div><div class='ctx'> 	return work_done;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void rtl8169_rx_missed(struct net_device *dev, void __iomem *ioaddr)</div><div class='add'>+{</div><div class='add'>+	struct rtl8169_private *tp = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	if (tp-&gt;mac_version &gt; RTL_GIGA_MAC_VER_06)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	dev-&gt;stats.rx_missed_errors += (RTL_R32(RxMissed) &amp; 0xffffff);</div><div class='add'>+	RTL_W32(RxMissed, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void rtl8169_down(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct rtl8169_private *tp = netdev_priv(dev);</div><div class='hunk'>@@ -2939,9 +3697,7 @@ core_down:</div><div class='ctx'> </div><div class='ctx'> 	rtl8169_asic_down(ioaddr);</div><div class='ctx'> </div><div class='del'>-	/* Update the error counts. */</div><div class='del'>-	dev-&gt;stats.rx_missed_errors += RTL_R32(RxMissed);</div><div class='del'>-	RTL_W32(RxMissed, 0);</div><div class='add'>+	rtl8169_rx_missed(dev, ioaddr);</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irq(&amp;tp-&gt;lock);</div><div class='ctx'> </div><div class='hunk'>@@ -3063,8 +3819,7 @@ static struct net_device_stats *rtl8169_get_stats(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	if (netif_running(dev)) {</div><div class='ctx'> 		spin_lock_irqsave(&amp;tp-&gt;lock, flags);</div><div class='del'>-		dev-&gt;stats.rx_missed_errors += RTL_R32(RxMissed);</div><div class='del'>-		RTL_W32(RxMissed, 0);</div><div class='add'>+		rtl8169_rx_missed(dev, ioaddr);</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;tp-&gt;lock, flags);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3089,8 +3844,7 @@ static int rtl8169_suspend(struct pci_dev *pdev, pm_message_t state)</div><div class='ctx'> </div><div class='ctx'> 	rtl8169_asic_down(ioaddr);</div><div class='ctx'> </div><div class='del'>-	dev-&gt;stats.rx_missed_errors += RTL_R32(RxMissed);</div><div class='del'>-	RTL_W32(RxMissed, 0);</div><div class='add'>+	rtl8169_rx_missed(dev, ioaddr);</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irq(&amp;tp-&gt;lock);</div><div class='ctx'> </div><div class='hunk'>@@ -3121,6 +3875,11 @@ out:</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void rtl_shutdown(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	rtl8169_suspend(pdev, PMSG_SUSPEND);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif /* CONFIG_PM */</div><div class='ctx'> </div><div class='ctx'> static struct pci_driver rtl8169_pci_driver = {</div><div class='hunk'>@@ -3131,6 +3890,7 @@ static struct pci_driver rtl8169_pci_driver = {</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> 	.suspend	= rtl8169_suspend,</div><div class='ctx'> 	.resume		= rtl8169_resume,</div><div class='add'>+	.shutdown	= rtl_shutdown,</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c<br/>index a2b073097e5c..6a1375f9cbb8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/s2io.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/s2io.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/s2io.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/s2io.c</a></div><div class='hunk'>@@ -371,9 +371,6 @@ static void s2io_vlan_rx_register(struct net_device *dev,</div><div class='ctx'> 				flags[i]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* A flag indicating whether 'RX_PA_CFG_STRIP_VLAN_TAG' bit is set or not */</div><div class='del'>-static int vlan_strip_flag;</div><div class='del'>-</div><div class='ctx'> /* Unregister the vlan */</div><div class='ctx'> static void s2io_vlan_rx_kill_vid(struct net_device *dev, unsigned long vid)</div><div class='ctx'> {</div><div class='hunk'>@@ -2303,7 +2300,7 @@ static int start_nic(struct s2io_nic *nic)</div><div class='ctx'> 		val64 = readq(&amp;bar0-&gt;rx_pa_cfg);</div><div class='ctx'> 		val64 &amp;= ~RX_PA_CFG_STRIP_VLAN_TAG;</div><div class='ctx'> 		writeq(val64, &amp;bar0-&gt;rx_pa_cfg);</div><div class='del'>-		vlan_strip_flag = 0;</div><div class='add'>+		nic-&gt;vlan_strip_flag = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -3136,7 +3133,7 @@ static void tx_intr_handler(struct fifo_info *fifo_data)</div><div class='ctx'> 		if (skb == NULL) {</div><div class='ctx'> 			spin_unlock_irqrestore(&amp;fifo_data-&gt;tx_lock, flags);</div><div class='ctx'> 			DBG_PRINT(ERR_DBG, "%s: Null skb ",</div><div class='del'>-			__FUNCTION__);</div><div class='add'>+			__func__);</div><div class='ctx'> 			DBG_PRINT(ERR_DBG, "in Tx Free Intr\n");</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -3496,7 +3493,7 @@ static void s2io_reset(struct s2io_nic * sp)</div><div class='ctx'> 	unsigned long long mem_alloc_cnt, mem_free_cnt, watchdog_cnt;</div><div class='ctx'> </div><div class='ctx'> 	DBG_PRINT(INIT_DBG,"%s - Resetting XFrame card %s\n",</div><div class='del'>-			__FUNCTION__, sp-&gt;dev-&gt;name);</div><div class='add'>+			__func__, sp-&gt;dev-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	/* Back up  the PCI-X CMD reg, dont want to lose MMRBC, OST settings */</div><div class='ctx'> 	pci_read_config_word(sp-&gt;pdev, PCIX_COMMAND_REGISTER, &amp;(pci_cmd));</div><div class='hunk'>@@ -3518,7 +3515,7 @@ static void s2io_reset(struct s2io_nic * sp)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (check_pci_device_id(val16) == (u16)PCI_ANY_ID) {</div><div class='del'>-		DBG_PRINT(ERR_DBG,"%s SW_Reset failed!\n", __FUNCTION__);</div><div class='add'>+		DBG_PRINT(ERR_DBG,"%s SW_Reset failed!\n", __func__);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	pci_write_config_word(sp-&gt;pdev, PCIX_COMMAND_REGISTER, pci_cmd);</div><div class='hunk'>@@ -3768,7 +3765,7 @@ static void restore_xmsi_data(struct s2io_nic *nic)</div><div class='ctx'> 		val64 = (s2BIT(7) | s2BIT(15) | vBIT(msix_index, 26, 6));</div><div class='ctx'> 		writeq(val64, &amp;bar0-&gt;xmsi_access);</div><div class='ctx'> 		if (wait_for_msix_trans(nic, msix_index)) {</div><div class='del'>-			DBG_PRINT(ERR_DBG, "failed in %s\n", __FUNCTION__);</div><div class='add'>+			DBG_PRINT(ERR_DBG, "failed in %s\n", __func__);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3789,7 +3786,7 @@ static void store_xmsi_data(struct s2io_nic *nic)</div><div class='ctx'> 		val64 = (s2BIT(15) | vBIT(msix_index, 26, 6));</div><div class='ctx'> 		writeq(val64, &amp;bar0-&gt;xmsi_access);</div><div class='ctx'> 		if (wait_for_msix_trans(nic, msix_index)) {</div><div class='del'>-			DBG_PRINT(ERR_DBG, "failed in %s\n", __FUNCTION__);</div><div class='add'>+			DBG_PRINT(ERR_DBG, "failed in %s\n", __func__);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> 		addr = readq(&amp;bar0-&gt;xmsi_address);</div><div class='hunk'>@@ -3812,7 +3809,7 @@ static int s2io_enable_msi_x(struct s2io_nic *nic)</div><div class='ctx'> 			       GFP_KERNEL);</div><div class='ctx'> 	if (!nic-&gt;entries) {</div><div class='ctx'> 		DBG_PRINT(INFO_DBG, "%s: Memory allocation failed\n", \</div><div class='del'>-			__FUNCTION__);</div><div class='add'>+			__func__);</div><div class='ctx'> 		nic-&gt;mac_control.stats_info-&gt;sw_stat.mem_alloc_fail_cnt++;</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3826,7 +3823,7 @@ static int s2io_enable_msi_x(struct s2io_nic *nic)</div><div class='ctx'> 				   GFP_KERNEL);</div><div class='ctx'> 	if (!nic-&gt;s2io_entries) {</div><div class='ctx'> 		DBG_PRINT(INFO_DBG, "%s: Memory allocation failed\n",</div><div class='del'>-			__FUNCTION__);</div><div class='add'>+			__func__);</div><div class='ctx'> 		nic-&gt;mac_control.stats_info-&gt;sw_stat.mem_alloc_fail_cnt++;</div><div class='ctx'> 		kfree(nic-&gt;entries);</div><div class='ctx'> 		nic-&gt;mac_control.stats_info-&gt;sw_stat.mem_freed</div><div class='hunk'>@@ -5010,7 +5007,7 @@ static void s2io_set_multicast(struct net_device *dev)</div><div class='ctx'> 			val64 = readq(&amp;bar0-&gt;rx_pa_cfg);</div><div class='ctx'> 			val64 &amp;= ~RX_PA_CFG_STRIP_VLAN_TAG;</div><div class='ctx'> 			writeq(val64, &amp;bar0-&gt;rx_pa_cfg);</div><div class='del'>-			vlan_strip_flag = 0;</div><div class='add'>+			sp-&gt;vlan_strip_flag = 0;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		val64 = readq(&amp;bar0-&gt;mac_cfg);</div><div class='hunk'>@@ -5032,7 +5029,7 @@ static void s2io_set_multicast(struct net_device *dev)</div><div class='ctx'> 			val64 = readq(&amp;bar0-&gt;rx_pa_cfg);</div><div class='ctx'> 			val64 |= RX_PA_CFG_STRIP_VLAN_TAG;</div><div class='ctx'> 			writeq(val64, &amp;bar0-&gt;rx_pa_cfg);</div><div class='del'>-			vlan_strip_flag = 1;</div><div class='add'>+			sp-&gt;vlan_strip_flag = 1;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		val64 = readq(&amp;bar0-&gt;mac_cfg);</div><div class='hunk'>@@ -6746,7 +6743,7 @@ static int s2io_change_mtu(struct net_device *dev, int new_mtu)</div><div class='ctx'> 		ret = s2io_card_up(sp);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			DBG_PRINT(ERR_DBG, "%s: Device bring up failed\n",</div><div class='del'>-				  __FUNCTION__);</div><div class='add'>+				  __func__);</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		}</div><div class='ctx'> 		s2io_wake_all_tx_queue(sp);</div><div class='hunk'>@@ -7530,7 +7527,7 @@ static int rx_osm_handler(struct ring_info *ring_data, struct RxD_t * rxdp)</div><div class='ctx'> 					default:</div><div class='ctx'> 						DBG_PRINT(ERR_DBG,</div><div class='ctx'> 							"%s: Samadhana!!\n",</div><div class='del'>-							 __FUNCTION__);</div><div class='add'>+							 __func__);</div><div class='ctx'> 						BUG();</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='hunk'>@@ -7781,7 +7778,7 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> 	if ((ret = pci_request_regions(pdev, s2io_driver_name))) {</div><div class='del'>-		DBG_PRINT(ERR_DBG, "%s: Request Regions failed - %x \n", __FUNCTION__, ret);</div><div class='add'>+		DBG_PRINT(ERR_DBG, "%s: Request Regions failed - %x \n", __func__, ret);</div><div class='ctx'> 		pci_disable_device(pdev);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -7998,7 +7995,7 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)</div><div class='ctx'> 	if (sp-&gt;device_type &amp; XFRAME_II_DEVICE) {</div><div class='ctx'> 		mode = s2io_verify_pci_mode(sp);</div><div class='ctx'> 		if (mode &lt; 0) {</div><div class='del'>-			DBG_PRINT(ERR_DBG, "%s: ", __FUNCTION__);</div><div class='add'>+			DBG_PRINT(ERR_DBG, "%s: ", __func__);</div><div class='ctx'> 			DBG_PRINT(ERR_DBG, " Unsupported PCI bus mode\n");</div><div class='ctx'> 			ret = -EBADSLT;</div><div class='ctx'> 			goto set_swap_failed;</div><div class='hunk'>@@ -8175,8 +8172,8 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)</div><div class='ctx'> 		    break;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (sp-&gt;config.multiq) {</div><div class='del'>-	for (i = 0; i &lt; sp-&gt;config.tx_fifo_num; i++)</div><div class='del'>-		mac_control-&gt;fifos[i].multiq = config-&gt;multiq;</div><div class='add'>+		for (i = 0; i &lt; sp-&gt;config.tx_fifo_num; i++)</div><div class='add'>+			mac_control-&gt;fifos[i].multiq = config-&gt;multiq;</div><div class='ctx'> 		DBG_PRINT(ERR_DBG, "%s: Multiqueue support enabled\n",</div><div class='ctx'> 			dev-&gt;name);</div><div class='ctx'> 	} else</div><div class='hunk'>@@ -8206,6 +8203,11 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)</div><div class='ctx'> 	/* Initialize device name */</div><div class='ctx'> 	sprintf(sp-&gt;name, "%s Neterion %s", dev-&gt;name, sp-&gt;product_name);</div><div class='ctx'> </div><div class='add'>+	if (vlan_tag_strip)</div><div class='add'>+		sp-&gt;vlan_strip_flag = 1;</div><div class='add'>+	else</div><div class='add'>+		sp-&gt;vlan_strip_flag = 0;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Make Link state as off at this point, when the Link change</div><div class='ctx'> 	 * interrupt comes the state will be automatically changed to</div><div class='hunk'>@@ -8299,7 +8301,7 @@ static int check_L2_lro_capable(u8 *buffer, struct iphdr **ip,</div><div class='ctx'> </div><div class='ctx'> 	if (!(rxdp-&gt;Control_1 &amp; RXD_FRAME_PROTO_TCP)) {</div><div class='ctx'> 		DBG_PRINT(INIT_DBG,"%s: Non-TCP frames not supported for LRO\n",</div><div class='del'>-			  __FUNCTION__);</div><div class='add'>+			  __func__);</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -8311,7 +8313,7 @@ static int check_L2_lro_capable(u8 *buffer, struct iphdr **ip,</div><div class='ctx'> 		 * If vlan stripping is disabled and the frame is VLAN tagged,</div><div class='ctx'> 		 * shift the offset by the VLAN header size bytes.</div><div class='ctx'> 		 */</div><div class='del'>-		if ((!vlan_strip_flag) &amp;&amp;</div><div class='add'>+		if ((!sp-&gt;vlan_strip_flag) &amp;&amp;</div><div class='ctx'> 			(rxdp-&gt;Control_1 &amp; RXD_FRAME_VLAN_TAG))</div><div class='ctx'> 			ip_off += HEADER_VLAN_SIZE;</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -8330,7 +8332,7 @@ static int check_L2_lro_capable(u8 *buffer, struct iphdr **ip,</div><div class='ctx'> static int check_for_socket_match(struct lro *lro, struct iphdr *ip,</div><div class='ctx'> 				  struct tcphdr *tcp)</div><div class='ctx'> {</div><div class='del'>-	DBG_PRINT(INFO_DBG,"%s: Been here...\n", __FUNCTION__);</div><div class='add'>+	DBG_PRINT(INFO_DBG,"%s: Been here...\n", __func__);</div><div class='ctx'> 	if ((lro-&gt;iph-&gt;saddr != ip-&gt;saddr) || (lro-&gt;iph-&gt;daddr != ip-&gt;daddr) ||</div><div class='ctx'> 	   (lro-&gt;tcph-&gt;source != tcp-&gt;source) || (lro-&gt;tcph-&gt;dest != tcp-&gt;dest))</div><div class='ctx'> 		return -1;</div><div class='hunk'>@@ -8345,7 +8347,7 @@ static inline int get_l4_pyld_length(struct iphdr *ip, struct tcphdr *tcp)</div><div class='ctx'> static void initiate_new_session(struct lro *lro, u8 *l2h,</div><div class='ctx'> 	struct iphdr *ip, struct tcphdr *tcp, u32 tcp_pyld_len, u16 vlan_tag)</div><div class='ctx'> {</div><div class='del'>-	DBG_PRINT(INFO_DBG,"%s: Been here...\n", __FUNCTION__);</div><div class='add'>+	DBG_PRINT(INFO_DBG,"%s: Been here...\n", __func__);</div><div class='ctx'> 	lro-&gt;l2h = l2h;</div><div class='ctx'> 	lro-&gt;iph = ip;</div><div class='ctx'> 	lro-&gt;tcph = tcp;</div><div class='hunk'>@@ -8375,7 +8377,7 @@ static void update_L3L4_header(struct s2io_nic *sp, struct lro *lro)</div><div class='ctx'> 	struct tcphdr *tcp = lro-&gt;tcph;</div><div class='ctx'> 	__sum16 nchk;</div><div class='ctx'> 	struct stat_block *statinfo = sp-&gt;mac_control.stats_info;</div><div class='del'>-	DBG_PRINT(INFO_DBG,"%s: Been here...\n", __FUNCTION__);</div><div class='add'>+	DBG_PRINT(INFO_DBG,"%s: Been here...\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	/* Update L3 header */</div><div class='ctx'> 	ip-&gt;tot_len = htons(lro-&gt;total_len);</div><div class='hunk'>@@ -8403,7 +8405,7 @@ static void update_L3L4_header(struct s2io_nic *sp, struct lro *lro)</div><div class='ctx'> static void aggregate_new_rx(struct lro *lro, struct iphdr *ip,</div><div class='ctx'> 		struct tcphdr *tcp, u32 l4_pyld)</div><div class='ctx'> {</div><div class='del'>-	DBG_PRINT(INFO_DBG,"%s: Been here...\n", __FUNCTION__);</div><div class='add'>+	DBG_PRINT(INFO_DBG,"%s: Been here...\n", __func__);</div><div class='ctx'> 	lro-&gt;total_len += l4_pyld;</div><div class='ctx'> 	lro-&gt;frags_len += l4_pyld;</div><div class='ctx'> 	lro-&gt;tcp_next_seq += l4_pyld;</div><div class='hunk'>@@ -8427,7 +8429,7 @@ static int verify_l3_l4_lro_capable(struct lro *l_lro, struct iphdr *ip,</div><div class='ctx'> {</div><div class='ctx'> 	u8 *ptr;</div><div class='ctx'> </div><div class='del'>-	DBG_PRINT(INFO_DBG,"%s: Been here...\n", __FUNCTION__);</div><div class='add'>+	DBG_PRINT(INFO_DBG,"%s: Been here...\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	if (!tcp_pyld_len) {</div><div class='ctx'> 		/* Runt frame or a pure ack */</div><div class='hunk'>@@ -8509,7 +8511,7 @@ s2io_club_tcp_session(struct ring_info *ring_data, u8 *buffer, u8 **tcp,</div><div class='ctx'> </div><div class='ctx'> 			if ((*lro)-&gt;tcp_next_seq != ntohl(tcph-&gt;seq)) {</div><div class='ctx'> 				DBG_PRINT(INFO_DBG, "%s:Out of order. expected "</div><div class='del'>-					  "0x%x, actual 0x%x\n", __FUNCTION__,</div><div class='add'>+					  "0x%x, actual 0x%x\n", __func__,</div><div class='ctx'> 					  (*lro)-&gt;tcp_next_seq,</div><div class='ctx'> 					  ntohl(tcph-&gt;seq));</div><div class='ctx'> </div><div class='hunk'>@@ -8549,7 +8551,7 @@ s2io_club_tcp_session(struct ring_info *ring_data, u8 *buffer, u8 **tcp,</div><div class='ctx'> </div><div class='ctx'> 	if (ret == 0) { /* sessions exceeded */</div><div class='ctx'> 		DBG_PRINT(INFO_DBG,"%s:All LRO sessions already in use\n",</div><div class='del'>-			  __FUNCTION__);</div><div class='add'>+			  __func__);</div><div class='ctx'> 		*lro = NULL;</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -8571,7 +8573,7 @@ s2io_club_tcp_session(struct ring_info *ring_data, u8 *buffer, u8 **tcp,</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			DBG_PRINT(ERR_DBG,"%s:Dont know, can't say!!\n",</div><div class='del'>-				__FUNCTION__);</div><div class='add'>+				__func__);</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -8592,7 +8594,7 @@ static void queue_rx_frame(struct sk_buff *skb, u16 vlan_tag)</div><div class='ctx'> </div><div class='ctx'> 	skb-&gt;protocol = eth_type_trans(skb, dev);</div><div class='ctx'> 	if (sp-&gt;vlgrp &amp;&amp; vlan_tag</div><div class='del'>-		&amp;&amp; (vlan_strip_flag)) {</div><div class='add'>+		&amp;&amp; (sp-&gt;vlan_strip_flag)) {</div><div class='ctx'> 		/* Queueing the vlan frame to the upper layer */</div><div class='ctx'> 		if (sp-&gt;config.napi)</div><div class='ctx'> 			vlan_hwaccel_receive_skb(skb, sp-&gt;vlgrp, vlan_tag);</div><div class='head'>diff --git a/drivers/net/s2io.h b/drivers/net/s2io.h<br/>index 6722a2f7d091..55cb943f23f8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/s2io.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/s2io.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/s2io.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/s2io.h</a></div><div class='hunk'>@@ -962,6 +962,7 @@ struct s2io_nic {</div><div class='ctx'> 	int task_flag;</div><div class='ctx'> 	unsigned long long start_time;</div><div class='ctx'> 	struct vlan_group *vlgrp;</div><div class='add'>+	int vlan_strip_flag;</div><div class='ctx'> #define MSIX_FLG                0xA5</div><div class='ctx'> 	int num_entries;</div><div class='ctx'> 	struct msix_entry *entries;</div><div class='head'>diff --git a/drivers/net/sb1250-mac.c b/drivers/net/sb1250-mac.c<br/>index fe41e4ec21ec..2615d46e6e50 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sb1250-mac.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/sb1250-mac.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sb1250-mac.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sb1250-mac.c</a></div><div class='hunk'>@@ -256,7 +256,7 @@ struct sbmac_softc {</div><div class='ctx'> 	struct net_device	*sbm_dev;	/* pointer to linux device */</div><div class='ctx'> 	struct napi_struct	napi;</div><div class='ctx'> 	struct phy_device	*phy_dev;	/* the associated PHY device */</div><div class='del'>-	struct mii_bus		mii_bus;	/* the MII bus */</div><div class='add'>+	struct mii_bus		*mii_bus;	/* the MII bus */</div><div class='ctx'> 	int			phy_irq[PHY_MAX_ADDR];</div><div class='ctx'> 	spinlock_t		sbm_lock;	/* spin lock */</div><div class='ctx'> 	int			sbm_devflags;	/* current device flags */</div><div class='hunk'>@@ -2069,9 +2069,10 @@ static irqreturn_t sbmac_intr(int irq,void *dev_instance)</div><div class='ctx'> static int sbmac_start_tx(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct sbmac_softc *sc = netdev_priv(dev);</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	/* lock eth irq */</div><div class='del'>-	spin_lock_irq (&amp;sc-&gt;sbm_lock);</div><div class='add'>+	spin_lock_irqsave(&amp;sc-&gt;sbm_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Put the buffer on the transmit ring.  If we</div><div class='hunk'>@@ -2081,14 +2082,14 @@ static int sbmac_start_tx(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	if (sbdma_add_txbuffer(&amp;(sc-&gt;sbm_txdma),skb)) {</div><div class='ctx'> 		/* XXX save skb that we could not send */</div><div class='ctx'> 		netif_stop_queue(dev);</div><div class='del'>-		spin_unlock_irq(&amp;sc-&gt;sbm_lock);</div><div class='add'>+		spin_unlock_irqrestore(&amp;sc-&gt;sbm_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;trans_start = jiffies;</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irq (&amp;sc-&gt;sbm_lock);</div><div class='add'>+	spin_unlock_irqrestore(&amp;sc-&gt;sbm_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -2347,10 +2348,17 @@ static int sbmac_init(struct platform_device *pldev, long long base)</div><div class='ctx'> 	/* This is needed for PASS2 for Rx H/W checksum feature */</div><div class='ctx'> 	sbmac_set_iphdr_offset(sc);</div><div class='ctx'> </div><div class='add'>+	sc-&gt;mii_bus = mdiobus_alloc();</div><div class='add'>+	if (sc-&gt;mii_bus == NULL) {</div><div class='add'>+		sbmac_uninitctx(sc);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	err = register_netdev(dev);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		printk(KERN_ERR "%s.%d: unable to register netdev\n",</div><div class='ctx'> 		       sbmac_string, idx);</div><div class='add'>+		mdiobus_free(sc-&gt;mii_bus);</div><div class='ctx'> 		sbmac_uninitctx(sc);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2368,17 +2376,17 @@ static int sbmac_init(struct platform_device *pldev, long long base)</div><div class='ctx'> 	pr_info("%s: SiByte Ethernet at 0x%08Lx, address: %s\n",</div><div class='ctx'> 	       dev-&gt;name, base, print_mac(mac, eaddr));</div><div class='ctx'> </div><div class='del'>-	sc-&gt;mii_bus.name = sbmac_mdio_string;</div><div class='del'>-	snprintf(sc-&gt;mii_bus.id, MII_BUS_ID_SIZE, "%x", idx);</div><div class='del'>-	sc-&gt;mii_bus.priv = sc;</div><div class='del'>-	sc-&gt;mii_bus.read = sbmac_mii_read;</div><div class='del'>-	sc-&gt;mii_bus.write = sbmac_mii_write;</div><div class='del'>-	sc-&gt;mii_bus.irq = sc-&gt;phy_irq;</div><div class='add'>+	sc-&gt;mii_bus-&gt;name = sbmac_mdio_string;</div><div class='add'>+	snprintf(sc-&gt;mii_bus-&gt;id, MII_BUS_ID_SIZE, "%x", idx);</div><div class='add'>+	sc-&gt;mii_bus-&gt;priv = sc;</div><div class='add'>+	sc-&gt;mii_bus-&gt;read = sbmac_mii_read;</div><div class='add'>+	sc-&gt;mii_bus-&gt;write = sbmac_mii_write;</div><div class='add'>+	sc-&gt;mii_bus-&gt;irq = sc-&gt;phy_irq;</div><div class='ctx'> 	for (i = 0; i &lt; PHY_MAX_ADDR; ++i)</div><div class='del'>-		sc-&gt;mii_bus.irq[i] = SBMAC_PHY_INT;</div><div class='add'>+		sc-&gt;mii_bus-&gt;irq[i] = SBMAC_PHY_INT;</div><div class='ctx'> </div><div class='del'>-	sc-&gt;mii_bus.dev = &amp;pldev-&gt;dev;</div><div class='del'>-	dev_set_drvdata(&amp;pldev-&gt;dev, &amp;sc-&gt;mii_bus);</div><div class='add'>+	sc-&gt;mii_bus-&gt;parent = &amp;pldev-&gt;dev;</div><div class='add'>+	dev_set_drvdata(&amp;pldev-&gt;dev, sc-&gt;mii_bus);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -2409,7 +2417,7 @@ static int sbmac_open(struct net_device *dev)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Probe PHY address</div><div class='ctx'> 	 */</div><div class='del'>-	err = mdiobus_register(&amp;sc-&gt;mii_bus);</div><div class='add'>+	err = mdiobus_register(sc-&gt;mii_bus);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		printk(KERN_ERR "%s: unable to register MDIO bus\n",</div><div class='ctx'> 		       dev-&gt;name);</div><div class='hunk'>@@ -2446,7 +2454,7 @@ static int sbmac_open(struct net_device *dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> out_unregister:</div><div class='del'>-	mdiobus_unregister(&amp;sc-&gt;mii_bus);</div><div class='add'>+	mdiobus_unregister(sc-&gt;mii_bus);</div><div class='ctx'> </div><div class='ctx'> out_unirq:</div><div class='ctx'> 	free_irq(dev-&gt;irq, dev);</div><div class='hunk'>@@ -2462,7 +2470,7 @@ static int sbmac_mii_probe(struct net_device *dev)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; PHY_MAX_ADDR; i++) {</div><div class='del'>-		phy_dev = sc-&gt;mii_bus.phy_map[i];</div><div class='add'>+		phy_dev = sc-&gt;mii_bus-&gt;phy_map[i];</div><div class='ctx'> 		if (phy_dev)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2568,14 +2576,15 @@ static void sbmac_mii_poll(struct net_device *dev)</div><div class='ctx'> static void sbmac_tx_timeout (struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct sbmac_softc *sc = netdev_priv(dev);</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq (&amp;sc-&gt;sbm_lock);</div><div class='add'>+	spin_lock_irqsave(&amp;sc-&gt;sbm_lock, flags);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;trans_start = jiffies;</div><div class='ctx'> 	dev-&gt;stats.tx_errors++;</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irq (&amp;sc-&gt;sbm_lock);</div><div class='add'>+	spin_unlock_irqrestore(&amp;sc-&gt;sbm_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	printk (KERN_WARNING "%s: Transmit timed out\n",dev-&gt;name);</div><div class='ctx'> }</div><div class='hunk'>@@ -2639,7 +2648,7 @@ static int sbmac_close(struct net_device *dev)</div><div class='ctx'> 	phy_disconnect(sc-&gt;phy_dev);</div><div class='ctx'> 	sc-&gt;phy_dev = NULL;</div><div class='ctx'> </div><div class='del'>-	mdiobus_unregister(&amp;sc-&gt;mii_bus);</div><div class='add'>+	mdiobus_unregister(sc-&gt;mii_bus);</div><div class='ctx'> </div><div class='ctx'> 	free_irq(dev-&gt;irq, dev);</div><div class='ctx'> </div><div class='hunk'>@@ -2748,6 +2757,7 @@ static int __exit sbmac_remove(struct platform_device *pldev)</div><div class='ctx'> </div><div class='ctx'> 	unregister_netdev(dev);</div><div class='ctx'> 	sbmac_uninitctx(sc);</div><div class='add'>+	mdiobus_free(sc-&gt;mii_bus);</div><div class='ctx'> 	iounmap(sc-&gt;sbm_base);</div><div class='ctx'> 	free_netdev(dev);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/sfc/bitfield.h b/drivers/net/sfc/bitfield.h<br/>index 2c79d27404e0..d95c21828014 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sfc/bitfield.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/sfc/bitfield.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sfc/bitfield.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sfc/bitfield.h</a></div><div class='hunk'>@@ -52,9 +52,9 @@</div><div class='ctx'>  *</div><div class='ctx'>  * The maximum width mask that can be generated is 64 bits.</div><div class='ctx'>  */</div><div class='del'>-#define EFX_MASK64(field)					\</div><div class='del'>-	(EFX_WIDTH(field) == 64 ? ~((u64) 0) :		\</div><div class='del'>-	 (((((u64) 1) &lt;&lt; EFX_WIDTH(field))) - 1))</div><div class='add'>+#define EFX_MASK64(width)			\</div><div class='add'>+	((width) == 64 ? ~((u64) 0) :		\</div><div class='add'>+	 (((((u64) 1) &lt;&lt; (width))) - 1))</div><div class='ctx'> </div><div class='ctx'> /* Mask equal in width to the specified field.</div><div class='ctx'>  *</div><div class='hunk'>@@ -63,9 +63,9 @@</div><div class='ctx'>  * The maximum width mask that can be generated is 32 bits.  Use</div><div class='ctx'>  * EFX_MASK64 for higher width fields.</div><div class='ctx'>  */</div><div class='del'>-#define EFX_MASK32(field)					\</div><div class='del'>-	(EFX_WIDTH(field) == 32 ? ~((u32) 0) :		\</div><div class='del'>-	 (((((u32) 1) &lt;&lt; EFX_WIDTH(field))) - 1))</div><div class='add'>+#define EFX_MASK32(width)			\</div><div class='add'>+	((width) == 32 ? ~((u32) 0) :		\</div><div class='add'>+	 (((((u32) 1) &lt;&lt; (width))) - 1))</div><div class='ctx'> </div><div class='ctx'> /* A doubleword (i.e. 4 byte) datatype - little-endian in HW */</div><div class='ctx'> typedef union efx_dword {</div><div class='hunk'>@@ -138,44 +138,49 @@ typedef union efx_oword {</div><div class='ctx'> 	EFX_EXTRACT_NATIVE(le32_to_cpu(element), min, max, low, high)</div><div class='ctx'> </div><div class='ctx'> #define EFX_EXTRACT_OWORD64(oword, low, high)				\</div><div class='del'>-	(EFX_EXTRACT64((oword).u64[0], 0, 63, low, high) |		\</div><div class='del'>-	 EFX_EXTRACT64((oword).u64[1], 64, 127, low, high))</div><div class='add'>+	((EFX_EXTRACT64((oword).u64[0], 0, 63, low, high) |		\</div><div class='add'>+	  EFX_EXTRACT64((oword).u64[1], 64, 127, low, high)) &amp;		\</div><div class='add'>+	 EFX_MASK64(high + 1 - low))</div><div class='ctx'> </div><div class='ctx'> #define EFX_EXTRACT_QWORD64(qword, low, high)				\</div><div class='del'>-	EFX_EXTRACT64((qword).u64[0], 0, 63, low, high)</div><div class='add'>+	(EFX_EXTRACT64((qword).u64[0], 0, 63, low, high) &amp;		\</div><div class='add'>+	 EFX_MASK64(high + 1 - low))</div><div class='ctx'> </div><div class='ctx'> #define EFX_EXTRACT_OWORD32(oword, low, high)				\</div><div class='del'>-	(EFX_EXTRACT32((oword).u32[0], 0, 31, low, high) |		\</div><div class='del'>-	 EFX_EXTRACT32((oword).u32[1], 32, 63, low, high) |		\</div><div class='del'>-	 EFX_EXTRACT32((oword).u32[2], 64, 95, low, high) |		\</div><div class='del'>-	 EFX_EXTRACT32((oword).u32[3], 96, 127, low, high))</div><div class='add'>+	((EFX_EXTRACT32((oword).u32[0], 0, 31, low, high) |		\</div><div class='add'>+	  EFX_EXTRACT32((oword).u32[1], 32, 63, low, high) |		\</div><div class='add'>+	  EFX_EXTRACT32((oword).u32[2], 64, 95, low, high) |		\</div><div class='add'>+	  EFX_EXTRACT32((oword).u32[3], 96, 127, low, high)) &amp;		\</div><div class='add'>+	 EFX_MASK32(high + 1 - low))</div><div class='ctx'> </div><div class='ctx'> #define EFX_EXTRACT_QWORD32(qword, low, high)				\</div><div class='del'>-	(EFX_EXTRACT32((qword).u32[0], 0, 31, low, high) |		\</div><div class='del'>-	 EFX_EXTRACT32((qword).u32[1], 32, 63, low, high))</div><div class='add'>+	((EFX_EXTRACT32((qword).u32[0], 0, 31, low, high) |		\</div><div class='add'>+	  EFX_EXTRACT32((qword).u32[1], 32, 63, low, high)) &amp;		\</div><div class='add'>+	 EFX_MASK32(high + 1 - low))</div><div class='ctx'> </div><div class='del'>-#define EFX_EXTRACT_DWORD(dword, low, high)				\</div><div class='del'>-	EFX_EXTRACT32((dword).u32[0], 0, 31, low, high)</div><div class='add'>+#define EFX_EXTRACT_DWORD(dword, low, high)			\</div><div class='add'>+	(EFX_EXTRACT32((dword).u32[0], 0, 31, low, high) &amp;	\</div><div class='add'>+	 EFX_MASK32(high + 1 - low))</div><div class='ctx'> </div><div class='del'>-#define EFX_OWORD_FIELD64(oword, field)					\</div><div class='del'>-	(EFX_EXTRACT_OWORD64(oword, EFX_LOW_BIT(field), EFX_HIGH_BIT(field)) \</div><div class='del'>-	 &amp; EFX_MASK64(field))</div><div class='add'>+#define EFX_OWORD_FIELD64(oword, field)				\</div><div class='add'>+	EFX_EXTRACT_OWORD64(oword, EFX_LOW_BIT(field),		\</div><div class='add'>+			    EFX_HIGH_BIT(field))</div><div class='ctx'> </div><div class='del'>-#define EFX_QWORD_FIELD64(qword, field)					\</div><div class='del'>-	(EFX_EXTRACT_QWORD64(qword, EFX_LOW_BIT(field), EFX_HIGH_BIT(field)) \</div><div class='del'>-	 &amp; EFX_MASK64(field))</div><div class='add'>+#define EFX_QWORD_FIELD64(qword, field)				\</div><div class='add'>+	EFX_EXTRACT_QWORD64(qword, EFX_LOW_BIT(field),		\</div><div class='add'>+			    EFX_HIGH_BIT(field))</div><div class='ctx'> </div><div class='del'>-#define EFX_OWORD_FIELD32(oword, field)					\</div><div class='del'>-	(EFX_EXTRACT_OWORD32(oword, EFX_LOW_BIT(field), EFX_HIGH_BIT(field)) \</div><div class='del'>-	 &amp; EFX_MASK32(field))</div><div class='add'>+#define EFX_OWORD_FIELD32(oword, field)				\</div><div class='add'>+	EFX_EXTRACT_OWORD32(oword, EFX_LOW_BIT(field),		\</div><div class='add'>+			    EFX_HIGH_BIT(field))</div><div class='ctx'> </div><div class='del'>-#define EFX_QWORD_FIELD32(qword, field)					\</div><div class='del'>-	(EFX_EXTRACT_QWORD32(qword, EFX_LOW_BIT(field), EFX_HIGH_BIT(field)) \</div><div class='del'>-	 &amp; EFX_MASK32(field))</div><div class='add'>+#define EFX_QWORD_FIELD32(qword, field)				\</div><div class='add'>+	EFX_EXTRACT_QWORD32(qword, EFX_LOW_BIT(field),		\</div><div class='add'>+			    EFX_HIGH_BIT(field))</div><div class='ctx'> </div><div class='del'>-#define EFX_DWORD_FIELD(dword, field)					   \</div><div class='del'>-	(EFX_EXTRACT_DWORD(dword, EFX_LOW_BIT(field), EFX_HIGH_BIT(field)) \</div><div class='del'>-	 &amp; EFX_MASK32(field))</div><div class='add'>+#define EFX_DWORD_FIELD(dword, field)				\</div><div class='add'>+	EFX_EXTRACT_DWORD(dword, EFX_LOW_BIT(field),		\</div><div class='add'>+			  EFX_HIGH_BIT(field))</div><div class='ctx'> </div><div class='ctx'> #define EFX_OWORD_IS_ZERO64(oword)					\</div><div class='ctx'> 	(((oword).u64[0] | (oword).u64[1]) == (__force __le64) 0)</div><div class='hunk'>@@ -411,69 +416,102 @@ typedef union efx_oword {</div><div class='ctx'>  * for read-modify-write operations.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-</div><div class='ctx'> #define EFX_INVERT_OWORD(oword) do {		\</div><div class='ctx'> 	(oword).u64[0] = ~((oword).u64[0]);	\</div><div class='ctx'> 	(oword).u64[1] = ~((oword).u64[1]);	\</div><div class='ctx'> 	} while (0)</div><div class='ctx'> </div><div class='del'>-#define EFX_INSERT_FIELD64(...)					\</div><div class='del'>-	cpu_to_le64(EFX_INSERT_FIELD_NATIVE(__VA_ARGS__))</div><div class='add'>+#define EFX_AND_OWORD(oword, from, mask)			\</div><div class='add'>+	do {							\</div><div class='add'>+		(oword).u64[0] = (from).u64[0] &amp; (mask).u64[0];	\</div><div class='add'>+		(oword).u64[1] = (from).u64[1] &amp; (mask).u64[1];	\</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+#define EFX_OR_OWORD(oword, from, mask)				\</div><div class='add'>+	do {							\</div><div class='add'>+		(oword).u64[0] = (from).u64[0] | (mask).u64[0];	\</div><div class='add'>+		(oword).u64[1] = (from).u64[1] | (mask).u64[1];	\</div><div class='add'>+	} while (0)</div><div class='ctx'> </div><div class='del'>-#define EFX_INSERT_FIELD32(...)					\</div><div class='del'>-	cpu_to_le32(EFX_INSERT_FIELD_NATIVE(__VA_ARGS__))</div><div class='add'>+#define EFX_INSERT64(min, max, low, high, value)			\</div><div class='add'>+	cpu_to_le64(EFX_INSERT_NATIVE(min, max, low, high, value))</div><div class='ctx'> </div><div class='del'>-#define EFX_INPLACE_MASK64(min, max, field)			\</div><div class='del'>-	EFX_INSERT_FIELD64(min, max, field, EFX_MASK64(field))</div><div class='add'>+#define EFX_INSERT32(min, max, low, high, value)			\</div><div class='add'>+	cpu_to_le32(EFX_INSERT_NATIVE(min, max, low, high, value))</div><div class='ctx'> </div><div class='del'>-#define EFX_INPLACE_MASK32(min, max, field)			\</div><div class='del'>-	EFX_INSERT_FIELD32(min, max, field, EFX_MASK32(field))</div><div class='add'>+#define EFX_INPLACE_MASK64(min, max, low, high)				\</div><div class='add'>+	EFX_INSERT64(min, max, low, high, EFX_MASK64(high + 1 - low))</div><div class='ctx'> </div><div class='del'>-#define EFX_SET_OWORD_FIELD64(oword, field, value) do {			\</div><div class='add'>+#define EFX_INPLACE_MASK32(min, max, low, high)				\</div><div class='add'>+	EFX_INSERT32(min, max, low, high, EFX_MASK32(high + 1 - low))</div><div class='add'>+</div><div class='add'>+#define EFX_SET_OWORD64(oword, low, high, value) do {			\</div><div class='ctx'> 	(oword).u64[0] = (((oword).u64[0] 				\</div><div class='del'>-			   &amp; ~EFX_INPLACE_MASK64(0,  63, field))	\</div><div class='del'>-			  | EFX_INSERT_FIELD64(0,  63, field, value));  \</div><div class='add'>+			   &amp; ~EFX_INPLACE_MASK64(0,  63, low, high))	\</div><div class='add'>+			  | EFX_INSERT64(0,  63, low, high, value));	\</div><div class='ctx'> 	(oword).u64[1] = (((oword).u64[1] 				\</div><div class='del'>-			   &amp; ~EFX_INPLACE_MASK64(64, 127, field))	\</div><div class='del'>-			  | EFX_INSERT_FIELD64(64, 127, field, value)); \</div><div class='add'>+			   &amp; ~EFX_INPLACE_MASK64(64, 127, low, high))	\</div><div class='add'>+			  | EFX_INSERT64(64, 127, low, high, value));	\</div><div class='ctx'> 	} while (0)</div><div class='ctx'> </div><div class='del'>-#define EFX_SET_QWORD_FIELD64(qword, field, value) do {			\</div><div class='add'>+#define EFX_SET_QWORD64(qword, low, high, value) do {			\</div><div class='ctx'> 	(qword).u64[0] = (((qword).u64[0] 				\</div><div class='del'>-			   &amp; ~EFX_INPLACE_MASK64(0, 63, field))		\</div><div class='del'>-			  | EFX_INSERT_FIELD64(0, 63, field, value));	\</div><div class='add'>+			   &amp; ~EFX_INPLACE_MASK64(0, 63, low, high))	\</div><div class='add'>+			  | EFX_INSERT64(0, 63, low, high, value));	\</div><div class='ctx'> 	} while (0)</div><div class='ctx'> </div><div class='del'>-#define EFX_SET_OWORD_FIELD32(oword, field, value) do {			\</div><div class='add'>+#define EFX_SET_OWORD32(oword, low, high, value) do {			\</div><div class='ctx'> 	(oword).u32[0] = (((oword).u32[0] 				\</div><div class='del'>-			   &amp; ~EFX_INPLACE_MASK32(0, 31, field))		\</div><div class='del'>-			  | EFX_INSERT_FIELD32(0, 31, field, value));	\</div><div class='add'>+			   &amp; ~EFX_INPLACE_MASK32(0, 31, low, high))	\</div><div class='add'>+			  | EFX_INSERT32(0, 31, low, high, value));	\</div><div class='ctx'> 	(oword).u32[1] = (((oword).u32[1] 				\</div><div class='del'>-			   &amp; ~EFX_INPLACE_MASK32(32, 63, field))	\</div><div class='del'>-			  | EFX_INSERT_FIELD32(32, 63, field, value));	\</div><div class='add'>+			   &amp; ~EFX_INPLACE_MASK32(32, 63, low, high))	\</div><div class='add'>+			  | EFX_INSERT32(32, 63, low, high, value));	\</div><div class='ctx'> 	(oword).u32[2] = (((oword).u32[2] 				\</div><div class='del'>-			   &amp; ~EFX_INPLACE_MASK32(64, 95, field))	\</div><div class='del'>-			  | EFX_INSERT_FIELD32(64, 95, field, value));	\</div><div class='add'>+			   &amp; ~EFX_INPLACE_MASK32(64, 95, low, high))	\</div><div class='add'>+			  | EFX_INSERT32(64, 95, low, high, value));	\</div><div class='ctx'> 	(oword).u32[3] = (((oword).u32[3] 				\</div><div class='del'>-			   &amp; ~EFX_INPLACE_MASK32(96, 127, field))	\</div><div class='del'>-			  | EFX_INSERT_FIELD32(96, 127, field, value));	\</div><div class='add'>+			   &amp; ~EFX_INPLACE_MASK32(96, 127, low, high))	\</div><div class='add'>+			  | EFX_INSERT32(96, 127, low, high, value));	\</div><div class='ctx'> 	} while (0)</div><div class='ctx'> </div><div class='del'>-#define EFX_SET_QWORD_FIELD32(qword, field, value) do {			\</div><div class='add'>+#define EFX_SET_QWORD32(qword, low, high, value) do {			\</div><div class='ctx'> 	(qword).u32[0] = (((qword).u32[0] 				\</div><div class='del'>-			   &amp; ~EFX_INPLACE_MASK32(0, 31, field))		\</div><div class='del'>-			  | EFX_INSERT_FIELD32(0, 31, field, value));	\</div><div class='add'>+			   &amp; ~EFX_INPLACE_MASK32(0, 31, low, high))	\</div><div class='add'>+			  | EFX_INSERT32(0, 31, low, high, value));	\</div><div class='ctx'> 	(qword).u32[1] = (((qword).u32[1] 				\</div><div class='del'>-			   &amp; ~EFX_INPLACE_MASK32(32, 63, field))	\</div><div class='del'>-			  | EFX_INSERT_FIELD32(32, 63, field, value));	\</div><div class='add'>+			   &amp; ~EFX_INPLACE_MASK32(32, 63, low, high))	\</div><div class='add'>+			  | EFX_INSERT32(32, 63, low, high, value));	\</div><div class='ctx'> 	} while (0)</div><div class='ctx'> </div><div class='del'>-#define EFX_SET_DWORD_FIELD(dword, field, value) do {			\</div><div class='del'>-	(dword).u32[0] = (((dword).u32[0] 				\</div><div class='del'>-			   &amp; ~EFX_INPLACE_MASK32(0, 31, field))		\</div><div class='del'>-			  | EFX_INSERT_FIELD32(0, 31, field, value));	\</div><div class='add'>+#define EFX_SET_DWORD32(dword, low, high, value) do {			\</div><div class='add'>+	(dword).u32[0] = (((dword).u32[0]				\</div><div class='add'>+			   &amp; ~EFX_INPLACE_MASK32(0, 31, low, high))	\</div><div class='add'>+			  | EFX_INSERT32(0, 31, low, high, value));	\</div><div class='ctx'> 	} while (0)</div><div class='ctx'> </div><div class='add'>+#define EFX_SET_OWORD_FIELD64(oword, field, value)			\</div><div class='add'>+	EFX_SET_OWORD64(oword, EFX_LOW_BIT(field),			\</div><div class='add'>+			 EFX_HIGH_BIT(field), value)</div><div class='add'>+</div><div class='add'>+#define EFX_SET_QWORD_FIELD64(qword, field, value)			\</div><div class='add'>+	EFX_SET_QWORD64(qword, EFX_LOW_BIT(field),			\</div><div class='add'>+			 EFX_HIGH_BIT(field), value)</div><div class='add'>+</div><div class='add'>+#define EFX_SET_OWORD_FIELD32(oword, field, value)			\</div><div class='add'>+	EFX_SET_OWORD32(oword, EFX_LOW_BIT(field),			\</div><div class='add'>+			 EFX_HIGH_BIT(field), value)</div><div class='add'>+</div><div class='add'>+#define EFX_SET_QWORD_FIELD32(qword, field, value)			\</div><div class='add'>+	EFX_SET_QWORD32(qword, EFX_LOW_BIT(field),			\</div><div class='add'>+			 EFX_HIGH_BIT(field), value)</div><div class='add'>+</div><div class='add'>+#define EFX_SET_DWORD_FIELD(dword, field, value)			\</div><div class='add'>+	EFX_SET_DWORD32(dword, EFX_LOW_BIT(field),			\</div><div class='add'>+			 EFX_HIGH_BIT(field), value)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> #if BITS_PER_LONG == 64</div><div class='ctx'> #define EFX_SET_OWORD_FIELD EFX_SET_OWORD_FIELD64</div><div class='ctx'> #define EFX_SET_QWORD_FIELD EFX_SET_QWORD_FIELD64</div><div class='hunk'>@@ -502,4 +540,10 @@ typedef union efx_oword {</div><div class='ctx'> #define EFX_DMA_TYPE_WIDTH(width) \</div><div class='ctx'> 	(((width) &lt; DMA_ADDR_T_WIDTH) ? (width) : DMA_ADDR_T_WIDTH)</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+/* Static initialiser */</div><div class='add'>+#define EFX_OWORD32(a, b, c, d)						\</div><div class='add'>+	{ .u32 = { __constant_cpu_to_le32(a), __constant_cpu_to_le32(b), \</div><div class='add'>+		   __constant_cpu_to_le32(c), __constant_cpu_to_le32(d) } }</div><div class='add'>+</div><div class='ctx'> #endif /* EFX_BITFIELD_H */</div><div class='head'>diff --git a/drivers/net/sfc/boards.c b/drivers/net/sfc/boards.c<br/>index d3d3dd0a1170..99e602373269 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sfc/boards.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/sfc/boards.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sfc/boards.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sfc/boards.c</a></div><div class='hunk'>@@ -31,23 +31,23 @@ static void blink_led_timer(unsigned long context)</div><div class='ctx'> 		mod_timer(&amp;bl-&gt;timer, jiffies + BLINK_INTERVAL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void board_blink(struct efx_nic *efx, int blink)</div><div class='add'>+static void board_blink(struct efx_nic *efx, bool blink)</div><div class='ctx'> {</div><div class='ctx'> 	struct efx_blinker *blinker = &amp;efx-&gt;board_info.blinker;</div><div class='ctx'> </div><div class='ctx'> 	/* The rtnl mutex serialises all ethtool ioctls, so</div><div class='ctx'> 	 * nothing special needs doing here. */</div><div class='ctx'> 	if (blink) {</div><div class='del'>-		blinker-&gt;resubmit = 1;</div><div class='del'>-		blinker-&gt;state = 0;</div><div class='add'>+		blinker-&gt;resubmit = true;</div><div class='add'>+		blinker-&gt;state = false;</div><div class='ctx'> 		setup_timer(&amp;blinker-&gt;timer, blink_led_timer,</div><div class='ctx'> 			    (unsigned long)efx);</div><div class='ctx'> 		mod_timer(&amp;blinker-&gt;timer, jiffies + BLINK_INTERVAL);</div><div class='ctx'> 	} else {</div><div class='del'>-		blinker-&gt;resubmit = 0;</div><div class='add'>+		blinker-&gt;resubmit = false;</div><div class='ctx'> 		if (blinker-&gt;timer.function)</div><div class='ctx'> 			del_timer_sync(&amp;blinker-&gt;timer);</div><div class='del'>-		efx-&gt;board_info.set_fault_led(efx, 0);</div><div class='add'>+		efx-&gt;board_info.set_fault_led(efx, false);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -78,7 +78,7 @@ static int sfe4002_init_leds(struct efx_nic *efx)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void sfe4002_fault_led(struct efx_nic *efx, int state)</div><div class='add'>+static void sfe4002_fault_led(struct efx_nic *efx, bool state)</div><div class='ctx'> {</div><div class='ctx'> 	xfp_set_led(efx, SFE4002_FAULT_LED, state ? QUAKE_LED_ON :</div><div class='ctx'> 			QUAKE_LED_OFF);</div><div class='head'>diff --git a/drivers/net/sfc/boards.h b/drivers/net/sfc/boards.h<br/>index e5e844359ce7..c6e01b64bfb4 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sfc/boards.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/sfc/boards.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sfc/boards.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sfc/boards.h</a></div><div class='hunk'>@@ -21,7 +21,5 @@ enum efx_board_type {</div><div class='ctx'> </div><div class='ctx'> extern int efx_set_board_info(struct efx_nic *efx, u16 revision_info);</div><div class='ctx'> extern int sfe4001_init(struct efx_nic *efx);</div><div class='del'>-/* Are we putting the PHY into flash config mode */</div><div class='del'>-extern unsigned int sfe4001_phy_flash_cfg;</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/sfc/efx.c b/drivers/net/sfc/efx.c<br/>index 45c72eebb3a7..06ea71c7e34e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sfc/efx.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/sfc/efx.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sfc/efx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sfc/efx.c</a></div><div class='hunk'>@@ -28,7 +28,6 @@</div><div class='ctx'> #include "efx.h"</div><div class='ctx'> #include "mdio_10g.h"</div><div class='ctx'> #include "falcon.h"</div><div class='del'>-#include "workarounds.h"</div><div class='ctx'> #include "mac.h"</div><div class='ctx'> </div><div class='ctx'> #define EFX_MAX_MTU (9 * 1024)</div><div class='hunk'>@@ -52,7 +51,7 @@ static struct workqueue_struct *refill_workqueue;</div><div class='ctx'>  * This sets the default for new devices.  It can be controlled later</div><div class='ctx'>  * using ethtool.</div><div class='ctx'>  */</div><div class='del'>-static int lro = 1;</div><div class='add'>+static int lro = true;</div><div class='ctx'> module_param(lro, int, 0644);</div><div class='ctx'> MODULE_PARM_DESC(lro, "Large receive offload acceleration");</div><div class='ctx'> </div><div class='hunk'>@@ -65,7 +64,7 @@ MODULE_PARM_DESC(lro, "Large receive offload acceleration");</div><div class='ctx'>  * This is forced to 0 for MSI interrupt mode as the interrupt vector</div><div class='ctx'>  * is not written</div><div class='ctx'>  */</div><div class='del'>-static unsigned int separate_tx_and_rx_channels = 1;</div><div class='add'>+static unsigned int separate_tx_and_rx_channels = true;</div><div class='ctx'> </div><div class='ctx'> /* This is the weight assigned to each of the (per-channel) virtual</div><div class='ctx'>  * NAPI devices.</div><div class='hunk'>@@ -81,7 +80,7 @@ unsigned int efx_monitor_interval = 1 * HZ;</div><div class='ctx'> /* This controls whether or not the hardware monitor will trigger a</div><div class='ctx'>  * reset when it detects an error condition.</div><div class='ctx'>  */</div><div class='del'>-static unsigned int monitor_reset = 1;</div><div class='add'>+static unsigned int monitor_reset = true;</div><div class='ctx'> </div><div class='ctx'> /* This controls whether or not the driver will initialise devices</div><div class='ctx'>  * with invalid MAC addresses stored in the EEPROM or flash.  If true,</div><div class='hunk'>@@ -141,8 +140,7 @@ static void efx_fini_channels(struct efx_nic *efx);</div><div class='ctx'> </div><div class='ctx'> #define EFX_ASSERT_RESET_SERIALISED(efx)		\</div><div class='ctx'> 	do {						\</div><div class='del'>-		if ((efx-&gt;state == STATE_RUNNING) ||	\</div><div class='del'>-		    (efx-&gt;state == STATE_RESETTING))	\</div><div class='add'>+		if (efx-&gt;state == STATE_RUNNING)	\</div><div class='ctx'> 			ASSERT_RTNL();			\</div><div class='ctx'> 	} while (0)</div><div class='ctx'> </div><div class='hunk'>@@ -159,16 +157,18 @@ static void efx_fini_channels(struct efx_nic *efx);</div><div class='ctx'>  * never be concurrently called more than once on the same channel,</div><div class='ctx'>  * though different channels may be being processed concurrently.</div><div class='ctx'>  */</div><div class='del'>-static inline int efx_process_channel(struct efx_channel *channel, int rx_quota)</div><div class='add'>+static int efx_process_channel(struct efx_channel *channel, int rx_quota)</div><div class='ctx'> {</div><div class='del'>-	int rxdmaqs;</div><div class='del'>-	struct efx_rx_queue *rx_queue;</div><div class='add'>+	struct efx_nic *efx = channel-&gt;efx;</div><div class='add'>+	int rx_packets;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(channel-&gt;efx-&gt;reset_pending != RESET_TYPE_NONE ||</div><div class='add'>+	if (unlikely(efx-&gt;reset_pending != RESET_TYPE_NONE ||</div><div class='ctx'> 		     !channel-&gt;enabled))</div><div class='del'>-		return rx_quota;</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-	rxdmaqs = falcon_process_eventq(channel, &amp;rx_quota);</div><div class='add'>+	rx_packets = falcon_process_eventq(channel, rx_quota);</div><div class='add'>+	if (rx_packets == 0)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Deliver last RX packet. */</div><div class='ctx'> 	if (channel-&gt;rx_pkt) {</div><div class='hunk'>@@ -180,16 +180,9 @@ static inline int efx_process_channel(struct efx_channel *channel, int rx_quota)</div><div class='ctx'> 	efx_flush_lro(channel);</div><div class='ctx'> 	efx_rx_strategy(channel);</div><div class='ctx'> </div><div class='del'>-	/* Refill descriptor rings as necessary */</div><div class='del'>-	rx_queue = &amp;channel-&gt;efx-&gt;rx_queue[0];</div><div class='del'>-	while (rxdmaqs) {</div><div class='del'>-		if (rxdmaqs &amp; 0x01)</div><div class='del'>-			efx_fast_push_rx_descriptors(rx_queue);</div><div class='del'>-		rx_queue++;</div><div class='del'>-		rxdmaqs &gt;&gt;= 1;</div><div class='del'>-	}</div><div class='add'>+	efx_fast_push_rx_descriptors(&amp;efx-&gt;rx_queue[channel-&gt;channel]);</div><div class='ctx'> </div><div class='del'>-	return rx_quota;</div><div class='add'>+	return rx_packets;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Mark channel as finished processing</div><div class='hunk'>@@ -203,7 +196,7 @@ static inline void efx_channel_processed(struct efx_channel *channel)</div><div class='ctx'> 	/* The interrupt handler for this channel may set work_pending</div><div class='ctx'> 	 * as soon as we acknowledge the events we've seen.  Make sure</div><div class='ctx'> 	 * it's cleared before then. */</div><div class='del'>-	channel-&gt;work_pending = 0;</div><div class='add'>+	channel-&gt;work_pending = false;</div><div class='ctx'> 	smp_wmb();</div><div class='ctx'> </div><div class='ctx'> 	falcon_eventq_read_ack(channel);</div><div class='hunk'>@@ -219,14 +212,12 @@ static int efx_poll(struct napi_struct *napi, int budget)</div><div class='ctx'> 	struct efx_channel *channel =</div><div class='ctx'> 		container_of(napi, struct efx_channel, napi_str);</div><div class='ctx'> 	struct net_device *napi_dev = channel-&gt;napi_dev;</div><div class='del'>-	int unused;</div><div class='ctx'> 	int rx_packets;</div><div class='ctx'> </div><div class='ctx'> 	EFX_TRACE(channel-&gt;efx, "channel %d NAPI poll executing on CPU %d\n",</div><div class='ctx'> 		  channel-&gt;channel, raw_smp_processor_id());</div><div class='ctx'> </div><div class='del'>-	unused = efx_process_channel(channel, budget);</div><div class='del'>-	rx_packets = (budget - unused);</div><div class='add'>+	rx_packets = efx_process_channel(channel, budget);</div><div class='ctx'> </div><div class='ctx'> 	if (rx_packets &lt; budget) {</div><div class='ctx'> 		/* There is no race here; although napi_disable() will</div><div class='hunk'>@@ -260,7 +251,7 @@ void efx_process_channel_now(struct efx_channel *channel)</div><div class='ctx'> 	falcon_disable_interrupts(efx);</div><div class='ctx'> 	if (efx-&gt;legacy_irq)</div><div class='ctx'> 		synchronize_irq(efx-&gt;legacy_irq);</div><div class='del'>-	if (channel-&gt;has_interrupt &amp;&amp; channel-&gt;irq)</div><div class='add'>+	if (channel-&gt;irq)</div><div class='ctx'> 		synchronize_irq(channel-&gt;irq);</div><div class='ctx'> </div><div class='ctx'> 	/* Wait for any NAPI processing to complete */</div><div class='hunk'>@@ -290,13 +281,13 @@ static int efx_probe_eventq(struct efx_channel *channel)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Prepare channel's event queue */</div><div class='del'>-static int efx_init_eventq(struct efx_channel *channel)</div><div class='add'>+static void efx_init_eventq(struct efx_channel *channel)</div><div class='ctx'> {</div><div class='ctx'> 	EFX_LOG(channel-&gt;efx, "chan %d init event queue\n", channel-&gt;channel);</div><div class='ctx'> </div><div class='ctx'> 	channel-&gt;eventq_read_ptr = 0;</div><div class='ctx'> </div><div class='del'>-	return falcon_init_eventq(channel);</div><div class='add'>+	falcon_init_eventq(channel);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void efx_fini_eventq(struct efx_channel *channel)</div><div class='hunk'>@@ -362,12 +353,11 @@ static int efx_probe_channel(struct efx_channel *channel)</div><div class='ctx'>  * to propagate configuration changes (mtu, checksum offload), or</div><div class='ctx'>  * to clear hardware error conditions</div><div class='ctx'>  */</div><div class='del'>-static int efx_init_channels(struct efx_nic *efx)</div><div class='add'>+static void efx_init_channels(struct efx_nic *efx)</div><div class='ctx'> {</div><div class='ctx'> 	struct efx_tx_queue *tx_queue;</div><div class='ctx'> 	struct efx_rx_queue *rx_queue;</div><div class='ctx'> 	struct efx_channel *channel;</div><div class='del'>-	int rc = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Calculate the rx buffer allocation parameters required to</div><div class='ctx'> 	 * support the current MTU, including padding for header</div><div class='hunk'>@@ -382,36 +372,20 @@ static int efx_init_channels(struct efx_nic *efx)</div><div class='ctx'> 	efx_for_each_channel(channel, efx) {</div><div class='ctx'> 		EFX_LOG(channel-&gt;efx, "init chan %d\n", channel-&gt;channel);</div><div class='ctx'> </div><div class='del'>-		rc = efx_init_eventq(channel);</div><div class='del'>-		if (rc)</div><div class='del'>-			goto err;</div><div class='add'>+		efx_init_eventq(channel);</div><div class='ctx'> </div><div class='del'>-		efx_for_each_channel_tx_queue(tx_queue, channel) {</div><div class='del'>-			rc = efx_init_tx_queue(tx_queue);</div><div class='del'>-			if (rc)</div><div class='del'>-				goto err;</div><div class='del'>-		}</div><div class='add'>+		efx_for_each_channel_tx_queue(tx_queue, channel)</div><div class='add'>+			efx_init_tx_queue(tx_queue);</div><div class='ctx'> </div><div class='ctx'> 		/* The rx buffer allocation strategy is MTU dependent */</div><div class='ctx'> 		efx_rx_strategy(channel);</div><div class='ctx'> </div><div class='del'>-		efx_for_each_channel_rx_queue(rx_queue, channel) {</div><div class='del'>-			rc = efx_init_rx_queue(rx_queue);</div><div class='del'>-			if (rc)</div><div class='del'>-				goto err;</div><div class='del'>-		}</div><div class='add'>+		efx_for_each_channel_rx_queue(rx_queue, channel)</div><div class='add'>+			efx_init_rx_queue(rx_queue);</div><div class='ctx'> </div><div class='ctx'> 		WARN_ON(channel-&gt;rx_pkt != NULL);</div><div class='ctx'> 		efx_rx_strategy(channel);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>- err:</div><div class='del'>-	EFX_ERR(efx, "failed to initialise channel %d\n",</div><div class='del'>-		channel ? channel-&gt;channel : -1);</div><div class='del'>-	efx_fini_channels(efx);</div><div class='del'>-	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* This enables event queue processing and packet transmission.</div><div class='hunk'>@@ -432,8 +406,8 @@ static void efx_start_channel(struct efx_channel *channel)</div><div class='ctx'> 	/* The interrupt handler for this channel may set work_pending</div><div class='ctx'> 	 * as soon as we enable it.  Make sure it's cleared before</div><div class='ctx'> 	 * then.  Similarly, make sure it sees the enabled flag set. */</div><div class='del'>-	channel-&gt;work_pending = 0;</div><div class='del'>-	channel-&gt;enabled = 1;</div><div class='add'>+	channel-&gt;work_pending = false;</div><div class='add'>+	channel-&gt;enabled = true;</div><div class='ctx'> 	smp_wmb();</div><div class='ctx'> </div><div class='ctx'> 	napi_enable(&amp;channel-&gt;napi_str);</div><div class='hunk'>@@ -456,7 +430,7 @@ static void efx_stop_channel(struct efx_channel *channel)</div><div class='ctx'> </div><div class='ctx'> 	EFX_LOG(channel-&gt;efx, "stop chan %d\n", channel-&gt;channel);</div><div class='ctx'> </div><div class='del'>-	channel-&gt;enabled = 0;</div><div class='add'>+	channel-&gt;enabled = false;</div><div class='ctx'> 	napi_disable(&amp;channel-&gt;napi_str);</div><div class='ctx'> </div><div class='ctx'> 	/* Ensure that any worker threads have exited or will be no-ops */</div><div class='hunk'>@@ -471,10 +445,17 @@ static void efx_fini_channels(struct efx_nic *efx)</div><div class='ctx'> 	struct efx_channel *channel;</div><div class='ctx'> 	struct efx_tx_queue *tx_queue;</div><div class='ctx'> 	struct efx_rx_queue *rx_queue;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='ctx'> 	EFX_ASSERT_RESET_SERIALISED(efx);</div><div class='ctx'> 	BUG_ON(efx-&gt;port_enabled);</div><div class='ctx'> </div><div class='add'>+	rc = falcon_flush_queues(efx);</div><div class='add'>+	if (rc)</div><div class='add'>+		EFX_ERR(efx, "failed to flush queues\n");</div><div class='add'>+	else</div><div class='add'>+		EFX_LOG(efx, "successfully flushed all queues\n");</div><div class='add'>+</div><div class='ctx'> 	efx_for_each_channel(channel, efx) {</div><div class='ctx'> 		EFX_LOG(channel-&gt;efx, "shut down chan %d\n", channel-&gt;channel);</div><div class='ctx'> </div><div class='hunk'>@@ -482,13 +463,6 @@ static void efx_fini_channels(struct efx_nic *efx)</div><div class='ctx'> 			efx_fini_rx_queue(rx_queue);</div><div class='ctx'> 		efx_for_each_channel_tx_queue(tx_queue, channel)</div><div class='ctx'> 			efx_fini_tx_queue(tx_queue);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Do the event queues last so that we can handle flush events</div><div class='del'>-	 * for all DMA queues. */</div><div class='del'>-	efx_for_each_channel(channel, efx) {</div><div class='del'>-		EFX_LOG(channel-&gt;efx, "shut down evq %d\n", channel-&gt;channel);</div><div class='del'>-</div><div class='ctx'> 		efx_fini_eventq(channel);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -526,8 +500,6 @@ void efx_schedule_slow_fill(struct efx_rx_queue *rx_queue, int delay)</div><div class='ctx'>  */</div><div class='ctx'> static void efx_link_status_changed(struct efx_nic *efx)</div><div class='ctx'> {</div><div class='del'>-	int carrier_ok;</div><div class='del'>-</div><div class='ctx'> 	/* SFC Bug 5356: A net_dev notifier is registered, so we must ensure</div><div class='ctx'> 	 * that no events are triggered between unregister_netdev() and the</div><div class='ctx'> 	 * driver unloading. A more general condition is that NETDEV_CHANGE</div><div class='hunk'>@@ -535,8 +507,12 @@ static void efx_link_status_changed(struct efx_nic *efx)</div><div class='ctx'> 	if (!netif_running(efx-&gt;net_dev))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	carrier_ok = netif_carrier_ok(efx-&gt;net_dev) ? 1 : 0;</div><div class='del'>-	if (efx-&gt;link_up != carrier_ok) {</div><div class='add'>+	if (efx-&gt;port_inhibited) {</div><div class='add'>+		netif_carrier_off(efx-&gt;net_dev);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (efx-&gt;link_up != netif_carrier_ok(efx-&gt;net_dev)) {</div><div class='ctx'> 		efx-&gt;n_link_state_changes++;</div><div class='ctx'> </div><div class='ctx'> 		if (efx-&gt;link_up)</div><div class='hunk'>@@ -577,13 +553,19 @@ static void efx_link_status_changed(struct efx_nic *efx)</div><div class='ctx'> </div><div class='ctx'> /* This call reinitialises the MAC to pick up new PHY settings. The</div><div class='ctx'>  * caller must hold the mac_lock */</div><div class='del'>-static void __efx_reconfigure_port(struct efx_nic *efx)</div><div class='add'>+void __efx_reconfigure_port(struct efx_nic *efx)</div><div class='ctx'> {</div><div class='ctx'> 	WARN_ON(!mutex_is_locked(&amp;efx-&gt;mac_lock));</div><div class='ctx'> </div><div class='ctx'> 	EFX_LOG(efx, "reconfiguring MAC from PHY settings on CPU %d\n",</div><div class='ctx'> 		raw_smp_processor_id());</div><div class='ctx'> </div><div class='add'>+	/* Serialise the promiscuous flag with efx_set_multicast_list. */</div><div class='add'>+	if (efx_dev_registered(efx)) {</div><div class='add'>+		netif_addr_lock_bh(efx-&gt;net_dev);</div><div class='add'>+		netif_addr_unlock_bh(efx-&gt;net_dev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	falcon_reconfigure_xmac(efx);</div><div class='ctx'> </div><div class='ctx'> 	/* Inform kernel of loss/gain of carrier */</div><div class='hunk'>@@ -661,7 +643,8 @@ static int efx_init_port(struct efx_nic *efx)</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='del'>-	efx-&gt;port_initialized = 1;</div><div class='add'>+	efx-&gt;port_initialized = true;</div><div class='add'>+	efx-&gt;stats_enabled = true;</div><div class='ctx'> </div><div class='ctx'> 	/* Reconfigure port to program MAC registers */</div><div class='ctx'> 	falcon_reconfigure_xmac(efx);</div><div class='hunk'>@@ -678,7 +661,7 @@ static void efx_start_port(struct efx_nic *efx)</div><div class='ctx'> 	BUG_ON(efx-&gt;port_enabled);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;efx-&gt;mac_lock);</div><div class='del'>-	efx-&gt;port_enabled = 1;</div><div class='add'>+	efx-&gt;port_enabled = true;</div><div class='ctx'> 	__efx_reconfigure_port(efx);</div><div class='ctx'> 	mutex_unlock(&amp;efx-&gt;mac_lock);</div><div class='ctx'> }</div><div class='hunk'>@@ -692,7 +675,7 @@ static void efx_stop_port(struct efx_nic *efx)</div><div class='ctx'> 	EFX_LOG(efx, "stop port\n");</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;efx-&gt;mac_lock);</div><div class='del'>-	efx-&gt;port_enabled = 0;</div><div class='add'>+	efx-&gt;port_enabled = false;</div><div class='ctx'> 	mutex_unlock(&amp;efx-&gt;mac_lock);</div><div class='ctx'> </div><div class='ctx'> 	/* Serialise against efx_set_multicast_list() */</div><div class='hunk'>@@ -710,9 +693,9 @@ static void efx_fini_port(struct efx_nic *efx)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	falcon_fini_xmac(efx);</div><div class='del'>-	efx-&gt;port_initialized = 0;</div><div class='add'>+	efx-&gt;port_initialized = false;</div><div class='ctx'> </div><div class='del'>-	efx-&gt;link_up = 0;</div><div class='add'>+	efx-&gt;link_up = false;</div><div class='ctx'> 	efx_link_status_changed(efx);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -797,7 +780,7 @@ static int efx_init_io(struct efx_nic *efx)</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'>  fail4:</div><div class='del'>-	release_mem_region(efx-&gt;membase_phys, efx-&gt;type-&gt;mem_map_size);</div><div class='add'>+	pci_release_region(efx-&gt;pci_dev, efx-&gt;type-&gt;mem_bar);</div><div class='ctx'>  fail3:</div><div class='ctx'> 	efx-&gt;membase_phys = 0;</div><div class='ctx'>  fail2:</div><div class='hunk'>@@ -823,53 +806,61 @@ static void efx_fini_io(struct efx_nic *efx)</div><div class='ctx'> 	pci_disable_device(efx-&gt;pci_dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Probe the number and type of interrupts we are able to obtain. */</div><div class='add'>+/* Get number of RX queues wanted.  Return number of online CPU</div><div class='add'>+ * packages in the expectation that an IRQ balancer will spread</div><div class='add'>+ * interrupts across them. */</div><div class='add'>+static int efx_wanted_rx_queues(void)</div><div class='add'>+{</div><div class='add'>+	cpumask_t core_mask;</div><div class='add'>+	int count;</div><div class='add'>+	int cpu;</div><div class='add'>+</div><div class='add'>+	cpus_clear(core_mask);</div><div class='add'>+	count = 0;</div><div class='add'>+	for_each_online_cpu(cpu) {</div><div class='add'>+		if (!cpu_isset(cpu, core_mask)) {</div><div class='add'>+			++count;</div><div class='add'>+			cpus_or(core_mask, core_mask,</div><div class='add'>+				topology_core_siblings(cpu));</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Probe the number and type of interrupts we are able to obtain, and</div><div class='add'>+ * the resulting numbers of channels and RX queues.</div><div class='add'>+ */</div><div class='ctx'> static void efx_probe_interrupts(struct efx_nic *efx)</div><div class='ctx'> {</div><div class='del'>-	int max_channel = efx-&gt;type-&gt;phys_addr_channels - 1;</div><div class='del'>-	struct msix_entry xentries[EFX_MAX_CHANNELS];</div><div class='add'>+	int max_channels =</div><div class='add'>+		min_t(int, efx-&gt;type-&gt;phys_addr_channels, EFX_MAX_CHANNELS);</div><div class='ctx'> 	int rc, i;</div><div class='ctx'> </div><div class='ctx'> 	if (efx-&gt;interrupt_mode == EFX_INT_MODE_MSIX) {</div><div class='del'>-		BUG_ON(!pci_find_capability(efx-&gt;pci_dev, PCI_CAP_ID_MSIX));</div><div class='del'>-</div><div class='del'>-		if (rss_cpus == 0) {</div><div class='del'>-			cpumask_t core_mask;</div><div class='del'>-			int cpu;</div><div class='del'>-</div><div class='del'>-			cpus_clear(core_mask);</div><div class='del'>-			efx-&gt;rss_queues = 0;</div><div class='del'>-			for_each_online_cpu(cpu) {</div><div class='del'>-				if (!cpu_isset(cpu, core_mask)) {</div><div class='del'>-					++efx-&gt;rss_queues;</div><div class='del'>-					cpus_or(core_mask, core_mask,</div><div class='del'>-						topology_core_siblings(cpu));</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			efx-&gt;rss_queues = rss_cpus;</div><div class='del'>-		}</div><div class='add'>+		struct msix_entry xentries[EFX_MAX_CHANNELS];</div><div class='add'>+		int wanted_ints;</div><div class='ctx'> </div><div class='del'>-		efx-&gt;rss_queues = min(efx-&gt;rss_queues, max_channel + 1);</div><div class='del'>-		efx-&gt;rss_queues = min(efx-&gt;rss_queues, EFX_MAX_CHANNELS);</div><div class='add'>+		/* We want one RX queue and interrupt per CPU package</div><div class='add'>+		 * (or as specified by the rss_cpus module parameter).</div><div class='add'>+		 * We will need one channel per interrupt.</div><div class='add'>+		 */</div><div class='add'>+		wanted_ints = rss_cpus ? rss_cpus : efx_wanted_rx_queues();</div><div class='add'>+		efx-&gt;n_rx_queues = min(wanted_ints, max_channels);</div><div class='ctx'> </div><div class='del'>-		/* Request maximum number of MSI interrupts, and fill out</div><div class='del'>-		 * the channel interrupt information the allowed allocation */</div><div class='del'>-		for (i = 0; i &lt; efx-&gt;rss_queues; i++)</div><div class='add'>+		for (i = 0; i &lt; efx-&gt;n_rx_queues; i++)</div><div class='ctx'> 			xentries[i].entry = i;</div><div class='del'>-		rc = pci_enable_msix(efx-&gt;pci_dev, xentries, efx-&gt;rss_queues);</div><div class='add'>+		rc = pci_enable_msix(efx-&gt;pci_dev, xentries, efx-&gt;n_rx_queues);</div><div class='ctx'> 		if (rc &gt; 0) {</div><div class='del'>-			EFX_BUG_ON_PARANOID(rc &gt;= efx-&gt;rss_queues);</div><div class='del'>-			efx-&gt;rss_queues = rc;</div><div class='add'>+			EFX_BUG_ON_PARANOID(rc &gt;= efx-&gt;n_rx_queues);</div><div class='add'>+			efx-&gt;n_rx_queues = rc;</div><div class='ctx'> 			rc = pci_enable_msix(efx-&gt;pci_dev, xentries,</div><div class='del'>-					     efx-&gt;rss_queues);</div><div class='add'>+					     efx-&gt;n_rx_queues);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (rc == 0) {</div><div class='del'>-			for (i = 0; i &lt; efx-&gt;rss_queues; i++) {</div><div class='del'>-				efx-&gt;channel[i].has_interrupt = 1;</div><div class='add'>+			for (i = 0; i &lt; efx-&gt;n_rx_queues; i++)</div><div class='ctx'> 				efx-&gt;channel[i].irq = xentries[i].vector;</div><div class='del'>-			}</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* Fall back to single channel MSI */</div><div class='ctx'> 			efx-&gt;interrupt_mode = EFX_INT_MODE_MSI;</div><div class='hunk'>@@ -879,11 +870,10 @@ static void efx_probe_interrupts(struct efx_nic *efx)</div><div class='ctx'> </div><div class='ctx'> 	/* Try single interrupt MSI */</div><div class='ctx'> 	if (efx-&gt;interrupt_mode == EFX_INT_MODE_MSI) {</div><div class='del'>-		efx-&gt;rss_queues = 1;</div><div class='add'>+		efx-&gt;n_rx_queues = 1;</div><div class='ctx'> 		rc = pci_enable_msi(efx-&gt;pci_dev);</div><div class='ctx'> 		if (rc == 0) {</div><div class='ctx'> 			efx-&gt;channel[0].irq = efx-&gt;pci_dev-&gt;irq;</div><div class='del'>-			efx-&gt;channel[0].has_interrupt = 1;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			EFX_ERR(efx, "could not enable MSI\n");</div><div class='ctx'> 			efx-&gt;interrupt_mode = EFX_INT_MODE_LEGACY;</div><div class='hunk'>@@ -892,10 +882,7 @@ static void efx_probe_interrupts(struct efx_nic *efx)</div><div class='ctx'> </div><div class='ctx'> 	/* Assume legacy interrupts */</div><div class='ctx'> 	if (efx-&gt;interrupt_mode == EFX_INT_MODE_LEGACY) {</div><div class='del'>-		efx-&gt;rss_queues = 1;</div><div class='del'>-		/* Every channel is interruptible */</div><div class='del'>-		for (i = 0; i &lt; EFX_MAX_CHANNELS; i++)</div><div class='del'>-			efx-&gt;channel[i].has_interrupt = 1;</div><div class='add'>+		efx-&gt;n_rx_queues = 1;</div><div class='ctx'> 		efx-&gt;legacy_irq = efx-&gt;pci_dev-&gt;irq;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -905,7 +892,7 @@ static void efx_remove_interrupts(struct efx_nic *efx)</div><div class='ctx'> 	struct efx_channel *channel;</div><div class='ctx'> </div><div class='ctx'> 	/* Remove MSI/MSI-X interrupts */</div><div class='del'>-	efx_for_each_channel_with_interrupt(channel, efx)</div><div class='add'>+	efx_for_each_channel(channel, efx)</div><div class='ctx'> 		channel-&gt;irq = 0;</div><div class='ctx'> 	pci_disable_msi(efx-&gt;pci_dev);</div><div class='ctx'> 	pci_disable_msix(efx-&gt;pci_dev);</div><div class='hunk'>@@ -914,45 +901,22 @@ static void efx_remove_interrupts(struct efx_nic *efx)</div><div class='ctx'> 	efx-&gt;legacy_irq = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Select number of used resources</div><div class='del'>- * Should be called after probe_interrupts()</div><div class='del'>- */</div><div class='del'>-static void efx_select_used(struct efx_nic *efx)</div><div class='add'>+static void efx_set_channels(struct efx_nic *efx)</div><div class='ctx'> {</div><div class='ctx'> 	struct efx_tx_queue *tx_queue;</div><div class='ctx'> 	struct efx_rx_queue *rx_queue;</div><div class='del'>-	int i;</div><div class='ctx'> </div><div class='del'>-	/* TX queues.  One per port per channel with TX capability</div><div class='del'>-	 * (more than one per port won't work on Linux, due to out</div><div class='del'>-	 *  of order issues... but will be fine on Solaris)</div><div class='del'>-	 */</div><div class='del'>-	tx_queue = &amp;efx-&gt;tx_queue[0];</div><div class='del'>-</div><div class='del'>-	/* Perform this for each channel with TX capabilities.</div><div class='del'>-	 * At the moment, we only support a single TX queue</div><div class='del'>-	 */</div><div class='del'>-	tx_queue-&gt;used = 1;</div><div class='del'>-	if ((!EFX_INT_MODE_USE_MSI(efx)) &amp;&amp; separate_tx_and_rx_channels)</div><div class='del'>-		tx_queue-&gt;channel = &amp;efx-&gt;channel[1];</div><div class='del'>-	else</div><div class='del'>-		tx_queue-&gt;channel = &amp;efx-&gt;channel[0];</div><div class='del'>-	tx_queue-&gt;channel-&gt;used_flags |= EFX_USED_BY_TX;</div><div class='del'>-	tx_queue++;</div><div class='del'>-</div><div class='del'>-	/* RX queues.  Each has a dedicated channel. */</div><div class='del'>-	for (i = 0; i &lt; EFX_MAX_RX_QUEUES; i++) {</div><div class='del'>-		rx_queue = &amp;efx-&gt;rx_queue[i];</div><div class='add'>+	efx_for_each_tx_queue(tx_queue, efx) {</div><div class='add'>+		if (!EFX_INT_MODE_USE_MSI(efx) &amp;&amp; separate_tx_and_rx_channels)</div><div class='add'>+			tx_queue-&gt;channel = &amp;efx-&gt;channel[1];</div><div class='add'>+		else</div><div class='add'>+			tx_queue-&gt;channel = &amp;efx-&gt;channel[0];</div><div class='add'>+		tx_queue-&gt;channel-&gt;used_flags |= EFX_USED_BY_TX;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		if (i &lt; efx-&gt;rss_queues) {</div><div class='del'>-			rx_queue-&gt;used = 1;</div><div class='del'>-			/* If we allow multiple RX queues per channel</div><div class='del'>-			 * we need to decide that here</div><div class='del'>-			 */</div><div class='del'>-			rx_queue-&gt;channel = &amp;efx-&gt;channel[rx_queue-&gt;queue];</div><div class='del'>-			rx_queue-&gt;channel-&gt;used_flags |= EFX_USED_BY_RX;</div><div class='del'>-			rx_queue++;</div><div class='del'>-		}</div><div class='add'>+	efx_for_each_rx_queue(rx_queue, efx) {</div><div class='add'>+		rx_queue-&gt;channel = &amp;efx-&gt;channel[rx_queue-&gt;queue];</div><div class='add'>+		rx_queue-&gt;channel-&gt;used_flags |= EFX_USED_BY_RX;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -971,8 +935,7 @@ static int efx_probe_nic(struct efx_nic *efx)</div><div class='ctx'> 	 * in MSI-X interrupts. */</div><div class='ctx'> 	efx_probe_interrupts(efx);</div><div class='ctx'> </div><div class='del'>-	/* Determine number of RX queues and TX queues */</div><div class='del'>-	efx_select_used(efx);</div><div class='add'>+	efx_set_channels(efx);</div><div class='ctx'> </div><div class='ctx'> 	/* Initialise the interrupt moderation settings */</div><div class='ctx'> 	efx_init_irq_moderation(efx, tx_irq_mod_usec, rx_irq_mod_usec);</div><div class='hunk'>@@ -1058,7 +1021,8 @@ static void efx_start_all(struct efx_nic *efx)</div><div class='ctx'> 	/* Mark the port as enabled so port reconfigurations can start, then</div><div class='ctx'> 	 * restart the transmit interface early so the watchdog timer stops */</div><div class='ctx'> 	efx_start_port(efx);</div><div class='del'>-	efx_wake_queue(efx);</div><div class='add'>+	if (efx_dev_registered(efx))</div><div class='add'>+		efx_wake_queue(efx);</div><div class='ctx'> </div><div class='ctx'> 	efx_for_each_channel(channel, efx)</div><div class='ctx'> 		efx_start_channel(channel);</div><div class='hunk'>@@ -1109,7 +1073,7 @@ static void efx_stop_all(struct efx_nic *efx)</div><div class='ctx'> 	falcon_disable_interrupts(efx);</div><div class='ctx'> 	if (efx-&gt;legacy_irq)</div><div class='ctx'> 		synchronize_irq(efx-&gt;legacy_irq);</div><div class='del'>-	efx_for_each_channel_with_interrupt(channel, efx) {</div><div class='add'>+	efx_for_each_channel(channel, efx) {</div><div class='ctx'> 		if (channel-&gt;irq)</div><div class='ctx'> 			synchronize_irq(channel-&gt;irq);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1128,13 +1092,12 @@ static void efx_stop_all(struct efx_nic *efx)</div><div class='ctx'> </div><div class='ctx'> 	/* Isolate the MAC from the TX and RX engines, so that queue</div><div class='ctx'> 	 * flushes will complete in a timely fashion. */</div><div class='del'>-	falcon_deconfigure_mac_wrapper(efx);</div><div class='ctx'> 	falcon_drain_tx_fifo(efx);</div><div class='ctx'> </div><div class='ctx'> 	/* Stop the kernel transmit interface late, so the watchdog</div><div class='ctx'> 	 * timer isn't ticking over the flush */</div><div class='del'>-	efx_stop_queue(efx);</div><div class='ctx'> 	if (efx_dev_registered(efx)) {</div><div class='add'>+		efx_stop_queue(efx);</div><div class='ctx'> 		netif_tx_lock_bh(efx-&gt;net_dev);</div><div class='ctx'> 		netif_tx_unlock_bh(efx-&gt;net_dev);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1151,24 +1114,16 @@ static void efx_remove_all(struct efx_nic *efx)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* A convinience function to safely flush all the queues */</div><div class='del'>-int efx_flush_queues(struct efx_nic *efx)</div><div class='add'>+void efx_flush_queues(struct efx_nic *efx)</div><div class='ctx'> {</div><div class='del'>-	int rc;</div><div class='del'>-</div><div class='ctx'> 	EFX_ASSERT_RESET_SERIALISED(efx);</div><div class='ctx'> </div><div class='ctx'> 	efx_stop_all(efx);</div><div class='ctx'> </div><div class='ctx'> 	efx_fini_channels(efx);</div><div class='del'>-	rc = efx_init_channels(efx);</div><div class='del'>-	if (rc) {</div><div class='del'>-		efx_schedule_reset(efx, RESET_TYPE_DISABLE);</div><div class='del'>-		return rc;</div><div class='del'>-	}</div><div class='add'>+	efx_init_channels(efx);</div><div class='ctx'> </div><div class='ctx'> 	efx_start_all(efx);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**************************************************************************</div><div class='hunk'>@@ -1249,7 +1204,7 @@ static void efx_monitor(struct work_struct *data)</div><div class='ctx'>  */</div><div class='ctx'> static int efx_ioctl(struct net_device *net_dev, struct ifreq *ifr, int cmd)</div><div class='ctx'> {</div><div class='del'>-	struct efx_nic *efx = net_dev-&gt;priv;</div><div class='add'>+	struct efx_nic *efx = netdev_priv(net_dev);</div><div class='ctx'> </div><div class='ctx'> 	EFX_ASSERT_RESET_SERIALISED(efx);</div><div class='ctx'> </div><div class='hunk'>@@ -1303,10 +1258,10 @@ static void efx_fini_napi(struct efx_nic *efx)</div><div class='ctx'>  */</div><div class='ctx'> static void efx_netpoll(struct net_device *net_dev)</div><div class='ctx'> {</div><div class='del'>-	struct efx_nic *efx = net_dev-&gt;priv;</div><div class='add'>+	struct efx_nic *efx = netdev_priv(net_dev);</div><div class='ctx'> 	struct efx_channel *channel;</div><div class='ctx'> </div><div class='del'>-	efx_for_each_channel_with_interrupt(channel, efx)</div><div class='add'>+	efx_for_each_channel(channel, efx)</div><div class='ctx'> 		efx_schedule_channel(channel);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1321,12 +1276,15 @@ static void efx_netpoll(struct net_device *net_dev)</div><div class='ctx'> /* Context: process, rtnl_lock() held. */</div><div class='ctx'> static int efx_net_open(struct net_device *net_dev)</div><div class='ctx'> {</div><div class='del'>-	struct efx_nic *efx = net_dev-&gt;priv;</div><div class='add'>+	struct efx_nic *efx = netdev_priv(net_dev);</div><div class='ctx'> 	EFX_ASSERT_RESET_SERIALISED(efx);</div><div class='ctx'> </div><div class='ctx'> 	EFX_LOG(efx, "opening device %s on CPU %d\n", net_dev-&gt;name,</div><div class='ctx'> 		raw_smp_processor_id());</div><div class='ctx'> </div><div class='add'>+	if (efx-&gt;phy_mode &amp; PHY_MODE_SPECIAL)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='ctx'> 	efx_start_all(efx);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1337,8 +1295,7 @@ static int efx_net_open(struct net_device *net_dev)</div><div class='ctx'>  */</div><div class='ctx'> static int efx_net_stop(struct net_device *net_dev)</div><div class='ctx'> {</div><div class='del'>-	struct efx_nic *efx = net_dev-&gt;priv;</div><div class='del'>-	int rc;</div><div class='add'>+	struct efx_nic *efx = netdev_priv(net_dev);</div><div class='ctx'> </div><div class='ctx'> 	EFX_LOG(efx, "closing %s on CPU %d\n", net_dev-&gt;name,</div><div class='ctx'> 		raw_smp_processor_id());</div><div class='hunk'>@@ -1346,9 +1303,7 @@ static int efx_net_stop(struct net_device *net_dev)</div><div class='ctx'> 	/* Stop the device and flush all the channels */</div><div class='ctx'> 	efx_stop_all(efx);</div><div class='ctx'> 	efx_fini_channels(efx);</div><div class='del'>-	rc = efx_init_channels(efx);</div><div class='del'>-	if (rc)</div><div class='del'>-		efx_schedule_reset(efx, RESET_TYPE_DISABLE);</div><div class='add'>+	efx_init_channels(efx);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1356,7 +1311,7 @@ static int efx_net_stop(struct net_device *net_dev)</div><div class='ctx'> /* Context: process, dev_base_lock or RTNL held, non-blocking. */</div><div class='ctx'> static struct net_device_stats *efx_net_stats(struct net_device *net_dev)</div><div class='ctx'> {</div><div class='del'>-	struct efx_nic *efx = net_dev-&gt;priv;</div><div class='add'>+	struct efx_nic *efx = netdev_priv(net_dev);</div><div class='ctx'> 	struct efx_mac_stats *mac_stats = &amp;efx-&gt;mac_stats;</div><div class='ctx'> 	struct net_device_stats *stats = &amp;net_dev-&gt;stats;</div><div class='ctx'> </div><div class='hunk'>@@ -1366,7 +1321,7 @@ static struct net_device_stats *efx_net_stats(struct net_device *net_dev)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!spin_trylock(&amp;efx-&gt;stats_lock))</div><div class='ctx'> 		return stats;</div><div class='del'>-	if (efx-&gt;state == STATE_RUNNING) {</div><div class='add'>+	if (efx-&gt;stats_enabled) {</div><div class='ctx'> 		falcon_update_stats_xmac(efx);</div><div class='ctx'> 		falcon_update_nic_stats(efx);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1403,7 +1358,7 @@ static struct net_device_stats *efx_net_stats(struct net_device *net_dev)</div><div class='ctx'> /* Context: netif_tx_lock held, BHs disabled. */</div><div class='ctx'> static void efx_watchdog(struct net_device *net_dev)</div><div class='ctx'> {</div><div class='del'>-	struct efx_nic *efx = net_dev-&gt;priv;</div><div class='add'>+	struct efx_nic *efx = netdev_priv(net_dev);</div><div class='ctx'> </div><div class='ctx'> 	EFX_ERR(efx, "TX stuck with stop_count=%d port_enabled=%d: %s\n",</div><div class='ctx'> 		atomic_read(&amp;efx-&gt;netif_stop_count), efx-&gt;port_enabled,</div><div class='hunk'>@@ -1417,7 +1372,7 @@ static void efx_watchdog(struct net_device *net_dev)</div><div class='ctx'> /* Context: process, rtnl_lock() held. */</div><div class='ctx'> static int efx_change_mtu(struct net_device *net_dev, int new_mtu)</div><div class='ctx'> {</div><div class='del'>-	struct efx_nic *efx = net_dev-&gt;priv;</div><div class='add'>+	struct efx_nic *efx = netdev_priv(net_dev);</div><div class='ctx'> 	int rc = 0;</div><div class='ctx'> </div><div class='ctx'> 	EFX_ASSERT_RESET_SERIALISED(efx);</div><div class='hunk'>@@ -1431,21 +1386,15 @@ static int efx_change_mtu(struct net_device *net_dev, int new_mtu)</div><div class='ctx'> </div><div class='ctx'> 	efx_fini_channels(efx);</div><div class='ctx'> 	net_dev-&gt;mtu = new_mtu;</div><div class='del'>-	rc = efx_init_channels(efx);</div><div class='del'>-	if (rc)</div><div class='del'>-		goto fail;</div><div class='add'>+	efx_init_channels(efx);</div><div class='ctx'> </div><div class='ctx'> 	efx_start_all(efx);</div><div class='ctx'> 	return rc;</div><div class='del'>-</div><div class='del'>- fail:</div><div class='del'>-	efx_schedule_reset(efx, RESET_TYPE_DISABLE);</div><div class='del'>-	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int efx_set_mac_address(struct net_device *net_dev, void *data)</div><div class='ctx'> {</div><div class='del'>-	struct efx_nic *efx = net_dev-&gt;priv;</div><div class='add'>+	struct efx_nic *efx = netdev_priv(net_dev);</div><div class='ctx'> 	struct sockaddr *addr = data;</div><div class='ctx'> 	char *new_addr = addr-&gt;sa_data;</div><div class='ctx'> </div><div class='hunk'>@@ -1466,26 +1415,19 @@ static int efx_set_mac_address(struct net_device *net_dev, void *data)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Context: netif_tx_lock held, BHs disabled. */</div><div class='add'>+/* Context: netif_addr_lock held, BHs disabled. */</div><div class='ctx'> static void efx_set_multicast_list(struct net_device *net_dev)</div><div class='ctx'> {</div><div class='del'>-	struct efx_nic *efx = net_dev-&gt;priv;</div><div class='add'>+	struct efx_nic *efx = netdev_priv(net_dev);</div><div class='ctx'> 	struct dev_mc_list *mc_list = net_dev-&gt;mc_list;</div><div class='ctx'> 	union efx_multicast_hash *mc_hash = &amp;efx-&gt;multicast_hash;</div><div class='del'>-	int promiscuous;</div><div class='add'>+	bool promiscuous = !!(net_dev-&gt;flags &amp; IFF_PROMISC);</div><div class='add'>+	bool changed = (efx-&gt;promiscuous != promiscuous);</div><div class='ctx'> 	u32 crc;</div><div class='ctx'> 	int bit;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	/* Set per-MAC promiscuity flag and reconfigure MAC if necessary */</div><div class='del'>-	promiscuous = (net_dev-&gt;flags &amp; IFF_PROMISC) ? 1 : 0;</div><div class='del'>-	if (efx-&gt;promiscuous != promiscuous) {</div><div class='del'>-		efx-&gt;promiscuous = promiscuous;</div><div class='del'>-		/* Close the window between efx_stop_port() and efx_flush_all()</div><div class='del'>-		 * by only queuing work when the port is enabled. */</div><div class='del'>-		if (efx-&gt;port_enabled)</div><div class='del'>-			queue_work(efx-&gt;workqueue, &amp;efx-&gt;reconfigure_work);</div><div class='del'>-	}</div><div class='add'>+	efx-&gt;promiscuous = promiscuous;</div><div class='ctx'> </div><div class='ctx'> 	/* Build multicast hash table */</div><div class='ctx'> 	if (promiscuous || (net_dev-&gt;flags &amp; IFF_ALLMULTI)) {</div><div class='hunk'>@@ -1500,6 +1442,13 @@ static void efx_set_multicast_list(struct net_device *net_dev)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (!efx-&gt;port_enabled)</div><div class='add'>+		/* Delay pushing settings until efx_start_port() */</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (changed)</div><div class='add'>+		queue_work(efx-&gt;workqueue, &amp;efx-&gt;reconfigure_work);</div><div class='add'>+</div><div class='ctx'> 	/* Create and activate new global multicast hash table */</div><div class='ctx'> 	falcon_set_multicast_hash(efx);</div><div class='ctx'> }</div><div class='hunk'>@@ -1510,7 +1459,7 @@ static int efx_netdev_event(struct notifier_block *this,</div><div class='ctx'> 	struct net_device *net_dev = ptr;</div><div class='ctx'> </div><div class='ctx'> 	if (net_dev-&gt;open == efx_net_open &amp;&amp; event == NETDEV_CHANGENAME) {</div><div class='del'>-		struct efx_nic *efx = net_dev-&gt;priv;</div><div class='add'>+		struct efx_nic *efx = netdev_priv(net_dev);</div><div class='ctx'> </div><div class='ctx'> 		strcpy(efx-&gt;name, net_dev-&gt;name);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1568,7 +1517,7 @@ static void efx_unregister_netdev(struct efx_nic *efx)</div><div class='ctx'> 	if (!efx-&gt;net_dev)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	BUG_ON(efx-&gt;net_dev-&gt;priv != efx);</div><div class='add'>+	BUG_ON(netdev_priv(efx-&gt;net_dev) != efx);</div><div class='ctx'> </div><div class='ctx'> 	/* Free up any skbs still remaining. This has to happen before</div><div class='ctx'> 	 * we try to unregister the netdev as running their destructors</div><div class='hunk'>@@ -1588,49 +1537,60 @@ static void efx_unregister_netdev(struct efx_nic *efx)</div><div class='ctx'>  *</div><div class='ctx'>  **************************************************************************/</div><div class='ctx'> </div><div class='del'>-/* The final hardware and software finalisation before reset. */</div><div class='del'>-static int efx_reset_down(struct efx_nic *efx, struct ethtool_cmd *ecmd)</div><div class='add'>+/* Tears down the entire software state and most of the hardware state</div><div class='add'>+ * before reset.  */</div><div class='add'>+void efx_reset_down(struct efx_nic *efx, struct ethtool_cmd *ecmd)</div><div class='ctx'> {</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	EFX_ASSERT_RESET_SERIALISED(efx);</div><div class='ctx'> </div><div class='add'>+	/* The net_dev-&gt;get_stats handler is quite slow, and will fail</div><div class='add'>+	 * if a fetch is pending over reset. Serialise against it. */</div><div class='add'>+	spin_lock(&amp;efx-&gt;stats_lock);</div><div class='add'>+	efx-&gt;stats_enabled = false;</div><div class='add'>+	spin_unlock(&amp;efx-&gt;stats_lock);</div><div class='add'>+</div><div class='add'>+	efx_stop_all(efx);</div><div class='add'>+	mutex_lock(&amp;efx-&gt;mac_lock);</div><div class='add'>+</div><div class='ctx'> 	rc = falcon_xmac_get_settings(efx, ecmd);</div><div class='del'>-	if (rc) {</div><div class='add'>+	if (rc)</div><div class='ctx'> 		EFX_ERR(efx, "could not back up PHY settings\n");</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	efx_fini_channels(efx);</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>- fail:</div><div class='del'>-	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* The first part of software initialisation after a hardware reset</div><div class='del'>- * This function does not handle serialisation with the kernel, it</div><div class='del'>- * assumes the caller has done this */</div><div class='del'>-static int efx_reset_up(struct efx_nic *efx, struct ethtool_cmd *ecmd)</div><div class='add'>+/* This function will always ensure that the locks acquired in</div><div class='add'>+ * efx_reset_down() are released. A failure return code indicates</div><div class='add'>+ * that we were unable to reinitialise the hardware, and the</div><div class='add'>+ * driver should be disabled. If ok is false, then the rx and tx</div><div class='add'>+ * engines are not restarted, pending a RESET_DISABLE. */</div><div class='add'>+int efx_reset_up(struct efx_nic *efx, struct ethtool_cmd *ecmd, bool ok)</div><div class='ctx'> {</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	rc = efx_init_channels(efx);</div><div class='del'>-	if (rc)</div><div class='del'>-		goto fail1;</div><div class='add'>+	EFX_ASSERT_RESET_SERIALISED(efx);</div><div class='ctx'> </div><div class='del'>-	/* Restore MAC and PHY settings. */</div><div class='del'>-	rc = falcon_xmac_set_settings(efx, ecmd);</div><div class='add'>+	rc = falcon_init_nic(efx);</div><div class='ctx'> 	if (rc) {</div><div class='del'>-		EFX_ERR(efx, "could not restore PHY settings\n");</div><div class='del'>-		goto fail2;</div><div class='add'>+		EFX_ERR(efx, "failed to initialise NIC\n");</div><div class='add'>+		ok = false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	if (ok) {</div><div class='add'>+		efx_init_channels(efx);</div><div class='ctx'> </div><div class='del'>- fail2:</div><div class='del'>-	efx_fini_channels(efx);</div><div class='del'>- fail1:</div><div class='add'>+		if (falcon_xmac_set_settings(efx, ecmd))</div><div class='add'>+			EFX_ERR(efx, "could not restore PHY settings\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;efx-&gt;mac_lock);</div><div class='add'>+</div><div class='add'>+	if (ok) {</div><div class='add'>+		efx_start_all(efx);</div><div class='add'>+		efx-&gt;stats_enabled = true;</div><div class='add'>+	}</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1659,25 +1619,14 @@ static int efx_reset(struct efx_nic *efx)</div><div class='ctx'> 		goto unlock_rtnl;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	efx-&gt;state = STATE_RESETTING;</div><div class='ctx'> 	EFX_INFO(efx, "resetting (%d)\n", method);</div><div class='ctx'> </div><div class='del'>-	/* The net_dev-&gt;get_stats handler is quite slow, and will fail</div><div class='del'>-	 * if a fetch is pending over reset. Serialise against it. */</div><div class='del'>-	spin_lock(&amp;efx-&gt;stats_lock);</div><div class='del'>-	spin_unlock(&amp;efx-&gt;stats_lock);</div><div class='del'>-</div><div class='del'>-	efx_stop_all(efx);</div><div class='del'>-	mutex_lock(&amp;efx-&gt;mac_lock);</div><div class='del'>-</div><div class='del'>-	rc = efx_reset_down(efx, &amp;ecmd);</div><div class='del'>-	if (rc)</div><div class='del'>-		goto fail1;</div><div class='add'>+	efx_reset_down(efx, &amp;ecmd);</div><div class='ctx'> </div><div class='ctx'> 	rc = falcon_reset_hw(efx, method);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		EFX_ERR(efx, "failed to reset hardware\n");</div><div class='del'>-		goto fail2;</div><div class='add'>+		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Allow resets to be rescheduled. */</div><div class='hunk'>@@ -1689,46 +1638,27 @@ static int efx_reset(struct efx_nic *efx)</div><div class='ctx'> 	 * can respond to requests. */</div><div class='ctx'> 	pci_set_master(efx-&gt;pci_dev);</div><div class='ctx'> </div><div class='del'>-	/* Reinitialise device. This is appropriate in the RESET_TYPE_DISABLE</div><div class='del'>-	 * case so the driver can talk to external SRAM */</div><div class='del'>-	rc = falcon_init_nic(efx);</div><div class='del'>-	if (rc) {</div><div class='del'>-		EFX_ERR(efx, "failed to initialise NIC\n");</div><div class='del'>-		goto fail3;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* Leave device stopped if necessary */</div><div class='ctx'> 	if (method == RESET_TYPE_DISABLE) {</div><div class='del'>-		/* Reinitialise the device anyway so the driver unload sequence</div><div class='del'>-		 * can talk to the external SRAM */</div><div class='del'>-		falcon_init_nic(efx);</div><div class='ctx'> 		rc = -EIO;</div><div class='del'>-		goto fail4;</div><div class='add'>+		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rc = efx_reset_up(efx, &amp;ecmd);</div><div class='add'>+	rc = efx_reset_up(efx, &amp;ecmd, true);</div><div class='ctx'> 	if (rc)</div><div class='del'>-		goto fail5;</div><div class='add'>+		goto disable;</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;efx-&gt;mac_lock);</div><div class='ctx'> 	EFX_LOG(efx, "reset complete\n");</div><div class='del'>-</div><div class='del'>-	efx-&gt;state = STATE_RUNNING;</div><div class='del'>-	efx_start_all(efx);</div><div class='del'>-</div><div class='ctx'>  unlock_rtnl:</div><div class='ctx'> 	rtnl_unlock();</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>- fail5:</div><div class='del'>- fail4:</div><div class='del'>- fail3:</div><div class='del'>- fail2:</div><div class='del'>- fail1:</div><div class='add'>+ fail:</div><div class='add'>+	efx_reset_up(efx, &amp;ecmd, false);</div><div class='add'>+ disable:</div><div class='ctx'> 	EFX_ERR(efx, "has been disabled\n");</div><div class='ctx'> 	efx-&gt;state = STATE_DISABLED;</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;efx-&gt;mac_lock);</div><div class='ctx'> 	rtnl_unlock();</div><div class='ctx'> 	efx_unregister_netdev(efx);</div><div class='ctx'> 	efx_fini_port(efx);</div><div class='hunk'>@@ -1801,7 +1731,7 @@ static struct pci_device_id efx_pci_table[] __devinitdata = {</div><div class='ctx'>  *</div><div class='ctx'>  * Dummy PHY/MAC/Board operations</div><div class='ctx'>  *</div><div class='del'>- * Can be used where the MAC does not implement this operation</div><div class='add'>+ * Can be used for some unimplemented operations</div><div class='ctx'>  * Needed so all function pointers are valid and do not have to be tested</div><div class='ctx'>  * before use</div><div class='ctx'>  *</div><div class='hunk'>@@ -1811,7 +1741,7 @@ int efx_port_dummy_op_int(struct efx_nic *efx)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> void efx_port_dummy_op_void(struct efx_nic *efx) {}</div><div class='del'>-void efx_port_dummy_op_blink(struct efx_nic *efx, int blink) {}</div><div class='add'>+void efx_port_dummy_op_blink(struct efx_nic *efx, bool blink) {}</div><div class='ctx'> </div><div class='ctx'> static struct efx_phy_operations efx_dummy_phy_operations = {</div><div class='ctx'> 	.init		 = efx_port_dummy_op_int,</div><div class='hunk'>@@ -1819,20 +1749,14 @@ static struct efx_phy_operations efx_dummy_phy_operations = {</div><div class='ctx'> 	.check_hw        = efx_port_dummy_op_int,</div><div class='ctx'> 	.fini		 = efx_port_dummy_op_void,</div><div class='ctx'> 	.clear_interrupt = efx_port_dummy_op_void,</div><div class='del'>-	.reset_xaui      = efx_port_dummy_op_void,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* Dummy board operations */</div><div class='del'>-static int efx_nic_dummy_op_int(struct efx_nic *nic)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static struct efx_board efx_dummy_board_info = {</div><div class='del'>-	.init    = efx_nic_dummy_op_int,</div><div class='del'>-	.init_leds = efx_port_dummy_op_int,</div><div class='del'>-	.set_fault_led = efx_port_dummy_op_blink,</div><div class='del'>-	.fini	= efx_port_dummy_op_void,</div><div class='add'>+	.init		= efx_port_dummy_op_int,</div><div class='add'>+	.init_leds	= efx_port_dummy_op_int,</div><div class='add'>+	.set_fault_led	= efx_port_dummy_op_blink,</div><div class='add'>+	.blink		= efx_port_dummy_op_blink,</div><div class='add'>+	.fini		= efx_port_dummy_op_void,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**************************************************************************</div><div class='hunk'>@@ -1865,7 +1789,7 @@ static int efx_init_struct(struct efx_nic *efx, struct efx_nic_type *type,</div><div class='ctx'> 	efx-&gt;board_info = efx_dummy_board_info;</div><div class='ctx'> </div><div class='ctx'> 	efx-&gt;net_dev = net_dev;</div><div class='del'>-	efx-&gt;rx_checksum_enabled = 1;</div><div class='add'>+	efx-&gt;rx_checksum_enabled = true;</div><div class='ctx'> 	spin_lock_init(&amp;efx-&gt;netif_stop_lock);</div><div class='ctx'> 	spin_lock_init(&amp;efx-&gt;stats_lock);</div><div class='ctx'> 	mutex_init(&amp;efx-&gt;mac_lock);</div><div class='hunk'>@@ -1878,10 +1802,9 @@ static int efx_init_struct(struct efx_nic *efx, struct efx_nic_type *type,</div><div class='ctx'> 		channel = &amp;efx-&gt;channel[i];</div><div class='ctx'> 		channel-&gt;efx = efx;</div><div class='ctx'> 		channel-&gt;channel = i;</div><div class='del'>-		channel-&gt;evqnum = i;</div><div class='del'>-		channel-&gt;work_pending = 0;</div><div class='add'>+		channel-&gt;work_pending = false;</div><div class='ctx'> 	}</div><div class='del'>-	for (i = 0; i &lt; EFX_MAX_TX_QUEUES; i++) {</div><div class='add'>+	for (i = 0; i &lt; EFX_TX_QUEUE_COUNT; i++) {</div><div class='ctx'> 		tx_queue = &amp;efx-&gt;tx_queue[i];</div><div class='ctx'> 		tx_queue-&gt;efx = efx;</div><div class='ctx'> 		tx_queue-&gt;queue = i;</div><div class='hunk'>@@ -2056,19 +1979,16 @@ static int efx_pci_probe_main(struct efx_nic *efx)</div><div class='ctx'> 		goto fail5;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rc = efx_init_channels(efx);</div><div class='del'>-	if (rc)</div><div class='del'>-		goto fail6;</div><div class='add'>+	efx_init_channels(efx);</div><div class='ctx'> </div><div class='ctx'> 	rc = falcon_init_interrupt(efx);</div><div class='ctx'> 	if (rc)</div><div class='del'>-		goto fail7;</div><div class='add'>+		goto fail6;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>- fail7:</div><div class='del'>-	efx_fini_channels(efx);</div><div class='ctx'>  fail6:</div><div class='add'>+	efx_fini_channels(efx);</div><div class='ctx'> 	efx_fini_port(efx);</div><div class='ctx'>  fail5:</div><div class='ctx'>  fail4:</div><div class='hunk'>@@ -2105,7 +2025,10 @@ static int __devinit efx_pci_probe(struct pci_dev *pci_dev,</div><div class='ctx'> 			      NETIF_F_HIGHDMA | NETIF_F_TSO);</div><div class='ctx'> 	if (lro)</div><div class='ctx'> 		net_dev-&gt;features |= NETIF_F_LRO;</div><div class='del'>-	efx = net_dev-&gt;priv;</div><div class='add'>+	/* Mask for features that also apply to VLAN devices */</div><div class='add'>+	net_dev-&gt;vlan_features |= (NETIF_F_ALL_CSUM | NETIF_F_SG |</div><div class='add'>+				   NETIF_F_HIGHDMA | NETIF_F_TSO);</div><div class='add'>+	efx = netdev_priv(net_dev);</div><div class='ctx'> 	pci_set_drvdata(pci_dev, efx);</div><div class='ctx'> 	rc = efx_init_struct(efx, type, pci_dev, net_dev);</div><div class='ctx'> 	if (rc)</div><div class='head'>diff --git a/drivers/net/sfc/efx.h b/drivers/net/sfc/efx.h<br/>index 3b2f69f4a9ab..d02937b70eee 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sfc/efx.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/sfc/efx.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sfc/efx.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sfc/efx.h</a></div><div class='hunk'>@@ -28,15 +28,21 @@ extern void efx_wake_queue(struct efx_nic *efx);</div><div class='ctx'> /* RX */</div><div class='ctx'> extern void efx_xmit_done(struct efx_tx_queue *tx_queue, unsigned int index);</div><div class='ctx'> extern void efx_rx_packet(struct efx_rx_queue *rx_queue, unsigned int index,</div><div class='del'>-			  unsigned int len, int checksummed, int discard);</div><div class='add'>+			  unsigned int len, bool checksummed, bool discard);</div><div class='ctx'> extern void efx_schedule_slow_fill(struct efx_rx_queue *rx_queue, int delay);</div><div class='ctx'> </div><div class='ctx'> /* Channels */</div><div class='ctx'> extern void efx_process_channel_now(struct efx_channel *channel);</div><div class='del'>-extern int efx_flush_queues(struct efx_nic *efx);</div><div class='add'>+extern void efx_flush_queues(struct efx_nic *efx);</div><div class='ctx'> </div><div class='ctx'> /* Ports */</div><div class='ctx'> extern void efx_reconfigure_port(struct efx_nic *efx);</div><div class='add'>+extern void __efx_reconfigure_port(struct efx_nic *efx);</div><div class='add'>+</div><div class='add'>+/* Reset handling */</div><div class='add'>+extern void efx_reset_down(struct efx_nic *efx, struct ethtool_cmd *ecmd);</div><div class='add'>+extern int efx_reset_up(struct efx_nic *efx, struct ethtool_cmd *ecmd,</div><div class='add'>+			bool ok);</div><div class='ctx'> </div><div class='ctx'> /* Global */</div><div class='ctx'> extern void efx_schedule_reset(struct efx_nic *efx, enum reset_type type);</div><div class='hunk'>@@ -50,7 +56,7 @@ extern void efx_hex_dump(const u8 *, unsigned int, const char *);</div><div class='ctx'> /* Dummy PHY ops for PHY drivers */</div><div class='ctx'> extern int efx_port_dummy_op_int(struct efx_nic *efx);</div><div class='ctx'> extern void efx_port_dummy_op_void(struct efx_nic *efx);</div><div class='del'>-extern void efx_port_dummy_op_blink(struct efx_nic *efx, int blink);</div><div class='add'>+extern void efx_port_dummy_op_blink(struct efx_nic *efx, bool blink);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> extern unsigned int efx_monitor_interval;</div><div class='hunk'>@@ -59,7 +65,7 @@ static inline void efx_schedule_channel(struct efx_channel *channel)</div><div class='ctx'> {</div><div class='ctx'> 	EFX_TRACE(channel-&gt;efx, "channel %d scheduling NAPI poll on CPU%d\n",</div><div class='ctx'> 		  channel-&gt;channel, raw_smp_processor_id());</div><div class='del'>-	channel-&gt;work_pending = 1;</div><div class='add'>+	channel-&gt;work_pending = true;</div><div class='ctx'> </div><div class='ctx'> 	netif_rx_schedule(channel-&gt;napi_dev, &amp;channel-&gt;napi_str);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/sfc/enum.h b/drivers/net/sfc/enum.h<br/>index c53290d08e2b..cec15dbb88e4 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sfc/enum.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/sfc/enum.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sfc/enum.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sfc/enum.h</a></div><div class='hunk'>@@ -52,12 +52,11 @@ extern const char *efx_loopback_mode_names[];</div><div class='ctx'> #define LOOPBACK_MASK(_efx)			\</div><div class='ctx'> 	(1 &lt;&lt; (_efx)-&gt;loopback_mode)</div><div class='ctx'> </div><div class='del'>-#define LOOPBACK_INTERNAL(_efx)						\</div><div class='del'>-	((LOOPBACKS_10G_INTERNAL &amp; LOOPBACK_MASK(_efx)) ? 1 : 0)</div><div class='add'>+#define LOOPBACK_INTERNAL(_efx)				\</div><div class='add'>+	(!!(LOOPBACKS_10G_INTERNAL &amp; LOOPBACK_MASK(_efx)))</div><div class='ctx'> </div><div class='del'>-#define LOOPBACK_OUT_OF(_from, _to, _mask)		\</div><div class='del'>-	(((LOOPBACK_MASK(_from) &amp; (_mask)) &amp;&amp;		\</div><div class='del'>-	  ((LOOPBACK_MASK(_to) &amp; (_mask)) == 0)) ? 1 : 0)</div><div class='add'>+#define LOOPBACK_OUT_OF(_from, _to, _mask)				\</div><div class='add'>+	((LOOPBACK_MASK(_from) &amp; (_mask)) &amp;&amp; !(LOOPBACK_MASK(_to) &amp; (_mask)))</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/sfc/ethtool.c b/drivers/net/sfc/ethtool.c<br/>index e2c75d101610..fa98af58223e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sfc/ethtool.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/sfc/ethtool.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sfc/ethtool.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sfc/ethtool.c</a></div><div class='hunk'>@@ -17,6 +17,7 @@</div><div class='ctx'> #include "ethtool.h"</div><div class='ctx'> #include "falcon.h"</div><div class='ctx'> #include "gmii.h"</div><div class='add'>+#include "spi.h"</div><div class='ctx'> #include "mac.h"</div><div class='ctx'> </div><div class='ctx'> const char *efx_loopback_mode_names[] = {</div><div class='hunk'>@@ -32,8 +33,6 @@ const char *efx_loopback_mode_names[] = {</div><div class='ctx'> 	[LOOPBACK_NETWORK]	= "NETWORK",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int efx_ethtool_set_tx_csum(struct net_device *net_dev, u32 enable);</div><div class='del'>-</div><div class='ctx'> struct ethtool_string {</div><div class='ctx'> 	char name[ETH_GSTRING_LEN];</div><div class='ctx'> };</div><div class='hunk'>@@ -173,6 +172,11 @@ static struct efx_ethtool_stat efx_ethtool_stats[] = {</div><div class='ctx'> /* Number of ethtool statistics */</div><div class='ctx'> #define EFX_ETHTOOL_NUM_STATS ARRAY_SIZE(efx_ethtool_stats)</div><div class='ctx'> </div><div class='add'>+/* EEPROM range with gPXE configuration */</div><div class='add'>+#define EFX_ETHTOOL_EEPROM_MAGIC 0xEFAB</div><div class='add'>+#define EFX_ETHTOOL_EEPROM_MIN 0x100U</div><div class='add'>+#define EFX_ETHTOOL_EEPROM_MAX 0x400U</div><div class='add'>+</div><div class='ctx'> /**************************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * Ethtool operations</div><div class='hunk'>@@ -183,7 +187,7 @@ static struct efx_ethtool_stat efx_ethtool_stats[] = {</div><div class='ctx'> /* Identify device by flashing LEDs */</div><div class='ctx'> static int efx_ethtool_phys_id(struct net_device *net_dev, u32 seconds)</div><div class='ctx'> {</div><div class='del'>-	struct efx_nic *efx = net_dev-&gt;priv;</div><div class='add'>+	struct efx_nic *efx = netdev_priv(net_dev);</div><div class='ctx'> </div><div class='ctx'> 	efx-&gt;board_info.blink(efx, 1);</div><div class='ctx'> 	schedule_timeout_interruptible(seconds * HZ);</div><div class='hunk'>@@ -195,7 +199,7 @@ static int efx_ethtool_phys_id(struct net_device *net_dev, u32 seconds)</div><div class='ctx'> int efx_ethtool_get_settings(struct net_device *net_dev,</div><div class='ctx'> 			     struct ethtool_cmd *ecmd)</div><div class='ctx'> {</div><div class='del'>-	struct efx_nic *efx = net_dev-&gt;priv;</div><div class='add'>+	struct efx_nic *efx = netdev_priv(net_dev);</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;efx-&gt;mac_lock);</div><div class='hunk'>@@ -209,7 +213,7 @@ int efx_ethtool_get_settings(struct net_device *net_dev,</div><div class='ctx'> int efx_ethtool_set_settings(struct net_device *net_dev,</div><div class='ctx'> 			     struct ethtool_cmd *ecmd)</div><div class='ctx'> {</div><div class='del'>-	struct efx_nic *efx = net_dev-&gt;priv;</div><div class='add'>+	struct efx_nic *efx = netdev_priv(net_dev);</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;efx-&gt;mac_lock);</div><div class='hunk'>@@ -224,7 +228,7 @@ int efx_ethtool_set_settings(struct net_device *net_dev,</div><div class='ctx'> static void efx_ethtool_get_drvinfo(struct net_device *net_dev,</div><div class='ctx'> 				    struct ethtool_drvinfo *info)</div><div class='ctx'> {</div><div class='del'>-	struct efx_nic *efx = net_dev-&gt;priv;</div><div class='add'>+	struct efx_nic *efx = netdev_priv(net_dev);</div><div class='ctx'> </div><div class='ctx'> 	strlcpy(info-&gt;driver, EFX_DRIVER_NAME, sizeof(info-&gt;driver));</div><div class='ctx'> 	strlcpy(info-&gt;version, EFX_DRIVER_VERSION, sizeof(info-&gt;version));</div><div class='hunk'>@@ -329,7 +333,10 @@ static int efx_ethtool_fill_self_tests(struct efx_nic *efx,</div><div class='ctx'> 	unsigned int n = 0;</div><div class='ctx'> 	enum efx_loopback_mode mode;</div><div class='ctx'> </div><div class='del'>-	/* Interrupt */</div><div class='add'>+	efx_fill_test(n++, strings, data, &amp;tests-&gt;mii,</div><div class='add'>+		      "core", 0, "mii", NULL);</div><div class='add'>+	efx_fill_test(n++, strings, data, &amp;tests-&gt;nvram,</div><div class='add'>+		      "core", 0, "nvram", NULL);</div><div class='ctx'> 	efx_fill_test(n++, strings, data, &amp;tests-&gt;interrupt,</div><div class='ctx'> 		      "core", 0, "interrupt", NULL);</div><div class='ctx'> </div><div class='hunk'>@@ -349,16 +356,17 @@ static int efx_ethtool_fill_self_tests(struct efx_nic *efx,</div><div class='ctx'> 			      "eventq.poll", NULL);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* PHY presence */</div><div class='del'>-	efx_fill_test(n++, strings, data, &amp;tests-&gt;phy_ok,</div><div class='del'>-		      EFX_PORT_NAME, "phy_ok", NULL);</div><div class='add'>+	efx_fill_test(n++, strings, data, &amp;tests-&gt;registers,</div><div class='add'>+		      "core", 0, "registers", NULL);</div><div class='add'>+	efx_fill_test(n++, strings, data, &amp;tests-&gt;phy,</div><div class='add'>+		      EFX_PORT_NAME, "phy", NULL);</div><div class='ctx'> </div><div class='ctx'> 	/* Loopback tests */</div><div class='ctx'> 	efx_fill_test(n++, strings, data, &amp;tests-&gt;loopback_speed,</div><div class='ctx'> 		      EFX_PORT_NAME, "loopback.speed", NULL);</div><div class='ctx'> 	efx_fill_test(n++, strings, data, &amp;tests-&gt;loopback_full_duplex,</div><div class='ctx'> 		      EFX_PORT_NAME, "loopback.full_duplex", NULL);</div><div class='del'>-	for (mode = LOOPBACK_NONE; mode &lt; LOOPBACK_TEST_MAX; mode++) {</div><div class='add'>+	for (mode = LOOPBACK_NONE; mode &lt;= LOOPBACK_TEST_MAX; mode++) {</div><div class='ctx'> 		if (!(efx-&gt;loopback_modes &amp; (1 &lt;&lt; mode)))</div><div class='ctx'> 			continue;</div><div class='ctx'> 		n = efx_fill_loopback_test(efx,</div><div class='hunk'>@@ -369,22 +377,24 @@ static int efx_ethtool_fill_self_tests(struct efx_nic *efx,</div><div class='ctx'> 	return n;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int efx_ethtool_get_stats_count(struct net_device *net_dev)</div><div class='add'>+static int efx_ethtool_get_sset_count(struct net_device *net_dev,</div><div class='add'>+				      int string_set)</div><div class='ctx'> {</div><div class='del'>-	return EFX_ETHTOOL_NUM_STATS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int efx_ethtool_self_test_count(struct net_device *net_dev)</div><div class='del'>-{</div><div class='del'>-	struct efx_nic *efx = net_dev-&gt;priv;</div><div class='del'>-</div><div class='del'>-	return efx_ethtool_fill_self_tests(efx, NULL, NULL, NULL);</div><div class='add'>+	switch (string_set) {</div><div class='add'>+	case ETH_SS_STATS:</div><div class='add'>+		return EFX_ETHTOOL_NUM_STATS;</div><div class='add'>+	case ETH_SS_TEST:</div><div class='add'>+		return efx_ethtool_fill_self_tests(netdev_priv(net_dev),</div><div class='add'>+						   NULL, NULL, NULL);</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void efx_ethtool_get_strings(struct net_device *net_dev,</div><div class='ctx'> 				    u32 string_set, u8 *strings)</div><div class='ctx'> {</div><div class='del'>-	struct efx_nic *efx = net_dev-&gt;priv;</div><div class='add'>+	struct efx_nic *efx = netdev_priv(net_dev);</div><div class='ctx'> 	struct ethtool_string *ethtool_strings =</div><div class='ctx'> 		(struct ethtool_string *)strings;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -410,7 +420,7 @@ static void efx_ethtool_get_stats(struct net_device *net_dev,</div><div class='ctx'> 				  struct ethtool_stats *stats,</div><div class='ctx'> 				  u64 *data)</div><div class='ctx'> {</div><div class='del'>-	struct efx_nic *efx = net_dev-&gt;priv;</div><div class='add'>+	struct efx_nic *efx = netdev_priv(net_dev);</div><div class='ctx'> 	struct efx_mac_stats *mac_stats = &amp;efx-&gt;mac_stats;</div><div class='ctx'> 	struct efx_ethtool_stat *stat;</div><div class='ctx'> 	struct efx_channel *channel;</div><div class='hunk'>@@ -442,60 +452,21 @@ static void efx_ethtool_get_stats(struct net_device *net_dev,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int efx_ethtool_set_tso(struct net_device *net_dev, u32 enable)</div><div class='del'>-{</div><div class='del'>-	int rc;</div><div class='del'>-</div><div class='del'>-	/* Our TSO requires TX checksumming, so force TX checksumming</div><div class='del'>-	 * on when TSO is enabled.</div><div class='del'>-	 */</div><div class='del'>-	if (enable) {</div><div class='del'>-		rc = efx_ethtool_set_tx_csum(net_dev, 1);</div><div class='del'>-		if (rc)</div><div class='del'>-			return rc;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ethtool_op_set_tso(net_dev, enable);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int efx_ethtool_set_tx_csum(struct net_device *net_dev, u32 enable)</div><div class='del'>-{</div><div class='del'>-	struct efx_nic *efx = net_dev-&gt;priv;</div><div class='del'>-	int rc;</div><div class='del'>-</div><div class='del'>-	rc = ethtool_op_set_tx_csum(net_dev, enable);</div><div class='del'>-	if (rc)</div><div class='del'>-		return rc;</div><div class='del'>-</div><div class='del'>-	efx_flush_queues(efx);</div><div class='del'>-</div><div class='del'>-	/* Our TSO requires TX checksumming, so disable TSO when</div><div class='del'>-	 * checksumming is disabled</div><div class='del'>-	 */</div><div class='del'>-	if (!enable) {</div><div class='del'>-		rc = efx_ethtool_set_tso(net_dev, 0);</div><div class='del'>-		if (rc)</div><div class='del'>-			return rc;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int efx_ethtool_set_rx_csum(struct net_device *net_dev, u32 enable)</div><div class='ctx'> {</div><div class='del'>-	struct efx_nic *efx = net_dev-&gt;priv;</div><div class='add'>+	struct efx_nic *efx = netdev_priv(net_dev);</div><div class='ctx'> </div><div class='ctx'> 	/* No way to stop the hardware doing the checks; we just</div><div class='ctx'> 	 * ignore the result.</div><div class='ctx'> 	 */</div><div class='del'>-	efx-&gt;rx_checksum_enabled = (enable ? 1 : 0);</div><div class='add'>+	efx-&gt;rx_checksum_enabled = !!enable;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u32 efx_ethtool_get_rx_csum(struct net_device *net_dev)</div><div class='ctx'> {</div><div class='del'>-	struct efx_nic *efx = net_dev-&gt;priv;</div><div class='add'>+	struct efx_nic *efx = netdev_priv(net_dev);</div><div class='ctx'> </div><div class='ctx'> 	return efx-&gt;rx_checksum_enabled;</div><div class='ctx'> }</div><div class='hunk'>@@ -503,7 +474,7 @@ static u32 efx_ethtool_get_rx_csum(struct net_device *net_dev)</div><div class='ctx'> static void efx_ethtool_self_test(struct net_device *net_dev,</div><div class='ctx'> 				  struct ethtool_test *test, u64 *data)</div><div class='ctx'> {</div><div class='del'>-	struct efx_nic *efx = net_dev-&gt;priv;</div><div class='add'>+	struct efx_nic *efx = netdev_priv(net_dev);</div><div class='ctx'> 	struct efx_self_tests efx_tests;</div><div class='ctx'> 	int offline, already_up;</div><div class='ctx'> 	int rc;</div><div class='hunk'>@@ -533,15 +504,9 @@ static void efx_ethtool_self_test(struct net_device *net_dev,</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	/* Perform offline tests only if online tests passed */</div><div class='del'>-	if (offline) {</div><div class='del'>-		/* Stop the kernel from sending packets during the test. */</div><div class='del'>-		efx_stop_queue(efx);</div><div class='del'>-		rc = efx_flush_queues(efx);</div><div class='del'>-		if (!rc)</div><div class='del'>-			rc = efx_offline_test(efx, &amp;efx_tests,</div><div class='del'>-					      efx-&gt;loopback_modes);</div><div class='del'>-		efx_wake_queue(efx);</div><div class='del'>-	}</div><div class='add'>+	if (offline)</div><div class='add'>+		rc = efx_offline_test(efx, &amp;efx_tests,</div><div class='add'>+				      efx-&gt;loopback_modes);</div><div class='ctx'> </div><div class='ctx'>  out:</div><div class='ctx'> 	if (!already_up)</div><div class='hunk'>@@ -561,22 +526,65 @@ static void efx_ethtool_self_test(struct net_device *net_dev,</div><div class='ctx'> /* Restart autonegotiation */</div><div class='ctx'> static int efx_ethtool_nway_reset(struct net_device *net_dev)</div><div class='ctx'> {</div><div class='del'>-	struct efx_nic *efx = net_dev-&gt;priv;</div><div class='add'>+	struct efx_nic *efx = netdev_priv(net_dev);</div><div class='ctx'> </div><div class='ctx'> 	return mii_nway_restart(&amp;efx-&gt;mii);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u32 efx_ethtool_get_link(struct net_device *net_dev)</div><div class='ctx'> {</div><div class='del'>-	struct efx_nic *efx = net_dev-&gt;priv;</div><div class='add'>+	struct efx_nic *efx = netdev_priv(net_dev);</div><div class='ctx'> </div><div class='ctx'> 	return efx-&gt;link_up;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int efx_ethtool_get_eeprom_len(struct net_device *net_dev)</div><div class='add'>+{</div><div class='add'>+	struct efx_nic *efx = netdev_priv(net_dev);</div><div class='add'>+	struct efx_spi_device *spi = efx-&gt;spi_eeprom;</div><div class='add'>+</div><div class='add'>+	if (!spi)</div><div class='add'>+		return 0;</div><div class='add'>+	return min(spi-&gt;size, EFX_ETHTOOL_EEPROM_MAX) -</div><div class='add'>+		min(spi-&gt;size, EFX_ETHTOOL_EEPROM_MIN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int efx_ethtool_get_eeprom(struct net_device *net_dev,</div><div class='add'>+				  struct ethtool_eeprom *eeprom, u8 *buf)</div><div class='add'>+{</div><div class='add'>+	struct efx_nic *efx = netdev_priv(net_dev);</div><div class='add'>+	struct efx_spi_device *spi = efx-&gt;spi_eeprom;</div><div class='add'>+	size_t len;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = falcon_spi_read(spi, eeprom-&gt;offset + EFX_ETHTOOL_EEPROM_MIN,</div><div class='add'>+			     eeprom-&gt;len, &amp;len, buf);</div><div class='add'>+	eeprom-&gt;magic = EFX_ETHTOOL_EEPROM_MAGIC;</div><div class='add'>+	eeprom-&gt;len = len;</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int efx_ethtool_set_eeprom(struct net_device *net_dev,</div><div class='add'>+				  struct ethtool_eeprom *eeprom, u8 *buf)</div><div class='add'>+{</div><div class='add'>+	struct efx_nic *efx = netdev_priv(net_dev);</div><div class='add'>+	struct efx_spi_device *spi = efx-&gt;spi_eeprom;</div><div class='add'>+	size_t len;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (eeprom-&gt;magic != EFX_ETHTOOL_EEPROM_MAGIC)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	rc = falcon_spi_write(spi, eeprom-&gt;offset + EFX_ETHTOOL_EEPROM_MIN,</div><div class='add'>+			      eeprom-&gt;len, &amp;len, buf);</div><div class='add'>+	eeprom-&gt;len = len;</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int efx_ethtool_get_coalesce(struct net_device *net_dev,</div><div class='ctx'> 				    struct ethtool_coalesce *coalesce)</div><div class='ctx'> {</div><div class='del'>-	struct efx_nic *efx = net_dev-&gt;priv;</div><div class='add'>+	struct efx_nic *efx = netdev_priv(net_dev);</div><div class='ctx'> 	struct efx_tx_queue *tx_queue;</div><div class='ctx'> 	struct efx_rx_queue *rx_queue;</div><div class='ctx'> 	struct efx_channel *channel;</div><div class='hunk'>@@ -614,7 +622,7 @@ static int efx_ethtool_get_coalesce(struct net_device *net_dev,</div><div class='ctx'> static int efx_ethtool_set_coalesce(struct net_device *net_dev,</div><div class='ctx'> 				    struct ethtool_coalesce *coalesce)</div><div class='ctx'> {</div><div class='del'>-	struct efx_nic *efx = net_dev-&gt;priv;</div><div class='add'>+	struct efx_nic *efx = netdev_priv(net_dev);</div><div class='ctx'> 	struct efx_channel *channel;</div><div class='ctx'> 	struct efx_tx_queue *tx_queue;</div><div class='ctx'> 	unsigned tx_usecs, rx_usecs;</div><div class='hunk'>@@ -657,7 +665,7 @@ static int efx_ethtool_set_coalesce(struct net_device *net_dev,</div><div class='ctx'> static int efx_ethtool_set_pauseparam(struct net_device *net_dev,</div><div class='ctx'> 				      struct ethtool_pauseparam *pause)</div><div class='ctx'> {</div><div class='del'>-	struct efx_nic *efx = net_dev-&gt;priv;</div><div class='add'>+	struct efx_nic *efx = netdev_priv(net_dev);</div><div class='ctx'> 	enum efx_fc_type flow_control = efx-&gt;flow_control;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='hunk'>@@ -680,11 +688,11 @@ static int efx_ethtool_set_pauseparam(struct net_device *net_dev,</div><div class='ctx'> static void efx_ethtool_get_pauseparam(struct net_device *net_dev,</div><div class='ctx'> 				       struct ethtool_pauseparam *pause)</div><div class='ctx'> {</div><div class='del'>-	struct efx_nic *efx = net_dev-&gt;priv;</div><div class='add'>+	struct efx_nic *efx = netdev_priv(net_dev);</div><div class='ctx'> </div><div class='del'>-	pause-&gt;rx_pause = (efx-&gt;flow_control &amp; EFX_FC_RX) ? 1 : 0;</div><div class='del'>-	pause-&gt;tx_pause = (efx-&gt;flow_control &amp; EFX_FC_TX) ? 1 : 0;</div><div class='del'>-	pause-&gt;autoneg = (efx-&gt;flow_control &amp; EFX_FC_AUTO) ? 1 : 0;</div><div class='add'>+	pause-&gt;rx_pause = !!(efx-&gt;flow_control &amp; EFX_FC_RX);</div><div class='add'>+	pause-&gt;tx_pause = !!(efx-&gt;flow_control &amp; EFX_FC_TX);</div><div class='add'>+	pause-&gt;autoneg = !!(efx-&gt;flow_control &amp; EFX_FC_AUTO);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -694,6 +702,9 @@ struct ethtool_ops efx_ethtool_ops = {</div><div class='ctx'> 	.get_drvinfo		= efx_ethtool_get_drvinfo,</div><div class='ctx'> 	.nway_reset		= efx_ethtool_nway_reset,</div><div class='ctx'> 	.get_link		= efx_ethtool_get_link,</div><div class='add'>+	.get_eeprom_len		= efx_ethtool_get_eeprom_len,</div><div class='add'>+	.get_eeprom		= efx_ethtool_get_eeprom,</div><div class='add'>+	.set_eeprom		= efx_ethtool_set_eeprom,</div><div class='ctx'> 	.get_coalesce		= efx_ethtool_get_coalesce,</div><div class='ctx'> 	.set_coalesce		= efx_ethtool_set_coalesce,</div><div class='ctx'> 	.get_pauseparam         = efx_ethtool_get_pauseparam,</div><div class='hunk'>@@ -701,17 +712,16 @@ struct ethtool_ops efx_ethtool_ops = {</div><div class='ctx'> 	.get_rx_csum		= efx_ethtool_get_rx_csum,</div><div class='ctx'> 	.set_rx_csum		= efx_ethtool_set_rx_csum,</div><div class='ctx'> 	.get_tx_csum		= ethtool_op_get_tx_csum,</div><div class='del'>-	.set_tx_csum		= efx_ethtool_set_tx_csum,</div><div class='add'>+	.set_tx_csum		= ethtool_op_set_tx_csum,</div><div class='ctx'> 	.get_sg			= ethtool_op_get_sg,</div><div class='ctx'> 	.set_sg			= ethtool_op_set_sg,</div><div class='ctx'> 	.get_tso		= ethtool_op_get_tso,</div><div class='del'>-	.set_tso		= efx_ethtool_set_tso,</div><div class='add'>+	.set_tso		= ethtool_op_set_tso,</div><div class='ctx'> 	.get_flags		= ethtool_op_get_flags,</div><div class='ctx'> 	.set_flags		= ethtool_op_set_flags,</div><div class='del'>-	.self_test_count	= efx_ethtool_self_test_count,</div><div class='add'>+	.get_sset_count		= efx_ethtool_get_sset_count,</div><div class='ctx'> 	.self_test		= efx_ethtool_self_test,</div><div class='ctx'> 	.get_strings		= efx_ethtool_get_strings,</div><div class='ctx'> 	.phys_id		= efx_ethtool_phys_id,</div><div class='del'>-	.get_stats_count	= efx_ethtool_get_stats_count,</div><div class='ctx'> 	.get_ethtool_stats	= efx_ethtool_get_stats,</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/net/sfc/falcon.c b/drivers/net/sfc/falcon.c<br/>index 9138ee5b7b7b..31ed1f49de00 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sfc/falcon.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/sfc/falcon.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sfc/falcon.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sfc/falcon.c</a></div><div class='hunk'>@@ -108,10 +108,10 @@ MODULE_PARM_DESC(rx_xon_thresh_bytes, "RX fifo XON threshold");</div><div class='ctx'> /* Max number of internal errors. After this resets will not be performed */</div><div class='ctx'> #define FALCON_MAX_INT_ERRORS 4</div><div class='ctx'> </div><div class='del'>-/* Maximum period that we wait for flush events. If the flush event</div><div class='del'>- * doesn't arrive in this period of time then we check if the queue</div><div class='del'>- * was disabled anyway. */</div><div class='del'>-#define FALCON_FLUSH_TIMEOUT 10 /* 10ms */</div><div class='add'>+/* We poll for events every FLUSH_INTERVAL ms, and check FLUSH_POLL_COUNT times</div><div class='add'>+ */</div><div class='add'>+#define FALCON_FLUSH_INTERVAL 10</div><div class='add'>+#define FALCON_FLUSH_POLL_COUNT 100</div><div class='ctx'> </div><div class='ctx'> /**************************************************************************</div><div class='ctx'>  *</div><div class='hunk'>@@ -242,7 +242,7 @@ static struct i2c_algo_bit_data falcon_i2c_bit_operations = {</div><div class='ctx'>  * falcon_alloc_special_buffer()) in Falcon's buffer table, allowing</div><div class='ctx'>  * it to be used for event queues, descriptor rings etc.</div><div class='ctx'>  */</div><div class='del'>-static int</div><div class='add'>+static void</div><div class='ctx'> falcon_init_special_buffer(struct efx_nic *efx,</div><div class='ctx'> 			   struct efx_special_buffer *buffer)</div><div class='ctx'> {</div><div class='hunk'>@@ -266,8 +266,6 @@ falcon_init_special_buffer(struct efx_nic *efx,</div><div class='ctx'> 				     BUF_OWNER_ID_FBUF, 0);</div><div class='ctx'> 		falcon_write_sram(efx, &amp;buf_desc, index);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Unmaps a buffer from Falcon and clears the buffer table entries */</div><div class='hunk'>@@ -449,16 +447,15 @@ int falcon_probe_tx(struct efx_tx_queue *tx_queue)</div><div class='ctx'> 					   sizeof(efx_qword_t));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int falcon_init_tx(struct efx_tx_queue *tx_queue)</div><div class='add'>+void falcon_init_tx(struct efx_tx_queue *tx_queue)</div><div class='ctx'> {</div><div class='ctx'> 	efx_oword_t tx_desc_ptr;</div><div class='ctx'> 	struct efx_nic *efx = tx_queue-&gt;efx;</div><div class='del'>-	int rc;</div><div class='add'>+</div><div class='add'>+	tx_queue-&gt;flushed = false;</div><div class='ctx'> </div><div class='ctx'> 	/* Pin TX descriptor ring */</div><div class='del'>-	rc = falcon_init_special_buffer(efx, &amp;tx_queue-&gt;txd);</div><div class='del'>-	if (rc)</div><div class='del'>-		return rc;</div><div class='add'>+	falcon_init_special_buffer(efx, &amp;tx_queue-&gt;txd);</div><div class='ctx'> </div><div class='ctx'> 	/* Push TX descriptor ring to card */</div><div class='ctx'> 	EFX_POPULATE_OWORD_10(tx_desc_ptr,</div><div class='hunk'>@@ -466,7 +463,7 @@ int falcon_init_tx(struct efx_tx_queue *tx_queue)</div><div class='ctx'> 			      TX_ISCSI_DDIG_EN, 0,</div><div class='ctx'> 			      TX_ISCSI_HDIG_EN, 0,</div><div class='ctx'> 			      TX_DESCQ_BUF_BASE_ID, tx_queue-&gt;txd.index,</div><div class='del'>-			      TX_DESCQ_EVQ_ID, tx_queue-&gt;channel-&gt;evqnum,</div><div class='add'>+			      TX_DESCQ_EVQ_ID, tx_queue-&gt;channel-&gt;channel,</div><div class='ctx'> 			      TX_DESCQ_OWNER_ID, 0,</div><div class='ctx'> 			      TX_DESCQ_LABEL, tx_queue-&gt;queue,</div><div class='ctx'> 			      TX_DESCQ_SIZE, FALCON_TXD_RING_ORDER,</div><div class='hunk'>@@ -474,9 +471,9 @@ int falcon_init_tx(struct efx_tx_queue *tx_queue)</div><div class='ctx'> 			      TX_NON_IP_DROP_DIS_B0, 1);</div><div class='ctx'> </div><div class='ctx'> 	if (falcon_rev(efx) &gt;= FALCON_REV_B0) {</div><div class='del'>-		int csum = !(efx-&gt;net_dev-&gt;features &amp; NETIF_F_IP_CSUM);</div><div class='del'>-		EFX_SET_OWORD_FIELD(tx_desc_ptr, TX_IP_CHKSM_DIS_B0, csum);</div><div class='del'>-		EFX_SET_OWORD_FIELD(tx_desc_ptr, TX_TCP_CHKSM_DIS_B0, csum);</div><div class='add'>+		int csum = tx_queue-&gt;queue == EFX_TX_QUEUE_OFFLOAD_CSUM;</div><div class='add'>+		EFX_SET_OWORD_FIELD(tx_desc_ptr, TX_IP_CHKSM_DIS_B0, !csum);</div><div class='add'>+		EFX_SET_OWORD_FIELD(tx_desc_ptr, TX_TCP_CHKSM_DIS_B0, !csum);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	falcon_write_table(efx, &amp;tx_desc_ptr, efx-&gt;type-&gt;txd_ptr_tbl_base,</div><div class='hunk'>@@ -485,73 +482,28 @@ int falcon_init_tx(struct efx_tx_queue *tx_queue)</div><div class='ctx'> 	if (falcon_rev(efx) &lt; FALCON_REV_B0) {</div><div class='ctx'> 		efx_oword_t reg;</div><div class='ctx'> </div><div class='del'>-		BUG_ON(tx_queue-&gt;queue &gt;= 128); /* HW limit */</div><div class='add'>+		/* Only 128 bits in this register */</div><div class='add'>+		BUILD_BUG_ON(EFX_TX_QUEUE_COUNT &gt;= 128);</div><div class='ctx'> </div><div class='ctx'> 		falcon_read(efx, &amp;reg, TX_CHKSM_CFG_REG_KER_A1);</div><div class='del'>-		if (efx-&gt;net_dev-&gt;features &amp; NETIF_F_IP_CSUM)</div><div class='add'>+		if (tx_queue-&gt;queue == EFX_TX_QUEUE_OFFLOAD_CSUM)</div><div class='ctx'> 			clear_bit_le(tx_queue-&gt;queue, (void *)&amp;reg);</div><div class='ctx'> 		else</div><div class='ctx'> 			set_bit_le(tx_queue-&gt;queue, (void *)&amp;reg);</div><div class='ctx'> 		falcon_write(efx, &amp;reg, TX_CHKSM_CFG_REG_KER_A1);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int falcon_flush_tx_queue(struct efx_tx_queue *tx_queue)</div><div class='add'>+static void falcon_flush_tx_queue(struct efx_tx_queue *tx_queue)</div><div class='ctx'> {</div><div class='ctx'> 	struct efx_nic *efx = tx_queue-&gt;efx;</div><div class='del'>-	struct efx_channel *channel = &amp;efx-&gt;channel[0];</div><div class='ctx'> 	efx_oword_t tx_flush_descq;</div><div class='del'>-	unsigned int read_ptr, i;</div><div class='ctx'> </div><div class='ctx'> 	/* Post a flush command */</div><div class='ctx'> 	EFX_POPULATE_OWORD_2(tx_flush_descq,</div><div class='ctx'> 			     TX_FLUSH_DESCQ_CMD, 1,</div><div class='ctx'> 			     TX_FLUSH_DESCQ, tx_queue-&gt;queue);</div><div class='ctx'> 	falcon_write(efx, &amp;tx_flush_descq, TX_FLUSH_DESCQ_REG_KER);</div><div class='del'>-	msleep(FALCON_FLUSH_TIMEOUT);</div><div class='del'>-</div><div class='del'>-	if (EFX_WORKAROUND_7803(efx))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* Look for a flush completed event */</div><div class='del'>-	read_ptr = channel-&gt;eventq_read_ptr;</div><div class='del'>-	for (i = 0; i &lt; FALCON_EVQ_SIZE; ++i) {</div><div class='del'>-		efx_qword_t *event = falcon_event(channel, read_ptr);</div><div class='del'>-		int ev_code, ev_sub_code, ev_queue;</div><div class='del'>-		if (!falcon_event_present(event))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		ev_code = EFX_QWORD_FIELD(*event, EV_CODE);</div><div class='del'>-		ev_sub_code = EFX_QWORD_FIELD(*event, DRIVER_EV_SUB_CODE);</div><div class='del'>-		ev_queue = EFX_QWORD_FIELD(*event, DRIVER_EV_TX_DESCQ_ID);</div><div class='del'>-		if ((ev_sub_code == TX_DESCQ_FLS_DONE_EV_DECODE) &amp;&amp;</div><div class='del'>-		    (ev_queue == tx_queue-&gt;queue)) {</div><div class='del'>-			EFX_LOG(efx, "tx queue %d flush command succesful\n",</div><div class='del'>-				tx_queue-&gt;queue);</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		read_ptr = (read_ptr + 1) &amp; FALCON_EVQ_MASK;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (EFX_WORKAROUND_11557(efx)) {</div><div class='del'>-		efx_oword_t reg;</div><div class='del'>-		int enabled;</div><div class='del'>-</div><div class='del'>-		falcon_read_table(efx, &amp;reg, efx-&gt;type-&gt;txd_ptr_tbl_base,</div><div class='del'>-				  tx_queue-&gt;queue);</div><div class='del'>-		enabled = EFX_OWORD_FIELD(reg, TX_DESCQ_EN);</div><div class='del'>-		if (!enabled) {</div><div class='del'>-			EFX_LOG(efx, "tx queue %d disabled without a "</div><div class='del'>-				"flush event seen\n", tx_queue-&gt;queue);</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	EFX_ERR(efx, "tx queue %d flush command timed out\n", tx_queue-&gt;queue);</div><div class='del'>-	return -ETIMEDOUT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void falcon_fini_tx(struct efx_tx_queue *tx_queue)</div><div class='hunk'>@@ -559,9 +511,8 @@ void falcon_fini_tx(struct efx_tx_queue *tx_queue)</div><div class='ctx'> 	struct efx_nic *efx = tx_queue-&gt;efx;</div><div class='ctx'> 	efx_oword_t tx_desc_ptr;</div><div class='ctx'> </div><div class='del'>-	/* Stop the hardware using the queue */</div><div class='del'>-	if (falcon_flush_tx_queue(tx_queue))</div><div class='del'>-		EFX_ERR(efx, "failed to flush tx queue %d\n", tx_queue-&gt;queue);</div><div class='add'>+	/* The queue should have been flushed */</div><div class='add'>+	WARN_ON(!tx_queue-&gt;flushed);</div><div class='ctx'> </div><div class='ctx'> 	/* Remove TX descriptor ring from card */</div><div class='ctx'> 	EFX_ZERO_OWORD(tx_desc_ptr);</div><div class='hunk'>@@ -638,29 +589,28 @@ int falcon_probe_rx(struct efx_rx_queue *rx_queue)</div><div class='ctx'> 					   sizeof(efx_qword_t));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int falcon_init_rx(struct efx_rx_queue *rx_queue)</div><div class='add'>+void falcon_init_rx(struct efx_rx_queue *rx_queue)</div><div class='ctx'> {</div><div class='ctx'> 	efx_oword_t rx_desc_ptr;</div><div class='ctx'> 	struct efx_nic *efx = rx_queue-&gt;efx;</div><div class='del'>-	int rc;</div><div class='del'>-	int is_b0 = falcon_rev(efx) &gt;= FALCON_REV_B0;</div><div class='del'>-	int iscsi_digest_en = is_b0;</div><div class='add'>+	bool is_b0 = falcon_rev(efx) &gt;= FALCON_REV_B0;</div><div class='add'>+	bool iscsi_digest_en = is_b0;</div><div class='ctx'> </div><div class='ctx'> 	EFX_LOG(efx, "RX queue %d ring in special buffers %d-%d\n",</div><div class='ctx'> 		rx_queue-&gt;queue, rx_queue-&gt;rxd.index,</div><div class='ctx'> 		rx_queue-&gt;rxd.index + rx_queue-&gt;rxd.entries - 1);</div><div class='ctx'> </div><div class='add'>+	rx_queue-&gt;flushed = false;</div><div class='add'>+</div><div class='ctx'> 	/* Pin RX descriptor ring */</div><div class='del'>-	rc = falcon_init_special_buffer(efx, &amp;rx_queue-&gt;rxd);</div><div class='del'>-	if (rc)</div><div class='del'>-		return rc;</div><div class='add'>+	falcon_init_special_buffer(efx, &amp;rx_queue-&gt;rxd);</div><div class='ctx'> </div><div class='ctx'> 	/* Push RX descriptor ring to card */</div><div class='ctx'> 	EFX_POPULATE_OWORD_10(rx_desc_ptr,</div><div class='ctx'> 			      RX_ISCSI_DDIG_EN, iscsi_digest_en,</div><div class='ctx'> 			      RX_ISCSI_HDIG_EN, iscsi_digest_en,</div><div class='ctx'> 			      RX_DESCQ_BUF_BASE_ID, rx_queue-&gt;rxd.index,</div><div class='del'>-			      RX_DESCQ_EVQ_ID, rx_queue-&gt;channel-&gt;evqnum,</div><div class='add'>+			      RX_DESCQ_EVQ_ID, rx_queue-&gt;channel-&gt;channel,</div><div class='ctx'> 			      RX_DESCQ_OWNER_ID, 0,</div><div class='ctx'> 			      RX_DESCQ_LABEL, rx_queue-&gt;queue,</div><div class='ctx'> 			      RX_DESCQ_SIZE, FALCON_RXD_RING_ORDER,</div><div class='hunk'>@@ -670,14 +620,11 @@ int falcon_init_rx(struct efx_rx_queue *rx_queue)</div><div class='ctx'> 			      RX_DESCQ_EN, 1);</div><div class='ctx'> 	falcon_write_table(efx, &amp;rx_desc_ptr, efx-&gt;type-&gt;rxd_ptr_tbl_base,</div><div class='ctx'> 			   rx_queue-&gt;queue);</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int falcon_flush_rx_queue(struct efx_rx_queue *rx_queue)</div><div class='add'>+static void falcon_flush_rx_queue(struct efx_rx_queue *rx_queue)</div><div class='ctx'> {</div><div class='ctx'> 	struct efx_nic *efx = rx_queue-&gt;efx;</div><div class='del'>-	struct efx_channel *channel = &amp;efx-&gt;channel[0];</div><div class='del'>-	unsigned int read_ptr, i;</div><div class='ctx'> 	efx_oword_t rx_flush_descq;</div><div class='ctx'> </div><div class='ctx'> 	/* Post a flush command */</div><div class='hunk'>@@ -685,75 +632,15 @@ static int falcon_flush_rx_queue(struct efx_rx_queue *rx_queue)</div><div class='ctx'> 			     RX_FLUSH_DESCQ_CMD, 1,</div><div class='ctx'> 			     RX_FLUSH_DESCQ, rx_queue-&gt;queue);</div><div class='ctx'> 	falcon_write(efx, &amp;rx_flush_descq, RX_FLUSH_DESCQ_REG_KER);</div><div class='del'>-	msleep(FALCON_FLUSH_TIMEOUT);</div><div class='del'>-</div><div class='del'>-	if (EFX_WORKAROUND_7803(efx))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* Look for a flush completed event */</div><div class='del'>-	read_ptr = channel-&gt;eventq_read_ptr;</div><div class='del'>-	for (i = 0; i &lt; FALCON_EVQ_SIZE; ++i) {</div><div class='del'>-		efx_qword_t *event = falcon_event(channel, read_ptr);</div><div class='del'>-		int ev_code, ev_sub_code, ev_queue, ev_failed;</div><div class='del'>-		if (!falcon_event_present(event))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		ev_code = EFX_QWORD_FIELD(*event, EV_CODE);</div><div class='del'>-		ev_sub_code = EFX_QWORD_FIELD(*event, DRIVER_EV_SUB_CODE);</div><div class='del'>-		ev_queue = EFX_QWORD_FIELD(*event, DRIVER_EV_RX_DESCQ_ID);</div><div class='del'>-		ev_failed = EFX_QWORD_FIELD(*event, DRIVER_EV_RX_FLUSH_FAIL);</div><div class='del'>-</div><div class='del'>-		if ((ev_sub_code == RX_DESCQ_FLS_DONE_EV_DECODE) &amp;&amp;</div><div class='del'>-		    (ev_queue == rx_queue-&gt;queue)) {</div><div class='del'>-			if (ev_failed) {</div><div class='del'>-				EFX_INFO(efx, "rx queue %d flush command "</div><div class='del'>-					 "failed\n", rx_queue-&gt;queue);</div><div class='del'>-				return -EAGAIN;</div><div class='del'>-			} else {</div><div class='del'>-				EFX_LOG(efx, "rx queue %d flush command "</div><div class='del'>-					"succesful\n", rx_queue-&gt;queue);</div><div class='del'>-				return 0;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		read_ptr = (read_ptr + 1) &amp; FALCON_EVQ_MASK;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (EFX_WORKAROUND_11557(efx)) {</div><div class='del'>-		efx_oword_t reg;</div><div class='del'>-		int enabled;</div><div class='del'>-</div><div class='del'>-		falcon_read_table(efx, &amp;reg, efx-&gt;type-&gt;rxd_ptr_tbl_base,</div><div class='del'>-				  rx_queue-&gt;queue);</div><div class='del'>-		enabled = EFX_OWORD_FIELD(reg, RX_DESCQ_EN);</div><div class='del'>-		if (!enabled) {</div><div class='del'>-			EFX_LOG(efx, "rx queue %d disabled without a "</div><div class='del'>-				"flush event seen\n", rx_queue-&gt;queue);</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	EFX_ERR(efx, "rx queue %d flush command timed out\n", rx_queue-&gt;queue);</div><div class='del'>-	return -ETIMEDOUT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void falcon_fini_rx(struct efx_rx_queue *rx_queue)</div><div class='ctx'> {</div><div class='ctx'> 	efx_oword_t rx_desc_ptr;</div><div class='ctx'> 	struct efx_nic *efx = rx_queue-&gt;efx;</div><div class='del'>-	int i, rc;</div><div class='ctx'> </div><div class='del'>-	/* Try and flush the rx queue. This may need to be repeated */</div><div class='del'>-	for (i = 0; i &lt; 5; i++) {</div><div class='del'>-		rc = falcon_flush_rx_queue(rx_queue);</div><div class='del'>-		if (rc == -EAGAIN)</div><div class='del'>-			continue;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	if (rc) {</div><div class='del'>-		EFX_ERR(efx, "failed to flush rx queue %d\n", rx_queue-&gt;queue);</div><div class='del'>-		efx_schedule_reset(efx, RESET_TYPE_INVISIBLE);</div><div class='del'>-	}</div><div class='add'>+	/* The queue should already have been flushed */</div><div class='add'>+	WARN_ON(!rx_queue-&gt;flushed);</div><div class='ctx'> </div><div class='ctx'> 	/* Remove RX descriptor ring from card */</div><div class='ctx'> 	EFX_ZERO_OWORD(rx_desc_ptr);</div><div class='hunk'>@@ -793,7 +680,7 @@ void falcon_eventq_read_ack(struct efx_channel *channel)</div><div class='ctx'> </div><div class='ctx'> 	EFX_POPULATE_DWORD_1(reg, EVQ_RPTR_DWORD, channel-&gt;eventq_read_ptr);</div><div class='ctx'> 	falcon_writel_table(efx, &amp;reg, efx-&gt;type-&gt;evq_rptr_tbl_base,</div><div class='del'>-			    channel-&gt;evqnum);</div><div class='add'>+			    channel-&gt;channel);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Use HW to insert a SW defined event */</div><div class='hunk'>@@ -802,7 +689,7 @@ void falcon_generate_event(struct efx_channel *channel, efx_qword_t *event)</div><div class='ctx'> 	efx_oword_t drv_ev_reg;</div><div class='ctx'> </div><div class='ctx'> 	EFX_POPULATE_OWORD_2(drv_ev_reg,</div><div class='del'>-			     DRV_EV_QID, channel-&gt;evqnum,</div><div class='add'>+			     DRV_EV_QID, channel-&gt;channel,</div><div class='ctx'> 			     DRV_EV_DATA,</div><div class='ctx'> 			     EFX_QWORD_FIELD64(*event, WHOLE_EVENT));</div><div class='ctx'> 	falcon_write(channel-&gt;efx, &amp;drv_ev_reg, DRV_EV_REG_KER);</div><div class='hunk'>@@ -813,8 +700,8 @@ void falcon_generate_event(struct efx_channel *channel, efx_qword_t *event)</div><div class='ctx'>  * Falcon batches TX completion events; the message we receive is of</div><div class='ctx'>  * the form "complete all TX events up to this index".</div><div class='ctx'>  */</div><div class='del'>-static inline void falcon_handle_tx_event(struct efx_channel *channel,</div><div class='del'>-					  efx_qword_t *event)</div><div class='add'>+static void falcon_handle_tx_event(struct efx_channel *channel,</div><div class='add'>+				   efx_qword_t *event)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int tx_ev_desc_ptr;</div><div class='ctx'> 	unsigned int tx_ev_q_label;</div><div class='hunk'>@@ -847,39 +734,19 @@ static inline void falcon_handle_tx_event(struct efx_channel *channel,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Check received packet's destination MAC address. */</div><div class='del'>-static int check_dest_mac(struct efx_rx_queue *rx_queue,</div><div class='del'>-			  const efx_qword_t *event)</div><div class='del'>-{</div><div class='del'>-	struct efx_rx_buffer *rx_buf;</div><div class='del'>-	struct efx_nic *efx = rx_queue-&gt;efx;</div><div class='del'>-	int rx_ev_desc_ptr;</div><div class='del'>-	struct ethhdr *eh;</div><div class='del'>-</div><div class='del'>-	if (efx-&gt;promiscuous)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	rx_ev_desc_ptr = EFX_QWORD_FIELD(*event, RX_EV_DESC_PTR);</div><div class='del'>-	rx_buf = efx_rx_buffer(rx_queue, rx_ev_desc_ptr);</div><div class='del'>-	eh = (struct ethhdr *)rx_buf-&gt;data;</div><div class='del'>-	if (memcmp(eh-&gt;h_dest, efx-&gt;net_dev-&gt;dev_addr, ETH_ALEN))</div><div class='del'>-		return 0;</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* Detect errors included in the rx_evt_pkt_ok bit. */</div><div class='ctx'> static void falcon_handle_rx_not_ok(struct efx_rx_queue *rx_queue,</div><div class='ctx'> 				    const efx_qword_t *event,</div><div class='del'>-				    unsigned *rx_ev_pkt_ok,</div><div class='del'>-				    int *discard, int byte_count)</div><div class='add'>+				    bool *rx_ev_pkt_ok,</div><div class='add'>+				    bool *discard)</div><div class='ctx'> {</div><div class='ctx'> 	struct efx_nic *efx = rx_queue-&gt;efx;</div><div class='del'>-	unsigned rx_ev_buf_owner_id_err, rx_ev_ip_hdr_chksum_err;</div><div class='del'>-	unsigned rx_ev_tcp_udp_chksum_err, rx_ev_eth_crc_err;</div><div class='del'>-	unsigned rx_ev_frm_trunc, rx_ev_drib_nib, rx_ev_tobe_disc;</div><div class='del'>-	unsigned rx_ev_pkt_type, rx_ev_other_err, rx_ev_pause_frm;</div><div class='del'>-	unsigned rx_ev_ip_frag_err, rx_ev_hdr_type, rx_ev_mcast_pkt;</div><div class='del'>-	int snap, non_ip;</div><div class='add'>+	bool rx_ev_buf_owner_id_err, rx_ev_ip_hdr_chksum_err;</div><div class='add'>+	bool rx_ev_tcp_udp_chksum_err, rx_ev_eth_crc_err;</div><div class='add'>+	bool rx_ev_frm_trunc, rx_ev_drib_nib, rx_ev_tobe_disc;</div><div class='add'>+	bool rx_ev_other_err, rx_ev_pause_frm;</div><div class='add'>+	bool rx_ev_ip_frag_err, rx_ev_hdr_type, rx_ev_mcast_pkt;</div><div class='add'>+	unsigned rx_ev_pkt_type;</div><div class='ctx'> </div><div class='ctx'> 	rx_ev_hdr_type = EFX_QWORD_FIELD(*event, RX_EV_HDR_TYPE);</div><div class='ctx'> 	rx_ev_mcast_pkt = EFX_QWORD_FIELD(*event, RX_EV_MCAST_PKT);</div><div class='hunk'>@@ -903,41 +770,6 @@ static void falcon_handle_rx_not_ok(struct efx_rx_queue *rx_queue,</div><div class='ctx'> 			   rx_ev_buf_owner_id_err | rx_ev_eth_crc_err |</div><div class='ctx'> 			   rx_ev_frm_trunc | rx_ev_ip_hdr_chksum_err);</div><div class='ctx'> </div><div class='del'>-	snap = (rx_ev_pkt_type == RX_EV_PKT_TYPE_LLC_DECODE) ||</div><div class='del'>-		(rx_ev_pkt_type == RX_EV_PKT_TYPE_VLAN_LLC_DECODE);</div><div class='del'>-	non_ip = (rx_ev_hdr_type == RX_EV_HDR_TYPE_NON_IP_DECODE);</div><div class='del'>-</div><div class='del'>-	/* SFC bug 5475/8970: The Falcon XMAC incorrectly calculates the</div><div class='del'>-	 * length field of an LLC frame, which sets TOBE_DISC. We could set</div><div class='del'>-	 * PASS_LEN_ERR, but we want the MAC to filter out short frames (to</div><div class='del'>-	 * protect the RX block).</div><div class='del'>-	 *</div><div class='del'>-	 * bug5475 - LLC/SNAP: Falcon identifies SNAP packets.</div><div class='del'>-	 * bug8970 - LLC/noSNAP: Falcon does not provide an LLC flag.</div><div class='del'>-	 *                       LLC can't encapsulate IP, so by definition</div><div class='del'>-	 *                       these packets are NON_IP.</div><div class='del'>-	 *</div><div class='del'>-	 * Unicast mismatch will also cause TOBE_DISC, so the driver needs</div><div class='del'>-	 * to check this.</div><div class='del'>-	 */</div><div class='del'>-	if (EFX_WORKAROUND_5475(efx) &amp;&amp; rx_ev_tobe_disc &amp;&amp; (snap || non_ip)) {</div><div class='del'>-		/* If all the other flags are zero then we can state the</div><div class='del'>-		 * entire packet is ok, which will flag to the kernel not</div><div class='del'>-		 * to recalculate checksums.</div><div class='del'>-		 */</div><div class='del'>-		if (!(non_ip | rx_ev_other_err | rx_ev_pause_frm))</div><div class='del'>-			*rx_ev_pkt_ok = 1;</div><div class='del'>-</div><div class='del'>-		rx_ev_tobe_disc = 0;</div><div class='del'>-</div><div class='del'>-		/* TOBE_DISC is set for unicast mismatch.  But given that</div><div class='del'>-		 * we can't trust TOBE_DISC here, we must validate the dest</div><div class='del'>-		 * MAC address ourselves.</div><div class='del'>-		 */</div><div class='del'>-		if (!rx_ev_mcast_pkt &amp;&amp; !check_dest_mac(rx_queue, event))</div><div class='del'>-			rx_ev_tobe_disc = 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* Count errors that are not in MAC stats. */</div><div class='ctx'> 	if (rx_ev_frm_trunc)</div><div class='ctx'> 		++rx_queue-&gt;channel-&gt;n_rx_frm_trunc;</div><div class='hunk'>@@ -961,7 +793,7 @@ static void falcon_handle_rx_not_ok(struct efx_rx_queue *rx_queue,</div><div class='ctx'> #ifdef EFX_ENABLE_DEBUG</div><div class='ctx'> 	if (rx_ev_other_err) {</div><div class='ctx'> 		EFX_INFO_RL(efx, " RX queue %d unexpected RX event "</div><div class='del'>-			    EFX_QWORD_FMT "%s%s%s%s%s%s%s%s%s\n",</div><div class='add'>+			    EFX_QWORD_FMT "%s%s%s%s%s%s%s%s\n",</div><div class='ctx'> 			    rx_queue-&gt;queue, EFX_QWORD_VAL(*event),</div><div class='ctx'> 			    rx_ev_buf_owner_id_err ? " [OWNER_ID_ERR]" : "",</div><div class='ctx'> 			    rx_ev_ip_hdr_chksum_err ?</div><div class='hunk'>@@ -972,8 +804,7 @@ static void falcon_handle_rx_not_ok(struct efx_rx_queue *rx_queue,</div><div class='ctx'> 			    rx_ev_frm_trunc ? " [FRM_TRUNC]" : "",</div><div class='ctx'> 			    rx_ev_drib_nib ? " [DRIB_NIB]" : "",</div><div class='ctx'> 			    rx_ev_tobe_disc ? " [TOBE_DISC]" : "",</div><div class='del'>-			    rx_ev_pause_frm ? " [PAUSE]" : "",</div><div class='del'>-			    snap ? " [SNAP/LLC]" : "");</div><div class='add'>+			    rx_ev_pause_frm ? " [PAUSE]" : "");</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -1006,13 +837,13 @@ static void falcon_handle_rx_bad_index(struct efx_rx_queue *rx_queue,</div><div class='ctx'>  * Also "is multicast" and "matches multicast filter" flags can be used to</div><div class='ctx'>  * discard non-matching multicast packets.</div><div class='ctx'>  */</div><div class='del'>-static inline int falcon_handle_rx_event(struct efx_channel *channel,</div><div class='del'>-					 const efx_qword_t *event)</div><div class='add'>+static void falcon_handle_rx_event(struct efx_channel *channel,</div><div class='add'>+				   const efx_qword_t *event)</div><div class='ctx'> {</div><div class='del'>-	unsigned int rx_ev_q_label, rx_ev_desc_ptr, rx_ev_byte_cnt;</div><div class='del'>-	unsigned int rx_ev_pkt_ok, rx_ev_hdr_type, rx_ev_mcast_pkt;</div><div class='add'>+	unsigned int rx_ev_desc_ptr, rx_ev_byte_cnt;</div><div class='add'>+	unsigned int rx_ev_hdr_type, rx_ev_mcast_pkt;</div><div class='ctx'> 	unsigned expected_ptr;</div><div class='del'>-	int discard = 0, checksummed;</div><div class='add'>+	bool rx_ev_pkt_ok, discard = false, checksummed;</div><div class='ctx'> 	struct efx_rx_queue *rx_queue;</div><div class='ctx'> 	struct efx_nic *efx = channel-&gt;efx;</div><div class='ctx'> </div><div class='hunk'>@@ -1022,16 +853,14 @@ static inline int falcon_handle_rx_event(struct efx_channel *channel,</div><div class='ctx'> 	rx_ev_hdr_type = EFX_QWORD_FIELD(*event, RX_EV_HDR_TYPE);</div><div class='ctx'> 	WARN_ON(EFX_QWORD_FIELD(*event, RX_EV_JUMBO_CONT));</div><div class='ctx'> 	WARN_ON(EFX_QWORD_FIELD(*event, RX_EV_SOP) != 1);</div><div class='add'>+	WARN_ON(EFX_QWORD_FIELD(*event, RX_EV_Q_LABEL) != channel-&gt;channel);</div><div class='ctx'> </div><div class='del'>-	rx_ev_q_label = EFX_QWORD_FIELD(*event, RX_EV_Q_LABEL);</div><div class='del'>-	rx_queue = &amp;efx-&gt;rx_queue[rx_ev_q_label];</div><div class='add'>+	rx_queue = &amp;efx-&gt;rx_queue[channel-&gt;channel];</div><div class='ctx'> </div><div class='ctx'> 	rx_ev_desc_ptr = EFX_QWORD_FIELD(*event, RX_EV_DESC_PTR);</div><div class='ctx'> 	expected_ptr = rx_queue-&gt;removed_count &amp; FALCON_RXD_RING_MASK;</div><div class='del'>-	if (unlikely(rx_ev_desc_ptr != expected_ptr)) {</div><div class='add'>+	if (unlikely(rx_ev_desc_ptr != expected_ptr))</div><div class='ctx'> 		falcon_handle_rx_bad_index(rx_queue, rx_ev_desc_ptr);</div><div class='del'>-		return rx_ev_q_label;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	if (likely(rx_ev_pkt_ok)) {</div><div class='ctx'> 		/* If packet is marked as OK and packet type is TCP/IPv4 or</div><div class='hunk'>@@ -1040,8 +869,8 @@ static inline int falcon_handle_rx_event(struct efx_channel *channel,</div><div class='ctx'> 		checksummed = RX_EV_HDR_TYPE_HAS_CHECKSUMS(rx_ev_hdr_type);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		falcon_handle_rx_not_ok(rx_queue, event, &amp;rx_ev_pkt_ok,</div><div class='del'>-					&amp;discard, rx_ev_byte_cnt);</div><div class='del'>-		checksummed = 0;</div><div class='add'>+					&amp;discard);</div><div class='add'>+		checksummed = false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Detect multicast packets that didn't match the filter */</div><div class='hunk'>@@ -1051,14 +880,12 @@ static inline int falcon_handle_rx_event(struct efx_channel *channel,</div><div class='ctx'> 			EFX_QWORD_FIELD(*event, RX_EV_MCAST_HASH_MATCH);</div><div class='ctx'> </div><div class='ctx'> 		if (unlikely(!rx_ev_mcast_hash_match))</div><div class='del'>-			discard = 1;</div><div class='add'>+			discard = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Handle received packet */</div><div class='ctx'> 	efx_rx_packet(rx_queue, rx_ev_desc_ptr, rx_ev_byte_cnt,</div><div class='ctx'> 		      checksummed, discard);</div><div class='del'>-</div><div class='del'>-	return rx_ev_q_label;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Global events are basically PHY events */</div><div class='hunk'>@@ -1066,23 +893,23 @@ static void falcon_handle_global_event(struct efx_channel *channel,</div><div class='ctx'> 				       efx_qword_t *event)</div><div class='ctx'> {</div><div class='ctx'> 	struct efx_nic *efx = channel-&gt;efx;</div><div class='del'>-	int is_phy_event = 0, handled = 0;</div><div class='add'>+	bool is_phy_event = false, handled = false;</div><div class='ctx'> </div><div class='ctx'> 	/* Check for interrupt on either port.  Some boards have a</div><div class='ctx'> 	 * single PHY wired to the interrupt line for port 1. */</div><div class='ctx'> 	if (EFX_QWORD_FIELD(*event, G_PHY0_INTR) ||</div><div class='ctx'> 	    EFX_QWORD_FIELD(*event, G_PHY1_INTR) ||</div><div class='ctx'> 	    EFX_QWORD_FIELD(*event, XG_PHY_INTR))</div><div class='del'>-		is_phy_event = 1;</div><div class='add'>+		is_phy_event = true;</div><div class='ctx'> </div><div class='ctx'> 	if ((falcon_rev(efx) &gt;= FALCON_REV_B0) &amp;&amp;</div><div class='del'>-	    EFX_OWORD_FIELD(*event, XG_MNT_INTR_B0))</div><div class='del'>-		is_phy_event = 1;</div><div class='add'>+	    EFX_QWORD_FIELD(*event, XG_MNT_INTR_B0))</div><div class='add'>+		is_phy_event = true;</div><div class='ctx'> </div><div class='ctx'> 	if (is_phy_event) {</div><div class='ctx'> 		efx-&gt;phy_op-&gt;clear_interrupt(efx);</div><div class='ctx'> 		queue_work(efx-&gt;workqueue, &amp;efx-&gt;reconfigure_work);</div><div class='del'>-		handled = 1;</div><div class='add'>+		handled = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (EFX_QWORD_FIELD_VER(efx, *event, RX_RECOVERY)) {</div><div class='hunk'>@@ -1092,7 +919,7 @@ static void falcon_handle_global_event(struct efx_channel *channel,</div><div class='ctx'> 		atomic_inc(&amp;efx-&gt;rx_reset);</div><div class='ctx'> 		efx_schedule_reset(efx, EFX_WORKAROUND_6555(efx) ?</div><div class='ctx'> 				   RESET_TYPE_RX_RECOVERY : RESET_TYPE_DISABLE);</div><div class='del'>-		handled = 1;</div><div class='add'>+		handled = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!handled)</div><div class='hunk'>@@ -1163,13 +990,12 @@ static void falcon_handle_driver_event(struct efx_channel *channel,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int falcon_process_eventq(struct efx_channel *channel, int *rx_quota)</div><div class='add'>+int falcon_process_eventq(struct efx_channel *channel, int rx_quota)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int read_ptr;</div><div class='ctx'> 	efx_qword_t event, *p_event;</div><div class='ctx'> 	int ev_code;</div><div class='del'>-	int rxq;</div><div class='del'>-	int rxdmaqs = 0;</div><div class='add'>+	int rx_packets = 0;</div><div class='ctx'> </div><div class='ctx'> 	read_ptr = channel-&gt;eventq_read_ptr;</div><div class='ctx'> </div><div class='hunk'>@@ -1191,9 +1017,8 @@ int falcon_process_eventq(struct efx_channel *channel, int *rx_quota)</div><div class='ctx'> </div><div class='ctx'> 		switch (ev_code) {</div><div class='ctx'> 		case RX_IP_EV_DECODE:</div><div class='del'>-			rxq = falcon_handle_rx_event(channel, &amp;event);</div><div class='del'>-			rxdmaqs |= (1 &lt;&lt; rxq);</div><div class='del'>-			(*rx_quota)--;</div><div class='add'>+			falcon_handle_rx_event(channel, &amp;event);</div><div class='add'>+			++rx_packets;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case TX_IP_EV_DECODE:</div><div class='ctx'> 			falcon_handle_tx_event(channel, &amp;event);</div><div class='hunk'>@@ -1220,10 +1045,10 @@ int falcon_process_eventq(struct efx_channel *channel, int *rx_quota)</div><div class='ctx'> 		/* Increment read pointer */</div><div class='ctx'> 		read_ptr = (read_ptr + 1) &amp; FALCON_EVQ_MASK;</div><div class='ctx'> </div><div class='del'>-	} while (*rx_quota);</div><div class='add'>+	} while (rx_packets &lt; rx_quota);</div><div class='ctx'> </div><div class='ctx'> 	channel-&gt;eventq_read_ptr = read_ptr;</div><div class='del'>-	return rxdmaqs;</div><div class='add'>+	return rx_packets;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void falcon_set_int_moderation(struct efx_channel *channel)</div><div class='hunk'>@@ -1251,7 +1076,7 @@ void falcon_set_int_moderation(struct efx_channel *channel)</div><div class='ctx'> 				     TIMER_VAL, 0);</div><div class='ctx'> 	}</div><div class='ctx'> 	falcon_writel_page_locked(efx, &amp;timer_cmd, TIMER_CMD_REG_KER,</div><div class='del'>-				  channel-&gt;evqnum);</div><div class='add'>+				  channel-&gt;channel);</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1265,20 +1090,17 @@ int falcon_probe_eventq(struct efx_channel *channel)</div><div class='ctx'> 	return falcon_alloc_special_buffer(efx, &amp;channel-&gt;eventq, evq_size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int falcon_init_eventq(struct efx_channel *channel)</div><div class='add'>+void falcon_init_eventq(struct efx_channel *channel)</div><div class='ctx'> {</div><div class='ctx'> 	efx_oword_t evq_ptr;</div><div class='ctx'> 	struct efx_nic *efx = channel-&gt;efx;</div><div class='del'>-	int rc;</div><div class='ctx'> </div><div class='ctx'> 	EFX_LOG(efx, "channel %d event queue in special buffers %d-%d\n",</div><div class='ctx'> 		channel-&gt;channel, channel-&gt;eventq.index,</div><div class='ctx'> 		channel-&gt;eventq.index + channel-&gt;eventq.entries - 1);</div><div class='ctx'> </div><div class='ctx'> 	/* Pin event queue buffer */</div><div class='del'>-	rc = falcon_init_special_buffer(efx, &amp;channel-&gt;eventq);</div><div class='del'>-	if (rc)</div><div class='del'>-		return rc;</div><div class='add'>+	falcon_init_special_buffer(efx, &amp;channel-&gt;eventq);</div><div class='ctx'> </div><div class='ctx'> 	/* Fill event queue with all ones (i.e. empty events) */</div><div class='ctx'> 	memset(channel-&gt;eventq.addr, 0xff, channel-&gt;eventq.len);</div><div class='hunk'>@@ -1289,11 +1111,9 @@ int falcon_init_eventq(struct efx_channel *channel)</div><div class='ctx'> 			     EVQ_SIZE, FALCON_EVQ_ORDER,</div><div class='ctx'> 			     EVQ_BUF_BASE_ID, channel-&gt;eventq.index);</div><div class='ctx'> 	falcon_write_table(efx, &amp;evq_ptr, efx-&gt;type-&gt;evq_ptr_tbl_base,</div><div class='del'>-			   channel-&gt;evqnum);</div><div class='add'>+			   channel-&gt;channel);</div><div class='ctx'> </div><div class='ctx'> 	falcon_set_int_moderation(channel);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void falcon_fini_eventq(struct efx_channel *channel)</div><div class='hunk'>@@ -1304,7 +1124,7 @@ void falcon_fini_eventq(struct efx_channel *channel)</div><div class='ctx'> 	/* Remove event queue from card */</div><div class='ctx'> 	EFX_ZERO_OWORD(eventq_ptr);</div><div class='ctx'> 	falcon_write_table(efx, &amp;eventq_ptr, efx-&gt;type-&gt;evq_ptr_tbl_base,</div><div class='del'>-			   channel-&gt;evqnum);</div><div class='add'>+			   channel-&gt;channel);</div><div class='ctx'> </div><div class='ctx'> 	/* Unpin event queue */</div><div class='ctx'> 	falcon_fini_special_buffer(efx, &amp;channel-&gt;eventq);</div><div class='hunk'>@@ -1331,6 +1151,121 @@ void falcon_generate_test_event(struct efx_channel *channel, unsigned int magic)</div><div class='ctx'> 	falcon_generate_event(channel, &amp;test_event);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * Flush handling</div><div class='add'>+ *</div><div class='add'>+ **************************************************************************/</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void falcon_poll_flush_events(struct efx_nic *efx)</div><div class='add'>+{</div><div class='add'>+	struct efx_channel *channel = &amp;efx-&gt;channel[0];</div><div class='add'>+	struct efx_tx_queue *tx_queue;</div><div class='add'>+	struct efx_rx_queue *rx_queue;</div><div class='add'>+	unsigned int read_ptr, i;</div><div class='add'>+</div><div class='add'>+	read_ptr = channel-&gt;eventq_read_ptr;</div><div class='add'>+	for (i = 0; i &lt; FALCON_EVQ_SIZE; ++i) {</div><div class='add'>+		efx_qword_t *event = falcon_event(channel, read_ptr);</div><div class='add'>+		int ev_code, ev_sub_code, ev_queue;</div><div class='add'>+		bool ev_failed;</div><div class='add'>+		if (!falcon_event_present(event))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		ev_code = EFX_QWORD_FIELD(*event, EV_CODE);</div><div class='add'>+		if (ev_code != DRIVER_EV_DECODE)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ev_sub_code = EFX_QWORD_FIELD(*event, DRIVER_EV_SUB_CODE);</div><div class='add'>+		switch (ev_sub_code) {</div><div class='add'>+		case TX_DESCQ_FLS_DONE_EV_DECODE:</div><div class='add'>+			ev_queue = EFX_QWORD_FIELD(*event,</div><div class='add'>+						   DRIVER_EV_TX_DESCQ_ID);</div><div class='add'>+			if (ev_queue &lt; EFX_TX_QUEUE_COUNT) {</div><div class='add'>+				tx_queue = efx-&gt;tx_queue + ev_queue;</div><div class='add'>+				tx_queue-&gt;flushed = true;</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		case RX_DESCQ_FLS_DONE_EV_DECODE:</div><div class='add'>+			ev_queue = EFX_QWORD_FIELD(*event,</div><div class='add'>+						   DRIVER_EV_RX_DESCQ_ID);</div><div class='add'>+			ev_failed = EFX_QWORD_FIELD(*event,</div><div class='add'>+						    DRIVER_EV_RX_FLUSH_FAIL);</div><div class='add'>+			if (ev_queue &lt; efx-&gt;n_rx_queues) {</div><div class='add'>+				rx_queue = efx-&gt;rx_queue + ev_queue;</div><div class='add'>+</div><div class='add'>+				/* retry the rx flush */</div><div class='add'>+				if (ev_failed)</div><div class='add'>+					falcon_flush_rx_queue(rx_queue);</div><div class='add'>+				else</div><div class='add'>+					rx_queue-&gt;flushed = true;</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		read_ptr = (read_ptr + 1) &amp; FALCON_EVQ_MASK;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Handle tx and rx flushes at the same time, since they run in</div><div class='add'>+ * parallel in the hardware and there's no reason for us to</div><div class='add'>+ * serialise them */</div><div class='add'>+int falcon_flush_queues(struct efx_nic *efx)</div><div class='add'>+{</div><div class='add'>+	struct efx_rx_queue *rx_queue;</div><div class='add'>+	struct efx_tx_queue *tx_queue;</div><div class='add'>+	int i;</div><div class='add'>+	bool outstanding;</div><div class='add'>+</div><div class='add'>+	/* Issue flush requests */</div><div class='add'>+	efx_for_each_tx_queue(tx_queue, efx) {</div><div class='add'>+		tx_queue-&gt;flushed = false;</div><div class='add'>+		falcon_flush_tx_queue(tx_queue);</div><div class='add'>+	}</div><div class='add'>+	efx_for_each_rx_queue(rx_queue, efx) {</div><div class='add'>+		rx_queue-&gt;flushed = false;</div><div class='add'>+		falcon_flush_rx_queue(rx_queue);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Poll the evq looking for flush completions. Since we're not pushing</div><div class='add'>+	 * any more rx or tx descriptors at this point, we're in no danger of</div><div class='add'>+	 * overflowing the evq whilst we wait */</div><div class='add'>+	for (i = 0; i &lt; FALCON_FLUSH_POLL_COUNT; ++i) {</div><div class='add'>+		msleep(FALCON_FLUSH_INTERVAL);</div><div class='add'>+		falcon_poll_flush_events(efx);</div><div class='add'>+</div><div class='add'>+		/* Check if every queue has been succesfully flushed */</div><div class='add'>+		outstanding = false;</div><div class='add'>+		efx_for_each_tx_queue(tx_queue, efx)</div><div class='add'>+			outstanding |= !tx_queue-&gt;flushed;</div><div class='add'>+		efx_for_each_rx_queue(rx_queue, efx)</div><div class='add'>+			outstanding |= !rx_queue-&gt;flushed;</div><div class='add'>+		if (!outstanding)</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Mark the queues as all flushed. We're going to return failure</div><div class='add'>+	 * leading to a reset, or fake up success anyway. "flushed" now</div><div class='add'>+	 * indicates that we tried to flush. */</div><div class='add'>+	efx_for_each_tx_queue(tx_queue, efx) {</div><div class='add'>+		if (!tx_queue-&gt;flushed)</div><div class='add'>+			EFX_ERR(efx, "tx queue %d flush command timed out\n",</div><div class='add'>+				tx_queue-&gt;queue);</div><div class='add'>+		tx_queue-&gt;flushed = true;</div><div class='add'>+	}</div><div class='add'>+	efx_for_each_rx_queue(rx_queue, efx) {</div><div class='add'>+		if (!rx_queue-&gt;flushed)</div><div class='add'>+			EFX_ERR(efx, "rx queue %d flush command timed out\n",</div><div class='add'>+				rx_queue-&gt;queue);</div><div class='add'>+		rx_queue-&gt;flushed = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (EFX_WORKAROUND_7803(efx))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return -ETIMEDOUT;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /**************************************************************************</div><div class='ctx'>  *</div><div class='hunk'>@@ -1371,7 +1306,7 @@ void falcon_enable_interrupts(struct efx_nic *efx)</div><div class='ctx'> </div><div class='ctx'> 	/* Force processing of all the channels to get the EVQ RPTRs up to</div><div class='ctx'> 	   date */</div><div class='del'>-	efx_for_each_channel_with_interrupt(channel, efx)</div><div class='add'>+	efx_for_each_channel(channel, efx)</div><div class='ctx'> 		efx_schedule_channel(channel);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1439,10 +1374,11 @@ static irqreturn_t falcon_fatal_interrupt(struct efx_nic *efx)</div><div class='ctx'> 			EFX_OWORD_FMT "\n", EFX_OWORD_VAL(reg));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Disable DMA bus mastering on both devices */</div><div class='add'>+	/* Disable both devices */</div><div class='ctx'> 	pci_disable_device(efx-&gt;pci_dev);</div><div class='ctx'> 	if (FALCON_IS_DUAL_FUNC(efx))</div><div class='ctx'> 		pci_disable_device(nic_data-&gt;pci_dev2);</div><div class='add'>+	falcon_disable_interrupts(efx);</div><div class='ctx'> </div><div class='ctx'> 	if (++n_int_errors &lt; FALCON_MAX_INT_ERRORS) {</div><div class='ctx'> 		EFX_ERR(efx, "SYSTEM ERROR - reset scheduled\n");</div><div class='hunk'>@@ -1589,7 +1525,7 @@ static void falcon_setup_rss_indir_table(struct efx_nic *efx)</div><div class='ctx'> 	     offset &lt; RX_RSS_INDIR_TBL_B0 + 0x800;</div><div class='ctx'> 	     offset += 0x10) {</div><div class='ctx'> 		EFX_POPULATE_DWORD_1(dword, RX_RSS_INDIR_ENT_B0,</div><div class='del'>-				     i % efx-&gt;rss_queues);</div><div class='add'>+				     i % efx-&gt;n_rx_queues);</div><div class='ctx'> 		falcon_writel(efx, &amp;dword, offset);</div><div class='ctx'> 		i++;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1621,7 +1557,7 @@ int falcon_init_interrupt(struct efx_nic *efx)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Hook MSI or MSI-X interrupt */</div><div class='del'>-	efx_for_each_channel_with_interrupt(channel, efx) {</div><div class='add'>+	efx_for_each_channel(channel, efx) {</div><div class='ctx'> 		rc = request_irq(channel-&gt;irq, falcon_msi_interrupt,</div><div class='ctx'> 				 IRQF_PROBE_SHARED, /* Not shared */</div><div class='ctx'> 				 efx-&gt;name, channel);</div><div class='hunk'>@@ -1634,7 +1570,7 @@ int falcon_init_interrupt(struct efx_nic *efx)</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'>  fail2:</div><div class='del'>-	efx_for_each_channel_with_interrupt(channel, efx)</div><div class='add'>+	efx_for_each_channel(channel, efx)</div><div class='ctx'> 		free_irq(channel-&gt;irq, channel);</div><div class='ctx'>  fail1:</div><div class='ctx'> 	return rc;</div><div class='hunk'>@@ -1646,7 +1582,7 @@ void falcon_fini_interrupt(struct efx_nic *efx)</div><div class='ctx'> 	efx_oword_t reg;</div><div class='ctx'> </div><div class='ctx'> 	/* Disable MSI/MSI-X interrupts */</div><div class='del'>-	efx_for_each_channel_with_interrupt(channel, efx) {</div><div class='add'>+	efx_for_each_channel(channel, efx) {</div><div class='ctx'> 		if (channel-&gt;irq)</div><div class='ctx'> 			free_irq(channel-&gt;irq, channel);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1669,69 +1605,200 @@ void falcon_fini_interrupt(struct efx_nic *efx)</div><div class='ctx'>  **************************************************************************</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define FALCON_SPI_MAX_LEN sizeof(efx_oword_t)</div><div class='add'>+#define FALCON_SPI_MAX_LEN ((unsigned) sizeof(efx_oword_t))</div><div class='ctx'> </div><div class='ctx'> /* Wait for SPI command completion */</div><div class='ctx'> static int falcon_spi_wait(struct efx_nic *efx)</div><div class='ctx'> {</div><div class='add'>+	unsigned long timeout = jiffies + DIV_ROUND_UP(HZ, 10);</div><div class='ctx'> 	efx_oword_t reg;</div><div class='del'>-	int cmd_en, timer_active;</div><div class='del'>-	int count;</div><div class='add'>+	bool cmd_en, timer_active;</div><div class='ctx'> </div><div class='del'>-	count = 0;</div><div class='del'>-	do {</div><div class='add'>+	for (;;) {</div><div class='ctx'> 		falcon_read(efx, &amp;reg, EE_SPI_HCMD_REG_KER);</div><div class='ctx'> 		cmd_en = EFX_OWORD_FIELD(reg, EE_SPI_HCMD_CMD_EN);</div><div class='ctx'> 		timer_active = EFX_OWORD_FIELD(reg, EE_WR_TIMER_ACTIVE);</div><div class='ctx'> 		if (!cmd_en &amp;&amp; !timer_active)</div><div class='ctx'> 			return 0;</div><div class='del'>-		udelay(10);</div><div class='del'>-	} while (++count &lt; 10000); /* wait upto 100msec */</div><div class='del'>-	EFX_ERR(efx, "timed out waiting for SPI\n");</div><div class='del'>-	return -ETIMEDOUT;</div><div class='add'>+		if (time_after_eq(jiffies, timeout)) {</div><div class='add'>+			EFX_ERR(efx, "timed out waiting for SPI\n");</div><div class='add'>+			return -ETIMEDOUT;</div><div class='add'>+		}</div><div class='add'>+		cpu_relax();</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-falcon_spi_read(struct efx_nic *efx, int device_id, unsigned int command,</div><div class='del'>-		unsigned int address, unsigned int addr_len,</div><div class='del'>-		void *data, unsigned int len)</div><div class='add'>+static int falcon_spi_cmd(const struct efx_spi_device *spi,</div><div class='add'>+			  unsigned int command, int address,</div><div class='add'>+			  const void *in, void *out, unsigned int len)</div><div class='ctx'> {</div><div class='add'>+	struct efx_nic *efx = spi-&gt;efx;</div><div class='add'>+	bool addressed = (address &gt;= 0);</div><div class='add'>+	bool reading = (out != NULL);</div><div class='ctx'> 	efx_oword_t reg;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	BUG_ON(len &gt; FALCON_SPI_MAX_LEN);</div><div class='add'>+	/* Input validation */</div><div class='add'>+	if (len &gt; FALCON_SPI_MAX_LEN)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* Check SPI not currently being accessed */</div><div class='ctx'> 	rc = falcon_spi_wait(efx);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='del'>-	/* Program address register */</div><div class='del'>-	EFX_POPULATE_OWORD_1(reg, EE_SPI_HADR_ADR, address);</div><div class='del'>-	falcon_write(efx, &amp;reg, EE_SPI_HADR_REG_KER);</div><div class='add'>+	/* Program address register, if we have an address */</div><div class='add'>+	if (addressed) {</div><div class='add'>+		EFX_POPULATE_OWORD_1(reg, EE_SPI_HADR_ADR, address);</div><div class='add'>+		falcon_write(efx, &amp;reg, EE_SPI_HADR_REG_KER);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Program data register, if we have data */</div><div class='add'>+	if (in != NULL) {</div><div class='add'>+		memcpy(&amp;reg, in, len);</div><div class='add'>+		falcon_write(efx, &amp;reg, EE_SPI_HDATA_REG_KER);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	/* Issue read command */</div><div class='add'>+	/* Issue read/write command */</div><div class='ctx'> 	EFX_POPULATE_OWORD_7(reg,</div><div class='ctx'> 			     EE_SPI_HCMD_CMD_EN, 1,</div><div class='del'>-			     EE_SPI_HCMD_SF_SEL, device_id,</div><div class='add'>+			     EE_SPI_HCMD_SF_SEL, spi-&gt;device_id,</div><div class='ctx'> 			     EE_SPI_HCMD_DABCNT, len,</div><div class='del'>-			     EE_SPI_HCMD_READ, EE_SPI_READ,</div><div class='add'>+			     EE_SPI_HCMD_READ, reading,</div><div class='ctx'> 			     EE_SPI_HCMD_DUBCNT, 0,</div><div class='del'>-			     EE_SPI_HCMD_ADBCNT, addr_len,</div><div class='add'>+			     EE_SPI_HCMD_ADBCNT,</div><div class='add'>+			     (addressed ? spi-&gt;addr_len : 0),</div><div class='ctx'> 			     EE_SPI_HCMD_ENC, command);</div><div class='ctx'> 	falcon_write(efx, &amp;reg, EE_SPI_HCMD_REG_KER);</div><div class='ctx'> </div><div class='del'>-	/* Wait for read to complete */</div><div class='add'>+	/* Wait for read/write to complete */</div><div class='ctx'> 	rc = falcon_spi_wait(efx);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='ctx'> 	/* Read data */</div><div class='del'>-	falcon_read(efx, &amp;reg, EE_SPI_HDATA_REG_KER);</div><div class='del'>-	memcpy(data, &amp;reg, len);</div><div class='add'>+	if (out != NULL) {</div><div class='add'>+		falcon_read(efx, &amp;reg, EE_SPI_HDATA_REG_KER);</div><div class='add'>+		memcpy(out, &amp;reg, len);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static unsigned int</div><div class='add'>+falcon_spi_write_limit(const struct efx_spi_device *spi, unsigned int start)</div><div class='add'>+{</div><div class='add'>+	return min(FALCON_SPI_MAX_LEN,</div><div class='add'>+		   (spi-&gt;block_size - (start &amp; (spi-&gt;block_size - 1))));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u8</div><div class='add'>+efx_spi_munge_command(const struct efx_spi_device *spi,</div><div class='add'>+		      const u8 command, const unsigned int address)</div><div class='add'>+{</div><div class='add'>+	return command | (((address &gt;&gt; 8) &amp; spi-&gt;munge_address) &lt;&lt; 3);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int falcon_spi_fast_wait(const struct efx_spi_device *spi)</div><div class='add'>+{</div><div class='add'>+	u8 status;</div><div class='add'>+	int i, rc;</div><div class='add'>+</div><div class='add'>+	/* Wait up to 1000us for flash/EEPROM to finish a fast operation. */</div><div class='add'>+	for (i = 0; i &lt; 50; i++) {</div><div class='add'>+		udelay(20);</div><div class='add'>+</div><div class='add'>+		rc = falcon_spi_cmd(spi, SPI_RDSR, -1, NULL,</div><div class='add'>+				    &amp;status, sizeof(status));</div><div class='add'>+		if (rc)</div><div class='add'>+			return rc;</div><div class='add'>+		if (!(status &amp; SPI_STATUS_NRDY))</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='add'>+	EFX_ERR(spi-&gt;efx,</div><div class='add'>+		"timed out waiting for device %d last status=0x%02x\n",</div><div class='add'>+		spi-&gt;device_id, status);</div><div class='add'>+	return -ETIMEDOUT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int falcon_spi_read(const struct efx_spi_device *spi, loff_t start,</div><div class='add'>+		    size_t len, size_t *retlen, u8 *buffer)</div><div class='add'>+{</div><div class='add'>+	unsigned int command, block_len, pos = 0;</div><div class='add'>+	int rc = 0;</div><div class='add'>+</div><div class='add'>+	while (pos &lt; len) {</div><div class='add'>+		block_len = min((unsigned int)len - pos,</div><div class='add'>+				FALCON_SPI_MAX_LEN);</div><div class='add'>+</div><div class='add'>+		command = efx_spi_munge_command(spi, SPI_READ, start + pos);</div><div class='add'>+		rc = falcon_spi_cmd(spi, command, start + pos, NULL,</div><div class='add'>+				    buffer + pos, block_len);</div><div class='add'>+		if (rc)</div><div class='add'>+			break;</div><div class='add'>+		pos += block_len;</div><div class='add'>+</div><div class='add'>+		/* Avoid locking up the system */</div><div class='add'>+		cond_resched();</div><div class='add'>+		if (signal_pending(current)) {</div><div class='add'>+			rc = -EINTR;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (retlen)</div><div class='add'>+		*retlen = pos;</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int falcon_spi_write(const struct efx_spi_device *spi, loff_t start,</div><div class='add'>+		     size_t len, size_t *retlen, const u8 *buffer)</div><div class='add'>+{</div><div class='add'>+	u8 verify_buffer[FALCON_SPI_MAX_LEN];</div><div class='add'>+	unsigned int command, block_len, pos = 0;</div><div class='add'>+	int rc = 0;</div><div class='add'>+</div><div class='add'>+	while (pos &lt; len) {</div><div class='add'>+		rc = falcon_spi_cmd(spi, SPI_WREN, -1, NULL, NULL, 0);</div><div class='add'>+		if (rc)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		block_len = min((unsigned int)len - pos,</div><div class='add'>+				falcon_spi_write_limit(spi, start + pos));</div><div class='add'>+		command = efx_spi_munge_command(spi, SPI_WRITE, start + pos);</div><div class='add'>+		rc = falcon_spi_cmd(spi, command, start + pos,</div><div class='add'>+				    buffer + pos, NULL, block_len);</div><div class='add'>+		if (rc)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		rc = falcon_spi_fast_wait(spi);</div><div class='add'>+		if (rc)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		command = efx_spi_munge_command(spi, SPI_READ, start + pos);</div><div class='add'>+		rc = falcon_spi_cmd(spi, command, start + pos,</div><div class='add'>+				    NULL, verify_buffer, block_len);</div><div class='add'>+		if (memcmp(verify_buffer, buffer + pos, block_len)) {</div><div class='add'>+			rc = -EIO;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		pos += block_len;</div><div class='add'>+</div><div class='add'>+		/* Avoid locking up the system */</div><div class='add'>+		cond_resched();</div><div class='add'>+		if (signal_pending(current)) {</div><div class='add'>+			rc = -EINTR;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (retlen)</div><div class='add'>+		*retlen = pos;</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**************************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * MAC wrapper</div><div class='hunk'>@@ -1812,7 +1879,7 @@ void falcon_reconfigure_mac_wrapper(struct efx_nic *efx)</div><div class='ctx'> {</div><div class='ctx'> 	efx_oword_t reg;</div><div class='ctx'> 	int link_speed;</div><div class='del'>-	unsigned int tx_fc;</div><div class='add'>+	bool tx_fc;</div><div class='ctx'> </div><div class='ctx'> 	if (efx-&gt;link_options &amp; GM_LPA_10000)</div><div class='ctx'> 		link_speed = 0x3;</div><div class='hunk'>@@ -1847,7 +1914,7 @@ void falcon_reconfigure_mac_wrapper(struct efx_nic *efx)</div><div class='ctx'> 	/* Transmission of pause frames when RX crosses the threshold is</div><div class='ctx'> 	 * covered by RX_XOFF_MAC_EN and XM_TX_CFG_REG:XM_FCNTL.</div><div class='ctx'> 	 * Action on receipt of pause frames is controller by XM_DIS_FCNTL */</div><div class='del'>-	tx_fc = (efx-&gt;flow_control &amp; EFX_FC_TX) ? 1 : 0;</div><div class='add'>+	tx_fc = !!(efx-&gt;flow_control &amp; EFX_FC_TX);</div><div class='ctx'> 	falcon_read(efx, &amp;reg, RX_CFG_REG_KER);</div><div class='ctx'> 	EFX_SET_OWORD_FIELD_VER(efx, reg, RX_XOFF_MAC_EN, tx_fc);</div><div class='ctx'> </div><div class='hunk'>@@ -1887,8 +1954,10 @@ int falcon_dma_stats(struct efx_nic *efx, unsigned int done_offset)</div><div class='ctx'> </div><div class='ctx'> 	/* Wait for transfer to complete */</div><div class='ctx'> 	for (i = 0; i &lt; 400; i++) {</div><div class='del'>-		if (*(volatile u32 *)dma_done == FALCON_STATS_DONE)</div><div class='add'>+		if (*(volatile u32 *)dma_done == FALCON_STATS_DONE) {</div><div class='add'>+			rmb(); /* Ensure the stats are valid. */</div><div class='ctx'> 			return 0;</div><div class='add'>+		}</div><div class='ctx'> 		udelay(10);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1951,7 +2020,7 @@ static int falcon_gmii_wait(struct efx_nic *efx)</div><div class='ctx'> static void falcon_mdio_write(struct net_device *net_dev, int phy_id,</div><div class='ctx'> 			      int addr, int value)</div><div class='ctx'> {</div><div class='del'>-	struct efx_nic *efx = net_dev-&gt;priv;</div><div class='add'>+	struct efx_nic *efx = netdev_priv(net_dev);</div><div class='ctx'> 	unsigned int phy_id2 = phy_id &amp; FALCON_PHY_ID_ID_MASK;</div><div class='ctx'> 	efx_oword_t reg;</div><div class='ctx'> </div><div class='hunk'>@@ -2019,7 +2088,7 @@ static void falcon_mdio_write(struct net_device *net_dev, int phy_id,</div><div class='ctx'>  * could be read, -1 will be returned. */</div><div class='ctx'> static int falcon_mdio_read(struct net_device *net_dev, int phy_id, int addr)</div><div class='ctx'> {</div><div class='del'>-	struct efx_nic *efx = net_dev-&gt;priv;</div><div class='add'>+	struct efx_nic *efx = netdev_priv(net_dev);</div><div class='ctx'> 	unsigned int phy_addr = phy_id &amp; FALCON_PHY_ID_ID_MASK;</div><div class='ctx'> 	efx_oword_t reg;</div><div class='ctx'> 	int value = -1;</div><div class='hunk'>@@ -2120,7 +2189,7 @@ int falcon_probe_port(struct efx_nic *efx)</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='ctx'> 	/* Set up GMII structure for PHY */</div><div class='del'>-	efx-&gt;mii.supports_gmii = 1;</div><div class='add'>+	efx-&gt;mii.supports_gmii = true;</div><div class='ctx'> 	falcon_init_mdio(&amp;efx-&gt;mii);</div><div class='ctx'> </div><div class='ctx'> 	/* Hardware flow ctrl. FalconA RX FIFO too small for pause generation */</div><div class='hunk'>@@ -2168,6 +2237,170 @@ void falcon_set_multicast_hash(struct efx_nic *efx)</div><div class='ctx'> 	falcon_write(efx, &amp;mc_hash-&gt;oword[1], MAC_MCAST_HASH_REG1_KER);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+/**************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * Falcon test code</div><div class='add'>+ *</div><div class='add'>+ **************************************************************************/</div><div class='add'>+</div><div class='add'>+int falcon_read_nvram(struct efx_nic *efx, struct falcon_nvconfig *nvconfig_out)</div><div class='add'>+{</div><div class='add'>+	struct falcon_nvconfig *nvconfig;</div><div class='add'>+	struct efx_spi_device *spi;</div><div class='add'>+	void *region;</div><div class='add'>+	int rc, magic_num, struct_ver;</div><div class='add'>+	__le16 *word, *limit;</div><div class='add'>+	u32 csum;</div><div class='add'>+</div><div class='add'>+	region = kmalloc(NVCONFIG_END, GFP_KERNEL);</div><div class='add'>+	if (!region)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	nvconfig = region + NVCONFIG_OFFSET;</div><div class='add'>+</div><div class='add'>+	spi = efx-&gt;spi_flash ? efx-&gt;spi_flash : efx-&gt;spi_eeprom;</div><div class='add'>+	rc = falcon_spi_read(spi, 0, NVCONFIG_END, NULL, region);</div><div class='add'>+	if (rc) {</div><div class='add'>+		EFX_ERR(efx, "Failed to read %s\n",</div><div class='add'>+			efx-&gt;spi_flash ? "flash" : "EEPROM");</div><div class='add'>+		rc = -EIO;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	magic_num = le16_to_cpu(nvconfig-&gt;board_magic_num);</div><div class='add'>+	struct_ver = le16_to_cpu(nvconfig-&gt;board_struct_ver);</div><div class='add'>+</div><div class='add'>+	rc = -EINVAL;</div><div class='add'>+	if (magic_num != NVCONFIG_BOARD_MAGIC_NUM) {</div><div class='add'>+		EFX_ERR(efx, "NVRAM bad magic 0x%x\n", magic_num);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	if (struct_ver &lt; 2) {</div><div class='add'>+		EFX_ERR(efx, "NVRAM has ancient version 0x%x\n", struct_ver);</div><div class='add'>+		goto out;</div><div class='add'>+	} else if (struct_ver &lt; 4) {</div><div class='add'>+		word = &amp;nvconfig-&gt;board_magic_num;</div><div class='add'>+		limit = (__le16 *) (nvconfig + 1);</div><div class='add'>+	} else {</div><div class='add'>+		word = region;</div><div class='add'>+		limit = region + NVCONFIG_END;</div><div class='add'>+	}</div><div class='add'>+	for (csum = 0; word &lt; limit; ++word)</div><div class='add'>+		csum += le16_to_cpu(*word);</div><div class='add'>+</div><div class='add'>+	if (~csum &amp; 0xffff) {</div><div class='add'>+		EFX_ERR(efx, "NVRAM has incorrect checksum\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = 0;</div><div class='add'>+	if (nvconfig_out)</div><div class='add'>+		memcpy(nvconfig_out, nvconfig, sizeof(*nvconfig));</div><div class='add'>+</div><div class='add'>+ out:</div><div class='add'>+	kfree(region);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Registers tested in the falcon register test */</div><div class='add'>+static struct {</div><div class='add'>+	unsigned address;</div><div class='add'>+	efx_oword_t mask;</div><div class='add'>+} efx_test_registers[] = {</div><div class='add'>+	{ ADR_REGION_REG_KER,</div><div class='add'>+	  EFX_OWORD32(0x0001FFFF, 0x0001FFFF, 0x0001FFFF, 0x0001FFFF) },</div><div class='add'>+	{ RX_CFG_REG_KER,</div><div class='add'>+	  EFX_OWORD32(0xFFFFFFFE, 0x00017FFF, 0x00000000, 0x00000000) },</div><div class='add'>+	{ TX_CFG_REG_KER,</div><div class='add'>+	  EFX_OWORD32(0x7FFF0037, 0x00000000, 0x00000000, 0x00000000) },</div><div class='add'>+	{ TX_CFG2_REG_KER,</div><div class='add'>+	  EFX_OWORD32(0xFFFEFE80, 0x1FFFFFFF, 0x020000FE, 0x007FFFFF) },</div><div class='add'>+	{ MAC0_CTRL_REG_KER,</div><div class='add'>+	  EFX_OWORD32(0xFFFF0000, 0x00000000, 0x00000000, 0x00000000) },</div><div class='add'>+	{ SRM_TX_DC_CFG_REG_KER,</div><div class='add'>+	  EFX_OWORD32(0x001FFFFF, 0x00000000, 0x00000000, 0x00000000) },</div><div class='add'>+	{ RX_DC_CFG_REG_KER,</div><div class='add'>+	  EFX_OWORD32(0x0000000F, 0x00000000, 0x00000000, 0x00000000) },</div><div class='add'>+	{ RX_DC_PF_WM_REG_KER,</div><div class='add'>+	  EFX_OWORD32(0x000003FF, 0x00000000, 0x00000000, 0x00000000) },</div><div class='add'>+	{ DP_CTRL_REG,</div><div class='add'>+	  EFX_OWORD32(0x00000FFF, 0x00000000, 0x00000000, 0x00000000) },</div><div class='add'>+	{ XM_GLB_CFG_REG,</div><div class='add'>+	  EFX_OWORD32(0x00000C68, 0x00000000, 0x00000000, 0x00000000) },</div><div class='add'>+	{ XM_TX_CFG_REG,</div><div class='add'>+	  EFX_OWORD32(0x00080164, 0x00000000, 0x00000000, 0x00000000) },</div><div class='add'>+	{ XM_RX_CFG_REG,</div><div class='add'>+	  EFX_OWORD32(0x07100A0C, 0x00000000, 0x00000000, 0x00000000) },</div><div class='add'>+	{ XM_RX_PARAM_REG,</div><div class='add'>+	  EFX_OWORD32(0x00001FF8, 0x00000000, 0x00000000, 0x00000000) },</div><div class='add'>+	{ XM_FC_REG,</div><div class='add'>+	  EFX_OWORD32(0xFFFF0001, 0x00000000, 0x00000000, 0x00000000) },</div><div class='add'>+	{ XM_ADR_LO_REG,</div><div class='add'>+	  EFX_OWORD32(0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000) },</div><div class='add'>+	{ XX_SD_CTL_REG,</div><div class='add'>+	  EFX_OWORD32(0x0003FF0F, 0x00000000, 0x00000000, 0x00000000) },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static bool efx_masked_compare_oword(const efx_oword_t *a, const efx_oword_t *b,</div><div class='add'>+				     const efx_oword_t *mask)</div><div class='add'>+{</div><div class='add'>+	return ((a-&gt;u64[0] ^ b-&gt;u64[0]) &amp; mask-&gt;u64[0]) ||</div><div class='add'>+		((a-&gt;u64[1] ^ b-&gt;u64[1]) &amp; mask-&gt;u64[1]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int falcon_test_registers(struct efx_nic *efx)</div><div class='add'>+{</div><div class='add'>+	unsigned address = 0, i, j;</div><div class='add'>+	efx_oword_t mask, imask, original, reg, buf;</div><div class='add'>+</div><div class='add'>+	/* Falcon should be in loopback to isolate the XMAC from the PHY */</div><div class='add'>+	WARN_ON(!LOOPBACK_INTERNAL(efx));</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(efx_test_registers); ++i) {</div><div class='add'>+		address = efx_test_registers[i].address;</div><div class='add'>+		mask = imask = efx_test_registers[i].mask;</div><div class='add'>+		EFX_INVERT_OWORD(imask);</div><div class='add'>+</div><div class='add'>+		falcon_read(efx, &amp;original, address);</div><div class='add'>+</div><div class='add'>+		/* bit sweep on and off */</div><div class='add'>+		for (j = 0; j &lt; 128; j++) {</div><div class='add'>+			if (!EFX_EXTRACT_OWORD32(mask, j, j))</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			/* Test this testable bit can be set in isolation */</div><div class='add'>+			EFX_AND_OWORD(reg, original, mask);</div><div class='add'>+			EFX_SET_OWORD32(reg, j, j, 1);</div><div class='add'>+</div><div class='add'>+			falcon_write(efx, &amp;reg, address);</div><div class='add'>+			falcon_read(efx, &amp;buf, address);</div><div class='add'>+</div><div class='add'>+			if (efx_masked_compare_oword(&amp;reg, &amp;buf, &amp;mask))</div><div class='add'>+				goto fail;</div><div class='add'>+</div><div class='add'>+			/* Test this testable bit can be cleared in isolation */</div><div class='add'>+			EFX_OR_OWORD(reg, original, mask);</div><div class='add'>+			EFX_SET_OWORD32(reg, j, j, 0);</div><div class='add'>+</div><div class='add'>+			falcon_write(efx, &amp;reg, address);</div><div class='add'>+			falcon_read(efx, &amp;buf, address);</div><div class='add'>+</div><div class='add'>+			if (efx_masked_compare_oword(&amp;reg, &amp;buf, &amp;mask))</div><div class='add'>+				goto fail;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		falcon_write(efx, &amp;original, address);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+fail:</div><div class='add'>+	EFX_ERR(efx, "wrote "EFX_OWORD_FMT" read "EFX_OWORD_FMT</div><div class='add'>+		" at address 0x%x mask "EFX_OWORD_FMT"\n", EFX_OWORD_VAL(reg),</div><div class='add'>+		EFX_OWORD_VAL(buf), address, EFX_OWORD_VAL(mask));</div><div class='add'>+	return -EIO;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**************************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * Device reset</div><div class='hunk'>@@ -2305,68 +2538,103 @@ static int falcon_reset_sram(struct efx_nic *efx)</div><div class='ctx'> 	return -ETIMEDOUT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int falcon_spi_device_init(struct efx_nic *efx,</div><div class='add'>+				  struct efx_spi_device **spi_device_ret,</div><div class='add'>+				  unsigned int device_id, u32 device_type)</div><div class='add'>+{</div><div class='add'>+	struct efx_spi_device *spi_device;</div><div class='add'>+</div><div class='add'>+	if (device_type != 0) {</div><div class='add'>+		spi_device = kmalloc(sizeof(*spi_device), GFP_KERNEL);</div><div class='add'>+		if (!spi_device)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		spi_device-&gt;device_id = device_id;</div><div class='add'>+		spi_device-&gt;size =</div><div class='add'>+			1 &lt;&lt; SPI_DEV_TYPE_FIELD(device_type, SPI_DEV_TYPE_SIZE);</div><div class='add'>+		spi_device-&gt;addr_len =</div><div class='add'>+			SPI_DEV_TYPE_FIELD(device_type, SPI_DEV_TYPE_ADDR_LEN);</div><div class='add'>+		spi_device-&gt;munge_address = (spi_device-&gt;size == 1 &lt;&lt; 9 &amp;&amp;</div><div class='add'>+					     spi_device-&gt;addr_len == 1);</div><div class='add'>+		spi_device-&gt;block_size =</div><div class='add'>+			1 &lt;&lt; SPI_DEV_TYPE_FIELD(device_type,</div><div class='add'>+						SPI_DEV_TYPE_BLOCK_SIZE);</div><div class='add'>+</div><div class='add'>+		spi_device-&gt;efx = efx;</div><div class='add'>+	} else {</div><div class='add'>+		spi_device = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kfree(*spi_device_ret);</div><div class='add'>+	*spi_device_ret = spi_device;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void falcon_remove_spi_devices(struct efx_nic *efx)</div><div class='add'>+{</div><div class='add'>+	kfree(efx-&gt;spi_eeprom);</div><div class='add'>+	efx-&gt;spi_eeprom = NULL;</div><div class='add'>+	kfree(efx-&gt;spi_flash);</div><div class='add'>+	efx-&gt;spi_flash = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Extract non-volatile configuration */</div><div class='ctx'> static int falcon_probe_nvconfig(struct efx_nic *efx)</div><div class='ctx'> {</div><div class='ctx'> 	struct falcon_nvconfig *nvconfig;</div><div class='del'>-	efx_oword_t nic_stat;</div><div class='del'>-	int device_id;</div><div class='del'>-	unsigned addr_len;</div><div class='del'>-	size_t offset, len;</div><div class='del'>-	int magic_num, struct_ver, board_rev;</div><div class='add'>+	int board_rev;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	/* Find the boot device. */</div><div class='del'>-	falcon_read(efx, &amp;nic_stat, NIC_STAT_REG);</div><div class='del'>-	if (EFX_OWORD_FIELD(nic_stat, SF_PRST)) {</div><div class='del'>-		device_id = EE_SPI_FLASH;</div><div class='del'>-		addr_len = 3;</div><div class='del'>-	} else if (EFX_OWORD_FIELD(nic_stat, EE_PRST)) {</div><div class='del'>-		device_id = EE_SPI_EEPROM;</div><div class='del'>-		addr_len = 2;</div><div class='del'>-	} else {</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	nvconfig = kmalloc(sizeof(*nvconfig), GFP_KERNEL);</div><div class='add'>+	if (!nvconfig)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	/* Read the whole configuration structure into memory. */</div><div class='del'>-	for (offset = 0; offset &lt; sizeof(*nvconfig); offset += len) {</div><div class='del'>-		len = min(sizeof(*nvconfig) - offset,</div><div class='del'>-			  (size_t) FALCON_SPI_MAX_LEN);</div><div class='del'>-		rc = falcon_spi_read(efx, device_id, SPI_READ,</div><div class='del'>-				     NVCONFIG_BASE + offset, addr_len,</div><div class='del'>-				     (char *)nvconfig + offset, len);</div><div class='del'>-		if (rc)</div><div class='del'>-			goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Read the MAC addresses */</div><div class='del'>-	memcpy(efx-&gt;mac_address, nvconfig-&gt;mac_address[0], ETH_ALEN);</div><div class='del'>-</div><div class='del'>-	/* Read the board configuration. */</div><div class='del'>-	magic_num = le16_to_cpu(nvconfig-&gt;board_magic_num);</div><div class='del'>-	struct_ver = le16_to_cpu(nvconfig-&gt;board_struct_ver);</div><div class='del'>-</div><div class='del'>-	if (magic_num != NVCONFIG_BOARD_MAGIC_NUM || struct_ver &lt; 2) {</div><div class='del'>-		EFX_ERR(efx, "Non volatile memory bad magic=%x ver=%x "</div><div class='del'>-			"therefore using defaults\n", magic_num, struct_ver);</div><div class='add'>+	rc = falcon_read_nvram(efx, nvconfig);</div><div class='add'>+	if (rc == -EINVAL) {</div><div class='add'>+		EFX_ERR(efx, "NVRAM is invalid therefore using defaults\n");</div><div class='ctx'> 		efx-&gt;phy_type = PHY_TYPE_NONE;</div><div class='ctx'> 		efx-&gt;mii.phy_id = PHY_ADDR_INVALID;</div><div class='ctx'> 		board_rev = 0;</div><div class='add'>+		rc = 0;</div><div class='add'>+	} else if (rc) {</div><div class='add'>+		goto fail1;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		struct falcon_nvconfig_board_v2 *v2 = &amp;nvconfig-&gt;board_v2;</div><div class='add'>+		struct falcon_nvconfig_board_v3 *v3 = &amp;nvconfig-&gt;board_v3;</div><div class='ctx'> </div><div class='ctx'> 		efx-&gt;phy_type = v2-&gt;port0_phy_type;</div><div class='ctx'> 		efx-&gt;mii.phy_id = v2-&gt;port0_phy_addr;</div><div class='ctx'> 		board_rev = le16_to_cpu(v2-&gt;board_revision);</div><div class='add'>+</div><div class='add'>+		if (le16_to_cpu(nvconfig-&gt;board_struct_ver) &gt;= 3) {</div><div class='add'>+			__le32 fl = v3-&gt;spi_device_type[EE_SPI_FLASH];</div><div class='add'>+			__le32 ee = v3-&gt;spi_device_type[EE_SPI_EEPROM];</div><div class='add'>+			rc = falcon_spi_device_init(efx, &amp;efx-&gt;spi_flash,</div><div class='add'>+						    EE_SPI_FLASH,</div><div class='add'>+						    le32_to_cpu(fl));</div><div class='add'>+			if (rc)</div><div class='add'>+				goto fail2;</div><div class='add'>+			rc = falcon_spi_device_init(efx, &amp;efx-&gt;spi_eeprom,</div><div class='add'>+						    EE_SPI_EEPROM,</div><div class='add'>+						    le32_to_cpu(ee));</div><div class='add'>+			if (rc)</div><div class='add'>+				goto fail2;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Read the MAC addresses */</div><div class='add'>+	memcpy(efx-&gt;mac_address, nvconfig-&gt;mac_address[0], ETH_ALEN);</div><div class='add'>+</div><div class='ctx'> 	EFX_LOG(efx, "PHY is %d phy_id %d\n", efx-&gt;phy_type, efx-&gt;mii.phy_id);</div><div class='ctx'> </div><div class='ctx'> 	efx_set_board_info(efx, board_rev);</div><div class='ctx'> </div><div class='del'>- out:</div><div class='add'>+	kfree(nvconfig);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+ fail2:</div><div class='add'>+	falcon_remove_spi_devices(efx);</div><div class='add'>+ fail1:</div><div class='ctx'> 	kfree(nvconfig);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='hunk'>@@ -2417,6 +2685,86 @@ static int falcon_probe_nic_variant(struct efx_nic *efx)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Probe all SPI devices on the NIC */</div><div class='add'>+static void falcon_probe_spi_devices(struct efx_nic *efx)</div><div class='add'>+{</div><div class='add'>+	efx_oword_t nic_stat, gpio_ctl, ee_vpd_cfg;</div><div class='add'>+	bool has_flash, has_eeprom, boot_is_external;</div><div class='add'>+</div><div class='add'>+	falcon_read(efx, &amp;gpio_ctl, GPIO_CTL_REG_KER);</div><div class='add'>+	falcon_read(efx, &amp;nic_stat, NIC_STAT_REG);</div><div class='add'>+	falcon_read(efx, &amp;ee_vpd_cfg, EE_VPD_CFG_REG_KER);</div><div class='add'>+</div><div class='add'>+	has_flash = EFX_OWORD_FIELD(nic_stat, SF_PRST);</div><div class='add'>+	has_eeprom = EFX_OWORD_FIELD(nic_stat, EE_PRST);</div><div class='add'>+	boot_is_external = EFX_OWORD_FIELD(gpio_ctl, BOOTED_USING_NVDEVICE);</div><div class='add'>+</div><div class='add'>+	if (has_flash) {</div><div class='add'>+		/* Default flash SPI device: Atmel AT25F1024</div><div class='add'>+		 * 128 KB, 24-bit address, 32 KB erase block,</div><div class='add'>+		 * 256 B write block</div><div class='add'>+		 */</div><div class='add'>+		u32 flash_device_type =</div><div class='add'>+			(17 &lt;&lt; SPI_DEV_TYPE_SIZE_LBN)</div><div class='add'>+			| (3 &lt;&lt; SPI_DEV_TYPE_ADDR_LEN_LBN)</div><div class='add'>+			| (0x52 &lt;&lt; SPI_DEV_TYPE_ERASE_CMD_LBN)</div><div class='add'>+			| (15 &lt;&lt; SPI_DEV_TYPE_ERASE_SIZE_LBN)</div><div class='add'>+			| (8 &lt;&lt; SPI_DEV_TYPE_BLOCK_SIZE_LBN);</div><div class='add'>+</div><div class='add'>+		falcon_spi_device_init(efx, &amp;efx-&gt;spi_flash,</div><div class='add'>+				       EE_SPI_FLASH, flash_device_type);</div><div class='add'>+</div><div class='add'>+		if (!boot_is_external) {</div><div class='add'>+			/* Disable VPD and set clock dividers to safe</div><div class='add'>+			 * values for initial programming.</div><div class='add'>+			 */</div><div class='add'>+			EFX_LOG(efx, "Booted from internal ASIC settings;"</div><div class='add'>+				" setting SPI config\n");</div><div class='add'>+			EFX_POPULATE_OWORD_3(ee_vpd_cfg, EE_VPD_EN, 0,</div><div class='add'>+					     /* 125 MHz / 7 ~= 20 MHz */</div><div class='add'>+					     EE_SF_CLOCK_DIV, 7,</div><div class='add'>+					     /* 125 MHz / 63 ~= 2 MHz */</div><div class='add'>+					     EE_EE_CLOCK_DIV, 63);</div><div class='add'>+			falcon_write(efx, &amp;ee_vpd_cfg, EE_VPD_CFG_REG_KER);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (has_eeprom) {</div><div class='add'>+		u32 eeprom_device_type;</div><div class='add'>+</div><div class='add'>+		/* If it has no flash, it must have a large EEPROM</div><div class='add'>+		 * for chip config; otherwise check whether 9-bit</div><div class='add'>+		 * addressing is used for VPD configuration</div><div class='add'>+		 */</div><div class='add'>+		if (has_flash &amp;&amp;</div><div class='add'>+		    (!boot_is_external ||</div><div class='add'>+		     EFX_OWORD_FIELD(ee_vpd_cfg, EE_VPD_EN_AD9_MODE))) {</div><div class='add'>+			/* Default SPI device: Atmel AT25040 or similar</div><div class='add'>+			 * 512 B, 9-bit address, 8 B write block</div><div class='add'>+			 */</div><div class='add'>+			eeprom_device_type =</div><div class='add'>+				(9 &lt;&lt; SPI_DEV_TYPE_SIZE_LBN)</div><div class='add'>+				| (1 &lt;&lt; SPI_DEV_TYPE_ADDR_LEN_LBN)</div><div class='add'>+				| (3 &lt;&lt; SPI_DEV_TYPE_BLOCK_SIZE_LBN);</div><div class='add'>+		} else {</div><div class='add'>+			/* "Large" SPI device: Atmel AT25640 or similar</div><div class='add'>+			 * 8 KB, 16-bit address, 32 B write block</div><div class='add'>+			 */</div><div class='add'>+			eeprom_device_type =</div><div class='add'>+				(13 &lt;&lt; SPI_DEV_TYPE_SIZE_LBN)</div><div class='add'>+				| (2 &lt;&lt; SPI_DEV_TYPE_ADDR_LEN_LBN)</div><div class='add'>+				| (5 &lt;&lt; SPI_DEV_TYPE_BLOCK_SIZE_LBN);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		falcon_spi_device_init(efx, &amp;efx-&gt;spi_eeprom,</div><div class='add'>+				       EE_SPI_EEPROM, eeprom_device_type);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	EFX_LOG(efx, "flash is %s, EEPROM is %s\n",</div><div class='add'>+		(has_flash ? "present" : "absent"),</div><div class='add'>+		(has_eeprom ? "present" : "absent"));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int falcon_probe_nic(struct efx_nic *efx)</div><div class='ctx'> {</div><div class='ctx'> 	struct falcon_nic_data *nic_data;</div><div class='hunk'>@@ -2424,6 +2772,8 @@ int falcon_probe_nic(struct efx_nic *efx)</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate storage for hardware specific data */</div><div class='ctx'> 	nic_data = kzalloc(sizeof(*nic_data), GFP_KERNEL);</div><div class='add'>+	if (!nic_data)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	efx-&gt;nic_data = nic_data;</div><div class='ctx'> </div><div class='ctx'> 	/* Determine number of ports etc. */</div><div class='hunk'>@@ -2467,6 +2817,8 @@ int falcon_probe_nic(struct efx_nic *efx)</div><div class='ctx'> 		(unsigned long long)efx-&gt;irq_status.dma_addr,</div><div class='ctx'> 		efx-&gt;irq_status.addr, virt_to_phys(efx-&gt;irq_status.addr));</div><div class='ctx'> </div><div class='add'>+	falcon_probe_spi_devices(efx);</div><div class='add'>+</div><div class='ctx'> 	/* Read in the non-volatile configuration */</div><div class='ctx'> 	rc = falcon_probe_nvconfig(efx);</div><div class='ctx'> 	if (rc)</div><div class='hunk'>@@ -2486,6 +2838,7 @@ int falcon_probe_nic(struct efx_nic *efx)</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'>  fail5:</div><div class='add'>+	falcon_remove_spi_devices(efx);</div><div class='ctx'> 	falcon_free_buffer(efx, &amp;efx-&gt;irq_status);</div><div class='ctx'>  fail4:</div><div class='ctx'>  fail3:</div><div class='hunk'>@@ -2573,19 +2926,14 @@ int falcon_init_nic(struct efx_nic *efx)</div><div class='ctx'> 	EFX_INVERT_OWORD(temp);</div><div class='ctx'> 	falcon_write(efx, &amp;temp, FATAL_INTR_REG_KER);</div><div class='ctx'> </div><div class='del'>-	/* Set number of RSS queues for receive path. */</div><div class='del'>-	falcon_read(efx, &amp;temp, RX_FILTER_CTL_REG);</div><div class='del'>-	if (falcon_rev(efx) &gt;= FALCON_REV_B0)</div><div class='del'>-		EFX_SET_OWORD_FIELD(temp, NUM_KER, 0);</div><div class='del'>-	else</div><div class='del'>-		EFX_SET_OWORD_FIELD(temp, NUM_KER, efx-&gt;rss_queues - 1);</div><div class='ctx'> 	if (EFX_WORKAROUND_7244(efx)) {</div><div class='add'>+		falcon_read(efx, &amp;temp, RX_FILTER_CTL_REG);</div><div class='ctx'> 		EFX_SET_OWORD_FIELD(temp, UDP_FULL_SRCH_LIMIT, 8);</div><div class='ctx'> 		EFX_SET_OWORD_FIELD(temp, UDP_WILD_SRCH_LIMIT, 8);</div><div class='ctx'> 		EFX_SET_OWORD_FIELD(temp, TCP_FULL_SRCH_LIMIT, 8);</div><div class='ctx'> 		EFX_SET_OWORD_FIELD(temp, TCP_WILD_SRCH_LIMIT, 8);</div><div class='add'>+		falcon_write(efx, &amp;temp, RX_FILTER_CTL_REG);</div><div class='ctx'> 	}</div><div class='del'>-	falcon_write(efx, &amp;temp, RX_FILTER_CTL_REG);</div><div class='ctx'> </div><div class='ctx'> 	falcon_setup_rss_indir_table(efx);</div><div class='ctx'> </div><div class='hunk'>@@ -2641,8 +2989,8 @@ int falcon_init_nic(struct efx_nic *efx)</div><div class='ctx'> 		  rx_xoff_thresh_bytes : efx-&gt;type-&gt;rx_xoff_thresh);</div><div class='ctx'> 	EFX_SET_OWORD_FIELD_VER(efx, temp, RX_XOFF_MAC_TH, thresh / 256);</div><div class='ctx'> 	/* RX control FIFO thresholds [32 entries] */</div><div class='del'>-	EFX_SET_OWORD_FIELD_VER(efx, temp, RX_XON_TX_TH, 25);</div><div class='del'>-	EFX_SET_OWORD_FIELD_VER(efx, temp, RX_XOFF_TX_TH, 20);</div><div class='add'>+	EFX_SET_OWORD_FIELD_VER(efx, temp, RX_XON_TX_TH, 20);</div><div class='add'>+	EFX_SET_OWORD_FIELD_VER(efx, temp, RX_XOFF_TX_TH, 25);</div><div class='ctx'> 	falcon_write(efx, &amp;temp, RX_CFG_REG_KER);</div><div class='ctx'> </div><div class='ctx'> 	/* Set destination of both TX and RX Flush events */</div><div class='hunk'>@@ -2662,6 +3010,7 @@ void falcon_remove_nic(struct efx_nic *efx)</div><div class='ctx'> 	rc = i2c_del_adapter(&amp;efx-&gt;i2c_adap);</div><div class='ctx'> 	BUG_ON(rc);</div><div class='ctx'> </div><div class='add'>+	falcon_remove_spi_devices(efx);</div><div class='ctx'> 	falcon_free_buffer(efx, &amp;efx-&gt;irq_status);</div><div class='ctx'> </div><div class='ctx'> 	falcon_reset_hw(efx, RESET_TYPE_ALL);</div><div class='head'>diff --git a/drivers/net/sfc/falcon.h b/drivers/net/sfc/falcon.h<br/>index 492f9bc28840..be025ba7a6c6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sfc/falcon.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/sfc/falcon.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sfc/falcon.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sfc/falcon.h</a></div><div class='hunk'>@@ -40,24 +40,24 @@ extern struct efx_nic_type falcon_b_nic_type;</div><div class='ctx'> </div><div class='ctx'> /* TX data path */</div><div class='ctx'> extern int falcon_probe_tx(struct efx_tx_queue *tx_queue);</div><div class='del'>-extern int falcon_init_tx(struct efx_tx_queue *tx_queue);</div><div class='add'>+extern void falcon_init_tx(struct efx_tx_queue *tx_queue);</div><div class='ctx'> extern void falcon_fini_tx(struct efx_tx_queue *tx_queue);</div><div class='ctx'> extern void falcon_remove_tx(struct efx_tx_queue *tx_queue);</div><div class='ctx'> extern void falcon_push_buffers(struct efx_tx_queue *tx_queue);</div><div class='ctx'> </div><div class='ctx'> /* RX data path */</div><div class='ctx'> extern int falcon_probe_rx(struct efx_rx_queue *rx_queue);</div><div class='del'>-extern int falcon_init_rx(struct efx_rx_queue *rx_queue);</div><div class='add'>+extern void falcon_init_rx(struct efx_rx_queue *rx_queue);</div><div class='ctx'> extern void falcon_fini_rx(struct efx_rx_queue *rx_queue);</div><div class='ctx'> extern void falcon_remove_rx(struct efx_rx_queue *rx_queue);</div><div class='ctx'> extern void falcon_notify_rx_desc(struct efx_rx_queue *rx_queue);</div><div class='ctx'> </div><div class='ctx'> /* Event data path */</div><div class='ctx'> extern int falcon_probe_eventq(struct efx_channel *channel);</div><div class='del'>-extern int falcon_init_eventq(struct efx_channel *channel);</div><div class='add'>+extern void falcon_init_eventq(struct efx_channel *channel);</div><div class='ctx'> extern void falcon_fini_eventq(struct efx_channel *channel);</div><div class='ctx'> extern void falcon_remove_eventq(struct efx_channel *channel);</div><div class='del'>-extern int falcon_process_eventq(struct efx_channel *channel, int *rx_quota);</div><div class='add'>+extern int falcon_process_eventq(struct efx_channel *channel, int rx_quota);</div><div class='ctx'> extern void falcon_eventq_read_ack(struct efx_channel *channel);</div><div class='ctx'> </div><div class='ctx'> /* Ports */</div><div class='hunk'>@@ -65,7 +65,7 @@ extern int falcon_probe_port(struct efx_nic *efx);</div><div class='ctx'> extern void falcon_remove_port(struct efx_nic *efx);</div><div class='ctx'> </div><div class='ctx'> /* MAC/PHY */</div><div class='del'>-extern int falcon_xaui_link_ok(struct efx_nic *efx);</div><div class='add'>+extern bool falcon_xaui_link_ok(struct efx_nic *efx);</div><div class='ctx'> extern int falcon_dma_stats(struct efx_nic *efx,</div><div class='ctx'> 			    unsigned int done_offset);</div><div class='ctx'> extern void falcon_drain_tx_fifo(struct efx_nic *efx);</div><div class='hunk'>@@ -86,6 +86,7 @@ extern void falcon_fini_interrupt(struct efx_nic *efx);</div><div class='ctx'> extern int falcon_probe_nic(struct efx_nic *efx);</div><div class='ctx'> extern int falcon_probe_resources(struct efx_nic *efx);</div><div class='ctx'> extern int falcon_init_nic(struct efx_nic *efx);</div><div class='add'>+extern int falcon_flush_queues(struct efx_nic *efx);</div><div class='ctx'> extern int falcon_reset_hw(struct efx_nic *efx, enum reset_type method);</div><div class='ctx'> extern void falcon_remove_resources(struct efx_nic *efx);</div><div class='ctx'> extern void falcon_remove_nic(struct efx_nic *efx);</div><div class='hunk'>@@ -93,6 +94,12 @@ extern void falcon_update_nic_stats(struct efx_nic *efx);</div><div class='ctx'> extern void falcon_set_multicast_hash(struct efx_nic *efx);</div><div class='ctx'> extern int falcon_reset_xaui(struct efx_nic *efx);</div><div class='ctx'> </div><div class='add'>+/* Tests */</div><div class='add'>+struct falcon_nvconfig;</div><div class='add'>+extern int falcon_read_nvram(struct efx_nic *efx,</div><div class='add'>+			     struct falcon_nvconfig *nvconfig);</div><div class='add'>+extern int falcon_test_registers(struct efx_nic *efx);</div><div class='add'>+</div><div class='ctx'> /**************************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * Falcon MAC stats</div><div class='head'>diff --git a/drivers/net/sfc/falcon_hwdefs.h b/drivers/net/sfc/falcon_hwdefs.h<br/>index 6d003114eeab..5d584b0dbb51 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sfc/falcon_hwdefs.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/sfc/falcon_hwdefs.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sfc/falcon_hwdefs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sfc/falcon_hwdefs.h</a></div><div class='hunk'>@@ -92,6 +92,17 @@</div><div class='ctx'> /* SPI host data register */</div><div class='ctx'> #define EE_SPI_HDATA_REG_KER 0x0120</div><div class='ctx'> </div><div class='add'>+/* SPI/VPD config register */</div><div class='add'>+#define EE_VPD_CFG_REG_KER 0x0140</div><div class='add'>+#define EE_VPD_EN_LBN 0</div><div class='add'>+#define EE_VPD_EN_WIDTH 1</div><div class='add'>+#define EE_VPD_EN_AD9_MODE_LBN 1</div><div class='add'>+#define EE_VPD_EN_AD9_MODE_WIDTH 1</div><div class='add'>+#define EE_EE_CLOCK_DIV_LBN 112</div><div class='add'>+#define EE_EE_CLOCK_DIV_WIDTH 7</div><div class='add'>+#define EE_SF_CLOCK_DIV_LBN 120</div><div class='add'>+#define EE_SF_CLOCK_DIV_WIDTH 7</div><div class='add'>+</div><div class='ctx'> /* PCIE CORE ACCESS REG */</div><div class='ctx'> #define PCIE_CORE_ADDR_PCIE_DEVICE_CTRL_STAT 0x68</div><div class='ctx'> #define PCIE_CORE_ADDR_PCIE_LINK_CTRL_STAT 0x70</div><div class='hunk'>@@ -106,7 +117,6 @@</div><div class='ctx'> #define SF_PRST_WIDTH 1</div><div class='ctx'> #define EE_PRST_LBN 8</div><div class='ctx'> #define EE_PRST_WIDTH 1</div><div class='del'>-/* See pic_mode_t for decoding of this field */</div><div class='ctx'> /* These bit definitions are extrapolated from the list of numerical</div><div class='ctx'>  * values for STRAP_PINS.</div><div class='ctx'>  */</div><div class='hunk'>@@ -115,6 +125,9 @@</div><div class='ctx'> #define STRAP_PCIE_LBN 0</div><div class='ctx'> #define STRAP_PCIE_WIDTH 1</div><div class='ctx'> </div><div class='add'>+#define BOOTED_USING_NVDEVICE_LBN 3</div><div class='add'>+#define BOOTED_USING_NVDEVICE_WIDTH 1</div><div class='add'>+</div><div class='ctx'> /* GPIO control register */</div><div class='ctx'> #define GPIO_CTL_REG_KER 0x0210</div><div class='ctx'> #define GPIO_OUTPUTS_LBN   (16)</div><div class='hunk'>@@ -479,18 +492,8 @@</div><div class='ctx'> #define MAC_MCAST_HASH_REG0_KER 0xca0</div><div class='ctx'> #define MAC_MCAST_HASH_REG1_KER 0xcb0</div><div class='ctx'> </div><div class='del'>-/* GMAC registers */</div><div class='del'>-#define FALCON_GMAC_REGBANK 0xe00</div><div class='del'>-#define FALCON_GMAC_REGBANK_SIZE 0x200</div><div class='del'>-#define FALCON_GMAC_REG_SIZE 0x10</div><div class='del'>-</div><div class='del'>-/* XMAC registers */</div><div class='del'>-#define FALCON_XMAC_REGBANK 0x1200</div><div class='del'>-#define FALCON_XMAC_REGBANK_SIZE 0x200</div><div class='del'>-#define FALCON_XMAC_REG_SIZE 0x10</div><div class='del'>-</div><div class='ctx'> /* XGMAC address register low */</div><div class='del'>-#define XM_ADR_LO_REG_MAC 0x00</div><div class='add'>+#define XM_ADR_LO_REG 0x1200</div><div class='ctx'> #define XM_ADR_3_LBN 24</div><div class='ctx'> #define XM_ADR_3_WIDTH 8</div><div class='ctx'> #define XM_ADR_2_LBN 16</div><div class='hunk'>@@ -501,14 +504,14 @@</div><div class='ctx'> #define XM_ADR_0_WIDTH 8</div><div class='ctx'> </div><div class='ctx'> /* XGMAC address register high */</div><div class='del'>-#define XM_ADR_HI_REG_MAC 0x01</div><div class='add'>+#define XM_ADR_HI_REG 0x1210</div><div class='ctx'> #define XM_ADR_5_LBN 8</div><div class='ctx'> #define XM_ADR_5_WIDTH 8</div><div class='ctx'> #define XM_ADR_4_LBN 0</div><div class='ctx'> #define XM_ADR_4_WIDTH 8</div><div class='ctx'> </div><div class='ctx'> /* XGMAC global configuration */</div><div class='del'>-#define XM_GLB_CFG_REG_MAC 0x02</div><div class='add'>+#define XM_GLB_CFG_REG 0x1220</div><div class='ctx'> #define XM_RX_STAT_EN_LBN 11</div><div class='ctx'> #define XM_RX_STAT_EN_WIDTH 1</div><div class='ctx'> #define XM_TX_STAT_EN_LBN 10</div><div class='hunk'>@@ -521,7 +524,7 @@</div><div class='ctx'> #define XM_CORE_RST_WIDTH 1</div><div class='ctx'> </div><div class='ctx'> /* XGMAC transmit configuration */</div><div class='del'>-#define XM_TX_CFG_REG_MAC 0x03</div><div class='add'>+#define XM_TX_CFG_REG 0x1230</div><div class='ctx'> #define XM_IPG_LBN 16</div><div class='ctx'> #define XM_IPG_WIDTH 4</div><div class='ctx'> #define XM_FCNTL_LBN 10</div><div class='hunk'>@@ -536,7 +539,7 @@</div><div class='ctx'> #define XM_TXEN_WIDTH 1</div><div class='ctx'> </div><div class='ctx'> /* XGMAC receive configuration */</div><div class='del'>-#define XM_RX_CFG_REG_MAC 0x04</div><div class='add'>+#define XM_RX_CFG_REG 0x1240</div><div class='ctx'> #define XM_PASS_CRC_ERR_LBN 25</div><div class='ctx'> #define XM_PASS_CRC_ERR_WIDTH 1</div><div class='ctx'> #define XM_ACPT_ALL_MCAST_LBN 11</div><div class='hunk'>@@ -549,7 +552,7 @@</div><div class='ctx'> #define XM_RXEN_WIDTH 1</div><div class='ctx'> </div><div class='ctx'> /* XGMAC management interrupt mask register */</div><div class='del'>-#define XM_MGT_INT_MSK_REG_MAC_B0 0x5</div><div class='add'>+#define XM_MGT_INT_MSK_REG_B0 0x1250</div><div class='ctx'> #define XM_MSK_PRMBLE_ERR_LBN 2</div><div class='ctx'> #define XM_MSK_PRMBLE_ERR_WIDTH 1</div><div class='ctx'> #define XM_MSK_RMTFLT_LBN 1</div><div class='hunk'>@@ -558,29 +561,29 @@</div><div class='ctx'> #define XM_MSK_LCLFLT_WIDTH 1</div><div class='ctx'> </div><div class='ctx'> /* XGMAC flow control register */</div><div class='del'>-#define XM_FC_REG_MAC 0x7</div><div class='add'>+#define XM_FC_REG 0x1270</div><div class='ctx'> #define XM_PAUSE_TIME_LBN 16</div><div class='ctx'> #define XM_PAUSE_TIME_WIDTH 16</div><div class='ctx'> #define XM_DIS_FCNTL_LBN 0</div><div class='ctx'> #define XM_DIS_FCNTL_WIDTH 1</div><div class='ctx'> </div><div class='ctx'> /* XGMAC pause time count register */</div><div class='del'>-#define XM_PAUSE_TIME_REG_MAC 0x9</div><div class='add'>+#define XM_PAUSE_TIME_REG 0x1290</div><div class='ctx'> </div><div class='ctx'> /* XGMAC transmit parameter register */</div><div class='del'>-#define XM_TX_PARAM_REG_MAC 0x0d</div><div class='add'>+#define XM_TX_PARAM_REG 0x012d0</div><div class='ctx'> #define XM_TX_JUMBO_MODE_LBN 31</div><div class='ctx'> #define XM_TX_JUMBO_MODE_WIDTH 1</div><div class='ctx'> #define XM_MAX_TX_FRM_SIZE_LBN 16</div><div class='ctx'> #define XM_MAX_TX_FRM_SIZE_WIDTH 14</div><div class='ctx'> </div><div class='ctx'> /* XGMAC receive parameter register */</div><div class='del'>-#define XM_RX_PARAM_REG_MAC 0x0e</div><div class='add'>+#define XM_RX_PARAM_REG 0x12e0</div><div class='ctx'> #define XM_MAX_RX_FRM_SIZE_LBN 0</div><div class='ctx'> #define XM_MAX_RX_FRM_SIZE_WIDTH 14</div><div class='ctx'> </div><div class='ctx'> /* XGMAC management interrupt status register */</div><div class='del'>-#define XM_MGT_INT_REG_MAC_B0 0x0f</div><div class='add'>+#define XM_MGT_INT_REG_B0 0x12f0</div><div class='ctx'> #define XM_PRMBLE_ERR 2</div><div class='ctx'> #define XM_PRMBLE_WIDTH 1</div><div class='ctx'> #define XM_RMTFLT_LBN 1</div><div class='hunk'>@@ -589,7 +592,7 @@</div><div class='ctx'> #define XM_LCLFLT_WIDTH 1</div><div class='ctx'> </div><div class='ctx'> /* XGXS/XAUI powerdown/reset register */</div><div class='del'>-#define XX_PWR_RST_REG_MAC 0x10</div><div class='add'>+#define XX_PWR_RST_REG 0x1300</div><div class='ctx'> </div><div class='ctx'> #define XX_PWRDND_EN_LBN 15</div><div class='ctx'> #define XX_PWRDND_EN_WIDTH 1</div><div class='hunk'>@@ -619,7 +622,7 @@</div><div class='ctx'> #define XX_RST_XX_EN_WIDTH 1</div><div class='ctx'> </div><div class='ctx'> /* XGXS/XAUI powerdown/reset control register */</div><div class='del'>-#define XX_SD_CTL_REG_MAC 0x11</div><div class='add'>+#define XX_SD_CTL_REG 0x1310</div><div class='ctx'> #define XX_HIDRVD_LBN 15</div><div class='ctx'> #define XX_HIDRVD_WIDTH 1</div><div class='ctx'> #define XX_LODRVD_LBN 14</div><div class='hunk'>@@ -645,7 +648,7 @@</div><div class='ctx'> #define XX_LPBKA_LBN 0</div><div class='ctx'> #define XX_LPBKA_WIDTH 1</div><div class='ctx'> </div><div class='del'>-#define XX_TXDRV_CTL_REG_MAC 0x12</div><div class='add'>+#define XX_TXDRV_CTL_REG 0x1320</div><div class='ctx'> #define XX_DEQD_LBN 28</div><div class='ctx'> #define XX_DEQD_WIDTH 4</div><div class='ctx'> #define XX_DEQC_LBN 24</div><div class='hunk'>@@ -664,7 +667,7 @@</div><div class='ctx'> #define XX_DTXA_WIDTH 4</div><div class='ctx'> </div><div class='ctx'> /* XAUI XGXS core status register */</div><div class='del'>-#define XX_CORE_STAT_REG_MAC 0x16</div><div class='add'>+#define XX_CORE_STAT_REG 0x1360</div><div class='ctx'> #define XX_FORCE_SIG_LBN 24</div><div class='ctx'> #define XX_FORCE_SIG_WIDTH 8</div><div class='ctx'> #define XX_FORCE_SIG_DECODE_FORCED 0xff</div><div class='hunk'>@@ -1127,7 +1130,28 @@ struct falcon_nvconfig_board_v2 {</div><div class='ctx'> 	__le16 board_revision;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-#define NVCONFIG_BASE 0x300</div><div class='add'>+/* Board configuration v3 extra information */</div><div class='add'>+struct falcon_nvconfig_board_v3 {</div><div class='add'>+	__le32 spi_device_type[2];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* Bit numbers for spi_device_type */</div><div class='add'>+#define SPI_DEV_TYPE_SIZE_LBN 0</div><div class='add'>+#define SPI_DEV_TYPE_SIZE_WIDTH 5</div><div class='add'>+#define SPI_DEV_TYPE_ADDR_LEN_LBN 6</div><div class='add'>+#define SPI_DEV_TYPE_ADDR_LEN_WIDTH 2</div><div class='add'>+#define SPI_DEV_TYPE_ERASE_CMD_LBN 8</div><div class='add'>+#define SPI_DEV_TYPE_ERASE_CMD_WIDTH 8</div><div class='add'>+#define SPI_DEV_TYPE_ERASE_SIZE_LBN 16</div><div class='add'>+#define SPI_DEV_TYPE_ERASE_SIZE_WIDTH 5</div><div class='add'>+#define SPI_DEV_TYPE_BLOCK_SIZE_LBN 24</div><div class='add'>+#define SPI_DEV_TYPE_BLOCK_SIZE_WIDTH 5</div><div class='add'>+#define SPI_DEV_TYPE_FIELD(type, field)					\</div><div class='add'>+	(((type) &gt;&gt; EFX_LOW_BIT(field)) &amp; EFX_MASK32(EFX_WIDTH(field)))</div><div class='add'>+</div><div class='add'>+#define NVCONFIG_OFFSET 0x300</div><div class='add'>+#define NVCONFIG_END 0x400</div><div class='add'>+</div><div class='ctx'> #define NVCONFIG_BOARD_MAGIC_NUM 0xFA1C</div><div class='ctx'> struct falcon_nvconfig {</div><div class='ctx'> 	efx_oword_t ee_vpd_cfg_reg;			/* 0x300 */</div><div class='hunk'>@@ -1144,6 +1168,8 @@ struct falcon_nvconfig {</div><div class='ctx'> 	__le16 board_struct_ver;</div><div class='ctx'> 	__le16 board_checksum;</div><div class='ctx'> 	struct falcon_nvconfig_board_v2 board_v2;</div><div class='add'>+	efx_oword_t ee_base_page_reg;			/* 0x3B0 */</div><div class='add'>+	struct falcon_nvconfig_board_v3 board_v3;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> #endif /* EFX_FALCON_HWDEFS_H */</div><div class='head'>diff --git a/drivers/net/sfc/falcon_io.h b/drivers/net/sfc/falcon_io.h<br/>index 6670cdfc41ab..c16da3149fa9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sfc/falcon_io.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/sfc/falcon_io.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sfc/falcon_io.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sfc/falcon_io.h</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include "net_driver.h"</div><div class='ctx'> </div><div class='ctx'> /**************************************************************************</div><div class='ctx'>  *</div><div class='head'>diff --git a/drivers/net/sfc/falcon_xmac.c b/drivers/net/sfc/falcon_xmac.c<br/>index 55c0d9760be8..d4012314dd01 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sfc/falcon_xmac.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/sfc/falcon_xmac.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sfc/falcon_xmac.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sfc/falcon_xmac.c</a></div><div class='hunk'>@@ -23,56 +23,24 @@</div><div class='ctx'> </div><div class='ctx'> /**************************************************************************</div><div class='ctx'>  *</div><div class='del'>- * MAC register access</div><div class='del'>- *</div><div class='del'>- **************************************************************************/</div><div class='del'>-</div><div class='del'>-/* Offset of an XMAC register within Falcon */</div><div class='del'>-#define FALCON_XMAC_REG(mac_reg)					\</div><div class='del'>-	(FALCON_XMAC_REGBANK + ((mac_reg) * FALCON_XMAC_REG_SIZE))</div><div class='del'>-</div><div class='del'>-void falcon_xmac_writel(struct efx_nic *efx,</div><div class='del'>-			 efx_dword_t *value, unsigned int mac_reg)</div><div class='del'>-{</div><div class='del'>-	efx_oword_t temp;</div><div class='del'>-</div><div class='del'>-	EFX_POPULATE_OWORD_1(temp, MAC_DATA, EFX_DWORD_FIELD(*value, MAC_DATA));</div><div class='del'>-	falcon_write(efx, &amp;temp, FALCON_XMAC_REG(mac_reg));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void falcon_xmac_readl(struct efx_nic *efx,</div><div class='del'>-		       efx_dword_t *value, unsigned int mac_reg)</div><div class='del'>-{</div><div class='del'>-	efx_oword_t temp;</div><div class='del'>-</div><div class='del'>-	falcon_read(efx, &amp;temp, FALCON_XMAC_REG(mac_reg));</div><div class='del'>-	EFX_POPULATE_DWORD_1(*value, MAC_DATA, EFX_OWORD_FIELD(temp, MAC_DATA));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**************************************************************************</div><div class='del'>- *</div><div class='ctx'>  * MAC operations</div><div class='ctx'>  *</div><div class='ctx'>  *************************************************************************/</div><div class='ctx'> static int falcon_reset_xmac(struct efx_nic *efx)</div><div class='ctx'> {</div><div class='del'>-	efx_dword_t reg;</div><div class='add'>+	efx_oword_t reg;</div><div class='ctx'> 	int count;</div><div class='ctx'> </div><div class='del'>-	EFX_POPULATE_DWORD_1(reg, XM_CORE_RST, 1);</div><div class='del'>-	falcon_xmac_writel(efx, &amp;reg, XM_GLB_CFG_REG_MAC);</div><div class='add'>+	EFX_POPULATE_OWORD_1(reg, XM_CORE_RST, 1);</div><div class='add'>+	falcon_write(efx, &amp;reg, XM_GLB_CFG_REG);</div><div class='ctx'> </div><div class='ctx'> 	for (count = 0; count &lt; 10000; count++) {	/* wait upto 100ms */</div><div class='del'>-		falcon_xmac_readl(efx, &amp;reg, XM_GLB_CFG_REG_MAC);</div><div class='del'>-		if (EFX_DWORD_FIELD(reg, XM_CORE_RST) == 0)</div><div class='add'>+		falcon_read(efx, &amp;reg, XM_GLB_CFG_REG);</div><div class='add'>+		if (EFX_OWORD_FIELD(reg, XM_CORE_RST) == 0)</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		udelay(10);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* This often fails when DSP is disabled, ignore it */</div><div class='del'>-	if (sfe4001_phy_flash_cfg != 0)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='ctx'> 	EFX_ERR(efx, "timed out waiting for XMAC core reset\n");</div><div class='ctx'> 	return -ETIMEDOUT;</div><div class='ctx'> }</div><div class='hunk'>@@ -80,25 +48,25 @@ static int falcon_reset_xmac(struct efx_nic *efx)</div><div class='ctx'> /* Configure the XAUI driver that is an output from Falcon */</div><div class='ctx'> static void falcon_setup_xaui(struct efx_nic *efx)</div><div class='ctx'> {</div><div class='del'>-	efx_dword_t sdctl, txdrv;</div><div class='add'>+	efx_oword_t sdctl, txdrv;</div><div class='ctx'> </div><div class='ctx'> 	/* Move the XAUI into low power, unless there is no PHY, in</div><div class='ctx'> 	 * which case the XAUI will have to drive a cable. */</div><div class='ctx'> 	if (efx-&gt;phy_type == PHY_TYPE_NONE)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	falcon_xmac_readl(efx, &amp;sdctl, XX_SD_CTL_REG_MAC);</div><div class='del'>-	EFX_SET_DWORD_FIELD(sdctl, XX_HIDRVD, XX_SD_CTL_DRV_DEFAULT);</div><div class='del'>-	EFX_SET_DWORD_FIELD(sdctl, XX_LODRVD, XX_SD_CTL_DRV_DEFAULT);</div><div class='del'>-	EFX_SET_DWORD_FIELD(sdctl, XX_HIDRVC, XX_SD_CTL_DRV_DEFAULT);</div><div class='del'>-	EFX_SET_DWORD_FIELD(sdctl, XX_LODRVC, XX_SD_CTL_DRV_DEFAULT);</div><div class='del'>-	EFX_SET_DWORD_FIELD(sdctl, XX_HIDRVB, XX_SD_CTL_DRV_DEFAULT);</div><div class='del'>-	EFX_SET_DWORD_FIELD(sdctl, XX_LODRVB, XX_SD_CTL_DRV_DEFAULT);</div><div class='del'>-	EFX_SET_DWORD_FIELD(sdctl, XX_HIDRVA, XX_SD_CTL_DRV_DEFAULT);</div><div class='del'>-	EFX_SET_DWORD_FIELD(sdctl, XX_LODRVA, XX_SD_CTL_DRV_DEFAULT);</div><div class='del'>-	falcon_xmac_writel(efx, &amp;sdctl, XX_SD_CTL_REG_MAC);</div><div class='del'>-</div><div class='del'>-	EFX_POPULATE_DWORD_8(txdrv,</div><div class='add'>+	falcon_read(efx, &amp;sdctl, XX_SD_CTL_REG);</div><div class='add'>+	EFX_SET_OWORD_FIELD(sdctl, XX_HIDRVD, XX_SD_CTL_DRV_DEFAULT);</div><div class='add'>+	EFX_SET_OWORD_FIELD(sdctl, XX_LODRVD, XX_SD_CTL_DRV_DEFAULT);</div><div class='add'>+	EFX_SET_OWORD_FIELD(sdctl, XX_HIDRVC, XX_SD_CTL_DRV_DEFAULT);</div><div class='add'>+	EFX_SET_OWORD_FIELD(sdctl, XX_LODRVC, XX_SD_CTL_DRV_DEFAULT);</div><div class='add'>+	EFX_SET_OWORD_FIELD(sdctl, XX_HIDRVB, XX_SD_CTL_DRV_DEFAULT);</div><div class='add'>+	EFX_SET_OWORD_FIELD(sdctl, XX_LODRVB, XX_SD_CTL_DRV_DEFAULT);</div><div class='add'>+	EFX_SET_OWORD_FIELD(sdctl, XX_HIDRVA, XX_SD_CTL_DRV_DEFAULT);</div><div class='add'>+	EFX_SET_OWORD_FIELD(sdctl, XX_LODRVA, XX_SD_CTL_DRV_DEFAULT);</div><div class='add'>+	falcon_write(efx, &amp;sdctl, XX_SD_CTL_REG);</div><div class='add'>+</div><div class='add'>+	EFX_POPULATE_OWORD_8(txdrv,</div><div class='ctx'> 			     XX_DEQD, XX_TXDRV_DEQ_DEFAULT,</div><div class='ctx'> 			     XX_DEQC, XX_TXDRV_DEQ_DEFAULT,</div><div class='ctx'> 			     XX_DEQB, XX_TXDRV_DEQ_DEFAULT,</div><div class='hunk'>@@ -107,93 +75,21 @@ static void falcon_setup_xaui(struct efx_nic *efx)</div><div class='ctx'> 			     XX_DTXC, XX_TXDRV_DTX_DEFAULT,</div><div class='ctx'> 			     XX_DTXB, XX_TXDRV_DTX_DEFAULT,</div><div class='ctx'> 			     XX_DTXA, XX_TXDRV_DTX_DEFAULT);</div><div class='del'>-	falcon_xmac_writel(efx, &amp;txdrv, XX_TXDRV_CTL_REG_MAC);</div><div class='add'>+	falcon_write(efx, &amp;txdrv, XX_TXDRV_CTL_REG);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void falcon_hold_xaui_in_rst(struct efx_nic *efx)</div><div class='del'>-{</div><div class='del'>-	efx_dword_t reg;</div><div class='del'>-</div><div class='del'>-	EFX_ZERO_DWORD(reg);</div><div class='del'>-	EFX_SET_DWORD_FIELD(reg, XX_PWRDNA_EN, 1);</div><div class='del'>-	EFX_SET_DWORD_FIELD(reg, XX_PWRDNB_EN, 1);</div><div class='del'>-	EFX_SET_DWORD_FIELD(reg, XX_PWRDNC_EN, 1);</div><div class='del'>-	EFX_SET_DWORD_FIELD(reg, XX_PWRDND_EN, 1);</div><div class='del'>-	EFX_SET_DWORD_FIELD(reg, XX_RSTPLLAB_EN, 1);</div><div class='del'>-	EFX_SET_DWORD_FIELD(reg, XX_RSTPLLCD_EN, 1);</div><div class='del'>-	EFX_SET_DWORD_FIELD(reg, XX_RESETA_EN, 1);</div><div class='del'>-	EFX_SET_DWORD_FIELD(reg, XX_RESETB_EN, 1);</div><div class='del'>-	EFX_SET_DWORD_FIELD(reg, XX_RESETC_EN, 1);</div><div class='del'>-	EFX_SET_DWORD_FIELD(reg, XX_RESETD_EN, 1);</div><div class='del'>-	EFX_SET_DWORD_FIELD(reg, XX_RSTXGXSRX_EN, 1);</div><div class='del'>-	EFX_SET_DWORD_FIELD(reg, XX_RSTXGXSTX_EN, 1);</div><div class='del'>-	falcon_xmac_writel(efx, &amp;reg, XX_PWR_RST_REG_MAC);</div><div class='del'>-	udelay(10);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int _falcon_reset_xaui_a(struct efx_nic *efx)</div><div class='del'>-{</div><div class='del'>-	efx_dword_t reg;</div><div class='del'>-</div><div class='del'>-	falcon_hold_xaui_in_rst(efx);</div><div class='del'>-	falcon_xmac_readl(efx, &amp;reg, XX_PWR_RST_REG_MAC);</div><div class='del'>-</div><div class='del'>-	/* Follow the RAMBUS XAUI data reset sequencing</div><div class='del'>-	 * Channels A and B first: power down, reset PLL, reset, clear</div><div class='del'>-	 */</div><div class='del'>-	EFX_SET_DWORD_FIELD(reg, XX_PWRDNA_EN, 0);</div><div class='del'>-	EFX_SET_DWORD_FIELD(reg, XX_PWRDNB_EN, 0);</div><div class='del'>-	falcon_xmac_writel(efx, &amp;reg, XX_PWR_RST_REG_MAC);</div><div class='del'>-	udelay(10);</div><div class='del'>-</div><div class='del'>-	EFX_SET_DWORD_FIELD(reg, XX_RSTPLLAB_EN, 0);</div><div class='del'>-	falcon_xmac_writel(efx, &amp;reg, XX_PWR_RST_REG_MAC);</div><div class='del'>-	udelay(10);</div><div class='del'>-</div><div class='del'>-	EFX_SET_DWORD_FIELD(reg, XX_RESETA_EN, 0);</div><div class='del'>-	EFX_SET_DWORD_FIELD(reg, XX_RESETB_EN, 0);</div><div class='del'>-	falcon_xmac_writel(efx, &amp;reg, XX_PWR_RST_REG_MAC);</div><div class='del'>-	udelay(10);</div><div class='del'>-</div><div class='del'>-	/* Channels C and D: power down, reset PLL, reset, clear */</div><div class='del'>-	EFX_SET_DWORD_FIELD(reg, XX_PWRDNC_EN, 0);</div><div class='del'>-	EFX_SET_DWORD_FIELD(reg, XX_PWRDND_EN, 0);</div><div class='del'>-	falcon_xmac_writel(efx, &amp;reg, XX_PWR_RST_REG_MAC);</div><div class='del'>-	udelay(10);</div><div class='del'>-</div><div class='del'>-	EFX_SET_DWORD_FIELD(reg, XX_RSTPLLCD_EN, 0);</div><div class='del'>-	falcon_xmac_writel(efx, &amp;reg, XX_PWR_RST_REG_MAC);</div><div class='del'>-	udelay(10);</div><div class='del'>-</div><div class='del'>-	EFX_SET_DWORD_FIELD(reg, XX_RESETC_EN, 0);</div><div class='del'>-	EFX_SET_DWORD_FIELD(reg, XX_RESETD_EN, 0);</div><div class='del'>-	falcon_xmac_writel(efx, &amp;reg, XX_PWR_RST_REG_MAC);</div><div class='del'>-	udelay(10);</div><div class='del'>-</div><div class='del'>-	/* Setup XAUI */</div><div class='del'>-	falcon_setup_xaui(efx);</div><div class='del'>-	udelay(10);</div><div class='del'>-</div><div class='del'>-	/* Take XGXS out of reset */</div><div class='del'>-	EFX_ZERO_DWORD(reg);</div><div class='del'>-	falcon_xmac_writel(efx, &amp;reg, XX_PWR_RST_REG_MAC);</div><div class='del'>-	udelay(10);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int _falcon_reset_xaui_b(struct efx_nic *efx)</div><div class='add'>+int falcon_reset_xaui(struct efx_nic *efx)</div><div class='ctx'> {</div><div class='del'>-	efx_dword_t reg;</div><div class='add'>+	efx_oword_t reg;</div><div class='ctx'> 	int count;</div><div class='ctx'> </div><div class='ctx'> 	EFX_POPULATE_DWORD_1(reg, XX_RST_XX_EN, 1);</div><div class='del'>-	falcon_xmac_writel(efx, &amp;reg, XX_PWR_RST_REG_MAC);</div><div class='add'>+	falcon_write(efx, &amp;reg, XX_PWR_RST_REG);</div><div class='ctx'> </div><div class='ctx'> 	/* Give some time for the link to establish */</div><div class='ctx'> 	for (count = 0; count &lt; 1000; count++) { /* wait upto 10ms */</div><div class='del'>-		falcon_xmac_readl(efx, &amp;reg, XX_PWR_RST_REG_MAC);</div><div class='del'>-		if (EFX_DWORD_FIELD(reg, XX_RST_XX_EN) == 0) {</div><div class='add'>+		falcon_read(efx, &amp;reg, XX_PWR_RST_REG);</div><div class='add'>+		if (EFX_OWORD_FIELD(reg, XX_RST_XX_EN) == 0) {</div><div class='ctx'> 			falcon_setup_xaui(efx);</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -203,55 +99,41 @@ static int _falcon_reset_xaui_b(struct efx_nic *efx)</div><div class='ctx'> 	return -ETIMEDOUT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int falcon_reset_xaui(struct efx_nic *efx)</div><div class='add'>+static bool falcon_xgmii_status(struct efx_nic *efx)</div><div class='ctx'> {</div><div class='del'>-	int rc;</div><div class='del'>-</div><div class='del'>-	if (EFX_WORKAROUND_9388(efx)) {</div><div class='del'>-		falcon_hold_xaui_in_rst(efx);</div><div class='del'>-		efx-&gt;phy_op-&gt;reset_xaui(efx);</div><div class='del'>-		rc = _falcon_reset_xaui_a(efx);</div><div class='del'>-	} else {</div><div class='del'>-		rc = _falcon_reset_xaui_b(efx);</div><div class='del'>-	}</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int falcon_xgmii_status(struct efx_nic *efx)</div><div class='del'>-{</div><div class='del'>-	efx_dword_t reg;</div><div class='add'>+	efx_oword_t reg;</div><div class='ctx'> </div><div class='ctx'> 	if (falcon_rev(efx) &lt; FALCON_REV_B0)</div><div class='del'>-		return 1;</div><div class='add'>+		return true;</div><div class='ctx'> </div><div class='ctx'> 	/* The ISR latches, so clear it and re-read */</div><div class='del'>-	falcon_xmac_readl(efx, &amp;reg, XM_MGT_INT_REG_MAC_B0);</div><div class='del'>-	falcon_xmac_readl(efx, &amp;reg, XM_MGT_INT_REG_MAC_B0);</div><div class='add'>+	falcon_read(efx, &amp;reg, XM_MGT_INT_REG_B0);</div><div class='add'>+	falcon_read(efx, &amp;reg, XM_MGT_INT_REG_B0);</div><div class='ctx'> </div><div class='del'>-	if (EFX_DWORD_FIELD(reg, XM_LCLFLT) ||</div><div class='del'>-	    EFX_DWORD_FIELD(reg, XM_RMTFLT)) {</div><div class='add'>+	if (EFX_OWORD_FIELD(reg, XM_LCLFLT) ||</div><div class='add'>+	    EFX_OWORD_FIELD(reg, XM_RMTFLT)) {</div><div class='ctx'> 		EFX_INFO(efx, "MGT_INT: "EFX_DWORD_FMT"\n", EFX_DWORD_VAL(reg));</div><div class='del'>-		return 0;</div><div class='add'>+		return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return 1;</div><div class='add'>+	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void falcon_mask_status_intr(struct efx_nic *efx, int enable)</div><div class='add'>+static void falcon_mask_status_intr(struct efx_nic *efx, bool enable)</div><div class='ctx'> {</div><div class='del'>-	efx_dword_t reg;</div><div class='add'>+	efx_oword_t reg;</div><div class='ctx'> </div><div class='ctx'> 	if ((falcon_rev(efx) &lt; FALCON_REV_B0) || LOOPBACK_INTERNAL(efx))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/* Flush the ISR */</div><div class='ctx'> 	if (enable)</div><div class='del'>-		falcon_xmac_readl(efx, &amp;reg, XM_MGT_INT_REG_MAC_B0);</div><div class='add'>+		falcon_read(efx, &amp;reg, XM_MGT_INT_REG_B0);</div><div class='ctx'> </div><div class='del'>-	EFX_POPULATE_DWORD_2(reg,</div><div class='add'>+	EFX_POPULATE_OWORD_2(reg,</div><div class='ctx'> 			     XM_MSK_RMTFLT, !enable,</div><div class='ctx'> 			     XM_MSK_LCLFLT, !enable);</div><div class='del'>-	falcon_xmac_writel(efx, &amp;reg, XM_MGT_INT_MSK_REG_MAC_B0);</div><div class='add'>+	falcon_write(efx, &amp;reg, XM_MGT_INT_MSK_REG_B0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int falcon_init_xmac(struct efx_nic *efx)</div><div class='hunk'>@@ -274,7 +156,7 @@ int falcon_init_xmac(struct efx_nic *efx)</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto fail2;</div><div class='ctx'> </div><div class='del'>-	falcon_mask_status_intr(efx, 1);</div><div class='add'>+	falcon_mask_status_intr(efx, true);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'>  fail2:</div><div class='hunk'>@@ -283,34 +165,34 @@ int falcon_init_xmac(struct efx_nic *efx)</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int falcon_xaui_link_ok(struct efx_nic *efx)</div><div class='add'>+bool falcon_xaui_link_ok(struct efx_nic *efx)</div><div class='ctx'> {</div><div class='del'>-	efx_dword_t reg;</div><div class='del'>-	int align_done, sync_status, link_ok = 0;</div><div class='add'>+	efx_oword_t reg;</div><div class='add'>+	bool align_done, link_ok = false;</div><div class='add'>+	int sync_status;</div><div class='ctx'> </div><div class='ctx'> 	if (LOOPBACK_INTERNAL(efx))</div><div class='del'>-		return 1;</div><div class='add'>+		return true;</div><div class='ctx'> </div><div class='ctx'> 	/* Read link status */</div><div class='del'>-	falcon_xmac_readl(efx, &amp;reg, XX_CORE_STAT_REG_MAC);</div><div class='add'>+	falcon_read(efx, &amp;reg, XX_CORE_STAT_REG);</div><div class='ctx'> </div><div class='del'>-	align_done = EFX_DWORD_FIELD(reg, XX_ALIGN_DONE);</div><div class='del'>-	sync_status = EFX_DWORD_FIELD(reg, XX_SYNC_STAT);</div><div class='add'>+	align_done = EFX_OWORD_FIELD(reg, XX_ALIGN_DONE);</div><div class='add'>+	sync_status = EFX_OWORD_FIELD(reg, XX_SYNC_STAT);</div><div class='ctx'> 	if (align_done &amp;&amp; (sync_status == XX_SYNC_STAT_DECODE_SYNCED))</div><div class='del'>-		link_ok = 1;</div><div class='add'>+		link_ok = true;</div><div class='ctx'> </div><div class='ctx'> 	/* Clear link status ready for next read */</div><div class='del'>-	EFX_SET_DWORD_FIELD(reg, XX_COMMA_DET, XX_COMMA_DET_RESET);</div><div class='del'>-	EFX_SET_DWORD_FIELD(reg, XX_CHARERR, XX_CHARERR_RESET);</div><div class='del'>-	EFX_SET_DWORD_FIELD(reg, XX_DISPERR, XX_DISPERR_RESET);</div><div class='del'>-	falcon_xmac_writel(efx, &amp;reg, XX_CORE_STAT_REG_MAC);</div><div class='add'>+	EFX_SET_OWORD_FIELD(reg, XX_COMMA_DET, XX_COMMA_DET_RESET);</div><div class='add'>+	EFX_SET_OWORD_FIELD(reg, XX_CHARERR, XX_CHARERR_RESET);</div><div class='add'>+	EFX_SET_OWORD_FIELD(reg, XX_DISPERR, XX_DISPERR_RESET);</div><div class='add'>+	falcon_write(efx, &amp;reg, XX_CORE_STAT_REG);</div><div class='ctx'> </div><div class='ctx'> 	/* If the link is up, then check the phy side of the xaui link</div><div class='ctx'> 	 * (error conditions from the wire side propoagate back through</div><div class='ctx'> 	 * the phy to the xaui side). */</div><div class='ctx'> 	if (efx-&gt;link_up &amp;&amp; link_ok) {</div><div class='del'>-		int has_phyxs = efx-&gt;phy_op-&gt;mmds &amp; (1 &lt;&lt; MDIO_MMD_PHYXS);</div><div class='del'>-		if (has_phyxs)</div><div class='add'>+		if (efx-&gt;phy_op-&gt;mmds &amp; (1 &lt;&lt; MDIO_MMD_PHYXS))</div><div class='ctx'> 			link_ok = mdio_clause45_phyxgxs_lane_sync(efx);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -325,15 +207,15 @@ int falcon_xaui_link_ok(struct efx_nic *efx)</div><div class='ctx'> static void falcon_reconfigure_xmac_core(struct efx_nic *efx)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int max_frame_len;</div><div class='del'>-	efx_dword_t reg;</div><div class='del'>-	int rx_fc = (efx-&gt;flow_control &amp; EFX_FC_RX) ? 1 : 0;</div><div class='add'>+	efx_oword_t reg;</div><div class='add'>+	bool rx_fc = !!(efx-&gt;flow_control &amp; EFX_FC_RX);</div><div class='ctx'> </div><div class='ctx'> 	/* Configure MAC  - cut-thru mode is hard wired on */</div><div class='ctx'> 	EFX_POPULATE_DWORD_3(reg,</div><div class='ctx'> 			     XM_RX_JUMBO_MODE, 1,</div><div class='ctx'> 			     XM_TX_STAT_EN, 1,</div><div class='ctx'> 			     XM_RX_STAT_EN, 1);</div><div class='del'>-	falcon_xmac_writel(efx, &amp;reg, XM_GLB_CFG_REG_MAC);</div><div class='add'>+	falcon_write(efx, &amp;reg, XM_GLB_CFG_REG);</div><div class='ctx'> </div><div class='ctx'> 	/* Configure TX */</div><div class='ctx'> 	EFX_POPULATE_DWORD_6(reg,</div><div class='hunk'>@@ -343,7 +225,7 @@ static void falcon_reconfigure_xmac_core(struct efx_nic *efx)</div><div class='ctx'> 			     XM_TXCRC, 1,</div><div class='ctx'> 			     XM_FCNTL, 1,</div><div class='ctx'> 			     XM_IPG, 0x3);</div><div class='del'>-	falcon_xmac_writel(efx, &amp;reg, XM_TX_CFG_REG_MAC);</div><div class='add'>+	falcon_write(efx, &amp;reg, XM_TX_CFG_REG);</div><div class='ctx'> </div><div class='ctx'> 	/* Configure RX */</div><div class='ctx'> 	EFX_POPULATE_DWORD_5(reg,</div><div class='hunk'>@@ -352,21 +234,21 @@ static void falcon_reconfigure_xmac_core(struct efx_nic *efx)</div><div class='ctx'> 			     XM_ACPT_ALL_MCAST, 1,</div><div class='ctx'> 			     XM_ACPT_ALL_UCAST, efx-&gt;promiscuous,</div><div class='ctx'> 			     XM_PASS_CRC_ERR, 1);</div><div class='del'>-	falcon_xmac_writel(efx, &amp;reg, XM_RX_CFG_REG_MAC);</div><div class='add'>+	falcon_write(efx, &amp;reg, XM_RX_CFG_REG);</div><div class='ctx'> </div><div class='ctx'> 	/* Set frame length */</div><div class='ctx'> 	max_frame_len = EFX_MAX_FRAME_LEN(efx-&gt;net_dev-&gt;mtu);</div><div class='ctx'> 	EFX_POPULATE_DWORD_1(reg, XM_MAX_RX_FRM_SIZE, max_frame_len);</div><div class='del'>-	falcon_xmac_writel(efx, &amp;reg, XM_RX_PARAM_REG_MAC);</div><div class='add'>+	falcon_write(efx, &amp;reg, XM_RX_PARAM_REG);</div><div class='ctx'> 	EFX_POPULATE_DWORD_2(reg,</div><div class='ctx'> 			     XM_MAX_TX_FRM_SIZE, max_frame_len,</div><div class='ctx'> 			     XM_TX_JUMBO_MODE, 1);</div><div class='del'>-	falcon_xmac_writel(efx, &amp;reg, XM_TX_PARAM_REG_MAC);</div><div class='add'>+	falcon_write(efx, &amp;reg, XM_TX_PARAM_REG);</div><div class='ctx'> </div><div class='ctx'> 	EFX_POPULATE_DWORD_2(reg,</div><div class='ctx'> 			     XM_PAUSE_TIME, 0xfffe, /* MAX PAUSE TIME */</div><div class='del'>-			     XM_DIS_FCNTL, rx_fc ? 0 : 1);</div><div class='del'>-	falcon_xmac_writel(efx, &amp;reg, XM_FC_REG_MAC);</div><div class='add'>+			     XM_DIS_FCNTL, !rx_fc);</div><div class='add'>+	falcon_write(efx, &amp;reg, XM_FC_REG);</div><div class='ctx'> </div><div class='ctx'> 	/* Set MAC address */</div><div class='ctx'> 	EFX_POPULATE_DWORD_4(reg,</div><div class='hunk'>@@ -374,83 +256,75 @@ static void falcon_reconfigure_xmac_core(struct efx_nic *efx)</div><div class='ctx'> 			     XM_ADR_1, efx-&gt;net_dev-&gt;dev_addr[1],</div><div class='ctx'> 			     XM_ADR_2, efx-&gt;net_dev-&gt;dev_addr[2],</div><div class='ctx'> 			     XM_ADR_3, efx-&gt;net_dev-&gt;dev_addr[3]);</div><div class='del'>-	falcon_xmac_writel(efx, &amp;reg, XM_ADR_LO_REG_MAC);</div><div class='add'>+	falcon_write(efx, &amp;reg, XM_ADR_LO_REG);</div><div class='ctx'> 	EFX_POPULATE_DWORD_2(reg,</div><div class='ctx'> 			     XM_ADR_4, efx-&gt;net_dev-&gt;dev_addr[4],</div><div class='ctx'> 			     XM_ADR_5, efx-&gt;net_dev-&gt;dev_addr[5]);</div><div class='del'>-	falcon_xmac_writel(efx, &amp;reg, XM_ADR_HI_REG_MAC);</div><div class='add'>+	falcon_write(efx, &amp;reg, XM_ADR_HI_REG);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void falcon_reconfigure_xgxs_core(struct efx_nic *efx)</div><div class='ctx'> {</div><div class='del'>-	efx_dword_t reg;</div><div class='del'>-	int xgxs_loopback = (efx-&gt;loopback_mode == LOOPBACK_XGXS) ? 1 : 0;</div><div class='del'>-	int xaui_loopback = (efx-&gt;loopback_mode == LOOPBACK_XAUI) ? 1 : 0;</div><div class='del'>-	int xgmii_loopback =</div><div class='del'>-		(efx-&gt;loopback_mode == LOOPBACK_XGMII) ? 1 : 0;</div><div class='add'>+	efx_oword_t reg;</div><div class='add'>+	bool xgxs_loopback = (efx-&gt;loopback_mode == LOOPBACK_XGXS);</div><div class='add'>+	bool xaui_loopback = (efx-&gt;loopback_mode == LOOPBACK_XAUI);</div><div class='add'>+	bool xgmii_loopback = (efx-&gt;loopback_mode == LOOPBACK_XGMII);</div><div class='ctx'> </div><div class='ctx'> 	/* XGXS block is flaky and will need to be reset if moving</div><div class='ctx'> 	 * into our out of XGMII, XGXS or XAUI loopbacks. */</div><div class='ctx'> 	if (EFX_WORKAROUND_5147(efx)) {</div><div class='del'>-		int old_xgmii_loopback, old_xgxs_loopback, old_xaui_loopback;</div><div class='del'>-		int reset_xgxs;</div><div class='add'>+		bool old_xgmii_loopback, old_xgxs_loopback, old_xaui_loopback;</div><div class='add'>+		bool reset_xgxs;</div><div class='ctx'> </div><div class='del'>-		falcon_xmac_readl(efx, &amp;reg, XX_CORE_STAT_REG_MAC);</div><div class='del'>-		old_xgxs_loopback = EFX_DWORD_FIELD(reg, XX_XGXS_LB_EN);</div><div class='del'>-		old_xgmii_loopback = EFX_DWORD_FIELD(reg, XX_XGMII_LB_EN);</div><div class='add'>+		falcon_read(efx, &amp;reg, XX_CORE_STAT_REG);</div><div class='add'>+		old_xgxs_loopback = EFX_OWORD_FIELD(reg, XX_XGXS_LB_EN);</div><div class='add'>+		old_xgmii_loopback = EFX_OWORD_FIELD(reg, XX_XGMII_LB_EN);</div><div class='ctx'> </div><div class='del'>-		falcon_xmac_readl(efx, &amp;reg, XX_SD_CTL_REG_MAC);</div><div class='del'>-		old_xaui_loopback = EFX_DWORD_FIELD(reg, XX_LPBKA);</div><div class='add'>+		falcon_read(efx, &amp;reg, XX_SD_CTL_REG);</div><div class='add'>+		old_xaui_loopback = EFX_OWORD_FIELD(reg, XX_LPBKA);</div><div class='ctx'> </div><div class='ctx'> 		/* The PHY driver may have turned XAUI off */</div><div class='ctx'> 		reset_xgxs = ((xgxs_loopback != old_xgxs_loopback) ||</div><div class='ctx'> 			      (xaui_loopback != old_xaui_loopback) ||</div><div class='ctx'> 			      (xgmii_loopback != old_xgmii_loopback));</div><div class='del'>-		if (reset_xgxs) {</div><div class='del'>-			falcon_xmac_readl(efx, &amp;reg, XX_PWR_RST_REG_MAC);</div><div class='del'>-			EFX_SET_DWORD_FIELD(reg, XX_RSTXGXSTX_EN, 1);</div><div class='del'>-			EFX_SET_DWORD_FIELD(reg, XX_RSTXGXSRX_EN, 1);</div><div class='del'>-			falcon_xmac_writel(efx, &amp;reg, XX_PWR_RST_REG_MAC);</div><div class='del'>-			udelay(1);</div><div class='del'>-			EFX_SET_DWORD_FIELD(reg, XX_RSTXGXSTX_EN, 0);</div><div class='del'>-			EFX_SET_DWORD_FIELD(reg, XX_RSTXGXSRX_EN, 0);</div><div class='del'>-			falcon_xmac_writel(efx, &amp;reg, XX_PWR_RST_REG_MAC);</div><div class='del'>-			udelay(1);</div><div class='del'>-		}</div><div class='add'>+</div><div class='add'>+		if (reset_xgxs)</div><div class='add'>+			falcon_reset_xaui(efx);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	falcon_xmac_readl(efx, &amp;reg, XX_CORE_STAT_REG_MAC);</div><div class='del'>-	EFX_SET_DWORD_FIELD(reg, XX_FORCE_SIG,</div><div class='add'>+	falcon_read(efx, &amp;reg, XX_CORE_STAT_REG);</div><div class='add'>+	EFX_SET_OWORD_FIELD(reg, XX_FORCE_SIG,</div><div class='ctx'> 			    (xgxs_loopback || xaui_loopback) ?</div><div class='ctx'> 			    XX_FORCE_SIG_DECODE_FORCED : 0);</div><div class='del'>-	EFX_SET_DWORD_FIELD(reg, XX_XGXS_LB_EN, xgxs_loopback);</div><div class='del'>-	EFX_SET_DWORD_FIELD(reg, XX_XGMII_LB_EN, xgmii_loopback);</div><div class='del'>-	falcon_xmac_writel(efx, &amp;reg, XX_CORE_STAT_REG_MAC);</div><div class='del'>-</div><div class='del'>-	falcon_xmac_readl(efx, &amp;reg, XX_SD_CTL_REG_MAC);</div><div class='del'>-	EFX_SET_DWORD_FIELD(reg, XX_LPBKD, xaui_loopback);</div><div class='del'>-	EFX_SET_DWORD_FIELD(reg, XX_LPBKC, xaui_loopback);</div><div class='del'>-	EFX_SET_DWORD_FIELD(reg, XX_LPBKB, xaui_loopback);</div><div class='del'>-	EFX_SET_DWORD_FIELD(reg, XX_LPBKA, xaui_loopback);</div><div class='del'>-	falcon_xmac_writel(efx, &amp;reg, XX_SD_CTL_REG_MAC);</div><div class='add'>+	EFX_SET_OWORD_FIELD(reg, XX_XGXS_LB_EN, xgxs_loopback);</div><div class='add'>+	EFX_SET_OWORD_FIELD(reg, XX_XGMII_LB_EN, xgmii_loopback);</div><div class='add'>+	falcon_write(efx, &amp;reg, XX_CORE_STAT_REG);</div><div class='add'>+</div><div class='add'>+	falcon_read(efx, &amp;reg, XX_SD_CTL_REG);</div><div class='add'>+	EFX_SET_OWORD_FIELD(reg, XX_LPBKD, xaui_loopback);</div><div class='add'>+	EFX_SET_OWORD_FIELD(reg, XX_LPBKC, xaui_loopback);</div><div class='add'>+	EFX_SET_OWORD_FIELD(reg, XX_LPBKB, xaui_loopback);</div><div class='add'>+	EFX_SET_OWORD_FIELD(reg, XX_LPBKA, xaui_loopback);</div><div class='add'>+	falcon_write(efx, &amp;reg, XX_SD_CTL_REG);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* Try and bring the Falcon side of the Falcon-Phy XAUI link fails</div><div class='ctx'>  * to come back up. Bash it until it comes back up */</div><div class='del'>-static int falcon_check_xaui_link_up(struct efx_nic *efx)</div><div class='add'>+static bool falcon_check_xaui_link_up(struct efx_nic *efx)</div><div class='ctx'> {</div><div class='ctx'> 	int max_tries, tries;</div><div class='ctx'> 	tries = EFX_WORKAROUND_5147(efx) ? 5 : 1;</div><div class='ctx'> 	max_tries = tries;</div><div class='ctx'> </div><div class='ctx'> 	if ((efx-&gt;loopback_mode == LOOPBACK_NETWORK) ||</div><div class='del'>-	    (efx-&gt;phy_type == PHY_TYPE_NONE))</div><div class='del'>-		return 0;</div><div class='add'>+	    (efx-&gt;phy_type == PHY_TYPE_NONE) ||</div><div class='add'>+	    efx_phy_mode_disabled(efx-&gt;phy_mode))</div><div class='add'>+		return false;</div><div class='ctx'> </div><div class='ctx'> 	while (tries) {</div><div class='ctx'> 		if (falcon_xaui_link_ok(efx))</div><div class='del'>-			return 1;</div><div class='add'>+			return true;</div><div class='ctx'> </div><div class='ctx'> 		EFX_LOG(efx, "%s Clobbering XAUI (%d tries left).\n",</div><div class='ctx'> 			__func__, tries);</div><div class='hunk'>@@ -461,18 +335,22 @@ static int falcon_check_xaui_link_up(struct efx_nic *efx)</div><div class='ctx'> </div><div class='ctx'> 	EFX_LOG(efx, "Failed to bring XAUI link back up in %d tries!\n",</div><div class='ctx'> 		max_tries);</div><div class='del'>-	return 0;</div><div class='add'>+	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void falcon_reconfigure_xmac(struct efx_nic *efx)</div><div class='ctx'> {</div><div class='del'>-	int xaui_link_ok;</div><div class='add'>+	bool xaui_link_ok;</div><div class='ctx'> </div><div class='del'>-	falcon_mask_status_intr(efx, 0);</div><div class='add'>+	falcon_mask_status_intr(efx, false);</div><div class='ctx'> </div><div class='ctx'> 	falcon_deconfigure_mac_wrapper(efx);</div><div class='ctx'> </div><div class='del'>-	efx-&gt;tx_disabled = LOOPBACK_INTERNAL(efx);</div><div class='add'>+	/* Reconfigure the PHY, disabling transmit in mac level loopback. */</div><div class='add'>+	if (LOOPBACK_INTERNAL(efx))</div><div class='add'>+		efx-&gt;phy_mode |= PHY_MODE_TX_DISABLED;</div><div class='add'>+	else</div><div class='add'>+		efx-&gt;phy_mode &amp;= ~PHY_MODE_TX_DISABLED;</div><div class='ctx'> 	efx-&gt;phy_op-&gt;reconfigure(efx);</div><div class='ctx'> </div><div class='ctx'> 	falcon_reconfigure_xgxs_core(efx);</div><div class='hunk'>@@ -484,7 +362,7 @@ void falcon_reconfigure_xmac(struct efx_nic *efx)</div><div class='ctx'> 	xaui_link_ok = falcon_check_xaui_link_up(efx);</div><div class='ctx'> </div><div class='ctx'> 	if (xaui_link_ok &amp;&amp; efx-&gt;link_up)</div><div class='del'>-		falcon_mask_status_intr(efx, 1);</div><div class='add'>+		falcon_mask_status_intr(efx, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void falcon_fini_xmac(struct efx_nic *efx)</div><div class='hunk'>@@ -554,21 +432,23 @@ void falcon_update_stats_xmac(struct efx_nic *efx)</div><div class='ctx'> </div><div class='ctx'> 	/* Update derived statistics */</div><div class='ctx'> 	mac_stats-&gt;tx_good_bytes =</div><div class='del'>-		(mac_stats-&gt;tx_bytes - mac_stats-&gt;tx_bad_bytes);</div><div class='add'>+		(mac_stats-&gt;tx_bytes - mac_stats-&gt;tx_bad_bytes -</div><div class='add'>+		 mac_stats-&gt;tx_control * 64);</div><div class='ctx'> 	mac_stats-&gt;rx_bad_bytes =</div><div class='del'>-		(mac_stats-&gt;rx_bytes - mac_stats-&gt;rx_good_bytes);</div><div class='add'>+		(mac_stats-&gt;rx_bytes - mac_stats-&gt;rx_good_bytes -</div><div class='add'>+		 mac_stats-&gt;rx_control * 64);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int falcon_check_xmac(struct efx_nic *efx)</div><div class='ctx'> {</div><div class='del'>-	unsigned xaui_link_ok;</div><div class='add'>+	bool xaui_link_ok;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	if ((efx-&gt;loopback_mode == LOOPBACK_NETWORK) ||</div><div class='del'>-	    (efx-&gt;phy_type == PHY_TYPE_NONE))</div><div class='add'>+	    efx_phy_mode_disabled(efx-&gt;phy_mode))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	falcon_mask_status_intr(efx, 0);</div><div class='add'>+	falcon_mask_status_intr(efx, false);</div><div class='ctx'> 	xaui_link_ok = falcon_xaui_link_ok(efx);</div><div class='ctx'> </div><div class='ctx'> 	if (EFX_WORKAROUND_5147(efx) &amp;&amp; !xaui_link_ok)</div><div class='hunk'>@@ -579,7 +459,7 @@ int falcon_check_xmac(struct efx_nic *efx)</div><div class='ctx'> </div><div class='ctx'> 	/* Unmask interrupt if everything was (and still is) ok */</div><div class='ctx'> 	if (xaui_link_ok &amp;&amp; efx-&gt;link_up)</div><div class='del'>-		falcon_mask_status_intr(efx, 1);</div><div class='add'>+		falcon_mask_status_intr(efx, true);</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='hunk'>@@ -620,7 +500,7 @@ int falcon_xmac_set_settings(struct efx_nic *efx, struct ethtool_cmd *ecmd)</div><div class='ctx'> </div><div class='ctx'> int falcon_xmac_set_pause(struct efx_nic *efx, enum efx_fc_type flow_control)</div><div class='ctx'> {</div><div class='del'>-	int reset;</div><div class='add'>+	bool reset;</div><div class='ctx'> </div><div class='ctx'> 	if (flow_control &amp; EFX_FC_AUTO) {</div><div class='ctx'> 		EFX_LOG(efx, "10G does not support flow control "</div><div class='head'>diff --git a/drivers/net/sfc/mac.h b/drivers/net/sfc/mac.h<br/>index edd07d4dee18..a31571c69137 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sfc/mac.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/sfc/mac.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sfc/mac.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sfc/mac.h</a></div><div class='hunk'>@@ -13,10 +13,6 @@</div><div class='ctx'> </div><div class='ctx'> #include "net_driver.h"</div><div class='ctx'> </div><div class='del'>-extern void falcon_xmac_writel(struct efx_nic *efx,</div><div class='del'>-			       efx_dword_t *value, unsigned int mac_reg);</div><div class='del'>-extern void falcon_xmac_readl(struct efx_nic *efx,</div><div class='del'>-			      efx_dword_t *value, unsigned int mac_reg);</div><div class='ctx'> extern int falcon_init_xmac(struct efx_nic *efx);</div><div class='ctx'> extern void falcon_reconfigure_xmac(struct efx_nic *efx);</div><div class='ctx'> extern void falcon_update_stats_xmac(struct efx_nic *efx);</div><div class='head'>diff --git a/drivers/net/sfc/mdio_10g.c b/drivers/net/sfc/mdio_10g.c<br/>index c4f540e93b79..003e48dcb2f3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sfc/mdio_10g.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/sfc/mdio_10g.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sfc/mdio_10g.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sfc/mdio_10g.c</a></div><div class='hunk'>@@ -159,20 +159,21 @@ int mdio_clause45_check_mmds(struct efx_nic *efx,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mdio_clause45_links_ok(struct efx_nic *efx, unsigned int mmd_mask)</div><div class='add'>+bool mdio_clause45_links_ok(struct efx_nic *efx, unsigned int mmd_mask)</div><div class='ctx'> {</div><div class='ctx'> 	int phy_id = efx-&gt;mii.phy_id;</div><div class='ctx'> 	int status;</div><div class='del'>-	int ok = 1;</div><div class='add'>+	bool ok = true;</div><div class='ctx'> 	int mmd = 0;</div><div class='del'>-	int good;</div><div class='ctx'> </div><div class='ctx'> 	/* If the port is in loopback, then we should only consider a subset</div><div class='ctx'> 	 * of mmd's */</div><div class='ctx'> 	if (LOOPBACK_INTERNAL(efx))</div><div class='del'>-		return 1;</div><div class='add'>+		return true;</div><div class='ctx'> 	else if (efx-&gt;loopback_mode == LOOPBACK_NETWORK)</div><div class='del'>-		return 0;</div><div class='add'>+		return false;</div><div class='add'>+	else if (efx_phy_mode_disabled(efx-&gt;phy_mode))</div><div class='add'>+		return false;</div><div class='ctx'> 	else if (efx-&gt;loopback_mode == LOOPBACK_PHYXS)</div><div class='ctx'> 		mmd_mask &amp;= ~(MDIO_MMDREG_DEVS0_PHYXS |</div><div class='ctx'> 			      MDIO_MMDREG_DEVS0_PCS |</div><div class='hunk'>@@ -192,8 +193,7 @@ int mdio_clause45_links_ok(struct efx_nic *efx, unsigned int mmd_mask)</div><div class='ctx'> 			status = mdio_clause45_read(efx, phy_id,</div><div class='ctx'> 						    mmd, MDIO_MMDREG_STAT1);</div><div class='ctx'> </div><div class='del'>-			good = status &amp; (1 &lt;&lt; MDIO_MMDREG_STAT1_LINK_LBN);</div><div class='del'>-			ok = ok &amp;&amp; good;</div><div class='add'>+			ok = ok &amp;&amp; (status &amp; (1 &lt;&lt; MDIO_MMDREG_STAT1_LINK_LBN));</div><div class='ctx'> 		}</div><div class='ctx'> 		mmd_mask = (mmd_mask &gt;&gt; 1);</div><div class='ctx'> 		mmd++;</div><div class='hunk'>@@ -208,7 +208,7 @@ void mdio_clause45_transmit_disable(struct efx_nic *efx)</div><div class='ctx'> </div><div class='ctx'> 	ctrl1 = ctrl2 = mdio_clause45_read(efx, phy_id, MDIO_MMD_PMAPMD,</div><div class='ctx'> 					   MDIO_MMDREG_TXDIS);</div><div class='del'>-	if (efx-&gt;tx_disabled)</div><div class='add'>+	if (efx-&gt;phy_mode &amp; PHY_MODE_TX_DISABLED)</div><div class='ctx'> 		ctrl2 |= (1 &lt;&lt; MDIO_MMDREG_TXDIS_GLOBAL_LBN);</div><div class='ctx'> 	else</div><div class='ctx'> 		ctrl1 &amp;= ~(1 &lt;&lt; MDIO_MMDREG_TXDIS_GLOBAL_LBN);</div><div class='head'>diff --git a/drivers/net/sfc/mdio_10g.h b/drivers/net/sfc/mdio_10g.h<br/>index cb99f3f4491c..19c42eaf7fb4 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sfc/mdio_10g.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/sfc/mdio_10g.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sfc/mdio_10g.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sfc/mdio_10g.h</a></div><div class='hunk'>@@ -199,18 +199,19 @@ static inline u32 mdio_clause45_read_id(struct efx_nic *efx, int mmd)</div><div class='ctx'> 	return (id_hi &lt;&lt; 16) | (id_low);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int mdio_clause45_phyxgxs_lane_sync(struct efx_nic *efx)</div><div class='add'>+static inline bool mdio_clause45_phyxgxs_lane_sync(struct efx_nic *efx)</div><div class='ctx'> {</div><div class='del'>-	int i, sync, lane_status;</div><div class='add'>+	int i, lane_status;</div><div class='add'>+	bool sync;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 2; ++i)</div><div class='ctx'> 		lane_status = mdio_clause45_read(efx, efx-&gt;mii.phy_id,</div><div class='ctx'> 						 MDIO_MMD_PHYXS,</div><div class='ctx'> 						 MDIO_PHYXS_LANE_STATE);</div><div class='ctx'> </div><div class='del'>-	sync = (lane_status &amp; (1 &lt;&lt; MDIO_PHYXS_LANE_ALIGNED_LBN)) != 0;</div><div class='add'>+	sync = !!(lane_status &amp; (1 &lt;&lt; MDIO_PHYXS_LANE_ALIGNED_LBN));</div><div class='ctx'> 	if (!sync)</div><div class='del'>-		EFX_INFO(efx, "XGXS lane status: %x\n", lane_status);</div><div class='add'>+		EFX_LOG(efx, "XGXS lane status: %x\n", lane_status);</div><div class='ctx'> 	return sync;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -230,8 +231,8 @@ int mdio_clause45_check_mmds(struct efx_nic *efx,</div><div class='ctx'> 			     unsigned int mmd_mask, unsigned int fatal_mask);</div><div class='ctx'> </div><div class='ctx'> /* Check the link status of specified mmds in bit mask */</div><div class='del'>-extern int mdio_clause45_links_ok(struct efx_nic *efx,</div><div class='del'>-				  unsigned int mmd_mask);</div><div class='add'>+extern bool mdio_clause45_links_ok(struct efx_nic *efx,</div><div class='add'>+				   unsigned int mmd_mask);</div><div class='ctx'> </div><div class='ctx'> /* Generic transmit disable support though PMAPMD */</div><div class='ctx'> extern void mdio_clause45_transmit_disable(struct efx_nic *efx);</div><div class='head'>diff --git a/drivers/net/sfc/net_driver.h b/drivers/net/sfc/net_driver.h<br/>index 219c74a772c3..cdb11fad6050 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sfc/net_driver.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/sfc/net_driver.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sfc/net_driver.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sfc/net_driver.h</a></div><div class='hunk'>@@ -88,9 +88,12 @@ do {if (net_ratelimit()) EFX_LOG(efx, fmt, ##args); } while (0)</div><div class='ctx'>  **************************************************************************/</div><div class='ctx'> </div><div class='ctx'> #define EFX_MAX_CHANNELS 32</div><div class='del'>-#define EFX_MAX_TX_QUEUES 1</div><div class='ctx'> #define EFX_MAX_RX_QUEUES EFX_MAX_CHANNELS</div><div class='ctx'> </div><div class='add'>+#define EFX_TX_QUEUE_OFFLOAD_CSUM	0</div><div class='add'>+#define EFX_TX_QUEUE_NO_CSUM		1</div><div class='add'>+#define EFX_TX_QUEUE_COUNT		2</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * struct efx_special_buffer - An Efx special buffer</div><div class='ctx'>  * @addr: CPU base address of the buffer</div><div class='hunk'>@@ -127,7 +130,6 @@ struct efx_special_buffer {</div><div class='ctx'>  *	This field is zero when the queue slot is empty.</div><div class='ctx'>  * @continuation: True if this fragment is not the end of a packet.</div><div class='ctx'>  * @unmap_single: True if pci_unmap_single should be used.</div><div class='del'>- * @unmap_addr: DMA address to unmap</div><div class='ctx'>  * @unmap_len: Length of this fragment to unmap</div><div class='ctx'>  */</div><div class='ctx'> struct efx_tx_buffer {</div><div class='hunk'>@@ -135,9 +137,8 @@ struct efx_tx_buffer {</div><div class='ctx'> 	struct efx_tso_header *tsoh;</div><div class='ctx'> 	dma_addr_t dma_addr;</div><div class='ctx'> 	unsigned short len;</div><div class='del'>-	unsigned char continuation;</div><div class='del'>-	unsigned char unmap_single;</div><div class='del'>-	dma_addr_t unmap_addr;</div><div class='add'>+	bool continuation;</div><div class='add'>+	bool unmap_single;</div><div class='ctx'> 	unsigned short unmap_len;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -156,13 +157,13 @@ struct efx_tx_buffer {</div><div class='ctx'>  *</div><div class='ctx'>  * @efx: The associated Efx NIC</div><div class='ctx'>  * @queue: DMA queue number</div><div class='del'>- * @used: Queue is used by net driver</div><div class='ctx'>  * @channel: The associated channel</div><div class='ctx'>  * @buffer: The software buffer ring</div><div class='ctx'>  * @txd: The hardware descriptor ring</div><div class='add'>+ * @flushed: Used when handling queue flushing</div><div class='ctx'>  * @read_count: Current read pointer.</div><div class='ctx'>  *	This is the number of buffers that have been removed from both rings.</div><div class='del'>- * @stopped: Stopped flag.</div><div class='add'>+ * @stopped: Stopped count.</div><div class='ctx'>  *	Set if this TX queue is currently stopping its port.</div><div class='ctx'>  * @insert_count: Current insert pointer</div><div class='ctx'>  *	This is the number of buffers that have been added to the</div><div class='hunk'>@@ -188,11 +189,11 @@ struct efx_tx_queue {</div><div class='ctx'> 	/* Members which don't change on the fast path */</div><div class='ctx'> 	struct efx_nic *efx ____cacheline_aligned_in_smp;</div><div class='ctx'> 	int queue;</div><div class='del'>-	int used;</div><div class='ctx'> 	struct efx_channel *channel;</div><div class='ctx'> 	struct efx_nic *nic;</div><div class='ctx'> 	struct efx_tx_buffer *buffer;</div><div class='ctx'> 	struct efx_special_buffer txd;</div><div class='add'>+	bool flushed;</div><div class='ctx'> </div><div class='ctx'> 	/* Members used mainly on the completion path */</div><div class='ctx'> 	unsigned int read_count ____cacheline_aligned_in_smp;</div><div class='hunk'>@@ -232,7 +233,6 @@ struct efx_rx_buffer {</div><div class='ctx'>  * struct efx_rx_queue - An Efx RX queue</div><div class='ctx'>  * @efx: The associated Efx NIC</div><div class='ctx'>  * @queue: DMA queue number</div><div class='del'>- * @used: Queue is used by net driver</div><div class='ctx'>  * @channel: The associated channel</div><div class='ctx'>  * @buffer: The software buffer ring</div><div class='ctx'>  * @rxd: The hardware descriptor ring</div><div class='hunk'>@@ -262,11 +262,11 @@ struct efx_rx_buffer {</div><div class='ctx'>  *	the remaining space in the allocation.</div><div class='ctx'>  * @buf_dma_addr: Page's DMA address.</div><div class='ctx'>  * @buf_data: Page's host address.</div><div class='add'>+ * @flushed: Use when handling queue flushing</div><div class='ctx'>  */</div><div class='ctx'> struct efx_rx_queue {</div><div class='ctx'> 	struct efx_nic *efx;</div><div class='ctx'> 	int queue;</div><div class='del'>-	int used;</div><div class='ctx'> 	struct efx_channel *channel;</div><div class='ctx'> 	struct efx_rx_buffer *buffer;</div><div class='ctx'> 	struct efx_special_buffer rxd;</div><div class='hunk'>@@ -288,6 +288,7 @@ struct efx_rx_queue {</div><div class='ctx'> 	struct page *buf_page;</div><div class='ctx'> 	dma_addr_t buf_dma_addr;</div><div class='ctx'> 	char *buf_data;</div><div class='add'>+	bool flushed;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -325,12 +326,10 @@ enum efx_rx_alloc_method {</div><div class='ctx'>  * queue.</div><div class='ctx'>  *</div><div class='ctx'>  * @efx: Associated Efx NIC</div><div class='del'>- * @evqnum: Event queue number</div><div class='ctx'>  * @channel: Channel instance number</div><div class='ctx'>  * @used_flags: Channel is used by net driver</div><div class='ctx'>  * @enabled: Channel enabled indicator</div><div class='ctx'>  * @irq: IRQ number (MSI and MSI-X only)</div><div class='del'>- * @has_interrupt: Channel has an interrupt</div><div class='ctx'>  * @irq_moderation: IRQ moderation value (in us)</div><div class='ctx'>  * @napi_dev: Net device used with NAPI</div><div class='ctx'>  * @napi_str: NAPI control structure</div><div class='hunk'>@@ -357,17 +356,14 @@ enum efx_rx_alloc_method {</div><div class='ctx'>  */</div><div class='ctx'> struct efx_channel {</div><div class='ctx'> 	struct efx_nic *efx;</div><div class='del'>-	int evqnum;</div><div class='ctx'> 	int channel;</div><div class='ctx'> 	int used_flags;</div><div class='del'>-	int enabled;</div><div class='add'>+	bool enabled;</div><div class='ctx'> 	int irq;</div><div class='del'>-	unsigned int has_interrupt;</div><div class='ctx'> 	unsigned int irq_moderation;</div><div class='ctx'> 	struct net_device *napi_dev;</div><div class='ctx'> 	struct napi_struct napi_str;</div><div class='del'>-	struct work_struct reset_work;</div><div class='del'>-	int work_pending;</div><div class='add'>+	bool work_pending;</div><div class='ctx'> 	struct efx_special_buffer eventq;</div><div class='ctx'> 	unsigned int eventq_read_ptr;</div><div class='ctx'> 	unsigned int last_eventq_read_ptr;</div><div class='hunk'>@@ -390,7 +386,7 @@ struct efx_channel {</div><div class='ctx'> 	 * access with prefetches.</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct efx_rx_buffer *rx_pkt;</div><div class='del'>-	int rx_pkt_csummed;</div><div class='add'>+	bool rx_pkt_csummed;</div><div class='ctx'> </div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -403,8 +399,8 @@ struct efx_channel {</div><div class='ctx'>  */</div><div class='ctx'> struct efx_blinker {</div><div class='ctx'> 	int led_num;</div><div class='del'>-	int state;</div><div class='del'>-	int resubmit;</div><div class='add'>+	bool state;</div><div class='add'>+	bool resubmit;</div><div class='ctx'> 	struct timer_list timer;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -432,8 +428,8 @@ struct efx_board {</div><div class='ctx'> 	 * have a separate init callback that happens later than</div><div class='ctx'> 	 * board init. */</div><div class='ctx'> 	int (*init_leds)(struct efx_nic *efx);</div><div class='del'>-	void (*set_fault_led) (struct efx_nic *efx, int state);</div><div class='del'>-	void (*blink) (struct efx_nic *efx, int start);</div><div class='add'>+	void (*set_fault_led) (struct efx_nic *efx, bool state);</div><div class='add'>+	void (*blink) (struct efx_nic *efx, bool start);</div><div class='ctx'> 	void (*fini) (struct efx_nic *nic);</div><div class='ctx'> 	struct efx_blinker blinker;</div><div class='ctx'> 	struct i2c_client *hwmon_client, *ioexp_client;</div><div class='hunk'>@@ -467,8 +463,7 @@ enum nic_state {</div><div class='ctx'> 	STATE_INIT = 0,</div><div class='ctx'> 	STATE_RUNNING = 1,</div><div class='ctx'> 	STATE_FINI = 2,</div><div class='del'>-	STATE_RESETTING = 3, /* rtnl_lock always held */</div><div class='del'>-	STATE_DISABLED = 4,</div><div class='add'>+	STATE_DISABLED = 3,</div><div class='ctx'> 	STATE_MAX,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -479,7 +474,7 @@ enum nic_state {</div><div class='ctx'>  * This is the equivalent of NET_IP_ALIGN [which controls the alignment</div><div class='ctx'>  * of the skb-&gt;head for hardware DMA].</div><div class='ctx'>  */</div><div class='del'>-#if defined(__i386__) || defined(__x86_64__)</div><div class='add'>+#ifdef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS</div><div class='ctx'> #define EFX_PAGE_IP_ALIGN 0</div><div class='ctx'> #else</div><div class='ctx'> #define EFX_PAGE_IP_ALIGN NET_IP_ALIGN</div><div class='hunk'>@@ -512,7 +507,6 @@ enum efx_fc_type {</div><div class='ctx'>  * @clear_interrupt: Clear down interrupt</div><div class='ctx'>  * @blink: Blink LEDs</div><div class='ctx'>  * @check_hw: Check hardware</div><div class='del'>- * @reset_xaui: Reset XAUI side of PHY for (software sequenced reset)</div><div class='ctx'>  * @mmds: MMD presence mask</div><div class='ctx'>  * @loopbacks: Supported loopback modes mask</div><div class='ctx'>  */</div><div class='hunk'>@@ -522,11 +516,28 @@ struct efx_phy_operations {</div><div class='ctx'> 	void (*reconfigure) (struct efx_nic *efx);</div><div class='ctx'> 	void (*clear_interrupt) (struct efx_nic *efx);</div><div class='ctx'> 	int (*check_hw) (struct efx_nic *efx);</div><div class='del'>-	void (*reset_xaui) (struct efx_nic *efx);</div><div class='add'>+	int (*test) (struct efx_nic *efx);</div><div class='ctx'> 	int mmds;</div><div class='ctx'> 	unsigned loopbacks;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * @enum efx_phy_mode - PHY operating mode flags</div><div class='add'>+ * @PHY_MODE_NORMAL: on and should pass traffic</div><div class='add'>+ * @PHY_MODE_TX_DISABLED: on with TX disabled</div><div class='add'>+ * @PHY_MODE_SPECIAL: on but will not pass traffic</div><div class='add'>+ */</div><div class='add'>+enum efx_phy_mode {</div><div class='add'>+	PHY_MODE_NORMAL		= 0,</div><div class='add'>+	PHY_MODE_TX_DISABLED	= 1,</div><div class='add'>+	PHY_MODE_SPECIAL	= 8,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline bool efx_phy_mode_disabled(enum efx_phy_mode mode)</div><div class='add'>+{</div><div class='add'>+	return !!(mode &amp; ~PHY_MODE_TX_DISABLED);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Efx extended statistics</div><div class='ctx'>  *</div><div class='hunk'>@@ -632,7 +643,7 @@ union efx_multicast_hash {</div><div class='ctx'>  * @tx_queue: TX DMA queues</div><div class='ctx'>  * @rx_queue: RX DMA queues</div><div class='ctx'>  * @channel: Channels</div><div class='del'>- * @rss_queues: Number of RSS queues</div><div class='add'>+ * @n_rx_queues: Number of RX queues</div><div class='ctx'>  * @rx_buffer_len: RX buffer length</div><div class='ctx'>  * @rx_buffer_order: Order (log2) of number of pages for each RX buffer</div><div class='ctx'>  * @irq_status: Interrupt status buffer</div><div class='hunk'>@@ -640,15 +651,20 @@ union efx_multicast_hash {</div><div class='ctx'>  *	This register is written with the SMP processor ID whenever an</div><div class='ctx'>  *	interrupt is handled.  It is used by falcon_test_interrupt()</div><div class='ctx'>  *	to verify that an interrupt has occurred.</div><div class='add'>+ * @spi_flash: SPI flash device</div><div class='add'>+ *	This field will be %NULL if no flash device is present.</div><div class='add'>+ * @spi_eeprom: SPI EEPROM device</div><div class='add'>+ *	This field will be %NULL if no EEPROM device is present.</div><div class='ctx'>  * @n_rx_nodesc_drop_cnt: RX no descriptor drop count</div><div class='ctx'>  * @nic_data: Hardware dependant state</div><div class='del'>- * @mac_lock: MAC access lock. Protects @port_enabled, efx_monitor() and</div><div class='del'>- *	efx_reconfigure_port()</div><div class='add'>+ * @mac_lock: MAC access lock. Protects @port_enabled, @phy_mode,</div><div class='add'>+ *	@port_inhibited, efx_monitor() and efx_reconfigure_port()</div><div class='ctx'>  * @port_enabled: Port enabled indicator.</div><div class='ctx'>  *	Serialises efx_stop_all(), efx_start_all() and efx_monitor() and</div><div class='ctx'>  *	efx_reconfigure_work with kernel interfaces. Safe to read under any</div><div class='ctx'>  *	one of the rtnl_lock, mac_lock, or netif_tx_lock, but all three must</div><div class='ctx'>  *	be held to modify it.</div><div class='add'>+ * @port_inhibited: If set, the netif_carrier is always off. Hold the mac_lock</div><div class='ctx'>  * @port_initialized: Port initialized?</div><div class='ctx'>  * @net_dev: Operating system network device. Consider holding the rtnl lock</div><div class='ctx'>  * @rx_checksum_enabled: RX checksumming enabled</div><div class='hunk'>@@ -658,14 +674,16 @@ union efx_multicast_hash {</div><div class='ctx'>  *	can provide.  Generic code converts these into a standard</div><div class='ctx'>  *	&amp;struct net_device_stats.</div><div class='ctx'>  * @stats_buffer: DMA buffer for statistics</div><div class='del'>- * @stats_lock: Statistics update lock</div><div class='add'>+ * @stats_lock: Statistics update lock. Serialises statistics fetches</div><div class='add'>+ * @stats_enabled: Temporarily disable statistics fetches.</div><div class='add'>+ *	Serialised by @stats_lock</div><div class='ctx'>  * @mac_address: Permanent MAC address</div><div class='ctx'>  * @phy_type: PHY type</div><div class='ctx'>  * @phy_lock: PHY access lock</div><div class='ctx'>  * @phy_op: PHY interface</div><div class='ctx'>  * @phy_data: PHY private data (including PHY-specific stats)</div><div class='ctx'>  * @mii: PHY interface</div><div class='del'>- * @tx_disabled: PHY transmitter turned off</div><div class='add'>+ * @phy_mode: PHY operating mode. Serialised by @mac_lock.</div><div class='ctx'>  * @link_up: Link status</div><div class='ctx'>  * @link_options: Link options (MII/GMII format)</div><div class='ctx'>  * @n_link_state_changes: Number of times the link has changed state</div><div class='hunk'>@@ -700,27 +718,31 @@ struct efx_nic {</div><div class='ctx'> 	enum nic_state state;</div><div class='ctx'> 	enum reset_type reset_pending;</div><div class='ctx'> </div><div class='del'>-	struct efx_tx_queue tx_queue[EFX_MAX_TX_QUEUES];</div><div class='add'>+	struct efx_tx_queue tx_queue[EFX_TX_QUEUE_COUNT];</div><div class='ctx'> 	struct efx_rx_queue rx_queue[EFX_MAX_RX_QUEUES];</div><div class='ctx'> 	struct efx_channel channel[EFX_MAX_CHANNELS];</div><div class='ctx'> </div><div class='del'>-	int rss_queues;</div><div class='add'>+	int n_rx_queues;</div><div class='ctx'> 	unsigned int rx_buffer_len;</div><div class='ctx'> 	unsigned int rx_buffer_order;</div><div class='ctx'> </div><div class='ctx'> 	struct efx_buffer irq_status;</div><div class='ctx'> 	volatile signed int last_irq_cpu;</div><div class='ctx'> </div><div class='add'>+	struct efx_spi_device *spi_flash;</div><div class='add'>+	struct efx_spi_device *spi_eeprom;</div><div class='add'>+</div><div class='ctx'> 	unsigned n_rx_nodesc_drop_cnt;</div><div class='ctx'> </div><div class='ctx'> 	struct falcon_nic_data *nic_data;</div><div class='ctx'> </div><div class='ctx'> 	struct mutex mac_lock;</div><div class='del'>-	int port_enabled;</div><div class='add'>+	bool port_enabled;</div><div class='add'>+	bool port_inhibited;</div><div class='ctx'> </div><div class='del'>-	int port_initialized;</div><div class='add'>+	bool port_initialized;</div><div class='ctx'> 	struct net_device *net_dev;</div><div class='del'>-	int rx_checksum_enabled;</div><div class='add'>+	bool rx_checksum_enabled;</div><div class='ctx'> </div><div class='ctx'> 	atomic_t netif_stop_count;</div><div class='ctx'> 	spinlock_t netif_stop_lock;</div><div class='hunk'>@@ -728,6 +750,7 @@ struct efx_nic {</div><div class='ctx'> 	struct efx_mac_stats mac_stats;</div><div class='ctx'> 	struct efx_buffer stats_buffer;</div><div class='ctx'> 	spinlock_t stats_lock;</div><div class='add'>+	bool stats_enabled;</div><div class='ctx'> </div><div class='ctx'> 	unsigned char mac_address[ETH_ALEN];</div><div class='ctx'> </div><div class='hunk'>@@ -736,13 +759,13 @@ struct efx_nic {</div><div class='ctx'> 	struct efx_phy_operations *phy_op;</div><div class='ctx'> 	void *phy_data;</div><div class='ctx'> 	struct mii_if_info mii;</div><div class='del'>-	unsigned tx_disabled;</div><div class='add'>+	enum efx_phy_mode phy_mode;</div><div class='ctx'> </div><div class='del'>-	int link_up;</div><div class='add'>+	bool link_up;</div><div class='ctx'> 	unsigned int link_options;</div><div class='ctx'> 	unsigned int n_link_state_changes;</div><div class='ctx'> </div><div class='del'>-	int promiscuous;</div><div class='add'>+	bool promiscuous;</div><div class='ctx'> 	union efx_multicast_hash multicast_hash;</div><div class='ctx'> 	enum efx_fc_type flow_control;</div><div class='ctx'> 	struct work_struct reconfigure_work;</div><div class='hunk'>@@ -829,50 +852,33 @@ struct efx_nic_type {</div><div class='ctx'> 			continue;					\</div><div class='ctx'> 		else</div><div class='ctx'> </div><div class='del'>-/* Iterate over all used channels with interrupts */</div><div class='del'>-#define efx_for_each_channel_with_interrupt(_channel, _efx)		\</div><div class='del'>-	for (_channel = &amp;_efx-&gt;channel[0];				\</div><div class='del'>-	     _channel &lt; &amp;_efx-&gt;channel[EFX_MAX_CHANNELS];		\</div><div class='del'>-	     _channel++)						\</div><div class='del'>-		if (!(_channel-&gt;used_flags &amp;&amp; _channel-&gt;has_interrupt))	\</div><div class='del'>-			continue;					\</div><div class='del'>-		else</div><div class='del'>-</div><div class='ctx'> /* Iterate over all used TX queues */</div><div class='ctx'> #define efx_for_each_tx_queue(_tx_queue, _efx)				\</div><div class='ctx'> 	for (_tx_queue = &amp;_efx-&gt;tx_queue[0];				\</div><div class='del'>-	     _tx_queue &lt; &amp;_efx-&gt;tx_queue[EFX_MAX_TX_QUEUES];		\</div><div class='del'>-	     _tx_queue++)						\</div><div class='del'>-		if (!_tx_queue-&gt;used)					\</div><div class='del'>-			continue;					\</div><div class='del'>-		else</div><div class='add'>+	     _tx_queue &lt; &amp;_efx-&gt;tx_queue[EFX_TX_QUEUE_COUNT];		\</div><div class='add'>+	     _tx_queue++)</div><div class='ctx'> </div><div class='ctx'> /* Iterate over all TX queues belonging to a channel */</div><div class='ctx'> #define efx_for_each_channel_tx_queue(_tx_queue, _channel)		\</div><div class='ctx'> 	for (_tx_queue = &amp;_channel-&gt;efx-&gt;tx_queue[0];			\</div><div class='del'>-	     _tx_queue &lt; &amp;_channel-&gt;efx-&gt;tx_queue[EFX_MAX_TX_QUEUES];	\</div><div class='add'>+	     _tx_queue &lt; &amp;_channel-&gt;efx-&gt;tx_queue[EFX_TX_QUEUE_COUNT];	\</div><div class='ctx'> 	     _tx_queue++)						\</div><div class='del'>-		if ((!_tx_queue-&gt;used) ||				\</div><div class='del'>-		    (_tx_queue-&gt;channel != _channel))			\</div><div class='add'>+		if (_tx_queue-&gt;channel != _channel)			\</div><div class='ctx'> 			continue;					\</div><div class='ctx'> 		else</div><div class='ctx'> </div><div class='ctx'> /* Iterate over all used RX queues */</div><div class='ctx'> #define efx_for_each_rx_queue(_rx_queue, _efx)				\</div><div class='ctx'> 	for (_rx_queue = &amp;_efx-&gt;rx_queue[0];				\</div><div class='del'>-	     _rx_queue &lt; &amp;_efx-&gt;rx_queue[EFX_MAX_RX_QUEUES];		\</div><div class='del'>-	     _rx_queue++)						\</div><div class='del'>-		if (!_rx_queue-&gt;used)					\</div><div class='del'>-			continue;					\</div><div class='del'>-		else</div><div class='add'>+	     _rx_queue &lt; &amp;_efx-&gt;rx_queue[_efx-&gt;n_rx_queues];		\</div><div class='add'>+	     _rx_queue++)</div><div class='ctx'> </div><div class='ctx'> /* Iterate over all RX queues belonging to a channel */</div><div class='ctx'> #define efx_for_each_channel_rx_queue(_rx_queue, _channel)		\</div><div class='del'>-	for (_rx_queue = &amp;_channel-&gt;efx-&gt;rx_queue[0];			\</div><div class='del'>-	     _rx_queue &lt; &amp;_channel-&gt;efx-&gt;rx_queue[EFX_MAX_RX_QUEUES];	\</div><div class='del'>-	     _rx_queue++)						\</div><div class='del'>-		if ((!_rx_queue-&gt;used) ||				\</div><div class='del'>-		    (_rx_queue-&gt;channel != _channel))			\</div><div class='add'>+	for (_rx_queue = &amp;_channel-&gt;efx-&gt;rx_queue[_channel-&gt;channel];	\</div><div class='add'>+	     _rx_queue;							\</div><div class='add'>+	     _rx_queue = NULL)						\</div><div class='add'>+		if (_rx_queue-&gt;channel != _channel)			\</div><div class='ctx'> 			continue;					\</div><div class='ctx'> 		else</div><div class='ctx'> </div><div class='hunk'>@@ -886,13 +892,13 @@ static inline struct efx_rx_buffer *efx_rx_buffer(struct efx_rx_queue *rx_queue,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Set bit in a little-endian bitfield */</div><div class='del'>-static inline void set_bit_le(int nr, unsigned char *addr)</div><div class='add'>+static inline void set_bit_le(unsigned nr, unsigned char *addr)</div><div class='ctx'> {</div><div class='ctx'> 	addr[nr / 8] |= (1 &lt;&lt; (nr % 8));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Clear bit in a little-endian bitfield */</div><div class='del'>-static inline void clear_bit_le(int nr, unsigned char *addr)</div><div class='add'>+static inline void clear_bit_le(unsigned nr, unsigned char *addr)</div><div class='ctx'> {</div><div class='ctx'> 	addr[nr / 8] &amp;= ~(1 &lt;&lt; (nr % 8));</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/sfc/phy.h b/drivers/net/sfc/phy.h<br/>index 9d02c84e6b2d..f746536f4ffa 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sfc/phy.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/sfc/phy.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sfc/phy.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sfc/phy.h</a></div><div class='hunk'>@@ -15,15 +15,7 @@</div><div class='ctx'>  */</div><div class='ctx'> extern struct efx_phy_operations falcon_tenxpress_phy_ops;</div><div class='ctx'> </div><div class='del'>-enum tenxpress_state {</div><div class='del'>-	TENXPRESS_STATUS_OFF = 0,</div><div class='del'>-	TENXPRESS_STATUS_OTEMP = 1,</div><div class='del'>-	TENXPRESS_STATUS_NORMAL = 2,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-extern void tenxpress_set_state(struct efx_nic *efx,</div><div class='del'>-				enum tenxpress_state state);</div><div class='del'>-extern void tenxpress_phy_blink(struct efx_nic *efx, int blink);</div><div class='add'>+extern void tenxpress_phy_blink(struct efx_nic *efx, bool blink);</div><div class='ctx'> extern void tenxpress_crc_err(struct efx_nic *efx);</div><div class='ctx'> </div><div class='ctx'> /****************************************************************************</div><div class='head'>diff --git a/drivers/net/sfc/rx.c b/drivers/net/sfc/rx.c<br/>index 0d27dd39bc09..0f805da4ce55 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sfc/rx.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/sfc/rx.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sfc/rx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sfc/rx.c</a></div><div class='hunk'>@@ -212,8 +212,8 @@ void efx_lro_fini(struct net_lro_mgr *lro_mgr)</div><div class='ctx'>  * and populates a struct efx_rx_buffer with the relevant</div><div class='ctx'>  * information.  Return a negative error code or 0 on success.</div><div class='ctx'>  */</div><div class='del'>-static inline int efx_init_rx_buffer_skb(struct efx_rx_queue *rx_queue,</div><div class='del'>-					 struct efx_rx_buffer *rx_buf)</div><div class='add'>+static int efx_init_rx_buffer_skb(struct efx_rx_queue *rx_queue,</div><div class='add'>+				  struct efx_rx_buffer *rx_buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct efx_nic *efx = rx_queue-&gt;efx;</div><div class='ctx'> 	struct net_device *net_dev = efx-&gt;net_dev;</div><div class='hunk'>@@ -252,8 +252,8 @@ static inline int efx_init_rx_buffer_skb(struct efx_rx_queue *rx_queue,</div><div class='ctx'>  * and populates a struct efx_rx_buffer with the relevant</div><div class='ctx'>  * information.  Return a negative error code or 0 on success.</div><div class='ctx'>  */</div><div class='del'>-static inline int efx_init_rx_buffer_page(struct efx_rx_queue *rx_queue,</div><div class='del'>-					  struct efx_rx_buffer *rx_buf)</div><div class='add'>+static int efx_init_rx_buffer_page(struct efx_rx_queue *rx_queue,</div><div class='add'>+				   struct efx_rx_buffer *rx_buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct efx_nic *efx = rx_queue-&gt;efx;</div><div class='ctx'> 	int bytes, space, offset;</div><div class='hunk'>@@ -319,8 +319,8 @@ static inline int efx_init_rx_buffer_page(struct efx_rx_queue *rx_queue,</div><div class='ctx'>  * and populates a struct efx_rx_buffer with the relevant</div><div class='ctx'>  * information.</div><div class='ctx'>  */</div><div class='del'>-static inline int efx_init_rx_buffer(struct efx_rx_queue *rx_queue,</div><div class='del'>-				     struct efx_rx_buffer *new_rx_buf)</div><div class='add'>+static int efx_init_rx_buffer(struct efx_rx_queue *rx_queue,</div><div class='add'>+			      struct efx_rx_buffer *new_rx_buf)</div><div class='ctx'> {</div><div class='ctx'> 	int rc = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -340,8 +340,8 @@ static inline int efx_init_rx_buffer(struct efx_rx_queue *rx_queue,</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void efx_unmap_rx_buffer(struct efx_nic *efx,</div><div class='del'>-				       struct efx_rx_buffer *rx_buf)</div><div class='add'>+static void efx_unmap_rx_buffer(struct efx_nic *efx,</div><div class='add'>+				struct efx_rx_buffer *rx_buf)</div><div class='ctx'> {</div><div class='ctx'> 	if (rx_buf-&gt;page) {</div><div class='ctx'> 		EFX_BUG_ON_PARANOID(rx_buf-&gt;skb);</div><div class='hunk'>@@ -357,8 +357,8 @@ static inline void efx_unmap_rx_buffer(struct efx_nic *efx,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void efx_free_rx_buffer(struct efx_nic *efx,</div><div class='del'>-				      struct efx_rx_buffer *rx_buf)</div><div class='add'>+static void efx_free_rx_buffer(struct efx_nic *efx,</div><div class='add'>+			       struct efx_rx_buffer *rx_buf)</div><div class='ctx'> {</div><div class='ctx'> 	if (rx_buf-&gt;page) {</div><div class='ctx'> 		__free_pages(rx_buf-&gt;page, efx-&gt;rx_buffer_order);</div><div class='hunk'>@@ -369,8 +369,8 @@ static inline void efx_free_rx_buffer(struct efx_nic *efx,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void efx_fini_rx_buffer(struct efx_rx_queue *rx_queue,</div><div class='del'>-				      struct efx_rx_buffer *rx_buf)</div><div class='add'>+static void efx_fini_rx_buffer(struct efx_rx_queue *rx_queue,</div><div class='add'>+			       struct efx_rx_buffer *rx_buf)</div><div class='ctx'> {</div><div class='ctx'> 	efx_unmap_rx_buffer(rx_queue-&gt;efx, rx_buf);</div><div class='ctx'> 	efx_free_rx_buffer(rx_queue-&gt;efx, rx_buf);</div><div class='hunk'>@@ -506,10 +506,10 @@ void efx_rx_work(struct work_struct *data)</div><div class='ctx'> 		efx_schedule_slow_fill(rx_queue, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void efx_rx_packet__check_len(struct efx_rx_queue *rx_queue,</div><div class='del'>-					    struct efx_rx_buffer *rx_buf,</div><div class='del'>-					    int len, int *discard,</div><div class='del'>-					    int *leak_packet)</div><div class='add'>+static void efx_rx_packet__check_len(struct efx_rx_queue *rx_queue,</div><div class='add'>+				     struct efx_rx_buffer *rx_buf,</div><div class='add'>+				     int len, bool *discard,</div><div class='add'>+				     bool *leak_packet)</div><div class='ctx'> {</div><div class='ctx'> 	struct efx_nic *efx = rx_queue-&gt;efx;</div><div class='ctx'> 	unsigned max_len = rx_buf-&gt;len - efx-&gt;type-&gt;rx_buffer_padding;</div><div class='hunk'>@@ -520,7 +520,7 @@ static inline void efx_rx_packet__check_len(struct efx_rx_queue *rx_queue,</div><div class='ctx'> 	/* The packet must be discarded, but this is only a fatal error</div><div class='ctx'> 	 * if the caller indicated it was</div><div class='ctx'> 	 */</div><div class='del'>-	*discard = 1;</div><div class='add'>+	*discard = true;</div><div class='ctx'> </div><div class='ctx'> 	if ((len &gt; rx_buf-&gt;len) &amp;&amp; EFX_WORKAROUND_8071(efx)) {</div><div class='ctx'> 		EFX_ERR_RL(efx, " RX queue %d seriously overlength "</div><div class='hunk'>@@ -546,8 +546,8 @@ static inline void efx_rx_packet__check_len(struct efx_rx_queue *rx_queue,</div><div class='ctx'>  * Handles driverlink veto, and passes the fragment up via</div><div class='ctx'>  * the appropriate LRO method</div><div class='ctx'>  */</div><div class='del'>-static inline void efx_rx_packet_lro(struct efx_channel *channel,</div><div class='del'>-				     struct efx_rx_buffer *rx_buf)</div><div class='add'>+static void efx_rx_packet_lro(struct efx_channel *channel,</div><div class='add'>+			      struct efx_rx_buffer *rx_buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_lro_mgr *lro_mgr = &amp;channel-&gt;lro_mgr;</div><div class='ctx'> 	void *priv = channel;</div><div class='hunk'>@@ -574,9 +574,9 @@ static inline void efx_rx_packet_lro(struct efx_channel *channel,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Allocate and construct an SKB around a struct page.*/</div><div class='del'>-static inline struct sk_buff *efx_rx_mk_skb(struct efx_rx_buffer *rx_buf,</div><div class='del'>-					    struct efx_nic *efx,</div><div class='del'>-					    int hdr_len)</div><div class='add'>+static struct sk_buff *efx_rx_mk_skb(struct efx_rx_buffer *rx_buf,</div><div class='add'>+				     struct efx_nic *efx,</div><div class='add'>+				     int hdr_len)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> </div><div class='hunk'>@@ -621,11 +621,11 @@ static inline struct sk_buff *efx_rx_mk_skb(struct efx_rx_buffer *rx_buf,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void efx_rx_packet(struct efx_rx_queue *rx_queue, unsigned int index,</div><div class='del'>-		   unsigned int len, int checksummed, int discard)</div><div class='add'>+		   unsigned int len, bool checksummed, bool discard)</div><div class='ctx'> {</div><div class='ctx'> 	struct efx_nic *efx = rx_queue-&gt;efx;</div><div class='ctx'> 	struct efx_rx_buffer *rx_buf;</div><div class='del'>-	int leak_packet = 0;</div><div class='add'>+	bool leak_packet = false;</div><div class='ctx'> </div><div class='ctx'> 	rx_buf = efx_rx_buffer(rx_queue, index);</div><div class='ctx'> 	EFX_BUG_ON_PARANOID(!rx_buf-&gt;data);</div><div class='hunk'>@@ -683,11 +683,11 @@ void efx_rx_packet(struct efx_rx_queue *rx_queue, unsigned int index,</div><div class='ctx'> </div><div class='ctx'> /* Handle a received packet.  Second half: Touches packet payload. */</div><div class='ctx'> void __efx_rx_packet(struct efx_channel *channel,</div><div class='del'>-		     struct efx_rx_buffer *rx_buf, int checksummed)</div><div class='add'>+		     struct efx_rx_buffer *rx_buf, bool checksummed)</div><div class='ctx'> {</div><div class='ctx'> 	struct efx_nic *efx = channel-&gt;efx;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='del'>-	int lro = efx-&gt;net_dev-&gt;features &amp; NETIF_F_LRO;</div><div class='add'>+	bool lro = !!(efx-&gt;net_dev-&gt;features &amp; NETIF_F_LRO);</div><div class='ctx'> </div><div class='ctx'> 	/* If we're in loopback test, then pass the packet directly to the</div><div class='ctx'> 	 * loopback layer, and free the rx_buf here</div><div class='hunk'>@@ -789,27 +789,18 @@ int efx_probe_rx_queue(struct efx_rx_queue *rx_queue)</div><div class='ctx'> 	/* Allocate RX buffers */</div><div class='ctx'> 	rxq_size = (efx-&gt;type-&gt;rxd_ring_mask + 1) * sizeof(*rx_queue-&gt;buffer);</div><div class='ctx'> 	rx_queue-&gt;buffer = kzalloc(rxq_size, GFP_KERNEL);</div><div class='del'>-	if (!rx_queue-&gt;buffer) {</div><div class='del'>-		rc = -ENOMEM;</div><div class='del'>-		goto fail1;</div><div class='del'>-	}</div><div class='add'>+	if (!rx_queue-&gt;buffer)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	rc = falcon_probe_rx(rx_queue);</div><div class='del'>-	if (rc)</div><div class='del'>-		goto fail2;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>- fail2:</div><div class='del'>-	kfree(rx_queue-&gt;buffer);</div><div class='del'>-	rx_queue-&gt;buffer = NULL;</div><div class='del'>- fail1:</div><div class='del'>-	rx_queue-&gt;used = 0;</div><div class='del'>-</div><div class='add'>+	if (rc) {</div><div class='add'>+		kfree(rx_queue-&gt;buffer);</div><div class='add'>+		rx_queue-&gt;buffer = NULL;</div><div class='add'>+	}</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int efx_init_rx_queue(struct efx_rx_queue *rx_queue)</div><div class='add'>+void efx_init_rx_queue(struct efx_rx_queue *rx_queue)</div><div class='ctx'> {</div><div class='ctx'> 	struct efx_nic *efx = rx_queue-&gt;efx;</div><div class='ctx'> 	unsigned int max_fill, trigger, limit;</div><div class='hunk'>@@ -833,7 +824,7 @@ int efx_init_rx_queue(struct efx_rx_queue *rx_queue)</div><div class='ctx'> 	rx_queue-&gt;fast_fill_limit = limit;</div><div class='ctx'> </div><div class='ctx'> 	/* Set up RX descriptor ring */</div><div class='del'>-	return falcon_init_rx(rx_queue);</div><div class='add'>+	falcon_init_rx(rx_queue);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void efx_fini_rx_queue(struct efx_rx_queue *rx_queue)</div><div class='hunk'>@@ -872,7 +863,6 @@ void efx_remove_rx_queue(struct efx_rx_queue *rx_queue)</div><div class='ctx'> </div><div class='ctx'> 	kfree(rx_queue-&gt;buffer);</div><div class='ctx'> 	rx_queue-&gt;buffer = NULL;</div><div class='del'>-	rx_queue-&gt;used = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void efx_flush_lro(struct efx_channel *channel)</div><div class='head'>diff --git a/drivers/net/sfc/rx.h b/drivers/net/sfc/rx.h<br/>index f35e377bfc5f..0e88a9ddc1c6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sfc/rx.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/sfc/rx.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sfc/rx.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sfc/rx.h</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'> </div><div class='ctx'> int efx_probe_rx_queue(struct efx_rx_queue *rx_queue);</div><div class='ctx'> void efx_remove_rx_queue(struct efx_rx_queue *rx_queue);</div><div class='del'>-int efx_init_rx_queue(struct efx_rx_queue *rx_queue);</div><div class='add'>+void efx_init_rx_queue(struct efx_rx_queue *rx_queue);</div><div class='ctx'> void efx_fini_rx_queue(struct efx_rx_queue *rx_queue);</div><div class='ctx'> </div><div class='ctx'> int efx_lro_init(struct net_lro_mgr *lro_mgr, struct efx_nic *efx);</div><div class='hunk'>@@ -24,6 +24,6 @@ void efx_rx_strategy(struct efx_channel *channel);</div><div class='ctx'> void efx_fast_push_rx_descriptors(struct efx_rx_queue *rx_queue);</div><div class='ctx'> void efx_rx_work(struct work_struct *data);</div><div class='ctx'> void __efx_rx_packet(struct efx_channel *channel,</div><div class='del'>-		     struct efx_rx_buffer *rx_buf, int checksummed);</div><div class='add'>+		     struct efx_rx_buffer *rx_buf, bool checksummed);</div><div class='ctx'> </div><div class='ctx'> #endif /* EFX_RX_H */</div><div class='head'>diff --git a/drivers/net/sfc/selftest.c b/drivers/net/sfc/selftest.c<br/>index 3b2de9fe7f27..362956e3fe17 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sfc/selftest.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/sfc/selftest.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sfc/selftest.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sfc/selftest.c</a></div><div class='hunk'>@@ -27,6 +27,9 @@</div><div class='ctx'> #include "boards.h"</div><div class='ctx'> #include "workarounds.h"</div><div class='ctx'> #include "mac.h"</div><div class='add'>+#include "spi.h"</div><div class='add'>+#include "falcon_io.h"</div><div class='add'>+#include "mdio_10g.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Loopback test packet structure</div><div class='hunk'>@@ -51,7 +54,7 @@ static const char *payload_msg =</div><div class='ctx'> 	"Hello world! This is an Efx loopback test in progress!";</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * efx_selftest_state - persistent state during a selftest</div><div class='add'>+ * efx_loopback_state - persistent state during a loopback selftest</div><div class='ctx'>  * @flush:		Drop all packets in efx_loopback_rx_packet</div><div class='ctx'>  * @packet_count:	Number of packets being used in this test</div><div class='ctx'>  * @skbs:		An array of skbs transmitted</div><div class='hunk'>@@ -59,10 +62,14 @@ static const char *payload_msg =</div><div class='ctx'>  * @rx_bad:		RX bad packet count</div><div class='ctx'>  * @payload:		Payload used in tests</div><div class='ctx'>  */</div><div class='del'>-struct efx_selftest_state {</div><div class='del'>-	int flush;</div><div class='add'>+struct efx_loopback_state {</div><div class='add'>+	bool flush;</div><div class='ctx'> 	int packet_count;</div><div class='ctx'> 	struct sk_buff **skbs;</div><div class='add'>+</div><div class='add'>+	/* Checksums are being offloaded */</div><div class='add'>+	bool offload_csum;</div><div class='add'>+</div><div class='ctx'> 	atomic_t rx_good;</div><div class='ctx'> 	atomic_t rx_bad;</div><div class='ctx'> 	struct efx_loopback_payload payload;</div><div class='hunk'>@@ -70,21 +77,65 @@ struct efx_selftest_state {</div><div class='ctx'> </div><div class='ctx'> /**************************************************************************</div><div class='ctx'>  *</div><div class='del'>- * Configurable values</div><div class='add'>+ * MII, NVRAM and register tests</div><div class='ctx'>  *</div><div class='ctx'>  **************************************************************************/</div><div class='ctx'> </div><div class='del'>-/* Level of loopback testing</div><div class='del'>- *</div><div class='del'>- * The maximum packet burst length is 16**(n-1), i.e.</div><div class='del'>- *</div><div class='del'>- * - Level 0 : no packets</div><div class='del'>- * - Level 1 : 1 packet</div><div class='del'>- * - Level 2 : 17 packets (1 * 1 packet, 1 * 16 packets)</div><div class='del'>- * - Level 3 : 273 packets (1 * 1 packet, 1 * 16 packet, 1 * 256 packets)</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-static unsigned int loopback_test_level = 3;</div><div class='add'>+static int efx_test_mii(struct efx_nic *efx, struct efx_self_tests *tests)</div><div class='add'>+{</div><div class='add'>+	int rc = 0;</div><div class='add'>+	u16 physid1, physid2;</div><div class='add'>+	struct mii_if_info *mii = &amp;efx-&gt;mii;</div><div class='add'>+	struct net_device *net_dev = efx-&gt;net_dev;</div><div class='add'>+</div><div class='add'>+	if (efx-&gt;phy_type == PHY_TYPE_NONE)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;efx-&gt;mac_lock);</div><div class='add'>+	tests-&gt;mii = -1;</div><div class='add'>+</div><div class='add'>+	physid1 = mii-&gt;mdio_read(net_dev, mii-&gt;phy_id, MII_PHYSID1);</div><div class='add'>+	physid2 = mii-&gt;mdio_read(net_dev, mii-&gt;phy_id, MII_PHYSID2);</div><div class='add'>+</div><div class='add'>+	if ((physid1 == 0x0000) || (physid1 == 0xffff) ||</div><div class='add'>+	    (physid2 == 0x0000) || (physid2 == 0xffff)) {</div><div class='add'>+		EFX_ERR(efx, "no MII PHY present with ID %d\n",</div><div class='add'>+			mii-&gt;phy_id);</div><div class='add'>+		rc = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = mdio_clause45_check_mmds(efx, efx-&gt;phy_op-&gt;mmds, 0);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;efx-&gt;mac_lock);</div><div class='add'>+	tests-&gt;mii = rc ? -1 : 1;</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int efx_test_nvram(struct efx_nic *efx, struct efx_self_tests *tests)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = falcon_read_nvram(efx, NULL);</div><div class='add'>+	tests-&gt;nvram = rc ? -1 : 1;</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int efx_test_chip(struct efx_nic *efx, struct efx_self_tests *tests)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	/* Not supported on A-series silicon */</div><div class='add'>+	if (falcon_rev(efx) &lt; FALCON_REV_B0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	rc = falcon_test_registers(efx);</div><div class='add'>+	tests-&gt;registers = rc ? -1 : 1;</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /**************************************************************************</div><div class='ctx'>  *</div><div class='hunk'>@@ -107,7 +158,7 @@ static int efx_test_interrupts(struct efx_nic *efx,</div><div class='ctx'> </div><div class='ctx'> 	/* ACK each interrupting event queue. Receiving an interrupt due to</div><div class='ctx'> 	 * traffic before a test event is raised is considered a pass */</div><div class='del'>-	efx_for_each_channel_with_interrupt(channel, efx) {</div><div class='add'>+	efx_for_each_channel(channel, efx) {</div><div class='ctx'> 		if (channel-&gt;work_pending)</div><div class='ctx'> 			efx_process_channel_now(channel);</div><div class='ctx'> 		if (efx-&gt;last_irq_cpu &gt;= 0)</div><div class='hunk'>@@ -132,41 +183,6 @@ static int efx_test_interrupts(struct efx_nic *efx,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Test generation and receipt of non-interrupting events */</div><div class='del'>-static int efx_test_eventq(struct efx_channel *channel,</div><div class='del'>-			   struct efx_self_tests *tests)</div><div class='del'>-{</div><div class='del'>-	unsigned int magic;</div><div class='del'>-</div><div class='del'>-	/* Channel specific code, limited to 20 bits */</div><div class='del'>-	magic = (0x00010150 + channel-&gt;channel);</div><div class='del'>-	EFX_LOG(channel-&gt;efx, "channel %d testing event queue with code %x\n",</div><div class='del'>-		channel-&gt;channel, magic);</div><div class='del'>-</div><div class='del'>-	tests-&gt;eventq_dma[channel-&gt;channel] = -1;</div><div class='del'>-	tests-&gt;eventq_int[channel-&gt;channel] = 1;	/* fake pass */</div><div class='del'>-	tests-&gt;eventq_poll[channel-&gt;channel] = 1;	/* fake pass */</div><div class='del'>-</div><div class='del'>-	/* Reset flag and zero magic word */</div><div class='del'>-	channel-&gt;efx-&gt;last_irq_cpu = -1;</div><div class='del'>-	channel-&gt;eventq_magic = 0;</div><div class='del'>-	smp_wmb();</div><div class='del'>-</div><div class='del'>-	falcon_generate_test_event(channel, magic);</div><div class='del'>-	udelay(1);</div><div class='del'>-</div><div class='del'>-	efx_process_channel_now(channel);</div><div class='del'>-	if (channel-&gt;eventq_magic != magic) {</div><div class='del'>-		EFX_ERR(channel-&gt;efx, "channel %d  failed to see test event\n",</div><div class='del'>-			channel-&gt;channel);</div><div class='del'>-		return -ETIMEDOUT;</div><div class='del'>-	} else {</div><div class='del'>-		tests-&gt;eventq_dma[channel-&gt;channel] = 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* Test generation and receipt of interrupting events */</div><div class='ctx'> static int efx_test_eventq_irq(struct efx_channel *channel,</div><div class='ctx'> 			       struct efx_self_tests *tests)</div><div class='hunk'>@@ -230,39 +246,18 @@ static int efx_test_eventq_irq(struct efx_channel *channel,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**************************************************************************</div><div class='del'>- *</div><div class='del'>- * PHY testing</div><div class='del'>- *</div><div class='del'>- **************************************************************************/</div><div class='del'>-</div><div class='del'>-/* Check PHY presence by reading the PHY ID registers */</div><div class='del'>-static int efx_test_phy(struct efx_nic *efx,</div><div class='del'>-			struct efx_self_tests *tests)</div><div class='add'>+static int efx_test_phy(struct efx_nic *efx, struct efx_self_tests *tests)</div><div class='ctx'> {</div><div class='del'>-	u16 physid1, physid2;</div><div class='del'>-	struct mii_if_info *mii = &amp;efx-&gt;mii;</div><div class='del'>-	struct net_device *net_dev = efx-&gt;net_dev;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='del'>-	if (efx-&gt;phy_type == PHY_TYPE_NONE)</div><div class='add'>+	if (!efx-&gt;phy_op-&gt;test)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	EFX_LOG(efx, "testing PHY presence\n");</div><div class='del'>-	tests-&gt;phy_ok = -1;</div><div class='del'>-</div><div class='del'>-	physid1 = mii-&gt;mdio_read(net_dev, mii-&gt;phy_id, MII_PHYSID1);</div><div class='del'>-	physid2 = mii-&gt;mdio_read(net_dev, mii-&gt;phy_id, MII_PHYSID2);</div><div class='del'>-</div><div class='del'>-	if ((physid1 != 0x0000) &amp;&amp; (physid1 != 0xffff) &amp;&amp;</div><div class='del'>-	    (physid2 != 0x0000) &amp;&amp; (physid2 != 0xffff)) {</div><div class='del'>-		EFX_LOG(efx, "found MII PHY %d ID 0x%x:%x\n",</div><div class='del'>-			mii-&gt;phy_id, physid1, physid2);</div><div class='del'>-		tests-&gt;phy_ok = 1;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	EFX_ERR(efx, "no MII PHY present with ID %d\n", mii-&gt;phy_id);</div><div class='del'>-	return -ENODEV;</div><div class='add'>+	mutex_lock(&amp;efx-&gt;mac_lock);</div><div class='add'>+	rc = efx-&gt;phy_op-&gt;test(efx);</div><div class='add'>+	mutex_unlock(&amp;efx-&gt;mac_lock);</div><div class='add'>+	tests-&gt;phy = rc ? -1 : 1;</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**************************************************************************</div><div class='hunk'>@@ -278,7 +273,7 @@ static int efx_test_phy(struct efx_nic *efx,</div><div class='ctx'> void efx_loopback_rx_packet(struct efx_nic *efx,</div><div class='ctx'> 			    const char *buf_ptr, int pkt_len)</div><div class='ctx'> {</div><div class='del'>-	struct efx_selftest_state *state = efx-&gt;loopback_selftest;</div><div class='add'>+	struct efx_loopback_state *state = efx-&gt;loopback_selftest;</div><div class='ctx'> 	struct efx_loopback_payload *received;</div><div class='ctx'> 	struct efx_loopback_payload *payload;</div><div class='ctx'> </div><div class='hunk'>@@ -289,11 +284,12 @@ void efx_loopback_rx_packet(struct efx_nic *efx,</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	payload = &amp;state-&gt;payload;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	received = (struct efx_loopback_payload *) buf_ptr;</div><div class='ctx'> 	received-&gt;ip.saddr = payload-&gt;ip.saddr;</div><div class='del'>-	received-&gt;ip.check = payload-&gt;ip.check;</div><div class='del'>-	</div><div class='add'>+	if (state-&gt;offload_csum)</div><div class='add'>+		received-&gt;ip.check = payload-&gt;ip.check;</div><div class='add'>+</div><div class='ctx'> 	/* Check that header exists */</div><div class='ctx'> 	if (pkt_len &lt; sizeof(received-&gt;header)) {</div><div class='ctx'> 		EFX_ERR(efx, "saw runt RX packet (length %d) in %s loopback "</div><div class='hunk'>@@ -362,7 +358,7 @@ void efx_loopback_rx_packet(struct efx_nic *efx,</div><div class='ctx'> /* Initialise an efx_selftest_state for a new iteration */</div><div class='ctx'> static void efx_iterate_state(struct efx_nic *efx)</div><div class='ctx'> {</div><div class='del'>-	struct efx_selftest_state *state = efx-&gt;loopback_selftest;</div><div class='add'>+	struct efx_loopback_state *state = efx-&gt;loopback_selftest;</div><div class='ctx'> 	struct net_device *net_dev = efx-&gt;net_dev;</div><div class='ctx'> 	struct efx_loopback_payload *payload = &amp;state-&gt;payload;</div><div class='ctx'> </div><div class='hunk'>@@ -395,17 +391,17 @@ static void efx_iterate_state(struct efx_nic *efx)</div><div class='ctx'> 	smp_wmb();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int efx_tx_loopback(struct efx_tx_queue *tx_queue)</div><div class='add'>+static int efx_begin_loopback(struct efx_tx_queue *tx_queue)</div><div class='ctx'> {</div><div class='ctx'> 	struct efx_nic *efx = tx_queue-&gt;efx;</div><div class='del'>-	struct efx_selftest_state *state = efx-&gt;loopback_selftest;</div><div class='add'>+	struct efx_loopback_state *state = efx-&gt;loopback_selftest;</div><div class='ctx'> 	struct efx_loopback_payload *payload;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	int i, rc;</div><div class='ctx'> </div><div class='ctx'> 	/* Transmit N copies of buffer */</div><div class='ctx'> 	for (i = 0; i &lt; state-&gt;packet_count; i++) {</div><div class='del'>-		/* Allocate an skb, holding an extra reference for </div><div class='add'>+		/* Allocate an skb, holding an extra reference for</div><div class='ctx'> 		 * transmit completion counting */</div><div class='ctx'> 		skb = alloc_skb(sizeof(state-&gt;payload), GFP_KERNEL);</div><div class='ctx'> 		if (!skb)</div><div class='hunk'>@@ -444,11 +440,25 @@ static int efx_tx_loopback(struct efx_tx_queue *tx_queue)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int efx_rx_loopback(struct efx_tx_queue *tx_queue,</div><div class='del'>-			   struct efx_loopback_self_tests *lb_tests)</div><div class='add'>+static int efx_poll_loopback(struct efx_nic *efx)</div><div class='add'>+{</div><div class='add'>+	struct efx_loopback_state *state = efx-&gt;loopback_selftest;</div><div class='add'>+	struct efx_channel *channel;</div><div class='add'>+</div><div class='add'>+	/* NAPI polling is not enabled, so process channels</div><div class='add'>+	 * synchronously */</div><div class='add'>+	efx_for_each_channel(channel, efx) {</div><div class='add'>+		if (channel-&gt;work_pending)</div><div class='add'>+			efx_process_channel_now(channel);</div><div class='add'>+	}</div><div class='add'>+	return atomic_read(&amp;state-&gt;rx_good) == state-&gt;packet_count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int efx_end_loopback(struct efx_tx_queue *tx_queue,</div><div class='add'>+			    struct efx_loopback_self_tests *lb_tests)</div><div class='ctx'> {</div><div class='ctx'> 	struct efx_nic *efx = tx_queue-&gt;efx;</div><div class='del'>-	struct efx_selftest_state *state = efx-&gt;loopback_selftest;</div><div class='add'>+	struct efx_loopback_state *state = efx-&gt;loopback_selftest;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	int tx_done = 0, rx_good, rx_bad;</div><div class='ctx'> 	int i, rc = 0;</div><div class='hunk'>@@ -507,11 +517,10 @@ efx_test_loopback(struct efx_tx_queue *tx_queue,</div><div class='ctx'> 		  struct efx_loopback_self_tests *lb_tests)</div><div class='ctx'> {</div><div class='ctx'> 	struct efx_nic *efx = tx_queue-&gt;efx;</div><div class='del'>-	struct efx_selftest_state *state = efx-&gt;loopback_selftest;</div><div class='del'>-	struct efx_channel *channel;</div><div class='del'>-	int i, rc = 0;</div><div class='add'>+	struct efx_loopback_state *state = efx-&gt;loopback_selftest;</div><div class='add'>+	int i, begin_rc, end_rc;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; loopback_test_level; i++) {</div><div class='add'>+	for (i = 0; i &lt; 3; i++) {</div><div class='ctx'> 		/* Determine how many packets to send */</div><div class='ctx'> 		state-&gt;packet_count = (efx-&gt;type-&gt;txd_ring_mask + 1) / 3;</div><div class='ctx'> 		state-&gt;packet_count = min(1 &lt;&lt; (i &lt;&lt; 2), state-&gt;packet_count);</div><div class='hunk'>@@ -519,30 +528,31 @@ efx_test_loopback(struct efx_tx_queue *tx_queue,</div><div class='ctx'> 				      state-&gt;packet_count, GFP_KERNEL);</div><div class='ctx'> 		if (!state-&gt;skbs)</div><div class='ctx'> 			return -ENOMEM;</div><div class='del'>-		state-&gt;flush = 0;</div><div class='add'>+		state-&gt;flush = false;</div><div class='ctx'> </div><div class='ctx'> 		EFX_LOG(efx, "TX queue %d testing %s loopback with %d "</div><div class='ctx'> 			"packets\n", tx_queue-&gt;queue, LOOPBACK_MODE(efx),</div><div class='ctx'> 			state-&gt;packet_count);</div><div class='ctx'> </div><div class='ctx'> 		efx_iterate_state(efx);</div><div class='del'>-		rc = efx_tx_loopback(tx_queue);</div><div class='del'>-		</div><div class='del'>-		/* NAPI polling is not enabled, so process channels synchronously */</div><div class='del'>-		schedule_timeout_uninterruptible(HZ / 50);</div><div class='del'>-		efx_for_each_channel_with_interrupt(channel, efx) {</div><div class='del'>-			if (channel-&gt;work_pending)</div><div class='del'>-				efx_process_channel_now(channel);</div><div class='add'>+		begin_rc = efx_begin_loopback(tx_queue);</div><div class='add'>+</div><div class='add'>+		/* This will normally complete very quickly, but be</div><div class='add'>+		 * prepared to wait up to 100 ms. */</div><div class='add'>+		msleep(1);</div><div class='add'>+		if (!efx_poll_loopback(efx)) {</div><div class='add'>+			msleep(100);</div><div class='add'>+			efx_poll_loopback(efx);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		rc |= efx_rx_loopback(tx_queue, lb_tests);</div><div class='add'>+		end_rc = efx_end_loopback(tx_queue, lb_tests);</div><div class='ctx'> 		kfree(state-&gt;skbs);</div><div class='ctx'> </div><div class='del'>-		if (rc) {</div><div class='add'>+		if (begin_rc || end_rc) {</div><div class='ctx'> 			/* Wait a while to ensure there are no packets</div><div class='ctx'> 			 * floating around after a failure. */</div><div class='ctx'> 			schedule_timeout_uninterruptible(HZ / 10);</div><div class='del'>-			return rc;</div><div class='add'>+			return begin_rc ? begin_rc : end_rc;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -550,49 +560,36 @@ efx_test_loopback(struct efx_tx_queue *tx_queue,</div><div class='ctx'> 		"of %d packets\n", tx_queue-&gt;queue, LOOPBACK_MODE(efx),</div><div class='ctx'> 		state-&gt;packet_count);</div><div class='ctx'> </div><div class='del'>-	return rc;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int efx_test_loopbacks(struct efx_nic *efx,</div><div class='add'>+static int efx_test_loopbacks(struct efx_nic *efx, struct ethtool_cmd ecmd,</div><div class='ctx'> 			      struct efx_self_tests *tests,</div><div class='ctx'> 			      unsigned int loopback_modes)</div><div class='ctx'> {</div><div class='del'>-	struct efx_selftest_state *state = efx-&gt;loopback_selftest;</div><div class='del'>-	struct ethtool_cmd ecmd, ecmd_loopback;</div><div class='add'>+	enum efx_loopback_mode mode;</div><div class='add'>+	struct efx_loopback_state *state;</div><div class='ctx'> 	struct efx_tx_queue *tx_queue;</div><div class='del'>-	enum efx_loopback_mode old_mode, mode;</div><div class='del'>-	int count, rc = 0, link_up;</div><div class='del'>-	</div><div class='del'>-	rc = efx_ethtool_get_settings(efx-&gt;net_dev, &amp;ecmd);</div><div class='del'>-	if (rc) {</div><div class='del'>-		EFX_ERR(efx, "could not get GMII settings\n");</div><div class='del'>-		return rc;</div><div class='del'>-	}</div><div class='del'>-	old_mode = efx-&gt;loopback_mode;</div><div class='del'>-</div><div class='del'>-	/* Disable autonegotiation for the purposes of loopback */</div><div class='del'>-	memcpy(&amp;ecmd_loopback, &amp;ecmd, sizeof(ecmd_loopback));</div><div class='del'>-	if (ecmd_loopback.autoneg == AUTONEG_ENABLE) {</div><div class='del'>-		ecmd_loopback.autoneg = AUTONEG_DISABLE;</div><div class='del'>-		ecmd_loopback.duplex = DUPLEX_FULL;</div><div class='del'>-		ecmd_loopback.speed = SPEED_10000;</div><div class='del'>-	}</div><div class='add'>+	bool link_up;</div><div class='add'>+	int count, rc = 0;</div><div class='ctx'> </div><div class='del'>-	rc = efx_ethtool_set_settings(efx-&gt;net_dev, &amp;ecmd_loopback);</div><div class='del'>-	if (rc) {</div><div class='del'>-		EFX_ERR(efx, "could not disable autonegotiation\n");</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-	tests-&gt;loopback_speed = ecmd_loopback.speed;</div><div class='del'>-	tests-&gt;loopback_full_duplex = ecmd_loopback.duplex;</div><div class='add'>+	/* Set the port loopback_selftest member. From this point on</div><div class='add'>+	 * all received packets will be dropped. Mark the state as</div><div class='add'>+	 * "flushing" so all inflight packets are dropped */</div><div class='add'>+	state = kzalloc(sizeof(*state), GFP_KERNEL);</div><div class='add'>+	if (state == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	BUG_ON(efx-&gt;loopback_selftest);</div><div class='add'>+	state-&gt;flush = true;</div><div class='add'>+	efx-&gt;loopback_selftest = state;</div><div class='ctx'> </div><div class='ctx'> 	/* Test all supported loopback modes */</div><div class='del'>-	for (mode = LOOPBACK_NONE; mode &lt; LOOPBACK_TEST_MAX; mode++) {</div><div class='add'>+	for (mode = LOOPBACK_NONE; mode &lt;= LOOPBACK_TEST_MAX; mode++) {</div><div class='ctx'> 		if (!(loopback_modes &amp; (1 &lt;&lt; mode)))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		/* Move the port into the specified loopback mode. */</div><div class='del'>-		state-&gt;flush = 1;</div><div class='add'>+		state-&gt;flush = true;</div><div class='ctx'> 		efx-&gt;loopback_mode = mode;</div><div class='ctx'> 		efx_reconfigure_port(efx);</div><div class='ctx'> </div><div class='hunk'>@@ -616,7 +613,7 @@ static int efx_test_loopbacks(struct efx_nic *efx,</div><div class='ctx'> 			 */</div><div class='ctx'> 			link_up = efx-&gt;link_up;</div><div class='ctx'> 			if (!falcon_xaui_link_ok(efx))</div><div class='del'>-				link_up = 0;</div><div class='add'>+				link_up = false;</div><div class='ctx'> </div><div class='ctx'> 		} while ((++count &lt; 20) &amp;&amp; !link_up);</div><div class='ctx'> </div><div class='hunk'>@@ -634,18 +631,21 @@ static int efx_test_loopbacks(struct efx_nic *efx,</div><div class='ctx'> </div><div class='ctx'> 		/* Test every TX queue */</div><div class='ctx'> 		efx_for_each_tx_queue(tx_queue, efx) {</div><div class='del'>-			rc |= efx_test_loopback(tx_queue,</div><div class='del'>-						&amp;tests-&gt;loopback[mode]);</div><div class='add'>+			state-&gt;offload_csum = (tx_queue-&gt;queue ==</div><div class='add'>+					       EFX_TX_QUEUE_OFFLOAD_CSUM);</div><div class='add'>+			rc = efx_test_loopback(tx_queue,</div><div class='add'>+					       &amp;tests-&gt;loopback[mode]);</div><div class='ctx'> 			if (rc)</div><div class='ctx'> 				goto out;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'>  out:</div><div class='del'>-	/* Take out of loopback and restore PHY settings */</div><div class='del'>-	state-&gt;flush = 1;</div><div class='del'>-	efx-&gt;loopback_mode = old_mode;</div><div class='del'>-	efx_ethtool_set_settings(efx-&gt;net_dev, &amp;ecmd);</div><div class='add'>+	/* Remove the flush. The caller will remove the loopback setting */</div><div class='add'>+	state-&gt;flush = true;</div><div class='add'>+	efx-&gt;loopback_selftest = NULL;</div><div class='add'>+	wmb();</div><div class='add'>+	kfree(state);</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='hunk'>@@ -661,23 +661,27 @@ static int efx_test_loopbacks(struct efx_nic *efx,</div><div class='ctx'> int efx_online_test(struct efx_nic *efx, struct efx_self_tests *tests)</div><div class='ctx'> {</div><div class='ctx'> 	struct efx_channel *channel;</div><div class='del'>-	int rc = 0;</div><div class='add'>+	int rc, rc2 = 0;</div><div class='add'>+</div><div class='add'>+	rc = efx_test_mii(efx, tests);</div><div class='add'>+	if (rc &amp;&amp; !rc2)</div><div class='add'>+		rc2 = rc;</div><div class='ctx'> </div><div class='del'>-	EFX_LOG(efx, "performing online self-tests\n");</div><div class='add'>+	rc = efx_test_nvram(efx, tests);</div><div class='add'>+	if (rc &amp;&amp; !rc2)</div><div class='add'>+		rc2 = rc;</div><div class='add'>+</div><div class='add'>+	rc = efx_test_interrupts(efx, tests);</div><div class='add'>+	if (rc &amp;&amp; !rc2)</div><div class='add'>+		rc2 = rc;</div><div class='ctx'> </div><div class='del'>-	rc |= efx_test_interrupts(efx, tests);</div><div class='ctx'> 	efx_for_each_channel(channel, efx) {</div><div class='del'>-		if (channel-&gt;has_interrupt)</div><div class='del'>-			rc |= efx_test_eventq_irq(channel, tests);</div><div class='del'>-		else</div><div class='del'>-			rc |= efx_test_eventq(channel, tests);</div><div class='add'>+		rc = efx_test_eventq_irq(channel, tests);</div><div class='add'>+		if (rc &amp;&amp; !rc2)</div><div class='add'>+			rc2 = rc;</div><div class='ctx'> 	}</div><div class='del'>-	rc |= efx_test_phy(efx, tests);</div><div class='del'>-</div><div class='del'>-	if (rc)</div><div class='del'>-		EFX_ERR(efx, "failed online self-tests\n");</div><div class='ctx'> </div><div class='del'>-	return rc;</div><div class='add'>+	return rc2;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Offline (i.e. disruptive) testing</div><div class='hunk'>@@ -685,35 +689,66 @@ int efx_online_test(struct efx_nic *efx, struct efx_self_tests *tests)</div><div class='ctx'> int efx_offline_test(struct efx_nic *efx,</div><div class='ctx'> 		     struct efx_self_tests *tests, unsigned int loopback_modes)</div><div class='ctx'> {</div><div class='del'>-	struct efx_selftest_state *state;</div><div class='del'>-	int rc = 0;</div><div class='del'>-</div><div class='del'>-	EFX_LOG(efx, "performing offline self-tests\n");</div><div class='add'>+	enum efx_loopback_mode loopback_mode = efx-&gt;loopback_mode;</div><div class='add'>+	int phy_mode = efx-&gt;phy_mode;</div><div class='add'>+	struct ethtool_cmd ecmd, ecmd_test;</div><div class='add'>+	int rc, rc2 = 0;</div><div class='add'>+</div><div class='add'>+	/* force the carrier state off so the kernel doesn't transmit during</div><div class='add'>+	 * the loopback test, and the watchdog timeout doesn't fire. Also put</div><div class='add'>+	 * falcon into loopback for the register test.</div><div class='add'>+	 */</div><div class='add'>+	mutex_lock(&amp;efx-&gt;mac_lock);</div><div class='add'>+	efx-&gt;port_inhibited = true;</div><div class='add'>+	if (efx-&gt;loopback_modes)</div><div class='add'>+		efx-&gt;loopback_mode = __ffs(efx-&gt;loopback_modes);</div><div class='add'>+	__efx_reconfigure_port(efx);</div><div class='add'>+	mutex_unlock(&amp;efx-&gt;mac_lock);</div><div class='add'>+</div><div class='add'>+	/* free up all consumers of SRAM (including all the queues) */</div><div class='add'>+	efx_reset_down(efx, &amp;ecmd);</div><div class='add'>+</div><div class='add'>+	rc = efx_test_chip(efx, tests);</div><div class='add'>+	if (rc &amp;&amp; !rc2)</div><div class='add'>+		rc2 = rc;</div><div class='add'>+</div><div class='add'>+	/* reset the chip to recover from the register test */</div><div class='add'>+	rc = falcon_reset_hw(efx, RESET_TYPE_ALL);</div><div class='add'>+</div><div class='add'>+	/* Modify the saved ecmd so that when efx_reset_up() restores the phy</div><div class='add'>+	 * state, AN is disabled, and the phy is powered, and out of loopback */</div><div class='add'>+	memcpy(&amp;ecmd_test, &amp;ecmd, sizeof(ecmd_test));</div><div class='add'>+	if (ecmd_test.autoneg == AUTONEG_ENABLE) {</div><div class='add'>+		ecmd_test.autoneg = AUTONEG_DISABLE;</div><div class='add'>+		ecmd_test.duplex = DUPLEX_FULL;</div><div class='add'>+		ecmd_test.speed = SPEED_10000;</div><div class='add'>+	}</div><div class='add'>+	efx-&gt;loopback_mode = LOOPBACK_NONE;</div><div class='ctx'> </div><div class='del'>-	/* Create a selftest_state structure to hold state for the test */</div><div class='del'>-	state = kzalloc(sizeof(*state), GFP_KERNEL);</div><div class='del'>-	if (state == NULL) {</div><div class='del'>-		rc = -ENOMEM;</div><div class='del'>-		goto out;</div><div class='add'>+	rc = efx_reset_up(efx, &amp;ecmd_test, rc == 0);</div><div class='add'>+	if (rc) {</div><div class='add'>+		EFX_ERR(efx, "Unable to recover from chip test\n");</div><div class='add'>+		efx_schedule_reset(efx, RESET_TYPE_DISABLE);</div><div class='add'>+		return rc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Set the port loopback_selftest member. From this point on</div><div class='del'>-	 * all received packets will be dropped. Mark the state as</div><div class='del'>-	 * "flushing" so all inflight packets are dropped */</div><div class='del'>-	BUG_ON(efx-&gt;loopback_selftest);</div><div class='del'>-	state-&gt;flush = 1;</div><div class='del'>-	efx-&gt;loopback_selftest = state;</div><div class='add'>+	tests-&gt;loopback_speed = ecmd_test.speed;</div><div class='add'>+	tests-&gt;loopback_full_duplex = ecmd_test.duplex;</div><div class='ctx'> </div><div class='del'>-	rc = efx_test_loopbacks(efx, tests, loopback_modes);</div><div class='add'>+	rc = efx_test_phy(efx, tests);</div><div class='add'>+	if (rc &amp;&amp; !rc2)</div><div class='add'>+		rc2 = rc;</div><div class='ctx'> </div><div class='del'>-	efx-&gt;loopback_selftest = NULL;</div><div class='del'>-	wmb();</div><div class='del'>-	kfree(state);</div><div class='add'>+	rc = efx_test_loopbacks(efx, ecmd_test, tests, loopback_modes);</div><div class='add'>+	if (rc &amp;&amp; !rc2)</div><div class='add'>+		rc2 = rc;</div><div class='ctx'> </div><div class='del'>- out:</div><div class='del'>-	if (rc)</div><div class='del'>-		EFX_ERR(efx, "failed offline self-tests\n");</div><div class='add'>+	/* restore the PHY to the previous state */</div><div class='add'>+	efx-&gt;loopback_mode = loopback_mode;</div><div class='add'>+	efx-&gt;phy_mode = phy_mode;</div><div class='add'>+	efx-&gt;port_inhibited = false;</div><div class='add'>+	efx_ethtool_set_settings(efx-&gt;net_dev, &amp;ecmd);</div><div class='ctx'> </div><div class='del'>-	return rc;</div><div class='add'>+	return rc2;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/sfc/selftest.h b/drivers/net/sfc/selftest.h<br/>index f6999c2b622d..fc15df15d766 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sfc/selftest.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/sfc/selftest.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sfc/selftest.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sfc/selftest.h</a></div><div class='hunk'>@@ -18,8 +18,8 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> struct efx_loopback_self_tests {</div><div class='del'>-	int tx_sent[EFX_MAX_TX_QUEUES];</div><div class='del'>-	int tx_done[EFX_MAX_TX_QUEUES];</div><div class='add'>+	int tx_sent[EFX_TX_QUEUE_COUNT];</div><div class='add'>+	int tx_done[EFX_TX_QUEUE_COUNT];</div><div class='ctx'> 	int rx_good;</div><div class='ctx'> 	int rx_bad;</div><div class='ctx'> };</div><div class='hunk'>@@ -29,14 +29,19 @@ struct efx_loopback_self_tests {</div><div class='ctx'>  * indicates failure.</div><div class='ctx'>  */</div><div class='ctx'> struct efx_self_tests {</div><div class='add'>+	/* online tests */</div><div class='add'>+	int mii;</div><div class='add'>+	int nvram;</div><div class='ctx'> 	int interrupt;</div><div class='ctx'> 	int eventq_dma[EFX_MAX_CHANNELS];</div><div class='ctx'> 	int eventq_int[EFX_MAX_CHANNELS];</div><div class='ctx'> 	int eventq_poll[EFX_MAX_CHANNELS];</div><div class='del'>-	int phy_ok;</div><div class='add'>+	/* offline tests */</div><div class='add'>+	int registers;</div><div class='add'>+	int phy;</div><div class='ctx'> 	int loopback_speed;</div><div class='ctx'> 	int loopback_full_duplex;</div><div class='del'>-	struct efx_loopback_self_tests loopback[LOOPBACK_TEST_MAX];</div><div class='add'>+	struct efx_loopback_self_tests loopback[LOOPBACK_TEST_MAX + 1];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern void efx_loopback_rx_packet(struct efx_nic *efx,</div><div class='head'>diff --git a/drivers/net/sfc/sfe4001.c b/drivers/net/sfc/sfe4001.c<br/>index b27849523990..fe4e3fd22330 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sfc/sfe4001.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/sfc/sfe4001.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sfc/sfe4001.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sfc/sfe4001.c</a></div><div class='hunk'>@@ -13,11 +13,13 @@</div><div class='ctx'>  * the PHY</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='add'>+#include "net_driver.h"</div><div class='ctx'> #include "efx.h"</div><div class='ctx'> #include "phy.h"</div><div class='ctx'> #include "boards.h"</div><div class='ctx'> #include "falcon.h"</div><div class='ctx'> #include "falcon_hwdefs.h"</div><div class='add'>+#include "falcon_io.h"</div><div class='ctx'> #include "mac.h"</div><div class='ctx'> </div><div class='ctx'> /**************************************************************************</div><div class='hunk'>@@ -120,23 +122,144 @@ static void sfe4001_poweroff(struct efx_nic *efx)</div><div class='ctx'> 	i2c_smbus_read_byte_data(hwmon_client, RSL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void sfe4001_fini(struct efx_nic *efx)</div><div class='add'>+static int sfe4001_poweron(struct efx_nic *efx)</div><div class='ctx'> {</div><div class='del'>-	EFX_INFO(efx, "%s\n", __func__);</div><div class='add'>+	struct i2c_client *hwmon_client = efx-&gt;board_info.hwmon_client;</div><div class='add'>+	struct i2c_client *ioexp_client = efx-&gt;board_info.ioexp_client;</div><div class='add'>+	unsigned int i, j;</div><div class='add'>+	int rc;</div><div class='add'>+	u8 out;</div><div class='add'>+</div><div class='add'>+	/* Clear any previous over-temperature alert */</div><div class='add'>+	rc = i2c_smbus_read_byte_data(hwmon_client, RSL);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	/* Enable port 0 and port 1 outputs on IO expander */</div><div class='add'>+	rc = i2c_smbus_write_byte_data(ioexp_client, P0_CONFIG, 0x00);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+	rc = i2c_smbus_write_byte_data(ioexp_client, P1_CONFIG,</div><div class='add'>+				       0xff &amp; ~(1 &lt;&lt; P1_SPARE_LBN));</div><div class='add'>+	if (rc)</div><div class='add'>+		goto fail_on;</div><div class='add'>+</div><div class='add'>+	/* If PHY power is on, turn it all off and wait 1 second to</div><div class='add'>+	 * ensure a full reset.</div><div class='add'>+	 */</div><div class='add'>+	rc = i2c_smbus_read_byte_data(ioexp_client, P0_OUT);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		goto fail_on;</div><div class='add'>+	out = 0xff &amp; ~((0 &lt;&lt; P0_EN_1V2_LBN) | (0 &lt;&lt; P0_EN_2V5_LBN) |</div><div class='add'>+		       (0 &lt;&lt; P0_EN_3V3X_LBN) | (0 &lt;&lt; P0_EN_5V_LBN) |</div><div class='add'>+		       (0 &lt;&lt; P0_EN_1V0X_LBN));</div><div class='add'>+	if (rc != out) {</div><div class='add'>+		EFX_INFO(efx, "power-cycling PHY\n");</div><div class='add'>+		rc = i2c_smbus_write_byte_data(ioexp_client, P0_OUT, out);</div><div class='add'>+		if (rc)</div><div class='add'>+			goto fail_on;</div><div class='add'>+		schedule_timeout_uninterruptible(HZ);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	for (i = 0; i &lt; 20; ++i) {</div><div class='add'>+		/* Turn on 1.2V, 2.5V, 3.3V and 5V power rails */</div><div class='add'>+		out = 0xff &amp; ~((1 &lt;&lt; P0_EN_1V2_LBN) | (1 &lt;&lt; P0_EN_2V5_LBN) |</div><div class='add'>+			       (1 &lt;&lt; P0_EN_3V3X_LBN) | (1 &lt;&lt; P0_EN_5V_LBN) |</div><div class='add'>+			       (1 &lt;&lt; P0_X_TRST_LBN));</div><div class='add'>+		if (efx-&gt;phy_mode &amp; PHY_MODE_SPECIAL)</div><div class='add'>+			out |= 1 &lt;&lt; P0_EN_3V3X_LBN;</div><div class='add'>+</div><div class='add'>+		rc = i2c_smbus_write_byte_data(ioexp_client, P0_OUT, out);</div><div class='add'>+		if (rc)</div><div class='add'>+			goto fail_on;</div><div class='add'>+		msleep(10);</div><div class='add'>+</div><div class='add'>+		/* Turn on 1V power rail */</div><div class='add'>+		out &amp;= ~(1 &lt;&lt; P0_EN_1V0X_LBN);</div><div class='add'>+		rc = i2c_smbus_write_byte_data(ioexp_client, P0_OUT, out);</div><div class='add'>+		if (rc)</div><div class='add'>+			goto fail_on;</div><div class='add'>+</div><div class='add'>+		EFX_INFO(efx, "waiting for DSP boot (attempt %d)...\n", i);</div><div class='add'>+</div><div class='add'>+		/* In flash config mode, DSP does not turn on AFE, so</div><div class='add'>+		 * just wait 1 second.</div><div class='add'>+		 */</div><div class='add'>+		if (efx-&gt;phy_mode &amp; PHY_MODE_SPECIAL) {</div><div class='add'>+			schedule_timeout_uninterruptible(HZ);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		for (j = 0; j &lt; 10; ++j) {</div><div class='add'>+			msleep(100);</div><div class='add'>+</div><div class='add'>+			/* Check DSP has asserted AFE power line */</div><div class='add'>+			rc = i2c_smbus_read_byte_data(ioexp_client, P1_IN);</div><div class='add'>+			if (rc &lt; 0)</div><div class='add'>+				goto fail_on;</div><div class='add'>+			if (rc &amp; (1 &lt;&lt; P1_AFE_PWD_LBN))</div><div class='add'>+				return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	EFX_INFO(efx, "timed out waiting for DSP boot\n");</div><div class='add'>+	rc = -ETIMEDOUT;</div><div class='add'>+fail_on:</div><div class='ctx'> 	sfe4001_poweroff(efx);</div><div class='del'>- 	i2c_unregister_device(efx-&gt;board_info.ioexp_client);</div><div class='del'>- 	i2c_unregister_device(efx-&gt;board_info.hwmon_client);</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* The P0_EN_3V3X line on SFE4001 boards (from A2 onward) is connected</div><div class='del'>- * to the FLASH_CFG_1 input on the DSP.  We must keep it high at power-</div><div class='del'>- * up to allow writing the flash (done through MDIO from userland).</div><div class='add'>+/* On SFE4001 rev A2 and later, we can control the FLASH_CFG_1 pin</div><div class='add'>+ * using the 3V3X output of the IO-expander.  Allow the user to set</div><div class='add'>+ * this when the device is stopped, and keep it stopped then.</div><div class='ctx'>  */</div><div class='del'>-unsigned int sfe4001_phy_flash_cfg;</div><div class='del'>-module_param_named(phy_flash_cfg, sfe4001_phy_flash_cfg, uint, 0444);</div><div class='del'>-MODULE_PARM_DESC(phy_flash_cfg,</div><div class='del'>-		 "Force PHY to enter flash configuration mode");</div><div class='add'>+</div><div class='add'>+static ssize_t show_phy_flash_cfg(struct device *dev,</div><div class='add'>+				  struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct efx_nic *efx = pci_get_drvdata(to_pci_dev(dev));</div><div class='add'>+	return sprintf(buf, "%d\n", !!(efx-&gt;phy_mode &amp; PHY_MODE_SPECIAL));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t set_phy_flash_cfg(struct device *dev,</div><div class='add'>+				 struct device_attribute *attr,</div><div class='add'>+				 const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct efx_nic *efx = pci_get_drvdata(to_pci_dev(dev));</div><div class='add'>+	enum efx_phy_mode old_mode, new_mode;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	rtnl_lock();</div><div class='add'>+	old_mode = efx-&gt;phy_mode;</div><div class='add'>+	if (count == 0 || *buf == '0')</div><div class='add'>+		new_mode = old_mode &amp; ~PHY_MODE_SPECIAL;</div><div class='add'>+	else</div><div class='add'>+		new_mode = PHY_MODE_SPECIAL;</div><div class='add'>+	if (old_mode == new_mode) {</div><div class='add'>+		err = 0;</div><div class='add'>+	} else if (efx-&gt;state != STATE_RUNNING || netif_running(efx-&gt;net_dev)) {</div><div class='add'>+		err = -EBUSY;</div><div class='add'>+	} else {</div><div class='add'>+		efx-&gt;phy_mode = new_mode;</div><div class='add'>+		err = sfe4001_poweron(efx);</div><div class='add'>+		efx_reconfigure_port(efx);</div><div class='add'>+	}</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+</div><div class='add'>+	return err ? err : count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static DEVICE_ATTR(phy_flash_cfg, 0644, show_phy_flash_cfg, set_phy_flash_cfg);</div><div class='add'>+</div><div class='add'>+static void sfe4001_fini(struct efx_nic *efx)</div><div class='add'>+{</div><div class='add'>+	EFX_INFO(efx, "%s\n", __func__);</div><div class='add'>+</div><div class='add'>+	device_remove_file(&amp;efx-&gt;pci_dev-&gt;dev, &amp;dev_attr_phy_flash_cfg);</div><div class='add'>+	sfe4001_poweroff(efx);</div><div class='add'>+	i2c_unregister_device(efx-&gt;board_info.ioexp_client);</div><div class='add'>+	i2c_unregister_device(efx-&gt;board_info.hwmon_client);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /* This board uses an I2C expander to provider power to the PHY, which needs to</div><div class='ctx'>  * be turned on before the PHY can be used.</div><div class='hunk'>@@ -144,41 +267,14 @@ MODULE_PARM_DESC(phy_flash_cfg,</div><div class='ctx'>  */</div><div class='ctx'> int sfe4001_init(struct efx_nic *efx)</div><div class='ctx'> {</div><div class='del'>-	struct i2c_client *hwmon_client, *ioexp_client;</div><div class='del'>-	unsigned int count;</div><div class='add'>+	struct i2c_client *hwmon_client;</div><div class='ctx'> 	int rc;</div><div class='del'>-	u8 out;</div><div class='del'>-	efx_dword_t reg;</div><div class='ctx'> </div><div class='ctx'> 	hwmon_client = i2c_new_dummy(&amp;efx-&gt;i2c_adap, MAX6647);</div><div class='ctx'> 	if (!hwmon_client)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	efx-&gt;board_info.hwmon_client = hwmon_client;</div><div class='ctx'> </div><div class='del'>-	ioexp_client = i2c_new_dummy(&amp;efx-&gt;i2c_adap, PCA9539);</div><div class='del'>-	if (!ioexp_client) {</div><div class='del'>-		rc = -EIO;</div><div class='del'>-		goto fail_hwmon;</div><div class='del'>-	}</div><div class='del'>-	efx-&gt;board_info.ioexp_client = ioexp_client;</div><div class='del'>-</div><div class='del'>-	/* 10Xpress has fixed-function LED pins, so there is no board-specific</div><div class='del'>-	 * blink code. */</div><div class='del'>-	efx-&gt;board_info.blink = tenxpress_phy_blink;</div><div class='del'>-</div><div class='del'>-	/* Ensure that XGXS and XAUI SerDes are held in reset */</div><div class='del'>-	EFX_POPULATE_DWORD_7(reg, XX_PWRDNA_EN, 1,</div><div class='del'>-			     XX_PWRDNB_EN, 1,</div><div class='del'>-			     XX_RSTPLLAB_EN, 1,</div><div class='del'>-			     XX_RESETA_EN, 1,</div><div class='del'>-			     XX_RESETB_EN, 1,</div><div class='del'>-			     XX_RSTXGXSRX_EN, 1,</div><div class='del'>-			     XX_RSTXGXSTX_EN, 1);</div><div class='del'>-	falcon_xmac_writel(efx, &amp;reg, XX_PWR_RST_REG_MAC);</div><div class='del'>-	udelay(10);</div><div class='del'>-</div><div class='del'>-	efx-&gt;board_info.fini = sfe4001_fini;</div><div class='del'>-</div><div class='ctx'> 	/* Set DSP over-temperature alert threshold */</div><div class='ctx'> 	EFX_INFO(efx, "DSP cut-out at %dC\n", xgphy_max_temperature);</div><div class='ctx'> 	rc = i2c_smbus_write_byte_data(hwmon_client, WLHO,</div><div class='hunk'>@@ -195,78 +291,34 @@ int sfe4001_init(struct efx_nic *efx)</div><div class='ctx'> 		goto fail_ioexp;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Clear any previous over-temperature alert */</div><div class='del'>-	rc = i2c_smbus_read_byte_data(hwmon_client, RSL);</div><div class='del'>-	if (rc &lt; 0)</div><div class='del'>-		goto fail_ioexp;</div><div class='add'>+	efx-&gt;board_info.ioexp_client = i2c_new_dummy(&amp;efx-&gt;i2c_adap, PCA9539);</div><div class='add'>+	if (!efx-&gt;board_info.ioexp_client) {</div><div class='add'>+		rc = -EIO;</div><div class='add'>+		goto fail_hwmon;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	/* Enable port 0 and port 1 outputs on IO expander */</div><div class='del'>-	rc = i2c_smbus_write_byte_data(ioexp_client, P0_CONFIG, 0x00);</div><div class='add'>+	/* 10Xpress has fixed-function LED pins, so there is no board-specific</div><div class='add'>+	 * blink code. */</div><div class='add'>+	efx-&gt;board_info.blink = tenxpress_phy_blink;</div><div class='add'>+</div><div class='add'>+	efx-&gt;board_info.fini = sfe4001_fini;</div><div class='add'>+</div><div class='add'>+	rc = sfe4001_poweron(efx);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto fail_ioexp;</div><div class='del'>-	rc = i2c_smbus_write_byte_data(ioexp_client, P1_CONFIG,</div><div class='del'>-				       0xff &amp; ~(1 &lt;&lt; P1_SPARE_LBN));</div><div class='del'>-	if (rc)</div><div class='del'>-		goto fail_on;</div><div class='ctx'> </div><div class='del'>-	/* Turn all power off then wait 1 sec. This ensures PHY is reset */</div><div class='del'>-	out = 0xff &amp; ~((0 &lt;&lt; P0_EN_1V2_LBN) | (0 &lt;&lt; P0_EN_2V5_LBN) |</div><div class='del'>-		       (0 &lt;&lt; P0_EN_3V3X_LBN) | (0 &lt;&lt; P0_EN_5V_LBN) |</div><div class='del'>-		       (0 &lt;&lt; P0_EN_1V0X_LBN));</div><div class='del'>-	rc = i2c_smbus_write_byte_data(ioexp_client, P0_OUT, out);</div><div class='add'>+	rc = device_create_file(&amp;efx-&gt;pci_dev-&gt;dev, &amp;dev_attr_phy_flash_cfg);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto fail_on;</div><div class='ctx'> </div><div class='del'>-	schedule_timeout_uninterruptible(HZ);</div><div class='del'>-	count = 0;</div><div class='del'>-	do {</div><div class='del'>-		/* Turn on 1.2V, 2.5V, 3.3V and 5V power rails */</div><div class='del'>-		out = 0xff &amp; ~((1 &lt;&lt; P0_EN_1V2_LBN) | (1 &lt;&lt; P0_EN_2V5_LBN) |</div><div class='del'>-			       (1 &lt;&lt; P0_EN_3V3X_LBN) | (1 &lt;&lt; P0_EN_5V_LBN) |</div><div class='del'>-			       (1 &lt;&lt; P0_X_TRST_LBN));</div><div class='del'>-		if (sfe4001_phy_flash_cfg)</div><div class='del'>-			out |= 1 &lt;&lt; P0_EN_3V3X_LBN;</div><div class='del'>-</div><div class='del'>-		rc = i2c_smbus_write_byte_data(ioexp_client, P0_OUT, out);</div><div class='del'>-		if (rc)</div><div class='del'>-			goto fail_on;</div><div class='del'>-		msleep(10);</div><div class='del'>-</div><div class='del'>-		/* Turn on 1V power rail */</div><div class='del'>-		out &amp;= ~(1 &lt;&lt; P0_EN_1V0X_LBN);</div><div class='del'>-		rc = i2c_smbus_write_byte_data(ioexp_client, P0_OUT, out);</div><div class='del'>-		if (rc)</div><div class='del'>-			goto fail_on;</div><div class='del'>-</div><div class='del'>-		EFX_INFO(efx, "waiting for power (attempt %d)...\n", count);</div><div class='del'>-</div><div class='del'>-		schedule_timeout_uninterruptible(HZ);</div><div class='del'>-</div><div class='del'>-		/* Check DSP is powered */</div><div class='del'>-		rc = i2c_smbus_read_byte_data(ioexp_client, P1_IN);</div><div class='del'>-		if (rc &lt; 0)</div><div class='del'>-			goto fail_on;</div><div class='del'>-		if (rc &amp; (1 &lt;&lt; P1_AFE_PWD_LBN))</div><div class='del'>-			goto done;</div><div class='del'>-</div><div class='del'>-		/* DSP doesn't look powered in flash config mode */</div><div class='del'>-		if (sfe4001_phy_flash_cfg)</div><div class='del'>-			goto done;</div><div class='del'>-	} while (++count &lt; 20);</div><div class='del'>-</div><div class='del'>-	EFX_INFO(efx, "timed out waiting for power\n");</div><div class='del'>-	rc = -ETIMEDOUT;</div><div class='del'>-	goto fail_on;</div><div class='del'>-</div><div class='del'>-done:</div><div class='ctx'> 	EFX_INFO(efx, "PHY is powered on\n");</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> fail_on:</div><div class='ctx'> 	sfe4001_poweroff(efx);</div><div class='ctx'> fail_ioexp:</div><div class='del'>- 	i2c_unregister_device(ioexp_client);</div><div class='add'>+	i2c_unregister_device(efx-&gt;board_info.ioexp_client);</div><div class='ctx'> fail_hwmon:</div><div class='del'>- 	i2c_unregister_device(hwmon_client);</div><div class='add'>+	i2c_unregister_device(hwmon_client);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/sfc/spi.h b/drivers/net/sfc/spi.h<br/>index 34412f3d41c9..feef61942377 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sfc/spi.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/sfc/spi.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sfc/spi.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sfc/spi.h</a></div><div class='hunk'>@@ -19,53 +19,48 @@</div><div class='ctx'>  *</div><div class='ctx'>  *************************************************************************/</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Commands common to all known devices.</div><div class='del'>- *</div><div class='add'>+#define SPI_WRSR 0x01		/* Write status register */</div><div class='add'>+#define SPI_WRITE 0x02		/* Write data to memory array */</div><div class='add'>+#define SPI_READ 0x03		/* Read data from memory array */</div><div class='add'>+#define SPI_WRDI 0x04		/* Reset write enable latch */</div><div class='add'>+#define SPI_RDSR 0x05		/* Read status register */</div><div class='add'>+#define SPI_WREN 0x06		/* Set write enable latch */</div><div class='add'>+</div><div class='add'>+#define SPI_STATUS_WPEN 0x80	/* Write-protect pin enabled */</div><div class='add'>+#define SPI_STATUS_BP2 0x10	/* Block protection bit 2 */</div><div class='add'>+#define SPI_STATUS_BP1 0x08	/* Block protection bit 1 */</div><div class='add'>+#define SPI_STATUS_BP0 0x04	/* Block protection bit 0 */</div><div class='add'>+#define SPI_STATUS_WEN 0x02	/* State of the write enable latch */</div><div class='add'>+#define SPI_STATUS_NRDY 0x01	/* Device busy flag */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct efx_spi_device - an Efx SPI (Serial Peripheral Interface) device</div><div class='add'>+ * @efx:		The Efx controller that owns this device</div><div class='add'>+ * @device_id:		Controller's id for the device</div><div class='add'>+ * @size:		Size (in bytes)</div><div class='add'>+ * @addr_len:		Number of address bytes in read/write commands</div><div class='add'>+ * @munge_address:	Flag whether addresses should be munged.</div><div class='add'>+ *	Some devices with 9-bit addresses (e.g. AT25040A EEPROM)</div><div class='add'>+ *	use bit 3 of the command byte as address bit A8, rather</div><div class='add'>+ *	than having a two-byte address.  If this flag is set, then</div><div class='add'>+ *	commands should be munged in this way.</div><div class='add'>+ * @block_size:		Write block size (in bytes).</div><div class='add'>+ *	Write commands are limited to blocks with this size and alignment.</div><div class='add'>+ * @read:		Read function for the device</div><div class='add'>+ * @write:		Write function for the device</div><div class='ctx'>  */</div><div class='del'>-</div><div class='del'>-/* Write status register */</div><div class='del'>-#define SPI_WRSR 0x01</div><div class='del'>-</div><div class='del'>-/* Write data to memory array */</div><div class='del'>-#define SPI_WRITE 0x02</div><div class='del'>-</div><div class='del'>-/* Read data from memory array */</div><div class='del'>-#define SPI_READ 0x03</div><div class='del'>-</div><div class='del'>-/* Reset write enable latch */</div><div class='del'>-#define SPI_WRDI 0x04</div><div class='del'>-</div><div class='del'>-/* Read status register */</div><div class='del'>-#define SPI_RDSR 0x05</div><div class='del'>-</div><div class='del'>-/* Set write enable latch */</div><div class='del'>-#define SPI_WREN 0x06</div><div class='del'>-</div><div class='del'>-/* SST: Enable write to status register */</div><div class='del'>-#define SPI_SST_EWSR 0x50</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Status register bits.  Not all bits are supported on all devices.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* Write-protect pin enabled */</div><div class='del'>-#define SPI_STATUS_WPEN 0x80</div><div class='del'>-</div><div class='del'>-/* Block protection bit 2 */</div><div class='del'>-#define SPI_STATUS_BP2 0x10</div><div class='del'>-</div><div class='del'>-/* Block protection bit 1 */</div><div class='del'>-#define SPI_STATUS_BP1 0x08</div><div class='del'>-</div><div class='del'>-/* Block protection bit 0 */</div><div class='del'>-#define SPI_STATUS_BP0 0x04</div><div class='del'>-</div><div class='del'>-/* State of the write enable latch */</div><div class='del'>-#define SPI_STATUS_WEN 0x02</div><div class='del'>-</div><div class='del'>-/* Device busy flag */</div><div class='del'>-#define SPI_STATUS_NRDY 0x01</div><div class='add'>+struct efx_spi_device {</div><div class='add'>+	struct efx_nic *efx;</div><div class='add'>+	int device_id;</div><div class='add'>+	unsigned int size;</div><div class='add'>+	unsigned int addr_len;</div><div class='add'>+	unsigned int munge_address:1;</div><div class='add'>+	unsigned int block_size;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int falcon_spi_read(const struct efx_spi_device *spi, loff_t start,</div><div class='add'>+		    size_t len, size_t *retlen, u8 *buffer);</div><div class='add'>+int falcon_spi_write(const struct efx_spi_device *spi, loff_t start,</div><div class='add'>+		     size_t len, size_t *retlen, const u8 *buffer);</div><div class='ctx'> </div><div class='ctx'> #endif /* EFX_SPI_H */</div><div class='head'>diff --git a/drivers/net/sfc/tenxpress.c b/drivers/net/sfc/tenxpress.c<br/>index c0146061c326..d507c93d666e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sfc/tenxpress.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/sfc/tenxpress.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sfc/tenxpress.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sfc/tenxpress.c</a></div><div class='hunk'>@@ -65,25 +65,10 @@</div><div class='ctx'> #define PMA_PMD_LED_DEFAULT	(PMA_PMD_LED_OFF &lt;&lt; PMA_PMD_LED_RX_LBN)</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-/* Self test (BIST) control register */</div><div class='del'>-#define PMA_PMD_BIST_CTRL_REG	(0xc014)</div><div class='del'>-#define PMA_PMD_BIST_BER_LBN	(2)	/* Run BER test */</div><div class='del'>-#define PMA_PMD_BIST_CONT_LBN	(1)	/* Run continuous BIST until cleared */</div><div class='del'>-#define PMA_PMD_BIST_SINGLE_LBN	(0)	/* Run 1 BIST iteration (self clears) */</div><div class='del'>-/* Self test status register */</div><div class='del'>-#define PMA_PMD_BIST_STAT_REG	(0xc015)</div><div class='del'>-#define PMA_PMD_BIST_ENX_LBN	(3)</div><div class='del'>-#define PMA_PMD_BIST_PMA_LBN	(2)</div><div class='del'>-#define PMA_PMD_BIST_RXD_LBN	(1)</div><div class='del'>-#define PMA_PMD_BIST_AFE_LBN	(0)</div><div class='del'>-</div><div class='ctx'> /* Special Software reset register */</div><div class='ctx'> #define PMA_PMD_EXT_CTRL_REG 49152</div><div class='ctx'> #define PMA_PMD_EXT_SSR_LBN 15</div><div class='ctx'> </div><div class='del'>-#define BIST_MAX_DELAY	(1000)</div><div class='del'>-#define BIST_POLL_DELAY	(10)</div><div class='del'>-</div><div class='ctx'> /* Misc register defines */</div><div class='ctx'> #define PCS_CLOCK_CTRL_REG 0xd801</div><div class='ctx'> #define PLL312_RST_N_LBN 2</div><div class='hunk'>@@ -119,27 +104,12 @@ MODULE_PARM_DESC(crc_error_reset_threshold,</div><div class='ctx'> 		 "Max number of CRC errors before XAUI reset");</div><div class='ctx'> </div><div class='ctx'> struct tenxpress_phy_data {</div><div class='del'>-	enum tenxpress_state state;</div><div class='ctx'> 	enum efx_loopback_mode loopback_mode;</div><div class='ctx'> 	atomic_t bad_crc_count;</div><div class='del'>-	int tx_disabled;</div><div class='add'>+	enum efx_phy_mode phy_mode;</div><div class='ctx'> 	int bad_lp_tries;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int tenxpress_state_is(struct efx_nic *efx, int state)</div><div class='del'>-{</div><div class='del'>-	struct tenxpress_phy_data *phy_data = efx-&gt;phy_data;</div><div class='del'>-	return (phy_data != NULL) &amp;&amp; (state == phy_data-&gt;state);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void tenxpress_set_state(struct efx_nic *efx,</div><div class='del'>-				enum tenxpress_state state)</div><div class='del'>-{</div><div class='del'>-	struct tenxpress_phy_data *phy_data = efx-&gt;phy_data;</div><div class='del'>-	if (phy_data != NULL)</div><div class='del'>-		phy_data-&gt;state = state;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void tenxpress_crc_err(struct efx_nic *efx)</div><div class='ctx'> {</div><div class='ctx'> 	struct tenxpress_phy_data *phy_data = efx-&gt;phy_data;</div><div class='hunk'>@@ -176,8 +146,6 @@ static int tenxpress_phy_check(struct efx_nic *efx)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void tenxpress_reset_xaui(struct efx_nic *efx);</div><div class='del'>-</div><div class='ctx'> static int tenxpress_init(struct efx_nic *efx)</div><div class='ctx'> {</div><div class='ctx'> 	int rc, reg;</div><div class='hunk'>@@ -214,15 +182,12 @@ static int tenxpress_phy_init(struct efx_nic *efx)</div><div class='ctx'> 	if (!phy_data)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	efx-&gt;phy_data = phy_data;</div><div class='add'>+	phy_data-&gt;phy_mode = efx-&gt;phy_mode;</div><div class='ctx'> </div><div class='del'>-	tenxpress_set_state(efx, TENXPRESS_STATUS_NORMAL);</div><div class='del'>-</div><div class='del'>-	if (!sfe4001_phy_flash_cfg) {</div><div class='del'>-		rc = mdio_clause45_wait_reset_mmds(efx,</div><div class='del'>-						   TENXPRESS_REQUIRED_DEVS);</div><div class='del'>-		if (rc &lt; 0)</div><div class='del'>-			goto fail;</div><div class='del'>-	}</div><div class='add'>+	rc = mdio_clause45_wait_reset_mmds(efx,</div><div class='add'>+					   TENXPRESS_REQUIRED_DEVS);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		goto fail;</div><div class='ctx'> </div><div class='ctx'> 	rc = mdio_clause45_check_mmds(efx, TENXPRESS_REQUIRED_DEVS, 0);</div><div class='ctx'> 	if (rc &lt; 0)</div><div class='hunk'>@@ -249,7 +214,10 @@ static int tenxpress_special_reset(struct efx_nic *efx)</div><div class='ctx'> {</div><div class='ctx'> 	int rc, reg;</div><div class='ctx'> </div><div class='del'>-	EFX_TRACE(efx, "%s\n", __func__);</div><div class='add'>+	/* The XGMAC clock is driven from the SFC7101/SFT9001 312MHz clock, so</div><div class='add'>+	 * a special software reset can glitch the XGMAC sufficiently for stats</div><div class='add'>+	 * requests to fail. Since we don't ofen special_reset, just lock. */</div><div class='add'>+	spin_lock(&amp;efx-&gt;stats_lock);</div><div class='ctx'> </div><div class='ctx'> 	/* Initiate reset */</div><div class='ctx'> 	reg = mdio_clause45_read(efx, efx-&gt;mii.phy_id,</div><div class='hunk'>@@ -258,23 +226,25 @@ static int tenxpress_special_reset(struct efx_nic *efx)</div><div class='ctx'> 	mdio_clause45_write(efx, efx-&gt;mii.phy_id, MDIO_MMD_PMAPMD,</div><div class='ctx'> 			    PMA_PMD_EXT_CTRL_REG, reg);</div><div class='ctx'> </div><div class='del'>-	msleep(200);</div><div class='add'>+	mdelay(200);</div><div class='ctx'> </div><div class='ctx'> 	/* Wait for the blocks to come out of reset */</div><div class='ctx'> 	rc = mdio_clause45_wait_reset_mmds(efx,</div><div class='ctx'> 					   TENXPRESS_REQUIRED_DEVS);</div><div class='ctx'> 	if (rc &lt; 0)</div><div class='del'>-		return rc;</div><div class='add'>+		goto unlock;</div><div class='ctx'> </div><div class='ctx'> 	/* Try and reconfigure the device */</div><div class='ctx'> 	rc = tenxpress_init(efx);</div><div class='ctx'> 	if (rc &lt; 0)</div><div class='del'>-		return rc;</div><div class='add'>+		goto unlock;</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+unlock:</div><div class='add'>+	spin_unlock(&amp;efx-&gt;stats_lock);</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void tenxpress_set_bad_lp(struct efx_nic *efx, int bad_lp)</div><div class='add'>+static void tenxpress_set_bad_lp(struct efx_nic *efx, bool bad_lp)</div><div class='ctx'> {</div><div class='ctx'> 	struct tenxpress_phy_data *pd = efx-&gt;phy_data;</div><div class='ctx'> 	int reg;</div><div class='hunk'>@@ -311,15 +281,15 @@ static void tenxpress_set_bad_lp(struct efx_nic *efx, int bad_lp)</div><div class='ctx'>  * into a non-10GBT port and if so warn the user that they won't get</div><div class='ctx'>  * link any time soon as we are 10GBT only, unless caller specified</div><div class='ctx'>  * not to do this check (it isn't useful in loopback) */</div><div class='del'>-static int tenxpress_link_ok(struct efx_nic *efx, int check_lp)</div><div class='add'>+static bool tenxpress_link_ok(struct efx_nic *efx, bool check_lp)</div><div class='ctx'> {</div><div class='del'>-	int ok = mdio_clause45_links_ok(efx, TENXPRESS_REQUIRED_DEVS);</div><div class='add'>+	bool ok = mdio_clause45_links_ok(efx, TENXPRESS_REQUIRED_DEVS);</div><div class='ctx'> </div><div class='ctx'> 	if (ok) {</div><div class='del'>-		tenxpress_set_bad_lp(efx, 0);</div><div class='add'>+		tenxpress_set_bad_lp(efx, false);</div><div class='ctx'> 	} else if (check_lp) {</div><div class='ctx'> 		/* Are we plugged into the wrong sort of link? */</div><div class='del'>-		int bad_lp = 0;</div><div class='add'>+		bool bad_lp = false;</div><div class='ctx'> 		int phy_id = efx-&gt;mii.phy_id;</div><div class='ctx'> 		int an_stat = mdio_clause45_read(efx, phy_id, MDIO_MMD_AN,</div><div class='ctx'> 						 MDIO_AN_STATUS);</div><div class='hunk'>@@ -332,7 +302,7 @@ static int tenxpress_link_ok(struct efx_nic *efx, int check_lp)</div><div class='ctx'> 		 * bit has the advantage of not clearing when autoneg</div><div class='ctx'> 		 * restarts. */</div><div class='ctx'> 		if (!(xphy_stat &amp; (1 &lt;&lt; PMA_PMD_XSTAT_FLP_LBN))) {</div><div class='del'>-			tenxpress_set_bad_lp(efx, 0);</div><div class='add'>+			tenxpress_set_bad_lp(efx, false);</div><div class='ctx'> 			return ok;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -367,16 +337,19 @@ static void tenxpress_phyxs_loopback(struct efx_nic *efx)</div><div class='ctx'> static void tenxpress_phy_reconfigure(struct efx_nic *efx)</div><div class='ctx'> {</div><div class='ctx'> 	struct tenxpress_phy_data *phy_data = efx-&gt;phy_data;</div><div class='del'>-	int loop_change = LOOPBACK_OUT_OF(phy_data, efx,</div><div class='del'>-					  TENXPRESS_LOOPBACKS);</div><div class='add'>+	bool loop_change = LOOPBACK_OUT_OF(phy_data, efx,</div><div class='add'>+					   TENXPRESS_LOOPBACKS);</div><div class='ctx'> </div><div class='del'>-	if (!tenxpress_state_is(efx, TENXPRESS_STATUS_NORMAL))</div><div class='add'>+	if (efx-&gt;phy_mode &amp; PHY_MODE_SPECIAL) {</div><div class='add'>+		phy_data-&gt;phy_mode = efx-&gt;phy_mode;</div><div class='ctx'> 		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* When coming out of transmit disable, coming out of low power</div><div class='ctx'> 	 * mode, or moving out of any PHY internal loopback mode,</div><div class='ctx'> 	 * perform a special software reset */</div><div class='del'>-	if ((phy_data-&gt;tx_disabled &amp;&amp; !efx-&gt;tx_disabled) ||</div><div class='add'>+	if ((efx-&gt;phy_mode == PHY_MODE_NORMAL &amp;&amp;</div><div class='add'>+	     phy_data-&gt;phy_mode != PHY_MODE_NORMAL) ||</div><div class='ctx'> 	    loop_change) {</div><div class='ctx'> 		tenxpress_special_reset(efx);</div><div class='ctx'> 		falcon_reset_xaui(efx);</div><div class='hunk'>@@ -386,9 +359,9 @@ static void tenxpress_phy_reconfigure(struct efx_nic *efx)</div><div class='ctx'> 	mdio_clause45_phy_reconfigure(efx);</div><div class='ctx'> 	tenxpress_phyxs_loopback(efx);</div><div class='ctx'> </div><div class='del'>-	phy_data-&gt;tx_disabled = efx-&gt;tx_disabled;</div><div class='ctx'> 	phy_data-&gt;loopback_mode = efx-&gt;loopback_mode;</div><div class='del'>-	efx-&gt;link_up = tenxpress_link_ok(efx, 0);</div><div class='add'>+	phy_data-&gt;phy_mode = efx-&gt;phy_mode;</div><div class='add'>+	efx-&gt;link_up = tenxpress_link_ok(efx, false);</div><div class='ctx'> 	efx-&gt;link_options = GM_LPA_10000FULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -402,16 +375,14 @@ static void tenxpress_phy_clear_interrupt(struct efx_nic *efx)</div><div class='ctx'> static int tenxpress_phy_check_hw(struct efx_nic *efx)</div><div class='ctx'> {</div><div class='ctx'> 	struct tenxpress_phy_data *phy_data = efx-&gt;phy_data;</div><div class='del'>-	int phy_up = tenxpress_state_is(efx, TENXPRESS_STATUS_NORMAL);</div><div class='del'>-	int link_ok;</div><div class='add'>+	bool link_ok;</div><div class='ctx'> </div><div class='del'>-	link_ok = phy_up &amp;&amp; tenxpress_link_ok(efx, 1);</div><div class='add'>+	link_ok = tenxpress_link_ok(efx, true);</div><div class='ctx'> </div><div class='ctx'> 	if (link_ok != efx-&gt;link_up)</div><div class='ctx'> 		falcon_xmac_sim_phy_event(efx);</div><div class='ctx'> </div><div class='del'>-	/* Nothing to check if we've already shut down the PHY */</div><div class='del'>-	if (!phy_up)</div><div class='add'>+	if (phy_data-&gt;phy_mode != PHY_MODE_NORMAL)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (atomic_read(&amp;phy_data-&gt;bad_crc_count) &gt; crc_error_reset_threshold) {</div><div class='hunk'>@@ -444,7 +415,7 @@ static void tenxpress_phy_fini(struct efx_nic *efx)</div><div class='ctx'> </div><div class='ctx'> /* Set the RX and TX LEDs and Link LED flashing. The other LEDs</div><div class='ctx'>  * (which probably aren't wired anyway) are left in AUTO mode */</div><div class='del'>-void tenxpress_phy_blink(struct efx_nic *efx, int blink)</div><div class='add'>+void tenxpress_phy_blink(struct efx_nic *efx, bool blink)</div><div class='ctx'> {</div><div class='ctx'> 	int reg;</div><div class='ctx'> </div><div class='hunk'>@@ -459,52 +430,10 @@ void tenxpress_phy_blink(struct efx_nic *efx, int blink)</div><div class='ctx'> 			    PMA_PMD_LED_OVERR_REG, reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void tenxpress_reset_xaui(struct efx_nic *efx)</div><div class='add'>+static int tenxpress_phy_test(struct efx_nic *efx)</div><div class='ctx'> {</div><div class='del'>-	int phy = efx-&gt;mii.phy_id;</div><div class='del'>-	int clk_ctrl, test_select, soft_rst2;</div><div class='del'>-</div><div class='del'>-	/* Real work is done on clock_ctrl other resets are thought to be</div><div class='del'>-	 * optional but make the reset more reliable</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/* Read */</div><div class='del'>-	clk_ctrl = mdio_clause45_read(efx, phy, MDIO_MMD_PCS,</div><div class='del'>-				      PCS_CLOCK_CTRL_REG);</div><div class='del'>-	test_select = mdio_clause45_read(efx, phy, MDIO_MMD_PCS,</div><div class='del'>-					 PCS_TEST_SELECT_REG);</div><div class='del'>-	soft_rst2 = mdio_clause45_read(efx, phy, MDIO_MMD_PCS,</div><div class='del'>-				       PCS_SOFT_RST2_REG);</div><div class='del'>-</div><div class='del'>-	/* Put in reset */</div><div class='del'>-	test_select &amp;= ~(1 &lt;&lt; CLK312_EN_LBN);</div><div class='del'>-	mdio_clause45_write(efx, phy, MDIO_MMD_PCS,</div><div class='del'>-			    PCS_TEST_SELECT_REG, test_select);</div><div class='del'>-</div><div class='del'>-	soft_rst2 &amp;= ~((1 &lt;&lt; XGXS_RST_N_LBN) | (1 &lt;&lt; SERDES_RST_N_LBN));</div><div class='del'>-	mdio_clause45_write(efx, phy, MDIO_MMD_PCS,</div><div class='del'>-			    PCS_SOFT_RST2_REG, soft_rst2);</div><div class='del'>-</div><div class='del'>-	clk_ctrl &amp;= ~(1 &lt;&lt; PLL312_RST_N_LBN);</div><div class='del'>-	mdio_clause45_write(efx, phy, MDIO_MMD_PCS,</div><div class='del'>-			    PCS_CLOCK_CTRL_REG, clk_ctrl);</div><div class='del'>-	udelay(10);</div><div class='del'>-</div><div class='del'>-	/* Remove reset */</div><div class='del'>-	clk_ctrl |= (1 &lt;&lt; PLL312_RST_N_LBN);</div><div class='del'>-	mdio_clause45_write(efx, phy, MDIO_MMD_PCS,</div><div class='del'>-			    PCS_CLOCK_CTRL_REG, clk_ctrl);</div><div class='del'>-	udelay(10);</div><div class='del'>-</div><div class='del'>-	soft_rst2 |= ((1 &lt;&lt; XGXS_RST_N_LBN) | (1 &lt;&lt; SERDES_RST_N_LBN));</div><div class='del'>-	mdio_clause45_write(efx, phy, MDIO_MMD_PCS,</div><div class='del'>-			    PCS_SOFT_RST2_REG, soft_rst2);</div><div class='del'>-	udelay(10);</div><div class='del'>-</div><div class='del'>-	test_select |= (1 &lt;&lt; CLK312_EN_LBN);</div><div class='del'>-	mdio_clause45_write(efx, phy, MDIO_MMD_PCS,</div><div class='del'>-			    PCS_TEST_SELECT_REG, test_select);</div><div class='del'>-	udelay(10);</div><div class='add'>+	/* BIST is automatically run after a special software reset */</div><div class='add'>+	return tenxpress_special_reset(efx);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct efx_phy_operations falcon_tenxpress_phy_ops = {</div><div class='hunk'>@@ -513,7 +442,7 @@ struct efx_phy_operations falcon_tenxpress_phy_ops = {</div><div class='ctx'> 	.check_hw         = tenxpress_phy_check_hw,</div><div class='ctx'> 	.fini             = tenxpress_phy_fini,</div><div class='ctx'> 	.clear_interrupt  = tenxpress_phy_clear_interrupt,</div><div class='del'>-	.reset_xaui       = tenxpress_reset_xaui,</div><div class='add'>+	.test             = tenxpress_phy_test,</div><div class='ctx'> 	.mmds             = TENXPRESS_REQUIRED_DEVS,</div><div class='ctx'> 	.loopbacks        = TENXPRESS_LOOPBACKS,</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/net/sfc/tx.c b/drivers/net/sfc/tx.c<br/>index 5e8374ab28ee..da3e9ff339f5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sfc/tx.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/sfc/tx.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sfc/tx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sfc/tx.c</a></div><div class='hunk'>@@ -47,7 +47,7 @@ void efx_stop_queue(struct efx_nic *efx)</div><div class='ctx'>  * We want to be able to nest calls to netif_stop_queue(), since each</div><div class='ctx'>  * channel can have an individual stop on the queue.</div><div class='ctx'>  */</div><div class='del'>-inline void efx_wake_queue(struct efx_nic *efx)</div><div class='add'>+void efx_wake_queue(struct efx_nic *efx)</div><div class='ctx'> {</div><div class='ctx'> 	local_bh_disable();</div><div class='ctx'> 	if (atomic_dec_and_lock(&amp;efx-&gt;netif_stop_count,</div><div class='hunk'>@@ -59,19 +59,21 @@ inline void efx_wake_queue(struct efx_nic *efx)</div><div class='ctx'> 	local_bh_enable();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void efx_dequeue_buffer(struct efx_tx_queue *tx_queue,</div><div class='del'>-				      struct efx_tx_buffer *buffer)</div><div class='add'>+static void efx_dequeue_buffer(struct efx_tx_queue *tx_queue,</div><div class='add'>+			       struct efx_tx_buffer *buffer)</div><div class='ctx'> {</div><div class='ctx'> 	if (buffer-&gt;unmap_len) {</div><div class='ctx'> 		struct pci_dev *pci_dev = tx_queue-&gt;efx-&gt;pci_dev;</div><div class='add'>+		dma_addr_t unmap_addr = (buffer-&gt;dma_addr + buffer-&gt;len -</div><div class='add'>+					 buffer-&gt;unmap_len);</div><div class='ctx'> 		if (buffer-&gt;unmap_single)</div><div class='del'>-			pci_unmap_single(pci_dev, buffer-&gt;unmap_addr,</div><div class='del'>-					 buffer-&gt;unmap_len, PCI_DMA_TODEVICE);</div><div class='add'>+			pci_unmap_single(pci_dev, unmap_addr, buffer-&gt;unmap_len,</div><div class='add'>+					 PCI_DMA_TODEVICE);</div><div class='ctx'> 		else</div><div class='del'>-			pci_unmap_page(pci_dev, buffer-&gt;unmap_addr,</div><div class='del'>-				       buffer-&gt;unmap_len, PCI_DMA_TODEVICE);</div><div class='add'>+			pci_unmap_page(pci_dev, unmap_addr, buffer-&gt;unmap_len,</div><div class='add'>+				       PCI_DMA_TODEVICE);</div><div class='ctx'> 		buffer-&gt;unmap_len = 0;</div><div class='del'>-		buffer-&gt;unmap_single = 0;</div><div class='add'>+		buffer-&gt;unmap_single = false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (buffer-&gt;skb) {</div><div class='hunk'>@@ -103,13 +105,13 @@ struct efx_tso_header {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int efx_enqueue_skb_tso(struct efx_tx_queue *tx_queue,</div><div class='del'>-			       const struct sk_buff *skb);</div><div class='add'>+			       struct sk_buff *skb);</div><div class='ctx'> static void efx_fini_tso(struct efx_tx_queue *tx_queue);</div><div class='ctx'> static void efx_tsoh_heap_free(struct efx_tx_queue *tx_queue,</div><div class='ctx'> 			       struct efx_tso_header *tsoh);</div><div class='ctx'> </div><div class='del'>-static inline void efx_tsoh_free(struct efx_tx_queue *tx_queue,</div><div class='del'>-				 struct efx_tx_buffer *buffer)</div><div class='add'>+static void efx_tsoh_free(struct efx_tx_queue *tx_queue,</div><div class='add'>+			  struct efx_tx_buffer *buffer)</div><div class='ctx'> {</div><div class='ctx'> 	if (buffer-&gt;tsoh) {</div><div class='ctx'> 		if (likely(!buffer-&gt;tsoh-&gt;unmap_len)) {</div><div class='hunk'>@@ -136,8 +138,8 @@ static inline void efx_tsoh_free(struct efx_tx_queue *tx_queue,</div><div class='ctx'>  * Returns NETDEV_TX_OK or NETDEV_TX_BUSY</div><div class='ctx'>  * You must hold netif_tx_lock() to call this function.</div><div class='ctx'>  */</div><div class='del'>-static inline int efx_enqueue_skb(struct efx_tx_queue *tx_queue,</div><div class='del'>-				  const struct sk_buff *skb)</div><div class='add'>+static int efx_enqueue_skb(struct efx_tx_queue *tx_queue,</div><div class='add'>+			   struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct efx_nic *efx = tx_queue-&gt;efx;</div><div class='ctx'> 	struct pci_dev *pci_dev = efx-&gt;pci_dev;</div><div class='hunk'>@@ -148,7 +150,7 @@ static inline int efx_enqueue_skb(struct efx_tx_queue *tx_queue,</div><div class='ctx'> 	unsigned int len, unmap_len = 0, fill_level, insert_ptr, misalign;</div><div class='ctx'> 	dma_addr_t dma_addr, unmap_addr = 0;</div><div class='ctx'> 	unsigned int dma_len;</div><div class='del'>-	unsigned unmap_single;</div><div class='add'>+	bool unmap_single;</div><div class='ctx'> 	int q_space, i = 0;</div><div class='ctx'> 	int rc = NETDEV_TX_OK;</div><div class='ctx'> </div><div class='hunk'>@@ -167,7 +169,7 @@ static inline int efx_enqueue_skb(struct efx_tx_queue *tx_queue,</div><div class='ctx'> 	 * since this is more efficient on machines with sparse</div><div class='ctx'> 	 * memory.</div><div class='ctx'> 	 */</div><div class='del'>-	unmap_single = 1;</div><div class='add'>+	unmap_single = true;</div><div class='ctx'> 	dma_addr = pci_map_single(pci_dev, skb-&gt;data, len, PCI_DMA_TODEVICE);</div><div class='ctx'> </div><div class='ctx'> 	/* Process all fragments */</div><div class='hunk'>@@ -213,7 +215,7 @@ static inline int efx_enqueue_skb(struct efx_tx_queue *tx_queue,</div><div class='ctx'> 			EFX_BUG_ON_PARANOID(buffer-&gt;tsoh);</div><div class='ctx'> 			EFX_BUG_ON_PARANOID(buffer-&gt;skb);</div><div class='ctx'> 			EFX_BUG_ON_PARANOID(buffer-&gt;len);</div><div class='del'>-			EFX_BUG_ON_PARANOID(buffer-&gt;continuation != 1);</div><div class='add'>+			EFX_BUG_ON_PARANOID(!buffer-&gt;continuation);</div><div class='ctx'> 			EFX_BUG_ON_PARANOID(buffer-&gt;unmap_len);</div><div class='ctx'> </div><div class='ctx'> 			dma_len = (((~dma_addr) &amp; efx-&gt;type-&gt;tx_dma_mask) + 1);</div><div class='hunk'>@@ -233,7 +235,6 @@ static inline int efx_enqueue_skb(struct efx_tx_queue *tx_queue,</div><div class='ctx'> 		} while (len);</div><div class='ctx'> </div><div class='ctx'> 		/* Transfer ownership of the unmapping to the final buffer */</div><div class='del'>-		buffer-&gt;unmap_addr = unmap_addr;</div><div class='ctx'> 		buffer-&gt;unmap_single = unmap_single;</div><div class='ctx'> 		buffer-&gt;unmap_len = unmap_len;</div><div class='ctx'> 		unmap_len = 0;</div><div class='hunk'>@@ -247,14 +248,14 @@ static inline int efx_enqueue_skb(struct efx_tx_queue *tx_queue,</div><div class='ctx'> 		page_offset = fragment-&gt;page_offset;</div><div class='ctx'> 		i++;</div><div class='ctx'> 		/* Map for DMA */</div><div class='del'>-		unmap_single = 0;</div><div class='add'>+		unmap_single = false;</div><div class='ctx'> 		dma_addr = pci_map_page(pci_dev, page, page_offset, len,</div><div class='ctx'> 					PCI_DMA_TODEVICE);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Transfer ownership of the skb to the final buffer */</div><div class='ctx'> 	buffer-&gt;skb = skb;</div><div class='del'>-	buffer-&gt;continuation = 0;</div><div class='add'>+	buffer-&gt;continuation = false;</div><div class='ctx'> </div><div class='ctx'> 	/* Pass off to hardware */</div><div class='ctx'> 	falcon_push_buffers(tx_queue);</div><div class='hunk'>@@ -287,9 +288,14 @@ static inline int efx_enqueue_skb(struct efx_tx_queue *tx_queue,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Free the fragment we were mid-way through pushing */</div><div class='del'>-	if (unmap_len)</div><div class='del'>-		pci_unmap_page(pci_dev, unmap_addr, unmap_len,</div><div class='del'>-			       PCI_DMA_TODEVICE);</div><div class='add'>+	if (unmap_len) {</div><div class='add'>+		if (unmap_single)</div><div class='add'>+			pci_unmap_single(pci_dev, unmap_addr, unmap_len,</div><div class='add'>+					 PCI_DMA_TODEVICE);</div><div class='add'>+		else</div><div class='add'>+			pci_unmap_page(pci_dev, unmap_addr, unmap_len,</div><div class='add'>+				       PCI_DMA_TODEVICE);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='hunk'>@@ -299,8 +305,8 @@ static inline int efx_enqueue_skb(struct efx_tx_queue *tx_queue,</div><div class='ctx'>  * This removes packets from the TX queue, up to and including the</div><div class='ctx'>  * specified index.</div><div class='ctx'>  */</div><div class='del'>-static inline void efx_dequeue_buffers(struct efx_tx_queue *tx_queue,</div><div class='del'>-				       unsigned int index)</div><div class='add'>+static void efx_dequeue_buffers(struct efx_tx_queue *tx_queue,</div><div class='add'>+				unsigned int index)</div><div class='ctx'> {</div><div class='ctx'> 	struct efx_nic *efx = tx_queue-&gt;efx;</div><div class='ctx'> 	unsigned int stop_index, read_ptr;</div><div class='hunk'>@@ -320,7 +326,7 @@ static inline void efx_dequeue_buffers(struct efx_tx_queue *tx_queue,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		efx_dequeue_buffer(tx_queue, buffer);</div><div class='del'>-		buffer-&gt;continuation = 1;</div><div class='add'>+		buffer-&gt;continuation = true;</div><div class='ctx'> 		buffer-&gt;len = 0;</div><div class='ctx'> </div><div class='ctx'> 		++tx_queue-&gt;read_count;</div><div class='hunk'>@@ -367,8 +373,15 @@ inline int efx_xmit(struct efx_nic *efx,</div><div class='ctx'>  */</div><div class='ctx'> int efx_hard_start_xmit(struct sk_buff *skb, struct net_device *net_dev)</div><div class='ctx'> {</div><div class='del'>-	struct efx_nic *efx = net_dev-&gt;priv;</div><div class='del'>-	return efx_xmit(efx, &amp;efx-&gt;tx_queue[0], skb);</div><div class='add'>+	struct efx_nic *efx = netdev_priv(net_dev);</div><div class='add'>+	struct efx_tx_queue *tx_queue;</div><div class='add'>+</div><div class='add'>+	if (likely(skb-&gt;ip_summed == CHECKSUM_PARTIAL))</div><div class='add'>+		tx_queue = &amp;efx-&gt;tx_queue[EFX_TX_QUEUE_OFFLOAD_CSUM];</div><div class='add'>+	else</div><div class='add'>+		tx_queue = &amp;efx-&gt;tx_queue[EFX_TX_QUEUE_NO_CSUM];</div><div class='add'>+</div><div class='add'>+	return efx_xmit(efx, tx_queue, skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void efx_xmit_done(struct efx_tx_queue *tx_queue, unsigned int index)</div><div class='hunk'>@@ -412,30 +425,25 @@ int efx_probe_tx_queue(struct efx_tx_queue *tx_queue)</div><div class='ctx'> 	/* Allocate software ring */</div><div class='ctx'> 	txq_size = (efx-&gt;type-&gt;txd_ring_mask + 1) * sizeof(*tx_queue-&gt;buffer);</div><div class='ctx'> 	tx_queue-&gt;buffer = kzalloc(txq_size, GFP_KERNEL);</div><div class='del'>-	if (!tx_queue-&gt;buffer) {</div><div class='del'>-		rc = -ENOMEM;</div><div class='del'>-		goto fail1;</div><div class='del'>-	}</div><div class='add'>+	if (!tx_queue-&gt;buffer)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	for (i = 0; i &lt;= efx-&gt;type-&gt;txd_ring_mask; ++i)</div><div class='del'>-		tx_queue-&gt;buffer[i].continuation = 1;</div><div class='add'>+		tx_queue-&gt;buffer[i].continuation = true;</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate hardware ring */</div><div class='ctx'> 	rc = falcon_probe_tx(tx_queue);</div><div class='ctx'> 	if (rc)</div><div class='del'>-		goto fail2;</div><div class='add'>+		goto fail;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>- fail2:</div><div class='add'>+ fail:</div><div class='ctx'> 	kfree(tx_queue-&gt;buffer);</div><div class='ctx'> 	tx_queue-&gt;buffer = NULL;</div><div class='del'>- fail1:</div><div class='del'>-	tx_queue-&gt;used = 0;</div><div class='del'>-</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int efx_init_tx_queue(struct efx_tx_queue *tx_queue)</div><div class='add'>+void efx_init_tx_queue(struct efx_tx_queue *tx_queue)</div><div class='ctx'> {</div><div class='ctx'> 	EFX_LOG(tx_queue-&gt;efx, "initialising TX queue %d\n", tx_queue-&gt;queue);</div><div class='ctx'> </div><div class='hunk'>@@ -446,7 +454,7 @@ int efx_init_tx_queue(struct efx_tx_queue *tx_queue)</div><div class='ctx'> 	BUG_ON(tx_queue-&gt;stopped);</div><div class='ctx'> </div><div class='ctx'> 	/* Set up TX descriptor ring */</div><div class='del'>-	return falcon_init_tx(tx_queue);</div><div class='add'>+	falcon_init_tx(tx_queue);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void efx_release_tx_buffers(struct efx_tx_queue *tx_queue)</div><div class='hunk'>@@ -461,7 +469,7 @@ void efx_release_tx_buffers(struct efx_tx_queue *tx_queue)</div><div class='ctx'> 		buffer = &amp;tx_queue-&gt;buffer[tx_queue-&gt;read_count &amp;</div><div class='ctx'> 					   tx_queue-&gt;efx-&gt;type-&gt;txd_ring_mask];</div><div class='ctx'> 		efx_dequeue_buffer(tx_queue, buffer);</div><div class='del'>-		buffer-&gt;continuation = 1;</div><div class='add'>+		buffer-&gt;continuation = true;</div><div class='ctx'> 		buffer-&gt;len = 0;</div><div class='ctx'> </div><div class='ctx'> 		++tx_queue-&gt;read_count;</div><div class='hunk'>@@ -494,7 +502,6 @@ void efx_remove_tx_queue(struct efx_tx_queue *tx_queue)</div><div class='ctx'> </div><div class='ctx'> 	kfree(tx_queue-&gt;buffer);</div><div class='ctx'> 	tx_queue-&gt;buffer = NULL;</div><div class='del'>-	tx_queue-&gt;used = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -509,7 +516,7 @@ void efx_remove_tx_queue(struct efx_tx_queue *tx_queue)</div><div class='ctx'> /* Number of bytes inserted at the start of a TSO header buffer,</div><div class='ctx'>  * similar to NET_IP_ALIGN.</div><div class='ctx'>  */</div><div class='del'>-#if defined(__i386__) || defined(__x86_64__)</div><div class='add'>+#ifdef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS</div><div class='ctx'> #define TSOH_OFFSET	0</div><div class='ctx'> #else</div><div class='ctx'> #define TSOH_OFFSET	NET_IP_ALIGN</div><div class='hunk'>@@ -533,47 +540,37 @@ void efx_remove_tx_queue(struct efx_tx_queue *tx_queue)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct tso_state - TSO state for an SKB</div><div class='del'>- * @remaining_len: Bytes of data we've yet to segment</div><div class='add'>+ * @out_len: Remaining length in current segment</div><div class='ctx'>  * @seqnum: Current sequence number</div><div class='add'>+ * @ipv4_id: Current IPv4 ID, host endian</div><div class='ctx'>  * @packet_space: Remaining space in current packet</div><div class='del'>- * @ifc: Input fragment cursor.</div><div class='del'>- *	Where we are in the current fragment of the incoming SKB.  These</div><div class='del'>- *	values get updated in place when we split a fragment over</div><div class='del'>- *	multiple packets.</div><div class='del'>- * @p: Parameters.</div><div class='del'>- *	These values are set once at the start of the TSO send and do</div><div class='del'>- *	not get changed as the routine progresses.</div><div class='add'>+ * @dma_addr: DMA address of current position</div><div class='add'>+ * @in_len: Remaining length in current SKB fragment</div><div class='add'>+ * @unmap_len: Length of SKB fragment</div><div class='add'>+ * @unmap_addr: DMA address of SKB fragment</div><div class='add'>+ * @unmap_single: DMA single vs page mapping flag</div><div class='add'>+ * @header_len: Number of bytes of header</div><div class='add'>+ * @full_packet_size: Number of bytes to put in each outgoing segment</div><div class='ctx'>  *</div><div class='ctx'>  * The state used during segmentation.  It is put into this data structure</div><div class='ctx'>  * just to make it easy to pass into inline functions.</div><div class='ctx'>  */</div><div class='ctx'> struct tso_state {</div><div class='del'>-	unsigned remaining_len;</div><div class='add'>+	/* Output position */</div><div class='add'>+	unsigned out_len;</div><div class='ctx'> 	unsigned seqnum;</div><div class='add'>+	unsigned ipv4_id;</div><div class='ctx'> 	unsigned packet_space;</div><div class='ctx'> </div><div class='del'>-	struct {</div><div class='del'>-		/* DMA address of current position */</div><div class='del'>-		dma_addr_t dma_addr;</div><div class='del'>-		/* Remaining length */</div><div class='del'>-		unsigned int len;</div><div class='del'>-		/* DMA address and length of the whole fragment */</div><div class='del'>-		unsigned int unmap_len;</div><div class='del'>-		dma_addr_t unmap_addr;</div><div class='del'>-		struct page *page;</div><div class='del'>-		unsigned page_off;</div><div class='del'>-	} ifc;</div><div class='del'>-</div><div class='del'>-	struct {</div><div class='del'>-		/* The number of bytes of header */</div><div class='del'>-		unsigned int header_length;</div><div class='del'>-</div><div class='del'>-		/* The number of bytes to put in each outgoing segment. */</div><div class='del'>-		int full_packet_size;</div><div class='del'>-</div><div class='del'>-		/* Current IPv4 ID, host endian. */</div><div class='del'>-		unsigned ipv4_id;</div><div class='del'>-	} p;</div><div class='add'>+	/* Input position */</div><div class='add'>+	dma_addr_t dma_addr;</div><div class='add'>+	unsigned in_len;</div><div class='add'>+	unsigned unmap_len;</div><div class='add'>+	dma_addr_t unmap_addr;</div><div class='add'>+	bool unmap_single;</div><div class='add'>+</div><div class='add'>+	unsigned header_len;</div><div class='add'>+	int full_packet_size;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -581,11 +578,24 @@ struct tso_state {</div><div class='ctx'>  * Verify that our various assumptions about sk_buffs and the conditions</div><div class='ctx'>  * under which TSO will be attempted hold true.</div><div class='ctx'>  */</div><div class='del'>-static inline void efx_tso_check_safe(const struct sk_buff *skb)</div><div class='add'>+static void efx_tso_check_safe(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	EFX_BUG_ON_PARANOID(skb-&gt;protocol != htons(ETH_P_IP));</div><div class='add'>+	__be16 protocol = skb-&gt;protocol;</div><div class='add'>+</div><div class='ctx'> 	EFX_BUG_ON_PARANOID(((struct ethhdr *)skb-&gt;data)-&gt;h_proto !=</div><div class='del'>-			    skb-&gt;protocol);</div><div class='add'>+			    protocol);</div><div class='add'>+	if (protocol == htons(ETH_P_8021Q)) {</div><div class='add'>+		/* Find the encapsulated protocol; reset network header</div><div class='add'>+		 * and transport header based on that. */</div><div class='add'>+		struct vlan_ethhdr *veh = (struct vlan_ethhdr *)skb-&gt;data;</div><div class='add'>+		protocol = veh-&gt;h_vlan_encapsulated_proto;</div><div class='add'>+		skb_set_network_header(skb, sizeof(*veh));</div><div class='add'>+		if (protocol == htons(ETH_P_IP))</div><div class='add'>+			skb_set_transport_header(skb, sizeof(*veh) +</div><div class='add'>+						 4 * ip_hdr(skb)-&gt;ihl);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	EFX_BUG_ON_PARANOID(protocol != htons(ETH_P_IP));</div><div class='ctx'> 	EFX_BUG_ON_PARANOID(ip_hdr(skb)-&gt;protocol != IPPROTO_TCP);</div><div class='ctx'> 	EFX_BUG_ON_PARANOID((PTR_DIFF(tcp_hdr(skb), skb-&gt;data)</div><div class='ctx'> 			     + (tcp_hdr(skb)-&gt;doff &lt;&lt; 2u)) &gt;</div><div class='hunk'>@@ -685,18 +695,14 @@ efx_tsoh_heap_free(struct efx_tx_queue *tx_queue, struct efx_tso_header *tsoh)</div><div class='ctx'>  * @tx_queue:		Efx TX queue</div><div class='ctx'>  * @dma_addr:		DMA address of fragment</div><div class='ctx'>  * @len:		Length of fragment</div><div class='del'>- * @skb:		Only non-null for end of last segment</div><div class='del'>- * @end_of_packet:	True if last fragment in a packet</div><div class='del'>- * @unmap_addr:		DMA address of fragment for unmapping</div><div class='del'>- * @unmap_len:		Only set this in last segment of a fragment</div><div class='add'>+ * @final_buffer:	The final buffer inserted into the queue</div><div class='ctx'>  *</div><div class='ctx'>  * Push descriptors onto the TX queue.  Return 0 on success or 1 if</div><div class='ctx'>  * @tx_queue full.</div><div class='ctx'>  */</div><div class='ctx'> static int efx_tx_queue_insert(struct efx_tx_queue *tx_queue,</div><div class='ctx'> 			       dma_addr_t dma_addr, unsigned len,</div><div class='del'>-			       const struct sk_buff *skb, int end_of_packet,</div><div class='del'>-			       dma_addr_t unmap_addr, unsigned unmap_len)</div><div class='add'>+			       struct efx_tx_buffer **final_buffer)</div><div class='ctx'> {</div><div class='ctx'> 	struct efx_tx_buffer *buffer;</div><div class='ctx'> 	struct efx_nic *efx = tx_queue-&gt;efx;</div><div class='hunk'>@@ -724,8 +730,10 @@ static int efx_tx_queue_insert(struct efx_tx_queue *tx_queue,</div><div class='ctx'> 			fill_level = (tx_queue-&gt;insert_count</div><div class='ctx'> 				      - tx_queue-&gt;old_read_count);</div><div class='ctx'> 			q_space = efx-&gt;type-&gt;txd_ring_mask - 1 - fill_level;</div><div class='del'>-			if (unlikely(q_space-- &lt;= 0))</div><div class='add'>+			if (unlikely(q_space-- &lt;= 0)) {</div><div class='add'>+				*final_buffer = NULL;</div><div class='ctx'> 				return 1;</div><div class='add'>+			}</div><div class='ctx'> 			smp_mb();</div><div class='ctx'> 			--tx_queue-&gt;stopped;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -742,7 +750,7 @@ static int efx_tx_queue_insert(struct efx_tx_queue *tx_queue,</div><div class='ctx'> 		EFX_BUG_ON_PARANOID(buffer-&gt;len);</div><div class='ctx'> 		EFX_BUG_ON_PARANOID(buffer-&gt;unmap_len);</div><div class='ctx'> 		EFX_BUG_ON_PARANOID(buffer-&gt;skb);</div><div class='del'>-		EFX_BUG_ON_PARANOID(buffer-&gt;continuation != 1);</div><div class='add'>+		EFX_BUG_ON_PARANOID(!buffer-&gt;continuation);</div><div class='ctx'> 		EFX_BUG_ON_PARANOID(buffer-&gt;tsoh);</div><div class='ctx'> </div><div class='ctx'> 		buffer-&gt;dma_addr = dma_addr;</div><div class='hunk'>@@ -765,10 +773,7 @@ static int efx_tx_queue_insert(struct efx_tx_queue *tx_queue,</div><div class='ctx'> </div><div class='ctx'> 	EFX_BUG_ON_PARANOID(!len);</div><div class='ctx'> 	buffer-&gt;len = len;</div><div class='del'>-	buffer-&gt;skb = skb;</div><div class='del'>-	buffer-&gt;continuation = !end_of_packet;</div><div class='del'>-	buffer-&gt;unmap_addr = unmap_addr;</div><div class='del'>-	buffer-&gt;unmap_len = unmap_len;</div><div class='add'>+	*final_buffer = buffer;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -780,8 +785,8 @@ static int efx_tx_queue_insert(struct efx_tx_queue *tx_queue,</div><div class='ctx'>  * a single fragment, and we know it doesn't cross a page boundary.  It</div><div class='ctx'>  * also allows us to not worry about end-of-packet etc.</div><div class='ctx'>  */</div><div class='del'>-static inline void efx_tso_put_header(struct efx_tx_queue *tx_queue,</div><div class='del'>-				      struct efx_tso_header *tsoh, unsigned len)</div><div class='add'>+static void efx_tso_put_header(struct efx_tx_queue *tx_queue,</div><div class='add'>+			       struct efx_tso_header *tsoh, unsigned len)</div><div class='ctx'> {</div><div class='ctx'> 	struct efx_tx_buffer *buffer;</div><div class='ctx'> </div><div class='hunk'>@@ -791,7 +796,7 @@ static inline void efx_tso_put_header(struct efx_tx_queue *tx_queue,</div><div class='ctx'> 	EFX_BUG_ON_PARANOID(buffer-&gt;len);</div><div class='ctx'> 	EFX_BUG_ON_PARANOID(buffer-&gt;unmap_len);</div><div class='ctx'> 	EFX_BUG_ON_PARANOID(buffer-&gt;skb);</div><div class='del'>-	EFX_BUG_ON_PARANOID(buffer-&gt;continuation != 1);</div><div class='add'>+	EFX_BUG_ON_PARANOID(!buffer-&gt;continuation);</div><div class='ctx'> 	EFX_BUG_ON_PARANOID(buffer-&gt;tsoh);</div><div class='ctx'> 	buffer-&gt;len = len;</div><div class='ctx'> 	buffer-&gt;dma_addr = tsoh-&gt;dma_addr;</div><div class='hunk'>@@ -805,6 +810,7 @@ static inline void efx_tso_put_header(struct efx_tx_queue *tx_queue,</div><div class='ctx'> static void efx_enqueue_unwind(struct efx_tx_queue *tx_queue)</div><div class='ctx'> {</div><div class='ctx'> 	struct efx_tx_buffer *buffer;</div><div class='add'>+	dma_addr_t unmap_addr;</div><div class='ctx'> </div><div class='ctx'> 	/* Work backwards until we hit the original insert pointer value */</div><div class='ctx'> 	while (tx_queue-&gt;insert_count != tx_queue-&gt;write_count) {</div><div class='hunk'>@@ -814,11 +820,18 @@ static void efx_enqueue_unwind(struct efx_tx_queue *tx_queue)</div><div class='ctx'> 		efx_tsoh_free(tx_queue, buffer);</div><div class='ctx'> 		EFX_BUG_ON_PARANOID(buffer-&gt;skb);</div><div class='ctx'> 		buffer-&gt;len = 0;</div><div class='del'>-		buffer-&gt;continuation = 1;</div><div class='add'>+		buffer-&gt;continuation = true;</div><div class='ctx'> 		if (buffer-&gt;unmap_len) {</div><div class='del'>-			pci_unmap_page(tx_queue-&gt;efx-&gt;pci_dev,</div><div class='del'>-				       buffer-&gt;unmap_addr,</div><div class='del'>-				       buffer-&gt;unmap_len, PCI_DMA_TODEVICE);</div><div class='add'>+			unmap_addr = (buffer-&gt;dma_addr + buffer-&gt;len -</div><div class='add'>+				      buffer-&gt;unmap_len);</div><div class='add'>+			if (buffer-&gt;unmap_single)</div><div class='add'>+				pci_unmap_single(tx_queue-&gt;efx-&gt;pci_dev,</div><div class='add'>+						 unmap_addr, buffer-&gt;unmap_len,</div><div class='add'>+						 PCI_DMA_TODEVICE);</div><div class='add'>+			else</div><div class='add'>+				pci_unmap_page(tx_queue-&gt;efx-&gt;pci_dev,</div><div class='add'>+					       unmap_addr, buffer-&gt;unmap_len,</div><div class='add'>+					       PCI_DMA_TODEVICE);</div><div class='ctx'> 			buffer-&gt;unmap_len = 0;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -826,50 +839,57 @@ static void efx_enqueue_unwind(struct efx_tx_queue *tx_queue)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* Parse the SKB header and initialise state. */</div><div class='del'>-static inline void tso_start(struct tso_state *st, const struct sk_buff *skb)</div><div class='add'>+static void tso_start(struct tso_state *st, const struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	/* All ethernet/IP/TCP headers combined size is TCP header size</div><div class='ctx'> 	 * plus offset of TCP header relative to start of packet.</div><div class='ctx'> 	 */</div><div class='del'>-	st-&gt;p.header_length = ((tcp_hdr(skb)-&gt;doff &lt;&lt; 2u)</div><div class='del'>-			       + PTR_DIFF(tcp_hdr(skb), skb-&gt;data));</div><div class='del'>-	st-&gt;p.full_packet_size = (st-&gt;p.header_length</div><div class='del'>-				  + skb_shinfo(skb)-&gt;gso_size);</div><div class='add'>+	st-&gt;header_len = ((tcp_hdr(skb)-&gt;doff &lt;&lt; 2u)</div><div class='add'>+			  + PTR_DIFF(tcp_hdr(skb), skb-&gt;data));</div><div class='add'>+	st-&gt;full_packet_size = st-&gt;header_len + skb_shinfo(skb)-&gt;gso_size;</div><div class='ctx'> </div><div class='del'>-	st-&gt;p.ipv4_id = ntohs(ip_hdr(skb)-&gt;id);</div><div class='add'>+	st-&gt;ipv4_id = ntohs(ip_hdr(skb)-&gt;id);</div><div class='ctx'> 	st-&gt;seqnum = ntohl(tcp_hdr(skb)-&gt;seq);</div><div class='ctx'> </div><div class='ctx'> 	EFX_BUG_ON_PARANOID(tcp_hdr(skb)-&gt;urg);</div><div class='ctx'> 	EFX_BUG_ON_PARANOID(tcp_hdr(skb)-&gt;syn);</div><div class='ctx'> 	EFX_BUG_ON_PARANOID(tcp_hdr(skb)-&gt;rst);</div><div class='ctx'> </div><div class='del'>-	st-&gt;packet_space = st-&gt;p.full_packet_size;</div><div class='del'>-	st-&gt;remaining_len = skb-&gt;len - st-&gt;p.header_length;</div><div class='add'>+	st-&gt;packet_space = st-&gt;full_packet_size;</div><div class='add'>+	st-&gt;out_len = skb-&gt;len - st-&gt;header_len;</div><div class='add'>+	st-&gt;unmap_len = 0;</div><div class='add'>+	st-&gt;unmap_single = false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * tso_get_fragment - record fragment details and map for DMA</div><div class='del'>- * @st:			TSO state</div><div class='del'>- * @efx:		Efx NIC</div><div class='del'>- * @data:		Pointer to fragment data</div><div class='del'>- * @len:		Length of fragment</div><div class='del'>- *</div><div class='del'>- * Record fragment details and map for DMA.  Return 0 on success, or</div><div class='del'>- * -%ENOMEM if DMA mapping fails.</div><div class='del'>- */</div><div class='del'>-static inline int tso_get_fragment(struct tso_state *st, struct efx_nic *efx,</div><div class='del'>-				   int len, struct page *page, int page_off)</div><div class='add'>+static int tso_get_fragment(struct tso_state *st, struct efx_nic *efx,</div><div class='add'>+			    skb_frag_t *frag)</div><div class='ctx'> {</div><div class='add'>+	st-&gt;unmap_addr = pci_map_page(efx-&gt;pci_dev, frag-&gt;page,</div><div class='add'>+				      frag-&gt;page_offset, frag-&gt;size,</div><div class='add'>+				      PCI_DMA_TODEVICE);</div><div class='add'>+	if (likely(!pci_dma_mapping_error(efx-&gt;pci_dev, st-&gt;unmap_addr))) {</div><div class='add'>+		st-&gt;unmap_single = false;</div><div class='add'>+		st-&gt;unmap_len = frag-&gt;size;</div><div class='add'>+		st-&gt;in_len = frag-&gt;size;</div><div class='add'>+		st-&gt;dma_addr = st-&gt;unmap_addr;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	return -ENOMEM;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	st-&gt;ifc.unmap_addr = pci_map_page(efx-&gt;pci_dev, page, page_off,</div><div class='del'>-					  len, PCI_DMA_TODEVICE);</div><div class='del'>-	if (likely(!pci_dma_mapping_error(efx-&gt;pci_dev, st-&gt;ifc.unmap_addr))) {</div><div class='del'>-		st-&gt;ifc.unmap_len = len;</div><div class='del'>-		st-&gt;ifc.len = len;</div><div class='del'>-		st-&gt;ifc.dma_addr = st-&gt;ifc.unmap_addr;</div><div class='del'>-		st-&gt;ifc.page = page;</div><div class='del'>-		st-&gt;ifc.page_off = page_off;</div><div class='add'>+static int tso_get_head_fragment(struct tso_state *st, struct efx_nic *efx,</div><div class='add'>+				 const struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	int hl = st-&gt;header_len;</div><div class='add'>+	int len = skb_headlen(skb) - hl;</div><div class='add'>+</div><div class='add'>+	st-&gt;unmap_addr = pci_map_single(efx-&gt;pci_dev, skb-&gt;data + hl,</div><div class='add'>+					len, PCI_DMA_TODEVICE);</div><div class='add'>+	if (likely(!pci_dma_mapping_error(efx-&gt;pci_dev, st-&gt;unmap_addr))) {</div><div class='add'>+		st-&gt;unmap_single = true;</div><div class='add'>+		st-&gt;unmap_len = len;</div><div class='add'>+		st-&gt;in_len = len;</div><div class='add'>+		st-&gt;dma_addr = st-&gt;unmap_addr;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	return -ENOMEM;</div><div class='hunk'>@@ -886,36 +906,45 @@ static inline int tso_get_fragment(struct tso_state *st, struct efx_nic *efx,</div><div class='ctx'>  * of fragment or end-of-packet.  Return 0 on success, 1 if not enough</div><div class='ctx'>  * space in @tx_queue.</div><div class='ctx'>  */</div><div class='del'>-static inline int tso_fill_packet_with_fragment(struct efx_tx_queue *tx_queue,</div><div class='del'>-						const struct sk_buff *skb,</div><div class='del'>-						struct tso_state *st)</div><div class='add'>+static int tso_fill_packet_with_fragment(struct efx_tx_queue *tx_queue,</div><div class='add'>+					 const struct sk_buff *skb,</div><div class='add'>+					 struct tso_state *st)</div><div class='ctx'> {</div><div class='del'>-</div><div class='add'>+	struct efx_tx_buffer *buffer;</div><div class='ctx'> 	int n, end_of_packet, rc;</div><div class='ctx'> </div><div class='del'>-	if (st-&gt;ifc.len == 0)</div><div class='add'>+	if (st-&gt;in_len == 0)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	if (st-&gt;packet_space == 0)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	EFX_BUG_ON_PARANOID(st-&gt;ifc.len &lt;= 0);</div><div class='add'>+	EFX_BUG_ON_PARANOID(st-&gt;in_len &lt;= 0);</div><div class='ctx'> 	EFX_BUG_ON_PARANOID(st-&gt;packet_space &lt;= 0);</div><div class='ctx'> </div><div class='del'>-	n = min(st-&gt;ifc.len, st-&gt;packet_space);</div><div class='add'>+	n = min(st-&gt;in_len, st-&gt;packet_space);</div><div class='ctx'> </div><div class='ctx'> 	st-&gt;packet_space -= n;</div><div class='del'>-	st-&gt;remaining_len -= n;</div><div class='del'>-	st-&gt;ifc.len -= n;</div><div class='del'>-	st-&gt;ifc.page_off += n;</div><div class='del'>-	end_of_packet = st-&gt;remaining_len == 0 || st-&gt;packet_space == 0;</div><div class='del'>-</div><div class='del'>-	rc = efx_tx_queue_insert(tx_queue, st-&gt;ifc.dma_addr, n,</div><div class='del'>-				 st-&gt;remaining_len ? NULL : skb,</div><div class='del'>-				 end_of_packet, st-&gt;ifc.unmap_addr,</div><div class='del'>-				 st-&gt;ifc.len ? 0 : st-&gt;ifc.unmap_len);</div><div class='del'>-</div><div class='del'>-	st-&gt;ifc.dma_addr += n;</div><div class='add'>+	st-&gt;out_len -= n;</div><div class='add'>+	st-&gt;in_len -= n;</div><div class='add'>+</div><div class='add'>+	rc = efx_tx_queue_insert(tx_queue, st-&gt;dma_addr, n, &amp;buffer);</div><div class='add'>+	if (likely(rc == 0)) {</div><div class='add'>+		if (st-&gt;out_len == 0)</div><div class='add'>+			/* Transfer ownership of the skb */</div><div class='add'>+			buffer-&gt;skb = skb;</div><div class='add'>+</div><div class='add'>+		end_of_packet = st-&gt;out_len == 0 || st-&gt;packet_space == 0;</div><div class='add'>+		buffer-&gt;continuation = !end_of_packet;</div><div class='add'>+</div><div class='add'>+		if (st-&gt;in_len == 0) {</div><div class='add'>+			/* Transfer ownership of the pci mapping */</div><div class='add'>+			buffer-&gt;unmap_len = st-&gt;unmap_len;</div><div class='add'>+			buffer-&gt;unmap_single = st-&gt;unmap_single;</div><div class='add'>+			st-&gt;unmap_len = 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	st-&gt;dma_addr += n;</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -929,9 +958,9 @@ static inline int tso_fill_packet_with_fragment(struct efx_tx_queue *tx_queue,</div><div class='ctx'>  * Generate a new header and prepare for the new packet.  Return 0 on</div><div class='ctx'>  * success, or -1 if failed to alloc header.</div><div class='ctx'>  */</div><div class='del'>-static inline int tso_start_new_packet(struct efx_tx_queue *tx_queue,</div><div class='del'>-				       const struct sk_buff *skb,</div><div class='del'>-				       struct tso_state *st)</div><div class='add'>+static int tso_start_new_packet(struct efx_tx_queue *tx_queue,</div><div class='add'>+				const struct sk_buff *skb,</div><div class='add'>+				struct tso_state *st)</div><div class='ctx'> {</div><div class='ctx'> 	struct efx_tso_header *tsoh;</div><div class='ctx'> 	struct iphdr *tsoh_iph;</div><div class='hunk'>@@ -940,7 +969,7 @@ static inline int tso_start_new_packet(struct efx_tx_queue *tx_queue,</div><div class='ctx'> 	u8 *header;</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate a DMA-mapped header buffer. */</div><div class='del'>-	if (likely(TSOH_SIZE(st-&gt;p.header_length) &lt;= TSOH_STD_SIZE)) {</div><div class='add'>+	if (likely(TSOH_SIZE(st-&gt;header_len) &lt;= TSOH_STD_SIZE)) {</div><div class='ctx'> 		if (tx_queue-&gt;tso_headers_free == NULL) {</div><div class='ctx'> 			if (efx_tsoh_block_alloc(tx_queue))</div><div class='ctx'> 				return -1;</div><div class='hunk'>@@ -951,7 +980,7 @@ static inline int tso_start_new_packet(struct efx_tx_queue *tx_queue,</div><div class='ctx'> 		tsoh-&gt;unmap_len = 0;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		tx_queue-&gt;tso_long_headers++;</div><div class='del'>-		tsoh = efx_tsoh_heap_alloc(tx_queue, st-&gt;p.header_length);</div><div class='add'>+		tsoh = efx_tsoh_heap_alloc(tx_queue, st-&gt;header_len);</div><div class='ctx'> 		if (unlikely(!tsoh))</div><div class='ctx'> 			return -1;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -961,33 +990,32 @@ static inline int tso_start_new_packet(struct efx_tx_queue *tx_queue,</div><div class='ctx'> 	tsoh_iph = (struct iphdr *)(header + SKB_IPV4_OFF(skb));</div><div class='ctx'> </div><div class='ctx'> 	/* Copy and update the headers. */</div><div class='del'>-	memcpy(header, skb-&gt;data, st-&gt;p.header_length);</div><div class='add'>+	memcpy(header, skb-&gt;data, st-&gt;header_len);</div><div class='ctx'> </div><div class='ctx'> 	tsoh_th-&gt;seq = htonl(st-&gt;seqnum);</div><div class='ctx'> 	st-&gt;seqnum += skb_shinfo(skb)-&gt;gso_size;</div><div class='del'>-	if (st-&gt;remaining_len &gt; skb_shinfo(skb)-&gt;gso_size) {</div><div class='add'>+	if (st-&gt;out_len &gt; skb_shinfo(skb)-&gt;gso_size) {</div><div class='ctx'> 		/* This packet will not finish the TSO burst. */</div><div class='del'>-		ip_length = st-&gt;p.full_packet_size - ETH_HDR_LEN(skb);</div><div class='add'>+		ip_length = st-&gt;full_packet_size - ETH_HDR_LEN(skb);</div><div class='ctx'> 		tsoh_th-&gt;fin = 0;</div><div class='ctx'> 		tsoh_th-&gt;psh = 0;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* This packet will be the last in the TSO burst. */</div><div class='del'>-		ip_length = (st-&gt;p.header_length - ETH_HDR_LEN(skb)</div><div class='del'>-			     + st-&gt;remaining_len);</div><div class='add'>+		ip_length = st-&gt;header_len - ETH_HDR_LEN(skb) + st-&gt;out_len;</div><div class='ctx'> 		tsoh_th-&gt;fin = tcp_hdr(skb)-&gt;fin;</div><div class='ctx'> 		tsoh_th-&gt;psh = tcp_hdr(skb)-&gt;psh;</div><div class='ctx'> 	}</div><div class='ctx'> 	tsoh_iph-&gt;tot_len = htons(ip_length);</div><div class='ctx'> </div><div class='ctx'> 	/* Linux leaves suitable gaps in the IP ID space for us to fill. */</div><div class='del'>-	tsoh_iph-&gt;id = htons(st-&gt;p.ipv4_id);</div><div class='del'>-	st-&gt;p.ipv4_id++;</div><div class='add'>+	tsoh_iph-&gt;id = htons(st-&gt;ipv4_id);</div><div class='add'>+	st-&gt;ipv4_id++;</div><div class='ctx'> </div><div class='ctx'> 	st-&gt;packet_space = skb_shinfo(skb)-&gt;gso_size;</div><div class='ctx'> 	++tx_queue-&gt;tso_packets;</div><div class='ctx'> </div><div class='ctx'> 	/* Form a descriptor for this header. */</div><div class='del'>-	efx_tso_put_header(tx_queue, tsoh, st-&gt;p.header_length);</div><div class='add'>+	efx_tso_put_header(tx_queue, tsoh, st-&gt;header_len);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1005,11 +1033,11 @@ static inline int tso_start_new_packet(struct efx_tx_queue *tx_queue,</div><div class='ctx'>  * %NETDEV_TX_OK or %NETDEV_TX_BUSY.</div><div class='ctx'>  */</div><div class='ctx'> static int efx_enqueue_skb_tso(struct efx_tx_queue *tx_queue,</div><div class='del'>-			       const struct sk_buff *skb)</div><div class='add'>+			       struct sk_buff *skb)</div><div class='ctx'> {</div><div class='add'>+	struct efx_nic *efx = tx_queue-&gt;efx;</div><div class='ctx'> 	int frag_i, rc, rc2 = NETDEV_TX_OK;</div><div class='ctx'> 	struct tso_state state;</div><div class='del'>-	skb_frag_t *f;</div><div class='ctx'> </div><div class='ctx'> 	/* Verify TSO is safe - these checks should never fail. */</div><div class='ctx'> 	efx_tso_check_safe(skb);</div><div class='hunk'>@@ -1021,29 +1049,16 @@ static int efx_enqueue_skb_tso(struct efx_tx_queue *tx_queue,</div><div class='ctx'> 	/* Assume that skb header area contains exactly the headers, and</div><div class='ctx'> 	 * all payload is in the frag list.</div><div class='ctx'> 	 */</div><div class='del'>-	if (skb_headlen(skb) == state.p.header_length) {</div><div class='add'>+	if (skb_headlen(skb) == state.header_len) {</div><div class='ctx'> 		/* Grab the first payload fragment. */</div><div class='ctx'> 		EFX_BUG_ON_PARANOID(skb_shinfo(skb)-&gt;nr_frags &lt; 1);</div><div class='ctx'> 		frag_i = 0;</div><div class='del'>-		f = &amp;skb_shinfo(skb)-&gt;frags[frag_i];</div><div class='del'>-		rc = tso_get_fragment(&amp;state, tx_queue-&gt;efx,</div><div class='del'>-				      f-&gt;size, f-&gt;page, f-&gt;page_offset);</div><div class='add'>+		rc = tso_get_fragment(&amp;state, efx,</div><div class='add'>+				      skb_shinfo(skb)-&gt;frags + frag_i);</div><div class='ctx'> 		if (rc)</div><div class='ctx'> 			goto mem_err;</div><div class='ctx'> 	} else {</div><div class='del'>-		/* It may look like this code fragment assumes that the</div><div class='del'>-		 * skb-&gt;data portion does not cross a page boundary, but</div><div class='del'>-		 * that is not the case.  It is guaranteed to be direct</div><div class='del'>-		 * mapped memory, and therefore is physically contiguous,</div><div class='del'>-		 * and so DMA will work fine.  kmap_atomic() on this region</div><div class='del'>-		 * will just return the direct mapping, so that will work</div><div class='del'>-		 * too.</div><div class='del'>-		 */</div><div class='del'>-		int page_off = (unsigned long)skb-&gt;data &amp; (PAGE_SIZE - 1);</div><div class='del'>-		int hl = state.p.header_length;</div><div class='del'>-		rc = tso_get_fragment(&amp;state, tx_queue-&gt;efx,</div><div class='del'>-				      skb_headlen(skb) - hl,</div><div class='del'>-				      virt_to_page(skb-&gt;data), page_off + hl);</div><div class='add'>+		rc = tso_get_head_fragment(&amp;state, efx, skb);</div><div class='ctx'> 		if (rc)</div><div class='ctx'> 			goto mem_err;</div><div class='ctx'> 		frag_i = -1;</div><div class='hunk'>@@ -1058,13 +1073,12 @@ static int efx_enqueue_skb_tso(struct efx_tx_queue *tx_queue,</div><div class='ctx'> 			goto stop;</div><div class='ctx'> </div><div class='ctx'> 		/* Move onto the next fragment? */</div><div class='del'>-		if (state.ifc.len == 0) {</div><div class='add'>+		if (state.in_len == 0) {</div><div class='ctx'> 			if (++frag_i &gt;= skb_shinfo(skb)-&gt;nr_frags)</div><div class='ctx'> 				/* End of payload reached. */</div><div class='ctx'> 				break;</div><div class='del'>-			f = &amp;skb_shinfo(skb)-&gt;frags[frag_i];</div><div class='del'>-			rc = tso_get_fragment(&amp;state, tx_queue-&gt;efx,</div><div class='del'>-					      f-&gt;size, f-&gt;page, f-&gt;page_offset);</div><div class='add'>+			rc = tso_get_fragment(&amp;state, efx,</div><div class='add'>+					      skb_shinfo(skb)-&gt;frags + frag_i);</div><div class='ctx'> 			if (rc)</div><div class='ctx'> 				goto mem_err;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1082,8 +1096,7 @@ static int efx_enqueue_skb_tso(struct efx_tx_queue *tx_queue,</div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='ctx'> </div><div class='ctx'>  mem_err:</div><div class='del'>-	EFX_ERR(tx_queue-&gt;efx, "Out of memory for TSO headers, or PCI mapping"</div><div class='del'>-		" error\n");</div><div class='add'>+	EFX_ERR(efx, "Out of memory for TSO headers, or PCI mapping error\n");</div><div class='ctx'> 	dev_kfree_skb_any((struct sk_buff *)skb);</div><div class='ctx'> 	goto unwind;</div><div class='ctx'> </div><div class='hunk'>@@ -1092,9 +1105,19 @@ static int efx_enqueue_skb_tso(struct efx_tx_queue *tx_queue,</div><div class='ctx'> </div><div class='ctx'> 	/* Stop the queue if it wasn't stopped before. */</div><div class='ctx'> 	if (tx_queue-&gt;stopped == 1)</div><div class='del'>-		efx_stop_queue(tx_queue-&gt;efx);</div><div class='add'>+		efx_stop_queue(efx);</div><div class='ctx'> </div><div class='ctx'>  unwind:</div><div class='add'>+	/* Free the DMA mapping we were in the process of writing out */</div><div class='add'>+	if (state.unmap_len) {</div><div class='add'>+		if (state.unmap_single)</div><div class='add'>+			pci_unmap_single(efx-&gt;pci_dev, state.unmap_addr,</div><div class='add'>+					 state.unmap_len, PCI_DMA_TODEVICE);</div><div class='add'>+		else</div><div class='add'>+			pci_unmap_page(efx-&gt;pci_dev, state.unmap_addr,</div><div class='add'>+				       state.unmap_len, PCI_DMA_TODEVICE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	efx_enqueue_unwind(tx_queue);</div><div class='ctx'> 	return rc2;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/sfc/tx.h b/drivers/net/sfc/tx.h<br/>index 1526a73b4b51..5e1cc234e42f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sfc/tx.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/sfc/tx.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sfc/tx.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sfc/tx.h</a></div><div class='hunk'>@@ -15,7 +15,7 @@</div><div class='ctx'> </div><div class='ctx'> int efx_probe_tx_queue(struct efx_tx_queue *tx_queue);</div><div class='ctx'> void efx_remove_tx_queue(struct efx_tx_queue *tx_queue);</div><div class='del'>-int efx_init_tx_queue(struct efx_tx_queue *tx_queue);</div><div class='add'>+void efx_init_tx_queue(struct efx_tx_queue *tx_queue);</div><div class='ctx'> void efx_fini_tx_queue(struct efx_tx_queue *tx_queue);</div><div class='ctx'> </div><div class='ctx'> int efx_hard_start_xmit(struct sk_buff *skb, struct net_device *net_dev);</div><div class='head'>diff --git a/drivers/net/sfc/workarounds.h b/drivers/net/sfc/workarounds.h<br/>index 35ab19c27f8d..fa7b49d69288 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sfc/workarounds.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/sfc/workarounds.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sfc/workarounds.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sfc/workarounds.h</a></div><div class='hunk'>@@ -20,14 +20,10 @@</div><div class='ctx'> </div><div class='ctx'> /* XAUI resets if link not detected */</div><div class='ctx'> #define EFX_WORKAROUND_5147 EFX_WORKAROUND_ALWAYS</div><div class='del'>-/* SNAP frames have TOBE_DISC set */</div><div class='del'>-#define EFX_WORKAROUND_5475 EFX_WORKAROUND_ALWAYS</div><div class='ctx'> /* RX PCIe double split performance issue */</div><div class='ctx'> #define EFX_WORKAROUND_7575 EFX_WORKAROUND_ALWAYS</div><div class='ctx'> /* TX pkt parser problem with &lt;= 16 byte TXes */</div><div class='ctx'> #define EFX_WORKAROUND_9141 EFX_WORKAROUND_ALWAYS</div><div class='del'>-/* XGXS and XAUI reset sequencing in SW */</div><div class='del'>-#define EFX_WORKAROUND_9388 EFX_WORKAROUND_ALWAYS</div><div class='ctx'> /* Low rate CRC errors require XAUI reset */</div><div class='ctx'> #define EFX_WORKAROUND_10750 EFX_WORKAROUND_ALWAYS</div><div class='ctx'> /* TX_EV_PKT_ERR can be caused by a dangling TX descriptor</div><div class='head'>diff --git a/drivers/net/sfc/xfp_phy.c b/drivers/net/sfc/xfp_phy.c<br/>index f3684ad28887..276151df3a70 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sfc/xfp_phy.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/sfc/xfp_phy.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sfc/xfp_phy.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sfc/xfp_phy.c</a></div><div class='hunk'>@@ -40,7 +40,7 @@ void xfp_set_led(struct efx_nic *p, int led, int mode)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct xfp_phy_data {</div><div class='del'>-	int tx_disabled;</div><div class='add'>+	enum efx_phy_mode phy_mode;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define XFP_MAX_RESET_TIME 500</div><div class='hunk'>@@ -93,7 +93,7 @@ static int xfp_phy_init(struct efx_nic *efx)</div><div class='ctx'> 		 " %x)\n", devid, MDIO_ID_OUI(devid), MDIO_ID_MODEL(devid),</div><div class='ctx'> 		 MDIO_ID_REV(devid));</div><div class='ctx'> </div><div class='del'>-	phy_data-&gt;tx_disabled = efx-&gt;tx_disabled;</div><div class='add'>+	phy_data-&gt;phy_mode = efx-&gt;phy_mode;</div><div class='ctx'> </div><div class='ctx'> 	rc = xfp_reset_phy(efx);</div><div class='ctx'> </div><div class='hunk'>@@ -136,13 +136,14 @@ static void xfp_phy_reconfigure(struct efx_nic *efx)</div><div class='ctx'> 	struct xfp_phy_data *phy_data = efx-&gt;phy_data;</div><div class='ctx'> </div><div class='ctx'> 	/* Reset the PHY when moving from tx off to tx on */</div><div class='del'>-	if (phy_data-&gt;tx_disabled &amp;&amp; !efx-&gt;tx_disabled)</div><div class='add'>+	if (!(efx-&gt;phy_mode &amp; PHY_MODE_TX_DISABLED) &amp;&amp;</div><div class='add'>+	    (phy_data-&gt;phy_mode &amp; PHY_MODE_TX_DISABLED))</div><div class='ctx'> 		xfp_reset_phy(efx);</div><div class='ctx'> </div><div class='ctx'> 	mdio_clause45_transmit_disable(efx);</div><div class='ctx'> 	mdio_clause45_phy_reconfigure(efx);</div><div class='ctx'> </div><div class='del'>-	phy_data-&gt;tx_disabled = efx-&gt;tx_disabled;</div><div class='add'>+	phy_data-&gt;phy_mode = efx-&gt;phy_mode;</div><div class='ctx'> 	efx-&gt;link_up = xfp_link_ok(efx);</div><div class='ctx'> 	efx-&gt;link_options = GM_LPA_10000FULL;</div><div class='ctx'> }</div><div class='hunk'>@@ -151,7 +152,7 @@ static void xfp_phy_reconfigure(struct efx_nic *efx)</div><div class='ctx'> static void xfp_phy_fini(struct efx_nic *efx)</div><div class='ctx'> {</div><div class='ctx'> 	/* Clobber the LED if it was blinking */</div><div class='del'>-	efx-&gt;board_info.blink(efx, 0);</div><div class='add'>+	efx-&gt;board_info.blink(efx, false);</div><div class='ctx'> </div><div class='ctx'> 	/* Free the context block */</div><div class='ctx'> 	kfree(efx-&gt;phy_data);</div><div class='hunk'>@@ -164,7 +165,6 @@ struct efx_phy_operations falcon_xfp_phy_ops = {</div><div class='ctx'> 	.check_hw        = xfp_phy_check_hw,</div><div class='ctx'> 	.fini            = xfp_phy_fini,</div><div class='ctx'> 	.clear_interrupt = xfp_phy_clear_interrupt,</div><div class='del'>-	.reset_xaui      = efx_port_dummy_op_void,</div><div class='ctx'> 	.mmds            = XFP_REQUIRED_DEVS,</div><div class='ctx'> 	.loopbacks       = XFP_LOOPBACKS,</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c<br/>index 1c370e6aa641..b39d1cc1ef04 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sh_eth.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/sh_eth.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sh_eth.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sh_eth.c</a></div><div class='hunk'>@@ -1140,7 +1140,7 @@ static int sh_mdio_init(struct net_device *ndev, int id)</div><div class='ctx'> </div><div class='ctx'> 	/* Hook up MII support for ethtool */</div><div class='ctx'> 	mdp-&gt;mii_bus-&gt;name = "sh_mii";</div><div class='del'>-	mdp-&gt;mii_bus-&gt;dev = &amp;ndev-&gt;dev;</div><div class='add'>+	mdp-&gt;mii_bus-&gt;parent = &amp;ndev-&gt;dev;</div><div class='ctx'> 	mdp-&gt;mii_bus-&gt;id[0] = id;</div><div class='ctx'> </div><div class='ctx'> 	/* PHY IRQ */</div><div class='hunk'>@@ -1166,7 +1166,7 @@ out_free_irq:</div><div class='ctx'> 	kfree(mdp-&gt;mii_bus-&gt;irq);</div><div class='ctx'> </div><div class='ctx'> out_free_bus:</div><div class='del'>-	kfree(mdp-&gt;mii_bus);</div><div class='add'>+	free_mdio_bitbang(mdp-&gt;mii_bus);</div><div class='ctx'> </div><div class='ctx'> out_free_bitbang:</div><div class='ctx'> 	kfree(bitbang);</div><div class='head'>diff --git a/drivers/net/skfp/pmf.c b/drivers/net/skfp/pmf.c<br/>index ea85de918233..79e665e0853d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/skfp/pmf.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/skfp/pmf.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/skfp/pmf.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/skfp/pmf.c</a></div><div class='hunk'>@@ -44,17 +44,10 @@ static SMbuf *smt_build_pmf_response(struct s_smc *smc, struct smt_header *req,</div><div class='ctx'> 				     int set, int local);</div><div class='ctx'> static int port_to_mib(struct s_smc *smc, int p);</div><div class='ctx'> </div><div class='del'>-#define MOFFSS(e)	((int)&amp;(((struct fddi_mib *)0)-&gt;e))</div><div class='del'>-#define MOFFSA(e)	((int) (((struct fddi_mib *)0)-&gt;e))</div><div class='del'>-</div><div class='del'>-#define MOFFMS(e)	((int)&amp;(((struct fddi_mib_m *)0)-&gt;e))</div><div class='del'>-#define MOFFMA(e)	((int) (((struct fddi_mib_m *)0)-&gt;e))</div><div class='del'>-</div><div class='del'>-#define MOFFAS(e)	((int)&amp;(((struct fddi_mib_a *)0)-&gt;e))</div><div class='del'>-#define MOFFAA(e)	((int) (((struct fddi_mib_a *)0)-&gt;e))</div><div class='del'>-</div><div class='del'>-#define MOFFPS(e)	((int)&amp;(((struct fddi_mib_p *)0)-&gt;e))</div><div class='del'>-#define MOFFPA(e)	((int) (((struct fddi_mib_p *)0)-&gt;e))</div><div class='add'>+#define MOFFSS(e)	offsetof(struct fddi_mib, e)</div><div class='add'>+#define MOFFMS(e)	offsetof(struct fddi_mib_m, e)</div><div class='add'>+#define MOFFAS(e)	offsetof(struct fddi_mib_a, e)</div><div class='add'>+#define MOFFPS(e)	offsetof(struct fddi_mib_p, e)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #define AC_G	0x01		/* Get */</div><div class='hunk'>@@ -87,8 +80,8 @@ static const struct s_p_tab {</div><div class='ctx'> 	{ SMT_P100D,AC_G,	MOFFSS(fddiSMTOpVersionId),	"S"	} ,</div><div class='ctx'> 	{ SMT_P100E,AC_G,	MOFFSS(fddiSMTHiVersionId),	"S"	} ,</div><div class='ctx'> 	{ SMT_P100F,AC_G,	MOFFSS(fddiSMTLoVersionId),	"S"	} ,</div><div class='del'>-	{ SMT_P1010,AC_G,	MOFFSA(fddiSMTManufacturerData), "D" } ,</div><div class='del'>-	{ SMT_P1011,AC_GR,	MOFFSA(fddiSMTUserData),	"D"	} ,</div><div class='add'>+	{ SMT_P1010,AC_G,	MOFFSS(fddiSMTManufacturerData), "D" } ,</div><div class='add'>+	{ SMT_P1011,AC_GR,	MOFFSS(fddiSMTUserData),	"D"	} ,</div><div class='ctx'> 	{ SMT_P1012,AC_G,	MOFFSS(fddiSMTMIBVersionId),	"S"	} ,</div><div class='ctx'> </div><div class='ctx'> 	/* StationConfigGrp */</div><div class='hunk'>@@ -103,7 +96,7 @@ static const struct s_p_tab {</div><div class='ctx'> 	{ SMT_P101D,AC_GR,	MOFFSS(fddiSMTTT_Notify),	"wS"	} ,</div><div class='ctx'> 	{ SMT_P101E,AC_GR,	MOFFSS(fddiSMTStatRptPolicy),	"bB"	} ,</div><div class='ctx'> 	{ SMT_P101F,AC_GR,	MOFFSS(fddiSMTTrace_MaxExpiration),"lL"	} ,</div><div class='del'>-	{ SMT_P1020,AC_G,	MOFFSA(fddiSMTPORTIndexes),	"II"	} ,</div><div class='add'>+	{ SMT_P1020,AC_G,	MOFFSS(fddiSMTPORTIndexes),	"II"	} ,</div><div class='ctx'> 	{ SMT_P1021,AC_G,	MOFFSS(fddiSMTMACIndexes),	"I"	} ,</div><div class='ctx'> 	{ SMT_P1022,AC_G,	MOFFSS(fddiSMTBypassPresent),	"F"	} ,</div><div class='ctx'> </div><div class='hunk'>@@ -117,8 +110,8 @@ static const struct s_p_tab {</div><div class='ctx'> </div><div class='ctx'> 	/* MIBOperationGrp */</div><div class='ctx'> 	{ SMT_P1032,AC_GROUP	} ,</div><div class='del'>-	{ SMT_P1033,AC_G,	MOFFSA(fddiSMTTimeStamp),"P"		} ,</div><div class='del'>-	{ SMT_P1034,AC_G,	MOFFSA(fddiSMTTransitionTimeStamp),"P"	} ,</div><div class='add'>+	{ SMT_P1033,AC_G,	MOFFSS(fddiSMTTimeStamp),"P"		} ,</div><div class='add'>+	{ SMT_P1034,AC_G,	MOFFSS(fddiSMTTransitionTimeStamp),"P"	} ,</div><div class='ctx'> 	/* NOTE : SMT_P1035 is already swapped ! SMT_P_SETCOUNT */</div><div class='ctx'> 	{ SMT_P1035,AC_G,	MOFFSS(fddiSMTSetCount),"4P"		} ,</div><div class='ctx'> 	{ SMT_P1036,AC_G,	MOFFSS(fddiSMTLastSetStationId),"8"	} ,</div><div class='hunk'>@@ -129,7 +122,7 @@ static const struct s_p_tab {</div><div class='ctx'> 	 * PRIVATE EXTENSIONS</div><div class='ctx'> 	 * only accessible locally to get/set passwd</div><div class='ctx'> 	 */</div><div class='del'>-	{ SMT_P10F0,AC_GR,	MOFFSA(fddiPRPMFPasswd),	"8"	} ,</div><div class='add'>+	{ SMT_P10F0,AC_GR,	MOFFSS(fddiPRPMFPasswd),	"8"	} ,</div><div class='ctx'> 	{ SMT_P10F1,AC_GR,	MOFFSS(fddiPRPMFStation),	"8"	} ,</div><div class='ctx'> #ifdef	ESS</div><div class='ctx'> 	{ SMT_P10F2,AC_GR,	MOFFSS(fddiESSPayload),		"lL"	} ,</div><div class='hunk'>@@ -245,7 +238,7 @@ static const struct s_p_tab {</div><div class='ctx'> 	{ SMT_P400E,AC_GR,	MOFFPS(fddiPORTConnectionPolicies),"bB"	} ,</div><div class='ctx'> 	{ SMT_P400F,AC_G,	MOFFPS(fddiPORTMacIndicated),	"2"	} ,</div><div class='ctx'> 	{ SMT_P4010,AC_G,	MOFFPS(fddiPORTCurrentPath),	"E"	} ,</div><div class='del'>-	{ SMT_P4011,AC_GR,	MOFFPA(fddiPORTRequestedPaths),	"l4"	} ,</div><div class='add'>+	{ SMT_P4011,AC_GR,	MOFFPS(fddiPORTRequestedPaths),	"l4"	} ,</div><div class='ctx'> 	{ SMT_P4012,AC_G,	MOFFPS(fddiPORTMACPlacement),	"S"	} ,</div><div class='ctx'> 	{ SMT_P4013,AC_G,	MOFFPS(fddiPORTAvailablePaths),	"B"	} ,</div><div class='ctx'> 	{ SMT_P4016,AC_G,	MOFFPS(fddiPORTPMDClass),	"E"	} ,</div><div class='head'>diff --git a/drivers/net/skge.c b/drivers/net/skge.c<br/>index 2e26dced13a1..43f4c730be42 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/skge.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/skge.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/skge.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/skge.c</a></div><div class='hunk'>@@ -319,6 +319,7 @@ static int skge_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd)</div><div class='ctx'> 	struct skge_port *skge = netdev_priv(dev);</div><div class='ctx'> 	const struct skge_hw *hw = skge-&gt;hw;</div><div class='ctx'> 	u32 supported = skge_supported_modes(hw);</div><div class='add'>+	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (ecmd-&gt;autoneg == AUTONEG_ENABLE) {</div><div class='ctx'> 		ecmd-&gt;advertising = supported;</div><div class='hunk'>@@ -367,8 +368,14 @@ static int skge_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd)</div><div class='ctx'> 	skge-&gt;autoneg = ecmd-&gt;autoneg;</div><div class='ctx'> 	skge-&gt;advertising = ecmd-&gt;advertising;</div><div class='ctx'> </div><div class='del'>-	if (netif_running(dev))</div><div class='del'>-		skge_phy_reset(skge);</div><div class='add'>+	if (netif_running(dev)) {</div><div class='add'>+		skge_down(dev);</div><div class='add'>+		err = skge_up(dev);</div><div class='add'>+		if (err) {</div><div class='add'>+			dev_close(dev);</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return (0);</div><div class='ctx'> }</div><div class='hunk'>@@ -494,7 +501,7 @@ static int skge_set_ring_param(struct net_device *dev,</div><div class='ctx'> 			       struct ethtool_ringparam *p)</div><div class='ctx'> {</div><div class='ctx'> 	struct skge_port *skge = netdev_priv(dev);</div><div class='del'>-	int err;</div><div class='add'>+	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (p-&gt;rx_pending == 0 || p-&gt;rx_pending &gt; MAX_RX_RING_SIZE ||</div><div class='ctx'> 	    p-&gt;tx_pending &lt; TX_LOW_WATER || p-&gt;tx_pending &gt; MAX_TX_RING_SIZE)</div><div class='hunk'>@@ -510,7 +517,7 @@ static int skge_set_ring_param(struct net_device *dev,</div><div class='ctx'> 			dev_close(dev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u32 skge_get_msglevel(struct net_device *netdev)</div><div class='hunk'>@@ -593,6 +600,7 @@ static int skge_set_pauseparam(struct net_device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct skge_port *skge = netdev_priv(dev);</div><div class='ctx'> 	struct ethtool_pauseparam old;</div><div class='add'>+	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	skge_get_pauseparam(dev, &amp;old);</div><div class='ctx'> </div><div class='hunk'>@@ -609,8 +617,14 @@ static int skge_set_pauseparam(struct net_device *dev,</div><div class='ctx'> 			skge-&gt;flow_control = FLOW_MODE_NONE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (netif_running(dev))</div><div class='del'>-		skge_phy_reset(skge);</div><div class='add'>+	if (netif_running(dev)) {</div><div class='add'>+		skge_down(dev);</div><div class='add'>+		err = skge_up(dev);</div><div class='add'>+		if (err) {</div><div class='add'>+			dev_close(dev);</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c<br/>index e24b25ca1c69..3813d15e2df7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sky2.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/sky2.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sky2.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sky2.c</a></div><div class='hunk'>@@ -3034,7 +3034,8 @@ static int sky2_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)</div><div class='ctx'> 	struct sky2_port *sky2 = netdev_priv(dev);</div><div class='ctx'> 	struct sky2_hw *hw = sky2-&gt;hw;</div><div class='ctx'> </div><div class='del'>-	if (wol-&gt;wolopts &amp; ~sky2_wol_supported(sky2-&gt;hw))</div><div class='add'>+	if ((wol-&gt;wolopts &amp; ~sky2_wol_supported(sky2-&gt;hw))</div><div class='add'>+	    || !device_can_wakeup(&amp;hw-&gt;pdev-&gt;dev))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 	sky2-&gt;wol = wol-&gt;wolopts;</div><div class='hunk'>@@ -3045,6 +3046,8 @@ static int sky2_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)</div><div class='ctx'> 		sky2_write32(hw, B0_CTST, sky2-&gt;wol</div><div class='ctx'> 			     ? Y2_HW_WOL_ON : Y2_HW_WOL_OFF);</div><div class='ctx'> </div><div class='add'>+	device_set_wakeup_enable(&amp;hw-&gt;pdev-&gt;dev, sky2-&gt;wol);</div><div class='add'>+</div><div class='ctx'> 	if (!netif_running(dev))</div><div class='ctx'> 		sky2_wol_init(sky2);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -3732,27 +3735,63 @@ static int sky2_get_eeprom_len(struct net_device *dev)</div><div class='ctx'> 	return 1 &lt;&lt; ( ((reg2 &amp; PCI_VPD_ROM_SZ) &gt;&gt; 14) + 8);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 sky2_vpd_read(struct sky2_hw *hw, int cap, u16 offset)</div><div class='add'>+static int sky2_vpd_wait(const struct sky2_hw *hw, int cap, u16 busy)</div><div class='ctx'> {</div><div class='del'>-	u32 val;</div><div class='add'>+	unsigned long start = jiffies;</div><div class='ctx'> </div><div class='del'>-	sky2_pci_write16(hw, cap + PCI_VPD_ADDR, offset);</div><div class='add'>+	while ( (sky2_pci_read16(hw, cap + PCI_VPD_ADDR) &amp; PCI_VPD_ADDR_F) == busy) {</div><div class='add'>+		/* Can take up to 10.6 ms for write */</div><div class='add'>+		if (time_after(jiffies, start + HZ/4)) {</div><div class='add'>+			dev_err(&amp;hw-&gt;pdev-&gt;dev, PFX "VPD cycle timed out");</div><div class='add'>+			return -ETIMEDOUT;</div><div class='add'>+		}</div><div class='add'>+		mdelay(1);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	do {</div><div class='del'>-		offset = sky2_pci_read16(hw, cap + PCI_VPD_ADDR);</div><div class='del'>-	} while (!(offset &amp; PCI_VPD_ADDR_F));</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sky2_vpd_read(struct sky2_hw *hw, int cap, void *data,</div><div class='add'>+			 u16 offset, size_t length)</div><div class='add'>+{</div><div class='add'>+	int rc = 0;</div><div class='add'>+</div><div class='add'>+	while (length &gt; 0) {</div><div class='add'>+		u32 val;</div><div class='add'>+</div><div class='add'>+		sky2_pci_write16(hw, cap + PCI_VPD_ADDR, offset);</div><div class='add'>+		rc = sky2_vpd_wait(hw, cap, 0);</div><div class='add'>+		if (rc)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		val = sky2_pci_read32(hw, cap + PCI_VPD_DATA);</div><div class='add'>+</div><div class='add'>+		memcpy(data, &amp;val, min(sizeof(val), length));</div><div class='add'>+		offset += sizeof(u32);</div><div class='add'>+		data += sizeof(u32);</div><div class='add'>+		length -= sizeof(u32);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	val = sky2_pci_read32(hw, cap + PCI_VPD_DATA);</div><div class='del'>-	return val;</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void sky2_vpd_write(struct sky2_hw *hw, int cap, u16 offset, u32 val)</div><div class='add'>+static int sky2_vpd_write(struct sky2_hw *hw, int cap, const void *data,</div><div class='add'>+			  u16 offset, unsigned int length)</div><div class='ctx'> {</div><div class='del'>-	sky2_pci_write16(hw, cap + PCI_VPD_DATA, val);</div><div class='del'>-	sky2_pci_write32(hw, cap + PCI_VPD_ADDR, offset | PCI_VPD_ADDR_F);</div><div class='del'>-	do {</div><div class='del'>-		offset = sky2_pci_read16(hw, cap + PCI_VPD_ADDR);</div><div class='del'>-	} while (offset &amp; PCI_VPD_ADDR_F);</div><div class='add'>+	unsigned int i;</div><div class='add'>+	int rc = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; length; i += sizeof(u32)) {</div><div class='add'>+		u32 val = *(u32 *)(data + i);</div><div class='add'>+</div><div class='add'>+		sky2_pci_write32(hw, cap + PCI_VPD_DATA, val);</div><div class='add'>+		sky2_pci_write32(hw, cap + PCI_VPD_ADDR, offset | PCI_VPD_ADDR_F);</div><div class='add'>+</div><div class='add'>+		rc = sky2_vpd_wait(hw, cap, PCI_VPD_ADDR_F);</div><div class='add'>+		if (rc)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int sky2_get_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,</div><div class='hunk'>@@ -3760,24 +3799,13 @@ static int sky2_get_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom</div><div class='ctx'> {</div><div class='ctx'> 	struct sky2_port *sky2 = netdev_priv(dev);</div><div class='ctx'> 	int cap = pci_find_capability(sky2-&gt;hw-&gt;pdev, PCI_CAP_ID_VPD);</div><div class='del'>-	int length = eeprom-&gt;len;</div><div class='del'>-	u16 offset = eeprom-&gt;offset;</div><div class='ctx'> </div><div class='ctx'> 	if (!cap)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	eeprom-&gt;magic = SKY2_EEPROM_MAGIC;</div><div class='ctx'> </div><div class='del'>-	while (length &gt; 0) {</div><div class='del'>-		u32 val = sky2_vpd_read(sky2-&gt;hw, cap, offset);</div><div class='del'>-		int n = min_t(int, length, sizeof(val));</div><div class='del'>-</div><div class='del'>-		memcpy(data, &amp;val, n);</div><div class='del'>-		length -= n;</div><div class='del'>-		data += n;</div><div class='del'>-		offset += n;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='add'>+	return sky2_vpd_read(sky2-&gt;hw, cap, data, eeprom-&gt;offset, eeprom-&gt;len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int sky2_set_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,</div><div class='hunk'>@@ -3785,8 +3813,6 @@ static int sky2_set_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom</div><div class='ctx'> {</div><div class='ctx'> 	struct sky2_port *sky2 = netdev_priv(dev);</div><div class='ctx'> 	int cap = pci_find_capability(sky2-&gt;hw-&gt;pdev, PCI_CAP_ID_VPD);</div><div class='del'>-	int length = eeprom-&gt;len;</div><div class='del'>-	u16 offset = eeprom-&gt;offset;</div><div class='ctx'> </div><div class='ctx'> 	if (!cap)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -3794,21 +3820,11 @@ static int sky2_set_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom</div><div class='ctx'> 	if (eeprom-&gt;magic != SKY2_EEPROM_MAGIC)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	while (length &gt; 0) {</div><div class='del'>-		u32 val;</div><div class='del'>-		int n = min_t(int, length, sizeof(val));</div><div class='del'>-</div><div class='del'>-		if (n &lt; sizeof(val))</div><div class='del'>-			val = sky2_vpd_read(sky2-&gt;hw, cap, offset);</div><div class='del'>-		memcpy(&amp;val, data, n);</div><div class='del'>-</div><div class='del'>-		sky2_vpd_write(sky2-&gt;hw, cap, offset, val);</div><div class='add'>+	/* Partial writes not supported */</div><div class='add'>+	if ((eeprom-&gt;offset &amp; 3) || (eeprom-&gt;len &amp; 3))</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-		length -= n;</div><div class='del'>-		data += n;</div><div class='del'>-		offset += n;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='add'>+	return sky2_vpd_write(sky2-&gt;hw, cap, data, eeprom-&gt;offset, eeprom-&gt;len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -4166,16 +4182,67 @@ static int __devinit sky2_test_msi(struct sky2_hw *hw)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit pci_wake_enabled(struct pci_dev *dev)</div><div class='add'>+/*</div><div class='add'>+ * Read and parse the first part of Vital Product Data</div><div class='add'>+ */</div><div class='add'>+#define VPD_SIZE	128</div><div class='add'>+#define VPD_MAGIC	0x82</div><div class='add'>+</div><div class='add'>+static void __devinit sky2_vpd_info(struct sky2_hw *hw)</div><div class='ctx'> {</div><div class='del'>-	int pm  = pci_find_capability(dev, PCI_CAP_ID_PM);</div><div class='del'>-	u16 value;</div><div class='add'>+	int cap = pci_find_capability(hw-&gt;pdev, PCI_CAP_ID_VPD);</div><div class='add'>+	const u8 *p;</div><div class='add'>+	u8 *vpd_buf = NULL;</div><div class='add'>+	u16 len;</div><div class='add'>+	static struct vpd_tag {</div><div class='add'>+		char tag[2];</div><div class='add'>+		char *label;</div><div class='add'>+	} vpd_tags[] = {</div><div class='add'>+		{ "PN",	"Part Number" },</div><div class='add'>+		{ "EC", "Engineering Level" },</div><div class='add'>+		{ "MN", "Manufacturer" },</div><div class='add'>+	};</div><div class='ctx'> </div><div class='del'>-	if (!pm)</div><div class='del'>-		return 0;</div><div class='del'>-	if (pci_read_config_word(dev, pm + PCI_PM_CTRL, &amp;value))</div><div class='del'>-		return 0;</div><div class='del'>-	return value &amp; PCI_PM_CTRL_PME_ENABLE;</div><div class='add'>+	if (!cap)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	vpd_buf = kmalloc(VPD_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!vpd_buf)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (sky2_vpd_read(hw, cap, vpd_buf, 0, VPD_SIZE))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (vpd_buf[0] != VPD_MAGIC)</div><div class='add'>+		goto out;</div><div class='add'>+	len = vpd_buf[1];</div><div class='add'>+	if (len == 0 || len &gt; VPD_SIZE - 4)</div><div class='add'>+		goto out;</div><div class='add'>+	p = vpd_buf + 3;</div><div class='add'>+	dev_info(&amp;hw-&gt;pdev-&gt;dev, "%.*s\n", len, p);</div><div class='add'>+	p += len;</div><div class='add'>+</div><div class='add'>+	while (p &lt; vpd_buf + VPD_SIZE - 4) {</div><div class='add'>+		int i;</div><div class='add'>+</div><div class='add'>+		if (!memcmp("RW", p, 2))	/* end marker */</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		len = p[2];</div><div class='add'>+		if (len &gt; (p - vpd_buf) - 4)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; ARRAY_SIZE(vpd_tags); i++) {</div><div class='add'>+			if (!memcmp(vpd_tags[i].tag, p, 2)) {</div><div class='add'>+				printk(KERN_DEBUG " %s: %.*s\n",</div><div class='add'>+				       vpd_tags[i].label, len, p + 3);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		p += len + 3;</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	kfree(vpd_buf);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* This driver supports yukon2 chipset only */</div><div class='hunk'>@@ -4238,7 +4305,7 @@ static int __devinit sky2_probe(struct pci_dev *pdev,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	wol_default = pci_wake_enabled(pdev) ? WAKE_MAGIC : 0;</div><div class='add'>+	wol_default = device_may_wakeup(&amp;pdev-&gt;dev) ? WAKE_MAGIC : 0;</div><div class='ctx'> </div><div class='ctx'> 	err = -ENOMEM;</div><div class='ctx'> 	hw = kzalloc(sizeof(*hw), GFP_KERNEL);</div><div class='hunk'>@@ -4276,13 +4343,13 @@ static int __devinit sky2_probe(struct pci_dev *pdev,</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err_out_iounmap;</div><div class='ctx'> </div><div class='del'>-	dev_info(&amp;pdev-&gt;dev, "v%s addr 0x%llx irq %d Yukon-2 %s rev %d\n",</div><div class='del'>-		 DRV_VERSION, (unsigned long long)pci_resource_start(pdev, 0),</div><div class='del'>-		 pdev-&gt;irq, sky2_name(hw-&gt;chip_id, buf1, sizeof(buf1)),</div><div class='del'>-		 hw-&gt;chip_rev);</div><div class='add'>+	dev_info(&amp;pdev-&gt;dev, "Yukon-2 %s chip revision %d\n",</div><div class='add'>+		 sky2_name(hw-&gt;chip_id, buf1, sizeof(buf1)), hw-&gt;chip_rev);</div><div class='ctx'> </div><div class='ctx'> 	sky2_reset(hw);</div><div class='ctx'> </div><div class='add'>+	sky2_vpd_info(hw);</div><div class='add'>+</div><div class='ctx'> 	dev = sky2_init_netdev(hw, 0, using_dac, wol_default);</div><div class='ctx'> 	if (!dev) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='hunk'>@@ -4533,6 +4600,8 @@ static struct pci_driver sky2_driver = {</div><div class='ctx'> </div><div class='ctx'> static int __init sky2_init_module(void)</div><div class='ctx'> {</div><div class='add'>+	pr_info(PFX "driver version " DRV_VERSION "\n");</div><div class='add'>+</div><div class='ctx'> 	sky2_debug_init();</div><div class='ctx'> 	return pci_register_driver(&amp;sky2_driver);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c<br/>index c5871624f972..8aa7460ef0e3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/smc911x.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/smc911x.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/smc911x.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/smc911x.c</a></div><div class='hunk'>@@ -183,7 +183,7 @@ static void smc911x_reset(struct net_device *dev)</div><div class='ctx'> 	unsigned int reg, timeout=0, resets=1;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	DBG(SMC_DEBUG_FUNC, "%s: --&gt; %s\n", dev-&gt;name, __FUNCTION__);</div><div class='add'>+	DBG(SMC_DEBUG_FUNC, "%s: --&gt; %s\n", dev-&gt;name, __func__);</div><div class='ctx'> </div><div class='ctx'> 	/*	 Take out of PM setting first */</div><div class='ctx'> 	if ((SMC_GET_PMT_CTRL(lp) &amp; PMT_CTRL_READY_) == 0) {</div><div class='hunk'>@@ -272,7 +272,7 @@ static void smc911x_enable(struct net_device *dev)</div><div class='ctx'> 	unsigned mask, cfg, cr;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	DBG(SMC_DEBUG_FUNC, "%s: --&gt; %s\n", dev-&gt;name, __FUNCTION__);</div><div class='add'>+	DBG(SMC_DEBUG_FUNC, "%s: --&gt; %s\n", dev-&gt;name, __func__);</div><div class='ctx'> </div><div class='ctx'> 	SMC_SET_MAC_ADDR(lp, dev-&gt;dev_addr);</div><div class='ctx'> </div><div class='hunk'>@@ -329,7 +329,7 @@ static void smc911x_shutdown(struct net_device *dev)</div><div class='ctx'> 	unsigned cr;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	DBG(SMC_DEBUG_FUNC, "%s: --&gt; %s\n", CARDNAME, __FUNCTION__);</div><div class='add'>+	DBG(SMC_DEBUG_FUNC, "%s: --&gt; %s\n", CARDNAME, __func__);</div><div class='ctx'> </div><div class='ctx'> 	/* Disable IRQ's */</div><div class='ctx'> 	SMC_SET_INT_EN(lp, 0);</div><div class='hunk'>@@ -348,7 +348,7 @@ static inline void smc911x_drop_pkt(struct net_device *dev)</div><div class='ctx'> 	struct smc911x_local *lp = netdev_priv(dev);</div><div class='ctx'> 	unsigned int fifo_count, timeout, reg;</div><div class='ctx'> </div><div class='del'>-	DBG(SMC_DEBUG_FUNC | SMC_DEBUG_RX, "%s: --&gt; %s\n", CARDNAME, __FUNCTION__);</div><div class='add'>+	DBG(SMC_DEBUG_FUNC | SMC_DEBUG_RX, "%s: --&gt; %s\n", CARDNAME, __func__);</div><div class='ctx'> 	fifo_count = SMC_GET_RX_FIFO_INF(lp) &amp; 0xFFFF;</div><div class='ctx'> 	if (fifo_count &lt;= 4) {</div><div class='ctx'> 		/* Manually dump the packet data */</div><div class='hunk'>@@ -382,7 +382,7 @@ static inline void	 smc911x_rcv(struct net_device *dev)</div><div class='ctx'> 	unsigned char *data;</div><div class='ctx'> </div><div class='ctx'> 	DBG(SMC_DEBUG_FUNC | SMC_DEBUG_RX, "%s: --&gt; %s\n",</div><div class='del'>-		dev-&gt;name, __FUNCTION__);</div><div class='add'>+		dev-&gt;name, __func__);</div><div class='ctx'> 	status = SMC_GET_RX_STS_FIFO(lp);</div><div class='ctx'> 	DBG(SMC_DEBUG_RX, "%s: Rx pkt len %d status 0x%08x \n",</div><div class='ctx'> 		dev-&gt;name, (status &amp; 0x3fff0000) &gt;&gt; 16, status &amp; 0xc000ffff);</div><div class='hunk'>@@ -460,7 +460,7 @@ static void smc911x_hardware_send_pkt(struct net_device *dev)</div><div class='ctx'> 	unsigned char *buf;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	DBG(SMC_DEBUG_FUNC | SMC_DEBUG_TX, "%s: --&gt; %s\n", dev-&gt;name, __FUNCTION__);</div><div class='add'>+	DBG(SMC_DEBUG_FUNC | SMC_DEBUG_TX, "%s: --&gt; %s\n", dev-&gt;name, __func__);</div><div class='ctx'> 	BUG_ON(lp-&gt;pending_tx_skb == NULL);</div><div class='ctx'> </div><div class='ctx'> 	skb = lp-&gt;pending_tx_skb;</div><div class='hunk'>@@ -524,7 +524,7 @@ static int smc911x_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	DBG(SMC_DEBUG_FUNC | SMC_DEBUG_TX, "%s: --&gt; %s\n",</div><div class='del'>-		dev-&gt;name, __FUNCTION__);</div><div class='add'>+		dev-&gt;name, __func__);</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(lp-&gt;pending_tx_skb != NULL);</div><div class='ctx'> </div><div class='hunk'>@@ -596,7 +596,7 @@ static void smc911x_tx(struct net_device *dev)</div><div class='ctx'> 	unsigned int tx_status;</div><div class='ctx'> </div><div class='ctx'> 	DBG(SMC_DEBUG_FUNC | SMC_DEBUG_TX, "%s: --&gt; %s\n",</div><div class='del'>-		dev-&gt;name, __FUNCTION__);</div><div class='add'>+		dev-&gt;name, __func__);</div><div class='ctx'> </div><div class='ctx'> 	/* Collect the TX status */</div><div class='ctx'> 	while (((SMC_GET_TX_FIFO_INF(lp) &amp; TX_FIFO_INF_TSUSED_) &gt;&gt; 16) != 0) {</div><div class='hunk'>@@ -647,7 +647,7 @@ static int smc911x_phy_read(struct net_device *dev, int phyaddr, int phyreg)</div><div class='ctx'> 	SMC_GET_MII(lp, phyreg, phyaddr, phydata);</div><div class='ctx'> </div><div class='ctx'> 	DBG(SMC_DEBUG_MISC, "%s: phyaddr=0x%x, phyreg=0x%02x, phydata=0x%04x\n",</div><div class='del'>-		__FUNCTION__, phyaddr, phyreg, phydata);</div><div class='add'>+		__func__, phyaddr, phyreg, phydata);</div><div class='ctx'> 	return phydata;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -661,7 +661,7 @@ static void smc911x_phy_write(struct net_device *dev, int phyaddr, int phyreg,</div><div class='ctx'> 	struct smc911x_local *lp = netdev_priv(dev);</div><div class='ctx'> </div><div class='ctx'> 	DBG(SMC_DEBUG_MISC, "%s: phyaddr=0x%x, phyreg=0x%x, phydata=0x%x\n",</div><div class='del'>-		__FUNCTION__, phyaddr, phyreg, phydata);</div><div class='add'>+		__func__, phyaddr, phyreg, phydata);</div><div class='ctx'> </div><div class='ctx'> 	SMC_SET_MII(lp, phyreg, phyaddr, phydata);</div><div class='ctx'> }</div><div class='hunk'>@@ -676,7 +676,7 @@ static void smc911x_phy_detect(struct net_device *dev)</div><div class='ctx'> 	int phyaddr;</div><div class='ctx'> 	unsigned int cfg, id1, id2;</div><div class='ctx'> </div><div class='del'>-	DBG(SMC_DEBUG_FUNC, "%s: --&gt; %s\n", dev-&gt;name, __FUNCTION__);</div><div class='add'>+	DBG(SMC_DEBUG_FUNC, "%s: --&gt; %s\n", dev-&gt;name, __func__);</div><div class='ctx'> </div><div class='ctx'> 	lp-&gt;phy_type = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -685,8 +685,10 @@ static void smc911x_phy_detect(struct net_device *dev)</div><div class='ctx'> 	 * PHY#1 to PHY#31, and then PHY#0 last.</div><div class='ctx'> 	 */</div><div class='ctx'> 	switch(lp-&gt;version) {</div><div class='del'>-		case 0x115:</div><div class='del'>-		case 0x117:</div><div class='add'>+		case CHIP_9115:</div><div class='add'>+		case CHIP_9117:</div><div class='add'>+		case CHIP_9215:</div><div class='add'>+		case CHIP_9217:</div><div class='ctx'> 			cfg = SMC_GET_HW_CFG(lp);</div><div class='ctx'> 			if (cfg &amp; HW_CFG_EXT_PHY_DET_) {</div><div class='ctx'> 				cfg &amp;= ~HW_CFG_PHY_CLK_SEL_;</div><div class='hunk'>@@ -722,6 +724,9 @@ static void smc911x_phy_detect(struct net_device *dev)</div><div class='ctx'> 						break;</div><div class='ctx'> 					}</div><div class='ctx'> 				}</div><div class='add'>+				if (phyaddr &lt; 32)</div><div class='add'>+					/* Found an external PHY */</div><div class='add'>+					break;</div><div class='ctx'> 			}</div><div class='ctx'> 		default:</div><div class='ctx'> 			/* Internal media only */</div><div class='hunk'>@@ -746,7 +751,7 @@ static int smc911x_phy_fixed(struct net_device *dev)</div><div class='ctx'> 	int phyaddr = lp-&gt;mii.phy_id;</div><div class='ctx'> 	int bmcr;</div><div class='ctx'> </div><div class='del'>-	DBG(SMC_DEBUG_FUNC, "%s: --&gt; %s\n", dev-&gt;name, __FUNCTION__);</div><div class='add'>+	DBG(SMC_DEBUG_FUNC, "%s: --&gt; %s\n", dev-&gt;name, __func__);</div><div class='ctx'> </div><div class='ctx'> 	/* Enter Link Disable state */</div><div class='ctx'> 	SMC_GET_PHY_BMCR(lp, phyaddr, bmcr);</div><div class='hunk'>@@ -793,7 +798,7 @@ static int smc911x_phy_reset(struct net_device *dev, int phy)</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	unsigned int reg;</div><div class='ctx'> </div><div class='del'>-	DBG(SMC_DEBUG_FUNC, "%s: --&gt; %s()\n", dev-&gt;name, __FUNCTION__);</div><div class='add'>+	DBG(SMC_DEBUG_FUNC, "%s: --&gt; %s()\n", dev-&gt;name, __func__);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;lp-&gt;lock, flags);</div><div class='ctx'> 	reg = SMC_GET_PMT_CTRL(lp);</div><div class='hunk'>@@ -852,7 +857,7 @@ static void smc911x_phy_check_media(struct net_device *dev, int init)</div><div class='ctx'> 	int phyaddr = lp-&gt;mii.phy_id;</div><div class='ctx'> 	unsigned int bmcr, cr;</div><div class='ctx'> </div><div class='del'>-	DBG(SMC_DEBUG_FUNC, "%s: --&gt; %s\n", dev-&gt;name, __FUNCTION__);</div><div class='add'>+	DBG(SMC_DEBUG_FUNC, "%s: --&gt; %s\n", dev-&gt;name, __func__);</div><div class='ctx'> </div><div class='ctx'> 	if (mii_check_media(&amp;lp-&gt;mii, netif_msg_link(lp), init)) {</div><div class='ctx'> 		/* duplex state has changed */</div><div class='hunk'>@@ -892,7 +897,7 @@ static void smc911x_phy_configure(struct work_struct *work)</div><div class='ctx'> 	int status;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	DBG(SMC_DEBUG_FUNC, "%s: --&gt; %s()\n", dev-&gt;name, __FUNCTION__);</div><div class='add'>+	DBG(SMC_DEBUG_FUNC, "%s: --&gt; %s()\n", dev-&gt;name, __func__);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We should not be called if phy_type is zero.</div><div class='hunk'>@@ -985,7 +990,7 @@ static void smc911x_phy_interrupt(struct net_device *dev)</div><div class='ctx'> 	int phyaddr = lp-&gt;mii.phy_id;</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='del'>-	DBG(SMC_DEBUG_FUNC, "%s: --&gt; %s\n", dev-&gt;name, __FUNCTION__);</div><div class='add'>+	DBG(SMC_DEBUG_FUNC, "%s: --&gt; %s\n", dev-&gt;name, __func__);</div><div class='ctx'> </div><div class='ctx'> 	if (lp-&gt;phy_type == 0)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -1013,7 +1018,7 @@ static irqreturn_t smc911x_interrupt(int irq, void *dev_id)</div><div class='ctx'> 	unsigned int rx_overrun=0, cr, pkts;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	DBG(SMC_DEBUG_FUNC, "%s: --&gt; %s\n", dev-&gt;name, __FUNCTION__);</div><div class='add'>+	DBG(SMC_DEBUG_FUNC, "%s: --&gt; %s\n", dev-&gt;name, __func__);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;lp-&gt;lock, flags);</div><div class='ctx'> </div><div class='hunk'>@@ -1174,8 +1179,6 @@ static irqreturn_t smc911x_interrupt(int irq, void *dev_id)</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;lp-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-	DBG(3, "%s: Interrupt done (%d loops)\n", dev-&gt;name, 8-timeout);</div><div class='del'>-</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1188,7 +1191,7 @@ smc911x_tx_dma_irq(int dma, void *data)</div><div class='ctx'> 	struct sk_buff *skb = lp-&gt;current_tx_skb;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	DBG(SMC_DEBUG_FUNC, "%s: --&gt; %s\n", dev-&gt;name, __FUNCTION__);</div><div class='add'>+	DBG(SMC_DEBUG_FUNC, "%s: --&gt; %s\n", dev-&gt;name, __func__);</div><div class='ctx'> </div><div class='ctx'> 	DBG(SMC_DEBUG_TX | SMC_DEBUG_DMA, "%s: TX DMA irq handler\n", dev-&gt;name);</div><div class='ctx'> 	/* Clear the DMA interrupt sources */</div><div class='hunk'>@@ -1224,7 +1227,7 @@ smc911x_rx_dma_irq(int dma, void *data)</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	unsigned int pkts;</div><div class='ctx'> </div><div class='del'>-	DBG(SMC_DEBUG_FUNC, "%s: --&gt; %s\n", dev-&gt;name, __FUNCTION__);</div><div class='add'>+	DBG(SMC_DEBUG_FUNC, "%s: --&gt; %s\n", dev-&gt;name, __func__);</div><div class='ctx'> 	DBG(SMC_DEBUG_RX | SMC_DEBUG_DMA, "%s: RX DMA irq handler\n", dev-&gt;name);</div><div class='ctx'> 	/* Clear the DMA interrupt sources */</div><div class='ctx'> 	SMC_DMA_ACK_IRQ(dev, dma);</div><div class='hunk'>@@ -1272,7 +1275,7 @@ static void smc911x_timeout(struct net_device *dev)</div><div class='ctx'> 	int status, mask;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	DBG(SMC_DEBUG_FUNC, "%s: --&gt; %s\n", dev-&gt;name, __FUNCTION__);</div><div class='add'>+	DBG(SMC_DEBUG_FUNC, "%s: --&gt; %s\n", dev-&gt;name, __func__);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;lp-&gt;lock, flags);</div><div class='ctx'> 	status = SMC_GET_INT(lp);</div><div class='hunk'>@@ -1310,7 +1313,7 @@ static void smc911x_set_multicast_list(struct net_device *dev)</div><div class='ctx'> 	unsigned int mcr, update_multicast = 0;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	DBG(SMC_DEBUG_FUNC, "%s: --&gt; %s\n", dev-&gt;name, __FUNCTION__);</div><div class='add'>+	DBG(SMC_DEBUG_FUNC, "%s: --&gt; %s\n", dev-&gt;name, __func__);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;lp-&gt;lock, flags);</div><div class='ctx'> 	SMC_GET_MAC_CR(lp, mcr);</div><div class='hunk'>@@ -1412,7 +1415,7 @@ smc911x_open(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct smc911x_local *lp = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	DBG(SMC_DEBUG_FUNC, "%s: --&gt; %s\n", dev-&gt;name, __FUNCTION__);</div><div class='add'>+	DBG(SMC_DEBUG_FUNC, "%s: --&gt; %s\n", dev-&gt;name, __func__);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Check that the address is valid.  If its not, refuse</div><div class='hunk'>@@ -1420,7 +1423,7 @@ smc911x_open(struct net_device *dev)</div><div class='ctx'> 	 * address using ifconfig eth0 hw ether xx:xx:xx:xx:xx:xx</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!is_valid_ether_addr(dev-&gt;dev_addr)) {</div><div class='del'>-		PRINTK("%s: no valid ethernet hw addr\n", __FUNCTION__);</div><div class='add'>+		PRINTK("%s: no valid ethernet hw addr\n", __func__);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1449,7 +1452,7 @@ static int smc911x_close(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct smc911x_local *lp = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	DBG(SMC_DEBUG_FUNC, "%s: --&gt; %s\n", dev-&gt;name, __FUNCTION__);</div><div class='add'>+	DBG(SMC_DEBUG_FUNC, "%s: --&gt; %s\n", dev-&gt;name, __func__);</div><div class='ctx'> </div><div class='ctx'> 	netif_stop_queue(dev);</div><div class='ctx'> 	netif_carrier_off(dev);</div><div class='hunk'>@@ -1483,7 +1486,7 @@ smc911x_ethtool_getsettings(struct net_device *dev, struct ethtool_cmd *cmd)</div><div class='ctx'> 	int ret, status;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	DBG(SMC_DEBUG_FUNC, "%s: --&gt; %s\n", dev-&gt;name, __FUNCTION__);</div><div class='add'>+	DBG(SMC_DEBUG_FUNC, "%s: --&gt; %s\n", dev-&gt;name, __func__);</div><div class='ctx'> 	cmd-&gt;maxtxpkt = 1;</div><div class='ctx'> 	cmd-&gt;maxrxpkt = 1;</div><div class='ctx'> </div><div class='hunk'>@@ -1621,7 +1624,7 @@ static int smc911x_ethtool_wait_eeprom_ready(struct net_device *dev)</div><div class='ctx'> 	for(timeout=10;(e2p_cmd &amp; E2P_CMD_EPC_BUSY_) &amp;&amp; timeout; timeout--) {</div><div class='ctx'> 		if (e2p_cmd &amp; E2P_CMD_EPC_TIMEOUT_) {</div><div class='ctx'> 			PRINTK("%s: %s timeout waiting for EEPROM to respond\n",</div><div class='del'>-				dev-&gt;name, __FUNCTION__);</div><div class='add'>+				dev-&gt;name, __func__);</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		}</div><div class='ctx'> 		mdelay(1);</div><div class='hunk'>@@ -1629,7 +1632,7 @@ static int smc911x_ethtool_wait_eeprom_ready(struct net_device *dev)</div><div class='ctx'> 	}</div><div class='ctx'> 	if (timeout == 0) {</div><div class='ctx'> 		PRINTK("%s: %s timeout waiting for EEPROM CMD not busy\n",</div><div class='del'>-			dev-&gt;name, __FUNCTION__);</div><div class='add'>+			dev-&gt;name, __func__);</div><div class='ctx'> 		return -ETIMEDOUT;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1742,7 +1745,7 @@ static int __init smc911x_findirq(struct net_device *dev)</div><div class='ctx'> 	int timeout = 20;</div><div class='ctx'> 	unsigned long cookie;</div><div class='ctx'> </div><div class='del'>-	DBG(SMC_DEBUG_FUNC, "--&gt; %s\n", __FUNCTION__);</div><div class='add'>+	DBG(SMC_DEBUG_FUNC, "--&gt; %s\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	cookie = probe_irq_on();</div><div class='ctx'> </div><div class='hunk'>@@ -1808,7 +1811,7 @@ static int __init smc911x_probe(struct net_device *dev)</div><div class='ctx'> 	const char *version_string;</div><div class='ctx'> 	unsigned long irq_flags;</div><div class='ctx'> </div><div class='del'>-	DBG(SMC_DEBUG_FUNC, "%s: --&gt; %s\n", dev-&gt;name, __FUNCTION__);</div><div class='add'>+	DBG(SMC_DEBUG_FUNC, "%s: --&gt; %s\n", dev-&gt;name, __func__);</div><div class='ctx'> </div><div class='ctx'> 	/* First, see if the endian word is recognized */</div><div class='ctx'> 	val = SMC_GET_BYTE_TEST(lp);</div><div class='hunk'>@@ -2058,7 +2061,7 @@ static int smc911x_drv_probe(struct platform_device *pdev)</div><div class='ctx'> 	unsigned int *addr;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	DBG(SMC_DEBUG_FUNC, "--&gt; %s\n",  __FUNCTION__);</div><div class='add'>+	DBG(SMC_DEBUG_FUNC, "--&gt; %s\n",  __func__);</div><div class='ctx'> 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='ctx'> 	if (!res) {</div><div class='ctx'> 		ret = -ENODEV;</div><div class='hunk'>@@ -2129,7 +2132,7 @@ static int smc911x_drv_remove(struct platform_device *pdev)</div><div class='ctx'> 	struct smc911x_local *lp = netdev_priv(ndev);</div><div class='ctx'> 	struct resource *res;</div><div class='ctx'> </div><div class='del'>-	DBG(SMC_DEBUG_FUNC, "--&gt; %s\n", __FUNCTION__);</div><div class='add'>+	DBG(SMC_DEBUG_FUNC, "--&gt; %s\n", __func__);</div><div class='ctx'> 	platform_set_drvdata(pdev, NULL);</div><div class='ctx'> </div><div class='ctx'> 	unregister_netdev(ndev);</div><div class='hunk'>@@ -2159,7 +2162,7 @@ static int smc911x_drv_suspend(struct platform_device *dev, pm_message_t state)</div><div class='ctx'> 	struct net_device *ndev = platform_get_drvdata(dev);</div><div class='ctx'> 	struct smc911x_local *lp = netdev_priv(ndev);</div><div class='ctx'> </div><div class='del'>-	DBG(SMC_DEBUG_FUNC, "--&gt; %s\n", __FUNCTION__);</div><div class='add'>+	DBG(SMC_DEBUG_FUNC, "--&gt; %s\n", __func__);</div><div class='ctx'> 	if (ndev) {</div><div class='ctx'> 		if (netif_running(ndev)) {</div><div class='ctx'> 			netif_device_detach(ndev);</div><div class='hunk'>@@ -2177,7 +2180,7 @@ static int smc911x_drv_resume(struct platform_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *ndev = platform_get_drvdata(dev);</div><div class='ctx'> </div><div class='del'>-	DBG(SMC_DEBUG_FUNC, "--&gt; %s\n", __FUNCTION__);</div><div class='add'>+	DBG(SMC_DEBUG_FUNC, "--&gt; %s\n", __func__);</div><div class='ctx'> 	if (ndev) {</div><div class='ctx'> 		struct smc911x_local *lp = netdev_priv(ndev);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/smc911x.h b/drivers/net/smc911x.h<br/>index 2abfc2845198..bf6240f23f5d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/smc911x.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/smc911x.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/smc911x.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/smc911x.h</a></div><div class='hunk'>@@ -666,10 +666,13 @@ smc_pxa_dma_outsl(struct smc911x_local *lp, u_long physaddr,</div><div class='ctx'> #define LAN911X_INTERNAL_PHY_ID		(0x0007C000)</div><div class='ctx'> </div><div class='ctx'> /* Chip ID values */</div><div class='del'>-#define CHIP_9115	0x115</div><div class='del'>-#define CHIP_9116	0x116</div><div class='del'>-#define CHIP_9117	0x117</div><div class='del'>-#define CHIP_9118	0x118</div><div class='add'>+#define CHIP_9115	0x0115</div><div class='add'>+#define CHIP_9116	0x0116</div><div class='add'>+#define CHIP_9117	0x0117</div><div class='add'>+#define CHIP_9118	0x0118</div><div class='add'>+#define CHIP_9215	0x115A</div><div class='add'>+#define CHIP_9217	0x117A</div><div class='add'>+#define CHIP_9218	0x118A</div><div class='ctx'> </div><div class='ctx'> struct chip_id {</div><div class='ctx'> 	u16 id;</div><div class='hunk'>@@ -681,6 +684,9 @@ static const struct chip_id chip_ids[] =  {</div><div class='ctx'> 	{ CHIP_9116, "LAN9116" },</div><div class='ctx'> 	{ CHIP_9117, "LAN9117" },</div><div class='ctx'> 	{ CHIP_9118, "LAN9118" },</div><div class='add'>+	{ CHIP_9215, "LAN9215" },</div><div class='add'>+	{ CHIP_9217, "LAN9217" },</div><div class='add'>+	{ CHIP_9218, "LAN9218" },</div><div class='ctx'> 	{ 0, NULL },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/smc91x.c b/drivers/net/smc91x.c<br/>index 24768c10cadb..c70870e0fd61 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/smc91x.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/smc91x.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/smc91x.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/smc91x.c</a></div><div class='hunk'>@@ -270,7 +270,7 @@ static void smc_reset(struct net_device *dev)</div><div class='ctx'> 	unsigned int ctl, cfg;</div><div class='ctx'> 	struct sk_buff *pending_skb;</div><div class='ctx'> </div><div class='del'>-	DBG(2, "%s: %s\n", dev-&gt;name, __FUNCTION__);</div><div class='add'>+	DBG(2, "%s: %s\n", dev-&gt;name, __func__);</div><div class='ctx'> </div><div class='ctx'> 	/* Disable all interrupts, block TX tasklet */</div><div class='ctx'> 	spin_lock_irq(&amp;lp-&gt;lock);</div><div class='hunk'>@@ -363,7 +363,7 @@ static void smc_enable(struct net_device *dev)</div><div class='ctx'> 	void __iomem *ioaddr = lp-&gt;base;</div><div class='ctx'> 	int mask;</div><div class='ctx'> </div><div class='del'>-	DBG(2, "%s: %s\n", dev-&gt;name, __FUNCTION__);</div><div class='add'>+	DBG(2, "%s: %s\n", dev-&gt;name, __func__);</div><div class='ctx'> </div><div class='ctx'> 	/* see the header file for options in TCR/RCR DEFAULT */</div><div class='ctx'> 	SMC_SELECT_BANK(lp, 0);</div><div class='hunk'>@@ -397,7 +397,7 @@ static void smc_shutdown(struct net_device *dev)</div><div class='ctx'> 	void __iomem *ioaddr = lp-&gt;base;</div><div class='ctx'> 	struct sk_buff *pending_skb;</div><div class='ctx'> </div><div class='del'>-	DBG(2, "%s: %s\n", CARDNAME, __FUNCTION__);</div><div class='add'>+	DBG(2, "%s: %s\n", CARDNAME, __func__);</div><div class='ctx'> </div><div class='ctx'> 	/* no more interrupts for me */</div><div class='ctx'> 	spin_lock_irq(&amp;lp-&gt;lock);</div><div class='hunk'>@@ -430,7 +430,7 @@ static inline void  smc_rcv(struct net_device *dev)</div><div class='ctx'> 	void __iomem *ioaddr = lp-&gt;base;</div><div class='ctx'> 	unsigned int packet_number, status, packet_len;</div><div class='ctx'> </div><div class='del'>-	DBG(3, "%s: %s\n", dev-&gt;name, __FUNCTION__);</div><div class='add'>+	DBG(3, "%s: %s\n", dev-&gt;name, __func__);</div><div class='ctx'> </div><div class='ctx'> 	packet_number = SMC_GET_RXFIFO(lp);</div><div class='ctx'> 	if (unlikely(packet_number &amp; RXFIFO_REMPTY)) {</div><div class='hunk'>@@ -577,7 +577,7 @@ static void smc_hardware_send_pkt(unsigned long data)</div><div class='ctx'> 	unsigned int packet_no, len;</div><div class='ctx'> 	unsigned char *buf;</div><div class='ctx'> </div><div class='del'>-	DBG(3, "%s: %s\n", dev-&gt;name, __FUNCTION__);</div><div class='add'>+	DBG(3, "%s: %s\n", dev-&gt;name, __func__);</div><div class='ctx'> </div><div class='ctx'> 	if (!smc_special_trylock(&amp;lp-&gt;lock)) {</div><div class='ctx'> 		netif_stop_queue(dev);</div><div class='hunk'>@@ -662,7 +662,7 @@ static int smc_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	void __iomem *ioaddr = lp-&gt;base;</div><div class='ctx'> 	unsigned int numPages, poll_count, status;</div><div class='ctx'> </div><div class='del'>-	DBG(3, "%s: %s\n", dev-&gt;name, __FUNCTION__);</div><div class='add'>+	DBG(3, "%s: %s\n", dev-&gt;name, __func__);</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(lp-&gt;pending_tx_skb != NULL);</div><div class='ctx'> </div><div class='hunk'>@@ -734,7 +734,7 @@ static void smc_tx(struct net_device *dev)</div><div class='ctx'> 	void __iomem *ioaddr = lp-&gt;base;</div><div class='ctx'> 	unsigned int saved_packet, packet_no, tx_status, pkt_len;</div><div class='ctx'> </div><div class='del'>-	DBG(3, "%s: %s\n", dev-&gt;name, __FUNCTION__);</div><div class='add'>+	DBG(3, "%s: %s\n", dev-&gt;name, __func__);</div><div class='ctx'> </div><div class='ctx'> 	/* If the TX FIFO is empty then nothing to do */</div><div class='ctx'> 	packet_no = SMC_GET_TXFIFO(lp);</div><div class='hunk'>@@ -856,7 +856,7 @@ static int smc_phy_read(struct net_device *dev, int phyaddr, int phyreg)</div><div class='ctx'> 	SMC_SET_MII(lp, SMC_GET_MII(lp) &amp; ~(MII_MCLK|MII_MDOE|MII_MDO));</div><div class='ctx'> </div><div class='ctx'> 	DBG(3, "%s: phyaddr=0x%x, phyreg=0x%x, phydata=0x%x\n",</div><div class='del'>-		__FUNCTION__, phyaddr, phyreg, phydata);</div><div class='add'>+		__func__, phyaddr, phyreg, phydata);</div><div class='ctx'> </div><div class='ctx'> 	SMC_SELECT_BANK(lp, 2);</div><div class='ctx'> 	return phydata;</div><div class='hunk'>@@ -883,7 +883,7 @@ static void smc_phy_write(struct net_device *dev, int phyaddr, int phyreg,</div><div class='ctx'> 	SMC_SET_MII(lp, SMC_GET_MII(lp) &amp; ~(MII_MCLK|MII_MDOE|MII_MDO));</div><div class='ctx'> </div><div class='ctx'> 	DBG(3, "%s: phyaddr=0x%x, phyreg=0x%x, phydata=0x%x\n",</div><div class='del'>-		__FUNCTION__, phyaddr, phyreg, phydata);</div><div class='add'>+		__func__, phyaddr, phyreg, phydata);</div><div class='ctx'> </div><div class='ctx'> 	SMC_SELECT_BANK(lp, 2);</div><div class='ctx'> }</div><div class='hunk'>@@ -896,7 +896,7 @@ static void smc_phy_detect(struct net_device *dev)</div><div class='ctx'> 	struct smc_local *lp = netdev_priv(dev);</div><div class='ctx'> 	int phyaddr;</div><div class='ctx'> </div><div class='del'>-	DBG(2, "%s: %s\n", dev-&gt;name, __FUNCTION__);</div><div class='add'>+	DBG(2, "%s: %s\n", dev-&gt;name, __func__);</div><div class='ctx'> </div><div class='ctx'> 	lp-&gt;phy_type = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -935,7 +935,7 @@ static int smc_phy_fixed(struct net_device *dev)</div><div class='ctx'> 	int phyaddr = lp-&gt;mii.phy_id;</div><div class='ctx'> 	int bmcr, cfg1;</div><div class='ctx'> </div><div class='del'>-	DBG(3, "%s: %s\n", dev-&gt;name, __FUNCTION__);</div><div class='add'>+	DBG(3, "%s: %s\n", dev-&gt;name, __func__);</div><div class='ctx'> </div><div class='ctx'> 	/* Enter Link Disable state */</div><div class='ctx'> 	cfg1 = smc_phy_read(dev, phyaddr, PHY_CFG1_REG);</div><div class='hunk'>@@ -1168,7 +1168,7 @@ static void smc_phy_interrupt(struct net_device *dev)</div><div class='ctx'> 	int phyaddr = lp-&gt;mii.phy_id;</div><div class='ctx'> 	int phy18;</div><div class='ctx'> </div><div class='del'>-	DBG(2, "%s: %s\n", dev-&gt;name, __FUNCTION__);</div><div class='add'>+	DBG(2, "%s: %s\n", dev-&gt;name, __func__);</div><div class='ctx'> </div><div class='ctx'> 	if (lp-&gt;phy_type == 0)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -1236,7 +1236,7 @@ static irqreturn_t smc_interrupt(int irq, void *dev_id)</div><div class='ctx'> 	int status, mask, timeout, card_stats;</div><div class='ctx'> 	int saved_pointer;</div><div class='ctx'> </div><div class='del'>-	DBG(3, "%s: %s\n", dev-&gt;name, __FUNCTION__);</div><div class='add'>+	DBG(3, "%s: %s\n", dev-&gt;name, __func__);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;lp-&gt;lock);</div><div class='ctx'> </div><div class='hunk'>@@ -1358,7 +1358,7 @@ static void smc_timeout(struct net_device *dev)</div><div class='ctx'> 	void __iomem *ioaddr = lp-&gt;base;</div><div class='ctx'> 	int status, mask, eph_st, meminfo, fifo;</div><div class='ctx'> </div><div class='del'>-	DBG(2, "%s: %s\n", dev-&gt;name, __FUNCTION__);</div><div class='add'>+	DBG(2, "%s: %s\n", dev-&gt;name, __func__);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irq(&amp;lp-&gt;lock);</div><div class='ctx'> 	status = SMC_GET_INT(lp);</div><div class='hunk'>@@ -1402,7 +1402,7 @@ static void smc_set_multicast_list(struct net_device *dev)</div><div class='ctx'> 	unsigned char multicast_table[8];</div><div class='ctx'> 	int update_multicast = 0;</div><div class='ctx'> </div><div class='del'>-	DBG(2, "%s: %s\n", dev-&gt;name, __FUNCTION__);</div><div class='add'>+	DBG(2, "%s: %s\n", dev-&gt;name, __func__);</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;flags &amp; IFF_PROMISC) {</div><div class='ctx'> 		DBG(2, "%s: RCR_PRMS\n", dev-&gt;name);</div><div class='hunk'>@@ -1505,7 +1505,7 @@ smc_open(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct smc_local *lp = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	DBG(2, "%s: %s\n", dev-&gt;name, __FUNCTION__);</div><div class='add'>+	DBG(2, "%s: %s\n", dev-&gt;name, __func__);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Check that the address is valid.  If its not, refuse</div><div class='hunk'>@@ -1513,14 +1513,16 @@ smc_open(struct net_device *dev)</div><div class='ctx'> 	 * address using ifconfig eth0 hw ether xx:xx:xx:xx:xx:xx</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!is_valid_ether_addr(dev-&gt;dev_addr)) {</div><div class='del'>-		PRINTK("%s: no valid ethernet hw addr\n", __FUNCTION__);</div><div class='add'>+		PRINTK("%s: no valid ethernet hw addr\n", __func__);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Setup the default Register Modes */</div><div class='ctx'> 	lp-&gt;tcr_cur_mode = TCR_DEFAULT;</div><div class='ctx'> 	lp-&gt;rcr_cur_mode = RCR_DEFAULT;</div><div class='del'>-	lp-&gt;rpc_cur_mode = RPC_DEFAULT;</div><div class='add'>+	lp-&gt;rpc_cur_mode = RPC_DEFAULT |</div><div class='add'>+				lp-&gt;cfg.leda &lt;&lt; RPC_LSXA_SHFT |</div><div class='add'>+				lp-&gt;cfg.ledb &lt;&lt; RPC_LSXB_SHFT;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If we are not using a MII interface, we need to</div><div class='hunk'>@@ -1557,7 +1559,7 @@ static int smc_close(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct smc_local *lp = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	DBG(2, "%s: %s\n", dev-&gt;name, __FUNCTION__);</div><div class='add'>+	DBG(2, "%s: %s\n", dev-&gt;name, __func__);</div><div class='ctx'> </div><div class='ctx'> 	netif_stop_queue(dev);</div><div class='ctx'> 	netif_carrier_off(dev);</div><div class='hunk'>@@ -1700,7 +1702,7 @@ static int __init smc_findirq(struct smc_local *lp)</div><div class='ctx'> 	int timeout = 20;</div><div class='ctx'> 	unsigned long cookie;</div><div class='ctx'> </div><div class='del'>-	DBG(2, "%s: %s\n", CARDNAME, __FUNCTION__);</div><div class='add'>+	DBG(2, "%s: %s\n", CARDNAME, __func__);</div><div class='ctx'> </div><div class='ctx'> 	cookie = probe_irq_on();</div><div class='ctx'> </div><div class='hunk'>@@ -1778,7 +1780,7 @@ static int __init smc_probe(struct net_device *dev, void __iomem *ioaddr,</div><div class='ctx'> 	const char *version_string;</div><div class='ctx'> 	DECLARE_MAC_BUF(mac);</div><div class='ctx'> </div><div class='del'>-	DBG(2, "%s: %s\n", CARDNAME, __FUNCTION__);</div><div class='add'>+	DBG(2, "%s: %s\n", CARDNAME, __func__);</div><div class='ctx'> </div><div class='ctx'> 	/* First, see if the high byte is 0x33 */</div><div class='ctx'> 	val = SMC_CURRENT_BANK(lp);</div><div class='hunk'>@@ -1961,7 +1963,8 @@ static int __init smc_probe(struct net_device *dev, void __iomem *ioaddr,</div><div class='ctx'> 		if (dev-&gt;dma != (unsigned char)-1)</div><div class='ctx'> 			printk(" DMA %d", dev-&gt;dma);</div><div class='ctx'> </div><div class='del'>-		printk("%s%s\n", nowait ? " [nowait]" : "",</div><div class='add'>+		printk("%s%s\n",</div><div class='add'>+			lp-&gt;cfg.flags &amp; SMC91X_NOWAIT ? " [nowait]" : "",</div><div class='ctx'> 			THROTTLE_TX_PKTS ? " [throttle_tx]" : "");</div><div class='ctx'> </div><div class='ctx'> 		if (!is_valid_ether_addr(dev-&gt;dev_addr)) {</div><div class='hunk'>@@ -2157,6 +2160,11 @@ static int smc_drv_probe(struct platform_device *pdev)</div><div class='ctx'> 		lp-&gt;cfg.flags |= (nowait) ? SMC91X_NOWAIT : 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (!lp-&gt;cfg.leda &amp;&amp; !lp-&gt;cfg.ledb) {</div><div class='add'>+		lp-&gt;cfg.leda = RPC_LSA_DEFAULT;</div><div class='add'>+		lp-&gt;cfg.ledb = RPC_LSB_DEFAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ndev-&gt;dma = (unsigned char)-1;</div><div class='ctx'> </div><div class='ctx'> 	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "smc91x-regs");</div><div class='head'>diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h<br/>index 997e7f1d5c6e..a07cc9351c6b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/smc91x.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/smc91x.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/smc91x.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/smc91x.h</a></div><div class='hunk'>@@ -43,7 +43,8 @@</div><div class='ctx'> #if defined(CONFIG_ARCH_LUBBOCK) ||\</div><div class='ctx'>     defined(CONFIG_MACH_MAINSTONE) ||\</div><div class='ctx'>     defined(CONFIG_MACH_ZYLONITE) ||\</div><div class='del'>-    defined(CONFIG_MACH_LITTLETON)</div><div class='add'>+    defined(CONFIG_MACH_LITTLETON) ||\</div><div class='add'>+    defined(CONFIG_ARCH_VIPER)</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -446,6 +447,8 @@ static inline void LPD7_SMC_outsw (unsigned char* a, int r,</div><div class='ctx'> #define SMC_CAN_USE_32BIT	1</div><div class='ctx'> #define SMC_NOWAIT		1</div><div class='ctx'> </div><div class='add'>+#define SMC_IO_SHIFT		(lp-&gt;io_shift)</div><div class='add'>+</div><div class='ctx'> #define SMC_inb(a, r)		readb((a) + (r))</div><div class='ctx'> #define SMC_inw(a, r)		readw((a) + (r))</div><div class='ctx'> #define SMC_inl(a, r)		readl((a) + (r))</div><div class='hunk'>@@ -778,14 +781,6 @@ smc_pxa_dma_irq(int dma, void *dummy)</div><div class='ctx'> #define RPC_ANEG	0x0800	// When 1 PHY is in Auto-Negotiate Mode</div><div class='ctx'> #define RPC_LSXA_SHFT	5	// Bits to shift LS2A,LS1A,LS0A to lsb</div><div class='ctx'> #define RPC_LSXB_SHFT	2	// Bits to get LS2B,LS1B,LS0B to lsb</div><div class='del'>-#define RPC_LED_100_10	(0x00)	// LED = 100Mbps OR's with 10Mbps link detect</div><div class='del'>-#define RPC_LED_RES	(0x01)	// LED = Reserved</div><div class='del'>-#define RPC_LED_10	(0x02)	// LED = 10Mbps link detect</div><div class='del'>-#define RPC_LED_FD	(0x03)	// LED = Full Duplex Mode</div><div class='del'>-#define RPC_LED_TX_RX	(0x04)	// LED = TX or RX packet occurred</div><div class='del'>-#define RPC_LED_100	(0x05)	// LED = 100Mbps link dectect</div><div class='del'>-#define RPC_LED_TX	(0x06)	// LED = TX packet occurred</div><div class='del'>-#define RPC_LED_RX	(0x07)	// LED = RX packet occurred</div><div class='ctx'> </div><div class='ctx'> #ifndef RPC_LSA_DEFAULT</div><div class='ctx'> #define RPC_LSA_DEFAULT	RPC_LED_100</div><div class='hunk'>@@ -794,7 +789,7 @@ smc_pxa_dma_irq(int dma, void *dummy)</div><div class='ctx'> #define RPC_LSB_DEFAULT RPC_LED_FD</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#define RPC_DEFAULT (RPC_ANEG | (RPC_LSA_DEFAULT &lt;&lt; RPC_LSXA_SHFT) | (RPC_LSB_DEFAULT &lt;&lt; RPC_LSXB_SHFT) | RPC_SPEED | RPC_DPLX)</div><div class='add'>+#define RPC_DEFAULT (RPC_ANEG | RPC_SPEED | RPC_DPLX)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* Bank 0 0x0C is reserved */</div><div class='head'>diff --git a/drivers/net/sunbmac.c b/drivers/net/sunbmac.c<br/>index 0e4a88d16327..018d0fca9422 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sunbmac.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/sunbmac.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sunbmac.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sunbmac.c</a></div><div class='hunk'>@@ -1,7 +1,6 @@</div><div class='del'>-/* $Id: sunbmac.c,v 1.30 2002/01/15 06:48:55 davem Exp $</div><div class='del'>- * sunbmac.c: Driver for Sparc BigMAC 100baseT ethernet adapters.</div><div class='add'>+/* sunbmac.c: Driver for Sparc BigMAC 100baseT ethernet adapters.</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 1997, 1998, 1999, 2003 David S. Miller (davem@redhat.com)</div><div class='add'>+ * Copyright (C) 1997, 1998, 1999, 2003, 2008 David S. Miller (davem@davemloft.net)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -23,6 +22,9 @@</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/auxio.h&gt;</div><div class='ctx'> #include &lt;asm/byteorder.h&gt;</div><div class='hunk'>@@ -32,15 +34,14 @@</div><div class='ctx'> #include &lt;asm/openprom.h&gt;</div><div class='ctx'> #include &lt;asm/oplib.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='del'>-#include &lt;asm/sbus.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "sunbmac.h"</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME	"sunbmac"</div><div class='del'>-#define DRV_VERSION	"2.0"</div><div class='del'>-#define DRV_RELDATE	"11/24/03"</div><div class='del'>-#define DRV_AUTHOR	"David S. Miller (davem@redhat.com)"</div><div class='add'>+#define DRV_VERSION	"2.1"</div><div class='add'>+#define DRV_RELDATE	"August 26, 2008"</div><div class='add'>+#define DRV_AUTHOR	"David S. Miller (davem@davemloft.net)"</div><div class='ctx'> </div><div class='ctx'> static char version[] =</div><div class='ctx'> 	DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE " " DRV_AUTHOR "\n";</div><div class='hunk'>@@ -96,8 +97,8 @@ static int qec_global_reset(void __iomem *gregs)</div><div class='ctx'> </div><div class='ctx'> static void qec_init(struct bigmac *bp)</div><div class='ctx'> {</div><div class='add'>+	struct of_device *qec_op = bp-&gt;qec_op;</div><div class='ctx'> 	void __iomem *gregs = bp-&gt;gregs;</div><div class='del'>-	struct sbus_dev *qec_sdev = bp-&gt;qec_sdev;</div><div class='ctx'> 	u8 bsizes = bp-&gt;bigmac_bursts;</div><div class='ctx'> 	u32 regval;</div><div class='ctx'> </div><div class='hunk'>@@ -112,13 +113,13 @@ static void qec_init(struct bigmac *bp)</div><div class='ctx'> 	sbus_writel(GLOB_PSIZE_2048, gregs + GLOB_PSIZE);</div><div class='ctx'> </div><div class='ctx'> 	/* All of memsize is given to bigmac. */</div><div class='del'>-	sbus_writel(qec_sdev-&gt;reg_addrs[1].reg_size,</div><div class='add'>+	sbus_writel(resource_size(&amp;qec_op-&gt;resource[1]),</div><div class='ctx'> 		    gregs + GLOB_MSIZE);</div><div class='ctx'> </div><div class='ctx'> 	/* Half to the transmitter, half to the receiver. */</div><div class='del'>-	sbus_writel(qec_sdev-&gt;reg_addrs[1].reg_size &gt;&gt; 1,</div><div class='add'>+	sbus_writel(resource_size(&amp;qec_op-&gt;resource[1]) &gt;&gt; 1,</div><div class='ctx'> 		    gregs + GLOB_TSIZE);</div><div class='del'>-	sbus_writel(qec_sdev-&gt;reg_addrs[1].reg_size &gt;&gt; 1,</div><div class='add'>+	sbus_writel(resource_size(&amp;qec_op-&gt;resource[1]) &gt;&gt; 1,</div><div class='ctx'> 		    gregs + GLOB_RSIZE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -239,9 +240,10 @@ static void bigmac_init_rings(struct bigmac *bp, int from_irq)</div><div class='ctx'> 		skb_reserve(skb, 34);</div><div class='ctx'> </div><div class='ctx'> 		bb-&gt;be_rxd[i].rx_addr =</div><div class='del'>-			sbus_map_single(bp-&gt;bigmac_sdev, skb-&gt;data,</div><div class='del'>-					RX_BUF_ALLOC_SIZE - 34,</div><div class='del'>-					SBUS_DMA_FROMDEVICE);</div><div class='add'>+			dma_map_single(&amp;bp-&gt;bigmac_op-&gt;dev,</div><div class='add'>+				       skb-&gt;data,</div><div class='add'>+				       RX_BUF_ALLOC_SIZE - 34,</div><div class='add'>+				       DMA_FROM_DEVICE);</div><div class='ctx'> 		bb-&gt;be_rxd[i].rx_flags =</div><div class='ctx'> 			(RXD_OWN | ((RX_BUF_ALLOC_SIZE - 34) &amp; RXD_LENGTH));</div><div class='ctx'> 	}</div><div class='hunk'>@@ -776,9 +778,9 @@ static void bigmac_tx(struct bigmac *bp)</div><div class='ctx'> 		skb = bp-&gt;tx_skbs[elem];</div><div class='ctx'> 		bp-&gt;enet_stats.tx_packets++;</div><div class='ctx'> 		bp-&gt;enet_stats.tx_bytes += skb-&gt;len;</div><div class='del'>-		sbus_unmap_single(bp-&gt;bigmac_sdev,</div><div class='del'>-				  this-&gt;tx_addr, skb-&gt;len,</div><div class='del'>-				  SBUS_DMA_TODEVICE);</div><div class='add'>+		dma_unmap_single(&amp;bp-&gt;bigmac_op-&gt;dev,</div><div class='add'>+				 this-&gt;tx_addr, skb-&gt;len,</div><div class='add'>+				 DMA_TO_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 		DTX(("skb(%p) ", skb));</div><div class='ctx'> 		bp-&gt;tx_skbs[elem] = NULL;</div><div class='hunk'>@@ -831,18 +833,19 @@ static void bigmac_rx(struct bigmac *bp)</div><div class='ctx'> 				drops++;</div><div class='ctx'> 				goto drop_it;</div><div class='ctx'> 			}</div><div class='del'>-			sbus_unmap_single(bp-&gt;bigmac_sdev,</div><div class='del'>-					  this-&gt;rx_addr,</div><div class='del'>-					  RX_BUF_ALLOC_SIZE - 34,</div><div class='del'>-					  SBUS_DMA_FROMDEVICE);</div><div class='add'>+			dma_unmap_single(&amp;bp-&gt;bigmac_op-&gt;dev,</div><div class='add'>+					 this-&gt;rx_addr,</div><div class='add'>+					 RX_BUF_ALLOC_SIZE - 34,</div><div class='add'>+					 DMA_FROM_DEVICE);</div><div class='ctx'> 			bp-&gt;rx_skbs[elem] = new_skb;</div><div class='ctx'> 			new_skb-&gt;dev = bp-&gt;dev;</div><div class='ctx'> 			skb_put(new_skb, ETH_FRAME_LEN);</div><div class='ctx'> 			skb_reserve(new_skb, 34);</div><div class='del'>-			this-&gt;rx_addr = sbus_map_single(bp-&gt;bigmac_sdev,</div><div class='del'>-							new_skb-&gt;data,</div><div class='del'>-							RX_BUF_ALLOC_SIZE - 34,</div><div class='del'>-							SBUS_DMA_FROMDEVICE);</div><div class='add'>+			this-&gt;rx_addr =</div><div class='add'>+				dma_map_single(&amp;bp-&gt;bigmac_op-&gt;dev,</div><div class='add'>+					       new_skb-&gt;data,</div><div class='add'>+					       RX_BUF_ALLOC_SIZE - 34,</div><div class='add'>+					       DMA_FROM_DEVICE);</div><div class='ctx'> 			this-&gt;rx_flags =</div><div class='ctx'> 				(RXD_OWN | ((RX_BUF_ALLOC_SIZE - 34) &amp; RXD_LENGTH));</div><div class='ctx'> </div><div class='hunk'>@@ -857,13 +860,13 @@ static void bigmac_rx(struct bigmac *bp)</div><div class='ctx'> 			}</div><div class='ctx'> 			skb_reserve(copy_skb, 2);</div><div class='ctx'> 			skb_put(copy_skb, len);</div><div class='del'>-			sbus_dma_sync_single_for_cpu(bp-&gt;bigmac_sdev,</div><div class='del'>-						     this-&gt;rx_addr, len,</div><div class='del'>-						     SBUS_DMA_FROMDEVICE);</div><div class='add'>+			dma_sync_single_for_cpu(&amp;bp-&gt;bigmac_op-&gt;dev,</div><div class='add'>+						this-&gt;rx_addr, len,</div><div class='add'>+						DMA_FROM_DEVICE);</div><div class='ctx'> 			skb_copy_to_linear_data(copy_skb, (unsigned char *)skb-&gt;data, len);</div><div class='del'>-			sbus_dma_sync_single_for_device(bp-&gt;bigmac_sdev,</div><div class='del'>-							this-&gt;rx_addr, len,</div><div class='del'>-							SBUS_DMA_FROMDEVICE);</div><div class='add'>+			dma_sync_single_for_device(&amp;bp-&gt;bigmac_op-&gt;dev,</div><div class='add'>+						   this-&gt;rx_addr, len,</div><div class='add'>+						   DMA_FROM_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 			/* Reuse original ring buffer. */</div><div class='ctx'> 			this-&gt;rx_flags =</div><div class='hunk'>@@ -959,7 +962,8 @@ static int bigmac_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	u32 mapping;</div><div class='ctx'> </div><div class='ctx'> 	len = skb-&gt;len;</div><div class='del'>-	mapping = sbus_map_single(bp-&gt;bigmac_sdev, skb-&gt;data, len, SBUS_DMA_TODEVICE);</div><div class='add'>+	mapping = dma_map_single(&amp;bp-&gt;bigmac_op-&gt;dev, skb-&gt;data,</div><div class='add'>+				 len, DMA_TO_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 	/* Avoid a race... */</div><div class='ctx'> 	spin_lock_irq(&amp;bp-&gt;lock);</div><div class='hunk'>@@ -1051,12 +1055,8 @@ static void bigmac_set_multicast(struct net_device *dev)</div><div class='ctx'> /* Ethtool support... */</div><div class='ctx'> static void bigmac_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)</div><div class='ctx'> {</div><div class='del'>-	struct bigmac *bp = dev-&gt;priv;</div><div class='del'>-</div><div class='ctx'> 	strcpy(info-&gt;driver, "sunbmac");</div><div class='ctx'> 	strcpy(info-&gt;version, "2.0");</div><div class='del'>-	sprintf(info-&gt;bus_info, "SBUS:%d",</div><div class='del'>-		bp-&gt;qec_sdev-&gt;slot);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u32 bigmac_get_link(struct net_device *dev)</div><div class='hunk'>@@ -1075,14 +1075,15 @@ static const struct ethtool_ops bigmac_ethtool_ops = {</div><div class='ctx'> 	.get_link		= bigmac_get_link,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __devinit bigmac_ether_init(struct sbus_dev *qec_sdev)</div><div class='add'>+static int __devinit bigmac_ether_init(struct of_device *op,</div><div class='add'>+				       struct of_device *qec_op)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev;</div><div class='ctx'> 	static int version_printed;</div><div class='del'>-	struct bigmac *bp;</div><div class='add'>+	struct net_device *dev;</div><div class='ctx'> 	u8 bsizes, bsizes_more;</div><div class='del'>-	int i;</div><div class='ctx'> 	DECLARE_MAC_BUF(mac);</div><div class='add'>+	struct bigmac *bp;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	/* Get a new device struct for this interface. */</div><div class='ctx'> 	dev = alloc_etherdev(sizeof(struct bigmac));</div><div class='hunk'>@@ -1092,32 +1093,21 @@ static int __devinit bigmac_ether_init(struct sbus_dev *qec_sdev)</div><div class='ctx'> 	if (version_printed++ == 0)</div><div class='ctx'> 		printk(KERN_INFO "%s", version);</div><div class='ctx'> </div><div class='del'>-	dev-&gt;base_addr = (long) qec_sdev;</div><div class='ctx'> 	for (i = 0; i &lt; 6; i++)</div><div class='ctx'> 		dev-&gt;dev_addr[i] = idprom-&gt;id_ethaddr[i];</div><div class='ctx'> </div><div class='ctx'> 	/* Setup softc, with backpointers to QEC and BigMAC SBUS device structs. */</div><div class='del'>-	bp = dev-&gt;priv;</div><div class='del'>-	bp-&gt;qec_sdev = qec_sdev;</div><div class='del'>-	bp-&gt;bigmac_sdev = qec_sdev-&gt;child;</div><div class='add'>+	bp = netdev_priv(dev);</div><div class='add'>+	bp-&gt;qec_op = qec_op;</div><div class='add'>+	bp-&gt;bigmac_op = op;</div><div class='ctx'> </div><div class='del'>-	SET_NETDEV_DEV(dev, &amp;bp-&gt;bigmac_sdev-&gt;ofdev.dev);</div><div class='add'>+	SET_NETDEV_DEV(dev, &amp;op-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;bp-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	/* Verify the registers we expect, are actually there. */</div><div class='del'>-	if ((bp-&gt;bigmac_sdev-&gt;num_registers != 3) ||</div><div class='del'>-	   (bp-&gt;qec_sdev-&gt;num_registers != 2)) {</div><div class='del'>-		printk(KERN_ERR "BIGMAC: Device does not have 2 and 3 regs, it has %d and %d.\n",</div><div class='del'>-		       bp-&gt;qec_sdev-&gt;num_registers,</div><div class='del'>-		       bp-&gt;bigmac_sdev-&gt;num_registers);</div><div class='del'>-		printk(KERN_ERR "BIGMAC: Would you like that for here or to go?\n");</div><div class='del'>-		goto fail_and_cleanup;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* Map in QEC global control registers. */</div><div class='del'>-	bp-&gt;gregs = sbus_ioremap(&amp;bp-&gt;qec_sdev-&gt;resource[0], 0,</div><div class='del'>-				 GLOB_REG_SIZE, "BigMAC QEC GLobal Regs");</div><div class='add'>+	bp-&gt;gregs = of_ioremap(&amp;qec_op-&gt;resource[0], 0,</div><div class='add'>+			       GLOB_REG_SIZE, "BigMAC QEC GLobal Regs");</div><div class='ctx'> 	if (!bp-&gt;gregs) {</div><div class='ctx'> 		printk(KERN_ERR "BIGMAC: Cannot map QEC global registers.\n");</div><div class='ctx'> 		goto fail_and_cleanup;</div><div class='hunk'>@@ -1134,13 +1124,8 @@ static int __devinit bigmac_ether_init(struct sbus_dev *qec_sdev)</div><div class='ctx'> 		goto fail_and_cleanup;</div><div class='ctx'> </div><div class='ctx'> 	/* Get supported SBUS burst sizes. */</div><div class='del'>-	bsizes = prom_getintdefault(bp-&gt;qec_sdev-&gt;prom_node,</div><div class='del'>-				    "burst-sizes",</div><div class='del'>-				    0xff);</div><div class='del'>-</div><div class='del'>-	bsizes_more = prom_getintdefault(bp-&gt;qec_sdev-&gt;bus-&gt;prom_node,</div><div class='del'>-					 "burst-sizes",</div><div class='del'>-					 0xff);</div><div class='add'>+	bsizes = of_getintprop_default(qec_op-&gt;node, "burst-sizes", 0xff);</div><div class='add'>+	bsizes_more = of_getintprop_default(qec_op-&gt;node, "burst-sizes", 0xff);</div><div class='ctx'> </div><div class='ctx'> 	bsizes &amp;= 0xff;</div><div class='ctx'> 	if (bsizes_more != 0xff)</div><div class='hunk'>@@ -1154,16 +1139,16 @@ static int __devinit bigmac_ether_init(struct sbus_dev *qec_sdev)</div><div class='ctx'> 	qec_init(bp);</div><div class='ctx'> </div><div class='ctx'> 	/* Map in the BigMAC channel registers. */</div><div class='del'>-	bp-&gt;creg = sbus_ioremap(&amp;bp-&gt;bigmac_sdev-&gt;resource[0], 0,</div><div class='del'>-				CREG_REG_SIZE, "BigMAC QEC Channel Regs");</div><div class='add'>+	bp-&gt;creg = of_ioremap(&amp;op-&gt;resource[0], 0,</div><div class='add'>+			      CREG_REG_SIZE, "BigMAC QEC Channel Regs");</div><div class='ctx'> 	if (!bp-&gt;creg) {</div><div class='ctx'> 		printk(KERN_ERR "BIGMAC: Cannot map QEC channel registers.\n");</div><div class='ctx'> 		goto fail_and_cleanup;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Map in the BigMAC control registers. */</div><div class='del'>-	bp-&gt;bregs = sbus_ioremap(&amp;bp-&gt;bigmac_sdev-&gt;resource[1], 0,</div><div class='del'>-				 BMAC_REG_SIZE, "BigMAC Primary Regs");</div><div class='add'>+	bp-&gt;bregs = of_ioremap(&amp;op-&gt;resource[1], 0,</div><div class='add'>+			       BMAC_REG_SIZE, "BigMAC Primary Regs");</div><div class='ctx'> 	if (!bp-&gt;bregs) {</div><div class='ctx'> 		printk(KERN_ERR "BIGMAC: Cannot map BigMAC primary registers.\n");</div><div class='ctx'> 		goto fail_and_cleanup;</div><div class='hunk'>@@ -1172,8 +1157,8 @@ static int __devinit bigmac_ether_init(struct sbus_dev *qec_sdev)</div><div class='ctx'> 	/* Map in the BigMAC transceiver registers, this is how you poke at</div><div class='ctx'> 	 * the BigMAC's PHY.</div><div class='ctx'> 	 */</div><div class='del'>-	bp-&gt;tregs = sbus_ioremap(&amp;bp-&gt;bigmac_sdev-&gt;resource[2], 0,</div><div class='del'>-				 TCVR_REG_SIZE, "BigMAC Transceiver Regs");</div><div class='add'>+	bp-&gt;tregs = of_ioremap(&amp;op-&gt;resource[2], 0,</div><div class='add'>+			       TCVR_REG_SIZE, "BigMAC Transceiver Regs");</div><div class='ctx'> 	if (!bp-&gt;tregs) {</div><div class='ctx'> 		printk(KERN_ERR "BIGMAC: Cannot map BigMAC transceiver registers.\n");</div><div class='ctx'> 		goto fail_and_cleanup;</div><div class='hunk'>@@ -1183,17 +1168,17 @@ static int __devinit bigmac_ether_init(struct sbus_dev *qec_sdev)</div><div class='ctx'> 	bigmac_stop(bp);</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate transmit/receive descriptor DVMA block. */</div><div class='del'>-	bp-&gt;bmac_block = sbus_alloc_consistent(bp-&gt;bigmac_sdev,</div><div class='del'>-					       PAGE_SIZE,</div><div class='del'>-					       &amp;bp-&gt;bblock_dvma);</div><div class='add'>+	bp-&gt;bmac_block = dma_alloc_coherent(&amp;bp-&gt;bigmac_op-&gt;dev,</div><div class='add'>+					    PAGE_SIZE,</div><div class='add'>+					    &amp;bp-&gt;bblock_dvma, GFP_ATOMIC);</div><div class='ctx'> 	if (bp-&gt;bmac_block == NULL || bp-&gt;bblock_dvma == 0) {</div><div class='ctx'> 		printk(KERN_ERR "BIGMAC: Cannot allocate consistent DMA.\n");</div><div class='ctx'> 		goto fail_and_cleanup;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Get the board revision of this BigMAC. */</div><div class='del'>-	bp-&gt;board_rev = prom_getintdefault(bp-&gt;bigmac_sdev-&gt;prom_node,</div><div class='del'>-					   "board-version", 1);</div><div class='add'>+	bp-&gt;board_rev = of_getintprop_default(bp-&gt;bigmac_op-&gt;node,</div><div class='add'>+					      "board-version", 1);</div><div class='ctx'> </div><div class='ctx'> 	/* Init auto-negotiation timer state. */</div><div class='ctx'> 	init_timer(&amp;bp-&gt;bigmac_timer);</div><div class='hunk'>@@ -1217,7 +1202,7 @@ static int __devinit bigmac_ether_init(struct sbus_dev *qec_sdev)</div><div class='ctx'> 	dev-&gt;watchdog_timeo = 5*HZ;</div><div class='ctx'> </div><div class='ctx'> 	/* Finish net device registration. */</div><div class='del'>-	dev-&gt;irq = bp-&gt;bigmac_sdev-&gt;irqs[0];</div><div class='add'>+	dev-&gt;irq = bp-&gt;bigmac_op-&gt;irqs[0];</div><div class='ctx'> 	dev-&gt;dma = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (register_netdev(dev)) {</div><div class='hunk'>@@ -1225,7 +1210,7 @@ static int __devinit bigmac_ether_init(struct sbus_dev *qec_sdev)</div><div class='ctx'> 		goto fail_and_cleanup;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dev_set_drvdata(&amp;bp-&gt;bigmac_sdev-&gt;ofdev.dev, bp);</div><div class='add'>+	dev_set_drvdata(&amp;bp-&gt;bigmac_op-&gt;dev, bp);</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_INFO "%s: BigMAC 100baseT Ethernet %s\n",</div><div class='ctx'> 	       dev-&gt;name, print_mac(mac, dev-&gt;dev_addr));</div><div class='hunk'>@@ -1236,66 +1221,67 @@ fail_and_cleanup:</div><div class='ctx'> 	/* Something went wrong, undo whatever we did so far. */</div><div class='ctx'> 	/* Free register mappings if any. */</div><div class='ctx'> 	if (bp-&gt;gregs)</div><div class='del'>-		sbus_iounmap(bp-&gt;gregs, GLOB_REG_SIZE);</div><div class='add'>+		of_iounmap(&amp;qec_op-&gt;resource[0], bp-&gt;gregs, GLOB_REG_SIZE);</div><div class='ctx'> 	if (bp-&gt;creg)</div><div class='del'>-		sbus_iounmap(bp-&gt;creg, CREG_REG_SIZE);</div><div class='add'>+		of_iounmap(&amp;op-&gt;resource[0], bp-&gt;creg, CREG_REG_SIZE);</div><div class='ctx'> 	if (bp-&gt;bregs)</div><div class='del'>-		sbus_iounmap(bp-&gt;bregs, BMAC_REG_SIZE);</div><div class='add'>+		of_iounmap(&amp;op-&gt;resource[1], bp-&gt;bregs, BMAC_REG_SIZE);</div><div class='ctx'> 	if (bp-&gt;tregs)</div><div class='del'>-		sbus_iounmap(bp-&gt;tregs, TCVR_REG_SIZE);</div><div class='add'>+		of_iounmap(&amp;op-&gt;resource[2], bp-&gt;tregs, TCVR_REG_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	if (bp-&gt;bmac_block)</div><div class='del'>-		sbus_free_consistent(bp-&gt;bigmac_sdev,</div><div class='del'>-				     PAGE_SIZE,</div><div class='del'>-				     bp-&gt;bmac_block,</div><div class='del'>-				     bp-&gt;bblock_dvma);</div><div class='add'>+		dma_free_coherent(&amp;bp-&gt;bigmac_op-&gt;dev,</div><div class='add'>+				  PAGE_SIZE,</div><div class='add'>+				  bp-&gt;bmac_block,</div><div class='add'>+				  bp-&gt;bblock_dvma);</div><div class='ctx'> </div><div class='ctx'> 	/* This also frees the co-located 'dev-&gt;priv' */</div><div class='ctx'> 	free_netdev(dev);</div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* QEC can be the parent of either QuadEthernet or</div><div class='del'>- * a BigMAC.  We want the latter.</div><div class='add'>+/* QEC can be the parent of either QuadEthernet or a BigMAC.  We want</div><div class='add'>+ * the latter.</div><div class='ctx'>  */</div><div class='del'>-static int __devinit bigmac_sbus_probe(struct of_device *dev, const struct of_device_id *match)</div><div class='add'>+static int __devinit bigmac_sbus_probe(struct of_device *op,</div><div class='add'>+				       const struct of_device_id *match)</div><div class='ctx'> {</div><div class='del'>-	struct sbus_dev *sdev = to_sbus_device(&amp;dev-&gt;dev);</div><div class='del'>-	struct device_node *dp = dev-&gt;node;</div><div class='add'>+	struct device *parent = op-&gt;dev.parent;</div><div class='add'>+	struct of_device *qec_op;</div><div class='ctx'> </div><div class='del'>-	if (!strcmp(dp-&gt;name, "be"))</div><div class='del'>-		sdev = sdev-&gt;parent;</div><div class='add'>+	qec_op = to_of_device(parent);</div><div class='ctx'> </div><div class='del'>-	return bigmac_ether_init(sdev);</div><div class='add'>+	return bigmac_ether_init(op, qec_op);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devexit bigmac_sbus_remove(struct of_device *dev)</div><div class='add'>+static int __devexit bigmac_sbus_remove(struct of_device *op)</div><div class='ctx'> {</div><div class='del'>-	struct bigmac *bp = dev_get_drvdata(&amp;dev-&gt;dev);</div><div class='add'>+	struct bigmac *bp = dev_get_drvdata(&amp;op-&gt;dev);</div><div class='add'>+	struct device *parent = op-&gt;dev.parent;</div><div class='ctx'> 	struct net_device *net_dev = bp-&gt;dev;</div><div class='add'>+	struct of_device *qec_op;</div><div class='ctx'> </div><div class='del'>-	unregister_netdevice(net_dev);</div><div class='add'>+	qec_op = to_of_device(parent);</div><div class='ctx'> </div><div class='del'>-	sbus_iounmap(bp-&gt;gregs, GLOB_REG_SIZE);</div><div class='del'>-	sbus_iounmap(bp-&gt;creg, CREG_REG_SIZE);</div><div class='del'>-	sbus_iounmap(bp-&gt;bregs, BMAC_REG_SIZE);</div><div class='del'>-	sbus_iounmap(bp-&gt;tregs, TCVR_REG_SIZE);</div><div class='del'>-	sbus_free_consistent(bp-&gt;bigmac_sdev,</div><div class='del'>-			     PAGE_SIZE,</div><div class='del'>-			     bp-&gt;bmac_block,</div><div class='del'>-			     bp-&gt;bblock_dvma);</div><div class='add'>+	unregister_netdev(net_dev);</div><div class='add'>+</div><div class='add'>+	of_iounmap(&amp;qec_op-&gt;resource[0], bp-&gt;gregs, GLOB_REG_SIZE);</div><div class='add'>+	of_iounmap(&amp;op-&gt;resource[0], bp-&gt;creg, CREG_REG_SIZE);</div><div class='add'>+	of_iounmap(&amp;op-&gt;resource[1], bp-&gt;bregs, BMAC_REG_SIZE);</div><div class='add'>+	of_iounmap(&amp;op-&gt;resource[2], bp-&gt;tregs, TCVR_REG_SIZE);</div><div class='add'>+	dma_free_coherent(&amp;op-&gt;dev,</div><div class='add'>+			  PAGE_SIZE,</div><div class='add'>+			  bp-&gt;bmac_block,</div><div class='add'>+			  bp-&gt;bblock_dvma);</div><div class='ctx'> </div><div class='ctx'> 	free_netdev(net_dev);</div><div class='ctx'> </div><div class='del'>-	dev_set_drvdata(&amp;dev-&gt;dev, NULL);</div><div class='add'>+	dev_set_drvdata(&amp;op-&gt;dev, NULL);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct of_device_id bigmac_sbus_match[] = {</div><div class='del'>-	{</div><div class='del'>-		.name = "qec",</div><div class='del'>-	},</div><div class='add'>+static const struct of_device_id bigmac_sbus_match[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.name = "be",</div><div class='ctx'> 	},</div><div class='hunk'>@@ -1313,7 +1299,7 @@ static struct of_platform_driver bigmac_sbus_driver = {</div><div class='ctx'> </div><div class='ctx'> static int __init bigmac_init(void)</div><div class='ctx'> {</div><div class='del'>-	return of_register_driver(&amp;bigmac_sbus_driver, &amp;sbus_bus_type);</div><div class='add'>+	return of_register_driver(&amp;bigmac_sbus_driver, &amp;of_bus_type);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit bigmac_exit(void)</div><div class='head'>diff --git a/drivers/net/sunbmac.h b/drivers/net/sunbmac.h<br/>index b563d3c2993e..8840bc0b840b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sunbmac.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/sunbmac.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sunbmac.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sunbmac.h</a></div><div class='hunk'>@@ -329,8 +329,8 @@ struct bigmac {</div><div class='ctx'> 	unsigned int		timer_ticks;</div><div class='ctx'> </div><div class='ctx'> 	struct net_device_stats	enet_stats;</div><div class='del'>-	struct sbus_dev		*qec_sdev;</div><div class='del'>-	struct sbus_dev		*bigmac_sdev;</div><div class='add'>+	struct of_device	*qec_op;</div><div class='add'>+	struct of_device	*bigmac_op;</div><div class='ctx'> 	struct net_device	*dev;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/sundance.c b/drivers/net/sundance.c<br/>index 7d5561b8241c..f860ea150395 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sundance.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/sundance.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sundance.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sundance.c</a></div><div class='hunk'>@@ -409,6 +409,7 @@ static int  change_mtu(struct net_device *dev, int new_mtu);</div><div class='ctx'> static int  eeprom_read(void __iomem *ioaddr, int location);</div><div class='ctx'> static int  mdio_read(struct net_device *dev, int phy_id, int location);</div><div class='ctx'> static void mdio_write(struct net_device *dev, int phy_id, int location, int value);</div><div class='add'>+static int  mdio_wait_link(struct net_device *dev, int wait);</div><div class='ctx'> static int  netdev_open(struct net_device *dev);</div><div class='ctx'> static void check_duplex(struct net_device *dev);</div><div class='ctx'> static void netdev_timer(unsigned long data);</div><div class='hunk'>@@ -785,6 +786,24 @@ static void mdio_write(struct net_device *dev, int phy_id, int location, int val</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int mdio_wait_link(struct net_device *dev, int wait)</div><div class='add'>+{</div><div class='add'>+	int bmsr;</div><div class='add'>+	int phy_id;</div><div class='add'>+	struct netdev_private *np;</div><div class='add'>+</div><div class='add'>+	np = netdev_priv(dev);</div><div class='add'>+	phy_id = np-&gt;phys[0];</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		bmsr = mdio_read(dev, phy_id, MII_BMSR);</div><div class='add'>+		if (bmsr &amp; 0x0004)</div><div class='add'>+			return 0;</div><div class='add'>+		mdelay(1);</div><div class='add'>+	} while (--wait &gt; 0);</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int netdev_open(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct netdev_private *np = netdev_priv(dev);</div><div class='hunk'>@@ -1393,41 +1412,51 @@ static void netdev_error(struct net_device *dev, int intr_status)</div><div class='ctx'> 	int speed;</div><div class='ctx'> </div><div class='ctx'> 	if (intr_status &amp; LinkChange) {</div><div class='del'>-		if (np-&gt;an_enable) {</div><div class='del'>-			mii_advertise = mdio_read (dev, np-&gt;phys[0], MII_ADVERTISE);</div><div class='del'>-			mii_lpa= mdio_read (dev, np-&gt;phys[0], MII_LPA);</div><div class='del'>-			mii_advertise &amp;= mii_lpa;</div><div class='del'>-			printk (KERN_INFO "%s: Link changed: ", dev-&gt;name);</div><div class='del'>-			if (mii_advertise &amp; ADVERTISE_100FULL) {</div><div class='del'>-				np-&gt;speed = 100;</div><div class='del'>-				printk ("100Mbps, full duplex\n");</div><div class='del'>-			} else if (mii_advertise &amp; ADVERTISE_100HALF) {</div><div class='del'>-				np-&gt;speed = 100;</div><div class='del'>-				printk ("100Mbps, half duplex\n");</div><div class='del'>-			} else if (mii_advertise &amp; ADVERTISE_10FULL) {</div><div class='del'>-				np-&gt;speed = 10;</div><div class='del'>-				printk ("10Mbps, full duplex\n");</div><div class='del'>-			} else if (mii_advertise &amp; ADVERTISE_10HALF) {</div><div class='del'>-				np-&gt;speed = 10;</div><div class='del'>-				printk ("10Mbps, half duplex\n");</div><div class='del'>-			} else</div><div class='del'>-				printk ("\n");</div><div class='add'>+		if (mdio_wait_link(dev, 10) == 0) {</div><div class='add'>+			printk(KERN_INFO "%s: Link up\n", dev-&gt;name);</div><div class='add'>+			if (np-&gt;an_enable) {</div><div class='add'>+				mii_advertise = mdio_read(dev, np-&gt;phys[0],</div><div class='add'>+							   MII_ADVERTISE);</div><div class='add'>+				mii_lpa = mdio_read(dev, np-&gt;phys[0], MII_LPA);</div><div class='add'>+				mii_advertise &amp;= mii_lpa;</div><div class='add'>+				printk(KERN_INFO "%s: Link changed: ",</div><div class='add'>+					dev-&gt;name);</div><div class='add'>+				if (mii_advertise &amp; ADVERTISE_100FULL) {</div><div class='add'>+					np-&gt;speed = 100;</div><div class='add'>+					printk("100Mbps, full duplex\n");</div><div class='add'>+				} else if (mii_advertise &amp; ADVERTISE_100HALF) {</div><div class='add'>+					np-&gt;speed = 100;</div><div class='add'>+					printk("100Mbps, half duplex\n");</div><div class='add'>+				} else if (mii_advertise &amp; ADVERTISE_10FULL) {</div><div class='add'>+					np-&gt;speed = 10;</div><div class='add'>+					printk("10Mbps, full duplex\n");</div><div class='add'>+				} else if (mii_advertise &amp; ADVERTISE_10HALF) {</div><div class='add'>+					np-&gt;speed = 10;</div><div class='add'>+					printk("10Mbps, half duplex\n");</div><div class='add'>+				} else</div><div class='add'>+					printk("\n");</div><div class='ctx'> </div><div class='add'>+			} else {</div><div class='add'>+				mii_ctl = mdio_read(dev, np-&gt;phys[0], MII_BMCR);</div><div class='add'>+				speed = (mii_ctl &amp; BMCR_SPEED100) ? 100 : 10;</div><div class='add'>+				np-&gt;speed = speed;</div><div class='add'>+				printk(KERN_INFO "%s: Link changed: %dMbps ,",</div><div class='add'>+					dev-&gt;name, speed);</div><div class='add'>+				printk("%s duplex.\n",</div><div class='add'>+					(mii_ctl &amp; BMCR_FULLDPLX) ?</div><div class='add'>+						"full" : "half");</div><div class='add'>+			}</div><div class='add'>+			check_duplex(dev);</div><div class='add'>+			if (np-&gt;flowctrl &amp;&amp; np-&gt;mii_if.full_duplex) {</div><div class='add'>+				iowrite16(ioread16(ioaddr + MulticastFilter1+2) | 0x0200,</div><div class='add'>+					ioaddr + MulticastFilter1+2);</div><div class='add'>+				iowrite16(ioread16(ioaddr + MACCtrl0) | EnbFlowCtrl,</div><div class='add'>+					ioaddr + MACCtrl0);</div><div class='add'>+			}</div><div class='add'>+			netif_carrier_on(dev);</div><div class='ctx'> 		} else {</div><div class='del'>-			mii_ctl = mdio_read (dev, np-&gt;phys[0], MII_BMCR);</div><div class='del'>-			speed = (mii_ctl &amp; BMCR_SPEED100) ? 100 : 10;</div><div class='del'>-			np-&gt;speed = speed;</div><div class='del'>-			printk (KERN_INFO "%s: Link changed: %dMbps ,",</div><div class='del'>-				dev-&gt;name, speed);</div><div class='del'>-			printk ("%s duplex.\n", (mii_ctl &amp; BMCR_FULLDPLX) ?</div><div class='del'>-				"full" : "half");</div><div class='del'>-		}</div><div class='del'>-		check_duplex (dev);</div><div class='del'>-		if (np-&gt;flowctrl &amp;&amp; np-&gt;mii_if.full_duplex) {</div><div class='del'>-			iowrite16(ioread16(ioaddr + MulticastFilter1+2) | 0x0200,</div><div class='del'>-				ioaddr + MulticastFilter1+2);</div><div class='del'>-			iowrite16(ioread16(ioaddr + MACCtrl0) | EnbFlowCtrl,</div><div class='del'>-				ioaddr + MACCtrl0);</div><div class='add'>+			printk(KERN_INFO "%s: Link down\n", dev-&gt;name);</div><div class='add'>+			netif_carrier_off(dev);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	if (intr_status &amp; StatsMax) {</div><div class='head'>diff --git a/drivers/net/sunhme.c b/drivers/net/sunhme.c<br/>index b79d5f018f79..f1ebeb5f65b2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sunhme.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/sunhme.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sunhme.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sunhme.c</a></div><div class='hunk'>@@ -3,7 +3,7 @@</div><div class='ctx'>  *           "Happy Meal Ethernet" found on SunSwift SBUS cards.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 1996, 1998, 1999, 2002, 2003,</div><div class='del'>-		 2006 David S. Miller (davem@davemloft.net)</div><div class='add'>+ *		2006, 2008 David S. Miller (davem@davemloft.net)</div><div class='ctx'>  *</div><div class='ctx'>  * Changes :</div><div class='ctx'>  * 2000/11/11 Willy Tarreau &lt;willy AT meta-x.org&gt;</div><div class='hunk'>@@ -34,6 +34,7 @@</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='hunk'>@@ -41,8 +42,9 @@</div><div class='ctx'> #include &lt;asm/byteorder.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SPARC</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_device.h&gt;</div><div class='ctx'> #include &lt;asm/idprom.h&gt;</div><div class='del'>-#include &lt;asm/sbus.h&gt;</div><div class='ctx'> #include &lt;asm/openprom.h&gt;</div><div class='ctx'> #include &lt;asm/oplib.h&gt;</div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='hunk'>@@ -60,8 +62,8 @@</div><div class='ctx'> #include "sunhme.h"</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME	"sunhme"</div><div class='del'>-#define DRV_VERSION	"3.00"</div><div class='del'>-#define DRV_RELDATE	"June 23, 2006"</div><div class='add'>+#define DRV_VERSION	"3.10"</div><div class='add'>+#define DRV_RELDATE	"August 26, 2008"</div><div class='ctx'> #define DRV_AUTHOR	"David S. Miller (davem@davemloft.net)"</div><div class='ctx'> </div><div class='ctx'> static char version[] =</div><div class='hunk'>@@ -251,13 +253,13 @@ static u32 pci_hme_read_desc32(hme32 *p)</div><div class='ctx'> #define hme_read_desc32(__hp, __p) \</div><div class='ctx'> 	((__hp)-&gt;read_desc32(__p))</div><div class='ctx'> #define hme_dma_map(__hp, __ptr, __size, __dir) \</div><div class='del'>-	((__hp)-&gt;dma_map((__hp)-&gt;happy_dev, (__ptr), (__size), (__dir)))</div><div class='add'>+	((__hp)-&gt;dma_map((__hp)-&gt;dma_dev, (__ptr), (__size), (__dir)))</div><div class='ctx'> #define hme_dma_unmap(__hp, __addr, __size, __dir) \</div><div class='del'>-	((__hp)-&gt;dma_unmap((__hp)-&gt;happy_dev, (__addr), (__size), (__dir)))</div><div class='add'>+	((__hp)-&gt;dma_unmap((__hp)-&gt;dma_dev, (__addr), (__size), (__dir)))</div><div class='ctx'> #define hme_dma_sync_for_cpu(__hp, __addr, __size, __dir) \</div><div class='del'>-	((__hp)-&gt;dma_sync_for_cpu((__hp)-&gt;happy_dev, (__addr), (__size), (__dir)))</div><div class='add'>+	((__hp)-&gt;dma_sync_for_cpu((__hp)-&gt;dma_dev, (__addr), (__size), (__dir)))</div><div class='ctx'> #define hme_dma_sync_for_device(__hp, __addr, __size, __dir) \</div><div class='del'>-	((__hp)-&gt;dma_sync_for_device((__hp)-&gt;happy_dev, (__addr), (__size), (__dir)))</div><div class='add'>+	((__hp)-&gt;dma_sync_for_device((__hp)-&gt;dma_dev, (__addr), (__size), (__dir)))</div><div class='ctx'> #else</div><div class='ctx'> #ifdef CONFIG_SBUS</div><div class='ctx'> /* SBUS only compilation */</div><div class='hunk'>@@ -277,13 +279,13 @@ do {	(__txd)-&gt;tx_addr = (__force hme32)(u32)(__addr); \</div><div class='ctx'> } while(0)</div><div class='ctx'> #define hme_read_desc32(__hp, __p)	((__force u32)(hme32)*(__p))</div><div class='ctx'> #define hme_dma_map(__hp, __ptr, __size, __dir) \</div><div class='del'>-	sbus_map_single((__hp)-&gt;happy_dev, (__ptr), (__size), (__dir))</div><div class='add'>+	dma_map_single((__hp)-&gt;dma_dev, (__ptr), (__size), (__dir))</div><div class='ctx'> #define hme_dma_unmap(__hp, __addr, __size, __dir) \</div><div class='del'>-	sbus_unmap_single((__hp)-&gt;happy_dev, (__addr), (__size), (__dir))</div><div class='add'>+	dma_unmap_single((__hp)-&gt;dma_dev, (__addr), (__size), (__dir))</div><div class='ctx'> #define hme_dma_sync_for_cpu(__hp, __addr, __size, __dir) \</div><div class='del'>-	sbus_dma_sync_single_for_cpu((__hp)-&gt;happy_dev, (__addr), (__size), (__dir))</div><div class='add'>+	dma_dma_sync_single_for_cpu((__hp)-&gt;dma_dev, (__addr), (__size), (__dir))</div><div class='ctx'> #define hme_dma_sync_for_device(__hp, __addr, __size, __dir) \</div><div class='del'>-	sbus_dma_sync_single_for_device((__hp)-&gt;happy_dev, (__addr), (__size), (__dir))</div><div class='add'>+	dma_dma_sync_single_for_device((__hp)-&gt;dma_dev, (__addr), (__size), (__dir))</div><div class='ctx'> #else</div><div class='ctx'> /* PCI only compilation */</div><div class='ctx'> #define hme_write32(__hp, __reg, __val) \</div><div class='hunk'>@@ -305,36 +307,17 @@ static inline u32 hme_read_desc32(struct happy_meal *hp, hme32 *p)</div><div class='ctx'> 	return le32_to_cpup((__le32 *)p);</div><div class='ctx'> }</div><div class='ctx'> #define hme_dma_map(__hp, __ptr, __size, __dir) \</div><div class='del'>-	pci_map_single((__hp)-&gt;happy_dev, (__ptr), (__size), (__dir))</div><div class='add'>+	pci_map_single((__hp)-&gt;dma_dev, (__ptr), (__size), (__dir))</div><div class='ctx'> #define hme_dma_unmap(__hp, __addr, __size, __dir) \</div><div class='del'>-	pci_unmap_single((__hp)-&gt;happy_dev, (__addr), (__size), (__dir))</div><div class='add'>+	pci_unmap_single((__hp)-&gt;dma_dev, (__addr), (__size), (__dir))</div><div class='ctx'> #define hme_dma_sync_for_cpu(__hp, __addr, __size, __dir) \</div><div class='del'>-	pci_dma_sync_single_for_cpu((__hp)-&gt;happy_dev, (__addr), (__size), (__dir))</div><div class='add'>+	pci_dma_sync_single_for_cpu((__hp)-&gt;dma_dev, (__addr), (__size), (__dir))</div><div class='ctx'> #define hme_dma_sync_for_device(__hp, __addr, __size, __dir) \</div><div class='del'>-	pci_dma_sync_single_for_device((__hp)-&gt;happy_dev, (__addr), (__size), (__dir))</div><div class='add'>+	pci_dma_sync_single_for_device((__hp)-&gt;dma_dev, (__addr), (__size), (__dir))</div><div class='ctx'> #endif</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#ifdef SBUS_DMA_BIDIRECTIONAL</div><div class='del'>-#	define DMA_BIDIRECTIONAL	SBUS_DMA_BIDIRECTIONAL</div><div class='del'>-#else</div><div class='del'>-#	define DMA_BIDIRECTIONAL	0</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef SBUS_DMA_FROMDEVICE</div><div class='del'>-#	define DMA_FROMDEVICE		SBUS_DMA_FROMDEVICE</div><div class='del'>-#else</div><div class='del'>-#	define DMA_TODEVICE		1</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef SBUS_DMA_TODEVICE</div><div class='del'>-#	define DMA_TODEVICE		SBUS_DMA_TODEVICE</div><div class='del'>-#else</div><div class='del'>-#	define DMA_FROMDEVICE		2</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> /* Oh yes, the MIF BitBang is mighty fun to program.  BitBucket is more like it. */</div><div class='ctx'> static void BB_PUT_BIT(struct happy_meal *hp, void __iomem *tregs, int bit)</div><div class='ctx'> {</div><div class='hunk'>@@ -1224,7 +1207,8 @@ static void happy_meal_clean_rings(struct happy_meal *hp)</div><div class='ctx'> </div><div class='ctx'> 			rxd = &amp;hp-&gt;happy_block-&gt;happy_meal_rxd[i];</div><div class='ctx'> 			dma_addr = hme_read_desc32(hp, &amp;rxd-&gt;rx_addr);</div><div class='del'>-			hme_dma_unmap(hp, dma_addr, RX_BUF_ALLOC_SIZE, DMA_FROMDEVICE);</div><div class='add'>+			dma_unmap_single(hp-&gt;dma_dev, dma_addr,</div><div class='add'>+					 RX_BUF_ALLOC_SIZE, DMA_FROM_DEVICE);</div><div class='ctx'> 			dev_kfree_skb_any(skb);</div><div class='ctx'> 			hp-&gt;rx_skbs[i] = NULL;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1242,10 +1226,10 @@ static void happy_meal_clean_rings(struct happy_meal *hp)</div><div class='ctx'> 			for (frag = 0; frag &lt;= skb_shinfo(skb)-&gt;nr_frags; frag++) {</div><div class='ctx'> 				txd = &amp;hp-&gt;happy_block-&gt;happy_meal_txd[i];</div><div class='ctx'> 				dma_addr = hme_read_desc32(hp, &amp;txd-&gt;tx_addr);</div><div class='del'>-				hme_dma_unmap(hp, dma_addr,</div><div class='del'>-					      (hme_read_desc32(hp, &amp;txd-&gt;tx_flags)</div><div class='del'>-					       &amp; TXFLAG_SIZE),</div><div class='del'>-					      DMA_TODEVICE);</div><div class='add'>+				dma_unmap_single(hp-&gt;dma_dev, dma_addr,</div><div class='add'>+						 (hme_read_desc32(hp, &amp;txd-&gt;tx_flags)</div><div class='add'>+						  &amp; TXFLAG_SIZE),</div><div class='add'>+						 DMA_TO_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 				if (frag != skb_shinfo(skb)-&gt;nr_frags)</div><div class='ctx'> 					i++;</div><div class='hunk'>@@ -1287,7 +1271,8 @@ static void happy_meal_init_rings(struct happy_meal *hp)</div><div class='ctx'> 		skb_put(skb, (ETH_FRAME_LEN + RX_OFFSET + 4));</div><div class='ctx'> 		hme_write_rxd(hp, &amp;hb-&gt;happy_meal_rxd[i],</div><div class='ctx'> 			      (RXFLAG_OWN | ((RX_BUF_ALLOC_SIZE - RX_OFFSET) &lt;&lt; 16)),</div><div class='del'>-			      hme_dma_map(hp, skb-&gt;data, RX_BUF_ALLOC_SIZE, DMA_FROMDEVICE));</div><div class='add'>+			      dma_map_single(hp-&gt;dma_dev, skb-&gt;data, RX_BUF_ALLOC_SIZE,</div><div class='add'>+					     DMA_FROM_DEVICE));</div><div class='ctx'> 		skb_reserve(skb, RX_OFFSET);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1593,7 +1578,7 @@ static int happy_meal_init(struct happy_meal *hp)</div><div class='ctx'> 	if ((hp-&gt;happy_bursts &amp; DMA_BURST64) &amp;&amp;</div><div class='ctx'> 	    ((hp-&gt;happy_flags &amp; HFLAG_PCI) != 0</div><div class='ctx'> #ifdef CONFIG_SBUS</div><div class='del'>-	     || sbus_can_burst64(hp-&gt;happy_dev)</div><div class='add'>+	     || sbus_can_burst64()</div><div class='ctx'> #endif</div><div class='ctx'> 	     || 0)) {</div><div class='ctx'> 		u32 gcfg = GREG_CFG_BURST64;</div><div class='hunk'>@@ -1603,11 +1588,13 @@ static int happy_meal_init(struct happy_meal *hp)</div><div class='ctx'> 		 * do not.  -DaveM</div><div class='ctx'> 		 */</div><div class='ctx'> #ifdef CONFIG_SBUS</div><div class='del'>-		if ((hp-&gt;happy_flags &amp; HFLAG_PCI) == 0 &amp;&amp;</div><div class='del'>-		    sbus_can_dma_64bit(hp-&gt;happy_dev)) {</div><div class='del'>-			sbus_set_sbus64(hp-&gt;happy_dev,</div><div class='del'>-					hp-&gt;happy_bursts);</div><div class='del'>-			gcfg |= GREG_CFG_64BIT;</div><div class='add'>+		if ((hp-&gt;happy_flags &amp; HFLAG_PCI) == 0) {</div><div class='add'>+			struct of_device *op = hp-&gt;happy_dev;</div><div class='add'>+			if (sbus_can_dma_64bit()) {</div><div class='add'>+				sbus_set_sbus64(&amp;op-&gt;dev,</div><div class='add'>+						hp-&gt;happy_bursts);</div><div class='add'>+				gcfg |= GREG_CFG_64BIT;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -1966,7 +1953,7 @@ static void happy_meal_tx(struct happy_meal *hp)</div><div class='ctx'> 			dma_len = hme_read_desc32(hp, &amp;this-&gt;tx_flags);</div><div class='ctx'> </div><div class='ctx'> 			dma_len &amp;= TXFLAG_SIZE;</div><div class='del'>-			hme_dma_unmap(hp, dma_addr, dma_len, DMA_TODEVICE);</div><div class='add'>+			dma_unmap_single(hp-&gt;dma_dev, dma_addr, dma_len, DMA_TO_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 			elem = NEXT_TX(elem);</div><div class='ctx'> 			this = &amp;txbase[elem];</div><div class='hunk'>@@ -2044,13 +2031,14 @@ static void happy_meal_rx(struct happy_meal *hp, struct net_device *dev)</div><div class='ctx'> 				drops++;</div><div class='ctx'> 				goto drop_it;</div><div class='ctx'> 			}</div><div class='del'>-			hme_dma_unmap(hp, dma_addr, RX_BUF_ALLOC_SIZE, DMA_FROMDEVICE);</div><div class='add'>+			dma_unmap_single(hp-&gt;dma_dev, dma_addr, RX_BUF_ALLOC_SIZE, DMA_FROM_DEVICE);</div><div class='ctx'> 			hp-&gt;rx_skbs[elem] = new_skb;</div><div class='ctx'> 			new_skb-&gt;dev = dev;</div><div class='ctx'> 			skb_put(new_skb, (ETH_FRAME_LEN + RX_OFFSET + 4));</div><div class='ctx'> 			hme_write_rxd(hp, this,</div><div class='ctx'> 				      (RXFLAG_OWN|((RX_BUF_ALLOC_SIZE-RX_OFFSET)&lt;&lt;16)),</div><div class='del'>-				      hme_dma_map(hp, new_skb-&gt;data, RX_BUF_ALLOC_SIZE, DMA_FROMDEVICE));</div><div class='add'>+				      dma_map_single(hp-&gt;dma_dev, new_skb-&gt;data, RX_BUF_ALLOC_SIZE,</div><div class='add'>+						     DMA_FROM_DEVICE));</div><div class='ctx'> 			skb_reserve(new_skb, RX_OFFSET);</div><div class='ctx'> </div><div class='ctx'> 			/* Trim the original skb for the netif. */</div><div class='hunk'>@@ -2065,10 +2053,9 @@ static void happy_meal_rx(struct happy_meal *hp, struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 			skb_reserve(copy_skb, 2);</div><div class='ctx'> 			skb_put(copy_skb, len);</div><div class='del'>-			hme_dma_sync_for_cpu(hp, dma_addr, len, DMA_FROMDEVICE);</div><div class='add'>+			dma_sync_single_for_cpu(hp-&gt;dma_dev, dma_addr, len, DMA_FROM_DEVICE);</div><div class='ctx'> 			skb_copy_from_linear_data(skb, copy_skb-&gt;data, len);</div><div class='del'>-			hme_dma_sync_for_device(hp, dma_addr, len, DMA_FROMDEVICE);</div><div class='del'>-</div><div class='add'>+			dma_sync_single_for_device(hp-&gt;dma_dev, dma_addr, len, DMA_FROM_DEVICE);</div><div class='ctx'> 			/* Reuse original ring buffer. */</div><div class='ctx'> 			hme_write_rxd(hp, this,</div><div class='ctx'> 				      (RXFLAG_OWN|((RX_BUF_ALLOC_SIZE-RX_OFFSET)&lt;&lt;16)),</div><div class='hunk'>@@ -2300,7 +2287,7 @@ static int happy_meal_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 		u32 mapping, len;</div><div class='ctx'> </div><div class='ctx'> 		len = skb-&gt;len;</div><div class='del'>-		mapping = hme_dma_map(hp, skb-&gt;data, len, DMA_TODEVICE);</div><div class='add'>+		mapping = dma_map_single(hp-&gt;dma_dev, skb-&gt;data, len, DMA_TO_DEVICE);</div><div class='ctx'> 		tx_flags |= (TXFLAG_SOP | TXFLAG_EOP);</div><div class='ctx'> 		hme_write_txd(hp, &amp;hp-&gt;happy_block-&gt;happy_meal_txd[entry],</div><div class='ctx'> 			      (tx_flags | (len &amp; TXFLAG_SIZE)),</div><div class='hunk'>@@ -2314,7 +2301,8 @@ static int happy_meal_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 		 * Otherwise we could race with the device.</div><div class='ctx'> 		 */</div><div class='ctx'> 		first_len = skb_headlen(skb);</div><div class='del'>-		first_mapping = hme_dma_map(hp, skb-&gt;data, first_len, DMA_TODEVICE);</div><div class='add'>+		first_mapping = dma_map_single(hp-&gt;dma_dev, skb-&gt;data, first_len,</div><div class='add'>+					       DMA_TO_DEVICE);</div><div class='ctx'> 		entry = NEXT_TX(entry);</div><div class='ctx'> </div><div class='ctx'> 		for (frag = 0; frag &lt; skb_shinfo(skb)-&gt;nr_frags; frag++) {</div><div class='hunk'>@@ -2322,10 +2310,9 @@ static int happy_meal_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 			u32 len, mapping, this_txflags;</div><div class='ctx'> </div><div class='ctx'> 			len = this_frag-&gt;size;</div><div class='del'>-			mapping = hme_dma_map(hp,</div><div class='del'>-					      ((void *) page_address(this_frag-&gt;page) +</div><div class='del'>-					       this_frag-&gt;page_offset),</div><div class='del'>-					      len, DMA_TODEVICE);</div><div class='add'>+			mapping = dma_map_page(hp-&gt;dma_dev, this_frag-&gt;page,</div><div class='add'>+					       this_frag-&gt;page_offset, len,</div><div class='add'>+					       DMA_TO_DEVICE);</div><div class='ctx'> 			this_txflags = tx_flags;</div><div class='ctx'> 			if (frag == skb_shinfo(skb)-&gt;nr_frags - 1)</div><div class='ctx'> 				this_txflags |= TXFLAG_EOP;</div><div class='hunk'>@@ -2493,9 +2480,12 @@ static void hme_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info</div><div class='ctx'> 	}</div><div class='ctx'> #ifdef CONFIG_SBUS</div><div class='ctx'> 	else {</div><div class='del'>-		struct sbus_dev *sdev = hp-&gt;happy_dev;</div><div class='del'>-		sprintf(info-&gt;bus_info, "SBUS:%d",</div><div class='del'>-			sdev-&gt;slot);</div><div class='add'>+		const struct linux_prom_registers *regs;</div><div class='add'>+		struct of_device *op = hp-&gt;happy_dev;</div><div class='add'>+		regs = of_get_property(op-&gt;node, "regs", NULL);</div><div class='add'>+		if (regs)</div><div class='add'>+			sprintf(info-&gt;bus_info, "SBUS:%d",</div><div class='add'>+				regs-&gt;which_io);</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='hunk'>@@ -2521,63 +2511,21 @@ static const struct ethtool_ops hme_ethtool_ops = {</div><div class='ctx'> static int hme_version_printed;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SBUS</div><div class='del'>-void __devinit quattro_get_ranges(struct quattro *qp)</div><div class='del'>-{</div><div class='del'>-	struct sbus_dev *sdev = qp-&gt;quattro_dev;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = prom_getproperty(sdev-&gt;prom_node,</div><div class='del'>-			       "ranges",</div><div class='del'>-			       (char *)&amp;qp-&gt;ranges[0],</div><div class='del'>-			       sizeof(qp-&gt;ranges));</div><div class='del'>-	if (err == 0 || err == -1) {</div><div class='del'>-		qp-&gt;nranges = 0;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	qp-&gt;nranges = (err / sizeof(struct linux_prom_ranges));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __devinit quattro_apply_ranges(struct quattro *qp, struct happy_meal *hp)</div><div class='del'>-{</div><div class='del'>-	struct sbus_dev *sdev = hp-&gt;happy_dev;</div><div class='del'>-	int rng;</div><div class='del'>-</div><div class='del'>-	for (rng = 0; rng &lt; qp-&gt;nranges; rng++) {</div><div class='del'>-		struct linux_prom_ranges *rngp = &amp;qp-&gt;ranges[rng];</div><div class='del'>-		int reg;</div><div class='del'>-</div><div class='del'>-		for (reg = 0; reg &lt; 5; reg++) {</div><div class='del'>-			if (sdev-&gt;reg_addrs[reg].which_io ==</div><div class='del'>-			    rngp-&gt;ot_child_space)</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-		if (reg == 5)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		sdev-&gt;reg_addrs[reg].which_io = rngp-&gt;ot_parent_space;</div><div class='del'>-		sdev-&gt;reg_addrs[reg].phys_addr += rngp-&gt;ot_parent_base;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* Given a happy meal sbus device, find it's quattro parent.</div><div class='ctx'>  * If none exist, allocate and return a new one.</div><div class='ctx'>  *</div><div class='ctx'>  * Return NULL on failure.</div><div class='ctx'>  */</div><div class='del'>-static struct quattro * __devinit quattro_sbus_find(struct sbus_dev *goal_sdev)</div><div class='add'>+static struct quattro * __devinit quattro_sbus_find(struct of_device *child)</div><div class='ctx'> {</div><div class='del'>-	struct sbus_dev *sdev;</div><div class='add'>+	struct device *parent = child-&gt;dev.parent;</div><div class='add'>+	struct of_device *op;</div><div class='ctx'> 	struct quattro *qp;</div><div class='del'>-	int i;</div><div class='ctx'> </div><div class='del'>-	for (qp = qfe_sbus_list; qp != NULL; qp = qp-&gt;next) {</div><div class='del'>-		for (i = 0, sdev = qp-&gt;quattro_dev;</div><div class='del'>-		     (sdev != NULL) &amp;&amp; (i &lt; 4);</div><div class='del'>-		     sdev = sdev-&gt;next, i++) {</div><div class='del'>-			if (sdev == goal_sdev)</div><div class='del'>-				return qp;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	op = to_of_device(parent);</div><div class='add'>+	qp = dev_get_drvdata(&amp;op-&gt;dev);</div><div class='add'>+	if (qp)</div><div class='add'>+		return qp;</div><div class='ctx'> </div><div class='ctx'> 	qp = kmalloc(sizeof(struct quattro), GFP_KERNEL);</div><div class='ctx'> 	if (qp != NULL) {</div><div class='hunk'>@@ -2586,10 +2534,11 @@ static struct quattro * __devinit quattro_sbus_find(struct sbus_dev *goal_sdev)</div><div class='ctx'> 		for (i = 0; i &lt; 4; i++)</div><div class='ctx'> 			qp-&gt;happy_meals[i] = NULL;</div><div class='ctx'> </div><div class='del'>-		qp-&gt;quattro_dev = goal_sdev;</div><div class='add'>+		qp-&gt;quattro_dev = child;</div><div class='ctx'> 		qp-&gt;next = qfe_sbus_list;</div><div class='ctx'> 		qfe_sbus_list = qp;</div><div class='del'>-		quattro_get_ranges(qp);</div><div class='add'>+</div><div class='add'>+		dev_set_drvdata(&amp;op-&gt;dev, qp);</div><div class='ctx'> 	}</div><div class='ctx'> 	return qp;</div><div class='ctx'> }</div><div class='hunk'>@@ -2602,10 +2551,10 @@ static void __init quattro_sbus_register_irqs(void)</div><div class='ctx'> 	struct quattro *qp;</div><div class='ctx'> </div><div class='ctx'> 	for (qp = qfe_sbus_list; qp != NULL; qp = qp-&gt;next) {</div><div class='del'>-		struct sbus_dev *sdev = qp-&gt;quattro_dev;</div><div class='add'>+		struct of_device *op = qp-&gt;quattro_dev;</div><div class='ctx'> 		int err;</div><div class='ctx'> </div><div class='del'>-		err = request_irq(sdev-&gt;irqs[0],</div><div class='add'>+		err = request_irq(op-&gt;irqs[0],</div><div class='ctx'> 				  quattro_sbus_interrupt,</div><div class='ctx'> 				  IRQF_SHARED, "Quattro",</div><div class='ctx'> 				  qp);</div><div class='hunk'>@@ -2621,9 +2570,9 @@ static void quattro_sbus_free_irqs(void)</div><div class='ctx'> 	struct quattro *qp;</div><div class='ctx'> </div><div class='ctx'> 	for (qp = qfe_sbus_list; qp != NULL; qp = qp-&gt;next) {</div><div class='del'>-		struct sbus_dev *sdev = qp-&gt;quattro_dev;</div><div class='add'>+		struct of_device *op = qp-&gt;quattro_dev;</div><div class='ctx'> </div><div class='del'>-		free_irq(sdev-&gt;irqs[0], qp);</div><div class='add'>+		free_irq(op-&gt;irqs[0], qp);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_SBUS */</div><div class='hunk'>@@ -2660,9 +2609,9 @@ static struct quattro * __devinit quattro_pci_find(struct pci_dev *pdev)</div><div class='ctx'> #endif /* CONFIG_PCI */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SBUS</div><div class='del'>-static int __devinit happy_meal_sbus_probe_one(struct sbus_dev *sdev, int is_qfe)</div><div class='add'>+static int __devinit happy_meal_sbus_probe_one(struct of_device *op, int is_qfe)</div><div class='ctx'> {</div><div class='del'>-	struct device_node *dp = sdev-&gt;ofdev.node;</div><div class='add'>+	struct device_node *dp = op-&gt;node, *sbus_dp;</div><div class='ctx'> 	struct quattro *qp = NULL;</div><div class='ctx'> 	struct happy_meal *hp;</div><div class='ctx'> 	struct net_device *dev;</div><div class='hunk'>@@ -2671,7 +2620,7 @@ static int __devinit happy_meal_sbus_probe_one(struct sbus_dev *sdev, int is_qfe</div><div class='ctx'> 	DECLARE_MAC_BUF(mac);</div><div class='ctx'> </div><div class='ctx'> 	if (is_qfe) {</div><div class='del'>-		qp = quattro_sbus_find(sdev);</div><div class='add'>+		qp = quattro_sbus_find(op);</div><div class='ctx'> 		if (qp == NULL)</div><div class='ctx'> 			goto err_out;</div><div class='ctx'> 		for (qfe_slot = 0; qfe_slot &lt; 4; qfe_slot++)</div><div class='hunk'>@@ -2685,7 +2634,7 @@ static int __devinit happy_meal_sbus_probe_one(struct sbus_dev *sdev, int is_qfe</div><div class='ctx'> 	dev = alloc_etherdev(sizeof(struct happy_meal));</div><div class='ctx'> 	if (!dev)</div><div class='ctx'> 		goto err_out;</div><div class='del'>-	SET_NETDEV_DEV(dev, &amp;sdev-&gt;ofdev.dev);</div><div class='add'>+	SET_NETDEV_DEV(dev, &amp;op-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	if (hme_version_printed++ == 0)</div><div class='ctx'> 		printk(KERN_INFO "%s", version);</div><div class='hunk'>@@ -2713,56 +2662,50 @@ static int __devinit happy_meal_sbus_probe_one(struct sbus_dev *sdev, int is_qfe</div><div class='ctx'> 			memcpy(dev-&gt;dev_addr, idprom-&gt;id_ethaddr, 6);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	hp = dev-&gt;priv;</div><div class='add'>+	hp = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	hp-&gt;happy_dev = sdev;</div><div class='add'>+	hp-&gt;happy_dev = op;</div><div class='add'>+	hp-&gt;dma_dev = &amp;op-&gt;dev;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;hp-&gt;happy_lock);</div><div class='ctx'> </div><div class='ctx'> 	err = -ENODEV;</div><div class='del'>-	if (sdev-&gt;num_registers != 5) {</div><div class='del'>-		printk(KERN_ERR "happymeal: Device needs 5 regs, has %d.\n",</div><div class='del'>-		       sdev-&gt;num_registers);</div><div class='del'>-		goto err_out_free_netdev;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if (qp != NULL) {</div><div class='ctx'> 		hp-&gt;qfe_parent = qp;</div><div class='ctx'> 		hp-&gt;qfe_ent = qfe_slot;</div><div class='ctx'> 		qp-&gt;happy_meals[qfe_slot] = dev;</div><div class='del'>-		quattro_apply_ranges(qp, hp);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	hp-&gt;gregs = sbus_ioremap(&amp;sdev-&gt;resource[0], 0,</div><div class='del'>-				 GREG_REG_SIZE, "HME Global Regs");</div><div class='add'>+	hp-&gt;gregs = of_ioremap(&amp;op-&gt;resource[0], 0,</div><div class='add'>+			       GREG_REG_SIZE, "HME Global Regs");</div><div class='ctx'> 	if (!hp-&gt;gregs) {</div><div class='ctx'> 		printk(KERN_ERR "happymeal: Cannot map global registers.\n");</div><div class='ctx'> 		goto err_out_free_netdev;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	hp-&gt;etxregs = sbus_ioremap(&amp;sdev-&gt;resource[1], 0,</div><div class='del'>-				   ETX_REG_SIZE, "HME TX Regs");</div><div class='add'>+	hp-&gt;etxregs = of_ioremap(&amp;op-&gt;resource[1], 0,</div><div class='add'>+				 ETX_REG_SIZE, "HME TX Regs");</div><div class='ctx'> 	if (!hp-&gt;etxregs) {</div><div class='ctx'> 		printk(KERN_ERR "happymeal: Cannot map MAC TX registers.\n");</div><div class='ctx'> 		goto err_out_iounmap;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	hp-&gt;erxregs = sbus_ioremap(&amp;sdev-&gt;resource[2], 0,</div><div class='del'>-				   ERX_REG_SIZE, "HME RX Regs");</div><div class='add'>+	hp-&gt;erxregs = of_ioremap(&amp;op-&gt;resource[2], 0,</div><div class='add'>+				 ERX_REG_SIZE, "HME RX Regs");</div><div class='ctx'> 	if (!hp-&gt;erxregs) {</div><div class='ctx'> 		printk(KERN_ERR "happymeal: Cannot map MAC RX registers.\n");</div><div class='ctx'> 		goto err_out_iounmap;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	hp-&gt;bigmacregs = sbus_ioremap(&amp;sdev-&gt;resource[3], 0,</div><div class='del'>-				      BMAC_REG_SIZE, "HME BIGMAC Regs");</div><div class='add'>+	hp-&gt;bigmacregs = of_ioremap(&amp;op-&gt;resource[3], 0,</div><div class='add'>+				    BMAC_REG_SIZE, "HME BIGMAC Regs");</div><div class='ctx'> 	if (!hp-&gt;bigmacregs) {</div><div class='ctx'> 		printk(KERN_ERR "happymeal: Cannot map BIGMAC registers.\n");</div><div class='ctx'> 		goto err_out_iounmap;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	hp-&gt;tcvregs = sbus_ioremap(&amp;sdev-&gt;resource[4], 0,</div><div class='del'>-				   TCVR_REG_SIZE, "HME Tranceiver Regs");</div><div class='add'>+	hp-&gt;tcvregs = of_ioremap(&amp;op-&gt;resource[4], 0,</div><div class='add'>+				 TCVR_REG_SIZE, "HME Tranceiver Regs");</div><div class='ctx'> 	if (!hp-&gt;tcvregs) {</div><div class='ctx'> 		printk(KERN_ERR "happymeal: Cannot map TCVR registers.\n");</div><div class='ctx'> 		goto err_out_iounmap;</div><div class='hunk'>@@ -2781,13 +2724,18 @@ static int __devinit happy_meal_sbus_probe_one(struct sbus_dev *sdev, int is_qfe</div><div class='ctx'> 	if (qp != NULL)</div><div class='ctx'> 		hp-&gt;happy_flags |= HFLAG_QUATTRO;</div><div class='ctx'> </div><div class='add'>+	sbus_dp = to_of_device(op-&gt;dev.parent)-&gt;node;</div><div class='add'>+	if (is_qfe)</div><div class='add'>+		sbus_dp = to_of_device(op-&gt;dev.parent-&gt;parent)-&gt;node;</div><div class='add'>+</div><div class='ctx'> 	/* Get the supported DVMA burst sizes from our Happy SBUS. */</div><div class='del'>-	hp-&gt;happy_bursts = of_getintprop_default(sdev-&gt;bus-&gt;ofdev.node,</div><div class='add'>+	hp-&gt;happy_bursts = of_getintprop_default(sbus_dp,</div><div class='ctx'> 						 "burst-sizes", 0x00);</div><div class='ctx'> </div><div class='del'>-	hp-&gt;happy_block = sbus_alloc_consistent(hp-&gt;happy_dev,</div><div class='del'>-						PAGE_SIZE,</div><div class='del'>-						&amp;hp-&gt;hblock_dvma);</div><div class='add'>+	hp-&gt;happy_block = dma_alloc_coherent(hp-&gt;dma_dev,</div><div class='add'>+					     PAGE_SIZE,</div><div class='add'>+					     &amp;hp-&gt;hblock_dvma,</div><div class='add'>+					     GFP_ATOMIC);</div><div class='ctx'> 	err = -ENOMEM;</div><div class='ctx'> 	if (!hp-&gt;happy_block) {</div><div class='ctx'> 		printk(KERN_ERR "happymeal: Cannot allocate descriptors.\n");</div><div class='hunk'>@@ -2816,19 +2764,13 @@ static int __devinit happy_meal_sbus_probe_one(struct sbus_dev *sdev, int is_qfe</div><div class='ctx'> 	/* Happy Meal can do it all... */</div><div class='ctx'> 	dev-&gt;features |= NETIF_F_SG | NETIF_F_HW_CSUM;</div><div class='ctx'> </div><div class='del'>-	dev-&gt;irq = sdev-&gt;irqs[0];</div><div class='add'>+	dev-&gt;irq = op-&gt;irqs[0];</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_SBUS) &amp;&amp; defined(CONFIG_PCI)</div><div class='del'>-	/* Hook up PCI register/dma accessors. */</div><div class='add'>+	/* Hook up SBUS register/descriptor accessors. */</div><div class='ctx'> 	hp-&gt;read_desc32 = sbus_hme_read_desc32;</div><div class='ctx'> 	hp-&gt;write_txd = sbus_hme_write_txd;</div><div class='ctx'> 	hp-&gt;write_rxd = sbus_hme_write_rxd;</div><div class='del'>-	hp-&gt;dma_map = (u32 (*)(void *, void *, long, int))sbus_map_single;</div><div class='del'>-	hp-&gt;dma_unmap = (void (*)(void *, u32, long, int))sbus_unmap_single;</div><div class='del'>-	hp-&gt;dma_sync_for_cpu = (void (*)(void *, u32, long, int))</div><div class='del'>-		sbus_dma_sync_single_for_cpu;</div><div class='del'>-	hp-&gt;dma_sync_for_device = (void (*)(void *, u32, long, int))</div><div class='del'>-		sbus_dma_sync_single_for_device;</div><div class='ctx'> 	hp-&gt;read32 = sbus_hme_read32;</div><div class='ctx'> 	hp-&gt;write32 = sbus_hme_write32;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -2843,10 +2785,10 @@ static int __devinit happy_meal_sbus_probe_one(struct sbus_dev *sdev, int is_qfe</div><div class='ctx'> 	if (register_netdev(hp-&gt;dev)) {</div><div class='ctx'> 		printk(KERN_ERR "happymeal: Cannot register net device, "</div><div class='ctx'> 		       "aborting.\n");</div><div class='del'>-		goto err_out_free_consistent;</div><div class='add'>+		goto err_out_free_coherent;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dev_set_drvdata(&amp;sdev-&gt;ofdev.dev, hp);</div><div class='add'>+	dev_set_drvdata(&amp;op-&gt;dev, hp);</div><div class='ctx'> </div><div class='ctx'> 	if (qfe_slot != -1)</div><div class='ctx'> 		printk(KERN_INFO "%s: Quattro HME slot %d (SBUS) 10/100baseT Ethernet ",</div><div class='hunk'>@@ -2859,23 +2801,23 @@ static int __devinit happy_meal_sbus_probe_one(struct sbus_dev *sdev, int is_qfe</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>-err_out_free_consistent:</div><div class='del'>-	sbus_free_consistent(hp-&gt;happy_dev,</div><div class='del'>-			     PAGE_SIZE,</div><div class='del'>-			     hp-&gt;happy_block,</div><div class='del'>-			     hp-&gt;hblock_dvma);</div><div class='add'>+err_out_free_coherent:</div><div class='add'>+	dma_free_coherent(hp-&gt;dma_dev,</div><div class='add'>+			  PAGE_SIZE,</div><div class='add'>+			  hp-&gt;happy_block,</div><div class='add'>+			  hp-&gt;hblock_dvma);</div><div class='ctx'> </div><div class='ctx'> err_out_iounmap:</div><div class='ctx'> 	if (hp-&gt;gregs)</div><div class='del'>-		sbus_iounmap(hp-&gt;gregs, GREG_REG_SIZE);</div><div class='add'>+		of_iounmap(&amp;op-&gt;resource[0], hp-&gt;gregs, GREG_REG_SIZE);</div><div class='ctx'> 	if (hp-&gt;etxregs)</div><div class='del'>-		sbus_iounmap(hp-&gt;etxregs, ETX_REG_SIZE);</div><div class='add'>+		of_iounmap(&amp;op-&gt;resource[1], hp-&gt;etxregs, ETX_REG_SIZE);</div><div class='ctx'> 	if (hp-&gt;erxregs)</div><div class='del'>-		sbus_iounmap(hp-&gt;erxregs, ERX_REG_SIZE);</div><div class='add'>+		of_iounmap(&amp;op-&gt;resource[2], hp-&gt;erxregs, ERX_REG_SIZE);</div><div class='ctx'> 	if (hp-&gt;bigmacregs)</div><div class='del'>-		sbus_iounmap(hp-&gt;bigmacregs, BMAC_REG_SIZE);</div><div class='add'>+		of_iounmap(&amp;op-&gt;resource[3], hp-&gt;bigmacregs, BMAC_REG_SIZE);</div><div class='ctx'> 	if (hp-&gt;tcvregs)</div><div class='del'>-		sbus_iounmap(hp-&gt;tcvregs, TCVR_REG_SIZE);</div><div class='add'>+		of_iounmap(&amp;op-&gt;resource[4], hp-&gt;tcvregs, TCVR_REG_SIZE);</div><div class='ctx'> </div><div class='ctx'> err_out_free_netdev:</div><div class='ctx'> 	free_netdev(dev);</div><div class='hunk'>@@ -3035,6 +2977,7 @@ static int __devinit happy_meal_pci_probe(struct pci_dev *pdev,</div><div class='ctx'> 	memset(hp, 0, sizeof(*hp));</div><div class='ctx'> </div><div class='ctx'> 	hp-&gt;happy_dev = pdev;</div><div class='add'>+	hp-&gt;dma_dev = &amp;pdev-&gt;dev;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;hp-&gt;happy_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -3121,7 +3064,7 @@ static int __devinit happy_meal_pci_probe(struct pci_dev *pdev,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	hp-&gt;happy_block = (struct hmeal_init_block *)</div><div class='del'>-		pci_alloc_consistent(pdev, PAGE_SIZE, &amp;hp-&gt;hblock_dvma);</div><div class='add'>+		dma_alloc_coherent(&amp;pdev-&gt;dev, PAGE_SIZE, &amp;hp-&gt;hblock_dvma, GFP_KERNEL);</div><div class='ctx'> </div><div class='ctx'> 	err = -ENODEV;</div><div class='ctx'> 	if (!hp-&gt;happy_block) {</div><div class='hunk'>@@ -3151,16 +3094,10 @@ static int __devinit happy_meal_pci_probe(struct pci_dev *pdev,</div><div class='ctx'> 	dev-&gt;features |= NETIF_F_SG | NETIF_F_HW_CSUM;</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_SBUS) &amp;&amp; defined(CONFIG_PCI)</div><div class='del'>-	/* Hook up PCI register/dma accessors. */</div><div class='add'>+	/* Hook up PCI register/descriptor accessors. */</div><div class='ctx'> 	hp-&gt;read_desc32 = pci_hme_read_desc32;</div><div class='ctx'> 	hp-&gt;write_txd = pci_hme_write_txd;</div><div class='ctx'> 	hp-&gt;write_rxd = pci_hme_write_rxd;</div><div class='del'>-	hp-&gt;dma_map = (u32 (*)(void *, void *, long, int))pci_map_single;</div><div class='del'>-	hp-&gt;dma_unmap = (void (*)(void *, u32, long, int))pci_unmap_single;</div><div class='del'>-	hp-&gt;dma_sync_for_cpu = (void (*)(void *, u32, long, int))</div><div class='del'>-		pci_dma_sync_single_for_cpu;</div><div class='del'>-	hp-&gt;dma_sync_for_device = (void (*)(void *, u32, long, int))</div><div class='del'>-		pci_dma_sync_single_for_device;</div><div class='ctx'> 	hp-&gt;read32 = pci_hme_read32;</div><div class='ctx'> 	hp-&gt;write32 = pci_hme_write32;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -3231,10 +3168,8 @@ static void __devexit happy_meal_pci_remove(struct pci_dev *pdev)</div><div class='ctx'> </div><div class='ctx'> 	unregister_netdev(net_dev);</div><div class='ctx'> </div><div class='del'>-	pci_free_consistent(hp-&gt;happy_dev,</div><div class='del'>-			    PAGE_SIZE,</div><div class='del'>-			    hp-&gt;happy_block,</div><div class='del'>-			    hp-&gt;hblock_dvma);</div><div class='add'>+	dma_free_coherent(hp-&gt;dma_dev, PAGE_SIZE,</div><div class='add'>+			  hp-&gt;happy_block, hp-&gt;hblock_dvma);</div><div class='ctx'> 	iounmap(hp-&gt;gregs);</div><div class='ctx'> 	pci_release_regions(hp-&gt;happy_dev);</div><div class='ctx'> </div><div class='hunk'>@@ -3279,46 +3214,45 @@ static void happy_meal_pci_exit(void)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SBUS</div><div class='del'>-static int __devinit hme_sbus_probe(struct of_device *dev, const struct of_device_id *match)</div><div class='add'>+static int __devinit hme_sbus_probe(struct of_device *op, const struct of_device_id *match)</div><div class='ctx'> {</div><div class='del'>-	struct sbus_dev *sdev = to_sbus_device(&amp;dev-&gt;dev);</div><div class='del'>-	struct device_node *dp = dev-&gt;node;</div><div class='add'>+	struct device_node *dp = op-&gt;node;</div><div class='ctx'> 	const char *model = of_get_property(dp, "model", NULL);</div><div class='ctx'> 	int is_qfe = (match-&gt;data != NULL);</div><div class='ctx'> </div><div class='ctx'> 	if (!is_qfe &amp;&amp; model &amp;&amp; !strcmp(model, "SUNW,sbus-qfe"))</div><div class='ctx'> 		is_qfe = 1;</div><div class='ctx'> </div><div class='del'>-	return happy_meal_sbus_probe_one(sdev, is_qfe);</div><div class='add'>+	return happy_meal_sbus_probe_one(op, is_qfe);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devexit hme_sbus_remove(struct of_device *dev)</div><div class='add'>+static int __devexit hme_sbus_remove(struct of_device *op)</div><div class='ctx'> {</div><div class='del'>-	struct happy_meal *hp = dev_get_drvdata(&amp;dev-&gt;dev);</div><div class='add'>+	struct happy_meal *hp = dev_get_drvdata(&amp;op-&gt;dev);</div><div class='ctx'> 	struct net_device *net_dev = hp-&gt;dev;</div><div class='ctx'> </div><div class='ctx'> 	unregister_netdev(net_dev);</div><div class='ctx'> </div><div class='ctx'> 	/* XXX qfe parent interrupt... */</div><div class='ctx'> </div><div class='del'>-	sbus_iounmap(hp-&gt;gregs, GREG_REG_SIZE);</div><div class='del'>-	sbus_iounmap(hp-&gt;etxregs, ETX_REG_SIZE);</div><div class='del'>-	sbus_iounmap(hp-&gt;erxregs, ERX_REG_SIZE);</div><div class='del'>-	sbus_iounmap(hp-&gt;bigmacregs, BMAC_REG_SIZE);</div><div class='del'>-	sbus_iounmap(hp-&gt;tcvregs, TCVR_REG_SIZE);</div><div class='del'>-	sbus_free_consistent(hp-&gt;happy_dev,</div><div class='del'>-			     PAGE_SIZE,</div><div class='del'>-			     hp-&gt;happy_block,</div><div class='del'>-			     hp-&gt;hblock_dvma);</div><div class='add'>+	of_iounmap(&amp;op-&gt;resource[0], hp-&gt;gregs, GREG_REG_SIZE);</div><div class='add'>+	of_iounmap(&amp;op-&gt;resource[1], hp-&gt;etxregs, ETX_REG_SIZE);</div><div class='add'>+	of_iounmap(&amp;op-&gt;resource[2], hp-&gt;erxregs, ERX_REG_SIZE);</div><div class='add'>+	of_iounmap(&amp;op-&gt;resource[3], hp-&gt;bigmacregs, BMAC_REG_SIZE);</div><div class='add'>+	of_iounmap(&amp;op-&gt;resource[4], hp-&gt;tcvregs, TCVR_REG_SIZE);</div><div class='add'>+	dma_free_coherent(hp-&gt;dma_dev,</div><div class='add'>+			  PAGE_SIZE,</div><div class='add'>+			  hp-&gt;happy_block,</div><div class='add'>+			  hp-&gt;hblock_dvma);</div><div class='ctx'> </div><div class='ctx'> 	free_netdev(net_dev);</div><div class='ctx'> </div><div class='del'>-	dev_set_drvdata(&amp;dev-&gt;dev, NULL);</div><div class='add'>+	dev_set_drvdata(&amp;op-&gt;dev, NULL);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct of_device_id hme_sbus_match[] = {</div><div class='add'>+static const struct of_device_id hme_sbus_match[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.name = "SUNW,hme",</div><div class='ctx'> 	},</div><div class='hunk'>@@ -3346,7 +3280,7 @@ static int __init happy_meal_sbus_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = of_register_driver(&amp;hme_sbus_driver, &amp;sbus_bus_type);</div><div class='add'>+	err = of_register_driver(&amp;hme_sbus_driver, &amp;of_bus_type);</div><div class='ctx'> 	if (!err)</div><div class='ctx'> 		quattro_sbus_register_irqs();</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/sunhme.h b/drivers/net/sunhme.h<br/>index 4da5539fac7b..efd2ca0fcad3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sunhme.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/sunhme.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sunhme.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sunhme.h</a></div><div class='hunk'>@@ -405,14 +405,11 @@ struct happy_meal {</div><div class='ctx'> 	u32 (*read_desc32)(hme32 *);</div><div class='ctx'> 	void (*write_txd)(struct happy_meal_txd *, u32, u32);</div><div class='ctx'> 	void (*write_rxd)(struct happy_meal_rxd *, u32, u32);</div><div class='del'>-	u32 (*dma_map)(void *, void *, long, int);</div><div class='del'>-	void (*dma_unmap)(void *, u32, long, int);</div><div class='del'>-	void (*dma_sync_for_cpu)(void *, u32, long, int);</div><div class='del'>-	void (*dma_sync_for_device)(void *, u32, long, int);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	/* This is either a sbus_dev or a pci_dev. */</div><div class='add'>+	/* This is either an of_device or a pci_dev. */</div><div class='ctx'> 	void			  *happy_dev;</div><div class='add'>+	struct device		  *dma_dev;</div><div class='ctx'> </div><div class='ctx'> 	spinlock_t		  happy_lock;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/sunlance.c b/drivers/net/sunlance.c<br/>index 4e994f87469e..704301a5a7ff 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sunlance.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/sunlance.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sunlance.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sunlance.c</a></div><div class='hunk'>@@ -91,6 +91,9 @@ static char lancestr[] = "LANCE";</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/ethtool.h&gt;</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='hunk'>@@ -98,7 +101,6 @@ static char lancestr[] = "LANCE";</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/byteorder.h&gt;	/* Used by the checksum routines */</div><div class='ctx'> #include &lt;asm/idprom.h&gt;</div><div class='del'>-#include &lt;asm/sbus.h&gt;</div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='ctx'> #include &lt;asm/auxio.h&gt;		/* For tpe-link-test? setting */</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='hunk'>@@ -248,7 +250,7 @@ struct lance_private {</div><div class='ctx'> 	int		rx_new, tx_new;</div><div class='ctx'> 	int		rx_old, tx_old;</div><div class='ctx'> </div><div class='del'>-	struct sbus_dma *ledma;	/* If set this points to ledma	*/</div><div class='add'>+	struct of_device *ledma;	/* If set this points to ledma	*/</div><div class='ctx'> 	char		tpe;		/* cable-selection is TPE	*/</div><div class='ctx'> 	char		auto_select;	/* cable-selection by carrier	*/</div><div class='ctx'> 	char		burst_sizes;	/* ledma SBus burst sizes	*/</div><div class='hunk'>@@ -263,7 +265,8 @@ struct lance_private {</div><div class='ctx'> 	char	       	       *name;</div><div class='ctx'> 	dma_addr_t		init_block_dvma;</div><div class='ctx'> 	struct net_device      *dev;		  /* Backpointer	*/</div><div class='del'>-	struct sbus_dev	       *sdev;</div><div class='add'>+	struct of_device       *op;</div><div class='add'>+	struct of_device       *lebuffer;</div><div class='ctx'> 	struct timer_list       multicast_timer;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1272,27 +1275,29 @@ static void lance_set_multicast_retry(unsigned long _opaque)</div><div class='ctx'> static void lance_free_hwresources(struct lance_private *lp)</div><div class='ctx'> {</div><div class='ctx'> 	if (lp-&gt;lregs)</div><div class='del'>-		sbus_iounmap(lp-&gt;lregs, LANCE_REG_SIZE);</div><div class='add'>+		of_iounmap(&amp;lp-&gt;op-&gt;resource[0], lp-&gt;lregs, LANCE_REG_SIZE);</div><div class='add'>+	if (lp-&gt;dregs) {</div><div class='add'>+		struct of_device *ledma = lp-&gt;ledma;</div><div class='add'>+</div><div class='add'>+		of_iounmap(&amp;ledma-&gt;resource[0], lp-&gt;dregs,</div><div class='add'>+			   resource_size(&amp;ledma-&gt;resource[0]));</div><div class='add'>+	}</div><div class='ctx'> 	if (lp-&gt;init_block_iomem) {</div><div class='del'>-		sbus_iounmap(lp-&gt;init_block_iomem,</div><div class='del'>-			     sizeof(struct lance_init_block));</div><div class='add'>+		of_iounmap(&amp;lp-&gt;lebuffer-&gt;resource[0], lp-&gt;init_block_iomem,</div><div class='add'>+			   sizeof(struct lance_init_block));</div><div class='ctx'> 	} else if (lp-&gt;init_block_mem) {</div><div class='del'>-		sbus_free_consistent(lp-&gt;sdev,</div><div class='del'>-				     sizeof(struct lance_init_block),</div><div class='del'>-				     lp-&gt;init_block_mem,</div><div class='del'>-				     lp-&gt;init_block_dvma);</div><div class='add'>+		dma_free_coherent(&amp;lp-&gt;op-&gt;dev,</div><div class='add'>+				  sizeof(struct lance_init_block),</div><div class='add'>+				  lp-&gt;init_block_mem,</div><div class='add'>+				  lp-&gt;init_block_dvma);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Ethtool support... */</div><div class='ctx'> static void sparc_lance_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)</div><div class='ctx'> {</div><div class='del'>-	struct lance_private *lp = netdev_priv(dev);</div><div class='del'>-</div><div class='ctx'> 	strcpy(info-&gt;driver, "sunlance");</div><div class='ctx'> 	strcpy(info-&gt;version, "2.02");</div><div class='del'>-	sprintf(info-&gt;bus_info, "SBUS:%d",</div><div class='del'>-		lp-&gt;sdev-&gt;slot);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u32 sparc_lance_get_link(struct net_device *dev)</div><div class='hunk'>@@ -1308,16 +1313,16 @@ static const struct ethtool_ops sparc_lance_ethtool_ops = {</div><div class='ctx'> 	.get_link		= sparc_lance_get_link,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __devinit sparc_lance_probe_one(struct sbus_dev *sdev,</div><div class='del'>-					   struct sbus_dma *ledma,</div><div class='del'>-					   struct sbus_dev *lebuffer)</div><div class='add'>+static int __devinit sparc_lance_probe_one(struct of_device *op,</div><div class='add'>+					   struct of_device *ledma,</div><div class='add'>+					   struct of_device *lebuffer)</div><div class='ctx'> {</div><div class='add'>+	struct device_node *dp = op-&gt;node;</div><div class='ctx'> 	static unsigned version_printed;</div><div class='del'>-	struct device_node *dp = sdev-&gt;ofdev.node;</div><div class='del'>-	struct net_device *dev;</div><div class='ctx'> 	struct lance_private *lp;</div><div class='del'>-	int    i;</div><div class='add'>+	struct net_device *dev;</div><div class='ctx'> 	DECLARE_MAC_BUF(mac);</div><div class='add'>+	int    i;</div><div class='ctx'> </div><div class='ctx'> 	dev = alloc_etherdev(sizeof(struct lance_private) + 8);</div><div class='ctx'> 	if (!dev)</div><div class='hunk'>@@ -1338,14 +1343,27 @@ static int __devinit sparc_lance_probe_one(struct sbus_dev *sdev,</div><div class='ctx'> 		dev-&gt;dev_addr[i] = idprom-&gt;id_ethaddr[i];</div><div class='ctx'> </div><div class='ctx'> 	/* Get the IO region */</div><div class='del'>-	lp-&gt;lregs = sbus_ioremap(&amp;sdev-&gt;resource[0], 0,</div><div class='del'>-				 LANCE_REG_SIZE, lancestr);</div><div class='add'>+	lp-&gt;lregs = of_ioremap(&amp;op-&gt;resource[0], 0,</div><div class='add'>+			       LANCE_REG_SIZE, lancestr);</div><div class='ctx'> 	if (!lp-&gt;lregs) {</div><div class='ctx'> 		printk(KERN_ERR "SunLance: Cannot map registers.\n");</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	lp-&gt;sdev = sdev;</div><div class='add'>+	lp-&gt;ledma = ledma;</div><div class='add'>+	if (lp-&gt;ledma) {</div><div class='add'>+		lp-&gt;dregs = of_ioremap(&amp;ledma-&gt;resource[0], 0,</div><div class='add'>+				       resource_size(&amp;ledma-&gt;resource[0]),</div><div class='add'>+				       "ledma");</div><div class='add'>+		if (!lp-&gt;dregs) {</div><div class='add'>+			printk(KERN_ERR "SunLance: Cannot map "</div><div class='add'>+			       "ledma registers.\n");</div><div class='add'>+			goto fail;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	lp-&gt;op = op;</div><div class='add'>+	lp-&gt;lebuffer = lebuffer;</div><div class='ctx'> 	if (lebuffer) {</div><div class='ctx'> 		/* sanity check */</div><div class='ctx'> 		if (lebuffer-&gt;resource[0].start &amp; 7) {</div><div class='hunk'>@@ -1353,8 +1371,8 @@ static int __devinit sparc_lance_probe_one(struct sbus_dev *sdev,</div><div class='ctx'> 			goto fail;</div><div class='ctx'> 		}</div><div class='ctx'> 		lp-&gt;init_block_iomem =</div><div class='del'>-			sbus_ioremap(&amp;lebuffer-&gt;resource[0], 0,</div><div class='del'>-				     sizeof(struct lance_init_block), "lebuffer");</div><div class='add'>+			of_ioremap(&amp;lebuffer-&gt;resource[0], 0,</div><div class='add'>+				   sizeof(struct lance_init_block), "lebuffer");</div><div class='ctx'> 		if (!lp-&gt;init_block_iomem) {</div><div class='ctx'> 			printk(KERN_ERR "SunLance: Cannot map PIO buffer.\n");</div><div class='ctx'> 			goto fail;</div><div class='hunk'>@@ -1366,9 +1384,10 @@ static int __devinit sparc_lance_probe_one(struct sbus_dev *sdev,</div><div class='ctx'> 		lp-&gt;tx = lance_tx_pio;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		lp-&gt;init_block_mem =</div><div class='del'>-			sbus_alloc_consistent(sdev, sizeof(struct lance_init_block),</div><div class='del'>-					      &amp;lp-&gt;init_block_dvma);</div><div class='del'>-		if (!lp-&gt;init_block_mem || lp-&gt;init_block_dvma == 0) {</div><div class='add'>+			dma_alloc_coherent(&amp;op-&gt;dev,</div><div class='add'>+					   sizeof(struct lance_init_block),</div><div class='add'>+					   &amp;lp-&gt;init_block_dvma, GFP_ATOMIC);</div><div class='add'>+		if (!lp-&gt;init_block_mem) {</div><div class='ctx'> 			printk(KERN_ERR "SunLance: Cannot allocate consistent DMA memory.\n");</div><div class='ctx'> 			goto fail;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1383,13 +1402,13 @@ static int __devinit sparc_lance_probe_one(struct sbus_dev *sdev,</div><div class='ctx'> 						      LE_C3_BCON));</div><div class='ctx'> </div><div class='ctx'> 	lp-&gt;name = lancestr;</div><div class='del'>-	lp-&gt;ledma = ledma;</div><div class='ctx'> </div><div class='ctx'> 	lp-&gt;burst_sizes = 0;</div><div class='ctx'> 	if (lp-&gt;ledma) {</div><div class='del'>-		struct device_node *ledma_dp = ledma-&gt;sdev-&gt;ofdev.node;</div><div class='del'>-		const char *prop;</div><div class='add'>+		struct device_node *ledma_dp = ledma-&gt;node;</div><div class='add'>+		struct device_node *sbus_dp;</div><div class='ctx'> 		unsigned int sbmask;</div><div class='add'>+		const char *prop;</div><div class='ctx'> 		u32 csr;</div><div class='ctx'> </div><div class='ctx'> 		/* Find burst-size property for ledma */</div><div class='hunk'>@@ -1397,7 +1416,8 @@ static int __devinit sparc_lance_probe_one(struct sbus_dev *sdev,</div><div class='ctx'> 							"burst-sizes", 0);</div><div class='ctx'> </div><div class='ctx'> 		/* ledma may be capable of fast bursts, but sbus may not. */</div><div class='del'>-		sbmask = of_getintprop_default(ledma_dp, "burst-sizes",</div><div class='add'>+		sbus_dp = ledma_dp-&gt;parent;</div><div class='add'>+		sbmask = of_getintprop_default(sbus_dp, "burst-sizes",</div><div class='ctx'> 					       DMA_BURSTBITS);</div><div class='ctx'> 		lp-&gt;burst_sizes &amp;= sbmask;</div><div class='ctx'> </div><div class='hunk'>@@ -1435,8 +1455,6 @@ no_link_test:</div><div class='ctx'> 			lp-&gt;tpe = 1;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		lp-&gt;dregs = ledma-&gt;regs;</div><div class='del'>-</div><div class='ctx'> 		/* Reset ledma */</div><div class='ctx'> 		csr = sbus_readl(lp-&gt;dregs + DMA_CSR);</div><div class='ctx'> 		sbus_writel(csr | DMA_RST_ENET, lp-&gt;dregs + DMA_CSR);</div><div class='hunk'>@@ -1446,7 +1464,7 @@ no_link_test:</div><div class='ctx'> 		lp-&gt;dregs = NULL;</div><div class='ctx'> </div><div class='ctx'> 	lp-&gt;dev = dev;</div><div class='del'>-	SET_NETDEV_DEV(dev, &amp;sdev-&gt;ofdev.dev);</div><div class='add'>+	SET_NETDEV_DEV(dev, &amp;op-&gt;dev);</div><div class='ctx'> 	dev-&gt;open = &amp;lance_open;</div><div class='ctx'> 	dev-&gt;stop = &amp;lance_close;</div><div class='ctx'> 	dev-&gt;hard_start_xmit = &amp;lance_start_xmit;</div><div class='hunk'>@@ -1455,9 +1473,7 @@ no_link_test:</div><div class='ctx'> 	dev-&gt;set_multicast_list = &amp;lance_set_multicast;</div><div class='ctx'> 	dev-&gt;ethtool_ops = &amp;sparc_lance_ethtool_ops;</div><div class='ctx'> </div><div class='del'>-	dev-&gt;irq = sdev-&gt;irqs[0];</div><div class='del'>-</div><div class='del'>-	dev-&gt;dma = 0;</div><div class='add'>+	dev-&gt;irq = op-&gt;irqs[0];</div><div class='ctx'> </div><div class='ctx'> 	/* We cannot sleep if the chip is busy during a</div><div class='ctx'> 	 * multicast list update event, because such events</div><div class='hunk'>@@ -1473,7 +1489,7 @@ no_link_test:</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dev_set_drvdata(&amp;sdev-&gt;ofdev.dev, lp);</div><div class='add'>+	dev_set_drvdata(&amp;op-&gt;dev, lp);</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_INFO "%s: LANCE %s\n",</div><div class='ctx'> 	       dev-&gt;name, print_mac(mac, dev-&gt;dev_addr));</div><div class='hunk'>@@ -1486,80 +1502,25 @@ fail:</div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* On 4m, find the associated dma for the lance chip */</div><div class='del'>-static struct sbus_dma * __devinit find_ledma(struct sbus_dev *sdev)</div><div class='del'>-{</div><div class='del'>-	struct sbus_dma *p;</div><div class='del'>-</div><div class='del'>-	for_each_dvma(p) {</div><div class='del'>-		if (p-&gt;sdev == sdev)</div><div class='del'>-			return p;</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SUN4</div><div class='del'>-</div><div class='del'>-#include &lt;asm/sun4paddr.h&gt;</div><div class='del'>-#include &lt;asm/machines.h&gt;</div><div class='del'>-</div><div class='del'>-/* Find all the lance cards on the system and initialize them */</div><div class='del'>-static struct sbus_dev sun4_sdev;</div><div class='del'>-static int __devinit sparc_lance_init(void)</div><div class='del'>-{</div><div class='del'>-	if ((idprom-&gt;id_machtype == (SM_SUN4|SM_4_330)) ||</div><div class='del'>-	    (idprom-&gt;id_machtype == (SM_SUN4|SM_4_470))) {</div><div class='del'>-		memset(&amp;sun4_sdev, 0, sizeof(struct sbus_dev));</div><div class='del'>-		sun4_sdev.reg_addrs[0].phys_addr = sun4_eth_physaddr;</div><div class='del'>-		sun4_sdev.irqs[0] = 6;</div><div class='del'>-		return sparc_lance_probe_one(&amp;sun4_sdev, NULL, NULL);</div><div class='del'>-	}</div><div class='del'>-	return -ENODEV;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __exit sunlance_sun4_remove(void)</div><div class='add'>+static int __devinit sunlance_sbus_probe(struct of_device *op, const struct of_device_id *match)</div><div class='ctx'> {</div><div class='del'>-	struct lance_private *lp = dev_get_drvdata(&amp;sun4_sdev.ofdev.dev);</div><div class='del'>-	struct net_device *net_dev = lp-&gt;dev;</div><div class='del'>-</div><div class='del'>-	unregister_netdev(net_dev);</div><div class='del'>-</div><div class='del'>-	lance_free_hwresources(lp);</div><div class='del'>-</div><div class='del'>-	free_netdev(net_dev);</div><div class='del'>-</div><div class='del'>-	dev_set_drvdata(&amp;sun4_sdev.ofdev.dev, NULL);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#else /* !CONFIG_SUN4 */</div><div class='del'>-</div><div class='del'>-static int __devinit sunlance_sbus_probe(struct of_device *dev, const struct of_device_id *match)</div><div class='del'>-{</div><div class='del'>-	struct sbus_dev *sdev = to_sbus_device(&amp;dev-&gt;dev);</div><div class='add'>+	struct of_device *parent = to_of_device(op-&gt;dev.parent);</div><div class='add'>+	struct device_node *parent_dp = parent-&gt;node;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (sdev-&gt;parent) {</div><div class='del'>-		struct of_device *parent = &amp;sdev-&gt;parent-&gt;ofdev;</div><div class='del'>-</div><div class='del'>-		if (!strcmp(parent-&gt;node-&gt;name, "ledma")) {</div><div class='del'>-			struct sbus_dma *ledma = find_ledma(to_sbus_device(&amp;parent-&gt;dev));</div><div class='del'>-</div><div class='del'>-			err = sparc_lance_probe_one(sdev, ledma, NULL);</div><div class='del'>-		} else if (!strcmp(parent-&gt;node-&gt;name, "lebuffer")) {</div><div class='del'>-			err = sparc_lance_probe_one(sdev, NULL, to_sbus_device(&amp;parent-&gt;dev));</div><div class='del'>-		} else</div><div class='del'>-			err = sparc_lance_probe_one(sdev, NULL, NULL);</div><div class='add'>+	if (!strcmp(parent_dp-&gt;name, "ledma")) {</div><div class='add'>+		err = sparc_lance_probe_one(op, parent, NULL);</div><div class='add'>+	} else if (!strcmp(parent_dp-&gt;name, "lebuffer")) {</div><div class='add'>+		err = sparc_lance_probe_one(op, NULL, parent);</div><div class='ctx'> 	} else</div><div class='del'>-		err = sparc_lance_probe_one(sdev, NULL, NULL);</div><div class='add'>+		err = sparc_lance_probe_one(op, NULL, NULL);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devexit sunlance_sbus_remove(struct of_device *dev)</div><div class='add'>+static int __devexit sunlance_sbus_remove(struct of_device *op)</div><div class='ctx'> {</div><div class='del'>-	struct lance_private *lp = dev_get_drvdata(&amp;dev-&gt;dev);</div><div class='add'>+	struct lance_private *lp = dev_get_drvdata(&amp;op-&gt;dev);</div><div class='ctx'> 	struct net_device *net_dev = lp-&gt;dev;</div><div class='ctx'> </div><div class='ctx'> 	unregister_netdev(net_dev);</div><div class='hunk'>@@ -1568,12 +1529,12 @@ static int __devexit sunlance_sbus_remove(struct of_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	free_netdev(net_dev);</div><div class='ctx'> </div><div class='del'>-	dev_set_drvdata(&amp;dev-&gt;dev, NULL);</div><div class='add'>+	dev_set_drvdata(&amp;op-&gt;dev, NULL);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct of_device_id sunlance_sbus_match[] = {</div><div class='add'>+static const struct of_device_id sunlance_sbus_match[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.name = "le",</div><div class='ctx'> 	},</div><div class='hunk'>@@ -1593,17 +1554,12 @@ static struct of_platform_driver sunlance_sbus_driver = {</div><div class='ctx'> /* Find all the lance cards on the system and initialize them */</div><div class='ctx'> static int __init sparc_lance_init(void)</div><div class='ctx'> {</div><div class='del'>-	return of_register_driver(&amp;sunlance_sbus_driver, &amp;sbus_bus_type);</div><div class='add'>+	return of_register_driver(&amp;sunlance_sbus_driver, &amp;of_bus_type);</div><div class='ctx'> }</div><div class='del'>-#endif /* !CONFIG_SUN4 */</div><div class='ctx'> </div><div class='ctx'> static void __exit sparc_lance_exit(void)</div><div class='ctx'> {</div><div class='del'>-#ifdef CONFIG_SUN4</div><div class='del'>-	sunlance_sun4_remove();</div><div class='del'>-#else</div><div class='ctx'> 	of_unregister_driver(&amp;sunlance_sbus_driver);</div><div class='del'>-#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(sparc_lance_init);</div><div class='head'>diff --git a/drivers/net/sunqe.c b/drivers/net/sunqe.c<br/>index e811331d4608..f63644744ff9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sunqe.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/sunqe.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sunqe.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sunqe.c</a></div><div class='hunk'>@@ -3,7 +3,7 @@</div><div class='ctx'>  *          controller out there can be most efficiently programmed</div><div class='ctx'>  *          if you make it look like a LANCE.</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 1996, 1999, 2003, 2006 David S. Miller (davem@davemloft.net)</div><div class='add'>+ * Copyright (C) 1996, 1999, 2003, 2006, 2008 David S. Miller (davem@davemloft.net)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -24,13 +24,15 @@</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/ethtool.h&gt;</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='ctx'> #include &lt;asm/byteorder.h&gt;</div><div class='ctx'> #include &lt;asm/idprom.h&gt;</div><div class='del'>-#include &lt;asm/sbus.h&gt;</div><div class='ctx'> #include &lt;asm/openprom.h&gt;</div><div class='ctx'> #include &lt;asm/oplib.h&gt;</div><div class='ctx'> #include &lt;asm/auxio.h&gt;</div><div class='hunk'>@@ -40,8 +42,8 @@</div><div class='ctx'> #include "sunqe.h"</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME	"sunqe"</div><div class='del'>-#define DRV_VERSION	"4.0"</div><div class='del'>-#define DRV_RELDATE	"June 23, 2006"</div><div class='add'>+#define DRV_VERSION	"4.1"</div><div class='add'>+#define DRV_RELDATE	"August 27, 2008"</div><div class='ctx'> #define DRV_AUTHOR	"David S. Miller (davem@davemloft.net)"</div><div class='ctx'> </div><div class='ctx'> static char version[] =</div><div class='hunk'>@@ -690,12 +692,18 @@ static void qe_set_multicast(struct net_device *dev)</div><div class='ctx'> /* Ethtool support... */</div><div class='ctx'> static void qe_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)</div><div class='ctx'> {</div><div class='add'>+	const struct linux_prom_registers *regs;</div><div class='ctx'> 	struct sunqe *qep = dev-&gt;priv;</div><div class='add'>+	struct of_device *op;</div><div class='ctx'> </div><div class='ctx'> 	strcpy(info-&gt;driver, "sunqe");</div><div class='ctx'> 	strcpy(info-&gt;version, "3.0");</div><div class='del'>-	sprintf(info-&gt;bus_info, "SBUS:%d",</div><div class='del'>-		qep-&gt;qe_sdev-&gt;slot);</div><div class='add'>+</div><div class='add'>+	op = qep-&gt;op;</div><div class='add'>+	regs = of_get_property(op-&gt;node, "reg", NULL);</div><div class='add'>+	if (regs)</div><div class='add'>+		sprintf(info-&gt;bus_info, "SBUS:%d", regs-&gt;which_io);</div><div class='add'>+</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u32 qe_get_link(struct net_device *dev)</div><div class='hunk'>@@ -717,11 +725,11 @@ static const struct ethtool_ops qe_ethtool_ops = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* This is only called once at boot time for each card probed. */</div><div class='del'>-static inline void qec_init_once(struct sunqec *qecp, struct sbus_dev *qsdev)</div><div class='add'>+static void qec_init_once(struct sunqec *qecp, struct of_device *op)</div><div class='ctx'> {</div><div class='ctx'> 	u8 bsizes = qecp-&gt;qec_bursts;</div><div class='ctx'> </div><div class='del'>-	if (sbus_can_burst64(qsdev) &amp;&amp; (bsizes &amp; DMA_BURST64)) {</div><div class='add'>+	if (sbus_can_burst64() &amp;&amp; (bsizes &amp; DMA_BURST64)) {</div><div class='ctx'> 		sbus_writel(GLOB_CTRL_B64, qecp-&gt;gregs + GLOB_CTRL);</div><div class='ctx'> 	} else if (bsizes &amp; DMA_BURST32) {</div><div class='ctx'> 		sbus_writel(GLOB_CTRL_B32, qecp-&gt;gregs + GLOB_CTRL);</div><div class='hunk'>@@ -735,15 +743,15 @@ static inline void qec_init_once(struct sunqec *qecp, struct sbus_dev *qsdev)</div><div class='ctx'> 	sbus_writel(GLOB_PSIZE_2048, qecp-&gt;gregs + GLOB_PSIZE);</div><div class='ctx'> </div><div class='ctx'> 	/* Set the local memsize register, divided up to one piece per QE channel. */</div><div class='del'>-	sbus_writel((qsdev-&gt;reg_addrs[1].reg_size &gt;&gt; 2),</div><div class='add'>+	sbus_writel((resource_size(&amp;op-&gt;resource[1]) &gt;&gt; 2),</div><div class='ctx'> 		    qecp-&gt;gregs + GLOB_MSIZE);</div><div class='ctx'> </div><div class='ctx'> 	/* Divide up the local QEC memory amongst the 4 QE receiver and</div><div class='ctx'> 	 * transmitter FIFOs.  Basically it is (total / 2 / num_channels).</div><div class='ctx'> 	 */</div><div class='del'>-	sbus_writel((qsdev-&gt;reg_addrs[1].reg_size &gt;&gt; 2) &gt;&gt; 1,</div><div class='add'>+	sbus_writel((resource_size(&amp;op-&gt;resource[1]) &gt;&gt; 2) &gt;&gt; 1,</div><div class='ctx'> 		    qecp-&gt;gregs + GLOB_TSIZE);</div><div class='del'>-	sbus_writel((qsdev-&gt;reg_addrs[1].reg_size &gt;&gt; 2) &gt;&gt; 1,</div><div class='add'>+	sbus_writel((resource_size(&amp;op-&gt;resource[1]) &gt;&gt; 2) &gt;&gt; 1,</div><div class='ctx'> 		    qecp-&gt;gregs + GLOB_RSIZE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -767,24 +775,21 @@ static u8 __devinit qec_get_burst(struct device_node *dp)</div><div class='ctx'> 	return bsizes;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct sunqec * __devinit get_qec(struct sbus_dev *child_sdev)</div><div class='add'>+static struct sunqec * __devinit get_qec(struct of_device *child)</div><div class='ctx'> {</div><div class='del'>-	struct sbus_dev *qec_sdev = child_sdev-&gt;parent;</div><div class='add'>+	struct of_device *op = to_of_device(child-&gt;dev.parent);</div><div class='ctx'> 	struct sunqec *qecp;</div><div class='ctx'> </div><div class='del'>-	for (qecp = root_qec_dev; qecp; qecp = qecp-&gt;next_module) {</div><div class='del'>-		if (qecp-&gt;qec_sdev == qec_sdev)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='add'>+	qecp = dev_get_drvdata(&amp;op-&gt;dev);</div><div class='ctx'> 	if (!qecp) {</div><div class='ctx'> 		qecp = kzalloc(sizeof(struct sunqec), GFP_KERNEL);</div><div class='ctx'> 		if (qecp) {</div><div class='ctx'> 			u32 ctrl;</div><div class='ctx'> </div><div class='del'>-			qecp-&gt;qec_sdev = qec_sdev;</div><div class='del'>-			qecp-&gt;gregs = sbus_ioremap(&amp;qec_sdev-&gt;resource[0], 0,</div><div class='del'>-						   GLOB_REG_SIZE,</div><div class='del'>-						   "QEC Global Registers");</div><div class='add'>+			qecp-&gt;op = op;</div><div class='add'>+			qecp-&gt;gregs = of_ioremap(&amp;op-&gt;resource[0], 0,</div><div class='add'>+						 GLOB_REG_SIZE,</div><div class='add'>+						 "QEC Global Registers");</div><div class='ctx'> 			if (!qecp-&gt;gregs)</div><div class='ctx'> 				goto fail;</div><div class='ctx'> </div><div class='hunk'>@@ -799,16 +804,18 @@ static struct sunqec * __devinit get_qec(struct sbus_dev *child_sdev)</div><div class='ctx'> 			if (qec_global_reset(qecp-&gt;gregs))</div><div class='ctx'> 				goto fail;</div><div class='ctx'> </div><div class='del'>-			qecp-&gt;qec_bursts = qec_get_burst(qec_sdev-&gt;ofdev.node);</div><div class='add'>+			qecp-&gt;qec_bursts = qec_get_burst(op-&gt;node);</div><div class='ctx'> </div><div class='del'>-			qec_init_once(qecp, qec_sdev);</div><div class='add'>+			qec_init_once(qecp, op);</div><div class='ctx'> </div><div class='del'>-			if (request_irq(qec_sdev-&gt;irqs[0], &amp;qec_interrupt,</div><div class='add'>+			if (request_irq(op-&gt;irqs[0], &amp;qec_interrupt,</div><div class='ctx'> 					IRQF_SHARED, "qec", (void *) qecp)) {</div><div class='ctx'> 				printk(KERN_ERR "qec: Can't register irq.\n");</div><div class='ctx'> 				goto fail;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='add'>+			dev_set_drvdata(&amp;op-&gt;dev, qecp);</div><div class='add'>+</div><div class='ctx'> 			qecp-&gt;next_module = root_qec_dev;</div><div class='ctx'> 			root_qec_dev = qecp;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -818,17 +825,17 @@ static struct sunqec * __devinit get_qec(struct sbus_dev *child_sdev)</div><div class='ctx'> </div><div class='ctx'> fail:</div><div class='ctx'> 	if (qecp-&gt;gregs)</div><div class='del'>-		sbus_iounmap(qecp-&gt;gregs, GLOB_REG_SIZE);</div><div class='add'>+		of_iounmap(&amp;op-&gt;resource[0], qecp-&gt;gregs, GLOB_REG_SIZE);</div><div class='ctx'> 	kfree(qecp);</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit qec_ether_init(struct sbus_dev *sdev)</div><div class='add'>+static int __devinit qec_ether_init(struct of_device *op)</div><div class='ctx'> {</div><div class='ctx'> 	static unsigned version_printed;</div><div class='ctx'> 	struct net_device *dev;</div><div class='del'>-	struct sunqe *qe;</div><div class='ctx'> 	struct sunqec *qecp;</div><div class='add'>+	struct sunqe *qe;</div><div class='ctx'> 	int i, res;</div><div class='ctx'> </div><div class='ctx'> 	if (version_printed++ == 0)</div><div class='hunk'>@@ -842,49 +849,42 @@ static int __devinit qec_ether_init(struct sbus_dev *sdev)</div><div class='ctx'> </div><div class='ctx'> 	qe = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	i = of_getintprop_default(sdev-&gt;ofdev.node, "channel#", -1);</div><div class='del'>-	if (i == -1) {</div><div class='del'>-		struct sbus_dev *td = sdev-&gt;parent-&gt;child;</div><div class='del'>-		i = 0;</div><div class='del'>-		while (td != sdev) {</div><div class='del'>-			td = td-&gt;next;</div><div class='del'>-			i++;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	res = -ENODEV;</div><div class='add'>+</div><div class='add'>+	i = of_getintprop_default(op-&gt;node, "channel#", -1);</div><div class='add'>+	if (i == -1)</div><div class='add'>+		goto fail;</div><div class='ctx'> 	qe-&gt;channel = i;</div><div class='ctx'> 	spin_lock_init(&amp;qe-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	res = -ENODEV;</div><div class='del'>-	qecp = get_qec(sdev);</div><div class='add'>+	qecp = get_qec(op);</div><div class='ctx'> 	if (!qecp)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='ctx'> 	qecp-&gt;qes[qe-&gt;channel] = qe;</div><div class='ctx'> 	qe-&gt;dev = dev;</div><div class='ctx'> 	qe-&gt;parent = qecp;</div><div class='del'>-	qe-&gt;qe_sdev = sdev;</div><div class='add'>+	qe-&gt;op = op;</div><div class='ctx'> </div><div class='ctx'> 	res = -ENOMEM;</div><div class='del'>-	qe-&gt;qcregs = sbus_ioremap(&amp;qe-&gt;qe_sdev-&gt;resource[0], 0,</div><div class='del'>-				  CREG_REG_SIZE, "QEC Channel Registers");</div><div class='add'>+	qe-&gt;qcregs = of_ioremap(&amp;op-&gt;resource[0], 0,</div><div class='add'>+				CREG_REG_SIZE, "QEC Channel Registers");</div><div class='ctx'> 	if (!qe-&gt;qcregs) {</div><div class='ctx'> 		printk(KERN_ERR "qe: Cannot map channel registers.\n");</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	qe-&gt;mregs = sbus_ioremap(&amp;qe-&gt;qe_sdev-&gt;resource[1], 0,</div><div class='del'>-				 MREGS_REG_SIZE, "QE MACE Registers");</div><div class='add'>+	qe-&gt;mregs = of_ioremap(&amp;op-&gt;resource[1], 0,</div><div class='add'>+			       MREGS_REG_SIZE, "QE MACE Registers");</div><div class='ctx'> 	if (!qe-&gt;mregs) {</div><div class='ctx'> 		printk(KERN_ERR "qe: Cannot map MACE registers.\n");</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	qe-&gt;qe_block = sbus_alloc_consistent(qe-&gt;qe_sdev,</div><div class='del'>-					     PAGE_SIZE,</div><div class='del'>-					     &amp;qe-&gt;qblock_dvma);</div><div class='del'>-	qe-&gt;buffers = sbus_alloc_consistent(qe-&gt;qe_sdev,</div><div class='del'>-					    sizeof(struct sunqe_buffers),</div><div class='del'>-					    &amp;qe-&gt;buffers_dvma);</div><div class='add'>+	qe-&gt;qe_block = dma_alloc_coherent(&amp;op-&gt;dev, PAGE_SIZE,</div><div class='add'>+					  &amp;qe-&gt;qblock_dvma, GFP_ATOMIC);</div><div class='add'>+	qe-&gt;buffers = dma_alloc_coherent(&amp;op-&gt;dev, sizeof(struct sunqe_buffers),</div><div class='add'>+					 &amp;qe-&gt;buffers_dvma, GFP_ATOMIC);</div><div class='ctx'> 	if (qe-&gt;qe_block == NULL || qe-&gt;qblock_dvma == 0 ||</div><div class='ctx'> 	    qe-&gt;buffers == NULL || qe-&gt;buffers_dvma == 0)</div><div class='ctx'> 		goto fail;</div><div class='hunk'>@@ -892,7 +892,7 @@ static int __devinit qec_ether_init(struct sbus_dev *sdev)</div><div class='ctx'> 	/* Stop this QE. */</div><div class='ctx'> 	qe_stop(qe);</div><div class='ctx'> </div><div class='del'>-	SET_NETDEV_DEV(dev, &amp;sdev-&gt;ofdev.dev);</div><div class='add'>+	SET_NETDEV_DEV(dev, &amp;op-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;open = qe_open;</div><div class='ctx'> 	dev-&gt;stop = qe_close;</div><div class='hunk'>@@ -900,7 +900,7 @@ static int __devinit qec_ether_init(struct sbus_dev *sdev)</div><div class='ctx'> 	dev-&gt;set_multicast_list = qe_set_multicast;</div><div class='ctx'> 	dev-&gt;tx_timeout = qe_tx_timeout;</div><div class='ctx'> 	dev-&gt;watchdog_timeo = 5*HZ;</div><div class='del'>-	dev-&gt;irq = sdev-&gt;irqs[0];</div><div class='add'>+	dev-&gt;irq = op-&gt;irqs[0];</div><div class='ctx'> 	dev-&gt;dma = 0;</div><div class='ctx'> 	dev-&gt;ethtool_ops = &amp;qe_ethtool_ops;</div><div class='ctx'> </div><div class='hunk'>@@ -908,7 +908,7 @@ static int __devinit qec_ether_init(struct sbus_dev *sdev)</div><div class='ctx'> 	if (res)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='del'>-	dev_set_drvdata(&amp;sdev-&gt;ofdev.dev, qe);</div><div class='add'>+	dev_set_drvdata(&amp;op-&gt;dev, qe);</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_INFO "%s: qe channel[%d] ", dev-&gt;name, qe-&gt;channel);</div><div class='ctx'> 	for (i = 0; i &lt; 6; i++)</div><div class='hunk'>@@ -922,58 +922,50 @@ static int __devinit qec_ether_init(struct sbus_dev *sdev)</div><div class='ctx'> </div><div class='ctx'> fail:</div><div class='ctx'> 	if (qe-&gt;qcregs)</div><div class='del'>-		sbus_iounmap(qe-&gt;qcregs, CREG_REG_SIZE);</div><div class='add'>+		of_iounmap(&amp;op-&gt;resource[0], qe-&gt;qcregs, CREG_REG_SIZE);</div><div class='ctx'> 	if (qe-&gt;mregs)</div><div class='del'>-		sbus_iounmap(qe-&gt;mregs, MREGS_REG_SIZE);</div><div class='add'>+		of_iounmap(&amp;op-&gt;resource[1], qe-&gt;mregs, MREGS_REG_SIZE);</div><div class='ctx'> 	if (qe-&gt;qe_block)</div><div class='del'>-		sbus_free_consistent(qe-&gt;qe_sdev,</div><div class='del'>-				     PAGE_SIZE,</div><div class='del'>-				     qe-&gt;qe_block,</div><div class='del'>-				     qe-&gt;qblock_dvma);</div><div class='add'>+		dma_free_coherent(&amp;op-&gt;dev, PAGE_SIZE,</div><div class='add'>+				  qe-&gt;qe_block, qe-&gt;qblock_dvma);</div><div class='ctx'> 	if (qe-&gt;buffers)</div><div class='del'>-		sbus_free_consistent(qe-&gt;qe_sdev,</div><div class='del'>-				     sizeof(struct sunqe_buffers),</div><div class='del'>-				     qe-&gt;buffers,</div><div class='del'>-				     qe-&gt;buffers_dvma);</div><div class='add'>+		dma_free_coherent(&amp;op-&gt;dev,</div><div class='add'>+				  sizeof(struct sunqe_buffers),</div><div class='add'>+				  qe-&gt;buffers,</div><div class='add'>+				  qe-&gt;buffers_dvma);</div><div class='ctx'> </div><div class='ctx'> 	free_netdev(dev);</div><div class='ctx'> </div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit qec_sbus_probe(struct of_device *dev, const struct of_device_id *match)</div><div class='add'>+static int __devinit qec_sbus_probe(struct of_device *op, const struct of_device_id *match)</div><div class='ctx'> {</div><div class='del'>-	struct sbus_dev *sdev = to_sbus_device(&amp;dev-&gt;dev);</div><div class='del'>-</div><div class='del'>-	return qec_ether_init(sdev);</div><div class='add'>+	return qec_ether_init(op);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devexit qec_sbus_remove(struct of_device *dev)</div><div class='add'>+static int __devexit qec_sbus_remove(struct of_device *op)</div><div class='ctx'> {</div><div class='del'>-	struct sunqe *qp = dev_get_drvdata(&amp;dev-&gt;dev);</div><div class='add'>+	struct sunqe *qp = dev_get_drvdata(&amp;op-&gt;dev);</div><div class='ctx'> 	struct net_device *net_dev = qp-&gt;dev;</div><div class='ctx'> </div><div class='ctx'> 	unregister_netdev(net_dev);</div><div class='ctx'> </div><div class='del'>-	sbus_iounmap(qp-&gt;qcregs, CREG_REG_SIZE);</div><div class='del'>-	sbus_iounmap(qp-&gt;mregs, MREGS_REG_SIZE);</div><div class='del'>-	sbus_free_consistent(qp-&gt;qe_sdev,</div><div class='del'>-			     PAGE_SIZE,</div><div class='del'>-			     qp-&gt;qe_block,</div><div class='del'>-			     qp-&gt;qblock_dvma);</div><div class='del'>-	sbus_free_consistent(qp-&gt;qe_sdev,</div><div class='del'>-			     sizeof(struct sunqe_buffers),</div><div class='del'>-			     qp-&gt;buffers,</div><div class='del'>-			     qp-&gt;buffers_dvma);</div><div class='add'>+	of_iounmap(&amp;op-&gt;resource[0], qp-&gt;qcregs, CREG_REG_SIZE);</div><div class='add'>+	of_iounmap(&amp;op-&gt;resource[1], qp-&gt;mregs, MREGS_REG_SIZE);</div><div class='add'>+	dma_free_coherent(&amp;op-&gt;dev, PAGE_SIZE,</div><div class='add'>+			  qp-&gt;qe_block, qp-&gt;qblock_dvma);</div><div class='add'>+	dma_free_coherent(&amp;op-&gt;dev, sizeof(struct sunqe_buffers),</div><div class='add'>+			  qp-&gt;buffers, qp-&gt;buffers_dvma);</div><div class='ctx'> </div><div class='ctx'> 	free_netdev(net_dev);</div><div class='ctx'> </div><div class='del'>-	dev_set_drvdata(&amp;dev-&gt;dev, NULL);</div><div class='add'>+	dev_set_drvdata(&amp;op-&gt;dev, NULL);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct of_device_id qec_sbus_match[] = {</div><div class='add'>+static const struct of_device_id qec_sbus_match[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.name = "qe",</div><div class='ctx'> 	},</div><div class='hunk'>@@ -991,7 +983,7 @@ static struct of_platform_driver qec_sbus_driver = {</div><div class='ctx'> </div><div class='ctx'> static int __init qec_init(void)</div><div class='ctx'> {</div><div class='del'>-	return of_register_driver(&amp;qec_sbus_driver, &amp;sbus_bus_type);</div><div class='add'>+	return of_register_driver(&amp;qec_sbus_driver, &amp;of_bus_type);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit qec_exit(void)</div><div class='hunk'>@@ -1000,11 +992,11 @@ static void __exit qec_exit(void)</div><div class='ctx'> </div><div class='ctx'> 	while (root_qec_dev) {</div><div class='ctx'> 		struct sunqec *next = root_qec_dev-&gt;next_module;</div><div class='add'>+		struct of_device *op = root_qec_dev-&gt;op;</div><div class='ctx'> </div><div class='del'>-		free_irq(root_qec_dev-&gt;qec_sdev-&gt;irqs[0],</div><div class='del'>-			 (void *) root_qec_dev);</div><div class='del'>-		sbus_iounmap(root_qec_dev-&gt;gregs, GLOB_REG_SIZE);</div><div class='del'>-</div><div class='add'>+		free_irq(op-&gt;irqs[0], (void *) root_qec_dev);</div><div class='add'>+		of_iounmap(&amp;op-&gt;resource[0], root_qec_dev-&gt;gregs,</div><div class='add'>+			   GLOB_REG_SIZE);</div><div class='ctx'> 		kfree(root_qec_dev);</div><div class='ctx'> </div><div class='ctx'> 		root_qec_dev = next;</div><div class='head'>diff --git a/drivers/net/sunqe.h b/drivers/net/sunqe.h<br/>index 347c8ddc1592..5813a7b2faa5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sunqe.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/sunqe.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sunqe.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sunqe.h</a></div><div class='hunk'>@@ -314,7 +314,7 @@ struct sunqec {</div><div class='ctx'> 	void __iomem		*gregs;		/* QEC Global Registers         */</div><div class='ctx'> 	struct sunqe		*qes[4];	/* Each child MACE              */</div><div class='ctx'> 	unsigned int            qec_bursts;	/* Support burst sizes          */</div><div class='del'>-	struct sbus_dev		*qec_sdev;	/* QEC's SBUS device            */</div><div class='add'>+	struct of_device	*op;		/* QEC's OF device              */</div><div class='ctx'> 	struct sunqec		*next_module;	/* List of all QECs in system   */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -342,7 +342,7 @@ struct sunqe {</div><div class='ctx'> 	__u32				buffers_dvma;	/* DVMA visible address.       */</div><div class='ctx'> 	struct sunqec			*parent;</div><div class='ctx'> 	u8				mconfig;	/* Base MACE mconfig value     */</div><div class='del'>-	struct sbus_dev			*qe_sdev;	/* QE's SBUS device struct     */</div><div class='add'>+	struct of_device		*op;		/* QE's OF device struct       */</div><div class='ctx'> 	struct net_device		*dev;		/* QE's netdevice struct       */</div><div class='ctx'> 	int				channel;	/* Who am I?                   */</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/net/sunvnet.c b/drivers/net/sunvnet.c<br/>index 6415ce15c2ef..a720065553df 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sunvnet.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/sunvnet.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/sunvnet.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/sunvnet.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /* sunvnet.c: Sun LDOM Virtual Network Driver.</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2007 David S. Miller &lt;davem@davemloft.net&gt;</div><div class='add'>+ * Copyright (C) 2007, 2008 David S. Miller &lt;davem@davemloft.net&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -1260,7 +1260,7 @@ static int vnet_port_remove(struct vio_dev *vdev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct vio_device_id vnet_port_match[] = {</div><div class='add'>+static const struct vio_device_id vnet_port_match[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.type = "vnet-port",</div><div class='ctx'> 	},</div><div class='head'>diff --git a/drivers/net/tc35815.c b/drivers/net/tc35815.c<br/>index 8487ace9d2e3..df20cafff7dd 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/tc35815.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/tc35815.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/tc35815.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/tc35815.c</a></div><div class='hunk'>@@ -424,7 +424,7 @@ struct tc35815_local {</div><div class='ctx'> 	 */</div><div class='ctx'> 	spinlock_t lock;</div><div class='ctx'> </div><div class='del'>-	struct mii_bus mii_bus;</div><div class='add'>+	struct mii_bus *mii_bus;</div><div class='ctx'> 	struct phy_device *phy_dev;</div><div class='ctx'> 	int duplex;</div><div class='ctx'> 	int speed;</div><div class='hunk'>@@ -704,13 +704,13 @@ static int tc_mii_probe(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	/* find the first phy */</div><div class='ctx'> 	for (phy_addr = 0; phy_addr &lt; PHY_MAX_ADDR; phy_addr++) {</div><div class='del'>-		if (lp-&gt;mii_bus.phy_map[phy_addr]) {</div><div class='add'>+		if (lp-&gt;mii_bus-&gt;phy_map[phy_addr]) {</div><div class='ctx'> 			if (phydev) {</div><div class='ctx'> 				printk(KERN_ERR "%s: multiple PHYs found\n",</div><div class='ctx'> 				       dev-&gt;name);</div><div class='ctx'> 				return -EINVAL;</div><div class='ctx'> 			}</div><div class='del'>-			phydev = lp-&gt;mii_bus.phy_map[phy_addr];</div><div class='add'>+			phydev = lp-&gt;mii_bus-&gt;phy_map[phy_addr];</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -762,23 +762,29 @@ static int tc_mii_init(struct net_device *dev)</div><div class='ctx'> 	int err;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	lp-&gt;mii_bus.name = "tc35815_mii_bus";</div><div class='del'>-	lp-&gt;mii_bus.read = tc_mdio_read;</div><div class='del'>-	lp-&gt;mii_bus.write = tc_mdio_write;</div><div class='del'>-	snprintf(lp-&gt;mii_bus.id, MII_BUS_ID_SIZE, "%x",</div><div class='del'>-		 (lp-&gt;pci_dev-&gt;bus-&gt;number &lt;&lt; 8) | lp-&gt;pci_dev-&gt;devfn);</div><div class='del'>-	lp-&gt;mii_bus.priv = dev;</div><div class='del'>-	lp-&gt;mii_bus.dev = &amp;lp-&gt;pci_dev-&gt;dev;</div><div class='del'>-	lp-&gt;mii_bus.irq = kmalloc(sizeof(int) * PHY_MAX_ADDR, GFP_KERNEL);</div><div class='del'>-	if (!lp-&gt;mii_bus.irq) {</div><div class='add'>+	lp-&gt;mii_bus = mdiobus_alloc();</div><div class='add'>+	if (lp-&gt;mii_bus == NULL) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto err_out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	lp-&gt;mii_bus-&gt;name = "tc35815_mii_bus";</div><div class='add'>+	lp-&gt;mii_bus-&gt;read = tc_mdio_read;</div><div class='add'>+	lp-&gt;mii_bus-&gt;write = tc_mdio_write;</div><div class='add'>+	snprintf(lp-&gt;mii_bus-&gt;id, MII_BUS_ID_SIZE, "%x",</div><div class='add'>+		 (lp-&gt;pci_dev-&gt;bus-&gt;number &lt;&lt; 8) | lp-&gt;pci_dev-&gt;devfn);</div><div class='add'>+	lp-&gt;mii_bus-&gt;priv = dev;</div><div class='add'>+	lp-&gt;mii_bus-&gt;parent = &amp;lp-&gt;pci_dev-&gt;dev;</div><div class='add'>+	lp-&gt;mii_bus-&gt;irq = kmalloc(sizeof(int) * PHY_MAX_ADDR, GFP_KERNEL);</div><div class='add'>+	if (!lp-&gt;mii_bus-&gt;irq) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto err_out_free_mii_bus;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; PHY_MAX_ADDR; i++)</div><div class='del'>-		lp-&gt;mii_bus.irq[i] = PHY_POLL;</div><div class='add'>+		lp-&gt;mii_bus-&gt;irq[i] = PHY_POLL;</div><div class='ctx'> </div><div class='del'>-	err = mdiobus_register(&amp;lp-&gt;mii_bus);</div><div class='add'>+	err = mdiobus_register(lp-&gt;mii_bus);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err_out_free_mdio_irq;</div><div class='ctx'> 	err = tc_mii_probe(dev);</div><div class='hunk'>@@ -787,9 +793,11 @@ static int tc_mii_init(struct net_device *dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err_out_unregister_bus:</div><div class='del'>-	mdiobus_unregister(&amp;lp-&gt;mii_bus);</div><div class='add'>+	mdiobus_unregister(lp-&gt;mii_bus);</div><div class='ctx'> err_out_free_mdio_irq:</div><div class='del'>-	kfree(lp-&gt;mii_bus.irq);</div><div class='add'>+	kfree(lp-&gt;mii_bus-&gt;irq);</div><div class='add'>+err_out_free_mii_bus:</div><div class='add'>+	mdiobus_free(lp-&gt;mii_bus);</div><div class='ctx'> err_out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -961,8 +969,9 @@ static void __devexit tc35815_remove_one(struct pci_dev *pdev)</div><div class='ctx'> 	struct tc35815_local *lp = netdev_priv(dev);</div><div class='ctx'> </div><div class='ctx'> 	phy_disconnect(lp-&gt;phy_dev);</div><div class='del'>-	mdiobus_unregister(&amp;lp-&gt;mii_bus);</div><div class='del'>-	kfree(lp-&gt;mii_bus.irq);</div><div class='add'>+	mdiobus_unregister(lp-&gt;mii_bus);</div><div class='add'>+	kfree(lp-&gt;mii_bus-&gt;irq);</div><div class='add'>+	mdiobus_free(lp-&gt;mii_bus);</div><div class='ctx'> 	unregister_netdev(dev);</div><div class='ctx'> 	free_netdev(dev);</div><div class='ctx'> 	pci_set_drvdata(pdev, NULL);</div><div class='head'>diff --git a/drivers/net/tehuti.h b/drivers/net/tehuti.h<br/>index 7db48f1cd949..efaf84d9757d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/tehuti.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/tehuti.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/tehuti.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/tehuti.h</a></div><div class='hunk'>@@ -539,22 +539,22 @@ struct txd_desc {</div><div class='ctx'> </div><div class='ctx'> #define ERR(fmt, args...) printk(KERN_ERR fmt, ## args)</div><div class='ctx'> #define DBG2(fmt, args...)	\</div><div class='del'>-	printk(KERN_ERR  "%s:%-5d: " fmt, __FUNCTION__, __LINE__, ## args)</div><div class='add'>+	printk(KERN_ERR  "%s:%-5d: " fmt, __func__, __LINE__, ## args)</div><div class='ctx'> </div><div class='ctx'> #define BDX_ASSERT(x) BUG_ON(x)</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> </div><div class='ctx'> #define ENTER          do { \</div><div class='del'>-	printk(KERN_ERR  "%s:%-5d: ENTER\n", __FUNCTION__, __LINE__); \</div><div class='add'>+	printk(KERN_ERR  "%s:%-5d: ENTER\n", __func__, __LINE__); \</div><div class='ctx'> } while (0)</div><div class='ctx'> </div><div class='ctx'> #define RET(args...)   do { \</div><div class='del'>-	printk(KERN_ERR  "%s:%-5d: RETURN\n", __FUNCTION__, __LINE__); \</div><div class='add'>+	printk(KERN_ERR  "%s:%-5d: RETURN\n", __func__, __LINE__); \</div><div class='ctx'> return args; } while (0)</div><div class='ctx'> </div><div class='ctx'> #define DBG(fmt, args...)	\</div><div class='del'>-	printk(KERN_ERR  "%s:%-5d: " fmt, __FUNCTION__, __LINE__, ## args)</div><div class='add'>+	printk(KERN_ERR  "%s:%-5d: " fmt, __func__, __LINE__, ## args)</div><div class='ctx'> #else</div><div class='ctx'> #define ENTER         do {  } while (0)</div><div class='ctx'> #define RET(args...)   return args</div><div class='head'>diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c<br/>index 71d2c5cfdad9..eb9f8f3638e1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/tg3.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/tg3.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/tg3.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/tg3.c</a></div><div class='hunk'>@@ -876,7 +876,7 @@ static void tg3_mdio_config(struct tg3 *tp)</div><div class='ctx'> {</div><div class='ctx'> 	u32 val;</div><div class='ctx'> </div><div class='del'>-	if (tp-&gt;mdio_bus.phy_map[PHY_ADDR]-&gt;interface !=</div><div class='add'>+	if (tp-&gt;mdio_bus-&gt;phy_map[PHY_ADDR]-&gt;interface !=</div><div class='ctx'> 	    PHY_INTERFACE_MODE_RGMII)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -920,9 +920,9 @@ static void tg3_mdio_config(struct tg3 *tp)</div><div class='ctx'> static void tg3_mdio_start(struct tg3 *tp)</div><div class='ctx'> {</div><div class='ctx'> 	if (tp-&gt;tg3_flags3 &amp; TG3_FLG3_MDIOBUS_INITED) {</div><div class='del'>-		mutex_lock(&amp;tp-&gt;mdio_bus.mdio_lock);</div><div class='add'>+		mutex_lock(&amp;tp-&gt;mdio_bus-&gt;mdio_lock);</div><div class='ctx'> 		tp-&gt;tg3_flags3 &amp;= ~TG3_FLG3_MDIOBUS_PAUSED;</div><div class='del'>-		mutex_unlock(&amp;tp-&gt;mdio_bus.mdio_lock);</div><div class='add'>+		mutex_unlock(&amp;tp-&gt;mdio_bus-&gt;mdio_lock);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	tp-&gt;mi_mode &amp;= ~MAC_MI_MODE_AUTO_POLL;</div><div class='hunk'>@@ -936,9 +936,9 @@ static void tg3_mdio_start(struct tg3 *tp)</div><div class='ctx'> static void tg3_mdio_stop(struct tg3 *tp)</div><div class='ctx'> {</div><div class='ctx'> 	if (tp-&gt;tg3_flags3 &amp; TG3_FLG3_MDIOBUS_INITED) {</div><div class='del'>-		mutex_lock(&amp;tp-&gt;mdio_bus.mdio_lock);</div><div class='add'>+		mutex_lock(&amp;tp-&gt;mdio_bus-&gt;mdio_lock);</div><div class='ctx'> 		tp-&gt;tg3_flags3 |= TG3_FLG3_MDIOBUS_PAUSED;</div><div class='del'>-		mutex_unlock(&amp;tp-&gt;mdio_bus.mdio_lock);</div><div class='add'>+		mutex_unlock(&amp;tp-&gt;mdio_bus-&gt;mdio_lock);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -947,7 +947,6 @@ static int tg3_mdio_init(struct tg3 *tp)</div><div class='ctx'> 	int i;</div><div class='ctx'> 	u32 reg;</div><div class='ctx'> 	struct phy_device *phydev;</div><div class='del'>-	struct mii_bus *mdio_bus = &amp;tp-&gt;mdio_bus;</div><div class='ctx'> </div><div class='ctx'> 	tg3_mdio_start(tp);</div><div class='ctx'> </div><div class='hunk'>@@ -955,21 +954,23 @@ static int tg3_mdio_init(struct tg3 *tp)</div><div class='ctx'> 	    (tp-&gt;tg3_flags3 &amp; TG3_FLG3_MDIOBUS_INITED))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	memset(mdio_bus, 0, sizeof(*mdio_bus));</div><div class='add'>+	tp-&gt;mdio_bus = mdiobus_alloc();</div><div class='add'>+	if (tp-&gt;mdio_bus == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	mdio_bus-&gt;name     = "tg3 mdio bus";</div><div class='del'>-	snprintf(mdio_bus-&gt;id, MII_BUS_ID_SIZE, "%x",</div><div class='add'>+	tp-&gt;mdio_bus-&gt;name     = "tg3 mdio bus";</div><div class='add'>+	snprintf(tp-&gt;mdio_bus-&gt;id, MII_BUS_ID_SIZE, "%x",</div><div class='ctx'> 		 (tp-&gt;pdev-&gt;bus-&gt;number &lt;&lt; 8) | tp-&gt;pdev-&gt;devfn);</div><div class='del'>-	mdio_bus-&gt;priv     = tp;</div><div class='del'>-	mdio_bus-&gt;dev      = &amp;tp-&gt;pdev-&gt;dev;</div><div class='del'>-	mdio_bus-&gt;read     = &amp;tg3_mdio_read;</div><div class='del'>-	mdio_bus-&gt;write    = &amp;tg3_mdio_write;</div><div class='del'>-	mdio_bus-&gt;reset    = &amp;tg3_mdio_reset;</div><div class='del'>-	mdio_bus-&gt;phy_mask = ~(1 &lt;&lt; PHY_ADDR);</div><div class='del'>-	mdio_bus-&gt;irq      = &amp;tp-&gt;mdio_irq[0];</div><div class='add'>+	tp-&gt;mdio_bus-&gt;priv     = tp;</div><div class='add'>+	tp-&gt;mdio_bus-&gt;parent   = &amp;tp-&gt;pdev-&gt;dev;</div><div class='add'>+	tp-&gt;mdio_bus-&gt;read     = &amp;tg3_mdio_read;</div><div class='add'>+	tp-&gt;mdio_bus-&gt;write    = &amp;tg3_mdio_write;</div><div class='add'>+	tp-&gt;mdio_bus-&gt;reset    = &amp;tg3_mdio_reset;</div><div class='add'>+	tp-&gt;mdio_bus-&gt;phy_mask = ~(1 &lt;&lt; PHY_ADDR);</div><div class='add'>+	tp-&gt;mdio_bus-&gt;irq      = &amp;tp-&gt;mdio_irq[0];</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; PHY_MAX_ADDR; i++)</div><div class='del'>-		mdio_bus-&gt;irq[i] = PHY_POLL;</div><div class='add'>+		tp-&gt;mdio_bus-&gt;irq[i] = PHY_POLL;</div><div class='ctx'> </div><div class='ctx'> 	/* The bus registration will look for all the PHYs on the mdio bus.</div><div class='ctx'> 	 * Unfortunately, it does not ensure the PHY is powered up before</div><div class='hunk'>@@ -979,7 +980,7 @@ static int tg3_mdio_init(struct tg3 *tp)</div><div class='ctx'> 	if (tg3_readphy(tp, MII_BMCR, &amp;reg) || (reg &amp; BMCR_PDOWN))</div><div class='ctx'> 		tg3_bmcr_reset(tp);</div><div class='ctx'> </div><div class='del'>-	i = mdiobus_register(mdio_bus);</div><div class='add'>+	i = mdiobus_register(tp-&gt;mdio_bus);</div><div class='ctx'> 	if (i) {</div><div class='ctx'> 		printk(KERN_WARNING "%s: mdiobus_reg failed (0x%x)\n",</div><div class='ctx'> 			tp-&gt;dev-&gt;name, i);</div><div class='hunk'>@@ -988,7 +989,7 @@ static int tg3_mdio_init(struct tg3 *tp)</div><div class='ctx'> </div><div class='ctx'> 	tp-&gt;tg3_flags3 |= TG3_FLG3_MDIOBUS_INITED;</div><div class='ctx'> </div><div class='del'>-	phydev = tp-&gt;mdio_bus.phy_map[PHY_ADDR];</div><div class='add'>+	phydev = tp-&gt;mdio_bus-&gt;phy_map[PHY_ADDR];</div><div class='ctx'> </div><div class='ctx'> 	switch (phydev-&gt;phy_id) {</div><div class='ctx'> 	case TG3_PHY_ID_BCM50610:</div><div class='hunk'>@@ -1014,7 +1015,8 @@ static void tg3_mdio_fini(struct tg3 *tp)</div><div class='ctx'> {</div><div class='ctx'> 	if (tp-&gt;tg3_flags3 &amp; TG3_FLG3_MDIOBUS_INITED) {</div><div class='ctx'> 		tp-&gt;tg3_flags3 &amp;= ~TG3_FLG3_MDIOBUS_INITED;</div><div class='del'>-		mdiobus_unregister(&amp;tp-&gt;mdio_bus);</div><div class='add'>+		mdiobus_unregister(tp-&gt;mdio_bus);</div><div class='add'>+		mdiobus_free(tp-&gt;mdio_bus);</div><div class='ctx'> 		tp-&gt;tg3_flags3 &amp;= ~TG3_FLG3_MDIOBUS_PAUSED;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -1220,7 +1222,7 @@ static void tg3_setup_flow_control(struct tg3 *tp, u32 lcladv, u32 rmtadv)</div><div class='ctx'> 	u32 old_tx_mode = tp-&gt;tx_mode;</div><div class='ctx'> </div><div class='ctx'> 	if (tp-&gt;tg3_flags3 &amp; TG3_FLG3_USE_PHYLIB)</div><div class='del'>-		autoneg = tp-&gt;mdio_bus.phy_map[PHY_ADDR]-&gt;autoneg;</div><div class='add'>+		autoneg = tp-&gt;mdio_bus-&gt;phy_map[PHY_ADDR]-&gt;autoneg;</div><div class='ctx'> 	else</div><div class='ctx'> 		autoneg = tp-&gt;link_config.autoneg;</div><div class='ctx'> </div><div class='hunk'>@@ -1257,7 +1259,7 @@ static void tg3_adjust_link(struct net_device *dev)</div><div class='ctx'> 	u8 oldflowctrl, linkmesg = 0;</div><div class='ctx'> 	u32 mac_mode, lcl_adv, rmt_adv;</div><div class='ctx'> 	struct tg3 *tp = netdev_priv(dev);</div><div class='del'>-	struct phy_device *phydev = tp-&gt;mdio_bus.phy_map[PHY_ADDR];</div><div class='add'>+	struct phy_device *phydev = tp-&gt;mdio_bus-&gt;phy_map[PHY_ADDR];</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;tp-&gt;lock);</div><div class='ctx'> </div><div class='hunk'>@@ -1334,7 +1336,7 @@ static int tg3_phy_init(struct tg3 *tp)</div><div class='ctx'> 	/* Bring the PHY back to a known state. */</div><div class='ctx'> 	tg3_bmcr_reset(tp);</div><div class='ctx'> </div><div class='del'>-	phydev = tp-&gt;mdio_bus.phy_map[PHY_ADDR];</div><div class='add'>+	phydev = tp-&gt;mdio_bus-&gt;phy_map[PHY_ADDR];</div><div class='ctx'> </div><div class='ctx'> 	/* Attach the MAC to the PHY. */</div><div class='ctx'> 	phydev = phy_connect(tp-&gt;dev, phydev-&gt;dev.bus_id, tg3_adjust_link,</div><div class='hunk'>@@ -1367,7 +1369,7 @@ static void tg3_phy_start(struct tg3 *tp)</div><div class='ctx'> 	if (!(tp-&gt;tg3_flags3 &amp; TG3_FLG3_PHY_CONNECTED))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	phydev = tp-&gt;mdio_bus.phy_map[PHY_ADDR];</div><div class='add'>+	phydev = tp-&gt;mdio_bus-&gt;phy_map[PHY_ADDR];</div><div class='ctx'> </div><div class='ctx'> 	if (tp-&gt;link_config.phy_is_low_power) {</div><div class='ctx'> 		tp-&gt;link_config.phy_is_low_power = 0;</div><div class='hunk'>@@ -1387,13 +1389,13 @@ static void tg3_phy_stop(struct tg3 *tp)</div><div class='ctx'> 	if (!(tp-&gt;tg3_flags3 &amp; TG3_FLG3_PHY_CONNECTED))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	phy_stop(tp-&gt;mdio_bus.phy_map[PHY_ADDR]);</div><div class='add'>+	phy_stop(tp-&gt;mdio_bus-&gt;phy_map[PHY_ADDR]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void tg3_phy_fini(struct tg3 *tp)</div><div class='ctx'> {</div><div class='ctx'> 	if (tp-&gt;tg3_flags3 &amp; TG3_FLG3_PHY_CONNECTED) {</div><div class='del'>-		phy_disconnect(tp-&gt;mdio_bus.phy_map[PHY_ADDR]);</div><div class='add'>+		phy_disconnect(tp-&gt;mdio_bus-&gt;phy_map[PHY_ADDR]);</div><div class='ctx'> 		tp-&gt;tg3_flags3 &amp;= ~TG3_FLG3_PHY_CONNECTED;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -2049,7 +2051,7 @@ static int tg3_set_power_state(struct tg3 *tp, pci_power_t state)</div><div class='ctx'> 			struct phy_device *phydev;</div><div class='ctx'> 			u32 advertising;</div><div class='ctx'> </div><div class='del'>-			phydev = tp-&gt;mdio_bus.phy_map[PHY_ADDR];</div><div class='add'>+			phydev = tp-&gt;mdio_bus-&gt;phy_map[PHY_ADDR];</div><div class='ctx'> </div><div class='ctx'> 			tp-&gt;link_config.phy_is_low_power = 1;</div><div class='ctx'> </div><div class='hunk'>@@ -3861,10 +3863,7 @@ static void tg3_tx(struct tg3 *tp)</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		pci_unmap_single(tp-&gt;pdev,</div><div class='del'>-				 pci_unmap_addr(ri, mapping),</div><div class='del'>-				 skb_headlen(skb),</div><div class='del'>-				 PCI_DMA_TODEVICE);</div><div class='add'>+		skb_dma_unmap(&amp;tp-&gt;pdev-&gt;dev, skb, DMA_TO_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 		ri-&gt;skb = NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -3874,12 +3873,6 @@ static void tg3_tx(struct tg3 *tp)</div><div class='ctx'> 			ri = &amp;tp-&gt;tx_buffers[sw_idx];</div><div class='ctx'> 			if (unlikely(ri-&gt;skb != NULL || sw_idx == hw_idx))</div><div class='ctx'> 				tx_bug = 1;</div><div class='del'>-</div><div class='del'>-			pci_unmap_page(tp-&gt;pdev,</div><div class='del'>-				       pci_unmap_addr(ri, mapping),</div><div class='del'>-				       skb_shinfo(skb)-&gt;frags[i].size,</div><div class='del'>-				       PCI_DMA_TODEVICE);</div><div class='del'>-</div><div class='ctx'> 			sw_idx = NEXT_TX(sw_idx);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -4633,12 +4626,16 @@ static int tigon3_dma_hwbug_workaround(struct tg3 *tp, struct sk_buff *skb,</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* New SKB is guaranteed to be linear. */</div><div class='ctx'> 		entry = *start;</div><div class='del'>-		new_addr = pci_map_single(tp-&gt;pdev, new_skb-&gt;data, new_skb-&gt;len,</div><div class='del'>-					  PCI_DMA_TODEVICE);</div><div class='add'>+		ret = skb_dma_map(&amp;tp-&gt;pdev-&gt;dev, new_skb, DMA_TO_DEVICE);</div><div class='add'>+		new_addr = skb_shinfo(new_skb)-&gt;dma_maps[0];</div><div class='add'>+</div><div class='ctx'> 		/* Make sure new skb does not cross any 4G boundaries.</div><div class='ctx'> 		 * Drop the packet if it does.</div><div class='ctx'> 		 */</div><div class='del'>-		if (tg3_4g_overflow_test(new_addr, new_skb-&gt;len)) {</div><div class='add'>+		if (ret || tg3_4g_overflow_test(new_addr, new_skb-&gt;len)) {</div><div class='add'>+			if (!ret)</div><div class='add'>+				skb_dma_unmap(&amp;tp-&gt;pdev-&gt;dev, new_skb,</div><div class='add'>+					      DMA_TO_DEVICE);</div><div class='ctx'> 			ret = -1;</div><div class='ctx'> 			dev_kfree_skb(new_skb);</div><div class='ctx'> 			new_skb = NULL;</div><div class='hunk'>@@ -4652,18 +4649,8 @@ static int tigon3_dma_hwbug_workaround(struct tg3 *tp, struct sk_buff *skb,</div><div class='ctx'> 	/* Now clean up the sw ring entries. */</div><div class='ctx'> 	i = 0;</div><div class='ctx'> 	while (entry != last_plus_one) {</div><div class='del'>-		int len;</div><div class='del'>-</div><div class='del'>-		if (i == 0)</div><div class='del'>-			len = skb_headlen(skb);</div><div class='del'>-		else</div><div class='del'>-			len = skb_shinfo(skb)-&gt;frags[i-1].size;</div><div class='del'>-		pci_unmap_single(tp-&gt;pdev,</div><div class='del'>-				 pci_unmap_addr(&amp;tp-&gt;tx_buffers[entry], mapping),</div><div class='del'>-				 len, PCI_DMA_TODEVICE);</div><div class='ctx'> 		if (i == 0) {</div><div class='ctx'> 			tp-&gt;tx_buffers[entry].skb = new_skb;</div><div class='del'>-			pci_unmap_addr_set(&amp;tp-&gt;tx_buffers[entry], mapping, new_addr);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			tp-&gt;tx_buffers[entry].skb = NULL;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -4671,6 +4658,7 @@ static int tigon3_dma_hwbug_workaround(struct tg3 *tp, struct sk_buff *skb,</div><div class='ctx'> 		i++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	skb_dma_unmap(&amp;tp-&gt;pdev-&gt;dev, skb, DMA_TO_DEVICE);</div><div class='ctx'> 	dev_kfree_skb(skb);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -4705,8 +4693,9 @@ static void tg3_set_txd(struct tg3 *tp, int entry,</div><div class='ctx'> static int tg3_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct tg3 *tp = netdev_priv(dev);</div><div class='del'>-	dma_addr_t mapping;</div><div class='ctx'> 	u32 len, entry, base_flags, mss;</div><div class='add'>+	struct skb_shared_info *sp;</div><div class='add'>+	dma_addr_t mapping;</div><div class='ctx'> </div><div class='ctx'> 	len = skb_headlen(skb);</div><div class='ctx'> </div><div class='hunk'>@@ -4765,11 +4754,16 @@ static int tg3_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 			       (vlan_tx_tag_get(skb) &lt;&lt; 16));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	/* Queue skb data, a.k.a. the main skb fragment. */</div><div class='del'>-	mapping = pci_map_single(tp-&gt;pdev, skb-&gt;data, len, PCI_DMA_TODEVICE);</div><div class='add'>+	if (skb_dma_map(&amp;tp-&gt;pdev-&gt;dev, skb, DMA_TO_DEVICE)) {</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sp = skb_shinfo(skb);</div><div class='add'>+</div><div class='add'>+	mapping = sp-&gt;dma_maps[0];</div><div class='ctx'> </div><div class='ctx'> 	tp-&gt;tx_buffers[entry].skb = skb;</div><div class='del'>-	pci_unmap_addr_set(&amp;tp-&gt;tx_buffers[entry], mapping, mapping);</div><div class='ctx'> </div><div class='ctx'> 	tg3_set_txd(tp, entry, mapping, len, base_flags,</div><div class='ctx'> 		    (skb_shinfo(skb)-&gt;nr_frags == 0) | (mss &lt;&lt; 1));</div><div class='hunk'>@@ -4785,13 +4779,8 @@ static int tg3_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 			skb_frag_t *frag = &amp;skb_shinfo(skb)-&gt;frags[i];</div><div class='ctx'> </div><div class='ctx'> 			len = frag-&gt;size;</div><div class='del'>-			mapping = pci_map_page(tp-&gt;pdev,</div><div class='del'>-					       frag-&gt;page,</div><div class='del'>-					       frag-&gt;page_offset,</div><div class='del'>-					       len, PCI_DMA_TODEVICE);</div><div class='del'>-</div><div class='add'>+			mapping = sp-&gt;dma_maps[i + 1];</div><div class='ctx'> 			tp-&gt;tx_buffers[entry].skb = NULL;</div><div class='del'>-			pci_unmap_addr_set(&amp;tp-&gt;tx_buffers[entry], mapping, mapping);</div><div class='ctx'> </div><div class='ctx'> 			tg3_set_txd(tp, entry, mapping, len,</div><div class='ctx'> 				    base_flags, (i == last) | (mss &lt;&lt; 1));</div><div class='hunk'>@@ -4859,9 +4848,10 @@ tg3_tso_bug_end:</div><div class='ctx'> static int tg3_start_xmit_dma_bug(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct tg3 *tp = netdev_priv(dev);</div><div class='del'>-	dma_addr_t mapping;</div><div class='ctx'> 	u32 len, entry, base_flags, mss;</div><div class='add'>+	struct skb_shared_info *sp;</div><div class='ctx'> 	int would_hit_hwbug;</div><div class='add'>+	dma_addr_t mapping;</div><div class='ctx'> </div><div class='ctx'> 	len = skb_headlen(skb);</div><div class='ctx'> </div><div class='hunk'>@@ -4942,11 +4932,16 @@ static int tg3_start_xmit_dma_bug(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 			       (vlan_tx_tag_get(skb) &lt;&lt; 16));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	/* Queue skb data, a.k.a. the main skb fragment. */</div><div class='del'>-	mapping = pci_map_single(tp-&gt;pdev, skb-&gt;data, len, PCI_DMA_TODEVICE);</div><div class='add'>+	if (skb_dma_map(&amp;tp-&gt;pdev-&gt;dev, skb, DMA_TO_DEVICE)) {</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sp = skb_shinfo(skb);</div><div class='add'>+</div><div class='add'>+	mapping = sp-&gt;dma_maps[0];</div><div class='ctx'> </div><div class='ctx'> 	tp-&gt;tx_buffers[entry].skb = skb;</div><div class='del'>-	pci_unmap_addr_set(&amp;tp-&gt;tx_buffers[entry], mapping, mapping);</div><div class='ctx'> </div><div class='ctx'> 	would_hit_hwbug = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -4969,13 +4964,9 @@ static int tg3_start_xmit_dma_bug(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 			skb_frag_t *frag = &amp;skb_shinfo(skb)-&gt;frags[i];</div><div class='ctx'> </div><div class='ctx'> 			len = frag-&gt;size;</div><div class='del'>-			mapping = pci_map_page(tp-&gt;pdev,</div><div class='del'>-					       frag-&gt;page,</div><div class='del'>-					       frag-&gt;page_offset,</div><div class='del'>-					       len, PCI_DMA_TODEVICE);</div><div class='add'>+			mapping = sp-&gt;dma_maps[i + 1];</div><div class='ctx'> </div><div class='ctx'> 			tp-&gt;tx_buffers[entry].skb = NULL;</div><div class='del'>-			pci_unmap_addr_set(&amp;tp-&gt;tx_buffers[entry], mapping, mapping);</div><div class='ctx'> </div><div class='ctx'> 			if (tg3_4g_overflow_test(mapping, len))</div><div class='ctx'> 				would_hit_hwbug = 1;</div><div class='hunk'>@@ -5128,7 +5119,6 @@ static void tg3_free_rings(struct tg3 *tp)</div><div class='ctx'> 	for (i = 0; i &lt; TG3_TX_RING_SIZE; ) {</div><div class='ctx'> 		struct tx_ring_info *txp;</div><div class='ctx'> 		struct sk_buff *skb;</div><div class='del'>-		int j;</div><div class='ctx'> </div><div class='ctx'> 		txp = &amp;tp-&gt;tx_buffers[i];</div><div class='ctx'> 		skb = txp-&gt;skb;</div><div class='hunk'>@@ -5138,22 +5128,11 @@ static void tg3_free_rings(struct tg3 *tp)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		pci_unmap_single(tp-&gt;pdev,</div><div class='del'>-				 pci_unmap_addr(txp, mapping),</div><div class='del'>-				 skb_headlen(skb),</div><div class='del'>-				 PCI_DMA_TODEVICE);</div><div class='del'>-		txp-&gt;skb = NULL;</div><div class='add'>+		skb_dma_unmap(&amp;tp-&gt;pdev-&gt;dev, skb, DMA_TO_DEVICE);</div><div class='ctx'> </div><div class='del'>-		i++;</div><div class='add'>+		txp-&gt;skb = NULL;</div><div class='ctx'> </div><div class='del'>-		for (j = 0; j &lt; skb_shinfo(skb)-&gt;nr_frags; j++) {</div><div class='del'>-			txp = &amp;tp-&gt;tx_buffers[i &amp; (TG3_TX_RING_SIZE - 1)];</div><div class='del'>-			pci_unmap_page(tp-&gt;pdev,</div><div class='del'>-				       pci_unmap_addr(txp, mapping),</div><div class='del'>-				       skb_shinfo(skb)-&gt;frags[j].size,</div><div class='del'>-				       PCI_DMA_TODEVICE);</div><div class='del'>-			i++;</div><div class='del'>-		}</div><div class='add'>+		i += skb_shinfo(skb)-&gt;nr_frags + 1;</div><div class='ctx'> </div><div class='ctx'> 		dev_kfree_skb_any(skb);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -8977,7 +8956,7 @@ static int tg3_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)</div><div class='ctx'> 	if (tp-&gt;tg3_flags3 &amp; TG3_FLG3_USE_PHYLIB) {</div><div class='ctx'> 		if (!(tp-&gt;tg3_flags3 &amp; TG3_FLG3_PHY_CONNECTED))</div><div class='ctx'> 			return -EAGAIN;</div><div class='del'>-		return phy_ethtool_gset(tp-&gt;mdio_bus.phy_map[PHY_ADDR], cmd);</div><div class='add'>+		return phy_ethtool_gset(tp-&gt;mdio_bus-&gt;phy_map[PHY_ADDR], cmd);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	cmd-&gt;supported = (SUPPORTED_Autoneg);</div><div class='hunk'>@@ -9018,7 +8997,7 @@ static int tg3_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)</div><div class='ctx'> 	if (tp-&gt;tg3_flags3 &amp; TG3_FLG3_USE_PHYLIB) {</div><div class='ctx'> 		if (!(tp-&gt;tg3_flags3 &amp; TG3_FLG3_PHY_CONNECTED))</div><div class='ctx'> 			return -EAGAIN;</div><div class='del'>-		return phy_ethtool_sset(tp-&gt;mdio_bus.phy_map[PHY_ADDR], cmd);</div><div class='add'>+		return phy_ethtool_sset(tp-&gt;mdio_bus-&gt;phy_map[PHY_ADDR], cmd);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (tp-&gt;tg3_flags2 &amp; TG3_FLG2_ANY_SERDES) {</div><div class='hunk'>@@ -9166,7 +9145,7 @@ static int tg3_nway_reset(struct net_device *dev)</div><div class='ctx'> 	if (tp-&gt;tg3_flags3 &amp; TG3_FLG3_USE_PHYLIB) {</div><div class='ctx'> 		if (!(tp-&gt;tg3_flags3 &amp; TG3_FLG3_PHY_CONNECTED))</div><div class='ctx'> 			return -EAGAIN;</div><div class='del'>-		r = phy_start_aneg(tp-&gt;mdio_bus.phy_map[PHY_ADDR]);</div><div class='add'>+		r = phy_start_aneg(tp-&gt;mdio_bus-&gt;phy_map[PHY_ADDR]);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		u32 bmcr;</div><div class='ctx'> </div><div class='hunk'>@@ -9283,7 +9262,7 @@ static int tg3_set_pauseparam(struct net_device *dev, struct ethtool_pauseparam</div><div class='ctx'> 			u32 newadv;</div><div class='ctx'> 			struct phy_device *phydev;</div><div class='ctx'> </div><div class='del'>-			phydev = tp-&gt;mdio_bus.phy_map[PHY_ADDR];</div><div class='add'>+			phydev = tp-&gt;mdio_bus-&gt;phy_map[PHY_ADDR];</div><div class='ctx'> </div><div class='ctx'> 			if (epause-&gt;rx_pause) {</div><div class='ctx'> 				if (epause-&gt;tx_pause)</div><div class='hunk'>@@ -10265,7 +10244,7 @@ static int tg3_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)</div><div class='ctx'> 	if (tp-&gt;tg3_flags3 &amp; TG3_FLG3_USE_PHYLIB) {</div><div class='ctx'> 		if (!(tp-&gt;tg3_flags3 &amp; TG3_FLG3_PHY_CONNECTED))</div><div class='ctx'> 			return -EAGAIN;</div><div class='del'>-		return phy_mii_ioctl(tp-&gt;mdio_bus.phy_map[PHY_ADDR], data, cmd);</div><div class='add'>+		return phy_mii_ioctl(tp-&gt;mdio_bus-&gt;phy_map[PHY_ADDR], data, cmd);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	switch(cmd) {</div><div class='head'>diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h<br/>index f5b8cab8d4b5..be252abe8985 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/tg3.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/tg3.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/tg3.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/tg3.h</a></div><div class='hunk'>@@ -2197,7 +2197,6 @@ struct ring_info {</div><div class='ctx'> </div><div class='ctx'> struct tx_ring_info {</div><div class='ctx'> 	struct sk_buff			*skb;</div><div class='del'>-	DECLARE_PCI_UNMAP_ADDR(mapping)</div><div class='ctx'> 	u32				prev_vlan_tag;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2557,7 +2556,7 @@ struct tg3 {</div><div class='ctx'> 	int				msi_cap;</div><div class='ctx'> 	int				pcix_cap;</div><div class='ctx'> </div><div class='del'>-	struct mii_bus			mdio_bus;</div><div class='add'>+	struct mii_bus			*mdio_bus;</div><div class='ctx'> 	int				mdio_irq[PHY_MAX_ADDR];</div><div class='ctx'> </div><div class='ctx'> 	/* PHY info */</div><div class='head'>diff --git a/drivers/net/tlan.c b/drivers/net/tlan.c<br/>index ec871f646766..c41d68761364 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/tlan.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/tlan.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/tlan.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/tlan.c</a></div><div class='hunk'>@@ -29,7 +29,8 @@</div><div class='ctx'>  *</div><div class='ctx'>  *	Tigran Aivazian &lt;tigran@sco.com&gt;:	TLan_PciProbe() now uses</div><div class='ctx'>  *						new PCI BIOS interface.</div><div class='del'>- *	Alan Cox	&lt;alan@redhat.com&gt;:	Fixed the out of memory</div><div class='add'>+ *	Alan Cox	&lt;alan@lxorguk.ukuu.org.uk&gt;:</div><div class='add'>+ *						Fixed the out of memory</div><div class='ctx'>  *						handling.</div><div class='ctx'>  *</div><div class='ctx'>  *	Torben Mathiasen &lt;torben.mathiasen@compaq.com&gt; New Maintainer!</div><div class='head'>diff --git a/drivers/net/tokenring/smctr.c b/drivers/net/tokenring/smctr.c<br/>index fa73e6eed6be..ed50d288e494 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/tokenring/smctr.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/tokenring/smctr.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/tokenring/smctr.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/tokenring/smctr.c</a></div><div class='hunk'>@@ -25,7 +25,7 @@</div><div class='ctx'>  *  To do:</div><div class='ctx'>  *    1. Multicast support.</div><div class='ctx'>  *</div><div class='del'>- *  Initial 2.5 cleanup Alan Cox &lt;alan@redhat.com&gt;  2002/10/28</div><div class='add'>+ *  Initial 2.5 cleanup Alan Cox &lt;alan@lxorguk.ukuu.org.uk&gt;  2002/10/28</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='head'>diff --git a/drivers/net/tsi108_eth.c b/drivers/net/tsi108_eth.c<br/>index 43fde99b24ac..eb1da6f0b086 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/tsi108_eth.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/tsi108_eth.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/tsi108_eth.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/tsi108_eth.c</a></div><div class='hunk'>@@ -263,7 +263,7 @@ static inline void tsi108_write_tbi(struct tsi108_prv_data *data,</div><div class='ctx'> 			return;</div><div class='ctx'> 		udelay(10);</div><div class='ctx'> 	}</div><div class='del'>-	printk(KERN_ERR "%s function time out \n", __FUNCTION__);</div><div class='add'>+	printk(KERN_ERR "%s function time out \n", __func__);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mii_speed(struct mii_if_info *mii)</div><div class='hunk'>@@ -1059,7 +1059,7 @@ static void tsi108_stop_ethernet(struct net_device *dev)</div><div class='ctx'> 			return;</div><div class='ctx'> 		udelay(10);</div><div class='ctx'> 	}</div><div class='del'>-	printk(KERN_ERR "%s function time out \n", __FUNCTION__);</div><div class='add'>+	printk(KERN_ERR "%s function time out \n", __func__);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void tsi108_reset_ether(struct tsi108_prv_data * data)</div><div class='hunk'>@@ -1244,7 +1244,7 @@ static void tsi108_init_phy(struct net_device *dev)</div><div class='ctx'> 		udelay(10);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (i == 0)</div><div class='del'>-		printk(KERN_ERR "%s function time out \n", __FUNCTION__);</div><div class='add'>+		printk(KERN_ERR "%s function time out \n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	if (data-&gt;phy_type == TSI108_PHY_BCM54XX) {</div><div class='ctx'> 		tsi108_write_mii(data, 0x09, 0x0300);</div><div class='head'>diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c<br/>index 9281d06d5aaa..124d5d690dde 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/tulip/de2104x.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/tulip/de2104x.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/tulip/de2104x.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/tulip/de2104x.c</a></div><div class='hunk'>@@ -1418,7 +1418,6 @@ static int de_close (struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	de_free_rings(de);</div><div class='ctx'> 	de_adapter_sleep(de);</div><div class='del'>-	pci_disable_device(de-&gt;pdev);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1689,6 +1688,7 @@ static void __devinit de21040_get_mac_address (struct de_private *de)</div><div class='ctx'> 	unsigned i;</div><div class='ctx'> </div><div class='ctx'> 	dw32 (ROMCmd, 0);	/* Reset the pointer with a dummy write. */</div><div class='add'>+	udelay(5);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 6; i++) {</div><div class='ctx'> 		int value, boguscnt = 100000;</div><div class='head'>diff --git a/drivers/net/tulip/de4x5.c b/drivers/net/tulip/de4x5.c<br/>index 617ef41bdfea..6444cbec0bdc 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/tulip/de4x5.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/tulip/de4x5.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/tulip/de4x5.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/tulip/de4x5.c</a></div><div class='hunk'>@@ -832,7 +832,7 @@ struct de4x5_private {</div><div class='ctx'> 	s32 csr14;                          /* Saved SIA TX/RX Register     */</div><div class='ctx'> 	s32 csr15;                          /* Saved SIA General Register   */</div><div class='ctx'> 	int save_cnt;                       /* Flag if state already saved  */</div><div class='del'>-	struct sk_buff *skb;                /* Save the (re-ordered) skb's  */</div><div class='add'>+	struct sk_buff_head queue;          /* Save the (re-ordered) skb's  */</div><div class='ctx'>     } cache;</div><div class='ctx'>     struct de4x5_srom srom;                 /* A copy of the SROM           */</div><div class='ctx'>     int cfrv;				    /* Card CFRV copy */</div><div class='hunk'>@@ -1128,6 +1128,7 @@ de4x5_hw_init(struct net_device *dev, u_long iobase, struct device *gendev)</div><div class='ctx'> 	printk("      which has an Ethernet PROM CRC error.\n");</div><div class='ctx'> 	return -ENXIO;</div><div class='ctx'>     } else {</div><div class='add'>+	skb_queue_head_init(&amp;lp-&gt;cache.queue);</div><div class='ctx'> 	lp-&gt;cache.gepc = GEP_INIT;</div><div class='ctx'> 	lp-&gt;asBit = GEP_SLNK;</div><div class='ctx'> 	lp-&gt;asPolarity = GEP_SLNK;</div><div class='hunk'>@@ -1487,7 +1488,7 @@ de4x5_queue_pkt(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	}</div><div class='ctx'>     } else if (skb-&gt;len &gt; 0) {</div><div class='ctx'> 	/* If we already have stuff queued locally, use that first */</div><div class='del'>-	if (lp-&gt;cache.skb &amp;&amp; !lp-&gt;interrupt) {</div><div class='add'>+	if (!skb_queue_empty(&amp;lp-&gt;cache.queue) &amp;&amp; !lp-&gt;interrupt) {</div><div class='ctx'> 	    de4x5_put_cache(dev, skb);</div><div class='ctx'> 	    skb = de4x5_get_cache(dev);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1580,7 +1581,7 @@ de4x5_interrupt(int irq, void *dev_id)</div><div class='ctx'> </div><div class='ctx'>     /* Load the TX ring with any locally stored packets */</div><div class='ctx'>     if (!test_and_set_bit(0, (void *)&amp;lp-&gt;cache.lock)) {</div><div class='del'>-	while (lp-&gt;cache.skb &amp;&amp; !netif_queue_stopped(dev) &amp;&amp; lp-&gt;tx_enable) {</div><div class='add'>+	while (!skb_queue_empty(&amp;lp-&gt;cache.queue) &amp;&amp; !netif_queue_stopped(dev) &amp;&amp; lp-&gt;tx_enable) {</div><div class='ctx'> 	    de4x5_queue_pkt(de4x5_get_cache(dev), dev);</div><div class='ctx'> 	}</div><div class='ctx'> 	lp-&gt;cache.lock = 0;</div><div class='hunk'>@@ -3679,11 +3680,7 @@ de4x5_free_tx_buffs(struct net_device *dev)</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     /* Unload the locally queued packets */</div><div class='del'>-    while (lp-&gt;cache.skb) {</div><div class='del'>-	dev_kfree_skb(de4x5_get_cache(dev));</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    return;</div><div class='add'>+    __skb_queue_purge(&amp;lp-&gt;cache.queue);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -3781,43 +3778,24 @@ static void</div><div class='ctx'> de4x5_put_cache(struct net_device *dev, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'>     struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-    struct sk_buff *p;</div><div class='del'>-</div><div class='del'>-    if (lp-&gt;cache.skb) {</div><div class='del'>-	for (p=lp-&gt;cache.skb; p-&gt;next; p=p-&gt;next);</div><div class='del'>-	p-&gt;next = skb;</div><div class='del'>-    } else {</div><div class='del'>-	lp-&gt;cache.skb = skb;</div><div class='del'>-    }</div><div class='del'>-    skb-&gt;next = NULL;</div><div class='ctx'> </div><div class='del'>-    return;</div><div class='add'>+    __skb_queue_tail(&amp;lp-&gt;cache.queue, skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> de4x5_putb_cache(struct net_device *dev, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'>     struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-    struct sk_buff *p = lp-&gt;cache.skb;</div><div class='del'>-</div><div class='del'>-    lp-&gt;cache.skb = skb;</div><div class='del'>-    skb-&gt;next = p;</div><div class='ctx'> </div><div class='del'>-    return;</div><div class='add'>+    __skb_queue_head(&amp;lp-&gt;cache.queue, skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct sk_buff *</div><div class='ctx'> de4x5_get_cache(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'>     struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-    struct sk_buff *p = lp-&gt;cache.skb;</div><div class='ctx'> </div><div class='del'>-    if (p) {</div><div class='del'>-	lp-&gt;cache.skb = p-&gt;next;</div><div class='del'>-	p-&gt;next = NULL;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    return p;</div><div class='add'>+    return __skb_dequeue(&amp;lp-&gt;cache.queue);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/drivers/net/tulip/dmfe.c b/drivers/net/tulip/dmfe.c<br/>index 656200472fa1..8e46a513a252 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/tulip/dmfe.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/tulip/dmfe.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/tulip/dmfe.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/tulip/dmfe.c</a></div><div class='hunk'>@@ -23,7 +23,7 @@</div><div class='ctx'>     Marcelo Tosatti &lt;marcelo@conectiva.com.br&gt; :</div><div class='ctx'>     Made it compile in 2.3 (device to net_device)</div><div class='ctx'> </div><div class='del'>-    Alan Cox &lt;alan@redhat.com&gt; :</div><div class='add'>+    Alan Cox &lt;alan@lxorguk.ukuu.org.uk&gt; :</div><div class='ctx'>     Cleaned up for kernel merge.</div><div class='ctx'>     Removed the back compatibility support</div><div class='ctx'>     Reformatted, fixing spelling etc as I went</div><div class='hunk'>@@ -49,7 +49,7 @@</div><div class='ctx'>     support.  Updated PCI resource allocation.  Do not</div><div class='ctx'>     forget to unmap PCI mapped skbs.</div><div class='ctx'> </div><div class='del'>-    Alan Cox &lt;alan@redhat.com&gt;</div><div class='add'>+    Alan Cox &lt;alan@lxorguk.ukuu.org.uk&gt;</div><div class='ctx'>     Added new PCI identifiers provided by Clear Zhang at ALi</div><div class='ctx'>     for their 1563 ethernet device.</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c<br/>index 8f944e57fd55..c87747bb24c5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/ucc_geth.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/ucc_geth.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/ucc_geth.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/ucc_geth.c</a></div><div class='hunk'>@@ -400,7 +400,7 @@ static struct enet_addr_container *get_enet_addr_container(void)</div><div class='ctx'> 	enet_addr_cont = kmalloc(sizeof(struct enet_addr_container), GFP_KERNEL);</div><div class='ctx'> 	if (!enet_addr_cont) {</div><div class='ctx'> 		ugeth_err("%s: No memory for enet_addr_container object.",</div><div class='del'>-			  __FUNCTION__);</div><div class='add'>+			  __func__);</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -427,7 +427,7 @@ static int hw_add_addr_in_paddr(struct ucc_geth_private *ugeth,</div><div class='ctx'> 	struct ucc_geth_82xx_address_filtering_pram *p_82xx_addr_filt;</div><div class='ctx'> </div><div class='ctx'> 	if (!(paddr_num &lt; NUM_OF_PADDRS)) {</div><div class='del'>-		ugeth_warn("%s: Illegal paddr_num.", __FUNCTION__);</div><div class='add'>+		ugeth_warn("%s: Illegal paddr_num.", __func__);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -447,7 +447,7 @@ static int hw_clear_addr_in_paddr(struct ucc_geth_private *ugeth, u8 paddr_num)</div><div class='ctx'> 	struct ucc_geth_82xx_address_filtering_pram __iomem *p_82xx_addr_filt;</div><div class='ctx'> </div><div class='ctx'> 	if (!(paddr_num &lt; NUM_OF_PADDRS)) {</div><div class='del'>-		ugeth_warn("%s: Illagel paddr_num.", __FUNCTION__);</div><div class='add'>+		ugeth_warn("%s: Illagel paddr_num.", __func__);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1441,7 +1441,7 @@ static int adjust_enet_interface(struct ucc_geth_private *ugeth)</div><div class='ctx'> 	u32 upsmr, maccfg2, tbiBaseAddress;</div><div class='ctx'> 	u16 value;</div><div class='ctx'> </div><div class='del'>-	ugeth_vdbg("%s: IN", __FUNCTION__);</div><div class='add'>+	ugeth_vdbg("%s: IN", __func__);</div><div class='ctx'> </div><div class='ctx'> 	ug_info = ugeth-&gt;ug_info;</div><div class='ctx'> 	ug_regs = ugeth-&gt;ug_regs;</div><div class='hunk'>@@ -1504,7 +1504,7 @@ static int adjust_enet_interface(struct ucc_geth_private *ugeth)</div><div class='ctx'> 	if (ret_val != 0) {</div><div class='ctx'> 		if (netif_msg_probe(ugeth))</div><div class='ctx'> 			ugeth_err("%s: Preamble length must be between 3 and 7 inclusive.",</div><div class='del'>-			     __FUNCTION__);</div><div class='add'>+			     __func__);</div><div class='ctx'> 		return ret_val;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1744,7 +1744,7 @@ static int ugeth_enable(struct ucc_geth_private *ugeth, enum comm_dir mode)</div><div class='ctx'> 	/* check if the UCC number is in range. */</div><div class='ctx'> 	if (ugeth-&gt;ug_info-&gt;uf_info.ucc_num &gt;= UCC_MAX_NUM) {</div><div class='ctx'> 		if (netif_msg_probe(ugeth))</div><div class='del'>-			ugeth_err("%s: ucc_num out of range.", __FUNCTION__);</div><div class='add'>+			ugeth_err("%s: ucc_num out of range.", __func__);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1773,7 +1773,7 @@ static int ugeth_disable(struct ucc_geth_private * ugeth, enum comm_dir mode)</div><div class='ctx'> 	/* check if the UCC number is in range. */</div><div class='ctx'> 	if (ugeth-&gt;ug_info-&gt;uf_info.ucc_num &gt;= UCC_MAX_NUM) {</div><div class='ctx'> 		if (netif_msg_probe(ugeth))</div><div class='del'>-			ugeth_err("%s: ucc_num out of range.", __FUNCTION__);</div><div class='add'>+			ugeth_err("%s: ucc_num out of range.", __func__);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2062,7 +2062,7 @@ static int ugeth_82xx_filtering_add_addr_in_paddr(struct ucc_geth_private *ugeth</div><div class='ctx'> 		ugeth_warn</div><div class='ctx'> 		    ("%s: multicast address added to paddr will have no "</div><div class='ctx'> 		     "effect - is this what you wanted?",</div><div class='del'>-		     __FUNCTION__);</div><div class='add'>+		     __func__);</div><div class='ctx'> </div><div class='ctx'> 	ugeth-&gt;indAddrRegUsed[paddr_num] = 1;	/* mark this paddr as used */</div><div class='ctx'> 	/* store address in our database */</div><div class='hunk'>@@ -2278,7 +2278,7 @@ static void ucc_geth_stop(struct ucc_geth_private *ugeth)</div><div class='ctx'> 	struct phy_device *phydev = ugeth-&gt;phydev;</div><div class='ctx'> 	u32 tempval;</div><div class='ctx'> </div><div class='del'>-	ugeth_vdbg("%s: IN", __FUNCTION__);</div><div class='add'>+	ugeth_vdbg("%s: IN", __func__);</div><div class='ctx'> </div><div class='ctx'> 	/* Disable the controller */</div><div class='ctx'> 	ugeth_disable(ugeth, COMM_DIR_RX_AND_TX);</div><div class='hunk'>@@ -2315,7 +2315,7 @@ static int ucc_struct_init(struct ucc_geth_private *ugeth)</div><div class='ctx'> 	      (uf_info-&gt;bd_mem_part == MEM_PART_MURAM))) {</div><div class='ctx'> 		if (netif_msg_probe(ugeth))</div><div class='ctx'> 			ugeth_err("%s: Bad memory partition value.",</div><div class='del'>-					__FUNCTION__);</div><div class='add'>+					__func__);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2327,7 +2327,7 @@ static int ucc_struct_init(struct ucc_geth_private *ugeth)</div><div class='ctx'> 			if (netif_msg_probe(ugeth))</div><div class='ctx'> 				ugeth_err</div><div class='ctx'> 				    ("%s: Rx BD ring length must be multiple of 4, no smaller than 8.",</div><div class='del'>-					__FUNCTION__);</div><div class='add'>+					__func__);</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2338,7 +2338,7 @@ static int ucc_struct_init(struct ucc_geth_private *ugeth)</div><div class='ctx'> 			if (netif_msg_probe(ugeth))</div><div class='ctx'> 				ugeth_err</div><div class='ctx'> 				    ("%s: Tx BD ring length must be no smaller than 2.",</div><div class='del'>-				     __FUNCTION__);</div><div class='add'>+				     __func__);</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2349,21 +2349,21 @@ static int ucc_struct_init(struct ucc_geth_private *ugeth)</div><div class='ctx'> 		if (netif_msg_probe(ugeth))</div><div class='ctx'> 			ugeth_err</div><div class='ctx'> 			    ("%s: max_rx_buf_length must be non-zero multiple of 128.",</div><div class='del'>-			     __FUNCTION__);</div><div class='add'>+			     __func__);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* num Tx queues */</div><div class='ctx'> 	if (ug_info-&gt;numQueuesTx &gt; NUM_TX_QUEUES) {</div><div class='ctx'> 		if (netif_msg_probe(ugeth))</div><div class='del'>-			ugeth_err("%s: number of tx queues too large.", __FUNCTION__);</div><div class='add'>+			ugeth_err("%s: number of tx queues too large.", __func__);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* num Rx queues */</div><div class='ctx'> 	if (ug_info-&gt;numQueuesRx &gt; NUM_RX_QUEUES) {</div><div class='ctx'> 		if (netif_msg_probe(ugeth))</div><div class='del'>-			ugeth_err("%s: number of rx queues too large.", __FUNCTION__);</div><div class='add'>+			ugeth_err("%s: number of rx queues too large.", __func__);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2374,7 +2374,7 @@ static int ucc_struct_init(struct ucc_geth_private *ugeth)</div><div class='ctx'> 				ugeth_err</div><div class='ctx'> 				    ("%s: VLAN priority table entry must not be"</div><div class='ctx'> 					" larger than number of Rx queues.",</div><div class='del'>-				     __FUNCTION__);</div><div class='add'>+				     __func__);</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2386,7 +2386,7 @@ static int ucc_struct_init(struct ucc_geth_private *ugeth)</div><div class='ctx'> 				ugeth_err</div><div class='ctx'> 				    ("%s: IP priority table entry must not be"</div><div class='ctx'> 					" larger than number of Rx queues.",</div><div class='del'>-				     __FUNCTION__);</div><div class='add'>+				     __func__);</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2394,7 +2394,7 @@ static int ucc_struct_init(struct ucc_geth_private *ugeth)</div><div class='ctx'> 	if (ug_info-&gt;cam &amp;&amp; !ug_info-&gt;ecamptr) {</div><div class='ctx'> 		if (netif_msg_probe(ugeth))</div><div class='ctx'> 			ugeth_err("%s: If cam mode is chosen, must supply cam ptr.",</div><div class='del'>-				  __FUNCTION__);</div><div class='add'>+				  __func__);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2404,7 +2404,7 @@ static int ucc_struct_init(struct ucc_geth_private *ugeth)</div><div class='ctx'> 		if (netif_msg_probe(ugeth))</div><div class='ctx'> 			ugeth_err("%s: Number of station addresses greater than 1 "</div><div class='ctx'> 				  "not allowed in extended parsing mode.",</div><div class='del'>-				  __FUNCTION__);</div><div class='add'>+				  __func__);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2418,7 +2418,7 @@ static int ucc_struct_init(struct ucc_geth_private *ugeth)</div><div class='ctx'> 	/* Initialize the general fast UCC block. */</div><div class='ctx'> 	if (ucc_fast_init(uf_info, &amp;ugeth-&gt;uccf)) {</div><div class='ctx'> 		if (netif_msg_probe(ugeth))</div><div class='del'>-			ugeth_err("%s: Failed to init uccf.", __FUNCTION__);</div><div class='add'>+			ugeth_err("%s: Failed to init uccf.", __func__);</div><div class='ctx'> 		ucc_geth_memclean(ugeth);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2448,7 +2448,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)</div><div class='ctx'> 	u8 __iomem *endOfRing;</div><div class='ctx'> 	u8 numThreadsRxNumerical, numThreadsTxNumerical;</div><div class='ctx'> </div><div class='del'>-	ugeth_vdbg("%s: IN", __FUNCTION__);</div><div class='add'>+	ugeth_vdbg("%s: IN", __func__);</div><div class='ctx'> 	uccf = ugeth-&gt;uccf;</div><div class='ctx'> 	ug_info = ugeth-&gt;ug_info;</div><div class='ctx'> 	uf_info = &amp;ug_info-&gt;uf_info;</div><div class='hunk'>@@ -2474,7 +2474,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)</div><div class='ctx'> 	default:</div><div class='ctx'> 		if (netif_msg_ifup(ugeth))</div><div class='ctx'> 			ugeth_err("%s: Bad number of Rx threads value.",</div><div class='del'>-				       	__FUNCTION__);</div><div class='add'>+				       	__func__);</div><div class='ctx'> 		ucc_geth_memclean(ugeth);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -2499,7 +2499,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)</div><div class='ctx'> 	default:</div><div class='ctx'> 		if (netif_msg_ifup(ugeth))</div><div class='ctx'> 			ugeth_err("%s: Bad number of Tx threads value.",</div><div class='del'>-				       	__FUNCTION__);</div><div class='add'>+				       	__func__);</div><div class='ctx'> 		ucc_geth_memclean(ugeth);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -2553,7 +2553,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)</div><div class='ctx'> 	if (ret_val != 0) {</div><div class='ctx'> 		if (netif_msg_ifup(ugeth))</div><div class='ctx'> 			ugeth_err("%s: IPGIFG initialization parameter too large.",</div><div class='del'>-				  __FUNCTION__);</div><div class='add'>+				  __func__);</div><div class='ctx'> 		ucc_geth_memclean(ugeth);</div><div class='ctx'> 		return ret_val;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2571,7 +2571,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)</div><div class='ctx'> 	if (ret_val != 0) {</div><div class='ctx'> 		if (netif_msg_ifup(ugeth))</div><div class='ctx'> 			ugeth_err("%s: Half Duplex initialization parameter too large.",</div><div class='del'>-			  __FUNCTION__);</div><div class='add'>+			  __func__);</div><div class='ctx'> 		ucc_geth_memclean(ugeth);</div><div class='ctx'> 		return ret_val;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2626,7 +2626,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)</div><div class='ctx'> 			if (netif_msg_ifup(ugeth))</div><div class='ctx'> 				ugeth_err</div><div class='ctx'> 				    ("%s: Can not allocate memory for Tx bd rings.",</div><div class='del'>-				     __FUNCTION__);</div><div class='add'>+				     __func__);</div><div class='ctx'> 			ucc_geth_memclean(ugeth);</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2662,7 +2662,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)</div><div class='ctx'> 			if (netif_msg_ifup(ugeth))</div><div class='ctx'> 				ugeth_err</div><div class='ctx'> 				    ("%s: Can not allocate memory for Rx bd rings.",</div><div class='del'>-				     __FUNCTION__);</div><div class='add'>+				     __func__);</div><div class='ctx'> 			ucc_geth_memclean(ugeth);</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2678,7 +2678,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)</div><div class='ctx'> 		if (ugeth-&gt;tx_skbuff[j] == NULL) {</div><div class='ctx'> 			if (netif_msg_ifup(ugeth))</div><div class='ctx'> 				ugeth_err("%s: Could not allocate tx_skbuff",</div><div class='del'>-					  __FUNCTION__);</div><div class='add'>+					  __func__);</div><div class='ctx'> 			ucc_geth_memclean(ugeth);</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2710,7 +2710,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)</div><div class='ctx'> 		if (ugeth-&gt;rx_skbuff[j] == NULL) {</div><div class='ctx'> 			if (netif_msg_ifup(ugeth))</div><div class='ctx'> 				ugeth_err("%s: Could not allocate rx_skbuff",</div><div class='del'>-					  __FUNCTION__);</div><div class='add'>+					  __func__);</div><div class='ctx'> 			ucc_geth_memclean(ugeth);</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2744,7 +2744,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)</div><div class='ctx'> 		if (netif_msg_ifup(ugeth))</div><div class='ctx'> 			ugeth_err</div><div class='ctx'> 			    ("%s: Can not allocate DPRAM memory for p_tx_glbl_pram.",</div><div class='del'>-			     __FUNCTION__);</div><div class='add'>+			     __func__);</div><div class='ctx'> 		ucc_geth_memclean(ugeth);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2767,7 +2767,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)</div><div class='ctx'> 		if (netif_msg_ifup(ugeth))</div><div class='ctx'> 			ugeth_err</div><div class='ctx'> 			    ("%s: Can not allocate DPRAM memory for p_thread_data_tx.",</div><div class='del'>-			     __FUNCTION__);</div><div class='add'>+			     __func__);</div><div class='ctx'> 		ucc_geth_memclean(ugeth);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2797,7 +2797,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)</div><div class='ctx'> 		if (netif_msg_ifup(ugeth))</div><div class='ctx'> 			ugeth_err</div><div class='ctx'> 			    ("%s: Can not allocate DPRAM memory for p_send_q_mem_reg.",</div><div class='del'>-			     __FUNCTION__);</div><div class='add'>+			     __func__);</div><div class='ctx'> 		ucc_geth_memclean(ugeth);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2841,7 +2841,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)</div><div class='ctx'> 			if (netif_msg_ifup(ugeth))</div><div class='ctx'> 				ugeth_err</div><div class='ctx'> 				 ("%s: Can not allocate DPRAM memory for p_scheduler.",</div><div class='del'>-				     __FUNCTION__);</div><div class='add'>+				     __func__);</div><div class='ctx'> 			ucc_geth_memclean(ugeth);</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2892,7 +2892,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)</div><div class='ctx'> 				ugeth_err</div><div class='ctx'> 				    ("%s: Can not allocate DPRAM memory for"</div><div class='ctx'> 					" p_tx_fw_statistics_pram.",</div><div class='del'>-				       	__FUNCTION__);</div><div class='add'>+				       	__func__);</div><div class='ctx'> 			ucc_geth_memclean(ugeth);</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2932,7 +2932,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)</div><div class='ctx'> 		if (netif_msg_ifup(ugeth))</div><div class='ctx'> 			ugeth_err</div><div class='ctx'> 			    ("%s: Can not allocate DPRAM memory for p_rx_glbl_pram.",</div><div class='del'>-			     __FUNCTION__);</div><div class='add'>+			     __func__);</div><div class='ctx'> 		ucc_geth_memclean(ugeth);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2954,7 +2954,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)</div><div class='ctx'> 		if (netif_msg_ifup(ugeth))</div><div class='ctx'> 			ugeth_err</div><div class='ctx'> 			    ("%s: Can not allocate DPRAM memory for p_thread_data_rx.",</div><div class='del'>-			     __FUNCTION__);</div><div class='add'>+			     __func__);</div><div class='ctx'> 		ucc_geth_memclean(ugeth);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2978,7 +2978,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)</div><div class='ctx'> 			if (netif_msg_ifup(ugeth))</div><div class='ctx'> 				ugeth_err</div><div class='ctx'> 					("%s: Can not allocate DPRAM memory for"</div><div class='del'>-					" p_rx_fw_statistics_pram.", __FUNCTION__);</div><div class='add'>+					" p_rx_fw_statistics_pram.", __func__);</div><div class='ctx'> 			ucc_geth_memclean(ugeth);</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -3001,7 +3001,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)</div><div class='ctx'> 		if (netif_msg_ifup(ugeth))</div><div class='ctx'> 			ugeth_err</div><div class='ctx'> 			    ("%s: Can not allocate DPRAM memory for"</div><div class='del'>-				" p_rx_irq_coalescing_tbl.", __FUNCTION__);</div><div class='add'>+				" p_rx_irq_coalescing_tbl.", __func__);</div><div class='ctx'> 		ucc_geth_memclean(ugeth);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3070,7 +3070,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)</div><div class='ctx'> 		if (netif_msg_ifup(ugeth))</div><div class='ctx'> 			ugeth_err</div><div class='ctx'> 			    ("%s: Can not allocate DPRAM memory for p_rx_bd_qs_tbl.",</div><div class='del'>-			     __FUNCTION__);</div><div class='add'>+			     __func__);</div><div class='ctx'> 		ucc_geth_memclean(ugeth);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3147,7 +3147,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)</div><div class='ctx'> 		if (!ug_info-&gt;extendedFilteringChainPointer) {</div><div class='ctx'> 			if (netif_msg_ifup(ugeth))</div><div class='ctx'> 				ugeth_err("%s: Null Extended Filtering Chain Pointer.",</div><div class='del'>-					  __FUNCTION__);</div><div class='add'>+					  __func__);</div><div class='ctx'> 			ucc_geth_memclean(ugeth);</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -3161,7 +3161,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)</div><div class='ctx'> 			if (netif_msg_ifup(ugeth))</div><div class='ctx'> 				ugeth_err</div><div class='ctx'> 					("%s: Can not allocate DPRAM memory for"</div><div class='del'>-					" p_exf_glbl_param.", __FUNCTION__);</div><div class='add'>+					" p_exf_glbl_param.", __func__);</div><div class='ctx'> 			ucc_geth_memclean(ugeth);</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -3209,7 +3209,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)</div><div class='ctx'> 		if (netif_msg_ifup(ugeth))</div><div class='ctx'> 			ugeth_err</div><div class='ctx'> 			    ("%s: Can not allocate memory for"</div><div class='del'>-				" p_UccInitEnetParamShadows.", __FUNCTION__);</div><div class='add'>+				" p_UccInitEnetParamShadows.", __func__);</div><div class='ctx'> 		ucc_geth_memclean(ugeth);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3244,7 +3244,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)</div><div class='ctx'> 		QE_FLTR_LARGEST_EXTERNAL_TABLE_LOOKUP_KEY_SIZE_16_BYTES)) {</div><div class='ctx'> 		if (netif_msg_ifup(ugeth))</div><div class='ctx'> 			ugeth_err("%s: Invalid largest External Lookup Key Size.",</div><div class='del'>-				  __FUNCTION__);</div><div class='add'>+				  __func__);</div><div class='ctx'> 		ucc_geth_memclean(ugeth);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3271,7 +3271,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)</div><div class='ctx'> 		ug_info-&gt;riscRx, 1)) != 0) {</div><div class='ctx'> 		if (netif_msg_ifup(ugeth))</div><div class='ctx'> 				ugeth_err("%s: Can not fill p_init_enet_param_shadow.",</div><div class='del'>-					__FUNCTION__);</div><div class='add'>+					__func__);</div><div class='ctx'> 		ucc_geth_memclean(ugeth);</div><div class='ctx'> 		return ret_val;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3287,7 +3287,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)</div><div class='ctx'> 				    ug_info-&gt;riscTx, 0)) != 0) {</div><div class='ctx'> 		if (netif_msg_ifup(ugeth))</div><div class='ctx'> 			ugeth_err("%s: Can not fill p_init_enet_param_shadow.",</div><div class='del'>-				  __FUNCTION__);</div><div class='add'>+				  __func__);</div><div class='ctx'> 		ucc_geth_memclean(ugeth);</div><div class='ctx'> 		return ret_val;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3297,7 +3297,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)</div><div class='ctx'> 		if ((ret_val = rx_bd_buffer_set(ugeth, (u8) i)) != 0) {</div><div class='ctx'> 			if (netif_msg_ifup(ugeth))</div><div class='ctx'> 				ugeth_err("%s: Can not fill Rx bds with buffers.",</div><div class='del'>-					  __FUNCTION__);</div><div class='add'>+					  __func__);</div><div class='ctx'> 			ucc_geth_memclean(ugeth);</div><div class='ctx'> 			return ret_val;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -3309,7 +3309,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)</div><div class='ctx'> 		if (netif_msg_ifup(ugeth))</div><div class='ctx'> 			ugeth_err</div><div class='ctx'> 			    ("%s: Can not allocate DPRAM memory for p_init_enet_pram.",</div><div class='del'>-			     __FUNCTION__);</div><div class='add'>+			     __func__);</div><div class='ctx'> 		ucc_geth_memclean(ugeth);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3360,7 +3360,7 @@ static void ucc_geth_timeout(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ucc_geth_private *ugeth = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	ugeth_vdbg("%s: IN", __FUNCTION__);</div><div class='add'>+	ugeth_vdbg("%s: IN", __func__);</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;stats.tx_errors++;</div><div class='ctx'> </div><div class='hunk'>@@ -3386,7 +3386,7 @@ static int ucc_geth_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	u32 bd_status;</div><div class='ctx'> 	u8 txQ = 0;</div><div class='ctx'> </div><div class='del'>-	ugeth_vdbg("%s: IN", __FUNCTION__);</div><div class='add'>+	ugeth_vdbg("%s: IN", __func__);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irq(&amp;ugeth-&gt;lock);</div><div class='ctx'> </div><div class='hunk'>@@ -3459,7 +3459,7 @@ static int ucc_geth_rx(struct ucc_geth_private *ugeth, u8 rxQ, int rx_work_limit</div><div class='ctx'> 	u8 *bdBuffer;</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> </div><div class='del'>-	ugeth_vdbg("%s: IN", __FUNCTION__);</div><div class='add'>+	ugeth_vdbg("%s: IN", __func__);</div><div class='ctx'> </div><div class='ctx'> 	dev = ugeth-&gt;dev;</div><div class='ctx'> </div><div class='hunk'>@@ -3481,7 +3481,7 @@ static int ucc_geth_rx(struct ucc_geth_private *ugeth, u8 rxQ, int rx_work_limit</div><div class='ctx'> 		    (bd_status &amp; R_ERRORS_FATAL)) {</div><div class='ctx'> 			if (netif_msg_rx_err(ugeth))</div><div class='ctx'> 				ugeth_err("%s, %d: ERROR!!! skb - 0x%08x",</div><div class='del'>-					   __FUNCTION__, __LINE__, (u32) skb);</div><div class='add'>+					   __func__, __LINE__, (u32) skb);</div><div class='ctx'> 			if (skb)</div><div class='ctx'> 				dev_kfree_skb_any(skb);</div><div class='ctx'> </div><div class='hunk'>@@ -3507,7 +3507,7 @@ static int ucc_geth_rx(struct ucc_geth_private *ugeth, u8 rxQ, int rx_work_limit</div><div class='ctx'> 		skb = get_new_skb(ugeth, bd);</div><div class='ctx'> 		if (!skb) {</div><div class='ctx'> 			if (netif_msg_rx_err(ugeth))</div><div class='del'>-				ugeth_warn("%s: No Rx Data Buffer", __FUNCTION__);</div><div class='add'>+				ugeth_warn("%s: No Rx Data Buffer", __func__);</div><div class='ctx'> 			dev-&gt;stats.rx_dropped++;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -3613,7 +3613,7 @@ static irqreturn_t ucc_geth_irq_handler(int irq, void *info)</div><div class='ctx'> 	register u32 tx_mask;</div><div class='ctx'> 	u8 i;</div><div class='ctx'> </div><div class='del'>-	ugeth_vdbg("%s: IN", __FUNCTION__);</div><div class='add'>+	ugeth_vdbg("%s: IN", __func__);</div><div class='ctx'> </div><div class='ctx'> 	uccf = ugeth-&gt;uccf;</div><div class='ctx'> 	ug_info = ugeth-&gt;ug_info;</div><div class='hunk'>@@ -3683,13 +3683,13 @@ static int ucc_geth_open(struct net_device *dev)</div><div class='ctx'> 	struct ucc_geth_private *ugeth = netdev_priv(dev);</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	ugeth_vdbg("%s: IN", __FUNCTION__);</div><div class='add'>+	ugeth_vdbg("%s: IN", __func__);</div><div class='ctx'> </div><div class='ctx'> 	/* Test station address */</div><div class='ctx'> 	if (dev-&gt;dev_addr[0] &amp; ENET_GROUP_ADDR) {</div><div class='ctx'> 		if (netif_msg_ifup(ugeth))</div><div class='ctx'> 			ugeth_err("%s: Multicast address used for station address"</div><div class='del'>-				  " - is this what you wanted?", __FUNCTION__);</div><div class='add'>+				  " - is this what you wanted?", __func__);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3772,7 +3772,7 @@ static int ucc_geth_close(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ucc_geth_private *ugeth = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	ugeth_vdbg("%s: IN", __FUNCTION__);</div><div class='add'>+	ugeth_vdbg("%s: IN", __func__);</div><div class='ctx'> </div><div class='ctx'> 	napi_disable(&amp;ugeth-&gt;napi);</div><div class='ctx'> </div><div class='hunk'>@@ -3840,7 +3840,7 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma</div><div class='ctx'> 		PHY_INTERFACE_MODE_TBI, PHY_INTERFACE_MODE_RTBI,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	ugeth_vdbg("%s: IN", __FUNCTION__);</div><div class='add'>+	ugeth_vdbg("%s: IN", __func__);</div><div class='ctx'> </div><div class='ctx'> 	prop = of_get_property(np, "cell-index", NULL);</div><div class='ctx'> 	if (!prop) {</div><div class='hunk'>@@ -3857,7 +3857,7 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma</div><div class='ctx'> 	if (ug_info == NULL) {</div><div class='ctx'> 		if (netif_msg_probe(&amp;debug))</div><div class='ctx'> 			ugeth_err("%s: [%d] Missing additional data!",</div><div class='del'>-				       	__FUNCTION__, ucc_num);</div><div class='add'>+				       	__func__, ucc_num);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ucc_geth_mii.c b/drivers/net/ucc_geth_mii.c<br/>index 6d9e7ad9fda9..c001d261366b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/ucc_geth_mii.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/ucc_geth_mii.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/ucc_geth_mii.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/ucc_geth_mii.c</a></div><div class='hunk'>@@ -141,8 +141,7 @@ static int uec_mdio_probe(struct of_device *ofdev, const struct of_device_id *ma</div><div class='ctx'> 	struct resource res;</div><div class='ctx'> 	int k, err = 0;</div><div class='ctx'> </div><div class='del'>-	new_bus = kzalloc(sizeof(struct mii_bus), GFP_KERNEL);</div><div class='del'>-</div><div class='add'>+	new_bus = mdiobus_alloc();</div><div class='ctx'> 	if (NULL == new_bus)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -187,7 +186,7 @@ static int uec_mdio_probe(struct of_device *ofdev, const struct of_device_id *ma</div><div class='ctx'> </div><div class='ctx'> 	new_bus-&gt;priv = (void __force *)regs;</div><div class='ctx'> </div><div class='del'>-	new_bus-&gt;dev = device;</div><div class='add'>+	new_bus-&gt;parent = device;</div><div class='ctx'> 	dev_set_drvdata(device, new_bus);</div><div class='ctx'> </div><div class='ctx'> 	/* Read MII management master from device tree */</div><div class='hunk'>@@ -235,7 +234,7 @@ bus_register_fail:</div><div class='ctx'> ioremap_fail:</div><div class='ctx'> 	kfree(new_bus-&gt;irq);</div><div class='ctx'> reg_map_fail:</div><div class='del'>-	kfree(new_bus);</div><div class='add'>+	mdiobus_free(new_bus);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -251,7 +250,7 @@ static int uec_mdio_remove(struct of_device *ofdev)</div><div class='ctx'> </div><div class='ctx'> 	iounmap((void __iomem *)bus-&gt;priv);</div><div class='ctx'> 	bus-&gt;priv = NULL;</div><div class='del'>-	kfree(bus);</div><div class='add'>+	mdiobus_free(bus);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/usb/Kconfig b/drivers/net/usb/Kconfig<br/>index 0973b6e37024..8ee21030e9ac 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/usb/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/usb/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/usb/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/usb/Kconfig</a></div><div class='hunk'>@@ -188,6 +188,14 @@ config USB_NET_DM9601</div><div class='ctx'> 	  This option adds support for Davicom DM9601 based USB 1.1</div><div class='ctx'> 	  10/100 Ethernet adapters.</div><div class='ctx'> </div><div class='add'>+config USB_NET_SMSC95XX</div><div class='add'>+	tristate "SMSC LAN95XX based USB 2.0 10/100 ethernet devices"</div><div class='add'>+	depends on USB_USBNET</div><div class='add'>+	select CRC32</div><div class='add'>+	help</div><div class='add'>+	  This option adds support for SMSC LAN95XX based USB 2.0</div><div class='add'>+	  10/100 Ethernet adapters.</div><div class='add'>+</div><div class='ctx'> config USB_NET_GL620A</div><div class='ctx'> 	tristate "GeneSys GL620USB-A based cables"</div><div class='ctx'> 	depends on USB_USBNET</div><div class='head'>diff --git a/drivers/net/usb/Makefile b/drivers/net/usb/Makefile<br/>index 24800c157f98..88a87eeb376a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/usb/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/usb/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/usb/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/usb/Makefile</a></div><div class='hunk'>@@ -10,6 +10,7 @@ obj-$(CONFIG_USB_HSO)		+= hso.o</div><div class='ctx'> obj-$(CONFIG_USB_NET_AX8817X)	+= asix.o</div><div class='ctx'> obj-$(CONFIG_USB_NET_CDCETHER)	+= cdc_ether.o</div><div class='ctx'> obj-$(CONFIG_USB_NET_DM9601)	+= dm9601.o</div><div class='add'>+obj-$(CONFIG_USB_NET_SMSC95XX)	+= smsc95xx.o</div><div class='ctx'> obj-$(CONFIG_USB_NET_GL620A)	+= gl620a.o</div><div class='ctx'> obj-$(CONFIG_USB_NET_NET1080)	+= net1080.o</div><div class='ctx'> obj-$(CONFIG_USB_NET_PLUSB)	+= plusb.o</div><div class='hunk'>@@ -19,6 +20,3 @@ obj-$(CONFIG_USB_NET_ZAURUS)	+= zaurus.o</div><div class='ctx'> obj-$(CONFIG_USB_NET_MCS7830)	+= mcs7830.o</div><div class='ctx'> obj-$(CONFIG_USB_USBNET)	+= usbnet.o</div><div class='ctx'> </div><div class='del'>-ifeq ($(CONFIG_USB_DEBUG),y)</div><div class='del'>-EXTRA_CFLAGS += -DDEBUG</div><div class='del'>-endif</div><div class='head'>diff --git a/drivers/net/usb/catc.c b/drivers/net/usb/catc.c<br/>index 22c17bbacb69..466a89e24444 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/usb/catc.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/usb/catc.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/usb/catc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/usb/catc.c</a></div><div class='hunk'>@@ -456,7 +456,7 @@ static void catc_tx_timeout(struct net_device *netdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct catc *catc = netdev_priv(netdev);</div><div class='ctx'> </div><div class='del'>-	warn("Transmit timed out.");</div><div class='add'>+	dev_warn(&amp;netdev-&gt;dev, "Transmit timed out.\n");</div><div class='ctx'> 	usb_unlink_urb(catc-&gt;tx_urb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -847,7 +847,8 @@ static int catc_probe(struct usb_interface *intf, const struct usb_device_id *id</div><div class='ctx'> 			dbg("64k Memory\n");</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='del'>-			warn("Couldn't detect memory size, assuming 32k");</div><div class='add'>+			dev_warn(&amp;intf-&gt;dev,</div><div class='add'>+				 "Couldn't detect memory size, assuming 32k\n");</div><div class='ctx'> 		case 0x87654321:</div><div class='ctx'> 			catc_set_reg(catc, TxBufCount, 4);</div><div class='ctx'> 			catc_set_reg(catc, RxBufCount, 16);</div><div class='hunk'>@@ -953,7 +954,8 @@ static int __init catc_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int result = usb_register(&amp;catc_driver);</div><div class='ctx'> 	if (result == 0)</div><div class='del'>-		info(DRIVER_VERSION " " DRIVER_DESC);</div><div class='add'>+		printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"</div><div class='add'>+		       DRIVER_DESC "\n");</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c<br/>index 6e42b5a8c22b..1164c52e2c0a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/usb/hso.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/usb/hso.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/usb/hso.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/usb/hso.c</a></div><div class='hunk'>@@ -92,9 +92,6 @@</div><div class='ctx'> </div><div class='ctx'> #define	HSO_NET_TX_TIMEOUT		(HZ*10)</div><div class='ctx'> </div><div class='del'>-/* Serial port defines and structs. */</div><div class='del'>-#define HSO_SERIAL_FLAG_RX_SENT		0</div><div class='del'>-</div><div class='ctx'> #define HSO_SERIAL_MAGIC		0x48534f31</div><div class='ctx'> </div><div class='ctx'> /* Number of ttys to handle */</div><div class='hunk'>@@ -179,6 +176,12 @@ struct hso_net {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum rx_ctrl_state{</div><div class='add'>+	RX_IDLE,</div><div class='add'>+	RX_SENT,</div><div class='add'>+	RX_PENDING</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct hso_serial {</div><div class='ctx'> 	struct hso_device *parent;</div><div class='ctx'> 	int magic;</div><div class='hunk'>@@ -205,7 +208,7 @@ struct hso_serial {</div><div class='ctx'> 	struct usb_endpoint_descriptor *in_endp;</div><div class='ctx'> 	struct usb_endpoint_descriptor *out_endp;</div><div class='ctx'> </div><div class='del'>-	unsigned long flags;</div><div class='add'>+	enum rx_ctrl_state rx_state;</div><div class='ctx'> 	u8 rts_state;</div><div class='ctx'> 	u8 dtr_state;</div><div class='ctx'> 	unsigned tx_urb_used:1;</div><div class='hunk'>@@ -216,6 +219,15 @@ struct hso_serial {</div><div class='ctx'> 	spinlock_t serial_lock;</div><div class='ctx'> </div><div class='ctx'> 	int (*write_data) (struct hso_serial *serial);</div><div class='add'>+	/* Hacks required to get flow control</div><div class='add'>+	 * working on the serial receive buffers</div><div class='add'>+	 * so as not to drop characters on the floor.</div><div class='add'>+	 */</div><div class='add'>+	int  curr_rx_urb_idx;</div><div class='add'>+	u16  curr_rx_urb_offset;</div><div class='add'>+	u8   rx_urb_filled[MAX_RX_URBS];</div><div class='add'>+	struct tasklet_struct unthrottle_tasklet;</div><div class='add'>+	struct work_struct    retry_unthrottle_workqueue;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct hso_device {</div><div class='hunk'>@@ -271,7 +283,7 @@ struct hso_device {</div><div class='ctx'> static int hso_serial_tiocmset(struct tty_struct *tty, struct file *file,</div><div class='ctx'> 			       unsigned int set, unsigned int clear);</div><div class='ctx'> static void ctrl_callback(struct urb *urb);</div><div class='del'>-static void put_rxbuf_data(struct urb *urb, struct hso_serial *serial);</div><div class='add'>+static int put_rxbuf_data(struct urb *urb, struct hso_serial *serial);</div><div class='ctx'> static void hso_kick_transmit(struct hso_serial *serial);</div><div class='ctx'> /* Helper functions */</div><div class='ctx'> static int hso_mux_submit_intr_urb(struct hso_shared_int *mux_int,</div><div class='hunk'>@@ -287,6 +299,8 @@ static int hso_start_net_device(struct hso_device *hso_dev);</div><div class='ctx'> static void hso_free_shared_int(struct hso_shared_int *shared_int);</div><div class='ctx'> static int hso_stop_net_device(struct hso_device *hso_dev);</div><div class='ctx'> static void hso_serial_ref_free(struct kref *ref);</div><div class='add'>+static void hso_std_serial_read_bulk_callback(struct urb *urb);</div><div class='add'>+static int hso_mux_serial_read(struct hso_serial *serial);</div><div class='ctx'> static void async_get_intf(struct work_struct *data);</div><div class='ctx'> static void async_put_intf(struct work_struct *data);</div><div class='ctx'> static int hso_put_activity(struct hso_device *hso_dev);</div><div class='hunk'>@@ -458,6 +472,17 @@ static ssize_t hso_sysfs_show_porttype(struct device *dev,</div><div class='ctx'> }</div><div class='ctx'> static DEVICE_ATTR(hsotype, S_IRUGO, hso_sysfs_show_porttype, NULL);</div><div class='ctx'> </div><div class='add'>+static int hso_urb_to_index(struct hso_serial *serial, struct urb *urb)</div><div class='add'>+{</div><div class='add'>+	int idx;</div><div class='add'>+</div><div class='add'>+	for (idx = 0; idx &lt; serial-&gt;num_rx_urbs; idx++)</div><div class='add'>+		if (serial-&gt;rx_urb[idx] == urb)</div><div class='add'>+			return idx;</div><div class='add'>+	dev_err(serial-&gt;parent-&gt;dev, "hso_urb_to_index failed\n");</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* converts mux value to a port spec value */</div><div class='ctx'> static u32 hso_mux_to_port(int mux)</div><div class='ctx'> {</div><div class='hunk'>@@ -1039,6 +1064,158 @@ static void _hso_serial_set_termios(struct tty_struct *tty,</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void hso_resubmit_rx_bulk_urb(struct hso_serial *serial, struct urb *urb)</div><div class='add'>+{</div><div class='add'>+	int result;</div><div class='add'>+#ifdef CONFIG_HSO_AUTOPM</div><div class='add'>+	usb_mark_last_busy(urb-&gt;dev);</div><div class='add'>+#endif</div><div class='add'>+	/* We are done with this URB, resubmit it. Prep the USB to wait for</div><div class='add'>+	 * another frame */</div><div class='add'>+	usb_fill_bulk_urb(urb, serial-&gt;parent-&gt;usb,</div><div class='add'>+			  usb_rcvbulkpipe(serial-&gt;parent-&gt;usb,</div><div class='add'>+					  serial-&gt;in_endp-&gt;</div><div class='add'>+					  bEndpointAddress &amp; 0x7F),</div><div class='add'>+			  urb-&gt;transfer_buffer, serial-&gt;rx_data_length,</div><div class='add'>+			  hso_std_serial_read_bulk_callback, serial);</div><div class='add'>+	/* Give this to the USB subsystem so it can tell us when more data</div><div class='add'>+	 * arrives. */</div><div class='add'>+	result = usb_submit_urb(urb, GFP_ATOMIC);</div><div class='add'>+	if (result) {</div><div class='add'>+		dev_err(&amp;urb-&gt;dev-&gt;dev, "%s failed submit serial rx_urb %d\n",</div><div class='add'>+			__func__, result);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void put_rxbuf_data_and_resubmit_bulk_urb(struct hso_serial *serial)</div><div class='add'>+{</div><div class='add'>+	int count;</div><div class='add'>+	struct urb *curr_urb;</div><div class='add'>+</div><div class='add'>+	while (serial-&gt;rx_urb_filled[serial-&gt;curr_rx_urb_idx]) {</div><div class='add'>+		curr_urb = serial-&gt;rx_urb[serial-&gt;curr_rx_urb_idx];</div><div class='add'>+		count = put_rxbuf_data(curr_urb, serial);</div><div class='add'>+		if (count == -1)</div><div class='add'>+			return;</div><div class='add'>+		if (count == 0) {</div><div class='add'>+			serial-&gt;curr_rx_urb_idx++;</div><div class='add'>+			if (serial-&gt;curr_rx_urb_idx &gt;= serial-&gt;num_rx_urbs)</div><div class='add'>+				serial-&gt;curr_rx_urb_idx = 0;</div><div class='add'>+			hso_resubmit_rx_bulk_urb(serial, curr_urb);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void put_rxbuf_data_and_resubmit_ctrl_urb(struct hso_serial *serial)</div><div class='add'>+{</div><div class='add'>+	int count = 0;</div><div class='add'>+	struct urb *urb;</div><div class='add'>+</div><div class='add'>+	urb = serial-&gt;rx_urb[0];</div><div class='add'>+	if (serial-&gt;open_count &gt; 0) {</div><div class='add'>+		count = put_rxbuf_data(urb, serial);</div><div class='add'>+		if (count == -1)</div><div class='add'>+			return;</div><div class='add'>+	}</div><div class='add'>+	/* Re issue a read as long as we receive data. */</div><div class='add'>+</div><div class='add'>+	if (count == 0 &amp;&amp; ((urb-&gt;actual_length != 0) ||</div><div class='add'>+			   (serial-&gt;rx_state == RX_PENDING))) {</div><div class='add'>+		serial-&gt;rx_state = RX_SENT;</div><div class='add'>+		hso_mux_serial_read(serial);</div><div class='add'>+	} else</div><div class='add'>+		serial-&gt;rx_state = RX_IDLE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* read callback for Diag and CS port */</div><div class='add'>+static void hso_std_serial_read_bulk_callback(struct urb *urb)</div><div class='add'>+{</div><div class='add'>+	struct hso_serial *serial = urb-&gt;context;</div><div class='add'>+	int status = urb-&gt;status;</div><div class='add'>+</div><div class='add'>+	/* sanity check */</div><div class='add'>+	if (!serial) {</div><div class='add'>+		D1("serial == NULL");</div><div class='add'>+		return;</div><div class='add'>+	} else if (status) {</div><div class='add'>+		log_usb_status(status, __func__);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	D4("\n--- Got serial_read_bulk callback %02x ---", status);</div><div class='add'>+	D1("Actual length = %d\n", urb-&gt;actual_length);</div><div class='add'>+	DUMP1(urb-&gt;transfer_buffer, urb-&gt;actual_length);</div><div class='add'>+</div><div class='add'>+	/* Anyone listening? */</div><div class='add'>+	if (serial-&gt;open_count == 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (status == 0) {</div><div class='add'>+		if (serial-&gt;parent-&gt;port_spec &amp; HSO_INFO_CRC_BUG) {</div><div class='add'>+			u32 rest;</div><div class='add'>+			u8 crc_check[4] = { 0xDE, 0xAD, 0xBE, 0xEF };</div><div class='add'>+			rest =</div><div class='add'>+			    urb-&gt;actual_length %</div><div class='add'>+			    serial-&gt;in_endp-&gt;wMaxPacketSize;</div><div class='add'>+			if (((rest == 5) || (rest == 6))</div><div class='add'>+			    &amp;&amp; !memcmp(((u8 *) urb-&gt;transfer_buffer) +</div><div class='add'>+				       urb-&gt;actual_length - 4, crc_check, 4)) {</div><div class='add'>+				urb-&gt;actual_length -= 4;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		/* Valid data, handle RX data */</div><div class='add'>+		spin_lock(&amp;serial-&gt;serial_lock);</div><div class='add'>+		serial-&gt;rx_urb_filled[hso_urb_to_index(serial, urb)] = 1;</div><div class='add'>+		put_rxbuf_data_and_resubmit_bulk_urb(serial);</div><div class='add'>+		spin_unlock(&amp;serial-&gt;serial_lock);</div><div class='add'>+	} else if (status == -ENOENT || status == -ECONNRESET) {</div><div class='add'>+		/* Unlinked - check for throttled port. */</div><div class='add'>+		D2("Port %d, successfully unlinked urb", serial-&gt;minor);</div><div class='add'>+		spin_lock(&amp;serial-&gt;serial_lock);</div><div class='add'>+		serial-&gt;rx_urb_filled[hso_urb_to_index(serial, urb)] = 0;</div><div class='add'>+		hso_resubmit_rx_bulk_urb(serial, urb);</div><div class='add'>+		spin_unlock(&amp;serial-&gt;serial_lock);</div><div class='add'>+	} else {</div><div class='add'>+		D2("Port %d, status = %d for read urb", serial-&gt;minor, status);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This needs to be a tasklet otherwise we will</div><div class='add'>+ * end up recursively calling this function.</div><div class='add'>+ */</div><div class='add'>+void hso_unthrottle_tasklet(struct hso_serial *serial)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;serial-&gt;serial_lock, flags);</div><div class='add'>+	if ((serial-&gt;parent-&gt;port_spec &amp; HSO_INTF_MUX))</div><div class='add'>+		put_rxbuf_data_and_resubmit_ctrl_urb(serial);</div><div class='add'>+	else</div><div class='add'>+		put_rxbuf_data_and_resubmit_bulk_urb(serial);</div><div class='add'>+	spin_unlock_irqrestore(&amp;serial-&gt;serial_lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static	void hso_unthrottle(struct tty_struct *tty)</div><div class='add'>+{</div><div class='add'>+	struct hso_serial *serial = get_serial_by_tty(tty);</div><div class='add'>+</div><div class='add'>+	tasklet_hi_schedule(&amp;serial-&gt;unthrottle_tasklet);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void hso_unthrottle_workfunc(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct hso_serial *serial =</div><div class='add'>+	    container_of(work, struct hso_serial,</div><div class='add'>+			 retry_unthrottle_workqueue);</div><div class='add'>+	hso_unthrottle_tasklet(serial);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* open the requested serial port */</div><div class='ctx'> static int hso_serial_open(struct tty_struct *tty, struct file *filp)</div><div class='ctx'> {</div><div class='hunk'>@@ -1064,13 +1241,18 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)</div><div class='ctx'> 	tty-&gt;driver_data = serial;</div><div class='ctx'> 	serial-&gt;tty = tty;</div><div class='ctx'> </div><div class='del'>-	/* check for port allready opened, if not set the termios */</div><div class='add'>+	/* check for port already opened, if not set the termios */</div><div class='ctx'> 	serial-&gt;open_count++;</div><div class='ctx'> 	if (serial-&gt;open_count == 1) {</div><div class='ctx'> 		tty-&gt;low_latency = 1;</div><div class='del'>-		serial-&gt;flags = 0;</div><div class='add'>+		serial-&gt;rx_state = RX_IDLE;</div><div class='ctx'> 		/* Force default termio settings */</div><div class='ctx'> 		_hso_serial_set_termios(tty, NULL);</div><div class='add'>+		tasklet_init(&amp;serial-&gt;unthrottle_tasklet,</div><div class='add'>+			     (void (*)(unsigned long))hso_unthrottle_tasklet,</div><div class='add'>+			     (unsigned long)serial);</div><div class='add'>+		INIT_WORK(&amp;serial-&gt;retry_unthrottle_workqueue,</div><div class='add'>+			  hso_unthrottle_workfunc);</div><div class='ctx'> 		result = hso_start_serial_device(serial-&gt;parent, GFP_KERNEL);</div><div class='ctx'> 		if (result) {</div><div class='ctx'> 			hso_stop_serial_device(serial-&gt;parent);</div><div class='hunk'>@@ -1117,9 +1299,13 @@ static void hso_serial_close(struct tty_struct *tty, struct file *filp)</div><div class='ctx'> 		}</div><div class='ctx'> 		if (!usb_gone)</div><div class='ctx'> 			hso_stop_serial_device(serial-&gt;parent);</div><div class='add'>+		tasklet_kill(&amp;serial-&gt;unthrottle_tasklet);</div><div class='add'>+		cancel_work_sync(&amp;serial-&gt;retry_unthrottle_workqueue);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	if (!usb_gone)</div><div class='ctx'> 		usb_autopm_put_interface(serial-&gt;parent-&gt;interface);</div><div class='add'>+</div><div class='ctx'> 	mutex_unlock(&amp;serial-&gt;parent-&gt;mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1422,15 +1608,21 @@ static void intr_callback(struct urb *urb)</div><div class='ctx'> 								   (1 &lt;&lt; i));</div><div class='ctx'> 			if (serial != NULL) {</div><div class='ctx'> 				D1("Pending read interrupt on port %d\n", i);</div><div class='del'>-				if (!test_and_set_bit(HSO_SERIAL_FLAG_RX_SENT,</div><div class='del'>-						      &amp;serial-&gt;flags)) {</div><div class='add'>+				spin_lock(&amp;serial-&gt;serial_lock);</div><div class='add'>+				if (serial-&gt;rx_state == RX_IDLE) {</div><div class='ctx'> 					/* Setup and send a ctrl req read on</div><div class='ctx'> 					 * port i */</div><div class='del'>-					hso_mux_serial_read(serial);</div><div class='add'>+				if (!serial-&gt;rx_urb_filled[0]) {</div><div class='add'>+						serial-&gt;rx_state = RX_SENT;</div><div class='add'>+						hso_mux_serial_read(serial);</div><div class='add'>+					} else</div><div class='add'>+						serial-&gt;rx_state = RX_PENDING;</div><div class='add'>+</div><div class='ctx'> 				} else {</div><div class='ctx'> 					D1("Already pending a read on "</div><div class='ctx'> 					   "port %d\n", i);</div><div class='ctx'> 				}</div><div class='add'>+				spin_unlock(&amp;serial-&gt;serial_lock);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1532,16 +1724,10 @@ static void ctrl_callback(struct urb *urb)</div><div class='ctx'> 	if (req-&gt;bRequestType ==</div><div class='ctx'> 	    (USB_DIR_IN | USB_TYPE_OPTION_VENDOR | USB_RECIP_INTERFACE)) {</div><div class='ctx'> 		/* response to a read command */</div><div class='del'>-		if (serial-&gt;open_count &gt; 0) {</div><div class='del'>-			/* handle RX data the normal way */</div><div class='del'>-			put_rxbuf_data(urb, serial);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Re issue a read as long as we receive data. */</div><div class='del'>-		if (urb-&gt;actual_length != 0)</div><div class='del'>-			hso_mux_serial_read(serial);</div><div class='del'>-		else</div><div class='del'>-			clear_bit(HSO_SERIAL_FLAG_RX_SENT, &amp;serial-&gt;flags);</div><div class='add'>+		serial-&gt;rx_urb_filled[0] = 1;</div><div class='add'>+		spin_lock(&amp;serial-&gt;serial_lock);</div><div class='add'>+		put_rxbuf_data_and_resubmit_ctrl_urb(serial);</div><div class='add'>+		spin_unlock(&amp;serial-&gt;serial_lock);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		hso_put_activity(serial-&gt;parent);</div><div class='ctx'> 		if (serial-&gt;tty)</div><div class='hunk'>@@ -1552,91 +1738,42 @@ static void ctrl_callback(struct urb *urb)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* handle RX data for serial port */</div><div class='del'>-static void put_rxbuf_data(struct urb *urb, struct hso_serial *serial)</div><div class='add'>+static int put_rxbuf_data(struct urb *urb, struct hso_serial *serial)</div><div class='ctx'> {</div><div class='ctx'> 	struct tty_struct *tty = serial-&gt;tty;</div><div class='del'>-</div><div class='add'>+	int write_length_remaining = 0;</div><div class='add'>+	int curr_write_len;</div><div class='ctx'> 	/* Sanity check */</div><div class='ctx'> 	if (urb == NULL || serial == NULL) {</div><div class='ctx'> 		D1("serial = NULL");</div><div class='del'>-		return;</div><div class='add'>+		return -2;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Push data to tty */</div><div class='del'>-	if (tty &amp;&amp; urb-&gt;actual_length) {</div><div class='add'>+	if (tty) {</div><div class='add'>+		write_length_remaining = urb-&gt;actual_length -</div><div class='add'>+			serial-&gt;curr_rx_urb_offset;</div><div class='ctx'> 		D1("data to push to tty");</div><div class='del'>-		tty_insert_flip_string(tty, urb-&gt;transfer_buffer,</div><div class='del'>-				       urb-&gt;actual_length);</div><div class='del'>-		tty_flip_buffer_push(tty);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* read callback for Diag and CS port */</div><div class='del'>-static void hso_std_serial_read_bulk_callback(struct urb *urb)</div><div class='del'>-{</div><div class='del'>-	struct hso_serial *serial = urb-&gt;context;</div><div class='del'>-	int result;</div><div class='del'>-	int status = urb-&gt;status;</div><div class='del'>-</div><div class='del'>-	/* sanity check */</div><div class='del'>-	if (!serial) {</div><div class='del'>-		D1("serial == NULL");</div><div class='del'>-		return;</div><div class='del'>-	} else if (status) {</div><div class='del'>-		log_usb_status(status, __func__);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	D4("\n--- Got serial_read_bulk callback %02x ---", status);</div><div class='del'>-	D1("Actual length = %d\n", urb-&gt;actual_length);</div><div class='del'>-	DUMP1(urb-&gt;transfer_buffer, urb-&gt;actual_length);</div><div class='del'>-</div><div class='del'>-	/* Anyone listening? */</div><div class='del'>-	if (serial-&gt;open_count == 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (status == 0) {</div><div class='del'>-		if (serial-&gt;parent-&gt;port_spec &amp; HSO_INFO_CRC_BUG) {</div><div class='del'>-			u32 rest;</div><div class='del'>-			u8 crc_check[4] = { 0xDE, 0xAD, 0xBE, 0xEF };</div><div class='del'>-			rest =</div><div class='del'>-			    urb-&gt;actual_length %</div><div class='del'>-			    serial-&gt;in_endp-&gt;wMaxPacketSize;</div><div class='del'>-			if (((rest == 5) || (rest == 6))</div><div class='del'>-			    &amp;&amp; !memcmp(((u8 *) urb-&gt;transfer_buffer) +</div><div class='del'>-				       urb-&gt;actual_length - 4, crc_check, 4)) {</div><div class='del'>-				urb-&gt;actual_length -= 4;</div><div class='del'>-			}</div><div class='add'>+		while (write_length_remaining) {</div><div class='add'>+			if (test_bit(TTY_THROTTLED, &amp;tty-&gt;flags))</div><div class='add'>+				return -1;</div><div class='add'>+			curr_write_len =  tty_insert_flip_string</div><div class='add'>+				(tty, urb-&gt;transfer_buffer +</div><div class='add'>+				 serial-&gt;curr_rx_urb_offset,</div><div class='add'>+				 write_length_remaining);</div><div class='add'>+			serial-&gt;curr_rx_urb_offset += curr_write_len;</div><div class='add'>+			write_length_remaining -= curr_write_len;</div><div class='add'>+			tty_flip_buffer_push(tty);</div><div class='ctx'> 		}</div><div class='del'>-		/* Valid data, handle RX data */</div><div class='del'>-		put_rxbuf_data(urb, serial);</div><div class='del'>-	} else if (status == -ENOENT || status == -ECONNRESET) {</div><div class='del'>-		/* Unlinked - check for throttled port. */</div><div class='del'>-		D2("Port %d, successfully unlinked urb", serial-&gt;minor);</div><div class='del'>-	} else {</div><div class='del'>-		D2("Port %d, status = %d for read urb", serial-&gt;minor, status);</div><div class='del'>-		return;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	usb_mark_last_busy(urb-&gt;dev);</div><div class='del'>-</div><div class='del'>-	/* We are done with this URB, resubmit it. Prep the USB to wait for</div><div class='del'>-	 * another frame */</div><div class='del'>-	usb_fill_bulk_urb(urb, serial-&gt;parent-&gt;usb,</div><div class='del'>-			  usb_rcvbulkpipe(serial-&gt;parent-&gt;usb,</div><div class='del'>-					  serial-&gt;in_endp-&gt;</div><div class='del'>-					  bEndpointAddress &amp; 0x7F),</div><div class='del'>-			  urb-&gt;transfer_buffer, serial-&gt;rx_data_length,</div><div class='del'>-			  hso_std_serial_read_bulk_callback, serial);</div><div class='del'>-	/* Give this to the USB subsystem so it can tell us when more data</div><div class='del'>-	 * arrives. */</div><div class='del'>-	result = usb_submit_urb(urb, GFP_ATOMIC);</div><div class='del'>-	if (result) {</div><div class='del'>-		dev_err(&amp;urb-&gt;dev-&gt;dev, "%s failed submit serial rx_urb %d",</div><div class='del'>-			__func__, result);</div><div class='add'>+	if (write_length_remaining == 0) {</div><div class='add'>+		serial-&gt;curr_rx_urb_offset = 0;</div><div class='add'>+		serial-&gt;rx_urb_filled[hso_urb_to_index(serial, urb)] = 0;</div><div class='ctx'> 	}</div><div class='add'>+	return write_length_remaining;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> /* Base driver functions */</div><div class='ctx'> </div><div class='ctx'> static void hso_log_port(struct hso_device *hso_dev)</div><div class='hunk'>@@ -1794,9 +1931,13 @@ static int hso_stop_serial_device(struct hso_device *hso_dev)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; serial-&gt;num_rx_urbs; i++) {</div><div class='del'>-		if (serial-&gt;rx_urb[i])</div><div class='add'>+		if (serial-&gt;rx_urb[i]) {</div><div class='ctx'> 				usb_kill_urb(serial-&gt;rx_urb[i]);</div><div class='add'>+				serial-&gt;rx_urb_filled[i] = 0;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='add'>+	serial-&gt;curr_rx_urb_idx = 0;</div><div class='add'>+	serial-&gt;curr_rx_urb_offset = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (serial-&gt;tx_urb)</div><div class='ctx'> 		usb_kill_urb(serial-&gt;tx_urb);</div><div class='hunk'>@@ -2211,14 +2352,14 @@ static struct hso_device *hso_create_bulk_serial_device(</div><div class='ctx'> 				     USB_DIR_IN);</div><div class='ctx'> 	if (!serial-&gt;in_endp) {</div><div class='ctx'> 		dev_err(&amp;interface-&gt;dev, "Failed to find BULK IN ep\n");</div><div class='del'>-		goto exit;</div><div class='add'>+		goto exit2;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!</div><div class='ctx'> 	    (serial-&gt;out_endp =</div><div class='ctx'> 	     hso_get_ep(interface, USB_ENDPOINT_XFER_BULK, USB_DIR_OUT))) {</div><div class='ctx'> 		dev_err(&amp;interface-&gt;dev, "Failed to find BULK IN ep\n");</div><div class='del'>-		goto exit;</div><div class='add'>+		goto exit2;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	serial-&gt;write_data = hso_std_serial_write_data;</div><div class='hunk'>@@ -2231,9 +2372,10 @@ static struct hso_device *hso_create_bulk_serial_device(</div><div class='ctx'> </div><div class='ctx'> 	/* done, return it */</div><div class='ctx'> 	return hso_dev;</div><div class='add'>+</div><div class='add'>+exit2:</div><div class='add'>+	hso_serial_common_free(serial);</div><div class='ctx'> exit:</div><div class='del'>-	if (hso_dev &amp;&amp; serial)</div><div class='del'>-		hso_serial_common_free(serial);</div><div class='ctx'> 	kfree(serial);</div><div class='ctx'> 	hso_free_device(hso_dev);</div><div class='ctx'> 	return NULL;</div><div class='hunk'>@@ -2740,6 +2882,7 @@ static const struct tty_operations hso_serial_ops = {</div><div class='ctx'> 	.chars_in_buffer = hso_serial_chars_in_buffer,</div><div class='ctx'> 	.tiocmget = hso_serial_tiocmget,</div><div class='ctx'> 	.tiocmset = hso_serial_tiocmset,</div><div class='add'>+	.unthrottle = hso_unthrottle</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct usb_driver hso_driver = {</div><div class='head'>diff --git a/drivers/net/usb/kaweth.c b/drivers/net/usb/kaweth.c<br/>index d6829db51b45..fdbf3be24fda 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/usb/kaweth.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/usb/kaweth.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/usb/kaweth.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/usb/kaweth.c</a></div><div class='hunk'>@@ -832,7 +832,7 @@ static int kaweth_start_xmit(struct sk_buff *skb, struct net_device *net)</div><div class='ctx'> </div><div class='ctx'> 	if((res = usb_submit_urb(kaweth-&gt;tx_urb, GFP_ATOMIC)))</div><div class='ctx'> 	{</div><div class='del'>-		warn("kaweth failed tx_urb %d", res);</div><div class='add'>+		dev_warn(&amp;net-&gt;dev, "kaweth failed tx_urb %d\n", res);</div><div class='ctx'> skip:</div><div class='ctx'> 		kaweth-&gt;stats.tx_errors++;</div><div class='ctx'> </div><div class='hunk'>@@ -924,7 +924,7 @@ static void kaweth_tx_timeout(struct net_device *net)</div><div class='ctx'> {</div><div class='ctx'> 	struct kaweth_device *kaweth = netdev_priv(net);</div><div class='ctx'> </div><div class='del'>-	warn("%s: Tx timed out. Resetting.", net-&gt;name);</div><div class='add'>+	dev_warn(&amp;net-&gt;dev, "%s: Tx timed out. Resetting.\n", net-&gt;name);</div><div class='ctx'> 	kaweth-&gt;stats.tx_errors++;</div><div class='ctx'> 	net-&gt;trans_start = jiffies;</div><div class='ctx'> </div><div class='hunk'>@@ -1016,10 +1016,10 @@ static int kaweth_probe(</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	if (le16_to_cpu(dev-&gt;descriptor.bcdDevice) &gt;&gt; 8) {</div><div class='del'>-		info("Firmware present in device.");</div><div class='add'>+		dev_info(&amp;intf-&gt;dev, "Firmware present in device.\n");</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* Download the firmware */</div><div class='del'>-		info("Downloading firmware...");</div><div class='add'>+		dev_info(&amp;intf-&gt;dev, "Downloading firmware...\n");</div><div class='ctx'> 		kaweth-&gt;firmware_buf = (__u8 *)__get_free_page(GFP_KERNEL);</div><div class='ctx'> 		if ((result = kaweth_download_firmware(kaweth,</div><div class='ctx'> 						      "kaweth/new_code.bin",</div><div class='hunk'>@@ -1061,7 +1061,7 @@ static int kaweth_probe(</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Device will now disappear for a moment...  */</div><div class='del'>-		info("Firmware loaded.  I'll be back...");</div><div class='add'>+		dev_info(&amp;intf-&gt;dev, "Firmware loaded.  I'll be back...\n");</div><div class='ctx'> err_fw:</div><div class='ctx'> 		free_page((unsigned long)kaweth-&gt;firmware_buf);</div><div class='ctx'> 		free_netdev(netdev);</div><div class='hunk'>@@ -1075,10 +1075,10 @@ err_fw:</div><div class='ctx'> 		goto err_free_netdev;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	info("Statistics collection: %x", kaweth-&gt;configuration.statistics_mask);</div><div class='del'>-	info("Multicast filter limit: %x", kaweth-&gt;configuration.max_multicast_filters &amp; ((1 &lt;&lt; 15) - 1));</div><div class='del'>-	info("MTU: %d", le16_to_cpu(kaweth-&gt;configuration.segment_size));</div><div class='del'>-	info("Read MAC address %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x",</div><div class='add'>+	dev_info(&amp;intf-&gt;dev, "Statistics collection: %x\n", kaweth-&gt;configuration.statistics_mask);</div><div class='add'>+	dev_info(&amp;intf-&gt;dev, "Multicast filter limit: %x\n", kaweth-&gt;configuration.max_multicast_filters &amp; ((1 &lt;&lt; 15) - 1));</div><div class='add'>+	dev_info(&amp;intf-&gt;dev, "MTU: %d\n", le16_to_cpu(kaweth-&gt;configuration.segment_size));</div><div class='add'>+	dev_info(&amp;intf-&gt;dev, "Read MAC address %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x\n",</div><div class='ctx'> 		 (int)kaweth-&gt;configuration.hw_addr[0],</div><div class='ctx'> 		 (int)kaweth-&gt;configuration.hw_addr[1],</div><div class='ctx'> 		 (int)kaweth-&gt;configuration.hw_addr[2],</div><div class='hunk'>@@ -1174,7 +1174,8 @@ err_fw:</div><div class='ctx'> 		goto err_intfdata;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	info("kaweth interface created at %s", kaweth-&gt;net-&gt;name);</div><div class='add'>+	dev_info(&amp;intf-&gt;dev, "kaweth interface created at %s\n",</div><div class='add'>+		 kaweth-&gt;net-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	dbg("Kaweth probe returning.");</div><div class='ctx'> </div><div class='hunk'>@@ -1205,11 +1206,11 @@ static void kaweth_disconnect(struct usb_interface *intf)</div><div class='ctx'> 	struct kaweth_device *kaweth = usb_get_intfdata(intf);</div><div class='ctx'> 	struct net_device *netdev;</div><div class='ctx'> </div><div class='del'>-	info("Unregistering");</div><div class='add'>+	dev_info(&amp;intf-&gt;dev, "Unregistering\n");</div><div class='ctx'> </div><div class='ctx'> 	usb_set_intfdata(intf, NULL);</div><div class='ctx'> 	if (!kaweth) {</div><div class='del'>-		warn("unregistering non-existant device");</div><div class='add'>+		dev_warn(&amp;intf-&gt;dev, "unregistering non-existant device\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	netdev = kaweth-&gt;net;</div><div class='hunk'>@@ -1269,7 +1270,7 @@ static int usb_start_wait_urb(struct urb *urb, int timeout, int* actual_length)</div><div class='ctx'> </div><div class='ctx'> 	if (!wait_event_timeout(awd.wqh, awd.done, timeout)) {</div><div class='ctx'>                 // timeout</div><div class='del'>-                warn("usb_control/bulk_msg: timeout");</div><div class='add'>+                dev_warn(&amp;urb-&gt;dev-&gt;dev, "usb_control/bulk_msg: timeout\n");</div><div class='ctx'>                 usb_kill_urb(urb);  // remove urb safely</div><div class='ctx'>                 status = -ETIMEDOUT;</div><div class='ctx'>         }</div><div class='head'>diff --git a/drivers/net/usb/mcs7830.c b/drivers/net/usb/mcs7830.c<br/>index ca9d00c1194e..b5143509e8be 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/usb/mcs7830.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/usb/mcs7830.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/usb/mcs7830.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/usb/mcs7830.c</a></div><div class='hunk'>@@ -118,7 +118,7 @@ static void mcs7830_async_cmd_callback(struct urb *urb)</div><div class='ctx'> </div><div class='ctx'> 	if (urb-&gt;status &lt; 0)</div><div class='ctx'> 		printk(KERN_DEBUG "%s() failed with %d\n",</div><div class='del'>-		       __FUNCTION__, urb-&gt;status);</div><div class='add'>+		       __func__, urb-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	kfree(req);</div><div class='ctx'> 	usb_free_urb(urb);</div><div class='head'>diff --git a/drivers/net/usb/pegasus.c b/drivers/net/usb/pegasus.c<br/>index 8c19307e5040..38b90e7a7ed3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/usb/pegasus.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/usb/pegasus.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/usb/pegasus.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/usb/pegasus.c</a></div><div class='hunk'>@@ -119,7 +119,7 @@ static void ctrl_callback(struct urb *urb)</div><div class='ctx'> 	default:</div><div class='ctx'> 		if (netif_msg_drv(pegasus) &amp;&amp; printk_ratelimit())</div><div class='ctx'> 			dev_dbg(&amp;pegasus-&gt;intf-&gt;dev, "%s, status %d\n",</div><div class='del'>-				__FUNCTION__, urb-&gt;status);</div><div class='add'>+				__func__, urb-&gt;status);</div><div class='ctx'> 	}</div><div class='ctx'> 	pegasus-&gt;flags &amp;= ~ETH_REGS_CHANGED;</div><div class='ctx'> 	wake_up(&amp;pegasus-&gt;ctrl_wait);</div><div class='hunk'>@@ -136,7 +136,7 @@ static int get_registers(pegasus_t * pegasus, __u16 indx, __u16 size,</div><div class='ctx'> 	if (!buffer) {</div><div class='ctx'> 		if (netif_msg_drv(pegasus))</div><div class='ctx'> 			dev_warn(&amp;pegasus-&gt;intf-&gt;dev, "out of memory in %s\n",</div><div class='del'>-					__FUNCTION__);</div><div class='add'>+					__func__);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> 	add_wait_queue(&amp;pegasus-&gt;ctrl_wait, &amp;wait);</div><div class='hunk'>@@ -224,7 +224,7 @@ static int set_registers(pegasus_t * pegasus, __u16 indx, __u16 size,</div><div class='ctx'> 			netif_device_detach(pegasus-&gt;net);</div><div class='ctx'> 		if (netif_msg_drv(pegasus))</div><div class='ctx'> 			dev_err(&amp;pegasus-&gt;intf-&gt;dev, "%s, status %d\n",</div><div class='del'>-					__FUNCTION__, ret);</div><div class='add'>+					__func__, ret);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -246,7 +246,7 @@ static int set_register(pegasus_t * pegasus, __u16 indx, __u8 data)</div><div class='ctx'> 	if (!tmp) {</div><div class='ctx'> 		if (netif_msg_drv(pegasus))</div><div class='ctx'> 			dev_warn(&amp;pegasus-&gt;intf-&gt;dev, "out of memory in %s\n",</div><div class='del'>-					__FUNCTION__);</div><div class='add'>+					__func__);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> 	memcpy(tmp, &amp;data, 1);</div><div class='hunk'>@@ -277,7 +277,7 @@ static int set_register(pegasus_t * pegasus, __u16 indx, __u8 data)</div><div class='ctx'> 			netif_device_detach(pegasus-&gt;net);</div><div class='ctx'> 		if (netif_msg_drv(pegasus) &amp;&amp; printk_ratelimit())</div><div class='ctx'> 			dev_err(&amp;pegasus-&gt;intf-&gt;dev, "%s, status %d\n",</div><div class='del'>-					__FUNCTION__, ret);</div><div class='add'>+					__func__, ret);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -310,7 +310,7 @@ static int update_eth_regs_async(pegasus_t * pegasus)</div><div class='ctx'> 			netif_device_detach(pegasus-&gt;net);</div><div class='ctx'> 		if (netif_msg_drv(pegasus))</div><div class='ctx'> 			dev_err(&amp;pegasus-&gt;intf-&gt;dev, "%s, status %d\n",</div><div class='del'>-					__FUNCTION__, ret);</div><div class='add'>+					__func__, ret);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -341,7 +341,7 @@ static int read_mii_word(pegasus_t * pegasus, __u8 phy, __u8 indx, __u16 * regd)</div><div class='ctx'> 	}</div><div class='ctx'> fail:</div><div class='ctx'> 	if (netif_msg_drv(pegasus))</div><div class='del'>-		dev_warn(&amp;pegasus-&gt;intf-&gt;dev, "%s failed\n", __FUNCTION__);</div><div class='add'>+		dev_warn(&amp;pegasus-&gt;intf-&gt;dev, "%s failed\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -378,7 +378,7 @@ static int write_mii_word(pegasus_t * pegasus, __u8 phy, __u8 indx, __u16 regd)</div><div class='ctx'> </div><div class='ctx'> fail:</div><div class='ctx'> 	if (netif_msg_drv(pegasus))</div><div class='del'>-		dev_warn(&amp;pegasus-&gt;intf-&gt;dev, "%s failed\n", __FUNCTION__);</div><div class='add'>+		dev_warn(&amp;pegasus-&gt;intf-&gt;dev, "%s failed\n", __func__);</div><div class='ctx'> 	return -ETIMEDOUT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -415,7 +415,7 @@ static int read_eprom_word(pegasus_t * pegasus, __u8 index, __u16 * retdata)</div><div class='ctx'> </div><div class='ctx'> fail:</div><div class='ctx'> 	if (netif_msg_drv(pegasus))</div><div class='del'>-		dev_warn(&amp;pegasus-&gt;intf-&gt;dev, "%s failed\n", __FUNCTION__);</div><div class='add'>+		dev_warn(&amp;pegasus-&gt;intf-&gt;dev, "%s failed\n", __func__);</div><div class='ctx'> 	return -ETIMEDOUT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -463,7 +463,7 @@ static int write_eprom_word(pegasus_t * pegasus, __u8 index, __u16 data)</div><div class='ctx'> 		return ret;</div><div class='ctx'> fail:</div><div class='ctx'> 	if (netif_msg_drv(pegasus))</div><div class='del'>-		dev_warn(&amp;pegasus-&gt;intf-&gt;dev, "%s failed\n", __FUNCTION__);</div><div class='add'>+		dev_warn(&amp;pegasus-&gt;intf-&gt;dev, "%s failed\n", __func__);</div><div class='ctx'> 	return -ETIMEDOUT;</div><div class='ctx'> }</div><div class='ctx'> #endif				/* PEGASUS_WRITE_EEPROM */</div><div class='head'>diff --git a/drivers/net/usb/rtl8150.c b/drivers/net/usb/rtl8150.c<br/>index df56a518691c..6133401ebc67 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/usb/rtl8150.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/usb/rtl8150.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/usb/rtl8150.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/usb/rtl8150.c</a></div><div class='hunk'>@@ -221,7 +221,7 @@ static void ctrl_callback(struct urb *urb)</div><div class='ctx'> 	case -ENOENT:</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		warn("ctrl urb status %d", urb-&gt;status);</div><div class='add'>+		dev_warn(&amp;urb-&gt;dev-&gt;dev, "ctrl urb status %d\n", urb-&gt;status);</div><div class='ctx'> 	}</div><div class='ctx'> 	dev = urb-&gt;context;</div><div class='ctx'> 	clear_bit(RX_REG_SET, &amp;dev-&gt;flags);</div><div class='hunk'>@@ -441,10 +441,10 @@ static void read_bulk_callback(struct urb *urb)</div><div class='ctx'> 	case -ENOENT:</div><div class='ctx'> 		return;	/* the urb is in unlink state */</div><div class='ctx'> 	case -ETIME:</div><div class='del'>-		warn("may be reset is needed?..");</div><div class='add'>+		dev_warn(&amp;urb-&gt;dev-&gt;dev, "may be reset is needed?..\n");</div><div class='ctx'> 		goto goon;</div><div class='ctx'> 	default:</div><div class='del'>-		warn("Rx status %d", urb-&gt;status);</div><div class='add'>+		dev_warn(&amp;urb-&gt;dev-&gt;dev, "Rx status %d\n", urb-&gt;status);</div><div class='ctx'> 		goto goon;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -538,7 +538,8 @@ static void write_bulk_callback(struct urb *urb)</div><div class='ctx'> 	if (!netif_device_present(dev-&gt;netdev))</div><div class='ctx'> 		return;</div><div class='ctx'> 	if (urb-&gt;status)</div><div class='del'>-		info("%s: Tx status %d", dev-&gt;netdev-&gt;name, urb-&gt;status);</div><div class='add'>+		dev_info(&amp;urb-&gt;dev-&gt;dev, "%s: Tx status %d\n",</div><div class='add'>+			 dev-&gt;netdev-&gt;name, urb-&gt;status);</div><div class='ctx'> 	dev-&gt;netdev-&gt;trans_start = jiffies;</div><div class='ctx'> 	netif_wake_queue(dev-&gt;netdev);</div><div class='ctx'> }</div><div class='hunk'>@@ -561,7 +562,8 @@ static void intr_callback(struct urb *urb)</div><div class='ctx'> 		return;</div><div class='ctx'> 	/* -EPIPE:  should clear the halt */</div><div class='ctx'> 	default:</div><div class='del'>-		info("%s: intr status %d", dev-&gt;netdev-&gt;name, urb-&gt;status);</div><div class='add'>+		dev_info(&amp;urb-&gt;dev-&gt;dev, "%s: intr status %d\n",</div><div class='add'>+			 dev-&gt;netdev-&gt;name, urb-&gt;status);</div><div class='ctx'> 		goto resubmit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -665,7 +667,7 @@ static int enable_net_traffic(rtl8150_t * dev)</div><div class='ctx'> 	u8 cr, tcr, rcr, msr;</div><div class='ctx'> </div><div class='ctx'> 	if (!rtl8150_reset(dev)) {</div><div class='del'>-		warn("%s - device reset failed", __FUNCTION__);</div><div class='add'>+		dev_warn(&amp;dev-&gt;udev-&gt;dev, "device reset failed\n");</div><div class='ctx'> 	}</div><div class='ctx'> 	/* RCR bit7=1 attach Rx info at the end;  =0 HW CRC (which is broken) */</div><div class='ctx'> 	rcr = 0x9e;</div><div class='hunk'>@@ -699,7 +701,7 @@ static struct net_device_stats *rtl8150_netdev_stats(struct net_device *dev)</div><div class='ctx'> static void rtl8150_tx_timeout(struct net_device *netdev)</div><div class='ctx'> {</div><div class='ctx'> 	rtl8150_t *dev = netdev_priv(netdev);</div><div class='del'>-	warn("%s: Tx timeout.", netdev-&gt;name);</div><div class='add'>+	dev_warn(&amp;netdev-&gt;dev, "Tx timeout.\n");</div><div class='ctx'> 	usb_unlink_urb(dev-&gt;tx_urb);</div><div class='ctx'> 	dev-&gt;stats.tx_errors++;</div><div class='ctx'> }</div><div class='hunk'>@@ -710,12 +712,12 @@ static void rtl8150_set_multicast(struct net_device *netdev)</div><div class='ctx'> 	netif_stop_queue(netdev);</div><div class='ctx'> 	if (netdev-&gt;flags &amp; IFF_PROMISC) {</div><div class='ctx'> 		dev-&gt;rx_creg |= cpu_to_le16(0x0001);</div><div class='del'>-		info("%s: promiscuous mode", netdev-&gt;name);</div><div class='add'>+		dev_info(&amp;netdev-&gt;dev, "%s: promiscuous mode\n", netdev-&gt;name);</div><div class='ctx'> 	} else if (netdev-&gt;mc_count ||</div><div class='ctx'> 		   (netdev-&gt;flags &amp; IFF_ALLMULTI)) {</div><div class='ctx'> 		dev-&gt;rx_creg &amp;= cpu_to_le16(0xfffe);</div><div class='ctx'> 		dev-&gt;rx_creg |= cpu_to_le16(0x0002);</div><div class='del'>-		info("%s: allmulti set", netdev-&gt;name);</div><div class='add'>+		dev_info(&amp;netdev-&gt;dev, "%s: allmulti set\n", netdev-&gt;name);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* ~RX_MULTICAST, ~RX_PROMISCUOUS */</div><div class='ctx'> 		dev-&gt;rx_creg &amp;= cpu_to_le16(0x00fc);</div><div class='hunk'>@@ -740,7 +742,7 @@ static int rtl8150_start_xmit(struct sk_buff *skb, struct net_device *netdev)</div><div class='ctx'> 		if (res == -ENODEV)</div><div class='ctx'> 			netif_device_detach(dev-&gt;netdev);</div><div class='ctx'> 		else {</div><div class='del'>-			warn("failed tx_urb %d\n", res);</div><div class='add'>+			dev_warn(&amp;netdev-&gt;dev, "failed tx_urb %d\n", res);</div><div class='ctx'> 			dev-&gt;stats.tx_errors++;</div><div class='ctx'> 			netif_start_queue(netdev);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -783,7 +785,7 @@ static int rtl8150_open(struct net_device *netdev)</div><div class='ctx'> 	if ((res = usb_submit_urb(dev-&gt;rx_urb, GFP_KERNEL))) {</div><div class='ctx'> 		if (res == -ENODEV)</div><div class='ctx'> 			netif_device_detach(dev-&gt;netdev);</div><div class='del'>-		warn("%s: rx_urb submit failed: %d", __FUNCTION__, res);</div><div class='add'>+		dev_warn(&amp;netdev-&gt;dev, "rx_urb submit failed: %d\n", res);</div><div class='ctx'> 		return res;</div><div class='ctx'> 	}</div><div class='ctx'> 	usb_fill_int_urb(dev-&gt;intr_urb, dev-&gt;udev, usb_rcvintpipe(dev-&gt;udev, 3),</div><div class='hunk'>@@ -792,7 +794,7 @@ static int rtl8150_open(struct net_device *netdev)</div><div class='ctx'> 	if ((res = usb_submit_urb(dev-&gt;intr_urb, GFP_KERNEL))) {</div><div class='ctx'> 		if (res == -ENODEV)</div><div class='ctx'> 			netif_device_detach(dev-&gt;netdev);</div><div class='del'>-		warn("%s: intr_urb submit failed: %d", __FUNCTION__, res);</div><div class='add'>+		dev_warn(&amp;netdev-&gt;dev, "intr_urb submit failed: %d\n", res);</div><div class='ctx'> 		usb_kill_urb(dev-&gt;rx_urb);</div><div class='ctx'> 		return res;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -947,7 +949,7 @@ static int rtl8150_probe(struct usb_interface *intf,</div><div class='ctx'> 		goto out2;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	info("%s: rtl8150 is detected", netdev-&gt;name);</div><div class='add'>+	dev_info(&amp;intf-&gt;dev, "%s: rtl8150 is detected\n", netdev-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -984,7 +986,8 @@ static void rtl8150_disconnect(struct usb_interface *intf)</div><div class='ctx'> </div><div class='ctx'> static int __init usb_rtl8150_init(void)</div><div class='ctx'> {</div><div class='del'>-	info(DRIVER_DESC " " DRIVER_VERSION);</div><div class='add'>+	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"</div><div class='add'>+	       DRIVER_DESC "\n");</div><div class='ctx'> 	return usb_register(&amp;rtl8150_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c<br/>new file mode 100644<br/>index 000000000000..51e2f5d7d14e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/usb/smsc95xx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/usb/smsc95xx.c</a></div><div class='hunk'>@@ -0,0 +1,1225 @@</div><div class='add'>+ /***************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2007-2008 SMSC</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public License</div><div class='add'>+ * as published by the Free Software Foundation; either version 2</div><div class='add'>+ * of the License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.</div><div class='add'>+ *</div><div class='add'>+ *****************************************************************************/</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/kmod.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='add'>+#include &lt;linux/mii.h&gt;</div><div class='add'>+#include &lt;linux/usb.h&gt;</div><div class='add'>+#include &lt;linux/crc32.h&gt;</div><div class='add'>+#include &lt;linux/usb/usbnet.h&gt;</div><div class='add'>+#include "smsc95xx.h"</div><div class='add'>+</div><div class='add'>+#define SMSC_CHIPNAME			"smsc95xx"</div><div class='add'>+#define SMSC_DRIVER_VERSION		"1.0.3"</div><div class='add'>+#define HS_USB_PKT_SIZE			(512)</div><div class='add'>+#define FS_USB_PKT_SIZE			(64)</div><div class='add'>+#define DEFAULT_HS_BURST_CAP_SIZE	(16 * 1024 + 5 * HS_USB_PKT_SIZE)</div><div class='add'>+#define DEFAULT_FS_BURST_CAP_SIZE	(6 * 1024 + 33 * FS_USB_PKT_SIZE)</div><div class='add'>+#define DEFAULT_BULK_IN_DELAY		(0x00002000)</div><div class='add'>+#define MAX_SINGLE_PACKET_SIZE		(2048)</div><div class='add'>+#define LAN95XX_EEPROM_MAGIC		(0x9500)</div><div class='add'>+#define EEPROM_MAC_OFFSET		(0x01)</div><div class='add'>+#define DEFAULT_RX_CSUM_ENABLE		(true)</div><div class='add'>+#define SMSC95XX_INTERNAL_PHY_ID	(1)</div><div class='add'>+#define SMSC95XX_TX_OVERHEAD		(8)</div><div class='add'>+#define FLOW_CTRL_TX			(1)</div><div class='add'>+#define FLOW_CTRL_RX			(2)</div><div class='add'>+</div><div class='add'>+struct smsc95xx_priv {</div><div class='add'>+	u32 mac_cr;</div><div class='add'>+	spinlock_t mac_cr_lock;</div><div class='add'>+	bool use_rx_csum;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct usb_context {</div><div class='add'>+	struct usb_ctrlrequest req;</div><div class='add'>+	struct completion notify;</div><div class='add'>+	struct usbnet *dev;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int turbo_mode = true;</div><div class='add'>+module_param(turbo_mode, bool, 0644);</div><div class='add'>+MODULE_PARM_DESC(turbo_mode, "Enable multiple frames per Rx transaction");</div><div class='add'>+</div><div class='add'>+static int smsc95xx_read_reg(struct usbnet *dev, u32 index, u32 *data)</div><div class='add'>+{</div><div class='add'>+	u32 *buf = kmalloc(4, GFP_KERNEL);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	BUG_ON(!dev);</div><div class='add'>+</div><div class='add'>+	if (!buf)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ret = usb_control_msg(dev-&gt;udev, usb_rcvctrlpipe(dev-&gt;udev, 0),</div><div class='add'>+		USB_VENDOR_REQUEST_READ_REGISTER,</div><div class='add'>+		USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,</div><div class='add'>+		00, index, buf, 4, USB_CTRL_GET_TIMEOUT);</div><div class='add'>+</div><div class='add'>+	if (unlikely(ret &lt; 0))</div><div class='add'>+		devwarn(dev, "Failed to read register index 0x%08x", index);</div><div class='add'>+</div><div class='add'>+	le32_to_cpus(buf);</div><div class='add'>+	*data = *buf;</div><div class='add'>+	kfree(buf);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int smsc95xx_write_reg(struct usbnet *dev, u32 index, u32 data)</div><div class='add'>+{</div><div class='add'>+	u32 *buf = kmalloc(4, GFP_KERNEL);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	BUG_ON(!dev);</div><div class='add'>+</div><div class='add'>+	if (!buf)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	*buf = data;</div><div class='add'>+	cpu_to_le32s(buf);</div><div class='add'>+</div><div class='add'>+	ret = usb_control_msg(dev-&gt;udev, usb_sndctrlpipe(dev-&gt;udev, 0),</div><div class='add'>+		USB_VENDOR_REQUEST_WRITE_REGISTER,</div><div class='add'>+		USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,</div><div class='add'>+		00, index, buf, 4, USB_CTRL_SET_TIMEOUT);</div><div class='add'>+</div><div class='add'>+	if (unlikely(ret &lt; 0))</div><div class='add'>+		devwarn(dev, "Failed to write register index 0x%08x", index);</div><div class='add'>+</div><div class='add'>+	kfree(buf);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Loop until the read is completed with timeout</div><div class='add'>+ * called with phy_mutex held */</div><div class='add'>+static int smsc95xx_phy_wait_not_busy(struct usbnet *dev)</div><div class='add'>+{</div><div class='add'>+	unsigned long start_time = jiffies;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		smsc95xx_read_reg(dev, MII_ADDR, &amp;val);</div><div class='add'>+		if (!(val &amp; MII_BUSY_))</div><div class='add'>+			return 0;</div><div class='add'>+	} while (!time_after(jiffies, start_time + HZ));</div><div class='add'>+</div><div class='add'>+	return -EIO;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int smsc95xx_mdio_read(struct net_device *netdev, int phy_id, int idx)</div><div class='add'>+{</div><div class='add'>+	struct usbnet *dev = netdev_priv(netdev);</div><div class='add'>+	u32 val, addr;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;phy_mutex);</div><div class='add'>+</div><div class='add'>+	/* confirm MII not busy */</div><div class='add'>+	if (smsc95xx_phy_wait_not_busy(dev)) {</div><div class='add'>+		devwarn(dev, "MII is busy in smsc95xx_mdio_read");</div><div class='add'>+		mutex_unlock(&amp;dev-&gt;phy_mutex);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* set the address, index &amp; direction (read from PHY) */</div><div class='add'>+	phy_id &amp;= dev-&gt;mii.phy_id_mask;</div><div class='add'>+	idx &amp;= dev-&gt;mii.reg_num_mask;</div><div class='add'>+	addr = (phy_id &lt;&lt; 11) | (idx &lt;&lt; 6) | MII_READ_;</div><div class='add'>+	smsc95xx_write_reg(dev, MII_ADDR, addr);</div><div class='add'>+</div><div class='add'>+	if (smsc95xx_phy_wait_not_busy(dev)) {</div><div class='add'>+		devwarn(dev, "Timed out reading MII reg %02X", idx);</div><div class='add'>+		mutex_unlock(&amp;dev-&gt;phy_mutex);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	smsc95xx_read_reg(dev, MII_DATA, &amp;val);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;phy_mutex);</div><div class='add'>+</div><div class='add'>+	return (u16)(val &amp; 0xFFFF);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void smsc95xx_mdio_write(struct net_device *netdev, int phy_id, int idx,</div><div class='add'>+				int regval)</div><div class='add'>+{</div><div class='add'>+	struct usbnet *dev = netdev_priv(netdev);</div><div class='add'>+	u32 val, addr;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;phy_mutex);</div><div class='add'>+</div><div class='add'>+	/* confirm MII not busy */</div><div class='add'>+	if (smsc95xx_phy_wait_not_busy(dev)) {</div><div class='add'>+		devwarn(dev, "MII is busy in smsc95xx_mdio_write");</div><div class='add'>+		mutex_unlock(&amp;dev-&gt;phy_mutex);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	val = regval;</div><div class='add'>+	smsc95xx_write_reg(dev, MII_DATA, val);</div><div class='add'>+</div><div class='add'>+	/* set the address, index &amp; direction (write to PHY) */</div><div class='add'>+	phy_id &amp;= dev-&gt;mii.phy_id_mask;</div><div class='add'>+	idx &amp;= dev-&gt;mii.reg_num_mask;</div><div class='add'>+	addr = (phy_id &lt;&lt; 11) | (idx &lt;&lt; 6) | MII_WRITE_;</div><div class='add'>+	smsc95xx_write_reg(dev, MII_ADDR, addr);</div><div class='add'>+</div><div class='add'>+	if (smsc95xx_phy_wait_not_busy(dev))</div><div class='add'>+		devwarn(dev, "Timed out writing MII reg %02X", idx);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;phy_mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int smsc95xx_wait_eeprom(struct usbnet *dev)</div><div class='add'>+{</div><div class='add'>+	unsigned long start_time = jiffies;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		smsc95xx_read_reg(dev, E2P_CMD, &amp;val);</div><div class='add'>+		if (!(val &amp; E2P_CMD_BUSY_) || (val &amp; E2P_CMD_TIMEOUT_))</div><div class='add'>+			break;</div><div class='add'>+		udelay(40);</div><div class='add'>+	} while (!time_after(jiffies, start_time + HZ));</div><div class='add'>+</div><div class='add'>+	if (val &amp; (E2P_CMD_TIMEOUT_ | E2P_CMD_BUSY_)) {</div><div class='add'>+		devwarn(dev, "EEPROM read operation timeout");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int smsc95xx_eeprom_confirm_not_busy(struct usbnet *dev)</div><div class='add'>+{</div><div class='add'>+	unsigned long start_time = jiffies;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		smsc95xx_read_reg(dev, E2P_CMD, &amp;val);</div><div class='add'>+</div><div class='add'>+		if (!(val &amp; E2P_CMD_LOADED_)) {</div><div class='add'>+			devwarn(dev, "No EEPROM present");</div><div class='add'>+			return -EIO;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!(val &amp; E2P_CMD_BUSY_))</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		udelay(40);</div><div class='add'>+	} while (!time_after(jiffies, start_time + HZ));</div><div class='add'>+</div><div class='add'>+	devwarn(dev, "EEPROM is busy");</div><div class='add'>+	return -EIO;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int smsc95xx_read_eeprom(struct usbnet *dev, u32 offset, u32 length,</div><div class='add'>+				u8 *data)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	BUG_ON(!dev);</div><div class='add'>+	BUG_ON(!data);</div><div class='add'>+</div><div class='add'>+	ret = smsc95xx_eeprom_confirm_not_busy(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; length; i++) {</div><div class='add'>+		val = E2P_CMD_BUSY_ | E2P_CMD_READ_ | (offset &amp; E2P_CMD_ADDR_);</div><div class='add'>+		smsc95xx_write_reg(dev, E2P_CMD, val);</div><div class='add'>+</div><div class='add'>+		ret = smsc95xx_wait_eeprom(dev);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		smsc95xx_read_reg(dev, E2P_DATA, &amp;val);</div><div class='add'>+</div><div class='add'>+		data[i] = val &amp; 0xFF;</div><div class='add'>+		offset++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int smsc95xx_write_eeprom(struct usbnet *dev, u32 offset, u32 length,</div><div class='add'>+				 u8 *data)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	BUG_ON(!dev);</div><div class='add'>+	BUG_ON(!data);</div><div class='add'>+</div><div class='add'>+	ret = smsc95xx_eeprom_confirm_not_busy(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Issue write/erase enable command */</div><div class='add'>+	val = E2P_CMD_BUSY_ | E2P_CMD_EWEN_;</div><div class='add'>+	smsc95xx_write_reg(dev, E2P_CMD, val);</div><div class='add'>+</div><div class='add'>+	ret = smsc95xx_wait_eeprom(dev);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; length; i++) {</div><div class='add'>+</div><div class='add'>+		/* Fill data register */</div><div class='add'>+		val = data[i];</div><div class='add'>+		smsc95xx_write_reg(dev, E2P_DATA, val);</div><div class='add'>+</div><div class='add'>+		/* Send "write" command */</div><div class='add'>+		val = E2P_CMD_BUSY_ | E2P_CMD_WRITE_ | (offset &amp; E2P_CMD_ADDR_);</div><div class='add'>+		smsc95xx_write_reg(dev, E2P_CMD, val);</div><div class='add'>+</div><div class='add'>+		ret = smsc95xx_wait_eeprom(dev);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		offset++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void smsc95xx_async_cmd_callback(struct urb *urb, struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	struct usb_context *usb_context = urb-&gt;context;</div><div class='add'>+	struct usbnet *dev = usb_context-&gt;dev;</div><div class='add'>+</div><div class='add'>+	if (urb-&gt;status &lt; 0)</div><div class='add'>+		devwarn(dev, "async callback failed with %d", urb-&gt;status);</div><div class='add'>+</div><div class='add'>+	complete(&amp;usb_context-&gt;notify);</div><div class='add'>+</div><div class='add'>+	kfree(usb_context);</div><div class='add'>+	usb_free_urb(urb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int smsc95xx_write_reg_async(struct usbnet *dev, u16 index, u32 *data)</div><div class='add'>+{</div><div class='add'>+	struct usb_context *usb_context;</div><div class='add'>+	int status;</div><div class='add'>+	struct urb *urb;</div><div class='add'>+	const u16 size = 4;</div><div class='add'>+</div><div class='add'>+	urb = usb_alloc_urb(0, GFP_ATOMIC);</div><div class='add'>+	if (!urb) {</div><div class='add'>+		devwarn(dev, "Error allocating URB");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	usb_context = kmalloc(sizeof(struct usb_context), GFP_ATOMIC);</div><div class='add'>+	if (usb_context == NULL) {</div><div class='add'>+		devwarn(dev, "Error allocating control msg");</div><div class='add'>+		usb_free_urb(urb);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	usb_context-&gt;req.bRequestType =</div><div class='add'>+		USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE;</div><div class='add'>+	usb_context-&gt;req.bRequest = USB_VENDOR_REQUEST_WRITE_REGISTER;</div><div class='add'>+	usb_context-&gt;req.wValue = 00;</div><div class='add'>+	usb_context-&gt;req.wIndex = cpu_to_le16(index);</div><div class='add'>+	usb_context-&gt;req.wLength = cpu_to_le16(size);</div><div class='add'>+	init_completion(&amp;usb_context-&gt;notify);</div><div class='add'>+</div><div class='add'>+	usb_fill_control_urb(urb, dev-&gt;udev, usb_sndctrlpipe(dev-&gt;udev, 0),</div><div class='add'>+		(void *)&amp;usb_context-&gt;req, data, size,</div><div class='add'>+		(usb_complete_t)smsc95xx_async_cmd_callback,</div><div class='add'>+		(void *)usb_context);</div><div class='add'>+</div><div class='add'>+	status = usb_submit_urb(urb, GFP_ATOMIC);</div><div class='add'>+	if (status &lt; 0) {</div><div class='add'>+		devwarn(dev, "Error submitting control msg, sts=%d", status);</div><div class='add'>+		kfree(usb_context);</div><div class='add'>+		usb_free_urb(urb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* returns hash bit number for given MAC address</div><div class='add'>+ * example:</div><div class='add'>+ * 01 00 5E 00 00 01 -&gt; returns bit number 31 */</div><div class='add'>+static unsigned int smsc95xx_hash(char addr[ETH_ALEN])</div><div class='add'>+{</div><div class='add'>+	return (ether_crc(ETH_ALEN, addr) &gt;&gt; 26) &amp; 0x3f;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void smsc95xx_set_multicast(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct usbnet *dev = netdev_priv(netdev);</div><div class='add'>+	struct smsc95xx_priv *pdata = (struct smsc95xx_priv *)(dev-&gt;data[0]);</div><div class='add'>+	u32 hash_hi = 0;</div><div class='add'>+	u32 hash_lo = 0;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;pdata-&gt;mac_cr_lock, flags);</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;net-&gt;flags &amp; IFF_PROMISC) {</div><div class='add'>+		if (netif_msg_drv(dev))</div><div class='add'>+			devdbg(dev, "promiscuous mode enabled");</div><div class='add'>+		pdata-&gt;mac_cr |= MAC_CR_PRMS_;</div><div class='add'>+		pdata-&gt;mac_cr &amp;= ~(MAC_CR_MCPAS_ | MAC_CR_HPFILT_);</div><div class='add'>+	} else if (dev-&gt;net-&gt;flags &amp; IFF_ALLMULTI) {</div><div class='add'>+		if (netif_msg_drv(dev))</div><div class='add'>+			devdbg(dev, "receive all multicast enabled");</div><div class='add'>+		pdata-&gt;mac_cr |= MAC_CR_MCPAS_;</div><div class='add'>+		pdata-&gt;mac_cr &amp;= ~(MAC_CR_PRMS_ | MAC_CR_HPFILT_);</div><div class='add'>+	} else if (dev-&gt;net-&gt;mc_count &gt; 0) {</div><div class='add'>+		struct dev_mc_list *mc_list = dev-&gt;net-&gt;mc_list;</div><div class='add'>+		int count = 0;</div><div class='add'>+</div><div class='add'>+		pdata-&gt;mac_cr |= MAC_CR_HPFILT_;</div><div class='add'>+		pdata-&gt;mac_cr &amp;= ~(MAC_CR_PRMS_ | MAC_CR_MCPAS_);</div><div class='add'>+</div><div class='add'>+		while (mc_list) {</div><div class='add'>+			count++;</div><div class='add'>+			if (mc_list-&gt;dmi_addrlen == ETH_ALEN) {</div><div class='add'>+				u32 bitnum = smsc95xx_hash(mc_list-&gt;dmi_addr);</div><div class='add'>+				u32 mask = 0x01 &lt;&lt; (bitnum &amp; 0x1F);</div><div class='add'>+				if (bitnum &amp; 0x20)</div><div class='add'>+					hash_hi |= mask;</div><div class='add'>+				else</div><div class='add'>+					hash_lo |= mask;</div><div class='add'>+			} else {</div><div class='add'>+				devwarn(dev, "dmi_addrlen != 6");</div><div class='add'>+			}</div><div class='add'>+			mc_list = mc_list-&gt;next;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (count != ((u32)dev-&gt;net-&gt;mc_count))</div><div class='add'>+			devwarn(dev, "mc_count != dev-&gt;mc_count");</div><div class='add'>+</div><div class='add'>+		if (netif_msg_drv(dev))</div><div class='add'>+			devdbg(dev, "HASHH=0x%08X, HASHL=0x%08X", hash_hi,</div><div class='add'>+				hash_lo);</div><div class='add'>+	} else {</div><div class='add'>+		if (netif_msg_drv(dev))</div><div class='add'>+			devdbg(dev, "receive own packets only");</div><div class='add'>+		pdata-&gt;mac_cr &amp;=</div><div class='add'>+			~(MAC_CR_PRMS_ | MAC_CR_MCPAS_ | MAC_CR_HPFILT_);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;pdata-&gt;mac_cr_lock, flags);</div><div class='add'>+</div><div class='add'>+	/* Initiate async writes, as we can't wait for completion here */</div><div class='add'>+	smsc95xx_write_reg_async(dev, HASHH, &amp;hash_hi);</div><div class='add'>+	smsc95xx_write_reg_async(dev, HASHL, &amp;hash_lo);</div><div class='add'>+	smsc95xx_write_reg_async(dev, MAC_CR, &amp;pdata-&gt;mac_cr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 smsc95xx_resolve_flowctrl_fulldplx(u16 lcladv, u16 rmtadv)</div><div class='add'>+{</div><div class='add'>+	u8 cap = 0;</div><div class='add'>+</div><div class='add'>+	if (lcladv &amp; ADVERTISE_PAUSE_CAP) {</div><div class='add'>+		if (lcladv &amp; ADVERTISE_PAUSE_ASYM) {</div><div class='add'>+			if (rmtadv &amp; LPA_PAUSE_CAP)</div><div class='add'>+				cap = FLOW_CTRL_TX | FLOW_CTRL_RX;</div><div class='add'>+			else if (rmtadv &amp; LPA_PAUSE_ASYM)</div><div class='add'>+				cap = FLOW_CTRL_RX;</div><div class='add'>+		} else {</div><div class='add'>+			if (rmtadv &amp; LPA_PAUSE_CAP)</div><div class='add'>+				cap = FLOW_CTRL_TX | FLOW_CTRL_RX;</div><div class='add'>+		}</div><div class='add'>+	} else if (lcladv &amp; ADVERTISE_PAUSE_ASYM) {</div><div class='add'>+		if ((rmtadv &amp; LPA_PAUSE_CAP) &amp;&amp; (rmtadv &amp; LPA_PAUSE_ASYM))</div><div class='add'>+			cap = FLOW_CTRL_TX;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return cap;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void smsc95xx_phy_update_flowcontrol(struct usbnet *dev, u8 duplex,</div><div class='add'>+					    u16 lcladv, u16 rmtadv)</div><div class='add'>+{</div><div class='add'>+	u32 flow, afc_cfg = 0;</div><div class='add'>+</div><div class='add'>+	int ret = smsc95xx_read_reg(dev, AFC_CFG, &amp;afc_cfg);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		devwarn(dev, "error reading AFC_CFG");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (duplex == DUPLEX_FULL) {</div><div class='add'>+		u8 cap = smsc95xx_resolve_flowctrl_fulldplx(lcladv, rmtadv);</div><div class='add'>+</div><div class='add'>+		if (cap &amp; FLOW_CTRL_RX)</div><div class='add'>+			flow = 0xFFFF0002;</div><div class='add'>+		else</div><div class='add'>+			flow = 0;</div><div class='add'>+</div><div class='add'>+		if (cap &amp; FLOW_CTRL_TX)</div><div class='add'>+			afc_cfg |= 0xF;</div><div class='add'>+		else</div><div class='add'>+			afc_cfg &amp;= ~0xF;</div><div class='add'>+</div><div class='add'>+		if (netif_msg_link(dev))</div><div class='add'>+			devdbg(dev, "rx pause %s, tx pause %s",</div><div class='add'>+				(cap &amp; FLOW_CTRL_RX ? "enabled" : "disabled"),</div><div class='add'>+				(cap &amp; FLOW_CTRL_TX ? "enabled" : "disabled"));</div><div class='add'>+	} else {</div><div class='add'>+		if (netif_msg_link(dev))</div><div class='add'>+			devdbg(dev, "half duplex");</div><div class='add'>+		flow = 0;</div><div class='add'>+		afc_cfg |= 0xF;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	smsc95xx_write_reg(dev, FLOW, flow);</div><div class='add'>+	smsc95xx_write_reg(dev,	AFC_CFG, afc_cfg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int smsc95xx_link_reset(struct usbnet *dev)</div><div class='add'>+{</div><div class='add'>+	struct smsc95xx_priv *pdata = (struct smsc95xx_priv *)(dev-&gt;data[0]);</div><div class='add'>+	struct mii_if_info *mii = &amp;dev-&gt;mii;</div><div class='add'>+	struct ethtool_cmd ecmd;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u16 lcladv, rmtadv;</div><div class='add'>+	u32 intdata;</div><div class='add'>+</div><div class='add'>+	/* clear interrupt status */</div><div class='add'>+	smsc95xx_mdio_read(dev-&gt;net, mii-&gt;phy_id, PHY_INT_SRC);</div><div class='add'>+	intdata = 0xFFFFFFFF;</div><div class='add'>+	smsc95xx_write_reg(dev, INT_STS, intdata);</div><div class='add'>+</div><div class='add'>+	mii_check_media(mii, 1, 1);</div><div class='add'>+	mii_ethtool_gset(&amp;dev-&gt;mii, &amp;ecmd);</div><div class='add'>+	lcladv = smsc95xx_mdio_read(dev-&gt;net, mii-&gt;phy_id, MII_ADVERTISE);</div><div class='add'>+	rmtadv = smsc95xx_mdio_read(dev-&gt;net, mii-&gt;phy_id, MII_LPA);</div><div class='add'>+</div><div class='add'>+	if (netif_msg_link(dev))</div><div class='add'>+		devdbg(dev, "speed: %d duplex: %d lcladv: %04x rmtadv: %04x",</div><div class='add'>+			ecmd.speed, ecmd.duplex, lcladv, rmtadv);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;pdata-&gt;mac_cr_lock, flags);</div><div class='add'>+	if (ecmd.duplex != DUPLEX_FULL) {</div><div class='add'>+		pdata-&gt;mac_cr &amp;= ~MAC_CR_FDPX_;</div><div class='add'>+		pdata-&gt;mac_cr |= MAC_CR_RCVOWN_;</div><div class='add'>+	} else {</div><div class='add'>+		pdata-&gt;mac_cr &amp;= ~MAC_CR_RCVOWN_;</div><div class='add'>+		pdata-&gt;mac_cr |= MAC_CR_FDPX_;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;pdata-&gt;mac_cr_lock, flags);</div><div class='add'>+</div><div class='add'>+	smsc95xx_write_reg(dev, MAC_CR, pdata-&gt;mac_cr);</div><div class='add'>+</div><div class='add'>+	smsc95xx_phy_update_flowcontrol(dev, ecmd.duplex, lcladv, rmtadv);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void smsc95xx_status(struct usbnet *dev, struct urb *urb)</div><div class='add'>+{</div><div class='add'>+	u32 intdata;</div><div class='add'>+</div><div class='add'>+	if (urb-&gt;actual_length != 4) {</div><div class='add'>+		devwarn(dev, "unexpected urb length %d", urb-&gt;actual_length);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;intdata, urb-&gt;transfer_buffer, 4);</div><div class='add'>+	le32_to_cpus(&amp;intdata);</div><div class='add'>+</div><div class='add'>+	if (netif_msg_link(dev))</div><div class='add'>+		devdbg(dev, "intdata: 0x%08X", intdata);</div><div class='add'>+</div><div class='add'>+	if (intdata &amp; INT_ENP_PHY_INT_)</div><div class='add'>+		usbnet_defer_kevent(dev, EVENT_LINK_RESET);</div><div class='add'>+	else</div><div class='add'>+		devwarn(dev, "unexpected interrupt, intdata=0x%08X", intdata);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Enable or disable Rx checksum offload engine */</div><div class='add'>+static int smsc95xx_set_rx_csum(struct usbnet *dev, bool enable)</div><div class='add'>+{</div><div class='add'>+	u32 read_buf;</div><div class='add'>+	int ret = smsc95xx_read_reg(dev, COE_CR, &amp;read_buf);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		devwarn(dev, "Failed to read COE_CR: %d", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (enable)</div><div class='add'>+		read_buf |= Rx_COE_EN_;</div><div class='add'>+	else</div><div class='add'>+		read_buf &amp;= ~Rx_COE_EN_;</div><div class='add'>+</div><div class='add'>+	ret = smsc95xx_write_reg(dev, COE_CR, read_buf);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		devwarn(dev, "Failed to write COE_CR: %d", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (netif_msg_hw(dev))</div><div class='add'>+		devdbg(dev, "COE_CR = 0x%08x", read_buf);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int smsc95xx_ethtool_get_eeprom_len(struct net_device *net)</div><div class='add'>+{</div><div class='add'>+	return MAX_EEPROM_SIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int smsc95xx_ethtool_get_eeprom(struct net_device *netdev,</div><div class='add'>+				       struct ethtool_eeprom *ee, u8 *data)</div><div class='add'>+{</div><div class='add'>+	struct usbnet *dev = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	ee-&gt;magic = LAN95XX_EEPROM_MAGIC;</div><div class='add'>+</div><div class='add'>+	return smsc95xx_read_eeprom(dev, ee-&gt;offset, ee-&gt;len, data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int smsc95xx_ethtool_set_eeprom(struct net_device *netdev,</div><div class='add'>+				       struct ethtool_eeprom *ee, u8 *data)</div><div class='add'>+{</div><div class='add'>+	struct usbnet *dev = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	if (ee-&gt;magic != LAN95XX_EEPROM_MAGIC) {</div><div class='add'>+		devwarn(dev, "EEPROM: magic value mismatch, magic = 0x%x",</div><div class='add'>+			ee-&gt;magic);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return smsc95xx_write_eeprom(dev, ee-&gt;offset, ee-&gt;len, data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 smsc95xx_ethtool_get_rx_csum(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct usbnet *dev = netdev_priv(netdev);</div><div class='add'>+	struct smsc95xx_priv *pdata = (struct smsc95xx_priv *)(dev-&gt;data[0]);</div><div class='add'>+</div><div class='add'>+	return pdata-&gt;use_rx_csum;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int smsc95xx_ethtool_set_rx_csum(struct net_device *netdev, u32 val)</div><div class='add'>+{</div><div class='add'>+	struct usbnet *dev = netdev_priv(netdev);</div><div class='add'>+	struct smsc95xx_priv *pdata = (struct smsc95xx_priv *)(dev-&gt;data[0]);</div><div class='add'>+</div><div class='add'>+	pdata-&gt;use_rx_csum = !!val;</div><div class='add'>+</div><div class='add'>+	return smsc95xx_set_rx_csum(dev, pdata-&gt;use_rx_csum);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct ethtool_ops smsc95xx_ethtool_ops = {</div><div class='add'>+	.get_link	= usbnet_get_link,</div><div class='add'>+	.nway_reset	= usbnet_nway_reset,</div><div class='add'>+	.get_drvinfo	= usbnet_get_drvinfo,</div><div class='add'>+	.get_msglevel	= usbnet_get_msglevel,</div><div class='add'>+	.set_msglevel	= usbnet_set_msglevel,</div><div class='add'>+	.get_settings	= usbnet_get_settings,</div><div class='add'>+	.set_settings	= usbnet_set_settings,</div><div class='add'>+	.get_eeprom_len	= smsc95xx_ethtool_get_eeprom_len,</div><div class='add'>+	.get_eeprom	= smsc95xx_ethtool_get_eeprom,</div><div class='add'>+	.set_eeprom	= smsc95xx_ethtool_set_eeprom,</div><div class='add'>+	.get_rx_csum	= smsc95xx_ethtool_get_rx_csum,</div><div class='add'>+	.set_rx_csum	= smsc95xx_ethtool_set_rx_csum,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int smsc95xx_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd)</div><div class='add'>+{</div><div class='add'>+	struct usbnet *dev = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	if (!netif_running(netdev))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return generic_mii_ioctl(&amp;dev-&gt;mii, if_mii(rq), cmd, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void smsc95xx_init_mac_address(struct usbnet *dev)</div><div class='add'>+{</div><div class='add'>+	/* try reading mac address from EEPROM */</div><div class='add'>+	if (smsc95xx_read_eeprom(dev, EEPROM_MAC_OFFSET, ETH_ALEN,</div><div class='add'>+			dev-&gt;net-&gt;dev_addr) == 0) {</div><div class='add'>+		if (is_valid_ether_addr(dev-&gt;net-&gt;dev_addr)) {</div><div class='add'>+			/* eeprom values are valid so use them */</div><div class='add'>+			if (netif_msg_ifup(dev))</div><div class='add'>+				devdbg(dev, "MAC address read from EEPROM");</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* no eeprom, or eeprom values are invalid. generate random MAC */</div><div class='add'>+	random_ether_addr(dev-&gt;net-&gt;dev_addr);</div><div class='add'>+	if (netif_msg_ifup(dev))</div><div class='add'>+		devdbg(dev, "MAC address set to random_ether_addr");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int smsc95xx_set_mac_address(struct usbnet *dev)</div><div class='add'>+{</div><div class='add'>+	u32 addr_lo = dev-&gt;net-&gt;dev_addr[0] | dev-&gt;net-&gt;dev_addr[1] &lt;&lt; 8 |</div><div class='add'>+		dev-&gt;net-&gt;dev_addr[2] &lt;&lt; 16 | dev-&gt;net-&gt;dev_addr[3] &lt;&lt; 24;</div><div class='add'>+	u32 addr_hi = dev-&gt;net-&gt;dev_addr[4] | dev-&gt;net-&gt;dev_addr[5] &lt;&lt; 8;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = smsc95xx_write_reg(dev, ADDRL, addr_lo);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		devwarn(dev, "Failed to write ADDRL: %d", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = smsc95xx_write_reg(dev, ADDRH, addr_hi);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		devwarn(dev, "Failed to write ADDRH: %d", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* starts the TX path */</div><div class='add'>+static void smsc95xx_start_tx_path(struct usbnet *dev)</div><div class='add'>+{</div><div class='add'>+	struct smsc95xx_priv *pdata = (struct smsc95xx_priv *)(dev-&gt;data[0]);</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u32 reg_val;</div><div class='add'>+</div><div class='add'>+	/* Enable Tx at MAC */</div><div class='add'>+	spin_lock_irqsave(&amp;pdata-&gt;mac_cr_lock, flags);</div><div class='add'>+	pdata-&gt;mac_cr |= MAC_CR_TXEN_;</div><div class='add'>+	spin_unlock_irqrestore(&amp;pdata-&gt;mac_cr_lock, flags);</div><div class='add'>+</div><div class='add'>+	smsc95xx_write_reg(dev, MAC_CR, pdata-&gt;mac_cr);</div><div class='add'>+</div><div class='add'>+	/* Enable Tx at SCSRs */</div><div class='add'>+	reg_val = TX_CFG_ON_;</div><div class='add'>+	smsc95xx_write_reg(dev, TX_CFG, reg_val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Starts the Receive path */</div><div class='add'>+static void smsc95xx_start_rx_path(struct usbnet *dev)</div><div class='add'>+{</div><div class='add'>+	struct smsc95xx_priv *pdata = (struct smsc95xx_priv *)(dev-&gt;data[0]);</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;pdata-&gt;mac_cr_lock, flags);</div><div class='add'>+	pdata-&gt;mac_cr |= MAC_CR_RXEN_;</div><div class='add'>+	spin_unlock_irqrestore(&amp;pdata-&gt;mac_cr_lock, flags);</div><div class='add'>+</div><div class='add'>+	smsc95xx_write_reg(dev, MAC_CR, pdata-&gt;mac_cr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int smsc95xx_phy_initialize(struct usbnet *dev)</div><div class='add'>+{</div><div class='add'>+	/* Initialize MII structure */</div><div class='add'>+	dev-&gt;mii.dev = dev-&gt;net;</div><div class='add'>+	dev-&gt;mii.mdio_read = smsc95xx_mdio_read;</div><div class='add'>+	dev-&gt;mii.mdio_write = smsc95xx_mdio_write;</div><div class='add'>+	dev-&gt;mii.phy_id_mask = 0x1f;</div><div class='add'>+	dev-&gt;mii.reg_num_mask = 0x1f;</div><div class='add'>+	dev-&gt;mii.phy_id = SMSC95XX_INTERNAL_PHY_ID;</div><div class='add'>+</div><div class='add'>+	smsc95xx_mdio_write(dev-&gt;net, dev-&gt;mii.phy_id, MII_BMCR, BMCR_RESET);</div><div class='add'>+	smsc95xx_mdio_write(dev-&gt;net, dev-&gt;mii.phy_id, MII_ADVERTISE,</div><div class='add'>+		ADVERTISE_ALL | ADVERTISE_CSMA | ADVERTISE_PAUSE_CAP |</div><div class='add'>+		ADVERTISE_PAUSE_ASYM);</div><div class='add'>+</div><div class='add'>+	/* read to clear */</div><div class='add'>+	smsc95xx_mdio_read(dev-&gt;net, dev-&gt;mii.phy_id, PHY_INT_SRC);</div><div class='add'>+</div><div class='add'>+	smsc95xx_mdio_write(dev-&gt;net, dev-&gt;mii.phy_id, PHY_INT_MASK,</div><div class='add'>+		PHY_INT_MASK_DEFAULT_);</div><div class='add'>+	mii_nway_restart(&amp;dev-&gt;mii);</div><div class='add'>+</div><div class='add'>+	if (netif_msg_ifup(dev))</div><div class='add'>+		devdbg(dev, "phy initialised succesfully");</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int smsc95xx_reset(struct usbnet *dev)</div><div class='add'>+{</div><div class='add'>+	struct smsc95xx_priv *pdata = (struct smsc95xx_priv *)(dev-&gt;data[0]);</div><div class='add'>+	u32 read_buf, write_buf, burst_cap;</div><div class='add'>+	int ret = 0, timeout;</div><div class='add'>+	DECLARE_MAC_BUF(mac);</div><div class='add'>+</div><div class='add'>+	if (netif_msg_ifup(dev))</div><div class='add'>+		devdbg(dev, "entering smsc95xx_reset");</div><div class='add'>+</div><div class='add'>+	write_buf = HW_CFG_LRST_;</div><div class='add'>+	ret = smsc95xx_write_reg(dev, HW_CFG, write_buf);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		devwarn(dev, "Failed to write HW_CFG_LRST_ bit in HW_CFG "</div><div class='add'>+			"register, ret = %d", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	timeout = 0;</div><div class='add'>+	do {</div><div class='add'>+		ret = smsc95xx_read_reg(dev, HW_CFG, &amp;read_buf);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			devwarn(dev, "Failed to read HW_CFG: %d", ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+		msleep(10);</div><div class='add'>+		timeout++;</div><div class='add'>+	} while ((read_buf &amp; HW_CFG_LRST_) &amp;&amp; (timeout &lt; 100));</div><div class='add'>+</div><div class='add'>+	if (timeout &gt;= 100) {</div><div class='add'>+		devwarn(dev, "timeout waiting for completion of Lite Reset");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	write_buf = PM_CTL_PHY_RST_;</div><div class='add'>+	ret = smsc95xx_write_reg(dev, PM_CTRL, write_buf);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		devwarn(dev, "Failed to write PM_CTRL: %d", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	timeout = 0;</div><div class='add'>+	do {</div><div class='add'>+		ret = smsc95xx_read_reg(dev, PM_CTRL, &amp;read_buf);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			devwarn(dev, "Failed to read PM_CTRL: %d", ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+		msleep(10);</div><div class='add'>+		timeout++;</div><div class='add'>+	} while ((read_buf &amp; PM_CTL_PHY_RST_) &amp;&amp; (timeout &lt; 100));</div><div class='add'>+</div><div class='add'>+	if (timeout &gt;= 100) {</div><div class='add'>+		devwarn(dev, "timeout waiting for PHY Reset");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	smsc95xx_init_mac_address(dev);</div><div class='add'>+</div><div class='add'>+	ret = smsc95xx_set_mac_address(dev);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (netif_msg_ifup(dev))</div><div class='add'>+		devdbg(dev, "MAC Address: %s",</div><div class='add'>+			print_mac(mac, dev-&gt;net-&gt;dev_addr));</div><div class='add'>+</div><div class='add'>+	ret = smsc95xx_read_reg(dev, HW_CFG, &amp;read_buf);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		devwarn(dev, "Failed to read HW_CFG: %d", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (netif_msg_ifup(dev))</div><div class='add'>+		devdbg(dev, "Read Value from HW_CFG : 0x%08x", read_buf);</div><div class='add'>+</div><div class='add'>+	read_buf |= HW_CFG_BIR_;</div><div class='add'>+</div><div class='add'>+	ret = smsc95xx_write_reg(dev, HW_CFG, read_buf);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		devwarn(dev, "Failed to write HW_CFG_BIR_ bit in HW_CFG "</div><div class='add'>+			"register, ret = %d", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = smsc95xx_read_reg(dev, HW_CFG, &amp;read_buf);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		devwarn(dev, "Failed to read HW_CFG: %d", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+	if (netif_msg_ifup(dev))</div><div class='add'>+		devdbg(dev, "Read Value from HW_CFG after writing "</div><div class='add'>+			"HW_CFG_BIR_: 0x%08x", read_buf);</div><div class='add'>+</div><div class='add'>+	if (!turbo_mode) {</div><div class='add'>+		burst_cap = 0;</div><div class='add'>+		dev-&gt;rx_urb_size = MAX_SINGLE_PACKET_SIZE;</div><div class='add'>+	} else if (dev-&gt;udev-&gt;speed == USB_SPEED_HIGH) {</div><div class='add'>+		burst_cap = DEFAULT_HS_BURST_CAP_SIZE / HS_USB_PKT_SIZE;</div><div class='add'>+		dev-&gt;rx_urb_size = DEFAULT_HS_BURST_CAP_SIZE;</div><div class='add'>+	} else {</div><div class='add'>+		burst_cap = DEFAULT_FS_BURST_CAP_SIZE / FS_USB_PKT_SIZE;</div><div class='add'>+		dev-&gt;rx_urb_size = DEFAULT_FS_BURST_CAP_SIZE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (netif_msg_ifup(dev))</div><div class='add'>+		devdbg(dev, "rx_urb_size=%ld", (ulong)dev-&gt;rx_urb_size);</div><div class='add'>+</div><div class='add'>+	ret = smsc95xx_write_reg(dev, BURST_CAP, burst_cap);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		devwarn(dev, "Failed to write BURST_CAP: %d", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = smsc95xx_read_reg(dev, BURST_CAP, &amp;read_buf);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		devwarn(dev, "Failed to read BURST_CAP: %d", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+	if (netif_msg_ifup(dev))</div><div class='add'>+		devdbg(dev, "Read Value from BURST_CAP after writing: 0x%08x",</div><div class='add'>+			read_buf);</div><div class='add'>+</div><div class='add'>+	read_buf = DEFAULT_BULK_IN_DELAY;</div><div class='add'>+	ret = smsc95xx_write_reg(dev, BULK_IN_DLY, read_buf);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		devwarn(dev, "ret = %d", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = smsc95xx_read_reg(dev, BULK_IN_DLY, &amp;read_buf);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		devwarn(dev, "Failed to read BULK_IN_DLY: %d", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+	if (netif_msg_ifup(dev))</div><div class='add'>+		devdbg(dev, "Read Value from BULK_IN_DLY after writing: "</div><div class='add'>+			"0x%08x", read_buf);</div><div class='add'>+</div><div class='add'>+	ret = smsc95xx_read_reg(dev, HW_CFG, &amp;read_buf);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		devwarn(dev, "Failed to read HW_CFG: %d", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+	if (netif_msg_ifup(dev))</div><div class='add'>+		devdbg(dev, "Read Value from HW_CFG: 0x%08x", read_buf);</div><div class='add'>+</div><div class='add'>+	if (turbo_mode)</div><div class='add'>+		read_buf |= (HW_CFG_MEF_ | HW_CFG_BCE_);</div><div class='add'>+</div><div class='add'>+	read_buf &amp;= ~HW_CFG_RXDOFF_;</div><div class='add'>+</div><div class='add'>+	/* set Rx data offset=2, Make IP header aligns on word boundary. */</div><div class='add'>+	read_buf |= NET_IP_ALIGN &lt;&lt; 9;</div><div class='add'>+</div><div class='add'>+	ret = smsc95xx_write_reg(dev, HW_CFG, read_buf);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		devwarn(dev, "Failed to write HW_CFG register, ret=%d", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = smsc95xx_read_reg(dev, HW_CFG, &amp;read_buf);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		devwarn(dev, "Failed to read HW_CFG: %d", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+	if (netif_msg_ifup(dev))</div><div class='add'>+		devdbg(dev, "Read Value from HW_CFG after writing: 0x%08x",</div><div class='add'>+			read_buf);</div><div class='add'>+</div><div class='add'>+	write_buf = 0xFFFFFFFF;</div><div class='add'>+	ret = smsc95xx_write_reg(dev, INT_STS, write_buf);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		devwarn(dev, "Failed to write INT_STS register, ret=%d", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = smsc95xx_read_reg(dev, ID_REV, &amp;read_buf);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		devwarn(dev, "Failed to read ID_REV: %d", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+	if (netif_msg_ifup(dev))</div><div class='add'>+		devdbg(dev, "ID_REV = 0x%08x", read_buf);</div><div class='add'>+</div><div class='add'>+	/* Init Tx */</div><div class='add'>+	write_buf = 0;</div><div class='add'>+	ret = smsc95xx_write_reg(dev, FLOW, write_buf);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		devwarn(dev, "Failed to write FLOW: %d", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	read_buf = AFC_CFG_DEFAULT;</div><div class='add'>+	ret = smsc95xx_write_reg(dev, AFC_CFG, read_buf);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		devwarn(dev, "Failed to write AFC_CFG: %d", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Don't need mac_cr_lock during initialisation */</div><div class='add'>+	ret = smsc95xx_read_reg(dev, MAC_CR, &amp;pdata-&gt;mac_cr);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		devwarn(dev, "Failed to read MAC_CR: %d", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Init Rx */</div><div class='add'>+	/* Set Vlan */</div><div class='add'>+	write_buf = (u32)ETH_P_8021Q;</div><div class='add'>+	ret = smsc95xx_write_reg(dev, VLAN1, write_buf);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		devwarn(dev, "Failed to write VAN1: %d", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Enable or disable Rx checksum offload engine */</div><div class='add'>+	ret = smsc95xx_set_rx_csum(dev, pdata-&gt;use_rx_csum);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		devwarn(dev, "Failed to set Rx csum offload: %d", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	smsc95xx_set_multicast(dev-&gt;net);</div><div class='add'>+</div><div class='add'>+	if (smsc95xx_phy_initialize(dev) &lt; 0)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	ret = smsc95xx_read_reg(dev, INT_EP_CTL, &amp;read_buf);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		devwarn(dev, "Failed to read INT_EP_CTL: %d", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* enable PHY interrupts */</div><div class='add'>+	read_buf |= INT_EP_CTL_PHY_INT_;</div><div class='add'>+</div><div class='add'>+	ret = smsc95xx_write_reg(dev, INT_EP_CTL, read_buf);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		devwarn(dev, "Failed to write INT_EP_CTL: %d", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	smsc95xx_start_tx_path(dev);</div><div class='add'>+	smsc95xx_start_rx_path(dev);</div><div class='add'>+</div><div class='add'>+	if (netif_msg_ifup(dev))</div><div class='add'>+		devdbg(dev, "smsc95xx_reset, return 0");</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int smsc95xx_bind(struct usbnet *dev, struct usb_interface *intf)</div><div class='add'>+{</div><div class='add'>+	struct smsc95xx_priv *pdata = NULL;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO SMSC_CHIPNAME " v" SMSC_DRIVER_VERSION "\n");</div><div class='add'>+</div><div class='add'>+	ret = usbnet_get_endpoints(dev, intf);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		devwarn(dev, "usbnet_get_endpoints failed: %d", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev-&gt;data[0] = (unsigned long)kzalloc(sizeof(struct smsc95xx_priv),</div><div class='add'>+		GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	pdata = (struct smsc95xx_priv *)(dev-&gt;data[0]);</div><div class='add'>+	if (!pdata) {</div><div class='add'>+		devwarn(dev, "Unable to allocate struct smsc95xx_priv");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;pdata-&gt;mac_cr_lock);</div><div class='add'>+</div><div class='add'>+	pdata-&gt;use_rx_csum = DEFAULT_RX_CSUM_ENABLE;</div><div class='add'>+</div><div class='add'>+	/* Init all registers */</div><div class='add'>+	ret = smsc95xx_reset(dev);</div><div class='add'>+</div><div class='add'>+	dev-&gt;net-&gt;do_ioctl = smsc95xx_ioctl;</div><div class='add'>+	dev-&gt;net-&gt;ethtool_ops = &amp;smsc95xx_ethtool_ops;</div><div class='add'>+	dev-&gt;net-&gt;set_multicast_list = smsc95xx_set_multicast;</div><div class='add'>+	dev-&gt;net-&gt;flags |= IFF_MULTICAST;</div><div class='add'>+	dev-&gt;net-&gt;hard_header_len += SMSC95XX_TX_OVERHEAD;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void smsc95xx_unbind(struct usbnet *dev, struct usb_interface *intf)</div><div class='add'>+{</div><div class='add'>+	struct smsc95xx_priv *pdata = (struct smsc95xx_priv *)(dev-&gt;data[0]);</div><div class='add'>+	if (pdata) {</div><div class='add'>+		if (netif_msg_ifdown(dev))</div><div class='add'>+			devdbg(dev, "free pdata");</div><div class='add'>+		kfree(pdata);</div><div class='add'>+		pdata = NULL;</div><div class='add'>+		dev-&gt;data[0] = 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void smsc95xx_rx_csum_offload(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	skb-&gt;csum = *(u16 *)(skb_tail_pointer(skb) - 2);</div><div class='add'>+	skb-&gt;ip_summed = CHECKSUM_COMPLETE;</div><div class='add'>+	skb_trim(skb, skb-&gt;len - 2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int smsc95xx_rx_fixup(struct usbnet *dev, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct smsc95xx_priv *pdata = (struct smsc95xx_priv *)(dev-&gt;data[0]);</div><div class='add'>+</div><div class='add'>+	while (skb-&gt;len &gt; 0) {</div><div class='add'>+		u32 header, align_count;</div><div class='add'>+		struct sk_buff *ax_skb;</div><div class='add'>+		unsigned char *packet;</div><div class='add'>+		u16 size;</div><div class='add'>+</div><div class='add'>+		memcpy(&amp;header, skb-&gt;data, sizeof(header));</div><div class='add'>+		le32_to_cpus(&amp;header);</div><div class='add'>+		skb_pull(skb, 4 + NET_IP_ALIGN);</div><div class='add'>+		packet = skb-&gt;data;</div><div class='add'>+</div><div class='add'>+		/* get the packet length */</div><div class='add'>+		size = (u16)((header &amp; RX_STS_FL_) &gt;&gt; 16);</div><div class='add'>+		align_count = (4 - ((size + NET_IP_ALIGN) % 4)) % 4;</div><div class='add'>+</div><div class='add'>+		if (unlikely(header &amp; RX_STS_ES_)) {</div><div class='add'>+			if (netif_msg_rx_err(dev))</div><div class='add'>+				devdbg(dev, "Error header=0x%08x", header);</div><div class='add'>+			dev-&gt;stats.rx_errors++;</div><div class='add'>+			dev-&gt;stats.rx_dropped++;</div><div class='add'>+</div><div class='add'>+			if (header &amp; RX_STS_CRC_) {</div><div class='add'>+				dev-&gt;stats.rx_crc_errors++;</div><div class='add'>+			} else {</div><div class='add'>+				if (header &amp; (RX_STS_TL_ | RX_STS_RF_))</div><div class='add'>+					dev-&gt;stats.rx_frame_errors++;</div><div class='add'>+</div><div class='add'>+				if ((header &amp; RX_STS_LE_) &amp;&amp;</div><div class='add'>+					(!(header &amp; RX_STS_FT_)))</div><div class='add'>+					dev-&gt;stats.rx_length_errors++;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			/* ETH_FRAME_LEN + 4(CRC) + 2(COE) + 4(Vlan) */</div><div class='add'>+			if (unlikely(size &gt; (ETH_FRAME_LEN + 12))) {</div><div class='add'>+				if (netif_msg_rx_err(dev))</div><div class='add'>+					devdbg(dev, "size err header=0x%08x",</div><div class='add'>+						header);</div><div class='add'>+				return 0;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* last frame in this batch */</div><div class='add'>+			if (skb-&gt;len == size) {</div><div class='add'>+				if (pdata-&gt;use_rx_csum)</div><div class='add'>+					smsc95xx_rx_csum_offload(skb);</div><div class='add'>+</div><div class='add'>+				skb-&gt;truesize = size + sizeof(struct sk_buff);</div><div class='add'>+</div><div class='add'>+				return 1;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			ax_skb = skb_clone(skb, GFP_ATOMIC);</div><div class='add'>+			if (unlikely(!ax_skb)) {</div><div class='add'>+				devwarn(dev, "Error allocating skb");</div><div class='add'>+				return 0;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			ax_skb-&gt;len = size;</div><div class='add'>+			ax_skb-&gt;data = packet;</div><div class='add'>+			skb_set_tail_pointer(ax_skb, size);</div><div class='add'>+</div><div class='add'>+			if (pdata-&gt;use_rx_csum)</div><div class='add'>+				smsc95xx_rx_csum_offload(ax_skb);</div><div class='add'>+</div><div class='add'>+			ax_skb-&gt;truesize = size + sizeof(struct sk_buff);</div><div class='add'>+</div><div class='add'>+			usbnet_skb_return(dev, ax_skb);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		skb_pull(skb, size);</div><div class='add'>+</div><div class='add'>+		/* padding bytes before the next frame starts */</div><div class='add'>+		if (skb-&gt;len)</div><div class='add'>+			skb_pull(skb, align_count);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (unlikely(skb-&gt;len &lt; 0)) {</div><div class='add'>+		devwarn(dev, "invalid rx length&lt;0 %d", skb-&gt;len);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *smsc95xx_tx_fixup(struct usbnet *dev,</div><div class='add'>+					 struct sk_buff *skb, gfp_t flags)</div><div class='add'>+{</div><div class='add'>+	u32 tx_cmd_a, tx_cmd_b;</div><div class='add'>+</div><div class='add'>+	if (skb_headroom(skb) &lt; SMSC95XX_TX_OVERHEAD) {</div><div class='add'>+		struct sk_buff *skb2 = skb_copy_expand(skb,</div><div class='add'>+			SMSC95XX_TX_OVERHEAD, 0, flags);</div><div class='add'>+		dev_kfree_skb_any(skb);</div><div class='add'>+		skb = skb2;</div><div class='add'>+		if (!skb)</div><div class='add'>+			return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb_push(skb, 4);</div><div class='add'>+	tx_cmd_b = (u32)(skb-&gt;len - 4);</div><div class='add'>+	cpu_to_le32s(&amp;tx_cmd_b);</div><div class='add'>+	memcpy(skb-&gt;data, &amp;tx_cmd_b, 4);</div><div class='add'>+</div><div class='add'>+	skb_push(skb, 4);</div><div class='add'>+	tx_cmd_a = (u32)(skb-&gt;len - 8) | TX_CMD_A_FIRST_SEG_ |</div><div class='add'>+		TX_CMD_A_LAST_SEG_;</div><div class='add'>+	cpu_to_le32s(&amp;tx_cmd_a);</div><div class='add'>+	memcpy(skb-&gt;data, &amp;tx_cmd_a, 4);</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct driver_info smsc95xx_info = {</div><div class='add'>+	.description	= "smsc95xx USB 2.0 Ethernet",</div><div class='add'>+	.bind		= smsc95xx_bind,</div><div class='add'>+	.unbind		= smsc95xx_unbind,</div><div class='add'>+	.link_reset	= smsc95xx_link_reset,</div><div class='add'>+	.reset		= smsc95xx_reset,</div><div class='add'>+	.rx_fixup	= smsc95xx_rx_fixup,</div><div class='add'>+	.tx_fixup	= smsc95xx_tx_fixup,</div><div class='add'>+	.status		= smsc95xx_status,</div><div class='add'>+	.flags		= FLAG_ETHER,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct usb_device_id products[] = {</div><div class='add'>+	{</div><div class='add'>+		/* SMSC9500 USB Ethernet Device */</div><div class='add'>+		USB_DEVICE(0x0424, 0x9500),</div><div class='add'>+		.driver_info = (unsigned long) &amp;smsc95xx_info,</div><div class='add'>+	},</div><div class='add'>+	{ },		/* END */</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(usb, products);</div><div class='add'>+</div><div class='add'>+static struct usb_driver smsc95xx_driver = {</div><div class='add'>+	.name		= "smsc95xx",</div><div class='add'>+	.id_table	= products,</div><div class='add'>+	.probe		= usbnet_probe,</div><div class='add'>+	.suspend	= usbnet_suspend,</div><div class='add'>+	.resume		= usbnet_resume,</div><div class='add'>+	.disconnect	= usbnet_disconnect,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init smsc95xx_init(void)</div><div class='add'>+{</div><div class='add'>+	return usb_register(&amp;smsc95xx_driver);</div><div class='add'>+}</div><div class='add'>+module_init(smsc95xx_init);</div><div class='add'>+</div><div class='add'>+static void __exit smsc95xx_exit(void)</div><div class='add'>+{</div><div class='add'>+	usb_deregister(&amp;smsc95xx_driver);</div><div class='add'>+}</div><div class='add'>+module_exit(smsc95xx_exit);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Nancy Lin");</div><div class='add'>+MODULE_AUTHOR("Steve Glendinning &lt;steve.glendinning@smsc.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("SMSC95XX USB 2.0 Ethernet Devices");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/net/usb/smsc95xx.h b/drivers/net/usb/smsc95xx.h<br/>new file mode 100644<br/>index 000000000000..66b5c84f302e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/usb/smsc95xx.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/usb/smsc95xx.h</a></div><div class='hunk'>@@ -0,0 +1,253 @@</div><div class='add'>+ /***************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2007-2008 SMSC</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public License</div><div class='add'>+ * as published by the Free Software Foundation; either version 2</div><div class='add'>+ * of the License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.</div><div class='add'>+ *</div><div class='add'>+ *****************************************************************************/</div><div class='add'>+</div><div class='add'>+#ifndef _SMSC95XX_H</div><div class='add'>+#define _SMSC95XX_H</div><div class='add'>+</div><div class='add'>+/* Tx command words */</div><div class='add'>+#define TX_CMD_A_DATA_OFFSET_		(0x001F0000)</div><div class='add'>+#define TX_CMD_A_FIRST_SEG_		(0x00002000)</div><div class='add'>+#define TX_CMD_A_LAST_SEG_		(0x00001000)</div><div class='add'>+#define TX_CMD_A_BUF_SIZE_		(0x000007FF)</div><div class='add'>+</div><div class='add'>+#define TX_CMD_B_CSUM_ENABLE		(0x00004000)</div><div class='add'>+#define TX_CMD_B_ADD_CRC_DISABLE_	(0x00002000)</div><div class='add'>+#define TX_CMD_B_DISABLE_PADDING_	(0x00001000)</div><div class='add'>+#define TX_CMD_B_PKT_BYTE_LENGTH_	(0x000007FF)</div><div class='add'>+</div><div class='add'>+/* Rx status word */</div><div class='add'>+#define RX_STS_FF_			(0x40000000)	/* Filter Fail */</div><div class='add'>+#define RX_STS_FL_			(0x3FFF0000)	/* Frame Length */</div><div class='add'>+#define RX_STS_ES_			(0x00008000)	/* Error Summary */</div><div class='add'>+#define RX_STS_BF_			(0x00002000)	/* Broadcast Frame */</div><div class='add'>+#define RX_STS_LE_			(0x00001000)	/* Length Error */</div><div class='add'>+#define RX_STS_RF_			(0x00000800)	/* Runt Frame */</div><div class='add'>+#define RX_STS_MF_			(0x00000400)	/* Multicast Frame */</div><div class='add'>+#define RX_STS_TL_			(0x00000080)	/* Frame too long */</div><div class='add'>+#define RX_STS_CS_			(0x00000040)	/* Collision Seen */</div><div class='add'>+#define RX_STS_FT_			(0x00000020)	/* Frame Type */</div><div class='add'>+#define RX_STS_RW_			(0x00000010)	/* Receive Watchdog */</div><div class='add'>+#define RX_STS_ME_			(0x00000008)	/* Mii Error */</div><div class='add'>+#define RX_STS_DB_			(0x00000004)	/* Dribbling */</div><div class='add'>+#define RX_STS_CRC_			(0x00000002)	/* CRC Error */</div><div class='add'>+</div><div class='add'>+/* SCSRs */</div><div class='add'>+#define ID_REV				(0x00)</div><div class='add'>+#define ID_REV_CHIP_ID_MASK_		(0xFFFF0000)</div><div class='add'>+#define ID_REV_CHIP_REV_MASK_		(0x0000FFFF)</div><div class='add'>+#define ID_REV_CHIP_ID_9500_		(0x9500)</div><div class='add'>+</div><div class='add'>+#define INT_STS				(0x08)</div><div class='add'>+#define INT_STS_TX_STOP_		(0x00020000)</div><div class='add'>+#define INT_STS_RX_STOP_		(0x00010000)</div><div class='add'>+#define INT_STS_PHY_INT_		(0x00008000)</div><div class='add'>+#define INT_STS_TXE_			(0x00004000)</div><div class='add'>+#define INT_STS_TDFU_			(0x00002000)</div><div class='add'>+#define INT_STS_TDFO_			(0x00001000)</div><div class='add'>+#define INT_STS_RXDF_			(0x00000800)</div><div class='add'>+#define INT_STS_GPIOS_			(0x000007FF)</div><div class='add'>+</div><div class='add'>+#define RX_CFG				(0x0C)</div><div class='add'>+#define RX_FIFO_FLUSH_			(0x00000001)</div><div class='add'>+</div><div class='add'>+#define TX_CFG				(0x10)</div><div class='add'>+#define TX_CFG_ON_			(0x00000004)</div><div class='add'>+#define TX_CFG_STOP_			(0x00000002)</div><div class='add'>+#define TX_CFG_FIFO_FLUSH_		(0x00000001)</div><div class='add'>+</div><div class='add'>+#define HW_CFG				(0x14)</div><div class='add'>+#define HW_CFG_BIR_			(0x00001000)</div><div class='add'>+#define HW_CFG_LEDB_			(0x00000800)</div><div class='add'>+#define HW_CFG_RXDOFF_			(0x00000600)</div><div class='add'>+#define HW_CFG_DRP_			(0x00000040)</div><div class='add'>+#define HW_CFG_MEF_			(0x00000020)</div><div class='add'>+#define HW_CFG_LRST_			(0x00000008)</div><div class='add'>+#define HW_CFG_PSEL_			(0x00000004)</div><div class='add'>+#define HW_CFG_BCE_			(0x00000002)</div><div class='add'>+#define HW_CFG_SRST_			(0x00000001)</div><div class='add'>+</div><div class='add'>+#define PM_CTRL				(0x20)</div><div class='add'>+#define PM_CTL_DEV_RDY_			(0x00000080)</div><div class='add'>+#define PM_CTL_SUS_MODE_		(0x00000060)</div><div class='add'>+#define PM_CTL_SUS_MODE_0		(0x00000000)</div><div class='add'>+#define PM_CTL_SUS_MODE_1		(0x00000020)</div><div class='add'>+#define PM_CTL_SUS_MODE_2		(0x00000060)</div><div class='add'>+#define PM_CTL_PHY_RST_			(0x00000010)</div><div class='add'>+#define PM_CTL_WOL_EN_			(0x00000008)</div><div class='add'>+#define PM_CTL_ED_EN_			(0x00000004)</div><div class='add'>+#define PM_CTL_WUPS_			(0x00000003)</div><div class='add'>+#define PM_CTL_WUPS_NO_			(0x00000000)</div><div class='add'>+#define PM_CTL_WUPS_ED_			(0x00000001)</div><div class='add'>+#define PM_CTL_WUPS_WOL_		(0x00000002)</div><div class='add'>+#define PM_CTL_WUPS_MULTI_		(0x00000003)</div><div class='add'>+</div><div class='add'>+#define LED_GPIO_CFG			(0x24)</div><div class='add'>+</div><div class='add'>+#define GPIO_CFG			(0x28)</div><div class='add'>+</div><div class='add'>+#define AFC_CFG				(0x2C)</div><div class='add'>+</div><div class='add'>+/* Hi watermark = 15.5Kb (~10 mtu pkts) */</div><div class='add'>+/* low watermark = 3k (~2 mtu pkts) */</div><div class='add'>+/* backpressure duration = ~ 350us */</div><div class='add'>+/* Apply FC on any frame. */</div><div class='add'>+#define AFC_CFG_DEFAULT			(0x00F830A1)</div><div class='add'>+</div><div class='add'>+#define E2P_CMD				(0x30)</div><div class='add'>+#define E2P_CMD_BUSY_			(0x80000000)</div><div class='add'>+#define E2P_CMD_MASK_			(0x70000000)</div><div class='add'>+#define E2P_CMD_READ_			(0x00000000)</div><div class='add'>+#define E2P_CMD_EWDS_			(0x10000000)</div><div class='add'>+#define E2P_CMD_EWEN_			(0x20000000)</div><div class='add'>+#define E2P_CMD_WRITE_			(0x30000000)</div><div class='add'>+#define E2P_CMD_WRAL_			(0x40000000)</div><div class='add'>+#define E2P_CMD_ERASE_			(0x50000000)</div><div class='add'>+#define E2P_CMD_ERAL_			(0x60000000)</div><div class='add'>+#define E2P_CMD_RELOAD_			(0x70000000)</div><div class='add'>+#define E2P_CMD_TIMEOUT_		(0x00000400)</div><div class='add'>+#define E2P_CMD_LOADED_			(0x00000200)</div><div class='add'>+#define E2P_CMD_ADDR_			(0x000001FF)</div><div class='add'>+</div><div class='add'>+#define MAX_EEPROM_SIZE			(512)</div><div class='add'>+</div><div class='add'>+#define E2P_DATA			(0x34)</div><div class='add'>+#define E2P_DATA_MASK_			(0x000000FF)</div><div class='add'>+</div><div class='add'>+#define BURST_CAP			(0x38)</div><div class='add'>+</div><div class='add'>+#define GPIO_WAKE			(0x64)</div><div class='add'>+</div><div class='add'>+#define INT_EP_CTL			(0x68)</div><div class='add'>+#define INT_EP_CTL_INTEP_		(0x80000000)</div><div class='add'>+#define INT_EP_CTL_MACRTO_		(0x00080000)</div><div class='add'>+#define INT_EP_CTL_TX_STOP_		(0x00020000)</div><div class='add'>+#define INT_EP_CTL_RX_STOP_		(0x00010000)</div><div class='add'>+#define INT_EP_CTL_PHY_INT_		(0x00008000)</div><div class='add'>+#define INT_EP_CTL_TXE_			(0x00004000)</div><div class='add'>+#define INT_EP_CTL_TDFU_		(0x00002000)</div><div class='add'>+#define INT_EP_CTL_TDFO_		(0x00001000)</div><div class='add'>+#define INT_EP_CTL_RXDF_		(0x00000800)</div><div class='add'>+#define INT_EP_CTL_GPIOS_		(0x000007FF)</div><div class='add'>+</div><div class='add'>+#define BULK_IN_DLY			(0x6C)</div><div class='add'>+</div><div class='add'>+/* MAC CSRs */</div><div class='add'>+#define MAC_CR				(0x100)</div><div class='add'>+#define MAC_CR_RXALL_			(0x80000000)</div><div class='add'>+#define MAC_CR_RCVOWN_			(0x00800000)</div><div class='add'>+#define MAC_CR_LOOPBK_			(0x00200000)</div><div class='add'>+#define MAC_CR_FDPX_			(0x00100000)</div><div class='add'>+#define MAC_CR_MCPAS_			(0x00080000)</div><div class='add'>+#define MAC_CR_PRMS_			(0x00040000)</div><div class='add'>+#define MAC_CR_INVFILT_			(0x00020000)</div><div class='add'>+#define MAC_CR_PASSBAD_			(0x00010000)</div><div class='add'>+#define MAC_CR_HFILT_			(0x00008000)</div><div class='add'>+#define MAC_CR_HPFILT_			(0x00002000)</div><div class='add'>+#define MAC_CR_LCOLL_			(0x00001000)</div><div class='add'>+#define MAC_CR_BCAST_			(0x00000800)</div><div class='add'>+#define MAC_CR_DISRTY_			(0x00000400)</div><div class='add'>+#define MAC_CR_PADSTR_			(0x00000100)</div><div class='add'>+#define MAC_CR_BOLMT_MASK		(0x000000C0)</div><div class='add'>+#define MAC_CR_DFCHK_			(0x00000020)</div><div class='add'>+#define MAC_CR_TXEN_			(0x00000008)</div><div class='add'>+#define MAC_CR_RXEN_			(0x00000004)</div><div class='add'>+</div><div class='add'>+#define ADDRH				(0x104)</div><div class='add'>+</div><div class='add'>+#define ADDRL				(0x108)</div><div class='add'>+</div><div class='add'>+#define HASHH				(0x10C)</div><div class='add'>+</div><div class='add'>+#define HASHL				(0x110)</div><div class='add'>+</div><div class='add'>+#define MII_ADDR			(0x114)</div><div class='add'>+#define MII_WRITE_			(0x02)</div><div class='add'>+#define MII_BUSY_			(0x01)</div><div class='add'>+#define MII_READ_			(0x00) /* ~of MII Write bit */</div><div class='add'>+</div><div class='add'>+#define MII_DATA			(0x118)</div><div class='add'>+</div><div class='add'>+#define FLOW				(0x11C)</div><div class='add'>+#define FLOW_FCPT_			(0xFFFF0000)</div><div class='add'>+#define FLOW_FCPASS_			(0x00000004)</div><div class='add'>+#define FLOW_FCEN_			(0x00000002)</div><div class='add'>+#define FLOW_FCBSY_			(0x00000001)</div><div class='add'>+</div><div class='add'>+#define VLAN1				(0x120)</div><div class='add'>+</div><div class='add'>+#define VLAN2				(0x124)</div><div class='add'>+</div><div class='add'>+#define WUFF				(0x128)</div><div class='add'>+</div><div class='add'>+#define WUCSR				(0x12C)</div><div class='add'>+</div><div class='add'>+#define COE_CR				(0x130)</div><div class='add'>+#define Tx_COE_EN_			(0x00010000)</div><div class='add'>+#define Rx_COE_MODE_			(0x00000002)</div><div class='add'>+#define Rx_COE_EN_			(0x00000001)</div><div class='add'>+</div><div class='add'>+/* Vendor-specific PHY Definitions */</div><div class='add'>+</div><div class='add'>+/* Mode Control/Status Register */</div><div class='add'>+#define PHY_MODE_CTRL_STS		(17)</div><div class='add'>+#define MODE_CTRL_STS_EDPWRDOWN_	((u16)0x2000)</div><div class='add'>+#define MODE_CTRL_STS_ENERGYON_		((u16)0x0002)</div><div class='add'>+</div><div class='add'>+#define SPECIAL_CTRL_STS		(27)</div><div class='add'>+#define SPECIAL_CTRL_STS_OVRRD_AMDIX_	((u16)0x8000)</div><div class='add'>+#define SPECIAL_CTRL_STS_AMDIX_ENABLE_	((u16)0x4000)</div><div class='add'>+#define SPECIAL_CTRL_STS_AMDIX_STATE_	((u16)0x2000)</div><div class='add'>+</div><div class='add'>+#define PHY_INT_SRC			(29)</div><div class='add'>+#define PHY_INT_SRC_ENERGY_ON_		((u16)0x0080)</div><div class='add'>+#define PHY_INT_SRC_ANEG_COMP_		((u16)0x0040)</div><div class='add'>+#define PHY_INT_SRC_REMOTE_FAULT_	((u16)0x0020)</div><div class='add'>+#define PHY_INT_SRC_LINK_DOWN_		((u16)0x0010)</div><div class='add'>+</div><div class='add'>+#define PHY_INT_MASK			(30)</div><div class='add'>+#define PHY_INT_MASK_ENERGY_ON_		((u16)0x0080)</div><div class='add'>+#define PHY_INT_MASK_ANEG_COMP_		((u16)0x0040)</div><div class='add'>+#define PHY_INT_MASK_REMOTE_FAULT_	((u16)0x0020)</div><div class='add'>+#define PHY_INT_MASK_LINK_DOWN_		((u16)0x0010)</div><div class='add'>+#define PHY_INT_MASK_DEFAULT_		(PHY_INT_MASK_ANEG_COMP_ | \</div><div class='add'>+					 PHY_INT_MASK_LINK_DOWN_)</div><div class='add'>+</div><div class='add'>+#define PHY_SPECIAL			(31)</div><div class='add'>+#define PHY_SPECIAL_SPD_		((u16)0x001C)</div><div class='add'>+#define PHY_SPECIAL_SPD_10HALF_		((u16)0x0004)</div><div class='add'>+#define PHY_SPECIAL_SPD_10FULL_		((u16)0x0014)</div><div class='add'>+#define PHY_SPECIAL_SPD_100HALF_	((u16)0x0008)</div><div class='add'>+#define PHY_SPECIAL_SPD_100FULL_	((u16)0x0018)</div><div class='add'>+</div><div class='add'>+/* USB Vendor Requests */</div><div class='add'>+#define USB_VENDOR_REQUEST_WRITE_REGISTER	0xA0</div><div class='add'>+#define USB_VENDOR_REQUEST_READ_REGISTER	0xA1</div><div class='add'>+#define USB_VENDOR_REQUEST_GET_STATS		0xA2</div><div class='add'>+</div><div class='add'>+/* Interrupt Endpoint status word bitfields */</div><div class='add'>+#define INT_ENP_TX_STOP_		((u32)BIT(17))</div><div class='add'>+#define INT_ENP_RX_STOP_		((u32)BIT(16))</div><div class='add'>+#define INT_ENP_PHY_INT_		((u32)BIT(15))</div><div class='add'>+#define INT_ENP_TXE_			((u32)BIT(14))</div><div class='add'>+#define INT_ENP_TDFU_			((u32)BIT(13))</div><div class='add'>+#define INT_ENP_TDFO_			((u32)BIT(12))</div><div class='add'>+#define INT_ENP_RXDF_			((u32)BIT(11))</div><div class='add'>+</div><div class='add'>+#endif /* _SMSC95XX_H */</div><div class='head'>diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c<br/>index 8463efb9e0b1..02d25c743994 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/usb/usbnet.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/usb/usbnet.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/usb/usbnet.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/usb/usbnet.c</a></div><div class='hunk'>@@ -512,14 +512,13 @@ static int unlink_urbs (struct usbnet *dev, struct sk_buff_head *q)</div><div class='ctx'> 	int			count = 0;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave (&amp;q-&gt;lock, flags);</div><div class='del'>-	for (skb = q-&gt;next; skb != (struct sk_buff *) q; skb = skbnext) {</div><div class='add'>+	skb_queue_walk_safe(q, skb, skbnext) {</div><div class='ctx'> 		struct skb_data		*entry;</div><div class='ctx'> 		struct urb		*urb;</div><div class='ctx'> 		int			retval;</div><div class='ctx'> </div><div class='ctx'> 		entry = (struct skb_data *) skb-&gt;cb;</div><div class='ctx'> 		urb = entry-&gt;urb;</div><div class='del'>-		skbnext = skb-&gt;next;</div><div class='ctx'> </div><div class='ctx'> 		// during some PM-driven resume scenarios,</div><div class='ctx'> 		// these (async) unlinks complete immediately</div><div class='head'>diff --git a/drivers/net/via-rhine.c b/drivers/net/via-rhine.c<br/>index 96dff04334b8..5b7870080c56 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/via-rhine.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/via-rhine.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/via-rhine.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/via-rhine.c</a></div><div class='hunk'>@@ -914,7 +914,7 @@ static void alloc_rbufs(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	/* Fill in the Rx buffers.  Handle allocation failure gracefully. */</div><div class='ctx'> 	for (i = 0; i &lt; RX_RING_SIZE; i++) {</div><div class='del'>-		struct sk_buff *skb = dev_alloc_skb(rp-&gt;rx_buf_sz);</div><div class='add'>+		struct sk_buff *skb = netdev_alloc_skb(dev, rp-&gt;rx_buf_sz);</div><div class='ctx'> 		rp-&gt;rx_skbuff[i] = skb;</div><div class='ctx'> 		if (skb == NULL)</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -1473,8 +1473,8 @@ static int rhine_rx(struct net_device *dev, int limit)</div><div class='ctx'> 			/* Check if the packet is long enough to accept without</div><div class='ctx'> 			   copying to a minimally-sized skbuff. */</div><div class='ctx'> 			if (pkt_len &lt; rx_copybreak &amp;&amp;</div><div class='del'>-				(skb = dev_alloc_skb(pkt_len + 2)) != NULL) {</div><div class='del'>-				skb_reserve(skb, 2);	/* 16 byte align the IP header */</div><div class='add'>+				(skb = netdev_alloc_skb(dev, pkt_len + NET_IP_ALIGN)) != NULL) {</div><div class='add'>+				skb_reserve(skb, NET_IP_ALIGN);	/* 16 byte align the IP header */</div><div class='ctx'> 				pci_dma_sync_single_for_cpu(rp-&gt;pdev,</div><div class='ctx'> 							    rp-&gt;rx_skbuff_dma[entry],</div><div class='ctx'> 							    rp-&gt;rx_buf_sz,</div><div class='hunk'>@@ -1518,7 +1518,7 @@ static int rhine_rx(struct net_device *dev, int limit)</div><div class='ctx'> 		struct sk_buff *skb;</div><div class='ctx'> 		entry = rp-&gt;dirty_rx % RX_RING_SIZE;</div><div class='ctx'> 		if (rp-&gt;rx_skbuff[entry] == NULL) {</div><div class='del'>-			skb = dev_alloc_skb(rp-&gt;rx_buf_sz);</div><div class='add'>+			skb = netdev_alloc_skb(dev, rp-&gt;rx_buf_sz);</div><div class='ctx'> 			rp-&gt;rx_skbuff[entry] = skb;</div><div class='ctx'> 			if (skb == NULL)</div><div class='ctx'> 				break;	/* Better luck next round. */</div><div class='head'>diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c<br/>index 007c12970065..2dced383bcfb 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/via-velocity.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/via-velocity.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/via-velocity.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/via-velocity.c</a></div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'>  *	Scatter gather</div><div class='ctx'>  *	More testing</div><div class='ctx'>  *</div><div class='del'>- * The changes are (c) Copyright 2004, Red Hat Inc. &lt;alan@redhat.com&gt;</div><div class='add'>+ * The changes are (c) Copyright 2004, Red Hat Inc. &lt;alan@lxorguk.ukuu.org.uk&gt;</div><div class='ctx'>  * Additional fixes and clean up: Francois Romieu</div><div class='ctx'>  *</div><div class='ctx'>  * This source has not been verified for use in safety critical systems.</div><div class='hunk'>@@ -1272,7 +1272,7 @@ static void velocity_free_rd_ring(struct velocity_info *vptr)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		pci_unmap_single(vptr-&gt;pdev, rd_info-&gt;skb_dma, vptr-&gt;rx.buf_sz,</div><div class='ctx'> 				 PCI_DMA_FROMDEVICE);</div><div class='del'>-		rd_info-&gt;skb_dma = (dma_addr_t) NULL;</div><div class='add'>+		rd_info-&gt;skb_dma = 0;</div><div class='ctx'> </div><div class='ctx'> 		dev_kfree_skb(rd_info-&gt;skb);</div><div class='ctx'> 		rd_info-&gt;skb = NULL;</div><div class='hunk'>@@ -1333,7 +1333,7 @@ static void velocity_free_td_ring_entry(struct velocity_info *vptr,</div><div class='ctx'> 			if (td_info-&gt;skb_dma[i]) {</div><div class='ctx'> 				pci_unmap_single(vptr-&gt;pdev, td_info-&gt;skb_dma[i],</div><div class='ctx'> 					td_info-&gt;skb-&gt;len, PCI_DMA_TODEVICE);</div><div class='del'>-				td_info-&gt;skb_dma[i] = (dma_addr_t) NULL;</div><div class='add'>+				td_info-&gt;skb_dma[i] = 0;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		dev_kfree_skb(td_info-&gt;skb);</div><div class='head'>diff --git a/drivers/net/via-velocity.h b/drivers/net/via-velocity.h<br/>index 1b95b04c9257..29a33090d3d4 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/via-velocity.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/via-velocity.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/via-velocity.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/via-velocity.h</a></div><div class='hunk'>@@ -1381,7 +1381,7 @@ enum velocity_msg_level {</div><div class='ctx'> #define ASSERT(x) { \</div><div class='ctx'> 	if (!(x)) { \</div><div class='ctx'> 		printk(KERN_ERR "assertion %s failed: file %s line %d\n", #x,\</div><div class='del'>-			__FUNCTION__, __LINE__);\</div><div class='add'>+			__func__, __LINE__);\</div><div class='ctx'> 		BUG(); \</div><div class='ctx'> 	}\</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wan/Kconfig b/drivers/net/wan/Kconfig<br/>index 2ae2ec40015d..21efd99b9294 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wan/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wan/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wan/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wan/Kconfig</a></div><div class='hunk'>@@ -205,7 +205,7 @@ config WANXL_BUILD_FIRMWARE</div><div class='ctx'> </div><div class='ctx'> config PC300</div><div class='ctx'> 	tristate "Cyclades-PC300 support (RS-232/V.35, X.21, T1/E1 boards)"</div><div class='del'>-	depends on HDLC &amp;&amp; PCI</div><div class='add'>+	depends on HDLC &amp;&amp; PCI &amp;&amp; BROKEN</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  Driver for the Cyclades-PC300 synchronous communication boards.</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wan/cosa.c b/drivers/net/wan/cosa.c<br/>index f14051556c87..7f97f8d08c39 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wan/cosa.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wan/cosa.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wan/cosa.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wan/cosa.c</a></div><div class='hunk'>@@ -388,8 +388,8 @@ static int __init cosa_init(void)</div><div class='ctx'> 		goto out_chrdev;</div><div class='ctx'> 	}</div><div class='ctx'> 	for (i = 0; i &lt; nr_cards; i++)</div><div class='del'>-		device_create_drvdata(cosa_class, NULL, MKDEV(cosa_major, i),</div><div class='del'>-				      NULL, "cosa%d", i);</div><div class='add'>+		device_create(cosa_class, NULL, MKDEV(cosa_major, i), NULL,</div><div class='add'>+			      "cosa%d", i);</div><div class='ctx'> 	err = 0;</div><div class='ctx'> 	goto out;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wan/cycx_drv.c b/drivers/net/wan/cycx_drv.c<br/>index d14e6678deed..a5ddc6c8963e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wan/cycx_drv.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wan/cycx_drv.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wan/cycx_drv.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wan/cycx_drv.c</a></div><div class='hunk'>@@ -407,7 +407,7 @@ static int load_cyc2x(struct cycx_hw *hw, struct cycx_firmware *cfm, u32 len)</div><div class='ctx'> 	if (cfm-&gt;version != CFM_VERSION) {</div><div class='ctx'> 		printk(KERN_ERR "%s:%s: firmware format %u rejected! "</div><div class='ctx'> 				"Expecting %u.\n",</div><div class='del'>-				modname, __FUNCTION__, cfm-&gt;version, CFM_VERSION);</div><div class='add'>+				modname, __func__, cfm-&gt;version, CFM_VERSION);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -420,7 +420,7 @@ static int load_cyc2x(struct cycx_hw *hw, struct cycx_firmware *cfm, u32 len)</div><div class='ctx'> */</div><div class='ctx'> 	if (cksum != cfm-&gt;checksum) {</div><div class='ctx'> 		printk(KERN_ERR "%s:%s: firmware corrupted!\n",</div><div class='del'>-				modname, __FUNCTION__);</div><div class='add'>+				modname, __func__);</div><div class='ctx'> 		printk(KERN_ERR " cdsize = 0x%x (expected 0x%lx)\n",</div><div class='ctx'> 				len - (int)sizeof(struct cycx_firmware) - 1,</div><div class='ctx'> 				cfm-&gt;info.codesize);</div><div class='hunk'>@@ -432,7 +432,7 @@ static int load_cyc2x(struct cycx_hw *hw, struct cycx_firmware *cfm, u32 len)</div><div class='ctx'> 	/* If everything is ok, set reset, data and code pointers */</div><div class='ctx'> 	img_hdr = (struct cycx_fw_header *)&amp;cfm-&gt;image;</div><div class='ctx'> #ifdef FIRMWARE_DEBUG</div><div class='del'>-	printk(KERN_INFO "%s:%s: image sizes\n", __FUNCTION__, modname);</div><div class='add'>+	printk(KERN_INFO "%s:%s: image sizes\n", __func__, modname);</div><div class='ctx'> 	printk(KERN_INFO " reset=%lu\n", img_hdr-&gt;reset_size);</div><div class='ctx'> 	printk(KERN_INFO "  data=%lu\n", img_hdr-&gt;data_size);</div><div class='ctx'> 	printk(KERN_INFO "  code=%lu\n", img_hdr-&gt;code_size);</div><div class='head'>diff --git a/drivers/net/wan/cycx_x25.c b/drivers/net/wan/cycx_x25.c<br/>index d3b28b01b9f9..5a7303dc0965 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wan/cycx_x25.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wan/cycx_x25.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wan/cycx_x25.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wan/cycx_x25.c</a></div><div class='hunk'>@@ -874,7 +874,7 @@ static void cycx_x25_irq_connect(struct cycx_device *card,</div><div class='ctx'> 		nibble_to_byte(d + (sizeloc &gt;&gt; 1), rem, sizerem, sizeloc &amp; 1);</div><div class='ctx'> </div><div class='ctx'> 	dprintk(1, KERN_INFO "%s:lcn=%d, local=%s, remote=%s\n",</div><div class='del'>-			  __FUNCTION__, lcn, loc, rem);</div><div class='add'>+			  __func__, lcn, loc, rem);</div><div class='ctx'> </div><div class='ctx'> 	dev = cycx_x25_get_dev_by_dte_addr(wandev, rem);</div><div class='ctx'> 	if (!dev) {</div><div class='hunk'>@@ -902,7 +902,7 @@ static void cycx_x25_irq_connect_confirm(struct cycx_device *card,</div><div class='ctx'> 	cycx_peek(&amp;card-&gt;hw, cmd-&gt;buf, &amp;lcn, sizeof(lcn));</div><div class='ctx'> 	cycx_peek(&amp;card-&gt;hw, cmd-&gt;buf + 1, &amp;key, sizeof(key));</div><div class='ctx'> 	dprintk(1, KERN_INFO "%s: %s:lcn=%d, key=%d\n",</div><div class='del'>-			  card-&gt;devname, __FUNCTION__, lcn, key);</div><div class='add'>+			  card-&gt;devname, __func__, lcn, key);</div><div class='ctx'> </div><div class='ctx'> 	dev = cycx_x25_get_dev_by_lcn(wandev, -key);</div><div class='ctx'> 	if (!dev) {</div><div class='hunk'>@@ -929,7 +929,7 @@ static void cycx_x25_irq_disconnect_confirm(struct cycx_device *card,</div><div class='ctx'> </div><div class='ctx'> 	cycx_peek(&amp;card-&gt;hw, cmd-&gt;buf, &amp;lcn, sizeof(lcn));</div><div class='ctx'> 	dprintk(1, KERN_INFO "%s: %s:lcn=%d\n",</div><div class='del'>-			  card-&gt;devname, __FUNCTION__, lcn);</div><div class='add'>+			  card-&gt;devname, __func__, lcn);</div><div class='ctx'> 	dev = cycx_x25_get_dev_by_lcn(wandev, lcn);</div><div class='ctx'> 	if (!dev) {</div><div class='ctx'> 		/* Invalid channel, discard packet */</div><div class='hunk'>@@ -950,7 +950,7 @@ static void cycx_x25_irq_disconnect(struct cycx_device *card,</div><div class='ctx'> 	u8 lcn;</div><div class='ctx'> </div><div class='ctx'> 	cycx_peek(&amp;card-&gt;hw, cmd-&gt;buf, &amp;lcn, sizeof(lcn));</div><div class='del'>-	dprintk(1, KERN_INFO "%s:lcn=%d\n", __FUNCTION__, lcn);</div><div class='add'>+	dprintk(1, KERN_INFO "%s:lcn=%d\n", __func__, lcn);</div><div class='ctx'> </div><div class='ctx'> 	dev = cycx_x25_get_dev_by_lcn(wandev, lcn);</div><div class='ctx'> 	if (dev) {</div><div class='hunk'>@@ -1381,7 +1381,7 @@ static void cycx_x25_chan_timer(unsigned long d)</div><div class='ctx'> 		cycx_x25_chan_disconnect(dev);</div><div class='ctx'> 	else</div><div class='ctx'> 		printk(KERN_ERR "%s: %s for svc (%s) not connected!\n",</div><div class='del'>-				chan-&gt;card-&gt;devname, __FUNCTION__, dev-&gt;name);</div><div class='add'>+				chan-&gt;card-&gt;devname, __func__, dev-&gt;name);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Set logical channel state. */</div><div class='hunk'>@@ -1485,7 +1485,7 @@ static void cycx_x25_chan_send_event(struct net_device *dev, u8 event)</div><div class='ctx'> 	unsigned char *ptr;</div><div class='ctx'> </div><div class='ctx'> 	if ((skb = dev_alloc_skb(1)) == NULL) {</div><div class='del'>-		printk(KERN_ERR "%s: out of memory\n", __FUNCTION__);</div><div class='add'>+		printk(KERN_ERR "%s: out of memory\n", __func__);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wan/dscc4.c b/drivers/net/wan/dscc4.c<br/>index f5d55ad02267..5f1ccb2b08b1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wan/dscc4.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wan/dscc4.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wan/dscc4.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wan/dscc4.c</a></div><div class='hunk'>@@ -647,7 +647,7 @@ static inline void dscc4_rx_skb(struct dscc4_dev_priv *dpriv,</div><div class='ctx'> </div><div class='ctx'> 	skb = dpriv-&gt;rx_skbuff[dpriv-&gt;rx_current++%RX_RING_SIZE];</div><div class='ctx'> 	if (!skb) {</div><div class='del'>-		printk(KERN_DEBUG "%s: skb=0 (%s)\n", dev-&gt;name, __FUNCTION__);</div><div class='add'>+		printk(KERN_DEBUG "%s: skb=0 (%s)\n", dev-&gt;name, __func__);</div><div class='ctx'> 		goto refill;</div><div class='ctx'> 	}</div><div class='ctx'> 	pkt_len = TO_SIZE(le32_to_cpu(rx_fd-&gt;state2));</div><div class='head'>diff --git a/drivers/net/wan/hdlc_x25.c b/drivers/net/wan/hdlc_x25.c<br/>index 8b7e5d2e2ac9..cbcbf6f0414c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wan/hdlc_x25.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wan/hdlc_x25.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wan/hdlc_x25.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wan/hdlc_x25.c</a></div><div class='hunk'>@@ -163,15 +163,17 @@ static void x25_close(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> static int x25_rx(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='add'>+	struct net_device *dev = skb-&gt;dev;</div><div class='add'>+</div><div class='ctx'> 	if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL) {</div><div class='del'>-		skb-&gt;dev-&gt;stats.rx_dropped++;</div><div class='add'>+		dev-&gt;stats.rx_dropped++;</div><div class='ctx'> 		return NET_RX_DROP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (lapb_data_received(skb-&gt;dev, skb) == LAPB_OK)</div><div class='add'>+	if (lapb_data_received(dev, skb) == LAPB_OK)</div><div class='ctx'> 		return NET_RX_SUCCESS;</div><div class='ctx'> </div><div class='del'>-	skb-&gt;dev-&gt;stats.rx_errors++;</div><div class='add'>+	dev-&gt;stats.rx_errors++;</div><div class='ctx'> 	dev_kfree_skb_any(skb);</div><div class='ctx'> 	return NET_RX_DROP;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wan/lmc/lmc_main.c b/drivers/net/wan/lmc/lmc_main.c<br/>index f80640f5a744..d7bb63e616b5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wan/lmc/lmc_main.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wan/lmc/lmc_main.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wan/lmc/lmc_main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wan/lmc/lmc_main.c</a></div><div class='hunk'>@@ -122,7 +122,6 @@ int lmc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/</div><div class='ctx'>      * Most functions mess with the structure</div><div class='ctx'>      * Disable interrupts while we do the polling</div><div class='ctx'>      */</div><div class='del'>-    spin_lock_irqsave(&amp;sc-&gt;lmc_lock, flags);</div><div class='ctx'> </div><div class='ctx'>     switch (cmd) {</div><div class='ctx'>         /*</div><div class='hunk'>@@ -152,6 +151,7 @@ int lmc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	spin_lock_irqsave(&amp;sc-&gt;lmc_lock, flags);</div><div class='ctx'>         sc-&gt;lmc_media-&gt;set_status (sc, &amp;ctl);</div><div class='ctx'> </div><div class='ctx'>         if(ctl.crc_length != sc-&gt;ictl.crc_length) {</div><div class='hunk'>@@ -161,6 +161,7 @@ int lmc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/</div><div class='ctx'> 	    else</div><div class='ctx'> 		sc-&gt;TxDescriptControlInit &amp;= ~LMC_TDES_ADD_CRC_DISABLE;</div><div class='ctx'>         }</div><div class='add'>+	spin_unlock_irqrestore(&amp;sc-&gt;lmc_lock, flags);</div><div class='ctx'> </div><div class='ctx'>         ret = 0;</div><div class='ctx'>         break;</div><div class='hunk'>@@ -187,15 +188,18 @@ int lmc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/</div><div class='ctx'> 		break;				/* no change */</div><div class='ctx'>             }</div><div class='ctx'>             </div><div class='add'>+	    spin_lock_irqsave(&amp;sc-&gt;lmc_lock, flags);</div><div class='ctx'>             lmc_proto_close(sc);</div><div class='ctx'> </div><div class='ctx'>             sc-&gt;if_type = new_type;</div><div class='ctx'>             lmc_proto_attach(sc);</div><div class='ctx'> 	    ret = lmc_proto_open(sc);</div><div class='add'>+	    spin_unlock_irqrestore(&amp;sc-&gt;lmc_lock, flags);</div><div class='ctx'> 	    break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'>     case LMCIOCGETXINFO: /*fold01*/</div><div class='add'>+	spin_lock_irqsave(&amp;sc-&gt;lmc_lock, flags);</div><div class='ctx'>         sc-&gt;lmc_xinfo.Magic0 = 0xBEEFCAFE;</div><div class='ctx'> </div><div class='ctx'>         sc-&gt;lmc_xinfo.PciCardType = sc-&gt;lmc_cardtype;</div><div class='hunk'>@@ -208,6 +212,7 @@ int lmc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/</div><div class='ctx'>         sc-&gt;lmc_xinfo.MaxFrameSize = LMC_PKT_BUF_SZ;</div><div class='ctx'>         sc-&gt;lmc_xinfo.link_status = sc-&gt;lmc_media-&gt;get_link_status (sc);</div><div class='ctx'>         sc-&gt;lmc_xinfo.mii_reg16 = lmc_mii_readreg (sc, 0, 16);</div><div class='add'>+	spin_unlock_irqrestore(&amp;sc-&gt;lmc_lock, flags);</div><div class='ctx'> </div><div class='ctx'>         sc-&gt;lmc_xinfo.Magic1 = 0xDEADBEEF;</div><div class='ctx'> </div><div class='hunk'>@@ -220,6 +225,7 @@ int lmc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/</div><div class='ctx'>         break;</div><div class='ctx'> </div><div class='ctx'>     case LMCIOCGETLMCSTATS:</div><div class='add'>+	    spin_lock_irqsave(&amp;sc-&gt;lmc_lock, flags);</div><div class='ctx'> 	    if (sc-&gt;lmc_cardtype == LMC_CARDTYPE_T1) {</div><div class='ctx'> 		    lmc_mii_writereg(sc, 0, 17, T1FRAMER_FERR_LSB);</div><div class='ctx'> 		    sc-&gt;extra_stats.framingBitErrorCount +=</div><div class='hunk'>@@ -243,6 +249,7 @@ int lmc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/</div><div class='ctx'> 		    sc-&gt;extra_stats.severelyErroredFrameCount +=</div><div class='ctx'> 			    regVal &amp; T1FRAMER_SEF_MASK;</div><div class='ctx'> 	    }</div><div class='add'>+	    spin_unlock_irqrestore(&amp;sc-&gt;lmc_lock, flags);</div><div class='ctx'> 	    if (copy_to_user(ifr-&gt;ifr_data, &amp;sc-&gt;lmc_device-&gt;stats,</div><div class='ctx'> 			     sizeof(sc-&gt;lmc_device-&gt;stats)) ||</div><div class='ctx'> 		copy_to_user(ifr-&gt;ifr_data + sizeof(sc-&gt;lmc_device-&gt;stats),</div><div class='hunk'>@@ -258,12 +265,14 @@ int lmc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/</div><div class='ctx'> 		    break;</div><div class='ctx'> 	    }</div><div class='ctx'> </div><div class='add'>+	    spin_lock_irqsave(&amp;sc-&gt;lmc_lock, flags);</div><div class='ctx'> 	    memset(&amp;sc-&gt;lmc_device-&gt;stats, 0, sizeof(sc-&gt;lmc_device-&gt;stats));</div><div class='ctx'> 	    memset(&amp;sc-&gt;extra_stats, 0, sizeof(sc-&gt;extra_stats));</div><div class='ctx'> 	    sc-&gt;extra_stats.check = STATCHECK;</div><div class='ctx'> 	    sc-&gt;extra_stats.version_size = (DRIVER_VERSION &lt;&lt; 16) +</div><div class='ctx'> 		    sizeof(sc-&gt;lmc_device-&gt;stats) + sizeof(sc-&gt;extra_stats);</div><div class='ctx'> 	    sc-&gt;extra_stats.lmc_cardtype = sc-&gt;lmc_cardtype;</div><div class='add'>+	    spin_unlock_irqrestore(&amp;sc-&gt;lmc_lock, flags);</div><div class='ctx'> 	    ret = 0;</div><div class='ctx'> 	    break;</div><div class='ctx'> </div><div class='hunk'>@@ -282,8 +291,10 @@ int lmc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/</div><div class='ctx'> 		ret = -EFAULT;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='add'>+	spin_lock_irqsave(&amp;sc-&gt;lmc_lock, flags);</div><div class='ctx'>         sc-&gt;lmc_media-&gt;set_circuit_type(sc, ctl.circuit_type);</div><div class='ctx'>         sc-&gt;ictl.circuit_type = ctl.circuit_type;</div><div class='add'>+	spin_unlock_irqrestore(&amp;sc-&gt;lmc_lock, flags);</div><div class='ctx'>         ret = 0;</div><div class='ctx'> </div><div class='ctx'>         break;</div><div class='hunk'>@@ -294,12 +305,14 @@ int lmc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/</div><div class='ctx'>             break;</div><div class='ctx'>         }</div><div class='ctx'> </div><div class='add'>+	spin_lock_irqsave(&amp;sc-&gt;lmc_lock, flags);</div><div class='ctx'>         /* Reset driver and bring back to current state */</div><div class='ctx'>         printk (" REG16 before reset +%04x\n", lmc_mii_readreg (sc, 0, 16));</div><div class='ctx'>         lmc_running_reset (dev);</div><div class='ctx'>         printk (" REG16 after reset +%04x\n", lmc_mii_readreg (sc, 0, 16));</div><div class='ctx'> </div><div class='ctx'>         LMC_EVENT_LOG(LMC_EVENT_FORCEDRESET, LMC_CSR_READ (sc, csr_status), lmc_mii_readreg (sc, 0, 16));</div><div class='add'>+	spin_unlock_irqrestore(&amp;sc-&gt;lmc_lock, flags);</div><div class='ctx'> </div><div class='ctx'>         ret = 0;</div><div class='ctx'>         break;</div><div class='hunk'>@@ -338,14 +351,15 @@ int lmc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/</div><div class='ctx'>              */</div><div class='ctx'>             netif_stop_queue(dev);</div><div class='ctx'> </div><div class='del'>-	if (copy_from_user(&amp;xc, ifr-&gt;ifr_data, sizeof(struct lmc_xilinx_control))) {</div><div class='add'>+	    if (copy_from_user(&amp;xc, ifr-&gt;ifr_data, sizeof(struct lmc_xilinx_control))) {</div><div class='ctx'> 		ret = -EFAULT;</div><div class='ctx'> 		break;</div><div class='del'>-	}</div><div class='add'>+	    }</div><div class='ctx'>             switch(xc.command){</div><div class='ctx'>             case lmc_xilinx_reset: /*fold02*/</div><div class='ctx'>                 {</div><div class='ctx'>                     u16 mii;</div><div class='add'>+		    spin_lock_irqsave(&amp;sc-&gt;lmc_lock, flags);</div><div class='ctx'>                     mii = lmc_mii_readreg (sc, 0, 16);</div><div class='ctx'> </div><div class='ctx'>                     /*</div><div class='hunk'>@@ -404,6 +418,7 @@ int lmc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/</div><div class='ctx'>                             lmc_led_off(sc, LMC_DS3_LED2);</div><div class='ctx'>                         }</div><div class='ctx'>                     }</div><div class='add'>+		    spin_unlock_irqrestore(&amp;sc-&gt;lmc_lock, flags);</div><div class='ctx'>                     </div><div class='ctx'>                     </div><div class='ctx'> </div><div class='hunk'>@@ -416,6 +431,7 @@ int lmc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/</div><div class='ctx'>                 {</div><div class='ctx'>                     u16 mii;</div><div class='ctx'>                     int timeout = 500000;</div><div class='add'>+		    spin_lock_irqsave(&amp;sc-&gt;lmc_lock, flags);</div><div class='ctx'>                     mii = lmc_mii_readreg (sc, 0, 16);</div><div class='ctx'> </div><div class='ctx'>                     /*</div><div class='hunk'>@@ -451,13 +467,14 @@ int lmc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/</div><div class='ctx'>                      */</div><div class='ctx'>                     while( (LMC_CSR_READ(sc, csr_gp) &amp; LMC_GEP_INIT) == 0 &amp;&amp;</div><div class='ctx'>                            (timeout-- &gt; 0))</div><div class='del'>-                        ;</div><div class='add'>+                        cpu_relax();</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'>                     /*</div><div class='ctx'>                      * stop driving Xilinx-related signals</div><div class='ctx'>                      */</div><div class='ctx'>                     lmc_gpio_mkinput(sc, 0xff);</div><div class='add'>+		    spin_unlock_irqrestore(&amp;sc-&gt;lmc_lock, flags);</div><div class='ctx'> </div><div class='ctx'>                     ret = 0x0;</div><div class='ctx'>                     </div><div class='hunk'>@@ -493,6 +510,7 @@ int lmc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/</div><div class='ctx'> </div><div class='ctx'>                     printk("%s: Starting load of data Len: %d at 0x%p == 0x%p\n", dev-&gt;name, xc.len, xc.data, data);</div><div class='ctx'> </div><div class='add'>+		    spin_lock_irqsave(&amp;sc-&gt;lmc_lock, flags);</div><div class='ctx'>                     lmc_gpio_mkinput(sc, 0xff);</div><div class='ctx'> </div><div class='ctx'>                     /*</div><div class='hunk'>@@ -545,7 +563,7 @@ int lmc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/</div><div class='ctx'>                      */</div><div class='ctx'>                     while( (LMC_CSR_READ(sc, csr_gp) &amp; LMC_GEP_INIT) == 0 &amp;&amp;</div><div class='ctx'>                            (timeout-- &gt; 0))</div><div class='del'>-                        ;</div><div class='add'>+                        cpu_relax();</div><div class='ctx'> </div><div class='ctx'>                     printk(KERN_DEBUG "%s: Waited %d for the Xilinx to clear it's memory\n", dev-&gt;name, 500000-timeout);</div><div class='ctx'> </div><div class='hunk'>@@ -588,6 +606,7 @@ int lmc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/</div><div class='ctx'> </div><div class='ctx'>                     sc-&gt;lmc_miireg16 &amp;= ~LMC_MII16_FIFO_RESET;</div><div class='ctx'>                     lmc_mii_writereg(sc, 0, 16, sc-&gt;lmc_miireg16);</div><div class='add'>+		    spin_unlock_irqrestore(&amp;sc-&gt;lmc_lock, flags);</div><div class='ctx'> </div><div class='ctx'>                     kfree(data);</div><div class='ctx'>                     </div><div class='hunk'>@@ -611,8 +630,6 @@ int lmc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/</div><div class='ctx'>         break;</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='del'>-    spin_unlock_irqrestore(&amp;sc-&gt;lmc_lock, flags); /*fold01*/</div><div class='del'>-</div><div class='ctx'>     lmc_trace(dev, "lmc_ioctl out");</div><div class='ctx'> </div><div class='ctx'>     return ret;</div><div class='head'>diff --git a/drivers/net/wan/pc300_tty.c b/drivers/net/wan/pc300_tty.c<br/>index 4518d0aa2480..4917a94943bd 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wan/pc300_tty.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wan/pc300_tty.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wan/pc300_tty.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wan/pc300_tty.c</a></div><div class='hunk'>@@ -548,7 +548,7 @@ static int pc300_tiocmset(struct tty_struct *tty, struct file *file,</div><div class='ctx'> {</div><div class='ctx'> 	st_cpc_tty_area    *cpc_tty; </div><div class='ctx'> </div><div class='del'>-	CPC_TTY_DBG("%s: set:%x clear:%x\n", __FUNCTION__, set, clear);</div><div class='add'>+	CPC_TTY_DBG("%s: set:%x clear:%x\n", __func__, set, clear);</div><div class='ctx'> </div><div class='ctx'> 	if (!tty || !tty-&gt;driver_data ) {</div><div class='ctx'> 	   	CPC_TTY_DBG("hdlcX-tty: no TTY to chars in buffer\n");	</div><div class='head'>diff --git a/drivers/net/wan/sbni.c b/drivers/net/wan/sbni.c<br/>index 6596cd0742b9..f972fef87c98 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wan/sbni.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wan/sbni.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wan/sbni.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wan/sbni.c</a></div><div class='hunk'>@@ -856,7 +856,7 @@ prepare_to_send( struct sk_buff  *skb,  struct net_device  *dev )</div><div class='ctx'> 		len = SBNI_MIN_LEN;</div><div class='ctx'> </div><div class='ctx'> 	nl-&gt;tx_buf_p	= skb;</div><div class='del'>-	nl-&gt;tx_frameno	= (len + nl-&gt;maxframe - 1) / nl-&gt;maxframe;</div><div class='add'>+	nl-&gt;tx_frameno	= DIV_ROUND_UP(len, nl-&gt;maxframe);</div><div class='ctx'> 	nl-&gt;framelen	= len &lt; nl-&gt;maxframe  ?  len  :  nl-&gt;maxframe;</div><div class='ctx'> </div><div class='ctx'> 	outb( inb( dev-&gt;base_addr + CSR0 ) | TR_REQ,  dev-&gt;base_addr + CSR0 );</div><div class='head'>diff --git a/drivers/net/wan/z85230.c b/drivers/net/wan/z85230.c<br/>index 243bd8d918fe..ccd9cd35ecbe 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wan/z85230.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wan/z85230.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wan/z85230.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wan/z85230.c</a></div><div class='hunk'>@@ -18,7 +18,8 @@</div><div class='ctx'>  *	DMA now uses get_free_page as kmalloc buffers may span a 64K </div><div class='ctx'>  *	boundary.</div><div class='ctx'>  *</div><div class='del'>- *	Modified for SMP safety and SMP locking by Alan Cox &lt;alan@redhat.com&gt;</div><div class='add'>+ *	Modified for SMP safety and SMP locking by Alan Cox</div><div class='add'>+ *					&lt;alan@lxorguk.ukuu.org.uk&gt;</div><div class='ctx'>  *</div><div class='ctx'>  *	Performance</div><div class='ctx'>  *</div><div class='head'>diff --git a/drivers/net/wan/z85230.h b/drivers/net/wan/z85230.h<br/>index 4f372396c512..85b3e785d484 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wan/z85230.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wan/z85230.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wan/z85230.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wan/z85230.h</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'>  *	Description of Z8530 Z85C30 and Z85230 communications chips</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)</div><div class='del'>- * Copyright (C) 1998 Alan Cox &lt;alan@redhat.com&gt;</div><div class='add'>+ * Copyright (C) 1998 Alan Cox &lt;alan@lxorguk.ukuu.org.uk&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _Z8530_H</div><div class='head'>diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig<br/>index 9931b5ab59cd..45bdf0b339bb 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/Kconfig</a></div><div class='hunk'>@@ -300,6 +300,19 @@ config LIBERTAS_DEBUG</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  Debugging support.</div><div class='ctx'> </div><div class='add'>+config LIBERTAS_THINFIRM</div><div class='add'>+	tristate "Marvell 8xxx Libertas WLAN driver support with thin firmware"</div><div class='add'>+	depends on WLAN_80211 &amp;&amp; MAC80211</div><div class='add'>+	select FW_LOADER</div><div class='add'>+	---help---</div><div class='add'>+	  A library for Marvell Libertas 8xxx devices using thinfirm.</div><div class='add'>+</div><div class='add'>+config LIBERTAS_THINFIRM_USB</div><div class='add'>+	tristate "Marvell Libertas 8388 USB 802.11b/g cards with thin firmware"</div><div class='add'>+	depends on LIBERTAS_THINFIRM &amp;&amp; USB</div><div class='add'>+	---help---</div><div class='add'>+	  A driver for Marvell Libertas 8388 USB devices using thinfirm.</div><div class='add'>+</div><div class='ctx'> config AIRO</div><div class='ctx'> 	tristate "Cisco/Aironet 34X/35X/4500/4800 ISA and PCI cards"</div><div class='ctx'> 	depends on ISA_DMA_API &amp;&amp; WLAN_80211 &amp;&amp; (PCI || BROKEN)</div><div class='hunk'>@@ -322,6 +335,9 @@ config HERMES</div><div class='ctx'> 	tristate "Hermes chipset 802.11b support (Orinoco/Prism2/Symbol)"</div><div class='ctx'> 	depends on (PPC_PMAC || PCI || PCMCIA) &amp;&amp; WLAN_80211</div><div class='ctx'> 	select WIRELESS_EXT</div><div class='add'>+	select FW_LOADER</div><div class='add'>+	select CRYPTO</div><div class='add'>+	select CRYPTO_MICHAEL_MIC</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  A driver for 802.11b wireless cards based on the "Hermes" or</div><div class='ctx'> 	  Intersil HFA384x (Prism 2) MAC controller.  This includes the vast</div><div class='hunk'>@@ -411,7 +427,6 @@ config PCMCIA_HERMES</div><div class='ctx'> config PCMCIA_SPECTRUM</div><div class='ctx'> 	tristate "Symbol Spectrum24 Trilogy PCMCIA card support"</div><div class='ctx'> 	depends on PCMCIA &amp;&amp; HERMES</div><div class='del'>-	select FW_LOADER</div><div class='ctx'> 	---help---</div><div class='ctx'> </div><div class='ctx'> 	  This is a driver for 802.11b cards using RAM-loadable Symbol</div><div class='head'>diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile<br/>index 59aa89ec6e81..59d2d805f60b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/Makefile</a></div><div class='hunk'>@@ -16,7 +16,7 @@ obj-$(CONFIG_WAVELAN)		+= wavelan.o</div><div class='ctx'> obj-$(CONFIG_PCMCIA_NETWAVE)	+= netwave_cs.o</div><div class='ctx'> obj-$(CONFIG_PCMCIA_WAVELAN)	+= wavelan_cs.o</div><div class='ctx'> </div><div class='del'>-obj-$(CONFIG_HERMES)		+= orinoco.o hermes.o</div><div class='add'>+obj-$(CONFIG_HERMES)		+= orinoco.o hermes.o hermes_dld.o</div><div class='ctx'> obj-$(CONFIG_PCMCIA_HERMES)	+= orinoco_cs.o</div><div class='ctx'> obj-$(CONFIG_APPLE_AIRPORT)	+= airport.o</div><div class='ctx'> obj-$(CONFIG_PLX_HERMES)	+= orinoco_plx.o</div><div class='hunk'>@@ -48,6 +48,8 @@ obj-$(CONFIG_USB_NET_RNDIS_WLAN)	+= rndis_wlan.o</div><div class='ctx'> obj-$(CONFIG_USB_ZD1201)	+= zd1201.o</div><div class='ctx'> obj-$(CONFIG_LIBERTAS)		+= libertas/</div><div class='ctx'> </div><div class='add'>+obj-$(CONFIG_LIBERTAS_THINFIRM)	+= libertas_tf/</div><div class='add'>+</div><div class='ctx'> rtl8180-objs		:= rtl8180_dev.o rtl8180_rtl8225.o rtl8180_sa2400.o rtl8180_max2820.o rtl8180_grf5101.o</div><div class='ctx'> rtl8187-objs		:= rtl8187_dev.o rtl8187_rtl8225.o</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/adm8211.c b/drivers/net/wireless/adm8211.c<br/>index 3333d4596b8d..b2c050b68890 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/adm8211.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/adm8211.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/adm8211.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/adm8211.c</a></div><div class='hunk'>@@ -765,11 +765,11 @@ static void adm8211_update_mode(struct ieee80211_hw *dev)</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;soft_rx_crc = 0;</div><div class='ctx'> 	switch (priv-&gt;mode) {</div><div class='del'>-	case IEEE80211_IF_TYPE_STA:</div><div class='add'>+	case NL80211_IFTYPE_STATION:</div><div class='ctx'> 		priv-&gt;nar &amp;= ~(ADM8211_NAR_PR | ADM8211_NAR_EA);</div><div class='ctx'> 		priv-&gt;nar |= ADM8211_NAR_ST | ADM8211_NAR_SR;</div><div class='ctx'> 		break;</div><div class='del'>-	case IEEE80211_IF_TYPE_IBSS:</div><div class='add'>+	case NL80211_IFTYPE_ADHOC:</div><div class='ctx'> 		priv-&gt;nar &amp;= ~ADM8211_NAR_PR;</div><div class='ctx'> 		priv-&gt;nar |= ADM8211_NAR_EA | ADM8211_NAR_ST | ADM8211_NAR_SR;</div><div class='ctx'> </div><div class='hunk'>@@ -777,7 +777,7 @@ static void adm8211_update_mode(struct ieee80211_hw *dev)</div><div class='ctx'> 		if (priv-&gt;pdev-&gt;revision &gt;= ADM8211_REV_BA)</div><div class='ctx'> 			priv-&gt;soft_rx_crc = 1;</div><div class='ctx'> 		break;</div><div class='del'>-	case IEEE80211_IF_TYPE_MNTR:</div><div class='add'>+	case NL80211_IFTYPE_MONITOR:</div><div class='ctx'> 		priv-&gt;nar &amp;= ~(ADM8211_NAR_EA | ADM8211_NAR_ST);</div><div class='ctx'> 		priv-&gt;nar |= ADM8211_NAR_PR | ADM8211_NAR_SR;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1410,11 +1410,11 @@ static int adm8211_add_interface(struct ieee80211_hw *dev,</div><div class='ctx'> 				 struct ieee80211_if_init_conf *conf)</div><div class='ctx'> {</div><div class='ctx'> 	struct adm8211_priv *priv = dev-&gt;priv;</div><div class='del'>-	if (priv-&gt;mode != IEEE80211_IF_TYPE_MNTR)</div><div class='add'>+	if (priv-&gt;mode != NL80211_IFTYPE_MONITOR)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 	switch (conf-&gt;type) {</div><div class='del'>-	case IEEE80211_IF_TYPE_STA:</div><div class='add'>+	case NL80211_IFTYPE_STATION:</div><div class='ctx'> 		priv-&gt;mode = conf-&gt;type;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -1437,7 +1437,7 @@ static void adm8211_remove_interface(struct ieee80211_hw *dev,</div><div class='ctx'> 				     struct ieee80211_if_init_conf *conf)</div><div class='ctx'> {</div><div class='ctx'> 	struct adm8211_priv *priv = dev-&gt;priv;</div><div class='del'>-	priv-&gt;mode = IEEE80211_IF_TYPE_MNTR;</div><div class='add'>+	priv-&gt;mode = NL80211_IFTYPE_MONITOR;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int adm8211_init_rings(struct ieee80211_hw *dev)</div><div class='hunk'>@@ -1556,7 +1556,7 @@ static int adm8211_start(struct ieee80211_hw *dev)</div><div class='ctx'> 	ADM8211_CSR_WRITE(IER, ADM8211_IER_NIE | ADM8211_IER_AIE |</div><div class='ctx'> 			       ADM8211_IER_RCIE | ADM8211_IER_TCIE |</div><div class='ctx'> 			       ADM8211_IER_TDUIE | ADM8211_IER_GPTIE);</div><div class='del'>-	priv-&gt;mode = IEEE80211_IF_TYPE_MNTR;</div><div class='add'>+	priv-&gt;mode = NL80211_IFTYPE_MONITOR;</div><div class='ctx'> 	adm8211_update_mode(dev);</div><div class='ctx'> 	ADM8211_CSR_WRITE(RDR, 0);</div><div class='ctx'> </div><div class='hunk'>@@ -1571,7 +1571,7 @@ static void adm8211_stop(struct ieee80211_hw *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct adm8211_priv *priv = dev-&gt;priv;</div><div class='ctx'> </div><div class='del'>-	priv-&gt;mode = IEEE80211_IF_TYPE_INVALID;</div><div class='add'>+	priv-&gt;mode = NL80211_IFTYPE_UNSPECIFIED;</div><div class='ctx'> 	priv-&gt;nar = 0;</div><div class='ctx'> 	ADM8211_CSR_WRITE(NAR, 0);</div><div class='ctx'> 	ADM8211_CSR_WRITE(IER, 0);</div><div class='hunk'>@@ -1884,6 +1884,7 @@ static int __devinit adm8211_probe(struct pci_dev *pdev,</div><div class='ctx'> 	dev-&gt;extra_tx_headroom = sizeof(struct adm8211_tx_hdr);</div><div class='ctx'> 	/* dev-&gt;flags = IEEE80211_HW_RX_INCLUDES_FCS in promisc mode */</div><div class='ctx'> 	dev-&gt;flags = IEEE80211_HW_SIGNAL_UNSPEC;</div><div class='add'>+	dev-&gt;wiphy-&gt;interface_modes = BIT(NL80211_IFTYPE_STATION);</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;channel_change_time = 1000;</div><div class='ctx'> 	dev-&gt;max_signal = 100;    /* FIXME: find better value */</div><div class='hunk'>@@ -1895,7 +1896,7 @@ static int __devinit adm8211_probe(struct pci_dev *pdev,</div><div class='ctx'> 	priv-&gt;tx_power = 0x40;</div><div class='ctx'> 	priv-&gt;lpf_cutoff = 0xFF;</div><div class='ctx'> 	priv-&gt;lnags_threshold = 0xFF;</div><div class='del'>-	priv-&gt;mode = IEEE80211_IF_TYPE_INVALID;</div><div class='add'>+	priv-&gt;mode = NL80211_IFTYPE_UNSPECIFIED;</div><div class='ctx'> </div><div class='ctx'> 	/* Power-on issue. EEPROM won't read correctly without */</div><div class='ctx'> 	if (pdev-&gt;revision &gt;= ADM8211_REV_BA) {</div><div class='hunk'>@@ -1985,7 +1986,7 @@ static int adm8211_suspend(struct pci_dev *pdev, pm_message_t state)</div><div class='ctx'> 	struct ieee80211_hw *dev = pci_get_drvdata(pdev);</div><div class='ctx'> 	struct adm8211_priv *priv = dev-&gt;priv;</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;mode != IEEE80211_IF_TYPE_INVALID) {</div><div class='add'>+	if (priv-&gt;mode != NL80211_IFTYPE_UNSPECIFIED) {</div><div class='ctx'> 		ieee80211_stop_queues(dev);</div><div class='ctx'> 		adm8211_stop(dev);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2003,7 +2004,7 @@ static int adm8211_resume(struct pci_dev *pdev)</div><div class='ctx'> 	pci_set_power_state(pdev, PCI_D0);</div><div class='ctx'> 	pci_restore_state(pdev);</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;mode != IEEE80211_IF_TYPE_INVALID) {</div><div class='add'>+	if (priv-&gt;mode != NL80211_IFTYPE_UNSPECIFIED) {</div><div class='ctx'> 		adm8211_start(dev);</div><div class='ctx'> 		ieee80211_wake_queues(dev);</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c<br/>index b5cd850a4a59..370133e492d2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/airo.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/airo.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/airo.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/airo.c</a></div><div class='hunk'>@@ -1915,7 +1915,7 @@ static int mpi_start_xmit(struct sk_buff *skb, struct net_device *dev) {</div><div class='ctx'> 	struct airo_info *ai = dev-&gt;priv;</div><div class='ctx'> </div><div class='ctx'> 	if (!skb) {</div><div class='del'>-		airo_print_err(dev-&gt;name, "%s: skb == NULL!",__FUNCTION__);</div><div class='add'>+		airo_print_err(dev-&gt;name, "%s: skb == NULL!",__func__);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	npacks = skb_queue_len (&amp;ai-&gt;txq);</div><div class='hunk'>@@ -1964,7 +1964,7 @@ static int mpi_send_packet (struct net_device *dev)</div><div class='ctx'> 	if ((skb = skb_dequeue(&amp;ai-&gt;txq)) == NULL) {</div><div class='ctx'> 		airo_print_err(dev-&gt;name,</div><div class='ctx'> 			"%s: Dequeue'd zero in send_packet()",</div><div class='del'>-			__FUNCTION__);</div><div class='add'>+			__func__);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2115,7 +2115,7 @@ static int airo_start_xmit(struct sk_buff *skb, struct net_device *dev) {</div><div class='ctx'> 	u32 *fids = priv-&gt;fids;</div><div class='ctx'> </div><div class='ctx'> 	if ( skb == NULL ) {</div><div class='del'>-		airo_print_err(dev-&gt;name, "%s: skb == NULL!", __FUNCTION__);</div><div class='add'>+		airo_print_err(dev-&gt;name, "%s: skb == NULL!", __func__);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2186,7 +2186,7 @@ static int airo_start_xmit11(struct sk_buff *skb, struct net_device *dev) {</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if ( skb == NULL ) {</div><div class='del'>-		airo_print_err(dev-&gt;name, "%s: skb == NULL!", __FUNCTION__);</div><div class='add'>+		airo_print_err(dev-&gt;name, "%s: skb == NULL!", __func__);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -4127,7 +4127,7 @@ static int PC4500_writerid(struct airo_info *ai, u16 rid,</div><div class='ctx'> 		if (test_bit(FLAG_ENABLED, &amp;ai-&gt;flags) &amp;&amp; (RID_WEP_TEMP != rid))</div><div class='ctx'> 			airo_print_err(ai-&gt;dev-&gt;name,</div><div class='ctx'> 				"%s: MAC should be disabled (rid=%04x)",</div><div class='del'>-				__FUNCTION__, rid);</div><div class='add'>+				__func__, rid);</div><div class='ctx'> 		memset(&amp;cmd, 0, sizeof(cmd));</div><div class='ctx'> 		memset(&amp;rsp, 0, sizeof(rsp));</div><div class='ctx'> </div><div class='hunk'>@@ -4142,7 +4142,7 @@ static int PC4500_writerid(struct airo_info *ai, u16 rid,</div><div class='ctx'> 			&amp;ai-&gt;config_desc.rid_desc, sizeof(Rid));</div><div class='ctx'> </div><div class='ctx'> 		if (len &lt; 4 || len &gt; 2047) {</div><div class='del'>-			airo_print_err(ai-&gt;dev-&gt;name, "%s: len=%d", __FUNCTION__, len);</div><div class='add'>+			airo_print_err(ai-&gt;dev-&gt;name, "%s: len=%d", __func__, len);</div><div class='ctx'> 			rc = -1;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			memcpy((char *)ai-&gt;config_desc.virtual_host_addr,</div><div class='hunk'>@@ -4151,9 +4151,9 @@ static int PC4500_writerid(struct airo_info *ai, u16 rid,</div><div class='ctx'> 			rc = issuecommand(ai, &amp;cmd, &amp;rsp);</div><div class='ctx'> 			if ((rc &amp; 0xff00) != 0) {</div><div class='ctx'> 				airo_print_err(ai-&gt;dev-&gt;name, "%s: Write rid Error %d",</div><div class='del'>-						__FUNCTION__, rc);</div><div class='add'>+						__func__, rc);</div><div class='ctx'> 				airo_print_err(ai-&gt;dev-&gt;name, "%s: Cmd=%04x",</div><div class='del'>-						__FUNCTION__, cmd.cmd);</div><div class='add'>+						__func__, cmd.cmd);</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			if ((rsp.status &amp; 0x7f00))</div><div class='hunk'>@@ -7107,7 +7107,7 @@ static int airo_get_aplist(struct net_device *dev,</div><div class='ctx'>  */</div><div class='ctx'> static int airo_set_scan(struct net_device *dev,</div><div class='ctx'> 			 struct iw_request_info *info,</div><div class='del'>-			 struct iw_param *vwrq,</div><div class='add'>+			 struct iw_point *dwrq,</div><div class='ctx'> 			 char *extra)</div><div class='ctx'> {</div><div class='ctx'> 	struct airo_info *ai = dev-&gt;priv;</div><div class='head'>diff --git a/drivers/net/wireless/airo_cs.c b/drivers/net/wireless/airo_cs.c<br/>index f12355398fe7..27696c20f4c2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/airo_cs.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/airo_cs.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/airo_cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/airo_cs.c</a></div><div class='hunk'>@@ -147,7 +147,7 @@ static int airo_probe(struct pcmcia_device *p_dev)</div><div class='ctx'> 	DEBUG(0, "airo_attach()\n");</div><div class='ctx'> </div><div class='ctx'> 	/* Interrupt setup */</div><div class='del'>-	p_dev-&gt;irq.Attributes = IRQ_TYPE_EXCLUSIVE;</div><div class='add'>+	p_dev-&gt;irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;</div><div class='ctx'> 	p_dev-&gt;irq.IRQInfo1 = IRQ_LEVEL_ID;</div><div class='ctx'> 	p_dev-&gt;irq.Handler = NULL;</div><div class='ctx'> 	</div><div class='hunk'>@@ -206,126 +206,123 @@ static void airo_detach(struct pcmcia_device *link)</div><div class='ctx'> #define CS_CHECK(fn, ret) \</div><div class='ctx'> do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)</div><div class='ctx'> </div><div class='add'>+static int airo_cs_config_check(struct pcmcia_device *p_dev,</div><div class='add'>+				cistpl_cftable_entry_t *cfg,</div><div class='add'>+				cistpl_cftable_entry_t *dflt,</div><div class='add'>+				unsigned int vcc,</div><div class='add'>+				void *priv_data)</div><div class='add'>+{</div><div class='add'>+	win_req_t *req = priv_data;</div><div class='add'>+</div><div class='add'>+	if (cfg-&gt;index == 0)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	/* Does this card need audio output? */</div><div class='add'>+	if (cfg-&gt;flags &amp; CISTPL_CFTABLE_AUDIO) {</div><div class='add'>+		p_dev-&gt;conf.Attributes |= CONF_ENABLE_SPKR;</div><div class='add'>+		p_dev-&gt;conf.Status = CCSR_AUDIO_ENA;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Use power settings for Vcc and Vpp if present */</div><div class='add'>+	/*  Note that the CIS values need to be rescaled */</div><div class='add'>+	if (cfg-&gt;vpp1.present &amp; (1&lt;&lt;CISTPL_POWER_VNOM))</div><div class='add'>+		p_dev-&gt;conf.Vpp = cfg-&gt;vpp1.param[CISTPL_POWER_VNOM]/10000;</div><div class='add'>+	else if (dflt-&gt;vpp1.present &amp; (1&lt;&lt;CISTPL_POWER_VNOM))</div><div class='add'>+		p_dev-&gt;conf.Vpp = dflt-&gt;vpp1.param[CISTPL_POWER_VNOM]/10000;</div><div class='add'>+</div><div class='add'>+	/* Do we need to allocate an interrupt? */</div><div class='add'>+	if (cfg-&gt;irq.IRQInfo1 || dflt-&gt;irq.IRQInfo1)</div><div class='add'>+		p_dev-&gt;conf.Attributes |= CONF_ENABLE_IRQ;</div><div class='add'>+</div><div class='add'>+	/* IO window settings */</div><div class='add'>+	p_dev-&gt;io.NumPorts1 = p_dev-&gt;io.NumPorts2 = 0;</div><div class='add'>+	if ((cfg-&gt;io.nwin &gt; 0) || (dflt-&gt;io.nwin &gt; 0)) {</div><div class='add'>+		cistpl_io_t *io = (cfg-&gt;io.nwin) ? &amp;cfg-&gt;io : &amp;dflt-&gt;io;</div><div class='add'>+		p_dev-&gt;io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;</div><div class='add'>+		if (!(io-&gt;flags &amp; CISTPL_IO_8BIT))</div><div class='add'>+			p_dev-&gt;io.Attributes1 = IO_DATA_PATH_WIDTH_16;</div><div class='add'>+		if (!(io-&gt;flags &amp; CISTPL_IO_16BIT))</div><div class='add'>+			p_dev-&gt;io.Attributes1 = IO_DATA_PATH_WIDTH_8;</div><div class='add'>+		p_dev-&gt;io.BasePort1 = io-&gt;win[0].base;</div><div class='add'>+		p_dev-&gt;io.NumPorts1 = io-&gt;win[0].len;</div><div class='add'>+		if (io-&gt;nwin &gt; 1) {</div><div class='add'>+			p_dev-&gt;io.Attributes2 = p_dev-&gt;io.Attributes1;</div><div class='add'>+			p_dev-&gt;io.BasePort2 = io-&gt;win[1].base;</div><div class='add'>+			p_dev-&gt;io.NumPorts2 = io-&gt;win[1].len;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* This reserves IO space but doesn't actually enable it */</div><div class='add'>+	if (pcmcia_request_io(p_dev, &amp;p_dev-&gt;io) != 0)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	  Now set up a common memory window, if needed.  There is room</div><div class='add'>+	  in the struct pcmcia_device structure for one memory window handle,</div><div class='add'>+	  but if the base addresses need to be saved, or if multiple</div><div class='add'>+	  windows are needed, the info should go in the private data</div><div class='add'>+	  structure for this device.</div><div class='add'>+</div><div class='add'>+	  Note that the memory window base is a physical address, and</div><div class='add'>+	  needs to be mapped to virtual space with ioremap() before it</div><div class='add'>+	  is used.</div><div class='add'>+	*/</div><div class='add'>+	if ((cfg-&gt;mem.nwin &gt; 0) || (dflt-&gt;mem.nwin &gt; 0)) {</div><div class='add'>+		cistpl_mem_t *mem = (cfg-&gt;mem.nwin) ? &amp;cfg-&gt;mem : &amp;dflt-&gt;mem;</div><div class='add'>+		memreq_t map;</div><div class='add'>+		req-&gt;Attributes = WIN_DATA_WIDTH_16|WIN_MEMORY_TYPE_CM;</div><div class='add'>+		req-&gt;Base = mem-&gt;win[0].host_addr;</div><div class='add'>+		req-&gt;Size = mem-&gt;win[0].len;</div><div class='add'>+		req-&gt;AccessSpeed = 0;</div><div class='add'>+		if (pcmcia_request_window(&amp;p_dev, req, &amp;p_dev-&gt;win) != 0)</div><div class='add'>+			return -ENODEV;</div><div class='add'>+		map.Page = 0;</div><div class='add'>+		map.CardOffset = mem-&gt;win[0].card_addr;</div><div class='add'>+		if (pcmcia_map_mem_page(p_dev-&gt;win, &amp;map) != 0)</div><div class='add'>+			return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+	/* If we got this far, we're cool! */</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> static int airo_config(struct pcmcia_device *link)</div><div class='ctx'> {</div><div class='del'>-	tuple_t tuple;</div><div class='del'>-	cisparse_t parse;</div><div class='ctx'> 	local_info_t *dev;</div><div class='add'>+	win_req_t *req;</div><div class='ctx'> 	int last_fn, last_ret;</div><div class='del'>-	u_char buf[64];</div><div class='del'>-	win_req_t req;</div><div class='del'>-	memreq_t map;</div><div class='ctx'> </div><div class='ctx'> 	dev = link-&gt;priv;</div><div class='ctx'> </div><div class='ctx'> 	DEBUG(0, "airo_config(0x%p)\n", link);</div><div class='ctx'> </div><div class='add'>+	req = kzalloc(sizeof(win_req_t), GFP_KERNEL);</div><div class='add'>+	if (!req)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * In this loop, we scan the CIS for configuration table</div><div class='add'>+	 * entries, each of which describes a valid card</div><div class='add'>+	 * configuration, including voltage, IO window, memory window,</div><div class='add'>+	 * and interrupt settings.</div><div class='add'>+	 *</div><div class='add'>+	 * We make no assumptions about the card to be configured: we</div><div class='add'>+	 * use just the information available in the CIS.  In an ideal</div><div class='add'>+	 * world, this would work for any PCMCIA card, but it requires</div><div class='add'>+	 * a complete and accurate CIS.  In practice, a driver usually</div><div class='add'>+	 * "knows" most of these things without consulting the CIS,</div><div class='add'>+	 * and most client drivers will only use the CIS to fill in</div><div class='add'>+	 * implementation-defined details.</div><div class='add'>+	 */</div><div class='add'>+	last_ret = pcmcia_loop_config(link, airo_cs_config_check, req);</div><div class='add'>+	if (last_ret)</div><div class='add'>+		goto failed;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='del'>-	  In this loop, we scan the CIS for configuration table entries,</div><div class='del'>-	  each of which describes a valid card configuration, including</div><div class='del'>-	  voltage, IO window, memory window, and interrupt settings.</div><div class='del'>-	  </div><div class='del'>-	  We make no assumptions about the card to be configured: we use</div><div class='del'>-	  just the information available in the CIS.  In an ideal world,</div><div class='del'>-	  this would work for any PCMCIA card, but it requires a complete</div><div class='del'>-	  and accurate CIS.  In practice, a driver usually "knows" most of</div><div class='del'>-	  these things without consulting the CIS, and most client drivers</div><div class='del'>-	  will only use the CIS to fill in implementation-defined details.</div><div class='add'>+	  Allocate an interrupt line.  Note that this does not assign a</div><div class='add'>+	  handler to the interrupt, unless the 'Handler' member of the</div><div class='add'>+	  irq structure is initialized.</div><div class='ctx'> 	*/</div><div class='del'>-	tuple.Attributes = 0;</div><div class='del'>-	tuple.TupleData = buf;</div><div class='del'>-	tuple.TupleDataMax = sizeof(buf);</div><div class='del'>-	tuple.TupleOffset = 0;</div><div class='del'>-	tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;</div><div class='del'>-	CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &amp;tuple));</div><div class='del'>-	while (1) {</div><div class='del'>-		cistpl_cftable_entry_t dflt = { 0 };</div><div class='del'>-		cistpl_cftable_entry_t *cfg = &amp;(parse.cftable_entry);</div><div class='del'>-		if (pcmcia_get_tuple_data(link, &amp;tuple) != 0 ||</div><div class='del'>-				pcmcia_parse_tuple(link, &amp;tuple, &amp;parse) != 0)</div><div class='del'>-			goto next_entry;</div><div class='del'>-		</div><div class='del'>-		if (cfg-&gt;flags &amp; CISTPL_CFTABLE_DEFAULT) dflt = *cfg;</div><div class='del'>-		if (cfg-&gt;index == 0) goto next_entry;</div><div class='del'>-		link-&gt;conf.ConfigIndex = cfg-&gt;index;</div><div class='del'>-		</div><div class='del'>-		/* Does this card need audio output? */</div><div class='del'>-		if (cfg-&gt;flags &amp; CISTPL_CFTABLE_AUDIO) {</div><div class='del'>-			link-&gt;conf.Attributes |= CONF_ENABLE_SPKR;</div><div class='del'>-			link-&gt;conf.Status = CCSR_AUDIO_ENA;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		/* Use power settings for Vcc and Vpp if present */</div><div class='del'>-		/*  Note that the CIS values need to be rescaled */</div><div class='del'>-		if (cfg-&gt;vpp1.present &amp; (1&lt;&lt;CISTPL_POWER_VNOM))</div><div class='del'>-			link-&gt;conf.Vpp =</div><div class='del'>-				cfg-&gt;vpp1.param[CISTPL_POWER_VNOM]/10000;</div><div class='del'>-		else if (dflt.vpp1.present &amp; (1&lt;&lt;CISTPL_POWER_VNOM))</div><div class='del'>-			link-&gt;conf.Vpp =</div><div class='del'>-				dflt.vpp1.param[CISTPL_POWER_VNOM]/10000;</div><div class='del'>-		</div><div class='del'>-		/* Do we need to allocate an interrupt? */</div><div class='del'>-		if (cfg-&gt;irq.IRQInfo1 || dflt.irq.IRQInfo1)</div><div class='del'>-			link-&gt;conf.Attributes |= CONF_ENABLE_IRQ;</div><div class='del'>-		</div><div class='del'>-		/* IO window settings */</div><div class='del'>-		link-&gt;io.NumPorts1 = link-&gt;io.NumPorts2 = 0;</div><div class='del'>-		if ((cfg-&gt;io.nwin &gt; 0) || (dflt.io.nwin &gt; 0)) {</div><div class='del'>-			cistpl_io_t *io = (cfg-&gt;io.nwin) ? &amp;cfg-&gt;io : &amp;dflt.io;</div><div class='del'>-			link-&gt;io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;</div><div class='del'>-			if (!(io-&gt;flags &amp; CISTPL_IO_8BIT))</div><div class='del'>-				link-&gt;io.Attributes1 = IO_DATA_PATH_WIDTH_16;</div><div class='del'>-			if (!(io-&gt;flags &amp; CISTPL_IO_16BIT))</div><div class='del'>-				link-&gt;io.Attributes1 = IO_DATA_PATH_WIDTH_8;</div><div class='del'>-			link-&gt;io.BasePort1 = io-&gt;win[0].base;</div><div class='del'>-			link-&gt;io.NumPorts1 = io-&gt;win[0].len;</div><div class='del'>-			if (io-&gt;nwin &gt; 1) {</div><div class='del'>-				link-&gt;io.Attributes2 = link-&gt;io.Attributes1;</div><div class='del'>-				link-&gt;io.BasePort2 = io-&gt;win[1].base;</div><div class='del'>-				link-&gt;io.NumPorts2 = io-&gt;win[1].len;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		/* This reserves IO space but doesn't actually enable it */</div><div class='del'>-		if (pcmcia_request_io(link, &amp;link-&gt;io) != 0)</div><div class='del'>-			goto next_entry;</div><div class='del'>-		</div><div class='del'>-		/*</div><div class='del'>-		  Now set up a common memory window, if needed.  There is room</div><div class='del'>-		  in the struct pcmcia_device structure for one memory window handle,</div><div class='del'>-		  but if the base addresses need to be saved, or if multiple</div><div class='del'>-		  windows are needed, the info should go in the private data</div><div class='del'>-		  structure for this device.</div><div class='del'>-		  </div><div class='del'>-		  Note that the memory window base is a physical address, and</div><div class='del'>-		  needs to be mapped to virtual space with ioremap() before it</div><div class='del'>-		  is used.</div><div class='del'>-		*/</div><div class='del'>-		if ((cfg-&gt;mem.nwin &gt; 0) || (dflt.mem.nwin &gt; 0)) {</div><div class='del'>-			cistpl_mem_t *mem =</div><div class='del'>-				(cfg-&gt;mem.nwin) ? &amp;cfg-&gt;mem : &amp;dflt.mem;</div><div class='del'>-			req.Attributes = WIN_DATA_WIDTH_16|WIN_MEMORY_TYPE_CM;</div><div class='del'>-			req.Base = mem-&gt;win[0].host_addr;</div><div class='del'>-			req.Size = mem-&gt;win[0].len;</div><div class='del'>-			req.AccessSpeed = 0;</div><div class='del'>-			if (pcmcia_request_window(&amp;link, &amp;req, &amp;link-&gt;win) != 0)</div><div class='del'>-				goto next_entry;</div><div class='del'>-			map.Page = 0; map.CardOffset = mem-&gt;win[0].card_addr;</div><div class='del'>-			if (pcmcia_map_mem_page(link-&gt;win, &amp;map) != 0)</div><div class='del'>-				goto next_entry;</div><div class='del'>-		}</div><div class='del'>-		/* If we got this far, we're cool! */</div><div class='del'>-		break;</div><div class='del'>-		</div><div class='del'>-	next_entry:</div><div class='del'>-		CS_CHECK(GetNextTuple, pcmcia_get_next_tuple(link, &amp;tuple));</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-    /*</div><div class='del'>-      Allocate an interrupt line.  Note that this does not assign a</div><div class='del'>-      handler to the interrupt, unless the 'Handler' member of the</div><div class='del'>-      irq structure is initialized.</div><div class='del'>-    */</div><div class='ctx'> 	if (link-&gt;conf.Attributes &amp; CONF_ENABLE_IRQ)</div><div class='ctx'> 		CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &amp;link-&gt;irq));</div><div class='ctx'> 	</div><div class='hunk'>@@ -362,14 +359,17 @@ static int airo_config(struct pcmcia_device *link)</div><div class='ctx'> 		printk(" &amp; 0x%04x-0x%04x", link-&gt;io.BasePort2,</div><div class='ctx'> 		       link-&gt;io.BasePort2+link-&gt;io.NumPorts2-1);</div><div class='ctx'> 	if (link-&gt;win)</div><div class='del'>-		printk(", mem 0x%06lx-0x%06lx", req.Base,</div><div class='del'>-		       req.Base+req.Size-1);</div><div class='add'>+		printk(", mem 0x%06lx-0x%06lx", req-&gt;Base,</div><div class='add'>+		       req-&gt;Base+req-&gt;Size-1);</div><div class='ctx'> 	printk("\n");</div><div class='add'>+	kfree(req);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'>  cs_failed:</div><div class='ctx'> 	cs_error(link, last_fn, last_ret);</div><div class='add'>+ failed:</div><div class='ctx'> 	airo_release(link);</div><div class='add'>+	kfree(req);</div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'> } /* airo_config */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/airport.c b/drivers/net/wireless/airport.c<br/>index 6f7eb9f59223..ce03a2e865fa 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/airport.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/airport.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/airport.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/airport.c</a></div><div class='hunk'>@@ -180,7 +180,8 @@ airport_attach(struct macio_dev *mdev, const struct of_device_id *match)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate space for private device-specific data */</div><div class='del'>-	dev = alloc_orinocodev(sizeof(*card), airport_hard_reset);</div><div class='add'>+	dev = alloc_orinocodev(sizeof(*card), &amp;mdev-&gt;ofdev.dev,</div><div class='add'>+			       airport_hard_reset, NULL);</div><div class='ctx'> 	if (! dev) {</div><div class='ctx'> 		printk(KERN_ERR PFX "Cannot allocate network device\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='head'>diff --git a/drivers/net/wireless/ath5k/Makefile b/drivers/net/wireless/ath5k/Makefile<br/>index 564ecd0c5d4b..719cfaef7085 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/ath5k/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/ath5k/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/ath5k/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/ath5k/Makefile</a></div><div class='hunk'>@@ -1,6 +1,14 @@</div><div class='del'>-ath5k-y				+= base.o</div><div class='del'>-ath5k-y				+= hw.o</div><div class='add'>+ath5k-y				+= caps.o</div><div class='ctx'> ath5k-y				+= initvals.o</div><div class='add'>+ath5k-y				+= eeprom.o</div><div class='add'>+ath5k-y				+= gpio.o</div><div class='add'>+ath5k-y				+= desc.o</div><div class='add'>+ath5k-y				+= dma.o</div><div class='add'>+ath5k-y				+= qcu.o</div><div class='add'>+ath5k-y				+= pcu.o</div><div class='ctx'> ath5k-y				+= phy.o</div><div class='add'>+ath5k-y				+= reset.o</div><div class='add'>+ath5k-y				+= attach.o</div><div class='add'>+ath5k-y				+= base.o</div><div class='ctx'> ath5k-$(CONFIG_ATH5K_DEBUG)	+= debug.o</div><div class='ctx'> obj-$(CONFIG_ATH5K)		+= ath5k.o</div><div class='head'>diff --git a/drivers/net/wireless/ath5k/ath5k.h b/drivers/net/wireless/ath5k/ath5k.h<br/>index 9102eea3c8bf..53ea439aff48 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/ath5k/ath5k.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/ath5k/ath5k.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/ath5k/ath5k.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/ath5k/ath5k.h</a></div><div class='hunk'>@@ -18,18 +18,23 @@</div><div class='ctx'> #ifndef _ATH5K_H</div><div class='ctx'> #define _ATH5K_H</div><div class='ctx'> </div><div class='del'>-/* Set this to 1 to disable regulatory domain restrictions for channel tests.</div><div class='del'>- * WARNING: This is for debuging only and has side effects (eg. scan takes too</div><div class='del'>- * long and results timeouts). It's also illegal to tune to some of the</div><div class='del'>- * supported frequencies in some countries, so use this at your own risk,</div><div class='del'>- * you've been warned. */</div><div class='add'>+/* TODO: Clean up channel debuging -doesn't work anyway- and start</div><div class='add'>+ * working on reg. control code using all available eeprom information</div><div class='add'>+ * -rev. engineering needed- */</div><div class='ctx'> #define CHAN_DEBUG	0</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;net/mac80211.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "hw.h"</div><div class='add'>+/* RX/TX descriptor hw structs</div><div class='add'>+ * TODO: Driver part should only see sw structs */</div><div class='add'>+#include "desc.h"</div><div class='add'>+</div><div class='add'>+/* EEPROM structs/offsets</div><div class='add'>+ * TODO: Make a more generic struct (eg. add more stuff to ath5k_capabilities)</div><div class='add'>+ * and clean up common bits, then introduce set/get functions in eeprom.c */</div><div class='add'>+#include "eeprom.h"</div><div class='ctx'> </div><div class='ctx'> /* PCI IDs */</div><div class='ctx'> #define PCI_DEVICE_ID_ATHEROS_AR5210 		0x0007 /* AR5210 */</div><div class='hunk'>@@ -87,7 +92,92 @@</div><div class='ctx'> 	ATH5K_PRINTK_LIMIT(_sc, KERN_ERR, _fmt, ##__VA_ARGS__)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * AR5K REGISTER ACCESS</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* Some macros to read/write fields */</div><div class='add'>+</div><div class='add'>+/* First shift, then mask */</div><div class='add'>+#define AR5K_REG_SM(_val, _flags)					\</div><div class='add'>+	(((_val) &lt;&lt; _flags##_S) &amp; (_flags))</div><div class='add'>+</div><div class='add'>+/* First mask, then shift */</div><div class='add'>+#define AR5K_REG_MS(_val, _flags)					\</div><div class='add'>+	(((_val) &amp; (_flags)) &gt;&gt; _flags##_S)</div><div class='add'>+</div><div class='add'>+/* Some registers can hold multiple values of interest. For this</div><div class='add'>+ * reason when we want to write to these registers we must first</div><div class='add'>+ * retrieve the values which we do not want to clear (lets call this</div><div class='add'>+ * old_data) and then set the register with this and our new_value:</div><div class='add'>+ * ( old_data | new_value) */</div><div class='add'>+#define AR5K_REG_WRITE_BITS(ah, _reg, _flags, _val)			\</div><div class='add'>+	ath5k_hw_reg_write(ah, (ath5k_hw_reg_read(ah, _reg) &amp; ~(_flags)) | \</div><div class='add'>+	    (((_val) &lt;&lt; _flags##_S) &amp; (_flags)), _reg)</div><div class='add'>+</div><div class='add'>+#define AR5K_REG_MASKED_BITS(ah, _reg, _flags, _mask)			\</div><div class='add'>+	ath5k_hw_reg_write(ah, (ath5k_hw_reg_read(ah, _reg) &amp;		\</div><div class='add'>+			(_mask)) | (_flags), _reg)</div><div class='add'>+</div><div class='add'>+#define AR5K_REG_ENABLE_BITS(ah, _reg, _flags)				\</div><div class='add'>+	ath5k_hw_reg_write(ah, ath5k_hw_reg_read(ah, _reg) | (_flags), _reg)</div><div class='add'>+</div><div class='add'>+#define AR5K_REG_DISABLE_BITS(ah, _reg, _flags)			\</div><div class='add'>+	ath5k_hw_reg_write(ah, ath5k_hw_reg_read(ah, _reg) &amp; ~(_flags), _reg)</div><div class='add'>+</div><div class='add'>+/* Access to PHY registers */</div><div class='add'>+#define AR5K_PHY_READ(ah, _reg)					\</div><div class='add'>+	ath5k_hw_reg_read(ah, (ah)-&gt;ah_phy + ((_reg) &lt;&lt; 2))</div><div class='add'>+</div><div class='add'>+#define AR5K_PHY_WRITE(ah, _reg, _val)					\</div><div class='add'>+	ath5k_hw_reg_write(ah, _val, (ah)-&gt;ah_phy + ((_reg) &lt;&lt; 2))</div><div class='add'>+</div><div class='add'>+/* Access QCU registers per queue */</div><div class='add'>+#define AR5K_REG_READ_Q(ah, _reg, _queue)				\</div><div class='add'>+	(ath5k_hw_reg_read(ah, _reg) &amp; (1 &lt;&lt; _queue))			\</div><div class='add'>+</div><div class='add'>+#define AR5K_REG_WRITE_Q(ah, _reg, _queue)				\</div><div class='add'>+	ath5k_hw_reg_write(ah, (1 &lt;&lt; _queue), _reg)</div><div class='add'>+</div><div class='add'>+#define AR5K_Q_ENABLE_BITS(_reg, _queue) do {				\</div><div class='add'>+	_reg |= 1 &lt;&lt; _queue;						\</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define AR5K_Q_DISABLE_BITS(_reg, _queue) do {				\</div><div class='add'>+	_reg &amp;= ~(1 &lt;&lt; _queue);						\</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+/* Used while writing initvals */</div><div class='add'>+#define AR5K_REG_WAIT(_i) do {						\</div><div class='add'>+	if (_i % 64)							\</div><div class='add'>+		udelay(1);						\</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+/* Register dumps are done per operation mode */</div><div class='add'>+#define AR5K_INI_RFGAIN_5GHZ		0</div><div class='add'>+#define AR5K_INI_RFGAIN_2GHZ		1</div><div class='add'>+</div><div class='add'>+/* TODO: Clean this up */</div><div class='add'>+#define AR5K_INI_VAL_11A		0</div><div class='add'>+#define AR5K_INI_VAL_11A_TURBO		1</div><div class='add'>+#define AR5K_INI_VAL_11B		2</div><div class='add'>+#define AR5K_INI_VAL_11G		3</div><div class='add'>+#define AR5K_INI_VAL_11G_TURBO		4</div><div class='add'>+#define AR5K_INI_VAL_XR			0</div><div class='add'>+#define AR5K_INI_VAL_MAX		5</div><div class='add'>+</div><div class='add'>+#define AR5K_RF5111_INI_RF_MAX_BANKS	AR5K_MAX_RF_BANKS</div><div class='add'>+#define AR5K_RF5112_INI_RF_MAX_BANKS	AR5K_MAX_RF_BANKS</div><div class='add'>+</div><div class='add'>+/* Used for BSSID etc manipulation */</div><div class='add'>+#define AR5K_LOW_ID(_a)(				\</div><div class='add'>+(_a)[0] | (_a)[1] &lt;&lt; 8 | (_a)[2] &lt;&lt; 16 | (_a)[3] &lt;&lt; 24	\</div><div class='add'>+)</div><div class='add'>+</div><div class='add'>+#define AR5K_HIGH_ID(_a)	((_a)[4] | (_a)[5] &lt;&lt; 8)</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Some tuneable values (these should be changeable by the user)</div><div class='add'>+ * TODO: Make use of them and add more options OR use debug/configfs</div><div class='ctx'>  */</div><div class='ctx'> #define AR5K_TUNE_DMA_BEACON_RESP		2</div><div class='ctx'> #define AR5K_TUNE_SW_BEACON_RESP		10</div><div class='hunk'>@@ -98,13 +188,13 @@</div><div class='ctx'> #define AR5K_TUNE_REGISTER_TIMEOUT		20000</div><div class='ctx'> /* Register for RSSI threshold has a mask of 0xff, so 255 seems to</div><div class='ctx'>  * be the max value. */</div><div class='del'>-#define AR5K_TUNE_RSSI_THRES                   129</div><div class='add'>+#define AR5K_TUNE_RSSI_THRES			129</div><div class='ctx'> /* This must be set when setting the RSSI threshold otherwise it can</div><div class='ctx'>  * prevent a reset. If AR5K_RSSI_THR is read after writing to it</div><div class='ctx'>  * the BMISS_THRES will be seen as 0, seems harware doesn't keep</div><div class='ctx'>  * track of it. Max value depends on harware. For AR5210 this is just 7.</div><div class='ctx'>  * For AR5211+ this seems to be up to 255. */</div><div class='del'>-#define AR5K_TUNE_BMISS_THRES                  7</div><div class='add'>+#define AR5K_TUNE_BMISS_THRES			7</div><div class='ctx'> #define AR5K_TUNE_REGISTER_DWELL_TIME		20000</div><div class='ctx'> #define AR5K_TUNE_BEACON_INTERVAL		100</div><div class='ctx'> #define AR5K_TUNE_AIFS				2</div><div class='hunk'>@@ -123,6 +213,55 @@</div><div class='ctx'> #define AR5K_TUNE_ANT_DIVERSITY			true</div><div class='ctx'> #define AR5K_TUNE_HWTXTRIES			4</div><div class='ctx'> </div><div class='add'>+#define AR5K_INIT_CARR_SENSE_EN			1</div><div class='add'>+</div><div class='add'>+/*Swap RX/TX Descriptor for big endian archs*/</div><div class='add'>+#if defined(__BIG_ENDIAN)</div><div class='add'>+#define AR5K_INIT_CFG	(		\</div><div class='add'>+	AR5K_CFG_SWTD | AR5K_CFG_SWRD	\</div><div class='add'>+)</div><div class='add'>+#else</div><div class='add'>+#define AR5K_INIT_CFG	0x00000000</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* Initial values */</div><div class='add'>+#define AR5K_INIT_TX_LATENCY			502</div><div class='add'>+#define AR5K_INIT_USEC				39</div><div class='add'>+#define AR5K_INIT_USEC_TURBO			79</div><div class='add'>+#define AR5K_INIT_USEC_32			31</div><div class='add'>+#define AR5K_INIT_SLOT_TIME			396</div><div class='add'>+#define AR5K_INIT_SLOT_TIME_TURBO		480</div><div class='add'>+#define AR5K_INIT_ACK_CTS_TIMEOUT		1024</div><div class='add'>+#define AR5K_INIT_ACK_CTS_TIMEOUT_TURBO		0x08000800</div><div class='add'>+#define AR5K_INIT_PROG_IFS			920</div><div class='add'>+#define AR5K_INIT_PROG_IFS_TURBO		960</div><div class='add'>+#define AR5K_INIT_EIFS				3440</div><div class='add'>+#define AR5K_INIT_EIFS_TURBO			6880</div><div class='add'>+#define AR5K_INIT_SIFS				560</div><div class='add'>+#define AR5K_INIT_SIFS_TURBO			480</div><div class='add'>+#define AR5K_INIT_SH_RETRY			10</div><div class='add'>+#define AR5K_INIT_LG_RETRY			AR5K_INIT_SH_RETRY</div><div class='add'>+#define AR5K_INIT_SSH_RETRY			32</div><div class='add'>+#define AR5K_INIT_SLG_RETRY			AR5K_INIT_SSH_RETRY</div><div class='add'>+#define AR5K_INIT_TX_RETRY			10</div><div class='add'>+</div><div class='add'>+#define AR5K_INIT_TRANSMIT_LATENCY		(			\</div><div class='add'>+	(AR5K_INIT_TX_LATENCY &lt;&lt; 14) | (AR5K_INIT_USEC_32 &lt;&lt; 7) |	\</div><div class='add'>+	(AR5K_INIT_USEC)						\</div><div class='add'>+)</div><div class='add'>+#define AR5K_INIT_TRANSMIT_LATENCY_TURBO	(			\</div><div class='add'>+	(AR5K_INIT_TX_LATENCY &lt;&lt; 14) | (AR5K_INIT_USEC_32 &lt;&lt; 7) |	\</div><div class='add'>+	(AR5K_INIT_USEC_TURBO)						\</div><div class='add'>+)</div><div class='add'>+#define AR5K_INIT_PROTO_TIME_CNTRL		(			\</div><div class='add'>+	(AR5K_INIT_CARR_SENSE_EN &lt;&lt; 26) | (AR5K_INIT_EIFS &lt;&lt; 12) |	\</div><div class='add'>+	(AR5K_INIT_PROG_IFS)						\</div><div class='add'>+)</div><div class='add'>+#define AR5K_INIT_PROTO_TIME_CNTRL_TURBO	(			\</div><div class='add'>+	(AR5K_INIT_CARR_SENSE_EN &lt;&lt; 26) | (AR5K_INIT_EIFS_TURBO &lt;&lt; 12) | \</div><div class='add'>+	(AR5K_INIT_PROG_IFS_TURBO)					\</div><div class='add'>+)</div><div class='add'>+</div><div class='ctx'> /* token to use for aifs, cwmin, cwmax in MadWiFi */</div><div class='ctx'> #define	AR5K_TXQ_USEDEFAULT	((u32) -1)</div><div class='ctx'> </div><div class='hunk'>@@ -142,7 +281,9 @@ enum ath5k_radio {</div><div class='ctx'> 	AR5K_RF5112	= 2,</div><div class='ctx'> 	AR5K_RF2413	= 3,</div><div class='ctx'> 	AR5K_RF5413	= 4,</div><div class='del'>-	AR5K_RF2425	= 5,</div><div class='add'>+	AR5K_RF2316	= 5,</div><div class='add'>+	AR5K_RF2317	= 6,</div><div class='add'>+	AR5K_RF2425	= 7,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -150,7 +291,7 @@ enum ath5k_radio {</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> enum ath5k_srev_type {</div><div class='del'>-	AR5K_VERSION_VER,</div><div class='add'>+	AR5K_VERSION_MAC,</div><div class='ctx'> 	AR5K_VERSION_RAD,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -162,23 +303,24 @@ struct ath5k_srev_name {</div><div class='ctx'> </div><div class='ctx'> #define AR5K_SREV_UNKNOWN	0xffff</div><div class='ctx'> </div><div class='del'>-#define AR5K_SREV_VER_AR5210	0x00</div><div class='del'>-#define AR5K_SREV_VER_AR5311	0x10</div><div class='del'>-#define AR5K_SREV_VER_AR5311A	0x20</div><div class='del'>-#define AR5K_SREV_VER_AR5311B	0x30</div><div class='del'>-#define AR5K_SREV_VER_AR5211	0x40</div><div class='del'>-#define AR5K_SREV_VER_AR5212	0x50</div><div class='del'>-#define AR5K_SREV_VER_AR5213	0x55</div><div class='del'>-#define AR5K_SREV_VER_AR5213A	0x59</div><div class='del'>-#define AR5K_SREV_VER_AR2413	0x78</div><div class='del'>-#define AR5K_SREV_VER_AR2414	0x79</div><div class='del'>-#define AR5K_SREV_VER_AR2424	0xa0 /* PCI-E */</div><div class='del'>-#define AR5K_SREV_VER_AR5424	0xa3 /* PCI-E */</div><div class='del'>-#define AR5K_SREV_VER_AR5413	0xa4</div><div class='del'>-#define AR5K_SREV_VER_AR5414	0xa5</div><div class='del'>-#define AR5K_SREV_VER_AR5416	0xc0 /* PCI-E */</div><div class='del'>-#define AR5K_SREV_VER_AR5418	0xca /* PCI-E */</div><div class='del'>-#define AR5K_SREV_VER_AR2425	0xe2 /* PCI-E */</div><div class='add'>+#define AR5K_SREV_AR5210	0x00 /* Crete */</div><div class='add'>+#define AR5K_SREV_AR5311	0x10 /* Maui 1 */</div><div class='add'>+#define AR5K_SREV_AR5311A	0x20 /* Maui 2 */</div><div class='add'>+#define AR5K_SREV_AR5311B	0x30 /* Spirit */</div><div class='add'>+#define AR5K_SREV_AR5211	0x40 /* Oahu */</div><div class='add'>+#define AR5K_SREV_AR5212	0x50 /* Venice */</div><div class='add'>+#define AR5K_SREV_AR5213	0x55 /* ??? */</div><div class='add'>+#define AR5K_SREV_AR5213A	0x59 /* Hainan */</div><div class='add'>+#define AR5K_SREV_AR2413	0x78 /* Griffin lite */</div><div class='add'>+#define AR5K_SREV_AR2414	0x70 /* Griffin */</div><div class='add'>+#define AR5K_SREV_AR5424	0x90 /* Condor */</div><div class='add'>+#define AR5K_SREV_AR5413	0xa4 /* Eagle lite */</div><div class='add'>+#define AR5K_SREV_AR5414	0xa0 /* Eagle */</div><div class='add'>+#define AR5K_SREV_AR2415	0xb0 /* Cobra */</div><div class='add'>+#define AR5K_SREV_AR5416	0xc0 /* PCI-E */</div><div class='add'>+#define AR5K_SREV_AR5418	0xca /* PCI-E */</div><div class='add'>+#define AR5K_SREV_AR2425	0xe0 /* Swan */</div><div class='add'>+#define AR5K_SREV_AR2417	0xf0 /* Nala */</div><div class='ctx'> </div><div class='ctx'> #define AR5K_SREV_RAD_5110	0x00</div><div class='ctx'> #define AR5K_SREV_RAD_5111	0x10</div><div class='hunk'>@@ -190,13 +332,22 @@ struct ath5k_srev_name {</div><div class='ctx'> #define AR5K_SREV_RAD_2112	0x40</div><div class='ctx'> #define AR5K_SREV_RAD_2112A	0x45</div><div class='ctx'> #define	AR5K_SREV_RAD_2112B	0x46</div><div class='del'>-#define AR5K_SREV_RAD_SC0	0x50	/* Found on 2413/2414 */</div><div class='del'>-#define AR5K_SREV_RAD_SC1	0x60	/* Found on 5413/5414 */</div><div class='del'>-#define AR5K_SREV_RAD_SC2	0xa0	/* Found on 2424-5/5424 */</div><div class='del'>-#define AR5K_SREV_RAD_5133	0xc0	/* MIMO found on 5418 */</div><div class='add'>+#define AR5K_SREV_RAD_2413	0x50</div><div class='add'>+#define AR5K_SREV_RAD_5413	0x60</div><div class='add'>+#define AR5K_SREV_RAD_2316	0x70</div><div class='add'>+#define AR5K_SREV_RAD_2317	0x80</div><div class='add'>+#define AR5K_SREV_RAD_5424	0xa0 /* Mostly same as 5413 */</div><div class='add'>+#define AR5K_SREV_RAD_2425	0xa2</div><div class='add'>+#define AR5K_SREV_RAD_5133	0xc0</div><div class='add'>+</div><div class='add'>+#define AR5K_SREV_PHY_5211	0x30</div><div class='add'>+#define AR5K_SREV_PHY_5212	0x41</div><div class='add'>+#define AR5K_SREV_PHY_2112B	0x43</div><div class='add'>+#define AR5K_SREV_PHY_2413	0x45</div><div class='add'>+#define AR5K_SREV_PHY_5413	0x61</div><div class='add'>+#define AR5K_SREV_PHY_2425	0x70</div><div class='ctx'> </div><div class='ctx'> /* IEEE defs */</div><div class='del'>-</div><div class='ctx'> #define IEEE80211_MAX_LEN       2500</div><div class='ctx'> </div><div class='ctx'> /* TODO add support to mac80211 for vendor-specific rates and modes */</div><div class='hunk'>@@ -268,27 +419,21 @@ enum ath5k_driver_mode {</div><div class='ctx'> 	AR5K_MODE_MAX		=	5</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* adding this flag to rate_code enables short preamble, see ar5212_reg.h */</div><div class='del'>-#define AR5K_SET_SHORT_PREAMBLE 0x04</div><div class='del'>-</div><div class='del'>-#define HAS_SHPREAMBLE(_ix) \</div><div class='del'>-	(rt-&gt;rates[_ix].modulation == IEEE80211_RATE_SHORT_PREAMBLE)</div><div class='del'>-#define SHPREAMBLE_FLAG(_ix) \</div><div class='del'>-	(HAS_SHPREAMBLE(_ix) ? AR5K_SET_SHORT_PREAMBLE : 0)</div><div class='del'>-</div><div class='ctx'> </div><div class='ctx'> /****************\</div><div class='ctx'>   TX DEFINITIONS</div><div class='ctx'> \****************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * TX Status</div><div class='add'>+ * TX Status descriptor</div><div class='ctx'>  */</div><div class='ctx'> struct ath5k_tx_status {</div><div class='ctx'> 	u16	ts_seqnum;</div><div class='ctx'> 	u16	ts_tstamp;</div><div class='ctx'> 	u8	ts_status;</div><div class='del'>-	u8	ts_rate;</div><div class='add'>+	u8	ts_rate[4];</div><div class='add'>+	u8	ts_retry[4];</div><div class='add'>+	u8	ts_final_idx;</div><div class='ctx'> 	s8	ts_rssi;</div><div class='ctx'> 	u8	ts_shortretry;</div><div class='ctx'> 	u8	ts_longretry;</div><div class='hunk'>@@ -354,7 +499,6 @@ enum ath5k_tx_queue_id {</div><div class='ctx'> 	AR5K_TX_QUEUE_ID_XR_DATA	= 9,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Flags to set hw queue's parameters...</div><div class='ctx'>  */</div><div class='hunk'>@@ -387,7 +531,8 @@ struct ath5k_txq_info {</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Transmit packet types.</div><div class='del'>- * These are not fully used inside OpenHAL yet</div><div class='add'>+ * used on tx control descriptor</div><div class='add'>+ * TODO: Use them inside base.c corectly</div><div class='ctx'>  */</div><div class='ctx'> enum ath5k_pkt_type {</div><div class='ctx'> 	AR5K_PKT_TYPE_NORMAL		= 0,</div><div class='hunk'>@@ -430,7 +575,7 @@ enum ath5k_dmasize {</div><div class='ctx'> \****************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * RX Status</div><div class='add'>+ * RX Status descriptor</div><div class='ctx'>  */</div><div class='ctx'> struct ath5k_rx_status {</div><div class='ctx'> 	u16	rs_datalen;</div><div class='hunk'>@@ -494,34 +639,59 @@ struct ath5k_beacon_state {</div><div class='ctx'> #define TSF_TO_TU(_tsf) (u32)((_tsf) &gt;&gt; 10)</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+/*******************************\</div><div class='add'>+  GAIN OPTIMIZATION DEFINITIONS</div><div class='add'>+\*******************************/</div><div class='add'>+</div><div class='add'>+enum ath5k_rfgain {</div><div class='add'>+	AR5K_RFGAIN_INACTIVE = 0,</div><div class='add'>+	AR5K_RFGAIN_READ_REQUESTED,</div><div class='add'>+	AR5K_RFGAIN_NEED_CHANGE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define AR5K_GAIN_CRN_FIX_BITS_5111		4</div><div class='add'>+#define AR5K_GAIN_CRN_FIX_BITS_5112		7</div><div class='add'>+#define AR5K_GAIN_CRN_MAX_FIX_BITS		AR5K_GAIN_CRN_FIX_BITS_5112</div><div class='add'>+#define AR5K_GAIN_DYN_ADJUST_HI_MARGIN		15</div><div class='add'>+#define AR5K_GAIN_DYN_ADJUST_LO_MARGIN		20</div><div class='add'>+#define AR5K_GAIN_CCK_PROBE_CORR		5</div><div class='add'>+#define AR5K_GAIN_CCK_OFDM_GAIN_DELTA		15</div><div class='add'>+#define AR5K_GAIN_STEP_COUNT			10</div><div class='add'>+#define AR5K_GAIN_PARAM_TX_CLIP			0</div><div class='add'>+#define AR5K_GAIN_PARAM_PD_90			1</div><div class='add'>+#define AR5K_GAIN_PARAM_PD_84			2</div><div class='add'>+#define AR5K_GAIN_PARAM_GAIN_SEL		3</div><div class='add'>+#define AR5K_GAIN_PARAM_MIX_ORN			0</div><div class='add'>+#define AR5K_GAIN_PARAM_PD_138			1</div><div class='add'>+#define AR5K_GAIN_PARAM_PD_137			2</div><div class='add'>+#define AR5K_GAIN_PARAM_PD_136			3</div><div class='add'>+#define AR5K_GAIN_PARAM_PD_132			4</div><div class='add'>+#define AR5K_GAIN_PARAM_PD_131			5</div><div class='add'>+#define AR5K_GAIN_PARAM_PD_130			6</div><div class='add'>+#define AR5K_GAIN_CHECK_ADJUST(_g) 		\</div><div class='add'>+	((_g)-&gt;g_current &lt;= (_g)-&gt;g_low || (_g)-&gt;g_current &gt;= (_g)-&gt;g_high)</div><div class='add'>+</div><div class='add'>+struct ath5k_gain_opt_step {</div><div class='add'>+	s16				gos_param[AR5K_GAIN_CRN_MAX_FIX_BITS];</div><div class='add'>+	s32				gos_gain;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath5k_gain {</div><div class='add'>+	u32			g_step_idx;</div><div class='add'>+	u32			g_current;</div><div class='add'>+	u32			g_target;</div><div class='add'>+	u32			g_low;</div><div class='add'>+	u32			g_high;</div><div class='add'>+	u32			g_f_corr;</div><div class='add'>+	u32			g_active;</div><div class='add'>+	const struct ath5k_gain_opt_step	*g_step;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> /********************\</div><div class='ctx'>   COMMON DEFINITIONS</div><div class='ctx'> \********************/</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Atheros hardware descriptor</div><div class='del'>- * This is read and written to by the hardware</div><div class='del'>- */</div><div class='del'>-struct ath5k_desc {</div><div class='del'>-	u32	ds_link;	/* physical address of the next descriptor */</div><div class='del'>-	u32	ds_data;	/* physical address of data buffer (skb) */</div><div class='del'>-</div><div class='del'>-	union {</div><div class='del'>-		struct ath5k_hw_5210_tx_desc	ds_tx5210;</div><div class='del'>-		struct ath5k_hw_5212_tx_desc	ds_tx5212;</div><div class='del'>-		struct ath5k_hw_all_rx_desc	ds_rx;</div><div class='del'>-	} ud;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-#define AR5K_RXDESC_INTREQ	0x0020</div><div class='del'>-</div><div class='del'>-#define AR5K_TXDESC_CLRDMASK	0x0001</div><div class='del'>-#define AR5K_TXDESC_NOACK	0x0002	/*[5211+]*/</div><div class='del'>-#define AR5K_TXDESC_RTSENA	0x0004</div><div class='del'>-#define AR5K_TXDESC_CTSENA	0x0008</div><div class='del'>-#define AR5K_TXDESC_INTREQ	0x0010</div><div class='del'>-#define AR5K_TXDESC_VEOL	0x0020	/*[5211+]*/</div><div class='del'>-</div><div class='ctx'> #define AR5K_SLOT_TIME_9	396</div><div class='ctx'> #define AR5K_SLOT_TIME_20	880</div><div class='ctx'> #define AR5K_SLOT_TIME_MAX	0xffff</div><div class='hunk'>@@ -553,167 +723,79 @@ struct ath5k_desc {</div><div class='ctx'> #define CHANNEL_MODES		CHANNEL_ALL</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Used internaly in OpenHAL (ar5211.c/ar5212.c</div><div class='del'>- * for reset_tx_queue). Also see struct struct ieee80211_channel.</div><div class='add'>+ * Used internaly for reset_tx_queue).</div><div class='add'>+ * Also see struct struct ieee80211_channel.</div><div class='ctx'>  */</div><div class='ctx'> #define IS_CHAN_XR(_c)	((_c.hw_value &amp; CHANNEL_XR) != 0)</div><div class='ctx'> #define IS_CHAN_B(_c)	((_c.hw_value &amp; CHANNEL_B) != 0)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * The following structure will be used to map 2GHz channels to</div><div class='add'>+ * The following structure is used to map 2GHz channels to</div><div class='ctx'>  * 5GHz Atheros channels.</div><div class='add'>+ * TODO: Clean up</div><div class='ctx'>  */</div><div class='ctx'> struct ath5k_athchan_2ghz {</div><div class='ctx'> 	u32	a2_flags;</div><div class='ctx'> 	u16	a2_athchan;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Rate definitions</div><div class='del'>- * TODO: Clean them up or move them on mac80211 -most of these infos are</div><div class='del'>- * 	 used by the rate control algorytm on MadWiFi.</div><div class='del'>- */</div><div class='ctx'> </div><div class='del'>-/* Max number of rates on the rate table and what it seems</div><div class='del'>- * Atheros hardware supports */</div><div class='del'>-#define AR5K_MAX_RATES 32</div><div class='add'>+/******************\</div><div class='add'>+  RATE DEFINITIONS</div><div class='add'>+\******************/</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct ath5k_rate - rate structure</div><div class='del'>- * @valid: is this a valid rate for rate control (remove)</div><div class='del'>- * @modulation: respective mac80211 modulation</div><div class='del'>- * @rate_kbps: rate in kbit/s</div><div class='del'>- * @rate_code: hardware rate value, used in &amp;struct ath5k_desc, on RX on</div><div class='del'>- *     &amp;struct ath5k_rx_status.rs_rate and on TX on</div><div class='del'>- *     &amp;struct ath5k_tx_status.ts_rate. Seems the ar5xxx harware supports</div><div class='del'>- *     up to 32 rates, indexed by 1-32. This means we really only need</div><div class='del'>- *     6 bits for the rate_code.</div><div class='del'>- * @dot11_rate: respective IEEE-802.11 rate value</div><div class='del'>- * @control_rate: index of rate assumed to be used to send control frames.</div><div class='del'>- *     This can be used to set override the value on the rate duration</div><div class='del'>- *     registers. This is only useful if we can override in the harware at</div><div class='del'>- *     what rate we want to send control frames at. Note that IEEE-802.11</div><div class='del'>- *     Ch. 9.6 (after IEEE 802.11g changes) defines the rate at which we</div><div class='del'>- *     should send ACK/CTS, if we change this value we can be breaking</div><div class='del'>- *     the spec.</div><div class='add'>+ * Seems the ar5xxx harware supports up to 32 rates, indexed by 1-32.</div><div class='ctx'>  *</div><div class='del'>- * This structure is used to get the RX rate or set the TX rate on the</div><div class='add'>+ * The rate code is used to get the RX rate or set the TX rate on the</div><div class='ctx'>  * hardware descriptors. It is also used for internal modulation control</div><div class='ctx'>  * and settings.</div><div class='ctx'>  *</div><div class='del'>- * On RX after the &amp;struct ath5k_desc is parsed by the appropriate</div><div class='del'>- * ah_proc_rx_desc() the respective hardware rate value is set in</div><div class='del'>- * &amp;struct ath5k_rx_status.rs_rate. On TX the desired rate is set in</div><div class='del'>- * &amp;struct ath5k_tx_status.ts_rate which is later used to setup the</div><div class='del'>- * &amp;struct ath5k_desc correctly. This is the hardware rate map we are</div><div class='del'>- * aware of:</div><div class='add'>+ * This is the hardware rate map we are aware of:</div><div class='ctx'>  *</div><div class='del'>- * rate_code   1       2       3       4       5       6       7       8</div><div class='add'>+ * rate_code   0x01    0x02    0x03    0x04    0x05    0x06    0x07    0x08</div><div class='ctx'>  * rate_kbps   3000    1000    ?       ?       ?       2000    500     48000</div><div class='ctx'>  *</div><div class='del'>- * rate_code   9       10      11      12      13      14      15      16</div><div class='add'>+ * rate_code   0x09    0x0A    0x0B    0x0C    0x0D    0x0E    0x0F    0x10</div><div class='ctx'>  * rate_kbps   24000   12000   6000    54000   36000   18000   9000    ?</div><div class='ctx'>  *</div><div class='ctx'>  * rate_code   17      18      19      20      21      22      23      24</div><div class='ctx'>  * rate_kbps   ?       ?       ?       ?       ?       ?       ?       11000</div><div class='ctx'>  *</div><div class='ctx'>  * rate_code   25      26      27      28      29      30      31      32</div><div class='del'>- * rate_kbps   5500    2000    1000    ?       ?       ?       ?       ?</div><div class='add'>+ * rate_kbps   5500    2000    1000    11000S  5500S   2000S   ?       ?</div><div class='ctx'>  *</div><div class='add'>+ * "S" indicates CCK rates with short preamble.</div><div class='add'>+ *</div><div class='add'>+ * AR5211 has different rate codes for CCK (802.11B) rates. It only uses the</div><div class='add'>+ * lowest 4 bits, so they are the same as below with a 0xF mask.</div><div class='add'>+ * (0xB, 0xA, 0x9 and 0x8 for 1M, 2M, 5.5M and 11M).</div><div class='add'>+ * We handle this in ath5k_setup_bands().</div><div class='ctx'>  */</div><div class='del'>-struct ath5k_rate {</div><div class='del'>-	u8	valid;</div><div class='del'>-	u32	modulation;</div><div class='del'>-	u16	rate_kbps;</div><div class='del'>-	u8	rate_code;</div><div class='del'>-	u8	dot11_rate;</div><div class='del'>-	u8	control_rate;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* XXX: GRR all this stuff to get leds blinking ??? (check out setcurmode) */</div><div class='del'>-struct ath5k_rate_table {</div><div class='del'>-	u16	rate_count;</div><div class='del'>-	u8	rate_code_to_index[AR5K_MAX_RATES];	/* Back-mapping */</div><div class='del'>-	struct ath5k_rate rates[AR5K_MAX_RATES];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Rate tables...</div><div class='del'>- * TODO: CLEAN THIS !!!</div><div class='del'>- */</div><div class='del'>-#define AR5K_RATES_11A { 8, {					\</div><div class='del'>-	255, 255, 255, 255, 255, 255, 255, 255, 6, 4, 2, 0,	\</div><div class='del'>-	7, 5, 3, 1, 255, 255, 255, 255, 255, 255, 255, 255,	\</div><div class='del'>-	255, 255, 255, 255, 255, 255, 255, 255 }, {		\</div><div class='del'>-	{ 1, 0, 6000, 11, 140, 0 },		\</div><div class='del'>-	{ 1, 0, 9000, 15, 18, 0 },		\</div><div class='del'>-	{ 1, 0, 12000, 10, 152, 2 },		\</div><div class='del'>-	{ 1, 0, 18000, 14, 36, 2 },		\</div><div class='del'>-	{ 1, 0, 24000, 9, 176, 4 },		\</div><div class='del'>-	{ 1, 0, 36000, 13, 72, 4 },		\</div><div class='del'>-	{ 1, 0, 48000, 8, 96, 4 },		\</div><div class='del'>-	{ 1, 0, 54000, 12, 108, 4 } }		\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define AR5K_RATES_11B { 4, {						\</div><div class='del'>-	255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,	\</div><div class='del'>-	255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,	\</div><div class='del'>-	3, 2, 1, 0, 255, 255, 255, 255 }, {				\</div><div class='del'>-	{ 1, 0, 1000, 27, 130, 0 },	\</div><div class='del'>-	{ 1, IEEE80211_RATE_SHORT_PREAMBLE, 2000, 26, 132, 1 },	\</div><div class='del'>-	{ 1, IEEE80211_RATE_SHORT_PREAMBLE, 5500, 25, 139, 1 },	\</div><div class='del'>-	{ 1, IEEE80211_RATE_SHORT_PREAMBLE, 11000, 24, 150, 1 } }	\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define AR5K_RATES_11G { 12, {					\</div><div class='del'>-	255, 255, 255, 255, 255, 255, 255, 255, 10, 8, 6, 4,	\</div><div class='del'>-	11, 9, 7, 5, 255, 255, 255, 255, 255, 255, 255, 255,	\</div><div class='del'>-	3, 2, 1, 0, 255, 255, 255, 255 }, {			\</div><div class='del'>-	{ 1, 0, 1000, 27, 2, 0 },		\</div><div class='del'>-	{ 1, IEEE80211_RATE_SHORT_PREAMBLE, 2000, 26, 4, 1 },		\</div><div class='del'>-	{ 1, IEEE80211_RATE_SHORT_PREAMBLE, 5500, 25, 11, 1 },		\</div><div class='del'>-	{ 1, IEEE80211_RATE_SHORT_PREAMBLE, 11000, 24, 22, 1 },	\</div><div class='del'>-	{ 0, 0, 6000, 11, 12, 4 },	\</div><div class='del'>-	{ 0, 0, 9000, 15, 18, 4 },	\</div><div class='del'>-	{ 1, 0, 12000, 10, 24, 6 },	\</div><div class='del'>-	{ 1, 0, 18000, 14, 36, 6 },	\</div><div class='del'>-	{ 1, 0, 24000, 9, 48, 8 },	\</div><div class='del'>-	{ 1, 0, 36000, 13, 72, 8 },	\</div><div class='del'>-	{ 1, 0, 48000, 8, 96, 8 },	\</div><div class='del'>-	{ 1, 0, 54000, 12, 108, 8 } }	\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define AR5K_RATES_TURBO { 8, {					\</div><div class='del'>-	255, 255, 255, 255, 255, 255, 255, 255, 6, 4, 2, 0,	\</div><div class='del'>-	7, 5, 3, 1, 255, 255, 255, 255, 255, 255, 255, 255,	\</div><div class='del'>-	255, 255, 255, 255, 255, 255, 255, 255 }, {		\</div><div class='del'>-	{ 1, MODULATION_TURBO, 6000, 11, 140, 0 },	\</div><div class='del'>-	{ 1, MODULATION_TURBO, 9000, 15, 18, 0 },	\</div><div class='del'>-	{ 1, MODULATION_TURBO, 12000, 10, 152, 2 },	\</div><div class='del'>-	{ 1, MODULATION_TURBO, 18000, 14, 36, 2 },	\</div><div class='del'>-	{ 1, MODULATION_TURBO, 24000, 9, 176, 4 },	\</div><div class='del'>-	{ 1, MODULATION_TURBO, 36000, 13, 72, 4 },	\</div><div class='del'>-	{ 1, MODULATION_TURBO, 48000, 8, 96, 4 },	\</div><div class='del'>-	{ 1, MODULATION_TURBO, 54000, 12, 108, 4 } }	\</div><div class='del'>-}</div><div class='add'>+#define AR5K_MAX_RATES 32</div><div class='ctx'> </div><div class='del'>-#define AR5K_RATES_XR { 12, {					\</div><div class='del'>-	255, 3, 1, 255, 255, 255, 2, 0, 10, 8, 6, 4,		\</div><div class='del'>-	11, 9, 7, 5, 255, 255, 255, 255, 255, 255, 255, 255,	\</div><div class='del'>-	255, 255, 255, 255, 255, 255, 255, 255 }, {		\</div><div class='del'>-	{ 1, MODULATION_XR, 500, 7, 129, 0 },		\</div><div class='del'>-	{ 1, MODULATION_XR, 1000, 2, 139, 1 },		\</div><div class='del'>-	{ 1, MODULATION_XR, 2000, 6, 150, 2 },		\</div><div class='del'>-	{ 1, MODULATION_XR, 3000, 1, 150, 3 },		\</div><div class='del'>-	{ 1, 0, 6000, 11, 140, 4 },	\</div><div class='del'>-	{ 1, 0, 9000, 15, 18, 4 },	\</div><div class='del'>-	{ 1, 0, 12000, 10, 152, 6 },	\</div><div class='del'>-	{ 1, 0, 18000, 14, 36, 6 },	\</div><div class='del'>-	{ 1, 0, 24000, 9, 176, 8 },	\</div><div class='del'>-	{ 1, 0, 36000, 13, 72, 8 },	\</div><div class='del'>-	{ 1, 0, 48000, 8, 96, 8 },	\</div><div class='del'>-	{ 1, 0, 54000, 12, 108, 8 } }	\</div><div class='del'>-}</div><div class='add'>+/* B */</div><div class='add'>+#define ATH5K_RATE_CODE_1M	0x1B</div><div class='add'>+#define ATH5K_RATE_CODE_2M	0x1A</div><div class='add'>+#define ATH5K_RATE_CODE_5_5M	0x19</div><div class='add'>+#define ATH5K_RATE_CODE_11M	0x18</div><div class='add'>+/* A and G */</div><div class='add'>+#define ATH5K_RATE_CODE_6M	0x0B</div><div class='add'>+#define ATH5K_RATE_CODE_9M	0x0F</div><div class='add'>+#define ATH5K_RATE_CODE_12M	0x0A</div><div class='add'>+#define ATH5K_RATE_CODE_18M	0x0E</div><div class='add'>+#define ATH5K_RATE_CODE_24M	0x09</div><div class='add'>+#define ATH5K_RATE_CODE_36M	0x0D</div><div class='add'>+#define ATH5K_RATE_CODE_48M	0x08</div><div class='add'>+#define ATH5K_RATE_CODE_54M	0x0C</div><div class='add'>+/* XR */</div><div class='add'>+#define ATH5K_RATE_CODE_XR_500K	0x07</div><div class='add'>+#define ATH5K_RATE_CODE_XR_1M	0x02</div><div class='add'>+#define ATH5K_RATE_CODE_XR_2M	0x06</div><div class='add'>+#define ATH5K_RATE_CODE_XR_3M	0x01</div><div class='add'>+</div><div class='add'>+/* adding this flag to rate_code enables short preamble */</div><div class='add'>+#define AR5K_SET_SHORT_PREAMBLE 0x04</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Crypto definitions</div><div class='hunk'>@@ -735,7 +817,6 @@ struct ath5k_rate_table {</div><div class='ctx'> 		return (false);			\</div><div class='ctx'> } while (0)</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> enum ath5k_ant_setting {</div><div class='ctx'> 	AR5K_ANT_VARIABLE	= 0,	/* variable by programming */</div><div class='ctx'> 	AR5K_ANT_FIXED_A	= 1,	/* fixed to 11a frequencies */</div><div class='hunk'>@@ -846,7 +927,8 @@ enum ath5k_power_mode {</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * These match net80211 definitions (not used in</div><div class='del'>- * d80211).</div><div class='add'>+ * mac80211).</div><div class='add'>+ * TODO: Clean this up</div><div class='ctx'>  */</div><div class='ctx'> #define AR5K_LED_INIT	0 /*IEEE80211_S_INIT*/</div><div class='ctx'> #define AR5K_LED_SCAN	1 /*IEEE80211_S_SCAN*/</div><div class='hunk'>@@ -862,7 +944,8 @@ enum ath5k_power_mode {</div><div class='ctx'> /*</div><div class='ctx'>  * Chipset capabilities -see ath5k_hw_get_capability-</div><div class='ctx'>  * get_capability function is not yet fully implemented</div><div class='del'>- * in OpenHAL so most of these don't work yet...</div><div class='add'>+ * in ath5k so most of these don't work yet...</div><div class='add'>+ * TODO: Implement these &amp; merge with _TUNE_ stuff above</div><div class='ctx'>  */</div><div class='ctx'> enum ath5k_capability_type {</div><div class='ctx'> 	AR5K_CAP_REG_DMN		= 0,	/* Used to get current reg. domain id */</div><div class='hunk'>@@ -931,6 +1014,7 @@ struct ath5k_capabilities {</div><div class='ctx'> #define AR5K_MAX_GPIO		10</div><div class='ctx'> #define AR5K_MAX_RF_BANKS	8</div><div class='ctx'> </div><div class='add'>+/* TODO: Clean up and merge with ath5k_softc */</div><div class='ctx'> struct ath5k_hw {</div><div class='ctx'> 	u32			ah_magic;</div><div class='ctx'> </div><div class='hunk'>@@ -939,7 +1023,7 @@ struct ath5k_hw {</div><div class='ctx'> </div><div class='ctx'> 	enum ath5k_int		ah_imr;</div><div class='ctx'> </div><div class='del'>-	enum ieee80211_if_types	ah_op_mode;</div><div class='add'>+	enum nl80211_iftype	ah_op_mode;</div><div class='ctx'> 	enum ath5k_power_mode	ah_power_mode;</div><div class='ctx'> 	struct ieee80211_channel ah_current_channel;</div><div class='ctx'> 	bool			ah_turbo;</div><div class='hunk'>@@ -1023,11 +1107,13 @@ struct ath5k_hw {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Function pointers</div><div class='ctx'> 	 */</div><div class='add'>+	int (*ah_setup_rx_desc)(struct ath5k_hw *ah, struct ath5k_desc *desc,</div><div class='add'>+				u32 size, unsigned int flags);</div><div class='ctx'> 	int (*ah_setup_tx_desc)(struct ath5k_hw *, struct ath5k_desc *,</div><div class='ctx'> 		unsigned int, unsigned int, enum ath5k_pkt_type, unsigned int,</div><div class='ctx'> 		unsigned int, unsigned int, unsigned int, unsigned int,</div><div class='ctx'> 		unsigned int, unsigned int, unsigned int);</div><div class='del'>-	int (*ah_setup_xtx_desc)(struct ath5k_hw *, struct ath5k_desc *,</div><div class='add'>+	int (*ah_setup_mrr_tx_desc)(struct ath5k_hw *, struct ath5k_desc *,</div><div class='ctx'> 		unsigned int, unsigned int, unsigned int, unsigned int,</div><div class='ctx'> 		unsigned int, unsigned int);</div><div class='ctx'> 	int (*ah_proc_tx_desc)(struct ath5k_hw *, struct ath5k_desc *,</div><div class='hunk'>@@ -1040,33 +1126,38 @@ struct ath5k_hw {</div><div class='ctx'>  * Prototypes</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/* General Functions */</div><div class='del'>-extern int ath5k_hw_register_timeout(struct ath5k_hw *ah, u32 reg, u32 flag, u32 val, bool is_set);</div><div class='ctx'> /* Attach/Detach Functions */</div><div class='ctx'> extern struct ath5k_hw *ath5k_hw_attach(struct ath5k_softc *sc, u8 mac_version);</div><div class='del'>-extern const struct ath5k_rate_table *ath5k_hw_get_rate_table(struct ath5k_hw *ah, unsigned int mode);</div><div class='ctx'> extern void ath5k_hw_detach(struct ath5k_hw *ah);</div><div class='add'>+</div><div class='ctx'> /* Reset Functions */</div><div class='del'>-extern int ath5k_hw_reset(struct ath5k_hw *ah, enum ieee80211_if_types op_mode, struct ieee80211_channel *channel, bool change_channel);</div><div class='add'>+extern int ath5k_hw_nic_wakeup(struct ath5k_hw *ah, int flags, bool initial);</div><div class='add'>+extern int ath5k_hw_reset(struct ath5k_hw *ah, enum nl80211_iftype op_mode, struct ieee80211_channel *channel, bool change_channel);</div><div class='ctx'> /* Power management functions */</div><div class='ctx'> extern int ath5k_hw_set_power(struct ath5k_hw *ah, enum ath5k_power_mode mode, bool set_chip, u16 sleep_duration);</div><div class='add'>+</div><div class='ctx'> /* DMA Related Functions */</div><div class='del'>-extern void ath5k_hw_start_rx(struct ath5k_hw *ah);</div><div class='add'>+extern void ath5k_hw_start_rx_dma(struct ath5k_hw *ah);</div><div class='ctx'> extern int ath5k_hw_stop_rx_dma(struct ath5k_hw *ah);</div><div class='del'>-extern u32 ath5k_hw_get_rx_buf(struct ath5k_hw *ah);</div><div class='del'>-extern void ath5k_hw_put_rx_buf(struct ath5k_hw *ah, u32 phys_addr);</div><div class='del'>-extern int ath5k_hw_tx_start(struct ath5k_hw *ah, unsigned int queue);</div><div class='add'>+extern u32 ath5k_hw_get_rxdp(struct ath5k_hw *ah);</div><div class='add'>+extern void ath5k_hw_set_rxdp(struct ath5k_hw *ah, u32 phys_addr);</div><div class='add'>+extern int ath5k_hw_start_tx_dma(struct ath5k_hw *ah, unsigned int queue);</div><div class='ctx'> extern int ath5k_hw_stop_tx_dma(struct ath5k_hw *ah, unsigned int queue);</div><div class='del'>-extern u32 ath5k_hw_get_tx_buf(struct ath5k_hw *ah, unsigned int queue);</div><div class='del'>-extern int ath5k_hw_put_tx_buf(struct ath5k_hw *ah, unsigned int queue, u32 phys_addr);</div><div class='add'>+extern u32 ath5k_hw_get_txdp(struct ath5k_hw *ah, unsigned int queue);</div><div class='add'>+extern int ath5k_hw_set_txdp(struct ath5k_hw *ah, unsigned int queue,</div><div class='add'>+				u32 phys_addr);</div><div class='ctx'> extern int ath5k_hw_update_tx_triglevel(struct ath5k_hw *ah, bool increase);</div><div class='ctx'> /* Interrupt handling */</div><div class='ctx'> extern bool ath5k_hw_is_intr_pending(struct ath5k_hw *ah);</div><div class='ctx'> extern int ath5k_hw_get_isr(struct ath5k_hw *ah, enum ath5k_int *interrupt_mask);</div><div class='del'>-extern enum ath5k_int ath5k_hw_set_intr(struct ath5k_hw *ah, enum ath5k_int new_mask);</div><div class='add'>+extern enum ath5k_int ath5k_hw_set_imr(struct ath5k_hw *ah, enum</div><div class='add'>+ath5k_int new_mask);</div><div class='ctx'> extern void ath5k_hw_update_mib_counters(struct ath5k_hw *ah, struct ieee80211_low_level_stats *stats);</div><div class='add'>+</div><div class='ctx'> /* EEPROM access functions */</div><div class='del'>-extern int ath5k_hw_set_regdomain(struct ath5k_hw *ah, u16 regdomain);</div><div class='add'>+extern int ath5k_eeprom_init(struct ath5k_hw *ah);</div><div class='add'>+extern int ath5k_eeprom_read_mac(struct ath5k_hw *ah, u8 *mac);</div><div class='add'>+</div><div class='ctx'> /* Protocol Control Unit Functions */</div><div class='ctx'> extern int ath5k_hw_set_opmode(struct ath5k_hw *ah);</div><div class='ctx'> /* BSSID Functions */</div><div class='hunk'>@@ -1076,14 +1167,14 @@ extern void ath5k_hw_set_associd(struct ath5k_hw *ah, const u8 *bssid, u16 assoc</div><div class='ctx'> extern int ath5k_hw_set_bssid_mask(struct ath5k_hw *ah, const u8 *mask);</div><div class='ctx'> /* Receive start/stop functions */</div><div class='ctx'> extern void ath5k_hw_start_rx_pcu(struct ath5k_hw *ah);</div><div class='del'>-extern void ath5k_hw_stop_pcu_recv(struct ath5k_hw *ah);</div><div class='add'>+extern void ath5k_hw_stop_rx_pcu(struct ath5k_hw *ah);</div><div class='ctx'> /* RX Filter functions */</div><div class='ctx'> extern void ath5k_hw_set_mcast_filter(struct ath5k_hw *ah, u32 filter0, u32 filter1);</div><div class='del'>-extern int ath5k_hw_set_mcast_filterindex(struct ath5k_hw *ah, u32 index);</div><div class='add'>+extern int ath5k_hw_set_mcast_filter_idx(struct ath5k_hw *ah, u32 index);</div><div class='ctx'> extern int ath5k_hw_clear_mcast_filter_idx(struct ath5k_hw *ah, u32 index);</div><div class='ctx'> extern u32 ath5k_hw_get_rx_filter(struct ath5k_hw *ah);</div><div class='ctx'> extern void ath5k_hw_set_rx_filter(struct ath5k_hw *ah, u32 filter);</div><div class='del'>-/* Beacon related functions */</div><div class='add'>+/* Beacon control functions */</div><div class='ctx'> extern u32 ath5k_hw_get_tsf32(struct ath5k_hw *ah);</div><div class='ctx'> extern u64 ath5k_hw_get_tsf64(struct ath5k_hw *ah);</div><div class='ctx'> extern void ath5k_hw_reset_tsf(struct ath5k_hw *ah);</div><div class='hunk'>@@ -1105,61 +1196,129 @@ extern int ath5k_hw_reset_key(struct ath5k_hw *ah, u16 entry);</div><div class='ctx'> extern int ath5k_hw_is_key_valid(struct ath5k_hw *ah, u16 entry);</div><div class='ctx'> extern int ath5k_hw_set_key(struct ath5k_hw *ah, u16 entry, const struct ieee80211_key_conf *key, const u8 *mac);</div><div class='ctx'> extern int ath5k_hw_set_key_lladdr(struct ath5k_hw *ah, u16 entry, const u8 *mac);</div><div class='add'>+</div><div class='ctx'> /* Queue Control Unit, DFS Control Unit Functions */</div><div class='del'>-extern int ath5k_hw_setup_tx_queue(struct ath5k_hw *ah, enum ath5k_tx_queue queue_type, struct ath5k_txq_info *queue_info);</div><div class='del'>-extern int ath5k_hw_setup_tx_queueprops(struct ath5k_hw *ah, int queue, const struct ath5k_txq_info *queue_info);</div><div class='ctx'> extern int ath5k_hw_get_tx_queueprops(struct ath5k_hw *ah, int queue, struct ath5k_txq_info *queue_info);</div><div class='add'>+extern int ath5k_hw_set_tx_queueprops(struct ath5k_hw *ah, int queue,</div><div class='add'>+				const struct ath5k_txq_info *queue_info);</div><div class='add'>+extern int ath5k_hw_setup_tx_queue(struct ath5k_hw *ah,</div><div class='add'>+				enum ath5k_tx_queue queue_type,</div><div class='add'>+				struct ath5k_txq_info *queue_info);</div><div class='add'>+extern u32 ath5k_hw_num_tx_pending(struct ath5k_hw *ah, unsigned int queue);</div><div class='ctx'> extern void ath5k_hw_release_tx_queue(struct ath5k_hw *ah, unsigned int queue);</div><div class='ctx'> extern int ath5k_hw_reset_tx_queue(struct ath5k_hw *ah, unsigned int queue);</div><div class='del'>-extern u32 ath5k_hw_num_tx_pending(struct ath5k_hw *ah, unsigned int queue);</div><div class='del'>-extern int ath5k_hw_set_slot_time(struct ath5k_hw *ah, unsigned int slot_time);</div><div class='ctx'> extern unsigned int ath5k_hw_get_slot_time(struct ath5k_hw *ah);</div><div class='add'>+extern int ath5k_hw_set_slot_time(struct ath5k_hw *ah, unsigned int slot_time);</div><div class='add'>+</div><div class='ctx'> /* Hardware Descriptor Functions */</div><div class='del'>-extern int ath5k_hw_setup_rx_desc(struct ath5k_hw *ah, struct ath5k_desc *desc, u32 size, unsigned int flags);</div><div class='add'>+extern int ath5k_hw_init_desc_functions(struct ath5k_hw *ah);</div><div class='add'>+</div><div class='ctx'> /* GPIO Functions */</div><div class='ctx'> extern void ath5k_hw_set_ledstate(struct ath5k_hw *ah, unsigned int state);</div><div class='del'>-extern int ath5k_hw_set_gpio_output(struct ath5k_hw *ah, u32 gpio);</div><div class='ctx'> extern int ath5k_hw_set_gpio_input(struct ath5k_hw *ah, u32 gpio);</div><div class='add'>+extern int ath5k_hw_set_gpio_output(struct ath5k_hw *ah, u32 gpio);</div><div class='ctx'> extern u32 ath5k_hw_get_gpio(struct ath5k_hw *ah, u32 gpio);</div><div class='ctx'> extern int ath5k_hw_set_gpio(struct ath5k_hw *ah, u32 gpio, u32 val);</div><div class='ctx'> extern void ath5k_hw_set_gpio_intr(struct ath5k_hw *ah, unsigned int gpio, u32 interrupt_level);</div><div class='add'>+</div><div class='ctx'> /* Misc functions */</div><div class='add'>+int ath5k_hw_set_capabilities(struct ath5k_hw *ah);</div><div class='ctx'> extern int ath5k_hw_get_capability(struct ath5k_hw *ah, enum ath5k_capability_type cap_type, u32 capability, u32 *result);</div><div class='del'>-</div><div class='add'>+extern int ath5k_hw_enable_pspoll(struct ath5k_hw *ah, u8 *bssid, u16 assoc_id);</div><div class='add'>+extern int ath5k_hw_disable_pspoll(struct ath5k_hw *ah);</div><div class='ctx'> </div><div class='ctx'> /* Initial register settings functions */</div><div class='ctx'> extern int ath5k_hw_write_initvals(struct ath5k_hw *ah, u8 mode, bool change_channel);</div><div class='add'>+</div><div class='ctx'> /* Initialize RF */</div><div class='ctx'> extern int ath5k_hw_rfregs(struct ath5k_hw *ah, struct ieee80211_channel *channel, unsigned int mode);</div><div class='ctx'> extern int ath5k_hw_rfgain(struct ath5k_hw *ah, unsigned int freq);</div><div class='ctx'> extern enum ath5k_rfgain ath5k_hw_get_rf_gain(struct ath5k_hw *ah);</div><div class='ctx'> extern int ath5k_hw_set_rfgain_opt(struct ath5k_hw *ah);</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> /* PHY/RF channel functions */</div><div class='ctx'> extern bool ath5k_channel_ok(struct ath5k_hw *ah, u16 freq, unsigned int flags);</div><div class='ctx'> extern int ath5k_hw_channel(struct ath5k_hw *ah, struct ieee80211_channel *channel);</div><div class='ctx'> /* PHY calibration */</div><div class='ctx'> extern int ath5k_hw_phy_calibrate(struct ath5k_hw *ah, struct ieee80211_channel *channel);</div><div class='del'>-extern int ath5k_hw_phy_disable(struct ath5k_hw *ah);</div><div class='add'>+extern int ath5k_hw_noise_floor_calibration(struct ath5k_hw *ah, short freq);</div><div class='ctx'> /* Misc PHY functions */</div><div class='ctx'> extern u16 ath5k_hw_radio_revision(struct ath5k_hw *ah, unsigned int chan);</div><div class='ctx'> extern void ath5k_hw_set_def_antenna(struct ath5k_hw *ah, unsigned int ant);</div><div class='ctx'> extern unsigned int ath5k_hw_get_def_antenna(struct ath5k_hw *ah);</div><div class='del'>-extern int ath5k_hw_noise_floor_calibration(struct ath5k_hw *ah, short freq);</div><div class='add'>+extern int ath5k_hw_phy_disable(struct ath5k_hw *ah);</div><div class='ctx'> /* TX power setup */</div><div class='ctx'> extern int ath5k_hw_txpower(struct ath5k_hw *ah, struct ieee80211_channel *channel, unsigned int txpower);</div><div class='ctx'> extern int ath5k_hw_set_txpower_limit(struct ath5k_hw *ah, unsigned int power);</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Functions used internaly</div><div class='add'>+ */</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Translate usec to hw clock units</div><div class='add'>+ */</div><div class='add'>+static inline unsigned int ath5k_hw_htoclock(unsigned int usec, bool turbo)</div><div class='add'>+{</div><div class='add'>+	return turbo ? (usec * 80) : (usec * 40);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Translate hw clock units to usec</div><div class='add'>+ */</div><div class='add'>+static inline unsigned int ath5k_hw_clocktoh(unsigned int clock, bool turbo)</div><div class='add'>+{</div><div class='add'>+	return turbo ? (clock / 80) : (clock / 40);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Read from a register</div><div class='add'>+ */</div><div class='ctx'> static inline u32 ath5k_hw_reg_read(struct ath5k_hw *ah, u16 reg)</div><div class='ctx'> {</div><div class='ctx'> 	return ioread32(ah-&gt;ah_iobase + reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Write to a register</div><div class='add'>+ */</div><div class='ctx'> static inline void ath5k_hw_reg_write(struct ath5k_hw *ah, u32 val, u16 reg)</div><div class='ctx'> {</div><div class='ctx'> 	iowrite32(val, ah-&gt;ah_iobase + reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#if defined(_ATH5K_RESET) || defined(_ATH5K_PHY)</div><div class='add'>+/*</div><div class='add'>+ * Check if a register write has been completed</div><div class='add'>+ */</div><div class='add'>+static int ath5k_hw_register_timeout(struct ath5k_hw *ah, u32 reg, u32 flag,</div><div class='add'>+		u32 val, bool is_set)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	u32 data;</div><div class='add'>+</div><div class='add'>+	for (i = AR5K_TUNE_REGISTER_TIMEOUT; i &gt; 0; i--) {</div><div class='add'>+		data = ath5k_hw_reg_read(ah, reg);</div><div class='add'>+		if (is_set &amp;&amp; (data &amp; flag))</div><div class='add'>+			break;</div><div class='add'>+		else if ((data &amp; flag) == val)</div><div class='add'>+			break;</div><div class='add'>+		udelay(15);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return (i &lt;= 0) ? -EAGAIN : 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static inline u32 ath5k_hw_bitswap(u32 val, unsigned int bits)</div><div class='add'>+{</div><div class='add'>+	u32 retval = 0, bit, i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; bits; i++) {</div><div class='add'>+		bit = (val &gt;&gt; i) &amp; 1;</div><div class='add'>+		retval = (retval &lt;&lt; 1) | bit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/wireless/ath5k/attach.c b/drivers/net/wireless/ath5k/attach.c<br/>new file mode 100644<br/>index 000000000000..51d569883cdd<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/ath5k/attach.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/ath5k/attach.c</a></div><div class='hunk'>@@ -0,0 +1,359 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2004-2008 Reyk Floeter &lt;reyk@openbsd.org&gt;</div><div class='add'>+ * Copyright (c) 2006-2008 Nick Kossifidis &lt;mickflemm@gmail.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * Permission to use, copy, modify, and distribute this software for any</div><div class='add'>+ * purpose with or without fee is hereby granted, provided that the above</div><div class='add'>+ * copyright notice and this permission notice appear in all copies.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES</div><div class='add'>+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR</div><div class='add'>+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES</div><div class='add'>+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN</div><div class='add'>+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF</div><div class='add'>+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*************************************\</div><div class='add'>+* Attach/Detach Functions and helpers *</div><div class='add'>+\*************************************/</div><div class='add'>+</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include "ath5k.h"</div><div class='add'>+#include "reg.h"</div><div class='add'>+#include "debug.h"</div><div class='add'>+#include "base.h"</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_post - Power On Self Test helper function</div><div class='add'>+ *</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ */</div><div class='add'>+static int ath5k_hw_post(struct ath5k_hw *ah)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	int i, c;</div><div class='add'>+	u16 cur_reg;</div><div class='add'>+	u16 regs[2] = {AR5K_STA_ID0, AR5K_PHY(8)};</div><div class='add'>+	u32 var_pattern;</div><div class='add'>+	u32 static_pattern[4] = {</div><div class='add'>+		0x55555555,	0xaaaaaaaa,</div><div class='add'>+		0x66666666,	0x99999999</div><div class='add'>+	};</div><div class='add'>+	u32 init_val;</div><div class='add'>+	u32 cur_val;</div><div class='add'>+</div><div class='add'>+	for (c = 0; c &lt; 2; c++) {</div><div class='add'>+</div><div class='add'>+		cur_reg = regs[c];</div><div class='add'>+</div><div class='add'>+		/* Save previous value */</div><div class='add'>+		init_val = ath5k_hw_reg_read(ah, cur_reg);</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; 256; i++) {</div><div class='add'>+			var_pattern = i &lt;&lt; 16 | i;</div><div class='add'>+			ath5k_hw_reg_write(ah, var_pattern, cur_reg);</div><div class='add'>+			cur_val = ath5k_hw_reg_read(ah, cur_reg);</div><div class='add'>+</div><div class='add'>+			if (cur_val != var_pattern) {</div><div class='add'>+				ATH5K_ERR(ah-&gt;ah_sc, "POST Failed !!!\n");</div><div class='add'>+				return -EAGAIN;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* Found on ndiswrapper dumps */</div><div class='add'>+			var_pattern = 0x0039080f;</div><div class='add'>+			ath5k_hw_reg_write(ah, var_pattern, cur_reg);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; 4; i++) {</div><div class='add'>+			var_pattern = static_pattern[i];</div><div class='add'>+			ath5k_hw_reg_write(ah, var_pattern, cur_reg);</div><div class='add'>+			cur_val = ath5k_hw_reg_read(ah, cur_reg);</div><div class='add'>+</div><div class='add'>+			if (cur_val != var_pattern) {</div><div class='add'>+				ATH5K_ERR(ah-&gt;ah_sc, "POST Failed !!!\n");</div><div class='add'>+				return -EAGAIN;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* Found on ndiswrapper dumps */</div><div class='add'>+			var_pattern = 0x003b080f;</div><div class='add'>+			ath5k_hw_reg_write(ah, var_pattern, cur_reg);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Restore previous value */</div><div class='add'>+		ath5k_hw_reg_write(ah, init_val, cur_reg);</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_attach - Check if hw is supported and init the needed structs</div><div class='add'>+ *</div><div class='add'>+ * @sc: The &amp;struct ath5k_softc we got from the driver's attach function</div><div class='add'>+ * @mac_version: The mac version id (check out ath5k.h) based on pci id</div><div class='add'>+ *</div><div class='add'>+ * Check if the device is supported, perform a POST and initialize the needed</div><div class='add'>+ * structs. Returns -ENOMEM if we don't have memory for the needed structs,</div><div class='add'>+ * -ENODEV if the device is not supported or prints an error msg if something</div><div class='add'>+ * else went wrong.</div><div class='add'>+ */</div><div class='add'>+struct ath5k_hw *ath5k_hw_attach(struct ath5k_softc *sc, u8 mac_version)</div><div class='add'>+{</div><div class='add'>+	struct ath5k_hw *ah;</div><div class='add'>+	struct pci_dev *pdev = sc-&gt;pdev;</div><div class='add'>+	u8 mac[ETH_ALEN];</div><div class='add'>+	int ret;</div><div class='add'>+	u32 srev;</div><div class='add'>+</div><div class='add'>+	/*If we passed the test malloc a ath5k_hw struct*/</div><div class='add'>+	ah = kzalloc(sizeof(struct ath5k_hw), GFP_KERNEL);</div><div class='add'>+	if (ah == NULL) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		ATH5K_ERR(sc, "out of memory\n");</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ah-&gt;ah_sc = sc;</div><div class='add'>+	ah-&gt;ah_iobase = sc-&gt;iobase;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * HW information</div><div class='add'>+	 */</div><div class='add'>+	ah-&gt;ah_op_mode = NL80211_IFTYPE_STATION;</div><div class='add'>+	ah-&gt;ah_radar.r_enabled = AR5K_TUNE_RADAR_ALERT;</div><div class='add'>+	ah-&gt;ah_turbo = false;</div><div class='add'>+	ah-&gt;ah_txpower.txp_tpc = AR5K_TUNE_TPC_TXPOWER;</div><div class='add'>+	ah-&gt;ah_imr = 0;</div><div class='add'>+	ah-&gt;ah_atim_window = 0;</div><div class='add'>+	ah-&gt;ah_aifs = AR5K_TUNE_AIFS;</div><div class='add'>+	ah-&gt;ah_cw_min = AR5K_TUNE_CWMIN;</div><div class='add'>+	ah-&gt;ah_limit_tx_retries = AR5K_INIT_TX_RETRY;</div><div class='add'>+	ah-&gt;ah_software_retry = false;</div><div class='add'>+	ah-&gt;ah_ant_diversity = AR5K_TUNE_ANT_DIVERSITY;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Set the mac version based on the pci id</div><div class='add'>+	 */</div><div class='add'>+	ah-&gt;ah_version = mac_version;</div><div class='add'>+</div><div class='add'>+	/*Fill the ath5k_hw struct with the needed functions*/</div><div class='add'>+	ret = ath5k_hw_init_desc_functions(ah);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_free;</div><div class='add'>+</div><div class='add'>+	/* Bring device out of sleep and reset it's units */</div><div class='add'>+	ret = ath5k_hw_nic_wakeup(ah, CHANNEL_B, true);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_free;</div><div class='add'>+</div><div class='add'>+	/* Get MAC, PHY and RADIO revisions */</div><div class='add'>+	srev = ath5k_hw_reg_read(ah, AR5K_SREV);</div><div class='add'>+	ah-&gt;ah_mac_srev = srev;</div><div class='add'>+	ah-&gt;ah_mac_version = AR5K_REG_MS(srev, AR5K_SREV_VER);</div><div class='add'>+	ah-&gt;ah_mac_revision = AR5K_REG_MS(srev, AR5K_SREV_REV);</div><div class='add'>+	ah-&gt;ah_phy_revision = ath5k_hw_reg_read(ah, AR5K_PHY_CHIP_ID) &amp;</div><div class='add'>+			0xffffffff;</div><div class='add'>+	ah-&gt;ah_radio_5ghz_revision = ath5k_hw_radio_revision(ah,</div><div class='add'>+			CHANNEL_5GHZ);</div><div class='add'>+	ah-&gt;ah_phy = AR5K_PHY(0);</div><div class='add'>+</div><div class='add'>+	/* Try to identify radio chip based on it's srev */</div><div class='add'>+	switch (ah-&gt;ah_radio_5ghz_revision &amp; 0xf0) {</div><div class='add'>+	case AR5K_SREV_RAD_5111:</div><div class='add'>+		ah-&gt;ah_radio = AR5K_RF5111;</div><div class='add'>+		ah-&gt;ah_single_chip = false;</div><div class='add'>+		ah-&gt;ah_radio_2ghz_revision = ath5k_hw_radio_revision(ah,</div><div class='add'>+							CHANNEL_2GHZ);</div><div class='add'>+		ah-&gt;ah_phy_spending = AR5K_PHY_SPENDING_RF5111;</div><div class='add'>+		break;</div><div class='add'>+	case AR5K_SREV_RAD_5112:</div><div class='add'>+	case AR5K_SREV_RAD_2112:</div><div class='add'>+		ah-&gt;ah_radio = AR5K_RF5112;</div><div class='add'>+		ah-&gt;ah_single_chip = false;</div><div class='add'>+		ah-&gt;ah_radio_2ghz_revision = ath5k_hw_radio_revision(ah,</div><div class='add'>+							CHANNEL_2GHZ);</div><div class='add'>+		ah-&gt;ah_phy_spending = AR5K_PHY_SPENDING_RF5112;</div><div class='add'>+		break;</div><div class='add'>+	case AR5K_SREV_RAD_2413:</div><div class='add'>+		ah-&gt;ah_radio = AR5K_RF2413;</div><div class='add'>+		ah-&gt;ah_single_chip = true;</div><div class='add'>+		ah-&gt;ah_phy_spending = AR5K_PHY_SPENDING_RF2413;</div><div class='add'>+		break;</div><div class='add'>+	case AR5K_SREV_RAD_5413:</div><div class='add'>+		ah-&gt;ah_radio = AR5K_RF5413;</div><div class='add'>+		ah-&gt;ah_single_chip = true;</div><div class='add'>+		ah-&gt;ah_phy_spending = AR5K_PHY_SPENDING_RF5413;</div><div class='add'>+		break;</div><div class='add'>+	case AR5K_SREV_RAD_2316:</div><div class='add'>+		ah-&gt;ah_radio = AR5K_RF2316;</div><div class='add'>+		ah-&gt;ah_single_chip = true;</div><div class='add'>+		ah-&gt;ah_phy_spending = AR5K_PHY_SPENDING_RF2316;</div><div class='add'>+		break;</div><div class='add'>+	case AR5K_SREV_RAD_2317:</div><div class='add'>+		ah-&gt;ah_radio = AR5K_RF2317;</div><div class='add'>+		ah-&gt;ah_single_chip = true;</div><div class='add'>+		ah-&gt;ah_phy_spending = AR5K_PHY_SPENDING_RF2317;</div><div class='add'>+		break;</div><div class='add'>+	case AR5K_SREV_RAD_5424:</div><div class='add'>+		if (ah-&gt;ah_mac_version == AR5K_SREV_AR2425 ||</div><div class='add'>+		ah-&gt;ah_mac_version == AR5K_SREV_AR2417){</div><div class='add'>+			ah-&gt;ah_radio = AR5K_RF2425;</div><div class='add'>+			ah-&gt;ah_single_chip = true;</div><div class='add'>+			ah-&gt;ah_phy_spending = AR5K_PHY_SPENDING_RF2425;</div><div class='add'>+		} else {</div><div class='add'>+			ah-&gt;ah_radio = AR5K_RF5413;</div><div class='add'>+			ah-&gt;ah_single_chip = true;</div><div class='add'>+			ah-&gt;ah_phy_spending = AR5K_PHY_SPENDING_RF5413;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		/* Identify radio based on mac/phy srev */</div><div class='add'>+		if (ah-&gt;ah_version == AR5K_AR5210) {</div><div class='add'>+			ah-&gt;ah_radio = AR5K_RF5110;</div><div class='add'>+			ah-&gt;ah_single_chip = false;</div><div class='add'>+		} else if (ah-&gt;ah_version == AR5K_AR5211) {</div><div class='add'>+			ah-&gt;ah_radio = AR5K_RF5111;</div><div class='add'>+			ah-&gt;ah_single_chip = false;</div><div class='add'>+			ah-&gt;ah_radio_2ghz_revision = ath5k_hw_radio_revision(ah,</div><div class='add'>+								CHANNEL_2GHZ);</div><div class='add'>+		} else if (ah-&gt;ah_mac_version == (AR5K_SREV_AR2425 &gt;&gt; 4) ||</div><div class='add'>+		ah-&gt;ah_mac_version == (AR5K_SREV_AR2417 &gt;&gt; 4) ||</div><div class='add'>+		ah-&gt;ah_phy_revision == AR5K_SREV_PHY_2425) {</div><div class='add'>+			ah-&gt;ah_radio = AR5K_RF2425;</div><div class='add'>+			ah-&gt;ah_single_chip = true;</div><div class='add'>+			ah-&gt;ah_radio_5ghz_revision = AR5K_SREV_RAD_2425;</div><div class='add'>+			ah-&gt;ah_phy_spending = AR5K_PHY_SPENDING_RF2425;</div><div class='add'>+		} else if (srev == AR5K_SREV_AR5213A &amp;&amp;</div><div class='add'>+		ah-&gt;ah_phy_revision == AR5K_SREV_PHY_2112B) {</div><div class='add'>+			ah-&gt;ah_radio = AR5K_RF5112;</div><div class='add'>+			ah-&gt;ah_single_chip = false;</div><div class='add'>+			ah-&gt;ah_radio_5ghz_revision = AR5K_SREV_RAD_2112B;</div><div class='add'>+		} else if (ah-&gt;ah_mac_version == (AR5K_SREV_AR2415 &gt;&gt; 4)) {</div><div class='add'>+			ah-&gt;ah_radio = AR5K_RF2316;</div><div class='add'>+			ah-&gt;ah_single_chip = true;</div><div class='add'>+			ah-&gt;ah_radio_5ghz_revision = AR5K_SREV_RAD_2316;</div><div class='add'>+			ah-&gt;ah_phy_spending = AR5K_PHY_SPENDING_RF2316;</div><div class='add'>+		} else if (ah-&gt;ah_mac_version == (AR5K_SREV_AR5414 &gt;&gt; 4) ||</div><div class='add'>+		ah-&gt;ah_phy_revision == AR5K_SREV_PHY_5413) {</div><div class='add'>+			ah-&gt;ah_radio = AR5K_RF5413;</div><div class='add'>+			ah-&gt;ah_single_chip = true;</div><div class='add'>+			ah-&gt;ah_radio_5ghz_revision = AR5K_SREV_RAD_5413;</div><div class='add'>+			ah-&gt;ah_phy_spending = AR5K_PHY_SPENDING_RF5413;</div><div class='add'>+		} else if (ah-&gt;ah_mac_version == (AR5K_SREV_AR2414 &gt;&gt; 4) ||</div><div class='add'>+		ah-&gt;ah_phy_revision == AR5K_SREV_PHY_2413) {</div><div class='add'>+			ah-&gt;ah_radio = AR5K_RF2413;</div><div class='add'>+			ah-&gt;ah_single_chip = true;</div><div class='add'>+			ah-&gt;ah_radio_5ghz_revision = AR5K_SREV_RAD_2413;</div><div class='add'>+			ah-&gt;ah_phy_spending = AR5K_PHY_SPENDING_RF2413;</div><div class='add'>+		} else {</div><div class='add'>+			ATH5K_ERR(sc, "Couldn't identify radio revision.\n");</div><div class='add'>+			ret = -ENODEV;</div><div class='add'>+			goto err_free;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	/* Return on unsuported chips (unsupported eeprom etc) */</div><div class='add'>+	if ((srev &gt;= AR5K_SREV_AR5416) &amp;&amp;</div><div class='add'>+	(srev &lt; AR5K_SREV_AR2425)) {</div><div class='add'>+		ATH5K_ERR(sc, "Device not yet supported.\n");</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto err_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Write PCI-E power save settings</div><div class='add'>+	 */</div><div class='add'>+	if ((ah-&gt;ah_version == AR5K_AR5212) &amp;&amp; (pdev-&gt;is_pcie)) {</div><div class='add'>+		ath5k_hw_reg_write(ah, 0x9248fc00, AR5K_PCIE_SERDES);</div><div class='add'>+		ath5k_hw_reg_write(ah, 0x24924924, AR5K_PCIE_SERDES);</div><div class='add'>+		/* Shut off RX when elecidle is asserted */</div><div class='add'>+		ath5k_hw_reg_write(ah, 0x28000039, AR5K_PCIE_SERDES);</div><div class='add'>+		ath5k_hw_reg_write(ah, 0x53160824, AR5K_PCIE_SERDES);</div><div class='add'>+		/* TODO: EEPROM work */</div><div class='add'>+		ath5k_hw_reg_write(ah, 0xe5980579, AR5K_PCIE_SERDES);</div><div class='add'>+		/* Shut off PLL and CLKREQ active in L1 */</div><div class='add'>+		ath5k_hw_reg_write(ah, 0x001defff, AR5K_PCIE_SERDES);</div><div class='add'>+		/* Preserce other settings */</div><div class='add'>+		ath5k_hw_reg_write(ah, 0x1aaabe40, AR5K_PCIE_SERDES);</div><div class='add'>+		ath5k_hw_reg_write(ah, 0xbe105554, AR5K_PCIE_SERDES);</div><div class='add'>+		ath5k_hw_reg_write(ah, 0x000e3007, AR5K_PCIE_SERDES);</div><div class='add'>+		/* Reset SERDES to load new settings */</div><div class='add'>+		ath5k_hw_reg_write(ah, 0x00000000, AR5K_PCIE_SERDES_RESET);</div><div class='add'>+		mdelay(1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * POST</div><div class='add'>+	 */</div><div class='add'>+	ret = ath5k_hw_post(ah);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_free;</div><div class='add'>+</div><div class='add'>+	/* Enable pci core retry fix on Hainan (5213A) and later chips */</div><div class='add'>+	if (srev &gt;= AR5K_SREV_AR5213A)</div><div class='add'>+		ath5k_hw_reg_write(ah, AR5K_PCICFG_RETRY_FIX, AR5K_PCICFG);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Get card capabilities, calibration values etc</div><div class='add'>+	 * TODO: EEPROM work</div><div class='add'>+	 */</div><div class='add'>+	ret = ath5k_eeprom_init(ah);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ATH5K_ERR(sc, "unable to init EEPROM\n");</div><div class='add'>+		goto err_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Get misc capabilities */</div><div class='add'>+	ret = ath5k_hw_set_capabilities(ah);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ATH5K_ERR(sc, "unable to get device capabilities: 0x%04x\n",</div><div class='add'>+			sc-&gt;pdev-&gt;device);</div><div class='add'>+		goto err_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Set MAC address */</div><div class='add'>+	ret = ath5k_eeprom_read_mac(ah, mac);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ATH5K_ERR(sc, "unable to read address from EEPROM: 0x%04x\n",</div><div class='add'>+			sc-&gt;pdev-&gt;device);</div><div class='add'>+		goto err_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath5k_hw_set_lladdr(ah, mac);</div><div class='add'>+	/* Set BSSID to bcast address: ff:ff:ff:ff:ff:ff for now */</div><div class='add'>+	memset(ah-&gt;ah_bssid, 0xff, ETH_ALEN);</div><div class='add'>+	ath5k_hw_set_associd(ah, ah-&gt;ah_bssid, 0);</div><div class='add'>+	ath5k_hw_set_opmode(ah);</div><div class='add'>+</div><div class='add'>+	ath5k_hw_set_rfgain_opt(ah);</div><div class='add'>+</div><div class='add'>+	return ah;</div><div class='add'>+err_free:</div><div class='add'>+	kfree(ah);</div><div class='add'>+err:</div><div class='add'>+	return ERR_PTR(ret);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_detach - Free the ath5k_hw struct</div><div class='add'>+ *</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ */</div><div class='add'>+void ath5k_hw_detach(struct ath5k_hw *ah)</div><div class='add'>+{</div><div class='add'>+	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='add'>+</div><div class='add'>+	__set_bit(ATH_STAT_INVALID, ah-&gt;ah_sc-&gt;status);</div><div class='add'>+</div><div class='add'>+	if (ah-&gt;ah_rf_banks != NULL)</div><div class='add'>+		kfree(ah-&gt;ah_rf_banks);</div><div class='add'>+</div><div class='add'>+	/* assume interrupts are down */</div><div class='add'>+	kfree(ah);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/ath5k/base.c b/drivers/net/wireless/ath5k/base.c<br/>index 0676c6d84383..9b95c4049b31 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/ath5k/base.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/ath5k/base.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/ath5k/base.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/ath5k/base.c</a></div><div class='hunk'>@@ -72,7 +72,7 @@ MODULE_AUTHOR("Nick Kossifidis");</div><div class='ctx'> MODULE_DESCRIPTION("Support for 5xxx series of Atheros 802.11 wireless LAN cards.");</div><div class='ctx'> MODULE_SUPPORTED_DEVICE("Atheros 5xxx WLAN cards");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='del'>-MODULE_VERSION("0.5.0 (EXPERIMENTAL)");</div><div class='add'>+MODULE_VERSION("0.6.0 (EXPERIMENTAL)");</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* Known PCI ids */</div><div class='hunk'>@@ -93,45 +93,94 @@ static struct pci_device_id ath5k_pci_id_table[] __devinitdata = {</div><div class='ctx'> 	{ PCI_VDEVICE(ATHEROS, 0x0019), .driver_data = AR5K_AR5212 }, /* 5212 combatible */</div><div class='ctx'> 	{ PCI_VDEVICE(ATHEROS, 0x001a), .driver_data = AR5K_AR5212 }, /* 2413 Griffin-lite */</div><div class='ctx'> 	{ PCI_VDEVICE(ATHEROS, 0x001b), .driver_data = AR5K_AR5212 }, /* 5413 Eagle */</div><div class='del'>-	{ PCI_VDEVICE(ATHEROS, 0x001c), .driver_data = AR5K_AR5212 }, /* 5424 Condor (PCI-E)*/</div><div class='add'>+	{ PCI_VDEVICE(ATHEROS, 0x001c), .driver_data = AR5K_AR5212 }, /* PCI-E cards */</div><div class='add'>+	{ PCI_VDEVICE(ATHEROS, 0x001d), .driver_data = AR5K_AR5212 }, /* 2417 Nala */</div><div class='ctx'> 	{ 0 }</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, ath5k_pci_id_table);</div><div class='ctx'> </div><div class='ctx'> /* Known SREVs */</div><div class='ctx'> static struct ath5k_srev_name srev_names[] = {</div><div class='del'>-	{ "5210",	AR5K_VERSION_VER,	AR5K_SREV_VER_AR5210 },</div><div class='del'>-	{ "5311",	AR5K_VERSION_VER,	AR5K_SREV_VER_AR5311 },</div><div class='del'>-	{ "5311A",	AR5K_VERSION_VER,	AR5K_SREV_VER_AR5311A },</div><div class='del'>-	{ "5311B",	AR5K_VERSION_VER,	AR5K_SREV_VER_AR5311B },</div><div class='del'>-	{ "5211",	AR5K_VERSION_VER,	AR5K_SREV_VER_AR5211 },</div><div class='del'>-	{ "5212",	AR5K_VERSION_VER,	AR5K_SREV_VER_AR5212 },</div><div class='del'>-	{ "5213",	AR5K_VERSION_VER,	AR5K_SREV_VER_AR5213 },</div><div class='del'>-	{ "5213A",	AR5K_VERSION_VER,	AR5K_SREV_VER_AR5213A },</div><div class='del'>-	{ "2413",	AR5K_VERSION_VER,	AR5K_SREV_VER_AR2413 },</div><div class='del'>-	{ "2414",	AR5K_VERSION_VER,	AR5K_SREV_VER_AR2414 },</div><div class='del'>-	{ "2424",	AR5K_VERSION_VER,	AR5K_SREV_VER_AR2424 },</div><div class='del'>-	{ "5424",	AR5K_VERSION_VER,	AR5K_SREV_VER_AR5424 },</div><div class='del'>-	{ "5413",	AR5K_VERSION_VER,	AR5K_SREV_VER_AR5413 },</div><div class='del'>-	{ "5414",	AR5K_VERSION_VER,	AR5K_SREV_VER_AR5414 },</div><div class='del'>-	{ "5416",	AR5K_VERSION_VER,	AR5K_SREV_VER_AR5416 },</div><div class='del'>-	{ "5418",	AR5K_VERSION_VER,	AR5K_SREV_VER_AR5418 },</div><div class='del'>-	{ "2425",	AR5K_VERSION_VER,	AR5K_SREV_VER_AR2425 },</div><div class='del'>-	{ "xxxxx",	AR5K_VERSION_VER,	AR5K_SREV_UNKNOWN },</div><div class='add'>+	{ "5210",	AR5K_VERSION_MAC,	AR5K_SREV_AR5210 },</div><div class='add'>+	{ "5311",	AR5K_VERSION_MAC,	AR5K_SREV_AR5311 },</div><div class='add'>+	{ "5311A",	AR5K_VERSION_MAC,	AR5K_SREV_AR5311A },</div><div class='add'>+	{ "5311B",	AR5K_VERSION_MAC,	AR5K_SREV_AR5311B },</div><div class='add'>+	{ "5211",	AR5K_VERSION_MAC,	AR5K_SREV_AR5211 },</div><div class='add'>+	{ "5212",	AR5K_VERSION_MAC,	AR5K_SREV_AR5212 },</div><div class='add'>+	{ "5213",	AR5K_VERSION_MAC,	AR5K_SREV_AR5213 },</div><div class='add'>+	{ "5213A",	AR5K_VERSION_MAC,	AR5K_SREV_AR5213A },</div><div class='add'>+	{ "2413",	AR5K_VERSION_MAC,	AR5K_SREV_AR2413 },</div><div class='add'>+	{ "2414",	AR5K_VERSION_MAC,	AR5K_SREV_AR2414 },</div><div class='add'>+	{ "5424",	AR5K_VERSION_MAC,	AR5K_SREV_AR5424 },</div><div class='add'>+	{ "5413",	AR5K_VERSION_MAC,	AR5K_SREV_AR5413 },</div><div class='add'>+	{ "5414",	AR5K_VERSION_MAC,	AR5K_SREV_AR5414 },</div><div class='add'>+	{ "2415",	AR5K_VERSION_MAC,	AR5K_SREV_AR2415 },</div><div class='add'>+	{ "5416",	AR5K_VERSION_MAC,	AR5K_SREV_AR5416 },</div><div class='add'>+	{ "5418",	AR5K_VERSION_MAC,	AR5K_SREV_AR5418 },</div><div class='add'>+	{ "2425",	AR5K_VERSION_MAC,	AR5K_SREV_AR2425 },</div><div class='add'>+	{ "2417",	AR5K_VERSION_MAC,	AR5K_SREV_AR2417 },</div><div class='add'>+	{ "xxxxx",	AR5K_VERSION_MAC,	AR5K_SREV_UNKNOWN },</div><div class='ctx'> 	{ "5110",	AR5K_VERSION_RAD,	AR5K_SREV_RAD_5110 },</div><div class='ctx'> 	{ "5111",	AR5K_VERSION_RAD,	AR5K_SREV_RAD_5111 },</div><div class='add'>+	{ "5111A",	AR5K_VERSION_RAD,	AR5K_SREV_RAD_5111A },</div><div class='ctx'> 	{ "2111",	AR5K_VERSION_RAD,	AR5K_SREV_RAD_2111 },</div><div class='ctx'> 	{ "5112",	AR5K_VERSION_RAD,	AR5K_SREV_RAD_5112 },</div><div class='ctx'> 	{ "5112A",	AR5K_VERSION_RAD,	AR5K_SREV_RAD_5112A },</div><div class='add'>+	{ "5112B",	AR5K_VERSION_RAD,	AR5K_SREV_RAD_5112B },</div><div class='ctx'> 	{ "2112",	AR5K_VERSION_RAD,	AR5K_SREV_RAD_2112 },</div><div class='ctx'> 	{ "2112A",	AR5K_VERSION_RAD,	AR5K_SREV_RAD_2112A },</div><div class='del'>-	{ "SChip",	AR5K_VERSION_RAD,	AR5K_SREV_RAD_SC0 },</div><div class='del'>-	{ "SChip",	AR5K_VERSION_RAD,	AR5K_SREV_RAD_SC1 },</div><div class='del'>-	{ "SChip",	AR5K_VERSION_RAD,	AR5K_SREV_RAD_SC2 },</div><div class='add'>+	{ "2112B",	AR5K_VERSION_RAD,	AR5K_SREV_RAD_2112B },</div><div class='add'>+	{ "2413",	AR5K_VERSION_RAD,	AR5K_SREV_RAD_2413 },</div><div class='add'>+	{ "5413",	AR5K_VERSION_RAD,	AR5K_SREV_RAD_5413 },</div><div class='add'>+	{ "2316",	AR5K_VERSION_RAD,	AR5K_SREV_RAD_2316 },</div><div class='add'>+	{ "2317",	AR5K_VERSION_RAD,	AR5K_SREV_RAD_2317 },</div><div class='add'>+	{ "5424",	AR5K_VERSION_RAD,	AR5K_SREV_RAD_5424 },</div><div class='ctx'> 	{ "5133",	AR5K_VERSION_RAD,	AR5K_SREV_RAD_5133 },</div><div class='ctx'> 	{ "xxxxx",	AR5K_VERSION_RAD,	AR5K_SREV_UNKNOWN },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct ieee80211_rate ath5k_rates[] = {</div><div class='add'>+	{ .bitrate = 10,</div><div class='add'>+	  .hw_value = ATH5K_RATE_CODE_1M, },</div><div class='add'>+	{ .bitrate = 20,</div><div class='add'>+	  .hw_value = ATH5K_RATE_CODE_2M,</div><div class='add'>+	  .hw_value_short = ATH5K_RATE_CODE_2M | AR5K_SET_SHORT_PREAMBLE,</div><div class='add'>+	  .flags = IEEE80211_RATE_SHORT_PREAMBLE },</div><div class='add'>+	{ .bitrate = 55,</div><div class='add'>+	  .hw_value = ATH5K_RATE_CODE_5_5M,</div><div class='add'>+	  .hw_value_short = ATH5K_RATE_CODE_5_5M | AR5K_SET_SHORT_PREAMBLE,</div><div class='add'>+	  .flags = IEEE80211_RATE_SHORT_PREAMBLE },</div><div class='add'>+	{ .bitrate = 110,</div><div class='add'>+	  .hw_value = ATH5K_RATE_CODE_11M,</div><div class='add'>+	  .hw_value_short = ATH5K_RATE_CODE_11M | AR5K_SET_SHORT_PREAMBLE,</div><div class='add'>+	  .flags = IEEE80211_RATE_SHORT_PREAMBLE },</div><div class='add'>+	{ .bitrate = 60,</div><div class='add'>+	  .hw_value = ATH5K_RATE_CODE_6M,</div><div class='add'>+	  .flags = 0 },</div><div class='add'>+	{ .bitrate = 90,</div><div class='add'>+	  .hw_value = ATH5K_RATE_CODE_9M,</div><div class='add'>+	  .flags = 0 },</div><div class='add'>+	{ .bitrate = 120,</div><div class='add'>+	  .hw_value = ATH5K_RATE_CODE_12M,</div><div class='add'>+	  .flags = 0 },</div><div class='add'>+	{ .bitrate = 180,</div><div class='add'>+	  .hw_value = ATH5K_RATE_CODE_18M,</div><div class='add'>+	  .flags = 0 },</div><div class='add'>+	{ .bitrate = 240,</div><div class='add'>+	  .hw_value = ATH5K_RATE_CODE_24M,</div><div class='add'>+	  .flags = 0 },</div><div class='add'>+	{ .bitrate = 360,</div><div class='add'>+	  .hw_value = ATH5K_RATE_CODE_36M,</div><div class='add'>+	  .flags = 0 },</div><div class='add'>+	{ .bitrate = 480,</div><div class='add'>+	  .hw_value = ATH5K_RATE_CODE_48M,</div><div class='add'>+	  .flags = 0 },</div><div class='add'>+	{ .bitrate = 540,</div><div class='add'>+	  .hw_value = ATH5K_RATE_CODE_54M,</div><div class='add'>+	  .flags = 0 },</div><div class='add'>+	/* XR missing */</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Prototypes - PCI stack related functions</div><div class='ctx'>  */</div><div class='hunk'>@@ -162,7 +211,8 @@ static struct pci_driver ath5k_pci_driver = {</div><div class='ctx'>  * Prototypes - MAC 802.11 stack related functions</div><div class='ctx'>  */</div><div class='ctx'> static int ath5k_tx(struct ieee80211_hw *hw, struct sk_buff *skb);</div><div class='del'>-static int ath5k_reset(struct ieee80211_hw *hw);</div><div class='add'>+static int ath5k_reset(struct ath5k_softc *sc, bool stop, bool change_channel);</div><div class='add'>+static int ath5k_reset_wake(struct ath5k_softc *sc);</div><div class='ctx'> static int ath5k_start(struct ieee80211_hw *hw);</div><div class='ctx'> static void ath5k_stop(struct ieee80211_hw *hw);</div><div class='ctx'> static int ath5k_add_interface(struct ieee80211_hw *hw,</div><div class='hunk'>@@ -218,20 +268,16 @@ static void 	ath5k_detach(struct pci_dev *pdev,</div><div class='ctx'> 			struct ieee80211_hw *hw);</div><div class='ctx'> /* Channel/mode setup */</div><div class='ctx'> static inline short ath5k_ieee2mhz(short chan);</div><div class='del'>-static unsigned int ath5k_copy_rates(struct ieee80211_rate *rates,</div><div class='del'>-				const struct ath5k_rate_table *rt,</div><div class='del'>-				unsigned int max);</div><div class='ctx'> static unsigned int ath5k_copy_channels(struct ath5k_hw *ah,</div><div class='ctx'> 				struct ieee80211_channel *channels,</div><div class='ctx'> 				unsigned int mode,</div><div class='ctx'> 				unsigned int max);</div><div class='del'>-static int 	ath5k_getchannels(struct ieee80211_hw *hw);</div><div class='add'>+static int 	ath5k_setup_bands(struct ieee80211_hw *hw);</div><div class='ctx'> static int 	ath5k_chan_set(struct ath5k_softc *sc,</div><div class='ctx'> 				struct ieee80211_channel *chan);</div><div class='ctx'> static void	ath5k_setcurmode(struct ath5k_softc *sc,</div><div class='ctx'> 				unsigned int mode);</div><div class='ctx'> static void	ath5k_mode_setup(struct ath5k_softc *sc);</div><div class='del'>-static void	ath5k_set_total_hw_rates(struct ath5k_softc *sc);</div><div class='ctx'> </div><div class='ctx'> /* Descriptor setup */</div><div class='ctx'> static int	ath5k_desc_alloc(struct ath5k_softc *sc,</div><div class='hunk'>@@ -351,7 +397,11 @@ ath5k_chip_name(enum ath5k_srev_type type, u_int16_t val)</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(srev_names); i++) {</div><div class='ctx'> 		if (srev_names[i].sr_type != type)</div><div class='ctx'> 			continue;</div><div class='del'>-		if ((val &amp; 0xff) &lt; srev_names[i + 1].sr_val) {</div><div class='add'>+</div><div class='add'>+		if ((val &amp; 0xf0) == srev_names[i].sr_val)</div><div class='add'>+			name = srev_names[i].sr_name;</div><div class='add'>+</div><div class='add'>+		if ((val &amp; 0xff) == srev_names[i].sr_val) {</div><div class='ctx'> 			name = srev_names[i].sr_name;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -446,6 +496,12 @@ ath5k_pci_probe(struct pci_dev *pdev,</div><div class='ctx'> 	hw-&gt;flags = IEEE80211_HW_RX_INCLUDES_FCS |</div><div class='ctx'> 		    IEEE80211_HW_SIGNAL_DBM |</div><div class='ctx'> 		    IEEE80211_HW_NOISE_DBM;</div><div class='add'>+</div><div class='add'>+	hw-&gt;wiphy-&gt;interface_modes =</div><div class='add'>+		BIT(NL80211_IFTYPE_STATION) |</div><div class='add'>+		BIT(NL80211_IFTYPE_ADHOC) |</div><div class='add'>+		BIT(NL80211_IFTYPE_MESH_POINT);</div><div class='add'>+</div><div class='ctx'> 	hw-&gt;extra_tx_headroom = 2;</div><div class='ctx'> 	hw-&gt;channel_change_time = 5000;</div><div class='ctx'> 	sc = hw-&gt;priv;</div><div class='hunk'>@@ -462,7 +518,7 @@ ath5k_pci_probe(struct pci_dev *pdev,</div><div class='ctx'> </div><div class='ctx'> 	sc-&gt;iobase = mem; /* So we can unmap it on detach */</div><div class='ctx'> 	sc-&gt;cachelsz = csz * sizeof(u32); /* convert to bytes */</div><div class='del'>-	sc-&gt;opmode = IEEE80211_IF_TYPE_STA;</div><div class='add'>+	sc-&gt;opmode = NL80211_IFTYPE_STATION;</div><div class='ctx'> 	mutex_init(&amp;sc-&gt;lock);</div><div class='ctx'> 	spin_lock_init(&amp;sc-&gt;rxbuflock);</div><div class='ctx'> 	spin_lock_init(&amp;sc-&gt;txbuflock);</div><div class='hunk'>@@ -485,13 +541,19 @@ ath5k_pci_probe(struct pci_dev *pdev,</div><div class='ctx'> 		goto err_irq;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* set up multi-rate retry capabilities */</div><div class='add'>+	if (sc-&gt;ah-&gt;ah_version == AR5K_AR5212) {</div><div class='add'>+		hw-&gt;max_altrates = 3;</div><div class='add'>+		hw-&gt;max_altrate_tries = 11;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Finish private driver data initialization */</div><div class='ctx'> 	ret = ath5k_attach(pdev, hw);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err_ah;</div><div class='ctx'> </div><div class='ctx'> 	ATH5K_INFO(sc, "Atheros AR%s chip found (MAC: 0x%x, PHY: 0x%x)\n",</div><div class='del'>-			ath5k_chip_name(AR5K_VERSION_VER,sc-&gt;ah-&gt;ah_mac_srev),</div><div class='add'>+			ath5k_chip_name(AR5K_VERSION_MAC, sc-&gt;ah-&gt;ah_mac_srev),</div><div class='ctx'> 					sc-&gt;ah-&gt;ah_mac_srev,</div><div class='ctx'> 					sc-&gt;ah-&gt;ah_phy_revision);</div><div class='ctx'> </div><div class='hunk'>@@ -646,7 +708,6 @@ err_no_irq:</div><div class='ctx'> #endif /* CONFIG_PM */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /***********************\</div><div class='ctx'> * Driver Initialization *</div><div class='ctx'> \***********************/</div><div class='hunk'>@@ -669,7 +730,7 @@ ath5k_attach(struct pci_dev *pdev, struct ieee80211_hw *hw)</div><div class='ctx'> 	 * return false w/o doing anything.  MAC's that do</div><div class='ctx'> 	 * support it will return true w/o doing anything.</div><div class='ctx'> 	 */</div><div class='del'>-	ret = ah-&gt;ah_setup_xtx_desc(ah, NULL, 0, 0, 0, 0, 0, 0);</div><div class='add'>+	ret = ah-&gt;ah_setup_mrr_tx_desc(ah, NULL, 0, 0, 0, 0, 0, 0);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	if (ret &gt; 0)</div><div class='hunk'>@@ -688,15 +749,12 @@ ath5k_attach(struct pci_dev *pdev, struct ieee80211_hw *hw)</div><div class='ctx'> 	 * on settings like the phy mode and regulatory</div><div class='ctx'> 	 * domain restrictions.</div><div class='ctx'> 	 */</div><div class='del'>-	ret = ath5k_getchannels(hw);</div><div class='add'>+	ret = ath5k_setup_bands(hw);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ATH5K_ERR(sc, "can't get channels\n");</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Set *_rates so we can map hw rate index */</div><div class='del'>-	ath5k_set_total_hw_rates(sc);</div><div class='del'>-</div><div class='ctx'> 	/* NB: setup here so ath5k_rate_update is happy */</div><div class='ctx'> 	if (test_bit(AR5K_MODE_11A, ah-&gt;ah_modes))</div><div class='ctx'> 		ath5k_setcurmode(sc, AR5K_MODE_11A);</div><div class='hunk'>@@ -813,27 +871,6 @@ ath5k_ieee2mhz(short chan)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static unsigned int</div><div class='del'>-ath5k_copy_rates(struct ieee80211_rate *rates,</div><div class='del'>-		const struct ath5k_rate_table *rt,</div><div class='del'>-		unsigned int max)</div><div class='del'>-{</div><div class='del'>-	unsigned int i, count;</div><div class='del'>-</div><div class='del'>-	if (rt == NULL)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	for (i = 0, count = 0; i &lt; rt-&gt;rate_count &amp;&amp; max &gt; 0; i++) {</div><div class='del'>-		rates[count].bitrate = rt-&gt;rates[i].rate_kbps / 100;</div><div class='del'>-		rates[count].hw_value = rt-&gt;rates[i].rate_code;</div><div class='del'>-		rates[count].flags = rt-&gt;rates[i].modulation;</div><div class='del'>-		count++;</div><div class='del'>-		max--;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned int</div><div class='ctx'> ath5k_copy_channels(struct ath5k_hw *ah,</div><div class='ctx'> 		struct ieee80211_channel *channels,</div><div class='ctx'> 		unsigned int mode,</div><div class='hunk'>@@ -895,74 +932,97 @@ ath5k_copy_channels(struct ath5k_hw *ah,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void</div><div class='add'>+ath5k_setup_rate_idx(struct ath5k_softc *sc, struct ieee80211_supported_band *b)</div><div class='add'>+{</div><div class='add'>+	u8 i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; AR5K_MAX_RATES; i++)</div><div class='add'>+		sc-&gt;rate_idx[b-&gt;band][i] = -1;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; b-&gt;n_bitrates; i++) {</div><div class='add'>+		sc-&gt;rate_idx[b-&gt;band][b-&gt;bitrates[i].hw_value] = i;</div><div class='add'>+		if (b-&gt;bitrates[i].hw_value_short)</div><div class='add'>+			sc-&gt;rate_idx[b-&gt;band][b-&gt;bitrates[i].hw_value_short] = i;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int</div><div class='del'>-ath5k_getchannels(struct ieee80211_hw *hw)</div><div class='add'>+ath5k_setup_bands(struct ieee80211_hw *hw)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath5k_softc *sc = hw-&gt;priv;</div><div class='ctx'> 	struct ath5k_hw *ah = sc-&gt;ah;</div><div class='del'>-	struct ieee80211_supported_band *sbands = sc-&gt;sbands;</div><div class='del'>-	const struct ath5k_rate_table *hw_rates;</div><div class='del'>-	unsigned int max_r, max_c, count_r, count_c;</div><div class='del'>-	int mode2g = AR5K_MODE_11G;</div><div class='add'>+	struct ieee80211_supported_band *sband;</div><div class='add'>+	int max_c, count_c = 0;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	BUILD_BUG_ON(ARRAY_SIZE(sc-&gt;sbands) &lt; IEEE80211_NUM_BANDS);</div><div class='del'>-</div><div class='del'>-	max_r = ARRAY_SIZE(sc-&gt;rates);</div><div class='ctx'> 	max_c = ARRAY_SIZE(sc-&gt;channels);</div><div class='del'>-	count_r = count_c = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* 2GHz band */</div><div class='del'>-	if (!test_bit(AR5K_MODE_11G, sc-&gt;ah-&gt;ah_capabilities.cap_mode)) {</div><div class='del'>-		mode2g = AR5K_MODE_11B;</div><div class='del'>-		if (!test_bit(AR5K_MODE_11B,</div><div class='del'>-			sc-&gt;ah-&gt;ah_capabilities.cap_mode))</div><div class='del'>-			mode2g = -1;</div><div class='del'>-	}</div><div class='add'>+	sband = &amp;sc-&gt;sbands[IEEE80211_BAND_2GHZ];</div><div class='add'>+	sband-&gt;band = IEEE80211_BAND_2GHZ;</div><div class='add'>+	sband-&gt;bitrates = &amp;sc-&gt;rates[IEEE80211_BAND_2GHZ][0];</div><div class='ctx'> </div><div class='del'>-	if (mode2g &gt; 0) {</div><div class='del'>-		struct ieee80211_supported_band *sband =</div><div class='del'>-			&amp;sbands[IEEE80211_BAND_2GHZ];</div><div class='add'>+	if (test_bit(AR5K_MODE_11G, sc-&gt;ah-&gt;ah_capabilities.cap_mode)) {</div><div class='add'>+		/* G mode */</div><div class='add'>+		memcpy(sband-&gt;bitrates, &amp;ath5k_rates[0],</div><div class='add'>+		       sizeof(struct ieee80211_rate) * 12);</div><div class='add'>+		sband-&gt;n_bitrates = 12;</div><div class='ctx'> </div><div class='del'>-		sband-&gt;bitrates = sc-&gt;rates;</div><div class='ctx'> 		sband-&gt;channels = sc-&gt;channels;</div><div class='del'>-</div><div class='del'>-		sband-&gt;band = IEEE80211_BAND_2GHZ;</div><div class='ctx'> 		sband-&gt;n_channels = ath5k_copy_channels(ah, sband-&gt;channels,</div><div class='del'>-					mode2g, max_c);</div><div class='del'>-</div><div class='del'>-		hw_rates = ath5k_hw_get_rate_table(ah, mode2g);</div><div class='del'>-		sband-&gt;n_bitrates = ath5k_copy_rates(sband-&gt;bitrates,</div><div class='del'>-					hw_rates, max_r);</div><div class='add'>+					AR5K_MODE_11G, max_c);</div><div class='ctx'> </div><div class='add'>+		hw-&gt;wiphy-&gt;bands[IEEE80211_BAND_2GHZ] = sband;</div><div class='ctx'> 		count_c = sband-&gt;n_channels;</div><div class='del'>-		count_r = sband-&gt;n_bitrates;</div><div class='add'>+		max_c -= count_c;</div><div class='add'>+	} else if (test_bit(AR5K_MODE_11B, sc-&gt;ah-&gt;ah_capabilities.cap_mode)) {</div><div class='add'>+		/* B mode */</div><div class='add'>+		memcpy(sband-&gt;bitrates, &amp;ath5k_rates[0],</div><div class='add'>+		       sizeof(struct ieee80211_rate) * 4);</div><div class='add'>+		sband-&gt;n_bitrates = 4;</div><div class='add'>+</div><div class='add'>+		/* 5211 only supports B rates and uses 4bit rate codes</div><div class='add'>+		 * (e.g normally we have 0x1B for 1M, but on 5211 we have 0x0B)</div><div class='add'>+		 * fix them up here:</div><div class='add'>+		 */</div><div class='add'>+		if (ah-&gt;ah_version == AR5K_AR5211) {</div><div class='add'>+			for (i = 0; i &lt; 4; i++) {</div><div class='add'>+				sband-&gt;bitrates[i].hw_value =</div><div class='add'>+					sband-&gt;bitrates[i].hw_value &amp; 0xF;</div><div class='add'>+				sband-&gt;bitrates[i].hw_value_short =</div><div class='add'>+					sband-&gt;bitrates[i].hw_value_short &amp; 0xF;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		hw-&gt;wiphy-&gt;bands[IEEE80211_BAND_2GHZ] = sband;</div><div class='add'>+		sband-&gt;channels = sc-&gt;channels;</div><div class='add'>+		sband-&gt;n_channels = ath5k_copy_channels(ah, sband-&gt;channels,</div><div class='add'>+					AR5K_MODE_11B, max_c);</div><div class='ctx'> </div><div class='del'>-		max_r -= count_r;</div><div class='add'>+		hw-&gt;wiphy-&gt;bands[IEEE80211_BAND_2GHZ] = sband;</div><div class='add'>+		count_c = sband-&gt;n_channels;</div><div class='ctx'> 		max_c -= count_c;</div><div class='del'>-</div><div class='ctx'> 	}</div><div class='add'>+	ath5k_setup_rate_idx(sc, sband);</div><div class='ctx'> </div><div class='del'>-	/* 5GHz band */</div><div class='del'>-</div><div class='add'>+	/* 5GHz band, A mode */</div><div class='ctx'> 	if (test_bit(AR5K_MODE_11A, sc-&gt;ah-&gt;ah_capabilities.cap_mode)) {</div><div class='del'>-		struct ieee80211_supported_band *sband =</div><div class='del'>-			&amp;sbands[IEEE80211_BAND_5GHZ];</div><div class='add'>+		sband = &amp;sc-&gt;sbands[IEEE80211_BAND_5GHZ];</div><div class='add'>+		sband-&gt;band = IEEE80211_BAND_5GHZ;</div><div class='add'>+		sband-&gt;bitrates = &amp;sc-&gt;rates[IEEE80211_BAND_5GHZ][0];</div><div class='ctx'> </div><div class='del'>-		sband-&gt;bitrates = &amp;sc-&gt;rates[count_r];</div><div class='del'>-		sband-&gt;channels = &amp;sc-&gt;channels[count_c];</div><div class='add'>+		memcpy(sband-&gt;bitrates, &amp;ath5k_rates[4],</div><div class='add'>+		       sizeof(struct ieee80211_rate) * 8);</div><div class='add'>+		sband-&gt;n_bitrates = 8;</div><div class='ctx'> </div><div class='del'>-		sband-&gt;band = IEEE80211_BAND_5GHZ;</div><div class='add'>+		sband-&gt;channels = &amp;sc-&gt;channels[count_c];</div><div class='ctx'> 		sband-&gt;n_channels = ath5k_copy_channels(ah, sband-&gt;channels,</div><div class='ctx'> 					AR5K_MODE_11A, max_c);</div><div class='ctx'> </div><div class='del'>-		hw_rates = ath5k_hw_get_rate_table(ah, AR5K_MODE_11A);</div><div class='del'>-		sband-&gt;n_bitrates = ath5k_copy_rates(sband-&gt;bitrates,</div><div class='del'>-					hw_rates, max_r);</div><div class='del'>-</div><div class='ctx'> 		hw-&gt;wiphy-&gt;bands[IEEE80211_BAND_5GHZ] = sband;</div><div class='ctx'> 	}</div><div class='add'>+	ath5k_setup_rate_idx(sc, sband);</div><div class='ctx'> </div><div class='ctx'> 	ath5k_debug_dump_bands(sc);</div><div class='ctx'> </div><div class='hunk'>@@ -978,9 +1038,6 @@ ath5k_getchannels(struct ieee80211_hw *hw)</div><div class='ctx'> static int</div><div class='ctx'> ath5k_chan_set(struct ath5k_softc *sc, struct ieee80211_channel *chan)</div><div class='ctx'> {</div><div class='del'>-	struct ath5k_hw *ah = sc-&gt;ah;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='ctx'> 	ATH5K_DBG(sc, ATH5K_DEBUG_RESET, "(%u MHz) -&gt; (%u MHz)\n",</div><div class='ctx'> 		sc-&gt;curchan-&gt;center_freq, chan-&gt;center_freq);</div><div class='ctx'> </div><div class='hunk'>@@ -996,41 +1053,7 @@ ath5k_chan_set(struct ath5k_softc *sc, struct ieee80211_channel *chan)</div><div class='ctx'> 		 * hardware at the new frequency, and then re-enable</div><div class='ctx'> 		 * the relevant bits of the h/w.</div><div class='ctx'> 		 */</div><div class='del'>-		ath5k_hw_set_intr(ah, 0);	/* disable interrupts */</div><div class='del'>-		ath5k_txq_cleanup(sc);		/* clear pending tx frames */</div><div class='del'>-		ath5k_rx_stop(sc);		/* turn off frame recv */</div><div class='del'>-		ret = ath5k_hw_reset(ah, sc-&gt;opmode, sc-&gt;curchan, true);</div><div class='del'>-		if (ret) {</div><div class='del'>-			ATH5K_ERR(sc, "%s: unable to reset channel "</div><div class='del'>-				"(%u Mhz)\n", __func__, chan-&gt;center_freq);</div><div class='del'>-			return ret;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ath5k_hw_set_txpower_limit(sc-&gt;ah, 0);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Re-enable rx framework.</div><div class='del'>-		 */</div><div class='del'>-		ret = ath5k_rx_start(sc);</div><div class='del'>-		if (ret) {</div><div class='del'>-			ATH5K_ERR(sc, "%s: unable to restart recv logic\n",</div><div class='del'>-					__func__);</div><div class='del'>-			return ret;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Change channels and update the h/w rate map</div><div class='del'>-		 * if we're switching; e.g. 11a to 11b/g.</div><div class='del'>-		 *</div><div class='del'>-		 * XXX needed?</div><div class='del'>-		 */</div><div class='del'>-/*		ath5k_chan_change(sc, chan); */</div><div class='del'>-</div><div class='del'>-		ath5k_beacon_config(sc);</div><div class='del'>-		/*</div><div class='del'>-		 * Re-enable interrupts.</div><div class='del'>-		 */</div><div class='del'>-		ath5k_hw_set_intr(ah, sc-&gt;imask);</div><div class='add'>+		return ath5k_reset(sc, true, true);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1068,75 +1091,13 @@ ath5k_mode_setup(struct ath5k_softc *sc)</div><div class='ctx'> 	ATH5K_DBG(sc, ATH5K_DEBUG_MODE, "RX filter 0x%x\n", rfilt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Match the hw provided rate index (through descriptors)</div><div class='del'>- * to an index for sc-&gt;curband-&gt;bitrates, so it can be used</div><div class='del'>- * by the stack.</div><div class='del'>- *</div><div class='del'>- * This one is a little bit tricky but i think i'm right</div><div class='del'>- * about this...</div><div class='del'>- *</div><div class='del'>- * We have 4 rate tables in the following order:</div><div class='del'>- * XR (4 rates)</div><div class='del'>- * 802.11a (8 rates)</div><div class='del'>- * 802.11b (4 rates)</div><div class='del'>- * 802.11g (12 rates)</div><div class='del'>- * that make the hw rate table.</div><div class='del'>- *</div><div class='del'>- * Lets take a 5211 for example that supports a and b modes only.</div><div class='del'>- * First comes the 802.11a table and then 802.11b (total 12 rates).</div><div class='del'>- * When hw returns eg. 11 it points to the last 802.11b rate (11Mbit),</div><div class='del'>- * if it returns 2 it points to the second 802.11a rate etc.</div><div class='del'>- *</div><div class='del'>- * Same goes for 5212 who has xr/a/b/g support (total 28 rates).</div><div class='del'>- * First comes the XR table, then 802.11a, 802.11b and 802.11g.</div><div class='del'>- * When hw returns eg. 27 it points to the last 802.11g rate (54Mbits) etc</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-ath5k_set_total_hw_rates(struct ath5k_softc *sc) {</div><div class='del'>-</div><div class='del'>-	struct ath5k_hw *ah = sc-&gt;ah;</div><div class='del'>-</div><div class='del'>-	if (test_bit(AR5K_MODE_11A, ah-&gt;ah_modes))</div><div class='del'>-		sc-&gt;a_rates = 8;</div><div class='del'>-</div><div class='del'>-	if (test_bit(AR5K_MODE_11B, ah-&gt;ah_modes))</div><div class='del'>-		sc-&gt;b_rates = 4;</div><div class='del'>-</div><div class='del'>-	if (test_bit(AR5K_MODE_11G, ah-&gt;ah_modes))</div><div class='del'>-		sc-&gt;g_rates = 12;</div><div class='del'>-</div><div class='del'>-	/* XXX: Need to see what what happens when</div><div class='del'>-		xr disable bits in eeprom are set */</div><div class='del'>-	if (ah-&gt;ah_version &gt;= AR5K_AR5212)</div><div class='del'>-		sc-&gt;xr_rates = 4;</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline int</div><div class='del'>-ath5k_hw_to_driver_rix(struct ath5k_softc *sc, int hw_rix) {</div><div class='del'>-</div><div class='del'>-	int mac80211_rix;</div><div class='del'>-</div><div class='del'>-	if(sc-&gt;curband-&gt;band == IEEE80211_BAND_2GHZ) {</div><div class='del'>-		/* We setup a g ratetable for both b/g modes */</div><div class='del'>-		mac80211_rix =</div><div class='del'>-			hw_rix - sc-&gt;b_rates - sc-&gt;a_rates - sc-&gt;xr_rates;</div><div class='del'>-	} else {</div><div class='del'>-		mac80211_rix = hw_rix - sc-&gt;xr_rates;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Something went wrong, fallback to basic rate for this band */</div><div class='del'>-	if ((mac80211_rix &gt;= sc-&gt;curband-&gt;n_bitrates) ||</div><div class='del'>-		(mac80211_rix &lt;= 0 ))</div><div class='del'>-		mac80211_rix = 1;</div><div class='del'>-</div><div class='del'>-	return mac80211_rix;</div><div class='add'>+ath5k_hw_to_driver_rix(struct ath5k_softc *sc, int hw_rix)</div><div class='add'>+{</div><div class='add'>+	WARN_ON(hw_rix &lt; 0 || hw_rix &gt; AR5K_MAX_RATES);</div><div class='add'>+	return sc-&gt;rate_idx[sc-&gt;curband-&gt;band][hw_rix];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> /***************\</div><div class='ctx'> * Buffers setup *</div><div class='ctx'> \***************/</div><div class='hunk'>@@ -1199,7 +1160,7 @@ ath5k_rxbuf_setup(struct ath5k_softc *sc, struct ath5k_buf *bf)</div><div class='ctx'> 	ds = bf-&gt;desc;</div><div class='ctx'> 	ds-&gt;ds_link = bf-&gt;daddr;	/* link to self */</div><div class='ctx'> 	ds-&gt;ds_data = bf-&gt;skbaddr;</div><div class='del'>-	ath5k_hw_setup_rx_desc(ah, ds,</div><div class='add'>+	ah-&gt;ah_setup_rx_desc(ah, ds,</div><div class='ctx'> 		skb_tailroom(skb),	/* buffer size */</div><div class='ctx'> 		0);</div><div class='ctx'> </div><div class='hunk'>@@ -1218,7 +1179,9 @@ ath5k_txbuf_setup(struct ath5k_softc *sc, struct ath5k_buf *bf)</div><div class='ctx'> 	struct sk_buff *skb = bf-&gt;skb;</div><div class='ctx'> 	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);</div><div class='ctx'> 	unsigned int pktlen, flags, keyidx = AR5K_TXKEYIX_INVALID;</div><div class='del'>-	int ret;</div><div class='add'>+	struct ieee80211_rate *rate;</div><div class='add'>+	unsigned int mrr_rate[3], mrr_tries[3];</div><div class='add'>+	int i, ret;</div><div class='ctx'> </div><div class='ctx'> 	flags = AR5K_TXDESC_INTREQ | AR5K_TXDESC_CLRDMASK;</div><div class='ctx'> </div><div class='hunk'>@@ -1233,7 +1196,7 @@ ath5k_txbuf_setup(struct ath5k_softc *sc, struct ath5k_buf *bf)</div><div class='ctx'> </div><div class='ctx'> 	if (info-&gt;control.hw_key) {</div><div class='ctx'> 		keyidx = info-&gt;control.hw_key-&gt;hw_key_idx;</div><div class='del'>-		pktlen += info-&gt;control.icv_len;</div><div class='add'>+		pktlen += info-&gt;control.hw_key-&gt;icv_len;</div><div class='ctx'> 	}</div><div class='ctx'> 	ret = ah-&gt;ah_setup_tx_desc(ah, ds, pktlen,</div><div class='ctx'> 		ieee80211_get_hdrlen_from_skb(skb), AR5K_PKT_TYPE_NORMAL,</div><div class='hunk'>@@ -1243,6 +1206,22 @@ ath5k_txbuf_setup(struct ath5k_softc *sc, struct ath5k_buf *bf)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err_unmap;</div><div class='ctx'> </div><div class='add'>+	memset(mrr_rate, 0, sizeof(mrr_rate));</div><div class='add'>+	memset(mrr_tries, 0, sizeof(mrr_tries));</div><div class='add'>+	for (i = 0; i &lt; 3; i++) {</div><div class='add'>+		rate = ieee80211_get_alt_retry_rate(sc-&gt;hw, info, i);</div><div class='add'>+		if (!rate)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		mrr_rate[i] = rate-&gt;hw_value;</div><div class='add'>+		mrr_tries[i] = info-&gt;control.retries[i].limit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ah-&gt;ah_setup_mrr_tx_desc(ah, ds,</div><div class='add'>+		mrr_rate[0], mrr_tries[0],</div><div class='add'>+		mrr_rate[1], mrr_tries[1],</div><div class='add'>+		mrr_rate[2], mrr_tries[2]);</div><div class='add'>+</div><div class='ctx'> 	ds-&gt;ds_link = 0;</div><div class='ctx'> 	ds-&gt;ds_data = bf-&gt;skbaddr;</div><div class='ctx'> </div><div class='hunk'>@@ -1250,12 +1229,12 @@ ath5k_txbuf_setup(struct ath5k_softc *sc, struct ath5k_buf *bf)</div><div class='ctx'> 	list_add_tail(&amp;bf-&gt;list, &amp;txq-&gt;q);</div><div class='ctx'> 	sc-&gt;tx_stats[txq-&gt;qnum].len++;</div><div class='ctx'> 	if (txq-&gt;link == NULL) /* is this first packet? */</div><div class='del'>-		ath5k_hw_put_tx_buf(ah, txq-&gt;qnum, bf-&gt;daddr);</div><div class='add'>+		ath5k_hw_set_txdp(ah, txq-&gt;qnum, bf-&gt;daddr);</div><div class='ctx'> 	else /* no, so only link it */</div><div class='ctx'> 		*txq-&gt;link = bf-&gt;daddr;</div><div class='ctx'> </div><div class='ctx'> 	txq-&gt;link = &amp;ds-&gt;ds_link;</div><div class='del'>-	ath5k_hw_tx_start(ah, txq-&gt;qnum);</div><div class='add'>+	ath5k_hw_start_tx_dma(ah, txq-&gt;qnum);</div><div class='ctx'> 	mmiowb();</div><div class='ctx'> 	spin_unlock_bh(&amp;txq-&gt;lock);</div><div class='ctx'> </div><div class='hunk'>@@ -1433,7 +1412,8 @@ ath5k_beaconq_config(struct ath5k_softc *sc)</div><div class='ctx'> 	ret = ath5k_hw_get_tx_queueprops(ah, sc-&gt;bhalq, &amp;qi);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='del'>-	if (sc-&gt;opmode == IEEE80211_IF_TYPE_AP) {</div><div class='add'>+	if (sc-&gt;opmode == NL80211_IFTYPE_AP ||</div><div class='add'>+		sc-&gt;opmode == NL80211_IFTYPE_MESH_POINT) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Always burst out beacon and CAB traffic</div><div class='ctx'> 		 * (aifs = cwmin = cwmax = 0)</div><div class='hunk'>@@ -1441,7 +1421,7 @@ ath5k_beaconq_config(struct ath5k_softc *sc)</div><div class='ctx'> 		qi.tqi_aifs = 0;</div><div class='ctx'> 		qi.tqi_cw_min = 0;</div><div class='ctx'> 		qi.tqi_cw_max = 0;</div><div class='del'>-	} else if (sc-&gt;opmode == IEEE80211_IF_TYPE_IBSS) {</div><div class='add'>+	} else if (sc-&gt;opmode == NL80211_IFTYPE_ADHOC) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Adhoc mode; backoff between 0 and (2 * cw_min).</div><div class='ctx'> 		 */</div><div class='hunk'>@@ -1454,7 +1434,7 @@ ath5k_beaconq_config(struct ath5k_softc *sc)</div><div class='ctx'> 		"beacon queueprops tqi_aifs:%d tqi_cw_min:%d tqi_cw_max:%d\n",</div><div class='ctx'> 		qi.tqi_aifs, qi.tqi_cw_min, qi.tqi_cw_max);</div><div class='ctx'> </div><div class='del'>-	ret = ath5k_hw_setup_tx_queueprops(ah, sc-&gt;bhalq, &amp;qi);</div><div class='add'>+	ret = ath5k_hw_set_tx_queueprops(ah, sc-&gt;bhalq, &amp;qi);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ATH5K_ERR(sc, "%s: unable to update parameters for beacon "</div><div class='ctx'> 			"hardware queue!\n", __func__);</div><div class='hunk'>@@ -1503,14 +1483,14 @@ ath5k_txq_cleanup(struct ath5k_softc *sc)</div><div class='ctx'> 		/* don't touch the hardware if marked invalid */</div><div class='ctx'> 		ath5k_hw_stop_tx_dma(ah, sc-&gt;bhalq);</div><div class='ctx'> 		ATH5K_DBG(sc, ATH5K_DEBUG_RESET, "beacon queue %x\n",</div><div class='del'>-			ath5k_hw_get_tx_buf(ah, sc-&gt;bhalq));</div><div class='add'>+			ath5k_hw_get_txdp(ah, sc-&gt;bhalq));</div><div class='ctx'> 		for (i = 0; i &lt; ARRAY_SIZE(sc-&gt;txqs); i++)</div><div class='ctx'> 			if (sc-&gt;txqs[i].setup) {</div><div class='ctx'> 				ath5k_hw_stop_tx_dma(ah, sc-&gt;txqs[i].qnum);</div><div class='ctx'> 				ATH5K_DBG(sc, ATH5K_DEBUG_RESET, "txq [%u] %x, "</div><div class='ctx'> 					"link %p\n",</div><div class='ctx'> 					sc-&gt;txqs[i].qnum,</div><div class='del'>-					ath5k_hw_get_tx_buf(ah,</div><div class='add'>+					ath5k_hw_get_txdp(ah,</div><div class='ctx'> 							sc-&gt;txqs[i].qnum),</div><div class='ctx'> 					sc-&gt;txqs[i].link);</div><div class='ctx'> 			}</div><div class='hunk'>@@ -1570,8 +1550,8 @@ ath5k_rx_start(struct ath5k_softc *sc)</div><div class='ctx'> 	bf = list_first_entry(&amp;sc-&gt;rxbuf, struct ath5k_buf, list);</div><div class='ctx'> 	spin_unlock_bh(&amp;sc-&gt;rxbuflock);</div><div class='ctx'> </div><div class='del'>-	ath5k_hw_put_rx_buf(ah, bf-&gt;daddr);</div><div class='del'>-	ath5k_hw_start_rx(ah);		/* enable recv descriptors */</div><div class='add'>+	ath5k_hw_set_rxdp(ah, bf-&gt;daddr);</div><div class='add'>+	ath5k_hw_start_rx_dma(ah);	/* enable recv descriptors */</div><div class='ctx'> 	ath5k_mode_setup(sc);		/* set filters, etc. */</div><div class='ctx'> 	ath5k_hw_start_rx_pcu(ah);	/* re-enable PCU/DMA engine */</div><div class='ctx'> </div><div class='hunk'>@@ -1588,7 +1568,7 @@ ath5k_rx_stop(struct ath5k_softc *sc)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath5k_hw *ah = sc-&gt;ah;</div><div class='ctx'> </div><div class='del'>-	ath5k_hw_stop_pcu_recv(ah);	/* disable PCU */</div><div class='add'>+	ath5k_hw_stop_rx_pcu(ah);	/* disable PCU */</div><div class='ctx'> 	ath5k_hw_set_rx_filter(ah, 0);	/* clear recv filter */</div><div class='ctx'> 	ath5k_hw_stop_rx_dma(ah);	/* disable DMA engine */</div><div class='ctx'> </div><div class='hunk'>@@ -1602,7 +1582,7 @@ ath5k_rx_decrypted(struct ath5k_softc *sc, struct ath5k_desc *ds,</div><div class='ctx'> 		struct sk_buff *skb, struct ath5k_rx_status *rs)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_hdr *hdr = (void *)skb-&gt;data;</div><div class='del'>-	unsigned int keyix, hlen = ieee80211_get_hdrlen_from_skb(skb);</div><div class='add'>+	unsigned int keyix, hlen;</div><div class='ctx'> </div><div class='ctx'> 	if (!(rs-&gt;rs_status &amp; AR5K_RXERR_DECRYPT) &amp;&amp;</div><div class='ctx'> 			rs-&gt;rs_keyix != AR5K_RXKEYIX_INVALID)</div><div class='hunk'>@@ -1611,6 +1591,7 @@ ath5k_rx_decrypted(struct ath5k_softc *sc, struct ath5k_desc *ds,</div><div class='ctx'> 	/* Apparently when a default key is used to decrypt the packet</div><div class='ctx'> 	   the hw does not set the index used to decrypt.  In such cases</div><div class='ctx'> 	   get the index from the packet. */</div><div class='add'>+	hlen = ieee80211_hdrlen(hdr-&gt;frame_control);</div><div class='ctx'> 	if (ieee80211_has_protected(hdr-&gt;frame_control) &amp;&amp;</div><div class='ctx'> 	    !(rs-&gt;rs_status &amp; AR5K_RXERR_DECRYPT) &amp;&amp;</div><div class='ctx'> 	    skb-&gt;len &gt;= hlen + 4) {</div><div class='hunk'>@@ -1768,7 +1749,7 @@ ath5k_tasklet_rx(unsigned long data)</div><div class='ctx'> 			/* let crypto-error packets fall through in MNTR */</div><div class='ctx'> 			if ((rs.rs_status &amp;</div><div class='ctx'> 				~(AR5K_RXERR_DECRYPT|AR5K_RXERR_MIC)) ||</div><div class='del'>-					sc-&gt;opmode != IEEE80211_IF_TYPE_MNTR)</div><div class='add'>+					sc-&gt;opmode != NL80211_IFTYPE_MONITOR)</div><div class='ctx'> 				goto next;</div><div class='ctx'> 		}</div><div class='ctx'> accept:</div><div class='hunk'>@@ -1824,10 +1805,14 @@ accept:</div><div class='ctx'> 		rxs.rate_idx = ath5k_hw_to_driver_rix(sc, rs.rs_rate);</div><div class='ctx'> 		rxs.flag |= ath5k_rx_decrypted(sc, ds, skb, &amp;rs);</div><div class='ctx'> </div><div class='add'>+		if (rxs.rate_idx &gt;= 0 &amp;&amp; rs.rs_rate ==</div><div class='add'>+		    sc-&gt;curband-&gt;bitrates[rxs.rate_idx].hw_value_short)</div><div class='add'>+			rxs.flag |= RX_FLAG_SHORTPRE;</div><div class='add'>+</div><div class='ctx'> 		ath5k_debug_dump_skb(sc, skb, "RX  ", 0);</div><div class='ctx'> </div><div class='ctx'> 		/* check beacons in IBSS mode */</div><div class='del'>-		if (sc-&gt;opmode == IEEE80211_IF_TYPE_IBSS)</div><div class='add'>+		if (sc-&gt;opmode == NL80211_IFTYPE_ADHOC)</div><div class='ctx'> 			ath5k_check_ibss_tsf(sc, skb, &amp;rxs);</div><div class='ctx'> </div><div class='ctx'> 		__ieee80211_rx(sc-&gt;hw, skb, &amp;rxs);</div><div class='hunk'>@@ -1853,7 +1838,7 @@ ath5k_tx_processq(struct ath5k_softc *sc, struct ath5k_txq *txq)</div><div class='ctx'> 	struct ath5k_desc *ds;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	struct ieee80211_tx_info *info;</div><div class='del'>-	int ret;</div><div class='add'>+	int i, ret;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;txq-&gt;lock);</div><div class='ctx'> 	list_for_each_entry_safe(bf, bf0, &amp;txq-&gt;q, list) {</div><div class='hunk'>@@ -1875,7 +1860,25 @@ ath5k_tx_processq(struct ath5k_softc *sc, struct ath5k_txq *txq)</div><div class='ctx'> 		pci_unmap_single(sc-&gt;pdev, bf-&gt;skbaddr, skb-&gt;len,</div><div class='ctx'> 				PCI_DMA_TODEVICE);</div><div class='ctx'> </div><div class='del'>-		info-&gt;status.retry_count = ts.ts_shortretry + ts.ts_longretry / 6;</div><div class='add'>+		memset(&amp;info-&gt;status, 0, sizeof(info-&gt;status));</div><div class='add'>+		info-&gt;tx_rate_idx = ath5k_hw_to_driver_rix(sc,</div><div class='add'>+				ts.ts_rate[ts.ts_final_idx]);</div><div class='add'>+		info-&gt;status.retry_count = ts.ts_longretry;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; 4; i++) {</div><div class='add'>+			struct ieee80211_tx_altrate *r =</div><div class='add'>+				&amp;info-&gt;status.retries[i];</div><div class='add'>+</div><div class='add'>+			if (ts.ts_rate[i]) {</div><div class='add'>+				r-&gt;rate_idx = ath5k_hw_to_driver_rix(sc, ts.ts_rate[i]);</div><div class='add'>+				r-&gt;limit = ts.ts_retry[i];</div><div class='add'>+			} else {</div><div class='add'>+				r-&gt;rate_idx = -1;</div><div class='add'>+				r-&gt;limit = 0;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		info-&gt;status.excessive_retries = 0;</div><div class='ctx'> 		if (unlikely(ts.ts_status)) {</div><div class='ctx'> 			sc-&gt;ll_stats.dot11ACKFailureCount++;</div><div class='ctx'> 			if (ts.ts_status &amp; AR5K_TXERR_XRETRY)</div><div class='hunk'>@@ -1942,7 +1945,7 @@ ath5k_beacon_setup(struct ath5k_softc *sc, struct ath5k_buf *bf)</div><div class='ctx'> 	ds = bf-&gt;desc;</div><div class='ctx'> </div><div class='ctx'> 	flags = AR5K_TXDESC_NOACK;</div><div class='del'>-	if (sc-&gt;opmode == IEEE80211_IF_TYPE_IBSS &amp;&amp; ath5k_hw_hasveol(ah)) {</div><div class='add'>+	if (sc-&gt;opmode == NL80211_IFTYPE_ADHOC &amp;&amp; ath5k_hw_hasveol(ah)) {</div><div class='ctx'> 		ds-&gt;ds_link = bf-&gt;daddr;	/* self-linked */</div><div class='ctx'> 		flags |= AR5K_TXDESC_VEOL;</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -1991,8 +1994,8 @@ ath5k_beacon_send(struct ath5k_softc *sc)</div><div class='ctx'> </div><div class='ctx'> 	ATH5K_DBG_UNLIMIT(sc, ATH5K_DEBUG_BEACON, "in beacon_send\n");</div><div class='ctx'> </div><div class='del'>-	if (unlikely(bf-&gt;skb == NULL || sc-&gt;opmode == IEEE80211_IF_TYPE_STA ||</div><div class='del'>-			sc-&gt;opmode == IEEE80211_IF_TYPE_MNTR)) {</div><div class='add'>+	if (unlikely(bf-&gt;skb == NULL || sc-&gt;opmode == NL80211_IFTYPE_STATION ||</div><div class='add'>+			sc-&gt;opmode == NL80211_IFTYPE_MONITOR)) {</div><div class='ctx'> 		ATH5K_WARN(sc, "bf=%p bf_skb=%p\n", bf, bf ? bf-&gt;skb : NULL);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2032,8 +2035,8 @@ ath5k_beacon_send(struct ath5k_softc *sc)</div><div class='ctx'> 		/* NB: hw still stops DMA, so proceed */</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ath5k_hw_put_tx_buf(ah, sc-&gt;bhalq, bf-&gt;daddr);</div><div class='del'>-	ath5k_hw_tx_start(ah, sc-&gt;bhalq);</div><div class='add'>+	ath5k_hw_set_txdp(ah, sc-&gt;bhalq, bf-&gt;daddr);</div><div class='add'>+	ath5k_hw_start_tx_dma(ah, sc-&gt;bhalq);</div><div class='ctx'> 	ATH5K_DBG(sc, ATH5K_DEBUG_BEACON, "TXDP[%u] = %llx (%p)\n",</div><div class='ctx'> 		sc-&gt;bhalq, (unsigned long long)bf-&gt;daddr, bf-&gt;desc);</div><div class='ctx'> </div><div class='hunk'>@@ -2162,13 +2165,13 @@ ath5k_beacon_config(struct ath5k_softc *sc)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath5k_hw *ah = sc-&gt;ah;</div><div class='ctx'> </div><div class='del'>-	ath5k_hw_set_intr(ah, 0);</div><div class='add'>+	ath5k_hw_set_imr(ah, 0);</div><div class='ctx'> 	sc-&gt;bmisscount = 0;</div><div class='ctx'> 	sc-&gt;imask &amp;= ~(AR5K_INT_BMISS | AR5K_INT_SWBA);</div><div class='ctx'> </div><div class='del'>-	if (sc-&gt;opmode == IEEE80211_IF_TYPE_STA) {</div><div class='add'>+	if (sc-&gt;opmode == NL80211_IFTYPE_STATION) {</div><div class='ctx'> 		sc-&gt;imask |= AR5K_INT_BMISS;</div><div class='del'>-	} else if (sc-&gt;opmode == IEEE80211_IF_TYPE_IBSS) {</div><div class='add'>+	} else if (sc-&gt;opmode == NL80211_IFTYPE_ADHOC) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * In IBSS mode we use a self-linked tx descriptor and let the</div><div class='ctx'> 		 * hardware send the beacons automatically. We have to load it</div><div class='hunk'>@@ -2188,7 +2191,7 @@ ath5k_beacon_config(struct ath5k_softc *sc)</div><div class='ctx'> 	}</div><div class='ctx'> 	/* TODO else AP */</div><div class='ctx'> </div><div class='del'>-	ath5k_hw_set_intr(ah, sc-&gt;imask);</div><div class='add'>+	ath5k_hw_set_imr(ah, sc-&gt;imask);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -2220,36 +2223,13 @@ ath5k_init(struct ath5k_softc *sc)</div><div class='ctx'> 	 */</div><div class='ctx'> 	sc-&gt;curchan = sc-&gt;hw-&gt;conf.channel;</div><div class='ctx'> 	sc-&gt;curband = &amp;sc-&gt;sbands[sc-&gt;curchan-&gt;band];</div><div class='del'>-	ret = ath5k_hw_reset(sc-&gt;ah, sc-&gt;opmode, sc-&gt;curchan, false);</div><div class='del'>-	if (ret) {</div><div class='del'>-		ATH5K_ERR(sc, "unable to reset hardware: %d\n", ret);</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * This is needed only to setup initial state</div><div class='del'>-	 * but it's best done after a reset.</div><div class='del'>-	 */</div><div class='del'>-	ath5k_hw_set_txpower_limit(sc-&gt;ah, 0);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Setup the hardware after reset: the key cache</div><div class='del'>-	 * is filled as needed and the receive engine is</div><div class='del'>-	 * set going.  Frame transmit is handled entirely</div><div class='del'>-	 * in the frame output path; there's nothing to do</div><div class='del'>-	 * here except setup the interrupt mask.</div><div class='del'>-	 */</div><div class='del'>-	ret = ath5k_rx_start(sc);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto done;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Enable interrupts.</div><div class='del'>-	 */</div><div class='ctx'> 	sc-&gt;imask = AR5K_INT_RX | AR5K_INT_TX | AR5K_INT_RXEOL |</div><div class='ctx'> 		AR5K_INT_RXORN | AR5K_INT_FATAL | AR5K_INT_GLOBAL |</div><div class='ctx'> 		AR5K_INT_MIB;</div><div class='add'>+	ret = ath5k_reset(sc, false, false);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto done;</div><div class='ctx'> </div><div class='del'>-	ath5k_hw_set_intr(sc-&gt;ah, sc-&gt;imask);</div><div class='ctx'> 	/* Set ack to be sent at low bit-rates */</div><div class='ctx'> 	ath5k_hw_set_ack_bitrate_high(sc-&gt;ah, false);</div><div class='ctx'> </div><div class='hunk'>@@ -2290,7 +2270,7 @@ ath5k_stop_locked(struct ath5k_softc *sc)</div><div class='ctx'> </div><div class='ctx'> 	if (!test_bit(ATH_STAT_INVALID, sc-&gt;status)) {</div><div class='ctx'> 		ath5k_led_off(sc);</div><div class='del'>-		ath5k_hw_set_intr(ah, 0);</div><div class='add'>+		ath5k_hw_set_imr(ah, 0);</div><div class='ctx'> 		synchronize_irq(sc-&gt;pdev-&gt;irq);</div><div class='ctx'> 	}</div><div class='ctx'> 	ath5k_txq_cleanup(sc);</div><div class='hunk'>@@ -2396,7 +2376,7 @@ ath5k_intr(int irq, void *dev_id)</div><div class='ctx'> 				* transmission time) in order to detect wether</div><div class='ctx'> 				* automatic TSF updates happened.</div><div class='ctx'> 				*/</div><div class='del'>-				if (sc-&gt;opmode == IEEE80211_IF_TYPE_IBSS) {</div><div class='add'>+				if (sc-&gt;opmode == NL80211_IFTYPE_ADHOC) {</div><div class='ctx'> 					 /* XXX: only if VEOL suppported */</div><div class='ctx'> 					u64 tsf = ath5k_hw_get_tsf64(ah);</div><div class='ctx'> 					sc-&gt;nexttbtt += sc-&gt;bintval;</div><div class='hunk'>@@ -2451,7 +2431,7 @@ ath5k_tasklet_reset(unsigned long data)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath5k_softc *sc = (void *)data;</div><div class='ctx'> </div><div class='del'>-	ath5k_reset(sc-&gt;hw);</div><div class='add'>+	ath5k_reset_wake(sc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -2474,7 +2454,7 @@ ath5k_calibrate(unsigned long data)</div><div class='ctx'> 		 * to load new gain values.</div><div class='ctx'> 		 */</div><div class='ctx'> 		ATH5K_DBG(sc, ATH5K_DEBUG_RESET, "calibration, resetting\n");</div><div class='del'>-		ath5k_reset(sc-&gt;hw);</div><div class='add'>+		ath5k_reset_wake(sc);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (ath5k_hw_phy_calibrate(ah, sc-&gt;curchan))</div><div class='ctx'> 		ATH5K_ERR(sc, "calibration of channel %u failed\n",</div><div class='hunk'>@@ -2626,7 +2606,7 @@ ath5k_tx(struct ieee80211_hw *hw, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	ath5k_debug_dump_skb(sc, skb, "TX  ", 1);</div><div class='ctx'> </div><div class='del'>-	if (sc-&gt;opmode == IEEE80211_IF_TYPE_MNTR)</div><div class='add'>+	if (sc-&gt;opmode == NL80211_IFTYPE_MONITOR)</div><div class='ctx'> 		ATH5K_DBG(sc, ATH5K_DEBUG_XMIT, "tx in monitor (scan?)\n");</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -2675,48 +2655,67 @@ ath5k_tx(struct ieee80211_hw *hw, struct sk_buff *skb)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-ath5k_reset(struct ieee80211_hw *hw)</div><div class='add'>+ath5k_reset(struct ath5k_softc *sc, bool stop, bool change_channel)</div><div class='ctx'> {</div><div class='del'>-	struct ath5k_softc *sc = hw-&gt;priv;</div><div class='ctx'> 	struct ath5k_hw *ah = sc-&gt;ah;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ATH5K_DBG(sc, ATH5K_DEBUG_RESET, "resetting\n");</div><div class='ctx'> </div><div class='del'>-	ath5k_hw_set_intr(ah, 0);</div><div class='del'>-	ath5k_txq_cleanup(sc);</div><div class='del'>-	ath5k_rx_stop(sc);</div><div class='del'>-</div><div class='add'>+	if (stop) {</div><div class='add'>+		ath5k_hw_set_imr(ah, 0);</div><div class='add'>+		ath5k_txq_cleanup(sc);</div><div class='add'>+		ath5k_rx_stop(sc);</div><div class='add'>+	}</div><div class='ctx'> 	ret = ath5k_hw_reset(ah, sc-&gt;opmode, sc-&gt;curchan, true);</div><div class='del'>-	if (unlikely(ret)) {</div><div class='add'>+	if (ret) {</div><div class='ctx'> 		ATH5K_ERR(sc, "can't reset hardware (%d)\n", ret);</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * This is needed only to setup initial state</div><div class='add'>+	 * but it's best done after a reset.</div><div class='add'>+	 */</div><div class='ctx'> 	ath5k_hw_set_txpower_limit(sc-&gt;ah, 0);</div><div class='ctx'> </div><div class='ctx'> 	ret = ath5k_rx_start(sc);</div><div class='del'>-	if (unlikely(ret)) {</div><div class='add'>+	if (ret) {</div><div class='ctx'> 		ATH5K_ERR(sc, "can't start recv logic\n");</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='del'>-	 * We may be doing a reset in response to an ioctl</div><div class='del'>-	 * that changes the channel so update any state that</div><div class='del'>-	 * might change as a result.</div><div class='add'>+	 * Change channels and update the h/w rate map if we're switching;</div><div class='add'>+	 * e.g. 11a to 11b/g.</div><div class='add'>+	 *</div><div class='add'>+	 * We may be doing a reset in response to an ioctl that changes the</div><div class='add'>+	 * channel so update any state that might change as a result.</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * XXX needed?</div><div class='ctx'> 	 */</div><div class='ctx'> /*	ath5k_chan_change(sc, c); */</div><div class='del'>-	ath5k_beacon_config(sc);</div><div class='del'>-	/* intrs are started by ath5k_beacon_config */</div><div class='ctx'> </div><div class='del'>-	ieee80211_wake_queues(hw);</div><div class='add'>+	ath5k_beacon_config(sc);</div><div class='add'>+	/* intrs are enabled by ath5k_beacon_config */</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> err:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int</div><div class='add'>+ath5k_reset_wake(struct ath5k_softc *sc)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ath5k_reset(sc, true, true);</div><div class='add'>+	if (!ret)</div><div class='add'>+		ieee80211_wake_queues(sc-&gt;hw);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ath5k_start(struct ieee80211_hw *hw)</div><div class='ctx'> {</div><div class='ctx'> 	return ath5k_init(hw-&gt;priv);</div><div class='hunk'>@@ -2742,9 +2741,9 @@ static int ath5k_add_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 	sc-&gt;vif = conf-&gt;vif;</div><div class='ctx'> </div><div class='ctx'> 	switch (conf-&gt;type) {</div><div class='del'>-	case IEEE80211_IF_TYPE_STA:</div><div class='del'>-	case IEEE80211_IF_TYPE_IBSS:</div><div class='del'>-	case IEEE80211_IF_TYPE_MNTR:</div><div class='add'>+	case NL80211_IFTYPE_STATION:</div><div class='add'>+	case NL80211_IFTYPE_ADHOC:</div><div class='add'>+	case NL80211_IFTYPE_MONITOR:</div><div class='ctx'> 		sc-&gt;opmode = conf-&gt;type;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -2815,7 +2814,7 @@ ath5k_config_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (conf-&gt;changed &amp; IEEE80211_IFCC_BEACON &amp;&amp;</div><div class='del'>-	    vif-&gt;type == IEEE80211_IF_TYPE_IBSS) {</div><div class='add'>+	    vif-&gt;type == NL80211_IFTYPE_ADHOC) {</div><div class='ctx'> 		struct sk_buff *beacon = ieee80211_beacon_get(hw, vif);</div><div class='ctx'> 		if (!beacon) {</div><div class='ctx'> 			ret = -ENOMEM;</div><div class='hunk'>@@ -2827,7 +2826,7 @@ ath5k_config_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;sc-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	return ath5k_reset(hw);</div><div class='add'>+	return ath5k_reset_wake(sc);</div><div class='ctx'> unlock:</div><div class='ctx'> 	mutex_unlock(&amp;sc-&gt;lock);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -2934,16 +2933,17 @@ static void ath5k_configure_filter(struct ieee80211_hw *hw,</div><div class='ctx'> </div><div class='ctx'> 	/* XXX move these to mac80211, and add a beacon IFF flag to mac80211 */</div><div class='ctx'> </div><div class='del'>-	if (sc-&gt;opmode == IEEE80211_IF_TYPE_MNTR)</div><div class='add'>+	if (sc-&gt;opmode == NL80211_IFTYPE_MONITOR)</div><div class='ctx'> 		rfilt |= AR5K_RX_FILTER_CONTROL | AR5K_RX_FILTER_BEACON |</div><div class='ctx'> 			AR5K_RX_FILTER_PROBEREQ | AR5K_RX_FILTER_PROM;</div><div class='del'>-	if (sc-&gt;opmode != IEEE80211_IF_TYPE_STA)</div><div class='add'>+	if (sc-&gt;opmode != NL80211_IFTYPE_STATION)</div><div class='ctx'> 		rfilt |= AR5K_RX_FILTER_PROBEREQ;</div><div class='del'>-	if (sc-&gt;opmode != IEEE80211_IF_TYPE_AP &amp;&amp;</div><div class='add'>+	if (sc-&gt;opmode != NL80211_IFTYPE_AP &amp;&amp;</div><div class='add'>+		sc-&gt;opmode != NL80211_IFTYPE_MESH_POINT &amp;&amp;</div><div class='ctx'> 		test_bit(ATH_STAT_PROMISC, sc-&gt;status))</div><div class='ctx'> 		rfilt |= AR5K_RX_FILTER_PROM;</div><div class='del'>-	if (sc-&gt;opmode == IEEE80211_IF_TYPE_STA ||</div><div class='del'>-		sc-&gt;opmode == IEEE80211_IF_TYPE_IBSS) {</div><div class='add'>+	if (sc-&gt;opmode == NL80211_IFTYPE_STATION ||</div><div class='add'>+		sc-&gt;opmode == NL80211_IFTYPE_ADHOC) {</div><div class='ctx'> 		rfilt |= AR5K_RX_FILTER_BEACON;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3048,7 +3048,7 @@ ath5k_reset_tsf(struct ieee80211_hw *hw)</div><div class='ctx'> 	 * in IBSS mode we need to update the beacon timers too.</div><div class='ctx'> 	 * this will also reset the TSF if we call it with 0</div><div class='ctx'> 	 */</div><div class='del'>-	if (sc-&gt;opmode == IEEE80211_IF_TYPE_IBSS)</div><div class='add'>+	if (sc-&gt;opmode == NL80211_IFTYPE_ADHOC)</div><div class='ctx'> 		ath5k_beacon_update_timers(sc, 0);</div><div class='ctx'> 	else</div><div class='ctx'> 		ath5k_hw_reset_tsf(sc-&gt;ah);</div><div class='hunk'>@@ -3063,7 +3063,7 @@ ath5k_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	ath5k_debug_dump_skb(sc, skb, "BC  ", 1);</div><div class='ctx'> </div><div class='del'>-	if (sc-&gt;opmode != IEEE80211_IF_TYPE_IBSS) {</div><div class='add'>+	if (sc-&gt;opmode != NL80211_IFTYPE_ADHOC) {</div><div class='ctx'> 		ret = -EIO;</div><div class='ctx'> 		goto end;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/net/wireless/ath5k/base.h b/drivers/net/wireless/ath5k/base.h<br/>index 7ec2f377d5c7..9d0b728928e3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/ath5k/base.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/ath5k/base.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/ath5k/base.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/ath5k/base.h</a></div><div class='hunk'>@@ -111,17 +111,13 @@ struct ath5k_softc {</div><div class='ctx'> 	struct ieee80211_hw	*hw;		/* IEEE 802.11 common */</div><div class='ctx'> 	struct ieee80211_supported_band sbands[IEEE80211_NUM_BANDS];</div><div class='ctx'> 	struct ieee80211_channel channels[ATH_CHAN_MAX];</div><div class='del'>-	struct ieee80211_rate	rates[AR5K_MAX_RATES * IEEE80211_NUM_BANDS];</div><div class='del'>-	enum ieee80211_if_types	opmode;</div><div class='add'>+	struct ieee80211_rate	rates[IEEE80211_NUM_BANDS][AR5K_MAX_RATES];</div><div class='add'>+	u8			rate_idx[IEEE80211_NUM_BANDS][AR5K_MAX_RATES];</div><div class='add'>+	enum nl80211_iftype	opmode;</div><div class='ctx'> 	struct ath5k_hw		*ah;		/* Atheros HW */</div><div class='ctx'> </div><div class='ctx'> 	struct ieee80211_supported_band		*curband;</div><div class='ctx'> </div><div class='del'>-	u8			a_rates;</div><div class='del'>-	u8			b_rates;</div><div class='del'>-	u8			g_rates;</div><div class='del'>-	u8			xr_rates;</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_ATH5K_DEBUG</div><div class='ctx'> 	struct ath5k_dbg_info	debug;		/* debug info */</div><div class='ctx'> #endif /* CONFIG_ATH5K_DEBUG */</div><div class='head'>diff --git a/drivers/net/wireless/ath5k/caps.c b/drivers/net/wireless/ath5k/caps.c<br/>new file mode 100644<br/>index 000000000000..150f5ed204a0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/ath5k/caps.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/ath5k/caps.c</a></div><div class='hunk'>@@ -0,0 +1,193 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2004-2008 Reyk Floeter &lt;reyk@openbsd.org&gt;</div><div class='add'>+ * Copyright (c) 2006-2008 Nick Kossifidis &lt;mickflemm@gmail.com&gt;</div><div class='add'>+ * Copyright (c) 2007-2008 Jiri Slaby &lt;jirislaby@gmail.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * Permission to use, copy, modify, and distribute this software for any</div><div class='add'>+ * purpose with or without fee is hereby granted, provided that the above</div><div class='add'>+ * copyright notice and this permission notice appear in all copies.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES</div><div class='add'>+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR</div><div class='add'>+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES</div><div class='add'>+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN</div><div class='add'>+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF</div><div class='add'>+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/**************\</div><div class='add'>+* Capabilities *</div><div class='add'>+\**************/</div><div class='add'>+</div><div class='add'>+#include "ath5k.h"</div><div class='add'>+#include "reg.h"</div><div class='add'>+#include "debug.h"</div><div class='add'>+#include "base.h"</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Fill the capabilities struct</div><div class='add'>+ * TODO: Merge this with EEPROM code when we are done with it</div><div class='add'>+ */</div><div class='add'>+int ath5k_hw_set_capabilities(struct ath5k_hw *ah)</div><div class='add'>+{</div><div class='add'>+	u16 ee_header;</div><div class='add'>+</div><div class='add'>+	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='add'>+	/* Capabilities stored in the EEPROM */</div><div class='add'>+	ee_header = ah-&gt;ah_capabilities.cap_eeprom.ee_header;</div><div class='add'>+</div><div class='add'>+	if (ah-&gt;ah_version == AR5K_AR5210) {</div><div class='add'>+		/*</div><div class='add'>+		 * Set radio capabilities</div><div class='add'>+		 * (The AR5110 only supports the middle 5GHz band)</div><div class='add'>+		 */</div><div class='add'>+		ah-&gt;ah_capabilities.cap_range.range_5ghz_min = 5120;</div><div class='add'>+		ah-&gt;ah_capabilities.cap_range.range_5ghz_max = 5430;</div><div class='add'>+		ah-&gt;ah_capabilities.cap_range.range_2ghz_min = 0;</div><div class='add'>+		ah-&gt;ah_capabilities.cap_range.range_2ghz_max = 0;</div><div class='add'>+</div><div class='add'>+		/* Set supported modes */</div><div class='add'>+		__set_bit(AR5K_MODE_11A, ah-&gt;ah_capabilities.cap_mode);</div><div class='add'>+		__set_bit(AR5K_MODE_11A_TURBO, ah-&gt;ah_capabilities.cap_mode);</div><div class='add'>+	} else {</div><div class='add'>+		/*</div><div class='add'>+		 * XXX The tranceiver supports frequencies from 4920 to 6100GHz</div><div class='add'>+		 * XXX and from 2312 to 2732GHz. There are problems with the</div><div class='add'>+		 * XXX current ieee80211 implementation because the IEEE</div><div class='add'>+		 * XXX channel mapping does not support negative channel</div><div class='add'>+		 * XXX numbers (2312MHz is channel -19). Of course, this</div><div class='add'>+		 * XXX doesn't matter because these channels are out of range</div><div class='add'>+		 * XXX but some regulation domains like MKK (Japan) will</div><div class='add'>+		 * XXX support frequencies somewhere around 4.8GHz.</div><div class='add'>+		 */</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Set radio capabilities</div><div class='add'>+		 */</div><div class='add'>+</div><div class='add'>+		if (AR5K_EEPROM_HDR_11A(ee_header)) {</div><div class='add'>+			/* 4920 */</div><div class='add'>+			ah-&gt;ah_capabilities.cap_range.range_5ghz_min = 5005;</div><div class='add'>+			ah-&gt;ah_capabilities.cap_range.range_5ghz_max = 6100;</div><div class='add'>+</div><div class='add'>+			/* Set supported modes */</div><div class='add'>+			__set_bit(AR5K_MODE_11A,</div><div class='add'>+					ah-&gt;ah_capabilities.cap_mode);</div><div class='add'>+			__set_bit(AR5K_MODE_11A_TURBO,</div><div class='add'>+					ah-&gt;ah_capabilities.cap_mode);</div><div class='add'>+			if (ah-&gt;ah_version == AR5K_AR5212)</div><div class='add'>+				__set_bit(AR5K_MODE_11G_TURBO,</div><div class='add'>+						ah-&gt;ah_capabilities.cap_mode);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Enable  802.11b if a 2GHz capable radio (2111/5112) is</div><div class='add'>+		 * connected */</div><div class='add'>+		if (AR5K_EEPROM_HDR_11B(ee_header) ||</div><div class='add'>+				AR5K_EEPROM_HDR_11G(ee_header)) {</div><div class='add'>+			/* 2312 */</div><div class='add'>+			ah-&gt;ah_capabilities.cap_range.range_2ghz_min = 2412;</div><div class='add'>+			ah-&gt;ah_capabilities.cap_range.range_2ghz_max = 2732;</div><div class='add'>+</div><div class='add'>+			if (AR5K_EEPROM_HDR_11B(ee_header))</div><div class='add'>+				__set_bit(AR5K_MODE_11B,</div><div class='add'>+						ah-&gt;ah_capabilities.cap_mode);</div><div class='add'>+</div><div class='add'>+			if (AR5K_EEPROM_HDR_11G(ee_header))</div><div class='add'>+				__set_bit(AR5K_MODE_11G,</div><div class='add'>+						ah-&gt;ah_capabilities.cap_mode);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* GPIO */</div><div class='add'>+	ah-&gt;ah_gpio_npins = AR5K_NUM_GPIO;</div><div class='add'>+</div><div class='add'>+	/* Set number of supported TX queues */</div><div class='add'>+	if (ah-&gt;ah_version == AR5K_AR5210)</div><div class='add'>+		ah-&gt;ah_capabilities.cap_queues.q_tx_num =</div><div class='add'>+			AR5K_NUM_TX_QUEUES_NOQCU;</div><div class='add'>+	else</div><div class='add'>+		ah-&gt;ah_capabilities.cap_queues.q_tx_num = AR5K_NUM_TX_QUEUES;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Main function used by the driver part to check caps */</div><div class='add'>+int ath5k_hw_get_capability(struct ath5k_hw *ah,</div><div class='add'>+		enum ath5k_capability_type cap_type,</div><div class='add'>+		u32 capability, u32 *result)</div><div class='add'>+{</div><div class='add'>+	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='add'>+</div><div class='add'>+	switch (cap_type) {</div><div class='add'>+	case AR5K_CAP_NUM_TXQUEUES:</div><div class='add'>+		if (result) {</div><div class='add'>+			if (ah-&gt;ah_version == AR5K_AR5210)</div><div class='add'>+				*result = AR5K_NUM_TX_QUEUES_NOQCU;</div><div class='add'>+			else</div><div class='add'>+				*result = AR5K_NUM_TX_QUEUES;</div><div class='add'>+			goto yes;</div><div class='add'>+		}</div><div class='add'>+	case AR5K_CAP_VEOL:</div><div class='add'>+		goto yes;</div><div class='add'>+	case AR5K_CAP_COMPRESSION:</div><div class='add'>+		if (ah-&gt;ah_version == AR5K_AR5212)</div><div class='add'>+			goto yes;</div><div class='add'>+		else</div><div class='add'>+			goto no;</div><div class='add'>+	case AR5K_CAP_BURST:</div><div class='add'>+		goto yes;</div><div class='add'>+	case AR5K_CAP_TPC:</div><div class='add'>+		goto yes;</div><div class='add'>+	case AR5K_CAP_BSSIDMASK:</div><div class='add'>+		if (ah-&gt;ah_version == AR5K_AR5212)</div><div class='add'>+			goto yes;</div><div class='add'>+		else</div><div class='add'>+			goto no;</div><div class='add'>+	case AR5K_CAP_XR:</div><div class='add'>+		if (ah-&gt;ah_version == AR5K_AR5212)</div><div class='add'>+			goto yes;</div><div class='add'>+		else</div><div class='add'>+			goto no;</div><div class='add'>+	default:</div><div class='add'>+		goto no;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+no:</div><div class='add'>+	return -EINVAL;</div><div class='add'>+yes:</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * TODO: Following functions should be part of a new function</div><div class='add'>+ * set_capability</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+int ath5k_hw_enable_pspoll(struct ath5k_hw *ah, u8 *bssid,</div><div class='add'>+		u16 assoc_id)</div><div class='add'>+{</div><div class='add'>+	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='add'>+</div><div class='add'>+	if (ah-&gt;ah_version == AR5K_AR5210) {</div><div class='add'>+		AR5K_REG_DISABLE_BITS(ah, AR5K_STA_ID1,</div><div class='add'>+			AR5K_STA_ID1_NO_PSPOLL | AR5K_STA_ID1_DEFAULT_ANTENNA);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EIO;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath5k_hw_disable_pspoll(struct ath5k_hw *ah)</div><div class='add'>+{</div><div class='add'>+	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='add'>+</div><div class='add'>+	if (ah-&gt;ah_version == AR5K_AR5210) {</div><div class='add'>+		AR5K_REG_ENABLE_BITS(ah, AR5K_STA_ID1,</div><div class='add'>+			AR5K_STA_ID1_NO_PSPOLL | AR5K_STA_ID1_DEFAULT_ANTENNA);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EIO;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/ath5k/debug.c b/drivers/net/wireless/ath5k/debug.c<br/>index 6fa6c8e04ff0..8f92d670f614 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/ath5k/debug.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/ath5k/debug.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/ath5k/debug.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/ath5k/debug.c</a></div><div class='hunk'>@@ -58,8 +58,8 @@</div><div class='ctx'>  * THE POSSIBILITY OF SUCH DAMAGES.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include "debug.h"</div><div class='ctx'> #include "base.h"</div><div class='add'>+#include "debug.h"</div><div class='ctx'> </div><div class='ctx'> static unsigned int ath5k_debug;</div><div class='ctx'> module_param_named(debug, ath5k_debug, uint, 0);</div><div class='hunk'>@@ -525,7 +525,7 @@ ath5k_debug_printrxbuffs(struct ath5k_softc *sc, struct ath5k_hw *ah)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_DEBUG "rx queue %x, link %p\n",</div><div class='del'>-		ath5k_hw_get_rx_buf(ah), sc-&gt;rxlink);</div><div class='add'>+		ath5k_hw_get_rxdp(ah), sc-&gt;rxlink);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;sc-&gt;rxbuflock);</div><div class='ctx'> 	list_for_each_entry(bf, &amp;sc-&gt;rxbuf, list) {</div><div class='head'>diff --git a/drivers/net/wireless/ath5k/desc.c b/drivers/net/wireless/ath5k/desc.c<br/>new file mode 100644<br/>index 000000000000..dd1374052ba9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/ath5k/desc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/ath5k/desc.c</a></div><div class='hunk'>@@ -0,0 +1,692 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2004-2008 Reyk Floeter &lt;reyk@openbsd.org&gt;</div><div class='add'>+ * Copyright (c) 2006-2008 Nick Kossifidis &lt;mickflemm@gmail.com&gt;</div><div class='add'>+ * Copyright (c) 2007-2008 Pavel Roskin &lt;proski@gnu.org&gt;</div><div class='add'>+ *</div><div class='add'>+ * Permission to use, copy, modify, and distribute this software for any</div><div class='add'>+ * purpose with or without fee is hereby granted, provided that the above</div><div class='add'>+ * copyright notice and this permission notice appear in all copies.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES</div><div class='add'>+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR</div><div class='add'>+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES</div><div class='add'>+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN</div><div class='add'>+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF</div><div class='add'>+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/******************************\</div><div class='add'>+ Hardware Descriptor Functions</div><div class='add'>+\******************************/</div><div class='add'>+</div><div class='add'>+#include "ath5k.h"</div><div class='add'>+#include "reg.h"</div><div class='add'>+#include "debug.h"</div><div class='add'>+#include "base.h"</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * TX Descriptors</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Initialize the 2-word tx control descriptor on 5210/5211</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+ath5k_hw_setup_2word_tx_desc(struct ath5k_hw *ah, struct ath5k_desc *desc,</div><div class='add'>+	unsigned int pkt_len, unsigned int hdr_len, enum ath5k_pkt_type type,</div><div class='add'>+	unsigned int tx_power, unsigned int tx_rate0, unsigned int tx_tries0,</div><div class='add'>+	unsigned int key_index, unsigned int antenna_mode, unsigned int flags,</div><div class='add'>+	unsigned int rtscts_rate, unsigned int rtscts_duration)</div><div class='add'>+{</div><div class='add'>+	u32 frame_type;</div><div class='add'>+	struct ath5k_hw_2w_tx_ctl *tx_ctl;</div><div class='add'>+	unsigned int frame_len;</div><div class='add'>+</div><div class='add'>+	tx_ctl = &amp;desc-&gt;ud.ds_tx5210.tx_ctl;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Validate input</div><div class='add'>+	 * - Zero retries don't make sense.</div><div class='add'>+	 * - A zero rate will put the HW into a mode where it continously sends</div><div class='add'>+	 *   noise on the channel, so it is important to avoid this.</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(tx_tries0 == 0)) {</div><div class='add'>+		ATH5K_ERR(ah-&gt;ah_sc, "zero retries\n");</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (unlikely(tx_rate0 == 0)) {</div><div class='add'>+		ATH5K_ERR(ah-&gt;ah_sc, "zero rate\n");</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Clear descriptor */</div><div class='add'>+	memset(&amp;desc-&gt;ud.ds_tx5210, 0, sizeof(struct ath5k_hw_5210_tx_desc));</div><div class='add'>+</div><div class='add'>+	/* Setup control descriptor */</div><div class='add'>+</div><div class='add'>+	/* Verify and set frame length */</div><div class='add'>+</div><div class='add'>+	/* remove padding we might have added before */</div><div class='add'>+	frame_len = pkt_len - (hdr_len &amp; 3) + FCS_LEN;</div><div class='add'>+</div><div class='add'>+	if (frame_len &amp; ~AR5K_2W_TX_DESC_CTL0_FRAME_LEN)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	tx_ctl-&gt;tx_control_0 = frame_len &amp; AR5K_2W_TX_DESC_CTL0_FRAME_LEN;</div><div class='add'>+</div><div class='add'>+	/* Verify and set buffer length */</div><div class='add'>+</div><div class='add'>+	/* NB: beacon's BufLen must be a multiple of 4 bytes */</div><div class='add'>+	if (type == AR5K_PKT_TYPE_BEACON)</div><div class='add'>+		pkt_len = roundup(pkt_len, 4);</div><div class='add'>+</div><div class='add'>+	if (pkt_len &amp; ~AR5K_2W_TX_DESC_CTL1_BUF_LEN)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	tx_ctl-&gt;tx_control_1 = pkt_len &amp; AR5K_2W_TX_DESC_CTL1_BUF_LEN;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Verify and set header length</div><div class='add'>+	 * XXX: I only found that on 5210 code, does it work on 5211 ?</div><div class='add'>+	 */</div><div class='add'>+	if (ah-&gt;ah_version == AR5K_AR5210) {</div><div class='add'>+		if (hdr_len &amp; ~AR5K_2W_TX_DESC_CTL0_HEADER_LEN)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		tx_ctl-&gt;tx_control_0 |=</div><div class='add'>+			AR5K_REG_SM(hdr_len, AR5K_2W_TX_DESC_CTL0_HEADER_LEN);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*Diferences between 5210-5211*/</div><div class='add'>+	if (ah-&gt;ah_version == AR5K_AR5210) {</div><div class='add'>+		switch (type) {</div><div class='add'>+		case AR5K_PKT_TYPE_BEACON:</div><div class='add'>+		case AR5K_PKT_TYPE_PROBE_RESP:</div><div class='add'>+			frame_type = AR5K_AR5210_TX_DESC_FRAME_TYPE_NO_DELAY;</div><div class='add'>+		case AR5K_PKT_TYPE_PIFS:</div><div class='add'>+			frame_type = AR5K_AR5210_TX_DESC_FRAME_TYPE_PIFS;</div><div class='add'>+		default:</div><div class='add'>+			frame_type = type /*&lt;&lt; 2 ?*/;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		tx_ctl-&gt;tx_control_0 |=</div><div class='add'>+		AR5K_REG_SM(frame_type, AR5K_2W_TX_DESC_CTL0_FRAME_TYPE) |</div><div class='add'>+		AR5K_REG_SM(tx_rate0, AR5K_2W_TX_DESC_CTL0_XMIT_RATE);</div><div class='add'>+</div><div class='add'>+	} else {</div><div class='add'>+		tx_ctl-&gt;tx_control_0 |=</div><div class='add'>+			AR5K_REG_SM(tx_rate0, AR5K_2W_TX_DESC_CTL0_XMIT_RATE) |</div><div class='add'>+			AR5K_REG_SM(antenna_mode,</div><div class='add'>+				AR5K_2W_TX_DESC_CTL0_ANT_MODE_XMIT);</div><div class='add'>+		tx_ctl-&gt;tx_control_1 |=</div><div class='add'>+			AR5K_REG_SM(type, AR5K_2W_TX_DESC_CTL1_FRAME_TYPE);</div><div class='add'>+	}</div><div class='add'>+#define _TX_FLAGS(_c, _flag)					\</div><div class='add'>+	if (flags &amp; AR5K_TXDESC_##_flag) {			\</div><div class='add'>+		tx_ctl-&gt;tx_control_##_c |=			\</div><div class='add'>+			AR5K_2W_TX_DESC_CTL##_c##_##_flag;	\</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	_TX_FLAGS(0, CLRDMASK);</div><div class='add'>+	_TX_FLAGS(0, VEOL);</div><div class='add'>+	_TX_FLAGS(0, INTREQ);</div><div class='add'>+	_TX_FLAGS(0, RTSENA);</div><div class='add'>+	_TX_FLAGS(1, NOACK);</div><div class='add'>+</div><div class='add'>+#undef _TX_FLAGS</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * WEP crap</div><div class='add'>+	 */</div><div class='add'>+	if (key_index != AR5K_TXKEYIX_INVALID) {</div><div class='add'>+		tx_ctl-&gt;tx_control_0 |=</div><div class='add'>+			AR5K_2W_TX_DESC_CTL0_ENCRYPT_KEY_VALID;</div><div class='add'>+		tx_ctl-&gt;tx_control_1 |=</div><div class='add'>+			AR5K_REG_SM(key_index,</div><div class='add'>+			AR5K_2W_TX_DESC_CTL1_ENCRYPT_KEY_INDEX);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * RTS/CTS Duration [5210 ?]</div><div class='add'>+	 */</div><div class='add'>+	if ((ah-&gt;ah_version == AR5K_AR5210) &amp;&amp;</div><div class='add'>+			(flags &amp; (AR5K_TXDESC_RTSENA | AR5K_TXDESC_CTSENA)))</div><div class='add'>+		tx_ctl-&gt;tx_control_1 |= rtscts_duration &amp;</div><div class='add'>+				AR5K_2W_TX_DESC_CTL1_RTS_DURATION;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Initialize the 4-word tx control descriptor on 5212</div><div class='add'>+ */</div><div class='add'>+static int ath5k_hw_setup_4word_tx_desc(struct ath5k_hw *ah,</div><div class='add'>+	struct ath5k_desc *desc, unsigned int pkt_len, unsigned int hdr_len,</div><div class='add'>+	enum ath5k_pkt_type type, unsigned int tx_power, unsigned int tx_rate0,</div><div class='add'>+	unsigned int tx_tries0, unsigned int key_index,</div><div class='add'>+	unsigned int antenna_mode, unsigned int flags,</div><div class='add'>+	unsigned int rtscts_rate,</div><div class='add'>+	unsigned int rtscts_duration)</div><div class='add'>+{</div><div class='add'>+	struct ath5k_hw_4w_tx_ctl *tx_ctl;</div><div class='add'>+	unsigned int frame_len;</div><div class='add'>+</div><div class='add'>+	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='add'>+	tx_ctl = &amp;desc-&gt;ud.ds_tx5212.tx_ctl;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Validate input</div><div class='add'>+	 * - Zero retries don't make sense.</div><div class='add'>+	 * - A zero rate will put the HW into a mode where it continously sends</div><div class='add'>+	 *   noise on the channel, so it is important to avoid this.</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(tx_tries0 == 0)) {</div><div class='add'>+		ATH5K_ERR(ah-&gt;ah_sc, "zero retries\n");</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (unlikely(tx_rate0 == 0)) {</div><div class='add'>+		ATH5K_ERR(ah-&gt;ah_sc, "zero rate\n");</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Clear descriptor */</div><div class='add'>+	memset(&amp;desc-&gt;ud.ds_tx5212, 0, sizeof(struct ath5k_hw_5212_tx_desc));</div><div class='add'>+</div><div class='add'>+	/* Setup control descriptor */</div><div class='add'>+</div><div class='add'>+	/* Verify and set frame length */</div><div class='add'>+</div><div class='add'>+	/* remove padding we might have added before */</div><div class='add'>+	frame_len = pkt_len - (hdr_len &amp; 3) + FCS_LEN;</div><div class='add'>+</div><div class='add'>+	if (frame_len &amp; ~AR5K_4W_TX_DESC_CTL0_FRAME_LEN)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	tx_ctl-&gt;tx_control_0 = frame_len &amp; AR5K_4W_TX_DESC_CTL0_FRAME_LEN;</div><div class='add'>+</div><div class='add'>+	/* Verify and set buffer length */</div><div class='add'>+</div><div class='add'>+	/* NB: beacon's BufLen must be a multiple of 4 bytes */</div><div class='add'>+	if (type == AR5K_PKT_TYPE_BEACON)</div><div class='add'>+		pkt_len = roundup(pkt_len, 4);</div><div class='add'>+</div><div class='add'>+	if (pkt_len &amp; ~AR5K_4W_TX_DESC_CTL1_BUF_LEN)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	tx_ctl-&gt;tx_control_1 = pkt_len &amp; AR5K_4W_TX_DESC_CTL1_BUF_LEN;</div><div class='add'>+</div><div class='add'>+	tx_ctl-&gt;tx_control_0 |=</div><div class='add'>+		AR5K_REG_SM(tx_power, AR5K_4W_TX_DESC_CTL0_XMIT_POWER) |</div><div class='add'>+		AR5K_REG_SM(antenna_mode, AR5K_4W_TX_DESC_CTL0_ANT_MODE_XMIT);</div><div class='add'>+	tx_ctl-&gt;tx_control_1 |= AR5K_REG_SM(type,</div><div class='add'>+					AR5K_4W_TX_DESC_CTL1_FRAME_TYPE);</div><div class='add'>+	tx_ctl-&gt;tx_control_2 = AR5K_REG_SM(tx_tries0 + AR5K_TUNE_HWTXTRIES,</div><div class='add'>+					AR5K_4W_TX_DESC_CTL2_XMIT_TRIES0);</div><div class='add'>+	tx_ctl-&gt;tx_control_3 = tx_rate0 &amp; AR5K_4W_TX_DESC_CTL3_XMIT_RATE0;</div><div class='add'>+</div><div class='add'>+#define _TX_FLAGS(_c, _flag)					\</div><div class='add'>+	if (flags &amp; AR5K_TXDESC_##_flag) {			\</div><div class='add'>+		tx_ctl-&gt;tx_control_##_c |=			\</div><div class='add'>+			AR5K_4W_TX_DESC_CTL##_c##_##_flag;	\</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	_TX_FLAGS(0, CLRDMASK);</div><div class='add'>+	_TX_FLAGS(0, VEOL);</div><div class='add'>+	_TX_FLAGS(0, INTREQ);</div><div class='add'>+	_TX_FLAGS(0, RTSENA);</div><div class='add'>+	_TX_FLAGS(0, CTSENA);</div><div class='add'>+	_TX_FLAGS(1, NOACK);</div><div class='add'>+</div><div class='add'>+#undef _TX_FLAGS</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * WEP crap</div><div class='add'>+	 */</div><div class='add'>+	if (key_index != AR5K_TXKEYIX_INVALID) {</div><div class='add'>+		tx_ctl-&gt;tx_control_0 |= AR5K_4W_TX_DESC_CTL0_ENCRYPT_KEY_VALID;</div><div class='add'>+		tx_ctl-&gt;tx_control_1 |= AR5K_REG_SM(key_index,</div><div class='add'>+				AR5K_4W_TX_DESC_CTL1_ENCRYPT_KEY_INDEX);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * RTS/CTS</div><div class='add'>+	 */</div><div class='add'>+	if (flags &amp; (AR5K_TXDESC_RTSENA | AR5K_TXDESC_CTSENA)) {</div><div class='add'>+		if ((flags &amp; AR5K_TXDESC_RTSENA) &amp;&amp;</div><div class='add'>+				(flags &amp; AR5K_TXDESC_CTSENA))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		tx_ctl-&gt;tx_control_2 |= rtscts_duration &amp;</div><div class='add'>+				AR5K_4W_TX_DESC_CTL2_RTS_DURATION;</div><div class='add'>+		tx_ctl-&gt;tx_control_3 |= AR5K_REG_SM(rtscts_rate,</div><div class='add'>+				AR5K_4W_TX_DESC_CTL3_RTS_CTS_RATE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Initialize a 4-word multi rate retry tx control descriptor on 5212</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+ath5k_hw_setup_mrr_tx_desc(struct ath5k_hw *ah, struct ath5k_desc *desc,</div><div class='add'>+	unsigned int tx_rate1, u_int tx_tries1, u_int tx_rate2,</div><div class='add'>+	u_int tx_tries2, unsigned int tx_rate3, u_int tx_tries3)</div><div class='add'>+{</div><div class='add'>+	struct ath5k_hw_4w_tx_ctl *tx_ctl;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Rates can be 0 as long as the retry count is 0 too.</div><div class='add'>+	 * A zero rate and nonzero retry count will put the HW into a mode where</div><div class='add'>+	 * it continously sends noise on the channel, so it is important to</div><div class='add'>+	 * avoid this.</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely((tx_rate1 == 0 &amp;&amp; tx_tries1 != 0) ||</div><div class='add'>+		     (tx_rate2 == 0 &amp;&amp; tx_tries2 != 0) ||</div><div class='add'>+		     (tx_rate3 == 0 &amp;&amp; tx_tries3 != 0))) {</div><div class='add'>+		ATH5K_ERR(ah-&gt;ah_sc, "zero rate\n");</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ah-&gt;ah_version == AR5K_AR5212) {</div><div class='add'>+		tx_ctl = &amp;desc-&gt;ud.ds_tx5212.tx_ctl;</div><div class='add'>+</div><div class='add'>+#define _XTX_TRIES(_n)							\</div><div class='add'>+	if (tx_tries##_n) {						\</div><div class='add'>+		tx_ctl-&gt;tx_control_2 |=					\</div><div class='add'>+		    AR5K_REG_SM(tx_tries##_n,				\</div><div class='add'>+		    AR5K_4W_TX_DESC_CTL2_XMIT_TRIES##_n);		\</div><div class='add'>+		tx_ctl-&gt;tx_control_3 |=					\</div><div class='add'>+		    AR5K_REG_SM(tx_rate##_n,				\</div><div class='add'>+		    AR5K_4W_TX_DESC_CTL3_XMIT_RATE##_n);		\</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+		_XTX_TRIES(1);</div><div class='add'>+		_XTX_TRIES(2);</div><div class='add'>+		_XTX_TRIES(3);</div><div class='add'>+</div><div class='add'>+#undef _XTX_TRIES</div><div class='add'>+</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* no mrr support for cards older than 5212 */</div><div class='add'>+static int</div><div class='add'>+ath5k_hw_setup_no_mrr(struct ath5k_hw *ah, struct ath5k_desc *desc,</div><div class='add'>+	unsigned int tx_rate1, u_int tx_tries1, u_int tx_rate2,</div><div class='add'>+	u_int tx_tries2, unsigned int tx_rate3, u_int tx_tries3)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Proccess the tx status descriptor on 5210/5211</div><div class='add'>+ */</div><div class='add'>+static int ath5k_hw_proc_2word_tx_status(struct ath5k_hw *ah,</div><div class='add'>+		struct ath5k_desc *desc, struct ath5k_tx_status *ts)</div><div class='add'>+{</div><div class='add'>+	struct ath5k_hw_2w_tx_ctl *tx_ctl;</div><div class='add'>+	struct ath5k_hw_tx_status *tx_status;</div><div class='add'>+</div><div class='add'>+	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='add'>+</div><div class='add'>+	tx_ctl = &amp;desc-&gt;ud.ds_tx5210.tx_ctl;</div><div class='add'>+	tx_status = &amp;desc-&gt;ud.ds_tx5210.tx_stat;</div><div class='add'>+</div><div class='add'>+	/* No frame has been send or error */</div><div class='add'>+	if (unlikely((tx_status-&gt;tx_status_1 &amp; AR5K_DESC_TX_STATUS1_DONE) == 0))</div><div class='add'>+		return -EINPROGRESS;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Get descriptor status</div><div class='add'>+	 */</div><div class='add'>+	ts-&gt;ts_tstamp = AR5K_REG_MS(tx_status-&gt;tx_status_0,</div><div class='add'>+		AR5K_DESC_TX_STATUS0_SEND_TIMESTAMP);</div><div class='add'>+	ts-&gt;ts_shortretry = AR5K_REG_MS(tx_status-&gt;tx_status_0,</div><div class='add'>+		AR5K_DESC_TX_STATUS0_SHORT_RETRY_COUNT);</div><div class='add'>+	ts-&gt;ts_longretry = AR5K_REG_MS(tx_status-&gt;tx_status_0,</div><div class='add'>+		AR5K_DESC_TX_STATUS0_LONG_RETRY_COUNT);</div><div class='add'>+	/*TODO: ts-&gt;ts_virtcol + test*/</div><div class='add'>+	ts-&gt;ts_seqnum = AR5K_REG_MS(tx_status-&gt;tx_status_1,</div><div class='add'>+		AR5K_DESC_TX_STATUS1_SEQ_NUM);</div><div class='add'>+	ts-&gt;ts_rssi = AR5K_REG_MS(tx_status-&gt;tx_status_1,</div><div class='add'>+		AR5K_DESC_TX_STATUS1_ACK_SIG_STRENGTH);</div><div class='add'>+	ts-&gt;ts_antenna = 1;</div><div class='add'>+	ts-&gt;ts_status = 0;</div><div class='add'>+	ts-&gt;ts_rate[0] = AR5K_REG_MS(tx_ctl-&gt;tx_control_0,</div><div class='add'>+		AR5K_2W_TX_DESC_CTL0_XMIT_RATE);</div><div class='add'>+	ts-&gt;ts_retry[0] = ts-&gt;ts_longretry;</div><div class='add'>+	ts-&gt;ts_final_idx = 0;</div><div class='add'>+</div><div class='add'>+	if (!(tx_status-&gt;tx_status_0 &amp; AR5K_DESC_TX_STATUS0_FRAME_XMIT_OK)) {</div><div class='add'>+		if (tx_status-&gt;tx_status_0 &amp;</div><div class='add'>+				AR5K_DESC_TX_STATUS0_EXCESSIVE_RETRIES)</div><div class='add'>+			ts-&gt;ts_status |= AR5K_TXERR_XRETRY;</div><div class='add'>+</div><div class='add'>+		if (tx_status-&gt;tx_status_0 &amp; AR5K_DESC_TX_STATUS0_FIFO_UNDERRUN)</div><div class='add'>+			ts-&gt;ts_status |= AR5K_TXERR_FIFO;</div><div class='add'>+</div><div class='add'>+		if (tx_status-&gt;tx_status_0 &amp; AR5K_DESC_TX_STATUS0_FILTERED)</div><div class='add'>+			ts-&gt;ts_status |= AR5K_TXERR_FILT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Proccess a tx status descriptor on 5212</div><div class='add'>+ */</div><div class='add'>+static int ath5k_hw_proc_4word_tx_status(struct ath5k_hw *ah,</div><div class='add'>+		struct ath5k_desc *desc, struct ath5k_tx_status *ts)</div><div class='add'>+{</div><div class='add'>+	struct ath5k_hw_4w_tx_ctl *tx_ctl;</div><div class='add'>+	struct ath5k_hw_tx_status *tx_status;</div><div class='add'>+</div><div class='add'>+	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='add'>+</div><div class='add'>+	tx_ctl = &amp;desc-&gt;ud.ds_tx5212.tx_ctl;</div><div class='add'>+	tx_status = &amp;desc-&gt;ud.ds_tx5212.tx_stat;</div><div class='add'>+</div><div class='add'>+	/* No frame has been send or error */</div><div class='add'>+	if (unlikely(!(tx_status-&gt;tx_status_1 &amp; AR5K_DESC_TX_STATUS1_DONE)))</div><div class='add'>+		return -EINPROGRESS;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Get descriptor status</div><div class='add'>+	 */</div><div class='add'>+	ts-&gt;ts_tstamp = AR5K_REG_MS(tx_status-&gt;tx_status_0,</div><div class='add'>+		AR5K_DESC_TX_STATUS0_SEND_TIMESTAMP);</div><div class='add'>+	ts-&gt;ts_shortretry = AR5K_REG_MS(tx_status-&gt;tx_status_0,</div><div class='add'>+		AR5K_DESC_TX_STATUS0_SHORT_RETRY_COUNT);</div><div class='add'>+	ts-&gt;ts_longretry = AR5K_REG_MS(tx_status-&gt;tx_status_0,</div><div class='add'>+		AR5K_DESC_TX_STATUS0_LONG_RETRY_COUNT);</div><div class='add'>+	ts-&gt;ts_seqnum = AR5K_REG_MS(tx_status-&gt;tx_status_1,</div><div class='add'>+		AR5K_DESC_TX_STATUS1_SEQ_NUM);</div><div class='add'>+	ts-&gt;ts_rssi = AR5K_REG_MS(tx_status-&gt;tx_status_1,</div><div class='add'>+		AR5K_DESC_TX_STATUS1_ACK_SIG_STRENGTH);</div><div class='add'>+	ts-&gt;ts_antenna = (tx_status-&gt;tx_status_1 &amp;</div><div class='add'>+		AR5K_DESC_TX_STATUS1_XMIT_ANTENNA) ? 2 : 1;</div><div class='add'>+	ts-&gt;ts_status = 0;</div><div class='add'>+</div><div class='add'>+	ts-&gt;ts_final_idx = AR5K_REG_MS(tx_status-&gt;tx_status_1,</div><div class='add'>+			AR5K_DESC_TX_STATUS1_FINAL_TS_INDEX);</div><div class='add'>+</div><div class='add'>+	/* The longretry counter has the number of un-acked retries</div><div class='add'>+	 * for the final rate. To get the total number of retries</div><div class='add'>+	 * we have to add the retry counters for the other rates</div><div class='add'>+	 * as well</div><div class='add'>+	 */</div><div class='add'>+	ts-&gt;ts_retry[ts-&gt;ts_final_idx] = ts-&gt;ts_longretry;</div><div class='add'>+	switch (ts-&gt;ts_final_idx) {</div><div class='add'>+	case 3:</div><div class='add'>+		ts-&gt;ts_rate[3] = AR5K_REG_MS(tx_ctl-&gt;tx_control_3,</div><div class='add'>+			AR5K_4W_TX_DESC_CTL3_XMIT_RATE3);</div><div class='add'>+</div><div class='add'>+		ts-&gt;ts_retry[2] = AR5K_REG_MS(tx_ctl-&gt;tx_control_2,</div><div class='add'>+			AR5K_4W_TX_DESC_CTL2_XMIT_TRIES2);</div><div class='add'>+		ts-&gt;ts_longretry += ts-&gt;ts_retry[2];</div><div class='add'>+		/* fall through */</div><div class='add'>+	case 2:</div><div class='add'>+		ts-&gt;ts_rate[2] = AR5K_REG_MS(tx_ctl-&gt;tx_control_3,</div><div class='add'>+			AR5K_4W_TX_DESC_CTL3_XMIT_RATE2);</div><div class='add'>+</div><div class='add'>+		ts-&gt;ts_retry[1] = AR5K_REG_MS(tx_ctl-&gt;tx_control_2,</div><div class='add'>+			AR5K_4W_TX_DESC_CTL2_XMIT_TRIES1);</div><div class='add'>+		ts-&gt;ts_longretry += ts-&gt;ts_retry[1];</div><div class='add'>+		/* fall through */</div><div class='add'>+	case 1:</div><div class='add'>+		ts-&gt;ts_rate[1] = AR5K_REG_MS(tx_ctl-&gt;tx_control_3,</div><div class='add'>+			AR5K_4W_TX_DESC_CTL3_XMIT_RATE1);</div><div class='add'>+</div><div class='add'>+		ts-&gt;ts_retry[0] = AR5K_REG_MS(tx_ctl-&gt;tx_control_2,</div><div class='add'>+			AR5K_4W_TX_DESC_CTL2_XMIT_TRIES1);</div><div class='add'>+		ts-&gt;ts_longretry += ts-&gt;ts_retry[0];</div><div class='add'>+		/* fall through */</div><div class='add'>+	case 0:</div><div class='add'>+		ts-&gt;ts_rate[0] = tx_ctl-&gt;tx_control_3 &amp;</div><div class='add'>+			AR5K_4W_TX_DESC_CTL3_XMIT_RATE0;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* TX error */</div><div class='add'>+	if (!(tx_status-&gt;tx_status_0 &amp; AR5K_DESC_TX_STATUS0_FRAME_XMIT_OK)) {</div><div class='add'>+		if (tx_status-&gt;tx_status_0 &amp;</div><div class='add'>+				AR5K_DESC_TX_STATUS0_EXCESSIVE_RETRIES)</div><div class='add'>+			ts-&gt;ts_status |= AR5K_TXERR_XRETRY;</div><div class='add'>+</div><div class='add'>+		if (tx_status-&gt;tx_status_0 &amp; AR5K_DESC_TX_STATUS0_FIFO_UNDERRUN)</div><div class='add'>+			ts-&gt;ts_status |= AR5K_TXERR_FIFO;</div><div class='add'>+</div><div class='add'>+		if (tx_status-&gt;tx_status_0 &amp; AR5K_DESC_TX_STATUS0_FILTERED)</div><div class='add'>+			ts-&gt;ts_status |= AR5K_TXERR_FILT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * RX Descriptors</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Initialize an rx control descriptor</div><div class='add'>+ */</div><div class='add'>+static int ath5k_hw_setup_rx_desc(struct ath5k_hw *ah, struct ath5k_desc *desc,</div><div class='add'>+			u32 size, unsigned int flags)</div><div class='add'>+{</div><div class='add'>+	struct ath5k_hw_rx_ctl *rx_ctl;</div><div class='add'>+</div><div class='add'>+	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='add'>+	rx_ctl = &amp;desc-&gt;ud.ds_rx.rx_ctl;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Clear the descriptor</div><div class='add'>+	 * If we don't clean the status descriptor,</div><div class='add'>+	 * while scanning we get too many results,</div><div class='add'>+	 * most of them virtual, after some secs</div><div class='add'>+	 * of scanning system hangs. M.F.</div><div class='add'>+	*/</div><div class='add'>+	memset(&amp;desc-&gt;ud.ds_rx, 0, sizeof(struct ath5k_hw_all_rx_desc));</div><div class='add'>+</div><div class='add'>+	/* Setup descriptor */</div><div class='add'>+	rx_ctl-&gt;rx_control_1 = size &amp; AR5K_DESC_RX_CTL1_BUF_LEN;</div><div class='add'>+	if (unlikely(rx_ctl-&gt;rx_control_1 != size))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (flags &amp; AR5K_RXDESC_INTREQ)</div><div class='add'>+		rx_ctl-&gt;rx_control_1 |= AR5K_DESC_RX_CTL1_INTREQ;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Proccess the rx status descriptor on 5210/5211</div><div class='add'>+ */</div><div class='add'>+static int ath5k_hw_proc_5210_rx_status(struct ath5k_hw *ah,</div><div class='add'>+		struct ath5k_desc *desc, struct ath5k_rx_status *rs)</div><div class='add'>+{</div><div class='add'>+	struct ath5k_hw_rx_status *rx_status;</div><div class='add'>+</div><div class='add'>+	rx_status = &amp;desc-&gt;ud.ds_rx.u.rx_stat;</div><div class='add'>+</div><div class='add'>+	/* No frame received / not ready */</div><div class='add'>+	if (unlikely(!(rx_status-&gt;rx_status_1 &amp;</div><div class='add'>+	AR5K_5210_RX_DESC_STATUS1_DONE)))</div><div class='add'>+		return -EINPROGRESS;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Frame receive status</div><div class='add'>+	 */</div><div class='add'>+	rs-&gt;rs_datalen = rx_status-&gt;rx_status_0 &amp;</div><div class='add'>+		AR5K_5210_RX_DESC_STATUS0_DATA_LEN;</div><div class='add'>+	rs-&gt;rs_rssi = AR5K_REG_MS(rx_status-&gt;rx_status_0,</div><div class='add'>+		AR5K_5210_RX_DESC_STATUS0_RECEIVE_SIGNAL);</div><div class='add'>+	rs-&gt;rs_rate = AR5K_REG_MS(rx_status-&gt;rx_status_0,</div><div class='add'>+		AR5K_5210_RX_DESC_STATUS0_RECEIVE_RATE);</div><div class='add'>+	rs-&gt;rs_antenna = rx_status-&gt;rx_status_0 &amp;</div><div class='add'>+		AR5K_5210_RX_DESC_STATUS0_RECEIVE_ANTENNA;</div><div class='add'>+	rs-&gt;rs_more = rx_status-&gt;rx_status_0 &amp;</div><div class='add'>+		AR5K_5210_RX_DESC_STATUS0_MORE;</div><div class='add'>+	/* TODO: this timestamp is 13 bit, later on we assume 15 bit */</div><div class='add'>+	rs-&gt;rs_tstamp = AR5K_REG_MS(rx_status-&gt;rx_status_1,</div><div class='add'>+		AR5K_5210_RX_DESC_STATUS1_RECEIVE_TIMESTAMP);</div><div class='add'>+	rs-&gt;rs_status = 0;</div><div class='add'>+	rs-&gt;rs_phyerr = 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Key table status</div><div class='add'>+	 */</div><div class='add'>+	if (rx_status-&gt;rx_status_1 &amp; AR5K_5210_RX_DESC_STATUS1_KEY_INDEX_VALID)</div><div class='add'>+		rs-&gt;rs_keyix = AR5K_REG_MS(rx_status-&gt;rx_status_1,</div><div class='add'>+			AR5K_5210_RX_DESC_STATUS1_KEY_INDEX);</div><div class='add'>+	else</div><div class='add'>+		rs-&gt;rs_keyix = AR5K_RXKEYIX_INVALID;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Receive/descriptor errors</div><div class='add'>+	 */</div><div class='add'>+	if (!(rx_status-&gt;rx_status_1 &amp;</div><div class='add'>+	AR5K_5210_RX_DESC_STATUS1_FRAME_RECEIVE_OK)) {</div><div class='add'>+		if (rx_status-&gt;rx_status_1 &amp;</div><div class='add'>+				AR5K_5210_RX_DESC_STATUS1_CRC_ERROR)</div><div class='add'>+			rs-&gt;rs_status |= AR5K_RXERR_CRC;</div><div class='add'>+</div><div class='add'>+		if (rx_status-&gt;rx_status_1 &amp;</div><div class='add'>+				AR5K_5210_RX_DESC_STATUS1_FIFO_OVERRUN)</div><div class='add'>+			rs-&gt;rs_status |= AR5K_RXERR_FIFO;</div><div class='add'>+</div><div class='add'>+		if (rx_status-&gt;rx_status_1 &amp;</div><div class='add'>+				AR5K_5210_RX_DESC_STATUS1_PHY_ERROR) {</div><div class='add'>+			rs-&gt;rs_status |= AR5K_RXERR_PHY;</div><div class='add'>+			rs-&gt;rs_phyerr |= AR5K_REG_MS(rx_status-&gt;rx_status_1,</div><div class='add'>+				AR5K_5210_RX_DESC_STATUS1_PHY_ERROR);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (rx_status-&gt;rx_status_1 &amp;</div><div class='add'>+				AR5K_5210_RX_DESC_STATUS1_DECRYPT_CRC_ERROR)</div><div class='add'>+			rs-&gt;rs_status |= AR5K_RXERR_DECRYPT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Proccess the rx status descriptor on 5212</div><div class='add'>+ */</div><div class='add'>+static int ath5k_hw_proc_5212_rx_status(struct ath5k_hw *ah,</div><div class='add'>+		struct ath5k_desc *desc, struct ath5k_rx_status *rs)</div><div class='add'>+{</div><div class='add'>+	struct ath5k_hw_rx_status *rx_status;</div><div class='add'>+	struct ath5k_hw_rx_error *rx_err;</div><div class='add'>+</div><div class='add'>+	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='add'>+	rx_status = &amp;desc-&gt;ud.ds_rx.u.rx_stat;</div><div class='add'>+</div><div class='add'>+	/* Overlay on error */</div><div class='add'>+	rx_err = &amp;desc-&gt;ud.ds_rx.u.rx_err;</div><div class='add'>+</div><div class='add'>+	/* No frame received / not ready */</div><div class='add'>+	if (unlikely(!(rx_status-&gt;rx_status_1 &amp;</div><div class='add'>+	AR5K_5212_RX_DESC_STATUS1_DONE)))</div><div class='add'>+		return -EINPROGRESS;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Frame receive status</div><div class='add'>+	 */</div><div class='add'>+	rs-&gt;rs_datalen = rx_status-&gt;rx_status_0 &amp;</div><div class='add'>+		AR5K_5212_RX_DESC_STATUS0_DATA_LEN;</div><div class='add'>+	rs-&gt;rs_rssi = AR5K_REG_MS(rx_status-&gt;rx_status_0,</div><div class='add'>+		AR5K_5212_RX_DESC_STATUS0_RECEIVE_SIGNAL);</div><div class='add'>+	rs-&gt;rs_rate = AR5K_REG_MS(rx_status-&gt;rx_status_0,</div><div class='add'>+		AR5K_5212_RX_DESC_STATUS0_RECEIVE_RATE);</div><div class='add'>+	rs-&gt;rs_antenna = rx_status-&gt;rx_status_0 &amp;</div><div class='add'>+		AR5K_5212_RX_DESC_STATUS0_RECEIVE_ANTENNA;</div><div class='add'>+	rs-&gt;rs_more = rx_status-&gt;rx_status_0 &amp;</div><div class='add'>+		AR5K_5212_RX_DESC_STATUS0_MORE;</div><div class='add'>+	rs-&gt;rs_tstamp = AR5K_REG_MS(rx_status-&gt;rx_status_1,</div><div class='add'>+		AR5K_5212_RX_DESC_STATUS1_RECEIVE_TIMESTAMP);</div><div class='add'>+	rs-&gt;rs_status = 0;</div><div class='add'>+	rs-&gt;rs_phyerr = 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Key table status</div><div class='add'>+	 */</div><div class='add'>+	if (rx_status-&gt;rx_status_1 &amp; AR5K_5212_RX_DESC_STATUS1_KEY_INDEX_VALID)</div><div class='add'>+		rs-&gt;rs_keyix = AR5K_REG_MS(rx_status-&gt;rx_status_1,</div><div class='add'>+				AR5K_5212_RX_DESC_STATUS1_KEY_INDEX);</div><div class='add'>+	else</div><div class='add'>+		rs-&gt;rs_keyix = AR5K_RXKEYIX_INVALID;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Receive/descriptor errors</div><div class='add'>+	 */</div><div class='add'>+	if (!(rx_status-&gt;rx_status_1 &amp;</div><div class='add'>+	AR5K_5212_RX_DESC_STATUS1_FRAME_RECEIVE_OK)) {</div><div class='add'>+		if (rx_status-&gt;rx_status_1 &amp;</div><div class='add'>+				AR5K_5212_RX_DESC_STATUS1_CRC_ERROR)</div><div class='add'>+			rs-&gt;rs_status |= AR5K_RXERR_CRC;</div><div class='add'>+</div><div class='add'>+		if (rx_status-&gt;rx_status_1 &amp;</div><div class='add'>+				AR5K_5212_RX_DESC_STATUS1_PHY_ERROR) {</div><div class='add'>+			rs-&gt;rs_status |= AR5K_RXERR_PHY;</div><div class='add'>+			rs-&gt;rs_phyerr |= AR5K_REG_MS(rx_err-&gt;rx_error_1,</div><div class='add'>+					   AR5K_RX_DESC_ERROR1_PHY_ERROR_CODE);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (rx_status-&gt;rx_status_1 &amp;</div><div class='add'>+				AR5K_5212_RX_DESC_STATUS1_DECRYPT_CRC_ERROR)</div><div class='add'>+			rs-&gt;rs_status |= AR5K_RXERR_DECRYPT;</div><div class='add'>+</div><div class='add'>+		if (rx_status-&gt;rx_status_1 &amp;</div><div class='add'>+				AR5K_5212_RX_DESC_STATUS1_MIC_ERROR)</div><div class='add'>+			rs-&gt;rs_status |= AR5K_RXERR_MIC;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Init function pointers inside ath5k_hw struct</div><div class='add'>+ */</div><div class='add'>+int ath5k_hw_init_desc_functions(struct ath5k_hw *ah)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	if (ah-&gt;ah_version != AR5K_AR5210 &amp;&amp;</div><div class='add'>+		ah-&gt;ah_version != AR5K_AR5211 &amp;&amp;</div><div class='add'>+		ah-&gt;ah_version != AR5K_AR5212)</div><div class='add'>+			return -ENOTSUPP;</div><div class='add'>+</div><div class='add'>+	/* XXX: What is this magic value and where is it used ? */</div><div class='add'>+	if (ah-&gt;ah_version == AR5K_AR5212)</div><div class='add'>+		ah-&gt;ah_magic = AR5K_EEPROM_MAGIC_5212;</div><div class='add'>+	else if (ah-&gt;ah_version == AR5K_AR5211)</div><div class='add'>+		ah-&gt;ah_magic = AR5K_EEPROM_MAGIC_5211;</div><div class='add'>+</div><div class='add'>+	if (ah-&gt;ah_version == AR5K_AR5212) {</div><div class='add'>+		ah-&gt;ah_setup_rx_desc = ath5k_hw_setup_rx_desc;</div><div class='add'>+		ah-&gt;ah_setup_tx_desc = ath5k_hw_setup_4word_tx_desc;</div><div class='add'>+		ah-&gt;ah_setup_mrr_tx_desc = ath5k_hw_setup_mrr_tx_desc;</div><div class='add'>+		ah-&gt;ah_proc_tx_desc = ath5k_hw_proc_4word_tx_status;</div><div class='add'>+	} else {</div><div class='add'>+		ah-&gt;ah_setup_rx_desc = ath5k_hw_setup_rx_desc;</div><div class='add'>+		ah-&gt;ah_setup_tx_desc = ath5k_hw_setup_2word_tx_desc;</div><div class='add'>+		ah-&gt;ah_setup_mrr_tx_desc = ath5k_hw_setup_no_mrr;</div><div class='add'>+		ah-&gt;ah_proc_tx_desc = ath5k_hw_proc_2word_tx_status;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ah-&gt;ah_version == AR5K_AR5212)</div><div class='add'>+		ah-&gt;ah_proc_rx_desc = ath5k_hw_proc_5212_rx_status;</div><div class='add'>+	else if (ah-&gt;ah_version &lt;= AR5K_AR5211)</div><div class='add'>+		ah-&gt;ah_proc_rx_desc = ath5k_hw_proc_5210_rx_status;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='head'>diff --git a/drivers/net/wireless/ath5k/hw.h b/drivers/net/wireless/ath5k/desc.h<br/>index 64fca8dcb386..56158c804e3e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/ath5k/hw.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/ath5k/hw.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/ath5k/desc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/ath5k/desc.h</a></div><div class='hunk'>@@ -1,8 +1,6 @@</div><div class='ctx'> /*</div><div class='del'>- * Copyright (c) 2004-2007 Reyk Floeter &lt;reyk@openbsd.org&gt;</div><div class='del'>- * Copyright (c) 2006-2007 Nick Kossifidis &lt;mickflemm@gmail.com&gt;</div><div class='del'>- * Copyright (c) 2007 Matthew W. S. Bell  &lt;mentor@madwifi.org&gt;</div><div class='del'>- * Copyright (c) 2007 Luis Rodriguez &lt;mcgrof@winlab.rutgers.edu&gt;</div><div class='add'>+ * Copyright (c) 2004-2008 Reyk Floeter &lt;reyk@openbsd.org&gt;</div><div class='add'>+ * Copyright (c) 2006-2008 Nick Kossifidis &lt;mickflemm@gmail.com&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * Permission to use, copy, modify, and distribute this software for any</div><div class='ctx'>  * purpose with or without fee is hereby granted, provided that the above</div><div class='hunk'>@@ -15,159 +13,9 @@</div><div class='ctx'>  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN</div><div class='ctx'>  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF</div><div class='ctx'>  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.</div><div class='add'>+ *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Gain settings</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-enum ath5k_rfgain {</div><div class='del'>-	AR5K_RFGAIN_INACTIVE = 0,</div><div class='del'>-	AR5K_RFGAIN_READ_REQUESTED,</div><div class='del'>-	AR5K_RFGAIN_NEED_CHANGE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define AR5K_GAIN_CRN_FIX_BITS_5111		4</div><div class='del'>-#define AR5K_GAIN_CRN_FIX_BITS_5112		7</div><div class='del'>-#define AR5K_GAIN_CRN_MAX_FIX_BITS		AR5K_GAIN_CRN_FIX_BITS_5112</div><div class='del'>-#define AR5K_GAIN_DYN_ADJUST_HI_MARGIN		15</div><div class='del'>-#define AR5K_GAIN_DYN_ADJUST_LO_MARGIN		20</div><div class='del'>-#define AR5K_GAIN_CCK_PROBE_CORR		5</div><div class='del'>-#define AR5K_GAIN_CCK_OFDM_GAIN_DELTA		15</div><div class='del'>-#define AR5K_GAIN_STEP_COUNT			10</div><div class='del'>-#define AR5K_GAIN_PARAM_TX_CLIP			0</div><div class='del'>-#define AR5K_GAIN_PARAM_PD_90			1</div><div class='del'>-#define AR5K_GAIN_PARAM_PD_84			2</div><div class='del'>-#define AR5K_GAIN_PARAM_GAIN_SEL		3</div><div class='del'>-#define AR5K_GAIN_PARAM_MIX_ORN			0</div><div class='del'>-#define AR5K_GAIN_PARAM_PD_138			1</div><div class='del'>-#define AR5K_GAIN_PARAM_PD_137			2</div><div class='del'>-#define AR5K_GAIN_PARAM_PD_136			3</div><div class='del'>-#define AR5K_GAIN_PARAM_PD_132			4</div><div class='del'>-#define AR5K_GAIN_PARAM_PD_131			5</div><div class='del'>-#define AR5K_GAIN_PARAM_PD_130			6</div><div class='del'>-#define AR5K_GAIN_CHECK_ADJUST(_g) 		\</div><div class='del'>-	((_g)-&gt;g_current &lt;= (_g)-&gt;g_low || (_g)-&gt;g_current &gt;= (_g)-&gt;g_high)</div><div class='del'>-</div><div class='del'>-struct ath5k_gain_opt_step {</div><div class='del'>-	s16				gos_param[AR5K_GAIN_CRN_MAX_FIX_BITS];</div><div class='del'>-	s32				gos_gain;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct ath5k_gain {</div><div class='del'>-	u32			g_step_idx;</div><div class='del'>-	u32			g_current;</div><div class='del'>-	u32			g_target;</div><div class='del'>-	u32			g_low;</div><div class='del'>-	u32			g_high;</div><div class='del'>-	u32			g_f_corr;</div><div class='del'>-	u32			g_active;</div><div class='del'>-	const struct ath5k_gain_opt_step	*g_step;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * HW SPECIFIC STRUCTS</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* Some EEPROM defines */</div><div class='del'>-#define AR5K_EEPROM_EEP_SCALE		100</div><div class='del'>-#define AR5K_EEPROM_EEP_DELTA		10</div><div class='del'>-#define AR5K_EEPROM_N_MODES		3</div><div class='del'>-#define AR5K_EEPROM_N_5GHZ_CHAN		10</div><div class='del'>-#define AR5K_EEPROM_N_2GHZ_CHAN		3</div><div class='del'>-#define AR5K_EEPROM_MAX_CHAN		10</div><div class='del'>-#define AR5K_EEPROM_N_PCDAC		11</div><div class='del'>-#define AR5K_EEPROM_N_TEST_FREQ		8</div><div class='del'>-#define AR5K_EEPROM_N_EDGES		8</div><div class='del'>-#define AR5K_EEPROM_N_INTERCEPTS	11</div><div class='del'>-#define AR5K_EEPROM_FREQ_M(_v)		AR5K_EEPROM_OFF(_v, 0x7f, 0xff)</div><div class='del'>-#define AR5K_EEPROM_PCDAC_M		0x3f</div><div class='del'>-#define AR5K_EEPROM_PCDAC_START		1</div><div class='del'>-#define AR5K_EEPROM_PCDAC_STOP		63</div><div class='del'>-#define AR5K_EEPROM_PCDAC_STEP		1</div><div class='del'>-#define AR5K_EEPROM_NON_EDGE_M		0x40</div><div class='del'>-#define AR5K_EEPROM_CHANNEL_POWER	8</div><div class='del'>-#define AR5K_EEPROM_N_OBDB		4</div><div class='del'>-#define AR5K_EEPROM_OBDB_DIS		0xffff</div><div class='del'>-#define AR5K_EEPROM_CHANNEL_DIS		0xff</div><div class='del'>-#define AR5K_EEPROM_SCALE_OC_DELTA(_x)	(((_x) * 2) / 10)</div><div class='del'>-#define AR5K_EEPROM_N_CTLS(_v)		AR5K_EEPROM_OFF(_v, 16, 32)</div><div class='del'>-#define AR5K_EEPROM_MAX_CTLS		32</div><div class='del'>-#define AR5K_EEPROM_N_XPD_PER_CHANNEL	4</div><div class='del'>-#define AR5K_EEPROM_N_XPD0_POINTS	4</div><div class='del'>-#define AR5K_EEPROM_N_XPD3_POINTS	3</div><div class='del'>-#define AR5K_EEPROM_N_INTERCEPT_10_2GHZ	35</div><div class='del'>-#define AR5K_EEPROM_N_INTERCEPT_10_5GHZ	55</div><div class='del'>-#define AR5K_EEPROM_POWER_M		0x3f</div><div class='del'>-#define AR5K_EEPROM_POWER_MIN		0</div><div class='del'>-#define AR5K_EEPROM_POWER_MAX		3150</div><div class='del'>-#define AR5K_EEPROM_POWER_STEP		50</div><div class='del'>-#define AR5K_EEPROM_POWER_TABLE_SIZE	64</div><div class='del'>-#define AR5K_EEPROM_N_POWER_LOC_11B	4</div><div class='del'>-#define AR5K_EEPROM_N_POWER_LOC_11G	6</div><div class='del'>-#define AR5K_EEPROM_I_GAIN		10</div><div class='del'>-#define AR5K_EEPROM_CCK_OFDM_DELTA	15</div><div class='del'>-#define AR5K_EEPROM_N_IQ_CAL		2</div><div class='del'>-</div><div class='del'>-/* Struct to hold EEPROM calibration data */</div><div class='del'>-struct ath5k_eeprom_info {</div><div class='del'>-	u16	ee_magic;</div><div class='del'>-	u16	ee_protect;</div><div class='del'>-	u16	ee_regdomain;</div><div class='del'>-	u16	ee_version;</div><div class='del'>-	u16	ee_header;</div><div class='del'>-	u16	ee_ant_gain;</div><div class='del'>-	u16	ee_misc0;</div><div class='del'>-	u16	ee_misc1;</div><div class='del'>-	u16	ee_cck_ofdm_gain_delta;</div><div class='del'>-	u16	ee_cck_ofdm_power_delta;</div><div class='del'>-	u16	ee_scaled_cck_delta;</div><div class='del'>-</div><div class='del'>-	/* Used for tx thermal adjustment (eeprom_init, rfregs) */</div><div class='del'>-	u16	ee_tx_clip;</div><div class='del'>-	u16	ee_pwd_84;</div><div class='del'>-	u16	ee_pwd_90;</div><div class='del'>-	u16	ee_gain_select;</div><div class='del'>-</div><div class='del'>-	/* RF Calibration settings (reset, rfregs) */</div><div class='del'>-	u16	ee_i_cal[AR5K_EEPROM_N_MODES];</div><div class='del'>-	u16	ee_q_cal[AR5K_EEPROM_N_MODES];</div><div class='del'>-	u16	ee_fixed_bias[AR5K_EEPROM_N_MODES];</div><div class='del'>-	u16	ee_turbo_max_power[AR5K_EEPROM_N_MODES];</div><div class='del'>-	u16	ee_xr_power[AR5K_EEPROM_N_MODES];</div><div class='del'>-	u16	ee_switch_settling[AR5K_EEPROM_N_MODES];</div><div class='del'>-	u16	ee_ant_tx_rx[AR5K_EEPROM_N_MODES];</div><div class='del'>-	u16	ee_ant_control[AR5K_EEPROM_N_MODES][AR5K_EEPROM_N_PCDAC];</div><div class='del'>-	u16	ee_ob[AR5K_EEPROM_N_MODES][AR5K_EEPROM_N_OBDB];</div><div class='del'>-	u16	ee_db[AR5K_EEPROM_N_MODES][AR5K_EEPROM_N_OBDB];</div><div class='del'>-	u16	ee_tx_end2xlna_enable[AR5K_EEPROM_N_MODES];</div><div class='del'>-	u16	ee_tx_end2xpa_disable[AR5K_EEPROM_N_MODES];</div><div class='del'>-	u16	ee_tx_frm2xpa_enable[AR5K_EEPROM_N_MODES];</div><div class='del'>-	u16	ee_thr_62[AR5K_EEPROM_N_MODES];</div><div class='del'>-	u16	ee_xlna_gain[AR5K_EEPROM_N_MODES];</div><div class='del'>-	u16	ee_xpd[AR5K_EEPROM_N_MODES];</div><div class='del'>-	u16	ee_x_gain[AR5K_EEPROM_N_MODES];</div><div class='del'>-	u16	ee_i_gain[AR5K_EEPROM_N_MODES];</div><div class='del'>-	u16	ee_margin_tx_rx[AR5K_EEPROM_N_MODES];</div><div class='del'>-</div><div class='del'>-	/* Unused */</div><div class='del'>-	u16	ee_false_detect[AR5K_EEPROM_N_MODES];</div><div class='del'>-	u16	ee_cal_pier[AR5K_EEPROM_N_MODES][AR5K_EEPROM_N_2GHZ_CHAN];</div><div class='del'>-	u16	ee_channel[AR5K_EEPROM_N_MODES][AR5K_EEPROM_MAX_CHAN]; /*empty*/</div><div class='del'>-</div><div class='del'>-	/* Conformance test limits (Unused) */</div><div class='del'>-	u16	ee_ctls;</div><div class='del'>-	u16	ee_ctl[AR5K_EEPROM_MAX_CTLS];</div><div class='del'>-</div><div class='del'>-	/* Noise Floor Calibration settings */</div><div class='del'>-	s16	ee_noise_floor_thr[AR5K_EEPROM_N_MODES];</div><div class='del'>-	s8	ee_adc_desired_size[AR5K_EEPROM_N_MODES];</div><div class='del'>-	s8	ee_pga_desired_size[AR5K_EEPROM_N_MODES];</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Internal RX/TX descriptor structures</div><div class='ctx'>  * (rX: reserved fields possibily used by future versions of the ar5k chipset)</div><div class='hunk'>@@ -178,14 +26,15 @@ struct ath5k_eeprom_info {</div><div class='ctx'>  */</div><div class='ctx'> struct ath5k_hw_rx_ctl {</div><div class='ctx'> 	u32	rx_control_0; /* RX control word 0 */</div><div class='add'>+	u32	rx_control_1; /* RX control word 1 */</div><div class='add'>+} __packed;</div><div class='ctx'> </div><div class='add'>+/* RX control word 0 field/sflags */</div><div class='ctx'> #define AR5K_DESC_RX_CTL0			0x00000000</div><div class='ctx'> </div><div class='del'>-	u32	rx_control_1; /* RX control word 1 */</div><div class='del'>-</div><div class='add'>+/* RX control word 1 fields/flags */</div><div class='ctx'> #define AR5K_DESC_RX_CTL1_BUF_LEN		0x00000fff</div><div class='ctx'> #define AR5K_DESC_RX_CTL1_INTREQ		0x00002000</div><div class='del'>-} __packed;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * common hardware RX status descriptor</div><div class='hunk'>@@ -197,6 +46,7 @@ struct ath5k_hw_rx_status {</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /* 5210/5211 */</div><div class='add'>+/* RX status word 0 fields/flags */</div><div class='ctx'> #define AR5K_5210_RX_DESC_STATUS0_DATA_LEN		0x00000fff</div><div class='ctx'> #define AR5K_5210_RX_DESC_STATUS0_MORE			0x00001000</div><div class='ctx'> #define AR5K_5210_RX_DESC_STATUS0_RECEIVE_RATE		0x00078000</div><div class='hunk'>@@ -205,6 +55,8 @@ struct ath5k_hw_rx_status {</div><div class='ctx'> #define AR5K_5210_RX_DESC_STATUS0_RECEIVE_SIGNAL_S	19</div><div class='ctx'> #define AR5K_5210_RX_DESC_STATUS0_RECEIVE_ANTENNA	0x38000000</div><div class='ctx'> #define AR5K_5210_RX_DESC_STATUS0_RECEIVE_ANTENNA_S	27</div><div class='add'>+</div><div class='add'>+/* RX status word 1 fields/flags */</div><div class='ctx'> #define AR5K_5210_RX_DESC_STATUS1_DONE			0x00000001</div><div class='ctx'> #define AR5K_5210_RX_DESC_STATUS1_FRAME_RECEIVE_OK	0x00000002</div><div class='ctx'> #define AR5K_5210_RX_DESC_STATUS1_CRC_ERROR		0x00000004</div><div class='hunk'>@@ -220,6 +72,7 @@ struct ath5k_hw_rx_status {</div><div class='ctx'> #define AR5K_5210_RX_DESC_STATUS1_KEY_CACHE_MISS	0x10000000</div><div class='ctx'> </div><div class='ctx'> /* 5212 */</div><div class='add'>+/* RX status word 0 fields/flags */</div><div class='ctx'> #define AR5K_5212_RX_DESC_STATUS0_DATA_LEN		0x00000fff</div><div class='ctx'> #define AR5K_5212_RX_DESC_STATUS0_MORE			0x00001000</div><div class='ctx'> #define AR5K_5212_RX_DESC_STATUS0_DECOMP_CRC_ERROR	0x00002000</div><div class='hunk'>@@ -229,6 +82,8 @@ struct ath5k_hw_rx_status {</div><div class='ctx'> #define AR5K_5212_RX_DESC_STATUS0_RECEIVE_SIGNAL_S	20</div><div class='ctx'> #define AR5K_5212_RX_DESC_STATUS0_RECEIVE_ANTENNA	0xf0000000</div><div class='ctx'> #define AR5K_5212_RX_DESC_STATUS0_RECEIVE_ANTENNA_S	28</div><div class='add'>+</div><div class='add'>+/* RX status word 1 fields/flags */</div><div class='ctx'> #define AR5K_5212_RX_DESC_STATUS1_DONE			0x00000001</div><div class='ctx'> #define AR5K_5212_RX_DESC_STATUS1_FRAME_RECEIVE_OK	0x00000002</div><div class='ctx'> #define AR5K_5212_RX_DESC_STATUS1_CRC_ERROR		0x00000004</div><div class='hunk'>@@ -246,16 +101,18 @@ struct ath5k_hw_rx_status {</div><div class='ctx'>  * common hardware RX error descriptor</div><div class='ctx'>  */</div><div class='ctx'> struct ath5k_hw_rx_error {</div><div class='del'>-	u32	rx_error_0; /* RX error word 0 */</div><div class='add'>+	u32	rx_error_0; /* RX status word 0 */</div><div class='add'>+	u32	rx_error_1; /* RX status word 1 */</div><div class='add'>+} __packed;</div><div class='ctx'> </div><div class='add'>+/* RX error word 0 fields/flags */</div><div class='ctx'> #define AR5K_RX_DESC_ERROR0			0x00000000</div><div class='ctx'> </div><div class='del'>-	u32	rx_error_1; /* RX error word 1 */</div><div class='del'>-</div><div class='add'>+/* RX error word 1 fields/flags */</div><div class='ctx'> #define AR5K_RX_DESC_ERROR1_PHY_ERROR_CODE	0x0000ff00</div><div class='ctx'> #define AR5K_RX_DESC_ERROR1_PHY_ERROR_CODE_S	8</div><div class='del'>-} __packed;</div><div class='ctx'> </div><div class='add'>+/* PHY Error codes */</div><div class='ctx'> #define AR5K_DESC_RX_PHY_ERROR_NONE		0x00</div><div class='ctx'> #define AR5K_DESC_RX_PHY_ERROR_TIMING		0x20</div><div class='ctx'> #define AR5K_DESC_RX_PHY_ERROR_PARITY		0x40</div><div class='hunk'>@@ -270,7 +127,10 @@ struct ath5k_hw_rx_error {</div><div class='ctx'>  */</div><div class='ctx'> struct ath5k_hw_2w_tx_ctl {</div><div class='ctx'> 	u32	tx_control_0; /* TX control word 0 */</div><div class='add'>+	u32	tx_control_1; /* TX control word 1 */</div><div class='add'>+} __packed;</div><div class='ctx'> </div><div class='add'>+/* TX control word 0 fields/flags */</div><div class='ctx'> #define AR5K_2W_TX_DESC_CTL0_FRAME_LEN		0x00000fff</div><div class='ctx'> #define AR5K_2W_TX_DESC_CTL0_HEADER_LEN		0x0003f000 /*[5210 ?]*/</div><div class='ctx'> #define AR5K_2W_TX_DESC_CTL0_HEADER_LEN_S	12</div><div class='hunk'>@@ -284,29 +144,34 @@ struct ath5k_hw_2w_tx_ctl {</div><div class='ctx'> #define AR5K_2W_TX_DESC_CTL0_FRAME_TYPE_S	26</div><div class='ctx'> #define AR5K_2W_TX_DESC_CTL0_ANT_MODE_XMIT_5210	0x02000000</div><div class='ctx'> #define AR5K_2W_TX_DESC_CTL0_ANT_MODE_XMIT_5211	0x1e000000</div><div class='del'>-#define AR5K_2W_TX_DESC_CTL0_ANT_MODE_XMIT	(ah-&gt;ah_version == AR5K_AR5210 ? \</div><div class='del'>-						AR5K_2W_TX_DESC_CTL0_ANT_MODE_XMIT_5210 : \</div><div class='del'>-						AR5K_2W_TX_DESC_CTL0_ANT_MODE_XMIT_5211)</div><div class='add'>+</div><div class='add'>+#define AR5K_2W_TX_DESC_CTL0_ANT_MODE_XMIT			\</div><div class='add'>+		(ah-&gt;ah_version == AR5K_AR5210 ?		\</div><div class='add'>+		AR5K_2W_TX_DESC_CTL0_ANT_MODE_XMIT_5210 :	\</div><div class='add'>+		AR5K_2W_TX_DESC_CTL0_ANT_MODE_XMIT_5211)</div><div class='add'>+</div><div class='ctx'> #define AR5K_2W_TX_DESC_CTL0_ANT_MODE_XMIT_S	25</div><div class='ctx'> #define AR5K_2W_TX_DESC_CTL0_INTREQ		0x20000000</div><div class='ctx'> #define AR5K_2W_TX_DESC_CTL0_ENCRYPT_KEY_VALID	0x40000000</div><div class='ctx'> </div><div class='del'>-	u32	tx_control_1; /* TX control word 1 */</div><div class='del'>-</div><div class='add'>+/* TX control word 1 fields/flags */</div><div class='ctx'> #define AR5K_2W_TX_DESC_CTL1_BUF_LEN		0x00000fff</div><div class='ctx'> #define AR5K_2W_TX_DESC_CTL1_MORE		0x00001000</div><div class='ctx'> #define AR5K_2W_TX_DESC_CTL1_ENCRYPT_KEY_INDEX_5210	0x0007e000</div><div class='ctx'> #define AR5K_2W_TX_DESC_CTL1_ENCRYPT_KEY_INDEX_5211	0x000fe000</div><div class='del'>-#define AR5K_2W_TX_DESC_CTL1_ENCRYPT_KEY_INDEX	(ah-&gt;ah_version == AR5K_AR5210 ? \</div><div class='del'>-						AR5K_2W_TX_DESC_CTL1_ENCRYPT_KEY_INDEX_5210 : \</div><div class='del'>-						AR5K_2W_TX_DESC_CTL1_ENCRYPT_KEY_INDEX_5211)</div><div class='add'>+</div><div class='add'>+#define AR5K_2W_TX_DESC_CTL1_ENCRYPT_KEY_INDEX				\</div><div class='add'>+			(ah-&gt;ah_version == AR5K_AR5210 ?		\</div><div class='add'>+			AR5K_2W_TX_DESC_CTL1_ENCRYPT_KEY_INDEX_5210 :	\</div><div class='add'>+			AR5K_2W_TX_DESC_CTL1_ENCRYPT_KEY_INDEX_5211)</div><div class='add'>+</div><div class='ctx'> #define AR5K_2W_TX_DESC_CTL1_ENCRYPT_KEY_INDEX_S	13</div><div class='ctx'> #define AR5K_2W_TX_DESC_CTL1_FRAME_TYPE		0x00700000 /*[5211]*/</div><div class='ctx'> #define AR5K_2W_TX_DESC_CTL1_FRAME_TYPE_S	20</div><div class='ctx'> #define AR5K_2W_TX_DESC_CTL1_NOACK		0x00800000 /*[5211]*/</div><div class='ctx'> #define AR5K_2W_TX_DESC_CTL1_RTS_DURATION	0xfff80000 /*[5210 ?]*/</div><div class='del'>-} __packed;</div><div class='ctx'> </div><div class='add'>+/* Frame types */</div><div class='ctx'> #define AR5K_AR5210_TX_DESC_FRAME_TYPE_NORMAL   0x00</div><div class='ctx'> #define AR5K_AR5210_TX_DESC_FRAME_TYPE_ATIM     0x04</div><div class='ctx'> #define AR5K_AR5210_TX_DESC_FRAME_TYPE_PSPOLL   0x08</div><div class='hunk'>@@ -378,7 +243,10 @@ struct ath5k_hw_4w_tx_ctl {</div><div class='ctx'>  */</div><div class='ctx'> struct ath5k_hw_tx_status {</div><div class='ctx'> 	u32	tx_status_0; /* TX status word 0 */</div><div class='add'>+	u32	tx_status_1; /* TX status word 1 */</div><div class='add'>+} __packed;</div><div class='ctx'> </div><div class='add'>+/* TX status word 0 fields/flags */</div><div class='ctx'> #define AR5K_DESC_TX_STATUS0_FRAME_XMIT_OK	0x00000001</div><div class='ctx'> #define AR5K_DESC_TX_STATUS0_EXCESSIVE_RETRIES	0x00000002</div><div class='ctx'> #define AR5K_DESC_TX_STATUS0_FIFO_UNDERRUN	0x00000004</div><div class='hunk'>@@ -400,8 +268,7 @@ struct ath5k_hw_tx_status {</div><div class='ctx'> #define AR5K_DESC_TX_STATUS0_SEND_TIMESTAMP	0xffff0000</div><div class='ctx'> #define AR5K_DESC_TX_STATUS0_SEND_TIMESTAMP_S	16</div><div class='ctx'> </div><div class='del'>-	u32	tx_status_1; /* TX status word 1 */</div><div class='del'>-</div><div class='add'>+/* TX status word 1 fields/flags */</div><div class='ctx'> #define AR5K_DESC_TX_STATUS1_DONE		0x00000001</div><div class='ctx'> #define AR5K_DESC_TX_STATUS1_SEQ_NUM		0x00001ffe</div><div class='ctx'> #define AR5K_DESC_TX_STATUS1_SEQ_NUM_S		1</div><div class='hunk'>@@ -411,8 +278,6 @@ struct ath5k_hw_tx_status {</div><div class='ctx'> #define AR5K_DESC_TX_STATUS1_FINAL_TS_INDEX_S	21</div><div class='ctx'> #define AR5K_DESC_TX_STATUS1_COMP_SUCCESS	0x00800000</div><div class='ctx'> #define AR5K_DESC_TX_STATUS1_XMIT_ANTENNA	0x01000000</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * 5210/5211 hardware TX descriptor</div><div class='hunk'>@@ -441,176 +306,27 @@ struct ath5k_hw_all_rx_desc {</div><div class='ctx'> 	} u;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /*</div><div class='del'>- * AR5K REGISTER ACCESS</div><div class='add'>+ * Atheros hardware descriptor</div><div class='add'>+ * This is read and written to by the hardware</div><div class='ctx'>  */</div><div class='add'>+struct ath5k_desc {</div><div class='add'>+	u32	ds_link;	/* physical address of the next descriptor */</div><div class='add'>+	u32	ds_data;	/* physical address of data buffer (skb) */</div><div class='ctx'> </div><div class='del'>-/*Swap RX/TX Descriptor for big endian archs*/</div><div class='del'>-#if defined(__BIG_ENDIAN)</div><div class='del'>-#define AR5K_INIT_CFG	(		\</div><div class='del'>-	AR5K_CFG_SWTD | AR5K_CFG_SWRD	\</div><div class='del'>-)</div><div class='del'>-#else</div><div class='del'>-#define AR5K_INIT_CFG	0x00000000</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*#define AR5K_REG_READ(_reg)	ath5k_hw_reg_read(ah, _reg)</div><div class='del'>-</div><div class='del'>-#define AR5K_REG_WRITE(_reg, _val)	ath5k_hw_reg_write(ah, _val, _reg)*/</div><div class='del'>-</div><div class='del'>-#define AR5K_REG_SM(_val, _flags)					\</div><div class='del'>-	(((_val) &lt;&lt; _flags##_S) &amp; (_flags))</div><div class='del'>-</div><div class='del'>-#define AR5K_REG_MS(_val, _flags)					\</div><div class='del'>-	(((_val) &amp; (_flags)) &gt;&gt; _flags##_S)</div><div class='del'>-</div><div class='del'>-/* Some registers can hold multiple values of interest. For this</div><div class='del'>- * reason when we want to write to these registers we must first</div><div class='del'>- * retrieve the values which we do not want to clear (lets call this</div><div class='del'>- * old_data) and then set the register with this and our new_value:</div><div class='del'>- * ( old_data | new_value) */</div><div class='del'>-#define AR5K_REG_WRITE_BITS(ah, _reg, _flags, _val)			\</div><div class='del'>-	ath5k_hw_reg_write(ah, (ath5k_hw_reg_read(ah, _reg) &amp; ~(_flags)) | \</div><div class='del'>-	    (((_val) &lt;&lt; _flags##_S) &amp; (_flags)), _reg)</div><div class='del'>-</div><div class='del'>-#define AR5K_REG_MASKED_BITS(ah, _reg, _flags, _mask)			\</div><div class='del'>-	ath5k_hw_reg_write(ah, (ath5k_hw_reg_read(ah, _reg) &amp;		\</div><div class='del'>-			(_mask)) | (_flags), _reg)</div><div class='del'>-</div><div class='del'>-#define AR5K_REG_ENABLE_BITS(ah, _reg, _flags)				\</div><div class='del'>-	ath5k_hw_reg_write(ah, ath5k_hw_reg_read(ah, _reg) | (_flags), _reg)</div><div class='del'>-</div><div class='del'>-#define AR5K_REG_DISABLE_BITS(ah, _reg, _flags)			\</div><div class='del'>-	ath5k_hw_reg_write(ah, ath5k_hw_reg_read(ah, _reg) &amp; ~(_flags), _reg)</div><div class='del'>-</div><div class='del'>-#define AR5K_PHY_WRITE(ah, _reg, _val)					\</div><div class='del'>-	ath5k_hw_reg_write(ah, _val, (ah)-&gt;ah_phy + ((_reg) &lt;&lt; 2))</div><div class='del'>-</div><div class='del'>-#define AR5K_PHY_READ(ah, _reg)					\</div><div class='del'>-	ath5k_hw_reg_read(ah, (ah)-&gt;ah_phy + ((_reg) &lt;&lt; 2))</div><div class='del'>-</div><div class='del'>-#define AR5K_REG_WAIT(_i) do {						\</div><div class='del'>-	if (_i % 64)							\</div><div class='del'>-		udelay(1);						\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#define AR5K_EEPROM_READ(_o, _v) do {					\</div><div class='del'>-	if ((ret = ath5k_hw_eeprom_read(ah, (_o), &amp;(_v))) != 0)	\</div><div class='del'>-		return (ret);						\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#define AR5K_EEPROM_READ_HDR(_o, _v)					\</div><div class='del'>-	AR5K_EEPROM_READ(_o, ah-&gt;ah_capabilities.cap_eeprom._v);	\</div><div class='del'>-</div><div class='del'>-/* Read status of selected queue */</div><div class='del'>-#define AR5K_REG_READ_Q(ah, _reg, _queue)				\</div><div class='del'>-	(ath5k_hw_reg_read(ah, _reg) &amp; (1 &lt;&lt; _queue))			\</div><div class='del'>-</div><div class='del'>-#define AR5K_REG_WRITE_Q(ah, _reg, _queue)				\</div><div class='del'>-	ath5k_hw_reg_write(ah, (1 &lt;&lt; _queue), _reg)</div><div class='del'>-</div><div class='del'>-#define AR5K_Q_ENABLE_BITS(_reg, _queue) do {				\</div><div class='del'>-	_reg |= 1 &lt;&lt; _queue;						\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#define AR5K_Q_DISABLE_BITS(_reg, _queue) do {				\</div><div class='del'>-	_reg &amp;= ~(1 &lt;&lt; _queue);						\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#define AR5K_LOW_ID(_a)(				\</div><div class='del'>-(_a)[0] | (_a)[1] &lt;&lt; 8 | (_a)[2] &lt;&lt; 16 | (_a)[3] &lt;&lt; 24	\</div><div class='del'>-)</div><div class='del'>-</div><div class='del'>-#define AR5K_HIGH_ID(_a)	((_a)[4] | (_a)[5] &lt;&lt; 8)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Initial register values</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Common initial register values</div><div class='del'>- */</div><div class='del'>-#define AR5K_INIT_MODE				CHANNEL_B</div><div class='del'>-</div><div class='del'>-#define AR5K_INIT_TX_LATENCY			502</div><div class='del'>-#define AR5K_INIT_USEC				39</div><div class='del'>-#define AR5K_INIT_USEC_TURBO			79</div><div class='del'>-#define AR5K_INIT_USEC_32			31</div><div class='del'>-#define AR5K_INIT_CARR_SENSE_EN			1</div><div class='del'>-#define AR5K_INIT_PROG_IFS			920</div><div class='del'>-#define AR5K_INIT_PROG_IFS_TURBO		960</div><div class='del'>-#define AR5K_INIT_EIFS				3440</div><div class='del'>-#define AR5K_INIT_EIFS_TURBO			6880</div><div class='del'>-#define AR5K_INIT_SLOT_TIME			396</div><div class='del'>-#define AR5K_INIT_SLOT_TIME_TURBO		480</div><div class='del'>-#define AR5K_INIT_ACK_CTS_TIMEOUT		1024</div><div class='del'>-#define AR5K_INIT_ACK_CTS_TIMEOUT_TURBO		0x08000800</div><div class='del'>-#define AR5K_INIT_SIFS				560</div><div class='del'>-#define AR5K_INIT_SIFS_TURBO			480</div><div class='del'>-#define AR5K_INIT_SH_RETRY			10</div><div class='del'>-#define AR5K_INIT_LG_RETRY			AR5K_INIT_SH_RETRY</div><div class='del'>-#define AR5K_INIT_SSH_RETRY			32</div><div class='del'>-#define AR5K_INIT_SLG_RETRY			AR5K_INIT_SSH_RETRY</div><div class='del'>-#define AR5K_INIT_TX_RETRY			10</div><div class='del'>-#define AR5K_INIT_TOPS				8</div><div class='del'>-#define AR5K_INIT_RXNOFRM			8</div><div class='del'>-#define AR5K_INIT_RPGTO				0</div><div class='del'>-#define AR5K_INIT_TXNOFRM			0</div><div class='del'>-#define AR5K_INIT_BEACON_PERIOD			65535</div><div class='del'>-#define AR5K_INIT_TIM_OFFSET			0</div><div class='del'>-#define AR5K_INIT_BEACON_EN			0</div><div class='del'>-#define AR5K_INIT_RESET_TSF			0</div><div class='del'>-</div><div class='del'>-#define AR5K_INIT_TRANSMIT_LATENCY		(			\</div><div class='del'>-	(AR5K_INIT_TX_LATENCY &lt;&lt; 14) | (AR5K_INIT_USEC_32 &lt;&lt; 7) |	\</div><div class='del'>-	(AR5K_INIT_USEC)						\</div><div class='del'>-)</div><div class='del'>-#define AR5K_INIT_TRANSMIT_LATENCY_TURBO	(			\</div><div class='del'>-	(AR5K_INIT_TX_LATENCY &lt;&lt; 14) | (AR5K_INIT_USEC_32 &lt;&lt; 7) |	\</div><div class='del'>-	(AR5K_INIT_USEC_TURBO)						\</div><div class='del'>-)</div><div class='del'>-#define AR5K_INIT_PROTO_TIME_CNTRL		(			\</div><div class='del'>-	(AR5K_INIT_CARR_SENSE_EN &lt;&lt; 26) | (AR5K_INIT_EIFS &lt;&lt; 12) |	\</div><div class='del'>-	(AR5K_INIT_PROG_IFS)						\</div><div class='del'>-)</div><div class='del'>-#define AR5K_INIT_PROTO_TIME_CNTRL_TURBO	(			\</div><div class='del'>-	(AR5K_INIT_CARR_SENSE_EN &lt;&lt; 26) | (AR5K_INIT_EIFS_TURBO &lt;&lt; 12) | \</div><div class='del'>-	(AR5K_INIT_PROG_IFS_TURBO)					\</div><div class='del'>-)</div><div class='del'>-#define AR5K_INIT_BEACON_CONTROL		(			\</div><div class='del'>-	(AR5K_INIT_RESET_TSF &lt;&lt; 24) | (AR5K_INIT_BEACON_EN &lt;&lt; 23) |	\</div><div class='del'>-	(AR5K_INIT_TIM_OFFSET &lt;&lt; 16) | (AR5K_INIT_BEACON_PERIOD)	\</div><div class='del'>-)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Non-common initial register values which have to be loaded into the</div><div class='del'>- * card at boot time and after each reset.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* Register dumps are done per operation mode */</div><div class='del'>-#define AR5K_INI_RFGAIN_5GHZ		0</div><div class='del'>-#define AR5K_INI_RFGAIN_2GHZ		1</div><div class='del'>-</div><div class='del'>-#define AR5K_INI_VAL_11A		0</div><div class='del'>-#define AR5K_INI_VAL_11A_TURBO		1</div><div class='del'>-#define AR5K_INI_VAL_11B		2</div><div class='del'>-#define AR5K_INI_VAL_11G		3</div><div class='del'>-#define AR5K_INI_VAL_11G_TURBO		4</div><div class='del'>-#define AR5K_INI_VAL_XR			0</div><div class='del'>-#define AR5K_INI_VAL_MAX		5</div><div class='del'>-</div><div class='del'>-#define AR5K_RF5111_INI_RF_MAX_BANKS	AR5K_MAX_RF_BANKS</div><div class='del'>-#define AR5K_RF5112_INI_RF_MAX_BANKS	AR5K_MAX_RF_BANKS</div><div class='add'>+	union {</div><div class='add'>+		struct ath5k_hw_5210_tx_desc	ds_tx5210;</div><div class='add'>+		struct ath5k_hw_5212_tx_desc	ds_tx5212;</div><div class='add'>+		struct ath5k_hw_all_rx_desc	ds_rx;</div><div class='add'>+	} ud;</div><div class='add'>+} __packed;</div><div class='ctx'> </div><div class='del'>-static inline u32 ath5k_hw_bitswap(u32 val, unsigned int bits)</div><div class='del'>-{</div><div class='del'>-	u32 retval = 0, bit, i;</div><div class='add'>+#define AR5K_RXDESC_INTREQ	0x0020</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; bits; i++) {</div><div class='del'>-		bit = (val &gt;&gt; i) &amp; 1;</div><div class='del'>-		retval = (retval &lt;&lt; 1) | bit;</div><div class='del'>-	}</div><div class='add'>+#define AR5K_TXDESC_CLRDMASK	0x0001</div><div class='add'>+#define AR5K_TXDESC_NOACK	0x0002	/*[5211+]*/</div><div class='add'>+#define AR5K_TXDESC_RTSENA	0x0004</div><div class='add'>+#define AR5K_TXDESC_CTSENA	0x0008</div><div class='add'>+#define AR5K_TXDESC_INTREQ	0x0010</div><div class='add'>+#define AR5K_TXDESC_VEOL	0x0020	/*[5211+]*/</div><div class='ctx'> </div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/net/wireless/ath5k/dma.c b/drivers/net/wireless/ath5k/dma.c<br/>new file mode 100644<br/>index 000000000000..7adceb2c7fab<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/ath5k/dma.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/ath5k/dma.c</a></div><div class='hunk'>@@ -0,0 +1,605 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2004-2008 Reyk Floeter &lt;reyk@openbsd.org&gt;</div><div class='add'>+ * Copyright (c) 2006-2008 Nick Kossifidis &lt;mickflemm@gmail.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * Permission to use, copy, modify, and distribute this software for any</div><div class='add'>+ * purpose with or without fee is hereby granted, provided that the above</div><div class='add'>+ * copyright notice and this permission notice appear in all copies.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES</div><div class='add'>+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR</div><div class='add'>+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES</div><div class='add'>+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN</div><div class='add'>+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF</div><div class='add'>+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*************************************\</div><div class='add'>+* DMA and interrupt masking functions *</div><div class='add'>+\*************************************/</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * dma.c - DMA and interrupt masking functions</div><div class='add'>+ *</div><div class='add'>+ * Here we setup descriptor pointers (rxdp/txdp) start/stop dma engine and</div><div class='add'>+ * handle queue setup for 5210 chipset (rest are handled on qcu.c).</div><div class='add'>+ * Also we setup interrupt mask register (IMR) and read the various iterrupt</div><div class='add'>+ * status registers (ISR).</div><div class='add'>+ *</div><div class='add'>+ * TODO: Handle SISR on 5211+ and introduce a function to return the queue</div><div class='add'>+ * number that resulted the interrupt.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "ath5k.h"</div><div class='add'>+#include "reg.h"</div><div class='add'>+#include "debug.h"</div><div class='add'>+#include "base.h"</div><div class='add'>+</div><div class='add'>+/*********\</div><div class='add'>+* Receive *</div><div class='add'>+\*********/</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_start_rx_dma - Start DMA receive</div><div class='add'>+ *</div><div class='add'>+ * @ah:	The &amp;struct ath5k_hw</div><div class='add'>+ */</div><div class='add'>+void ath5k_hw_start_rx_dma(struct ath5k_hw *ah)</div><div class='add'>+{</div><div class='add'>+	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='add'>+	ath5k_hw_reg_write(ah, AR5K_CR_RXE, AR5K_CR);</div><div class='add'>+	ath5k_hw_reg_read(ah, AR5K_CR);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_stop_rx_dma - Stop DMA receive</div><div class='add'>+ *</div><div class='add'>+ * @ah:	The &amp;struct ath5k_hw</div><div class='add'>+ */</div><div class='add'>+int ath5k_hw_stop_rx_dma(struct ath5k_hw *ah)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='add'>+	ath5k_hw_reg_write(ah, AR5K_CR_RXD, AR5K_CR);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * It may take some time to disable the DMA receive unit</div><div class='add'>+	 */</div><div class='add'>+	for (i = 1000; i &gt; 0 &amp;&amp;</div><div class='add'>+			(ath5k_hw_reg_read(ah, AR5K_CR) &amp; AR5K_CR_RXE) != 0;</div><div class='add'>+			i--)</div><div class='add'>+		udelay(10);</div><div class='add'>+</div><div class='add'>+	return i ? 0 : -EBUSY;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_get_rxdp - Get RX Descriptor's address</div><div class='add'>+ *</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ *</div><div class='add'>+ * XXX: Is RXDP read and clear ?</div><div class='add'>+ */</div><div class='add'>+u32 ath5k_hw_get_rxdp(struct ath5k_hw *ah)</div><div class='add'>+{</div><div class='add'>+	return ath5k_hw_reg_read(ah, AR5K_RXDP);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_set_rxdp - Set RX Descriptor's address</div><div class='add'>+ *</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @phys_addr: RX descriptor address</div><div class='add'>+ *</div><div class='add'>+ * XXX: Should we check if rx is enabled before setting rxdp ?</div><div class='add'>+ */</div><div class='add'>+void ath5k_hw_set_rxdp(struct ath5k_hw *ah, u32 phys_addr)</div><div class='add'>+{</div><div class='add'>+	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='add'>+</div><div class='add'>+	ath5k_hw_reg_write(ah, phys_addr, AR5K_RXDP);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/**********\</div><div class='add'>+* Transmit *</div><div class='add'>+\**********/</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_start_tx_dma - Start DMA transmit for a specific queue</div><div class='add'>+ *</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @queue: The hw queue number</div><div class='add'>+ *</div><div class='add'>+ * Start DMA transmit for a specific queue and since 5210 doesn't have</div><div class='add'>+ * QCU/DCU, set up queue parameters for 5210 here based on queue type (one</div><div class='add'>+ * queue for normal data and one queue for beacons). For queue setup</div><div class='add'>+ * on newer chips check out qcu.c. Returns -EINVAL if queue number is out</div><div class='add'>+ * of range or if queue is already disabled.</div><div class='add'>+ *</div><div class='add'>+ * NOTE: Must be called after setting up tx control descriptor for that</div><div class='add'>+ * queue (see below).</div><div class='add'>+ */</div><div class='add'>+int ath5k_hw_start_tx_dma(struct ath5k_hw *ah, unsigned int queue)</div><div class='add'>+{</div><div class='add'>+	u32 tx_queue;</div><div class='add'>+</div><div class='add'>+	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='add'>+	AR5K_ASSERT_ENTRY(queue, ah-&gt;ah_capabilities.cap_queues.q_tx_num);</div><div class='add'>+</div><div class='add'>+	/* Return if queue is declared inactive */</div><div class='add'>+	if (ah-&gt;ah_txq[queue].tqi_type == AR5K_TX_QUEUE_INACTIVE)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	if (ah-&gt;ah_version == AR5K_AR5210) {</div><div class='add'>+		tx_queue = ath5k_hw_reg_read(ah, AR5K_CR);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Set the queue by type on 5210</div><div class='add'>+		 */</div><div class='add'>+		switch (ah-&gt;ah_txq[queue].tqi_type) {</div><div class='add'>+		case AR5K_TX_QUEUE_DATA:</div><div class='add'>+			tx_queue |= AR5K_CR_TXE0 &amp; ~AR5K_CR_TXD0;</div><div class='add'>+			break;</div><div class='add'>+		case AR5K_TX_QUEUE_BEACON:</div><div class='add'>+			tx_queue |= AR5K_CR_TXE1 &amp; ~AR5K_CR_TXD1;</div><div class='add'>+			ath5k_hw_reg_write(ah, AR5K_BCR_TQ1V | AR5K_BCR_BDMAE,</div><div class='add'>+					AR5K_BSR);</div><div class='add'>+			break;</div><div class='add'>+		case AR5K_TX_QUEUE_CAB:</div><div class='add'>+			tx_queue |= AR5K_CR_TXE1 &amp; ~AR5K_CR_TXD1;</div><div class='add'>+			ath5k_hw_reg_write(ah, AR5K_BCR_TQ1FV | AR5K_BCR_TQ1V |</div><div class='add'>+				AR5K_BCR_BDMAE, AR5K_BSR);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		/* Start queue */</div><div class='add'>+		ath5k_hw_reg_write(ah, tx_queue, AR5K_CR);</div><div class='add'>+		ath5k_hw_reg_read(ah, AR5K_CR);</div><div class='add'>+	} else {</div><div class='add'>+		/* Return if queue is disabled */</div><div class='add'>+		if (AR5K_REG_READ_Q(ah, AR5K_QCU_TXD, queue))</div><div class='add'>+			return -EIO;</div><div class='add'>+</div><div class='add'>+		/* Start queue */</div><div class='add'>+		AR5K_REG_WRITE_Q(ah, AR5K_QCU_TXE, queue);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_stop_tx_dma - Stop DMA transmit on a specific queue</div><div class='add'>+ *</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @queue: The hw queue number</div><div class='add'>+ *</div><div class='add'>+ * Stop DMA transmit on a specific hw queue and drain queue so we don't</div><div class='add'>+ * have any pending frames. Returns -EBUSY if we still have pending frames,</div><div class='add'>+ * -EINVAL if queue number is out of range.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+int ath5k_hw_stop_tx_dma(struct ath5k_hw *ah, unsigned int queue)</div><div class='add'>+{</div><div class='add'>+	unsigned int i = 40;</div><div class='add'>+	u32 tx_queue, pending;</div><div class='add'>+</div><div class='add'>+	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='add'>+	AR5K_ASSERT_ENTRY(queue, ah-&gt;ah_capabilities.cap_queues.q_tx_num);</div><div class='add'>+</div><div class='add'>+	/* Return if queue is declared inactive */</div><div class='add'>+	if (ah-&gt;ah_txq[queue].tqi_type == AR5K_TX_QUEUE_INACTIVE)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	if (ah-&gt;ah_version == AR5K_AR5210) {</div><div class='add'>+		tx_queue = ath5k_hw_reg_read(ah, AR5K_CR);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Set by queue type</div><div class='add'>+		 */</div><div class='add'>+		switch (ah-&gt;ah_txq[queue].tqi_type) {</div><div class='add'>+		case AR5K_TX_QUEUE_DATA:</div><div class='add'>+			tx_queue |= AR5K_CR_TXD0 &amp; ~AR5K_CR_TXE0;</div><div class='add'>+			break;</div><div class='add'>+		case AR5K_TX_QUEUE_BEACON:</div><div class='add'>+		case AR5K_TX_QUEUE_CAB:</div><div class='add'>+			/* XXX Fix me... */</div><div class='add'>+			tx_queue |= AR5K_CR_TXD1 &amp; ~AR5K_CR_TXD1;</div><div class='add'>+			ath5k_hw_reg_write(ah, 0, AR5K_BSR);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Stop queue */</div><div class='add'>+		ath5k_hw_reg_write(ah, tx_queue, AR5K_CR);</div><div class='add'>+		ath5k_hw_reg_read(ah, AR5K_CR);</div><div class='add'>+	} else {</div><div class='add'>+		/*</div><div class='add'>+		 * Schedule TX disable and wait until queue is empty</div><div class='add'>+		 */</div><div class='add'>+		AR5K_REG_WRITE_Q(ah, AR5K_QCU_TXD, queue);</div><div class='add'>+</div><div class='add'>+		/*Check for pending frames*/</div><div class='add'>+		do {</div><div class='add'>+			pending = ath5k_hw_reg_read(ah,</div><div class='add'>+				AR5K_QUEUE_STATUS(queue)) &amp;</div><div class='add'>+				AR5K_QCU_STS_FRMPENDCNT;</div><div class='add'>+			udelay(100);</div><div class='add'>+		} while (--i &amp;&amp; pending);</div><div class='add'>+</div><div class='add'>+		/* For 2413+ order PCU to drop packets using</div><div class='add'>+		 * QUIET mechanism */</div><div class='add'>+		if (ah-&gt;ah_mac_version &gt;= (AR5K_SREV_AR2414 &gt;&gt; 4) &amp;&amp;</div><div class='add'>+		pending){</div><div class='add'>+			/* Set periodicity and duration */</div><div class='add'>+			ath5k_hw_reg_write(ah,</div><div class='add'>+				AR5K_REG_SM(100, AR5K_QUIET_CTL2_QT_PER)|</div><div class='add'>+				AR5K_REG_SM(10, AR5K_QUIET_CTL2_QT_DUR),</div><div class='add'>+				AR5K_QUIET_CTL2);</div><div class='add'>+</div><div class='add'>+			/* Enable quiet period for current TSF */</div><div class='add'>+			ath5k_hw_reg_write(ah,</div><div class='add'>+				AR5K_QUIET_CTL1_QT_EN |</div><div class='add'>+				AR5K_REG_SM(ath5k_hw_reg_read(ah,</div><div class='add'>+						AR5K_TSF_L32_5211) &gt;&gt; 10,</div><div class='add'>+						AR5K_QUIET_CTL1_NEXT_QT_TSF),</div><div class='add'>+				AR5K_QUIET_CTL1);</div><div class='add'>+</div><div class='add'>+			/* Force channel idle high */</div><div class='add'>+			AR5K_REG_ENABLE_BITS(ah, AR5K_DIAG_SW_5211,</div><div class='add'>+					AR5K_DIAG_SW_CHANEL_IDLE_HIGH);</div><div class='add'>+</div><div class='add'>+			/* Wait a while and disable mechanism */</div><div class='add'>+			udelay(200);</div><div class='add'>+			AR5K_REG_DISABLE_BITS(ah, AR5K_QUIET_CTL1,</div><div class='add'>+						AR5K_QUIET_CTL1_QT_EN);</div><div class='add'>+</div><div class='add'>+			/* Re-check for pending frames */</div><div class='add'>+			i = 40;</div><div class='add'>+			do {</div><div class='add'>+				pending = ath5k_hw_reg_read(ah,</div><div class='add'>+					AR5K_QUEUE_STATUS(queue)) &amp;</div><div class='add'>+					AR5K_QCU_STS_FRMPENDCNT;</div><div class='add'>+				udelay(100);</div><div class='add'>+			} while (--i &amp;&amp; pending);</div><div class='add'>+</div><div class='add'>+			AR5K_REG_DISABLE_BITS(ah, AR5K_DIAG_SW_5211,</div><div class='add'>+					AR5K_DIAG_SW_CHANEL_IDLE_HIGH);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Clear register */</div><div class='add'>+		ath5k_hw_reg_write(ah, 0, AR5K_QCU_TXD);</div><div class='add'>+		if (pending)</div><div class='add'>+			return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* TODO: Check for success on 5210 else return error */</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_get_txdp - Get TX Descriptor's address for a specific queue</div><div class='add'>+ *</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @queue: The hw queue number</div><div class='add'>+ *</div><div class='add'>+ * Get TX descriptor's address for a specific queue. For 5210 we ignore</div><div class='add'>+ * the queue number and use tx queue type since we only have 2 queues.</div><div class='add'>+ * We use TXDP0 for normal data queue and TXDP1 for beacon queue.</div><div class='add'>+ * For newer chips with QCU/DCU we just read the corresponding TXDP register.</div><div class='add'>+ *</div><div class='add'>+ * XXX: Is TXDP read and clear ?</div><div class='add'>+ */</div><div class='add'>+u32 ath5k_hw_get_txdp(struct ath5k_hw *ah, unsigned int queue)</div><div class='add'>+{</div><div class='add'>+	u16 tx_reg;</div><div class='add'>+</div><div class='add'>+	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='add'>+	AR5K_ASSERT_ENTRY(queue, ah-&gt;ah_capabilities.cap_queues.q_tx_num);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Get the transmit queue descriptor pointer from the selected queue</div><div class='add'>+	 */</div><div class='add'>+	/*5210 doesn't have QCU*/</div><div class='add'>+	if (ah-&gt;ah_version == AR5K_AR5210) {</div><div class='add'>+		switch (ah-&gt;ah_txq[queue].tqi_type) {</div><div class='add'>+		case AR5K_TX_QUEUE_DATA:</div><div class='add'>+			tx_reg = AR5K_NOQCU_TXDP0;</div><div class='add'>+			break;</div><div class='add'>+		case AR5K_TX_QUEUE_BEACON:</div><div class='add'>+		case AR5K_TX_QUEUE_CAB:</div><div class='add'>+			tx_reg = AR5K_NOQCU_TXDP1;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			return 0xffffffff;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		tx_reg = AR5K_QUEUE_TXDP(queue);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ath5k_hw_reg_read(ah, tx_reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_set_txdp - Set TX Descriptor's address for a specific queue</div><div class='add'>+ *</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @queue: The hw queue number</div><div class='add'>+ *</div><div class='add'>+ * Set TX descriptor's address for a specific queue. For 5210 we ignore</div><div class='add'>+ * the queue number and we use tx queue type since we only have 2 queues</div><div class='add'>+ * so as above we use TXDP0 for normal data queue and TXDP1 for beacon queue.</div><div class='add'>+ * For newer chips with QCU/DCU we just set the corresponding TXDP register.</div><div class='add'>+ * Returns -EINVAL if queue type is invalid for 5210 and -EIO if queue is still</div><div class='add'>+ * active.</div><div class='add'>+ */</div><div class='add'>+int ath5k_hw_set_txdp(struct ath5k_hw *ah, unsigned int queue, u32 phys_addr)</div><div class='add'>+{</div><div class='add'>+	u16 tx_reg;</div><div class='add'>+</div><div class='add'>+	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='add'>+	AR5K_ASSERT_ENTRY(queue, ah-&gt;ah_capabilities.cap_queues.q_tx_num);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Set the transmit queue descriptor pointer register by type</div><div class='add'>+	 * on 5210</div><div class='add'>+	 */</div><div class='add'>+	if (ah-&gt;ah_version == AR5K_AR5210) {</div><div class='add'>+		switch (ah-&gt;ah_txq[queue].tqi_type) {</div><div class='add'>+		case AR5K_TX_QUEUE_DATA:</div><div class='add'>+			tx_reg = AR5K_NOQCU_TXDP0;</div><div class='add'>+			break;</div><div class='add'>+		case AR5K_TX_QUEUE_BEACON:</div><div class='add'>+		case AR5K_TX_QUEUE_CAB:</div><div class='add'>+			tx_reg = AR5K_NOQCU_TXDP1;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		/*</div><div class='add'>+		 * Set the transmit queue descriptor pointer for</div><div class='add'>+		 * the selected queue on QCU for 5211+</div><div class='add'>+		 * (this won't work if the queue is still active)</div><div class='add'>+		 */</div><div class='add'>+		if (AR5K_REG_READ_Q(ah, AR5K_QCU_TXE, queue))</div><div class='add'>+			return -EIO;</div><div class='add'>+</div><div class='add'>+		tx_reg = AR5K_QUEUE_TXDP(queue);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Set descriptor pointer */</div><div class='add'>+	ath5k_hw_reg_write(ah, phys_addr, tx_reg);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_update_tx_triglevel - Update tx trigger level</div><div class='add'>+ *</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @increase: Flag to force increase of trigger level</div><div class='add'>+ *</div><div class='add'>+ * This function increases/decreases the tx trigger level for the tx fifo</div><div class='add'>+ * buffer (aka FIFO threshold) that is used to indicate when PCU flushes</div><div class='add'>+ * the buffer and transmits it's data. Lowering this results sending small</div><div class='add'>+ * frames more quickly but can lead to tx underruns, raising it a lot can</div><div class='add'>+ * result other problems (i think bmiss is related). Right now we start with</div><div class='add'>+ * the lowest possible (64Bytes) and if we get tx underrun we increase it using</div><div class='add'>+ * the increase flag. Returns -EIO if we have have reached maximum/minimum.</div><div class='add'>+ *</div><div class='add'>+ * XXX: Link this with tx DMA size ?</div><div class='add'>+ * XXX: Use it to save interrupts ?</div><div class='add'>+ * TODO: Needs testing, i think it's related to bmiss...</div><div class='add'>+ */</div><div class='add'>+int ath5k_hw_update_tx_triglevel(struct ath5k_hw *ah, bool increase)</div><div class='add'>+{</div><div class='add'>+	u32 trigger_level, imr;</div><div class='add'>+	int ret = -EIO;</div><div class='add'>+</div><div class='add'>+	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Disable interrupts by setting the mask</div><div class='add'>+	 */</div><div class='add'>+	imr = ath5k_hw_set_imr(ah, ah-&gt;ah_imr &amp; ~AR5K_INT_GLOBAL);</div><div class='add'>+</div><div class='add'>+	trigger_level = AR5K_REG_MS(ath5k_hw_reg_read(ah, AR5K_TXCFG),</div><div class='add'>+			AR5K_TXCFG_TXFULL);</div><div class='add'>+</div><div class='add'>+	if (!increase) {</div><div class='add'>+		if (--trigger_level &lt; AR5K_TUNE_MIN_TX_FIFO_THRES)</div><div class='add'>+			goto done;</div><div class='add'>+	} else</div><div class='add'>+		trigger_level +=</div><div class='add'>+			((AR5K_TUNE_MAX_TX_FIFO_THRES - trigger_level) / 2);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Update trigger level on success</div><div class='add'>+	 */</div><div class='add'>+	if (ah-&gt;ah_version == AR5K_AR5210)</div><div class='add'>+		ath5k_hw_reg_write(ah, trigger_level, AR5K_TRIG_LVL);</div><div class='add'>+	else</div><div class='add'>+		AR5K_REG_WRITE_BITS(ah, AR5K_TXCFG,</div><div class='add'>+				AR5K_TXCFG_TXFULL, trigger_level);</div><div class='add'>+</div><div class='add'>+	ret = 0;</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	/*</div><div class='add'>+	 * Restore interrupt mask</div><div class='add'>+	 */</div><div class='add'>+	ath5k_hw_set_imr(ah, imr);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*******************\</div><div class='add'>+* Interrupt masking *</div><div class='add'>+\*******************/</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_is_intr_pending - Check if we have pending interrupts</div><div class='add'>+ *</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ *</div><div class='add'>+ * Check if we have pending interrupts to process. Returns 1 if we</div><div class='add'>+ * have pending interrupts and 0 if we haven't.</div><div class='add'>+ */</div><div class='add'>+bool ath5k_hw_is_intr_pending(struct ath5k_hw *ah)</div><div class='add'>+{</div><div class='add'>+	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='add'>+	return ath5k_hw_reg_read(ah, AR5K_INTPEND) == 1 ? 1 : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_get_isr - Get interrupt status</div><div class='add'>+ *</div><div class='add'>+ * @ah: The @struct ath5k_hw</div><div class='add'>+ * @interrupt_mask: Driver's interrupt mask used to filter out</div><div class='add'>+ * interrupts in sw.</div><div class='add'>+ *</div><div class='add'>+ * This function is used inside our interrupt handler to determine the reason</div><div class='add'>+ * for the interrupt by reading Primary Interrupt Status Register. Returns an</div><div class='add'>+ * abstract interrupt status mask which is mostly ISR with some uncommon bits</div><div class='add'>+ * being mapped on some standard non hw-specific positions</div><div class='add'>+ * (check out &amp;ath5k_int).</div><div class='add'>+ *</div><div class='add'>+ * NOTE: We use read-and-clear register, so after this function is called ISR</div><div class='add'>+ * is zeroed.</div><div class='add'>+ *</div><div class='add'>+ * XXX: Why filter interrupts in sw with interrupt_mask ? No benefit at all</div><div class='add'>+ * plus it can be misleading (one might thing that we save interrupts this way)</div><div class='add'>+ */</div><div class='add'>+int ath5k_hw_get_isr(struct ath5k_hw *ah, enum ath5k_int *interrupt_mask)</div><div class='add'>+{</div><div class='add'>+	u32 data;</div><div class='add'>+</div><div class='add'>+	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Read interrupt status from the Interrupt Status register</div><div class='add'>+	 * on 5210</div><div class='add'>+	 */</div><div class='add'>+	if (ah-&gt;ah_version == AR5K_AR5210) {</div><div class='add'>+		data = ath5k_hw_reg_read(ah, AR5K_ISR);</div><div class='add'>+		if (unlikely(data == AR5K_INT_NOCARD)) {</div><div class='add'>+			*interrupt_mask = data;</div><div class='add'>+			return -ENODEV;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		/*</div><div class='add'>+		 * Read interrupt status from the Read-And-Clear</div><div class='add'>+		 * shadow register.</div><div class='add'>+		 * Note: PISR/SISR Not available on 5210</div><div class='add'>+		 */</div><div class='add'>+		data = ath5k_hw_reg_read(ah, AR5K_RAC_PISR);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Get abstract interrupt mask (driver-compatible)</div><div class='add'>+	 */</div><div class='add'>+	*interrupt_mask = (data &amp; AR5K_INT_COMMON) &amp; ah-&gt;ah_imr;</div><div class='add'>+</div><div class='add'>+	if (unlikely(data == AR5K_INT_NOCARD))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	if (data &amp; (AR5K_ISR_RXOK | AR5K_ISR_RXERR))</div><div class='add'>+		*interrupt_mask |= AR5K_INT_RX;</div><div class='add'>+</div><div class='add'>+	if (data &amp; (AR5K_ISR_TXOK | AR5K_ISR_TXERR</div><div class='add'>+		| AR5K_ISR_TXDESC | AR5K_ISR_TXEOL))</div><div class='add'>+		*interrupt_mask |= AR5K_INT_TX;</div><div class='add'>+</div><div class='add'>+	if (ah-&gt;ah_version != AR5K_AR5210) {</div><div class='add'>+		/*HIU = Host Interface Unit (PCI etc)*/</div><div class='add'>+		if (unlikely(data &amp; (AR5K_ISR_HIUERR)))</div><div class='add'>+			*interrupt_mask |= AR5K_INT_FATAL;</div><div class='add'>+</div><div class='add'>+		/*Beacon Not Ready*/</div><div class='add'>+		if (unlikely(data &amp; (AR5K_ISR_BNR)))</div><div class='add'>+			*interrupt_mask |= AR5K_INT_BNR;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * XXX: BMISS interrupts may occur after association.</div><div class='add'>+	 * I found this on 5210 code but it needs testing. If this is</div><div class='add'>+	 * true we should disable them before assoc and re-enable them</div><div class='add'>+	 * after a successfull assoc + some jiffies.</div><div class='add'>+	 */</div><div class='add'>+#if 0</div><div class='add'>+	interrupt_mask &amp;= ~AR5K_INT_BMISS;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * In case we didn't handle anything,</div><div class='add'>+	 * print the register value.</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(*interrupt_mask == 0 &amp;&amp; net_ratelimit()))</div><div class='add'>+		ATH5K_PRINTF("0x%08x\n", data);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_set_imr - Set interrupt mask</div><div class='add'>+ *</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @new_mask: The new interrupt mask to be set</div><div class='add'>+ *</div><div class='add'>+ * Set the interrupt mask in hw to save interrupts. We do that by mapping</div><div class='add'>+ * ath5k_int bits to hw-specific bits to remove abstraction and writing</div><div class='add'>+ * Interrupt Mask Register.</div><div class='add'>+ */</div><div class='add'>+enum ath5k_int ath5k_hw_set_imr(struct ath5k_hw *ah, enum ath5k_int new_mask)</div><div class='add'>+{</div><div class='add'>+	enum ath5k_int old_mask, int_mask;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Disable card interrupts to prevent any race conditions</div><div class='add'>+	 * (they will be re-enabled afterwards).</div><div class='add'>+	 */</div><div class='add'>+	ath5k_hw_reg_write(ah, AR5K_IER_DISABLE, AR5K_IER);</div><div class='add'>+	ath5k_hw_reg_read(ah, AR5K_IER);</div><div class='add'>+</div><div class='add'>+	old_mask = ah-&gt;ah_imr;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Add additional, chipset-dependent interrupt mask flags</div><div class='add'>+	 * and write them to the IMR (interrupt mask register).</div><div class='add'>+	 */</div><div class='add'>+	int_mask = new_mask &amp; AR5K_INT_COMMON;</div><div class='add'>+</div><div class='add'>+	if (new_mask &amp; AR5K_INT_RX)</div><div class='add'>+		int_mask |= AR5K_IMR_RXOK | AR5K_IMR_RXERR | AR5K_IMR_RXORN |</div><div class='add'>+			AR5K_IMR_RXDESC;</div><div class='add'>+</div><div class='add'>+	if (new_mask &amp; AR5K_INT_TX)</div><div class='add'>+		int_mask |= AR5K_IMR_TXOK | AR5K_IMR_TXERR | AR5K_IMR_TXDESC |</div><div class='add'>+			AR5K_IMR_TXURN;</div><div class='add'>+</div><div class='add'>+	if (ah-&gt;ah_version != AR5K_AR5210) {</div><div class='add'>+		if (new_mask &amp; AR5K_INT_FATAL) {</div><div class='add'>+			int_mask |= AR5K_IMR_HIUERR;</div><div class='add'>+			AR5K_REG_ENABLE_BITS(ah, AR5K_SIMR2, AR5K_SIMR2_MCABT |</div><div class='add'>+					AR5K_SIMR2_SSERR | AR5K_SIMR2_DPERR);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath5k_hw_reg_write(ah, int_mask, AR5K_PIMR);</div><div class='add'>+</div><div class='add'>+	/* Store new interrupt mask */</div><div class='add'>+	ah-&gt;ah_imr = new_mask;</div><div class='add'>+</div><div class='add'>+	/* ..re-enable interrupts */</div><div class='add'>+	ath5k_hw_reg_write(ah, AR5K_IER_ENABLE, AR5K_IER);</div><div class='add'>+	ath5k_hw_reg_read(ah, AR5K_IER);</div><div class='add'>+</div><div class='add'>+	return old_mask;</div><div class='add'>+}</div><div class='add'>+</div><div class='head'>diff --git a/drivers/net/wireless/ath5k/eeprom.c b/drivers/net/wireless/ath5k/eeprom.c<br/>new file mode 100644<br/>index 000000000000..a883839b6a9f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/ath5k/eeprom.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/ath5k/eeprom.c</a></div><div class='hunk'>@@ -0,0 +1,466 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2004-2008 Reyk Floeter &lt;reyk@openbsd.org&gt;</div><div class='add'>+ * Copyright (c) 2006-2008 Nick Kossifidis &lt;mickflemm@gmail.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * Permission to use, copy, modify, and distribute this software for any</div><div class='add'>+ * purpose with or without fee is hereby granted, provided that the above</div><div class='add'>+ * copyright notice and this permission notice appear in all copies.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES</div><div class='add'>+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR</div><div class='add'>+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES</div><div class='add'>+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN</div><div class='add'>+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF</div><div class='add'>+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*************************************\</div><div class='add'>+* EEPROM access functions and helpers *</div><div class='add'>+\*************************************/</div><div class='add'>+</div><div class='add'>+#include "ath5k.h"</div><div class='add'>+#include "reg.h"</div><div class='add'>+#include "debug.h"</div><div class='add'>+#include "base.h"</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Read from eeprom</div><div class='add'>+ */</div><div class='add'>+static int ath5k_hw_eeprom_read(struct ath5k_hw *ah, u32 offset, u16 *data)</div><div class='add'>+{</div><div class='add'>+	u32 status, timeout;</div><div class='add'>+</div><div class='add'>+	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='add'>+	/*</div><div class='add'>+	 * Initialize EEPROM access</div><div class='add'>+	 */</div><div class='add'>+	if (ah-&gt;ah_version == AR5K_AR5210) {</div><div class='add'>+		AR5K_REG_ENABLE_BITS(ah, AR5K_PCICFG, AR5K_PCICFG_EEAE);</div><div class='add'>+		(void)ath5k_hw_reg_read(ah, AR5K_EEPROM_BASE + (4 * offset));</div><div class='add'>+	} else {</div><div class='add'>+		ath5k_hw_reg_write(ah, offset, AR5K_EEPROM_BASE);</div><div class='add'>+		AR5K_REG_ENABLE_BITS(ah, AR5K_EEPROM_CMD,</div><div class='add'>+				AR5K_EEPROM_CMD_READ);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (timeout = AR5K_TUNE_REGISTER_TIMEOUT; timeout &gt; 0; timeout--) {</div><div class='add'>+		status = ath5k_hw_reg_read(ah, AR5K_EEPROM_STATUS);</div><div class='add'>+		if (status &amp; AR5K_EEPROM_STAT_RDDONE) {</div><div class='add'>+			if (status &amp; AR5K_EEPROM_STAT_RDERR)</div><div class='add'>+				return -EIO;</div><div class='add'>+			*data = (u16)(ath5k_hw_reg_read(ah, AR5K_EEPROM_DATA) &amp;</div><div class='add'>+					0xffff);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+		udelay(15);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -ETIMEDOUT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Translate binary channel representation in EEPROM to frequency</div><div class='add'>+ */</div><div class='add'>+static u16 ath5k_eeprom_bin2freq(struct ath5k_hw *ah, u16 bin,</div><div class='add'>+				unsigned int mode)</div><div class='add'>+{</div><div class='add'>+	u16 val;</div><div class='add'>+</div><div class='add'>+	if (bin == AR5K_EEPROM_CHANNEL_DIS)</div><div class='add'>+		return bin;</div><div class='add'>+</div><div class='add'>+	if (mode == AR5K_EEPROM_MODE_11A) {</div><div class='add'>+		if (ah-&gt;ah_ee_version &gt; AR5K_EEPROM_VERSION_3_2)</div><div class='add'>+			val = (5 * bin) + 4800;</div><div class='add'>+		else</div><div class='add'>+			val = bin &gt; 62 ? (10 * 62) + (5 * (bin - 62)) + 5100 :</div><div class='add'>+				(bin * 10) + 5100;</div><div class='add'>+	} else {</div><div class='add'>+		if (ah-&gt;ah_ee_version &gt; AR5K_EEPROM_VERSION_3_2)</div><div class='add'>+			val = bin + 2300;</div><div class='add'>+		else</div><div class='add'>+			val = bin + 2400;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Read antenna infos from eeprom</div><div class='add'>+ */</div><div class='add'>+static int ath5k_eeprom_read_ants(struct ath5k_hw *ah, u32 *offset,</div><div class='add'>+		unsigned int mode)</div><div class='add'>+{</div><div class='add'>+	struct ath5k_eeprom_info *ee = &amp;ah-&gt;ah_capabilities.cap_eeprom;</div><div class='add'>+	u32 o = *offset;</div><div class='add'>+	u16 val;</div><div class='add'>+	int ret, i = 0;</div><div class='add'>+</div><div class='add'>+	AR5K_EEPROM_READ(o++, val);</div><div class='add'>+	ee-&gt;ee_switch_settling[mode]	= (val &gt;&gt; 8) &amp; 0x7f;</div><div class='add'>+	ee-&gt;ee_ant_tx_rx[mode]		= (val &gt;&gt; 2) &amp; 0x3f;</div><div class='add'>+	ee-&gt;ee_ant_control[mode][i]	= (val &lt;&lt; 4) &amp; 0x3f;</div><div class='add'>+</div><div class='add'>+	AR5K_EEPROM_READ(o++, val);</div><div class='add'>+	ee-&gt;ee_ant_control[mode][i++]	|= (val &gt;&gt; 12) &amp; 0xf;</div><div class='add'>+	ee-&gt;ee_ant_control[mode][i++]	= (val &gt;&gt; 6) &amp; 0x3f;</div><div class='add'>+	ee-&gt;ee_ant_control[mode][i++]	= val &amp; 0x3f;</div><div class='add'>+</div><div class='add'>+	AR5K_EEPROM_READ(o++, val);</div><div class='add'>+	ee-&gt;ee_ant_control[mode][i++]	= (val &gt;&gt; 10) &amp; 0x3f;</div><div class='add'>+	ee-&gt;ee_ant_control[mode][i++]	= (val &gt;&gt; 4) &amp; 0x3f;</div><div class='add'>+	ee-&gt;ee_ant_control[mode][i]	= (val &lt;&lt; 2) &amp; 0x3f;</div><div class='add'>+</div><div class='add'>+	AR5K_EEPROM_READ(o++, val);</div><div class='add'>+	ee-&gt;ee_ant_control[mode][i++]	|= (val &gt;&gt; 14) &amp; 0x3;</div><div class='add'>+	ee-&gt;ee_ant_control[mode][i++]	= (val &gt;&gt; 8) &amp; 0x3f;</div><div class='add'>+	ee-&gt;ee_ant_control[mode][i++]	= (val &gt;&gt; 2) &amp; 0x3f;</div><div class='add'>+	ee-&gt;ee_ant_control[mode][i]	= (val &lt;&lt; 4) &amp; 0x3f;</div><div class='add'>+</div><div class='add'>+	AR5K_EEPROM_READ(o++, val);</div><div class='add'>+	ee-&gt;ee_ant_control[mode][i++]	|= (val &gt;&gt; 12) &amp; 0xf;</div><div class='add'>+	ee-&gt;ee_ant_control[mode][i++]	= (val &gt;&gt; 6) &amp; 0x3f;</div><div class='add'>+	ee-&gt;ee_ant_control[mode][i++]	= val &amp; 0x3f;</div><div class='add'>+</div><div class='add'>+	/* Get antenna modes */</div><div class='add'>+	ah-&gt;ah_antenna[mode][0] =</div><div class='add'>+	    (ee-&gt;ee_ant_control[mode][0] &lt;&lt; 4) | 0x1;</div><div class='add'>+	ah-&gt;ah_antenna[mode][AR5K_ANT_FIXED_A] =</div><div class='add'>+	     ee-&gt;ee_ant_control[mode][1] 	|</div><div class='add'>+	    (ee-&gt;ee_ant_control[mode][2] &lt;&lt; 6) 	|</div><div class='add'>+	    (ee-&gt;ee_ant_control[mode][3] &lt;&lt; 12) |</div><div class='add'>+	    (ee-&gt;ee_ant_control[mode][4] &lt;&lt; 18) |</div><div class='add'>+	    (ee-&gt;ee_ant_control[mode][5] &lt;&lt; 24);</div><div class='add'>+	ah-&gt;ah_antenna[mode][AR5K_ANT_FIXED_B] =</div><div class='add'>+	     ee-&gt;ee_ant_control[mode][6] 	|</div><div class='add'>+	    (ee-&gt;ee_ant_control[mode][7] &lt;&lt; 6) 	|</div><div class='add'>+	    (ee-&gt;ee_ant_control[mode][8] &lt;&lt; 12) |</div><div class='add'>+	    (ee-&gt;ee_ant_control[mode][9] &lt;&lt; 18) |</div><div class='add'>+	    (ee-&gt;ee_ant_control[mode][10] &lt;&lt; 24);</div><div class='add'>+</div><div class='add'>+	/* return new offset */</div><div class='add'>+	*offset = o;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Read supported modes from eeprom</div><div class='add'>+ */</div><div class='add'>+static int ath5k_eeprom_read_modes(struct ath5k_hw *ah, u32 *offset,</div><div class='add'>+		unsigned int mode)</div><div class='add'>+{</div><div class='add'>+	struct ath5k_eeprom_info *ee = &amp;ah-&gt;ah_capabilities.cap_eeprom;</div><div class='add'>+	u32 o = *offset;</div><div class='add'>+	u16 val;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	AR5K_EEPROM_READ(o++, val);</div><div class='add'>+	ee-&gt;ee_tx_end2xlna_enable[mode]	= (val &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+	ee-&gt;ee_thr_62[mode]		= val &amp; 0xff;</div><div class='add'>+</div><div class='add'>+	if (ah-&gt;ah_ee_version &lt;= AR5K_EEPROM_VERSION_3_2)</div><div class='add'>+		ee-&gt;ee_thr_62[mode] = mode == AR5K_EEPROM_MODE_11A ? 15 : 28;</div><div class='add'>+</div><div class='add'>+	AR5K_EEPROM_READ(o++, val);</div><div class='add'>+	ee-&gt;ee_tx_end2xpa_disable[mode]	= (val &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+	ee-&gt;ee_tx_frm2xpa_enable[mode]	= val &amp; 0xff;</div><div class='add'>+</div><div class='add'>+	AR5K_EEPROM_READ(o++, val);</div><div class='add'>+	ee-&gt;ee_pga_desired_size[mode]	= (val &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+</div><div class='add'>+	if ((val &amp; 0xff) &amp; 0x80)</div><div class='add'>+		ee-&gt;ee_noise_floor_thr[mode] = -((((val &amp; 0xff) ^ 0xff)) + 1);</div><div class='add'>+	else</div><div class='add'>+		ee-&gt;ee_noise_floor_thr[mode] = val &amp; 0xff;</div><div class='add'>+</div><div class='add'>+	if (ah-&gt;ah_ee_version &lt;= AR5K_EEPROM_VERSION_3_2)</div><div class='add'>+		ee-&gt;ee_noise_floor_thr[mode] =</div><div class='add'>+		    mode == AR5K_EEPROM_MODE_11A ? -54 : -1;</div><div class='add'>+</div><div class='add'>+	AR5K_EEPROM_READ(o++, val);</div><div class='add'>+	ee-&gt;ee_xlna_gain[mode]		= (val &gt;&gt; 5) &amp; 0xff;</div><div class='add'>+	ee-&gt;ee_x_gain[mode]		= (val &gt;&gt; 1) &amp; 0xf;</div><div class='add'>+	ee-&gt;ee_xpd[mode]		= val &amp; 0x1;</div><div class='add'>+</div><div class='add'>+	if (ah-&gt;ah_ee_version &gt;= AR5K_EEPROM_VERSION_4_0)</div><div class='add'>+		ee-&gt;ee_fixed_bias[mode] = (val &gt;&gt; 13) &amp; 0x1;</div><div class='add'>+</div><div class='add'>+	if (ah-&gt;ah_ee_version &gt;= AR5K_EEPROM_VERSION_3_3) {</div><div class='add'>+		AR5K_EEPROM_READ(o++, val);</div><div class='add'>+		ee-&gt;ee_false_detect[mode] = (val &gt;&gt; 6) &amp; 0x7f;</div><div class='add'>+</div><div class='add'>+		if (mode == AR5K_EEPROM_MODE_11A)</div><div class='add'>+			ee-&gt;ee_xr_power[mode] = val &amp; 0x3f;</div><div class='add'>+		else {</div><div class='add'>+			ee-&gt;ee_ob[mode][0] = val &amp; 0x7;</div><div class='add'>+			ee-&gt;ee_db[mode][0] = (val &gt;&gt; 3) &amp; 0x7;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ah-&gt;ah_ee_version &lt; AR5K_EEPROM_VERSION_3_4) {</div><div class='add'>+		ee-&gt;ee_i_gain[mode] = AR5K_EEPROM_I_GAIN;</div><div class='add'>+		ee-&gt;ee_cck_ofdm_power_delta = AR5K_EEPROM_CCK_OFDM_DELTA;</div><div class='add'>+	} else {</div><div class='add'>+		ee-&gt;ee_i_gain[mode] = (val &gt;&gt; 13) &amp; 0x7;</div><div class='add'>+</div><div class='add'>+		AR5K_EEPROM_READ(o++, val);</div><div class='add'>+		ee-&gt;ee_i_gain[mode] |= (val &lt;&lt; 3) &amp; 0x38;</div><div class='add'>+</div><div class='add'>+		if (mode == AR5K_EEPROM_MODE_11G)</div><div class='add'>+			ee-&gt;ee_cck_ofdm_power_delta = (val &gt;&gt; 3) &amp; 0xff;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ah-&gt;ah_ee_version &gt;= AR5K_EEPROM_VERSION_4_0 &amp;&amp;</div><div class='add'>+			mode == AR5K_EEPROM_MODE_11A) {</div><div class='add'>+		ee-&gt;ee_i_cal[mode] = (val &gt;&gt; 8) &amp; 0x3f;</div><div class='add'>+		ee-&gt;ee_q_cal[mode] = (val &gt;&gt; 3) &amp; 0x1f;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ah-&gt;ah_ee_version &gt;= AR5K_EEPROM_VERSION_4_6 &amp;&amp;</div><div class='add'>+	    mode == AR5K_EEPROM_MODE_11G)</div><div class='add'>+		ee-&gt;ee_scaled_cck_delta = (val &gt;&gt; 11) &amp; 0x1f;</div><div class='add'>+</div><div class='add'>+	/* return new offset */</div><div class='add'>+	*offset = o;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Initialize eeprom &amp; capabilities structs</div><div class='add'>+ */</div><div class='add'>+int ath5k_eeprom_init(struct ath5k_hw *ah)</div><div class='add'>+{</div><div class='add'>+	struct ath5k_eeprom_info *ee = &amp;ah-&gt;ah_capabilities.cap_eeprom;</div><div class='add'>+	unsigned int mode, i;</div><div class='add'>+	int ret;</div><div class='add'>+	u32 offset;</div><div class='add'>+	u16 val;</div><div class='add'>+</div><div class='add'>+	/* Initial TX thermal adjustment values */</div><div class='add'>+	ee-&gt;ee_tx_clip = 4;</div><div class='add'>+	ee-&gt;ee_pwd_84 = ee-&gt;ee_pwd_90 = 1;</div><div class='add'>+	ee-&gt;ee_gain_select = 1;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Read values from EEPROM and store them in the capability structure</div><div class='add'>+	 */</div><div class='add'>+	AR5K_EEPROM_READ_HDR(AR5K_EEPROM_MAGIC, ee_magic);</div><div class='add'>+	AR5K_EEPROM_READ_HDR(AR5K_EEPROM_PROTECT, ee_protect);</div><div class='add'>+	AR5K_EEPROM_READ_HDR(AR5K_EEPROM_REG_DOMAIN, ee_regdomain);</div><div class='add'>+	AR5K_EEPROM_READ_HDR(AR5K_EEPROM_VERSION, ee_version);</div><div class='add'>+	AR5K_EEPROM_READ_HDR(AR5K_EEPROM_HDR, ee_header);</div><div class='add'>+</div><div class='add'>+	/* Return if we have an old EEPROM */</div><div class='add'>+	if (ah-&gt;ah_ee_version &lt; AR5K_EEPROM_VERSION_3_0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+#ifdef notyet</div><div class='add'>+	/*</div><div class='add'>+	 * Validate the checksum of the EEPROM date. There are some</div><div class='add'>+	 * devices with invalid EEPROMs.</div><div class='add'>+	 */</div><div class='add'>+	for (cksum = 0, offset = 0; offset &lt; AR5K_EEPROM_INFO_MAX; offset++) {</div><div class='add'>+		AR5K_EEPROM_READ(AR5K_EEPROM_INFO(offset), val);</div><div class='add'>+		cksum ^= val;</div><div class='add'>+	}</div><div class='add'>+	if (cksum != AR5K_EEPROM_INFO_CKSUM) {</div><div class='add'>+		ATH5K_ERR(ah-&gt;ah_sc, "Invalid EEPROM checksum 0x%04x\n", cksum);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	AR5K_EEPROM_READ_HDR(AR5K_EEPROM_ANT_GAIN(ah-&gt;ah_ee_version),</div><div class='add'>+	    ee_ant_gain);</div><div class='add'>+</div><div class='add'>+	if (ah-&gt;ah_ee_version &gt;= AR5K_EEPROM_VERSION_4_0) {</div><div class='add'>+		AR5K_EEPROM_READ_HDR(AR5K_EEPROM_MISC0, ee_misc0);</div><div class='add'>+		AR5K_EEPROM_READ_HDR(AR5K_EEPROM_MISC1, ee_misc1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ah-&gt;ah_ee_version &lt; AR5K_EEPROM_VERSION_3_3) {</div><div class='add'>+		AR5K_EEPROM_READ(AR5K_EEPROM_OBDB0_2GHZ, val);</div><div class='add'>+		ee-&gt;ee_ob[AR5K_EEPROM_MODE_11B][0] = val &amp; 0x7;</div><div class='add'>+		ee-&gt;ee_db[AR5K_EEPROM_MODE_11B][0] = (val &gt;&gt; 3) &amp; 0x7;</div><div class='add'>+</div><div class='add'>+		AR5K_EEPROM_READ(AR5K_EEPROM_OBDB1_2GHZ, val);</div><div class='add'>+		ee-&gt;ee_ob[AR5K_EEPROM_MODE_11G][0] = val &amp; 0x7;</div><div class='add'>+		ee-&gt;ee_db[AR5K_EEPROM_MODE_11G][0] = (val &gt;&gt; 3) &amp; 0x7;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Get conformance test limit values</div><div class='add'>+	 */</div><div class='add'>+	offset = AR5K_EEPROM_CTL(ah-&gt;ah_ee_version);</div><div class='add'>+	ee-&gt;ee_ctls = AR5K_EEPROM_N_CTLS(ah-&gt;ah_ee_version);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ee-&gt;ee_ctls; i++) {</div><div class='add'>+		AR5K_EEPROM_READ(offset++, val);</div><div class='add'>+		ee-&gt;ee_ctl[i] = (val &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+		ee-&gt;ee_ctl[i + 1] = val &amp; 0xff;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Get values for 802.11a (5GHz)</div><div class='add'>+	 */</div><div class='add'>+	mode = AR5K_EEPROM_MODE_11A;</div><div class='add'>+</div><div class='add'>+	ee-&gt;ee_turbo_max_power[mode] =</div><div class='add'>+			AR5K_EEPROM_HDR_T_5GHZ_DBM(ee-&gt;ee_header);</div><div class='add'>+</div><div class='add'>+	offset = AR5K_EEPROM_MODES_11A(ah-&gt;ah_ee_version);</div><div class='add'>+</div><div class='add'>+	ret = ath5k_eeprom_read_ants(ah, &amp;offset, mode);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	AR5K_EEPROM_READ(offset++, val);</div><div class='add'>+	ee-&gt;ee_adc_desired_size[mode]	= (s8)((val &gt;&gt; 8) &amp; 0xff);</div><div class='add'>+	ee-&gt;ee_ob[mode][3]		= (val &gt;&gt; 5) &amp; 0x7;</div><div class='add'>+	ee-&gt;ee_db[mode][3]		= (val &gt;&gt; 2) &amp; 0x7;</div><div class='add'>+	ee-&gt;ee_ob[mode][2]		= (val &lt;&lt; 1) &amp; 0x7;</div><div class='add'>+</div><div class='add'>+	AR5K_EEPROM_READ(offset++, val);</div><div class='add'>+	ee-&gt;ee_ob[mode][2]		|= (val &gt;&gt; 15) &amp; 0x1;</div><div class='add'>+	ee-&gt;ee_db[mode][2]		= (val &gt;&gt; 12) &amp; 0x7;</div><div class='add'>+	ee-&gt;ee_ob[mode][1]		= (val &gt;&gt; 9) &amp; 0x7;</div><div class='add'>+	ee-&gt;ee_db[mode][1]		= (val &gt;&gt; 6) &amp; 0x7;</div><div class='add'>+	ee-&gt;ee_ob[mode][0]		= (val &gt;&gt; 3) &amp; 0x7;</div><div class='add'>+	ee-&gt;ee_db[mode][0]		= val &amp; 0x7;</div><div class='add'>+</div><div class='add'>+	ret = ath5k_eeprom_read_modes(ah, &amp;offset, mode);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (ah-&gt;ah_ee_version &gt;= AR5K_EEPROM_VERSION_4_1) {</div><div class='add'>+		AR5K_EEPROM_READ(offset++, val);</div><div class='add'>+		ee-&gt;ee_margin_tx_rx[mode] = val &amp; 0x3f;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Get values for 802.11b (2.4GHz)</div><div class='add'>+	 */</div><div class='add'>+	mode = AR5K_EEPROM_MODE_11B;</div><div class='add'>+	offset = AR5K_EEPROM_MODES_11B(ah-&gt;ah_ee_version);</div><div class='add'>+</div><div class='add'>+	ret = ath5k_eeprom_read_ants(ah, &amp;offset, mode);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	AR5K_EEPROM_READ(offset++, val);</div><div class='add'>+	ee-&gt;ee_adc_desired_size[mode]	= (s8)((val &gt;&gt; 8) &amp; 0xff);</div><div class='add'>+	ee-&gt;ee_ob[mode][1]		= (val &gt;&gt; 4) &amp; 0x7;</div><div class='add'>+	ee-&gt;ee_db[mode][1]		= val &amp; 0x7;</div><div class='add'>+</div><div class='add'>+	ret = ath5k_eeprom_read_modes(ah, &amp;offset, mode);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (ah-&gt;ah_ee_version &gt;= AR5K_EEPROM_VERSION_4_0) {</div><div class='add'>+		AR5K_EEPROM_READ(offset++, val);</div><div class='add'>+		ee-&gt;ee_cal_pier[mode][0] =</div><div class='add'>+			ath5k_eeprom_bin2freq(ah, val &amp; 0xff, mode);</div><div class='add'>+		ee-&gt;ee_cal_pier[mode][1] =</div><div class='add'>+			ath5k_eeprom_bin2freq(ah, (val &gt;&gt; 8) &amp; 0xff, mode);</div><div class='add'>+</div><div class='add'>+		AR5K_EEPROM_READ(offset++, val);</div><div class='add'>+		ee-&gt;ee_cal_pier[mode][2] =</div><div class='add'>+			ath5k_eeprom_bin2freq(ah, val &amp; 0xff, mode);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ah-&gt;ah_ee_version &gt;= AR5K_EEPROM_VERSION_4_1)</div><div class='add'>+		ee-&gt;ee_margin_tx_rx[mode] = (val &gt;&gt; 8) &amp; 0x3f;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Get values for 802.11g (2.4GHz)</div><div class='add'>+	 */</div><div class='add'>+	mode = AR5K_EEPROM_MODE_11G;</div><div class='add'>+	offset = AR5K_EEPROM_MODES_11G(ah-&gt;ah_ee_version);</div><div class='add'>+</div><div class='add'>+	ret = ath5k_eeprom_read_ants(ah, &amp;offset, mode);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	AR5K_EEPROM_READ(offset++, val);</div><div class='add'>+	ee-&gt;ee_adc_desired_size[mode]	= (s8)((val &gt;&gt; 8) &amp; 0xff);</div><div class='add'>+	ee-&gt;ee_ob[mode][1]		= (val &gt;&gt; 4) &amp; 0x7;</div><div class='add'>+	ee-&gt;ee_db[mode][1]		= val &amp; 0x7;</div><div class='add'>+</div><div class='add'>+	ret = ath5k_eeprom_read_modes(ah, &amp;offset, mode);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (ah-&gt;ah_ee_version &gt;= AR5K_EEPROM_VERSION_4_0) {</div><div class='add'>+		AR5K_EEPROM_READ(offset++, val);</div><div class='add'>+		ee-&gt;ee_cal_pier[mode][0] =</div><div class='add'>+			ath5k_eeprom_bin2freq(ah, val &amp; 0xff, mode);</div><div class='add'>+		ee-&gt;ee_cal_pier[mode][1] =</div><div class='add'>+			ath5k_eeprom_bin2freq(ah, (val &gt;&gt; 8) &amp; 0xff, mode);</div><div class='add'>+</div><div class='add'>+		AR5K_EEPROM_READ(offset++, val);</div><div class='add'>+		ee-&gt;ee_turbo_max_power[mode] = val &amp; 0x7f;</div><div class='add'>+		ee-&gt;ee_xr_power[mode] = (val &gt;&gt; 7) &amp; 0x3f;</div><div class='add'>+</div><div class='add'>+		AR5K_EEPROM_READ(offset++, val);</div><div class='add'>+		ee-&gt;ee_cal_pier[mode][2] =</div><div class='add'>+			ath5k_eeprom_bin2freq(ah, val &amp; 0xff, mode);</div><div class='add'>+</div><div class='add'>+		if (ah-&gt;ah_ee_version &gt;= AR5K_EEPROM_VERSION_4_1)</div><div class='add'>+			ee-&gt;ee_margin_tx_rx[mode] = (val &gt;&gt; 8) &amp; 0x3f;</div><div class='add'>+</div><div class='add'>+		AR5K_EEPROM_READ(offset++, val);</div><div class='add'>+		ee-&gt;ee_i_cal[mode] = (val &gt;&gt; 8) &amp; 0x3f;</div><div class='add'>+		ee-&gt;ee_q_cal[mode] = (val &gt;&gt; 3) &amp; 0x1f;</div><div class='add'>+</div><div class='add'>+		if (ah-&gt;ah_ee_version &gt;= AR5K_EEPROM_VERSION_4_2) {</div><div class='add'>+			AR5K_EEPROM_READ(offset++, val);</div><div class='add'>+			ee-&gt;ee_cck_ofdm_gain_delta = val &amp; 0xff;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Read 5GHz EEPROM channels</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Read the MAC address from eeprom</div><div class='add'>+ */</div><div class='add'>+int ath5k_eeprom_read_mac(struct ath5k_hw *ah, u8 *mac)</div><div class='add'>+{</div><div class='add'>+	u8 mac_d[ETH_ALEN];</div><div class='add'>+	u32 total, offset;</div><div class='add'>+	u16 data;</div><div class='add'>+	int octet, ret;</div><div class='add'>+</div><div class='add'>+	memset(mac, 0, ETH_ALEN);</div><div class='add'>+	memset(mac_d, 0, ETH_ALEN);</div><div class='add'>+</div><div class='add'>+	ret = ath5k_hw_eeprom_read(ah, 0x20, &amp;data);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	for (offset = 0x1f, octet = 0, total = 0; offset &gt;= 0x1d; offset--) {</div><div class='add'>+		ret = ath5k_hw_eeprom_read(ah, offset, &amp;data);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		total += data;</div><div class='add'>+		mac_d[octet + 1] = data &amp; 0xff;</div><div class='add'>+		mac_d[octet] = data &gt;&gt; 8;</div><div class='add'>+		octet += 2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(mac, mac_d, ETH_ALEN);</div><div class='add'>+</div><div class='add'>+	if (!total || total == 3 * 0xffff)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='head'>diff --git a/drivers/net/wireless/ath5k/eeprom.h b/drivers/net/wireless/ath5k/eeprom.h<br/>new file mode 100644<br/>index 000000000000..a468ecfbb18a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/ath5k/eeprom.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/ath5k/eeprom.h</a></div><div class='hunk'>@@ -0,0 +1,215 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2004-2008 Reyk Floeter &lt;reyk@openbsd.org&gt;</div><div class='add'>+ * Copyright (c) 2006-2008 Nick Kossifidis &lt;mickflemm@gmail.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * Permission to use, copy, modify, and distribute this software for any</div><div class='add'>+ * purpose with or without fee is hereby granted, provided that the above</div><div class='add'>+ * copyright notice and this permission notice appear in all copies.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES</div><div class='add'>+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR</div><div class='add'>+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES</div><div class='add'>+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN</div><div class='add'>+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF</div><div class='add'>+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Common ar5xxx EEPROM data offsets (set these on AR5K_EEPROM_BASE)</div><div class='add'>+ */</div><div class='add'>+#define AR5K_EEPROM_MAGIC		0x003d	/* EEPROM Magic number */</div><div class='add'>+#define AR5K_EEPROM_MAGIC_VALUE		0x5aa5	/* Default - found on EEPROM */</div><div class='add'>+#define AR5K_EEPROM_MAGIC_5212		0x0000145c /* 5212 */</div><div class='add'>+#define AR5K_EEPROM_MAGIC_5211		0x0000145b /* 5211 */</div><div class='add'>+#define AR5K_EEPROM_MAGIC_5210		0x0000145a /* 5210 */</div><div class='add'>+</div><div class='add'>+#define AR5K_EEPROM_PROTECT		0x003f	/* EEPROM protect status */</div><div class='add'>+#define AR5K_EEPROM_PROTECT_RD_0_31	0x0001	/* Read protection bit for offsets 0x0 - 0x1f */</div><div class='add'>+#define AR5K_EEPROM_PROTECT_WR_0_31	0x0002	/* Write protection bit for offsets 0x0 - 0x1f */</div><div class='add'>+#define AR5K_EEPROM_PROTECT_RD_32_63	0x0004	/* 0x20 - 0x3f */</div><div class='add'>+#define AR5K_EEPROM_PROTECT_WR_32_63	0x0008</div><div class='add'>+#define AR5K_EEPROM_PROTECT_RD_64_127	0x0010	/* 0x40 - 0x7f */</div><div class='add'>+#define AR5K_EEPROM_PROTECT_WR_64_127	0x0020</div><div class='add'>+#define AR5K_EEPROM_PROTECT_RD_128_191	0x0040	/* 0x80 - 0xbf (regdom) */</div><div class='add'>+#define AR5K_EEPROM_PROTECT_WR_128_191	0x0080</div><div class='add'>+#define AR5K_EEPROM_PROTECT_RD_192_207	0x0100	/* 0xc0 - 0xcf */</div><div class='add'>+#define AR5K_EEPROM_PROTECT_WR_192_207	0x0200</div><div class='add'>+#define AR5K_EEPROM_PROTECT_RD_208_223	0x0400	/* 0xd0 - 0xdf */</div><div class='add'>+#define AR5K_EEPROM_PROTECT_WR_208_223	0x0800</div><div class='add'>+#define AR5K_EEPROM_PROTECT_RD_224_239	0x1000	/* 0xe0 - 0xef */</div><div class='add'>+#define AR5K_EEPROM_PROTECT_WR_224_239	0x2000</div><div class='add'>+#define AR5K_EEPROM_PROTECT_RD_240_255	0x4000	/* 0xf0 - 0xff */</div><div class='add'>+#define AR5K_EEPROM_PROTECT_WR_240_255	0x8000</div><div class='add'>+#define AR5K_EEPROM_REG_DOMAIN		0x00bf	/* EEPROM regdom */</div><div class='add'>+#define AR5K_EEPROM_INFO_BASE		0x00c0	/* EEPROM header */</div><div class='add'>+#define AR5K_EEPROM_INFO_MAX		(0x400 - AR5K_EEPROM_INFO_BASE)</div><div class='add'>+#define AR5K_EEPROM_INFO_CKSUM		0xffff</div><div class='add'>+#define AR5K_EEPROM_INFO(_n)		(AR5K_EEPROM_INFO_BASE + (_n))</div><div class='add'>+</div><div class='add'>+#define AR5K_EEPROM_VERSION		AR5K_EEPROM_INFO(1)	/* EEPROM Version */</div><div class='add'>+#define AR5K_EEPROM_VERSION_3_0		0x3000	/* No idea what's going on before this version */</div><div class='add'>+#define AR5K_EEPROM_VERSION_3_1		0x3001	/* ob/db values for 2Ghz (ar5211_rfregs) */</div><div class='add'>+#define AR5K_EEPROM_VERSION_3_2		0x3002	/* different frequency representation (eeprom_bin2freq) */</div><div class='add'>+#define AR5K_EEPROM_VERSION_3_3		0x3003	/* offsets changed, has 32 CTLs (see below) and ee_false_detect (eeprom_read_modes) */</div><div class='add'>+#define AR5K_EEPROM_VERSION_3_4		0x3004	/* has ee_i_gain ee_cck_ofdm_power_delta (eeprom_read_modes) */</div><div class='add'>+#define AR5K_EEPROM_VERSION_4_0		0x4000	/* has ee_misc*, ee_cal_pier, ee_turbo_max_power and ee_xr_power (eeprom_init) */</div><div class='add'>+#define AR5K_EEPROM_VERSION_4_1		0x4001	/* has ee_margin_tx_rx (eeprom_init) */</div><div class='add'>+#define AR5K_EEPROM_VERSION_4_2		0x4002	/* has ee_cck_ofdm_gain_delta (eeprom_init) */</div><div class='add'>+#define AR5K_EEPROM_VERSION_4_3		0x4003</div><div class='add'>+#define AR5K_EEPROM_VERSION_4_4		0x4004</div><div class='add'>+#define AR5K_EEPROM_VERSION_4_5		0x4005</div><div class='add'>+#define AR5K_EEPROM_VERSION_4_6		0x4006	/* has ee_scaled_cck_delta */</div><div class='add'>+#define AR5K_EEPROM_VERSION_4_7		0x4007</div><div class='add'>+</div><div class='add'>+#define AR5K_EEPROM_MODE_11A		0</div><div class='add'>+#define AR5K_EEPROM_MODE_11B		1</div><div class='add'>+#define AR5K_EEPROM_MODE_11G		2</div><div class='add'>+</div><div class='add'>+#define AR5K_EEPROM_HDR			AR5K_EEPROM_INFO(2)	/* Header that contains the device caps */</div><div class='add'>+#define AR5K_EEPROM_HDR_11A(_v)		(((_v) &gt;&gt; AR5K_EEPROM_MODE_11A) &amp; 0x1)</div><div class='add'>+#define AR5K_EEPROM_HDR_11B(_v)		(((_v) &gt;&gt; AR5K_EEPROM_MODE_11B) &amp; 0x1)</div><div class='add'>+#define AR5K_EEPROM_HDR_11G(_v)		(((_v) &gt;&gt; AR5K_EEPROM_MODE_11G) &amp; 0x1)</div><div class='add'>+#define AR5K_EEPROM_HDR_T_2GHZ_DIS(_v)	(((_v) &gt;&gt; 3) &amp; 0x1)	/* Disable turbo for 2Ghz (?) */</div><div class='add'>+#define AR5K_EEPROM_HDR_T_5GHZ_DBM(_v)	(((_v) &gt;&gt; 4) &amp; 0x7f)	/* Max turbo power for a/XR mode (eeprom_init) */</div><div class='add'>+#define AR5K_EEPROM_HDR_DEVICE(_v)	(((_v) &gt;&gt; 11) &amp; 0x7)</div><div class='add'>+#define AR5K_EEPROM_HDR_T_5GHZ_DIS(_v)	(((_v) &gt;&gt; 15) &amp; 0x1)	/* Disable turbo for 5Ghz (?) */</div><div class='add'>+#define AR5K_EEPROM_HDR_RFKILL(_v)	(((_v) &gt;&gt; 14) &amp; 0x1)	/* Device has RFKill support */</div><div class='add'>+</div><div class='add'>+#define AR5K_EEPROM_RFKILL_GPIO_SEL	0x0000001c</div><div class='add'>+#define AR5K_EEPROM_RFKILL_GPIO_SEL_S	2</div><div class='add'>+#define AR5K_EEPROM_RFKILL_POLARITY	0x00000002</div><div class='add'>+#define AR5K_EEPROM_RFKILL_POLARITY_S	1</div><div class='add'>+</div><div class='add'>+/* Newer EEPROMs are using a different offset */</div><div class='add'>+#define AR5K_EEPROM_OFF(_v, _v3_0, _v3_3) \</div><div class='add'>+	(((_v) &gt;= AR5K_EEPROM_VERSION_3_3) ? _v3_3 : _v3_0)</div><div class='add'>+</div><div class='add'>+#define AR5K_EEPROM_ANT_GAIN(_v)	AR5K_EEPROM_OFF(_v, 0x00c4, 0x00c3)</div><div class='add'>+#define AR5K_EEPROM_ANT_GAIN_5GHZ(_v)	((int8_t)(((_v) &gt;&gt; 8) &amp; 0xff))</div><div class='add'>+#define AR5K_EEPROM_ANT_GAIN_2GHZ(_v)	((int8_t)((_v) &amp; 0xff))</div><div class='add'>+</div><div class='add'>+/* calibration settings */</div><div class='add'>+#define AR5K_EEPROM_MODES_11A(_v)	AR5K_EEPROM_OFF(_v, 0x00c5, 0x00d4)</div><div class='add'>+#define AR5K_EEPROM_MODES_11B(_v)	AR5K_EEPROM_OFF(_v, 0x00d0, 0x00f2)</div><div class='add'>+#define AR5K_EEPROM_MODES_11G(_v)	AR5K_EEPROM_OFF(_v, 0x00da, 0x010d)</div><div class='add'>+#define AR5K_EEPROM_CTL(_v)		AR5K_EEPROM_OFF(_v, 0x00e4, 0x0128)	/* Conformance test limits */</div><div class='add'>+</div><div class='add'>+/* [3.1 - 3.3] */</div><div class='add'>+#define AR5K_EEPROM_OBDB0_2GHZ		0x00ec</div><div class='add'>+#define AR5K_EEPROM_OBDB1_2GHZ		0x00ed</div><div class='add'>+</div><div class='add'>+/* Misc values available since EEPROM 4.0 */</div><div class='add'>+#define AR5K_EEPROM_MISC0		0x00c4</div><div class='add'>+#define AR5K_EEPROM_EARSTART(_v)	((_v) &amp; 0xfff)</div><div class='add'>+#define AR5K_EEPROM_EEMAP(_v)		(((_v) &gt;&gt; 14) &amp; 0x3)</div><div class='add'>+#define AR5K_EEPROM_MISC1		0x00c5</div><div class='add'>+#define AR5K_EEPROM_TARGET_PWRSTART(_v)	((_v) &amp; 0xfff)</div><div class='add'>+#define AR5K_EEPROM_HAS32KHZCRYSTAL(_v)	(((_v) &gt;&gt; 14) &amp; 0x1)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Some EEPROM defines */</div><div class='add'>+#define AR5K_EEPROM_EEP_SCALE		100</div><div class='add'>+#define AR5K_EEPROM_EEP_DELTA		10</div><div class='add'>+#define AR5K_EEPROM_N_MODES		3</div><div class='add'>+#define AR5K_EEPROM_N_5GHZ_CHAN		10</div><div class='add'>+#define AR5K_EEPROM_N_2GHZ_CHAN		3</div><div class='add'>+#define AR5K_EEPROM_MAX_CHAN		10</div><div class='add'>+#define AR5K_EEPROM_N_PCDAC		11</div><div class='add'>+#define AR5K_EEPROM_N_TEST_FREQ		8</div><div class='add'>+#define AR5K_EEPROM_N_EDGES		8</div><div class='add'>+#define AR5K_EEPROM_N_INTERCEPTS	11</div><div class='add'>+#define AR5K_EEPROM_FREQ_M(_v)		AR5K_EEPROM_OFF(_v, 0x7f, 0xff)</div><div class='add'>+#define AR5K_EEPROM_PCDAC_M		0x3f</div><div class='add'>+#define AR5K_EEPROM_PCDAC_START		1</div><div class='add'>+#define AR5K_EEPROM_PCDAC_STOP		63</div><div class='add'>+#define AR5K_EEPROM_PCDAC_STEP		1</div><div class='add'>+#define AR5K_EEPROM_NON_EDGE_M		0x40</div><div class='add'>+#define AR5K_EEPROM_CHANNEL_POWER	8</div><div class='add'>+#define AR5K_EEPROM_N_OBDB		4</div><div class='add'>+#define AR5K_EEPROM_OBDB_DIS		0xffff</div><div class='add'>+#define AR5K_EEPROM_CHANNEL_DIS		0xff</div><div class='add'>+#define AR5K_EEPROM_SCALE_OC_DELTA(_x)	(((_x) * 2) / 10)</div><div class='add'>+#define AR5K_EEPROM_N_CTLS(_v)		AR5K_EEPROM_OFF(_v, 16, 32)</div><div class='add'>+#define AR5K_EEPROM_MAX_CTLS		32</div><div class='add'>+#define AR5K_EEPROM_N_XPD_PER_CHANNEL	4</div><div class='add'>+#define AR5K_EEPROM_N_XPD0_POINTS	4</div><div class='add'>+#define AR5K_EEPROM_N_XPD3_POINTS	3</div><div class='add'>+#define AR5K_EEPROM_N_INTERCEPT_10_2GHZ	35</div><div class='add'>+#define AR5K_EEPROM_N_INTERCEPT_10_5GHZ	55</div><div class='add'>+#define AR5K_EEPROM_POWER_M		0x3f</div><div class='add'>+#define AR5K_EEPROM_POWER_MIN		0</div><div class='add'>+#define AR5K_EEPROM_POWER_MAX		3150</div><div class='add'>+#define AR5K_EEPROM_POWER_STEP		50</div><div class='add'>+#define AR5K_EEPROM_POWER_TABLE_SIZE	64</div><div class='add'>+#define AR5K_EEPROM_N_POWER_LOC_11B	4</div><div class='add'>+#define AR5K_EEPROM_N_POWER_LOC_11G	6</div><div class='add'>+#define AR5K_EEPROM_I_GAIN		10</div><div class='add'>+#define AR5K_EEPROM_CCK_OFDM_DELTA	15</div><div class='add'>+#define AR5K_EEPROM_N_IQ_CAL		2</div><div class='add'>+</div><div class='add'>+#define AR5K_EEPROM_READ(_o, _v) do {			\</div><div class='add'>+	ret = ath5k_hw_eeprom_read(ah, (_o), &amp;(_v));	\</div><div class='add'>+	if (ret)					\</div><div class='add'>+		return ret;				\</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define AR5K_EEPROM_READ_HDR(_o, _v)					\</div><div class='add'>+	AR5K_EEPROM_READ(_o, ah-&gt;ah_capabilities.cap_eeprom._v);	\</div><div class='add'>+</div><div class='add'>+/* Struct to hold EEPROM calibration data */</div><div class='add'>+struct ath5k_eeprom_info {</div><div class='add'>+	u16	ee_magic;</div><div class='add'>+	u16	ee_protect;</div><div class='add'>+	u16	ee_regdomain;</div><div class='add'>+	u16	ee_version;</div><div class='add'>+	u16	ee_header;</div><div class='add'>+	u16	ee_ant_gain;</div><div class='add'>+	u16	ee_misc0;</div><div class='add'>+	u16	ee_misc1;</div><div class='add'>+	u16	ee_cck_ofdm_gain_delta;</div><div class='add'>+	u16	ee_cck_ofdm_power_delta;</div><div class='add'>+	u16	ee_scaled_cck_delta;</div><div class='add'>+</div><div class='add'>+	/* Used for tx thermal adjustment (eeprom_init, rfregs) */</div><div class='add'>+	u16	ee_tx_clip;</div><div class='add'>+	u16	ee_pwd_84;</div><div class='add'>+	u16	ee_pwd_90;</div><div class='add'>+	u16	ee_gain_select;</div><div class='add'>+</div><div class='add'>+	/* RF Calibration settings (reset, rfregs) */</div><div class='add'>+	u16	ee_i_cal[AR5K_EEPROM_N_MODES];</div><div class='add'>+	u16	ee_q_cal[AR5K_EEPROM_N_MODES];</div><div class='add'>+	u16	ee_fixed_bias[AR5K_EEPROM_N_MODES];</div><div class='add'>+	u16	ee_turbo_max_power[AR5K_EEPROM_N_MODES];</div><div class='add'>+	u16	ee_xr_power[AR5K_EEPROM_N_MODES];</div><div class='add'>+	u16	ee_switch_settling[AR5K_EEPROM_N_MODES];</div><div class='add'>+	u16	ee_ant_tx_rx[AR5K_EEPROM_N_MODES];</div><div class='add'>+	u16	ee_ant_control[AR5K_EEPROM_N_MODES][AR5K_EEPROM_N_PCDAC];</div><div class='add'>+	u16	ee_ob[AR5K_EEPROM_N_MODES][AR5K_EEPROM_N_OBDB];</div><div class='add'>+	u16	ee_db[AR5K_EEPROM_N_MODES][AR5K_EEPROM_N_OBDB];</div><div class='add'>+	u16	ee_tx_end2xlna_enable[AR5K_EEPROM_N_MODES];</div><div class='add'>+	u16	ee_tx_end2xpa_disable[AR5K_EEPROM_N_MODES];</div><div class='add'>+	u16	ee_tx_frm2xpa_enable[AR5K_EEPROM_N_MODES];</div><div class='add'>+	u16	ee_thr_62[AR5K_EEPROM_N_MODES];</div><div class='add'>+	u16	ee_xlna_gain[AR5K_EEPROM_N_MODES];</div><div class='add'>+	u16	ee_xpd[AR5K_EEPROM_N_MODES];</div><div class='add'>+	u16	ee_x_gain[AR5K_EEPROM_N_MODES];</div><div class='add'>+	u16	ee_i_gain[AR5K_EEPROM_N_MODES];</div><div class='add'>+	u16	ee_margin_tx_rx[AR5K_EEPROM_N_MODES];</div><div class='add'>+</div><div class='add'>+	/* Unused */</div><div class='add'>+	u16	ee_false_detect[AR5K_EEPROM_N_MODES];</div><div class='add'>+	u16	ee_cal_pier[AR5K_EEPROM_N_MODES][AR5K_EEPROM_N_2GHZ_CHAN];</div><div class='add'>+	u16	ee_channel[AR5K_EEPROM_N_MODES][AR5K_EEPROM_MAX_CHAN]; /*empty*/</div><div class='add'>+</div><div class='add'>+	/* Conformance test limits (Unused) */</div><div class='add'>+	u16	ee_ctls;</div><div class='add'>+	u16	ee_ctl[AR5K_EEPROM_MAX_CTLS];</div><div class='add'>+</div><div class='add'>+	/* Noise Floor Calibration settings */</div><div class='add'>+	s16	ee_noise_floor_thr[AR5K_EEPROM_N_MODES];</div><div class='add'>+	s8	ee_adc_desired_size[AR5K_EEPROM_N_MODES];</div><div class='add'>+	s8	ee_pga_desired_size[AR5K_EEPROM_N_MODES];</div><div class='add'>+};</div><div class='head'>diff --git a/drivers/net/wireless/ath5k/gpio.c b/drivers/net/wireless/ath5k/gpio.c<br/>new file mode 100644<br/>index 000000000000..b77205adc180<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/ath5k/gpio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/ath5k/gpio.c</a></div><div class='hunk'>@@ -0,0 +1,176 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2004-2008 Reyk Floeter &lt;reyk@openbsd.org&gt;</div><div class='add'>+ * Copyright (c) 2006-2008 Nick Kossifidis &lt;mickflemm@gmail.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * Permission to use, copy, modify, and distribute this software for any</div><div class='add'>+ * purpose with or without fee is hereby granted, provided that the above</div><div class='add'>+ * copyright notice and this permission notice appear in all copies.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES</div><div class='add'>+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR</div><div class='add'>+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES</div><div class='add'>+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN</div><div class='add'>+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF</div><div class='add'>+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/****************\</div><div class='add'>+  GPIO Functions</div><div class='add'>+\****************/</div><div class='add'>+</div><div class='add'>+#include "ath5k.h"</div><div class='add'>+#include "reg.h"</div><div class='add'>+#include "debug.h"</div><div class='add'>+#include "base.h"</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Set led state</div><div class='add'>+ */</div><div class='add'>+void ath5k_hw_set_ledstate(struct ath5k_hw *ah, unsigned int state)</div><div class='add'>+{</div><div class='add'>+	u32 led;</div><div class='add'>+	/*5210 has different led mode handling*/</div><div class='add'>+	u32 led_5210;</div><div class='add'>+</div><div class='add'>+	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='add'>+</div><div class='add'>+	/*Reset led status*/</div><div class='add'>+	if (ah-&gt;ah_version != AR5K_AR5210)</div><div class='add'>+		AR5K_REG_DISABLE_BITS(ah, AR5K_PCICFG,</div><div class='add'>+			AR5K_PCICFG_LEDMODE |  AR5K_PCICFG_LED);</div><div class='add'>+	else</div><div class='add'>+		AR5K_REG_DISABLE_BITS(ah, AR5K_PCICFG, AR5K_PCICFG_LED);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Some blinking values, define at your wish</div><div class='add'>+	 */</div><div class='add'>+	switch (state) {</div><div class='add'>+	case AR5K_LED_SCAN:</div><div class='add'>+	case AR5K_LED_AUTH:</div><div class='add'>+		led = AR5K_PCICFG_LEDMODE_PROP | AR5K_PCICFG_LED_PEND;</div><div class='add'>+		led_5210 = AR5K_PCICFG_LED_PEND | AR5K_PCICFG_LED_BCTL;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case AR5K_LED_INIT:</div><div class='add'>+		led = AR5K_PCICFG_LEDMODE_PROP | AR5K_PCICFG_LED_NONE;</div><div class='add'>+		led_5210 = AR5K_PCICFG_LED_PEND;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case AR5K_LED_ASSOC:</div><div class='add'>+	case AR5K_LED_RUN:</div><div class='add'>+		led = AR5K_PCICFG_LEDMODE_PROP | AR5K_PCICFG_LED_ASSOC;</div><div class='add'>+		led_5210 = AR5K_PCICFG_LED_ASSOC;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		led = AR5K_PCICFG_LEDMODE_PROM | AR5K_PCICFG_LED_NONE;</div><div class='add'>+		led_5210 = AR5K_PCICFG_LED_PEND;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*Write new status to the register*/</div><div class='add'>+	if (ah-&gt;ah_version != AR5K_AR5210)</div><div class='add'>+		AR5K_REG_ENABLE_BITS(ah, AR5K_PCICFG, led);</div><div class='add'>+	else</div><div class='add'>+		AR5K_REG_ENABLE_BITS(ah, AR5K_PCICFG, led_5210);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Set GPIO inputs</div><div class='add'>+ */</div><div class='add'>+int ath5k_hw_set_gpio_input(struct ath5k_hw *ah, u32 gpio)</div><div class='add'>+{</div><div class='add'>+	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='add'>+	if (gpio &gt; AR5K_NUM_GPIO)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ath5k_hw_reg_write(ah,</div><div class='add'>+		(ath5k_hw_reg_read(ah, AR5K_GPIOCR) &amp; ~AR5K_GPIOCR_OUT(gpio))</div><div class='add'>+		| AR5K_GPIOCR_IN(gpio), AR5K_GPIOCR);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Set GPIO outputs</div><div class='add'>+ */</div><div class='add'>+int ath5k_hw_set_gpio_output(struct ath5k_hw *ah, u32 gpio)</div><div class='add'>+{</div><div class='add'>+	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='add'>+	if (gpio &gt; AR5K_NUM_GPIO)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ath5k_hw_reg_write(ah,</div><div class='add'>+		(ath5k_hw_reg_read(ah, AR5K_GPIOCR) &amp; ~AR5K_GPIOCR_OUT(gpio))</div><div class='add'>+		| AR5K_GPIOCR_OUT(gpio), AR5K_GPIOCR);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Get GPIO state</div><div class='add'>+ */</div><div class='add'>+u32 ath5k_hw_get_gpio(struct ath5k_hw *ah, u32 gpio)</div><div class='add'>+{</div><div class='add'>+	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='add'>+	if (gpio &gt; AR5K_NUM_GPIO)</div><div class='add'>+		return 0xffffffff;</div><div class='add'>+</div><div class='add'>+	/* GPIO input magic */</div><div class='add'>+	return ((ath5k_hw_reg_read(ah, AR5K_GPIODI) &amp; AR5K_GPIODI_M) &gt;&gt; gpio) &amp;</div><div class='add'>+		0x1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Set GPIO state</div><div class='add'>+ */</div><div class='add'>+int ath5k_hw_set_gpio(struct ath5k_hw *ah, u32 gpio, u32 val)</div><div class='add'>+{</div><div class='add'>+	u32 data;</div><div class='add'>+	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='add'>+</div><div class='add'>+	if (gpio &gt; AR5K_NUM_GPIO)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* GPIO output magic */</div><div class='add'>+	data = ath5k_hw_reg_read(ah, AR5K_GPIODO);</div><div class='add'>+</div><div class='add'>+	data &amp;= ~(1 &lt;&lt; gpio);</div><div class='add'>+	data |= (val &amp; 1) &lt;&lt; gpio;</div><div class='add'>+</div><div class='add'>+	ath5k_hw_reg_write(ah, data, AR5K_GPIODO);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Initialize the GPIO interrupt (RFKill switch)</div><div class='add'>+ */</div><div class='add'>+void ath5k_hw_set_gpio_intr(struct ath5k_hw *ah, unsigned int gpio,</div><div class='add'>+		u32 interrupt_level)</div><div class='add'>+{</div><div class='add'>+	u32 data;</div><div class='add'>+</div><div class='add'>+	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='add'>+	if (gpio &gt; AR5K_NUM_GPIO)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Set the GPIO interrupt</div><div class='add'>+	 */</div><div class='add'>+	data = (ath5k_hw_reg_read(ah, AR5K_GPIOCR) &amp;</div><div class='add'>+		~(AR5K_GPIOCR_INT_SEL(gpio) | AR5K_GPIOCR_INT_SELH |</div><div class='add'>+		AR5K_GPIOCR_INT_ENA | AR5K_GPIOCR_OUT(gpio))) |</div><div class='add'>+		(AR5K_GPIOCR_INT_SEL(gpio) | AR5K_GPIOCR_INT_ENA);</div><div class='add'>+</div><div class='add'>+	ath5k_hw_reg_write(ah, interrupt_level ? data :</div><div class='add'>+		(data | AR5K_GPIOCR_INT_SELH), AR5K_GPIOCR);</div><div class='add'>+</div><div class='add'>+	ah-&gt;ah_imr |= AR5K_IMR_GPIO;</div><div class='add'>+</div><div class='add'>+	/* Enable GPIO interrupts */</div><div class='add'>+	AR5K_REG_ENABLE_BITS(ah, AR5K_PIMR, AR5K_IMR_GPIO);</div><div class='add'>+}</div><div class='add'>+</div><div class='head'>diff --git a/drivers/net/wireless/ath5k/hw.c b/drivers/net/wireless/ath5k/hw.c<br/>deleted file mode 100644<br/>index ad1a5b422c8c..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/ath5k/hw.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/ath5k/hw.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,4529 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (c) 2004-2007 Reyk Floeter &lt;reyk@openbsd.org&gt;</div><div class='del'>- * Copyright (c) 2006-2007 Nick Kossifidis &lt;mickflemm@gmail.com&gt;</div><div class='del'>- * Copyright (c) 2007 Matthew W. S. Bell  &lt;mentor@madwifi.org&gt;</div><div class='del'>- * Copyright (c) 2007 Luis Rodriguez &lt;mcgrof@winlab.rutgers.edu&gt;</div><div class='del'>- * Copyright (c) 2007 Pavel Roskin &lt;proski@gnu.org&gt;</div><div class='del'>- * Copyright (c) 2007 Jiri Slaby &lt;jirislaby@gmail.com&gt;</div><div class='del'>- *</div><div class='del'>- * Permission to use, copy, modify, and distribute this software for any</div><div class='del'>- * purpose with or without fee is hereby granted, provided that the above</div><div class='del'>- * copyright notice and this permission notice appear in all copies.</div><div class='del'>- *</div><div class='del'>- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES</div><div class='del'>- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF</div><div class='del'>- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR</div><div class='del'>- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES</div><div class='del'>- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN</div><div class='del'>- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF</div><div class='del'>- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * HW related functions for Atheros Wireless LAN devices.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-</div><div class='del'>-#include "reg.h"</div><div class='del'>-#include "base.h"</div><div class='del'>-#include "debug.h"</div><div class='del'>-</div><div class='del'>-/* Rate tables */</div><div class='del'>-static const struct ath5k_rate_table ath5k_rt_11a = AR5K_RATES_11A;</div><div class='del'>-static const struct ath5k_rate_table ath5k_rt_11b = AR5K_RATES_11B;</div><div class='del'>-static const struct ath5k_rate_table ath5k_rt_11g = AR5K_RATES_11G;</div><div class='del'>-static const struct ath5k_rate_table ath5k_rt_turbo = AR5K_RATES_TURBO;</div><div class='del'>-static const struct ath5k_rate_table ath5k_rt_xr = AR5K_RATES_XR;</div><div class='del'>-</div><div class='del'>-/* Prototypes */</div><div class='del'>-static int ath5k_hw_nic_reset(struct ath5k_hw *, u32);</div><div class='del'>-static int ath5k_hw_nic_wakeup(struct ath5k_hw *, int, bool);</div><div class='del'>-static int ath5k_hw_setup_4word_tx_desc(struct ath5k_hw *, struct ath5k_desc *,</div><div class='del'>-	unsigned int, unsigned int, enum ath5k_pkt_type, unsigned int,</div><div class='del'>-	unsigned int, unsigned int, unsigned int, unsigned int, unsigned int,</div><div class='del'>-	unsigned int, unsigned int);</div><div class='del'>-static int ath5k_hw_setup_xr_tx_desc(struct ath5k_hw *, struct ath5k_desc *,</div><div class='del'>-	unsigned int, unsigned int, unsigned int, unsigned int, unsigned int,</div><div class='del'>-	unsigned int);</div><div class='del'>-static int ath5k_hw_proc_4word_tx_status(struct ath5k_hw *, struct ath5k_desc *,</div><div class='del'>-					 struct ath5k_tx_status *);</div><div class='del'>-static int ath5k_hw_setup_2word_tx_desc(struct ath5k_hw *, struct ath5k_desc *,</div><div class='del'>-	unsigned int, unsigned int, enum ath5k_pkt_type, unsigned int,</div><div class='del'>-	unsigned int, unsigned int, unsigned int, unsigned int, unsigned int,</div><div class='del'>-	unsigned int, unsigned int);</div><div class='del'>-static int ath5k_hw_proc_2word_tx_status(struct ath5k_hw *, struct ath5k_desc *,</div><div class='del'>-					 struct ath5k_tx_status *);</div><div class='del'>-static int ath5k_hw_proc_5212_rx_status(struct ath5k_hw *, struct ath5k_desc *,</div><div class='del'>-					struct ath5k_rx_status *);</div><div class='del'>-static int ath5k_hw_proc_5210_rx_status(struct ath5k_hw *, struct ath5k_desc *,</div><div class='del'>-					struct ath5k_rx_status *);</div><div class='del'>-static int ath5k_hw_get_capabilities(struct ath5k_hw *);</div><div class='del'>-</div><div class='del'>-static int ath5k_eeprom_init(struct ath5k_hw *);</div><div class='del'>-static int ath5k_eeprom_read_mac(struct ath5k_hw *, u8 *);</div><div class='del'>-</div><div class='del'>-static int ath5k_hw_enable_pspoll(struct ath5k_hw *, u8 *, u16);</div><div class='del'>-static int ath5k_hw_disable_pspoll(struct ath5k_hw *);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Enable to overwrite the country code (use "00" for debug)</div><div class='del'>- */</div><div class='del'>-#if 0</div><div class='del'>-#define COUNTRYCODE "00"</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*******************\</div><div class='del'>-  General Functions</div><div class='del'>-\*******************/</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Functions used internaly</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static inline unsigned int ath5k_hw_htoclock(unsigned int usec, bool turbo)</div><div class='del'>-{</div><div class='del'>-	return turbo ? (usec * 80) : (usec * 40);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned int ath5k_hw_clocktoh(unsigned int clock, bool turbo)</div><div class='del'>-{</div><div class='del'>-	return turbo ? (clock / 80) : (clock / 40);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Check if a register write has been completed</div><div class='del'>- */</div><div class='del'>-int ath5k_hw_register_timeout(struct ath5k_hw *ah, u32 reg, u32 flag, u32 val,</div><div class='del'>-		bool is_set)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	u32 data;</div><div class='del'>-</div><div class='del'>-	for (i = AR5K_TUNE_REGISTER_TIMEOUT; i &gt; 0; i--) {</div><div class='del'>-		data = ath5k_hw_reg_read(ah, reg);</div><div class='del'>-		if (is_set &amp;&amp; (data &amp; flag))</div><div class='del'>-			break;</div><div class='del'>-		else if ((data &amp; flag) == val)</div><div class='del'>-			break;</div><div class='del'>-		udelay(15);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return (i &lt;= 0) ? -EAGAIN : 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/***************************************\</div><div class='del'>-	Attach/Detach Functions</div><div class='del'>-\***************************************/</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Power On Self Test helper function</div><div class='del'>- */</div><div class='del'>-static int ath5k_hw_post(struct ath5k_hw *ah)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	int i, c;</div><div class='del'>-	u16 cur_reg;</div><div class='del'>-	u16 regs[2] = {AR5K_STA_ID0, AR5K_PHY(8)};</div><div class='del'>-	u32 var_pattern;</div><div class='del'>-	u32 static_pattern[4] = {</div><div class='del'>-		0x55555555,	0xaaaaaaaa,</div><div class='del'>-		0x66666666,	0x99999999</div><div class='del'>-	};</div><div class='del'>-	u32 init_val;</div><div class='del'>-	u32 cur_val;</div><div class='del'>-</div><div class='del'>-	for (c = 0; c &lt; 2; c++) {</div><div class='del'>-</div><div class='del'>-		cur_reg = regs[c];</div><div class='del'>-</div><div class='del'>-		/* Save previous value */</div><div class='del'>-		init_val = ath5k_hw_reg_read(ah, cur_reg);</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; 256; i++) {</div><div class='del'>-			var_pattern = i &lt;&lt; 16 | i;</div><div class='del'>-			ath5k_hw_reg_write(ah, var_pattern, cur_reg);</div><div class='del'>-			cur_val = ath5k_hw_reg_read(ah, cur_reg);</div><div class='del'>-</div><div class='del'>-			if (cur_val != var_pattern) {</div><div class='del'>-				ATH5K_ERR(ah-&gt;ah_sc, "POST Failed !!!\n");</div><div class='del'>-				return -EAGAIN;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* Found on ndiswrapper dumps */</div><div class='del'>-			var_pattern = 0x0039080f;</div><div class='del'>-			ath5k_hw_reg_write(ah, var_pattern, cur_reg);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; 4; i++) {</div><div class='del'>-			var_pattern = static_pattern[i];</div><div class='del'>-			ath5k_hw_reg_write(ah, var_pattern, cur_reg);</div><div class='del'>-			cur_val = ath5k_hw_reg_read(ah, cur_reg);</div><div class='del'>-</div><div class='del'>-			if (cur_val != var_pattern) {</div><div class='del'>-				ATH5K_ERR(ah-&gt;ah_sc, "POST Failed !!!\n");</div><div class='del'>-				return -EAGAIN;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* Found on ndiswrapper dumps */</div><div class='del'>-			var_pattern = 0x003b080f;</div><div class='del'>-			ath5k_hw_reg_write(ah, var_pattern, cur_reg);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Restore previous value */</div><div class='del'>-		ath5k_hw_reg_write(ah, init_val, cur_reg);</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Check if the device is supported and initialize the needed structs</div><div class='del'>- */</div><div class='del'>-struct ath5k_hw *ath5k_hw_attach(struct ath5k_softc *sc, u8 mac_version)</div><div class='del'>-{</div><div class='del'>-	struct ath5k_hw *ah;</div><div class='del'>-	struct pci_dev *pdev = sc-&gt;pdev;</div><div class='del'>-	u8 mac[ETH_ALEN];</div><div class='del'>-	int ret;</div><div class='del'>-	u32 srev;</div><div class='del'>-</div><div class='del'>-	/*If we passed the test malloc a ath5k_hw struct*/</div><div class='del'>-	ah = kzalloc(sizeof(struct ath5k_hw), GFP_KERNEL);</div><div class='del'>-	if (ah == NULL) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		ATH5K_ERR(sc, "out of memory\n");</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ah-&gt;ah_sc = sc;</div><div class='del'>-	ah-&gt;ah_iobase = sc-&gt;iobase;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * HW information</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	ah-&gt;ah_op_mode = IEEE80211_IF_TYPE_STA;</div><div class='del'>-	ah-&gt;ah_radar.r_enabled = AR5K_TUNE_RADAR_ALERT;</div><div class='del'>-	ah-&gt;ah_turbo = false;</div><div class='del'>-	ah-&gt;ah_txpower.txp_tpc = AR5K_TUNE_TPC_TXPOWER;</div><div class='del'>-	ah-&gt;ah_imr = 0;</div><div class='del'>-	ah-&gt;ah_atim_window = 0;</div><div class='del'>-	ah-&gt;ah_aifs = AR5K_TUNE_AIFS;</div><div class='del'>-	ah-&gt;ah_cw_min = AR5K_TUNE_CWMIN;</div><div class='del'>-	ah-&gt;ah_limit_tx_retries = AR5K_INIT_TX_RETRY;</div><div class='del'>-	ah-&gt;ah_software_retry = false;</div><div class='del'>-	ah-&gt;ah_ant_diversity = AR5K_TUNE_ANT_DIVERSITY;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Set the mac revision based on the pci id</div><div class='del'>-	 */</div><div class='del'>-	ah-&gt;ah_version = mac_version;</div><div class='del'>-</div><div class='del'>-	/*Fill the ath5k_hw struct with the needed functions*/</div><div class='del'>-	if (ah-&gt;ah_version == AR5K_AR5212)</div><div class='del'>-		ah-&gt;ah_magic = AR5K_EEPROM_MAGIC_5212;</div><div class='del'>-	else if (ah-&gt;ah_version == AR5K_AR5211)</div><div class='del'>-		ah-&gt;ah_magic = AR5K_EEPROM_MAGIC_5211;</div><div class='del'>-</div><div class='del'>-	if (ah-&gt;ah_version == AR5K_AR5212) {</div><div class='del'>-		ah-&gt;ah_setup_tx_desc = ath5k_hw_setup_4word_tx_desc;</div><div class='del'>-		ah-&gt;ah_setup_xtx_desc = ath5k_hw_setup_xr_tx_desc;</div><div class='del'>-		ah-&gt;ah_proc_tx_desc = ath5k_hw_proc_4word_tx_status;</div><div class='del'>-	} else {</div><div class='del'>-		ah-&gt;ah_setup_tx_desc = ath5k_hw_setup_2word_tx_desc;</div><div class='del'>-		ah-&gt;ah_setup_xtx_desc = ath5k_hw_setup_xr_tx_desc;</div><div class='del'>-		ah-&gt;ah_proc_tx_desc = ath5k_hw_proc_2word_tx_status;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ah-&gt;ah_version == AR5K_AR5212)</div><div class='del'>-		ah-&gt;ah_proc_rx_desc = ath5k_hw_proc_5212_rx_status;</div><div class='del'>-	else if (ah-&gt;ah_version &lt;= AR5K_AR5211)</div><div class='del'>-		ah-&gt;ah_proc_rx_desc = ath5k_hw_proc_5210_rx_status;</div><div class='del'>-</div><div class='del'>-	/* Bring device out of sleep and reset it's units */</div><div class='del'>-	ret = ath5k_hw_nic_wakeup(ah, AR5K_INIT_MODE, true);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err_free;</div><div class='del'>-</div><div class='del'>-	/* Get MAC, PHY and RADIO revisions */</div><div class='del'>-	srev = ath5k_hw_reg_read(ah, AR5K_SREV);</div><div class='del'>-	ah-&gt;ah_mac_srev = srev;</div><div class='del'>-	ah-&gt;ah_mac_version = AR5K_REG_MS(srev, AR5K_SREV_VER);</div><div class='del'>-	ah-&gt;ah_mac_revision = AR5K_REG_MS(srev, AR5K_SREV_REV);</div><div class='del'>-	ah-&gt;ah_phy_revision = ath5k_hw_reg_read(ah, AR5K_PHY_CHIP_ID) &amp;</div><div class='del'>-			0xffffffff;</div><div class='del'>-	ah-&gt;ah_radio_5ghz_revision = ath5k_hw_radio_revision(ah,</div><div class='del'>-			CHANNEL_5GHZ);</div><div class='del'>-</div><div class='del'>-	if (ah-&gt;ah_version == AR5K_AR5210)</div><div class='del'>-		ah-&gt;ah_radio_2ghz_revision = 0;</div><div class='del'>-	else</div><div class='del'>-		ah-&gt;ah_radio_2ghz_revision = ath5k_hw_radio_revision(ah,</div><div class='del'>-				CHANNEL_2GHZ);</div><div class='del'>-</div><div class='del'>-	/* Return on unsuported chips (unsupported eeprom etc) */</div><div class='del'>-	if ((srev &gt;= AR5K_SREV_VER_AR5416) &amp;&amp;</div><div class='del'>-	(srev &lt; AR5K_SREV_VER_AR2425)) {</div><div class='del'>-		ATH5K_ERR(sc, "Device not yet supported.\n");</div><div class='del'>-		ret = -ENODEV;</div><div class='del'>-		goto err_free;</div><div class='del'>-	} else if (srev == AR5K_SREV_VER_AR2425) {</div><div class='del'>-		ATH5K_WARN(sc, "Support for RF2425 is under development.\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Identify single chip solutions */</div><div class='del'>-	if (((srev &lt;= AR5K_SREV_VER_AR5414) &amp;&amp;</div><div class='del'>-	(srev &gt;= AR5K_SREV_VER_AR2413)) ||</div><div class='del'>-	(srev == AR5K_SREV_VER_AR2425)) {</div><div class='del'>-		ah-&gt;ah_single_chip = true;</div><div class='del'>-	} else {</div><div class='del'>-		ah-&gt;ah_single_chip = false;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Single chip radio */</div><div class='del'>-	if (ah-&gt;ah_radio_2ghz_revision == ah-&gt;ah_radio_5ghz_revision)</div><div class='del'>-		ah-&gt;ah_radio_2ghz_revision = 0;</div><div class='del'>-</div><div class='del'>-	/* Identify the radio chip*/</div><div class='del'>-	if (ah-&gt;ah_version == AR5K_AR5210) {</div><div class='del'>-		ah-&gt;ah_radio = AR5K_RF5110;</div><div class='del'>-	/*</div><div class='del'>-	 * Register returns 0x0/0x04 for radio revision</div><div class='del'>-	 * so ath5k_hw_radio_revision doesn't parse the value</div><div class='del'>-	 * correctly. For now we are based on mac's srev to</div><div class='del'>-	 * identify RF2425 radio.</div><div class='del'>-	 */</div><div class='del'>-	} else if (srev == AR5K_SREV_VER_AR2425) {</div><div class='del'>-		ah-&gt;ah_radio = AR5K_RF2425;</div><div class='del'>-		ah-&gt;ah_phy_spending = AR5K_PHY_SPENDING_RF2425;</div><div class='del'>-	} else if (ah-&gt;ah_radio_5ghz_revision &lt; AR5K_SREV_RAD_5112) {</div><div class='del'>-		ah-&gt;ah_radio = AR5K_RF5111;</div><div class='del'>-		ah-&gt;ah_phy_spending = AR5K_PHY_SPENDING_RF5111;</div><div class='del'>-	} else if (ah-&gt;ah_radio_5ghz_revision &lt; AR5K_SREV_RAD_SC0) {</div><div class='del'>-		ah-&gt;ah_radio = AR5K_RF5112;</div><div class='del'>-		ah-&gt;ah_phy_spending = AR5K_PHY_SPENDING_RF5112;</div><div class='del'>-	} else if (ah-&gt;ah_radio_5ghz_revision &lt; AR5K_SREV_RAD_SC1) {</div><div class='del'>-		ah-&gt;ah_radio = AR5K_RF2413;</div><div class='del'>-		ah-&gt;ah_phy_spending = AR5K_PHY_SPENDING_RF2413;</div><div class='del'>-	} else if (ah-&gt;ah_radio_5ghz_revision &lt; AR5K_SREV_RAD_SC2) {</div><div class='del'>-		ah-&gt;ah_radio = AR5K_RF5413;</div><div class='del'>-		ah-&gt;ah_phy_spending = AR5K_PHY_SPENDING_RF5413;</div><div class='del'>-	} else if (ah-&gt;ah_radio_5ghz_revision &lt; AR5K_SREV_RAD_5133) {</div><div class='del'>-		/* AR5424 */</div><div class='del'>-		if (srev &gt;= AR5K_SREV_VER_AR5424) {</div><div class='del'>-			ah-&gt;ah_radio = AR5K_RF5413;</div><div class='del'>-			ah-&gt;ah_phy_spending = AR5K_PHY_SPENDING_RF5413;</div><div class='del'>-		/* AR2424 */</div><div class='del'>-		} else {</div><div class='del'>-			ah-&gt;ah_radio = AR5K_RF2413; /* For testing */</div><div class='del'>-			ah-&gt;ah_phy_spending = AR5K_PHY_SPENDING_RF2413;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	ah-&gt;ah_phy = AR5K_PHY(0);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Write PCI-E power save settings</div><div class='del'>-	 */</div><div class='del'>-	if ((ah-&gt;ah_version == AR5K_AR5212) &amp;&amp; (pdev-&gt;is_pcie)) {</div><div class='del'>-		ath5k_hw_reg_write(ah, 0x9248fc00, 0x4080);</div><div class='del'>-		ath5k_hw_reg_write(ah, 0x24924924, 0x4080);</div><div class='del'>-		ath5k_hw_reg_write(ah, 0x28000039, 0x4080);</div><div class='del'>-		ath5k_hw_reg_write(ah, 0x53160824, 0x4080);</div><div class='del'>-		ath5k_hw_reg_write(ah, 0xe5980579, 0x4080);</div><div class='del'>-		ath5k_hw_reg_write(ah, 0x001defff, 0x4080);</div><div class='del'>-		ath5k_hw_reg_write(ah, 0x1aaabe40, 0x4080);</div><div class='del'>-		ath5k_hw_reg_write(ah, 0xbe105554, 0x4080);</div><div class='del'>-		ath5k_hw_reg_write(ah, 0x000e3007, 0x4080);</div><div class='del'>-		ath5k_hw_reg_write(ah, 0x00000000, 0x4084);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * POST</div><div class='del'>-	 */</div><div class='del'>-	ret = ath5k_hw_post(ah);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err_free;</div><div class='del'>-</div><div class='del'>-	/* Write AR5K_PCICFG_UNK on 2112B and later chips */</div><div class='del'>-	if (ah-&gt;ah_radio_5ghz_revision &gt; AR5K_SREV_RAD_2112B ||</div><div class='del'>-	srev &gt; AR5K_SREV_VER_AR2413) {</div><div class='del'>-		ath5k_hw_reg_write(ah, AR5K_PCICFG_UNK, AR5K_PCICFG);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Get card capabilities, values, ...</div><div class='del'>-	 */</div><div class='del'>-	ret = ath5k_eeprom_init(ah);</div><div class='del'>-	if (ret) {</div><div class='del'>-		ATH5K_ERR(sc, "unable to init EEPROM\n");</div><div class='del'>-		goto err_free;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Get misc capabilities */</div><div class='del'>-	ret = ath5k_hw_get_capabilities(ah);</div><div class='del'>-	if (ret) {</div><div class='del'>-		ATH5K_ERR(sc, "unable to get device capabilities: 0x%04x\n",</div><div class='del'>-			sc-&gt;pdev-&gt;device);</div><div class='del'>-		goto err_free;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Get MAC address */</div><div class='del'>-	ret = ath5k_eeprom_read_mac(ah, mac);</div><div class='del'>-	if (ret) {</div><div class='del'>-		ATH5K_ERR(sc, "unable to read address from EEPROM: 0x%04x\n",</div><div class='del'>-			sc-&gt;pdev-&gt;device);</div><div class='del'>-		goto err_free;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ath5k_hw_set_lladdr(ah, mac);</div><div class='del'>-	/* Set BSSID to bcast address: ff:ff:ff:ff:ff:ff for now */</div><div class='del'>-	memset(ah-&gt;ah_bssid, 0xff, ETH_ALEN);</div><div class='del'>-	ath5k_hw_set_associd(ah, ah-&gt;ah_bssid, 0);</div><div class='del'>-	ath5k_hw_set_opmode(ah);</div><div class='del'>-</div><div class='del'>-	ath5k_hw_set_rfgain_opt(ah);</div><div class='del'>-</div><div class='del'>-	return ah;</div><div class='del'>-err_free:</div><div class='del'>-	kfree(ah);</div><div class='del'>-err:</div><div class='del'>-	return ERR_PTR(ret);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Bring up MAC + PHY Chips</div><div class='del'>- */</div><div class='del'>-static int ath5k_hw_nic_wakeup(struct ath5k_hw *ah, int flags, bool initial)</div><div class='del'>-{</div><div class='del'>-	struct pci_dev *pdev = ah-&gt;ah_sc-&gt;pdev;</div><div class='del'>-	u32 turbo, mode, clock, bus_flags;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	turbo = 0;</div><div class='del'>-	mode = 0;</div><div class='del'>-	clock = 0;</div><div class='del'>-</div><div class='del'>-	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='del'>-</div><div class='del'>-	/* Wakeup the device */</div><div class='del'>-	ret = ath5k_hw_set_power(ah, AR5K_PM_AWAKE, true, 0);</div><div class='del'>-	if (ret) {</div><div class='del'>-		ATH5K_ERR(ah-&gt;ah_sc, "failed to wakeup the MAC Chip\n");</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ah-&gt;ah_version != AR5K_AR5210) {</div><div class='del'>-		/*</div><div class='del'>-		 * Get channel mode flags</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		if (ah-&gt;ah_radio &gt;= AR5K_RF5112) {</div><div class='del'>-			mode = AR5K_PHY_MODE_RAD_RF5112;</div><div class='del'>-			clock = AR5K_PHY_PLL_RF5112;</div><div class='del'>-		} else {</div><div class='del'>-			mode = AR5K_PHY_MODE_RAD_RF5111;	/*Zero*/</div><div class='del'>-			clock = AR5K_PHY_PLL_RF5111;		/*Zero*/</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (flags &amp; CHANNEL_2GHZ) {</div><div class='del'>-			mode |= AR5K_PHY_MODE_FREQ_2GHZ;</div><div class='del'>-			clock |= AR5K_PHY_PLL_44MHZ;</div><div class='del'>-</div><div class='del'>-			if (flags &amp; CHANNEL_CCK) {</div><div class='del'>-				mode |= AR5K_PHY_MODE_MOD_CCK;</div><div class='del'>-			} else if (flags &amp; CHANNEL_OFDM) {</div><div class='del'>-				/* XXX Dynamic OFDM/CCK is not supported by the</div><div class='del'>-				 * AR5211 so we set MOD_OFDM for plain g (no</div><div class='del'>-				 * CCK headers) operation. We need to test</div><div class='del'>-				 * this, 5211 might support ofdm-only g after</div><div class='del'>-				 * all, there are also initial register values</div><div class='del'>-				 * in the code for g mode (see initvals.c). */</div><div class='del'>-				if (ah-&gt;ah_version == AR5K_AR5211)</div><div class='del'>-					mode |= AR5K_PHY_MODE_MOD_OFDM;</div><div class='del'>-				else</div><div class='del'>-					mode |= AR5K_PHY_MODE_MOD_DYN;</div><div class='del'>-			} else {</div><div class='del'>-				ATH5K_ERR(ah-&gt;ah_sc,</div><div class='del'>-					"invalid radio modulation mode\n");</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			}</div><div class='del'>-		} else if (flags &amp; CHANNEL_5GHZ) {</div><div class='del'>-			mode |= AR5K_PHY_MODE_FREQ_5GHZ;</div><div class='del'>-			clock |= AR5K_PHY_PLL_40MHZ;</div><div class='del'>-</div><div class='del'>-			if (flags &amp; CHANNEL_OFDM)</div><div class='del'>-				mode |= AR5K_PHY_MODE_MOD_OFDM;</div><div class='del'>-			else {</div><div class='del'>-				ATH5K_ERR(ah-&gt;ah_sc,</div><div class='del'>-					"invalid radio modulation mode\n");</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			ATH5K_ERR(ah-&gt;ah_sc, "invalid radio frequency mode\n");</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (flags &amp; CHANNEL_TURBO)</div><div class='del'>-			turbo = AR5K_PHY_TURBO_MODE | AR5K_PHY_TURBO_SHORT;</div><div class='del'>-	} else { /* Reset the device */</div><div class='del'>-</div><div class='del'>-		/* ...enable Atheros turbo mode if requested */</div><div class='del'>-		if (flags &amp; CHANNEL_TURBO)</div><div class='del'>-			ath5k_hw_reg_write(ah, AR5K_PHY_TURBO_MODE,</div><div class='del'>-					AR5K_PHY_TURBO);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* reseting PCI on PCI-E cards results card to hang</div><div class='del'>-	 * and always return 0xffff... so we ingore that flag</div><div class='del'>-	 * for PCI-E cards */</div><div class='del'>-	bus_flags = (pdev-&gt;is_pcie) ? 0 : AR5K_RESET_CTL_PCI;</div><div class='del'>-</div><div class='del'>-	/* Reset chipset */</div><div class='del'>-	ret = ath5k_hw_nic_reset(ah, AR5K_RESET_CTL_PCU |</div><div class='del'>-		AR5K_RESET_CTL_BASEBAND | bus_flags);</div><div class='del'>-	if (ret) {</div><div class='del'>-		ATH5K_ERR(ah-&gt;ah_sc, "failed to reset the MAC Chip\n");</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ah-&gt;ah_version == AR5K_AR5210)</div><div class='del'>-		udelay(2300);</div><div class='del'>-</div><div class='del'>-	/* ...wakeup again!*/</div><div class='del'>-	ret = ath5k_hw_set_power(ah, AR5K_PM_AWAKE, true, 0);</div><div class='del'>-	if (ret) {</div><div class='del'>-		ATH5K_ERR(ah-&gt;ah_sc, "failed to resume the MAC Chip\n");</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* ...final warm reset */</div><div class='del'>-	if (ath5k_hw_nic_reset(ah, 0)) {</div><div class='del'>-		ATH5K_ERR(ah-&gt;ah_sc, "failed to warm reset the MAC Chip\n");</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ah-&gt;ah_version != AR5K_AR5210) {</div><div class='del'>-		/* ...set the PHY operating mode */</div><div class='del'>-		ath5k_hw_reg_write(ah, clock, AR5K_PHY_PLL);</div><div class='del'>-		udelay(300);</div><div class='del'>-</div><div class='del'>-		ath5k_hw_reg_write(ah, mode, AR5K_PHY_MODE);</div><div class='del'>-		ath5k_hw_reg_write(ah, turbo, AR5K_PHY_TURBO);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Get the rate table for a specific operation mode</div><div class='del'>- */</div><div class='del'>-const struct ath5k_rate_table *ath5k_hw_get_rate_table(struct ath5k_hw *ah,</div><div class='del'>-		unsigned int mode)</div><div class='del'>-{</div><div class='del'>-	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='del'>-</div><div class='del'>-	if (!test_bit(mode, ah-&gt;ah_capabilities.cap_mode))</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	/* Get rate tables */</div><div class='del'>-	switch (mode) {</div><div class='del'>-	case AR5K_MODE_11A:</div><div class='del'>-		return &amp;ath5k_rt_11a;</div><div class='del'>-	case AR5K_MODE_11A_TURBO:</div><div class='del'>-		return &amp;ath5k_rt_turbo;</div><div class='del'>-	case AR5K_MODE_11B:</div><div class='del'>-		return &amp;ath5k_rt_11b;</div><div class='del'>-	case AR5K_MODE_11G:</div><div class='del'>-		return &amp;ath5k_rt_11g;</div><div class='del'>-	case AR5K_MODE_11G_TURBO:</div><div class='del'>-		return &amp;ath5k_rt_xr;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Free the ath5k_hw struct</div><div class='del'>- */</div><div class='del'>-void ath5k_hw_detach(struct ath5k_hw *ah)</div><div class='del'>-{</div><div class='del'>-	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='del'>-</div><div class='del'>-	__set_bit(ATH_STAT_INVALID, ah-&gt;ah_sc-&gt;status);</div><div class='del'>-</div><div class='del'>-	if (ah-&gt;ah_rf_banks != NULL)</div><div class='del'>-		kfree(ah-&gt;ah_rf_banks);</div><div class='del'>-</div><div class='del'>-	/* assume interrupts are down */</div><div class='del'>-	kfree(ah);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/****************************\</div><div class='del'>-  Reset function and helpers</div><div class='del'>-\****************************/</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ath5k_hw_write_ofdm_timings - set OFDM timings on AR5212</div><div class='del'>- *</div><div class='del'>- * @ah: the &amp;struct ath5k_hw</div><div class='del'>- * @channel: the currently set channel upon reset</div><div class='del'>- *</div><div class='del'>- * Write the OFDM timings for the AR5212 upon reset. This is a helper for</div><div class='del'>- * ath5k_hw_reset(). This seems to tune the PLL a specified frequency</div><div class='del'>- * depending on the bandwidth of the channel.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-static inline int ath5k_hw_write_ofdm_timings(struct ath5k_hw *ah,</div><div class='del'>-	struct ieee80211_channel *channel)</div><div class='del'>-{</div><div class='del'>-	/* Get exponent and mantissa and set it */</div><div class='del'>-	u32 coef_scaled, coef_exp, coef_man,</div><div class='del'>-		ds_coef_exp, ds_coef_man, clock;</div><div class='del'>-</div><div class='del'>-	if (!(ah-&gt;ah_version == AR5K_AR5212) ||</div><div class='del'>-		!(channel-&gt;hw_value &amp; CHANNEL_OFDM))</div><div class='del'>-		BUG();</div><div class='del'>-</div><div class='del'>-	/* Seems there are two PLLs, one for baseband sampling and one</div><div class='del'>-	 * for tuning. Tuning basebands are 40 MHz or 80MHz when in</div><div class='del'>-	 * turbo. */</div><div class='del'>-	clock = channel-&gt;hw_value &amp; CHANNEL_TURBO ? 80 : 40;</div><div class='del'>-	coef_scaled = ((5 * (clock &lt;&lt; 24)) / 2) /</div><div class='del'>-	channel-&gt;center_freq;</div><div class='del'>-</div><div class='del'>-	for (coef_exp = 31; coef_exp &gt; 0; coef_exp--)</div><div class='del'>-		if ((coef_scaled &gt;&gt; coef_exp) &amp; 0x1)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-	if (!coef_exp)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	coef_exp = 14 - (coef_exp - 24);</div><div class='del'>-	coef_man = coef_scaled +</div><div class='del'>-		(1 &lt;&lt; (24 - coef_exp - 1));</div><div class='del'>-	ds_coef_man = coef_man &gt;&gt; (24 - coef_exp);</div><div class='del'>-	ds_coef_exp = coef_exp - 16;</div><div class='del'>-</div><div class='del'>-	AR5K_REG_WRITE_BITS(ah, AR5K_PHY_TIMING_3,</div><div class='del'>-		AR5K_PHY_TIMING_3_DSC_MAN, ds_coef_man);</div><div class='del'>-	AR5K_REG_WRITE_BITS(ah, AR5K_PHY_TIMING_3,</div><div class='del'>-		AR5K_PHY_TIMING_3_DSC_EXP, ds_coef_exp);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ath5k_hw_write_rate_duration - set rate duration during hw resets</div><div class='del'>- *</div><div class='del'>- * @ah: the &amp;struct ath5k_hw</div><div class='del'>- * @mode: one of enum ath5k_driver_mode</div><div class='del'>- *</div><div class='del'>- * Write the rate duration table for the current mode upon hw reset. This</div><div class='del'>- * is a helper for ath5k_hw_reset(). It seems all this is doing is setting</div><div class='del'>- * an ACK timeout for the hardware for the current mode for each rate. The</div><div class='del'>- * rates which are capable of short preamble (802.11b rates 2Mbps, 5.5Mbps,</div><div class='del'>- * and 11Mbps) have another register for the short preamble ACK timeout</div><div class='del'>- * calculation.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-static inline void ath5k_hw_write_rate_duration(struct ath5k_hw *ah,</div><div class='del'>-       unsigned int mode)</div><div class='del'>-{</div><div class='del'>-	struct ath5k_softc *sc = ah-&gt;ah_sc;</div><div class='del'>-	const struct ath5k_rate_table *rt;</div><div class='del'>-	struct ieee80211_rate srate = {};</div><div class='del'>-	unsigned int i;</div><div class='del'>-</div><div class='del'>-	/* Get rate table for the current operating mode */</div><div class='del'>-	rt = ath5k_hw_get_rate_table(ah, mode);</div><div class='del'>-</div><div class='del'>-	/* Write rate duration table */</div><div class='del'>-	for (i = 0; i &lt; rt-&gt;rate_count; i++) {</div><div class='del'>-		const struct ath5k_rate *rate, *control_rate;</div><div class='del'>-</div><div class='del'>-		u32 reg;</div><div class='del'>-		u16 tx_time;</div><div class='del'>-</div><div class='del'>-		rate = &amp;rt-&gt;rates[i];</div><div class='del'>-		control_rate = &amp;rt-&gt;rates[rate-&gt;control_rate];</div><div class='del'>-</div><div class='del'>-		/* Set ACK timeout */</div><div class='del'>-		reg = AR5K_RATE_DUR(rate-&gt;rate_code);</div><div class='del'>-</div><div class='del'>-		srate.bitrate = control_rate-&gt;rate_kbps/100;</div><div class='del'>-</div><div class='del'>-		/* An ACK frame consists of 10 bytes. If you add the FCS,</div><div class='del'>-		 * which ieee80211_generic_frame_duration() adds,</div><div class='del'>-		 * its 14 bytes. Note we use the control rate and not the</div><div class='del'>-		 * actual rate for this rate. See mac80211 tx.c</div><div class='del'>-		 * ieee80211_duration() for a brief description of</div><div class='del'>-		 * what rate we should choose to TX ACKs. */</div><div class='del'>-		tx_time = le16_to_cpu(ieee80211_generic_frame_duration(sc-&gt;hw,</div><div class='del'>-							sc-&gt;vif, 10, &amp;srate));</div><div class='del'>-</div><div class='del'>-		ath5k_hw_reg_write(ah, tx_time, reg);</div><div class='del'>-</div><div class='del'>-		if (!HAS_SHPREAMBLE(i))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * We're not distinguishing short preamble here,</div><div class='del'>-		 * This is true, all we'll get is a longer value here</div><div class='del'>-		 * which is not necessarilly bad. We could use</div><div class='del'>-		 * export ieee80211_frame_duration() but that needs to be</div><div class='del'>-		 * fixed first to be properly used by mac802111 drivers:</div><div class='del'>-		 *</div><div class='del'>-		 *  - remove erp stuff and let the routine figure ofdm</div><div class='del'>-		 *    erp rates</div><div class='del'>-		 *  - remove passing argument ieee80211_local as</div><div class='del'>-		 *    drivers don't have access to it</div><div class='del'>-		 *  - move drivers using ieee80211_generic_frame_duration()</div><div class='del'>-		 *    to this</div><div class='del'>-		 */</div><div class='del'>-		ath5k_hw_reg_write(ah, tx_time,</div><div class='del'>-			reg + (AR5K_SET_SHORT_PREAMBLE &lt;&lt; 2));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Main reset function</div><div class='del'>- */</div><div class='del'>-int ath5k_hw_reset(struct ath5k_hw *ah, enum ieee80211_if_types op_mode,</div><div class='del'>-	struct ieee80211_channel *channel, bool change_channel)</div><div class='del'>-{</div><div class='del'>-	struct ath5k_eeprom_info *ee = &amp;ah-&gt;ah_capabilities.cap_eeprom;</div><div class='del'>-	struct pci_dev *pdev = ah-&gt;ah_sc-&gt;pdev;</div><div class='del'>-	u32 data, s_seq, s_ant, s_led[3], dma_size;</div><div class='del'>-	unsigned int i, mode, freq, ee_mode, ant[2];</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='del'>-</div><div class='del'>-	s_seq = 0;</div><div class='del'>-	s_ant = 0;</div><div class='del'>-	ee_mode = 0;</div><div class='del'>-	freq = 0;</div><div class='del'>-	mode = 0;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Save some registers before a reset</div><div class='del'>-	 */</div><div class='del'>-	/*DCU/Antenna selection not available on 5210*/</div><div class='del'>-	if (ah-&gt;ah_version != AR5K_AR5210) {</div><div class='del'>-		if (change_channel) {</div><div class='del'>-			/* Seq number for queue 0 -do this for all queues ? */</div><div class='del'>-			s_seq = ath5k_hw_reg_read(ah,</div><div class='del'>-					AR5K_QUEUE_DFS_SEQNUM(0));</div><div class='del'>-			/*Default antenna*/</div><div class='del'>-			s_ant = ath5k_hw_reg_read(ah, AR5K_DEFAULT_ANTENNA);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*GPIOs*/</div><div class='del'>-	s_led[0] = ath5k_hw_reg_read(ah, AR5K_PCICFG) &amp; AR5K_PCICFG_LEDSTATE;</div><div class='del'>-	s_led[1] = ath5k_hw_reg_read(ah, AR5K_GPIOCR);</div><div class='del'>-	s_led[2] = ath5k_hw_reg_read(ah, AR5K_GPIODO);</div><div class='del'>-</div><div class='del'>-	if (change_channel &amp;&amp; ah-&gt;ah_rf_banks != NULL)</div><div class='del'>-		ath5k_hw_get_rf_gain(ah);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/*Wakeup the device*/</div><div class='del'>-	ret = ath5k_hw_nic_wakeup(ah, channel-&gt;hw_value, false);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Initialize operating mode</div><div class='del'>-	 */</div><div class='del'>-	ah-&gt;ah_op_mode = op_mode;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * 5111/5112 Settings</div><div class='del'>-	 * 5210 only comes with RF5110</div><div class='del'>-	 */</div><div class='del'>-	if (ah-&gt;ah_version != AR5K_AR5210) {</div><div class='del'>-		if (ah-&gt;ah_radio != AR5K_RF5111 &amp;&amp;</div><div class='del'>-			ah-&gt;ah_radio != AR5K_RF5112 &amp;&amp;</div><div class='del'>-			ah-&gt;ah_radio != AR5K_RF5413 &amp;&amp;</div><div class='del'>-			ah-&gt;ah_radio != AR5K_RF2413 &amp;&amp;</div><div class='del'>-			ah-&gt;ah_radio != AR5K_RF2425) {</div><div class='del'>-			ATH5K_ERR(ah-&gt;ah_sc,</div><div class='del'>-				"invalid phy radio: %u\n", ah-&gt;ah_radio);</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		switch (channel-&gt;hw_value &amp; CHANNEL_MODES) {</div><div class='del'>-		case CHANNEL_A:</div><div class='del'>-			mode = AR5K_MODE_11A;</div><div class='del'>-			freq = AR5K_INI_RFGAIN_5GHZ;</div><div class='del'>-			ee_mode = AR5K_EEPROM_MODE_11A;</div><div class='del'>-			break;</div><div class='del'>-		case CHANNEL_G:</div><div class='del'>-			mode = AR5K_MODE_11G;</div><div class='del'>-			freq = AR5K_INI_RFGAIN_2GHZ;</div><div class='del'>-			ee_mode = AR5K_EEPROM_MODE_11G;</div><div class='del'>-			break;</div><div class='del'>-		case CHANNEL_B:</div><div class='del'>-			mode = AR5K_MODE_11B;</div><div class='del'>-			freq = AR5K_INI_RFGAIN_2GHZ;</div><div class='del'>-			ee_mode = AR5K_EEPROM_MODE_11B;</div><div class='del'>-			break;</div><div class='del'>-		case CHANNEL_T:</div><div class='del'>-			mode = AR5K_MODE_11A_TURBO;</div><div class='del'>-			freq = AR5K_INI_RFGAIN_5GHZ;</div><div class='del'>-			ee_mode = AR5K_EEPROM_MODE_11A;</div><div class='del'>-			break;</div><div class='del'>-		/*Is this ok on 5211 too ?*/</div><div class='del'>-		case CHANNEL_TG:</div><div class='del'>-			mode = AR5K_MODE_11G_TURBO;</div><div class='del'>-			freq = AR5K_INI_RFGAIN_2GHZ;</div><div class='del'>-			ee_mode = AR5K_EEPROM_MODE_11G;</div><div class='del'>-			break;</div><div class='del'>-		case CHANNEL_XR:</div><div class='del'>-			if (ah-&gt;ah_version == AR5K_AR5211) {</div><div class='del'>-				ATH5K_ERR(ah-&gt;ah_sc,</div><div class='del'>-					"XR mode not available on 5211");</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			}</div><div class='del'>-			mode = AR5K_MODE_XR;</div><div class='del'>-			freq = AR5K_INI_RFGAIN_5GHZ;</div><div class='del'>-			ee_mode = AR5K_EEPROM_MODE_11A;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			ATH5K_ERR(ah-&gt;ah_sc,</div><div class='del'>-				"invalid channel: %d\n", channel-&gt;center_freq);</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* PHY access enable */</div><div class='del'>-		ath5k_hw_reg_write(ah, AR5K_PHY_SHIFT_5GHZ, AR5K_PHY(0));</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = ath5k_hw_write_initvals(ah, mode, change_channel);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * 5211/5212 Specific</div><div class='del'>-	 */</div><div class='del'>-	if (ah-&gt;ah_version != AR5K_AR5210) {</div><div class='del'>-		/*</div><div class='del'>-		 * Write initial RF gain settings</div><div class='del'>-		 * This should work for both 5111/5112</div><div class='del'>-		 */</div><div class='del'>-		ret = ath5k_hw_rfgain(ah, freq);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		mdelay(1);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Write some more initial register settings</div><div class='del'>-		 */</div><div class='del'>-		if (ah-&gt;ah_version == AR5K_AR5212) {</div><div class='del'>-			ath5k_hw_reg_write(ah, 0x0002a002, 0x982c);</div><div class='del'>-</div><div class='del'>-			if (channel-&gt;hw_value == CHANNEL_G)</div><div class='del'>-				if (ah-&gt;ah_mac_srev &lt; AR5K_SREV_VER_AR2413)</div><div class='del'>-					ath5k_hw_reg_write(ah, 0x00f80d80,</div><div class='del'>-								0x994c);</div><div class='del'>-				else if (ah-&gt;ah_mac_srev &lt; AR5K_SREV_VER_AR2424)</div><div class='del'>-					ath5k_hw_reg_write(ah, 0x00380140,</div><div class='del'>-								0x994c);</div><div class='del'>-				else if (ah-&gt;ah_mac_srev &lt; AR5K_SREV_VER_AR2425)</div><div class='del'>-					ath5k_hw_reg_write(ah, 0x00fc0ec0,</div><div class='del'>-								0x994c);</div><div class='del'>-				else /* 2425 */</div><div class='del'>-					ath5k_hw_reg_write(ah, 0x00fc0fc0,</div><div class='del'>-								0x994c);</div><div class='del'>-			else</div><div class='del'>-				ath5k_hw_reg_write(ah, 0x00000000, 0x994c);</div><div class='del'>-</div><div class='del'>-			/* Some bits are disabled here, we know nothing about</div><div class='del'>-			 * register 0xa228 yet, most of the times this ends up</div><div class='del'>-			 * with a value 0x9b5 -haven't seen any dump with</div><div class='del'>-			 * a different value- */</div><div class='del'>-			/* Got this from decompiling binary HAL */</div><div class='del'>-			data = ath5k_hw_reg_read(ah, 0xa228);</div><div class='del'>-			data &amp;= 0xfffffdff;</div><div class='del'>-			ath5k_hw_reg_write(ah, data, 0xa228);</div><div class='del'>-</div><div class='del'>-			data = ath5k_hw_reg_read(ah, 0xa228);</div><div class='del'>-			data &amp;= 0xfffe03ff;</div><div class='del'>-			ath5k_hw_reg_write(ah, data, 0xa228);</div><div class='del'>-			data = 0;</div><div class='del'>-</div><div class='del'>-			/* Just write 0x9b5 ? */</div><div class='del'>-			/* ath5k_hw_reg_write(ah, 0x000009b5, 0xa228); */</div><div class='del'>-			ath5k_hw_reg_write(ah, 0x0000000f, AR5K_SEQ_MASK);</div><div class='del'>-			ath5k_hw_reg_write(ah, 0x00000000, 0xa254);</div><div class='del'>-			ath5k_hw_reg_write(ah, 0x0000000e, AR5K_PHY_SCAL);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Fix for first revision of the RF5112 RF chipset */</div><div class='del'>-		if (ah-&gt;ah_radio &gt;= AR5K_RF5112 &amp;&amp;</div><div class='del'>-				ah-&gt;ah_radio_5ghz_revision &lt;</div><div class='del'>-				AR5K_SREV_RAD_5112A) {</div><div class='del'>-			ath5k_hw_reg_write(ah, AR5K_PHY_CCKTXCTL_WORLD,</div><div class='del'>-					AR5K_PHY_CCKTXCTL);</div><div class='del'>-			if (channel-&gt;hw_value &amp; CHANNEL_5GHZ)</div><div class='del'>-				data = 0xffb81020;</div><div class='del'>-			else</div><div class='del'>-				data = 0xffb80d20;</div><div class='del'>-			ath5k_hw_reg_write(ah, data, AR5K_PHY_FRAME_CTL);</div><div class='del'>-			data = 0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Set TX power (FIXME)</div><div class='del'>-		 */</div><div class='del'>-		ret = ath5k_hw_txpower(ah, channel, AR5K_TUNE_DEFAULT_TXPOWER);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		/* Write rate duration table only on AR5212 and if</div><div class='del'>-		 * virtual interface has already been brought up</div><div class='del'>-		 * XXX: rethink this after new mode changes to</div><div class='del'>-		 * mac80211 are integrated */</div><div class='del'>-		if (ah-&gt;ah_version == AR5K_AR5212 &amp;&amp;</div><div class='del'>-			ah-&gt;ah_sc-&gt;vif != NULL)</div><div class='del'>-			ath5k_hw_write_rate_duration(ah, mode);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Write RF registers</div><div class='del'>-		 */</div><div class='del'>-		ret = ath5k_hw_rfregs(ah, channel, mode);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Configure additional registers</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		/* Write OFDM timings on 5212*/</div><div class='del'>-		if (ah-&gt;ah_version == AR5K_AR5212 &amp;&amp;</div><div class='del'>-			channel-&gt;hw_value &amp; CHANNEL_OFDM) {</div><div class='del'>-			ret = ath5k_hw_write_ofdm_timings(ah, channel);</div><div class='del'>-			if (ret)</div><div class='del'>-				return ret;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*Enable/disable 802.11b mode on 5111</div><div class='del'>-		(enable 2111 frequency converter + CCK)*/</div><div class='del'>-		if (ah-&gt;ah_radio == AR5K_RF5111) {</div><div class='del'>-			if (mode == AR5K_MODE_11B)</div><div class='del'>-				AR5K_REG_ENABLE_BITS(ah, AR5K_TXCFG,</div><div class='del'>-				    AR5K_TXCFG_B_MODE);</div><div class='del'>-			else</div><div class='del'>-				AR5K_REG_DISABLE_BITS(ah, AR5K_TXCFG,</div><div class='del'>-				    AR5K_TXCFG_B_MODE);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Set channel and calibrate the PHY</div><div class='del'>-		 */</div><div class='del'>-		ret = ath5k_hw_channel(ah, channel);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		/* Set antenna mode */</div><div class='del'>-		AR5K_REG_MASKED_BITS(ah, AR5K_PHY_ANT_CTL,</div><div class='del'>-			ah-&gt;ah_antenna[ee_mode][0], 0xfffffc06);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * In case a fixed antenna was set as default</div><div class='del'>-		 * write the same settings on both AR5K_PHY_ANT_SWITCH_TABLE</div><div class='del'>-		 * registers.</div><div class='del'>-		 */</div><div class='del'>-		if (s_ant != 0){</div><div class='del'>-			if (s_ant == AR5K_ANT_FIXED_A) /* 1 - Main */</div><div class='del'>-				ant[0] = ant[1] = AR5K_ANT_FIXED_A;</div><div class='del'>-			else	/* 2 - Aux */</div><div class='del'>-				ant[0] = ant[1] = AR5K_ANT_FIXED_B;</div><div class='del'>-		} else {</div><div class='del'>-			ant[0] = AR5K_ANT_FIXED_A;</div><div class='del'>-			ant[1] = AR5K_ANT_FIXED_B;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ath5k_hw_reg_write(ah, ah-&gt;ah_antenna[ee_mode][ant[0]],</div><div class='del'>-			AR5K_PHY_ANT_SWITCH_TABLE_0);</div><div class='del'>-		ath5k_hw_reg_write(ah, ah-&gt;ah_antenna[ee_mode][ant[1]],</div><div class='del'>-			AR5K_PHY_ANT_SWITCH_TABLE_1);</div><div class='del'>-</div><div class='del'>-		/* Commit values from EEPROM */</div><div class='del'>-		if (ah-&gt;ah_radio == AR5K_RF5111)</div><div class='del'>-			AR5K_REG_WRITE_BITS(ah, AR5K_PHY_FRAME_CTL,</div><div class='del'>-			    AR5K_PHY_FRAME_CTL_TX_CLIP, ee-&gt;ee_tx_clip);</div><div class='del'>-</div><div class='del'>-		ath5k_hw_reg_write(ah,</div><div class='del'>-			AR5K_PHY_NF_SVAL(ee-&gt;ee_noise_floor_thr[ee_mode]),</div><div class='del'>-			AR5K_PHY_NFTHRES);</div><div class='del'>-</div><div class='del'>-		AR5K_REG_MASKED_BITS(ah, AR5K_PHY_SETTLING,</div><div class='del'>-			(ee-&gt;ee_switch_settling[ee_mode] &lt;&lt; 7) &amp; 0x3f80,</div><div class='del'>-			0xffffc07f);</div><div class='del'>-		AR5K_REG_MASKED_BITS(ah, AR5K_PHY_GAIN,</div><div class='del'>-			(ee-&gt;ee_ant_tx_rx[ee_mode] &lt;&lt; 12) &amp; 0x3f000,</div><div class='del'>-			0xfffc0fff);</div><div class='del'>-		AR5K_REG_MASKED_BITS(ah, AR5K_PHY_DESIRED_SIZE,</div><div class='del'>-			(ee-&gt;ee_adc_desired_size[ee_mode] &amp; 0x00ff) |</div><div class='del'>-			((ee-&gt;ee_pga_desired_size[ee_mode] &lt;&lt; 8) &amp; 0xff00),</div><div class='del'>-			0xffff0000);</div><div class='del'>-</div><div class='del'>-		ath5k_hw_reg_write(ah,</div><div class='del'>-			(ee-&gt;ee_tx_end2xpa_disable[ee_mode] &lt;&lt; 24) |</div><div class='del'>-			(ee-&gt;ee_tx_end2xpa_disable[ee_mode] &lt;&lt; 16) |</div><div class='del'>-			(ee-&gt;ee_tx_frm2xpa_enable[ee_mode] &lt;&lt; 8) |</div><div class='del'>-			(ee-&gt;ee_tx_frm2xpa_enable[ee_mode]), AR5K_PHY_RF_CTL4);</div><div class='del'>-</div><div class='del'>-		AR5K_REG_MASKED_BITS(ah, AR5K_PHY_RF_CTL3,</div><div class='del'>-			ee-&gt;ee_tx_end2xlna_enable[ee_mode] &lt;&lt; 8, 0xffff00ff);</div><div class='del'>-		AR5K_REG_MASKED_BITS(ah, AR5K_PHY_NF,</div><div class='del'>-			(ee-&gt;ee_thr_62[ee_mode] &lt;&lt; 12) &amp; 0x7f000, 0xfff80fff);</div><div class='del'>-		AR5K_REG_MASKED_BITS(ah, AR5K_PHY_OFDM_SELFCORR, 4, 0xffffff01);</div><div class='del'>-</div><div class='del'>-		AR5K_REG_ENABLE_BITS(ah, AR5K_PHY_IQ,</div><div class='del'>-		    AR5K_PHY_IQ_CORR_ENABLE |</div><div class='del'>-		    (ee-&gt;ee_i_cal[ee_mode] &lt;&lt; AR5K_PHY_IQ_CORR_Q_I_COFF_S) |</div><div class='del'>-		    ee-&gt;ee_q_cal[ee_mode]);</div><div class='del'>-</div><div class='del'>-		if (ah-&gt;ah_ee_version &gt;= AR5K_EEPROM_VERSION_4_1)</div><div class='del'>-			AR5K_REG_WRITE_BITS(ah, AR5K_PHY_GAIN_2GHZ,</div><div class='del'>-				AR5K_PHY_GAIN_2GHZ_MARGIN_TXRX,</div><div class='del'>-				ee-&gt;ee_margin_tx_rx[ee_mode]);</div><div class='del'>-</div><div class='del'>-	} else {</div><div class='del'>-		mdelay(1);</div><div class='del'>-		/* Disable phy and wait */</div><div class='del'>-		ath5k_hw_reg_write(ah, AR5K_PHY_ACT_DISABLE, AR5K_PHY_ACT);</div><div class='del'>-		mdelay(1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Restore saved values</div><div class='del'>-	 */</div><div class='del'>-	/*DCU/Antenna selection not available on 5210*/</div><div class='del'>-	if (ah-&gt;ah_version != AR5K_AR5210) {</div><div class='del'>-		ath5k_hw_reg_write(ah, s_seq, AR5K_QUEUE_DFS_SEQNUM(0));</div><div class='del'>-		ath5k_hw_reg_write(ah, s_ant, AR5K_DEFAULT_ANTENNA);</div><div class='del'>-	}</div><div class='del'>-	AR5K_REG_ENABLE_BITS(ah, AR5K_PCICFG, s_led[0]);</div><div class='del'>-	ath5k_hw_reg_write(ah, s_led[1], AR5K_GPIOCR);</div><div class='del'>-	ath5k_hw_reg_write(ah, s_led[2], AR5K_GPIODO);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Misc</div><div class='del'>-	 */</div><div class='del'>-	/* XXX: add ah-&gt;aid once mac80211 gives this to us */</div><div class='del'>-	ath5k_hw_set_associd(ah, ah-&gt;ah_bssid, 0);</div><div class='del'>-</div><div class='del'>-	ath5k_hw_set_opmode(ah);</div><div class='del'>-	/*PISR/SISR Not available on 5210*/</div><div class='del'>-	if (ah-&gt;ah_version != AR5K_AR5210) {</div><div class='del'>-		ath5k_hw_reg_write(ah, 0xffffffff, AR5K_PISR);</div><div class='del'>-		/* If we later allow tuning for this, store into sc structure */</div><div class='del'>-		data = AR5K_TUNE_RSSI_THRES |</div><div class='del'>-			AR5K_TUNE_BMISS_THRES &lt;&lt; AR5K_RSSI_THR_BMISS_S;</div><div class='del'>-		ath5k_hw_reg_write(ah, data, AR5K_RSSI_THR);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Set Rx/Tx DMA Configuration</div><div class='del'>-	 *</div><div class='del'>-	 * Set maximum DMA size (512) except for PCI-E cards since</div><div class='del'>-	 * it causes rx overruns and tx errors (tested on 5424 but since</div><div class='del'>-	 * rx overruns also occur on 5416/5418 with madwifi we set 128</div><div class='del'>-	 * for all PCI-E cards to be safe).</div><div class='del'>-	 *</div><div class='del'>-	 * In dumps this is 128 for allchips.</div><div class='del'>-	 *</div><div class='del'>-	 * XXX: need to check 5210 for this</div><div class='del'>-	 * TODO: Check out tx triger level, it's always 64 on dumps but I</div><div class='del'>-	 * guess we can tweak it and see how it goes ;-)</div><div class='del'>-	 */</div><div class='del'>-	dma_size = (pdev-&gt;is_pcie) ? AR5K_DMASIZE_128B : AR5K_DMASIZE_512B;</div><div class='del'>-	if (ah-&gt;ah_version != AR5K_AR5210) {</div><div class='del'>-		AR5K_REG_WRITE_BITS(ah, AR5K_TXCFG,</div><div class='del'>-			AR5K_TXCFG_SDMAMR, dma_size);</div><div class='del'>-		AR5K_REG_WRITE_BITS(ah, AR5K_RXCFG,</div><div class='del'>-			AR5K_RXCFG_SDMAMW, dma_size);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Enable the PHY and wait until completion</div><div class='del'>-	 */</div><div class='del'>-	ath5k_hw_reg_write(ah, AR5K_PHY_ACT_ENABLE, AR5K_PHY_ACT);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * On 5211+ read activation -&gt; rx delay</div><div class='del'>-	 * and use it.</div><div class='del'>-	 */</div><div class='del'>-	if (ah-&gt;ah_version != AR5K_AR5210) {</div><div class='del'>-		data = ath5k_hw_reg_read(ah, AR5K_PHY_RX_DELAY) &amp;</div><div class='del'>-			AR5K_PHY_RX_DELAY_M;</div><div class='del'>-		data = (channel-&gt;hw_value &amp; CHANNEL_CCK) ?</div><div class='del'>-			((data &lt;&lt; 2) / 22) : (data / 10);</div><div class='del'>-</div><div class='del'>-		udelay(100 + (2 * data));</div><div class='del'>-		data = 0;</div><div class='del'>-	} else {</div><div class='del'>-		mdelay(1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Perform ADC test (?)</div><div class='del'>-	 */</div><div class='del'>-	data = ath5k_hw_reg_read(ah, AR5K_PHY_TST1);</div><div class='del'>-	ath5k_hw_reg_write(ah, AR5K_PHY_TST1_TXHOLD, AR5K_PHY_TST1);</div><div class='del'>-	for (i = 0; i &lt;= 20; i++) {</div><div class='del'>-		if (!(ath5k_hw_reg_read(ah, AR5K_PHY_ADC_TEST) &amp; 0x10))</div><div class='del'>-			break;</div><div class='del'>-		udelay(200);</div><div class='del'>-	}</div><div class='del'>-	ath5k_hw_reg_write(ah, data, AR5K_PHY_TST1);</div><div class='del'>-	data = 0;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Start automatic gain calibration</div><div class='del'>-	 *</div><div class='del'>-	 * During AGC calibration RX path is re-routed to</div><div class='del'>-	 * a signal detector so we don't receive anything.</div><div class='del'>-	 *</div><div class='del'>-	 * This method is used to calibrate some static offsets</div><div class='del'>-	 * used together with on-the fly I/Q calibration (the</div><div class='del'>-	 * one performed via ath5k_hw_phy_calibrate), that doesn't</div><div class='del'>-	 * interrupt rx path.</div><div class='del'>-	 *</div><div class='del'>-	 * If we are in a noisy environment AGC calibration may time</div><div class='del'>-	 * out.</div><div class='del'>-	 */</div><div class='del'>-	AR5K_REG_ENABLE_BITS(ah, AR5K_PHY_AGCCTL,</div><div class='del'>-				AR5K_PHY_AGCCTL_CAL);</div><div class='del'>-</div><div class='del'>-	/* At the same time start I/Q calibration for QAM constellation</div><div class='del'>-	 * -no need for CCK- */</div><div class='del'>-	ah-&gt;ah_calibration = false;</div><div class='del'>-	if (!(mode == AR5K_MODE_11B)) {</div><div class='del'>-		ah-&gt;ah_calibration = true;</div><div class='del'>-		AR5K_REG_WRITE_BITS(ah, AR5K_PHY_IQ,</div><div class='del'>-				AR5K_PHY_IQ_CAL_NUM_LOG_MAX, 15);</div><div class='del'>-		AR5K_REG_ENABLE_BITS(ah, AR5K_PHY_IQ,</div><div class='del'>-				AR5K_PHY_IQ_RUN);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Wait for gain calibration to finish (we check for I/Q calibration</div><div class='del'>-	 * during ath5k_phy_calibrate) */</div><div class='del'>-	if (ath5k_hw_register_timeout(ah, AR5K_PHY_AGCCTL,</div><div class='del'>-			AR5K_PHY_AGCCTL_CAL, 0, false)) {</div><div class='del'>-		ATH5K_ERR(ah-&gt;ah_sc, "gain calibration timeout (%uMHz)\n",</div><div class='del'>-			channel-&gt;center_freq);</div><div class='del'>-		return -EAGAIN;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Start noise floor calibration</div><div class='del'>-	 *</div><div class='del'>-	 * If we run NF calibration before AGC, it always times out.</div><div class='del'>-	 * Binary HAL starts NF and AGC calibration at the same time</div><div class='del'>-	 * and only waits for AGC to finish. I believe that's wrong because</div><div class='del'>-	 * during NF calibration, rx path is also routed to a detector, so if</div><div class='del'>-	 * it doesn't finish we won't have RX.</div><div class='del'>-	 *</div><div class='del'>-	 * XXX: Find an interval that's OK for all cards...</div><div class='del'>-	 */</div><div class='del'>-	ret = ath5k_hw_noise_floor_calibration(ah, channel-&gt;center_freq);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Reset queues and start beacon timers at the end of the reset routine</div><div class='del'>-	 */</div><div class='del'>-	for (i = 0; i &lt; ah-&gt;ah_capabilities.cap_queues.q_tx_num; i++) {</div><div class='del'>-		/*No QCU on 5210*/</div><div class='del'>-		if (ah-&gt;ah_version != AR5K_AR5210)</div><div class='del'>-			AR5K_REG_WRITE_Q(ah, AR5K_QUEUE_QCUMASK(i), i);</div><div class='del'>-</div><div class='del'>-		ret = ath5k_hw_reset_tx_queue(ah, i);</div><div class='del'>-		if (ret) {</div><div class='del'>-			ATH5K_ERR(ah-&gt;ah_sc,</div><div class='del'>-				"failed to reset TX queue #%d\n", i);</div><div class='del'>-			return ret;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Pre-enable interrupts on 5211/5212*/</div><div class='del'>-	if (ah-&gt;ah_version != AR5K_AR5210)</div><div class='del'>-		ath5k_hw_set_intr(ah, AR5K_INT_RX | AR5K_INT_TX |</div><div class='del'>-				AR5K_INT_FATAL);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Set RF kill flags if supported by the device (read from the EEPROM)</div><div class='del'>-	 * Disable gpio_intr for now since it results system hang.</div><div class='del'>-	 * TODO: Handle this in ath5k_intr</div><div class='del'>-	 */</div><div class='del'>-#if 0</div><div class='del'>-	if (AR5K_EEPROM_HDR_RFKILL(ah-&gt;ah_capabilities.cap_eeprom.ee_header)) {</div><div class='del'>-		ath5k_hw_set_gpio_input(ah, 0);</div><div class='del'>-		ah-&gt;ah_gpio[0] = ath5k_hw_get_gpio(ah, 0);</div><div class='del'>-		if (ah-&gt;ah_gpio[0] == 0)</div><div class='del'>-			ath5k_hw_set_gpio_intr(ah, 0, 1);</div><div class='del'>-		else</div><div class='del'>-			ath5k_hw_set_gpio_intr(ah, 0, 0);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Set the 32MHz reference clock on 5212 phy clock sleep register</div><div class='del'>-	 *</div><div class='del'>-	 * TODO: Find out how to switch to external 32Khz clock to save power</div><div class='del'>-	 */</div><div class='del'>-	if (ah-&gt;ah_version == AR5K_AR5212) {</div><div class='del'>-		ath5k_hw_reg_write(ah, AR5K_PHY_SCR_32MHZ, AR5K_PHY_SCR);</div><div class='del'>-		ath5k_hw_reg_write(ah, AR5K_PHY_SLMT_32MHZ, AR5K_PHY_SLMT);</div><div class='del'>-		ath5k_hw_reg_write(ah, AR5K_PHY_SCAL_32MHZ, AR5K_PHY_SCAL);</div><div class='del'>-		ath5k_hw_reg_write(ah, AR5K_PHY_SCLOCK_32MHZ, AR5K_PHY_SCLOCK);</div><div class='del'>-		ath5k_hw_reg_write(ah, AR5K_PHY_SDELAY_32MHZ, AR5K_PHY_SDELAY);</div><div class='del'>-		ath5k_hw_reg_write(ah, ah-&gt;ah_phy_spending, AR5K_PHY_SPENDING);</div><div class='del'>-</div><div class='del'>-		data = ath5k_hw_reg_read(ah, AR5K_USEC_5211) &amp; 0xffffc07f ;</div><div class='del'>-		data |= (ah-&gt;ah_phy_spending == AR5K_PHY_SPENDING_18) ?</div><div class='del'>-						0x00000f80 : 0x00001380 ;</div><div class='del'>-		ath5k_hw_reg_write(ah, data, AR5K_USEC_5211);</div><div class='del'>-		data = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ah-&gt;ah_version == AR5K_AR5212) {</div><div class='del'>-		ath5k_hw_reg_write(ah, 0x000100aa, 0x8118);</div><div class='del'>-		ath5k_hw_reg_write(ah, 0x00003210, 0x811c);</div><div class='del'>-		ath5k_hw_reg_write(ah, 0x00000052, 0x8108);</div><div class='del'>-		if (ah-&gt;ah_mac_srev &gt;= AR5K_SREV_VER_AR2413)</div><div class='del'>-			ath5k_hw_reg_write(ah, 0x00000004, 0x8120);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Disable beacons and reset the register</div><div class='del'>-	 */</div><div class='del'>-	AR5K_REG_DISABLE_BITS(ah, AR5K_BEACON, AR5K_BEACON_ENABLE |</div><div class='del'>-			AR5K_BEACON_RESET_TSF);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Reset chipset</div><div class='del'>- */</div><div class='del'>-static int ath5k_hw_nic_reset(struct ath5k_hw *ah, u32 val)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	u32 mask = val ? val : ~0U;</div><div class='del'>-</div><div class='del'>-	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='del'>-</div><div class='del'>-	/* Read-and-clear RX Descriptor Pointer*/</div><div class='del'>-	ath5k_hw_reg_read(ah, AR5K_RXDP);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Reset the device and wait until success</div><div class='del'>-	 */</div><div class='del'>-	ath5k_hw_reg_write(ah, val, AR5K_RESET_CTL);</div><div class='del'>-</div><div class='del'>-	/* Wait at least 128 PCI clocks */</div><div class='del'>-	udelay(15);</div><div class='del'>-</div><div class='del'>-	if (ah-&gt;ah_version == AR5K_AR5210) {</div><div class='del'>-		val &amp;= AR5K_RESET_CTL_CHIP;</div><div class='del'>-		mask &amp;= AR5K_RESET_CTL_CHIP;</div><div class='del'>-	} else {</div><div class='del'>-		val &amp;= AR5K_RESET_CTL_PCU | AR5K_RESET_CTL_BASEBAND;</div><div class='del'>-		mask &amp;= AR5K_RESET_CTL_PCU | AR5K_RESET_CTL_BASEBAND;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = ath5k_hw_register_timeout(ah, AR5K_RESET_CTL, mask, val, false);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Reset configuration register (for hw byte-swap). Note that this</div><div class='del'>-	 * is only set for big endian. We do the necessary magic in</div><div class='del'>-	 * AR5K_INIT_CFG.</div><div class='del'>-	 */</div><div class='del'>-	if ((val &amp; AR5K_RESET_CTL_PCU) == 0)</div><div class='del'>-		ath5k_hw_reg_write(ah, AR5K_INIT_CFG, AR5K_CFG);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Power management functions</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Sleep control</div><div class='del'>- */</div><div class='del'>-int ath5k_hw_set_power(struct ath5k_hw *ah, enum ath5k_power_mode mode,</div><div class='del'>-		bool set_chip, u16 sleep_duration)</div><div class='del'>-{</div><div class='del'>-	unsigned int i;</div><div class='del'>-	u32 staid, data;</div><div class='del'>-</div><div class='del'>-	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='del'>-	staid = ath5k_hw_reg_read(ah, AR5K_STA_ID1);</div><div class='del'>-</div><div class='del'>-	switch (mode) {</div><div class='del'>-	case AR5K_PM_AUTO:</div><div class='del'>-		staid &amp;= ~AR5K_STA_ID1_DEFAULT_ANTENNA;</div><div class='del'>-		/* fallthrough */</div><div class='del'>-	case AR5K_PM_NETWORK_SLEEP:</div><div class='del'>-		if (set_chip)</div><div class='del'>-			ath5k_hw_reg_write(ah,</div><div class='del'>-				AR5K_SLEEP_CTL_SLE_ALLOW |</div><div class='del'>-				sleep_duration,</div><div class='del'>-				AR5K_SLEEP_CTL);</div><div class='del'>-</div><div class='del'>-		staid |= AR5K_STA_ID1_PWR_SV;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case AR5K_PM_FULL_SLEEP:</div><div class='del'>-		if (set_chip)</div><div class='del'>-			ath5k_hw_reg_write(ah, AR5K_SLEEP_CTL_SLE_SLP,</div><div class='del'>-				AR5K_SLEEP_CTL);</div><div class='del'>-</div><div class='del'>-		staid |= AR5K_STA_ID1_PWR_SV;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case AR5K_PM_AWAKE:</div><div class='del'>-</div><div class='del'>-		staid &amp;= ~AR5K_STA_ID1_PWR_SV;</div><div class='del'>-</div><div class='del'>-		if (!set_chip)</div><div class='del'>-			goto commit;</div><div class='del'>-</div><div class='del'>-		/* Preserve sleep duration */</div><div class='del'>-		data = ath5k_hw_reg_read(ah, AR5K_SLEEP_CTL);</div><div class='del'>-		if( data &amp; 0xffc00000 ){</div><div class='del'>-			data = 0;</div><div class='del'>-		} else {</div><div class='del'>-			data = data &amp; 0xfffcffff;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ath5k_hw_reg_write(ah, data, AR5K_SLEEP_CTL);</div><div class='del'>-		udelay(15);</div><div class='del'>-</div><div class='del'>-		for (i = 50; i &gt; 0; i--) {</div><div class='del'>-			/* Check if the chip did wake up */</div><div class='del'>-			if ((ath5k_hw_reg_read(ah, AR5K_PCICFG) &amp;</div><div class='del'>-					AR5K_PCICFG_SPWR_DN) == 0)</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			/* Wait a bit and retry */</div><div class='del'>-			udelay(200);</div><div class='del'>-			ath5k_hw_reg_write(ah, data, AR5K_SLEEP_CTL);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Fail if the chip didn't wake up */</div><div class='del'>-		if (i &lt;= 0)</div><div class='del'>-			return -EIO;</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-commit:</div><div class='del'>-	ah-&gt;ah_power_mode = mode;</div><div class='del'>-	ath5k_hw_reg_write(ah, staid, AR5K_STA_ID1);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/***********************\</div><div class='del'>-  DMA Related Functions</div><div class='del'>-\***********************/</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Receive functions</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Start DMA receive</div><div class='del'>- */</div><div class='del'>-void ath5k_hw_start_rx(struct ath5k_hw *ah)</div><div class='del'>-{</div><div class='del'>-	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='del'>-	ath5k_hw_reg_write(ah, AR5K_CR_RXE, AR5K_CR);</div><div class='del'>-	ath5k_hw_reg_read(ah, AR5K_CR);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Stop DMA receive</div><div class='del'>- */</div><div class='del'>-int ath5k_hw_stop_rx_dma(struct ath5k_hw *ah)</div><div class='del'>-{</div><div class='del'>-	unsigned int i;</div><div class='del'>-</div><div class='del'>-	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='del'>-	ath5k_hw_reg_write(ah, AR5K_CR_RXD, AR5K_CR);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * It may take some time to disable the DMA receive unit</div><div class='del'>-	 */</div><div class='del'>-	for (i = 2000; i &gt; 0 &amp;&amp;</div><div class='del'>-			(ath5k_hw_reg_read(ah, AR5K_CR) &amp; AR5K_CR_RXE) != 0;</div><div class='del'>-			i--)</div><div class='del'>-		udelay(10);</div><div class='del'>-</div><div class='del'>-	return i ? 0 : -EBUSY;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Get the address of the RX Descriptor</div><div class='del'>- */</div><div class='del'>-u32 ath5k_hw_get_rx_buf(struct ath5k_hw *ah)</div><div class='del'>-{</div><div class='del'>-	return ath5k_hw_reg_read(ah, AR5K_RXDP);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Set the address of the RX Descriptor</div><div class='del'>- */</div><div class='del'>-void ath5k_hw_put_rx_buf(struct ath5k_hw *ah, u32 phys_addr)</div><div class='del'>-{</div><div class='del'>-	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='del'>-</div><div class='del'>-	/*TODO:Shouldn't we check if RX is enabled first ?*/</div><div class='del'>-	ath5k_hw_reg_write(ah, phys_addr, AR5K_RXDP);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Transmit functions</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Start DMA transmit for a specific queue</div><div class='del'>- * (see also QCU/DCU functions)</div><div class='del'>- */</div><div class='del'>-int ath5k_hw_tx_start(struct ath5k_hw *ah, unsigned int queue)</div><div class='del'>-{</div><div class='del'>-	u32 tx_queue;</div><div class='del'>-</div><div class='del'>-	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='del'>-	AR5K_ASSERT_ENTRY(queue, ah-&gt;ah_capabilities.cap_queues.q_tx_num);</div><div class='del'>-</div><div class='del'>-	/* Return if queue is declared inactive */</div><div class='del'>-	if (ah-&gt;ah_txq[queue].tqi_type == AR5K_TX_QUEUE_INACTIVE)</div><div class='del'>-		return -EIO;</div><div class='del'>-</div><div class='del'>-	if (ah-&gt;ah_version == AR5K_AR5210) {</div><div class='del'>-		tx_queue = ath5k_hw_reg_read(ah, AR5K_CR);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Set the queue by type on 5210</div><div class='del'>-		 */</div><div class='del'>-		switch (ah-&gt;ah_txq[queue].tqi_type) {</div><div class='del'>-		case AR5K_TX_QUEUE_DATA:</div><div class='del'>-			tx_queue |= AR5K_CR_TXE0 &amp; ~AR5K_CR_TXD0;</div><div class='del'>-			break;</div><div class='del'>-		case AR5K_TX_QUEUE_BEACON:</div><div class='del'>-			tx_queue |= AR5K_CR_TXE1 &amp; ~AR5K_CR_TXD1;</div><div class='del'>-			ath5k_hw_reg_write(ah, AR5K_BCR_TQ1V | AR5K_BCR_BDMAE,</div><div class='del'>-					AR5K_BSR);</div><div class='del'>-			break;</div><div class='del'>-		case AR5K_TX_QUEUE_CAB:</div><div class='del'>-			tx_queue |= AR5K_CR_TXE1 &amp; ~AR5K_CR_TXD1;</div><div class='del'>-			ath5k_hw_reg_write(ah, AR5K_BCR_TQ1FV | AR5K_BCR_TQ1V |</div><div class='del'>-				AR5K_BCR_BDMAE, AR5K_BSR);</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-		/* Start queue */</div><div class='del'>-		ath5k_hw_reg_write(ah, tx_queue, AR5K_CR);</div><div class='del'>-		ath5k_hw_reg_read(ah, AR5K_CR);</div><div class='del'>-	} else {</div><div class='del'>-		/* Return if queue is disabled */</div><div class='del'>-		if (AR5K_REG_READ_Q(ah, AR5K_QCU_TXD, queue))</div><div class='del'>-			return -EIO;</div><div class='del'>-</div><div class='del'>-		/* Start queue */</div><div class='del'>-		AR5K_REG_WRITE_Q(ah, AR5K_QCU_TXE, queue);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Stop DMA transmit for a specific queue</div><div class='del'>- * (see also QCU/DCU functions)</div><div class='del'>- */</div><div class='del'>-int ath5k_hw_stop_tx_dma(struct ath5k_hw *ah, unsigned int queue)</div><div class='del'>-{</div><div class='del'>-	unsigned int i = 100;</div><div class='del'>-	u32 tx_queue, pending;</div><div class='del'>-</div><div class='del'>-	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='del'>-	AR5K_ASSERT_ENTRY(queue, ah-&gt;ah_capabilities.cap_queues.q_tx_num);</div><div class='del'>-</div><div class='del'>-	/* Return if queue is declared inactive */</div><div class='del'>-	if (ah-&gt;ah_txq[queue].tqi_type == AR5K_TX_QUEUE_INACTIVE)</div><div class='del'>-		return -EIO;</div><div class='del'>-</div><div class='del'>-	if (ah-&gt;ah_version == AR5K_AR5210) {</div><div class='del'>-		tx_queue = ath5k_hw_reg_read(ah, AR5K_CR);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Set by queue type</div><div class='del'>-		 */</div><div class='del'>-		switch (ah-&gt;ah_txq[queue].tqi_type) {</div><div class='del'>-		case AR5K_TX_QUEUE_DATA:</div><div class='del'>-			tx_queue |= AR5K_CR_TXD0 &amp; ~AR5K_CR_TXE0;</div><div class='del'>-			break;</div><div class='del'>-		case AR5K_TX_QUEUE_BEACON:</div><div class='del'>-		case AR5K_TX_QUEUE_CAB:</div><div class='del'>-			/* XXX Fix me... */</div><div class='del'>-			tx_queue |= AR5K_CR_TXD1 &amp; ~AR5K_CR_TXD1;</div><div class='del'>-			ath5k_hw_reg_write(ah, 0, AR5K_BSR);</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Stop queue */</div><div class='del'>-		ath5k_hw_reg_write(ah, tx_queue, AR5K_CR);</div><div class='del'>-		ath5k_hw_reg_read(ah, AR5K_CR);</div><div class='del'>-	} else {</div><div class='del'>-		/*</div><div class='del'>-		 * Schedule TX disable and wait until queue is empty</div><div class='del'>-		 */</div><div class='del'>-		AR5K_REG_WRITE_Q(ah, AR5K_QCU_TXD, queue);</div><div class='del'>-</div><div class='del'>-		/*Check for pending frames*/</div><div class='del'>-		do {</div><div class='del'>-			pending = ath5k_hw_reg_read(ah,</div><div class='del'>-				AR5K_QUEUE_STATUS(queue)) &amp;</div><div class='del'>-				AR5K_QCU_STS_FRMPENDCNT;</div><div class='del'>-			udelay(100);</div><div class='del'>-		} while (--i &amp;&amp; pending);</div><div class='del'>-</div><div class='del'>-		/* Clear register */</div><div class='del'>-		ath5k_hw_reg_write(ah, 0, AR5K_QCU_TXD);</div><div class='del'>-		if (pending)</div><div class='del'>-			return -EBUSY;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* TODO: Check for success else return error */</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Get the address of the TX Descriptor for a specific queue</div><div class='del'>- * (see also QCU/DCU functions)</div><div class='del'>- */</div><div class='del'>-u32 ath5k_hw_get_tx_buf(struct ath5k_hw *ah, unsigned int queue)</div><div class='del'>-{</div><div class='del'>-	u16 tx_reg;</div><div class='del'>-</div><div class='del'>-	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='del'>-	AR5K_ASSERT_ENTRY(queue, ah-&gt;ah_capabilities.cap_queues.q_tx_num);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Get the transmit queue descriptor pointer from the selected queue</div><div class='del'>-	 */</div><div class='del'>-	/*5210 doesn't have QCU*/</div><div class='del'>-	if (ah-&gt;ah_version == AR5K_AR5210) {</div><div class='del'>-		switch (ah-&gt;ah_txq[queue].tqi_type) {</div><div class='del'>-		case AR5K_TX_QUEUE_DATA:</div><div class='del'>-			tx_reg = AR5K_NOQCU_TXDP0;</div><div class='del'>-			break;</div><div class='del'>-		case AR5K_TX_QUEUE_BEACON:</div><div class='del'>-		case AR5K_TX_QUEUE_CAB:</div><div class='del'>-			tx_reg = AR5K_NOQCU_TXDP1;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			return 0xffffffff;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		tx_reg = AR5K_QUEUE_TXDP(queue);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ath5k_hw_reg_read(ah, tx_reg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Set the address of the TX Descriptor for a specific queue</div><div class='del'>- * (see also QCU/DCU functions)</div><div class='del'>- */</div><div class='del'>-int ath5k_hw_put_tx_buf(struct ath5k_hw *ah, unsigned int queue, u32 phys_addr)</div><div class='del'>-{</div><div class='del'>-	u16 tx_reg;</div><div class='del'>-</div><div class='del'>-	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='del'>-	AR5K_ASSERT_ENTRY(queue, ah-&gt;ah_capabilities.cap_queues.q_tx_num);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Set the transmit queue descriptor pointer register by type</div><div class='del'>-	 * on 5210</div><div class='del'>-	 */</div><div class='del'>-	if (ah-&gt;ah_version == AR5K_AR5210) {</div><div class='del'>-		switch (ah-&gt;ah_txq[queue].tqi_type) {</div><div class='del'>-		case AR5K_TX_QUEUE_DATA:</div><div class='del'>-			tx_reg = AR5K_NOQCU_TXDP0;</div><div class='del'>-			break;</div><div class='del'>-		case AR5K_TX_QUEUE_BEACON:</div><div class='del'>-		case AR5K_TX_QUEUE_CAB:</div><div class='del'>-			tx_reg = AR5K_NOQCU_TXDP1;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		/*</div><div class='del'>-		 * Set the transmit queue descriptor pointer for</div><div class='del'>-		 * the selected queue on QCU for 5211+</div><div class='del'>-		 * (this won't work if the queue is still active)</div><div class='del'>-		 */</div><div class='del'>-		if (AR5K_REG_READ_Q(ah, AR5K_QCU_TXE, queue))</div><div class='del'>-			return -EIO;</div><div class='del'>-</div><div class='del'>-		tx_reg = AR5K_QUEUE_TXDP(queue);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Set descriptor pointer */</div><div class='del'>-	ath5k_hw_reg_write(ah, phys_addr, tx_reg);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Update tx trigger level</div><div class='del'>- */</div><div class='del'>-int ath5k_hw_update_tx_triglevel(struct ath5k_hw *ah, bool increase)</div><div class='del'>-{</div><div class='del'>-	u32 trigger_level, imr;</div><div class='del'>-	int ret = -EIO;</div><div class='del'>-</div><div class='del'>-	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Disable interrupts by setting the mask</div><div class='del'>-	 */</div><div class='del'>-	imr = ath5k_hw_set_intr(ah, ah-&gt;ah_imr &amp; ~AR5K_INT_GLOBAL);</div><div class='del'>-</div><div class='del'>-	/*TODO: Boundary check on trigger_level*/</div><div class='del'>-	trigger_level = AR5K_REG_MS(ath5k_hw_reg_read(ah, AR5K_TXCFG),</div><div class='del'>-			AR5K_TXCFG_TXFULL);</div><div class='del'>-</div><div class='del'>-	if (!increase) {</div><div class='del'>-		if (--trigger_level &lt; AR5K_TUNE_MIN_TX_FIFO_THRES)</div><div class='del'>-			goto done;</div><div class='del'>-	} else</div><div class='del'>-		trigger_level +=</div><div class='del'>-			((AR5K_TUNE_MAX_TX_FIFO_THRES - trigger_level) / 2);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Update trigger level on success</div><div class='del'>-	 */</div><div class='del'>-	if (ah-&gt;ah_version == AR5K_AR5210)</div><div class='del'>-		ath5k_hw_reg_write(ah, trigger_level, AR5K_TRIG_LVL);</div><div class='del'>-	else</div><div class='del'>-		AR5K_REG_WRITE_BITS(ah, AR5K_TXCFG,</div><div class='del'>-				AR5K_TXCFG_TXFULL, trigger_level);</div><div class='del'>-</div><div class='del'>-	ret = 0;</div><div class='del'>-</div><div class='del'>-done:</div><div class='del'>-	/*</div><div class='del'>-	 * Restore interrupt mask</div><div class='del'>-	 */</div><div class='del'>-	ath5k_hw_set_intr(ah, imr);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Interrupt handling</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Check if we have pending interrupts</div><div class='del'>- */</div><div class='del'>-bool ath5k_hw_is_intr_pending(struct ath5k_hw *ah)</div><div class='del'>-{</div><div class='del'>-	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='del'>-	return ath5k_hw_reg_read(ah, AR5K_INTPEND);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Get interrupt mask (ISR)</div><div class='del'>- */</div><div class='del'>-int ath5k_hw_get_isr(struct ath5k_hw *ah, enum ath5k_int *interrupt_mask)</div><div class='del'>-{</div><div class='del'>-	u32 data;</div><div class='del'>-</div><div class='del'>-	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Read interrupt status from the Interrupt Status register</div><div class='del'>-	 * on 5210</div><div class='del'>-	 */</div><div class='del'>-	if (ah-&gt;ah_version == AR5K_AR5210) {</div><div class='del'>-		data = ath5k_hw_reg_read(ah, AR5K_ISR);</div><div class='del'>-		if (unlikely(data == AR5K_INT_NOCARD)) {</div><div class='del'>-			*interrupt_mask = data;</div><div class='del'>-			return -ENODEV;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		/*</div><div class='del'>-		 * Read interrupt status from the Read-And-Clear shadow register</div><div class='del'>-		 * Note: PISR/SISR Not available on 5210</div><div class='del'>-		 */</div><div class='del'>-		data = ath5k_hw_reg_read(ah, AR5K_RAC_PISR);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Get abstract interrupt mask (driver-compatible)</div><div class='del'>-	 */</div><div class='del'>-	*interrupt_mask = (data &amp; AR5K_INT_COMMON) &amp; ah-&gt;ah_imr;</div><div class='del'>-</div><div class='del'>-	if (unlikely(data == AR5K_INT_NOCARD))</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	if (data &amp; (AR5K_ISR_RXOK | AR5K_ISR_RXERR))</div><div class='del'>-		*interrupt_mask |= AR5K_INT_RX;</div><div class='del'>-</div><div class='del'>-	if (data &amp; (AR5K_ISR_TXOK | AR5K_ISR_TXERR</div><div class='del'>-		| AR5K_ISR_TXDESC | AR5K_ISR_TXEOL))</div><div class='del'>-		*interrupt_mask |= AR5K_INT_TX;</div><div class='del'>-</div><div class='del'>-	if (ah-&gt;ah_version != AR5K_AR5210) {</div><div class='del'>-		/*HIU = Host Interface Unit (PCI etc)*/</div><div class='del'>-		if (unlikely(data &amp; (AR5K_ISR_HIUERR)))</div><div class='del'>-			*interrupt_mask |= AR5K_INT_FATAL;</div><div class='del'>-</div><div class='del'>-		/*Beacon Not Ready*/</div><div class='del'>-		if (unlikely(data &amp; (AR5K_ISR_BNR)))</div><div class='del'>-			*interrupt_mask |= AR5K_INT_BNR;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * XXX: BMISS interrupts may occur after association.</div><div class='del'>-	 * I found this on 5210 code but it needs testing. If this is</div><div class='del'>-	 * true we should disable them before assoc and re-enable them</div><div class='del'>-	 * after a successfull assoc + some jiffies.</div><div class='del'>-	 */</div><div class='del'>-#if 0</div><div class='del'>-	interrupt_mask &amp;= ~AR5K_INT_BMISS;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * In case we didn't handle anything,</div><div class='del'>-	 * print the register value.</div><div class='del'>-	 */</div><div class='del'>-	if (unlikely(*interrupt_mask == 0 &amp;&amp; net_ratelimit()))</div><div class='del'>-		ATH5K_PRINTF("0x%08x\n", data);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Set interrupt mask</div><div class='del'>- */</div><div class='del'>-enum ath5k_int ath5k_hw_set_intr(struct ath5k_hw *ah, enum ath5k_int new_mask)</div><div class='del'>-{</div><div class='del'>-	enum ath5k_int old_mask, int_mask;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Disable card interrupts to prevent any race conditions</div><div class='del'>-	 * (they will be re-enabled afterwards).</div><div class='del'>-	 */</div><div class='del'>-	ath5k_hw_reg_write(ah, AR5K_IER_DISABLE, AR5K_IER);</div><div class='del'>-	ath5k_hw_reg_read(ah, AR5K_IER);</div><div class='del'>-</div><div class='del'>-	old_mask = ah-&gt;ah_imr;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Add additional, chipset-dependent interrupt mask flags</div><div class='del'>-	 * and write them to the IMR (interrupt mask register).</div><div class='del'>-	 */</div><div class='del'>-	int_mask = new_mask &amp; AR5K_INT_COMMON;</div><div class='del'>-</div><div class='del'>-	if (new_mask &amp; AR5K_INT_RX)</div><div class='del'>-		int_mask |= AR5K_IMR_RXOK | AR5K_IMR_RXERR | AR5K_IMR_RXORN |</div><div class='del'>-			AR5K_IMR_RXDESC;</div><div class='del'>-</div><div class='del'>-	if (new_mask &amp; AR5K_INT_TX)</div><div class='del'>-		int_mask |= AR5K_IMR_TXOK | AR5K_IMR_TXERR | AR5K_IMR_TXDESC |</div><div class='del'>-			AR5K_IMR_TXURN;</div><div class='del'>-</div><div class='del'>-	if (ah-&gt;ah_version != AR5K_AR5210) {</div><div class='del'>-		if (new_mask &amp; AR5K_INT_FATAL) {</div><div class='del'>-			int_mask |= AR5K_IMR_HIUERR;</div><div class='del'>-			AR5K_REG_ENABLE_BITS(ah, AR5K_SIMR2, AR5K_SIMR2_MCABT |</div><div class='del'>-					AR5K_SIMR2_SSERR | AR5K_SIMR2_DPERR);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ath5k_hw_reg_write(ah, int_mask, AR5K_PIMR);</div><div class='del'>-</div><div class='del'>-	/* Store new interrupt mask */</div><div class='del'>-	ah-&gt;ah_imr = new_mask;</div><div class='del'>-</div><div class='del'>-	/* ..re-enable interrupts */</div><div class='del'>-	ath5k_hw_reg_write(ah, AR5K_IER_ENABLE, AR5K_IER);</div><div class='del'>-	ath5k_hw_reg_read(ah, AR5K_IER);</div><div class='del'>-</div><div class='del'>-	return old_mask;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*************************\</div><div class='del'>-  EEPROM access functions</div><div class='del'>-\*************************/</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Read from eeprom</div><div class='del'>- */</div><div class='del'>-static int ath5k_hw_eeprom_read(struct ath5k_hw *ah, u32 offset, u16 *data)</div><div class='del'>-{</div><div class='del'>-	u32 status, timeout;</div><div class='del'>-</div><div class='del'>-	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='del'>-	/*</div><div class='del'>-	 * Initialize EEPROM access</div><div class='del'>-	 */</div><div class='del'>-	if (ah-&gt;ah_version == AR5K_AR5210) {</div><div class='del'>-		AR5K_REG_ENABLE_BITS(ah, AR5K_PCICFG, AR5K_PCICFG_EEAE);</div><div class='del'>-		(void)ath5k_hw_reg_read(ah, AR5K_EEPROM_BASE + (4 * offset));</div><div class='del'>-	} else {</div><div class='del'>-		ath5k_hw_reg_write(ah, offset, AR5K_EEPROM_BASE);</div><div class='del'>-		AR5K_REG_ENABLE_BITS(ah, AR5K_EEPROM_CMD,</div><div class='del'>-				AR5K_EEPROM_CMD_READ);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (timeout = AR5K_TUNE_REGISTER_TIMEOUT; timeout &gt; 0; timeout--) {</div><div class='del'>-		status = ath5k_hw_reg_read(ah, AR5K_EEPROM_STATUS);</div><div class='del'>-		if (status &amp; AR5K_EEPROM_STAT_RDDONE) {</div><div class='del'>-			if (status &amp; AR5K_EEPROM_STAT_RDERR)</div><div class='del'>-				return -EIO;</div><div class='del'>-			*data = (u16)(ath5k_hw_reg_read(ah, AR5K_EEPROM_DATA) &amp;</div><div class='del'>-					0xffff);</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-		udelay(15);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return -ETIMEDOUT;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Write to eeprom - currently disabled, use at your own risk</div><div class='del'>- */</div><div class='del'>-#if 0</div><div class='del'>-static int ath5k_hw_eeprom_write(struct ath5k_hw *ah, u32 offset, u16 data)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	u32 status, timeout;</div><div class='del'>-</div><div class='del'>-	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Initialize eeprom access</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (ah-&gt;ah_version == AR5K_AR5210) {</div><div class='del'>-		AR5K_REG_ENABLE_BITS(ah, AR5K_PCICFG, AR5K_PCICFG_EEAE);</div><div class='del'>-	} else {</div><div class='del'>-		AR5K_REG_ENABLE_BITS(ah, AR5K_EEPROM_CMD,</div><div class='del'>-				AR5K_EEPROM_CMD_RESET);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Write data to data register</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (ah-&gt;ah_version == AR5K_AR5210) {</div><div class='del'>-		ath5k_hw_reg_write(ah, data, AR5K_EEPROM_BASE + (4 * offset));</div><div class='del'>-	} else {</div><div class='del'>-		ath5k_hw_reg_write(ah, offset, AR5K_EEPROM_BASE);</div><div class='del'>-		ath5k_hw_reg_write(ah, data, AR5K_EEPROM_DATA);</div><div class='del'>-		AR5K_REG_ENABLE_BITS(ah, AR5K_EEPROM_CMD,</div><div class='del'>-				AR5K_EEPROM_CMD_WRITE);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Check status</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	for (timeout = AR5K_TUNE_REGISTER_TIMEOUT; timeout &gt; 0; timeout--) {</div><div class='del'>-		status = ath5k_hw_reg_read(ah, AR5K_EEPROM_STATUS);</div><div class='del'>-		if (status &amp; AR5K_EEPROM_STAT_WRDONE) {</div><div class='del'>-			if (status &amp; AR5K_EEPROM_STAT_WRERR)</div><div class='del'>-				return EIO;</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-		udelay(15);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ATH5K_ERR(ah-&gt;ah_sc, "EEPROM Write is disabled!");</div><div class='del'>-	return -EIO;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Translate binary channel representation in EEPROM to frequency</div><div class='del'>- */</div><div class='del'>-static u16 ath5k_eeprom_bin2freq(struct ath5k_hw *ah, u16 bin, unsigned int mode)</div><div class='del'>-{</div><div class='del'>-	u16 val;</div><div class='del'>-</div><div class='del'>-	if (bin == AR5K_EEPROM_CHANNEL_DIS)</div><div class='del'>-		return bin;</div><div class='del'>-</div><div class='del'>-	if (mode == AR5K_EEPROM_MODE_11A) {</div><div class='del'>-		if (ah-&gt;ah_ee_version &gt; AR5K_EEPROM_VERSION_3_2)</div><div class='del'>-			val = (5 * bin) + 4800;</div><div class='del'>-		else</div><div class='del'>-			val = bin &gt; 62 ? (10 * 62) + (5 * (bin - 62)) + 5100 :</div><div class='del'>-				(bin * 10) + 5100;</div><div class='del'>-	} else {</div><div class='del'>-		if (ah-&gt;ah_ee_version &gt; AR5K_EEPROM_VERSION_3_2)</div><div class='del'>-			val = bin + 2300;</div><div class='del'>-		else</div><div class='del'>-			val = bin + 2400;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Read antenna infos from eeprom</div><div class='del'>- */</div><div class='del'>-static int ath5k_eeprom_read_ants(struct ath5k_hw *ah, u32 *offset,</div><div class='del'>-		unsigned int mode)</div><div class='del'>-{</div><div class='del'>-	struct ath5k_eeprom_info *ee = &amp;ah-&gt;ah_capabilities.cap_eeprom;</div><div class='del'>-	u32 o = *offset;</div><div class='del'>-	u16 val;</div><div class='del'>-	int ret, i = 0;</div><div class='del'>-</div><div class='del'>-	AR5K_EEPROM_READ(o++, val);</div><div class='del'>-	ee-&gt;ee_switch_settling[mode]	= (val &gt;&gt; 8) &amp; 0x7f;</div><div class='del'>-	ee-&gt;ee_ant_tx_rx[mode]		= (val &gt;&gt; 2) &amp; 0x3f;</div><div class='del'>-	ee-&gt;ee_ant_control[mode][i]	= (val &lt;&lt; 4) &amp; 0x3f;</div><div class='del'>-</div><div class='del'>-	AR5K_EEPROM_READ(o++, val);</div><div class='del'>-	ee-&gt;ee_ant_control[mode][i++]	|= (val &gt;&gt; 12) &amp; 0xf;</div><div class='del'>-	ee-&gt;ee_ant_control[mode][i++]	= (val &gt;&gt; 6) &amp; 0x3f;</div><div class='del'>-	ee-&gt;ee_ant_control[mode][i++]	= val &amp; 0x3f;</div><div class='del'>-</div><div class='del'>-	AR5K_EEPROM_READ(o++, val);</div><div class='del'>-	ee-&gt;ee_ant_control[mode][i++]	= (val &gt;&gt; 10) &amp; 0x3f;</div><div class='del'>-	ee-&gt;ee_ant_control[mode][i++]	= (val &gt;&gt; 4) &amp; 0x3f;</div><div class='del'>-	ee-&gt;ee_ant_control[mode][i]	= (val &lt;&lt; 2) &amp; 0x3f;</div><div class='del'>-</div><div class='del'>-	AR5K_EEPROM_READ(o++, val);</div><div class='del'>-	ee-&gt;ee_ant_control[mode][i++]	|= (val &gt;&gt; 14) &amp; 0x3;</div><div class='del'>-	ee-&gt;ee_ant_control[mode][i++]	= (val &gt;&gt; 8) &amp; 0x3f;</div><div class='del'>-	ee-&gt;ee_ant_control[mode][i++]	= (val &gt;&gt; 2) &amp; 0x3f;</div><div class='del'>-	ee-&gt;ee_ant_control[mode][i]	= (val &lt;&lt; 4) &amp; 0x3f;</div><div class='del'>-</div><div class='del'>-	AR5K_EEPROM_READ(o++, val);</div><div class='del'>-	ee-&gt;ee_ant_control[mode][i++]	|= (val &gt;&gt; 12) &amp; 0xf;</div><div class='del'>-	ee-&gt;ee_ant_control[mode][i++]	= (val &gt;&gt; 6) &amp; 0x3f;</div><div class='del'>-	ee-&gt;ee_ant_control[mode][i++]	= val &amp; 0x3f;</div><div class='del'>-</div><div class='del'>-	/* Get antenna modes */</div><div class='del'>-	ah-&gt;ah_antenna[mode][0] =</div><div class='del'>-	    (ee-&gt;ee_ant_control[mode][0] &lt;&lt; 4) | 0x1;</div><div class='del'>-	ah-&gt;ah_antenna[mode][AR5K_ANT_FIXED_A] =</div><div class='del'>-	     ee-&gt;ee_ant_control[mode][1] 	|</div><div class='del'>-	    (ee-&gt;ee_ant_control[mode][2] &lt;&lt; 6) 	|</div><div class='del'>-	    (ee-&gt;ee_ant_control[mode][3] &lt;&lt; 12) |</div><div class='del'>-	    (ee-&gt;ee_ant_control[mode][4] &lt;&lt; 18) |</div><div class='del'>-	    (ee-&gt;ee_ant_control[mode][5] &lt;&lt; 24);</div><div class='del'>-	ah-&gt;ah_antenna[mode][AR5K_ANT_FIXED_B] =</div><div class='del'>-	     ee-&gt;ee_ant_control[mode][6] 	|</div><div class='del'>-	    (ee-&gt;ee_ant_control[mode][7] &lt;&lt; 6) 	|</div><div class='del'>-	    (ee-&gt;ee_ant_control[mode][8] &lt;&lt; 12) |</div><div class='del'>-	    (ee-&gt;ee_ant_control[mode][9] &lt;&lt; 18) |</div><div class='del'>-	    (ee-&gt;ee_ant_control[mode][10] &lt;&lt; 24);</div><div class='del'>-</div><div class='del'>-	/* return new offset */</div><div class='del'>-	*offset = o;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Read supported modes from eeprom</div><div class='del'>- */</div><div class='del'>-static int ath5k_eeprom_read_modes(struct ath5k_hw *ah, u32 *offset,</div><div class='del'>-		unsigned int mode)</div><div class='del'>-{</div><div class='del'>-	struct ath5k_eeprom_info *ee = &amp;ah-&gt;ah_capabilities.cap_eeprom;</div><div class='del'>-	u32 o = *offset;</div><div class='del'>-	u16 val;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	AR5K_EEPROM_READ(o++, val);</div><div class='del'>-	ee-&gt;ee_tx_end2xlna_enable[mode]	= (val &gt;&gt; 8) &amp; 0xff;</div><div class='del'>-	ee-&gt;ee_thr_62[mode]		= val &amp; 0xff;</div><div class='del'>-</div><div class='del'>-	if (ah-&gt;ah_ee_version &lt;= AR5K_EEPROM_VERSION_3_2)</div><div class='del'>-		ee-&gt;ee_thr_62[mode] = mode == AR5K_EEPROM_MODE_11A ? 15 : 28;</div><div class='del'>-</div><div class='del'>-	AR5K_EEPROM_READ(o++, val);</div><div class='del'>-	ee-&gt;ee_tx_end2xpa_disable[mode]	= (val &gt;&gt; 8) &amp; 0xff;</div><div class='del'>-	ee-&gt;ee_tx_frm2xpa_enable[mode]	= val &amp; 0xff;</div><div class='del'>-</div><div class='del'>-	AR5K_EEPROM_READ(o++, val);</div><div class='del'>-	ee-&gt;ee_pga_desired_size[mode]	= (val &gt;&gt; 8) &amp; 0xff;</div><div class='del'>-</div><div class='del'>-	if ((val &amp; 0xff) &amp; 0x80)</div><div class='del'>-		ee-&gt;ee_noise_floor_thr[mode] = -((((val &amp; 0xff) ^ 0xff)) + 1);</div><div class='del'>-	else</div><div class='del'>-		ee-&gt;ee_noise_floor_thr[mode] = val &amp; 0xff;</div><div class='del'>-</div><div class='del'>-	if (ah-&gt;ah_ee_version &lt;= AR5K_EEPROM_VERSION_3_2)</div><div class='del'>-		ee-&gt;ee_noise_floor_thr[mode] =</div><div class='del'>-		    mode == AR5K_EEPROM_MODE_11A ? -54 : -1;</div><div class='del'>-</div><div class='del'>-	AR5K_EEPROM_READ(o++, val);</div><div class='del'>-	ee-&gt;ee_xlna_gain[mode]		= (val &gt;&gt; 5) &amp; 0xff;</div><div class='del'>-	ee-&gt;ee_x_gain[mode]		= (val &gt;&gt; 1) &amp; 0xf;</div><div class='del'>-	ee-&gt;ee_xpd[mode]		= val &amp; 0x1;</div><div class='del'>-</div><div class='del'>-	if (ah-&gt;ah_ee_version &gt;= AR5K_EEPROM_VERSION_4_0)</div><div class='del'>-		ee-&gt;ee_fixed_bias[mode] = (val &gt;&gt; 13) &amp; 0x1;</div><div class='del'>-</div><div class='del'>-	if (ah-&gt;ah_ee_version &gt;= AR5K_EEPROM_VERSION_3_3) {</div><div class='del'>-		AR5K_EEPROM_READ(o++, val);</div><div class='del'>-		ee-&gt;ee_false_detect[mode] = (val &gt;&gt; 6) &amp; 0x7f;</div><div class='del'>-</div><div class='del'>-		if (mode == AR5K_EEPROM_MODE_11A)</div><div class='del'>-			ee-&gt;ee_xr_power[mode] = val &amp; 0x3f;</div><div class='del'>-		else {</div><div class='del'>-			ee-&gt;ee_ob[mode][0] = val &amp; 0x7;</div><div class='del'>-			ee-&gt;ee_db[mode][0] = (val &gt;&gt; 3) &amp; 0x7;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ah-&gt;ah_ee_version &lt; AR5K_EEPROM_VERSION_3_4) {</div><div class='del'>-		ee-&gt;ee_i_gain[mode] = AR5K_EEPROM_I_GAIN;</div><div class='del'>-		ee-&gt;ee_cck_ofdm_power_delta = AR5K_EEPROM_CCK_OFDM_DELTA;</div><div class='del'>-	} else {</div><div class='del'>-		ee-&gt;ee_i_gain[mode] = (val &gt;&gt; 13) &amp; 0x7;</div><div class='del'>-</div><div class='del'>-		AR5K_EEPROM_READ(o++, val);</div><div class='del'>-		ee-&gt;ee_i_gain[mode] |= (val &lt;&lt; 3) &amp; 0x38;</div><div class='del'>-</div><div class='del'>-		if (mode == AR5K_EEPROM_MODE_11G)</div><div class='del'>-			ee-&gt;ee_cck_ofdm_power_delta = (val &gt;&gt; 3) &amp; 0xff;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ah-&gt;ah_ee_version &gt;= AR5K_EEPROM_VERSION_4_0 &amp;&amp;</div><div class='del'>-			mode == AR5K_EEPROM_MODE_11A) {</div><div class='del'>-		ee-&gt;ee_i_cal[mode] = (val &gt;&gt; 8) &amp; 0x3f;</div><div class='del'>-		ee-&gt;ee_q_cal[mode] = (val &gt;&gt; 3) &amp; 0x1f;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ah-&gt;ah_ee_version &gt;= AR5K_EEPROM_VERSION_4_6 &amp;&amp;</div><div class='del'>-	    mode == AR5K_EEPROM_MODE_11G)</div><div class='del'>-		ee-&gt;ee_scaled_cck_delta = (val &gt;&gt; 11) &amp; 0x1f;</div><div class='del'>-</div><div class='del'>-	/* return new offset */</div><div class='del'>-	*offset = o;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Initialize eeprom &amp; capabilities structs</div><div class='del'>- */</div><div class='del'>-static int ath5k_eeprom_init(struct ath5k_hw *ah)</div><div class='del'>-{</div><div class='del'>-	struct ath5k_eeprom_info *ee = &amp;ah-&gt;ah_capabilities.cap_eeprom;</div><div class='del'>-	unsigned int mode, i;</div><div class='del'>-	int ret;</div><div class='del'>-	u32 offset;</div><div class='del'>-	u16 val;</div><div class='del'>-</div><div class='del'>-	/* Initial TX thermal adjustment values */</div><div class='del'>-	ee-&gt;ee_tx_clip = 4;</div><div class='del'>-	ee-&gt;ee_pwd_84 = ee-&gt;ee_pwd_90 = 1;</div><div class='del'>-	ee-&gt;ee_gain_select = 1;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Read values from EEPROM and store them in the capability structure</div><div class='del'>-	 */</div><div class='del'>-	AR5K_EEPROM_READ_HDR(AR5K_EEPROM_MAGIC, ee_magic);</div><div class='del'>-	AR5K_EEPROM_READ_HDR(AR5K_EEPROM_PROTECT, ee_protect);</div><div class='del'>-	AR5K_EEPROM_READ_HDR(AR5K_EEPROM_REG_DOMAIN, ee_regdomain);</div><div class='del'>-	AR5K_EEPROM_READ_HDR(AR5K_EEPROM_VERSION, ee_version);</div><div class='del'>-	AR5K_EEPROM_READ_HDR(AR5K_EEPROM_HDR, ee_header);</div><div class='del'>-</div><div class='del'>-	/* Return if we have an old EEPROM */</div><div class='del'>-	if (ah-&gt;ah_ee_version &lt; AR5K_EEPROM_VERSION_3_0)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-#ifdef notyet</div><div class='del'>-	/*</div><div class='del'>-	 * Validate the checksum of the EEPROM date. There are some</div><div class='del'>-	 * devices with invalid EEPROMs.</div><div class='del'>-	 */</div><div class='del'>-	for (cksum = 0, offset = 0; offset &lt; AR5K_EEPROM_INFO_MAX; offset++) {</div><div class='del'>-		AR5K_EEPROM_READ(AR5K_EEPROM_INFO(offset), val);</div><div class='del'>-		cksum ^= val;</div><div class='del'>-	}</div><div class='del'>-	if (cksum != AR5K_EEPROM_INFO_CKSUM) {</div><div class='del'>-		ATH5K_ERR(ah-&gt;ah_sc, "Invalid EEPROM checksum 0x%04x\n", cksum);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	AR5K_EEPROM_READ_HDR(AR5K_EEPROM_ANT_GAIN(ah-&gt;ah_ee_version),</div><div class='del'>-	    ee_ant_gain);</div><div class='del'>-</div><div class='del'>-	if (ah-&gt;ah_ee_version &gt;= AR5K_EEPROM_VERSION_4_0) {</div><div class='del'>-		AR5K_EEPROM_READ_HDR(AR5K_EEPROM_MISC0, ee_misc0);</div><div class='del'>-		AR5K_EEPROM_READ_HDR(AR5K_EEPROM_MISC1, ee_misc1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ah-&gt;ah_ee_version &lt; AR5K_EEPROM_VERSION_3_3) {</div><div class='del'>-		AR5K_EEPROM_READ(AR5K_EEPROM_OBDB0_2GHZ, val);</div><div class='del'>-		ee-&gt;ee_ob[AR5K_EEPROM_MODE_11B][0] = val &amp; 0x7;</div><div class='del'>-		ee-&gt;ee_db[AR5K_EEPROM_MODE_11B][0] = (val &gt;&gt; 3) &amp; 0x7;</div><div class='del'>-</div><div class='del'>-		AR5K_EEPROM_READ(AR5K_EEPROM_OBDB1_2GHZ, val);</div><div class='del'>-		ee-&gt;ee_ob[AR5K_EEPROM_MODE_11G][0] = val &amp; 0x7;</div><div class='del'>-		ee-&gt;ee_db[AR5K_EEPROM_MODE_11G][0] = (val &gt;&gt; 3) &amp; 0x7;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Get conformance test limit values</div><div class='del'>-	 */</div><div class='del'>-	offset = AR5K_EEPROM_CTL(ah-&gt;ah_ee_version);</div><div class='del'>-	ee-&gt;ee_ctls = AR5K_EEPROM_N_CTLS(ah-&gt;ah_ee_version);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ee-&gt;ee_ctls; i++) {</div><div class='del'>-		AR5K_EEPROM_READ(offset++, val);</div><div class='del'>-		ee-&gt;ee_ctl[i] = (val &gt;&gt; 8) &amp; 0xff;</div><div class='del'>-		ee-&gt;ee_ctl[i + 1] = val &amp; 0xff;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Get values for 802.11a (5GHz)</div><div class='del'>-	 */</div><div class='del'>-	mode = AR5K_EEPROM_MODE_11A;</div><div class='del'>-</div><div class='del'>-	ee-&gt;ee_turbo_max_power[mode] =</div><div class='del'>-			AR5K_EEPROM_HDR_T_5GHZ_DBM(ee-&gt;ee_header);</div><div class='del'>-</div><div class='del'>-	offset = AR5K_EEPROM_MODES_11A(ah-&gt;ah_ee_version);</div><div class='del'>-</div><div class='del'>-	ret = ath5k_eeprom_read_ants(ah, &amp;offset, mode);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	AR5K_EEPROM_READ(offset++, val);</div><div class='del'>-	ee-&gt;ee_adc_desired_size[mode]	= (s8)((val &gt;&gt; 8) &amp; 0xff);</div><div class='del'>-	ee-&gt;ee_ob[mode][3]		= (val &gt;&gt; 5) &amp; 0x7;</div><div class='del'>-	ee-&gt;ee_db[mode][3]		= (val &gt;&gt; 2) &amp; 0x7;</div><div class='del'>-	ee-&gt;ee_ob[mode][2]		= (val &lt;&lt; 1) &amp; 0x7;</div><div class='del'>-</div><div class='del'>-	AR5K_EEPROM_READ(offset++, val);</div><div class='del'>-	ee-&gt;ee_ob[mode][2]		|= (val &gt;&gt; 15) &amp; 0x1;</div><div class='del'>-	ee-&gt;ee_db[mode][2]		= (val &gt;&gt; 12) &amp; 0x7;</div><div class='del'>-	ee-&gt;ee_ob[mode][1]		= (val &gt;&gt; 9) &amp; 0x7;</div><div class='del'>-	ee-&gt;ee_db[mode][1]		= (val &gt;&gt; 6) &amp; 0x7;</div><div class='del'>-	ee-&gt;ee_ob[mode][0]		= (val &gt;&gt; 3) &amp; 0x7;</div><div class='del'>-	ee-&gt;ee_db[mode][0]		= val &amp; 0x7;</div><div class='del'>-</div><div class='del'>-	ret = ath5k_eeprom_read_modes(ah, &amp;offset, mode);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	if (ah-&gt;ah_ee_version &gt;= AR5K_EEPROM_VERSION_4_1) {</div><div class='del'>-		AR5K_EEPROM_READ(offset++, val);</div><div class='del'>-		ee-&gt;ee_margin_tx_rx[mode] = val &amp; 0x3f;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Get values for 802.11b (2.4GHz)</div><div class='del'>-	 */</div><div class='del'>-	mode = AR5K_EEPROM_MODE_11B;</div><div class='del'>-	offset = AR5K_EEPROM_MODES_11B(ah-&gt;ah_ee_version);</div><div class='del'>-</div><div class='del'>-	ret = ath5k_eeprom_read_ants(ah, &amp;offset, mode);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	AR5K_EEPROM_READ(offset++, val);</div><div class='del'>-	ee-&gt;ee_adc_desired_size[mode]	= (s8)((val &gt;&gt; 8) &amp; 0xff);</div><div class='del'>-	ee-&gt;ee_ob[mode][1]		= (val &gt;&gt; 4) &amp; 0x7;</div><div class='del'>-	ee-&gt;ee_db[mode][1]		= val &amp; 0x7;</div><div class='del'>-</div><div class='del'>-	ret = ath5k_eeprom_read_modes(ah, &amp;offset, mode);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	if (ah-&gt;ah_ee_version &gt;= AR5K_EEPROM_VERSION_4_0) {</div><div class='del'>-		AR5K_EEPROM_READ(offset++, val);</div><div class='del'>-		ee-&gt;ee_cal_pier[mode][0] =</div><div class='del'>-			ath5k_eeprom_bin2freq(ah, val &amp; 0xff, mode);</div><div class='del'>-		ee-&gt;ee_cal_pier[mode][1] =</div><div class='del'>-			ath5k_eeprom_bin2freq(ah, (val &gt;&gt; 8) &amp; 0xff, mode);</div><div class='del'>-</div><div class='del'>-		AR5K_EEPROM_READ(offset++, val);</div><div class='del'>-		ee-&gt;ee_cal_pier[mode][2] =</div><div class='del'>-			ath5k_eeprom_bin2freq(ah, val &amp; 0xff, mode);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ah-&gt;ah_ee_version &gt;= AR5K_EEPROM_VERSION_4_1)</div><div class='del'>-		ee-&gt;ee_margin_tx_rx[mode] = (val &gt;&gt; 8) &amp; 0x3f;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Get values for 802.11g (2.4GHz)</div><div class='del'>-	 */</div><div class='del'>-	mode = AR5K_EEPROM_MODE_11G;</div><div class='del'>-	offset = AR5K_EEPROM_MODES_11G(ah-&gt;ah_ee_version);</div><div class='del'>-</div><div class='del'>-	ret = ath5k_eeprom_read_ants(ah, &amp;offset, mode);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	AR5K_EEPROM_READ(offset++, val);</div><div class='del'>-	ee-&gt;ee_adc_desired_size[mode]	= (s8)((val &gt;&gt; 8) &amp; 0xff);</div><div class='del'>-	ee-&gt;ee_ob[mode][1]		= (val &gt;&gt; 4) &amp; 0x7;</div><div class='del'>-	ee-&gt;ee_db[mode][1]		= val &amp; 0x7;</div><div class='del'>-</div><div class='del'>-	ret = ath5k_eeprom_read_modes(ah, &amp;offset, mode);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	if (ah-&gt;ah_ee_version &gt;= AR5K_EEPROM_VERSION_4_0) {</div><div class='del'>-		AR5K_EEPROM_READ(offset++, val);</div><div class='del'>-		ee-&gt;ee_cal_pier[mode][0] =</div><div class='del'>-			ath5k_eeprom_bin2freq(ah, val &amp; 0xff, mode);</div><div class='del'>-		ee-&gt;ee_cal_pier[mode][1] =</div><div class='del'>-			ath5k_eeprom_bin2freq(ah, (val &gt;&gt; 8) &amp; 0xff, mode);</div><div class='del'>-</div><div class='del'>-		AR5K_EEPROM_READ(offset++, val);</div><div class='del'>-		ee-&gt;ee_turbo_max_power[mode] = val &amp; 0x7f;</div><div class='del'>-		ee-&gt;ee_xr_power[mode] = (val &gt;&gt; 7) &amp; 0x3f;</div><div class='del'>-</div><div class='del'>-		AR5K_EEPROM_READ(offset++, val);</div><div class='del'>-		ee-&gt;ee_cal_pier[mode][2] =</div><div class='del'>-			ath5k_eeprom_bin2freq(ah, val &amp; 0xff, mode);</div><div class='del'>-</div><div class='del'>-		if (ah-&gt;ah_ee_version &gt;= AR5K_EEPROM_VERSION_4_1)</div><div class='del'>-			ee-&gt;ee_margin_tx_rx[mode] = (val &gt;&gt; 8) &amp; 0x3f;</div><div class='del'>-</div><div class='del'>-		AR5K_EEPROM_READ(offset++, val);</div><div class='del'>-		ee-&gt;ee_i_cal[mode] = (val &gt;&gt; 8) &amp; 0x3f;</div><div class='del'>-		ee-&gt;ee_q_cal[mode] = (val &gt;&gt; 3) &amp; 0x1f;</div><div class='del'>-</div><div class='del'>-		if (ah-&gt;ah_ee_version &gt;= AR5K_EEPROM_VERSION_4_2) {</div><div class='del'>-			AR5K_EEPROM_READ(offset++, val);</div><div class='del'>-			ee-&gt;ee_cck_ofdm_gain_delta = val &amp; 0xff;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Read 5GHz EEPROM channels</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Read the MAC address from eeprom</div><div class='del'>- */</div><div class='del'>-static int ath5k_eeprom_read_mac(struct ath5k_hw *ah, u8 *mac)</div><div class='del'>-{</div><div class='del'>-	u8 mac_d[ETH_ALEN];</div><div class='del'>-	u32 total, offset;</div><div class='del'>-	u16 data;</div><div class='del'>-	int octet, ret;</div><div class='del'>-</div><div class='del'>-	memset(mac, 0, ETH_ALEN);</div><div class='del'>-	memset(mac_d, 0, ETH_ALEN);</div><div class='del'>-</div><div class='del'>-	ret = ath5k_hw_eeprom_read(ah, 0x20, &amp;data);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	for (offset = 0x1f, octet = 0, total = 0; offset &gt;= 0x1d; offset--) {</div><div class='del'>-		ret = ath5k_hw_eeprom_read(ah, offset, &amp;data);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		total += data;</div><div class='del'>-		mac_d[octet + 1] = data &amp; 0xff;</div><div class='del'>-		mac_d[octet] = data &gt;&gt; 8;</div><div class='del'>-		octet += 2;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memcpy(mac, mac_d, ETH_ALEN);</div><div class='del'>-</div><div class='del'>-	if (!total || total == 3 * 0xffff)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Fill the capabilities struct</div><div class='del'>- */</div><div class='del'>-static int ath5k_hw_get_capabilities(struct ath5k_hw *ah)</div><div class='del'>-{</div><div class='del'>-	u16 ee_header;</div><div class='del'>-</div><div class='del'>-	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='del'>-	/* Capabilities stored in the EEPROM */</div><div class='del'>-	ee_header = ah-&gt;ah_capabilities.cap_eeprom.ee_header;</div><div class='del'>-</div><div class='del'>-	if (ah-&gt;ah_version == AR5K_AR5210) {</div><div class='del'>-		/*</div><div class='del'>-		 * Set radio capabilities</div><div class='del'>-		 * (The AR5110 only supports the middle 5GHz band)</div><div class='del'>-		 */</div><div class='del'>-		ah-&gt;ah_capabilities.cap_range.range_5ghz_min = 5120;</div><div class='del'>-		ah-&gt;ah_capabilities.cap_range.range_5ghz_max = 5430;</div><div class='del'>-		ah-&gt;ah_capabilities.cap_range.range_2ghz_min = 0;</div><div class='del'>-		ah-&gt;ah_capabilities.cap_range.range_2ghz_max = 0;</div><div class='del'>-</div><div class='del'>-		/* Set supported modes */</div><div class='del'>-		__set_bit(AR5K_MODE_11A, ah-&gt;ah_capabilities.cap_mode);</div><div class='del'>-		__set_bit(AR5K_MODE_11A_TURBO, ah-&gt;ah_capabilities.cap_mode);</div><div class='del'>-	} else {</div><div class='del'>-		/*</div><div class='del'>-		 * XXX The tranceiver supports frequencies from 4920 to 6100GHz</div><div class='del'>-		 * XXX and from 2312 to 2732GHz. There are problems with the</div><div class='del'>-		 * XXX current ieee80211 implementation because the IEEE</div><div class='del'>-		 * XXX channel mapping does not support negative channel</div><div class='del'>-		 * XXX numbers (2312MHz is channel -19). Of course, this</div><div class='del'>-		 * XXX doesn't matter because these channels are out of range</div><div class='del'>-		 * XXX but some regulation domains like MKK (Japan) will</div><div class='del'>-		 * XXX support frequencies somewhere around 4.8GHz.</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Set radio capabilities</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		if (AR5K_EEPROM_HDR_11A(ee_header)) {</div><div class='del'>-			ah-&gt;ah_capabilities.cap_range.range_5ghz_min = 5005; /* 4920 */</div><div class='del'>-			ah-&gt;ah_capabilities.cap_range.range_5ghz_max = 6100;</div><div class='del'>-</div><div class='del'>-			/* Set supported modes */</div><div class='del'>-			__set_bit(AR5K_MODE_11A,</div><div class='del'>-					ah-&gt;ah_capabilities.cap_mode);</div><div class='del'>-			__set_bit(AR5K_MODE_11A_TURBO,</div><div class='del'>-					ah-&gt;ah_capabilities.cap_mode);</div><div class='del'>-			if (ah-&gt;ah_version == AR5K_AR5212)</div><div class='del'>-				__set_bit(AR5K_MODE_11G_TURBO,</div><div class='del'>-						ah-&gt;ah_capabilities.cap_mode);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Enable  802.11b if a 2GHz capable radio (2111/5112) is</div><div class='del'>-		 * connected */</div><div class='del'>-		if (AR5K_EEPROM_HDR_11B(ee_header) ||</div><div class='del'>-				AR5K_EEPROM_HDR_11G(ee_header)) {</div><div class='del'>-			ah-&gt;ah_capabilities.cap_range.range_2ghz_min = 2412; /* 2312 */</div><div class='del'>-			ah-&gt;ah_capabilities.cap_range.range_2ghz_max = 2732;</div><div class='del'>-</div><div class='del'>-			if (AR5K_EEPROM_HDR_11B(ee_header))</div><div class='del'>-				__set_bit(AR5K_MODE_11B,</div><div class='del'>-						ah-&gt;ah_capabilities.cap_mode);</div><div class='del'>-</div><div class='del'>-			if (AR5K_EEPROM_HDR_11G(ee_header))</div><div class='del'>-				__set_bit(AR5K_MODE_11G,</div><div class='del'>-						ah-&gt;ah_capabilities.cap_mode);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* GPIO */</div><div class='del'>-	ah-&gt;ah_gpio_npins = AR5K_NUM_GPIO;</div><div class='del'>-</div><div class='del'>-	/* Set number of supported TX queues */</div><div class='del'>-	if (ah-&gt;ah_version == AR5K_AR5210)</div><div class='del'>-		ah-&gt;ah_capabilities.cap_queues.q_tx_num =</div><div class='del'>-			AR5K_NUM_TX_QUEUES_NOQCU;</div><div class='del'>-	else</div><div class='del'>-		ah-&gt;ah_capabilities.cap_queues.q_tx_num = AR5K_NUM_TX_QUEUES;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*********************************\</div><div class='del'>-  Protocol Control Unit Functions</div><div class='del'>-\*********************************/</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Set Operation mode</div><div class='del'>- */</div><div class='del'>-int ath5k_hw_set_opmode(struct ath5k_hw *ah)</div><div class='del'>-{</div><div class='del'>-	u32 pcu_reg, beacon_reg, low_id, high_id;</div><div class='del'>-</div><div class='del'>-	pcu_reg = 0;</div><div class='del'>-	beacon_reg = 0;</div><div class='del'>-</div><div class='del'>-	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='del'>-</div><div class='del'>-	switch (ah-&gt;ah_op_mode) {</div><div class='del'>-	case IEEE80211_IF_TYPE_IBSS:</div><div class='del'>-		pcu_reg |= AR5K_STA_ID1_ADHOC | AR5K_STA_ID1_DESC_ANTENNA |</div><div class='del'>-			(ah-&gt;ah_version == AR5K_AR5210 ?</div><div class='del'>-				AR5K_STA_ID1_NO_PSPOLL : 0);</div><div class='del'>-		beacon_reg |= AR5K_BCR_ADHOC;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case IEEE80211_IF_TYPE_AP:</div><div class='del'>-		pcu_reg |= AR5K_STA_ID1_AP | AR5K_STA_ID1_RTS_DEF_ANTENNA |</div><div class='del'>-			(ah-&gt;ah_version == AR5K_AR5210 ?</div><div class='del'>-				AR5K_STA_ID1_NO_PSPOLL : 0);</div><div class='del'>-		beacon_reg |= AR5K_BCR_AP;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case IEEE80211_IF_TYPE_STA:</div><div class='del'>-		pcu_reg |= AR5K_STA_ID1_DEFAULT_ANTENNA |</div><div class='del'>-			(ah-&gt;ah_version == AR5K_AR5210 ?</div><div class='del'>-				AR5K_STA_ID1_PWR_SV : 0);</div><div class='del'>-	case IEEE80211_IF_TYPE_MNTR:</div><div class='del'>-		pcu_reg |= AR5K_STA_ID1_DEFAULT_ANTENNA |</div><div class='del'>-			(ah-&gt;ah_version == AR5K_AR5210 ?</div><div class='del'>-				AR5K_STA_ID1_NO_PSPOLL : 0);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Set PCU registers</div><div class='del'>-	 */</div><div class='del'>-	low_id = AR5K_LOW_ID(ah-&gt;ah_sta_id);</div><div class='del'>-	high_id = AR5K_HIGH_ID(ah-&gt;ah_sta_id);</div><div class='del'>-	ath5k_hw_reg_write(ah, low_id, AR5K_STA_ID0);</div><div class='del'>-	ath5k_hw_reg_write(ah, pcu_reg | high_id, AR5K_STA_ID1);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Set Beacon Control Register on 5210</div><div class='del'>-	 */</div><div class='del'>-	if (ah-&gt;ah_version == AR5K_AR5210)</div><div class='del'>-		ath5k_hw_reg_write(ah, beacon_reg, AR5K_BCR);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * BSSID Functions</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Get station id</div><div class='del'>- */</div><div class='del'>-void ath5k_hw_get_lladdr(struct ath5k_hw *ah, u8 *mac)</div><div class='del'>-{</div><div class='del'>-	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='del'>-	memcpy(mac, ah-&gt;ah_sta_id, ETH_ALEN);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Set station id</div><div class='del'>- */</div><div class='del'>-int ath5k_hw_set_lladdr(struct ath5k_hw *ah, const u8 *mac)</div><div class='del'>-{</div><div class='del'>-	u32 low_id, high_id;</div><div class='del'>-</div><div class='del'>-	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='del'>-	/* Set new station ID */</div><div class='del'>-	memcpy(ah-&gt;ah_sta_id, mac, ETH_ALEN);</div><div class='del'>-</div><div class='del'>-	low_id = AR5K_LOW_ID(mac);</div><div class='del'>-	high_id = AR5K_HIGH_ID(mac);</div><div class='del'>-</div><div class='del'>-	ath5k_hw_reg_write(ah, low_id, AR5K_STA_ID0);</div><div class='del'>-	ath5k_hw_reg_write(ah, high_id, AR5K_STA_ID1);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Set BSSID</div><div class='del'>- */</div><div class='del'>-void ath5k_hw_set_associd(struct ath5k_hw *ah, const u8 *bssid, u16 assoc_id)</div><div class='del'>-{</div><div class='del'>-	u32 low_id, high_id;</div><div class='del'>-	u16 tim_offset = 0;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Set simple BSSID mask on 5212</div><div class='del'>-	 */</div><div class='del'>-	if (ah-&gt;ah_version == AR5K_AR5212) {</div><div class='del'>-		ath5k_hw_reg_write(ah, 0xffffffff, AR5K_BSS_IDM0);</div><div class='del'>-		ath5k_hw_reg_write(ah, 0xffffffff, AR5K_BSS_IDM1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Set BSSID which triggers the "SME Join" operation</div><div class='del'>-	 */</div><div class='del'>-	low_id = AR5K_LOW_ID(bssid);</div><div class='del'>-	high_id = AR5K_HIGH_ID(bssid);</div><div class='del'>-	ath5k_hw_reg_write(ah, low_id, AR5K_BSS_ID0);</div><div class='del'>-	ath5k_hw_reg_write(ah, high_id | ((assoc_id &amp; 0x3fff) &lt;&lt;</div><div class='del'>-				AR5K_BSS_ID1_AID_S), AR5K_BSS_ID1);</div><div class='del'>-</div><div class='del'>-	if (assoc_id == 0) {</div><div class='del'>-		ath5k_hw_disable_pspoll(ah);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	AR5K_REG_WRITE_BITS(ah, AR5K_BEACON, AR5K_BEACON_TIM,</div><div class='del'>-			tim_offset ? tim_offset + 4 : 0);</div><div class='del'>-</div><div class='del'>-	ath5k_hw_enable_pspoll(ah, NULL, 0);</div><div class='del'>-}</div><div class='del'>-/**</div><div class='del'>- * ath5k_hw_set_bssid_mask - set common bits we should listen to</div><div class='del'>- *</div><div class='del'>- * The bssid_mask is a utility used by AR5212 hardware to inform the hardware</div><div class='del'>- * which bits of the interface's MAC address should be looked at when trying</div><div class='del'>- * to decide which packets to ACK. In station mode every bit matters. In AP</div><div class='del'>- * mode with a single BSS every bit matters as well. In AP mode with</div><div class='del'>- * multiple BSSes not every bit matters.</div><div class='del'>- *</div><div class='del'>- * @ah: the &amp;struct ath5k_hw</div><div class='del'>- * @mask: the bssid_mask, a u8 array of size ETH_ALEN</div><div class='del'>- *</div><div class='del'>- * Note that this is a simple filter and *does* not filter out all</div><div class='del'>- * relevant frames. Some non-relevant frames will get through, probability</div><div class='del'>- * jocks are welcomed to compute.</div><div class='del'>- *</div><div class='del'>- * When handling multiple BSSes (or VAPs) you can get the BSSID mask by</div><div class='del'>- * computing the set of:</div><div class='del'>- *</div><div class='del'>- *     ~ ( MAC XOR BSSID )</div><div class='del'>- *</div><div class='del'>- * When you do this you are essentially computing the common bits. Later it</div><div class='del'>- * is assumed the harware will "and" (&amp;) the BSSID mask with the MAC address</div><div class='del'>- * to obtain the relevant bits which should match on the destination frame.</div><div class='del'>- *</div><div class='del'>- * Simple example: on your card you have have two BSSes you have created with</div><div class='del'>- * BSSID-01 and BSSID-02. Lets assume BSSID-01 will not use the MAC address.</div><div class='del'>- * There is another BSSID-03 but you are not part of it. For simplicity's sake,</div><div class='del'>- * assuming only 4 bits for a mac address and for BSSIDs you can then have:</div><div class='del'>- *</div><div class='del'>- *                  \</div><div class='del'>- * MAC:                0001 |</div><div class='del'>- * BSSID-01:   0100 | --&gt; Belongs to us</div><div class='del'>- * BSSID-02:   1001 |</div><div class='del'>- *                  /</div><div class='del'>- * -------------------</div><div class='del'>- * BSSID-03:   0110  | --&gt; External</div><div class='del'>- * -------------------</div><div class='del'>- *</div><div class='del'>- * Our bssid_mask would then be:</div><div class='del'>- *</div><div class='del'>- *             On loop iteration for BSSID-01:</div><div class='del'>- *             ~(0001 ^ 0100)  -&gt; ~(0101)</div><div class='del'>- *                             -&gt;   1010</div><div class='del'>- *             bssid_mask      =    1010</div><div class='del'>- *</div><div class='del'>- *             On loop iteration for BSSID-02:</div><div class='del'>- *             bssid_mask &amp;= ~(0001   ^   1001)</div><div class='del'>- *             bssid_mask =   (1010)  &amp; ~(0001 ^ 1001)</div><div class='del'>- *             bssid_mask =   (1010)  &amp; ~(1001)</div><div class='del'>- *             bssid_mask =   (1010)  &amp;  (0110)</div><div class='del'>- *             bssid_mask =   0010</div><div class='del'>- *</div><div class='del'>- * A bssid_mask of 0010 means "only pay attention to the second least</div><div class='del'>- * significant bit". This is because its the only bit common</div><div class='del'>- * amongst the MAC and all BSSIDs we support. To findout what the real</div><div class='del'>- * common bit is we can simply "&amp;" the bssid_mask now with any BSSID we have</div><div class='del'>- * or our MAC address (we assume the hardware uses the MAC address).</div><div class='del'>- *</div><div class='del'>- * Now, suppose there's an incoming frame for BSSID-03:</div><div class='del'>- *</div><div class='del'>- * IFRAME-01:  0110</div><div class='del'>- *</div><div class='del'>- * An easy eye-inspeciton of this already should tell you that this frame</div><div class='del'>- * will not pass our check. This is beacuse the bssid_mask tells the</div><div class='del'>- * hardware to only look at the second least significant bit and the</div><div class='del'>- * common bit amongst the MAC and BSSIDs is 0, this frame has the 2nd LSB</div><div class='del'>- * as 1, which does not match 0.</div><div class='del'>- *</div><div class='del'>- * So with IFRAME-01 we *assume* the hardware will do:</div><div class='del'>- *</div><div class='del'>- *     allow = (IFRAME-01 &amp; bssid_mask) == (bssid_mask &amp; MAC) ? 1 : 0;</div><div class='del'>- *  --&gt; allow = (0110 &amp; 0010) == (0010 &amp; 0001) ? 1 : 0;</div><div class='del'>- *  --&gt; allow = (0010) == 0000 ? 1 : 0;</div><div class='del'>- *  --&gt; allow = 0</div><div class='del'>- *</div><div class='del'>- *  Lets now test a frame that should work:</div><div class='del'>- *</div><div class='del'>- * IFRAME-02:  0001 (we should allow)</div><div class='del'>- *</div><div class='del'>- *     allow = (0001 &amp; 1010) == 1010</div><div class='del'>- *</div><div class='del'>- *     allow = (IFRAME-02 &amp; bssid_mask) == (bssid_mask &amp; MAC) ? 1 : 0;</div><div class='del'>- *  --&gt; allow = (0001 &amp; 0010) ==  (0010 &amp; 0001) ? 1 :0;</div><div class='del'>- *  --&gt; allow = (0010) == (0010)</div><div class='del'>- *  --&gt; allow = 1</div><div class='del'>- *</div><div class='del'>- * Other examples:</div><div class='del'>- *</div><div class='del'>- * IFRAME-03:  0100 --&gt; allowed</div><div class='del'>- * IFRAME-04:  1001 --&gt; allowed</div><div class='del'>- * IFRAME-05:  1101 --&gt; allowed but its not for us!!!</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-int ath5k_hw_set_bssid_mask(struct ath5k_hw *ah, const u8 *mask)</div><div class='del'>-{</div><div class='del'>-	u32 low_id, high_id;</div><div class='del'>-	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='del'>-</div><div class='del'>-	if (ah-&gt;ah_version == AR5K_AR5212) {</div><div class='del'>-		low_id = AR5K_LOW_ID(mask);</div><div class='del'>-		high_id = AR5K_HIGH_ID(mask);</div><div class='del'>-</div><div class='del'>-		ath5k_hw_reg_write(ah, low_id, AR5K_BSS_IDM0);</div><div class='del'>-		ath5k_hw_reg_write(ah, high_id, AR5K_BSS_IDM1);</div><div class='del'>-</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return -EIO;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Receive start/stop functions</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Start receive on PCU</div><div class='del'>- */</div><div class='del'>-void ath5k_hw_start_rx_pcu(struct ath5k_hw *ah)</div><div class='del'>-{</div><div class='del'>-	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='del'>-	AR5K_REG_DISABLE_BITS(ah, AR5K_DIAG_SW, AR5K_DIAG_SW_DIS_RX);</div><div class='del'>-</div><div class='del'>-	/* TODO: ANI Support */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Stop receive on PCU</div><div class='del'>- */</div><div class='del'>-void ath5k_hw_stop_pcu_recv(struct ath5k_hw *ah)</div><div class='del'>-{</div><div class='del'>-	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='del'>-	AR5K_REG_ENABLE_BITS(ah, AR5K_DIAG_SW, AR5K_DIAG_SW_DIS_RX);</div><div class='del'>-</div><div class='del'>-	/* TODO: ANI Support */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * RX Filter functions</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Set multicast filter</div><div class='del'>- */</div><div class='del'>-void ath5k_hw_set_mcast_filter(struct ath5k_hw *ah, u32 filter0, u32 filter1)</div><div class='del'>-{</div><div class='del'>-	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='del'>-	/* Set the multicat filter */</div><div class='del'>-	ath5k_hw_reg_write(ah, filter0, AR5K_MCAST_FILTER0);</div><div class='del'>-	ath5k_hw_reg_write(ah, filter1, AR5K_MCAST_FILTER1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Set multicast filter by index</div><div class='del'>- */</div><div class='del'>-int ath5k_hw_set_mcast_filterindex(struct ath5k_hw *ah, u32 index)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='del'>-	if (index &gt;= 64)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	else if (index &gt;= 32)</div><div class='del'>-		AR5K_REG_ENABLE_BITS(ah, AR5K_MCAST_FILTER1,</div><div class='del'>-				(1 &lt;&lt; (index - 32)));</div><div class='del'>-	else</div><div class='del'>-		AR5K_REG_ENABLE_BITS(ah, AR5K_MCAST_FILTER0, (1 &lt;&lt; index));</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Clear Multicast filter by index</div><div class='del'>- */</div><div class='del'>-int ath5k_hw_clear_mcast_filter_idx(struct ath5k_hw *ah, u32 index)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='del'>-	if (index &gt;= 64)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	else if (index &gt;= 32)</div><div class='del'>-		AR5K_REG_DISABLE_BITS(ah, AR5K_MCAST_FILTER1,</div><div class='del'>-				(1 &lt;&lt; (index - 32)));</div><div class='del'>-	else</div><div class='del'>-		AR5K_REG_DISABLE_BITS(ah, AR5K_MCAST_FILTER0, (1 &lt;&lt; index));</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Get current rx filter</div><div class='del'>- */</div><div class='del'>-u32 ath5k_hw_get_rx_filter(struct ath5k_hw *ah)</div><div class='del'>-{</div><div class='del'>-	u32 data, filter = 0;</div><div class='del'>-</div><div class='del'>-	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='del'>-	filter = ath5k_hw_reg_read(ah, AR5K_RX_FILTER);</div><div class='del'>-</div><div class='del'>-	/*Radar detection for 5212*/</div><div class='del'>-	if (ah-&gt;ah_version == AR5K_AR5212) {</div><div class='del'>-		data = ath5k_hw_reg_read(ah, AR5K_PHY_ERR_FIL);</div><div class='del'>-</div><div class='del'>-		if (data &amp; AR5K_PHY_ERR_FIL_RADAR)</div><div class='del'>-			filter |= AR5K_RX_FILTER_RADARERR;</div><div class='del'>-		if (data &amp; (AR5K_PHY_ERR_FIL_OFDM | AR5K_PHY_ERR_FIL_CCK))</div><div class='del'>-			filter |= AR5K_RX_FILTER_PHYERR;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return filter;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Set rx filter</div><div class='del'>- */</div><div class='del'>-void ath5k_hw_set_rx_filter(struct ath5k_hw *ah, u32 filter)</div><div class='del'>-{</div><div class='del'>-	u32 data = 0;</div><div class='del'>-</div><div class='del'>-	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='del'>-</div><div class='del'>-	/* Set PHY error filter register on 5212*/</div><div class='del'>-	if (ah-&gt;ah_version == AR5K_AR5212) {</div><div class='del'>-		if (filter &amp; AR5K_RX_FILTER_RADARERR)</div><div class='del'>-			data |= AR5K_PHY_ERR_FIL_RADAR;</div><div class='del'>-		if (filter &amp; AR5K_RX_FILTER_PHYERR)</div><div class='del'>-			data |= AR5K_PHY_ERR_FIL_OFDM | AR5K_PHY_ERR_FIL_CCK;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * The AR5210 uses promiscous mode to detect radar activity</div><div class='del'>-	 */</div><div class='del'>-	if (ah-&gt;ah_version == AR5K_AR5210 &amp;&amp;</div><div class='del'>-			(filter &amp; AR5K_RX_FILTER_RADARERR)) {</div><div class='del'>-		filter &amp;= ~AR5K_RX_FILTER_RADARERR;</div><div class='del'>-		filter |= AR5K_RX_FILTER_PROM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*Zero length DMA*/</div><div class='del'>-	if (data)</div><div class='del'>-		AR5K_REG_ENABLE_BITS(ah, AR5K_RXCFG, AR5K_RXCFG_ZLFDMA);</div><div class='del'>-	else</div><div class='del'>-		AR5K_REG_DISABLE_BITS(ah, AR5K_RXCFG, AR5K_RXCFG_ZLFDMA);</div><div class='del'>-</div><div class='del'>-	/*Write RX Filter register*/</div><div class='del'>-	ath5k_hw_reg_write(ah, filter &amp; 0xff, AR5K_RX_FILTER);</div><div class='del'>-</div><div class='del'>-	/*Write PHY error filter register on 5212*/</div><div class='del'>-	if (ah-&gt;ah_version == AR5K_AR5212)</div><div class='del'>-		ath5k_hw_reg_write(ah, data, AR5K_PHY_ERR_FIL);</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Beacon related functions</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Get a 32bit TSF</div><div class='del'>- */</div><div class='del'>-u32 ath5k_hw_get_tsf32(struct ath5k_hw *ah)</div><div class='del'>-{</div><div class='del'>-	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='del'>-	return ath5k_hw_reg_read(ah, AR5K_TSF_L32);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Get the full 64bit TSF</div><div class='del'>- */</div><div class='del'>-u64 ath5k_hw_get_tsf64(struct ath5k_hw *ah)</div><div class='del'>-{</div><div class='del'>-	u64 tsf = ath5k_hw_reg_read(ah, AR5K_TSF_U32);</div><div class='del'>-	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='del'>-</div><div class='del'>-	return ath5k_hw_reg_read(ah, AR5K_TSF_L32) | (tsf &lt;&lt; 32);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Force a TSF reset</div><div class='del'>- */</div><div class='del'>-void ath5k_hw_reset_tsf(struct ath5k_hw *ah)</div><div class='del'>-{</div><div class='del'>-	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='del'>-	AR5K_REG_ENABLE_BITS(ah, AR5K_BEACON, AR5K_BEACON_RESET_TSF);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Initialize beacon timers</div><div class='del'>- */</div><div class='del'>-void ath5k_hw_init_beacon(struct ath5k_hw *ah, u32 next_beacon, u32 interval)</div><div class='del'>-{</div><div class='del'>-	u32 timer1, timer2, timer3;</div><div class='del'>-</div><div class='del'>-	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='del'>-	/*</div><div class='del'>-	 * Set the additional timers by mode</div><div class='del'>-	 */</div><div class='del'>-	switch (ah-&gt;ah_op_mode) {</div><div class='del'>-	case IEEE80211_IF_TYPE_STA:</div><div class='del'>-		if (ah-&gt;ah_version == AR5K_AR5210) {</div><div class='del'>-			timer1 = 0xffffffff;</div><div class='del'>-			timer2 = 0xffffffff;</div><div class='del'>-		} else {</div><div class='del'>-			timer1 = 0x0000ffff;</div><div class='del'>-			timer2 = 0x0007ffff;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		timer1 = (next_beacon - AR5K_TUNE_DMA_BEACON_RESP) &lt;&lt; 3;</div><div class='del'>-		timer2 = (next_beacon - AR5K_TUNE_SW_BEACON_RESP) &lt;&lt; 3;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	timer3 = next_beacon + (ah-&gt;ah_atim_window ? ah-&gt;ah_atim_window : 1);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Set the beacon register and enable all timers.</div><div class='del'>-	 * (next beacon, DMA beacon, software beacon, ATIM window time)</div><div class='del'>-	 */</div><div class='del'>-	ath5k_hw_reg_write(ah, next_beacon, AR5K_TIMER0);</div><div class='del'>-	ath5k_hw_reg_write(ah, timer1, AR5K_TIMER1);</div><div class='del'>-	ath5k_hw_reg_write(ah, timer2, AR5K_TIMER2);</div><div class='del'>-	ath5k_hw_reg_write(ah, timer3, AR5K_TIMER3);</div><div class='del'>-</div><div class='del'>-	ath5k_hw_reg_write(ah, interval &amp; (AR5K_BEACON_PERIOD |</div><div class='del'>-			AR5K_BEACON_RESET_TSF | AR5K_BEACON_ENABLE),</div><div class='del'>-		AR5K_BEACON);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-/*</div><div class='del'>- * Set beacon timers</div><div class='del'>- */</div><div class='del'>-int ath5k_hw_set_beacon_timers(struct ath5k_hw *ah,</div><div class='del'>-		const struct ath5k_beacon_state *state)</div><div class='del'>-{</div><div class='del'>-	u32 cfp_period, next_cfp, dtim, interval, next_beacon;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * TODO: should be changed through *state</div><div class='del'>-	 * review struct ath5k_beacon_state struct</div><div class='del'>-	 *</div><div class='del'>-	 * XXX: These are used for cfp period bellow, are they</div><div class='del'>-	 * ok ? Is it O.K. for tsf here to be 0 or should we use</div><div class='del'>-	 * get_tsf ?</div><div class='del'>-	 */</div><div class='del'>-	u32 dtim_count = 0; /* XXX */</div><div class='del'>-	u32 cfp_count = 0; /* XXX */</div><div class='del'>-	u32 tsf = 0; /* XXX */</div><div class='del'>-</div><div class='del'>-	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='del'>-	/* Return on an invalid beacon state */</div><div class='del'>-	if (state-&gt;bs_interval &lt; 1)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	interval = state-&gt;bs_interval;</div><div class='del'>-	dtim = state-&gt;bs_dtim_period;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * PCF support?</div><div class='del'>-	 */</div><div class='del'>-	if (state-&gt;bs_cfp_period &gt; 0) {</div><div class='del'>-		/*</div><div class='del'>-		 * Enable PCF mode and set the CFP</div><div class='del'>-		 * (Contention Free Period) and timer registers</div><div class='del'>-		 */</div><div class='del'>-		cfp_period = state-&gt;bs_cfp_period * state-&gt;bs_dtim_period *</div><div class='del'>-			state-&gt;bs_interval;</div><div class='del'>-		next_cfp = (cfp_count * state-&gt;bs_dtim_period + dtim_count) *</div><div class='del'>-			state-&gt;bs_interval;</div><div class='del'>-</div><div class='del'>-		AR5K_REG_ENABLE_BITS(ah, AR5K_STA_ID1,</div><div class='del'>-				AR5K_STA_ID1_DEFAULT_ANTENNA |</div><div class='del'>-				AR5K_STA_ID1_PCF);</div><div class='del'>-		ath5k_hw_reg_write(ah, cfp_period, AR5K_CFP_PERIOD);</div><div class='del'>-		ath5k_hw_reg_write(ah, state-&gt;bs_cfp_max_duration,</div><div class='del'>-				AR5K_CFP_DUR);</div><div class='del'>-		ath5k_hw_reg_write(ah, (tsf + (next_cfp == 0 ? cfp_period :</div><div class='del'>-						next_cfp)) &lt;&lt; 3, AR5K_TIMER2);</div><div class='del'>-	} else {</div><div class='del'>-		/* Disable PCF mode */</div><div class='del'>-		AR5K_REG_DISABLE_BITS(ah, AR5K_STA_ID1,</div><div class='del'>-				AR5K_STA_ID1_DEFAULT_ANTENNA |</div><div class='del'>-				AR5K_STA_ID1_PCF);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Enable the beacon timer register</div><div class='del'>-	 */</div><div class='del'>-	ath5k_hw_reg_write(ah, state-&gt;bs_next_beacon, AR5K_TIMER0);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Start the beacon timers</div><div class='del'>-	 */</div><div class='del'>-	ath5k_hw_reg_write(ah, (ath5k_hw_reg_read(ah, AR5K_BEACON) &amp;~</div><div class='del'>-		(AR5K_BEACON_PERIOD | AR5K_BEACON_TIM)) |</div><div class='del'>-		AR5K_REG_SM(state-&gt;bs_tim_offset ? state-&gt;bs_tim_offset + 4 : 0,</div><div class='del'>-		AR5K_BEACON_TIM) | AR5K_REG_SM(state-&gt;bs_interval,</div><div class='del'>-		AR5K_BEACON_PERIOD), AR5K_BEACON);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Write new beacon miss threshold, if it appears to be valid</div><div class='del'>-	 * XXX: Figure out right values for min &lt;= bs_bmiss_threshold &lt;= max</div><div class='del'>-	 * and return if its not in range. We can test this by reading value and</div><div class='del'>-	 * setting value to a largest value and seeing which values register.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	AR5K_REG_WRITE_BITS(ah, AR5K_RSSI_THR, AR5K_RSSI_THR_BMISS,</div><div class='del'>-			state-&gt;bs_bmiss_threshold);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Set sleep control register</div><div class='del'>-	 * XXX: Didn't find this in 5210 code but since this register</div><div class='del'>-	 * exists also in ar5k's 5210 headers i leave it as common code.</div><div class='del'>-	 */</div><div class='del'>-	AR5K_REG_WRITE_BITS(ah, AR5K_SLEEP_CTL, AR5K_SLEEP_CTL_SLDUR,</div><div class='del'>-			(state-&gt;bs_sleep_duration - 3) &lt;&lt; 3);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Set enhanced sleep registers on 5212</div><div class='del'>-	 */</div><div class='del'>-	if (ah-&gt;ah_version == AR5K_AR5212) {</div><div class='del'>-		if (state-&gt;bs_sleep_duration &gt; state-&gt;bs_interval &amp;&amp;</div><div class='del'>-				roundup(state-&gt;bs_sleep_duration, interval) ==</div><div class='del'>-				state-&gt;bs_sleep_duration)</div><div class='del'>-			interval = state-&gt;bs_sleep_duration;</div><div class='del'>-</div><div class='del'>-		if (state-&gt;bs_sleep_duration &gt; dtim &amp;&amp; (dtim == 0 ||</div><div class='del'>-				roundup(state-&gt;bs_sleep_duration, dtim) ==</div><div class='del'>-				state-&gt;bs_sleep_duration))</div><div class='del'>-			dtim = state-&gt;bs_sleep_duration;</div><div class='del'>-</div><div class='del'>-		if (interval &gt; dtim)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='del'>-		next_beacon = interval == dtim ? state-&gt;bs_next_dtim :</div><div class='del'>-			state-&gt;bs_next_beacon;</div><div class='del'>-</div><div class='del'>-		ath5k_hw_reg_write(ah,</div><div class='del'>-			AR5K_REG_SM((state-&gt;bs_next_dtim - 3) &lt;&lt; 3,</div><div class='del'>-			AR5K_SLEEP0_NEXT_DTIM) |</div><div class='del'>-			AR5K_REG_SM(10, AR5K_SLEEP0_CABTO) |</div><div class='del'>-			AR5K_SLEEP0_ENH_SLEEP_EN |</div><div class='del'>-			AR5K_SLEEP0_ASSUME_DTIM, AR5K_SLEEP0);</div><div class='del'>-</div><div class='del'>-		ath5k_hw_reg_write(ah, AR5K_REG_SM((next_beacon - 3) &lt;&lt; 3,</div><div class='del'>-			AR5K_SLEEP1_NEXT_TIM) |</div><div class='del'>-			AR5K_REG_SM(10, AR5K_SLEEP1_BEACON_TO), AR5K_SLEEP1);</div><div class='del'>-</div><div class='del'>-		ath5k_hw_reg_write(ah,</div><div class='del'>-			AR5K_REG_SM(interval, AR5K_SLEEP2_TIM_PER) |</div><div class='del'>-			AR5K_REG_SM(dtim, AR5K_SLEEP2_DTIM_PER), AR5K_SLEEP2);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Reset beacon timers</div><div class='del'>- */</div><div class='del'>-void ath5k_hw_reset_beacon(struct ath5k_hw *ah)</div><div class='del'>-{</div><div class='del'>-	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='del'>-	/*</div><div class='del'>-	 * Disable beacon timer</div><div class='del'>-	 */</div><div class='del'>-	ath5k_hw_reg_write(ah, 0, AR5K_TIMER0);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Disable some beacon register values</div><div class='del'>-	 */</div><div class='del'>-	AR5K_REG_DISABLE_BITS(ah, AR5K_STA_ID1,</div><div class='del'>-			AR5K_STA_ID1_DEFAULT_ANTENNA | AR5K_STA_ID1_PCF);</div><div class='del'>-	ath5k_hw_reg_write(ah, AR5K_BEACON_PERIOD, AR5K_BEACON);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Wait for beacon queue to finish</div><div class='del'>- */</div><div class='del'>-int ath5k_hw_beaconq_finish(struct ath5k_hw *ah, unsigned long phys_addr)</div><div class='del'>-{</div><div class='del'>-	unsigned int i;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='del'>-</div><div class='del'>-	/* 5210 doesn't have QCU*/</div><div class='del'>-	if (ah-&gt;ah_version == AR5K_AR5210) {</div><div class='del'>-		/*</div><div class='del'>-		 * Wait for beaconn queue to finish by checking</div><div class='del'>-		 * Control Register and Beacon Status Register.</div><div class='del'>-		 */</div><div class='del'>-		for (i = AR5K_TUNE_BEACON_INTERVAL / 2; i &gt; 0; i--) {</div><div class='del'>-			if (!(ath5k_hw_reg_read(ah, AR5K_BSR) &amp; AR5K_BSR_TXQ1F)</div><div class='del'>-					||</div><div class='del'>-			    !(ath5k_hw_reg_read(ah, AR5K_CR) &amp; AR5K_BSR_TXQ1F))</div><div class='del'>-				break;</div><div class='del'>-			udelay(10);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Timeout... */</div><div class='del'>-		if (i &lt;= 0) {</div><div class='del'>-			/*</div><div class='del'>-			 * Re-schedule the beacon queue</div><div class='del'>-			 */</div><div class='del'>-			ath5k_hw_reg_write(ah, phys_addr, AR5K_NOQCU_TXDP1);</div><div class='del'>-			ath5k_hw_reg_write(ah, AR5K_BCR_TQ1V | AR5K_BCR_BDMAE,</div><div class='del'>-					AR5K_BCR);</div><div class='del'>-</div><div class='del'>-			return -EIO;</div><div class='del'>-		}</div><div class='del'>-		ret = 0;</div><div class='del'>-	} else {</div><div class='del'>-	/*5211/5212*/</div><div class='del'>-		ret = ath5k_hw_register_timeout(ah,</div><div class='del'>-			AR5K_QUEUE_STATUS(AR5K_TX_QUEUE_ID_BEACON),</div><div class='del'>-			AR5K_QCU_STS_FRMPENDCNT, 0, false);</div><div class='del'>-</div><div class='del'>-		if (AR5K_REG_READ_Q(ah, AR5K_QCU_TXE, AR5K_TX_QUEUE_ID_BEACON))</div><div class='del'>-			return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Update mib counters (statistics)</div><div class='del'>- */</div><div class='del'>-void ath5k_hw_update_mib_counters(struct ath5k_hw *ah,</div><div class='del'>-		struct ieee80211_low_level_stats  *stats)</div><div class='del'>-{</div><div class='del'>-	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='del'>-</div><div class='del'>-	/* Read-And-Clear */</div><div class='del'>-	stats-&gt;dot11ACKFailureCount += ath5k_hw_reg_read(ah, AR5K_ACK_FAIL);</div><div class='del'>-	stats-&gt;dot11RTSFailureCount += ath5k_hw_reg_read(ah, AR5K_RTS_FAIL);</div><div class='del'>-	stats-&gt;dot11RTSSuccessCount += ath5k_hw_reg_read(ah, AR5K_RTS_OK);</div><div class='del'>-	stats-&gt;dot11FCSErrorCount += ath5k_hw_reg_read(ah, AR5K_FCS_FAIL);</div><div class='del'>-</div><div class='del'>-	/* XXX: Should we use this to track beacon count ?</div><div class='del'>-	 * -we read it anyway to clear the register */</div><div class='del'>-	ath5k_hw_reg_read(ah, AR5K_BEACON_CNT);</div><div class='del'>-</div><div class='del'>-	/* Reset profile count registers on 5212*/</div><div class='del'>-	if (ah-&gt;ah_version == AR5K_AR5212) {</div><div class='del'>-		ath5k_hw_reg_write(ah, 0, AR5K_PROFCNT_TX);</div><div class='del'>-		ath5k_hw_reg_write(ah, 0, AR5K_PROFCNT_RX);</div><div class='del'>-		ath5k_hw_reg_write(ah, 0, AR5K_PROFCNT_RXCLR);</div><div class='del'>-		ath5k_hw_reg_write(ah, 0, AR5K_PROFCNT_CYCLE);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/** ath5k_hw_set_ack_bitrate - set bitrate for ACKs</div><div class='del'>- *</div><div class='del'>- * @ah: the &amp;struct ath5k_hw</div><div class='del'>- * @high: determines if to use low bit rate or now</div><div class='del'>- */</div><div class='del'>-void ath5k_hw_set_ack_bitrate_high(struct ath5k_hw *ah, bool high)</div><div class='del'>-{</div><div class='del'>-	if (ah-&gt;ah_version != AR5K_AR5212)</div><div class='del'>-		return;</div><div class='del'>-	else {</div><div class='del'>-		u32 val = AR5K_STA_ID1_BASE_RATE_11B | AR5K_STA_ID1_ACKCTS_6MB;</div><div class='del'>-		if (high)</div><div class='del'>-			AR5K_REG_ENABLE_BITS(ah, AR5K_STA_ID1, val);</div><div class='del'>-		else</div><div class='del'>-			AR5K_REG_DISABLE_BITS(ah, AR5K_STA_ID1, val);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ACK/CTS Timeouts</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Set ACK timeout on PCU</div><div class='del'>- */</div><div class='del'>-int ath5k_hw_set_ack_timeout(struct ath5k_hw *ah, unsigned int timeout)</div><div class='del'>-{</div><div class='del'>-	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='del'>-	if (ath5k_hw_clocktoh(AR5K_REG_MS(0xffffffff, AR5K_TIME_OUT_ACK),</div><div class='del'>-			ah-&gt;ah_turbo) &lt;= timeout)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	AR5K_REG_WRITE_BITS(ah, AR5K_TIME_OUT, AR5K_TIME_OUT_ACK,</div><div class='del'>-		ath5k_hw_htoclock(timeout, ah-&gt;ah_turbo));</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Read the ACK timeout from PCU</div><div class='del'>- */</div><div class='del'>-unsigned int ath5k_hw_get_ack_timeout(struct ath5k_hw *ah)</div><div class='del'>-{</div><div class='del'>-	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='del'>-</div><div class='del'>-	return ath5k_hw_clocktoh(AR5K_REG_MS(ath5k_hw_reg_read(ah,</div><div class='del'>-			AR5K_TIME_OUT), AR5K_TIME_OUT_ACK), ah-&gt;ah_turbo);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Set CTS timeout on PCU</div><div class='del'>- */</div><div class='del'>-int ath5k_hw_set_cts_timeout(struct ath5k_hw *ah, unsigned int timeout)</div><div class='del'>-{</div><div class='del'>-	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='del'>-	if (ath5k_hw_clocktoh(AR5K_REG_MS(0xffffffff, AR5K_TIME_OUT_CTS),</div><div class='del'>-			ah-&gt;ah_turbo) &lt;= timeout)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	AR5K_REG_WRITE_BITS(ah, AR5K_TIME_OUT, AR5K_TIME_OUT_CTS,</div><div class='del'>-			ath5k_hw_htoclock(timeout, ah-&gt;ah_turbo));</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Read CTS timeout from PCU</div><div class='del'>- */</div><div class='del'>-unsigned int ath5k_hw_get_cts_timeout(struct ath5k_hw *ah)</div><div class='del'>-{</div><div class='del'>-	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='del'>-	return ath5k_hw_clocktoh(AR5K_REG_MS(ath5k_hw_reg_read(ah,</div><div class='del'>-			AR5K_TIME_OUT), AR5K_TIME_OUT_CTS), ah-&gt;ah_turbo);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Key table (WEP) functions</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-int ath5k_hw_reset_key(struct ath5k_hw *ah, u16 entry)</div><div class='del'>-{</div><div class='del'>-	unsigned int i;</div><div class='del'>-</div><div class='del'>-	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='del'>-	AR5K_ASSERT_ENTRY(entry, AR5K_KEYTABLE_SIZE);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; AR5K_KEYCACHE_SIZE; i++)</div><div class='del'>-		ath5k_hw_reg_write(ah, 0, AR5K_KEYTABLE_OFF(entry, i));</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Set NULL encryption on AR5212+</div><div class='del'>-	 *</div><div class='del'>-	 * Note: AR5K_KEYTABLE_TYPE -&gt; AR5K_KEYTABLE_OFF(entry, 5)</div><div class='del'>-	 *       AR5K_KEYTABLE_TYPE_NULL -&gt; 0x00000007</div><div class='del'>-	 *</div><div class='del'>-	 * Note2: Windows driver (ndiswrapper) sets this to</div><div class='del'>-	 *        0x00000714 instead of 0x00000007</div><div class='del'>-	 */</div><div class='del'>-	if (ah-&gt;ah_version &gt; AR5K_AR5211)</div><div class='del'>-		ath5k_hw_reg_write(ah, AR5K_KEYTABLE_TYPE_NULL,</div><div class='del'>-				AR5K_KEYTABLE_TYPE(entry));</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int ath5k_hw_is_key_valid(struct ath5k_hw *ah, u16 entry)</div><div class='del'>-{</div><div class='del'>-	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='del'>-	AR5K_ASSERT_ENTRY(entry, AR5K_KEYTABLE_SIZE);</div><div class='del'>-</div><div class='del'>-	/* Check the validation flag at the end of the entry */</div><div class='del'>-	return ath5k_hw_reg_read(ah, AR5K_KEYTABLE_MAC1(entry)) &amp;</div><div class='del'>-		AR5K_KEYTABLE_VALID;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int ath5k_hw_set_key(struct ath5k_hw *ah, u16 entry,</div><div class='del'>-		const struct ieee80211_key_conf *key, const u8 *mac)</div><div class='del'>-{</div><div class='del'>-	unsigned int i;</div><div class='del'>-	__le32 key_v[5] = {};</div><div class='del'>-	u32 keytype;</div><div class='del'>-</div><div class='del'>-	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='del'>-</div><div class='del'>-	/* key-&gt;keylen comes in from mac80211 in bytes */</div><div class='del'>-</div><div class='del'>-	if (key-&gt;keylen &gt; AR5K_KEYTABLE_SIZE / 8)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	switch (key-&gt;keylen) {</div><div class='del'>-	/* WEP 40-bit   = 40-bit  entered key + 24 bit IV = 64-bit */</div><div class='del'>-	case 40 / 8:</div><div class='del'>-		memcpy(&amp;key_v[0], key-&gt;key, 5);</div><div class='del'>-		keytype = AR5K_KEYTABLE_TYPE_40;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	/* WEP 104-bit  = 104-bit entered key + 24-bit IV = 128-bit */</div><div class='del'>-	case 104 / 8:</div><div class='del'>-		memcpy(&amp;key_v[0], &amp;key-&gt;key[0], 6);</div><div class='del'>-		memcpy(&amp;key_v[2], &amp;key-&gt;key[6], 6);</div><div class='del'>-		memcpy(&amp;key_v[4], &amp;key-&gt;key[12], 1);</div><div class='del'>-		keytype = AR5K_KEYTABLE_TYPE_104;</div><div class='del'>-		break;</div><div class='del'>-	/* WEP 128-bit  = 128-bit entered key + 24 bit IV = 152-bit */</div><div class='del'>-	case 128 / 8:</div><div class='del'>-		memcpy(&amp;key_v[0], &amp;key-&gt;key[0], 6);</div><div class='del'>-		memcpy(&amp;key_v[2], &amp;key-&gt;key[6], 6);</div><div class='del'>-		memcpy(&amp;key_v[4], &amp;key-&gt;key[12], 4);</div><div class='del'>-		keytype = AR5K_KEYTABLE_TYPE_128;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		return -EINVAL; /* shouldn't happen */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(key_v); i++)</div><div class='del'>-		ath5k_hw_reg_write(ah, le32_to_cpu(key_v[i]),</div><div class='del'>-				AR5K_KEYTABLE_OFF(entry, i));</div><div class='del'>-</div><div class='del'>-	ath5k_hw_reg_write(ah, keytype, AR5K_KEYTABLE_TYPE(entry));</div><div class='del'>-</div><div class='del'>-	return ath5k_hw_set_key_lladdr(ah, entry, mac);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int ath5k_hw_set_key_lladdr(struct ath5k_hw *ah, u16 entry, const u8 *mac)</div><div class='del'>-{</div><div class='del'>-	u32 low_id, high_id;</div><div class='del'>-</div><div class='del'>-	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='del'>-	 /* Invalid entry (key table overflow) */</div><div class='del'>-	AR5K_ASSERT_ENTRY(entry, AR5K_KEYTABLE_SIZE);</div><div class='del'>-</div><div class='del'>-	/* MAC may be NULL if it's a broadcast key. In this case no need to</div><div class='del'>-	 * to compute AR5K_LOW_ID and AR5K_HIGH_ID as we already know it. */</div><div class='del'>-	if (unlikely(mac == NULL)) {</div><div class='del'>-		low_id = 0xffffffff;</div><div class='del'>-		high_id = 0xffff | AR5K_KEYTABLE_VALID;</div><div class='del'>-	} else {</div><div class='del'>-		low_id = AR5K_LOW_ID(mac);</div><div class='del'>-		high_id = AR5K_HIGH_ID(mac) | AR5K_KEYTABLE_VALID;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ath5k_hw_reg_write(ah, low_id, AR5K_KEYTABLE_MAC0(entry));</div><div class='del'>-	ath5k_hw_reg_write(ah, high_id, AR5K_KEYTABLE_MAC1(entry));</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/********************************************\</div><div class='del'>-Queue Control Unit, DFS Control Unit Functions</div><div class='del'>-\********************************************/</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Initialize a transmit queue</div><div class='del'>- */</div><div class='del'>-int ath5k_hw_setup_tx_queue(struct ath5k_hw *ah, enum ath5k_tx_queue queue_type,</div><div class='del'>-		struct ath5k_txq_info *queue_info)</div><div class='del'>-{</div><div class='del'>-	unsigned int queue;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Get queue by type</div><div class='del'>-	 */</div><div class='del'>-	/*5210 only has 2 queues*/</div><div class='del'>-	if (ah-&gt;ah_version == AR5K_AR5210) {</div><div class='del'>-		switch (queue_type) {</div><div class='del'>-		case AR5K_TX_QUEUE_DATA:</div><div class='del'>-			queue = AR5K_TX_QUEUE_ID_NOQCU_DATA;</div><div class='del'>-			break;</div><div class='del'>-		case AR5K_TX_QUEUE_BEACON:</div><div class='del'>-		case AR5K_TX_QUEUE_CAB:</div><div class='del'>-			queue = AR5K_TX_QUEUE_ID_NOQCU_BEACON;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		switch (queue_type) {</div><div class='del'>-		case AR5K_TX_QUEUE_DATA:</div><div class='del'>-			for (queue = AR5K_TX_QUEUE_ID_DATA_MIN;</div><div class='del'>-				ah-&gt;ah_txq[queue].tqi_type !=</div><div class='del'>-				AR5K_TX_QUEUE_INACTIVE; queue++) {</div><div class='del'>-</div><div class='del'>-				if (queue &gt; AR5K_TX_QUEUE_ID_DATA_MAX)</div><div class='del'>-					return -EINVAL;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case AR5K_TX_QUEUE_UAPSD:</div><div class='del'>-			queue = AR5K_TX_QUEUE_ID_UAPSD;</div><div class='del'>-			break;</div><div class='del'>-		case AR5K_TX_QUEUE_BEACON:</div><div class='del'>-			queue = AR5K_TX_QUEUE_ID_BEACON;</div><div class='del'>-			break;</div><div class='del'>-		case AR5K_TX_QUEUE_CAB:</div><div class='del'>-			queue = AR5K_TX_QUEUE_ID_CAB;</div><div class='del'>-			break;</div><div class='del'>-		case AR5K_TX_QUEUE_XR_DATA:</div><div class='del'>-			if (ah-&gt;ah_version != AR5K_AR5212)</div><div class='del'>-				ATH5K_ERR(ah-&gt;ah_sc,</div><div class='del'>-					"XR data queues only supported in"</div><div class='del'>-					" 5212!\n");</div><div class='del'>-			queue = AR5K_TX_QUEUE_ID_XR_DATA;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Setup internal queue structure</div><div class='del'>-	 */</div><div class='del'>-	memset(&amp;ah-&gt;ah_txq[queue], 0, sizeof(struct ath5k_txq_info));</div><div class='del'>-	ah-&gt;ah_txq[queue].tqi_type = queue_type;</div><div class='del'>-</div><div class='del'>-	if (queue_info != NULL) {</div><div class='del'>-		queue_info-&gt;tqi_type = queue_type;</div><div class='del'>-		ret = ath5k_hw_setup_tx_queueprops(ah, queue, queue_info);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * We use ah_txq_status to hold a temp value for</div><div class='del'>-	 * the Secondary interrupt mask registers on 5211+</div><div class='del'>-	 * check out ath5k_hw_reset_tx_queue</div><div class='del'>-	 */</div><div class='del'>-	AR5K_Q_ENABLE_BITS(ah-&gt;ah_txq_status, queue);</div><div class='del'>-</div><div class='del'>-	return queue;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Setup a transmit queue</div><div class='del'>- */</div><div class='del'>-int ath5k_hw_setup_tx_queueprops(struct ath5k_hw *ah, int queue,</div><div class='del'>-				const struct ath5k_txq_info *queue_info)</div><div class='del'>-{</div><div class='del'>-	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='del'>-	AR5K_ASSERT_ENTRY(queue, ah-&gt;ah_capabilities.cap_queues.q_tx_num);</div><div class='del'>-</div><div class='del'>-	if (ah-&gt;ah_txq[queue].tqi_type == AR5K_TX_QUEUE_INACTIVE)</div><div class='del'>-		return -EIO;</div><div class='del'>-</div><div class='del'>-	memcpy(&amp;ah-&gt;ah_txq[queue], queue_info, sizeof(struct ath5k_txq_info));</div><div class='del'>-</div><div class='del'>-	/*XXX: Is this supported on 5210 ?*/</div><div class='del'>-	if ((queue_info-&gt;tqi_type == AR5K_TX_QUEUE_DATA &amp;&amp;</div><div class='del'>-			((queue_info-&gt;tqi_subtype == AR5K_WME_AC_VI) ||</div><div class='del'>-			(queue_info-&gt;tqi_subtype == AR5K_WME_AC_VO))) ||</div><div class='del'>-			queue_info-&gt;tqi_type == AR5K_TX_QUEUE_UAPSD)</div><div class='del'>-		ah-&gt;ah_txq[queue].tqi_flags |= AR5K_TXQ_FLAG_POST_FR_BKOFF_DIS;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Get properties for a specific transmit queue</div><div class='del'>- */</div><div class='del'>-int ath5k_hw_get_tx_queueprops(struct ath5k_hw *ah, int queue,</div><div class='del'>-		struct ath5k_txq_info *queue_info)</div><div class='del'>-{</div><div class='del'>-	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='del'>-	memcpy(queue_info, &amp;ah-&gt;ah_txq[queue], sizeof(struct ath5k_txq_info));</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Set a transmit queue inactive</div><div class='del'>- */</div><div class='del'>-void ath5k_hw_release_tx_queue(struct ath5k_hw *ah, unsigned int queue)</div><div class='del'>-{</div><div class='del'>-	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='del'>-	if (WARN_ON(queue &gt;= ah-&gt;ah_capabilities.cap_queues.q_tx_num))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* This queue will be skipped in further operations */</div><div class='del'>-	ah-&gt;ah_txq[queue].tqi_type = AR5K_TX_QUEUE_INACTIVE;</div><div class='del'>-	/*For SIMR setup*/</div><div class='del'>-	AR5K_Q_DISABLE_BITS(ah-&gt;ah_txq_status, queue);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Set DFS params for a transmit queue</div><div class='del'>- */</div><div class='del'>-int ath5k_hw_reset_tx_queue(struct ath5k_hw *ah, unsigned int queue)</div><div class='del'>-{</div><div class='del'>-	u32 cw_min, cw_max, retry_lg, retry_sh;</div><div class='del'>-	struct ath5k_txq_info *tq = &amp;ah-&gt;ah_txq[queue];</div><div class='del'>-</div><div class='del'>-	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='del'>-	AR5K_ASSERT_ENTRY(queue, ah-&gt;ah_capabilities.cap_queues.q_tx_num);</div><div class='del'>-</div><div class='del'>-	tq = &amp;ah-&gt;ah_txq[queue];</div><div class='del'>-</div><div class='del'>-	if (tq-&gt;tqi_type == AR5K_TX_QUEUE_INACTIVE)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (ah-&gt;ah_version == AR5K_AR5210) {</div><div class='del'>-		/* Only handle data queues, others will be ignored */</div><div class='del'>-		if (tq-&gt;tqi_type != AR5K_TX_QUEUE_DATA)</div><div class='del'>-			return 0;</div><div class='del'>-</div><div class='del'>-		/* Set Slot time */</div><div class='del'>-		ath5k_hw_reg_write(ah, ah-&gt;ah_turbo ?</div><div class='del'>-			AR5K_INIT_SLOT_TIME_TURBO : AR5K_INIT_SLOT_TIME,</div><div class='del'>-			AR5K_SLOT_TIME);</div><div class='del'>-		/* Set ACK_CTS timeout */</div><div class='del'>-		ath5k_hw_reg_write(ah, ah-&gt;ah_turbo ?</div><div class='del'>-			AR5K_INIT_ACK_CTS_TIMEOUT_TURBO :</div><div class='del'>-			AR5K_INIT_ACK_CTS_TIMEOUT, AR5K_SLOT_TIME);</div><div class='del'>-		/* Set Transmit Latency */</div><div class='del'>-		ath5k_hw_reg_write(ah, ah-&gt;ah_turbo ?</div><div class='del'>-			AR5K_INIT_TRANSMIT_LATENCY_TURBO :</div><div class='del'>-			AR5K_INIT_TRANSMIT_LATENCY, AR5K_USEC_5210);</div><div class='del'>-		/* Set IFS0 */</div><div class='del'>-		if (ah-&gt;ah_turbo)</div><div class='del'>-			 ath5k_hw_reg_write(ah, ((AR5K_INIT_SIFS_TURBO +</div><div class='del'>-				(ah-&gt;ah_aifs + tq-&gt;tqi_aifs) *</div><div class='del'>-				AR5K_INIT_SLOT_TIME_TURBO) &lt;&lt;</div><div class='del'>-				AR5K_IFS0_DIFS_S) | AR5K_INIT_SIFS_TURBO,</div><div class='del'>-				AR5K_IFS0);</div><div class='del'>-		else</div><div class='del'>-			ath5k_hw_reg_write(ah, ((AR5K_INIT_SIFS +</div><div class='del'>-				(ah-&gt;ah_aifs + tq-&gt;tqi_aifs) *</div><div class='del'>-				AR5K_INIT_SLOT_TIME) &lt;&lt; AR5K_IFS0_DIFS_S) |</div><div class='del'>-				AR5K_INIT_SIFS, AR5K_IFS0);</div><div class='del'>-</div><div class='del'>-		/* Set IFS1 */</div><div class='del'>-		ath5k_hw_reg_write(ah, ah-&gt;ah_turbo ?</div><div class='del'>-			AR5K_INIT_PROTO_TIME_CNTRL_TURBO :</div><div class='del'>-			AR5K_INIT_PROTO_TIME_CNTRL, AR5K_IFS1);</div><div class='del'>-		/* Set AR5K_PHY_SETTLING */</div><div class='del'>-		ath5k_hw_reg_write(ah, ah-&gt;ah_turbo ?</div><div class='del'>-			(ath5k_hw_reg_read(ah, AR5K_PHY_SETTLING) &amp; ~0x7F)</div><div class='del'>-			| 0x38 :</div><div class='del'>-			(ath5k_hw_reg_read(ah, AR5K_PHY_SETTLING) &amp; ~0x7F)</div><div class='del'>-			| 0x1C,</div><div class='del'>-			AR5K_PHY_SETTLING);</div><div class='del'>-		/* Set Frame Control Register */</div><div class='del'>-		ath5k_hw_reg_write(ah, ah-&gt;ah_turbo ?</div><div class='del'>-			(AR5K_PHY_FRAME_CTL_INI | AR5K_PHY_TURBO_MODE |</div><div class='del'>-			AR5K_PHY_TURBO_SHORT | 0x2020) :</div><div class='del'>-			(AR5K_PHY_FRAME_CTL_INI | 0x1020),</div><div class='del'>-			AR5K_PHY_FRAME_CTL_5210);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Calculate cwmin/max by channel mode</div><div class='del'>-	 */</div><div class='del'>-	cw_min = ah-&gt;ah_cw_min = AR5K_TUNE_CWMIN;</div><div class='del'>-	cw_max = ah-&gt;ah_cw_max = AR5K_TUNE_CWMAX;</div><div class='del'>-	ah-&gt;ah_aifs = AR5K_TUNE_AIFS;</div><div class='del'>-	/*XR is only supported on 5212*/</div><div class='del'>-	if (IS_CHAN_XR(ah-&gt;ah_current_channel) &amp;&amp;</div><div class='del'>-			ah-&gt;ah_version == AR5K_AR5212) {</div><div class='del'>-		cw_min = ah-&gt;ah_cw_min = AR5K_TUNE_CWMIN_XR;</div><div class='del'>-		cw_max = ah-&gt;ah_cw_max = AR5K_TUNE_CWMAX_XR;</div><div class='del'>-		ah-&gt;ah_aifs = AR5K_TUNE_AIFS_XR;</div><div class='del'>-	/*B mode is not supported on 5210*/</div><div class='del'>-	} else if (IS_CHAN_B(ah-&gt;ah_current_channel) &amp;&amp;</div><div class='del'>-			ah-&gt;ah_version != AR5K_AR5210) {</div><div class='del'>-		cw_min = ah-&gt;ah_cw_min = AR5K_TUNE_CWMIN_11B;</div><div class='del'>-		cw_max = ah-&gt;ah_cw_max = AR5K_TUNE_CWMAX_11B;</div><div class='del'>-		ah-&gt;ah_aifs = AR5K_TUNE_AIFS_11B;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cw_min = 1;</div><div class='del'>-	while (cw_min &lt; ah-&gt;ah_cw_min)</div><div class='del'>-		cw_min = (cw_min &lt;&lt; 1) | 1;</div><div class='del'>-</div><div class='del'>-	cw_min = tq-&gt;tqi_cw_min &lt; 0 ? (cw_min &gt;&gt; (-tq-&gt;tqi_cw_min)) :</div><div class='del'>-		((cw_min &lt;&lt; tq-&gt;tqi_cw_min) + (1 &lt;&lt; tq-&gt;tqi_cw_min) - 1);</div><div class='del'>-	cw_max = tq-&gt;tqi_cw_max &lt; 0 ? (cw_max &gt;&gt; (-tq-&gt;tqi_cw_max)) :</div><div class='del'>-		((cw_max &lt;&lt; tq-&gt;tqi_cw_max) + (1 &lt;&lt; tq-&gt;tqi_cw_max) - 1);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Calculate and set retry limits</div><div class='del'>-	 */</div><div class='del'>-	if (ah-&gt;ah_software_retry) {</div><div class='del'>-		/* XXX Need to test this */</div><div class='del'>-		retry_lg = ah-&gt;ah_limit_tx_retries;</div><div class='del'>-		retry_sh = retry_lg = retry_lg &gt; AR5K_DCU_RETRY_LMT_SH_RETRY ?</div><div class='del'>-			AR5K_DCU_RETRY_LMT_SH_RETRY : retry_lg;</div><div class='del'>-	} else {</div><div class='del'>-		retry_lg = AR5K_INIT_LG_RETRY;</div><div class='del'>-		retry_sh = AR5K_INIT_SH_RETRY;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*No QCU/DCU [5210]*/</div><div class='del'>-	if (ah-&gt;ah_version == AR5K_AR5210) {</div><div class='del'>-		ath5k_hw_reg_write(ah,</div><div class='del'>-			(cw_min &lt;&lt; AR5K_NODCU_RETRY_LMT_CW_MIN_S)</div><div class='del'>-			| AR5K_REG_SM(AR5K_INIT_SLG_RETRY,</div><div class='del'>-				AR5K_NODCU_RETRY_LMT_SLG_RETRY)</div><div class='del'>-			| AR5K_REG_SM(AR5K_INIT_SSH_RETRY,</div><div class='del'>-				AR5K_NODCU_RETRY_LMT_SSH_RETRY)</div><div class='del'>-			| AR5K_REG_SM(retry_lg, AR5K_NODCU_RETRY_LMT_LG_RETRY)</div><div class='del'>-			| AR5K_REG_SM(retry_sh, AR5K_NODCU_RETRY_LMT_SH_RETRY),</div><div class='del'>-			AR5K_NODCU_RETRY_LMT);</div><div class='del'>-	} else {</div><div class='del'>-		/*QCU/DCU [5211+]*/</div><div class='del'>-		ath5k_hw_reg_write(ah,</div><div class='del'>-			AR5K_REG_SM(AR5K_INIT_SLG_RETRY,</div><div class='del'>-				AR5K_DCU_RETRY_LMT_SLG_RETRY) |</div><div class='del'>-			AR5K_REG_SM(AR5K_INIT_SSH_RETRY,</div><div class='del'>-				AR5K_DCU_RETRY_LMT_SSH_RETRY) |</div><div class='del'>-			AR5K_REG_SM(retry_lg, AR5K_DCU_RETRY_LMT_LG_RETRY) |</div><div class='del'>-			AR5K_REG_SM(retry_sh, AR5K_DCU_RETRY_LMT_SH_RETRY),</div><div class='del'>-			AR5K_QUEUE_DFS_RETRY_LIMIT(queue));</div><div class='del'>-</div><div class='del'>-	/*===Rest is also for QCU/DCU only [5211+]===*/</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Set initial content window (cw_min/cw_max)</div><div class='del'>-		 * and arbitrated interframe space (aifs)...</div><div class='del'>-		 */</div><div class='del'>-		ath5k_hw_reg_write(ah,</div><div class='del'>-			AR5K_REG_SM(cw_min, AR5K_DCU_LCL_IFS_CW_MIN) |</div><div class='del'>-			AR5K_REG_SM(cw_max, AR5K_DCU_LCL_IFS_CW_MAX) |</div><div class='del'>-			AR5K_REG_SM(ah-&gt;ah_aifs + tq-&gt;tqi_aifs,</div><div class='del'>-				AR5K_DCU_LCL_IFS_AIFS),</div><div class='del'>-			AR5K_QUEUE_DFS_LOCAL_IFS(queue));</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Set misc registers</div><div class='del'>-		 */</div><div class='del'>-		ath5k_hw_reg_write(ah, AR5K_QCU_MISC_DCU_EARLY,</div><div class='del'>-			AR5K_QUEUE_MISC(queue));</div><div class='del'>-</div><div class='del'>-		if (tq-&gt;tqi_cbr_period) {</div><div class='del'>-			ath5k_hw_reg_write(ah, AR5K_REG_SM(tq-&gt;tqi_cbr_period,</div><div class='del'>-				AR5K_QCU_CBRCFG_INTVAL) |</div><div class='del'>-				AR5K_REG_SM(tq-&gt;tqi_cbr_overflow_limit,</div><div class='del'>-				AR5K_QCU_CBRCFG_ORN_THRES),</div><div class='del'>-				AR5K_QUEUE_CBRCFG(queue));</div><div class='del'>-			AR5K_REG_ENABLE_BITS(ah, AR5K_QUEUE_MISC(queue),</div><div class='del'>-				AR5K_QCU_MISC_FRSHED_CBR);</div><div class='del'>-			if (tq-&gt;tqi_cbr_overflow_limit)</div><div class='del'>-				AR5K_REG_ENABLE_BITS(ah,</div><div class='del'>-					AR5K_QUEUE_MISC(queue),</div><div class='del'>-					AR5K_QCU_MISC_CBR_THRES_ENABLE);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (tq-&gt;tqi_ready_time)</div><div class='del'>-			ath5k_hw_reg_write(ah, AR5K_REG_SM(tq-&gt;tqi_ready_time,</div><div class='del'>-				AR5K_QCU_RDYTIMECFG_INTVAL) |</div><div class='del'>-				AR5K_QCU_RDYTIMECFG_ENABLE,</div><div class='del'>-				AR5K_QUEUE_RDYTIMECFG(queue));</div><div class='del'>-</div><div class='del'>-		if (tq-&gt;tqi_burst_time) {</div><div class='del'>-			ath5k_hw_reg_write(ah, AR5K_REG_SM(tq-&gt;tqi_burst_time,</div><div class='del'>-				AR5K_DCU_CHAN_TIME_DUR) |</div><div class='del'>-				AR5K_DCU_CHAN_TIME_ENABLE,</div><div class='del'>-				AR5K_QUEUE_DFS_CHANNEL_TIME(queue));</div><div class='del'>-</div><div class='del'>-			if (tq-&gt;tqi_flags &amp; AR5K_TXQ_FLAG_RDYTIME_EXP_POLICY_ENABLE)</div><div class='del'>-				AR5K_REG_ENABLE_BITS(ah,</div><div class='del'>-					AR5K_QUEUE_MISC(queue),</div><div class='del'>-					AR5K_QCU_MISC_RDY_VEOL_POLICY);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (tq-&gt;tqi_flags &amp; AR5K_TXQ_FLAG_BACKOFF_DISABLE)</div><div class='del'>-			ath5k_hw_reg_write(ah, AR5K_DCU_MISC_POST_FR_BKOFF_DIS,</div><div class='del'>-				AR5K_QUEUE_DFS_MISC(queue));</div><div class='del'>-</div><div class='del'>-		if (tq-&gt;tqi_flags &amp; AR5K_TXQ_FLAG_FRAG_BURST_BACKOFF_ENABLE)</div><div class='del'>-			ath5k_hw_reg_write(ah, AR5K_DCU_MISC_BACKOFF_FRAG,</div><div class='del'>-				AR5K_QUEUE_DFS_MISC(queue));</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Set registers by queue type</div><div class='del'>-		 */</div><div class='del'>-		switch (tq-&gt;tqi_type) {</div><div class='del'>-		case AR5K_TX_QUEUE_BEACON:</div><div class='del'>-			AR5K_REG_ENABLE_BITS(ah, AR5K_QUEUE_MISC(queue),</div><div class='del'>-				AR5K_QCU_MISC_FRSHED_DBA_GT |</div><div class='del'>-				AR5K_QCU_MISC_CBREXP_BCN |</div><div class='del'>-				AR5K_QCU_MISC_BCN_ENABLE);</div><div class='del'>-</div><div class='del'>-			AR5K_REG_ENABLE_BITS(ah, AR5K_QUEUE_DFS_MISC(queue),</div><div class='del'>-				(AR5K_DCU_MISC_ARBLOCK_CTL_GLOBAL &lt;&lt;</div><div class='del'>-				AR5K_DCU_MISC_ARBLOCK_CTL_S) |</div><div class='del'>-				AR5K_DCU_MISC_POST_FR_BKOFF_DIS |</div><div class='del'>-				AR5K_DCU_MISC_BCN_ENABLE);</div><div class='del'>-</div><div class='del'>-			ath5k_hw_reg_write(ah, ((AR5K_TUNE_BEACON_INTERVAL -</div><div class='del'>-				(AR5K_TUNE_SW_BEACON_RESP -</div><div class='del'>-				AR5K_TUNE_DMA_BEACON_RESP) -</div><div class='del'>-				AR5K_TUNE_ADDITIONAL_SWBA_BACKOFF) * 1024) |</div><div class='del'>-				AR5K_QCU_RDYTIMECFG_ENABLE,</div><div class='del'>-				AR5K_QUEUE_RDYTIMECFG(queue));</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case AR5K_TX_QUEUE_CAB:</div><div class='del'>-			AR5K_REG_ENABLE_BITS(ah, AR5K_QUEUE_MISC(queue),</div><div class='del'>-				AR5K_QCU_MISC_FRSHED_DBA_GT |</div><div class='del'>-				AR5K_QCU_MISC_CBREXP |</div><div class='del'>-				AR5K_QCU_MISC_CBREXP_BCN);</div><div class='del'>-</div><div class='del'>-			AR5K_REG_ENABLE_BITS(ah, AR5K_QUEUE_DFS_MISC(queue),</div><div class='del'>-				(AR5K_DCU_MISC_ARBLOCK_CTL_GLOBAL &lt;&lt;</div><div class='del'>-				AR5K_DCU_MISC_ARBLOCK_CTL_S));</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case AR5K_TX_QUEUE_UAPSD:</div><div class='del'>-			AR5K_REG_ENABLE_BITS(ah, AR5K_QUEUE_MISC(queue),</div><div class='del'>-				AR5K_QCU_MISC_CBREXP);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case AR5K_TX_QUEUE_DATA:</div><div class='del'>-		default:</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Enable interrupts for this tx queue</div><div class='del'>-		 * in the secondary interrupt mask registers</div><div class='del'>-		 */</div><div class='del'>-		if (tq-&gt;tqi_flags &amp; AR5K_TXQ_FLAG_TXOKINT_ENABLE)</div><div class='del'>-			AR5K_Q_ENABLE_BITS(ah-&gt;ah_txq_imr_txok, queue);</div><div class='del'>-</div><div class='del'>-		if (tq-&gt;tqi_flags &amp; AR5K_TXQ_FLAG_TXERRINT_ENABLE)</div><div class='del'>-			AR5K_Q_ENABLE_BITS(ah-&gt;ah_txq_imr_txerr, queue);</div><div class='del'>-</div><div class='del'>-		if (tq-&gt;tqi_flags &amp; AR5K_TXQ_FLAG_TXURNINT_ENABLE)</div><div class='del'>-			AR5K_Q_ENABLE_BITS(ah-&gt;ah_txq_imr_txurn, queue);</div><div class='del'>-</div><div class='del'>-		if (tq-&gt;tqi_flags &amp; AR5K_TXQ_FLAG_TXDESCINT_ENABLE)</div><div class='del'>-			AR5K_Q_ENABLE_BITS(ah-&gt;ah_txq_imr_txdesc, queue);</div><div class='del'>-</div><div class='del'>-		if (tq-&gt;tqi_flags &amp; AR5K_TXQ_FLAG_TXEOLINT_ENABLE)</div><div class='del'>-			AR5K_Q_ENABLE_BITS(ah-&gt;ah_txq_imr_txeol, queue);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-		/* Update secondary interrupt mask registers */</div><div class='del'>-		ah-&gt;ah_txq_imr_txok &amp;= ah-&gt;ah_txq_status;</div><div class='del'>-		ah-&gt;ah_txq_imr_txerr &amp;= ah-&gt;ah_txq_status;</div><div class='del'>-		ah-&gt;ah_txq_imr_txurn &amp;= ah-&gt;ah_txq_status;</div><div class='del'>-		ah-&gt;ah_txq_imr_txdesc &amp;= ah-&gt;ah_txq_status;</div><div class='del'>-		ah-&gt;ah_txq_imr_txeol &amp;= ah-&gt;ah_txq_status;</div><div class='del'>-</div><div class='del'>-		ath5k_hw_reg_write(ah, AR5K_REG_SM(ah-&gt;ah_txq_imr_txok,</div><div class='del'>-			AR5K_SIMR0_QCU_TXOK) |</div><div class='del'>-			AR5K_REG_SM(ah-&gt;ah_txq_imr_txdesc,</div><div class='del'>-			AR5K_SIMR0_QCU_TXDESC), AR5K_SIMR0);</div><div class='del'>-		ath5k_hw_reg_write(ah, AR5K_REG_SM(ah-&gt;ah_txq_imr_txerr,</div><div class='del'>-			AR5K_SIMR1_QCU_TXERR) |</div><div class='del'>-			AR5K_REG_SM(ah-&gt;ah_txq_imr_txeol,</div><div class='del'>-			AR5K_SIMR1_QCU_TXEOL), AR5K_SIMR1);</div><div class='del'>-		ath5k_hw_reg_write(ah, AR5K_REG_SM(ah-&gt;ah_txq_imr_txurn,</div><div class='del'>-			AR5K_SIMR2_QCU_TXURN), AR5K_SIMR2);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Get number of pending frames</div><div class='del'>- * for a specific queue [5211+]</div><div class='del'>- */</div><div class='del'>-u32 ath5k_hw_num_tx_pending(struct ath5k_hw *ah, unsigned int queue) {</div><div class='del'>-	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='del'>-	AR5K_ASSERT_ENTRY(queue, ah-&gt;ah_capabilities.cap_queues.q_tx_num);</div><div class='del'>-</div><div class='del'>-	/* Return if queue is declared inactive */</div><div class='del'>-	if (ah-&gt;ah_txq[queue].tqi_type == AR5K_TX_QUEUE_INACTIVE)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	/* XXX: How about AR5K_CFG_TXCNT ? */</div><div class='del'>-	if (ah-&gt;ah_version == AR5K_AR5210)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	return AR5K_QUEUE_STATUS(queue) &amp; AR5K_QCU_STS_FRMPENDCNT;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Set slot time</div><div class='del'>- */</div><div class='del'>-int ath5k_hw_set_slot_time(struct ath5k_hw *ah, unsigned int slot_time)</div><div class='del'>-{</div><div class='del'>-	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='del'>-	if (slot_time &lt; AR5K_SLOT_TIME_9 || slot_time &gt; AR5K_SLOT_TIME_MAX)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (ah-&gt;ah_version == AR5K_AR5210)</div><div class='del'>-		ath5k_hw_reg_write(ah, ath5k_hw_htoclock(slot_time,</div><div class='del'>-				ah-&gt;ah_turbo), AR5K_SLOT_TIME);</div><div class='del'>-	else</div><div class='del'>-		ath5k_hw_reg_write(ah, slot_time, AR5K_DCU_GBL_IFS_SLOT);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Get slot time</div><div class='del'>- */</div><div class='del'>-unsigned int ath5k_hw_get_slot_time(struct ath5k_hw *ah)</div><div class='del'>-{</div><div class='del'>-	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='del'>-	if (ah-&gt;ah_version == AR5K_AR5210)</div><div class='del'>-		return ath5k_hw_clocktoh(ath5k_hw_reg_read(ah,</div><div class='del'>-				AR5K_SLOT_TIME) &amp; 0xffff, ah-&gt;ah_turbo);</div><div class='del'>-	else</div><div class='del'>-		return ath5k_hw_reg_read(ah, AR5K_DCU_GBL_IFS_SLOT) &amp; 0xffff;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/******************************\</div><div class='del'>- Hardware Descriptor Functions</div><div class='del'>-\******************************/</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * TX Descriptor</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Initialize the 2-word tx descriptor on 5210/5211</div><div class='del'>- */</div><div class='del'>-static int</div><div class='del'>-ath5k_hw_setup_2word_tx_desc(struct ath5k_hw *ah, struct ath5k_desc *desc,</div><div class='del'>-	unsigned int pkt_len, unsigned int hdr_len, enum ath5k_pkt_type type,</div><div class='del'>-	unsigned int tx_power, unsigned int tx_rate0, unsigned int tx_tries0,</div><div class='del'>-	unsigned int key_index, unsigned int antenna_mode, unsigned int flags,</div><div class='del'>-	unsigned int rtscts_rate, unsigned int rtscts_duration)</div><div class='del'>-{</div><div class='del'>-	u32 frame_type;</div><div class='del'>-	struct ath5k_hw_2w_tx_ctl *tx_ctl;</div><div class='del'>-	unsigned int frame_len;</div><div class='del'>-</div><div class='del'>-	tx_ctl = &amp;desc-&gt;ud.ds_tx5210.tx_ctl;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Validate input</div><div class='del'>-	 * - Zero retries don't make sense.</div><div class='del'>-	 * - A zero rate will put the HW into a mode where it continously sends</div><div class='del'>-	 *   noise on the channel, so it is important to avoid this.</div><div class='del'>-	 */</div><div class='del'>-	if (unlikely(tx_tries0 == 0)) {</div><div class='del'>-		ATH5K_ERR(ah-&gt;ah_sc, "zero retries\n");</div><div class='del'>-		WARN_ON(1);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	if (unlikely(tx_rate0 == 0)) {</div><div class='del'>-		ATH5K_ERR(ah-&gt;ah_sc, "zero rate\n");</div><div class='del'>-		WARN_ON(1);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Clear descriptor */</div><div class='del'>-	memset(&amp;desc-&gt;ud.ds_tx5210, 0, sizeof(struct ath5k_hw_5210_tx_desc));</div><div class='del'>-</div><div class='del'>-	/* Setup control descriptor */</div><div class='del'>-</div><div class='del'>-	/* Verify and set frame length */</div><div class='del'>-</div><div class='del'>-	/* remove padding we might have added before */</div><div class='del'>-	frame_len = pkt_len - (hdr_len &amp; 3) + FCS_LEN;</div><div class='del'>-</div><div class='del'>-	if (frame_len &amp; ~AR5K_2W_TX_DESC_CTL0_FRAME_LEN)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	tx_ctl-&gt;tx_control_0 = frame_len &amp; AR5K_2W_TX_DESC_CTL0_FRAME_LEN;</div><div class='del'>-</div><div class='del'>-	/* Verify and set buffer length */</div><div class='del'>-</div><div class='del'>-	/* NB: beacon's BufLen must be a multiple of 4 bytes */</div><div class='del'>-	if(type == AR5K_PKT_TYPE_BEACON)</div><div class='del'>-		pkt_len = roundup(pkt_len, 4);</div><div class='del'>-</div><div class='del'>-	if (pkt_len &amp; ~AR5K_2W_TX_DESC_CTL1_BUF_LEN)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	tx_ctl-&gt;tx_control_1 = pkt_len &amp; AR5K_2W_TX_DESC_CTL1_BUF_LEN;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Verify and set header length</div><div class='del'>-	 * XXX: I only found that on 5210 code, does it work on 5211 ?</div><div class='del'>-	 */</div><div class='del'>-	if (ah-&gt;ah_version == AR5K_AR5210) {</div><div class='del'>-		if (hdr_len &amp; ~AR5K_2W_TX_DESC_CTL0_HEADER_LEN)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		tx_ctl-&gt;tx_control_0 |=</div><div class='del'>-			AR5K_REG_SM(hdr_len, AR5K_2W_TX_DESC_CTL0_HEADER_LEN);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*Diferences between 5210-5211*/</div><div class='del'>-	if (ah-&gt;ah_version == AR5K_AR5210) {</div><div class='del'>-		switch (type) {</div><div class='del'>-		case AR5K_PKT_TYPE_BEACON:</div><div class='del'>-		case AR5K_PKT_TYPE_PROBE_RESP:</div><div class='del'>-			frame_type = AR5K_AR5210_TX_DESC_FRAME_TYPE_NO_DELAY;</div><div class='del'>-		case AR5K_PKT_TYPE_PIFS:</div><div class='del'>-			frame_type = AR5K_AR5210_TX_DESC_FRAME_TYPE_PIFS;</div><div class='del'>-		default:</div><div class='del'>-			frame_type = type /*&lt;&lt; 2 ?*/;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		tx_ctl-&gt;tx_control_0 |=</div><div class='del'>-			AR5K_REG_SM(frame_type, AR5K_2W_TX_DESC_CTL0_FRAME_TYPE) |</div><div class='del'>-			AR5K_REG_SM(tx_rate0, AR5K_2W_TX_DESC_CTL0_XMIT_RATE);</div><div class='del'>-	} else {</div><div class='del'>-		tx_ctl-&gt;tx_control_0 |=</div><div class='del'>-			AR5K_REG_SM(tx_rate0, AR5K_2W_TX_DESC_CTL0_XMIT_RATE) |</div><div class='del'>-			AR5K_REG_SM(antenna_mode, AR5K_2W_TX_DESC_CTL0_ANT_MODE_XMIT);</div><div class='del'>-		tx_ctl-&gt;tx_control_1 |=</div><div class='del'>-			AR5K_REG_SM(type, AR5K_2W_TX_DESC_CTL1_FRAME_TYPE);</div><div class='del'>-	}</div><div class='del'>-#define _TX_FLAGS(_c, _flag)						\</div><div class='del'>-	if (flags &amp; AR5K_TXDESC_##_flag)				\</div><div class='del'>-		tx_ctl-&gt;tx_control_##_c |=				\</div><div class='del'>-			AR5K_2W_TX_DESC_CTL##_c##_##_flag</div><div class='del'>-</div><div class='del'>-	_TX_FLAGS(0, CLRDMASK);</div><div class='del'>-	_TX_FLAGS(0, VEOL);</div><div class='del'>-	_TX_FLAGS(0, INTREQ);</div><div class='del'>-	_TX_FLAGS(0, RTSENA);</div><div class='del'>-	_TX_FLAGS(1, NOACK);</div><div class='del'>-</div><div class='del'>-#undef _TX_FLAGS</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * WEP crap</div><div class='del'>-	 */</div><div class='del'>-	if (key_index != AR5K_TXKEYIX_INVALID) {</div><div class='del'>-		tx_ctl-&gt;tx_control_0 |=</div><div class='del'>-			AR5K_2W_TX_DESC_CTL0_ENCRYPT_KEY_VALID;</div><div class='del'>-		tx_ctl-&gt;tx_control_1 |=</div><div class='del'>-			AR5K_REG_SM(key_index,</div><div class='del'>-			AR5K_2W_TX_DESC_CTL1_ENCRYPT_KEY_INDEX);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * RTS/CTS Duration [5210 ?]</div><div class='del'>-	 */</div><div class='del'>-	if ((ah-&gt;ah_version == AR5K_AR5210) &amp;&amp;</div><div class='del'>-			(flags &amp; (AR5K_TXDESC_RTSENA | AR5K_TXDESC_CTSENA)))</div><div class='del'>-		tx_ctl-&gt;tx_control_1 |= rtscts_duration &amp;</div><div class='del'>-				AR5K_2W_TX_DESC_CTL1_RTS_DURATION;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Initialize the 4-word tx descriptor on 5212</div><div class='del'>- */</div><div class='del'>-static int ath5k_hw_setup_4word_tx_desc(struct ath5k_hw *ah,</div><div class='del'>-	struct ath5k_desc *desc, unsigned int pkt_len, unsigned int hdr_len,</div><div class='del'>-	enum ath5k_pkt_type type, unsigned int tx_power, unsigned int tx_rate0,</div><div class='del'>-	unsigned int tx_tries0, unsigned int key_index,</div><div class='del'>-	unsigned int antenna_mode, unsigned int flags, unsigned int rtscts_rate,</div><div class='del'>-	unsigned int rtscts_duration)</div><div class='del'>-{</div><div class='del'>-	struct ath5k_hw_4w_tx_ctl *tx_ctl;</div><div class='del'>-	unsigned int frame_len;</div><div class='del'>-</div><div class='del'>-	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='del'>-	tx_ctl = &amp;desc-&gt;ud.ds_tx5212.tx_ctl;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Validate input</div><div class='del'>-	 * - Zero retries don't make sense.</div><div class='del'>-	 * - A zero rate will put the HW into a mode where it continously sends</div><div class='del'>-	 *   noise on the channel, so it is important to avoid this.</div><div class='del'>-	 */</div><div class='del'>-	if (unlikely(tx_tries0 == 0)) {</div><div class='del'>-		ATH5K_ERR(ah-&gt;ah_sc, "zero retries\n");</div><div class='del'>-		WARN_ON(1);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	if (unlikely(tx_rate0 == 0)) {</div><div class='del'>-		ATH5K_ERR(ah-&gt;ah_sc, "zero rate\n");</div><div class='del'>-		WARN_ON(1);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Clear descriptor */</div><div class='del'>-	memset(&amp;desc-&gt;ud.ds_tx5212, 0, sizeof(struct ath5k_hw_5212_tx_desc));</div><div class='del'>-</div><div class='del'>-	/* Setup control descriptor */</div><div class='del'>-</div><div class='del'>-	/* Verify and set frame length */</div><div class='del'>-</div><div class='del'>-	/* remove padding we might have added before */</div><div class='del'>-	frame_len = pkt_len - (hdr_len &amp; 3) + FCS_LEN;</div><div class='del'>-</div><div class='del'>-	if (frame_len &amp; ~AR5K_4W_TX_DESC_CTL0_FRAME_LEN)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	tx_ctl-&gt;tx_control_0 = frame_len &amp; AR5K_4W_TX_DESC_CTL0_FRAME_LEN;</div><div class='del'>-</div><div class='del'>-	/* Verify and set buffer length */</div><div class='del'>-</div><div class='del'>-	/* NB: beacon's BufLen must be a multiple of 4 bytes */</div><div class='del'>-	if(type == AR5K_PKT_TYPE_BEACON)</div><div class='del'>-		pkt_len = roundup(pkt_len, 4);</div><div class='del'>-</div><div class='del'>-	if (pkt_len &amp; ~AR5K_4W_TX_DESC_CTL1_BUF_LEN)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	tx_ctl-&gt;tx_control_1 = pkt_len &amp; AR5K_4W_TX_DESC_CTL1_BUF_LEN;</div><div class='del'>-</div><div class='del'>-	tx_ctl-&gt;tx_control_0 |=</div><div class='del'>-		AR5K_REG_SM(tx_power, AR5K_4W_TX_DESC_CTL0_XMIT_POWER) |</div><div class='del'>-		AR5K_REG_SM(antenna_mode, AR5K_4W_TX_DESC_CTL0_ANT_MODE_XMIT);</div><div class='del'>-	tx_ctl-&gt;tx_control_1 |= AR5K_REG_SM(type,</div><div class='del'>-					AR5K_4W_TX_DESC_CTL1_FRAME_TYPE);</div><div class='del'>-	tx_ctl-&gt;tx_control_2 = AR5K_REG_SM(tx_tries0 + AR5K_TUNE_HWTXTRIES,</div><div class='del'>-					AR5K_4W_TX_DESC_CTL2_XMIT_TRIES0);</div><div class='del'>-	tx_ctl-&gt;tx_control_3 = tx_rate0 &amp; AR5K_4W_TX_DESC_CTL3_XMIT_RATE0;</div><div class='del'>-</div><div class='del'>-#define _TX_FLAGS(_c, _flag)			\</div><div class='del'>-	if (flags &amp; AR5K_TXDESC_##_flag)	\</div><div class='del'>-		tx_ctl-&gt;tx_control_##_c |=	\</div><div class='del'>-			AR5K_4W_TX_DESC_CTL##_c##_##_flag</div><div class='del'>-</div><div class='del'>-	_TX_FLAGS(0, CLRDMASK);</div><div class='del'>-	_TX_FLAGS(0, VEOL);</div><div class='del'>-	_TX_FLAGS(0, INTREQ);</div><div class='del'>-	_TX_FLAGS(0, RTSENA);</div><div class='del'>-	_TX_FLAGS(0, CTSENA);</div><div class='del'>-	_TX_FLAGS(1, NOACK);</div><div class='del'>-</div><div class='del'>-#undef _TX_FLAGS</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * WEP crap</div><div class='del'>-	 */</div><div class='del'>-	if (key_index != AR5K_TXKEYIX_INVALID) {</div><div class='del'>-		tx_ctl-&gt;tx_control_0 |= AR5K_4W_TX_DESC_CTL0_ENCRYPT_KEY_VALID;</div><div class='del'>-		tx_ctl-&gt;tx_control_1 |= AR5K_REG_SM(key_index,</div><div class='del'>-				AR5K_4W_TX_DESC_CTL1_ENCRYPT_KEY_INDEX);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * RTS/CTS</div><div class='del'>-	 */</div><div class='del'>-	if (flags &amp; (AR5K_TXDESC_RTSENA | AR5K_TXDESC_CTSENA)) {</div><div class='del'>-		if ((flags &amp; AR5K_TXDESC_RTSENA) &amp;&amp;</div><div class='del'>-				(flags &amp; AR5K_TXDESC_CTSENA))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		tx_ctl-&gt;tx_control_2 |= rtscts_duration &amp;</div><div class='del'>-				AR5K_4W_TX_DESC_CTL2_RTS_DURATION;</div><div class='del'>-		tx_ctl-&gt;tx_control_3 |= AR5K_REG_SM(rtscts_rate,</div><div class='del'>-				AR5K_4W_TX_DESC_CTL3_RTS_CTS_RATE);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Initialize a 4-word multirate tx descriptor on 5212</div><div class='del'>- */</div><div class='del'>-static int</div><div class='del'>-ath5k_hw_setup_xr_tx_desc(struct ath5k_hw *ah, struct ath5k_desc *desc,</div><div class='del'>-	unsigned int tx_rate1, u_int tx_tries1, u_int tx_rate2, u_int tx_tries2,</div><div class='del'>-	unsigned int tx_rate3, u_int tx_tries3)</div><div class='del'>-{</div><div class='del'>-	struct ath5k_hw_4w_tx_ctl *tx_ctl;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Rates can be 0 as long as the retry count is 0 too.</div><div class='del'>-	 * A zero rate and nonzero retry count will put the HW into a mode where</div><div class='del'>-	 * it continously sends noise on the channel, so it is important to</div><div class='del'>-	 * avoid this.</div><div class='del'>-	 */</div><div class='del'>-	if (unlikely((tx_rate1 == 0 &amp;&amp; tx_tries1 != 0) ||</div><div class='del'>-		     (tx_rate2 == 0 &amp;&amp; tx_tries2 != 0) ||</div><div class='del'>-		     (tx_rate3 == 0 &amp;&amp; tx_tries3 != 0))) {</div><div class='del'>-		ATH5K_ERR(ah-&gt;ah_sc, "zero rate\n");</div><div class='del'>-		WARN_ON(1);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ah-&gt;ah_version == AR5K_AR5212) {</div><div class='del'>-		tx_ctl = &amp;desc-&gt;ud.ds_tx5212.tx_ctl;</div><div class='del'>-</div><div class='del'>-#define _XTX_TRIES(_n)							\</div><div class='del'>-	if (tx_tries##_n) {						\</div><div class='del'>-		tx_ctl-&gt;tx_control_2 |=				\</div><div class='del'>-		    AR5K_REG_SM(tx_tries##_n,				\</div><div class='del'>-		    AR5K_4W_TX_DESC_CTL2_XMIT_TRIES##_n);		\</div><div class='del'>-		tx_ctl-&gt;tx_control_3 |=				\</div><div class='del'>-		    AR5K_REG_SM(tx_rate##_n,				\</div><div class='del'>-		    AR5K_4W_TX_DESC_CTL3_XMIT_RATE##_n);		\</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-		_XTX_TRIES(1);</div><div class='del'>-		_XTX_TRIES(2);</div><div class='del'>-		_XTX_TRIES(3);</div><div class='del'>-</div><div class='del'>-#undef _XTX_TRIES</div><div class='del'>-</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Proccess the tx status descriptor on 5210/5211</div><div class='del'>- */</div><div class='del'>-static int ath5k_hw_proc_2word_tx_status(struct ath5k_hw *ah,</div><div class='del'>-		struct ath5k_desc *desc, struct ath5k_tx_status *ts)</div><div class='del'>-{</div><div class='del'>-	struct ath5k_hw_2w_tx_ctl *tx_ctl;</div><div class='del'>-	struct ath5k_hw_tx_status *tx_status;</div><div class='del'>-</div><div class='del'>-	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='del'>-</div><div class='del'>-	tx_ctl = &amp;desc-&gt;ud.ds_tx5210.tx_ctl;</div><div class='del'>-	tx_status = &amp;desc-&gt;ud.ds_tx5210.tx_stat;</div><div class='del'>-</div><div class='del'>-	/* No frame has been send or error */</div><div class='del'>-	if (unlikely((tx_status-&gt;tx_status_1 &amp; AR5K_DESC_TX_STATUS1_DONE) == 0))</div><div class='del'>-		return -EINPROGRESS;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Get descriptor status</div><div class='del'>-	 */</div><div class='del'>-	ts-&gt;ts_tstamp = AR5K_REG_MS(tx_status-&gt;tx_status_0,</div><div class='del'>-		AR5K_DESC_TX_STATUS0_SEND_TIMESTAMP);</div><div class='del'>-	ts-&gt;ts_shortretry = AR5K_REG_MS(tx_status-&gt;tx_status_0,</div><div class='del'>-		AR5K_DESC_TX_STATUS0_SHORT_RETRY_COUNT);</div><div class='del'>-	ts-&gt;ts_longretry = AR5K_REG_MS(tx_status-&gt;tx_status_0,</div><div class='del'>-		AR5K_DESC_TX_STATUS0_LONG_RETRY_COUNT);</div><div class='del'>-	/*TODO: ts-&gt;ts_virtcol + test*/</div><div class='del'>-	ts-&gt;ts_seqnum = AR5K_REG_MS(tx_status-&gt;tx_status_1,</div><div class='del'>-		AR5K_DESC_TX_STATUS1_SEQ_NUM);</div><div class='del'>-	ts-&gt;ts_rssi = AR5K_REG_MS(tx_status-&gt;tx_status_1,</div><div class='del'>-		AR5K_DESC_TX_STATUS1_ACK_SIG_STRENGTH);</div><div class='del'>-	ts-&gt;ts_antenna = 1;</div><div class='del'>-	ts-&gt;ts_status = 0;</div><div class='del'>-	ts-&gt;ts_rate = AR5K_REG_MS(tx_ctl-&gt;tx_control_0,</div><div class='del'>-		AR5K_2W_TX_DESC_CTL0_XMIT_RATE);</div><div class='del'>-</div><div class='del'>-	if ((tx_status-&gt;tx_status_0 &amp; AR5K_DESC_TX_STATUS0_FRAME_XMIT_OK) == 0){</div><div class='del'>-		if (tx_status-&gt;tx_status_0 &amp;</div><div class='del'>-				AR5K_DESC_TX_STATUS0_EXCESSIVE_RETRIES)</div><div class='del'>-			ts-&gt;ts_status |= AR5K_TXERR_XRETRY;</div><div class='del'>-</div><div class='del'>-		if (tx_status-&gt;tx_status_0 &amp; AR5K_DESC_TX_STATUS0_FIFO_UNDERRUN)</div><div class='del'>-			ts-&gt;ts_status |= AR5K_TXERR_FIFO;</div><div class='del'>-</div><div class='del'>-		if (tx_status-&gt;tx_status_0 &amp; AR5K_DESC_TX_STATUS0_FILTERED)</div><div class='del'>-			ts-&gt;ts_status |= AR5K_TXERR_FILT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Proccess a tx descriptor on 5212</div><div class='del'>- */</div><div class='del'>-static int ath5k_hw_proc_4word_tx_status(struct ath5k_hw *ah,</div><div class='del'>-		struct ath5k_desc *desc, struct ath5k_tx_status *ts)</div><div class='del'>-{</div><div class='del'>-	struct ath5k_hw_4w_tx_ctl *tx_ctl;</div><div class='del'>-	struct ath5k_hw_tx_status *tx_status;</div><div class='del'>-</div><div class='del'>-	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='del'>-</div><div class='del'>-	tx_ctl = &amp;desc-&gt;ud.ds_tx5212.tx_ctl;</div><div class='del'>-	tx_status = &amp;desc-&gt;ud.ds_tx5212.tx_stat;</div><div class='del'>-</div><div class='del'>-	/* No frame has been send or error */</div><div class='del'>-	if (unlikely((tx_status-&gt;tx_status_1 &amp; AR5K_DESC_TX_STATUS1_DONE) == 0))</div><div class='del'>-		return -EINPROGRESS;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Get descriptor status</div><div class='del'>-	 */</div><div class='del'>-	ts-&gt;ts_tstamp = AR5K_REG_MS(tx_status-&gt;tx_status_0,</div><div class='del'>-		AR5K_DESC_TX_STATUS0_SEND_TIMESTAMP);</div><div class='del'>-	ts-&gt;ts_shortretry = AR5K_REG_MS(tx_status-&gt;tx_status_0,</div><div class='del'>-		AR5K_DESC_TX_STATUS0_SHORT_RETRY_COUNT);</div><div class='del'>-	ts-&gt;ts_longretry = AR5K_REG_MS(tx_status-&gt;tx_status_0,</div><div class='del'>-		AR5K_DESC_TX_STATUS0_LONG_RETRY_COUNT);</div><div class='del'>-	ts-&gt;ts_seqnum = AR5K_REG_MS(tx_status-&gt;tx_status_1,</div><div class='del'>-		AR5K_DESC_TX_STATUS1_SEQ_NUM);</div><div class='del'>-	ts-&gt;ts_rssi = AR5K_REG_MS(tx_status-&gt;tx_status_1,</div><div class='del'>-		AR5K_DESC_TX_STATUS1_ACK_SIG_STRENGTH);</div><div class='del'>-	ts-&gt;ts_antenna = (tx_status-&gt;tx_status_1 &amp;</div><div class='del'>-		AR5K_DESC_TX_STATUS1_XMIT_ANTENNA) ? 2 : 1;</div><div class='del'>-	ts-&gt;ts_status = 0;</div><div class='del'>-</div><div class='del'>-	switch (AR5K_REG_MS(tx_status-&gt;tx_status_1,</div><div class='del'>-			AR5K_DESC_TX_STATUS1_FINAL_TS_INDEX)) {</div><div class='del'>-	case 0:</div><div class='del'>-		ts-&gt;ts_rate = tx_ctl-&gt;tx_control_3 &amp;</div><div class='del'>-			AR5K_4W_TX_DESC_CTL3_XMIT_RATE0;</div><div class='del'>-		break;</div><div class='del'>-	case 1:</div><div class='del'>-		ts-&gt;ts_rate = AR5K_REG_MS(tx_ctl-&gt;tx_control_3,</div><div class='del'>-			AR5K_4W_TX_DESC_CTL3_XMIT_RATE1);</div><div class='del'>-		ts-&gt;ts_longretry += AR5K_REG_MS(tx_ctl-&gt;tx_control_2,</div><div class='del'>-			AR5K_4W_TX_DESC_CTL2_XMIT_TRIES1);</div><div class='del'>-		break;</div><div class='del'>-	case 2:</div><div class='del'>-		ts-&gt;ts_rate = AR5K_REG_MS(tx_ctl-&gt;tx_control_3,</div><div class='del'>-			AR5K_4W_TX_DESC_CTL3_XMIT_RATE2);</div><div class='del'>-		ts-&gt;ts_longretry += AR5K_REG_MS(tx_ctl-&gt;tx_control_2,</div><div class='del'>-			AR5K_4W_TX_DESC_CTL2_XMIT_TRIES2);</div><div class='del'>-		break;</div><div class='del'>-	case 3:</div><div class='del'>-		ts-&gt;ts_rate = AR5K_REG_MS(tx_ctl-&gt;tx_control_3,</div><div class='del'>-			AR5K_4W_TX_DESC_CTL3_XMIT_RATE3);</div><div class='del'>-		ts-&gt;ts_longretry += AR5K_REG_MS(tx_ctl-&gt;tx_control_2,</div><div class='del'>-			AR5K_4W_TX_DESC_CTL2_XMIT_TRIES3);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((tx_status-&gt;tx_status_0 &amp; AR5K_DESC_TX_STATUS0_FRAME_XMIT_OK) == 0){</div><div class='del'>-		if (tx_status-&gt;tx_status_0 &amp;</div><div class='del'>-				AR5K_DESC_TX_STATUS0_EXCESSIVE_RETRIES)</div><div class='del'>-			ts-&gt;ts_status |= AR5K_TXERR_XRETRY;</div><div class='del'>-</div><div class='del'>-		if (tx_status-&gt;tx_status_0 &amp; AR5K_DESC_TX_STATUS0_FIFO_UNDERRUN)</div><div class='del'>-			ts-&gt;ts_status |= AR5K_TXERR_FIFO;</div><div class='del'>-</div><div class='del'>-		if (tx_status-&gt;tx_status_0 &amp; AR5K_DESC_TX_STATUS0_FILTERED)</div><div class='del'>-			ts-&gt;ts_status |= AR5K_TXERR_FILT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * RX Descriptor</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Initialize an rx descriptor</div><div class='del'>- */</div><div class='del'>-int ath5k_hw_setup_rx_desc(struct ath5k_hw *ah, struct ath5k_desc *desc,</div><div class='del'>-			u32 size, unsigned int flags)</div><div class='del'>-{</div><div class='del'>-	struct ath5k_hw_rx_ctl *rx_ctl;</div><div class='del'>-</div><div class='del'>-	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='del'>-	rx_ctl = &amp;desc-&gt;ud.ds_rx.rx_ctl;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Clear the descriptor</div><div class='del'>-	 * If we don't clean the status descriptor,</div><div class='del'>-	 * while scanning we get too many results,</div><div class='del'>-	 * most of them virtual, after some secs</div><div class='del'>-	 * of scanning system hangs. M.F.</div><div class='del'>-	*/</div><div class='del'>-	memset(&amp;desc-&gt;ud.ds_rx, 0, sizeof(struct ath5k_hw_all_rx_desc));</div><div class='del'>-</div><div class='del'>-	/* Setup descriptor */</div><div class='del'>-	rx_ctl-&gt;rx_control_1 = size &amp; AR5K_DESC_RX_CTL1_BUF_LEN;</div><div class='del'>-	if (unlikely(rx_ctl-&gt;rx_control_1 != size))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (flags &amp; AR5K_RXDESC_INTREQ)</div><div class='del'>-		rx_ctl-&gt;rx_control_1 |= AR5K_DESC_RX_CTL1_INTREQ;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Proccess the rx status descriptor on 5210/5211</div><div class='del'>- */</div><div class='del'>-static int ath5k_hw_proc_5210_rx_status(struct ath5k_hw *ah,</div><div class='del'>-		struct ath5k_desc *desc, struct ath5k_rx_status *rs)</div><div class='del'>-{</div><div class='del'>-	struct ath5k_hw_rx_status *rx_status;</div><div class='del'>-</div><div class='del'>-	rx_status = &amp;desc-&gt;ud.ds_rx.u.rx_stat;</div><div class='del'>-</div><div class='del'>-	/* No frame received / not ready */</div><div class='del'>-	if (unlikely((rx_status-&gt;rx_status_1 &amp; AR5K_5210_RX_DESC_STATUS1_DONE)</div><div class='del'>-				== 0))</div><div class='del'>-		return -EINPROGRESS;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Frame receive status</div><div class='del'>-	 */</div><div class='del'>-	rs-&gt;rs_datalen = rx_status-&gt;rx_status_0 &amp;</div><div class='del'>-		AR5K_5210_RX_DESC_STATUS0_DATA_LEN;</div><div class='del'>-	rs-&gt;rs_rssi = AR5K_REG_MS(rx_status-&gt;rx_status_0,</div><div class='del'>-		AR5K_5210_RX_DESC_STATUS0_RECEIVE_SIGNAL);</div><div class='del'>-	rs-&gt;rs_rate = AR5K_REG_MS(rx_status-&gt;rx_status_0,</div><div class='del'>-		AR5K_5210_RX_DESC_STATUS0_RECEIVE_RATE);</div><div class='del'>-	rs-&gt;rs_antenna = rx_status-&gt;rx_status_0 &amp;</div><div class='del'>-		AR5K_5210_RX_DESC_STATUS0_RECEIVE_ANTENNA;</div><div class='del'>-	rs-&gt;rs_more = rx_status-&gt;rx_status_0 &amp;</div><div class='del'>-		AR5K_5210_RX_DESC_STATUS0_MORE;</div><div class='del'>-	/* TODO: this timestamp is 13 bit, later on we assume 15 bit */</div><div class='del'>-	rs-&gt;rs_tstamp = AR5K_REG_MS(rx_status-&gt;rx_status_1,</div><div class='del'>-		AR5K_5210_RX_DESC_STATUS1_RECEIVE_TIMESTAMP);</div><div class='del'>-	rs-&gt;rs_status = 0;</div><div class='del'>-	rs-&gt;rs_phyerr = 0;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Key table status</div><div class='del'>-	 */</div><div class='del'>-	if (rx_status-&gt;rx_status_1 &amp; AR5K_5210_RX_DESC_STATUS1_KEY_INDEX_VALID)</div><div class='del'>-		rs-&gt;rs_keyix = AR5K_REG_MS(rx_status-&gt;rx_status_1,</div><div class='del'>-			AR5K_5210_RX_DESC_STATUS1_KEY_INDEX);</div><div class='del'>-	else</div><div class='del'>-		rs-&gt;rs_keyix = AR5K_RXKEYIX_INVALID;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Receive/descriptor errors</div><div class='del'>-	 */</div><div class='del'>-	if ((rx_status-&gt;rx_status_1 &amp;</div><div class='del'>-			AR5K_5210_RX_DESC_STATUS1_FRAME_RECEIVE_OK) == 0) {</div><div class='del'>-		if (rx_status-&gt;rx_status_1 &amp;</div><div class='del'>-				AR5K_5210_RX_DESC_STATUS1_CRC_ERROR)</div><div class='del'>-			rs-&gt;rs_status |= AR5K_RXERR_CRC;</div><div class='del'>-</div><div class='del'>-		if (rx_status-&gt;rx_status_1 &amp;</div><div class='del'>-				AR5K_5210_RX_DESC_STATUS1_FIFO_OVERRUN)</div><div class='del'>-			rs-&gt;rs_status |= AR5K_RXERR_FIFO;</div><div class='del'>-</div><div class='del'>-		if (rx_status-&gt;rx_status_1 &amp;</div><div class='del'>-				AR5K_5210_RX_DESC_STATUS1_PHY_ERROR) {</div><div class='del'>-			rs-&gt;rs_status |= AR5K_RXERR_PHY;</div><div class='del'>-			rs-&gt;rs_phyerr |= AR5K_REG_MS(rx_status-&gt;rx_status_1,</div><div class='del'>-					   AR5K_5210_RX_DESC_STATUS1_PHY_ERROR);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (rx_status-&gt;rx_status_1 &amp;</div><div class='del'>-				AR5K_5210_RX_DESC_STATUS1_DECRYPT_CRC_ERROR)</div><div class='del'>-			rs-&gt;rs_status |= AR5K_RXERR_DECRYPT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Proccess the rx status descriptor on 5212</div><div class='del'>- */</div><div class='del'>-static int ath5k_hw_proc_5212_rx_status(struct ath5k_hw *ah,</div><div class='del'>-		struct ath5k_desc *desc, struct ath5k_rx_status *rs)</div><div class='del'>-{</div><div class='del'>-	struct ath5k_hw_rx_status *rx_status;</div><div class='del'>-	struct ath5k_hw_rx_error *rx_err;</div><div class='del'>-</div><div class='del'>-	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='del'>-	rx_status = &amp;desc-&gt;ud.ds_rx.u.rx_stat;</div><div class='del'>-</div><div class='del'>-	/* Overlay on error */</div><div class='del'>-	rx_err = &amp;desc-&gt;ud.ds_rx.u.rx_err;</div><div class='del'>-</div><div class='del'>-	/* No frame received / not ready */</div><div class='del'>-	if (unlikely((rx_status-&gt;rx_status_1 &amp; AR5K_5212_RX_DESC_STATUS1_DONE)</div><div class='del'>-				== 0))</div><div class='del'>-		return -EINPROGRESS;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Frame receive status</div><div class='del'>-	 */</div><div class='del'>-	rs-&gt;rs_datalen = rx_status-&gt;rx_status_0 &amp;</div><div class='del'>-		AR5K_5212_RX_DESC_STATUS0_DATA_LEN;</div><div class='del'>-	rs-&gt;rs_rssi = AR5K_REG_MS(rx_status-&gt;rx_status_0,</div><div class='del'>-		AR5K_5212_RX_DESC_STATUS0_RECEIVE_SIGNAL);</div><div class='del'>-	rs-&gt;rs_rate = AR5K_REG_MS(rx_status-&gt;rx_status_0,</div><div class='del'>-		AR5K_5212_RX_DESC_STATUS0_RECEIVE_RATE);</div><div class='del'>-	rs-&gt;rs_antenna = rx_status-&gt;rx_status_0 &amp;</div><div class='del'>-		AR5K_5212_RX_DESC_STATUS0_RECEIVE_ANTENNA;</div><div class='del'>-	rs-&gt;rs_more = rx_status-&gt;rx_status_0 &amp;</div><div class='del'>-		AR5K_5212_RX_DESC_STATUS0_MORE;</div><div class='del'>-	rs-&gt;rs_tstamp = AR5K_REG_MS(rx_status-&gt;rx_status_1,</div><div class='del'>-		AR5K_5212_RX_DESC_STATUS1_RECEIVE_TIMESTAMP);</div><div class='del'>-	rs-&gt;rs_status = 0;</div><div class='del'>-	rs-&gt;rs_phyerr = 0;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Key table status</div><div class='del'>-	 */</div><div class='del'>-	if (rx_status-&gt;rx_status_1 &amp; AR5K_5212_RX_DESC_STATUS1_KEY_INDEX_VALID)</div><div class='del'>-		rs-&gt;rs_keyix = AR5K_REG_MS(rx_status-&gt;rx_status_1,</div><div class='del'>-				AR5K_5212_RX_DESC_STATUS1_KEY_INDEX);</div><div class='del'>-	else</div><div class='del'>-		rs-&gt;rs_keyix = AR5K_RXKEYIX_INVALID;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Receive/descriptor errors</div><div class='del'>-	 */</div><div class='del'>-	if ((rx_status-&gt;rx_status_1 &amp;</div><div class='del'>-			AR5K_5212_RX_DESC_STATUS1_FRAME_RECEIVE_OK) == 0) {</div><div class='del'>-		if (rx_status-&gt;rx_status_1 &amp;</div><div class='del'>-				AR5K_5212_RX_DESC_STATUS1_CRC_ERROR)</div><div class='del'>-			rs-&gt;rs_status |= AR5K_RXERR_CRC;</div><div class='del'>-</div><div class='del'>-		if (rx_status-&gt;rx_status_1 &amp;</div><div class='del'>-				AR5K_5212_RX_DESC_STATUS1_PHY_ERROR) {</div><div class='del'>-			rs-&gt;rs_status |= AR5K_RXERR_PHY;</div><div class='del'>-			rs-&gt;rs_phyerr |= AR5K_REG_MS(rx_err-&gt;rx_error_1,</div><div class='del'>-					   AR5K_RX_DESC_ERROR1_PHY_ERROR_CODE);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (rx_status-&gt;rx_status_1 &amp;</div><div class='del'>-				AR5K_5212_RX_DESC_STATUS1_DECRYPT_CRC_ERROR)</div><div class='del'>-			rs-&gt;rs_status |= AR5K_RXERR_DECRYPT;</div><div class='del'>-</div><div class='del'>-		if (rx_status-&gt;rx_status_1 &amp;</div><div class='del'>-				AR5K_5212_RX_DESC_STATUS1_MIC_ERROR)</div><div class='del'>-			rs-&gt;rs_status |= AR5K_RXERR_MIC;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/****************\</div><div class='del'>-  GPIO Functions</div><div class='del'>-\****************/</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Set led state</div><div class='del'>- */</div><div class='del'>-void ath5k_hw_set_ledstate(struct ath5k_hw *ah, unsigned int state)</div><div class='del'>-{</div><div class='del'>-	u32 led;</div><div class='del'>-	/*5210 has different led mode handling*/</div><div class='del'>-	u32 led_5210;</div><div class='del'>-</div><div class='del'>-	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='del'>-</div><div class='del'>-	/*Reset led status*/</div><div class='del'>-	if (ah-&gt;ah_version != AR5K_AR5210)</div><div class='del'>-		AR5K_REG_DISABLE_BITS(ah, AR5K_PCICFG,</div><div class='del'>-			AR5K_PCICFG_LEDMODE |  AR5K_PCICFG_LED);</div><div class='del'>-	else</div><div class='del'>-		AR5K_REG_DISABLE_BITS(ah, AR5K_PCICFG, AR5K_PCICFG_LED);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Some blinking values, define at your wish</div><div class='del'>-	 */</div><div class='del'>-	switch (state) {</div><div class='del'>-	case AR5K_LED_SCAN:</div><div class='del'>-	case AR5K_LED_AUTH:</div><div class='del'>-		led = AR5K_PCICFG_LEDMODE_PROP | AR5K_PCICFG_LED_PEND;</div><div class='del'>-		led_5210 = AR5K_PCICFG_LED_PEND | AR5K_PCICFG_LED_BCTL;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case AR5K_LED_INIT:</div><div class='del'>-		led = AR5K_PCICFG_LEDMODE_PROP | AR5K_PCICFG_LED_NONE;</div><div class='del'>-		led_5210 = AR5K_PCICFG_LED_PEND;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case AR5K_LED_ASSOC:</div><div class='del'>-	case AR5K_LED_RUN:</div><div class='del'>-		led = AR5K_PCICFG_LEDMODE_PROP | AR5K_PCICFG_LED_ASSOC;</div><div class='del'>-		led_5210 = AR5K_PCICFG_LED_ASSOC;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		led = AR5K_PCICFG_LEDMODE_PROM | AR5K_PCICFG_LED_NONE;</div><div class='del'>-		led_5210 = AR5K_PCICFG_LED_PEND;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*Write new status to the register*/</div><div class='del'>-	if (ah-&gt;ah_version != AR5K_AR5210)</div><div class='del'>-		AR5K_REG_ENABLE_BITS(ah, AR5K_PCICFG, led);</div><div class='del'>-	else</div><div class='del'>-		AR5K_REG_ENABLE_BITS(ah, AR5K_PCICFG, led_5210);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Set GPIO outputs</div><div class='del'>- */</div><div class='del'>-int ath5k_hw_set_gpio_output(struct ath5k_hw *ah, u32 gpio)</div><div class='del'>-{</div><div class='del'>-	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='del'>-	if (gpio &gt; AR5K_NUM_GPIO)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	ath5k_hw_reg_write(ah, (ath5k_hw_reg_read(ah, AR5K_GPIOCR) &amp;~</div><div class='del'>-		AR5K_GPIOCR_OUT(gpio)) | AR5K_GPIOCR_OUT(gpio), AR5K_GPIOCR);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Set GPIO inputs</div><div class='del'>- */</div><div class='del'>-int ath5k_hw_set_gpio_input(struct ath5k_hw *ah, u32 gpio)</div><div class='del'>-{</div><div class='del'>-	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='del'>-	if (gpio &gt; AR5K_NUM_GPIO)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	ath5k_hw_reg_write(ah, (ath5k_hw_reg_read(ah, AR5K_GPIOCR) &amp;~</div><div class='del'>-		AR5K_GPIOCR_OUT(gpio)) | AR5K_GPIOCR_IN(gpio), AR5K_GPIOCR);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Get GPIO state</div><div class='del'>- */</div><div class='del'>-u32 ath5k_hw_get_gpio(struct ath5k_hw *ah, u32 gpio)</div><div class='del'>-{</div><div class='del'>-	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='del'>-	if (gpio &gt; AR5K_NUM_GPIO)</div><div class='del'>-		return 0xffffffff;</div><div class='del'>-</div><div class='del'>-	/* GPIO input magic */</div><div class='del'>-	return ((ath5k_hw_reg_read(ah, AR5K_GPIODI) &amp; AR5K_GPIODI_M) &gt;&gt; gpio) &amp;</div><div class='del'>-		0x1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Set GPIO state</div><div class='del'>- */</div><div class='del'>-int ath5k_hw_set_gpio(struct ath5k_hw *ah, u32 gpio, u32 val)</div><div class='del'>-{</div><div class='del'>-	u32 data;</div><div class='del'>-	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='del'>-</div><div class='del'>-	if (gpio &gt; AR5K_NUM_GPIO)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	/* GPIO output magic */</div><div class='del'>-	data = ath5k_hw_reg_read(ah, AR5K_GPIODO);</div><div class='del'>-</div><div class='del'>-	data &amp;= ~(1 &lt;&lt; gpio);</div><div class='del'>-	data |= (val &amp; 1) &lt;&lt; gpio;</div><div class='del'>-</div><div class='del'>-	ath5k_hw_reg_write(ah, data, AR5K_GPIODO);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Initialize the GPIO interrupt (RFKill switch)</div><div class='del'>- */</div><div class='del'>-void ath5k_hw_set_gpio_intr(struct ath5k_hw *ah, unsigned int gpio,</div><div class='del'>-		u32 interrupt_level)</div><div class='del'>-{</div><div class='del'>-	u32 data;</div><div class='del'>-</div><div class='del'>-	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='del'>-	if (gpio &gt; AR5K_NUM_GPIO)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Set the GPIO interrupt</div><div class='del'>-	 */</div><div class='del'>-	data = (ath5k_hw_reg_read(ah, AR5K_GPIOCR) &amp;</div><div class='del'>-		~(AR5K_GPIOCR_INT_SEL(gpio) | AR5K_GPIOCR_INT_SELH |</div><div class='del'>-		AR5K_GPIOCR_INT_ENA | AR5K_GPIOCR_OUT(gpio))) |</div><div class='del'>-		(AR5K_GPIOCR_INT_SEL(gpio) | AR5K_GPIOCR_INT_ENA);</div><div class='del'>-</div><div class='del'>-	ath5k_hw_reg_write(ah, interrupt_level ? data :</div><div class='del'>-		(data | AR5K_GPIOCR_INT_SELH), AR5K_GPIOCR);</div><div class='del'>-</div><div class='del'>-	ah-&gt;ah_imr |= AR5K_IMR_GPIO;</div><div class='del'>-</div><div class='del'>-	/* Enable GPIO interrupts */</div><div class='del'>-	AR5K_REG_ENABLE_BITS(ah, AR5K_PIMR, AR5K_IMR_GPIO);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/****************\</div><div class='del'>-  Misc functions</div><div class='del'>-\****************/</div><div class='del'>-</div><div class='del'>-int ath5k_hw_get_capability(struct ath5k_hw *ah,</div><div class='del'>-		enum ath5k_capability_type cap_type,</div><div class='del'>-		u32 capability, u32 *result)</div><div class='del'>-{</div><div class='del'>-	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='del'>-</div><div class='del'>-	switch (cap_type) {</div><div class='del'>-	case AR5K_CAP_NUM_TXQUEUES:</div><div class='del'>-		if (result) {</div><div class='del'>-			if (ah-&gt;ah_version == AR5K_AR5210)</div><div class='del'>-				*result = AR5K_NUM_TX_QUEUES_NOQCU;</div><div class='del'>-			else</div><div class='del'>-				*result = AR5K_NUM_TX_QUEUES;</div><div class='del'>-			goto yes;</div><div class='del'>-		}</div><div class='del'>-	case AR5K_CAP_VEOL:</div><div class='del'>-		goto yes;</div><div class='del'>-	case AR5K_CAP_COMPRESSION:</div><div class='del'>-		if (ah-&gt;ah_version == AR5K_AR5212)</div><div class='del'>-			goto yes;</div><div class='del'>-		else</div><div class='del'>-			goto no;</div><div class='del'>-	case AR5K_CAP_BURST:</div><div class='del'>-		goto yes;</div><div class='del'>-	case AR5K_CAP_TPC:</div><div class='del'>-		goto yes;</div><div class='del'>-	case AR5K_CAP_BSSIDMASK:</div><div class='del'>-		if (ah-&gt;ah_version == AR5K_AR5212)</div><div class='del'>-			goto yes;</div><div class='del'>-		else</div><div class='del'>-			goto no;</div><div class='del'>-	case AR5K_CAP_XR:</div><div class='del'>-		if (ah-&gt;ah_version == AR5K_AR5212)</div><div class='del'>-			goto yes;</div><div class='del'>-		else</div><div class='del'>-			goto no;</div><div class='del'>-	default:</div><div class='del'>-		goto no;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-no:</div><div class='del'>-	return -EINVAL;</div><div class='del'>-yes:</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ath5k_hw_enable_pspoll(struct ath5k_hw *ah, u8 *bssid,</div><div class='del'>-		u16 assoc_id)</div><div class='del'>-{</div><div class='del'>-	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='del'>-</div><div class='del'>-	if (ah-&gt;ah_version == AR5K_AR5210) {</div><div class='del'>-		AR5K_REG_DISABLE_BITS(ah, AR5K_STA_ID1,</div><div class='del'>-			AR5K_STA_ID1_NO_PSPOLL | AR5K_STA_ID1_DEFAULT_ANTENNA);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return -EIO;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ath5k_hw_disable_pspoll(struct ath5k_hw *ah)</div><div class='del'>-{</div><div class='del'>-	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='del'>-</div><div class='del'>-	if (ah-&gt;ah_version == AR5K_AR5210) {</div><div class='del'>-		AR5K_REG_ENABLE_BITS(ah, AR5K_STA_ID1,</div><div class='del'>-			AR5K_STA_ID1_NO_PSPOLL | AR5K_STA_ID1_DEFAULT_ANTENNA);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return -EIO;</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/net/wireless/ath5k/initvals.c b/drivers/net/wireless/ath5k/initvals.c<br/>index 2806b21bf90b..ea2e1a20b499 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/ath5k/initvals.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/ath5k/initvals.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/ath5k/initvals.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/ath5k/initvals.c</a></div><div class='hunk'>@@ -1,9 +1,9 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Initial register settings functions</div><div class='ctx'>  *</div><div class='del'>- * Copyright (c) 2004, 2005, 2006, 2007 Reyk Floeter &lt;reyk@openbsd.org&gt;</div><div class='del'>- * Copyright (c) 2006, 2007 Nick Kossifidis &lt;mickflemm@gmail.com&gt;</div><div class='del'>- * Copyright (c) 2007 Jiri Slaby &lt;jirislaby@gmail.com&gt;</div><div class='add'>+ * Copyright (c) 2004-2007 Reyk Floeter &lt;reyk@openbsd.org&gt;</div><div class='add'>+ * Copyright (c) 2006-2007 Nick Kossifidis &lt;mickflemm@gmail.com&gt;</div><div class='add'>+ * Copyright (c) 2007-2008 Jiri Slaby &lt;jirislaby@gmail.com&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * Permission to use, copy, modify, and distribute this software for any</div><div class='ctx'>  * purpose with or without fee is hereby granted, provided that the above</div><div class='hunk'>@@ -20,13 +20,9 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "ath5k.h"</div><div class='del'>-#include "base.h"</div><div class='ctx'> #include "reg.h"</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * MAC/PHY REGISTERS</div><div class='del'>- */</div><div class='del'>-</div><div class='add'>+#include "debug.h"</div><div class='add'>+#include "base.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Mode-independent initial register writes</div><div class='hunk'>@@ -65,10 +61,10 @@ static const struct ath5k_ini ar5210_ini[] = {</div><div class='ctx'> 	{ AR5K_TXCFG,		AR5K_DMASIZE_128B },</div><div class='ctx'> 	{ AR5K_RXCFG,		AR5K_DMASIZE_128B },</div><div class='ctx'> 	{ AR5K_CFG,		AR5K_INIT_CFG },</div><div class='del'>-	{ AR5K_TOPS,		AR5K_INIT_TOPS },</div><div class='del'>-	{ AR5K_RXNOFRM,		AR5K_INIT_RXNOFRM },</div><div class='del'>-	{ AR5K_RPGTO,		AR5K_INIT_RPGTO },</div><div class='del'>-	{ AR5K_TXNOFRM,		AR5K_INIT_TXNOFRM },</div><div class='add'>+	{ AR5K_TOPS,		8 },</div><div class='add'>+	{ AR5K_RXNOFRM,		8 },</div><div class='add'>+	{ AR5K_RPGTO,		0 },</div><div class='add'>+	{ AR5K_TXNOFRM,		0 },</div><div class='ctx'> 	{ AR5K_SFR,		0 },</div><div class='ctx'> 	{ AR5K_MIBC,		0 },</div><div class='ctx'> 	{ AR5K_MISC,		0 },</div><div class='head'>diff --git a/drivers/net/wireless/ath5k/pcu.c b/drivers/net/wireless/ath5k/pcu.c<br/>new file mode 100644<br/>index 000000000000..a47df9a24aa1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/ath5k/pcu.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/ath5k/pcu.c</a></div><div class='hunk'>@@ -0,0 +1,1014 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2004-2008 Reyk Floeter &lt;reyk@openbsd.org&gt;</div><div class='add'>+ * Copyright (c) 2006-2008 Nick Kossifidis &lt;mickflemm@gmail.com&gt;</div><div class='add'>+ * Copyright (c) 2007-2008 Matthew W. S. Bell  &lt;mentor@madwifi.org&gt;</div><div class='add'>+ * Copyright (c) 2007-2008 Luis Rodriguez &lt;mcgrof@winlab.rutgers.edu&gt;</div><div class='add'>+ * Copyright (c) 2007-2008 Pavel Roskin &lt;proski@gnu.org&gt;</div><div class='add'>+ * Copyright (c) 2007-2008 Jiri Slaby &lt;jirislaby@gmail.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * Permission to use, copy, modify, and distribute this software for any</div><div class='add'>+ * purpose with or without fee is hereby granted, provided that the above</div><div class='add'>+ * copyright notice and this permission notice appear in all copies.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES</div><div class='add'>+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR</div><div class='add'>+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES</div><div class='add'>+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN</div><div class='add'>+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF</div><div class='add'>+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*********************************\</div><div class='add'>+* Protocol Control Unit Functions *</div><div class='add'>+\*********************************/</div><div class='add'>+</div><div class='add'>+#include "ath5k.h"</div><div class='add'>+#include "reg.h"</div><div class='add'>+#include "debug.h"</div><div class='add'>+#include "base.h"</div><div class='add'>+</div><div class='add'>+/*******************\</div><div class='add'>+* Generic functions *</div><div class='add'>+\*******************/</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_set_opmode - Set PCU operating mode</div><div class='add'>+ *</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ *</div><div class='add'>+ * Initialize PCU for the various operating modes (AP/STA etc)</div><div class='add'>+ *</div><div class='add'>+ * NOTE: ah-&gt;ah_op_mode must be set before calling this.</div><div class='add'>+ */</div><div class='add'>+int ath5k_hw_set_opmode(struct ath5k_hw *ah)</div><div class='add'>+{</div><div class='add'>+	u32 pcu_reg, beacon_reg, low_id, high_id;</div><div class='add'>+</div><div class='add'>+	pcu_reg = 0;</div><div class='add'>+	beacon_reg = 0;</div><div class='add'>+</div><div class='add'>+	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='add'>+</div><div class='add'>+	switch (ah-&gt;ah_op_mode) {</div><div class='add'>+	case NL80211_IFTYPE_ADHOC:</div><div class='add'>+		pcu_reg |= AR5K_STA_ID1_ADHOC | AR5K_STA_ID1_DESC_ANTENNA |</div><div class='add'>+			(ah-&gt;ah_version == AR5K_AR5210 ?</div><div class='add'>+				AR5K_STA_ID1_NO_PSPOLL : 0);</div><div class='add'>+		beacon_reg |= AR5K_BCR_ADHOC;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case NL80211_IFTYPE_AP:</div><div class='add'>+	case NL80211_IFTYPE_MESH_POINT:</div><div class='add'>+		pcu_reg |= AR5K_STA_ID1_AP | AR5K_STA_ID1_RTS_DEF_ANTENNA |</div><div class='add'>+			(ah-&gt;ah_version == AR5K_AR5210 ?</div><div class='add'>+				AR5K_STA_ID1_NO_PSPOLL : 0);</div><div class='add'>+		beacon_reg |= AR5K_BCR_AP;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case NL80211_IFTYPE_STATION:</div><div class='add'>+		pcu_reg |= AR5K_STA_ID1_DEFAULT_ANTENNA |</div><div class='add'>+			(ah-&gt;ah_version == AR5K_AR5210 ?</div><div class='add'>+				AR5K_STA_ID1_PWR_SV : 0);</div><div class='add'>+	case NL80211_IFTYPE_MONITOR:</div><div class='add'>+		pcu_reg |= AR5K_STA_ID1_DEFAULT_ANTENNA |</div><div class='add'>+			(ah-&gt;ah_version == AR5K_AR5210 ?</div><div class='add'>+				AR5K_STA_ID1_NO_PSPOLL : 0);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Set PCU registers</div><div class='add'>+	 */</div><div class='add'>+	low_id = AR5K_LOW_ID(ah-&gt;ah_sta_id);</div><div class='add'>+	high_id = AR5K_HIGH_ID(ah-&gt;ah_sta_id);</div><div class='add'>+	ath5k_hw_reg_write(ah, low_id, AR5K_STA_ID0);</div><div class='add'>+	ath5k_hw_reg_write(ah, pcu_reg | high_id, AR5K_STA_ID1);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Set Beacon Control Register on 5210</div><div class='add'>+	 */</div><div class='add'>+	if (ah-&gt;ah_version == AR5K_AR5210)</div><div class='add'>+		ath5k_hw_reg_write(ah, beacon_reg, AR5K_BCR);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_update - Update mib counters (mac layer statistics)</div><div class='add'>+ *</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @stats: The &amp;struct ieee80211_low_level_stats we use to track</div><div class='add'>+ * statistics on the driver</div><div class='add'>+ *</div><div class='add'>+ * Reads MIB counters from PCU and updates sw statistics. Must be</div><div class='add'>+ * called after a MIB interrupt.</div><div class='add'>+ */</div><div class='add'>+void ath5k_hw_update_mib_counters(struct ath5k_hw *ah,</div><div class='add'>+		struct ieee80211_low_level_stats  *stats)</div><div class='add'>+{</div><div class='add'>+	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='add'>+</div><div class='add'>+	/* Read-And-Clear */</div><div class='add'>+	stats-&gt;dot11ACKFailureCount += ath5k_hw_reg_read(ah, AR5K_ACK_FAIL);</div><div class='add'>+	stats-&gt;dot11RTSFailureCount += ath5k_hw_reg_read(ah, AR5K_RTS_FAIL);</div><div class='add'>+	stats-&gt;dot11RTSSuccessCount += ath5k_hw_reg_read(ah, AR5K_RTS_OK);</div><div class='add'>+	stats-&gt;dot11FCSErrorCount += ath5k_hw_reg_read(ah, AR5K_FCS_FAIL);</div><div class='add'>+</div><div class='add'>+	/* XXX: Should we use this to track beacon count ?</div><div class='add'>+	 * -we read it anyway to clear the register */</div><div class='add'>+	ath5k_hw_reg_read(ah, AR5K_BEACON_CNT);</div><div class='add'>+</div><div class='add'>+	/* Reset profile count registers on 5212*/</div><div class='add'>+	if (ah-&gt;ah_version == AR5K_AR5212) {</div><div class='add'>+		ath5k_hw_reg_write(ah, 0, AR5K_PROFCNT_TX);</div><div class='add'>+		ath5k_hw_reg_write(ah, 0, AR5K_PROFCNT_RX);</div><div class='add'>+		ath5k_hw_reg_write(ah, 0, AR5K_PROFCNT_RXCLR);</div><div class='add'>+		ath5k_hw_reg_write(ah, 0, AR5K_PROFCNT_CYCLE);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_set_ack_bitrate - set bitrate for ACKs</div><div class='add'>+ *</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @high: Flag to determine if we want to use high transmition rate</div><div class='add'>+ * for ACKs or not</div><div class='add'>+ *</div><div class='add'>+ * If high flag is set, we tell hw to use a set of control rates based on</div><div class='add'>+ * the current transmition rate (check out control_rates array inside reset.c).</div><div class='add'>+ * If not hw just uses the lowest rate available for the current modulation</div><div class='add'>+ * scheme being used (1Mbit for CCK and 6Mbits for OFDM).</div><div class='add'>+ */</div><div class='add'>+void ath5k_hw_set_ack_bitrate_high(struct ath5k_hw *ah, bool high)</div><div class='add'>+{</div><div class='add'>+	if (ah-&gt;ah_version != AR5K_AR5212)</div><div class='add'>+		return;</div><div class='add'>+	else {</div><div class='add'>+		u32 val = AR5K_STA_ID1_BASE_RATE_11B | AR5K_STA_ID1_ACKCTS_6MB;</div><div class='add'>+		if (high)</div><div class='add'>+			AR5K_REG_ENABLE_BITS(ah, AR5K_STA_ID1, val);</div><div class='add'>+		else</div><div class='add'>+			AR5K_REG_DISABLE_BITS(ah, AR5K_STA_ID1, val);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/******************\</div><div class='add'>+* ACK/CTS Timeouts *</div><div class='add'>+\******************/</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_het_ack_timeout - Get ACK timeout from PCU in usec</div><div class='add'>+ *</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ */</div><div class='add'>+unsigned int ath5k_hw_get_ack_timeout(struct ath5k_hw *ah)</div><div class='add'>+{</div><div class='add'>+	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='add'>+</div><div class='add'>+	return ath5k_hw_clocktoh(AR5K_REG_MS(ath5k_hw_reg_read(ah,</div><div class='add'>+			AR5K_TIME_OUT), AR5K_TIME_OUT_ACK), ah-&gt;ah_turbo);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_set_ack_timeout - Set ACK timeout on PCU</div><div class='add'>+ *</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @timeout: Timeout in usec</div><div class='add'>+ */</div><div class='add'>+int ath5k_hw_set_ack_timeout(struct ath5k_hw *ah, unsigned int timeout)</div><div class='add'>+{</div><div class='add'>+	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='add'>+	if (ath5k_hw_clocktoh(AR5K_REG_MS(0xffffffff, AR5K_TIME_OUT_ACK),</div><div class='add'>+			ah-&gt;ah_turbo) &lt;= timeout)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	AR5K_REG_WRITE_BITS(ah, AR5K_TIME_OUT, AR5K_TIME_OUT_ACK,</div><div class='add'>+		ath5k_hw_htoclock(timeout, ah-&gt;ah_turbo));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_get_cts_timeout - Get CTS timeout from PCU in usec</div><div class='add'>+ *</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ */</div><div class='add'>+unsigned int ath5k_hw_get_cts_timeout(struct ath5k_hw *ah)</div><div class='add'>+{</div><div class='add'>+	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='add'>+	return ath5k_hw_clocktoh(AR5K_REG_MS(ath5k_hw_reg_read(ah,</div><div class='add'>+			AR5K_TIME_OUT), AR5K_TIME_OUT_CTS), ah-&gt;ah_turbo);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_set_cts_timeout - Set CTS timeout on PCU</div><div class='add'>+ *</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @timeout: Timeout in usec</div><div class='add'>+ */</div><div class='add'>+int ath5k_hw_set_cts_timeout(struct ath5k_hw *ah, unsigned int timeout)</div><div class='add'>+{</div><div class='add'>+	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='add'>+	if (ath5k_hw_clocktoh(AR5K_REG_MS(0xffffffff, AR5K_TIME_OUT_CTS),</div><div class='add'>+			ah-&gt;ah_turbo) &lt;= timeout)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	AR5K_REG_WRITE_BITS(ah, AR5K_TIME_OUT, AR5K_TIME_OUT_CTS,</div><div class='add'>+			ath5k_hw_htoclock(timeout, ah-&gt;ah_turbo));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/****************\</div><div class='add'>+* BSSID handling *</div><div class='add'>+\****************/</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_get_lladdr - Get station id</div><div class='add'>+ *</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @mac: The card's mac address</div><div class='add'>+ *</div><div class='add'>+ * Initialize ah-&gt;ah_sta_id using the mac address provided</div><div class='add'>+ * (just a memcpy).</div><div class='add'>+ *</div><div class='add'>+ * TODO: Remove it once we merge ath5k_softc and ath5k_hw</div><div class='add'>+ */</div><div class='add'>+void ath5k_hw_get_lladdr(struct ath5k_hw *ah, u8 *mac)</div><div class='add'>+{</div><div class='add'>+	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='add'>+	memcpy(mac, ah-&gt;ah_sta_id, ETH_ALEN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_set_lladdr - Set station id</div><div class='add'>+ *</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @mac: The card's mac address</div><div class='add'>+ *</div><div class='add'>+ * Set station id on hw using the provided mac address</div><div class='add'>+ */</div><div class='add'>+int ath5k_hw_set_lladdr(struct ath5k_hw *ah, const u8 *mac)</div><div class='add'>+{</div><div class='add'>+	u32 low_id, high_id;</div><div class='add'>+</div><div class='add'>+	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='add'>+	/* Set new station ID */</div><div class='add'>+	memcpy(ah-&gt;ah_sta_id, mac, ETH_ALEN);</div><div class='add'>+</div><div class='add'>+	low_id = AR5K_LOW_ID(mac);</div><div class='add'>+	high_id = AR5K_HIGH_ID(mac);</div><div class='add'>+</div><div class='add'>+	ath5k_hw_reg_write(ah, low_id, AR5K_STA_ID0);</div><div class='add'>+	ath5k_hw_reg_write(ah, high_id, AR5K_STA_ID1);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_set_associd - Set BSSID for association</div><div class='add'>+ *</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @bssid: BSSID</div><div class='add'>+ * @assoc_id: Assoc id</div><div class='add'>+ *</div><div class='add'>+ * Sets the BSSID which trigers the "SME Join" operation</div><div class='add'>+ */</div><div class='add'>+void ath5k_hw_set_associd(struct ath5k_hw *ah, const u8 *bssid, u16 assoc_id)</div><div class='add'>+{</div><div class='add'>+	u32 low_id, high_id;</div><div class='add'>+	u16 tim_offset = 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Set simple BSSID mask on 5212</div><div class='add'>+	 */</div><div class='add'>+	if (ah-&gt;ah_version == AR5K_AR5212) {</div><div class='add'>+		ath5k_hw_reg_write(ah, 0xffffffff, AR5K_BSS_IDM0);</div><div class='add'>+		ath5k_hw_reg_write(ah, 0xffffffff, AR5K_BSS_IDM1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Set BSSID which triggers the "SME Join" operation</div><div class='add'>+	 */</div><div class='add'>+	low_id = AR5K_LOW_ID(bssid);</div><div class='add'>+	high_id = AR5K_HIGH_ID(bssid);</div><div class='add'>+	ath5k_hw_reg_write(ah, low_id, AR5K_BSS_ID0);</div><div class='add'>+	ath5k_hw_reg_write(ah, high_id | ((assoc_id &amp; 0x3fff) &lt;&lt;</div><div class='add'>+				AR5K_BSS_ID1_AID_S), AR5K_BSS_ID1);</div><div class='add'>+</div><div class='add'>+	if (assoc_id == 0) {</div><div class='add'>+		ath5k_hw_disable_pspoll(ah);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	AR5K_REG_WRITE_BITS(ah, AR5K_BEACON, AR5K_BEACON_TIM,</div><div class='add'>+			tim_offset ? tim_offset + 4 : 0);</div><div class='add'>+</div><div class='add'>+	ath5k_hw_enable_pspoll(ah, NULL, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_set_bssid_mask - filter out bssids we listen</div><div class='add'>+ *</div><div class='add'>+ * @ah: the &amp;struct ath5k_hw</div><div class='add'>+ * @mask: the bssid_mask, a u8 array of size ETH_ALEN</div><div class='add'>+ *</div><div class='add'>+ * BSSID masking is a method used by AR5212 and newer hardware to inform PCU</div><div class='add'>+ * which bits of the interface's MAC address should be looked at when trying</div><div class='add'>+ * to decide which packets to ACK. In station mode and AP mode with a single</div><div class='add'>+ * BSS every bit matters since we lock to only one BSS. In AP mode with</div><div class='add'>+ * multiple BSSes (virtual interfaces) not every bit matters because hw must</div><div class='add'>+ * accept frames for all BSSes and so we tweak some bits of our mac address</div><div class='add'>+ * in order to have multiple BSSes.</div><div class='add'>+ *</div><div class='add'>+ * NOTE: This is a simple filter and does *not* filter out all</div><div class='add'>+ * relevant frames. Some frames that are not for us might get ACKed from us</div><div class='add'>+ * by PCU because they just match the mask.</div><div class='add'>+ *</div><div class='add'>+ * When handling multiple BSSes you can get the BSSID mask by computing the</div><div class='add'>+ * set of  ~ ( MAC XOR BSSID ) for all bssids we handle.</div><div class='add'>+ *</div><div class='add'>+ * When you do this you are essentially computing the common bits of all your</div><div class='add'>+ * BSSes. Later it is assumed the harware will "and" (&amp;) the BSSID mask with</div><div class='add'>+ * the MAC address to obtain the relevant bits and compare the result with</div><div class='add'>+ * (frame's BSSID &amp; mask) to see if they match.</div><div class='add'>+ */</div><div class='add'>+/*</div><div class='add'>+ * Simple example: on your card you have have two BSSes you have created with</div><div class='add'>+ * BSSID-01 and BSSID-02. Lets assume BSSID-01 will not use the MAC address.</div><div class='add'>+ * There is another BSSID-03 but you are not part of it. For simplicity's sake,</div><div class='add'>+ * assuming only 4 bits for a mac address and for BSSIDs you can then have:</div><div class='add'>+ *</div><div class='add'>+ *                  \</div><div class='add'>+ * MAC:                0001 |</div><div class='add'>+ * BSSID-01:   0100 | --&gt; Belongs to us</div><div class='add'>+ * BSSID-02:   1001 |</div><div class='add'>+ *                  /</div><div class='add'>+ * -------------------</div><div class='add'>+ * BSSID-03:   0110  | --&gt; External</div><div class='add'>+ * -------------------</div><div class='add'>+ *</div><div class='add'>+ * Our bssid_mask would then be:</div><div class='add'>+ *</div><div class='add'>+ *             On loop iteration for BSSID-01:</div><div class='add'>+ *             ~(0001 ^ 0100)  -&gt; ~(0101)</div><div class='add'>+ *                             -&gt;   1010</div><div class='add'>+ *             bssid_mask      =    1010</div><div class='add'>+ *</div><div class='add'>+ *             On loop iteration for BSSID-02:</div><div class='add'>+ *             bssid_mask &amp;= ~(0001   ^   1001)</div><div class='add'>+ *             bssid_mask =   (1010)  &amp; ~(0001 ^ 1001)</div><div class='add'>+ *             bssid_mask =   (1010)  &amp; ~(1001)</div><div class='add'>+ *             bssid_mask =   (1010)  &amp;  (0110)</div><div class='add'>+ *             bssid_mask =   0010</div><div class='add'>+ *</div><div class='add'>+ * A bssid_mask of 0010 means "only pay attention to the second least</div><div class='add'>+ * significant bit". This is because its the only bit common</div><div class='add'>+ * amongst the MAC and all BSSIDs we support. To findout what the real</div><div class='add'>+ * common bit is we can simply "&amp;" the bssid_mask now with any BSSID we have</div><div class='add'>+ * or our MAC address (we assume the hardware uses the MAC address).</div><div class='add'>+ *</div><div class='add'>+ * Now, suppose there's an incoming frame for BSSID-03:</div><div class='add'>+ *</div><div class='add'>+ * IFRAME-01:  0110</div><div class='add'>+ *</div><div class='add'>+ * An easy eye-inspeciton of this already should tell you that this frame</div><div class='add'>+ * will not pass our check. This is beacuse the bssid_mask tells the</div><div class='add'>+ * hardware to only look at the second least significant bit and the</div><div class='add'>+ * common bit amongst the MAC and BSSIDs is 0, this frame has the 2nd LSB</div><div class='add'>+ * as 1, which does not match 0.</div><div class='add'>+ *</div><div class='add'>+ * So with IFRAME-01 we *assume* the hardware will do:</div><div class='add'>+ *</div><div class='add'>+ *     allow = (IFRAME-01 &amp; bssid_mask) == (bssid_mask &amp; MAC) ? 1 : 0;</div><div class='add'>+ *  --&gt; allow = (0110 &amp; 0010) == (0010 &amp; 0001) ? 1 : 0;</div><div class='add'>+ *  --&gt; allow = (0010) == 0000 ? 1 : 0;</div><div class='add'>+ *  --&gt; allow = 0</div><div class='add'>+ *</div><div class='add'>+ *  Lets now test a frame that should work:</div><div class='add'>+ *</div><div class='add'>+ * IFRAME-02:  0001 (we should allow)</div><div class='add'>+ *</div><div class='add'>+ *     allow = (0001 &amp; 1010) == 1010</div><div class='add'>+ *</div><div class='add'>+ *     allow = (IFRAME-02 &amp; bssid_mask) == (bssid_mask &amp; MAC) ? 1 : 0;</div><div class='add'>+ *  --&gt; allow = (0001 &amp; 0010) ==  (0010 &amp; 0001) ? 1 :0;</div><div class='add'>+ *  --&gt; allow = (0010) == (0010)</div><div class='add'>+ *  --&gt; allow = 1</div><div class='add'>+ *</div><div class='add'>+ * Other examples:</div><div class='add'>+ *</div><div class='add'>+ * IFRAME-03:  0100 --&gt; allowed</div><div class='add'>+ * IFRAME-04:  1001 --&gt; allowed</div><div class='add'>+ * IFRAME-05:  1101 --&gt; allowed but its not for us!!!</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+int ath5k_hw_set_bssid_mask(struct ath5k_hw *ah, const u8 *mask)</div><div class='add'>+{</div><div class='add'>+	u32 low_id, high_id;</div><div class='add'>+	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='add'>+</div><div class='add'>+	if (ah-&gt;ah_version == AR5K_AR5212) {</div><div class='add'>+		low_id = AR5K_LOW_ID(mask);</div><div class='add'>+		high_id = AR5K_HIGH_ID(mask);</div><div class='add'>+</div><div class='add'>+		ath5k_hw_reg_write(ah, low_id, AR5K_BSS_IDM0);</div><div class='add'>+		ath5k_hw_reg_write(ah, high_id, AR5K_BSS_IDM1);</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EIO;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/************\</div><div class='add'>+* RX Control *</div><div class='add'>+\************/</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_start_rx_pcu - Start RX engine</div><div class='add'>+ *</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ *</div><div class='add'>+ * Starts RX engine on PCU so that hw can process RXed frames</div><div class='add'>+ * (ACK etc).</div><div class='add'>+ *</div><div class='add'>+ * NOTE: RX DMA should be already enabled using ath5k_hw_start_rx_dma</div><div class='add'>+ * TODO: Init ANI here</div><div class='add'>+ */</div><div class='add'>+void ath5k_hw_start_rx_pcu(struct ath5k_hw *ah)</div><div class='add'>+{</div><div class='add'>+	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='add'>+	AR5K_REG_DISABLE_BITS(ah, AR5K_DIAG_SW, AR5K_DIAG_SW_DIS_RX);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * at5k_hw_stop_rx_pcu - Stop RX engine</div><div class='add'>+ *</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ *</div><div class='add'>+ * Stops RX engine on PCU</div><div class='add'>+ *</div><div class='add'>+ * TODO: Detach ANI here</div><div class='add'>+ */</div><div class='add'>+void ath5k_hw_stop_rx_pcu(struct ath5k_hw *ah)</div><div class='add'>+{</div><div class='add'>+	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='add'>+	AR5K_REG_ENABLE_BITS(ah, AR5K_DIAG_SW, AR5K_DIAG_SW_DIS_RX);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Set multicast filter</div><div class='add'>+ */</div><div class='add'>+void ath5k_hw_set_mcast_filter(struct ath5k_hw *ah, u32 filter0, u32 filter1)</div><div class='add'>+{</div><div class='add'>+	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='add'>+	/* Set the multicat filter */</div><div class='add'>+	ath5k_hw_reg_write(ah, filter0, AR5K_MCAST_FILTER0);</div><div class='add'>+	ath5k_hw_reg_write(ah, filter1, AR5K_MCAST_FILTER1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Set multicast filter by index</div><div class='add'>+ */</div><div class='add'>+int ath5k_hw_set_mcast_filter_idx(struct ath5k_hw *ah, u32 index)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='add'>+	if (index &gt;= 64)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	else if (index &gt;= 32)</div><div class='add'>+		AR5K_REG_ENABLE_BITS(ah, AR5K_MCAST_FILTER1,</div><div class='add'>+				(1 &lt;&lt; (index - 32)));</div><div class='add'>+	else</div><div class='add'>+		AR5K_REG_ENABLE_BITS(ah, AR5K_MCAST_FILTER0, (1 &lt;&lt; index));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Clear Multicast filter by index</div><div class='add'>+ */</div><div class='add'>+int ath5k_hw_clear_mcast_filter_idx(struct ath5k_hw *ah, u32 index)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='add'>+	if (index &gt;= 64)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	else if (index &gt;= 32)</div><div class='add'>+		AR5K_REG_DISABLE_BITS(ah, AR5K_MCAST_FILTER1,</div><div class='add'>+				(1 &lt;&lt; (index - 32)));</div><div class='add'>+	else</div><div class='add'>+		AR5K_REG_DISABLE_BITS(ah, AR5K_MCAST_FILTER0, (1 &lt;&lt; index));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_get_rx_filter - Get current rx filter</div><div class='add'>+ *</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ *</div><div class='add'>+ * Returns the RX filter by reading rx filter and</div><div class='add'>+ * phy error filter registers. RX filter is used</div><div class='add'>+ * to set the allowed frame types that PCU will accept</div><div class='add'>+ * and pass to the driver. For a list of frame types</div><div class='add'>+ * check out reg.h.</div><div class='add'>+ */</div><div class='add'>+u32 ath5k_hw_get_rx_filter(struct ath5k_hw *ah)</div><div class='add'>+{</div><div class='add'>+	u32 data, filter = 0;</div><div class='add'>+</div><div class='add'>+	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='add'>+	filter = ath5k_hw_reg_read(ah, AR5K_RX_FILTER);</div><div class='add'>+</div><div class='add'>+	/*Radar detection for 5212*/</div><div class='add'>+	if (ah-&gt;ah_version == AR5K_AR5212) {</div><div class='add'>+		data = ath5k_hw_reg_read(ah, AR5K_PHY_ERR_FIL);</div><div class='add'>+</div><div class='add'>+		if (data &amp; AR5K_PHY_ERR_FIL_RADAR)</div><div class='add'>+			filter |= AR5K_RX_FILTER_RADARERR;</div><div class='add'>+		if (data &amp; (AR5K_PHY_ERR_FIL_OFDM | AR5K_PHY_ERR_FIL_CCK))</div><div class='add'>+			filter |= AR5K_RX_FILTER_PHYERR;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return filter;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_set_rx_filter - Set rx filter</div><div class='add'>+ *</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @filter: RX filter mask (see reg.h)</div><div class='add'>+ *</div><div class='add'>+ * Sets RX filter register and also handles PHY error filter</div><div class='add'>+ * register on 5212 and newer chips so that we have proper PHY</div><div class='add'>+ * error reporting.</div><div class='add'>+ */</div><div class='add'>+void ath5k_hw_set_rx_filter(struct ath5k_hw *ah, u32 filter)</div><div class='add'>+{</div><div class='add'>+	u32 data = 0;</div><div class='add'>+</div><div class='add'>+	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='add'>+</div><div class='add'>+	/* Set PHY error filter register on 5212*/</div><div class='add'>+	if (ah-&gt;ah_version == AR5K_AR5212) {</div><div class='add'>+		if (filter &amp; AR5K_RX_FILTER_RADARERR)</div><div class='add'>+			data |= AR5K_PHY_ERR_FIL_RADAR;</div><div class='add'>+		if (filter &amp; AR5K_RX_FILTER_PHYERR)</div><div class='add'>+			data |= AR5K_PHY_ERR_FIL_OFDM | AR5K_PHY_ERR_FIL_CCK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The AR5210 uses promiscous mode to detect radar activity</div><div class='add'>+	 */</div><div class='add'>+	if (ah-&gt;ah_version == AR5K_AR5210 &amp;&amp;</div><div class='add'>+			(filter &amp; AR5K_RX_FILTER_RADARERR)) {</div><div class='add'>+		filter &amp;= ~AR5K_RX_FILTER_RADARERR;</div><div class='add'>+		filter |= AR5K_RX_FILTER_PROM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*Zero length DMA*/</div><div class='add'>+	if (data)</div><div class='add'>+		AR5K_REG_ENABLE_BITS(ah, AR5K_RXCFG, AR5K_RXCFG_ZLFDMA);</div><div class='add'>+	else</div><div class='add'>+		AR5K_REG_DISABLE_BITS(ah, AR5K_RXCFG, AR5K_RXCFG_ZLFDMA);</div><div class='add'>+</div><div class='add'>+	/*Write RX Filter register*/</div><div class='add'>+	ath5k_hw_reg_write(ah, filter &amp; 0xff, AR5K_RX_FILTER);</div><div class='add'>+</div><div class='add'>+	/*Write PHY error filter register on 5212*/</div><div class='add'>+	if (ah-&gt;ah_version == AR5K_AR5212)</div><div class='add'>+		ath5k_hw_reg_write(ah, data, AR5K_PHY_ERR_FIL);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/****************\</div><div class='add'>+* Beacon control *</div><div class='add'>+\****************/</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_get_tsf32 - Get a 32bit TSF</div><div class='add'>+ *</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ *</div><div class='add'>+ * Returns lower 32 bits of current TSF</div><div class='add'>+ */</div><div class='add'>+u32 ath5k_hw_get_tsf32(struct ath5k_hw *ah)</div><div class='add'>+{</div><div class='add'>+	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='add'>+	return ath5k_hw_reg_read(ah, AR5K_TSF_L32);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_get_tsf64 - Get the full 64bit TSF</div><div class='add'>+ *</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ *</div><div class='add'>+ * Returns the current TSF</div><div class='add'>+ */</div><div class='add'>+u64 ath5k_hw_get_tsf64(struct ath5k_hw *ah)</div><div class='add'>+{</div><div class='add'>+	u64 tsf = ath5k_hw_reg_read(ah, AR5K_TSF_U32);</div><div class='add'>+	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='add'>+</div><div class='add'>+	return ath5k_hw_reg_read(ah, AR5K_TSF_L32) | (tsf &lt;&lt; 32);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_reset_tsf - Force a TSF reset</div><div class='add'>+ *</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ *</div><div class='add'>+ * Forces a TSF reset on PCU</div><div class='add'>+ */</div><div class='add'>+void ath5k_hw_reset_tsf(struct ath5k_hw *ah)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='add'>+</div><div class='add'>+	val = ath5k_hw_reg_read(ah, AR5K_BEACON) | AR5K_BEACON_RESET_TSF;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Each write to the RESET_TSF bit toggles a hardware internal</div><div class='add'>+	 * signal to reset TSF, but if left high it will cause a TSF reset</div><div class='add'>+	 * on the next chip reset as well.  Thus we always write the value</div><div class='add'>+	 * twice to clear the signal.</div><div class='add'>+	 */</div><div class='add'>+	ath5k_hw_reg_write(ah, val, AR5K_BEACON);</div><div class='add'>+	ath5k_hw_reg_write(ah, val, AR5K_BEACON);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Initialize beacon timers</div><div class='add'>+ */</div><div class='add'>+void ath5k_hw_init_beacon(struct ath5k_hw *ah, u32 next_beacon, u32 interval)</div><div class='add'>+{</div><div class='add'>+	u32 timer1, timer2, timer3;</div><div class='add'>+</div><div class='add'>+	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='add'>+	/*</div><div class='add'>+	 * Set the additional timers by mode</div><div class='add'>+	 */</div><div class='add'>+	switch (ah-&gt;ah_op_mode) {</div><div class='add'>+	case NL80211_IFTYPE_STATION:</div><div class='add'>+		if (ah-&gt;ah_version == AR5K_AR5210) {</div><div class='add'>+			timer1 = 0xffffffff;</div><div class='add'>+			timer2 = 0xffffffff;</div><div class='add'>+		} else {</div><div class='add'>+			timer1 = 0x0000ffff;</div><div class='add'>+			timer2 = 0x0007ffff;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		timer1 = (next_beacon - AR5K_TUNE_DMA_BEACON_RESP) &lt;&lt; 3;</div><div class='add'>+		timer2 = (next_beacon - AR5K_TUNE_SW_BEACON_RESP) &lt;&lt; 3;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	timer3 = next_beacon + (ah-&gt;ah_atim_window ? ah-&gt;ah_atim_window : 1);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Set the beacon register and enable all timers.</div><div class='add'>+	 * (next beacon, DMA beacon, software beacon, ATIM window time)</div><div class='add'>+	 */</div><div class='add'>+	ath5k_hw_reg_write(ah, next_beacon, AR5K_TIMER0);</div><div class='add'>+	ath5k_hw_reg_write(ah, timer1, AR5K_TIMER1);</div><div class='add'>+	ath5k_hw_reg_write(ah, timer2, AR5K_TIMER2);</div><div class='add'>+	ath5k_hw_reg_write(ah, timer3, AR5K_TIMER3);</div><div class='add'>+</div><div class='add'>+	ath5k_hw_reg_write(ah, interval &amp; (AR5K_BEACON_PERIOD |</div><div class='add'>+			AR5K_BEACON_RESET_TSF | AR5K_BEACON_ENABLE),</div><div class='add'>+		AR5K_BEACON);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#if 0</div><div class='add'>+/*</div><div class='add'>+ * Set beacon timers</div><div class='add'>+ */</div><div class='add'>+int ath5k_hw_set_beacon_timers(struct ath5k_hw *ah,</div><div class='add'>+		const struct ath5k_beacon_state *state)</div><div class='add'>+{</div><div class='add'>+	u32 cfp_period, next_cfp, dtim, interval, next_beacon;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * TODO: should be changed through *state</div><div class='add'>+	 * review struct ath5k_beacon_state struct</div><div class='add'>+	 *</div><div class='add'>+	 * XXX: These are used for cfp period bellow, are they</div><div class='add'>+	 * ok ? Is it O.K. for tsf here to be 0 or should we use</div><div class='add'>+	 * get_tsf ?</div><div class='add'>+	 */</div><div class='add'>+	u32 dtim_count = 0; /* XXX */</div><div class='add'>+	u32 cfp_count = 0; /* XXX */</div><div class='add'>+	u32 tsf = 0; /* XXX */</div><div class='add'>+</div><div class='add'>+	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='add'>+	/* Return on an invalid beacon state */</div><div class='add'>+	if (state-&gt;bs_interval &lt; 1)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	interval = state-&gt;bs_interval;</div><div class='add'>+	dtim = state-&gt;bs_dtim_period;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * PCF support?</div><div class='add'>+	 */</div><div class='add'>+	if (state-&gt;bs_cfp_period &gt; 0) {</div><div class='add'>+		/*</div><div class='add'>+		 * Enable PCF mode and set the CFP</div><div class='add'>+		 * (Contention Free Period) and timer registers</div><div class='add'>+		 */</div><div class='add'>+		cfp_period = state-&gt;bs_cfp_period * state-&gt;bs_dtim_period *</div><div class='add'>+			state-&gt;bs_interval;</div><div class='add'>+		next_cfp = (cfp_count * state-&gt;bs_dtim_period + dtim_count) *</div><div class='add'>+			state-&gt;bs_interval;</div><div class='add'>+</div><div class='add'>+		AR5K_REG_ENABLE_BITS(ah, AR5K_STA_ID1,</div><div class='add'>+				AR5K_STA_ID1_DEFAULT_ANTENNA |</div><div class='add'>+				AR5K_STA_ID1_PCF);</div><div class='add'>+		ath5k_hw_reg_write(ah, cfp_period, AR5K_CFP_PERIOD);</div><div class='add'>+		ath5k_hw_reg_write(ah, state-&gt;bs_cfp_max_duration,</div><div class='add'>+				AR5K_CFP_DUR);</div><div class='add'>+		ath5k_hw_reg_write(ah, (tsf + (next_cfp == 0 ? cfp_period :</div><div class='add'>+						next_cfp)) &lt;&lt; 3, AR5K_TIMER2);</div><div class='add'>+	} else {</div><div class='add'>+		/* Disable PCF mode */</div><div class='add'>+		AR5K_REG_DISABLE_BITS(ah, AR5K_STA_ID1,</div><div class='add'>+				AR5K_STA_ID1_DEFAULT_ANTENNA |</div><div class='add'>+				AR5K_STA_ID1_PCF);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Enable the beacon timer register</div><div class='add'>+	 */</div><div class='add'>+	ath5k_hw_reg_write(ah, state-&gt;bs_next_beacon, AR5K_TIMER0);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Start the beacon timers</div><div class='add'>+	 */</div><div class='add'>+	ath5k_hw_reg_write(ah, (ath5k_hw_reg_read(ah, AR5K_BEACON) &amp;</div><div class='add'>+		~(AR5K_BEACON_PERIOD | AR5K_BEACON_TIM)) |</div><div class='add'>+		AR5K_REG_SM(state-&gt;bs_tim_offset ? state-&gt;bs_tim_offset + 4 : 0,</div><div class='add'>+		AR5K_BEACON_TIM) | AR5K_REG_SM(state-&gt;bs_interval,</div><div class='add'>+		AR5K_BEACON_PERIOD), AR5K_BEACON);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Write new beacon miss threshold, if it appears to be valid</div><div class='add'>+	 * XXX: Figure out right values for min &lt;= bs_bmiss_threshold &lt;= max</div><div class='add'>+	 * and return if its not in range. We can test this by reading value and</div><div class='add'>+	 * setting value to a largest value and seeing which values register.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	AR5K_REG_WRITE_BITS(ah, AR5K_RSSI_THR, AR5K_RSSI_THR_BMISS,</div><div class='add'>+			state-&gt;bs_bmiss_threshold);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Set sleep control register</div><div class='add'>+	 * XXX: Didn't find this in 5210 code but since this register</div><div class='add'>+	 * exists also in ar5k's 5210 headers i leave it as common code.</div><div class='add'>+	 */</div><div class='add'>+	AR5K_REG_WRITE_BITS(ah, AR5K_SLEEP_CTL, AR5K_SLEEP_CTL_SLDUR,</div><div class='add'>+			(state-&gt;bs_sleep_duration - 3) &lt;&lt; 3);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Set enhanced sleep registers on 5212</div><div class='add'>+	 */</div><div class='add'>+	if (ah-&gt;ah_version == AR5K_AR5212) {</div><div class='add'>+		if (state-&gt;bs_sleep_duration &gt; state-&gt;bs_interval &amp;&amp;</div><div class='add'>+				roundup(state-&gt;bs_sleep_duration, interval) ==</div><div class='add'>+				state-&gt;bs_sleep_duration)</div><div class='add'>+			interval = state-&gt;bs_sleep_duration;</div><div class='add'>+</div><div class='add'>+		if (state-&gt;bs_sleep_duration &gt; dtim &amp;&amp; (dtim == 0 ||</div><div class='add'>+				roundup(state-&gt;bs_sleep_duration, dtim) ==</div><div class='add'>+				state-&gt;bs_sleep_duration))</div><div class='add'>+			dtim = state-&gt;bs_sleep_duration;</div><div class='add'>+</div><div class='add'>+		if (interval &gt; dtim)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		next_beacon = interval == dtim ? state-&gt;bs_next_dtim :</div><div class='add'>+			state-&gt;bs_next_beacon;</div><div class='add'>+</div><div class='add'>+		ath5k_hw_reg_write(ah,</div><div class='add'>+			AR5K_REG_SM((state-&gt;bs_next_dtim - 3) &lt;&lt; 3,</div><div class='add'>+			AR5K_SLEEP0_NEXT_DTIM) |</div><div class='add'>+			AR5K_REG_SM(10, AR5K_SLEEP0_CABTO) |</div><div class='add'>+			AR5K_SLEEP0_ENH_SLEEP_EN |</div><div class='add'>+			AR5K_SLEEP0_ASSUME_DTIM, AR5K_SLEEP0);</div><div class='add'>+</div><div class='add'>+		ath5k_hw_reg_write(ah, AR5K_REG_SM((next_beacon - 3) &lt;&lt; 3,</div><div class='add'>+			AR5K_SLEEP1_NEXT_TIM) |</div><div class='add'>+			AR5K_REG_SM(10, AR5K_SLEEP1_BEACON_TO), AR5K_SLEEP1);</div><div class='add'>+</div><div class='add'>+		ath5k_hw_reg_write(ah,</div><div class='add'>+			AR5K_REG_SM(interval, AR5K_SLEEP2_TIM_PER) |</div><div class='add'>+			AR5K_REG_SM(dtim, AR5K_SLEEP2_DTIM_PER), AR5K_SLEEP2);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Reset beacon timers</div><div class='add'>+ */</div><div class='add'>+void ath5k_hw_reset_beacon(struct ath5k_hw *ah)</div><div class='add'>+{</div><div class='add'>+	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='add'>+	/*</div><div class='add'>+	 * Disable beacon timer</div><div class='add'>+	 */</div><div class='add'>+	ath5k_hw_reg_write(ah, 0, AR5K_TIMER0);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Disable some beacon register values</div><div class='add'>+	 */</div><div class='add'>+	AR5K_REG_DISABLE_BITS(ah, AR5K_STA_ID1,</div><div class='add'>+			AR5K_STA_ID1_DEFAULT_ANTENNA | AR5K_STA_ID1_PCF);</div><div class='add'>+	ath5k_hw_reg_write(ah, AR5K_BEACON_PERIOD, AR5K_BEACON);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Wait for beacon queue to finish</div><div class='add'>+ */</div><div class='add'>+int ath5k_hw_beaconq_finish(struct ath5k_hw *ah, unsigned long phys_addr)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='add'>+</div><div class='add'>+	/* 5210 doesn't have QCU*/</div><div class='add'>+	if (ah-&gt;ah_version == AR5K_AR5210) {</div><div class='add'>+		/*</div><div class='add'>+		 * Wait for beaconn queue to finish by checking</div><div class='add'>+		 * Control Register and Beacon Status Register.</div><div class='add'>+		 */</div><div class='add'>+		for (i = AR5K_TUNE_BEACON_INTERVAL / 2; i &gt; 0; i--) {</div><div class='add'>+			if (!(ath5k_hw_reg_read(ah, AR5K_BSR) &amp; AR5K_BSR_TXQ1F)</div><div class='add'>+					||</div><div class='add'>+			    !(ath5k_hw_reg_read(ah, AR5K_CR) &amp; AR5K_BSR_TXQ1F))</div><div class='add'>+				break;</div><div class='add'>+			udelay(10);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Timeout... */</div><div class='add'>+		if (i &lt;= 0) {</div><div class='add'>+			/*</div><div class='add'>+			 * Re-schedule the beacon queue</div><div class='add'>+			 */</div><div class='add'>+			ath5k_hw_reg_write(ah, phys_addr, AR5K_NOQCU_TXDP1);</div><div class='add'>+			ath5k_hw_reg_write(ah, AR5K_BCR_TQ1V | AR5K_BCR_BDMAE,</div><div class='add'>+					AR5K_BCR);</div><div class='add'>+</div><div class='add'>+			return -EIO;</div><div class='add'>+		}</div><div class='add'>+		ret = 0;</div><div class='add'>+	} else {</div><div class='add'>+	/*5211/5212*/</div><div class='add'>+		ret = ath5k_hw_register_timeout(ah,</div><div class='add'>+			AR5K_QUEUE_STATUS(AR5K_TX_QUEUE_ID_BEACON),</div><div class='add'>+			AR5K_QCU_STS_FRMPENDCNT, 0, false);</div><div class='add'>+</div><div class='add'>+		if (AR5K_REG_READ_Q(ah, AR5K_QCU_TXE, AR5K_TX_QUEUE_ID_BEACON))</div><div class='add'>+			return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*********************\</div><div class='add'>+* Key table functions *</div><div class='add'>+\*********************/</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Reset a key entry on the table</div><div class='add'>+ */</div><div class='add'>+int ath5k_hw_reset_key(struct ath5k_hw *ah, u16 entry)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='add'>+	AR5K_ASSERT_ENTRY(entry, AR5K_KEYTABLE_SIZE);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; AR5K_KEYCACHE_SIZE; i++)</div><div class='add'>+		ath5k_hw_reg_write(ah, 0, AR5K_KEYTABLE_OFF(entry, i));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Set NULL encryption on AR5212+</div><div class='add'>+	 *</div><div class='add'>+	 * Note: AR5K_KEYTABLE_TYPE -&gt; AR5K_KEYTABLE_OFF(entry, 5)</div><div class='add'>+	 *       AR5K_KEYTABLE_TYPE_NULL -&gt; 0x00000007</div><div class='add'>+	 *</div><div class='add'>+	 * Note2: Windows driver (ndiswrapper) sets this to</div><div class='add'>+	 *        0x00000714 instead of 0x00000007</div><div class='add'>+	 */</div><div class='add'>+	if (ah-&gt;ah_version &gt; AR5K_AR5211)</div><div class='add'>+		ath5k_hw_reg_write(ah, AR5K_KEYTABLE_TYPE_NULL,</div><div class='add'>+				AR5K_KEYTABLE_TYPE(entry));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Check if a table entry is valid</div><div class='add'>+ */</div><div class='add'>+int ath5k_hw_is_key_valid(struct ath5k_hw *ah, u16 entry)</div><div class='add'>+{</div><div class='add'>+	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='add'>+	AR5K_ASSERT_ENTRY(entry, AR5K_KEYTABLE_SIZE);</div><div class='add'>+</div><div class='add'>+	/* Check the validation flag at the end of the entry */</div><div class='add'>+	return ath5k_hw_reg_read(ah, AR5K_KEYTABLE_MAC1(entry)) &amp;</div><div class='add'>+		AR5K_KEYTABLE_VALID;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Set a key entry on the table</div><div class='add'>+ */</div><div class='add'>+int ath5k_hw_set_key(struct ath5k_hw *ah, u16 entry,</div><div class='add'>+		const struct ieee80211_key_conf *key, const u8 *mac)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+	__le32 key_v[5] = {};</div><div class='add'>+	u32 keytype;</div><div class='add'>+</div><div class='add'>+	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='add'>+</div><div class='add'>+	/* key-&gt;keylen comes in from mac80211 in bytes */</div><div class='add'>+</div><div class='add'>+	if (key-&gt;keylen &gt; AR5K_KEYTABLE_SIZE / 8)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	switch (key-&gt;keylen) {</div><div class='add'>+	/* WEP 40-bit   = 40-bit  entered key + 24 bit IV = 64-bit */</div><div class='add'>+	case 40 / 8:</div><div class='add'>+		memcpy(&amp;key_v[0], key-&gt;key, 5);</div><div class='add'>+		keytype = AR5K_KEYTABLE_TYPE_40;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	/* WEP 104-bit  = 104-bit entered key + 24-bit IV = 128-bit */</div><div class='add'>+	case 104 / 8:</div><div class='add'>+		memcpy(&amp;key_v[0], &amp;key-&gt;key[0], 6);</div><div class='add'>+		memcpy(&amp;key_v[2], &amp;key-&gt;key[6], 6);</div><div class='add'>+		memcpy(&amp;key_v[4], &amp;key-&gt;key[12], 1);</div><div class='add'>+		keytype = AR5K_KEYTABLE_TYPE_104;</div><div class='add'>+		break;</div><div class='add'>+	/* WEP 128-bit  = 128-bit entered key + 24 bit IV = 152-bit */</div><div class='add'>+	case 128 / 8:</div><div class='add'>+		memcpy(&amp;key_v[0], &amp;key-&gt;key[0], 6);</div><div class='add'>+		memcpy(&amp;key_v[2], &amp;key-&gt;key[6], 6);</div><div class='add'>+		memcpy(&amp;key_v[4], &amp;key-&gt;key[12], 4);</div><div class='add'>+		keytype = AR5K_KEYTABLE_TYPE_128;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL; /* shouldn't happen */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(key_v); i++)</div><div class='add'>+		ath5k_hw_reg_write(ah, le32_to_cpu(key_v[i]),</div><div class='add'>+				AR5K_KEYTABLE_OFF(entry, i));</div><div class='add'>+</div><div class='add'>+	ath5k_hw_reg_write(ah, keytype, AR5K_KEYTABLE_TYPE(entry));</div><div class='add'>+</div><div class='add'>+	return ath5k_hw_set_key_lladdr(ah, entry, mac);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath5k_hw_set_key_lladdr(struct ath5k_hw *ah, u16 entry, const u8 *mac)</div><div class='add'>+{</div><div class='add'>+	u32 low_id, high_id;</div><div class='add'>+</div><div class='add'>+	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='add'>+	 /* Invalid entry (key table overflow) */</div><div class='add'>+	AR5K_ASSERT_ENTRY(entry, AR5K_KEYTABLE_SIZE);</div><div class='add'>+</div><div class='add'>+	/* MAC may be NULL if it's a broadcast key. In this case no need to</div><div class='add'>+	 * to compute AR5K_LOW_ID and AR5K_HIGH_ID as we already know it. */</div><div class='add'>+	if (unlikely(mac == NULL)) {</div><div class='add'>+		low_id = 0xffffffff;</div><div class='add'>+		high_id = 0xffff | AR5K_KEYTABLE_VALID;</div><div class='add'>+	} else {</div><div class='add'>+		low_id = AR5K_LOW_ID(mac);</div><div class='add'>+		high_id = AR5K_HIGH_ID(mac) | AR5K_KEYTABLE_VALID;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath5k_hw_reg_write(ah, low_id, AR5K_KEYTABLE_MAC0(entry));</div><div class='add'>+	ath5k_hw_reg_write(ah, high_id, AR5K_KEYTABLE_MAC1(entry));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='head'>diff --git a/drivers/net/wireless/ath5k/phy.c b/drivers/net/wireless/ath5k/phy.c<br/>index fa0d47faf574..e43f6563e61a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/ath5k/phy.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/ath5k/phy.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/ath5k/phy.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/ath5k/phy.c</a></div><div class='hunk'>@@ -1,9 +1,9 @@</div><div class='ctx'> /*</div><div class='ctx'>  * PHY functions</div><div class='ctx'>  *</div><div class='del'>- * Copyright (c) 2004, 2005, 2006, 2007 Reyk Floeter &lt;reyk@openbsd.org&gt;</div><div class='del'>- * Copyright (c) 2006, 2007 Nick Kossifidis &lt;mickflemm@gmail.com&gt;</div><div class='del'>- * Copyright (c) 2007 Jiri Slaby &lt;jirislaby@gmail.com&gt;</div><div class='add'>+ * Copyright (c) 2004-2007 Reyk Floeter &lt;reyk@openbsd.org&gt;</div><div class='add'>+ * Copyright (c) 2006-2007 Nick Kossifidis &lt;mickflemm@gmail.com&gt;</div><div class='add'>+ * Copyright (c) 2007-2008 Jiri Slaby &lt;jirislaby@gmail.com&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * Permission to use, copy, modify, and distribute this software for any</div><div class='ctx'>  * purpose with or without fee is hereby granted, provided that the above</div><div class='hunk'>@@ -19,6 +19,8 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#define _ATH5K_PHY</div><div class='add'>+</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "ath5k.h"</div><div class='hunk'>@@ -2122,7 +2124,7 @@ static int ath5k_hw_rf5110_calibrate(struct ath5k_hw *ah,</div><div class='ctx'> 	beacon = ath5k_hw_reg_read(ah, AR5K_BEACON_5210);</div><div class='ctx'> 	ath5k_hw_reg_write(ah, beacon &amp; ~AR5K_BEACON_ENABLE, AR5K_BEACON_5210);</div><div class='ctx'> </div><div class='del'>-	udelay(2300);</div><div class='add'>+	mdelay(2);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Set the channel (with AGC turned off)</div><div class='hunk'>@@ -2501,3 +2503,5 @@ int ath5k_hw_set_txpower_limit(struct ath5k_hw *ah, unsigned int power)</div><div class='ctx'> </div><div class='ctx'> 	return ath5k_hw_txpower(ah, channel, power);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+#undef _ATH5K_PHY</div><div class='head'>diff --git a/drivers/net/wireless/ath5k/qcu.c b/drivers/net/wireless/ath5k/qcu.c<br/>new file mode 100644<br/>index 000000000000..01bf09176d23<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/ath5k/qcu.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/ath5k/qcu.c</a></div><div class='hunk'>@@ -0,0 +1,488 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2004-2008 Reyk Floeter &lt;reyk@openbsd.org&gt;</div><div class='add'>+ * Copyright (c) 2006-2008 Nick Kossifidis &lt;mickflemm@gmail.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * Permission to use, copy, modify, and distribute this software for any</div><div class='add'>+ * purpose with or without fee is hereby granted, provided that the above</div><div class='add'>+ * copyright notice and this permission notice appear in all copies.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES</div><div class='add'>+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR</div><div class='add'>+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES</div><div class='add'>+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN</div><div class='add'>+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF</div><div class='add'>+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/********************************************\</div><div class='add'>+Queue Control Unit, DFS Control Unit Functions</div><div class='add'>+\********************************************/</div><div class='add'>+</div><div class='add'>+#include "ath5k.h"</div><div class='add'>+#include "reg.h"</div><div class='add'>+#include "debug.h"</div><div class='add'>+#include "base.h"</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Get properties for a transmit queue</div><div class='add'>+ */</div><div class='add'>+int ath5k_hw_get_tx_queueprops(struct ath5k_hw *ah, int queue,</div><div class='add'>+		struct ath5k_txq_info *queue_info)</div><div class='add'>+{</div><div class='add'>+	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='add'>+	memcpy(queue_info, &amp;ah-&gt;ah_txq[queue], sizeof(struct ath5k_txq_info));</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Set properties for a transmit queue</div><div class='add'>+ */</div><div class='add'>+int ath5k_hw_set_tx_queueprops(struct ath5k_hw *ah, int queue,</div><div class='add'>+				const struct ath5k_txq_info *queue_info)</div><div class='add'>+{</div><div class='add'>+	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='add'>+	AR5K_ASSERT_ENTRY(queue, ah-&gt;ah_capabilities.cap_queues.q_tx_num);</div><div class='add'>+</div><div class='add'>+	if (ah-&gt;ah_txq[queue].tqi_type == AR5K_TX_QUEUE_INACTIVE)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;ah-&gt;ah_txq[queue], queue_info, sizeof(struct ath5k_txq_info));</div><div class='add'>+</div><div class='add'>+	/*XXX: Is this supported on 5210 ?*/</div><div class='add'>+	if ((queue_info-&gt;tqi_type == AR5K_TX_QUEUE_DATA &amp;&amp;</div><div class='add'>+			((queue_info-&gt;tqi_subtype == AR5K_WME_AC_VI) ||</div><div class='add'>+			(queue_info-&gt;tqi_subtype == AR5K_WME_AC_VO))) ||</div><div class='add'>+			queue_info-&gt;tqi_type == AR5K_TX_QUEUE_UAPSD)</div><div class='add'>+		ah-&gt;ah_txq[queue].tqi_flags |= AR5K_TXQ_FLAG_POST_FR_BKOFF_DIS;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Initialize a transmit queue</div><div class='add'>+ */</div><div class='add'>+int ath5k_hw_setup_tx_queue(struct ath5k_hw *ah, enum ath5k_tx_queue queue_type,</div><div class='add'>+		struct ath5k_txq_info *queue_info)</div><div class='add'>+{</div><div class='add'>+	unsigned int queue;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Get queue by type</div><div class='add'>+	 */</div><div class='add'>+	/*5210 only has 2 queues*/</div><div class='add'>+	if (ah-&gt;ah_version == AR5K_AR5210) {</div><div class='add'>+		switch (queue_type) {</div><div class='add'>+		case AR5K_TX_QUEUE_DATA:</div><div class='add'>+			queue = AR5K_TX_QUEUE_ID_NOQCU_DATA;</div><div class='add'>+			break;</div><div class='add'>+		case AR5K_TX_QUEUE_BEACON:</div><div class='add'>+		case AR5K_TX_QUEUE_CAB:</div><div class='add'>+			queue = AR5K_TX_QUEUE_ID_NOQCU_BEACON;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		switch (queue_type) {</div><div class='add'>+		case AR5K_TX_QUEUE_DATA:</div><div class='add'>+			for (queue = AR5K_TX_QUEUE_ID_DATA_MIN;</div><div class='add'>+				ah-&gt;ah_txq[queue].tqi_type !=</div><div class='add'>+				AR5K_TX_QUEUE_INACTIVE; queue++) {</div><div class='add'>+</div><div class='add'>+				if (queue &gt; AR5K_TX_QUEUE_ID_DATA_MAX)</div><div class='add'>+					return -EINVAL;</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		case AR5K_TX_QUEUE_UAPSD:</div><div class='add'>+			queue = AR5K_TX_QUEUE_ID_UAPSD;</div><div class='add'>+			break;</div><div class='add'>+		case AR5K_TX_QUEUE_BEACON:</div><div class='add'>+			queue = AR5K_TX_QUEUE_ID_BEACON;</div><div class='add'>+			break;</div><div class='add'>+		case AR5K_TX_QUEUE_CAB:</div><div class='add'>+			queue = AR5K_TX_QUEUE_ID_CAB;</div><div class='add'>+			break;</div><div class='add'>+		case AR5K_TX_QUEUE_XR_DATA:</div><div class='add'>+			if (ah-&gt;ah_version != AR5K_AR5212)</div><div class='add'>+				ATH5K_ERR(ah-&gt;ah_sc,</div><div class='add'>+					"XR data queues only supported in"</div><div class='add'>+					" 5212!\n");</div><div class='add'>+			queue = AR5K_TX_QUEUE_ID_XR_DATA;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Setup internal queue structure</div><div class='add'>+	 */</div><div class='add'>+	memset(&amp;ah-&gt;ah_txq[queue], 0, sizeof(struct ath5k_txq_info));</div><div class='add'>+	ah-&gt;ah_txq[queue].tqi_type = queue_type;</div><div class='add'>+</div><div class='add'>+	if (queue_info != NULL) {</div><div class='add'>+		queue_info-&gt;tqi_type = queue_type;</div><div class='add'>+		ret = ath5k_hw_set_tx_queueprops(ah, queue, queue_info);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We use ah_txq_status to hold a temp value for</div><div class='add'>+	 * the Secondary interrupt mask registers on 5211+</div><div class='add'>+	 * check out ath5k_hw_reset_tx_queue</div><div class='add'>+	 */</div><div class='add'>+	AR5K_Q_ENABLE_BITS(ah-&gt;ah_txq_status, queue);</div><div class='add'>+</div><div class='add'>+	return queue;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Get number of pending frames</div><div class='add'>+ * for a specific queue [5211+]</div><div class='add'>+ */</div><div class='add'>+u32 ath5k_hw_num_tx_pending(struct ath5k_hw *ah, unsigned int queue)</div><div class='add'>+{</div><div class='add'>+	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='add'>+	AR5K_ASSERT_ENTRY(queue, ah-&gt;ah_capabilities.cap_queues.q_tx_num);</div><div class='add'>+</div><div class='add'>+	/* Return if queue is declared inactive */</div><div class='add'>+	if (ah-&gt;ah_txq[queue].tqi_type == AR5K_TX_QUEUE_INACTIVE)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* XXX: How about AR5K_CFG_TXCNT ? */</div><div class='add'>+	if (ah-&gt;ah_version == AR5K_AR5210)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return AR5K_QUEUE_STATUS(queue) &amp; AR5K_QCU_STS_FRMPENDCNT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Set a transmit queue inactive</div><div class='add'>+ */</div><div class='add'>+void ath5k_hw_release_tx_queue(struct ath5k_hw *ah, unsigned int queue)</div><div class='add'>+{</div><div class='add'>+	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='add'>+	if (WARN_ON(queue &gt;= ah-&gt;ah_capabilities.cap_queues.q_tx_num))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* This queue will be skipped in further operations */</div><div class='add'>+	ah-&gt;ah_txq[queue].tqi_type = AR5K_TX_QUEUE_INACTIVE;</div><div class='add'>+	/*For SIMR setup*/</div><div class='add'>+	AR5K_Q_DISABLE_BITS(ah-&gt;ah_txq_status, queue);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Set DFS properties for a transmit queue on DCU</div><div class='add'>+ */</div><div class='add'>+int ath5k_hw_reset_tx_queue(struct ath5k_hw *ah, unsigned int queue)</div><div class='add'>+{</div><div class='add'>+	u32 cw_min, cw_max, retry_lg, retry_sh;</div><div class='add'>+	struct ath5k_txq_info *tq = &amp;ah-&gt;ah_txq[queue];</div><div class='add'>+</div><div class='add'>+	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='add'>+	AR5K_ASSERT_ENTRY(queue, ah-&gt;ah_capabilities.cap_queues.q_tx_num);</div><div class='add'>+</div><div class='add'>+	tq = &amp;ah-&gt;ah_txq[queue];</div><div class='add'>+</div><div class='add'>+	if (tq-&gt;tqi_type == AR5K_TX_QUEUE_INACTIVE)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (ah-&gt;ah_version == AR5K_AR5210) {</div><div class='add'>+		/* Only handle data queues, others will be ignored */</div><div class='add'>+		if (tq-&gt;tqi_type != AR5K_TX_QUEUE_DATA)</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		/* Set Slot time */</div><div class='add'>+		ath5k_hw_reg_write(ah, ah-&gt;ah_turbo ?</div><div class='add'>+			AR5K_INIT_SLOT_TIME_TURBO : AR5K_INIT_SLOT_TIME,</div><div class='add'>+			AR5K_SLOT_TIME);</div><div class='add'>+		/* Set ACK_CTS timeout */</div><div class='add'>+		ath5k_hw_reg_write(ah, ah-&gt;ah_turbo ?</div><div class='add'>+			AR5K_INIT_ACK_CTS_TIMEOUT_TURBO :</div><div class='add'>+			AR5K_INIT_ACK_CTS_TIMEOUT, AR5K_SLOT_TIME);</div><div class='add'>+		/* Set Transmit Latency */</div><div class='add'>+		ath5k_hw_reg_write(ah, ah-&gt;ah_turbo ?</div><div class='add'>+			AR5K_INIT_TRANSMIT_LATENCY_TURBO :</div><div class='add'>+			AR5K_INIT_TRANSMIT_LATENCY, AR5K_USEC_5210);</div><div class='add'>+</div><div class='add'>+		/* Set IFS0 */</div><div class='add'>+		if (ah-&gt;ah_turbo) {</div><div class='add'>+			 ath5k_hw_reg_write(ah, ((AR5K_INIT_SIFS_TURBO +</div><div class='add'>+				(ah-&gt;ah_aifs + tq-&gt;tqi_aifs) *</div><div class='add'>+				AR5K_INIT_SLOT_TIME_TURBO) &lt;&lt;</div><div class='add'>+				AR5K_IFS0_DIFS_S) | AR5K_INIT_SIFS_TURBO,</div><div class='add'>+				AR5K_IFS0);</div><div class='add'>+		} else {</div><div class='add'>+			ath5k_hw_reg_write(ah, ((AR5K_INIT_SIFS +</div><div class='add'>+				(ah-&gt;ah_aifs + tq-&gt;tqi_aifs) *</div><div class='add'>+				AR5K_INIT_SLOT_TIME) &lt;&lt; AR5K_IFS0_DIFS_S) |</div><div class='add'>+				AR5K_INIT_SIFS, AR5K_IFS0);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Set IFS1 */</div><div class='add'>+		ath5k_hw_reg_write(ah, ah-&gt;ah_turbo ?</div><div class='add'>+			AR5K_INIT_PROTO_TIME_CNTRL_TURBO :</div><div class='add'>+			AR5K_INIT_PROTO_TIME_CNTRL, AR5K_IFS1);</div><div class='add'>+		/* Set AR5K_PHY_SETTLING */</div><div class='add'>+		ath5k_hw_reg_write(ah, ah-&gt;ah_turbo ?</div><div class='add'>+			(ath5k_hw_reg_read(ah, AR5K_PHY_SETTLING) &amp; ~0x7F)</div><div class='add'>+			| 0x38 :</div><div class='add'>+			(ath5k_hw_reg_read(ah, AR5K_PHY_SETTLING) &amp; ~0x7F)</div><div class='add'>+			| 0x1C,</div><div class='add'>+			AR5K_PHY_SETTLING);</div><div class='add'>+		/* Set Frame Control Register */</div><div class='add'>+		ath5k_hw_reg_write(ah, ah-&gt;ah_turbo ?</div><div class='add'>+			(AR5K_PHY_FRAME_CTL_INI | AR5K_PHY_TURBO_MODE |</div><div class='add'>+			AR5K_PHY_TURBO_SHORT | 0x2020) :</div><div class='add'>+			(AR5K_PHY_FRAME_CTL_INI | 0x1020),</div><div class='add'>+			AR5K_PHY_FRAME_CTL_5210);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Calculate cwmin/max by channel mode</div><div class='add'>+	 */</div><div class='add'>+	cw_min = ah-&gt;ah_cw_min = AR5K_TUNE_CWMIN;</div><div class='add'>+	cw_max = ah-&gt;ah_cw_max = AR5K_TUNE_CWMAX;</div><div class='add'>+	ah-&gt;ah_aifs = AR5K_TUNE_AIFS;</div><div class='add'>+	/*XR is only supported on 5212*/</div><div class='add'>+	if (IS_CHAN_XR(ah-&gt;ah_current_channel) &amp;&amp;</div><div class='add'>+			ah-&gt;ah_version == AR5K_AR5212) {</div><div class='add'>+		cw_min = ah-&gt;ah_cw_min = AR5K_TUNE_CWMIN_XR;</div><div class='add'>+		cw_max = ah-&gt;ah_cw_max = AR5K_TUNE_CWMAX_XR;</div><div class='add'>+		ah-&gt;ah_aifs = AR5K_TUNE_AIFS_XR;</div><div class='add'>+	/*B mode is not supported on 5210*/</div><div class='add'>+	} else if (IS_CHAN_B(ah-&gt;ah_current_channel) &amp;&amp;</div><div class='add'>+			ah-&gt;ah_version != AR5K_AR5210) {</div><div class='add'>+		cw_min = ah-&gt;ah_cw_min = AR5K_TUNE_CWMIN_11B;</div><div class='add'>+		cw_max = ah-&gt;ah_cw_max = AR5K_TUNE_CWMAX_11B;</div><div class='add'>+		ah-&gt;ah_aifs = AR5K_TUNE_AIFS_11B;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cw_min = 1;</div><div class='add'>+	while (cw_min &lt; ah-&gt;ah_cw_min)</div><div class='add'>+		cw_min = (cw_min &lt;&lt; 1) | 1;</div><div class='add'>+</div><div class='add'>+	cw_min = tq-&gt;tqi_cw_min &lt; 0 ? (cw_min &gt;&gt; (-tq-&gt;tqi_cw_min)) :</div><div class='add'>+		((cw_min &lt;&lt; tq-&gt;tqi_cw_min) + (1 &lt;&lt; tq-&gt;tqi_cw_min) - 1);</div><div class='add'>+	cw_max = tq-&gt;tqi_cw_max &lt; 0 ? (cw_max &gt;&gt; (-tq-&gt;tqi_cw_max)) :</div><div class='add'>+		((cw_max &lt;&lt; tq-&gt;tqi_cw_max) + (1 &lt;&lt; tq-&gt;tqi_cw_max) - 1);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Calculate and set retry limits</div><div class='add'>+	 */</div><div class='add'>+	if (ah-&gt;ah_software_retry) {</div><div class='add'>+		/* XXX Need to test this */</div><div class='add'>+		retry_lg = ah-&gt;ah_limit_tx_retries;</div><div class='add'>+		retry_sh = retry_lg = retry_lg &gt; AR5K_DCU_RETRY_LMT_SH_RETRY ?</div><div class='add'>+			AR5K_DCU_RETRY_LMT_SH_RETRY : retry_lg;</div><div class='add'>+	} else {</div><div class='add'>+		retry_lg = AR5K_INIT_LG_RETRY;</div><div class='add'>+		retry_sh = AR5K_INIT_SH_RETRY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*No QCU/DCU [5210]*/</div><div class='add'>+	if (ah-&gt;ah_version == AR5K_AR5210) {</div><div class='add'>+		ath5k_hw_reg_write(ah,</div><div class='add'>+			(cw_min &lt;&lt; AR5K_NODCU_RETRY_LMT_CW_MIN_S)</div><div class='add'>+			| AR5K_REG_SM(AR5K_INIT_SLG_RETRY,</div><div class='add'>+				AR5K_NODCU_RETRY_LMT_SLG_RETRY)</div><div class='add'>+			| AR5K_REG_SM(AR5K_INIT_SSH_RETRY,</div><div class='add'>+				AR5K_NODCU_RETRY_LMT_SSH_RETRY)</div><div class='add'>+			| AR5K_REG_SM(retry_lg, AR5K_NODCU_RETRY_LMT_LG_RETRY)</div><div class='add'>+			| AR5K_REG_SM(retry_sh, AR5K_NODCU_RETRY_LMT_SH_RETRY),</div><div class='add'>+			AR5K_NODCU_RETRY_LMT);</div><div class='add'>+	} else {</div><div class='add'>+		/*QCU/DCU [5211+]*/</div><div class='add'>+		ath5k_hw_reg_write(ah,</div><div class='add'>+			AR5K_REG_SM(AR5K_INIT_SLG_RETRY,</div><div class='add'>+				AR5K_DCU_RETRY_LMT_SLG_RETRY) |</div><div class='add'>+			AR5K_REG_SM(AR5K_INIT_SSH_RETRY,</div><div class='add'>+				AR5K_DCU_RETRY_LMT_SSH_RETRY) |</div><div class='add'>+			AR5K_REG_SM(retry_lg, AR5K_DCU_RETRY_LMT_LG_RETRY) |</div><div class='add'>+			AR5K_REG_SM(retry_sh, AR5K_DCU_RETRY_LMT_SH_RETRY),</div><div class='add'>+			AR5K_QUEUE_DFS_RETRY_LIMIT(queue));</div><div class='add'>+</div><div class='add'>+	/*===Rest is also for QCU/DCU only [5211+]===*/</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Set initial content window (cw_min/cw_max)</div><div class='add'>+		 * and arbitrated interframe space (aifs)...</div><div class='add'>+		 */</div><div class='add'>+		ath5k_hw_reg_write(ah,</div><div class='add'>+			AR5K_REG_SM(cw_min, AR5K_DCU_LCL_IFS_CW_MIN) |</div><div class='add'>+			AR5K_REG_SM(cw_max, AR5K_DCU_LCL_IFS_CW_MAX) |</div><div class='add'>+			AR5K_REG_SM(ah-&gt;ah_aifs + tq-&gt;tqi_aifs,</div><div class='add'>+				AR5K_DCU_LCL_IFS_AIFS),</div><div class='add'>+			AR5K_QUEUE_DFS_LOCAL_IFS(queue));</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Set misc registers</div><div class='add'>+		 */</div><div class='add'>+		ath5k_hw_reg_write(ah, AR5K_QCU_MISC_DCU_EARLY,</div><div class='add'>+			AR5K_QUEUE_MISC(queue));</div><div class='add'>+</div><div class='add'>+		if (tq-&gt;tqi_cbr_period) {</div><div class='add'>+			ath5k_hw_reg_write(ah, AR5K_REG_SM(tq-&gt;tqi_cbr_period,</div><div class='add'>+				AR5K_QCU_CBRCFG_INTVAL) |</div><div class='add'>+				AR5K_REG_SM(tq-&gt;tqi_cbr_overflow_limit,</div><div class='add'>+				AR5K_QCU_CBRCFG_ORN_THRES),</div><div class='add'>+				AR5K_QUEUE_CBRCFG(queue));</div><div class='add'>+			AR5K_REG_ENABLE_BITS(ah, AR5K_QUEUE_MISC(queue),</div><div class='add'>+				AR5K_QCU_MISC_FRSHED_CBR);</div><div class='add'>+			if (tq-&gt;tqi_cbr_overflow_limit)</div><div class='add'>+				AR5K_REG_ENABLE_BITS(ah,</div><div class='add'>+					AR5K_QUEUE_MISC(queue),</div><div class='add'>+					AR5K_QCU_MISC_CBR_THRES_ENABLE);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (tq-&gt;tqi_ready_time)</div><div class='add'>+			ath5k_hw_reg_write(ah, AR5K_REG_SM(tq-&gt;tqi_ready_time,</div><div class='add'>+				AR5K_QCU_RDYTIMECFG_INTVAL) |</div><div class='add'>+				AR5K_QCU_RDYTIMECFG_ENABLE,</div><div class='add'>+				AR5K_QUEUE_RDYTIMECFG(queue));</div><div class='add'>+</div><div class='add'>+		if (tq-&gt;tqi_burst_time) {</div><div class='add'>+			ath5k_hw_reg_write(ah, AR5K_REG_SM(tq-&gt;tqi_burst_time,</div><div class='add'>+				AR5K_DCU_CHAN_TIME_DUR) |</div><div class='add'>+				AR5K_DCU_CHAN_TIME_ENABLE,</div><div class='add'>+				AR5K_QUEUE_DFS_CHANNEL_TIME(queue));</div><div class='add'>+</div><div class='add'>+			if (tq-&gt;tqi_flags</div><div class='add'>+			&amp; AR5K_TXQ_FLAG_RDYTIME_EXP_POLICY_ENABLE)</div><div class='add'>+				AR5K_REG_ENABLE_BITS(ah,</div><div class='add'>+					AR5K_QUEUE_MISC(queue),</div><div class='add'>+					AR5K_QCU_MISC_RDY_VEOL_POLICY);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (tq-&gt;tqi_flags &amp; AR5K_TXQ_FLAG_BACKOFF_DISABLE)</div><div class='add'>+			ath5k_hw_reg_write(ah, AR5K_DCU_MISC_POST_FR_BKOFF_DIS,</div><div class='add'>+				AR5K_QUEUE_DFS_MISC(queue));</div><div class='add'>+</div><div class='add'>+		if (tq-&gt;tqi_flags &amp; AR5K_TXQ_FLAG_FRAG_BURST_BACKOFF_ENABLE)</div><div class='add'>+			ath5k_hw_reg_write(ah, AR5K_DCU_MISC_BACKOFF_FRAG,</div><div class='add'>+				AR5K_QUEUE_DFS_MISC(queue));</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Set registers by queue type</div><div class='add'>+		 */</div><div class='add'>+		switch (tq-&gt;tqi_type) {</div><div class='add'>+		case AR5K_TX_QUEUE_BEACON:</div><div class='add'>+			AR5K_REG_ENABLE_BITS(ah, AR5K_QUEUE_MISC(queue),</div><div class='add'>+				AR5K_QCU_MISC_FRSHED_DBA_GT |</div><div class='add'>+				AR5K_QCU_MISC_CBREXP_BCN_DIS |</div><div class='add'>+				AR5K_QCU_MISC_BCN_ENABLE);</div><div class='add'>+</div><div class='add'>+			AR5K_REG_ENABLE_BITS(ah, AR5K_QUEUE_DFS_MISC(queue),</div><div class='add'>+				(AR5K_DCU_MISC_ARBLOCK_CTL_GLOBAL &lt;&lt;</div><div class='add'>+				AR5K_DCU_MISC_ARBLOCK_CTL_S) |</div><div class='add'>+				AR5K_DCU_MISC_POST_FR_BKOFF_DIS |</div><div class='add'>+				AR5K_DCU_MISC_BCN_ENABLE);</div><div class='add'>+</div><div class='add'>+			ath5k_hw_reg_write(ah, ((AR5K_TUNE_BEACON_INTERVAL -</div><div class='add'>+				(AR5K_TUNE_SW_BEACON_RESP -</div><div class='add'>+				AR5K_TUNE_DMA_BEACON_RESP) -</div><div class='add'>+				AR5K_TUNE_ADDITIONAL_SWBA_BACKOFF) * 1024) |</div><div class='add'>+				AR5K_QCU_RDYTIMECFG_ENABLE,</div><div class='add'>+				AR5K_QUEUE_RDYTIMECFG(queue));</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case AR5K_TX_QUEUE_CAB:</div><div class='add'>+			AR5K_REG_ENABLE_BITS(ah, AR5K_QUEUE_MISC(queue),</div><div class='add'>+				AR5K_QCU_MISC_FRSHED_DBA_GT |</div><div class='add'>+				AR5K_QCU_MISC_CBREXP_DIS |</div><div class='add'>+				AR5K_QCU_MISC_CBREXP_BCN_DIS);</div><div class='add'>+</div><div class='add'>+			AR5K_REG_ENABLE_BITS(ah, AR5K_QUEUE_DFS_MISC(queue),</div><div class='add'>+				(AR5K_DCU_MISC_ARBLOCK_CTL_GLOBAL &lt;&lt;</div><div class='add'>+				AR5K_DCU_MISC_ARBLOCK_CTL_S));</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case AR5K_TX_QUEUE_UAPSD:</div><div class='add'>+			AR5K_REG_ENABLE_BITS(ah, AR5K_QUEUE_MISC(queue),</div><div class='add'>+				AR5K_QCU_MISC_CBREXP_DIS);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case AR5K_TX_QUEUE_DATA:</div><div class='add'>+		default:</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Enable interrupts for this tx queue</div><div class='add'>+		 * in the secondary interrupt mask registers</div><div class='add'>+		 */</div><div class='add'>+		if (tq-&gt;tqi_flags &amp; AR5K_TXQ_FLAG_TXOKINT_ENABLE)</div><div class='add'>+			AR5K_Q_ENABLE_BITS(ah-&gt;ah_txq_imr_txok, queue);</div><div class='add'>+</div><div class='add'>+		if (tq-&gt;tqi_flags &amp; AR5K_TXQ_FLAG_TXERRINT_ENABLE)</div><div class='add'>+			AR5K_Q_ENABLE_BITS(ah-&gt;ah_txq_imr_txerr, queue);</div><div class='add'>+</div><div class='add'>+		if (tq-&gt;tqi_flags &amp; AR5K_TXQ_FLAG_TXURNINT_ENABLE)</div><div class='add'>+			AR5K_Q_ENABLE_BITS(ah-&gt;ah_txq_imr_txurn, queue);</div><div class='add'>+</div><div class='add'>+		if (tq-&gt;tqi_flags &amp; AR5K_TXQ_FLAG_TXDESCINT_ENABLE)</div><div class='add'>+			AR5K_Q_ENABLE_BITS(ah-&gt;ah_txq_imr_txdesc, queue);</div><div class='add'>+</div><div class='add'>+		if (tq-&gt;tqi_flags &amp; AR5K_TXQ_FLAG_TXEOLINT_ENABLE)</div><div class='add'>+			AR5K_Q_ENABLE_BITS(ah-&gt;ah_txq_imr_txeol, queue);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+		/* Update secondary interrupt mask registers */</div><div class='add'>+		ah-&gt;ah_txq_imr_txok &amp;= ah-&gt;ah_txq_status;</div><div class='add'>+		ah-&gt;ah_txq_imr_txerr &amp;= ah-&gt;ah_txq_status;</div><div class='add'>+		ah-&gt;ah_txq_imr_txurn &amp;= ah-&gt;ah_txq_status;</div><div class='add'>+		ah-&gt;ah_txq_imr_txdesc &amp;= ah-&gt;ah_txq_status;</div><div class='add'>+		ah-&gt;ah_txq_imr_txeol &amp;= ah-&gt;ah_txq_status;</div><div class='add'>+</div><div class='add'>+		ath5k_hw_reg_write(ah, AR5K_REG_SM(ah-&gt;ah_txq_imr_txok,</div><div class='add'>+			AR5K_SIMR0_QCU_TXOK) |</div><div class='add'>+			AR5K_REG_SM(ah-&gt;ah_txq_imr_txdesc,</div><div class='add'>+			AR5K_SIMR0_QCU_TXDESC), AR5K_SIMR0);</div><div class='add'>+		ath5k_hw_reg_write(ah, AR5K_REG_SM(ah-&gt;ah_txq_imr_txerr,</div><div class='add'>+			AR5K_SIMR1_QCU_TXERR) |</div><div class='add'>+			AR5K_REG_SM(ah-&gt;ah_txq_imr_txeol,</div><div class='add'>+			AR5K_SIMR1_QCU_TXEOL), AR5K_SIMR1);</div><div class='add'>+		ath5k_hw_reg_write(ah, AR5K_REG_SM(ah-&gt;ah_txq_imr_txurn,</div><div class='add'>+			AR5K_SIMR2_QCU_TXURN), AR5K_SIMR2);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Get slot time from DCU</div><div class='add'>+ */</div><div class='add'>+unsigned int ath5k_hw_get_slot_time(struct ath5k_hw *ah)</div><div class='add'>+{</div><div class='add'>+	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='add'>+	if (ah-&gt;ah_version == AR5K_AR5210)</div><div class='add'>+		return ath5k_hw_clocktoh(ath5k_hw_reg_read(ah,</div><div class='add'>+				AR5K_SLOT_TIME) &amp; 0xffff, ah-&gt;ah_turbo);</div><div class='add'>+	else</div><div class='add'>+		return ath5k_hw_reg_read(ah, AR5K_DCU_GBL_IFS_SLOT) &amp; 0xffff;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Set slot time on DCU</div><div class='add'>+ */</div><div class='add'>+int ath5k_hw_set_slot_time(struct ath5k_hw *ah, unsigned int slot_time)</div><div class='add'>+{</div><div class='add'>+	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='add'>+	if (slot_time &lt; AR5K_SLOT_TIME_9 || slot_time &gt; AR5K_SLOT_TIME_MAX)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (ah-&gt;ah_version == AR5K_AR5210)</div><div class='add'>+		ath5k_hw_reg_write(ah, ath5k_hw_htoclock(slot_time,</div><div class='add'>+				ah-&gt;ah_turbo), AR5K_SLOT_TIME);</div><div class='add'>+	else</div><div class='add'>+		ath5k_hw_reg_write(ah, slot_time, AR5K_DCU_GBL_IFS_SLOT);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='head'>diff --git a/drivers/net/wireless/ath5k/reg.h b/drivers/net/wireless/ath5k/reg.h<br/>index 7562bf173d3e..e557fe178bbf 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/ath5k/reg.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/ath5k/reg.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/ath5k/reg.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/ath5k/reg.h</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*</div><div class='del'>- * Copyright (c) 2007 Nick Kossifidis &lt;mickflemm@gmail.com&gt;</div><div class='del'>- * Copyright (c) 2004, 2005, 2006, 2007 Reyk Floeter &lt;reyk@openbsd.org&gt;</div><div class='del'>- * Copyright (c) 2007 Michael Taylor &lt;mike.taylor@apprion.com&gt;</div><div class='add'>+ * Copyright (c) 2006-2008 Nick Kossifidis &lt;mickflemm@gmail.com&gt;</div><div class='add'>+ * Copyright (c) 2004-2008 Reyk Floeter &lt;reyk@openbsd.org&gt;</div><div class='add'>+ * Copyright (c) 2007-2008 Michael Taylor &lt;mike.taylor@apprion.com&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * Permission to use, copy, modify, and distribute this software for any</div><div class='ctx'>  * purpose with or without fee is hereby granted, provided that the above</div><div class='hunk'>@@ -29,6 +29,10 @@</div><div class='ctx'>  *        http://www.it.iitb.ac.in/~janak/wifire/01222734.pdf</div><div class='ctx'>  *</div><div class='ctx'>  * 5211 - http://www.hotchips.org/archives/hc14/3_Tue/16_mcfarland.pdf</div><div class='add'>+ *</div><div class='add'>+ * This file also contains register values found on a memory dump of</div><div class='add'>+ * Atheros's ART program (Atheros Radio Test), on ath9k, on legacy-hal</div><div class='add'>+ * released by Atheros and on various debug messages found on the net.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -295,7 +299,7 @@</div><div class='ctx'> #define AR5K_ISR_RXPHY		0x00004000	/* PHY error */</div><div class='ctx'> #define AR5K_ISR_RXKCM		0x00008000	/* RX Key cache miss */</div><div class='ctx'> #define AR5K_ISR_SWBA		0x00010000	/* Software beacon alert */</div><div class='del'>-#define AR5K_ISR_BRSSI		0x00020000</div><div class='add'>+#define AR5K_ISR_BRSSI		0x00020000	/* Beacon rssi below threshold (?) */</div><div class='ctx'> #define AR5K_ISR_BMISS		0x00040000	/* Beacon missed */</div><div class='ctx'> #define AR5K_ISR_HIUERR		0x00080000	/* Host Interface Unit error [5211+] */</div><div class='ctx'> #define AR5K_ISR_BNR		0x00100000 	/* Beacon not ready [5211+] */</div><div class='hunk'>@@ -303,46 +307,56 @@</div><div class='ctx'> #define AR5K_ISR_RXCHIRP	0x00200000	/* CHIRP Received [5212+] */</div><div class='ctx'> #define AR5K_ISR_SSERR		0x00200000	/* Signaled System Error [5210] */</div><div class='ctx'> #define AR5K_ISR_DPERR		0x00400000	/* Det par Error (?) [5210] */</div><div class='del'>-#define AR5K_ISR_TIM		0x00800000	/* [5210] */</div><div class='del'>-#define AR5K_ISR_BCNMISC	0x00800000	/* [5212+] */</div><div class='del'>-#define AR5K_ISR_GPIO		0x01000000	/* GPIO (rf kill)*/</div><div class='del'>-#define AR5K_ISR_QCBRORN	0x02000000	/* CBR overrun (?)  [5211+] */</div><div class='del'>-#define AR5K_ISR_QCBRURN	0x04000000	/* CBR underrun (?) [5211+] */</div><div class='del'>-#define AR5K_ISR_QTRIG		0x08000000	/* [5211+] */</div><div class='add'>+#define AR5K_ISR_RXDOPPLER	0x00400000	/* Doppler chirp received [5212+] */</div><div class='add'>+#define AR5K_ISR_TIM		0x00800000	/* [5211+] */</div><div class='add'>+#define AR5K_ISR_BCNMISC	0x00800000	/* 'or' of TIM, CAB_END, DTIM_SYNC, BCN_TIMEOUT,</div><div class='add'>+						CAB_TIMEOUT and DTIM bits from SISR2 [5212+] */</div><div class='add'>+#define AR5K_ISR_GPIO		0x01000000	/* GPIO (rf kill) */</div><div class='add'>+#define AR5K_ISR_QCBRORN	0x02000000	/* QCU CBR overrun [5211+] */</div><div class='add'>+#define AR5K_ISR_QCBRURN	0x04000000	/* QCU CBR underrun [5211+] */</div><div class='add'>+#define AR5K_ISR_QTRIG		0x08000000	/* QCU scheduling trigger [5211+] */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Secondary status registers [5211+] (0 - 4)</div><div class='ctx'>  *</div><div class='del'>- * I guess from the names that these give the status for each</div><div class='del'>- * queue, that's why only masks are defined here, haven't got</div><div class='del'>- * any info about them (couldn't find them anywhere in ar5k code).</div><div class='add'>+ * These give the status for each QCU, only QCUs 0-9 are</div><div class='add'>+ * represented.</div><div class='ctx'>  */</div><div class='ctx'> #define AR5K_SISR0		0x0084			/* Register Address [5211+] */</div><div class='ctx'> #define AR5K_SISR0_QCU_TXOK	0x000003ff	/* Mask for QCU_TXOK */</div><div class='add'>+#define AR5K_SISR0_QCU_TXOK_S	0</div><div class='ctx'> #define AR5K_SISR0_QCU_TXDESC	0x03ff0000	/* Mask for QCU_TXDESC */</div><div class='add'>+#define AR5K_SISR0_QCU_TXDESC_S	16</div><div class='ctx'> </div><div class='ctx'> #define AR5K_SISR1		0x0088			/* Register Address [5211+] */</div><div class='ctx'> #define AR5K_SISR1_QCU_TXERR	0x000003ff	/* Mask for QCU_TXERR */</div><div class='add'>+#define AR5K_SISR1_QCU_TXERR_S	0</div><div class='ctx'> #define AR5K_SISR1_QCU_TXEOL	0x03ff0000	/* Mask for QCU_TXEOL */</div><div class='add'>+#define AR5K_SISR1_QCU_TXEOL_S	16</div><div class='ctx'> </div><div class='ctx'> #define AR5K_SISR2		0x008c			/* Register Address [5211+] */</div><div class='ctx'> #define AR5K_SISR2_QCU_TXURN	0x000003ff	/* Mask for QCU_TXURN */</div><div class='add'>+#define	AR5K_SISR2_QCU_TXURN_S	0</div><div class='ctx'> #define	AR5K_SISR2_MCABT	0x00100000	/* Master Cycle Abort */</div><div class='ctx'> #define	AR5K_SISR2_SSERR	0x00200000	/* Signaled System Error */</div><div class='del'>-#define	AR5K_SISR2_DPERR	0x00400000	/* Det par Error (?) */</div><div class='add'>+#define	AR5K_SISR2_DPERR	0x00400000	/* Bus parity error */</div><div class='ctx'> #define	AR5K_SISR2_TIM		0x01000000	/* [5212+] */</div><div class='ctx'> #define	AR5K_SISR2_CAB_END	0x02000000	/* [5212+] */</div><div class='ctx'> #define	AR5K_SISR2_DTIM_SYNC	0x04000000	/* DTIM sync lost [5212+] */</div><div class='ctx'> #define	AR5K_SISR2_BCN_TIMEOUT	0x08000000	/* Beacon Timeout [5212+] */</div><div class='ctx'> #define	AR5K_SISR2_CAB_TIMEOUT	0x10000000	/* CAB Timeout [5212+] */</div><div class='ctx'> #define	AR5K_SISR2_DTIM		0x20000000	/* [5212+] */</div><div class='add'>+#define	AR5K_SISR2_TSFOOR	0x80000000	/* TSF OOR (?) */</div><div class='ctx'> </div><div class='ctx'> #define AR5K_SISR3		0x0090			/* Register Address [5211+] */</div><div class='ctx'> #define AR5K_SISR3_QCBRORN	0x000003ff	/* Mask for QCBRORN */</div><div class='add'>+#define AR5K_SISR3_QCBORN_S	0</div><div class='ctx'> #define AR5K_SISR3_QCBRURN	0x03ff0000	/* Mask for QCBRURN */</div><div class='add'>+#define AR5K_SISR3_QCBRURN_S	16</div><div class='ctx'> </div><div class='ctx'> #define AR5K_SISR4		0x0094			/* Register Address [5211+] */</div><div class='ctx'> #define AR5K_SISR4_QTRIG	0x000003ff	/* Mask for QTRIG */</div><div class='add'>+#define AR5K_SISR4_QTRIG_S	0</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Shadow read-and-clear interrupt status registers [5211+]</div><div class='hunk'>@@ -379,7 +393,7 @@</div><div class='ctx'> #define AR5K_IMR_RXPHY		0x00004000	/* PHY error*/</div><div class='ctx'> #define AR5K_IMR_RXKCM		0x00008000	/* RX Key cache miss */</div><div class='ctx'> #define AR5K_IMR_SWBA		0x00010000	/* Software beacon alert*/</div><div class='del'>-#define AR5K_IMR_BRSSI		0x00020000</div><div class='add'>+#define AR5K_IMR_BRSSI		0x00020000	/* Beacon rssi below threshold (?) */</div><div class='ctx'> #define AR5K_IMR_BMISS		0x00040000	/* Beacon missed*/</div><div class='ctx'> #define AR5K_IMR_HIUERR		0x00080000	/* Host Interface Unit error [5211+] */</div><div class='ctx'> #define AR5K_IMR_BNR		0x00100000 	/* Beacon not ready [5211+] */</div><div class='hunk'>@@ -387,12 +401,14 @@</div><div class='ctx'> #define AR5K_IMR_RXCHIRP	0x00200000	/* CHIRP Received [5212+]*/</div><div class='ctx'> #define AR5K_IMR_SSERR		0x00200000	/* Signaled System Error [5210] */</div><div class='ctx'> #define AR5K_IMR_DPERR		0x00400000	/* Det par Error (?) [5210] */</div><div class='add'>+#define AR5K_IMR_RXDOPPLER	0x00400000	/* Doppler chirp received [5212+] */</div><div class='ctx'> #define AR5K_IMR_TIM		0x00800000	/* [5211+] */</div><div class='del'>-#define AR5K_IMR_BCNMISC	0x00800000	/* [5212+] */</div><div class='add'>+#define AR5K_IMR_BCNMISC	0x00800000	/* 'or' of TIM, CAB_END, DTIM_SYNC, BCN_TIMEOUT,</div><div class='add'>+						CAB_TIMEOUT and DTIM bits from SISR2 [5212+] */</div><div class='ctx'> #define AR5K_IMR_GPIO		0x01000000	/* GPIO (rf kill)*/</div><div class='del'>-#define AR5K_IMR_QCBRORN	0x02000000	/* CBR overrun (?) [5211+] */</div><div class='del'>-#define AR5K_IMR_QCBRURN	0x04000000	/* CBR underrun (?) [5211+] */</div><div class='del'>-#define AR5K_IMR_QTRIG		0x08000000	/* [5211+] */</div><div class='add'>+#define AR5K_IMR_QCBRORN	0x02000000	/* QCU CBR overrun (?) [5211+] */</div><div class='add'>+#define AR5K_IMR_QCBRURN	0x04000000	/* QCU CBR underrun (?) [5211+] */</div><div class='add'>+#define AR5K_IMR_QTRIG		0x08000000	/* QCU scheduling trigger [5211+] */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Secondary interrupt mask registers [5211+] (0 - 4)</div><div class='hunk'>@@ -414,13 +430,14 @@</div><div class='ctx'> #define AR5K_SIMR2_QCU_TXURN_S	0</div><div class='ctx'> #define	AR5K_SIMR2_MCABT	0x00100000	/* Master Cycle Abort */</div><div class='ctx'> #define	AR5K_SIMR2_SSERR	0x00200000	/* Signaled System Error */</div><div class='del'>-#define	AR5K_SIMR2_DPERR	0x00400000	/* Det par Error (?) */</div><div class='add'>+#define	AR5K_SIMR2_DPERR	0x00400000	/* Bus parity error */</div><div class='ctx'> #define	AR5K_SIMR2_TIM		0x01000000	/* [5212+] */</div><div class='ctx'> #define	AR5K_SIMR2_CAB_END	0x02000000	/* [5212+] */</div><div class='ctx'> #define	AR5K_SIMR2_DTIM_SYNC	0x04000000	/* DTIM Sync lost [5212+] */</div><div class='ctx'> #define	AR5K_SIMR2_BCN_TIMEOUT	0x08000000	/* Beacon Timeout [5212+] */</div><div class='ctx'> #define	AR5K_SIMR2_CAB_TIMEOUT	0x10000000	/* CAB Timeout [5212+] */</div><div class='ctx'> #define	AR5K_SIMR2_DTIM		0x20000000	/* [5212+] */</div><div class='add'>+#define	AR5K_SIMR2_TSFOOR	0x80000000	/* TSF OOR (?) */</div><div class='ctx'> </div><div class='ctx'> #define AR5K_SIMR3		0x00b0			/* Register Address [5211+] */</div><div class='ctx'> #define AR5K_SIMR3_QCBRORN	0x000003ff	/* Mask for QCBRORN */</div><div class='hunk'>@@ -586,15 +603,15 @@</div><div class='ctx'> #define	AR5K_QCU_MISC_FRSHED_M		0x0000000f	/* Frame sheduling mask */</div><div class='ctx'> #define	AR5K_QCU_MISC_FRSHED_ASAP		0	/* ASAP */</div><div class='ctx'> #define	AR5K_QCU_MISC_FRSHED_CBR		1	/* Constant Bit Rate */</div><div class='del'>-#define	AR5K_QCU_MISC_FRSHED_DBA_GT		2	/* DMA Beacon alert gated (?) */</div><div class='del'>-#define	AR5K_QCU_MISC_FRSHED_TIM_GT		3	/* Time gated (?) */</div><div class='del'>-#define	AR5K_QCU_MISC_FRSHED_BCN_SENT_GT	4	/* Beacon sent gated (?) */</div><div class='add'>+#define	AR5K_QCU_MISC_FRSHED_DBA_GT		2	/* DMA Beacon alert gated */</div><div class='add'>+#define	AR5K_QCU_MISC_FRSHED_TIM_GT		3	/* TIMT gated */</div><div class='add'>+#define	AR5K_QCU_MISC_FRSHED_BCN_SENT_GT	4	/* Beacon sent gated */</div><div class='ctx'> #define	AR5K_QCU_MISC_ONESHOT_ENABLE	0x00000010	/* Oneshot enable */</div><div class='del'>-#define	AR5K_QCU_MISC_CBREXP		0x00000020	/* CBR expired (normal queue) */</div><div class='del'>-#define	AR5K_QCU_MISC_CBREXP_BCN	0x00000040	/* CBR expired (beacon queue) */</div><div class='add'>+#define	AR5K_QCU_MISC_CBREXP_DIS	0x00000020	/* Disable CBR expired counter (normal queue) */</div><div class='add'>+#define	AR5K_QCU_MISC_CBREXP_BCN_DIS	0x00000040	/* Disable CBR expired counter (beacon queue) */</div><div class='ctx'> #define	AR5K_QCU_MISC_BCN_ENABLE	0x00000080	/* Enable Beacon use */</div><div class='del'>-#define	AR5K_QCU_MISC_CBR_THRES_ENABLE	0x00000100	/* CBR threshold enabled */</div><div class='del'>-#define	AR5K_QCU_MISC_RDY_VEOL_POLICY	0x00000200	/* TXE reset when RDYTIME enalbed */</div><div class='add'>+#define	AR5K_QCU_MISC_CBR_THRES_ENABLE	0x00000100	/* CBR expired threshold enabled */</div><div class='add'>+#define	AR5K_QCU_MISC_RDY_VEOL_POLICY	0x00000200	/* TXE reset when RDYTIME expired or VEOL */</div><div class='ctx'> #define	AR5K_QCU_MISC_CBR_RESET_CNT	0x00000400	/* CBR threshold (counter) reset */</div><div class='ctx'> #define	AR5K_QCU_MISC_DCU_EARLY		0x00000800	/* DCU early termination */</div><div class='ctx'> #define AR5K_QCU_MISC_DCU_CMP_EN	0x00001000	/* Enable frame compression */</div><div class='hunk'>@@ -663,6 +680,7 @@</div><div class='ctx'> #define	AR5K_DCU_LCL_IFS_CW_MAX_S	10</div><div class='ctx'> #define	AR5K_DCU_LCL_IFS_AIFS		0x0ff00000	/* Arbitrated Interframe Space */</div><div class='ctx'> #define	AR5K_DCU_LCL_IFS_AIFS_S		20</div><div class='add'>+#define	AR5K_DCU_LCL_IFS_AIFS_MAX	0xfc		/* Anything above that can cause DCU to hang */</div><div class='ctx'> #define	AR5K_QUEUE_DFS_LOCAL_IFS(_q)	AR5K_QUEUE_REG(AR5K_DCU_LCL_IFS_BASE, _q)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -691,11 +709,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  * DCU misc registers [5211+]</div><div class='ctx'>  *</div><div class='del'>- * For some of the registers i couldn't find in the code</div><div class='del'>- * (only backoff stuff is there realy) i tried to match the</div><div class='del'>- * names with 802.11e parameters etc, so i guess VIRTCOL here</div><div class='del'>- * means Virtual Collision and HCFPOLL means Hybrid Coordination</div><div class='del'>- * factor Poll (CF- Poll). Arbiter lockout control controls the</div><div class='add'>+ * Note: Arbiter lockout control controls the</div><div class='ctx'>  * behaviour on low priority queues when we have multiple queues</div><div class='ctx'>  * with pending frames. Intra-frame lockout means we wait until</div><div class='ctx'>  * the queue's current frame transmits (with post frame backoff and bursting)</div><div class='hunk'>@@ -705,15 +719,20 @@</div><div class='ctx'>  * No lockout means there is no special handling.</div><div class='ctx'>  */</div><div class='ctx'> #define AR5K_DCU_MISC_BASE		0x1100			/* Register Address -Queue0 DCU_MISC */</div><div class='del'>-#define	AR5K_DCU_MISC_BACKOFF		0x000007ff	/* Mask for backoff threshold */</div><div class='add'>+#define	AR5K_DCU_MISC_BACKOFF		0x0000003f	/* Mask for backoff threshold */</div><div class='add'>+#define	AR5K_DCU_MISC_ETS_RTS_POL	0x00000040	/* End of transmission series</div><div class='add'>+							station RTS/data failure count</div><div class='add'>+							reset policy (?) */</div><div class='add'>+#define AR5K_DCU_MISC_ETS_CW_POL	0x00000080	/* End of transmission series</div><div class='add'>+							CW reset policy */</div><div class='add'>+#define	AR5K_DCU_MISC_FRAG_WAIT		0x00000100	/* Wait for next fragment */</div><div class='ctx'> #define AR5K_DCU_MISC_BACKOFF_FRAG	0x00000200	/* Enable backoff while bursting */</div><div class='ctx'> #define	AR5K_DCU_MISC_HCFPOLL_ENABLE	0x00000800	/* CF - Poll enable */</div><div class='ctx'> #define	AR5K_DCU_MISC_BACKOFF_PERSIST	0x00001000	/* Persistent backoff */</div><div class='ctx'> #define	AR5K_DCU_MISC_FRMPRFTCH_ENABLE	0x00002000	/* Enable frame pre-fetch */</div><div class='ctx'> #define	AR5K_DCU_MISC_VIRTCOL		0x0000c000	/* Mask for Virtual Collision (?) */</div><div class='del'>-#define	AR5K_DCU_MISC_VIRTCOL_NORMAL		0</div><div class='del'>-#define	AR5K_DCU_MISC_VIRTCOL_MODIFIED		1</div><div class='del'>-#define	AR5K_DCU_MISC_VIRTCOL_IGNORE		2</div><div class='add'>+#define	AR5K_DCU_MISC_VIRTCOL_NORMAL	0</div><div class='add'>+#define	AR5K_DCU_MISC_VIRTCOL_IGNORE	1</div><div class='ctx'> #define	AR5K_DCU_MISC_BCN_ENABLE	0x00010000	/* Enable Beacon use */</div><div class='ctx'> #define	AR5K_DCU_MISC_ARBLOCK_CTL	0x00060000	/* Arbiter lockout control mask */</div><div class='ctx'> #define	AR5K_DCU_MISC_ARBLOCK_CTL_S	17</div><div class='hunk'>@@ -768,8 +787,9 @@</div><div class='ctx'> #define	AR5K_DCU_GBL_IFS_MISC_TURBO_MODE	0x00000008	/* Turbo mode */</div><div class='ctx'> #define	AR5K_DCU_GBL_IFS_MISC_SIFS_DUR_USEC	0x000003f0	/* SIFS Duration mask */</div><div class='ctx'> #define	AR5K_DCU_GBL_IFS_MISC_USEC_DUR		0x000ffc00	/* USEC Duration mask */</div><div class='add'>+#define	AR5K_DCU_GBL_IFS_MISC_USEC_DUR_S	10</div><div class='ctx'> #define	AR5K_DCU_GBL_IFS_MISC_DCU_ARB_DELAY	0x00300000	/* DCU Arbiter delay mask */</div><div class='del'>-#define AR5K_DCU_GBL_IFS_MISC_SIFS_CNT_RST	0x00400000	/* SIFC cnt reset policy (?) */</div><div class='add'>+#define AR5K_DCU_GBL_IFS_MISC_SIFS_CNT_RST	0x00400000	/* SIFS cnt reset policy (?) */</div><div class='ctx'> #define AR5K_DCU_GBL_IFS_MISC_AIFS_CNT_RST	0x00800000	/* AIFS cnt reset policy (?) */</div><div class='ctx'> #define AR5K_DCU_GBL_IFS_MISC_RND_LFSR_SL_DIS	0x01000000	/* Disable random LFSR slice */</div><div class='ctx'> </div><div class='hunk'>@@ -820,8 +840,6 @@</div><div class='ctx'> #define AR5K_RESET_CTL_MAC	0x00000004	/* MAC reset (PCU+Baseband ?) [5210] */</div><div class='ctx'> #define AR5K_RESET_CTL_PHY	0x00000008	/* PHY reset [5210] */</div><div class='ctx'> #define AR5K_RESET_CTL_PCI	0x00000010	/* PCI Core reset (interrupts etc) */</div><div class='del'>-#define AR5K_RESET_CTL_CHIP	(AR5K_RESET_CTL_PCU | AR5K_RESET_CTL_DMA |	\</div><div class='del'>-				AR5K_RESET_CTL_MAC | AR5K_RESET_CTL_PHY)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Sleep control register</div><div class='hunk'>@@ -833,9 +851,11 @@</div><div class='ctx'> #define AR5K_SLEEP_CTL_SLE_S		16</div><div class='ctx'> #define AR5K_SLEEP_CTL_SLE_WAKE		0x00000000	/* Force chip awake */</div><div class='ctx'> #define AR5K_SLEEP_CTL_SLE_SLP		0x00010000	/* Force chip sleep */</div><div class='del'>-#define AR5K_SLEEP_CTL_SLE_ALLOW	0x00020000</div><div class='add'>+#define AR5K_SLEEP_CTL_SLE_ALLOW	0x00020000	/* Normal sleep policy */</div><div class='ctx'> #define AR5K_SLEEP_CTL_SLE_UNITS	0x00000008	/* [5211+] */</div><div class='del'>-/* more bits */</div><div class='add'>+#define AR5K_SLEEP_CTL_DUR_TIM_POL	0x00040000	/* Sleep duration timing policy */</div><div class='add'>+#define AR5K_SLEEP_CTL_DUR_WRITE_POL	0x00080000	/* Sleep duration write policy */</div><div class='add'>+#define AR5K_SLEEP_CTL_SLE_POL		0x00100000	/* Sleep policy mode */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Interrupt pending register</div><div class='hunk'>@@ -851,27 +871,28 @@</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * PCI configuration register</div><div class='add'>+ * TODO: Fix LED stuff</div><div class='ctx'>  */</div><div class='ctx'> #define AR5K_PCICFG			0x4010			/* Register Address */</div><div class='ctx'> #define AR5K_PCICFG_EEAE		0x00000001	/* Eeprom access enable [5210] */</div><div class='del'>-#define	AR5K_PCICFG_SLEEP_CLOCK_EN	0x00000002	/* Enable sleep clock (?) */</div><div class='add'>+#define AR5K_PCICFG_SLEEP_CLOCK_EN	0x00000002	/* Enable sleep clock */</div><div class='ctx'> #define AR5K_PCICFG_CLKRUNEN		0x00000004	/* CLKRUN enable [5211+] */</div><div class='ctx'> #define AR5K_PCICFG_EESIZE		0x00000018	/* Mask for EEPROM size [5211+] */</div><div class='ctx'> #define AR5K_PCICFG_EESIZE_S		3</div><div class='ctx'> #define AR5K_PCICFG_EESIZE_4K		0		/* 4K */</div><div class='ctx'> #define AR5K_PCICFG_EESIZE_8K		1		/* 8K */</div><div class='ctx'> #define AR5K_PCICFG_EESIZE_16K		2		/* 16K */</div><div class='del'>-#define AR5K_PCICFG_EESIZE_FAIL		3		/* Failed to get size (?) [5211+] */</div><div class='add'>+#define AR5K_PCICFG_EESIZE_FAIL		3		/* Failed to get size [5211+] */</div><div class='ctx'> #define AR5K_PCICFG_LED			0x00000060	/* Led status [5211+] */</div><div class='ctx'> #define AR5K_PCICFG_LED_NONE		0x00000000	/* Default [5211+] */</div><div class='ctx'> #define AR5K_PCICFG_LED_PEND		0x00000020	/* Scan / Auth pending */</div><div class='ctx'> #define AR5K_PCICFG_LED_ASSOC		0x00000040	/* Associated */</div><div class='ctx'> #define	AR5K_PCICFG_BUS_SEL		0x00000380	/* Mask for "bus select" [5211+] (?) */</div><div class='del'>-#define	AR5K_PCICFG_CBEFIX_DIS		0x00000400	/* Disable CBE fix (?) */</div><div class='del'>-#define AR5K_PCICFG_SL_INTEN		0x00000800	/* Enable interrupts when asleep (?) */</div><div class='add'>+#define AR5K_PCICFG_CBEFIX_DIS		0x00000400	/* Disable CBE fix */</div><div class='add'>+#define AR5K_PCICFG_SL_INTEN		0x00000800	/* Enable interrupts when asleep */</div><div class='ctx'> #define AR5K_PCICFG_LED_BCTL		0x00001000	/* Led blink (?) [5210] */</div><div class='del'>-#define	AR5K_PCICFG_UNK			0x00001000	/* Passed on some parts durring attach (?) */</div><div class='del'>-#define AR5K_PCICFG_SL_INPEN		0x00002000	/* Sleep even whith pending interrupts (?) */</div><div class='add'>+#define AR5K_PCICFG_RETRY_FIX		0x00001000	/* Enable pci core retry fix */</div><div class='add'>+#define AR5K_PCICFG_SL_INPEN		0x00002000	/* Sleep even whith pending interrupts*/</div><div class='ctx'> #define AR5K_PCICFG_SPWR_DN		0x00010000	/* Mask for power status */</div><div class='ctx'> #define AR5K_PCICFG_LEDMODE		0x000e0000	/* Ledmode [5211+] */</div><div class='ctx'> #define AR5K_PCICFG_LEDMODE_PROP	0x00000000	/* Blink on standard traffic [5211+] */</div><div class='hunk'>@@ -884,7 +905,8 @@</div><div class='ctx'> #define AR5K_PCICFG_LEDSTATE				\</div><div class='ctx'> 	(AR5K_PCICFG_LED | AR5K_PCICFG_LEDMODE |	\</div><div class='ctx'> 	AR5K_PCICFG_LEDBLINK | AR5K_PCICFG_LEDSLOW)</div><div class='del'>-#define	AR5K_PCICFG_SLEEP_CLOCK_RATE	0x03000000	/* Sleep clock rate (field) */</div><div class='add'>+#define	AR5K_PCICFG_SLEEP_CLOCK_RATE	0x03000000	/* Sleep clock rate */</div><div class='add'>+#define	AR5K_PCICFG_SLEEP_CLOCK_RATE_S	24</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * "General Purpose Input/Output" (GPIO) control register</div><div class='hunk'>@@ -906,8 +928,8 @@</div><div class='ctx'> </div><div class='ctx'> #define AR5K_GPIOCR		0x4014				/* Register Address */</div><div class='ctx'> #define AR5K_GPIOCR_INT_ENA	0x00008000		/* Enable GPIO interrupt */</div><div class='del'>-#define AR5K_GPIOCR_INT_SELL	0x00000000		/* Generate interrupt when pin is off (?) */</div><div class='del'>-#define AR5K_GPIOCR_INT_SELH	0x00010000		/* Generate interrupt when pin is on */</div><div class='add'>+#define AR5K_GPIOCR_INT_SELL	0x00000000		/* Generate interrupt when pin is low */</div><div class='add'>+#define AR5K_GPIOCR_INT_SELH	0x00010000		/* Generate interrupt when pin is high */</div><div class='ctx'> #define AR5K_GPIOCR_IN(n)	(0 &lt;&lt; ((n) * 2))	/* Mode 0 for pin n */</div><div class='ctx'> #define AR5K_GPIOCR_OUT0(n)	(1 &lt;&lt; ((n) * 2))	/* Mode 1 for pin n */</div><div class='ctx'> #define AR5K_GPIOCR_OUT1(n)	(2 &lt;&lt; ((n) * 2))	/* Mode 2 for pin n */</div><div class='hunk'>@@ -925,7 +947,6 @@</div><div class='ctx'> #define AR5K_GPIODI	0x401c</div><div class='ctx'> #define AR5K_GPIODI_M	0x0000002f</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Silicon revision register</div><div class='ctx'>  */</div><div class='hunk'>@@ -935,7 +956,59 @@</div><div class='ctx'> #define AR5K_SREV_VER		0x000000ff	/* Mask for version */</div><div class='ctx'> #define AR5K_SREV_VER_S		4</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * TXE write posting register</div><div class='add'>+ */</div><div class='add'>+#define	AR5K_TXEPOST	0x4028</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * QCU sleep mask</div><div class='add'>+ */</div><div class='add'>+#define	AR5K_QCU_SLEEP_MASK	0x402c</div><div class='add'>+</div><div class='add'>+/* 0x4068 is compression buffer configuration</div><div class='add'>+ * register on 5414 and pm configuration register</div><div class='add'>+ * on 5424 and newer pci-e chips. */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Compression buffer configuration</div><div class='add'>+ * register (enable/disable) [5414]</div><div class='add'>+ */</div><div class='add'>+#define AR5K_5414_CBCFG		0x4068</div><div class='add'>+#define AR5K_5414_CBCFG_BUF_DIS	0x10	/* Disable buffer */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * PCI-E Power managment configuration</div><div class='add'>+ * and status register [5424+]</div><div class='add'>+ */</div><div class='add'>+#define	AR5K_PCIE_PM_CTL		0x4068			/* Register address */</div><div class='add'>+/* Only 5424 */</div><div class='add'>+#define	AR5K_PCIE_PM_CTL_L1_WHEN_D2	0x00000001	/* enable PCIe core enter L1</div><div class='add'>+							when d2_sleep_en is asserted */</div><div class='add'>+#define	AR5K_PCIE_PM_CTL_L0_L0S_CLEAR	0x00000002	/* Clear L0 and L0S counters */</div><div class='add'>+#define	AR5K_PCIE_PM_CTL_L0_L0S_EN	0x00000004	/* Start L0 nd L0S counters */</div><div class='add'>+#define	AR5K_PCIE_PM_CTL_LDRESET_EN	0x00000008	/* Enable reset when link goes</div><div class='add'>+							down */</div><div class='add'>+/* Wake On Wireless */</div><div class='add'>+#define	AR5K_PCIE_PM_CTL_PME_EN		0x00000010	/* PME Enable */</div><div class='add'>+#define	AR5K_PCIE_PM_CTL_AUX_PWR_DET	0x00000020	/* Aux power detect */</div><div class='add'>+#define	AR5K_PCIE_PM_CTL_PME_CLEAR	0x00000040	/* Clear PME */</div><div class='add'>+#define	AR5K_PCIE_PM_CTL_PSM_D0		0x00000080</div><div class='add'>+#define	AR5K_PCIE_PM_CTL_PSM_D1		0x00000100</div><div class='add'>+#define	AR5K_PCIE_PM_CTL_PSM_D2		0x00000200</div><div class='add'>+#define	AR5K_PCIE_PM_CTL_PSM_D3		0x00000400</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * PCI-E Workaround enable register</div><div class='add'>+ */</div><div class='add'>+#define	AR5K_PCIE_WAEN	0x407c</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * PCI-E Serializer/Desirializer</div><div class='add'>+ * registers</div><div class='add'>+ */</div><div class='add'>+#define	AR5K_PCIE_SERDES	0x4080</div><div class='add'>+#define	AR5K_PCIE_SERDES_RESET	0x4084</div><div class='ctx'> </div><div class='ctx'> /*====EEPROM REGISTERS====*/</div><div class='ctx'> </div><div class='hunk'>@@ -977,98 +1050,6 @@</div><div class='ctx'> #define AR5K_EEPROM_BASE	0x6000</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Common ar5xxx EEPROM data offsets (set these on AR5K_EEPROM_BASE)</div><div class='del'>- */</div><div class='del'>-#define AR5K_EEPROM_MAGIC		0x003d	/* EEPROM Magic number */</div><div class='del'>-#define AR5K_EEPROM_MAGIC_VALUE		0x5aa5	/* Default - found on EEPROM */</div><div class='del'>-#define AR5K_EEPROM_MAGIC_5212		0x0000145c /* 5212 */</div><div class='del'>-#define AR5K_EEPROM_MAGIC_5211		0x0000145b /* 5211 */</div><div class='del'>-#define AR5K_EEPROM_MAGIC_5210		0x0000145a /* 5210 */</div><div class='del'>-</div><div class='del'>-#define AR5K_EEPROM_PROTECT		0x003f	/* EEPROM protect status */</div><div class='del'>-#define AR5K_EEPROM_PROTECT_RD_0_31	0x0001	/* Read protection bit for offsets 0x0 - 0x1f */</div><div class='del'>-#define AR5K_EEPROM_PROTECT_WR_0_31	0x0002	/* Write protection bit for offsets 0x0 - 0x1f */</div><div class='del'>-#define AR5K_EEPROM_PROTECT_RD_32_63	0x0004	/* 0x20 - 0x3f */</div><div class='del'>-#define AR5K_EEPROM_PROTECT_WR_32_63	0x0008</div><div class='del'>-#define AR5K_EEPROM_PROTECT_RD_64_127	0x0010	/* 0x40 - 0x7f */</div><div class='del'>-#define AR5K_EEPROM_PROTECT_WR_64_127	0x0020</div><div class='del'>-#define AR5K_EEPROM_PROTECT_RD_128_191	0x0040	/* 0x80 - 0xbf (regdom) */</div><div class='del'>-#define AR5K_EEPROM_PROTECT_WR_128_191	0x0080</div><div class='del'>-#define AR5K_EEPROM_PROTECT_RD_192_207	0x0100	/* 0xc0 - 0xcf */</div><div class='del'>-#define AR5K_EEPROM_PROTECT_WR_192_207	0x0200</div><div class='del'>-#define AR5K_EEPROM_PROTECT_RD_208_223	0x0400	/* 0xd0 - 0xdf */</div><div class='del'>-#define AR5K_EEPROM_PROTECT_WR_208_223	0x0800</div><div class='del'>-#define AR5K_EEPROM_PROTECT_RD_224_239	0x1000	/* 0xe0 - 0xef */</div><div class='del'>-#define AR5K_EEPROM_PROTECT_WR_224_239	0x2000</div><div class='del'>-#define AR5K_EEPROM_PROTECT_RD_240_255	0x4000	/* 0xf0 - 0xff */</div><div class='del'>-#define AR5K_EEPROM_PROTECT_WR_240_255	0x8000</div><div class='del'>-#define AR5K_EEPROM_REG_DOMAIN		0x00bf	/* EEPROM regdom */</div><div class='del'>-#define AR5K_EEPROM_INFO_BASE		0x00c0	/* EEPROM header */</div><div class='del'>-#define AR5K_EEPROM_INFO_MAX		(0x400 - AR5K_EEPROM_INFO_BASE)</div><div class='del'>-#define AR5K_EEPROM_INFO_CKSUM		0xffff</div><div class='del'>-#define AR5K_EEPROM_INFO(_n)		(AR5K_EEPROM_INFO_BASE + (_n))</div><div class='del'>-</div><div class='del'>-#define AR5K_EEPROM_VERSION		AR5K_EEPROM_INFO(1)	/* EEPROM Version */</div><div class='del'>-#define AR5K_EEPROM_VERSION_3_0		0x3000	/* No idea what's going on before this version */</div><div class='del'>-#define AR5K_EEPROM_VERSION_3_1		0x3001	/* ob/db values for 2Ghz (ar5211_rfregs) */</div><div class='del'>-#define AR5K_EEPROM_VERSION_3_2		0x3002	/* different frequency representation (eeprom_bin2freq) */</div><div class='del'>-#define AR5K_EEPROM_VERSION_3_3		0x3003	/* offsets changed, has 32 CTLs (see below) and ee_false_detect (eeprom_read_modes) */</div><div class='del'>-#define AR5K_EEPROM_VERSION_3_4		0x3004	/* has ee_i_gain ee_cck_ofdm_power_delta (eeprom_read_modes) */</div><div class='del'>-#define AR5K_EEPROM_VERSION_4_0		0x4000	/* has ee_misc*, ee_cal_pier, ee_turbo_max_power and ee_xr_power (eeprom_init) */</div><div class='del'>-#define AR5K_EEPROM_VERSION_4_1		0x4001	/* has ee_margin_tx_rx (eeprom_init) */</div><div class='del'>-#define AR5K_EEPROM_VERSION_4_2		0x4002	/* has ee_cck_ofdm_gain_delta (eeprom_init) */</div><div class='del'>-#define AR5K_EEPROM_VERSION_4_3		0x4003</div><div class='del'>-#define AR5K_EEPROM_VERSION_4_4		0x4004</div><div class='del'>-#define AR5K_EEPROM_VERSION_4_5		0x4005</div><div class='del'>-#define AR5K_EEPROM_VERSION_4_6		0x4006	/* has ee_scaled_cck_delta */</div><div class='del'>-#define AR5K_EEPROM_VERSION_4_7		0x4007</div><div class='del'>-</div><div class='del'>-#define AR5K_EEPROM_MODE_11A		0</div><div class='del'>-#define AR5K_EEPROM_MODE_11B		1</div><div class='del'>-#define AR5K_EEPROM_MODE_11G		2</div><div class='del'>-</div><div class='del'>-#define AR5K_EEPROM_HDR			AR5K_EEPROM_INFO(2)	/* Header that contains the device caps */</div><div class='del'>-#define AR5K_EEPROM_HDR_11A(_v)		(((_v) &gt;&gt; AR5K_EEPROM_MODE_11A) &amp; 0x1)</div><div class='del'>-#define AR5K_EEPROM_HDR_11B(_v)		(((_v) &gt;&gt; AR5K_EEPROM_MODE_11B) &amp; 0x1)</div><div class='del'>-#define AR5K_EEPROM_HDR_11G(_v)		(((_v) &gt;&gt; AR5K_EEPROM_MODE_11G) &amp; 0x1)</div><div class='del'>-#define AR5K_EEPROM_HDR_T_2GHZ_DIS(_v)	(((_v) &gt;&gt; 3) &amp; 0x1)	/* Disable turbo for 2Ghz (?) */</div><div class='del'>-#define AR5K_EEPROM_HDR_T_5GHZ_DBM(_v)	(((_v) &gt;&gt; 4) &amp; 0x7f)	/* Max turbo power for a/XR mode (eeprom_init) */</div><div class='del'>-#define AR5K_EEPROM_HDR_DEVICE(_v)	(((_v) &gt;&gt; 11) &amp; 0x7)</div><div class='del'>-#define AR5K_EEPROM_HDR_T_5GHZ_DIS(_v)	(((_v) &gt;&gt; 15) &amp; 0x1)	/* Disable turbo for 5Ghz (?) */</div><div class='del'>-#define AR5K_EEPROM_HDR_RFKILL(_v)	(((_v) &gt;&gt; 14) &amp; 0x1)	/* Device has RFKill support */</div><div class='del'>-</div><div class='del'>-#define AR5K_EEPROM_RFKILL_GPIO_SEL	0x0000001c</div><div class='del'>-#define AR5K_EEPROM_RFKILL_GPIO_SEL_S	2</div><div class='del'>-#define AR5K_EEPROM_RFKILL_POLARITY	0x00000002</div><div class='del'>-#define AR5K_EEPROM_RFKILL_POLARITY_S	1</div><div class='del'>-</div><div class='del'>-/* Newer EEPROMs are using a different offset */</div><div class='del'>-#define AR5K_EEPROM_OFF(_v, _v3_0, _v3_3) \</div><div class='del'>-	(((_v) &gt;= AR5K_EEPROM_VERSION_3_3) ? _v3_3 : _v3_0)</div><div class='del'>-</div><div class='del'>-#define AR5K_EEPROM_ANT_GAIN(_v)	AR5K_EEPROM_OFF(_v, 0x00c4, 0x00c3)</div><div class='del'>-#define AR5K_EEPROM_ANT_GAIN_5GHZ(_v)	((int8_t)(((_v) &gt;&gt; 8) &amp; 0xff))</div><div class='del'>-#define AR5K_EEPROM_ANT_GAIN_2GHZ(_v)	((int8_t)((_v) &amp; 0xff))</div><div class='del'>-</div><div class='del'>-/* calibration settings */</div><div class='del'>-#define AR5K_EEPROM_MODES_11A(_v)	AR5K_EEPROM_OFF(_v, 0x00c5, 0x00d4)</div><div class='del'>-#define AR5K_EEPROM_MODES_11B(_v)	AR5K_EEPROM_OFF(_v, 0x00d0, 0x00f2)</div><div class='del'>-#define AR5K_EEPROM_MODES_11G(_v)	AR5K_EEPROM_OFF(_v, 0x00da, 0x010d)</div><div class='del'>-#define AR5K_EEPROM_CTL(_v)		AR5K_EEPROM_OFF(_v, 0x00e4, 0x0128)	/* Conformance test limits */</div><div class='del'>-</div><div class='del'>-/* [3.1 - 3.3] */</div><div class='del'>-#define AR5K_EEPROM_OBDB0_2GHZ		0x00ec</div><div class='del'>-#define AR5K_EEPROM_OBDB1_2GHZ		0x00ed</div><div class='del'>-</div><div class='del'>-/* Misc values available since EEPROM 4.0 */</div><div class='del'>-#define AR5K_EEPROM_MISC0		0x00c4</div><div class='del'>-#define AR5K_EEPROM_EARSTART(_v)	((_v) &amp; 0xfff)</div><div class='del'>-#define AR5K_EEPROM_EEMAP(_v)		(((_v) &gt;&gt; 14) &amp; 0x3)</div><div class='del'>-#define AR5K_EEPROM_MISC1		0x00c5</div><div class='del'>-#define AR5K_EEPROM_TARGET_PWRSTART(_v)	((_v) &amp; 0xfff)</div><div class='del'>-#define AR5K_EEPROM_HAS32KHZCRYSTAL(_v)	(((_v) &gt;&gt; 14) &amp; 0x1)</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * EEPROM data register</div><div class='ctx'>  */</div><div class='ctx'> #define AR5K_EEPROM_DATA_5211	0x6004</div><div class='hunk'>@@ -1100,14 +1081,28 @@</div><div class='ctx'>  * EEPROM config register</div><div class='ctx'>  */</div><div class='ctx'> #define AR5K_EEPROM_CFG			0x6010			/* Register Addres */</div><div class='del'>-#define AR5K_EEPROM_CFG_SIZE_OVR	0x00000001</div><div class='add'>+#define AR5K_EEPROM_CFG_SIZE		0x00000003		/* Size determination override */</div><div class='add'>+#define AR5K_EEPROM_CFG_SIZE_AUTO	0</div><div class='add'>+#define AR5K_EEPROM_CFG_SIZE_4KBIT	1</div><div class='add'>+#define AR5K_EEPROM_CFG_SIZE_8KBIT	2</div><div class='add'>+#define AR5K_EEPROM_CFG_SIZE_16KBIT	3</div><div class='ctx'> #define AR5K_EEPROM_CFG_WR_WAIT_DIS	0x00000004	/* Disable write wait */</div><div class='ctx'> #define AR5K_EEPROM_CFG_CLK_RATE	0x00000018	/* Clock rate */</div><div class='del'>-#define AR5K_EEPROM_CFG_PROT_KEY	0x00ffff00	/* Protectio key */</div><div class='add'>+#define AR5K_EEPROM_CFG_CLK_RATE_S		3</div><div class='add'>+#define AR5K_EEPROM_CFG_CLK_RATE_156KHZ	0</div><div class='add'>+#define AR5K_EEPROM_CFG_CLK_RATE_312KHZ	1</div><div class='add'>+#define AR5K_EEPROM_CFG_CLK_RATE_625KHZ	2</div><div class='add'>+#define AR5K_EEPROM_CFG_PROT_KEY	0x00ffff00      /* Protection key */</div><div class='add'>+#define AR5K_EEPROM_CFG_PROT_KEY_S	8</div><div class='ctx'> #define AR5K_EEPROM_CFG_LIND_EN		0x01000000	/* Enable length indicator (?) */</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * TODO: Wake On Wireless registers</div><div class='add'>+ * Range 0x7000 - 0x7ce0</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Protocol Control Unit (PCU) registers</div><div class='ctx'>  */</div><div class='ctx'> /*</div><div class='hunk'>@@ -1139,11 +1134,13 @@</div><div class='ctx'> #define AR5K_STA_ID1_DESC_ANTENNA	0x00400000	/* Update antenna from descriptor */</div><div class='ctx'> #define AR5K_STA_ID1_RTS_DEF_ANTENNA	0x00800000	/* Use default antenna for RTS */</div><div class='ctx'> #define AR5K_STA_ID1_ACKCTS_6MB		0x01000000	/* Use 6Mbit/s for ACK/CTS */</div><div class='del'>-#define AR5K_STA_ID1_BASE_RATE_11B	0x02000000	/* Use 11b base rate (for ACK/CTS ?) [5211+] */</div><div class='del'>-#define AR5K_STA_ID1_SELF_GEN_SECTORE	0x04000000	/* Self generate sectore (?) */</div><div class='add'>+#define AR5K_STA_ID1_BASE_RATE_11B	0x02000000	/* Use 11b base rate for ACK/CTS [5211+] */</div><div class='add'>+#define AR5K_STA_ID1_SELFGEN_DEF_ANT	0x04000000	/* Use def. antenna for self generated frames */</div><div class='ctx'> #define AR5K_STA_ID1_CRYPT_MIC_EN	0x08000000	/* Enable MIC */</div><div class='del'>-#define AR5K_STA_ID1_KEYSRCH_MODE	0x10000000	/* Keysearch mode (?) */</div><div class='add'>+#define AR5K_STA_ID1_KEYSRCH_MODE	0x10000000	/* Look up key when key id != 0 */</div><div class='ctx'> #define AR5K_STA_ID1_PRESERVE_SEQ_NUM	0x20000000	/* Preserve sequence number */</div><div class='add'>+#define AR5K_STA_ID1_CBCIV_ENDIAN	0x40000000	/* ??? */</div><div class='add'>+#define AR5K_STA_ID1_KEYSRCH_MCAST	0x80000000	/* Do key cache search for mcast frames */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * First BSSID register (MAC address, lower 32bits)</div><div class='hunk'>@@ -1402,16 +1399,16 @@</div><div class='ctx'> #define AR5K_DIAG_SW_LOOP_BACK_5211	0x00000040</div><div class='ctx'> #define AR5K_DIAG_SW_LOOP_BACK		(ah-&gt;ah_version == AR5K_AR5210 ? \</div><div class='ctx'> 					AR5K_DIAG_SW_LOOP_BACK_5210 : AR5K_DIAG_SW_LOOP_BACK_5211)</div><div class='del'>-#define AR5K_DIAG_SW_CORR_FCS_5210	0x00000100</div><div class='add'>+#define AR5K_DIAG_SW_CORR_FCS_5210	0x00000100	/* Corrupted FCS */</div><div class='ctx'> #define AR5K_DIAG_SW_CORR_FCS_5211	0x00000080</div><div class='ctx'> #define AR5K_DIAG_SW_CORR_FCS		(ah-&gt;ah_version == AR5K_AR5210 ? \</div><div class='ctx'> 					AR5K_DIAG_SW_CORR_FCS_5210 : AR5K_DIAG_SW_CORR_FCS_5211)</div><div class='del'>-#define AR5K_DIAG_SW_CHAN_INFO_5210	0x00000200</div><div class='add'>+#define AR5K_DIAG_SW_CHAN_INFO_5210	0x00000200	/* Dump channel info */</div><div class='ctx'> #define AR5K_DIAG_SW_CHAN_INFO_5211	0x00000100</div><div class='ctx'> #define AR5K_DIAG_SW_CHAN_INFO		(ah-&gt;ah_version == AR5K_AR5210 ? \</div><div class='ctx'> 					AR5K_DIAG_SW_CHAN_INFO_5210 : AR5K_DIAG_SW_CHAN_INFO_5211)</div><div class='del'>-#define AR5K_DIAG_SW_EN_SCRAM_SEED_5211	0x00000200	/* Enable scrambler seed */</div><div class='del'>-#define AR5K_DIAG_SW_EN_SCRAM_SEED_5210	0x00000400</div><div class='add'>+#define AR5K_DIAG_SW_EN_SCRAM_SEED_5210	0x00000400	/* Enable fixed scrambler seed */</div><div class='add'>+#define AR5K_DIAG_SW_EN_SCRAM_SEED_5211	0x00000200</div><div class='ctx'> #define AR5K_DIAG_SW_EN_SCRAM_SEED	(ah-&gt;ah_version == AR5K_AR5210 ? \</div><div class='ctx'> 					AR5K_DIAG_SW_EN_SCRAM_SEED_5210 : AR5K_DIAG_SW_EN_SCRAM_SEED_5211)</div><div class='ctx'> #define AR5K_DIAG_SW_ECO_ENABLE		0x00000400	/* [5211+] */</div><div class='hunk'>@@ -1420,12 +1417,15 @@</div><div class='ctx'> #define AR5K_DIAG_SW_SCRAM_SEED_S	10</div><div class='ctx'> #define AR5K_DIAG_SW_DIS_SEQ_INC	0x00040000	/* Disable seqnum increment (?)[5210] */</div><div class='ctx'> #define AR5K_DIAG_SW_FRAME_NV0_5210	0x00080000</div><div class='del'>-#define AR5K_DIAG_SW_FRAME_NV0_5211	0x00020000</div><div class='add'>+#define AR5K_DIAG_SW_FRAME_NV0_5211	0x00020000	/* Accept frames of non-zero protocol number */</div><div class='ctx'> #define	AR5K_DIAG_SW_FRAME_NV0		(ah-&gt;ah_version == AR5K_AR5210 ? \</div><div class='ctx'> 					AR5K_DIAG_SW_FRAME_NV0_5210 : AR5K_DIAG_SW_FRAME_NV0_5211)</div><div class='del'>-#define AR5K_DIAG_SW_OBSPT_M		0x000c0000</div><div class='add'>+#define AR5K_DIAG_SW_OBSPT_M		0x000c0000	/* Observation point select (?) */</div><div class='ctx'> #define AR5K_DIAG_SW_OBSPT_S		18</div><div class='del'>-/* more bits */</div><div class='add'>+#define AR5K_DIAG_SW_RX_CLEAR_HIGH	0x0010000	/* Force RX Clear high */</div><div class='add'>+#define AR5K_DIAG_SW_IGNORE_CARR_SENSE	0x0020000	/* Ignore virtual carrier sense */</div><div class='add'>+#define AR5K_DIAG_SW_CHANEL_IDLE_HIGH	0x0040000	/* Force channel idle high */</div><div class='add'>+#define AR5K_DIAG_SW_PHEAR_ME		0x0080000	/* ??? */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * TSF (clock) register (lower 32 bits)</div><div class='hunk'>@@ -1636,16 +1636,16 @@</div><div class='ctx'>  *</div><div class='ctx'>  * XXX: PCDAC steps (0.5dbm) or DBM ?</div><div class='ctx'>  *</div><div class='del'>- * XXX: Mask changes for newer chips to 7f</div><div class='del'>- *      like tx power table ?</div><div class='ctx'>  */</div><div class='ctx'> #define AR5K_TXPC			0x80e8			/* Register Address */</div><div class='del'>-#define AR5K_TXPC_ACK_M			0x0000003f	/* Mask for ACK tx power */</div><div class='add'>+#define AR5K_TXPC_ACK_M			0x0000003f	/* ACK tx power */</div><div class='ctx'> #define AR5K_TXPC_ACK_S			0</div><div class='del'>-#define AR5K_TXPC_CTS_M			0x00003f00	/* Mask for CTS tx power */</div><div class='add'>+#define AR5K_TXPC_CTS_M			0x00003f00	/* CTS tx power */</div><div class='ctx'> #define AR5K_TXPC_CTS_S			8</div><div class='del'>-#define AR5K_TXPC_CHIRP_M		0x003f0000	/* Mask for CHIRP tx power */</div><div class='del'>-#define AR5K_TXPC_CHIRP_S		22</div><div class='add'>+#define AR5K_TXPC_CHIRP_M		0x003f0000	/* CHIRP tx power */</div><div class='add'>+#define AR5K_TXPC_CHIRP_S		16</div><div class='add'>+#define AR5K_TXPC_DOPPLER		0x0f000000	/* Doppler chirp span (?) */</div><div class='add'>+#define AR5K_TXPC_DOPPLER_S		24</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Profile count registers</div><div class='hunk'>@@ -1656,14 +1656,19 @@</div><div class='ctx'> #define AR5K_PROFCNT_CYCLE		0x80f8	/* Cycle count (?) */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Quiet (period) control registers (?)</div><div class='add'>+ * Quiet period control registers</div><div class='ctx'>  */</div><div class='ctx'> #define AR5K_QUIET_CTL1			0x80fc			/* Register Address */</div><div class='del'>-#define AR5K_QUIET_CTL1_NEXT_QT		0x0000ffff	/* Mask for next quiet (period?) (?) */</div><div class='del'>-#define AR5K_QUIET_CTL1_QT_EN		0x00010000	/* Enable quiet (period?) */</div><div class='add'>+#define AR5K_QUIET_CTL1_NEXT_QT_TSF	0x0000ffff	/* Next quiet period TSF (TU) */</div><div class='add'>+#define AR5K_QUIET_CTL1_NEXT_QT_TSF_S	0</div><div class='add'>+#define AR5K_QUIET_CTL1_QT_EN		0x00010000	/* Enable quiet period */</div><div class='add'>+#define AR5K_QUIET_CTL1_ACK_CTS_EN	0x00020000	/* Send ACK/CTS during quiet period */</div><div class='add'>+</div><div class='ctx'> #define AR5K_QUIET_CTL2			0x8100			/* Register Address */</div><div class='del'>-#define AR5K_QUIET_CTL2_QT_PER		0x0000ffff	/* Mask for quiet period (?) */</div><div class='del'>-#define AR5K_QUIET_CTL2_QT_DUR		0xffff0000	/* Mask for quiet duration (?) */</div><div class='add'>+#define AR5K_QUIET_CTL2_QT_PER		0x0000ffff	/* Mask for quiet period periodicity */</div><div class='add'>+#define AR5K_QUIET_CTL2_QT_PER_S	0</div><div class='add'>+#define AR5K_QUIET_CTL2_QT_DUR		0xffff0000	/* Mask for quiet period duration */</div><div class='add'>+#define AR5K_QUIET_CTL2_QT_DUR_S	16</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * TSF parameter register</div><div class='hunk'>@@ -1673,12 +1678,15 @@</div><div class='ctx'> #define AR5K_TSF_PARM_INC_S		0</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * QoS register (?)</div><div class='add'>+ * QoS NOACK policy</div><div class='ctx'>  */</div><div class='del'>-#define AR5K_QOS			0x8108			/* Register Address */</div><div class='del'>-#define AR5K_QOS_NOACK_2BIT_VALUES	0x00000000	/* (field) */</div><div class='del'>-#define AR5K_QOS_NOACK_BIT_OFFSET	0x00000020	/* (field) */</div><div class='del'>-#define AR5K_QOS_NOACK_BYTE_OFFSET	0x00000080	/* (field) */</div><div class='add'>+#define AR5K_QOS_NOACK			0x8108			/* Register Address */</div><div class='add'>+#define AR5K_QOS_NOACK_2BIT_VALUES	0x0000000f	/* ??? */</div><div class='add'>+#define AR5K_QOS_NOACK_2BIT_VALUES_S	0</div><div class='add'>+#define AR5K_QOS_NOACK_BIT_OFFSET	0x00000070	/* ??? */</div><div class='add'>+#define AR5K_QOS_NOACK_BIT_OFFSET_S	4</div><div class='add'>+#define AR5K_QOS_NOACK_BYTE_OFFSET	0x00000180	/* ??? */</div><div class='add'>+#define AR5K_QOS_NOACK_BYTE_OFFSET_S	8</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * PHY error filter register</div><div class='hunk'>@@ -1702,29 +1710,15 @@</div><div class='ctx'> /*</div><div class='ctx'>  * MIC QoS control register (?)</div><div class='ctx'>  */</div><div class='del'>-#define	AR5K_MIC_QOS_CTL	0x8118			/* Register Address */</div><div class='del'>-#define	AR5K_MIC_QOS_CTL_0	0x00000001	/* MIC QoS control 0 (?) */</div><div class='del'>-#define	AR5K_MIC_QOS_CTL_1	0x00000004	/* MIC QoS control 1 (?) */</div><div class='del'>-#define	AR5K_MIC_QOS_CTL_2	0x00000010	/* MIC QoS control 2 (?) */</div><div class='del'>-#define	AR5K_MIC_QOS_CTL_3	0x00000040	/* MIC QoS control 3 (?) */</div><div class='del'>-#define	AR5K_MIC_QOS_CTL_4	0x00000100	/* MIC QoS control 4 (?) */</div><div class='del'>-#define	AR5K_MIC_QOS_CTL_5	0x00000400	/* MIC QoS control 5 (?) */</div><div class='del'>-#define	AR5K_MIC_QOS_CTL_6	0x00001000	/* MIC QoS control 6 (?) */</div><div class='del'>-#define	AR5K_MIC_QOS_CTL_7	0x00004000	/* MIC QoS control 7 (?) */</div><div class='del'>-#define	AR5K_MIC_QOS_CTL_MQ_EN	0x00010000	/* Enable MIC QoS */</div><div class='add'>+#define	AR5K_MIC_QOS_CTL		0x8118			/* Register Address */</div><div class='add'>+#define	AR5K_MIC_QOS_CTL_OFF(_n)	(1 &lt;&lt; (_n * 2))</div><div class='add'>+#define	AR5K_MIC_QOS_CTL_MQ_EN		0x00010000	/* Enable MIC QoS */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * MIC QoS select register (?)</div><div class='ctx'>  */</div><div class='del'>-#define	AR5K_MIC_QOS_SEL	0x811c</div><div class='del'>-#define	AR5K_MIC_QOS_SEL_0	0x00000001</div><div class='del'>-#define	AR5K_MIC_QOS_SEL_1	0x00000010</div><div class='del'>-#define	AR5K_MIC_QOS_SEL_2	0x00000100</div><div class='del'>-#define	AR5K_MIC_QOS_SEL_3	0x00001000</div><div class='del'>-#define	AR5K_MIC_QOS_SEL_4	0x00010000</div><div class='del'>-#define	AR5K_MIC_QOS_SEL_5	0x00100000</div><div class='del'>-#define	AR5K_MIC_QOS_SEL_6	0x01000000</div><div class='del'>-#define	AR5K_MIC_QOS_SEL_7	0x10000000</div><div class='add'>+#define	AR5K_MIC_QOS_SEL		0x811c</div><div class='add'>+#define	AR5K_MIC_QOS_SEL_OFF(_n)	(1 &lt;&lt; (_n * 4))</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Misc mode control register (?)</div><div class='hunk'>@@ -1759,6 +1753,11 @@</div><div class='ctx'> #define	AR5K_TSF_THRES			0x813c</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * TODO: Wake On Wireless registers</div><div class='add'>+ * Range: 0x8147 - 0x818c</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Rate -&gt; ACK SIFS mapping table (32 entries)</div><div class='ctx'>  */</div><div class='ctx'> #define	AR5K_RATE_ACKSIFS_BASE		0x8680			/* Register Address */</div><div class='hunk'>@@ -1873,7 +1872,8 @@</div><div class='ctx'>  */</div><div class='ctx'> #define	AR5K_PHY_TURBO			0x9804			/* Register Address */</div><div class='ctx'> #define	AR5K_PHY_TURBO_MODE		0x00000001	/* Enable turbo mode */</div><div class='del'>-#define	AR5K_PHY_TURBO_SHORT		0x00000002	/* Short mode (20Mhz channels) (?) */</div><div class='add'>+#define	AR5K_PHY_TURBO_SHORT		0x00000002	/* Set short symbols to turbo mode */</div><div class='add'>+#define	AR5K_PHY_TURBO_MIMO		0x00000004	/* Set turbo for mimo mimo */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * PHY agility command register</div><div class='hunk'>@@ -1883,6 +1883,11 @@</div><div class='ctx'> #define	AR5K_PHY_TST1			0x9808</div><div class='ctx'> #define	AR5K_PHY_AGC_DISABLE		0x08000000	/* Disable AGC to A2 (?)*/</div><div class='ctx'> #define	AR5K_PHY_TST1_TXHOLD		0x00003800	/* Set tx hold (?) */</div><div class='add'>+#define	AR5K_PHY_TST1_TXSRC_SRC		0x00000002	/* Used with bit 7 (?) */</div><div class='add'>+#define	AR5K_PHY_TST1_TXSRC_SRC_S	1</div><div class='add'>+#define	AR5K_PHY_TST1_TXSRC_ALT		0x00000080	/* Set input to tsdac (?) */</div><div class='add'>+#define	AR5K_PHY_TST1_TXSRC_ALT_S	7</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * PHY timing register 3 [5112+]</div><div class='hunk'>@@ -1907,15 +1912,23 @@</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * PHY RF control registers</div><div class='del'>- * (i think these are delay times,</div><div class='del'>- * these calibration values exist</div><div class='del'>- * in EEPROM)</div><div class='ctx'>  */</div><div class='ctx'> #define AR5K_PHY_RF_CTL2		0x9824			/* Register Address */</div><div class='del'>-#define	AR5K_PHY_RF_CTL2_TXF2TXD_START	0x0000000f	/* Mask for TX frame to TX d(esc?) start */</div><div class='add'>+#define	AR5K_PHY_RF_CTL2_TXF2TXD_START	0x0000000f	/* TX frame to TX data start */</div><div class='add'>+#define	AR5K_PHY_RF_CTL2_TXF2TXD_START_S	0</div><div class='ctx'> </div><div class='ctx'> #define AR5K_PHY_RF_CTL3		0x9828			/* Register Address */</div><div class='del'>-#define AR5K_PHY_RF_CTL3_TXE2XLNA_ON	0x0000000f	/* Mask for TX end to XLNA on */</div><div class='add'>+#define AR5K_PHY_RF_CTL3_TXE2XLNA_ON	0x0000000f	/* TX end to XLNA on */</div><div class='add'>+#define	AR5K_PHY_RF_CTL3_TXE2XLNA_ON_S	0</div><div class='add'>+</div><div class='add'>+#define	AR5K_PHY_ADC_CTL			0x982c</div><div class='add'>+#define	AR5K_PHY_ADC_CTL_INBUFGAIN_OFF		0x00000003</div><div class='add'>+#define	AR5K_PHY_ADC_CTL_INBUFGAIN_OFF_S	0</div><div class='add'>+#define	AR5K_PHY_ADC_CTL_PWD_DAC_OFF		0x00002000</div><div class='add'>+#define	AR5K_PHY_ADC_CTL_PWD_BAND_GAP_OFF	0x00004000</div><div class='add'>+#define	AR5K_PHY_ADC_CTL_PWD_ADC_OFF		0x00008000</div><div class='add'>+#define	AR5K_PHY_ADC_CTL_INBUFGAIN_ON		0x00030000</div><div class='add'>+#define	AR5K_PHY_ADC_CTL_INBUFGAIN_ON_S		16</div><div class='ctx'> </div><div class='ctx'> #define AR5K_PHY_RF_CTL4		0x9834			/* Register Address */</div><div class='ctx'> #define AR5K_PHY_RF_CTL4_TXF2XPA_A_ON	0x00000001	/* TX frame to XPA A on (field) */</div><div class='hunk'>@@ -1937,35 +1950,43 @@</div><div class='ctx'>  * PHY settling register</div><div class='ctx'>  */</div><div class='ctx'> #define AR5K_PHY_SETTLING		0x9844			/* Register Address */</div><div class='del'>-#define	AR5K_PHY_SETTLING_AGC		0x0000007f	/* Mask for AGC settling time */</div><div class='del'>-#define	AR5K_PHY_SETTLING_SWITCH	0x00003f80	/* Mask for Switch settlig time */</div><div class='add'>+#define	AR5K_PHY_SETTLING_AGC		0x0000007f	/* AGC settling time */</div><div class='add'>+#define	AR5K_PHY_SETTLING_AGC_S		0</div><div class='add'>+#define	AR5K_PHY_SETTLING_SWITCH	0x00003f80	/* Switch settlig time */</div><div class='add'>+#define	AR5K_PHY_SETTLINK_SWITCH_S	7</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * PHY Gain registers</div><div class='ctx'>  */</div><div class='ctx'> #define AR5K_PHY_GAIN			0x9848			/* Register Address */</div><div class='del'>-#define	AR5K_PHY_GAIN_TXRX_ATTEN	0x0003f000	/* Mask for TX-RX Attenuation */</div><div class='add'>+#define	AR5K_PHY_GAIN_TXRX_ATTEN	0x0003f000	/* TX-RX Attenuation */</div><div class='add'>+#define	AR5K_PHY_GAIN_TXRX_ATTEN_S	12</div><div class='add'>+#define	AR5K_PHY_GAIN_TXRX_RF_MAX	0x007c0000</div><div class='add'>+#define	AR5K_PHY_GAIN_TXRX_RF_MAX_S	18</div><div class='ctx'> </div><div class='ctx'> #define	AR5K_PHY_GAIN_OFFSET		0x984c			/* Register Address */</div><div class='ctx'> #define	AR5K_PHY_GAIN_OFFSET_RXTX_FLAG	0x00020000	/* RX-TX flag (?) */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Desired size register</div><div class='add'>+ * Desired ADC/PGA size register</div><div class='ctx'>  * (for more infos read ANI patent)</div><div class='ctx'>  */</div><div class='ctx'> #define AR5K_PHY_DESIRED_SIZE		0x9850			/* Register Address */</div><div class='del'>-#define	AR5K_PHY_DESIRED_SIZE_ADC	0x000000ff	/* Mask for ADC desired size */</div><div class='del'>-#define	AR5K_PHY_DESIRED_SIZE_PGA	0x0000ff00	/* Mask for PGA desired size */</div><div class='del'>-#define	AR5K_PHY_DESIRED_SIZE_TOT	0x0ff00000	/* Mask for Total desired size (?) */</div><div class='add'>+#define	AR5K_PHY_DESIRED_SIZE_ADC	0x000000ff	/* ADC desired size */</div><div class='add'>+#define	AR5K_PHY_DESIRED_SIZE_ADC_S	0</div><div class='add'>+#define	AR5K_PHY_DESIRED_SIZE_PGA	0x0000ff00	/* PGA desired size */</div><div class='add'>+#define	AR5K_PHY_DESIRED_SIZE_PGA_S	8</div><div class='add'>+#define	AR5K_PHY_DESIRED_SIZE_TOT	0x0ff00000	/* Total desired size */</div><div class='add'>+#define	AR5K_PHY_DESIRED_SIZE_TOT_S	20</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * PHY signal register</div><div class='ctx'>  * (for more infos read ANI patent)</div><div class='ctx'>  */</div><div class='ctx'> #define	AR5K_PHY_SIG			0x9858			/* Register Address */</div><div class='del'>-#define	AR5K_PHY_SIG_FIRSTEP		0x0003f000	/* Mask for FIRSTEP */</div><div class='add'>+#define	AR5K_PHY_SIG_FIRSTEP		0x0003f000	/* FIRSTEP */</div><div class='ctx'> #define	AR5K_PHY_SIG_FIRSTEP_S		12</div><div class='del'>-#define	AR5K_PHY_SIG_FIRPWR		0x03fc0000	/* Mask for FIPWR */</div><div class='add'>+#define	AR5K_PHY_SIG_FIRPWR		0x03fc0000	/* FIPWR */</div><div class='ctx'> #define	AR5K_PHY_SIG_FIRPWR_S		18</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1973,9 +1994,9 @@</div><div class='ctx'>  * (for more infos read ANI patent)</div><div class='ctx'>  */</div><div class='ctx'> #define	AR5K_PHY_AGCCOARSE		0x985c			/* Register Address */</div><div class='del'>-#define	AR5K_PHY_AGCCOARSE_LO		0x00007f80	/* Mask for AGC Coarse low */</div><div class='add'>+#define	AR5K_PHY_AGCCOARSE_LO		0x00007f80	/* AGC Coarse low */</div><div class='ctx'> #define	AR5K_PHY_AGCCOARSE_LO_S		7</div><div class='del'>-#define	AR5K_PHY_AGCCOARSE_HI		0x003f8000	/* Mask for AGC Coarse high */</div><div class='add'>+#define	AR5K_PHY_AGCCOARSE_HI		0x003f8000	/* AGC Coarse high */</div><div class='ctx'> #define	AR5K_PHY_AGCCOARSE_HI_S		15</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1984,6 +2005,8 @@</div><div class='ctx'> #define	AR5K_PHY_AGCCTL			0x9860			/* Register address */</div><div class='ctx'> #define	AR5K_PHY_AGCCTL_CAL		0x00000001	/* Enable PHY calibration */</div><div class='ctx'> #define	AR5K_PHY_AGCCTL_NF		0x00000002	/* Enable Noise Floor calibration */</div><div class='add'>+#define	AR5K_PHY_AGCCTL_NF_EN		0x00008000	/* Enable nf calibration to happen (?) */</div><div class='add'>+#define	AR5K_PHY_AGCCTL_NF_NOUPDATE	0x00020000	/* Don't update nf automaticaly */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * PHY noise floor status register</div><div class='hunk'>@@ -1994,7 +2017,10 @@</div><div class='ctx'> #define AR5K_PHY_NF_RVAL(_n)		(((_n) &gt;&gt; 19) &amp; AR5K_PHY_NF_M)</div><div class='ctx'> #define AR5K_PHY_NF_AVAL(_n)		(-((_n) ^ AR5K_PHY_NF_M) + 1)</div><div class='ctx'> #define AR5K_PHY_NF_SVAL(_n)		(((_n) &amp; AR5K_PHY_NF_M) | (1 &lt;&lt; 9))</div><div class='del'>-#define	AR5K_PHY_NF_THRESH62		0x00001000	/* Thresh62 -check ANI patent- (field) */</div><div class='add'>+#define	AR5K_PHY_NF_THRESH62		0x0007f000	/* Thresh62 -check ANI patent- (field) */</div><div class='add'>+#define	AR5K_PHY_NF_THRESH62_S		12</div><div class='add'>+#define	AR5K_PHY_NF_MINCCA_PWR		0x0ff80000	/* ??? */</div><div class='add'>+#define	AR5K_PHY_NF_MINCCA_PWR_S	19</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * PHY ADC saturation register [5110]</div><div class='hunk'>@@ -2034,24 +2060,31 @@</div><div class='ctx'>  */</div><div class='ctx'> #define AR5K_PHY_SCR			0x9870</div><div class='ctx'> #define AR5K_PHY_SCR_32MHZ		0x0000001f</div><div class='add'>+</div><div class='ctx'> #define AR5K_PHY_SLMT			0x9874</div><div class='ctx'> #define AR5K_PHY_SLMT_32MHZ		0x0000007f</div><div class='add'>+</div><div class='ctx'> #define AR5K_PHY_SCAL			0x9878</div><div class='ctx'> #define AR5K_PHY_SCAL_32MHZ		0x0000000e</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * PHY PLL (Phase Locked Loop) control register</div><div class='ctx'>  */</div><div class='ctx'> #define	AR5K_PHY_PLL			0x987c</div><div class='del'>-#define	AR5K_PHY_PLL_20MHZ		0x13	/* For half rate (?) [5111+] */</div><div class='del'>-#define	AR5K_PHY_PLL_40MHZ_5211		0x18	/* For 802.11a */</div><div class='add'>+#define	AR5K_PHY_PLL_20MHZ		0x00000013	/* For half rate (?) */</div><div class='add'>+/* 40MHz -&gt; 5GHz band */</div><div class='add'>+#define	AR5K_PHY_PLL_40MHZ_5211		0x00000018</div><div class='ctx'> #define	AR5K_PHY_PLL_40MHZ_5212		0x000000aa</div><div class='add'>+#define	AR5K_PHY_PLL_40MHZ_5413		0x00000004</div><div class='ctx'> #define	AR5K_PHY_PLL_40MHZ		(ah-&gt;ah_version == AR5K_AR5211 ? \</div><div class='ctx'> 					AR5K_PHY_PLL_40MHZ_5211 : AR5K_PHY_PLL_40MHZ_5212)</div><div class='del'>-#define	AR5K_PHY_PLL_44MHZ_5211		0x19	/* For 802.11b/g */</div><div class='add'>+/* 44MHz -&gt; 2.4GHz band */</div><div class='add'>+#define	AR5K_PHY_PLL_44MHZ_5211		0x00000019</div><div class='ctx'> #define	AR5K_PHY_PLL_44MHZ_5212		0x000000ab</div><div class='ctx'> #define	AR5K_PHY_PLL_44MHZ		(ah-&gt;ah_version == AR5K_AR5211 ? \</div><div class='ctx'> 					AR5K_PHY_PLL_44MHZ_5211 : AR5K_PHY_PLL_44MHZ_5212)</div><div class='add'>+</div><div class='ctx'> #define AR5K_PHY_PLL_RF5111		0x00000000</div><div class='ctx'> #define AR5K_PHY_PLL_RF5112		0x00000040</div><div class='ctx'> #define	AR5K_PHY_PLL_HALF_RATE		0x00000100</div><div class='hunk'>@@ -2118,6 +2151,19 @@</div><div class='ctx'> #define AR5K_PHY_RFSTG_DISABLE		0x00000021</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * BIN masks (?)</div><div class='add'>+ */</div><div class='add'>+#define	AR5K_PHY_BIN_MASK_1	0x9900</div><div class='add'>+#define	AR5K_PHY_BIN_MASK_2	0x9904</div><div class='add'>+#define	AR5K_PHY_BIN_MASK_3	0x9908</div><div class='add'>+</div><div class='add'>+#define	AR5K_PHY_BIN_MASK_CTL		0x990c</div><div class='add'>+#define	AR5K_PHY_BIN_MASK_CTL_MASK_4	0x00003fff</div><div class='add'>+#define	AR5K_PHY_BIN_MASK_CTL_MASK_4_S	0</div><div class='add'>+#define	AR5K_PHY_BIN_MASK_CTL_RATE	0xff000000</div><div class='add'>+#define	AR5K_PHY_BIN_MASK_CTL_RATE_S	24</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * PHY Antenna control register</div><div class='ctx'>  */</div><div class='ctx'> #define AR5K_PHY_ANT_CTL		0x9910			/* Register Address */</div><div class='hunk'>@@ -2164,6 +2210,7 @@</div><div class='ctx'> #define	AR5K_PHY_OFDM_SELFCORR			0x9924			/* Register Address */</div><div class='ctx'> #define	AR5K_PHY_OFDM_SELFCORR_CYPWR_THR1_EN	0x00000001	/* Enable cyclic RSSI thr 1 */</div><div class='ctx'> #define	AR5K_PHY_OFDM_SELFCORR_CYPWR_THR1	0x000000fe	/* Mask for Cyclic RSSI threshold 1 */</div><div class='add'>+#define	AR5K_PHY_OFDM_SELFCORR_CYPWR_THR1_S	0</div><div class='ctx'> #define	AR5K_PHY_OFDM_SELFCORR_CYPWR_THR3	0x00000100	/* Cyclic RSSI threshold 3 (field) (?) */</div><div class='ctx'> #define	AR5K_PHY_OFDM_SELFCORR_RSSI_1ATHR_EN	0x00008000	/* Enable 1A RSSI threshold (?) */</div><div class='ctx'> #define	AR5K_PHY_OFDM_SELFCORR_RSSI_1ATHR	0x00010000	/* 1A RSSI threshold (field) (?) */</div><div class='hunk'>@@ -2210,7 +2257,6 @@</div><div class='ctx'> #define	AR5K_PHY_PAPD_PROBE_INI_5111	0x00004883	/* [5212+] */</div><div class='ctx'> #define	AR5K_PHY_PAPD_PROBE_INI_5112	0x00004882	/* [5212+] */</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * PHY TX rate power registers [5112+]</div><div class='ctx'>  */</div><div class='hunk'>@@ -2232,6 +2278,8 @@</div><div class='ctx'> #define	AR5K_PHY_FRAME_CTL_TX_CLIP	0x00000038	/* Mask for tx clip (?) */</div><div class='ctx'> #define	AR5K_PHY_FRAME_CTL_TX_CLIP_S	3</div><div class='ctx'> #define	AR5K_PHY_FRAME_CTL_PREP_CHINFO	0x00010000	/* Prepend chan info */</div><div class='add'>+#define	AR5K_PHY_FRAME_CTL_EMU		0x80000000</div><div class='add'>+#define	AR5K_PHY_FRAME_CTL_EMU_S	31</div><div class='ctx'> /*---[5110/5111]---*/</div><div class='ctx'> #define	AR5K_PHY_FRAME_CTL_TIMING_ERR	0x01000000	/* PHY timing error */</div><div class='ctx'> #define	AR5K_PHY_FRAME_CTL_PARITY_ERR	0x02000000	/* Parity error */</div><div class='hunk'>@@ -2250,48 +2298,36 @@</div><div class='ctx'>  * PHY radar detection register [5111+]</div><div class='ctx'>  */</div><div class='ctx'> #define	AR5K_PHY_RADAR			0x9954</div><div class='del'>-</div><div class='del'>-/* Radar enable 			........ ........ ........ .......1 */</div><div class='ctx'> #define	AR5K_PHY_RADAR_ENABLE		0x00000001</div><div class='del'>-#define	AR5K_PHY_RADAR_DISABLE          0x00000000</div><div class='del'>-#define	AR5K_PHY_RADAR_ENABLE_S		0</div><div class='del'>-</div><div class='del'>-/* This is the value found on the card  .1.111.1 .1.1.... 111....1 1...1...</div><div class='del'>-at power on. */</div><div class='del'>-#define	AR5K_PHY_RADAR_PWONDEF_AR5213	0x5d50e188</div><div class='del'>-</div><div class='del'>-/* This is the value found on the card 	.1.1.111 ..11...1 .1...1.1 1...11.1</div><div class='del'>-after DFS is enabled */</div><div class='del'>-#define	AR5K_PHY_RADAR_ENABLED_AR5213	0x5731458d</div><div class='del'>-</div><div class='del'>-/* Finite Impulse Response (FIR) filter .1111111 ........ ........ ........</div><div class='del'>- * power out threshold.</div><div class='del'>- * 7-bits, standard power range {0..127} in 1/2 dBm units. */</div><div class='del'>-#define AR5K_PHY_RADAR_FIRPWROUTTHR    	0x7f000000</div><div class='del'>-#define AR5K_PHY_RADAR_FIRPWROUTTHR_S	24</div><div class='del'>-</div><div class='del'>-/* Radar RSSI/SNR threshold.		........ 111111.. ........ ........</div><div class='del'>- * 6-bits, dBm range {0..63} in dBm units. */</div><div class='del'>-#define AR5K_PHY_RADAR_RADARRSSITHR    	0x00fc0000</div><div class='del'>-#define AR5K_PHY_RADAR_RADARRSSITHR_S	18</div><div class='del'>-</div><div class='del'>-/* Pulse height threshold 		........ ......11 1111.... ........</div><div class='del'>- * 6-bits, dBm range {0..63} in dBm units. */</div><div class='del'>-#define AR5K_PHY_RADAR_PULSEHEIGHTTHR   0x0003f000</div><div class='del'>-#define AR5K_PHY_RADAR_PULSEHEIGHTTHR_S	12</div><div class='del'>-</div><div class='del'>-/* Pulse RSSI/SNR threshold		........ ........ ....1111 11......</div><div class='del'>- * 6-bits, dBm range {0..63} in dBm units. */</div><div class='del'>-#define AR5K_PHY_RADAR_PULSERSSITHR    	0x00000fc0</div><div class='del'>-#define AR5K_PHY_RADAR_PULSERSSITHR_S	6</div><div class='del'>-</div><div class='del'>-/* Inband threshold  			........ ........ ........ ..11111.</div><div class='del'>- * 5-bits, units unknown {0..31} (? MHz ?) */</div><div class='del'>-#define AR5K_PHY_RADAR_INBANDTHR    	0x0000003e</div><div class='add'>+#define	AR5K_PHY_RADAR_DISABLE		0x00000000</div><div class='add'>+#define AR5K_PHY_RADAR_INBANDTHR    	0x0000003e	/* Inband threshold</div><div class='add'>+							5-bits, units unknown {0..31}</div><div class='add'>+							(? MHz ?) */</div><div class='ctx'> #define AR5K_PHY_RADAR_INBANDTHR_S	1</div><div class='ctx'> </div><div class='add'>+#define AR5K_PHY_RADAR_PRSSI_THR    	0x00000fc0	/* Pulse RSSI/SNR threshold</div><div class='add'>+							6-bits, dBm range {0..63}</div><div class='add'>+							in dBm units. */</div><div class='add'>+#define AR5K_PHY_RADAR_PRSSI_THR_S	6</div><div class='add'>+</div><div class='add'>+#define AR5K_PHY_RADAR_PHEIGHT_THR   	0x0003f000	/* Pulse height threshold</div><div class='add'>+							6-bits, dBm range {0..63}</div><div class='add'>+							in dBm units. */</div><div class='add'>+#define AR5K_PHY_RADAR_PHEIGHT_THR_S	12</div><div class='add'>+</div><div class='add'>+#define AR5K_PHY_RADAR_RSSI_THR    	0x00fc0000	/* Radar RSSI/SNR threshold.</div><div class='add'>+							6-bits, dBm range {0..63}</div><div class='add'>+							in dBm units. */</div><div class='add'>+#define AR5K_PHY_RADAR_RSSI_THR_S	18</div><div class='add'>+</div><div class='add'>+#define AR5K_PHY_RADAR_FIRPWR_THR	0x7f000000	/* Finite Impulse Response</div><div class='add'>+							filter power out threshold.</div><div class='add'>+							7-bits, standard power range</div><div class='add'>+							{0..127} in 1/2 dBm units. */</div><div class='add'>+#define AR5K_PHY_RADAR_FIRPWR_THRS	24</div><div class='add'>+</div><div class='ctx'> /*</div><div class='del'>- * PHY antenna switch table registers [5110]</div><div class='add'>+ * PHY antenna switch table registers</div><div class='ctx'>  */</div><div class='ctx'> #define AR5K_PHY_ANT_SWITCH_TABLE_0	0x9960</div><div class='ctx'> #define AR5K_PHY_ANT_SWITCH_TABLE_1	0x9964</div><div class='hunk'>@@ -2302,25 +2338,65 @@ after DFS is enabled */</div><div class='ctx'> #define AR5K_PHY_NFTHRES		0x9968</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * PHY clock sleep registers [5112+]</div><div class='add'>+ * Sigma Delta register (?) [5213]</div><div class='ctx'>  */</div><div class='del'>-#define AR5K_PHY_SCLOCK			0x99f0</div><div class='del'>-#define AR5K_PHY_SCLOCK_32MHZ		0x0000000c</div><div class='del'>-#define AR5K_PHY_SDELAY			0x99f4</div><div class='del'>-#define AR5K_PHY_SDELAY_32MHZ		0x000000ff</div><div class='del'>-#define AR5K_PHY_SPENDING		0x99f8</div><div class='del'>-#define	AR5K_PHY_SPENDING_14		0x00000014</div><div class='del'>-#define	AR5K_PHY_SPENDING_18		0x00000018</div><div class='del'>-#define AR5K_PHY_SPENDING_RF5111	0x00000018</div><div class='del'>-#define AR5K_PHY_SPENDING_RF5112	0x00000014</div><div class='del'>-/* #define AR5K_PHY_SPENDING_RF5112A	0x0000000e */</div><div class='del'>-/* #define AR5K_PHY_SPENDING_RF5424	0x00000012 */</div><div class='del'>-#define	AR5K_PHY_SPENDING_RF5413	0x00000014</div><div class='del'>-#define	AR5K_PHY_SPENDING_RF2413	0x00000014</div><div class='del'>-#define AR5K_PHY_SPENDING_RF2425	0x00000018</div><div class='add'>+#define AR5K_PHY_SIGMA_DELTA		0x996C</div><div class='add'>+#define AR5K_PHY_SIGMA_DELTA_ADC_SEL	0x00000003</div><div class='add'>+#define AR5K_PHY_SIGMA_DELTA_ADC_SEL_S	0</div><div class='add'>+#define AR5K_PHY_SIGMA_DELTA_FILT2	0x000000f8</div><div class='add'>+#define AR5K_PHY_SIGMA_DELTA_FILT2_S	3</div><div class='add'>+#define AR5K_PHY_SIGMA_DELTA_FILT1	0x00001f00</div><div class='add'>+#define AR5K_PHY_SIGMA_DELTA_FILT1_S	8</div><div class='add'>+#define AR5K_PHY_SIGMA_DELTA_ADC_CLIP	0x01ff3000</div><div class='add'>+#define AR5K_PHY_SIGMA_DELTA_ADC_CLIP_S	13</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * RF restart register [5112+] (?)</div><div class='add'>+ */</div><div class='add'>+#define AR5K_PHY_RESTART		0x9970		/* restart */</div><div class='add'>+#define AR5K_PHY_RESTART_DIV_GC		0x001c0000	/* Fast diversity gc_limit (?) */</div><div class='add'>+#define AR5K_PHY_RESTART_DIV_GC_S	18</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * RF Bus access request register (for synth-oly channel switching)</div><div class='add'>+ */</div><div class='add'>+#define AR5K_PHY_RFBUS_REQ		0x997C</div><div class='add'>+#define AR5K_PHY_RFBUS_REQ_REQUEST	0x00000001</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Spur mitigation masks (?)</div><div class='add'>+ */</div><div class='add'>+#define AR5K_PHY_TIMING_7		0x9980</div><div class='add'>+#define AR5K_PHY_TIMING_8		0x9984</div><div class='add'>+#define AR5K_PHY_TIMING_8_PILOT_MASK_2		0x000fffff</div><div class='add'>+#define AR5K_PHY_TIMING_8_PILOT_MASK_2_S	0</div><div class='add'>+</div><div class='add'>+#define AR5K_PHY_BIN_MASK2_1		0x9988</div><div class='add'>+#define AR5K_PHY_BIN_MASK2_2		0x998c</div><div class='add'>+#define AR5K_PHY_BIN_MASK2_3		0x9990</div><div class='add'>+</div><div class='add'>+#define AR5K_PHY_BIN_MASK2_4		0x9994</div><div class='add'>+#define AR5K_PHY_BIN_MASK2_4_MASK_4	0x00003fff</div><div class='add'>+#define AR5K_PHY_BIN_MASK2_4_MASK_4_S	0</div><div class='add'>+</div><div class='add'>+#define AR_PHY_TIMING_9			0x9998</div><div class='add'>+#define AR_PHY_TIMING_10		0x999c</div><div class='add'>+#define AR_PHY_TIMING_10_PILOT_MASK_2	0x000fffff</div><div class='add'>+#define AR_PHY_TIMING_10_PILOT_MASK_2_S	0</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Spur mitigation control</div><div class='add'>+ */</div><div class='add'>+#define AR_PHY_TIMING_11			0x99a0		/* Register address */</div><div class='add'>+#define AR_PHY_TIMING_11_SPUR_DELTA_PHASE	0x000fffff	/* Spur delta phase */</div><div class='add'>+#define AR_PHY_TIMING_11_SPUR_DELTA_PHASE_S	0</div><div class='add'>+#define AR_PHY_TIMING_11_SPUR_FREQ_SD		0x3ff00000	/* Freq sigma delta */</div><div class='add'>+#define AR_PHY_TIMING_11_SPUR_FREQ_SD_S	20</div><div class='add'>+#define AR_PHY_TIMING_11_USE_SPUR_IN_AGC	0x40000000	/* Spur filter in AGC detector */</div><div class='add'>+#define AR_PHY_TIMING_11_USE_SPUR_IN_SELFCOR	0x80000000	/* Spur filter in OFDM self correlator */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Misc PHY/radio registers [5110 - 5111]</div><div class='add'>+ * Gain tables</div><div class='ctx'>  */</div><div class='ctx'> #define	AR5K_BB_GAIN_BASE		0x9b00	/* BaseBand Amplifier Gain table base address */</div><div class='ctx'> #define AR5K_BB_GAIN(_n)		(AR5K_BB_GAIN_BASE + ((_n) &lt;&lt; 2))</div><div class='hunk'>@@ -2340,9 +2416,10 @@ after DFS is enabled */</div><div class='ctx'> #define	AR5K_PHY_CURRENT_RSSI	0x9c1c</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * PHY RF Bus grant register (?)</div><div class='add'>+ * PHY RF Bus grant register</div><div class='ctx'>  */</div><div class='ctx'> #define	AR5K_PHY_RFBUS_GRANT	0x9c20</div><div class='add'>+#define	AR5K_PHY_RFBUS_GRANT_OK	0x00000001</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * PHY ADC test register</div><div class='hunk'>@@ -2386,6 +2463,31 @@ after DFS is enabled */</div><div class='ctx'> #define	AR5K_PHY_CHAN_STATUS_RX_CLR_PAP	0x00000008</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Heavy clip enable register</div><div class='add'>+ */</div><div class='add'>+#define	AR5K_PHY_HEAVY_CLIP_ENABLE	0x99e0</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * PHY clock sleep registers [5112+]</div><div class='add'>+ */</div><div class='add'>+#define AR5K_PHY_SCLOCK			0x99f0</div><div class='add'>+#define AR5K_PHY_SCLOCK_32MHZ		0x0000000c</div><div class='add'>+#define AR5K_PHY_SDELAY			0x99f4</div><div class='add'>+#define AR5K_PHY_SDELAY_32MHZ		0x000000ff</div><div class='add'>+#define AR5K_PHY_SPENDING		0x99f8</div><div class='add'>+#define AR5K_PHY_SPENDING_14		0x00000014</div><div class='add'>+#define AR5K_PHY_SPENDING_18		0x00000018</div><div class='add'>+#define AR5K_PHY_SPENDING_RF5111	0x00000018</div><div class='add'>+#define AR5K_PHY_SPENDING_RF5112	0x00000014</div><div class='add'>+/* #define AR5K_PHY_SPENDING_RF5112A	0x0000000e */</div><div class='add'>+/* #define AR5K_PHY_SPENDING_RF5424	0x00000012 */</div><div class='add'>+#define AR5K_PHY_SPENDING_RF5413	0x00000018</div><div class='add'>+#define AR5K_PHY_SPENDING_RF2413	0x00000018</div><div class='add'>+#define AR5K_PHY_SPENDING_RF2316	0x00000018</div><div class='add'>+#define AR5K_PHY_SPENDING_RF2317	0x00000018</div><div class='add'>+#define AR5K_PHY_SPENDING_RF2425	0x00000014</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * PHY PAPD I (power?) table (?)</div><div class='ctx'>  * (92! entries)</div><div class='ctx'>  */</div><div class='hunk'>@@ -2436,10 +2538,47 @@ after DFS is enabled */</div><div class='ctx'> #define AR5K_PHY_CCK_CROSSCORR_WEAK_SIG_THR	0x0000000f</div><div class='ctx'> #define AR5K_PHY_CCK_CROSSCORR_WEAK_SIG_THR_S	0</div><div class='ctx'> </div><div class='add'>+/* Same address is used for antenna diversity activation */</div><div class='add'>+#define	AR5K_PHY_FAST_ANT_DIV		0xa208</div><div class='add'>+#define	AR5K_PHY_FAST_ANT_DIV_EN	0x00002000</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * PHY 2GHz gain register [5111+]</div><div class='ctx'>  */</div><div class='del'>-#define	AR5K_PHY_GAIN_2GHZ		0xa20c</div><div class='del'>-#define	AR5K_PHY_GAIN_2GHZ_MARGIN_TXRX	0x00fc0000</div><div class='add'>+#define	AR5K_PHY_GAIN_2GHZ			0xa20c</div><div class='add'>+#define	AR5K_PHY_GAIN_2GHZ_MARGIN_TXRX		0x00fc0000</div><div class='ctx'> #define	AR5K_PHY_GAIN_2GHZ_MARGIN_TXRX_S	18</div><div class='del'>-#define	AR5K_PHY_GAIN_2GHZ_INI_5111	0x6480416c</div><div class='add'>+#define	AR5K_PHY_GAIN_2GHZ_INI_5111		0x6480416c</div><div class='add'>+</div><div class='add'>+#define	AR5K_PHY_CCK_RX_CTL_4			0xa21c</div><div class='add'>+#define	AR5K_PHY_CCK_RX_CTL_4_FREQ_EST_SHORT	0x01f80000</div><div class='add'>+#define	AR5K_PHY_CCK_RX_CTL_4_FREQ_EST_SHORT_S	19</div><div class='add'>+</div><div class='add'>+#define	AR5K_PHY_DAG_CCK_CTL			0xa228</div><div class='add'>+#define	AR5K_PHY_DAG_CCK_CTL_EN_RSSI_THR	0x00000200</div><div class='add'>+#define	AR5K_PHY_DAG_CCK_CTL_RSSI_THR		0x0001fc00</div><div class='add'>+#define	AR5K_PHY_DAG_CCK_CTL_RSSI_THR_S		10</div><div class='add'>+</div><div class='add'>+#define	AR5K_PHY_FAST_ADC	0xa24c</div><div class='add'>+</div><div class='add'>+#define	AR5K_PHY_BLUETOOTH	0xa254</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Transmit Power Control register</div><div class='add'>+ * [2413+]</div><div class='add'>+ */</div><div class='add'>+#define	AR5K_PHY_TPC_RG1		0xa258</div><div class='add'>+#define	AR5K_PHY_TPC_RG1_NUM_PD_GAIN	0x0000c000</div><div class='add'>+#define	AR5K_PHY_TPC_RG1_NUM_PD_GAIN_S	14</div><div class='add'>+</div><div class='add'>+#define	AR5K_PHY_TPC_RG5			0xa26C</div><div class='add'>+#define	AR5K_PHY_TPC_RG5_PD_GAIN_OVERLAP	0x0000000F</div><div class='add'>+#define	AR5K_PHY_TPC_RG5_PD_GAIN_OVERLAP_S	0</div><div class='add'>+#define	AR5K_PHY_TPC_RG5_PD_GAIN_BOUNDARY_1	0x000003F0</div><div class='add'>+#define	AR5K_PHY_TPC_RG5_PD_GAIN_BOUNDARY_1_S	4</div><div class='add'>+#define	AR5K_PHY_TPC_RG5_PD_GAIN_BOUNDARY_2	0x0000FC00</div><div class='add'>+#define	AR5K_PHY_TPC_RG5_PD_GAIN_BOUNDARY_2_S	10</div><div class='add'>+#define	AR5K_PHY_TPC_RG5_PD_GAIN_BOUNDARY_3	0x003F0000</div><div class='add'>+#define	AR5K_PHY_TPC_RG5_PD_GAIN_BOUNDARY_3_S	16</div><div class='add'>+#define	AR5K_PHY_TPC_RG5_PD_GAIN_BOUNDARY_4	0x0FC00000</div><div class='add'>+#define	AR5K_PHY_TPC_RG5_PD_GAIN_BOUNDARY_4_S	22</div><div class='head'>diff --git a/drivers/net/wireless/ath5k/reset.c b/drivers/net/wireless/ath5k/reset.c<br/>new file mode 100644<br/>index 000000000000..8f1886834e61<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/ath5k/reset.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/ath5k/reset.c</a></div><div class='hunk'>@@ -0,0 +1,931 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2004-2008 Reyk Floeter &lt;reyk@openbsd.org&gt;</div><div class='add'>+ * Copyright (c) 2006-2008 Nick Kossifidis &lt;mickflemm@gmail.com&gt;</div><div class='add'>+ * Copyright (c) 2007-2008 Luis Rodriguez &lt;mcgrof@winlab.rutgers.edu&gt;</div><div class='add'>+ * Copyright (c) 2007-2008 Pavel Roskin &lt;proski@gnu.org&gt;</div><div class='add'>+ * Copyright (c) 2007-2008 Jiri Slaby &lt;jirislaby@gmail.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * Permission to use, copy, modify, and distribute this software for any</div><div class='add'>+ * purpose with or without fee is hereby granted, provided that the above</div><div class='add'>+ * copyright notice and this permission notice appear in all copies.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES</div><div class='add'>+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR</div><div class='add'>+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES</div><div class='add'>+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN</div><div class='add'>+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF</div><div class='add'>+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define _ATH5K_RESET</div><div class='add'>+</div><div class='add'>+/*****************************\</div><div class='add'>+  Reset functions and helpers</div><div class='add'>+\*****************************/</div><div class='add'>+</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include "ath5k.h"</div><div class='add'>+#include "reg.h"</div><div class='add'>+#include "base.h"</div><div class='add'>+#include "debug.h"</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_write_ofdm_timings - set OFDM timings on AR5212</div><div class='add'>+ *</div><div class='add'>+ * @ah: the &amp;struct ath5k_hw</div><div class='add'>+ * @channel: the currently set channel upon reset</div><div class='add'>+ *</div><div class='add'>+ * Write the OFDM timings for the AR5212 upon reset. This is a helper for</div><div class='add'>+ * ath5k_hw_reset(). This seems to tune the PLL a specified frequency</div><div class='add'>+ * depending on the bandwidth of the channel.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+static inline int ath5k_hw_write_ofdm_timings(struct ath5k_hw *ah,</div><div class='add'>+	struct ieee80211_channel *channel)</div><div class='add'>+{</div><div class='add'>+	/* Get exponent and mantissa and set it */</div><div class='add'>+	u32 coef_scaled, coef_exp, coef_man,</div><div class='add'>+		ds_coef_exp, ds_coef_man, clock;</div><div class='add'>+</div><div class='add'>+	if (!(ah-&gt;ah_version == AR5K_AR5212) ||</div><div class='add'>+		!(channel-&gt;hw_value &amp; CHANNEL_OFDM))</div><div class='add'>+		BUG();</div><div class='add'>+</div><div class='add'>+	/* Seems there are two PLLs, one for baseband sampling and one</div><div class='add'>+	 * for tuning. Tuning basebands are 40 MHz or 80MHz when in</div><div class='add'>+	 * turbo. */</div><div class='add'>+	clock = channel-&gt;hw_value &amp; CHANNEL_TURBO ? 80 : 40;</div><div class='add'>+	coef_scaled = ((5 * (clock &lt;&lt; 24)) / 2) /</div><div class='add'>+	channel-&gt;center_freq;</div><div class='add'>+</div><div class='add'>+	for (coef_exp = 31; coef_exp &gt; 0; coef_exp--)</div><div class='add'>+		if ((coef_scaled &gt;&gt; coef_exp) &amp; 0x1)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+	if (!coef_exp)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	coef_exp = 14 - (coef_exp - 24);</div><div class='add'>+	coef_man = coef_scaled +</div><div class='add'>+		(1 &lt;&lt; (24 - coef_exp - 1));</div><div class='add'>+	ds_coef_man = coef_man &gt;&gt; (24 - coef_exp);</div><div class='add'>+	ds_coef_exp = coef_exp - 16;</div><div class='add'>+</div><div class='add'>+	AR5K_REG_WRITE_BITS(ah, AR5K_PHY_TIMING_3,</div><div class='add'>+		AR5K_PHY_TIMING_3_DSC_MAN, ds_coef_man);</div><div class='add'>+	AR5K_REG_WRITE_BITS(ah, AR5K_PHY_TIMING_3,</div><div class='add'>+		AR5K_PHY_TIMING_3_DSC_EXP, ds_coef_exp);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * index into rates for control rates, we can set it up like this because</div><div class='add'>+ * this is only used for AR5212 and we know it supports G mode</div><div class='add'>+ */</div><div class='add'>+static int control_rates[] =</div><div class='add'>+	{ 0, 1, 1, 1, 4, 4, 6, 6, 8, 8, 8, 8 };</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_write_rate_duration - set rate duration during hw resets</div><div class='add'>+ *</div><div class='add'>+ * @ah: the &amp;struct ath5k_hw</div><div class='add'>+ * @mode: one of enum ath5k_driver_mode</div><div class='add'>+ *</div><div class='add'>+ * Write the rate duration table upon hw reset. This is a helper for</div><div class='add'>+ * ath5k_hw_reset(). It seems all this is doing is setting an ACK timeout for</div><div class='add'>+ * the hardware for the current mode for each rate. The rates which are capable</div><div class='add'>+ * of short preamble (802.11b rates 2Mbps, 5.5Mbps, and 11Mbps) have another</div><div class='add'>+ * register for the short preamble ACK timeout calculation.</div><div class='add'>+ */</div><div class='add'>+static inline void ath5k_hw_write_rate_duration(struct ath5k_hw *ah,</div><div class='add'>+       unsigned int mode)</div><div class='add'>+{</div><div class='add'>+	struct ath5k_softc *sc = ah-&gt;ah_sc;</div><div class='add'>+	struct ieee80211_rate *rate;</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	/* Write rate duration table */</div><div class='add'>+	for (i = 0; i &lt; sc-&gt;sbands[IEEE80211_BAND_2GHZ].n_bitrates; i++) {</div><div class='add'>+		u32 reg;</div><div class='add'>+		u16 tx_time;</div><div class='add'>+</div><div class='add'>+		rate = &amp;sc-&gt;sbands[IEEE80211_BAND_2GHZ].bitrates[control_rates[i]];</div><div class='add'>+</div><div class='add'>+		/* Set ACK timeout */</div><div class='add'>+		reg = AR5K_RATE_DUR(rate-&gt;hw_value);</div><div class='add'>+</div><div class='add'>+		/* An ACK frame consists of 10 bytes. If you add the FCS,</div><div class='add'>+		 * which ieee80211_generic_frame_duration() adds,</div><div class='add'>+		 * its 14 bytes. Note we use the control rate and not the</div><div class='add'>+		 * actual rate for this rate. See mac80211 tx.c</div><div class='add'>+		 * ieee80211_duration() for a brief description of</div><div class='add'>+		 * what rate we should choose to TX ACKs. */</div><div class='add'>+		tx_time = le16_to_cpu(ieee80211_generic_frame_duration(sc-&gt;hw,</div><div class='add'>+							sc-&gt;vif, 10, rate));</div><div class='add'>+</div><div class='add'>+		ath5k_hw_reg_write(ah, tx_time, reg);</div><div class='add'>+</div><div class='add'>+		if (!(rate-&gt;flags &amp; IEEE80211_RATE_SHORT_PREAMBLE))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * We're not distinguishing short preamble here,</div><div class='add'>+		 * This is true, all we'll get is a longer value here</div><div class='add'>+		 * which is not necessarilly bad. We could use</div><div class='add'>+		 * export ieee80211_frame_duration() but that needs to be</div><div class='add'>+		 * fixed first to be properly used by mac802111 drivers:</div><div class='add'>+		 *</div><div class='add'>+		 *  - remove erp stuff and let the routine figure ofdm</div><div class='add'>+		 *    erp rates</div><div class='add'>+		 *  - remove passing argument ieee80211_local as</div><div class='add'>+		 *    drivers don't have access to it</div><div class='add'>+		 *  - move drivers using ieee80211_generic_frame_duration()</div><div class='add'>+		 *    to this</div><div class='add'>+		 */</div><div class='add'>+		ath5k_hw_reg_write(ah, tx_time,</div><div class='add'>+			reg + (AR5K_SET_SHORT_PREAMBLE &lt;&lt; 2));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Reset chipset</div><div class='add'>+ */</div><div class='add'>+static int ath5k_hw_nic_reset(struct ath5k_hw *ah, u32 val)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u32 mask = val ? val : ~0U;</div><div class='add'>+</div><div class='add'>+	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='add'>+</div><div class='add'>+	/* Read-and-clear RX Descriptor Pointer*/</div><div class='add'>+	ath5k_hw_reg_read(ah, AR5K_RXDP);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Reset the device and wait until success</div><div class='add'>+	 */</div><div class='add'>+	ath5k_hw_reg_write(ah, val, AR5K_RESET_CTL);</div><div class='add'>+</div><div class='add'>+	/* Wait at least 128 PCI clocks */</div><div class='add'>+	udelay(15);</div><div class='add'>+</div><div class='add'>+	if (ah-&gt;ah_version == AR5K_AR5210) {</div><div class='add'>+		val &amp;= AR5K_RESET_CTL_PCU | AR5K_RESET_CTL_DMA</div><div class='add'>+			| AR5K_RESET_CTL_MAC | AR5K_RESET_CTL_PHY;</div><div class='add'>+		mask &amp;= AR5K_RESET_CTL_PCU | AR5K_RESET_CTL_DMA</div><div class='add'>+			| AR5K_RESET_CTL_MAC | AR5K_RESET_CTL_PHY;</div><div class='add'>+	} else {</div><div class='add'>+		val &amp;= AR5K_RESET_CTL_PCU | AR5K_RESET_CTL_BASEBAND;</div><div class='add'>+		mask &amp;= AR5K_RESET_CTL_PCU | AR5K_RESET_CTL_BASEBAND;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath5k_hw_register_timeout(ah, AR5K_RESET_CTL, mask, val, false);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Reset configuration register (for hw byte-swap). Note that this</div><div class='add'>+	 * is only set for big endian. We do the necessary magic in</div><div class='add'>+	 * AR5K_INIT_CFG.</div><div class='add'>+	 */</div><div class='add'>+	if ((val &amp; AR5K_RESET_CTL_PCU) == 0)</div><div class='add'>+		ath5k_hw_reg_write(ah, AR5K_INIT_CFG, AR5K_CFG);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Sleep control</div><div class='add'>+ */</div><div class='add'>+int ath5k_hw_set_power(struct ath5k_hw *ah, enum ath5k_power_mode mode,</div><div class='add'>+		bool set_chip, u16 sleep_duration)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+	u32 staid, data;</div><div class='add'>+</div><div class='add'>+	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='add'>+	staid = ath5k_hw_reg_read(ah, AR5K_STA_ID1);</div><div class='add'>+</div><div class='add'>+	switch (mode) {</div><div class='add'>+	case AR5K_PM_AUTO:</div><div class='add'>+		staid &amp;= ~AR5K_STA_ID1_DEFAULT_ANTENNA;</div><div class='add'>+		/* fallthrough */</div><div class='add'>+	case AR5K_PM_NETWORK_SLEEP:</div><div class='add'>+		if (set_chip)</div><div class='add'>+			ath5k_hw_reg_write(ah,</div><div class='add'>+				AR5K_SLEEP_CTL_SLE_ALLOW |</div><div class='add'>+				sleep_duration,</div><div class='add'>+				AR5K_SLEEP_CTL);</div><div class='add'>+</div><div class='add'>+		staid |= AR5K_STA_ID1_PWR_SV;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case AR5K_PM_FULL_SLEEP:</div><div class='add'>+		if (set_chip)</div><div class='add'>+			ath5k_hw_reg_write(ah, AR5K_SLEEP_CTL_SLE_SLP,</div><div class='add'>+				AR5K_SLEEP_CTL);</div><div class='add'>+</div><div class='add'>+		staid |= AR5K_STA_ID1_PWR_SV;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case AR5K_PM_AWAKE:</div><div class='add'>+</div><div class='add'>+		staid &amp;= ~AR5K_STA_ID1_PWR_SV;</div><div class='add'>+</div><div class='add'>+		if (!set_chip)</div><div class='add'>+			goto commit;</div><div class='add'>+</div><div class='add'>+		/* Preserve sleep duration */</div><div class='add'>+		data = ath5k_hw_reg_read(ah, AR5K_SLEEP_CTL);</div><div class='add'>+		if (data &amp; 0xffc00000)</div><div class='add'>+			data = 0;</div><div class='add'>+		else</div><div class='add'>+			data = data &amp; 0xfffcffff;</div><div class='add'>+</div><div class='add'>+		ath5k_hw_reg_write(ah, data, AR5K_SLEEP_CTL);</div><div class='add'>+		udelay(15);</div><div class='add'>+</div><div class='add'>+		for (i = 50; i &gt; 0; i--) {</div><div class='add'>+			/* Check if the chip did wake up */</div><div class='add'>+			if ((ath5k_hw_reg_read(ah, AR5K_PCICFG) &amp;</div><div class='add'>+					AR5K_PCICFG_SPWR_DN) == 0)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			/* Wait a bit and retry */</div><div class='add'>+			udelay(200);</div><div class='add'>+			ath5k_hw_reg_write(ah, data, AR5K_SLEEP_CTL);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Fail if the chip didn't wake up */</div><div class='add'>+		if (i &lt;= 0)</div><div class='add'>+			return -EIO;</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+commit:</div><div class='add'>+	ah-&gt;ah_power_mode = mode;</div><div class='add'>+	ath5k_hw_reg_write(ah, staid, AR5K_STA_ID1);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Bring up MAC + PHY Chips</div><div class='add'>+ */</div><div class='add'>+int ath5k_hw_nic_wakeup(struct ath5k_hw *ah, int flags, bool initial)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pdev = ah-&gt;ah_sc-&gt;pdev;</div><div class='add'>+	u32 turbo, mode, clock, bus_flags;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	turbo = 0;</div><div class='add'>+	mode = 0;</div><div class='add'>+	clock = 0;</div><div class='add'>+</div><div class='add'>+	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='add'>+</div><div class='add'>+	/* Wakeup the device */</div><div class='add'>+	ret = ath5k_hw_set_power(ah, AR5K_PM_AWAKE, true, 0);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ATH5K_ERR(ah-&gt;ah_sc, "failed to wakeup the MAC Chip\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ah-&gt;ah_version != AR5K_AR5210) {</div><div class='add'>+		/*</div><div class='add'>+		 * Get channel mode flags</div><div class='add'>+		 */</div><div class='add'>+</div><div class='add'>+		if (ah-&gt;ah_radio &gt;= AR5K_RF5112) {</div><div class='add'>+			mode = AR5K_PHY_MODE_RAD_RF5112;</div><div class='add'>+			clock = AR5K_PHY_PLL_RF5112;</div><div class='add'>+		} else {</div><div class='add'>+			mode = AR5K_PHY_MODE_RAD_RF5111;	/*Zero*/</div><div class='add'>+			clock = AR5K_PHY_PLL_RF5111;		/*Zero*/</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (flags &amp; CHANNEL_2GHZ) {</div><div class='add'>+			mode |= AR5K_PHY_MODE_FREQ_2GHZ;</div><div class='add'>+			clock |= AR5K_PHY_PLL_44MHZ;</div><div class='add'>+</div><div class='add'>+			if (flags &amp; CHANNEL_CCK) {</div><div class='add'>+				mode |= AR5K_PHY_MODE_MOD_CCK;</div><div class='add'>+			} else if (flags &amp; CHANNEL_OFDM) {</div><div class='add'>+				/* XXX Dynamic OFDM/CCK is not supported by the</div><div class='add'>+				 * AR5211 so we set MOD_OFDM for plain g (no</div><div class='add'>+				 * CCK headers) operation. We need to test</div><div class='add'>+				 * this, 5211 might support ofdm-only g after</div><div class='add'>+				 * all, there are also initial register values</div><div class='add'>+				 * in the code for g mode (see initvals.c). */</div><div class='add'>+				if (ah-&gt;ah_version == AR5K_AR5211)</div><div class='add'>+					mode |= AR5K_PHY_MODE_MOD_OFDM;</div><div class='add'>+				else</div><div class='add'>+					mode |= AR5K_PHY_MODE_MOD_DYN;</div><div class='add'>+			} else {</div><div class='add'>+				ATH5K_ERR(ah-&gt;ah_sc,</div><div class='add'>+					"invalid radio modulation mode\n");</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			}</div><div class='add'>+		} else if (flags &amp; CHANNEL_5GHZ) {</div><div class='add'>+			mode |= AR5K_PHY_MODE_FREQ_5GHZ;</div><div class='add'>+			clock |= AR5K_PHY_PLL_40MHZ;</div><div class='add'>+</div><div class='add'>+			if (flags &amp; CHANNEL_OFDM)</div><div class='add'>+				mode |= AR5K_PHY_MODE_MOD_OFDM;</div><div class='add'>+			else {</div><div class='add'>+				ATH5K_ERR(ah-&gt;ah_sc,</div><div class='add'>+					"invalid radio modulation mode\n");</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			ATH5K_ERR(ah-&gt;ah_sc, "invalid radio frequency mode\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (flags &amp; CHANNEL_TURBO)</div><div class='add'>+			turbo = AR5K_PHY_TURBO_MODE | AR5K_PHY_TURBO_SHORT;</div><div class='add'>+	} else { /* Reset the device */</div><div class='add'>+</div><div class='add'>+		/* ...enable Atheros turbo mode if requested */</div><div class='add'>+		if (flags &amp; CHANNEL_TURBO)</div><div class='add'>+			ath5k_hw_reg_write(ah, AR5K_PHY_TURBO_MODE,</div><div class='add'>+					AR5K_PHY_TURBO);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* reseting PCI on PCI-E cards results card to hang</div><div class='add'>+	 * and always return 0xffff... so we ingore that flag</div><div class='add'>+	 * for PCI-E cards */</div><div class='add'>+	bus_flags = (pdev-&gt;is_pcie) ? 0 : AR5K_RESET_CTL_PCI;</div><div class='add'>+</div><div class='add'>+	/* Reset chipset */</div><div class='add'>+	if (ah-&gt;ah_version == AR5K_AR5210) {</div><div class='add'>+		ret = ath5k_hw_nic_reset(ah, AR5K_RESET_CTL_PCU |</div><div class='add'>+			AR5K_RESET_CTL_MAC | AR5K_RESET_CTL_DMA |</div><div class='add'>+			AR5K_RESET_CTL_PHY | AR5K_RESET_CTL_PCI);</div><div class='add'>+			mdelay(2);</div><div class='add'>+	} else {</div><div class='add'>+		ret = ath5k_hw_nic_reset(ah, AR5K_RESET_CTL_PCU |</div><div class='add'>+			AR5K_RESET_CTL_BASEBAND | bus_flags);</div><div class='add'>+	}</div><div class='add'>+	if (ret) {</div><div class='add'>+		ATH5K_ERR(ah-&gt;ah_sc, "failed to reset the MAC Chip\n");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* ...wakeup again!*/</div><div class='add'>+	ret = ath5k_hw_set_power(ah, AR5K_PM_AWAKE, true, 0);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ATH5K_ERR(ah-&gt;ah_sc, "failed to resume the MAC Chip\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* ...final warm reset */</div><div class='add'>+	if (ath5k_hw_nic_reset(ah, 0)) {</div><div class='add'>+		ATH5K_ERR(ah-&gt;ah_sc, "failed to warm reset the MAC Chip\n");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ah-&gt;ah_version != AR5K_AR5210) {</div><div class='add'>+		/* ...set the PHY operating mode */</div><div class='add'>+		ath5k_hw_reg_write(ah, clock, AR5K_PHY_PLL);</div><div class='add'>+		udelay(300);</div><div class='add'>+</div><div class='add'>+		ath5k_hw_reg_write(ah, mode, AR5K_PHY_MODE);</div><div class='add'>+		ath5k_hw_reg_write(ah, turbo, AR5K_PHY_TURBO);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Main reset function</div><div class='add'>+ */</div><div class='add'>+int ath5k_hw_reset(struct ath5k_hw *ah, enum nl80211_iftype op_mode,</div><div class='add'>+	struct ieee80211_channel *channel, bool change_channel)</div><div class='add'>+{</div><div class='add'>+	struct ath5k_eeprom_info *ee = &amp;ah-&gt;ah_capabilities.cap_eeprom;</div><div class='add'>+	struct pci_dev *pdev = ah-&gt;ah_sc-&gt;pdev;</div><div class='add'>+	u32 data, s_seq, s_ant, s_led[3], dma_size;</div><div class='add'>+	unsigned int i, mode, freq, ee_mode, ant[2];</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='add'>+</div><div class='add'>+	s_seq = 0;</div><div class='add'>+	s_ant = 0;</div><div class='add'>+	ee_mode = 0;</div><div class='add'>+	freq = 0;</div><div class='add'>+	mode = 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Save some registers before a reset</div><div class='add'>+	 */</div><div class='add'>+	/*DCU/Antenna selection not available on 5210*/</div><div class='add'>+	if (ah-&gt;ah_version != AR5K_AR5210) {</div><div class='add'>+		if (change_channel) {</div><div class='add'>+			/* Seq number for queue 0 -do this for all queues ? */</div><div class='add'>+			s_seq = ath5k_hw_reg_read(ah,</div><div class='add'>+					AR5K_QUEUE_DFS_SEQNUM(0));</div><div class='add'>+			/*Default antenna*/</div><div class='add'>+			s_ant = ath5k_hw_reg_read(ah, AR5K_DEFAULT_ANTENNA);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*GPIOs*/</div><div class='add'>+	s_led[0] = ath5k_hw_reg_read(ah, AR5K_PCICFG) &amp; AR5K_PCICFG_LEDSTATE;</div><div class='add'>+	s_led[1] = ath5k_hw_reg_read(ah, AR5K_GPIOCR);</div><div class='add'>+	s_led[2] = ath5k_hw_reg_read(ah, AR5K_GPIODO);</div><div class='add'>+</div><div class='add'>+	if (change_channel &amp;&amp; ah-&gt;ah_rf_banks != NULL)</div><div class='add'>+		ath5k_hw_get_rf_gain(ah);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	/*Wakeup the device*/</div><div class='add'>+	ret = ath5k_hw_nic_wakeup(ah, channel-&gt;hw_value, false);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Initialize operating mode</div><div class='add'>+	 */</div><div class='add'>+	ah-&gt;ah_op_mode = op_mode;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * 5111/5112 Settings</div><div class='add'>+	 * 5210 only comes with RF5110</div><div class='add'>+	 */</div><div class='add'>+	if (ah-&gt;ah_version != AR5K_AR5210) {</div><div class='add'>+		if (ah-&gt;ah_radio != AR5K_RF5111 &amp;&amp;</div><div class='add'>+			ah-&gt;ah_radio != AR5K_RF5112 &amp;&amp;</div><div class='add'>+			ah-&gt;ah_radio != AR5K_RF5413 &amp;&amp;</div><div class='add'>+			ah-&gt;ah_radio != AR5K_RF2413 &amp;&amp;</div><div class='add'>+			ah-&gt;ah_radio != AR5K_RF2425) {</div><div class='add'>+			ATH5K_ERR(ah-&gt;ah_sc,</div><div class='add'>+				"invalid phy radio: %u\n", ah-&gt;ah_radio);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		switch (channel-&gt;hw_value &amp; CHANNEL_MODES) {</div><div class='add'>+		case CHANNEL_A:</div><div class='add'>+			mode = AR5K_MODE_11A;</div><div class='add'>+			freq = AR5K_INI_RFGAIN_5GHZ;</div><div class='add'>+			ee_mode = AR5K_EEPROM_MODE_11A;</div><div class='add'>+			break;</div><div class='add'>+		case CHANNEL_G:</div><div class='add'>+			mode = AR5K_MODE_11G;</div><div class='add'>+			freq = AR5K_INI_RFGAIN_2GHZ;</div><div class='add'>+			ee_mode = AR5K_EEPROM_MODE_11G;</div><div class='add'>+			break;</div><div class='add'>+		case CHANNEL_B:</div><div class='add'>+			mode = AR5K_MODE_11B;</div><div class='add'>+			freq = AR5K_INI_RFGAIN_2GHZ;</div><div class='add'>+			ee_mode = AR5K_EEPROM_MODE_11B;</div><div class='add'>+			break;</div><div class='add'>+		case CHANNEL_T:</div><div class='add'>+			mode = AR5K_MODE_11A_TURBO;</div><div class='add'>+			freq = AR5K_INI_RFGAIN_5GHZ;</div><div class='add'>+			ee_mode = AR5K_EEPROM_MODE_11A;</div><div class='add'>+			break;</div><div class='add'>+		/*Is this ok on 5211 too ?*/</div><div class='add'>+		case CHANNEL_TG:</div><div class='add'>+			mode = AR5K_MODE_11G_TURBO;</div><div class='add'>+			freq = AR5K_INI_RFGAIN_2GHZ;</div><div class='add'>+			ee_mode = AR5K_EEPROM_MODE_11G;</div><div class='add'>+			break;</div><div class='add'>+		case CHANNEL_XR:</div><div class='add'>+			if (ah-&gt;ah_version == AR5K_AR5211) {</div><div class='add'>+				ATH5K_ERR(ah-&gt;ah_sc,</div><div class='add'>+					"XR mode not available on 5211");</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			}</div><div class='add'>+			mode = AR5K_MODE_XR;</div><div class='add'>+			freq = AR5K_INI_RFGAIN_5GHZ;</div><div class='add'>+			ee_mode = AR5K_EEPROM_MODE_11A;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			ATH5K_ERR(ah-&gt;ah_sc,</div><div class='add'>+				"invalid channel: %d\n", channel-&gt;center_freq);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* PHY access enable */</div><div class='add'>+		ath5k_hw_reg_write(ah, AR5K_PHY_SHIFT_5GHZ, AR5K_PHY(0));</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath5k_hw_write_initvals(ah, mode, change_channel);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * 5211/5212 Specific</div><div class='add'>+	 */</div><div class='add'>+	if (ah-&gt;ah_version != AR5K_AR5210) {</div><div class='add'>+		/*</div><div class='add'>+		 * Write initial RF gain settings</div><div class='add'>+		 * This should work for both 5111/5112</div><div class='add'>+		 */</div><div class='add'>+		ret = ath5k_hw_rfgain(ah, freq);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		mdelay(1);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Write some more initial register settings</div><div class='add'>+		 */</div><div class='add'>+		if (ah-&gt;ah_version == AR5K_AR5212) {</div><div class='add'>+			ath5k_hw_reg_write(ah, 0x0002a002, 0x982c);</div><div class='add'>+</div><div class='add'>+			if (channel-&gt;hw_value == CHANNEL_G)</div><div class='add'>+				if (ah-&gt;ah_mac_srev &lt; AR5K_SREV_AR2413)</div><div class='add'>+					ath5k_hw_reg_write(ah, 0x00f80d80,</div><div class='add'>+								0x994c);</div><div class='add'>+				else if (ah-&gt;ah_mac_srev &lt; AR5K_SREV_AR5424)</div><div class='add'>+					ath5k_hw_reg_write(ah, 0x00380140,</div><div class='add'>+								0x994c);</div><div class='add'>+				else if (ah-&gt;ah_mac_srev &lt; AR5K_SREV_AR2425)</div><div class='add'>+					ath5k_hw_reg_write(ah, 0x00fc0ec0,</div><div class='add'>+								0x994c);</div><div class='add'>+				else /* 2425 */</div><div class='add'>+					ath5k_hw_reg_write(ah, 0x00fc0fc0,</div><div class='add'>+								0x994c);</div><div class='add'>+			else</div><div class='add'>+				ath5k_hw_reg_write(ah, 0x00000000, 0x994c);</div><div class='add'>+</div><div class='add'>+			/* Some bits are disabled here, we know nothing about</div><div class='add'>+			 * register 0xa228 yet, most of the times this ends up</div><div class='add'>+			 * with a value 0x9b5 -haven't seen any dump with</div><div class='add'>+			 * a different value- */</div><div class='add'>+			/* Got this from decompiling binary HAL */</div><div class='add'>+			data = ath5k_hw_reg_read(ah, 0xa228);</div><div class='add'>+			data &amp;= 0xfffffdff;</div><div class='add'>+			ath5k_hw_reg_write(ah, data, 0xa228);</div><div class='add'>+</div><div class='add'>+			data = ath5k_hw_reg_read(ah, 0xa228);</div><div class='add'>+			data &amp;= 0xfffe03ff;</div><div class='add'>+			ath5k_hw_reg_write(ah, data, 0xa228);</div><div class='add'>+			data = 0;</div><div class='add'>+</div><div class='add'>+			/* Just write 0x9b5 ? */</div><div class='add'>+			/* ath5k_hw_reg_write(ah, 0x000009b5, 0xa228); */</div><div class='add'>+			ath5k_hw_reg_write(ah, 0x0000000f, AR5K_SEQ_MASK);</div><div class='add'>+			ath5k_hw_reg_write(ah, 0x00000000, 0xa254);</div><div class='add'>+			ath5k_hw_reg_write(ah, 0x0000000e, AR5K_PHY_SCAL);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Fix for first revision of the RF5112 RF chipset */</div><div class='add'>+		if (ah-&gt;ah_radio &gt;= AR5K_RF5112 &amp;&amp;</div><div class='add'>+				ah-&gt;ah_radio_5ghz_revision &lt;</div><div class='add'>+				AR5K_SREV_RAD_5112A) {</div><div class='add'>+			ath5k_hw_reg_write(ah, AR5K_PHY_CCKTXCTL_WORLD,</div><div class='add'>+					AR5K_PHY_CCKTXCTL);</div><div class='add'>+			if (channel-&gt;hw_value &amp; CHANNEL_5GHZ)</div><div class='add'>+				data = 0xffb81020;</div><div class='add'>+			else</div><div class='add'>+				data = 0xffb80d20;</div><div class='add'>+			ath5k_hw_reg_write(ah, data, AR5K_PHY_FRAME_CTL);</div><div class='add'>+			data = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Set TX power (FIXME)</div><div class='add'>+		 */</div><div class='add'>+		ret = ath5k_hw_txpower(ah, channel, AR5K_TUNE_DEFAULT_TXPOWER);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		/* Write rate duration table only on AR5212 and if</div><div class='add'>+		 * virtual interface has already been brought up</div><div class='add'>+		 * XXX: rethink this after new mode changes to</div><div class='add'>+		 * mac80211 are integrated */</div><div class='add'>+		if (ah-&gt;ah_version == AR5K_AR5212 &amp;&amp;</div><div class='add'>+			ah-&gt;ah_sc-&gt;vif != NULL)</div><div class='add'>+			ath5k_hw_write_rate_duration(ah, mode);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Write RF registers</div><div class='add'>+		 */</div><div class='add'>+		ret = ath5k_hw_rfregs(ah, channel, mode);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Configure additional registers</div><div class='add'>+		 */</div><div class='add'>+</div><div class='add'>+		/* Write OFDM timings on 5212*/</div><div class='add'>+		if (ah-&gt;ah_version == AR5K_AR5212 &amp;&amp;</div><div class='add'>+			channel-&gt;hw_value &amp; CHANNEL_OFDM) {</div><div class='add'>+			ret = ath5k_hw_write_ofdm_timings(ah, channel);</div><div class='add'>+			if (ret)</div><div class='add'>+				return ret;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*Enable/disable 802.11b mode on 5111</div><div class='add'>+		(enable 2111 frequency converter + CCK)*/</div><div class='add'>+		if (ah-&gt;ah_radio == AR5K_RF5111) {</div><div class='add'>+			if (mode == AR5K_MODE_11B)</div><div class='add'>+				AR5K_REG_ENABLE_BITS(ah, AR5K_TXCFG,</div><div class='add'>+				    AR5K_TXCFG_B_MODE);</div><div class='add'>+			else</div><div class='add'>+				AR5K_REG_DISABLE_BITS(ah, AR5K_TXCFG,</div><div class='add'>+				    AR5K_TXCFG_B_MODE);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Set channel and calibrate the PHY</div><div class='add'>+		 */</div><div class='add'>+		ret = ath5k_hw_channel(ah, channel);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		/* Set antenna mode */</div><div class='add'>+		AR5K_REG_MASKED_BITS(ah, AR5K_PHY_ANT_CTL,</div><div class='add'>+			ah-&gt;ah_antenna[ee_mode][0], 0xfffffc06);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * In case a fixed antenna was set as default</div><div class='add'>+		 * write the same settings on both AR5K_PHY_ANT_SWITCH_TABLE</div><div class='add'>+		 * registers.</div><div class='add'>+		 */</div><div class='add'>+		if (s_ant != 0) {</div><div class='add'>+			if (s_ant == AR5K_ANT_FIXED_A) /* 1 - Main */</div><div class='add'>+				ant[0] = ant[1] = AR5K_ANT_FIXED_A;</div><div class='add'>+			else	/* 2 - Aux */</div><div class='add'>+				ant[0] = ant[1] = AR5K_ANT_FIXED_B;</div><div class='add'>+		} else {</div><div class='add'>+			ant[0] = AR5K_ANT_FIXED_A;</div><div class='add'>+			ant[1] = AR5K_ANT_FIXED_B;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ath5k_hw_reg_write(ah, ah-&gt;ah_antenna[ee_mode][ant[0]],</div><div class='add'>+			AR5K_PHY_ANT_SWITCH_TABLE_0);</div><div class='add'>+		ath5k_hw_reg_write(ah, ah-&gt;ah_antenna[ee_mode][ant[1]],</div><div class='add'>+			AR5K_PHY_ANT_SWITCH_TABLE_1);</div><div class='add'>+</div><div class='add'>+		/* Commit values from EEPROM */</div><div class='add'>+		if (ah-&gt;ah_radio == AR5K_RF5111)</div><div class='add'>+			AR5K_REG_WRITE_BITS(ah, AR5K_PHY_FRAME_CTL,</div><div class='add'>+			    AR5K_PHY_FRAME_CTL_TX_CLIP, ee-&gt;ee_tx_clip);</div><div class='add'>+</div><div class='add'>+		ath5k_hw_reg_write(ah,</div><div class='add'>+			AR5K_PHY_NF_SVAL(ee-&gt;ee_noise_floor_thr[ee_mode]),</div><div class='add'>+			AR5K_PHY_NFTHRES);</div><div class='add'>+</div><div class='add'>+		AR5K_REG_MASKED_BITS(ah, AR5K_PHY_SETTLING,</div><div class='add'>+			(ee-&gt;ee_switch_settling[ee_mode] &lt;&lt; 7) &amp; 0x3f80,</div><div class='add'>+			0xffffc07f);</div><div class='add'>+		AR5K_REG_MASKED_BITS(ah, AR5K_PHY_GAIN,</div><div class='add'>+			(ee-&gt;ee_ant_tx_rx[ee_mode] &lt;&lt; 12) &amp; 0x3f000,</div><div class='add'>+			0xfffc0fff);</div><div class='add'>+		AR5K_REG_MASKED_BITS(ah, AR5K_PHY_DESIRED_SIZE,</div><div class='add'>+			(ee-&gt;ee_adc_desired_size[ee_mode] &amp; 0x00ff) |</div><div class='add'>+			((ee-&gt;ee_pga_desired_size[ee_mode] &lt;&lt; 8) &amp; 0xff00),</div><div class='add'>+			0xffff0000);</div><div class='add'>+</div><div class='add'>+		ath5k_hw_reg_write(ah,</div><div class='add'>+			(ee-&gt;ee_tx_end2xpa_disable[ee_mode] &lt;&lt; 24) |</div><div class='add'>+			(ee-&gt;ee_tx_end2xpa_disable[ee_mode] &lt;&lt; 16) |</div><div class='add'>+			(ee-&gt;ee_tx_frm2xpa_enable[ee_mode] &lt;&lt; 8) |</div><div class='add'>+			(ee-&gt;ee_tx_frm2xpa_enable[ee_mode]), AR5K_PHY_RF_CTL4);</div><div class='add'>+</div><div class='add'>+		AR5K_REG_MASKED_BITS(ah, AR5K_PHY_RF_CTL3,</div><div class='add'>+			ee-&gt;ee_tx_end2xlna_enable[ee_mode] &lt;&lt; 8, 0xffff00ff);</div><div class='add'>+		AR5K_REG_MASKED_BITS(ah, AR5K_PHY_NF,</div><div class='add'>+			(ee-&gt;ee_thr_62[ee_mode] &lt;&lt; 12) &amp; 0x7f000, 0xfff80fff);</div><div class='add'>+		AR5K_REG_MASKED_BITS(ah, AR5K_PHY_OFDM_SELFCORR, 4, 0xffffff01);</div><div class='add'>+</div><div class='add'>+		AR5K_REG_ENABLE_BITS(ah, AR5K_PHY_IQ,</div><div class='add'>+		    AR5K_PHY_IQ_CORR_ENABLE |</div><div class='add'>+		    (ee-&gt;ee_i_cal[ee_mode] &lt;&lt; AR5K_PHY_IQ_CORR_Q_I_COFF_S) |</div><div class='add'>+		    ee-&gt;ee_q_cal[ee_mode]);</div><div class='add'>+</div><div class='add'>+		if (ah-&gt;ah_ee_version &gt;= AR5K_EEPROM_VERSION_4_1)</div><div class='add'>+			AR5K_REG_WRITE_BITS(ah, AR5K_PHY_GAIN_2GHZ,</div><div class='add'>+				AR5K_PHY_GAIN_2GHZ_MARGIN_TXRX,</div><div class='add'>+				ee-&gt;ee_margin_tx_rx[ee_mode]);</div><div class='add'>+</div><div class='add'>+	} else {</div><div class='add'>+		mdelay(1);</div><div class='add'>+		/* Disable phy and wait */</div><div class='add'>+		ath5k_hw_reg_write(ah, AR5K_PHY_ACT_DISABLE, AR5K_PHY_ACT);</div><div class='add'>+		mdelay(1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Restore saved values</div><div class='add'>+	 */</div><div class='add'>+	/*DCU/Antenna selection not available on 5210*/</div><div class='add'>+	if (ah-&gt;ah_version != AR5K_AR5210) {</div><div class='add'>+		ath5k_hw_reg_write(ah, s_seq, AR5K_QUEUE_DFS_SEQNUM(0));</div><div class='add'>+		ath5k_hw_reg_write(ah, s_ant, AR5K_DEFAULT_ANTENNA);</div><div class='add'>+	}</div><div class='add'>+	AR5K_REG_ENABLE_BITS(ah, AR5K_PCICFG, s_led[0]);</div><div class='add'>+	ath5k_hw_reg_write(ah, s_led[1], AR5K_GPIOCR);</div><div class='add'>+	ath5k_hw_reg_write(ah, s_led[2], AR5K_GPIODO);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Misc</div><div class='add'>+	 */</div><div class='add'>+	/* XXX: add ah-&gt;aid once mac80211 gives this to us */</div><div class='add'>+	ath5k_hw_set_associd(ah, ah-&gt;ah_bssid, 0);</div><div class='add'>+</div><div class='add'>+	ath5k_hw_set_opmode(ah);</div><div class='add'>+	/*PISR/SISR Not available on 5210*/</div><div class='add'>+	if (ah-&gt;ah_version != AR5K_AR5210) {</div><div class='add'>+		ath5k_hw_reg_write(ah, 0xffffffff, AR5K_PISR);</div><div class='add'>+		/* If we later allow tuning for this, store into sc structure */</div><div class='add'>+		data = AR5K_TUNE_RSSI_THRES |</div><div class='add'>+			AR5K_TUNE_BMISS_THRES &lt;&lt; AR5K_RSSI_THR_BMISS_S;</div><div class='add'>+		ath5k_hw_reg_write(ah, data, AR5K_RSSI_THR);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Set Rx/Tx DMA Configuration</div><div class='add'>+	 *</div><div class='add'>+	 * Set maximum DMA size (512) except for PCI-E cards since</div><div class='add'>+	 * it causes rx overruns and tx errors (tested on 5424 but since</div><div class='add'>+	 * rx overruns also occur on 5416/5418 with madwifi we set 128</div><div class='add'>+	 * for all PCI-E cards to be safe).</div><div class='add'>+	 *</div><div class='add'>+	 * In dumps this is 128 for allchips.</div><div class='add'>+	 *</div><div class='add'>+	 * XXX: need to check 5210 for this</div><div class='add'>+	 * TODO: Check out tx triger level, it's always 64 on dumps but I</div><div class='add'>+	 * guess we can tweak it and see how it goes ;-)</div><div class='add'>+	 */</div><div class='add'>+	dma_size = (pdev-&gt;is_pcie) ? AR5K_DMASIZE_128B : AR5K_DMASIZE_512B;</div><div class='add'>+	if (ah-&gt;ah_version != AR5K_AR5210) {</div><div class='add'>+		AR5K_REG_WRITE_BITS(ah, AR5K_TXCFG,</div><div class='add'>+			AR5K_TXCFG_SDMAMR, dma_size);</div><div class='add'>+		AR5K_REG_WRITE_BITS(ah, AR5K_RXCFG,</div><div class='add'>+			AR5K_RXCFG_SDMAMW, dma_size);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Enable the PHY and wait until completion</div><div class='add'>+	 */</div><div class='add'>+	ath5k_hw_reg_write(ah, AR5K_PHY_ACT_ENABLE, AR5K_PHY_ACT);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * On 5211+ read activation -&gt; rx delay</div><div class='add'>+	 * and use it.</div><div class='add'>+	 */</div><div class='add'>+	if (ah-&gt;ah_version != AR5K_AR5210) {</div><div class='add'>+		data = ath5k_hw_reg_read(ah, AR5K_PHY_RX_DELAY) &amp;</div><div class='add'>+			AR5K_PHY_RX_DELAY_M;</div><div class='add'>+		data = (channel-&gt;hw_value &amp; CHANNEL_CCK) ?</div><div class='add'>+			((data &lt;&lt; 2) / 22) : (data / 10);</div><div class='add'>+</div><div class='add'>+		udelay(100 + (2 * data));</div><div class='add'>+		data = 0;</div><div class='add'>+	} else {</div><div class='add'>+		mdelay(1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Perform ADC test (?)</div><div class='add'>+	 */</div><div class='add'>+	data = ath5k_hw_reg_read(ah, AR5K_PHY_TST1);</div><div class='add'>+	ath5k_hw_reg_write(ah, AR5K_PHY_TST1_TXHOLD, AR5K_PHY_TST1);</div><div class='add'>+	for (i = 0; i &lt;= 20; i++) {</div><div class='add'>+		if (!(ath5k_hw_reg_read(ah, AR5K_PHY_ADC_TEST) &amp; 0x10))</div><div class='add'>+			break;</div><div class='add'>+		udelay(200);</div><div class='add'>+	}</div><div class='add'>+	ath5k_hw_reg_write(ah, data, AR5K_PHY_TST1);</div><div class='add'>+	data = 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Start automatic gain calibration</div><div class='add'>+	 *</div><div class='add'>+	 * During AGC calibration RX path is re-routed to</div><div class='add'>+	 * a signal detector so we don't receive anything.</div><div class='add'>+	 *</div><div class='add'>+	 * This method is used to calibrate some static offsets</div><div class='add'>+	 * used together with on-the fly I/Q calibration (the</div><div class='add'>+	 * one performed via ath5k_hw_phy_calibrate), that doesn't</div><div class='add'>+	 * interrupt rx path.</div><div class='add'>+	 *</div><div class='add'>+	 * If we are in a noisy environment AGC calibration may time</div><div class='add'>+	 * out.</div><div class='add'>+	 */</div><div class='add'>+	AR5K_REG_ENABLE_BITS(ah, AR5K_PHY_AGCCTL,</div><div class='add'>+				AR5K_PHY_AGCCTL_CAL);</div><div class='add'>+</div><div class='add'>+	/* At the same time start I/Q calibration for QAM constellation</div><div class='add'>+	 * -no need for CCK- */</div><div class='add'>+	ah-&gt;ah_calibration = false;</div><div class='add'>+	if (!(mode == AR5K_MODE_11B)) {</div><div class='add'>+		ah-&gt;ah_calibration = true;</div><div class='add'>+		AR5K_REG_WRITE_BITS(ah, AR5K_PHY_IQ,</div><div class='add'>+				AR5K_PHY_IQ_CAL_NUM_LOG_MAX, 15);</div><div class='add'>+		AR5K_REG_ENABLE_BITS(ah, AR5K_PHY_IQ,</div><div class='add'>+				AR5K_PHY_IQ_RUN);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Wait for gain calibration to finish (we check for I/Q calibration</div><div class='add'>+	 * during ath5k_phy_calibrate) */</div><div class='add'>+	if (ath5k_hw_register_timeout(ah, AR5K_PHY_AGCCTL,</div><div class='add'>+			AR5K_PHY_AGCCTL_CAL, 0, false)) {</div><div class='add'>+		ATH5K_ERR(ah-&gt;ah_sc, "gain calibration timeout (%uMHz)\n",</div><div class='add'>+			channel-&gt;center_freq);</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Start noise floor calibration</div><div class='add'>+	 *</div><div class='add'>+	 * If we run NF calibration before AGC, it always times out.</div><div class='add'>+	 * Binary HAL starts NF and AGC calibration at the same time</div><div class='add'>+	 * and only waits for AGC to finish. I believe that's wrong because</div><div class='add'>+	 * during NF calibration, rx path is also routed to a detector, so if</div><div class='add'>+	 * it doesn't finish we won't have RX.</div><div class='add'>+	 *</div><div class='add'>+	 * XXX: Find an interval that's OK for all cards...</div><div class='add'>+	 */</div><div class='add'>+	ret = ath5k_hw_noise_floor_calibration(ah, channel-&gt;center_freq);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Reset queues and start beacon timers at the end of the reset routine</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; ah-&gt;ah_capabilities.cap_queues.q_tx_num; i++) {</div><div class='add'>+		/*No QCU on 5210*/</div><div class='add'>+		if (ah-&gt;ah_version != AR5K_AR5210)</div><div class='add'>+			AR5K_REG_WRITE_Q(ah, AR5K_QUEUE_QCUMASK(i), i);</div><div class='add'>+</div><div class='add'>+		ret = ath5k_hw_reset_tx_queue(ah, i);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ATH5K_ERR(ah-&gt;ah_sc,</div><div class='add'>+				"failed to reset TX queue #%d\n", i);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Pre-enable interrupts on 5211/5212*/</div><div class='add'>+	if (ah-&gt;ah_version != AR5K_AR5210)</div><div class='add'>+		ath5k_hw_set_imr(ah, AR5K_INT_RX | AR5K_INT_TX |</div><div class='add'>+				AR5K_INT_FATAL);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Set RF kill flags if supported by the device (read from the EEPROM)</div><div class='add'>+	 * Disable gpio_intr for now since it results system hang.</div><div class='add'>+	 * TODO: Handle this in ath5k_intr</div><div class='add'>+	 */</div><div class='add'>+#if 0</div><div class='add'>+	if (AR5K_EEPROM_HDR_RFKILL(ah-&gt;ah_capabilities.cap_eeprom.ee_header)) {</div><div class='add'>+		ath5k_hw_set_gpio_input(ah, 0);</div><div class='add'>+		ah-&gt;ah_gpio[0] = ath5k_hw_get_gpio(ah, 0);</div><div class='add'>+		if (ah-&gt;ah_gpio[0] == 0)</div><div class='add'>+			ath5k_hw_set_gpio_intr(ah, 0, 1);</div><div class='add'>+		else</div><div class='add'>+			ath5k_hw_set_gpio_intr(ah, 0, 0);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Set the 32MHz reference clock on 5212 phy clock sleep register</div><div class='add'>+	 *</div><div class='add'>+	 * TODO: Find out how to switch to external 32Khz clock to save power</div><div class='add'>+	 */</div><div class='add'>+	if (ah-&gt;ah_version == AR5K_AR5212) {</div><div class='add'>+		ath5k_hw_reg_write(ah, AR5K_PHY_SCR_32MHZ, AR5K_PHY_SCR);</div><div class='add'>+		ath5k_hw_reg_write(ah, AR5K_PHY_SLMT_32MHZ, AR5K_PHY_SLMT);</div><div class='add'>+		ath5k_hw_reg_write(ah, AR5K_PHY_SCAL_32MHZ, AR5K_PHY_SCAL);</div><div class='add'>+		ath5k_hw_reg_write(ah, AR5K_PHY_SCLOCK_32MHZ, AR5K_PHY_SCLOCK);</div><div class='add'>+		ath5k_hw_reg_write(ah, AR5K_PHY_SDELAY_32MHZ, AR5K_PHY_SDELAY);</div><div class='add'>+		ath5k_hw_reg_write(ah, ah-&gt;ah_phy_spending, AR5K_PHY_SPENDING);</div><div class='add'>+</div><div class='add'>+		data = ath5k_hw_reg_read(ah, AR5K_USEC_5211) &amp; 0xffffc07f ;</div><div class='add'>+		data |= (ah-&gt;ah_phy_spending == AR5K_PHY_SPENDING_18) ?</div><div class='add'>+						0x00000f80 : 0x00001380 ;</div><div class='add'>+		ath5k_hw_reg_write(ah, data, AR5K_USEC_5211);</div><div class='add'>+		data = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ah-&gt;ah_version == AR5K_AR5212) {</div><div class='add'>+		ath5k_hw_reg_write(ah, 0x000100aa, 0x8118);</div><div class='add'>+		ath5k_hw_reg_write(ah, 0x00003210, 0x811c);</div><div class='add'>+		ath5k_hw_reg_write(ah, 0x00000052, 0x8108);</div><div class='add'>+		if (ah-&gt;ah_mac_srev &gt;= AR5K_SREV_AR2413)</div><div class='add'>+			ath5k_hw_reg_write(ah, 0x00000004, 0x8120);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Disable beacons and reset the register</div><div class='add'>+	 */</div><div class='add'>+	AR5K_REG_DISABLE_BITS(ah, AR5K_BEACON, AR5K_BEACON_ENABLE |</div><div class='add'>+			AR5K_BEACON_RESET_TSF);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#undef _ATH5K_RESET</div><div class='head'>diff --git a/drivers/net/wireless/ath9k/Kconfig b/drivers/net/wireless/ath9k/Kconfig<br/>index 9e19dcceb3a2..80a692430413 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/ath9k/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/ath9k/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/ath9k/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/ath9k/Kconfig</a></div><div class='hunk'>@@ -1,6 +1,9 @@</div><div class='ctx'> config ATH9K</div><div class='ctx'> 	tristate "Atheros 802.11n wireless cards support"</div><div class='ctx'> 	depends on PCI &amp;&amp; MAC80211 &amp;&amp; WLAN_80211</div><div class='add'>+	select MAC80211_LEDS</div><div class='add'>+	select LEDS_CLASS</div><div class='add'>+	select NEW_LEDS</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  This module adds support for wireless adapters based on</div><div class='ctx'> 	  Atheros IEEE 802.11n AR5008 and AR9001 family of chipsets.</div><div class='head'>diff --git a/drivers/net/wireless/ath9k/ath9k.h b/drivers/net/wireless/ath9k/ath9k.h<br/>index d1b0fbae5a32..accace5f7efb 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/ath9k/ath9k.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/ath9k/ath9k.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/ath9k/ath9k.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/ath9k/ath9k.h</a></div><div class='hunk'>@@ -144,6 +144,7 @@ struct ath_desc {</div><div class='ctx'> #define ATH9K_TXDESC_EXT_AND_CTL	0x0080</div><div class='ctx'> #define ATH9K_TXDESC_VMF		0x0100</div><div class='ctx'> #define ATH9K_TXDESC_FRAG_IS_ON 	0x0200</div><div class='add'>+#define ATH9K_TXDESC_CAB		0x0400</div><div class='ctx'> </div><div class='ctx'> #define ATH9K_RXDESC_INTREQ		0x0020</div><div class='ctx'> </div><div class='hunk'>@@ -564,8 +565,6 @@ enum ath9k_cipher {</div><div class='ctx'> #define CTL_5GHT40              8</div><div class='ctx'> </div><div class='ctx'> #define AR_EEPROM_MAC(i)        (0x1d+(i))</div><div class='del'>-#define EEP_SCALE       100</div><div class='del'>-#define EEP_DELTA       10</div><div class='ctx'> </div><div class='ctx'> #define AR_EEPROM_RFSILENT_GPIO_SEL     0x001c</div><div class='ctx'> #define AR_EEPROM_RFSILENT_GPIO_SEL_S   2</div><div class='hunk'>@@ -606,9 +605,6 @@ struct ath9k_country_entry {</div><div class='ctx'> #define REG_CLR_BIT(_a, _r, _f) \</div><div class='ctx'> 	REG_WRITE(_a, _r, REG_READ(_a, _r) &amp; ~_f)</div><div class='ctx'> </div><div class='del'>-#define ATH9K_COMP_BUF_MAX_SIZE   9216</div><div class='del'>-#define ATH9K_COMP_BUF_ALIGN_SIZE 512</div><div class='del'>-</div><div class='ctx'> #define ATH9K_TXQ_USE_LOCKOUT_BKOFF_DIS   0x00000001</div><div class='ctx'> </div><div class='ctx'> #define INIT_AIFS       2</div><div class='hunk'>@@ -632,12 +628,6 @@ struct ath9k_country_entry {</div><div class='ctx'> 				 (IEEE80211_WEP_IVLEN +		\</div><div class='ctx'> 				  IEEE80211_WEP_KIDLEN +	\</div><div class='ctx'> 				  IEEE80211_WEP_CRCLEN))</div><div class='del'>-#define IEEE80211_MAX_LEN       (2300 + FCS_LEN +		\</div><div class='del'>-				 (IEEE80211_WEP_IVLEN +		\</div><div class='del'>-				  IEEE80211_WEP_KIDLEN +	\</div><div class='del'>-				  IEEE80211_WEP_CRCLEN))</div><div class='del'>-</div><div class='del'>-#define MAX_REG_ADD_COUNT   129</div><div class='ctx'> #define MAX_RATE_POWER 63</div><div class='ctx'> </div><div class='ctx'> enum ath9k_power_mode {</div><div class='hunk'>@@ -707,13 +697,6 @@ enum phytype {</div><div class='ctx'> };</div><div class='ctx'> #define PHY_CCK PHY_DS</div><div class='ctx'> </div><div class='del'>-enum start_adhoc_option {</div><div class='del'>-	START_ADHOC_NO_11A,</div><div class='del'>-	START_ADHOC_PER_11D,</div><div class='del'>-	START_ADHOC_IN_11A,</div><div class='del'>-	START_ADHOC_IN_11B,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> enum ath9k_tp_scale {</div><div class='ctx'> 	ATH9K_TP_SCALE_MAX = 0,</div><div class='ctx'> 	ATH9K_TP_SCALE_50,</div><div class='hunk'>@@ -769,14 +752,11 @@ struct ath9k_node_stats {</div><div class='ctx'> </div><div class='ctx'> #define ATH9K_RSSI_EP_MULTIPLIER  (1&lt;&lt;7)</div><div class='ctx'> </div><div class='del'>-enum ath9k_gpio_output_mux_type {</div><div class='del'>-	ATH9K_GPIO_OUTPUT_MUX_AS_OUTPUT,</div><div class='del'>-	ATH9K_GPIO_OUTPUT_MUX_AS_PCIE_ATTENTION_LED,</div><div class='del'>-	ATH9K_GPIO_OUTPUT_MUX_AS_PCIE_POWER_LED,</div><div class='del'>-	ATH9K_GPIO_OUTPUT_MUX_AS_MAC_NETWORK_LED,</div><div class='del'>-	ATH9K_GPIO_OUTPUT_MUX_AS_MAC_POWER_LED,</div><div class='del'>-	ATH9K_GPIO_OUTPUT_MUX_NUM_ENTRIES</div><div class='del'>-};</div><div class='add'>+#define AR_GPIO_OUTPUT_MUX_AS_OUTPUT             0</div><div class='add'>+#define AR_GPIO_OUTPUT_MUX_AS_PCIE_ATTENTION_LED 1</div><div class='add'>+#define AR_GPIO_OUTPUT_MUX_AS_PCIE_POWER_LED     2</div><div class='add'>+#define AR_GPIO_OUTPUT_MUX_AS_MAC_NETWORK_LED    5</div><div class='add'>+#define AR_GPIO_OUTPUT_MUX_AS_MAC_POWER_LED      6</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='ctx'> 	ATH9K_RESET_POWER_ON,</div><div class='hunk'>@@ -790,19 +770,20 @@ struct ath_hal {</div><div class='ctx'> 	u32 ah_magic;</div><div class='ctx'> 	u16 ah_devid;</div><div class='ctx'> 	u16 ah_subvendorid;</div><div class='del'>-	struct ath_softc *ah_sc;</div><div class='del'>-	void __iomem *ah_sh;</div><div class='del'>-	u16 ah_countryCode;</div><div class='ctx'> 	u32 ah_macVersion;</div><div class='ctx'> 	u16 ah_macRev;</div><div class='ctx'> 	u16 ah_phyRev;</div><div class='ctx'> 	u16 ah_analog5GhzRev;</div><div class='ctx'> 	u16 ah_analog2GhzRev;</div><div class='del'>-	u8 ah_decompMask[ATH9K_DECOMP_MASK_SIZE];</div><div class='del'>-	u32 ah_flags;</div><div class='add'>+</div><div class='add'>+	void __iomem *ah_sh;</div><div class='add'>+	struct ath_softc *ah_sc;</div><div class='ctx'> 	enum ath9k_opmode ah_opmode;</div><div class='ctx'> 	struct ath9k_ops_config ah_config;</div><div class='ctx'> 	struct ath9k_hw_capabilities ah_caps;</div><div class='add'>+</div><div class='add'>+	u16 ah_countryCode;</div><div class='add'>+	u32 ah_flags;</div><div class='ctx'> 	int16_t ah_powerLimit;</div><div class='ctx'> 	u16 ah_maxPowerLevel;</div><div class='ctx'> 	u32 ah_tpScale;</div><div class='hunk'>@@ -812,15 +793,17 @@ struct ath_hal {</div><div class='ctx'> 	u16 ah_currentRD5G;</div><div class='ctx'> 	u16 ah_currentRD2G;</div><div class='ctx'> 	char ah_iso[4];</div><div class='del'>-	enum start_adhoc_option ah_adHocMode;</div><div class='del'>-	bool ah_commonMode;</div><div class='add'>+</div><div class='ctx'> 	struct ath9k_channel ah_channels[150];</div><div class='del'>-	u32 ah_nchan;</div><div class='ctx'> 	struct ath9k_channel *ah_curchan;</div><div class='del'>-	u16 ah_rfsilent;</div><div class='del'>-	bool ah_rfkillEnabled;</div><div class='add'>+	u32 ah_nchan;</div><div class='add'>+</div><div class='ctx'> 	bool ah_isPciExpress;</div><div class='ctx'> 	u16 ah_txTrigLevel;</div><div class='add'>+	u16 ah_rfsilent;</div><div class='add'>+	u32 ah_rfkill_gpio;</div><div class='add'>+	u32 ah_rfkill_polarity;</div><div class='add'>+</div><div class='ctx'> #ifndef ATH_NF_PER_CHAN</div><div class='ctx'> 	struct ath9k_nfcal_hist nfCalHist[NUM_NF_READINGS];</div><div class='ctx'> #endif</div><div class='hunk'>@@ -853,7 +836,7 @@ bool ath9k_regd_init_channels(struct ath_hal *ah,</div><div class='ctx'> u32 ath9k_hw_mhz2ieee(struct ath_hal *ah, u32 freq, u32 flags);</div><div class='ctx'> enum ath9k_int ath9k_hw_set_interrupts(struct ath_hal *ah,</div><div class='ctx'> 				     enum ath9k_int ints);</div><div class='del'>-bool ath9k_hw_reset(struct ath_hal *ah, enum ath9k_opmode opmode,</div><div class='add'>+bool ath9k_hw_reset(struct ath_hal *ah,</div><div class='ctx'> 		    struct ath9k_channel *chan,</div><div class='ctx'> 		    enum ath9k_ht_macmode macmode,</div><div class='ctx'> 		    u8 txchainmask, u8 rxchainmask,</div><div class='hunk'>@@ -871,7 +854,7 @@ bool ath9k_hw_calibrate(struct ath_hal *ah,</div><div class='ctx'> 			u8 rxchainmask,</div><div class='ctx'> 			bool longcal,</div><div class='ctx'> 			bool *isCalDone);</div><div class='del'>-int16_t ath9k_hw_getchan_noise(struct ath_hal *ah,</div><div class='add'>+s16 ath9k_hw_getchan_noise(struct ath_hal *ah,</div><div class='ctx'> 			       struct ath9k_channel *chan);</div><div class='ctx'> void ath9k_hw_write_associd(struct ath_hal *ah, const u8 *bssid,</div><div class='ctx'> 			    u16 assocId);</div><div class='hunk'>@@ -1018,4 +1001,9 @@ void ath9k_hw_get_channel_centers(struct ath_hal *ah,</div><div class='ctx'> bool ath9k_get_channel_edges(struct ath_hal *ah,</div><div class='ctx'> 			     u16 flags, u16 *low,</div><div class='ctx'> 			     u16 *high);</div><div class='add'>+void ath9k_hw_cfg_output(struct ath_hal *ah, u32 gpio,</div><div class='add'>+			u32 ah_signal_type);</div><div class='add'>+void ath9k_hw_set_gpio(struct ath_hal *ah, u32 gpio, u32 value);</div><div class='add'>+u32 ath9k_hw_gpio_get(struct ath_hal *ah, u32 gpio);</div><div class='add'>+void ath9k_hw_cfg_gpio_input(struct ath_hal *ah, u32 gpio);</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/wireless/ath9k/beacon.c b/drivers/net/wireless/ath9k/beacon.c<br/>index 00a0eaa08866..9e15c30bbc06 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/ath9k/beacon.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/ath9k/beacon.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/ath9k/beacon.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/ath9k/beacon.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'> </div><div class='ctx'>  /* Implementation of beacon processing. */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='ctx'> #include "core.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -26,14 +25,13 @@</div><div class='ctx'>  *  the operating mode of the station (AP or AdHoc).  Parameters are AIFS</div><div class='ctx'>  *  settings and channel width min/max</div><div class='ctx'> */</div><div class='del'>-</div><div class='ctx'> static int ath_beaconq_config(struct ath_softc *sc)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_hal *ah = sc-&gt;sc_ah;</div><div class='ctx'> 	struct ath9k_tx_queue_info qi;</div><div class='ctx'> </div><div class='ctx'> 	ath9k_hw_get_txq_props(ah, sc-&gt;sc_bhalq, &amp;qi);</div><div class='del'>-	if (sc-&gt;sc_opmode == ATH9K_M_HOSTAP) {</div><div class='add'>+	if (sc-&gt;sc_ah-&gt;ah_opmode == ATH9K_M_HOSTAP) {</div><div class='ctx'> 		/* Always burst out beacon and CAB traffic. */</div><div class='ctx'> 		qi.tqi_aifs = 1;</div><div class='ctx'> 		qi.tqi_cwmin = 0;</div><div class='hunk'>@@ -63,19 +61,18 @@ static int ath_beaconq_config(struct ath_softc *sc)</div><div class='ctx'>  *  up all required antenna switch parameters, rate codes, and channel flags.</div><div class='ctx'>  *  Beacons are always sent out at the lowest rate, and are not retried.</div><div class='ctx'> */</div><div class='del'>-</div><div class='ctx'> static void ath_beacon_setup(struct ath_softc *sc,</div><div class='del'>-	struct ath_vap *avp, struct ath_buf *bf)</div><div class='add'>+			     struct ath_vap *avp, struct ath_buf *bf)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb = (struct sk_buff *)bf-&gt;bf_mpdu;</div><div class='ctx'> 	struct ath_hal *ah = sc-&gt;sc_ah;</div><div class='ctx'> 	struct ath_desc *ds;</div><div class='del'>-	int flags, antenna;</div><div class='add'>+	struct ath9k_11n_rate_series series[4];</div><div class='ctx'> 	const struct ath9k_rate_table *rt;</div><div class='add'>+	int flags, antenna;</div><div class='ctx'> 	u8 rix, rate;</div><div class='ctx'> 	int ctsrate = 0;</div><div class='ctx'> 	int ctsduration = 0;</div><div class='del'>-	struct ath9k_11n_rate_series  series[4];</div><div class='ctx'> </div><div class='ctx'> 	DPRINTF(sc, ATH_DBG_BEACON, "%s: m %p len %u\n",</div><div class='ctx'> 		__func__, skb, skb-&gt;len);</div><div class='hunk'>@@ -85,7 +82,7 @@ static void ath_beacon_setup(struct ath_softc *sc,</div><div class='ctx'> </div><div class='ctx'> 	flags = ATH9K_TXDESC_NOACK;</div><div class='ctx'> </div><div class='del'>-	if (sc-&gt;sc_opmode == ATH9K_M_IBSS &amp;&amp;</div><div class='add'>+	if (sc-&gt;sc_ah-&gt;ah_opmode == ATH9K_M_IBSS &amp;&amp;</div><div class='ctx'> 	    (ah-&gt;ah_caps.hw_caps &amp; ATH9K_HW_CAP_VEOL)) {</div><div class='ctx'> 		ds-&gt;ds_link = bf-&gt;bf_daddr; /* self-linked */</div><div class='ctx'> 		flags |= ATH9K_TXDESC_VEOL;</div><div class='hunk'>@@ -111,27 +108,28 @@ static void ath_beacon_setup(struct ath_softc *sc,</div><div class='ctx'> 	rix = 0;</div><div class='ctx'> 	rt = sc-&gt;sc_currates;</div><div class='ctx'> 	rate = rt-&gt;info[rix].rateCode;</div><div class='del'>-	if (sc-&gt;sc_flags &amp; ATH_PREAMBLE_SHORT)</div><div class='add'>+	if (sc-&gt;sc_flags &amp; SC_OP_PREAMBLE_SHORT)</div><div class='ctx'> 		rate |= rt-&gt;info[rix].shortPreamble;</div><div class='ctx'> </div><div class='del'>-	ath9k_hw_set11n_txdesc(ah, ds</div><div class='del'>-			      , skb-&gt;len + FCS_LEN /* frame length */</div><div class='del'>-			      , ATH9K_PKT_TYPE_BEACON /* Atheros packet type */</div><div class='del'>-			      , avp-&gt;av_btxctl.txpower /* txpower XXX */</div><div class='del'>-			      , ATH9K_TXKEYIX_INVALID /* no encryption */</div><div class='del'>-			      , ATH9K_KEY_TYPE_CLEAR /* no encryption */</div><div class='del'>-			      , flags /* no ack, veol for beacons */</div><div class='add'>+	ath9k_hw_set11n_txdesc(ah, ds,</div><div class='add'>+			       skb-&gt;len + FCS_LEN,     /* frame length */</div><div class='add'>+			       ATH9K_PKT_TYPE_BEACON,  /* Atheros packet type */</div><div class='add'>+			       avp-&gt;av_btxctl.txpower, /* txpower XXX */</div><div class='add'>+			       ATH9K_TXKEYIX_INVALID,  /* no encryption */</div><div class='add'>+			       ATH9K_KEY_TYPE_CLEAR,   /* no encryption */</div><div class='add'>+			       flags                   /* no ack,</div><div class='add'>+							  veol for beacons */</div><div class='ctx'> 		);</div><div class='ctx'> </div><div class='ctx'> 	/* NB: beacon's BufLen must be a multiple of 4 bytes */</div><div class='del'>-	ath9k_hw_filltxdesc(ah, ds</div><div class='del'>-			   , roundup(skb-&gt;len, 4) /* buffer length */</div><div class='del'>-			   , true /* first segment */</div><div class='del'>-			   , true /* last segment */</div><div class='del'>-			   , ds /* first descriptor */</div><div class='add'>+	ath9k_hw_filltxdesc(ah, ds,</div><div class='add'>+			    roundup(skb-&gt;len, 4), /* buffer length */</div><div class='add'>+			    true,                 /* first segment */</div><div class='add'>+			    true,                 /* last segment */</div><div class='add'>+			    ds                    /* first descriptor */</div><div class='ctx'> 		);</div><div class='ctx'> </div><div class='del'>-	memzero(series, sizeof(struct ath9k_11n_rate_series) * 4);</div><div class='add'>+	memset(series, 0, sizeof(struct ath9k_11n_rate_series) * 4);</div><div class='ctx'> 	series[0].Tries = 1;</div><div class='ctx'> 	series[0].Rate = rate;</div><div class='ctx'> 	series[0].ChSel = sc-&gt;sc_tx_chainmask;</div><div class='hunk'>@@ -140,55 +138,6 @@ static void ath_beacon_setup(struct ath_softc *sc,</div><div class='ctx'> 		ctsrate, ctsduration, series, 4, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Move everything from the vap's mcast queue to the hardware cab queue.</div><div class='del'>- * Caller must hold mcasq lock and cabq lock</div><div class='del'>- * XXX MORE_DATA bit?</div><div class='del'>- */</div><div class='del'>-static void empty_mcastq_into_cabq(struct ath_hal *ah,</div><div class='del'>-	struct ath_txq *mcastq, struct ath_txq *cabq)</div><div class='del'>-{</div><div class='del'>-	struct ath_buf *bfmcast;</div><div class='del'>-</div><div class='del'>-	BUG_ON(list_empty(&amp;mcastq-&gt;axq_q));</div><div class='del'>-</div><div class='del'>-	bfmcast = list_first_entry(&amp;mcastq-&gt;axq_q, struct ath_buf, list);</div><div class='del'>-</div><div class='del'>-	/* link the descriptors */</div><div class='del'>-	if (!cabq-&gt;axq_link)</div><div class='del'>-		ath9k_hw_puttxbuf(ah, cabq-&gt;axq_qnum, bfmcast-&gt;bf_daddr);</div><div class='del'>-	else</div><div class='del'>-		*cabq-&gt;axq_link = bfmcast-&gt;bf_daddr;</div><div class='del'>-</div><div class='del'>-	/* append the private vap mcast list to  the cabq */</div><div class='del'>-</div><div class='del'>-	cabq-&gt;axq_depth	+= mcastq-&gt;axq_depth;</div><div class='del'>-	cabq-&gt;axq_totalqueued += mcastq-&gt;axq_totalqueued;</div><div class='del'>-	cabq-&gt;axq_linkbuf = mcastq-&gt;axq_linkbuf;</div><div class='del'>-	cabq-&gt;axq_link = mcastq-&gt;axq_link;</div><div class='del'>-	list_splice_tail_init(&amp;mcastq-&gt;axq_q, &amp;cabq-&gt;axq_q);</div><div class='del'>-	mcastq-&gt;axq_depth = 0;</div><div class='del'>-	mcastq-&gt;axq_totalqueued = 0;</div><div class='del'>-	mcastq-&gt;axq_linkbuf = NULL;</div><div class='del'>-	mcastq-&gt;axq_link = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This is only run at DTIM. We move everything from the vap's mcast queue</div><div class='del'>- * to the hardware cab queue. Caller must hold the mcastq lock. */</div><div class='del'>-static void trigger_mcastq(struct ath_hal *ah,</div><div class='del'>-	struct ath_txq *mcastq, struct ath_txq *cabq)</div><div class='del'>-{</div><div class='del'>-	spin_lock_bh(&amp;cabq-&gt;axq_lock);</div><div class='del'>-</div><div class='del'>-	if (!list_empty(&amp;mcastq-&gt;axq_q))</div><div class='del'>-		empty_mcastq_into_cabq(ah, mcastq, cabq);</div><div class='del'>-</div><div class='del'>-	/* cabq is gated by beacon so it is safe to start here */</div><div class='del'>-	if (!list_empty(&amp;cabq-&gt;axq_q))</div><div class='del'>-		ath9k_hw_txstart(ah, cabq-&gt;axq_qnum);</div><div class='del'>-</div><div class='del'>-	spin_unlock_bh(&amp;cabq-&gt;axq_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  *  Generate beacon frame and queue cab data for a vap.</div><div class='ctx'>  *</div><div class='hunk'>@@ -199,39 +148,36 @@ static void trigger_mcastq(struct ath_hal *ah,</div><div class='ctx'> */</div><div class='ctx'> static struct ath_buf *ath_beacon_generate(struct ath_softc *sc, int if_id)</div><div class='ctx'> {</div><div class='del'>-	struct ath_hal *ah = sc-&gt;sc_ah;</div><div class='ctx'> 	struct ath_buf *bf;</div><div class='ctx'> 	struct ath_vap *avp;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='del'>-	int cabq_depth;</div><div class='del'>-	int mcastq_depth;</div><div class='del'>-	int is_beacon_dtim = 0;</div><div class='del'>-	unsigned int curlen;</div><div class='ctx'> 	struct ath_txq *cabq;</div><div class='del'>-	struct ath_txq *mcastq;</div><div class='ctx'> 	struct ieee80211_tx_info *info;</div><div class='add'>+	int cabq_depth;</div><div class='add'>+</div><div class='ctx'> 	avp = sc-&gt;sc_vaps[if_id];</div><div class='add'>+	ASSERT(avp);</div><div class='ctx'> </div><div class='del'>-	mcastq = &amp;avp-&gt;av_mcastq;</div><div class='ctx'> 	cabq = sc-&gt;sc_cabq;</div><div class='ctx'> </div><div class='del'>-	ASSERT(avp);</div><div class='del'>-</div><div class='ctx'> 	if (avp-&gt;av_bcbuf == NULL) {</div><div class='ctx'> 		DPRINTF(sc, ATH_DBG_BEACON, "%s: avp=%p av_bcbuf=%p\n",</div><div class='ctx'> 			__func__, avp, avp-&gt;av_bcbuf);</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	bf = avp-&gt;av_bcbuf;</div><div class='del'>-	skb = (struct sk_buff *) bf-&gt;bf_mpdu;</div><div class='add'>+	skb = (struct sk_buff *)bf-&gt;bf_mpdu;</div><div class='add'>+	if (skb) {</div><div class='add'>+		pci_unmap_single(sc-&gt;pdev, bf-&gt;bf_dmacontext,</div><div class='add'>+				 skb_end_pointer(skb) - skb-&gt;head,</div><div class='add'>+				 PCI_DMA_TODEVICE);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Update dynamic beacon contents.  If this returns</div><div class='del'>-	 * non-zero then we need to remap the memory because</div><div class='del'>-	 * the beacon frame changed size (probably because</div><div class='del'>-	 * of the TIM bitmap).</div><div class='del'>-	 */</div><div class='del'>-	curlen = skb-&gt;len;</div><div class='add'>+	skb = ieee80211_beacon_get(sc-&gt;hw, avp-&gt;av_if_data);</div><div class='add'>+	bf-&gt;bf_mpdu = skb;</div><div class='add'>+	if (skb == NULL)</div><div class='add'>+		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	info = IEEE80211_SKB_CB(skb);</div><div class='ctx'> 	if (info-&gt;flags &amp; IEEE80211_TX_CTL_ASSIGN_SEQ) {</div><div class='hunk'>@@ -239,29 +185,18 @@ static struct ath_buf *ath_beacon_generate(struct ath_softc *sc, int if_id)</div><div class='ctx'> 		 * TODO: make sure the seq# gets assigned properly (vs. other</div><div class='ctx'> 		 * TX frames)</div><div class='ctx'> 		 */</div><div class='del'>-		struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb-&gt;data;</div><div class='add'>+		struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb-&gt;data;</div><div class='ctx'> 		sc-&gt;seq_no += 0x10;</div><div class='ctx'> 		hdr-&gt;seq_ctrl &amp;= cpu_to_le16(IEEE80211_SCTL_FRAG);</div><div class='ctx'> 		hdr-&gt;seq_ctrl |= cpu_to_le16(sc-&gt;seq_no);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* XXX: spin_lock_bh should not be used here, but sparse bitches</div><div class='del'>-	 * otherwise. We should fix sparse :) */</div><div class='del'>-	spin_lock_bh(&amp;mcastq-&gt;axq_lock);</div><div class='del'>-	mcastq_depth = avp-&gt;av_mcastq.axq_depth;</div><div class='del'>-</div><div class='del'>-	if (ath_update_beacon(sc, if_id, &amp;avp-&gt;av_boff, skb, mcastq_depth) ==</div><div class='del'>-	    1) {</div><div class='del'>-		ath_skb_unmap_single(sc, skb, PCI_DMA_TODEVICE,</div><div class='del'>-				     get_dma_mem_context(bf, bf_dmacontext));</div><div class='del'>-		bf-&gt;bf_buf_addr = ath_skb_map_single(sc, skb, PCI_DMA_TODEVICE,</div><div class='del'>-			get_dma_mem_context(bf, bf_dmacontext));</div><div class='del'>-	} else {</div><div class='del'>-		pci_dma_sync_single_for_cpu(sc-&gt;pdev,</div><div class='del'>-					    bf-&gt;bf_buf_addr,</div><div class='del'>-					    skb_tailroom(skb),</div><div class='del'>-					    PCI_DMA_TODEVICE);</div><div class='del'>-	}</div><div class='add'>+	bf-&gt;bf_buf_addr = bf-&gt;bf_dmacontext =</div><div class='add'>+		pci_map_single(sc-&gt;pdev, skb-&gt;data,</div><div class='add'>+			       skb_end_pointer(skb) - skb-&gt;head,</div><div class='add'>+			       PCI_DMA_TODEVICE);</div><div class='add'>+</div><div class='add'>+	skb = ieee80211_get_buffered_bc(sc-&gt;hw, avp-&gt;av_if_data);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * if the CABQ traffic from previous DTIM is pending and the current</div><div class='hunk'>@@ -275,9 +210,7 @@ static struct ath_buf *ath_beacon_generate(struct ath_softc *sc, int if_id)</div><div class='ctx'> 	cabq_depth = cabq-&gt;axq_depth;</div><div class='ctx'> 	spin_unlock_bh(&amp;cabq-&gt;axq_lock);</div><div class='ctx'> </div><div class='del'>-	is_beacon_dtim = avp-&gt;av_boff.bo_tim[4] &amp; 1;</div><div class='del'>-</div><div class='del'>-	if (mcastq_depth &amp;&amp; is_beacon_dtim &amp;&amp; cabq_depth) {</div><div class='add'>+	if (skb &amp;&amp; cabq_depth) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Unlock the cabq lock as ath_tx_draintxq acquires</div><div class='ctx'> 		 * the lock again which is a common function and that</div><div class='hunk'>@@ -297,10 +230,11 @@ static struct ath_buf *ath_beacon_generate(struct ath_softc *sc, int if_id)</div><div class='ctx'> 	 * Enable the CAB queue before the beacon queue to</div><div class='ctx'> 	 * insure cab frames are triggered by this beacon.</div><div class='ctx'> 	 */</div><div class='del'>-	if (is_beacon_dtim)</div><div class='del'>-		trigger_mcastq(ah, mcastq, cabq);</div><div class='add'>+	while (skb) {</div><div class='add'>+		ath_tx_cabq(sc, skb);</div><div class='add'>+		skb = ieee80211_get_buffered_bc(sc-&gt;hw, avp-&gt;av_if_data);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	spin_unlock_bh(&amp;mcastq-&gt;axq_lock);</div><div class='ctx'> 	return bf;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -308,7 +242,6 @@ static struct ath_buf *ath_beacon_generate(struct ath_softc *sc, int if_id)</div><div class='ctx'>  * Startup beacon transmission for adhoc mode when they are sent entirely</div><div class='ctx'>  * by the hardware using the self-linked descriptor + veol trick.</div><div class='ctx'> */</div><div class='del'>-</div><div class='ctx'> static void ath_beacon_start_adhoc(struct ath_softc *sc, int if_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_hal *ah = sc-&gt;sc_ah;</div><div class='hunk'>@@ -345,12 +278,11 @@ static void ath_beacon_start_adhoc(struct ath_softc *sc, int if_id)</div><div class='ctx'>  *  min/max, and enable aifs). The info structure does not need to be</div><div class='ctx'>  *  persistant.</div><div class='ctx'> */</div><div class='del'>-</div><div class='ctx'> int ath_beaconq_setup(struct ath_hal *ah)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath9k_tx_queue_info qi;</div><div class='ctx'> </div><div class='del'>-	memzero(&amp;qi, sizeof(qi));</div><div class='add'>+	memset(&amp;qi, 0, sizeof(qi));</div><div class='ctx'> 	qi.tqi_aifs = 1;</div><div class='ctx'> 	qi.tqi_cwmin = 0;</div><div class='ctx'> 	qi.tqi_cwmax = 0;</div><div class='hunk'>@@ -366,29 +298,27 @@ int ath_beaconq_setup(struct ath_hal *ah)</div><div class='ctx'>  *  the ATH interface.  This routine also calculates the beacon "slot" for</div><div class='ctx'>  *  staggared beacons in the mBSSID case.</div><div class='ctx'> */</div><div class='del'>-</div><div class='ctx'> int ath_beacon_alloc(struct ath_softc *sc, int if_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_vap *avp;</div><div class='del'>-	struct ieee80211_hdr *wh;</div><div class='add'>+	struct ieee80211_hdr *hdr;</div><div class='ctx'> 	struct ath_buf *bf;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='add'>+	__le64 tstamp;</div><div class='ctx'> </div><div class='ctx'> 	avp = sc-&gt;sc_vaps[if_id];</div><div class='ctx'> 	ASSERT(avp);</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate a beacon descriptor if we haven't done so. */</div><div class='ctx'> 	if (!avp-&gt;av_bcbuf) {</div><div class='del'>-		/*</div><div class='del'>-		 * Allocate beacon state for hostap/ibss.  We know</div><div class='del'>-		 * a buffer is available.</div><div class='del'>-		 */</div><div class='add'>+		/* Allocate beacon state for hostap/ibss.  We know</div><div class='add'>+		 * a buffer is available. */</div><div class='ctx'> </div><div class='ctx'> 		avp-&gt;av_bcbuf = list_first_entry(&amp;sc-&gt;sc_bbuf,</div><div class='del'>-				struct ath_buf, list);</div><div class='add'>+						 struct ath_buf, list);</div><div class='ctx'> 		list_del(&amp;avp-&gt;av_bcbuf-&gt;list);</div><div class='ctx'> </div><div class='del'>-		if (sc-&gt;sc_opmode == ATH9K_M_HOSTAP ||</div><div class='add'>+		if (sc-&gt;sc_ah-&gt;ah_opmode == ATH9K_M_HOSTAP ||</div><div class='ctx'> 		    !(sc-&gt;sc_ah-&gt;ah_caps.hw_caps &amp; ATH9K_HW_CAP_VEOL)) {</div><div class='ctx'> 			int slot;</div><div class='ctx'> 			/*</div><div class='hunk'>@@ -421,17 +351,16 @@ int ath_beacon_alloc(struct ath_softc *sc, int if_id)</div><div class='ctx'> 	bf = avp-&gt;av_bcbuf;</div><div class='ctx'> 	if (bf-&gt;bf_mpdu != NULL) {</div><div class='ctx'> 		skb = (struct sk_buff *)bf-&gt;bf_mpdu;</div><div class='del'>-		ath_skb_unmap_single(sc, skb, PCI_DMA_TODEVICE,</div><div class='del'>-				     get_dma_mem_context(bf, bf_dmacontext));</div><div class='add'>+		pci_unmap_single(sc-&gt;pdev, bf-&gt;bf_dmacontext,</div><div class='add'>+				 skb_end_pointer(skb) - skb-&gt;head,</div><div class='add'>+				 PCI_DMA_TODEVICE);</div><div class='ctx'> 		dev_kfree_skb_any(skb);</div><div class='ctx'> 		bf-&gt;bf_mpdu = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * NB: the beacon data buffer must be 32-bit aligned;</div><div class='del'>-	 * we assume the wbuf routines will return us something</div><div class='del'>-	 * with this alignment (perhaps should assert).</div><div class='del'>-	 * FIXME: Fill avp-&gt;av_boff.bo_tim,avp-&gt;av_btxctl.txpower and</div><div class='add'>+	 * NB: the beacon data buffer must be 32-bit aligned.</div><div class='add'>+	 * FIXME: Fill avp-&gt;av_btxctl.txpower and</div><div class='ctx'> 	 * avp-&gt;av_btxctl.shortPreamble</div><div class='ctx'> 	 */</div><div class='ctx'> 	skb = ieee80211_beacon_get(sc-&gt;hw, avp-&gt;av_if_data);</div><div class='hunk'>@@ -441,6 +370,9 @@ int ath_beacon_alloc(struct ath_softc *sc, int if_id)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	tstamp = ((struct ieee80211_mgmt *)skb-&gt;data)-&gt;u.beacon.timestamp;</div><div class='add'>+	sc-&gt;bc_tstamp = le64_to_cpu(tstamp);</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Calculate a TSF adjustment factor required for</div><div class='ctx'> 	 * staggered beacons.  Note that we assume the format</div><div class='hunk'>@@ -452,9 +384,8 @@ int ath_beacon_alloc(struct ath_softc *sc, int if_id)</div><div class='ctx'> 		__le64 val;</div><div class='ctx'> 		int intval;</div><div class='ctx'> </div><div class='del'>-		/* FIXME: Use default value for now: Sujith */</div><div class='del'>-</div><div class='del'>-		intval = ATH_DEFAULT_BINTVAL;</div><div class='add'>+		intval = sc-&gt;hw-&gt;conf.beacon_int ?</div><div class='add'>+			sc-&gt;hw-&gt;conf.beacon_int : ATH_DEFAULT_BINTVAL;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * The beacon interval is in TU's; the TSF in usecs.</div><div class='hunk'>@@ -475,12 +406,14 @@ int ath_beacon_alloc(struct ath_softc *sc, int if_id)</div><div class='ctx'> 			__func__, "stagger",</div><div class='ctx'> 			avp-&gt;av_bslot, intval, (unsigned long long)tsfadjust);</div><div class='ctx'> </div><div class='del'>-		wh = (struct ieee80211_hdr *)skb-&gt;data;</div><div class='del'>-		memcpy(&amp;wh[1], &amp;val, sizeof(val));</div><div class='add'>+		hdr = (struct ieee80211_hdr *)skb-&gt;data;</div><div class='add'>+		memcpy(&amp;hdr[1], &amp;val, sizeof(val));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	bf-&gt;bf_buf_addr = ath_skb_map_single(sc, skb, PCI_DMA_TODEVICE,</div><div class='del'>-		get_dma_mem_context(bf, bf_dmacontext));</div><div class='add'>+	bf-&gt;bf_buf_addr = bf-&gt;bf_dmacontext =</div><div class='add'>+		pci_map_single(sc-&gt;pdev, skb-&gt;data,</div><div class='add'>+			       skb_end_pointer(skb) - skb-&gt;head,</div><div class='add'>+			       PCI_DMA_TODEVICE);</div><div class='ctx'> 	bf-&gt;bf_mpdu = skb;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -490,9 +423,8 @@ int ath_beacon_alloc(struct ath_softc *sc, int if_id)</div><div class='ctx'>  *  Reclaim beacon resources and return buffer to the pool.</div><div class='ctx'>  *</div><div class='ctx'>  *  Checks the VAP to put the beacon frame buffer back to the ATH object</div><div class='del'>- *  queue, and de-allocates any wbuf frames that were sent as CAB traffic.</div><div class='add'>+ *  queue, and de-allocates any skbs that were sent as CAB traffic.</div><div class='ctx'> */</div><div class='del'>-</div><div class='ctx'> void ath_beacon_return(struct ath_softc *sc, struct ath_vap *avp)</div><div class='ctx'> {</div><div class='ctx'> 	if (avp-&gt;av_bcbuf != NULL) {</div><div class='hunk'>@@ -506,8 +438,9 @@ void ath_beacon_return(struct ath_softc *sc, struct ath_vap *avp)</div><div class='ctx'> 		bf = avp-&gt;av_bcbuf;</div><div class='ctx'> 		if (bf-&gt;bf_mpdu != NULL) {</div><div class='ctx'> 			struct sk_buff *skb = (struct sk_buff *)bf-&gt;bf_mpdu;</div><div class='del'>-			ath_skb_unmap_single(sc, skb, PCI_DMA_TODEVICE,</div><div class='del'>-				get_dma_mem_context(bf, bf_dmacontext));</div><div class='add'>+			pci_unmap_single(sc-&gt;pdev, bf-&gt;bf_dmacontext,</div><div class='add'>+					 skb_end_pointer(skb) - skb-&gt;head,</div><div class='add'>+					 PCI_DMA_TODEVICE);</div><div class='ctx'> 			dev_kfree_skb_any(skb);</div><div class='ctx'> 			bf-&gt;bf_mpdu = NULL;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -518,44 +451,14 @@ void ath_beacon_return(struct ath_softc *sc, struct ath_vap *avp)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- *  Reclaim beacon resources and return buffer to the pool.</div><div class='del'>- *</div><div class='del'>- *  This function will free any wbuf frames that are still attached to the</div><div class='del'>- *  beacon buffers in the ATH object.  Note that this does not de-allocate</div><div class='del'>- *  any wbuf objects that are in the transmit queue and have not yet returned</div><div class='del'>- *  to the ATH object.</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-void ath_beacon_free(struct ath_softc *sc)</div><div class='del'>-{</div><div class='del'>-	struct ath_buf *bf;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(bf, &amp;sc-&gt;sc_bbuf, list) {</div><div class='del'>-		if (bf-&gt;bf_mpdu != NULL) {</div><div class='del'>-			struct sk_buff *skb = (struct sk_buff *) bf-&gt;bf_mpdu;</div><div class='del'>-			ath_skb_unmap_single(sc, skb, PCI_DMA_TODEVICE,</div><div class='del'>-				get_dma_mem_context(bf, bf_dmacontext));</div><div class='del'>-			dev_kfree_skb_any(skb);</div><div class='del'>-			bf-&gt;bf_mpdu = NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * Tasklet for Sending Beacons</div><div class='ctx'>  *</div><div class='ctx'>  * Transmit one or more beacon frames at SWBA.  Dynamic updates to the frame</div><div class='ctx'>  * contents are done as needed and the slot time is also adjusted based on</div><div class='ctx'>  * current state.</div><div class='del'>- *</div><div class='del'>- * This tasklet is not scheduled, it's called in ISR context.</div><div class='ctx'> */</div><div class='del'>-</div><div class='ctx'> void ath9k_beacon_tasklet(unsigned long data)</div><div class='ctx'> {</div><div class='del'>-#define TSF_TO_TU(_h,_l)					\</div><div class='del'>-	((((u32)(_h)) &lt;&lt; 22) | (((u32)(_l)) &gt;&gt; 10))</div><div class='del'>-</div><div class='ctx'> 	struct ath_softc *sc = (struct ath_softc *)data;</div><div class='ctx'> 	struct ath_hal *ah = sc-&gt;sc_ah;</div><div class='ctx'> 	struct ath_buf *bf = NULL;</div><div class='hunk'>@@ -568,7 +471,7 @@ void ath9k_beacon_tasklet(unsigned long data)</div><div class='ctx'> 	u32 tsftu;</div><div class='ctx'> 	u16 intval;</div><div class='ctx'> </div><div class='del'>-	if (sc-&gt;sc_noreset) {</div><div class='add'>+	if (sc-&gt;sc_flags &amp; SC_OP_NO_RESET) {</div><div class='ctx'> 		show_cycles = ath9k_hw_GetMibCycleCountsPct(ah,</div><div class='ctx'> 							    &amp;rx_clear,</div><div class='ctx'> 							    &amp;rx_frame,</div><div class='hunk'>@@ -581,6 +484,8 @@ void ath9k_beacon_tasklet(unsigned long data)</div><div class='ctx'> 	 * and wait for the next.  Missed beacons indicate</div><div class='ctx'> 	 * a problem and should not occur.  If we miss too</div><div class='ctx'> 	 * many consecutive beacons reset the device.</div><div class='add'>+	 *</div><div class='add'>+	 * FIXME: Clean up this mess !!</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (ath9k_hw_numtxpending(ah, sc-&gt;sc_bhalq) != 0) {</div><div class='ctx'> 		sc-&gt;sc_bmisscount++;</div><div class='hunk'>@@ -590,25 +495,22 @@ void ath9k_beacon_tasklet(unsigned long data)</div><div class='ctx'> 		 *      (in that layer).</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (sc-&gt;sc_bmisscount &lt; BSTUCK_THRESH) {</div><div class='del'>-			if (sc-&gt;sc_noreset) {</div><div class='add'>+			if (sc-&gt;sc_flags &amp; SC_OP_NO_RESET) {</div><div class='ctx'> 				DPRINTF(sc, ATH_DBG_BEACON,</div><div class='ctx'> 					"%s: missed %u consecutive beacons\n",</div><div class='ctx'> 					__func__, sc-&gt;sc_bmisscount);</div><div class='ctx'> 				if (show_cycles) {</div><div class='ctx'> 					/*</div><div class='del'>-					 * Display cycle counter stats</div><div class='del'>-					 * from HW to aide in debug of</div><div class='del'>-					 * stickiness.</div><div class='add'>+					 * Display cycle counter stats from HW</div><div class='add'>+					 * to aide in debug of stickiness.</div><div class='ctx'> 					 */</div><div class='del'>-					DPRINTF(sc,</div><div class='del'>-						ATH_DBG_BEACON,</div><div class='add'>+					DPRINTF(sc, ATH_DBG_BEACON,</div><div class='ctx'> 						"%s: busy times: rx_clear=%d, "</div><div class='ctx'> 						"rx_frame=%d, tx_frame=%d\n",</div><div class='ctx'> 						__func__, rx_clear, rx_frame,</div><div class='ctx'> 						tx_frame);</div><div class='ctx'> 				} else {</div><div class='del'>-					DPRINTF(sc,</div><div class='del'>-						ATH_DBG_BEACON,</div><div class='add'>+					DPRINTF(sc, ATH_DBG_BEACON,</div><div class='ctx'> 						"%s: unable to obtain "</div><div class='ctx'> 						"busy times\n", __func__);</div><div class='ctx'> 				}</div><div class='hunk'>@@ -618,10 +520,9 @@ void ath9k_beacon_tasklet(unsigned long data)</div><div class='ctx'> 					__func__, sc-&gt;sc_bmisscount);</div><div class='ctx'> 			}</div><div class='ctx'> 		} else if (sc-&gt;sc_bmisscount &gt;= BSTUCK_THRESH) {</div><div class='del'>-			if (sc-&gt;sc_noreset) {</div><div class='add'>+			if (sc-&gt;sc_flags &amp; SC_OP_NO_RESET) {</div><div class='ctx'> 				if (sc-&gt;sc_bmisscount == BSTUCK_THRESH) {</div><div class='del'>-					DPRINTF(sc,</div><div class='del'>-						ATH_DBG_BEACON,</div><div class='add'>+					DPRINTF(sc, ATH_DBG_BEACON,</div><div class='ctx'> 						"%s: beacon is officially "</div><div class='ctx'> 						"stuck\n", __func__);</div><div class='ctx'> 					ath9k_hw_dmaRegDump(ah);</div><div class='hunk'>@@ -633,13 +534,12 @@ void ath9k_beacon_tasklet(unsigned long data)</div><div class='ctx'> 				ath_bstuck_process(sc);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	if (sc-&gt;sc_bmisscount != 0) {</div><div class='del'>-		if (sc-&gt;sc_noreset) {</div><div class='del'>-			DPRINTF(sc,</div><div class='del'>-				ATH_DBG_BEACON,</div><div class='add'>+		if (sc-&gt;sc_flags &amp; SC_OP_NO_RESET) {</div><div class='add'>+			DPRINTF(sc, ATH_DBG_BEACON,</div><div class='ctx'> 				"%s: resume beacon xmit after %u misses\n",</div><div class='ctx'> 				__func__, sc-&gt;sc_bmisscount);</div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -656,17 +556,19 @@ void ath9k_beacon_tasklet(unsigned long data)</div><div class='ctx'> 	 * on the tsf to safeguard against missing an swba.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	/* FIXME: Use default value for now - Sujith */</div><div class='del'>-	intval = ATH_DEFAULT_BINTVAL;</div><div class='add'>+	intval = sc-&gt;hw-&gt;conf.beacon_int ?</div><div class='add'>+		sc-&gt;hw-&gt;conf.beacon_int : ATH_DEFAULT_BINTVAL;</div><div class='ctx'> </div><div class='ctx'> 	tsf = ath9k_hw_gettsf64(ah);</div><div class='ctx'> 	tsftu = TSF_TO_TU(tsf&gt;&gt;32, tsf);</div><div class='ctx'> 	slot = ((tsftu % intval) * ATH_BCBUF) / intval;</div><div class='ctx'> 	if_id = sc-&gt;sc_bslot[(slot + 1) % ATH_BCBUF];</div><div class='add'>+</div><div class='ctx'> 	DPRINTF(sc, ATH_DBG_BEACON,</div><div class='del'>-			"%s: slot %d [tsf %llu tsftu %u intval %u] if_id %d\n",</div><div class='del'>-			__func__, slot, (unsigned long long) tsf, tsftu,</div><div class='del'>-			intval, if_id);</div><div class='add'>+		"%s: slot %d [tsf %llu tsftu %u intval %u] if_id %d\n",</div><div class='add'>+		__func__, slot, (unsigned long long)tsf, tsftu,</div><div class='add'>+		intval, if_id);</div><div class='add'>+</div><div class='ctx'> 	bfaddr = 0;</div><div class='ctx'> 	if (if_id != ATH_IF_ID_ANY) {</div><div class='ctx'> 		bf = ath_beacon_generate(sc, if_id);</div><div class='hunk'>@@ -717,22 +619,20 @@ void ath9k_beacon_tasklet(unsigned long data)</div><div class='ctx'> </div><div class='ctx'> 		sc-&gt;ast_be_xmit += bc;     /* XXX per-vap? */</div><div class='ctx'> 	}</div><div class='del'>-#undef TSF_TO_TU</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *  Tasklet for Beacon Stuck processing</div><div class='ctx'>  *</div><div class='ctx'>  *  Processing for Beacon Stuck.</div><div class='del'>- *  Basically calls the ath_internal_reset function to reset the chip.</div><div class='add'>+ *  Basically resets the chip.</div><div class='ctx'> */</div><div class='del'>-</div><div class='ctx'> void ath_bstuck_process(struct ath_softc *sc)</div><div class='ctx'> {</div><div class='ctx'> 	DPRINTF(sc, ATH_DBG_BEACON,</div><div class='ctx'> 		"%s: stuck beacon; resetting (bmiss count %u)\n",</div><div class='ctx'> 		__func__, sc-&gt;sc_bmisscount);</div><div class='del'>-	ath_internal_reset(sc);</div><div class='add'>+	ath_reset(sc, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -750,40 +650,32 @@ void ath_bstuck_process(struct ath_softc *sc)</div><div class='ctx'>  * interrupt when we stop seeing beacons from the AP</div><div class='ctx'>  * we've associated with.</div><div class='ctx'>  */</div><div class='del'>-</div><div class='ctx'> void ath_beacon_config(struct ath_softc *sc, int if_id)</div><div class='ctx'> {</div><div class='del'>-#define TSF_TO_TU(_h,_l)					\</div><div class='del'>-	((((u32)(_h)) &lt;&lt; 22) | (((u32)(_l)) &gt;&gt; 10))</div><div class='ctx'> 	struct ath_hal *ah = sc-&gt;sc_ah;</div><div class='del'>-	u32 nexttbtt, intval;</div><div class='ctx'> 	struct ath_beacon_config conf;</div><div class='ctx'> 	enum ath9k_opmode av_opmode;</div><div class='add'>+	u32 nexttbtt, intval;</div><div class='ctx'> </div><div class='ctx'> 	if (if_id != ATH_IF_ID_ANY)</div><div class='ctx'> 		av_opmode = sc-&gt;sc_vaps[if_id]-&gt;av_opmode;</div><div class='ctx'> 	else</div><div class='del'>-		av_opmode = sc-&gt;sc_opmode;</div><div class='add'>+		av_opmode = sc-&gt;sc_ah-&gt;ah_opmode;</div><div class='ctx'> </div><div class='del'>-	memzero(&amp;conf, sizeof(struct ath_beacon_config));</div><div class='add'>+	memset(&amp;conf, 0, sizeof(struct ath_beacon_config));</div><div class='ctx'> </div><div class='del'>-	/* FIXME: Use default values for now - Sujith */</div><div class='del'>-	/* Query beacon configuration first */</div><div class='del'>-	/*</div><div class='del'>-	 * Protocol stack doesn't support dynamic beacon configuration,</div><div class='del'>-	 * use default configurations.</div><div class='del'>-	 */</div><div class='del'>-	conf.beacon_interval = ATH_DEFAULT_BINTVAL;</div><div class='add'>+	conf.beacon_interval = sc-&gt;hw-&gt;conf.beacon_int ?</div><div class='add'>+		sc-&gt;hw-&gt;conf.beacon_int : ATH_DEFAULT_BINTVAL;</div><div class='ctx'> 	conf.listen_interval = 1;</div><div class='ctx'> 	conf.dtim_period = conf.beacon_interval;</div><div class='ctx'> 	conf.dtim_count = 1;</div><div class='ctx'> 	conf.bmiss_timeout = ATH_DEFAULT_BMISS_LIMIT * conf.beacon_interval;</div><div class='ctx'> </div><div class='ctx'> 	/* extract tstamp from last beacon and convert to TU */</div><div class='del'>-	nexttbtt = TSF_TO_TU(get_unaligned_le32(conf.u.last_tstamp + 4),</div><div class='del'>-			     get_unaligned_le32(conf.u.last_tstamp));</div><div class='add'>+	nexttbtt = TSF_TO_TU(sc-&gt;bc_tstamp &gt;&gt; 32, sc-&gt;bc_tstamp);</div><div class='add'>+</div><div class='ctx'> 	/* XXX conditionalize multi-bss support? */</div><div class='del'>-	if (sc-&gt;sc_opmode == ATH9K_M_HOSTAP) {</div><div class='add'>+	if (sc-&gt;sc_ah-&gt;ah_opmode == ATH9K_M_HOSTAP) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * For multi-bss ap support beacons are either staggered</div><div class='ctx'> 		 * evenly over N slots or burst together.  For the former</div><div class='hunk'>@@ -797,14 +689,16 @@ void ath_beacon_config(struct ath_softc *sc, int if_id)</div><div class='ctx'> 		intval = conf.beacon_interval &amp; ATH9K_BEACON_PERIOD;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (nexttbtt == 0)      /* e.g. for ap mode */</div><div class='add'>+	if (nexttbtt == 0)	/* e.g. for ap mode */</div><div class='ctx'> 		nexttbtt = intval;</div><div class='del'>-	else if (intval)        /* NB: can be 0 for monitor mode */</div><div class='add'>+	else if (intval)	/* NB: can be 0 for monitor mode */</div><div class='ctx'> 		nexttbtt = roundup(nexttbtt, intval);</div><div class='add'>+</div><div class='ctx'> 	DPRINTF(sc, ATH_DBG_BEACON, "%s: nexttbtt %u intval %u (%u)\n",</div><div class='ctx'> 		__func__, nexttbtt, intval, conf.beacon_interval);</div><div class='add'>+</div><div class='ctx'> 	/* Check for ATH9K_M_HOSTAP and sc_nostabeacons for WDS client */</div><div class='del'>-	if (sc-&gt;sc_opmode == ATH9K_M_STA) {</div><div class='add'>+	if (sc-&gt;sc_ah-&gt;ah_opmode == ATH9K_M_STA) {</div><div class='ctx'> 		struct ath9k_beacon_state bs;</div><div class='ctx'> 		u64 tsf;</div><div class='ctx'> 		u32 tsftu;</div><div class='hunk'>@@ -816,19 +710,19 @@ void ath_beacon_config(struct ath_softc *sc, int if_id)</div><div class='ctx'> 		 * last beacon we received (which may be none).</div><div class='ctx'> 		 */</div><div class='ctx'> 		dtimperiod = conf.dtim_period;</div><div class='del'>-		if (dtimperiod &lt;= 0)        /* NB: 0 if not known */</div><div class='add'>+		if (dtimperiod &lt;= 0)		/* NB: 0 if not known */</div><div class='ctx'> 			dtimperiod = 1;</div><div class='ctx'> 		dtimcount = conf.dtim_count;</div><div class='del'>-		if (dtimcount &gt;= dtimperiod)    /* NB: sanity check */</div><div class='del'>-			dtimcount = 0;      /* XXX? */</div><div class='del'>-		cfpperiod = 1;          /* NB: no PCF support yet */</div><div class='add'>+		if (dtimcount &gt;= dtimperiod)	/* NB: sanity check */</div><div class='add'>+			dtimcount = 0;</div><div class='add'>+		cfpperiod = 1;			/* NB: no PCF support yet */</div><div class='ctx'> 		cfpcount = 0;</div><div class='ctx'> </div><div class='ctx'> 		sleepduration = conf.listen_interval * intval;</div><div class='ctx'> 		if (sleepduration &lt;= 0)</div><div class='ctx'> 			sleepduration = intval;</div><div class='ctx'> </div><div class='del'>-#define FUDGE   2</div><div class='add'>+#define FUDGE 2</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Pull nexttbtt forward to reflect the current</div><div class='ctx'> 		 * TSF and calculate dtim+cfp state for the result.</div><div class='hunk'>@@ -844,7 +738,7 @@ void ath_beacon_config(struct ath_softc *sc, int if_id)</div><div class='ctx'> 			}</div><div class='ctx'> 		} while (nexttbtt &lt; tsftu);</div><div class='ctx'> #undef FUDGE</div><div class='del'>-		memzero(&amp;bs, sizeof(bs));</div><div class='add'>+		memset(&amp;bs, 0, sizeof(bs));</div><div class='ctx'> 		bs.bs_intval = intval;</div><div class='ctx'> 		bs.bs_nexttbtt = nexttbtt;</div><div class='ctx'> 		bs.bs_dtimperiod = dtimperiod*intval;</div><div class='hunk'>@@ -852,6 +746,7 @@ void ath_beacon_config(struct ath_softc *sc, int if_id)</div><div class='ctx'> 		bs.bs_cfpperiod = cfpperiod*bs.bs_dtimperiod;</div><div class='ctx'> 		bs.bs_cfpnext = bs.bs_nextdtim + cfpcount*bs.bs_dtimperiod;</div><div class='ctx'> 		bs.bs_cfpmaxduration = 0;</div><div class='add'>+</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Calculate the number of consecutive beacons to miss</div><div class='ctx'> 		 * before taking a BMISS interrupt.  The configuration</div><div class='hunk'>@@ -860,9 +755,8 @@ void ath_beacon_config(struct ath_softc *sc, int if_id)</div><div class='ctx'> 		 * result to at most 15 beacons.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (sleepduration &gt; intval) {</div><div class='del'>-			bs.bs_bmissthreshold =</div><div class='del'>-				conf.listen_interval *</div><div class='del'>-					ATH_DEFAULT_BMISS_LIMIT / 2;</div><div class='add'>+			bs.bs_bmissthreshold = conf.listen_interval *</div><div class='add'>+				ATH_DEFAULT_BMISS_LIMIT / 2;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			bs.bs_bmissthreshold =</div><div class='ctx'> 				DIV_ROUND_UP(conf.bmiss_timeout, intval);</div><div class='hunk'>@@ -882,8 +776,8 @@ void ath_beacon_config(struct ath_softc *sc, int if_id)</div><div class='ctx'> 		 * XXX fixed at 100ms</div><div class='ctx'> 		 */</div><div class='ctx'> </div><div class='del'>-		bs.bs_sleepduration =</div><div class='del'>-			roundup(IEEE80211_MS_TO_TU(100), sleepduration);</div><div class='add'>+		bs.bs_sleepduration = roundup(IEEE80211_MS_TO_TU(100),</div><div class='add'>+					      sleepduration);</div><div class='ctx'> 		if (bs.bs_sleepduration &gt; bs.bs_dtimperiod)</div><div class='ctx'> 			bs.bs_sleepduration = bs.bs_dtimperiod;</div><div class='ctx'> </div><div class='hunk'>@@ -899,19 +793,19 @@ void ath_beacon_config(struct ath_softc *sc, int if_id)</div><div class='ctx'> 			"cfp:period %u "</div><div class='ctx'> 			"maxdur %u "</div><div class='ctx'> 			"next %u "</div><div class='del'>-			"timoffset %u\n"</div><div class='del'>-			, __func__</div><div class='del'>-			, (unsigned long long)tsf, tsftu</div><div class='del'>-			, bs.bs_intval</div><div class='del'>-			, bs.bs_nexttbtt</div><div class='del'>-			, bs.bs_dtimperiod</div><div class='del'>-			, bs.bs_nextdtim</div><div class='del'>-			, bs.bs_bmissthreshold</div><div class='del'>-			, bs.bs_sleepduration</div><div class='del'>-			, bs.bs_cfpperiod</div><div class='del'>-			, bs.bs_cfpmaxduration</div><div class='del'>-			, bs.bs_cfpnext</div><div class='del'>-			, bs.bs_timoffset</div><div class='add'>+			"timoffset %u\n",</div><div class='add'>+			__func__,</div><div class='add'>+			(unsigned long long)tsf, tsftu,</div><div class='add'>+			bs.bs_intval,</div><div class='add'>+			bs.bs_nexttbtt,</div><div class='add'>+			bs.bs_dtimperiod,</div><div class='add'>+			bs.bs_nextdtim,</div><div class='add'>+			bs.bs_bmissthreshold,</div><div class='add'>+			bs.bs_sleepduration,</div><div class='add'>+			bs.bs_cfpperiod,</div><div class='add'>+			bs.bs_cfpmaxduration,</div><div class='add'>+			bs.bs_cfpnext,</div><div class='add'>+			bs.bs_timoffset</div><div class='ctx'> 			);</div><div class='ctx'> </div><div class='ctx'> 		ath9k_hw_set_interrupts(ah, 0);</div><div class='hunk'>@@ -924,12 +818,12 @@ void ath_beacon_config(struct ath_softc *sc, int if_id)</div><div class='ctx'> 		ath9k_hw_set_interrupts(ah, 0);</div><div class='ctx'> 		if (nexttbtt == intval)</div><div class='ctx'> 			intval |= ATH9K_BEACON_RESET_TSF;</div><div class='del'>-		if (sc-&gt;sc_opmode == ATH9K_M_IBSS) {</div><div class='add'>+		if (sc-&gt;sc_ah-&gt;ah_opmode == ATH9K_M_IBSS) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Pull nexttbtt forward to reflect the current</div><div class='del'>-			 * TSF .</div><div class='add'>+			 * TSF</div><div class='ctx'> 			 */</div><div class='del'>-#define FUDGE   2</div><div class='add'>+#define FUDGE 2</div><div class='ctx'> 			if (!(intval &amp; ATH9K_BEACON_RESET_TSF)) {</div><div class='ctx'> 				tsf = ath9k_hw_gettsf64(ah);</div><div class='ctx'> 				tsftu = TSF_TO_TU((u32)(tsf&gt;&gt;32),</div><div class='hunk'>@@ -956,7 +850,7 @@ void ath_beacon_config(struct ath_softc *sc, int if_id)</div><div class='ctx'> 			if (!(ah-&gt;ah_caps.hw_caps &amp; ATH9K_HW_CAP_VEOL))</div><div class='ctx'> 				sc-&gt;sc_imask |= ATH9K_INT_SWBA;</div><div class='ctx'> 			ath_beaconq_config(sc);</div><div class='del'>-		} else if (sc-&gt;sc_opmode == ATH9K_M_HOSTAP) {</div><div class='add'>+		} else if (sc-&gt;sc_ah-&gt;ah_opmode == ATH9K_M_HOSTAP) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * In AP mode we enable the beacon timers and</div><div class='ctx'> 			 * SWBA interrupts to prepare beacon frames.</div><div class='hunk'>@@ -972,11 +866,10 @@ void ath_beacon_config(struct ath_softc *sc, int if_id)</div><div class='ctx'> 		 * When using a self-linked beacon descriptor in</div><div class='ctx'> 		 * ibss mode load it once here.</div><div class='ctx'> 		 */</div><div class='del'>-		if (sc-&gt;sc_opmode == ATH9K_M_IBSS &amp;&amp;</div><div class='add'>+		if (sc-&gt;sc_ah-&gt;ah_opmode == ATH9K_M_IBSS &amp;&amp;</div><div class='ctx'> 		    (ah-&gt;ah_caps.hw_caps &amp; ATH9K_HW_CAP_VEOL))</div><div class='ctx'> 			ath_beacon_start_adhoc(sc, 0);</div><div class='ctx'> 	}</div><div class='del'>-#undef TSF_TO_TU</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Function to collect beacon rssi data and resync beacon if necessary */</div><div class='hunk'>@@ -988,5 +881,5 @@ void ath_beacon_sync(struct ath_softc *sc, int if_id)</div><div class='ctx'> 	 * beacon frame we just received.</div><div class='ctx'> 	 */</div><div class='ctx'> 	ath_beacon_config(sc, if_id);</div><div class='del'>-	sc-&gt;sc_beacons = 1;</div><div class='add'>+	sc-&gt;sc_flags |= SC_OP_BEACONS;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/ath9k/core.c b/drivers/net/wireless/ath9k/core.c<br/>index 87e37bc39145..c5033f6f42ac 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/ath9k/core.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/ath9k/core.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/ath9k/core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/ath9k/core.c</a></div><div class='hunk'>@@ -21,9 +21,6 @@</div><div class='ctx'> </div><div class='ctx'> static int ath_outdoor;		/* enable outdoor use */</div><div class='ctx'> </div><div class='del'>-static const u8 ath_bcast_mac[ETH_ALEN] =</div><div class='del'>-    { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };</div><div class='del'>-</div><div class='ctx'> static u32 ath_chainmask_sel_up_rssi_thres =</div><div class='ctx'> 	ATH_CHAINMASK_SEL_UP_RSSI_THRES;</div><div class='ctx'> static u32 ath_chainmask_sel_down_rssi_thres =</div><div class='hunk'>@@ -54,10 +51,8 @@ static void bus_read_cachesize(struct ath_softc *sc, int *csz)</div><div class='ctx'>  *  Set current operating mode</div><div class='ctx'>  *</div><div class='ctx'>  *  This function initializes and fills the rate table in the ATH object based</div><div class='del'>- *  on the operating mode.  The blink rates are also set up here, although</div><div class='del'>- *  they have been superceeded by the ath_led module.</div><div class='add'>+ *  on the operating mode.</div><div class='ctx'> */</div><div class='del'>-</div><div class='ctx'> static void ath_setcurmode(struct ath_softc *sc, enum wireless_mode mode)</div><div class='ctx'> {</div><div class='ctx'> 	const struct ath9k_rate_table *rt;</div><div class='hunk'>@@ -70,7 +65,7 @@ static void ath_setcurmode(struct ath_softc *sc, enum wireless_mode mode)</div><div class='ctx'> 	for (i = 0; i &lt; rt-&gt;rateCount; i++)</div><div class='ctx'> 		sc-&gt;sc_rixmap[rt-&gt;info[i].rateCode] = (u8) i;</div><div class='ctx'> </div><div class='del'>-	memzero(sc-&gt;sc_hwmap, sizeof(sc-&gt;sc_hwmap));</div><div class='add'>+	memset(sc-&gt;sc_hwmap, 0, sizeof(sc-&gt;sc_hwmap));</div><div class='ctx'> 	for (i = 0; i &lt; 256; i++) {</div><div class='ctx'> 		u8 ix = rt-&gt;rateCodeToIndex[i];</div><div class='ctx'> </div><div class='hunk'>@@ -235,7 +230,7 @@ static int ath_setup_channels(struct ath_softc *sc)</div><div class='ctx'>  *  Determine mode from channel flags</div><div class='ctx'>  *</div><div class='ctx'>  *  This routine will provide the enumerated WIRELESSS_MODE value based</div><div class='del'>- *  on the settings of the channel flags.  If ho valid set of flags</div><div class='add'>+ *  on the settings of the channel flags.  If no valid set of flags</div><div class='ctx'>  *  exist, the lowest mode (11b) is selected.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='hunk'>@@ -260,7 +255,8 @@ static enum wireless_mode ath_chan2mode(struct ath9k_channel *chan)</div><div class='ctx'> 	else if (chan-&gt;chanmode == CHANNEL_G_HT40MINUS)</div><div class='ctx'> 		return ATH9K_MODE_11NG_HT40MINUS;</div><div class='ctx'> </div><div class='del'>-	/* NB: should not get here */</div><div class='add'>+	WARN_ON(1); /* should not get here */</div><div class='add'>+</div><div class='ctx'> 	return ATH9K_MODE_11B;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -275,14 +271,12 @@ static int ath_stop(struct ath_softc *sc)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_hal *ah = sc-&gt;sc_ah;</div><div class='ctx'> </div><div class='del'>-	DPRINTF(sc, ATH_DBG_CONFIG, "%s: invalid %u\n",</div><div class='del'>-		__func__, sc-&gt;sc_invalid);</div><div class='add'>+	DPRINTF(sc, ATH_DBG_CONFIG, "%s: invalid %ld\n",</div><div class='add'>+		__func__, sc-&gt;sc_flags &amp; SC_OP_INVALID);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Shutdown the hardware and driver:</div><div class='ctx'> 	 *    stop output from above</div><div class='del'>-	 *    reset 802.11 state machine</div><div class='del'>-	 *      (sends station deassoc/deauth frames)</div><div class='ctx'> 	 *    turn off timers</div><div class='ctx'> 	 *    disable interrupts</div><div class='ctx'> 	 *    clear transmit machinery</div><div class='hunk'>@@ -295,7 +289,7 @@ static int ath_stop(struct ath_softc *sc)</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	ath_draintxq(sc, false);</div><div class='del'>-	if (!sc-&gt;sc_invalid) {</div><div class='add'>+	if (!(sc-&gt;sc_flags &amp; SC_OP_INVALID)) {</div><div class='ctx'> 		ath_stoprecv(sc);</div><div class='ctx'> 		ath9k_hw_phy_disable(ah);</div><div class='ctx'> 	} else</div><div class='hunk'>@@ -305,56 +299,6 @@ static int ath_stop(struct ath_softc *sc)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- *  Start Scan</div><div class='del'>- *</div><div class='del'>- *  This function is called when starting a channel scan.  It will perform</div><div class='del'>- *  power save wakeup processing, set the filter for the scan, and get the</div><div class='del'>- *  chip ready to send broadcast packets out during the scan.</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-void ath_scan_start(struct ath_softc *sc)</div><div class='del'>-{</div><div class='del'>-	struct ath_hal *ah = sc-&gt;sc_ah;</div><div class='del'>-	u32 rfilt;</div><div class='del'>-	u32 now = (u32) jiffies_to_msecs(get_timestamp());</div><div class='del'>-</div><div class='del'>-	sc-&gt;sc_scanning = 1;</div><div class='del'>-	rfilt = ath_calcrxfilter(sc);</div><div class='del'>-	ath9k_hw_setrxfilter(ah, rfilt);</div><div class='del'>-	ath9k_hw_write_associd(ah, ath_bcast_mac, 0);</div><div class='del'>-</div><div class='del'>-	/* Restore previous power management state. */</div><div class='del'>-</div><div class='del'>-	DPRINTF(sc, ATH_DBG_CONFIG, "%d.%03d | %s: RX filter 0x%x aid 0\n",</div><div class='del'>-		now / 1000, now % 1000, __func__, rfilt);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *  Scan End</div><div class='del'>- *</div><div class='del'>- *  This routine is called by the upper layer when the scan is completed.  This</div><div class='del'>- *  will set the filters back to normal operating mode, set the BSSID to the</div><div class='del'>- *  correct value, and restore the power save state.</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-void ath_scan_end(struct ath_softc *sc)</div><div class='del'>-{</div><div class='del'>-	struct ath_hal *ah = sc-&gt;sc_ah;</div><div class='del'>-	u32 rfilt;</div><div class='del'>-	u32 now = (u32) jiffies_to_msecs(get_timestamp());</div><div class='del'>-</div><div class='del'>-	sc-&gt;sc_scanning = 0;</div><div class='del'>-	/* Request for a full reset due to rx packet filter changes */</div><div class='del'>-	sc-&gt;sc_full_reset = 1;</div><div class='del'>-	rfilt = ath_calcrxfilter(sc);</div><div class='del'>-	ath9k_hw_setrxfilter(ah, rfilt);</div><div class='del'>-	ath9k_hw_write_associd(ah, sc-&gt;sc_curbssid, sc-&gt;sc_curaid);</div><div class='del'>-</div><div class='del'>-	DPRINTF(sc, ATH_DBG_CONFIG, "%d.%03d | %s: RX filter 0x%x aid 0x%x\n",</div><div class='del'>-		now / 1000, now % 1000, __func__, rfilt, sc-&gt;sc_curaid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * Set the current channel</div><div class='ctx'>  *</div><div class='ctx'>  * Set/change channels.  If the channel is really being changed, it's done</div><div class='hunk'>@@ -365,25 +309,23 @@ int ath_set_channel(struct ath_softc *sc, struct ath9k_channel *hchan)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_hal *ah = sc-&gt;sc_ah;</div><div class='ctx'> 	bool fastcc = true, stopped;</div><div class='del'>-	enum ath9k_ht_macmode ht_macmode;</div><div class='ctx'> </div><div class='del'>-	if (sc-&gt;sc_invalid)	/* if the device is invalid or removed */</div><div class='add'>+	if (sc-&gt;sc_flags &amp; SC_OP_INVALID) /* the device is invalid or removed */</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='ctx'> 	DPRINTF(sc, ATH_DBG_CONFIG,</div><div class='ctx'> 		"%s: %u (%u MHz) -&gt; %u (%u MHz), cflags:%x\n",</div><div class='ctx'> 		__func__,</div><div class='del'>-		ath9k_hw_mhz2ieee(ah, sc-&gt;sc_curchan.channel,</div><div class='del'>-				  sc-&gt;sc_curchan.channelFlags),</div><div class='del'>-		sc-&gt;sc_curchan.channel,</div><div class='add'>+		ath9k_hw_mhz2ieee(ah, sc-&gt;sc_ah-&gt;ah_curchan-&gt;channel,</div><div class='add'>+				  sc-&gt;sc_ah-&gt;ah_curchan-&gt;channelFlags),</div><div class='add'>+		sc-&gt;sc_ah-&gt;ah_curchan-&gt;channel,</div><div class='ctx'> 		ath9k_hw_mhz2ieee(ah, hchan-&gt;channel, hchan-&gt;channelFlags),</div><div class='ctx'> 		hchan-&gt;channel, hchan-&gt;channelFlags);</div><div class='ctx'> </div><div class='del'>-	ht_macmode = ath_cwm_macmode(sc);</div><div class='del'>-</div><div class='del'>-	if (hchan-&gt;channel != sc-&gt;sc_curchan.channel ||</div><div class='del'>-	    hchan-&gt;channelFlags != sc-&gt;sc_curchan.channelFlags ||</div><div class='del'>-	    sc-&gt;sc_update_chainmask || sc-&gt;sc_full_reset) {</div><div class='add'>+	if (hchan-&gt;channel != sc-&gt;sc_ah-&gt;ah_curchan-&gt;channel ||</div><div class='add'>+	    hchan-&gt;channelFlags != sc-&gt;sc_ah-&gt;ah_curchan-&gt;channelFlags ||</div><div class='add'>+	    (sc-&gt;sc_flags &amp; SC_OP_CHAINMASK_UPDATE) ||</div><div class='add'>+	    (sc-&gt;sc_flags &amp; SC_OP_FULL_RESET)) {</div><div class='ctx'> 		int status;</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * This is only performed if the channel settings have</div><div class='hunk'>@@ -402,15 +344,16 @@ int ath_set_channel(struct ath_softc *sc, struct ath9k_channel *hchan)</div><div class='ctx'> 		 * to flush data frames already in queue because of</div><div class='ctx'> 		 * changing channel. */</div><div class='ctx'> </div><div class='del'>-		if (!stopped || sc-&gt;sc_full_reset)</div><div class='add'>+		if (!stopped || (sc-&gt;sc_flags &amp; SC_OP_FULL_RESET))</div><div class='ctx'> 			fastcc = false;</div><div class='ctx'> </div><div class='ctx'> 		spin_lock_bh(&amp;sc-&gt;sc_resetlock);</div><div class='del'>-		if (!ath9k_hw_reset(ah, sc-&gt;sc_opmode, hchan,</div><div class='del'>-					ht_macmode, sc-&gt;sc_tx_chainmask,</div><div class='del'>-					sc-&gt;sc_rx_chainmask,</div><div class='del'>-					sc-&gt;sc_ht_extprotspacing,</div><div class='del'>-					fastcc, &amp;status)) {</div><div class='add'>+		if (!ath9k_hw_reset(ah, hchan,</div><div class='add'>+				    sc-&gt;sc_ht_info.tx_chan_width,</div><div class='add'>+				    sc-&gt;sc_tx_chainmask,</div><div class='add'>+				    sc-&gt;sc_rx_chainmask,</div><div class='add'>+				    sc-&gt;sc_ht_extprotspacing,</div><div class='add'>+				    fastcc, &amp;status)) {</div><div class='ctx'> 			DPRINTF(sc, ATH_DBG_FATAL,</div><div class='ctx'> 				"%s: unable to reset channel %u (%uMhz) "</div><div class='ctx'> 				"flags 0x%x hal status %u\n", __func__,</div><div class='hunk'>@@ -422,9 +365,8 @@ int ath_set_channel(struct ath_softc *sc, struct ath9k_channel *hchan)</div><div class='ctx'> 		}</div><div class='ctx'> 		spin_unlock_bh(&amp;sc-&gt;sc_resetlock);</div><div class='ctx'> </div><div class='del'>-		sc-&gt;sc_curchan = *hchan;</div><div class='del'>-		sc-&gt;sc_update_chainmask = 0;</div><div class='del'>-		sc-&gt;sc_full_reset = 0;</div><div class='add'>+		sc-&gt;sc_flags &amp;= ~SC_OP_CHAINMASK_UPDATE;</div><div class='add'>+		sc-&gt;sc_flags &amp;= ~SC_OP_FULL_RESET;</div><div class='ctx'> </div><div class='ctx'> 		/* Re-enable rx framework */</div><div class='ctx'> 		if (ath_startrecv(sc) != 0) {</div><div class='hunk'>@@ -475,7 +417,7 @@ static void ath_chainmask_sel_init(struct ath_softc *sc, struct ath_node *an)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_chainmask_sel *cm = &amp;an-&gt;an_chainmask_sel;</div><div class='ctx'> </div><div class='del'>-	memzero(cm, sizeof(struct ath_chainmask_sel));</div><div class='add'>+	memset(cm, 0, sizeof(struct ath_chainmask_sel));</div><div class='ctx'> </div><div class='ctx'> 	cm-&gt;cur_tx_mask = sc-&gt;sc_tx_chainmask;</div><div class='ctx'> 	cm-&gt;cur_rx_mask = sc-&gt;sc_rx_chainmask;</div><div class='hunk'>@@ -535,7 +477,7 @@ int ath_chainmask_sel_logic(struct ath_softc *sc, struct ath_node *an)</div><div class='ctx'> </div><div class='ctx'> void ath_update_chainmask(struct ath_softc *sc, int is_ht)</div><div class='ctx'> {</div><div class='del'>-	sc-&gt;sc_update_chainmask = 1;</div><div class='add'>+	sc-&gt;sc_flags |= SC_OP_CHAINMASK_UPDATE;</div><div class='ctx'> 	if (is_ht) {</div><div class='ctx'> 		sc-&gt;sc_tx_chainmask = sc-&gt;sc_ah-&gt;ah_caps.tx_chainmask;</div><div class='ctx'> 		sc-&gt;sc_rx_chainmask = sc-&gt;sc_ah-&gt;ah_caps.rx_chainmask;</div><div class='hunk'>@@ -548,66 +490,126 @@ void ath_update_chainmask(struct ath_softc *sc, int is_ht)</div><div class='ctx'> 		__func__, sc-&gt;sc_tx_chainmask, sc-&gt;sc_rx_chainmask);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/******************/</div><div class='del'>-/* VAP management */</div><div class='del'>-/******************/</div><div class='add'>+/*******/</div><div class='add'>+/* ANI */</div><div class='add'>+/*******/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- *  VAP in Listen mode</div><div class='del'>- *</div><div class='del'>- *  This routine brings the VAP out of the down state into a "listen" state</div><div class='del'>- *  where it waits for association requests.  This is used in AP and AdHoc</div><div class='del'>- *  modes.</div><div class='del'>-*/</div><div class='add'>+ *  This routine performs the periodic noise floor calibration function</div><div class='add'>+ *  that is used to adjust and optimize the chip performance.  This</div><div class='add'>+ *  takes environmental changes (location, temperature) into account.</div><div class='add'>+ *  When the task is complete, it reschedules itself depending on the</div><div class='add'>+ *  appropriate interval that was calculated.</div><div class='add'>+ */</div><div class='ctx'> </div><div class='del'>-int ath_vap_listen(struct ath_softc *sc, int if_id)</div><div class='add'>+static void ath_ani_calibrate(unsigned long data)</div><div class='ctx'> {</div><div class='del'>-	struct ath_hal *ah = sc-&gt;sc_ah;</div><div class='del'>-	struct ath_vap *avp;</div><div class='del'>-	u32 rfilt = 0;</div><div class='del'>-	DECLARE_MAC_BUF(mac);</div><div class='add'>+	struct ath_softc *sc;</div><div class='add'>+	struct ath_hal *ah;</div><div class='add'>+	bool longcal = false;</div><div class='add'>+	bool shortcal = false;</div><div class='add'>+	bool aniflag = false;</div><div class='add'>+	unsigned int timestamp = jiffies_to_msecs(jiffies);</div><div class='add'>+	u32 cal_interval;</div><div class='ctx'> </div><div class='del'>-	avp = sc-&gt;sc_vaps[if_id];</div><div class='del'>-	if (avp == NULL) {</div><div class='del'>-		DPRINTF(sc, ATH_DBG_FATAL, "%s: invalid interface id %u\n",</div><div class='del'>-			__func__, if_id);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='add'>+	sc = (struct ath_softc *)data;</div><div class='add'>+	ah = sc-&gt;sc_ah;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SLOW_ANT_DIV</div><div class='del'>-	ath_slow_ant_div_stop(&amp;sc-&gt;sc_antdiv);</div><div class='del'>-#endif</div><div class='add'>+	/*</div><div class='add'>+	* don't calibrate when we're scanning.</div><div class='add'>+	* we are most likely not on our home channel.</div><div class='add'>+	*/</div><div class='add'>+	if (sc-&gt;rx_filter &amp; FIF_BCN_PRBRESP_PROMISC)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	/* update ratectrl about the new state */</div><div class='del'>-	ath_rate_newstate(sc, avp);</div><div class='add'>+	/* Long calibration runs independently of short calibration. */</div><div class='add'>+	if ((timestamp - sc-&gt;sc_ani.sc_longcal_timer) &gt;= ATH_LONG_CALINTERVAL) {</div><div class='add'>+		longcal = true;</div><div class='add'>+		DPRINTF(sc, ATH_DBG_ANI, "%s: longcal @%lu\n",</div><div class='add'>+			__func__, jiffies);</div><div class='add'>+		sc-&gt;sc_ani.sc_longcal_timer = timestamp;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	rfilt = ath_calcrxfilter(sc);</div><div class='del'>-	ath9k_hw_setrxfilter(ah, rfilt);</div><div class='add'>+	/* Short calibration applies only while sc_caldone is false */</div><div class='add'>+	if (!sc-&gt;sc_ani.sc_caldone) {</div><div class='add'>+		if ((timestamp - sc-&gt;sc_ani.sc_shortcal_timer) &gt;=</div><div class='add'>+		    ATH_SHORT_CALINTERVAL) {</div><div class='add'>+			shortcal = true;</div><div class='add'>+			DPRINTF(sc, ATH_DBG_ANI, "%s: shortcal @%lu\n",</div><div class='add'>+			       __func__, jiffies);</div><div class='add'>+			sc-&gt;sc_ani.sc_shortcal_timer = timestamp;</div><div class='add'>+			sc-&gt;sc_ani.sc_resetcal_timer = timestamp;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		if ((timestamp - sc-&gt;sc_ani.sc_resetcal_timer) &gt;=</div><div class='add'>+		    ATH_RESTART_CALINTERVAL) {</div><div class='add'>+			ath9k_hw_reset_calvalid(ah, ah-&gt;ah_curchan,</div><div class='add'>+						&amp;sc-&gt;sc_ani.sc_caldone);</div><div class='add'>+			if (sc-&gt;sc_ani.sc_caldone)</div><div class='add'>+				sc-&gt;sc_ani.sc_resetcal_timer = timestamp;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (sc-&gt;sc_opmode == ATH9K_M_STA || sc-&gt;sc_opmode == ATH9K_M_IBSS) {</div><div class='del'>-		memcpy(sc-&gt;sc_curbssid, ath_bcast_mac, ETH_ALEN);</div><div class='del'>-		ath9k_hw_write_associd(ah, sc-&gt;sc_curbssid, sc-&gt;sc_curaid);</div><div class='del'>-	} else</div><div class='del'>-		sc-&gt;sc_curaid = 0;</div><div class='add'>+	/* Verify whether we must check ANI */</div><div class='add'>+	if ((timestamp - sc-&gt;sc_ani.sc_checkani_timer) &gt;=</div><div class='add'>+	   ATH_ANI_POLLINTERVAL) {</div><div class='add'>+		aniflag = true;</div><div class='add'>+		sc-&gt;sc_ani.sc_checkani_timer = timestamp;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	DPRINTF(sc, ATH_DBG_CONFIG,</div><div class='del'>-		"%s: RX filter 0x%x bssid %s aid 0x%x\n",</div><div class='del'>-		__func__, rfilt, print_mac(mac,</div><div class='del'>-			sc-&gt;sc_curbssid), sc-&gt;sc_curaid);</div><div class='add'>+	/* Skip all processing if there's nothing to do. */</div><div class='add'>+	if (longcal || shortcal || aniflag) {</div><div class='add'>+		/* Call ANI routine if necessary */</div><div class='add'>+		if (aniflag)</div><div class='add'>+			ath9k_hw_ani_monitor(ah, &amp;sc-&gt;sc_halstats,</div><div class='add'>+					     ah-&gt;ah_curchan);</div><div class='add'>+</div><div class='add'>+		/* Perform calibration if necessary */</div><div class='add'>+		if (longcal || shortcal) {</div><div class='add'>+			bool iscaldone = false;</div><div class='add'>+</div><div class='add'>+			if (ath9k_hw_calibrate(ah, ah-&gt;ah_curchan,</div><div class='add'>+					       sc-&gt;sc_rx_chainmask, longcal,</div><div class='add'>+					       &amp;iscaldone)) {</div><div class='add'>+				if (longcal)</div><div class='add'>+					sc-&gt;sc_ani.sc_noise_floor =</div><div class='add'>+						ath9k_hw_getchan_noise(ah,</div><div class='add'>+							       ah-&gt;ah_curchan);</div><div class='add'>+</div><div class='add'>+				DPRINTF(sc, ATH_DBG_ANI,</div><div class='add'>+					"%s: calibrate chan %u/%x nf: %d\n",</div><div class='add'>+					 __func__,</div><div class='add'>+					ah-&gt;ah_curchan-&gt;channel,</div><div class='add'>+					ah-&gt;ah_curchan-&gt;channelFlags,</div><div class='add'>+					sc-&gt;sc_ani.sc_noise_floor);</div><div class='add'>+			} else {</div><div class='add'>+				DPRINTF(sc, ATH_DBG_ANY,</div><div class='add'>+					"%s: calibrate chan %u/%x failed\n",</div><div class='add'>+					 __func__,</div><div class='add'>+					ah-&gt;ah_curchan-&gt;channel,</div><div class='add'>+					ah-&gt;ah_curchan-&gt;channelFlags);</div><div class='add'>+			}</div><div class='add'>+			sc-&gt;sc_ani.sc_caldone = iscaldone;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * XXXX</div><div class='del'>-	 * Disable BMISS interrupt when we're not associated</div><div class='del'>-	 */</div><div class='del'>-	ath9k_hw_set_interrupts(ah,</div><div class='del'>-		sc-&gt;sc_imask &amp; ~(ATH9K_INT_SWBA | ATH9K_INT_BMISS));</div><div class='del'>-	sc-&gt;sc_imask &amp;= ~(ATH9K_INT_SWBA | ATH9K_INT_BMISS);</div><div class='del'>-	/* need to reconfigure the beacons when it moves to RUN */</div><div class='del'>-	sc-&gt;sc_beacons = 0;</div><div class='add'>+	* Set timer interval based on previous results.</div><div class='add'>+	* The interval must be the shortest necessary to satisfy ANI,</div><div class='add'>+	* short calibration and long calibration.</div><div class='add'>+	*/</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	cal_interval = ATH_ANI_POLLINTERVAL;</div><div class='add'>+	if (!sc-&gt;sc_ani.sc_caldone)</div><div class='add'>+		cal_interval = min(cal_interval, (u32)ATH_SHORT_CALINTERVAL);</div><div class='add'>+</div><div class='add'>+	mod_timer(&amp;sc-&gt;sc_ani.timer, jiffies + msecs_to_jiffies(cal_interval));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/******************/</div><div class='add'>+/* VAP management */</div><div class='add'>+/******************/</div><div class='add'>+</div><div class='ctx'> int ath_vap_attach(struct ath_softc *sc,</div><div class='ctx'> 		   int if_id,</div><div class='ctx'> 		   struct ieee80211_vif *if_data,</div><div class='hunk'>@@ -640,21 +642,19 @@ int ath_vap_attach(struct ath_softc *sc,</div><div class='ctx'> 	if (avp == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	memzero(avp, sizeof(struct ath_vap));</div><div class='add'>+	memset(avp, 0, sizeof(struct ath_vap));</div><div class='ctx'> 	avp-&gt;av_if_data = if_data;</div><div class='ctx'> 	/* Set the VAP opmode */</div><div class='ctx'> 	avp-&gt;av_opmode = opmode;</div><div class='ctx'> 	avp-&gt;av_bslot = -1;</div><div class='del'>-	INIT_LIST_HEAD(&amp;avp-&gt;av_mcastq.axq_q);</div><div class='del'>-	INIT_LIST_HEAD(&amp;avp-&gt;av_mcastq.axq_acq);</div><div class='del'>-	spin_lock_init(&amp;avp-&gt;av_mcastq.axq_lock);</div><div class='ctx'> </div><div class='del'>-	ath9k_hw_set_tsfadjust(sc-&gt;sc_ah, 1);</div><div class='add'>+	if (opmode == ATH9K_M_HOSTAP)</div><div class='add'>+		ath9k_hw_set_tsfadjust(sc-&gt;sc_ah, 1);</div><div class='ctx'> </div><div class='ctx'> 	sc-&gt;sc_vaps[if_id] = avp;</div><div class='ctx'> 	sc-&gt;sc_nvaps++;</div><div class='ctx'> 	/* Set the device opmode */</div><div class='del'>-	sc-&gt;sc_opmode = opmode;</div><div class='add'>+	sc-&gt;sc_ah-&gt;ah_opmode = opmode;</div><div class='ctx'> </div><div class='ctx'> 	/* default VAP configuration */</div><div class='ctx'> 	avp-&gt;av_config.av_fixed_rateset = IEEE80211_FIXED_RATE_NONE;</div><div class='hunk'>@@ -687,9 +687,6 @@ int ath_vap_detach(struct ath_softc *sc, int if_id)</div><div class='ctx'> 	ath_stoprecv(sc);	/* stop recv side */</div><div class='ctx'> 	ath_flushrecv(sc);	/* flush recv queue */</div><div class='ctx'> </div><div class='del'>-	/* Reclaim any pending mcast bufs on the vap. */</div><div class='del'>-	ath_tx_draintxq(sc, &amp;avp-&gt;av_mcastq, false);</div><div class='del'>-</div><div class='ctx'> 	kfree(avp);</div><div class='ctx'> 	sc-&gt;sc_vaps[if_id] = NULL;</div><div class='ctx'> 	sc-&gt;sc_nvaps--;</div><div class='hunk'>@@ -726,9 +723,9 @@ int ath_open(struct ath_softc *sc, struct ath9k_channel *initial_chan)</div><div class='ctx'> 	struct ath_hal *ah = sc-&gt;sc_ah;</div><div class='ctx'> 	int status;</div><div class='ctx'> 	int error = 0;</div><div class='del'>-	enum ath9k_ht_macmode ht_macmode = ath_cwm_macmode(sc);</div><div class='ctx'> </div><div class='del'>-	DPRINTF(sc, ATH_DBG_CONFIG, "%s: mode %d\n", __func__, sc-&gt;sc_opmode);</div><div class='add'>+	DPRINTF(sc, ATH_DBG_CONFIG, "%s: mode %d\n",</div><div class='add'>+		__func__, sc-&gt;sc_ah-&gt;ah_opmode);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Stop anything previously setup.  This is safe</div><div class='hunk'>@@ -750,16 +747,16 @@ int ath_open(struct ath_softc *sc, struct ath9k_channel *initial_chan)</div><div class='ctx'> 	 * be followed by initialization of the appropriate bits</div><div class='ctx'> 	 * and then setup of the interrupt mask.</div><div class='ctx'> 	 */</div><div class='del'>-	sc-&gt;sc_curchan = *initial_chan;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;sc-&gt;sc_resetlock);</div><div class='del'>-	if (!ath9k_hw_reset(ah, sc-&gt;sc_opmode, &amp;sc-&gt;sc_curchan, ht_macmode,</div><div class='del'>-			   sc-&gt;sc_tx_chainmask, sc-&gt;sc_rx_chainmask,</div><div class='del'>-			   sc-&gt;sc_ht_extprotspacing, false, &amp;status)) {</div><div class='add'>+	if (!ath9k_hw_reset(ah, initial_chan,</div><div class='add'>+			    sc-&gt;sc_ht_info.tx_chan_width,</div><div class='add'>+			    sc-&gt;sc_tx_chainmask, sc-&gt;sc_rx_chainmask,</div><div class='add'>+			    sc-&gt;sc_ht_extprotspacing, false, &amp;status)) {</div><div class='ctx'> 		DPRINTF(sc, ATH_DBG_FATAL,</div><div class='ctx'> 			"%s: unable to reset hardware; hal status %u "</div><div class='ctx'> 			"(freq %u flags 0x%x)\n", __func__, status,</div><div class='del'>-			sc-&gt;sc_curchan.channel, sc-&gt;sc_curchan.channelFlags);</div><div class='add'>+			initial_chan-&gt;channel, initial_chan-&gt;channelFlags);</div><div class='ctx'> 		error = -EIO;</div><div class='ctx'> 		spin_unlock_bh(&amp;sc-&gt;sc_resetlock);</div><div class='ctx'> 		goto done;</div><div class='hunk'>@@ -795,20 +792,14 @@ int ath_open(struct ath_softc *sc, struct ath9k_channel *initial_chan)</div><div class='ctx'> 	if (ah-&gt;ah_caps.hw_caps &amp; ATH9K_HW_CAP_HT)</div><div class='ctx'> 		sc-&gt;sc_imask |= ATH9K_INT_CST;</div><div class='ctx'> </div><div class='del'>-	/* Note: We disable MIB interrupts for now as we don't yet</div><div class='del'>-	 * handle processing ANI, otherwise you will get an interrupt</div><div class='del'>-	 * storm after about 7 hours of usage making the system unusable</div><div class='del'>-	 * with huge latency. Once we do have ANI processing included</div><div class='del'>-	 * we can re-enable this interrupt. */</div><div class='del'>-#if 0</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Enable MIB interrupts when there are hardware phy counters.</div><div class='ctx'> 	 * Note we only do this (at the moment) for station mode.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (ath9k_hw_phycounters(ah) &amp;&amp;</div><div class='del'>-	    ((sc-&gt;sc_opmode == ATH9K_M_STA) || (sc-&gt;sc_opmode == ATH9K_M_IBSS)))</div><div class='add'>+	    ((sc-&gt;sc_ah-&gt;ah_opmode == ATH9K_M_STA) ||</div><div class='add'>+	     (sc-&gt;sc_ah-&gt;ah_opmode == ATH9K_M_IBSS)))</div><div class='ctx'> 		sc-&gt;sc_imask |= ATH9K_INT_MIB;</div><div class='del'>-#endif</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Some hardware processes the TIM IE and fires an</div><div class='ctx'> 	 * interrupt when the TIM bit is set.  For hardware</div><div class='hunk'>@@ -816,7 +807,7 @@ int ath_open(struct ath_softc *sc, struct ath9k_channel *initial_chan)</div><div class='ctx'> 	 * enable the TIM interrupt when operating as station.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if ((ah-&gt;ah_caps.hw_caps &amp; ATH9K_HW_CAP_ENHANCEDPM) &amp;&amp;</div><div class='del'>-	    (sc-&gt;sc_opmode == ATH9K_M_STA) &amp;&amp;</div><div class='add'>+	    (sc-&gt;sc_ah-&gt;ah_opmode == ATH9K_M_STA) &amp;&amp;</div><div class='ctx'> 	    !sc-&gt;sc_config.swBeaconProcess)</div><div class='ctx'> 		sc-&gt;sc_imask |= ATH9K_INT_TIM;</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -828,34 +819,34 @@ int ath_open(struct ath_softc *sc, struct ath9k_channel *initial_chan)</div><div class='ctx'> </div><div class='ctx'> 	/* XXX: we must make sure h/w is ready and clear invalid flag</div><div class='ctx'> 	 * before turning on interrupt. */</div><div class='del'>-	sc-&gt;sc_invalid = 0;</div><div class='add'>+	sc-&gt;sc_flags &amp;= ~SC_OP_INVALID;</div><div class='ctx'> done:</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Reset the hardware w/o losing operational state.  This is</div><div class='del'>- * basically a more efficient way of doing ath_stop, ath_init,</div><div class='del'>- * followed by state transitions to the current 802.11</div><div class='del'>- * operational state.  Used to recover from errors rx overrun</div><div class='del'>- * and to reset the hardware when rf gain settings must be reset.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int ath_reset_start(struct ath_softc *sc, u32 flag)</div><div class='add'>+int ath_reset(struct ath_softc *sc, bool retry_tx)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_hal *ah = sc-&gt;sc_ah;</div><div class='add'>+	int status;</div><div class='add'>+	int error = 0;</div><div class='ctx'> </div><div class='ctx'> 	ath9k_hw_set_interrupts(ah, 0);	/* disable interrupts */</div><div class='del'>-	ath_draintxq(sc, flag &amp; RESET_RETRY_TXQ);	/* stop xmit side */</div><div class='del'>-	ath_stoprecv(sc);	/* stop recv side */</div><div class='del'>-	ath_flushrecv(sc);	/* flush recv queue */</div><div class='add'>+	ath_draintxq(sc, retry_tx);	/* stop xmit */</div><div class='add'>+	ath_stoprecv(sc);		/* stop recv */</div><div class='add'>+	ath_flushrecv(sc);		/* flush recv queue */</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ath_reset_end(struct ath_softc *sc, u32 flag)</div><div class='del'>-{</div><div class='del'>-	struct ath_hal *ah = sc-&gt;sc_ah;</div><div class='add'>+	/* Reset chip */</div><div class='add'>+	spin_lock_bh(&amp;sc-&gt;sc_resetlock);</div><div class='add'>+	if (!ath9k_hw_reset(ah, sc-&gt;sc_ah-&gt;ah_curchan,</div><div class='add'>+			    sc-&gt;sc_ht_info.tx_chan_width,</div><div class='add'>+			    sc-&gt;sc_tx_chainmask, sc-&gt;sc_rx_chainmask,</div><div class='add'>+			    sc-&gt;sc_ht_extprotspacing, false, &amp;status)) {</div><div class='add'>+		DPRINTF(sc, ATH_DBG_FATAL,</div><div class='add'>+			"%s: unable to reset hardware; hal status %u\n",</div><div class='add'>+			__func__, status);</div><div class='add'>+		error = -EIO;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(&amp;sc-&gt;sc_resetlock);</div><div class='ctx'> </div><div class='ctx'> 	if (ath_startrecv(sc) != 0)	/* restart recv */</div><div class='ctx'> 		DPRINTF(sc, ATH_DBG_FATAL,</div><div class='hunk'>@@ -866,16 +857,17 @@ static int ath_reset_end(struct ath_softc *sc, u32 flag)</div><div class='ctx'> 	 * that changes the channel so update any state that</div><div class='ctx'> 	 * might change as a result.</div><div class='ctx'> 	 */</div><div class='del'>-	ath_setcurmode(sc, ath_chan2mode(&amp;sc-&gt;sc_curchan));</div><div class='add'>+	ath_setcurmode(sc, ath_chan2mode(sc-&gt;sc_ah-&gt;ah_curchan));</div><div class='ctx'> </div><div class='del'>-	ath_update_txpow(sc);	/* update tx power state */</div><div class='add'>+	ath_update_txpow(sc);</div><div class='ctx'> </div><div class='del'>-	if (sc-&gt;sc_beacons)</div><div class='add'>+	if (sc-&gt;sc_flags &amp; SC_OP_BEACONS)</div><div class='ctx'> 		ath_beacon_config(sc, ATH_IF_ID_ANY);	/* restart beacons */</div><div class='add'>+</div><div class='ctx'> 	ath9k_hw_set_interrupts(ah, sc-&gt;sc_imask);</div><div class='ctx'> </div><div class='ctx'> 	/* Restart the txq */</div><div class='del'>-	if (flag &amp; RESET_RETRY_TXQ) {</div><div class='add'>+	if (retry_tx) {</div><div class='ctx'> 		int i;</div><div class='ctx'> 		for (i = 0; i &lt; ATH9K_NUM_TX_QUEUES; i++) {</div><div class='ctx'> 			if (ATH_TXQ_SETUP(sc, i)) {</div><div class='hunk'>@@ -885,28 +877,6 @@ static int ath_reset_end(struct ath_softc *sc, u32 flag)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int ath_reset(struct ath_softc *sc)</div><div class='del'>-{</div><div class='del'>-	struct ath_hal *ah = sc-&gt;sc_ah;</div><div class='del'>-	int status;</div><div class='del'>-	int error = 0;</div><div class='del'>-	enum ath9k_ht_macmode ht_macmode = ath_cwm_macmode(sc);</div><div class='del'>-</div><div class='del'>-	/* NB: indicate channel change so we do a full reset */</div><div class='del'>-	spin_lock_bh(&amp;sc-&gt;sc_resetlock);</div><div class='del'>-	if (!ath9k_hw_reset(ah, sc-&gt;sc_opmode, &amp;sc-&gt;sc_curchan,</div><div class='del'>-			   ht_macmode,</div><div class='del'>-			   sc-&gt;sc_tx_chainmask, sc-&gt;sc_rx_chainmask,</div><div class='del'>-			   sc-&gt;sc_ht_extprotspacing, false, &amp;status)) {</div><div class='del'>-		DPRINTF(sc, ATH_DBG_FATAL,</div><div class='del'>-			"%s: unable to reset hardware; hal status %u\n",</div><div class='del'>-			__func__, status);</div><div class='del'>-		error = -EIO;</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_bh(&amp;sc-&gt;sc_resetlock);</div><div class='ctx'> </div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='hunk'>@@ -916,7 +886,7 @@ int ath_suspend(struct ath_softc *sc)</div><div class='ctx'> 	struct ath_hal *ah = sc-&gt;sc_ah;</div><div class='ctx'> </div><div class='ctx'> 	/* No I/O if device has been surprise removed */</div><div class='del'>-	if (sc-&gt;sc_invalid)</div><div class='add'>+	if (sc-&gt;sc_flags &amp; SC_OP_INVALID)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='ctx'> 	/* Shut off the interrupt before setting sc-&gt;sc_invalid to '1' */</div><div class='hunk'>@@ -924,7 +894,7 @@ int ath_suspend(struct ath_softc *sc)</div><div class='ctx'> </div><div class='ctx'> 	/* XXX: we must make sure h/w will not generate any interrupt</div><div class='ctx'> 	 * before setting the invalid flag. */</div><div class='del'>-	sc-&gt;sc_invalid = 1;</div><div class='add'>+	sc-&gt;sc_flags |= SC_OP_INVALID;</div><div class='ctx'> </div><div class='ctx'> 	/* disable HAL and put h/w to sleep */</div><div class='ctx'> 	ath9k_hw_disable(sc-&gt;sc_ah);</div><div class='hunk'>@@ -945,7 +915,7 @@ irqreturn_t ath_isr(int irq, void *dev)</div><div class='ctx'> 	bool sched = false;</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='del'>-		if (sc-&gt;sc_invalid) {</div><div class='add'>+		if (sc-&gt;sc_flags &amp; SC_OP_INVALID) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * The hardware is not ready/present, don't</div><div class='ctx'> 			 * touch anything. Note this can happen early</div><div class='hunk'>@@ -1055,7 +1025,7 @@ static void ath9k_tasklet(unsigned long data)</div><div class='ctx'> </div><div class='ctx'> 	if (status &amp; ATH9K_INT_FATAL) {</div><div class='ctx'> 		/* need a chip reset */</div><div class='del'>-		ath_internal_reset(sc);</div><div class='add'>+		ath_reset(sc, false);</div><div class='ctx'> 		return;</div><div class='ctx'> 	} else {</div><div class='ctx'> </div><div class='hunk'>@@ -1098,10 +1068,9 @@ int ath_init(u16 devid, struct ath_softc *sc)</div><div class='ctx'> 	int status;</div><div class='ctx'> 	int error = 0, i;</div><div class='ctx'> 	int csz = 0;</div><div class='del'>-	u32 rd;</div><div class='ctx'> </div><div class='ctx'> 	/* XXX: hardware will not be ready until ath_open() being called */</div><div class='del'>-	sc-&gt;sc_invalid = 1;</div><div class='add'>+	sc-&gt;sc_flags |= SC_OP_INVALID;</div><div class='ctx'> </div><div class='ctx'> 	sc-&gt;sc_debug = DBG_DEFAULT;</div><div class='ctx'> 	DPRINTF(sc, ATH_DBG_CONFIG, "%s: devid 0x%x\n", __func__, devid);</div><div class='hunk'>@@ -1131,8 +1100,9 @@ int ath_init(u16 devid, struct ath_softc *sc)</div><div class='ctx'> 	}</div><div class='ctx'> 	sc-&gt;sc_ah = ah;</div><div class='ctx'> </div><div class='del'>-	/* Get the chipset-specific aggr limit. */</div><div class='del'>-	sc-&gt;sc_rtsaggrlimit = ah-&gt;ah_caps.rts_aggr_limit;</div><div class='add'>+	/* Initializes the noise floor to a reasonable default value.</div><div class='add'>+	 * Later on this will be updated during ANI processing. */</div><div class='add'>+	sc-&gt;sc_ani.sc_noise_floor = ATH_DEFAULT_NOISE_FLOOR;</div><div class='ctx'> </div><div class='ctx'> 	/* Get the hardware key cache size. */</div><div class='ctx'> 	sc-&gt;sc_keymax = ah-&gt;ah_caps.keycache_size;</div><div class='hunk'>@@ -1167,14 +1137,12 @@ int ath_init(u16 devid, struct ath_softc *sc)</div><div class='ctx'> 	 * is resposible for filtering this list based on settings</div><div class='ctx'> 	 * like the phy mode.</div><div class='ctx'> 	 */</div><div class='del'>-	rd = ah-&gt;ah_currentRD;</div><div class='del'>-</div><div class='ctx'> 	error = ath_setup_channels(sc);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto bad;</div><div class='ctx'> </div><div class='ctx'> 	/* default to STA mode */</div><div class='del'>-	sc-&gt;sc_opmode = ATH9K_M_MONITOR;</div><div class='add'>+	sc-&gt;sc_ah-&gt;ah_opmode = ATH9K_M_MONITOR;</div><div class='ctx'> </div><div class='ctx'> 	/* Setup rate tables */</div><div class='ctx'> </div><div class='hunk'>@@ -1243,9 +1211,11 @@ int ath_init(u16 devid, struct ath_softc *sc)</div><div class='ctx'> 		goto bad2;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	setup_timer(&amp;sc-&gt;sc_ani.timer, ath_ani_calibrate, (unsigned long)sc);</div><div class='add'>+</div><div class='ctx'> 	sc-&gt;sc_rc = ath_rate_attach(ah);</div><div class='ctx'> 	if (sc-&gt;sc_rc == NULL) {</div><div class='del'>-		error = EIO;</div><div class='add'>+		error = -EIO;</div><div class='ctx'> 		goto bad2;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1285,20 +1255,13 @@ int ath_init(u16 devid, struct ath_softc *sc)</div><div class='ctx'> </div><div class='ctx'> 	/* 11n Capabilities */</div><div class='ctx'> 	if (ah-&gt;ah_caps.hw_caps &amp; ATH9K_HW_CAP_HT) {</div><div class='del'>-		sc-&gt;sc_txaggr = 1;</div><div class='del'>-		sc-&gt;sc_rxaggr = 1;</div><div class='add'>+		sc-&gt;sc_flags |= SC_OP_TXAGGR;</div><div class='add'>+		sc-&gt;sc_flags |= SC_OP_RXAGGR;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	sc-&gt;sc_tx_chainmask = ah-&gt;ah_caps.tx_chainmask;</div><div class='ctx'> 	sc-&gt;sc_rx_chainmask = ah-&gt;ah_caps.rx_chainmask;</div><div class='ctx'> </div><div class='del'>-	/* Configuration for rx chain detection */</div><div class='del'>-	sc-&gt;sc_rxchaindetect_ref = 0;</div><div class='del'>-	sc-&gt;sc_rxchaindetect_thresh5GHz = 35;</div><div class='del'>-	sc-&gt;sc_rxchaindetect_thresh2GHz = 35;</div><div class='del'>-	sc-&gt;sc_rxchaindetect_delta5GHz = 30;</div><div class='del'>-	sc-&gt;sc_rxchaindetect_delta2GHz = 30;</div><div class='del'>-</div><div class='ctx'> 	ath9k_hw_setcapability(ah, ATH9K_CAP_DIVERSITY, 1, true, NULL);</div><div class='ctx'> 	sc-&gt;sc_defant = ath9k_hw_getdefantenna(ah);</div><div class='ctx'> </div><div class='hunk'>@@ -1344,7 +1307,7 @@ void ath_deinit(struct ath_softc *sc)</div><div class='ctx'> 	tasklet_kill(&amp;sc-&gt;intr_tq);</div><div class='ctx'> 	tasklet_kill(&amp;sc-&gt;bcon_tasklet);</div><div class='ctx'> 	ath_stop(sc);</div><div class='del'>-	if (!sc-&gt;sc_invalid)</div><div class='add'>+	if (!(sc-&gt;sc_flags &amp; SC_OP_INVALID))</div><div class='ctx'> 		ath9k_hw_setpower(sc-&gt;sc_ah, ATH9K_PM_AWAKE);</div><div class='ctx'> 	ath_rate_detach(sc-&gt;sc_rc);</div><div class='ctx'> 	/* cleanup tx queues */</div><div class='hunk'>@@ -1371,7 +1334,7 @@ struct ath_node *ath_node_attach(struct ath_softc *sc, u8 *addr, int if_id)</div><div class='ctx'> 	an = kmalloc(sizeof(struct ath_node), GFP_ATOMIC);</div><div class='ctx'> 	if (an == NULL)</div><div class='ctx'> 		return NULL;</div><div class='del'>-	memzero(an, sizeof(*an));</div><div class='add'>+	memset(an, 0, sizeof(*an));</div><div class='ctx'> </div><div class='ctx'> 	an-&gt;an_sc = sc;</div><div class='ctx'> 	memcpy(an-&gt;an_addr, addr, ETH_ALEN);</div><div class='hunk'>@@ -1471,9 +1434,9 @@ void ath_newassoc(struct ath_softc *sc,</div><div class='ctx'> 	/* if station reassociates, tear down the aggregation state. */</div><div class='ctx'> 	if (!isnew) {</div><div class='ctx'> 		for (tidno = 0; tidno &lt; WME_NUM_TID; tidno++) {</div><div class='del'>-			if (sc-&gt;sc_txaggr)</div><div class='add'>+			if (sc-&gt;sc_flags &amp; SC_OP_TXAGGR)</div><div class='ctx'> 				ath_tx_aggr_teardown(sc, an, tidno);</div><div class='del'>-			if (sc-&gt;sc_rxaggr)</div><div class='add'>+			if (sc-&gt;sc_flags &amp; SC_OP_RXAGGR)</div><div class='ctx'> 				ath_rx_aggr_teardown(sc, an, tidno);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1758,7 +1721,7 @@ int ath_descdma_setup(struct ath_softc *sc,</div><div class='ctx'> 		error = -ENOMEM;</div><div class='ctx'> 		goto fail2;</div><div class='ctx'> 	}</div><div class='del'>-	memzero(bf, bsize);</div><div class='add'>+	memset(bf, 0, bsize);</div><div class='ctx'> 	dd-&gt;dd_bufptr = bf;</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(head);</div><div class='hunk'>@@ -1790,7 +1753,7 @@ fail2:</div><div class='ctx'> 	pci_free_consistent(sc-&gt;pdev,</div><div class='ctx'> 		dd-&gt;dd_desc_len, dd-&gt;dd_desc, dd-&gt;dd_desc_paddr);</div><div class='ctx'> fail:</div><div class='del'>-	memzero(dd, sizeof(*dd));</div><div class='add'>+	memset(dd, 0, sizeof(*dd));</div><div class='ctx'> 	return error;</div><div class='ctx'> #undef ATH_DESC_4KB_BOUND_CHECK</div><div class='ctx'> #undef ATH_DESC_4KB_BOUND_NUM_SKIPPED</div><div class='hunk'>@@ -1815,20 +1778,13 @@ void ath_descdma_cleanup(struct ath_softc *sc,</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(head);</div><div class='ctx'> 	kfree(dd-&gt;dd_bufptr);</div><div class='del'>-	memzero(dd, sizeof(*dd));</div><div class='add'>+	memset(dd, 0, sizeof(*dd));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*************/</div><div class='ctx'> /* Utilities */</div><div class='ctx'> /*************/</div><div class='ctx'> </div><div class='del'>-void ath_internal_reset(struct ath_softc *sc)</div><div class='del'>-{</div><div class='del'>-	ath_reset_start(sc, 0);</div><div class='del'>-	ath_reset(sc);</div><div class='del'>-	ath_reset_end(sc, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> int ath_get_hal_qnum(u16 queue, struct ath_softc *sc)</div><div class='ctx'> {</div><div class='ctx'> 	int qnum;</div><div class='head'>diff --git a/drivers/net/wireless/ath9k/core.h b/drivers/net/wireless/ath9k/core.h<br/>index 2f84093331ee..cb3e61e57c4d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/ath9k/core.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/ath9k/core.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/ath9k/core.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/ath9k/core.h</a></div><div class='hunk'>@@ -39,6 +39,8 @@</div><div class='ctx'> #include &lt;linux/scatterlist.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;net/mac80211.h&gt;</div><div class='add'>+#include &lt;linux/leds.h&gt;</div><div class='add'>+#include &lt;linux/rfkill.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "ath9k.h"</div><div class='ctx'> #include "rc.h"</div><div class='hunk'>@@ -79,11 +81,8 @@ struct ath_node;</div><div class='ctx'> 		}				\</div><div class='ctx'> 	} while (0)</div><div class='ctx'> </div><div class='del'>-/* XXX: remove */</div><div class='del'>-#define memzero(_buf, _len) memset(_buf, 0, _len)</div><div class='del'>-</div><div class='del'>-#define get_dma_mem_context(var, field) (&amp;((var)-&gt;field))</div><div class='del'>-#define copy_dma_mem_context(dst, src)  (*dst = *src)</div><div class='add'>+#define TSF_TO_TU(_h,_l) \</div><div class='add'>+	((((u32)(_h)) &lt;&lt; 22) | (((u32)(_l)) &gt;&gt; 10))</div><div class='ctx'> </div><div class='ctx'> #define ATH9K_BH_STATUS_INTACT		0</div><div class='ctx'> #define ATH9K_BH_STATUS_CHANGE		1</div><div class='hunk'>@@ -95,6 +94,8 @@ static inline unsigned long get_timestamp(void)</div><div class='ctx'> 	return ((jiffies / HZ) * 1000) + (jiffies % HZ) * (1000 / HZ);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static const u8 ath_bcast_mac[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};</div><div class='add'>+</div><div class='ctx'> /*************/</div><div class='ctx'> /* Debugging */</div><div class='ctx'> /*************/</div><div class='hunk'>@@ -175,42 +176,38 @@ void ath_update_chainmask(struct ath_softc *sc, int is_ht);</div><div class='ctx'> /* Descriptor Management */</div><div class='ctx'> /*************************/</div><div class='ctx'> </div><div class='del'>-/* Number of descriptors per buffer. The only case where we see skbuff</div><div class='del'>-chains is due to FF aggregation in the driver. */</div><div class='del'>-#define	ATH_TXDESC	    1</div><div class='del'>-/* if there's more fragment for this MSDU */</div><div class='del'>-#define ATH_BF_MORE_MPDU    1</div><div class='ctx'> #define ATH_TXBUF_RESET(_bf) do {				\</div><div class='ctx'> 		(_bf)-&gt;bf_status = 0;				\</div><div class='ctx'> 		(_bf)-&gt;bf_lastbf = NULL;			\</div><div class='ctx'> 		(_bf)-&gt;bf_lastfrm = NULL;			\</div><div class='ctx'> 		(_bf)-&gt;bf_next = NULL;				\</div><div class='del'>-		memzero(&amp;((_bf)-&gt;bf_state),			\</div><div class='add'>+		memset(&amp;((_bf)-&gt;bf_state), 0,			\</div><div class='ctx'> 			    sizeof(struct ath_buf_state));	\</div><div class='ctx'> 	} while (0)</div><div class='ctx'> </div><div class='add'>+enum buffer_type {</div><div class='add'>+	BUF_DATA		= BIT(0),</div><div class='add'>+	BUF_AGGR		= BIT(1),</div><div class='add'>+	BUF_AMPDU		= BIT(2),</div><div class='add'>+	BUF_HT			= BIT(3),</div><div class='add'>+	BUF_RETRY		= BIT(4),</div><div class='add'>+	BUF_XRETRY		= BIT(5),</div><div class='add'>+	BUF_SHORT_PREAMBLE	= BIT(6),</div><div class='add'>+	BUF_BAR			= BIT(7),</div><div class='add'>+	BUF_PSPOLL		= BIT(8),</div><div class='add'>+	BUF_AGGR_BURST		= BIT(9),</div><div class='add'>+	BUF_CALC_AIRTIME	= BIT(10),</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct ath_buf_state {</div><div class='del'>-	int bfs_nframes;	/* # frames in aggregate */</div><div class='del'>-	u16 bfs_al;		/* length of aggregate */</div><div class='del'>-	u16 bfs_frmlen;		/* length of frame */</div><div class='del'>-	int bfs_seqno;		/* sequence number */</div><div class='del'>-	int bfs_tidno;		/* tid of this frame */</div><div class='del'>-	int bfs_retries;	/* current retries */</div><div class='add'>+	int bfs_nframes;			/* # frames in aggregate */</div><div class='add'>+	u16 bfs_al;				/* length of aggregate */</div><div class='add'>+	u16 bfs_frmlen;				/* length of frame */</div><div class='add'>+	int bfs_seqno;				/* sequence number */</div><div class='add'>+	int bfs_tidno;				/* tid of this frame */</div><div class='add'>+	int bfs_retries;			/* current retries */</div><div class='ctx'> 	struct ath_rc_series bfs_rcs[4];	/* rate series */</div><div class='del'>-	u8 bfs_isdata:1;	/* is a data frame/aggregate */</div><div class='del'>-	u8 bfs_isaggr:1;	/* is an aggregate */</div><div class='del'>-	u8 bfs_isampdu:1;	/* is an a-mpdu, aggregate or not */</div><div class='del'>-	u8 bfs_ht:1;		/* is an HT frame */</div><div class='del'>-	u8 bfs_isretried:1;	/* is retried */</div><div class='del'>-	u8 bfs_isxretried:1;	/* is excessive retried */</div><div class='del'>-	u8 bfs_shpreamble:1;	/* is short preamble */</div><div class='del'>-	u8 bfs_isbar:1;		/* is a BAR */</div><div class='del'>-	u8 bfs_ispspoll:1;	/* is a PS-Poll */</div><div class='del'>-	u8 bfs_aggrburst:1;	/* is a aggr burst */</div><div class='del'>-	u8 bfs_calcairtime:1;	/* requests airtime be calculated</div><div class='del'>-				when set for tx frame */</div><div class='del'>-	int bfs_rifsburst_elem;	/* RIFS burst/bar */</div><div class='del'>-	int bfs_nrifsubframes;	/* # of elements in burst */</div><div class='add'>+	u32 bf_type;				/* BUF_* (enum buffer_type) */</div><div class='ctx'> 	/* key type use to encrypt this frame */</div><div class='ctx'> 	enum ath9k_key_type bfs_keytype;</div><div class='ctx'> };</div><div class='hunk'>@@ -222,26 +219,22 @@ struct ath_buf_state {</div><div class='ctx'> #define bf_seqno        	bf_state.bfs_seqno</div><div class='ctx'> #define bf_tidno        	bf_state.bfs_tidno</div><div class='ctx'> #define bf_rcs          	bf_state.bfs_rcs</div><div class='del'>-#define bf_isdata       	bf_state.bfs_isdata</div><div class='del'>-#define bf_isaggr       	bf_state.bfs_isaggr</div><div class='del'>-#define bf_isampdu      	bf_state.bfs_isampdu</div><div class='del'>-#define bf_ht           	bf_state.bfs_ht</div><div class='del'>-#define bf_isretried    	bf_state.bfs_isretried</div><div class='del'>-#define bf_isxretried   	bf_state.bfs_isxretried</div><div class='del'>-#define bf_shpreamble   	bf_state.bfs_shpreamble</div><div class='del'>-#define bf_rifsburst_elem  	bf_state.bfs_rifsburst_elem</div><div class='del'>-#define bf_nrifsubframes  	bf_state.bfs_nrifsubframes</div><div class='ctx'> #define bf_keytype      	bf_state.bfs_keytype</div><div class='del'>-#define bf_isbar        	bf_state.bfs_isbar</div><div class='del'>-#define bf_ispspoll     	bf_state.bfs_ispspoll</div><div class='del'>-#define bf_aggrburst    	bf_state.bfs_aggrburst</div><div class='del'>-#define bf_calcairtime  	bf_state.bfs_calcairtime</div><div class='add'>+#define bf_isdata(bf)		(bf-&gt;bf_state.bf_type &amp; BUF_DATA)</div><div class='add'>+#define bf_isaggr(bf)		(bf-&gt;bf_state.bf_type &amp; BUF_AGGR)</div><div class='add'>+#define bf_isampdu(bf)		(bf-&gt;bf_state.bf_type &amp; BUF_AMPDU)</div><div class='add'>+#define bf_isht(bf)		(bf-&gt;bf_state.bf_type &amp; BUF_HT)</div><div class='add'>+#define bf_isretried(bf)	(bf-&gt;bf_state.bf_type &amp; BUF_RETRY)</div><div class='add'>+#define bf_isxretried(bf)	(bf-&gt;bf_state.bf_type &amp; BUF_XRETRY)</div><div class='add'>+#define bf_isshpreamble(bf)	(bf-&gt;bf_state.bf_type &amp; BUF_SHORT_PREAMBLE)</div><div class='add'>+#define bf_isbar(bf)		(bf-&gt;bf_state.bf_type &amp; BUF_BAR)</div><div class='add'>+#define bf_ispspoll(bf) 	(bf-&gt;bf_state.bf_type &amp; BUF_PSPOLL)</div><div class='add'>+#define bf_isaggrburst(bf)	(bf-&gt;bf_state.bf_type &amp; BUF_AGGR_BURST)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Abstraction of a contiguous buffer to transmit/receive.  There is only</div><div class='ctx'>  * a single hw descriptor encapsulated here.</div><div class='ctx'>  */</div><div class='del'>-</div><div class='ctx'> struct ath_buf {</div><div class='ctx'> 	struct list_head list;</div><div class='ctx'> 	struct list_head *last;</div><div class='hunk'>@@ -316,7 +309,7 @@ void ath_descdma_cleanup(struct ath_softc *sc,</div><div class='ctx'> #define ATH_RX_TIMEOUT           40      /* 40 milliseconds */</div><div class='ctx'> #define WME_NUM_TID              16</div><div class='ctx'> #define IEEE80211_BAR_CTL_TID_M  0xF000  /* tid mask */</div><div class='del'>-#define IEEE80211_BAR_CTL_TID_S  2       /* tid shift */</div><div class='add'>+#define IEEE80211_BAR_CTL_TID_S  12      /* tid shift */</div><div class='ctx'> </div><div class='ctx'> enum ATH_RX_TYPE {</div><div class='ctx'> 	ATH_RX_NON_CONSUMED = 0,</div><div class='hunk'>@@ -391,10 +384,10 @@ int ath_rx_input(struct ath_softc *sc,</div><div class='ctx'> 		 struct sk_buff *skb,</div><div class='ctx'> 		 struct ath_recv_status *rx_status,</div><div class='ctx'> 		 enum ATH_RX_TYPE *status);</div><div class='del'>-int ath__rx_indicate(struct ath_softc *sc,</div><div class='del'>-		    struct sk_buff *skb,</div><div class='del'>-		    struct ath_recv_status *status,</div><div class='del'>-		    u16 keyix);</div><div class='add'>+int _ath_rx_indicate(struct ath_softc *sc,</div><div class='add'>+		     struct sk_buff *skb,</div><div class='add'>+		     struct ath_recv_status *status,</div><div class='add'>+		     u16 keyix);</div><div class='ctx'> int ath_rx_subframe(struct ath_node *an, struct sk_buff *skb,</div><div class='ctx'> 		    struct ath_recv_status *status);</div><div class='ctx'> </div><div class='hunk'>@@ -402,8 +395,7 @@ int ath_rx_subframe(struct ath_node *an, struct sk_buff *skb,</div><div class='ctx'> /* TX */</div><div class='ctx'> /******/</div><div class='ctx'> </div><div class='del'>-#define ATH_FRAG_PER_MSDU       1</div><div class='del'>-#define ATH_TXBUF               (512/ATH_FRAG_PER_MSDU)</div><div class='add'>+#define ATH_TXBUF               512</div><div class='ctx'> /* max number of transmit attempts (tries) */</div><div class='ctx'> #define ATH_TXMAXTRY            13</div><div class='ctx'> /* max number of 11n transmit attempts (tries) */</div><div class='hunk'>@@ -522,7 +514,6 @@ struct ath_tx_control {</div><div class='ctx'> 	u32 keyix;</div><div class='ctx'> 	int min_rate;</div><div class='ctx'> 	int mcast_rate;</div><div class='del'>-	u16 nextfraglen;</div><div class='ctx'> 	struct ath_softc *dev;</div><div class='ctx'> 	dma_addr_t dmacontext;</div><div class='ctx'> };</div><div class='hunk'>@@ -557,10 +548,10 @@ void ath_tx_cleanupq(struct ath_softc *sc, struct ath_txq *txq);</div><div class='ctx'> int ath_tx_setup(struct ath_softc *sc, int haltype);</div><div class='ctx'> void ath_draintxq(struct ath_softc *sc, bool retry_tx);</div><div class='ctx'> void ath_tx_draintxq(struct ath_softc *sc,</div><div class='del'>-	struct ath_txq *txq, bool retry_tx);</div><div class='add'>+		     struct ath_txq *txq, bool retry_tx);</div><div class='ctx'> void ath_tx_node_init(struct ath_softc *sc, struct ath_node *an);</div><div class='ctx'> void ath_tx_node_cleanup(struct ath_softc *sc,</div><div class='del'>-	struct ath_node *an, bool bh_flag);</div><div class='add'>+			 struct ath_node *an, bool bh_flag);</div><div class='ctx'> void ath_tx_node_free(struct ath_softc *sc, struct ath_node *an);</div><div class='ctx'> void ath_txq_schedule(struct ath_softc *sc, struct ath_txq *txq);</div><div class='ctx'> int ath_tx_init(struct ath_softc *sc, int nbufs);</div><div class='hunk'>@@ -575,6 +566,7 @@ u32 ath_txq_aggr_depth(struct ath_softc *sc, int qnum);</div><div class='ctx'> void ath_notify_txq_status(struct ath_softc *sc, u16 queue_depth);</div><div class='ctx'> void ath_tx_complete(struct ath_softc *sc, struct sk_buff *skb,</div><div class='ctx'> 		     struct ath_xmit_status *tx_status, struct ath_node *an);</div><div class='add'>+void ath_tx_cabq(struct ath_softc *sc, struct sk_buff *skb);</div><div class='ctx'> </div><div class='ctx'> /**********************/</div><div class='ctx'> /* Node / Aggregation */</div><div class='hunk'>@@ -585,7 +577,6 @@ void ath_tx_complete(struct ath_softc *sc, struct sk_buff *skb,</div><div class='ctx'> /* indicates the node is 80211 power save */</div><div class='ctx'> #define ATH_NODE_PWRSAVE        0x2</div><div class='ctx'> </div><div class='del'>-#define ADDBA_TIMEOUT              200 /* 200 milliseconds */</div><div class='ctx'> #define ADDBA_EXCHANGE_ATTEMPTS    10</div><div class='ctx'> #define ATH_AGGR_DELIM_SZ          4   /* delimiter size   */</div><div class='ctx'> #define ATH_AGGR_MINPLEN           256 /* in bytes, minimum packet length */</div><div class='hunk'>@@ -705,9 +696,6 @@ struct ath_node *ath_node_find(struct ath_softc *sc, u8 *addr);</div><div class='ctx'> #define	ATH_BCBUF               	4   /* number of beacon buffers */</div><div class='ctx'> #define ATH_DEFAULT_BINTVAL     	100 /* default beacon interval in TU */</div><div class='ctx'> #define ATH_DEFAULT_BMISS_LIMIT 	10</div><div class='del'>-#define	ATH_BEACON_AIFS_DEFAULT		0  /* Default aifs for ap beacon q */</div><div class='del'>-#define	ATH_BEACON_CWMIN_DEFAULT	0  /* Default cwmin for ap beacon q */</div><div class='del'>-#define	ATH_BEACON_CWMAX_DEFAULT	0  /* Default cwmax for ap beacon q */</div><div class='ctx'> #define IEEE80211_MS_TO_TU(x)           (((x) * 1000) / 1024)</div><div class='ctx'> </div><div class='ctx'> /* beacon configuration */</div><div class='hunk'>@@ -724,30 +712,16 @@ struct ath_beacon_config {</div><div class='ctx'> 	} u; /* last received beacon/probe response timestamp of this BSS. */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* offsets in a beacon frame for</div><div class='del'>- * quick acess of beacon content by low-level driver */</div><div class='del'>-struct ath_beacon_offset {</div><div class='del'>-	u8 *bo_tim;	/* start of atim/dtim */</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> void ath9k_beacon_tasklet(unsigned long data);</div><div class='ctx'> void ath_beacon_config(struct ath_softc *sc, int if_id);</div><div class='ctx'> int ath_beaconq_setup(struct ath_hal *ah);</div><div class='ctx'> int ath_beacon_alloc(struct ath_softc *sc, int if_id);</div><div class='ctx'> void ath_bstuck_process(struct ath_softc *sc);</div><div class='del'>-void ath_beacon_tasklet(struct ath_softc *sc, int *needmark);</div><div class='del'>-void ath_beacon_free(struct ath_softc *sc);</div><div class='ctx'> void ath_beacon_return(struct ath_softc *sc, struct ath_vap *avp);</div><div class='ctx'> void ath_beacon_sync(struct ath_softc *sc, int if_id);</div><div class='del'>-void ath_update_beacon_info(struct ath_softc *sc, int avgbrssi);</div><div class='ctx'> void ath_get_beaconconfig(struct ath_softc *sc,</div><div class='ctx'> 			  int if_id,</div><div class='ctx'> 			  struct ath_beacon_config *conf);</div><div class='del'>-int ath_update_beacon(struct ath_softc *sc,</div><div class='del'>-		      int if_id,</div><div class='del'>-		      struct ath_beacon_offset *bo,</div><div class='del'>-		      struct sk_buff *skb,</div><div class='del'>-		      int mcast);</div><div class='ctx'> /********/</div><div class='ctx'> /* VAPs */</div><div class='ctx'> /********/</div><div class='hunk'>@@ -774,10 +748,8 @@ struct ath_vap {</div><div class='ctx'> 	struct ieee80211_vif *av_if_data;</div><div class='ctx'> 	enum ath9k_opmode av_opmode;	/* VAP operational mode */</div><div class='ctx'> 	struct ath_buf *av_bcbuf;	/* beacon buffer */</div><div class='del'>-	struct ath_beacon_offset av_boff; /* dynamic update state */</div><div class='ctx'> 	struct ath_tx_control av_btxctl;  /* txctl information for beacon */</div><div class='ctx'> 	int av_bslot;			/* beacon slot index */</div><div class='del'>-	struct ath_txq av_mcastq;	/* multicast transmit queue */</div><div class='ctx'> 	struct ath_vap_config av_config;/* vap configuration parameters*/</div><div class='ctx'> 	struct ath_rate_node *rc_node;</div><div class='ctx'> };</div><div class='hunk'>@@ -788,8 +760,7 @@ int ath_vap_attach(struct ath_softc *sc,</div><div class='ctx'> 		   enum ath9k_opmode opmode);</div><div class='ctx'> int ath_vap_detach(struct ath_softc *sc, int if_id);</div><div class='ctx'> int ath_vap_config(struct ath_softc *sc,</div><div class='del'>-	int if_id, struct ath_vap_config *if_config);</div><div class='del'>-int ath_vap_listen(struct ath_softc *sc, int if_id);</div><div class='add'>+		   int if_id, struct ath_vap_config *if_config);</div><div class='ctx'> </div><div class='ctx'> /*********************/</div><div class='ctx'> /* Antenna diversity */</div><div class='hunk'>@@ -829,6 +800,58 @@ void ath_slow_ant_div(struct ath_antdiv *antdiv,</div><div class='ctx'> 		      struct ath_rx_status *rx_stats);</div><div class='ctx'> void ath_setdefantenna(void *sc, u32 antenna);</div><div class='ctx'> </div><div class='add'>+/*******/</div><div class='add'>+/* ANI */</div><div class='add'>+/*******/</div><div class='add'>+</div><div class='add'>+/* ANI values for STA only.</div><div class='add'>+   FIXME: Add appropriate values for AP later */</div><div class='add'>+</div><div class='add'>+#define ATH_ANI_POLLINTERVAL    100     /* 100 milliseconds between ANI poll */</div><div class='add'>+#define ATH_SHORT_CALINTERVAL   1000    /* 1 second between calibrations */</div><div class='add'>+#define ATH_LONG_CALINTERVAL    30000   /* 30 seconds between calibrations */</div><div class='add'>+#define ATH_RESTART_CALINTERVAL 1200000 /* 20 minutes between calibrations */</div><div class='add'>+</div><div class='add'>+struct ath_ani {</div><div class='add'>+	bool sc_caldone;</div><div class='add'>+	int16_t sc_noise_floor;</div><div class='add'>+	unsigned int sc_longcal_timer;</div><div class='add'>+	unsigned int sc_shortcal_timer;</div><div class='add'>+	unsigned int sc_resetcal_timer;</div><div class='add'>+	unsigned int sc_checkani_timer;</div><div class='add'>+	struct timer_list timer;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/********************/</div><div class='add'>+/*   LED Control    */</div><div class='add'>+/********************/</div><div class='add'>+</div><div class='add'>+#define ATH_LED_PIN	1</div><div class='add'>+</div><div class='add'>+enum ath_led_type {</div><div class='add'>+	ATH_LED_RADIO,</div><div class='add'>+	ATH_LED_ASSOC,</div><div class='add'>+	ATH_LED_TX,</div><div class='add'>+	ATH_LED_RX</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath_led {</div><div class='add'>+	struct ath_softc *sc;</div><div class='add'>+	struct led_classdev led_cdev;</div><div class='add'>+	enum ath_led_type led_type;</div><div class='add'>+	char name[32];</div><div class='add'>+	bool registered;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Rfkill */</div><div class='add'>+#define ATH_RFKILL_POLL_INTERVAL	2000 /* msecs */</div><div class='add'>+</div><div class='add'>+struct ath_rfkill {</div><div class='add'>+	struct rfkill *rfkill;</div><div class='add'>+	struct delayed_work rfkill_poll;</div><div class='add'>+	char rfkill_name[32];</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /********************/</div><div class='ctx'> /* Main driver core */</div><div class='ctx'> /********************/</div><div class='hunk'>@@ -841,11 +864,7 @@ void ath_setdefantenna(void *sc, u32 antenna);</div><div class='ctx'> #define	ATH_DEFAULT_NOISE_FLOOR -95</div><div class='ctx'> #define ATH_REGCLASSIDS_MAX     10</div><div class='ctx'> #define ATH_CABQ_READY_TIME     80  /* % of beacon interval */</div><div class='del'>-#define ATH_PREAMBLE_SHORT	(1&lt;&lt;0)</div><div class='del'>-#define ATH_PROTECT_ENABLE	(1&lt;&lt;1)</div><div class='ctx'> #define ATH_MAX_SW_RETRIES      10</div><div class='del'>-/* Num farmes difference in tx to flip default recv */</div><div class='del'>-#define	ATH_ANTENNA_DIFF	2</div><div class='ctx'> #define ATH_CHAN_MAX            255</div><div class='ctx'> #define IEEE80211_WEP_NKID      4       /* number of key ids */</div><div class='ctx'> #define IEEE80211_RATE_VAL      0x7f</div><div class='hunk'>@@ -859,9 +878,7 @@ void ath_setdefantenna(void *sc, u32 antenna);</div><div class='ctx'>  */</div><div class='ctx'> #define	ATH_KEYMAX	        128        /* max key cache size we handle */</div><div class='ctx'> </div><div class='del'>-#define RESET_RETRY_TXQ         0x00000001</div><div class='ctx'> #define ATH_IF_ID_ANY   	0xff</div><div class='del'>-</div><div class='ctx'> #define ATH_TXPOWER_MAX         100     /* .5 dBm units */</div><div class='ctx'> </div><div class='ctx'> #define RSSI_LPF_THRESHOLD         -20</div><div class='hunk'>@@ -907,60 +924,64 @@ struct ath_ht_info {</div><div class='ctx'> 	u8 ext_chan_offset;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define SC_OP_INVALID		BIT(0)</div><div class='add'>+#define SC_OP_BEACONS		BIT(1)</div><div class='add'>+#define SC_OP_RXAGGR		BIT(2)</div><div class='add'>+#define SC_OP_TXAGGR		BIT(3)</div><div class='add'>+#define SC_OP_CHAINMASK_UPDATE	BIT(4)</div><div class='add'>+#define SC_OP_FULL_RESET	BIT(5)</div><div class='add'>+#define SC_OP_NO_RESET		BIT(6)</div><div class='add'>+#define SC_OP_PREAMBLE_SHORT	BIT(7)</div><div class='add'>+#define SC_OP_PROTECT_ENABLE	BIT(8)</div><div class='add'>+#define SC_OP_RXFLUSH		BIT(9)</div><div class='add'>+#define SC_OP_LED_ASSOCIATED	BIT(10)</div><div class='add'>+#define SC_OP_RFKILL_REGISTERED	BIT(11)</div><div class='add'>+#define SC_OP_RFKILL_SW_BLOCKED	BIT(12)</div><div class='add'>+#define SC_OP_RFKILL_HW_BLOCKED	BIT(13)</div><div class='add'>+</div><div class='ctx'> struct ath_softc {</div><div class='ctx'> 	struct ieee80211_hw *hw;</div><div class='ctx'> 	struct pci_dev *pdev;</div><div class='del'>-	void __iomem *mem;</div><div class='ctx'> 	struct tasklet_struct intr_tq;</div><div class='ctx'> 	struct tasklet_struct bcon_tasklet;</div><div class='del'>-	struct ath_config sc_config;	/* load-time parameters */</div><div class='del'>-	int sc_debug;</div><div class='add'>+	struct ath_config sc_config;</div><div class='ctx'> 	struct ath_hal *sc_ah;</div><div class='del'>-	struct ath_rate_softc *sc_rc;	/* tx rate control support */</div><div class='add'>+	struct ath_rate_softc *sc_rc;</div><div class='add'>+	void __iomem *mem;</div><div class='add'>+</div><div class='add'>+	u8 sc_curbssid[ETH_ALEN];</div><div class='add'>+	u8 sc_myaddr[ETH_ALEN];</div><div class='add'>+	u8 sc_bssidmask[ETH_ALEN];</div><div class='add'>+</div><div class='add'>+	int sc_debug;</div><div class='ctx'> 	u32 sc_intrstatus;</div><div class='del'>-	enum ath9k_opmode sc_opmode;	/* current operating mode */</div><div class='del'>-</div><div class='del'>-	u8 sc_invalid;			/* being detached */</div><div class='del'>-	u8 sc_beacons;			/* beacons running */</div><div class='del'>-	u8 sc_scanning;			/* scanning active */</div><div class='del'>-	u8 sc_txaggr;			/* enable 11n tx aggregation */</div><div class='del'>-	u8 sc_rxaggr;			/* enable 11n rx aggregation */</div><div class='del'>-	u8 sc_update_chainmask;		/* change chain mask */</div><div class='del'>-	u8 sc_full_reset;		/* force full reset */</div><div class='del'>-	enum wireless_mode sc_curmode;	/* current phy mode */</div><div class='add'>+	u32 sc_flags; /* SC_OP_* */</div><div class='add'>+	unsigned int rx_filter;</div><div class='ctx'> 	u16 sc_curtxpow;</div><div class='ctx'> 	u16 sc_curaid;</div><div class='del'>-	u8 sc_curbssid[ETH_ALEN];</div><div class='del'>-	u8 sc_myaddr[ETH_ALEN];</div><div class='add'>+	u16 sc_cachelsz;</div><div class='add'>+	int sc_slotupdate;		/* slot to next advance fsm */</div><div class='add'>+	int sc_slottime;</div><div class='add'>+	int sc_bslot[ATH_BCBUF];</div><div class='add'>+	u8 sc_tx_chainmask;</div><div class='add'>+	u8 sc_rx_chainmask;</div><div class='add'>+	enum ath9k_int sc_imask;</div><div class='add'>+	enum wireless_mode sc_curmode;	/* current phy mode */</div><div class='ctx'> 	enum PROT_MODE sc_protmode;</div><div class='del'>-	u8 sc_mcastantenna;</div><div class='del'>-	u8 sc_txantenna;		/* data tx antenna (fixed or auto) */</div><div class='add'>+</div><div class='ctx'> 	u8 sc_nbcnvaps;			/* # of vaps sending beacons */</div><div class='ctx'> 	u16 sc_nvaps;			/* # of active virtual ap's */</div><div class='ctx'> 	struct ath_vap *sc_vaps[ATH_BCBUF];</div><div class='del'>-	enum ath9k_int sc_imask;</div><div class='del'>-	u8 sc_bssidmask[ETH_ALEN];</div><div class='add'>+</div><div class='add'>+	u8 sc_mcastantenna;</div><div class='ctx'> 	u8 sc_defant;			/* current default antenna */</div><div class='ctx'> 	u8 sc_rxotherant;		/* rx's on non-default antenna */</div><div class='del'>-	u16 sc_cachelsz;</div><div class='del'>-	int sc_slotupdate;		/* slot to next advance fsm */</div><div class='del'>-	int sc_slottime;</div><div class='del'>-	u8 sc_noreset;</div><div class='del'>-	int sc_bslot[ATH_BCBUF];</div><div class='add'>+</div><div class='ctx'> 	struct ath9k_node_stats sc_halstats; /* station-mode rssi stats */</div><div class='ctx'> 	struct list_head node_list;</div><div class='ctx'> 	struct ath_ht_info sc_ht_info;</div><div class='del'>-	int16_t sc_noise_floor;		/* signal noise floor in dBm */</div><div class='ctx'> 	enum ath9k_ht_extprotspacing sc_ht_extprotspacing;</div><div class='del'>-	u8 sc_tx_chainmask;</div><div class='del'>-	u8 sc_rx_chainmask;</div><div class='del'>-	u8 sc_rxchaindetect_ref;</div><div class='del'>-	u8 sc_rxchaindetect_thresh5GHz;</div><div class='del'>-	u8 sc_rxchaindetect_thresh2GHz;</div><div class='del'>-	u8 sc_rxchaindetect_delta5GHz;</div><div class='del'>-	u8 sc_rxchaindetect_delta2GHz;</div><div class='del'>-	u32 sc_rtsaggrlimit;		/* Chipset specific aggr limit */</div><div class='del'>-	u32 sc_flags;</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_SLOW_ANT_DIV</div><div class='ctx'> 	struct ath_antdiv sc_antdiv;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -980,8 +1001,6 @@ struct ath_softc {</div><div class='ctx'> 	struct ath_descdma sc_rxdma;</div><div class='ctx'> 	int sc_rxbufsize;	/* rx size based on mtu */</div><div class='ctx'> 	u32 *sc_rxlink;		/* link ptr in last RX desc */</div><div class='del'>-	u32 sc_rxflush;		/* rx flush in progress */</div><div class='del'>-	u64 sc_lastrx;		/* tsf of last rx'd frame */</div><div class='ctx'> </div><div class='ctx'> 	/* TX */</div><div class='ctx'> 	struct list_head sc_txbuf;</div><div class='hunk'>@@ -990,7 +1009,6 @@ struct ath_softc {</div><div class='ctx'> 	u32 sc_txqsetup;</div><div class='ctx'> 	u32 sc_txintrperiod;	/* tx interrupt batching */</div><div class='ctx'> 	int sc_haltype2q[ATH9K_WME_AC_VO+1]; /* HAL WME	AC -&gt; h/w qnum */</div><div class='del'>-	u32 sc_ant_tx[8];	/* recent tx frames/antenna */</div><div class='ctx'> 	u16 seq_no; /* TX sequence number */</div><div class='ctx'> </div><div class='ctx'> 	/* Beacon */</div><div class='hunk'>@@ -1001,6 +1019,7 @@ struct ath_softc {</div><div class='ctx'> 	u32 sc_bhalq;</div><div class='ctx'> 	u32 sc_bmisscount;</div><div class='ctx'> 	u32 ast_be_xmit;	/* beacons transmitted */</div><div class='add'>+	u64 bc_tstamp;</div><div class='ctx'> </div><div class='ctx'> 	/* Rate */</div><div class='ctx'> 	struct ieee80211_rate rates[IEEE80211_NUM_BANDS][ATH_RATE_MAX];</div><div class='hunk'>@@ -1015,7 +1034,6 @@ struct ath_softc {</div><div class='ctx'> 	/* Channel, Band */</div><div class='ctx'> 	struct ieee80211_channel channels[IEEE80211_NUM_BANDS][ATH_CHAN_MAX];</div><div class='ctx'> 	struct ieee80211_supported_band sbands[IEEE80211_NUM_BANDS];</div><div class='del'>-	struct ath9k_channel sc_curchan;</div><div class='ctx'> </div><div class='ctx'> 	/* Locks */</div><div class='ctx'> 	spinlock_t sc_rxflushlock;</div><div class='hunk'>@@ -1023,6 +1041,18 @@ struct ath_softc {</div><div class='ctx'> 	spinlock_t sc_txbuflock;</div><div class='ctx'> 	spinlock_t sc_resetlock;</div><div class='ctx'> 	spinlock_t node_lock;</div><div class='add'>+</div><div class='add'>+	/* LEDs */</div><div class='add'>+	struct ath_led radio_led;</div><div class='add'>+	struct ath_led assoc_led;</div><div class='add'>+	struct ath_led tx_led;</div><div class='add'>+	struct ath_led rx_led;</div><div class='add'>+</div><div class='add'>+	/* Rfkill */</div><div class='add'>+	struct ath_rfkill rf_kill;</div><div class='add'>+</div><div class='add'>+	/* ANI */</div><div class='add'>+	struct ath_ani sc_ani;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int ath_init(u16 devid, struct ath_softc *sc);</div><div class='hunk'>@@ -1030,14 +1060,8 @@ void ath_deinit(struct ath_softc *sc);</div><div class='ctx'> int ath_open(struct ath_softc *sc, struct ath9k_channel *initial_chan);</div><div class='ctx'> int ath_suspend(struct ath_softc *sc);</div><div class='ctx'> irqreturn_t ath_isr(int irq, void *dev);</div><div class='del'>-int ath_reset(struct ath_softc *sc);</div><div class='del'>-void ath_scan_start(struct ath_softc *sc);</div><div class='del'>-void ath_scan_end(struct ath_softc *sc);</div><div class='add'>+int ath_reset(struct ath_softc *sc, bool retry_tx);</div><div class='ctx'> int ath_set_channel(struct ath_softc *sc, struct ath9k_channel *hchan);</div><div class='del'>-void ath_setup_rate(struct ath_softc *sc,</div><div class='del'>-		    enum wireless_mode wMode,</div><div class='del'>-		    enum RATE_TYPE type,</div><div class='del'>-		    const struct ath9k_rate_table *rt);</div><div class='ctx'> </div><div class='ctx'> /*********************/</div><div class='ctx'> /* Utility Functions */</div><div class='hunk'>@@ -1056,17 +1080,5 @@ int ath_cabq_update(struct ath_softc *);</div><div class='ctx'> void ath_get_currentCountry(struct ath_softc *sc,</div><div class='ctx'> 	struct ath9k_country_entry *ctry);</div><div class='ctx'> u64 ath_extend_tsf(struct ath_softc *sc, u32 rstamp);</div><div class='del'>-void ath_internal_reset(struct ath_softc *sc);</div><div class='del'>-u32 ath_chan2flags(struct ieee80211_channel *chan, struct ath_softc *sc);</div><div class='del'>-dma_addr_t ath_skb_map_single(struct ath_softc *sc,</div><div class='del'>-			      struct sk_buff *skb,</div><div class='del'>-			      int direction,</div><div class='del'>-			      dma_addr_t *pa);</div><div class='del'>-void ath_skb_unmap_single(struct ath_softc *sc,</div><div class='del'>-			  struct sk_buff *skb,</div><div class='del'>-			  int direction,</div><div class='del'>-			  dma_addr_t *pa);</div><div class='del'>-void ath_mcast_merge(struct ath_softc *sc, u32 mfilt[2]);</div><div class='del'>-enum ath9k_ht_macmode ath_cwm_macmode(struct ath_softc *sc);</div><div class='ctx'> </div><div class='ctx'> #endif /* CORE_H */</div><div class='head'>diff --git a/drivers/net/wireless/ath9k/hw.c b/drivers/net/wireless/ath9k/hw.c<br/>index 6dbfed0b4149..98bc25c9b3cf 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/ath9k/hw.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/ath9k/hw.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/ath9k/hw.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/ath9k/hw.c</a></div><div class='hunk'>@@ -85,29 +85,6 @@ static const struct hal_percal_data adc_init_dc_cal = {</div><div class='ctx'> 	ath9k_hw_adc_dccal_calibrate</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const struct ath_hal ar5416hal = {</div><div class='del'>-	AR5416_MAGIC,</div><div class='del'>-	0,</div><div class='del'>-	0,</div><div class='del'>-	NULL,</div><div class='del'>-	NULL,</div><div class='del'>-	CTRY_DEFAULT,</div><div class='del'>-	0,</div><div class='del'>-	0,</div><div class='del'>-	0,</div><div class='del'>-	0,</div><div class='del'>-	0,</div><div class='del'>-	{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='del'>-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='del'>-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='del'>-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='del'>-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='del'>-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='del'>-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='del'>-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static struct ath9k_rate_table ar5416_11a_table = {</div><div class='ctx'> 	8,</div><div class='ctx'> 	{0},</div><div class='hunk'>@@ -352,7 +329,7 @@ static void ath9k_hw_set_defaults(struct ath_hal *ah)</div><div class='ctx'> 	ah-&gt;ah_config.ofdm_trig_high = 500;</div><div class='ctx'> 	ah-&gt;ah_config.cck_trig_high = 200;</div><div class='ctx'> 	ah-&gt;ah_config.cck_trig_low = 100;</div><div class='del'>-	ah-&gt;ah_config.enable_ani = 0;</div><div class='add'>+	ah-&gt;ah_config.enable_ani = 1;</div><div class='ctx'> 	ah-&gt;ah_config.noise_immunity_level = 4;</div><div class='ctx'> 	ah-&gt;ah_config.ofdm_weaksignal_det = 1;</div><div class='ctx'> 	ah-&gt;ah_config.cck_weaksignal_thr = 0;</div><div class='hunk'>@@ -371,7 +348,7 @@ static void ath9k_hw_set_defaults(struct ath_hal *ah)</div><div class='ctx'> 	ah-&gt;ah_config.intr_mitigation = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void ath9k_hw_override_ini(struct ath_hal *ah,</div><div class='add'>+static void ath9k_hw_override_ini(struct ath_hal *ah,</div><div class='ctx'> 					 struct ath9k_channel *chan)</div><div class='ctx'> {</div><div class='ctx'> 	if (!AR_SREV_5416_V20_OR_LATER(ah)</div><div class='hunk'>@@ -381,8 +358,8 @@ static inline void ath9k_hw_override_ini(struct ath_hal *ah,</div><div class='ctx'> 	REG_WRITE(ah, 0x9800 + (651 &lt;&lt; 2), 0x11);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void ath9k_hw_init_bb(struct ath_hal *ah,</div><div class='del'>-				    struct ath9k_channel *chan)</div><div class='add'>+static void ath9k_hw_init_bb(struct ath_hal *ah,</div><div class='add'>+			     struct ath9k_channel *chan)</div><div class='ctx'> {</div><div class='ctx'> 	u32 synthDelay;</div><div class='ctx'> </div><div class='hunk'>@@ -397,8 +374,8 @@ static inline void ath9k_hw_init_bb(struct ath_hal *ah,</div><div class='ctx'> 	udelay(synthDelay + BASE_ACTIVATE_DELAY);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void ath9k_hw_init_interrupt_masks(struct ath_hal *ah,</div><div class='del'>-						 enum ath9k_opmode opmode)</div><div class='add'>+static void ath9k_hw_init_interrupt_masks(struct ath_hal *ah,</div><div class='add'>+					  enum ath9k_opmode opmode)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_hal_5416 *ahp = AH5416(ah);</div><div class='ctx'> </div><div class='hunk'>@@ -428,7 +405,7 @@ static inline void ath9k_hw_init_interrupt_masks(struct ath_hal *ah,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void ath9k_hw_init_qos(struct ath_hal *ah)</div><div class='add'>+static void ath9k_hw_init_qos(struct ath_hal *ah)</div><div class='ctx'> {</div><div class='ctx'> 	REG_WRITE(ah, AR_MIC_QOS_CONTROL, 0x100aa);</div><div class='ctx'> 	REG_WRITE(ah, AR_MIC_QOS_SELECT, 0x3210);</div><div class='hunk'>@@ -523,7 +500,7 @@ static inline bool ath9k_hw_nvram_read(struct ath_hal *ah,</div><div class='ctx'> 		return ath9k_hw_eeprom_read(ah, off, data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool ath9k_hw_fill_eeprom(struct ath_hal *ah)</div><div class='add'>+static bool ath9k_hw_fill_eeprom(struct ath_hal *ah)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_hal_5416 *ahp = AH5416(ah);</div><div class='ctx'> 	struct ar5416_eeprom *eep = &amp;ahp-&gt;ah_eeprom;</div><div class='hunk'>@@ -790,7 +767,7 @@ ath9k_hw_eeprom_set_board_values(struct ath_hal *ah,</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int ath9k_hw_check_eeprom(struct ath_hal *ah)</div><div class='add'>+static int ath9k_hw_check_eeprom(struct ath_hal *ah)</div><div class='ctx'> {</div><div class='ctx'> 	u32 sum = 0, el;</div><div class='ctx'> 	u16 *eepdata;</div><div class='hunk'>@@ -1196,11 +1173,12 @@ static struct ath_hal_5416 *ath9k_hw_newstate(u16 devid,</div><div class='ctx'> </div><div class='ctx'> 	ah = &amp;ahp-&gt;ah;</div><div class='ctx'> </div><div class='del'>-	memcpy(&amp;ahp-&gt;ah, &amp;ar5416hal, sizeof(struct ath_hal));</div><div class='del'>-</div><div class='ctx'> 	ah-&gt;ah_sc = sc;</div><div class='ctx'> 	ah-&gt;ah_sh = mem;</div><div class='ctx'> </div><div class='add'>+	ah-&gt;ah_magic = AR5416_MAGIC;</div><div class='add'>+	ah-&gt;ah_countryCode = CTRY_DEFAULT;</div><div class='add'>+</div><div class='ctx'> 	ah-&gt;ah_devid = devid;</div><div class='ctx'> 	ah-&gt;ah_subvendorid = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1294,7 +1272,7 @@ u32 ath9k_hw_get_eeprom(struct ath_hal_5416 *ahp,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int ath9k_hw_get_radiorev(struct ath_hal *ah)</div><div class='add'>+static int ath9k_hw_get_radiorev(struct ath_hal *ah)</div><div class='ctx'> {</div><div class='ctx'> 	u32 val;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -1307,7 +1285,7 @@ static inline int ath9k_hw_get_radiorev(struct ath_hal *ah)</div><div class='ctx'> 	return ath9k_hw_reverse_bits(val, 8);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int ath9k_hw_init_macaddr(struct ath_hal *ah)</div><div class='add'>+static int ath9k_hw_init_macaddr(struct ath_hal *ah)</div><div class='ctx'> {</div><div class='ctx'> 	u32 sum;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -1389,7 +1367,7 @@ static u16 ath9k_hw_eeprom_get_spur_chan(struct ath_hal *ah,</div><div class='ctx'> 	return spur_val;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int ath9k_hw_rfattach(struct ath_hal *ah)</div><div class='add'>+static int ath9k_hw_rfattach(struct ath_hal *ah)</div><div class='ctx'> {</div><div class='ctx'> 	bool rfStatus = false;</div><div class='ctx'> 	int ecode = 0;</div><div class='hunk'>@@ -1434,8 +1412,8 @@ static int ath9k_hw_rf_claim(struct ath_hal *ah)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void ath9k_hw_init_pll(struct ath_hal *ah,</div><div class='del'>-				     struct ath9k_channel *chan)</div><div class='add'>+static void ath9k_hw_init_pll(struct ath_hal *ah,</div><div class='add'>+			      struct ath9k_channel *chan)</div><div class='ctx'> {</div><div class='ctx'> 	u32 pll;</div><div class='ctx'> </div><div class='hunk'>@@ -1553,7 +1531,7 @@ static void ath9k_hw_set_operating_mode(struct ath_hal *ah, int opmode)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void</div><div class='add'>+static void</div><div class='ctx'> ath9k_hw_set_rfmode(struct ath_hal *ah, struct ath9k_channel *chan)</div><div class='ctx'> {</div><div class='ctx'> 	u32 rfMode = 0;</div><div class='hunk'>@@ -1623,7 +1601,7 @@ static bool ath9k_hw_set_reset(struct ath_hal *ah, int type)</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool ath9k_hw_set_reset_power_on(struct ath_hal *ah)</div><div class='add'>+static bool ath9k_hw_set_reset_power_on(struct ath_hal *ah)</div><div class='ctx'> {</div><div class='ctx'> 	REG_WRITE(ah, AR_RTC_FORCE_WAKE, AR_RTC_FORCE_WAKE_EN |</div><div class='ctx'> 		  AR_RTC_FORCE_WAKE_ON_INT);</div><div class='hunk'>@@ -1664,7 +1642,7 @@ static bool ath9k_hw_set_reset_reg(struct ath_hal *ah,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline</div><div class='add'>+static</div><div class='ctx'> struct ath9k_channel *ath9k_hw_check_chan(struct ath_hal *ah,</div><div class='ctx'> 					  struct ath9k_channel *chan)</div><div class='ctx'> {</div><div class='hunk'>@@ -2098,7 +2076,7 @@ static void ath9k_hw_ani_attach(struct ath_hal *ah)</div><div class='ctx'> 		ahp-&gt;ah_procPhyErr |= HAL_PROCESS_ANI;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void ath9k_hw_ani_setup(struct ath_hal *ah)</div><div class='add'>+static void ath9k_hw_ani_setup(struct ath_hal *ah)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_hal_5416 *ahp = AH5416(ah);</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -2548,6 +2526,11 @@ static void ath9k_ani_reset(struct ath_hal *ah)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Process a MIB interrupt.  We may potentially be invoked because</div><div class='add'>+ * any of the MIB counters overflow/trigger so don't assume we're</div><div class='add'>+ * here because a PHY error counter triggered.</div><div class='add'>+ */</div><div class='ctx'> void ath9k_hw_procmibevent(struct ath_hal *ah,</div><div class='ctx'> 			   const struct ath9k_node_stats *stats)</div><div class='ctx'> {</div><div class='hunk'>@@ -2555,18 +2538,20 @@ void ath9k_hw_procmibevent(struct ath_hal *ah,</div><div class='ctx'> 	u32 phyCnt1, phyCnt2;</div><div class='ctx'> </div><div class='ctx'> 	DPRINTF(ah-&gt;ah_sc, ATH_DBG_ANI, "Processing Mib Intr\n");</div><div class='del'>-</div><div class='add'>+	/* Reset these counters regardless */</div><div class='ctx'> 	REG_WRITE(ah, AR_FILT_OFDM, 0);</div><div class='ctx'> 	REG_WRITE(ah, AR_FILT_CCK, 0);</div><div class='ctx'> 	if (!(REG_READ(ah, AR_SLP_MIB_CTRL) &amp; AR_SLP_MIB_PENDING))</div><div class='ctx'> 		REG_WRITE(ah, AR_SLP_MIB_CTRL, AR_SLP_MIB_CLEAR);</div><div class='ctx'> </div><div class='add'>+	/* Clear the mib counters and save them in the stats */</div><div class='ctx'> 	ath9k_hw_update_mibstats(ah, &amp;ahp-&gt;ah_mibStats);</div><div class='ctx'> 	ahp-&gt;ah_stats.ast_nodestats = *stats;</div><div class='ctx'> </div><div class='ctx'> 	if (!DO_ANI(ah))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	/* NB: these are not reset-on-read */</div><div class='ctx'> 	phyCnt1 = REG_READ(ah, AR_PHY_ERR_1);</div><div class='ctx'> 	phyCnt2 = REG_READ(ah, AR_PHY_ERR_2);</div><div class='ctx'> 	if (((phyCnt1 &amp; AR_MIBCNT_INTRMASK) == AR_MIBCNT_INTRMASK) ||</div><div class='hunk'>@@ -2574,6 +2559,7 @@ void ath9k_hw_procmibevent(struct ath_hal *ah,</div><div class='ctx'> 		struct ar5416AniState *aniState = ahp-&gt;ah_curani;</div><div class='ctx'> 		u32 ofdmPhyErrCnt, cckPhyErrCnt;</div><div class='ctx'> </div><div class='add'>+		/* NB: only use ast_ani_*errs with AH_PRIVATE_DIAG */</div><div class='ctx'> 		ofdmPhyErrCnt = phyCnt1 - aniState-&gt;ofdmPhyErrBase;</div><div class='ctx'> 		ahp-&gt;ah_stats.ast_ani_ofdmerrs +=</div><div class='ctx'> 			ofdmPhyErrCnt - aniState-&gt;ofdmPhyErrCount;</div><div class='hunk'>@@ -2584,11 +2570,17 @@ void ath9k_hw_procmibevent(struct ath_hal *ah,</div><div class='ctx'> 			cckPhyErrCnt - aniState-&gt;cckPhyErrCount;</div><div class='ctx'> 		aniState-&gt;cckPhyErrCount = cckPhyErrCnt;</div><div class='ctx'> </div><div class='add'>+		/*</div><div class='add'>+		 * NB: figure out which counter triggered.  If both</div><div class='add'>+		 * trigger we'll only deal with one as the processing</div><div class='add'>+		 * clobbers the error counter so the trigger threshold</div><div class='add'>+		 * check will never be true.</div><div class='add'>+		 */</div><div class='ctx'> 		if (aniState-&gt;ofdmPhyErrCount &gt; aniState-&gt;ofdmTrigHigh)</div><div class='ctx'> 			ath9k_hw_ani_ofdm_err_trigger(ah);</div><div class='ctx'> 		if (aniState-&gt;cckPhyErrCount &gt; aniState-&gt;cckTrigHigh)</div><div class='ctx'> 			ath9k_hw_ani_cck_err_trigger(ah);</div><div class='del'>-</div><div class='add'>+		/* NB: always restart to insure the h/w counters are reset */</div><div class='ctx'> 		ath9k_ani_restart(ah);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -2822,32 +2814,11 @@ static void ath9k_hw_gpio_cfg_output_mux(struct ath_hal *ah,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool ath9k_hw_cfg_output(struct ath_hal *ah, u32 gpio,</div><div class='del'>-				enum ath9k_gpio_output_mux_type</div><div class='del'>-				halSignalType)</div><div class='add'>+void ath9k_hw_cfg_output(struct ath_hal *ah, u32 gpio,</div><div class='add'>+			 u32 ah_signal_type)</div><div class='ctx'> {</div><div class='del'>-	u32 ah_signal_type;</div><div class='ctx'> 	u32 gpio_shift;</div><div class='ctx'> </div><div class='del'>-	static u32 MuxSignalConversionTable[] = {</div><div class='del'>-</div><div class='del'>-		AR_GPIO_OUTPUT_MUX_AS_OUTPUT,</div><div class='del'>-</div><div class='del'>-		AR_GPIO_OUTPUT_MUX_AS_PCIE_ATTENTION_LED,</div><div class='del'>-</div><div class='del'>-		AR_GPIO_OUTPUT_MUX_AS_PCIE_POWER_LED,</div><div class='del'>-</div><div class='del'>-		AR_GPIO_OUTPUT_MUX_AS_MAC_NETWORK_LED,</div><div class='del'>-</div><div class='del'>-		AR_GPIO_OUTPUT_MUX_AS_MAC_POWER_LED,</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	if ((halSignalType &gt;= 0)</div><div class='del'>-	    &amp;&amp; (halSignalType &lt; ARRAY_SIZE(MuxSignalConversionTable)))</div><div class='del'>-		ah_signal_type = MuxSignalConversionTable[halSignalType];</div><div class='del'>-	else</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='ctx'> 	ath9k_hw_gpio_cfg_output_mux(ah, gpio, ah_signal_type);</div><div class='ctx'> </div><div class='ctx'> 	gpio_shift = 2 * gpio;</div><div class='hunk'>@@ -2856,19 +2827,46 @@ static bool ath9k_hw_cfg_output(struct ath_hal *ah, u32 gpio,</div><div class='ctx'> 		AR_GPIO_OE_OUT,</div><div class='ctx'> 		(AR_GPIO_OE_OUT_DRV_ALL &lt;&lt; gpio_shift),</div><div class='ctx'> 		(AR_GPIO_OE_OUT_DRV &lt;&lt; gpio_shift));</div><div class='del'>-</div><div class='del'>-	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool ath9k_hw_set_gpio(struct ath_hal *ah, u32 gpio,</div><div class='del'>-			      u32 val)</div><div class='add'>+void ath9k_hw_set_gpio(struct ath_hal *ah, u32 gpio, u32 val)</div><div class='ctx'> {</div><div class='ctx'> 	REG_RMW(ah, AR_GPIO_IN_OUT, ((val &amp; 1) &lt;&lt; gpio),</div><div class='ctx'> 		AR_GPIO_BIT(gpio));</div><div class='del'>-	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 ath9k_hw_gpio_get(struct ath_hal *ah, u32 gpio)</div><div class='add'>+/*</div><div class='add'>+ * Configure GPIO Input lines</div><div class='add'>+ */</div><div class='add'>+void ath9k_hw_cfg_gpio_input(struct ath_hal *ah, u32 gpio)</div><div class='add'>+{</div><div class='add'>+	u32 gpio_shift;</div><div class='add'>+</div><div class='add'>+	ASSERT(gpio &lt; ah-&gt;ah_caps.num_gpio_pins);</div><div class='add'>+</div><div class='add'>+	gpio_shift = gpio &lt;&lt; 1;</div><div class='add'>+</div><div class='add'>+	REG_RMW(ah,</div><div class='add'>+		AR_GPIO_OE_OUT,</div><div class='add'>+		(AR_GPIO_OE_OUT_DRV_NO &lt;&lt; gpio_shift),</div><div class='add'>+		(AR_GPIO_OE_OUT_DRV &lt;&lt; gpio_shift));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_RFKILL</div><div class='add'>+static void ath9k_enable_rfkill(struct ath_hal *ah)</div><div class='add'>+{</div><div class='add'>+	REG_SET_BIT(ah, AR_GPIO_INPUT_EN_VAL,</div><div class='add'>+		    AR_GPIO_INPUT_EN_VAL_RFSILENT_BB);</div><div class='add'>+</div><div class='add'>+	REG_CLR_BIT(ah, AR_GPIO_INPUT_MUX2,</div><div class='add'>+		    AR_GPIO_INPUT_MUX2_RFSILENT);</div><div class='add'>+</div><div class='add'>+	ath9k_hw_cfg_gpio_input(ah, ah-&gt;ah_rfkill_gpio);</div><div class='add'>+	REG_SET_BIT(ah, AR_PHY_TEST, RFSILENT_BB);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+u32 ath9k_hw_gpio_get(struct ath_hal *ah, u32 gpio)</div><div class='ctx'> {</div><div class='ctx'> 	if (gpio &gt;= ah-&gt;ah_caps.num_gpio_pins)</div><div class='ctx'> 		return 0xffffffff;</div><div class='hunk'>@@ -2883,7 +2881,7 @@ static u32 ath9k_hw_gpio_get(struct ath_hal *ah, u32 gpio)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int ath9k_hw_post_attach(struct ath_hal *ah)</div><div class='add'>+static int ath9k_hw_post_attach(struct ath_hal *ah)</div><div class='ctx'> {</div><div class='ctx'> 	int ecode;</div><div class='ctx'> </div><div class='hunk'>@@ -3081,17 +3079,17 @@ static bool ath9k_hw_fill_cap_info(struct ath_hal *ah)</div><div class='ctx'> </div><div class='ctx'> 	pCap-&gt;hw_caps |= ATH9K_HW_CAP_ENHANCEDPM;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_RFKILL</div><div class='ctx'> 	ah-&gt;ah_rfsilent = ath9k_hw_get_eeprom(ahp, EEP_RF_SILENT);</div><div class='ctx'> 	if (ah-&gt;ah_rfsilent &amp; EEP_RFSILENT_ENABLED) {</div><div class='del'>-		ahp-&gt;ah_gpioSelect =</div><div class='add'>+		ah-&gt;ah_rfkill_gpio =</div><div class='ctx'> 			MS(ah-&gt;ah_rfsilent, EEP_RFSILENT_GPIO_SEL);</div><div class='del'>-		ahp-&gt;ah_polarity =</div><div class='add'>+		ah-&gt;ah_rfkill_polarity =</div><div class='ctx'> 			MS(ah-&gt;ah_rfsilent, EEP_RFSILENT_POLARITY);</div><div class='ctx'> </div><div class='del'>-		ath9k_hw_setcapability(ah, ATH9K_CAP_RFSILENT, 1, true,</div><div class='del'>-				       NULL);</div><div class='ctx'> 		pCap-&gt;hw_caps |= ATH9K_HW_CAP_RFSILENT;</div><div class='ctx'> 	}</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	if ((ah-&gt;ah_macVersion == AR_SREV_VERSION_5416_PCI) ||</div><div class='ctx'> 	    (ah-&gt;ah_macVersion == AR_SREV_VERSION_5416_PCIE) ||</div><div class='hunk'>@@ -3595,7 +3593,7 @@ static inline bool ath9k_hw_fill_vpd_table(u8 pwrMin,</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void</div><div class='add'>+static void</div><div class='ctx'> ath9k_hw_get_gain_boundaries_pdadcs(struct ath_hal *ah,</div><div class='ctx'> 				    struct ath9k_channel *chan,</div><div class='ctx'> 				    struct cal_data_per_freq *pRawDataSet,</div><div class='hunk'>@@ -3777,7 +3775,7 @@ ath9k_hw_get_gain_boundaries_pdadcs(struct ath_hal *ah,</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool</div><div class='add'>+static bool</div><div class='ctx'> ath9k_hw_set_power_cal_table(struct ath_hal *ah,</div><div class='ctx'> 			     struct ar5416_eeprom *pEepData,</div><div class='ctx'> 			     struct ath9k_channel *chan,</div><div class='hunk'>@@ -3980,7 +3978,7 @@ void ath9k_hw_configpcipowersave(struct ath_hal *ah, int restore)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void</div><div class='add'>+static void</div><div class='ctx'> ath9k_hw_get_legacy_target_powers(struct ath_hal *ah,</div><div class='ctx'> 				  struct ath9k_channel *chan,</div><div class='ctx'> 				  struct cal_target_power_leg *powInfo,</div><div class='hunk'>@@ -4046,7 +4044,7 @@ ath9k_hw_get_legacy_target_powers(struct ath_hal *ah,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void</div><div class='add'>+static void</div><div class='ctx'> ath9k_hw_get_target_powers(struct ath_hal *ah,</div><div class='ctx'> 			   struct ath9k_channel *chan,</div><div class='ctx'> 			   struct cal_target_power_ht *powInfo,</div><div class='hunk'>@@ -4113,7 +4111,7 @@ ath9k_hw_get_target_powers(struct ath_hal *ah,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline u16</div><div class='add'>+static u16</div><div class='ctx'> ath9k_hw_get_max_edge_power(u16 freq,</div><div class='ctx'> 			    struct cal_ctl_edges *pRdEdgesPower,</div><div class='ctx'> 			    bool is2GHz)</div><div class='hunk'>@@ -4143,7 +4141,7 @@ ath9k_hw_get_max_edge_power(u16 freq,</div><div class='ctx'> 	return twiceMaxEdgePower;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool</div><div class='add'>+static bool</div><div class='ctx'> ath9k_hw_set_power_per_rate_table(struct ath_hal *ah,</div><div class='ctx'> 				  struct ar5416_eeprom *pEepData,</div><div class='ctx'> 				  struct ath9k_channel *chan,</div><div class='hunk'>@@ -5122,7 +5120,7 @@ static void ath9k_hw_spur_mitigate(struct ath_hal *ah,</div><div class='ctx'> 	REG_WRITE(ah, AR_PHY_MASK2_P_61_45, tmp_mask);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void ath9k_hw_init_chain_masks(struct ath_hal *ah)</div><div class='add'>+static void ath9k_hw_init_chain_masks(struct ath_hal *ah)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_hal_5416 *ahp = AH5416(ah);</div><div class='ctx'> 	int rx_chainmask, tx_chainmask;</div><div class='hunk'>@@ -5326,7 +5324,7 @@ bool ath9k_hw_setslottime(struct ath_hal *ah, u32 us)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void ath9k_hw_init_user_settings(struct ath_hal *ah)</div><div class='add'>+static void ath9k_hw_init_user_settings(struct ath_hal *ah)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_hal_5416 *ahp = AH5416(ah);</div><div class='ctx'> </div><div class='hunk'>@@ -5345,7 +5343,7 @@ static inline void ath9k_hw_init_user_settings(struct ath_hal *ah)</div><div class='ctx'> 		ath9k_hw_set_global_txtimeout(ah, ahp-&gt;ah_globaltxtimeout);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int</div><div class='add'>+static int</div><div class='ctx'> ath9k_hw_process_ini(struct ath_hal *ah,</div><div class='ctx'> 		     struct ath9k_channel *chan,</div><div class='ctx'> 		     enum ath9k_ht_macmode macmode)</div><div class='hunk'>@@ -5476,7 +5474,7 @@ ath9k_hw_process_ini(struct ath_hal *ah,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void ath9k_hw_setup_calibration(struct ath_hal *ah,</div><div class='add'>+static void ath9k_hw_setup_calibration(struct ath_hal *ah,</div><div class='ctx'> 					      struct hal_cal_list *currCal)</div><div class='ctx'> {</div><div class='ctx'> 	REG_RMW_FIELD(ah, AR_PHY_TIMING_CTRL4(0),</div><div class='hunk'>@@ -5512,8 +5510,8 @@ static inline void ath9k_hw_setup_calibration(struct ath_hal *ah,</div><div class='ctx'> 		    AR_PHY_TIMING_CTRL4_DO_CAL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void ath9k_hw_reset_calibration(struct ath_hal *ah,</div><div class='del'>-					      struct hal_cal_list *currCal)</div><div class='add'>+static void ath9k_hw_reset_calibration(struct ath_hal *ah,</div><div class='add'>+				       struct hal_cal_list *currCal)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_hal_5416 *ahp = AH5416(ah);</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -5532,7 +5530,7 @@ static inline void ath9k_hw_reset_calibration(struct ath_hal *ah,</div><div class='ctx'> 	ahp-&gt;ah_CalSamples = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void</div><div class='add'>+static void</div><div class='ctx'> ath9k_hw_per_calibration(struct ath_hal *ah,</div><div class='ctx'> 			 struct ath9k_channel *ichan,</div><div class='ctx'> 			 u8 rxchainmask,</div><div class='hunk'>@@ -5622,7 +5620,7 @@ static inline bool ath9k_hw_run_init_cals(struct ath_hal *ah,</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool</div><div class='add'>+static bool</div><div class='ctx'> ath9k_hw_channel_change(struct ath_hal *ah,</div><div class='ctx'> 			struct ath9k_channel *chan,</div><div class='ctx'> 			enum ath9k_ht_macmode macmode)</div><div class='hunk'>@@ -5799,8 +5797,8 @@ static bool ath9k_hw_iscal_supported(struct ath_hal *ah,</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool ath9k_hw_init_cal(struct ath_hal *ah,</div><div class='del'>-				     struct ath9k_channel *chan)</div><div class='add'>+static bool ath9k_hw_init_cal(struct ath_hal *ah,</div><div class='add'>+			      struct ath9k_channel *chan)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_hal_5416 *ahp = AH5416(ah);</div><div class='ctx'> 	struct ath9k_channel *ichan =</div><div class='hunk'>@@ -5861,7 +5859,7 @@ static inline bool ath9k_hw_init_cal(struct ath_hal *ah,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-bool ath9k_hw_reset(struct ath_hal *ah, enum ath9k_opmode opmode,</div><div class='add'>+bool ath9k_hw_reset(struct ath_hal *ah,</div><div class='ctx'> 		    struct ath9k_channel *chan,</div><div class='ctx'> 		    enum ath9k_ht_macmode macmode,</div><div class='ctx'> 		    u8 txchainmask, u8 rxchainmask,</div><div class='hunk'>@@ -5869,7 +5867,6 @@ bool ath9k_hw_reset(struct ath_hal *ah, enum ath9k_opmode opmode,</div><div class='ctx'> 		    bool bChannelChange,</div><div class='ctx'> 		    int *status)</div><div class='ctx'> {</div><div class='del'>-#define FAIL(_code)     do { ecode = _code; goto bad; } while (0)</div><div class='ctx'> 	u32 saveLedState;</div><div class='ctx'> 	struct ath_hal_5416 *ahp = AH5416(ah);</div><div class='ctx'> 	struct ath9k_channel *curchan = ah-&gt;ah_curchan;</div><div class='hunk'>@@ -5891,11 +5888,14 @@ bool ath9k_hw_reset(struct ath_hal *ah, enum ath9k_opmode opmode,</div><div class='ctx'> 		DPRINTF(ah-&gt;ah_sc, ATH_DBG_CHANNEL,</div><div class='ctx'> 			 "%s: invalid channel %u/0x%x; no mapping\n",</div><div class='ctx'> 			 __func__, chan-&gt;channel, chan-&gt;channelFlags);</div><div class='del'>-		FAIL(-EINVAL);</div><div class='add'>+		ecode = -EINVAL;</div><div class='add'>+		goto bad;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!ath9k_hw_setpower(ah, ATH9K_PM_AWAKE))</div><div class='del'>-		return false;</div><div class='add'>+	if (!ath9k_hw_setpower(ah, ATH9K_PM_AWAKE)) {</div><div class='add'>+		ecode = -EIO;</div><div class='add'>+		goto bad;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (curchan)</div><div class='ctx'> 		ath9k_hw_getnf(ah, curchan);</div><div class='hunk'>@@ -5932,7 +5932,8 @@ bool ath9k_hw_reset(struct ath_hal *ah, enum ath9k_opmode opmode,</div><div class='ctx'> 	if (!ath9k_hw_chip_reset(ah, chan)) {</div><div class='ctx'> 		DPRINTF(ah-&gt;ah_sc, ATH_DBG_RESET, "%s: chip reset failed\n",</div><div class='ctx'> 			 __func__);</div><div class='del'>-		FAIL(-EIO);</div><div class='add'>+		ecode = -EINVAL;</div><div class='add'>+		goto bad;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (AR_SREV_9280(ah)) {</div><div class='hunk'>@@ -5945,12 +5946,14 @@ bool ath9k_hw_reset(struct ath_hal *ah, enum ath9k_opmode opmode,</div><div class='ctx'> 			else</div><div class='ctx'> 				ath9k_hw_set_gpio(ah, 9, 1);</div><div class='ctx'> 		}</div><div class='del'>-		ath9k_hw_cfg_output(ah, 9, ATH9K_GPIO_OUTPUT_MUX_AS_OUTPUT);</div><div class='add'>+		ath9k_hw_cfg_output(ah, 9, AR_GPIO_OUTPUT_MUX_AS_OUTPUT);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ecode = ath9k_hw_process_ini(ah, chan, macmode);</div><div class='del'>-	if (ecode != 0)</div><div class='add'>+	if (ecode != 0) {</div><div class='add'>+		ecode = -EINVAL;</div><div class='ctx'> 		goto bad;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (IS_CHAN_OFDM(chan) || IS_CHAN_HT(chan))</div><div class='ctx'> 		ath9k_hw_set_delta_slope(ah, chan);</div><div class='hunk'>@@ -5963,7 +5966,8 @@ bool ath9k_hw_reset(struct ath_hal *ah, enum ath9k_opmode opmode,</div><div class='ctx'> 	if (!ath9k_hw_eeprom_set_board_values(ah, chan)) {</div><div class='ctx'> 		DPRINTF(ah-&gt;ah_sc, ATH_DBG_EEPROM,</div><div class='ctx'> 			 "%s: error setting board options\n", __func__);</div><div class='del'>-		FAIL(-EIO);</div><div class='add'>+		ecode = -EIO;</div><div class='add'>+		goto bad;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ath9k_hw_decrease_chain_power(ah, chan);</div><div class='hunk'>@@ -5975,7 +5979,7 @@ bool ath9k_hw_reset(struct ath_hal *ah, enum ath9k_opmode opmode,</div><div class='ctx'> 		  | (ah-&gt;ah_config.</div><div class='ctx'> 		     ack_6mb ? AR_STA_ID1_ACKCTS_6MB : 0)</div><div class='ctx'> 		  | ahp-&gt;ah_staId1Defaults);</div><div class='del'>-	ath9k_hw_set_operating_mode(ah, opmode);</div><div class='add'>+	ath9k_hw_set_operating_mode(ah, ah-&gt;ah_opmode);</div><div class='ctx'> </div><div class='ctx'> 	REG_WRITE(ah, AR_BSSMSKL, get_unaligned_le32(ahp-&gt;ah_bssidmask));</div><div class='ctx'> 	REG_WRITE(ah, AR_BSSMSKU, get_unaligned_le16(ahp-&gt;ah_bssidmask + 4));</div><div class='hunk'>@@ -5991,11 +5995,15 @@ bool ath9k_hw_reset(struct ath_hal *ah, enum ath9k_opmode opmode,</div><div class='ctx'> 	REG_WRITE(ah, AR_RSSI_THR, INIT_RSSI_THR);</div><div class='ctx'> </div><div class='ctx'> 	if (AR_SREV_9280_10_OR_LATER(ah)) {</div><div class='del'>-		if (!(ath9k_hw_ar9280_set_channel(ah, chan)))</div><div class='del'>-			FAIL(-EIO);</div><div class='add'>+		if (!(ath9k_hw_ar9280_set_channel(ah, chan))) {</div><div class='add'>+			ecode = -EIO;</div><div class='add'>+			goto bad;</div><div class='add'>+		}</div><div class='ctx'> 	} else {</div><div class='del'>-		if (!(ath9k_hw_set_channel(ah, chan)))</div><div class='del'>-			FAIL(-EIO);</div><div class='add'>+		if (!(ath9k_hw_set_channel(ah, chan))) {</div><div class='add'>+			ecode = -EIO;</div><div class='add'>+			goto bad;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; AR_NUM_DCU; i++)</div><div class='hunk'>@@ -6005,13 +6013,15 @@ bool ath9k_hw_reset(struct ath_hal *ah, enum ath9k_opmode opmode,</div><div class='ctx'> 	for (i = 0; i &lt; ah-&gt;ah_caps.total_queues; i++)</div><div class='ctx'> 		ath9k_hw_resettxqueue(ah, i);</div><div class='ctx'> </div><div class='del'>-	ath9k_hw_init_interrupt_masks(ah, opmode);</div><div class='add'>+	ath9k_hw_init_interrupt_masks(ah, ah-&gt;ah_opmode);</div><div class='ctx'> 	ath9k_hw_init_qos(ah);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_RFKILL</div><div class='add'>+	if (ah-&gt;ah_caps.hw_caps &amp; ATH9K_HW_CAP_RFSILENT)</div><div class='add'>+		ath9k_enable_rfkill(ah);</div><div class='add'>+#endif</div><div class='ctx'> 	ath9k_hw_init_user_settings(ah);</div><div class='ctx'> </div><div class='del'>-	ah-&gt;ah_opmode = opmode;</div><div class='del'>-</div><div class='ctx'> 	REG_WRITE(ah, AR_STA_ID1,</div><div class='ctx'> 		  REG_READ(ah, AR_STA_ID1) | AR_STA_ID1_PRESERVE_SEQNUM);</div><div class='ctx'> </div><div class='hunk'>@@ -6027,8 +6037,10 @@ bool ath9k_hw_reset(struct ath_hal *ah, enum ath9k_opmode opmode,</div><div class='ctx'> </div><div class='ctx'> 	ath9k_hw_init_bb(ah, chan);</div><div class='ctx'> </div><div class='del'>-	if (!ath9k_hw_init_cal(ah, chan))</div><div class='del'>-		FAIL(-ENODEV);</div><div class='add'>+	if (!ath9k_hw_init_cal(ah, chan)){</div><div class='add'>+		ecode = -EIO;;</div><div class='add'>+		goto bad;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	rx_chainmask = ahp-&gt;ah_rxchainmask;</div><div class='ctx'> 	if ((rx_chainmask == 0x5) || (rx_chainmask == 0x3)) {</div><div class='hunk'>@@ -6064,7 +6076,6 @@ bad:</div><div class='ctx'> 	if (status)</div><div class='ctx'> 		*status = ecode;</div><div class='ctx'> 	return false;</div><div class='del'>-#undef FAIL</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> bool ath9k_hw_phy_disable(struct ath_hal *ah)</div><div class='hunk'>@@ -6539,31 +6550,6 @@ ath9k_hw_setbssidmask(struct ath_hal *ah, const u8 *mask)</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_ATH9K_RFKILL</div><div class='del'>-static void ath9k_enable_rfkill(struct ath_hal *ah)</div><div class='del'>-{</div><div class='del'>-	struct ath_hal_5416 *ahp = AH5416(ah);</div><div class='del'>-</div><div class='del'>-	REG_SET_BIT(ah, AR_GPIO_INPUT_EN_VAL,</div><div class='del'>-		    AR_GPIO_INPUT_EN_VAL_RFSILENT_BB);</div><div class='del'>-</div><div class='del'>-	REG_CLR_BIT(ah, AR_GPIO_INPUT_MUX2,</div><div class='del'>-		    AR_GPIO_INPUT_MUX2_RFSILENT);</div><div class='del'>-</div><div class='del'>-	ath9k_hw_cfg_gpio_input(ah, ahp-&gt;ah_gpioSelect);</div><div class='del'>-	REG_SET_BIT(ah, AR_PHY_TEST, RFSILENT_BB);</div><div class='del'>-</div><div class='del'>-	if (ahp-&gt;ah_gpioBit == ath9k_hw_gpio_get(ah, ahp-&gt;ah_gpioSelect)) {</div><div class='del'>-</div><div class='del'>-		ath9k_hw_set_gpio_intr(ah, ahp-&gt;ah_gpioSelect,</div><div class='del'>-				       !ahp-&gt;ah_gpioBit);</div><div class='del'>-	} else {</div><div class='del'>-		ath9k_hw_set_gpio_intr(ah, ahp-&gt;ah_gpioSelect,</div><div class='del'>-				       ahp-&gt;ah_gpioBit);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> void</div><div class='ctx'> ath9k_hw_write_associd(struct ath_hal *ah, const u8 *bssid,</div><div class='ctx'> 		       u16 assocId)</div><div class='hunk'>@@ -7678,8 +7664,7 @@ bool ath9k_hw_resettxqueue(struct ath_hal *ah, u32 q)</div><div class='ctx'> 	REG_WRITE(ah, AR_DRETRY_LIMIT(q),</div><div class='ctx'> 		  SM(INIT_SSH_RETRY, AR_D_RETRY_LIMIT_STA_SH)</div><div class='ctx'> 		  | SM(INIT_SLG_RETRY, AR_D_RETRY_LIMIT_STA_LG)</div><div class='del'>-		  | SM(qi-&gt;tqi_shretry, AR_D_RETRY_LIMIT_FR_SH)</div><div class='del'>-		);</div><div class='add'>+		  | SM(qi-&gt;tqi_shretry, AR_D_RETRY_LIMIT_FR_SH));</div><div class='ctx'> </div><div class='ctx'> 	REG_WRITE(ah, AR_QMISC(q), AR_Q_MISC_DCU_EARLY_TERM_REQ);</div><div class='ctx'> 	REG_WRITE(ah, AR_DMISC(q),</div><div class='hunk'>@@ -8324,15 +8309,7 @@ struct ath_hal *ath9k_hw_attach(u16 devid,</div><div class='ctx'> 		*error = -ENXIO;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	if (ah != NULL) {</div><div class='del'>-		ah-&gt;ah_devid = ah-&gt;ah_devid;</div><div class='del'>-		ah-&gt;ah_subvendorid = ah-&gt;ah_subvendorid;</div><div class='del'>-		ah-&gt;ah_macVersion = ah-&gt;ah_macVersion;</div><div class='del'>-		ah-&gt;ah_macRev = ah-&gt;ah_macRev;</div><div class='del'>-		ah-&gt;ah_phyRev = ah-&gt;ah_phyRev;</div><div class='del'>-		ah-&gt;ah_analog5GhzRev = ah-&gt;ah_analog5GhzRev;</div><div class='del'>-		ah-&gt;ah_analog2GhzRev = ah-&gt;ah_analog2GhzRev;</div><div class='del'>-	}</div><div class='add'>+</div><div class='ctx'> 	return ah;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -8439,23 +8416,48 @@ u32 ath9k_hw_mhz2ieee(struct ath_hal *ah, u32 freq, u32 flags)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int16_t</div><div class='add'>+/* We can tune this as we go by monitoring really low values */</div><div class='add'>+#define ATH9K_NF_TOO_LOW	-60</div><div class='add'>+</div><div class='add'>+/* AR5416 may return very high value (like -31 dBm), in those cases the nf</div><div class='add'>+ * is incorrect and we should use the static NF value. Later we can try to</div><div class='add'>+ * find out why they are reporting these values */</div><div class='add'>+static bool ath9k_hw_nf_in_range(struct ath_hal *ah, s16 nf)</div><div class='add'>+{</div><div class='add'>+	if (nf &gt; ATH9K_NF_TOO_LOW) {</div><div class='add'>+		DPRINTF(ah-&gt;ah_sc, ATH_DBG_NF_CAL,</div><div class='add'>+			 "%s: noise floor value detected (%d) is "</div><div class='add'>+			"lower than what we think is a "</div><div class='add'>+			"reasonable value (%d)\n",</div><div class='add'>+			 __func__, nf, ATH9K_NF_TOO_LOW);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+s16</div><div class='ctx'> ath9k_hw_getchan_noise(struct ath_hal *ah, struct ath9k_channel *chan)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath9k_channel *ichan;</div><div class='add'>+	s16 nf;</div><div class='ctx'> </div><div class='ctx'> 	ichan = ath9k_regd_check_channel(ah, chan);</div><div class='ctx'> 	if (ichan == NULL) {</div><div class='ctx'> 		DPRINTF(ah-&gt;ah_sc, ATH_DBG_NF_CAL,</div><div class='ctx'> 			 "%s: invalid channel %u/0x%x; no mapping\n",</div><div class='ctx'> 			 __func__, chan-&gt;channel, chan-&gt;channelFlags);</div><div class='del'>-		return 0;</div><div class='add'>+		return ATH_DEFAULT_NOISE_FLOOR;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (ichan-&gt;rawNoiseFloor == 0) {</div><div class='ctx'> 		enum wireless_mode mode = ath9k_hw_chan2wmode(ah, chan);</div><div class='del'>-		return NOISE_FLOOR[mode];</div><div class='add'>+		nf = NOISE_FLOOR[mode];</div><div class='ctx'> 	} else</div><div class='del'>-		return ichan-&gt;rawNoiseFloor;</div><div class='add'>+		nf = ichan-&gt;rawNoiseFloor;</div><div class='add'>+</div><div class='add'>+	if (!ath9k_hw_nf_in_range(ah, nf))</div><div class='add'>+		nf = ATH_DEFAULT_NOISE_FLOOR;</div><div class='add'>+</div><div class='add'>+	return nf;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> bool ath9k_hw_set_tsfadjust(struct ath_hal *ah, u32 setting)</div><div class='head'>diff --git a/drivers/net/wireless/ath9k/hw.h b/drivers/net/wireless/ath9k/hw.h<br/>index ae680f21ba7e..2113818ee934 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/ath9k/hw.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/ath9k/hw.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/ath9k/hw.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/ath9k/hw.h</a></div><div class='hunk'>@@ -314,14 +314,11 @@ struct ar5416_desc {</div><div class='ctx'> #define RXSTATUS_RATE(ah, ads)  (AR_SREV_5416_V20_OR_LATER(ah) ?	\</div><div class='ctx'> 				 MS(ads-&gt;ds_rxstatus0, AR_RxRate) :	\</div><div class='ctx'> 				 (ads-&gt;ds_rxstatus3 &gt;&gt; 2) &amp; 0xFF)</div><div class='del'>-#define RXSTATUS_DUPLICATE(ah, ads)  (AR_SREV_5416_V20_OR_LATER(ah) ?	\</div><div class='del'>-				      MS(ads-&gt;ds_rxstatus3, AR_Parallel40) : \</div><div class='del'>-				      (ads-&gt;ds_rxstatus3 &gt;&gt; 10) &amp; 0x1)</div><div class='ctx'> </div><div class='del'>-#define set11nTries(_series, _index)				\</div><div class='add'>+#define set11nTries(_series, _index) \</div><div class='ctx'> 	(SM((_series)[_index].Tries, AR_XmitDataTries##_index))</div><div class='ctx'> </div><div class='del'>-#define set11nRate(_series, _index)				\</div><div class='add'>+#define set11nRate(_series, _index) \</div><div class='ctx'> 	(SM((_series)[_index].Rate, AR_XmitRate##_index))</div><div class='ctx'> </div><div class='ctx'> #define set11nPktDurRTSCTS(_series, _index)				\</div><div class='hunk'>@@ -330,11 +327,11 @@ struct ar5416_desc {</div><div class='ctx'> 		AR_RTSCTSQual##_index : 0))</div><div class='ctx'> </div><div class='ctx'> #define set11nRateFlags(_series, _index)				\</div><div class='del'>-	(((_series)[_index].RateFlags &amp; ATH9K_RATESERIES_2040 ? \</div><div class='del'>-		AR_2040_##_index : 0) \</div><div class='del'>-	|((_series)[_index].RateFlags &amp; ATH9K_RATESERIES_HALFGI ? \</div><div class='del'>-		AR_GI##_index : 0) \</div><div class='del'>-	|SM((_series)[_index].ChSel, AR_ChainSel##_index))</div><div class='add'>+	(((_series)[_index].RateFlags &amp; ATH9K_RATESERIES_2040 ?		\</div><div class='add'>+	  AR_2040_##_index : 0)						\</div><div class='add'>+	 |((_series)[_index].RateFlags &amp; ATH9K_RATESERIES_HALFGI ?	\</div><div class='add'>+	   AR_GI##_index : 0)						\</div><div class='add'>+	 |SM((_series)[_index].ChSel, AR_ChainSel##_index))</div><div class='ctx'> </div><div class='ctx'> #define AR_SREV_9100(ah) ((ah-&gt;ah_macVersion) == AR_SREV_VERSION_9100)</div><div class='ctx'> </div><div class='hunk'>@@ -346,9 +343,6 @@ struct ar5416_desc {</div><div class='ctx'> #define MAX_TX_FIFO_THRESHOLD   ((4096 / 64) - 1)</div><div class='ctx'> #define INIT_TX_FIFO_THRESHOLD  MIN_TX_FIFO_THRESHOLD</div><div class='ctx'> </div><div class='del'>-#define NUM_CORNER_FIX_BITS_2133    7</div><div class='del'>-#define CCK_OFDM_GAIN_DELTA         15</div><div class='del'>-</div><div class='ctx'> struct ar5416AniState {</div><div class='ctx'> 	struct ath9k_channel c;</div><div class='ctx'> 	u8 noiseImmunityLevel;</div><div class='hunk'>@@ -377,11 +371,8 @@ struct ar5416AniState {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define HAL_PROCESS_ANI     0x00000001</div><div class='del'>-#define HAL_RADAR_EN        0x80000000</div><div class='del'>-#define HAL_AR_EN           0x40000000</div><div class='del'>-</div><div class='ctx'> #define DO_ANI(ah) \</div><div class='del'>-    ((AH5416(ah)-&gt;ah_procPhyErr &amp; HAL_PROCESS_ANI))</div><div class='add'>+	((AH5416(ah)-&gt;ah_procPhyErr &amp; HAL_PROCESS_ANI))</div><div class='ctx'> </div><div class='ctx'> struct ar5416Stats {</div><div class='ctx'> 	u32 ast_ani_niup;</div><div class='hunk'>@@ -425,7 +416,6 @@ struct ar5416Stats {</div><div class='ctx'> #define AR5416_EEP_MINOR_VER_7       0x7</div><div class='ctx'> #define AR5416_EEP_MINOR_VER_9       0x9</div><div class='ctx'> </div><div class='del'>-#define AR5416_EEP_START_LOC            256</div><div class='ctx'> #define AR5416_NUM_5G_CAL_PIERS         8</div><div class='ctx'> #define AR5416_NUM_2G_CAL_PIERS         4</div><div class='ctx'> #define AR5416_NUM_5G_20_TARGET_POWERS  8</div><div class='hunk'>@@ -441,25 +431,10 @@ struct ar5416Stats {</div><div class='ctx'> #define AR5416_EEPROM_MODAL_SPURS       5</div><div class='ctx'> #define AR5416_MAX_RATE_POWER           63</div><div class='ctx'> #define AR5416_NUM_PDADC_VALUES         128</div><div class='del'>-#define AR5416_NUM_RATES                16</div><div class='ctx'> #define AR5416_BCHAN_UNUSED             0xFF</div><div class='ctx'> #define AR5416_MAX_PWR_RANGE_IN_HALF_DB 64</div><div class='del'>-#define AR5416_EEPMISC_BIG_ENDIAN       0x01</div><div class='ctx'> #define AR5416_MAX_CHAINS               3</div><div class='del'>-#define AR5416_ANT_16S                  25</div><div class='del'>-</div><div class='del'>-#define AR5416_NUM_ANT_CHAIN_FIELDS     7</div><div class='del'>-#define AR5416_NUM_ANT_COMMON_FIELDS    4</div><div class='del'>-#define AR5416_SIZE_ANT_CHAIN_FIELD     3</div><div class='del'>-#define AR5416_SIZE_ANT_COMMON_FIELD    4</div><div class='del'>-#define AR5416_ANT_CHAIN_MASK           0x7</div><div class='del'>-#define AR5416_ANT_COMMON_MASK          0xf</div><div class='del'>-#define AR5416_CHAIN_0_IDX              0</div><div class='del'>-#define AR5416_CHAIN_1_IDX              1</div><div class='del'>-#define AR5416_CHAIN_2_IDX              2</div><div class='del'>-</div><div class='ctx'> #define AR5416_PWR_TABLE_OFFSET         -5</div><div class='del'>-#define AR5416_LEGACY_CHAINMASK         1</div><div class='ctx'> </div><div class='ctx'> enum eeprom_param {</div><div class='ctx'> 	EEP_NFTHRESH_5,</div><div class='hunk'>@@ -633,7 +608,7 @@ struct ar5416IniArray {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define INIT_INI_ARRAY(iniarray, array, rows, columns) do {	\</div><div class='del'>-		(iniarray)-&gt;ia_array = (u32 *)(array);    \</div><div class='add'>+		(iniarray)-&gt;ia_array = (u32 *)(array);		\</div><div class='ctx'> 		(iniarray)-&gt;ia_rows = (rows);			\</div><div class='ctx'> 		(iniarray)-&gt;ia_columns = (columns);		\</div><div class='ctx'> 	} while (0)</div><div class='hunk'>@@ -641,16 +616,16 @@ struct ar5416IniArray {</div><div class='ctx'> #define INI_RA(iniarray, row, column) \</div><div class='ctx'> 	(((iniarray)-&gt;ia_array)[(row) *	((iniarray)-&gt;ia_columns) + (column)])</div><div class='ctx'> </div><div class='del'>-#define INIT_CAL(_perCal) do { \</div><div class='del'>-		(_perCal)-&gt;calState = CAL_WAITING; \</div><div class='del'>-		(_perCal)-&gt;calNext = NULL; \</div><div class='add'>+#define INIT_CAL(_perCal) do {				\</div><div class='add'>+		(_perCal)-&gt;calState = CAL_WAITING;	\</div><div class='add'>+		(_perCal)-&gt;calNext = NULL;		\</div><div class='ctx'> 	} while (0)</div><div class='ctx'> </div><div class='ctx'> #define INSERT_CAL(_ahp, _perCal)					\</div><div class='ctx'> 	do {								\</div><div class='ctx'> 		if ((_ahp)-&gt;ah_cal_list_last == NULL) {			\</div><div class='del'>-			(_ahp)-&gt;ah_cal_list = \</div><div class='del'>-				(_ahp)-&gt;ah_cal_list_last = (_perCal); \</div><div class='add'>+			(_ahp)-&gt;ah_cal_list =				\</div><div class='add'>+				(_ahp)-&gt;ah_cal_list_last = (_perCal);	\</div><div class='ctx'> 			((_ahp)-&gt;ah_cal_list_last)-&gt;calNext = (_perCal); \</div><div class='ctx'> 		} else {						\</div><div class='ctx'> 			((_ahp)-&gt;ah_cal_list_last)-&gt;calNext = (_perCal); \</div><div class='hunk'>@@ -696,25 +671,29 @@ struct hal_cal_list {</div><div class='ctx'> struct ath_hal_5416 {</div><div class='ctx'> 	struct ath_hal ah;</div><div class='ctx'> 	struct ar5416_eeprom ah_eeprom;</div><div class='add'>+	struct ar5416Stats ah_stats;</div><div class='add'>+	struct ath9k_tx_queue_info ah_txq[ATH9K_NUM_TX_QUEUES];</div><div class='add'>+	void __iomem *ah_cal_mem;</div><div class='add'>+</div><div class='ctx'> 	u8 ah_macaddr[ETH_ALEN];</div><div class='ctx'> 	u8 ah_bssid[ETH_ALEN];</div><div class='ctx'> 	u8 ah_bssidmask[ETH_ALEN];</div><div class='ctx'> 	u16 ah_assocId;</div><div class='add'>+</div><div class='ctx'> 	int16_t ah_curchanRadIndex;</div><div class='ctx'> 	u32 ah_maskReg;</div><div class='del'>-	struct ar5416Stats ah_stats;</div><div class='del'>-	u32 ah_txDescMask;</div><div class='ctx'> 	u32 ah_txOkInterruptMask;</div><div class='ctx'> 	u32 ah_txErrInterruptMask;</div><div class='ctx'> 	u32 ah_txDescInterruptMask;</div><div class='ctx'> 	u32 ah_txEolInterruptMask;</div><div class='ctx'> 	u32 ah_txUrnInterruptMask;</div><div class='del'>-	struct ath9k_tx_queue_info ah_txq[ATH9K_NUM_TX_QUEUES];</div><div class='del'>-	enum ath9k_power_mode ah_powerMode;</div><div class='ctx'> 	bool ah_chipFullSleep;</div><div class='ctx'> 	u32 ah_atimWindow;</div><div class='del'>-	enum ath9k_ant_setting ah_diversityControl;</div><div class='ctx'> 	u16 ah_antennaSwitchSwap;</div><div class='add'>+	enum ath9k_power_mode ah_powerMode;</div><div class='add'>+	enum ath9k_ant_setting ah_diversityControl;</div><div class='add'>+</div><div class='add'>+	/* Calibration */</div><div class='ctx'> 	enum hal_cal_types ah_suppCals;</div><div class='ctx'> 	struct hal_cal_list ah_iqCalData;</div><div class='ctx'> 	struct hal_cal_list ah_adcGainCalData;</div><div class='hunk'>@@ -751,16 +730,16 @@ struct ath_hal_5416 {</div><div class='ctx'> 		int32_t sign[AR5416_MAX_CHAINS];</div><div class='ctx'> 	} ah_Meas3;</div><div class='ctx'> 	u16 ah_CalSamples;</div><div class='del'>-	u32 ah_tx6PowerInHalfDbm;</div><div class='add'>+</div><div class='ctx'> 	u32 ah_staId1Defaults;</div><div class='ctx'> 	u32 ah_miscMode;</div><div class='del'>-	bool ah_tpcEnabled;</div><div class='del'>-	u32 ah_beaconInterval;</div><div class='ctx'> 	enum {</div><div class='ctx'> 		AUTO_32KHZ,</div><div class='ctx'> 		USE_32KHZ,</div><div class='ctx'> 		DONT_USE_32KHZ,</div><div class='ctx'> 	} ah_enable32kHzClock;</div><div class='add'>+</div><div class='add'>+	/* RF */</div><div class='ctx'> 	u32 *ah_analogBank0Data;</div><div class='ctx'> 	u32 *ah_analogBank1Data;</div><div class='ctx'> 	u32 *ah_analogBank2Data;</div><div class='hunk'>@@ -770,8 +749,9 @@ struct ath_hal_5416 {</div><div class='ctx'> 	u32 *ah_analogBank7Data;</div><div class='ctx'> 	u32 *ah_addac5416_21;</div><div class='ctx'> 	u32 *ah_bank6Temp;</div><div class='del'>-	u32 ah_ofdmTxPower;</div><div class='add'>+</div><div class='ctx'> 	int16_t ah_txPowerIndexOffset;</div><div class='add'>+	u32 ah_beaconInterval;</div><div class='ctx'> 	u32 ah_slottime;</div><div class='ctx'> 	u32 ah_acktimeout;</div><div class='ctx'> 	u32 ah_ctstimeout;</div><div class='hunk'>@@ -780,7 +760,8 @@ struct ath_hal_5416 {</div><div class='ctx'> 	u32 ah_gpioSelect;</div><div class='ctx'> 	u32 ah_polarity;</div><div class='ctx'> 	u32 ah_gpioBit;</div><div class='del'>-	bool ah_eepEnabled;</div><div class='add'>+</div><div class='add'>+	/* ANI */</div><div class='ctx'> 	u32 ah_procPhyErr;</div><div class='ctx'> 	bool ah_hasHwPhyCounters;</div><div class='ctx'> 	u32 ah_aniPeriod;</div><div class='hunk'>@@ -790,18 +771,14 @@ struct ath_hal_5416 {</div><div class='ctx'> 	int ah_coarseHigh[5];</div><div class='ctx'> 	int ah_coarseLow[5];</div><div class='ctx'> 	int ah_firpwr[5];</div><div class='del'>-	u16 ah_ratesArray[16];</div><div class='add'>+	enum ath9k_ani_cmd ah_ani_function;</div><div class='add'>+</div><div class='ctx'> 	u32 ah_intrTxqs;</div><div class='ctx'> 	bool ah_intrMitigation;</div><div class='del'>-	u32 ah_cycleCount;</div><div class='del'>-	u32 ah_ctlBusy;</div><div class='del'>-	u32 ah_extBusy;</div><div class='ctx'> 	enum ath9k_ht_extprotspacing ah_extprotspacing;</div><div class='ctx'> 	u8 ah_txchainmask;</div><div class='ctx'> 	u8 ah_rxchainmask;</div><div class='del'>-	int ah_hwp;</div><div class='del'>-	void __iomem *ah_cal_mem;</div><div class='del'>-	enum ath9k_ani_cmd ah_ani_function;</div><div class='add'>+</div><div class='ctx'> 	struct ar5416IniArray ah_iniModes;</div><div class='ctx'> 	struct ar5416IniArray ah_iniCommon;</div><div class='ctx'> 	struct ar5416IniArray ah_iniBank0;</div><div class='hunk'>@@ -820,10 +797,6 @@ struct ath_hal_5416 {</div><div class='ctx'> </div><div class='ctx'> #define FREQ2FBIN(x, y) ((y) ? ((x) - 2300) : (((x) - 4800) / 5))</div><div class='ctx'> </div><div class='del'>-#define IS_5416_EMU(ah)					\</div><div class='del'>-	((ah-&gt;ah_devid == AR5416_DEVID_EMU) ||		\</div><div class='del'>-	 (ah-&gt;ah_devid == AR5416_DEVID_EMU_PCIE))</div><div class='del'>-</div><div class='ctx'> #define ar5416RfDetach(ah) do {					\</div><div class='ctx'> 		if (AH5416(ah)-&gt;ah_rfHal.rfDetach != NULL)	\</div><div class='ctx'> 			AH5416(ah)-&gt;ah_rfHal.rfDetach(ah);	\</div><div class='hunk'>@@ -841,8 +814,8 @@ struct ath_hal_5416 {</div><div class='ctx'> #define REG_WRITE_ARRAY(iniarray, column, regWr) do {                   \</div><div class='ctx'> 		int r;							\</div><div class='ctx'> 		for (r = 0; r &lt; ((iniarray)-&gt;ia_rows); r++) {		\</div><div class='del'>-			REG_WRITE(ah, INI_RA((iniarray), (r), 0), \</div><div class='del'>-				INI_RA((iniarray), r, (column))); \</div><div class='add'>+			REG_WRITE(ah, INI_RA((iniarray), (r), 0),	\</div><div class='add'>+				  INI_RA((iniarray), r, (column)));	\</div><div class='ctx'> 			DO_DELAY(regWr);				\</div><div class='ctx'> 		}							\</div><div class='ctx'> 	} while (0)</div><div class='hunk'>@@ -852,30 +825,21 @@ struct ath_hal_5416 {</div><div class='ctx'> #define COEF_SCALE_S                24</div><div class='ctx'> #define HT40_CHANNEL_CENTER_SHIFT   10</div><div class='ctx'> </div><div class='del'>-#define ar5416CheckOpMode(_opmode)					\</div><div class='del'>-	((_opmode == ATH9K_M_STA) || (_opmode == ATH9K_M_IBSS) ||	\</div><div class='del'>-	 (_opmode == ATH9K_M_HOSTAP) || (_opmode == ATH9K_M_MONITOR))</div><div class='del'>-</div><div class='ctx'> #define AR5416_EEPROM_MAGIC_OFFSET  0x0</div><div class='ctx'> </div><div class='ctx'> #define AR5416_EEPROM_S             2</div><div class='ctx'> #define AR5416_EEPROM_OFFSET        0x2000</div><div class='del'>-#define AR5416_EEPROM_START_ADDR			\</div><div class='add'>+#define AR5416_EEPROM_START_ADDR \</div><div class='ctx'> 	(AR_SREV_9100(ah)) ? 0x1fff1000 : 0x503f1200</div><div class='ctx'> #define AR5416_EEPROM_MAX           0xae0</div><div class='del'>-#define ar5416_get_eep_ver(_ahp)				\</div><div class='add'>+#define ar5416_get_eep_ver(_ahp) \</div><div class='ctx'> 	(((_ahp)-&gt;ah_eeprom.baseEepHeader.version &gt;&gt; 12) &amp; 0xF)</div><div class='del'>-#define ar5416_get_eep_rev(_ahp)				\</div><div class='add'>+#define ar5416_get_eep_rev(_ahp) \</div><div class='ctx'> 	(((_ahp)-&gt;ah_eeprom.baseEepHeader.version) &amp; 0xFFF)</div><div class='del'>-#define ar5416_get_ntxchains(_txchainmask)				\</div><div class='add'>+#define ar5416_get_ntxchains(_txchainmask) \</div><div class='ctx'> 	(((_txchainmask &gt;&gt; 2) &amp; 1) + \</div><div class='ctx'> 		((_txchainmask &gt;&gt; 1) &amp; 1) + (_txchainmask &amp; 1))</div><div class='ctx'> </div><div class='del'>-#define IS_EEP_MINOR_V3(_ahp) \</div><div class='del'>-	(ath9k_hw_get_eeprom((_ahp), EEP_MINOR_REV)  &gt;= AR5416_EEP_MINOR_VER_3)</div><div class='del'>-</div><div class='del'>-#define FIXED_CCA_THRESHOLD 15</div><div class='del'>-</div><div class='ctx'> #ifdef __BIG_ENDIAN</div><div class='ctx'> #define AR5416_EEPROM_MAGIC 0x5aa5</div><div class='ctx'> #else</div><div class='hunk'>@@ -910,8 +874,6 @@ struct ath_hal_5416 {</div><div class='ctx'> #define AR_GPIOD_MASK                   0x00001FFF</div><div class='ctx'> #define AR_GPIO_BIT(_gpio)              (1 &lt;&lt; (_gpio))</div><div class='ctx'> </div><div class='del'>-#define MAX_ANALOG_START                319</div><div class='del'>-</div><div class='ctx'> #define HAL_EP_RND(x, mul) \</div><div class='ctx'> 	((((x)%(mul)) &gt;= ((mul)/2)) ? ((x) + ((mul) - 1)) / (mul) : (x)/(mul))</div><div class='ctx'> #define BEACON_RSSI(ahp) \</div><div class='hunk'>@@ -923,8 +885,6 @@ struct ath_hal_5416 {</div><div class='ctx'> #define AH_TIMEOUT         100000</div><div class='ctx'> #define AH_TIME_QUANTUM        10</div><div class='ctx'> </div><div class='del'>-#define IS(_c, _f)       (((_c)-&gt;channelFlags &amp; _f) || 0)</div><div class='del'>-</div><div class='ctx'> #define AR_KEYTABLE_SIZE 128</div><div class='ctx'> #define POWER_UP_TIME    200000</div><div class='ctx'> </div><div class='hunk'>@@ -964,6 +924,6 @@ struct ath_hal_5416 {</div><div class='ctx'> #define OFDM_SYMBOL_TIME_QUARTER    16</div><div class='ctx'> </div><div class='ctx'> u32 ath9k_hw_get_eeprom(struct ath_hal_5416 *ahp,</div><div class='del'>-			      enum eeprom_param param);</div><div class='add'>+			enum eeprom_param param);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/wireless/ath9k/main.c b/drivers/net/wireless/ath9k/main.c<br/>index acebdf1d20a8..f05f584ab7bc 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/ath9k/main.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/ath9k/main.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/ath9k/main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/ath9k/main.c</a></div><div class='hunk'>@@ -22,8 +22,6 @@</div><div class='ctx'> #define ATH_PCI_VERSION "0.1"</div><div class='ctx'> </div><div class='ctx'> #define IEEE80211_HTCAP_MAXRXAMPDU_FACTOR	13</div><div class='del'>-#define IEEE80211_ACTION_CAT_HT			7</div><div class='del'>-#define IEEE80211_ACTION_HT_TXCHWIDTH		0</div><div class='ctx'> </div><div class='ctx'> static char *dev_info = "ath9k";</div><div class='ctx'> </div><div class='hunk'>@@ -142,7 +140,7 @@ static int ath_key_config(struct ath_softc *sc,</div><div class='ctx'> 	struct ath9k_keyval hk;</div><div class='ctx'> 	const u8 *mac = NULL;</div><div class='ctx'> 	int ret = 0;</div><div class='del'>-	enum ieee80211_if_types opmode;</div><div class='add'>+	enum nl80211_iftype opmode;</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;hk, 0, sizeof(hk));</div><div class='ctx'> </div><div class='hunk'>@@ -181,14 +179,14 @@ static int ath_key_config(struct ath_softc *sc,</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (is_broadcast_ether_addr(addr)) {</div><div class='ctx'> 		switch (opmode) {</div><div class='del'>-		case IEEE80211_IF_TYPE_STA:</div><div class='add'>+		case NL80211_IFTYPE_STATION:</div><div class='ctx'> 			/* default key:  could be group WPA key</div><div class='ctx'> 			 * or could be static WEP key */</div><div class='ctx'> 			mac = NULL;</div><div class='ctx'> 			break;</div><div class='del'>-		case IEEE80211_IF_TYPE_IBSS:</div><div class='add'>+		case NL80211_IFTYPE_ADHOC:</div><div class='ctx'> 			break;</div><div class='del'>-		case IEEE80211_IF_TYPE_AP:</div><div class='add'>+		case NL80211_IFTYPE_AP:</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			ASSERT(0);</div><div class='hunk'>@@ -211,30 +209,25 @@ static int ath_key_config(struct ath_softc *sc,</div><div class='ctx'> </div><div class='ctx'> static void ath_key_delete(struct ath_softc *sc, struct ieee80211_key_conf *key)</div><div class='ctx'> {</div><div class='del'>-#define ATH_MAX_NUM_KEYS 4</div><div class='ctx'> 	int freeslot;</div><div class='ctx'> </div><div class='del'>-	freeslot = (key-&gt;keyidx &gt;= ATH_MAX_NUM_KEYS) ? 1 : 0;</div><div class='add'>+	freeslot = (key-&gt;keyidx &gt;= 4) ? 1 : 0;</div><div class='ctx'> 	ath_key_reset(sc, key-&gt;keyidx, freeslot);</div><div class='del'>-#undef ATH_MAX_NUM_KEYS</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void setup_ht_cap(struct ieee80211_ht_info *ht_info)</div><div class='ctx'> {</div><div class='del'>-/* Until mac80211 includes these fields */</div><div class='del'>-</div><div class='del'>-#define IEEE80211_HT_CAP_DSSSCCK40 0x1000</div><div class='del'>-#define	IEEE80211_HT_CAP_MAXRXAMPDU_65536 0x3   /* 2 ^ 16 */</div><div class='del'>-#define	IEEE80211_HT_CAP_MPDUDENSITY_8 0x6     	/* 8 usec */</div><div class='add'>+#define	ATH9K_HT_CAP_MAXRXAMPDU_65536 0x3	/* 2 ^ 16 */</div><div class='add'>+#define	ATH9K_HT_CAP_MPDUDENSITY_8 0x6		/* 8 usec */</div><div class='ctx'> </div><div class='ctx'> 	ht_info-&gt;ht_supported = 1;</div><div class='ctx'> 	ht_info-&gt;cap = (u16)IEEE80211_HT_CAP_SUP_WIDTH</div><div class='del'>-			|(u16)IEEE80211_HT_CAP_MIMO_PS</div><div class='add'>+			|(u16)IEEE80211_HT_CAP_SM_PS</div><div class='ctx'> 			|(u16)IEEE80211_HT_CAP_SGI_40</div><div class='ctx'> 			|(u16)IEEE80211_HT_CAP_DSSSCCK40;</div><div class='ctx'> </div><div class='del'>-	ht_info-&gt;ampdu_factor = IEEE80211_HT_CAP_MAXRXAMPDU_65536;</div><div class='del'>-	ht_info-&gt;ampdu_density = IEEE80211_HT_CAP_MPDUDENSITY_8;</div><div class='add'>+	ht_info-&gt;ampdu_factor = ATH9K_HT_CAP_MAXRXAMPDU_65536;</div><div class='add'>+	ht_info-&gt;ampdu_density = ATH9K_HT_CAP_MPDUDENSITY_8;</div><div class='ctx'> 	/* setup supported mcs set */</div><div class='ctx'> 	memset(ht_info-&gt;supp_mcs_set, 0, 16);</div><div class='ctx'> 	ht_info-&gt;supp_mcs_set[0] = 0xff;</div><div class='hunk'>@@ -281,10 +274,12 @@ static void ath9k_rx_prepare(struct ath_softc *sc,</div><div class='ctx'> 	rx_status-&gt;mactime = status-&gt;tsf;</div><div class='ctx'> 	rx_status-&gt;band = curchan-&gt;band;</div><div class='ctx'> 	rx_status-&gt;freq =  curchan-&gt;center_freq;</div><div class='del'>-	rx_status-&gt;noise = ATH_DEFAULT_NOISE_FLOOR;</div><div class='add'>+	rx_status-&gt;noise = sc-&gt;sc_ani.sc_noise_floor;</div><div class='ctx'> 	rx_status-&gt;signal = rx_status-&gt;noise + status-&gt;rssi;</div><div class='ctx'> 	rx_status-&gt;rate_idx = ath_rate2idx(sc, (status-&gt;rateKbps / 100));</div><div class='ctx'> 	rx_status-&gt;antenna = status-&gt;antenna;</div><div class='add'>+</div><div class='add'>+	/* XXX Fix me, 64 cannot be the max rssi value, rigure it out */</div><div class='ctx'> 	rx_status-&gt;qual = status-&gt;rssi * 100 / 64;</div><div class='ctx'> </div><div class='ctx'> 	if (status-&gt;flags &amp; ATH_RX_MIC_ERROR)</div><div class='hunk'>@@ -330,6 +325,698 @@ static u8 parse_mpdudensity(u8 mpdudensity)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void ath9k_ht_conf(struct ath_softc *sc,</div><div class='add'>+			  struct ieee80211_bss_conf *bss_conf)</div><div class='add'>+{</div><div class='add'>+#define IEEE80211_HT_CAP_40MHZ_INTOLERANT BIT(14)</div><div class='add'>+	struct ath_ht_info *ht_info = &amp;sc-&gt;sc_ht_info;</div><div class='add'>+</div><div class='add'>+	if (bss_conf-&gt;assoc_ht) {</div><div class='add'>+		ht_info-&gt;ext_chan_offset =</div><div class='add'>+			bss_conf-&gt;ht_bss_conf-&gt;bss_cap &amp;</div><div class='add'>+				IEEE80211_HT_IE_CHA_SEC_OFFSET;</div><div class='add'>+</div><div class='add'>+		if (!(bss_conf-&gt;ht_conf-&gt;cap &amp;</div><div class='add'>+			IEEE80211_HT_CAP_40MHZ_INTOLERANT) &amp;&amp;</div><div class='add'>+			    (bss_conf-&gt;ht_bss_conf-&gt;bss_cap &amp;</div><div class='add'>+				IEEE80211_HT_IE_CHA_WIDTH))</div><div class='add'>+			ht_info-&gt;tx_chan_width = ATH9K_HT_MACMODE_2040;</div><div class='add'>+		else</div><div class='add'>+			ht_info-&gt;tx_chan_width = ATH9K_HT_MACMODE_20;</div><div class='add'>+</div><div class='add'>+		ath9k_hw_set11nmac2040(sc-&gt;sc_ah, ht_info-&gt;tx_chan_width);</div><div class='add'>+		ht_info-&gt;maxampdu = 1 &lt;&lt; (IEEE80211_HTCAP_MAXRXAMPDU_FACTOR +</div><div class='add'>+					bss_conf-&gt;ht_conf-&gt;ampdu_factor);</div><div class='add'>+		ht_info-&gt;mpdudensity =</div><div class='add'>+			parse_mpdudensity(bss_conf-&gt;ht_conf-&gt;ampdu_density);</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#undef IEEE80211_HT_CAP_40MHZ_INTOLERANT</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath9k_bss_assoc_info(struct ath_softc *sc,</div><div class='add'>+				 struct ieee80211_bss_conf *bss_conf)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hw *hw = sc-&gt;hw;</div><div class='add'>+	struct ieee80211_channel *curchan = hw-&gt;conf.channel;</div><div class='add'>+	struct ath_vap *avp;</div><div class='add'>+	int pos;</div><div class='add'>+	DECLARE_MAC_BUF(mac);</div><div class='add'>+</div><div class='add'>+	if (bss_conf-&gt;assoc) {</div><div class='add'>+		DPRINTF(sc, ATH_DBG_CONFIG, "%s: Bss Info ASSOC %d\n",</div><div class='add'>+			__func__,</div><div class='add'>+			bss_conf-&gt;aid);</div><div class='add'>+</div><div class='add'>+		avp = sc-&gt;sc_vaps[0];</div><div class='add'>+		if (avp == NULL) {</div><div class='add'>+			DPRINTF(sc, ATH_DBG_FATAL, "%s: Invalid interface\n",</div><div class='add'>+				__func__);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* New association, store aid */</div><div class='add'>+		if (avp-&gt;av_opmode == ATH9K_M_STA) {</div><div class='add'>+			sc-&gt;sc_curaid = bss_conf-&gt;aid;</div><div class='add'>+			ath9k_hw_write_associd(sc-&gt;sc_ah, sc-&gt;sc_curbssid,</div><div class='add'>+					       sc-&gt;sc_curaid);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Configure the beacon */</div><div class='add'>+		ath_beacon_config(sc, 0);</div><div class='add'>+		sc-&gt;sc_flags |= SC_OP_BEACONS;</div><div class='add'>+</div><div class='add'>+		/* Reset rssi stats */</div><div class='add'>+		sc-&gt;sc_halstats.ns_avgbrssi = ATH_RSSI_DUMMY_MARKER;</div><div class='add'>+		sc-&gt;sc_halstats.ns_avgrssi = ATH_RSSI_DUMMY_MARKER;</div><div class='add'>+		sc-&gt;sc_halstats.ns_avgtxrssi = ATH_RSSI_DUMMY_MARKER;</div><div class='add'>+		sc-&gt;sc_halstats.ns_avgtxrate = ATH_RATE_DUMMY_MARKER;</div><div class='add'>+</div><div class='add'>+		/* Update chainmask */</div><div class='add'>+		ath_update_chainmask(sc, bss_conf-&gt;assoc_ht);</div><div class='add'>+</div><div class='add'>+		DPRINTF(sc, ATH_DBG_CONFIG,</div><div class='add'>+			"%s: bssid %s aid 0x%x\n",</div><div class='add'>+			__func__,</div><div class='add'>+			print_mac(mac, sc-&gt;sc_curbssid), sc-&gt;sc_curaid);</div><div class='add'>+</div><div class='add'>+		DPRINTF(sc, ATH_DBG_CONFIG, "%s: Set channel: %d MHz\n",</div><div class='add'>+			__func__,</div><div class='add'>+			curchan-&gt;center_freq);</div><div class='add'>+</div><div class='add'>+		pos = ath_get_channel(sc, curchan);</div><div class='add'>+		if (pos == -1) {</div><div class='add'>+			DPRINTF(sc, ATH_DBG_FATAL,</div><div class='add'>+				"%s: Invalid channel\n", __func__);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (hw-&gt;conf.ht_conf.ht_supported)</div><div class='add'>+			sc-&gt;sc_ah-&gt;ah_channels[pos].chanmode =</div><div class='add'>+				ath_get_extchanmode(sc, curchan);</div><div class='add'>+		else</div><div class='add'>+			sc-&gt;sc_ah-&gt;ah_channels[pos].chanmode =</div><div class='add'>+				(curchan-&gt;band == IEEE80211_BAND_2GHZ) ?</div><div class='add'>+				CHANNEL_G : CHANNEL_A;</div><div class='add'>+</div><div class='add'>+		/* set h/w channel */</div><div class='add'>+		if (ath_set_channel(sc, &amp;sc-&gt;sc_ah-&gt;ah_channels[pos]) &lt; 0)</div><div class='add'>+			DPRINTF(sc, ATH_DBG_FATAL,</div><div class='add'>+				"%s: Unable to set channel\n",</div><div class='add'>+				__func__);</div><div class='add'>+</div><div class='add'>+		ath_rate_newstate(sc, avp);</div><div class='add'>+		/* Update ratectrl about the new state */</div><div class='add'>+		ath_rc_node_update(hw, avp-&gt;rc_node);</div><div class='add'>+</div><div class='add'>+		/* Start ANI */</div><div class='add'>+		mod_timer(&amp;sc-&gt;sc_ani.timer,</div><div class='add'>+			jiffies + msecs_to_jiffies(ATH_ANI_POLLINTERVAL));</div><div class='add'>+</div><div class='add'>+	} else {</div><div class='add'>+		DPRINTF(sc, ATH_DBG_CONFIG,</div><div class='add'>+		"%s: Bss Info DISSOC\n", __func__);</div><div class='add'>+		sc-&gt;sc_curaid = 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath_get_beaconconfig(struct ath_softc *sc,</div><div class='add'>+			  int if_id,</div><div class='add'>+			  struct ath_beacon_config *conf)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hw *hw = sc-&gt;hw;</div><div class='add'>+</div><div class='add'>+	/* fill in beacon config data */</div><div class='add'>+</div><div class='add'>+	conf-&gt;beacon_interval = hw-&gt;conf.beacon_int;</div><div class='add'>+	conf-&gt;listen_interval = 100;</div><div class='add'>+	conf-&gt;dtim_count = 1;</div><div class='add'>+	conf-&gt;bmiss_timeout = ATH_DEFAULT_BMISS_LIMIT * conf-&gt;listen_interval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath_tx_complete(struct ath_softc *sc, struct sk_buff *skb,</div><div class='add'>+		     struct ath_xmit_status *tx_status, struct ath_node *an)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hw *hw = sc-&gt;hw;</div><div class='add'>+	struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);</div><div class='add'>+</div><div class='add'>+	DPRINTF(sc, ATH_DBG_XMIT,</div><div class='add'>+		"%s: TX complete: skb: %p\n", __func__, skb);</div><div class='add'>+</div><div class='add'>+	if (tx_info-&gt;flags &amp; IEEE80211_TX_CTL_NO_ACK ||</div><div class='add'>+		tx_info-&gt;flags &amp; IEEE80211_TX_STAT_TX_FILTERED) {</div><div class='add'>+		/* free driver's private data area of tx_info */</div><div class='add'>+		if (tx_info-&gt;driver_data[0] != NULL)</div><div class='add'>+			kfree(tx_info-&gt;driver_data[0]);</div><div class='add'>+			tx_info-&gt;driver_data[0] = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tx_status-&gt;flags &amp; ATH_TX_BAR) {</div><div class='add'>+		tx_info-&gt;flags |= IEEE80211_TX_STAT_AMPDU_NO_BACK;</div><div class='add'>+		tx_status-&gt;flags &amp;= ~ATH_TX_BAR;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tx_status-&gt;flags &amp; (ATH_TX_ERROR | ATH_TX_XRETRY)) {</div><div class='add'>+		if (!(tx_info-&gt;flags &amp; IEEE80211_TX_CTL_NO_ACK)) {</div><div class='add'>+			/* Frame was not ACKed, but an ACK was expected */</div><div class='add'>+			tx_info-&gt;status.excessive_retries = 1;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		/* Frame was ACKed */</div><div class='add'>+		tx_info-&gt;flags |= IEEE80211_TX_STAT_ACK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tx_info-&gt;status.retry_count = tx_status-&gt;retries;</div><div class='add'>+</div><div class='add'>+	ieee80211_tx_status(hw, skb);</div><div class='add'>+	if (an)</div><div class='add'>+		ath_node_put(sc, an, ATH9K_BH_STATUS_CHANGE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int _ath_rx_indicate(struct ath_softc *sc,</div><div class='add'>+		     struct sk_buff *skb,</div><div class='add'>+		     struct ath_recv_status *status,</div><div class='add'>+		     u16 keyix)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hw *hw = sc-&gt;hw;</div><div class='add'>+	struct ath_node *an = NULL;</div><div class='add'>+	struct ieee80211_rx_status rx_status;</div><div class='add'>+	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb-&gt;data;</div><div class='add'>+	int hdrlen = ieee80211_get_hdrlen_from_skb(skb);</div><div class='add'>+	int padsize;</div><div class='add'>+	enum ATH_RX_TYPE st;</div><div class='add'>+</div><div class='add'>+	/* see if any padding is done by the hw and remove it */</div><div class='add'>+	if (hdrlen &amp; 3) {</div><div class='add'>+		padsize = hdrlen % 4;</div><div class='add'>+		memmove(skb-&gt;data + padsize, skb-&gt;data, hdrlen);</div><div class='add'>+		skb_pull(skb, padsize);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Prepare rx status */</div><div class='add'>+	ath9k_rx_prepare(sc, skb, status, &amp;rx_status);</div><div class='add'>+</div><div class='add'>+	if (!(keyix == ATH9K_RXKEYIX_INVALID) &amp;&amp;</div><div class='add'>+	    !(status-&gt;flags &amp; ATH_RX_DECRYPT_ERROR)) {</div><div class='add'>+		rx_status.flag |= RX_FLAG_DECRYPTED;</div><div class='add'>+	} else if ((le16_to_cpu(hdr-&gt;frame_control) &amp; IEEE80211_FCTL_PROTECTED)</div><div class='add'>+		   &amp;&amp; !(status-&gt;flags &amp; ATH_RX_DECRYPT_ERROR)</div><div class='add'>+		   &amp;&amp; skb-&gt;len &gt;= hdrlen + 4) {</div><div class='add'>+		keyix = skb-&gt;data[hdrlen + 3] &gt;&gt; 6;</div><div class='add'>+</div><div class='add'>+		if (test_bit(keyix, sc-&gt;sc_keymap))</div><div class='add'>+			rx_status.flag |= RX_FLAG_DECRYPTED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;sc-&gt;node_lock);</div><div class='add'>+	an = ath_node_find(sc, hdr-&gt;addr2);</div><div class='add'>+	spin_unlock_bh(&amp;sc-&gt;node_lock);</div><div class='add'>+</div><div class='add'>+	if (an) {</div><div class='add'>+		ath_rx_input(sc, an,</div><div class='add'>+			     hw-&gt;conf.ht_conf.ht_supported,</div><div class='add'>+			     skb, status, &amp;st);</div><div class='add'>+	}</div><div class='add'>+	if (!an || (st != ATH_RX_CONSUMED))</div><div class='add'>+		__ieee80211_rx(hw, skb, &amp;rx_status);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath_rx_subframe(struct ath_node *an,</div><div class='add'>+		    struct sk_buff *skb,</div><div class='add'>+		    struct ath_recv_status *status)</div><div class='add'>+{</div><div class='add'>+	struct ath_softc *sc = an-&gt;an_sc;</div><div class='add'>+	struct ieee80211_hw *hw = sc-&gt;hw;</div><div class='add'>+	struct ieee80211_rx_status rx_status;</div><div class='add'>+</div><div class='add'>+	/* Prepare rx status */</div><div class='add'>+	ath9k_rx_prepare(sc, skb, status, &amp;rx_status);</div><div class='add'>+	if (!(status-&gt;flags &amp; ATH_RX_DECRYPT_ERROR))</div><div class='add'>+		rx_status.flag |= RX_FLAG_DECRYPTED;</div><div class='add'>+</div><div class='add'>+	__ieee80211_rx(hw, skb, &amp;rx_status);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/********************************/</div><div class='add'>+/*	 LED functions		*/</div><div class='add'>+/********************************/</div><div class='add'>+</div><div class='add'>+static void ath_led_brightness(struct led_classdev *led_cdev,</div><div class='add'>+			       enum led_brightness brightness)</div><div class='add'>+{</div><div class='add'>+	struct ath_led *led = container_of(led_cdev, struct ath_led, led_cdev);</div><div class='add'>+	struct ath_softc *sc = led-&gt;sc;</div><div class='add'>+</div><div class='add'>+	switch (brightness) {</div><div class='add'>+	case LED_OFF:</div><div class='add'>+		if (led-&gt;led_type == ATH_LED_ASSOC ||</div><div class='add'>+		    led-&gt;led_type == ATH_LED_RADIO)</div><div class='add'>+			sc-&gt;sc_flags &amp;= ~SC_OP_LED_ASSOCIATED;</div><div class='add'>+		ath9k_hw_set_gpio(sc-&gt;sc_ah, ATH_LED_PIN,</div><div class='add'>+				(led-&gt;led_type == ATH_LED_RADIO) ? 1 :</div><div class='add'>+				!!(sc-&gt;sc_flags &amp; SC_OP_LED_ASSOCIATED));</div><div class='add'>+		break;</div><div class='add'>+	case LED_FULL:</div><div class='add'>+		if (led-&gt;led_type == ATH_LED_ASSOC)</div><div class='add'>+			sc-&gt;sc_flags |= SC_OP_LED_ASSOCIATED;</div><div class='add'>+		ath9k_hw_set_gpio(sc-&gt;sc_ah, ATH_LED_PIN, 0);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath_register_led(struct ath_softc *sc, struct ath_led *led,</div><div class='add'>+			    char *trigger)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	led-&gt;sc = sc;</div><div class='add'>+	led-&gt;led_cdev.name = led-&gt;name;</div><div class='add'>+	led-&gt;led_cdev.default_trigger = trigger;</div><div class='add'>+	led-&gt;led_cdev.brightness_set = ath_led_brightness;</div><div class='add'>+</div><div class='add'>+	ret = led_classdev_register(wiphy_dev(sc-&gt;hw-&gt;wiphy), &amp;led-&gt;led_cdev);</div><div class='add'>+	if (ret)</div><div class='add'>+		DPRINTF(sc, ATH_DBG_FATAL,</div><div class='add'>+			"Failed to register led:%s", led-&gt;name);</div><div class='add'>+	else</div><div class='add'>+		led-&gt;registered = 1;</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath_unregister_led(struct ath_led *led)</div><div class='add'>+{</div><div class='add'>+	if (led-&gt;registered) {</div><div class='add'>+		led_classdev_unregister(&amp;led-&gt;led_cdev);</div><div class='add'>+		led-&gt;registered = 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath_deinit_leds(struct ath_softc *sc)</div><div class='add'>+{</div><div class='add'>+	ath_unregister_led(&amp;sc-&gt;assoc_led);</div><div class='add'>+	sc-&gt;sc_flags &amp;= ~SC_OP_LED_ASSOCIATED;</div><div class='add'>+	ath_unregister_led(&amp;sc-&gt;tx_led);</div><div class='add'>+	ath_unregister_led(&amp;sc-&gt;rx_led);</div><div class='add'>+	ath_unregister_led(&amp;sc-&gt;radio_led);</div><div class='add'>+	ath9k_hw_set_gpio(sc-&gt;sc_ah, ATH_LED_PIN, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath_init_leds(struct ath_softc *sc)</div><div class='add'>+{</div><div class='add'>+	char *trigger;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Configure gpio 1 for output */</div><div class='add'>+	ath9k_hw_cfg_output(sc-&gt;sc_ah, ATH_LED_PIN,</div><div class='add'>+			    AR_GPIO_OUTPUT_MUX_AS_OUTPUT);</div><div class='add'>+	/* LED off, active low */</div><div class='add'>+	ath9k_hw_set_gpio(sc-&gt;sc_ah, ATH_LED_PIN, 1);</div><div class='add'>+</div><div class='add'>+	trigger = ieee80211_get_radio_led_name(sc-&gt;hw);</div><div class='add'>+	snprintf(sc-&gt;radio_led.name, sizeof(sc-&gt;radio_led.name),</div><div class='add'>+		"ath9k-%s:radio", wiphy_name(sc-&gt;hw-&gt;wiphy));</div><div class='add'>+	ret = ath_register_led(sc, &amp;sc-&gt;radio_led, trigger);</div><div class='add'>+	sc-&gt;radio_led.led_type = ATH_LED_RADIO;</div><div class='add'>+	if (ret)</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	trigger = ieee80211_get_assoc_led_name(sc-&gt;hw);</div><div class='add'>+	snprintf(sc-&gt;assoc_led.name, sizeof(sc-&gt;assoc_led.name),</div><div class='add'>+		"ath9k-%s:assoc", wiphy_name(sc-&gt;hw-&gt;wiphy));</div><div class='add'>+	ret = ath_register_led(sc, &amp;sc-&gt;assoc_led, trigger);</div><div class='add'>+	sc-&gt;assoc_led.led_type = ATH_LED_ASSOC;</div><div class='add'>+	if (ret)</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	trigger = ieee80211_get_tx_led_name(sc-&gt;hw);</div><div class='add'>+	snprintf(sc-&gt;tx_led.name, sizeof(sc-&gt;tx_led.name),</div><div class='add'>+		"ath9k-%s:tx", wiphy_name(sc-&gt;hw-&gt;wiphy));</div><div class='add'>+	ret = ath_register_led(sc, &amp;sc-&gt;tx_led, trigger);</div><div class='add'>+	sc-&gt;tx_led.led_type = ATH_LED_TX;</div><div class='add'>+	if (ret)</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	trigger = ieee80211_get_rx_led_name(sc-&gt;hw);</div><div class='add'>+	snprintf(sc-&gt;rx_led.name, sizeof(sc-&gt;rx_led.name),</div><div class='add'>+		"ath9k-%s:rx", wiphy_name(sc-&gt;hw-&gt;wiphy));</div><div class='add'>+	ret = ath_register_led(sc, &amp;sc-&gt;rx_led, trigger);</div><div class='add'>+	sc-&gt;rx_led.led_type = ATH_LED_RX;</div><div class='add'>+	if (ret)</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+fail:</div><div class='add'>+	ath_deinit_leds(sc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_RFKILL</div><div class='add'>+/*******************/</div><div class='add'>+/*	Rfkill	   */</div><div class='add'>+/*******************/</div><div class='add'>+</div><div class='add'>+static void ath_radio_enable(struct ath_softc *sc)</div><div class='add'>+{</div><div class='add'>+	struct ath_hal *ah = sc-&gt;sc_ah;</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;sc-&gt;sc_resetlock);</div><div class='add'>+	if (!ath9k_hw_reset(ah, ah-&gt;ah_curchan,</div><div class='add'>+			    sc-&gt;sc_ht_info.tx_chan_width,</div><div class='add'>+			    sc-&gt;sc_tx_chainmask,</div><div class='add'>+			    sc-&gt;sc_rx_chainmask,</div><div class='add'>+			    sc-&gt;sc_ht_extprotspacing,</div><div class='add'>+			    false, &amp;status)) {</div><div class='add'>+		DPRINTF(sc, ATH_DBG_FATAL,</div><div class='add'>+			"%s: unable to reset channel %u (%uMhz) "</div><div class='add'>+			"flags 0x%x hal status %u\n", __func__,</div><div class='add'>+			ath9k_hw_mhz2ieee(ah,</div><div class='add'>+					  ah-&gt;ah_curchan-&gt;channel,</div><div class='add'>+					  ah-&gt;ah_curchan-&gt;channelFlags),</div><div class='add'>+			ah-&gt;ah_curchan-&gt;channel,</div><div class='add'>+			ah-&gt;ah_curchan-&gt;channelFlags, status);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(&amp;sc-&gt;sc_resetlock);</div><div class='add'>+</div><div class='add'>+	ath_update_txpow(sc);</div><div class='add'>+	if (ath_startrecv(sc) != 0) {</div><div class='add'>+		DPRINTF(sc, ATH_DBG_FATAL,</div><div class='add'>+			"%s: unable to restart recv logic\n", __func__);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (sc-&gt;sc_flags &amp; SC_OP_BEACONS)</div><div class='add'>+		ath_beacon_config(sc, ATH_IF_ID_ANY);	/* restart beacons */</div><div class='add'>+</div><div class='add'>+	/* Re-Enable  interrupts */</div><div class='add'>+	ath9k_hw_set_interrupts(ah, sc-&gt;sc_imask);</div><div class='add'>+</div><div class='add'>+	/* Enable LED */</div><div class='add'>+	ath9k_hw_cfg_output(ah, ATH_LED_PIN,</div><div class='add'>+			    AR_GPIO_OUTPUT_MUX_AS_OUTPUT);</div><div class='add'>+	ath9k_hw_set_gpio(ah, ATH_LED_PIN, 0);</div><div class='add'>+</div><div class='add'>+	ieee80211_wake_queues(sc-&gt;hw);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath_radio_disable(struct ath_softc *sc)</div><div class='add'>+{</div><div class='add'>+	struct ath_hal *ah = sc-&gt;sc_ah;</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	ieee80211_stop_queues(sc-&gt;hw);</div><div class='add'>+</div><div class='add'>+	/* Disable LED */</div><div class='add'>+	ath9k_hw_set_gpio(ah, ATH_LED_PIN, 1);</div><div class='add'>+	ath9k_hw_cfg_gpio_input(ah, ATH_LED_PIN);</div><div class='add'>+</div><div class='add'>+	/* Disable interrupts */</div><div class='add'>+	ath9k_hw_set_interrupts(ah, 0);</div><div class='add'>+</div><div class='add'>+	ath_draintxq(sc, false);	/* clear pending tx frames */</div><div class='add'>+	ath_stoprecv(sc);		/* turn off frame recv */</div><div class='add'>+	ath_flushrecv(sc);		/* flush recv queue */</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;sc-&gt;sc_resetlock);</div><div class='add'>+	if (!ath9k_hw_reset(ah, ah-&gt;ah_curchan,</div><div class='add'>+			    sc-&gt;sc_ht_info.tx_chan_width,</div><div class='add'>+			    sc-&gt;sc_tx_chainmask,</div><div class='add'>+			    sc-&gt;sc_rx_chainmask,</div><div class='add'>+			    sc-&gt;sc_ht_extprotspacing,</div><div class='add'>+			    false, &amp;status)) {</div><div class='add'>+		DPRINTF(sc, ATH_DBG_FATAL,</div><div class='add'>+			"%s: unable to reset channel %u (%uMhz) "</div><div class='add'>+			"flags 0x%x hal status %u\n", __func__,</div><div class='add'>+			ath9k_hw_mhz2ieee(ah,</div><div class='add'>+				ah-&gt;ah_curchan-&gt;channel,</div><div class='add'>+				ah-&gt;ah_curchan-&gt;channelFlags),</div><div class='add'>+			ah-&gt;ah_curchan-&gt;channel,</div><div class='add'>+			ah-&gt;ah_curchan-&gt;channelFlags, status);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(&amp;sc-&gt;sc_resetlock);</div><div class='add'>+</div><div class='add'>+	ath9k_hw_phy_disable(ah);</div><div class='add'>+	ath9k_hw_setpower(ah, ATH9K_PM_FULL_SLEEP);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath_is_rfkill_set(struct ath_softc *sc)</div><div class='add'>+{</div><div class='add'>+	struct ath_hal *ah = sc-&gt;sc_ah;</div><div class='add'>+</div><div class='add'>+	return ath9k_hw_gpio_get(ah, ah-&gt;ah_rfkill_gpio) ==</div><div class='add'>+				  ah-&gt;ah_rfkill_polarity;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* h/w rfkill poll function */</div><div class='add'>+static void ath_rfkill_poll(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct ath_softc *sc = container_of(work, struct ath_softc,</div><div class='add'>+					    rf_kill.rfkill_poll.work);</div><div class='add'>+	bool radio_on;</div><div class='add'>+</div><div class='add'>+	if (sc-&gt;sc_flags &amp; SC_OP_INVALID)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	radio_on = !ath_is_rfkill_set(sc);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * enable/disable radio only when there is a</div><div class='add'>+	 * state change in RF switch</div><div class='add'>+	 */</div><div class='add'>+	if (radio_on == !!(sc-&gt;sc_flags &amp; SC_OP_RFKILL_HW_BLOCKED)) {</div><div class='add'>+		enum rfkill_state state;</div><div class='add'>+</div><div class='add'>+		if (sc-&gt;sc_flags &amp; SC_OP_RFKILL_SW_BLOCKED) {</div><div class='add'>+			state = radio_on ? RFKILL_STATE_SOFT_BLOCKED</div><div class='add'>+				: RFKILL_STATE_HARD_BLOCKED;</div><div class='add'>+		} else if (radio_on) {</div><div class='add'>+			ath_radio_enable(sc);</div><div class='add'>+			state = RFKILL_STATE_UNBLOCKED;</div><div class='add'>+		} else {</div><div class='add'>+			ath_radio_disable(sc);</div><div class='add'>+			state = RFKILL_STATE_HARD_BLOCKED;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (state == RFKILL_STATE_HARD_BLOCKED)</div><div class='add'>+			sc-&gt;sc_flags |= SC_OP_RFKILL_HW_BLOCKED;</div><div class='add'>+		else</div><div class='add'>+			sc-&gt;sc_flags &amp;= ~SC_OP_RFKILL_HW_BLOCKED;</div><div class='add'>+</div><div class='add'>+		rfkill_force_state(sc-&gt;rf_kill.rfkill, state);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	queue_delayed_work(sc-&gt;hw-&gt;workqueue, &amp;sc-&gt;rf_kill.rfkill_poll,</div><div class='add'>+			   msecs_to_jiffies(ATH_RFKILL_POLL_INTERVAL));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* s/w rfkill handler */</div><div class='add'>+static int ath_sw_toggle_radio(void *data, enum rfkill_state state)</div><div class='add'>+{</div><div class='add'>+	struct ath_softc *sc = data;</div><div class='add'>+</div><div class='add'>+	switch (state) {</div><div class='add'>+	case RFKILL_STATE_SOFT_BLOCKED:</div><div class='add'>+		if (!(sc-&gt;sc_flags &amp; (SC_OP_RFKILL_HW_BLOCKED |</div><div class='add'>+		    SC_OP_RFKILL_SW_BLOCKED)))</div><div class='add'>+			ath_radio_disable(sc);</div><div class='add'>+		sc-&gt;sc_flags |= SC_OP_RFKILL_SW_BLOCKED;</div><div class='add'>+		return 0;</div><div class='add'>+	case RFKILL_STATE_UNBLOCKED:</div><div class='add'>+		if ((sc-&gt;sc_flags &amp; SC_OP_RFKILL_SW_BLOCKED)) {</div><div class='add'>+			sc-&gt;sc_flags &amp;= ~SC_OP_RFKILL_SW_BLOCKED;</div><div class='add'>+			if (sc-&gt;sc_flags &amp; SC_OP_RFKILL_HW_BLOCKED) {</div><div class='add'>+				DPRINTF(sc, ATH_DBG_FATAL, "Can't turn on the"</div><div class='add'>+					"radio as it is disabled by h/w \n");</div><div class='add'>+				return -EPERM;</div><div class='add'>+			}</div><div class='add'>+			ath_radio_enable(sc);</div><div class='add'>+		}</div><div class='add'>+		return 0;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Init s/w rfkill */</div><div class='add'>+static int ath_init_sw_rfkill(struct ath_softc *sc)</div><div class='add'>+{</div><div class='add'>+	sc-&gt;rf_kill.rfkill = rfkill_allocate(wiphy_dev(sc-&gt;hw-&gt;wiphy),</div><div class='add'>+					     RFKILL_TYPE_WLAN);</div><div class='add'>+	if (!sc-&gt;rf_kill.rfkill) {</div><div class='add'>+		DPRINTF(sc, ATH_DBG_FATAL, "Failed to allocate rfkill\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snprintf(sc-&gt;rf_kill.rfkill_name, sizeof(sc-&gt;rf_kill.rfkill_name),</div><div class='add'>+		"ath9k-%s:rfkill", wiphy_name(sc-&gt;hw-&gt;wiphy));</div><div class='add'>+	sc-&gt;rf_kill.rfkill-&gt;name = sc-&gt;rf_kill.rfkill_name;</div><div class='add'>+	sc-&gt;rf_kill.rfkill-&gt;data = sc;</div><div class='add'>+	sc-&gt;rf_kill.rfkill-&gt;toggle_radio = ath_sw_toggle_radio;</div><div class='add'>+	sc-&gt;rf_kill.rfkill-&gt;state = RFKILL_STATE_UNBLOCKED;</div><div class='add'>+	sc-&gt;rf_kill.rfkill-&gt;user_claim_unsupported = 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Deinitialize rfkill */</div><div class='add'>+static void ath_deinit_rfkill(struct ath_softc *sc)</div><div class='add'>+{</div><div class='add'>+	if (sc-&gt;sc_ah-&gt;ah_caps.hw_caps &amp; ATH9K_HW_CAP_RFSILENT)</div><div class='add'>+		cancel_delayed_work_sync(&amp;sc-&gt;rf_kill.rfkill_poll);</div><div class='add'>+</div><div class='add'>+	if (sc-&gt;sc_flags &amp; SC_OP_RFKILL_REGISTERED) {</div><div class='add'>+		rfkill_unregister(sc-&gt;rf_kill.rfkill);</div><div class='add'>+		sc-&gt;sc_flags &amp;= ~SC_OP_RFKILL_REGISTERED;</div><div class='add'>+		sc-&gt;rf_kill.rfkill = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_RFKILL */</div><div class='add'>+</div><div class='add'>+static int ath_detach(struct ath_softc *sc)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hw *hw = sc-&gt;hw;</div><div class='add'>+</div><div class='add'>+	DPRINTF(sc, ATH_DBG_CONFIG, "%s: Detach ATH hw\n", __func__);</div><div class='add'>+</div><div class='add'>+	/* Deinit LED control */</div><div class='add'>+	ath_deinit_leds(sc);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_RFKILL</div><div class='add'>+	/* deinit rfkill */</div><div class='add'>+	ath_deinit_rfkill(sc);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* Unregister hw */</div><div class='add'>+</div><div class='add'>+	ieee80211_unregister_hw(hw);</div><div class='add'>+</div><div class='add'>+	/* unregister Rate control */</div><div class='add'>+	ath_rate_control_unregister();</div><div class='add'>+</div><div class='add'>+	/* tx/rx cleanup */</div><div class='add'>+</div><div class='add'>+	ath_rx_cleanup(sc);</div><div class='add'>+	ath_tx_cleanup(sc);</div><div class='add'>+</div><div class='add'>+	/* Deinit */</div><div class='add'>+</div><div class='add'>+	ath_deinit(sc);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath_attach(u16 devid,</div><div class='add'>+		      struct ath_softc *sc)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hw *hw = sc-&gt;hw;</div><div class='add'>+	int error = 0;</div><div class='add'>+</div><div class='add'>+	DPRINTF(sc, ATH_DBG_CONFIG, "%s: Attach ATH hw\n", __func__);</div><div class='add'>+</div><div class='add'>+	error = ath_init(devid, sc);</div><div class='add'>+	if (error != 0)</div><div class='add'>+		return error;</div><div class='add'>+</div><div class='add'>+	/* Init nodes */</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;sc-&gt;node_list);</div><div class='add'>+	spin_lock_init(&amp;sc-&gt;node_lock);</div><div class='add'>+</div><div class='add'>+	/* get mac address from hardware and set in mac80211 */</div><div class='add'>+</div><div class='add'>+	SET_IEEE80211_PERM_ADDR(hw, sc-&gt;sc_myaddr);</div><div class='add'>+</div><div class='add'>+	/* setup channels and rates */</div><div class='add'>+</div><div class='add'>+	sc-&gt;sbands[IEEE80211_BAND_2GHZ].channels =</div><div class='add'>+		sc-&gt;channels[IEEE80211_BAND_2GHZ];</div><div class='add'>+	sc-&gt;sbands[IEEE80211_BAND_2GHZ].bitrates =</div><div class='add'>+		sc-&gt;rates[IEEE80211_BAND_2GHZ];</div><div class='add'>+	sc-&gt;sbands[IEEE80211_BAND_2GHZ].band = IEEE80211_BAND_2GHZ;</div><div class='add'>+</div><div class='add'>+	if (sc-&gt;sc_ah-&gt;ah_caps.hw_caps &amp; ATH9K_HW_CAP_HT)</div><div class='add'>+		/* Setup HT capabilities for 2.4Ghz*/</div><div class='add'>+		setup_ht_cap(&amp;sc-&gt;sbands[IEEE80211_BAND_2GHZ].ht_info);</div><div class='add'>+</div><div class='add'>+	hw-&gt;wiphy-&gt;bands[IEEE80211_BAND_2GHZ] =</div><div class='add'>+		&amp;sc-&gt;sbands[IEEE80211_BAND_2GHZ];</div><div class='add'>+</div><div class='add'>+	if (test_bit(ATH9K_MODE_11A, sc-&gt;sc_ah-&gt;ah_caps.wireless_modes)) {</div><div class='add'>+		sc-&gt;sbands[IEEE80211_BAND_5GHZ].channels =</div><div class='add'>+			sc-&gt;channels[IEEE80211_BAND_5GHZ];</div><div class='add'>+		sc-&gt;sbands[IEEE80211_BAND_5GHZ].bitrates =</div><div class='add'>+			sc-&gt;rates[IEEE80211_BAND_5GHZ];</div><div class='add'>+		sc-&gt;sbands[IEEE80211_BAND_5GHZ].band =</div><div class='add'>+			IEEE80211_BAND_5GHZ;</div><div class='add'>+</div><div class='add'>+		if (sc-&gt;sc_ah-&gt;ah_caps.hw_caps &amp; ATH9K_HW_CAP_HT)</div><div class='add'>+			/* Setup HT capabilities for 5Ghz*/</div><div class='add'>+			setup_ht_cap(&amp;sc-&gt;sbands[IEEE80211_BAND_5GHZ].ht_info);</div><div class='add'>+</div><div class='add'>+		hw-&gt;wiphy-&gt;bands[IEEE80211_BAND_5GHZ] =</div><div class='add'>+			&amp;sc-&gt;sbands[IEEE80211_BAND_5GHZ];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* FIXME: Have to figure out proper hw init values later */</div><div class='add'>+</div><div class='add'>+	hw-&gt;queues = 4;</div><div class='add'>+	hw-&gt;ampdu_queues = 1;</div><div class='add'>+</div><div class='add'>+	/* Register rate control */</div><div class='add'>+	hw-&gt;rate_control_algorithm = "ath9k_rate_control";</div><div class='add'>+	error = ath_rate_control_register();</div><div class='add'>+	if (error != 0) {</div><div class='add'>+		DPRINTF(sc, ATH_DBG_FATAL,</div><div class='add'>+			"%s: Unable to register rate control "</div><div class='add'>+			"algorithm:%d\n", __func__, error);</div><div class='add'>+		ath_rate_control_unregister();</div><div class='add'>+		goto bad;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	error = ieee80211_register_hw(hw);</div><div class='add'>+	if (error != 0) {</div><div class='add'>+		ath_rate_control_unregister();</div><div class='add'>+		goto bad;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Initialize LED control */</div><div class='add'>+	ath_init_leds(sc);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_RFKILL</div><div class='add'>+	/* Initialze h/w Rfkill */</div><div class='add'>+	if (sc-&gt;sc_ah-&gt;ah_caps.hw_caps &amp; ATH9K_HW_CAP_RFSILENT)</div><div class='add'>+		INIT_DELAYED_WORK(&amp;sc-&gt;rf_kill.rfkill_poll, ath_rfkill_poll);</div><div class='add'>+</div><div class='add'>+	/* Initialize s/w rfkill */</div><div class='add'>+	if (ath_init_sw_rfkill(sc))</div><div class='add'>+		goto detach;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* initialize tx/rx engine */</div><div class='add'>+</div><div class='add'>+	error = ath_tx_init(sc, ATH_TXBUF);</div><div class='add'>+	if (error != 0)</div><div class='add'>+		goto detach;</div><div class='add'>+</div><div class='add'>+	error = ath_rx_init(sc, ATH_RXBUF);</div><div class='add'>+	if (error != 0)</div><div class='add'>+		goto detach;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+detach:</div><div class='add'>+	ath_detach(sc);</div><div class='add'>+bad:</div><div class='add'>+	return error;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ath9k_start(struct ieee80211_hw *hw)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_softc *sc = hw-&gt;priv;</div><div class='hunk'>@@ -358,6 +1045,33 @@ static int ath9k_start(struct ieee80211_hw *hw)</div><div class='ctx'> 		return error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_RFKILL</div><div class='add'>+	/* Start rfkill polling */</div><div class='add'>+	if (sc-&gt;sc_ah-&gt;ah_caps.hw_caps &amp; ATH9K_HW_CAP_RFSILENT)</div><div class='add'>+		queue_delayed_work(sc-&gt;hw-&gt;workqueue,</div><div class='add'>+				   &amp;sc-&gt;rf_kill.rfkill_poll, 0);</div><div class='add'>+</div><div class='add'>+	if (!(sc-&gt;sc_flags &amp; SC_OP_RFKILL_REGISTERED)) {</div><div class='add'>+		if (rfkill_register(sc-&gt;rf_kill.rfkill)) {</div><div class='add'>+			DPRINTF(sc, ATH_DBG_FATAL,</div><div class='add'>+					"Unable to register rfkill\n");</div><div class='add'>+			rfkill_free(sc-&gt;rf_kill.rfkill);</div><div class='add'>+</div><div class='add'>+			/* Deinitialize the device */</div><div class='add'>+			if (sc-&gt;pdev-&gt;irq)</div><div class='add'>+				free_irq(sc-&gt;pdev-&gt;irq, sc);</div><div class='add'>+			ath_detach(sc);</div><div class='add'>+			pci_iounmap(sc-&gt;pdev, sc-&gt;mem);</div><div class='add'>+			pci_release_region(sc-&gt;pdev, 0);</div><div class='add'>+			pci_disable_device(sc-&gt;pdev);</div><div class='add'>+			ieee80211_free_hw(hw);</div><div class='add'>+			return -EIO;</div><div class='add'>+		} else {</div><div class='add'>+			sc-&gt;sc_flags |= SC_OP_RFKILL_REGISTERED;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	ieee80211_wake_queues(hw);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -419,6 +1133,11 @@ static void ath9k_stop(struct ieee80211_hw *hw)</div><div class='ctx'> 			"%s: Device is no longer present\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	ieee80211_stop_queues(hw);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_RFKILL</div><div class='add'>+	if (sc-&gt;sc_ah-&gt;ah_caps.hw_caps &amp; ATH9K_HW_CAP_RFSILENT)</div><div class='add'>+		cancel_delayed_work_sync(&amp;sc-&gt;rf_kill.rfkill_poll);</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ath9k_add_interface(struct ieee80211_hw *hw,</div><div class='hunk'>@@ -433,16 +1152,19 @@ static int ath9k_add_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 		return -ENOBUFS;</div><div class='ctx'> </div><div class='ctx'> 	switch (conf-&gt;type) {</div><div class='del'>-	case IEEE80211_IF_TYPE_STA:</div><div class='add'>+	case NL80211_IFTYPE_STATION:</div><div class='ctx'> 		ic_opmode = ATH9K_M_STA;</div><div class='ctx'> 		break;</div><div class='del'>-	case IEEE80211_IF_TYPE_IBSS:</div><div class='add'>+	case NL80211_IFTYPE_ADHOC:</div><div class='ctx'> 		ic_opmode = ATH9K_M_IBSS;</div><div class='ctx'> 		break;</div><div class='add'>+	case NL80211_IFTYPE_AP:</div><div class='add'>+		ic_opmode = ATH9K_M_HOSTAP;</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		DPRINTF(sc, ATH_DBG_FATAL,</div><div class='del'>-			"%s: Only STA and IBSS are supported currently\n",</div><div class='del'>-			__func__);</div><div class='add'>+			"%s: Interface type %d not yet supported\n",</div><div class='add'>+			__func__, conf-&gt;type);</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -458,6 +1180,13 @@ static int ath9k_add_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 		return error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (conf-&gt;type == NL80211_IFTYPE_AP) {</div><div class='add'>+		/* TODO: is this a suitable place to start ANI for AP mode? */</div><div class='add'>+		/* Start ANI */</div><div class='add'>+		mod_timer(&amp;sc-&gt;sc_ani.timer,</div><div class='add'>+			  jiffies + msecs_to_jiffies(ATH_ANI_POLLINTERVAL));</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -480,12 +1209,15 @@ static void ath9k_remove_interface(struct ieee80211_hw *hw,</div><div class='ctx'> #ifdef CONFIG_SLOW_ANT_DIV</div><div class='ctx'> 	ath_slow_ant_div_stop(&amp;sc-&gt;sc_antdiv);</div><div class='ctx'> #endif</div><div class='add'>+	/* Stop ANI */</div><div class='add'>+	del_timer_sync(&amp;sc-&gt;sc_ani.timer);</div><div class='ctx'> </div><div class='ctx'> 	/* Update ratectrl */</div><div class='ctx'> 	ath_rate_newstate(sc, avp);</div><div class='ctx'> </div><div class='ctx'> 	/* Reclaim beacon resources */</div><div class='del'>-	if (sc-&gt;sc_opmode == ATH9K_M_HOSTAP || sc-&gt;sc_opmode == ATH9K_M_IBSS) {</div><div class='add'>+	if (sc-&gt;sc_ah-&gt;ah_opmode == ATH9K_M_HOSTAP ||</div><div class='add'>+	    sc-&gt;sc_ah-&gt;ah_opmode == ATH9K_M_IBSS) {</div><div class='ctx'> 		ath9k_hw_stoptxdma(sc-&gt;sc_ah, sc-&gt;sc_bhalq);</div><div class='ctx'> 		ath_beacon_return(sc, avp);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -493,7 +1225,7 @@ static void ath9k_remove_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 	/* Set interrupt mask */</div><div class='ctx'> 	sc-&gt;sc_imask &amp;= ~(ATH9K_INT_SWBA | ATH9K_INT_BMISS);</div><div class='ctx'> 	ath9k_hw_set_interrupts(sc-&gt;sc_ah, sc-&gt;sc_imask &amp; ~ATH9K_INT_GLOBAL);</div><div class='del'>-	sc-&gt;sc_beacons = 0;</div><div class='add'>+	sc-&gt;sc_flags &amp;= ~SC_OP_BEACONS;</div><div class='ctx'> </div><div class='ctx'> 	error = ath_vap_detach(sc, 0);</div><div class='ctx'> 	if (error)</div><div class='hunk'>@@ -542,6 +1274,7 @@ static int ath9k_config_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 				  struct ieee80211_if_conf *conf)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_softc *sc = hw-&gt;priv;</div><div class='add'>+	struct ath_hal *ah = sc-&gt;sc_ah;</div><div class='ctx'> 	struct ath_vap *avp;</div><div class='ctx'> 	u32 rfilt = 0;</div><div class='ctx'> 	int error, i;</div><div class='hunk'>@@ -554,18 +1287,25 @@ static int ath9k_config_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* TODO: Need to decide which hw opmode to use for multi-interface</div><div class='add'>+	 * cases */</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_AP &amp;&amp;</div><div class='add'>+	    ah-&gt;ah_opmode != ATH9K_M_HOSTAP) {</div><div class='add'>+		ah-&gt;ah_opmode = ATH9K_M_HOSTAP;</div><div class='add'>+		ath9k_hw_setopmode(ah);</div><div class='add'>+		ath9k_hw_write_associd(ah, sc-&gt;sc_myaddr, 0);</div><div class='add'>+		/* Request full reset to get hw opmode changed properly */</div><div class='add'>+		sc-&gt;sc_flags |= SC_OP_FULL_RESET;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if ((conf-&gt;changed &amp; IEEE80211_IFCC_BSSID) &amp;&amp;</div><div class='ctx'> 	    !is_zero_ether_addr(conf-&gt;bssid)) {</div><div class='ctx'> 		switch (vif-&gt;type) {</div><div class='del'>-		case IEEE80211_IF_TYPE_STA:</div><div class='del'>-		case IEEE80211_IF_TYPE_IBSS:</div><div class='add'>+		case NL80211_IFTYPE_STATION:</div><div class='add'>+		case NL80211_IFTYPE_ADHOC:</div><div class='ctx'> 			/* Update ratectrl about the new state */</div><div class='ctx'> 			ath_rate_newstate(sc, avp);</div><div class='ctx'> </div><div class='del'>-			/* Set rx filter */</div><div class='del'>-			rfilt = ath_calcrxfilter(sc);</div><div class='del'>-			ath9k_hw_setrxfilter(sc-&gt;sc_ah, rfilt);</div><div class='del'>-</div><div class='ctx'> 			/* Set BSSID */</div><div class='ctx'> 			memcpy(sc-&gt;sc_curbssid, conf-&gt;bssid, ETH_ALEN);</div><div class='ctx'> 			sc-&gt;sc_curaid = 0;</div><div class='hunk'>@@ -598,7 +1338,7 @@ static int ath9k_config_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 				print_mac(mac, sc-&gt;sc_curbssid), sc-&gt;sc_curaid);</div><div class='ctx'> </div><div class='ctx'> 			/* need to reconfigure the beacon */</div><div class='del'>-			sc-&gt;sc_beacons = 0;</div><div class='add'>+			sc-&gt;sc_flags &amp;= ~SC_OP_BEACONS ;</div><div class='ctx'> </div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='hunk'>@@ -607,7 +1347,8 @@ static int ath9k_config_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if ((conf-&gt;changed &amp; IEEE80211_IFCC_BEACON) &amp;&amp;</div><div class='del'>-	    (vif-&gt;type == IEEE80211_IF_TYPE_IBSS)) {</div><div class='add'>+	    ((vif-&gt;type == NL80211_IFTYPE_ADHOC) ||</div><div class='add'>+	     (vif-&gt;type == NL80211_IFTYPE_AP))) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Allocate and setup the beacon frame.</div><div class='ctx'> 		 *</div><div class='hunk'>@@ -626,7 +1367,7 @@ static int ath9k_config_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Check for WLAN_CAPABILITY_PRIVACY ? */</div><div class='del'>-	if ((avp-&gt;av_opmode != IEEE80211_IF_TYPE_STA)) {</div><div class='add'>+	if ((avp-&gt;av_opmode != NL80211_IFTYPE_STATION)) {</div><div class='ctx'> 		for (i = 0; i &lt; IEEE80211_WEP_NKID; i++)</div><div class='ctx'> 			if (ath9k_hw_keyisvalid(sc-&gt;sc_ah, (u16)i))</div><div class='ctx'> 				ath9k_hw_keysetmac(sc-&gt;sc_ah,</div><div class='hunk'>@@ -635,7 +1376,7 @@ static int ath9k_config_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Only legacy IBSS for now */</div><div class='del'>-	if (vif-&gt;type == IEEE80211_IF_TYPE_IBSS)</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_ADHOC)</div><div class='ctx'> 		ath_update_chainmask(sc, 0);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -649,8 +1390,7 @@ static int ath9k_config_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 	FIF_BCN_PRBRESP_PROMISC |		\</div><div class='ctx'> 	FIF_FCSFAIL)</div><div class='ctx'> </div><div class='del'>-/* Accept unicast, bcast and mcast frames */</div><div class='del'>-</div><div class='add'>+/* FIXME: sc-&gt;sc_full_reset ? */</div><div class='ctx'> static void ath9k_configure_filter(struct ieee80211_hw *hw,</div><div class='ctx'> 				   unsigned int changed_flags,</div><div class='ctx'> 				   unsigned int *total_flags,</div><div class='hunk'>@@ -658,22 +1398,28 @@ static void ath9k_configure_filter(struct ieee80211_hw *hw,</div><div class='ctx'> 				   struct dev_mc_list *mclist)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_softc *sc = hw-&gt;priv;</div><div class='add'>+	u32 rfilt;</div><div class='ctx'> </div><div class='ctx'> 	changed_flags &amp;= SUPPORTED_FILTERS;</div><div class='ctx'> 	*total_flags &amp;= SUPPORTED_FILTERS;</div><div class='ctx'> </div><div class='add'>+	sc-&gt;rx_filter = *total_flags;</div><div class='add'>+	rfilt = ath_calcrxfilter(sc);</div><div class='add'>+	ath9k_hw_setrxfilter(sc-&gt;sc_ah, rfilt);</div><div class='add'>+</div><div class='ctx'> 	if (changed_flags &amp; FIF_BCN_PRBRESP_PROMISC) {</div><div class='ctx'> 		if (*total_flags &amp; FIF_BCN_PRBRESP_PROMISC)</div><div class='del'>-			ath_scan_start(sc);</div><div class='del'>-		else</div><div class='del'>-			ath_scan_end(sc);</div><div class='add'>+			ath9k_hw_write_associd(sc-&gt;sc_ah, ath_bcast_mac, 0);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	DPRINTF(sc, ATH_DBG_CONFIG, "%s: Set HW RX filter: 0x%x\n",</div><div class='add'>+		__func__, sc-&gt;rx_filter);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ath9k_sta_notify(struct ieee80211_hw *hw,</div><div class='ctx'> 			     struct ieee80211_vif *vif,</div><div class='ctx'> 			     enum sta_notify_cmd cmd,</div><div class='del'>-			     const u8 *addr)</div><div class='add'>+			     struct ieee80211_sta *sta)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_softc *sc = hw-&gt;priv;</div><div class='ctx'> 	struct ath_node *an;</div><div class='hunk'>@@ -681,19 +1427,18 @@ static void ath9k_sta_notify(struct ieee80211_hw *hw,</div><div class='ctx'> 	DECLARE_MAC_BUF(mac);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;sc-&gt;node_lock, flags);</div><div class='del'>-	an = ath_node_find(sc, (u8 *) addr);</div><div class='add'>+	an = ath_node_find(sc, sta-&gt;addr);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;sc-&gt;node_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case STA_NOTIFY_ADD:</div><div class='ctx'> 		spin_lock_irqsave(&amp;sc-&gt;node_lock, flags);</div><div class='ctx'> 		if (!an) {</div><div class='del'>-			ath_node_attach(sc, (u8 *)addr, 0);</div><div class='add'>+			ath_node_attach(sc, sta-&gt;addr, 0);</div><div class='ctx'> 			DPRINTF(sc, ATH_DBG_CONFIG, "%s: Attach a node: %s\n",</div><div class='del'>-				__func__,</div><div class='del'>-				print_mac(mac, addr));</div><div class='add'>+				__func__, print_mac(mac, sta-&gt;addr));</div><div class='ctx'> 		} else {</div><div class='del'>-			ath_node_get(sc, (u8 *)addr);</div><div class='add'>+			ath_node_get(sc, sta-&gt;addr);</div><div class='ctx'> 		}</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;sc-&gt;node_lock, flags);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -706,7 +1451,7 @@ static void ath9k_sta_notify(struct ieee80211_hw *hw,</div><div class='ctx'> 			ath_node_put(sc, an, ATH9K_BH_STATUS_INTACT);</div><div class='ctx'> 			DPRINTF(sc, ATH_DBG_CONFIG, "%s: Put a node: %s\n",</div><div class='ctx'> 				__func__,</div><div class='del'>-				print_mac(mac, addr));</div><div class='add'>+				print_mac(mac, sta-&gt;addr));</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -784,117 +1529,6 @@ static int ath9k_set_key(struct ieee80211_hw *hw,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ath9k_ht_conf(struct ath_softc *sc,</div><div class='del'>-			  struct ieee80211_bss_conf *bss_conf)</div><div class='del'>-{</div><div class='del'>-#define IEEE80211_HT_CAP_40MHZ_INTOLERANT BIT(14)</div><div class='del'>-	struct ath_ht_info *ht_info = &amp;sc-&gt;sc_ht_info;</div><div class='del'>-</div><div class='del'>-	if (bss_conf-&gt;assoc_ht) {</div><div class='del'>-		ht_info-&gt;ext_chan_offset =</div><div class='del'>-			bss_conf-&gt;ht_bss_conf-&gt;bss_cap &amp;</div><div class='del'>-				IEEE80211_HT_IE_CHA_SEC_OFFSET;</div><div class='del'>-</div><div class='del'>-		if (!(bss_conf-&gt;ht_conf-&gt;cap &amp;</div><div class='del'>-			IEEE80211_HT_CAP_40MHZ_INTOLERANT) &amp;&amp;</div><div class='del'>-			    (bss_conf-&gt;ht_bss_conf-&gt;bss_cap &amp;</div><div class='del'>-				IEEE80211_HT_IE_CHA_WIDTH))</div><div class='del'>-			ht_info-&gt;tx_chan_width = ATH9K_HT_MACMODE_2040;</div><div class='del'>-		else</div><div class='del'>-			ht_info-&gt;tx_chan_width = ATH9K_HT_MACMODE_20;</div><div class='del'>-</div><div class='del'>-		ath9k_hw_set11nmac2040(sc-&gt;sc_ah, ht_info-&gt;tx_chan_width);</div><div class='del'>-		ht_info-&gt;maxampdu = 1 &lt;&lt; (IEEE80211_HTCAP_MAXRXAMPDU_FACTOR +</div><div class='del'>-					bss_conf-&gt;ht_conf-&gt;ampdu_factor);</div><div class='del'>-		ht_info-&gt;mpdudensity =</div><div class='del'>-			parse_mpdudensity(bss_conf-&gt;ht_conf-&gt;ampdu_density);</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#undef IEEE80211_HT_CAP_40MHZ_INTOLERANT</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ath9k_bss_assoc_info(struct ath_softc *sc,</div><div class='del'>-				 struct ieee80211_bss_conf *bss_conf)</div><div class='del'>-{</div><div class='del'>-	struct ieee80211_hw *hw = sc-&gt;hw;</div><div class='del'>-	struct ieee80211_channel *curchan = hw-&gt;conf.channel;</div><div class='del'>-	struct ath_vap *avp;</div><div class='del'>-	int pos;</div><div class='del'>-	DECLARE_MAC_BUF(mac);</div><div class='del'>-</div><div class='del'>-	if (bss_conf-&gt;assoc) {</div><div class='del'>-		DPRINTF(sc, ATH_DBG_CONFIG, "%s: Bss Info ASSOC %d\n",</div><div class='del'>-			__func__,</div><div class='del'>-			bss_conf-&gt;aid);</div><div class='del'>-</div><div class='del'>-		avp = sc-&gt;sc_vaps[0];</div><div class='del'>-		if (avp == NULL) {</div><div class='del'>-			DPRINTF(sc, ATH_DBG_FATAL, "%s: Invalid interface\n",</div><div class='del'>-				__func__);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* New association, store aid */</div><div class='del'>-		if (avp-&gt;av_opmode == ATH9K_M_STA) {</div><div class='del'>-			sc-&gt;sc_curaid = bss_conf-&gt;aid;</div><div class='del'>-			ath9k_hw_write_associd(sc-&gt;sc_ah, sc-&gt;sc_curbssid,</div><div class='del'>-					       sc-&gt;sc_curaid);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Configure the beacon */</div><div class='del'>-		ath_beacon_config(sc, 0);</div><div class='del'>-		sc-&gt;sc_beacons = 1;</div><div class='del'>-</div><div class='del'>-		/* Reset rssi stats */</div><div class='del'>-		sc-&gt;sc_halstats.ns_avgbrssi = ATH_RSSI_DUMMY_MARKER;</div><div class='del'>-		sc-&gt;sc_halstats.ns_avgrssi = ATH_RSSI_DUMMY_MARKER;</div><div class='del'>-		sc-&gt;sc_halstats.ns_avgtxrssi = ATH_RSSI_DUMMY_MARKER;</div><div class='del'>-		sc-&gt;sc_halstats.ns_avgtxrate = ATH_RATE_DUMMY_MARKER;</div><div class='del'>-</div><div class='del'>-		/* Update chainmask */</div><div class='del'>-		ath_update_chainmask(sc, bss_conf-&gt;assoc_ht);</div><div class='del'>-</div><div class='del'>-		DPRINTF(sc, ATH_DBG_CONFIG,</div><div class='del'>-			"%s: bssid %s aid 0x%x\n",</div><div class='del'>-			__func__,</div><div class='del'>-			print_mac(mac, sc-&gt;sc_curbssid), sc-&gt;sc_curaid);</div><div class='del'>-</div><div class='del'>-		DPRINTF(sc, ATH_DBG_CONFIG, "%s: Set channel: %d MHz\n",</div><div class='del'>-			__func__,</div><div class='del'>-			curchan-&gt;center_freq);</div><div class='del'>-</div><div class='del'>-		pos = ath_get_channel(sc, curchan);</div><div class='del'>-		if (pos == -1) {</div><div class='del'>-			DPRINTF(sc, ATH_DBG_FATAL,</div><div class='del'>-				"%s: Invalid channel\n", __func__);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (hw-&gt;conf.ht_conf.ht_supported)</div><div class='del'>-			sc-&gt;sc_ah-&gt;ah_channels[pos].chanmode =</div><div class='del'>-				ath_get_extchanmode(sc, curchan);</div><div class='del'>-		else</div><div class='del'>-			sc-&gt;sc_ah-&gt;ah_channels[pos].chanmode =</div><div class='del'>-				(curchan-&gt;band == IEEE80211_BAND_2GHZ) ?</div><div class='del'>-				CHANNEL_G : CHANNEL_A;</div><div class='del'>-</div><div class='del'>-		/* set h/w channel */</div><div class='del'>-		if (ath_set_channel(sc, &amp;sc-&gt;sc_ah-&gt;ah_channels[pos]) &lt; 0)</div><div class='del'>-			DPRINTF(sc, ATH_DBG_FATAL,</div><div class='del'>-				"%s: Unable to set channel\n",</div><div class='del'>-				__func__);</div><div class='del'>-</div><div class='del'>-		ath_rate_newstate(sc, avp);</div><div class='del'>-		/* Update ratectrl about the new state */</div><div class='del'>-		ath_rc_node_update(hw, avp-&gt;rc_node);</div><div class='del'>-	} else {</div><div class='del'>-		DPRINTF(sc, ATH_DBG_CONFIG,</div><div class='del'>-		"%s: Bss Info DISSOC\n", __func__);</div><div class='del'>-		sc-&gt;sc_curaid = 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void ath9k_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 				   struct ieee80211_vif *vif,</div><div class='ctx'> 				   struct ieee80211_bss_conf *bss_conf,</div><div class='hunk'>@@ -907,9 +1541,9 @@ static void ath9k_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 			__func__,</div><div class='ctx'> 			bss_conf-&gt;use_short_preamble);</div><div class='ctx'> 		if (bss_conf-&gt;use_short_preamble)</div><div class='del'>-			sc-&gt;sc_flags |= ATH_PREAMBLE_SHORT;</div><div class='add'>+			sc-&gt;sc_flags |= SC_OP_PREAMBLE_SHORT;</div><div class='ctx'> 		else</div><div class='del'>-			sc-&gt;sc_flags &amp;= ~ATH_PREAMBLE_SHORT;</div><div class='add'>+			sc-&gt;sc_flags &amp;= ~SC_OP_PREAMBLE_SHORT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; BSS_CHANGED_ERP_CTS_PROT) {</div><div class='hunk'>@@ -918,9 +1552,9 @@ static void ath9k_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 			bss_conf-&gt;use_cts_prot);</div><div class='ctx'> 		if (bss_conf-&gt;use_cts_prot &amp;&amp;</div><div class='ctx'> 		    hw-&gt;conf.channel-&gt;band != IEEE80211_BAND_5GHZ)</div><div class='del'>-			sc-&gt;sc_flags |= ATH_PROTECT_ENABLE;</div><div class='add'>+			sc-&gt;sc_flags |= SC_OP_PROTECT_ENABLE;</div><div class='ctx'> 		else</div><div class='del'>-			sc-&gt;sc_flags &amp;= ~ATH_PROTECT_ENABLE;</div><div class='add'>+			sc-&gt;sc_flags &amp;= ~SC_OP_PROTECT_ENABLE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; BSS_CHANGED_HT) {</div><div class='hunk'>@@ -959,45 +1593,44 @@ static void ath9k_reset_tsf(struct ieee80211_hw *hw)</div><div class='ctx'> </div><div class='ctx'> static int ath9k_ampdu_action(struct ieee80211_hw *hw,</div><div class='ctx'> 		       enum ieee80211_ampdu_mlme_action action,</div><div class='del'>-		       const u8 *addr,</div><div class='del'>-		       u16 tid,</div><div class='del'>-		       u16 *ssn)</div><div class='add'>+		       struct ieee80211_sta *sta,</div><div class='add'>+		       u16 tid, u16 *ssn)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_softc *sc = hw-&gt;priv;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	switch (action) {</div><div class='ctx'> 	case IEEE80211_AMPDU_RX_START:</div><div class='del'>-		ret = ath_rx_aggr_start(sc, addr, tid, ssn);</div><div class='add'>+		ret = ath_rx_aggr_start(sc, sta-&gt;addr, tid, ssn);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			DPRINTF(sc, ATH_DBG_FATAL,</div><div class='ctx'> 				"%s: Unable to start RX aggregation\n",</div><div class='ctx'> 				__func__);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case IEEE80211_AMPDU_RX_STOP:</div><div class='del'>-		ret = ath_rx_aggr_stop(sc, addr, tid);</div><div class='add'>+		ret = ath_rx_aggr_stop(sc, sta-&gt;addr, tid);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			DPRINTF(sc, ATH_DBG_FATAL,</div><div class='ctx'> 				"%s: Unable to stop RX aggregation\n",</div><div class='ctx'> 				__func__);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case IEEE80211_AMPDU_TX_START:</div><div class='del'>-		ret = ath_tx_aggr_start(sc, addr, tid, ssn);</div><div class='add'>+		ret = ath_tx_aggr_start(sc, sta-&gt;addr, tid, ssn);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			DPRINTF(sc, ATH_DBG_FATAL,</div><div class='ctx'> 				"%s: Unable to start TX aggregation\n",</div><div class='ctx'> 				__func__);</div><div class='ctx'> 		else</div><div class='del'>-			ieee80211_start_tx_ba_cb_irqsafe(hw, (u8 *)addr, tid);</div><div class='add'>+			ieee80211_start_tx_ba_cb_irqsafe(hw, sta-&gt;addr, tid);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case IEEE80211_AMPDU_TX_STOP:</div><div class='del'>-		ret = ath_tx_aggr_stop(sc, addr, tid);</div><div class='add'>+		ret = ath_tx_aggr_stop(sc, sta-&gt;addr, tid);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			DPRINTF(sc, ATH_DBG_FATAL,</div><div class='ctx'> 				"%s: Unable to stop TX aggregation\n",</div><div class='ctx'> 				__func__);</div><div class='ctx'> </div><div class='del'>-		ieee80211_stop_tx_ba_cb_irqsafe(hw, (u8 *)addr, tid);</div><div class='add'>+		ieee80211_stop_tx_ba_cb_irqsafe(hw, sta-&gt;addr, tid);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		DPRINTF(sc, ATH_DBG_FATAL,</div><div class='hunk'>@@ -1007,6 +1640,11 @@ static int ath9k_ampdu_action(struct ieee80211_hw *hw,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int ath9k_no_fragmentation(struct ieee80211_hw *hw, u32 value)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct ieee80211_ops ath9k_ops = {</div><div class='ctx'> 	.tx 		    = ath9k_tx,</div><div class='ctx'> 	.start 		    = ath9k_start,</div><div class='hunk'>@@ -1031,263 +1669,10 @@ static struct ieee80211_ops ath9k_ops = {</div><div class='ctx'> 	.get_tsf 	    = ath9k_get_tsf,</div><div class='ctx'> 	.reset_tsf 	    = ath9k_reset_tsf,</div><div class='ctx'> 	.tx_last_beacon     = NULL,</div><div class='del'>-	.ampdu_action       = ath9k_ampdu_action</div><div class='add'>+	.ampdu_action       = ath9k_ampdu_action,</div><div class='add'>+	.set_frag_threshold = ath9k_no_fragmentation,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-void ath_get_beaconconfig(struct ath_softc *sc,</div><div class='del'>-			  int if_id,</div><div class='del'>-			  struct ath_beacon_config *conf)</div><div class='del'>-{</div><div class='del'>-	struct ieee80211_hw *hw = sc-&gt;hw;</div><div class='del'>-</div><div class='del'>-	/* fill in beacon config data */</div><div class='del'>-</div><div class='del'>-	conf-&gt;beacon_interval = hw-&gt;conf.beacon_int;</div><div class='del'>-	conf-&gt;listen_interval = 100;</div><div class='del'>-	conf-&gt;dtim_count = 1;</div><div class='del'>-	conf-&gt;bmiss_timeout = ATH_DEFAULT_BMISS_LIMIT * conf-&gt;listen_interval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int ath_update_beacon(struct ath_softc *sc,</div><div class='del'>-		      int if_id,</div><div class='del'>-		      struct ath_beacon_offset *bo,</div><div class='del'>-		      struct sk_buff *skb,</div><div class='del'>-		      int mcast)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void ath_tx_complete(struct ath_softc *sc, struct sk_buff *skb,</div><div class='del'>-		     struct ath_xmit_status *tx_status, struct ath_node *an)</div><div class='del'>-{</div><div class='del'>-	struct ieee80211_hw *hw = sc-&gt;hw;</div><div class='del'>-	struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);</div><div class='del'>-</div><div class='del'>-	DPRINTF(sc, ATH_DBG_XMIT,</div><div class='del'>-		"%s: TX complete: skb: %p\n", __func__, skb);</div><div class='del'>-</div><div class='del'>-	if (tx_info-&gt;flags &amp; IEEE80211_TX_CTL_NO_ACK ||</div><div class='del'>-		tx_info-&gt;flags &amp; IEEE80211_TX_STAT_TX_FILTERED) {</div><div class='del'>-		/* free driver's private data area of tx_info */</div><div class='del'>-		if (tx_info-&gt;driver_data[0] != NULL)</div><div class='del'>-			kfree(tx_info-&gt;driver_data[0]);</div><div class='del'>-			tx_info-&gt;driver_data[0] = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (tx_status-&gt;flags &amp; ATH_TX_BAR) {</div><div class='del'>-		tx_info-&gt;flags |= IEEE80211_TX_STAT_AMPDU_NO_BACK;</div><div class='del'>-		tx_status-&gt;flags &amp;= ~ATH_TX_BAR;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (tx_status-&gt;flags &amp; (ATH_TX_ERROR | ATH_TX_XRETRY)) {</div><div class='del'>-		if (!(tx_info-&gt;flags &amp; IEEE80211_TX_CTL_NO_ACK)) {</div><div class='del'>-			/* Frame was not ACKed, but an ACK was expected */</div><div class='del'>-			tx_info-&gt;status.excessive_retries = 1;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		/* Frame was ACKed */</div><div class='del'>-		tx_info-&gt;flags |= IEEE80211_TX_STAT_ACK;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	tx_info-&gt;status.retry_count = tx_status-&gt;retries;</div><div class='del'>-</div><div class='del'>-	ieee80211_tx_status(hw, skb);</div><div class='del'>-	if (an)</div><div class='del'>-		ath_node_put(sc, an, ATH9K_BH_STATUS_CHANGE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int ath__rx_indicate(struct ath_softc *sc,</div><div class='del'>-		     struct sk_buff *skb,</div><div class='del'>-		     struct ath_recv_status *status,</div><div class='del'>-		     u16 keyix)</div><div class='del'>-{</div><div class='del'>-	struct ieee80211_hw *hw = sc-&gt;hw;</div><div class='del'>-	struct ath_node *an = NULL;</div><div class='del'>-	struct ieee80211_rx_status rx_status;</div><div class='del'>-	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb-&gt;data;</div><div class='del'>-	int hdrlen = ieee80211_get_hdrlen_from_skb(skb);</div><div class='del'>-	int padsize;</div><div class='del'>-	enum ATH_RX_TYPE st;</div><div class='del'>-</div><div class='del'>-	/* see if any padding is done by the hw and remove it */</div><div class='del'>-	if (hdrlen &amp; 3) {</div><div class='del'>-		padsize = hdrlen % 4;</div><div class='del'>-		memmove(skb-&gt;data + padsize, skb-&gt;data, hdrlen);</div><div class='del'>-		skb_pull(skb, padsize);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* remove FCS before passing up to protocol stack */</div><div class='del'>-	skb_trim(skb, (skb-&gt;len - FCS_LEN));</div><div class='del'>-</div><div class='del'>-	/* Prepare rx status */</div><div class='del'>-	ath9k_rx_prepare(sc, skb, status, &amp;rx_status);</div><div class='del'>-</div><div class='del'>-	if (!(keyix == ATH9K_RXKEYIX_INVALID) &amp;&amp;</div><div class='del'>-	    !(status-&gt;flags &amp; ATH_RX_DECRYPT_ERROR)) {</div><div class='del'>-		rx_status.flag |= RX_FLAG_DECRYPTED;</div><div class='del'>-	} else if ((le16_to_cpu(hdr-&gt;frame_control) &amp; IEEE80211_FCTL_PROTECTED)</div><div class='del'>-		   &amp;&amp; !(status-&gt;flags &amp; ATH_RX_DECRYPT_ERROR)</div><div class='del'>-		   &amp;&amp; skb-&gt;len &gt;= hdrlen + 4) {</div><div class='del'>-		keyix = skb-&gt;data[hdrlen + 3] &gt;&gt; 6;</div><div class='del'>-</div><div class='del'>-		if (test_bit(keyix, sc-&gt;sc_keymap))</div><div class='del'>-			rx_status.flag |= RX_FLAG_DECRYPTED;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_lock_bh(&amp;sc-&gt;node_lock);</div><div class='del'>-	an = ath_node_find(sc, hdr-&gt;addr2);</div><div class='del'>-	spin_unlock_bh(&amp;sc-&gt;node_lock);</div><div class='del'>-</div><div class='del'>-	if (an) {</div><div class='del'>-		ath_rx_input(sc, an,</div><div class='del'>-			     hw-&gt;conf.ht_conf.ht_supported,</div><div class='del'>-			     skb, status, &amp;st);</div><div class='del'>-	}</div><div class='del'>-	if (!an || (st != ATH_RX_CONSUMED))</div><div class='del'>-		__ieee80211_rx(hw, skb, &amp;rx_status);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int ath_rx_subframe(struct ath_node *an,</div><div class='del'>-		    struct sk_buff *skb,</div><div class='del'>-		    struct ath_recv_status *status)</div><div class='del'>-{</div><div class='del'>-	struct ath_softc *sc = an-&gt;an_sc;</div><div class='del'>-	struct ieee80211_hw *hw = sc-&gt;hw;</div><div class='del'>-	struct ieee80211_rx_status rx_status;</div><div class='del'>-</div><div class='del'>-	/* Prepare rx status */</div><div class='del'>-	ath9k_rx_prepare(sc, skb, status, &amp;rx_status);</div><div class='del'>-	if (!(status-&gt;flags &amp; ATH_RX_DECRYPT_ERROR))</div><div class='del'>-		rx_status.flag |= RX_FLAG_DECRYPTED;</div><div class='del'>-</div><div class='del'>-	__ieee80211_rx(hw, skb, &amp;rx_status);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum ath9k_ht_macmode ath_cwm_macmode(struct ath_softc *sc)</div><div class='del'>-{</div><div class='del'>-	return sc-&gt;sc_ht_info.tx_chan_width;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ath_detach(struct ath_softc *sc)</div><div class='del'>-{</div><div class='del'>-	struct ieee80211_hw *hw = sc-&gt;hw;</div><div class='del'>-</div><div class='del'>-	DPRINTF(sc, ATH_DBG_CONFIG, "%s: Detach ATH hw\n", __func__);</div><div class='del'>-</div><div class='del'>-	/* Unregister hw */</div><div class='del'>-</div><div class='del'>-	ieee80211_unregister_hw(hw);</div><div class='del'>-</div><div class='del'>-	/* unregister Rate control */</div><div class='del'>-	ath_rate_control_unregister();</div><div class='del'>-</div><div class='del'>-	/* tx/rx cleanup */</div><div class='del'>-</div><div class='del'>-	ath_rx_cleanup(sc);</div><div class='del'>-	ath_tx_cleanup(sc);</div><div class='del'>-</div><div class='del'>-	/* Deinit */</div><div class='del'>-</div><div class='del'>-	ath_deinit(sc);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ath_attach(u16 devid,</div><div class='del'>-		      struct ath_softc *sc)</div><div class='del'>-{</div><div class='del'>-	struct ieee80211_hw *hw = sc-&gt;hw;</div><div class='del'>-	int error = 0;</div><div class='del'>-</div><div class='del'>-	DPRINTF(sc, ATH_DBG_CONFIG, "%s: Attach ATH hw\n", __func__);</div><div class='del'>-</div><div class='del'>-	error = ath_init(devid, sc);</div><div class='del'>-	if (error != 0)</div><div class='del'>-		return error;</div><div class='del'>-</div><div class='del'>-	/* Init nodes */</div><div class='del'>-</div><div class='del'>-	INIT_LIST_HEAD(&amp;sc-&gt;node_list);</div><div class='del'>-	spin_lock_init(&amp;sc-&gt;node_lock);</div><div class='del'>-</div><div class='del'>-	/* get mac address from hardware and set in mac80211 */</div><div class='del'>-</div><div class='del'>-	SET_IEEE80211_PERM_ADDR(hw, sc-&gt;sc_myaddr);</div><div class='del'>-</div><div class='del'>-	/* setup channels and rates */</div><div class='del'>-</div><div class='del'>-	sc-&gt;sbands[IEEE80211_BAND_2GHZ].channels =</div><div class='del'>-		sc-&gt;channels[IEEE80211_BAND_2GHZ];</div><div class='del'>-	sc-&gt;sbands[IEEE80211_BAND_2GHZ].bitrates =</div><div class='del'>-		sc-&gt;rates[IEEE80211_BAND_2GHZ];</div><div class='del'>-	sc-&gt;sbands[IEEE80211_BAND_2GHZ].band = IEEE80211_BAND_2GHZ;</div><div class='del'>-</div><div class='del'>-	if (sc-&gt;sc_ah-&gt;ah_caps.hw_caps &amp; ATH9K_HW_CAP_HT)</div><div class='del'>-		/* Setup HT capabilities for 2.4Ghz*/</div><div class='del'>-		setup_ht_cap(&amp;sc-&gt;sbands[IEEE80211_BAND_2GHZ].ht_info);</div><div class='del'>-</div><div class='del'>-	hw-&gt;wiphy-&gt;bands[IEEE80211_BAND_2GHZ] =</div><div class='del'>-		&amp;sc-&gt;sbands[IEEE80211_BAND_2GHZ];</div><div class='del'>-</div><div class='del'>-	if (test_bit(ATH9K_MODE_11A, sc-&gt;sc_ah-&gt;ah_caps.wireless_modes)) {</div><div class='del'>-		sc-&gt;sbands[IEEE80211_BAND_5GHZ].channels =</div><div class='del'>-			sc-&gt;channels[IEEE80211_BAND_5GHZ];</div><div class='del'>-		sc-&gt;sbands[IEEE80211_BAND_5GHZ].bitrates =</div><div class='del'>-			sc-&gt;rates[IEEE80211_BAND_5GHZ];</div><div class='del'>-		sc-&gt;sbands[IEEE80211_BAND_5GHZ].band =</div><div class='del'>-			IEEE80211_BAND_5GHZ;</div><div class='del'>-</div><div class='del'>-		if (sc-&gt;sc_ah-&gt;ah_caps.hw_caps &amp; ATH9K_HW_CAP_HT)</div><div class='del'>-			/* Setup HT capabilities for 5Ghz*/</div><div class='del'>-			setup_ht_cap(&amp;sc-&gt;sbands[IEEE80211_BAND_5GHZ].ht_info);</div><div class='del'>-</div><div class='del'>-		hw-&gt;wiphy-&gt;bands[IEEE80211_BAND_5GHZ] =</div><div class='del'>-			&amp;sc-&gt;sbands[IEEE80211_BAND_5GHZ];</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* FIXME: Have to figure out proper hw init values later */</div><div class='del'>-</div><div class='del'>-	hw-&gt;queues = 4;</div><div class='del'>-	hw-&gt;ampdu_queues = 1;</div><div class='del'>-</div><div class='del'>-	/* Register rate control */</div><div class='del'>-	hw-&gt;rate_control_algorithm = "ath9k_rate_control";</div><div class='del'>-	error = ath_rate_control_register();</div><div class='del'>-	if (error != 0) {</div><div class='del'>-		DPRINTF(sc, ATH_DBG_FATAL,</div><div class='del'>-			"%s: Unable to register rate control "</div><div class='del'>-			"algorithm:%d\n", __func__, error);</div><div class='del'>-		ath_rate_control_unregister();</div><div class='del'>-		goto bad;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	error = ieee80211_register_hw(hw);</div><div class='del'>-	if (error != 0) {</div><div class='del'>-		ath_rate_control_unregister();</div><div class='del'>-		goto bad;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* initialize tx/rx engine */</div><div class='del'>-</div><div class='del'>-	error = ath_tx_init(sc, ATH_TXBUF);</div><div class='del'>-	if (error != 0)</div><div class='del'>-		goto bad1;</div><div class='del'>-</div><div class='del'>-	error = ath_rx_init(sc, ATH_RXBUF);</div><div class='del'>-	if (error != 0)</div><div class='del'>-		goto bad1;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-bad1:</div><div class='del'>-	ath_detach(sc);</div><div class='del'>-bad:</div><div class='del'>-	return error;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int ath_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='ctx'> {</div><div class='ctx'> 	void __iomem *mem;</div><div class='hunk'>@@ -1361,9 +1746,16 @@ static int ath_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='ctx'> 		goto bad2;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	hw-&gt;flags = IEEE80211_HW_SIGNAL_DBM |</div><div class='add'>+	hw-&gt;flags = IEEE80211_HW_RX_INCLUDES_FCS |</div><div class='add'>+		IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING |</div><div class='add'>+		IEEE80211_HW_SIGNAL_DBM |</div><div class='ctx'> 		IEEE80211_HW_NOISE_DBM;</div><div class='ctx'> </div><div class='add'>+	hw-&gt;wiphy-&gt;interface_modes =</div><div class='add'>+		BIT(NL80211_IFTYPE_AP) |</div><div class='add'>+		BIT(NL80211_IFTYPE_STATION) |</div><div class='add'>+		BIT(NL80211_IFTYPE_ADHOC);</div><div class='add'>+</div><div class='ctx'> 	SET_IEEE80211_DEV(hw, &amp;pdev-&gt;dev);</div><div class='ctx'> 	pci_set_drvdata(pdev, hw);</div><div class='ctx'> </div><div class='hunk'>@@ -1417,7 +1809,7 @@ static void ath_pci_remove(struct pci_dev *pdev)</div><div class='ctx'> 		ath9k_hw_set_interrupts(sc-&gt;sc_ah, 0);</div><div class='ctx'> 		/* clear the ISR */</div><div class='ctx'> 		ath9k_hw_getisr(sc-&gt;sc_ah, &amp;status);</div><div class='del'>-		sc-&gt;sc_invalid = 1;</div><div class='add'>+		sc-&gt;sc_flags |= SC_OP_INVALID;</div><div class='ctx'> 		free_irq(pdev-&gt;irq, sc);</div><div class='ctx'> 	}</div><div class='ctx'> 	ath_detach(sc);</div><div class='hunk'>@@ -1432,6 +1824,16 @@ static void ath_pci_remove(struct pci_dev *pdev)</div><div class='ctx'> </div><div class='ctx'> static int ath_pci_suspend(struct pci_dev *pdev, pm_message_t state)</div><div class='ctx'> {</div><div class='add'>+	struct ieee80211_hw *hw = pci_get_drvdata(pdev);</div><div class='add'>+	struct ath_softc *sc = hw-&gt;priv;</div><div class='add'>+</div><div class='add'>+	ath9k_hw_set_gpio(sc-&gt;sc_ah, ATH_LED_PIN, 1);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_RFKILL</div><div class='add'>+	if (sc-&gt;sc_ah-&gt;ah_caps.hw_caps &amp; ATH9K_HW_CAP_RFSILENT)</div><div class='add'>+		cancel_delayed_work_sync(&amp;sc-&gt;rf_kill.rfkill_poll);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	pci_save_state(pdev);</div><div class='ctx'> 	pci_disable_device(pdev);</div><div class='ctx'> 	pci_set_power_state(pdev, 3);</div><div class='hunk'>@@ -1441,6 +1843,8 @@ static int ath_pci_suspend(struct pci_dev *pdev, pm_message_t state)</div><div class='ctx'> </div><div class='ctx'> static int ath_pci_resume(struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='add'>+	struct ieee80211_hw *hw = pci_get_drvdata(pdev);</div><div class='add'>+	struct ath_softc *sc = hw-&gt;priv;</div><div class='ctx'> 	u32 val;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -1457,6 +1861,21 @@ static int ath_pci_resume(struct pci_dev *pdev)</div><div class='ctx'> 	if ((val &amp; 0x0000ff00) != 0)</div><div class='ctx'> 		pci_write_config_dword(pdev, 0x40, val &amp; 0xffff00ff);</div><div class='ctx'> </div><div class='add'>+	/* Enable LED */</div><div class='add'>+	ath9k_hw_cfg_output(sc-&gt;sc_ah, ATH_LED_PIN,</div><div class='add'>+			    AR_GPIO_OUTPUT_MUX_AS_OUTPUT);</div><div class='add'>+	ath9k_hw_set_gpio(sc-&gt;sc_ah, ATH_LED_PIN, 1);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_RFKILL</div><div class='add'>+	/*</div><div class='add'>+	 * check the h/w rfkill state on resume</div><div class='add'>+	 * and start the rfkill poll timer</div><div class='add'>+	 */</div><div class='add'>+	if (sc-&gt;sc_ah-&gt;ah_caps.hw_caps &amp; ATH9K_HW_CAP_RFSILENT)</div><div class='add'>+		queue_delayed_work(sc-&gt;hw-&gt;workqueue,</div><div class='add'>+				   &amp;sc-&gt;rf_kill.rfkill_poll, 0);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/ath9k/phy.h b/drivers/net/wireless/ath9k/phy.h<br/>index 0cd399a5344a..14702344448b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/ath9k/phy.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/ath9k/phy.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/ath9k/phy.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/ath9k/phy.h</a></div><div class='hunk'>@@ -18,19 +18,19 @@</div><div class='ctx'> #define PHY_H</div><div class='ctx'> </div><div class='ctx'> bool ath9k_hw_ar9280_set_channel(struct ath_hal *ah,</div><div class='del'>-					  struct ath9k_channel</div><div class='del'>-					  *chan);</div><div class='add'>+				 struct ath9k_channel</div><div class='add'>+				 *chan);</div><div class='ctx'> bool ath9k_hw_set_channel(struct ath_hal *ah,</div><div class='del'>-				   struct ath9k_channel *chan);</div><div class='add'>+			  struct ath9k_channel *chan);</div><div class='ctx'> void ath9k_hw_write_regs(struct ath_hal *ah, u32 modesIndex,</div><div class='ctx'> 			 u32 freqIndex, int regWrites);</div><div class='ctx'> bool ath9k_hw_set_rf_regs(struct ath_hal *ah,</div><div class='del'>-				   struct ath9k_channel *chan,</div><div class='del'>-				   u16 modesIndex);</div><div class='add'>+			  struct ath9k_channel *chan,</div><div class='add'>+			  u16 modesIndex);</div><div class='ctx'> void ath9k_hw_decrease_chain_power(struct ath_hal *ah,</div><div class='ctx'> 				   struct ath9k_channel *chan);</div><div class='ctx'> bool ath9k_hw_init_rf(struct ath_hal *ah,</div><div class='del'>-			       int *status);</div><div class='add'>+		      int *status);</div><div class='ctx'> </div><div class='ctx'> #define AR_PHY_BASE     0x9800</div><div class='ctx'> #define AR_PHY(_n)      (AR_PHY_BASE + ((_n)&lt;&lt;2))</div><div class='head'>diff --git a/drivers/net/wireless/ath9k/rc.c b/drivers/net/wireless/ath9k/rc.c<br/>index 73c460ad355f..cca2fc5b0765 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/ath9k/rc.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/ath9k/rc.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/ath9k/rc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/ath9k/rc.c</a></div><div class='hunk'>@@ -20,6 +20,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "core.h"</div><div class='add'>+/* FIXME: remove this include! */</div><div class='ctx'> #include "../net/mac80211/rate.h"</div><div class='ctx'> </div><div class='ctx'> static u32 tx_triglevel_max;</div><div class='hunk'>@@ -653,8 +654,8 @@ ath_rc_sib_init_validrates(struct ath_rate_node *ath_rc_priv,</div><div class='ctx'> 	rate_ctrl = (struct ath_tx_ratectrl *)(ath_rc_priv);</div><div class='ctx'> 	for (i = 0; i &lt; rate_table-&gt;rate_cnt; i++) {</div><div class='ctx'> 		valid = (ath_rc_priv-&gt;single_stream ?</div><div class='del'>-				rate_table-&gt;info[i].valid_single_stream :</div><div class='del'>-				rate_table-&gt;info[i].valid);</div><div class='add'>+			 rate_table-&gt;info[i].valid_single_stream :</div><div class='add'>+			 rate_table-&gt;info[i].valid);</div><div class='ctx'> 		if (valid == TRUE) {</div><div class='ctx'> 			u32 phy = rate_table-&gt;info[i].phy;</div><div class='ctx'> 			u8 valid_rate_count = 0;</div><div class='hunk'>@@ -740,14 +741,14 @@ ath_rc_sib_setvalid_htrates(struct ath_rate_node *ath_rc_priv,</div><div class='ctx'> 		for (j = 0; j &lt; rate_table-&gt;rate_cnt; j++) {</div><div class='ctx'> 			u32 phy = rate_table-&gt;info[j].phy;</div><div class='ctx'> 			u32 valid = (ath_rc_priv-&gt;single_stream ?</div><div class='del'>-				rate_table-&gt;info[j].valid_single_stream :</div><div class='del'>-				rate_table-&gt;info[j].valid);</div><div class='add'>+				     rate_table-&gt;info[j].valid_single_stream :</div><div class='add'>+				     rate_table-&gt;info[j].valid);</div><div class='ctx'> </div><div class='ctx'> 			if (((((struct ath_rateset *)</div><div class='del'>-				mcs_set)-&gt;rs_rates[i] &amp; 0x7F) !=</div><div class='del'>-				(rate_table-&gt;info[j].dot11rate &amp; 0x7F)) ||</div><div class='del'>-					!WLAN_RC_PHY_HT(phy) ||</div><div class='del'>-					!WLAN_RC_PHY_HT_VALID(valid, capflag))</div><div class='add'>+			       mcs_set)-&gt;rs_rates[i] &amp; 0x7F) !=</div><div class='add'>+			     (rate_table-&gt;info[j].dot11rate &amp; 0x7F)) ||</div><div class='add'>+			    !WLAN_RC_PHY_HT(phy) ||</div><div class='add'>+			    !WLAN_RC_PHY_HT_VALID(valid, capflag))</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='ctx'> 			if (!ath_rc_valid_phyrate(phy, capflag, FALSE))</div><div class='hunk'>@@ -847,9 +848,9 @@ void ath_rate_newstate(struct ath_softc *sc, struct ath_vap *avp)</div><div class='ctx'> 	/* For half and quarter rate channles use different</div><div class='ctx'> 	 * rate tables</div><div class='ctx'> 	 */</div><div class='del'>-	if (sc-&gt;sc_curchan.channelFlags &amp; CHANNEL_HALF)</div><div class='add'>+	if (sc-&gt;sc_ah-&gt;ah_curchan-&gt;channelFlags &amp; CHANNEL_HALF)</div><div class='ctx'> 		ar5416_sethalf_ratetable(asc);</div><div class='del'>-	else if (sc-&gt;sc_curchan.channelFlags &amp; CHANNEL_QUARTER)</div><div class='add'>+	else if (sc-&gt;sc_ah-&gt;ah_curchan-&gt;channelFlags &amp; CHANNEL_QUARTER)</div><div class='ctx'> 		ar5416_setquarter_ratetable(asc);</div><div class='ctx'> 	else /* full rate */</div><div class='ctx'> 		ar5416_setfull_ratetable(asc);</div><div class='hunk'>@@ -866,10 +867,10 @@ void ath_rate_newstate(struct ath_softc *sc, struct ath_vap *avp)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u8 ath_rc_ratefind_ht(struct ath_softc *sc,</div><div class='del'>-				   struct ath_rate_node *ath_rc_priv,</div><div class='del'>-				   const struct ath_rate_table *rate_table,</div><div class='del'>-				   int probe_allowed, int *is_probing,</div><div class='del'>-				   int is_retry)</div><div class='add'>+			     struct ath_rate_node *ath_rc_priv,</div><div class='add'>+			     const struct ath_rate_table *rate_table,</div><div class='add'>+			     int probe_allowed, int *is_probing,</div><div class='add'>+			     int is_retry)</div><div class='ctx'> {</div><div class='ctx'> 	u32 dt, best_thruput, this_thruput, now_msec;</div><div class='ctx'> 	u8 rate, next_rate, best_rate, maxindex, minindex;</div><div class='hunk'>@@ -997,8 +998,8 @@ static u8 ath_rc_ratefind_ht(struct ath_softc *sc,</div><div class='ctx'> 		rate = rate_ctrl-&gt;rate_table_size - 1;</div><div class='ctx'> </div><div class='ctx'> 	ASSERT((rate_table-&gt;info[rate].valid &amp;&amp; !ath_rc_priv-&gt;single_stream) ||</div><div class='del'>-		(rate_table-&gt;info[rate].valid_single_stream &amp;&amp;</div><div class='del'>-			ath_rc_priv-&gt;single_stream));</div><div class='add'>+	       (rate_table-&gt;info[rate].valid_single_stream &amp;&amp;</div><div class='add'>+		ath_rc_priv-&gt;single_stream));</div><div class='ctx'> </div><div class='ctx'> 	return rate;</div><div class='ctx'> }</div><div class='hunk'>@@ -1023,10 +1024,10 @@ static void ath_rc_rate_set_series(const struct ath_rate_table *rate_table ,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u8 ath_rc_rate_getidx(struct ath_softc *sc,</div><div class='del'>-				   struct ath_rate_node *ath_rc_priv,</div><div class='del'>-				   const struct ath_rate_table *rate_table,</div><div class='del'>-				   u8 rix, u16 stepdown,</div><div class='del'>-				   u16 min_rate)</div><div class='add'>+			     struct ath_rate_node *ath_rc_priv,</div><div class='add'>+			     const struct ath_rate_table *rate_table,</div><div class='add'>+			     u8 rix, u16 stepdown,</div><div class='add'>+			     u16 min_rate)</div><div class='ctx'> {</div><div class='ctx'> 	u32 j;</div><div class='ctx'> 	u8 nextindex;</div><div class='hunk'>@@ -1066,8 +1067,8 @@ static void ath_rc_ratefind(struct ath_softc *sc,</div><div class='ctx'> 	rate_table =</div><div class='ctx'> 		(struct ath_rate_table *)asc-&gt;hw_rate_table[sc-&gt;sc_curmode];</div><div class='ctx'> 	rix = ath_rc_ratefind_ht(sc, ath_rc_priv, rate_table,</div><div class='del'>-				(rcflag &amp; ATH_RC_PROBE_ALLOWED) ? 1 : 0,</div><div class='del'>-				is_probe, is_retry);</div><div class='add'>+				 (rcflag &amp; ATH_RC_PROBE_ALLOWED) ? 1 : 0,</div><div class='add'>+				 is_probe, is_retry);</div><div class='ctx'> 	nrix = rix;</div><div class='ctx'> </div><div class='ctx'> 	if ((rcflag &amp; ATH_RC_PROBE_ALLOWED) &amp;&amp; (*is_probe)) {</div><div class='hunk'>@@ -1099,13 +1100,13 @@ static void ath_rc_ratefind(struct ath_softc *sc,</div><div class='ctx'> 		try_num = ((i + 1) == num_rates) ?</div><div class='ctx'> 			num_tries - (try_per_rate * i) : try_per_rate ;</div><div class='ctx'> 		min_rate = (((i + 1) == num_rates) &amp;&amp;</div><div class='del'>-			(rcflag &amp; ATH_RC_MINRATE_LASTRATE)) ? 1 : 0;</div><div class='add'>+			    (rcflag &amp; ATH_RC_MINRATE_LASTRATE)) ? 1 : 0;</div><div class='ctx'> </div><div class='ctx'> 		nrix = ath_rc_rate_getidx(sc, ath_rc_priv,</div><div class='del'>-			rate_table, nrix, 1, min_rate);</div><div class='add'>+					  rate_table, nrix, 1, min_rate);</div><div class='ctx'> 		/* All other rates in the series have RTS enabled */</div><div class='ctx'> 		ath_rc_rate_set_series(rate_table,</div><div class='del'>-			&amp;series[i], try_num, nrix, TRUE);</div><div class='add'>+				       &amp;series[i], try_num, nrix, TRUE);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1124,13 +1125,13 @@ static void ath_rc_ratefind(struct ath_softc *sc,</div><div class='ctx'> 	 * above conditions.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if ((sc-&gt;sc_curmode == ATH9K_MODE_11NG_HT20) ||</div><div class='del'>-			(sc-&gt;sc_curmode == ATH9K_MODE_11NG_HT40PLUS) ||</div><div class='del'>-			(sc-&gt;sc_curmode == ATH9K_MODE_11NG_HT40MINUS)) {</div><div class='add'>+	    (sc-&gt;sc_curmode == ATH9K_MODE_11NG_HT40PLUS) ||</div><div class='add'>+	    (sc-&gt;sc_curmode == ATH9K_MODE_11NG_HT40MINUS)) {</div><div class='ctx'> 		u8  dot11rate = rate_table-&gt;info[rix].dot11rate;</div><div class='ctx'> 		u8 phy = rate_table-&gt;info[rix].phy;</div><div class='ctx'> 		if (i == 4 &amp;&amp;</div><div class='ctx'> 		    ((dot11rate == 2 &amp;&amp; phy == WLAN_RC_PHY_HT_40_SS) ||</div><div class='del'>-		    (dot11rate == 3 &amp;&amp; phy == WLAN_RC_PHY_HT_20_SS))) {</div><div class='add'>+		     (dot11rate == 3 &amp;&amp; phy == WLAN_RC_PHY_HT_20_SS))) {</div><div class='ctx'> 			series[3].rix = series[2].rix;</div><div class='ctx'> 			series[3].flags = series[2].flags;</div><div class='ctx'> 			series[3].max_4ms_framelen = series[2].max_4ms_framelen;</div><div class='hunk'>@@ -1141,18 +1142,19 @@ static void ath_rc_ratefind(struct ath_softc *sc,</div><div class='ctx'> /*</div><div class='ctx'>  * Return the Tx rate series.</div><div class='ctx'>  */</div><div class='del'>-void ath_rate_findrate(struct ath_softc *sc,</div><div class='del'>-		       struct ath_rate_node *ath_rc_priv,</div><div class='del'>-		       int num_tries,</div><div class='del'>-		       int num_rates,</div><div class='del'>-		       unsigned int rcflag,</div><div class='del'>-		       struct ath_rc_series series[],</div><div class='del'>-		       int *is_probe,</div><div class='del'>-		       int is_retry)</div><div class='add'>+static void ath_rate_findrate(struct ath_softc *sc,</div><div class='add'>+			      struct ath_rate_node *ath_rc_priv,</div><div class='add'>+			      int num_tries,</div><div class='add'>+			      int num_rates,</div><div class='add'>+			      unsigned int rcflag,</div><div class='add'>+			      struct ath_rc_series series[],</div><div class='add'>+			      int *is_probe,</div><div class='add'>+			      int is_retry)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_vap *avp = ath_rc_priv-&gt;avp;</div><div class='ctx'> </div><div class='del'>-	DPRINTF(sc, ATH_DBG_RATE, "%s", __func__);</div><div class='add'>+	DPRINTF(sc, ATH_DBG_RATE, "%s\n", __func__);</div><div class='add'>+</div><div class='ctx'> 	if (!num_rates || !num_tries)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -1174,9 +1176,8 @@ void ath_rate_findrate(struct ath_softc *sc,</div><div class='ctx'> 			unsigned int    mcs;</div><div class='ctx'> 			u8 series_rix = 0;</div><div class='ctx'> </div><div class='del'>-			series[idx].tries =</div><div class='del'>-				IEEE80211_RATE_IDX_ENTRY(</div><div class='del'>-					avp-&gt;av_config.av_fixed_retryset, idx);</div><div class='add'>+			series[idx].tries = IEEE80211_RATE_IDX_ENTRY(</div><div class='add'>+				avp-&gt;av_config.av_fixed_retryset, idx);</div><div class='ctx'> </div><div class='ctx'> 			mcs = IEEE80211_RATE_IDX_ENTRY(</div><div class='ctx'> 				avp-&gt;av_config.av_fixed_rateset, idx);</div><div class='hunk'>@@ -1228,7 +1229,7 @@ static void ath_rc_update_ht(struct ath_softc *sc,</div><div class='ctx'> 	u32 now_msec = jiffies_to_msecs(jiffies);</div><div class='ctx'> 	int state_change = FALSE, rate, count;</div><div class='ctx'> 	u8 last_per;</div><div class='del'>-	struct ath_rate_softc  *asc = (struct ath_rate_softc *)sc-&gt;sc_rc;</div><div class='add'>+	struct ath_rate_softc *asc = (struct ath_rate_softc *)sc-&gt;sc_rc;</div><div class='ctx'> 	struct ath_rate_table *rate_table =</div><div class='ctx'> 		(struct ath_rate_table *)asc-&gt;hw_rate_table[sc-&gt;sc_curmode];</div><div class='ctx'> </div><div class='hunk'>@@ -1272,14 +1273,14 @@ static void ath_rc_update_ht(struct ath_softc *sc,</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* xretries == 2 */</div><div class='ctx'> 			count = sizeof(nretry_to_per_lookup) /</div><div class='del'>-					sizeof(nretry_to_per_lookup[0]);</div><div class='add'>+				sizeof(nretry_to_per_lookup[0]);</div><div class='ctx'> 			if (retries &gt;= count)</div><div class='ctx'> 				retries = count - 1;</div><div class='ctx'> 			/* new_PER = 7/8*old_PER + 1/8*(currentPER) */</div><div class='ctx'> 			rate_ctrl-&gt;state[tx_rate].per =</div><div class='ctx'> 				(u8)(rate_ctrl-&gt;state[tx_rate].per -</div><div class='del'>-				(rate_ctrl-&gt;state[tx_rate].per &gt;&gt; 3) +</div><div class='del'>-				((100) &gt;&gt; 3));</div><div class='add'>+				     (rate_ctrl-&gt;state[tx_rate].per &gt;&gt; 3) +</div><div class='add'>+				     ((100) &gt;&gt; 3));</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* xretries == 1 or 2 */</div><div class='hunk'>@@ -1295,8 +1296,7 @@ static void ath_rc_update_ht(struct ath_softc *sc,</div><div class='ctx'> 		if (retries &gt;= count)</div><div class='ctx'> 			retries = count - 1;</div><div class='ctx'> 		if (info_priv-&gt;n_bad_frames) {</div><div class='del'>-			/* new_PER = 7/8*old_PER + 1/8*(currentPER)  */</div><div class='del'>-			/*</div><div class='add'>+			/* new_PER = 7/8*old_PER + 1/8*(currentPER)</div><div class='ctx'> 			 * Assuming that n_frames is not 0.  The current PER</div><div class='ctx'> 			 * from the retries is 100 * retries / (retries+1),</div><div class='ctx'> 			 * since the first retries attempts failed, and the</div><div class='hunk'>@@ -1386,7 +1386,7 @@ static void ath_rc_update_ht(struct ath_softc *sc,</div><div class='ctx'> 			 * rssi_ack values.</div><div class='ctx'> 			 */</div><div class='ctx'> 			if (tx_rate == rate_ctrl-&gt;rate_max_phy &amp;&amp;</div><div class='del'>-					rate_ctrl-&gt;hw_maxretry_pktcnt &lt; 255) {</div><div class='add'>+			    rate_ctrl-&gt;hw_maxretry_pktcnt &lt; 255) {</div><div class='ctx'> 				rate_ctrl-&gt;hw_maxretry_pktcnt++;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='hunk'>@@ -1418,7 +1418,7 @@ static void ath_rc_update_ht(struct ath_softc *sc,</div><div class='ctx'> 					/* Now reduce the current</div><div class='ctx'> 					 * rssi threshold. */</div><div class='ctx'> 					if ((rssi_ackAvg &lt; rssi_thres + 2) &amp;&amp;</div><div class='del'>-						(rssi_thres &gt; rssi_ack_vmin)) {</div><div class='add'>+					    (rssi_thres &gt; rssi_ack_vmin)) {</div><div class='ctx'> 						rate_ctrl-&gt;state[tx_rate].</div><div class='ctx'> 							rssi_thres--;</div><div class='ctx'> 					}</div><div class='hunk'>@@ -1436,10 +1436,10 @@ static void ath_rc_update_ht(struct ath_softc *sc,</div><div class='ctx'> 	 * a while (except if we are probing).</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (rate_ctrl-&gt;state[tx_rate].per &gt;= 55 &amp;&amp; tx_rate &gt; 0 &amp;&amp;</div><div class='del'>-			rate_table-&gt;info[tx_rate].ratekbps &lt;=</div><div class='del'>-			rate_table-&gt;info[rate_ctrl-&gt;rate_max_phy].ratekbps) {</div><div class='add'>+	    rate_table-&gt;info[tx_rate].ratekbps &lt;=</div><div class='add'>+	    rate_table-&gt;info[rate_ctrl-&gt;rate_max_phy].ratekbps) {</div><div class='ctx'> 		ath_rc_get_nextlowervalid_txrate(rate_table, rate_ctrl,</div><div class='del'>-				(u8) tx_rate, &amp;rate_ctrl-&gt;rate_max_phy);</div><div class='add'>+				 (u8) tx_rate, &amp;rate_ctrl-&gt;rate_max_phy);</div><div class='ctx'> </div><div class='ctx'> 		/* Don't probe for a little while. */</div><div class='ctx'> 		rate_ctrl-&gt;probe_time = now_msec;</div><div class='hunk'>@@ -1460,43 +1460,43 @@ static void ath_rc_update_ht(struct ath_softc *sc,</div><div class='ctx'> 				break;</div><div class='ctx'> </div><div class='ctx'> 			if (rate_ctrl-&gt;state[rate].rssi_thres +</div><div class='del'>-				rate_table-&gt;info[rate].rssi_ack_deltamin &gt;</div><div class='del'>-					rate_ctrl-&gt;state[rate+1].rssi_thres) {</div><div class='add'>+			    rate_table-&gt;info[rate].rssi_ack_deltamin &gt;</div><div class='add'>+			    rate_ctrl-&gt;state[rate+1].rssi_thres) {</div><div class='ctx'> 				rate_ctrl-&gt;state[rate+1].rssi_thres =</div><div class='ctx'> 					rate_ctrl-&gt;state[rate].</div><div class='del'>-						rssi_thres +</div><div class='add'>+					rssi_thres +</div><div class='ctx'> 					rate_table-&gt;info[rate].</div><div class='del'>-						rssi_ack_deltamin;</div><div class='add'>+					rssi_ack_deltamin;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Make sure the rates below this have lower rssi thresholds. */</div><div class='ctx'> 		for (rate = tx_rate - 1; rate &gt;= 0; rate--) {</div><div class='ctx'> 			if (rate_table-&gt;info[rate].phy !=</div><div class='del'>-				rate_table-&gt;info[tx_rate].phy)</div><div class='add'>+			    rate_table-&gt;info[tx_rate].phy)</div><div class='ctx'> 				break;</div><div class='ctx'> </div><div class='ctx'> 			if (rate_ctrl-&gt;state[rate].rssi_thres +</div><div class='del'>-				rate_table-&gt;info[rate].rssi_ack_deltamin &gt;</div><div class='del'>-					rate_ctrl-&gt;state[rate+1].rssi_thres) {</div><div class='add'>+			    rate_table-&gt;info[rate].rssi_ack_deltamin &gt;</div><div class='add'>+			    rate_ctrl-&gt;state[rate+1].rssi_thres) {</div><div class='ctx'> 				if (rate_ctrl-&gt;state[rate+1].rssi_thres &lt;</div><div class='del'>-					rate_table-&gt;info[rate].</div><div class='del'>-					rssi_ack_deltamin)</div><div class='add'>+				    rate_table-&gt;info[rate].</div><div class='add'>+				    rssi_ack_deltamin)</div><div class='ctx'> 					rate_ctrl-&gt;state[rate].rssi_thres = 0;</div><div class='ctx'> 				else {</div><div class='ctx'> 					rate_ctrl-&gt;state[rate].rssi_thres =</div><div class='ctx'> 						rate_ctrl-&gt;state[rate+1].</div><div class='del'>-							rssi_thres -</div><div class='del'>-							rate_table-&gt;info[rate].</div><div class='del'>-							rssi_ack_deltamin;</div><div class='add'>+						rssi_thres -</div><div class='add'>+						rate_table-&gt;info[rate].</div><div class='add'>+						rssi_ack_deltamin;</div><div class='ctx'> 				}</div><div class='ctx'> </div><div class='ctx'> 				if (rate_ctrl-&gt;state[rate].rssi_thres &lt;</div><div class='del'>-					rate_table-&gt;info[rate].</div><div class='del'>-						rssi_ack_validmin) {</div><div class='add'>+				    rate_table-&gt;info[rate].</div><div class='add'>+				    rssi_ack_validmin) {</div><div class='ctx'> 					rate_ctrl-&gt;state[rate].rssi_thres =</div><div class='ctx'> 						rate_table-&gt;info[rate].</div><div class='del'>-							rssi_ack_validmin;</div><div class='add'>+						rssi_ack_validmin;</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1507,11 +1507,11 @@ static void ath_rc_update_ht(struct ath_softc *sc,</div><div class='ctx'> 	if (rate_ctrl-&gt;state[tx_rate].per &lt; last_per) {</div><div class='ctx'> 		for (rate = tx_rate - 1; rate &gt;= 0; rate--) {</div><div class='ctx'> 			if (rate_table-&gt;info[rate].phy !=</div><div class='del'>-				rate_table-&gt;info[tx_rate].phy)</div><div class='add'>+			    rate_table-&gt;info[tx_rate].phy)</div><div class='ctx'> 				break;</div><div class='ctx'> </div><div class='ctx'> 			if (rate_ctrl-&gt;state[rate].per &gt;</div><div class='del'>-					rate_ctrl-&gt;state[rate+1].per) {</div><div class='add'>+			    rate_ctrl-&gt;state[rate+1].per) {</div><div class='ctx'> 				rate_ctrl-&gt;state[rate].per =</div><div class='ctx'> 					rate_ctrl-&gt;state[rate+1].per;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -1528,11 +1528,11 @@ static void ath_rc_update_ht(struct ath_softc *sc,</div><div class='ctx'> 	/* Every so often, we reduce the thresholds and</div><div class='ctx'> 	 * PER (different for CCK and OFDM). */</div><div class='ctx'> 	if (now_msec - rate_ctrl-&gt;rssi_down_time &gt;=</div><div class='del'>-		rate_table-&gt;rssi_reduce_interval) {</div><div class='add'>+	    rate_table-&gt;rssi_reduce_interval) {</div><div class='ctx'> </div><div class='ctx'> 		for (rate = 0; rate &lt; rate_ctrl-&gt;rate_table_size; rate++) {</div><div class='ctx'> 			if (rate_ctrl-&gt;state[rate].rssi_thres &gt;</div><div class='del'>-				rate_table-&gt;info[rate].rssi_ack_validmin)</div><div class='add'>+			    rate_table-&gt;info[rate].rssi_ack_validmin)</div><div class='ctx'> 				rate_ctrl-&gt;state[rate].rssi_thres -= 1;</div><div class='ctx'> 		}</div><div class='ctx'> 		rate_ctrl-&gt;rssi_down_time = now_msec;</div><div class='hunk'>@@ -1541,7 +1541,7 @@ static void ath_rc_update_ht(struct ath_softc *sc,</div><div class='ctx'> 	/* Every so often, we reduce the thresholds</div><div class='ctx'> 	 * and PER (different for CCK and OFDM). */</div><div class='ctx'> 	if (now_msec - rate_ctrl-&gt;per_down_time &gt;=</div><div class='del'>-		rate_table-&gt;rssi_reduce_interval) {</div><div class='add'>+	    rate_table-&gt;rssi_reduce_interval) {</div><div class='ctx'> 		for (rate = 0; rate &lt; rate_ctrl-&gt;rate_table_size; rate++) {</div><div class='ctx'> 			rate_ctrl-&gt;state[rate].per =</div><div class='ctx'> 				7 * rate_ctrl-&gt;state[rate].per / 8;</div><div class='hunk'>@@ -1560,7 +1560,7 @@ static void ath_rc_update(struct ath_softc *sc,</div><div class='ctx'> 			  struct ath_tx_info_priv *info_priv, int final_ts_idx,</div><div class='ctx'> 			  int xretries, int long_retry)</div><div class='ctx'> {</div><div class='del'>-	struct ath_rate_softc  *asc = (struct ath_rate_softc *)sc-&gt;sc_rc;</div><div class='add'>+	struct ath_rate_softc *asc = (struct ath_rate_softc *)sc-&gt;sc_rc;</div><div class='ctx'> 	struct ath_rate_table *rate_table;</div><div class='ctx'> 	struct ath_tx_ratectrl *rate_ctrl;</div><div class='ctx'> 	struct ath_rc_series rcs[4];</div><div class='hunk'>@@ -1637,7 +1637,6 @@ static void ath_rc_update(struct ath_softc *sc,</div><div class='ctx'> 		xretries, long_retry);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Process a tx descriptor for a completed transmit (success or failure).</div><div class='ctx'>  */</div><div class='hunk'>@@ -1651,13 +1650,13 @@ static void ath_rate_tx_complete(struct ath_softc *sc,</div><div class='ctx'> 	struct ath_vap *avp;</div><div class='ctx'> </div><div class='ctx'> 	avp = rc_priv-&gt;avp;</div><div class='del'>-	if ((avp-&gt;av_config.av_fixed_rateset != IEEE80211_FIXED_RATE_NONE)</div><div class='del'>-			|| info_priv-&gt;tx.ts_status &amp; ATH9K_TXERR_FILT)</div><div class='add'>+	if ((avp-&gt;av_config.av_fixed_rateset != IEEE80211_FIXED_RATE_NONE) ||</div><div class='add'>+	    (info_priv-&gt;tx.ts_status &amp; ATH9K_TXERR_FILT))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (info_priv-&gt;tx.ts_rssi &gt; 0) {</div><div class='ctx'> 		ATH_RSSI_LPF(an-&gt;an_chainmask_sel.tx_avgrssi,</div><div class='del'>-				info_priv-&gt;tx.ts_rssi);</div><div class='add'>+			     info_priv-&gt;tx.ts_rssi);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1682,7 +1681,6 @@ static void ath_rate_tx_complete(struct ath_softc *sc,</div><div class='ctx'> 		      info_priv-&gt;tx.ts_longretry);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  *  Update the SIB's rate control information</div><div class='ctx'>  *</div><div class='hunk'>@@ -1701,8 +1699,8 @@ static void ath_rc_sib_update(struct ath_softc *sc,</div><div class='ctx'> 	struct ath_rate_softc *asc = (struct ath_rate_softc *)sc-&gt;sc_rc;</div><div class='ctx'> 	struct ath_rateset *rateset = negotiated_rates;</div><div class='ctx'> 	u8 *ht_mcs = (u8 *)negotiated_htrates;</div><div class='del'>-	struct ath_tx_ratectrl *rate_ctrl  = (struct ath_tx_ratectrl *)</div><div class='del'>-		(ath_rc_priv);</div><div class='add'>+	struct ath_tx_ratectrl *rate_ctrl =</div><div class='add'>+		(struct ath_tx_ratectrl *)ath_rc_priv;</div><div class='ctx'> 	u8 i, j, k, hi = 0, hthi = 0;</div><div class='ctx'> </div><div class='ctx'> 	rate_table = (struct ath_rate_table *)</div><div class='hunk'>@@ -1815,19 +1813,18 @@ static void ath_rc_sib_init(struct ath_rate_node *ath_rc_priv)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static void ath_setup_rates(struct ieee80211_local *local, struct sta_info *sta)</div><div class='add'>+static void ath_setup_rates(struct ath_softc *sc,</div><div class='add'>+			    struct ieee80211_supported_band *sband,</div><div class='add'>+			    struct ieee80211_sta *sta,</div><div class='add'>+			    struct ath_rate_node *rc_priv)</div><div class='ctx'> </div><div class='ctx'> {</div><div class='del'>-	struct ieee80211_supported_band *sband;</div><div class='del'>-	struct ieee80211_hw *hw = local_to_hw(local);</div><div class='del'>-	struct ath_softc *sc = hw-&gt;priv;</div><div class='del'>-	struct ath_rate_node *rc_priv = sta-&gt;rate_ctrl_priv;</div><div class='ctx'> 	int i, j = 0;</div><div class='ctx'> </div><div class='del'>-	DPRINTF(sc, ATH_DBG_RATE, "%s", __func__);</div><div class='del'>-	sband =  local-&gt;hw.wiphy-&gt;bands[local-&gt;hw.conf.channel-&gt;band];</div><div class='add'>+	DPRINTF(sc, ATH_DBG_RATE, "%s\n", __func__);</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; sband-&gt;n_bitrates; i++) {</div><div class='del'>-		if (sta-&gt;supp_rates[local-&gt;hw.conf.channel-&gt;band] &amp; BIT(i)) {</div><div class='add'>+		if (sta-&gt;supp_rates[sband-&gt;band] &amp; BIT(i)) {</div><div class='ctx'> 			rc_priv-&gt;neg_rates.rs_rates[j]</div><div class='ctx'> 				= (sband-&gt;bitrates[i].bitrate * 2) / 10;</div><div class='ctx'> 			j++;</div><div class='hunk'>@@ -1854,19 +1851,17 @@ void ath_rc_node_update(struct ieee80211_hw *hw, struct ath_rate_node *rc_priv)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Rate Control callbacks */</div><div class='del'>-static void ath_tx_status(void *priv, struct net_device *dev,</div><div class='add'>+static void ath_tx_status(void *priv, struct ieee80211_supported_band *sband,</div><div class='add'>+			  struct ieee80211_sta *sta, void *priv_sta,</div><div class='ctx'> 			  struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_softc *sc = priv;</div><div class='ctx'> 	struct ath_tx_info_priv *tx_info_priv;</div><div class='ctx'> 	struct ath_node *an;</div><div class='del'>-	struct sta_info *sta;</div><div class='del'>-	struct ieee80211_local *local;</div><div class='ctx'> 	struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);</div><div class='ctx'> 	struct ieee80211_hdr *hdr;</div><div class='ctx'> 	__le16 fc;</div><div class='ctx'> </div><div class='del'>-	local = hw_to_local(sc-&gt;hw);</div><div class='ctx'> 	hdr = (struct ieee80211_hdr *)skb-&gt;data;</div><div class='ctx'> 	fc = hdr-&gt;frame_control;</div><div class='ctx'> 	tx_info_priv = (struct ath_tx_info_priv *)tx_info-&gt;driver_data[0];</div><div class='hunk'>@@ -1875,8 +1870,7 @@ static void ath_tx_status(void *priv, struct net_device *dev,</div><div class='ctx'> 	an = ath_node_find(sc, hdr-&gt;addr1);</div><div class='ctx'> 	spin_unlock_bh(&amp;sc-&gt;node_lock);</div><div class='ctx'> </div><div class='del'>-	sta = sta_info_get(local, hdr-&gt;addr1);</div><div class='del'>-	if (!an || !sta || !ieee80211_is_data(fc)) {</div><div class='add'>+	if (!an || !priv_sta || !ieee80211_is_data(fc)) {</div><div class='ctx'> 		if (tx_info-&gt;driver_data[0] != NULL) {</div><div class='ctx'> 			kfree(tx_info-&gt;driver_data[0]);</div><div class='ctx'> 			tx_info-&gt;driver_data[0] = NULL;</div><div class='hunk'>@@ -1884,37 +1878,40 @@ static void ath_tx_status(void *priv, struct net_device *dev,</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (tx_info-&gt;driver_data[0] != NULL) {</div><div class='del'>-		ath_rate_tx_complete(sc, an, sta-&gt;rate_ctrl_priv, tx_info_priv);</div><div class='add'>+		ath_rate_tx_complete(sc, an, priv_sta, tx_info_priv);</div><div class='ctx'> 		kfree(tx_info-&gt;driver_data[0]);</div><div class='ctx'> 		tx_info-&gt;driver_data[0] = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ath_tx_aggr_resp(struct ath_softc *sc,</div><div class='del'>-			     struct sta_info *sta,</div><div class='add'>+			     struct ieee80211_supported_band *sband,</div><div class='add'>+			     struct ieee80211_sta *sta,</div><div class='ctx'> 			     struct ath_node *an,</div><div class='ctx'> 			     u8 tidno)</div><div class='ctx'> {</div><div class='del'>-	struct ieee80211_hw *hw = sc-&gt;hw;</div><div class='del'>-	struct ieee80211_local *local;</div><div class='ctx'> 	struct ath_atx_tid *txtid;</div><div class='del'>-	struct ieee80211_supported_band *sband;</div><div class='ctx'> 	u16 buffersize = 0;</div><div class='ctx'> 	int state;</div><div class='del'>-	DECLARE_MAC_BUF(mac);</div><div class='add'>+	struct sta_info *si;</div><div class='ctx'> </div><div class='del'>-	if (!sc-&gt;sc_txaggr)</div><div class='add'>+	if (!(sc-&gt;sc_flags &amp; SC_OP_TXAGGR))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	txtid = ATH_AN_2_TID(an, tidno);</div><div class='ctx'> 	if (!txtid-&gt;paused)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	local = hw_to_local(sc-&gt;hw);</div><div class='del'>-	sband = hw-&gt;wiphy-&gt;bands[hw-&gt;conf.channel-&gt;band];</div><div class='add'>+	/*</div><div class='add'>+	 * XXX: This is entirely busted, we aren't supposed to</div><div class='add'>+	 *	access the sta from here because it's internal</div><div class='add'>+	 *	to mac80211, and looking at the state without</div><div class='add'>+	 *	locking is wrong too.</div><div class='add'>+	 */</div><div class='add'>+	si = container_of(sta, struct sta_info, sta);</div><div class='ctx'> 	buffersize = IEEE80211_MIN_AMPDU_BUF &lt;&lt;</div><div class='ctx'> 		sband-&gt;ht_info.ampdu_factor; /* FIXME */</div><div class='del'>-	state = sta-&gt;ampdu_mlme.tid_state_tx[tidno];</div><div class='add'>+	state = si-&gt;ampdu_mlme.tid_state_tx[tidno];</div><div class='ctx'> </div><div class='ctx'> 	if (state &amp; HT_ADDBA_RECEIVED_MSK) {</div><div class='ctx'> 		txtid-&gt;addba_exchangecomplete = 1;</div><div class='hunk'>@@ -1930,21 +1927,18 @@ static void ath_tx_aggr_resp(struct ath_softc *sc,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ath_get_rate(void *priv, struct net_device *dev,</div><div class='del'>-			 struct ieee80211_supported_band *sband,</div><div class='del'>-			 struct sk_buff *skb,</div><div class='del'>-			 struct rate_selection *sel)</div><div class='add'>+static void ath_get_rate(void *priv, struct ieee80211_supported_band *sband,</div><div class='add'>+			 struct ieee80211_sta *sta, void *priv_sta,</div><div class='add'>+			 struct sk_buff *skb, struct rate_selection *sel)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb-&gt;data;</div><div class='del'>-	struct ieee80211_local *local = wdev_priv(dev-&gt;ieee80211_ptr);</div><div class='del'>-	struct sta_info *sta;</div><div class='del'>-	struct ath_softc *sc = (struct ath_softc *)priv;</div><div class='add'>+	struct ath_softc *sc = priv;</div><div class='ctx'> 	struct ieee80211_hw *hw = sc-&gt;hw;</div><div class='ctx'> 	struct ath_tx_info_priv *tx_info_priv;</div><div class='del'>-	struct ath_rate_node *ath_rc_priv;</div><div class='add'>+	struct ath_rate_node *ath_rc_priv = priv_sta;</div><div class='ctx'> 	struct ath_node *an;</div><div class='ctx'> 	struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);</div><div class='del'>-	int is_probe, chk, ret;</div><div class='add'>+	int is_probe = FALSE, chk, ret;</div><div class='ctx'> 	s8 lowest_idx;</div><div class='ctx'> 	__le16 fc = hdr-&gt;frame_control;</div><div class='ctx'> 	u8 *qc, tid;</div><div class='hunk'>@@ -1957,18 +1951,15 @@ static void ath_get_rate(void *priv, struct net_device *dev,</div><div class='ctx'> 	ASSERT(tx_info-&gt;driver_data[0] != NULL);</div><div class='ctx'> 	tx_info_priv = (struct ath_tx_info_priv *)tx_info-&gt;driver_data[0];</div><div class='ctx'> </div><div class='del'>-	sta = sta_info_get(local, hdr-&gt;addr1);</div><div class='del'>-	lowest_idx = rate_lowest_index(local, sband, sta);</div><div class='add'>+	lowest_idx = rate_lowest_index(sband, sta);</div><div class='ctx'> 	tx_info_priv-&gt;min_rate = (sband-&gt;bitrates[lowest_idx].bitrate * 2) / 10;</div><div class='ctx'> 	/* lowest rate for management and multicast/broadcast frames */</div><div class='ctx'> 	if (!ieee80211_is_data(fc) ||</div><div class='del'>-			is_multicast_ether_addr(hdr-&gt;addr1) || !sta) {</div><div class='add'>+	    is_multicast_ether_addr(hdr-&gt;addr1) || !sta) {</div><div class='ctx'> 		sel-&gt;rate_idx = lowest_idx;</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ath_rc_priv = sta-&gt;rate_ctrl_priv;</div><div class='del'>-</div><div class='ctx'> 	/* Find tx rate for unicast frames */</div><div class='ctx'> 	ath_rate_findrate(sc, ath_rc_priv,</div><div class='ctx'> 			  ATH_11N_TXMAXTRY, 4,</div><div class='hunk'>@@ -1977,8 +1968,7 @@ static void ath_get_rate(void *priv, struct net_device *dev,</div><div class='ctx'> 			  &amp;is_probe,</div><div class='ctx'> 			  false);</div><div class='ctx'> 	if (is_probe)</div><div class='del'>-		sel-&gt;probe_idx = ((struct ath_tx_ratectrl *)</div><div class='del'>-			sta-&gt;rate_ctrl_priv)-&gt;probe_rate;</div><div class='add'>+		sel-&gt;probe_idx = ath_rc_priv-&gt;tx_ratectrl.probe_rate;</div><div class='ctx'> </div><div class='ctx'> 	/* Ratecontrol sometimes returns invalid rate index */</div><div class='ctx'> 	if (tx_info_priv-&gt;rcs[0].rix != 0xff)</div><div class='hunk'>@@ -2022,38 +2012,31 @@ static void ath_get_rate(void *priv, struct net_device *dev,</div><div class='ctx'> 						__func__,</div><div class='ctx'> 						print_mac(mac, hdr-&gt;addr1));</div><div class='ctx'> 			} else if (chk == AGGR_EXCHANGE_PROGRESS)</div><div class='del'>-				ath_tx_aggr_resp(sc, sta, an, tid);</div><div class='add'>+				ath_tx_aggr_resp(sc, sband, sta, an, tid);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ath_rate_init(void *priv, void *priv_sta,</div><div class='del'>-			  struct ieee80211_local *local,</div><div class='del'>-			  struct sta_info *sta)</div><div class='add'>+static void ath_rate_init(void *priv, struct ieee80211_supported_band *sband,</div><div class='add'>+                          struct ieee80211_sta *sta, void *priv_sta)</div><div class='ctx'> {</div><div class='del'>-	struct ieee80211_supported_band *sband;</div><div class='del'>-	struct ieee80211_hw *hw = local_to_hw(local);</div><div class='del'>-	struct ieee80211_conf *conf = &amp;local-&gt;hw.conf;</div><div class='del'>-	struct ath_softc *sc = hw-&gt;priv;</div><div class='add'>+	struct ath_softc *sc = priv;</div><div class='add'>+	struct ath_rate_node *ath_rc_priv = priv_sta;</div><div class='ctx'> 	int i, j = 0;</div><div class='ctx'> </div><div class='ctx'> 	DPRINTF(sc, ATH_DBG_RATE, "%s\n", __func__);</div><div class='ctx'> </div><div class='del'>-	sband = local-&gt;hw.wiphy-&gt;bands[local-&gt;hw.conf.channel-&gt;band];</div><div class='del'>-	sta-&gt;txrate_idx = rate_lowest_index(local, sband, sta);</div><div class='del'>-</div><div class='del'>-	ath_setup_rates(local, sta);</div><div class='del'>-	if (conf-&gt;flags &amp; IEEE80211_CONF_SUPPORT_HT_MODE) {</div><div class='add'>+	ath_setup_rates(sc, sband, sta, ath_rc_priv);</div><div class='add'>+	if (sc-&gt;hw-&gt;conf.flags &amp; IEEE80211_CONF_SUPPORT_HT_MODE) {</div><div class='ctx'> 		for (i = 0; i &lt; MCS_SET_SIZE; i++) {</div><div class='del'>-			if (conf-&gt;ht_conf.supp_mcs_set[i/8] &amp; (1&lt;&lt;(i%8)))</div><div class='del'>-				((struct ath_rate_node *)</div><div class='del'>-				priv_sta)-&gt;neg_ht_rates.rs_rates[j++] = i;</div><div class='add'>+			if (sc-&gt;hw-&gt;conf.ht_conf.supp_mcs_set[i/8] &amp; (1&lt;&lt;(i%8)))</div><div class='add'>+				ath_rc_priv-&gt;neg_ht_rates.rs_rates[j++] = i;</div><div class='ctx'> 			if (j == ATH_RATE_MAX)</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='del'>-		((struct ath_rate_node *)priv_sta)-&gt;neg_ht_rates.rs_nrates = j;</div><div class='add'>+		ath_rc_priv-&gt;neg_ht_rates.rs_nrates = j;</div><div class='ctx'> 	}</div><div class='del'>-	ath_rc_node_update(hw, priv_sta);</div><div class='add'>+	ath_rc_node_update(sc-&gt;hw, priv_sta);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ath_rate_clear(void *priv)</div><div class='hunk'>@@ -2061,13 +2044,12 @@ static void ath_rate_clear(void *priv)</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void *ath_rate_alloc(struct ieee80211_local *local)</div><div class='add'>+static void *ath_rate_alloc(struct ieee80211_hw *hw, struct dentry *debugfsdir)</div><div class='ctx'> {</div><div class='del'>-	struct ieee80211_hw *hw = local_to_hw(local);</div><div class='ctx'> 	struct ath_softc *sc = hw-&gt;priv;</div><div class='ctx'> </div><div class='del'>-	DPRINTF(sc, ATH_DBG_RATE, "%s", __func__);</div><div class='del'>-	return local-&gt;hw.priv;</div><div class='add'>+	DPRINTF(sc, ATH_DBG_RATE, "%s\n", __func__);</div><div class='add'>+	return hw-&gt;priv;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ath_rate_free(void *priv)</div><div class='hunk'>@@ -2075,24 +2057,28 @@ static void ath_rate_free(void *priv)</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void *ath_rate_alloc_sta(void *priv, gfp_t gfp)</div><div class='add'>+static void *ath_rate_alloc_sta(void *priv, struct ieee80211_sta *sta, gfp_t gfp)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_softc *sc = priv;</div><div class='ctx'> 	struct ath_vap *avp = sc-&gt;sc_vaps[0];</div><div class='ctx'> 	struct ath_rate_node *rate_priv;</div><div class='ctx'> </div><div class='del'>-	DPRINTF(sc, ATH_DBG_RATE, "%s", __func__);</div><div class='add'>+	DPRINTF(sc, ATH_DBG_RATE, "%s\n", __func__);</div><div class='add'>+</div><div class='ctx'> 	rate_priv = ath_rate_node_alloc(avp, sc-&gt;sc_rc, gfp);</div><div class='ctx'> 	if (!rate_priv) {</div><div class='del'>-		DPRINTF(sc, ATH_DBG_FATAL, "%s:Unable to allocate"</div><div class='del'>-				"private rate control structure", __func__);</div><div class='add'>+		DPRINTF(sc, ATH_DBG_FATAL,</div><div class='add'>+			"%s: Unable to allocate private rc structure\n",</div><div class='add'>+			__func__);</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> 	ath_rc_sib_init(rate_priv);</div><div class='add'>+</div><div class='ctx'> 	return rate_priv;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ath_rate_free_sta(void *priv, void *priv_sta)</div><div class='add'>+static void ath_rate_free_sta(void *priv, struct ieee80211_sta *sta,</div><div class='add'>+			      void *priv_sta)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_rate_node *rate_priv = priv_sta;</div><div class='ctx'> 	struct ath_softc *sc = priv;</div><div class='hunk'>@@ -2111,7 +2097,7 @@ static struct rate_control_ops ath_rate_ops = {</div><div class='ctx'> 	.alloc = ath_rate_alloc,</div><div class='ctx'> 	.free = ath_rate_free,</div><div class='ctx'> 	.alloc_sta = ath_rate_alloc_sta,</div><div class='del'>-	.free_sta = ath_rate_free_sta</div><div class='add'>+	.free_sta = ath_rate_free_sta,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int ath_rate_control_register(void)</div><div class='head'>diff --git a/drivers/net/wireless/ath9k/rc.h b/drivers/net/wireless/ath9k/rc.h<br/>index 71aef9c75232..b95b41508b98 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/ath9k/rc.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/ath9k/rc.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/ath9k/rc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/ath9k/rc.h</a></div><div class='hunk'>@@ -71,9 +71,6 @@ enum ieee80211_fixed_rate_mode {</div><div class='ctx'>  */</div><div class='ctx'> #define IEEE80211_RATE_IDX_ENTRY(val, idx) (((val&amp;(0xff&lt;&lt;(idx*8)))&gt;&gt;(idx*8)))</div><div class='ctx'> </div><div class='del'>-#define SHORT_PRE 1</div><div class='del'>-#define LONG_PRE 0</div><div class='del'>-</div><div class='ctx'> #define WLAN_PHY_HT_20_SS       WLAN_RC_PHY_HT_20_SS</div><div class='ctx'> #define WLAN_PHY_HT_20_DS       WLAN_RC_PHY_HT_20_DS</div><div class='ctx'> #define WLAN_PHY_HT_20_DS_HGI   WLAN_RC_PHY_HT_20_DS_HGI</div><div class='hunk'>@@ -102,18 +99,18 @@ enum {</div><div class='ctx'> 	WLAN_RC_PHY_MAX</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define WLAN_RC_PHY_DS(_phy)   ((_phy == WLAN_RC_PHY_HT_20_DS)           \</div><div class='del'>-	|| (_phy == WLAN_RC_PHY_HT_40_DS)        \</div><div class='del'>-	|| (_phy == WLAN_RC_PHY_HT_20_DS_HGI)    \</div><div class='del'>-	|| (_phy == WLAN_RC_PHY_HT_40_DS_HGI))</div><div class='del'>-#define WLAN_RC_PHY_40(_phy)   ((_phy == WLAN_RC_PHY_HT_40_SS)           \</div><div class='del'>-	|| (_phy == WLAN_RC_PHY_HT_40_DS)        \</div><div class='del'>-	|| (_phy == WLAN_RC_PHY_HT_40_SS_HGI)    \</div><div class='del'>-	|| (_phy == WLAN_RC_PHY_HT_40_DS_HGI))</div><div class='add'>+#define WLAN_RC_PHY_DS(_phy)   ((_phy == WLAN_RC_PHY_HT_20_DS)		\</div><div class='add'>+				|| (_phy == WLAN_RC_PHY_HT_40_DS)	\</div><div class='add'>+				|| (_phy == WLAN_RC_PHY_HT_20_DS_HGI)	\</div><div class='add'>+				|| (_phy == WLAN_RC_PHY_HT_40_DS_HGI))</div><div class='add'>+#define WLAN_RC_PHY_40(_phy)   ((_phy == WLAN_RC_PHY_HT_40_SS)		\</div><div class='add'>+				|| (_phy == WLAN_RC_PHY_HT_40_DS)	\</div><div class='add'>+				|| (_phy == WLAN_RC_PHY_HT_40_SS_HGI)	\</div><div class='add'>+				|| (_phy == WLAN_RC_PHY_HT_40_DS_HGI))</div><div class='ctx'> #define WLAN_RC_PHY_SGI(_phy)  ((_phy == WLAN_RC_PHY_HT_20_SS_HGI)      \</div><div class='del'>-	|| (_phy == WLAN_RC_PHY_HT_20_DS_HGI)   \</div><div class='del'>-	|| (_phy == WLAN_RC_PHY_HT_40_SS_HGI)   \</div><div class='del'>-	|| (_phy == WLAN_RC_PHY_HT_40_DS_HGI))</div><div class='add'>+				|| (_phy == WLAN_RC_PHY_HT_20_DS_HGI)   \</div><div class='add'>+				|| (_phy == WLAN_RC_PHY_HT_40_SS_HGI)   \</div><div class='add'>+				|| (_phy == WLAN_RC_PHY_HT_40_DS_HGI))</div><div class='ctx'> </div><div class='ctx'> #define WLAN_RC_PHY_HT(_phy)    (_phy &gt;= WLAN_RC_PHY_HT_20_SS)</div><div class='ctx'> </div><div class='hunk'>@@ -135,56 +132,59 @@ enum {</div><div class='ctx'> #define WLAN_RC_SGI_FLAG        (0x04)</div><div class='ctx'> #define WLAN_RC_HT_FLAG         (0x08)</div><div class='ctx'> </div><div class='del'>-/* Index into the rate table */</div><div class='del'>-#define INIT_RATE_MAX_20	23</div><div class='del'>-#define INIT_RATE_MAX_40	40</div><div class='del'>-</div><div class='ctx'> #define RATE_TABLE_SIZE		64</div><div class='ctx'> </div><div class='del'>-/* XXX: Convert to kdoc */</div><div class='add'>+/**</div><div class='add'>+ * struct ath_rate_table - Rate Control table</div><div class='add'>+ * @valid: valid for use in rate control</div><div class='add'>+ * @valid_single_stream: valid for use in rate control for</div><div class='add'>+ * 	single stream operation</div><div class='add'>+ * @phy: CCK/OFDM</div><div class='add'>+ * @ratekbps: rate in Kbits per second</div><div class='add'>+ * @user_ratekbps: user rate in Kbits per second</div><div class='add'>+ * @ratecode: rate that goes into HW descriptors</div><div class='add'>+ * @short_preamble: Mask for enabling short preamble in ratecode for CCK</div><div class='add'>+ * @dot11rate: value that goes into supported</div><div class='add'>+ * 	rates info element of MLME</div><div class='add'>+ * @ctrl_rate: Index of next lower basic rate, used for duration computation</div><div class='add'>+ * @max_4ms_framelen: maximum frame length(bytes) for tx duration</div><div class='add'>+ * @probe_interval: interval for rate control to probe for other rates</div><div class='add'>+ * @rssi_reduce_interval: interval for rate control to reduce rssi</div><div class='add'>+ * @initial_ratemax: initial ratemax value used in ath_rc_sib_update()</div><div class='add'>+ */</div><div class='ctx'> struct ath_rate_table {</div><div class='ctx'> 	int rate_cnt;</div><div class='ctx'> 	struct {</div><div class='del'>-		int valid;            /* Valid for use in rate control */</div><div class='del'>-		int valid_single_stream;/* Valid for use in rate control</div><div class='del'>-					for single stream operation */</div><div class='del'>-		u8 phy;              /* CCK/OFDM/TURBO/XR */</div><div class='del'>-		u32 ratekbps;         /* Rate in Kbits per second */</div><div class='del'>-		u32 user_ratekbps;     /* User rate in KBits per second */</div><div class='del'>-		u8 ratecode;         /* rate that goes into</div><div class='del'>-					hw descriptors */</div><div class='del'>-		u8 short_preamble;    /* Mask for enabling short preamble</div><div class='del'>-						in rate code for CCK */</div><div class='del'>-		u8 dot11rate;        /* Value that goes into supported</div><div class='del'>-					rates info element of MLME */</div><div class='del'>-		u8 ctrl_rate;      /* Index of next lower basic rate,</div><div class='del'>-					used for duration computation */</div><div class='del'>-		int8_t rssi_ack_validmin;  /* Rate control related */</div><div class='del'>-		int8_t rssi_ack_deltamin;  /* Rate control related */</div><div class='del'>-		u8 base_index;        /* base rate index */</div><div class='del'>-		u8 cw40index;        /* 40cap rate index */</div><div class='del'>-		u8 sgi_index;         /* shortgi rate index */</div><div class='del'>-		u8 ht_index;          /* shortgi rate index */</div><div class='del'>-		u32 max_4ms_framelen;   /* Maximum frame length(bytes)</div><div class='del'>-						for 4ms tx duration */</div><div class='add'>+		int valid;</div><div class='add'>+		int valid_single_stream;</div><div class='add'>+		u8 phy;</div><div class='add'>+		u32 ratekbps;</div><div class='add'>+		u32 user_ratekbps;</div><div class='add'>+		u8 ratecode;</div><div class='add'>+		u8 short_preamble;</div><div class='add'>+		u8 dot11rate;</div><div class='add'>+		u8 ctrl_rate;</div><div class='add'>+		int8_t rssi_ack_validmin;</div><div class='add'>+		int8_t rssi_ack_deltamin;</div><div class='add'>+		u8 base_index;</div><div class='add'>+		u8 cw40index;</div><div class='add'>+		u8 sgi_index;</div><div class='add'>+		u8 ht_index;</div><div class='add'>+		u32 max_4ms_framelen;</div><div class='ctx'> 	} info[RATE_TABLE_SIZE];</div><div class='del'>-	u32 probe_interval;        /* interval for ratectrl to</div><div class='del'>-					probe for other rates */</div><div class='del'>-	u32 rssi_reduce_interval;   /* interval for ratectrl</div><div class='del'>-						to reduce RSSI */</div><div class='del'>-	u8 initial_ratemax;   /* the initial ratemax value used</div><div class='del'>-					in ath_rc_sib_update() */</div><div class='add'>+	u32 probe_interval;</div><div class='add'>+	u32 rssi_reduce_interval;</div><div class='add'>+	u8 initial_ratemax;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define ATH_RC_PROBE_ALLOWED            0x00000001</div><div class='ctx'> #define ATH_RC_MINRATE_LASTRATE         0x00000002</div><div class='del'>-#define ATH_RC_SHORT_PREAMBLE           0x00000004</div><div class='ctx'> </div><div class='ctx'> struct ath_rc_series {</div><div class='del'>-	u8    rix;</div><div class='del'>-	u8    tries;</div><div class='del'>-	u8    flags;</div><div class='del'>-	u32   max_4ms_framelen;</div><div class='add'>+	u8 rix;</div><div class='add'>+	u8 tries;</div><div class='add'>+	u8 flags;</div><div class='add'>+	u32 max_4ms_framelen;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* rcs_flags definition */</div><div class='hunk'>@@ -201,42 +201,56 @@ struct ath_rc_series {</div><div class='ctx'> #define MAX_TX_RATE_PHY         48</div><div class='ctx'> </div><div class='ctx'> struct ath_tx_ratectrl_state {</div><div class='del'>-	int8_t rssi_thres; /* required rssi for this rate (dB) */</div><div class='del'>-	u8 per; /* recent estimate of packet error rate (%) */</div><div class='add'>+	int8_t rssi_thres;	/* required rssi for this rate (dB) */</div><div class='add'>+	u8 per;			/* recent estimate of packet error rate (%) */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * struct ath_tx_ratectrl - TX Rate control Information</div><div class='add'>+ * @state: RC state</div><div class='add'>+ * @rssi_last: last ACK rssi</div><div class='add'>+ * @rssi_last_lookup: last ACK rssi used for lookup</div><div class='add'>+ * @rssi_last_prev: previous last ACK rssi</div><div class='add'>+ * @rssi_last_prev2: 2nd previous last ACK rssi</div><div class='add'>+ * @rssi_sum_cnt: count of rssi_sum for averaging</div><div class='add'>+ * @rssi_sum_rate: rate that we are averaging</div><div class='add'>+ * @rssi_sum: running sum of rssi for averaging</div><div class='add'>+ * @probe_rate: rate we are probing at</div><div class='add'>+ * @rssi_time: msec timestamp for last ack rssi</div><div class='add'>+ * @rssi_down_time: msec timestamp for last down step</div><div class='add'>+ * @probe_time: msec timestamp for last probe</div><div class='add'>+ * @hw_maxretry_pktcnt: num of packets since we got HW max retry error</div><div class='add'>+ * @max_valid_rate: maximum number of valid rate</div><div class='add'>+ * @per_down_time: msec timestamp for last PER down step</div><div class='add'>+ * @valid_phy_ratecnt: valid rate count</div><div class='add'>+ * @rate_max_phy: phy index for the max rate</div><div class='add'>+ * @probe_interval: interval for ratectrl to probe for other rates</div><div class='add'>+ */</div><div class='ctx'> struct ath_tx_ratectrl {</div><div class='del'>-	struct ath_tx_ratectrl_state state[MAX_TX_RATE_TBL]; /* state */</div><div class='del'>-	int8_t rssi_last;            /* last ack rssi */</div><div class='del'>-	int8_t rssi_last_lookup;	/* last ack rssi used for lookup */</div><div class='del'>-	int8_t rssi_last_prev;	/* previous last ack rssi */</div><div class='del'>-	int8_t rssi_last_prev2;	/* 2nd previous last ack rssi */</div><div class='del'>-	int32_t rssi_sum_cnt;        /* count of rssi_sum for averaging */</div><div class='del'>-	int32_t rssi_sum_rate;       /* rate that we are averaging */</div><div class='del'>-	int32_t rssi_sum;           /* running sum of rssi for averaging */</div><div class='del'>-	u32 valid_txrate_mask;   /* mask of valid rates */</div><div class='del'>-	u8 rate_table_size;      /* rate table size */</div><div class='del'>-	u8 rate_max;            /* max rate that has recently worked */</div><div class='del'>-	u8 probe_rate;          /* rate we are probing at */</div><div class='del'>-	u32 rssi_time;          /* msec timestamp for last ack rssi */</div><div class='del'>-	u32 rssi_down_time;      /* msec timestamp for last down step */</div><div class='del'>-	u32 probe_time;         /* msec timestamp for last probe */</div><div class='del'>-	u8 hw_maxretry_pktcnt;   /* num packets since we got</div><div class='del'>-					HW max retry error */</div><div class='del'>-	u8 max_valid_rate;       /* maximum number of valid rate */</div><div class='del'>-	u8 valid_rate_index[MAX_TX_RATE_TBL]; /* valid rate index */</div><div class='del'>-	u32 per_down_time;       /* msec timstamp for last</div><div class='del'>-					PER down step */</div><div class='add'>+	struct ath_tx_ratectrl_state state[MAX_TX_RATE_TBL];</div><div class='add'>+	int8_t rssi_last;</div><div class='add'>+	int8_t rssi_last_lookup;</div><div class='add'>+	int8_t rssi_last_prev;</div><div class='add'>+	int8_t rssi_last_prev2;</div><div class='add'>+	int32_t rssi_sum_cnt;</div><div class='add'>+	int32_t rssi_sum_rate;</div><div class='add'>+	int32_t rssi_sum;</div><div class='add'>+	u8 rate_table_size;</div><div class='add'>+	u8 probe_rate;</div><div class='add'>+	u32 rssi_time;</div><div class='add'>+	u32 rssi_down_time;</div><div class='add'>+	u32 probe_time;</div><div class='add'>+	u8 hw_maxretry_pktcnt;</div><div class='add'>+	u8 max_valid_rate;</div><div class='add'>+	u8 valid_rate_index[MAX_TX_RATE_TBL];</div><div class='add'>+	u32 per_down_time;</div><div class='ctx'> </div><div class='ctx'> 	/* 11n state */</div><div class='del'>-	u8  valid_phy_ratecnt[WLAN_RC_PHY_MAX]; /* valid rate count */</div><div class='del'>-	u8  valid_phy_rateidx[WLAN_RC_PHY_MAX][MAX_TX_RATE_TBL];</div><div class='del'>-	u8  rc_phy_mode;</div><div class='del'>-	u8  rate_max_phy;        /* Phy index for the max rate */</div><div class='del'>-	u32 rate_max_lastused;   /* msec timstamp of when we</div><div class='del'>-					last used rateMaxPhy */</div><div class='del'>-	u32 probe_interval;     /* interval for ratectrl to probe</div><div class='del'>-					for other rates */</div><div class='add'>+	u8 valid_phy_ratecnt[WLAN_RC_PHY_MAX];</div><div class='add'>+	u8 valid_phy_rateidx[WLAN_RC_PHY_MAX][MAX_TX_RATE_TBL];</div><div class='add'>+	u8 rc_phy_mode;</div><div class='add'>+	u8 rate_max_phy;</div><div class='add'>+	u32 probe_interval;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ath_rateset {</div><div class='hunk'>@@ -248,29 +262,32 @@ struct ath_rateset {</div><div class='ctx'> struct ath_rate_softc {</div><div class='ctx'> 	/* phy tables that contain rate control data */</div><div class='ctx'> 	const void *hw_rate_table[ATH9K_MODE_MAX];</div><div class='del'>-	int fixedrix;	/* -1 or index of fixed rate */</div><div class='add'>+</div><div class='add'>+	/* -1 or index of fixed rate */</div><div class='add'>+	int fixedrix;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* per-node state */</div><div class='ctx'> struct ath_rate_node {</div><div class='del'>-	struct ath_tx_ratectrl tx_ratectrl;	/* rate control state proper */</div><div class='del'>-	u32 prev_data_rix;	/* rate idx of last data frame */</div><div class='add'>+	struct ath_tx_ratectrl tx_ratectrl;</div><div class='ctx'> </div><div class='del'>-	/* map of rate ix -&gt; negotiated rate set ix */</div><div class='del'>-	u8 rixmap[MAX_TX_RATE_TBL];</div><div class='add'>+	/* rate idx of last data frame */</div><div class='add'>+	u32 prev_data_rix;</div><div class='ctx'> </div><div class='del'>-	/* map of ht rate ix -&gt; negotiated rate set ix */</div><div class='del'>-	u8 ht_rixmap[MAX_TX_RATE_TBL];</div><div class='add'>+	/* ht capabilities */</div><div class='add'>+	u8 ht_cap;</div><div class='ctx'> </div><div class='del'>-	u8 ht_cap;		/* ht capabilities */</div><div class='del'>-	u8 ant_tx;		/* current transmit antenna */</div><div class='add'>+	/* When TRUE, only single stream Tx possible */</div><div class='add'>+	u8 single_stream;</div><div class='ctx'> </div><div class='del'>-	u8 single_stream;   /* When TRUE, only single</div><div class='del'>-				stream Tx possible */</div><div class='del'>-	struct ath_rateset neg_rates;	/* Negotiated rates */</div><div class='del'>-	struct ath_rateset neg_ht_rates;	/* Negotiated HT rates */</div><div class='del'>-	struct ath_rate_softc *asc; /* back pointer to atheros softc */</div><div class='del'>-	struct ath_vap *avp;	/* back pointer to vap */</div><div class='add'>+	/* Negotiated rates */</div><div class='add'>+	struct ath_rateset neg_rates;</div><div class='add'>+</div><div class='add'>+	/* Negotiated HT rates */</div><div class='add'>+	struct ath_rateset neg_ht_rates;</div><div class='add'>+</div><div class='add'>+	struct ath_rate_softc *asc;</div><div class='add'>+	struct ath_vap *avp;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Driver data of ieee80211_tx_info */</div><div class='hunk'>@@ -297,17 +314,10 @@ void ath_rc_node_update(struct ieee80211_hw *hw, struct ath_rate_node *rc_priv);</div><div class='ctx'> void ath_rate_newstate(struct ath_softc *sc, struct ath_vap *avp);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Return the tx rate series.</div><div class='del'>- */</div><div class='del'>-void ath_rate_findrate(struct ath_softc *sc, struct ath_rate_node *ath_rc_priv,</div><div class='del'>-		       int num_tries, int num_rates,</div><div class='del'>-		       unsigned int rcflag, struct ath_rc_series[],</div><div class='del'>-		       int *is_probe, int isretry);</div><div class='del'>-/*</div><div class='ctx'>  * Return rate index for given Dot11 Rate.</div><div class='ctx'>  */</div><div class='ctx'> u8 ath_rate_findrateix(struct ath_softc *sc,</div><div class='del'>-			     u8 dot11_rate);</div><div class='add'>+		       u8 dot11_rate);</div><div class='ctx'> </div><div class='ctx'> /* Routines to register/unregister rate control algorithm */</div><div class='ctx'> int ath_rate_control_register(void);</div><div class='head'>diff --git a/drivers/net/wireless/ath9k/recv.c b/drivers/net/wireless/ath9k/recv.c<br/>index 20ddb7acdb94..4983402af559 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/ath9k/recv.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/ath9k/recv.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/ath9k/recv.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/ath9k/recv.c</a></div><div class='hunk'>@@ -184,7 +184,7 @@ static int ath_ampdu_input(struct ath_softc *sc,</div><div class='ctx'> 		tid = qc[0] &amp; 0xf;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (sc-&gt;sc_opmode == ATH9K_M_STA) {</div><div class='add'>+	if (sc-&gt;sc_ah-&gt;ah_opmode == ATH9K_M_STA) {</div><div class='ctx'> 		/* Drop the frame not belonging to me. */</div><div class='ctx'> 		if (memcmp(hdr-&gt;addr1, sc-&gt;sc_myaddr, ETH_ALEN)) {</div><div class='ctx'> 			dev_kfree_skb(skb);</div><div class='hunk'>@@ -449,17 +449,16 @@ static int ath_rx_indicate(struct ath_softc *sc,</div><div class='ctx'> 	int type;</div><div class='ctx'> </div><div class='ctx'> 	/* indicate frame to the stack, which will free the old skb. */</div><div class='del'>-	type = ath__rx_indicate(sc, skb, status, keyix);</div><div class='add'>+	type = _ath_rx_indicate(sc, skb, status, keyix);</div><div class='ctx'> </div><div class='ctx'> 	/* allocate a new skb and queue it to for H/W processing */</div><div class='ctx'> 	nskb = ath_rxbuf_alloc(sc, sc-&gt;sc_rxbufsize);</div><div class='ctx'> 	if (nskb != NULL) {</div><div class='ctx'> 		bf-&gt;bf_mpdu = nskb;</div><div class='del'>-		bf-&gt;bf_buf_addr = ath_skb_map_single(sc,</div><div class='del'>-			nskb,</div><div class='del'>-			PCI_DMA_FROMDEVICE,</div><div class='del'>-			/* XXX: Remove get_dma_mem_context() */</div><div class='del'>-			get_dma_mem_context(bf, bf_dmacontext));</div><div class='add'>+		bf-&gt;bf_buf_addr = pci_map_single(sc-&gt;pdev, nskb-&gt;data,</div><div class='add'>+					 skb_end_pointer(nskb) - nskb-&gt;head,</div><div class='add'>+					 PCI_DMA_FROMDEVICE);</div><div class='add'>+		bf-&gt;bf_dmacontext = bf-&gt;bf_buf_addr;</div><div class='ctx'> 		ATH_RX_CONTEXT(nskb)-&gt;ctx_rxbuf = bf;</div><div class='ctx'> </div><div class='ctx'> 		/* queue the new wbuf to H/W */</div><div class='hunk'>@@ -505,7 +504,7 @@ int ath_rx_init(struct ath_softc *sc, int nbufs)</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='ctx'> 		spin_lock_init(&amp;sc-&gt;sc_rxflushlock);</div><div class='del'>-		sc-&gt;sc_rxflush = 0;</div><div class='add'>+		sc-&gt;sc_flags &amp;= ~SC_OP_RXFLUSH;</div><div class='ctx'> 		spin_lock_init(&amp;sc-&gt;sc_rxbuflock);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='hunk'>@@ -542,9 +541,10 @@ int ath_rx_init(struct ath_softc *sc, int nbufs)</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			bf-&gt;bf_mpdu = skb;</div><div class='del'>-			bf-&gt;bf_buf_addr =</div><div class='del'>-				ath_skb_map_single(sc, skb, PCI_DMA_FROMDEVICE,</div><div class='del'>-				       get_dma_mem_context(bf, bf_dmacontext));</div><div class='add'>+			bf-&gt;bf_buf_addr = pci_map_single(sc-&gt;pdev, skb-&gt;data,</div><div class='add'>+					 skb_end_pointer(skb) - skb-&gt;head,</div><div class='add'>+					 PCI_DMA_FROMDEVICE);</div><div class='add'>+			bf-&gt;bf_dmacontext = bf-&gt;bf_buf_addr;</div><div class='ctx'> 			ATH_RX_CONTEXT(skb)-&gt;ctx_rxbuf = bf;</div><div class='ctx'> 		}</div><div class='ctx'> 		sc-&gt;sc_rxlink = NULL;</div><div class='hunk'>@@ -598,6 +598,7 @@ void ath_rx_cleanup(struct ath_softc *sc)</div><div class='ctx'> u32 ath_calcrxfilter(struct ath_softc *sc)</div><div class='ctx'> {</div><div class='ctx'> #define	RX_FILTER_PRESERVE (ATH9K_RX_FILTER_PHYERR | ATH9K_RX_FILTER_PHYRADAR)</div><div class='add'>+</div><div class='ctx'> 	u32 rfilt;</div><div class='ctx'> </div><div class='ctx'> 	rfilt = (ath9k_hw_getrxfilter(sc-&gt;sc_ah) &amp; RX_FILTER_PRESERVE)</div><div class='hunk'>@@ -605,25 +606,29 @@ u32 ath_calcrxfilter(struct ath_softc *sc)</div><div class='ctx'> 		| ATH9K_RX_FILTER_MCAST;</div><div class='ctx'> </div><div class='ctx'> 	/* If not a STA, enable processing of Probe Requests */</div><div class='del'>-	if (sc-&gt;sc_opmode != ATH9K_M_STA)</div><div class='add'>+	if (sc-&gt;sc_ah-&gt;ah_opmode != ATH9K_M_STA)</div><div class='ctx'> 		rfilt |= ATH9K_RX_FILTER_PROBEREQ;</div><div class='ctx'> </div><div class='ctx'> 	/* Can't set HOSTAP into promiscous mode */</div><div class='del'>-	if (sc-&gt;sc_opmode == ATH9K_M_MONITOR) {</div><div class='add'>+	if (((sc-&gt;sc_ah-&gt;ah_opmode != ATH9K_M_HOSTAP) &amp;&amp;</div><div class='add'>+	     (sc-&gt;rx_filter &amp; FIF_PROMISC_IN_BSS)) ||</div><div class='add'>+	    (sc-&gt;sc_ah-&gt;ah_opmode == ATH9K_M_MONITOR)) {</div><div class='ctx'> 		rfilt |= ATH9K_RX_FILTER_PROM;</div><div class='ctx'> 		/* ??? To prevent from sending ACK */</div><div class='ctx'> 		rfilt &amp;= ~ATH9K_RX_FILTER_UCAST;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (sc-&gt;sc_opmode == ATH9K_M_STA || sc-&gt;sc_opmode == ATH9K_M_IBSS ||</div><div class='del'>-	    sc-&gt;sc_scanning)</div><div class='add'>+	if (((sc-&gt;sc_ah-&gt;ah_opmode == ATH9K_M_STA) &amp;&amp;</div><div class='add'>+	     (sc-&gt;rx_filter &amp; FIF_BCN_PRBRESP_PROMISC)) ||</div><div class='add'>+	    (sc-&gt;sc_ah-&gt;ah_opmode == ATH9K_M_IBSS))</div><div class='ctx'> 		rfilt |= ATH9K_RX_FILTER_BEACON;</div><div class='ctx'> </div><div class='ctx'> 	/* If in HOSTAP mode, want to enable reception of PSPOLL frames</div><div class='ctx'> 	   &amp; beacon frames */</div><div class='del'>-	if (sc-&gt;sc_opmode == ATH9K_M_HOSTAP)</div><div class='add'>+	if (sc-&gt;sc_ah-&gt;ah_opmode == ATH9K_M_HOSTAP)</div><div class='ctx'> 		rfilt |= (ATH9K_RX_FILTER_BEACON | ATH9K_RX_FILTER_PSPOLL);</div><div class='ctx'> 	return rfilt;</div><div class='add'>+</div><div class='ctx'> #undef RX_FILTER_PRESERVE</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -703,11 +708,11 @@ void ath_flushrecv(struct ath_softc *sc)</div><div class='ctx'> 	 * progress (see references to sc_rxflush)</div><div class='ctx'> 	 */</div><div class='ctx'> 	spin_lock_bh(&amp;sc-&gt;sc_rxflushlock);</div><div class='del'>-	sc-&gt;sc_rxflush = 1;</div><div class='add'>+	sc-&gt;sc_flags |= SC_OP_RXFLUSH;</div><div class='ctx'> </div><div class='ctx'> 	ath_rx_tasklet(sc, 1);</div><div class='ctx'> </div><div class='del'>-	sc-&gt;sc_rxflush = 0;</div><div class='add'>+	sc-&gt;sc_flags &amp;= ~SC_OP_RXFLUSH;</div><div class='ctx'> 	spin_unlock_bh(&amp;sc-&gt;sc_rxflushlock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -720,7 +725,7 @@ int ath_rx_input(struct ath_softc *sc,</div><div class='ctx'> 		 struct ath_recv_status *rx_status,</div><div class='ctx'> 		 enum ATH_RX_TYPE *status)</div><div class='ctx'> {</div><div class='del'>-	if (is_ampdu &amp;&amp; sc-&gt;sc_rxaggr) {</div><div class='add'>+	if (is_ampdu &amp;&amp; (sc-&gt;sc_flags &amp; SC_OP_RXAGGR)) {</div><div class='ctx'> 		*status = ATH_RX_CONSUMED;</div><div class='ctx'> 		return ath_ampdu_input(sc, an, skb, rx_status);</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -751,7 +756,7 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush)</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='ctx'> 		/* If handling rx interrupt and flush is in progress =&gt; exit */</div><div class='del'>-		if (sc-&gt;sc_rxflush &amp;&amp; (flush == 0))</div><div class='add'>+		if ((sc-&gt;sc_flags &amp; SC_OP_RXFLUSH) &amp;&amp; (flush == 0))</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		spin_lock_bh(&amp;sc-&gt;sc_rxbuflock);</div><div class='hunk'>@@ -887,7 +892,7 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush)</div><div class='ctx'> </div><div class='ctx'> 		hdr = (struct ieee80211_hdr *)skb-&gt;data;</div><div class='ctx'> 		fc = hdr-&gt;frame_control;</div><div class='del'>-		memzero(&amp;rx_status, sizeof(struct ath_recv_status));</div><div class='add'>+		memset(&amp;rx_status, 0, sizeof(struct ath_recv_status));</div><div class='ctx'> </div><div class='ctx'> 		if (ds-&gt;ds_rxstat.rs_more) {</div><div class='ctx'> 			/*</div><div class='hunk'>@@ -901,7 +906,7 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush)</div><div class='ctx'> 			 * Enable this if you want to see</div><div class='ctx'> 			 * error frames in Monitor mode.</div><div class='ctx'> 			 */</div><div class='del'>-			if (sc-&gt;sc_opmode != ATH9K_M_MONITOR)</div><div class='add'>+			if (sc-&gt;sc_ah-&gt;ah_opmode != ATH9K_M_MONITOR)</div><div class='ctx'> 				goto rx_next;</div><div class='ctx'> #endif</div><div class='ctx'> 			/* fall thru for monitor mode handling... */</div><div class='hunk'>@@ -946,7 +951,7 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush)</div><div class='ctx'> 			 * decryption and MIC failures. For monitor mode,</div><div class='ctx'> 			 * we also ignore the CRC error.</div><div class='ctx'> 			 */</div><div class='del'>-			if (sc-&gt;sc_opmode == ATH9K_M_MONITOR) {</div><div class='add'>+			if (sc-&gt;sc_ah-&gt;ah_opmode == ATH9K_M_MONITOR) {</div><div class='ctx'> 				if (ds-&gt;ds_rxstat.rs_status &amp;</div><div class='ctx'> 				    ~(ATH9K_RXERR_DECRYPT | ATH9K_RXERR_MIC |</div><div class='ctx'> 					ATH9K_RXERR_CRC))</div><div class='hunk'>@@ -994,20 +999,11 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush)</div><div class='ctx'> 				rx_status.flags |= ATH_RX_SHORT_GI;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/* sc-&gt;sc_noise_floor is only available when the station</div><div class='add'>+		/* sc_noise_floor is only available when the station</div><div class='ctx'> 		   attaches to an AP, so we use a default value</div><div class='ctx'> 		   if we are not yet attached. */</div><div class='del'>-</div><div class='del'>-		/* XXX we should use either sc-&gt;sc_noise_floor or</div><div class='del'>-		 * ath_hal_getChanNoise(ah, &amp;sc-&gt;sc_curchan)</div><div class='del'>-		 * to calculate the noise floor.</div><div class='del'>-		 * However, the value returned by ath_hal_getChanNoise</div><div class='del'>-		 * seems to be incorrect (-31dBm on the last test),</div><div class='del'>-		 * so we will use a hard-coded value until we</div><div class='del'>-		 * figure out what is going on.</div><div class='del'>-		 */</div><div class='ctx'> 		rx_status.abs_rssi =</div><div class='del'>-			ds-&gt;ds_rxstat.rs_rssi + ATH_DEFAULT_NOISE_FLOOR;</div><div class='add'>+			ds-&gt;ds_rxstat.rs_rssi + sc-&gt;sc_ani.sc_noise_floor;</div><div class='ctx'> </div><div class='ctx'> 		pci_dma_sync_single_for_cpu(sc-&gt;pdev,</div><div class='ctx'> 					    bf-&gt;bf_buf_addr,</div><div class='hunk'>@@ -1090,7 +1086,7 @@ rx_next:</div><div class='ctx'> 			"%s: Reset rx chain mask. "</div><div class='ctx'> 			"Do internal reset\n", __func__);</div><div class='ctx'> 		ASSERT(flush == 0);</div><div class='del'>-		ath_internal_reset(sc);</div><div class='add'>+		ath_reset(sc, false);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1128,7 +1124,7 @@ int ath_rx_aggr_start(struct ath_softc *sc,</div><div class='ctx'> 	rxtid = &amp;an-&gt;an_aggr.rx.tid[tid];</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;rxtid-&gt;tidlock);</div><div class='del'>-	if (sc-&gt;sc_rxaggr) {</div><div class='add'>+	if (sc-&gt;sc_flags &amp; SC_OP_RXAGGR) {</div><div class='ctx'> 		/* Allow aggregation reception</div><div class='ctx'> 		 * Adjust rx BA window size. Peer might indicate a</div><div class='ctx'> 		 * zero buffer size for a _dont_care_ condition.</div><div class='hunk'>@@ -1161,7 +1157,7 @@ int ath_rx_aggr_start(struct ath_softc *sc,</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* Ensure the memory is zeroed out (all internal</div><div class='ctx'> 			 * pointers are null) */</div><div class='del'>-			memzero(rxtid-&gt;rxbuf, ATH_TID_MAX_BUFS *</div><div class='add'>+			memset(rxtid-&gt;rxbuf, 0, ATH_TID_MAX_BUFS *</div><div class='ctx'> 				sizeof(struct ath_rxbuf));</div><div class='ctx'> 			DPRINTF(sc, ATH_DBG_AGGR,</div><div class='ctx'> 				"%s: Allocated @%p\n", __func__, rxtid-&gt;rxbuf);</div><div class='hunk'>@@ -1228,7 +1224,7 @@ void ath_rx_aggr_teardown(struct ath_softc *sc,</div><div class='ctx'> </div><div class='ctx'> void ath_rx_node_init(struct ath_softc *sc, struct ath_node *an)</div><div class='ctx'> {</div><div class='del'>-	if (sc-&gt;sc_rxaggr) {</div><div class='add'>+	if (sc-&gt;sc_flags &amp; SC_OP_RXAGGR) {</div><div class='ctx'> 		struct ath_arx_tid *rxtid;</div><div class='ctx'> 		int tidno;</div><div class='ctx'> </div><div class='hunk'>@@ -1260,7 +1256,7 @@ void ath_rx_node_init(struct ath_softc *sc, struct ath_node *an)</div><div class='ctx'> </div><div class='ctx'> void ath_rx_node_cleanup(struct ath_softc *sc, struct ath_node *an)</div><div class='ctx'> {</div><div class='del'>-	if (sc-&gt;sc_rxaggr) {</div><div class='add'>+	if (sc-&gt;sc_flags &amp; SC_OP_RXAGGR) {</div><div class='ctx'> 		struct ath_arx_tid *rxtid;</div><div class='ctx'> 		int tidno, i;</div><div class='ctx'> </div><div class='hunk'>@@ -1293,27 +1289,3 @@ void ath_rx_node_free(struct ath_softc *sc, struct ath_node *an)</div><div class='ctx'> {</div><div class='ctx'> 	ath_rx_node_cleanup(sc, an);</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-dma_addr_t ath_skb_map_single(struct ath_softc *sc,</div><div class='del'>-			      struct sk_buff *skb,</div><div class='del'>-			      int direction,</div><div class='del'>-			      dma_addr_t *pa)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * NB: do NOT use skb-&gt;len, which is 0 on initialization.</div><div class='del'>-	 * Use skb's entire data area instead.</div><div class='del'>-	 */</div><div class='del'>-	*pa = pci_map_single(sc-&gt;pdev, skb-&gt;data,</div><div class='del'>-		skb_end_pointer(skb) - skb-&gt;head, direction);</div><div class='del'>-	return *pa;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void ath_skb_unmap_single(struct ath_softc *sc,</div><div class='del'>-			  struct sk_buff *skb,</div><div class='del'>-			  int direction,</div><div class='del'>-			  dma_addr_t *pa)</div><div class='del'>-{</div><div class='del'>-	/* Unmap skb's entire data area */</div><div class='del'>-	pci_unmap_single(sc-&gt;pdev, *pa,</div><div class='del'>-		skb_end_pointer(skb) - skb-&gt;head, direction);</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/net/wireless/ath9k/reg.h b/drivers/net/wireless/ath9k/reg.h<br/>index 42b0890a4685..60617ae66209 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/ath9k/reg.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/ath9k/reg.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/ath9k/reg.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/ath9k/reg.h</a></div><div class='hunk'>@@ -899,12 +899,6 @@ enum {</div><div class='ctx'> #define AR_GPIO_OUTPUT_MUX2                      0x4064</div><div class='ctx'> #define AR_GPIO_OUTPUT_MUX3                      0x4068</div><div class='ctx'> </div><div class='del'>-#define AR_GPIO_OUTPUT_MUX_AS_OUTPUT             0</div><div class='del'>-#define AR_GPIO_OUTPUT_MUX_AS_PCIE_ATTENTION_LED 1</div><div class='del'>-#define AR_GPIO_OUTPUT_MUX_AS_PCIE_POWER_LED     2</div><div class='del'>-#define AR_GPIO_OUTPUT_MUX_AS_MAC_NETWORK_LED    5</div><div class='del'>-#define AR_GPIO_OUTPUT_MUX_AS_MAC_POWER_LED      6</div><div class='del'>-</div><div class='ctx'> #define AR_INPUT_STATE                           0x406c</div><div class='ctx'> </div><div class='ctx'> #define AR_EEPROM_STATUS_DATA                    0x407c</div><div class='head'>diff --git a/drivers/net/wireless/ath9k/xmit.c b/drivers/net/wireless/ath9k/xmit.c<br/>index 8b332e11a656..3a4757942b3f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/ath9k/xmit.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/ath9k/xmit.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/ath9k/xmit.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/ath9k/xmit.c</a></div><div class='hunk'>@@ -60,79 +60,6 @@ static u32 bits_per_symbol[][2] = {</div><div class='ctx'> #define IS_HT_RATE(_rate)     ((_rate) &amp; 0x80)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Insert a chain of ath_buf (descriptors) on a multicast txq</div><div class='del'>- * but do NOT start tx DMA on this queue.</div><div class='del'>- * NB: must be called with txq lock held</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void ath_tx_mcastqaddbuf(struct ath_softc *sc,</div><div class='del'>-				struct ath_txq *txq,</div><div class='del'>-				struct list_head *head)</div><div class='del'>-{</div><div class='del'>-	struct ath_hal *ah = sc-&gt;sc_ah;</div><div class='del'>-	struct ath_buf *bf;</div><div class='del'>-</div><div class='del'>-	if (list_empty(head))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Insert the frame on the outbound list and</div><div class='del'>-	 * pass it on to the hardware.</div><div class='del'>-	 */</div><div class='del'>-	bf = list_first_entry(head, struct ath_buf, list);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * The CAB queue is started from the SWBA handler since</div><div class='del'>-	 * frames only go out on DTIM and to avoid possible races.</div><div class='del'>-	 */</div><div class='del'>-	ath9k_hw_set_interrupts(ah, 0);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If there is anything in the mcastq, we want to set</div><div class='del'>-	 * the "more data" bit in the last item in the queue to</div><div class='del'>-	 * indicate that there is "more data". It makes sense to add</div><div class='del'>-	 * it here since you are *always* going to have</div><div class='del'>-	 * more data when adding to this queue, no matter where</div><div class='del'>-	 * you call from.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (txq-&gt;axq_depth) {</div><div class='del'>-		struct ath_buf *lbf;</div><div class='del'>-		struct ieee80211_hdr *hdr;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Add the "more data flag" to the last frame</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		lbf = list_entry(txq-&gt;axq_q.prev, struct ath_buf, list);</div><div class='del'>-		hdr = (struct ieee80211_hdr *)</div><div class='del'>-			((struct sk_buff *)(lbf-&gt;bf_mpdu))-&gt;data;</div><div class='del'>-		hdr-&gt;frame_control |= cpu_to_le16(IEEE80211_FCTL_MOREDATA);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Now, concat the frame onto the queue</div><div class='del'>-	 */</div><div class='del'>-	list_splice_tail_init(head, &amp;txq-&gt;axq_q);</div><div class='del'>-	txq-&gt;axq_depth++;</div><div class='del'>-	txq-&gt;axq_totalqueued++;</div><div class='del'>-	txq-&gt;axq_linkbuf = list_entry(txq-&gt;axq_q.prev, struct ath_buf, list);</div><div class='del'>-</div><div class='del'>-	DPRINTF(sc, ATH_DBG_QUEUE,</div><div class='del'>-		"%s: txq depth = %d\n", __func__, txq-&gt;axq_depth);</div><div class='del'>-	if (txq-&gt;axq_link != NULL) {</div><div class='del'>-		*txq-&gt;axq_link = bf-&gt;bf_daddr;</div><div class='del'>-		DPRINTF(sc, ATH_DBG_XMIT,</div><div class='del'>-			"%s: link[%u](%p)=%llx (%p)\n",</div><div class='del'>-			__func__,</div><div class='del'>-			txq-&gt;axq_qnum, txq-&gt;axq_link,</div><div class='del'>-			ito64(bf-&gt;bf_daddr), bf-&gt;bf_desc);</div><div class='del'>-	}</div><div class='del'>-	txq-&gt;axq_link = &amp;(bf-&gt;bf_lastbf-&gt;bf_desc-&gt;ds_link);</div><div class='del'>-	ath9k_hw_set_interrupts(ah, sc-&gt;sc_imask);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * Insert a chain of ath_buf (descriptors) on a txq and</div><div class='ctx'>  * assume the descriptors are already chained together by caller.</div><div class='ctx'>  * NB: must be called with txq lock held</div><div class='hunk'>@@ -277,8 +204,6 @@ static int ath_tx_prepare(struct ath_softc *sc,</div><div class='ctx'> 	__le16 fc;</div><div class='ctx'> 	u8 *qc;</div><div class='ctx'> </div><div class='del'>-	memset(txctl, 0, sizeof(struct ath_tx_control));</div><div class='del'>-</div><div class='ctx'> 	txctl-&gt;dev = sc;</div><div class='ctx'> 	hdr = (struct ieee80211_hdr *)skb-&gt;data;</div><div class='ctx'> 	hdrlen = ieee80211_get_hdrlen_from_skb(skb);</div><div class='hunk'>@@ -302,7 +227,6 @@ static int ath_tx_prepare(struct ath_softc *sc,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	txctl-&gt;if_id = 0;</div><div class='del'>-	txctl-&gt;nextfraglen = 0;</div><div class='ctx'> 	txctl-&gt;frmlen = skb-&gt;len + FCS_LEN - (hdrlen &amp; 3);</div><div class='ctx'> 	txctl-&gt;txpower = MAX_RATE_POWER; /* FIXME */</div><div class='ctx'> </div><div class='hunk'>@@ -313,7 +237,7 @@ static int ath_tx_prepare(struct ath_softc *sc,</div><div class='ctx'> </div><div class='ctx'> 	if (tx_info-&gt;control.hw_key) {</div><div class='ctx'> 		txctl-&gt;keyix = tx_info-&gt;control.hw_key-&gt;hw_key_idx;</div><div class='del'>-		txctl-&gt;frmlen += tx_info-&gt;control.icv_len;</div><div class='add'>+		txctl-&gt;frmlen += tx_info-&gt;control.hw_key-&gt;icv_len;</div><div class='ctx'> </div><div class='ctx'> 		if (tx_info-&gt;control.hw_key-&gt;alg == ALG_WEP)</div><div class='ctx'> 			txctl-&gt;keytype = ATH9K_KEY_TYPE_WEP;</div><div class='hunk'>@@ -329,12 +253,18 @@ static int ath_tx_prepare(struct ath_softc *sc,</div><div class='ctx'> </div><div class='ctx'> 	/* Fill qnum */</div><div class='ctx'> </div><div class='del'>-	txctl-&gt;qnum = ath_get_hal_qnum(skb_get_queue_mapping(skb), sc);</div><div class='del'>-	txq = &amp;sc-&gt;sc_txq[txctl-&gt;qnum];</div><div class='add'>+	if (unlikely(txctl-&gt;flags &amp; ATH9K_TXDESC_CAB)) {</div><div class='add'>+		txctl-&gt;qnum = 0;</div><div class='add'>+		txq = sc-&gt;sc_cabq;</div><div class='add'>+	} else {</div><div class='add'>+		txctl-&gt;qnum = ath_get_hal_qnum(skb_get_queue_mapping(skb), sc);</div><div class='add'>+		txq = &amp;sc-&gt;sc_txq[txctl-&gt;qnum];</div><div class='add'>+	}</div><div class='ctx'> 	spin_lock_bh(&amp;txq-&gt;axq_lock);</div><div class='ctx'> </div><div class='ctx'> 	/* Try to avoid running out of descriptors */</div><div class='del'>-	if (txq-&gt;axq_depth &gt;= (ATH_TXBUF - 20)) {</div><div class='add'>+	if (txq-&gt;axq_depth &gt;= (ATH_TXBUF - 20) &amp;&amp;</div><div class='add'>+	    !(txctl-&gt;flags &amp; ATH9K_TXDESC_CAB)) {</div><div class='ctx'> 		DPRINTF(sc, ATH_DBG_FATAL,</div><div class='ctx'> 			"%s: TX queue: %d is full, depth: %d\n",</div><div class='ctx'> 			__func__,</div><div class='hunk'>@@ -354,7 +284,7 @@ static int ath_tx_prepare(struct ath_softc *sc,</div><div class='ctx'> </div><div class='ctx'> 	/* Fill flags */</div><div class='ctx'> </div><div class='del'>-	txctl-&gt;flags = ATH9K_TXDESC_CLRDMASK;    /* needed for crypto errors */</div><div class='add'>+	txctl-&gt;flags |= ATH9K_TXDESC_CLRDMASK; /* needed for crypto errors */</div><div class='ctx'> </div><div class='ctx'> 	if (tx_info-&gt;flags &amp; IEEE80211_TX_CTL_NO_ACK)</div><div class='ctx'> 		txctl-&gt;flags |= ATH9K_TXDESC_NOACK;</div><div class='hunk'>@@ -392,7 +322,7 @@ static int ath_tx_prepare(struct ath_softc *sc,</div><div class='ctx'> 		 * incremented by the fragmentation routine.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (likely(!(txctl-&gt;flags &amp; ATH9K_TXDESC_FRAG_IS_ON)) &amp;&amp;</div><div class='del'>-			txctl-&gt;ht &amp;&amp; sc-&gt;sc_txaggr) {</div><div class='add'>+		    txctl-&gt;ht &amp;&amp; (sc-&gt;sc_flags &amp; SC_OP_TXAGGR)) {</div><div class='ctx'> 			struct ath_atx_tid *tid;</div><div class='ctx'> </div><div class='ctx'> 			tid = ATH_AN_2_TID(txctl-&gt;an, txctl-&gt;tidno);</div><div class='hunk'>@@ -413,50 +343,18 @@ static int ath_tx_prepare(struct ath_softc *sc,</div><div class='ctx'> 	}</div><div class='ctx'> 	rix = rcs[0].rix;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Calculate duration.  This logically belongs in the 802.11</div><div class='del'>-	 * layer but it lacks sufficient information to calculate it.</div><div class='del'>-	 */</div><div class='del'>-	if ((txctl-&gt;flags &amp; ATH9K_TXDESC_NOACK) == 0 &amp;&amp; !ieee80211_is_ctl(fc)) {</div><div class='del'>-		u16 dur;</div><div class='add'>+	if (ieee80211_has_morefrags(fc) ||</div><div class='add'>+	    (le16_to_cpu(hdr-&gt;seq_ctrl) &amp; IEEE80211_SCTL_FRAG)) {</div><div class='ctx'> 		/*</div><div class='del'>-		 * XXX not right with fragmentation.</div><div class='del'>-		 */</div><div class='del'>-		if (sc-&gt;sc_flags &amp; ATH_PREAMBLE_SHORT)</div><div class='del'>-			dur = rt-&gt;info[rix].spAckDuration;</div><div class='del'>-		else</div><div class='del'>-			dur = rt-&gt;info[rix].lpAckDuration;</div><div class='del'>-</div><div class='del'>-		if (le16_to_cpu(hdr-&gt;frame_control) &amp;</div><div class='del'>-				IEEE80211_FCTL_MOREFRAGS) {</div><div class='del'>-			dur += dur;  /* Add additional 'SIFS + ACK' */</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			** Compute size of next fragment in order to compute</div><div class='del'>-			** durations needed to update NAV.</div><div class='del'>-			** The last fragment uses the ACK duration only.</div><div class='del'>-			** Add time for next fragment.</div><div class='del'>-			*/</div><div class='del'>-			dur += ath9k_hw_computetxtime(sc-&gt;sc_ah, rt,</div><div class='del'>-					txctl-&gt;nextfraglen,</div><div class='del'>-					rix, sc-&gt;sc_flags &amp; ATH_PREAMBLE_SHORT);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (ieee80211_has_morefrags(fc) ||</div><div class='del'>-		     (le16_to_cpu(hdr-&gt;seq_ctrl) &amp; IEEE80211_SCTL_FRAG)) {</div><div class='del'>-			/*</div><div class='del'>-			**  Force hardware to use computed duration for next</div><div class='del'>-			**  fragment by disabling multi-rate retry, which</div><div class='del'>-			**  updates duration based on the multi-rate</div><div class='del'>-			**  duration table.</div><div class='del'>-			*/</div><div class='del'>-			rcs[1].tries = rcs[2].tries = rcs[3].tries = 0;</div><div class='del'>-			rcs[1].rix = rcs[2].rix = rcs[3].rix = 0;</div><div class='del'>-			/* reset tries but keep rate index */</div><div class='del'>-			rcs[0].tries = ATH_TXMAXTRY;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		hdr-&gt;duration_id = cpu_to_le16(dur);</div><div class='add'>+		**  Force hardware to use computed duration for next</div><div class='add'>+		**  fragment by disabling multi-rate retry, which</div><div class='add'>+		**  updates duration based on the multi-rate</div><div class='add'>+		**  duration table.</div><div class='add'>+		*/</div><div class='add'>+		rcs[1].tries = rcs[2].tries = rcs[3].tries = 0;</div><div class='add'>+		rcs[1].rix = rcs[2].rix = rcs[3].rix = 0;</div><div class='add'>+		/* reset tries but keep rate index */</div><div class='add'>+		rcs[0].tries = ATH_TXMAXTRY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -484,12 +382,8 @@ static int ath_tx_prepare(struct ath_softc *sc,</div><div class='ctx'> 	if (is_multicast_ether_addr(hdr-&gt;addr1)) {</div><div class='ctx'> 		antenna = sc-&gt;sc_mcastantenna + 1;</div><div class='ctx'> 		sc-&gt;sc_mcastantenna = (sc-&gt;sc_mcastantenna + 1) &amp; 0x1;</div><div class='del'>-	} else</div><div class='del'>-		antenna = sc-&gt;sc_txantenna;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-#ifdef USE_LEGACY_HAL</div><div class='del'>-	txctl-&gt;antenna = antenna;</div><div class='del'>-#endif</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -502,7 +396,6 @@ static void ath_tx_complete_buf(struct ath_softc *sc,</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb = bf-&gt;bf_mpdu;</div><div class='ctx'> 	struct ath_xmit_status tx_status;</div><div class='del'>-	dma_addr_t *pa;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Set retry information.</div><div class='hunk'>@@ -518,13 +411,12 @@ static void ath_tx_complete_buf(struct ath_softc *sc,</div><div class='ctx'> 	if (!txok) {</div><div class='ctx'> 		tx_status.flags |= ATH_TX_ERROR;</div><div class='ctx'> </div><div class='del'>-		if (bf-&gt;bf_isxretried)</div><div class='add'>+		if (bf_isxretried(bf))</div><div class='ctx'> 			tx_status.flags |= ATH_TX_XRETRY;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Unmap this frame */</div><div class='del'>-	pa = get_dma_mem_context(bf, bf_dmacontext);</div><div class='ctx'> 	pci_unmap_single(sc-&gt;pdev,</div><div class='del'>-			 *pa,</div><div class='add'>+			 bf-&gt;bf_dmacontext,</div><div class='ctx'> 			 skb-&gt;len,</div><div class='ctx'> 			 PCI_DMA_TODEVICE);</div><div class='ctx'> 	/* complete this frame */</div><div class='hunk'>@@ -629,7 +521,7 @@ static int ath_tx_num_badfrms(struct ath_softc *sc,</div><div class='ctx'> 	if (isnodegone || ds-&gt;ds_txstat.ts_flags == ATH9K_TX_SW_ABORTED)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	isaggr = bf-&gt;bf_isaggr;</div><div class='add'>+	isaggr = bf_isaggr(bf);</div><div class='ctx'> 	if (isaggr) {</div><div class='ctx'> 		seq_st = ATH_DS_BA_SEQ(ds);</div><div class='ctx'> 		memcpy(ba, ATH_DS_BA_BITMAP(ds), WME_BA_BMP_SIZE &gt;&gt; 3);</div><div class='hunk'>@@ -651,7 +543,7 @@ static void ath_tx_set_retry(struct ath_softc *sc, struct ath_buf *bf)</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	struct ieee80211_hdr *hdr;</div><div class='ctx'> </div><div class='del'>-	bf-&gt;bf_isretried = 1;</div><div class='add'>+	bf-&gt;bf_state.bf_type |= BUF_RETRY;</div><div class='ctx'> 	bf-&gt;bf_retries++;</div><div class='ctx'> </div><div class='ctx'> 	skb = bf-&gt;bf_mpdu;</div><div class='hunk'>@@ -698,7 +590,7 @@ static u32 ath_pkt_duration(struct ath_softc *sc,</div><div class='ctx'> 	u8 rc;</div><div class='ctx'> 	int streams, pktlen;</div><div class='ctx'> </div><div class='del'>-	pktlen = bf-&gt;bf_isaggr ? bf-&gt;bf_al : bf-&gt;bf_frmlen;</div><div class='add'>+	pktlen = bf_isaggr(bf) ? bf-&gt;bf_al : bf-&gt;bf_frmlen;</div><div class='ctx'> 	rc = rt-&gt;info[rix].rateCode;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -742,7 +634,7 @@ static void ath_buf_set_rate(struct ath_softc *sc, struct ath_buf *bf)</div><div class='ctx'> 	int i, flags, rtsctsena = 0, dynamic_mimops = 0;</div><div class='ctx'> 	u32 ctsduration = 0;</div><div class='ctx'> 	u8 rix = 0, cix, ctsrate = 0;</div><div class='del'>-	u32 aggr_limit_with_rts = sc-&gt;sc_rtsaggrlimit;</div><div class='add'>+	u32 aggr_limit_with_rts = ah-&gt;ah_caps.rts_aggr_limit;</div><div class='ctx'> 	struct ath_node *an = (struct ath_node *) bf-&gt;bf_node;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -781,7 +673,7 @@ static void ath_buf_set_rate(struct ath_softc *sc, struct ath_buf *bf)</div><div class='ctx'> 	 * let rate series flags determine which rates will actually</div><div class='ctx'> 	 * use RTS.</div><div class='ctx'> 	 */</div><div class='del'>-	if ((ah-&gt;ah_caps.hw_caps &amp; ATH9K_HW_CAP_HT) &amp;&amp; bf-&gt;bf_isdata) {</div><div class='add'>+	if ((ah-&gt;ah_caps.hw_caps &amp; ATH9K_HW_CAP_HT) &amp;&amp; bf_isdata(bf)) {</div><div class='ctx'> 		BUG_ON(!an);</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * 802.11g protection not needed, use our default behavior</div><div class='hunk'>@@ -793,7 +685,7 @@ static void ath_buf_set_rate(struct ath_softc *sc, struct ath_buf *bf)</div><div class='ctx'> 		 * and the second aggregate should have any protection at all.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (an-&gt;an_smmode == ATH_SM_PWRSAV_DYNAMIC) {</div><div class='del'>-			if (!bf-&gt;bf_aggrburst) {</div><div class='add'>+			if (!bf_isaggrburst(bf)) {</div><div class='ctx'> 				flags = ATH9K_TXDESC_RTSENA;</div><div class='ctx'> 				dynamic_mimops = 1;</div><div class='ctx'> 			} else {</div><div class='hunk'>@@ -806,7 +698,7 @@ static void ath_buf_set_rate(struct ath_softc *sc, struct ath_buf *bf)</div><div class='ctx'> 	 * Set protection if aggregate protection on</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (sc-&gt;sc_config.ath_aggr_prot &amp;&amp;</div><div class='del'>-	    (!bf-&gt;bf_isaggr || (bf-&gt;bf_isaggr &amp;&amp; bf-&gt;bf_al &lt; 8192))) {</div><div class='add'>+	    (!bf_isaggr(bf) || (bf_isaggr(bf) &amp;&amp; bf-&gt;bf_al &lt; 8192))) {</div><div class='ctx'> 		flags = ATH9K_TXDESC_RTSENA;</div><div class='ctx'> 		cix = rt-&gt;info[sc-&gt;sc_protrix].controlRate;</div><div class='ctx'> 		rtsctsena = 1;</div><div class='hunk'>@@ -815,7 +707,7 @@ static void ath_buf_set_rate(struct ath_softc *sc, struct ath_buf *bf)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 *  For AR5416 - RTS cannot be followed by a frame larger than 8K.</div><div class='ctx'> 	 */</div><div class='del'>-	if (bf-&gt;bf_isaggr &amp;&amp; (bf-&gt;bf_al &gt; aggr_limit_with_rts)) {</div><div class='add'>+	if (bf_isaggr(bf) &amp;&amp; (bf-&gt;bf_al &gt; aggr_limit_with_rts)) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Ensure that in the case of SM Dynamic power save</div><div class='ctx'> 		 * while we are bursting the second aggregate the</div><div class='hunk'>@@ -832,12 +724,12 @@ static void ath_buf_set_rate(struct ath_softc *sc, struct ath_buf *bf)</div><div class='ctx'> 	/* NB: cix is set above where RTS/CTS is enabled */</div><div class='ctx'> 	BUG_ON(cix == 0xff);</div><div class='ctx'> 	ctsrate = rt-&gt;info[cix].rateCode |</div><div class='del'>-		(bf-&gt;bf_shpreamble ? rt-&gt;info[cix].shortPreamble : 0);</div><div class='add'>+		(bf_isshpreamble(bf) ? rt-&gt;info[cix].shortPreamble : 0);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Setup HAL rate series</div><div class='ctx'> 	 */</div><div class='del'>-	memzero(series, sizeof(struct ath9k_11n_rate_series) * 4);</div><div class='add'>+	memset(series, 0, sizeof(struct ath9k_11n_rate_series) * 4);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 4; i++) {</div><div class='ctx'> 		if (!bf-&gt;bf_rcs[i].tries)</div><div class='hunk'>@@ -846,7 +738,7 @@ static void ath_buf_set_rate(struct ath_softc *sc, struct ath_buf *bf)</div><div class='ctx'> 		rix = bf-&gt;bf_rcs[i].rix;</div><div class='ctx'> </div><div class='ctx'> 		series[i].Rate = rt-&gt;info[rix].rateCode |</div><div class='del'>-			(bf-&gt;bf_shpreamble ? rt-&gt;info[rix].shortPreamble : 0);</div><div class='add'>+			(bf_isshpreamble(bf) ? rt-&gt;info[rix].shortPreamble : 0);</div><div class='ctx'> </div><div class='ctx'> 		series[i].Tries = bf-&gt;bf_rcs[i].tries;</div><div class='ctx'> </div><div class='hunk'>@@ -862,7 +754,7 @@ static void ath_buf_set_rate(struct ath_softc *sc, struct ath_buf *bf)</div><div class='ctx'> 			sc, rix, bf,</div><div class='ctx'> 			(bf-&gt;bf_rcs[i].flags &amp; ATH_RC_CW40_FLAG) != 0,</div><div class='ctx'> 			(bf-&gt;bf_rcs[i].flags &amp; ATH_RC_SGI_FLAG),</div><div class='del'>-			bf-&gt;bf_shpreamble);</div><div class='add'>+			bf_isshpreamble(bf));</div><div class='ctx'> </div><div class='ctx'> 		if ((an-&gt;an_smmode == ATH_SM_PWRSAV_STATIC) &amp;&amp;</div><div class='ctx'> 		    (bf-&gt;bf_rcs[i].flags &amp; ATH_RC_DS_FLAG) == 0) {</div><div class='hunk'>@@ -875,7 +767,7 @@ static void ath_buf_set_rate(struct ath_softc *sc, struct ath_buf *bf)</div><div class='ctx'> 			 */</div><div class='ctx'> 			series[i].ChSel = sc-&gt;sc_tx_chainmask;</div><div class='ctx'> 		} else {</div><div class='del'>-			if (bf-&gt;bf_ht)</div><div class='add'>+			if (bf_isht(bf))</div><div class='ctx'> 				series[i].ChSel =</div><div class='ctx'> 					ath_chainmask_sel_logic(sc, an);</div><div class='ctx'> 			else</div><div class='hunk'>@@ -908,7 +800,7 @@ static void ath_buf_set_rate(struct ath_softc *sc, struct ath_buf *bf)</div><div class='ctx'> 		 *     use the precalculated ACK durations.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (flags &amp; ATH9K_TXDESC_RTSENA) {    /* SIFS + CTS */</div><div class='del'>-			ctsduration += bf-&gt;bf_shpreamble ?</div><div class='add'>+			ctsduration += bf_isshpreamble(bf) ?</div><div class='ctx'> 				rt-&gt;info[cix].spAckDuration :</div><div class='ctx'> 				rt-&gt;info[cix].lpAckDuration;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -916,7 +808,7 @@ static void ath_buf_set_rate(struct ath_softc *sc, struct ath_buf *bf)</div><div class='ctx'> 		ctsduration += series[0].PktDuration;</div><div class='ctx'> </div><div class='ctx'> 		if ((bf-&gt;bf_flags &amp; ATH9K_TXDESC_NOACK) == 0) { /* SIFS + ACK */</div><div class='del'>-			ctsduration += bf-&gt;bf_shpreamble ?</div><div class='add'>+			ctsduration += bf_isshpreamble(bf) ?</div><div class='ctx'> 				rt-&gt;info[rix].spAckDuration :</div><div class='ctx'> 				rt-&gt;info[rix].lpAckDuration;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -925,17 +817,17 @@ static void ath_buf_set_rate(struct ath_softc *sc, struct ath_buf *bf)</div><div class='ctx'> 		 * Disable multi-rate retry when using RTS/CTS by clearing</div><div class='ctx'> 		 * series 1, 2 and 3.</div><div class='ctx'> 		 */</div><div class='del'>-		memzero(&amp;series[1], sizeof(struct ath9k_11n_rate_series) * 3);</div><div class='add'>+		memset(&amp;series[1], 0, sizeof(struct ath9k_11n_rate_series) * 3);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * set dur_update_en for l-sig computation except for PS-Poll frames</div><div class='ctx'> 	 */</div><div class='ctx'> 	ath9k_hw_set11n_ratescenario(ah, ds, lastds,</div><div class='del'>-				    !bf-&gt;bf_ispspoll,</div><div class='del'>-				    ctsrate,</div><div class='del'>-				    ctsduration,</div><div class='del'>-				    series, 4, flags);</div><div class='add'>+				     !bf_ispspoll(bf),</div><div class='add'>+				     ctsrate,</div><div class='add'>+				     ctsduration,</div><div class='add'>+				     series, 4, flags);</div><div class='ctx'> 	if (sc-&gt;sc_config.ath_aggr_prot &amp;&amp; flags)</div><div class='ctx'> 		ath9k_hw_set11n_burstduration(ah, ds, 8192);</div><div class='ctx'> }</div><div class='hunk'>@@ -958,7 +850,7 @@ static int ath_tx_send_normal(struct ath_softc *sc,</div><div class='ctx'> 	BUG_ON(list_empty(bf_head));</div><div class='ctx'> </div><div class='ctx'> 	bf = list_first_entry(bf_head, struct ath_buf, list);</div><div class='del'>-	bf-&gt;bf_isampdu = 0; /* regular HT frame */</div><div class='add'>+	bf-&gt;bf_state.bf_type &amp;= ~BUF_AMPDU; /* regular HT frame */</div><div class='ctx'> </div><div class='ctx'> 	skb = (struct sk_buff *)bf-&gt;bf_mpdu;</div><div class='ctx'> 	tx_info = IEEE80211_SKB_CB(skb);</div><div class='hunk'>@@ -998,7 +890,7 @@ static void ath_tx_flush_tid(struct ath_softc *sc, struct ath_atx_tid *tid)</div><div class='ctx'> </div><div class='ctx'> 	while (!list_empty(&amp;tid-&gt;buf_q)) {</div><div class='ctx'> 		bf = list_first_entry(&amp;tid-&gt;buf_q, struct ath_buf, list);</div><div class='del'>-		ASSERT(!bf-&gt;bf_isretried);</div><div class='add'>+		ASSERT(!bf_isretried(bf));</div><div class='ctx'> 		list_cut_position(&amp;bf_head, &amp;tid-&gt;buf_q, &amp;bf-&gt;bf_lastfrm-&gt;list);</div><div class='ctx'> 		ath_tx_send_normal(sc, txq, tid, &amp;bf_head);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1025,7 +917,7 @@ static void ath_tx_complete_aggr_rifs(struct ath_softc *sc,</div><div class='ctx'> 	int isaggr, txfail, txpending, sendbar = 0, needreset = 0;</div><div class='ctx'> 	int isnodegone = (an-&gt;an_flags &amp; ATH_NODE_CLEAN);</div><div class='ctx'> </div><div class='del'>-	isaggr = bf-&gt;bf_isaggr;</div><div class='add'>+	isaggr = bf_isaggr(bf);</div><div class='ctx'> 	if (isaggr) {</div><div class='ctx'> 		if (txok) {</div><div class='ctx'> 			if (ATH_DS_TX_BA(ds)) {</div><div class='hunk'>@@ -1038,7 +930,7 @@ static void ath_tx_complete_aggr_rifs(struct ath_softc *sc,</div><div class='ctx'> 					ATH_DS_BA_BITMAP(ds),</div><div class='ctx'> 					WME_BA_BMP_SIZE &gt;&gt; 3);</div><div class='ctx'> 			} else {</div><div class='del'>-				memzero(ba, WME_BA_BMP_SIZE &gt;&gt; 3);</div><div class='add'>+				memset(ba, 0, WME_BA_BMP_SIZE &gt;&gt; 3);</div><div class='ctx'> </div><div class='ctx'> 				/*</div><div class='ctx'> 				 * AR5416 can become deaf/mute when BA</div><div class='hunk'>@@ -1047,11 +939,11 @@ static void ath_tx_complete_aggr_rifs(struct ath_softc *sc,</div><div class='ctx'> 				 * when perform internal reset in this routine.</div><div class='ctx'> 				 * Only enable reset in STA mode for now.</div><div class='ctx'> 				 */</div><div class='del'>-				if (sc-&gt;sc_opmode == ATH9K_M_STA)</div><div class='add'>+				if (sc-&gt;sc_ah-&gt;ah_opmode == ATH9K_M_STA)</div><div class='ctx'> 					needreset = 1;</div><div class='ctx'> 			}</div><div class='ctx'> 		} else {</div><div class='del'>-			memzero(ba, WME_BA_BMP_SIZE &gt;&gt; 3);</div><div class='add'>+			memset(ba, 0, WME_BA_BMP_SIZE &gt;&gt; 3);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1075,7 +967,7 @@ static void ath_tx_complete_aggr_rifs(struct ath_softc *sc,</div><div class='ctx'> 					ath_tx_set_retry(sc, bf);</div><div class='ctx'> 					txpending = 1;</div><div class='ctx'> 				} else {</div><div class='del'>-					bf-&gt;bf_isxretried = 1;</div><div class='add'>+					bf-&gt;bf_state.bf_type |= BUF_XRETRY;</div><div class='ctx'> 					txfail = 1;</div><div class='ctx'> 					sendbar = 1;</div><div class='ctx'> 				}</div><div class='hunk'>@@ -1175,11 +1067,8 @@ static void ath_tx_complete_aggr_rifs(struct ath_softc *sc,</div><div class='ctx'> 						tbf-&gt;bf_lastfrm-&gt;bf_desc);</div><div class='ctx'> </div><div class='ctx'> 					/* copy the DMA context */</div><div class='del'>-					copy_dma_mem_context(</div><div class='del'>-						get_dma_mem_context(tbf,</div><div class='del'>-							bf_dmacontext),</div><div class='del'>-						get_dma_mem_context(bf_last,</div><div class='del'>-							bf_dmacontext));</div><div class='add'>+					tbf-&gt;bf_dmacontext =</div><div class='add'>+						bf_last-&gt;bf_dmacontext;</div><div class='ctx'> 				}</div><div class='ctx'> 				list_add_tail(&amp;tbf-&gt;list, &amp;bf_head);</div><div class='ctx'> 			} else {</div><div class='hunk'>@@ -1188,7 +1077,7 @@ static void ath_tx_complete_aggr_rifs(struct ath_softc *sc,</div><div class='ctx'> 				 * software retry</div><div class='ctx'> 				 */</div><div class='ctx'> 				ath9k_hw_cleartxdesc(sc-&gt;sc_ah,</div><div class='del'>-					bf-&gt;bf_lastfrm-&gt;bf_desc);</div><div class='add'>+						     bf-&gt;bf_lastfrm-&gt;bf_desc);</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			/*</div><div class='hunk'>@@ -1242,7 +1131,7 @@ static void ath_tx_complete_aggr_rifs(struct ath_softc *sc,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (needreset)</div><div class='del'>-		ath_internal_reset(sc);</div><div class='add'>+		ath_reset(sc, false);</div><div class='ctx'> </div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='hunk'>@@ -1331,7 +1220,7 @@ static int ath_tx_processq(struct ath_softc *sc, struct ath_txq *txq)</div><div class='ctx'> </div><div class='ctx'> 		txq-&gt;axq_depth--;</div><div class='ctx'> </div><div class='del'>-		if (bf-&gt;bf_isaggr)</div><div class='add'>+		if (bf_isaggr(bf))</div><div class='ctx'> 			txq-&gt;axq_aggr_depth--;</div><div class='ctx'> </div><div class='ctx'> 		txok = (ds-&gt;ds_txstat.ts_status == 0);</div><div class='hunk'>@@ -1345,14 +1234,14 @@ static int ath_tx_processq(struct ath_softc *sc, struct ath_txq *txq)</div><div class='ctx'> 			spin_unlock_bh(&amp;sc-&gt;sc_txbuflock);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (!bf-&gt;bf_isampdu) {</div><div class='add'>+		if (!bf_isampdu(bf)) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * This frame is sent out as a single frame.</div><div class='ctx'> 			 * Use hardware retry status for this frame.</div><div class='ctx'> 			 */</div><div class='ctx'> 			bf-&gt;bf_retries = ds-&gt;ds_txstat.ts_longretry;</div><div class='ctx'> 			if (ds-&gt;ds_txstat.ts_status &amp; ATH9K_TXERR_XRETRY)</div><div class='del'>-				bf-&gt;bf_isxretried = 1;</div><div class='add'>+				bf-&gt;bf_state.bf_type |= BUF_XRETRY;</div><div class='ctx'> 			nbad = 0;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			nbad = ath_tx_num_badfrms(sc, bf, txok);</div><div class='hunk'>@@ -1368,7 +1257,7 @@ static int ath_tx_processq(struct ath_softc *sc, struct ath_txq *txq)</div><div class='ctx'> 			if (ds-&gt;ds_txstat.ts_status == 0)</div><div class='ctx'> 				nacked++;</div><div class='ctx'> </div><div class='del'>-			if (bf-&gt;bf_isdata) {</div><div class='add'>+			if (bf_isdata(bf)) {</div><div class='ctx'> 				if (isrifs)</div><div class='ctx'> 					tmp_ds = bf-&gt;bf_rifslast-&gt;bf_desc;</div><div class='ctx'> 				else</div><div class='hunk'>@@ -1384,7 +1273,7 @@ static int ath_tx_processq(struct ath_softc *sc, struct ath_txq *txq)</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Complete this transmit unit</div><div class='ctx'> 		 */</div><div class='del'>-		if (bf-&gt;bf_isampdu)</div><div class='add'>+		if (bf_isampdu(bf))</div><div class='ctx'> 			ath_tx_complete_aggr_rifs(sc, txq, bf, &amp;bf_head, txok);</div><div class='ctx'> 		else</div><div class='ctx'> 			ath_tx_complete_buf(sc, bf, &amp;bf_head, txok, 0);</div><div class='hunk'>@@ -1406,7 +1295,7 @@ static int ath_tx_processq(struct ath_softc *sc, struct ath_txq *txq)</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * schedule any pending packets if aggregation is enabled</div><div class='ctx'> 		 */</div><div class='del'>-		if (sc-&gt;sc_txaggr)</div><div class='add'>+		if (sc-&gt;sc_flags &amp; SC_OP_TXAGGR)</div><div class='ctx'> 			ath_txq_schedule(sc, txq);</div><div class='ctx'> 		spin_unlock_bh(&amp;txq-&gt;axq_lock);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1430,10 +1319,9 @@ static void ath_drain_txdataq(struct ath_softc *sc, bool retry_tx)</div><div class='ctx'> 	struct ath_hal *ah = sc-&gt;sc_ah;</div><div class='ctx'> 	int i;</div><div class='ctx'> 	int npend = 0;</div><div class='del'>-	enum ath9k_ht_macmode ht_macmode = ath_cwm_macmode(sc);</div><div class='ctx'> </div><div class='ctx'> 	/* XXX return value */</div><div class='del'>-	if (!sc-&gt;sc_invalid) {</div><div class='add'>+	if (!(sc-&gt;sc_flags &amp; SC_OP_INVALID)) {</div><div class='ctx'> 		for (i = 0; i &lt; ATH9K_NUM_TX_QUEUES; i++) {</div><div class='ctx'> 			if (ATH_TXQ_SETUP(sc, i)) {</div><div class='ctx'> 				ath_tx_stopdma(sc, &amp;sc-&gt;sc_txq[i]);</div><div class='hunk'>@@ -1454,10 +1342,11 @@ static void ath_drain_txdataq(struct ath_softc *sc, bool retry_tx)</div><div class='ctx'> 			"%s: Unable to stop TxDMA. Reset HAL!\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 		spin_lock_bh(&amp;sc-&gt;sc_resetlock);</div><div class='del'>-		if (!ath9k_hw_reset(ah, sc-&gt;sc_opmode,</div><div class='del'>-			&amp;sc-&gt;sc_curchan, ht_macmode,</div><div class='del'>-			sc-&gt;sc_tx_chainmask, sc-&gt;sc_rx_chainmask,</div><div class='del'>-			sc-&gt;sc_ht_extprotspacing, true, &amp;status)) {</div><div class='add'>+		if (!ath9k_hw_reset(ah,</div><div class='add'>+				    sc-&gt;sc_ah-&gt;ah_curchan,</div><div class='add'>+				    sc-&gt;sc_ht_info.tx_chan_width,</div><div class='add'>+				    sc-&gt;sc_tx_chainmask, sc-&gt;sc_rx_chainmask,</div><div class='add'>+				    sc-&gt;sc_ht_extprotspacing, true, &amp;status)) {</div><div class='ctx'> </div><div class='ctx'> 			DPRINTF(sc, ATH_DBG_FATAL,</div><div class='ctx'> 				"%s: unable to reset hardware; hal status %u\n",</div><div class='hunk'>@@ -1481,7 +1370,7 @@ static void ath_tx_addto_baw(struct ath_softc *sc,</div><div class='ctx'> {</div><div class='ctx'> 	int index, cindex;</div><div class='ctx'> </div><div class='del'>-	if (bf-&gt;bf_isretried)</div><div class='add'>+	if (bf_isretried(bf))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	index  = ATH_BA_INDEX(tid-&gt;seq_start, bf-&gt;bf_seqno);</div><div class='hunk'>@@ -1516,7 +1405,7 @@ static int ath_tx_send_ampdu(struct ath_softc *sc,</div><div class='ctx'> 	BUG_ON(list_empty(bf_head));</div><div class='ctx'> </div><div class='ctx'> 	bf = list_first_entry(bf_head, struct ath_buf, list);</div><div class='del'>-	bf-&gt;bf_isampdu = 1;</div><div class='add'>+	bf-&gt;bf_state.bf_type |= BUF_AMPDU;</div><div class='ctx'> 	bf-&gt;bf_seqno = txctl-&gt;seqno; /* save seqno and tidno in buffer */</div><div class='ctx'> 	bf-&gt;bf_tidno = txctl-&gt;tidno;</div><div class='ctx'> </div><div class='hunk'>@@ -1860,7 +1749,7 @@ static void ath_tx_sched_aggr(struct ath_softc *sc,</div><div class='ctx'> 		if (bf-&gt;bf_nframes == 1) {</div><div class='ctx'> 			ASSERT(bf-&gt;bf_lastfrm == bf_last);</div><div class='ctx'> </div><div class='del'>-			bf-&gt;bf_isaggr = 0;</div><div class='add'>+			bf-&gt;bf_state.bf_type &amp;= ~BUF_AGGR;</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * clear aggr bits for every descriptor</div><div class='ctx'> 			 * XXX TODO: is there a way to optimize it?</div><div class='hunk'>@@ -1877,7 +1766,7 @@ static void ath_tx_sched_aggr(struct ath_softc *sc,</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * setup first desc with rate and aggr info</div><div class='ctx'> 		 */</div><div class='del'>-		bf-&gt;bf_isaggr  = 1;</div><div class='add'>+		bf-&gt;bf_state.bf_type |= BUF_AGGR;</div><div class='ctx'> 		ath_buf_set_rate(sc, bf);</div><div class='ctx'> 		ath9k_hw_set11n_aggr_first(sc-&gt;sc_ah, bf-&gt;bf_desc, bf-&gt;bf_al);</div><div class='ctx'> </div><div class='hunk'>@@ -1925,7 +1814,7 @@ static void ath_tid_drain(struct ath_softc *sc,</div><div class='ctx'> 		list_cut_position(&amp;bf_head, &amp;tid-&gt;buf_q, &amp;bf-&gt;bf_lastfrm-&gt;list);</div><div class='ctx'> </div><div class='ctx'> 		/* update baw for software retried frame */</div><div class='del'>-		if (bf-&gt;bf_isretried)</div><div class='add'>+		if (bf_isretried(bf))</div><div class='ctx'> 			ath_tx_update_baw(sc, tid, bf-&gt;bf_seqno);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='hunk'>@@ -1990,13 +1879,18 @@ static int ath_tx_start_dma(struct ath_softc *sc,</div><div class='ctx'> 	struct list_head bf_head;</div><div class='ctx'> 	struct ath_desc *ds;</div><div class='ctx'> 	struct ath_hal *ah = sc-&gt;sc_ah;</div><div class='del'>-	struct ath_txq *txq = &amp;sc-&gt;sc_txq[txctl-&gt;qnum];</div><div class='add'>+	struct ath_txq *txq;</div><div class='ctx'> 	struct ath_tx_info_priv *tx_info_priv;</div><div class='ctx'> 	struct ath_rc_series *rcs;</div><div class='ctx'> 	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb-&gt;data;</div><div class='ctx'> 	struct ieee80211_tx_info *tx_info =  IEEE80211_SKB_CB(skb);</div><div class='ctx'> 	__le16 fc = hdr-&gt;frame_control;</div><div class='ctx'> </div><div class='add'>+	if (unlikely(txctl-&gt;flags &amp; ATH9K_TXDESC_CAB))</div><div class='add'>+		txq = sc-&gt;sc_cabq;</div><div class='add'>+	else</div><div class='add'>+		txq = &amp;sc-&gt;sc_txq[txctl-&gt;qnum];</div><div class='add'>+</div><div class='ctx'> 	/* For each sglist entry, allocate an ath_buf for DMA */</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;bf_head);</div><div class='ctx'> 	spin_lock_bh(&amp;sc-&gt;sc_txbuflock);</div><div class='hunk'>@@ -2014,11 +1908,21 @@ static int ath_tx_start_dma(struct ath_softc *sc,</div><div class='ctx'> 	/* set up this buffer */</div><div class='ctx'> 	ATH_TXBUF_RESET(bf);</div><div class='ctx'> 	bf-&gt;bf_frmlen = txctl-&gt;frmlen;</div><div class='del'>-	bf-&gt;bf_isdata = ieee80211_is_data(fc);</div><div class='del'>-	bf-&gt;bf_isbar = ieee80211_is_back_req(fc);</div><div class='del'>-	bf-&gt;bf_ispspoll = ieee80211_is_pspoll(fc);</div><div class='add'>+</div><div class='add'>+	ieee80211_is_data(fc) ?</div><div class='add'>+		(bf-&gt;bf_state.bf_type |= BUF_DATA) :</div><div class='add'>+		(bf-&gt;bf_state.bf_type &amp;= ~BUF_DATA);</div><div class='add'>+	ieee80211_is_back_req(fc) ?</div><div class='add'>+		(bf-&gt;bf_state.bf_type |= BUF_BAR) :</div><div class='add'>+		(bf-&gt;bf_state.bf_type &amp;= ~BUF_BAR);</div><div class='add'>+	ieee80211_is_pspoll(fc) ?</div><div class='add'>+		(bf-&gt;bf_state.bf_type |= BUF_PSPOLL) :</div><div class='add'>+		(bf-&gt;bf_state.bf_type &amp;= ~BUF_PSPOLL);</div><div class='add'>+	(sc-&gt;sc_flags &amp; SC_OP_PREAMBLE_SHORT) ?</div><div class='add'>+		(bf-&gt;bf_state.bf_type |= BUF_SHORT_PREAMBLE) :</div><div class='add'>+		(bf-&gt;bf_state.bf_type &amp;= ~BUF_SHORT_PREAMBLE);</div><div class='add'>+</div><div class='ctx'> 	bf-&gt;bf_flags = txctl-&gt;flags;</div><div class='del'>-	bf-&gt;bf_shpreamble = sc-&gt;sc_flags &amp; ATH_PREAMBLE_SHORT;</div><div class='ctx'> 	bf-&gt;bf_keytype = txctl-&gt;keytype;</div><div class='ctx'> 	tx_info_priv = (struct ath_tx_info_priv *)tx_info-&gt;driver_data[0];</div><div class='ctx'> 	rcs = tx_info_priv-&gt;rcs;</div><div class='hunk'>@@ -2038,8 +1942,7 @@ static int ath_tx_start_dma(struct ath_softc *sc,</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Save the DMA context in the first ath_buf</div><div class='ctx'> 	 */</div><div class='del'>-	copy_dma_mem_context(get_dma_mem_context(bf, bf_dmacontext),</div><div class='del'>-			     get_dma_mem_context(txctl, dmacontext));</div><div class='add'>+	bf-&gt;bf_dmacontext = txctl-&gt;dmacontext;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Formulate first tx descriptor with tx controls.</div><div class='hunk'>@@ -2060,11 +1963,13 @@ static int ath_tx_start_dma(struct ath_softc *sc,</div><div class='ctx'> 			    ds);                /* first descriptor */</div><div class='ctx'> </div><div class='ctx'> 	bf-&gt;bf_lastfrm = bf;</div><div class='del'>-	bf-&gt;bf_ht = txctl-&gt;ht;</div><div class='add'>+	(txctl-&gt;ht) ?</div><div class='add'>+		(bf-&gt;bf_state.bf_type |= BUF_HT) :</div><div class='add'>+		(bf-&gt;bf_state.bf_type &amp;= ~BUF_HT);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;txq-&gt;axq_lock);</div><div class='ctx'> </div><div class='del'>-	if (txctl-&gt;ht &amp;&amp; sc-&gt;sc_txaggr) {</div><div class='add'>+	if (txctl-&gt;ht &amp;&amp; (sc-&gt;sc_flags &amp; SC_OP_TXAGGR)) {</div><div class='ctx'> 		struct ath_atx_tid *tid = ATH_AN_2_TID(an, txctl-&gt;tidno);</div><div class='ctx'> 		if (ath_aggr_query(sc, an, txctl-&gt;tidno)) {</div><div class='ctx'> 			/*</div><div class='hunk'>@@ -2090,27 +1995,7 @@ static int ath_tx_start_dma(struct ath_softc *sc,</div><div class='ctx'> 			bf-&gt;bf_tidno = txctl-&gt;tidno;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (is_multicast_ether_addr(hdr-&gt;addr1)) {</div><div class='del'>-			struct ath_vap *avp = sc-&gt;sc_vaps[txctl-&gt;if_id];</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * When servicing one or more stations in power-save</div><div class='del'>-			 * mode (or) if there is some mcast data waiting on</div><div class='del'>-			 * mcast queue (to prevent out of order delivery of</div><div class='del'>-			 * mcast,bcast packets) multicast frames must be</div><div class='del'>-			 * buffered until after the beacon. We use the private</div><div class='del'>-			 * mcast queue for that.</div><div class='del'>-			 */</div><div class='del'>-			/* XXX? more bit in 802.11 frame header */</div><div class='del'>-			spin_lock_bh(&amp;avp-&gt;av_mcastq.axq_lock);</div><div class='del'>-			if (txctl-&gt;ps || avp-&gt;av_mcastq.axq_depth)</div><div class='del'>-				ath_tx_mcastqaddbuf(sc,</div><div class='del'>-					&amp;avp-&gt;av_mcastq, &amp;bf_head);</div><div class='del'>-			else</div><div class='del'>-				ath_tx_txqaddbuf(sc, txq, &amp;bf_head);</div><div class='del'>-			spin_unlock_bh(&amp;avp-&gt;av_mcastq.axq_lock);</div><div class='del'>-		} else</div><div class='del'>-			ath_tx_txqaddbuf(sc, txq, &amp;bf_head);</div><div class='add'>+		ath_tx_txqaddbuf(sc, txq, &amp;bf_head);</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_bh(&amp;txq-&gt;axq_lock);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -2118,30 +2003,31 @@ static int ath_tx_start_dma(struct ath_softc *sc,</div><div class='ctx'> </div><div class='ctx'> static void xmit_map_sg(struct ath_softc *sc,</div><div class='ctx'> 			struct sk_buff *skb,</div><div class='del'>-			dma_addr_t *pa,</div><div class='ctx'> 			struct ath_tx_control *txctl)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_xmit_status tx_status;</div><div class='ctx'> 	struct ath_atx_tid *tid;</div><div class='ctx'> 	struct scatterlist sg;</div><div class='ctx'> </div><div class='del'>-	*pa = pci_map_single(sc-&gt;pdev, skb-&gt;data, skb-&gt;len, PCI_DMA_TODEVICE);</div><div class='add'>+	txctl-&gt;dmacontext = pci_map_single(sc-&gt;pdev, skb-&gt;data,</div><div class='add'>+					   skb-&gt;len, PCI_DMA_TODEVICE);</div><div class='ctx'> </div><div class='ctx'> 	/* setup S/G list */</div><div class='ctx'> 	memset(&amp;sg, 0, sizeof(struct scatterlist));</div><div class='del'>-	sg_dma_address(&amp;sg) = *pa;</div><div class='add'>+	sg_dma_address(&amp;sg) = txctl-&gt;dmacontext;</div><div class='ctx'> 	sg_dma_len(&amp;sg) = skb-&gt;len;</div><div class='ctx'> </div><div class='ctx'> 	if (ath_tx_start_dma(sc, skb, &amp;sg, 1, txctl) != 0) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 *  We have to do drop frame here.</div><div class='ctx'> 		 */</div><div class='del'>-		pci_unmap_single(sc-&gt;pdev, *pa, skb-&gt;len, PCI_DMA_TODEVICE);</div><div class='add'>+		pci_unmap_single(sc-&gt;pdev, txctl-&gt;dmacontext,</div><div class='add'>+				 skb-&gt;len, PCI_DMA_TODEVICE);</div><div class='ctx'> </div><div class='ctx'> 		tx_status.retries = 0;</div><div class='ctx'> 		tx_status.flags = ATH_TX_ERROR;</div><div class='ctx'> </div><div class='del'>-		if (txctl-&gt;ht &amp;&amp; sc-&gt;sc_txaggr) {</div><div class='add'>+		if (txctl-&gt;ht &amp;&amp; (sc-&gt;sc_flags &amp; SC_OP_TXAGGR)) {</div><div class='ctx'> 			/* Reclaim the seqno. */</div><div class='ctx'> 			tid = ATH_AN_2_TID((struct ath_node *)</div><div class='ctx'> 				txctl-&gt;an, txctl-&gt;tidno);</div><div class='hunk'>@@ -2162,7 +2048,7 @@ int ath_tx_init(struct ath_softc *sc, int nbufs)</div><div class='ctx'> </div><div class='ctx'> 		/* Setup tx descriptors */</div><div class='ctx'> 		error = ath_descdma_setup(sc, &amp;sc-&gt;sc_txdma, &amp;sc-&gt;sc_txbuf,</div><div class='del'>-			"tx", nbufs * ATH_FRAG_PER_MSDU, ATH_TXDESC);</div><div class='add'>+			"tx", nbufs, 1);</div><div class='ctx'> 		if (error != 0) {</div><div class='ctx'> 			DPRINTF(sc, ATH_DBG_FATAL,</div><div class='ctx'> 				"%s: failed to allocate tx descriptors: %d\n",</div><div class='hunk'>@@ -2212,7 +2098,7 @@ struct ath_txq *ath_txq_setup(struct ath_softc *sc, int qtype, int subtype)</div><div class='ctx'> 	struct ath9k_tx_queue_info qi;</div><div class='ctx'> 	int qnum;</div><div class='ctx'> </div><div class='del'>-	memzero(&amp;qi, sizeof(qi));</div><div class='add'>+	memset(&amp;qi, 0, sizeof(qi));</div><div class='ctx'> 	qi.tqi_subtype = subtype;</div><div class='ctx'> 	qi.tqi_aifs = ATH9K_TXQ_USEDEFAULT;</div><div class='ctx'> 	qi.tqi_cwmin = ATH9K_TXQ_USEDEFAULT;</div><div class='hunk'>@@ -2403,6 +2289,7 @@ int ath_tx_start(struct ath_softc *sc, struct sk_buff *skb)</div><div class='ctx'> 	struct ath_tx_control txctl;</div><div class='ctx'> 	int error = 0;</div><div class='ctx'> </div><div class='add'>+	memset(&amp;txctl, 0, sizeof(struct ath_tx_control));</div><div class='ctx'> 	error = ath_tx_prepare(sc, skb, &amp;txctl);</div><div class='ctx'> 	if (error == 0)</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -2410,9 +2297,7 @@ int ath_tx_start(struct ath_softc *sc, struct sk_buff *skb)</div><div class='ctx'> 		 * ath_tx_start_dma() will be called either synchronously</div><div class='ctx'> 		 * or asynchrounsly once DMA is complete.</div><div class='ctx'> 		 */</div><div class='del'>-		xmit_map_sg(sc, skb,</div><div class='del'>-			    get_dma_mem_context(&amp;txctl, dmacontext),</div><div class='del'>-			    &amp;txctl);</div><div class='add'>+		xmit_map_sg(sc, skb, &amp;txctl);</div><div class='ctx'> 	else</div><div class='ctx'> 		ath_node_put(sc, txctl.an, ATH9K_BH_STATUS_CHANGE);</div><div class='ctx'> </div><div class='hunk'>@@ -2424,8 +2309,7 @@ int ath_tx_start(struct ath_softc *sc, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> void ath_tx_tasklet(struct ath_softc *sc)</div><div class='ctx'> {</div><div class='del'>-	u64 tsf = ath9k_hw_gettsf64(sc-&gt;sc_ah);</div><div class='del'>-	int i, nacked = 0;</div><div class='add'>+	int i;</div><div class='ctx'> 	u32 qcumask = ((1 &lt;&lt; ATH9K_NUM_TX_QUEUES) - 1);</div><div class='ctx'> </div><div class='ctx'> 	ath9k_hw_gettxintrtxqs(sc-&gt;sc_ah, &amp;qcumask);</div><div class='hunk'>@@ -2435,10 +2319,8 @@ void ath_tx_tasklet(struct ath_softc *sc)</div><div class='ctx'> 	 */</div><div class='ctx'> 	for (i = 0; i &lt; ATH9K_NUM_TX_QUEUES; i++) {</div><div class='ctx'> 		if (ATH_TXQ_SETUP(sc, i) &amp;&amp; (qcumask &amp; (1 &lt;&lt; i)))</div><div class='del'>-			nacked += ath_tx_processq(sc, &amp;sc-&gt;sc_txq[i]);</div><div class='add'>+			ath_tx_processq(sc, &amp;sc-&gt;sc_txq[i]);</div><div class='ctx'> 	}</div><div class='del'>-	if (nacked)</div><div class='del'>-		sc-&gt;sc_lastrx = tsf;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void ath_tx_draintxq(struct ath_softc *sc,</div><div class='hunk'>@@ -2486,14 +2368,14 @@ void ath_tx_draintxq(struct ath_softc *sc,</div><div class='ctx'> </div><div class='ctx'> 		spin_unlock_bh(&amp;txq-&gt;axq_lock);</div><div class='ctx'> </div><div class='del'>-		if (bf-&gt;bf_isampdu)</div><div class='add'>+		if (bf_isampdu(bf))</div><div class='ctx'> 			ath_tx_complete_aggr_rifs(sc, txq, bf, &amp;bf_head, 0);</div><div class='ctx'> 		else</div><div class='ctx'> 			ath_tx_complete_buf(sc, bf, &amp;bf_head, 0, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* flush any pending frames if aggregation is enabled */</div><div class='del'>-	if (sc-&gt;sc_txaggr) {</div><div class='add'>+	if (sc-&gt;sc_flags &amp; SC_OP_TXAGGR) {</div><div class='ctx'> 		if (!retry_tx) {</div><div class='ctx'> 			spin_lock_bh(&amp;txq-&gt;axq_lock);</div><div class='ctx'> 			ath_txq_drain_pending_buffers(sc, txq,</div><div class='hunk'>@@ -2509,7 +2391,7 @@ void ath_draintxq(struct ath_softc *sc, bool retry_tx)</div><div class='ctx'> {</div><div class='ctx'> 	/* stop beacon queue. The beacon will be freed when</div><div class='ctx'> 	 * we go to INIT state */</div><div class='del'>-	if (!sc-&gt;sc_invalid) {</div><div class='add'>+	if (!(sc-&gt;sc_flags &amp; SC_OP_INVALID)) {</div><div class='ctx'> 		(void) ath9k_hw_stoptxdma(sc-&gt;sc_ah, sc-&gt;sc_bhalq);</div><div class='ctx'> 		DPRINTF(sc, ATH_DBG_XMIT, "%s: beacon queue %x\n", __func__,</div><div class='ctx'> 			ath9k_hw_gettxbuf(sc-&gt;sc_ah, sc-&gt;sc_bhalq));</div><div class='hunk'>@@ -2536,7 +2418,7 @@ enum ATH_AGGR_CHECK ath_tx_aggr_check(struct ath_softc *sc,</div><div class='ctx'> 	struct ath_atx_tid *txtid;</div><div class='ctx'> 	DECLARE_MAC_BUF(mac);</div><div class='ctx'> </div><div class='del'>-	if (!sc-&gt;sc_txaggr)</div><div class='add'>+	if (!(sc-&gt;sc_flags &amp; SC_OP_TXAGGR))</div><div class='ctx'> 		return AGGR_NOT_REQUIRED;</div><div class='ctx'> </div><div class='ctx'> 	/* ADDBA exchange must be completed before sending aggregates */</div><div class='hunk'>@@ -2583,7 +2465,7 @@ int ath_tx_aggr_start(struct ath_softc *sc,</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (sc-&gt;sc_txaggr) {</div><div class='add'>+	if (sc-&gt;sc_flags &amp; SC_OP_TXAGGR) {</div><div class='ctx'> 		txtid = ATH_AN_2_TID(an, tid);</div><div class='ctx'> 		txtid-&gt;addba_exchangeinprogress = 1;</div><div class='ctx'> 		ath_tx_pause_tid(sc, txtid);</div><div class='hunk'>@@ -2647,7 +2529,7 @@ void ath_tx_aggr_teardown(struct ath_softc *sc,</div><div class='ctx'> 	spin_lock_bh(&amp;txq-&gt;axq_lock);</div><div class='ctx'> 	while (!list_empty(&amp;txtid-&gt;buf_q)) {</div><div class='ctx'> 		bf = list_first_entry(&amp;txtid-&gt;buf_q, struct ath_buf, list);</div><div class='del'>-		if (!bf-&gt;bf_isretried) {</div><div class='add'>+		if (!bf_isretried(bf)) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * NB: it's based on the assumption that</div><div class='ctx'> 			 * software retried frame will always stay</div><div class='hunk'>@@ -2743,7 +2625,7 @@ void ath_txq_schedule(struct ath_softc *sc, struct ath_txq *txq)</div><div class='ctx'> </div><div class='ctx'> void ath_tx_node_init(struct ath_softc *sc, struct ath_node *an)</div><div class='ctx'> {</div><div class='del'>-	if (sc-&gt;sc_txaggr) {</div><div class='add'>+	if (sc-&gt;sc_flags &amp; SC_OP_TXAGGR) {</div><div class='ctx'> 		struct ath_atx_tid *tid;</div><div class='ctx'> 		struct ath_atx_ac *ac;</div><div class='ctx'> 		int tidno, acno;</div><div class='hunk'>@@ -2855,7 +2737,7 @@ void ath_tx_node_cleanup(struct ath_softc *sc,</div><div class='ctx'> </div><div class='ctx'> void ath_tx_node_free(struct ath_softc *sc, struct ath_node *an)</div><div class='ctx'> {</div><div class='del'>-	if (sc-&gt;sc_txaggr) {</div><div class='add'>+	if (sc-&gt;sc_flags &amp; SC_OP_TXAGGR) {</div><div class='ctx'> 		struct ath_atx_tid *tid;</div><div class='ctx'> 		int tidno, i;</div><div class='ctx'> </div><div class='hunk'>@@ -2869,3 +2751,57 @@ void ath_tx_node_free(struct ath_softc *sc, struct ath_node *an)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+void ath_tx_cabq(struct ath_softc *sc, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	int hdrlen, padsize;</div><div class='add'>+	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);</div><div class='add'>+	struct ath_tx_control txctl;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * As a temporary workaround, assign seq# here; this will likely need</div><div class='add'>+	 * to be cleaned up to work better with Beacon transmission and virtual</div><div class='add'>+	 * BSSes.</div><div class='add'>+	 */</div><div class='add'>+	if (info-&gt;flags &amp; IEEE80211_TX_CTL_ASSIGN_SEQ) {</div><div class='add'>+		struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb-&gt;data;</div><div class='add'>+		if (info-&gt;flags &amp; IEEE80211_TX_CTL_FIRST_FRAGMENT)</div><div class='add'>+			sc-&gt;seq_no += 0x10;</div><div class='add'>+		hdr-&gt;seq_ctrl &amp;= cpu_to_le16(IEEE80211_SCTL_FRAG);</div><div class='add'>+		hdr-&gt;seq_ctrl |= cpu_to_le16(sc-&gt;seq_no);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Add the padding after the header if this is not already done */</div><div class='add'>+	hdrlen = ieee80211_get_hdrlen_from_skb(skb);</div><div class='add'>+	if (hdrlen &amp; 3) {</div><div class='add'>+		padsize = hdrlen % 4;</div><div class='add'>+		if (skb_headroom(skb) &lt; padsize) {</div><div class='add'>+			DPRINTF(sc, ATH_DBG_XMIT, "%s: TX CABQ padding "</div><div class='add'>+				"failed\n", __func__);</div><div class='add'>+			dev_kfree_skb_any(skb);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+		skb_push(skb, padsize);</div><div class='add'>+		memmove(skb-&gt;data, skb-&gt;data + padsize, hdrlen);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DPRINTF(sc, ATH_DBG_XMIT, "%s: transmitting CABQ packet, skb: %p\n",</div><div class='add'>+		__func__,</div><div class='add'>+		skb);</div><div class='add'>+</div><div class='add'>+	memset(&amp;txctl, 0, sizeof(struct ath_tx_control));</div><div class='add'>+	txctl.flags = ATH9K_TXDESC_CAB;</div><div class='add'>+	if (ath_tx_prepare(sc, skb, &amp;txctl) == 0) {</div><div class='add'>+		/*</div><div class='add'>+		 * Start DMA mapping.</div><div class='add'>+		 * ath_tx_start_dma() will be called either synchronously</div><div class='add'>+		 * or asynchrounsly once DMA is complete.</div><div class='add'>+		 */</div><div class='add'>+		xmit_map_sg(sc, skb, &amp;txctl);</div><div class='add'>+	} else {</div><div class='add'>+		ath_node_put(sc, txctl.an, ATH9K_BH_STATUS_CHANGE);</div><div class='add'>+		DPRINTF(sc, ATH_DBG_XMIT, "%s: TX CABQ failed\n", __func__);</div><div class='add'>+		dev_kfree_skb_any(skb);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='head'>diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c<br/>index bd65c485098c..ecb02bdaab5b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/atmel.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/atmel.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/atmel.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/atmel.c</a></div><div class='hunk'>@@ -2258,7 +2258,7 @@ static int atmel_get_freq(struct net_device *dev,</div><div class='ctx'> </div><div class='ctx'> static int atmel_set_scan(struct net_device *dev,</div><div class='ctx'> 			  struct iw_request_info *info,</div><div class='del'>-			  struct iw_param *vwrq,</div><div class='add'>+			  struct iw_point *dwrq,</div><div class='ctx'> 			  char *extra)</div><div class='ctx'> {</div><div class='ctx'> 	struct atmel_private *priv = netdev_priv(dev);</div><div class='head'>diff --git a/drivers/net/wireless/atmel_cs.c b/drivers/net/wireless/atmel_cs.c<br/>index 12617cd0b78e..77406245dc7b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/atmel_cs.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/atmel_cs.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/atmel_cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/atmel_cs.c</a></div><div class='hunk'>@@ -158,7 +158,7 @@ static int atmel_probe(struct pcmcia_device *p_dev)</div><div class='ctx'> 	DEBUG(0, "atmel_attach()\n");</div><div class='ctx'> </div><div class='ctx'> 	/* Interrupt setup */</div><div class='del'>-	p_dev-&gt;irq.Attributes = IRQ_TYPE_EXCLUSIVE;</div><div class='add'>+	p_dev-&gt;irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;</div><div class='ctx'> 	p_dev-&gt;irq.IRQInfo1 = IRQ_LEVEL_ID;</div><div class='ctx'> 	p_dev-&gt;irq.Handler = NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -224,13 +224,58 @@ static int card_present(void *arg)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int atmel_config_check(struct pcmcia_device *p_dev,</div><div class='add'>+			      cistpl_cftable_entry_t *cfg,</div><div class='add'>+			      cistpl_cftable_entry_t *dflt,</div><div class='add'>+			      unsigned int vcc,</div><div class='add'>+			      void *priv_data)</div><div class='add'>+{</div><div class='add'>+	if (cfg-&gt;index == 0)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	/* Does this card need audio output? */</div><div class='add'>+	if (cfg-&gt;flags &amp; CISTPL_CFTABLE_AUDIO) {</div><div class='add'>+		p_dev-&gt;conf.Attributes |= CONF_ENABLE_SPKR;</div><div class='add'>+		p_dev-&gt;conf.Status = CCSR_AUDIO_ENA;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Use power settings for Vcc and Vpp if present */</div><div class='add'>+	/*  Note that the CIS values need to be rescaled */</div><div class='add'>+	if (cfg-&gt;vpp1.present &amp; (1&lt;&lt;CISTPL_POWER_VNOM))</div><div class='add'>+		p_dev-&gt;conf.Vpp = cfg-&gt;vpp1.param[CISTPL_POWER_VNOM]/10000;</div><div class='add'>+	else if (dflt-&gt;vpp1.present &amp; (1&lt;&lt;CISTPL_POWER_VNOM))</div><div class='add'>+		p_dev-&gt;conf.Vpp = dflt-&gt;vpp1.param[CISTPL_POWER_VNOM]/10000;</div><div class='add'>+</div><div class='add'>+	/* Do we need to allocate an interrupt? */</div><div class='add'>+	if (cfg-&gt;irq.IRQInfo1 || dflt-&gt;irq.IRQInfo1)</div><div class='add'>+		p_dev-&gt;conf.Attributes |= CONF_ENABLE_IRQ;</div><div class='add'>+</div><div class='add'>+	/* IO window settings */</div><div class='add'>+	p_dev-&gt;io.NumPorts1 = p_dev-&gt;io.NumPorts2 = 0;</div><div class='add'>+	if ((cfg-&gt;io.nwin &gt; 0) || (dflt-&gt;io.nwin &gt; 0)) {</div><div class='add'>+		cistpl_io_t *io = (cfg-&gt;io.nwin) ? &amp;cfg-&gt;io : &amp;dflt-&gt;io;</div><div class='add'>+		p_dev-&gt;io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;</div><div class='add'>+		if (!(io-&gt;flags &amp; CISTPL_IO_8BIT))</div><div class='add'>+			p_dev-&gt;io.Attributes1 = IO_DATA_PATH_WIDTH_16;</div><div class='add'>+		if (!(io-&gt;flags &amp; CISTPL_IO_16BIT))</div><div class='add'>+			p_dev-&gt;io.Attributes1 = IO_DATA_PATH_WIDTH_8;</div><div class='add'>+		p_dev-&gt;io.BasePort1 = io-&gt;win[0].base;</div><div class='add'>+		p_dev-&gt;io.NumPorts1 = io-&gt;win[0].len;</div><div class='add'>+		if (io-&gt;nwin &gt; 1) {</div><div class='add'>+			p_dev-&gt;io.Attributes2 = p_dev-&gt;io.Attributes1;</div><div class='add'>+			p_dev-&gt;io.BasePort2 = io-&gt;win[1].base;</div><div class='add'>+			p_dev-&gt;io.NumPorts2 = io-&gt;win[1].len;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* This reserves IO space but doesn't actually enable it */</div><div class='add'>+	return pcmcia_request_io(p_dev, &amp;p_dev-&gt;io);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int atmel_config(struct pcmcia_device *link)</div><div class='ctx'> {</div><div class='del'>-	tuple_t tuple;</div><div class='del'>-	cisparse_t parse;</div><div class='ctx'> 	local_info_t *dev;</div><div class='ctx'> 	int last_fn, last_ret;</div><div class='del'>-	u_char buf[64];</div><div class='ctx'> 	struct pcmcia_device_id *did;</div><div class='ctx'> </div><div class='ctx'> 	dev = link-&gt;priv;</div><div class='hunk'>@@ -238,11 +283,6 @@ static int atmel_config(struct pcmcia_device *link)</div><div class='ctx'> </div><div class='ctx'> 	DEBUG(0, "atmel_config(0x%p)\n", link);</div><div class='ctx'> </div><div class='del'>-	tuple.Attributes = 0;</div><div class='del'>-	tuple.TupleData = buf;</div><div class='del'>-	tuple.TupleDataMax = sizeof(buf);</div><div class='del'>-	tuple.TupleOffset = 0;</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	  In this loop, we scan the CIS for configuration table entries,</div><div class='ctx'> 	  each of which describes a valid card configuration, including</div><div class='hunk'>@@ -255,66 +295,8 @@ static int atmel_config(struct pcmcia_device *link)</div><div class='ctx'> 	  these things without consulting the CIS, and most client drivers</div><div class='ctx'> 	  will only use the CIS to fill in implementation-defined details.</div><div class='ctx'> 	*/</div><div class='del'>-	tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;</div><div class='del'>-	CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &amp;tuple));</div><div class='del'>-	while (1) {</div><div class='del'>-		cistpl_cftable_entry_t dflt = { 0 };</div><div class='del'>-		cistpl_cftable_entry_t *cfg = &amp;(parse.cftable_entry);</div><div class='del'>-		if (pcmcia_get_tuple_data(link, &amp;tuple) != 0 ||</div><div class='del'>-				pcmcia_parse_tuple(link, &amp;tuple, &amp;parse) != 0)</div><div class='del'>-			goto next_entry;</div><div class='del'>-</div><div class='del'>-		if (cfg-&gt;flags &amp; CISTPL_CFTABLE_DEFAULT) dflt = *cfg;</div><div class='del'>-		if (cfg-&gt;index == 0) goto next_entry;</div><div class='del'>-		link-&gt;conf.ConfigIndex = cfg-&gt;index;</div><div class='del'>-</div><div class='del'>-		/* Does this card need audio output? */</div><div class='del'>-		if (cfg-&gt;flags &amp; CISTPL_CFTABLE_AUDIO) {</div><div class='del'>-			link-&gt;conf.Attributes |= CONF_ENABLE_SPKR;</div><div class='del'>-			link-&gt;conf.Status = CCSR_AUDIO_ENA;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Use power settings for Vcc and Vpp if present */</div><div class='del'>-		/*  Note that the CIS values need to be rescaled */</div><div class='del'>-		if (cfg-&gt;vpp1.present &amp; (1&lt;&lt;CISTPL_POWER_VNOM))</div><div class='del'>-			link-&gt;conf.Vpp =</div><div class='del'>-				cfg-&gt;vpp1.param[CISTPL_POWER_VNOM]/10000;</div><div class='del'>-		else if (dflt.vpp1.present &amp; (1&lt;&lt;CISTPL_POWER_VNOM))</div><div class='del'>-			link-&gt;conf.Vpp =</div><div class='del'>-				dflt.vpp1.param[CISTPL_POWER_VNOM]/10000;</div><div class='del'>-</div><div class='del'>-		/* Do we need to allocate an interrupt? */</div><div class='del'>-		if (cfg-&gt;irq.IRQInfo1 || dflt.irq.IRQInfo1)</div><div class='del'>-			link-&gt;conf.Attributes |= CONF_ENABLE_IRQ;</div><div class='del'>-</div><div class='del'>-		/* IO window settings */</div><div class='del'>-		link-&gt;io.NumPorts1 = link-&gt;io.NumPorts2 = 0;</div><div class='del'>-		if ((cfg-&gt;io.nwin &gt; 0) || (dflt.io.nwin &gt; 0)) {</div><div class='del'>-			cistpl_io_t *io = (cfg-&gt;io.nwin) ? &amp;cfg-&gt;io : &amp;dflt.io;</div><div class='del'>-			link-&gt;io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;</div><div class='del'>-			if (!(io-&gt;flags &amp; CISTPL_IO_8BIT))</div><div class='del'>-				link-&gt;io.Attributes1 = IO_DATA_PATH_WIDTH_16;</div><div class='del'>-			if (!(io-&gt;flags &amp; CISTPL_IO_16BIT))</div><div class='del'>-				link-&gt;io.Attributes1 = IO_DATA_PATH_WIDTH_8;</div><div class='del'>-			link-&gt;io.BasePort1 = io-&gt;win[0].base;</div><div class='del'>-			link-&gt;io.NumPorts1 = io-&gt;win[0].len;</div><div class='del'>-			if (io-&gt;nwin &gt; 1) {</div><div class='del'>-				link-&gt;io.Attributes2 = link-&gt;io.Attributes1;</div><div class='del'>-				link-&gt;io.BasePort2 = io-&gt;win[1].base;</div><div class='del'>-				link-&gt;io.NumPorts2 = io-&gt;win[1].len;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* This reserves IO space but doesn't actually enable it */</div><div class='del'>-		if (pcmcia_request_io(link, &amp;link-&gt;io) != 0)</div><div class='del'>-			goto next_entry;</div><div class='del'>-</div><div class='del'>-		/* If we got this far, we're cool! */</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	next_entry:</div><div class='del'>-		CS_CHECK(GetNextTuple, pcmcia_get_next_tuple(link, &amp;tuple));</div><div class='del'>-	}</div><div class='add'>+	if (pcmcia_loop_config(link, atmel_config_check, NULL))</div><div class='add'>+		goto failed;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	  Allocate an interrupt line.  Note that this does not assign a</div><div class='hunk'>@@ -360,6 +342,7 @@ static int atmel_config(struct pcmcia_device *link)</div><div class='ctx'> </div><div class='ctx'>  cs_failed:</div><div class='ctx'> 	cs_error(link, last_fn, last_ret);</div><div class='add'>+ failed:</div><div class='ctx'> 	atmel_release(link);</div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/b43/Kconfig b/drivers/net/wireless/b43/Kconfig<br/>index 1fa043d1802c..1f81d36f87c5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/b43/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/b43/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/b43/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/b43/Kconfig</a></div><div class='hunk'>@@ -80,6 +80,18 @@ config B43_NPHY</div><div class='ctx'> </div><div class='ctx'> 	  SAY N.</div><div class='ctx'> </div><div class='add'>+config B43_PHY_LP</div><div class='add'>+	bool "IEEE 802.11g LP-PHY support (BROKEN)"</div><div class='add'>+	depends on B43 &amp;&amp; EXPERIMENTAL &amp;&amp; BROKEN</div><div class='add'>+	---help---</div><div class='add'>+	  Support for the LP-PHY.</div><div class='add'>+	  The LP-PHY is an IEEE 802.11g based PHY built into some notebooks</div><div class='add'>+	  and embedded devices.</div><div class='add'>+</div><div class='add'>+	  THIS IS BROKEN AND DOES NOT WORK YET.</div><div class='add'>+</div><div class='add'>+	  SAY N.</div><div class='add'>+</div><div class='ctx'> # This config option automatically enables b43 LEDS support,</div><div class='ctx'> # if it's possible.</div><div class='ctx'> config B43_LEDS</div><div class='head'>diff --git a/drivers/net/wireless/b43/Makefile b/drivers/net/wireless/b43/Makefile<br/>index 8c52b0b9862a..14a02b3aea53 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/b43/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/b43/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/b43/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/b43/Makefile</a></div><div class='hunk'>@@ -1,8 +1,11 @@</div><div class='ctx'> b43-y				+= main.o</div><div class='ctx'> b43-y				+= tables.o</div><div class='ctx'> b43-$(CONFIG_B43_NPHY)		+= tables_nphy.o</div><div class='del'>-b43-y				+= phy.o</div><div class='del'>-b43-$(CONFIG_B43_NPHY)		+= nphy.o</div><div class='add'>+b43-y				+= phy_common.o</div><div class='add'>+b43-y				+= phy_g.o</div><div class='add'>+b43-y				+= phy_a.o</div><div class='add'>+b43-$(CONFIG_B43_NPHY)		+= phy_n.o</div><div class='add'>+b43-$(CONFIG_B43_PHY_LP)	+= phy_lp.o</div><div class='ctx'> b43-y				+= sysfs.o</div><div class='ctx'> b43-y				+= xmit.o</div><div class='ctx'> b43-y				+= lo.o</div><div class='head'>diff --git a/drivers/net/wireless/b43/b43.h b/drivers/net/wireless/b43/b43.h<br/>index edcdfa366452..427b8203e3f9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/b43/b43.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/b43/b43.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/b43/b43.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/b43/b43.h</a></div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> #include "leds.h"</div><div class='ctx'> #include "rfkill.h"</div><div class='ctx'> #include "lo.h"</div><div class='del'>-#include "phy.h"</div><div class='add'>+#include "phy_common.h"</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* The unique identifier of the firmware that's officially supported by</div><div class='hunk'>@@ -173,6 +173,11 @@ enum {</div><div class='ctx'> #define B43_SHM_SH_CHAN			0x00A0	/* Current channel (low 8bit only) */</div><div class='ctx'> #define  B43_SHM_SH_CHAN_5GHZ		0x0100	/* Bit set, if 5Ghz channel */</div><div class='ctx'> #define B43_SHM_SH_BCMCFIFOID		0x0108	/* Last posted cookie to the bcast/mcast FIFO */</div><div class='add'>+/* TSSI information */</div><div class='add'>+#define B43_SHM_SH_TSSI_CCK		0x0058	/* TSSI for last 4 CCK frames (32bit) */</div><div class='add'>+#define B43_SHM_SH_TSSI_OFDM_A		0x0068	/* TSSI for last 4 OFDM frames (32bit) */</div><div class='add'>+#define B43_SHM_SH_TSSI_OFDM_G		0x0070	/* TSSI for last 4 OFDM frames (32bit) */</div><div class='add'>+#define  B43_TSSI_MAX			0x7F	/* Max value for one TSSI value */</div><div class='ctx'> /* SHM_SHARED TX FIFO variables */</div><div class='ctx'> #define B43_SHM_SH_SIZE01		0x0098	/* TX FIFO size for FIFO 0 (low) and 1 (high) */</div><div class='ctx'> #define B43_SHM_SH_SIZE23		0x009A	/* TX FIFO size for FIFO 2 and 3 */</div><div class='hunk'>@@ -508,122 +513,6 @@ struct b43_iv {</div><div class='ctx'> } __attribute__((__packed__));</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-struct b43_phy {</div><div class='del'>-	/* Band support flags. */</div><div class='del'>-	bool supports_2ghz;</div><div class='del'>-	bool supports_5ghz;</div><div class='del'>-</div><div class='del'>-	/* GMODE bit enabled? */</div><div class='del'>-	bool gmode;</div><div class='del'>-</div><div class='del'>-	/* Analog Type */</div><div class='del'>-	u8 analog;</div><div class='del'>-	/* B43_PHYTYPE_ */</div><div class='del'>-	u8 type;</div><div class='del'>-	/* PHY revision number. */</div><div class='del'>-	u8 rev;</div><div class='del'>-</div><div class='del'>-	/* Radio versioning */</div><div class='del'>-	u16 radio_manuf;	/* Radio manufacturer */</div><div class='del'>-	u16 radio_ver;		/* Radio version */</div><div class='del'>-	u8 radio_rev;		/* Radio revision */</div><div class='del'>-</div><div class='del'>-	bool dyn_tssi_tbl;	/* tssi2dbm is kmalloc()ed. */</div><div class='del'>-</div><div class='del'>-	/* ACI (adjacent channel interference) flags. */</div><div class='del'>-	bool aci_enable;</div><div class='del'>-	bool aci_wlan_automatic;</div><div class='del'>-	bool aci_hw_rssi;</div><div class='del'>-</div><div class='del'>-	/* Radio switched on/off */</div><div class='del'>-	bool radio_on;</div><div class='del'>-	struct {</div><div class='del'>-		/* Values saved when turning the radio off.</div><div class='del'>-		 * They are needed when turning it on again. */</div><div class='del'>-		bool valid;</div><div class='del'>-		u16 rfover;</div><div class='del'>-		u16 rfoverval;</div><div class='del'>-	} radio_off_context;</div><div class='del'>-</div><div class='del'>-	u16 minlowsig[2];</div><div class='del'>-	u16 minlowsigpos[2];</div><div class='del'>-</div><div class='del'>-	/* TSSI to dBm table in use */</div><div class='del'>-	const s8 *tssi2dbm;</div><div class='del'>-	/* Target idle TSSI */</div><div class='del'>-	int tgt_idle_tssi;</div><div class='del'>-	/* Current idle TSSI */</div><div class='del'>-	int cur_idle_tssi;</div><div class='del'>-</div><div class='del'>-	/* LocalOscillator control values. */</div><div class='del'>-	struct b43_txpower_lo_control *lo_control;</div><div class='del'>-	/* Values from b43_calc_loopback_gain() */</div><div class='del'>-	s16 max_lb_gain;	/* Maximum Loopback gain in hdB */</div><div class='del'>-	s16 trsw_rx_gain;	/* TRSW RX gain in hdB */</div><div class='del'>-	s16 lna_lod_gain;	/* LNA lod */</div><div class='del'>-	s16 lna_gain;		/* LNA */</div><div class='del'>-	s16 pga_gain;		/* PGA */</div><div class='del'>-</div><div class='del'>-	/* Desired TX power level (in dBm).</div><div class='del'>-	 * This is set by the user and adjusted in b43_phy_xmitpower(). */</div><div class='del'>-	u8 power_level;</div><div class='del'>-	/* A-PHY TX Power control value. */</div><div class='del'>-	u16 txpwr_offset;</div><div class='del'>-</div><div class='del'>-	/* Current TX power level attenuation control values */</div><div class='del'>-	struct b43_bbatt bbatt;</div><div class='del'>-	struct b43_rfatt rfatt;</div><div class='del'>-	u8 tx_control;		/* B43_TXCTL_XXX */</div><div class='del'>-</div><div class='del'>-	/* Hardware Power Control enabled? */</div><div class='del'>-	bool hardware_power_control;</div><div class='del'>-</div><div class='del'>-	/* Current Interference Mitigation mode */</div><div class='del'>-	int interfmode;</div><div class='del'>-	/* Stack of saved values from the Interference Mitigation code.</div><div class='del'>-	 * Each value in the stack is layed out as follows:</div><div class='del'>-	 * bit 0-11:  offset</div><div class='del'>-	 * bit 12-15: register ID</div><div class='del'>-	 * bit 16-32: value</div><div class='del'>-	 * register ID is: 0x1 PHY, 0x2 Radio, 0x3 ILT</div><div class='del'>-	 */</div><div class='del'>-#define B43_INTERFSTACK_SIZE	26</div><div class='del'>-	u32 interfstack[B43_INTERFSTACK_SIZE];	//FIXME: use a data structure</div><div class='del'>-</div><div class='del'>-	/* Saved values from the NRSSI Slope calculation */</div><div class='del'>-	s16 nrssi[2];</div><div class='del'>-	s32 nrssislope;</div><div class='del'>-	/* In memory nrssi lookup table. */</div><div class='del'>-	s8 nrssi_lt[64];</div><div class='del'>-</div><div class='del'>-	/* current channel */</div><div class='del'>-	u8 channel;</div><div class='del'>-</div><div class='del'>-	u16 lofcal;</div><div class='del'>-</div><div class='del'>-	u16 initval;		//FIXME rename?</div><div class='del'>-</div><div class='del'>-	/* PHY TX errors counter. */</div><div class='del'>-	atomic_t txerr_cnt;</div><div class='del'>-</div><div class='del'>-	/* The device does address auto increment for the OFDM tables.</div><div class='del'>-	 * We cache the previously used address here and omit the address</div><div class='del'>-	 * write on the next table access, if possible. */</div><div class='del'>-	u16 ofdmtab_addr; /* The address currently set in hardware. */</div><div class='del'>-	enum { /* The last data flow direction. */</div><div class='del'>-		B43_OFDMTAB_DIRECTION_UNKNOWN = 0,</div><div class='del'>-		B43_OFDMTAB_DIRECTION_READ,</div><div class='del'>-		B43_OFDMTAB_DIRECTION_WRITE,</div><div class='del'>-	} ofdmtab_addr_direction;</div><div class='del'>-</div><div class='del'>-#if B43_DEBUG</div><div class='del'>-	/* Manual TX-power control enabled? */</div><div class='del'>-	bool manual_txpower_control;</div><div class='del'>-	/* PHY registers locked by b43_phy_lock()? */</div><div class='del'>-	bool phy_locked;</div><div class='del'>-#endif /* B43_DEBUG */</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /* Data structures for DMA transmission, per 80211 core. */</div><div class='ctx'> struct b43_dma {</div><div class='ctx'> 	struct b43_dmaring *tx_ring_AC_BK; /* Background */</div><div class='hunk'>@@ -680,7 +569,7 @@ struct b43_key {</div><div class='ctx'> #define B43_QOS_VOICE		B43_QOS_PARAMS(3)</div><div class='ctx'> </div><div class='ctx'> /* QOS parameter hardware data structure offsets. */</div><div class='del'>-#define B43_NR_QOSPARAMS	22</div><div class='add'>+#define B43_NR_QOSPARAMS	16</div><div class='ctx'> enum {</div><div class='ctx'> 	B43_QOSPARAM_TXOP = 0,</div><div class='ctx'> 	B43_QOSPARAM_CWMIN,</div><div class='hunk'>@@ -696,8 +585,6 @@ enum {</div><div class='ctx'> struct b43_qos_params {</div><div class='ctx'> 	/* The QOS parameters */</div><div class='ctx'> 	struct ieee80211_tx_queue_params p;</div><div class='del'>-	/* Does this need to get uploaded to hardware? */</div><div class='del'>-	bool need_hw_update;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct b43_wldev;</div><div class='hunk'>@@ -759,11 +646,13 @@ struct b43_wl {</div><div class='ctx'> 	bool beacon_templates_virgin; /* Never wrote the templates? */</div><div class='ctx'> 	struct work_struct beacon_update_trigger;</div><div class='ctx'> </div><div class='del'>-	/* The current QOS parameters for the 4 queues.</div><div class='del'>-	 * This is protected by the irq_lock. */</div><div class='add'>+	/* The current QOS parameters for the 4 queues. */</div><div class='ctx'> 	struct b43_qos_params qos_params[4];</div><div class='del'>-	/* Workqueue for updating QOS parameters in hardware. */</div><div class='del'>-	struct work_struct qos_update_work;</div><div class='add'>+</div><div class='add'>+	/* Work for adjustment of the transmission power.</div><div class='add'>+	 * This is scheduled when we determine that the actual TX output</div><div class='add'>+	 * power doesn't match what we want. */</div><div class='add'>+	struct work_struct txpower_adjust_work;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* In-memory representation of a cached microcode file. */</div><div class='hunk'>@@ -908,6 +797,15 @@ static inline int b43_is_mode(struct b43_wl *wl, int type)</div><div class='ctx'> 	return (wl-&gt;operating &amp;&amp; wl-&gt;if_type == type);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * b43_current_band - Returns the currently used band.</div><div class='add'>+ * Returns one of IEEE80211_BAND_2GHZ and IEEE80211_BAND_5GHZ.</div><div class='add'>+ */</div><div class='add'>+static inline enum ieee80211_band b43_current_band(struct b43_wl *wl)</div><div class='add'>+{</div><div class='add'>+	return wl-&gt;hw-&gt;conf.channel-&gt;band;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline u16 b43_read16(struct b43_wldev *dev, u16 offset)</div><div class='ctx'> {</div><div class='ctx'> 	return ssb_read16(dev-&gt;dev, offset);</div><div class='head'>diff --git a/drivers/net/wireless/b43/debugfs.c b/drivers/net/wireless/b43/debugfs.c<br/>index 29851bc1101f..06a01da80160 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/b43/debugfs.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/b43/debugfs.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/b43/debugfs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/b43/debugfs.c</a></div><div class='hunk'>@@ -443,76 +443,6 @@ out_unlock:</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t txpower_g_read_file(struct b43_wldev *dev,</div><div class='del'>-				   char *buf, size_t bufsize)</div><div class='del'>-{</div><div class='del'>-	ssize_t count = 0;</div><div class='del'>-</div><div class='del'>-	if (dev-&gt;phy.type != B43_PHYTYPE_G) {</div><div class='del'>-		fappend("Device is not a G-PHY\n");</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-	fappend("Control:               %s\n", dev-&gt;phy.manual_txpower_control ?</div><div class='del'>-		"MANUAL" : "AUTOMATIC");</div><div class='del'>-	fappend("Baseband attenuation:  %u\n", dev-&gt;phy.bbatt.att);</div><div class='del'>-	fappend("Radio attenuation:     %u\n", dev-&gt;phy.rfatt.att);</div><div class='del'>-	fappend("TX Mixer Gain:         %s\n",</div><div class='del'>-		(dev-&gt;phy.tx_control &amp; B43_TXCTL_TXMIX) ? "ON" : "OFF");</div><div class='del'>-	fappend("PA Gain 2dB:           %s\n",</div><div class='del'>-		(dev-&gt;phy.tx_control &amp; B43_TXCTL_PA2DB) ? "ON" : "OFF");</div><div class='del'>-	fappend("PA Gain 3dB:           %s\n",</div><div class='del'>-		(dev-&gt;phy.tx_control &amp; B43_TXCTL_PA3DB) ? "ON" : "OFF");</div><div class='del'>-	fappend("\n\n");</div><div class='del'>-	fappend("You can write to this file:\n");</div><div class='del'>-	fappend("Writing \"auto\" enables automatic txpower control.\n");</div><div class='del'>-	fappend</div><div class='del'>-	    ("Writing the attenuation values as \"bbatt rfatt txmix pa2db pa3db\" "</div><div class='del'>-	     "enables manual txpower control.\n");</div><div class='del'>-	fappend("Example: 5 4 0 0 1\n");</div><div class='del'>-	fappend("Enables manual control with Baseband attenuation 5, "</div><div class='del'>-		"Radio attenuation 4, No TX Mixer Gain, "</div><div class='del'>-		"No PA Gain 2dB, With PA Gain 3dB.\n");</div><div class='del'>-out:</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int txpower_g_write_file(struct b43_wldev *dev,</div><div class='del'>-				const char *buf, size_t count)</div><div class='del'>-{</div><div class='del'>-	if (dev-&gt;phy.type != B43_PHYTYPE_G)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	if ((count &gt;= 4) &amp;&amp; (memcmp(buf, "auto", 4) == 0)) {</div><div class='del'>-		/* Automatic control */</div><div class='del'>-		dev-&gt;phy.manual_txpower_control = 0;</div><div class='del'>-		b43_phy_xmitpower(dev);</div><div class='del'>-	} else {</div><div class='del'>-		int bbatt = 0, rfatt = 0, txmix = 0, pa2db = 0, pa3db = 0;</div><div class='del'>-		/* Manual control */</div><div class='del'>-		if (sscanf(buf, "%d %d %d %d %d", &amp;bbatt, &amp;rfatt,</div><div class='del'>-			   &amp;txmix, &amp;pa2db, &amp;pa3db) != 5)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		b43_put_attenuation_into_ranges(dev, &amp;bbatt, &amp;rfatt);</div><div class='del'>-		dev-&gt;phy.manual_txpower_control = 1;</div><div class='del'>-		dev-&gt;phy.bbatt.att = bbatt;</div><div class='del'>-		dev-&gt;phy.rfatt.att = rfatt;</div><div class='del'>-		dev-&gt;phy.tx_control = 0;</div><div class='del'>-		if (txmix)</div><div class='del'>-			dev-&gt;phy.tx_control |= B43_TXCTL_TXMIX;</div><div class='del'>-		if (pa2db)</div><div class='del'>-			dev-&gt;phy.tx_control |= B43_TXCTL_PA2DB;</div><div class='del'>-		if (pa3db)</div><div class='del'>-			dev-&gt;phy.tx_control |= B43_TXCTL_PA3DB;</div><div class='del'>-		b43_phy_lock(dev);</div><div class='del'>-		b43_radio_lock(dev);</div><div class='del'>-		b43_set_txpower_g(dev, &amp;dev-&gt;phy.bbatt,</div><div class='del'>-				  &amp;dev-&gt;phy.rfatt, dev-&gt;phy.tx_control);</div><div class='del'>-		b43_radio_unlock(dev);</div><div class='del'>-		b43_phy_unlock(dev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* wl-&gt;irq_lock is locked */</div><div class='ctx'> static int restart_write_file(struct b43_wldev *dev,</div><div class='ctx'> 			      const char *buf, size_t count)</div><div class='hunk'>@@ -560,7 +490,7 @@ static ssize_t loctls_read_file(struct b43_wldev *dev,</div><div class='ctx'> 		err = -ENODEV;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	lo = phy-&gt;lo_control;</div><div class='add'>+	lo = phy-&gt;g-&gt;lo_control;</div><div class='ctx'> 	fappend("-- Local Oscillator calibration data --\n\n");</div><div class='ctx'> 	fappend("HW-power-control enabled: %d\n",</div><div class='ctx'> 		dev-&gt;phy.hardware_power_control);</div><div class='hunk'>@@ -578,8 +508,8 @@ static ssize_t loctls_read_file(struct b43_wldev *dev,</div><div class='ctx'> 	list_for_each_entry(cal, &amp;lo-&gt;calib_list, list) {</div><div class='ctx'> 		bool active;</div><div class='ctx'> </div><div class='del'>-		active = (b43_compare_bbatt(&amp;cal-&gt;bbatt, &amp;phy-&gt;bbatt) &amp;&amp;</div><div class='del'>-			  b43_compare_rfatt(&amp;cal-&gt;rfatt, &amp;phy-&gt;rfatt));</div><div class='add'>+		active = (b43_compare_bbatt(&amp;cal-&gt;bbatt, &amp;phy-&gt;g-&gt;bbatt) &amp;&amp;</div><div class='add'>+			  b43_compare_rfatt(&amp;cal-&gt;rfatt, &amp;phy-&gt;g-&gt;rfatt));</div><div class='ctx'> 		fappend("BB(%d), RF(%d,%d)  -&gt;  I=%d, Q=%d  "</div><div class='ctx'> 			"(expires in %lu sec)%s\n",</div><div class='ctx'> 			cal-&gt;bbatt.att,</div><div class='hunk'>@@ -763,7 +693,6 @@ B43_DEBUGFS_FOPS(mmio32read, mmio32read__read_file, mmio32read__write_file, 1);</div><div class='ctx'> B43_DEBUGFS_FOPS(mmio32write, NULL, mmio32write__write_file, 1);</div><div class='ctx'> B43_DEBUGFS_FOPS(tsf, tsf_read_file, tsf_write_file, 1);</div><div class='ctx'> B43_DEBUGFS_FOPS(txstat, txstat_read_file, NULL, 0);</div><div class='del'>-B43_DEBUGFS_FOPS(txpower_g, txpower_g_read_file, txpower_g_write_file, 0);</div><div class='ctx'> B43_DEBUGFS_FOPS(restart, NULL, restart_write_file, 1);</div><div class='ctx'> B43_DEBUGFS_FOPS(loctls, loctls_read_file, NULL, 0);</div><div class='ctx'> </div><div class='hunk'>@@ -877,7 +806,6 @@ void b43_debugfs_add_device(struct b43_wldev *dev)</div><div class='ctx'> 	ADD_FILE(mmio32write, 0200);</div><div class='ctx'> 	ADD_FILE(tsf, 0600);</div><div class='ctx'> 	ADD_FILE(txstat, 0400);</div><div class='del'>-	ADD_FILE(txpower_g, 0600);</div><div class='ctx'> 	ADD_FILE(restart, 0200);</div><div class='ctx'> 	ADD_FILE(loctls, 0400);</div><div class='ctx'> </div><div class='hunk'>@@ -907,7 +835,6 @@ void b43_debugfs_remove_device(struct b43_wldev *dev)</div><div class='ctx'> 	debugfs_remove(e-&gt;file_mmio32write.dentry);</div><div class='ctx'> 	debugfs_remove(e-&gt;file_tsf.dentry);</div><div class='ctx'> 	debugfs_remove(e-&gt;file_txstat.dentry);</div><div class='del'>-	debugfs_remove(e-&gt;file_txpower_g.dentry);</div><div class='ctx'> 	debugfs_remove(e-&gt;file_restart.dentry);</div><div class='ctx'> 	debugfs_remove(e-&gt;file_loctls.dentry);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/b43/lo.c b/drivers/net/wireless/b43/lo.c<br/>index 9c854d6aae36..6a18a1470465 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/b43/lo.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/b43/lo.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/b43/lo.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/b43/lo.c</a></div><div class='hunk'>@@ -29,7 +29,7 @@</div><div class='ctx'> </div><div class='ctx'> #include "b43.h"</div><div class='ctx'> #include "lo.h"</div><div class='del'>-#include "phy.h"</div><div class='add'>+#include "phy_g.h"</div><div class='ctx'> #include "main.h"</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='hunk'>@@ -174,7 +174,8 @@ static u16 lo_txctl_register_table(struct b43_wldev *dev,</div><div class='ctx'> static void lo_measure_txctl_values(struct b43_wldev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='del'>-	struct b43_txpower_lo_control *lo = phy-&gt;lo_control;</div><div class='add'>+	struct b43_phy_g *gphy = phy-&gt;g;</div><div class='add'>+	struct b43_txpower_lo_control *lo = gphy-&gt;lo_control;</div><div class='ctx'> 	u16 reg, mask;</div><div class='ctx'> 	u16 trsw_rx, pga;</div><div class='ctx'> 	u16 radio_pctl_reg;</div><div class='hunk'>@@ -195,7 +196,7 @@ static void lo_measure_txctl_values(struct b43_wldev *dev)</div><div class='ctx'> 		int lb_gain;	/* Loopback gain (in dB) */</div><div class='ctx'> </div><div class='ctx'> 		trsw_rx = 0;</div><div class='del'>-		lb_gain = phy-&gt;max_lb_gain / 2;</div><div class='add'>+		lb_gain = gphy-&gt;max_lb_gain / 2;</div><div class='ctx'> 		if (lb_gain &gt; 10) {</div><div class='ctx'> 			radio_pctl_reg = 0;</div><div class='ctx'> 			pga = abs(10 - lb_gain) / 6;</div><div class='hunk'>@@ -226,7 +227,7 @@ static void lo_measure_txctl_values(struct b43_wldev *dev)</div><div class='ctx'> 	}</div><div class='ctx'> 	b43_radio_write16(dev, 0x43, (b43_radio_read16(dev, 0x43)</div><div class='ctx'> 				      &amp; 0xFFF0) | radio_pctl_reg);</div><div class='del'>-	b43_phy_set_baseband_attenuation(dev, 2);</div><div class='add'>+	b43_gphy_set_baseband_attenuation(dev, 2);</div><div class='ctx'> </div><div class='ctx'> 	reg = lo_txctl_register_table(dev, &amp;mask, NULL);</div><div class='ctx'> 	mask = ~mask;</div><div class='hunk'>@@ -277,7 +278,8 @@ static void lo_measure_txctl_values(struct b43_wldev *dev)</div><div class='ctx'> static void lo_read_power_vector(struct b43_wldev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='del'>-	struct b43_txpower_lo_control *lo = phy-&gt;lo_control;</div><div class='add'>+	struct b43_phy_g *gphy = phy-&gt;g;</div><div class='add'>+	struct b43_txpower_lo_control *lo = gphy-&gt;lo_control;</div><div class='ctx'> 	int i;</div><div class='ctx'> 	u64 tmp;</div><div class='ctx'> 	u64 power_vector = 0;</div><div class='hunk'>@@ -298,6 +300,7 @@ static void lo_measure_gain_values(struct b43_wldev *dev,</div><div class='ctx'> 				   s16 max_rx_gain, int use_trsw_rx)</div><div class='ctx'> {</div><div class='ctx'> 	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='add'>+	struct b43_phy_g *gphy = phy-&gt;g;</div><div class='ctx'> 	u16 tmp;</div><div class='ctx'> </div><div class='ctx'> 	if (max_rx_gain &lt; 0)</div><div class='hunk'>@@ -308,7 +311,7 @@ static void lo_measure_gain_values(struct b43_wldev *dev,</div><div class='ctx'> 		int trsw_rx_gain;</div><div class='ctx'> </div><div class='ctx'> 		if (use_trsw_rx) {</div><div class='del'>-			trsw_rx_gain = phy-&gt;trsw_rx_gain / 2;</div><div class='add'>+			trsw_rx_gain = gphy-&gt;trsw_rx_gain / 2;</div><div class='ctx'> 			if (max_rx_gain &gt;= trsw_rx_gain) {</div><div class='ctx'> 				trsw_rx_gain = max_rx_gain - trsw_rx_gain;</div><div class='ctx'> 				trsw_rx = 0x20;</div><div class='hunk'>@@ -316,38 +319,38 @@ static void lo_measure_gain_values(struct b43_wldev *dev,</div><div class='ctx'> 		} else</div><div class='ctx'> 			trsw_rx_gain = max_rx_gain;</div><div class='ctx'> 		if (trsw_rx_gain &lt; 9) {</div><div class='del'>-			phy-&gt;lna_lod_gain = 0;</div><div class='add'>+			gphy-&gt;lna_lod_gain = 0;</div><div class='ctx'> 		} else {</div><div class='del'>-			phy-&gt;lna_lod_gain = 1;</div><div class='add'>+			gphy-&gt;lna_lod_gain = 1;</div><div class='ctx'> 			trsw_rx_gain -= 8;</div><div class='ctx'> 		}</div><div class='ctx'> 		trsw_rx_gain = clamp_val(trsw_rx_gain, 0, 0x2D);</div><div class='del'>-		phy-&gt;pga_gain = trsw_rx_gain / 3;</div><div class='del'>-		if (phy-&gt;pga_gain &gt;= 5) {</div><div class='del'>-			phy-&gt;pga_gain -= 5;</div><div class='del'>-			phy-&gt;lna_gain = 2;</div><div class='add'>+		gphy-&gt;pga_gain = trsw_rx_gain / 3;</div><div class='add'>+		if (gphy-&gt;pga_gain &gt;= 5) {</div><div class='add'>+			gphy-&gt;pga_gain -= 5;</div><div class='add'>+			gphy-&gt;lna_gain = 2;</div><div class='ctx'> 		} else</div><div class='del'>-			phy-&gt;lna_gain = 0;</div><div class='add'>+			gphy-&gt;lna_gain = 0;</div><div class='ctx'> 	} else {</div><div class='del'>-		phy-&gt;lna_gain = 0;</div><div class='del'>-		phy-&gt;trsw_rx_gain = 0x20;</div><div class='add'>+		gphy-&gt;lna_gain = 0;</div><div class='add'>+		gphy-&gt;trsw_rx_gain = 0x20;</div><div class='ctx'> 		if (max_rx_gain &gt;= 0x14) {</div><div class='del'>-			phy-&gt;lna_lod_gain = 1;</div><div class='del'>-			phy-&gt;pga_gain = 2;</div><div class='add'>+			gphy-&gt;lna_lod_gain = 1;</div><div class='add'>+			gphy-&gt;pga_gain = 2;</div><div class='ctx'> 		} else if (max_rx_gain &gt;= 0x12) {</div><div class='del'>-			phy-&gt;lna_lod_gain = 1;</div><div class='del'>-			phy-&gt;pga_gain = 1;</div><div class='add'>+			gphy-&gt;lna_lod_gain = 1;</div><div class='add'>+			gphy-&gt;pga_gain = 1;</div><div class='ctx'> 		} else if (max_rx_gain &gt;= 0xF) {</div><div class='del'>-			phy-&gt;lna_lod_gain = 1;</div><div class='del'>-			phy-&gt;pga_gain = 0;</div><div class='add'>+			gphy-&gt;lna_lod_gain = 1;</div><div class='add'>+			gphy-&gt;pga_gain = 0;</div><div class='ctx'> 		} else {</div><div class='del'>-			phy-&gt;lna_lod_gain = 0;</div><div class='del'>-			phy-&gt;pga_gain = 0;</div><div class='add'>+			gphy-&gt;lna_lod_gain = 0;</div><div class='add'>+			gphy-&gt;pga_gain = 0;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	tmp = b43_radio_read16(dev, 0x7A);</div><div class='del'>-	if (phy-&gt;lna_lod_gain == 0)</div><div class='add'>+	if (gphy-&gt;lna_lod_gain == 0)</div><div class='ctx'> 		tmp &amp;= ~0x0008;</div><div class='ctx'> 	else</div><div class='ctx'> 		tmp |= 0x0008;</div><div class='hunk'>@@ -392,10 +395,11 @@ static void lo_measure_setup(struct b43_wldev *dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct ssb_sprom *sprom = &amp;dev-&gt;dev-&gt;bus-&gt;sprom;</div><div class='ctx'> 	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='del'>-	struct b43_txpower_lo_control *lo = phy-&gt;lo_control;</div><div class='add'>+	struct b43_phy_g *gphy = phy-&gt;g;</div><div class='add'>+	struct b43_txpower_lo_control *lo = gphy-&gt;lo_control;</div><div class='ctx'> 	u16 tmp;</div><div class='ctx'> </div><div class='del'>-	if (b43_has_hardware_pctl(phy)) {</div><div class='add'>+	if (b43_has_hardware_pctl(dev)) {</div><div class='ctx'> 		sav-&gt;phy_lo_mask = b43_phy_read(dev, B43_PHY_LO_MASK);</div><div class='ctx'> 		sav-&gt;phy_extg_01 = b43_phy_read(dev, B43_PHY_EXTG(0x01));</div><div class='ctx'> 		sav-&gt;phy_dacctl_hwpctl = b43_phy_read(dev, B43_PHY_DACCTL);</div><div class='hunk'>@@ -496,7 +500,7 @@ static void lo_measure_setup(struct b43_wldev *dev,</div><div class='ctx'> 		b43_phy_write(dev, B43_PHY_CCK(0x2B), 0x0802);</div><div class='ctx'> 	if (phy-&gt;rev &gt;= 2)</div><div class='ctx'> 		b43_dummy_transmission(dev);</div><div class='del'>-	b43_radio_selectchannel(dev, 6, 0);</div><div class='add'>+	b43_gphy_channel_switch(dev, 6, 0);</div><div class='ctx'> 	b43_radio_read16(dev, 0x51);	/* dummy read */</div><div class='ctx'> 	if (phy-&gt;type == B43_PHYTYPE_G)</div><div class='ctx'> 		b43_phy_write(dev, B43_PHY_CCK(0x2F), 0);</div><div class='hunk'>@@ -520,18 +524,19 @@ static void lo_measure_restore(struct b43_wldev *dev,</div><div class='ctx'> 			       struct lo_g_saved_values *sav)</div><div class='ctx'> {</div><div class='ctx'> 	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='add'>+	struct b43_phy_g *gphy = phy-&gt;g;</div><div class='ctx'> 	u16 tmp;</div><div class='ctx'> </div><div class='ctx'> 	if (phy-&gt;rev &gt;= 2) {</div><div class='ctx'> 		b43_phy_write(dev, B43_PHY_PGACTL, 0xE300);</div><div class='del'>-		tmp = (phy-&gt;pga_gain &lt;&lt; 8);</div><div class='add'>+		tmp = (gphy-&gt;pga_gain &lt;&lt; 8);</div><div class='ctx'> 		b43_phy_write(dev, B43_PHY_RFOVERVAL, tmp | 0xA0);</div><div class='ctx'> 		udelay(5);</div><div class='ctx'> 		b43_phy_write(dev, B43_PHY_RFOVERVAL, tmp | 0xA2);</div><div class='ctx'> 		udelay(2);</div><div class='ctx'> 		b43_phy_write(dev, B43_PHY_RFOVERVAL, tmp | 0xA3);</div><div class='ctx'> 	} else {</div><div class='del'>-		tmp = (phy-&gt;pga_gain | 0xEFA0);</div><div class='add'>+		tmp = (gphy-&gt;pga_gain | 0xEFA0);</div><div class='ctx'> 		b43_phy_write(dev, B43_PHY_PGACTL, tmp);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (phy-&gt;type == B43_PHYTYPE_G) {</div><div class='hunk'>@@ -572,7 +577,7 @@ static void lo_measure_restore(struct b43_wldev *dev,</div><div class='ctx'> 		b43_phy_write(dev, B43_PHY_CCK(0x3E), sav-&gt;phy_cck_3E);</div><div class='ctx'> 		b43_phy_write(dev, B43_PHY_CRS0, sav-&gt;phy_crs0);</div><div class='ctx'> 	}</div><div class='del'>-	if (b43_has_hardware_pctl(phy)) {</div><div class='add'>+	if (b43_has_hardware_pctl(dev)) {</div><div class='ctx'> 		tmp = (sav-&gt;phy_lo_mask &amp; 0xBFFF);</div><div class='ctx'> 		b43_phy_write(dev, B43_PHY_LO_MASK, tmp);</div><div class='ctx'> 		b43_phy_write(dev, B43_PHY_EXTG(0x01), sav-&gt;phy_extg_01);</div><div class='hunk'>@@ -580,7 +585,7 @@ static void lo_measure_restore(struct b43_wldev *dev,</div><div class='ctx'> 		b43_phy_write(dev, B43_PHY_CCK(0x14), sav-&gt;phy_cck_14);</div><div class='ctx'> 		b43_phy_write(dev, B43_PHY_HPWR_TSSICTL, sav-&gt;phy_hpwr_tssictl);</div><div class='ctx'> 	}</div><div class='del'>-	b43_radio_selectchannel(dev, sav-&gt;old_channel, 1);</div><div class='add'>+	b43_gphy_channel_switch(dev, sav-&gt;old_channel, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct b43_lo_g_statemachine {</div><div class='hunk'>@@ -597,6 +602,7 @@ static int lo_probe_possible_loctls(struct b43_wldev *dev,</div><div class='ctx'> 				    struct b43_lo_g_statemachine *d)</div><div class='ctx'> {</div><div class='ctx'> 	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='add'>+	struct b43_phy_g *gphy = phy-&gt;g;</div><div class='ctx'> 	struct b43_loctl test_loctl;</div><div class='ctx'> 	struct b43_loctl orig_loctl;</div><div class='ctx'> 	struct b43_loctl prev_loctl = {</div><div class='hunk'>@@ -646,9 +652,9 @@ static int lo_probe_possible_loctls(struct b43_wldev *dev,</div><div class='ctx'> 		     test_loctl.q != prev_loctl.q) &amp;&amp;</div><div class='ctx'> 		    (abs(test_loctl.i) &lt;= 16 &amp;&amp; abs(test_loctl.q) &lt;= 16)) {</div><div class='ctx'> 			b43_lo_write(dev, &amp;test_loctl);</div><div class='del'>-			feedth = lo_measure_feedthrough(dev, phy-&gt;lna_gain,</div><div class='del'>-							phy-&gt;pga_gain,</div><div class='del'>-							phy-&gt;trsw_rx_gain);</div><div class='add'>+			feedth = lo_measure_feedthrough(dev, gphy-&gt;lna_gain,</div><div class='add'>+							gphy-&gt;pga_gain,</div><div class='add'>+							gphy-&gt;trsw_rx_gain);</div><div class='ctx'> 			if (feedth &lt; d-&gt;lowest_feedth) {</div><div class='ctx'> 				memcpy(probe_loctl, &amp;test_loctl,</div><div class='ctx'> 				       sizeof(struct b43_loctl));</div><div class='hunk'>@@ -677,6 +683,7 @@ static void lo_probe_loctls_statemachine(struct b43_wldev *dev,</div><div class='ctx'> 					 int *max_rx_gain)</div><div class='ctx'> {</div><div class='ctx'> 	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='add'>+	struct b43_phy_g *gphy = phy-&gt;g;</div><div class='ctx'> 	struct b43_lo_g_statemachine d;</div><div class='ctx'> 	u16 feedth;</div><div class='ctx'> 	int found_lower;</div><div class='hunk'>@@ -693,17 +700,17 @@ static void lo_probe_loctls_statemachine(struct b43_wldev *dev,</div><div class='ctx'> 		max_repeat = 4;</div><div class='ctx'> 	do {</div><div class='ctx'> 		b43_lo_write(dev, &amp;d.min_loctl);</div><div class='del'>-		feedth = lo_measure_feedthrough(dev, phy-&gt;lna_gain,</div><div class='del'>-						phy-&gt;pga_gain,</div><div class='del'>-						phy-&gt;trsw_rx_gain);</div><div class='add'>+		feedth = lo_measure_feedthrough(dev, gphy-&gt;lna_gain,</div><div class='add'>+						gphy-&gt;pga_gain,</div><div class='add'>+						gphy-&gt;trsw_rx_gain);</div><div class='ctx'> 		if (feedth &lt; 0x258) {</div><div class='ctx'> 			if (feedth &gt;= 0x12C)</div><div class='ctx'> 				*max_rx_gain += 6;</div><div class='ctx'> 			else</div><div class='ctx'> 				*max_rx_gain += 3;</div><div class='del'>-			feedth = lo_measure_feedthrough(dev, phy-&gt;lna_gain,</div><div class='del'>-							phy-&gt;pga_gain,</div><div class='del'>-							phy-&gt;trsw_rx_gain);</div><div class='add'>+			feedth = lo_measure_feedthrough(dev, gphy-&gt;lna_gain,</div><div class='add'>+							gphy-&gt;pga_gain,</div><div class='add'>+							gphy-&gt;trsw_rx_gain);</div><div class='ctx'> 		}</div><div class='ctx'> 		d.lowest_feedth = feedth;</div><div class='ctx'> </div><div class='hunk'>@@ -752,6 +759,7 @@ struct b43_lo_calib * b43_calibrate_lo_setting(struct b43_wldev *dev,</div><div class='ctx'> 					       const struct b43_rfatt *rfatt)</div><div class='ctx'> {</div><div class='ctx'> 	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='add'>+	struct b43_phy_g *gphy = phy-&gt;g;</div><div class='ctx'> 	struct b43_loctl loctl = {</div><div class='ctx'> 		.i = 0,</div><div class='ctx'> 		.q = 0,</div><div class='hunk'>@@ -782,11 +790,11 @@ struct b43_lo_calib * b43_calibrate_lo_setting(struct b43_wldev *dev,</div><div class='ctx'> 	if (rfatt-&gt;with_padmix)</div><div class='ctx'> 		max_rx_gain -= pad_mix_gain;</div><div class='ctx'> 	if (has_loopback_gain(phy))</div><div class='del'>-		max_rx_gain += phy-&gt;max_lb_gain;</div><div class='add'>+		max_rx_gain += gphy-&gt;max_lb_gain;</div><div class='ctx'> 	lo_measure_gain_values(dev, max_rx_gain,</div><div class='ctx'> 			       has_loopback_gain(phy));</div><div class='ctx'> </div><div class='del'>-	b43_phy_set_baseband_attenuation(dev, bbatt-&gt;att);</div><div class='add'>+	b43_gphy_set_baseband_attenuation(dev, bbatt-&gt;att);</div><div class='ctx'> 	lo_probe_loctls_statemachine(dev, &amp;loctl, &amp;max_rx_gain);</div><div class='ctx'> </div><div class='ctx'> 	lo_measure_restore(dev, &amp;saved_regs);</div><div class='hunk'>@@ -820,7 +828,7 @@ struct b43_lo_calib * b43_get_calib_lo_settings(struct b43_wldev *dev,</div><div class='ctx'> 						const struct b43_bbatt *bbatt,</div><div class='ctx'> 						const struct b43_rfatt *rfatt)</div><div class='ctx'> {</div><div class='del'>-	struct b43_txpower_lo_control *lo = dev-&gt;phy.lo_control;</div><div class='add'>+	struct b43_txpower_lo_control *lo = dev-&gt;phy.g-&gt;lo_control;</div><div class='ctx'> 	struct b43_lo_calib *c;</div><div class='ctx'> </div><div class='ctx'> 	c = b43_find_lo_calib(lo, bbatt, rfatt);</div><div class='hunk'>@@ -839,7 +847,8 @@ struct b43_lo_calib * b43_get_calib_lo_settings(struct b43_wldev *dev,</div><div class='ctx'> void b43_gphy_dc_lt_init(struct b43_wldev *dev, bool update_all)</div><div class='ctx'> {</div><div class='ctx'> 	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='del'>-	struct b43_txpower_lo_control *lo = phy-&gt;lo_control;</div><div class='add'>+	struct b43_phy_g *gphy = phy-&gt;g;</div><div class='add'>+	struct b43_txpower_lo_control *lo = gphy-&gt;lo_control;</div><div class='ctx'> 	int i;</div><div class='ctx'> 	int rf_offset, bb_offset;</div><div class='ctx'> 	const struct b43_rfatt *rfatt;</div><div class='hunk'>@@ -917,14 +926,14 @@ static inline void b43_lo_fixup_rfatt(struct b43_rfatt *rf)</div><div class='ctx'> </div><div class='ctx'> void b43_lo_g_adjust(struct b43_wldev *dev)</div><div class='ctx'> {</div><div class='del'>-	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='add'>+	struct b43_phy_g *gphy = dev-&gt;phy.g;</div><div class='ctx'> 	struct b43_lo_calib *cal;</div><div class='ctx'> 	struct b43_rfatt rf;</div><div class='ctx'> </div><div class='del'>-	memcpy(&amp;rf, &amp;phy-&gt;rfatt, sizeof(rf));</div><div class='add'>+	memcpy(&amp;rf, &amp;gphy-&gt;rfatt, sizeof(rf));</div><div class='ctx'> 	b43_lo_fixup_rfatt(&amp;rf);</div><div class='ctx'> </div><div class='del'>-	cal = b43_get_calib_lo_settings(dev, &amp;phy-&gt;bbatt, &amp;rf);</div><div class='add'>+	cal = b43_get_calib_lo_settings(dev, &amp;gphy-&gt;bbatt, &amp;rf);</div><div class='ctx'> 	if (!cal)</div><div class='ctx'> 		return;</div><div class='ctx'> 	b43_lo_write(dev, &amp;cal-&gt;ctl);</div><div class='hunk'>@@ -952,7 +961,8 @@ void b43_lo_g_adjust_to(struct b43_wldev *dev,</div><div class='ctx'> void b43_lo_g_maintanance_work(struct b43_wldev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='del'>-	struct b43_txpower_lo_control *lo = phy-&gt;lo_control;</div><div class='add'>+	struct b43_phy_g *gphy = phy-&gt;g;</div><div class='add'>+	struct b43_txpower_lo_control *lo = gphy-&gt;lo_control;</div><div class='ctx'> 	unsigned long now;</div><div class='ctx'> 	unsigned long expire;</div><div class='ctx'> 	struct b43_lo_calib *cal, *tmp;</div><div class='hunk'>@@ -962,7 +972,7 @@ void b43_lo_g_maintanance_work(struct b43_wldev *dev)</div><div class='ctx'> 	if (!lo)</div><div class='ctx'> 		return;</div><div class='ctx'> 	now = jiffies;</div><div class='del'>-	hwpctl = b43_has_hardware_pctl(phy);</div><div class='add'>+	hwpctl = b43_has_hardware_pctl(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (hwpctl) {</div><div class='ctx'> 		/* Read the power vector and update it, if needed. */</div><div class='hunk'>@@ -983,8 +993,8 @@ void b43_lo_g_maintanance_work(struct b43_wldev *dev)</div><div class='ctx'> 		if (!time_before(cal-&gt;calib_time, expire))</div><div class='ctx'> 			continue;</div><div class='ctx'> 		/* This item expired. */</div><div class='del'>-		if (b43_compare_bbatt(&amp;cal-&gt;bbatt, &amp;phy-&gt;bbatt) &amp;&amp;</div><div class='del'>-		    b43_compare_rfatt(&amp;cal-&gt;rfatt, &amp;phy-&gt;rfatt)) {</div><div class='add'>+		if (b43_compare_bbatt(&amp;cal-&gt;bbatt, &amp;gphy-&gt;bbatt) &amp;&amp;</div><div class='add'>+		    b43_compare_rfatt(&amp;cal-&gt;rfatt, &amp;gphy-&gt;rfatt)) {</div><div class='ctx'> 			B43_WARN_ON(current_item_expired);</div><div class='ctx'> 			current_item_expired = 1;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1002,7 +1012,7 @@ void b43_lo_g_maintanance_work(struct b43_wldev *dev)</div><div class='ctx'> 		/* Recalibrate currently used LO setting. */</div><div class='ctx'> 		if (b43_debug(dev, B43_DBG_LO))</div><div class='ctx'> 			b43dbg(dev-&gt;wl, "LO: Recalibrating current LO setting\n");</div><div class='del'>-		cal = b43_calibrate_lo_setting(dev, &amp;phy-&gt;bbatt, &amp;phy-&gt;rfatt);</div><div class='add'>+		cal = b43_calibrate_lo_setting(dev, &amp;gphy-&gt;bbatt, &amp;gphy-&gt;rfatt);</div><div class='ctx'> 		if (cal) {</div><div class='ctx'> 			list_add(&amp;cal-&gt;list, &amp;lo-&gt;calib_list);</div><div class='ctx'> 			b43_lo_write(dev, &amp;cal-&gt;ctl);</div><div class='hunk'>@@ -1013,7 +1023,7 @@ void b43_lo_g_maintanance_work(struct b43_wldev *dev)</div><div class='ctx'> </div><div class='ctx'> void b43_lo_g_cleanup(struct b43_wldev *dev)</div><div class='ctx'> {</div><div class='del'>-	struct b43_txpower_lo_control *lo = dev-&gt;phy.lo_control;</div><div class='add'>+	struct b43_txpower_lo_control *lo = dev-&gt;phy.g-&gt;lo_control;</div><div class='ctx'> 	struct b43_lo_calib *cal, *tmp;</div><div class='ctx'> </div><div class='ctx'> 	if (!lo)</div><div class='hunk'>@@ -1027,9 +1037,7 @@ void b43_lo_g_cleanup(struct b43_wldev *dev)</div><div class='ctx'> /* LO Initialization */</div><div class='ctx'> void b43_lo_g_init(struct b43_wldev *dev)</div><div class='ctx'> {</div><div class='del'>-	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='del'>-</div><div class='del'>-	if (b43_has_hardware_pctl(phy)) {</div><div class='add'>+	if (b43_has_hardware_pctl(dev)) {</div><div class='ctx'> 		lo_read_power_vector(dev);</div><div class='ctx'> 		b43_gphy_dc_lt_init(dev, 1);</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/net/wireless/b43/lo.h b/drivers/net/wireless/b43/lo.h<br/>index 1da321cabc12..3b27e20eff80 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/b43/lo.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/b43/lo.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/b43/lo.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/b43/lo.h</a></div><div class='hunk'>@@ -1,7 +1,9 @@</div><div class='ctx'> #ifndef B43_LO_H_</div><div class='ctx'> #define B43_LO_H_</div><div class='ctx'> </div><div class='del'>-#include "phy.h"</div><div class='add'>+/* G-PHY Local Oscillator */</div><div class='add'>+</div><div class='add'>+#include "phy_g.h"</div><div class='ctx'> </div><div class='ctx'> struct b43_wldev;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c<br/>index 7205a936ec74..14c44df584d0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/b43/main.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/b43/main.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/b43/main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/b43/main.c</a></div><div class='hunk'>@@ -44,8 +44,9 @@</div><div class='ctx'> #include "b43.h"</div><div class='ctx'> #include "main.h"</div><div class='ctx'> #include "debugfs.h"</div><div class='del'>-#include "phy.h"</div><div class='del'>-#include "nphy.h"</div><div class='add'>+#include "phy_common.h"</div><div class='add'>+#include "phy_g.h"</div><div class='add'>+#include "phy_n.h"</div><div class='ctx'> #include "dma.h"</div><div class='ctx'> #include "pio.h"</div><div class='ctx'> #include "sysfs.h"</div><div class='hunk'>@@ -814,7 +815,7 @@ void b43_dummy_transmission(struct b43_wldev *dev)</div><div class='ctx'> 			break;</div><div class='ctx'> 		udelay(10);</div><div class='ctx'> 	}</div><div class='del'>-	for (i = 0x00; i &lt; 0x0A; i++) {</div><div class='add'>+	for (i = 0x00; i &lt; 0x19; i++) {</div><div class='ctx'> 		value = b43_read16(dev, 0x0690);</div><div class='ctx'> 		if (!(value &amp; 0x0100))</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -1051,23 +1052,6 @@ void b43_power_saving_ctl_bits(struct b43_wldev *dev, unsigned int ps_flags)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Turn the Analog ON/OFF */</div><div class='del'>-static void b43_switch_analog(struct b43_wldev *dev, int on)</div><div class='del'>-{</div><div class='del'>-	switch (dev-&gt;phy.type) {</div><div class='del'>-	case B43_PHYTYPE_A:</div><div class='del'>-	case B43_PHYTYPE_G:</div><div class='del'>-		b43_write16(dev, B43_MMIO_PHY0, on ? 0 : 0xF4);</div><div class='del'>-		break;</div><div class='del'>-	case B43_PHYTYPE_N:</div><div class='del'>-		b43_phy_write(dev, B43_NPHY_AFECTL_OVER,</div><div class='del'>-			      on ? 0 : 0x7FFF);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		B43_WARN_ON(1);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void b43_wireless_core_reset(struct b43_wldev *dev, u32 flags)</div><div class='ctx'> {</div><div class='ctx'> 	u32 tmslow;</div><div class='hunk'>@@ -1090,8 +1074,12 @@ void b43_wireless_core_reset(struct b43_wldev *dev, u32 flags)</div><div class='ctx'> 	ssb_read32(dev-&gt;dev, SSB_TMSLOW);	/* flush */</div><div class='ctx'> 	msleep(1);</div><div class='ctx'> </div><div class='del'>-	/* Turn Analog ON */</div><div class='del'>-	b43_switch_analog(dev, 1);</div><div class='add'>+	/* Turn Analog ON, but only if we already know the PHY-type.</div><div class='add'>+	 * This protects against very early setup where we don't know the</div><div class='add'>+	 * PHY-type, yet. wireless_core_reset will be called once again later,</div><div class='add'>+	 * when we know the PHY-type. */</div><div class='add'>+	if (dev-&gt;phy.ops)</div><div class='add'>+		dev-&gt;phy.ops-&gt;switch_analog(dev, 1);</div><div class='ctx'> </div><div class='ctx'> 	macctl = b43_read32(dev, B43_MMIO_MACCTL);</div><div class='ctx'> 	macctl &amp;= ~B43_MACCTL_GMODE;</div><div class='hunk'>@@ -1174,6 +1162,8 @@ static void b43_calculate_link_quality(struct b43_wldev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	/* Top half of Link Quality calculation. */</div><div class='ctx'> </div><div class='add'>+	if (dev-&gt;phy.type != B43_PHYTYPE_G)</div><div class='add'>+		return;</div><div class='ctx'> 	if (dev-&gt;noisecalc.calculation_running)</div><div class='ctx'> 		return;</div><div class='ctx'> 	dev-&gt;noisecalc.calculation_running = 1;</div><div class='hunk'>@@ -1184,7 +1174,7 @@ static void b43_calculate_link_quality(struct b43_wldev *dev)</div><div class='ctx'> </div><div class='ctx'> static void handle_irq_noise(struct b43_wldev *dev)</div><div class='ctx'> {</div><div class='del'>-	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='add'>+	struct b43_phy_g *phy = dev-&gt;phy.g;</div><div class='ctx'> 	u16 tmp;</div><div class='ctx'> 	u8 noise[4];</div><div class='ctx'> 	u8 i, j;</div><div class='hunk'>@@ -1192,6 +1182,9 @@ static void handle_irq_noise(struct b43_wldev *dev)</div><div class='ctx'> </div><div class='ctx'> 	/* Bottom half of Link Quality calculation. */</div><div class='ctx'> </div><div class='add'>+	if (dev-&gt;phy.type != B43_PHYTYPE_G)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	/* Possible race condition: It might be possible that the user</div><div class='ctx'> 	 * changed to a different channel in the meantime since we</div><div class='ctx'> 	 * started the calculation. We ignore that fact, since it's</div><div class='hunk'>@@ -1251,13 +1244,13 @@ generate_new:</div><div class='ctx'> </div><div class='ctx'> static void handle_irq_tbtt_indication(struct b43_wldev *dev)</div><div class='ctx'> {</div><div class='del'>-	if (b43_is_mode(dev-&gt;wl, IEEE80211_IF_TYPE_AP)) {</div><div class='add'>+	if (b43_is_mode(dev-&gt;wl, NL80211_IFTYPE_AP)) {</div><div class='ctx'> 		///TODO: PS TBTT</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (1 /*FIXME: the last PSpoll frame was sent successfully */ )</div><div class='ctx'> 			b43_power_saving_ctl_bits(dev, 0);</div><div class='ctx'> 	}</div><div class='del'>-	if (b43_is_mode(dev-&gt;wl, IEEE80211_IF_TYPE_IBSS))</div><div class='add'>+	if (b43_is_mode(dev-&gt;wl, NL80211_IFTYPE_ADHOC))</div><div class='ctx'> 		dev-&gt;dfq_valid = 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1606,8 +1599,8 @@ static void handle_irq_beacon(struct b43_wldev *dev)</div><div class='ctx'> 	struct b43_wl *wl = dev-&gt;wl;</div><div class='ctx'> 	u32 cmd, beacon0_valid, beacon1_valid;</div><div class='ctx'> </div><div class='del'>-	if (!b43_is_mode(wl, IEEE80211_IF_TYPE_AP) &amp;&amp;</div><div class='del'>-	    !b43_is_mode(wl, IEEE80211_IF_TYPE_MESH_POINT))</div><div class='add'>+	if (!b43_is_mode(wl, NL80211_IFTYPE_AP) &amp;&amp;</div><div class='add'>+	    !b43_is_mode(wl, NL80211_IFTYPE_MESH_POINT))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/* This is the bottom half of the asynchronous beacon update. */</div><div class='hunk'>@@ -2575,10 +2568,10 @@ static void b43_adjust_opmode(struct b43_wldev *dev)</div><div class='ctx'> 	ctl &amp;= ~B43_MACCTL_BEACPROMISC;</div><div class='ctx'> 	ctl |= B43_MACCTL_INFRA;</div><div class='ctx'> </div><div class='del'>-	if (b43_is_mode(wl, IEEE80211_IF_TYPE_AP) ||</div><div class='del'>-	    b43_is_mode(wl, IEEE80211_IF_TYPE_MESH_POINT))</div><div class='add'>+	if (b43_is_mode(wl, NL80211_IFTYPE_AP) ||</div><div class='add'>+	    b43_is_mode(wl, NL80211_IFTYPE_MESH_POINT))</div><div class='ctx'> 		ctl |= B43_MACCTL_AP;</div><div class='del'>-	else if (b43_is_mode(wl, IEEE80211_IF_TYPE_IBSS))</div><div class='add'>+	else if (b43_is_mode(wl, NL80211_IFTYPE_ADHOC))</div><div class='ctx'> 		ctl &amp;= ~B43_MACCTL_INFRA;</div><div class='ctx'> </div><div class='ctx'> 	if (wl-&gt;filter_flags &amp; FIF_CONTROL)</div><div class='hunk'>@@ -2688,9 +2681,8 @@ static void b43_mgmtframe_txantenna(struct b43_wldev *dev, int antenna)</div><div class='ctx'> /* This is the opposite of b43_chip_init() */</div><div class='ctx'> static void b43_chip_exit(struct b43_wldev *dev)</div><div class='ctx'> {</div><div class='del'>-	b43_radio_turn_off(dev, 1);</div><div class='add'>+	b43_phy_exit(dev);</div><div class='ctx'> 	b43_gpio_cleanup(dev);</div><div class='del'>-	b43_lo_g_cleanup(dev);</div><div class='ctx'> 	/* firmware is released later */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2700,7 +2692,7 @@ static void b43_chip_exit(struct b43_wldev *dev)</div><div class='ctx'> static int b43_chip_init(struct b43_wldev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='del'>-	int err, tmp;</div><div class='add'>+	int err;</div><div class='ctx'> 	u32 value32, macctl;</div><div class='ctx'> 	u16 value16;</div><div class='ctx'> </div><div class='hunk'>@@ -2725,19 +2717,20 @@ static int b43_chip_init(struct b43_wldev *dev)</div><div class='ctx'> 	err = b43_upload_initvals(dev);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err_gpio_clean;</div><div class='del'>-	b43_radio_turn_on(dev);</div><div class='ctx'> </div><div class='del'>-	b43_write16(dev, 0x03E6, 0x0000);</div><div class='add'>+	/* Turn the Analog on and initialize the PHY. */</div><div class='add'>+	phy-&gt;ops-&gt;switch_analog(dev, 1);</div><div class='ctx'> 	err = b43_phy_init(dev);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto err_radio_off;</div><div class='add'>+		goto err_gpio_clean;</div><div class='ctx'> </div><div class='del'>-	/* Select initial Interference Mitigation. */</div><div class='del'>-	tmp = phy-&gt;interfmode;</div><div class='del'>-	phy-&gt;interfmode = B43_INTERFMODE_NONE;</div><div class='del'>-	b43_radio_set_interference_mitigation(dev, tmp);</div><div class='add'>+	/* Disable Interference Mitigation. */</div><div class='add'>+	if (phy-&gt;ops-&gt;interf_mitigation)</div><div class='add'>+		phy-&gt;ops-&gt;interf_mitigation(dev, B43_INTERFMODE_NONE);</div><div class='ctx'> </div><div class='del'>-	b43_set_rx_antenna(dev, B43_ANTENNA_DEFAULT);</div><div class='add'>+	/* Select the antennae */</div><div class='add'>+	if (phy-&gt;ops-&gt;set_rx_antenna)</div><div class='add'>+		phy-&gt;ops-&gt;set_rx_antenna(dev, B43_ANTENNA_DEFAULT);</div><div class='ctx'> 	b43_mgmtframe_txantenna(dev, B43_ANTENNA_DEFAULT);</div><div class='ctx'> </div><div class='ctx'> 	if (phy-&gt;type == B43_PHYTYPE_B) {</div><div class='hunk'>@@ -2790,8 +2783,6 @@ static int b43_chip_init(struct b43_wldev *dev)</div><div class='ctx'> out:</div><div class='ctx'> 	return err;</div><div class='ctx'> </div><div class='del'>-err_radio_off:</div><div class='del'>-	b43_radio_turn_off(dev, 1);</div><div class='ctx'> err_gpio_clean:</div><div class='ctx'> 	b43_gpio_cleanup(dev);</div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -2799,25 +2790,13 @@ err_gpio_clean:</div><div class='ctx'> </div><div class='ctx'> static void b43_periodic_every60sec(struct b43_wldev *dev)</div><div class='ctx'> {</div><div class='del'>-	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='add'>+	const struct b43_phy_operations *ops = dev-&gt;phy.ops;</div><div class='ctx'> </div><div class='del'>-	if (phy-&gt;type != B43_PHYTYPE_G)</div><div class='del'>-		return;</div><div class='del'>-	if (dev-&gt;dev-&gt;bus-&gt;sprom.boardflags_lo &amp; B43_BFL_RSSI) {</div><div class='del'>-		b43_mac_suspend(dev);</div><div class='del'>-		b43_calc_nrssi_slope(dev);</div><div class='del'>-		if ((phy-&gt;radio_ver == 0x2050) &amp;&amp; (phy-&gt;radio_rev == 8)) {</div><div class='del'>-			u8 old_chan = phy-&gt;channel;</div><div class='del'>-</div><div class='del'>-			/* VCO Calibration */</div><div class='del'>-			if (old_chan &gt;= 8)</div><div class='del'>-				b43_radio_selectchannel(dev, 1, 0);</div><div class='del'>-			else</div><div class='del'>-				b43_radio_selectchannel(dev, 13, 0);</div><div class='del'>-			b43_radio_selectchannel(dev, old_chan, 0);</div><div class='del'>-		}</div><div class='del'>-		b43_mac_enable(dev);</div><div class='del'>-	}</div><div class='add'>+	if (ops-&gt;pwork_60sec)</div><div class='add'>+		ops-&gt;pwork_60sec(dev);</div><div class='add'>+</div><div class='add'>+	/* Force check the TX power emission now. */</div><div class='add'>+	b43_phy_txpower_check(dev, B43_TXPWR_IGNORE_TIME);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void b43_periodic_every30sec(struct b43_wldev *dev)</div><div class='hunk'>@@ -2845,32 +2824,8 @@ static void b43_periodic_every15sec(struct b43_wldev *dev)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (phy-&gt;type == B43_PHYTYPE_G) {</div><div class='del'>-		//TODO: update_aci_moving_average</div><div class='del'>-		if (phy-&gt;aci_enable &amp;&amp; phy-&gt;aci_wlan_automatic) {</div><div class='del'>-			b43_mac_suspend(dev);</div><div class='del'>-			if (!phy-&gt;aci_enable &amp;&amp; 1 /*TODO: not scanning? */ ) {</div><div class='del'>-				if (0 /*TODO: bunch of conditions */ ) {</div><div class='del'>-					b43_radio_set_interference_mitigation</div><div class='del'>-					    (dev, B43_INTERFMODE_MANUALWLAN);</div><div class='del'>-				}</div><div class='del'>-			} else if (1 /*TODO*/) {</div><div class='del'>-				/*</div><div class='del'>-				   if ((aci_average &gt; 1000) &amp;&amp; !(b43_radio_aci_scan(dev))) {</div><div class='del'>-				   b43_radio_set_interference_mitigation(dev,</div><div class='del'>-				   B43_INTERFMODE_NONE);</div><div class='del'>-				   }</div><div class='del'>-				 */</div><div class='del'>-			}</div><div class='del'>-			b43_mac_enable(dev);</div><div class='del'>-		} else if (phy-&gt;interfmode == B43_INTERFMODE_NONWLAN &amp;&amp;</div><div class='del'>-			   phy-&gt;rev == 1) {</div><div class='del'>-			//TODO: implement rev1 workaround</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	b43_phy_xmitpower(dev);	//FIXME: unless scanning?</div><div class='del'>-	b43_lo_g_maintanance_work(dev);</div><div class='del'>-	//TODO for APHY (temperature?)</div><div class='add'>+	if (phy-&gt;ops-&gt;pwork_15sec)</div><div class='add'>+		phy-&gt;ops-&gt;pwork_15sec(dev);</div><div class='ctx'> </div><div class='ctx'> 	atomic_set(&amp;phy-&gt;txerr_cnt, B43_PHY_TX_BADNESS_LIMIT);</div><div class='ctx'> 	wmb();</div><div class='hunk'>@@ -3104,36 +3059,31 @@ static void b43_qos_params_upload(struct b43_wldev *dev,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Update the QOS parameters in hardware. */</div><div class='del'>-static void b43_qos_update(struct b43_wldev *dev)</div><div class='add'>+/* Mapping of mac80211 queue numbers to b43 QoS SHM offsets. */</div><div class='add'>+static const u16 b43_qos_shm_offsets[] = {</div><div class='add'>+	/* [mac80211-queue-nr] = SHM_OFFSET, */</div><div class='add'>+	[0] = B43_QOS_VOICE,</div><div class='add'>+	[1] = B43_QOS_VIDEO,</div><div class='add'>+	[2] = B43_QOS_BESTEFFORT,</div><div class='add'>+	[3] = B43_QOS_BACKGROUND,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Update all QOS parameters in hardware. */</div><div class='add'>+static void b43_qos_upload_all(struct b43_wldev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct b43_wl *wl = dev-&gt;wl;</div><div class='ctx'> 	struct b43_qos_params *params;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='del'>-	/* Mapping of mac80211 queues to b43 SHM offsets. */</div><div class='del'>-	static const u16 qos_shm_offsets[] = {</div><div class='del'>-		[0] = B43_QOS_VOICE,</div><div class='del'>-		[1] = B43_QOS_VIDEO,</div><div class='del'>-		[2] = B43_QOS_BESTEFFORT,</div><div class='del'>-		[3] = B43_QOS_BACKGROUND,</div><div class='del'>-	};</div><div class='del'>-	BUILD_BUG_ON(ARRAY_SIZE(qos_shm_offsets) != ARRAY_SIZE(wl-&gt;qos_params));</div><div class='add'>+	BUILD_BUG_ON(ARRAY_SIZE(b43_qos_shm_offsets) !=</div><div class='add'>+		     ARRAY_SIZE(wl-&gt;qos_params));</div><div class='ctx'> </div><div class='ctx'> 	b43_mac_suspend(dev);</div><div class='del'>-	spin_lock_irqsave(&amp;wl-&gt;irq_lock, flags);</div><div class='del'>-</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(wl-&gt;qos_params); i++) {</div><div class='ctx'> 		params = &amp;(wl-&gt;qos_params[i]);</div><div class='del'>-		if (params-&gt;need_hw_update) {</div><div class='del'>-			b43_qos_params_upload(dev, &amp;(params-&gt;p),</div><div class='del'>-					      qos_shm_offsets[i]);</div><div class='del'>-			params-&gt;need_hw_update = 0;</div><div class='del'>-		}</div><div class='add'>+		b43_qos_params_upload(dev, &amp;(params-&gt;p),</div><div class='add'>+				      b43_qos_shm_offsets[i]);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;wl-&gt;irq_lock, flags);</div><div class='ctx'> 	b43_mac_enable(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3142,25 +3092,50 @@ static void b43_qos_clear(struct b43_wl *wl)</div><div class='ctx'> 	struct b43_qos_params *params;</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='add'>+	/* Initialize QoS parameters to sane defaults. */</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(ARRAY_SIZE(b43_qos_shm_offsets) !=</div><div class='add'>+		     ARRAY_SIZE(wl-&gt;qos_params));</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(wl-&gt;qos_params); i++) {</div><div class='ctx'> 		params = &amp;(wl-&gt;qos_params[i]);</div><div class='ctx'> </div><div class='del'>-		memset(&amp;(params-&gt;p), 0, sizeof(params-&gt;p));</div><div class='del'>-		params-&gt;p.aifs = -1;</div><div class='del'>-		params-&gt;need_hw_update = 1;</div><div class='add'>+		switch (b43_qos_shm_offsets[i]) {</div><div class='add'>+		case B43_QOS_VOICE:</div><div class='add'>+			params-&gt;p.txop = 0;</div><div class='add'>+			params-&gt;p.aifs = 2;</div><div class='add'>+			params-&gt;p.cw_min = 0x0001;</div><div class='add'>+			params-&gt;p.cw_max = 0x0001;</div><div class='add'>+			break;</div><div class='add'>+		case B43_QOS_VIDEO:</div><div class='add'>+			params-&gt;p.txop = 0;</div><div class='add'>+			params-&gt;p.aifs = 2;</div><div class='add'>+			params-&gt;p.cw_min = 0x0001;</div><div class='add'>+			params-&gt;p.cw_max = 0x0001;</div><div class='add'>+			break;</div><div class='add'>+		case B43_QOS_BESTEFFORT:</div><div class='add'>+			params-&gt;p.txop = 0;</div><div class='add'>+			params-&gt;p.aifs = 3;</div><div class='add'>+			params-&gt;p.cw_min = 0x0001;</div><div class='add'>+			params-&gt;p.cw_max = 0x03FF;</div><div class='add'>+			break;</div><div class='add'>+		case B43_QOS_BACKGROUND:</div><div class='add'>+			params-&gt;p.txop = 0;</div><div class='add'>+			params-&gt;p.aifs = 7;</div><div class='add'>+			params-&gt;p.cw_min = 0x0001;</div><div class='add'>+			params-&gt;p.cw_max = 0x03FF;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			B43_WARN_ON(1);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Initialize the core's QOS capabilities */</div><div class='ctx'> static void b43_qos_init(struct b43_wldev *dev)</div><div class='ctx'> {</div><div class='del'>-	struct b43_wl *wl = dev-&gt;wl;</div><div class='del'>-	unsigned int i;</div><div class='del'>-</div><div class='ctx'> 	/* Upload the current QOS parameters. */</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(wl-&gt;qos_params); i++)</div><div class='del'>-		wl-&gt;qos_params[i].need_hw_update = 1;</div><div class='del'>-	b43_qos_update(dev);</div><div class='add'>+	b43_qos_upload_all(dev);</div><div class='ctx'> </div><div class='ctx'> 	/* Enable QOS support. */</div><div class='ctx'> 	b43_hf_write(dev, b43_hf_read(dev) | B43_HF_EDCF);</div><div class='hunk'>@@ -3169,25 +3144,13 @@ static void b43_qos_init(struct b43_wldev *dev)</div><div class='ctx'> 		    | B43_MMIO_IFSCTL_USE_EDCF);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void b43_qos_update_work(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct b43_wl *wl = container_of(work, struct b43_wl, qos_update_work);</div><div class='del'>-	struct b43_wldev *dev;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;wl-&gt;mutex);</div><div class='del'>-	dev = wl-&gt;current_dev;</div><div class='del'>-	if (likely(dev &amp;&amp; (b43_status(dev) &gt;= B43_STAT_INITIALIZED)))</div><div class='del'>-		b43_qos_update(dev);</div><div class='del'>-	mutex_unlock(&amp;wl-&gt;mutex);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int b43_op_conf_tx(struct ieee80211_hw *hw, u16 _queue,</div><div class='ctx'> 			  const struct ieee80211_tx_queue_params *params)</div><div class='ctx'> {</div><div class='ctx'> 	struct b43_wl *wl = hw_to_b43_wl(hw);</div><div class='del'>-	unsigned long flags;</div><div class='add'>+	struct b43_wldev *dev;</div><div class='ctx'> 	unsigned int queue = (unsigned int)_queue;</div><div class='del'>-	struct b43_qos_params *p;</div><div class='add'>+	int err = -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	if (queue &gt;= ARRAY_SIZE(wl-&gt;qos_params)) {</div><div class='ctx'> 		/* Queue not available or don't support setting</div><div class='hunk'>@@ -3195,16 +3158,25 @@ static int b43_op_conf_tx(struct ieee80211_hw *hw, u16 _queue,</div><div class='ctx'> 		 * confuse mac80211. */</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='add'>+	BUILD_BUG_ON(ARRAY_SIZE(b43_qos_shm_offsets) !=</div><div class='add'>+		     ARRAY_SIZE(wl-&gt;qos_params));</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;wl-&gt;irq_lock, flags);</div><div class='del'>-	p = &amp;(wl-&gt;qos_params[queue]);</div><div class='del'>-	memcpy(&amp;(p-&gt;p), params, sizeof(p-&gt;p));</div><div class='del'>-	p-&gt;need_hw_update = 1;</div><div class='del'>-	spin_unlock_irqrestore(&amp;wl-&gt;irq_lock, flags);</div><div class='add'>+	mutex_lock(&amp;wl-&gt;mutex);</div><div class='add'>+	dev = wl-&gt;current_dev;</div><div class='add'>+	if (unlikely(!dev || (b43_status(dev) &lt; B43_STAT_INITIALIZED)))</div><div class='add'>+		goto out_unlock;</div><div class='ctx'> </div><div class='del'>-	queue_work(hw-&gt;workqueue, &amp;wl-&gt;qos_update_work);</div><div class='add'>+	memcpy(&amp;(wl-&gt;qos_params[queue].p), params, sizeof(*params));</div><div class='add'>+	b43_mac_suspend(dev);</div><div class='add'>+	b43_qos_params_upload(dev, &amp;(wl-&gt;qos_params[queue].p),</div><div class='add'>+			      b43_qos_shm_offsets[queue]);</div><div class='add'>+	b43_mac_enable(dev);</div><div class='add'>+	err = 0;</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+out_unlock:</div><div class='add'>+	mutex_unlock(&amp;wl-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int b43_op_get_tx_stats(struct ieee80211_hw *hw,</div><div class='hunk'>@@ -3401,7 +3373,7 @@ static int b43_op_config(struct ieee80211_hw *hw, struct ieee80211_conf *conf)</div><div class='ctx'> 	/* Switch to the requested channel.</div><div class='ctx'> 	 * The firmware takes care of races with the TX handler. */</div><div class='ctx'> 	if (conf-&gt;channel-&gt;hw_value != phy-&gt;channel)</div><div class='del'>-		b43_radio_selectchannel(dev, conf-&gt;channel-&gt;hw_value, 0);</div><div class='add'>+		b43_switch_channel(dev, conf-&gt;channel-&gt;hw_value);</div><div class='ctx'> </div><div class='ctx'> 	/* Enable/Disable ShortSlot timing. */</div><div class='ctx'> 	if ((!!(conf-&gt;flags &amp; IEEE80211_CONF_SHORT_SLOT_TIME)) !=</div><div class='hunk'>@@ -3417,26 +3389,30 @@ static int b43_op_config(struct ieee80211_hw *hw, struct ieee80211_conf *conf)</div><div class='ctx'> </div><div class='ctx'> 	/* Adjust the desired TX power level. */</div><div class='ctx'> 	if (conf-&gt;power_level != 0) {</div><div class='del'>-		if (conf-&gt;power_level != phy-&gt;power_level) {</div><div class='del'>-			phy-&gt;power_level = conf-&gt;power_level;</div><div class='del'>-			b43_phy_xmitpower(dev);</div><div class='add'>+		spin_lock_irqsave(&amp;wl-&gt;irq_lock, flags);</div><div class='add'>+		if (conf-&gt;power_level != phy-&gt;desired_txpower) {</div><div class='add'>+			phy-&gt;desired_txpower = conf-&gt;power_level;</div><div class='add'>+			b43_phy_txpower_check(dev, B43_TXPWR_IGNORE_TIME |</div><div class='add'>+						   B43_TXPWR_IGNORE_TSSI);</div><div class='ctx'> 		}</div><div class='add'>+		spin_unlock_irqrestore(&amp;wl-&gt;irq_lock, flags);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Antennas for RX and management frame TX. */</div><div class='ctx'> 	antenna = b43_antenna_from_ieee80211(dev, conf-&gt;antenna_sel_tx);</div><div class='ctx'> 	b43_mgmtframe_txantenna(dev, antenna);</div><div class='ctx'> 	antenna = b43_antenna_from_ieee80211(dev, conf-&gt;antenna_sel_rx);</div><div class='del'>-	b43_set_rx_antenna(dev, antenna);</div><div class='add'>+	if (phy-&gt;ops-&gt;set_rx_antenna)</div><div class='add'>+		phy-&gt;ops-&gt;set_rx_antenna(dev, antenna);</div><div class='ctx'> </div><div class='ctx'> 	/* Update templates for AP/mesh mode. */</div><div class='del'>-	if (b43_is_mode(wl, IEEE80211_IF_TYPE_AP) ||</div><div class='del'>-	    b43_is_mode(wl, IEEE80211_IF_TYPE_MESH_POINT))</div><div class='add'>+	if (b43_is_mode(wl, NL80211_IFTYPE_AP) ||</div><div class='add'>+	    b43_is_mode(wl, NL80211_IFTYPE_MESH_POINT))</div><div class='ctx'> 		b43_set_beacon_int(dev, conf-&gt;beacon_int);</div><div class='ctx'> </div><div class='ctx'> 	if (!!conf-&gt;radio_enabled != phy-&gt;radio_on) {</div><div class='ctx'> 		if (conf-&gt;radio_enabled) {</div><div class='del'>-			b43_radio_turn_on(dev);</div><div class='add'>+			b43_software_rfkill(dev, RFKILL_STATE_UNBLOCKED);</div><div class='ctx'> 			b43info(dev-&gt;wl, "Radio turned on by software\n");</div><div class='ctx'> 			if (!dev-&gt;radio_hw_enable) {</div><div class='ctx'> 				b43info(dev-&gt;wl, "The hardware RF-kill button "</div><div class='hunk'>@@ -3444,7 +3420,7 @@ static int b43_op_config(struct ieee80211_hw *hw, struct ieee80211_conf *conf)</div><div class='ctx'> 					"Press the button to turn it on.\n");</div><div class='ctx'> 			}</div><div class='ctx'> 		} else {</div><div class='del'>-			b43_radio_turn_off(dev, 0);</div><div class='add'>+			b43_software_rfkill(dev, RFKILL_STATE_SOFT_BLOCKED);</div><div class='ctx'> 			b43info(dev-&gt;wl, "Radio turned off by software\n");</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3619,14 +3595,14 @@ static int b43_op_config_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 	else</div><div class='ctx'> 		memset(wl-&gt;bssid, 0, ETH_ALEN);</div><div class='ctx'> 	if (b43_status(dev) &gt;= B43_STAT_INITIALIZED) {</div><div class='del'>-		if (b43_is_mode(wl, IEEE80211_IF_TYPE_AP) ||</div><div class='del'>-		    b43_is_mode(wl, IEEE80211_IF_TYPE_MESH_POINT)) {</div><div class='add'>+		if (b43_is_mode(wl, NL80211_IFTYPE_AP) ||</div><div class='add'>+		    b43_is_mode(wl, NL80211_IFTYPE_MESH_POINT)) {</div><div class='ctx'> 			B43_WARN_ON(vif-&gt;type != wl-&gt;if_type);</div><div class='ctx'> 			if (conf-&gt;changed &amp; IEEE80211_IFCC_SSID)</div><div class='ctx'> 				b43_set_ssid(dev, conf-&gt;ssid, conf-&gt;ssid_len);</div><div class='ctx'> 			if (conf-&gt;changed &amp; IEEE80211_IFCC_BEACON)</div><div class='ctx'> 				b43_update_templates(wl);</div><div class='del'>-		} else if (b43_is_mode(wl, IEEE80211_IF_TYPE_IBSS)) {</div><div class='add'>+		} else if (b43_is_mode(wl, NL80211_IFTYPE_ADHOC)) {</div><div class='ctx'> 			if (conf-&gt;changed &amp; IEEE80211_IFCC_BEACON)</div><div class='ctx'> 				b43_update_templates(wl);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -3818,48 +3794,10 @@ static int b43_phy_versioning(struct b43_wldev *dev)</div><div class='ctx'> static void setup_struct_phy_for_init(struct b43_wldev *dev,</div><div class='ctx'> 				      struct b43_phy *phy)</div><div class='ctx'> {</div><div class='del'>-	struct b43_txpower_lo_control *lo;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	memset(phy-&gt;minlowsig, 0xFF, sizeof(phy-&gt;minlowsig));</div><div class='del'>-	memset(phy-&gt;minlowsigpos, 0, sizeof(phy-&gt;minlowsigpos));</div><div class='del'>-</div><div class='del'>-	phy-&gt;aci_enable = 0;</div><div class='del'>-	phy-&gt;aci_wlan_automatic = 0;</div><div class='del'>-	phy-&gt;aci_hw_rssi = 0;</div><div class='del'>-</div><div class='del'>-	phy-&gt;radio_off_context.valid = 0;</div><div class='del'>-</div><div class='del'>-	lo = phy-&gt;lo_control;</div><div class='del'>-	if (lo) {</div><div class='del'>-		memset(lo, 0, sizeof(*(phy-&gt;lo_control)));</div><div class='del'>-		lo-&gt;tx_bias = 0xFF;</div><div class='del'>-		INIT_LIST_HEAD(&amp;lo-&gt;calib_list);</div><div class='del'>-	}</div><div class='del'>-	phy-&gt;max_lb_gain = 0;</div><div class='del'>-	phy-&gt;trsw_rx_gain = 0;</div><div class='del'>-	phy-&gt;txpwr_offset = 0;</div><div class='del'>-</div><div class='del'>-	/* NRSSI */</div><div class='del'>-	phy-&gt;nrssislope = 0;</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(phy-&gt;nrssi); i++)</div><div class='del'>-		phy-&gt;nrssi[i] = -1000;</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(phy-&gt;nrssi_lt); i++)</div><div class='del'>-		phy-&gt;nrssi_lt[i] = i;</div><div class='del'>-</div><div class='del'>-	phy-&gt;lofcal = 0xFFFF;</div><div class='del'>-	phy-&gt;initval = 0xFFFF;</div><div class='del'>-</div><div class='del'>-	phy-&gt;interfmode = B43_INTERFMODE_NONE;</div><div class='del'>-	phy-&gt;channel = 0xFF;</div><div class='del'>-</div><div class='ctx'> 	phy-&gt;hardware_power_control = !!modparam_hwpctl;</div><div class='del'>-</div><div class='add'>+	phy-&gt;next_txpwr_check_time = jiffies;</div><div class='ctx'> 	/* PHY TX errors counter. */</div><div class='ctx'> 	atomic_set(&amp;phy-&gt;txerr_cnt, B43_PHY_TX_BADNESS_LIMIT);</div><div class='del'>-</div><div class='del'>-	/* OFDM-table address caching. */</div><div class='del'>-	phy-&gt;ofdmtab_addr_direction = B43_OFDMTAB_DIRECTION_UNKNOWN;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void setup_struct_wldev_for_init(struct b43_wldev *dev)</div><div class='hunk'>@@ -3965,7 +3903,7 @@ static void b43_set_synth_pu_delay(struct b43_wldev *dev, bool idle)</div><div class='ctx'> 		pu_delay = 3700;</div><div class='ctx'> 	else</div><div class='ctx'> 		pu_delay = 1050;</div><div class='del'>-	if (b43_is_mode(dev-&gt;wl, IEEE80211_IF_TYPE_IBSS) || idle)</div><div class='add'>+	if (b43_is_mode(dev-&gt;wl, NL80211_IFTYPE_ADHOC) || idle)</div><div class='ctx'> 		pu_delay = 500;</div><div class='ctx'> 	if ((dev-&gt;phy.radio_ver == 0x2050) &amp;&amp; (dev-&gt;phy.radio_rev == 8))</div><div class='ctx'> 		pu_delay = max(pu_delay, (u16)2400);</div><div class='hunk'>@@ -3979,7 +3917,7 @@ static void b43_set_pretbtt(struct b43_wldev *dev)</div><div class='ctx'> 	u16 pretbtt;</div><div class='ctx'> </div><div class='ctx'> 	/* The time value is in microseconds. */</div><div class='del'>-	if (b43_is_mode(dev-&gt;wl, IEEE80211_IF_TYPE_IBSS)) {</div><div class='add'>+	if (b43_is_mode(dev-&gt;wl, NL80211_IFTYPE_ADHOC)) {</div><div class='ctx'> 		pretbtt = 2;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (dev-&gt;phy.type == B43_PHYTYPE_A)</div><div class='hunk'>@@ -3995,7 +3933,6 @@ static void b43_set_pretbtt(struct b43_wldev *dev)</div><div class='ctx'> /* Locking: wl-&gt;mutex */</div><div class='ctx'> static void b43_wireless_core_exit(struct b43_wldev *dev)</div><div class='ctx'> {</div><div class='del'>-	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='ctx'> 	u32 macctl;</div><div class='ctx'> </div><div class='ctx'> 	B43_WARN_ON(b43_status(dev) &gt; B43_STAT_INITIALIZED);</div><div class='hunk'>@@ -4016,12 +3953,7 @@ static void b43_wireless_core_exit(struct b43_wldev *dev)</div><div class='ctx'> 	b43_dma_free(dev);</div><div class='ctx'> 	b43_pio_free(dev);</div><div class='ctx'> 	b43_chip_exit(dev);</div><div class='del'>-	b43_radio_turn_off(dev, 1);</div><div class='del'>-	b43_switch_analog(dev, 0);</div><div class='del'>-	if (phy-&gt;dyn_tssi_tbl)</div><div class='del'>-		kfree(phy-&gt;tssi2dbm);</div><div class='del'>-	kfree(phy-&gt;lo_control);</div><div class='del'>-	phy-&gt;lo_control = NULL;</div><div class='add'>+	dev-&gt;phy.ops-&gt;switch_analog(dev, 0);</div><div class='ctx'> 	if (dev-&gt;wl-&gt;current_beacon) {</div><div class='ctx'> 		dev_kfree_skb_any(dev-&gt;wl-&gt;current_beacon);</div><div class='ctx'> 		dev-&gt;wl-&gt;current_beacon = NULL;</div><div class='hunk'>@@ -4052,29 +3984,23 @@ static int b43_wireless_core_init(struct b43_wldev *dev)</div><div class='ctx'> 		b43_wireless_core_reset(dev, tmp);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((phy-&gt;type == B43_PHYTYPE_B) || (phy-&gt;type == B43_PHYTYPE_G)) {</div><div class='del'>-		phy-&gt;lo_control =</div><div class='del'>-		    kzalloc(sizeof(*(phy-&gt;lo_control)), GFP_KERNEL);</div><div class='del'>-		if (!phy-&gt;lo_control) {</div><div class='del'>-			err = -ENOMEM;</div><div class='del'>-			goto err_busdown;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	/* Reset all data structures. */</div><div class='ctx'> 	setup_struct_wldev_for_init(dev);</div><div class='del'>-</div><div class='del'>-	err = b43_phy_init_tssi2dbm_table(dev);</div><div class='del'>-	if (err)</div><div class='del'>-		goto err_kfree_lo_control;</div><div class='add'>+	phy-&gt;ops-&gt;prepare_structs(dev);</div><div class='ctx'> </div><div class='ctx'> 	/* Enable IRQ routing to this device. */</div><div class='ctx'> 	ssb_pcicore_dev_irqvecs_enable(&amp;bus-&gt;pcicore, dev-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	b43_imcfglo_timeouts_workaround(dev);</div><div class='ctx'> 	b43_bluetooth_coext_disable(dev);</div><div class='del'>-	b43_phy_early_init(dev);</div><div class='add'>+	if (phy-&gt;ops-&gt;prepare_hardware) {</div><div class='add'>+		err = phy-&gt;ops-&gt;prepare_hardware(dev);</div><div class='add'>+		if (err)</div><div class='add'>+			goto err_busdown;</div><div class='add'>+	}</div><div class='ctx'> 	err = b43_chip_init(dev);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto err_kfree_tssitbl;</div><div class='add'>+		goto err_busdown;</div><div class='ctx'> 	b43_shm_write16(dev, B43_SHM_SHARED,</div><div class='ctx'> 			B43_SHM_SH_WLCOREREV, dev-&gt;dev-&gt;id.revision);</div><div class='ctx'> 	hf = b43_hf_read(dev);</div><div class='hunk'>@@ -4140,15 +4066,9 @@ static int b43_wireless_core_init(struct b43_wldev *dev)</div><div class='ctx'> out:</div><div class='ctx'> 	return err;</div><div class='ctx'> </div><div class='del'>-      err_chip_exit:</div><div class='add'>+err_chip_exit:</div><div class='ctx'> 	b43_chip_exit(dev);</div><div class='del'>-      err_kfree_tssitbl:</div><div class='del'>-	if (phy-&gt;dyn_tssi_tbl)</div><div class='del'>-		kfree(phy-&gt;tssi2dbm);</div><div class='del'>-      err_kfree_lo_control:</div><div class='del'>-	kfree(phy-&gt;lo_control);</div><div class='del'>-	phy-&gt;lo_control = NULL;</div><div class='del'>-      err_busdown:</div><div class='add'>+err_busdown:</div><div class='ctx'> 	ssb_bus_may_powerdown(bus);</div><div class='ctx'> 	B43_WARN_ON(b43_status(dev) != B43_STAT_UNINIT);</div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -4164,11 +4084,11 @@ static int b43_op_add_interface(struct ieee80211_hw *hw,</div><div class='ctx'> </div><div class='ctx'> 	/* TODO: allow WDS/AP devices to coexist */</div><div class='ctx'> </div><div class='del'>-	if (conf-&gt;type != IEEE80211_IF_TYPE_AP &amp;&amp;</div><div class='del'>-	    conf-&gt;type != IEEE80211_IF_TYPE_MESH_POINT &amp;&amp;</div><div class='del'>-	    conf-&gt;type != IEEE80211_IF_TYPE_STA &amp;&amp;</div><div class='del'>-	    conf-&gt;type != IEEE80211_IF_TYPE_WDS &amp;&amp;</div><div class='del'>-	    conf-&gt;type != IEEE80211_IF_TYPE_IBSS)</div><div class='add'>+	if (conf-&gt;type != NL80211_IFTYPE_AP &amp;&amp;</div><div class='add'>+	    conf-&gt;type != NL80211_IFTYPE_MESH_POINT &amp;&amp;</div><div class='add'>+	    conf-&gt;type != NL80211_IFTYPE_STATION &amp;&amp;</div><div class='add'>+	    conf-&gt;type != NL80211_IFTYPE_WDS &amp;&amp;</div><div class='add'>+	    conf-&gt;type != NL80211_IFTYPE_ADHOC)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;wl-&gt;mutex);</div><div class='hunk'>@@ -4283,7 +4203,6 @@ static void b43_op_stop(struct ieee80211_hw *hw)</div><div class='ctx'> 	struct b43_wldev *dev = wl-&gt;current_dev;</div><div class='ctx'> </div><div class='ctx'> 	b43_rfkill_exit(dev);</div><div class='del'>-	cancel_work_sync(&amp;(wl-&gt;qos_update_work));</div><div class='ctx'> 	cancel_work_sync(&amp;(wl-&gt;beacon_update_trigger));</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;wl-&gt;mutex);</div><div class='hunk'>@@ -4291,6 +4210,8 @@ static void b43_op_stop(struct ieee80211_hw *hw)</div><div class='ctx'> 		b43_wireless_core_stop(dev);</div><div class='ctx'> 	b43_wireless_core_exit(dev);</div><div class='ctx'> 	mutex_unlock(&amp;wl-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	cancel_work_sync(&amp;(wl-&gt;txpower_adjust_work));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int b43_op_set_retry_limit(struct ieee80211_hw *hw,</div><div class='hunk'>@@ -4313,7 +4234,8 @@ out_unlock:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int b43_op_beacon_set_tim(struct ieee80211_hw *hw, int aid, int set)</div><div class='add'>+static int b43_op_beacon_set_tim(struct ieee80211_hw *hw,</div><div class='add'>+				 struct ieee80211_sta *sta, bool set)</div><div class='ctx'> {</div><div class='ctx'> 	struct b43_wl *wl = hw_to_b43_wl(hw);</div><div class='ctx'> 	unsigned long flags;</div><div class='hunk'>@@ -4328,7 +4250,7 @@ static int b43_op_beacon_set_tim(struct ieee80211_hw *hw, int aid, int set)</div><div class='ctx'> static void b43_op_sta_notify(struct ieee80211_hw *hw,</div><div class='ctx'> 			      struct ieee80211_vif *vif,</div><div class='ctx'> 			      enum sta_notify_cmd notify_cmd,</div><div class='del'>-			      const u8 *addr)</div><div class='add'>+			      struct ieee80211_sta *sta)</div><div class='ctx'> {</div><div class='ctx'> 	struct b43_wl *wl = hw_to_b43_wl(hw);</div><div class='ctx'> </div><div class='hunk'>@@ -4422,6 +4344,7 @@ static void b43_wireless_core_detach(struct b43_wldev *dev)</div><div class='ctx'> 	/* We release firmware that late to not be required to re-request</div><div class='ctx'> 	 * is all the time when we reinit the core. */</div><div class='ctx'> 	b43_release_firmware(dev);</div><div class='add'>+	b43_phy_free(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int b43_wireless_core_attach(struct b43_wldev *dev)</div><div class='hunk'>@@ -4495,30 +4418,35 @@ static int b43_wireless_core_attach(struct b43_wldev *dev)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	err = b43_phy_allocate(dev);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_powerdown;</div><div class='add'>+</div><div class='ctx'> 	dev-&gt;phy.gmode = have_2ghz_phy;</div><div class='ctx'> 	tmp = dev-&gt;phy.gmode ? B43_TMSLOW_GMODE : 0;</div><div class='ctx'> 	b43_wireless_core_reset(dev, tmp);</div><div class='ctx'> </div><div class='ctx'> 	err = b43_validate_chipaccess(dev);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto err_powerdown;</div><div class='add'>+		goto err_phy_free;</div><div class='ctx'> 	err = b43_setup_bands(dev, have_2ghz_phy, have_5ghz_phy);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto err_powerdown;</div><div class='add'>+		goto err_phy_free;</div><div class='ctx'> </div><div class='ctx'> 	/* Now set some default "current_dev" */</div><div class='ctx'> 	if (!wl-&gt;current_dev)</div><div class='ctx'> 		wl-&gt;current_dev = dev;</div><div class='ctx'> 	INIT_WORK(&amp;dev-&gt;restart_work, b43_chip_reset);</div><div class='ctx'> </div><div class='del'>-	b43_radio_turn_off(dev, 1);</div><div class='del'>-	b43_switch_analog(dev, 0);</div><div class='add'>+	dev-&gt;phy.ops-&gt;switch_analog(dev, 0);</div><div class='ctx'> 	ssb_device_disable(dev-&gt;dev, 0);</div><div class='ctx'> 	ssb_bus_may_powerdown(bus);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	return err;</div><div class='ctx'> </div><div class='add'>+err_phy_free:</div><div class='add'>+	b43_phy_free(dev);</div><div class='ctx'> err_powerdown:</div><div class='ctx'> 	ssb_bus_may_powerdown(bus);</div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -4615,9 +4543,11 @@ static void b43_sprom_fixup(struct ssb_bus *bus)</div><div class='ctx'> 		pdev = bus-&gt;host_pci;</div><div class='ctx'> 		if (IS_PDEV(pdev, BROADCOM, 0x4318, ASUSTEK, 0x100F) ||</div><div class='ctx'> 		    IS_PDEV(pdev, BROADCOM, 0x4320,    DELL, 0x0003) ||</div><div class='add'>+		    IS_PDEV(pdev, BROADCOM, 0x4320,      HP, 0x12f8) ||</div><div class='ctx'> 		    IS_PDEV(pdev, BROADCOM, 0x4320, LINKSYS, 0x0015) ||</div><div class='ctx'> 		    IS_PDEV(pdev, BROADCOM, 0x4320, LINKSYS, 0x0014) ||</div><div class='del'>-		    IS_PDEV(pdev, BROADCOM, 0x4320, LINKSYS, 0x0013))</div><div class='add'>+		    IS_PDEV(pdev, BROADCOM, 0x4320, LINKSYS, 0x0013) ||</div><div class='add'>+		    IS_PDEV(pdev, BROADCOM, 0x4320, MOTOROLA, 0x7010))</div><div class='ctx'> 			bus-&gt;sprom.boardflags_lo &amp;= ~B43_BFL_BTCOEXIST;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -4650,7 +4580,15 @@ static int b43_wireless_init(struct ssb_device *dev)</div><div class='ctx'> 		    IEEE80211_HW_SIGNAL_DBM |</div><div class='ctx'> 		    IEEE80211_HW_NOISE_DBM;</div><div class='ctx'> </div><div class='add'>+	hw-&gt;wiphy-&gt;interface_modes =</div><div class='add'>+		BIT(NL80211_IFTYPE_AP) |</div><div class='add'>+		BIT(NL80211_IFTYPE_MESH_POINT) |</div><div class='add'>+		BIT(NL80211_IFTYPE_STATION) |</div><div class='add'>+		BIT(NL80211_IFTYPE_WDS) |</div><div class='add'>+		BIT(NL80211_IFTYPE_ADHOC);</div><div class='add'>+</div><div class='ctx'> 	hw-&gt;queues = b43_modparam_qos ? 4 : 1;</div><div class='add'>+	hw-&gt;max_altrates = 1;</div><div class='ctx'> 	SET_IEEE80211_DEV(hw, dev-&gt;dev);</div><div class='ctx'> 	if (is_valid_ether_addr(sprom-&gt;et1mac))</div><div class='ctx'> 		SET_IEEE80211_PERM_ADDR(hw, sprom-&gt;et1mac);</div><div class='hunk'>@@ -4667,8 +4605,8 @@ static int b43_wireless_init(struct ssb_device *dev)</div><div class='ctx'> 	spin_lock_init(&amp;wl-&gt;shm_lock);</div><div class='ctx'> 	mutex_init(&amp;wl-&gt;mutex);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;wl-&gt;devlist);</div><div class='del'>-	INIT_WORK(&amp;wl-&gt;qos_update_work, b43_qos_update_work);</div><div class='ctx'> 	INIT_WORK(&amp;wl-&gt;beacon_update_trigger, b43_beacon_update_trigger_work);</div><div class='add'>+	INIT_WORK(&amp;wl-&gt;txpower_adjust_work, b43_phy_txpower_adjust_work);</div><div class='ctx'> </div><div class='ctx'> 	ssb_set_devtypedata(dev, wl);</div><div class='ctx'> 	b43info(wl, "Broadcom %04X WLAN found\n", dev-&gt;bus-&gt;chip_id);</div><div class='head'>diff --git a/drivers/net/wireless/b43/pcmcia.c b/drivers/net/wireless/b43/pcmcia.c<br/>index b8aa16307f79..3cfc30307a27 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/b43/pcmcia.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/b43/pcmcia.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/b43/pcmcia.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/b43/pcmcia.c</a></div><div class='hunk'>@@ -82,13 +82,13 @@ static int __devinit b43_pcmcia_probe(struct pcmcia_device *dev)</div><div class='ctx'> 	tuple.TupleOffset = 0;</div><div class='ctx'> </div><div class='ctx'> 	res = pcmcia_get_first_tuple(dev, &amp;tuple);</div><div class='del'>-	if (res != CS_SUCCESS)</div><div class='add'>+	if (res != 0)</div><div class='ctx'> 		goto err_kfree_ssb;</div><div class='ctx'> 	res = pcmcia_get_tuple_data(dev, &amp;tuple);</div><div class='del'>-	if (res != CS_SUCCESS)</div><div class='add'>+	if (res != 0)</div><div class='ctx'> 		goto err_kfree_ssb;</div><div class='del'>-	res = pcmcia_parse_tuple(dev, &amp;tuple, &amp;parse);</div><div class='del'>-	if (res != CS_SUCCESS)</div><div class='add'>+	res = pcmcia_parse_tuple(&amp;tuple, &amp;parse);</div><div class='add'>+	if (res != 0)</div><div class='ctx'> 		goto err_kfree_ssb;</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;conf.ConfigBase = parse.config.base;</div><div class='hunk'>@@ -107,13 +107,13 @@ static int __devinit b43_pcmcia_probe(struct pcmcia_device *dev)</div><div class='ctx'> 	win.Size = SSB_CORE_SIZE;</div><div class='ctx'> 	win.AccessSpeed = 250;</div><div class='ctx'> 	res = pcmcia_request_window(&amp;dev, &amp;win, &amp;dev-&gt;win);</div><div class='del'>-	if (res != CS_SUCCESS)</div><div class='add'>+	if (res != 0)</div><div class='ctx'> 		goto err_kfree_ssb;</div><div class='ctx'> </div><div class='ctx'> 	mem.CardOffset = 0;</div><div class='ctx'> 	mem.Page = 0;</div><div class='ctx'> 	res = pcmcia_map_mem_page(dev-&gt;win, &amp;mem);</div><div class='del'>-	if (res != CS_SUCCESS)</div><div class='add'>+	if (res != 0)</div><div class='ctx'> 		goto err_disable;</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;</div><div class='hunk'>@@ -121,11 +121,11 @@ static int __devinit b43_pcmcia_probe(struct pcmcia_device *dev)</div><div class='ctx'> 	dev-&gt;irq.Handler = NULL; /* The handler is registered later. */</div><div class='ctx'> 	dev-&gt;irq.Instance = NULL;</div><div class='ctx'> 	res = pcmcia_request_irq(dev, &amp;dev-&gt;irq);</div><div class='del'>-	if (res != CS_SUCCESS)</div><div class='add'>+	if (res != 0)</div><div class='ctx'> 		goto err_disable;</div><div class='ctx'> </div><div class='ctx'> 	res = pcmcia_request_configuration(dev, &amp;dev-&gt;conf);</div><div class='del'>-	if (res != CS_SUCCESS)</div><div class='add'>+	if (res != 0)</div><div class='ctx'> 		goto err_disable;</div><div class='ctx'> </div><div class='ctx'> 	err = ssb_bus_pcmciabus_register(ssb, dev, win.Base);</div><div class='head'>diff --git a/drivers/net/wireless/b43/phy.h b/drivers/net/wireless/b43/phy.h<br/>deleted file mode 100644<br/>index 4aab10903529..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/b43/phy.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/b43/phy.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,340 +0,0 @@</div><div class='del'>-#ifndef B43_PHY_H_</div><div class='del'>-#define B43_PHY_H_</div><div class='del'>-</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-</div><div class='del'>-struct b43_wldev;</div><div class='del'>-struct b43_phy;</div><div class='del'>-</div><div class='del'>-/*** PHY Registers ***/</div><div class='del'>-</div><div class='del'>-/* Routing */</div><div class='del'>-#define B43_PHYROUTE			0x0C00 /* PHY register routing bits mask */</div><div class='del'>-#define  B43_PHYROUTE_BASE		0x0000 /* Base registers */</div><div class='del'>-#define  B43_PHYROUTE_OFDM_GPHY		0x0400 /* OFDM register routing for G-PHYs */</div><div class='del'>-#define  B43_PHYROUTE_EXT_GPHY		0x0800 /* Extended G-PHY registers */</div><div class='del'>-#define  B43_PHYROUTE_N_BMODE		0x0C00 /* N-PHY BMODE registers */</div><div class='del'>-</div><div class='del'>-/* CCK (B-PHY) registers. */</div><div class='del'>-#define B43_PHY_CCK(reg)		((reg) | B43_PHYROUTE_BASE)</div><div class='del'>-/* N-PHY registers. */</div><div class='del'>-#define B43_PHY_N(reg)			((reg) | B43_PHYROUTE_BASE)</div><div class='del'>-/* N-PHY BMODE registers. */</div><div class='del'>-#define B43_PHY_N_BMODE(reg)		((reg) | B43_PHYROUTE_N_BMODE)</div><div class='del'>-/* OFDM (A-PHY) registers. */</div><div class='del'>-#define B43_PHY_OFDM(reg)		((reg) | B43_PHYROUTE_OFDM_GPHY)</div><div class='del'>-/* Extended G-PHY registers. */</div><div class='del'>-#define B43_PHY_EXTG(reg)		((reg) | B43_PHYROUTE_EXT_GPHY)</div><div class='del'>-</div><div class='del'>-/* OFDM (A) PHY Registers */</div><div class='del'>-#define B43_PHY_VERSION_OFDM		B43_PHY_OFDM(0x00)	/* Versioning register for A-PHY */</div><div class='del'>-#define B43_PHY_BBANDCFG		B43_PHY_OFDM(0x01)	/* Baseband config */</div><div class='del'>-#define  B43_PHY_BBANDCFG_RXANT		0x180	/* RX Antenna selection */</div><div class='del'>-#define  B43_PHY_BBANDCFG_RXANT_SHIFT	7</div><div class='del'>-#define B43_PHY_PWRDOWN			B43_PHY_OFDM(0x03)	/* Powerdown */</div><div class='del'>-#define B43_PHY_CRSTHRES1_R1		B43_PHY_OFDM(0x06)	/* CRS Threshold 1 (phy.rev 1 only) */</div><div class='del'>-#define B43_PHY_LNAHPFCTL		B43_PHY_OFDM(0x1C)	/* LNA/HPF control */</div><div class='del'>-#define B43_PHY_LPFGAINCTL		B43_PHY_OFDM(0x20)	/* LPF Gain control */</div><div class='del'>-#define B43_PHY_ADIVRELATED		B43_PHY_OFDM(0x27)	/* FIXME rename */</div><div class='del'>-#define B43_PHY_CRS0			B43_PHY_OFDM(0x29)</div><div class='del'>-#define  B43_PHY_CRS0_EN		0x4000</div><div class='del'>-#define B43_PHY_PEAK_COUNT		B43_PHY_OFDM(0x30)</div><div class='del'>-#define B43_PHY_ANTDWELL		B43_PHY_OFDM(0x2B)	/* Antenna dwell */</div><div class='del'>-#define  B43_PHY_ANTDWELL_AUTODIV1	0x0100	/* Automatic RX diversity start antenna */</div><div class='del'>-#define B43_PHY_ENCORE			B43_PHY_OFDM(0x49)	/* "Encore" (RangeMax / BroadRange) */</div><div class='del'>-#define  B43_PHY_ENCORE_EN		0x0200	/* Encore enable */</div><div class='del'>-#define B43_PHY_LMS			B43_PHY_OFDM(0x55)</div><div class='del'>-#define B43_PHY_OFDM61			B43_PHY_OFDM(0x61)	/* FIXME rename */</div><div class='del'>-#define  B43_PHY_OFDM61_10		0x0010	/* FIXME rename */</div><div class='del'>-#define B43_PHY_IQBAL			B43_PHY_OFDM(0x69)	/* I/Q balance */</div><div class='del'>-#define B43_PHY_BBTXDC_BIAS		B43_PHY_OFDM(0x6B)	/* Baseband TX DC bias */</div><div class='del'>-#define B43_PHY_OTABLECTL		B43_PHY_OFDM(0x72)	/* OFDM table control (see below) */</div><div class='del'>-#define  B43_PHY_OTABLEOFF		0x03FF	/* OFDM table offset (see below) */</div><div class='del'>-#define  B43_PHY_OTABLENR		0xFC00	/* OFDM table number (see below) */</div><div class='del'>-#define  B43_PHY_OTABLENR_SHIFT		10</div><div class='del'>-#define B43_PHY_OTABLEI			B43_PHY_OFDM(0x73)	/* OFDM table data I */</div><div class='del'>-#define B43_PHY_OTABLEQ			B43_PHY_OFDM(0x74)	/* OFDM table data Q */</div><div class='del'>-#define B43_PHY_HPWR_TSSICTL		B43_PHY_OFDM(0x78)	/* Hardware power TSSI control */</div><div class='del'>-#define B43_PHY_ADCCTL			B43_PHY_OFDM(0x7A)	/* ADC control */</div><div class='del'>-#define B43_PHY_IDLE_TSSI		B43_PHY_OFDM(0x7B)</div><div class='del'>-#define B43_PHY_A_TEMP_SENSE		B43_PHY_OFDM(0x7C)	/* A PHY temperature sense */</div><div class='del'>-#define B43_PHY_NRSSITHRES		B43_PHY_OFDM(0x8A)	/* NRSSI threshold */</div><div class='del'>-#define B43_PHY_ANTWRSETT		B43_PHY_OFDM(0x8C)	/* Antenna WR settle */</div><div class='del'>-#define  B43_PHY_ANTWRSETT_ARXDIV	0x2000	/* Automatic RX diversity enabled */</div><div class='del'>-#define B43_PHY_CLIPPWRDOWNT		B43_PHY_OFDM(0x93)	/* Clip powerdown threshold */</div><div class='del'>-#define B43_PHY_OFDM9B			B43_PHY_OFDM(0x9B)	/* FIXME rename */</div><div class='del'>-#define B43_PHY_N1P1GAIN		B43_PHY_OFDM(0xA0)</div><div class='del'>-#define B43_PHY_P1P2GAIN		B43_PHY_OFDM(0xA1)</div><div class='del'>-#define B43_PHY_N1N2GAIN		B43_PHY_OFDM(0xA2)</div><div class='del'>-#define B43_PHY_CLIPTHRES		B43_PHY_OFDM(0xA3)</div><div class='del'>-#define B43_PHY_CLIPN1P2THRES		B43_PHY_OFDM(0xA4)</div><div class='del'>-#define B43_PHY_CCKSHIFTBITS_WA		B43_PHY_OFDM(0xA5)	/* CCK shiftbits workaround, FIXME rename */</div><div class='del'>-#define B43_PHY_CCKSHIFTBITS		B43_PHY_OFDM(0xA7)	/* FIXME rename */</div><div class='del'>-#define B43_PHY_DIVSRCHIDX		B43_PHY_OFDM(0xA8)	/* Divider search gain/index */</div><div class='del'>-#define B43_PHY_CLIPP2THRES		B43_PHY_OFDM(0xA9)</div><div class='del'>-#define B43_PHY_CLIPP3THRES		B43_PHY_OFDM(0xAA)</div><div class='del'>-#define B43_PHY_DIVP1P2GAIN		B43_PHY_OFDM(0xAB)</div><div class='del'>-#define B43_PHY_DIVSRCHGAINBACK		B43_PHY_OFDM(0xAD)	/* Divider search gain back */</div><div class='del'>-#define B43_PHY_DIVSRCHGAINCHNG		B43_PHY_OFDM(0xAE)	/* Divider search gain change */</div><div class='del'>-#define B43_PHY_CRSTHRES1		B43_PHY_OFDM(0xC0)	/* CRS Threshold 1 (phy.rev &gt;= 2 only) */</div><div class='del'>-#define B43_PHY_CRSTHRES2		B43_PHY_OFDM(0xC1)	/* CRS Threshold 2 (phy.rev &gt;= 2 only) */</div><div class='del'>-#define B43_PHY_TSSIP_LTBASE		B43_PHY_OFDM(0x380)	/* TSSI power lookup table base */</div><div class='del'>-#define B43_PHY_DC_LTBASE		B43_PHY_OFDM(0x3A0)	/* DC lookup table base */</div><div class='del'>-#define B43_PHY_GAIN_LTBASE		B43_PHY_OFDM(0x3C0)	/* Gain lookup table base */</div><div class='del'>-</div><div class='del'>-/* CCK (B) PHY Registers */</div><div class='del'>-#define B43_PHY_VERSION_CCK		B43_PHY_CCK(0x00)	/* Versioning register for B-PHY */</div><div class='del'>-#define B43_PHY_CCKBBANDCFG		B43_PHY_CCK(0x01)	/* Contains antenna 0/1 control bit */</div><div class='del'>-#define B43_PHY_PGACTL			B43_PHY_CCK(0x15)	/* PGA control */</div><div class='del'>-#define  B43_PHY_PGACTL_LPF		0x1000	/* Low pass filter (?) */</div><div class='del'>-#define  B43_PHY_PGACTL_LOWBANDW	0x0040	/* Low bandwidth flag */</div><div class='del'>-#define  B43_PHY_PGACTL_UNKNOWN		0xEFA0</div><div class='del'>-#define B43_PHY_FBCTL1			B43_PHY_CCK(0x18)	/* Frequency bandwidth control 1 */</div><div class='del'>-#define B43_PHY_ITSSI			B43_PHY_CCK(0x29)	/* Idle TSSI */</div><div class='del'>-#define B43_PHY_LO_LEAKAGE		B43_PHY_CCK(0x2D)	/* Measured LO leakage */</div><div class='del'>-#define B43_PHY_ENERGY			B43_PHY_CCK(0x33)	/* Energy */</div><div class='del'>-#define B43_PHY_SYNCCTL			B43_PHY_CCK(0x35)</div><div class='del'>-#define B43_PHY_FBCTL2			B43_PHY_CCK(0x38)	/* Frequency bandwidth control 2 */</div><div class='del'>-#define B43_PHY_DACCTL			B43_PHY_CCK(0x60)	/* DAC control */</div><div class='del'>-#define B43_PHY_RCCALOVER		B43_PHY_CCK(0x78)	/* RC calibration override */</div><div class='del'>-</div><div class='del'>-/* Extended G-PHY Registers */</div><div class='del'>-#define B43_PHY_CLASSCTL		B43_PHY_EXTG(0x02)	/* Classify control */</div><div class='del'>-#define B43_PHY_GTABCTL			B43_PHY_EXTG(0x03)	/* G-PHY table control (see below) */</div><div class='del'>-#define  B43_PHY_GTABOFF		0x03FF	/* G-PHY table offset (see below) */</div><div class='del'>-#define  B43_PHY_GTABNR			0xFC00	/* G-PHY table number (see below) */</div><div class='del'>-#define  B43_PHY_GTABNR_SHIFT		10</div><div class='del'>-#define B43_PHY_GTABDATA		B43_PHY_EXTG(0x04)	/* G-PHY table data */</div><div class='del'>-#define B43_PHY_LO_MASK			B43_PHY_EXTG(0x0F)	/* Local Oscillator control mask */</div><div class='del'>-#define B43_PHY_LO_CTL			B43_PHY_EXTG(0x10)	/* Local Oscillator control */</div><div class='del'>-#define B43_PHY_RFOVER			B43_PHY_EXTG(0x11)	/* RF override */</div><div class='del'>-#define B43_PHY_RFOVERVAL		B43_PHY_EXTG(0x12)	/* RF override value */</div><div class='del'>-#define  B43_PHY_RFOVERVAL_EXTLNA	0x8000</div><div class='del'>-#define  B43_PHY_RFOVERVAL_LNA		0x7000</div><div class='del'>-#define  B43_PHY_RFOVERVAL_LNA_SHIFT	12</div><div class='del'>-#define  B43_PHY_RFOVERVAL_PGA		0x0F00</div><div class='del'>-#define  B43_PHY_RFOVERVAL_PGA_SHIFT	8</div><div class='del'>-#define  B43_PHY_RFOVERVAL_UNK		0x0010	/* Unknown, always set. */</div><div class='del'>-#define  B43_PHY_RFOVERVAL_TRSWRX	0x00E0</div><div class='del'>-#define  B43_PHY_RFOVERVAL_BW		0x0003	/* Bandwidth flags */</div><div class='del'>-#define   B43_PHY_RFOVERVAL_BW_LPF	0x0001	/* Low Pass Filter */</div><div class='del'>-#define   B43_PHY_RFOVERVAL_BW_LBW	0x0002	/* Low Bandwidth (when set), high when unset */</div><div class='del'>-#define B43_PHY_ANALOGOVER		B43_PHY_EXTG(0x14)	/* Analog override */</div><div class='del'>-#define B43_PHY_ANALOGOVERVAL		B43_PHY_EXTG(0x15)	/* Analog override value */</div><div class='del'>-</div><div class='del'>-/*** OFDM table numbers ***/</div><div class='del'>-#define B43_OFDMTAB(number, offset)	(((number) &lt;&lt; B43_PHY_OTABLENR_SHIFT) | (offset))</div><div class='del'>-#define B43_OFDMTAB_AGC1		B43_OFDMTAB(0x00, 0)</div><div class='del'>-#define B43_OFDMTAB_GAIN0		B43_OFDMTAB(0x00, 0)</div><div class='del'>-#define B43_OFDMTAB_GAINX		B43_OFDMTAB(0x01, 0)	//TODO rename</div><div class='del'>-#define B43_OFDMTAB_GAIN1		B43_OFDMTAB(0x01, 4)</div><div class='del'>-#define B43_OFDMTAB_AGC3		B43_OFDMTAB(0x02, 0)</div><div class='del'>-#define B43_OFDMTAB_GAIN2		B43_OFDMTAB(0x02, 3)</div><div class='del'>-#define B43_OFDMTAB_LNAHPFGAIN1		B43_OFDMTAB(0x03, 0)</div><div class='del'>-#define B43_OFDMTAB_WRSSI		B43_OFDMTAB(0x04, 0)</div><div class='del'>-#define B43_OFDMTAB_LNAHPFGAIN2		B43_OFDMTAB(0x04, 0)</div><div class='del'>-#define B43_OFDMTAB_NOISESCALE		B43_OFDMTAB(0x05, 0)</div><div class='del'>-#define B43_OFDMTAB_AGC2		B43_OFDMTAB(0x06, 0)</div><div class='del'>-#define B43_OFDMTAB_ROTOR		B43_OFDMTAB(0x08, 0)</div><div class='del'>-#define B43_OFDMTAB_ADVRETARD		B43_OFDMTAB(0x09, 0)</div><div class='del'>-#define B43_OFDMTAB_DAC			B43_OFDMTAB(0x0C, 0)</div><div class='del'>-#define B43_OFDMTAB_DC			B43_OFDMTAB(0x0E, 7)</div><div class='del'>-#define B43_OFDMTAB_PWRDYN2		B43_OFDMTAB(0x0E, 12)</div><div class='del'>-#define B43_OFDMTAB_LNAGAIN		B43_OFDMTAB(0x0E, 13)</div><div class='del'>-#define B43_OFDMTAB_UNKNOWN_0F		B43_OFDMTAB(0x0F, 0)	//TODO rename</div><div class='del'>-#define B43_OFDMTAB_UNKNOWN_APHY	B43_OFDMTAB(0x0F, 7)	//TODO rename</div><div class='del'>-#define B43_OFDMTAB_LPFGAIN		B43_OFDMTAB(0x0F, 12)</div><div class='del'>-#define B43_OFDMTAB_RSSI		B43_OFDMTAB(0x10, 0)</div><div class='del'>-#define B43_OFDMTAB_UNKNOWN_11		B43_OFDMTAB(0x11, 4)	//TODO rename</div><div class='del'>-#define B43_OFDMTAB_AGC1_R1		B43_OFDMTAB(0x13, 0)</div><div class='del'>-#define B43_OFDMTAB_GAINX_R1		B43_OFDMTAB(0x14, 0)	//TODO remove!</div><div class='del'>-#define B43_OFDMTAB_MINSIGSQ		B43_OFDMTAB(0x14, 0)</div><div class='del'>-#define B43_OFDMTAB_AGC3_R1		B43_OFDMTAB(0x15, 0)</div><div class='del'>-#define B43_OFDMTAB_WRSSI_R1		B43_OFDMTAB(0x15, 4)</div><div class='del'>-#define B43_OFDMTAB_TSSI		B43_OFDMTAB(0x15, 0)</div><div class='del'>-#define B43_OFDMTAB_DACRFPABB		B43_OFDMTAB(0x16, 0)</div><div class='del'>-#define B43_OFDMTAB_DACOFF		B43_OFDMTAB(0x17, 0)</div><div class='del'>-#define B43_OFDMTAB_DCBIAS		B43_OFDMTAB(0x18, 0)</div><div class='del'>-</div><div class='del'>-u16 b43_ofdmtab_read16(struct b43_wldev *dev, u16 table, u16 offset);</div><div class='del'>-void b43_ofdmtab_write16(struct b43_wldev *dev, u16 table,</div><div class='del'>-			 u16 offset, u16 value);</div><div class='del'>-u32 b43_ofdmtab_read32(struct b43_wldev *dev, u16 table, u16 offset);</div><div class='del'>-void b43_ofdmtab_write32(struct b43_wldev *dev, u16 table,</div><div class='del'>-			 u16 offset, u32 value);</div><div class='del'>-</div><div class='del'>-/*** G-PHY table numbers */</div><div class='del'>-#define B43_GTAB(number, offset)	(((number) &lt;&lt; B43_PHY_GTABNR_SHIFT) | (offset))</div><div class='del'>-#define B43_GTAB_NRSSI			B43_GTAB(0x00, 0)</div><div class='del'>-#define B43_GTAB_TRFEMW			B43_GTAB(0x0C, 0x120)</div><div class='del'>-#define B43_GTAB_ORIGTR			B43_GTAB(0x2E, 0x298)</div><div class='del'>-</div><div class='del'>-u16 b43_gtab_read(struct b43_wldev *dev, u16 table, u16 offset);	//TODO implement</div><div class='del'>-void b43_gtab_write(struct b43_wldev *dev, u16 table, u16 offset, u16 value);	//TODO implement</div><div class='del'>-</div><div class='del'>-#define B43_DEFAULT_CHANNEL_A	36</div><div class='del'>-#define B43_DEFAULT_CHANNEL_BG	6</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	B43_ANTENNA0,		/* Antenna 0 */</div><div class='del'>-	B43_ANTENNA1,		/* Antenna 0 */</div><div class='del'>-	B43_ANTENNA_AUTO1,	/* Automatic, starting with antenna 1 */</div><div class='del'>-	B43_ANTENNA_AUTO0,	/* Automatic, starting with antenna 0 */</div><div class='del'>-	B43_ANTENNA2,</div><div class='del'>-	B43_ANTENNA3 = 8,</div><div class='del'>-</div><div class='del'>-	B43_ANTENNA_AUTO = B43_ANTENNA_AUTO0,</div><div class='del'>-	B43_ANTENNA_DEFAULT = B43_ANTENNA_AUTO,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	B43_INTERFMODE_NONE,</div><div class='del'>-	B43_INTERFMODE_NONWLAN,</div><div class='del'>-	B43_INTERFMODE_MANUALWLAN,</div><div class='del'>-	B43_INTERFMODE_AUTOWLAN,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Masks for the different PHY versioning registers. */</div><div class='del'>-#define B43_PHYVER_ANALOG		0xF000</div><div class='del'>-#define B43_PHYVER_ANALOG_SHIFT		12</div><div class='del'>-#define B43_PHYVER_TYPE			0x0F00</div><div class='del'>-#define B43_PHYVER_TYPE_SHIFT		8</div><div class='del'>-#define B43_PHYVER_VERSION		0x00FF</div><div class='del'>-</div><div class='del'>-void b43_phy_lock(struct b43_wldev *dev);</div><div class='del'>-void b43_phy_unlock(struct b43_wldev *dev);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Read a value from a PHY register */</div><div class='del'>-u16 b43_phy_read(struct b43_wldev *dev, u16 offset);</div><div class='del'>-/* Write a value to a PHY register */</div><div class='del'>-void b43_phy_write(struct b43_wldev *dev, u16 offset, u16 val);</div><div class='del'>-/* Mask a PHY register with a mask */</div><div class='del'>-void b43_phy_mask(struct b43_wldev *dev, u16 offset, u16 mask);</div><div class='del'>-/* OR a PHY register with a bitmap */</div><div class='del'>-void b43_phy_set(struct b43_wldev *dev, u16 offset, u16 set);</div><div class='del'>-/* Mask and OR a PHY register with a mask and bitmap */</div><div class='del'>-void b43_phy_maskset(struct b43_wldev *dev, u16 offset, u16 mask, u16 set);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-int b43_phy_init_tssi2dbm_table(struct b43_wldev *dev);</div><div class='del'>-</div><div class='del'>-void b43_phy_early_init(struct b43_wldev *dev);</div><div class='del'>-int b43_phy_init(struct b43_wldev *dev);</div><div class='del'>-</div><div class='del'>-void b43_set_rx_antenna(struct b43_wldev *dev, int antenna);</div><div class='del'>-</div><div class='del'>-void b43_phy_xmitpower(struct b43_wldev *dev);</div><div class='del'>-</div><div class='del'>-/* Returns the boolean whether the board has HardwarePowerControl */</div><div class='del'>-bool b43_has_hardware_pctl(struct b43_phy *phy);</div><div class='del'>-/* Returns the boolean whether "TX Magnification" is enabled. */</div><div class='del'>-#define has_tx_magnification(phy) \</div><div class='del'>-	(((phy)-&gt;rev &gt;= 2) &amp;&amp;			\</div><div class='del'>-	 ((phy)-&gt;radio_ver == 0x2050) &amp;&amp;	\</div><div class='del'>-	 ((phy)-&gt;radio_rev == 8))</div><div class='del'>-/* Card uses the loopback gain stuff */</div><div class='del'>-#define has_loopback_gain(phy) \</div><div class='del'>-	(((phy)-&gt;rev &gt; 1) || ((phy)-&gt;gmode))</div><div class='del'>-</div><div class='del'>-/* Radio Attenuation (RF Attenuation) */</div><div class='del'>-struct b43_rfatt {</div><div class='del'>-	u8 att;			/* Attenuation value */</div><div class='del'>-	bool with_padmix;	/* Flag, PAD Mixer enabled. */</div><div class='del'>-};</div><div class='del'>-struct b43_rfatt_list {</div><div class='del'>-	/* Attenuation values list */</div><div class='del'>-	const struct b43_rfatt *list;</div><div class='del'>-	u8 len;</div><div class='del'>-	/* Minimum/Maximum attenuation values */</div><div class='del'>-	u8 min_val;</div><div class='del'>-	u8 max_val;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Returns true, if the values are the same. */</div><div class='del'>-static inline bool b43_compare_rfatt(const struct b43_rfatt *a,</div><div class='del'>-				     const struct b43_rfatt *b)</div><div class='del'>-{</div><div class='del'>-	return ((a-&gt;att == b-&gt;att) &amp;&amp;</div><div class='del'>-		(a-&gt;with_padmix == b-&gt;with_padmix));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Baseband Attenuation */</div><div class='del'>-struct b43_bbatt {</div><div class='del'>-	u8 att;			/* Attenuation value */</div><div class='del'>-};</div><div class='del'>-struct b43_bbatt_list {</div><div class='del'>-	/* Attenuation values list */</div><div class='del'>-	const struct b43_bbatt *list;</div><div class='del'>-	u8 len;</div><div class='del'>-	/* Minimum/Maximum attenuation values */</div><div class='del'>-	u8 min_val;</div><div class='del'>-	u8 max_val;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Returns true, if the values are the same. */</div><div class='del'>-static inline bool b43_compare_bbatt(const struct b43_bbatt *a,</div><div class='del'>-				     const struct b43_bbatt *b)</div><div class='del'>-{</div><div class='del'>-	return (a-&gt;att == b-&gt;att);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* tx_control bits. */</div><div class='del'>-#define B43_TXCTL_PA3DB		0x40	/* PA Gain 3dB */</div><div class='del'>-#define B43_TXCTL_PA2DB		0x20	/* PA Gain 2dB */</div><div class='del'>-#define B43_TXCTL_TXMIX		0x10	/* TX Mixer Gain */</div><div class='del'>-</div><div class='del'>-/* Write BasebandAttenuation value to the device. */</div><div class='del'>-void b43_phy_set_baseband_attenuation(struct b43_wldev *dev,</div><div class='del'>-				      u16 baseband_attenuation);</div><div class='del'>-</div><div class='del'>-extern const u8 b43_radio_channel_codes_bg[];</div><div class='del'>-</div><div class='del'>-void b43_radio_lock(struct b43_wldev *dev);</div><div class='del'>-void b43_radio_unlock(struct b43_wldev *dev);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Read a value from a 16bit radio register */</div><div class='del'>-u16 b43_radio_read16(struct b43_wldev *dev, u16 offset);</div><div class='del'>-/* Write a value to a 16bit radio register */</div><div class='del'>-void b43_radio_write16(struct b43_wldev *dev, u16 offset, u16 val);</div><div class='del'>-/* Mask a 16bit radio register with a mask */</div><div class='del'>-void b43_radio_mask(struct b43_wldev *dev, u16 offset, u16 mask);</div><div class='del'>-/* OR a 16bit radio register with a bitmap */</div><div class='del'>-void b43_radio_set(struct b43_wldev *dev, u16 offset, u16 set);</div><div class='del'>-/* Mask and OR a PHY register with a mask and bitmap */</div><div class='del'>-void b43_radio_maskset(struct b43_wldev *dev, u16 offset, u16 mask, u16 set);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-u16 b43_radio_init2050(struct b43_wldev *dev);</div><div class='del'>-void b43_radio_init2060(struct b43_wldev *dev);</div><div class='del'>-</div><div class='del'>-void b43_radio_turn_on(struct b43_wldev *dev);</div><div class='del'>-void b43_radio_turn_off(struct b43_wldev *dev, bool force);</div><div class='del'>-</div><div class='del'>-int b43_radio_selectchannel(struct b43_wldev *dev, u8 channel,</div><div class='del'>-			    int synthetic_pu_workaround);</div><div class='del'>-</div><div class='del'>-u8 b43_radio_aci_detect(struct b43_wldev *dev, u8 channel);</div><div class='del'>-u8 b43_radio_aci_scan(struct b43_wldev *dev);</div><div class='del'>-</div><div class='del'>-int b43_radio_set_interference_mitigation(struct b43_wldev *dev, int mode);</div><div class='del'>-</div><div class='del'>-void b43_calc_nrssi_slope(struct b43_wldev *dev);</div><div class='del'>-void b43_calc_nrssi_threshold(struct b43_wldev *dev);</div><div class='del'>-s16 b43_nrssi_hw_read(struct b43_wldev *dev, u16 offset);</div><div class='del'>-void b43_nrssi_hw_write(struct b43_wldev *dev, u16 offset, s16 val);</div><div class='del'>-void b43_nrssi_hw_update(struct b43_wldev *dev, u16 val);</div><div class='del'>-void b43_nrssi_mem_update(struct b43_wldev *dev);</div><div class='del'>-</div><div class='del'>-void b43_radio_set_tx_iq(struct b43_wldev *dev);</div><div class='del'>-u16 b43_radio_calibrationvalue(struct b43_wldev *dev);</div><div class='del'>-</div><div class='del'>-void b43_put_attenuation_into_ranges(struct b43_wldev *dev,</div><div class='del'>-				     int *_bbatt, int *_rfatt);</div><div class='del'>-</div><div class='del'>-void b43_set_txpower_g(struct b43_wldev *dev,</div><div class='del'>-		       const struct b43_bbatt *bbatt,</div><div class='del'>-		       const struct b43_rfatt *rfatt, u8 tx_control);</div><div class='del'>-</div><div class='del'>-#endif /* B43_PHY_H_ */</div><div class='head'>diff --git a/drivers/net/wireless/b43/phy_a.c b/drivers/net/wireless/b43/phy_a.c<br/>new file mode 100644<br/>index 000000000000..0f1a84c9de61<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/b43/phy_a.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/b43/phy_a.c</a></div><div class='hunk'>@@ -0,0 +1,643 @@</div><div class='add'>+/*</div><div class='add'>+</div><div class='add'>+  Broadcom B43 wireless driver</div><div class='add'>+  IEEE 802.11a PHY driver</div><div class='add'>+</div><div class='add'>+  Copyright (c) 2005 Martin Langer &lt;martin-langer@gmx.de&gt;,</div><div class='add'>+  Copyright (c) 2005-2007 Stefano Brivio &lt;stefano.brivio@polimi.it&gt;</div><div class='add'>+  Copyright (c) 2005-2008 Michael Buesch &lt;mb@bu3sch.de&gt;</div><div class='add'>+  Copyright (c) 2005, 2006 Danny van Dyk &lt;kugelfang@gentoo.org&gt;</div><div class='add'>+  Copyright (c) 2005, 2006 Andreas Jaggi &lt;andreas.jaggi@waterwave.ch&gt;</div><div class='add'>+</div><div class='add'>+  This program is free software; you can redistribute it and/or modify</div><div class='add'>+  it under the terms of the GNU General Public License as published by</div><div class='add'>+  the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+  (at your option) any later version.</div><div class='add'>+</div><div class='add'>+  This program is distributed in the hope that it will be useful,</div><div class='add'>+  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+  GNU General Public License for more details.</div><div class='add'>+</div><div class='add'>+  You should have received a copy of the GNU General Public License</div><div class='add'>+  along with this program; see the file COPYING.  If not, write to</div><div class='add'>+  the Free Software Foundation, Inc., 51 Franklin Steet, Fifth Floor,</div><div class='add'>+  Boston, MA 02110-1301, USA.</div><div class='add'>+</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#include "b43.h"</div><div class='add'>+#include "phy_a.h"</div><div class='add'>+#include "phy_common.h"</div><div class='add'>+#include "wa.h"</div><div class='add'>+#include "tables.h"</div><div class='add'>+#include "main.h"</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Get the freq, as it has to be written to the device. */</div><div class='add'>+static inline u16 channel2freq_a(u8 channel)</div><div class='add'>+{</div><div class='add'>+	B43_WARN_ON(channel &gt; 200);</div><div class='add'>+</div><div class='add'>+	return (5000 + 5 * channel);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u16 freq_r3A_value(u16 frequency)</div><div class='add'>+{</div><div class='add'>+	u16 value;</div><div class='add'>+</div><div class='add'>+	if (frequency &lt; 5091)</div><div class='add'>+		value = 0x0040;</div><div class='add'>+	else if (frequency &lt; 5321)</div><div class='add'>+		value = 0x0000;</div><div class='add'>+	else if (frequency &lt; 5806)</div><div class='add'>+		value = 0x0080;</div><div class='add'>+	else</div><div class='add'>+		value = 0x0040;</div><div class='add'>+</div><div class='add'>+	return value;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#if 0</div><div class='add'>+/* This function converts a TSSI value to dBm in Q5.2 */</div><div class='add'>+static s8 b43_aphy_estimate_power_out(struct b43_wldev *dev, s8 tssi)</div><div class='add'>+{</div><div class='add'>+	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='add'>+	struct b43_phy_a *aphy = phy-&gt;a;</div><div class='add'>+	s8 dbm = 0;</div><div class='add'>+	s32 tmp;</div><div class='add'>+</div><div class='add'>+	tmp = (aphy-&gt;tgt_idle_tssi - aphy-&gt;cur_idle_tssi + tssi);</div><div class='add'>+	tmp += 0x80;</div><div class='add'>+	tmp = clamp_val(tmp, 0x00, 0xFF);</div><div class='add'>+	dbm = aphy-&gt;tssi2dbm[tmp];</div><div class='add'>+	//TODO: There's a FIXME on the specs</div><div class='add'>+</div><div class='add'>+	return dbm;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+void b43_radio_set_tx_iq(struct b43_wldev *dev)</div><div class='add'>+{</div><div class='add'>+	static const u8 data_high[5] = { 0x00, 0x40, 0x80, 0x90, 0xD0 };</div><div class='add'>+	static const u8 data_low[5] = { 0x00, 0x01, 0x05, 0x06, 0x0A };</div><div class='add'>+	u16 tmp = b43_radio_read16(dev, 0x001E);</div><div class='add'>+	int i, j;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 5; i++) {</div><div class='add'>+		for (j = 0; j &lt; 5; j++) {</div><div class='add'>+			if (tmp == (data_high[i] &lt;&lt; 4 | data_low[j])) {</div><div class='add'>+				b43_phy_write(dev, 0x0069,</div><div class='add'>+					      (i - j) &lt;&lt; 8 | 0x00C0);</div><div class='add'>+				return;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void aphy_channel_switch(struct b43_wldev *dev, unsigned int channel)</div><div class='add'>+{</div><div class='add'>+	u16 freq, r8, tmp;</div><div class='add'>+</div><div class='add'>+	freq = channel2freq_a(channel);</div><div class='add'>+</div><div class='add'>+	r8 = b43_radio_read16(dev, 0x0008);</div><div class='add'>+	b43_write16(dev, 0x03F0, freq);</div><div class='add'>+	b43_radio_write16(dev, 0x0008, r8);</div><div class='add'>+</div><div class='add'>+	//TODO: write max channel TX power? to Radio 0x2D</div><div class='add'>+	tmp = b43_radio_read16(dev, 0x002E);</div><div class='add'>+	tmp &amp;= 0x0080;</div><div class='add'>+	//TODO: OR tmp with the Power out estimation for this channel?</div><div class='add'>+	b43_radio_write16(dev, 0x002E, tmp);</div><div class='add'>+</div><div class='add'>+	if (freq &gt;= 4920 &amp;&amp; freq &lt;= 5500) {</div><div class='add'>+		/*</div><div class='add'>+		 * r8 = (((freq * 15 * 0xE1FC780F) &gt;&gt; 32) / 29) &amp; 0x0F;</div><div class='add'>+		 *    = (freq * 0.025862069</div><div class='add'>+		 */</div><div class='add'>+		r8 = 3 * freq / 116;	/* is equal to r8 = freq * 0.025862 */</div><div class='add'>+	}</div><div class='add'>+	b43_radio_write16(dev, 0x0007, (r8 &lt;&lt; 4) | r8);</div><div class='add'>+	b43_radio_write16(dev, 0x0020, (r8 &lt;&lt; 4) | r8);</div><div class='add'>+	b43_radio_write16(dev, 0x0021, (r8 &lt;&lt; 4) | r8);</div><div class='add'>+	b43_radio_write16(dev, 0x0022, (b43_radio_read16(dev, 0x0022)</div><div class='add'>+					&amp; 0x000F) | (r8 &lt;&lt; 4));</div><div class='add'>+	b43_radio_write16(dev, 0x002A, (r8 &lt;&lt; 4));</div><div class='add'>+	b43_radio_write16(dev, 0x002B, (r8 &lt;&lt; 4));</div><div class='add'>+	b43_radio_write16(dev, 0x0008, (b43_radio_read16(dev, 0x0008)</div><div class='add'>+					&amp; 0x00F0) | (r8 &lt;&lt; 4));</div><div class='add'>+	b43_radio_write16(dev, 0x0029, (b43_radio_read16(dev, 0x0029)</div><div class='add'>+					&amp; 0xFF0F) | 0x00B0);</div><div class='add'>+	b43_radio_write16(dev, 0x0035, 0x00AA);</div><div class='add'>+	b43_radio_write16(dev, 0x0036, 0x0085);</div><div class='add'>+	b43_radio_write16(dev, 0x003A, (b43_radio_read16(dev, 0x003A)</div><div class='add'>+					&amp; 0xFF20) |</div><div class='add'>+			  freq_r3A_value(freq));</div><div class='add'>+	b43_radio_write16(dev, 0x003D,</div><div class='add'>+			  b43_radio_read16(dev, 0x003D) &amp; 0x00FF);</div><div class='add'>+	b43_radio_write16(dev, 0x0081, (b43_radio_read16(dev, 0x0081)</div><div class='add'>+					&amp; 0xFF7F) | 0x0080);</div><div class='add'>+	b43_radio_write16(dev, 0x0035,</div><div class='add'>+			  b43_radio_read16(dev, 0x0035) &amp; 0xFFEF);</div><div class='add'>+	b43_radio_write16(dev, 0x0035, (b43_radio_read16(dev, 0x0035)</div><div class='add'>+					&amp; 0xFFEF) | 0x0010);</div><div class='add'>+	b43_radio_set_tx_iq(dev);</div><div class='add'>+	//TODO: TSSI2dbm workaround</div><div class='add'>+//FIXME	b43_phy_xmitpower(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void b43_radio_init2060(struct b43_wldev *dev)</div><div class='add'>+{</div><div class='add'>+	b43_radio_write16(dev, 0x0004, 0x00C0);</div><div class='add'>+	b43_radio_write16(dev, 0x0005, 0x0008);</div><div class='add'>+	b43_radio_write16(dev, 0x0009, 0x0040);</div><div class='add'>+	b43_radio_write16(dev, 0x0005, 0x00AA);</div><div class='add'>+	b43_radio_write16(dev, 0x0032, 0x008F);</div><div class='add'>+	b43_radio_write16(dev, 0x0006, 0x008F);</div><div class='add'>+	b43_radio_write16(dev, 0x0034, 0x008F);</div><div class='add'>+	b43_radio_write16(dev, 0x002C, 0x0007);</div><div class='add'>+	b43_radio_write16(dev, 0x0082, 0x0080);</div><div class='add'>+	b43_radio_write16(dev, 0x0080, 0x0000);</div><div class='add'>+	b43_radio_write16(dev, 0x003F, 0x00DA);</div><div class='add'>+	b43_radio_write16(dev, 0x0005, b43_radio_read16(dev, 0x0005) &amp; ~0x0008);</div><div class='add'>+	b43_radio_write16(dev, 0x0081, b43_radio_read16(dev, 0x0081) &amp; ~0x0010);</div><div class='add'>+	b43_radio_write16(dev, 0x0081, b43_radio_read16(dev, 0x0081) &amp; ~0x0020);</div><div class='add'>+	b43_radio_write16(dev, 0x0081, b43_radio_read16(dev, 0x0081) &amp; ~0x0020);</div><div class='add'>+	msleep(1);		/* delay 400usec */</div><div class='add'>+</div><div class='add'>+	b43_radio_write16(dev, 0x0081,</div><div class='add'>+			  (b43_radio_read16(dev, 0x0081) &amp; ~0x0020) | 0x0010);</div><div class='add'>+	msleep(1);		/* delay 400usec */</div><div class='add'>+</div><div class='add'>+	b43_radio_write16(dev, 0x0005,</div><div class='add'>+			  (b43_radio_read16(dev, 0x0005) &amp; ~0x0008) | 0x0008);</div><div class='add'>+	b43_radio_write16(dev, 0x0085, b43_radio_read16(dev, 0x0085) &amp; ~0x0010);</div><div class='add'>+	b43_radio_write16(dev, 0x0005, b43_radio_read16(dev, 0x0005) &amp; ~0x0008);</div><div class='add'>+	b43_radio_write16(dev, 0x0081, b43_radio_read16(dev, 0x0081) &amp; ~0x0040);</div><div class='add'>+	b43_radio_write16(dev, 0x0081,</div><div class='add'>+			  (b43_radio_read16(dev, 0x0081) &amp; ~0x0040) | 0x0040);</div><div class='add'>+	b43_radio_write16(dev, 0x0005,</div><div class='add'>+			  (b43_radio_read16(dev, 0x0081) &amp; ~0x0008) | 0x0008);</div><div class='add'>+	b43_phy_write(dev, 0x0063, 0xDDC6);</div><div class='add'>+	b43_phy_write(dev, 0x0069, 0x07BE);</div><div class='add'>+	b43_phy_write(dev, 0x006A, 0x0000);</div><div class='add'>+</div><div class='add'>+	aphy_channel_switch(dev, dev-&gt;phy.ops-&gt;get_default_chan(dev));</div><div class='add'>+</div><div class='add'>+	msleep(1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void b43_phy_rssiagc(struct b43_wldev *dev, u8 enable)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;phy.rev &lt; 3) {</div><div class='add'>+		if (enable)</div><div class='add'>+			for (i = 0; i &lt; B43_TAB_RSSIAGC1_SIZE; i++) {</div><div class='add'>+				b43_ofdmtab_write16(dev,</div><div class='add'>+					B43_OFDMTAB_LNAHPFGAIN1, i, 0xFFF8);</div><div class='add'>+				b43_ofdmtab_write16(dev,</div><div class='add'>+					B43_OFDMTAB_WRSSI, i, 0xFFF8);</div><div class='add'>+			}</div><div class='add'>+		else</div><div class='add'>+			for (i = 0; i &lt; B43_TAB_RSSIAGC1_SIZE; i++) {</div><div class='add'>+				b43_ofdmtab_write16(dev,</div><div class='add'>+					B43_OFDMTAB_LNAHPFGAIN1, i, b43_tab_rssiagc1[i]);</div><div class='add'>+				b43_ofdmtab_write16(dev,</div><div class='add'>+					B43_OFDMTAB_WRSSI, i, b43_tab_rssiagc1[i]);</div><div class='add'>+			}</div><div class='add'>+	} else {</div><div class='add'>+		if (enable)</div><div class='add'>+			for (i = 0; i &lt; B43_TAB_RSSIAGC1_SIZE; i++)</div><div class='add'>+				b43_ofdmtab_write16(dev,</div><div class='add'>+					B43_OFDMTAB_WRSSI, i, 0x0820);</div><div class='add'>+		else</div><div class='add'>+			for (i = 0; i &lt; B43_TAB_RSSIAGC2_SIZE; i++)</div><div class='add'>+				b43_ofdmtab_write16(dev,</div><div class='add'>+					B43_OFDMTAB_WRSSI, i, b43_tab_rssiagc2[i]);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void b43_phy_ww(struct b43_wldev *dev)</div><div class='add'>+{</div><div class='add'>+	u16 b, curr_s, best_s = 0xFFFF;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	b43_phy_write(dev, B43_PHY_CRS0,</div><div class='add'>+		b43_phy_read(dev, B43_PHY_CRS0) &amp; ~B43_PHY_CRS0_EN);</div><div class='add'>+	b43_phy_write(dev, B43_PHY_OFDM(0x1B),</div><div class='add'>+		b43_phy_read(dev, B43_PHY_OFDM(0x1B)) | 0x1000);</div><div class='add'>+	b43_phy_write(dev, B43_PHY_OFDM(0x82),</div><div class='add'>+		(b43_phy_read(dev, B43_PHY_OFDM(0x82)) &amp; 0xF0FF) | 0x0300);</div><div class='add'>+	b43_radio_write16(dev, 0x0009,</div><div class='add'>+		b43_radio_read16(dev, 0x0009) | 0x0080);</div><div class='add'>+	b43_radio_write16(dev, 0x0012,</div><div class='add'>+		(b43_radio_read16(dev, 0x0012) &amp; 0xFFFC) | 0x0002);</div><div class='add'>+	b43_wa_initgains(dev);</div><div class='add'>+	b43_phy_write(dev, B43_PHY_OFDM(0xBA), 0x3ED5);</div><div class='add'>+	b = b43_phy_read(dev, B43_PHY_PWRDOWN);</div><div class='add'>+	b43_phy_write(dev, B43_PHY_PWRDOWN, (b &amp; 0xFFF8) | 0x0005);</div><div class='add'>+	b43_radio_write16(dev, 0x0004,</div><div class='add'>+		b43_radio_read16(dev, 0x0004) | 0x0004);</div><div class='add'>+	for (i = 0x10; i &lt;= 0x20; i++) {</div><div class='add'>+		b43_radio_write16(dev, 0x0013, i);</div><div class='add'>+		curr_s = b43_phy_read(dev, B43_PHY_OTABLEQ) &amp; 0x00FF;</div><div class='add'>+		if (!curr_s) {</div><div class='add'>+			best_s = 0x0000;</div><div class='add'>+			break;</div><div class='add'>+		} else if (curr_s &gt;= 0x0080)</div><div class='add'>+			curr_s = 0x0100 - curr_s;</div><div class='add'>+		if (curr_s &lt; best_s)</div><div class='add'>+			best_s = curr_s;</div><div class='add'>+	}</div><div class='add'>+	b43_phy_write(dev, B43_PHY_PWRDOWN, b);</div><div class='add'>+	b43_radio_write16(dev, 0x0004,</div><div class='add'>+		b43_radio_read16(dev, 0x0004) &amp; 0xFFFB);</div><div class='add'>+	b43_radio_write16(dev, 0x0013, best_s);</div><div class='add'>+	b43_ofdmtab_write16(dev, B43_OFDMTAB_AGC1_R1, 0, 0xFFEC);</div><div class='add'>+	b43_phy_write(dev, B43_PHY_OFDM(0xB7), 0x1E80);</div><div class='add'>+	b43_phy_write(dev, B43_PHY_OFDM(0xB6), 0x1C00);</div><div class='add'>+	b43_phy_write(dev, B43_PHY_OFDM(0xB5), 0x0EC0);</div><div class='add'>+	b43_phy_write(dev, B43_PHY_OFDM(0xB2), 0x00C0);</div><div class='add'>+	b43_phy_write(dev, B43_PHY_OFDM(0xB9), 0x1FFF);</div><div class='add'>+	b43_phy_write(dev, B43_PHY_OFDM(0xBB),</div><div class='add'>+		(b43_phy_read(dev, B43_PHY_OFDM(0xBB)) &amp; 0xF000) | 0x0053);</div><div class='add'>+	b43_phy_write(dev, B43_PHY_OFDM61,</div><div class='add'>+		(b43_phy_read(dev, B43_PHY_OFDM61) &amp; 0xFE1F) | 0x0120);</div><div class='add'>+	b43_phy_write(dev, B43_PHY_OFDM(0x13),</div><div class='add'>+		(b43_phy_read(dev, B43_PHY_OFDM(0x13)) &amp; 0x0FFF) | 0x3000);</div><div class='add'>+	b43_phy_write(dev, B43_PHY_OFDM(0x14),</div><div class='add'>+		(b43_phy_read(dev, B43_PHY_OFDM(0x14)) &amp; 0x0FFF) | 0x3000);</div><div class='add'>+	b43_ofdmtab_write16(dev, B43_OFDMTAB_AGC1, 6, 0x0017);</div><div class='add'>+	for (i = 0; i &lt; 6; i++)</div><div class='add'>+		b43_ofdmtab_write16(dev, B43_OFDMTAB_AGC1, i, 0x000F);</div><div class='add'>+	b43_ofdmtab_write16(dev, B43_OFDMTAB_AGC1, 0x0D, 0x000E);</div><div class='add'>+	b43_ofdmtab_write16(dev, B43_OFDMTAB_AGC1, 0x0E, 0x0011);</div><div class='add'>+	b43_ofdmtab_write16(dev, B43_OFDMTAB_AGC1, 0x0F, 0x0013);</div><div class='add'>+	b43_phy_write(dev, B43_PHY_OFDM(0x33), 0x5030);</div><div class='add'>+	b43_phy_write(dev, B43_PHY_CRS0,</div><div class='add'>+		b43_phy_read(dev, B43_PHY_CRS0) | B43_PHY_CRS0_EN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hardware_pctl_init_aphy(struct b43_wldev *dev)</div><div class='add'>+{</div><div class='add'>+	//TODO</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void b43_phy_inita(struct b43_wldev *dev)</div><div class='add'>+{</div><div class='add'>+	struct ssb_bus *bus = dev-&gt;dev-&gt;bus;</div><div class='add'>+	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='add'>+</div><div class='add'>+	/* This lowlevel A-PHY init is also called from G-PHY init.</div><div class='add'>+	 * So we must not access phy-&gt;a, if called from G-PHY code.</div><div class='add'>+	 */</div><div class='add'>+	B43_WARN_ON((phy-&gt;type != B43_PHYTYPE_A) &amp;&amp;</div><div class='add'>+		    (phy-&gt;type != B43_PHYTYPE_G));</div><div class='add'>+</div><div class='add'>+	might_sleep();</div><div class='add'>+</div><div class='add'>+	if (phy-&gt;rev &gt;= 6) {</div><div class='add'>+		if (phy-&gt;type == B43_PHYTYPE_A)</div><div class='add'>+			b43_phy_write(dev, B43_PHY_OFDM(0x1B),</div><div class='add'>+				b43_phy_read(dev, B43_PHY_OFDM(0x1B)) &amp; ~0x1000);</div><div class='add'>+		if (b43_phy_read(dev, B43_PHY_ENCORE) &amp; B43_PHY_ENCORE_EN)</div><div class='add'>+			b43_phy_write(dev, B43_PHY_ENCORE,</div><div class='add'>+				b43_phy_read(dev, B43_PHY_ENCORE) | 0x0010);</div><div class='add'>+		else</div><div class='add'>+			b43_phy_write(dev, B43_PHY_ENCORE,</div><div class='add'>+				b43_phy_read(dev, B43_PHY_ENCORE) &amp; ~0x1010);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	b43_wa_all(dev);</div><div class='add'>+</div><div class='add'>+	if (phy-&gt;type == B43_PHYTYPE_A) {</div><div class='add'>+		if (phy-&gt;gmode &amp;&amp; (phy-&gt;rev &lt; 3))</div><div class='add'>+			b43_phy_write(dev, 0x0034,</div><div class='add'>+				b43_phy_read(dev, 0x0034) | 0x0001);</div><div class='add'>+		b43_phy_rssiagc(dev, 0);</div><div class='add'>+</div><div class='add'>+		b43_phy_write(dev, B43_PHY_CRS0,</div><div class='add'>+			b43_phy_read(dev, B43_PHY_CRS0) | B43_PHY_CRS0_EN);</div><div class='add'>+</div><div class='add'>+		b43_radio_init2060(dev);</div><div class='add'>+</div><div class='add'>+		if ((bus-&gt;boardinfo.vendor == SSB_BOARDVENDOR_BCM) &amp;&amp;</div><div class='add'>+		    ((bus-&gt;boardinfo.type == SSB_BOARD_BU4306) ||</div><div class='add'>+		     (bus-&gt;boardinfo.type == SSB_BOARD_BU4309))) {</div><div class='add'>+			; //TODO: A PHY LO</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (phy-&gt;rev &gt;= 3)</div><div class='add'>+			b43_phy_ww(dev);</div><div class='add'>+</div><div class='add'>+		hardware_pctl_init_aphy(dev);</div><div class='add'>+</div><div class='add'>+		//TODO: radar detection</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((phy-&gt;type == B43_PHYTYPE_G) &amp;&amp;</div><div class='add'>+	    (dev-&gt;dev-&gt;bus-&gt;sprom.boardflags_lo &amp; B43_BFL_PACTRL)) {</div><div class='add'>+		b43_phy_write(dev, B43_PHY_OFDM(0x6E),</div><div class='add'>+				  (b43_phy_read(dev, B43_PHY_OFDM(0x6E))</div><div class='add'>+				   &amp; 0xE000) | 0x3CF);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Initialise the TSSI-&gt;dBm lookup table */</div><div class='add'>+static int b43_aphy_init_tssi2dbm_table(struct b43_wldev *dev)</div><div class='add'>+{</div><div class='add'>+	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='add'>+	struct b43_phy_a *aphy = phy-&gt;a;</div><div class='add'>+	s16 pab0, pab1, pab2;</div><div class='add'>+</div><div class='add'>+	pab0 = (s16) (dev-&gt;dev-&gt;bus-&gt;sprom.pa1b0);</div><div class='add'>+	pab1 = (s16) (dev-&gt;dev-&gt;bus-&gt;sprom.pa1b1);</div><div class='add'>+	pab2 = (s16) (dev-&gt;dev-&gt;bus-&gt;sprom.pa1b2);</div><div class='add'>+</div><div class='add'>+	if (pab0 != 0 &amp;&amp; pab1 != 0 &amp;&amp; pab2 != 0 &amp;&amp;</div><div class='add'>+	    pab0 != -1 &amp;&amp; pab1 != -1 &amp;&amp; pab2 != -1) {</div><div class='add'>+		/* The pabX values are set in SPROM. Use them. */</div><div class='add'>+		if ((s8) dev-&gt;dev-&gt;bus-&gt;sprom.itssi_a != 0 &amp;&amp;</div><div class='add'>+		    (s8) dev-&gt;dev-&gt;bus-&gt;sprom.itssi_a != -1)</div><div class='add'>+			aphy-&gt;tgt_idle_tssi =</div><div class='add'>+			    (s8) (dev-&gt;dev-&gt;bus-&gt;sprom.itssi_a);</div><div class='add'>+		else</div><div class='add'>+			aphy-&gt;tgt_idle_tssi = 62;</div><div class='add'>+		aphy-&gt;tssi2dbm = b43_generate_dyn_tssi2dbm_tab(dev, pab0,</div><div class='add'>+							       pab1, pab2);</div><div class='add'>+		if (!aphy-&gt;tssi2dbm)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+	} else {</div><div class='add'>+		/* pabX values not set in SPROM,</div><div class='add'>+		 * but APHY needs a generated table. */</div><div class='add'>+		aphy-&gt;tssi2dbm = NULL;</div><div class='add'>+		b43err(dev-&gt;wl, "Could not generate tssi2dBm "</div><div class='add'>+		       "table (wrong SPROM info)!\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int b43_aphy_op_allocate(struct b43_wldev *dev)</div><div class='add'>+{</div><div class='add'>+	struct b43_phy_a *aphy;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	aphy = kzalloc(sizeof(*aphy), GFP_KERNEL);</div><div class='add'>+	if (!aphy)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	dev-&gt;phy.a = aphy;</div><div class='add'>+</div><div class='add'>+	err = b43_aphy_init_tssi2dbm_table(dev);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_free_aphy;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_free_aphy:</div><div class='add'>+	kfree(aphy);</div><div class='add'>+	dev-&gt;phy.a = NULL;</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void b43_aphy_op_prepare_structs(struct b43_wldev *dev)</div><div class='add'>+{</div><div class='add'>+	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='add'>+	struct b43_phy_a *aphy = phy-&gt;a;</div><div class='add'>+	const void *tssi2dbm;</div><div class='add'>+	int tgt_idle_tssi;</div><div class='add'>+</div><div class='add'>+	/* tssi2dbm table is constant, so it is initialized at alloc time.</div><div class='add'>+	 * Save a copy of the pointer. */</div><div class='add'>+	tssi2dbm = aphy-&gt;tssi2dbm;</div><div class='add'>+	tgt_idle_tssi = aphy-&gt;tgt_idle_tssi;</div><div class='add'>+</div><div class='add'>+	/* Zero out the whole PHY structure. */</div><div class='add'>+	memset(aphy, 0, sizeof(*aphy));</div><div class='add'>+</div><div class='add'>+	aphy-&gt;tssi2dbm = tssi2dbm;</div><div class='add'>+	aphy-&gt;tgt_idle_tssi = tgt_idle_tssi;</div><div class='add'>+</div><div class='add'>+	//TODO init struct b43_phy_a</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void b43_aphy_op_free(struct b43_wldev *dev)</div><div class='add'>+{</div><div class='add'>+	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='add'>+	struct b43_phy_a *aphy = phy-&gt;a;</div><div class='add'>+</div><div class='add'>+	kfree(aphy-&gt;tssi2dbm);</div><div class='add'>+	aphy-&gt;tssi2dbm = NULL;</div><div class='add'>+</div><div class='add'>+	kfree(aphy);</div><div class='add'>+	dev-&gt;phy.a = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int b43_aphy_op_init(struct b43_wldev *dev)</div><div class='add'>+{</div><div class='add'>+	b43_phy_inita(dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u16 adjust_phyreg(struct b43_wldev *dev, u16 offset)</div><div class='add'>+{</div><div class='add'>+	/* OFDM registers are base-registers for the A-PHY. */</div><div class='add'>+	if ((offset &amp; B43_PHYROUTE) == B43_PHYROUTE_OFDM_GPHY) {</div><div class='add'>+		offset &amp;= ~B43_PHYROUTE;</div><div class='add'>+		offset |= B43_PHYROUTE_BASE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#if B43_DEBUG</div><div class='add'>+	if ((offset &amp; B43_PHYROUTE) == B43_PHYROUTE_EXT_GPHY) {</div><div class='add'>+		/* Ext-G registers are only available on G-PHYs */</div><div class='add'>+		b43err(dev-&gt;wl, "Invalid EXT-G PHY access at "</div><div class='add'>+		       "0x%04X on A-PHY\n", offset);</div><div class='add'>+		dump_stack();</div><div class='add'>+	}</div><div class='add'>+	if ((offset &amp; B43_PHYROUTE) == B43_PHYROUTE_N_BMODE) {</div><div class='add'>+		/* N-BMODE registers are only available on N-PHYs */</div><div class='add'>+		b43err(dev-&gt;wl, "Invalid N-BMODE PHY access at "</div><div class='add'>+		       "0x%04X on A-PHY\n", offset);</div><div class='add'>+		dump_stack();</div><div class='add'>+	}</div><div class='add'>+#endif /* B43_DEBUG */</div><div class='add'>+</div><div class='add'>+	return offset;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 b43_aphy_op_read(struct b43_wldev *dev, u16 reg)</div><div class='add'>+{</div><div class='add'>+	reg = adjust_phyreg(dev, reg);</div><div class='add'>+	b43_write16(dev, B43_MMIO_PHY_CONTROL, reg);</div><div class='add'>+	return b43_read16(dev, B43_MMIO_PHY_DATA);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void b43_aphy_op_write(struct b43_wldev *dev, u16 reg, u16 value)</div><div class='add'>+{</div><div class='add'>+	reg = adjust_phyreg(dev, reg);</div><div class='add'>+	b43_write16(dev, B43_MMIO_PHY_CONTROL, reg);</div><div class='add'>+	b43_write16(dev, B43_MMIO_PHY_DATA, value);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 b43_aphy_op_radio_read(struct b43_wldev *dev, u16 reg)</div><div class='add'>+{</div><div class='add'>+	/* Register 1 is a 32-bit register. */</div><div class='add'>+	B43_WARN_ON(reg == 1);</div><div class='add'>+	/* A-PHY needs 0x40 for read access */</div><div class='add'>+	reg |= 0x40;</div><div class='add'>+</div><div class='add'>+	b43_write16(dev, B43_MMIO_RADIO_CONTROL, reg);</div><div class='add'>+	return b43_read16(dev, B43_MMIO_RADIO_DATA_LOW);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void b43_aphy_op_radio_write(struct b43_wldev *dev, u16 reg, u16 value)</div><div class='add'>+{</div><div class='add'>+	/* Register 1 is a 32-bit register. */</div><div class='add'>+	B43_WARN_ON(reg == 1);</div><div class='add'>+</div><div class='add'>+	b43_write16(dev, B43_MMIO_RADIO_CONTROL, reg);</div><div class='add'>+	b43_write16(dev, B43_MMIO_RADIO_DATA_LOW, value);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool b43_aphy_op_supports_hwpctl(struct b43_wldev *dev)</div><div class='add'>+{</div><div class='add'>+	return (dev-&gt;phy.rev &gt;= 5);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void b43_aphy_op_software_rfkill(struct b43_wldev *dev,</div><div class='add'>+					enum rfkill_state state)</div><div class='add'>+{</div><div class='add'>+	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='add'>+</div><div class='add'>+	if (state == RFKILL_STATE_UNBLOCKED) {</div><div class='add'>+		if (phy-&gt;radio_on)</div><div class='add'>+			return;</div><div class='add'>+		b43_radio_write16(dev, 0x0004, 0x00C0);</div><div class='add'>+		b43_radio_write16(dev, 0x0005, 0x0008);</div><div class='add'>+		b43_phy_write(dev, 0x0010, b43_phy_read(dev, 0x0010) &amp; 0xFFF7);</div><div class='add'>+		b43_phy_write(dev, 0x0011, b43_phy_read(dev, 0x0011) &amp; 0xFFF7);</div><div class='add'>+		b43_radio_init2060(dev);</div><div class='add'>+	} else {</div><div class='add'>+		b43_radio_write16(dev, 0x0004, 0x00FF);</div><div class='add'>+		b43_radio_write16(dev, 0x0005, 0x00FB);</div><div class='add'>+		b43_phy_write(dev, 0x0010, b43_phy_read(dev, 0x0010) | 0x0008);</div><div class='add'>+		b43_phy_write(dev, 0x0011, b43_phy_read(dev, 0x0011) | 0x0008);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int b43_aphy_op_switch_channel(struct b43_wldev *dev,</div><div class='add'>+				      unsigned int new_channel)</div><div class='add'>+{</div><div class='add'>+	if (new_channel &gt; 200)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	aphy_channel_switch(dev, new_channel);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int b43_aphy_op_get_default_chan(struct b43_wldev *dev)</div><div class='add'>+{</div><div class='add'>+	return 36; /* Default to channel 36 */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void b43_aphy_op_set_rx_antenna(struct b43_wldev *dev, int antenna)</div><div class='add'>+{//TODO</div><div class='add'>+	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='add'>+	u64 hf;</div><div class='add'>+	u16 tmp;</div><div class='add'>+	int autodiv = 0;</div><div class='add'>+</div><div class='add'>+	if (antenna == B43_ANTENNA_AUTO0 || antenna == B43_ANTENNA_AUTO1)</div><div class='add'>+		autodiv = 1;</div><div class='add'>+</div><div class='add'>+	hf = b43_hf_read(dev);</div><div class='add'>+	hf &amp;= ~B43_HF_ANTDIVHELP;</div><div class='add'>+	b43_hf_write(dev, hf);</div><div class='add'>+</div><div class='add'>+	tmp = b43_phy_read(dev, B43_PHY_BBANDCFG);</div><div class='add'>+	tmp &amp;= ~B43_PHY_BBANDCFG_RXANT;</div><div class='add'>+	tmp |= (autodiv ? B43_ANTENNA_AUTO0 : antenna)</div><div class='add'>+	    &lt;&lt; B43_PHY_BBANDCFG_RXANT_SHIFT;</div><div class='add'>+	b43_phy_write(dev, B43_PHY_BBANDCFG, tmp);</div><div class='add'>+</div><div class='add'>+	if (autodiv) {</div><div class='add'>+		tmp = b43_phy_read(dev, B43_PHY_ANTDWELL);</div><div class='add'>+		if (antenna == B43_ANTENNA_AUTO0)</div><div class='add'>+			tmp &amp;= ~B43_PHY_ANTDWELL_AUTODIV1;</div><div class='add'>+		else</div><div class='add'>+			tmp |= B43_PHY_ANTDWELL_AUTODIV1;</div><div class='add'>+		b43_phy_write(dev, B43_PHY_ANTDWELL, tmp);</div><div class='add'>+	}</div><div class='add'>+	if (phy-&gt;rev &lt; 3) {</div><div class='add'>+		tmp = b43_phy_read(dev, B43_PHY_ANTDWELL);</div><div class='add'>+		tmp = (tmp &amp; 0xFF00) | 0x24;</div><div class='add'>+		b43_phy_write(dev, B43_PHY_ANTDWELL, tmp);</div><div class='add'>+	} else {</div><div class='add'>+		tmp = b43_phy_read(dev, B43_PHY_OFDM61);</div><div class='add'>+		tmp |= 0x10;</div><div class='add'>+		b43_phy_write(dev, B43_PHY_OFDM61, tmp);</div><div class='add'>+		if (phy-&gt;analog == 3) {</div><div class='add'>+			b43_phy_write(dev, B43_PHY_CLIPPWRDOWNT,</div><div class='add'>+				      0x1D);</div><div class='add'>+			b43_phy_write(dev, B43_PHY_ADIVRELATED,</div><div class='add'>+				      8);</div><div class='add'>+		} else {</div><div class='add'>+			b43_phy_write(dev, B43_PHY_CLIPPWRDOWNT,</div><div class='add'>+				      0x3A);</div><div class='add'>+			tmp =</div><div class='add'>+			    b43_phy_read(dev,</div><div class='add'>+					 B43_PHY_ADIVRELATED);</div><div class='add'>+			tmp = (tmp &amp; 0xFF00) | 8;</div><div class='add'>+			b43_phy_write(dev, B43_PHY_ADIVRELATED,</div><div class='add'>+				      tmp);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hf |= B43_HF_ANTDIVHELP;</div><div class='add'>+	b43_hf_write(dev, hf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void b43_aphy_op_adjust_txpower(struct b43_wldev *dev)</div><div class='add'>+{//TODO</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum b43_txpwr_result b43_aphy_op_recalc_txpower(struct b43_wldev *dev,</div><div class='add'>+							bool ignore_tssi)</div><div class='add'>+{//TODO</div><div class='add'>+	return B43_TXPWR_RES_DONE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void b43_aphy_op_pwork_15sec(struct b43_wldev *dev)</div><div class='add'>+{//TODO</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void b43_aphy_op_pwork_60sec(struct b43_wldev *dev)</div><div class='add'>+{//TODO</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct b43_phy_operations b43_phyops_a = {</div><div class='add'>+	.allocate		= b43_aphy_op_allocate,</div><div class='add'>+	.free			= b43_aphy_op_free,</div><div class='add'>+	.prepare_structs	= b43_aphy_op_prepare_structs,</div><div class='add'>+	.init			= b43_aphy_op_init,</div><div class='add'>+	.phy_read		= b43_aphy_op_read,</div><div class='add'>+	.phy_write		= b43_aphy_op_write,</div><div class='add'>+	.radio_read		= b43_aphy_op_radio_read,</div><div class='add'>+	.radio_write		= b43_aphy_op_radio_write,</div><div class='add'>+	.supports_hwpctl	= b43_aphy_op_supports_hwpctl,</div><div class='add'>+	.software_rfkill	= b43_aphy_op_software_rfkill,</div><div class='add'>+	.switch_analog		= b43_phyop_switch_analog_generic,</div><div class='add'>+	.switch_channel		= b43_aphy_op_switch_channel,</div><div class='add'>+	.get_default_chan	= b43_aphy_op_get_default_chan,</div><div class='add'>+	.set_rx_antenna		= b43_aphy_op_set_rx_antenna,</div><div class='add'>+	.recalc_txpower		= b43_aphy_op_recalc_txpower,</div><div class='add'>+	.adjust_txpower		= b43_aphy_op_adjust_txpower,</div><div class='add'>+	.pwork_15sec		= b43_aphy_op_pwork_15sec,</div><div class='add'>+	.pwork_60sec		= b43_aphy_op_pwork_60sec,</div><div class='add'>+};</div><div class='head'>diff --git a/drivers/net/wireless/b43/phy_a.h b/drivers/net/wireless/b43/phy_a.h<br/>new file mode 100644<br/>index 000000000000..5cfaab7b16ee<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/b43/phy_a.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/b43/phy_a.h</a></div><div class='hunk'>@@ -0,0 +1,130 @@</div><div class='add'>+#ifndef LINUX_B43_PHY_A_H_</div><div class='add'>+#define LINUX_B43_PHY_A_H_</div><div class='add'>+</div><div class='add'>+#include "phy_common.h"</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* OFDM (A) PHY Registers */</div><div class='add'>+#define B43_PHY_VERSION_OFDM		B43_PHY_OFDM(0x00)	/* Versioning register for A-PHY */</div><div class='add'>+#define B43_PHY_BBANDCFG		B43_PHY_OFDM(0x01)	/* Baseband config */</div><div class='add'>+#define  B43_PHY_BBANDCFG_RXANT		0x180	/* RX Antenna selection */</div><div class='add'>+#define  B43_PHY_BBANDCFG_RXANT_SHIFT	7</div><div class='add'>+#define B43_PHY_PWRDOWN			B43_PHY_OFDM(0x03)	/* Powerdown */</div><div class='add'>+#define B43_PHY_CRSTHRES1_R1		B43_PHY_OFDM(0x06)	/* CRS Threshold 1 (phy.rev 1 only) */</div><div class='add'>+#define B43_PHY_LNAHPFCTL		B43_PHY_OFDM(0x1C)	/* LNA/HPF control */</div><div class='add'>+#define B43_PHY_LPFGAINCTL		B43_PHY_OFDM(0x20)	/* LPF Gain control */</div><div class='add'>+#define B43_PHY_ADIVRELATED		B43_PHY_OFDM(0x27)	/* FIXME rename */</div><div class='add'>+#define B43_PHY_CRS0			B43_PHY_OFDM(0x29)</div><div class='add'>+#define  B43_PHY_CRS0_EN		0x4000</div><div class='add'>+#define B43_PHY_PEAK_COUNT		B43_PHY_OFDM(0x30)</div><div class='add'>+#define B43_PHY_ANTDWELL		B43_PHY_OFDM(0x2B)	/* Antenna dwell */</div><div class='add'>+#define  B43_PHY_ANTDWELL_AUTODIV1	0x0100	/* Automatic RX diversity start antenna */</div><div class='add'>+#define B43_PHY_ENCORE			B43_PHY_OFDM(0x49)	/* "Encore" (RangeMax / BroadRange) */</div><div class='add'>+#define  B43_PHY_ENCORE_EN		0x0200	/* Encore enable */</div><div class='add'>+#define B43_PHY_LMS			B43_PHY_OFDM(0x55)</div><div class='add'>+#define B43_PHY_OFDM61			B43_PHY_OFDM(0x61)	/* FIXME rename */</div><div class='add'>+#define  B43_PHY_OFDM61_10		0x0010	/* FIXME rename */</div><div class='add'>+#define B43_PHY_IQBAL			B43_PHY_OFDM(0x69)	/* I/Q balance */</div><div class='add'>+#define B43_PHY_BBTXDC_BIAS		B43_PHY_OFDM(0x6B)	/* Baseband TX DC bias */</div><div class='add'>+#define B43_PHY_OTABLECTL		B43_PHY_OFDM(0x72)	/* OFDM table control (see below) */</div><div class='add'>+#define  B43_PHY_OTABLEOFF		0x03FF	/* OFDM table offset (see below) */</div><div class='add'>+#define  B43_PHY_OTABLENR		0xFC00	/* OFDM table number (see below) */</div><div class='add'>+#define  B43_PHY_OTABLENR_SHIFT		10</div><div class='add'>+#define B43_PHY_OTABLEI			B43_PHY_OFDM(0x73)	/* OFDM table data I */</div><div class='add'>+#define B43_PHY_OTABLEQ			B43_PHY_OFDM(0x74)	/* OFDM table data Q */</div><div class='add'>+#define B43_PHY_HPWR_TSSICTL		B43_PHY_OFDM(0x78)	/* Hardware power TSSI control */</div><div class='add'>+#define B43_PHY_ADCCTL			B43_PHY_OFDM(0x7A)	/* ADC control */</div><div class='add'>+#define B43_PHY_IDLE_TSSI		B43_PHY_OFDM(0x7B)</div><div class='add'>+#define B43_PHY_A_TEMP_SENSE		B43_PHY_OFDM(0x7C)	/* A PHY temperature sense */</div><div class='add'>+#define B43_PHY_NRSSITHRES		B43_PHY_OFDM(0x8A)	/* NRSSI threshold */</div><div class='add'>+#define B43_PHY_ANTWRSETT		B43_PHY_OFDM(0x8C)	/* Antenna WR settle */</div><div class='add'>+#define  B43_PHY_ANTWRSETT_ARXDIV	0x2000	/* Automatic RX diversity enabled */</div><div class='add'>+#define B43_PHY_CLIPPWRDOWNT		B43_PHY_OFDM(0x93)	/* Clip powerdown threshold */</div><div class='add'>+#define B43_PHY_OFDM9B			B43_PHY_OFDM(0x9B)	/* FIXME rename */</div><div class='add'>+#define B43_PHY_N1P1GAIN		B43_PHY_OFDM(0xA0)</div><div class='add'>+#define B43_PHY_P1P2GAIN		B43_PHY_OFDM(0xA1)</div><div class='add'>+#define B43_PHY_N1N2GAIN		B43_PHY_OFDM(0xA2)</div><div class='add'>+#define B43_PHY_CLIPTHRES		B43_PHY_OFDM(0xA3)</div><div class='add'>+#define B43_PHY_CLIPN1P2THRES		B43_PHY_OFDM(0xA4)</div><div class='add'>+#define B43_PHY_CCKSHIFTBITS_WA		B43_PHY_OFDM(0xA5)	/* CCK shiftbits workaround, FIXME rename */</div><div class='add'>+#define B43_PHY_CCKSHIFTBITS		B43_PHY_OFDM(0xA7)	/* FIXME rename */</div><div class='add'>+#define B43_PHY_DIVSRCHIDX		B43_PHY_OFDM(0xA8)	/* Divider search gain/index */</div><div class='add'>+#define B43_PHY_CLIPP2THRES		B43_PHY_OFDM(0xA9)</div><div class='add'>+#define B43_PHY_CLIPP3THRES		B43_PHY_OFDM(0xAA)</div><div class='add'>+#define B43_PHY_DIVP1P2GAIN		B43_PHY_OFDM(0xAB)</div><div class='add'>+#define B43_PHY_DIVSRCHGAINBACK		B43_PHY_OFDM(0xAD)	/* Divider search gain back */</div><div class='add'>+#define B43_PHY_DIVSRCHGAINCHNG		B43_PHY_OFDM(0xAE)	/* Divider search gain change */</div><div class='add'>+#define B43_PHY_CRSTHRES1		B43_PHY_OFDM(0xC0)	/* CRS Threshold 1 (phy.rev &gt;= 2 only) */</div><div class='add'>+#define B43_PHY_CRSTHRES2		B43_PHY_OFDM(0xC1)	/* CRS Threshold 2 (phy.rev &gt;= 2 only) */</div><div class='add'>+#define B43_PHY_TSSIP_LTBASE		B43_PHY_OFDM(0x380)	/* TSSI power lookup table base */</div><div class='add'>+#define B43_PHY_DC_LTBASE		B43_PHY_OFDM(0x3A0)	/* DC lookup table base */</div><div class='add'>+#define B43_PHY_GAIN_LTBASE		B43_PHY_OFDM(0x3C0)	/* Gain lookup table base */</div><div class='add'>+</div><div class='add'>+/*** OFDM table numbers ***/</div><div class='add'>+#define B43_OFDMTAB(number, offset)	(((number) &lt;&lt; B43_PHY_OTABLENR_SHIFT) | (offset))</div><div class='add'>+#define B43_OFDMTAB_AGC1		B43_OFDMTAB(0x00, 0)</div><div class='add'>+#define B43_OFDMTAB_GAIN0		B43_OFDMTAB(0x00, 0)</div><div class='add'>+#define B43_OFDMTAB_GAINX		B43_OFDMTAB(0x01, 0)	//TODO rename</div><div class='add'>+#define B43_OFDMTAB_GAIN1		B43_OFDMTAB(0x01, 4)</div><div class='add'>+#define B43_OFDMTAB_AGC3		B43_OFDMTAB(0x02, 0)</div><div class='add'>+#define B43_OFDMTAB_GAIN2		B43_OFDMTAB(0x02, 3)</div><div class='add'>+#define B43_OFDMTAB_LNAHPFGAIN1		B43_OFDMTAB(0x03, 0)</div><div class='add'>+#define B43_OFDMTAB_WRSSI		B43_OFDMTAB(0x04, 0)</div><div class='add'>+#define B43_OFDMTAB_LNAHPFGAIN2		B43_OFDMTAB(0x04, 0)</div><div class='add'>+#define B43_OFDMTAB_NOISESCALE		B43_OFDMTAB(0x05, 0)</div><div class='add'>+#define B43_OFDMTAB_AGC2		B43_OFDMTAB(0x06, 0)</div><div class='add'>+#define B43_OFDMTAB_ROTOR		B43_OFDMTAB(0x08, 0)</div><div class='add'>+#define B43_OFDMTAB_ADVRETARD		B43_OFDMTAB(0x09, 0)</div><div class='add'>+#define B43_OFDMTAB_DAC			B43_OFDMTAB(0x0C, 0)</div><div class='add'>+#define B43_OFDMTAB_DC			B43_OFDMTAB(0x0E, 7)</div><div class='add'>+#define B43_OFDMTAB_PWRDYN2		B43_OFDMTAB(0x0E, 12)</div><div class='add'>+#define B43_OFDMTAB_LNAGAIN		B43_OFDMTAB(0x0E, 13)</div><div class='add'>+#define B43_OFDMTAB_UNKNOWN_0F		B43_OFDMTAB(0x0F, 0)	//TODO rename</div><div class='add'>+#define B43_OFDMTAB_UNKNOWN_APHY	B43_OFDMTAB(0x0F, 7)	//TODO rename</div><div class='add'>+#define B43_OFDMTAB_LPFGAIN		B43_OFDMTAB(0x0F, 12)</div><div class='add'>+#define B43_OFDMTAB_RSSI		B43_OFDMTAB(0x10, 0)</div><div class='add'>+#define B43_OFDMTAB_UNKNOWN_11		B43_OFDMTAB(0x11, 4)	//TODO rename</div><div class='add'>+#define B43_OFDMTAB_AGC1_R1		B43_OFDMTAB(0x13, 0)</div><div class='add'>+#define B43_OFDMTAB_GAINX_R1		B43_OFDMTAB(0x14, 0)	//TODO remove!</div><div class='add'>+#define B43_OFDMTAB_MINSIGSQ		B43_OFDMTAB(0x14, 0)</div><div class='add'>+#define B43_OFDMTAB_AGC3_R1		B43_OFDMTAB(0x15, 0)</div><div class='add'>+#define B43_OFDMTAB_WRSSI_R1		B43_OFDMTAB(0x15, 4)</div><div class='add'>+#define B43_OFDMTAB_TSSI		B43_OFDMTAB(0x15, 0)</div><div class='add'>+#define B43_OFDMTAB_DACRFPABB		B43_OFDMTAB(0x16, 0)</div><div class='add'>+#define B43_OFDMTAB_DACOFF		B43_OFDMTAB(0x17, 0)</div><div class='add'>+#define B43_OFDMTAB_DCBIAS		B43_OFDMTAB(0x18, 0)</div><div class='add'>+</div><div class='add'>+u16 b43_ofdmtab_read16(struct b43_wldev *dev, u16 table, u16 offset);</div><div class='add'>+void b43_ofdmtab_write16(struct b43_wldev *dev, u16 table,</div><div class='add'>+			 u16 offset, u16 value);</div><div class='add'>+u32 b43_ofdmtab_read32(struct b43_wldev *dev, u16 table, u16 offset);</div><div class='add'>+void b43_ofdmtab_write32(struct b43_wldev *dev, u16 table,</div><div class='add'>+			 u16 offset, u32 value);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+struct b43_phy_a {</div><div class='add'>+	/* Pointer to the table used to convert a</div><div class='add'>+	 * TSSI value to dBm-Q5.2 */</div><div class='add'>+	const s8 *tssi2dbm;</div><div class='add'>+	/* Target idle TSSI */</div><div class='add'>+	int tgt_idle_tssi;</div><div class='add'>+	/* Current idle TSSI */</div><div class='add'>+	int cur_idle_tssi;//FIXME value currently not set</div><div class='add'>+</div><div class='add'>+	/* A-PHY TX Power control value. */</div><div class='add'>+	u16 txpwr_offset;</div><div class='add'>+</div><div class='add'>+	//TODO lots of missing stuff</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * b43_phy_inita - Lowlevel A-PHY init routine.</div><div class='add'>+ * This is _only_ used by the G-PHY code.</div><div class='add'>+ */</div><div class='add'>+void b43_phy_inita(struct b43_wldev *dev);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+struct b43_phy_operations;</div><div class='add'>+extern const struct b43_phy_operations b43_phyops_a;</div><div class='add'>+</div><div class='add'>+#endif /* LINUX_B43_PHY_A_H_ */</div><div class='head'>diff --git a/drivers/net/wireless/b43/phy_common.c b/drivers/net/wireless/b43/phy_common.c<br/>new file mode 100644<br/>index 000000000000..af37abccccb3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/b43/phy_common.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/b43/phy_common.c</a></div><div class='hunk'>@@ -0,0 +1,381 @@</div><div class='add'>+/*</div><div class='add'>+</div><div class='add'>+  Broadcom B43 wireless driver</div><div class='add'>+  Common PHY routines</div><div class='add'>+</div><div class='add'>+  Copyright (c) 2005 Martin Langer &lt;martin-langer@gmx.de&gt;,</div><div class='add'>+  Copyright (c) 2005-2007 Stefano Brivio &lt;stefano.brivio@polimi.it&gt;</div><div class='add'>+  Copyright (c) 2005-2008 Michael Buesch &lt;mb@bu3sch.de&gt;</div><div class='add'>+  Copyright (c) 2005, 2006 Danny van Dyk &lt;kugelfang@gentoo.org&gt;</div><div class='add'>+  Copyright (c) 2005, 2006 Andreas Jaggi &lt;andreas.jaggi@waterwave.ch&gt;</div><div class='add'>+</div><div class='add'>+  This program is free software; you can redistribute it and/or modify</div><div class='add'>+  it under the terms of the GNU General Public License as published by</div><div class='add'>+  the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+  (at your option) any later version.</div><div class='add'>+</div><div class='add'>+  This program is distributed in the hope that it will be useful,</div><div class='add'>+  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+  GNU General Public License for more details.</div><div class='add'>+</div><div class='add'>+  You should have received a copy of the GNU General Public License</div><div class='add'>+  along with this program; see the file COPYING.  If not, write to</div><div class='add'>+  the Free Software Foundation, Inc., 51 Franklin Steet, Fifth Floor,</div><div class='add'>+  Boston, MA 02110-1301, USA.</div><div class='add'>+</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#include "phy_common.h"</div><div class='add'>+#include "phy_g.h"</div><div class='add'>+#include "phy_a.h"</div><div class='add'>+#include "phy_n.h"</div><div class='add'>+#include "phy_lp.h"</div><div class='add'>+#include "b43.h"</div><div class='add'>+#include "main.h"</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+int b43_phy_allocate(struct b43_wldev *dev)</div><div class='add'>+{</div><div class='add'>+	struct b43_phy *phy = &amp;(dev-&gt;phy);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	phy-&gt;ops = NULL;</div><div class='add'>+</div><div class='add'>+	switch (phy-&gt;type) {</div><div class='add'>+	case B43_PHYTYPE_A:</div><div class='add'>+		phy-&gt;ops = &amp;b43_phyops_a;</div><div class='add'>+		break;</div><div class='add'>+	case B43_PHYTYPE_G:</div><div class='add'>+		phy-&gt;ops = &amp;b43_phyops_g;</div><div class='add'>+		break;</div><div class='add'>+	case B43_PHYTYPE_N:</div><div class='add'>+#ifdef CONFIG_B43_NPHY</div><div class='add'>+		phy-&gt;ops = &amp;b43_phyops_n;</div><div class='add'>+#endif</div><div class='add'>+		break;</div><div class='add'>+	case B43_PHYTYPE_LP:</div><div class='add'>+#ifdef CONFIG_B43_PHY_LP</div><div class='add'>+		phy-&gt;ops = &amp;b43_phyops_lp;</div><div class='add'>+#endif</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	if (B43_WARN_ON(!phy-&gt;ops))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	err = phy-&gt;ops-&gt;allocate(dev);</div><div class='add'>+	if (err)</div><div class='add'>+		phy-&gt;ops = NULL;</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void b43_phy_free(struct b43_wldev *dev)</div><div class='add'>+{</div><div class='add'>+	dev-&gt;phy.ops-&gt;free(dev);</div><div class='add'>+	dev-&gt;phy.ops = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int b43_phy_init(struct b43_wldev *dev)</div><div class='add'>+{</div><div class='add'>+	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='add'>+	const struct b43_phy_operations *ops = phy-&gt;ops;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	phy-&gt;channel = ops-&gt;get_default_chan(dev);</div><div class='add'>+</div><div class='add'>+	ops-&gt;software_rfkill(dev, RFKILL_STATE_UNBLOCKED);</div><div class='add'>+	err = ops-&gt;init(dev);</div><div class='add'>+	if (err) {</div><div class='add'>+		b43err(dev-&gt;wl, "PHY init failed\n");</div><div class='add'>+		goto err_block_rf;</div><div class='add'>+	}</div><div class='add'>+	/* Make sure to switch hardware and firmware (SHM) to</div><div class='add'>+	 * the default channel. */</div><div class='add'>+	err = b43_switch_channel(dev, ops-&gt;get_default_chan(dev));</div><div class='add'>+	if (err) {</div><div class='add'>+		b43err(dev-&gt;wl, "PHY init: Channel switch to default failed\n");</div><div class='add'>+		goto err_phy_exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_phy_exit:</div><div class='add'>+	if (ops-&gt;exit)</div><div class='add'>+		ops-&gt;exit(dev);</div><div class='add'>+err_block_rf:</div><div class='add'>+	ops-&gt;software_rfkill(dev, RFKILL_STATE_SOFT_BLOCKED);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void b43_phy_exit(struct b43_wldev *dev)</div><div class='add'>+{</div><div class='add'>+	const struct b43_phy_operations *ops = dev-&gt;phy.ops;</div><div class='add'>+</div><div class='add'>+	ops-&gt;software_rfkill(dev, RFKILL_STATE_SOFT_BLOCKED);</div><div class='add'>+	if (ops-&gt;exit)</div><div class='add'>+		ops-&gt;exit(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool b43_has_hardware_pctl(struct b43_wldev *dev)</div><div class='add'>+{</div><div class='add'>+	if (!dev-&gt;phy.hardware_power_control)</div><div class='add'>+		return 0;</div><div class='add'>+	if (!dev-&gt;phy.ops-&gt;supports_hwpctl)</div><div class='add'>+		return 0;</div><div class='add'>+	return dev-&gt;phy.ops-&gt;supports_hwpctl(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void b43_radio_lock(struct b43_wldev *dev)</div><div class='add'>+{</div><div class='add'>+	u32 macctl;</div><div class='add'>+</div><div class='add'>+	macctl = b43_read32(dev, B43_MMIO_MACCTL);</div><div class='add'>+	B43_WARN_ON(macctl &amp; B43_MACCTL_RADIOLOCK);</div><div class='add'>+	macctl |= B43_MACCTL_RADIOLOCK;</div><div class='add'>+	b43_write32(dev, B43_MMIO_MACCTL, macctl);</div><div class='add'>+	/* Commit the write and wait for the device</div><div class='add'>+	 * to exit any radio register access. */</div><div class='add'>+	b43_read32(dev, B43_MMIO_MACCTL);</div><div class='add'>+	udelay(10);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void b43_radio_unlock(struct b43_wldev *dev)</div><div class='add'>+{</div><div class='add'>+	u32 macctl;</div><div class='add'>+</div><div class='add'>+	/* Commit any write */</div><div class='add'>+	b43_read16(dev, B43_MMIO_PHY_VER);</div><div class='add'>+	/* unlock */</div><div class='add'>+	macctl = b43_read32(dev, B43_MMIO_MACCTL);</div><div class='add'>+	B43_WARN_ON(!(macctl &amp; B43_MACCTL_RADIOLOCK));</div><div class='add'>+	macctl &amp;= ~B43_MACCTL_RADIOLOCK;</div><div class='add'>+	b43_write32(dev, B43_MMIO_MACCTL, macctl);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void b43_phy_lock(struct b43_wldev *dev)</div><div class='add'>+{</div><div class='add'>+#if B43_DEBUG</div><div class='add'>+	B43_WARN_ON(dev-&gt;phy.phy_locked);</div><div class='add'>+	dev-&gt;phy.phy_locked = 1;</div><div class='add'>+#endif</div><div class='add'>+	B43_WARN_ON(dev-&gt;dev-&gt;id.revision &lt; 3);</div><div class='add'>+</div><div class='add'>+	if (!b43_is_mode(dev-&gt;wl, NL80211_IFTYPE_AP))</div><div class='add'>+		b43_power_saving_ctl_bits(dev, B43_PS_AWAKE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void b43_phy_unlock(struct b43_wldev *dev)</div><div class='add'>+{</div><div class='add'>+#if B43_DEBUG</div><div class='add'>+	B43_WARN_ON(!dev-&gt;phy.phy_locked);</div><div class='add'>+	dev-&gt;phy.phy_locked = 0;</div><div class='add'>+#endif</div><div class='add'>+	B43_WARN_ON(dev-&gt;dev-&gt;id.revision &lt; 3);</div><div class='add'>+</div><div class='add'>+	if (!b43_is_mode(dev-&gt;wl, NL80211_IFTYPE_AP))</div><div class='add'>+		b43_power_saving_ctl_bits(dev, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u16 b43_radio_read(struct b43_wldev *dev, u16 reg)</div><div class='add'>+{</div><div class='add'>+	return dev-&gt;phy.ops-&gt;radio_read(dev, reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void b43_radio_write(struct b43_wldev *dev, u16 reg, u16 value)</div><div class='add'>+{</div><div class='add'>+	dev-&gt;phy.ops-&gt;radio_write(dev, reg, value);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void b43_radio_mask(struct b43_wldev *dev, u16 offset, u16 mask)</div><div class='add'>+{</div><div class='add'>+	b43_radio_write16(dev, offset,</div><div class='add'>+			  b43_radio_read16(dev, offset) &amp; mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void b43_radio_set(struct b43_wldev *dev, u16 offset, u16 set)</div><div class='add'>+{</div><div class='add'>+	b43_radio_write16(dev, offset,</div><div class='add'>+			  b43_radio_read16(dev, offset) | set);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void b43_radio_maskset(struct b43_wldev *dev, u16 offset, u16 mask, u16 set)</div><div class='add'>+{</div><div class='add'>+	b43_radio_write16(dev, offset,</div><div class='add'>+			  (b43_radio_read16(dev, offset) &amp; mask) | set);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u16 b43_phy_read(struct b43_wldev *dev, u16 reg)</div><div class='add'>+{</div><div class='add'>+	return dev-&gt;phy.ops-&gt;phy_read(dev, reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void b43_phy_write(struct b43_wldev *dev, u16 reg, u16 value)</div><div class='add'>+{</div><div class='add'>+	dev-&gt;phy.ops-&gt;phy_write(dev, reg, value);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void b43_phy_mask(struct b43_wldev *dev, u16 offset, u16 mask)</div><div class='add'>+{</div><div class='add'>+	b43_phy_write(dev, offset,</div><div class='add'>+		      b43_phy_read(dev, offset) &amp; mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void b43_phy_set(struct b43_wldev *dev, u16 offset, u16 set)</div><div class='add'>+{</div><div class='add'>+	b43_phy_write(dev, offset,</div><div class='add'>+		      b43_phy_read(dev, offset) | set);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void b43_phy_maskset(struct b43_wldev *dev, u16 offset, u16 mask, u16 set)</div><div class='add'>+{</div><div class='add'>+	b43_phy_write(dev, offset,</div><div class='add'>+		      (b43_phy_read(dev, offset) &amp; mask) | set);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int b43_switch_channel(struct b43_wldev *dev, unsigned int new_channel)</div><div class='add'>+{</div><div class='add'>+	struct b43_phy *phy = &amp;(dev-&gt;phy);</div><div class='add'>+	u16 channelcookie, savedcookie;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (new_channel == B43_DEFAULT_CHANNEL)</div><div class='add'>+		new_channel = phy-&gt;ops-&gt;get_default_chan(dev);</div><div class='add'>+</div><div class='add'>+	/* First we set the channel radio code to prevent the</div><div class='add'>+	 * firmware from sending ghost packets.</div><div class='add'>+	 */</div><div class='add'>+	channelcookie = new_channel;</div><div class='add'>+	if (b43_current_band(dev-&gt;wl) == IEEE80211_BAND_5GHZ)</div><div class='add'>+		channelcookie |= 0x100;</div><div class='add'>+	//FIXME set 40Mhz flag if required</div><div class='add'>+	savedcookie = b43_shm_read16(dev, B43_SHM_SHARED, B43_SHM_SH_CHAN);</div><div class='add'>+	b43_shm_write16(dev, B43_SHM_SHARED, B43_SHM_SH_CHAN, channelcookie);</div><div class='add'>+</div><div class='add'>+	/* Now try to switch the PHY hardware channel. */</div><div class='add'>+	err = phy-&gt;ops-&gt;switch_channel(dev, new_channel);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_restore_cookie;</div><div class='add'>+</div><div class='add'>+	dev-&gt;phy.channel = new_channel;</div><div class='add'>+	/* Wait for the radio to tune to the channel and stabilize. */</div><div class='add'>+	msleep(8);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_restore_cookie:</div><div class='add'>+	b43_shm_write16(dev, B43_SHM_SHARED,</div><div class='add'>+			B43_SHM_SH_CHAN, savedcookie);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void b43_software_rfkill(struct b43_wldev *dev, enum rfkill_state state)</div><div class='add'>+{</div><div class='add'>+	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='add'>+</div><div class='add'>+	if (state == RFKILL_STATE_HARD_BLOCKED) {</div><div class='add'>+		/* We cannot hardware-block the device */</div><div class='add'>+		state = RFKILL_STATE_SOFT_BLOCKED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	phy-&gt;ops-&gt;software_rfkill(dev, state);</div><div class='add'>+	phy-&gt;radio_on = (state == RFKILL_STATE_UNBLOCKED);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * b43_phy_txpower_adjust_work - TX power workqueue.</div><div class='add'>+ *</div><div class='add'>+ * Workqueue for updating the TX power parameters in hardware.</div><div class='add'>+ */</div><div class='add'>+void b43_phy_txpower_adjust_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct b43_wl *wl = container_of(work, struct b43_wl,</div><div class='add'>+					 txpower_adjust_work);</div><div class='add'>+	struct b43_wldev *dev;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;wl-&gt;mutex);</div><div class='add'>+	dev = wl-&gt;current_dev;</div><div class='add'>+</div><div class='add'>+	if (likely(dev &amp;&amp; (b43_status(dev) &gt;= B43_STAT_STARTED)))</div><div class='add'>+		dev-&gt;phy.ops-&gt;adjust_txpower(dev);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;wl-&gt;mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Called with wl-&gt;irq_lock locked */</div><div class='add'>+void b43_phy_txpower_check(struct b43_wldev *dev, unsigned int flags)</div><div class='add'>+{</div><div class='add'>+	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='add'>+	unsigned long now = jiffies;</div><div class='add'>+	enum b43_txpwr_result result;</div><div class='add'>+</div><div class='add'>+	if (!(flags &amp; B43_TXPWR_IGNORE_TIME)) {</div><div class='add'>+		/* Check if it's time for a TXpower check. */</div><div class='add'>+		if (time_before(now, phy-&gt;next_txpwr_check_time))</div><div class='add'>+			return; /* Not yet */</div><div class='add'>+	}</div><div class='add'>+	/* The next check will be needed in two seconds, or later. */</div><div class='add'>+	phy-&gt;next_txpwr_check_time = round_jiffies(now + (HZ * 2));</div><div class='add'>+</div><div class='add'>+	if ((dev-&gt;dev-&gt;bus-&gt;boardinfo.vendor == SSB_BOARDVENDOR_BCM) &amp;&amp;</div><div class='add'>+	    (dev-&gt;dev-&gt;bus-&gt;boardinfo.type == SSB_BOARD_BU4306))</div><div class='add'>+		return; /* No software txpower adjustment needed */</div><div class='add'>+</div><div class='add'>+	result = phy-&gt;ops-&gt;recalc_txpower(dev, !!(flags &amp; B43_TXPWR_IGNORE_TSSI));</div><div class='add'>+	if (result == B43_TXPWR_RES_DONE)</div><div class='add'>+		return; /* We are done. */</div><div class='add'>+	B43_WARN_ON(result != B43_TXPWR_RES_NEED_ADJUST);</div><div class='add'>+	B43_WARN_ON(phy-&gt;ops-&gt;adjust_txpower == NULL);</div><div class='add'>+</div><div class='add'>+	/* We must adjust the transmission power in hardware.</div><div class='add'>+	 * Schedule b43_phy_txpower_adjust_work(). */</div><div class='add'>+	queue_work(dev-&gt;wl-&gt;hw-&gt;workqueue, &amp;dev-&gt;wl-&gt;txpower_adjust_work);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int b43_phy_shm_tssi_read(struct b43_wldev *dev, u16 shm_offset)</div><div class='add'>+{</div><div class='add'>+	const bool is_ofdm = (shm_offset != B43_SHM_SH_TSSI_CCK);</div><div class='add'>+	unsigned int a, b, c, d;</div><div class='add'>+	unsigned int average;</div><div class='add'>+	u32 tmp;</div><div class='add'>+</div><div class='add'>+	tmp = b43_shm_read32(dev, B43_SHM_SHARED, shm_offset);</div><div class='add'>+	a = tmp &amp; 0xFF;</div><div class='add'>+	b = (tmp &gt;&gt; 8) &amp; 0xFF;</div><div class='add'>+	c = (tmp &gt;&gt; 16) &amp; 0xFF;</div><div class='add'>+	d = (tmp &gt;&gt; 24) &amp; 0xFF;</div><div class='add'>+	if (a == 0 || a == B43_TSSI_MAX ||</div><div class='add'>+	    b == 0 || b == B43_TSSI_MAX ||</div><div class='add'>+	    c == 0 || c == B43_TSSI_MAX ||</div><div class='add'>+	    d == 0 || d == B43_TSSI_MAX)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	/* The values are OK. Clear them. */</div><div class='add'>+	tmp = B43_TSSI_MAX | (B43_TSSI_MAX &lt;&lt; 8) |</div><div class='add'>+	      (B43_TSSI_MAX &lt;&lt; 16) | (B43_TSSI_MAX &lt;&lt; 24);</div><div class='add'>+	b43_shm_write32(dev, B43_SHM_SHARED, shm_offset, tmp);</div><div class='add'>+</div><div class='add'>+	if (is_ofdm) {</div><div class='add'>+		a = (a + 32) &amp; 0x3F;</div><div class='add'>+		b = (b + 32) &amp; 0x3F;</div><div class='add'>+		c = (c + 32) &amp; 0x3F;</div><div class='add'>+		d = (d + 32) &amp; 0x3F;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Get the average of the values with 0.5 added to each value. */</div><div class='add'>+	average = (a + b + c + d + 2) / 4;</div><div class='add'>+	if (is_ofdm) {</div><div class='add'>+		/* Adjust for CCK-boost */</div><div class='add'>+		if (b43_shm_read16(dev, B43_SHM_SHARED, B43_SHM_SH_HOSTFLO)</div><div class='add'>+		    &amp; B43_HF_CCKBOOST)</div><div class='add'>+			average = (average &gt;= 13) ? (average - 13) : 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return average;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void b43_phyop_switch_analog_generic(struct b43_wldev *dev, bool on)</div><div class='add'>+{</div><div class='add'>+	b43_write16(dev, B43_MMIO_PHY0, on ? 0 : 0xF4);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/b43/phy_common.h b/drivers/net/wireless/b43/phy_common.h<br/>new file mode 100644<br/>index 000000000000..c9f5430d1d7d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/b43/phy_common.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/b43/phy_common.h</a></div><div class='hunk'>@@ -0,0 +1,413 @@</div><div class='add'>+#ifndef LINUX_B43_PHY_COMMON_H_</div><div class='add'>+#define LINUX_B43_PHY_COMMON_H_</div><div class='add'>+</div><div class='add'>+#include &lt;linux/rfkill.h&gt;</div><div class='add'>+</div><div class='add'>+struct b43_wldev;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* PHY register routing bits */</div><div class='add'>+#define B43_PHYROUTE			0x0C00 /* PHY register routing bits mask */</div><div class='add'>+#define  B43_PHYROUTE_BASE		0x0000 /* Base registers */</div><div class='add'>+#define  B43_PHYROUTE_OFDM_GPHY		0x0400 /* OFDM register routing for G-PHYs */</div><div class='add'>+#define  B43_PHYROUTE_EXT_GPHY		0x0800 /* Extended G-PHY registers */</div><div class='add'>+#define  B43_PHYROUTE_N_BMODE		0x0C00 /* N-PHY BMODE registers */</div><div class='add'>+</div><div class='add'>+/* CCK (B-PHY) registers. */</div><div class='add'>+#define B43_PHY_CCK(reg)		((reg) | B43_PHYROUTE_BASE)</div><div class='add'>+/* N-PHY registers. */</div><div class='add'>+#define B43_PHY_N(reg)			((reg) | B43_PHYROUTE_BASE)</div><div class='add'>+/* N-PHY BMODE registers. */</div><div class='add'>+#define B43_PHY_N_BMODE(reg)		((reg) | B43_PHYROUTE_N_BMODE)</div><div class='add'>+/* OFDM (A-PHY) registers. */</div><div class='add'>+#define B43_PHY_OFDM(reg)		((reg) | B43_PHYROUTE_OFDM_GPHY)</div><div class='add'>+/* Extended G-PHY registers. */</div><div class='add'>+#define B43_PHY_EXTG(reg)		((reg) | B43_PHYROUTE_EXT_GPHY)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Masks for the PHY versioning registers. */</div><div class='add'>+#define B43_PHYVER_ANALOG		0xF000</div><div class='add'>+#define B43_PHYVER_ANALOG_SHIFT		12</div><div class='add'>+#define B43_PHYVER_TYPE			0x0F00</div><div class='add'>+#define B43_PHYVER_TYPE_SHIFT		8</div><div class='add'>+#define B43_PHYVER_VERSION		0x00FF</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum b43_interference_mitigation - Interference Mitigation mode</div><div class='add'>+ *</div><div class='add'>+ * @B43_INTERFMODE_NONE:	Disabled</div><div class='add'>+ * @B43_INTERFMODE_NONWLAN:	Non-WLAN Interference Mitigation</div><div class='add'>+ * @B43_INTERFMODE_MANUALWLAN:	WLAN Interference Mitigation</div><div class='add'>+ * @B43_INTERFMODE_AUTOWLAN:	Automatic WLAN Interference Mitigation</div><div class='add'>+ */</div><div class='add'>+enum b43_interference_mitigation {</div><div class='add'>+	B43_INTERFMODE_NONE,</div><div class='add'>+	B43_INTERFMODE_NONWLAN,</div><div class='add'>+	B43_INTERFMODE_MANUALWLAN,</div><div class='add'>+	B43_INTERFMODE_AUTOWLAN,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Antenna identifiers */</div><div class='add'>+enum {</div><div class='add'>+	B43_ANTENNA0,		/* Antenna 0 */</div><div class='add'>+	B43_ANTENNA1,		/* Antenna 0 */</div><div class='add'>+	B43_ANTENNA_AUTO1,	/* Automatic, starting with antenna 1 */</div><div class='add'>+	B43_ANTENNA_AUTO0,	/* Automatic, starting with antenna 0 */</div><div class='add'>+	B43_ANTENNA2,</div><div class='add'>+	B43_ANTENNA3 = 8,</div><div class='add'>+</div><div class='add'>+	B43_ANTENNA_AUTO = B43_ANTENNA_AUTO0,</div><div class='add'>+	B43_ANTENNA_DEFAULT = B43_ANTENNA_AUTO,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum b43_txpwr_result - Return value for the recalc_txpower PHY op.</div><div class='add'>+ *</div><div class='add'>+ * @B43_TXPWR_RES_NEED_ADJUST:	Values changed. Hardware adjustment is needed.</div><div class='add'>+ * @B43_TXPWR_RES_DONE:		No more work to do. Everything is done.</div><div class='add'>+ */</div><div class='add'>+enum b43_txpwr_result {</div><div class='add'>+	B43_TXPWR_RES_NEED_ADJUST,</div><div class='add'>+	B43_TXPWR_RES_DONE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct b43_phy_operations - Function pointers for PHY ops.</div><div class='add'>+ *</div><div class='add'>+ * @allocate:		Allocate and initialise the PHY data structures.</div><div class='add'>+ * 			Must not be NULL.</div><div class='add'>+ * @free:		Destroy and free the PHY data structures.</div><div class='add'>+ * 			Must not be NULL.</div><div class='add'>+ *</div><div class='add'>+ * @prepare_structs:	Prepare the PHY data structures.</div><div class='add'>+ * 			The data structures allocated in @allocate are</div><div class='add'>+ * 			initialized here.</div><div class='add'>+ * 			Must not be NULL.</div><div class='add'>+ * @prepare_hardware:	Prepare the PHY. This is called before b43_chip_init to</div><div class='add'>+ * 			do some early early PHY hardware init.</div><div class='add'>+ * 			Can be NULL, if not required.</div><div class='add'>+ * @init:		Initialize the PHY.</div><div class='add'>+ * 			Must not be NULL.</div><div class='add'>+ * @exit:		Shutdown the PHY.</div><div class='add'>+ * 			Can be NULL, if not required.</div><div class='add'>+ *</div><div class='add'>+ * @phy_read:		Read from a PHY register.</div><div class='add'>+ * 			Must not be NULL.</div><div class='add'>+ * @phy_write:		Write to a PHY register.</div><div class='add'>+ * 			Must not be NULL.</div><div class='add'>+ * @radio_read:		Read from a Radio register.</div><div class='add'>+ * 			Must not be NULL.</div><div class='add'>+ * @radio_write:	Write to a Radio register.</div><div class='add'>+ * 			Must not be NULL.</div><div class='add'>+ *</div><div class='add'>+ * @supports_hwpctl:	Returns a boolean whether Hardware Power Control</div><div class='add'>+ * 			is supported or not.</div><div class='add'>+ * 			If NULL, hwpctl is assumed to be never supported.</div><div class='add'>+ * @software_rfkill:	Turn the radio ON or OFF.</div><div class='add'>+ * 			Possible state values are</div><div class='add'>+ * 			RFKILL_STATE_SOFT_BLOCKED or</div><div class='add'>+ * 			RFKILL_STATE_UNBLOCKED</div><div class='add'>+ * 			Must not be NULL.</div><div class='add'>+ * @switch_analog:	Turn the Analog on/off.</div><div class='add'>+ * 			Must not be NULL.</div><div class='add'>+ * @switch_channel:	Switch the radio to another channel.</div><div class='add'>+ * 			Must not be NULL.</div><div class='add'>+ * @get_default_chan:	Just returns the default channel number.</div><div class='add'>+ * 			Must not be NULL.</div><div class='add'>+ * @set_rx_antenna:	Set the antenna used for RX.</div><div class='add'>+ * 			Can be NULL, if not supported.</div><div class='add'>+ * @interf_mitigation:	Switch the Interference Mitigation mode.</div><div class='add'>+ * 			Can be NULL, if not supported.</div><div class='add'>+ *</div><div class='add'>+ * @recalc_txpower:	Recalculate the transmission power parameters.</div><div class='add'>+ * 			This callback has to recalculate the TX power settings,</div><div class='add'>+ * 			but does not need to write them to the hardware, yet.</div><div class='add'>+ * 			Returns enum b43_txpwr_result to indicate whether the hardware</div><div class='add'>+ * 			needs to be adjusted.</div><div class='add'>+ * 			If B43_TXPWR_NEED_ADJUST is returned, @adjust_txpower</div><div class='add'>+ * 			will be called later.</div><div class='add'>+ * 			If the parameter "ignore_tssi" is true, the TSSI values should</div><div class='add'>+ * 			be ignored and a recalculation of the power settings should be</div><div class='add'>+ * 			done even if the TSSI values did not change.</div><div class='add'>+ * 			This callback is called with wl-&gt;irq_lock held and must not sleep.</div><div class='add'>+ * 			Must not be NULL.</div><div class='add'>+ * @adjust_txpower:	Write the previously calculated TX power settings</div><div class='add'>+ * 			(from @recalc_txpower) to the hardware.</div><div class='add'>+ * 			This function may sleep.</div><div class='add'>+ * 			Can be NULL, if (and ONLY if) @recalc_txpower _always_</div><div class='add'>+ * 			returns B43_TXPWR_RES_DONE.</div><div class='add'>+ *</div><div class='add'>+ * @pwork_15sec:	Periodic work. Called every 15 seconds.</div><div class='add'>+ * 			Can be NULL, if not required.</div><div class='add'>+ * @pwork_60sec:	Periodic work. Called every 60 seconds.</div><div class='add'>+ * 			Can be NULL, if not required.</div><div class='add'>+ */</div><div class='add'>+struct b43_phy_operations {</div><div class='add'>+	/* Initialisation */</div><div class='add'>+	int (*allocate)(struct b43_wldev *dev);</div><div class='add'>+	void (*free)(struct b43_wldev *dev);</div><div class='add'>+	void (*prepare_structs)(struct b43_wldev *dev);</div><div class='add'>+	int (*prepare_hardware)(struct b43_wldev *dev);</div><div class='add'>+	int (*init)(struct b43_wldev *dev);</div><div class='add'>+	void (*exit)(struct b43_wldev *dev);</div><div class='add'>+</div><div class='add'>+	/* Register access */</div><div class='add'>+	u16 (*phy_read)(struct b43_wldev *dev, u16 reg);</div><div class='add'>+	void (*phy_write)(struct b43_wldev *dev, u16 reg, u16 value);</div><div class='add'>+	u16 (*radio_read)(struct b43_wldev *dev, u16 reg);</div><div class='add'>+	void (*radio_write)(struct b43_wldev *dev, u16 reg, u16 value);</div><div class='add'>+</div><div class='add'>+	/* Radio */</div><div class='add'>+	bool (*supports_hwpctl)(struct b43_wldev *dev);</div><div class='add'>+	void (*software_rfkill)(struct b43_wldev *dev, enum rfkill_state state);</div><div class='add'>+	void (*switch_analog)(struct b43_wldev *dev, bool on);</div><div class='add'>+	int (*switch_channel)(struct b43_wldev *dev, unsigned int new_channel);</div><div class='add'>+	unsigned int (*get_default_chan)(struct b43_wldev *dev);</div><div class='add'>+	void (*set_rx_antenna)(struct b43_wldev *dev, int antenna);</div><div class='add'>+	int (*interf_mitigation)(struct b43_wldev *dev,</div><div class='add'>+				 enum b43_interference_mitigation new_mode);</div><div class='add'>+</div><div class='add'>+	/* Transmission power adjustment */</div><div class='add'>+	enum b43_txpwr_result (*recalc_txpower)(struct b43_wldev *dev,</div><div class='add'>+						bool ignore_tssi);</div><div class='add'>+	void (*adjust_txpower)(struct b43_wldev *dev);</div><div class='add'>+</div><div class='add'>+	/* Misc */</div><div class='add'>+	void (*pwork_15sec)(struct b43_wldev *dev);</div><div class='add'>+	void (*pwork_60sec)(struct b43_wldev *dev);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct b43_phy_a;</div><div class='add'>+struct b43_phy_g;</div><div class='add'>+struct b43_phy_n;</div><div class='add'>+struct b43_phy_lp;</div><div class='add'>+</div><div class='add'>+struct b43_phy {</div><div class='add'>+	/* Hardware operation callbacks. */</div><div class='add'>+	const struct b43_phy_operations *ops;</div><div class='add'>+</div><div class='add'>+	/* Most hardware context information is stored in the standard-</div><div class='add'>+	 * specific data structures pointed to by the pointers below.</div><div class='add'>+	 * Only one of them is valid (the currently enabled PHY). */</div><div class='add'>+#ifdef CONFIG_B43_DEBUG</div><div class='add'>+	/* No union for debug build to force NULL derefs in buggy code. */</div><div class='add'>+	struct {</div><div class='add'>+#else</div><div class='add'>+	union {</div><div class='add'>+#endif</div><div class='add'>+		/* A-PHY specific information */</div><div class='add'>+		struct b43_phy_a *a;</div><div class='add'>+		/* G-PHY specific information */</div><div class='add'>+		struct b43_phy_g *g;</div><div class='add'>+		/* N-PHY specific information */</div><div class='add'>+		struct b43_phy_n *n;</div><div class='add'>+		/* LP-PHY specific information */</div><div class='add'>+		struct b43_phy_lp *lp;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/* Band support flags. */</div><div class='add'>+	bool supports_2ghz;</div><div class='add'>+	bool supports_5ghz;</div><div class='add'>+</div><div class='add'>+	/* GMODE bit enabled? */</div><div class='add'>+	bool gmode;</div><div class='add'>+</div><div class='add'>+	/* Analog Type */</div><div class='add'>+	u8 analog;</div><div class='add'>+	/* B43_PHYTYPE_ */</div><div class='add'>+	u8 type;</div><div class='add'>+	/* PHY revision number. */</div><div class='add'>+	u8 rev;</div><div class='add'>+</div><div class='add'>+	/* Radio versioning */</div><div class='add'>+	u16 radio_manuf;	/* Radio manufacturer */</div><div class='add'>+	u16 radio_ver;		/* Radio version */</div><div class='add'>+	u8 radio_rev;		/* Radio revision */</div><div class='add'>+</div><div class='add'>+	/* Software state of the radio */</div><div class='add'>+	bool radio_on;</div><div class='add'>+</div><div class='add'>+	/* Desired TX power level (in dBm).</div><div class='add'>+	 * This is set by the user and adjusted in b43_phy_xmitpower(). */</div><div class='add'>+	int desired_txpower;</div><div class='add'>+</div><div class='add'>+	/* Hardware Power Control enabled? */</div><div class='add'>+	bool hardware_power_control;</div><div class='add'>+</div><div class='add'>+	/* The time (in absolute jiffies) when the next TX power output</div><div class='add'>+	 * check is needed. */</div><div class='add'>+	unsigned long next_txpwr_check_time;</div><div class='add'>+</div><div class='add'>+	/* current channel */</div><div class='add'>+	unsigned int channel;</div><div class='add'>+</div><div class='add'>+	/* PHY TX errors counter. */</div><div class='add'>+	atomic_t txerr_cnt;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_B43_DEBUG</div><div class='add'>+	/* PHY registers locked by b43_phy_lock()? */</div><div class='add'>+	bool phy_locked;</div><div class='add'>+#endif /* B43_DEBUG */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * b43_phy_allocate - Allocate PHY structs</div><div class='add'>+ * Allocate the PHY data structures, based on the current dev-&gt;phy.type</div><div class='add'>+ */</div><div class='add'>+int b43_phy_allocate(struct b43_wldev *dev);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * b43_phy_free - Free PHY structs</div><div class='add'>+ */</div><div class='add'>+void b43_phy_free(struct b43_wldev *dev);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * b43_phy_init - Initialise the PHY</div><div class='add'>+ */</div><div class='add'>+int b43_phy_init(struct b43_wldev *dev);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * b43_phy_exit - Cleanup PHY</div><div class='add'>+ */</div><div class='add'>+void b43_phy_exit(struct b43_wldev *dev);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * b43_has_hardware_pctl - Hardware Power Control supported?</div><div class='add'>+ * Returns a boolean, whether hardware power control is supported.</div><div class='add'>+ */</div><div class='add'>+bool b43_has_hardware_pctl(struct b43_wldev *dev);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * b43_phy_read - 16bit PHY register read access</div><div class='add'>+ */</div><div class='add'>+u16 b43_phy_read(struct b43_wldev *dev, u16 reg);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * b43_phy_write - 16bit PHY register write access</div><div class='add'>+ */</div><div class='add'>+void b43_phy_write(struct b43_wldev *dev, u16 reg, u16 value);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * b43_phy_mask - Mask a PHY register with a mask</div><div class='add'>+ */</div><div class='add'>+void b43_phy_mask(struct b43_wldev *dev, u16 offset, u16 mask);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * b43_phy_set - OR a PHY register with a bitmap</div><div class='add'>+ */</div><div class='add'>+void b43_phy_set(struct b43_wldev *dev, u16 offset, u16 set);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * b43_phy_maskset - Mask and OR a PHY register with a mask and bitmap</div><div class='add'>+ */</div><div class='add'>+void b43_phy_maskset(struct b43_wldev *dev, u16 offset, u16 mask, u16 set);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * b43_radio_read - 16bit Radio register read access</div><div class='add'>+ */</div><div class='add'>+u16 b43_radio_read(struct b43_wldev *dev, u16 reg);</div><div class='add'>+#define b43_radio_read16	b43_radio_read /* DEPRECATED */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * b43_radio_write - 16bit Radio register write access</div><div class='add'>+ */</div><div class='add'>+void b43_radio_write(struct b43_wldev *dev, u16 reg, u16 value);</div><div class='add'>+#define b43_radio_write16	b43_radio_write /* DEPRECATED */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * b43_radio_mask - Mask a 16bit radio register with a mask</div><div class='add'>+ */</div><div class='add'>+void b43_radio_mask(struct b43_wldev *dev, u16 offset, u16 mask);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * b43_radio_set - OR a 16bit radio register with a bitmap</div><div class='add'>+ */</div><div class='add'>+void b43_radio_set(struct b43_wldev *dev, u16 offset, u16 set);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * b43_radio_maskset - Mask and OR a radio register with a mask and bitmap</div><div class='add'>+ */</div><div class='add'>+void b43_radio_maskset(struct b43_wldev *dev, u16 offset, u16 mask, u16 set);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * b43_radio_lock - Lock firmware radio register access</div><div class='add'>+ */</div><div class='add'>+void b43_radio_lock(struct b43_wldev *dev);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * b43_radio_unlock - Unlock firmware radio register access</div><div class='add'>+ */</div><div class='add'>+void b43_radio_unlock(struct b43_wldev *dev);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * b43_phy_lock - Lock firmware PHY register access</div><div class='add'>+ */</div><div class='add'>+void b43_phy_lock(struct b43_wldev *dev);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * b43_phy_unlock - Unlock firmware PHY register access</div><div class='add'>+ */</div><div class='add'>+void b43_phy_unlock(struct b43_wldev *dev);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * b43_switch_channel - Switch to another channel</div><div class='add'>+ */</div><div class='add'>+int b43_switch_channel(struct b43_wldev *dev, unsigned int new_channel);</div><div class='add'>+/**</div><div class='add'>+ * B43_DEFAULT_CHANNEL - Switch to the default channel.</div><div class='add'>+ */</div><div class='add'>+#define B43_DEFAULT_CHANNEL	UINT_MAX</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * b43_software_rfkill - Turn the radio ON or OFF in software.</div><div class='add'>+ */</div><div class='add'>+void b43_software_rfkill(struct b43_wldev *dev, enum rfkill_state state);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * b43_phy_txpower_check - Check TX power output.</div><div class='add'>+ *</div><div class='add'>+ * Compare the current TX power output to the desired power emission</div><div class='add'>+ * and schedule an adjustment in case it mismatches.</div><div class='add'>+ * Requires wl-&gt;irq_lock locked.</div><div class='add'>+ *</div><div class='add'>+ * @flags:	OR'ed enum b43_phy_txpower_check_flags flags.</div><div class='add'>+ * 		See the docs below.</div><div class='add'>+ */</div><div class='add'>+void b43_phy_txpower_check(struct b43_wldev *dev, unsigned int flags);</div><div class='add'>+/**</div><div class='add'>+ * enum b43_phy_txpower_check_flags - Flags for b43_phy_txpower_check()</div><div class='add'>+ *</div><div class='add'>+ * @B43_TXPWR_IGNORE_TIME: Ignore the schedule time and force-redo</div><div class='add'>+ *                         the check now.</div><div class='add'>+ * @B43_TXPWR_IGNORE_TSSI: Redo the recalculation, even if the average</div><div class='add'>+ *                         TSSI did not change.</div><div class='add'>+ */</div><div class='add'>+enum b43_phy_txpower_check_flags {</div><div class='add'>+	B43_TXPWR_IGNORE_TIME		= (1 &lt;&lt; 0),</div><div class='add'>+	B43_TXPWR_IGNORE_TSSI		= (1 &lt;&lt; 1),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct work_struct;</div><div class='add'>+void b43_phy_txpower_adjust_work(struct work_struct *work);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * b43_phy_shm_tssi_read - Read the average of the last 4 TSSI from SHM.</div><div class='add'>+ *</div><div class='add'>+ * @shm_offset:		The SHM address to read the values from.</div><div class='add'>+ *</div><div class='add'>+ * Returns the average of the 4 TSSI values, or a negative error code.</div><div class='add'>+ */</div><div class='add'>+int b43_phy_shm_tssi_read(struct b43_wldev *dev, u16 shm_offset);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * b43_phy_switch_analog_generic - Generic PHY operation for switching the Analog.</div><div class='add'>+ *</div><div class='add'>+ * It does the switching based on the PHY0 core register.</div><div class='add'>+ * Do _not_ call this directly. Only use it as a switch_analog callback</div><div class='add'>+ * for struct b43_phy_operations.</div><div class='add'>+ */</div><div class='add'>+void b43_phyop_switch_analog_generic(struct b43_wldev *dev, bool on);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#endif /* LINUX_B43_PHY_COMMON_H_ */</div><div class='head'>diff --git a/drivers/net/wireless/b43/phy.c b/drivers/net/wireless/b43/phy_g.c<br/>index 305d4cd6fd03..232181f6333c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/b43/phy.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/b43/phy.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/b43/phy_g.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/b43/phy_g.c</a></div><div class='hunk'>@@ -1,10 +1,11 @@</div><div class='ctx'> /*</div><div class='ctx'> </div><div class='ctx'>   Broadcom B43 wireless driver</div><div class='add'>+  IEEE 802.11g PHY driver</div><div class='ctx'> </div><div class='ctx'>   Copyright (c) 2005 Martin Langer &lt;martin-langer@gmx.de&gt;,</div><div class='ctx'>   Copyright (c) 2005-2007 Stefano Brivio &lt;stefano.brivio@polimi.it&gt;</div><div class='del'>-  Copyright (c) 2005, 2006 Michael Buesch &lt;mb@bu3sch.de&gt;</div><div class='add'>+  Copyright (c) 2005-2008 Michael Buesch &lt;mb@bu3sch.de&gt;</div><div class='ctx'>   Copyright (c) 2005, 2006 Danny van Dyk &lt;kugelfang@gentoo.org&gt;</div><div class='ctx'>   Copyright (c) 2005, 2006 Andreas Jaggi &lt;andreas.jaggi@waterwave.ch&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -25,38 +26,14 @@</div><div class='ctx'> </div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/io.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/bitrev.h&gt;</div><div class='del'>-</div><div class='ctx'> #include "b43.h"</div><div class='del'>-#include "phy.h"</div><div class='del'>-#include "nphy.h"</div><div class='del'>-#include "main.h"</div><div class='del'>-#include "tables.h"</div><div class='add'>+#include "phy_g.h"</div><div class='add'>+#include "phy_common.h"</div><div class='ctx'> #include "lo.h"</div><div class='del'>-#include "wa.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static const s8 b43_tssi2dbm_b_table[] = {</div><div class='del'>-	0x4D, 0x4C, 0x4B, 0x4A,</div><div class='del'>-	0x4A, 0x49, 0x48, 0x47,</div><div class='del'>-	0x47, 0x46, 0x45, 0x45,</div><div class='del'>-	0x44, 0x43, 0x42, 0x42,</div><div class='del'>-	0x41, 0x40, 0x3F, 0x3E,</div><div class='del'>-	0x3D, 0x3C, 0x3B, 0x3A,</div><div class='del'>-	0x39, 0x38, 0x37, 0x36,</div><div class='del'>-	0x35, 0x34, 0x32, 0x31,</div><div class='del'>-	0x30, 0x2F, 0x2D, 0x2C,</div><div class='del'>-	0x2B, 0x29, 0x28, 0x26,</div><div class='del'>-	0x25, 0x23, 0x21, 0x1F,</div><div class='del'>-	0x1D, 0x1A, 0x17, 0x14,</div><div class='del'>-	0x10, 0x0C, 0x06, 0x00,</div><div class='del'>-	-7, -7, -7, -7,</div><div class='del'>-	-7, -7, -7, -7,</div><div class='del'>-	-7, -7, -7, -7,</div><div class='del'>-};</div><div class='add'>+#include "main.h"</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bitrev.h&gt;</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> static const s8 b43_tssi2dbm_g_table[] = {</div><div class='ctx'> 	77, 77, 77, 76,</div><div class='hunk'>@@ -84,8 +61,20 @@ const u8 b43_radio_channel_codes_bg[] = {</div><div class='ctx'> 	72, 84,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+static void b43_calc_nrssi_threshold(struct b43_wldev *dev);</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> #define bitrev4(tmp) (bitrev8(tmp) &gt;&gt; 4)</div><div class='del'>-static void b43_phy_initg(struct b43_wldev *dev);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Get the freq, as it has to be written to the device. */</div><div class='add'>+static inline u16 channel2freq_bg(u8 channel)</div><div class='add'>+{</div><div class='add'>+	B43_WARN_ON(!(channel &gt;= 1 &amp;&amp; channel &lt;= 14));</div><div class='add'>+</div><div class='add'>+	return b43_radio_channel_codes_bg[channel - 1];</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static void generate_rfatt_list(struct b43_wldev *dev,</div><div class='ctx'> 				struct b43_rfatt_list *list)</div><div class='hunk'>@@ -130,7 +119,7 @@ static void generate_rfatt_list(struct b43_wldev *dev,</div><div class='ctx'> 		{.att = 9,.with_padmix = 1,},</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	if (!b43_has_hardware_pctl(phy)) {</div><div class='add'>+	if (!b43_has_hardware_pctl(dev)) {</div><div class='ctx'> 		/* Software pctl */</div><div class='ctx'> 		list-&gt;list = rfatt_0;</div><div class='ctx'> 		list-&gt;len = ARRAY_SIZE(rfatt_0);</div><div class='hunk'>@@ -174,140 +163,55 @@ static void generate_bbatt_list(struct b43_wldev *dev,</div><div class='ctx'> 	list-&gt;max_val = 8;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-bool b43_has_hardware_pctl(struct b43_phy *phy)</div><div class='del'>-{</div><div class='del'>-	if (!phy-&gt;hardware_power_control)</div><div class='del'>-		return 0;</div><div class='del'>-	switch (phy-&gt;type) {</div><div class='del'>-	case B43_PHYTYPE_A:</div><div class='del'>-		if (phy-&gt;rev &gt;= 5)</div><div class='del'>-			return 1;</div><div class='del'>-		break;</div><div class='del'>-	case B43_PHYTYPE_G:</div><div class='del'>-		if (phy-&gt;rev &gt;= 6)</div><div class='del'>-			return 1;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		B43_WARN_ON(1);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void b43_shm_clear_tssi(struct b43_wldev *dev)</div><div class='ctx'> {</div><div class='del'>-	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='del'>-</div><div class='del'>-	switch (phy-&gt;type) {</div><div class='del'>-	case B43_PHYTYPE_A:</div><div class='del'>-		b43_shm_write16(dev, B43_SHM_SHARED, 0x0068, 0x7F7F);</div><div class='del'>-		b43_shm_write16(dev, B43_SHM_SHARED, 0x006a, 0x7F7F);</div><div class='del'>-		break;</div><div class='del'>-	case B43_PHYTYPE_B:</div><div class='del'>-	case B43_PHYTYPE_G:</div><div class='del'>-		b43_shm_write16(dev, B43_SHM_SHARED, 0x0058, 0x7F7F);</div><div class='del'>-		b43_shm_write16(dev, B43_SHM_SHARED, 0x005a, 0x7F7F);</div><div class='del'>-		b43_shm_write16(dev, B43_SHM_SHARED, 0x0070, 0x7F7F);</div><div class='del'>-		b43_shm_write16(dev, B43_SHM_SHARED, 0x0072, 0x7F7F);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Lock the PHY registers against concurrent access from the microcode.</div><div class='del'>- * This lock is nonrecursive. */</div><div class='del'>-void b43_phy_lock(struct b43_wldev *dev)</div><div class='del'>-{</div><div class='del'>-#if B43_DEBUG</div><div class='del'>-	B43_WARN_ON(dev-&gt;phy.phy_locked);</div><div class='del'>-	dev-&gt;phy.phy_locked = 1;</div><div class='del'>-#endif</div><div class='del'>-	B43_WARN_ON(dev-&gt;dev-&gt;id.revision &lt; 3);</div><div class='del'>-</div><div class='del'>-	if (!b43_is_mode(dev-&gt;wl, IEEE80211_IF_TYPE_AP))</div><div class='del'>-		b43_power_saving_ctl_bits(dev, B43_PS_AWAKE);</div><div class='add'>+	b43_shm_write16(dev, B43_SHM_SHARED, 0x0058, 0x7F7F);</div><div class='add'>+	b43_shm_write16(dev, B43_SHM_SHARED, 0x005a, 0x7F7F);</div><div class='add'>+	b43_shm_write16(dev, B43_SHM_SHARED, 0x0070, 0x7F7F);</div><div class='add'>+	b43_shm_write16(dev, B43_SHM_SHARED, 0x0072, 0x7F7F);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void b43_phy_unlock(struct b43_wldev *dev)</div><div class='add'>+/* Synthetic PU workaround */</div><div class='add'>+static void b43_synth_pu_workaround(struct b43_wldev *dev, u8 channel)</div><div class='ctx'> {</div><div class='del'>-#if B43_DEBUG</div><div class='del'>-	B43_WARN_ON(!dev-&gt;phy.phy_locked);</div><div class='del'>-	dev-&gt;phy.phy_locked = 0;</div><div class='del'>-#endif</div><div class='del'>-	B43_WARN_ON(dev-&gt;dev-&gt;id.revision &lt; 3);</div><div class='add'>+	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='ctx'> </div><div class='del'>-	if (!b43_is_mode(dev-&gt;wl, IEEE80211_IF_TYPE_AP))</div><div class='del'>-		b43_power_saving_ctl_bits(dev, 0);</div><div class='del'>-}</div><div class='add'>+	might_sleep();</div><div class='ctx'> </div><div class='del'>-/* Different PHYs require different register routing flags.</div><div class='del'>- * This adjusts (and does sanity checks on) the routing flags.</div><div class='del'>- */</div><div class='del'>-static inline u16 adjust_phyreg_for_phytype(struct b43_phy *phy,</div><div class='del'>-					    u16 offset, struct b43_wldev *dev)</div><div class='del'>-{</div><div class='del'>-	if (phy-&gt;type == B43_PHYTYPE_A) {</div><div class='del'>-		/* OFDM registers are base-registers for the A-PHY. */</div><div class='del'>-		if ((offset &amp; B43_PHYROUTE) == B43_PHYROUTE_OFDM_GPHY) {</div><div class='del'>-			offset &amp;= ~B43_PHYROUTE;</div><div class='del'>-			offset |= B43_PHYROUTE_BASE;</div><div class='del'>-		}</div><div class='add'>+	if (phy-&gt;radio_ver != 0x2050 || phy-&gt;radio_rev &gt;= 6) {</div><div class='add'>+		/* We do not need the workaround. */</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-#if B43_DEBUG</div><div class='del'>-	if ((offset &amp; B43_PHYROUTE) == B43_PHYROUTE_EXT_GPHY) {</div><div class='del'>-		/* Ext-G registers are only available on G-PHYs */</div><div class='del'>-		if (phy-&gt;type != B43_PHYTYPE_G) {</div><div class='del'>-			b43err(dev-&gt;wl, "Invalid EXT-G PHY access at "</div><div class='del'>-			       "0x%04X on PHY type %u\n", offset, phy-&gt;type);</div><div class='del'>-			dump_stack();</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if ((offset &amp; B43_PHYROUTE) == B43_PHYROUTE_N_BMODE) {</div><div class='del'>-		/* N-BMODE registers are only available on N-PHYs */</div><div class='del'>-		if (phy-&gt;type != B43_PHYTYPE_N) {</div><div class='del'>-			b43err(dev-&gt;wl, "Invalid N-BMODE PHY access at "</div><div class='del'>-			       "0x%04X on PHY type %u\n", offset, phy-&gt;type);</div><div class='del'>-			dump_stack();</div><div class='del'>-		}</div><div class='add'>+	if (channel &lt;= 10) {</div><div class='add'>+		b43_write16(dev, B43_MMIO_CHANNEL,</div><div class='add'>+			    channel2freq_bg(channel + 4));</div><div class='add'>+	} else {</div><div class='add'>+		b43_write16(dev, B43_MMIO_CHANNEL, channel2freq_bg(1));</div><div class='ctx'> 	}</div><div class='del'>-#endif /* B43_DEBUG */</div><div class='del'>-</div><div class='del'>-	return offset;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u16 b43_phy_read(struct b43_wldev * dev, u16 offset)</div><div class='del'>-{</div><div class='del'>-	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='del'>-</div><div class='del'>-	offset = adjust_phyreg_for_phytype(phy, offset, dev);</div><div class='del'>-	b43_write16(dev, B43_MMIO_PHY_CONTROL, offset);</div><div class='del'>-	return b43_read16(dev, B43_MMIO_PHY_DATA);</div><div class='add'>+	msleep(1);</div><div class='add'>+	b43_write16(dev, B43_MMIO_CHANNEL, channel2freq_bg(channel));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void b43_phy_write(struct b43_wldev *dev, u16 offset, u16 val)</div><div class='add'>+/* Set the baseband attenuation value on chip. */</div><div class='add'>+void b43_gphy_set_baseband_attenuation(struct b43_wldev *dev,</div><div class='add'>+				       u16 baseband_attenuation)</div><div class='ctx'> {</div><div class='ctx'> 	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='ctx'> </div><div class='del'>-	offset = adjust_phyreg_for_phytype(phy, offset, dev);</div><div class='del'>-	b43_write16(dev, B43_MMIO_PHY_CONTROL, offset);</div><div class='del'>-	b43_write16(dev, B43_MMIO_PHY_DATA, val);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void b43_phy_mask(struct b43_wldev *dev, u16 offset, u16 mask)</div><div class='del'>-{</div><div class='del'>-	b43_phy_write(dev, offset,</div><div class='del'>-		      b43_phy_read(dev, offset) &amp; mask);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void b43_phy_set(struct b43_wldev *dev, u16 offset, u16 set)</div><div class='del'>-{</div><div class='del'>-	b43_phy_write(dev, offset,</div><div class='del'>-		      b43_phy_read(dev, offset) | set);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void b43_phy_maskset(struct b43_wldev *dev, u16 offset, u16 mask, u16 set)</div><div class='del'>-{</div><div class='del'>-	b43_phy_write(dev, offset,</div><div class='del'>-		      (b43_phy_read(dev, offset) &amp; mask) | set);</div><div class='add'>+	if (phy-&gt;analog == 0) {</div><div class='add'>+		b43_write16(dev, B43_MMIO_PHY0, (b43_read16(dev, B43_MMIO_PHY0)</div><div class='add'>+						 &amp; 0xFFF0) |</div><div class='add'>+			    baseband_attenuation);</div><div class='add'>+	} else if (phy-&gt;analog &gt; 1) {</div><div class='add'>+		b43_phy_write(dev, B43_PHY_DACCTL,</div><div class='add'>+			      (b43_phy_read(dev, B43_PHY_DACCTL)</div><div class='add'>+			       &amp; 0xFFC3) | (baseband_attenuation &lt;&lt; 2));</div><div class='add'>+	} else {</div><div class='add'>+		b43_phy_write(dev, B43_PHY_DACCTL,</div><div class='add'>+			      (b43_phy_read(dev, B43_PHY_DACCTL)</div><div class='add'>+			       &amp; 0xFF87) | (baseband_attenuation &lt;&lt; 3));</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Adjust the transmission power output (G-PHY) */</div><div class='hunk'>@@ -316,7 +220,8 @@ void b43_set_txpower_g(struct b43_wldev *dev,</div><div class='ctx'> 		       const struct b43_rfatt *rfatt, u8 tx_control)</div><div class='ctx'> {</div><div class='ctx'> 	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='del'>-	struct b43_txpower_lo_control *lo = phy-&gt;lo_control;</div><div class='add'>+	struct b43_phy_g *gphy = phy-&gt;g;</div><div class='add'>+	struct b43_txpower_lo_control *lo = gphy-&gt;lo_control;</div><div class='ctx'> 	u16 bb, rf;</div><div class='ctx'> 	u16 tx_bias, tx_magn;</div><div class='ctx'> </div><div class='hunk'>@@ -327,11 +232,12 @@ void b43_set_txpower_g(struct b43_wldev *dev,</div><div class='ctx'> 	if (unlikely(tx_bias == 0xFF))</div><div class='ctx'> 		tx_bias = 0;</div><div class='ctx'> </div><div class='del'>-	/* Save the values for later */</div><div class='del'>-	phy-&gt;tx_control = tx_control;</div><div class='del'>-	memcpy(&amp;phy-&gt;rfatt, rfatt, sizeof(*rfatt));</div><div class='del'>-	phy-&gt;rfatt.with_padmix = !!(tx_control &amp; B43_TXCTL_TXMIX);</div><div class='del'>-	memcpy(&amp;phy-&gt;bbatt, bbatt, sizeof(*bbatt));</div><div class='add'>+	/* Save the values for later. Use memmove, because it's valid</div><div class='add'>+	 * to pass &amp;gphy-&gt;rfatt as rfatt pointer argument. Same for bbatt. */</div><div class='add'>+	gphy-&gt;tx_control = tx_control;</div><div class='add'>+	memmove(&amp;gphy-&gt;rfatt, rfatt, sizeof(*rfatt));</div><div class='add'>+	gphy-&gt;rfatt.with_padmix = !!(tx_control &amp; B43_TXCTL_TXMIX);</div><div class='add'>+	memmove(&amp;gphy-&gt;bbatt, bbatt, sizeof(*bbatt));</div><div class='ctx'> </div><div class='ctx'> 	if (b43_debug(dev, B43_DBG_XMITPOWER)) {</div><div class='ctx'> 		b43dbg(dev-&gt;wl, "Tuning TX-power to bbatt(%u), "</div><div class='hunk'>@@ -340,7 +246,7 @@ void b43_set_txpower_g(struct b43_wldev *dev,</div><div class='ctx'> 		       bb, rf, tx_control, tx_bias, tx_magn);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	b43_phy_set_baseband_attenuation(dev, bb);</div><div class='add'>+	b43_gphy_set_baseband_attenuation(dev, bb);</div><div class='ctx'> 	b43_shm_write16(dev, B43_SHM_SHARED, B43_SHM_SH_RFATT, rf);</div><div class='ctx'> 	if (phy-&gt;radio_ver == 0x2050 &amp;&amp; phy-&gt;radio_rev == 8) {</div><div class='ctx'> 		b43_radio_write16(dev, 0x43,</div><div class='hunk'>@@ -358,179 +264,23 @@ void b43_set_txpower_g(struct b43_wldev *dev,</div><div class='ctx'> 		b43_radio_write16(dev, 0x52, (b43_radio_read16(dev, 0x52)</div><div class='ctx'> 					      &amp; 0xFFF0) | (tx_bias &amp; 0x000F));</div><div class='ctx'> 	}</div><div class='del'>-	if (phy-&gt;type == B43_PHYTYPE_G)</div><div class='del'>-		b43_lo_g_adjust(dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void default_baseband_attenuation(struct b43_wldev *dev,</div><div class='del'>-					 struct b43_bbatt *bb)</div><div class='del'>-{</div><div class='del'>-	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='del'>-</div><div class='del'>-	if (phy-&gt;radio_ver == 0x2050 &amp;&amp; phy-&gt;radio_rev &lt; 6)</div><div class='del'>-		bb-&gt;att = 0;</div><div class='del'>-	else</div><div class='del'>-		bb-&gt;att = 2;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void default_radio_attenuation(struct b43_wldev *dev,</div><div class='del'>-				      struct b43_rfatt *rf)</div><div class='del'>-{</div><div class='del'>-	struct ssb_bus *bus = dev-&gt;dev-&gt;bus;</div><div class='del'>-	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='del'>-</div><div class='del'>-	rf-&gt;with_padmix = 0;</div><div class='del'>-</div><div class='del'>-	if (bus-&gt;boardinfo.vendor == SSB_BOARDVENDOR_BCM &amp;&amp;</div><div class='del'>-	    bus-&gt;boardinfo.type == SSB_BOARD_BCM4309G) {</div><div class='del'>-		if (bus-&gt;boardinfo.rev &lt; 0x43) {</div><div class='del'>-			rf-&gt;att = 2;</div><div class='del'>-			return;</div><div class='del'>-		} else if (bus-&gt;boardinfo.rev &lt; 0x51) {</div><div class='del'>-			rf-&gt;att = 3;</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (phy-&gt;type == B43_PHYTYPE_A) {</div><div class='del'>-		rf-&gt;att = 0x60;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (phy-&gt;radio_ver) {</div><div class='del'>-	case 0x2053:</div><div class='del'>-		switch (phy-&gt;radio_rev) {</div><div class='del'>-		case 1:</div><div class='del'>-			rf-&gt;att = 6;</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case 0x2050:</div><div class='del'>-		switch (phy-&gt;radio_rev) {</div><div class='del'>-		case 0:</div><div class='del'>-			rf-&gt;att = 5;</div><div class='del'>-			return;</div><div class='del'>-		case 1:</div><div class='del'>-			if (phy-&gt;type == B43_PHYTYPE_G) {</div><div class='del'>-				if (bus-&gt;boardinfo.vendor == SSB_BOARDVENDOR_BCM</div><div class='del'>-				    &amp;&amp; bus-&gt;boardinfo.type == SSB_BOARD_BCM4309G</div><div class='del'>-				    &amp;&amp; bus-&gt;boardinfo.rev &gt;= 30)</div><div class='del'>-					rf-&gt;att = 3;</div><div class='del'>-				else if (bus-&gt;boardinfo.vendor ==</div><div class='del'>-					 SSB_BOARDVENDOR_BCM</div><div class='del'>-					 &amp;&amp; bus-&gt;boardinfo.type ==</div><div class='del'>-					 SSB_BOARD_BU4306)</div><div class='del'>-					rf-&gt;att = 3;</div><div class='del'>-				else</div><div class='del'>-					rf-&gt;att = 1;</div><div class='del'>-			} else {</div><div class='del'>-				if (bus-&gt;boardinfo.vendor == SSB_BOARDVENDOR_BCM</div><div class='del'>-				    &amp;&amp; bus-&gt;boardinfo.type == SSB_BOARD_BCM4309G</div><div class='del'>-				    &amp;&amp; bus-&gt;boardinfo.rev &gt;= 30)</div><div class='del'>-					rf-&gt;att = 7;</div><div class='del'>-				else</div><div class='del'>-					rf-&gt;att = 6;</div><div class='del'>-			}</div><div class='del'>-			return;</div><div class='del'>-		case 2:</div><div class='del'>-			if (phy-&gt;type == B43_PHYTYPE_G) {</div><div class='del'>-				if (bus-&gt;boardinfo.vendor == SSB_BOARDVENDOR_BCM</div><div class='del'>-				    &amp;&amp; bus-&gt;boardinfo.type == SSB_BOARD_BCM4309G</div><div class='del'>-				    &amp;&amp; bus-&gt;boardinfo.rev &gt;= 30)</div><div class='del'>-					rf-&gt;att = 3;</div><div class='del'>-				else if (bus-&gt;boardinfo.vendor ==</div><div class='del'>-					 SSB_BOARDVENDOR_BCM</div><div class='del'>-					 &amp;&amp; bus-&gt;boardinfo.type ==</div><div class='del'>-					 SSB_BOARD_BU4306)</div><div class='del'>-					rf-&gt;att = 5;</div><div class='del'>-				else if (bus-&gt;chip_id == 0x4320)</div><div class='del'>-					rf-&gt;att = 4;</div><div class='del'>-				else</div><div class='del'>-					rf-&gt;att = 3;</div><div class='del'>-			} else</div><div class='del'>-				rf-&gt;att = 6;</div><div class='del'>-			return;</div><div class='del'>-		case 3:</div><div class='del'>-			rf-&gt;att = 5;</div><div class='del'>-			return;</div><div class='del'>-		case 4:</div><div class='del'>-		case 5:</div><div class='del'>-			rf-&gt;att = 1;</div><div class='del'>-			return;</div><div class='del'>-		case 6:</div><div class='del'>-		case 7:</div><div class='del'>-			rf-&gt;att = 5;</div><div class='del'>-			return;</div><div class='del'>-		case 8:</div><div class='del'>-			rf-&gt;att = 0xA;</div><div class='del'>-			rf-&gt;with_padmix = 1;</div><div class='del'>-			return;</div><div class='del'>-		case 9:</div><div class='del'>-		default:</div><div class='del'>-			rf-&gt;att = 5;</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	rf-&gt;att = 5;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u16 default_tx_control(struct b43_wldev *dev)</div><div class='del'>-{</div><div class='del'>-	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='del'>-</div><div class='del'>-	if (phy-&gt;radio_ver != 0x2050)</div><div class='del'>-		return 0;</div><div class='del'>-	if (phy-&gt;radio_rev == 1)</div><div class='del'>-		return B43_TXCTL_PA2DB | B43_TXCTL_TXMIX;</div><div class='del'>-	if (phy-&gt;radio_rev &lt; 6)</div><div class='del'>-		return B43_TXCTL_PA2DB;</div><div class='del'>-	if (phy-&gt;radio_rev == 8)</div><div class='del'>-		return B43_TXCTL_TXMIX;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This func is called "PHY calibrate" in the specs... */</div><div class='del'>-void b43_phy_early_init(struct b43_wldev *dev)</div><div class='del'>-{</div><div class='del'>-	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='del'>-	struct b43_txpower_lo_control *lo = phy-&gt;lo_control;</div><div class='del'>-</div><div class='del'>-	default_baseband_attenuation(dev, &amp;phy-&gt;bbatt);</div><div class='del'>-	default_radio_attenuation(dev, &amp;phy-&gt;rfatt);</div><div class='del'>-	phy-&gt;tx_control = (default_tx_control(dev) &lt;&lt; 4);</div><div class='del'>-</div><div class='del'>-	/* Commit previous writes */</div><div class='del'>-	b43_read32(dev, B43_MMIO_MACCTL);</div><div class='del'>-</div><div class='del'>-	if (phy-&gt;type == B43_PHYTYPE_B || phy-&gt;type == B43_PHYTYPE_G) {</div><div class='del'>-		generate_rfatt_list(dev, &amp;lo-&gt;rfatt_list);</div><div class='del'>-		generate_bbatt_list(dev, &amp;lo-&gt;bbatt_list);</div><div class='del'>-	}</div><div class='del'>-	if (phy-&gt;type == B43_PHYTYPE_G &amp;&amp; phy-&gt;rev == 1) {</div><div class='del'>-		/* Workaround: Temporarly disable gmode through the early init</div><div class='del'>-		 * phase, as the gmode stuff is not needed for phy rev 1 */</div><div class='del'>-		phy-&gt;gmode = 0;</div><div class='del'>-		b43_wireless_core_reset(dev, 0);</div><div class='del'>-		b43_phy_initg(dev);</div><div class='del'>-		phy-&gt;gmode = 1;</div><div class='del'>-		b43_wireless_core_reset(dev, B43_TMSLOW_GMODE);</div><div class='del'>-	}</div><div class='add'>+	b43_lo_g_adjust(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* GPHY_TSSI_Power_Lookup_Table_Init */</div><div class='ctx'> static void b43_gphy_tssi_power_lt_init(struct b43_wldev *dev)</div><div class='ctx'> {</div><div class='del'>-	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='add'>+	struct b43_phy_g *gphy = dev-&gt;phy.g;</div><div class='ctx'> 	int i;</div><div class='ctx'> 	u16 value;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 32; i++)</div><div class='del'>-		b43_ofdmtab_write16(dev, 0x3C20, i, phy-&gt;tssi2dbm[i]);</div><div class='add'>+		b43_ofdmtab_write16(dev, 0x3C20, i, gphy-&gt;tssi2dbm[i]);</div><div class='ctx'> 	for (i = 32; i &lt; 64; i++)</div><div class='del'>-		b43_ofdmtab_write16(dev, 0x3C00, i - 32, phy-&gt;tssi2dbm[i]);</div><div class='add'>+		b43_ofdmtab_write16(dev, 0x3C00, i - 32, gphy-&gt;tssi2dbm[i]);</div><div class='ctx'> 	for (i = 0; i &lt; 64; i += 2) {</div><div class='del'>-		value = (u16) phy-&gt;tssi2dbm[i];</div><div class='del'>-		value |= ((u16) phy-&gt;tssi2dbm[i + 1]) &lt;&lt; 8;</div><div class='add'>+		value = (u16) gphy-&gt;tssi2dbm[i];</div><div class='add'>+		value |= ((u16) gphy-&gt;tssi2dbm[i + 1]) &lt;&lt; 8;</div><div class='ctx'> 		b43_phy_write(dev, 0x380 + (i / 2), value);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -539,7 +289,8 @@ static void b43_gphy_tssi_power_lt_init(struct b43_wldev *dev)</div><div class='ctx'> static void b43_gphy_gain_lt_init(struct b43_wldev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='del'>-	struct b43_txpower_lo_control *lo = phy-&gt;lo_control;</div><div class='add'>+	struct b43_phy_g *gphy = phy-&gt;g;</div><div class='add'>+	struct b43_txpower_lo_control *lo = gphy-&gt;lo_control;</div><div class='ctx'> 	u16 nr_written = 0;</div><div class='ctx'> 	u16 tmp;</div><div class='ctx'> 	u8 rf, bb;</div><div class='hunk'>@@ -561,1509 +312,6 @@ static void b43_gphy_gain_lt_init(struct b43_wldev *dev)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hardware_pctl_init_aphy(struct b43_wldev *dev)</div><div class='del'>-{</div><div class='del'>-	//TODO</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void hardware_pctl_init_gphy(struct b43_wldev *dev)</div><div class='del'>-{</div><div class='del'>-	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='del'>-</div><div class='del'>-	b43_phy_write(dev, 0x0036, (b43_phy_read(dev, 0x0036) &amp; 0xFFC0)</div><div class='del'>-		      | (phy-&gt;tgt_idle_tssi - phy-&gt;cur_idle_tssi));</div><div class='del'>-	b43_phy_write(dev, 0x0478, (b43_phy_read(dev, 0x0478) &amp; 0xFF00)</div><div class='del'>-		      | (phy-&gt;tgt_idle_tssi - phy-&gt;cur_idle_tssi));</div><div class='del'>-	b43_gphy_tssi_power_lt_init(dev);</div><div class='del'>-	b43_gphy_gain_lt_init(dev);</div><div class='del'>-	b43_phy_write(dev, 0x0060, b43_phy_read(dev, 0x0060) &amp; 0xFFBF);</div><div class='del'>-	b43_phy_write(dev, 0x0014, 0x0000);</div><div class='del'>-</div><div class='del'>-	B43_WARN_ON(phy-&gt;rev &lt; 6);</div><div class='del'>-	b43_phy_write(dev, 0x0478, b43_phy_read(dev, 0x0478)</div><div class='del'>-		      | 0x0800);</div><div class='del'>-	b43_phy_write(dev, 0x0478, b43_phy_read(dev, 0x0478)</div><div class='del'>-		      &amp; 0xFEFF);</div><div class='del'>-	b43_phy_write(dev, 0x0801, b43_phy_read(dev, 0x0801)</div><div class='del'>-		      &amp; 0xFFBF);</div><div class='del'>-</div><div class='del'>-	b43_gphy_dc_lt_init(dev, 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* HardwarePowerControl init for A and G PHY */</div><div class='del'>-static void b43_hardware_pctl_init(struct b43_wldev *dev)</div><div class='del'>-{</div><div class='del'>-	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='del'>-</div><div class='del'>-	if (!b43_has_hardware_pctl(phy)) {</div><div class='del'>-		/* No hardware power control */</div><div class='del'>-		b43_hf_write(dev, b43_hf_read(dev) &amp; ~B43_HF_HWPCTL);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	/* Init the hwpctl related hardware */</div><div class='del'>-	switch (phy-&gt;type) {</div><div class='del'>-	case B43_PHYTYPE_A:</div><div class='del'>-		hardware_pctl_init_aphy(dev);</div><div class='del'>-		break;</div><div class='del'>-	case B43_PHYTYPE_G:</div><div class='del'>-		hardware_pctl_init_gphy(dev);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		B43_WARN_ON(1);</div><div class='del'>-	}</div><div class='del'>-	/* Enable hardware pctl in firmware. */</div><div class='del'>-	b43_hf_write(dev, b43_hf_read(dev) | B43_HF_HWPCTL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void b43_hardware_pctl_early_init(struct b43_wldev *dev)</div><div class='del'>-{</div><div class='del'>-	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='del'>-</div><div class='del'>-	if (!b43_has_hardware_pctl(phy)) {</div><div class='del'>-		b43_phy_write(dev, 0x047A, 0xC111);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	b43_phy_write(dev, 0x0036, b43_phy_read(dev, 0x0036) &amp; 0xFEFF);</div><div class='del'>-	b43_phy_write(dev, 0x002F, 0x0202);</div><div class='del'>-	b43_phy_write(dev, 0x047C, b43_phy_read(dev, 0x047C) | 0x0002);</div><div class='del'>-	b43_phy_write(dev, 0x047A, b43_phy_read(dev, 0x047A) | 0xF000);</div><div class='del'>-	if (phy-&gt;radio_ver == 0x2050 &amp;&amp; phy-&gt;radio_rev == 8) {</div><div class='del'>-		b43_phy_write(dev, 0x047A, (b43_phy_read(dev, 0x047A)</div><div class='del'>-					    &amp; 0xFF0F) | 0x0010);</div><div class='del'>-		b43_phy_write(dev, 0x005D, b43_phy_read(dev, 0x005D)</div><div class='del'>-			      | 0x8000);</div><div class='del'>-		b43_phy_write(dev, 0x004E, (b43_phy_read(dev, 0x004E)</div><div class='del'>-					    &amp; 0xFFC0) | 0x0010);</div><div class='del'>-		b43_phy_write(dev, 0x002E, 0xC07F);</div><div class='del'>-		b43_phy_write(dev, 0x0036, b43_phy_read(dev, 0x0036)</div><div class='del'>-			      | 0x0400);</div><div class='del'>-	} else {</div><div class='del'>-		b43_phy_write(dev, 0x0036, b43_phy_read(dev, 0x0036)</div><div class='del'>-			      | 0x0200);</div><div class='del'>-		b43_phy_write(dev, 0x0036, b43_phy_read(dev, 0x0036)</div><div class='del'>-			      | 0x0400);</div><div class='del'>-		b43_phy_write(dev, 0x005D, b43_phy_read(dev, 0x005D)</div><div class='del'>-			      &amp; 0x7FFF);</div><div class='del'>-		b43_phy_write(dev, 0x004F, b43_phy_read(dev, 0x004F)</div><div class='del'>-			      &amp; 0xFFFE);</div><div class='del'>-		b43_phy_write(dev, 0x004E, (b43_phy_read(dev, 0x004E)</div><div class='del'>-					    &amp; 0xFFC0) | 0x0010);</div><div class='del'>-		b43_phy_write(dev, 0x002E, 0xC07F);</div><div class='del'>-		b43_phy_write(dev, 0x047A, (b43_phy_read(dev, 0x047A)</div><div class='del'>-					    &amp; 0xFF0F) | 0x0010);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Intialize B/G PHY power control</div><div class='del'>- * as described in http://bcm-specs.sipsolutions.net/InitPowerControl</div><div class='del'>- */</div><div class='del'>-static void b43_phy_init_pctl(struct b43_wldev *dev)</div><div class='del'>-{</div><div class='del'>-	struct ssb_bus *bus = dev-&gt;dev-&gt;bus;</div><div class='del'>-	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='del'>-	struct b43_rfatt old_rfatt;</div><div class='del'>-	struct b43_bbatt old_bbatt;</div><div class='del'>-	u8 old_tx_control = 0;</div><div class='del'>-</div><div class='del'>-	if ((bus-&gt;boardinfo.vendor == SSB_BOARDVENDOR_BCM) &amp;&amp;</div><div class='del'>-	    (bus-&gt;boardinfo.type == SSB_BOARD_BU4306))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	b43_phy_write(dev, 0x0028, 0x8018);</div><div class='del'>-</div><div class='del'>-	/* This does something with the Analog... */</div><div class='del'>-	b43_write16(dev, B43_MMIO_PHY0, b43_read16(dev, B43_MMIO_PHY0)</div><div class='del'>-		    &amp; 0xFFDF);</div><div class='del'>-</div><div class='del'>-	if (phy-&gt;type == B43_PHYTYPE_G &amp;&amp; !phy-&gt;gmode)</div><div class='del'>-		return;</div><div class='del'>-	b43_hardware_pctl_early_init(dev);</div><div class='del'>-	if (phy-&gt;cur_idle_tssi == 0) {</div><div class='del'>-		if (phy-&gt;radio_ver == 0x2050 &amp;&amp; phy-&gt;analog == 0) {</div><div class='del'>-			b43_radio_write16(dev, 0x0076,</div><div class='del'>-					  (b43_radio_read16(dev, 0x0076)</div><div class='del'>-					   &amp; 0x00F7) | 0x0084);</div><div class='del'>-		} else {</div><div class='del'>-			struct b43_rfatt rfatt;</div><div class='del'>-			struct b43_bbatt bbatt;</div><div class='del'>-</div><div class='del'>-			memcpy(&amp;old_rfatt, &amp;phy-&gt;rfatt, sizeof(old_rfatt));</div><div class='del'>-			memcpy(&amp;old_bbatt, &amp;phy-&gt;bbatt, sizeof(old_bbatt));</div><div class='del'>-			old_tx_control = phy-&gt;tx_control;</div><div class='del'>-</div><div class='del'>-			bbatt.att = 11;</div><div class='del'>-			if (phy-&gt;radio_rev == 8) {</div><div class='del'>-				rfatt.att = 15;</div><div class='del'>-				rfatt.with_padmix = 1;</div><div class='del'>-			} else {</div><div class='del'>-				rfatt.att = 9;</div><div class='del'>-				rfatt.with_padmix = 0;</div><div class='del'>-			}</div><div class='del'>-			b43_set_txpower_g(dev, &amp;bbatt, &amp;rfatt, 0);</div><div class='del'>-		}</div><div class='del'>-		b43_dummy_transmission(dev);</div><div class='del'>-		phy-&gt;cur_idle_tssi = b43_phy_read(dev, B43_PHY_ITSSI);</div><div class='del'>-		if (B43_DEBUG) {</div><div class='del'>-			/* Current-Idle-TSSI sanity check. */</div><div class='del'>-			if (abs(phy-&gt;cur_idle_tssi - phy-&gt;tgt_idle_tssi) &gt;= 20) {</div><div class='del'>-				b43dbg(dev-&gt;wl,</div><div class='del'>-				       "!WARNING! Idle-TSSI phy-&gt;cur_idle_tssi "</div><div class='del'>-				       "measuring failed. (cur=%d, tgt=%d). Disabling TX power "</div><div class='del'>-				       "adjustment.\n", phy-&gt;cur_idle_tssi,</div><div class='del'>-				       phy-&gt;tgt_idle_tssi);</div><div class='del'>-				phy-&gt;cur_idle_tssi = 0;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		if (phy-&gt;radio_ver == 0x2050 &amp;&amp; phy-&gt;analog == 0) {</div><div class='del'>-			b43_radio_write16(dev, 0x0076,</div><div class='del'>-					  b43_radio_read16(dev, 0x0076)</div><div class='del'>-					  &amp; 0xFF7B);</div><div class='del'>-		} else {</div><div class='del'>-			b43_set_txpower_g(dev, &amp;old_bbatt,</div><div class='del'>-					  &amp;old_rfatt, old_tx_control);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	b43_hardware_pctl_init(dev);</div><div class='del'>-	b43_shm_clear_tssi(dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void b43_phy_rssiagc(struct b43_wldev *dev, u8 enable)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (dev-&gt;phy.rev &lt; 3) {</div><div class='del'>-		if (enable)</div><div class='del'>-			for (i = 0; i &lt; B43_TAB_RSSIAGC1_SIZE; i++) {</div><div class='del'>-				b43_ofdmtab_write16(dev,</div><div class='del'>-					B43_OFDMTAB_LNAHPFGAIN1, i, 0xFFF8);</div><div class='del'>-				b43_ofdmtab_write16(dev,</div><div class='del'>-					B43_OFDMTAB_WRSSI, i, 0xFFF8);</div><div class='del'>-			}</div><div class='del'>-		else</div><div class='del'>-			for (i = 0; i &lt; B43_TAB_RSSIAGC1_SIZE; i++) {</div><div class='del'>-				b43_ofdmtab_write16(dev,</div><div class='del'>-					B43_OFDMTAB_LNAHPFGAIN1, i, b43_tab_rssiagc1[i]);</div><div class='del'>-				b43_ofdmtab_write16(dev,</div><div class='del'>-					B43_OFDMTAB_WRSSI, i, b43_tab_rssiagc1[i]);</div><div class='del'>-			}</div><div class='del'>-	} else {</div><div class='del'>-		if (enable)</div><div class='del'>-			for (i = 0; i &lt; B43_TAB_RSSIAGC1_SIZE; i++)</div><div class='del'>-				b43_ofdmtab_write16(dev,</div><div class='del'>-					B43_OFDMTAB_WRSSI, i, 0x0820);</div><div class='del'>-		else</div><div class='del'>-			for (i = 0; i &lt; B43_TAB_RSSIAGC2_SIZE; i++)</div><div class='del'>-				b43_ofdmtab_write16(dev,</div><div class='del'>-					B43_OFDMTAB_WRSSI, i, b43_tab_rssiagc2[i]);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void b43_phy_ww(struct b43_wldev *dev)</div><div class='del'>-{</div><div class='del'>-	u16 b, curr_s, best_s = 0xFFFF;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	b43_phy_write(dev, B43_PHY_CRS0,</div><div class='del'>-		b43_phy_read(dev, B43_PHY_CRS0) &amp; ~B43_PHY_CRS0_EN);</div><div class='del'>-	b43_phy_write(dev, B43_PHY_OFDM(0x1B),</div><div class='del'>-		b43_phy_read(dev, B43_PHY_OFDM(0x1B)) | 0x1000);</div><div class='del'>-	b43_phy_write(dev, B43_PHY_OFDM(0x82),</div><div class='del'>-		(b43_phy_read(dev, B43_PHY_OFDM(0x82)) &amp; 0xF0FF) | 0x0300);</div><div class='del'>-	b43_radio_write16(dev, 0x0009,</div><div class='del'>-		b43_radio_read16(dev, 0x0009) | 0x0080);</div><div class='del'>-	b43_radio_write16(dev, 0x0012,</div><div class='del'>-		(b43_radio_read16(dev, 0x0012) &amp; 0xFFFC) | 0x0002);</div><div class='del'>-	b43_wa_initgains(dev);</div><div class='del'>-	b43_phy_write(dev, B43_PHY_OFDM(0xBA), 0x3ED5);</div><div class='del'>-	b = b43_phy_read(dev, B43_PHY_PWRDOWN);</div><div class='del'>-	b43_phy_write(dev, B43_PHY_PWRDOWN, (b &amp; 0xFFF8) | 0x0005);</div><div class='del'>-	b43_radio_write16(dev, 0x0004,</div><div class='del'>-		b43_radio_read16(dev, 0x0004) | 0x0004);</div><div class='del'>-	for (i = 0x10; i &lt;= 0x20; i++) {</div><div class='del'>-		b43_radio_write16(dev, 0x0013, i);</div><div class='del'>-		curr_s = b43_phy_read(dev, B43_PHY_OTABLEQ) &amp; 0x00FF;</div><div class='del'>-		if (!curr_s) {</div><div class='del'>-			best_s = 0x0000;</div><div class='del'>-			break;</div><div class='del'>-		} else if (curr_s &gt;= 0x0080)</div><div class='del'>-			curr_s = 0x0100 - curr_s;</div><div class='del'>-		if (curr_s &lt; best_s)</div><div class='del'>-			best_s = curr_s;</div><div class='del'>-	}</div><div class='del'>-	b43_phy_write(dev, B43_PHY_PWRDOWN, b);</div><div class='del'>-	b43_radio_write16(dev, 0x0004,</div><div class='del'>-		b43_radio_read16(dev, 0x0004) &amp; 0xFFFB);</div><div class='del'>-	b43_radio_write16(dev, 0x0013, best_s);</div><div class='del'>-	b43_ofdmtab_write16(dev, B43_OFDMTAB_AGC1_R1, 0, 0xFFEC);</div><div class='del'>-	b43_phy_write(dev, B43_PHY_OFDM(0xB7), 0x1E80);</div><div class='del'>-	b43_phy_write(dev, B43_PHY_OFDM(0xB6), 0x1C00);</div><div class='del'>-	b43_phy_write(dev, B43_PHY_OFDM(0xB5), 0x0EC0);</div><div class='del'>-	b43_phy_write(dev, B43_PHY_OFDM(0xB2), 0x00C0);</div><div class='del'>-	b43_phy_write(dev, B43_PHY_OFDM(0xB9), 0x1FFF);</div><div class='del'>-	b43_phy_write(dev, B43_PHY_OFDM(0xBB),</div><div class='del'>-		(b43_phy_read(dev, B43_PHY_OFDM(0xBB)) &amp; 0xF000) | 0x0053);</div><div class='del'>-	b43_phy_write(dev, B43_PHY_OFDM61,</div><div class='del'>-		(b43_phy_read(dev, B43_PHY_OFDM61) &amp; 0xFE1F) | 0x0120);</div><div class='del'>-	b43_phy_write(dev, B43_PHY_OFDM(0x13),</div><div class='del'>-		(b43_phy_read(dev, B43_PHY_OFDM(0x13)) &amp; 0x0FFF) | 0x3000);</div><div class='del'>-	b43_phy_write(dev, B43_PHY_OFDM(0x14),</div><div class='del'>-		(b43_phy_read(dev, B43_PHY_OFDM(0x14)) &amp; 0x0FFF) | 0x3000);</div><div class='del'>-	b43_ofdmtab_write16(dev, B43_OFDMTAB_AGC1, 6, 0x0017);</div><div class='del'>-	for (i = 0; i &lt; 6; i++)</div><div class='del'>-		b43_ofdmtab_write16(dev, B43_OFDMTAB_AGC1, i, 0x000F);</div><div class='del'>-	b43_ofdmtab_write16(dev, B43_OFDMTAB_AGC1, 0x0D, 0x000E);</div><div class='del'>-	b43_ofdmtab_write16(dev, B43_OFDMTAB_AGC1, 0x0E, 0x0011);</div><div class='del'>-	b43_ofdmtab_write16(dev, B43_OFDMTAB_AGC1, 0x0F, 0x0013);</div><div class='del'>-	b43_phy_write(dev, B43_PHY_OFDM(0x33), 0x5030);</div><div class='del'>-	b43_phy_write(dev, B43_PHY_CRS0,</div><div class='del'>-		b43_phy_read(dev, B43_PHY_CRS0) | B43_PHY_CRS0_EN);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Initialize APHY. This is also called for the GPHY in some cases. */</div><div class='del'>-static void b43_phy_inita(struct b43_wldev *dev)</div><div class='del'>-{</div><div class='del'>-	struct ssb_bus *bus = dev-&gt;dev-&gt;bus;</div><div class='del'>-	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='del'>-</div><div class='del'>-	might_sleep();</div><div class='del'>-</div><div class='del'>-	if (phy-&gt;rev &gt;= 6) {</div><div class='del'>-		if (phy-&gt;type == B43_PHYTYPE_A)</div><div class='del'>-			b43_phy_write(dev, B43_PHY_OFDM(0x1B),</div><div class='del'>-				b43_phy_read(dev, B43_PHY_OFDM(0x1B)) &amp; ~0x1000);</div><div class='del'>-		if (b43_phy_read(dev, B43_PHY_ENCORE) &amp; B43_PHY_ENCORE_EN)</div><div class='del'>-			b43_phy_write(dev, B43_PHY_ENCORE,</div><div class='del'>-				b43_phy_read(dev, B43_PHY_ENCORE) | 0x0010);</div><div class='del'>-		else</div><div class='del'>-			b43_phy_write(dev, B43_PHY_ENCORE,</div><div class='del'>-				b43_phy_read(dev, B43_PHY_ENCORE) &amp; ~0x1010);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	b43_wa_all(dev);</div><div class='del'>-</div><div class='del'>-	if (phy-&gt;type == B43_PHYTYPE_A) {</div><div class='del'>-		if (phy-&gt;gmode &amp;&amp; (phy-&gt;rev &lt; 3))</div><div class='del'>-			b43_phy_write(dev, 0x0034,</div><div class='del'>-				b43_phy_read(dev, 0x0034) | 0x0001);</div><div class='del'>-		b43_phy_rssiagc(dev, 0);</div><div class='del'>-</div><div class='del'>-		b43_phy_write(dev, B43_PHY_CRS0,</div><div class='del'>-			b43_phy_read(dev, B43_PHY_CRS0) | B43_PHY_CRS0_EN);</div><div class='del'>-</div><div class='del'>-		b43_radio_init2060(dev);</div><div class='del'>-</div><div class='del'>-		if ((bus-&gt;boardinfo.vendor == SSB_BOARDVENDOR_BCM) &amp;&amp;</div><div class='del'>-		    ((bus-&gt;boardinfo.type == SSB_BOARD_BU4306) ||</div><div class='del'>-		     (bus-&gt;boardinfo.type == SSB_BOARD_BU4309))) {</div><div class='del'>-			; //TODO: A PHY LO</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (phy-&gt;rev &gt;= 3)</div><div class='del'>-			b43_phy_ww(dev);</div><div class='del'>-</div><div class='del'>-		hardware_pctl_init_aphy(dev);</div><div class='del'>-</div><div class='del'>-		//TODO: radar detection</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((phy-&gt;type == B43_PHYTYPE_G) &amp;&amp;</div><div class='del'>-	    (dev-&gt;dev-&gt;bus-&gt;sprom.boardflags_lo &amp; B43_BFL_PACTRL)) {</div><div class='del'>-		b43_phy_write(dev, B43_PHY_OFDM(0x6E),</div><div class='del'>-				  (b43_phy_read(dev, B43_PHY_OFDM(0x6E))</div><div class='del'>-				   &amp; 0xE000) | 0x3CF);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void b43_phy_initb5(struct b43_wldev *dev)</div><div class='del'>-{</div><div class='del'>-	struct ssb_bus *bus = dev-&gt;dev-&gt;bus;</div><div class='del'>-	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='del'>-	u16 offset, value;</div><div class='del'>-	u8 old_channel;</div><div class='del'>-</div><div class='del'>-	if (phy-&gt;analog == 1) {</div><div class='del'>-		b43_radio_write16(dev, 0x007A, b43_radio_read16(dev, 0x007A)</div><div class='del'>-				  | 0x0050);</div><div class='del'>-	}</div><div class='del'>-	if ((bus-&gt;boardinfo.vendor != SSB_BOARDVENDOR_BCM) &amp;&amp;</div><div class='del'>-	    (bus-&gt;boardinfo.type != SSB_BOARD_BU4306)) {</div><div class='del'>-		value = 0x2120;</div><div class='del'>-		for (offset = 0x00A8; offset &lt; 0x00C7; offset++) {</div><div class='del'>-			b43_phy_write(dev, offset, value);</div><div class='del'>-			value += 0x202;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	b43_phy_write(dev, 0x0035, (b43_phy_read(dev, 0x0035) &amp; 0xF0FF)</div><div class='del'>-		      | 0x0700);</div><div class='del'>-	if (phy-&gt;radio_ver == 0x2050)</div><div class='del'>-		b43_phy_write(dev, 0x0038, 0x0667);</div><div class='del'>-</div><div class='del'>-	if (phy-&gt;gmode || phy-&gt;rev &gt;= 2) {</div><div class='del'>-		if (phy-&gt;radio_ver == 0x2050) {</div><div class='del'>-			b43_radio_write16(dev, 0x007A,</div><div class='del'>-					  b43_radio_read16(dev, 0x007A)</div><div class='del'>-					  | 0x0020);</div><div class='del'>-			b43_radio_write16(dev, 0x0051,</div><div class='del'>-					  b43_radio_read16(dev, 0x0051)</div><div class='del'>-					  | 0x0004);</div><div class='del'>-		}</div><div class='del'>-		b43_write16(dev, B43_MMIO_PHY_RADIO, 0x0000);</div><div class='del'>-</div><div class='del'>-		b43_phy_write(dev, 0x0802, b43_phy_read(dev, 0x0802) | 0x0100);</div><div class='del'>-		b43_phy_write(dev, 0x042B, b43_phy_read(dev, 0x042B) | 0x2000);</div><div class='del'>-</div><div class='del'>-		b43_phy_write(dev, 0x001C, 0x186A);</div><div class='del'>-</div><div class='del'>-		b43_phy_write(dev, 0x0013,</div><div class='del'>-			      (b43_phy_read(dev, 0x0013) &amp; 0x00FF) | 0x1900);</div><div class='del'>-		b43_phy_write(dev, 0x0035,</div><div class='del'>-			      (b43_phy_read(dev, 0x0035) &amp; 0xFFC0) | 0x0064);</div><div class='del'>-		b43_phy_write(dev, 0x005D,</div><div class='del'>-			      (b43_phy_read(dev, 0x005D) &amp; 0xFF80) | 0x000A);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (dev-&gt;bad_frames_preempt) {</div><div class='del'>-		b43_phy_write(dev, B43_PHY_RADIO_BITFIELD,</div><div class='del'>-			      b43_phy_read(dev,</div><div class='del'>-					   B43_PHY_RADIO_BITFIELD) | (1 &lt;&lt; 11));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (phy-&gt;analog == 1) {</div><div class='del'>-		b43_phy_write(dev, 0x0026, 0xCE00);</div><div class='del'>-		b43_phy_write(dev, 0x0021, 0x3763);</div><div class='del'>-		b43_phy_write(dev, 0x0022, 0x1BC3);</div><div class='del'>-		b43_phy_write(dev, 0x0023, 0x06F9);</div><div class='del'>-		b43_phy_write(dev, 0x0024, 0x037E);</div><div class='del'>-	} else</div><div class='del'>-		b43_phy_write(dev, 0x0026, 0xCC00);</div><div class='del'>-	b43_phy_write(dev, 0x0030, 0x00C6);</div><div class='del'>-	b43_write16(dev, 0x03EC, 0x3F22);</div><div class='del'>-</div><div class='del'>-	if (phy-&gt;analog == 1)</div><div class='del'>-		b43_phy_write(dev, 0x0020, 0x3E1C);</div><div class='del'>-	else</div><div class='del'>-		b43_phy_write(dev, 0x0020, 0x301C);</div><div class='del'>-</div><div class='del'>-	if (phy-&gt;analog == 0)</div><div class='del'>-		b43_write16(dev, 0x03E4, 0x3000);</div><div class='del'>-</div><div class='del'>-	old_channel = phy-&gt;channel;</div><div class='del'>-	/* Force to channel 7, even if not supported. */</div><div class='del'>-	b43_radio_selectchannel(dev, 7, 0);</div><div class='del'>-</div><div class='del'>-	if (phy-&gt;radio_ver != 0x2050) {</div><div class='del'>-		b43_radio_write16(dev, 0x0075, 0x0080);</div><div class='del'>-		b43_radio_write16(dev, 0x0079, 0x0081);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	b43_radio_write16(dev, 0x0050, 0x0020);</div><div class='del'>-	b43_radio_write16(dev, 0x0050, 0x0023);</div><div class='del'>-</div><div class='del'>-	if (phy-&gt;radio_ver == 0x2050) {</div><div class='del'>-		b43_radio_write16(dev, 0x0050, 0x0020);</div><div class='del'>-		b43_radio_write16(dev, 0x005A, 0x0070);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	b43_radio_write16(dev, 0x005B, 0x007B);</div><div class='del'>-	b43_radio_write16(dev, 0x005C, 0x00B0);</div><div class='del'>-</div><div class='del'>-	b43_radio_write16(dev, 0x007A, b43_radio_read16(dev, 0x007A) | 0x0007);</div><div class='del'>-</div><div class='del'>-	b43_radio_selectchannel(dev, old_channel, 0);</div><div class='del'>-</div><div class='del'>-	b43_phy_write(dev, 0x0014, 0x0080);</div><div class='del'>-	b43_phy_write(dev, 0x0032, 0x00CA);</div><div class='del'>-	b43_phy_write(dev, 0x002A, 0x88A3);</div><div class='del'>-</div><div class='del'>-	b43_set_txpower_g(dev, &amp;phy-&gt;bbatt, &amp;phy-&gt;rfatt, phy-&gt;tx_control);</div><div class='del'>-</div><div class='del'>-	if (phy-&gt;radio_ver == 0x2050)</div><div class='del'>-		b43_radio_write16(dev, 0x005D, 0x000D);</div><div class='del'>-</div><div class='del'>-	b43_write16(dev, 0x03E4, (b43_read16(dev, 0x03E4) &amp; 0xFFC0) | 0x0004);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void b43_phy_initb6(struct b43_wldev *dev)</div><div class='del'>-{</div><div class='del'>-	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='del'>-	u16 offset, val;</div><div class='del'>-	u8 old_channel;</div><div class='del'>-</div><div class='del'>-	b43_phy_write(dev, 0x003E, 0x817A);</div><div class='del'>-	b43_radio_write16(dev, 0x007A,</div><div class='del'>-			  (b43_radio_read16(dev, 0x007A) | 0x0058));</div><div class='del'>-	if (phy-&gt;radio_rev == 4 || phy-&gt;radio_rev == 5) {</div><div class='del'>-		b43_radio_write16(dev, 0x51, 0x37);</div><div class='del'>-		b43_radio_write16(dev, 0x52, 0x70);</div><div class='del'>-		b43_radio_write16(dev, 0x53, 0xB3);</div><div class='del'>-		b43_radio_write16(dev, 0x54, 0x9B);</div><div class='del'>-		b43_radio_write16(dev, 0x5A, 0x88);</div><div class='del'>-		b43_radio_write16(dev, 0x5B, 0x88);</div><div class='del'>-		b43_radio_write16(dev, 0x5D, 0x88);</div><div class='del'>-		b43_radio_write16(dev, 0x5E, 0x88);</div><div class='del'>-		b43_radio_write16(dev, 0x7D, 0x88);</div><div class='del'>-		b43_hf_write(dev, b43_hf_read(dev)</div><div class='del'>-			     | B43_HF_TSSIRPSMW);</div><div class='del'>-	}</div><div class='del'>-	B43_WARN_ON(phy-&gt;radio_rev == 6 || phy-&gt;radio_rev == 7);	/* We had code for these revs here... */</div><div class='del'>-	if (phy-&gt;radio_rev == 8) {</div><div class='del'>-		b43_radio_write16(dev, 0x51, 0);</div><div class='del'>-		b43_radio_write16(dev, 0x52, 0x40);</div><div class='del'>-		b43_radio_write16(dev, 0x53, 0xB7);</div><div class='del'>-		b43_radio_write16(dev, 0x54, 0x98);</div><div class='del'>-		b43_radio_write16(dev, 0x5A, 0x88);</div><div class='del'>-		b43_radio_write16(dev, 0x5B, 0x6B);</div><div class='del'>-		b43_radio_write16(dev, 0x5C, 0x0F);</div><div class='del'>-		if (dev-&gt;dev-&gt;bus-&gt;sprom.boardflags_lo &amp; B43_BFL_ALTIQ) {</div><div class='del'>-			b43_radio_write16(dev, 0x5D, 0xFA);</div><div class='del'>-			b43_radio_write16(dev, 0x5E, 0xD8);</div><div class='del'>-		} else {</div><div class='del'>-			b43_radio_write16(dev, 0x5D, 0xF5);</div><div class='del'>-			b43_radio_write16(dev, 0x5E, 0xB8);</div><div class='del'>-		}</div><div class='del'>-		b43_radio_write16(dev, 0x0073, 0x0003);</div><div class='del'>-		b43_radio_write16(dev, 0x007D, 0x00A8);</div><div class='del'>-		b43_radio_write16(dev, 0x007C, 0x0001);</div><div class='del'>-		b43_radio_write16(dev, 0x007E, 0x0008);</div><div class='del'>-	}</div><div class='del'>-	val = 0x1E1F;</div><div class='del'>-	for (offset = 0x0088; offset &lt; 0x0098; offset++) {</div><div class='del'>-		b43_phy_write(dev, offset, val);</div><div class='del'>-		val -= 0x0202;</div><div class='del'>-	}</div><div class='del'>-	val = 0x3E3F;</div><div class='del'>-	for (offset = 0x0098; offset &lt; 0x00A8; offset++) {</div><div class='del'>-		b43_phy_write(dev, offset, val);</div><div class='del'>-		val -= 0x0202;</div><div class='del'>-	}</div><div class='del'>-	val = 0x2120;</div><div class='del'>-	for (offset = 0x00A8; offset &lt; 0x00C8; offset++) {</div><div class='del'>-		b43_phy_write(dev, offset, (val &amp; 0x3F3F));</div><div class='del'>-		val += 0x0202;</div><div class='del'>-	}</div><div class='del'>-	if (phy-&gt;type == B43_PHYTYPE_G) {</div><div class='del'>-		b43_radio_write16(dev, 0x007A,</div><div class='del'>-				  b43_radio_read16(dev, 0x007A) | 0x0020);</div><div class='del'>-		b43_radio_write16(dev, 0x0051,</div><div class='del'>-				  b43_radio_read16(dev, 0x0051) | 0x0004);</div><div class='del'>-		b43_phy_write(dev, 0x0802, b43_phy_read(dev, 0x0802) | 0x0100);</div><div class='del'>-		b43_phy_write(dev, 0x042B, b43_phy_read(dev, 0x042B) | 0x2000);</div><div class='del'>-		b43_phy_write(dev, 0x5B, 0);</div><div class='del'>-		b43_phy_write(dev, 0x5C, 0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	old_channel = phy-&gt;channel;</div><div class='del'>-	if (old_channel &gt;= 8)</div><div class='del'>-		b43_radio_selectchannel(dev, 1, 0);</div><div class='del'>-	else</div><div class='del'>-		b43_radio_selectchannel(dev, 13, 0);</div><div class='del'>-</div><div class='del'>-	b43_radio_write16(dev, 0x0050, 0x0020);</div><div class='del'>-	b43_radio_write16(dev, 0x0050, 0x0023);</div><div class='del'>-	udelay(40);</div><div class='del'>-	if (phy-&gt;radio_rev &lt; 6 || phy-&gt;radio_rev == 8) {</div><div class='del'>-		b43_radio_write16(dev, 0x7C, (b43_radio_read16(dev, 0x7C)</div><div class='del'>-					      | 0x0002));</div><div class='del'>-		b43_radio_write16(dev, 0x50, 0x20);</div><div class='del'>-	}</div><div class='del'>-	if (phy-&gt;radio_rev &lt;= 2) {</div><div class='del'>-		b43_radio_write16(dev, 0x7C, 0x20);</div><div class='del'>-		b43_radio_write16(dev, 0x5A, 0x70);</div><div class='del'>-		b43_radio_write16(dev, 0x5B, 0x7B);</div><div class='del'>-		b43_radio_write16(dev, 0x5C, 0xB0);</div><div class='del'>-	}</div><div class='del'>-	b43_radio_write16(dev, 0x007A,</div><div class='del'>-			  (b43_radio_read16(dev, 0x007A) &amp; 0x00F8) | 0x0007);</div><div class='del'>-</div><div class='del'>-	b43_radio_selectchannel(dev, old_channel, 0);</div><div class='del'>-</div><div class='del'>-	b43_phy_write(dev, 0x0014, 0x0200);</div><div class='del'>-	if (phy-&gt;radio_rev &gt;= 6)</div><div class='del'>-		b43_phy_write(dev, 0x2A, 0x88C2);</div><div class='del'>-	else</div><div class='del'>-		b43_phy_write(dev, 0x2A, 0x8AC0);</div><div class='del'>-	b43_phy_write(dev, 0x0038, 0x0668);</div><div class='del'>-	b43_set_txpower_g(dev, &amp;phy-&gt;bbatt, &amp;phy-&gt;rfatt, phy-&gt;tx_control);</div><div class='del'>-	if (phy-&gt;radio_rev &lt;= 5) {</div><div class='del'>-		b43_phy_write(dev, 0x5D, (b43_phy_read(dev, 0x5D)</div><div class='del'>-					  &amp; 0xFF80) | 0x0003);</div><div class='del'>-	}</div><div class='del'>-	if (phy-&gt;radio_rev &lt;= 2)</div><div class='del'>-		b43_radio_write16(dev, 0x005D, 0x000D);</div><div class='del'>-</div><div class='del'>-	if (phy-&gt;analog == 4) {</div><div class='del'>-		b43_write16(dev, 0x3E4, 9);</div><div class='del'>-		b43_phy_write(dev, 0x61, b43_phy_read(dev, 0x61)</div><div class='del'>-			      &amp; 0x0FFF);</div><div class='del'>-	} else {</div><div class='del'>-		b43_phy_write(dev, 0x0002, (b43_phy_read(dev, 0x0002) &amp; 0xFFC0)</div><div class='del'>-			      | 0x0004);</div><div class='del'>-	}</div><div class='del'>-	if (phy-&gt;type == B43_PHYTYPE_B)</div><div class='del'>-		B43_WARN_ON(1);</div><div class='del'>-	else if (phy-&gt;type == B43_PHYTYPE_G)</div><div class='del'>-		b43_write16(dev, 0x03E6, 0x0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void b43_calc_loopback_gain(struct b43_wldev *dev)</div><div class='del'>-{</div><div class='del'>-	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='del'>-	u16 backup_phy[16] = { 0 };</div><div class='del'>-	u16 backup_radio[3];</div><div class='del'>-	u16 backup_bband;</div><div class='del'>-	u16 i, j, loop_i_max;</div><div class='del'>-	u16 trsw_rx;</div><div class='del'>-	u16 loop1_outer_done, loop1_inner_done;</div><div class='del'>-</div><div class='del'>-	backup_phy[0] = b43_phy_read(dev, B43_PHY_CRS0);</div><div class='del'>-	backup_phy[1] = b43_phy_read(dev, B43_PHY_CCKBBANDCFG);</div><div class='del'>-	backup_phy[2] = b43_phy_read(dev, B43_PHY_RFOVER);</div><div class='del'>-	backup_phy[3] = b43_phy_read(dev, B43_PHY_RFOVERVAL);</div><div class='del'>-	if (phy-&gt;rev != 1) {	/* Not in specs, but needed to prevent PPC machine check */</div><div class='del'>-		backup_phy[4] = b43_phy_read(dev, B43_PHY_ANALOGOVER);</div><div class='del'>-		backup_phy[5] = b43_phy_read(dev, B43_PHY_ANALOGOVERVAL);</div><div class='del'>-	}</div><div class='del'>-	backup_phy[6] = b43_phy_read(dev, B43_PHY_CCK(0x5A));</div><div class='del'>-	backup_phy[7] = b43_phy_read(dev, B43_PHY_CCK(0x59));</div><div class='del'>-	backup_phy[8] = b43_phy_read(dev, B43_PHY_CCK(0x58));</div><div class='del'>-	backup_phy[9] = b43_phy_read(dev, B43_PHY_CCK(0x0A));</div><div class='del'>-	backup_phy[10] = b43_phy_read(dev, B43_PHY_CCK(0x03));</div><div class='del'>-	backup_phy[11] = b43_phy_read(dev, B43_PHY_LO_MASK);</div><div class='del'>-	backup_phy[12] = b43_phy_read(dev, B43_PHY_LO_CTL);</div><div class='del'>-	backup_phy[13] = b43_phy_read(dev, B43_PHY_CCK(0x2B));</div><div class='del'>-	backup_phy[14] = b43_phy_read(dev, B43_PHY_PGACTL);</div><div class='del'>-	backup_phy[15] = b43_phy_read(dev, B43_PHY_LO_LEAKAGE);</div><div class='del'>-	backup_bband = phy-&gt;bbatt.att;</div><div class='del'>-	backup_radio[0] = b43_radio_read16(dev, 0x52);</div><div class='del'>-	backup_radio[1] = b43_radio_read16(dev, 0x43);</div><div class='del'>-	backup_radio[2] = b43_radio_read16(dev, 0x7A);</div><div class='del'>-</div><div class='del'>-	b43_phy_write(dev, B43_PHY_CRS0,</div><div class='del'>-		      b43_phy_read(dev, B43_PHY_CRS0) &amp; 0x3FFF);</div><div class='del'>-	b43_phy_write(dev, B43_PHY_CCKBBANDCFG,</div><div class='del'>-		      b43_phy_read(dev, B43_PHY_CCKBBANDCFG) | 0x8000);</div><div class='del'>-	b43_phy_write(dev, B43_PHY_RFOVER,</div><div class='del'>-		      b43_phy_read(dev, B43_PHY_RFOVER) | 0x0002);</div><div class='del'>-	b43_phy_write(dev, B43_PHY_RFOVERVAL,</div><div class='del'>-		      b43_phy_read(dev, B43_PHY_RFOVERVAL) &amp; 0xFFFD);</div><div class='del'>-	b43_phy_write(dev, B43_PHY_RFOVER,</div><div class='del'>-		      b43_phy_read(dev, B43_PHY_RFOVER) | 0x0001);</div><div class='del'>-	b43_phy_write(dev, B43_PHY_RFOVERVAL,</div><div class='del'>-		      b43_phy_read(dev, B43_PHY_RFOVERVAL) &amp; 0xFFFE);</div><div class='del'>-	if (phy-&gt;rev != 1) {	/* Not in specs, but needed to prevent PPC machine check */</div><div class='del'>-		b43_phy_write(dev, B43_PHY_ANALOGOVER,</div><div class='del'>-			      b43_phy_read(dev, B43_PHY_ANALOGOVER) | 0x0001);</div><div class='del'>-		b43_phy_write(dev, B43_PHY_ANALOGOVERVAL,</div><div class='del'>-			      b43_phy_read(dev,</div><div class='del'>-					   B43_PHY_ANALOGOVERVAL) &amp; 0xFFFE);</div><div class='del'>-		b43_phy_write(dev, B43_PHY_ANALOGOVER,</div><div class='del'>-			      b43_phy_read(dev, B43_PHY_ANALOGOVER) | 0x0002);</div><div class='del'>-		b43_phy_write(dev, B43_PHY_ANALOGOVERVAL,</div><div class='del'>-			      b43_phy_read(dev,</div><div class='del'>-					   B43_PHY_ANALOGOVERVAL) &amp; 0xFFFD);</div><div class='del'>-	}</div><div class='del'>-	b43_phy_write(dev, B43_PHY_RFOVER,</div><div class='del'>-		      b43_phy_read(dev, B43_PHY_RFOVER) | 0x000C);</div><div class='del'>-	b43_phy_write(dev, B43_PHY_RFOVERVAL,</div><div class='del'>-		      b43_phy_read(dev, B43_PHY_RFOVERVAL) | 0x000C);</div><div class='del'>-	b43_phy_write(dev, B43_PHY_RFOVER,</div><div class='del'>-		      b43_phy_read(dev, B43_PHY_RFOVER) | 0x0030);</div><div class='del'>-	b43_phy_write(dev, B43_PHY_RFOVERVAL,</div><div class='del'>-		      (b43_phy_read(dev, B43_PHY_RFOVERVAL)</div><div class='del'>-		       &amp; 0xFFCF) | 0x10);</div><div class='del'>-</div><div class='del'>-	b43_phy_write(dev, B43_PHY_CCK(0x5A), 0x0780);</div><div class='del'>-	b43_phy_write(dev, B43_PHY_CCK(0x59), 0xC810);</div><div class='del'>-	b43_phy_write(dev, B43_PHY_CCK(0x58), 0x000D);</div><div class='del'>-</div><div class='del'>-	b43_phy_write(dev, B43_PHY_CCK(0x0A),</div><div class='del'>-		      b43_phy_read(dev, B43_PHY_CCK(0x0A)) | 0x2000);</div><div class='del'>-	if (phy-&gt;rev != 1) {	/* Not in specs, but needed to prevent PPC machine check */</div><div class='del'>-		b43_phy_write(dev, B43_PHY_ANALOGOVER,</div><div class='del'>-			      b43_phy_read(dev, B43_PHY_ANALOGOVER) | 0x0004);</div><div class='del'>-		b43_phy_write(dev, B43_PHY_ANALOGOVERVAL,</div><div class='del'>-			      b43_phy_read(dev,</div><div class='del'>-					   B43_PHY_ANALOGOVERVAL) &amp; 0xFFFB);</div><div class='del'>-	}</div><div class='del'>-	b43_phy_write(dev, B43_PHY_CCK(0x03),</div><div class='del'>-		      (b43_phy_read(dev, B43_PHY_CCK(0x03))</div><div class='del'>-		       &amp; 0xFF9F) | 0x40);</div><div class='del'>-</div><div class='del'>-	if (phy-&gt;radio_rev == 8) {</div><div class='del'>-		b43_radio_write16(dev, 0x43, 0x000F);</div><div class='del'>-	} else {</div><div class='del'>-		b43_radio_write16(dev, 0x52, 0);</div><div class='del'>-		b43_radio_write16(dev, 0x43, (b43_radio_read16(dev, 0x43)</div><div class='del'>-					      &amp; 0xFFF0) | 0x9);</div><div class='del'>-	}</div><div class='del'>-	b43_phy_set_baseband_attenuation(dev, 11);</div><div class='del'>-</div><div class='del'>-	if (phy-&gt;rev &gt;= 3)</div><div class='del'>-		b43_phy_write(dev, B43_PHY_LO_MASK, 0xC020);</div><div class='del'>-	else</div><div class='del'>-		b43_phy_write(dev, B43_PHY_LO_MASK, 0x8020);</div><div class='del'>-	b43_phy_write(dev, B43_PHY_LO_CTL, 0);</div><div class='del'>-</div><div class='del'>-	b43_phy_write(dev, B43_PHY_CCK(0x2B),</div><div class='del'>-		      (b43_phy_read(dev, B43_PHY_CCK(0x2B))</div><div class='del'>-		       &amp; 0xFFC0) | 0x01);</div><div class='del'>-	b43_phy_write(dev, B43_PHY_CCK(0x2B),</div><div class='del'>-		      (b43_phy_read(dev, B43_PHY_CCK(0x2B))</div><div class='del'>-		       &amp; 0xC0FF) | 0x800);</div><div class='del'>-</div><div class='del'>-	b43_phy_write(dev, B43_PHY_RFOVER,</div><div class='del'>-		      b43_phy_read(dev, B43_PHY_RFOVER) | 0x0100);</div><div class='del'>-	b43_phy_write(dev, B43_PHY_RFOVERVAL,</div><div class='del'>-		      b43_phy_read(dev, B43_PHY_RFOVERVAL) &amp; 0xCFFF);</div><div class='del'>-</div><div class='del'>-	if (dev-&gt;dev-&gt;bus-&gt;sprom.boardflags_lo &amp; B43_BFL_EXTLNA) {</div><div class='del'>-		if (phy-&gt;rev &gt;= 7) {</div><div class='del'>-			b43_phy_write(dev, B43_PHY_RFOVER,</div><div class='del'>-				      b43_phy_read(dev, B43_PHY_RFOVER)</div><div class='del'>-				      | 0x0800);</div><div class='del'>-			b43_phy_write(dev, B43_PHY_RFOVERVAL,</div><div class='del'>-				      b43_phy_read(dev, B43_PHY_RFOVERVAL)</div><div class='del'>-				      | 0x8000);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	b43_radio_write16(dev, 0x7A, b43_radio_read16(dev, 0x7A)</div><div class='del'>-			  &amp; 0x00F7);</div><div class='del'>-</div><div class='del'>-	j = 0;</div><div class='del'>-	loop_i_max = (phy-&gt;radio_rev == 8) ? 15 : 9;</div><div class='del'>-	for (i = 0; i &lt; loop_i_max; i++) {</div><div class='del'>-		for (j = 0; j &lt; 16; j++) {</div><div class='del'>-			b43_radio_write16(dev, 0x43, i);</div><div class='del'>-			b43_phy_write(dev, B43_PHY_RFOVERVAL,</div><div class='del'>-				      (b43_phy_read(dev, B43_PHY_RFOVERVAL)</div><div class='del'>-				       &amp; 0xF0FF) | (j &lt;&lt; 8));</div><div class='del'>-			b43_phy_write(dev, B43_PHY_PGACTL,</div><div class='del'>-				      (b43_phy_read(dev, B43_PHY_PGACTL)</div><div class='del'>-				       &amp; 0x0FFF) | 0xA000);</div><div class='del'>-			b43_phy_write(dev, B43_PHY_PGACTL,</div><div class='del'>-				      b43_phy_read(dev, B43_PHY_PGACTL)</div><div class='del'>-				      | 0xF000);</div><div class='del'>-			udelay(20);</div><div class='del'>-			if (b43_phy_read(dev, B43_PHY_LO_LEAKAGE) &gt;= 0xDFC)</div><div class='del'>-				goto exit_loop1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-      exit_loop1:</div><div class='del'>-	loop1_outer_done = i;</div><div class='del'>-	loop1_inner_done = j;</div><div class='del'>-	if (j &gt;= 8) {</div><div class='del'>-		b43_phy_write(dev, B43_PHY_RFOVERVAL,</div><div class='del'>-			      b43_phy_read(dev, B43_PHY_RFOVERVAL)</div><div class='del'>-			      | 0x30);</div><div class='del'>-		trsw_rx = 0x1B;</div><div class='del'>-		for (j = j - 8; j &lt; 16; j++) {</div><div class='del'>-			b43_phy_write(dev, B43_PHY_RFOVERVAL,</div><div class='del'>-				      (b43_phy_read(dev, B43_PHY_RFOVERVAL)</div><div class='del'>-				       &amp; 0xF0FF) | (j &lt;&lt; 8));</div><div class='del'>-			b43_phy_write(dev, B43_PHY_PGACTL,</div><div class='del'>-				      (b43_phy_read(dev, B43_PHY_PGACTL)</div><div class='del'>-				       &amp; 0x0FFF) | 0xA000);</div><div class='del'>-			b43_phy_write(dev, B43_PHY_PGACTL,</div><div class='del'>-				      b43_phy_read(dev, B43_PHY_PGACTL)</div><div class='del'>-				      | 0xF000);</div><div class='del'>-			udelay(20);</div><div class='del'>-			trsw_rx -= 3;</div><div class='del'>-			if (b43_phy_read(dev, B43_PHY_LO_LEAKAGE) &gt;= 0xDFC)</div><div class='del'>-				goto exit_loop2;</div><div class='del'>-		}</div><div class='del'>-	} else</div><div class='del'>-		trsw_rx = 0x18;</div><div class='del'>-      exit_loop2:</div><div class='del'>-</div><div class='del'>-	if (phy-&gt;rev != 1) {	/* Not in specs, but needed to prevent PPC machine check */</div><div class='del'>-		b43_phy_write(dev, B43_PHY_ANALOGOVER, backup_phy[4]);</div><div class='del'>-		b43_phy_write(dev, B43_PHY_ANALOGOVERVAL, backup_phy[5]);</div><div class='del'>-	}</div><div class='del'>-	b43_phy_write(dev, B43_PHY_CCK(0x5A), backup_phy[6]);</div><div class='del'>-	b43_phy_write(dev, B43_PHY_CCK(0x59), backup_phy[7]);</div><div class='del'>-	b43_phy_write(dev, B43_PHY_CCK(0x58), backup_phy[8]);</div><div class='del'>-	b43_phy_write(dev, B43_PHY_CCK(0x0A), backup_phy[9]);</div><div class='del'>-	b43_phy_write(dev, B43_PHY_CCK(0x03), backup_phy[10]);</div><div class='del'>-	b43_phy_write(dev, B43_PHY_LO_MASK, backup_phy[11]);</div><div class='del'>-	b43_phy_write(dev, B43_PHY_LO_CTL, backup_phy[12]);</div><div class='del'>-	b43_phy_write(dev, B43_PHY_CCK(0x2B), backup_phy[13]);</div><div class='del'>-	b43_phy_write(dev, B43_PHY_PGACTL, backup_phy[14]);</div><div class='del'>-</div><div class='del'>-	b43_phy_set_baseband_attenuation(dev, backup_bband);</div><div class='del'>-</div><div class='del'>-	b43_radio_write16(dev, 0x52, backup_radio[0]);</div><div class='del'>-	b43_radio_write16(dev, 0x43, backup_radio[1]);</div><div class='del'>-	b43_radio_write16(dev, 0x7A, backup_radio[2]);</div><div class='del'>-</div><div class='del'>-	b43_phy_write(dev, B43_PHY_RFOVER, backup_phy[2] | 0x0003);</div><div class='del'>-	udelay(10);</div><div class='del'>-	b43_phy_write(dev, B43_PHY_RFOVER, backup_phy[2]);</div><div class='del'>-	b43_phy_write(dev, B43_PHY_RFOVERVAL, backup_phy[3]);</div><div class='del'>-	b43_phy_write(dev, B43_PHY_CRS0, backup_phy[0]);</div><div class='del'>-	b43_phy_write(dev, B43_PHY_CCKBBANDCFG, backup_phy[1]);</div><div class='del'>-</div><div class='del'>-	phy-&gt;max_lb_gain =</div><div class='del'>-	    ((loop1_inner_done * 6) - (loop1_outer_done * 4)) - 11;</div><div class='del'>-	phy-&gt;trsw_rx_gain = trsw_rx * 2;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void b43_phy_initg(struct b43_wldev *dev)</div><div class='del'>-{</div><div class='del'>-	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='del'>-	u16 tmp;</div><div class='del'>-</div><div class='del'>-	if (phy-&gt;rev == 1)</div><div class='del'>-		b43_phy_initb5(dev);</div><div class='del'>-	else</div><div class='del'>-		b43_phy_initb6(dev);</div><div class='del'>-</div><div class='del'>-	if (phy-&gt;rev &gt;= 2 || phy-&gt;gmode)</div><div class='del'>-		b43_phy_inita(dev);</div><div class='del'>-</div><div class='del'>-	if (phy-&gt;rev &gt;= 2) {</div><div class='del'>-		b43_phy_write(dev, B43_PHY_ANALOGOVER, 0);</div><div class='del'>-		b43_phy_write(dev, B43_PHY_ANALOGOVERVAL, 0);</div><div class='del'>-	}</div><div class='del'>-	if (phy-&gt;rev == 2) {</div><div class='del'>-		b43_phy_write(dev, B43_PHY_RFOVER, 0);</div><div class='del'>-		b43_phy_write(dev, B43_PHY_PGACTL, 0xC0);</div><div class='del'>-	}</div><div class='del'>-	if (phy-&gt;rev &gt; 5) {</div><div class='del'>-		b43_phy_write(dev, B43_PHY_RFOVER, 0x400);</div><div class='del'>-		b43_phy_write(dev, B43_PHY_PGACTL, 0xC0);</div><div class='del'>-	}</div><div class='del'>-	if (phy-&gt;gmode || phy-&gt;rev &gt;= 2) {</div><div class='del'>-		tmp = b43_phy_read(dev, B43_PHY_VERSION_OFDM);</div><div class='del'>-		tmp &amp;= B43_PHYVER_VERSION;</div><div class='del'>-		if (tmp == 3 || tmp == 5) {</div><div class='del'>-			b43_phy_write(dev, B43_PHY_OFDM(0xC2), 0x1816);</div><div class='del'>-			b43_phy_write(dev, B43_PHY_OFDM(0xC3), 0x8006);</div><div class='del'>-		}</div><div class='del'>-		if (tmp == 5) {</div><div class='del'>-			b43_phy_write(dev, B43_PHY_OFDM(0xCC),</div><div class='del'>-				      (b43_phy_read(dev, B43_PHY_OFDM(0xCC))</div><div class='del'>-				       &amp; 0x00FF) | 0x1F00);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if ((phy-&gt;rev &lt;= 2 &amp;&amp; phy-&gt;gmode) || phy-&gt;rev &gt;= 2)</div><div class='del'>-		b43_phy_write(dev, B43_PHY_OFDM(0x7E), 0x78);</div><div class='del'>-	if (phy-&gt;radio_rev == 8) {</div><div class='del'>-		b43_phy_write(dev, B43_PHY_EXTG(0x01),</div><div class='del'>-			      b43_phy_read(dev, B43_PHY_EXTG(0x01))</div><div class='del'>-			      | 0x80);</div><div class='del'>-		b43_phy_write(dev, B43_PHY_OFDM(0x3E),</div><div class='del'>-			      b43_phy_read(dev, B43_PHY_OFDM(0x3E))</div><div class='del'>-			      | 0x4);</div><div class='del'>-	}</div><div class='del'>-	if (has_loopback_gain(phy))</div><div class='del'>-		b43_calc_loopback_gain(dev);</div><div class='del'>-</div><div class='del'>-	if (phy-&gt;radio_rev != 8) {</div><div class='del'>-		if (phy-&gt;initval == 0xFFFF)</div><div class='del'>-			phy-&gt;initval = b43_radio_init2050(dev);</div><div class='del'>-		else</div><div class='del'>-			b43_radio_write16(dev, 0x0078, phy-&gt;initval);</div><div class='del'>-	}</div><div class='del'>-	b43_lo_g_init(dev);</div><div class='del'>-	if (has_tx_magnification(phy)) {</div><div class='del'>-		b43_radio_write16(dev, 0x52,</div><div class='del'>-				  (b43_radio_read16(dev, 0x52) &amp; 0xFF00)</div><div class='del'>-				  | phy-&gt;lo_control-&gt;tx_bias | phy-&gt;</div><div class='del'>-				  lo_control-&gt;tx_magn);</div><div class='del'>-	} else {</div><div class='del'>-		b43_radio_write16(dev, 0x52,</div><div class='del'>-				  (b43_radio_read16(dev, 0x52) &amp; 0xFFF0)</div><div class='del'>-				  | phy-&gt;lo_control-&gt;tx_bias);</div><div class='del'>-	}</div><div class='del'>-	if (phy-&gt;rev &gt;= 6) {</div><div class='del'>-		b43_phy_write(dev, B43_PHY_CCK(0x36),</div><div class='del'>-			      (b43_phy_read(dev, B43_PHY_CCK(0x36))</div><div class='del'>-			       &amp; 0x0FFF) | (phy-&gt;lo_control-&gt;</div><div class='del'>-					    tx_bias &lt;&lt; 12));</div><div class='del'>-	}</div><div class='del'>-	if (dev-&gt;dev-&gt;bus-&gt;sprom.boardflags_lo &amp; B43_BFL_PACTRL)</div><div class='del'>-		b43_phy_write(dev, B43_PHY_CCK(0x2E), 0x8075);</div><div class='del'>-	else</div><div class='del'>-		b43_phy_write(dev, B43_PHY_CCK(0x2E), 0x807F);</div><div class='del'>-	if (phy-&gt;rev &lt; 2)</div><div class='del'>-		b43_phy_write(dev, B43_PHY_CCK(0x2F), 0x101);</div><div class='del'>-	else</div><div class='del'>-		b43_phy_write(dev, B43_PHY_CCK(0x2F), 0x202);</div><div class='del'>-	if (phy-&gt;gmode || phy-&gt;rev &gt;= 2) {</div><div class='del'>-		b43_lo_g_adjust(dev);</div><div class='del'>-		b43_phy_write(dev, B43_PHY_LO_MASK, 0x8078);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!(dev-&gt;dev-&gt;bus-&gt;sprom.boardflags_lo &amp; B43_BFL_RSSI)) {</div><div class='del'>-		/* The specs state to update the NRSSI LT with</div><div class='del'>-		 * the value 0x7FFFFFFF here. I think that is some weird</div><div class='del'>-		 * compiler optimization in the original driver.</div><div class='del'>-		 * Essentially, what we do here is resetting all NRSSI LT</div><div class='del'>-		 * entries to -32 (see the clamp_val() in nrssi_hw_update())</div><div class='del'>-		 */</div><div class='del'>-		b43_nrssi_hw_update(dev, 0xFFFF);	//FIXME?</div><div class='del'>-		b43_calc_nrssi_threshold(dev);</div><div class='del'>-	} else if (phy-&gt;gmode || phy-&gt;rev &gt;= 2) {</div><div class='del'>-		if (phy-&gt;nrssi[0] == -1000) {</div><div class='del'>-			B43_WARN_ON(phy-&gt;nrssi[1] != -1000);</div><div class='del'>-			b43_calc_nrssi_slope(dev);</div><div class='del'>-		} else</div><div class='del'>-			b43_calc_nrssi_threshold(dev);</div><div class='del'>-	}</div><div class='del'>-	if (phy-&gt;radio_rev == 8)</div><div class='del'>-		b43_phy_write(dev, B43_PHY_EXTG(0x05), 0x3230);</div><div class='del'>-	b43_phy_init_pctl(dev);</div><div class='del'>-	/* FIXME: The spec says in the following if, the 0 should be replaced</div><div class='del'>-	   'if OFDM may not be used in the current locale'</div><div class='del'>-	   but OFDM is legal everywhere */</div><div class='del'>-	if ((dev-&gt;dev-&gt;bus-&gt;chip_id == 0x4306</div><div class='del'>-	     &amp;&amp; dev-&gt;dev-&gt;bus-&gt;chip_package == 2) || 0) {</div><div class='del'>-		b43_phy_write(dev, B43_PHY_CRS0, b43_phy_read(dev, B43_PHY_CRS0)</div><div class='del'>-			      &amp; 0xBFFF);</div><div class='del'>-		b43_phy_write(dev, B43_PHY_OFDM(0xC3),</div><div class='del'>-			      b43_phy_read(dev, B43_PHY_OFDM(0xC3))</div><div class='del'>-			      &amp; 0x7FFF);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Set the baseband attenuation value on chip. */</div><div class='del'>-void b43_phy_set_baseband_attenuation(struct b43_wldev *dev,</div><div class='del'>-				      u16 baseband_attenuation)</div><div class='del'>-{</div><div class='del'>-	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='del'>-</div><div class='del'>-	if (phy-&gt;analog == 0) {</div><div class='del'>-		b43_write16(dev, B43_MMIO_PHY0, (b43_read16(dev, B43_MMIO_PHY0)</div><div class='del'>-						 &amp; 0xFFF0) |</div><div class='del'>-			    baseband_attenuation);</div><div class='del'>-	} else if (phy-&gt;analog &gt; 1) {</div><div class='del'>-		b43_phy_write(dev, B43_PHY_DACCTL,</div><div class='del'>-			      (b43_phy_read(dev, B43_PHY_DACCTL)</div><div class='del'>-			       &amp; 0xFFC3) | (baseband_attenuation &lt;&lt; 2));</div><div class='del'>-	} else {</div><div class='del'>-		b43_phy_write(dev, B43_PHY_DACCTL,</div><div class='del'>-			      (b43_phy_read(dev, B43_PHY_DACCTL)</div><div class='del'>-			       &amp; 0xFF87) | (baseband_attenuation &lt;&lt; 3));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* http://bcm-specs.sipsolutions.net/EstimatePowerOut</div><div class='del'>- * This function converts a TSSI value to dBm in Q5.2</div><div class='del'>- */</div><div class='del'>-static s8 b43_phy_estimate_power_out(struct b43_wldev *dev, s8 tssi)</div><div class='del'>-{</div><div class='del'>-	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='del'>-	s8 dbm = 0;</div><div class='del'>-	s32 tmp;</div><div class='del'>-</div><div class='del'>-	tmp = (phy-&gt;tgt_idle_tssi - phy-&gt;cur_idle_tssi + tssi);</div><div class='del'>-</div><div class='del'>-	switch (phy-&gt;type) {</div><div class='del'>-	case B43_PHYTYPE_A:</div><div class='del'>-		tmp += 0x80;</div><div class='del'>-		tmp = clamp_val(tmp, 0x00, 0xFF);</div><div class='del'>-		dbm = phy-&gt;tssi2dbm[tmp];</div><div class='del'>-		//TODO: There's a FIXME on the specs</div><div class='del'>-		break;</div><div class='del'>-	case B43_PHYTYPE_B:</div><div class='del'>-	case B43_PHYTYPE_G:</div><div class='del'>-		tmp = clamp_val(tmp, 0x00, 0x3F);</div><div class='del'>-		dbm = phy-&gt;tssi2dbm[tmp];</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		B43_WARN_ON(1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return dbm;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void b43_put_attenuation_into_ranges(struct b43_wldev *dev,</div><div class='del'>-				     int *_bbatt, int *_rfatt)</div><div class='del'>-{</div><div class='del'>-	int rfatt = *_rfatt;</div><div class='del'>-	int bbatt = *_bbatt;</div><div class='del'>-	struct b43_txpower_lo_control *lo = dev-&gt;phy.lo_control;</div><div class='del'>-</div><div class='del'>-	/* Get baseband and radio attenuation values into their permitted ranges.</div><div class='del'>-	 * Radio attenuation affects power level 4 times as much as baseband. */</div><div class='del'>-</div><div class='del'>-	/* Range constants */</div><div class='del'>-	const int rf_min = lo-&gt;rfatt_list.min_val;</div><div class='del'>-	const int rf_max = lo-&gt;rfatt_list.max_val;</div><div class='del'>-	const int bb_min = lo-&gt;bbatt_list.min_val;</div><div class='del'>-	const int bb_max = lo-&gt;bbatt_list.max_val;</div><div class='del'>-</div><div class='del'>-	while (1) {</div><div class='del'>-		if (rfatt &gt; rf_max &amp;&amp; bbatt &gt; bb_max - 4)</div><div class='del'>-			break;	/* Can not get it into ranges */</div><div class='del'>-		if (rfatt &lt; rf_min &amp;&amp; bbatt &lt; bb_min + 4)</div><div class='del'>-			break;	/* Can not get it into ranges */</div><div class='del'>-		if (bbatt &gt; bb_max &amp;&amp; rfatt &gt; rf_max - 1)</div><div class='del'>-			break;	/* Can not get it into ranges */</div><div class='del'>-		if (bbatt &lt; bb_min &amp;&amp; rfatt &lt; rf_min + 1)</div><div class='del'>-			break;	/* Can not get it into ranges */</div><div class='del'>-</div><div class='del'>-		if (bbatt &gt; bb_max) {</div><div class='del'>-			bbatt -= 4;</div><div class='del'>-			rfatt += 1;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		if (bbatt &lt; bb_min) {</div><div class='del'>-			bbatt += 4;</div><div class='del'>-			rfatt -= 1;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		if (rfatt &gt; rf_max) {</div><div class='del'>-			rfatt -= 1;</div><div class='del'>-			bbatt += 4;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		if (rfatt &lt; rf_min) {</div><div class='del'>-			rfatt += 1;</div><div class='del'>-			bbatt -= 4;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*_rfatt = clamp_val(rfatt, rf_min, rf_max);</div><div class='del'>-	*_bbatt = clamp_val(bbatt, bb_min, bb_max);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* http://bcm-specs.sipsolutions.net/RecalculateTransmissionPower */</div><div class='del'>-void b43_phy_xmitpower(struct b43_wldev *dev)</div><div class='del'>-{</div><div class='del'>-	struct ssb_bus *bus = dev-&gt;dev-&gt;bus;</div><div class='del'>-	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='del'>-</div><div class='del'>-	if (phy-&gt;cur_idle_tssi == 0)</div><div class='del'>-		return;</div><div class='del'>-	if ((bus-&gt;boardinfo.vendor == SSB_BOARDVENDOR_BCM) &amp;&amp;</div><div class='del'>-	    (bus-&gt;boardinfo.type == SSB_BOARD_BU4306))</div><div class='del'>-		return;</div><div class='del'>-#ifdef CONFIG_B43_DEBUG</div><div class='del'>-	if (phy-&gt;manual_txpower_control)</div><div class='del'>-		return;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	switch (phy-&gt;type) {</div><div class='del'>-	case B43_PHYTYPE_A:{</div><div class='del'>-</div><div class='del'>-			//TODO: Nothing for A PHYs yet :-/</div><div class='del'>-</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	case B43_PHYTYPE_B:</div><div class='del'>-	case B43_PHYTYPE_G:{</div><div class='del'>-			u16 tmp;</div><div class='del'>-			s8 v0, v1, v2, v3;</div><div class='del'>-			s8 average;</div><div class='del'>-			int max_pwr;</div><div class='del'>-			int desired_pwr, estimated_pwr, pwr_adjust;</div><div class='del'>-			int rfatt_delta, bbatt_delta;</div><div class='del'>-			int rfatt, bbatt;</div><div class='del'>-			u8 tx_control;</div><div class='del'>-</div><div class='del'>-			tmp = b43_shm_read16(dev, B43_SHM_SHARED, 0x0058);</div><div class='del'>-			v0 = (s8) (tmp &amp; 0x00FF);</div><div class='del'>-			v1 = (s8) ((tmp &amp; 0xFF00) &gt;&gt; 8);</div><div class='del'>-			tmp = b43_shm_read16(dev, B43_SHM_SHARED, 0x005A);</div><div class='del'>-			v2 = (s8) (tmp &amp; 0x00FF);</div><div class='del'>-			v3 = (s8) ((tmp &amp; 0xFF00) &gt;&gt; 8);</div><div class='del'>-			tmp = 0;</div><div class='del'>-</div><div class='del'>-			if (v0 == 0x7F || v1 == 0x7F || v2 == 0x7F</div><div class='del'>-			    || v3 == 0x7F) {</div><div class='del'>-				tmp =</div><div class='del'>-				    b43_shm_read16(dev, B43_SHM_SHARED, 0x0070);</div><div class='del'>-				v0 = (s8) (tmp &amp; 0x00FF);</div><div class='del'>-				v1 = (s8) ((tmp &amp; 0xFF00) &gt;&gt; 8);</div><div class='del'>-				tmp =</div><div class='del'>-				    b43_shm_read16(dev, B43_SHM_SHARED, 0x0072);</div><div class='del'>-				v2 = (s8) (tmp &amp; 0x00FF);</div><div class='del'>-				v3 = (s8) ((tmp &amp; 0xFF00) &gt;&gt; 8);</div><div class='del'>-				if (v0 == 0x7F || v1 == 0x7F || v2 == 0x7F</div><div class='del'>-				    || v3 == 0x7F)</div><div class='del'>-					return;</div><div class='del'>-				v0 = (v0 + 0x20) &amp; 0x3F;</div><div class='del'>-				v1 = (v1 + 0x20) &amp; 0x3F;</div><div class='del'>-				v2 = (v2 + 0x20) &amp; 0x3F;</div><div class='del'>-				v3 = (v3 + 0x20) &amp; 0x3F;</div><div class='del'>-				tmp = 1;</div><div class='del'>-			}</div><div class='del'>-			b43_shm_clear_tssi(dev);</div><div class='del'>-</div><div class='del'>-			average = (v0 + v1 + v2 + v3 + 2) / 4;</div><div class='del'>-</div><div class='del'>-			if (tmp</div><div class='del'>-			    &amp;&amp; (b43_shm_read16(dev, B43_SHM_SHARED, 0x005E) &amp;</div><div class='del'>-				0x8))</div><div class='del'>-				average -= 13;</div><div class='del'>-</div><div class='del'>-			estimated_pwr =</div><div class='del'>-			    b43_phy_estimate_power_out(dev, average);</div><div class='del'>-</div><div class='del'>-			max_pwr = dev-&gt;dev-&gt;bus-&gt;sprom.maxpwr_bg;</div><div class='del'>-			if ((dev-&gt;dev-&gt;bus-&gt;sprom.boardflags_lo</div><div class='del'>-			    &amp; B43_BFL_PACTRL) &amp;&amp; (phy-&gt;type == B43_PHYTYPE_G))</div><div class='del'>-				max_pwr -= 0x3;</div><div class='del'>-			if (unlikely(max_pwr &lt;= 0)) {</div><div class='del'>-				b43warn(dev-&gt;wl,</div><div class='del'>-					"Invalid max-TX-power value in SPROM.\n");</div><div class='del'>-				max_pwr = 60;	/* fake it */</div><div class='del'>-				dev-&gt;dev-&gt;bus-&gt;sprom.maxpwr_bg = max_pwr;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/*TODO:</div><div class='del'>-			   max_pwr = min(REG - dev-&gt;dev-&gt;bus-&gt;sprom.antennagain_bgphy - 0x6, max_pwr)</div><div class='del'>-			   where REG is the max power as per the regulatory domain</div><div class='del'>-			 */</div><div class='del'>-</div><div class='del'>-			/* Get desired power (in Q5.2) */</div><div class='del'>-			desired_pwr = INT_TO_Q52(phy-&gt;power_level);</div><div class='del'>-			/* And limit it. max_pwr already is Q5.2 */</div><div class='del'>-			desired_pwr = clamp_val(desired_pwr, 0, max_pwr);</div><div class='del'>-			if (b43_debug(dev, B43_DBG_XMITPOWER)) {</div><div class='del'>-				b43dbg(dev-&gt;wl,</div><div class='del'>-				       "Current TX power output: " Q52_FMT</div><div class='del'>-				       " dBm, " "Desired TX power output: "</div><div class='del'>-				       Q52_FMT " dBm\n", Q52_ARG(estimated_pwr),</div><div class='del'>-				       Q52_ARG(desired_pwr));</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* Calculate the adjustment delta. */</div><div class='del'>-			pwr_adjust = desired_pwr - estimated_pwr;</div><div class='del'>-</div><div class='del'>-			/* RF attenuation delta. */</div><div class='del'>-			rfatt_delta = ((pwr_adjust + 7) / 8);</div><div class='del'>-			/* Lower attenuation =&gt; Bigger power output. Negate it. */</div><div class='del'>-			rfatt_delta = -rfatt_delta;</div><div class='del'>-</div><div class='del'>-			/* Baseband attenuation delta. */</div><div class='del'>-			bbatt_delta = pwr_adjust / 2;</div><div class='del'>-			/* Lower attenuation =&gt; Bigger power output. Negate it. */</div><div class='del'>-			bbatt_delta = -bbatt_delta;</div><div class='del'>-			/* RF att affects power level 4 times as much as</div><div class='del'>-			 * Baseband attennuation. Subtract it. */</div><div class='del'>-			bbatt_delta -= 4 * rfatt_delta;</div><div class='del'>-</div><div class='del'>-			/* So do we finally need to adjust something? */</div><div class='del'>-			if ((rfatt_delta == 0) &amp;&amp; (bbatt_delta == 0))</div><div class='del'>-				return;</div><div class='del'>-</div><div class='del'>-			/* Calculate the new attenuation values. */</div><div class='del'>-			bbatt = phy-&gt;bbatt.att;</div><div class='del'>-			bbatt += bbatt_delta;</div><div class='del'>-			rfatt = phy-&gt;rfatt.att;</div><div class='del'>-			rfatt += rfatt_delta;</div><div class='del'>-</div><div class='del'>-			b43_put_attenuation_into_ranges(dev, &amp;bbatt, &amp;rfatt);</div><div class='del'>-			tx_control = phy-&gt;tx_control;</div><div class='del'>-			if ((phy-&gt;radio_ver == 0x2050) &amp;&amp; (phy-&gt;radio_rev == 2)) {</div><div class='del'>-				if (rfatt &lt;= 1) {</div><div class='del'>-					if (tx_control == 0) {</div><div class='del'>-						tx_control =</div><div class='del'>-						    B43_TXCTL_PA2DB |</div><div class='del'>-						    B43_TXCTL_TXMIX;</div><div class='del'>-						rfatt += 2;</div><div class='del'>-						bbatt += 2;</div><div class='del'>-					} else if (dev-&gt;dev-&gt;bus-&gt;sprom.</div><div class='del'>-						   boardflags_lo &amp;</div><div class='del'>-						   B43_BFL_PACTRL) {</div><div class='del'>-						bbatt += 4 * (rfatt - 2);</div><div class='del'>-						rfatt = 2;</div><div class='del'>-					}</div><div class='del'>-				} else if (rfatt &gt; 4 &amp;&amp; tx_control) {</div><div class='del'>-					tx_control = 0;</div><div class='del'>-					if (bbatt &lt; 3) {</div><div class='del'>-						rfatt -= 3;</div><div class='del'>-						bbatt += 2;</div><div class='del'>-					} else {</div><div class='del'>-						rfatt -= 2;</div><div class='del'>-						bbatt -= 2;</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			/* Save the control values */</div><div class='del'>-			phy-&gt;tx_control = tx_control;</div><div class='del'>-			b43_put_attenuation_into_ranges(dev, &amp;bbatt, &amp;rfatt);</div><div class='del'>-			phy-&gt;rfatt.att = rfatt;</div><div class='del'>-			phy-&gt;bbatt.att = bbatt;</div><div class='del'>-</div><div class='del'>-			/* Adjust the hardware */</div><div class='del'>-			b43_phy_lock(dev);</div><div class='del'>-			b43_radio_lock(dev);</div><div class='del'>-			b43_set_txpower_g(dev, &amp;phy-&gt;bbatt, &amp;phy-&gt;rfatt,</div><div class='del'>-					  phy-&gt;tx_control);</div><div class='del'>-			b43_radio_unlock(dev);</div><div class='del'>-			b43_phy_unlock(dev);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	case B43_PHYTYPE_N:</div><div class='del'>-		b43_nphy_xmitpower(dev);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		B43_WARN_ON(1);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline s32 b43_tssi2dbm_ad(s32 num, s32 den)</div><div class='del'>-{</div><div class='del'>-	if (num &lt; 0)</div><div class='del'>-		return num / den;</div><div class='del'>-	else</div><div class='del'>-		return (num + den / 2) / den;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline</div><div class='del'>-    s8 b43_tssi2dbm_entry(s8 entry[], u8 index, s16 pab0, s16 pab1, s16 pab2)</div><div class='del'>-{</div><div class='del'>-	s32 m1, m2, f = 256, q, delta;</div><div class='del'>-	s8 i = 0;</div><div class='del'>-</div><div class='del'>-	m1 = b43_tssi2dbm_ad(16 * pab0 + index * pab1, 32);</div><div class='del'>-	m2 = max(b43_tssi2dbm_ad(32768 + index * pab2, 256), 1);</div><div class='del'>-	do {</div><div class='del'>-		if (i &gt; 15)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		q = b43_tssi2dbm_ad(f * 4096 -</div><div class='del'>-				    b43_tssi2dbm_ad(m2 * f, 16) * f, 2048);</div><div class='del'>-		delta = abs(q - f);</div><div class='del'>-		f = q;</div><div class='del'>-		i++;</div><div class='del'>-	} while (delta &gt;= 2);</div><div class='del'>-	entry[index] = clamp_val(b43_tssi2dbm_ad(m1 * f, 8192), -127, 128);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* http://bcm-specs.sipsolutions.net/TSSI_to_DBM_Table */</div><div class='del'>-int b43_phy_init_tssi2dbm_table(struct b43_wldev *dev)</div><div class='del'>-{</div><div class='del'>-	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='del'>-	s16 pab0, pab1, pab2;</div><div class='del'>-	u8 idx;</div><div class='del'>-	s8 *dyn_tssi2dbm;</div><div class='del'>-</div><div class='del'>-	if (phy-&gt;type == B43_PHYTYPE_A) {</div><div class='del'>-		pab0 = (s16) (dev-&gt;dev-&gt;bus-&gt;sprom.pa1b0);</div><div class='del'>-		pab1 = (s16) (dev-&gt;dev-&gt;bus-&gt;sprom.pa1b1);</div><div class='del'>-		pab2 = (s16) (dev-&gt;dev-&gt;bus-&gt;sprom.pa1b2);</div><div class='del'>-	} else {</div><div class='del'>-		pab0 = (s16) (dev-&gt;dev-&gt;bus-&gt;sprom.pa0b0);</div><div class='del'>-		pab1 = (s16) (dev-&gt;dev-&gt;bus-&gt;sprom.pa0b1);</div><div class='del'>-		pab2 = (s16) (dev-&gt;dev-&gt;bus-&gt;sprom.pa0b2);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((dev-&gt;dev-&gt;bus-&gt;chip_id == 0x4301) &amp;&amp; (phy-&gt;radio_ver != 0x2050)) {</div><div class='del'>-		phy-&gt;tgt_idle_tssi = 0x34;</div><div class='del'>-		phy-&gt;tssi2dbm = b43_tssi2dbm_b_table;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (pab0 != 0 &amp;&amp; pab1 != 0 &amp;&amp; pab2 != 0 &amp;&amp;</div><div class='del'>-	    pab0 != -1 &amp;&amp; pab1 != -1 &amp;&amp; pab2 != -1) {</div><div class='del'>-		/* The pabX values are set in SPROM. Use them. */</div><div class='del'>-		if (phy-&gt;type == B43_PHYTYPE_A) {</div><div class='del'>-			if ((s8) dev-&gt;dev-&gt;bus-&gt;sprom.itssi_a != 0 &amp;&amp;</div><div class='del'>-			    (s8) dev-&gt;dev-&gt;bus-&gt;sprom.itssi_a != -1)</div><div class='del'>-				phy-&gt;tgt_idle_tssi =</div><div class='del'>-				    (s8) (dev-&gt;dev-&gt;bus-&gt;sprom.itssi_a);</div><div class='del'>-			else</div><div class='del'>-				phy-&gt;tgt_idle_tssi = 62;</div><div class='del'>-		} else {</div><div class='del'>-			if ((s8) dev-&gt;dev-&gt;bus-&gt;sprom.itssi_bg != 0 &amp;&amp;</div><div class='del'>-			    (s8) dev-&gt;dev-&gt;bus-&gt;sprom.itssi_bg != -1)</div><div class='del'>-				phy-&gt;tgt_idle_tssi =</div><div class='del'>-				    (s8) (dev-&gt;dev-&gt;bus-&gt;sprom.itssi_bg);</div><div class='del'>-			else</div><div class='del'>-				phy-&gt;tgt_idle_tssi = 62;</div><div class='del'>-		}</div><div class='del'>-		dyn_tssi2dbm = kmalloc(64, GFP_KERNEL);</div><div class='del'>-		if (dyn_tssi2dbm == NULL) {</div><div class='del'>-			b43err(dev-&gt;wl, "Could not allocate memory "</div><div class='del'>-			       "for tssi2dbm table\n");</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		}</div><div class='del'>-		for (idx = 0; idx &lt; 64; idx++)</div><div class='del'>-			if (b43_tssi2dbm_entry</div><div class='del'>-			    (dyn_tssi2dbm, idx, pab0, pab1, pab2)) {</div><div class='del'>-				phy-&gt;tssi2dbm = NULL;</div><div class='del'>-				b43err(dev-&gt;wl, "Could not generate "</div><div class='del'>-				       "tssi2dBm table\n");</div><div class='del'>-				kfree(dyn_tssi2dbm);</div><div class='del'>-				return -ENODEV;</div><div class='del'>-			}</div><div class='del'>-		phy-&gt;tssi2dbm = dyn_tssi2dbm;</div><div class='del'>-		phy-&gt;dyn_tssi_tbl = 1;</div><div class='del'>-	} else {</div><div class='del'>-		/* pabX values not set in SPROM. */</div><div class='del'>-		switch (phy-&gt;type) {</div><div class='del'>-		case B43_PHYTYPE_A:</div><div class='del'>-			/* APHY needs a generated table. */</div><div class='del'>-			phy-&gt;tssi2dbm = NULL;</div><div class='del'>-			b43err(dev-&gt;wl, "Could not generate tssi2dBm "</div><div class='del'>-			       "table (wrong SPROM info)!\n");</div><div class='del'>-			return -ENODEV;</div><div class='del'>-		case B43_PHYTYPE_B:</div><div class='del'>-			phy-&gt;tgt_idle_tssi = 0x34;</div><div class='del'>-			phy-&gt;tssi2dbm = b43_tssi2dbm_b_table;</div><div class='del'>-			break;</div><div class='del'>-		case B43_PHYTYPE_G:</div><div class='del'>-			phy-&gt;tgt_idle_tssi = 0x34;</div><div class='del'>-			phy-&gt;tssi2dbm = b43_tssi2dbm_g_table;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int b43_phy_init(struct b43_wldev *dev)</div><div class='del'>-{</div><div class='del'>-	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='del'>-	bool unsupported = 0;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	switch (phy-&gt;type) {</div><div class='del'>-	case B43_PHYTYPE_A:</div><div class='del'>-		if (phy-&gt;rev == 2 || phy-&gt;rev == 3)</div><div class='del'>-			b43_phy_inita(dev);</div><div class='del'>-		else</div><div class='del'>-			unsupported = 1;</div><div class='del'>-		break;</div><div class='del'>-	case B43_PHYTYPE_G:</div><div class='del'>-		b43_phy_initg(dev);</div><div class='del'>-		break;</div><div class='del'>-	case B43_PHYTYPE_N:</div><div class='del'>-		err = b43_phy_initn(dev);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		unsupported = 1;</div><div class='del'>-	}</div><div class='del'>-	if (unsupported)</div><div class='del'>-		b43err(dev-&gt;wl, "Unknown PHYTYPE found\n");</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void b43_set_rx_antenna(struct b43_wldev *dev, int antenna)</div><div class='del'>-{</div><div class='del'>-	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='del'>-	u64 hf;</div><div class='del'>-	u16 tmp;</div><div class='del'>-	int autodiv = 0;</div><div class='del'>-</div><div class='del'>-	if (antenna == B43_ANTENNA_AUTO0 || antenna == B43_ANTENNA_AUTO1)</div><div class='del'>-		autodiv = 1;</div><div class='del'>-</div><div class='del'>-	hf = b43_hf_read(dev);</div><div class='del'>-	hf &amp;= ~B43_HF_ANTDIVHELP;</div><div class='del'>-	b43_hf_write(dev, hf);</div><div class='del'>-</div><div class='del'>-	switch (phy-&gt;type) {</div><div class='del'>-	case B43_PHYTYPE_A:</div><div class='del'>-	case B43_PHYTYPE_G:</div><div class='del'>-		tmp = b43_phy_read(dev, B43_PHY_BBANDCFG);</div><div class='del'>-		tmp &amp;= ~B43_PHY_BBANDCFG_RXANT;</div><div class='del'>-		tmp |= (autodiv ? B43_ANTENNA_AUTO0 : antenna)</div><div class='del'>-		    &lt;&lt; B43_PHY_BBANDCFG_RXANT_SHIFT;</div><div class='del'>-		b43_phy_write(dev, B43_PHY_BBANDCFG, tmp);</div><div class='del'>-</div><div class='del'>-		if (autodiv) {</div><div class='del'>-			tmp = b43_phy_read(dev, B43_PHY_ANTDWELL);</div><div class='del'>-			if (antenna == B43_ANTENNA_AUTO0)</div><div class='del'>-				tmp &amp;= ~B43_PHY_ANTDWELL_AUTODIV1;</div><div class='del'>-			else</div><div class='del'>-				tmp |= B43_PHY_ANTDWELL_AUTODIV1;</div><div class='del'>-			b43_phy_write(dev, B43_PHY_ANTDWELL, tmp);</div><div class='del'>-		}</div><div class='del'>-		if (phy-&gt;type == B43_PHYTYPE_G) {</div><div class='del'>-			tmp = b43_phy_read(dev, B43_PHY_ANTWRSETT);</div><div class='del'>-			if (autodiv)</div><div class='del'>-				tmp |= B43_PHY_ANTWRSETT_ARXDIV;</div><div class='del'>-			else</div><div class='del'>-				tmp &amp;= ~B43_PHY_ANTWRSETT_ARXDIV;</div><div class='del'>-			b43_phy_write(dev, B43_PHY_ANTWRSETT, tmp);</div><div class='del'>-			if (phy-&gt;rev &gt;= 2) {</div><div class='del'>-				tmp = b43_phy_read(dev, B43_PHY_OFDM61);</div><div class='del'>-				tmp |= B43_PHY_OFDM61_10;</div><div class='del'>-				b43_phy_write(dev, B43_PHY_OFDM61, tmp);</div><div class='del'>-</div><div class='del'>-				tmp =</div><div class='del'>-				    b43_phy_read(dev, B43_PHY_DIVSRCHGAINBACK);</div><div class='del'>-				tmp = (tmp &amp; 0xFF00) | 0x15;</div><div class='del'>-				b43_phy_write(dev, B43_PHY_DIVSRCHGAINBACK,</div><div class='del'>-					      tmp);</div><div class='del'>-</div><div class='del'>-				if (phy-&gt;rev == 2) {</div><div class='del'>-					b43_phy_write(dev, B43_PHY_ADIVRELATED,</div><div class='del'>-						      8);</div><div class='del'>-				} else {</div><div class='del'>-					tmp =</div><div class='del'>-					    b43_phy_read(dev,</div><div class='del'>-							 B43_PHY_ADIVRELATED);</div><div class='del'>-					tmp = (tmp &amp; 0xFF00) | 8;</div><div class='del'>-					b43_phy_write(dev, B43_PHY_ADIVRELATED,</div><div class='del'>-						      tmp);</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			if (phy-&gt;rev &gt;= 6)</div><div class='del'>-				b43_phy_write(dev, B43_PHY_OFDM9B, 0xDC);</div><div class='del'>-		} else {</div><div class='del'>-			if (phy-&gt;rev &lt; 3) {</div><div class='del'>-				tmp = b43_phy_read(dev, B43_PHY_ANTDWELL);</div><div class='del'>-				tmp = (tmp &amp; 0xFF00) | 0x24;</div><div class='del'>-				b43_phy_write(dev, B43_PHY_ANTDWELL, tmp);</div><div class='del'>-			} else {</div><div class='del'>-				tmp = b43_phy_read(dev, B43_PHY_OFDM61);</div><div class='del'>-				tmp |= 0x10;</div><div class='del'>-				b43_phy_write(dev, B43_PHY_OFDM61, tmp);</div><div class='del'>-				if (phy-&gt;analog == 3) {</div><div class='del'>-					b43_phy_write(dev, B43_PHY_CLIPPWRDOWNT,</div><div class='del'>-						      0x1D);</div><div class='del'>-					b43_phy_write(dev, B43_PHY_ADIVRELATED,</div><div class='del'>-						      8);</div><div class='del'>-				} else {</div><div class='del'>-					b43_phy_write(dev, B43_PHY_CLIPPWRDOWNT,</div><div class='del'>-						      0x3A);</div><div class='del'>-					tmp =</div><div class='del'>-					    b43_phy_read(dev,</div><div class='del'>-							 B43_PHY_ADIVRELATED);</div><div class='del'>-					tmp = (tmp &amp; 0xFF00) | 8;</div><div class='del'>-					b43_phy_write(dev, B43_PHY_ADIVRELATED,</div><div class='del'>-						      tmp);</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case B43_PHYTYPE_B:</div><div class='del'>-		tmp = b43_phy_read(dev, B43_PHY_CCKBBANDCFG);</div><div class='del'>-		tmp &amp;= ~B43_PHY_BBANDCFG_RXANT;</div><div class='del'>-		tmp |= (autodiv ? B43_ANTENNA_AUTO0 : antenna)</div><div class='del'>-		    &lt;&lt; B43_PHY_BBANDCFG_RXANT_SHIFT;</div><div class='del'>-		b43_phy_write(dev, B43_PHY_CCKBBANDCFG, tmp);</div><div class='del'>-		break;</div><div class='del'>-	case B43_PHYTYPE_N:</div><div class='del'>-		b43_nphy_set_rxantenna(dev, antenna);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		B43_WARN_ON(1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hf |= B43_HF_ANTDIVHELP;</div><div class='del'>-	b43_hf_write(dev, hf);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Get the freq, as it has to be written to the device. */</div><div class='del'>-static inline u16 channel2freq_bg(u8 channel)</div><div class='del'>-{</div><div class='del'>-	B43_WARN_ON(!(channel &gt;= 1 &amp;&amp; channel &lt;= 14));</div><div class='del'>-</div><div class='del'>-	return b43_radio_channel_codes_bg[channel - 1];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Get the freq, as it has to be written to the device. */</div><div class='del'>-static inline u16 channel2freq_a(u8 channel)</div><div class='del'>-{</div><div class='del'>-	B43_WARN_ON(channel &gt; 200);</div><div class='del'>-</div><div class='del'>-	return (5000 + 5 * channel);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void b43_radio_lock(struct b43_wldev *dev)</div><div class='del'>-{</div><div class='del'>-	u32 macctl;</div><div class='del'>-</div><div class='del'>-	macctl = b43_read32(dev, B43_MMIO_MACCTL);</div><div class='del'>-	B43_WARN_ON(macctl &amp; B43_MACCTL_RADIOLOCK);</div><div class='del'>-	macctl |= B43_MACCTL_RADIOLOCK;</div><div class='del'>-	b43_write32(dev, B43_MMIO_MACCTL, macctl);</div><div class='del'>-	/* Commit the write and wait for the device</div><div class='del'>-	 * to exit any radio register access. */</div><div class='del'>-	b43_read32(dev, B43_MMIO_MACCTL);</div><div class='del'>-	udelay(10);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void b43_radio_unlock(struct b43_wldev *dev)</div><div class='del'>-{</div><div class='del'>-	u32 macctl;</div><div class='del'>-</div><div class='del'>-	/* Commit any write */</div><div class='del'>-	b43_read16(dev, B43_MMIO_PHY_VER);</div><div class='del'>-	/* unlock */</div><div class='del'>-	macctl = b43_read32(dev, B43_MMIO_MACCTL);</div><div class='del'>-	B43_WARN_ON(!(macctl &amp; B43_MACCTL_RADIOLOCK));</div><div class='del'>-	macctl &amp;= ~B43_MACCTL_RADIOLOCK;</div><div class='del'>-	b43_write32(dev, B43_MMIO_MACCTL, macctl);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u16 b43_radio_read16(struct b43_wldev *dev, u16 offset)</div><div class='del'>-{</div><div class='del'>-	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='del'>-</div><div class='del'>-	/* Offset 1 is a 32-bit register. */</div><div class='del'>-	B43_WARN_ON(offset == 1);</div><div class='del'>-</div><div class='del'>-	switch (phy-&gt;type) {</div><div class='del'>-	case B43_PHYTYPE_A:</div><div class='del'>-		offset |= 0x40;</div><div class='del'>-		break;</div><div class='del'>-	case B43_PHYTYPE_B:</div><div class='del'>-		if (phy-&gt;radio_ver == 0x2053) {</div><div class='del'>-			if (offset &lt; 0x70)</div><div class='del'>-				offset += 0x80;</div><div class='del'>-			else if (offset &lt; 0x80)</div><div class='del'>-				offset += 0x70;</div><div class='del'>-		} else if (phy-&gt;radio_ver == 0x2050) {</div><div class='del'>-			offset |= 0x80;</div><div class='del'>-		} else</div><div class='del'>-			B43_WARN_ON(1);</div><div class='del'>-		break;</div><div class='del'>-	case B43_PHYTYPE_G:</div><div class='del'>-		offset |= 0x80;</div><div class='del'>-		break;</div><div class='del'>-	case B43_PHYTYPE_N:</div><div class='del'>-		offset |= 0x100;</div><div class='del'>-		break;</div><div class='del'>-	case B43_PHYTYPE_LP:</div><div class='del'>-		/* No adjustment required. */</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		B43_WARN_ON(1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	b43_write16(dev, B43_MMIO_RADIO_CONTROL, offset);</div><div class='del'>-	return b43_read16(dev, B43_MMIO_RADIO_DATA_LOW);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void b43_radio_write16(struct b43_wldev *dev, u16 offset, u16 val)</div><div class='del'>-{</div><div class='del'>-	/* Offset 1 is a 32-bit register. */</div><div class='del'>-	B43_WARN_ON(offset == 1);</div><div class='del'>-</div><div class='del'>-	b43_write16(dev, B43_MMIO_RADIO_CONTROL, offset);</div><div class='del'>-	b43_write16(dev, B43_MMIO_RADIO_DATA_LOW, val);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void b43_radio_mask(struct b43_wldev *dev, u16 offset, u16 mask)</div><div class='del'>-{</div><div class='del'>-	b43_radio_write16(dev, offset,</div><div class='del'>-			  b43_radio_read16(dev, offset) &amp; mask);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void b43_radio_set(struct b43_wldev *dev, u16 offset, u16 set)</div><div class='del'>-{</div><div class='del'>-	b43_radio_write16(dev, offset,</div><div class='del'>-			  b43_radio_read16(dev, offset) | set);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void b43_radio_maskset(struct b43_wldev *dev, u16 offset, u16 mask, u16 set)</div><div class='del'>-{</div><div class='del'>-	b43_radio_write16(dev, offset,</div><div class='del'>-			  (b43_radio_read16(dev, offset) &amp; mask) | set);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void b43_set_all_gains(struct b43_wldev *dev,</div><div class='ctx'> 			      s16 first, s16 second, s16 third)</div><div class='ctx'> {</div><div class='hunk'>@@ -2134,108 +382,10 @@ static void b43_set_original_gains(struct b43_wldev *dev)</div><div class='ctx'> 	b43_dummy_transmission(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Synthetic PU workaround */</div><div class='del'>-static void b43_synth_pu_workaround(struct b43_wldev *dev, u8 channel)</div><div class='del'>-{</div><div class='del'>-	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='del'>-</div><div class='del'>-	might_sleep();</div><div class='del'>-</div><div class='del'>-	if (phy-&gt;radio_ver != 0x2050 || phy-&gt;radio_rev &gt;= 6) {</div><div class='del'>-		/* We do not need the workaround. */</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (channel &lt;= 10) {</div><div class='del'>-		b43_write16(dev, B43_MMIO_CHANNEL,</div><div class='del'>-			    channel2freq_bg(channel + 4));</div><div class='del'>-	} else {</div><div class='del'>-		b43_write16(dev, B43_MMIO_CHANNEL, channel2freq_bg(1));</div><div class='del'>-	}</div><div class='del'>-	msleep(1);</div><div class='del'>-	b43_write16(dev, B43_MMIO_CHANNEL, channel2freq_bg(channel));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u8 b43_radio_aci_detect(struct b43_wldev *dev, u8 channel)</div><div class='del'>-{</div><div class='del'>-	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='del'>-	u8 ret = 0;</div><div class='del'>-	u16 saved, rssi, temp;</div><div class='del'>-	int i, j = 0;</div><div class='del'>-</div><div class='del'>-	saved = b43_phy_read(dev, 0x0403);</div><div class='del'>-	b43_radio_selectchannel(dev, channel, 0);</div><div class='del'>-	b43_phy_write(dev, 0x0403, (saved &amp; 0xFFF8) | 5);</div><div class='del'>-	if (phy-&gt;aci_hw_rssi)</div><div class='del'>-		rssi = b43_phy_read(dev, 0x048A) &amp; 0x3F;</div><div class='del'>-	else</div><div class='del'>-		rssi = saved &amp; 0x3F;</div><div class='del'>-	/* clamp temp to signed 5bit */</div><div class='del'>-	if (rssi &gt; 32)</div><div class='del'>-		rssi -= 64;</div><div class='del'>-	for (i = 0; i &lt; 100; i++) {</div><div class='del'>-		temp = (b43_phy_read(dev, 0x047F) &gt;&gt; 8) &amp; 0x3F;</div><div class='del'>-		if (temp &gt; 32)</div><div class='del'>-			temp -= 64;</div><div class='del'>-		if (temp &lt; rssi)</div><div class='del'>-			j++;</div><div class='del'>-		if (j &gt;= 20)</div><div class='del'>-			ret = 1;</div><div class='del'>-	}</div><div class='del'>-	b43_phy_write(dev, 0x0403, saved);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u8 b43_radio_aci_scan(struct b43_wldev * dev)</div><div class='del'>-{</div><div class='del'>-	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='del'>-	u8 ret[13];</div><div class='del'>-	unsigned int channel = phy-&gt;channel;</div><div class='del'>-	unsigned int i, j, start, end;</div><div class='del'>-</div><div class='del'>-	if (!((phy-&gt;type == B43_PHYTYPE_G) &amp;&amp; (phy-&gt;rev &gt; 0)))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	b43_phy_lock(dev);</div><div class='del'>-	b43_radio_lock(dev);</div><div class='del'>-	b43_phy_write(dev, 0x0802, b43_phy_read(dev, 0x0802) &amp; 0xFFFC);</div><div class='del'>-	b43_phy_write(dev, B43_PHY_G_CRS,</div><div class='del'>-		      b43_phy_read(dev, B43_PHY_G_CRS) &amp; 0x7FFF);</div><div class='del'>-	b43_set_all_gains(dev, 3, 8, 1);</div><div class='del'>-</div><div class='del'>-	start = (channel - 5 &gt; 0) ? channel - 5 : 1;</div><div class='del'>-	end = (channel + 5 &lt; 14) ? channel + 5 : 13;</div><div class='del'>-</div><div class='del'>-	for (i = start; i &lt;= end; i++) {</div><div class='del'>-		if (abs(channel - i) &gt; 2)</div><div class='del'>-			ret[i - 1] = b43_radio_aci_detect(dev, i);</div><div class='del'>-	}</div><div class='del'>-	b43_radio_selectchannel(dev, channel, 0);</div><div class='del'>-	b43_phy_write(dev, 0x0802,</div><div class='del'>-		      (b43_phy_read(dev, 0x0802) &amp; 0xFFFC) | 0x0003);</div><div class='del'>-	b43_phy_write(dev, 0x0403, b43_phy_read(dev, 0x0403) &amp; 0xFFF8);</div><div class='del'>-	b43_phy_write(dev, B43_PHY_G_CRS,</div><div class='del'>-		      b43_phy_read(dev, B43_PHY_G_CRS) | 0x8000);</div><div class='del'>-	b43_set_original_gains(dev);</div><div class='del'>-	for (i = 0; i &lt; 13; i++) {</div><div class='del'>-		if (!ret[i])</div><div class='del'>-			continue;</div><div class='del'>-		end = (i + 5 &lt; 13) ? i + 5 : 13;</div><div class='del'>-		for (j = i; j &lt; end; j++)</div><div class='del'>-			ret[j] = 1;</div><div class='del'>-	}</div><div class='del'>-	b43_radio_unlock(dev);</div><div class='del'>-	b43_phy_unlock(dev);</div><div class='del'>-</div><div class='del'>-	return ret[channel - 1];</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* http://bcm-specs.sipsolutions.net/NRSSILookupTable */</div><div class='ctx'> void b43_nrssi_hw_write(struct b43_wldev *dev, u16 offset, s16 val)</div><div class='ctx'> {</div><div class='ctx'> 	b43_phy_write(dev, B43_PHY_NRSSILT_CTRL, offset);</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	b43_phy_write(dev, B43_PHY_NRSSILT_DATA, (u16) val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2267,17 +417,17 @@ void b43_nrssi_hw_update(struct b43_wldev *dev, u16 val)</div><div class='ctx'> /* http://bcm-specs.sipsolutions.net/NRSSILookupTable */</div><div class='ctx'> void b43_nrssi_mem_update(struct b43_wldev *dev)</div><div class='ctx'> {</div><div class='del'>-	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='add'>+	struct b43_phy_g *gphy = dev-&gt;phy.g;</div><div class='ctx'> 	s16 i, delta;</div><div class='ctx'> 	s32 tmp;</div><div class='ctx'> </div><div class='del'>-	delta = 0x1F - phy-&gt;nrssi[0];</div><div class='add'>+	delta = 0x1F - gphy-&gt;nrssi[0];</div><div class='ctx'> 	for (i = 0; i &lt; 64; i++) {</div><div class='del'>-		tmp = (i - delta) * phy-&gt;nrssislope;</div><div class='add'>+		tmp = (i - delta) * gphy-&gt;nrssislope;</div><div class='ctx'> 		tmp /= 0x10000;</div><div class='ctx'> 		tmp += 0x3A;</div><div class='ctx'> 		tmp = clamp_val(tmp, 0, 0x3F);</div><div class='del'>-		phy-&gt;nrssi_lt[i] = tmp;</div><div class='add'>+		gphy-&gt;nrssi_lt[i] = tmp;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2442,347 +592,230 @@ static void b43_calc_nrssi_offset(struct b43_wldev *dev)</div><div class='ctx'> void b43_calc_nrssi_slope(struct b43_wldev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='add'>+	struct b43_phy_g *gphy = phy-&gt;g;</div><div class='ctx'> 	u16 backup[18] = { 0 };</div><div class='ctx'> 	u16 tmp;</div><div class='ctx'> 	s16 nrssi0, nrssi1;</div><div class='ctx'> </div><div class='del'>-	switch (phy-&gt;type) {</div><div class='del'>-	case B43_PHYTYPE_B:</div><div class='del'>-		backup[0] = b43_radio_read16(dev, 0x007A);</div><div class='del'>-		backup[1] = b43_radio_read16(dev, 0x0052);</div><div class='del'>-		backup[2] = b43_radio_read16(dev, 0x0043);</div><div class='del'>-		backup[3] = b43_phy_read(dev, 0x0030);</div><div class='del'>-		backup[4] = b43_phy_read(dev, 0x0026);</div><div class='del'>-		backup[5] = b43_phy_read(dev, 0x0015);</div><div class='del'>-		backup[6] = b43_phy_read(dev, 0x002A);</div><div class='del'>-		backup[7] = b43_phy_read(dev, 0x0020);</div><div class='del'>-		backup[8] = b43_phy_read(dev, 0x005A);</div><div class='del'>-		backup[9] = b43_phy_read(dev, 0x0059);</div><div class='del'>-		backup[10] = b43_phy_read(dev, 0x0058);</div><div class='del'>-		backup[11] = b43_read16(dev, 0x03E2);</div><div class='del'>-		backup[12] = b43_read16(dev, 0x03E6);</div><div class='del'>-		backup[13] = b43_read16(dev, B43_MMIO_CHANNEL_EXT);</div><div class='del'>-</div><div class='del'>-		tmp = b43_radio_read16(dev, 0x007A);</div><div class='del'>-		tmp &amp;= (phy-&gt;rev &gt;= 5) ? 0x007F : 0x000F;</div><div class='del'>-		b43_radio_write16(dev, 0x007A, tmp);</div><div class='del'>-		b43_phy_write(dev, 0x0030, 0x00FF);</div><div class='del'>-		b43_write16(dev, 0x03EC, 0x7F7F);</div><div class='del'>-		b43_phy_write(dev, 0x0026, 0x0000);</div><div class='del'>-		b43_phy_write(dev, 0x0015, b43_phy_read(dev, 0x0015) | 0x0020);</div><div class='del'>-		b43_phy_write(dev, 0x002A, 0x08A3);</div><div class='del'>-		b43_radio_write16(dev, 0x007A,</div><div class='del'>-				  b43_radio_read16(dev, 0x007A) | 0x0080);</div><div class='add'>+	B43_WARN_ON(phy-&gt;type != B43_PHYTYPE_G);</div><div class='ctx'> </div><div class='del'>-		nrssi0 = (s16) b43_phy_read(dev, 0x0027);</div><div class='del'>-		b43_radio_write16(dev, 0x007A,</div><div class='del'>-				  b43_radio_read16(dev, 0x007A) &amp; 0x007F);</div><div class='del'>-		if (phy-&gt;rev &gt;= 2) {</div><div class='del'>-			b43_write16(dev, 0x03E6, 0x0040);</div><div class='del'>-		} else if (phy-&gt;rev == 0) {</div><div class='del'>-			b43_write16(dev, 0x03E6, 0x0122);</div><div class='del'>-		} else {</div><div class='del'>-			b43_write16(dev, B43_MMIO_CHANNEL_EXT,</div><div class='del'>-				    b43_read16(dev,</div><div class='del'>-					       B43_MMIO_CHANNEL_EXT) &amp; 0x2000);</div><div class='del'>-		}</div><div class='del'>-		b43_phy_write(dev, 0x0020, 0x3F3F);</div><div class='del'>-		b43_phy_write(dev, 0x0015, 0xF330);</div><div class='del'>-		b43_radio_write16(dev, 0x005A, 0x0060);</div><div class='del'>-		b43_radio_write16(dev, 0x0043,</div><div class='del'>-				  b43_radio_read16(dev, 0x0043) &amp; 0x00F0);</div><div class='del'>-		b43_phy_write(dev, 0x005A, 0x0480);</div><div class='del'>-		b43_phy_write(dev, 0x0059, 0x0810);</div><div class='del'>-		b43_phy_write(dev, 0x0058, 0x000D);</div><div class='del'>-		udelay(20);</div><div class='del'>-</div><div class='del'>-		nrssi1 = (s16) b43_phy_read(dev, 0x0027);</div><div class='del'>-		b43_phy_write(dev, 0x0030, backup[3]);</div><div class='del'>-		b43_radio_write16(dev, 0x007A, backup[0]);</div><div class='del'>-		b43_write16(dev, 0x03E2, backup[11]);</div><div class='del'>-		b43_phy_write(dev, 0x0026, backup[4]);</div><div class='del'>-		b43_phy_write(dev, 0x0015, backup[5]);</div><div class='del'>-		b43_phy_write(dev, 0x002A, backup[6]);</div><div class='del'>-		b43_synth_pu_workaround(dev, phy-&gt;channel);</div><div class='del'>-		if (phy-&gt;rev != 0)</div><div class='del'>-			b43_write16(dev, 0x03F4, backup[13]);</div><div class='del'>-</div><div class='del'>-		b43_phy_write(dev, 0x0020, backup[7]);</div><div class='del'>-		b43_phy_write(dev, 0x005A, backup[8]);</div><div class='del'>-		b43_phy_write(dev, 0x0059, backup[9]);</div><div class='del'>-		b43_phy_write(dev, 0x0058, backup[10]);</div><div class='del'>-		b43_radio_write16(dev, 0x0052, backup[1]);</div><div class='del'>-		b43_radio_write16(dev, 0x0043, backup[2]);</div><div class='del'>-</div><div class='del'>-		if (nrssi0 == nrssi1)</div><div class='del'>-			phy-&gt;nrssislope = 0x00010000;</div><div class='del'>-		else</div><div class='del'>-			phy-&gt;nrssislope = 0x00400000 / (nrssi0 - nrssi1);</div><div class='del'>-</div><div class='del'>-		if (nrssi0 &lt;= -4) {</div><div class='del'>-			phy-&gt;nrssi[0] = nrssi0;</div><div class='del'>-			phy-&gt;nrssi[1] = nrssi1;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case B43_PHYTYPE_G:</div><div class='del'>-		if (phy-&gt;radio_rev &gt;= 9)</div><div class='del'>-			return;</div><div class='del'>-		if (phy-&gt;radio_rev == 8)</div><div class='del'>-			b43_calc_nrssi_offset(dev);</div><div class='add'>+	if (phy-&gt;radio_rev &gt;= 9)</div><div class='add'>+		return;</div><div class='add'>+	if (phy-&gt;radio_rev == 8)</div><div class='add'>+		b43_calc_nrssi_offset(dev);</div><div class='ctx'> </div><div class='del'>-		b43_phy_write(dev, B43_PHY_G_CRS,</div><div class='del'>-			      b43_phy_read(dev, B43_PHY_G_CRS) &amp; 0x7FFF);</div><div class='del'>-		b43_phy_write(dev, 0x0802, b43_phy_read(dev, 0x0802) &amp; 0xFFFC);</div><div class='del'>-		backup[7] = b43_read16(dev, 0x03E2);</div><div class='del'>-		b43_write16(dev, 0x03E2, b43_read16(dev, 0x03E2) | 0x8000);</div><div class='del'>-		backup[0] = b43_radio_read16(dev, 0x007A);</div><div class='del'>-		backup[1] = b43_radio_read16(dev, 0x0052);</div><div class='del'>-		backup[2] = b43_radio_read16(dev, 0x0043);</div><div class='del'>-		backup[3] = b43_phy_read(dev, 0x0015);</div><div class='del'>-		backup[4] = b43_phy_read(dev, 0x005A);</div><div class='del'>-		backup[5] = b43_phy_read(dev, 0x0059);</div><div class='del'>-		backup[6] = b43_phy_read(dev, 0x0058);</div><div class='del'>-		backup[8] = b43_read16(dev, 0x03E6);</div><div class='del'>-		backup[9] = b43_read16(dev, B43_MMIO_CHANNEL_EXT);</div><div class='del'>-		if (phy-&gt;rev &gt;= 3) {</div><div class='del'>-			backup[10] = b43_phy_read(dev, 0x002E);</div><div class='del'>-			backup[11] = b43_phy_read(dev, 0x002F);</div><div class='del'>-			backup[12] = b43_phy_read(dev, 0x080F);</div><div class='del'>-			backup[13] = b43_phy_read(dev, B43_PHY_G_LO_CONTROL);</div><div class='del'>-			backup[14] = b43_phy_read(dev, 0x0801);</div><div class='del'>-			backup[15] = b43_phy_read(dev, 0x0060);</div><div class='del'>-			backup[16] = b43_phy_read(dev, 0x0014);</div><div class='del'>-			backup[17] = b43_phy_read(dev, 0x0478);</div><div class='del'>-			b43_phy_write(dev, 0x002E, 0);</div><div class='del'>-			b43_phy_write(dev, B43_PHY_G_LO_CONTROL, 0);</div><div class='del'>-			switch (phy-&gt;rev) {</div><div class='del'>-			case 4:</div><div class='del'>-			case 6:</div><div class='del'>-			case 7:</div><div class='del'>-				b43_phy_write(dev, 0x0478,</div><div class='del'>-					      b43_phy_read(dev, 0x0478)</div><div class='del'>-					      | 0x0100);</div><div class='del'>-				b43_phy_write(dev, 0x0801,</div><div class='del'>-					      b43_phy_read(dev, 0x0801)</div><div class='del'>-					      | 0x0040);</div><div class='del'>-				break;</div><div class='del'>-			case 3:</div><div class='del'>-			case 5:</div><div class='del'>-				b43_phy_write(dev, 0x0801,</div><div class='del'>-					      b43_phy_read(dev, 0x0801)</div><div class='del'>-					      &amp; 0xFFBF);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			b43_phy_write(dev, 0x0060, b43_phy_read(dev, 0x0060)</div><div class='add'>+	b43_phy_write(dev, B43_PHY_G_CRS,</div><div class='add'>+		      b43_phy_read(dev, B43_PHY_G_CRS) &amp; 0x7FFF);</div><div class='add'>+	b43_phy_write(dev, 0x0802, b43_phy_read(dev, 0x0802) &amp; 0xFFFC);</div><div class='add'>+	backup[7] = b43_read16(dev, 0x03E2);</div><div class='add'>+	b43_write16(dev, 0x03E2, b43_read16(dev, 0x03E2) | 0x8000);</div><div class='add'>+	backup[0] = b43_radio_read16(dev, 0x007A);</div><div class='add'>+	backup[1] = b43_radio_read16(dev, 0x0052);</div><div class='add'>+	backup[2] = b43_radio_read16(dev, 0x0043);</div><div class='add'>+	backup[3] = b43_phy_read(dev, 0x0015);</div><div class='add'>+	backup[4] = b43_phy_read(dev, 0x005A);</div><div class='add'>+	backup[5] = b43_phy_read(dev, 0x0059);</div><div class='add'>+	backup[6] = b43_phy_read(dev, 0x0058);</div><div class='add'>+	backup[8] = b43_read16(dev, 0x03E6);</div><div class='add'>+	backup[9] = b43_read16(dev, B43_MMIO_CHANNEL_EXT);</div><div class='add'>+	if (phy-&gt;rev &gt;= 3) {</div><div class='add'>+		backup[10] = b43_phy_read(dev, 0x002E);</div><div class='add'>+		backup[11] = b43_phy_read(dev, 0x002F);</div><div class='add'>+		backup[12] = b43_phy_read(dev, 0x080F);</div><div class='add'>+		backup[13] = b43_phy_read(dev, B43_PHY_G_LO_CONTROL);</div><div class='add'>+		backup[14] = b43_phy_read(dev, 0x0801);</div><div class='add'>+		backup[15] = b43_phy_read(dev, 0x0060);</div><div class='add'>+		backup[16] = b43_phy_read(dev, 0x0014);</div><div class='add'>+		backup[17] = b43_phy_read(dev, 0x0478);</div><div class='add'>+		b43_phy_write(dev, 0x002E, 0);</div><div class='add'>+		b43_phy_write(dev, B43_PHY_G_LO_CONTROL, 0);</div><div class='add'>+		switch (phy-&gt;rev) {</div><div class='add'>+		case 4:</div><div class='add'>+		case 6:</div><div class='add'>+		case 7:</div><div class='add'>+			b43_phy_write(dev, 0x0478,</div><div class='add'>+				      b43_phy_read(dev, 0x0478)</div><div class='add'>+				      | 0x0100);</div><div class='add'>+			b43_phy_write(dev, 0x0801,</div><div class='add'>+				      b43_phy_read(dev, 0x0801)</div><div class='ctx'> 				      | 0x0040);</div><div class='del'>-			b43_phy_write(dev, 0x0014, b43_phy_read(dev, 0x0014)</div><div class='del'>-				      | 0x0200);</div><div class='del'>-		}</div><div class='del'>-		b43_radio_write16(dev, 0x007A,</div><div class='del'>-				  b43_radio_read16(dev, 0x007A) | 0x0070);</div><div class='del'>-		b43_set_all_gains(dev, 0, 8, 0);</div><div class='del'>-		b43_radio_write16(dev, 0x007A,</div><div class='del'>-				  b43_radio_read16(dev, 0x007A) &amp; 0x00F7);</div><div class='del'>-		if (phy-&gt;rev &gt;= 2) {</div><div class='del'>-			b43_phy_write(dev, 0x0811,</div><div class='del'>-				      (b43_phy_read(dev, 0x0811) &amp; 0xFFCF) |</div><div class='del'>-				      0x0030);</div><div class='del'>-			b43_phy_write(dev, 0x0812,</div><div class='del'>-				      (b43_phy_read(dev, 0x0812) &amp; 0xFFCF) |</div><div class='del'>-				      0x0010);</div><div class='add'>+			break;</div><div class='add'>+		case 3:</div><div class='add'>+		case 5:</div><div class='add'>+			b43_phy_write(dev, 0x0801,</div><div class='add'>+				      b43_phy_read(dev, 0x0801)</div><div class='add'>+				      &amp; 0xFFBF);</div><div class='add'>+			break;</div><div class='ctx'> 		}</div><div class='del'>-		b43_radio_write16(dev, 0x007A,</div><div class='del'>-				  b43_radio_read16(dev, 0x007A) | 0x0080);</div><div class='del'>-		udelay(20);</div><div class='add'>+		b43_phy_write(dev, 0x0060, b43_phy_read(dev, 0x0060)</div><div class='add'>+			      | 0x0040);</div><div class='add'>+		b43_phy_write(dev, 0x0014, b43_phy_read(dev, 0x0014)</div><div class='add'>+			      | 0x0200);</div><div class='add'>+	}</div><div class='add'>+	b43_radio_write16(dev, 0x007A,</div><div class='add'>+			  b43_radio_read16(dev, 0x007A) | 0x0070);</div><div class='add'>+	b43_set_all_gains(dev, 0, 8, 0);</div><div class='add'>+	b43_radio_write16(dev, 0x007A,</div><div class='add'>+			  b43_radio_read16(dev, 0x007A) &amp; 0x00F7);</div><div class='add'>+	if (phy-&gt;rev &gt;= 2) {</div><div class='add'>+		b43_phy_write(dev, 0x0811,</div><div class='add'>+			      (b43_phy_read(dev, 0x0811) &amp; 0xFFCF) |</div><div class='add'>+			      0x0030);</div><div class='add'>+		b43_phy_write(dev, 0x0812,</div><div class='add'>+			      (b43_phy_read(dev, 0x0812) &amp; 0xFFCF) |</div><div class='add'>+			      0x0010);</div><div class='add'>+	}</div><div class='add'>+	b43_radio_write16(dev, 0x007A,</div><div class='add'>+			  b43_radio_read16(dev, 0x007A) | 0x0080);</div><div class='add'>+	udelay(20);</div><div class='ctx'> </div><div class='del'>-		nrssi0 = (s16) ((b43_phy_read(dev, 0x047F) &gt;&gt; 8) &amp; 0x003F);</div><div class='del'>-		if (nrssi0 &gt;= 0x0020)</div><div class='del'>-			nrssi0 -= 0x0040;</div><div class='add'>+	nrssi0 = (s16) ((b43_phy_read(dev, 0x047F) &gt;&gt; 8) &amp; 0x003F);</div><div class='add'>+	if (nrssi0 &gt;= 0x0020)</div><div class='add'>+		nrssi0 -= 0x0040;</div><div class='ctx'> </div><div class='del'>-		b43_radio_write16(dev, 0x007A,</div><div class='del'>-				  b43_radio_read16(dev, 0x007A) &amp; 0x007F);</div><div class='del'>-		if (phy-&gt;rev &gt;= 2) {</div><div class='del'>-			b43_phy_write(dev, 0x0003, (b43_phy_read(dev, 0x0003)</div><div class='del'>-						    &amp; 0xFF9F) | 0x0040);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		b43_write16(dev, B43_MMIO_CHANNEL_EXT,</div><div class='del'>-			    b43_read16(dev, B43_MMIO_CHANNEL_EXT)</div><div class='del'>-			    | 0x2000);</div><div class='del'>-		b43_radio_write16(dev, 0x007A,</div><div class='del'>-				  b43_radio_read16(dev, 0x007A) | 0x000F);</div><div class='del'>-		b43_phy_write(dev, 0x0015, 0xF330);</div><div class='del'>-		if (phy-&gt;rev &gt;= 2) {</div><div class='del'>-			b43_phy_write(dev, 0x0812,</div><div class='del'>-				      (b43_phy_read(dev, 0x0812) &amp; 0xFFCF) |</div><div class='del'>-				      0x0020);</div><div class='del'>-			b43_phy_write(dev, 0x0811,</div><div class='del'>-				      (b43_phy_read(dev, 0x0811) &amp; 0xFFCF) |</div><div class='del'>-				      0x0020);</div><div class='del'>-		}</div><div class='add'>+	b43_radio_write16(dev, 0x007A,</div><div class='add'>+			  b43_radio_read16(dev, 0x007A) &amp; 0x007F);</div><div class='add'>+	if (phy-&gt;rev &gt;= 2) {</div><div class='add'>+		b43_phy_write(dev, 0x0003, (b43_phy_read(dev, 0x0003)</div><div class='add'>+					    &amp; 0xFF9F) | 0x0040);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		b43_set_all_gains(dev, 3, 0, 1);</div><div class='del'>-		if (phy-&gt;radio_rev == 8) {</div><div class='del'>-			b43_radio_write16(dev, 0x0043, 0x001F);</div><div class='del'>-		} else {</div><div class='del'>-			tmp = b43_radio_read16(dev, 0x0052) &amp; 0xFF0F;</div><div class='del'>-			b43_radio_write16(dev, 0x0052, tmp | 0x0060);</div><div class='del'>-			tmp = b43_radio_read16(dev, 0x0043) &amp; 0xFFF0;</div><div class='del'>-			b43_radio_write16(dev, 0x0043, tmp | 0x0009);</div><div class='del'>-		}</div><div class='del'>-		b43_phy_write(dev, 0x005A, 0x0480);</div><div class='del'>-		b43_phy_write(dev, 0x0059, 0x0810);</div><div class='del'>-		b43_phy_write(dev, 0x0058, 0x000D);</div><div class='del'>-		udelay(20);</div><div class='del'>-		nrssi1 = (s16) ((b43_phy_read(dev, 0x047F) &gt;&gt; 8) &amp; 0x003F);</div><div class='del'>-		if (nrssi1 &gt;= 0x0020)</div><div class='del'>-			nrssi1 -= 0x0040;</div><div class='del'>-		if (nrssi0 == nrssi1)</div><div class='del'>-			phy-&gt;nrssislope = 0x00010000;</div><div class='del'>-		else</div><div class='del'>-			phy-&gt;nrssislope = 0x00400000 / (nrssi0 - nrssi1);</div><div class='del'>-		if (nrssi0 &gt;= -4) {</div><div class='del'>-			phy-&gt;nrssi[0] = nrssi1;</div><div class='del'>-			phy-&gt;nrssi[1] = nrssi0;</div><div class='del'>-		}</div><div class='del'>-		if (phy-&gt;rev &gt;= 3) {</div><div class='del'>-			b43_phy_write(dev, 0x002E, backup[10]);</div><div class='del'>-			b43_phy_write(dev, 0x002F, backup[11]);</div><div class='del'>-			b43_phy_write(dev, 0x080F, backup[12]);</div><div class='del'>-			b43_phy_write(dev, B43_PHY_G_LO_CONTROL, backup[13]);</div><div class='del'>-		}</div><div class='del'>-		if (phy-&gt;rev &gt;= 2) {</div><div class='del'>-			b43_phy_write(dev, 0x0812,</div><div class='del'>-				      b43_phy_read(dev, 0x0812) &amp; 0xFFCF);</div><div class='del'>-			b43_phy_write(dev, 0x0811,</div><div class='del'>-				      b43_phy_read(dev, 0x0811) &amp; 0xFFCF);</div><div class='del'>-		}</div><div class='add'>+	b43_write16(dev, B43_MMIO_CHANNEL_EXT,</div><div class='add'>+		    b43_read16(dev, B43_MMIO_CHANNEL_EXT)</div><div class='add'>+		    | 0x2000);</div><div class='add'>+	b43_radio_write16(dev, 0x007A,</div><div class='add'>+			  b43_radio_read16(dev, 0x007A) | 0x000F);</div><div class='add'>+	b43_phy_write(dev, 0x0015, 0xF330);</div><div class='add'>+	if (phy-&gt;rev &gt;= 2) {</div><div class='add'>+		b43_phy_write(dev, 0x0812,</div><div class='add'>+			      (b43_phy_read(dev, 0x0812) &amp; 0xFFCF) |</div><div class='add'>+			      0x0020);</div><div class='add'>+		b43_phy_write(dev, 0x0811,</div><div class='add'>+			      (b43_phy_read(dev, 0x0811) &amp; 0xFFCF) |</div><div class='add'>+			      0x0020);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		b43_radio_write16(dev, 0x007A, backup[0]);</div><div class='del'>-		b43_radio_write16(dev, 0x0052, backup[1]);</div><div class='del'>-		b43_radio_write16(dev, 0x0043, backup[2]);</div><div class='del'>-		b43_write16(dev, 0x03E2, backup[7]);</div><div class='del'>-		b43_write16(dev, 0x03E6, backup[8]);</div><div class='del'>-		b43_write16(dev, B43_MMIO_CHANNEL_EXT, backup[9]);</div><div class='del'>-		b43_phy_write(dev, 0x0015, backup[3]);</div><div class='del'>-		b43_phy_write(dev, 0x005A, backup[4]);</div><div class='del'>-		b43_phy_write(dev, 0x0059, backup[5]);</div><div class='del'>-		b43_phy_write(dev, 0x0058, backup[6]);</div><div class='del'>-		b43_synth_pu_workaround(dev, phy-&gt;channel);</div><div class='del'>-		b43_phy_write(dev, 0x0802,</div><div class='del'>-			      b43_phy_read(dev, 0x0802) | (0x0001 | 0x0002));</div><div class='del'>-		b43_set_original_gains(dev);</div><div class='del'>-		b43_phy_write(dev, B43_PHY_G_CRS,</div><div class='del'>-			      b43_phy_read(dev, B43_PHY_G_CRS) | 0x8000);</div><div class='del'>-		if (phy-&gt;rev &gt;= 3) {</div><div class='del'>-			b43_phy_write(dev, 0x0801, backup[14]);</div><div class='del'>-			b43_phy_write(dev, 0x0060, backup[15]);</div><div class='del'>-			b43_phy_write(dev, 0x0014, backup[16]);</div><div class='del'>-			b43_phy_write(dev, 0x0478, backup[17]);</div><div class='del'>-		}</div><div class='del'>-		b43_nrssi_mem_update(dev);</div><div class='del'>-		b43_calc_nrssi_threshold(dev);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		B43_WARN_ON(1);</div><div class='add'>+	b43_set_all_gains(dev, 3, 0, 1);</div><div class='add'>+	if (phy-&gt;radio_rev == 8) {</div><div class='add'>+		b43_radio_write16(dev, 0x0043, 0x001F);</div><div class='add'>+	} else {</div><div class='add'>+		tmp = b43_radio_read16(dev, 0x0052) &amp; 0xFF0F;</div><div class='add'>+		b43_radio_write16(dev, 0x0052, tmp | 0x0060);</div><div class='add'>+		tmp = b43_radio_read16(dev, 0x0043) &amp; 0xFFF0;</div><div class='add'>+		b43_radio_write16(dev, 0x0043, tmp | 0x0009);</div><div class='add'>+	}</div><div class='add'>+	b43_phy_write(dev, 0x005A, 0x0480);</div><div class='add'>+	b43_phy_write(dev, 0x0059, 0x0810);</div><div class='add'>+	b43_phy_write(dev, 0x0058, 0x000D);</div><div class='add'>+	udelay(20);</div><div class='add'>+	nrssi1 = (s16) ((b43_phy_read(dev, 0x047F) &gt;&gt; 8) &amp; 0x003F);</div><div class='add'>+	if (nrssi1 &gt;= 0x0020)</div><div class='add'>+		nrssi1 -= 0x0040;</div><div class='add'>+	if (nrssi0 == nrssi1)</div><div class='add'>+		gphy-&gt;nrssislope = 0x00010000;</div><div class='add'>+	else</div><div class='add'>+		gphy-&gt;nrssislope = 0x00400000 / (nrssi0 - nrssi1);</div><div class='add'>+	if (nrssi0 &gt;= -4) {</div><div class='add'>+		gphy-&gt;nrssi[0] = nrssi1;</div><div class='add'>+		gphy-&gt;nrssi[1] = nrssi0;</div><div class='add'>+	}</div><div class='add'>+	if (phy-&gt;rev &gt;= 3) {</div><div class='add'>+		b43_phy_write(dev, 0x002E, backup[10]);</div><div class='add'>+		b43_phy_write(dev, 0x002F, backup[11]);</div><div class='add'>+		b43_phy_write(dev, 0x080F, backup[12]);</div><div class='add'>+		b43_phy_write(dev, B43_PHY_G_LO_CONTROL, backup[13]);</div><div class='ctx'> 	}</div><div class='add'>+	if (phy-&gt;rev &gt;= 2) {</div><div class='add'>+		b43_phy_write(dev, 0x0812,</div><div class='add'>+			      b43_phy_read(dev, 0x0812) &amp; 0xFFCF);</div><div class='add'>+		b43_phy_write(dev, 0x0811,</div><div class='add'>+			      b43_phy_read(dev, 0x0811) &amp; 0xFFCF);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	b43_radio_write16(dev, 0x007A, backup[0]);</div><div class='add'>+	b43_radio_write16(dev, 0x0052, backup[1]);</div><div class='add'>+	b43_radio_write16(dev, 0x0043, backup[2]);</div><div class='add'>+	b43_write16(dev, 0x03E2, backup[7]);</div><div class='add'>+	b43_write16(dev, 0x03E6, backup[8]);</div><div class='add'>+	b43_write16(dev, B43_MMIO_CHANNEL_EXT, backup[9]);</div><div class='add'>+	b43_phy_write(dev, 0x0015, backup[3]);</div><div class='add'>+	b43_phy_write(dev, 0x005A, backup[4]);</div><div class='add'>+	b43_phy_write(dev, 0x0059, backup[5]);</div><div class='add'>+	b43_phy_write(dev, 0x0058, backup[6]);</div><div class='add'>+	b43_synth_pu_workaround(dev, phy-&gt;channel);</div><div class='add'>+	b43_phy_write(dev, 0x0802,</div><div class='add'>+		      b43_phy_read(dev, 0x0802) | (0x0001 | 0x0002));</div><div class='add'>+	b43_set_original_gains(dev);</div><div class='add'>+	b43_phy_write(dev, B43_PHY_G_CRS,</div><div class='add'>+		      b43_phy_read(dev, B43_PHY_G_CRS) | 0x8000);</div><div class='add'>+	if (phy-&gt;rev &gt;= 3) {</div><div class='add'>+		b43_phy_write(dev, 0x0801, backup[14]);</div><div class='add'>+		b43_phy_write(dev, 0x0060, backup[15]);</div><div class='add'>+		b43_phy_write(dev, 0x0014, backup[16]);</div><div class='add'>+		b43_phy_write(dev, 0x0478, backup[17]);</div><div class='add'>+	}</div><div class='add'>+	b43_nrssi_mem_update(dev);</div><div class='add'>+	b43_calc_nrssi_threshold(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void b43_calc_nrssi_threshold(struct b43_wldev *dev)</div><div class='add'>+static void b43_calc_nrssi_threshold(struct b43_wldev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='del'>-	s32 threshold;</div><div class='add'>+	struct b43_phy_g *gphy = phy-&gt;g;</div><div class='ctx'> 	s32 a, b;</div><div class='ctx'> 	s16 tmp16;</div><div class='ctx'> 	u16 tmp_u16;</div><div class='ctx'> </div><div class='del'>-	switch (phy-&gt;type) {</div><div class='del'>-	case B43_PHYTYPE_B:{</div><div class='del'>-			if (phy-&gt;radio_ver != 0x2050)</div><div class='del'>-				return;</div><div class='del'>-			if (!</div><div class='del'>-			    (dev-&gt;dev-&gt;bus-&gt;sprom.</div><div class='del'>-			     boardflags_lo &amp; B43_BFL_RSSI))</div><div class='del'>-				return;</div><div class='del'>-</div><div class='del'>-			if (phy-&gt;radio_rev &gt;= 6) {</div><div class='del'>-				threshold =</div><div class='del'>-				    (phy-&gt;nrssi[1] - phy-&gt;nrssi[0]) * 32;</div><div class='del'>-				threshold += 20 * (phy-&gt;nrssi[0] + 1);</div><div class='del'>-				threshold /= 40;</div><div class='del'>-			} else</div><div class='del'>-				threshold = phy-&gt;nrssi[1] - 5;</div><div class='del'>-</div><div class='del'>-			threshold = clamp_val(threshold, 0, 0x3E);</div><div class='del'>-			b43_phy_read(dev, 0x0020);	/* dummy read */</div><div class='del'>-			b43_phy_write(dev, 0x0020,</div><div class='del'>-				      (((u16) threshold) &lt;&lt; 8) | 0x001C);</div><div class='del'>-</div><div class='del'>-			if (phy-&gt;radio_rev &gt;= 6) {</div><div class='del'>-				b43_phy_write(dev, 0x0087, 0x0E0D);</div><div class='del'>-				b43_phy_write(dev, 0x0086, 0x0C0B);</div><div class='del'>-				b43_phy_write(dev, 0x0085, 0x0A09);</div><div class='del'>-				b43_phy_write(dev, 0x0084, 0x0808);</div><div class='del'>-				b43_phy_write(dev, 0x0083, 0x0808);</div><div class='del'>-				b43_phy_write(dev, 0x0082, 0x0604);</div><div class='del'>-				b43_phy_write(dev, 0x0081, 0x0302);</div><div class='del'>-				b43_phy_write(dev, 0x0080, 0x0100);</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='add'>+	B43_WARN_ON(phy-&gt;type != B43_PHYTYPE_G);</div><div class='add'>+</div><div class='add'>+	if (!phy-&gt;gmode ||</div><div class='add'>+	    !(dev-&gt;dev-&gt;bus-&gt;sprom.boardflags_lo &amp; B43_BFL_RSSI)) {</div><div class='add'>+		tmp16 = b43_nrssi_hw_read(dev, 0x20);</div><div class='add'>+		if (tmp16 &gt;= 0x20)</div><div class='add'>+			tmp16 -= 0x40;</div><div class='add'>+		if (tmp16 &lt; 3) {</div><div class='add'>+			b43_phy_write(dev, 0x048A,</div><div class='add'>+				      (b43_phy_read(dev, 0x048A)</div><div class='add'>+				       &amp; 0xF000) | 0x09EB);</div><div class='add'>+		} else {</div><div class='add'>+			b43_phy_write(dev, 0x048A,</div><div class='add'>+				      (b43_phy_read(dev, 0x048A)</div><div class='add'>+				       &amp; 0xF000) | 0x0AED);</div><div class='ctx'> 		}</div><div class='del'>-	case B43_PHYTYPE_G:</div><div class='del'>-		if (!phy-&gt;gmode ||</div><div class='del'>-		    !(dev-&gt;dev-&gt;bus-&gt;sprom.boardflags_lo &amp; B43_BFL_RSSI)) {</div><div class='del'>-			tmp16 = b43_nrssi_hw_read(dev, 0x20);</div><div class='del'>-			if (tmp16 &gt;= 0x20)</div><div class='del'>-				tmp16 -= 0x40;</div><div class='del'>-			if (tmp16 &lt; 3) {</div><div class='del'>-				b43_phy_write(dev, 0x048A,</div><div class='del'>-					      (b43_phy_read(dev, 0x048A)</div><div class='del'>-					       &amp; 0xF000) | 0x09EB);</div><div class='del'>-			} else {</div><div class='del'>-				b43_phy_write(dev, 0x048A,</div><div class='del'>-					      (b43_phy_read(dev, 0x048A)</div><div class='del'>-					       &amp; 0xF000) | 0x0AED);</div><div class='del'>-			}</div><div class='add'>+	} else {</div><div class='add'>+		if (gphy-&gt;interfmode == B43_INTERFMODE_NONWLAN) {</div><div class='add'>+			a = 0xE;</div><div class='add'>+			b = 0xA;</div><div class='add'>+		} else if (!gphy-&gt;aci_wlan_automatic &amp;&amp; gphy-&gt;aci_enable) {</div><div class='add'>+			a = 0x13;</div><div class='add'>+			b = 0x12;</div><div class='ctx'> 		} else {</div><div class='del'>-			if (phy-&gt;interfmode == B43_INTERFMODE_NONWLAN) {</div><div class='del'>-				a = 0xE;</div><div class='del'>-				b = 0xA;</div><div class='del'>-			} else if (!phy-&gt;aci_wlan_automatic &amp;&amp; phy-&gt;aci_enable) {</div><div class='del'>-				a = 0x13;</div><div class='del'>-				b = 0x12;</div><div class='del'>-			} else {</div><div class='del'>-				a = 0xE;</div><div class='del'>-				b = 0x11;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			a = a * (phy-&gt;nrssi[1] - phy-&gt;nrssi[0]);</div><div class='del'>-			a += (phy-&gt;nrssi[0] &lt;&lt; 6);</div><div class='del'>-			if (a &lt; 32)</div><div class='del'>-				a += 31;</div><div class='del'>-			else</div><div class='del'>-				a += 32;</div><div class='del'>-			a = a &gt;&gt; 6;</div><div class='del'>-			a = clamp_val(a, -31, 31);</div><div class='del'>-</div><div class='del'>-			b = b * (phy-&gt;nrssi[1] - phy-&gt;nrssi[0]);</div><div class='del'>-			b += (phy-&gt;nrssi[0] &lt;&lt; 6);</div><div class='del'>-			if (b &lt; 32)</div><div class='del'>-				b += 31;</div><div class='del'>-			else</div><div class='del'>-				b += 32;</div><div class='del'>-			b = b &gt;&gt; 6;</div><div class='del'>-			b = clamp_val(b, -31, 31);</div><div class='del'>-</div><div class='del'>-			tmp_u16 = b43_phy_read(dev, 0x048A) &amp; 0xF000;</div><div class='del'>-			tmp_u16 |= ((u32) b &amp; 0x0000003F);</div><div class='del'>-			tmp_u16 |= (((u32) a &amp; 0x0000003F) &lt;&lt; 6);</div><div class='del'>-			b43_phy_write(dev, 0x048A, tmp_u16);</div><div class='add'>+			a = 0xE;</div><div class='add'>+			b = 0x11;</div><div class='ctx'> 		}</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		B43_WARN_ON(1);</div><div class='add'>+</div><div class='add'>+		a = a * (gphy-&gt;nrssi[1] - gphy-&gt;nrssi[0]);</div><div class='add'>+		a += (gphy-&gt;nrssi[0] &lt;&lt; 6);</div><div class='add'>+		if (a &lt; 32)</div><div class='add'>+			a += 31;</div><div class='add'>+		else</div><div class='add'>+			a += 32;</div><div class='add'>+		a = a &gt;&gt; 6;</div><div class='add'>+		a = clamp_val(a, -31, 31);</div><div class='add'>+</div><div class='add'>+		b = b * (gphy-&gt;nrssi[1] - gphy-&gt;nrssi[0]);</div><div class='add'>+		b += (gphy-&gt;nrssi[0] &lt;&lt; 6);</div><div class='add'>+		if (b &lt; 32)</div><div class='add'>+			b += 31;</div><div class='add'>+		else</div><div class='add'>+			b += 32;</div><div class='add'>+		b = b &gt;&gt; 6;</div><div class='add'>+		b = clamp_val(b, -31, 31);</div><div class='add'>+</div><div class='add'>+		tmp_u16 = b43_phy_read(dev, 0x048A) &amp; 0xF000;</div><div class='add'>+		tmp_u16 |= ((u32) b &amp; 0x0000003F);</div><div class='add'>+		tmp_u16 |= (((u32) a &amp; 0x0000003F) &lt;&lt; 6);</div><div class='add'>+		b43_phy_write(dev, 0x048A, tmp_u16);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2860,9 +893,10 @@ static void</div><div class='ctx'> b43_radio_interference_mitigation_enable(struct b43_wldev *dev, int mode)</div><div class='ctx'> {</div><div class='ctx'> 	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='add'>+	struct b43_phy_g *gphy = phy-&gt;g;</div><div class='ctx'> 	u16 tmp, flipped;</div><div class='ctx'> 	size_t stackidx = 0;</div><div class='del'>-	u32 *stack = phy-&gt;interfstack;</div><div class='add'>+	u32 *stack = gphy-&gt;interfstack;</div><div class='ctx'> </div><div class='ctx'> 	switch (mode) {</div><div class='ctx'> 	case B43_INTERFMODE_NONWLAN:</div><div class='hunk'>@@ -2928,7 +962,7 @@ b43_radio_interference_mitigation_enable(struct b43_wldev *dev, int mode)</div><div class='ctx'> 		if (b43_phy_read(dev, 0x0033) &amp; 0x0800)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		phy-&gt;aci_enable = 1;</div><div class='add'>+		gphy-&gt;aci_enable = 1;</div><div class='ctx'> </div><div class='ctx'> 		phy_stacksave(B43_PHY_RADIO_BITFIELD);</div><div class='ctx'> 		phy_stacksave(B43_PHY_G_CRS);</div><div class='hunk'>@@ -3064,7 +1098,8 @@ static void</div><div class='ctx'> b43_radio_interference_mitigation_disable(struct b43_wldev *dev, int mode)</div><div class='ctx'> {</div><div class='ctx'> 	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='del'>-	u32 *stack = phy-&gt;interfstack;</div><div class='add'>+	struct b43_phy_g *gphy = phy-&gt;g;</div><div class='add'>+	u32 *stack = gphy-&gt;interfstack;</div><div class='ctx'> </div><div class='ctx'> 	switch (mode) {</div><div class='ctx'> 	case B43_INTERFMODE_NONWLAN:</div><div class='hunk'>@@ -3103,7 +1138,7 @@ b43_radio_interference_mitigation_disable(struct b43_wldev *dev, int mode)</div><div class='ctx'> 		if (!(b43_phy_read(dev, 0x0033) &amp; 0x0800))</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		phy-&gt;aci_enable = 0;</div><div class='add'>+		gphy-&gt;aci_enable = 0;</div><div class='ctx'> </div><div class='ctx'> 		phy_stackrestore(B43_PHY_RADIO_BITFIELD);</div><div class='ctx'> 		phy_stackrestore(B43_PHY_G_CRS);</div><div class='hunk'>@@ -3153,47 +1188,6 @@ b43_radio_interference_mitigation_disable(struct b43_wldev *dev, int mode)</div><div class='ctx'> #undef ofdmtab_stacksave</div><div class='ctx'> #undef ofdmtab_stackrestore</div><div class='ctx'> </div><div class='del'>-int b43_radio_set_interference_mitigation(struct b43_wldev *dev, int mode)</div><div class='del'>-{</div><div class='del'>-	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='del'>-	int currentmode;</div><div class='del'>-</div><div class='del'>-	if ((phy-&gt;type != B43_PHYTYPE_G) || (phy-&gt;rev == 0) || (!phy-&gt;gmode))</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	phy-&gt;aci_wlan_automatic = 0;</div><div class='del'>-	switch (mode) {</div><div class='del'>-	case B43_INTERFMODE_AUTOWLAN:</div><div class='del'>-		phy-&gt;aci_wlan_automatic = 1;</div><div class='del'>-		if (phy-&gt;aci_enable)</div><div class='del'>-			mode = B43_INTERFMODE_MANUALWLAN;</div><div class='del'>-		else</div><div class='del'>-			mode = B43_INTERFMODE_NONE;</div><div class='del'>-		break;</div><div class='del'>-	case B43_INTERFMODE_NONE:</div><div class='del'>-	case B43_INTERFMODE_NONWLAN:</div><div class='del'>-	case B43_INTERFMODE_MANUALWLAN:</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	currentmode = phy-&gt;interfmode;</div><div class='del'>-	if (currentmode == mode)</div><div class='del'>-		return 0;</div><div class='del'>-	if (currentmode != B43_INTERFMODE_NONE)</div><div class='del'>-		b43_radio_interference_mitigation_disable(dev, currentmode);</div><div class='del'>-</div><div class='del'>-	if (mode == B43_INTERFMODE_NONE) {</div><div class='del'>-		phy-&gt;aci_enable = 0;</div><div class='del'>-		phy-&gt;aci_hw_rssi = 0;</div><div class='del'>-	} else</div><div class='del'>-		b43_radio_interference_mitigation_enable(dev, mode);</div><div class='del'>-	phy-&gt;interfmode = mode;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static u16 b43_radio_core_calibration_value(struct b43_wldev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	u16 reg, index, ret;</div><div class='hunk'>@@ -3219,13 +1213,14 @@ static u16 radio2050_rfover_val(struct b43_wldev *dev,</div><div class='ctx'> 				u16 phy_register, unsigned int lpd)</div><div class='ctx'> {</div><div class='ctx'> 	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='add'>+	struct b43_phy_g *gphy = phy-&gt;g;</div><div class='ctx'> 	struct ssb_sprom *sprom = &amp;(dev-&gt;dev-&gt;bus-&gt;sprom);</div><div class='ctx'> </div><div class='ctx'> 	if (!phy-&gt;gmode)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (has_loopback_gain(phy)) {</div><div class='del'>-		int max_lb_gain = phy-&gt;max_lb_gain;</div><div class='add'>+		int max_lb_gain = gphy-&gt;max_lb_gain;</div><div class='ctx'> 		u16 extlna;</div><div class='ctx'> 		u16 i;</div><div class='ctx'> </div><div class='hunk'>@@ -3606,301 +1601,1682 @@ u16 b43_radio_init2050(struct b43_wldev *dev)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void b43_radio_init2060(struct b43_wldev *dev)</div><div class='add'>+static void b43_phy_initb5(struct b43_wldev *dev)</div><div class='ctx'> {</div><div class='del'>-	int err;</div><div class='add'>+	struct ssb_bus *bus = dev-&gt;dev-&gt;bus;</div><div class='add'>+	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='add'>+	struct b43_phy_g *gphy = phy-&gt;g;</div><div class='add'>+	u16 offset, value;</div><div class='add'>+	u8 old_channel;</div><div class='ctx'> </div><div class='del'>-	b43_radio_write16(dev, 0x0004, 0x00C0);</div><div class='del'>-	b43_radio_write16(dev, 0x0005, 0x0008);</div><div class='del'>-	b43_radio_write16(dev, 0x0009, 0x0040);</div><div class='del'>-	b43_radio_write16(dev, 0x0005, 0x00AA);</div><div class='del'>-	b43_radio_write16(dev, 0x0032, 0x008F);</div><div class='del'>-	b43_radio_write16(dev, 0x0006, 0x008F);</div><div class='del'>-	b43_radio_write16(dev, 0x0034, 0x008F);</div><div class='del'>-	b43_radio_write16(dev, 0x002C, 0x0007);</div><div class='del'>-	b43_radio_write16(dev, 0x0082, 0x0080);</div><div class='del'>-	b43_radio_write16(dev, 0x0080, 0x0000);</div><div class='del'>-	b43_radio_write16(dev, 0x003F, 0x00DA);</div><div class='del'>-	b43_radio_write16(dev, 0x0005, b43_radio_read16(dev, 0x0005) &amp; ~0x0008);</div><div class='del'>-	b43_radio_write16(dev, 0x0081, b43_radio_read16(dev, 0x0081) &amp; ~0x0010);</div><div class='del'>-	b43_radio_write16(dev, 0x0081, b43_radio_read16(dev, 0x0081) &amp; ~0x0020);</div><div class='del'>-	b43_radio_write16(dev, 0x0081, b43_radio_read16(dev, 0x0081) &amp; ~0x0020);</div><div class='del'>-	msleep(1);		/* delay 400usec */</div><div class='del'>-</div><div class='del'>-	b43_radio_write16(dev, 0x0081,</div><div class='del'>-			  (b43_radio_read16(dev, 0x0081) &amp; ~0x0020) | 0x0010);</div><div class='del'>-	msleep(1);		/* delay 400usec */</div><div class='del'>-</div><div class='del'>-	b43_radio_write16(dev, 0x0005,</div><div class='del'>-			  (b43_radio_read16(dev, 0x0005) &amp; ~0x0008) | 0x0008);</div><div class='del'>-	b43_radio_write16(dev, 0x0085, b43_radio_read16(dev, 0x0085) &amp; ~0x0010);</div><div class='del'>-	b43_radio_write16(dev, 0x0005, b43_radio_read16(dev, 0x0005) &amp; ~0x0008);</div><div class='del'>-	b43_radio_write16(dev, 0x0081, b43_radio_read16(dev, 0x0081) &amp; ~0x0040);</div><div class='del'>-	b43_radio_write16(dev, 0x0081,</div><div class='del'>-			  (b43_radio_read16(dev, 0x0081) &amp; ~0x0040) | 0x0040);</div><div class='del'>-	b43_radio_write16(dev, 0x0005,</div><div class='del'>-			  (b43_radio_read16(dev, 0x0081) &amp; ~0x0008) | 0x0008);</div><div class='del'>-	b43_phy_write(dev, 0x0063, 0xDDC6);</div><div class='del'>-	b43_phy_write(dev, 0x0069, 0x07BE);</div><div class='del'>-	b43_phy_write(dev, 0x006A, 0x0000);</div><div class='del'>-</div><div class='del'>-	err = b43_radio_selectchannel(dev, B43_DEFAULT_CHANNEL_A, 0);</div><div class='del'>-	B43_WARN_ON(err);</div><div class='add'>+	if (phy-&gt;analog == 1) {</div><div class='add'>+		b43_radio_write16(dev, 0x007A, b43_radio_read16(dev, 0x007A)</div><div class='add'>+				  | 0x0050);</div><div class='add'>+	}</div><div class='add'>+	if ((bus-&gt;boardinfo.vendor != SSB_BOARDVENDOR_BCM) &amp;&amp;</div><div class='add'>+	    (bus-&gt;boardinfo.type != SSB_BOARD_BU4306)) {</div><div class='add'>+		value = 0x2120;</div><div class='add'>+		for (offset = 0x00A8; offset &lt; 0x00C7; offset++) {</div><div class='add'>+			b43_phy_write(dev, offset, value);</div><div class='add'>+			value += 0x202;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	b43_phy_write(dev, 0x0035, (b43_phy_read(dev, 0x0035) &amp; 0xF0FF)</div><div class='add'>+		      | 0x0700);</div><div class='add'>+	if (phy-&gt;radio_ver == 0x2050)</div><div class='add'>+		b43_phy_write(dev, 0x0038, 0x0667);</div><div class='ctx'> </div><div class='del'>-	msleep(1);</div><div class='add'>+	if (phy-&gt;gmode || phy-&gt;rev &gt;= 2) {</div><div class='add'>+		if (phy-&gt;radio_ver == 0x2050) {</div><div class='add'>+			b43_radio_write16(dev, 0x007A,</div><div class='add'>+					  b43_radio_read16(dev, 0x007A)</div><div class='add'>+					  | 0x0020);</div><div class='add'>+			b43_radio_write16(dev, 0x0051,</div><div class='add'>+					  b43_radio_read16(dev, 0x0051)</div><div class='add'>+					  | 0x0004);</div><div class='add'>+		}</div><div class='add'>+		b43_write16(dev, B43_MMIO_PHY_RADIO, 0x0000);</div><div class='add'>+</div><div class='add'>+		b43_phy_write(dev, 0x0802, b43_phy_read(dev, 0x0802) | 0x0100);</div><div class='add'>+		b43_phy_write(dev, 0x042B, b43_phy_read(dev, 0x042B) | 0x2000);</div><div class='add'>+</div><div class='add'>+		b43_phy_write(dev, 0x001C, 0x186A);</div><div class='add'>+</div><div class='add'>+		b43_phy_write(dev, 0x0013,</div><div class='add'>+			      (b43_phy_read(dev, 0x0013) &amp; 0x00FF) | 0x1900);</div><div class='add'>+		b43_phy_write(dev, 0x0035,</div><div class='add'>+			      (b43_phy_read(dev, 0x0035) &amp; 0xFFC0) | 0x0064);</div><div class='add'>+		b43_phy_write(dev, 0x005D,</div><div class='add'>+			      (b43_phy_read(dev, 0x005D) &amp; 0xFF80) | 0x000A);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;bad_frames_preempt) {</div><div class='add'>+		b43_phy_write(dev, B43_PHY_RADIO_BITFIELD,</div><div class='add'>+			      b43_phy_read(dev,</div><div class='add'>+					   B43_PHY_RADIO_BITFIELD) | (1 &lt;&lt; 11));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (phy-&gt;analog == 1) {</div><div class='add'>+		b43_phy_write(dev, 0x0026, 0xCE00);</div><div class='add'>+		b43_phy_write(dev, 0x0021, 0x3763);</div><div class='add'>+		b43_phy_write(dev, 0x0022, 0x1BC3);</div><div class='add'>+		b43_phy_write(dev, 0x0023, 0x06F9);</div><div class='add'>+		b43_phy_write(dev, 0x0024, 0x037E);</div><div class='add'>+	} else</div><div class='add'>+		b43_phy_write(dev, 0x0026, 0xCC00);</div><div class='add'>+	b43_phy_write(dev, 0x0030, 0x00C6);</div><div class='add'>+	b43_write16(dev, 0x03EC, 0x3F22);</div><div class='add'>+</div><div class='add'>+	if (phy-&gt;analog == 1)</div><div class='add'>+		b43_phy_write(dev, 0x0020, 0x3E1C);</div><div class='add'>+	else</div><div class='add'>+		b43_phy_write(dev, 0x0020, 0x301C);</div><div class='add'>+</div><div class='add'>+	if (phy-&gt;analog == 0)</div><div class='add'>+		b43_write16(dev, 0x03E4, 0x3000);</div><div class='add'>+</div><div class='add'>+	old_channel = phy-&gt;channel;</div><div class='add'>+	/* Force to channel 7, even if not supported. */</div><div class='add'>+	b43_gphy_channel_switch(dev, 7, 0);</div><div class='add'>+</div><div class='add'>+	if (phy-&gt;radio_ver != 0x2050) {</div><div class='add'>+		b43_radio_write16(dev, 0x0075, 0x0080);</div><div class='add'>+		b43_radio_write16(dev, 0x0079, 0x0081);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	b43_radio_write16(dev, 0x0050, 0x0020);</div><div class='add'>+	b43_radio_write16(dev, 0x0050, 0x0023);</div><div class='add'>+</div><div class='add'>+	if (phy-&gt;radio_ver == 0x2050) {</div><div class='add'>+		b43_radio_write16(dev, 0x0050, 0x0020);</div><div class='add'>+		b43_radio_write16(dev, 0x005A, 0x0070);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	b43_radio_write16(dev, 0x005B, 0x007B);</div><div class='add'>+	b43_radio_write16(dev, 0x005C, 0x00B0);</div><div class='add'>+</div><div class='add'>+	b43_radio_write16(dev, 0x007A, b43_radio_read16(dev, 0x007A) | 0x0007);</div><div class='add'>+</div><div class='add'>+	b43_gphy_channel_switch(dev, old_channel, 0);</div><div class='add'>+</div><div class='add'>+	b43_phy_write(dev, 0x0014, 0x0080);</div><div class='add'>+	b43_phy_write(dev, 0x0032, 0x00CA);</div><div class='add'>+	b43_phy_write(dev, 0x002A, 0x88A3);</div><div class='add'>+</div><div class='add'>+	b43_set_txpower_g(dev, &amp;gphy-&gt;bbatt, &amp;gphy-&gt;rfatt, gphy-&gt;tx_control);</div><div class='add'>+</div><div class='add'>+	if (phy-&gt;radio_ver == 0x2050)</div><div class='add'>+		b43_radio_write16(dev, 0x005D, 0x000D);</div><div class='add'>+</div><div class='add'>+	b43_write16(dev, 0x03E4, (b43_read16(dev, 0x03E4) &amp; 0xFFC0) | 0x0004);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline u16 freq_r3A_value(u16 frequency)</div><div class='add'>+static void b43_phy_initb6(struct b43_wldev *dev)</div><div class='ctx'> {</div><div class='del'>-	u16 value;</div><div class='add'>+	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='add'>+	struct b43_phy_g *gphy = phy-&gt;g;</div><div class='add'>+	u16 offset, val;</div><div class='add'>+	u8 old_channel;</div><div class='add'>+</div><div class='add'>+	b43_phy_write(dev, 0x003E, 0x817A);</div><div class='add'>+	b43_radio_write16(dev, 0x007A,</div><div class='add'>+			  (b43_radio_read16(dev, 0x007A) | 0x0058));</div><div class='add'>+	if (phy-&gt;radio_rev == 4 || phy-&gt;radio_rev == 5) {</div><div class='add'>+		b43_radio_write16(dev, 0x51, 0x37);</div><div class='add'>+		b43_radio_write16(dev, 0x52, 0x70);</div><div class='add'>+		b43_radio_write16(dev, 0x53, 0xB3);</div><div class='add'>+		b43_radio_write16(dev, 0x54, 0x9B);</div><div class='add'>+		b43_radio_write16(dev, 0x5A, 0x88);</div><div class='add'>+		b43_radio_write16(dev, 0x5B, 0x88);</div><div class='add'>+		b43_radio_write16(dev, 0x5D, 0x88);</div><div class='add'>+		b43_radio_write16(dev, 0x5E, 0x88);</div><div class='add'>+		b43_radio_write16(dev, 0x7D, 0x88);</div><div class='add'>+		b43_hf_write(dev, b43_hf_read(dev)</div><div class='add'>+			     | B43_HF_TSSIRPSMW);</div><div class='add'>+	}</div><div class='add'>+	B43_WARN_ON(phy-&gt;radio_rev == 6 || phy-&gt;radio_rev == 7);	/* We had code for these revs here... */</div><div class='add'>+	if (phy-&gt;radio_rev == 8) {</div><div class='add'>+		b43_radio_write16(dev, 0x51, 0);</div><div class='add'>+		b43_radio_write16(dev, 0x52, 0x40);</div><div class='add'>+		b43_radio_write16(dev, 0x53, 0xB7);</div><div class='add'>+		b43_radio_write16(dev, 0x54, 0x98);</div><div class='add'>+		b43_radio_write16(dev, 0x5A, 0x88);</div><div class='add'>+		b43_radio_write16(dev, 0x5B, 0x6B);</div><div class='add'>+		b43_radio_write16(dev, 0x5C, 0x0F);</div><div class='add'>+		if (dev-&gt;dev-&gt;bus-&gt;sprom.boardflags_lo &amp; B43_BFL_ALTIQ) {</div><div class='add'>+			b43_radio_write16(dev, 0x5D, 0xFA);</div><div class='add'>+			b43_radio_write16(dev, 0x5E, 0xD8);</div><div class='add'>+		} else {</div><div class='add'>+			b43_radio_write16(dev, 0x5D, 0xF5);</div><div class='add'>+			b43_radio_write16(dev, 0x5E, 0xB8);</div><div class='add'>+		}</div><div class='add'>+		b43_radio_write16(dev, 0x0073, 0x0003);</div><div class='add'>+		b43_radio_write16(dev, 0x007D, 0x00A8);</div><div class='add'>+		b43_radio_write16(dev, 0x007C, 0x0001);</div><div class='add'>+		b43_radio_write16(dev, 0x007E, 0x0008);</div><div class='add'>+	}</div><div class='add'>+	val = 0x1E1F;</div><div class='add'>+	for (offset = 0x0088; offset &lt; 0x0098; offset++) {</div><div class='add'>+		b43_phy_write(dev, offset, val);</div><div class='add'>+		val -= 0x0202;</div><div class='add'>+	}</div><div class='add'>+	val = 0x3E3F;</div><div class='add'>+	for (offset = 0x0098; offset &lt; 0x00A8; offset++) {</div><div class='add'>+		b43_phy_write(dev, offset, val);</div><div class='add'>+		val -= 0x0202;</div><div class='add'>+	}</div><div class='add'>+	val = 0x2120;</div><div class='add'>+	for (offset = 0x00A8; offset &lt; 0x00C8; offset++) {</div><div class='add'>+		b43_phy_write(dev, offset, (val &amp; 0x3F3F));</div><div class='add'>+		val += 0x0202;</div><div class='add'>+	}</div><div class='add'>+	if (phy-&gt;type == B43_PHYTYPE_G) {</div><div class='add'>+		b43_radio_write16(dev, 0x007A,</div><div class='add'>+				  b43_radio_read16(dev, 0x007A) | 0x0020);</div><div class='add'>+		b43_radio_write16(dev, 0x0051,</div><div class='add'>+				  b43_radio_read16(dev, 0x0051) | 0x0004);</div><div class='add'>+		b43_phy_write(dev, 0x0802, b43_phy_read(dev, 0x0802) | 0x0100);</div><div class='add'>+		b43_phy_write(dev, 0x042B, b43_phy_read(dev, 0x042B) | 0x2000);</div><div class='add'>+		b43_phy_write(dev, 0x5B, 0);</div><div class='add'>+		b43_phy_write(dev, 0x5C, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	old_channel = phy-&gt;channel;</div><div class='add'>+	if (old_channel &gt;= 8)</div><div class='add'>+		b43_gphy_channel_switch(dev, 1, 0);</div><div class='add'>+	else</div><div class='add'>+		b43_gphy_channel_switch(dev, 13, 0);</div><div class='add'>+</div><div class='add'>+	b43_radio_write16(dev, 0x0050, 0x0020);</div><div class='add'>+	b43_radio_write16(dev, 0x0050, 0x0023);</div><div class='add'>+	udelay(40);</div><div class='add'>+	if (phy-&gt;radio_rev &lt; 6 || phy-&gt;radio_rev == 8) {</div><div class='add'>+		b43_radio_write16(dev, 0x7C, (b43_radio_read16(dev, 0x7C)</div><div class='add'>+					      | 0x0002));</div><div class='add'>+		b43_radio_write16(dev, 0x50, 0x20);</div><div class='add'>+	}</div><div class='add'>+	if (phy-&gt;radio_rev &lt;= 2) {</div><div class='add'>+		b43_radio_write16(dev, 0x7C, 0x20);</div><div class='add'>+		b43_radio_write16(dev, 0x5A, 0x70);</div><div class='add'>+		b43_radio_write16(dev, 0x5B, 0x7B);</div><div class='add'>+		b43_radio_write16(dev, 0x5C, 0xB0);</div><div class='add'>+	}</div><div class='add'>+	b43_radio_write16(dev, 0x007A,</div><div class='add'>+			  (b43_radio_read16(dev, 0x007A) &amp; 0x00F8) | 0x0007);</div><div class='add'>+</div><div class='add'>+	b43_gphy_channel_switch(dev, old_channel, 0);</div><div class='ctx'> </div><div class='del'>-	if (frequency &lt; 5091)</div><div class='del'>-		value = 0x0040;</div><div class='del'>-	else if (frequency &lt; 5321)</div><div class='del'>-		value = 0x0000;</div><div class='del'>-	else if (frequency &lt; 5806)</div><div class='del'>-		value = 0x0080;</div><div class='add'>+	b43_phy_write(dev, 0x0014, 0x0200);</div><div class='add'>+	if (phy-&gt;radio_rev &gt;= 6)</div><div class='add'>+		b43_phy_write(dev, 0x2A, 0x88C2);</div><div class='ctx'> 	else</div><div class='del'>-		value = 0x0040;</div><div class='add'>+		b43_phy_write(dev, 0x2A, 0x8AC0);</div><div class='add'>+	b43_phy_write(dev, 0x0038, 0x0668);</div><div class='add'>+	b43_set_txpower_g(dev, &amp;gphy-&gt;bbatt, &amp;gphy-&gt;rfatt, gphy-&gt;tx_control);</div><div class='add'>+	if (phy-&gt;radio_rev &lt;= 5) {</div><div class='add'>+		b43_phy_write(dev, 0x5D, (b43_phy_read(dev, 0x5D)</div><div class='add'>+					  &amp; 0xFF80) | 0x0003);</div><div class='add'>+	}</div><div class='add'>+	if (phy-&gt;radio_rev &lt;= 2)</div><div class='add'>+		b43_radio_write16(dev, 0x005D, 0x000D);</div><div class='ctx'> </div><div class='del'>-	return value;</div><div class='add'>+	if (phy-&gt;analog == 4) {</div><div class='add'>+		b43_write16(dev, 0x3E4, 9);</div><div class='add'>+		b43_phy_write(dev, 0x61, b43_phy_read(dev, 0x61)</div><div class='add'>+			      &amp; 0x0FFF);</div><div class='add'>+	} else {</div><div class='add'>+		b43_phy_write(dev, 0x0002, (b43_phy_read(dev, 0x0002) &amp; 0xFFC0)</div><div class='add'>+			      | 0x0004);</div><div class='add'>+	}</div><div class='add'>+	if (phy-&gt;type == B43_PHYTYPE_B)</div><div class='add'>+		B43_WARN_ON(1);</div><div class='add'>+	else if (phy-&gt;type == B43_PHYTYPE_G)</div><div class='add'>+		b43_write16(dev, 0x03E6, 0x0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void b43_radio_set_tx_iq(struct b43_wldev *dev)</div><div class='add'>+static void b43_calc_loopback_gain(struct b43_wldev *dev)</div><div class='ctx'> {</div><div class='del'>-	static const u8 data_high[5] = { 0x00, 0x40, 0x80, 0x90, 0xD0 };</div><div class='del'>-	static const u8 data_low[5] = { 0x00, 0x01, 0x05, 0x06, 0x0A };</div><div class='del'>-	u16 tmp = b43_radio_read16(dev, 0x001E);</div><div class='del'>-	int i, j;</div><div class='add'>+	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='add'>+	struct b43_phy_g *gphy = phy-&gt;g;</div><div class='add'>+	u16 backup_phy[16] = { 0 };</div><div class='add'>+	u16 backup_radio[3];</div><div class='add'>+	u16 backup_bband;</div><div class='add'>+	u16 i, j, loop_i_max;</div><div class='add'>+	u16 trsw_rx;</div><div class='add'>+	u16 loop1_outer_done, loop1_inner_done;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; 5; i++) {</div><div class='del'>-		for (j = 0; j &lt; 5; j++) {</div><div class='del'>-			if (tmp == (data_high[i] &lt;&lt; 4 | data_low[j])) {</div><div class='del'>-				b43_phy_write(dev, 0x0069,</div><div class='del'>-					      (i - j) &lt;&lt; 8 | 0x00C0);</div><div class='del'>-				return;</div><div class='add'>+	backup_phy[0] = b43_phy_read(dev, B43_PHY_CRS0);</div><div class='add'>+	backup_phy[1] = b43_phy_read(dev, B43_PHY_CCKBBANDCFG);</div><div class='add'>+	backup_phy[2] = b43_phy_read(dev, B43_PHY_RFOVER);</div><div class='add'>+	backup_phy[3] = b43_phy_read(dev, B43_PHY_RFOVERVAL);</div><div class='add'>+	if (phy-&gt;rev != 1) {	/* Not in specs, but needed to prevent PPC machine check */</div><div class='add'>+		backup_phy[4] = b43_phy_read(dev, B43_PHY_ANALOGOVER);</div><div class='add'>+		backup_phy[5] = b43_phy_read(dev, B43_PHY_ANALOGOVERVAL);</div><div class='add'>+	}</div><div class='add'>+	backup_phy[6] = b43_phy_read(dev, B43_PHY_CCK(0x5A));</div><div class='add'>+	backup_phy[7] = b43_phy_read(dev, B43_PHY_CCK(0x59));</div><div class='add'>+	backup_phy[8] = b43_phy_read(dev, B43_PHY_CCK(0x58));</div><div class='add'>+	backup_phy[9] = b43_phy_read(dev, B43_PHY_CCK(0x0A));</div><div class='add'>+	backup_phy[10] = b43_phy_read(dev, B43_PHY_CCK(0x03));</div><div class='add'>+	backup_phy[11] = b43_phy_read(dev, B43_PHY_LO_MASK);</div><div class='add'>+	backup_phy[12] = b43_phy_read(dev, B43_PHY_LO_CTL);</div><div class='add'>+	backup_phy[13] = b43_phy_read(dev, B43_PHY_CCK(0x2B));</div><div class='add'>+	backup_phy[14] = b43_phy_read(dev, B43_PHY_PGACTL);</div><div class='add'>+	backup_phy[15] = b43_phy_read(dev, B43_PHY_LO_LEAKAGE);</div><div class='add'>+	backup_bband = gphy-&gt;bbatt.att;</div><div class='add'>+	backup_radio[0] = b43_radio_read16(dev, 0x52);</div><div class='add'>+	backup_radio[1] = b43_radio_read16(dev, 0x43);</div><div class='add'>+	backup_radio[2] = b43_radio_read16(dev, 0x7A);</div><div class='add'>+</div><div class='add'>+	b43_phy_write(dev, B43_PHY_CRS0,</div><div class='add'>+		      b43_phy_read(dev, B43_PHY_CRS0) &amp; 0x3FFF);</div><div class='add'>+	b43_phy_write(dev, B43_PHY_CCKBBANDCFG,</div><div class='add'>+		      b43_phy_read(dev, B43_PHY_CCKBBANDCFG) | 0x8000);</div><div class='add'>+	b43_phy_write(dev, B43_PHY_RFOVER,</div><div class='add'>+		      b43_phy_read(dev, B43_PHY_RFOVER) | 0x0002);</div><div class='add'>+	b43_phy_write(dev, B43_PHY_RFOVERVAL,</div><div class='add'>+		      b43_phy_read(dev, B43_PHY_RFOVERVAL) &amp; 0xFFFD);</div><div class='add'>+	b43_phy_write(dev, B43_PHY_RFOVER,</div><div class='add'>+		      b43_phy_read(dev, B43_PHY_RFOVER) | 0x0001);</div><div class='add'>+	b43_phy_write(dev, B43_PHY_RFOVERVAL,</div><div class='add'>+		      b43_phy_read(dev, B43_PHY_RFOVERVAL) &amp; 0xFFFE);</div><div class='add'>+	if (phy-&gt;rev != 1) {	/* Not in specs, but needed to prevent PPC machine check */</div><div class='add'>+		b43_phy_write(dev, B43_PHY_ANALOGOVER,</div><div class='add'>+			      b43_phy_read(dev, B43_PHY_ANALOGOVER) | 0x0001);</div><div class='add'>+		b43_phy_write(dev, B43_PHY_ANALOGOVERVAL,</div><div class='add'>+			      b43_phy_read(dev,</div><div class='add'>+					   B43_PHY_ANALOGOVERVAL) &amp; 0xFFFE);</div><div class='add'>+		b43_phy_write(dev, B43_PHY_ANALOGOVER,</div><div class='add'>+			      b43_phy_read(dev, B43_PHY_ANALOGOVER) | 0x0002);</div><div class='add'>+		b43_phy_write(dev, B43_PHY_ANALOGOVERVAL,</div><div class='add'>+			      b43_phy_read(dev,</div><div class='add'>+					   B43_PHY_ANALOGOVERVAL) &amp; 0xFFFD);</div><div class='add'>+	}</div><div class='add'>+	b43_phy_write(dev, B43_PHY_RFOVER,</div><div class='add'>+		      b43_phy_read(dev, B43_PHY_RFOVER) | 0x000C);</div><div class='add'>+	b43_phy_write(dev, B43_PHY_RFOVERVAL,</div><div class='add'>+		      b43_phy_read(dev, B43_PHY_RFOVERVAL) | 0x000C);</div><div class='add'>+	b43_phy_write(dev, B43_PHY_RFOVER,</div><div class='add'>+		      b43_phy_read(dev, B43_PHY_RFOVER) | 0x0030);</div><div class='add'>+	b43_phy_write(dev, B43_PHY_RFOVERVAL,</div><div class='add'>+		      (b43_phy_read(dev, B43_PHY_RFOVERVAL)</div><div class='add'>+		       &amp; 0xFFCF) | 0x10);</div><div class='add'>+</div><div class='add'>+	b43_phy_write(dev, B43_PHY_CCK(0x5A), 0x0780);</div><div class='add'>+	b43_phy_write(dev, B43_PHY_CCK(0x59), 0xC810);</div><div class='add'>+	b43_phy_write(dev, B43_PHY_CCK(0x58), 0x000D);</div><div class='add'>+</div><div class='add'>+	b43_phy_write(dev, B43_PHY_CCK(0x0A),</div><div class='add'>+		      b43_phy_read(dev, B43_PHY_CCK(0x0A)) | 0x2000);</div><div class='add'>+	if (phy-&gt;rev != 1) {	/* Not in specs, but needed to prevent PPC machine check */</div><div class='add'>+		b43_phy_write(dev, B43_PHY_ANALOGOVER,</div><div class='add'>+			      b43_phy_read(dev, B43_PHY_ANALOGOVER) | 0x0004);</div><div class='add'>+		b43_phy_write(dev, B43_PHY_ANALOGOVERVAL,</div><div class='add'>+			      b43_phy_read(dev,</div><div class='add'>+					   B43_PHY_ANALOGOVERVAL) &amp; 0xFFFB);</div><div class='add'>+	}</div><div class='add'>+	b43_phy_write(dev, B43_PHY_CCK(0x03),</div><div class='add'>+		      (b43_phy_read(dev, B43_PHY_CCK(0x03))</div><div class='add'>+		       &amp; 0xFF9F) | 0x40);</div><div class='add'>+</div><div class='add'>+	if (phy-&gt;radio_rev == 8) {</div><div class='add'>+		b43_radio_write16(dev, 0x43, 0x000F);</div><div class='add'>+	} else {</div><div class='add'>+		b43_radio_write16(dev, 0x52, 0);</div><div class='add'>+		b43_radio_write16(dev, 0x43, (b43_radio_read16(dev, 0x43)</div><div class='add'>+					      &amp; 0xFFF0) | 0x9);</div><div class='add'>+	}</div><div class='add'>+	b43_gphy_set_baseband_attenuation(dev, 11);</div><div class='add'>+</div><div class='add'>+	if (phy-&gt;rev &gt;= 3)</div><div class='add'>+		b43_phy_write(dev, B43_PHY_LO_MASK, 0xC020);</div><div class='add'>+	else</div><div class='add'>+		b43_phy_write(dev, B43_PHY_LO_MASK, 0x8020);</div><div class='add'>+	b43_phy_write(dev, B43_PHY_LO_CTL, 0);</div><div class='add'>+</div><div class='add'>+	b43_phy_write(dev, B43_PHY_CCK(0x2B),</div><div class='add'>+		      (b43_phy_read(dev, B43_PHY_CCK(0x2B))</div><div class='add'>+		       &amp; 0xFFC0) | 0x01);</div><div class='add'>+	b43_phy_write(dev, B43_PHY_CCK(0x2B),</div><div class='add'>+		      (b43_phy_read(dev, B43_PHY_CCK(0x2B))</div><div class='add'>+		       &amp; 0xC0FF) | 0x800);</div><div class='add'>+</div><div class='add'>+	b43_phy_write(dev, B43_PHY_RFOVER,</div><div class='add'>+		      b43_phy_read(dev, B43_PHY_RFOVER) | 0x0100);</div><div class='add'>+	b43_phy_write(dev, B43_PHY_RFOVERVAL,</div><div class='add'>+		      b43_phy_read(dev, B43_PHY_RFOVERVAL) &amp; 0xCFFF);</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;dev-&gt;bus-&gt;sprom.boardflags_lo &amp; B43_BFL_EXTLNA) {</div><div class='add'>+		if (phy-&gt;rev &gt;= 7) {</div><div class='add'>+			b43_phy_write(dev, B43_PHY_RFOVER,</div><div class='add'>+				      b43_phy_read(dev, B43_PHY_RFOVER)</div><div class='add'>+				      | 0x0800);</div><div class='add'>+			b43_phy_write(dev, B43_PHY_RFOVERVAL,</div><div class='add'>+				      b43_phy_read(dev, B43_PHY_RFOVERVAL)</div><div class='add'>+				      | 0x8000);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	b43_radio_write16(dev, 0x7A, b43_radio_read16(dev, 0x7A)</div><div class='add'>+			  &amp; 0x00F7);</div><div class='add'>+</div><div class='add'>+	j = 0;</div><div class='add'>+	loop_i_max = (phy-&gt;radio_rev == 8) ? 15 : 9;</div><div class='add'>+	for (i = 0; i &lt; loop_i_max; i++) {</div><div class='add'>+		for (j = 0; j &lt; 16; j++) {</div><div class='add'>+			b43_radio_write16(dev, 0x43, i);</div><div class='add'>+			b43_phy_write(dev, B43_PHY_RFOVERVAL,</div><div class='add'>+				      (b43_phy_read(dev, B43_PHY_RFOVERVAL)</div><div class='add'>+				       &amp; 0xF0FF) | (j &lt;&lt; 8));</div><div class='add'>+			b43_phy_write(dev, B43_PHY_PGACTL,</div><div class='add'>+				      (b43_phy_read(dev, B43_PHY_PGACTL)</div><div class='add'>+				       &amp; 0x0FFF) | 0xA000);</div><div class='add'>+			b43_phy_write(dev, B43_PHY_PGACTL,</div><div class='add'>+				      b43_phy_read(dev, B43_PHY_PGACTL)</div><div class='add'>+				      | 0xF000);</div><div class='add'>+			udelay(20);</div><div class='add'>+			if (b43_phy_read(dev, B43_PHY_LO_LEAKAGE) &gt;= 0xDFC)</div><div class='add'>+				goto exit_loop1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+      exit_loop1:</div><div class='add'>+	loop1_outer_done = i;</div><div class='add'>+	loop1_inner_done = j;</div><div class='add'>+	if (j &gt;= 8) {</div><div class='add'>+		b43_phy_write(dev, B43_PHY_RFOVERVAL,</div><div class='add'>+			      b43_phy_read(dev, B43_PHY_RFOVERVAL)</div><div class='add'>+			      | 0x30);</div><div class='add'>+		trsw_rx = 0x1B;</div><div class='add'>+		for (j = j - 8; j &lt; 16; j++) {</div><div class='add'>+			b43_phy_write(dev, B43_PHY_RFOVERVAL,</div><div class='add'>+				      (b43_phy_read(dev, B43_PHY_RFOVERVAL)</div><div class='add'>+				       &amp; 0xF0FF) | (j &lt;&lt; 8));</div><div class='add'>+			b43_phy_write(dev, B43_PHY_PGACTL,</div><div class='add'>+				      (b43_phy_read(dev, B43_PHY_PGACTL)</div><div class='add'>+				       &amp; 0x0FFF) | 0xA000);</div><div class='add'>+			b43_phy_write(dev, B43_PHY_PGACTL,</div><div class='add'>+				      b43_phy_read(dev, B43_PHY_PGACTL)</div><div class='add'>+				      | 0xF000);</div><div class='add'>+			udelay(20);</div><div class='add'>+			trsw_rx -= 3;</div><div class='add'>+			if (b43_phy_read(dev, B43_PHY_LO_LEAKAGE) &gt;= 0xDFC)</div><div class='add'>+				goto exit_loop2;</div><div class='add'>+		}</div><div class='add'>+	} else</div><div class='add'>+		trsw_rx = 0x18;</div><div class='add'>+      exit_loop2:</div><div class='add'>+</div><div class='add'>+	if (phy-&gt;rev != 1) {	/* Not in specs, but needed to prevent PPC machine check */</div><div class='add'>+		b43_phy_write(dev, B43_PHY_ANALOGOVER, backup_phy[4]);</div><div class='add'>+		b43_phy_write(dev, B43_PHY_ANALOGOVERVAL, backup_phy[5]);</div><div class='add'>+	}</div><div class='add'>+	b43_phy_write(dev, B43_PHY_CCK(0x5A), backup_phy[6]);</div><div class='add'>+	b43_phy_write(dev, B43_PHY_CCK(0x59), backup_phy[7]);</div><div class='add'>+	b43_phy_write(dev, B43_PHY_CCK(0x58), backup_phy[8]);</div><div class='add'>+	b43_phy_write(dev, B43_PHY_CCK(0x0A), backup_phy[9]);</div><div class='add'>+	b43_phy_write(dev, B43_PHY_CCK(0x03), backup_phy[10]);</div><div class='add'>+	b43_phy_write(dev, B43_PHY_LO_MASK, backup_phy[11]);</div><div class='add'>+	b43_phy_write(dev, B43_PHY_LO_CTL, backup_phy[12]);</div><div class='add'>+	b43_phy_write(dev, B43_PHY_CCK(0x2B), backup_phy[13]);</div><div class='add'>+	b43_phy_write(dev, B43_PHY_PGACTL, backup_phy[14]);</div><div class='add'>+</div><div class='add'>+	b43_gphy_set_baseband_attenuation(dev, backup_bband);</div><div class='add'>+</div><div class='add'>+	b43_radio_write16(dev, 0x52, backup_radio[0]);</div><div class='add'>+	b43_radio_write16(dev, 0x43, backup_radio[1]);</div><div class='add'>+	b43_radio_write16(dev, 0x7A, backup_radio[2]);</div><div class='add'>+</div><div class='add'>+	b43_phy_write(dev, B43_PHY_RFOVER, backup_phy[2] | 0x0003);</div><div class='add'>+	udelay(10);</div><div class='add'>+	b43_phy_write(dev, B43_PHY_RFOVER, backup_phy[2]);</div><div class='add'>+	b43_phy_write(dev, B43_PHY_RFOVERVAL, backup_phy[3]);</div><div class='add'>+	b43_phy_write(dev, B43_PHY_CRS0, backup_phy[0]);</div><div class='add'>+	b43_phy_write(dev, B43_PHY_CCKBBANDCFG, backup_phy[1]);</div><div class='add'>+</div><div class='add'>+	gphy-&gt;max_lb_gain =</div><div class='add'>+	    ((loop1_inner_done * 6) - (loop1_outer_done * 4)) - 11;</div><div class='add'>+	gphy-&gt;trsw_rx_gain = trsw_rx * 2;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void b43_hardware_pctl_early_init(struct b43_wldev *dev)</div><div class='add'>+{</div><div class='add'>+	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='add'>+</div><div class='add'>+	if (!b43_has_hardware_pctl(dev)) {</div><div class='add'>+		b43_phy_write(dev, 0x047A, 0xC111);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	b43_phy_write(dev, 0x0036, b43_phy_read(dev, 0x0036) &amp; 0xFEFF);</div><div class='add'>+	b43_phy_write(dev, 0x002F, 0x0202);</div><div class='add'>+	b43_phy_write(dev, 0x047C, b43_phy_read(dev, 0x047C) | 0x0002);</div><div class='add'>+	b43_phy_write(dev, 0x047A, b43_phy_read(dev, 0x047A) | 0xF000);</div><div class='add'>+	if (phy-&gt;radio_ver == 0x2050 &amp;&amp; phy-&gt;radio_rev == 8) {</div><div class='add'>+		b43_phy_write(dev, 0x047A, (b43_phy_read(dev, 0x047A)</div><div class='add'>+					    &amp; 0xFF0F) | 0x0010);</div><div class='add'>+		b43_phy_write(dev, 0x005D, b43_phy_read(dev, 0x005D)</div><div class='add'>+			      | 0x8000);</div><div class='add'>+		b43_phy_write(dev, 0x004E, (b43_phy_read(dev, 0x004E)</div><div class='add'>+					    &amp; 0xFFC0) | 0x0010);</div><div class='add'>+		b43_phy_write(dev, 0x002E, 0xC07F);</div><div class='add'>+		b43_phy_write(dev, 0x0036, b43_phy_read(dev, 0x0036)</div><div class='add'>+			      | 0x0400);</div><div class='add'>+	} else {</div><div class='add'>+		b43_phy_write(dev, 0x0036, b43_phy_read(dev, 0x0036)</div><div class='add'>+			      | 0x0200);</div><div class='add'>+		b43_phy_write(dev, 0x0036, b43_phy_read(dev, 0x0036)</div><div class='add'>+			      | 0x0400);</div><div class='add'>+		b43_phy_write(dev, 0x005D, b43_phy_read(dev, 0x005D)</div><div class='add'>+			      &amp; 0x7FFF);</div><div class='add'>+		b43_phy_write(dev, 0x004F, b43_phy_read(dev, 0x004F)</div><div class='add'>+			      &amp; 0xFFFE);</div><div class='add'>+		b43_phy_write(dev, 0x004E, (b43_phy_read(dev, 0x004E)</div><div class='add'>+					    &amp; 0xFFC0) | 0x0010);</div><div class='add'>+		b43_phy_write(dev, 0x002E, 0xC07F);</div><div class='add'>+		b43_phy_write(dev, 0x047A, (b43_phy_read(dev, 0x047A)</div><div class='add'>+					    &amp; 0xFF0F) | 0x0010);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Hardware power control for G-PHY */</div><div class='add'>+static void b43_hardware_pctl_init_gphy(struct b43_wldev *dev)</div><div class='add'>+{</div><div class='add'>+	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='add'>+	struct b43_phy_g *gphy = phy-&gt;g;</div><div class='add'>+</div><div class='add'>+	if (!b43_has_hardware_pctl(dev)) {</div><div class='add'>+		/* No hardware power control */</div><div class='add'>+		b43_hf_write(dev, b43_hf_read(dev) &amp; ~B43_HF_HWPCTL);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	b43_phy_write(dev, 0x0036, (b43_phy_read(dev, 0x0036) &amp; 0xFFC0)</div><div class='add'>+		      | (gphy-&gt;tgt_idle_tssi - gphy-&gt;cur_idle_tssi));</div><div class='add'>+	b43_phy_write(dev, 0x0478, (b43_phy_read(dev, 0x0478) &amp; 0xFF00)</div><div class='add'>+		      | (gphy-&gt;tgt_idle_tssi - gphy-&gt;cur_idle_tssi));</div><div class='add'>+	b43_gphy_tssi_power_lt_init(dev);</div><div class='add'>+	b43_gphy_gain_lt_init(dev);</div><div class='add'>+	b43_phy_write(dev, 0x0060, b43_phy_read(dev, 0x0060) &amp; 0xFFBF);</div><div class='add'>+	b43_phy_write(dev, 0x0014, 0x0000);</div><div class='add'>+</div><div class='add'>+	B43_WARN_ON(phy-&gt;rev &lt; 6);</div><div class='add'>+	b43_phy_write(dev, 0x0478, b43_phy_read(dev, 0x0478)</div><div class='add'>+		      | 0x0800);</div><div class='add'>+	b43_phy_write(dev, 0x0478, b43_phy_read(dev, 0x0478)</div><div class='add'>+		      &amp; 0xFEFF);</div><div class='add'>+	b43_phy_write(dev, 0x0801, b43_phy_read(dev, 0x0801)</div><div class='add'>+		      &amp; 0xFFBF);</div><div class='add'>+</div><div class='add'>+	b43_gphy_dc_lt_init(dev, 1);</div><div class='add'>+</div><div class='add'>+	/* Enable hardware pctl in firmware. */</div><div class='add'>+	b43_hf_write(dev, b43_hf_read(dev) | B43_HF_HWPCTL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Intialize B/G PHY power control */</div><div class='add'>+static void b43_phy_init_pctl(struct b43_wldev *dev)</div><div class='add'>+{</div><div class='add'>+	struct ssb_bus *bus = dev-&gt;dev-&gt;bus;</div><div class='add'>+	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='add'>+	struct b43_phy_g *gphy = phy-&gt;g;</div><div class='add'>+	struct b43_rfatt old_rfatt;</div><div class='add'>+	struct b43_bbatt old_bbatt;</div><div class='add'>+	u8 old_tx_control = 0;</div><div class='add'>+</div><div class='add'>+	B43_WARN_ON(phy-&gt;type != B43_PHYTYPE_G);</div><div class='add'>+</div><div class='add'>+	if ((bus-&gt;boardinfo.vendor == SSB_BOARDVENDOR_BCM) &amp;&amp;</div><div class='add'>+	    (bus-&gt;boardinfo.type == SSB_BOARD_BU4306))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	b43_phy_write(dev, 0x0028, 0x8018);</div><div class='add'>+</div><div class='add'>+	/* This does something with the Analog... */</div><div class='add'>+	b43_write16(dev, B43_MMIO_PHY0, b43_read16(dev, B43_MMIO_PHY0)</div><div class='add'>+		    &amp; 0xFFDF);</div><div class='add'>+</div><div class='add'>+	if (!phy-&gt;gmode)</div><div class='add'>+		return;</div><div class='add'>+	b43_hardware_pctl_early_init(dev);</div><div class='add'>+	if (gphy-&gt;cur_idle_tssi == 0) {</div><div class='add'>+		if (phy-&gt;radio_ver == 0x2050 &amp;&amp; phy-&gt;analog == 0) {</div><div class='add'>+			b43_radio_write16(dev, 0x0076,</div><div class='add'>+					  (b43_radio_read16(dev, 0x0076)</div><div class='add'>+					   &amp; 0x00F7) | 0x0084);</div><div class='add'>+		} else {</div><div class='add'>+			struct b43_rfatt rfatt;</div><div class='add'>+			struct b43_bbatt bbatt;</div><div class='add'>+</div><div class='add'>+			memcpy(&amp;old_rfatt, &amp;gphy-&gt;rfatt, sizeof(old_rfatt));</div><div class='add'>+			memcpy(&amp;old_bbatt, &amp;gphy-&gt;bbatt, sizeof(old_bbatt));</div><div class='add'>+			old_tx_control = gphy-&gt;tx_control;</div><div class='add'>+</div><div class='add'>+			bbatt.att = 11;</div><div class='add'>+			if (phy-&gt;radio_rev == 8) {</div><div class='add'>+				rfatt.att = 15;</div><div class='add'>+				rfatt.with_padmix = 1;</div><div class='add'>+			} else {</div><div class='add'>+				rfatt.att = 9;</div><div class='add'>+				rfatt.with_padmix = 0;</div><div class='ctx'> 			}</div><div class='add'>+			b43_set_txpower_g(dev, &amp;bbatt, &amp;rfatt, 0);</div><div class='add'>+		}</div><div class='add'>+		b43_dummy_transmission(dev);</div><div class='add'>+		gphy-&gt;cur_idle_tssi = b43_phy_read(dev, B43_PHY_ITSSI);</div><div class='add'>+		if (B43_DEBUG) {</div><div class='add'>+			/* Current-Idle-TSSI sanity check. */</div><div class='add'>+			if (abs(gphy-&gt;cur_idle_tssi - gphy-&gt;tgt_idle_tssi) &gt;= 20) {</div><div class='add'>+				b43dbg(dev-&gt;wl,</div><div class='add'>+				       "!WARNING! Idle-TSSI phy-&gt;cur_idle_tssi "</div><div class='add'>+				       "measuring failed. (cur=%d, tgt=%d). Disabling TX power "</div><div class='add'>+				       "adjustment.\n", gphy-&gt;cur_idle_tssi,</div><div class='add'>+				       gphy-&gt;tgt_idle_tssi);</div><div class='add'>+				gphy-&gt;cur_idle_tssi = 0;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if (phy-&gt;radio_ver == 0x2050 &amp;&amp; phy-&gt;analog == 0) {</div><div class='add'>+			b43_radio_write16(dev, 0x0076,</div><div class='add'>+					  b43_radio_read16(dev, 0x0076)</div><div class='add'>+					  &amp; 0xFF7B);</div><div class='add'>+		} else {</div><div class='add'>+			b43_set_txpower_g(dev, &amp;old_bbatt,</div><div class='add'>+					  &amp;old_rfatt, old_tx_control);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+	b43_hardware_pctl_init_gphy(dev);</div><div class='add'>+	b43_shm_clear_tssi(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int b43_radio_selectchannel(struct b43_wldev *dev,</div><div class='del'>-			    u8 channel, int synthetic_pu_workaround)</div><div class='add'>+static void b43_phy_initg(struct b43_wldev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='del'>-	u16 r8, tmp;</div><div class='del'>-	u16 freq;</div><div class='del'>-	u16 channelcookie, savedcookie;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	if (channel == 0xFF) {</div><div class='del'>-		switch (phy-&gt;type) {</div><div class='del'>-		case B43_PHYTYPE_A:</div><div class='del'>-			channel = B43_DEFAULT_CHANNEL_A;</div><div class='del'>-			break;</div><div class='del'>-		case B43_PHYTYPE_B:</div><div class='del'>-		case B43_PHYTYPE_G:</div><div class='del'>-			channel = B43_DEFAULT_CHANNEL_BG;</div><div class='del'>-			break;</div><div class='del'>-		case B43_PHYTYPE_N:</div><div class='del'>-			//FIXME check if we are on 2.4GHz or 5GHz and set a default channel.</div><div class='del'>-			channel = 1;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			B43_WARN_ON(1);</div><div class='add'>+	struct b43_phy_g *gphy = phy-&gt;g;</div><div class='add'>+	u16 tmp;</div><div class='add'>+</div><div class='add'>+	if (phy-&gt;rev == 1)</div><div class='add'>+		b43_phy_initb5(dev);</div><div class='add'>+	else</div><div class='add'>+		b43_phy_initb6(dev);</div><div class='add'>+</div><div class='add'>+	if (phy-&gt;rev &gt;= 2 || phy-&gt;gmode)</div><div class='add'>+		b43_phy_inita(dev);</div><div class='add'>+</div><div class='add'>+	if (phy-&gt;rev &gt;= 2) {</div><div class='add'>+		b43_phy_write(dev, B43_PHY_ANALOGOVER, 0);</div><div class='add'>+		b43_phy_write(dev, B43_PHY_ANALOGOVERVAL, 0);</div><div class='add'>+	}</div><div class='add'>+	if (phy-&gt;rev == 2) {</div><div class='add'>+		b43_phy_write(dev, B43_PHY_RFOVER, 0);</div><div class='add'>+		b43_phy_write(dev, B43_PHY_PGACTL, 0xC0);</div><div class='add'>+	}</div><div class='add'>+	if (phy-&gt;rev &gt; 5) {</div><div class='add'>+		b43_phy_write(dev, B43_PHY_RFOVER, 0x400);</div><div class='add'>+		b43_phy_write(dev, B43_PHY_PGACTL, 0xC0);</div><div class='add'>+	}</div><div class='add'>+	if (phy-&gt;gmode || phy-&gt;rev &gt;= 2) {</div><div class='add'>+		tmp = b43_phy_read(dev, B43_PHY_VERSION_OFDM);</div><div class='add'>+		tmp &amp;= B43_PHYVER_VERSION;</div><div class='add'>+		if (tmp == 3 || tmp == 5) {</div><div class='add'>+			b43_phy_write(dev, B43_PHY_OFDM(0xC2), 0x1816);</div><div class='add'>+			b43_phy_write(dev, B43_PHY_OFDM(0xC3), 0x8006);</div><div class='ctx'> 		}</div><div class='add'>+		if (tmp == 5) {</div><div class='add'>+			b43_phy_write(dev, B43_PHY_OFDM(0xCC),</div><div class='add'>+				      (b43_phy_read(dev, B43_PHY_OFDM(0xCC))</div><div class='add'>+				       &amp; 0x00FF) | 0x1F00);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if ((phy-&gt;rev &lt;= 2 &amp;&amp; phy-&gt;gmode) || phy-&gt;rev &gt;= 2)</div><div class='add'>+		b43_phy_write(dev, B43_PHY_OFDM(0x7E), 0x78);</div><div class='add'>+	if (phy-&gt;radio_rev == 8) {</div><div class='add'>+		b43_phy_write(dev, B43_PHY_EXTG(0x01),</div><div class='add'>+			      b43_phy_read(dev, B43_PHY_EXTG(0x01))</div><div class='add'>+			      | 0x80);</div><div class='add'>+		b43_phy_write(dev, B43_PHY_OFDM(0x3E),</div><div class='add'>+			      b43_phy_read(dev, B43_PHY_OFDM(0x3E))</div><div class='add'>+			      | 0x4);</div><div class='add'>+	}</div><div class='add'>+	if (has_loopback_gain(phy))</div><div class='add'>+		b43_calc_loopback_gain(dev);</div><div class='add'>+</div><div class='add'>+	if (phy-&gt;radio_rev != 8) {</div><div class='add'>+		if (gphy-&gt;initval == 0xFFFF)</div><div class='add'>+			gphy-&gt;initval = b43_radio_init2050(dev);</div><div class='add'>+		else</div><div class='add'>+			b43_radio_write16(dev, 0x0078, gphy-&gt;initval);</div><div class='add'>+	}</div><div class='add'>+	b43_lo_g_init(dev);</div><div class='add'>+	if (has_tx_magnification(phy)) {</div><div class='add'>+		b43_radio_write16(dev, 0x52,</div><div class='add'>+				  (b43_radio_read16(dev, 0x52) &amp; 0xFF00)</div><div class='add'>+				  | gphy-&gt;lo_control-&gt;tx_bias | gphy-&gt;</div><div class='add'>+				  lo_control-&gt;tx_magn);</div><div class='add'>+	} else {</div><div class='add'>+		b43_radio_write16(dev, 0x52,</div><div class='add'>+				  (b43_radio_read16(dev, 0x52) &amp; 0xFFF0)</div><div class='add'>+				  | gphy-&gt;lo_control-&gt;tx_bias);</div><div class='add'>+	}</div><div class='add'>+	if (phy-&gt;rev &gt;= 6) {</div><div class='add'>+		b43_phy_write(dev, B43_PHY_CCK(0x36),</div><div class='add'>+			      (b43_phy_read(dev, B43_PHY_CCK(0x36))</div><div class='add'>+			       &amp; 0x0FFF) | (gphy-&gt;lo_control-&gt;</div><div class='add'>+					    tx_bias &lt;&lt; 12));</div><div class='add'>+	}</div><div class='add'>+	if (dev-&gt;dev-&gt;bus-&gt;sprom.boardflags_lo &amp; B43_BFL_PACTRL)</div><div class='add'>+		b43_phy_write(dev, B43_PHY_CCK(0x2E), 0x8075);</div><div class='add'>+	else</div><div class='add'>+		b43_phy_write(dev, B43_PHY_CCK(0x2E), 0x807F);</div><div class='add'>+	if (phy-&gt;rev &lt; 2)</div><div class='add'>+		b43_phy_write(dev, B43_PHY_CCK(0x2F), 0x101);</div><div class='add'>+	else</div><div class='add'>+		b43_phy_write(dev, B43_PHY_CCK(0x2F), 0x202);</div><div class='add'>+	if (phy-&gt;gmode || phy-&gt;rev &gt;= 2) {</div><div class='add'>+		b43_lo_g_adjust(dev);</div><div class='add'>+		b43_phy_write(dev, B43_PHY_LO_MASK, 0x8078);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* First we set the channel radio code to prevent the</div><div class='del'>-	 * firmware from sending ghost packets.</div><div class='del'>-	 */</div><div class='del'>-	channelcookie = channel;</div><div class='del'>-	if (0 /*FIXME on 5Ghz */)</div><div class='del'>-		channelcookie |= 0x100;</div><div class='del'>-	//FIXME set 40Mhz flag if required</div><div class='del'>-	savedcookie = b43_shm_read16(dev, B43_SHM_SHARED, B43_SHM_SH_CHAN);</div><div class='del'>-	b43_shm_write16(dev, B43_SHM_SHARED, B43_SHM_SH_CHAN, channelcookie);</div><div class='del'>-</div><div class='del'>-	switch (phy-&gt;type) {</div><div class='del'>-	case B43_PHYTYPE_A:</div><div class='del'>-		if (channel &gt; 200) {</div><div class='del'>-			err = -EINVAL;</div><div class='del'>-			goto out;</div><div class='add'>+	if (!(dev-&gt;dev-&gt;bus-&gt;sprom.boardflags_lo &amp; B43_BFL_RSSI)) {</div><div class='add'>+		/* The specs state to update the NRSSI LT with</div><div class='add'>+		 * the value 0x7FFFFFFF here. I think that is some weird</div><div class='add'>+		 * compiler optimization in the original driver.</div><div class='add'>+		 * Essentially, what we do here is resetting all NRSSI LT</div><div class='add'>+		 * entries to -32 (see the clamp_val() in nrssi_hw_update())</div><div class='add'>+		 */</div><div class='add'>+		b43_nrssi_hw_update(dev, 0xFFFF);	//FIXME?</div><div class='add'>+		b43_calc_nrssi_threshold(dev);</div><div class='add'>+	} else if (phy-&gt;gmode || phy-&gt;rev &gt;= 2) {</div><div class='add'>+		if (gphy-&gt;nrssi[0] == -1000) {</div><div class='add'>+			B43_WARN_ON(gphy-&gt;nrssi[1] != -1000);</div><div class='add'>+			b43_calc_nrssi_slope(dev);</div><div class='add'>+		} else</div><div class='add'>+			b43_calc_nrssi_threshold(dev);</div><div class='add'>+	}</div><div class='add'>+	if (phy-&gt;radio_rev == 8)</div><div class='add'>+		b43_phy_write(dev, B43_PHY_EXTG(0x05), 0x3230);</div><div class='add'>+	b43_phy_init_pctl(dev);</div><div class='add'>+	/* FIXME: The spec says in the following if, the 0 should be replaced</div><div class='add'>+	   'if OFDM may not be used in the current locale'</div><div class='add'>+	   but OFDM is legal everywhere */</div><div class='add'>+	if ((dev-&gt;dev-&gt;bus-&gt;chip_id == 0x4306</div><div class='add'>+	     &amp;&amp; dev-&gt;dev-&gt;bus-&gt;chip_package == 2) || 0) {</div><div class='add'>+		b43_phy_write(dev, B43_PHY_CRS0, b43_phy_read(dev, B43_PHY_CRS0)</div><div class='add'>+			      &amp; 0xBFFF);</div><div class='add'>+		b43_phy_write(dev, B43_PHY_OFDM(0xC3),</div><div class='add'>+			      b43_phy_read(dev, B43_PHY_OFDM(0xC3))</div><div class='add'>+			      &amp; 0x7FFF);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void b43_gphy_channel_switch(struct b43_wldev *dev,</div><div class='add'>+			     unsigned int channel,</div><div class='add'>+			     bool synthetic_pu_workaround)</div><div class='add'>+{</div><div class='add'>+	if (synthetic_pu_workaround)</div><div class='add'>+		b43_synth_pu_workaround(dev, channel);</div><div class='add'>+</div><div class='add'>+	b43_write16(dev, B43_MMIO_CHANNEL, channel2freq_bg(channel));</div><div class='add'>+</div><div class='add'>+	if (channel == 14) {</div><div class='add'>+		if (dev-&gt;dev-&gt;bus-&gt;sprom.country_code ==</div><div class='add'>+		    SSB_SPROM1CCODE_JAPAN)</div><div class='add'>+			b43_hf_write(dev,</div><div class='add'>+				     b43_hf_read(dev) &amp; ~B43_HF_ACPR);</div><div class='add'>+		else</div><div class='add'>+			b43_hf_write(dev,</div><div class='add'>+				     b43_hf_read(dev) | B43_HF_ACPR);</div><div class='add'>+		b43_write16(dev, B43_MMIO_CHANNEL_EXT,</div><div class='add'>+			    b43_read16(dev, B43_MMIO_CHANNEL_EXT)</div><div class='add'>+			    | (1 &lt;&lt; 11));</div><div class='add'>+	} else {</div><div class='add'>+		b43_write16(dev, B43_MMIO_CHANNEL_EXT,</div><div class='add'>+			    b43_read16(dev, B43_MMIO_CHANNEL_EXT)</div><div class='add'>+			    &amp; 0xF7BF);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void default_baseband_attenuation(struct b43_wldev *dev,</div><div class='add'>+					 struct b43_bbatt *bb)</div><div class='add'>+{</div><div class='add'>+	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='add'>+</div><div class='add'>+	if (phy-&gt;radio_ver == 0x2050 &amp;&amp; phy-&gt;radio_rev &lt; 6)</div><div class='add'>+		bb-&gt;att = 0;</div><div class='add'>+	else</div><div class='add'>+		bb-&gt;att = 2;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void default_radio_attenuation(struct b43_wldev *dev,</div><div class='add'>+				      struct b43_rfatt *rf)</div><div class='add'>+{</div><div class='add'>+	struct ssb_bus *bus = dev-&gt;dev-&gt;bus;</div><div class='add'>+	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='add'>+</div><div class='add'>+	rf-&gt;with_padmix = 0;</div><div class='add'>+</div><div class='add'>+	if (bus-&gt;boardinfo.vendor == SSB_BOARDVENDOR_BCM &amp;&amp;</div><div class='add'>+	    bus-&gt;boardinfo.type == SSB_BOARD_BCM4309G) {</div><div class='add'>+		if (bus-&gt;boardinfo.rev &lt; 0x43) {</div><div class='add'>+			rf-&gt;att = 2;</div><div class='add'>+			return;</div><div class='add'>+		} else if (bus-&gt;boardinfo.rev &lt; 0x51) {</div><div class='add'>+			rf-&gt;att = 3;</div><div class='add'>+			return;</div><div class='ctx'> 		}</div><div class='del'>-		freq = channel2freq_a(channel);</div><div class='del'>-</div><div class='del'>-		r8 = b43_radio_read16(dev, 0x0008);</div><div class='del'>-		b43_write16(dev, 0x03F0, freq);</div><div class='del'>-		b43_radio_write16(dev, 0x0008, r8);</div><div class='del'>-</div><div class='del'>-		//TODO: write max channel TX power? to Radio 0x2D</div><div class='del'>-		tmp = b43_radio_read16(dev, 0x002E);</div><div class='del'>-		tmp &amp;= 0x0080;</div><div class='del'>-		//TODO: OR tmp with the Power out estimation for this channel?</div><div class='del'>-		b43_radio_write16(dev, 0x002E, tmp);</div><div class='del'>-</div><div class='del'>-		if (freq &gt;= 4920 &amp;&amp; freq &lt;= 5500) {</div><div class='del'>-			/*</div><div class='del'>-			 * r8 = (((freq * 15 * 0xE1FC780F) &gt;&gt; 32) / 29) &amp; 0x0F;</div><div class='del'>-			 *    = (freq * 0.025862069</div><div class='del'>-			 */</div><div class='del'>-			r8 = 3 * freq / 116;	/* is equal to r8 = freq * 0.025862 */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (phy-&gt;type == B43_PHYTYPE_A) {</div><div class='add'>+		rf-&gt;att = 0x60;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (phy-&gt;radio_ver) {</div><div class='add'>+	case 0x2053:</div><div class='add'>+		switch (phy-&gt;radio_rev) {</div><div class='add'>+		case 1:</div><div class='add'>+			rf-&gt;att = 6;</div><div class='add'>+			return;</div><div class='ctx'> 		}</div><div class='del'>-		b43_radio_write16(dev, 0x0007, (r8 &lt;&lt; 4) | r8);</div><div class='del'>-		b43_radio_write16(dev, 0x0020, (r8 &lt;&lt; 4) | r8);</div><div class='del'>-		b43_radio_write16(dev, 0x0021, (r8 &lt;&lt; 4) | r8);</div><div class='del'>-		b43_radio_write16(dev, 0x0022, (b43_radio_read16(dev, 0x0022)</div><div class='del'>-						&amp; 0x000F) | (r8 &lt;&lt; 4));</div><div class='del'>-		b43_radio_write16(dev, 0x002A, (r8 &lt;&lt; 4));</div><div class='del'>-		b43_radio_write16(dev, 0x002B, (r8 &lt;&lt; 4));</div><div class='del'>-		b43_radio_write16(dev, 0x0008, (b43_radio_read16(dev, 0x0008)</div><div class='del'>-						&amp; 0x00F0) | (r8 &lt;&lt; 4));</div><div class='del'>-		b43_radio_write16(dev, 0x0029, (b43_radio_read16(dev, 0x0029)</div><div class='del'>-						&amp; 0xFF0F) | 0x00B0);</div><div class='del'>-		b43_radio_write16(dev, 0x0035, 0x00AA);</div><div class='del'>-		b43_radio_write16(dev, 0x0036, 0x0085);</div><div class='del'>-		b43_radio_write16(dev, 0x003A, (b43_radio_read16(dev, 0x003A)</div><div class='del'>-						&amp; 0xFF20) |</div><div class='del'>-				  freq_r3A_value(freq));</div><div class='del'>-		b43_radio_write16(dev, 0x003D,</div><div class='del'>-				  b43_radio_read16(dev, 0x003D) &amp; 0x00FF);</div><div class='del'>-		b43_radio_write16(dev, 0x0081, (b43_radio_read16(dev, 0x0081)</div><div class='del'>-						&amp; 0xFF7F) | 0x0080);</div><div class='del'>-		b43_radio_write16(dev, 0x0035,</div><div class='del'>-				  b43_radio_read16(dev, 0x0035) &amp; 0xFFEF);</div><div class='del'>-		b43_radio_write16(dev, 0x0035, (b43_radio_read16(dev, 0x0035)</div><div class='del'>-						&amp; 0xFFEF) | 0x0010);</div><div class='del'>-		b43_radio_set_tx_iq(dev);</div><div class='del'>-		//TODO: TSSI2dbm workaround</div><div class='del'>-		b43_phy_xmitpower(dev);	//FIXME correct?</div><div class='ctx'> 		break;</div><div class='del'>-	case B43_PHYTYPE_G:</div><div class='del'>-		if ((channel &lt; 1) || (channel &gt; 14)) {</div><div class='del'>-			err = -EINVAL;</div><div class='del'>-			goto out;</div><div class='add'>+	case 0x2050:</div><div class='add'>+		switch (phy-&gt;radio_rev) {</div><div class='add'>+		case 0:</div><div class='add'>+			rf-&gt;att = 5;</div><div class='add'>+			return;</div><div class='add'>+		case 1:</div><div class='add'>+			if (phy-&gt;type == B43_PHYTYPE_G) {</div><div class='add'>+				if (bus-&gt;boardinfo.vendor == SSB_BOARDVENDOR_BCM</div><div class='add'>+				    &amp;&amp; bus-&gt;boardinfo.type == SSB_BOARD_BCM4309G</div><div class='add'>+				    &amp;&amp; bus-&gt;boardinfo.rev &gt;= 30)</div><div class='add'>+					rf-&gt;att = 3;</div><div class='add'>+				else if (bus-&gt;boardinfo.vendor ==</div><div class='add'>+					 SSB_BOARDVENDOR_BCM</div><div class='add'>+					 &amp;&amp; bus-&gt;boardinfo.type ==</div><div class='add'>+					 SSB_BOARD_BU4306)</div><div class='add'>+					rf-&gt;att = 3;</div><div class='add'>+				else</div><div class='add'>+					rf-&gt;att = 1;</div><div class='add'>+			} else {</div><div class='add'>+				if (bus-&gt;boardinfo.vendor == SSB_BOARDVENDOR_BCM</div><div class='add'>+				    &amp;&amp; bus-&gt;boardinfo.type == SSB_BOARD_BCM4309G</div><div class='add'>+				    &amp;&amp; bus-&gt;boardinfo.rev &gt;= 30)</div><div class='add'>+					rf-&gt;att = 7;</div><div class='add'>+				else</div><div class='add'>+					rf-&gt;att = 6;</div><div class='add'>+			}</div><div class='add'>+			return;</div><div class='add'>+		case 2:</div><div class='add'>+			if (phy-&gt;type == B43_PHYTYPE_G) {</div><div class='add'>+				if (bus-&gt;boardinfo.vendor == SSB_BOARDVENDOR_BCM</div><div class='add'>+				    &amp;&amp; bus-&gt;boardinfo.type == SSB_BOARD_BCM4309G</div><div class='add'>+				    &amp;&amp; bus-&gt;boardinfo.rev &gt;= 30)</div><div class='add'>+					rf-&gt;att = 3;</div><div class='add'>+				else if (bus-&gt;boardinfo.vendor ==</div><div class='add'>+					 SSB_BOARDVENDOR_BCM</div><div class='add'>+					 &amp;&amp; bus-&gt;boardinfo.type ==</div><div class='add'>+					 SSB_BOARD_BU4306)</div><div class='add'>+					rf-&gt;att = 5;</div><div class='add'>+				else if (bus-&gt;chip_id == 0x4320)</div><div class='add'>+					rf-&gt;att = 4;</div><div class='add'>+				else</div><div class='add'>+					rf-&gt;att = 3;</div><div class='add'>+			} else</div><div class='add'>+				rf-&gt;att = 6;</div><div class='add'>+			return;</div><div class='add'>+		case 3:</div><div class='add'>+			rf-&gt;att = 5;</div><div class='add'>+			return;</div><div class='add'>+		case 4:</div><div class='add'>+		case 5:</div><div class='add'>+			rf-&gt;att = 1;</div><div class='add'>+			return;</div><div class='add'>+		case 6:</div><div class='add'>+		case 7:</div><div class='add'>+			rf-&gt;att = 5;</div><div class='add'>+			return;</div><div class='add'>+		case 8:</div><div class='add'>+			rf-&gt;att = 0xA;</div><div class='add'>+			rf-&gt;with_padmix = 1;</div><div class='add'>+			return;</div><div class='add'>+		case 9:</div><div class='add'>+		default:</div><div class='add'>+			rf-&gt;att = 5;</div><div class='add'>+			return;</div><div class='ctx'> 		}</div><div class='add'>+	}</div><div class='add'>+	rf-&gt;att = 5;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		if (synthetic_pu_workaround)</div><div class='del'>-			b43_synth_pu_workaround(dev, channel);</div><div class='add'>+static u16 default_tx_control(struct b43_wldev *dev)</div><div class='add'>+{</div><div class='add'>+	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='ctx'> </div><div class='del'>-		b43_write16(dev, B43_MMIO_CHANNEL, channel2freq_bg(channel));</div><div class='add'>+	if (phy-&gt;radio_ver != 0x2050)</div><div class='add'>+		return 0;</div><div class='add'>+	if (phy-&gt;radio_rev == 1)</div><div class='add'>+		return B43_TXCTL_PA2DB | B43_TXCTL_TXMIX;</div><div class='add'>+	if (phy-&gt;radio_rev &lt; 6)</div><div class='add'>+		return B43_TXCTL_PA2DB;</div><div class='add'>+	if (phy-&gt;radio_rev == 8)</div><div class='add'>+		return B43_TXCTL_TXMIX;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		if (channel == 14) {</div><div class='del'>-			if (dev-&gt;dev-&gt;bus-&gt;sprom.country_code ==</div><div class='del'>-			    SSB_SPROM1CCODE_JAPAN)</div><div class='del'>-				b43_hf_write(dev,</div><div class='del'>-					     b43_hf_read(dev) &amp; ~B43_HF_ACPR);</div><div class='del'>-			else</div><div class='del'>-				b43_hf_write(dev,</div><div class='del'>-					     b43_hf_read(dev) | B43_HF_ACPR);</div><div class='del'>-			b43_write16(dev, B43_MMIO_CHANNEL_EXT,</div><div class='del'>-				    b43_read16(dev, B43_MMIO_CHANNEL_EXT)</div><div class='del'>-				    | (1 &lt;&lt; 11));</div><div class='del'>-		} else {</div><div class='del'>-			b43_write16(dev, B43_MMIO_CHANNEL_EXT,</div><div class='del'>-				    b43_read16(dev, B43_MMIO_CHANNEL_EXT)</div><div class='del'>-				    &amp; 0xF7BF);</div><div class='add'>+static u8 b43_gphy_aci_detect(struct b43_wldev *dev, u8 channel)</div><div class='add'>+{</div><div class='add'>+	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='add'>+	struct b43_phy_g *gphy = phy-&gt;g;</div><div class='add'>+	u8 ret = 0;</div><div class='add'>+	u16 saved, rssi, temp;</div><div class='add'>+	int i, j = 0;</div><div class='add'>+</div><div class='add'>+	saved = b43_phy_read(dev, 0x0403);</div><div class='add'>+	b43_switch_channel(dev, channel);</div><div class='add'>+	b43_phy_write(dev, 0x0403, (saved &amp; 0xFFF8) | 5);</div><div class='add'>+	if (gphy-&gt;aci_hw_rssi)</div><div class='add'>+		rssi = b43_phy_read(dev, 0x048A) &amp; 0x3F;</div><div class='add'>+	else</div><div class='add'>+		rssi = saved &amp; 0x3F;</div><div class='add'>+	/* clamp temp to signed 5bit */</div><div class='add'>+	if (rssi &gt; 32)</div><div class='add'>+		rssi -= 64;</div><div class='add'>+	for (i = 0; i &lt; 100; i++) {</div><div class='add'>+		temp = (b43_phy_read(dev, 0x047F) &gt;&gt; 8) &amp; 0x3F;</div><div class='add'>+		if (temp &gt; 32)</div><div class='add'>+			temp -= 64;</div><div class='add'>+		if (temp &lt; rssi)</div><div class='add'>+			j++;</div><div class='add'>+		if (j &gt;= 20)</div><div class='add'>+			ret = 1;</div><div class='add'>+	}</div><div class='add'>+	b43_phy_write(dev, 0x0403, saved);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 b43_gphy_aci_scan(struct b43_wldev *dev)</div><div class='add'>+{</div><div class='add'>+	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='add'>+	u8 ret[13];</div><div class='add'>+	unsigned int channel = phy-&gt;channel;</div><div class='add'>+	unsigned int i, j, start, end;</div><div class='add'>+</div><div class='add'>+	if (!((phy-&gt;type == B43_PHYTYPE_G) &amp;&amp; (phy-&gt;rev &gt; 0)))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	b43_phy_lock(dev);</div><div class='add'>+	b43_radio_lock(dev);</div><div class='add'>+	b43_phy_write(dev, 0x0802, b43_phy_read(dev, 0x0802) &amp; 0xFFFC);</div><div class='add'>+	b43_phy_write(dev, B43_PHY_G_CRS,</div><div class='add'>+		      b43_phy_read(dev, B43_PHY_G_CRS) &amp; 0x7FFF);</div><div class='add'>+	b43_set_all_gains(dev, 3, 8, 1);</div><div class='add'>+</div><div class='add'>+	start = (channel - 5 &gt; 0) ? channel - 5 : 1;</div><div class='add'>+	end = (channel + 5 &lt; 14) ? channel + 5 : 13;</div><div class='add'>+</div><div class='add'>+	for (i = start; i &lt;= end; i++) {</div><div class='add'>+		if (abs(channel - i) &gt; 2)</div><div class='add'>+			ret[i - 1] = b43_gphy_aci_detect(dev, i);</div><div class='add'>+	}</div><div class='add'>+	b43_switch_channel(dev, channel);</div><div class='add'>+	b43_phy_write(dev, 0x0802,</div><div class='add'>+		      (b43_phy_read(dev, 0x0802) &amp; 0xFFFC) | 0x0003);</div><div class='add'>+	b43_phy_write(dev, 0x0403, b43_phy_read(dev, 0x0403) &amp; 0xFFF8);</div><div class='add'>+	b43_phy_write(dev, B43_PHY_G_CRS,</div><div class='add'>+		      b43_phy_read(dev, B43_PHY_G_CRS) | 0x8000);</div><div class='add'>+	b43_set_original_gains(dev);</div><div class='add'>+	for (i = 0; i &lt; 13; i++) {</div><div class='add'>+		if (!ret[i])</div><div class='add'>+			continue;</div><div class='add'>+		end = (i + 5 &lt; 13) ? i + 5 : 13;</div><div class='add'>+		for (j = i; j &lt; end; j++)</div><div class='add'>+			ret[j] = 1;</div><div class='add'>+	}</div><div class='add'>+	b43_radio_unlock(dev);</div><div class='add'>+	b43_phy_unlock(dev);</div><div class='add'>+</div><div class='add'>+	return ret[channel - 1];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static s32 b43_tssi2dbm_ad(s32 num, s32 den)</div><div class='add'>+{</div><div class='add'>+	if (num &lt; 0)</div><div class='add'>+		return num / den;</div><div class='add'>+	else</div><div class='add'>+		return (num + den / 2) / den;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static s8 b43_tssi2dbm_entry(s8 entry[], u8 index,</div><div class='add'>+			     s16 pab0, s16 pab1, s16 pab2)</div><div class='add'>+{</div><div class='add'>+	s32 m1, m2, f = 256, q, delta;</div><div class='add'>+	s8 i = 0;</div><div class='add'>+</div><div class='add'>+	m1 = b43_tssi2dbm_ad(16 * pab0 + index * pab1, 32);</div><div class='add'>+	m2 = max(b43_tssi2dbm_ad(32768 + index * pab2, 256), 1);</div><div class='add'>+	do {</div><div class='add'>+		if (i &gt; 15)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		q = b43_tssi2dbm_ad(f * 4096 -</div><div class='add'>+				    b43_tssi2dbm_ad(m2 * f, 16) * f, 2048);</div><div class='add'>+		delta = abs(q - f);</div><div class='add'>+		f = q;</div><div class='add'>+		i++;</div><div class='add'>+	} while (delta &gt;= 2);</div><div class='add'>+	entry[index] = clamp_val(b43_tssi2dbm_ad(m1 * f, 8192), -127, 128);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u8 * b43_generate_dyn_tssi2dbm_tab(struct b43_wldev *dev,</div><div class='add'>+				   s16 pab0, s16 pab1, s16 pab2)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+	u8 *tab;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	tab = kmalloc(64, GFP_KERNEL);</div><div class='add'>+	if (!tab) {</div><div class='add'>+		b43err(dev-&gt;wl, "Could not allocate memory "</div><div class='add'>+		       "for tssi2dbm table\n");</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+	for (i = 0; i &lt; 64; i++) {</div><div class='add'>+		err = b43_tssi2dbm_entry(tab, i, pab0, pab1, pab2);</div><div class='add'>+		if (err) {</div><div class='add'>+			b43err(dev-&gt;wl, "Could not generate "</div><div class='add'>+			       "tssi2dBm table\n");</div><div class='add'>+			kfree(tab);</div><div class='add'>+			return NULL;</div><div class='ctx'> 		}</div><div class='del'>-		break;</div><div class='del'>-	case B43_PHYTYPE_N:</div><div class='del'>-		err = b43_nphy_selectchannel(dev, channel);</div><div class='del'>-		if (err)</div><div class='del'>-			goto out;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		B43_WARN_ON(1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	phy-&gt;channel = channel;</div><div class='del'>-	/* Wait for the radio to tune to the channel and stabilize. */</div><div class='del'>-	msleep(8);</div><div class='del'>-out:</div><div class='del'>-	if (err) {</div><div class='del'>-		b43_shm_write16(dev, B43_SHM_SHARED,</div><div class='del'>-				B43_SHM_SH_CHAN, savedcookie);</div><div class='add'>+	return tab;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Initialise the TSSI-&gt;dBm lookup table */</div><div class='add'>+static int b43_gphy_init_tssi2dbm_table(struct b43_wldev *dev)</div><div class='add'>+{</div><div class='add'>+	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='add'>+	struct b43_phy_g *gphy = phy-&gt;g;</div><div class='add'>+	s16 pab0, pab1, pab2;</div><div class='add'>+</div><div class='add'>+	pab0 = (s16) (dev-&gt;dev-&gt;bus-&gt;sprom.pa0b0);</div><div class='add'>+	pab1 = (s16) (dev-&gt;dev-&gt;bus-&gt;sprom.pa0b1);</div><div class='add'>+	pab2 = (s16) (dev-&gt;dev-&gt;bus-&gt;sprom.pa0b2);</div><div class='add'>+</div><div class='add'>+	B43_WARN_ON((dev-&gt;dev-&gt;bus-&gt;chip_id == 0x4301) &amp;&amp;</div><div class='add'>+		    (phy-&gt;radio_ver != 0x2050)); /* Not supported anymore */</div><div class='add'>+</div><div class='add'>+	gphy-&gt;dyn_tssi_tbl = 0;</div><div class='add'>+</div><div class='add'>+	if (pab0 != 0 &amp;&amp; pab1 != 0 &amp;&amp; pab2 != 0 &amp;&amp;</div><div class='add'>+	    pab0 != -1 &amp;&amp; pab1 != -1 &amp;&amp; pab2 != -1) {</div><div class='add'>+		/* The pabX values are set in SPROM. Use them. */</div><div class='add'>+		if ((s8) dev-&gt;dev-&gt;bus-&gt;sprom.itssi_bg != 0 &amp;&amp;</div><div class='add'>+		    (s8) dev-&gt;dev-&gt;bus-&gt;sprom.itssi_bg != -1) {</div><div class='add'>+			gphy-&gt;tgt_idle_tssi =</div><div class='add'>+				(s8) (dev-&gt;dev-&gt;bus-&gt;sprom.itssi_bg);</div><div class='add'>+		} else</div><div class='add'>+			gphy-&gt;tgt_idle_tssi = 62;</div><div class='add'>+		gphy-&gt;tssi2dbm = b43_generate_dyn_tssi2dbm_tab(dev, pab0,</div><div class='add'>+							       pab1, pab2);</div><div class='add'>+		if (!gphy-&gt;tssi2dbm)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		gphy-&gt;dyn_tssi_tbl = 1;</div><div class='add'>+	} else {</div><div class='add'>+		/* pabX values not set in SPROM. */</div><div class='add'>+		gphy-&gt;tgt_idle_tssi = 52;</div><div class='add'>+		gphy-&gt;tssi2dbm = b43_tssi2dbm_g_table;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int b43_gphy_op_allocate(struct b43_wldev *dev)</div><div class='add'>+{</div><div class='add'>+	struct b43_phy_g *gphy;</div><div class='add'>+	struct b43_txpower_lo_control *lo;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	gphy = kzalloc(sizeof(*gphy), GFP_KERNEL);</div><div class='add'>+	if (!gphy) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+	dev-&gt;phy.g = gphy;</div><div class='add'>+</div><div class='add'>+	lo = kzalloc(sizeof(*lo), GFP_KERNEL);</div><div class='add'>+	if (!lo) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto err_free_gphy;</div><div class='add'>+	}</div><div class='add'>+	gphy-&gt;lo_control = lo;</div><div class='add'>+</div><div class='add'>+	err = b43_gphy_init_tssi2dbm_table(dev);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_free_lo;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_free_lo:</div><div class='add'>+	kfree(lo);</div><div class='add'>+err_free_gphy:</div><div class='add'>+	kfree(gphy);</div><div class='add'>+error:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void b43_radio_turn_on(struct b43_wldev *dev)</div><div class='add'>+static void b43_gphy_op_prepare_structs(struct b43_wldev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='del'>-	int err;</div><div class='del'>-	u8 channel;</div><div class='add'>+	struct b43_phy_g *gphy = phy-&gt;g;</div><div class='add'>+	const void *tssi2dbm;</div><div class='add'>+	int tgt_idle_tssi;</div><div class='add'>+	struct b43_txpower_lo_control *lo;</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	/* tssi2dbm table is constant, so it is initialized at alloc time.</div><div class='add'>+	 * Save a copy of the pointer. */</div><div class='add'>+	tssi2dbm = gphy-&gt;tssi2dbm;</div><div class='add'>+	tgt_idle_tssi = gphy-&gt;tgt_idle_tssi;</div><div class='add'>+	/* Save the LO pointer. */</div><div class='add'>+	lo = gphy-&gt;lo_control;</div><div class='add'>+</div><div class='add'>+	/* Zero out the whole PHY structure. */</div><div class='add'>+	memset(gphy, 0, sizeof(*gphy));</div><div class='add'>+</div><div class='add'>+	/* Restore pointers. */</div><div class='add'>+	gphy-&gt;tssi2dbm = tssi2dbm;</div><div class='add'>+	gphy-&gt;tgt_idle_tssi = tgt_idle_tssi;</div><div class='add'>+	gphy-&gt;lo_control = lo;</div><div class='add'>+</div><div class='add'>+	memset(gphy-&gt;minlowsig, 0xFF, sizeof(gphy-&gt;minlowsig));</div><div class='add'>+</div><div class='add'>+	/* NRSSI */</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(gphy-&gt;nrssi); i++)</div><div class='add'>+		gphy-&gt;nrssi[i] = -1000;</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(gphy-&gt;nrssi_lt); i++)</div><div class='add'>+		gphy-&gt;nrssi_lt[i] = i;</div><div class='add'>+</div><div class='add'>+	gphy-&gt;lofcal = 0xFFFF;</div><div class='add'>+	gphy-&gt;initval = 0xFFFF;</div><div class='add'>+</div><div class='add'>+	gphy-&gt;interfmode = B43_INTERFMODE_NONE;</div><div class='add'>+</div><div class='add'>+	/* OFDM-table address caching. */</div><div class='add'>+	gphy-&gt;ofdmtab_addr_direction = B43_OFDMTAB_DIRECTION_UNKNOWN;</div><div class='add'>+</div><div class='add'>+	gphy-&gt;average_tssi = 0xFF;</div><div class='add'>+</div><div class='add'>+	/* Local Osciallator structure */</div><div class='add'>+	lo-&gt;tx_bias = 0xFF;</div><div class='add'>+	INIT_LIST_HEAD(&amp;lo-&gt;calib_list);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void b43_gphy_op_free(struct b43_wldev *dev)</div><div class='add'>+{</div><div class='add'>+	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='add'>+	struct b43_phy_g *gphy = phy-&gt;g;</div><div class='add'>+</div><div class='add'>+	kfree(gphy-&gt;lo_control);</div><div class='add'>+</div><div class='add'>+	if (gphy-&gt;dyn_tssi_tbl)</div><div class='add'>+		kfree(gphy-&gt;tssi2dbm);</div><div class='add'>+	gphy-&gt;dyn_tssi_tbl = 0;</div><div class='add'>+	gphy-&gt;tssi2dbm = NULL;</div><div class='add'>+</div><div class='add'>+	kfree(gphy);</div><div class='add'>+	dev-&gt;phy.g = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int b43_gphy_op_prepare_hardware(struct b43_wldev *dev)</div><div class='add'>+{</div><div class='add'>+	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='add'>+	struct b43_phy_g *gphy = phy-&gt;g;</div><div class='add'>+	struct b43_txpower_lo_control *lo = gphy-&gt;lo_control;</div><div class='add'>+</div><div class='add'>+	B43_WARN_ON(phy-&gt;type != B43_PHYTYPE_G);</div><div class='add'>+</div><div class='add'>+	default_baseband_attenuation(dev, &amp;gphy-&gt;bbatt);</div><div class='add'>+	default_radio_attenuation(dev, &amp;gphy-&gt;rfatt);</div><div class='add'>+	gphy-&gt;tx_control = (default_tx_control(dev) &lt;&lt; 4);</div><div class='add'>+	generate_rfatt_list(dev, &amp;lo-&gt;rfatt_list);</div><div class='add'>+	generate_bbatt_list(dev, &amp;lo-&gt;bbatt_list);</div><div class='add'>+</div><div class='add'>+	/* Commit previous writes */</div><div class='add'>+	b43_read32(dev, B43_MMIO_MACCTL);</div><div class='add'>+</div><div class='add'>+	if (phy-&gt;rev == 1) {</div><div class='add'>+		/* Workaround: Temporarly disable gmode through the early init</div><div class='add'>+		 * phase, as the gmode stuff is not needed for phy rev 1 */</div><div class='add'>+		phy-&gt;gmode = 0;</div><div class='add'>+		b43_wireless_core_reset(dev, 0);</div><div class='add'>+		b43_phy_initg(dev);</div><div class='add'>+		phy-&gt;gmode = 1;</div><div class='add'>+		b43_wireless_core_reset(dev, B43_TMSLOW_GMODE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int b43_gphy_op_init(struct b43_wldev *dev)</div><div class='add'>+{</div><div class='add'>+	b43_phy_initg(dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void b43_gphy_op_exit(struct b43_wldev *dev)</div><div class='add'>+{</div><div class='add'>+	b43_lo_g_cleanup(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 b43_gphy_op_read(struct b43_wldev *dev, u16 reg)</div><div class='add'>+{</div><div class='add'>+	b43_write16(dev, B43_MMIO_PHY_CONTROL, reg);</div><div class='add'>+	return b43_read16(dev, B43_MMIO_PHY_DATA);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void b43_gphy_op_write(struct b43_wldev *dev, u16 reg, u16 value)</div><div class='add'>+{</div><div class='add'>+	b43_write16(dev, B43_MMIO_PHY_CONTROL, reg);</div><div class='add'>+	b43_write16(dev, B43_MMIO_PHY_DATA, value);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 b43_gphy_op_radio_read(struct b43_wldev *dev, u16 reg)</div><div class='add'>+{</div><div class='add'>+	/* Register 1 is a 32-bit register. */</div><div class='add'>+	B43_WARN_ON(reg == 1);</div><div class='add'>+	/* G-PHY needs 0x80 for read access. */</div><div class='add'>+	reg |= 0x80;</div><div class='add'>+</div><div class='add'>+	b43_write16(dev, B43_MMIO_RADIO_CONTROL, reg);</div><div class='add'>+	return b43_read16(dev, B43_MMIO_RADIO_DATA_LOW);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void b43_gphy_op_radio_write(struct b43_wldev *dev, u16 reg, u16 value)</div><div class='add'>+{</div><div class='add'>+	/* Register 1 is a 32-bit register. */</div><div class='add'>+	B43_WARN_ON(reg == 1);</div><div class='add'>+</div><div class='add'>+	b43_write16(dev, B43_MMIO_RADIO_CONTROL, reg);</div><div class='add'>+	b43_write16(dev, B43_MMIO_RADIO_DATA_LOW, value);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool b43_gphy_op_supports_hwpctl(struct b43_wldev *dev)</div><div class='add'>+{</div><div class='add'>+	return (dev-&gt;phy.rev &gt;= 6);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void b43_gphy_op_software_rfkill(struct b43_wldev *dev,</div><div class='add'>+					enum rfkill_state state)</div><div class='add'>+{</div><div class='add'>+	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='add'>+	struct b43_phy_g *gphy = phy-&gt;g;</div><div class='add'>+	unsigned int channel;</div><div class='ctx'> </div><div class='ctx'> 	might_sleep();</div><div class='ctx'> </div><div class='del'>-	if (phy-&gt;radio_on)</div><div class='del'>-		return;</div><div class='add'>+	if (state == RFKILL_STATE_UNBLOCKED) {</div><div class='add'>+		/* Turn radio ON */</div><div class='add'>+		if (phy-&gt;radio_on)</div><div class='add'>+			return;</div><div class='ctx'> </div><div class='del'>-	switch (phy-&gt;type) {</div><div class='del'>-	case B43_PHYTYPE_A:</div><div class='del'>-		b43_radio_write16(dev, 0x0004, 0x00C0);</div><div class='del'>-		b43_radio_write16(dev, 0x0005, 0x0008);</div><div class='del'>-		b43_phy_write(dev, 0x0010, b43_phy_read(dev, 0x0010) &amp; 0xFFF7);</div><div class='del'>-		b43_phy_write(dev, 0x0011, b43_phy_read(dev, 0x0011) &amp; 0xFFF7);</div><div class='del'>-		b43_radio_init2060(dev);</div><div class='del'>-		break;</div><div class='del'>-	case B43_PHYTYPE_B:</div><div class='del'>-	case B43_PHYTYPE_G:</div><div class='ctx'> 		b43_phy_write(dev, 0x0015, 0x8000);</div><div class='ctx'> 		b43_phy_write(dev, 0x0015, 0xCC00);</div><div class='ctx'> 		b43_phy_write(dev, 0x0015, (phy-&gt;gmode ? 0x00C0 : 0x0000));</div><div class='del'>-		if (phy-&gt;radio_off_context.valid) {</div><div class='add'>+		if (gphy-&gt;radio_off_context.valid) {</div><div class='ctx'> 			/* Restore the RFover values. */</div><div class='ctx'> 			b43_phy_write(dev, B43_PHY_RFOVER,</div><div class='del'>-				      phy-&gt;radio_off_context.rfover);</div><div class='add'>+				      gphy-&gt;radio_off_context.rfover);</div><div class='ctx'> 			b43_phy_write(dev, B43_PHY_RFOVERVAL,</div><div class='del'>-				      phy-&gt;radio_off_context.rfoverval);</div><div class='del'>-			phy-&gt;radio_off_context.valid = 0;</div><div class='add'>+				      gphy-&gt;radio_off_context.rfoverval);</div><div class='add'>+			gphy-&gt;radio_off_context.valid = 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		channel = phy-&gt;channel;</div><div class='del'>-		err = b43_radio_selectchannel(dev, B43_DEFAULT_CHANNEL_BG, 1);</div><div class='del'>-		err |= b43_radio_selectchannel(dev, channel, 0);</div><div class='del'>-		B43_WARN_ON(err);</div><div class='del'>-		break;</div><div class='del'>-	case B43_PHYTYPE_N:</div><div class='del'>-		b43_nphy_radio_turn_on(dev);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		B43_WARN_ON(1);</div><div class='add'>+		b43_gphy_channel_switch(dev, 6, 1);</div><div class='add'>+		b43_gphy_channel_switch(dev, channel, 0);</div><div class='add'>+	} else {</div><div class='add'>+		/* Turn radio OFF */</div><div class='add'>+		u16 rfover, rfoverval;</div><div class='add'>+</div><div class='add'>+		rfover = b43_phy_read(dev, B43_PHY_RFOVER);</div><div class='add'>+		rfoverval = b43_phy_read(dev, B43_PHY_RFOVERVAL);</div><div class='add'>+		gphy-&gt;radio_off_context.rfover = rfover;</div><div class='add'>+		gphy-&gt;radio_off_context.rfoverval = rfoverval;</div><div class='add'>+		gphy-&gt;radio_off_context.valid = 1;</div><div class='add'>+		b43_phy_write(dev, B43_PHY_RFOVER, rfover | 0x008C);</div><div class='add'>+		b43_phy_write(dev, B43_PHY_RFOVERVAL, rfoverval &amp; 0xFF73);</div><div class='ctx'> 	}</div><div class='del'>-	phy-&gt;radio_on = 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void b43_radio_turn_off(struct b43_wldev *dev, bool force)</div><div class='add'>+static int b43_gphy_op_switch_channel(struct b43_wldev *dev,</div><div class='add'>+				      unsigned int new_channel)</div><div class='add'>+{</div><div class='add'>+	if ((new_channel &lt; 1) || (new_channel &gt; 14))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	b43_gphy_channel_switch(dev, new_channel, 0);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int b43_gphy_op_get_default_chan(struct b43_wldev *dev)</div><div class='add'>+{</div><div class='add'>+	return 1; /* Default to channel 1 */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void b43_gphy_op_set_rx_antenna(struct b43_wldev *dev, int antenna)</div><div class='ctx'> {</div><div class='ctx'> 	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='add'>+	u64 hf;</div><div class='add'>+	u16 tmp;</div><div class='add'>+	int autodiv = 0;</div><div class='ctx'> </div><div class='del'>-	if (!phy-&gt;radio_on &amp;&amp; !force)</div><div class='del'>-		return;</div><div class='add'>+	if (antenna == B43_ANTENNA_AUTO0 || antenna == B43_ANTENNA_AUTO1)</div><div class='add'>+		autodiv = 1;</div><div class='add'>+</div><div class='add'>+	hf = b43_hf_read(dev);</div><div class='add'>+	hf &amp;= ~B43_HF_ANTDIVHELP;</div><div class='add'>+	b43_hf_write(dev, hf);</div><div class='add'>+</div><div class='add'>+	tmp = b43_phy_read(dev, B43_PHY_BBANDCFG);</div><div class='add'>+	tmp &amp;= ~B43_PHY_BBANDCFG_RXANT;</div><div class='add'>+	tmp |= (autodiv ? B43_ANTENNA_AUTO0 : antenna)</div><div class='add'>+			&lt;&lt; B43_PHY_BBANDCFG_RXANT_SHIFT;</div><div class='add'>+	b43_phy_write(dev, B43_PHY_BBANDCFG, tmp);</div><div class='add'>+</div><div class='add'>+	if (autodiv) {</div><div class='add'>+		tmp = b43_phy_read(dev, B43_PHY_ANTDWELL);</div><div class='add'>+		if (antenna == B43_ANTENNA_AUTO0)</div><div class='add'>+			tmp &amp;= ~B43_PHY_ANTDWELL_AUTODIV1;</div><div class='add'>+		else</div><div class='add'>+			tmp |= B43_PHY_ANTDWELL_AUTODIV1;</div><div class='add'>+		b43_phy_write(dev, B43_PHY_ANTDWELL, tmp);</div><div class='add'>+	}</div><div class='add'>+	tmp = b43_phy_read(dev, B43_PHY_ANTWRSETT);</div><div class='add'>+	if (autodiv)</div><div class='add'>+		tmp |= B43_PHY_ANTWRSETT_ARXDIV;</div><div class='add'>+	else</div><div class='add'>+		tmp &amp;= ~B43_PHY_ANTWRSETT_ARXDIV;</div><div class='add'>+	b43_phy_write(dev, B43_PHY_ANTWRSETT, tmp);</div><div class='add'>+	if (phy-&gt;rev &gt;= 2) {</div><div class='add'>+		tmp = b43_phy_read(dev, B43_PHY_OFDM61);</div><div class='add'>+		tmp |= B43_PHY_OFDM61_10;</div><div class='add'>+		b43_phy_write(dev, B43_PHY_OFDM61, tmp);</div><div class='add'>+</div><div class='add'>+		tmp =</div><div class='add'>+		    b43_phy_read(dev, B43_PHY_DIVSRCHGAINBACK);</div><div class='add'>+		tmp = (tmp &amp; 0xFF00) | 0x15;</div><div class='add'>+		b43_phy_write(dev, B43_PHY_DIVSRCHGAINBACK,</div><div class='add'>+			      tmp);</div><div class='add'>+</div><div class='add'>+		if (phy-&gt;rev == 2) {</div><div class='add'>+			b43_phy_write(dev, B43_PHY_ADIVRELATED,</div><div class='add'>+				      8);</div><div class='add'>+		} else {</div><div class='add'>+			tmp =</div><div class='add'>+			    b43_phy_read(dev,</div><div class='add'>+					 B43_PHY_ADIVRELATED);</div><div class='add'>+			tmp = (tmp &amp; 0xFF00) | 8;</div><div class='add'>+			b43_phy_write(dev, B43_PHY_ADIVRELATED,</div><div class='add'>+				      tmp);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (phy-&gt;rev &gt;= 6)</div><div class='add'>+		b43_phy_write(dev, B43_PHY_OFDM9B, 0xDC);</div><div class='add'>+</div><div class='add'>+	hf |= B43_HF_ANTDIVHELP;</div><div class='add'>+	b43_hf_write(dev, hf);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	switch (phy-&gt;type) {</div><div class='del'>-	case B43_PHYTYPE_N:</div><div class='del'>-		b43_nphy_radio_turn_off(dev);</div><div class='add'>+static int b43_gphy_op_interf_mitigation(struct b43_wldev *dev,</div><div class='add'>+					 enum b43_interference_mitigation mode)</div><div class='add'>+{</div><div class='add'>+	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='add'>+	struct b43_phy_g *gphy = phy-&gt;g;</div><div class='add'>+	int currentmode;</div><div class='add'>+</div><div class='add'>+	B43_WARN_ON(phy-&gt;type != B43_PHYTYPE_G);</div><div class='add'>+	if ((phy-&gt;rev == 0) || (!phy-&gt;gmode))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	gphy-&gt;aci_wlan_automatic = 0;</div><div class='add'>+	switch (mode) {</div><div class='add'>+	case B43_INTERFMODE_AUTOWLAN:</div><div class='add'>+		gphy-&gt;aci_wlan_automatic = 1;</div><div class='add'>+		if (gphy-&gt;aci_enable)</div><div class='add'>+			mode = B43_INTERFMODE_MANUALWLAN;</div><div class='add'>+		else</div><div class='add'>+			mode = B43_INTERFMODE_NONE;</div><div class='ctx'> 		break;</div><div class='del'>-	case B43_PHYTYPE_A:</div><div class='del'>-		b43_radio_write16(dev, 0x0004, 0x00FF);</div><div class='del'>-		b43_radio_write16(dev, 0x0005, 0x00FB);</div><div class='del'>-		b43_phy_write(dev, 0x0010, b43_phy_read(dev, 0x0010) | 0x0008);</div><div class='del'>-		b43_phy_write(dev, 0x0011, b43_phy_read(dev, 0x0011) | 0x0008);</div><div class='add'>+	case B43_INTERFMODE_NONE:</div><div class='add'>+	case B43_INTERFMODE_NONWLAN:</div><div class='add'>+	case B43_INTERFMODE_MANUALWLAN:</div><div class='ctx'> 		break;</div><div class='del'>-	case B43_PHYTYPE_G: {</div><div class='del'>-		u16 rfover, rfoverval;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		rfover = b43_phy_read(dev, B43_PHY_RFOVER);</div><div class='del'>-		rfoverval = b43_phy_read(dev, B43_PHY_RFOVERVAL);</div><div class='del'>-		if (!force) {</div><div class='del'>-			phy-&gt;radio_off_context.rfover = rfover;</div><div class='del'>-			phy-&gt;radio_off_context.rfoverval = rfoverval;</div><div class='del'>-			phy-&gt;radio_off_context.valid = 1;</div><div class='add'>+	currentmode = gphy-&gt;interfmode;</div><div class='add'>+	if (currentmode == mode)</div><div class='add'>+		return 0;</div><div class='add'>+	if (currentmode != B43_INTERFMODE_NONE)</div><div class='add'>+		b43_radio_interference_mitigation_disable(dev, currentmode);</div><div class='add'>+</div><div class='add'>+	if (mode == B43_INTERFMODE_NONE) {</div><div class='add'>+		gphy-&gt;aci_enable = 0;</div><div class='add'>+		gphy-&gt;aci_hw_rssi = 0;</div><div class='add'>+	} else</div><div class='add'>+		b43_radio_interference_mitigation_enable(dev, mode);</div><div class='add'>+	gphy-&gt;interfmode = mode;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* http://bcm-specs.sipsolutions.net/EstimatePowerOut</div><div class='add'>+ * This function converts a TSSI value to dBm in Q5.2</div><div class='add'>+ */</div><div class='add'>+static s8 b43_gphy_estimate_power_out(struct b43_wldev *dev, s8 tssi)</div><div class='add'>+{</div><div class='add'>+	struct b43_phy_g *gphy = dev-&gt;phy.g;</div><div class='add'>+	s8 dbm;</div><div class='add'>+	s32 tmp;</div><div class='add'>+</div><div class='add'>+	tmp = (gphy-&gt;tgt_idle_tssi - gphy-&gt;cur_idle_tssi + tssi);</div><div class='add'>+	tmp = clamp_val(tmp, 0x00, 0x3F);</div><div class='add'>+	dbm = gphy-&gt;tssi2dbm[tmp];</div><div class='add'>+</div><div class='add'>+	return dbm;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void b43_put_attenuation_into_ranges(struct b43_wldev *dev,</div><div class='add'>+					    int *_bbatt, int *_rfatt)</div><div class='add'>+{</div><div class='add'>+	int rfatt = *_rfatt;</div><div class='add'>+	int bbatt = *_bbatt;</div><div class='add'>+	struct b43_txpower_lo_control *lo = dev-&gt;phy.g-&gt;lo_control;</div><div class='add'>+</div><div class='add'>+	/* Get baseband and radio attenuation values into their permitted ranges.</div><div class='add'>+	 * Radio attenuation affects power level 4 times as much as baseband. */</div><div class='add'>+</div><div class='add'>+	/* Range constants */</div><div class='add'>+	const int rf_min = lo-&gt;rfatt_list.min_val;</div><div class='add'>+	const int rf_max = lo-&gt;rfatt_list.max_val;</div><div class='add'>+	const int bb_min = lo-&gt;bbatt_list.min_val;</div><div class='add'>+	const int bb_max = lo-&gt;bbatt_list.max_val;</div><div class='add'>+</div><div class='add'>+	while (1) {</div><div class='add'>+		if (rfatt &gt; rf_max &amp;&amp; bbatt &gt; bb_max - 4)</div><div class='add'>+			break;	/* Can not get it into ranges */</div><div class='add'>+		if (rfatt &lt; rf_min &amp;&amp; bbatt &lt; bb_min + 4)</div><div class='add'>+			break;	/* Can not get it into ranges */</div><div class='add'>+		if (bbatt &gt; bb_max &amp;&amp; rfatt &gt; rf_max - 1)</div><div class='add'>+			break;	/* Can not get it into ranges */</div><div class='add'>+		if (bbatt &lt; bb_min &amp;&amp; rfatt &lt; rf_min + 1)</div><div class='add'>+			break;	/* Can not get it into ranges */</div><div class='add'>+</div><div class='add'>+		if (bbatt &gt; bb_max) {</div><div class='add'>+			bbatt -= 4;</div><div class='add'>+			rfatt += 1;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		if (bbatt &lt; bb_min) {</div><div class='add'>+			bbatt += 4;</div><div class='add'>+			rfatt -= 1;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		if (rfatt &gt; rf_max) {</div><div class='add'>+			rfatt -= 1;</div><div class='add'>+			bbatt += 4;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		if (rfatt &lt; rf_min) {</div><div class='add'>+			rfatt += 1;</div><div class='add'>+			bbatt -= 4;</div><div class='add'>+			continue;</div><div class='ctx'> 		}</div><div class='del'>-		b43_phy_write(dev, B43_PHY_RFOVER, rfover | 0x008C);</div><div class='del'>-		b43_phy_write(dev, B43_PHY_RFOVERVAL, rfoverval &amp; 0xFF73);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	default:</div><div class='del'>-		B43_WARN_ON(1);</div><div class='add'>+</div><div class='add'>+	*_rfatt = clamp_val(rfatt, rf_min, rf_max);</div><div class='add'>+	*_bbatt = clamp_val(bbatt, bb_min, bb_max);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void b43_gphy_op_adjust_txpower(struct b43_wldev *dev)</div><div class='add'>+{</div><div class='add'>+	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='add'>+	struct b43_phy_g *gphy = phy-&gt;g;</div><div class='add'>+	int rfatt, bbatt;</div><div class='add'>+	u8 tx_control;</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(&amp;dev-&gt;wl-&gt;irq_lock);</div><div class='add'>+</div><div class='add'>+	/* Calculate the new attenuation values. */</div><div class='add'>+	bbatt = gphy-&gt;bbatt.att;</div><div class='add'>+	bbatt += gphy-&gt;bbatt_delta;</div><div class='add'>+	rfatt = gphy-&gt;rfatt.att;</div><div class='add'>+	rfatt += gphy-&gt;rfatt_delta;</div><div class='add'>+</div><div class='add'>+	b43_put_attenuation_into_ranges(dev, &amp;bbatt, &amp;rfatt);</div><div class='add'>+	tx_control = gphy-&gt;tx_control;</div><div class='add'>+	if ((phy-&gt;radio_ver == 0x2050) &amp;&amp; (phy-&gt;radio_rev == 2)) {</div><div class='add'>+		if (rfatt &lt;= 1) {</div><div class='add'>+			if (tx_control == 0) {</div><div class='add'>+				tx_control =</div><div class='add'>+				    B43_TXCTL_PA2DB |</div><div class='add'>+				    B43_TXCTL_TXMIX;</div><div class='add'>+				rfatt += 2;</div><div class='add'>+				bbatt += 2;</div><div class='add'>+			} else if (dev-&gt;dev-&gt;bus-&gt;sprom.</div><div class='add'>+				   boardflags_lo &amp;</div><div class='add'>+				   B43_BFL_PACTRL) {</div><div class='add'>+				bbatt += 4 * (rfatt - 2);</div><div class='add'>+				rfatt = 2;</div><div class='add'>+			}</div><div class='add'>+		} else if (rfatt &gt; 4 &amp;&amp; tx_control) {</div><div class='add'>+			tx_control = 0;</div><div class='add'>+			if (bbatt &lt; 3) {</div><div class='add'>+				rfatt -= 3;</div><div class='add'>+				bbatt += 2;</div><div class='add'>+			} else {</div><div class='add'>+				rfatt -= 2;</div><div class='add'>+				bbatt -= 2;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	phy-&gt;radio_on = 0;</div><div class='add'>+	/* Save the control values */</div><div class='add'>+	gphy-&gt;tx_control = tx_control;</div><div class='add'>+	b43_put_attenuation_into_ranges(dev, &amp;bbatt, &amp;rfatt);</div><div class='add'>+	gphy-&gt;rfatt.att = rfatt;</div><div class='add'>+	gphy-&gt;bbatt.att = bbatt;</div><div class='add'>+</div><div class='add'>+	/* We drop the lock early, so we can sleep during hardware</div><div class='add'>+	 * adjustment. Possible races with op_recalc_txpower are harmless,</div><div class='add'>+	 * as we will be called once again in case we raced. */</div><div class='add'>+	spin_unlock_irq(&amp;dev-&gt;wl-&gt;irq_lock);</div><div class='add'>+</div><div class='add'>+	if (b43_debug(dev, B43_DBG_XMITPOWER))</div><div class='add'>+		b43dbg(dev-&gt;wl, "Adjusting TX power\n");</div><div class='add'>+</div><div class='add'>+	/* Adjust the hardware */</div><div class='add'>+	b43_phy_lock(dev);</div><div class='add'>+	b43_radio_lock(dev);</div><div class='add'>+	b43_set_txpower_g(dev, &amp;gphy-&gt;bbatt, &amp;gphy-&gt;rfatt,</div><div class='add'>+			  gphy-&gt;tx_control);</div><div class='add'>+	b43_radio_unlock(dev);</div><div class='add'>+	b43_phy_unlock(dev);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static enum b43_txpwr_result b43_gphy_op_recalc_txpower(struct b43_wldev *dev,</div><div class='add'>+							bool ignore_tssi)</div><div class='add'>+{</div><div class='add'>+	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='add'>+	struct b43_phy_g *gphy = phy-&gt;g;</div><div class='add'>+	unsigned int average_tssi;</div><div class='add'>+	int cck_result, ofdm_result;</div><div class='add'>+	int estimated_pwr, desired_pwr, pwr_adjust;</div><div class='add'>+	int rfatt_delta, bbatt_delta;</div><div class='add'>+	unsigned int max_pwr;</div><div class='add'>+</div><div class='add'>+	/* First get the average TSSI */</div><div class='add'>+	cck_result = b43_phy_shm_tssi_read(dev, B43_SHM_SH_TSSI_CCK);</div><div class='add'>+	ofdm_result = b43_phy_shm_tssi_read(dev, B43_SHM_SH_TSSI_OFDM_G);</div><div class='add'>+	if ((cck_result &lt; 0) &amp;&amp; (ofdm_result &lt; 0)) {</div><div class='add'>+		/* No TSSI information available */</div><div class='add'>+		if (!ignore_tssi)</div><div class='add'>+			goto no_adjustment_needed;</div><div class='add'>+		cck_result = 0;</div><div class='add'>+		ofdm_result = 0;</div><div class='add'>+	}</div><div class='add'>+	if (cck_result &lt; 0)</div><div class='add'>+		average_tssi = ofdm_result;</div><div class='add'>+	else if (ofdm_result &lt; 0)</div><div class='add'>+		average_tssi = cck_result;</div><div class='add'>+	else</div><div class='add'>+		average_tssi = (cck_result + ofdm_result) / 2;</div><div class='add'>+	/* Merge the average with the stored value. */</div><div class='add'>+	if (likely(gphy-&gt;average_tssi != 0xFF))</div><div class='add'>+		average_tssi = (average_tssi + gphy-&gt;average_tssi) / 2;</div><div class='add'>+	gphy-&gt;average_tssi = average_tssi;</div><div class='add'>+	B43_WARN_ON(average_tssi &gt;= B43_TSSI_MAX);</div><div class='add'>+</div><div class='add'>+	/* Estimate the TX power emission based on the TSSI */</div><div class='add'>+	estimated_pwr = b43_gphy_estimate_power_out(dev, average_tssi);</div><div class='add'>+</div><div class='add'>+	B43_WARN_ON(phy-&gt;type != B43_PHYTYPE_G);</div><div class='add'>+	max_pwr = dev-&gt;dev-&gt;bus-&gt;sprom.maxpwr_bg;</div><div class='add'>+	if (dev-&gt;dev-&gt;bus-&gt;sprom.boardflags_lo &amp; B43_BFL_PACTRL)</div><div class='add'>+		max_pwr -= 3; /* minus 0.75 */</div><div class='add'>+	if (unlikely(max_pwr &gt;= INT_TO_Q52(30/*dBm*/))) {</div><div class='add'>+		b43warn(dev-&gt;wl,</div><div class='add'>+			"Invalid max-TX-power value in SPROM.\n");</div><div class='add'>+		max_pwr = INT_TO_Q52(20); /* fake it */</div><div class='add'>+		dev-&gt;dev-&gt;bus-&gt;sprom.maxpwr_bg = max_pwr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Get desired power (in Q5.2) */</div><div class='add'>+	if (phy-&gt;desired_txpower &lt; 0)</div><div class='add'>+		desired_pwr = INT_TO_Q52(0);</div><div class='add'>+	else</div><div class='add'>+		desired_pwr = INT_TO_Q52(phy-&gt;desired_txpower);</div><div class='add'>+	/* And limit it. max_pwr already is Q5.2 */</div><div class='add'>+	desired_pwr = clamp_val(desired_pwr, 0, max_pwr);</div><div class='add'>+	if (b43_debug(dev, B43_DBG_XMITPOWER)) {</div><div class='add'>+		b43dbg(dev-&gt;wl,</div><div class='add'>+		       "[TX power]  current = " Q52_FMT</div><div class='add'>+		       " dBm,  desired = " Q52_FMT</div><div class='add'>+		       " dBm,  max = " Q52_FMT "\n",</div><div class='add'>+		       Q52_ARG(estimated_pwr),</div><div class='add'>+		       Q52_ARG(desired_pwr),</div><div class='add'>+		       Q52_ARG(max_pwr));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Calculate the adjustment delta. */</div><div class='add'>+	pwr_adjust = desired_pwr - estimated_pwr;</div><div class='add'>+	if (pwr_adjust == 0)</div><div class='add'>+		goto no_adjustment_needed;</div><div class='add'>+</div><div class='add'>+	/* RF attenuation delta. */</div><div class='add'>+	rfatt_delta = ((pwr_adjust + 7) / 8);</div><div class='add'>+	/* Lower attenuation =&gt; Bigger power output. Negate it. */</div><div class='add'>+	rfatt_delta = -rfatt_delta;</div><div class='add'>+</div><div class='add'>+	/* Baseband attenuation delta. */</div><div class='add'>+	bbatt_delta = pwr_adjust / 2;</div><div class='add'>+	/* Lower attenuation =&gt; Bigger power output. Negate it. */</div><div class='add'>+	bbatt_delta = -bbatt_delta;</div><div class='add'>+	/* RF att affects power level 4 times as much as</div><div class='add'>+	 * Baseband attennuation. Subtract it. */</div><div class='add'>+	bbatt_delta -= 4 * rfatt_delta;</div><div class='add'>+</div><div class='add'>+	if (b43_debug(dev, B43_DBG_XMITPOWER)) {</div><div class='add'>+		int dbm = pwr_adjust &lt; 0 ? -pwr_adjust : pwr_adjust;</div><div class='add'>+		b43dbg(dev-&gt;wl,</div><div class='add'>+		       "[TX power deltas]  %s" Q52_FMT " dBm   =&gt;   "</div><div class='add'>+		       "bbatt-delta = %d,  rfatt-delta = %d\n",</div><div class='add'>+		       (pwr_adjust &lt; 0 ? "-" : ""), Q52_ARG(dbm),</div><div class='add'>+		       bbatt_delta, rfatt_delta);</div><div class='add'>+	}</div><div class='add'>+	/* So do we finally need to adjust something in hardware? */</div><div class='add'>+	if ((rfatt_delta == 0) &amp;&amp; (bbatt_delta == 0))</div><div class='add'>+		goto no_adjustment_needed;</div><div class='add'>+</div><div class='add'>+	/* Save the deltas for later when we adjust the power. */</div><div class='add'>+	gphy-&gt;bbatt_delta = bbatt_delta;</div><div class='add'>+	gphy-&gt;rfatt_delta = rfatt_delta;</div><div class='add'>+</div><div class='add'>+	/* We need to adjust the TX power on the device. */</div><div class='add'>+	return B43_TXPWR_RES_NEED_ADJUST;</div><div class='add'>+</div><div class='add'>+no_adjustment_needed:</div><div class='add'>+	return B43_TXPWR_RES_DONE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void b43_gphy_op_pwork_15sec(struct b43_wldev *dev)</div><div class='add'>+{</div><div class='add'>+	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='add'>+	struct b43_phy_g *gphy = phy-&gt;g;</div><div class='add'>+</div><div class='add'>+	//TODO: update_aci_moving_average</div><div class='add'>+	if (gphy-&gt;aci_enable &amp;&amp; gphy-&gt;aci_wlan_automatic) {</div><div class='add'>+		b43_mac_suspend(dev);</div><div class='add'>+		if (!gphy-&gt;aci_enable &amp;&amp; 1 /*TODO: not scanning? */ ) {</div><div class='add'>+			if (0 /*TODO: bunch of conditions */ ) {</div><div class='add'>+				phy-&gt;ops-&gt;interf_mitigation(dev,</div><div class='add'>+					B43_INTERFMODE_MANUALWLAN);</div><div class='add'>+			}</div><div class='add'>+		} else if (0 /*TODO*/) {</div><div class='add'>+			   if (/*(aci_average &gt; 1000) &amp;&amp;*/ !b43_gphy_aci_scan(dev))</div><div class='add'>+				phy-&gt;ops-&gt;interf_mitigation(dev, B43_INTERFMODE_NONE);</div><div class='add'>+		}</div><div class='add'>+		b43_mac_enable(dev);</div><div class='add'>+	} else if (gphy-&gt;interfmode == B43_INTERFMODE_NONWLAN &amp;&amp;</div><div class='add'>+		   phy-&gt;rev == 1) {</div><div class='add'>+		//TODO: implement rev1 workaround</div><div class='add'>+	}</div><div class='add'>+	b43_lo_g_maintanance_work(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void b43_gphy_op_pwork_60sec(struct b43_wldev *dev)</div><div class='add'>+{</div><div class='add'>+	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='add'>+</div><div class='add'>+	if (!(dev-&gt;dev-&gt;bus-&gt;sprom.boardflags_lo &amp; B43_BFL_RSSI))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	b43_mac_suspend(dev);</div><div class='add'>+	b43_calc_nrssi_slope(dev);</div><div class='add'>+	if ((phy-&gt;radio_ver == 0x2050) &amp;&amp; (phy-&gt;radio_rev == 8)) {</div><div class='add'>+		u8 old_chan = phy-&gt;channel;</div><div class='add'>+</div><div class='add'>+		/* VCO Calibration */</div><div class='add'>+		if (old_chan &gt;= 8)</div><div class='add'>+			b43_switch_channel(dev, 1);</div><div class='add'>+		else</div><div class='add'>+			b43_switch_channel(dev, 13);</div><div class='add'>+		b43_switch_channel(dev, old_chan);</div><div class='add'>+	}</div><div class='add'>+	b43_mac_enable(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct b43_phy_operations b43_phyops_g = {</div><div class='add'>+	.allocate		= b43_gphy_op_allocate,</div><div class='add'>+	.free			= b43_gphy_op_free,</div><div class='add'>+	.prepare_structs	= b43_gphy_op_prepare_structs,</div><div class='add'>+	.prepare_hardware	= b43_gphy_op_prepare_hardware,</div><div class='add'>+	.init			= b43_gphy_op_init,</div><div class='add'>+	.exit			= b43_gphy_op_exit,</div><div class='add'>+	.phy_read		= b43_gphy_op_read,</div><div class='add'>+	.phy_write		= b43_gphy_op_write,</div><div class='add'>+	.radio_read		= b43_gphy_op_radio_read,</div><div class='add'>+	.radio_write		= b43_gphy_op_radio_write,</div><div class='add'>+	.supports_hwpctl	= b43_gphy_op_supports_hwpctl,</div><div class='add'>+	.software_rfkill	= b43_gphy_op_software_rfkill,</div><div class='add'>+	.switch_analog		= b43_phyop_switch_analog_generic,</div><div class='add'>+	.switch_channel		= b43_gphy_op_switch_channel,</div><div class='add'>+	.get_default_chan	= b43_gphy_op_get_default_chan,</div><div class='add'>+	.set_rx_antenna		= b43_gphy_op_set_rx_antenna,</div><div class='add'>+	.interf_mitigation	= b43_gphy_op_interf_mitigation,</div><div class='add'>+	.recalc_txpower		= b43_gphy_op_recalc_txpower,</div><div class='add'>+	.adjust_txpower		= b43_gphy_op_adjust_txpower,</div><div class='add'>+	.pwork_15sec		= b43_gphy_op_pwork_15sec,</div><div class='add'>+	.pwork_60sec		= b43_gphy_op_pwork_60sec,</div><div class='add'>+};</div><div class='head'>diff --git a/drivers/net/wireless/b43/phy_g.h b/drivers/net/wireless/b43/phy_g.h<br/>new file mode 100644<br/>index 000000000000..718947fd41ae<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/b43/phy_g.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/b43/phy_g.h</a></div><div class='hunk'>@@ -0,0 +1,209 @@</div><div class='add'>+#ifndef LINUX_B43_PHY_G_H_</div><div class='add'>+#define LINUX_B43_PHY_G_H_</div><div class='add'>+</div><div class='add'>+/* OFDM PHY registers are defined in the A-PHY header. */</div><div class='add'>+#include "phy_a.h"</div><div class='add'>+</div><div class='add'>+/* CCK (B) PHY Registers */</div><div class='add'>+#define B43_PHY_VERSION_CCK		B43_PHY_CCK(0x00)	/* Versioning register for B-PHY */</div><div class='add'>+#define B43_PHY_CCKBBANDCFG		B43_PHY_CCK(0x01)	/* Contains antenna 0/1 control bit */</div><div class='add'>+#define B43_PHY_PGACTL			B43_PHY_CCK(0x15)	/* PGA control */</div><div class='add'>+#define  B43_PHY_PGACTL_LPF		0x1000	/* Low pass filter (?) */</div><div class='add'>+#define  B43_PHY_PGACTL_LOWBANDW	0x0040	/* Low bandwidth flag */</div><div class='add'>+#define  B43_PHY_PGACTL_UNKNOWN		0xEFA0</div><div class='add'>+#define B43_PHY_FBCTL1			B43_PHY_CCK(0x18)	/* Frequency bandwidth control 1 */</div><div class='add'>+#define B43_PHY_ITSSI			B43_PHY_CCK(0x29)	/* Idle TSSI */</div><div class='add'>+#define B43_PHY_LO_LEAKAGE		B43_PHY_CCK(0x2D)	/* Measured LO leakage */</div><div class='add'>+#define B43_PHY_ENERGY			B43_PHY_CCK(0x33)	/* Energy */</div><div class='add'>+#define B43_PHY_SYNCCTL			B43_PHY_CCK(0x35)</div><div class='add'>+#define B43_PHY_FBCTL2			B43_PHY_CCK(0x38)	/* Frequency bandwidth control 2 */</div><div class='add'>+#define B43_PHY_DACCTL			B43_PHY_CCK(0x60)	/* DAC control */</div><div class='add'>+#define B43_PHY_RCCALOVER		B43_PHY_CCK(0x78)	/* RC calibration override */</div><div class='add'>+</div><div class='add'>+/* Extended G-PHY Registers */</div><div class='add'>+#define B43_PHY_CLASSCTL		B43_PHY_EXTG(0x02)	/* Classify control */</div><div class='add'>+#define B43_PHY_GTABCTL			B43_PHY_EXTG(0x03)	/* G-PHY table control (see below) */</div><div class='add'>+#define  B43_PHY_GTABOFF		0x03FF	/* G-PHY table offset (see below) */</div><div class='add'>+#define  B43_PHY_GTABNR			0xFC00	/* G-PHY table number (see below) */</div><div class='add'>+#define  B43_PHY_GTABNR_SHIFT		10</div><div class='add'>+#define B43_PHY_GTABDATA		B43_PHY_EXTG(0x04)	/* G-PHY table data */</div><div class='add'>+#define B43_PHY_LO_MASK			B43_PHY_EXTG(0x0F)	/* Local Oscillator control mask */</div><div class='add'>+#define B43_PHY_LO_CTL			B43_PHY_EXTG(0x10)	/* Local Oscillator control */</div><div class='add'>+#define B43_PHY_RFOVER			B43_PHY_EXTG(0x11)	/* RF override */</div><div class='add'>+#define B43_PHY_RFOVERVAL		B43_PHY_EXTG(0x12)	/* RF override value */</div><div class='add'>+#define  B43_PHY_RFOVERVAL_EXTLNA	0x8000</div><div class='add'>+#define  B43_PHY_RFOVERVAL_LNA		0x7000</div><div class='add'>+#define  B43_PHY_RFOVERVAL_LNA_SHIFT	12</div><div class='add'>+#define  B43_PHY_RFOVERVAL_PGA		0x0F00</div><div class='add'>+#define  B43_PHY_RFOVERVAL_PGA_SHIFT	8</div><div class='add'>+#define  B43_PHY_RFOVERVAL_UNK		0x0010	/* Unknown, always set. */</div><div class='add'>+#define  B43_PHY_RFOVERVAL_TRSWRX	0x00E0</div><div class='add'>+#define  B43_PHY_RFOVERVAL_BW		0x0003	/* Bandwidth flags */</div><div class='add'>+#define   B43_PHY_RFOVERVAL_BW_LPF	0x0001	/* Low Pass Filter */</div><div class='add'>+#define   B43_PHY_RFOVERVAL_BW_LBW	0x0002	/* Low Bandwidth (when set), high when unset */</div><div class='add'>+#define B43_PHY_ANALOGOVER		B43_PHY_EXTG(0x14)	/* Analog override */</div><div class='add'>+#define B43_PHY_ANALOGOVERVAL		B43_PHY_EXTG(0x15)	/* Analog override value */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*** G-PHY table numbers */</div><div class='add'>+#define B43_GTAB(number, offset)	(((number) &lt;&lt; B43_PHY_GTABNR_SHIFT) | (offset))</div><div class='add'>+#define B43_GTAB_NRSSI			B43_GTAB(0x00, 0)</div><div class='add'>+#define B43_GTAB_TRFEMW			B43_GTAB(0x0C, 0x120)</div><div class='add'>+#define B43_GTAB_ORIGTR			B43_GTAB(0x2E, 0x298)</div><div class='add'>+</div><div class='add'>+u16 b43_gtab_read(struct b43_wldev *dev, u16 table, u16 offset);</div><div class='add'>+void b43_gtab_write(struct b43_wldev *dev, u16 table, u16 offset, u16 value);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Returns the boolean whether "TX Magnification" is enabled. */</div><div class='add'>+#define has_tx_magnification(phy) \</div><div class='add'>+	(((phy)-&gt;rev &gt;= 2) &amp;&amp;			\</div><div class='add'>+	 ((phy)-&gt;radio_ver == 0x2050) &amp;&amp;	\</div><div class='add'>+	 ((phy)-&gt;radio_rev == 8))</div><div class='add'>+/* Card uses the loopback gain stuff */</div><div class='add'>+#define has_loopback_gain(phy) \</div><div class='add'>+	(((phy)-&gt;rev &gt; 1) || ((phy)-&gt;gmode))</div><div class='add'>+</div><div class='add'>+/* Radio Attenuation (RF Attenuation) */</div><div class='add'>+struct b43_rfatt {</div><div class='add'>+	u8 att;			/* Attenuation value */</div><div class='add'>+	bool with_padmix;	/* Flag, PAD Mixer enabled. */</div><div class='add'>+};</div><div class='add'>+struct b43_rfatt_list {</div><div class='add'>+	/* Attenuation values list */</div><div class='add'>+	const struct b43_rfatt *list;</div><div class='add'>+	u8 len;</div><div class='add'>+	/* Minimum/Maximum attenuation values */</div><div class='add'>+	u8 min_val;</div><div class='add'>+	u8 max_val;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Returns true, if the values are the same. */</div><div class='add'>+static inline bool b43_compare_rfatt(const struct b43_rfatt *a,</div><div class='add'>+				     const struct b43_rfatt *b)</div><div class='add'>+{</div><div class='add'>+	return ((a-&gt;att == b-&gt;att) &amp;&amp;</div><div class='add'>+		(a-&gt;with_padmix == b-&gt;with_padmix));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Baseband Attenuation */</div><div class='add'>+struct b43_bbatt {</div><div class='add'>+	u8 att;			/* Attenuation value */</div><div class='add'>+};</div><div class='add'>+struct b43_bbatt_list {</div><div class='add'>+	/* Attenuation values list */</div><div class='add'>+	const struct b43_bbatt *list;</div><div class='add'>+	u8 len;</div><div class='add'>+	/* Minimum/Maximum attenuation values */</div><div class='add'>+	u8 min_val;</div><div class='add'>+	u8 max_val;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Returns true, if the values are the same. */</div><div class='add'>+static inline bool b43_compare_bbatt(const struct b43_bbatt *a,</div><div class='add'>+				     const struct b43_bbatt *b)</div><div class='add'>+{</div><div class='add'>+	return (a-&gt;att == b-&gt;att);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* tx_control bits. */</div><div class='add'>+#define B43_TXCTL_PA3DB		0x40	/* PA Gain 3dB */</div><div class='add'>+#define B43_TXCTL_PA2DB		0x20	/* PA Gain 2dB */</div><div class='add'>+#define B43_TXCTL_TXMIX		0x10	/* TX Mixer Gain */</div><div class='add'>+</div><div class='add'>+struct b43_txpower_lo_control;</div><div class='add'>+</div><div class='add'>+struct b43_phy_g {</div><div class='add'>+	/* ACI (adjacent channel interference) flags. */</div><div class='add'>+	bool aci_enable;</div><div class='add'>+	bool aci_wlan_automatic;</div><div class='add'>+	bool aci_hw_rssi;</div><div class='add'>+</div><div class='add'>+	/* Radio switched on/off */</div><div class='add'>+	bool radio_on;</div><div class='add'>+	struct {</div><div class='add'>+		/* Values saved when turning the radio off.</div><div class='add'>+		 * They are needed when turning it on again. */</div><div class='add'>+		bool valid;</div><div class='add'>+		u16 rfover;</div><div class='add'>+		u16 rfoverval;</div><div class='add'>+	} radio_off_context;</div><div class='add'>+</div><div class='add'>+	u16 minlowsig[2];</div><div class='add'>+	u16 minlowsigpos[2];</div><div class='add'>+</div><div class='add'>+	/* Pointer to the table used to convert a</div><div class='add'>+	 * TSSI value to dBm-Q5.2 */</div><div class='add'>+	const s8 *tssi2dbm;</div><div class='add'>+	/* tssi2dbm is kmalloc()ed. Only used for free()ing. */</div><div class='add'>+	bool dyn_tssi_tbl;</div><div class='add'>+	/* Target idle TSSI */</div><div class='add'>+	int tgt_idle_tssi;</div><div class='add'>+	/* Current idle TSSI */</div><div class='add'>+	int cur_idle_tssi;</div><div class='add'>+	/* The current average TSSI.</div><div class='add'>+	 * Needs irq_lock, as it's updated in the IRQ path. */</div><div class='add'>+	u8 average_tssi;</div><div class='add'>+	/* Current TX power level attenuation control values */</div><div class='add'>+	struct b43_bbatt bbatt;</div><div class='add'>+	struct b43_rfatt rfatt;</div><div class='add'>+	u8 tx_control;		/* B43_TXCTL_XXX */</div><div class='add'>+	/* The calculated attenuation deltas that are used later</div><div class='add'>+	 * when adjusting the actual power output. */</div><div class='add'>+	int bbatt_delta;</div><div class='add'>+	int rfatt_delta;</div><div class='add'>+</div><div class='add'>+	/* LocalOscillator control values. */</div><div class='add'>+	struct b43_txpower_lo_control *lo_control;</div><div class='add'>+	/* Values from b43_calc_loopback_gain() */</div><div class='add'>+	s16 max_lb_gain;	/* Maximum Loopback gain in hdB */</div><div class='add'>+	s16 trsw_rx_gain;	/* TRSW RX gain in hdB */</div><div class='add'>+	s16 lna_lod_gain;	/* LNA lod */</div><div class='add'>+	s16 lna_gain;		/* LNA */</div><div class='add'>+	s16 pga_gain;		/* PGA */</div><div class='add'>+</div><div class='add'>+	/* Current Interference Mitigation mode */</div><div class='add'>+	int interfmode;</div><div class='add'>+	/* Stack of saved values from the Interference Mitigation code.</div><div class='add'>+	 * Each value in the stack is layed out as follows:</div><div class='add'>+	 * bit 0-11:  offset</div><div class='add'>+	 * bit 12-15: register ID</div><div class='add'>+	 * bit 16-32: value</div><div class='add'>+	 * register ID is: 0x1 PHY, 0x2 Radio, 0x3 ILT</div><div class='add'>+	 */</div><div class='add'>+#define B43_INTERFSTACK_SIZE	26</div><div class='add'>+	u32 interfstack[B43_INTERFSTACK_SIZE];	//FIXME: use a data structure</div><div class='add'>+</div><div class='add'>+	/* Saved values from the NRSSI Slope calculation */</div><div class='add'>+	s16 nrssi[2];</div><div class='add'>+	s32 nrssislope;</div><div class='add'>+	/* In memory nrssi lookup table. */</div><div class='add'>+	s8 nrssi_lt[64];</div><div class='add'>+</div><div class='add'>+	u16 lofcal;</div><div class='add'>+</div><div class='add'>+	u16 initval;		//FIXME rename?</div><div class='add'>+</div><div class='add'>+	/* The device does address auto increment for the OFDM tables.</div><div class='add'>+	 * We cache the previously used address here and omit the address</div><div class='add'>+	 * write on the next table access, if possible. */</div><div class='add'>+	u16 ofdmtab_addr; /* The address currently set in hardware. */</div><div class='add'>+	enum { /* The last data flow direction. */</div><div class='add'>+		B43_OFDMTAB_DIRECTION_UNKNOWN = 0,</div><div class='add'>+		B43_OFDMTAB_DIRECTION_READ,</div><div class='add'>+		B43_OFDMTAB_DIRECTION_WRITE,</div><div class='add'>+	} ofdmtab_addr_direction;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void b43_gphy_set_baseband_attenuation(struct b43_wldev *dev,</div><div class='add'>+				       u16 baseband_attenuation);</div><div class='add'>+void b43_gphy_channel_switch(struct b43_wldev *dev,</div><div class='add'>+			     unsigned int channel,</div><div class='add'>+			     bool synthetic_pu_workaround);</div><div class='add'>+u8 * b43_generate_dyn_tssi2dbm_tab(struct b43_wldev *dev,</div><div class='add'>+				   s16 pab0, s16 pab1, s16 pab2);</div><div class='add'>+</div><div class='add'>+struct b43_phy_operations;</div><div class='add'>+extern const struct b43_phy_operations b43_phyops_g;</div><div class='add'>+</div><div class='add'>+#endif /* LINUX_B43_PHY_G_H_ */</div><div class='head'>diff --git a/drivers/net/wireless/b43/phy_lp.c b/drivers/net/wireless/b43/phy_lp.c<br/>new file mode 100644<br/>index 000000000000..c5d9dc3667c0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/b43/phy_lp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/b43/phy_lp.c</a></div><div class='hunk'>@@ -0,0 +1,155 @@</div><div class='add'>+/*</div><div class='add'>+</div><div class='add'>+  Broadcom B43 wireless driver</div><div class='add'>+  IEEE 802.11g LP-PHY driver</div><div class='add'>+</div><div class='add'>+  Copyright (c) 2008 Michael Buesch &lt;mb@bu3sch.de&gt;</div><div class='add'>+</div><div class='add'>+  This program is free software; you can redistribute it and/or modify</div><div class='add'>+  it under the terms of the GNU General Public License as published by</div><div class='add'>+  the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+  (at your option) any later version.</div><div class='add'>+</div><div class='add'>+  This program is distributed in the hope that it will be useful,</div><div class='add'>+  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+  GNU General Public License for more details.</div><div class='add'>+</div><div class='add'>+  You should have received a copy of the GNU General Public License</div><div class='add'>+  along with this program; see the file COPYING.  If not, write to</div><div class='add'>+  the Free Software Foundation, Inc., 51 Franklin Steet, Fifth Floor,</div><div class='add'>+  Boston, MA 02110-1301, USA.</div><div class='add'>+</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#include "b43.h"</div><div class='add'>+#include "phy_lp.h"</div><div class='add'>+#include "phy_common.h"</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int b43_lpphy_op_allocate(struct b43_wldev *dev)</div><div class='add'>+{</div><div class='add'>+	struct b43_phy_lp *lpphy;</div><div class='add'>+</div><div class='add'>+	lpphy = kzalloc(sizeof(*lpphy), GFP_KERNEL);</div><div class='add'>+	if (!lpphy)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	dev-&gt;phy.lp = lpphy;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void b43_lpphy_op_prepare_structs(struct b43_wldev *dev)</div><div class='add'>+{</div><div class='add'>+	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='add'>+	struct b43_phy_lp *lpphy = phy-&gt;lp;</div><div class='add'>+</div><div class='add'>+	memset(lpphy, 0, sizeof(*lpphy));</div><div class='add'>+</div><div class='add'>+	//TODO</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void b43_lpphy_op_free(struct b43_wldev *dev)</div><div class='add'>+{</div><div class='add'>+	struct b43_phy_lp *lpphy = dev-&gt;phy.lp;</div><div class='add'>+</div><div class='add'>+	kfree(lpphy);</div><div class='add'>+	dev-&gt;phy.lp = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int b43_lpphy_op_init(struct b43_wldev *dev)</div><div class='add'>+{</div><div class='add'>+	//TODO</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 b43_lpphy_op_read(struct b43_wldev *dev, u16 reg)</div><div class='add'>+{</div><div class='add'>+	b43_write16(dev, B43_MMIO_PHY_CONTROL, reg);</div><div class='add'>+	return b43_read16(dev, B43_MMIO_PHY_DATA);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void b43_lpphy_op_write(struct b43_wldev *dev, u16 reg, u16 value)</div><div class='add'>+{</div><div class='add'>+	b43_write16(dev, B43_MMIO_PHY_CONTROL, reg);</div><div class='add'>+	b43_write16(dev, B43_MMIO_PHY_DATA, value);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 b43_lpphy_op_radio_read(struct b43_wldev *dev, u16 reg)</div><div class='add'>+{</div><div class='add'>+	/* Register 1 is a 32-bit register. */</div><div class='add'>+	B43_WARN_ON(reg == 1);</div><div class='add'>+	/* LP-PHY needs a special bit set for read access */</div><div class='add'>+	if (dev-&gt;phy.rev &lt; 2) {</div><div class='add'>+		if (reg != 0x4001)</div><div class='add'>+			reg |= 0x100;</div><div class='add'>+	} else</div><div class='add'>+		reg |= 0x200;</div><div class='add'>+</div><div class='add'>+	b43_write16(dev, B43_MMIO_RADIO_CONTROL, reg);</div><div class='add'>+	return b43_read16(dev, B43_MMIO_RADIO_DATA_LOW);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void b43_lpphy_op_radio_write(struct b43_wldev *dev, u16 reg, u16 value)</div><div class='add'>+{</div><div class='add'>+	/* Register 1 is a 32-bit register. */</div><div class='add'>+	B43_WARN_ON(reg == 1);</div><div class='add'>+</div><div class='add'>+	b43_write16(dev, B43_MMIO_RADIO_CONTROL, reg);</div><div class='add'>+	b43_write16(dev, B43_MMIO_RADIO_DATA_LOW, value);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void b43_lpphy_op_software_rfkill(struct b43_wldev *dev,</div><div class='add'>+					 enum rfkill_state state)</div><div class='add'>+{</div><div class='add'>+	//TODO</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int b43_lpphy_op_switch_channel(struct b43_wldev *dev,</div><div class='add'>+				       unsigned int new_channel)</div><div class='add'>+{</div><div class='add'>+	//TODO</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int b43_lpphy_op_get_default_chan(struct b43_wldev *dev)</div><div class='add'>+{</div><div class='add'>+	return 1; /* Default to channel 1 */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void b43_lpphy_op_set_rx_antenna(struct b43_wldev *dev, int antenna)</div><div class='add'>+{</div><div class='add'>+	//TODO</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void b43_lpphy_op_adjust_txpower(struct b43_wldev *dev)</div><div class='add'>+{</div><div class='add'>+	//TODO</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum b43_txpwr_result b43_lpphy_op_recalc_txpower(struct b43_wldev *dev,</div><div class='add'>+							 bool ignore_tssi)</div><div class='add'>+{</div><div class='add'>+	//TODO</div><div class='add'>+	return B43_TXPWR_RES_DONE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+const struct b43_phy_operations b43_phyops_lp = {</div><div class='add'>+	.allocate		= b43_lpphy_op_allocate,</div><div class='add'>+	.free			= b43_lpphy_op_free,</div><div class='add'>+	.prepare_structs	= b43_lpphy_op_prepare_structs,</div><div class='add'>+	.init			= b43_lpphy_op_init,</div><div class='add'>+	.phy_read		= b43_lpphy_op_read,</div><div class='add'>+	.phy_write		= b43_lpphy_op_write,</div><div class='add'>+	.radio_read		= b43_lpphy_op_radio_read,</div><div class='add'>+	.radio_write		= b43_lpphy_op_radio_write,</div><div class='add'>+	.software_rfkill	= b43_lpphy_op_software_rfkill,</div><div class='add'>+	.switch_analog		= b43_phyop_switch_analog_generic,</div><div class='add'>+	.switch_channel		= b43_lpphy_op_switch_channel,</div><div class='add'>+	.get_default_chan	= b43_lpphy_op_get_default_chan,</div><div class='add'>+	.set_rx_antenna		= b43_lpphy_op_set_rx_antenna,</div><div class='add'>+	.recalc_txpower		= b43_lpphy_op_recalc_txpower,</div><div class='add'>+	.adjust_txpower		= b43_lpphy_op_adjust_txpower,</div><div class='add'>+};</div><div class='head'>diff --git a/drivers/net/wireless/b43/phy_lp.h b/drivers/net/wireless/b43/phy_lp.h<br/>new file mode 100644<br/>index 000000000000..b0b5357abf93<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/b43/phy_lp.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/b43/phy_lp.h</a></div><div class='hunk'>@@ -0,0 +1,540 @@</div><div class='add'>+#ifndef LINUX_B43_PHY_LP_H_</div><div class='add'>+#define LINUX_B43_PHY_LP_H_</div><div class='add'>+</div><div class='add'>+/* Definitions for the LP-PHY */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define B43_LP_RADIO(radio_reg)			(radio_reg)</div><div class='add'>+#define B43_LP_NORTH(radio_reg)			B43_LP_RADIO(radio_reg)</div><div class='add'>+#define B43_LP_SOUTH(radio_reg)			B43_LP_RADIO((radio_reg) | 0x4000)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*** Broadcom 2062 NORTH radio registers ***/</div><div class='add'>+#define B2062_N_COMM1				B43_LP_NORTH(0x000) /* Common 01 (north) */</div><div class='add'>+#define B2062_N_COMM2				B43_LP_NORTH(0x002) /* Common 02 (north) */</div><div class='add'>+#define B2062_N_COMM3				B43_LP_NORTH(0x003) /* Common 03 (north) */</div><div class='add'>+#define B2062_N_COMM4				B43_LP_NORTH(0x004) /* Common 04 (north) */</div><div class='add'>+#define B2062_N_COMM5				B43_LP_NORTH(0x005) /* Common 05 (north) */</div><div class='add'>+#define B2062_N_COMM6				B43_LP_NORTH(0x006) /* Common 06 (north) */</div><div class='add'>+#define B2062_N_COMM7				B43_LP_NORTH(0x007) /* Common 07 (north) */</div><div class='add'>+#define B2062_N_COMM8				B43_LP_NORTH(0x008) /* Common 08 (north) */</div><div class='add'>+#define B2062_N_COMM9				B43_LP_NORTH(0x009) /* Common 09 (north) */</div><div class='add'>+#define B2062_N_COMM10				B43_LP_NORTH(0x00A) /* Common 10 (north) */</div><div class='add'>+#define B2062_N_COMM11				B43_LP_NORTH(0x00B) /* Common 11 (north) */</div><div class='add'>+#define B2062_N_COMM12				B43_LP_NORTH(0x00C) /* Common 12 (north) */</div><div class='add'>+#define B2062_N_COMM13				B43_LP_NORTH(0x00D) /* Common 13 (north) */</div><div class='add'>+#define B2062_N_COMM14				B43_LP_NORTH(0x00E) /* Common 14 (north) */</div><div class='add'>+#define B2062_N_COMM15				B43_LP_NORTH(0x00F) /* Common 15 (north) */</div><div class='add'>+#define B2062_N_PDN_CTL0			B43_LP_NORTH(0x010) /* PDN Control 0 (north) */</div><div class='add'>+#define B2062_N_PDN_CTL1			B43_LP_NORTH(0x011) /* PDN Control 1 (north) */</div><div class='add'>+#define B2062_N_PDN_CTL2			B43_LP_NORTH(0x012) /* PDN Control 2 (north) */</div><div class='add'>+#define B2062_N_PDN_CTL3			B43_LP_NORTH(0x013) /* PDN Control 3 (north) */</div><div class='add'>+#define B2062_N_PDN_CTL4			B43_LP_NORTH(0x014) /* PDN Control 4 (north) */</div><div class='add'>+#define B2062_N_GEN_CTL0			B43_LP_NORTH(0x015) /* GEN Control 0 (north) */</div><div class='add'>+#define B2062_N_IQ_CALIB			B43_LP_NORTH(0x016) /* IQ Calibration (north) */</div><div class='add'>+#define B2062_N_LGENC				B43_LP_NORTH(0x017) /* LGENC (north) */</div><div class='add'>+#define B2062_N_LGENA_LPF			B43_LP_NORTH(0x018) /* LGENA LPF (north) */</div><div class='add'>+#define B2062_N_LGENA_BIAS0			B43_LP_NORTH(0x019) /* LGENA Bias 0 (north) */</div><div class='add'>+#define B2062_N_LGNEA_BIAS1			B43_LP_NORTH(0x01A) /* LGNEA Bias 1 (north) */</div><div class='add'>+#define B2062_N_LGENA_CTL0			B43_LP_NORTH(0x01B) /* LGENA Control 0 (north) */</div><div class='add'>+#define B2062_N_LGENA_CTL1			B43_LP_NORTH(0x01C) /* LGENA Control 1 (north) */</div><div class='add'>+#define B2062_N_LGENA_CTL2			B43_LP_NORTH(0x01D) /* LGENA Control 2 (north) */</div><div class='add'>+#define B2062_N_LGENA_TUNE0			B43_LP_NORTH(0x01E) /* LGENA Tune 0 (north) */</div><div class='add'>+#define B2062_N_LGENA_TUNE1			B43_LP_NORTH(0x01F) /* LGENA Tune 1 (north) */</div><div class='add'>+#define B2062_N_LGENA_TUNE2			B43_LP_NORTH(0x020) /* LGENA Tune 2 (north) */</div><div class='add'>+#define B2062_N_LGENA_TUNE3			B43_LP_NORTH(0x021) /* LGENA Tune 3 (north) */</div><div class='add'>+#define B2062_N_LGENA_CTL3			B43_LP_NORTH(0x022) /* LGENA Control 3 (north) */</div><div class='add'>+#define B2062_N_LGENA_CTL4			B43_LP_NORTH(0x023) /* LGENA Control 4 (north) */</div><div class='add'>+#define B2062_N_LGENA_CTL5			B43_LP_NORTH(0x024) /* LGENA Control 5 (north) */</div><div class='add'>+#define B2062_N_LGENA_CTL6			B43_LP_NORTH(0x025) /* LGENA Control 6 (north) */</div><div class='add'>+#define B2062_N_LGENA_CTL7			B43_LP_NORTH(0x026) /* LGENA Control 7 (north) */</div><div class='add'>+#define B2062_N_RXA_CTL0			B43_LP_NORTH(0x027) /* RXA Control 0 (north) */</div><div class='add'>+#define B2062_N_RXA_CTL1			B43_LP_NORTH(0x028) /* RXA Control 1 (north) */</div><div class='add'>+#define B2062_N_RXA_CTL2			B43_LP_NORTH(0x029) /* RXA Control 2 (north) */</div><div class='add'>+#define B2062_N_RXA_CTL3			B43_LP_NORTH(0x02A) /* RXA Control 3 (north) */</div><div class='add'>+#define B2062_N_RXA_CTL4			B43_LP_NORTH(0x02B) /* RXA Control 4 (north) */</div><div class='add'>+#define B2062_N_RXA_CTL5			B43_LP_NORTH(0x02C) /* RXA Control 5 (north) */</div><div class='add'>+#define B2062_N_RXA_CTL6			B43_LP_NORTH(0x02D) /* RXA Control 6 (north) */</div><div class='add'>+#define B2062_N_RXA_CTL7			B43_LP_NORTH(0x02E) /* RXA Control 7 (north) */</div><div class='add'>+#define B2062_N_RXBB_CTL0			B43_LP_NORTH(0x02F) /* RXBB Control 0 (north) */</div><div class='add'>+#define B2062_N_RXBB_CTL1			B43_LP_NORTH(0x030) /* RXBB Control 1 (north) */</div><div class='add'>+#define B2062_N_RXBB_CTL2			B43_LP_NORTH(0x031) /* RXBB Control 2 (north) */</div><div class='add'>+#define B2062_N_RXBB_GAIN0			B43_LP_NORTH(0x032) /* RXBB Gain 0 (north) */</div><div class='add'>+#define B2062_N_RXBB_GAIN1			B43_LP_NORTH(0x033) /* RXBB Gain 1 (north) */</div><div class='add'>+#define B2062_N_RXBB_GAIN2			B43_LP_NORTH(0x034) /* RXBB Gain 2 (north) */</div><div class='add'>+#define B2062_N_RXBB_GAIN3			B43_LP_NORTH(0x035) /* RXBB Gain 3 (north) */</div><div class='add'>+#define B2062_N_RXBB_RSSI0			B43_LP_NORTH(0x036) /* RXBB RSSI 0 (north) */</div><div class='add'>+#define B2062_N_RXBB_RSSI1			B43_LP_NORTH(0x037) /* RXBB RSSI 1 (north) */</div><div class='add'>+#define B2062_N_RXBB_CALIB0			B43_LP_NORTH(0x038) /* RXBB Calibration0 (north) */</div><div class='add'>+#define B2062_N_RXBB_CALIB1			B43_LP_NORTH(0x039) /* RXBB Calibration1 (north) */</div><div class='add'>+#define B2062_N_RXBB_CALIB2			B43_LP_NORTH(0x03A) /* RXBB Calibration2 (north) */</div><div class='add'>+#define B2062_N_RXBB_BIAS0			B43_LP_NORTH(0x03B) /* RXBB Bias 0 (north) */</div><div class='add'>+#define B2062_N_RXBB_BIAS1			B43_LP_NORTH(0x03C) /* RXBB Bias 1 (north) */</div><div class='add'>+#define B2062_N_RXBB_BIAS2			B43_LP_NORTH(0x03D) /* RXBB Bias 2 (north) */</div><div class='add'>+#define B2062_N_RXBB_BIAS3			B43_LP_NORTH(0x03E) /* RXBB Bias 3 (north) */</div><div class='add'>+#define B2062_N_RXBB_BIAS4			B43_LP_NORTH(0x03F) /* RXBB Bias 4 (north) */</div><div class='add'>+#define B2062_N_RXBB_BIAS5			B43_LP_NORTH(0x040) /* RXBB Bias 5 (north) */</div><div class='add'>+#define B2062_N_RXBB_RSSI2			B43_LP_NORTH(0x041) /* RXBB RSSI 2 (north) */</div><div class='add'>+#define B2062_N_RXBB_RSSI3			B43_LP_NORTH(0x042) /* RXBB RSSI 3 (north) */</div><div class='add'>+#define B2062_N_RXBB_RSSI4			B43_LP_NORTH(0x043) /* RXBB RSSI 4 (north) */</div><div class='add'>+#define B2062_N_RXBB_RSSI5			B43_LP_NORTH(0x044) /* RXBB RSSI 5 (north) */</div><div class='add'>+#define B2062_N_TX_CTL0				B43_LP_NORTH(0x045) /* TX Control 0 (north) */</div><div class='add'>+#define B2062_N_TX_CTL1				B43_LP_NORTH(0x046) /* TX Control 1 (north) */</div><div class='add'>+#define B2062_N_TX_CTL2				B43_LP_NORTH(0x047) /* TX Control 2 (north) */</div><div class='add'>+#define B2062_N_TX_CTL3				B43_LP_NORTH(0x048) /* TX Control 3 (north) */</div><div class='add'>+#define B2062_N_TX_CTL4				B43_LP_NORTH(0x049) /* TX Control 4 (north) */</div><div class='add'>+#define B2062_N_TX_CTL5				B43_LP_NORTH(0x04A) /* TX Control 5 (north) */</div><div class='add'>+#define B2062_N_TX_CTL6				B43_LP_NORTH(0x04B) /* TX Control 6 (north) */</div><div class='add'>+#define B2062_N_TX_CTL7				B43_LP_NORTH(0x04C) /* TX Control 7 (north) */</div><div class='add'>+#define B2062_N_TX_CTL8				B43_LP_NORTH(0x04D) /* TX Control 8 (north) */</div><div class='add'>+#define B2062_N_TX_CTL9				B43_LP_NORTH(0x04E) /* TX Control 9 (north) */</div><div class='add'>+#define B2062_N_TX_CTL_A			B43_LP_NORTH(0x04F) /* TX Control A (north) */</div><div class='add'>+#define B2062_N_TX_GC2G				B43_LP_NORTH(0x050) /* TX GC2G (north) */</div><div class='add'>+#define B2062_N_TX_GC5G				B43_LP_NORTH(0x051) /* TX GC5G (north) */</div><div class='add'>+#define B2062_N_TX_TUNE				B43_LP_NORTH(0x052) /* TX Tune (north) */</div><div class='add'>+#define B2062_N_TX_PAD				B43_LP_NORTH(0x053) /* TX PAD (north) */</div><div class='add'>+#define B2062_N_TX_PGA				B43_LP_NORTH(0x054) /* TX PGA (north) */</div><div class='add'>+#define B2062_N_TX_PADAUX			B43_LP_NORTH(0x055) /* TX PADAUX (north) */</div><div class='add'>+#define B2062_N_TX_PGAAUX			B43_LP_NORTH(0x056) /* TX PGAAUX (north) */</div><div class='add'>+#define B2062_N_TSSI_CTL0			B43_LP_NORTH(0x057) /* TSSI Control 0 (north) */</div><div class='add'>+#define B2062_N_TSSI_CTL1			B43_LP_NORTH(0x058) /* TSSI Control 1 (north) */</div><div class='add'>+#define B2062_N_TSSI_CTL2			B43_LP_NORTH(0x059) /* TSSI Control 2 (north) */</div><div class='add'>+#define B2062_N_IQ_CALIB_CTL0			B43_LP_NORTH(0x05A) /* IQ Calibration Control 0 (north) */</div><div class='add'>+#define B2062_N_IQ_CALIB_CTL1			B43_LP_NORTH(0x05B) /* IQ Calibration Control 1 (north) */</div><div class='add'>+#define B2062_N_IQ_CALIB_CTL2			B43_LP_NORTH(0x05C) /* IQ Calibration Control 2 (north) */</div><div class='add'>+#define B2062_N_CALIB_TS			B43_LP_NORTH(0x05D) /* Calibration TS (north) */</div><div class='add'>+#define B2062_N_CALIB_CTL0			B43_LP_NORTH(0x05E) /* Calibration Control 0 (north) */</div><div class='add'>+#define B2062_N_CALIB_CTL1			B43_LP_NORTH(0x05F) /* Calibration Control 1 (north) */</div><div class='add'>+#define B2062_N_CALIB_CTL2			B43_LP_NORTH(0x060) /* Calibration Control 2 (north) */</div><div class='add'>+#define B2062_N_CALIB_CTL3			B43_LP_NORTH(0x061) /* Calibration Control 3 (north) */</div><div class='add'>+#define B2062_N_CALIB_CTL4			B43_LP_NORTH(0x062) /* Calibration Control 4 (north) */</div><div class='add'>+#define B2062_N_CALIB_DBG0			B43_LP_NORTH(0x063) /* Calibration Debug 0 (north) */</div><div class='add'>+#define B2062_N_CALIB_DBG1			B43_LP_NORTH(0x064) /* Calibration Debug 1 (north) */</div><div class='add'>+#define B2062_N_CALIB_DBG2			B43_LP_NORTH(0x065) /* Calibration Debug 2 (north) */</div><div class='add'>+#define B2062_N_CALIB_DBG3			B43_LP_NORTH(0x066) /* Calibration Debug 3 (north) */</div><div class='add'>+#define B2062_N_PSENSE_CTL0			B43_LP_NORTH(0x069) /* PSENSE Control 0 (north) */</div><div class='add'>+#define B2062_N_PSENSE_CTL1			B43_LP_NORTH(0x06A) /* PSENSE Control 1 (north) */</div><div class='add'>+#define B2062_N_PSENSE_CTL2			B43_LP_NORTH(0x06B) /* PSENSE Control 2 (north) */</div><div class='add'>+#define B2062_N_TEST_BUF0			B43_LP_NORTH(0x06C) /* TEST BUF0 (north) */</div><div class='add'>+</div><div class='add'>+/*** Broadcom 2062 SOUTH radio registers ***/</div><div class='add'>+#define B2062_S_COMM1				B43_LP_SOUTH(0x000) /* Common 01 (south) */</div><div class='add'>+#define B2062_S_RADIO_ID_CODE			B43_LP_SOUTH(0x001) /* Radio ID code (south) */</div><div class='add'>+#define B2062_S_COMM2				B43_LP_SOUTH(0x002) /* Common 02 (south) */</div><div class='add'>+#define B2062_S_COMM3				B43_LP_SOUTH(0x003) /* Common 03 (south) */</div><div class='add'>+#define B2062_S_COMM4				B43_LP_SOUTH(0x004) /* Common 04 (south) */</div><div class='add'>+#define B2062_S_COMM5				B43_LP_SOUTH(0x005) /* Common 05 (south) */</div><div class='add'>+#define B2062_S_COMM6				B43_LP_SOUTH(0x006) /* Common 06 (south) */</div><div class='add'>+#define B2062_S_COMM7				B43_LP_SOUTH(0x007) /* Common 07 (south) */</div><div class='add'>+#define B2062_S_COMM8				B43_LP_SOUTH(0x008) /* Common 08 (south) */</div><div class='add'>+#define B2062_S_COMM9				B43_LP_SOUTH(0x009) /* Common 09 (south) */</div><div class='add'>+#define B2062_S_COMM10				B43_LP_SOUTH(0x00A) /* Common 10 (south) */</div><div class='add'>+#define B2062_S_COMM11				B43_LP_SOUTH(0x00B) /* Common 11 (south) */</div><div class='add'>+#define B2062_S_COMM12				B43_LP_SOUTH(0x00C) /* Common 12 (south) */</div><div class='add'>+#define B2062_S_COMM13				B43_LP_SOUTH(0x00D) /* Common 13 (south) */</div><div class='add'>+#define B2062_S_COMM14				B43_LP_SOUTH(0x00E) /* Common 14 (south) */</div><div class='add'>+#define B2062_S_COMM15				B43_LP_SOUTH(0x00F) /* Common 15 (south) */</div><div class='add'>+#define B2062_S_PDS_CTL0			B43_LP_SOUTH(0x010) /* PDS Control 0 (south) */</div><div class='add'>+#define B2062_S_PDS_CTL1			B43_LP_SOUTH(0x011) /* PDS Control 1 (south) */</div><div class='add'>+#define B2062_S_PDS_CTL2			B43_LP_SOUTH(0x012) /* PDS Control 2 (south) */</div><div class='add'>+#define B2062_S_PDS_CTL3			B43_LP_SOUTH(0x013) /* PDS Control 3 (south) */</div><div class='add'>+#define B2062_S_BG_CTL0				B43_LP_SOUTH(0x014) /* BG Control 0 (south) */</div><div class='add'>+#define B2062_S_BG_CTL1				B43_LP_SOUTH(0x015) /* BG Control 1 (south) */</div><div class='add'>+#define B2062_S_BG_CTL2				B43_LP_SOUTH(0x016) /* BG Control 2 (south) */</div><div class='add'>+#define B2062_S_LGENG_CTL0			B43_LP_SOUTH(0x017) /* LGENG Control 00 (south) */</div><div class='add'>+#define B2062_S_LGENG_CTL1			B43_LP_SOUTH(0x018) /* LGENG Control 01 (south) */</div><div class='add'>+#define B2062_S_LGENG_CTL2			B43_LP_SOUTH(0x019) /* LGENG Control 02 (south) */</div><div class='add'>+#define B2062_S_LGENG_CTL3			B43_LP_SOUTH(0x01A) /* LGENG Control 03 (south) */</div><div class='add'>+#define B2062_S_LGENG_CTL4			B43_LP_SOUTH(0x01B) /* LGENG Control 04 (south) */</div><div class='add'>+#define B2062_S_LGENG_CTL5			B43_LP_SOUTH(0x01C) /* LGENG Control 05 (south) */</div><div class='add'>+#define B2062_S_LGENG_CTL6			B43_LP_SOUTH(0x01D) /* LGENG Control 06 (south) */</div><div class='add'>+#define B2062_S_LGENG_CTL7			B43_LP_SOUTH(0x01E) /* LGENG Control 07 (south) */</div><div class='add'>+#define B2062_S_LGENG_CTL8			B43_LP_SOUTH(0x01F) /* LGENG Control 08 (south) */</div><div class='add'>+#define B2062_S_LGENG_CTL9			B43_LP_SOUTH(0x020) /* LGENG Control 09 (south) */</div><div class='add'>+#define B2062_S_LGENG_CTL10			B43_LP_SOUTH(0x021) /* LGENG Control 10 (south) */</div><div class='add'>+#define B2062_S_LGENG_CTL11			B43_LP_SOUTH(0x022) /* LGENG Control 11 (south) */</div><div class='add'>+#define B2062_S_REFPLL_CTL0			B43_LP_SOUTH(0x023) /* REFPLL Control 00 (south) */</div><div class='add'>+#define B2062_S_REFPLL_CTL1			B43_LP_SOUTH(0x024) /* REFPLL Control 01 (south) */</div><div class='add'>+#define B2062_S_REFPLL_CTL2			B43_LP_SOUTH(0x025) /* REFPLL Control 02 (south) */</div><div class='add'>+#define B2062_S_REFPLL_CTL3			B43_LP_SOUTH(0x026) /* REFPLL Control 03 (south) */</div><div class='add'>+#define B2062_S_REFPLL_CTL4			B43_LP_SOUTH(0x027) /* REFPLL Control 04 (south) */</div><div class='add'>+#define B2062_S_REFPLL_CTL5			B43_LP_SOUTH(0x028) /* REFPLL Control 05 (south) */</div><div class='add'>+#define B2062_S_REFPLL_CTL6			B43_LP_SOUTH(0x029) /* REFPLL Control 06 (south) */</div><div class='add'>+#define B2062_S_REFPLL_CTL7			B43_LP_SOUTH(0x02A) /* REFPLL Control 07 (south) */</div><div class='add'>+#define B2062_S_REFPLL_CTL8			B43_LP_SOUTH(0x02B) /* REFPLL Control 08 (south) */</div><div class='add'>+#define B2062_S_REFPLL_CTL9			B43_LP_SOUTH(0x02C) /* REFPLL Control 09 (south) */</div><div class='add'>+#define B2062_S_REFPLL_CTL10			B43_LP_SOUTH(0x02D) /* REFPLL Control 10 (south) */</div><div class='add'>+#define B2062_S_REFPLL_CTL11			B43_LP_SOUTH(0x02E) /* REFPLL Control 11 (south) */</div><div class='add'>+#define B2062_S_REFPLL_CTL12			B43_LP_SOUTH(0x02F) /* REFPLL Control 12 (south) */</div><div class='add'>+#define B2062_S_REFPLL_CTL13			B43_LP_SOUTH(0x030) /* REFPLL Control 13 (south) */</div><div class='add'>+#define B2062_S_REFPLL_CTL14			B43_LP_SOUTH(0x031) /* REFPLL Control 14 (south) */</div><div class='add'>+#define B2062_S_REFPLL_CTL15			B43_LP_SOUTH(0x032) /* REFPLL Control 15 (south) */</div><div class='add'>+#define B2062_S_REFPLL_CTL16			B43_LP_SOUTH(0x033) /* REFPLL Control 16 (south) */</div><div class='add'>+#define B2062_S_RFPLL_CTL0			B43_LP_SOUTH(0x034) /* RFPLL Control 00 (south) */</div><div class='add'>+#define B2062_S_RFPLL_CTL1			B43_LP_SOUTH(0x035) /* RFPLL Control 01 (south) */</div><div class='add'>+#define B2062_S_RFPLL_CTL2			B43_LP_SOUTH(0x036) /* RFPLL Control 02 (south) */</div><div class='add'>+#define B2062_S_RFPLL_CTL3			B43_LP_SOUTH(0x037) /* RFPLL Control 03 (south) */</div><div class='add'>+#define B2062_S_RFPLL_CTL4			B43_LP_SOUTH(0x038) /* RFPLL Control 04 (south) */</div><div class='add'>+#define B2062_S_RFPLL_CTL5			B43_LP_SOUTH(0x039) /* RFPLL Control 05 (south) */</div><div class='add'>+#define B2062_S_RFPLL_CTL6			B43_LP_SOUTH(0x03A) /* RFPLL Control 06 (south) */</div><div class='add'>+#define B2062_S_RFPLL_CTL7			B43_LP_SOUTH(0x03B) /* RFPLL Control 07 (south) */</div><div class='add'>+#define B2062_S_RFPLL_CTL8			B43_LP_SOUTH(0x03C) /* RFPLL Control 08 (south) */</div><div class='add'>+#define B2062_S_RFPLL_CTL9			B43_LP_SOUTH(0x03D) /* RFPLL Control 09 (south) */</div><div class='add'>+#define B2062_S_RFPLL_CTL10			B43_LP_SOUTH(0x03E) /* RFPLL Control 10 (south) */</div><div class='add'>+#define B2062_S_RFPLL_CTL11			B43_LP_SOUTH(0x03F) /* RFPLL Control 11 (south) */</div><div class='add'>+#define B2062_S_RFPLL_CTL12			B43_LP_SOUTH(0x040) /* RFPLL Control 12 (south) */</div><div class='add'>+#define B2062_S_RFPLL_CTL13			B43_LP_SOUTH(0x041) /* RFPLL Control 13 (south) */</div><div class='add'>+#define B2062_S_RFPLL_CTL14			B43_LP_SOUTH(0x042) /* RFPLL Control 14 (south) */</div><div class='add'>+#define B2062_S_RFPLL_CTL15			B43_LP_SOUTH(0x043) /* RFPLL Control 15 (south) */</div><div class='add'>+#define B2062_S_RFPLL_CTL16			B43_LP_SOUTH(0x044) /* RFPLL Control 16 (south) */</div><div class='add'>+#define B2062_S_RFPLL_CTL17			B43_LP_SOUTH(0x045) /* RFPLL Control 17 (south) */</div><div class='add'>+#define B2062_S_RFPLL_CTL18			B43_LP_SOUTH(0x046) /* RFPLL Control 18 (south) */</div><div class='add'>+#define B2062_S_RFPLL_CTL19			B43_LP_SOUTH(0x047) /* RFPLL Control 19 (south) */</div><div class='add'>+#define B2062_S_RFPLL_CTL20			B43_LP_SOUTH(0x048) /* RFPLL Control 20 (south) */</div><div class='add'>+#define B2062_S_RFPLL_CTL21			B43_LP_SOUTH(0x049) /* RFPLL Control 21 (south) */</div><div class='add'>+#define B2062_S_RFPLL_CTL22			B43_LP_SOUTH(0x04A) /* RFPLL Control 22 (south) */</div><div class='add'>+#define B2062_S_RFPLL_CTL23			B43_LP_SOUTH(0x04B) /* RFPLL Control 23 (south) */</div><div class='add'>+#define B2062_S_RFPLL_CTL24			B43_LP_SOUTH(0x04C) /* RFPLL Control 24 (south) */</div><div class='add'>+#define B2062_S_RFPLL_CTL25			B43_LP_SOUTH(0x04D) /* RFPLL Control 25 (south) */</div><div class='add'>+#define B2062_S_RFPLL_CTL26			B43_LP_SOUTH(0x04E) /* RFPLL Control 26 (south) */</div><div class='add'>+#define B2062_S_RFPLL_CTL27			B43_LP_SOUTH(0x04F) /* RFPLL Control 27 (south) */</div><div class='add'>+#define B2062_S_RFPLL_CTL28			B43_LP_SOUTH(0x050) /* RFPLL Control 28 (south) */</div><div class='add'>+#define B2062_S_RFPLL_CTL29			B43_LP_SOUTH(0x051) /* RFPLL Control 29 (south) */</div><div class='add'>+#define B2062_S_RFPLL_CTL30			B43_LP_SOUTH(0x052) /* RFPLL Control 30 (south) */</div><div class='add'>+#define B2062_S_RFPLL_CTL31			B43_LP_SOUTH(0x053) /* RFPLL Control 31 (south) */</div><div class='add'>+#define B2062_S_RFPLL_CTL32			B43_LP_SOUTH(0x054) /* RFPLL Control 32 (south) */</div><div class='add'>+#define B2062_S_RFPLL_CTL33			B43_LP_SOUTH(0x055) /* RFPLL Control 33 (south) */</div><div class='add'>+#define B2062_S_RFPLL_CTL34			B43_LP_SOUTH(0x056) /* RFPLL Control 34 (south) */</div><div class='add'>+#define B2062_S_RXG_CNT0			B43_LP_SOUTH(0x057) /* RXG Counter 00 (south) */</div><div class='add'>+#define B2062_S_RXG_CNT1			B43_LP_SOUTH(0x058) /* RXG Counter 01 (south) */</div><div class='add'>+#define B2062_S_RXG_CNT2			B43_LP_SOUTH(0x059) /* RXG Counter 02 (south) */</div><div class='add'>+#define B2062_S_RXG_CNT3			B43_LP_SOUTH(0x05A) /* RXG Counter 03 (south) */</div><div class='add'>+#define B2062_S_RXG_CNT4			B43_LP_SOUTH(0x05B) /* RXG Counter 04 (south) */</div><div class='add'>+#define B2062_S_RXG_CNT5			B43_LP_SOUTH(0x05C) /* RXG Counter 05 (south) */</div><div class='add'>+#define B2062_S_RXG_CNT6			B43_LP_SOUTH(0x05D) /* RXG Counter 06 (south) */</div><div class='add'>+#define B2062_S_RXG_CNT7			B43_LP_SOUTH(0x05E) /* RXG Counter 07 (south) */</div><div class='add'>+#define B2062_S_RXG_CNT8			B43_LP_SOUTH(0x05F) /* RXG Counter 08 (south) */</div><div class='add'>+#define B2062_S_RXG_CNT9			B43_LP_SOUTH(0x060) /* RXG Counter 09 (south) */</div><div class='add'>+#define B2062_S_RXG_CNT10			B43_LP_SOUTH(0x061) /* RXG Counter 10 (south) */</div><div class='add'>+#define B2062_S_RXG_CNT11			B43_LP_SOUTH(0x062) /* RXG Counter 11 (south) */</div><div class='add'>+#define B2062_S_RXG_CNT12			B43_LP_SOUTH(0x063) /* RXG Counter 12 (south) */</div><div class='add'>+#define B2062_S_RXG_CNT13			B43_LP_SOUTH(0x064) /* RXG Counter 13 (south) */</div><div class='add'>+#define B2062_S_RXG_CNT14			B43_LP_SOUTH(0x065) /* RXG Counter 14 (south) */</div><div class='add'>+#define B2062_S_RXG_CNT15			B43_LP_SOUTH(0x066) /* RXG Counter 15 (south) */</div><div class='add'>+#define B2062_S_RXG_CNT16			B43_LP_SOUTH(0x067) /* RXG Counter 16 (south) */</div><div class='add'>+#define B2062_S_RXG_CNT17			B43_LP_SOUTH(0x068) /* RXG Counter 17 (south) */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*** Broadcom 2063 radio registers ***/</div><div class='add'>+#define B2063_RADIO_ID_CODE			B43_LP_RADIO(0x001) /* Radio ID code */</div><div class='add'>+#define B2063_COMM1				B43_LP_RADIO(0x000) /* Common 01 */</div><div class='add'>+#define B2063_COMM2				B43_LP_RADIO(0x002) /* Common 02 */</div><div class='add'>+#define B2063_COMM3				B43_LP_RADIO(0x003) /* Common 03 */</div><div class='add'>+#define B2063_COMM4				B43_LP_RADIO(0x004) /* Common 04 */</div><div class='add'>+#define B2063_COMM5				B43_LP_RADIO(0x005) /* Common 05 */</div><div class='add'>+#define B2063_COMM6				B43_LP_RADIO(0x006) /* Common 06 */</div><div class='add'>+#define B2063_COMM7				B43_LP_RADIO(0x007) /* Common 07 */</div><div class='add'>+#define B2063_COMM8				B43_LP_RADIO(0x008) /* Common 08 */</div><div class='add'>+#define B2063_COMM9				B43_LP_RADIO(0x009) /* Common 09 */</div><div class='add'>+#define B2063_COMM10				B43_LP_RADIO(0x00A) /* Common 10 */</div><div class='add'>+#define B2063_COMM11				B43_LP_RADIO(0x00B) /* Common 11 */</div><div class='add'>+#define B2063_COMM12				B43_LP_RADIO(0x00C) /* Common 12 */</div><div class='add'>+#define B2063_COMM13				B43_LP_RADIO(0x00D) /* Common 13 */</div><div class='add'>+#define B2063_COMM14				B43_LP_RADIO(0x00E) /* Common 14 */</div><div class='add'>+#define B2063_COMM15				B43_LP_RADIO(0x00F) /* Common 15 */</div><div class='add'>+#define B2063_COMM16				B43_LP_RADIO(0x010) /* Common 16 */</div><div class='add'>+#define B2063_COMM17				B43_LP_RADIO(0x011) /* Common 17 */</div><div class='add'>+#define B2063_COMM18				B43_LP_RADIO(0x012) /* Common 18 */</div><div class='add'>+#define B2063_COMM19				B43_LP_RADIO(0x013) /* Common 19 */</div><div class='add'>+#define B2063_COMM20				B43_LP_RADIO(0x014) /* Common 20 */</div><div class='add'>+#define B2063_COMM21				B43_LP_RADIO(0x015) /* Common 21 */</div><div class='add'>+#define B2063_COMM22				B43_LP_RADIO(0x016) /* Common 22 */</div><div class='add'>+#define B2063_COMM23				B43_LP_RADIO(0x017) /* Common 23 */</div><div class='add'>+#define B2063_COMM24				B43_LP_RADIO(0x018) /* Common 24 */</div><div class='add'>+#define B2063_PWR_SWITCH_CTL			B43_LP_RADIO(0x019) /* POWER SWITCH Control */</div><div class='add'>+#define B2063_PLL_SP1				B43_LP_RADIO(0x01A) /* PLL SP 1 */</div><div class='add'>+#define B2063_PLL_SP2				B43_LP_RADIO(0x01B) /* PLL SP 2 */</div><div class='add'>+#define B2063_LOGEN_SP1				B43_LP_RADIO(0x01C) /* LOGEN SP 1 */</div><div class='add'>+#define B2063_LOGEN_SP2				B43_LP_RADIO(0x01D) /* LOGEN SP 2 */</div><div class='add'>+#define B2063_LOGEN_SP3				B43_LP_RADIO(0x01E) /* LOGEN SP 3 */</div><div class='add'>+#define B2063_LOGEN_SP4				B43_LP_RADIO(0x01F) /* LOGEN SP 4 */</div><div class='add'>+#define B2063_LOGEN_SP5				B43_LP_RADIO(0x020) /* LOGEN SP 5 */</div><div class='add'>+#define B2063_G_RX_SP1				B43_LP_RADIO(0x021) /* G RX SP 1 */</div><div class='add'>+#define B2063_G_RX_SP2				B43_LP_RADIO(0x022) /* G RX SP 2 */</div><div class='add'>+#define B2063_G_RX_SP3				B43_LP_RADIO(0x023) /* G RX SP 3 */</div><div class='add'>+#define B2063_G_RX_SP4				B43_LP_RADIO(0x024) /* G RX SP 4 */</div><div class='add'>+#define B2063_G_RX_SP5				B43_LP_RADIO(0x025) /* G RX SP 5 */</div><div class='add'>+#define B2063_G_RX_SP6				B43_LP_RADIO(0x026) /* G RX SP 6 */</div><div class='add'>+#define B2063_G_RX_SP7				B43_LP_RADIO(0x027) /* G RX SP 7 */</div><div class='add'>+#define B2063_G_RX_SP8				B43_LP_RADIO(0x028) /* G RX SP 8 */</div><div class='add'>+#define B2063_G_RX_SP9				B43_LP_RADIO(0x029) /* G RX SP 9 */</div><div class='add'>+#define B2063_G_RX_SP10				B43_LP_RADIO(0x02A) /* G RX SP 10 */</div><div class='add'>+#define B2063_G_RX_SP11				B43_LP_RADIO(0x02B) /* G RX SP 11 */</div><div class='add'>+#define B2063_A_RX_SP1				B43_LP_RADIO(0x02C) /* A RX SP 1 */</div><div class='add'>+#define B2063_A_RX_SP2				B43_LP_RADIO(0x02D) /* A RX SP 2 */</div><div class='add'>+#define B2063_A_RX_SP3				B43_LP_RADIO(0x02E) /* A RX SP 3 */</div><div class='add'>+#define B2063_A_RX_SP4				B43_LP_RADIO(0x02F) /* A RX SP 4 */</div><div class='add'>+#define B2063_A_RX_SP5				B43_LP_RADIO(0x030) /* A RX SP 5 */</div><div class='add'>+#define B2063_A_RX_SP6				B43_LP_RADIO(0x031) /* A RX SP 6 */</div><div class='add'>+#define B2063_A_RX_SP7				B43_LP_RADIO(0x032) /* A RX SP 7 */</div><div class='add'>+#define B2063_RX_BB_SP1				B43_LP_RADIO(0x033) /* RX BB SP 1 */</div><div class='add'>+#define B2063_RX_BB_SP2				B43_LP_RADIO(0x034) /* RX BB SP 2 */</div><div class='add'>+#define B2063_RX_BB_SP3				B43_LP_RADIO(0x035) /* RX BB SP 3 */</div><div class='add'>+#define B2063_RX_BB_SP4				B43_LP_RADIO(0x036) /* RX BB SP 4 */</div><div class='add'>+#define B2063_RX_BB_SP5				B43_LP_RADIO(0x037) /* RX BB SP 5 */</div><div class='add'>+#define B2063_RX_BB_SP6				B43_LP_RADIO(0x038) /* RX BB SP 6 */</div><div class='add'>+#define B2063_RX_BB_SP7				B43_LP_RADIO(0x039) /* RX BB SP 7 */</div><div class='add'>+#define B2063_RX_BB_SP8				B43_LP_RADIO(0x03A) /* RX BB SP 8 */</div><div class='add'>+#define B2063_TX_RF_SP1				B43_LP_RADIO(0x03B) /* TX RF SP 1 */</div><div class='add'>+#define B2063_TX_RF_SP2				B43_LP_RADIO(0x03C) /* TX RF SP 2 */</div><div class='add'>+#define B2063_TX_RF_SP3				B43_LP_RADIO(0x03D) /* TX RF SP 3 */</div><div class='add'>+#define B2063_TX_RF_SP4				B43_LP_RADIO(0x03E) /* TX RF SP 4 */</div><div class='add'>+#define B2063_TX_RF_SP5				B43_LP_RADIO(0x03F) /* TX RF SP 5 */</div><div class='add'>+#define B2063_TX_RF_SP6				B43_LP_RADIO(0x040) /* TX RF SP 6 */</div><div class='add'>+#define B2063_TX_RF_SP7				B43_LP_RADIO(0x041) /* TX RF SP 7 */</div><div class='add'>+#define B2063_TX_RF_SP8				B43_LP_RADIO(0x042) /* TX RF SP 8 */</div><div class='add'>+#define B2063_TX_RF_SP9				B43_LP_RADIO(0x043) /* TX RF SP 9 */</div><div class='add'>+#define B2063_TX_RF_SP10			B43_LP_RADIO(0x044) /* TX RF SP 10 */</div><div class='add'>+#define B2063_TX_RF_SP11			B43_LP_RADIO(0x045) /* TX RF SP 11 */</div><div class='add'>+#define B2063_TX_RF_SP12			B43_LP_RADIO(0x046) /* TX RF SP 12 */</div><div class='add'>+#define B2063_TX_RF_SP13			B43_LP_RADIO(0x047) /* TX RF SP 13 */</div><div class='add'>+#define B2063_TX_RF_SP14			B43_LP_RADIO(0x048) /* TX RF SP 14 */</div><div class='add'>+#define B2063_TX_RF_SP15			B43_LP_RADIO(0x049) /* TX RF SP 15 */</div><div class='add'>+#define B2063_TX_RF_SP16			B43_LP_RADIO(0x04A) /* TX RF SP 16 */</div><div class='add'>+#define B2063_TX_RF_SP17			B43_LP_RADIO(0x04B) /* TX RF SP 17 */</div><div class='add'>+#define B2063_PA_SP1				B43_LP_RADIO(0x04C) /* PA SP 1 */</div><div class='add'>+#define B2063_PA_SP2				B43_LP_RADIO(0x04D) /* PA SP 2 */</div><div class='add'>+#define B2063_PA_SP3				B43_LP_RADIO(0x04E) /* PA SP 3 */</div><div class='add'>+#define B2063_PA_SP4				B43_LP_RADIO(0x04F) /* PA SP 4 */</div><div class='add'>+#define B2063_PA_SP5				B43_LP_RADIO(0x050) /* PA SP 5 */</div><div class='add'>+#define B2063_PA_SP6				B43_LP_RADIO(0x051) /* PA SP 6 */</div><div class='add'>+#define B2063_PA_SP7				B43_LP_RADIO(0x052) /* PA SP 7 */</div><div class='add'>+#define B2063_TX_BB_SP1				B43_LP_RADIO(0x053) /* TX BB SP 1 */</div><div class='add'>+#define B2063_TX_BB_SP2				B43_LP_RADIO(0x054) /* TX BB SP 2 */</div><div class='add'>+#define B2063_TX_BB_SP3				B43_LP_RADIO(0x055) /* TX BB SP 3 */</div><div class='add'>+#define B2063_REG_SP1				B43_LP_RADIO(0x056) /* REG SP 1 */</div><div class='add'>+#define B2063_BANDGAP_CTL1			B43_LP_RADIO(0x057) /* BANDGAP Control 1 */</div><div class='add'>+#define B2063_BANDGAP_CTL2			B43_LP_RADIO(0x058) /* BANDGAP Control 2 */</div><div class='add'>+#define B2063_LPO_CTL1				B43_LP_RADIO(0x059) /* LPO Control 1 */</div><div class='add'>+#define B2063_RC_CALIB_CTL1			B43_LP_RADIO(0x05A) /* RC Calibration Control 1 */</div><div class='add'>+#define B2063_RC_CALIB_CTL2			B43_LP_RADIO(0x05B) /* RC Calibration Control 2 */</div><div class='add'>+#define B2063_RC_CALIB_CTL3			B43_LP_RADIO(0x05C) /* RC Calibration Control 3 */</div><div class='add'>+#define B2063_RC_CALIB_CTL4			B43_LP_RADIO(0x05D) /* RC Calibration Control 4 */</div><div class='add'>+#define B2063_RC_CALIB_CTL5			B43_LP_RADIO(0x05E) /* RC Calibration Control 5 */</div><div class='add'>+#define B2063_RC_CALIB_CTL6			B43_LP_RADIO(0x05F) /* RC Calibration Control 6 */</div><div class='add'>+#define B2063_RC_CALIB_CTL7			B43_LP_RADIO(0x060) /* RC Calibration Control 7 */</div><div class='add'>+#define B2063_RC_CALIB_CTL8			B43_LP_RADIO(0x061) /* RC Calibration Control 8 */</div><div class='add'>+#define B2063_RC_CALIB_CTL9			B43_LP_RADIO(0x062) /* RC Calibration Control 9 */</div><div class='add'>+#define B2063_RC_CALIB_CTL10			B43_LP_RADIO(0x063) /* RC Calibration Control 10 */</div><div class='add'>+#define B2063_PLL_JTAG_CALNRST			B43_LP_RADIO(0x064) /* PLL JTAG CALNRST */</div><div class='add'>+#define B2063_PLL_JTAG_IN_PLL1			B43_LP_RADIO(0x065) /* PLL JTAG IN PLL 1 */</div><div class='add'>+#define B2063_PLL_JTAG_IN_PLL2			B43_LP_RADIO(0x066) /* PLL JTAG IN PLL 2 */</div><div class='add'>+#define B2063_PLL_JTAG_PLL_CP1			B43_LP_RADIO(0x067) /* PLL JTAG PLL CP 1 */</div><div class='add'>+#define B2063_PLL_JTAG_PLL_CP2			B43_LP_RADIO(0x068) /* PLL JTAG PLL CP 2 */</div><div class='add'>+#define B2063_PLL_JTAG_PLL_CP3			B43_LP_RADIO(0x069) /* PLL JTAG PLL CP 3 */</div><div class='add'>+#define B2063_PLL_JTAG_PLL_CP4			B43_LP_RADIO(0x06A) /* PLL JTAG PLL CP 4 */</div><div class='add'>+#define B2063_PLL_JTAG_PLL_CTL1			B43_LP_RADIO(0x06B) /* PLL JTAG PLL Control 1 */</div><div class='add'>+#define B2063_PLL_JTAG_PLL_LF1			B43_LP_RADIO(0x06C) /* PLL JTAG PLL LF 1 */</div><div class='add'>+#define B2063_PLL_JTAG_PLL_LF2			B43_LP_RADIO(0x06D) /* PLL JTAG PLL LF 2 */</div><div class='add'>+#define B2063_PLL_JTAG_PLL_LF3			B43_LP_RADIO(0x06E) /* PLL JTAG PLL LF 3 */</div><div class='add'>+#define B2063_PLL_JTAG_PLL_LF4			B43_LP_RADIO(0x06F) /* PLL JTAG PLL LF 4 */</div><div class='add'>+#define B2063_PLL_JTAG_PLL_SG1			B43_LP_RADIO(0x070) /* PLL JTAG PLL SG 1 */</div><div class='add'>+#define B2063_PLL_JTAG_PLL_SG2			B43_LP_RADIO(0x071) /* PLL JTAG PLL SG 2 */</div><div class='add'>+#define B2063_PLL_JTAG_PLL_SG3			B43_LP_RADIO(0x072) /* PLL JTAG PLL SG 3 */</div><div class='add'>+#define B2063_PLL_JTAG_PLL_SG4			B43_LP_RADIO(0x073) /* PLL JTAG PLL SG 4 */</div><div class='add'>+#define B2063_PLL_JTAG_PLL_SG5			B43_LP_RADIO(0x074) /* PLL JTAG PLL SG 5 */</div><div class='add'>+#define B2063_PLL_JTAG_PLL_VCO1			B43_LP_RADIO(0x075) /* PLL JTAG PLL VCO 1 */</div><div class='add'>+#define B2063_PLL_JTAG_PLL_VCO2			B43_LP_RADIO(0x076) /* PLL JTAG PLL VCO 2 */</div><div class='add'>+#define B2063_PLL_JTAG_PLL_VCO_CALIB1		B43_LP_RADIO(0x077) /* PLL JTAG PLL VCO Calibration 1 */</div><div class='add'>+#define B2063_PLL_JTAG_PLL_VCO_CALIB2		B43_LP_RADIO(0x078) /* PLL JTAG PLL VCO Calibration 2 */</div><div class='add'>+#define B2063_PLL_JTAG_PLL_VCO_CALIB3		B43_LP_RADIO(0x079) /* PLL JTAG PLL VCO Calibration 3 */</div><div class='add'>+#define B2063_PLL_JTAG_PLL_VCO_CALIB4		B43_LP_RADIO(0x07A) /* PLL JTAG PLL VCO Calibration 4 */</div><div class='add'>+#define B2063_PLL_JTAG_PLL_VCO_CALIB5		B43_LP_RADIO(0x07B) /* PLL JTAG PLL VCO Calibration 5 */</div><div class='add'>+#define B2063_PLL_JTAG_PLL_VCO_CALIB6		B43_LP_RADIO(0x07C) /* PLL JTAG PLL VCO Calibration 6 */</div><div class='add'>+#define B2063_PLL_JTAG_PLL_VCO_CALIB7		B43_LP_RADIO(0x07D) /* PLL JTAG PLL VCO Calibration 7 */</div><div class='add'>+#define B2063_PLL_JTAG_PLL_VCO_CALIB8		B43_LP_RADIO(0x07E) /* PLL JTAG PLL VCO Calibration 8 */</div><div class='add'>+#define B2063_PLL_JTAG_PLL_VCO_CALIB9		B43_LP_RADIO(0x07F) /* PLL JTAG PLL VCO Calibration 9 */</div><div class='add'>+#define B2063_PLL_JTAG_PLL_VCO_CALIB10		B43_LP_RADIO(0x080) /* PLL JTAG PLL VCO Calibration 10 */</div><div class='add'>+#define B2063_PLL_JTAG_PLL_XTAL_12		B43_LP_RADIO(0x081) /* PLL JTAG PLL XTAL 1 2 */</div><div class='add'>+#define B2063_PLL_JTAG_PLL_XTAL3		B43_LP_RADIO(0x082) /* PLL JTAG PLL XTAL 3 */</div><div class='add'>+#define B2063_LOGEN_ACL1			B43_LP_RADIO(0x083) /* LOGEN ACL 1 */</div><div class='add'>+#define B2063_LOGEN_ACL2			B43_LP_RADIO(0x084) /* LOGEN ACL 2 */</div><div class='add'>+#define B2063_LOGEN_ACL3			B43_LP_RADIO(0x085) /* LOGEN ACL 3 */</div><div class='add'>+#define B2063_LOGEN_ACL4			B43_LP_RADIO(0x086) /* LOGEN ACL 4 */</div><div class='add'>+#define B2063_LOGEN_ACL5			B43_LP_RADIO(0x087) /* LOGEN ACL 5 */</div><div class='add'>+#define B2063_LO_CALIB_INPUTS			B43_LP_RADIO(0x088) /* LO Calibration INPUTS */</div><div class='add'>+#define B2063_LO_CALIB_CTL1			B43_LP_RADIO(0x089) /* LO Calibration Control 1 */</div><div class='add'>+#define B2063_LO_CALIB_CTL2			B43_LP_RADIO(0x08A) /* LO Calibration Control 2 */</div><div class='add'>+#define B2063_LO_CALIB_CTL3			B43_LP_RADIO(0x08B) /* LO Calibration Control 3 */</div><div class='add'>+#define B2063_LO_CALIB_WAITCNT			B43_LP_RADIO(0x08C) /* LO Calibration WAITCNT */</div><div class='add'>+#define B2063_LO_CALIB_OVR1			B43_LP_RADIO(0x08D) /* LO Calibration OVR 1 */</div><div class='add'>+#define B2063_LO_CALIB_OVR2			B43_LP_RADIO(0x08E) /* LO Calibration OVR 2 */</div><div class='add'>+#define B2063_LO_CALIB_OVAL1			B43_LP_RADIO(0x08F) /* LO Calibration OVAL 1 */</div><div class='add'>+#define B2063_LO_CALIB_OVAL2			B43_LP_RADIO(0x090) /* LO Calibration OVAL 2 */</div><div class='add'>+#define B2063_LO_CALIB_OVAL3			B43_LP_RADIO(0x091) /* LO Calibration OVAL 3 */</div><div class='add'>+#define B2063_LO_CALIB_OVAL4			B43_LP_RADIO(0x092) /* LO Calibration OVAL 4 */</div><div class='add'>+#define B2063_LO_CALIB_OVAL5			B43_LP_RADIO(0x093) /* LO Calibration OVAL 5 */</div><div class='add'>+#define B2063_LO_CALIB_OVAL6			B43_LP_RADIO(0x094) /* LO Calibration OVAL 6 */</div><div class='add'>+#define B2063_LO_CALIB_OVAL7			B43_LP_RADIO(0x095) /* LO Calibration OVAL 7 */</div><div class='add'>+#define B2063_LO_CALIB_CALVLD1			B43_LP_RADIO(0x096) /* LO Calibration CALVLD 1 */</div><div class='add'>+#define B2063_LO_CALIB_CALVLD2			B43_LP_RADIO(0x097) /* LO Calibration CALVLD 2 */</div><div class='add'>+#define B2063_LO_CALIB_CVAL1			B43_LP_RADIO(0x098) /* LO Calibration CVAL 1 */</div><div class='add'>+#define B2063_LO_CALIB_CVAL2			B43_LP_RADIO(0x099) /* LO Calibration CVAL 2 */</div><div class='add'>+#define B2063_LO_CALIB_CVAL3			B43_LP_RADIO(0x09A) /* LO Calibration CVAL 3 */</div><div class='add'>+#define B2063_LO_CALIB_CVAL4			B43_LP_RADIO(0x09B) /* LO Calibration CVAL 4 */</div><div class='add'>+#define B2063_LO_CALIB_CVAL5			B43_LP_RADIO(0x09C) /* LO Calibration CVAL 5 */</div><div class='add'>+#define B2063_LO_CALIB_CVAL6			B43_LP_RADIO(0x09D) /* LO Calibration CVAL 6 */</div><div class='add'>+#define B2063_LO_CALIB_CVAL7			B43_LP_RADIO(0x09E) /* LO Calibration CVAL 7 */</div><div class='add'>+#define B2063_LOGEN_CALIB_EN			B43_LP_RADIO(0x09F) /* LOGEN Calibration EN */</div><div class='add'>+#define B2063_LOGEN_PEAKDET1			B43_LP_RADIO(0x0A0) /* LOGEN PEAKDET 1 */</div><div class='add'>+#define B2063_LOGEN_RCCR1			B43_LP_RADIO(0x0A1) /* LOGEN RCCR 1 */</div><div class='add'>+#define B2063_LOGEN_VCOBUF1			B43_LP_RADIO(0x0A2) /* LOGEN VCOBUF 1 */</div><div class='add'>+#define B2063_LOGEN_MIXER1			B43_LP_RADIO(0x0A3) /* LOGEN MIXER 1 */</div><div class='add'>+#define B2063_LOGEN_MIXER2			B43_LP_RADIO(0x0A4) /* LOGEN MIXER 2 */</div><div class='add'>+#define B2063_LOGEN_BUF1			B43_LP_RADIO(0x0A5) /* LOGEN BUF 1 */</div><div class='add'>+#define B2063_LOGEN_BUF2			B43_LP_RADIO(0x0A6) /* LOGEN BUF 2 */</div><div class='add'>+#define B2063_LOGEN_DIV1			B43_LP_RADIO(0x0A7) /* LOGEN DIV 1 */</div><div class='add'>+#define B2063_LOGEN_DIV2			B43_LP_RADIO(0x0A8) /* LOGEN DIV 2 */</div><div class='add'>+#define B2063_LOGEN_DIV3			B43_LP_RADIO(0x0A9) /* LOGEN DIV 3 */</div><div class='add'>+#define B2063_LOGEN_CBUFRX1			B43_LP_RADIO(0x0AA) /* LOGEN CBUFRX 1 */</div><div class='add'>+#define B2063_LOGEN_CBUFRX2			B43_LP_RADIO(0x0AB) /* LOGEN CBUFRX 2 */</div><div class='add'>+#define B2063_LOGEN_CBUFTX1			B43_LP_RADIO(0x0AC) /* LOGEN CBUFTX 1 */</div><div class='add'>+#define B2063_LOGEN_CBUFTX2			B43_LP_RADIO(0x0AD) /* LOGEN CBUFTX 2 */</div><div class='add'>+#define B2063_LOGEN_IDAC1			B43_LP_RADIO(0x0AE) /* LOGEN IDAC 1 */</div><div class='add'>+#define B2063_LOGEN_SPARE1			B43_LP_RADIO(0x0AF) /* LOGEN SPARE 1 */</div><div class='add'>+#define B2063_LOGEN_SPARE2			B43_LP_RADIO(0x0B0) /* LOGEN SPARE 2 */</div><div class='add'>+#define B2063_LOGEN_SPARE3			B43_LP_RADIO(0x0B1) /* LOGEN SPARE 3 */</div><div class='add'>+#define B2063_G_RX_1ST1				B43_LP_RADIO(0x0B2) /* G RX 1ST 1 */</div><div class='add'>+#define B2063_G_RX_1ST2				B43_LP_RADIO(0x0B3) /* G RX 1ST 2 */</div><div class='add'>+#define B2063_G_RX_1ST3				B43_LP_RADIO(0x0B4) /* G RX 1ST 3 */</div><div class='add'>+#define B2063_G_RX_2ND1				B43_LP_RADIO(0x0B5) /* G RX 2ND 1 */</div><div class='add'>+#define B2063_G_RX_2ND2				B43_LP_RADIO(0x0B6) /* G RX 2ND 2 */</div><div class='add'>+#define B2063_G_RX_2ND3				B43_LP_RADIO(0x0B7) /* G RX 2ND 3 */</div><div class='add'>+#define B2063_G_RX_2ND4				B43_LP_RADIO(0x0B8) /* G RX 2ND 4 */</div><div class='add'>+#define B2063_G_RX_2ND5				B43_LP_RADIO(0x0B9) /* G RX 2ND 5 */</div><div class='add'>+#define B2063_G_RX_2ND6				B43_LP_RADIO(0x0BA) /* G RX 2ND 6 */</div><div class='add'>+#define B2063_G_RX_2ND7				B43_LP_RADIO(0x0BB) /* G RX 2ND 7 */</div><div class='add'>+#define B2063_G_RX_2ND8				B43_LP_RADIO(0x0BC) /* G RX 2ND 8 */</div><div class='add'>+#define B2063_G_RX_PS1				B43_LP_RADIO(0x0BD) /* G RX PS 1 */</div><div class='add'>+#define B2063_G_RX_PS2				B43_LP_RADIO(0x0BE) /* G RX PS 2 */</div><div class='add'>+#define B2063_G_RX_PS3				B43_LP_RADIO(0x0BF) /* G RX PS 3 */</div><div class='add'>+#define B2063_G_RX_PS4				B43_LP_RADIO(0x0C0) /* G RX PS 4 */</div><div class='add'>+#define B2063_G_RX_PS5				B43_LP_RADIO(0x0C1) /* G RX PS 5 */</div><div class='add'>+#define B2063_G_RX_MIX1				B43_LP_RADIO(0x0C2) /* G RX MIX 1 */</div><div class='add'>+#define B2063_G_RX_MIX2				B43_LP_RADIO(0x0C3) /* G RX MIX 2 */</div><div class='add'>+#define B2063_G_RX_MIX3				B43_LP_RADIO(0x0C4) /* G RX MIX 3 */</div><div class='add'>+#define B2063_G_RX_MIX4				B43_LP_RADIO(0x0C5) /* G RX MIX 4 */</div><div class='add'>+#define B2063_G_RX_MIX5				B43_LP_RADIO(0x0C6) /* G RX MIX 5 */</div><div class='add'>+#define B2063_G_RX_MIX6				B43_LP_RADIO(0x0C7) /* G RX MIX 6 */</div><div class='add'>+#define B2063_G_RX_MIX7				B43_LP_RADIO(0x0C8) /* G RX MIX 7 */</div><div class='add'>+#define B2063_G_RX_MIX8				B43_LP_RADIO(0x0C9) /* G RX MIX 8 */</div><div class='add'>+#define B2063_G_RX_PDET1			B43_LP_RADIO(0x0CA) /* G RX PDET 1 */</div><div class='add'>+#define B2063_G_RX_SPARES1			B43_LP_RADIO(0x0CB) /* G RX SPARES 1 */</div><div class='add'>+#define B2063_G_RX_SPARES2			B43_LP_RADIO(0x0CC) /* G RX SPARES 2 */</div><div class='add'>+#define B2063_G_RX_SPARES3			B43_LP_RADIO(0x0CD) /* G RX SPARES 3 */</div><div class='add'>+#define B2063_A_RX_1ST1				B43_LP_RADIO(0x0CE) /* A RX 1ST 1 */</div><div class='add'>+#define B2063_A_RX_1ST2				B43_LP_RADIO(0x0CF) /* A RX 1ST 2 */</div><div class='add'>+#define B2063_A_RX_1ST3				B43_LP_RADIO(0x0D0) /* A RX 1ST 3 */</div><div class='add'>+#define B2063_A_RX_1ST4				B43_LP_RADIO(0x0D1) /* A RX 1ST 4 */</div><div class='add'>+#define B2063_A_RX_1ST5				B43_LP_RADIO(0x0D2) /* A RX 1ST 5 */</div><div class='add'>+#define B2063_A_RX_2ND1				B43_LP_RADIO(0x0D3) /* A RX 2ND 1 */</div><div class='add'>+#define B2063_A_RX_2ND2				B43_LP_RADIO(0x0D4) /* A RX 2ND 2 */</div><div class='add'>+#define B2063_A_RX_2ND3				B43_LP_RADIO(0x0D5) /* A RX 2ND 3 */</div><div class='add'>+#define B2063_A_RX_2ND4				B43_LP_RADIO(0x0D6) /* A RX 2ND 4 */</div><div class='add'>+#define B2063_A_RX_2ND5				B43_LP_RADIO(0x0D7) /* A RX 2ND 5 */</div><div class='add'>+#define B2063_A_RX_2ND6				B43_LP_RADIO(0x0D8) /* A RX 2ND 6 */</div><div class='add'>+#define B2063_A_RX_2ND7				B43_LP_RADIO(0x0D9) /* A RX 2ND 7 */</div><div class='add'>+#define B2063_A_RX_PS1				B43_LP_RADIO(0x0DA) /* A RX PS 1 */</div><div class='add'>+#define B2063_A_RX_PS2				B43_LP_RADIO(0x0DB) /* A RX PS 2 */</div><div class='add'>+#define B2063_A_RX_PS3				B43_LP_RADIO(0x0DC) /* A RX PS 3 */</div><div class='add'>+#define B2063_A_RX_PS4				B43_LP_RADIO(0x0DD) /* A RX PS 4 */</div><div class='add'>+#define B2063_A_RX_PS5				B43_LP_RADIO(0x0DE) /* A RX PS 5 */</div><div class='add'>+#define B2063_A_RX_PS6				B43_LP_RADIO(0x0DF) /* A RX PS 6 */</div><div class='add'>+#define B2063_A_RX_MIX1				B43_LP_RADIO(0x0E0) /* A RX MIX 1 */</div><div class='add'>+#define B2063_A_RX_MIX2				B43_LP_RADIO(0x0E1) /* A RX MIX 2 */</div><div class='add'>+#define B2063_A_RX_MIX3				B43_LP_RADIO(0x0E2) /* A RX MIX 3 */</div><div class='add'>+#define B2063_A_RX_MIX4				B43_LP_RADIO(0x0E3) /* A RX MIX 4 */</div><div class='add'>+#define B2063_A_RX_MIX5				B43_LP_RADIO(0x0E4) /* A RX MIX 5 */</div><div class='add'>+#define B2063_A_RX_MIX6				B43_LP_RADIO(0x0E5) /* A RX MIX 6 */</div><div class='add'>+#define B2063_A_RX_MIX7				B43_LP_RADIO(0x0E6) /* A RX MIX 7 */</div><div class='add'>+#define B2063_A_RX_MIX8				B43_LP_RADIO(0x0E7) /* A RX MIX 8 */</div><div class='add'>+#define B2063_A_RX_PWRDET1			B43_LP_RADIO(0x0E8) /* A RX PWRDET 1 */</div><div class='add'>+#define B2063_A_RX_SPARE1			B43_LP_RADIO(0x0E9) /* A RX SPARE 1 */</div><div class='add'>+#define B2063_A_RX_SPARE2			B43_LP_RADIO(0x0EA) /* A RX SPARE 2 */</div><div class='add'>+#define B2063_A_RX_SPARE3			B43_LP_RADIO(0x0EB) /* A RX SPARE 3 */</div><div class='add'>+#define B2063_RX_TIA_CTL1			B43_LP_RADIO(0x0EC) /* RX TIA Control 1 */</div><div class='add'>+#define B2063_RX_TIA_CTL2			B43_LP_RADIO(0x0ED) /* RX TIA Control 2 */</div><div class='add'>+#define B2063_RX_TIA_CTL3			B43_LP_RADIO(0x0EE) /* RX TIA Control 3 */</div><div class='add'>+#define B2063_RX_TIA_CTL4			B43_LP_RADIO(0x0EF) /* RX TIA Control 4 */</div><div class='add'>+#define B2063_RX_TIA_CTL5			B43_LP_RADIO(0x0F0) /* RX TIA Control 5 */</div><div class='add'>+#define B2063_RX_TIA_CTL6			B43_LP_RADIO(0x0F1) /* RX TIA Control 6 */</div><div class='add'>+#define B2063_RX_BB_CTL1			B43_LP_RADIO(0x0F2) /* RX BB Control 1 */</div><div class='add'>+#define B2063_RX_BB_CTL2			B43_LP_RADIO(0x0F3) /* RX BB Control 2 */</div><div class='add'>+#define B2063_RX_BB_CTL3			B43_LP_RADIO(0x0F4) /* RX BB Control 3 */</div><div class='add'>+#define B2063_RX_BB_CTL4			B43_LP_RADIO(0x0F5) /* RX BB Control 4 */</div><div class='add'>+#define B2063_RX_BB_CTL5			B43_LP_RADIO(0x0F6) /* RX BB Control 5 */</div><div class='add'>+#define B2063_RX_BB_CTL6			B43_LP_RADIO(0x0F7) /* RX BB Control 6 */</div><div class='add'>+#define B2063_RX_BB_CTL7			B43_LP_RADIO(0x0F8) /* RX BB Control 7 */</div><div class='add'>+#define B2063_RX_BB_CTL8			B43_LP_RADIO(0x0F9) /* RX BB Control 8 */</div><div class='add'>+#define B2063_RX_BB_CTL9			B43_LP_RADIO(0x0FA) /* RX BB Control 9 */</div><div class='add'>+#define B2063_TX_RF_CTL1			B43_LP_RADIO(0x0FB) /* TX RF Control 1 */</div><div class='add'>+#define B2063_TX_RF_IDAC_LO_RF_I		B43_LP_RADIO(0x0FC) /* TX RF IDAC LO RF I */</div><div class='add'>+#define B2063_TX_RF_IDAC_LO_RF_Q		B43_LP_RADIO(0x0FD) /* TX RF IDAC LO RF Q */</div><div class='add'>+#define B2063_TX_RF_IDAC_LO_BB_I		B43_LP_RADIO(0x0FE) /* TX RF IDAC LO BB I */</div><div class='add'>+#define B2063_TX_RF_IDAC_LO_BB_Q		B43_LP_RADIO(0x0FF) /* TX RF IDAC LO BB Q */</div><div class='add'>+#define B2063_TX_RF_CTL2			B43_LP_RADIO(0x100) /* TX RF Control 2 */</div><div class='add'>+#define B2063_TX_RF_CTL3			B43_LP_RADIO(0x101) /* TX RF Control 3 */</div><div class='add'>+#define B2063_TX_RF_CTL4			B43_LP_RADIO(0x102) /* TX RF Control 4 */</div><div class='add'>+#define B2063_TX_RF_CTL5			B43_LP_RADIO(0x103) /* TX RF Control 5 */</div><div class='add'>+#define B2063_TX_RF_CTL6			B43_LP_RADIO(0x104) /* TX RF Control 6 */</div><div class='add'>+#define B2063_TX_RF_CTL7			B43_LP_RADIO(0x105) /* TX RF Control 7 */</div><div class='add'>+#define B2063_TX_RF_CTL8			B43_LP_RADIO(0x106) /* TX RF Control 8 */</div><div class='add'>+#define B2063_TX_RF_CTL9			B43_LP_RADIO(0x107) /* TX RF Control 9 */</div><div class='add'>+#define B2063_TX_RF_CTL10			B43_LP_RADIO(0x108) /* TX RF Control 10 */</div><div class='add'>+#define B2063_TX_RF_CTL14			B43_LP_RADIO(0x109) /* TX RF Control 14 */</div><div class='add'>+#define B2063_TX_RF_CTL15			B43_LP_RADIO(0x10A) /* TX RF Control 15 */</div><div class='add'>+#define B2063_PA_CTL1				B43_LP_RADIO(0x10B) /* PA Control 1 */</div><div class='add'>+#define B2063_PA_CTL2				B43_LP_RADIO(0x10C) /* PA Control 2 */</div><div class='add'>+#define B2063_PA_CTL3				B43_LP_RADIO(0x10D) /* PA Control 3 */</div><div class='add'>+#define B2063_PA_CTL4				B43_LP_RADIO(0x10E) /* PA Control 4 */</div><div class='add'>+#define B2063_PA_CTL5				B43_LP_RADIO(0x10F) /* PA Control 5 */</div><div class='add'>+#define B2063_PA_CTL6				B43_LP_RADIO(0x110) /* PA Control 6 */</div><div class='add'>+#define B2063_PA_CTL7				B43_LP_RADIO(0x111) /* PA Control 7 */</div><div class='add'>+#define B2063_PA_CTL8				B43_LP_RADIO(0x112) /* PA Control 8 */</div><div class='add'>+#define B2063_PA_CTL9				B43_LP_RADIO(0x113) /* PA Control 9 */</div><div class='add'>+#define B2063_PA_CTL10				B43_LP_RADIO(0x114) /* PA Control 10 */</div><div class='add'>+#define B2063_PA_CTL11				B43_LP_RADIO(0x115) /* PA Control 11 */</div><div class='add'>+#define B2063_PA_CTL12				B43_LP_RADIO(0x116) /* PA Control 12 */</div><div class='add'>+#define B2063_PA_CTL13				B43_LP_RADIO(0x117) /* PA Control 13 */</div><div class='add'>+#define B2063_TX_BB_CTL1			B43_LP_RADIO(0x118) /* TX BB Control 1 */</div><div class='add'>+#define B2063_TX_BB_CTL2			B43_LP_RADIO(0x119) /* TX BB Control 2 */</div><div class='add'>+#define B2063_TX_BB_CTL3			B43_LP_RADIO(0x11A) /* TX BB Control 3 */</div><div class='add'>+#define B2063_TX_BB_CTL4			B43_LP_RADIO(0x11B) /* TX BB Control 4 */</div><div class='add'>+#define B2063_GPIO_CTL1				B43_LP_RADIO(0x11C) /* GPIO Control 1 */</div><div class='add'>+#define B2063_VREG_CTL1				B43_LP_RADIO(0x11D) /* VREG Control 1 */</div><div class='add'>+#define B2063_AMUX_CTL1				B43_LP_RADIO(0x11E) /* AMUX Control 1 */</div><div class='add'>+#define B2063_IQ_CALIB_GVAR			B43_LP_RADIO(0x11F) /* IQ Calibration GVAR */</div><div class='add'>+#define B2063_IQ_CALIB_CTL1			B43_LP_RADIO(0x120) /* IQ Calibration Control 1 */</div><div class='add'>+#define B2063_IQ_CALIB_CTL2			B43_LP_RADIO(0x121) /* IQ Calibration Control 2 */</div><div class='add'>+#define B2063_TEMPSENSE_CTL1			B43_LP_RADIO(0x122) /* TEMPSENSE Control 1 */</div><div class='add'>+#define B2063_TEMPSENSE_CTL2			B43_LP_RADIO(0x123) /* TEMPSENSE Control 2 */</div><div class='add'>+#define B2063_TX_RX_LOOPBACK1			B43_LP_RADIO(0x124) /* TX/RX LOOPBACK 1 */</div><div class='add'>+#define B2063_TX_RX_LOOPBACK2			B43_LP_RADIO(0x125) /* TX/RX LOOPBACK 2 */</div><div class='add'>+#define B2063_EXT_TSSI_CTL1			B43_LP_RADIO(0x126) /* EXT TSSI Control 1 */</div><div class='add'>+#define B2063_EXT_TSSI_CTL2			B43_LP_RADIO(0x127) /* EXT TSSI Control 2 */</div><div class='add'>+#define B2063_AFE_CTL				B43_LP_RADIO(0x128) /* AFE Control */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+struct b43_phy_lp {</div><div class='add'>+	//TODO</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+struct b43_phy_operations;</div><div class='add'>+extern const struct b43_phy_operations b43_phyops_lp;</div><div class='add'>+</div><div class='add'>+#endif /* LINUX_B43_PHY_LP_H_ */</div><div class='head'>diff --git a/drivers/net/wireless/b43/nphy.c b/drivers/net/wireless/b43/phy_n.c<br/>index 644eed993bea..8bcfda5f3f07 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/b43/nphy.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/b43/nphy.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/b43/phy_n.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/b43/phy_n.c</a></div><div class='hunk'>@@ -26,7 +26,7 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "b43.h"</div><div class='del'>-#include "nphy.h"</div><div class='add'>+#include "phy_n.h"</div><div class='ctx'> #include "tables_nphy.h"</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -34,10 +34,16 @@ void b43_nphy_set_rxantenna(struct b43_wldev *dev, int antenna)</div><div class='ctx'> {//TODO</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void b43_nphy_xmitpower(struct b43_wldev *dev)</div><div class='add'>+static void b43_nphy_op_adjust_txpower(struct b43_wldev *dev)</div><div class='ctx'> {//TODO</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static enum b43_txpwr_result b43_nphy_op_recalc_txpower(struct b43_wldev *dev,</div><div class='add'>+							bool ignore_tssi)</div><div class='add'>+{//TODO</div><div class='add'>+	return B43_TXPWR_RES_DONE;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void b43_chantab_radio_upload(struct b43_wldev *dev,</div><div class='ctx'> 				     const struct b43_nphy_channeltab_entry *e)</div><div class='ctx'> {</div><div class='hunk'>@@ -81,9 +87,8 @@ static void b43_nphy_tx_power_fix(struct b43_wldev *dev)</div><div class='ctx'> 	//TODO</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Tune the hardware to a new channel. Don't call this directly.</div><div class='del'>- * Use b43_radio_selectchannel() */</div><div class='del'>-int b43_nphy_selectchannel(struct b43_wldev *dev, u8 channel)</div><div class='add'>+/* Tune the hardware to a new channel. */</div><div class='add'>+static int nphy_channel_switch(struct b43_wldev *dev, unsigned int channel)</div><div class='ctx'> {</div><div class='ctx'> 	const struct b43_nphy_channeltab_entry *tabent;</div><div class='ctx'> </div><div class='hunk'>@@ -162,7 +167,7 @@ static void b43_radio_init2055_post(struct b43_wldev *dev)</div><div class='ctx'> 	msleep(1);</div><div class='ctx'> 	b43_radio_mask(dev, B2055_CAL_LPOCTL, 0xFF7F);</div><div class='ctx'> 	msleep(1);</div><div class='del'>-	b43_radio_selectchannel(dev, dev-&gt;phy.channel, 0);</div><div class='add'>+	nphy_channel_switch(dev, dev-&gt;phy.channel);</div><div class='ctx'> 	b43_radio_write16(dev, B2055_C1_RX_BB_LPF, 0x9);</div><div class='ctx'> 	b43_radio_write16(dev, B2055_C2_RX_BB_LPF, 0x9);</div><div class='ctx'> 	b43_radio_write16(dev, B2055_C1_RX_BB_MIDACHP, 0x83);</div><div class='hunk'>@@ -484,3 +489,140 @@ int b43_phy_initn(struct b43_wldev *dev)</div><div class='ctx'> 	b43err(dev-&gt;wl, "IEEE 802.11n devices are not supported, yet.\n");</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static int b43_nphy_op_allocate(struct b43_wldev *dev)</div><div class='add'>+{</div><div class='add'>+	struct b43_phy_n *nphy;</div><div class='add'>+</div><div class='add'>+	nphy = kzalloc(sizeof(*nphy), GFP_KERNEL);</div><div class='add'>+	if (!nphy)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	dev-&gt;phy.n = nphy;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void b43_nphy_op_prepare_structs(struct b43_wldev *dev)</div><div class='add'>+{</div><div class='add'>+	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='add'>+	struct b43_phy_n *nphy = phy-&gt;n;</div><div class='add'>+</div><div class='add'>+	memset(nphy, 0, sizeof(*nphy));</div><div class='add'>+</div><div class='add'>+	//TODO init struct b43_phy_n</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void b43_nphy_op_free(struct b43_wldev *dev)</div><div class='add'>+{</div><div class='add'>+	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='add'>+	struct b43_phy_n *nphy = phy-&gt;n;</div><div class='add'>+</div><div class='add'>+	kfree(nphy);</div><div class='add'>+	phy-&gt;n = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int b43_nphy_op_init(struct b43_wldev *dev)</div><div class='add'>+{</div><div class='add'>+	return b43_phy_initn(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void check_phyreg(struct b43_wldev *dev, u16 offset)</div><div class='add'>+{</div><div class='add'>+#if B43_DEBUG</div><div class='add'>+	if ((offset &amp; B43_PHYROUTE) == B43_PHYROUTE_OFDM_GPHY) {</div><div class='add'>+		/* OFDM registers are onnly available on A/G-PHYs */</div><div class='add'>+		b43err(dev-&gt;wl, "Invalid OFDM PHY access at "</div><div class='add'>+		       "0x%04X on N-PHY\n", offset);</div><div class='add'>+		dump_stack();</div><div class='add'>+	}</div><div class='add'>+	if ((offset &amp; B43_PHYROUTE) == B43_PHYROUTE_EXT_GPHY) {</div><div class='add'>+		/* Ext-G registers are only available on G-PHYs */</div><div class='add'>+		b43err(dev-&gt;wl, "Invalid EXT-G PHY access at "</div><div class='add'>+		       "0x%04X on N-PHY\n", offset);</div><div class='add'>+		dump_stack();</div><div class='add'>+	}</div><div class='add'>+#endif /* B43_DEBUG */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 b43_nphy_op_read(struct b43_wldev *dev, u16 reg)</div><div class='add'>+{</div><div class='add'>+	check_phyreg(dev, reg);</div><div class='add'>+	b43_write16(dev, B43_MMIO_PHY_CONTROL, reg);</div><div class='add'>+	return b43_read16(dev, B43_MMIO_PHY_DATA);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void b43_nphy_op_write(struct b43_wldev *dev, u16 reg, u16 value)</div><div class='add'>+{</div><div class='add'>+	check_phyreg(dev, reg);</div><div class='add'>+	b43_write16(dev, B43_MMIO_PHY_CONTROL, reg);</div><div class='add'>+	b43_write16(dev, B43_MMIO_PHY_DATA, value);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 b43_nphy_op_radio_read(struct b43_wldev *dev, u16 reg)</div><div class='add'>+{</div><div class='add'>+	/* Register 1 is a 32-bit register. */</div><div class='add'>+	B43_WARN_ON(reg == 1);</div><div class='add'>+	/* N-PHY needs 0x100 for read access */</div><div class='add'>+	reg |= 0x100;</div><div class='add'>+</div><div class='add'>+	b43_write16(dev, B43_MMIO_RADIO_CONTROL, reg);</div><div class='add'>+	return b43_read16(dev, B43_MMIO_RADIO_DATA_LOW);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void b43_nphy_op_radio_write(struct b43_wldev *dev, u16 reg, u16 value)</div><div class='add'>+{</div><div class='add'>+	/* Register 1 is a 32-bit register. */</div><div class='add'>+	B43_WARN_ON(reg == 1);</div><div class='add'>+</div><div class='add'>+	b43_write16(dev, B43_MMIO_RADIO_CONTROL, reg);</div><div class='add'>+	b43_write16(dev, B43_MMIO_RADIO_DATA_LOW, value);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void b43_nphy_op_software_rfkill(struct b43_wldev *dev,</div><div class='add'>+					enum rfkill_state state)</div><div class='add'>+{//TODO</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void b43_nphy_op_switch_analog(struct b43_wldev *dev, bool on)</div><div class='add'>+{</div><div class='add'>+	b43_phy_write(dev, B43_NPHY_AFECTL_OVER,</div><div class='add'>+		      on ? 0 : 0x7FFF);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int b43_nphy_op_switch_channel(struct b43_wldev *dev,</div><div class='add'>+				      unsigned int new_channel)</div><div class='add'>+{</div><div class='add'>+	if (b43_current_band(dev-&gt;wl) == IEEE80211_BAND_2GHZ) {</div><div class='add'>+		if ((new_channel &lt; 1) || (new_channel &gt; 14))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	} else {</div><div class='add'>+		if (new_channel &gt; 200)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return nphy_channel_switch(dev, new_channel);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int b43_nphy_op_get_default_chan(struct b43_wldev *dev)</div><div class='add'>+{</div><div class='add'>+	if (b43_current_band(dev-&gt;wl) == IEEE80211_BAND_2GHZ)</div><div class='add'>+		return 1;</div><div class='add'>+	return 36;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct b43_phy_operations b43_phyops_n = {</div><div class='add'>+	.allocate		= b43_nphy_op_allocate,</div><div class='add'>+	.free			= b43_nphy_op_free,</div><div class='add'>+	.prepare_structs	= b43_nphy_op_prepare_structs,</div><div class='add'>+	.init			= b43_nphy_op_init,</div><div class='add'>+	.phy_read		= b43_nphy_op_read,</div><div class='add'>+	.phy_write		= b43_nphy_op_write,</div><div class='add'>+	.radio_read		= b43_nphy_op_radio_read,</div><div class='add'>+	.radio_write		= b43_nphy_op_radio_write,</div><div class='add'>+	.software_rfkill	= b43_nphy_op_software_rfkill,</div><div class='add'>+	.switch_analog		= b43_nphy_op_switch_analog,</div><div class='add'>+	.switch_channel		= b43_nphy_op_switch_channel,</div><div class='add'>+	.get_default_chan	= b43_nphy_op_get_default_chan,</div><div class='add'>+	.recalc_txpower		= b43_nphy_op_recalc_txpower,</div><div class='add'>+	.adjust_txpower		= b43_nphy_op_adjust_txpower,</div><div class='add'>+};</div><div class='head'>diff --git a/drivers/net/wireless/b43/nphy.h b/drivers/net/wireless/b43/phy_n.h<br/>index faf46b9cbf1b..1749aef4147d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/b43/nphy.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/b43/nphy.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/b43/phy_n.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/b43/phy_n.h</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #ifndef B43_NPHY_H_</div><div class='ctx'> #define B43_NPHY_H_</div><div class='ctx'> </div><div class='del'>-#include "phy.h"</div><div class='add'>+#include "phy_common.h"</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* N-PHY registers. */</div><div class='hunk'>@@ -919,54 +919,12 @@</div><div class='ctx'> </div><div class='ctx'> struct b43_wldev;</div><div class='ctx'> </div><div class='add'>+struct b43_phy_n {</div><div class='add'>+	//TODO lots of missing stuff</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_B43_NPHY</div><div class='del'>-/* N-PHY support enabled */</div><div class='ctx'> </div><div class='del'>-int b43_phy_initn(struct b43_wldev *dev);</div><div class='add'>+struct b43_phy_operations;</div><div class='add'>+extern const struct b43_phy_operations b43_phyops_n;</div><div class='ctx'> </div><div class='del'>-void b43_nphy_radio_turn_on(struct b43_wldev *dev);</div><div class='del'>-void b43_nphy_radio_turn_off(struct b43_wldev *dev);</div><div class='del'>-</div><div class='del'>-int b43_nphy_selectchannel(struct b43_wldev *dev, u8 channel);</div><div class='del'>-</div><div class='del'>-void b43_nphy_xmitpower(struct b43_wldev *dev);</div><div class='del'>-void b43_nphy_set_rxantenna(struct b43_wldev *dev, int antenna);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#else /* CONFIG_B43_NPHY */</div><div class='del'>-/* N-PHY support disabled */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static inline</div><div class='del'>-int b43_phy_initn(struct b43_wldev *dev)</div><div class='del'>-{</div><div class='del'>-	return -EOPNOTSUPP;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline</div><div class='del'>-void b43_nphy_radio_turn_on(struct b43_wldev *dev)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-static inline</div><div class='del'>-void b43_nphy_radio_turn_off(struct b43_wldev *dev)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline</div><div class='del'>-int b43_nphy_selectchannel(struct b43_wldev *dev, u8 channel)</div><div class='del'>-{</div><div class='del'>-	return -ENOSYS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline</div><div class='del'>-void b43_nphy_xmitpower(struct b43_wldev *dev)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-static inline</div><div class='del'>-void b43_nphy_set_rxantenna(struct b43_wldev *dev, int antenna)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* CONFIG_B43_NPHY */</div><div class='ctx'> #endif /* B43_NPHY_H_ */</div><div class='head'>diff --git a/drivers/net/wireless/b43/rfkill.c b/drivers/net/wireless/b43/rfkill.c<br/>index 34ae125d5384..713753781f40 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/b43/rfkill.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/b43/rfkill.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/b43/rfkill.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/b43/rfkill.c</a></div><div class='hunk'>@@ -24,6 +24,7 @@</div><div class='ctx'> </div><div class='ctx'> #include "rfkill.h"</div><div class='ctx'> #include "b43.h"</div><div class='add'>+#include "phy_common.h"</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kmod.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -96,11 +97,11 @@ static int b43_rfkill_soft_toggle(void *data, enum rfkill_state state)</div><div class='ctx'> 			goto out_unlock;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (!dev-&gt;phy.radio_on)</div><div class='del'>-			b43_radio_turn_on(dev);</div><div class='add'>+			b43_software_rfkill(dev, state);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case RFKILL_STATE_SOFT_BLOCKED:</div><div class='ctx'> 		if (dev-&gt;phy.radio_on)</div><div class='del'>-			b43_radio_turn_off(dev, 0);</div><div class='add'>+			b43_software_rfkill(dev, state);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		b43warn(wl, "Received unexpected rfkill state %d.\n", state);</div><div class='hunk'>@@ -169,6 +170,11 @@ void b43_rfkill_init(struct b43_wldev *dev)</div><div class='ctx'> 			"The built-in radio LED will not work.\n");</div><div class='ctx'> #endif /* CONFIG_RFKILL_INPUT */</div><div class='ctx'> </div><div class='add'>+#if !defined(CONFIG_RFKILL_INPUT) &amp;&amp; !defined(CONFIG_RFKILL_INPUT_MODULE)</div><div class='add'>+	b43warn(wl, "The rfkill-input subsystem is not available. "</div><div class='add'>+		"The built-in radio LED will not work.\n");</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	err = input_register_polled_device(rfk-&gt;poll_dev);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err_unreg_rfk;</div><div class='head'>diff --git a/drivers/net/wireless/b43/sysfs.c b/drivers/net/wireless/b43/sysfs.c<br/>index 275095b8cbe7..5adaa3692d75 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/b43/sysfs.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/b43/sysfs.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/b43/sysfs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/b43/sysfs.c</a></div><div class='hunk'>@@ -29,7 +29,7 @@</div><div class='ctx'> #include "b43.h"</div><div class='ctx'> #include "sysfs.h"</div><div class='ctx'> #include "main.h"</div><div class='del'>-#include "phy.h"</div><div class='add'>+#include "phy_common.h"</div><div class='ctx'> </div><div class='ctx'> #define GENERIC_FILESIZE	64</div><div class='ctx'> </div><div class='hunk'>@@ -59,7 +59,12 @@ static ssize_t b43_attr_interfmode_show(struct device *dev,</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;wldev-&gt;wl-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-	switch (wldev-&gt;phy.interfmode) {</div><div class='add'>+	if (wldev-&gt;phy.type != B43_PHYTYPE_G) {</div><div class='add'>+		mutex_unlock(&amp;wldev-&gt;wl-&gt;mutex);</div><div class='add'>+		return -ENOSYS;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (wldev-&gt;phy.g-&gt;interfmode) {</div><div class='ctx'> 	case B43_INTERFMODE_NONE:</div><div class='ctx'> 		count =</div><div class='ctx'> 		    snprintf(buf, PAGE_SIZE,</div><div class='hunk'>@@ -117,11 +122,15 @@ static ssize_t b43_attr_interfmode_store(struct device *dev,</div><div class='ctx'> 	mutex_lock(&amp;wldev-&gt;wl-&gt;mutex);</div><div class='ctx'> 	spin_lock_irqsave(&amp;wldev-&gt;wl-&gt;irq_lock, flags);</div><div class='ctx'> </div><div class='del'>-	err = b43_radio_set_interference_mitigation(wldev, mode);</div><div class='del'>-	if (err) {</div><div class='del'>-		b43err(wldev-&gt;wl, "Interference Mitigation not "</div><div class='del'>-		       "supported by device\n");</div><div class='del'>-	}</div><div class='add'>+	if (wldev-&gt;phy.ops-&gt;interf_mitigation) {</div><div class='add'>+		err = wldev-&gt;phy.ops-&gt;interf_mitigation(wldev, mode);</div><div class='add'>+		if (err) {</div><div class='add'>+			b43err(wldev-&gt;wl, "Interference Mitigation not "</div><div class='add'>+			       "supported by device\n");</div><div class='add'>+		}</div><div class='add'>+	} else</div><div class='add'>+		err = -ENOSYS;</div><div class='add'>+</div><div class='ctx'> 	mmiowb();</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;wldev-&gt;wl-&gt;irq_lock, flags);</div><div class='ctx'> 	mutex_unlock(&amp;wldev-&gt;wl-&gt;mutex);</div><div class='head'>diff --git a/drivers/net/wireless/b43/tables.c b/drivers/net/wireless/b43/tables.c<br/>index 3f5ea06bf13c..1ef9a6463ec6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/b43/tables.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/b43/tables.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/b43/tables.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/b43/tables.c</a></div><div class='hunk'>@@ -27,7 +27,8 @@</div><div class='ctx'> </div><div class='ctx'> #include "b43.h"</div><div class='ctx'> #include "tables.h"</div><div class='del'>-#include "phy.h"</div><div class='add'>+#include "phy_g.h"</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> const u32 b43_tab_rotor[] = {</div><div class='ctx'> 	0xFEB93FFD, 0xFEC63FFD,	/* 0 */</div><div class='hunk'>@@ -377,17 +378,17 @@ static inline void assert_sizes(void)</div><div class='ctx'> </div><div class='ctx'> u16 b43_ofdmtab_read16(struct b43_wldev *dev, u16 table, u16 offset)</div><div class='ctx'> {</div><div class='del'>-	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='add'>+	struct b43_phy_g *gphy = dev-&gt;phy.g;</div><div class='ctx'> 	u16 addr;</div><div class='ctx'> </div><div class='ctx'> 	addr = table + offset;</div><div class='del'>-	if ((phy-&gt;ofdmtab_addr_direction != B43_OFDMTAB_DIRECTION_READ) ||</div><div class='del'>-	    (addr - 1 != phy-&gt;ofdmtab_addr)) {</div><div class='add'>+	if ((gphy-&gt;ofdmtab_addr_direction != B43_OFDMTAB_DIRECTION_READ) ||</div><div class='add'>+	    (addr - 1 != gphy-&gt;ofdmtab_addr)) {</div><div class='ctx'> 		/* The hardware has a different address in memory. Update it. */</div><div class='ctx'> 		b43_phy_write(dev, B43_PHY_OTABLECTL, addr);</div><div class='del'>-		phy-&gt;ofdmtab_addr_direction = B43_OFDMTAB_DIRECTION_READ;</div><div class='add'>+		gphy-&gt;ofdmtab_addr_direction = B43_OFDMTAB_DIRECTION_READ;</div><div class='ctx'> 	}</div><div class='del'>-	phy-&gt;ofdmtab_addr = addr;</div><div class='add'>+	gphy-&gt;ofdmtab_addr = addr;</div><div class='ctx'> </div><div class='ctx'> 	return b43_phy_read(dev, B43_PHY_OTABLEI);</div><div class='ctx'> </div><div class='hunk'>@@ -398,34 +399,34 @@ u16 b43_ofdmtab_read16(struct b43_wldev *dev, u16 table, u16 offset)</div><div class='ctx'> void b43_ofdmtab_write16(struct b43_wldev *dev, u16 table,</div><div class='ctx'> 			 u16 offset, u16 value)</div><div class='ctx'> {</div><div class='del'>-	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='add'>+	struct b43_phy_g *gphy = dev-&gt;phy.g;</div><div class='ctx'> 	u16 addr;</div><div class='ctx'> </div><div class='ctx'> 	addr = table + offset;</div><div class='del'>-	if ((phy-&gt;ofdmtab_addr_direction != B43_OFDMTAB_DIRECTION_WRITE) ||</div><div class='del'>-	    (addr - 1 != phy-&gt;ofdmtab_addr)) {</div><div class='add'>+	if ((gphy-&gt;ofdmtab_addr_direction != B43_OFDMTAB_DIRECTION_WRITE) ||</div><div class='add'>+	    (addr - 1 != gphy-&gt;ofdmtab_addr)) {</div><div class='ctx'> 		/* The hardware has a different address in memory. Update it. */</div><div class='ctx'> 		b43_phy_write(dev, B43_PHY_OTABLECTL, addr);</div><div class='del'>-		phy-&gt;ofdmtab_addr_direction = B43_OFDMTAB_DIRECTION_WRITE;</div><div class='add'>+		gphy-&gt;ofdmtab_addr_direction = B43_OFDMTAB_DIRECTION_WRITE;</div><div class='ctx'> 	}</div><div class='del'>-	phy-&gt;ofdmtab_addr = addr;</div><div class='add'>+	gphy-&gt;ofdmtab_addr = addr;</div><div class='ctx'> 	b43_phy_write(dev, B43_PHY_OTABLEI, value);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> u32 b43_ofdmtab_read32(struct b43_wldev *dev, u16 table, u16 offset)</div><div class='ctx'> {</div><div class='del'>-	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='add'>+	struct b43_phy_g *gphy = dev-&gt;phy.g;</div><div class='ctx'> 	u32 ret;</div><div class='ctx'> 	u16 addr;</div><div class='ctx'> </div><div class='ctx'> 	addr = table + offset;</div><div class='del'>-	if ((phy-&gt;ofdmtab_addr_direction != B43_OFDMTAB_DIRECTION_READ) ||</div><div class='del'>-	    (addr - 1 != phy-&gt;ofdmtab_addr)) {</div><div class='add'>+	if ((gphy-&gt;ofdmtab_addr_direction != B43_OFDMTAB_DIRECTION_READ) ||</div><div class='add'>+	    (addr - 1 != gphy-&gt;ofdmtab_addr)) {</div><div class='ctx'> 		/* The hardware has a different address in memory. Update it. */</div><div class='ctx'> 		b43_phy_write(dev, B43_PHY_OTABLECTL, addr);</div><div class='del'>-		phy-&gt;ofdmtab_addr_direction = B43_OFDMTAB_DIRECTION_READ;</div><div class='add'>+		gphy-&gt;ofdmtab_addr_direction = B43_OFDMTAB_DIRECTION_READ;</div><div class='ctx'> 	}</div><div class='del'>-	phy-&gt;ofdmtab_addr = addr;</div><div class='add'>+	gphy-&gt;ofdmtab_addr = addr;</div><div class='ctx'> 	ret = b43_phy_read(dev, B43_PHY_OTABLEQ);</div><div class='ctx'> 	ret &lt;&lt;= 16;</div><div class='ctx'> 	ret |= b43_phy_read(dev, B43_PHY_OTABLEI);</div><div class='hunk'>@@ -436,17 +437,17 @@ u32 b43_ofdmtab_read32(struct b43_wldev *dev, u16 table, u16 offset)</div><div class='ctx'> void b43_ofdmtab_write32(struct b43_wldev *dev, u16 table,</div><div class='ctx'> 			 u16 offset, u32 value)</div><div class='ctx'> {</div><div class='del'>-	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='add'>+	struct b43_phy_g *gphy = dev-&gt;phy.g;</div><div class='ctx'> 	u16 addr;</div><div class='ctx'> </div><div class='ctx'> 	addr = table + offset;</div><div class='del'>-	if ((phy-&gt;ofdmtab_addr_direction != B43_OFDMTAB_DIRECTION_WRITE) ||</div><div class='del'>-	    (addr - 1 != phy-&gt;ofdmtab_addr)) {</div><div class='add'>+	if ((gphy-&gt;ofdmtab_addr_direction != B43_OFDMTAB_DIRECTION_WRITE) ||</div><div class='add'>+	    (addr - 1 != gphy-&gt;ofdmtab_addr)) {</div><div class='ctx'> 		/* The hardware has a different address in memory. Update it. */</div><div class='ctx'> 		b43_phy_write(dev, B43_PHY_OTABLECTL, addr);</div><div class='del'>-		phy-&gt;ofdmtab_addr_direction = B43_OFDMTAB_DIRECTION_WRITE;</div><div class='add'>+		gphy-&gt;ofdmtab_addr_direction = B43_OFDMTAB_DIRECTION_WRITE;</div><div class='ctx'> 	}</div><div class='del'>-	phy-&gt;ofdmtab_addr = addr;</div><div class='add'>+	gphy-&gt;ofdmtab_addr = addr;</div><div class='ctx'> </div><div class='ctx'> 	b43_phy_write(dev, B43_PHY_OTABLEI, value);</div><div class='ctx'> 	b43_phy_write(dev, B43_PHY_OTABLEQ, (value &gt;&gt; 16));</div><div class='head'>diff --git a/drivers/net/wireless/b43/tables_nphy.c b/drivers/net/wireless/b43/tables_nphy.c<br/>index 2aa57551786a..4e2336315545 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/b43/tables_nphy.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/b43/tables_nphy.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/b43/tables_nphy.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/b43/tables_nphy.c</a></div><div class='hunk'>@@ -24,8 +24,8 @@</div><div class='ctx'> </div><div class='ctx'> #include "b43.h"</div><div class='ctx'> #include "tables_nphy.h"</div><div class='del'>-#include "phy.h"</div><div class='del'>-#include "nphy.h"</div><div class='add'>+#include "phy_common.h"</div><div class='add'>+#include "phy_n.h"</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> struct b2055_inittab_entry {</div><div class='head'>diff --git a/drivers/net/wireless/b43/wa.c b/drivers/net/wireless/b43/wa.c<br/>index daa94211f838..0c0fb15abb9f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/b43/wa.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/b43/wa.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/b43/wa.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/b43/wa.c</a></div><div class='hunk'>@@ -27,7 +27,7 @@</div><div class='ctx'> #include "b43.h"</div><div class='ctx'> #include "main.h"</div><div class='ctx'> #include "tables.h"</div><div class='del'>-#include "phy.h"</div><div class='add'>+#include "phy_common.h"</div><div class='ctx'> #include "wa.h"</div><div class='ctx'> </div><div class='ctx'> static void b43_wa_papd(struct b43_wldev *dev)</div><div class='head'>diff --git a/drivers/net/wireless/b43/xmit.c b/drivers/net/wireless/b43/xmit.c<br/>index 9dda8169f7cc..2fabcf8f0474 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/b43/xmit.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/b43/xmit.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/b43/xmit.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/b43/xmit.c</a></div><div class='hunk'>@@ -28,7 +28,7 @@</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> #include "xmit.h"</div><div class='del'>-#include "phy.h"</div><div class='add'>+#include "phy_common.h"</div><div class='ctx'> #include "dma.h"</div><div class='ctx'> #include "pio.h"</div><div class='ctx'> </div><div class='hunk'>@@ -208,7 +208,7 @@ int b43_generate_txhdr(struct b43_wldev *dev,</div><div class='ctx'> 	txrate = ieee80211_get_tx_rate(dev-&gt;wl-&gt;hw, info);</div><div class='ctx'> 	rate = txrate ? txrate-&gt;hw_value : B43_CCK_RATE_1MB;</div><div class='ctx'> 	rate_ofdm = b43_is_ofdm_rate(rate);</div><div class='del'>-	fbrate = ieee80211_get_alt_retry_rate(dev-&gt;wl-&gt;hw, info) ? : txrate;</div><div class='add'>+	fbrate = ieee80211_get_alt_retry_rate(dev-&gt;wl-&gt;hw, info, 0) ? : txrate;</div><div class='ctx'> 	rate_fb = fbrate-&gt;hw_value;</div><div class='ctx'> 	rate_fb_ofdm = b43_is_ofdm_rate(rate_fb);</div><div class='ctx'> </div><div class='hunk'>@@ -252,7 +252,7 @@ int b43_generate_txhdr(struct b43_wldev *dev,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Hardware appends ICV. */</div><div class='del'>-		plcp_fragment_len += info-&gt;control.icv_len;</div><div class='add'>+		plcp_fragment_len += info-&gt;control.hw_key-&gt;icv_len;</div><div class='ctx'> </div><div class='ctx'> 		key_idx = b43_kidx_to_fw(dev, key_idx);</div><div class='ctx'> 		mac_ctl |= (key_idx &lt;&lt; B43_TXH_MAC_KEYIDX_SHIFT) &amp;</div><div class='hunk'>@@ -260,7 +260,7 @@ int b43_generate_txhdr(struct b43_wldev *dev,</div><div class='ctx'> 		mac_ctl |= (key-&gt;algorithm &lt;&lt; B43_TXH_MAC_KEYALG_SHIFT) &amp;</div><div class='ctx'> 			   B43_TXH_MAC_KEYALG;</div><div class='ctx'> 		wlhdr_len = ieee80211_hdrlen(fctl);</div><div class='del'>-		iv_len = min((size_t) info-&gt;control.iv_len,</div><div class='add'>+		iv_len = min((size_t) info-&gt;control.hw_key-&gt;iv_len,</div><div class='ctx'> 			     ARRAY_SIZE(txhdr-&gt;iv));</div><div class='ctx'> 		memcpy(txhdr-&gt;iv, ((u8 *) wlhdr) + wlhdr_len, iv_len);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -431,6 +431,7 @@ static s8 b43_rssi_postprocess(struct b43_wldev *dev,</div><div class='ctx'> 			       int adjust_2053, int adjust_2050)</div><div class='ctx'> {</div><div class='ctx'> 	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='add'>+	struct b43_phy_g *gphy = phy-&gt;g;</div><div class='ctx'> 	s32 tmp;</div><div class='ctx'> </div><div class='ctx'> 	switch (phy-&gt;radio_ver) {</div><div class='hunk'>@@ -450,7 +451,8 @@ static s8 b43_rssi_postprocess(struct b43_wldev *dev,</div><div class='ctx'> 			    boardflags_lo &amp; B43_BFL_RSSI) {</div><div class='ctx'> 				if (in_rssi &gt; 63)</div><div class='ctx'> 					in_rssi = 63;</div><div class='del'>-				tmp = phy-&gt;nrssi_lt[in_rssi];</div><div class='add'>+				B43_WARN_ON(phy-&gt;type != B43_PHYTYPE_G);</div><div class='add'>+				tmp = gphy-&gt;nrssi_lt[in_rssi];</div><div class='ctx'> 				tmp = 31 - tmp;</div><div class='ctx'> 				tmp *= -131;</div><div class='ctx'> 				tmp /= 128;</div><div class='hunk'>@@ -678,6 +680,8 @@ void b43_handle_txstatus(struct b43_wldev *dev,</div><div class='ctx'> 		b43_pio_handle_txstatus(dev, status);</div><div class='ctx'> 	else</div><div class='ctx'> 		b43_dma_handle_txstatus(dev, status);</div><div class='add'>+</div><div class='add'>+	b43_phy_txpower_check(dev, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Fill out the mac80211 TXstatus report based on the b43-specific</div><div class='head'>diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c<br/>index 1cb77db5c292..c66d57560e7c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/b43legacy/main.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/b43legacy/main.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/b43legacy/main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/b43legacy/main.c</a></div><div class='hunk'>@@ -888,13 +888,13 @@ generate_new:</div><div class='ctx'> </div><div class='ctx'> static void handle_irq_tbtt_indication(struct b43legacy_wldev *dev)</div><div class='ctx'> {</div><div class='del'>-	if (b43legacy_is_mode(dev-&gt;wl, IEEE80211_IF_TYPE_AP)) {</div><div class='add'>+	if (b43legacy_is_mode(dev-&gt;wl, NL80211_IFTYPE_AP)) {</div><div class='ctx'> 		/* TODO: PS TBTT */</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (1/*FIXME: the last PSpoll frame was sent successfully */)</div><div class='ctx'> 			b43legacy_power_saving_ctl_bits(dev, -1, -1);</div><div class='ctx'> 	}</div><div class='del'>-	if (b43legacy_is_mode(dev-&gt;wl, IEEE80211_IF_TYPE_IBSS))</div><div class='add'>+	if (b43legacy_is_mode(dev-&gt;wl, NL80211_IFTYPE_ADHOC))</div><div class='ctx'> 		dev-&gt;dfq_valid = 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1201,7 +1201,7 @@ static void handle_irq_beacon(struct b43legacy_wldev *dev)</div><div class='ctx'> 	struct b43legacy_wl *wl = dev-&gt;wl;</div><div class='ctx'> 	u32 cmd;</div><div class='ctx'> </div><div class='del'>-	if (!b43legacy_is_mode(wl, IEEE80211_IF_TYPE_AP))</div><div class='add'>+	if (!b43legacy_is_mode(wl, NL80211_IFTYPE_AP))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/* This is the bottom half of the asynchronous beacon update. */</div><div class='hunk'>@@ -1936,9 +1936,9 @@ static void b43legacy_adjust_opmode(struct b43legacy_wldev *dev)</div><div class='ctx'> 	ctl &amp;= ~B43legacy_MACCTL_BEACPROMISC;</div><div class='ctx'> 	ctl |= B43legacy_MACCTL_INFRA;</div><div class='ctx'> </div><div class='del'>-	if (b43legacy_is_mode(wl, IEEE80211_IF_TYPE_AP))</div><div class='add'>+	if (b43legacy_is_mode(wl, NL80211_IFTYPE_AP))</div><div class='ctx'> 		ctl |= B43legacy_MACCTL_AP;</div><div class='del'>-	else if (b43legacy_is_mode(wl, IEEE80211_IF_TYPE_IBSS))</div><div class='add'>+	else if (b43legacy_is_mode(wl, NL80211_IFTYPE_ADHOC))</div><div class='ctx'> 		ctl &amp;= ~B43legacy_MACCTL_INFRA;</div><div class='ctx'> </div><div class='ctx'> 	if (wl-&gt;filter_flags &amp; FIF_CONTROL)</div><div class='hunk'>@@ -2646,7 +2646,7 @@ static int b43legacy_op_dev_config(struct ieee80211_hw *hw,</div><div class='ctx'> 	b43legacy_mgmtframe_txantenna(dev, antenna_tx);</div><div class='ctx'> </div><div class='ctx'> 	/* Update templates for AP mode. */</div><div class='del'>-	if (b43legacy_is_mode(wl, IEEE80211_IF_TYPE_AP))</div><div class='add'>+	if (b43legacy_is_mode(wl, NL80211_IFTYPE_AP))</div><div class='ctx'> 		b43legacy_set_beacon_int(dev, conf-&gt;beacon_int);</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -2733,12 +2733,12 @@ static int b43legacy_op_config_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 	else</div><div class='ctx'> 		memset(wl-&gt;bssid, 0, ETH_ALEN);</div><div class='ctx'> 	if (b43legacy_status(dev) &gt;= B43legacy_STAT_INITIALIZED) {</div><div class='del'>-		if (b43legacy_is_mode(wl, IEEE80211_IF_TYPE_AP)) {</div><div class='del'>-			B43legacy_WARN_ON(vif-&gt;type != IEEE80211_IF_TYPE_AP);</div><div class='add'>+		if (b43legacy_is_mode(wl, NL80211_IFTYPE_AP)) {</div><div class='add'>+			B43legacy_WARN_ON(vif-&gt;type != NL80211_IFTYPE_AP);</div><div class='ctx'> 			b43legacy_set_ssid(dev, conf-&gt;ssid, conf-&gt;ssid_len);</div><div class='ctx'> 			if (conf-&gt;changed &amp; IEEE80211_IFCC_BEACON)</div><div class='ctx'> 				b43legacy_update_templates(wl);</div><div class='del'>-		} else if (b43legacy_is_mode(wl, IEEE80211_IF_TYPE_IBSS)) {</div><div class='add'>+		} else if (b43legacy_is_mode(wl, NL80211_IFTYPE_ADHOC)) {</div><div class='ctx'> 			if (conf-&gt;changed &amp; IEEE80211_IFCC_BEACON)</div><div class='ctx'> 				b43legacy_update_templates(wl);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -3020,7 +3020,7 @@ static void b43legacy_set_synth_pu_delay(struct b43legacy_wldev *dev,</div><div class='ctx'> 					  bool idle) {</div><div class='ctx'> 	u16 pu_delay = 1050;</div><div class='ctx'> </div><div class='del'>-	if (b43legacy_is_mode(dev-&gt;wl, IEEE80211_IF_TYPE_IBSS) || idle)</div><div class='add'>+	if (b43legacy_is_mode(dev-&gt;wl, NL80211_IFTYPE_ADHOC) || idle)</div><div class='ctx'> 		pu_delay = 500;</div><div class='ctx'> 	if ((dev-&gt;phy.radio_ver == 0x2050) &amp;&amp; (dev-&gt;phy.radio_rev == 8))</div><div class='ctx'> 		pu_delay = max(pu_delay, (u16)2400);</div><div class='hunk'>@@ -3035,7 +3035,7 @@ static void b43legacy_set_pretbtt(struct b43legacy_wldev *dev)</div><div class='ctx'> 	u16 pretbtt;</div><div class='ctx'> </div><div class='ctx'> 	/* The time value is in microseconds. */</div><div class='del'>-	if (b43legacy_is_mode(dev-&gt;wl, IEEE80211_IF_TYPE_IBSS))</div><div class='add'>+	if (b43legacy_is_mode(dev-&gt;wl, NL80211_IFTYPE_ADHOC))</div><div class='ctx'> 		pretbtt = 2;</div><div class='ctx'> 	else</div><div class='ctx'> 		pretbtt = 250;</div><div class='hunk'>@@ -3259,10 +3259,10 @@ static int b43legacy_op_add_interface(struct ieee80211_hw *hw,</div><div class='ctx'> </div><div class='ctx'> 	/* TODO: allow WDS/AP devices to coexist */</div><div class='ctx'> </div><div class='del'>-	if (conf-&gt;type != IEEE80211_IF_TYPE_AP &amp;&amp;</div><div class='del'>-	    conf-&gt;type != IEEE80211_IF_TYPE_STA &amp;&amp;</div><div class='del'>-	    conf-&gt;type != IEEE80211_IF_TYPE_WDS &amp;&amp;</div><div class='del'>-	    conf-&gt;type != IEEE80211_IF_TYPE_IBSS)</div><div class='add'>+	if (conf-&gt;type != NL80211_IFTYPE_AP &amp;&amp;</div><div class='add'>+	    conf-&gt;type != NL80211_IFTYPE_STATION &amp;&amp;</div><div class='add'>+	    conf-&gt;type != NL80211_IFTYPE_WDS &amp;&amp;</div><div class='add'>+	    conf-&gt;type != NL80211_IFTYPE_ADHOC)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;wl-&gt;mutex);</div><div class='hunk'>@@ -3403,7 +3403,7 @@ out_unlock:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int b43legacy_op_beacon_set_tim(struct ieee80211_hw *hw,</div><div class='del'>-				       int aid, int set)</div><div class='add'>+				       struct ieee80211_sta *sta, bool set)</div><div class='ctx'> {</div><div class='ctx'> 	struct b43legacy_wl *wl = hw_to_b43legacy_wl(hw);</div><div class='ctx'> 	unsigned long flags;</div><div class='hunk'>@@ -3704,7 +3704,13 @@ static int b43legacy_wireless_init(struct ssb_device *dev)</div><div class='ctx'> 	hw-&gt;flags = IEEE80211_HW_RX_INCLUDES_FCS |</div><div class='ctx'> 		    IEEE80211_HW_SIGNAL_DBM |</div><div class='ctx'> 		    IEEE80211_HW_NOISE_DBM;</div><div class='add'>+	hw-&gt;wiphy-&gt;interface_modes =</div><div class='add'>+		BIT(NL80211_IFTYPE_AP) |</div><div class='add'>+		BIT(NL80211_IFTYPE_STATION) |</div><div class='add'>+		BIT(NL80211_IFTYPE_WDS) |</div><div class='add'>+		BIT(NL80211_IFTYPE_ADHOC);</div><div class='ctx'> 	hw-&gt;queues = 1; /* FIXME: hardware has more queues */</div><div class='add'>+	hw-&gt;max_altrates = 1;</div><div class='ctx'> 	SET_IEEE80211_DEV(hw, dev-&gt;dev);</div><div class='ctx'> 	if (is_valid_ether_addr(sprom-&gt;et1mac))</div><div class='ctx'> 		SET_IEEE80211_PERM_ADDR(hw, sprom-&gt;et1mac);</div><div class='head'>diff --git a/drivers/net/wireless/b43legacy/phy.c b/drivers/net/wireless/b43legacy/phy.c<br/>index 768cccb9b1ba..4c9442b16f3f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/b43legacy/phy.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/b43legacy/phy.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/b43legacy/phy.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/b43legacy/phy.c</a></div><div class='hunk'>@@ -103,7 +103,7 @@ void b43legacy_phy_lock(struct b43legacy_wldev *dev)</div><div class='ctx'> 	if (dev-&gt;dev-&gt;id.revision &lt; 3) {</div><div class='ctx'> 		b43legacy_mac_suspend(dev);</div><div class='ctx'> 	} else {</div><div class='del'>-		if (!b43legacy_is_mode(dev-&gt;wl, IEEE80211_IF_TYPE_AP))</div><div class='add'>+		if (!b43legacy_is_mode(dev-&gt;wl, NL80211_IFTYPE_AP))</div><div class='ctx'> 			b43legacy_power_saving_ctl_bits(dev, -1, 1);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -118,7 +118,7 @@ void b43legacy_phy_unlock(struct b43legacy_wldev *dev)</div><div class='ctx'> 	if (dev-&gt;dev-&gt;id.revision &lt; 3) {</div><div class='ctx'> 		b43legacy_mac_enable(dev);</div><div class='ctx'> 	} else {</div><div class='del'>-		if (!b43legacy_is_mode(dev-&gt;wl, IEEE80211_IF_TYPE_AP))</div><div class='add'>+		if (!b43legacy_is_mode(dev-&gt;wl, NL80211_IFTYPE_AP))</div><div class='ctx'> 			b43legacy_power_saving_ctl_bits(dev, -1, -1);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -595,12 +595,14 @@ static void b43legacy_phy_initb5(struct b43legacy_wldev *dev)</div><div class='ctx'> 				    0x0035) &amp; 0xFFC0) | 0x0064);</div><div class='ctx'> 		b43legacy_phy_write(dev, 0x005D, (b43legacy_phy_read(dev,</div><div class='ctx'> 				    0x005D) &amp; 0xFF80) | 0x000A);</div><div class='add'>+		b43legacy_phy_write(dev, 0x5B, 0x0000);</div><div class='add'>+		b43legacy_phy_write(dev, 0x5C, 0x0000);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;bad_frames_preempt)</div><div class='ctx'> 		b43legacy_phy_write(dev, B43legacy_PHY_RADIO_BITFIELD,</div><div class='ctx'> 				    b43legacy_phy_read(dev,</div><div class='del'>-				    B43legacy_PHY_RADIO_BITFIELD) | (1 &lt;&lt; 11));</div><div class='add'>+				    B43legacy_PHY_RADIO_BITFIELD) | (1 &lt;&lt; 12));</div><div class='ctx'> </div><div class='ctx'> 	if (phy-&gt;analog == 1) {</div><div class='ctx'> 		b43legacy_phy_write(dev, 0x0026, 0xCE00);</div><div class='hunk'>@@ -753,7 +755,7 @@ static void b43legacy_phy_initb6(struct b43legacy_wldev *dev)</div><div class='ctx'> 		b43legacy_radio_write16(dev, 0x0050, 0x0020);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (phy-&gt;radio_rev &lt;= 2) {</div><div class='del'>-		b43legacy_radio_write16(dev, 0x007C, 0x0020);</div><div class='add'>+		b43legacy_radio_write16(dev, 0x0050, 0x0020);</div><div class='ctx'> 		b43legacy_radio_write16(dev, 0x005A, 0x0070);</div><div class='ctx'> 		b43legacy_radio_write16(dev, 0x005B, 0x007B);</div><div class='ctx'> 		b43legacy_radio_write16(dev, 0x005C, 0x00B0);</div><div class='hunk'>@@ -771,7 +773,7 @@ static void b43legacy_phy_initb6(struct b43legacy_wldev *dev)</div><div class='ctx'> 		b43legacy_phy_write(dev, 0x002A, 0x8AC0);</div><div class='ctx'> 	b43legacy_phy_write(dev, 0x0038, 0x0668);</div><div class='ctx'> 	b43legacy_radio_set_txpower_bg(dev, 0xFFFF, 0xFFFF, 0xFFFF);</div><div class='del'>-	if (phy-&gt;radio_rev &lt;= 5)</div><div class='add'>+	if (phy-&gt;radio_rev == 4 || phy-&gt;radio_rev == 5)</div><div class='ctx'> 		b43legacy_phy_write(dev, 0x005D, (b43legacy_phy_read(dev,</div><div class='ctx'> 				    0x005D) &amp; 0xFF80) | 0x0003);</div><div class='ctx'> 	if (phy-&gt;radio_rev &lt;= 2)</div><div class='hunk'>@@ -1010,7 +1012,7 @@ static void b43legacy_phy_initg(struct b43legacy_wldev *dev)</div><div class='ctx'> 		b43legacy_phy_initb5(dev);</div><div class='ctx'> 	else</div><div class='ctx'> 		b43legacy_phy_initb6(dev);</div><div class='del'>-	if (phy-&gt;rev &gt;= 2 || phy-&gt;gmode)</div><div class='add'>+	if (phy-&gt;rev &gt;= 2 &amp;&amp; phy-&gt;gmode)</div><div class='ctx'> 		b43legacy_phy_inita(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (phy-&gt;rev &gt;= 2) {</div><div class='hunk'>@@ -1025,18 +1027,22 @@ static void b43legacy_phy_initg(struct b43legacy_wldev *dev)</div><div class='ctx'> 		b43legacy_phy_write(dev, 0x0811, 0x0400);</div><div class='ctx'> 		b43legacy_phy_write(dev, 0x0015, 0x00C0);</div><div class='ctx'> 	}</div><div class='del'>-	if (phy-&gt;rev &gt;= 2 || phy-&gt;gmode) {</div><div class='add'>+	if (phy-&gt;gmode) {</div><div class='ctx'> 		tmp = b43legacy_phy_read(dev, 0x0400) &amp; 0xFF;</div><div class='del'>-		if (tmp == 3 || tmp == 5) {</div><div class='add'>+		if (tmp == 3) {</div><div class='add'>+			b43legacy_phy_write(dev, 0x04C2, 0x1816);</div><div class='add'>+			b43legacy_phy_write(dev, 0x04C3, 0x8606);</div><div class='add'>+		}</div><div class='add'>+		if (tmp == 4 || tmp == 5) {</div><div class='ctx'> 			b43legacy_phy_write(dev, 0x04C2, 0x1816);</div><div class='ctx'> 			b43legacy_phy_write(dev, 0x04C3, 0x8006);</div><div class='del'>-			if (tmp == 5)</div><div class='del'>-				b43legacy_phy_write(dev, 0x04CC,</div><div class='del'>-						    (b43legacy_phy_read(dev,</div><div class='del'>-						     0x04CC) &amp; 0x00FF) |</div><div class='del'>-						     0x1F00);</div><div class='add'>+			b43legacy_phy_write(dev, 0x04CC,</div><div class='add'>+					    (b43legacy_phy_read(dev,</div><div class='add'>+					     0x04CC) &amp; 0x00FF) |</div><div class='add'>+					     0x1F00);</div><div class='ctx'> 		}</div><div class='del'>-		b43legacy_phy_write(dev, 0x047E, 0x0078);</div><div class='add'>+		if (phy-&gt;rev &gt;= 2)</div><div class='add'>+			b43legacy_phy_write(dev, 0x047E, 0x0078);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (phy-&gt;radio_rev == 8) {</div><div class='ctx'> 		b43legacy_phy_write(dev, 0x0801, b43legacy_phy_read(dev, 0x0801)</div><div class='hunk'>@@ -1078,7 +1084,7 @@ static void b43legacy_phy_initg(struct b43legacy_wldev *dev)</div><div class='ctx'> 		else</div><div class='ctx'> 			b43legacy_phy_write(dev, 0x002F, 0x0202);</div><div class='ctx'> 	}</div><div class='del'>-	if (phy-&gt;gmode || phy-&gt;rev &gt;= 2) {</div><div class='add'>+	if (phy-&gt;gmode) {</div><div class='ctx'> 		b43legacy_phy_lo_adjust(dev, 0);</div><div class='ctx'> 		b43legacy_phy_write(dev, 0x080F, 0x8078);</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/net/wireless/b43legacy/xmit.c b/drivers/net/wireless/b43legacy/xmit.c<br/>index 68e1f8c78727..65e833781608 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/b43legacy/xmit.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/b43legacy/xmit.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/b43legacy/xmit.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/b43legacy/xmit.c</a></div><div class='hunk'>@@ -193,7 +193,6 @@ static int generate_txhdr_fw3(struct b43legacy_wldev *dev,</div><div class='ctx'> {</div><div class='ctx'> 	const struct ieee80211_hdr *wlhdr;</div><div class='ctx'> 	int use_encryption = !!info-&gt;control.hw_key;</div><div class='del'>-	u16 fctl;</div><div class='ctx'> 	u8 rate;</div><div class='ctx'> 	struct ieee80211_rate *rate_fb;</div><div class='ctx'> 	int rate_ofdm;</div><div class='hunk'>@@ -204,7 +203,6 @@ static int generate_txhdr_fw3(struct b43legacy_wldev *dev,</div><div class='ctx'> 	struct ieee80211_rate *tx_rate;</div><div class='ctx'> </div><div class='ctx'> 	wlhdr = (const struct ieee80211_hdr *)fragment_data;</div><div class='del'>-	fctl = le16_to_cpu(wlhdr-&gt;frame_control);</div><div class='ctx'> </div><div class='ctx'> 	memset(txhdr, 0, sizeof(*txhdr));</div><div class='ctx'> </div><div class='hunk'>@@ -212,7 +210,7 @@ static int generate_txhdr_fw3(struct b43legacy_wldev *dev,</div><div class='ctx'> </div><div class='ctx'> 	rate = tx_rate-&gt;hw_value;</div><div class='ctx'> 	rate_ofdm = b43legacy_is_ofdm_rate(rate);</div><div class='del'>-	rate_fb = ieee80211_get_alt_retry_rate(dev-&gt;wl-&gt;hw, info) ? : tx_rate;</div><div class='add'>+	rate_fb = ieee80211_get_alt_retry_rate(dev-&gt;wl-&gt;hw, info, 0) ? : tx_rate;</div><div class='ctx'> 	rate_fb_ofdm = b43legacy_is_ofdm_rate(rate_fb-&gt;hw_value);</div><div class='ctx'> </div><div class='ctx'> 	txhdr-&gt;mac_frame_ctl = wlhdr-&gt;frame_control;</div><div class='hunk'>@@ -245,7 +243,7 @@ static int generate_txhdr_fw3(struct b43legacy_wldev *dev,</div><div class='ctx'> </div><div class='ctx'> 		if (key-&gt;enabled) {</div><div class='ctx'> 			/* Hardware appends ICV. */</div><div class='del'>-			plcp_fragment_len += info-&gt;control.icv_len;</div><div class='add'>+			plcp_fragment_len += info-&gt;control.hw_key-&gt;icv_len;</div><div class='ctx'> </div><div class='ctx'> 			key_idx = b43legacy_kidx_to_fw(dev, key_idx);</div><div class='ctx'> 			mac_ctl |= (key_idx &lt;&lt; B43legacy_TX4_MAC_KEYIDX_SHIFT) &amp;</div><div class='hunk'>@@ -253,8 +251,8 @@ static int generate_txhdr_fw3(struct b43legacy_wldev *dev,</div><div class='ctx'> 			mac_ctl |= (key-&gt;algorithm &lt;&lt;</div><div class='ctx'> 				   B43legacy_TX4_MAC_KEYALG_SHIFT) &amp;</div><div class='ctx'> 				   B43legacy_TX4_MAC_KEYALG;</div><div class='del'>-			wlhdr_len = ieee80211_get_hdrlen(fctl);</div><div class='del'>-			iv_len = min((size_t)info-&gt;control.iv_len,</div><div class='add'>+			wlhdr_len = ieee80211_hdrlen(wlhdr-&gt;frame_control);</div><div class='add'>+			iv_len = min((size_t)info-&gt;control.hw_key-&gt;iv_len,</div><div class='ctx'> 				     ARRAY_SIZE(txhdr-&gt;iv));</div><div class='ctx'> 			memcpy(txhdr-&gt;iv, ((u8 *)wlhdr) + wlhdr_len, iv_len);</div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -626,7 +624,7 @@ void b43legacy_handle_hwtxstatus(struct b43legacy_wldev *dev,</div><div class='ctx'> 	tmp = hw-&gt;count;</div><div class='ctx'> 	status.frame_count = (tmp &gt;&gt; 4);</div><div class='ctx'> 	status.rts_count = (tmp &amp; 0x0F);</div><div class='del'>-	tmp = hw-&gt;flags;</div><div class='add'>+	tmp = hw-&gt;flags &lt;&lt; 1;</div><div class='ctx'> 	status.supp_reason = ((tmp &amp; 0x1C) &gt;&gt; 2);</div><div class='ctx'> 	status.pm_indicated = !!(tmp &amp; 0x80);</div><div class='ctx'> 	status.intermediate = !!(tmp &amp; 0x40);</div><div class='head'>diff --git a/drivers/net/wireless/hermes.c b/drivers/net/wireless/hermes.c<br/>index 29d39105f5b8..bfa375369df3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/hermes.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/hermes.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/hermes.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/hermes.c</a></div><div class='hunk'>@@ -87,7 +87,8 @@ MODULE_LICENSE("Dual MPL/GPL");</div><div class='ctx'> </div><div class='ctx'>    Callable from any context.</div><div class='ctx'> */</div><div class='del'>-static int hermes_issue_cmd(hermes_t *hw, u16 cmd, u16 param0)</div><div class='add'>+static int hermes_issue_cmd(hermes_t *hw, u16 cmd, u16 param0,</div><div class='add'>+			    u16 param1, u16 param2)</div><div class='ctx'> {</div><div class='ctx'> 	int k = CMD_BUSY_TIMEOUT;</div><div class='ctx'> 	u16 reg;</div><div class='hunk'>@@ -103,8 +104,8 @@ static int hermes_issue_cmd(hermes_t *hw, u16 cmd, u16 param0)</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	hermes_write_regn(hw, PARAM2, 0);</div><div class='del'>-	hermes_write_regn(hw, PARAM1, 0);</div><div class='add'>+	hermes_write_regn(hw, PARAM2, param2);</div><div class='add'>+	hermes_write_regn(hw, PARAM1, param1);</div><div class='ctx'> 	hermes_write_regn(hw, PARAM0, param0);</div><div class='ctx'> 	hermes_write_regn(hw, CMD, cmd);</div><div class='ctx'> 	</div><div class='hunk'>@@ -115,16 +116,72 @@ static int hermes_issue_cmd(hermes_t *hw, u16 cmd, u16 param0)</div><div class='ctx'>  * Function definitions</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+/* For doing cmds that wipe the magic constant in SWSUPPORT0 */</div><div class='add'>+int hermes_doicmd_wait(hermes_t *hw, u16 cmd,</div><div class='add'>+		       u16 parm0, u16 parm1, u16 parm2,</div><div class='add'>+		       struct hermes_response *resp)</div><div class='add'>+{</div><div class='add'>+	int err = 0;</div><div class='add'>+	int k;</div><div class='add'>+	u16 status, reg;</div><div class='add'>+</div><div class='add'>+	err = hermes_issue_cmd(hw, cmd, parm0, parm1, parm2);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	reg = hermes_read_regn(hw, EVSTAT);</div><div class='add'>+	k = CMD_INIT_TIMEOUT;</div><div class='add'>+	while ((!(reg &amp; HERMES_EV_CMD)) &amp;&amp; k) {</div><div class='add'>+		k--;</div><div class='add'>+		udelay(10);</div><div class='add'>+		reg = hermes_read_regn(hw, EVSTAT);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hermes_write_regn(hw, SWSUPPORT0, HERMES_MAGIC);</div><div class='add'>+</div><div class='add'>+	if (!hermes_present(hw)) {</div><div class='add'>+		DEBUG(0, "hermes @ 0x%x: Card removed during reset.\n",</div><div class='add'>+		       hw-&gt;iobase);</div><div class='add'>+		err = -ENODEV;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!(reg &amp; HERMES_EV_CMD)) {</div><div class='add'>+		printk(KERN_ERR "hermes @ %p: "</div><div class='add'>+		       "Timeout waiting for card to reset (reg=0x%04x)!\n",</div><div class='add'>+		       hw-&gt;iobase, reg);</div><div class='add'>+		err = -ETIMEDOUT;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	status = hermes_read_regn(hw, STATUS);</div><div class='add'>+	if (resp) {</div><div class='add'>+		resp-&gt;status = status;</div><div class='add'>+		resp-&gt;resp0 = hermes_read_regn(hw, RESP0);</div><div class='add'>+		resp-&gt;resp1 = hermes_read_regn(hw, RESP1);</div><div class='add'>+		resp-&gt;resp2 = hermes_read_regn(hw, RESP2);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hermes_write_regn(hw, EVACK, HERMES_EV_CMD);</div><div class='add'>+</div><div class='add'>+	if (status &amp; HERMES_STATUS_RESULT)</div><div class='add'>+		err = -EIO;</div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(hermes_doicmd_wait);</div><div class='add'>+</div><div class='ctx'> void hermes_struct_init(hermes_t *hw, void __iomem *address, int reg_spacing)</div><div class='ctx'> {</div><div class='ctx'> 	hw-&gt;iobase = address;</div><div class='ctx'> 	hw-&gt;reg_spacing = reg_spacing;</div><div class='ctx'> 	hw-&gt;inten = 0x0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(hermes_struct_init);</div><div class='ctx'> </div><div class='ctx'> int hermes_init(hermes_t *hw)</div><div class='ctx'> {</div><div class='del'>-	u16 status, reg;</div><div class='add'>+	u16 reg;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	int k;</div><div class='ctx'> </div><div class='hunk'>@@ -162,45 +219,11 @@ int hermes_init(hermes_t *hw)</div><div class='ctx'> </div><div class='ctx'> 	/* We don't use hermes_docmd_wait here, because the reset wipes</div><div class='ctx'> 	   the magic constant in SWSUPPORT0 away, and it gets confused */</div><div class='del'>-	err = hermes_issue_cmd(hw, HERMES_CMD_INIT, 0);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	reg = hermes_read_regn(hw, EVSTAT);</div><div class='del'>-	k = CMD_INIT_TIMEOUT;</div><div class='del'>-	while ( (! (reg &amp; HERMES_EV_CMD)) &amp;&amp; k) {</div><div class='del'>-		k--;</div><div class='del'>-		udelay(10);</div><div class='del'>-		reg = hermes_read_regn(hw, EVSTAT);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hermes_write_regn(hw, SWSUPPORT0, HERMES_MAGIC);</div><div class='del'>-</div><div class='del'>-	if (! hermes_present(hw)) {</div><div class='del'>-		DEBUG(0, "hermes @ 0x%x: Card removed during reset.\n",</div><div class='del'>-		       hw-&gt;iobase);</div><div class='del'>-		err = -ENODEV;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-		</div><div class='del'>-	if (! (reg &amp; HERMES_EV_CMD)) {</div><div class='del'>-		printk(KERN_ERR "hermes @ %p: " </div><div class='del'>-		       "Timeout waiting for card to reset (reg=0x%04x)!\n",</div><div class='del'>-		       hw-&gt;iobase, reg);</div><div class='del'>-		err = -ETIMEDOUT;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	err = hermes_doicmd_wait(hw, HERMES_CMD_INIT, 0, 0, 0, NULL);</div><div class='ctx'> </div><div class='del'>-	status = hermes_read_regn(hw, STATUS);</div><div class='del'>-</div><div class='del'>-	hermes_write_regn(hw, EVACK, HERMES_EV_CMD);</div><div class='del'>-</div><div class='del'>-	if (status &amp; HERMES_STATUS_RESULT)</div><div class='del'>-		err = -EIO;</div><div class='del'>-</div><div class='del'>- out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(hermes_init);</div><div class='ctx'> </div><div class='ctx'> /* Issue a command to the chip, and (busy!) wait for it to</div><div class='ctx'>  * complete.</div><div class='hunk'>@@ -216,7 +239,7 @@ int hermes_docmd_wait(hermes_t *hw, u16 cmd, u16 parm0,</div><div class='ctx'> 	u16 reg;</div><div class='ctx'> 	u16 status;</div><div class='ctx'> </div><div class='del'>-	err = hermes_issue_cmd(hw, cmd, parm0);</div><div class='add'>+	err = hermes_issue_cmd(hw, cmd, parm0, 0, 0);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		if (! hermes_present(hw)) {</div><div class='ctx'> 			if (net_ratelimit())</div><div class='hunk'>@@ -271,6 +294,7 @@ int hermes_docmd_wait(hermes_t *hw, u16 cmd, u16 parm0,</div><div class='ctx'>  out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(hermes_docmd_wait);</div><div class='ctx'> </div><div class='ctx'> int hermes_allocate(hermes_t *hw, u16 size, u16 *fid)</div><div class='ctx'> {</div><div class='hunk'>@@ -313,7 +337,7 @@ int hermes_allocate(hermes_t *hw, u16 size, u16 *fid)</div><div class='ctx'> 	</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-</div><div class='add'>+EXPORT_SYMBOL(hermes_allocate);</div><div class='ctx'> </div><div class='ctx'> /* Set up a BAP to read a particular chunk of data from card's internal buffer.</div><div class='ctx'>  *</div><div class='hunk'>@@ -397,6 +421,7 @@ int hermes_bap_pread(hermes_t *hw, int bap, void *buf, int len,</div><div class='ctx'>  out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(hermes_bap_pread);</div><div class='ctx'> </div><div class='ctx'> /* Write a block of data to the chip's buffer, via the</div><div class='ctx'>  * BAP. Synchronization/serialization is the caller's problem.</div><div class='hunk'>@@ -422,6 +447,7 @@ int hermes_bap_pwrite(hermes_t *hw, int bap, const void *buf, int len,</div><div class='ctx'>  out:	</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(hermes_bap_pwrite);</div><div class='ctx'> </div><div class='ctx'> /* Read a Length-Type-Value record from the card.</div><div class='ctx'>  *</div><div class='hunk'>@@ -463,7 +489,7 @@ int hermes_read_ltv(hermes_t *hw, int bap, u16 rid, unsigned bufsize,</div><div class='ctx'> 	if (rtype != rid)</div><div class='ctx'> 		printk(KERN_WARNING "hermes @ %p: %s(): "</div><div class='ctx'> 		       "rid (0x%04x) does not match type (0x%04x)\n",</div><div class='del'>-		       hw-&gt;iobase, __FUNCTION__, rid, rtype);</div><div class='add'>+		       hw-&gt;iobase, __func__, rid, rtype);</div><div class='ctx'> 	if (HERMES_RECLEN_TO_BYTES(rlength) &gt; bufsize)</div><div class='ctx'> 		printk(KERN_WARNING "hermes @ %p: "</div><div class='ctx'> 		       "Truncating LTV record from %d to %d bytes. "</div><div class='hunk'>@@ -475,6 +501,7 @@ int hermes_read_ltv(hermes_t *hw, int bap, u16 rid, unsigned bufsize,</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(hermes_read_ltv);</div><div class='ctx'> </div><div class='ctx'> int hermes_write_ltv(hermes_t *hw, int bap, u16 rid, </div><div class='ctx'> 		     u16 length, const void *value)</div><div class='hunk'>@@ -497,20 +524,11 @@ int hermes_write_ltv(hermes_t *hw, int bap, u16 rid,</div><div class='ctx'> </div><div class='ctx'> 	hermes_write_bytes(hw, dreg, value, count &lt;&lt; 1);</div><div class='ctx'> </div><div class='del'>-	err = hermes_docmd_wait(hw, HERMES_CMD_ACCESS | HERMES_CMD_WRITE, </div><div class='add'>+	err = hermes_docmd_wait(hw, HERMES_CMD_ACCESS | HERMES_CMD_WRITE,</div><div class='ctx'> 				rid, NULL);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(hermes_struct_init);</div><div class='del'>-EXPORT_SYMBOL(hermes_init);</div><div class='del'>-EXPORT_SYMBOL(hermes_docmd_wait);</div><div class='del'>-EXPORT_SYMBOL(hermes_allocate);</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(hermes_bap_pread);</div><div class='del'>-EXPORT_SYMBOL(hermes_bap_pwrite);</div><div class='del'>-EXPORT_SYMBOL(hermes_read_ltv);</div><div class='ctx'> EXPORT_SYMBOL(hermes_write_ltv);</div><div class='ctx'> </div><div class='ctx'> static int __init init_hermes(void)</div><div class='head'>diff --git a/drivers/net/wireless/hermes.h b/drivers/net/wireless/hermes.h<br/>index 8e3f0e3edb58..8b13c8fef3dc 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/hermes.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/hermes.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/hermes.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/hermes.h</a></div><div class='hunk'>@@ -179,17 +179,23 @@</div><div class='ctx'> #define HERMES_802_11_OFFSET		(14)</div><div class='ctx'> #define HERMES_802_3_OFFSET		(14+32)</div><div class='ctx'> #define HERMES_802_2_OFFSET		(14+32+14)</div><div class='add'>+#define HERMES_TXCNTL2_OFFSET		(HERMES_802_3_OFFSET - 2)</div><div class='ctx'> </div><div class='ctx'> #define HERMES_RXSTAT_ERR		(0x0003)</div><div class='ctx'> #define	HERMES_RXSTAT_BADCRC		(0x0001)</div><div class='ctx'> #define	HERMES_RXSTAT_UNDECRYPTABLE	(0x0002)</div><div class='add'>+#define	HERMES_RXSTAT_MIC		(0x0010)	/* Frame contains MIC */</div><div class='ctx'> #define	HERMES_RXSTAT_MACPORT		(0x0700)</div><div class='ctx'> #define HERMES_RXSTAT_PCF		(0x1000)	/* Frame was received in CF period */</div><div class='add'>+#define	HERMES_RXSTAT_MIC_KEY_ID	(0x1800)	/* MIC key used */</div><div class='ctx'> #define	HERMES_RXSTAT_MSGTYPE		(0xE000)</div><div class='ctx'> #define	HERMES_RXSTAT_1042		(0x2000)	/* RFC-1042 frame */</div><div class='ctx'> #define	HERMES_RXSTAT_TUNNEL		(0x4000)	/* bridge-tunnel encoded frame */</div><div class='ctx'> #define	HERMES_RXSTAT_WMP		(0x6000)	/* Wavelan-II Management Protocol frame */</div><div class='ctx'> </div><div class='add'>+/* Shift amount for key ID in RXSTAT and TXCTRL */</div><div class='add'>+#define	HERMES_MIC_KEY_ID_SHIFT		11</div><div class='add'>+</div><div class='ctx'> struct hermes_tx_descriptor {</div><div class='ctx'> 	__le16 status;</div><div class='ctx'> 	__le16 reserved1;</div><div class='hunk'>@@ -208,6 +214,8 @@ struct hermes_tx_descriptor {</div><div class='ctx'> #define HERMES_TXCTRL_TX_OK		(0x0002)	/* ?? interrupt on Tx complete */</div><div class='ctx'> #define HERMES_TXCTRL_TX_EX		(0x0004)	/* ?? interrupt on Tx exception */</div><div class='ctx'> #define HERMES_TXCTRL_802_11		(0x0008)	/* We supply 802.11 header */</div><div class='add'>+#define HERMES_TXCTRL_MIC		(0x0010)	/* 802.3 + TKIP */</div><div class='add'>+#define HERMES_TXCTRL_MIC_KEY_ID	(0x1800)	/* MIC Key ID mask */</div><div class='ctx'> #define HERMES_TXCTRL_ALT_RTRY		(0x0020)</div><div class='ctx'> </div><div class='ctx'> /* Inquiry constants and data types */</div><div class='hunk'>@@ -302,6 +310,40 @@ union hermes_scan_info {</div><div class='ctx'> 	struct symbol_scan_apinfo	s;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* Extended scan struct for HERMES_INQ_CHANNELINFO.</div><div class='add'>+ * wl_lkm calls this an ACS scan (Automatic Channel Select).</div><div class='add'>+ * Keep out of union hermes_scan_info because it is much bigger than</div><div class='add'>+ * the older scan structures. */</div><div class='add'>+struct agere_ext_scan_info {</div><div class='add'>+	__le16	reserved0;</div><div class='add'>+</div><div class='add'>+	u8	noise;</div><div class='add'>+	u8	level;</div><div class='add'>+	u8	rx_flow;</div><div class='add'>+	u8	rate;</div><div class='add'>+	__le16	reserved1[2];</div><div class='add'>+</div><div class='add'>+	__le16	frame_control;</div><div class='add'>+	__le16	dur_id;</div><div class='add'>+	u8	addr1[ETH_ALEN];</div><div class='add'>+	u8	addr2[ETH_ALEN];</div><div class='add'>+	u8	bssid[ETH_ALEN];</div><div class='add'>+	__le16	sequence;</div><div class='add'>+	u8	addr4[ETH_ALEN];</div><div class='add'>+</div><div class='add'>+	__le16	data_length;</div><div class='add'>+</div><div class='add'>+	/* Next 3 fields do not get filled in. */</div><div class='add'>+	u8	daddr[ETH_ALEN];</div><div class='add'>+	u8	saddr[ETH_ALEN];</div><div class='add'>+	__le16	len_type;</div><div class='add'>+</div><div class='add'>+	__le64	timestamp;</div><div class='add'>+	__le16	beacon_interval;</div><div class='add'>+	__le16	capabilities;</div><div class='add'>+	u8	data[316];</div><div class='add'>+} __attribute__ ((packed));</div><div class='add'>+</div><div class='ctx'> #define HERMES_LINKSTATUS_NOT_CONNECTED   (0x0000)  </div><div class='ctx'> #define HERMES_LINKSTATUS_CONNECTED       (0x0001)</div><div class='ctx'> #define HERMES_LINKSTATUS_DISCONNECTED    (0x0002)</div><div class='hunk'>@@ -353,6 +395,9 @@ void hermes_struct_init(hermes_t *hw, void __iomem *address, int reg_spacing);</div><div class='ctx'> int hermes_init(hermes_t *hw);</div><div class='ctx'> int hermes_docmd_wait(hermes_t *hw, u16 cmd, u16 parm0,</div><div class='ctx'> 		      struct hermes_response *resp);</div><div class='add'>+int hermes_doicmd_wait(hermes_t *hw, u16 cmd,</div><div class='add'>+		       u16 parm0, u16 parm1, u16 parm2,</div><div class='add'>+		       struct hermes_response *resp);</div><div class='ctx'> int hermes_allocate(hermes_t *hw, u16 size, u16 *fid);</div><div class='ctx'> </div><div class='ctx'> int hermes_bap_pread(hermes_t *hw, int bap, void *buf, int len,</div><div class='head'>diff --git a/drivers/net/wireless/hermes_dld.c b/drivers/net/wireless/hermes_dld.c<br/>new file mode 100644<br/>index 000000000000..d8c626e61a3a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/hermes_dld.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/hermes_dld.c</a></div><div class='hunk'>@@ -0,0 +1,730 @@</div><div class='add'>+/*</div><div class='add'>+ * Hermes download helper driver.</div><div class='add'>+ *</div><div class='add'>+ * This could be entirely merged into hermes.c.</div><div class='add'>+ *</div><div class='add'>+ * I'm keeping it separate to minimise the amount of merging between</div><div class='add'>+ * kernel upgrades. It also means the memory overhead for drivers that</div><div class='add'>+ * don't need firmware download low.</div><div class='add'>+ *</div><div class='add'>+ * This driver:</div><div class='add'>+ *  - is capable of writing to the volatile area of the hermes device</div><div class='add'>+ *  - is currently not capable of writing to non-volatile areas</div><div class='add'>+ *  - provide helpers to identify and update plugin data</div><div class='add'>+ *  - is not capable of interpreting a fw image directly. That is up to</div><div class='add'>+ *    the main card driver.</div><div class='add'>+ *  - deals with Hermes I devices. It can probably be modified to deal</div><div class='add'>+ *    with Hermes II devices</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2007, David Kilroy</div><div class='add'>+ *</div><div class='add'>+ * Plug data code slightly modified from spectrum_cs driver</div><div class='add'>+ *    Copyright (C) 2002-2005 Pavel Roskin &lt;proski@gnu.org&gt;</div><div class='add'>+ * Portions based on information in wl_lkm_718 Agere driver</div><div class='add'>+ *    COPYRIGHT (C) 2001-2004 by Agere Systems Inc. All Rights Reserved</div><div class='add'>+ *</div><div class='add'>+ * The contents of this file are subject to the Mozilla Public License</div><div class='add'>+ * Version 1.1 (the "License"); you may not use this file except in</div><div class='add'>+ * compliance with the License. You may obtain a copy of the License</div><div class='add'>+ * at http://www.mozilla.org/MPL/</div><div class='add'>+ *</div><div class='add'>+ * Software distributed under the License is distributed on an "AS IS"</div><div class='add'>+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See</div><div class='add'>+ * the License for the specific language governing rights and</div><div class='add'>+ * limitations under the License.</div><div class='add'>+ *</div><div class='add'>+ * Alternatively, the contents of this file may be used under the</div><div class='add'>+ * terms of the GNU General Public License version 2 (the "GPL"), in</div><div class='add'>+ * which case the provisions of the GPL are applicable instead of the</div><div class='add'>+ * above.  If you wish to allow the use of your version of this file</div><div class='add'>+ * only under the terms of the GPL and not to allow others to use your</div><div class='add'>+ * version of this file under the MPL, indicate your decision by</div><div class='add'>+ * deleting the provisions above and replace them with the notice and</div><div class='add'>+ * other provisions required by the GPL.  If you do not delete the</div><div class='add'>+ * provisions above, a recipient may use your version of this file</div><div class='add'>+ * under either the MPL or the GPL.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include "hermes.h"</div><div class='add'>+#include "hermes_dld.h"</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("Download helper for Lucent Hermes chipset");</div><div class='add'>+MODULE_AUTHOR("David Kilroy &lt;kilroyd@gmail.com&gt;");</div><div class='add'>+MODULE_LICENSE("Dual MPL/GPL");</div><div class='add'>+</div><div class='add'>+#define PFX "hermes_dld: "</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * AUX port access.  To unlock the AUX port write the access keys to the</div><div class='add'>+ * PARAM0-2 registers, then write HERMES_AUX_ENABLE to the HERMES_CONTROL</div><div class='add'>+ * register.  Then read it and make sure it's HERMES_AUX_ENABLED.</div><div class='add'>+ */</div><div class='add'>+#define HERMES_AUX_ENABLE	0x8000	/* Enable auxiliary port access */</div><div class='add'>+#define HERMES_AUX_DISABLE	0x4000	/* Disable to auxiliary port access */</div><div class='add'>+#define HERMES_AUX_ENABLED	0xC000	/* Auxiliary port is open */</div><div class='add'>+#define HERMES_AUX_DISABLED	0x0000	/* Auxiliary port is closed */</div><div class='add'>+</div><div class='add'>+#define HERMES_AUX_PW0	0xFE01</div><div class='add'>+#define HERMES_AUX_PW1	0xDC23</div><div class='add'>+#define HERMES_AUX_PW2	0xBA45</div><div class='add'>+</div><div class='add'>+/* HERMES_CMD_DOWNLD */</div><div class='add'>+#define HERMES_PROGRAM_DISABLE             (0x0000 | HERMES_CMD_DOWNLD)</div><div class='add'>+#define HERMES_PROGRAM_ENABLE_VOLATILE     (0x0100 | HERMES_CMD_DOWNLD)</div><div class='add'>+#define HERMES_PROGRAM_ENABLE_NON_VOLATILE (0x0200 | HERMES_CMD_DOWNLD)</div><div class='add'>+#define HERMES_PROGRAM_NON_VOLATILE        (0x0300 | HERMES_CMD_DOWNLD)</div><div class='add'>+</div><div class='add'>+/* End markers used in dblocks */</div><div class='add'>+#define PDI_END		0x00000000	/* End of PDA */</div><div class='add'>+#define BLOCK_END	0xFFFFFFFF	/* Last image block */</div><div class='add'>+#define TEXT_END	0x1A		/* End of text header */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * PDA == Production Data Area</div><div class='add'>+ *</div><div class='add'>+ * In principle, the max. size of the PDA is is 4096 words. Currently,</div><div class='add'>+ * however, only about 500 bytes of this area are used.</div><div class='add'>+ *</div><div class='add'>+ * Some USB implementations can't handle sizes in excess of 1016. Note</div><div class='add'>+ * that PDA is not actually used in those USB environments, but may be</div><div class='add'>+ * retrieved by common code.</div><div class='add'>+ */</div><div class='add'>+#define MAX_PDA_SIZE	1000</div><div class='add'>+</div><div class='add'>+/* Limit the amout we try to download in a single shot.</div><div class='add'>+ * Size is in bytes.</div><div class='add'>+ */</div><div class='add'>+#define MAX_DL_SIZE 1024</div><div class='add'>+#define LIMIT_PROGRAM_SIZE 0</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The following structures have little-endian fields denoted by</div><div class='add'>+ * the leading underscore.  Don't access them directly - use inline</div><div class='add'>+ * functions defined below.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The binary image to be downloaded consists of series of data blocks.</div><div class='add'>+ * Each block has the following structure.</div><div class='add'>+ */</div><div class='add'>+struct dblock {</div><div class='add'>+	__le32 addr;		/* adapter address where to write the block */</div><div class='add'>+	__le16 len;		/* length of the data only, in bytes */</div><div class='add'>+	char data[0];		/* data to be written */</div><div class='add'>+} __attribute__ ((packed));</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Plug Data References are located in in the image after the last data</div><div class='add'>+ * block.  They refer to areas in the adapter memory where the plug data</div><div class='add'>+ * items with matching ID should be written.</div><div class='add'>+ */</div><div class='add'>+struct pdr {</div><div class='add'>+	__le32 id;		/* record ID */</div><div class='add'>+	__le32 addr;		/* adapter address where to write the data */</div><div class='add'>+	__le32 len;		/* expected length of the data, in bytes */</div><div class='add'>+	char next[0];		/* next PDR starts here */</div><div class='add'>+} __attribute__ ((packed));</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Plug Data Items are located in the EEPROM read from the adapter by</div><div class='add'>+ * primary firmware.  They refer to the device-specific data that should</div><div class='add'>+ * be plugged into the secondary firmware.</div><div class='add'>+ */</div><div class='add'>+struct pdi {</div><div class='add'>+	__le16 len;		/* length of ID and data, in words */</div><div class='add'>+	__le16 id;		/* record ID */</div><div class='add'>+	char data[0];		/* plug data */</div><div class='add'>+} __attribute__ ((packed));</div><div class='add'>+</div><div class='add'>+/*** FW data block access functions ***/</div><div class='add'>+</div><div class='add'>+static inline u32</div><div class='add'>+dblock_addr(const struct dblock *blk)</div><div class='add'>+{</div><div class='add'>+	return le32_to_cpu(blk-&gt;addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32</div><div class='add'>+dblock_len(const struct dblock *blk)</div><div class='add'>+{</div><div class='add'>+	return le16_to_cpu(blk-&gt;len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*** PDR Access functions ***/</div><div class='add'>+</div><div class='add'>+static inline u32</div><div class='add'>+pdr_id(const struct pdr *pdr)</div><div class='add'>+{</div><div class='add'>+	return le32_to_cpu(pdr-&gt;id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32</div><div class='add'>+pdr_addr(const struct pdr *pdr)</div><div class='add'>+{</div><div class='add'>+	return le32_to_cpu(pdr-&gt;addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32</div><div class='add'>+pdr_len(const struct pdr *pdr)</div><div class='add'>+{</div><div class='add'>+	return le32_to_cpu(pdr-&gt;len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*** PDI Access functions ***/</div><div class='add'>+</div><div class='add'>+static inline u32</div><div class='add'>+pdi_id(const struct pdi *pdi)</div><div class='add'>+{</div><div class='add'>+	return le16_to_cpu(pdi-&gt;id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Return length of the data only, in bytes */</div><div class='add'>+static inline u32</div><div class='add'>+pdi_len(const struct pdi *pdi)</div><div class='add'>+{</div><div class='add'>+	return 2 * (le16_to_cpu(pdi-&gt;len) - 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*** Hermes AUX control ***/</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+hermes_aux_setaddr(hermes_t *hw, u32 addr)</div><div class='add'>+{</div><div class='add'>+	hermes_write_reg(hw, HERMES_AUXPAGE, (u16) (addr &gt;&gt; 7));</div><div class='add'>+	hermes_write_reg(hw, HERMES_AUXOFFSET, (u16) (addr &amp; 0x7F));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+hermes_aux_control(hermes_t *hw, int enabled)</div><div class='add'>+{</div><div class='add'>+	int desired_state = enabled ? HERMES_AUX_ENABLED : HERMES_AUX_DISABLED;</div><div class='add'>+	int action = enabled ? HERMES_AUX_ENABLE : HERMES_AUX_DISABLE;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* Already open? */</div><div class='add'>+	if (hermes_read_reg(hw, HERMES_CONTROL) == desired_state)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	hermes_write_reg(hw, HERMES_PARAM0, HERMES_AUX_PW0);</div><div class='add'>+	hermes_write_reg(hw, HERMES_PARAM1, HERMES_AUX_PW1);</div><div class='add'>+	hermes_write_reg(hw, HERMES_PARAM2, HERMES_AUX_PW2);</div><div class='add'>+	hermes_write_reg(hw, HERMES_CONTROL, action);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 20; i++) {</div><div class='add'>+		udelay(10);</div><div class='add'>+		if (hermes_read_reg(hw, HERMES_CONTROL) ==</div><div class='add'>+		    desired_state)</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EBUSY;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*** Plug Data Functions ***/</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Scan PDR for the record with the specified RECORD_ID.</div><div class='add'>+ * If it's not found, return NULL.</div><div class='add'>+ */</div><div class='add'>+static struct pdr *</div><div class='add'>+hermes_find_pdr(struct pdr *first_pdr, u32 record_id)</div><div class='add'>+{</div><div class='add'>+	struct pdr *pdr = first_pdr;</div><div class='add'>+	void *end = (void *)first_pdr + MAX_PDA_SIZE;</div><div class='add'>+</div><div class='add'>+	while (((void *)pdr &lt; end) &amp;&amp;</div><div class='add'>+	       (pdr_id(pdr) != PDI_END)) {</div><div class='add'>+		/*</div><div class='add'>+		 * PDR area is currently not terminated by PDI_END.</div><div class='add'>+		 * It's followed by CRC records, which have the type</div><div class='add'>+		 * field where PDR has length.  The type can be 0 or 1.</div><div class='add'>+		 */</div><div class='add'>+		if (pdr_len(pdr) &lt; 2)</div><div class='add'>+			return NULL;</div><div class='add'>+</div><div class='add'>+		/* If the record ID matches, we are done */</div><div class='add'>+		if (pdr_id(pdr) == record_id)</div><div class='add'>+			return pdr;</div><div class='add'>+</div><div class='add'>+		pdr = (struct pdr *) pdr-&gt;next;</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Scan production data items for a particular entry */</div><div class='add'>+static struct pdi *</div><div class='add'>+hermes_find_pdi(struct pdi *first_pdi, u32 record_id)</div><div class='add'>+{</div><div class='add'>+	struct pdi *pdi = first_pdi;</div><div class='add'>+</div><div class='add'>+	while (pdi_id(pdi) != PDI_END) {</div><div class='add'>+</div><div class='add'>+		/* If the record ID matches, we are done */</div><div class='add'>+		if (pdi_id(pdi) == record_id)</div><div class='add'>+			return pdi;</div><div class='add'>+</div><div class='add'>+		pdi = (struct pdi *) &amp;pdi-&gt;data[pdi_len(pdi)];</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Process one Plug Data Item - find corresponding PDR and plug it */</div><div class='add'>+static int</div><div class='add'>+hermes_plug_pdi(hermes_t *hw, struct pdr *first_pdr, const struct pdi *pdi)</div><div class='add'>+{</div><div class='add'>+	struct pdr *pdr;</div><div class='add'>+</div><div class='add'>+	/* Find the PDR corresponding to this PDI */</div><div class='add'>+	pdr = hermes_find_pdr(first_pdr, pdi_id(pdi));</div><div class='add'>+</div><div class='add'>+	/* No match is found, safe to ignore */</div><div class='add'>+	if (!pdr)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Lengths of the data in PDI and PDR must match */</div><div class='add'>+	if (pdi_len(pdi) != pdr_len(pdr))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* do the actual plugging */</div><div class='add'>+	hermes_aux_setaddr(hw, pdr_addr(pdr));</div><div class='add'>+	hermes_write_bytes(hw, HERMES_AUXDATA, pdi-&gt;data, pdi_len(pdi));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Read PDA from the adapter */</div><div class='add'>+int hermes_read_pda(hermes_t *hw,</div><div class='add'>+		    __le16 *pda,</div><div class='add'>+		    u32 pda_addr,</div><div class='add'>+		    u16 pda_len,</div><div class='add'>+		    int use_eeprom) /* can we get this into hw? */</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u16 pda_size;</div><div class='add'>+	u16 data_len = pda_len;</div><div class='add'>+	__le16 *data = pda;</div><div class='add'>+</div><div class='add'>+	if (use_eeprom) {</div><div class='add'>+		/* PDA of spectrum symbol is in eeprom */</div><div class='add'>+</div><div class='add'>+		/* Issue command to read EEPROM */</div><div class='add'>+		ret = hermes_docmd_wait(hw, HERMES_CMD_READMIF, 0, NULL);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	} else {</div><div class='add'>+		/* wl_lkm does not include PDA size in the PDA area.</div><div class='add'>+		 * We will pad the information into pda, so other routines</div><div class='add'>+		 * don't have to be modified */</div><div class='add'>+		pda[0] = cpu_to_le16(pda_len - 2);</div><div class='add'>+			/* Includes CFG_PROD_DATA but not itself */</div><div class='add'>+		pda[1] = cpu_to_le16(0x0800); /* CFG_PROD_DATA */</div><div class='add'>+		data_len = pda_len - 4;</div><div class='add'>+		data = pda + 2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Open auxiliary port */</div><div class='add'>+	ret = hermes_aux_control(hw, 1);</div><div class='add'>+	printk(KERN_DEBUG PFX "AUX enable returned %d\n", ret);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* read PDA from EEPROM */</div><div class='add'>+	hermes_aux_setaddr(hw, pda_addr);</div><div class='add'>+	hermes_read_words(hw, HERMES_AUXDATA, data, data_len / 2);</div><div class='add'>+</div><div class='add'>+	/* Close aux port */</div><div class='add'>+	ret = hermes_aux_control(hw, 0);</div><div class='add'>+	printk(KERN_DEBUG PFX "AUX disable returned %d\n", ret);</div><div class='add'>+</div><div class='add'>+	/* Check PDA length */</div><div class='add'>+	pda_size = le16_to_cpu(pda[0]);</div><div class='add'>+	printk(KERN_DEBUG PFX "Actual PDA length %d, Max allowed %d\n",</div><div class='add'>+	       pda_size, pda_len);</div><div class='add'>+	if (pda_size &gt; pda_len)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(hermes_read_pda);</div><div class='add'>+</div><div class='add'>+/* Parse PDA and write the records into the adapter</div><div class='add'>+ *</div><div class='add'>+ * Attempt to write every records that is in the specified pda</div><div class='add'>+ * which also has a valid production data record for the firmware.</div><div class='add'>+ */</div><div class='add'>+int hermes_apply_pda(hermes_t *hw,</div><div class='add'>+		     const char *first_pdr,</div><div class='add'>+		     const __le16 *pda)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	const struct pdi *pdi;</div><div class='add'>+	struct pdr *pdr;</div><div class='add'>+</div><div class='add'>+	pdr = (struct pdr *) first_pdr;</div><div class='add'>+</div><div class='add'>+	/* Go through every PDI and plug them into the adapter */</div><div class='add'>+	pdi = (const struct pdi *) (pda + 2);</div><div class='add'>+	while (pdi_id(pdi) != PDI_END) {</div><div class='add'>+		ret = hermes_plug_pdi(hw, pdr, pdi);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		/* Increment to the next PDI */</div><div class='add'>+		pdi = (const struct pdi *) &amp;pdi-&gt;data[pdi_len(pdi)];</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(hermes_apply_pda);</div><div class='add'>+</div><div class='add'>+/* Identify the total number of bytes in all blocks</div><div class='add'>+ * including the header data.</div><div class='add'>+ */</div><div class='add'>+size_t</div><div class='add'>+hermes_blocks_length(const char *first_block)</div><div class='add'>+{</div><div class='add'>+	const struct dblock *blk = (const struct dblock *) first_block;</div><div class='add'>+	int total_len = 0;</div><div class='add'>+	int len;</div><div class='add'>+</div><div class='add'>+	/* Skip all blocks to locate Plug Data References</div><div class='add'>+	 * (Spectrum CS) */</div><div class='add'>+	while (dblock_addr(blk) != BLOCK_END) {</div><div class='add'>+		len = dblock_len(blk);</div><div class='add'>+		total_len += sizeof(*blk) + len;</div><div class='add'>+		blk = (struct dblock *) &amp;blk-&gt;data[len];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return total_len;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(hermes_blocks_length);</div><div class='add'>+</div><div class='add'>+/*** Hermes programming ***/</div><div class='add'>+</div><div class='add'>+/* About to start programming data (Hermes I)</div><div class='add'>+ * offset is the entry point</div><div class='add'>+ *</div><div class='add'>+ * Spectrum_cs' Symbol fw does not require this</div><div class='add'>+ * wl_lkm Agere fw does</div><div class='add'>+ * Don't know about intersil</div><div class='add'>+ */</div><div class='add'>+int hermesi_program_init(hermes_t *hw, u32 offset)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Disable interrupts?*/</div><div class='add'>+	/*hw-&gt;inten = 0x0;*/</div><div class='add'>+	/*hermes_write_regn(hw, INTEN, 0);*/</div><div class='add'>+	/*hermes_set_irqmask(hw, 0);*/</div><div class='add'>+</div><div class='add'>+	/* Acknowledge any outstanding command */</div><div class='add'>+	hermes_write_regn(hw, EVACK, 0xFFFF);</div><div class='add'>+</div><div class='add'>+	/* Using doicmd_wait rather than docmd_wait */</div><div class='add'>+	err = hermes_doicmd_wait(hw,</div><div class='add'>+				 0x0100 | HERMES_CMD_INIT,</div><div class='add'>+				 0, 0, 0, NULL);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = hermes_doicmd_wait(hw,</div><div class='add'>+				 0x0000 | HERMES_CMD_INIT,</div><div class='add'>+				 0, 0, 0, NULL);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = hermes_aux_control(hw, 1);</div><div class='add'>+	printk(KERN_DEBUG PFX "AUX enable returned %d\n", err);</div><div class='add'>+</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	printk(KERN_DEBUG PFX "Enabling volatile, EP 0x%08x\n", offset);</div><div class='add'>+	err = hermes_doicmd_wait(hw,</div><div class='add'>+				 HERMES_PROGRAM_ENABLE_VOLATILE,</div><div class='add'>+				 offset &amp; 0xFFFFu,</div><div class='add'>+				 offset &gt;&gt; 16,</div><div class='add'>+				 0,</div><div class='add'>+				 NULL);</div><div class='add'>+	printk(KERN_DEBUG PFX "PROGRAM_ENABLE returned %d\n",</div><div class='add'>+	       err);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(hermesi_program_init);</div><div class='add'>+</div><div class='add'>+/* Done programming data (Hermes I)</div><div class='add'>+ *</div><div class='add'>+ * Spectrum_cs' Symbol fw does not require this</div><div class='add'>+ * wl_lkm Agere fw does</div><div class='add'>+ * Don't know about intersil</div><div class='add'>+ */</div><div class='add'>+int hermesi_program_end(hermes_t *hw)</div><div class='add'>+{</div><div class='add'>+	struct hermes_response resp;</div><div class='add'>+	int rc = 0;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	rc = hermes_docmd_wait(hw, HERMES_PROGRAM_DISABLE, 0, &amp;resp);</div><div class='add'>+</div><div class='add'>+	printk(KERN_DEBUG PFX "PROGRAM_DISABLE returned %d, "</div><div class='add'>+	       "r0 0x%04x, r1 0x%04x, r2 0x%04x\n",</div><div class='add'>+	       rc, resp.resp0, resp.resp1, resp.resp2);</div><div class='add'>+</div><div class='add'>+	if ((rc == 0) &amp;&amp;</div><div class='add'>+	    ((resp.status &amp; HERMES_STATUS_CMDCODE) != HERMES_CMD_DOWNLD))</div><div class='add'>+		rc = -EIO;</div><div class='add'>+</div><div class='add'>+	err = hermes_aux_control(hw, 0);</div><div class='add'>+	printk(KERN_DEBUG PFX "AUX disable returned %d\n", err);</div><div class='add'>+</div><div class='add'>+	/* Acknowledge any outstanding command */</div><div class='add'>+	hermes_write_regn(hw, EVACK, 0xFFFF);</div><div class='add'>+</div><div class='add'>+	/* Reinitialise, ignoring return */</div><div class='add'>+	(void) hermes_doicmd_wait(hw, 0x0000 | HERMES_CMD_INIT,</div><div class='add'>+				  0, 0, 0, NULL);</div><div class='add'>+</div><div class='add'>+	return rc ? rc : err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(hermesi_program_end);</div><div class='add'>+</div><div class='add'>+/* Program the data blocks */</div><div class='add'>+int hermes_program(hermes_t *hw, const char *first_block, const char *end)</div><div class='add'>+{</div><div class='add'>+	const struct dblock *blk;</div><div class='add'>+	u32 blkaddr;</div><div class='add'>+	u32 blklen;</div><div class='add'>+#if LIMIT_PROGRAM_SIZE</div><div class='add'>+	u32 addr;</div><div class='add'>+	u32 len;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	blk = (const struct dblock *) first_block;</div><div class='add'>+</div><div class='add'>+	if ((const char *) blk &gt; (end - sizeof(*blk)))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	blkaddr = dblock_addr(blk);</div><div class='add'>+	blklen = dblock_len(blk);</div><div class='add'>+</div><div class='add'>+	while ((blkaddr != BLOCK_END) &amp;&amp;</div><div class='add'>+	       (((const char *) blk + blklen) &lt;= end)) {</div><div class='add'>+		printk(KERN_DEBUG PFX</div><div class='add'>+		       "Programming block of length %d to address 0x%08x\n",</div><div class='add'>+		       blklen, blkaddr);</div><div class='add'>+</div><div class='add'>+#if !LIMIT_PROGRAM_SIZE</div><div class='add'>+		/* wl_lkm driver splits this into writes of 2000 bytes */</div><div class='add'>+		hermes_aux_setaddr(hw, blkaddr);</div><div class='add'>+		hermes_write_bytes(hw, HERMES_AUXDATA, blk-&gt;data,</div><div class='add'>+				   blklen);</div><div class='add'>+#else</div><div class='add'>+		len = (blklen &lt; MAX_DL_SIZE) ? blklen : MAX_DL_SIZE;</div><div class='add'>+		addr = blkaddr;</div><div class='add'>+</div><div class='add'>+		while (addr &lt; (blkaddr + blklen)) {</div><div class='add'>+			printk(KERN_DEBUG PFX</div><div class='add'>+			       "Programming subblock of length %d "</div><div class='add'>+			       "to address 0x%08x. Data @ %p\n",</div><div class='add'>+			       len, addr, &amp;blk-&gt;data[addr - blkaddr]);</div><div class='add'>+</div><div class='add'>+			hermes_aux_setaddr(hw, addr);</div><div class='add'>+			hermes_write_bytes(hw, HERMES_AUXDATA,</div><div class='add'>+					   &amp;blk-&gt;data[addr - blkaddr],</div><div class='add'>+					   len);</div><div class='add'>+</div><div class='add'>+			addr += len;</div><div class='add'>+			len = ((blkaddr + blklen - addr) &lt; MAX_DL_SIZE) ?</div><div class='add'>+				(blkaddr + blklen - addr) : MAX_DL_SIZE;</div><div class='add'>+		}</div><div class='add'>+#endif</div><div class='add'>+		blk = (const struct dblock *) &amp;blk-&gt;data[blklen];</div><div class='add'>+</div><div class='add'>+		if ((const char *) blk &gt; (end - sizeof(*blk)))</div><div class='add'>+			return -EIO;</div><div class='add'>+</div><div class='add'>+		blkaddr = dblock_addr(blk);</div><div class='add'>+		blklen = dblock_len(blk);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(hermes_program);</div><div class='add'>+</div><div class='add'>+static int __init init_hermes_dld(void)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit exit_hermes_dld(void)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(init_hermes_dld);</div><div class='add'>+module_exit(exit_hermes_dld);</div><div class='add'>+</div><div class='add'>+/*** Default plugging data for Hermes I ***/</div><div class='add'>+/* Values from wl_lkm_718/hcf/dhf.c */</div><div class='add'>+</div><div class='add'>+#define DEFINE_DEFAULT_PDR(pid, length, data)				\</div><div class='add'>+static const struct {							\</div><div class='add'>+	__le16 len;							\</div><div class='add'>+	__le16 id;							\</div><div class='add'>+	u8 val[length];							\</div><div class='add'>+} __attribute__ ((packed)) default_pdr_data_##pid = {			\</div><div class='add'>+	__constant_cpu_to_le16((sizeof(default_pdr_data_##pid)/		\</div><div class='add'>+				sizeof(__le16)) - 1),			\</div><div class='add'>+	__constant_cpu_to_le16(pid),					\</div><div class='add'>+	data								\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define DEFAULT_PDR(pid) default_pdr_data_##pid</div><div class='add'>+</div><div class='add'>+/*  HWIF Compatiblity */</div><div class='add'>+DEFINE_DEFAULT_PDR(0x0005, 10, "\x00\x00\x06\x00\x01\x00\x01\x00\x01\x00");</div><div class='add'>+</div><div class='add'>+/* PPPPSign */</div><div class='add'>+DEFINE_DEFAULT_PDR(0x0108, 4, "\x00\x00\x00\x00");</div><div class='add'>+</div><div class='add'>+/* PPPPProf */</div><div class='add'>+DEFINE_DEFAULT_PDR(0x0109, 10, "\x00\x00\x00\x00\x03\x00\x00\x00\x00\x00");</div><div class='add'>+</div><div class='add'>+/* Antenna diversity */</div><div class='add'>+DEFINE_DEFAULT_PDR(0x0150, 2, "\x00\x3F");</div><div class='add'>+</div><div class='add'>+/* Modem VCO band Set-up */</div><div class='add'>+DEFINE_DEFAULT_PDR(0x0160, 28,</div><div class='add'>+		   "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+		   "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+		   "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+		   "\x00\x00\x00\x00");</div><div class='add'>+</div><div class='add'>+/* Modem Rx Gain Table Values */</div><div class='add'>+DEFINE_DEFAULT_PDR(0x0161, 256,</div><div class='add'>+		   "\x3F\x01\x3F\01\x3F\x01\x3F\x01"</div><div class='add'>+		   "\x3F\x01\x3F\01\x3F\x01\x3F\x01"</div><div class='add'>+		   "\x3F\x01\x3F\01\x3F\x01\x3F\x01"</div><div class='add'>+		   "\x3F\x01\x3F\01\x3F\x01\x3F\x01"</div><div class='add'>+		   "\x3F\x01\x3E\01\x3E\x01\x3D\x01"</div><div class='add'>+		   "\x3D\x01\x3C\01\x3C\x01\x3B\x01"</div><div class='add'>+		   "\x3B\x01\x3A\01\x3A\x01\x39\x01"</div><div class='add'>+		   "\x39\x01\x38\01\x38\x01\x37\x01"</div><div class='add'>+		   "\x37\x01\x36\01\x36\x01\x35\x01"</div><div class='add'>+		   "\x35\x01\x34\01\x34\x01\x33\x01"</div><div class='add'>+		   "\x33\x01\x32\x01\x32\x01\x31\x01"</div><div class='add'>+		   "\x31\x01\x30\x01\x30\x01\x7B\x01"</div><div class='add'>+		   "\x7B\x01\x7A\x01\x7A\x01\x79\x01"</div><div class='add'>+		   "\x79\x01\x78\x01\x78\x01\x77\x01"</div><div class='add'>+		   "\x77\x01\x76\x01\x76\x01\x75\x01"</div><div class='add'>+		   "\x75\x01\x74\x01\x74\x01\x73\x01"</div><div class='add'>+		   "\x73\x01\x72\x01\x72\x01\x71\x01"</div><div class='add'>+		   "\x71\x01\x70\x01\x70\x01\x68\x01"</div><div class='add'>+		   "\x68\x01\x67\x01\x67\x01\x66\x01"</div><div class='add'>+		   "\x66\x01\x65\x01\x65\x01\x57\x01"</div><div class='add'>+		   "\x57\x01\x56\x01\x56\x01\x55\x01"</div><div class='add'>+		   "\x55\x01\x54\x01\x54\x01\x53\x01"</div><div class='add'>+		   "\x53\x01\x52\x01\x52\x01\x51\x01"</div><div class='add'>+		   "\x51\x01\x50\x01\x50\x01\x48\x01"</div><div class='add'>+		   "\x48\x01\x47\x01\x47\x01\x46\x01"</div><div class='add'>+		   "\x46\x01\x45\x01\x45\x01\x44\x01"</div><div class='add'>+		   "\x44\x01\x43\x01\x43\x01\x42\x01"</div><div class='add'>+		   "\x42\x01\x41\x01\x41\x01\x40\x01"</div><div class='add'>+		   "\x40\x01\x40\x01\x40\x01\x40\x01"</div><div class='add'>+		   "\x40\x01\x40\x01\x40\x01\x40\x01"</div><div class='add'>+		   "\x40\x01\x40\x01\x40\x01\x40\x01"</div><div class='add'>+		   "\x40\x01\x40\x01\x40\x01\x40\x01");</div><div class='add'>+</div><div class='add'>+/* Write PDA according to certain rules.</div><div class='add'>+ *</div><div class='add'>+ * For every production data record, look for a previous setting in</div><div class='add'>+ * the pda, and use that.</div><div class='add'>+ *</div><div class='add'>+ * For certain records, use defaults if they are not found in pda.</div><div class='add'>+ */</div><div class='add'>+int hermes_apply_pda_with_defaults(hermes_t *hw,</div><div class='add'>+				   const char *first_pdr,</div><div class='add'>+				   const __le16 *pda)</div><div class='add'>+{</div><div class='add'>+	const struct pdr *pdr = (const struct pdr *) first_pdr;</div><div class='add'>+	struct pdi *first_pdi = (struct pdi *) &amp;pda[2];</div><div class='add'>+	struct pdi *pdi;</div><div class='add'>+	struct pdi *default_pdi = NULL;</div><div class='add'>+	struct pdi *outdoor_pdi;</div><div class='add'>+	void *end = (void *)first_pdr + MAX_PDA_SIZE;</div><div class='add'>+	int record_id;</div><div class='add'>+</div><div class='add'>+	while (((void *)pdr &lt; end) &amp;&amp;</div><div class='add'>+	       (pdr_id(pdr) != PDI_END)) {</div><div class='add'>+		/*</div><div class='add'>+		 * For spectrum_cs firmwares,</div><div class='add'>+		 * PDR area is currently not terminated by PDI_END.</div><div class='add'>+		 * It's followed by CRC records, which have the type</div><div class='add'>+		 * field where PDR has length.  The type can be 0 or 1.</div><div class='add'>+		 */</div><div class='add'>+		if (pdr_len(pdr) &lt; 2)</div><div class='add'>+			break;</div><div class='add'>+		record_id = pdr_id(pdr);</div><div class='add'>+</div><div class='add'>+		pdi = hermes_find_pdi(first_pdi, record_id);</div><div class='add'>+		if (pdi)</div><div class='add'>+			printk(KERN_DEBUG PFX "Found record 0x%04x at %p\n",</div><div class='add'>+			       record_id, pdi);</div><div class='add'>+</div><div class='add'>+		switch (record_id) {</div><div class='add'>+		case 0x110: /* Modem REFDAC values */</div><div class='add'>+		case 0x120: /* Modem VGDAC values */</div><div class='add'>+			outdoor_pdi = hermes_find_pdi(first_pdi, record_id + 1);</div><div class='add'>+			default_pdi = NULL;</div><div class='add'>+			if (outdoor_pdi) {</div><div class='add'>+				pdi = outdoor_pdi;</div><div class='add'>+				printk(KERN_DEBUG PFX</div><div class='add'>+				       "Using outdoor record 0x%04x at %p\n",</div><div class='add'>+				       record_id + 1, pdi);</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		case 0x5: /*  HWIF Compatiblity */</div><div class='add'>+			default_pdi = (struct pdi *) &amp;DEFAULT_PDR(0x0005);</div><div class='add'>+			break;</div><div class='add'>+		case 0x108: /* PPPPSign */</div><div class='add'>+			default_pdi = (struct pdi *) &amp;DEFAULT_PDR(0x0108);</div><div class='add'>+			break;</div><div class='add'>+		case 0x109: /* PPPPProf */</div><div class='add'>+			default_pdi = (struct pdi *) &amp;DEFAULT_PDR(0x0109);</div><div class='add'>+			break;</div><div class='add'>+		case 0x150: /* Antenna diversity */</div><div class='add'>+			default_pdi = (struct pdi *) &amp;DEFAULT_PDR(0x0150);</div><div class='add'>+			break;</div><div class='add'>+		case 0x160: /* Modem VCO band Set-up */</div><div class='add'>+			default_pdi = (struct pdi *) &amp;DEFAULT_PDR(0x0160);</div><div class='add'>+			break;</div><div class='add'>+		case 0x161: /* Modem Rx Gain Table Values */</div><div class='add'>+			default_pdi = (struct pdi *) &amp;DEFAULT_PDR(0x0161);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			default_pdi = NULL;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		if (!pdi &amp;&amp; default_pdi) {</div><div class='add'>+			/* Use default */</div><div class='add'>+			pdi = default_pdi;</div><div class='add'>+			printk(KERN_DEBUG PFX</div><div class='add'>+			       "Using default record 0x%04x at %p\n",</div><div class='add'>+			       record_id, pdi);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (pdi) {</div><div class='add'>+			/* Lengths of the data in PDI and PDR must match */</div><div class='add'>+			if (pdi_len(pdi) == pdr_len(pdr)) {</div><div class='add'>+				/* do the actual plugging */</div><div class='add'>+				hermes_aux_setaddr(hw, pdr_addr(pdr));</div><div class='add'>+				hermes_write_bytes(hw, HERMES_AUXDATA,</div><div class='add'>+						   pdi-&gt;data, pdi_len(pdi));</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		pdr++;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(hermes_apply_pda_with_defaults);</div><div class='head'>diff --git a/drivers/net/wireless/hermes_dld.h b/drivers/net/wireless/hermes_dld.h<br/>new file mode 100644<br/>index 000000000000..6fcb26277999<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/hermes_dld.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/hermes_dld.h</a></div><div class='hunk'>@@ -0,0 +1,48 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2007, David Kilroy</div><div class='add'>+ *</div><div class='add'>+ * The contents of this file are subject to the Mozilla Public License</div><div class='add'>+ * Version 1.1 (the "License"); you may not use this file except in</div><div class='add'>+ * compliance with the License. You may obtain a copy of the License</div><div class='add'>+ * at http://www.mozilla.org/MPL/</div><div class='add'>+ *</div><div class='add'>+ * Software distributed under the License is distributed on an "AS IS"</div><div class='add'>+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See</div><div class='add'>+ * the License for the specific language governing rights and</div><div class='add'>+ * limitations under the License.</div><div class='add'>+ *</div><div class='add'>+ * Alternatively, the contents of this file may be used under the</div><div class='add'>+ * terms of the GNU General Public License version 2 (the "GPL"), in</div><div class='add'>+ * which case the provisions of the GPL are applicable instead of the</div><div class='add'>+ * above.  If you wish to allow the use of your version of this file</div><div class='add'>+ * only under the terms of the GPL and not to allow others to use your</div><div class='add'>+ * version of this file under the MPL, indicate your decision by</div><div class='add'>+ * deleting the provisions above and replace them with the notice and</div><div class='add'>+ * other provisions required by the GPL.  If you do not delete the</div><div class='add'>+ * provisions above, a recipient may use your version of this file</div><div class='add'>+ * under either the MPL or the GPL.</div><div class='add'>+ */</div><div class='add'>+#ifndef _HERMES_DLD_H</div><div class='add'>+#define _HERMES_DLD_H</div><div class='add'>+</div><div class='add'>+#include "hermes.h"</div><div class='add'>+</div><div class='add'>+int hermesi_program_init(hermes_t *hw, u32 offset);</div><div class='add'>+int hermesi_program_end(hermes_t *hw);</div><div class='add'>+int hermes_program(hermes_t *hw, const char *first_block, const char *end);</div><div class='add'>+</div><div class='add'>+int hermes_read_pda(hermes_t *hw,</div><div class='add'>+		    __le16 *pda,</div><div class='add'>+		    u32 pda_addr,</div><div class='add'>+		    u16 pda_len,</div><div class='add'>+		    int use_eeprom);</div><div class='add'>+int hermes_apply_pda(hermes_t *hw,</div><div class='add'>+		     const char *first_pdr,</div><div class='add'>+		     const __le16 *pda);</div><div class='add'>+int hermes_apply_pda_with_defaults(hermes_t *hw,</div><div class='add'>+				   const char *first_pdr,</div><div class='add'>+				   const __le16 *pda);</div><div class='add'>+</div><div class='add'>+size_t hermes_blocks_length(const char *first_block);</div><div class='add'>+</div><div class='add'>+#endif /* _HERMES_DLD_H */</div><div class='head'>diff --git a/drivers/net/wireless/hermes_rid.h b/drivers/net/wireless/hermes_rid.h<br/>index 4f46b4809e55..42eb67dea1df 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/hermes_rid.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/hermes_rid.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/hermes_rid.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/hermes_rid.h</a></div><div class='hunk'>@@ -30,6 +30,7 @@</div><div class='ctx'> #define HERMES_RID_CNFWEPENABLED_AGERE		0xFC20</div><div class='ctx'> #define HERMES_RID_CNFAUTHENTICATION_AGERE	0xFC21</div><div class='ctx'> #define HERMES_RID_CNFMANDATORYBSSID_SYMBOL	0xFC21</div><div class='add'>+#define HERMES_RID_CNFDROPUNENCRYPTED		0xFC22</div><div class='ctx'> #define HERMES_RID_CNFWEPDEFAULTKEYID		0xFC23</div><div class='ctx'> #define HERMES_RID_CNFDEFAULTKEY0		0xFC24</div><div class='ctx'> #define HERMES_RID_CNFDEFAULTKEY1		0xFC25</div><div class='hunk'>@@ -85,6 +86,16 @@</div><div class='ctx'> #define HERMES_RID_CNFSCANSSID_AGERE		0xFCB2</div><div class='ctx'> #define HERMES_RID_CNFBASICRATES		0xFCB3</div><div class='ctx'> #define HERMES_RID_CNFSUPPORTEDRATES		0xFCB4</div><div class='add'>+#define HERMES_RID_CNFADDDEFAULTTKIPKEY_AGERE	0xFCB4</div><div class='add'>+#define HERMES_RID_CNFSETWPAAUTHMGMTSUITE_AGERE	0xFCB5</div><div class='add'>+#define HERMES_RID_CNFREMDEFAULTTKIPKEY_AGERE	0xFCB6</div><div class='add'>+#define HERMES_RID_CNFADDMAPPEDTKIPKEY_AGERE	0xFCB7</div><div class='add'>+#define HERMES_RID_CNFREMMAPPEDTKIPKEY_AGERE	0xFCB8</div><div class='add'>+#define HERMES_RID_CNFSETWPACAPABILITIES_AGERE	0xFCB9</div><div class='add'>+#define HERMES_RID_CNFCACHEDPMKADDRESS		0xFCBA</div><div class='add'>+#define HERMES_RID_CNFREMOVEPMKADDRESS		0xFCBB</div><div class='add'>+#define HERMES_RID_CNFSCANCHANNELS2GHZ		0xFCC2</div><div class='add'>+#define HERMES_RID_CNFDISASSOCIATE		0xFCC8</div><div class='ctx'> #define HERMES_RID_CNFTICKTIME			0xFCE0</div><div class='ctx'> #define HERMES_RID_CNFSCANREQUEST		0xFCE1</div><div class='ctx'> #define HERMES_RID_CNFJOINREQUEST		0xFCE2</div><div class='hunk'>@@ -137,6 +148,12 @@</div><div class='ctx'> #define HERMES_RID_CURRENTTXRATE6		0xFD85</div><div class='ctx'> #define HERMES_RID_OWNMACADDR			0xFD86</div><div class='ctx'> #define HERMES_RID_SCANRESULTSTABLE		0xFD88</div><div class='add'>+#define HERMES_RID_CURRENT_COUNTRY_INFO		0xFD89</div><div class='add'>+#define HERMES_RID_CURRENT_WPA_IE		0xFD8A</div><div class='add'>+#define HERMES_RID_CURRENT_TKIP_IV		0xFD8B</div><div class='add'>+#define HERMES_RID_CURRENT_ASSOC_REQ_INFO	0xFD8C</div><div class='add'>+#define HERMES_RID_CURRENT_ASSOC_RESP_INFO	0xFD8D</div><div class='add'>+#define HERMES_RID_TXQUEUEEMPTY			0xFD91</div><div class='ctx'> #define HERMES_RID_PHYTYPE			0xFDC0</div><div class='ctx'> #define HERMES_RID_CURRENTCHANNEL		0xFDC1</div><div class='ctx'> #define HERMES_RID_CURRENTPOWERSTATE		0xFDC2</div><div class='head'>diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c<br/>index 3b4e55cf33cd..633740277352 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/hostap/hostap_cs.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/hostap/hostap_cs.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/hostap/hostap_cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/hostap/hostap_cs.c</a></div><div class='hunk'>@@ -234,7 +234,7 @@ static void sandisk_set_iobase(local_info_t *local)</div><div class='ctx'> 	reg.Value = hw_priv-&gt;link-&gt;io.BasePort1 &amp; 0x00ff;</div><div class='ctx'> 	res = pcmcia_access_configuration_register(hw_priv-&gt;link,</div><div class='ctx'> 						   &amp;reg);</div><div class='del'>-	if (res != CS_SUCCESS) {</div><div class='add'>+	if (res != 0) {</div><div class='ctx'> 		printk(KERN_DEBUG "Prism3 SanDisk - failed to set I/O base 0 -"</div><div class='ctx'> 		       " res=%d\n", res);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -246,7 +246,7 @@ static void sandisk_set_iobase(local_info_t *local)</div><div class='ctx'> 	reg.Value = (hw_priv-&gt;link-&gt;io.BasePort1 &amp; 0xff00) &gt;&gt; 8;</div><div class='ctx'> 	res = pcmcia_access_configuration_register(hw_priv-&gt;link,</div><div class='ctx'> 						   &amp;reg);</div><div class='del'>-	if (res != CS_SUCCESS) {</div><div class='add'>+	if (res != 0) {</div><div class='ctx'> 		printk(KERN_DEBUG "Prism3 SanDisk - failed to set I/O base 1 -"</div><div class='ctx'> 		       " res=%d\n", res);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -305,7 +305,7 @@ static int sandisk_enable_wireless(struct net_device *dev)</div><div class='ctx'> 	tuple.DesiredTuple = CISTPL_LONGLINK_MFC;</div><div class='ctx'> 	if (pcmcia_get_first_tuple(hw_priv-&gt;link, &amp;tuple) ||</div><div class='ctx'> 	    pcmcia_get_tuple_data(hw_priv-&gt;link, &amp;tuple) ||</div><div class='del'>-	    pcmcia_parse_tuple(hw_priv-&gt;link, &amp;tuple, parse) ||</div><div class='add'>+	    pcmcia_parse_tuple(&amp;tuple, parse) ||</div><div class='ctx'> 		parse-&gt;longlink_mfc.nfn &lt; 2) {</div><div class='ctx'> 		/* No multi-function links found */</div><div class='ctx'> 		ret = -ENODEV;</div><div class='hunk'>@@ -322,7 +322,7 @@ static int sandisk_enable_wireless(struct net_device *dev)</div><div class='ctx'> 	reg.Value = COR_SOFT_RESET;</div><div class='ctx'> 	res = pcmcia_access_configuration_register(hw_priv-&gt;link,</div><div class='ctx'> 						   &amp;reg);</div><div class='del'>-	if (res != CS_SUCCESS) {</div><div class='add'>+	if (res != 0) {</div><div class='ctx'> 		printk(KERN_DEBUG "%s: SanDisk - COR sreset failed (%d)\n",</div><div class='ctx'> 		       dev-&gt;name, res);</div><div class='ctx'> 		goto done;</div><div class='hunk'>@@ -339,7 +339,7 @@ static int sandisk_enable_wireless(struct net_device *dev)</div><div class='ctx'> 	reg.Value = COR_LEVEL_REQ | 0x8 | COR_ADDR_DECODE | COR_FUNC_ENA;</div><div class='ctx'> 	res = pcmcia_access_configuration_register(hw_priv-&gt;link,</div><div class='ctx'> 						   &amp;reg);</div><div class='del'>-	if (res != CS_SUCCESS) {</div><div class='add'>+	if (res != 0) {</div><div class='ctx'> 		printk(KERN_DEBUG "%s: SanDisk - COR sreset failed (%d)\n",</div><div class='ctx'> 		       dev-&gt;name, res);</div><div class='ctx'> 		goto done;</div><div class='hunk'>@@ -374,7 +374,7 @@ static void prism2_pccard_cor_sreset(local_info_t *local)</div><div class='ctx'> 	reg.Value = 0;</div><div class='ctx'> 	res = pcmcia_access_configuration_register(hw_priv-&gt;link,</div><div class='ctx'> 						   &amp;reg);</div><div class='del'>-	if (res != CS_SUCCESS) {</div><div class='add'>+	if (res != 0) {</div><div class='ctx'> 		printk(KERN_DEBUG "prism2_pccard_cor_sreset failed 1 (%d)\n",</div><div class='ctx'> 		       res);</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -386,7 +386,7 @@ static void prism2_pccard_cor_sreset(local_info_t *local)</div><div class='ctx'> 	reg.Value |= COR_SOFT_RESET;</div><div class='ctx'> 	res = pcmcia_access_configuration_register(hw_priv-&gt;link,</div><div class='ctx'> 						   &amp;reg);</div><div class='del'>-	if (res != CS_SUCCESS) {</div><div class='add'>+	if (res != 0) {</div><div class='ctx'> 		printk(KERN_DEBUG "prism2_pccard_cor_sreset failed 2 (%d)\n",</div><div class='ctx'> 		       res);</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -399,7 +399,7 @@ static void prism2_pccard_cor_sreset(local_info_t *local)</div><div class='ctx'> 		reg.Value |= COR_IREQ_ENA;</div><div class='ctx'> 	res = pcmcia_access_configuration_register(hw_priv-&gt;link,</div><div class='ctx'> 						   &amp;reg);</div><div class='del'>-	if (res != CS_SUCCESS) {</div><div class='add'>+	if (res != 0) {</div><div class='ctx'> 		printk(KERN_DEBUG "prism2_pccard_cor_sreset failed 3 (%d)\n",</div><div class='ctx'> 		       res);</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -433,7 +433,7 @@ static void prism2_pccard_genesis_reset(local_info_t *local, int hcr)</div><div class='ctx'> 	reg.Value = 0;</div><div class='ctx'> 	res = pcmcia_access_configuration_register(hw_priv-&gt;link,</div><div class='ctx'> 						   &amp;reg);</div><div class='del'>-	if (res != CS_SUCCESS) {</div><div class='add'>+	if (res != 0) {</div><div class='ctx'> 		printk(KERN_DEBUG "prism2_pccard_genesis_sreset failed 1 "</div><div class='ctx'> 		       "(%d)\n", res);</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -446,7 +446,7 @@ static void prism2_pccard_genesis_reset(local_info_t *local, int hcr)</div><div class='ctx'> 	reg.Value |= COR_SOFT_RESET;</div><div class='ctx'> 	res = pcmcia_access_configuration_register(hw_priv-&gt;link,</div><div class='ctx'> 						   &amp;reg);</div><div class='del'>-	if (res != CS_SUCCESS) {</div><div class='add'>+	if (res != 0) {</div><div class='ctx'> 		printk(KERN_DEBUG "prism2_pccard_genesis_sreset failed 2 "</div><div class='ctx'> 		       "(%d)\n", res);</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -460,7 +460,7 @@ static void prism2_pccard_genesis_reset(local_info_t *local, int hcr)</div><div class='ctx'> 	reg.Offset = CISREG_CCSR;</div><div class='ctx'> 	res = pcmcia_access_configuration_register(hw_priv-&gt;link,</div><div class='ctx'> 						   &amp;reg);</div><div class='del'>-	if (res != CS_SUCCESS) {</div><div class='add'>+	if (res != 0) {</div><div class='ctx'> 		printk(KERN_DEBUG "prism2_pccard_genesis_sreset failed 3 "</div><div class='ctx'> 		       "(%d)\n", res);</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -472,7 +472,7 @@ static void prism2_pccard_genesis_reset(local_info_t *local, int hcr)</div><div class='ctx'> 	reg.Value = old_cor &amp; ~COR_SOFT_RESET;</div><div class='ctx'> 	res = pcmcia_access_configuration_register(hw_priv-&gt;link,</div><div class='ctx'> 						   &amp;reg);</div><div class='del'>-	if (res != CS_SUCCESS) {</div><div class='add'>+	if (res != 0) {</div><div class='ctx'> 		printk(KERN_DEBUG "prism2_pccard_genesis_sreset failed 4 "</div><div class='ctx'> 		       "(%d)\n", res);</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -532,145 +532,118 @@ static void prism2_detach(struct pcmcia_device *link)</div><div class='ctx'> #define CS_CHECK(fn, ret) \</div><div class='ctx'> do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)</div><div class='ctx'> </div><div class='del'>-#define CFG_CHECK2(fn, retf) \</div><div class='del'>-do { int _ret = (retf); \</div><div class='del'>-if (_ret != 0) { \</div><div class='del'>-	PDEBUG(DEBUG_EXTRA, "CardServices(" #fn ") returned %d\n", _ret); \</div><div class='del'>-	cs_error(link, fn, _ret); \</div><div class='del'>-	goto next_entry; \</div><div class='del'>-} \</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='ctx'> </div><div class='ctx'> /* run after a CARD_INSERTION event is received to configure the PCMCIA</div><div class='ctx'>  * socket and make the device available to the system */</div><div class='add'>+</div><div class='add'>+static int prism2_config_check(struct pcmcia_device *p_dev,</div><div class='add'>+			       cistpl_cftable_entry_t *cfg,</div><div class='add'>+			       cistpl_cftable_entry_t *dflt,</div><div class='add'>+			       unsigned int vcc,</div><div class='add'>+			       void *priv_data)</div><div class='add'>+{</div><div class='add'>+	if (cfg-&gt;index == 0)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	PDEBUG(DEBUG_EXTRA, "Checking CFTABLE_ENTRY 0x%02X "</div><div class='add'>+	       "(default 0x%02X)\n", cfg-&gt;index, dflt-&gt;index);</div><div class='add'>+</div><div class='add'>+	/* Does this card need audio output? */</div><div class='add'>+	if (cfg-&gt;flags &amp; CISTPL_CFTABLE_AUDIO) {</div><div class='add'>+		p_dev-&gt;conf.Attributes |= CONF_ENABLE_SPKR;</div><div class='add'>+		p_dev-&gt;conf.Status = CCSR_AUDIO_ENA;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Use power settings for Vcc and Vpp if present */</div><div class='add'>+	/*  Note that the CIS values need to be rescaled */</div><div class='add'>+	if (cfg-&gt;vcc.present &amp; (1 &lt;&lt; CISTPL_POWER_VNOM)) {</div><div class='add'>+		if (vcc != cfg-&gt;vcc.param[CISTPL_POWER_VNOM] /</div><div class='add'>+		    10000 &amp;&amp; !ignore_cis_vcc) {</div><div class='add'>+			PDEBUG(DEBUG_EXTRA, "  Vcc mismatch - skipping"</div><div class='add'>+			       " this entry\n");</div><div class='add'>+			return -ENODEV;</div><div class='add'>+		}</div><div class='add'>+	} else if (dflt-&gt;vcc.present &amp; (1 &lt;&lt; CISTPL_POWER_VNOM)) {</div><div class='add'>+		if (vcc != dflt-&gt;vcc.param[CISTPL_POWER_VNOM] /</div><div class='add'>+		    10000 &amp;&amp; !ignore_cis_vcc) {</div><div class='add'>+			PDEBUG(DEBUG_EXTRA, "  Vcc (default) mismatch "</div><div class='add'>+			       "- skipping this entry\n");</div><div class='add'>+			return -ENODEV;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cfg-&gt;vpp1.present &amp; (1 &lt;&lt; CISTPL_POWER_VNOM))</div><div class='add'>+		p_dev-&gt;conf.Vpp = cfg-&gt;vpp1.param[CISTPL_POWER_VNOM] / 10000;</div><div class='add'>+	else if (dflt-&gt;vpp1.present &amp; (1 &lt;&lt; CISTPL_POWER_VNOM))</div><div class='add'>+		p_dev-&gt;conf.Vpp = dflt-&gt;vpp1.param[CISTPL_POWER_VNOM] / 10000;</div><div class='add'>+</div><div class='add'>+	/* Do we need to allocate an interrupt? */</div><div class='add'>+	if (cfg-&gt;irq.IRQInfo1 || dflt-&gt;irq.IRQInfo1)</div><div class='add'>+		p_dev-&gt;conf.Attributes |= CONF_ENABLE_IRQ;</div><div class='add'>+	else if (!(p_dev-&gt;conf.Attributes &amp; CONF_ENABLE_IRQ)) {</div><div class='add'>+		/* At least Compaq WL200 does not have IRQInfo1 set,</div><div class='add'>+		 * but it does not work without interrupts.. */</div><div class='add'>+		printk(KERN_WARNING "Config has no IRQ info, but trying to "</div><div class='add'>+		       "enable IRQ anyway..\n");</div><div class='add'>+		p_dev-&gt;conf.Attributes |= CONF_ENABLE_IRQ;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* IO window settings */</div><div class='add'>+	PDEBUG(DEBUG_EXTRA, "IO window settings: cfg-&gt;io.nwin=%d "</div><div class='add'>+	       "dflt-&gt;io.nwin=%d\n",</div><div class='add'>+	       cfg-&gt;io.nwin, dflt-&gt;io.nwin);</div><div class='add'>+	p_dev-&gt;io.NumPorts1 = p_dev-&gt;io.NumPorts2 = 0;</div><div class='add'>+	if ((cfg-&gt;io.nwin &gt; 0) || (dflt-&gt;io.nwin &gt; 0)) {</div><div class='add'>+		cistpl_io_t *io = (cfg-&gt;io.nwin) ? &amp;cfg-&gt;io : &amp;dflt-&gt;io;</div><div class='add'>+		p_dev-&gt;io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;</div><div class='add'>+		PDEBUG(DEBUG_EXTRA, "io-&gt;flags = 0x%04X, "</div><div class='add'>+		       "io.base=0x%04x, len=%d\n", io-&gt;flags,</div><div class='add'>+		       io-&gt;win[0].base, io-&gt;win[0].len);</div><div class='add'>+		if (!(io-&gt;flags &amp; CISTPL_IO_8BIT))</div><div class='add'>+			p_dev-&gt;io.Attributes1 = IO_DATA_PATH_WIDTH_16;</div><div class='add'>+		if (!(io-&gt;flags &amp; CISTPL_IO_16BIT))</div><div class='add'>+			p_dev-&gt;io.Attributes1 = IO_DATA_PATH_WIDTH_8;</div><div class='add'>+		p_dev-&gt;io.IOAddrLines = io-&gt;flags &amp;</div><div class='add'>+			CISTPL_IO_LINES_MASK;</div><div class='add'>+		p_dev-&gt;io.BasePort1 = io-&gt;win[0].base;</div><div class='add'>+		p_dev-&gt;io.NumPorts1 = io-&gt;win[0].len;</div><div class='add'>+		if (io-&gt;nwin &gt; 1) {</div><div class='add'>+			p_dev-&gt;io.Attributes2 = p_dev-&gt;io.Attributes1;</div><div class='add'>+			p_dev-&gt;io.BasePort2 = io-&gt;win[1].base;</div><div class='add'>+			p_dev-&gt;io.NumPorts2 = io-&gt;win[1].len;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* This reserves IO space but doesn't actually enable it */</div><div class='add'>+	return pcmcia_request_io(p_dev, &amp;p_dev-&gt;io);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int prism2_config(struct pcmcia_device *link)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	struct hostap_interface *iface;</div><div class='ctx'> 	local_info_t *local;</div><div class='ctx'> 	int ret = 1;</div><div class='del'>-	tuple_t tuple;</div><div class='del'>-	cisparse_t *parse;</div><div class='ctx'> 	int last_fn, last_ret;</div><div class='del'>-	u_char buf[64];</div><div class='del'>-	config_info_t conf;</div><div class='del'>-	cistpl_cftable_entry_t dflt = { 0 };</div><div class='ctx'> 	struct hostap_cs_priv *hw_priv;</div><div class='ctx'> </div><div class='ctx'> 	PDEBUG(DEBUG_FLOW, "prism2_config()\n");</div><div class='ctx'> </div><div class='del'>-	parse = kmalloc(sizeof(cisparse_t), GFP_KERNEL);</div><div class='ctx'> 	hw_priv = kzalloc(sizeof(*hw_priv), GFP_KERNEL);</div><div class='del'>-	if (parse == NULL || hw_priv == NULL) {</div><div class='add'>+	if (hw_priv == NULL) {</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='ctx'> 		goto failed;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	tuple.Attributes = 0;</div><div class='del'>-	tuple.TupleData = buf;</div><div class='del'>-	tuple.TupleDataMax = sizeof(buf);</div><div class='del'>-	tuple.TupleOffset = 0;</div><div class='del'>-</div><div class='del'>-	CS_CHECK(GetConfigurationInfo,</div><div class='del'>-		 pcmcia_get_configuration_info(link, &amp;conf));</div><div class='del'>-</div><div class='ctx'> 	/* Look for an appropriate configuration table entry in the CIS */</div><div class='del'>-	tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;</div><div class='del'>-	CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &amp;tuple));</div><div class='del'>-	for (;;) {</div><div class='del'>-		cistpl_cftable_entry_t *cfg = &amp;(parse-&gt;cftable_entry);</div><div class='del'>-		CFG_CHECK2(GetTupleData,</div><div class='del'>-			   pcmcia_get_tuple_data(link, &amp;tuple));</div><div class='del'>-		CFG_CHECK2(ParseTuple,</div><div class='del'>-			   pcmcia_parse_tuple(link, &amp;tuple, parse));</div><div class='del'>-</div><div class='del'>-		if (cfg-&gt;flags &amp; CISTPL_CFTABLE_DEFAULT)</div><div class='del'>-			dflt = *cfg;</div><div class='del'>-		if (cfg-&gt;index == 0)</div><div class='del'>-			goto next_entry;</div><div class='del'>-		link-&gt;conf.ConfigIndex = cfg-&gt;index;</div><div class='del'>-		PDEBUG(DEBUG_EXTRA, "Checking CFTABLE_ENTRY 0x%02X "</div><div class='del'>-		       "(default 0x%02X)\n", cfg-&gt;index, dflt.index);</div><div class='del'>-</div><div class='del'>-		/* Does this card need audio output? */</div><div class='del'>-		if (cfg-&gt;flags &amp; CISTPL_CFTABLE_AUDIO) {</div><div class='del'>-			link-&gt;conf.Attributes |= CONF_ENABLE_SPKR;</div><div class='del'>-			link-&gt;conf.Status = CCSR_AUDIO_ENA;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Use power settings for Vcc and Vpp if present */</div><div class='del'>-		/*  Note that the CIS values need to be rescaled */</div><div class='del'>-		if (cfg-&gt;vcc.present &amp; (1 &lt;&lt; CISTPL_POWER_VNOM)) {</div><div class='del'>-			if (conf.Vcc != cfg-&gt;vcc.param[CISTPL_POWER_VNOM] /</div><div class='del'>-			    10000 &amp;&amp; !ignore_cis_vcc) {</div><div class='del'>-				PDEBUG(DEBUG_EXTRA, "  Vcc mismatch - skipping"</div><div class='del'>-				       " this entry\n");</div><div class='del'>-				goto next_entry;</div><div class='del'>-			}</div><div class='del'>-		} else if (dflt.vcc.present &amp; (1 &lt;&lt; CISTPL_POWER_VNOM)) {</div><div class='del'>-			if (conf.Vcc != dflt.vcc.param[CISTPL_POWER_VNOM] /</div><div class='del'>-			    10000 &amp;&amp; !ignore_cis_vcc) {</div><div class='del'>-				PDEBUG(DEBUG_EXTRA, "  Vcc (default) mismatch "</div><div class='del'>-				       "- skipping this entry\n");</div><div class='del'>-				goto next_entry;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (cfg-&gt;vpp1.present &amp; (1 &lt;&lt; CISTPL_POWER_VNOM))</div><div class='del'>-			link-&gt;conf.Vpp =</div><div class='del'>-				cfg-&gt;vpp1.param[CISTPL_POWER_VNOM] / 10000;</div><div class='del'>-		else if (dflt.vpp1.present &amp; (1 &lt;&lt; CISTPL_POWER_VNOM))</div><div class='del'>-			link-&gt;conf.Vpp =</div><div class='del'>-				dflt.vpp1.param[CISTPL_POWER_VNOM] / 10000;</div><div class='del'>-</div><div class='del'>-		/* Do we need to allocate an interrupt? */</div><div class='del'>-		if (cfg-&gt;irq.IRQInfo1 || dflt.irq.IRQInfo1)</div><div class='del'>-			link-&gt;conf.Attributes |= CONF_ENABLE_IRQ;</div><div class='del'>-		else if (!(link-&gt;conf.Attributes &amp; CONF_ENABLE_IRQ)) {</div><div class='del'>-			/* At least Compaq WL200 does not have IRQInfo1 set,</div><div class='del'>-			 * but it does not work without interrupts.. */</div><div class='del'>-			printk("Config has no IRQ info, but trying to enable "</div><div class='del'>-			       "IRQ anyway..\n");</div><div class='del'>-			link-&gt;conf.Attributes |= CONF_ENABLE_IRQ;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* IO window settings */</div><div class='del'>-		PDEBUG(DEBUG_EXTRA, "IO window settings: cfg-&gt;io.nwin=%d "</div><div class='del'>-		       "dflt.io.nwin=%d\n",</div><div class='del'>-		       cfg-&gt;io.nwin, dflt.io.nwin);</div><div class='del'>-		link-&gt;io.NumPorts1 = link-&gt;io.NumPorts2 = 0;</div><div class='del'>-		if ((cfg-&gt;io.nwin &gt; 0) || (dflt.io.nwin &gt; 0)) {</div><div class='del'>-			cistpl_io_t *io = (cfg-&gt;io.nwin) ? &amp;cfg-&gt;io : &amp;dflt.io;</div><div class='del'>-			link-&gt;io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;</div><div class='del'>-			PDEBUG(DEBUG_EXTRA, "io-&gt;flags = 0x%04X, "</div><div class='del'>-			       "io.base=0x%04x, len=%d\n", io-&gt;flags,</div><div class='del'>-			       io-&gt;win[0].base, io-&gt;win[0].len);</div><div class='del'>-			if (!(io-&gt;flags &amp; CISTPL_IO_8BIT))</div><div class='del'>-				link-&gt;io.Attributes1 = IO_DATA_PATH_WIDTH_16;</div><div class='del'>-			if (!(io-&gt;flags &amp; CISTPL_IO_16BIT))</div><div class='del'>-				link-&gt;io.Attributes1 = IO_DATA_PATH_WIDTH_8;</div><div class='del'>-			link-&gt;io.IOAddrLines = io-&gt;flags &amp;</div><div class='del'>-				CISTPL_IO_LINES_MASK;</div><div class='del'>-			link-&gt;io.BasePort1 = io-&gt;win[0].base;</div><div class='del'>-			link-&gt;io.NumPorts1 = io-&gt;win[0].len;</div><div class='del'>-			if (io-&gt;nwin &gt; 1) {</div><div class='del'>-				link-&gt;io.Attributes2 = link-&gt;io.Attributes1;</div><div class='del'>-				link-&gt;io.BasePort2 = io-&gt;win[1].base;</div><div class='del'>-				link-&gt;io.NumPorts2 = io-&gt;win[1].len;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* This reserves IO space but doesn't actually enable it */</div><div class='del'>-		CFG_CHECK2(RequestIO,</div><div class='del'>-			   pcmcia_request_io(link, &amp;link-&gt;io));</div><div class='del'>-</div><div class='del'>-		/* This configuration table entry is OK */</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	next_entry:</div><div class='del'>-		CS_CHECK(GetNextTuple,</div><div class='del'>-			 pcmcia_get_next_tuple(link, &amp;tuple));</div><div class='add'>+	last_ret = pcmcia_loop_config(link, prism2_config_check, NULL);</div><div class='add'>+	if (last_ret) {</div><div class='add'>+		if (!ignore_cis_vcc)</div><div class='add'>+			printk(KERN_ERR "GetNextTuple(): No matching "</div><div class='add'>+			       "CIS configuration.  Maybe you need the "</div><div class='add'>+			       "ignore_cis_vcc=1 parameter.\n");</div><div class='add'>+		cs_error(link, RequestIO, last_ret);</div><div class='add'>+		goto failed;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Need to allocate net_device before requesting IRQ handler */</div><div class='hunk'>@@ -738,14 +711,12 @@ static int prism2_config(struct pcmcia_device *link)</div><div class='ctx'> 		if (ret == 0 &amp;&amp; local-&gt;ddev)</div><div class='ctx'> 			strcpy(hw_priv-&gt;node.dev_name, local-&gt;ddev-&gt;name);</div><div class='ctx'> 	}</div><div class='del'>-	kfree(parse);</div><div class='ctx'> 	return ret;</div><div class='ctx'> </div><div class='ctx'>  cs_failed:</div><div class='ctx'> 	cs_error(link, last_fn, last_ret);</div><div class='ctx'> </div><div class='ctx'>  failed:</div><div class='del'>-	kfree(parse);</div><div class='ctx'> 	kfree(hw_priv);</div><div class='ctx'> 	prism2_release((u_long)link);</div><div class='ctx'> 	return ret;</div><div class='head'>diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c<br/>index 19a401c4a0dc..bca74811bc7f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/ipw2100.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/ipw2100.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/ipw2100.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/ipw2100.c</a></div><div class='hunk'>@@ -211,7 +211,7 @@ static u32 ipw2100_debug_level = IPW_DL_NONE;</div><div class='ctx'> do { \</div><div class='ctx'> 	if (ipw2100_debug_level &amp; (level)) { \</div><div class='ctx'> 		printk(KERN_DEBUG "ipw2100: %c %s ", \</div><div class='del'>-                       in_interrupt() ? 'I' : 'U',  __FUNCTION__); \</div><div class='add'>+                       in_interrupt() ? 'I' : 'U',  __func__); \</div><div class='ctx'> 		printk(message); \</div><div class='ctx'> 	} \</div><div class='ctx'> } while (0)</div><div class='head'>diff --git a/drivers/net/wireless/ipw2200.h b/drivers/net/wireless/ipw2200.h<br/>index d4ab28b73b32..0bad1ec3e7e0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/ipw2200.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/ipw2200.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/ipw2200.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/ipw2200.h</a></div><div class='hunk'>@@ -1394,13 +1394,13 @@ BIT_ARG16(x)</div><div class='ctx'> #define IPW_DEBUG(level, fmt, args...) \</div><div class='ctx'> do { if (ipw_debug_level &amp; (level)) \</div><div class='ctx'>   printk(KERN_DEBUG DRV_NAME": %c %s " fmt, \</div><div class='del'>-         in_interrupt() ? 'I' : 'U', __FUNCTION__ , ## args); } while (0)</div><div class='add'>+         in_interrupt() ? 'I' : 'U', __func__ , ## args); } while (0)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_IPW2200_DEBUG</div><div class='ctx'> #define IPW_LL_DEBUG(level, fmt, args...) \</div><div class='ctx'> do { if (ipw_debug_level &amp; (level)) \</div><div class='ctx'>   printk(KERN_DEBUG DRV_NAME": %c %s " fmt, \</div><div class='del'>-         in_interrupt() ? 'I' : 'U', __FUNCTION__ , ## args); } while (0)</div><div class='add'>+         in_interrupt() ? 'I' : 'U', __func__ , ## args); } while (0)</div><div class='ctx'> #else</div><div class='ctx'> #define IPW_LL_DEBUG(level, fmt, args...) do {} while (0)</div><div class='ctx'> #endif				/* CONFIG_IPW2200_DEBUG */</div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/iwl-3945-debug.h b/drivers/net/wireless/iwlwifi/iwl-3945-debug.h<br/>index f1d002f7b790..33016fb5e9b3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-3945-debug.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/iwlwifi/iwl-3945-debug.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-3945-debug.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/iwlwifi/iwl-3945-debug.h</a></div><div class='hunk'>@@ -34,12 +34,12 @@ extern u32 iwl3945_debug_level;</div><div class='ctx'> #define IWL_DEBUG(level, fmt, args...) \</div><div class='ctx'> do { if (iwl3945_debug_level &amp; (level)) \</div><div class='ctx'>   printk(KERN_ERR DRV_NAME": %c %s " fmt, \</div><div class='del'>-	 in_interrupt() ? 'I' : 'U', __FUNCTION__ , ## args); } while (0)</div><div class='add'>+	 in_interrupt() ? 'I' : 'U', __func__ , ## args); } while (0)</div><div class='ctx'> </div><div class='ctx'> #define IWL_DEBUG_LIMIT(level, fmt, args...) \</div><div class='ctx'> do { if ((iwl3945_debug_level &amp; (level)) &amp;&amp; net_ratelimit()) \</div><div class='ctx'>   printk(KERN_ERR DRV_NAME": %c %s " fmt, \</div><div class='del'>-	 in_interrupt() ? 'I' : 'U', __FUNCTION__ , ## args); } while (0)</div><div class='add'>+	 in_interrupt() ? 'I' : 'U', __func__ , ## args); } while (0)</div><div class='ctx'> </div><div class='ctx'> static inline void iwl3945_print_hex_dump(int level, void *p, u32 len)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/iwl-3945-io.h b/drivers/net/wireless/iwlwifi/iwl-3945-io.h<br/>index 0b9475114618..b3fe48de3ae7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-3945-io.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/iwlwifi/iwl-3945-io.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-3945-io.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/iwlwifi/iwl-3945-io.h</a></div><div class='hunk'>@@ -59,7 +59,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define _iwl3945_write32(priv, ofs, val) writel((val), (priv)-&gt;hw_base + (ofs))</div><div class='add'>+#define _iwl3945_write32(priv, ofs, val) iowrite32((val), (priv)-&gt;hw_base + (ofs))</div><div class='ctx'> #ifdef CONFIG_IWL3945_DEBUG</div><div class='ctx'> static inline void __iwl3945_write32(const char *f, u32 l, struct iwl3945_priv *priv,</div><div class='ctx'> 				 u32 ofs, u32 val)</div><div class='hunk'>@@ -73,14 +73,14 @@ static inline void __iwl3945_write32(const char *f, u32 l, struct iwl3945_priv *</div><div class='ctx'> #define iwl3945_write32(priv, ofs, val) _iwl3945_write32(priv, ofs, val)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#define _iwl3945_read32(priv, ofs) readl((priv)-&gt;hw_base + (ofs))</div><div class='add'>+#define _iwl3945_read32(priv, ofs) ioread32((priv)-&gt;hw_base + (ofs))</div><div class='ctx'> #ifdef CONFIG_IWL3945_DEBUG</div><div class='ctx'> static inline u32 __iwl3945_read32(char *f, u32 l, struct iwl3945_priv *priv, u32 ofs)</div><div class='ctx'> {</div><div class='ctx'> 	IWL_DEBUG_IO("read_direct32(0x%08X) - %s %d\n", ofs, f, l);</div><div class='ctx'> 	return _iwl3945_read32(priv, ofs);</div><div class='ctx'> }</div><div class='del'>-#define iwl3945_read32(priv, ofs) __iwl3945_read32(__FILE__, __LINE__, priv, ofs)</div><div class='add'>+#define iwl3945_read32(priv, ofs)__iwl3945_read32(__FILE__, __LINE__, priv, ofs)</div><div class='ctx'> #else</div><div class='ctx'> #define iwl3945_read32(p, o) _iwl3945_read32(p, o)</div><div class='ctx'> #endif</div><div class='hunk'>@@ -153,28 +153,10 @@ static inline void __iwl3945_clear_bit(const char *f, u32 l,</div><div class='ctx'> static inline int _iwl3945_grab_nic_access(struct iwl3945_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	u32 gp_ctl;</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_IWL3945_DEBUG</div><div class='ctx'> 	if (atomic_read(&amp;priv-&gt;restrict_refcnt))</div><div class='ctx'> 		return 0;</div><div class='ctx'> #endif</div><div class='del'>-	if (test_bit(STATUS_RF_KILL_HW, &amp;priv-&gt;status) ||</div><div class='del'>-	    test_bit(STATUS_RF_KILL_SW, &amp;priv-&gt;status)) {</div><div class='del'>-		IWL_WARNING("WARNING: Requesting MAC access during RFKILL "</div><div class='del'>-			"wakes up NIC\n");</div><div class='del'>-</div><div class='del'>-		/* 10 msec allows time for NIC to complete its data save */</div><div class='del'>-		gp_ctl = _iwl3945_read32(priv, CSR_GP_CNTRL);</div><div class='del'>-		if (gp_ctl &amp; CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY) {</div><div class='del'>-			IWL_DEBUG_RF_KILL("Wait for complete power-down, "</div><div class='del'>-				"gpctl = 0x%08x\n", gp_ctl);</div><div class='del'>-			mdelay(10);</div><div class='del'>-		} else</div><div class='del'>-			IWL_DEBUG_RF_KILL("power-down complete, "</div><div class='del'>-					  "gpctl = 0x%08x\n", gp_ctl);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* this bit wakes up the NIC */</div><div class='ctx'> 	_iwl3945_set_bit(priv, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);</div><div class='ctx'> 	ret = _iwl3945_poll_bit(priv, CSR_GP_CNTRL,</div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/iwl-3945-rs.c b/drivers/net/wireless/iwlwifi/iwl-3945-rs.c<br/>index 10c64bdb314c..6fc5e7361f26 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-3945-rs.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/iwlwifi/iwl-3945-rs.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-3945-rs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/iwlwifi/iwl-3945-rs.c</a></div><div class='hunk'>@@ -36,8 +36,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "../net/mac80211/rate.h"</div><div class='del'>-</div><div class='ctx'> #include "iwl-3945.h"</div><div class='ctx'> </div><div class='ctx'> #define RS_NAME "iwl-3945-rs"</div><div class='hunk'>@@ -65,6 +63,9 @@ struct iwl3945_rs_sta {</div><div class='ctx'> 	u8 ibss_sta_added;</div><div class='ctx'> 	struct timer_list rate_scale_flush;</div><div class='ctx'> 	struct iwl3945_rate_scale_data win[IWL_RATE_COUNT];</div><div class='add'>+</div><div class='add'>+	/* used to be in sta_info */</div><div class='add'>+	int last_txrate_idx;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static s32 iwl3945_expected_tpt_g[IWL_RATE_COUNT] = {</div><div class='hunk'>@@ -316,9 +317,10 @@ static void iwl3945_collect_tx_data(struct iwl3945_rs_sta *rs_sta,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void rs_rate_init(void *priv_rate, void *priv_sta,</div><div class='del'>-			 struct ieee80211_local *local, struct sta_info *sta)</div><div class='add'>+static void rs_rate_init(void *priv, struct ieee80211_supported_band *sband,</div><div class='add'>+			 struct ieee80211_sta *sta, void *priv_sta)</div><div class='ctx'> {</div><div class='add'>+	struct iwl3945_rs_sta *rs_sta = priv_sta;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	IWL_DEBUG_RATE("enter\n");</div><div class='hunk'>@@ -329,24 +331,22 @@ static void rs_rate_init(void *priv_rate, void *priv_sta,</div><div class='ctx'> 	 * after assoc.. */</div><div class='ctx'> </div><div class='ctx'> 	for (i = IWL_RATE_COUNT - 1; i &gt;= 0; i--) {</div><div class='del'>-		if (sta-&gt;supp_rates[local-&gt;hw.conf.channel-&gt;band] &amp; (1 &lt;&lt; i)) {</div><div class='del'>-			sta-&gt;txrate_idx = i;</div><div class='add'>+		if (sta-&gt;supp_rates[sband-&gt;band] &amp; (1 &lt;&lt; i)) {</div><div class='add'>+			rs_sta-&gt;last_txrate_idx = i;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	sta-&gt;last_txrate_idx = sta-&gt;txrate_idx;</div><div class='del'>-</div><div class='ctx'> 	/* For 5 GHz band it start at IWL_FIRST_OFDM_RATE */</div><div class='del'>-	if (local-&gt;hw.conf.channel-&gt;band == IEEE80211_BAND_5GHZ)</div><div class='del'>-		sta-&gt;last_txrate_idx += IWL_FIRST_OFDM_RATE;</div><div class='add'>+	if (sband-&gt;band == IEEE80211_BAND_5GHZ)</div><div class='add'>+		rs_sta-&gt;last_txrate_idx += IWL_FIRST_OFDM_RATE;</div><div class='ctx'> </div><div class='ctx'> 	IWL_DEBUG_RATE("leave\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void *rs_alloc(struct ieee80211_local *local)</div><div class='add'>+static void *rs_alloc(struct ieee80211_hw *hw, struct dentry *debugfsdir)</div><div class='ctx'> {</div><div class='del'>-	return local-&gt;hw.priv;</div><div class='add'>+	return hw-&gt;priv;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* rate scale requires free function to be implemented */</div><div class='hunk'>@@ -354,17 +354,24 @@ static void rs_free(void *priv)</div><div class='ctx'> {</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='add'>+</div><div class='ctx'> static void rs_clear(void *priv)</div><div class='ctx'> {</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static void *rs_alloc_sta(void *priv, gfp_t gfp)</div><div class='add'>+static void *rs_alloc_sta(void *priv, struct ieee80211_sta *sta, gfp_t gfp)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl3945_rs_sta *rs_sta;</div><div class='add'>+	struct iwl3945_sta_priv *psta = (void *) sta-&gt;drv_priv;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * XXX: If it's using sta-&gt;drv_priv anyway, it might</div><div class='add'>+	 *	as well just put all the information there.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='ctx'> 	IWL_DEBUG_RATE("enter\n");</div><div class='ctx'> </div><div class='ctx'> 	rs_sta = kzalloc(sizeof(struct iwl3945_rs_sta), gfp);</div><div class='hunk'>@@ -373,6 +380,8 @@ static void *rs_alloc_sta(void *priv, gfp_t gfp)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	psta-&gt;rs_sta = rs_sta;</div><div class='add'>+</div><div class='ctx'> 	spin_lock_init(&amp;rs_sta-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	rs_sta-&gt;start_rate = IWL_RATE_INVALID;</div><div class='hunk'>@@ -398,10 +407,14 @@ static void *rs_alloc_sta(void *priv, gfp_t gfp)</div><div class='ctx'> 	return rs_sta;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void rs_free_sta(void *priv, void *priv_sta)</div><div class='add'>+static void rs_free_sta(void *priv, struct ieee80211_sta *sta,</div><div class='add'>+			void *priv_sta)</div><div class='ctx'> {</div><div class='add'>+	struct iwl3945_sta_priv *psta = (void *) sta-&gt;drv_priv;</div><div class='ctx'> 	struct iwl3945_rs_sta *rs_sta = priv_sta;</div><div class='ctx'> </div><div class='add'>+	psta-&gt;rs_sta = NULL;</div><div class='add'>+</div><div class='ctx'> 	IWL_DEBUG_RATE("enter\n");</div><div class='ctx'> 	del_timer_sync(&amp;rs_sta-&gt;rate_scale_flush);</div><div class='ctx'> 	kfree(rs_sta);</div><div class='hunk'>@@ -443,26 +456,19 @@ static int rs_adjust_next_rate(struct iwl3945_priv *priv, int rate)</div><div class='ctx'>  * NOTE: Uses iwl3945_priv-&gt;retry_rate for the # of retries attempted by</div><div class='ctx'>  * the hardware for each rate.</div><div class='ctx'>  */</div><div class='del'>-static void rs_tx_status(void *priv_rate,</div><div class='del'>-			 struct net_device *dev,</div><div class='add'>+static void rs_tx_status(void *priv_rate, struct ieee80211_supported_band *sband,</div><div class='add'>+			 struct ieee80211_sta *sta, void *priv_sta,</div><div class='ctx'> 			 struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	u8 retries, current_count;</div><div class='ctx'> 	int scale_rate_index, first_index, last_index;</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	struct sta_info *sta;</div><div class='del'>-	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb-&gt;data;</div><div class='ctx'> 	struct iwl3945_priv *priv = (struct iwl3945_priv *)priv_rate;</div><div class='del'>-	struct ieee80211_local *local = wdev_priv(dev-&gt;ieee80211_ptr);</div><div class='del'>-	struct iwl3945_rs_sta *rs_sta;</div><div class='del'>-	struct ieee80211_supported_band *sband;</div><div class='add'>+	struct iwl3945_rs_sta *rs_sta = priv_sta;</div><div class='ctx'> 	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);</div><div class='ctx'> </div><div class='ctx'> 	IWL_DEBUG_RATE("enter\n");</div><div class='ctx'> </div><div class='del'>-	sband = local-&gt;hw.wiphy-&gt;bands[local-&gt;hw.conf.channel-&gt;band];</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> 	retries = info-&gt;status.retry_count;</div><div class='ctx'> 	first_index = sband-&gt;bitrates[info-&gt;tx_rate_idx].hw_value;</div><div class='ctx'> 	if ((first_index &lt; 0) || (first_index &gt;= IWL_RATE_COUNT)) {</div><div class='hunk'>@@ -470,17 +476,11 @@ static void rs_tx_status(void *priv_rate,</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-</div><div class='del'>-	sta = sta_info_get(local, hdr-&gt;addr1);</div><div class='del'>-	if (!sta || !sta-&gt;rate_ctrl_priv) {</div><div class='del'>-		rcu_read_unlock();</div><div class='add'>+	if (!priv_sta) {</div><div class='ctx'> 		IWL_DEBUG_RATE("leave: No STA priv data to update!\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rs_sta = (void *)sta-&gt;rate_ctrl_priv;</div><div class='del'>-</div><div class='ctx'> 	rs_sta-&gt;tx_packets++;</div><div class='ctx'> </div><div class='ctx'> 	scale_rate_index = first_index;</div><div class='hunk'>@@ -547,8 +547,6 @@ static void rs_tx_status(void *priv_rate,</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;rs_sta-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-</div><div class='ctx'> 	IWL_DEBUG_RATE("leave\n");</div><div class='ctx'> </div><div class='ctx'> 	return;</div><div class='hunk'>@@ -632,16 +630,15 @@ static u16 iwl3945_get_adjacent_rate(struct iwl3945_rs_sta *rs_sta,</div><div class='ctx'>  * rate table and must reference the driver allocated rate table</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-static void rs_get_rate(void *priv_rate, struct net_device *dev,</div><div class='del'>-			struct ieee80211_supported_band *sband,</div><div class='del'>-			struct sk_buff *skb,</div><div class='del'>-			struct rate_selection *sel)</div><div class='add'>+static void rs_get_rate(void *priv_r, struct ieee80211_supported_band *sband,</div><div class='add'>+			struct ieee80211_sta *sta, void *priv_sta,</div><div class='add'>+			struct sk_buff *skb, struct rate_selection *sel)</div><div class='ctx'> {</div><div class='ctx'> 	u8 low = IWL_RATE_INVALID;</div><div class='ctx'> 	u8 high = IWL_RATE_INVALID;</div><div class='ctx'> 	u16 high_low;</div><div class='ctx'> 	int index;</div><div class='del'>-	struct iwl3945_rs_sta *rs_sta;</div><div class='add'>+	struct iwl3945_rs_sta *rs_sta = priv_sta;</div><div class='ctx'> 	struct iwl3945_rate_scale_data *window = NULL;</div><div class='ctx'> 	int current_tpt = IWL_INV_TPT;</div><div class='ctx'> 	int low_tpt = IWL_INV_TPT;</div><div class='hunk'>@@ -649,40 +646,31 @@ static void rs_get_rate(void *priv_rate, struct net_device *dev,</div><div class='ctx'> 	u32 fail_count;</div><div class='ctx'> 	s8 scale_action = 0;</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	struct ieee80211_local *local = wdev_priv(dev-&gt;ieee80211_ptr);</div><div class='ctx'> 	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb-&gt;data;</div><div class='del'>-	struct sta_info *sta;</div><div class='ctx'> 	u16 fc, rate_mask;</div><div class='del'>-	struct iwl3945_priv *priv = (struct iwl3945_priv *)priv_rate;</div><div class='add'>+	struct iwl3945_priv *priv = (struct iwl3945_priv *)priv_r;</div><div class='ctx'> 	DECLARE_MAC_BUF(mac);</div><div class='ctx'> </div><div class='ctx'> 	IWL_DEBUG_RATE("enter\n");</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-</div><div class='del'>-	sta = sta_info_get(local, hdr-&gt;addr1);</div><div class='del'>-</div><div class='ctx'> 	/* Send management frames and broadcast/multicast data using lowest</div><div class='ctx'> 	 * rate. */</div><div class='ctx'> 	fc = le16_to_cpu(hdr-&gt;frame_control);</div><div class='ctx'> 	if ((fc &amp; IEEE80211_FCTL_FTYPE) != IEEE80211_FTYPE_DATA ||</div><div class='ctx'> 	    is_multicast_ether_addr(hdr-&gt;addr1) ||</div><div class='del'>-	    !sta || !sta-&gt;rate_ctrl_priv) {</div><div class='add'>+	    !sta || !priv_sta) {</div><div class='ctx'> 		IWL_DEBUG_RATE("leave: No STA priv data to update!\n");</div><div class='del'>-		sel-&gt;rate_idx = rate_lowest_index(local, sband, sta);</div><div class='del'>-		rcu_read_unlock();</div><div class='add'>+		sel-&gt;rate_idx = rate_lowest_index(sband, sta);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	rate_mask = sta-&gt;supp_rates[sband-&gt;band];</div><div class='del'>-	index = min(sta-&gt;last_txrate_idx &amp; 0xffff, IWL_RATE_COUNT - 1);</div><div class='add'>+	index = min(rs_sta-&gt;last_txrate_idx &amp; 0xffff, IWL_RATE_COUNT - 1);</div><div class='ctx'> </div><div class='ctx'> 	if (sband-&gt;band == IEEE80211_BAND_5GHZ)</div><div class='ctx'> 		rate_mask = rate_mask &lt;&lt; IWL_FIRST_OFDM_RATE;</div><div class='ctx'> </div><div class='del'>-	rs_sta = (void *)sta-&gt;rate_ctrl_priv;</div><div class='del'>-</div><div class='del'>-	if ((priv-&gt;iw_mode == IEEE80211_IF_TYPE_IBSS) &amp;&amp;</div><div class='add'>+	if ((priv-&gt;iw_mode == NL80211_IFTYPE_ADHOC) &amp;&amp;</div><div class='ctx'> 	    !rs_sta-&gt;ibss_sta_added) {</div><div class='ctx'> 		u8 sta_id = iwl3945_hw_find_station(priv, hdr-&gt;addr1);</div><div class='ctx'> </div><div class='hunk'>@@ -803,17 +791,13 @@ static void rs_get_rate(void *priv_rate, struct net_device *dev,</div><div class='ctx'> </div><div class='ctx'>  out:</div><div class='ctx'> </div><div class='del'>-	sta-&gt;last_txrate_idx = index;</div><div class='add'>+	rs_sta-&gt;last_txrate_idx = index;</div><div class='ctx'> 	if (sband-&gt;band == IEEE80211_BAND_5GHZ)</div><div class='del'>-		sta-&gt;txrate_idx = sta-&gt;last_txrate_idx - IWL_FIRST_OFDM_RATE;</div><div class='add'>+		sel-&gt;rate_idx = rs_sta-&gt;last_txrate_idx - IWL_FIRST_OFDM_RATE;</div><div class='ctx'> 	else</div><div class='del'>-		sta-&gt;txrate_idx = sta-&gt;last_txrate_idx;</div><div class='del'>-</div><div class='del'>-	rcu_read_unlock();</div><div class='add'>+		sel-&gt;rate_idx = rs_sta-&gt;last_txrate_idx;</div><div class='ctx'> </div><div class='ctx'> 	IWL_DEBUG_RATE("leave: %d\n", index);</div><div class='del'>-</div><div class='del'>-	sel-&gt;rate_idx = sta-&gt;txrate_idx;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct rate_control_ops rs_ops = {</div><div class='hunk'>@@ -829,114 +813,28 @@ static struct rate_control_ops rs_ops = {</div><div class='ctx'> 	.free_sta = rs_free_sta,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int iwl3945_fill_rs_info(struct ieee80211_hw *hw, char *buf, u8 sta_id)</div><div class='del'>-{</div><div class='del'>-	struct ieee80211_local *local = hw_to_local(hw);</div><div class='del'>-	struct iwl3945_priv *priv = hw-&gt;priv;</div><div class='del'>-	struct iwl3945_rs_sta *rs_sta;</div><div class='del'>-	struct sta_info *sta;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int count = 0, i;</div><div class='del'>-	u32 samples = 0, success = 0, good = 0;</div><div class='del'>-	unsigned long now = jiffies;</div><div class='del'>-	u32 max_time = 0;</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-</div><div class='del'>-	sta = sta_info_get(local, priv-&gt;stations[sta_id].sta.sta.addr);</div><div class='del'>-	if (!sta || !sta-&gt;rate_ctrl_priv) {</div><div class='del'>-		if (sta)</div><div class='del'>-			IWL_DEBUG_RATE("leave - no private rate data!\n");</div><div class='del'>-		else</div><div class='del'>-			IWL_DEBUG_RATE("leave - no station!\n");</div><div class='del'>-		rcu_read_unlock();</div><div class='del'>-		return sprintf(buf, "station %d not found\n", sta_id);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rs_sta = (void *)sta-&gt;rate_ctrl_priv;</div><div class='del'>-	spin_lock_irqsave(&amp;rs_sta-&gt;lock, flags);</div><div class='del'>-	i = IWL_RATE_54M_INDEX;</div><div class='del'>-	while (1) {</div><div class='del'>-		u64 mask;</div><div class='del'>-		int j;</div><div class='del'>-</div><div class='del'>-		count +=</div><div class='del'>-		    sprintf(&amp;buf[count], " %2dMbs: ", iwl3945_rates[i].ieee / 2);</div><div class='del'>-</div><div class='del'>-		mask = (1ULL &lt;&lt; (IWL_RATE_MAX_WINDOW - 1));</div><div class='del'>-		for (j = 0; j &lt; IWL_RATE_MAX_WINDOW; j++, mask &gt;&gt;= 1)</div><div class='del'>-			buf[count++] =</div><div class='del'>-			    (rs_sta-&gt;win[i].data &amp; mask) ? '1' : '0';</div><div class='del'>-</div><div class='del'>-		samples += rs_sta-&gt;win[i].counter;</div><div class='del'>-		good += rs_sta-&gt;win[i].success_counter;</div><div class='del'>-		success += rs_sta-&gt;win[i].success_counter *</div><div class='del'>-						iwl3945_rates[i].ieee;</div><div class='del'>-</div><div class='del'>-		if (rs_sta-&gt;win[i].stamp) {</div><div class='del'>-			int delta =</div><div class='del'>-			    jiffies_to_msecs(now - rs_sta-&gt;win[i].stamp);</div><div class='del'>-</div><div class='del'>-			if (delta &gt; max_time)</div><div class='del'>-				max_time = delta;</div><div class='del'>-</div><div class='del'>-			count += sprintf(&amp;buf[count], "%5dms\n", delta);</div><div class='del'>-		} else</div><div class='del'>-			buf[count++] = '\n';</div><div class='del'>-</div><div class='del'>-		j = iwl3945_get_prev_ieee_rate(i);</div><div class='del'>-		if (j == i)</div><div class='del'>-			break;</div><div class='del'>-		i = j;</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;rs_sta-&gt;lock, flags);</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-	/* Display the average rate of all samples taken.</div><div class='del'>-	 *</div><div class='del'>-	 * NOTE:  We multiple # of samples by 2 since the IEEE measurement</div><div class='del'>-	 * added from iwl3945_rates is actually 2X the rate */</div><div class='del'>-	if (samples)</div><div class='del'>-		count += sprintf(</div><div class='del'>-			&amp;buf[count],</div><div class='del'>-			"\nAverage rate is %3d.%02dMbs over last %4dms\n"</div><div class='del'>-			"%3d%% success (%d good packets over %d tries)\n",</div><div class='del'>-			success / (2 * samples), (success * 5 / samples) % 10,</div><div class='del'>-			max_time, good * 100 / samples, good, samples);</div><div class='del'>-	else</div><div class='del'>-		count += sprintf(&amp;buf[count], "\nAverage rate: 0Mbs\n");</div><div class='del'>-</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void iwl3945_rate_scale_init(struct ieee80211_hw *hw, s32 sta_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl3945_priv *priv = hw-&gt;priv;</div><div class='ctx'> 	s32 rssi = 0;</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	struct ieee80211_local *local = hw_to_local(hw);</div><div class='ctx'> 	struct iwl3945_rs_sta *rs_sta;</div><div class='del'>-	struct sta_info *sta;</div><div class='add'>+	struct ieee80211_sta *sta;</div><div class='add'>+	struct iwl3945_sta_priv *psta;</div><div class='ctx'> </div><div class='ctx'> 	IWL_DEBUG_RATE("enter\n");</div><div class='ctx'> </div><div class='del'>-	if (!local-&gt;rate_ctrl-&gt;ops-&gt;name ||</div><div class='del'>-	    strcmp(local-&gt;rate_ctrl-&gt;ops-&gt;name, RS_NAME)) {</div><div class='del'>-		IWL_WARNING("iwl-3945-rs not selected as rate control algo!\n");</div><div class='del'>-		IWL_DEBUG_RATE("leave - mac80211 picked the wrong RC algo.\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> </div><div class='del'>-	sta = sta_info_get(local, priv-&gt;stations[sta_id].sta.sta.addr);</div><div class='del'>-	if (!sta || !sta-&gt;rate_ctrl_priv) {</div><div class='add'>+	sta = ieee80211_find_sta(hw, priv-&gt;stations[sta_id].sta.sta.addr);</div><div class='add'>+	psta = (void *) sta-&gt;drv_priv;</div><div class='add'>+	if (!sta || !psta) {</div><div class='ctx'> 		IWL_DEBUG_RATE("leave - no private rate data!\n");</div><div class='ctx'> 		rcu_read_unlock();</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rs_sta = (void *)sta-&gt;rate_ctrl_priv;</div><div class='add'>+	rs_sta = psta-&gt;rs_sta;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;rs_sta-&gt;lock, flags);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/iwl-3945-rs.h b/drivers/net/wireless/iwlwifi/iwl-3945-rs.h<br/>index f085d330bdcf..98b17ae6ef24 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-3945-rs.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/iwlwifi/iwl-3945-rs.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-3945-rs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/iwlwifi/iwl-3945-rs.h</a></div><div class='hunk'>@@ -176,15 +176,6 @@ static inline u8 iwl3945_get_prev_ieee_rate(u8 rate_index)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * iwl3945_fill_rs_info - Fill an output text buffer with the rate representation</div><div class='del'>- *</div><div class='del'>- * NOTE:  This is provided as a quick mechanism for a user to visualize</div><div class='del'>- * the performance of the rate control algorithm and is not meant to be</div><div class='del'>- * parsed software.</div><div class='del'>- */</div><div class='del'>-extern int iwl3945_fill_rs_info(struct ieee80211_hw *, char *buf, u8 sta_id);</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * iwl3945_rate_scale_init - Initialize the rate scale table based on assoc info</div><div class='ctx'>  *</div><div class='ctx'>  * The specific throughput table used is based on the type of network</div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c<br/>index 3f51f3635344..7ca5627cc078 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-3945.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/iwlwifi/iwl-3945.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-3945.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/iwlwifi/iwl-3945.c</a></div><div class='hunk'>@@ -520,10 +520,10 @@ static int iwl3945_is_network_packet(struct iwl3945_priv *priv,</div><div class='ctx'> 	/* Filter incoming packets to determine if they are targeted toward</div><div class='ctx'> 	 * this network, discarding packets coming from ourselves */</div><div class='ctx'> 	switch (priv-&gt;iw_mode) {</div><div class='del'>-	case IEEE80211_IF_TYPE_IBSS: /* Header: Dest. | Source    | BSSID */</div><div class='add'>+	case NL80211_IFTYPE_ADHOC: /* Header: Dest. | Source    | BSSID */</div><div class='ctx'> 		/* packets to our IBSS update information */</div><div class='ctx'> 		return !compare_ether_addr(header-&gt;addr3, priv-&gt;bssid);</div><div class='del'>-	case IEEE80211_IF_TYPE_STA: /* Header: Dest. | AP{BSSID} | Source */</div><div class='add'>+	case NL80211_IFTYPE_STATION: /* Header: Dest. | AP{BSSID} | Source */</div><div class='ctx'> 		/* packets to our IBSS update information */</div><div class='ctx'> 		return !compare_ether_addr(header-&gt;addr2, priv-&gt;bssid);</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -531,99 +531,6 @@ static int iwl3945_is_network_packet(struct iwl3945_priv *priv,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iwl3945_add_radiotap(struct iwl3945_priv *priv,</div><div class='del'>-				 struct sk_buff *skb,</div><div class='del'>-				 struct iwl3945_rx_frame_hdr *rx_hdr,</div><div class='del'>-				 struct ieee80211_rx_status *stats)</div><div class='del'>-{</div><div class='del'>-	/* First cache any information we need before we overwrite</div><div class='del'>-	 * the information provided in the skb from the hardware */</div><div class='del'>-	s8 signal = stats-&gt;signal;</div><div class='del'>-	s8 noise = 0;</div><div class='del'>-	int rate = stats-&gt;rate_idx;</div><div class='del'>-	u64 tsf = stats-&gt;mactime;</div><div class='del'>-	__le16 phy_flags_hw = rx_hdr-&gt;phy_flags, antenna;</div><div class='del'>-</div><div class='del'>-	struct iwl3945_rt_rx_hdr {</div><div class='del'>-		struct ieee80211_radiotap_header rt_hdr;</div><div class='del'>-		__le64 rt_tsf;		/* TSF */</div><div class='del'>-		u8 rt_flags;		/* radiotap packet flags */</div><div class='del'>-		u8 rt_rate;		/* rate in 500kb/s */</div><div class='del'>-		__le16 rt_channelMHz;	/* channel in MHz */</div><div class='del'>-		__le16 rt_chbitmask;	/* channel bitfield */</div><div class='del'>-		s8 rt_dbmsignal;	/* signal in dBm, kluged to signed */</div><div class='del'>-		s8 rt_dbmnoise;</div><div class='del'>-		u8 rt_antenna;		/* antenna number */</div><div class='del'>-	} __attribute__ ((packed)) *iwl3945_rt;</div><div class='del'>-</div><div class='del'>-	if (skb_headroom(skb) &lt; sizeof(*iwl3945_rt)) {</div><div class='del'>-		if (net_ratelimit())</div><div class='del'>-			printk(KERN_ERR "not enough headroom [%d] for "</div><div class='del'>-			       "radiotap head [%zd]\n",</div><div class='del'>-			       skb_headroom(skb), sizeof(*iwl3945_rt));</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* put radiotap header in front of 802.11 header and data */</div><div class='del'>-	iwl3945_rt = (void *)skb_push(skb, sizeof(*iwl3945_rt));</div><div class='del'>-</div><div class='del'>-	/* initialise radiotap header */</div><div class='del'>-	iwl3945_rt-&gt;rt_hdr.it_version = PKTHDR_RADIOTAP_VERSION;</div><div class='del'>-	iwl3945_rt-&gt;rt_hdr.it_pad = 0;</div><div class='del'>-</div><div class='del'>-	/* total header + data */</div><div class='del'>-	put_unaligned_le16(sizeof(*iwl3945_rt), &amp;iwl3945_rt-&gt;rt_hdr.it_len);</div><div class='del'>-</div><div class='del'>-	/* Indicate all the fields we add to the radiotap header */</div><div class='del'>-	put_unaligned_le32((1 &lt;&lt; IEEE80211_RADIOTAP_TSFT) |</div><div class='del'>-			   (1 &lt;&lt; IEEE80211_RADIOTAP_FLAGS) |</div><div class='del'>-			   (1 &lt;&lt; IEEE80211_RADIOTAP_RATE) |</div><div class='del'>-			   (1 &lt;&lt; IEEE80211_RADIOTAP_CHANNEL) |</div><div class='del'>-			   (1 &lt;&lt; IEEE80211_RADIOTAP_DBM_ANTSIGNAL) |</div><div class='del'>-			   (1 &lt;&lt; IEEE80211_RADIOTAP_DBM_ANTNOISE) |</div><div class='del'>-			   (1 &lt;&lt; IEEE80211_RADIOTAP_ANTENNA),</div><div class='del'>-			&amp;iwl3945_rt-&gt;rt_hdr.it_present);</div><div class='del'>-</div><div class='del'>-	/* Zero the flags, we'll add to them as we go */</div><div class='del'>-	iwl3945_rt-&gt;rt_flags = 0;</div><div class='del'>-</div><div class='del'>-	put_unaligned_le64(tsf, &amp;iwl3945_rt-&gt;rt_tsf);</div><div class='del'>-</div><div class='del'>-	iwl3945_rt-&gt;rt_dbmsignal = signal;</div><div class='del'>-	iwl3945_rt-&gt;rt_dbmnoise = noise;</div><div class='del'>-</div><div class='del'>-	/* Convert the channel frequency and set the flags */</div><div class='del'>-	put_unaligned_le16(stats-&gt;freq, &amp;iwl3945_rt-&gt;rt_channelMHz);</div><div class='del'>-	if (!(phy_flags_hw &amp; RX_RES_PHY_FLAGS_BAND_24_MSK))</div><div class='del'>-		put_unaligned_le16(IEEE80211_CHAN_OFDM | IEEE80211_CHAN_5GHZ,</div><div class='del'>-			      &amp;iwl3945_rt-&gt;rt_chbitmask);</div><div class='del'>-	else if (phy_flags_hw &amp; RX_RES_PHY_FLAGS_MOD_CCK_MSK)</div><div class='del'>-		put_unaligned_le16(IEEE80211_CHAN_CCK | IEEE80211_CHAN_2GHZ,</div><div class='del'>-			      &amp;iwl3945_rt-&gt;rt_chbitmask);</div><div class='del'>-	else	/* 802.11g */</div><div class='del'>-		put_unaligned_le16(IEEE80211_CHAN_OFDM | IEEE80211_CHAN_2GHZ,</div><div class='del'>-			      &amp;iwl3945_rt-&gt;rt_chbitmask);</div><div class='del'>-</div><div class='del'>-	if (rate == -1)</div><div class='del'>-		iwl3945_rt-&gt;rt_rate = 0;</div><div class='del'>-	else {</div><div class='del'>-		if (stats-&gt;band == IEEE80211_BAND_5GHZ)</div><div class='del'>-			rate += IWL_FIRST_OFDM_RATE;</div><div class='del'>-</div><div class='del'>-		iwl3945_rt-&gt;rt_rate = iwl3945_rates[rate].ieee;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* antenna number */</div><div class='del'>-	antenna = phy_flags_hw &amp; RX_RES_PHY_FLAGS_ANTENNA_MSK;</div><div class='del'>-	iwl3945_rt-&gt;rt_antenna = le16_to_cpu(antenna) &gt;&gt; 4;</div><div class='del'>-</div><div class='del'>-	/* set the preamble flag if we have it */</div><div class='del'>-	if (phy_flags_hw &amp; RX_RES_PHY_FLAGS_SHORT_PREAMBLE_MSK)</div><div class='del'>-		iwl3945_rt-&gt;rt_flags |= IEEE80211_RADIOTAP_F_SHORTPRE;</div><div class='del'>-</div><div class='del'>-	stats-&gt;flag |= RX_FLAG_RADIOTAP;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void iwl3945_pass_packet_to_mac80211(struct iwl3945_priv *priv,</div><div class='ctx'> 				   struct iwl3945_rx_mem_buffer *rxb,</div><div class='ctx'> 				   struct ieee80211_rx_status *stats)</div><div class='hunk'>@@ -657,9 +564,6 @@ static void iwl3945_pass_packet_to_mac80211(struct iwl3945_priv *priv,</div><div class='ctx'> 		iwl3945_set_decrypted_flag(priv, rxb-&gt;skb,</div><div class='ctx'> 				       le32_to_cpu(rx_end-&gt;status), stats);</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;add_radiotap)</div><div class='del'>-		iwl3945_add_radiotap(priv, rxb-&gt;skb, rx_hdr, stats);</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_IWL3945_LEDS</div><div class='ctx'> 	if (ieee80211_is_data(hdr-&gt;frame_control))</div><div class='ctx'> 		priv-&gt;rxtxpackets += len;</div><div class='hunk'>@@ -684,7 +588,6 @@ static void iwl3945_rx_reply_rx(struct iwl3945_priv *priv,</div><div class='ctx'> 	u16 rx_stats_noise_diff = le16_to_cpu(rx_stats-&gt;noise_diff);</div><div class='ctx'> 	u8 network_packet;</div><div class='ctx'> </div><div class='del'>-	rx_status.antenna = 0;</div><div class='ctx'> 	rx_status.flag = 0;</div><div class='ctx'> 	rx_status.mactime = le64_to_cpu(rx_end-&gt;timestamp);</div><div class='ctx'> 	rx_status.freq =</div><div class='hunk'>@@ -696,6 +599,13 @@ static void iwl3945_rx_reply_rx(struct iwl3945_priv *priv,</div><div class='ctx'> 	if (rx_status.band == IEEE80211_BAND_5GHZ)</div><div class='ctx'> 		rx_status.rate_idx -= IWL_FIRST_OFDM_RATE;</div><div class='ctx'> </div><div class='add'>+	rx_status.antenna = le16_to_cpu(rx_hdr-&gt;phy_flags &amp;</div><div class='add'>+					RX_RES_PHY_FLAGS_ANTENNA_MSK) &gt;&gt; 4;</div><div class='add'>+</div><div class='add'>+	/* set the preamble flag if appropriate */</div><div class='add'>+	if (rx_hdr-&gt;phy_flags &amp; RX_RES_PHY_FLAGS_SHORT_PREAMBLE_MSK)</div><div class='add'>+		rx_status.flag |= RX_FLAG_SHORTPRE;</div><div class='add'>+</div><div class='ctx'> 	if ((unlikely(rx_stats-&gt;phy_count &gt; 20))) {</div><div class='ctx'> 		IWL_DEBUG_DROP</div><div class='ctx'> 		    ("dsp size out of range [0,20]: "</div><div class='hunk'>@@ -771,100 +681,7 @@ static void iwl3945_rx_reply_rx(struct iwl3945_priv *priv,</div><div class='ctx'> 		priv-&gt;last_rx_noise = rx_status.noise;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;iw_mode == IEEE80211_IF_TYPE_MNTR) {</div><div class='del'>-		iwl3945_pass_packet_to_mac80211(priv, rxb, &amp;rx_status);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (le16_to_cpu(header-&gt;frame_control) &amp; IEEE80211_FCTL_FTYPE) {</div><div class='del'>-	case IEEE80211_FTYPE_MGMT:</div><div class='del'>-		switch (le16_to_cpu(header-&gt;frame_control) &amp;</div><div class='del'>-			IEEE80211_FCTL_STYPE) {</div><div class='del'>-		case IEEE80211_STYPE_PROBE_RESP:</div><div class='del'>-		case IEEE80211_STYPE_BEACON:{</div><div class='del'>-				/* If this is a beacon or probe response for</div><div class='del'>-				 * our network then cache the beacon</div><div class='del'>-				 * timestamp */</div><div class='del'>-				if ((((priv-&gt;iw_mode == IEEE80211_IF_TYPE_STA)</div><div class='del'>-				      &amp;&amp; !compare_ether_addr(header-&gt;addr2,</div><div class='del'>-							     priv-&gt;bssid)) ||</div><div class='del'>-				     ((priv-&gt;iw_mode == IEEE80211_IF_TYPE_IBSS)</div><div class='del'>-				      &amp;&amp; !compare_ether_addr(header-&gt;addr3,</div><div class='del'>-							     priv-&gt;bssid)))) {</div><div class='del'>-					struct ieee80211_mgmt *mgmt =</div><div class='del'>-					    (struct ieee80211_mgmt *)header;</div><div class='del'>-					__le32 *pos;</div><div class='del'>-					pos = (__le32 *)&amp;mgmt-&gt;u.beacon.</div><div class='del'>-					    timestamp;</div><div class='del'>-					priv-&gt;timestamp0 = le32_to_cpu(pos[0]);</div><div class='del'>-					priv-&gt;timestamp1 = le32_to_cpu(pos[1]);</div><div class='del'>-					priv-&gt;beacon_int = le16_to_cpu(</div><div class='del'>-					    mgmt-&gt;u.beacon.beacon_int);</div><div class='del'>-					if (priv-&gt;call_post_assoc_from_beacon &amp;&amp;</div><div class='del'>-					    (priv-&gt;iw_mode ==</div><div class='del'>-						IEEE80211_IF_TYPE_STA))</div><div class='del'>-						queue_work(priv-&gt;workqueue,</div><div class='del'>-						    &amp;priv-&gt;post_associate.work);</div><div class='del'>-</div><div class='del'>-					priv-&gt;call_post_assoc_from_beacon = 0;</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-		case IEEE80211_STYPE_ACTION:</div><div class='del'>-			/* TODO: Parse 802.11h frames for CSA... */</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * TODO: Use the new callback function from</div><div class='del'>-			 * mac80211 instead of sniffing these packets.</div><div class='del'>-			 */</div><div class='del'>-		case IEEE80211_STYPE_ASSOC_RESP:</div><div class='del'>-		case IEEE80211_STYPE_REASSOC_RESP:{</div><div class='del'>-				struct ieee80211_mgmt *mgnt =</div><div class='del'>-				    (struct ieee80211_mgmt *)header;</div><div class='del'>-</div><div class='del'>-				/* We have just associated, give some</div><div class='del'>-				 * time for the 4-way handshake if</div><div class='del'>-				 * any. Don't start scan too early. */</div><div class='del'>-				priv-&gt;next_scan_jiffies = jiffies +</div><div class='del'>-					IWL_DELAY_NEXT_SCAN_AFTER_ASSOC;</div><div class='del'>-</div><div class='del'>-				priv-&gt;assoc_id = (~((1 &lt;&lt; 15) | (1 &lt;&lt; 14)) &amp;</div><div class='del'>-						  le16_to_cpu(mgnt-&gt;u.</div><div class='del'>-							      assoc_resp.aid));</div><div class='del'>-				priv-&gt;assoc_capability =</div><div class='del'>-				    le16_to_cpu(mgnt-&gt;u.assoc_resp.capab_info);</div><div class='del'>-				if (priv-&gt;beacon_int)</div><div class='del'>-					queue_work(priv-&gt;workqueue,</div><div class='del'>-					    &amp;priv-&gt;post_associate.work);</div><div class='del'>-				else</div><div class='del'>-					priv-&gt;call_post_assoc_from_beacon = 1;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-		case IEEE80211_STYPE_PROBE_REQ:{</div><div class='del'>-				DECLARE_MAC_BUF(mac1);</div><div class='del'>-				DECLARE_MAC_BUF(mac2);</div><div class='del'>-				DECLARE_MAC_BUF(mac3);</div><div class='del'>-				if (priv-&gt;iw_mode == IEEE80211_IF_TYPE_IBSS)</div><div class='del'>-					IWL_DEBUG_DROP</div><div class='del'>-					    ("Dropping (non network): %s"</div><div class='del'>-					     ", %s, %s\n",</div><div class='del'>-					     print_mac(mac1, header-&gt;addr1),</div><div class='del'>-					     print_mac(mac2, header-&gt;addr2),</div><div class='del'>-					     print_mac(mac3, header-&gt;addr3));</div><div class='del'>-				return;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	case IEEE80211_FTYPE_DATA:</div><div class='del'>-		/* fall through */</div><div class='del'>-	default:</div><div class='del'>-		iwl3945_pass_packet_to_mac80211(priv, rxb, &amp;rx_status);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='add'>+	iwl3945_pass_packet_to_mac80211(priv, rxb, &amp;rx_status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int iwl3945_hw_txq_attach_buf_to_tfd(struct iwl3945_priv *priv, void *ptr,</div><div class='hunk'>@@ -990,7 +807,7 @@ void iwl3945_hw_build_tx_cmd_rate(struct iwl3945_priv *priv,</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;stations[sta_id].current_rate.rate_n_flags = rate;</div><div class='ctx'> </div><div class='del'>-	if ((priv-&gt;iw_mode == IEEE80211_IF_TYPE_IBSS) &amp;&amp;</div><div class='add'>+	if ((priv-&gt;iw_mode == NL80211_IFTYPE_ADHOC) &amp;&amp;</div><div class='ctx'> 	    (sta_id != priv-&gt;hw_setting.bcast_sta_id) &amp;&amp;</div><div class='ctx'> 		(sta_id != IWL_MULTICAST_ID))</div><div class='ctx'> 		priv-&gt;stations[IWL_STA_ID].current_rate.rate_n_flags = rate;</div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.h b/drivers/net/wireless/iwlwifi/iwl-3945.h<br/>index fa81ba1af3d3..bdd32475b99c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-3945.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/iwlwifi/iwl-3945.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-3945.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/iwlwifi/iwl-3945.h</a></div><div class='hunk'>@@ -73,6 +73,10 @@ extern struct pci_device_id iwl3945_hw_card_ids[];</div><div class='ctx'> extern int iwl3945_param_hwcrypto;</div><div class='ctx'> extern int iwl3945_param_queues_num;</div><div class='ctx'> </div><div class='add'>+struct iwl3945_sta_priv {</div><div class='add'>+	struct iwl3945_rs_sta *rs_sta;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> enum iwl3945_antenna {</div><div class='ctx'> 	IWL_ANTENNA_DIVERSITY,</div><div class='ctx'> 	IWL_ANTENNA_MAIN,</div><div class='hunk'>@@ -707,7 +711,6 @@ struct iwl3945_priv {</div><div class='ctx'> </div><div class='ctx'> 	enum ieee80211_band band;</div><div class='ctx'> 	int alloc_rxb_skb;</div><div class='del'>-	bool add_radiotap;</div><div class='ctx'> </div><div class='ctx'> 	void (*rx_handlers[REPLY_MAX])(struct iwl3945_priv *priv,</div><div class='ctx'> 				       struct iwl3945_rx_mem_buffer *rxb);</div><div class='hunk'>@@ -852,7 +855,7 @@ struct iwl3945_priv {</div><div class='ctx'> 	/* eeprom */</div><div class='ctx'> 	struct iwl3945_eeprom eeprom;</div><div class='ctx'> </div><div class='del'>-	enum ieee80211_if_types iw_mode;</div><div class='add'>+	enum nl80211_iftype iw_mode;</div><div class='ctx'> </div><div class='ctx'> 	struct sk_buff *ibss_beacon;</div><div class='ctx'> </div><div class='hunk'>@@ -895,7 +898,6 @@ struct iwl3945_priv {</div><div class='ctx'> 	struct delayed_work thermal_periodic;</div><div class='ctx'> 	struct delayed_work gather_stats;</div><div class='ctx'> 	struct delayed_work scan_check;</div><div class='del'>-	struct delayed_work post_associate;</div><div class='ctx'> </div><div class='ctx'> #define IWL_DEFAULT_TX_POWER 0x0F</div><div class='ctx'> 	s8 user_txpower_limit;</div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/iwl-4965-hw.h b/drivers/net/wireless/iwlwifi/iwl-4965-hw.h<br/>index fce950f4163c..f4793a609443 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-4965-hw.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/iwlwifi/iwl-4965-hw.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-4965-hw.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/iwlwifi/iwl-4965-hw.h</a></div><div class='hunk'>@@ -98,16 +98,17 @@</div><div class='ctx'> #define IWL_RSSI_OFFSET	44</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#include "iwl-commands.h"</div><div class='ctx'> </div><div class='ctx'> /* PCI registers */</div><div class='del'>-#define PCI_LINK_CTRL      0x0F0	/* 1 byte */</div><div class='del'>-#define PCI_POWER_SOURCE   0x0C8</div><div class='del'>-#define PCI_REG_WUM8       0x0E8</div><div class='add'>+#define PCI_CFG_RETRY_TIMEOUT	0x041</div><div class='add'>+#define PCI_CFG_POWER_SOURCE	0x0C8</div><div class='add'>+#define PCI_REG_WUM8		0x0E8</div><div class='add'>+#define PCI_CFG_LINK_CTRL	0x0F0</div><div class='ctx'> </div><div class='ctx'> /* PCI register values */</div><div class='del'>-#define PCI_LINK_VAL_L0S_EN	0x01</div><div class='del'>-#define PCI_LINK_VAL_L1_EN	0x02</div><div class='add'>+#define PCI_CFG_LINK_CTRL_VAL_L0S_EN	0x01</div><div class='add'>+#define PCI_CFG_LINK_CTRL_VAL_L1_EN	0x02</div><div class='add'>+#define PCI_CFG_CMD_REG_INT_DIS_MSK	0x04</div><div class='ctx'> #define PCI_CFG_PMC_PME_FROM_D3COLD_SUPPORT         (0x80000000)</div><div class='ctx'> </div><div class='ctx'> #define TFD_QUEUE_SIZE_MAX      (256)</div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c<br/>index 23fed3298962..9838de5f4369 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-4965.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/iwlwifi/iwl-4965.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-4965.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/iwlwifi/iwl-4965.c</a></div><div class='hunk'>@@ -399,7 +399,7 @@ static void iwl4965_nic_config(struct iwl_priv *priv)</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	u32 val;</div><div class='ctx'> 	u16 radio_cfg;</div><div class='del'>-	u8 val_link;</div><div class='add'>+	u16 link;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='ctx'> </div><div class='hunk'>@@ -410,10 +410,10 @@ static void iwl4965_nic_config(struct iwl_priv *priv)</div><div class='ctx'> 				       val &amp; ~(1 &lt;&lt; 11));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pci_read_config_byte(priv-&gt;pci_dev, PCI_LINK_CTRL, &amp;val_link);</div><div class='add'>+	pci_read_config_word(priv-&gt;pci_dev, PCI_CFG_LINK_CTRL, &amp;link);</div><div class='ctx'> </div><div class='ctx'> 	/* L1 is enabled by BIOS */</div><div class='del'>-	if ((val_link &amp; PCI_LINK_VAL_L1_EN) == PCI_LINK_VAL_L1_EN)</div><div class='add'>+	if ((link &amp; PCI_CFG_LINK_CTRL_VAL_L1_EN) == PCI_CFG_LINK_CTRL_VAL_L1_EN)</div><div class='ctx'> 		/* diable L0S disabled L1A enabled */</div><div class='ctx'> 		iwl_set_bit(priv, CSR_GIO_REG, CSR_GIO_REG_VAL_L0S_ENABLED);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -1607,8 +1607,8 @@ static int iwl4965_send_rxon_assoc(struct iwl_priv *priv)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-int iwl4965_hw_channel_switch(struct iwl_priv *priv, u16 channel)</div><div class='add'>+#ifdef IEEE80211_CONF_CHANNEL_SWITCH</div><div class='add'>+static int iwl4965_hw_channel_switch(struct iwl_priv *priv, u16 channel)</div><div class='ctx'> {</div><div class='ctx'> 	int rc;</div><div class='ctx'> 	u8 band = 0;</div><div class='hunk'>@@ -1648,6 +1648,7 @@ int iwl4965_hw_channel_switch(struct iwl_priv *priv, u16 channel)</div><div class='ctx'> 	rc = iwl_send_cmd_pdu(priv, REPLY_CHANNEL_SWITCH, sizeof(cmd), &amp;cmd);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> static int iwl4965_shared_mem_rx_idx(struct iwl_priv *priv)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/iwl-5000-hw.h b/drivers/net/wireless/iwlwifi/iwl-5000-hw.h<br/>index 17d4f31c5934..c479ee211c5c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-5000-hw.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/iwlwifi/iwl-5000-hw.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-5000-hw.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/iwlwifi/iwl-5000-hw.h</a></div><div class='hunk'>@@ -129,6 +129,13 @@ struct iwl5000_shared {</div><div class='ctx'> 	__le32 padding2;</div><div class='ctx'> } __attribute__ ((packed));</div><div class='ctx'> </div><div class='add'>+/* calibrations defined for 5000 */</div><div class='add'>+/* defines the order in which results should be sent to the runtime uCode */</div><div class='add'>+enum iwl5000_calib {</div><div class='add'>+	IWL5000_CALIB_LO,</div><div class='add'>+	IWL5000_CALIB_TX_IQ,</div><div class='add'>+	IWL5000_CALIB_TX_IQ_PERD,</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> #endif /* __iwl_5000_hw_h__ */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c<br/>index b08036a9d894..5155b8a760a7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-5000.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/iwlwifi/iwl-5000.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-5000.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/iwlwifi/iwl-5000.c</a></div><div class='hunk'>@@ -209,14 +209,14 @@ static void iwl5000_nic_config(struct iwl_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	u16 radio_cfg;</div><div class='del'>-	u8 val_link;</div><div class='add'>+	u16 link;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-	pci_read_config_byte(priv-&gt;pci_dev, PCI_LINK_CTRL, &amp;val_link);</div><div class='add'>+	pci_read_config_word(priv-&gt;pci_dev, PCI_CFG_LINK_CTRL, &amp;link);</div><div class='ctx'> </div><div class='ctx'> 	/* L1 is enabled by BIOS */</div><div class='del'>-	if ((val_link &amp; PCI_LINK_VAL_L1_EN) == PCI_LINK_VAL_L1_EN)</div><div class='add'>+	if ((link &amp; PCI_CFG_LINK_CTRL_VAL_L1_EN) == PCI_CFG_LINK_CTRL_VAL_L1_EN)</div><div class='ctx'> 		/* diable L0S disabled L1A enabled */</div><div class='ctx'> 		iwl_set_bit(priv, CSR_GIO_REG, CSR_GIO_REG_VAL_L0S_ENABLED);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -445,48 +445,6 @@ static int iwl5000_send_Xtal_calib(struct iwl_priv *priv)</div><div class='ctx'> 				sizeof(cal_cmd), &amp;cal_cmd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int iwl5000_send_calib_results(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	struct iwl_host_cmd hcmd = {</div><div class='del'>-		.id = REPLY_PHY_CALIBRATION_CMD,</div><div class='del'>-		.meta.flags = CMD_SIZE_HUGE,</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;calib_results.lo_res) {</div><div class='del'>-		hcmd.len = priv-&gt;calib_results.lo_res_len;</div><div class='del'>-		hcmd.data = priv-&gt;calib_results.lo_res;</div><div class='del'>-		ret = iwl_send_cmd_sync(priv, &amp;hcmd);</div><div class='del'>-</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;calib_results.tx_iq_res) {</div><div class='del'>-		hcmd.len = priv-&gt;calib_results.tx_iq_res_len;</div><div class='del'>-		hcmd.data = priv-&gt;calib_results.tx_iq_res;</div><div class='del'>-		ret = iwl_send_cmd_sync(priv, &amp;hcmd);</div><div class='del'>-</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;calib_results.tx_iq_perd_res) {</div><div class='del'>-		hcmd.len = priv-&gt;calib_results.tx_iq_perd_res_len;</div><div class='del'>-		hcmd.data = priv-&gt;calib_results.tx_iq_perd_res;</div><div class='del'>-		ret = iwl_send_cmd_sync(priv, &amp;hcmd);</div><div class='del'>-</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-err:</div><div class='del'>-	IWL_ERROR("Error %d\n", ret);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int iwl5000_send_calib_cfg(struct iwl_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl5000_calib_cfg_cmd calib_cfg_cmd;</div><div class='hunk'>@@ -511,33 +469,30 @@ static void iwl5000_rx_calib_result(struct iwl_priv *priv,</div><div class='ctx'> 	struct iwl_rx_packet *pkt = (void *)rxb-&gt;skb-&gt;data;</div><div class='ctx'> 	struct iwl5000_calib_hdr *hdr = (struct iwl5000_calib_hdr *)pkt-&gt;u.raw;</div><div class='ctx'> 	int len = le32_to_cpu(pkt-&gt;len) &amp; FH_RSCSR_FRAME_SIZE_MSK;</div><div class='del'>-</div><div class='del'>-	iwl_free_calib_results(priv);</div><div class='add'>+	int index;</div><div class='ctx'> </div><div class='ctx'> 	/* reduce the size of the length field itself */</div><div class='ctx'> 	len -= 4;</div><div class='ctx'> </div><div class='add'>+	/* Define the order in which the results will be sent to the runtime</div><div class='add'>+	 * uCode. iwl_send_calib_results sends them in a row according to their</div><div class='add'>+	 * index. We sort them here */</div><div class='ctx'> 	switch (hdr-&gt;op_code) {</div><div class='ctx'> 	case IWL5000_PHY_CALIBRATE_LO_CMD:</div><div class='del'>-		priv-&gt;calib_results.lo_res = kzalloc(len, GFP_ATOMIC);</div><div class='del'>-		priv-&gt;calib_results.lo_res_len = len;</div><div class='del'>-		memcpy(priv-&gt;calib_results.lo_res, pkt-&gt;u.raw, len);</div><div class='add'>+		index = IWL5000_CALIB_LO;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case IWL5000_PHY_CALIBRATE_TX_IQ_CMD:</div><div class='del'>-		priv-&gt;calib_results.tx_iq_res = kzalloc(len, GFP_ATOMIC);</div><div class='del'>-		priv-&gt;calib_results.tx_iq_res_len = len;</div><div class='del'>-		memcpy(priv-&gt;calib_results.tx_iq_res, pkt-&gt;u.raw, len);</div><div class='add'>+		index = IWL5000_CALIB_TX_IQ;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case IWL5000_PHY_CALIBRATE_TX_IQ_PERD_CMD:</div><div class='del'>-		priv-&gt;calib_results.tx_iq_perd_res = kzalloc(len, GFP_ATOMIC);</div><div class='del'>-		priv-&gt;calib_results.tx_iq_perd_res_len = len;</div><div class='del'>-		memcpy(priv-&gt;calib_results.tx_iq_perd_res, pkt-&gt;u.raw, len);</div><div class='add'>+		index = IWL5000_CALIB_TX_IQ_PERD;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		IWL_ERROR("Unknown calibration notification %d\n",</div><div class='ctx'> 			  hdr-&gt;op_code);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='add'>+	iwl_calib_set(&amp;priv-&gt;calib_results[index], pkt-&gt;u.raw, len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void iwl5000_rx_calib_complete(struct iwl_priv *priv,</div><div class='hunk'>@@ -832,7 +787,7 @@ static int iwl5000_alive_notify(struct iwl_priv *priv)</div><div class='ctx'> 	iwl5000_send_Xtal_calib(priv);</div><div class='ctx'> </div><div class='ctx'> 	if (priv-&gt;ucode_type == UCODE_RT)</div><div class='del'>-		iwl5000_send_calib_results(priv);</div><div class='add'>+		iwl_send_calib_results(priv);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -878,12 +833,12 @@ static int iwl5000_hw_set_hw_params(struct iwl_priv *priv)</div><div class='ctx'> 	switch (priv-&gt;hw_rev &amp; CSR_HW_REV_TYPE_MSK) {</div><div class='ctx'> 	case CSR_HW_REV_TYPE_5100:</div><div class='ctx'> 	case CSR_HW_REV_TYPE_5300:</div><div class='del'>-		/* 5X00 wants in Celsius */</div><div class='add'>+	case CSR_HW_REV_TYPE_5350:</div><div class='add'>+		/* 5X00 and 5350 wants in Celsius */</div><div class='ctx'> 		priv-&gt;hw_params.ct_kill_threshold = CT_KILL_THRESHOLD;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CSR_HW_REV_TYPE_5150:</div><div class='del'>-	case CSR_HW_REV_TYPE_5350:</div><div class='del'>-		/* 5X50 wants in Kelvin */</div><div class='add'>+		/* 5150 wants in Kelvin */</div><div class='ctx'> 		priv-&gt;hw_params.ct_kill_threshold =</div><div class='ctx'> 				CELSIUS_TO_KELVIN(CT_KILL_THRESHOLD);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1614,6 +1569,8 @@ struct iwl_cfg iwl5350_agn_cfg = {</div><div class='ctx'> 	.mod_params = &amp;iwl50_mod_params,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+MODULE_FIRMWARE("iwlwifi-5000" IWL5000_UCODE_API ".ucode");</div><div class='add'>+</div><div class='ctx'> module_param_named(disable50, iwl50_mod_params.disable, int, 0444);</div><div class='ctx'> MODULE_PARM_DESC(disable50,</div><div class='ctx'> 		  "manually disable the 50XX radio (default 0 [radio on])");</div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c<br/>index 90a2b6dee7c0..e2a58e477036 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-agn-rs.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/iwlwifi/iwl-agn-rs.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-agn-rs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/iwlwifi/iwl-agn-rs.c</a></div><div class='hunk'>@@ -35,8 +35,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "../net/mac80211/rate.h"</div><div class='del'>-</div><div class='ctx'> #include "iwl-dev.h"</div><div class='ctx'> #include "iwl-sta.h"</div><div class='ctx'> #include "iwl-core.h"</div><div class='hunk'>@@ -163,12 +161,15 @@ struct iwl_lq_sta {</div><div class='ctx'> 	u32 dbg_fixed_rate;</div><div class='ctx'> #endif</div><div class='ctx'> 	struct iwl_priv *drv;</div><div class='add'>+</div><div class='add'>+	/* used to be in sta_info */</div><div class='add'>+	int last_txrate_idx;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void rs_rate_scale_perform(struct iwl_priv *priv,</div><div class='del'>-				   struct net_device *dev,</div><div class='ctx'> 				   struct ieee80211_hdr *hdr,</div><div class='del'>-				   struct sta_info *sta);</div><div class='add'>+				   struct ieee80211_sta *sta,</div><div class='add'>+				   struct iwl_lq_sta *lq_sta);</div><div class='ctx'> static void rs_fill_link_cmd(const struct iwl_priv *priv,</div><div class='ctx'> 			     struct iwl_lq_sta *lq_sta, u32 rate_n_flags);</div><div class='ctx'> </div><div class='hunk'>@@ -354,17 +355,11 @@ static u32 rs_tl_get_load(struct iwl_lq_sta *lq_data, u8 tid)</div><div class='ctx'> </div><div class='ctx'> static void rs_tl_turn_on_agg_for_tid(struct iwl_priv *priv,</div><div class='ctx'> 				      struct iwl_lq_sta *lq_data, u8 tid,</div><div class='del'>-				      struct sta_info *sta)</div><div class='add'>+				      struct ieee80211_sta *sta)</div><div class='ctx'> {</div><div class='del'>-	unsigned long state;</div><div class='ctx'> 	DECLARE_MAC_BUF(mac);</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;sta-&gt;lock);</div><div class='del'>-	state = sta-&gt;ampdu_mlme.tid_state_tx[tid];</div><div class='del'>-	spin_unlock_bh(&amp;sta-&gt;lock);</div><div class='del'>-</div><div class='del'>-	if (state == HT_AGG_STATE_IDLE &amp;&amp;</div><div class='del'>-	    rs_tl_get_load(lq_data, tid) &gt; IWL_AGG_LOAD_THRESHOLD) {</div><div class='add'>+	if (rs_tl_get_load(lq_data, tid) &gt; IWL_AGG_LOAD_THRESHOLD) {</div><div class='ctx'> 		IWL_DEBUG_HT("Starting Tx agg: STA: %s tid: %d\n",</div><div class='ctx'> 				print_mac(mac, sta-&gt;addr), tid);</div><div class='ctx'> 		ieee80211_start_tx_ba_session(priv-&gt;hw, sta-&gt;addr, tid);</div><div class='hunk'>@@ -373,7 +368,7 @@ static void rs_tl_turn_on_agg_for_tid(struct iwl_priv *priv,</div><div class='ctx'> </div><div class='ctx'> static void rs_tl_turn_on_agg(struct iwl_priv *priv, u8 tid,</div><div class='ctx'> 			      struct iwl_lq_sta *lq_data,</div><div class='del'>-			      struct sta_info *sta)</div><div class='add'>+			      struct ieee80211_sta *sta)</div><div class='ctx'> {</div><div class='ctx'> 	if ((tid &lt; TID_MAX_LOAD_COUNT))</div><div class='ctx'> 		rs_tl_turn_on_agg_for_tid(priv, lq_data, tid, sta);</div><div class='hunk'>@@ -436,7 +431,7 @@ static int rs_collect_tx_data(struct iwl_rate_scale_data *windows,</div><div class='ctx'> 		/* Shift bitmap by one frame (throw away oldest history),</div><div class='ctx'> 		 * OR in "1", and increment "success" if this</div><div class='ctx'> 		 * frame was successful. */</div><div class='del'>-		window-&gt;data &lt;&lt;= 1;;</div><div class='add'>+		window-&gt;data &lt;&lt;= 1;</div><div class='ctx'> 		if (successes &gt; 0) {</div><div class='ctx'> 			window-&gt;success_counter++;</div><div class='ctx'> 			window-&gt;data |= 0x1;</div><div class='hunk'>@@ -773,7 +768,8 @@ out:</div><div class='ctx'> /*</div><div class='ctx'>  * mac80211 sends us Tx status</div><div class='ctx'>  */</div><div class='del'>-static void rs_tx_status(void *priv_rate, struct net_device *dev,</div><div class='add'>+static void rs_tx_status(void *priv_r, struct ieee80211_supported_band *sband,</div><div class='add'>+			 struct ieee80211_sta *sta, void *priv_sta,</div><div class='ctx'> 			 struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	int status;</div><div class='hunk'>@@ -781,11 +777,9 @@ static void rs_tx_status(void *priv_rate, struct net_device *dev,</div><div class='ctx'> 	int rs_index, index = 0;</div><div class='ctx'> 	struct iwl_lq_sta *lq_sta;</div><div class='ctx'> 	struct iwl_link_quality_cmd *table;</div><div class='del'>-	struct sta_info *sta;</div><div class='ctx'> 	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb-&gt;data;</div><div class='del'>-	struct iwl_priv *priv = (struct iwl_priv *)priv_rate;</div><div class='del'>-	struct ieee80211_local *local = wdev_priv(dev-&gt;ieee80211_ptr);</div><div class='del'>-	struct ieee80211_hw *hw = local_to_hw(local);</div><div class='add'>+	struct iwl_priv *priv = (struct iwl_priv *)priv_r;</div><div class='add'>+	struct ieee80211_hw *hw = priv-&gt;hw;</div><div class='ctx'> 	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);</div><div class='ctx'> 	struct iwl_rate_scale_data *window = NULL;</div><div class='ctx'> 	struct iwl_rate_scale_data *search_win = NULL;</div><div class='hunk'>@@ -811,17 +805,9 @@ static void rs_tx_status(void *priv_rate, struct net_device *dev,</div><div class='ctx'> 	if (retries &gt; 15)</div><div class='ctx'> 		retries = 15;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='add'>+	lq_sta = (struct iwl_lq_sta *)priv_sta;</div><div class='ctx'> </div><div class='del'>-	sta = sta_info_get(local, hdr-&gt;addr1);</div><div class='del'>-</div><div class='del'>-	if (!sta || !sta-&gt;rate_ctrl_priv)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	lq_sta = (struct iwl_lq_sta *)sta-&gt;rate_ctrl_priv;</div><div class='del'>-</div><div class='del'>-	if ((priv-&gt;iw_mode == IEEE80211_IF_TYPE_IBSS) &amp;&amp;</div><div class='add'>+	if ((priv-&gt;iw_mode == NL80211_IFTYPE_ADHOC) &amp;&amp;</div><div class='ctx'> 	    !lq_sta-&gt;ibss_sta_added)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -965,9 +951,8 @@ static void rs_tx_status(void *priv_rate, struct net_device *dev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* See if there's a better rate or modulation mode to try. */</div><div class='del'>-	rs_rate_scale_perform(priv, dev, hdr, sta);</div><div class='add'>+	rs_rate_scale_perform(priv, hdr, sta, lq_sta);</div><div class='ctx'> out:</div><div class='del'>-	rcu_read_unlock();</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1128,6 +1113,7 @@ static s32 rs_get_best_rate(struct iwl_priv *priv,</div><div class='ctx'> </div><div class='ctx'> 			/* Higher rate not available, use the original */</div><div class='ctx'> 			} else {</div><div class='add'>+				new_rate = rate;</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1142,7 +1128,7 @@ static s32 rs_get_best_rate(struct iwl_priv *priv,</div><div class='ctx'> static int rs_switch_to_mimo2(struct iwl_priv *priv,</div><div class='ctx'> 			     struct iwl_lq_sta *lq_sta,</div><div class='ctx'> 			     struct ieee80211_conf *conf,</div><div class='del'>-			     struct sta_info *sta,</div><div class='add'>+			     struct ieee80211_sta *sta,</div><div class='ctx'> 			     struct iwl_scale_tbl_info *tbl, int index)</div><div class='ctx'> {</div><div class='ctx'> 	u16 rate_mask;</div><div class='hunk'>@@ -1153,8 +1139,8 @@ static int rs_switch_to_mimo2(struct iwl_priv *priv,</div><div class='ctx'> 	    !sta-&gt;ht_info.ht_supported)</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='del'>-	if (((sta-&gt;ht_info.cap &amp; IEEE80211_HT_CAP_MIMO_PS) &gt;&gt; 2)</div><div class='del'>-						== IWL_MIMO_PS_STATIC)</div><div class='add'>+	if (((sta-&gt;ht_info.cap &amp; IEEE80211_HT_CAP_SM_PS) &gt;&gt; 2)</div><div class='add'>+						== WLAN_HT_CAP_SM_PS_STATIC)</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='ctx'> 	/* Need both Tx chains/antennas to support MIMO */</div><div class='hunk'>@@ -1210,7 +1196,7 @@ static int rs_switch_to_mimo2(struct iwl_priv *priv,</div><div class='ctx'> static int rs_switch_to_siso(struct iwl_priv *priv,</div><div class='ctx'> 			     struct iwl_lq_sta *lq_sta,</div><div class='ctx'> 			     struct ieee80211_conf *conf,</div><div class='del'>-			     struct sta_info *sta,</div><div class='add'>+			     struct ieee80211_sta *sta,</div><div class='ctx'> 			     struct iwl_scale_tbl_info *tbl, int index)</div><div class='ctx'> {</div><div class='ctx'> 	u16 rate_mask;</div><div class='hunk'>@@ -1270,7 +1256,7 @@ static int rs_switch_to_siso(struct iwl_priv *priv,</div><div class='ctx'> static int rs_move_legacy_other(struct iwl_priv *priv,</div><div class='ctx'> 				struct iwl_lq_sta *lq_sta,</div><div class='ctx'> 				struct ieee80211_conf *conf,</div><div class='del'>-				struct sta_info *sta,</div><div class='add'>+				struct ieee80211_sta *sta,</div><div class='ctx'> 				int index)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_scale_tbl_info *tbl = &amp;(lq_sta-&gt;lq_info[lq_sta-&gt;active_tbl]);</div><div class='hunk'>@@ -1281,15 +1267,23 @@ static int rs_move_legacy_other(struct iwl_priv *priv,</div><div class='ctx'> 		  (sizeof(struct iwl_rate_scale_data) * IWL_RATE_COUNT));</div><div class='ctx'> 	u8 start_action = tbl-&gt;action;</div><div class='ctx'> 	u8 valid_tx_ant = priv-&gt;hw_params.valid_tx_ant;</div><div class='add'>+	u8 tx_chains_num = priv-&gt;hw_params.tx_chains_num;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	for (; ;) {</div><div class='ctx'> 		switch (tbl-&gt;action) {</div><div class='del'>-		case IWL_LEGACY_SWITCH_ANTENNA:</div><div class='add'>+		case IWL_LEGACY_SWITCH_ANTENNA1:</div><div class='add'>+		case IWL_LEGACY_SWITCH_ANTENNA2:</div><div class='ctx'> 			IWL_DEBUG_RATE("LQ: Legacy toggle Antenna\n");</div><div class='ctx'> </div><div class='ctx'> 			lq_sta-&gt;action_counter++;</div><div class='ctx'> </div><div class='add'>+			if ((tbl-&gt;action == IWL_LEGACY_SWITCH_ANTENNA1 &amp;&amp;</div><div class='add'>+							tx_chains_num &lt;= 1) ||</div><div class='add'>+			    (tbl-&gt;action == IWL_LEGACY_SWITCH_ANTENNA2 &amp;&amp;</div><div class='add'>+							tx_chains_num &lt;= 2))</div><div class='add'>+				break;</div><div class='add'>+</div><div class='ctx'> 			/* Don't change antenna if success has been great */</div><div class='ctx'> 			if (window-&gt;success_ratio &gt;= IWL_RS_GOOD_RATIO)</div><div class='ctx'> 				break;</div><div class='hunk'>@@ -1299,7 +1293,7 @@ static int rs_move_legacy_other(struct iwl_priv *priv,</div><div class='ctx'> </div><div class='ctx'> 			if (rs_toggle_antenna(valid_tx_ant,</div><div class='ctx'> 				&amp;search_tbl-&gt;current_rate, search_tbl)) {</div><div class='del'>-				lq_sta-&gt;search_better_tbl = 1;</div><div class='add'>+				rs_set_expected_tpt_table(lq_sta, search_tbl);</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			}</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -1312,43 +1306,54 @@ static int rs_move_legacy_other(struct iwl_priv *priv,</div><div class='ctx'> 			ret = rs_switch_to_siso(priv, lq_sta, conf, sta,</div><div class='ctx'> 						 search_tbl, index);</div><div class='ctx'> 			if (!ret) {</div><div class='del'>-				lq_sta-&gt;search_better_tbl = 1;</div><div class='ctx'> 				lq_sta-&gt;action_counter = 0;</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			break;</div><div class='del'>-		case IWL_LEGACY_SWITCH_MIMO2:</div><div class='add'>+		case IWL_LEGACY_SWITCH_MIMO2_AB:</div><div class='add'>+		case IWL_LEGACY_SWITCH_MIMO2_AC:</div><div class='add'>+		case IWL_LEGACY_SWITCH_MIMO2_BC:</div><div class='ctx'> 			IWL_DEBUG_RATE("LQ: Legacy switch to MIMO2\n");</div><div class='ctx'> </div><div class='ctx'> 			/* Set up search table to try MIMO */</div><div class='ctx'> 			memcpy(search_tbl, tbl, sz);</div><div class='ctx'> 			search_tbl-&gt;is_SGI = 0;</div><div class='del'>-			search_tbl-&gt;ant_type = ANT_AB;/*FIXME:RS*/</div><div class='del'>-				/*FIXME:RS:need to check ant validity*/</div><div class='add'>+</div><div class='add'>+			if (tbl-&gt;action == IWL_LEGACY_SWITCH_MIMO2_AB)</div><div class='add'>+				search_tbl-&gt;ant_type = ANT_AB;</div><div class='add'>+			else if (tbl-&gt;action == IWL_LEGACY_SWITCH_MIMO2_AC)</div><div class='add'>+				search_tbl-&gt;ant_type = ANT_AC;</div><div class='add'>+			else</div><div class='add'>+				search_tbl-&gt;ant_type = ANT_BC;</div><div class='add'>+</div><div class='add'>+			if (!rs_is_valid_ant(valid_tx_ant, search_tbl-&gt;ant_type))</div><div class='add'>+				break;</div><div class='add'>+</div><div class='ctx'> 			ret = rs_switch_to_mimo2(priv, lq_sta, conf, sta,</div><div class='ctx'> 						 search_tbl, index);</div><div class='ctx'> 			if (!ret) {</div><div class='del'>-				lq_sta-&gt;search_better_tbl = 1;</div><div class='ctx'> 				lq_sta-&gt;action_counter = 0;</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			}</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		tbl-&gt;action++;</div><div class='del'>-		if (tbl-&gt;action &gt; IWL_LEGACY_SWITCH_MIMO2)</div><div class='del'>-			tbl-&gt;action = IWL_LEGACY_SWITCH_ANTENNA;</div><div class='add'>+		if (tbl-&gt;action &gt; IWL_LEGACY_SWITCH_MIMO2_BC)</div><div class='add'>+			tbl-&gt;action = IWL_LEGACY_SWITCH_ANTENNA1;</div><div class='ctx'> </div><div class='ctx'> 		if (tbl-&gt;action == start_action)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 	}</div><div class='add'>+	search_tbl-&gt;lq_type = LQ_NONE;</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>- out:</div><div class='add'>+out:</div><div class='add'>+	lq_sta-&gt;search_better_tbl = 1;</div><div class='ctx'> 	tbl-&gt;action++;</div><div class='del'>-	if (tbl-&gt;action &gt; IWL_LEGACY_SWITCH_MIMO2)</div><div class='del'>-		tbl-&gt;action = IWL_LEGACY_SWITCH_ANTENNA;</div><div class='add'>+	if (tbl-&gt;action &gt; IWL_LEGACY_SWITCH_MIMO2_BC)</div><div class='add'>+		tbl-&gt;action = IWL_LEGACY_SWITCH_ANTENNA1;</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> }</div><div class='hunk'>@@ -1359,7 +1364,7 @@ static int rs_move_legacy_other(struct iwl_priv *priv,</div><div class='ctx'> static int rs_move_siso_to_other(struct iwl_priv *priv,</div><div class='ctx'> 				 struct iwl_lq_sta *lq_sta,</div><div class='ctx'> 				 struct ieee80211_conf *conf,</div><div class='del'>-				 struct sta_info *sta, int index)</div><div class='add'>+				 struct ieee80211_sta *sta, int index)</div><div class='ctx'> {</div><div class='ctx'> 	u8 is_green = lq_sta-&gt;is_green;</div><div class='ctx'> 	struct iwl_scale_tbl_info *tbl = &amp;(lq_sta-&gt;lq_info[lq_sta-&gt;active_tbl]);</div><div class='hunk'>@@ -1370,34 +1375,51 @@ static int rs_move_siso_to_other(struct iwl_priv *priv,</div><div class='ctx'> 		  (sizeof(struct iwl_rate_scale_data) * IWL_RATE_COUNT));</div><div class='ctx'> 	u8 start_action = tbl-&gt;action;</div><div class='ctx'> 	u8 valid_tx_ant = priv-&gt;hw_params.valid_tx_ant;</div><div class='add'>+	u8 tx_chains_num = priv-&gt;hw_params.tx_chains_num;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	for (;;) {</div><div class='ctx'> 		lq_sta-&gt;action_counter++;</div><div class='ctx'> 		switch (tbl-&gt;action) {</div><div class='del'>-		case IWL_SISO_SWITCH_ANTENNA:</div><div class='add'>+		case IWL_SISO_SWITCH_ANTENNA1:</div><div class='add'>+		case IWL_SISO_SWITCH_ANTENNA2:</div><div class='ctx'> 			IWL_DEBUG_RATE("LQ: SISO toggle Antenna\n");</div><div class='add'>+</div><div class='add'>+			if ((tbl-&gt;action == IWL_SISO_SWITCH_ANTENNA1 &amp;&amp;</div><div class='add'>+							tx_chains_num &lt;= 1) ||</div><div class='add'>+			    (tbl-&gt;action == IWL_SISO_SWITCH_ANTENNA2 &amp;&amp;</div><div class='add'>+							tx_chains_num &lt;= 2))</div><div class='add'>+				break;</div><div class='add'>+</div><div class='ctx'> 			if (window-&gt;success_ratio &gt;= IWL_RS_GOOD_RATIO)</div><div class='ctx'> 				break;</div><div class='ctx'> </div><div class='ctx'> 			memcpy(search_tbl, tbl, sz);</div><div class='ctx'> 			if (rs_toggle_antenna(valid_tx_ant,</div><div class='del'>-				       &amp;search_tbl-&gt;current_rate, search_tbl)) {</div><div class='del'>-				lq_sta-&gt;search_better_tbl = 1;</div><div class='add'>+				       &amp;search_tbl-&gt;current_rate, search_tbl))</div><div class='ctx'> 				goto out;</div><div class='del'>-			}</div><div class='ctx'> 			break;</div><div class='del'>-		case IWL_SISO_SWITCH_MIMO2:</div><div class='add'>+		case IWL_SISO_SWITCH_MIMO2_AB:</div><div class='add'>+		case IWL_SISO_SWITCH_MIMO2_AC:</div><div class='add'>+		case IWL_SISO_SWITCH_MIMO2_BC:</div><div class='ctx'> 			IWL_DEBUG_RATE("LQ: SISO switch to MIMO2\n");</div><div class='ctx'> 			memcpy(search_tbl, tbl, sz);</div><div class='ctx'> 			search_tbl-&gt;is_SGI = 0;</div><div class='del'>-			search_tbl-&gt;ant_type = ANT_AB; /*FIXME:RS*/</div><div class='add'>+</div><div class='add'>+			if (tbl-&gt;action == IWL_SISO_SWITCH_MIMO2_AB)</div><div class='add'>+				search_tbl-&gt;ant_type = ANT_AB;</div><div class='add'>+			else if (tbl-&gt;action == IWL_SISO_SWITCH_MIMO2_AC)</div><div class='add'>+				search_tbl-&gt;ant_type = ANT_AC;</div><div class='add'>+			else</div><div class='add'>+				search_tbl-&gt;ant_type = ANT_BC;</div><div class='add'>+</div><div class='add'>+			if (!rs_is_valid_ant(valid_tx_ant, search_tbl-&gt;ant_type))</div><div class='add'>+				break;</div><div class='add'>+</div><div class='ctx'> 			ret = rs_switch_to_mimo2(priv, lq_sta, conf, sta,</div><div class='ctx'> 						 search_tbl, index);</div><div class='del'>-			if (!ret) {</div><div class='del'>-				lq_sta-&gt;search_better_tbl = 1;</div><div class='add'>+			if (!ret)</div><div class='ctx'> 				goto out;</div><div class='del'>-			}</div><div class='ctx'> 			break;</div><div class='ctx'> 		case IWL_SISO_SWITCH_GI:</div><div class='ctx'> 			if (!tbl-&gt;is_fat &amp;&amp;</div><div class='hunk'>@@ -1427,22 +1449,23 @@ static int rs_move_siso_to_other(struct iwl_priv *priv,</div><div class='ctx'> 			}</div><div class='ctx'> 			search_tbl-&gt;current_rate = rate_n_flags_from_tbl(</div><div class='ctx'> 						search_tbl, index, is_green);</div><div class='del'>-			lq_sta-&gt;search_better_tbl = 1;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> 		tbl-&gt;action++;</div><div class='ctx'> 		if (tbl-&gt;action &gt; IWL_SISO_SWITCH_GI)</div><div class='del'>-			tbl-&gt;action = IWL_SISO_SWITCH_ANTENNA;</div><div class='add'>+			tbl-&gt;action = IWL_SISO_SWITCH_ANTENNA1;</div><div class='ctx'> </div><div class='ctx'> 		if (tbl-&gt;action == start_action)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='add'>+	search_tbl-&gt;lq_type = LQ_NONE;</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'>  out:</div><div class='add'>+	lq_sta-&gt;search_better_tbl = 1;</div><div class='ctx'> 	tbl-&gt;action++;</div><div class='ctx'> 	if (tbl-&gt;action &gt; IWL_SISO_SWITCH_GI)</div><div class='del'>-		tbl-&gt;action = IWL_SISO_SWITCH_ANTENNA;</div><div class='add'>+		tbl-&gt;action = IWL_SISO_SWITCH_ANTENNA1;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1452,43 +1475,64 @@ static int rs_move_siso_to_other(struct iwl_priv *priv,</div><div class='ctx'> static int rs_move_mimo_to_other(struct iwl_priv *priv,</div><div class='ctx'> 				 struct iwl_lq_sta *lq_sta,</div><div class='ctx'> 				 struct ieee80211_conf *conf,</div><div class='del'>-				 struct sta_info *sta, int index)</div><div class='add'>+				 struct ieee80211_sta *sta, int index)</div><div class='ctx'> {</div><div class='ctx'> 	s8 is_green = lq_sta-&gt;is_green;</div><div class='ctx'> 	struct iwl_scale_tbl_info *tbl = &amp;(lq_sta-&gt;lq_info[lq_sta-&gt;active_tbl]);</div><div class='ctx'> 	struct iwl_scale_tbl_info *search_tbl =</div><div class='ctx'> 				&amp;(lq_sta-&gt;lq_info[(1 - lq_sta-&gt;active_tbl)]);</div><div class='add'>+	struct iwl_rate_scale_data *window = &amp;(tbl-&gt;win[index]);</div><div class='ctx'> 	u32 sz = (sizeof(struct iwl_scale_tbl_info) -</div><div class='ctx'> 		  (sizeof(struct iwl_rate_scale_data) * IWL_RATE_COUNT));</div><div class='ctx'> 	u8 start_action = tbl-&gt;action;</div><div class='del'>-	/*u8 valid_tx_ant = priv-&gt;hw_params.valid_tx_ant;*/</div><div class='add'>+	u8 valid_tx_ant = priv-&gt;hw_params.valid_tx_ant;</div><div class='add'>+	u8 tx_chains_num = priv-&gt;hw_params.tx_chains_num;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	for (;;) {</div><div class='ctx'> 		lq_sta-&gt;action_counter++;</div><div class='ctx'> 		switch (tbl-&gt;action) {</div><div class='del'>-		case IWL_MIMO_SWITCH_ANTENNA_A:</div><div class='del'>-		case IWL_MIMO_SWITCH_ANTENNA_B:</div><div class='add'>+		case IWL_MIMO2_SWITCH_ANTENNA1:</div><div class='add'>+		case IWL_MIMO2_SWITCH_ANTENNA2:</div><div class='add'>+			IWL_DEBUG_RATE("LQ: MIMO toggle Antennas\n");</div><div class='add'>+</div><div class='add'>+			if (tx_chains_num &lt;= 2)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			if (window-&gt;success_ratio &gt;= IWL_RS_GOOD_RATIO)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			memcpy(search_tbl, tbl, sz);</div><div class='add'>+			if (rs_toggle_antenna(valid_tx_ant,</div><div class='add'>+				       &amp;search_tbl-&gt;current_rate, search_tbl))</div><div class='add'>+				goto out;</div><div class='add'>+			break;</div><div class='add'>+		case IWL_MIMO2_SWITCH_SISO_A:</div><div class='add'>+		case IWL_MIMO2_SWITCH_SISO_B:</div><div class='add'>+		case IWL_MIMO2_SWITCH_SISO_C:</div><div class='ctx'> 			IWL_DEBUG_RATE("LQ: MIMO2 switch to SISO\n");</div><div class='ctx'> </div><div class='ctx'> 			/* Set up new search table for SISO */</div><div class='ctx'> 			memcpy(search_tbl, tbl, sz);</div><div class='ctx'> </div><div class='del'>-			/*FIXME:RS:need to check ant validity + C*/</div><div class='del'>-			if (tbl-&gt;action == IWL_MIMO_SWITCH_ANTENNA_A)</div><div class='add'>+			if (tbl-&gt;action == IWL_MIMO2_SWITCH_SISO_A)</div><div class='ctx'> 				search_tbl-&gt;ant_type = ANT_A;</div><div class='del'>-			else</div><div class='add'>+			else if (tbl-&gt;action == IWL_MIMO2_SWITCH_SISO_B)</div><div class='ctx'> 				search_tbl-&gt;ant_type = ANT_B;</div><div class='add'>+			else</div><div class='add'>+				search_tbl-&gt;ant_type = ANT_C;</div><div class='add'>+</div><div class='add'>+			if (!rs_is_valid_ant(valid_tx_ant, search_tbl-&gt;ant_type))</div><div class='add'>+				break;</div><div class='ctx'> </div><div class='ctx'> 			ret = rs_switch_to_siso(priv, lq_sta, conf, sta,</div><div class='ctx'> 						 search_tbl, index);</div><div class='del'>-			if (!ret) {</div><div class='del'>-				lq_sta-&gt;search_better_tbl = 1;</div><div class='add'>+			if (!ret)</div><div class='ctx'> 				goto out;</div><div class='del'>-			}</div><div class='add'>+</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		case IWL_MIMO_SWITCH_GI:</div><div class='add'>+		case IWL_MIMO2_SWITCH_GI:</div><div class='ctx'> 			if (!tbl-&gt;is_fat &amp;&amp;</div><div class='ctx'> 				!(priv-&gt;current_ht_config.sgf &amp;</div><div class='ctx'> 						HT_SHORT_GI_20MHZ))</div><div class='hunk'>@@ -1517,23 +1561,23 @@ static int rs_move_mimo_to_other(struct iwl_priv *priv,</div><div class='ctx'> 			}</div><div class='ctx'> 			search_tbl-&gt;current_rate = rate_n_flags_from_tbl(</div><div class='ctx'> 						search_tbl, index, is_green);</div><div class='del'>-			lq_sta-&gt;search_better_tbl = 1;</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='ctx'> 		}</div><div class='ctx'> 		tbl-&gt;action++;</div><div class='del'>-		if (tbl-&gt;action &gt; IWL_MIMO_SWITCH_GI)</div><div class='del'>-			tbl-&gt;action = IWL_MIMO_SWITCH_ANTENNA_A;</div><div class='add'>+		if (tbl-&gt;action &gt; IWL_MIMO2_SWITCH_GI)</div><div class='add'>+			tbl-&gt;action = IWL_MIMO2_SWITCH_ANTENNA1;</div><div class='ctx'> </div><div class='ctx'> 		if (tbl-&gt;action == start_action)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='add'>+	search_tbl-&gt;lq_type = LQ_NONE;</div><div class='ctx'> 	return 0;</div><div class='ctx'>  out:</div><div class='add'>+	lq_sta-&gt;search_better_tbl = 1;</div><div class='ctx'> 	tbl-&gt;action++;</div><div class='del'>-	if (tbl-&gt;action &gt; IWL_MIMO_SWITCH_GI)</div><div class='del'>-		tbl-&gt;action = IWL_MIMO_SWITCH_ANTENNA_A;</div><div class='add'>+	if (tbl-&gt;action &gt; IWL_MIMO2_SWITCH_GI)</div><div class='add'>+		tbl-&gt;action = IWL_MIMO2_SWITCH_ANTENNA1;</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> }</div><div class='hunk'>@@ -1624,12 +1668,11 @@ static void rs_stay_in_table(struct iwl_lq_sta *lq_sta)</div><div class='ctx'>  * Do rate scaling and search for new modulation mode.</div><div class='ctx'>  */</div><div class='ctx'> static void rs_rate_scale_perform(struct iwl_priv *priv,</div><div class='del'>-				  struct net_device *dev,</div><div class='ctx'> 				  struct ieee80211_hdr *hdr,</div><div class='del'>-				  struct sta_info *sta)</div><div class='add'>+				  struct ieee80211_sta *sta,</div><div class='add'>+				  struct iwl_lq_sta *lq_sta)</div><div class='ctx'> {</div><div class='del'>-	struct ieee80211_local *local = wdev_priv(dev-&gt;ieee80211_ptr);</div><div class='del'>-	struct ieee80211_hw *hw = local_to_hw(local);</div><div class='add'>+	struct ieee80211_hw *hw = priv-&gt;hw;</div><div class='ctx'> 	struct ieee80211_conf *conf = &amp;hw-&gt;conf;</div><div class='ctx'> 	int low = IWL_RATE_INVALID;</div><div class='ctx'> 	int high = IWL_RATE_INVALID;</div><div class='hunk'>@@ -1644,7 +1687,6 @@ static void rs_rate_scale_perform(struct iwl_priv *priv,</div><div class='ctx'> 	__le16 fc;</div><div class='ctx'> 	u16 rate_mask;</div><div class='ctx'> 	u8 update_lq = 0;</div><div class='del'>-	struct iwl_lq_sta *lq_sta;</div><div class='ctx'> 	struct iwl_scale_tbl_info *tbl, *tbl1;</div><div class='ctx'> 	u16 rate_scale_index_msk = 0;</div><div class='ctx'> 	u32 rate;</div><div class='hunk'>@@ -1665,10 +1707,10 @@ static void rs_rate_scale_perform(struct iwl_priv *priv,</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!sta || !sta-&gt;rate_ctrl_priv)</div><div class='add'>+	if (!sta || !lq_sta)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	lq_sta = (struct iwl_lq_sta *)sta-&gt;rate_ctrl_priv;</div><div class='add'>+	lq_sta-&gt;supp_rates = sta-&gt;supp_rates[lq_sta-&gt;band];</div><div class='ctx'> </div><div class='ctx'> 	tid = rs_tl_add_packet(lq_sta, hdr);</div><div class='ctx'> </div><div class='hunk'>@@ -1686,7 +1728,7 @@ static void rs_rate_scale_perform(struct iwl_priv *priv,</div><div class='ctx'> 	is_green = lq_sta-&gt;is_green;</div><div class='ctx'> </div><div class='ctx'> 	/* current tx rate */</div><div class='del'>-	index = sta-&gt;last_txrate_idx;</div><div class='add'>+	index = lq_sta-&gt;last_txrate_idx;</div><div class='ctx'> </div><div class='ctx'> 	IWL_DEBUG_RATE("Rate scale index %d for type %d\n", index,</div><div class='ctx'> 		       tbl-&gt;lq_type);</div><div class='hunk'>@@ -1747,19 +1789,13 @@ static void rs_rate_scale_perform(struct iwl_priv *priv,</div><div class='ctx'> 		rs_stay_in_table(lq_sta);</div><div class='ctx'> </div><div class='ctx'> 		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Else we have enough samples; calculate estimate of</div><div class='ctx'> 	 * actual average throughput */</div><div class='del'>-	} else {</div><div class='del'>-		/*FIXME:RS remove this else if we don't get this error*/</div><div class='del'>-		if (window-&gt;average_tpt != ((window-&gt;success_ratio *</div><div class='del'>-				tbl-&gt;expected_tpt[index] + 64) / 128)) {</div><div class='del'>-			IWL_ERROR("expected_tpt should have been calculated"</div><div class='del'>-								" by now\n");</div><div class='del'>-			window-&gt;average_tpt = ((window-&gt;success_ratio *</div><div class='del'>-					tbl-&gt;expected_tpt[index] + 64) / 128);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+</div><div class='add'>+	BUG_ON(window-&gt;average_tpt != ((window-&gt;success_ratio *</div><div class='add'>+			tbl-&gt;expected_tpt[index] + 64) / 128));</div><div class='ctx'> </div><div class='ctx'> 	/* If we are searching for better modulation mode, check success. */</div><div class='ctx'> 	if (lq_sta-&gt;search_better_tbl) {</div><div class='hunk'>@@ -1769,7 +1805,7 @@ static void rs_rate_scale_perform(struct iwl_priv *priv,</div><div class='ctx'> 		 * continuing to use the setup that we've been trying. */</div><div class='ctx'> 		if (window-&gt;average_tpt &gt; lq_sta-&gt;last_tpt) {</div><div class='ctx'> </div><div class='del'>-			IWL_DEBUG_RATE("LQ: SWITCHING TO CURRENT TABLE "</div><div class='add'>+			IWL_DEBUG_RATE("LQ: SWITCHING TO NEW TABLE "</div><div class='ctx'> 					"suc=%d cur-tpt=%d old-tpt=%d\n",</div><div class='ctx'> 					window-&gt;success_ratio,</div><div class='ctx'> 					window-&gt;average_tpt,</div><div class='hunk'>@@ -2005,15 +2041,7 @@ lq_update:</div><div class='ctx'> out:</div><div class='ctx'> 	tbl-&gt;current_rate = rate_n_flags_from_tbl(tbl, index, is_green);</div><div class='ctx'> 	i = index;</div><div class='del'>-	sta-&gt;last_txrate_idx = i;</div><div class='del'>-</div><div class='del'>-	/* sta-&gt;txrate_idx is an index to A mode rates which start</div><div class='del'>-	 * at IWL_FIRST_OFDM_RATE</div><div class='del'>-	 */</div><div class='del'>-	if (lq_sta-&gt;band == IEEE80211_BAND_5GHZ)</div><div class='del'>-		sta-&gt;txrate_idx = i - IWL_FIRST_OFDM_RATE;</div><div class='del'>-	else</div><div class='del'>-		sta-&gt;txrate_idx = i;</div><div class='add'>+	lq_sta-&gt;last_txrate_idx = i;</div><div class='ctx'> </div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='hunk'>@@ -2021,9 +2049,9 @@ out:</div><div class='ctx'> </div><div class='ctx'> static void rs_initialize_lq(struct iwl_priv *priv,</div><div class='ctx'> 			     struct ieee80211_conf *conf,</div><div class='del'>-			     struct sta_info *sta)</div><div class='add'>+			     struct ieee80211_sta *sta,</div><div class='add'>+			     struct iwl_lq_sta *lq_sta)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_lq_sta *lq_sta;</div><div class='ctx'> 	struct iwl_scale_tbl_info *tbl;</div><div class='ctx'> 	int rate_idx;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -2032,14 +2060,13 @@ static void rs_initialize_lq(struct iwl_priv *priv,</div><div class='ctx'> 	u8 active_tbl = 0;</div><div class='ctx'> 	u8 valid_tx_ant;</div><div class='ctx'> </div><div class='del'>-	if (!sta || !sta-&gt;rate_ctrl_priv)</div><div class='add'>+	if (!sta || !lq_sta)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	lq_sta = (struct iwl_lq_sta *)sta-&gt;rate_ctrl_priv;</div><div class='del'>-	i = sta-&gt;last_txrate_idx;</div><div class='add'>+	i = lq_sta-&gt;last_txrate_idx;</div><div class='ctx'> </div><div class='ctx'> 	if ((lq_sta-&gt;lq.sta_id == 0xff) &amp;&amp;</div><div class='del'>-	    (priv-&gt;iw_mode == IEEE80211_IF_TYPE_IBSS))</div><div class='add'>+	    (priv-&gt;iw_mode == NL80211_IFTYPE_ADHOC))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	valid_tx_ant = priv-&gt;hw_params.valid_tx_ant;</div><div class='hunk'>@@ -2076,40 +2103,33 @@ static void rs_initialize_lq(struct iwl_priv *priv,</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void rs_get_rate(void *priv_rate, struct net_device *dev,</div><div class='del'>-			struct ieee80211_supported_band *sband,</div><div class='del'>-			struct sk_buff *skb,</div><div class='del'>-			struct rate_selection *sel)</div><div class='add'>+static void rs_get_rate(void *priv_r, struct ieee80211_supported_band *sband,</div><div class='add'>+			struct ieee80211_sta *sta, void *priv_sta,</div><div class='add'>+			struct sk_buff *skb, struct rate_selection *sel)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='ctx'> 	int i;</div><div class='del'>-	struct ieee80211_local *local = wdev_priv(dev-&gt;ieee80211_ptr);</div><div class='del'>-	struct ieee80211_conf *conf = &amp;local-&gt;hw.conf;</div><div class='add'>+	struct iwl_priv *priv = (struct iwl_priv *)priv_r;</div><div class='add'>+	struct ieee80211_conf *conf = &amp;priv-&gt;hw-&gt;conf;</div><div class='ctx'> 	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb-&gt;data;</div><div class='del'>-	struct sta_info *sta;</div><div class='ctx'> 	__le16 fc;</div><div class='del'>-	struct iwl_priv *priv = (struct iwl_priv *)priv_rate;</div><div class='ctx'> 	struct iwl_lq_sta *lq_sta;</div><div class='ctx'> </div><div class='ctx'> 	IWL_DEBUG_RATE_LIMIT("rate scale calculate new rate for skb\n");</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-</div><div class='del'>-	sta = sta_info_get(local, hdr-&gt;addr1);</div><div class='del'>-</div><div class='ctx'> 	/* Send management frames and broadcast/multicast data using lowest</div><div class='ctx'> 	 * rate. */</div><div class='ctx'> 	fc = hdr-&gt;frame_control;</div><div class='ctx'> 	if (!ieee80211_is_data(fc) || is_multicast_ether_addr(hdr-&gt;addr1) ||</div><div class='del'>-	    !sta || !sta-&gt;rate_ctrl_priv) {</div><div class='del'>-		sel-&gt;rate_idx = rate_lowest_index(local, sband, sta);</div><div class='del'>-		goto out;</div><div class='add'>+	    !sta || !priv_sta) {</div><div class='add'>+		sel-&gt;rate_idx = rate_lowest_index(sband, sta);</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	lq_sta = (struct iwl_lq_sta *)sta-&gt;rate_ctrl_priv;</div><div class='del'>-	i = sta-&gt;last_txrate_idx;</div><div class='add'>+	lq_sta = (struct iwl_lq_sta *)priv_sta;</div><div class='add'>+	i = lq_sta-&gt;last_txrate_idx;</div><div class='ctx'> </div><div class='del'>-	if ((priv-&gt;iw_mode == IEEE80211_IF_TYPE_IBSS) &amp;&amp;</div><div class='add'>+	if ((priv-&gt;iw_mode == NL80211_IFTYPE_ADHOC) &amp;&amp;</div><div class='ctx'> 	    !lq_sta-&gt;ibss_sta_added) {</div><div class='ctx'> 		u8 sta_id = iwl_find_station(priv, hdr-&gt;addr1);</div><div class='ctx'> 		DECLARE_MAC_BUF(mac);</div><div class='hunk'>@@ -2124,23 +2144,22 @@ static void rs_get_rate(void *priv_rate, struct net_device *dev,</div><div class='ctx'> 			lq_sta-&gt;lq.sta_id = sta_id;</div><div class='ctx'> 			lq_sta-&gt;lq.rs_table[0].rate_n_flags = 0;</div><div class='ctx'> 			lq_sta-&gt;ibss_sta_added = 1;</div><div class='del'>-			rs_initialize_lq(priv, conf, sta);</div><div class='add'>+			rs_initialize_lq(priv, conf, sta, lq_sta);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if ((i &lt; 0) || (i &gt; IWL_RATE_COUNT)) {</div><div class='del'>-		sel-&gt;rate_idx = rate_lowest_index(local, sband, sta);</div><div class='del'>-		goto out;</div><div class='add'>+		sel-&gt;rate_idx = rate_lowest_index(sband, sta);</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (sband-&gt;band == IEEE80211_BAND_5GHZ)</div><div class='ctx'> 		i -= IWL_FIRST_OFDM_RATE;</div><div class='ctx'> 	sel-&gt;rate_idx = i;</div><div class='del'>-out:</div><div class='del'>-	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void *rs_alloc_sta(void *priv_rate, gfp_t gfp)</div><div class='add'>+static void *rs_alloc_sta(void *priv_rate, struct ieee80211_sta *sta,</div><div class='add'>+			  gfp_t gfp)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_lq_sta *lq_sta;</div><div class='ctx'> 	struct iwl_priv *priv;</div><div class='hunk'>@@ -2163,33 +2182,28 @@ static void *rs_alloc_sta(void *priv_rate, gfp_t gfp)</div><div class='ctx'> 	return lq_sta;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void rs_rate_init(void *priv_rate, void *priv_sta,</div><div class='del'>-			 struct ieee80211_local *local,</div><div class='del'>-			 struct sta_info *sta)</div><div class='add'>+static void rs_rate_init(void *priv_r, struct ieee80211_supported_band *sband,</div><div class='add'>+			 struct ieee80211_sta *sta, void *priv_sta)</div><div class='ctx'> {</div><div class='ctx'> 	int i, j;</div><div class='del'>-	struct ieee80211_conf *conf = &amp;local-&gt;hw.conf;</div><div class='del'>-	struct ieee80211_supported_band *sband;</div><div class='del'>-	struct iwl_priv *priv = (struct iwl_priv *)priv_rate;</div><div class='add'>+	struct iwl_priv *priv = (struct iwl_priv *)priv_r;</div><div class='add'>+	struct ieee80211_conf *conf = &amp;priv-&gt;hw-&gt;conf;</div><div class='ctx'> 	struct iwl_lq_sta *lq_sta = priv_sta;</div><div class='ctx'> </div><div class='del'>-	sband = local-&gt;hw.wiphy-&gt;bands[local-&gt;hw.conf.channel-&gt;band];</div><div class='del'>-</div><div class='ctx'> 	lq_sta-&gt;flush_timer = 0;</div><div class='ctx'> 	lq_sta-&gt;supp_rates = sta-&gt;supp_rates[sband-&gt;band];</div><div class='del'>-	sta-&gt;txrate_idx = 3;</div><div class='ctx'> 	for (j = 0; j &lt; LQ_SIZE; j++)</div><div class='ctx'> 		for (i = 0; i &lt; IWL_RATE_COUNT; i++)</div><div class='ctx'> 			rs_rate_scale_clear_window(&amp;lq_sta-&gt;lq_info[j].win[i]);</div><div class='ctx'> </div><div class='del'>-	IWL_DEBUG_RATE("LQ: *** rate scale global init ***\n");</div><div class='add'>+	IWL_DEBUG_RATE("LQ: *** rate scale station global init ***\n");</div><div class='ctx'> 	/* TODO: what is a good starting rate for STA? About middle? Maybe not</div><div class='ctx'> 	 * the lowest or the highest rate.. Could consider using RSSI from</div><div class='ctx'> 	 * previous packets? Need to have IEEE 802.1X auth succeed immediately</div><div class='ctx'> 	 * after assoc.. */</div><div class='ctx'> </div><div class='ctx'> 	lq_sta-&gt;ibss_sta_added = 0;</div><div class='del'>-	if (priv-&gt;iw_mode == IEEE80211_IF_TYPE_AP) {</div><div class='add'>+	if (priv-&gt;iw_mode == NL80211_IFTYPE_AP) {</div><div class='ctx'> 		u8 sta_id = iwl_find_station(priv, sta-&gt;addr);</div><div class='ctx'> 		DECLARE_MAC_BUF(mac);</div><div class='ctx'> </div><div class='hunk'>@@ -2212,15 +2226,14 @@ static void rs_rate_init(void *priv_rate, void *priv_sta,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Find highest tx rate supported by hardware and destination station */</div><div class='add'>+	lq_sta-&gt;last_txrate_idx = 3;</div><div class='ctx'> 	for (i = 0; i &lt; sband-&gt;n_bitrates; i++)</div><div class='ctx'> 		if (sta-&gt;supp_rates[sband-&gt;band] &amp; BIT(i))</div><div class='del'>-			sta-&gt;txrate_idx = i;</div><div class='add'>+			lq_sta-&gt;last_txrate_idx = i;</div><div class='ctx'> </div><div class='del'>-	sta-&gt;last_txrate_idx = sta-&gt;txrate_idx;</div><div class='del'>-	/* WTF is with this bogus comment? A doesn't have cck rates */</div><div class='del'>-	/* For MODE_IEEE80211A, cck rates are at end of rate table */</div><div class='del'>-	if (local-&gt;hw.conf.channel-&gt;band == IEEE80211_BAND_5GHZ)</div><div class='del'>-		sta-&gt;last_txrate_idx += IWL_FIRST_OFDM_RATE;</div><div class='add'>+	/* For MODE_IEEE80211A, skip over cck rates in global rate table */</div><div class='add'>+	if (sband-&gt;band == IEEE80211_BAND_5GHZ)</div><div class='add'>+		lq_sta-&gt;last_txrate_idx += IWL_FIRST_OFDM_RATE;</div><div class='ctx'> </div><div class='ctx'> 	lq_sta-&gt;is_dup = 0;</div><div class='ctx'> 	lq_sta-&gt;is_green = rs_use_green(priv, conf);</div><div class='hunk'>@@ -2260,7 +2273,7 @@ static void rs_rate_init(void *priv_rate, void *priv_sta,</div><div class='ctx'> 	lq_sta-&gt;tx_agg_tid_en = IWL_AGG_ALL_TID;</div><div class='ctx'> 	lq_sta-&gt;drv = priv;</div><div class='ctx'> </div><div class='del'>-	rs_initialize_lq(priv, conf, sta);</div><div class='add'>+	rs_initialize_lq(priv, conf, sta, lq_sta);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void rs_fill_link_cmd(const struct iwl_priv *priv,</div><div class='hunk'>@@ -2382,9 +2395,9 @@ static void rs_fill_link_cmd(const struct iwl_priv *priv,</div><div class='ctx'> 	lq_cmd-&gt;agg_params.agg_time_limit = cpu_to_le16(4000);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void *rs_alloc(struct ieee80211_local *local)</div><div class='add'>+static void *rs_alloc(struct ieee80211_hw *hw, struct dentry *debugfsdir)</div><div class='ctx'> {</div><div class='del'>-	return local-&gt;hw.priv;</div><div class='add'>+	return hw-&gt;priv;</div><div class='ctx'> }</div><div class='ctx'> /* rate scale requires free function to be implemented */</div><div class='ctx'> static void rs_free(void *priv_rate)</div><div class='hunk'>@@ -2405,12 +2418,12 @@ static void rs_clear(void *priv_rate)</div><div class='ctx'> #endif /* CONFIG_IWLWIFI_DEBUG */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void rs_free_sta(void *priv_rate, void *priv_sta)</div><div class='add'>+static void rs_free_sta(void *priv_r, struct ieee80211_sta *sta,</div><div class='add'>+			void *priv_sta)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_lq_sta *lq_sta = priv_sta;</div><div class='del'>-	struct iwl_priv *priv;</div><div class='add'>+	struct iwl_priv *priv __maybe_unused = priv_r;</div><div class='ctx'> </div><div class='del'>-	priv = (struct iwl_priv *)priv_rate;</div><div class='ctx'> 	IWL_DEBUG_RATE("enter\n");</div><div class='ctx'> 	kfree(lq_sta);</div><div class='ctx'> 	IWL_DEBUG_RATE("leave\n");</div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rs.h b/drivers/net/wireless/iwlwifi/iwl-agn-rs.h<br/>index 84d4d1e33755..d148d73635eb 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-agn-rs.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/iwlwifi/iwl-agn-rs.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-agn-rs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/iwlwifi/iwl-agn-rs.h</a></div><div class='hunk'>@@ -206,21 +206,28 @@ enum {</div><div class='ctx'> #define IWL_RATE_DECREASE_TH		1920	/*  15% */</div><div class='ctx'> </div><div class='ctx'> /* possible actions when in legacy mode */</div><div class='del'>-#define IWL_LEGACY_SWITCH_ANTENNA	0</div><div class='del'>-#define IWL_LEGACY_SWITCH_SISO		1</div><div class='del'>-#define IWL_LEGACY_SWITCH_MIMO2		2</div><div class='add'>+#define IWL_LEGACY_SWITCH_ANTENNA1      0</div><div class='add'>+#define IWL_LEGACY_SWITCH_ANTENNA2      1</div><div class='add'>+#define IWL_LEGACY_SWITCH_SISO          2</div><div class='add'>+#define IWL_LEGACY_SWITCH_MIMO2_AB      3</div><div class='add'>+#define IWL_LEGACY_SWITCH_MIMO2_AC      4</div><div class='add'>+#define IWL_LEGACY_SWITCH_MIMO2_BC      5</div><div class='ctx'> </div><div class='ctx'> /* possible actions when in siso mode */</div><div class='del'>-#define IWL_SISO_SWITCH_ANTENNA		0</div><div class='del'>-#define IWL_SISO_SWITCH_MIMO2		1</div><div class='del'>-#define IWL_SISO_SWITCH_GI		2</div><div class='add'>+#define IWL_SISO_SWITCH_ANTENNA1        0</div><div class='add'>+#define IWL_SISO_SWITCH_ANTENNA2        1</div><div class='add'>+#define IWL_SISO_SWITCH_MIMO2_AB        2</div><div class='add'>+#define IWL_SISO_SWITCH_MIMO2_AC        3</div><div class='add'>+#define IWL_SISO_SWITCH_MIMO2_BC        4</div><div class='add'>+#define IWL_SISO_SWITCH_GI              5</div><div class='ctx'> </div><div class='ctx'> /* possible actions when in mimo mode */</div><div class='del'>-#define IWL_MIMO_SWITCH_ANTENNA_A	0</div><div class='del'>-#define IWL_MIMO_SWITCH_ANTENNA_B	1</div><div class='del'>-#define IWL_MIMO_SWITCH_GI		2</div><div class='del'>-</div><div class='del'>-/*FIXME:RS:separate MIMO2/3 transitions*/</div><div class='add'>+#define IWL_MIMO2_SWITCH_ANTENNA1       0</div><div class='add'>+#define IWL_MIMO2_SWITCH_ANTENNA2       1</div><div class='add'>+#define IWL_MIMO2_SWITCH_SISO_A         2</div><div class='add'>+#define IWL_MIMO2_SWITCH_SISO_B         3</div><div class='add'>+#define IWL_MIMO2_SWITCH_SISO_C         4</div><div class='add'>+#define IWL_MIMO2_SWITCH_GI             5</div><div class='ctx'> </div><div class='ctx'> /*FIXME:RS:add posible acctions for MIMO3*/</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c<br/>index e01f048a02dd..24a1aeb6448f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-agn.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/iwlwifi/iwl-agn.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-agn.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/iwlwifi/iwl-agn.c</a></div><div class='hunk'>@@ -337,7 +337,7 @@ static int iwl4965_commit_rxon(struct iwl_priv *priv)</div><div class='ctx'> 	/* If we have set the ASSOC_MSK and we are in BSS mode then</div><div class='ctx'> 	 * add the IWL_AP_ID to the station rate table */</div><div class='ctx'> 	if (new_assoc) {</div><div class='del'>-		if (priv-&gt;iw_mode == IEEE80211_IF_TYPE_STA) {</div><div class='add'>+		if (priv-&gt;iw_mode == NL80211_IFTYPE_STATION) {</div><div class='ctx'> 			ret = iwl_rxon_add_station(priv,</div><div class='ctx'> 					   priv-&gt;active_rxon.bssid_addr, 1);</div><div class='ctx'> 			if (ret == IWL_INVALID_STATION) {</div><div class='hunk'>@@ -448,8 +448,8 @@ static unsigned int iwl_fill_beacon_frame(struct iwl_priv *priv,</div><div class='ctx'> 					  const u8 *dest, int left)</div><div class='ctx'> {</div><div class='ctx'> 	if (!iwl_is_associated(priv) || !priv-&gt;ibss_beacon ||</div><div class='del'>-	    ((priv-&gt;iw_mode != IEEE80211_IF_TYPE_IBSS) &amp;&amp;</div><div class='del'>-	     (priv-&gt;iw_mode != IEEE80211_IF_TYPE_AP)))</div><div class='add'>+	    ((priv-&gt;iw_mode != NL80211_IFTYPE_ADHOC) &amp;&amp;</div><div class='add'>+	     (priv-&gt;iw_mode != NL80211_IFTYPE_AP)))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (priv-&gt;ibss_beacon-&gt;len &gt; left)</div><div class='hunk'>@@ -485,7 +485,7 @@ static u8 iwl4965_rate_get_lowest_plcp(struct iwl_priv *priv)</div><div class='ctx'> 		return IWL_RATE_6M_PLCP;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-unsigned int iwl4965_hw_get_beacon_cmd(struct iwl_priv *priv,</div><div class='add'>+static unsigned int iwl4965_hw_get_beacon_cmd(struct iwl_priv *priv,</div><div class='ctx'> 				       struct iwl_frame *frame, u8 rate)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_tx_beacon_cmd *tx_beacon_cmd;</div><div class='hunk'>@@ -564,8 +564,6 @@ static void iwl4965_ht_conf(struct iwl_priv *priv,</div><div class='ctx'> 	if (!iwl_conf-&gt;is_ht)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	priv-&gt;ps_mode = (u8)((ht_conf-&gt;cap &amp; IEEE80211_HT_CAP_MIMO_PS) &gt;&gt; 2);</div><div class='del'>-</div><div class='ctx'> 	if (ht_conf-&gt;cap &amp; IEEE80211_HT_CAP_SGI_20)</div><div class='ctx'> 		iwl_conf-&gt;sgf |= HT_SHORT_GI_20MHZ;</div><div class='ctx'> 	if (ht_conf-&gt;cap &amp; IEEE80211_HT_CAP_SGI_40)</div><div class='hunk'>@@ -586,6 +584,8 @@ static void iwl4965_ht_conf(struct iwl_priv *priv,</div><div class='ctx'> 		iwl_conf-&gt;supported_chan_width = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	iwl_conf-&gt;sm_ps = (u8)((ht_conf-&gt;cap &amp; IEEE80211_HT_CAP_SM_PS) &gt;&gt; 2);</div><div class='add'>+</div><div class='ctx'> 	memcpy(iwl_conf-&gt;supp_mcs_set, ht_conf-&gt;supp_mcs_set, 16);</div><div class='ctx'> </div><div class='ctx'> 	iwl_conf-&gt;control_channel = ht_bss_conf-&gt;primary_channel;</div><div class='hunk'>@@ -672,7 +672,7 @@ static void iwl4965_setup_rxon_timing(struct iwl_priv *priv)</div><div class='ctx'> 	beacon_int = priv-&gt;beacon_int;</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;iw_mode == IEEE80211_IF_TYPE_STA) {</div><div class='add'>+	if (priv-&gt;iw_mode == NL80211_IFTYPE_STATION) {</div><div class='ctx'> 		if (beacon_int == 0) {</div><div class='ctx'> 			priv-&gt;rxon_timing.beacon_interval = cpu_to_le16(100);</div><div class='ctx'> 			priv-&gt;rxon_timing.beacon_init_val = cpu_to_le32(102400);</div><div class='hunk'>@@ -721,7 +721,7 @@ static void iwl_set_flags_for_band(struct iwl_priv *priv,</div><div class='ctx'> 		else</div><div class='ctx'> 			priv-&gt;staging_rxon.flags &amp;= ~RXON_FLG_SHORT_SLOT_MSK;</div><div class='ctx'> </div><div class='del'>-		if (priv-&gt;iw_mode == IEEE80211_IF_TYPE_IBSS)</div><div class='add'>+		if (priv-&gt;iw_mode == NL80211_IFTYPE_ADHOC)</div><div class='ctx'> 			priv-&gt;staging_rxon.flags &amp;= ~RXON_FLG_SHORT_SLOT_MSK;</div><div class='ctx'> </div><div class='ctx'> 		priv-&gt;staging_rxon.flags |= RXON_FLG_BAND_24G_MSK;</div><div class='hunk'>@@ -740,23 +740,23 @@ static void iwl4965_connection_init_rx_config(struct iwl_priv *priv)</div><div class='ctx'> 	memset(&amp;priv-&gt;staging_rxon, 0, sizeof(priv-&gt;staging_rxon));</div><div class='ctx'> </div><div class='ctx'> 	switch (priv-&gt;iw_mode) {</div><div class='del'>-	case IEEE80211_IF_TYPE_AP:</div><div class='add'>+	case NL80211_IFTYPE_AP:</div><div class='ctx'> 		priv-&gt;staging_rxon.dev_type = RXON_DEV_TYPE_AP;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case IEEE80211_IF_TYPE_STA:</div><div class='add'>+	case NL80211_IFTYPE_STATION:</div><div class='ctx'> 		priv-&gt;staging_rxon.dev_type = RXON_DEV_TYPE_ESS;</div><div class='ctx'> 		priv-&gt;staging_rxon.filter_flags = RXON_FILTER_ACCEPT_GRP_MSK;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case IEEE80211_IF_TYPE_IBSS:</div><div class='add'>+	case NL80211_IFTYPE_ADHOC:</div><div class='ctx'> 		priv-&gt;staging_rxon.dev_type = RXON_DEV_TYPE_IBSS;</div><div class='ctx'> 		priv-&gt;staging_rxon.flags = RXON_FLG_SHORT_PREAMBLE_MSK;</div><div class='ctx'> 		priv-&gt;staging_rxon.filter_flags = RXON_FILTER_BCON_AWARE_MSK |</div><div class='ctx'> 						  RXON_FILTER_ACCEPT_GRP_MSK;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case IEEE80211_IF_TYPE_MNTR:</div><div class='add'>+	case NL80211_IFTYPE_MONITOR:</div><div class='ctx'> 		priv-&gt;staging_rxon.dev_type = RXON_DEV_TYPE_SNIFFER;</div><div class='ctx'> 		priv-&gt;staging_rxon.filter_flags = RXON_FILTER_PROMISC_MSK |</div><div class='ctx'> 		    RXON_FILTER_CTL2HOST_MSK | RXON_FILTER_ACCEPT_GRP_MSK;</div><div class='hunk'>@@ -785,7 +785,7 @@ static void iwl4965_connection_init_rx_config(struct iwl_priv *priv)</div><div class='ctx'> 	 * in some case A channels are all non IBSS</div><div class='ctx'> 	 * in this case force B/G channel</div><div class='ctx'> 	 */</div><div class='del'>-	if ((priv-&gt;iw_mode == IEEE80211_IF_TYPE_IBSS) &amp;&amp;</div><div class='add'>+	if ((priv-&gt;iw_mode == NL80211_IFTYPE_ADHOC) &amp;&amp;</div><div class='ctx'> 	    !(is_channel_ibss(ch_info)))</div><div class='ctx'> 		ch_info = &amp;priv-&gt;channel_info[0];</div><div class='ctx'> </div><div class='hunk'>@@ -1182,7 +1182,7 @@ static void iwl4965_rx_beacon_notif(struct iwl_priv *priv,</div><div class='ctx'> 		le32_to_cpu(beacon-&gt;low_tsf), rate);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	if ((priv-&gt;iw_mode == IEEE80211_IF_TYPE_AP) &amp;&amp;</div><div class='add'>+	if ((priv-&gt;iw_mode == NL80211_IFTYPE_AP) &amp;&amp;</div><div class='ctx'> 	    (!test_bit(STATUS_EXIT_PENDING, &amp;priv-&gt;status)))</div><div class='ctx'> 		queue_work(priv-&gt;workqueue, &amp;priv-&gt;beacon_update);</div><div class='ctx'> }</div><div class='hunk'>@@ -1270,7 +1270,7 @@ int iwl4965_set_pwr_src(struct iwl_priv *priv, enum iwl_pwr_src src)</div><div class='ctx'> </div><div class='ctx'> 	if (src == IWL_PWR_SRC_VAUX) {</div><div class='ctx'> 		u32 val;</div><div class='del'>-		ret = pci_read_config_dword(priv-&gt;pci_dev, PCI_POWER_SOURCE,</div><div class='add'>+		ret = pci_read_config_dword(priv-&gt;pci_dev, PCI_CFG_POWER_SOURCE,</div><div class='ctx'> 					    &amp;val);</div><div class='ctx'> </div><div class='ctx'> 		if (val &amp; PCI_CFG_PMC_PME_FROM_D3COLD_SUPPORT)</div><div class='hunk'>@@ -2388,7 +2388,7 @@ static void iwl4965_bg_set_monitor(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;priv-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-	ret = iwl4965_set_mode(priv, IEEE80211_IF_TYPE_MNTR);</div><div class='add'>+	ret = iwl4965_set_mode(priv, NL80211_IFTYPE_MONITOR);</div><div class='ctx'> </div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		if (ret == -EAGAIN)</div><div class='hunk'>@@ -2469,7 +2469,7 @@ static void iwl4965_post_associate(struct iwl_priv *priv)</div><div class='ctx'> 	DECLARE_MAC_BUF(mac);</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;iw_mode == IEEE80211_IF_TYPE_AP) {</div><div class='add'>+	if (priv-&gt;iw_mode == NL80211_IFTYPE_AP) {</div><div class='ctx'> 		IWL_ERROR("%s Should not be called in AP mode\n", __func__);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2486,6 +2486,7 @@ static void iwl4965_post_associate(struct iwl_priv *priv)</div><div class='ctx'> 	if (!priv-&gt;vif || !priv-&gt;is_open)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	iwl_power_cancel_timeout(priv);</div><div class='ctx'> 	iwl_scan_cancel_timeout(priv, 200);</div><div class='ctx'> </div><div class='ctx'> 	conf = ieee80211_get_hw_conf(priv-&gt;hw);</div><div class='hunk'>@@ -2503,8 +2504,7 @@ static void iwl4965_post_associate(struct iwl_priv *priv)</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;staging_rxon.filter_flags |= RXON_FILTER_ASSOC_MSK;</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;current_ht_config.is_ht)</div><div class='del'>-		iwl_set_rxon_ht(priv, &amp;priv-&gt;current_ht_config);</div><div class='add'>+	iwl_set_rxon_ht(priv, &amp;priv-&gt;current_ht_config);</div><div class='ctx'> </div><div class='ctx'> 	iwl_set_rxon_chain(priv);</div><div class='ctx'> 	priv-&gt;staging_rxon.assoc_id = cpu_to_le16(priv-&gt;assoc_id);</div><div class='hunk'>@@ -2523,7 +2523,7 @@ static void iwl4965_post_associate(struct iwl_priv *priv)</div><div class='ctx'> 		else</div><div class='ctx'> 			priv-&gt;staging_rxon.flags &amp;= ~RXON_FLG_SHORT_SLOT_MSK;</div><div class='ctx'> </div><div class='del'>-		if (priv-&gt;iw_mode == IEEE80211_IF_TYPE_IBSS)</div><div class='add'>+		if (priv-&gt;iw_mode == NL80211_IFTYPE_ADHOC)</div><div class='ctx'> 			priv-&gt;staging_rxon.flags &amp;= ~RXON_FLG_SHORT_SLOT_MSK;</div><div class='ctx'> </div><div class='ctx'> 	}</div><div class='hunk'>@@ -2531,10 +2531,10 @@ static void iwl4965_post_associate(struct iwl_priv *priv)</div><div class='ctx'> 	iwl4965_commit_rxon(priv);</div><div class='ctx'> </div><div class='ctx'> 	switch (priv-&gt;iw_mode) {</div><div class='del'>-	case IEEE80211_IF_TYPE_STA:</div><div class='add'>+	case NL80211_IFTYPE_STATION:</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case IEEE80211_IF_TYPE_IBSS:</div><div class='add'>+	case NL80211_IFTYPE_ADHOC:</div><div class='ctx'> </div><div class='ctx'> 		/* assume default assoc id */</div><div class='ctx'> 		priv-&gt;assoc_id = 1;</div><div class='hunk'>@@ -2550,44 +2550,23 @@ static void iwl4965_post_associate(struct iwl_priv *priv)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Enable Rx differential gain and sensitivity calibrations */</div><div class='del'>-	iwl_chain_noise_reset(priv);</div><div class='del'>-	priv-&gt;start_calib = 1;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;iw_mode == IEEE80211_IF_TYPE_IBSS)</div><div class='add'>+	if (priv-&gt;iw_mode == NL80211_IFTYPE_ADHOC)</div><div class='ctx'> 		priv-&gt;assoc_station_added = 1;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='ctx'> 	iwl_activate_qos(priv, 0);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-	iwl_power_update_mode(priv, 0);</div><div class='del'>-	/* we have just associated, don't start scan too early */</div><div class='del'>-	priv-&gt;next_scan_jiffies = jiffies + IWL_DELAY_NEXT_SCAN;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int iwl4965_mac_config(struct ieee80211_hw *hw, struct ieee80211_conf *conf);</div><div class='del'>-</div><div class='del'>-static void iwl_bg_scan_completed(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv =</div><div class='del'>-	    container_of(work, struct iwl_priv, scan_completed);</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_SCAN("SCAN complete scan\n");</div><div class='del'>-</div><div class='del'>-	if (test_bit(STATUS_EXIT_PENDING, &amp;priv-&gt;status))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (test_bit(STATUS_CONF_PENDING, &amp;priv-&gt;status))</div><div class='del'>-		iwl4965_mac_config(priv-&gt;hw, ieee80211_get_hw_conf(priv-&gt;hw));</div><div class='add'>+	/* the chain noise calibration will enabled PM upon completion</div><div class='add'>+	 * If chain noise has already been run, then we need to enable</div><div class='add'>+	 * power management here */</div><div class='add'>+	if (priv-&gt;chain_noise_data.state == IWL_CHAIN_NOISE_DONE)</div><div class='add'>+		iwl_power_enable_management(priv);</div><div class='ctx'> </div><div class='del'>-	ieee80211_scan_completed(priv-&gt;hw);</div><div class='add'>+	/* Enable Rx differential gain and sensitivity calibrations */</div><div class='add'>+	iwl_chain_noise_reset(priv);</div><div class='add'>+	priv-&gt;start_calib = 1;</div><div class='ctx'> </div><div class='del'>-	/* Since setting the TXPOWER may have been deferred while</div><div class='del'>-	 * performing the scan, fire one off */</div><div class='del'>-	mutex_lock(&amp;priv-&gt;mutex);</div><div class='del'>-	iwl_set_tx_power(priv, priv-&gt;tx_power_user_lmt, true);</div><div class='del'>-	mutex_unlock(&amp;priv-&gt;mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************</div><div class='hunk'>@@ -2728,12 +2707,6 @@ static int iwl4965_mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	IWL_DEBUG_MACDUMP("enter\n");</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;iw_mode == IEEE80211_IF_TYPE_MNTR) {</div><div class='del'>-		IWL_DEBUG_MAC80211("leave - monitor\n");</div><div class='del'>-		dev_kfree_skb_any(skb);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	IWL_DEBUG_TX("dev-&gt;xmit(%d bytes) at rate 0x%02x\n", skb-&gt;len,</div><div class='ctx'> 		     ieee80211_get_tx_rate(hw, IEEE80211_SKB_CB(skb))-&gt;bitrate);</div><div class='ctx'> </div><div class='hunk'>@@ -2798,8 +2771,6 @@ static int iwl4965_mac_config(struct ieee80211_hw *hw, struct ieee80211_conf *co</div><div class='ctx'> 	mutex_lock(&amp;priv-&gt;mutex);</div><div class='ctx'> 	IWL_DEBUG_MAC80211("enter to channel %d\n", conf-&gt;channel-&gt;hw_value);</div><div class='ctx'> </div><div class='del'>-	priv-&gt;add_radiotap = !!(conf-&gt;flags &amp; IEEE80211_CONF_RADIOTAP);</div><div class='del'>-</div><div class='ctx'> 	if (conf-&gt;radio_enabled &amp;&amp; iwl_radio_kill_sw_enable_radio(priv)) {</div><div class='ctx'> 		IWL_DEBUG_MAC80211("leave - RF-KILL - waiting for uCode\n");</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -2817,7 +2788,6 @@ static int iwl4965_mac_config(struct ieee80211_hw *hw, struct ieee80211_conf *co</div><div class='ctx'> 	if (unlikely(!priv-&gt;cfg-&gt;mod_params-&gt;disable_hw_scan &amp;&amp;</div><div class='ctx'> 		     test_bit(STATUS_SCANNING, &amp;priv-&gt;status))) {</div><div class='ctx'> 		IWL_DEBUG_MAC80211("leave - scanning\n");</div><div class='del'>-		set_bit(STATUS_CONF_PENDING, &amp;priv-&gt;status);</div><div class='ctx'> 		mutex_unlock(&amp;priv-&gt;mutex);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2830,7 +2800,7 @@ static int iwl4965_mac_config(struct ieee80211_hw *hw, struct ieee80211_conf *co</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;iw_mode == IEEE80211_IF_TYPE_IBSS &amp;&amp;</div><div class='add'>+	if (priv-&gt;iw_mode == NL80211_IFTYPE_ADHOC &amp;&amp;</div><div class='ctx'> 	    !is_channel_ibss(ch_info)) {</div><div class='ctx'> 		IWL_ERROR("channel %d in band %d not IBSS channel\n",</div><div class='ctx'> 			conf-&gt;channel-&gt;hw_value, conf-&gt;channel-&gt;band);</div><div class='hunk'>@@ -2851,7 +2821,7 @@ static int iwl4965_mac_config(struct ieee80211_hw *hw, struct ieee80211_conf *co</div><div class='ctx'> 	)</div><div class='ctx'> 		priv-&gt;staging_rxon.flags = 0;</div><div class='ctx'> </div><div class='del'>-	iwl_set_rxon_channel(priv, conf-&gt;channel-&gt;band, channel);</div><div class='add'>+	iwl_set_rxon_channel(priv, conf-&gt;channel);</div><div class='ctx'> </div><div class='ctx'> 	iwl_set_flags_for_band(priv, conf-&gt;channel-&gt;band);</div><div class='ctx'> </div><div class='hunk'>@@ -2880,6 +2850,13 @@ static int iwl4965_mac_config(struct ieee80211_hw *hw, struct ieee80211_conf *co</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (conf-&gt;flags &amp; IEEE80211_CONF_PS)</div><div class='add'>+		ret = iwl_power_set_user_mode(priv, IWL_POWER_INDEX_3);</div><div class='add'>+	else</div><div class='add'>+		ret = iwl_power_set_user_mode(priv, IWL_POWER_MODE_CAM);</div><div class='add'>+	if (ret)</div><div class='add'>+		IWL_DEBUG_MAC80211("Error setting power level\n");</div><div class='add'>+</div><div class='ctx'> 	IWL_DEBUG_MAC80211("TX Power old=%d new=%d\n",</div><div class='ctx'> 			   priv-&gt;tx_power_user_lmt, conf-&gt;power_level);</div><div class='ctx'> </div><div class='hunk'>@@ -2896,7 +2873,6 @@ static int iwl4965_mac_config(struct ieee80211_hw *hw, struct ieee80211_conf *co</div><div class='ctx'> 	IWL_DEBUG_MAC80211("leave\n");</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	clear_bit(STATUS_CONF_PENDING, &amp;priv-&gt;status);</div><div class='ctx'> 	mutex_unlock(&amp;priv-&gt;mutex);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -2945,7 +2921,7 @@ static void iwl4965_config_ap(struct iwl_priv *priv)</div><div class='ctx'> 				priv-&gt;staging_rxon.flags &amp;=</div><div class='ctx'> 					~RXON_FLG_SHORT_SLOT_MSK;</div><div class='ctx'> </div><div class='del'>-			if (priv-&gt;iw_mode == IEEE80211_IF_TYPE_IBSS)</div><div class='add'>+			if (priv-&gt;iw_mode == NL80211_IFTYPE_ADHOC)</div><div class='ctx'> 				priv-&gt;staging_rxon.flags &amp;=</div><div class='ctx'> 					~RXON_FLG_SHORT_SLOT_MSK;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2984,7 +2960,7 @@ static int iwl4965_mac_config_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;iw_mode == IEEE80211_IF_TYPE_IBSS &amp;&amp;</div><div class='add'>+	if (priv-&gt;iw_mode == NL80211_IFTYPE_ADHOC &amp;&amp;</div><div class='ctx'> 	    conf-&gt;changed &amp; IEEE80211_IFCC_BEACON) {</div><div class='ctx'> 		struct sk_buff *beacon = ieee80211_beacon_get(hw, vif);</div><div class='ctx'> 		if (!beacon)</div><div class='hunk'>@@ -2994,7 +2970,7 @@ static int iwl4965_mac_config_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 			return rc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((priv-&gt;iw_mode == IEEE80211_IF_TYPE_AP) &amp;&amp;</div><div class='add'>+	if ((priv-&gt;iw_mode == NL80211_IFTYPE_AP) &amp;&amp;</div><div class='ctx'> 	    (!conf-&gt;ssid_len)) {</div><div class='ctx'> 		IWL_DEBUG_MAC80211</div><div class='ctx'> 		    ("Leaving in AP mode because HostAPD is not ready.\n");</div><div class='hunk'>@@ -3017,7 +2993,7 @@ static int iwl4965_mac_config_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 	    !(priv-&gt;hw-&gt;flags &amp; IEEE80211_HW_NO_PROBE_FILTERING)) {</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;iw_mode == IEEE80211_IF_TYPE_AP) {</div><div class='add'>+	if (priv-&gt;iw_mode == NL80211_IFTYPE_AP) {</div><div class='ctx'> 		if (!conf-&gt;bssid) {</div><div class='ctx'> 			conf-&gt;bssid = priv-&gt;mac_addr;</div><div class='ctx'> 			memcpy(priv-&gt;bssid, priv-&gt;mac_addr, ETH_ALEN);</div><div class='hunk'>@@ -3052,11 +3028,11 @@ static int iwl4965_mac_config_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 		 * to verify) - jpk */</div><div class='ctx'> 		memcpy(priv-&gt;bssid, conf-&gt;bssid, ETH_ALEN);</div><div class='ctx'> </div><div class='del'>-		if (priv-&gt;iw_mode == IEEE80211_IF_TYPE_AP)</div><div class='add'>+		if (priv-&gt;iw_mode == NL80211_IFTYPE_AP)</div><div class='ctx'> 			iwl4965_config_ap(priv);</div><div class='ctx'> 		else {</div><div class='ctx'> 			rc = iwl4965_commit_rxon(priv);</div><div class='del'>-			if ((priv-&gt;iw_mode == IEEE80211_IF_TYPE_STA) &amp;&amp; rc)</div><div class='add'>+			if ((priv-&gt;iw_mode == NL80211_IFTYPE_STATION) &amp;&amp; rc)</div><div class='ctx'> 				iwl_rxon_add_station(</div><div class='ctx'> 					priv, priv-&gt;active_rxon.bssid_addr, 1);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -3092,7 +3068,7 @@ static void iwl4965_configure_filter(struct ieee80211_hw *hw,</div><div class='ctx'> </div><div class='ctx'> 	if (changed_flags &amp; (*total_flags) &amp; FIF_OTHER_BSS) {</div><div class='ctx'> 		IWL_DEBUG_MAC80211("Enter: type %d (0x%x, 0x%x)\n",</div><div class='del'>-				   IEEE80211_IF_TYPE_MNTR,</div><div class='add'>+				   NL80211_IFTYPE_MONITOR,</div><div class='ctx'> 				   changed_flags, *total_flags);</div><div class='ctx'> 		/* queue work 'cuz mac80211 is holding a lock which</div><div class='ctx'> 		 * prevents us from issuing (synchronous) f/w cmds */</div><div class='hunk'>@@ -3173,6 +3149,10 @@ static void iwl4965_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 			priv-&gt;power_data.dtim_period = bss_conf-&gt;dtim_period;</div><div class='ctx'> 			priv-&gt;timestamp = bss_conf-&gt;timestamp;</div><div class='ctx'> 			priv-&gt;assoc_capability = bss_conf-&gt;assoc_capability;</div><div class='add'>+</div><div class='add'>+			/* we have just associated, don't start scan too early</div><div class='add'>+			 * leave time for EAPOL exchange to complete</div><div class='add'>+			 */</div><div class='ctx'> 			priv-&gt;next_scan_jiffies = jiffies +</div><div class='ctx'> 					IWL_DELAY_NEXT_SCAN_AFTER_ASSOC;</div><div class='ctx'> 			mutex_lock(&amp;priv-&gt;mutex);</div><div class='hunk'>@@ -3189,11 +3169,11 @@ static void iwl4965_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int iwl4965_mac_hw_scan(struct ieee80211_hw *hw, u8 *ssid, size_t len)</div><div class='add'>+static int iwl_mac_hw_scan(struct ieee80211_hw *hw, u8 *ssid, size_t ssid_len)</div><div class='ctx'> {</div><div class='del'>-	int rc = 0;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	struct iwl_priv *priv = hw-&gt;priv;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	IWL_DEBUG_MAC80211("enter\n");</div><div class='ctx'> </div><div class='hunk'>@@ -3201,41 +3181,47 @@ static int iwl4965_mac_hw_scan(struct ieee80211_hw *hw, u8 *ssid, size_t len)</div><div class='ctx'> 	spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	if (!iwl_is_ready_rf(priv)) {</div><div class='del'>-		rc = -EIO;</div><div class='add'>+		ret = -EIO;</div><div class='ctx'> 		IWL_DEBUG_MAC80211("leave - not ready or exit pending\n");</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;iw_mode == IEEE80211_IF_TYPE_AP) {	/* APs don't scan */</div><div class='del'>-		rc = -EIO;</div><div class='add'>+	if (priv-&gt;iw_mode == NL80211_IFTYPE_AP) {	/* APs don't scan */</div><div class='add'>+		ret = -EIO;</div><div class='ctx'> 		IWL_ERROR("ERROR: APs don't scan\n");</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* we don't schedule scan within next_scan_jiffies period */</div><div class='add'>+	/* We don't schedule scan within next_scan_jiffies period.</div><div class='add'>+	 * Avoid scanning during possible EAPOL exchange, return</div><div class='add'>+	 * success immediately.</div><div class='add'>+	 */</div><div class='ctx'> 	if (priv-&gt;next_scan_jiffies &amp;&amp;</div><div class='del'>-			time_after(priv-&gt;next_scan_jiffies, jiffies)) {</div><div class='del'>-		rc = -EAGAIN;</div><div class='add'>+	    time_after(priv-&gt;next_scan_jiffies, jiffies)) {</div><div class='add'>+		IWL_DEBUG_SCAN("scan rejected: within next scan period\n");</div><div class='add'>+		queue_work(priv-&gt;workqueue, &amp;priv-&gt;scan_completed);</div><div class='add'>+		ret = 0;</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	/* if we just finished scan ask for delay */</div><div class='del'>-	if (priv-&gt;last_scan_jiffies &amp;&amp; time_after(priv-&gt;last_scan_jiffies +</div><div class='del'>-				IWL_DELAY_NEXT_SCAN, jiffies)) {</div><div class='del'>-		rc = -EAGAIN;</div><div class='add'>+	if (iwl_is_associated(priv) &amp;&amp; priv-&gt;last_scan_jiffies &amp;&amp;</div><div class='add'>+	    time_after(priv-&gt;last_scan_jiffies + IWL_DELAY_NEXT_SCAN, jiffies)) {</div><div class='add'>+		IWL_DEBUG_SCAN("scan rejected: within previous scan period\n");</div><div class='add'>+		queue_work(priv-&gt;workqueue, &amp;priv-&gt;scan_completed);</div><div class='add'>+		ret = 0;</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> 	}</div><div class='del'>-	if (len) {</div><div class='del'>-		IWL_DEBUG_SCAN("direct scan for %s [%d]\n ",</div><div class='del'>-			       iwl_escape_essid(ssid, len), (int)len);</div><div class='ctx'> </div><div class='add'>+	if (ssid_len) {</div><div class='ctx'> 		priv-&gt;one_direct_scan = 1;</div><div class='del'>-		priv-&gt;direct_ssid_len = (u8)</div><div class='del'>-		    min((u8) len, (u8) IW_ESSID_MAX_SIZE);</div><div class='add'>+		priv-&gt;direct_ssid_len =  min_t(u8, ssid_len, IW_ESSID_MAX_SIZE);</div><div class='ctx'> 		memcpy(priv-&gt;direct_ssid, ssid, priv-&gt;direct_ssid_len);</div><div class='del'>-	} else</div><div class='add'>+	} else {</div><div class='ctx'> 		priv-&gt;one_direct_scan = 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	rc = iwl_scan_initiate(priv);</div><div class='add'>+	ret = iwl_scan_initiate(priv);</div><div class='ctx'> </div><div class='ctx'> 	IWL_DEBUG_MAC80211("leave\n");</div><div class='ctx'> </div><div class='hunk'>@@ -3243,7 +3229,7 @@ out_unlock:</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='ctx'> 	mutex_unlock(&amp;priv-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-	return rc;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void iwl4965_mac_update_tkip_key(struct ieee80211_hw *hw,</div><div class='hunk'>@@ -3332,7 +3318,7 @@ static int iwl4965_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,</div><div class='ctx'> 	 * in 1X mode.</div><div class='ctx'> 	 * In legacy wep mode, we use another host command to the uCode */</div><div class='ctx'> 	if (key-&gt;alg == ALG_WEP &amp;&amp; sta_id == priv-&gt;hw_params.bcast_sta_id &amp;&amp;</div><div class='del'>-		priv-&gt;iw_mode != IEEE80211_IF_TYPE_AP) {</div><div class='add'>+		priv-&gt;iw_mode != NL80211_IFTYPE_AP) {</div><div class='ctx'> 		if (cmd == SET_KEY)</div><div class='ctx'> 			is_default_wep_key = !priv-&gt;key_mapping_key;</div><div class='ctx'> 		else</div><div class='hunk'>@@ -3403,7 +3389,7 @@ static int iwl4965_mac_conf_tx(struct ieee80211_hw *hw, u16 queue,</div><div class='ctx'> 	priv-&gt;qos_data.def_qos_parm.ac[q].reserved1 = 0;</div><div class='ctx'> 	priv-&gt;qos_data.qos_active = 1;</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;iw_mode == IEEE80211_IF_TYPE_AP)</div><div class='add'>+	if (priv-&gt;iw_mode == NL80211_IFTYPE_AP)</div><div class='ctx'> 		iwl_activate_qos(priv, 1);</div><div class='ctx'> 	else if (priv-&gt;assoc_id &amp;&amp; iwl_is_associated(priv))</div><div class='ctx'> 		iwl_activate_qos(priv, 0);</div><div class='hunk'>@@ -3416,13 +3402,13 @@ static int iwl4965_mac_conf_tx(struct ieee80211_hw *hw, u16 queue,</div><div class='ctx'> </div><div class='ctx'> static int iwl4965_mac_ampdu_action(struct ieee80211_hw *hw,</div><div class='ctx'> 			     enum ieee80211_ampdu_mlme_action action,</div><div class='del'>-			     const u8 *addr, u16 tid, u16 *ssn)</div><div class='add'>+			     struct ieee80211_sta *sta, u16 tid, u16 *ssn)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_priv *priv = hw-&gt;priv;</div><div class='ctx'> 	DECLARE_MAC_BUF(mac);</div><div class='ctx'> </div><div class='ctx'> 	IWL_DEBUG_HT("A-MPDU action on addr %s tid %d\n",</div><div class='del'>-		     print_mac(mac, addr), tid);</div><div class='add'>+		     print_mac(mac, sta-&gt;addr), tid);</div><div class='ctx'> </div><div class='ctx'> 	if (!(priv-&gt;cfg-&gt;sku &amp; IWL_SKU_N))</div><div class='ctx'> 		return -EACCES;</div><div class='hunk'>@@ -3430,16 +3416,16 @@ static int iwl4965_mac_ampdu_action(struct ieee80211_hw *hw,</div><div class='ctx'> 	switch (action) {</div><div class='ctx'> 	case IEEE80211_AMPDU_RX_START:</div><div class='ctx'> 		IWL_DEBUG_HT("start Rx\n");</div><div class='del'>-		return iwl_rx_agg_start(priv, addr, tid, *ssn);</div><div class='add'>+		return iwl_rx_agg_start(priv, sta-&gt;addr, tid, *ssn);</div><div class='ctx'> 	case IEEE80211_AMPDU_RX_STOP:</div><div class='ctx'> 		IWL_DEBUG_HT("stop Rx\n");</div><div class='del'>-		return iwl_rx_agg_stop(priv, addr, tid);</div><div class='add'>+		return iwl_rx_agg_stop(priv, sta-&gt;addr, tid);</div><div class='ctx'> 	case IEEE80211_AMPDU_TX_START:</div><div class='ctx'> 		IWL_DEBUG_HT("start Tx\n");</div><div class='del'>-		return iwl_tx_agg_start(priv, addr, tid, ssn);</div><div class='add'>+		return iwl_tx_agg_start(priv, sta-&gt;addr, tid, ssn);</div><div class='ctx'> 	case IEEE80211_AMPDU_TX_STOP:</div><div class='ctx'> 		IWL_DEBUG_HT("stop Tx\n");</div><div class='del'>-		return iwl_tx_agg_stop(priv, addr, tid);</div><div class='add'>+		return iwl_tx_agg_stop(priv, sta-&gt;addr, tid);</div><div class='ctx'> 	default:</div><div class='ctx'> 		IWL_DEBUG_HT("unknown\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -3521,7 +3507,7 @@ static void iwl4965_mac_reset_tsf(struct ieee80211_hw *hw)</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;beacon_int = priv-&gt;hw-&gt;conf.beacon_int;</div><div class='ctx'> 	priv-&gt;timestamp = 0;</div><div class='del'>-	if ((priv-&gt;iw_mode == IEEE80211_IF_TYPE_STA))</div><div class='add'>+	if ((priv-&gt;iw_mode == NL80211_IFTYPE_STATION))</div><div class='ctx'> 		priv-&gt;beacon_int = 0;</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='hunk'>@@ -3535,7 +3521,7 @@ static void iwl4965_mac_reset_tsf(struct ieee80211_hw *hw)</div><div class='ctx'> 	/* we are restarting association process</div><div class='ctx'> 	 * clear RXON_FILTER_ASSOC_MSK bit</div><div class='ctx'> 	 */</div><div class='del'>-	if (priv-&gt;iw_mode != IEEE80211_IF_TYPE_AP) {</div><div class='add'>+	if (priv-&gt;iw_mode != NL80211_IFTYPE_AP) {</div><div class='ctx'> 		iwl_scan_cancel_timeout(priv, 100);</div><div class='ctx'> 		priv-&gt;staging_rxon.filter_flags &amp;= ~RXON_FILTER_ASSOC_MSK;</div><div class='ctx'> 		iwl4965_commit_rxon(priv);</div><div class='hunk'>@@ -3544,7 +3530,17 @@ static void iwl4965_mac_reset_tsf(struct ieee80211_hw *hw)</div><div class='ctx'> 	iwl_power_update_mode(priv, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* Per mac80211.h: This is only used in IBSS mode... */</div><div class='del'>-	if (priv-&gt;iw_mode != IEEE80211_IF_TYPE_IBSS) {</div><div class='add'>+	if (priv-&gt;iw_mode != NL80211_IFTYPE_ADHOC) {</div><div class='add'>+</div><div class='add'>+		/* switch to CAM during association period.</div><div class='add'>+		 * the ucode will block any association/authentication</div><div class='add'>+		 * frome during assiciation period if it can not hear</div><div class='add'>+		 * the AP because of PM. the timer enable PM back is</div><div class='add'>+		 * association do not complete</div><div class='add'>+		 */</div><div class='add'>+		if (priv-&gt;hw-&gt;conf.channel-&gt;flags &amp; (IEEE80211_CHAN_PASSIVE_SCAN |</div><div class='add'>+						     IEEE80211_CHAN_RADAR))</div><div class='add'>+				iwl_power_disable_management(priv, 3000);</div><div class='ctx'> </div><div class='ctx'> 		IWL_DEBUG_MAC80211("leave - not in IBSS\n");</div><div class='ctx'> 		mutex_unlock(&amp;priv-&gt;mutex);</div><div class='hunk'>@@ -3573,7 +3569,7 @@ static int iwl4965_mac_beacon_update(struct ieee80211_hw *hw, struct sk_buff *sk</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;iw_mode != IEEE80211_IF_TYPE_IBSS) {</div><div class='add'>+	if (priv-&gt;iw_mode != NL80211_IFTYPE_ADHOC) {</div><div class='ctx'> 		IWL_DEBUG_MAC80211("leave - not IBSS\n");</div><div class='ctx'> 		mutex_unlock(&amp;priv-&gt;mutex);</div><div class='ctx'> 		return -EIO;</div><div class='hunk'>@@ -3630,11 +3626,11 @@ static ssize_t store_debug_level(struct device *d,</div><div class='ctx'> 				 const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_priv *priv = d-&gt;driver_data;</div><div class='del'>-	char *p = (char *)buf;</div><div class='del'>-	u32 val;</div><div class='add'>+	unsigned long val;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	val = simple_strtoul(p, &amp;p, 0);</div><div class='del'>-	if (p == buf)</div><div class='add'>+	ret = strict_strtoul(buf, 0, &amp;val);</div><div class='add'>+	if (ret)</div><div class='ctx'> 		printk(KERN_INFO DRV_NAME</div><div class='ctx'> 		       ": %s is not in hex or decimal form.\n", buf);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -3706,11 +3702,11 @@ static ssize_t store_tx_power(struct device *d,</div><div class='ctx'> 			      const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_priv *priv = (struct iwl_priv *)d-&gt;driver_data;</div><div class='del'>-	char *p = (char *)buf;</div><div class='del'>-	u32 val;</div><div class='add'>+	unsigned long val;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	val = simple_strtoul(p, &amp;p, 10);</div><div class='del'>-	if (p == buf)</div><div class='add'>+	ret = strict_strtoul(buf, 10, &amp;val);</div><div class='add'>+	if (ret)</div><div class='ctx'> 		printk(KERN_INFO DRV_NAME</div><div class='ctx'> 		       ": %s is not in decimal form.\n", buf);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -3734,7 +3730,12 @@ static ssize_t store_flags(struct device *d,</div><div class='ctx'> 			   const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_priv *priv = (struct iwl_priv *)d-&gt;driver_data;</div><div class='del'>-	u32 flags = simple_strtoul(buf, NULL, 0);</div><div class='add'>+	unsigned long val;</div><div class='add'>+	u32 flags;</div><div class='add'>+	int ret = strict_strtoul(buf, 0, &amp;val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	flags = (u32)val;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;priv-&gt;mutex);</div><div class='ctx'> 	if (le32_to_cpu(priv-&gt;staging_rxon.flags) != flags) {</div><div class='hunk'>@@ -3742,8 +3743,7 @@ static ssize_t store_flags(struct device *d,</div><div class='ctx'> 		if (iwl_scan_cancel_timeout(priv, 100))</div><div class='ctx'> 			IWL_WARNING("Could not cancel scan.\n");</div><div class='ctx'> 		else {</div><div class='del'>-			IWL_DEBUG_INFO("Committing rxon.flags = 0x%04X\n",</div><div class='del'>-				       flags);</div><div class='add'>+			IWL_DEBUG_INFO("Commit rxon.flags = 0x%04X\n", flags);</div><div class='ctx'> 			priv-&gt;staging_rxon.flags = cpu_to_le32(flags);</div><div class='ctx'> 			iwl4965_commit_rxon(priv);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -3769,7 +3769,12 @@ static ssize_t store_filter_flags(struct device *d,</div><div class='ctx'> 				  const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_priv *priv = (struct iwl_priv *)d-&gt;driver_data;</div><div class='del'>-	u32 filter_flags = simple_strtoul(buf, NULL, 0);</div><div class='add'>+	unsigned long val;</div><div class='add'>+	u32 filter_flags;</div><div class='add'>+	int ret = strict_strtoul(buf, 0, &amp;val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	filter_flags = (u32)val;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;priv-&gt;mutex);</div><div class='ctx'> 	if (le32_to_cpu(priv-&gt;staging_rxon.filter_flags) != filter_flags) {</div><div class='hunk'>@@ -3870,10 +3875,12 @@ static ssize_t store_retry_rate(struct device *d,</div><div class='ctx'> 				const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_priv *priv = dev_get_drvdata(d);</div><div class='add'>+	long val;</div><div class='add'>+	int ret  = strict_strtol(buf, 10, &amp;val);</div><div class='add'>+	if (!ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	priv-&gt;retry_rate = simple_strtoul(buf, NULL, 0);</div><div class='del'>-	if (priv-&gt;retry_rate &lt;= 0)</div><div class='del'>-		priv-&gt;retry_rate = 1;</div><div class='add'>+	priv-&gt;retry_rate = (val &gt; 0) ? val : 1;</div><div class='ctx'> </div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='hunk'>@@ -3894,9 +3901,9 @@ static ssize_t store_power_level(struct device *d,</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_priv *priv = dev_get_drvdata(d);</div><div class='ctx'> 	int ret;</div><div class='del'>-	int mode;</div><div class='add'>+	unsigned long mode;</div><div class='add'>+</div><div class='ctx'> </div><div class='del'>-	mode = simple_strtoul(buf, NULL, 0);</div><div class='ctx'> 	mutex_lock(&amp;priv-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	if (!iwl_is_ready(priv)) {</div><div class='hunk'>@@ -3904,6 +3911,10 @@ static ssize_t store_power_level(struct device *d,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ret = strict_strtoul(buf, 10, &amp;mode);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='ctx'> 	ret = iwl_power_set_user_mode(priv, mode);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		IWL_DEBUG_MAC80211("failed setting power mode.\n");</div><div class='hunk'>@@ -4080,9 +4091,8 @@ static void iwl_setup_deferred_work(struct iwl_priv *priv)</div><div class='ctx'> 	INIT_DELAYED_WORK(&amp;priv-&gt;init_alive_start, iwl_bg_init_alive_start);</div><div class='ctx'> 	INIT_DELAYED_WORK(&amp;priv-&gt;alive_start, iwl_bg_alive_start);</div><div class='ctx'> </div><div class='del'>-	/* FIXME : remove when resolved PENDING */</div><div class='del'>-	INIT_WORK(&amp;priv-&gt;scan_completed, iwl_bg_scan_completed);</div><div class='ctx'> 	iwl_setup_scan_deferred_work(priv);</div><div class='add'>+	iwl_setup_power_deferred_work(priv);</div><div class='ctx'> </div><div class='ctx'> 	if (priv-&gt;cfg-&gt;ops-&gt;lib-&gt;setup_deferred_work)</div><div class='ctx'> 		priv-&gt;cfg-&gt;ops-&gt;lib-&gt;setup_deferred_work(priv);</div><div class='hunk'>@@ -4102,6 +4112,7 @@ static void iwl_cancel_deferred_work(struct iwl_priv *priv)</div><div class='ctx'> </div><div class='ctx'> 	cancel_delayed_work_sync(&amp;priv-&gt;init_alive_start);</div><div class='ctx'> 	cancel_delayed_work(&amp;priv-&gt;scan_check);</div><div class='add'>+	cancel_delayed_work_sync(&amp;priv-&gt;set_power_save);</div><div class='ctx'> 	cancel_delayed_work(&amp;priv-&gt;alive_start);</div><div class='ctx'> 	cancel_work_sync(&amp;priv-&gt;beacon_update);</div><div class='ctx'> 	del_timer_sync(&amp;priv-&gt;statistics_periodic);</div><div class='hunk'>@@ -4150,7 +4161,7 @@ static struct ieee80211_ops iwl4965_hw_ops = {</div><div class='ctx'> 	.reset_tsf = iwl4965_mac_reset_tsf,</div><div class='ctx'> 	.bss_info_changed = iwl4965_bss_info_changed,</div><div class='ctx'> 	.ampdu_action = iwl4965_mac_ampdu_action,</div><div class='del'>-	.hw_scan = iwl4965_mac_hw_scan</div><div class='add'>+	.hw_scan = iwl_mac_hw_scan</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int iwl4965_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='hunk'>@@ -4204,13 +4215,13 @@ static int iwl4965_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e</div><div class='ctx'> </div><div class='ctx'> 	pci_set_master(pdev);</div><div class='ctx'> </div><div class='del'>-	err = pci_set_dma_mask(pdev, DMA_64BIT_MASK);</div><div class='add'>+	err = pci_set_dma_mask(pdev, DMA_BIT_MASK(36));</div><div class='ctx'> 	if (!err)</div><div class='del'>-		err = pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK);</div><div class='add'>+		err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(36));</div><div class='ctx'> 	if (err) {</div><div class='del'>-		err = pci_set_dma_mask(pdev, DMA_32BIT_MASK);</div><div class='add'>+		err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));</div><div class='ctx'> 		if (!err)</div><div class='del'>-			err = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);</div><div class='add'>+			err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));</div><div class='ctx'> 		/* both attempts failed: */</div><div class='ctx'> 		if (err) {</div><div class='ctx'> 			printk(KERN_WARNING "%s: No suitable DMA available.\n",</div><div class='hunk'>@@ -4225,9 +4236,6 @@ static int iwl4965_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e</div><div class='ctx'> </div><div class='ctx'> 	pci_set_drvdata(pdev, priv);</div><div class='ctx'> </div><div class='del'>-	/* We disable the RETRY_TIMEOUT register (0x41) to keep</div><div class='del'>-	 * PCI Tx retries from interfering with C3 CPU state */</div><div class='del'>-	pci_write_config_byte(pdev, 0x41, 0x00);</div><div class='ctx'> </div><div class='ctx'> 	/***********************</div><div class='ctx'> 	 * 3. Read REV register</div><div class='hunk'>@@ -4247,6 +4255,10 @@ static int iwl4965_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e</div><div class='ctx'> 		": Detected Intel Wireless WiFi Link %s REV=0x%X\n",</div><div class='ctx'> 		priv-&gt;cfg-&gt;name, priv-&gt;hw_rev);</div><div class='ctx'> </div><div class='add'>+	/* We disable the RETRY_TIMEOUT register (0x41) to keep</div><div class='add'>+	 * PCI Tx retries from interfering with C3 CPU state */</div><div class='add'>+	pci_write_config_byte(pdev, PCI_CFG_RETRY_TIMEOUT, 0x00);</div><div class='add'>+</div><div class='ctx'> 	/* amp init */</div><div class='ctx'> 	err = priv-&gt;cfg-&gt;ops-&gt;lib-&gt;apm_ops.init(priv);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='hunk'>@@ -4481,7 +4493,10 @@ static struct pci_device_id iwl_hw_card_ids[] = {</div><div class='ctx'> 	{IWL_PCI_DEVICE(0x4235, PCI_ANY_ID, iwl5300_agn_cfg)},</div><div class='ctx'> 	{IWL_PCI_DEVICE(0x4236, PCI_ANY_ID, iwl5300_agn_cfg)},</div><div class='ctx'> 	{IWL_PCI_DEVICE(0x4237, PCI_ANY_ID, iwl5100_agn_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x423A, PCI_ANY_ID, iwl5350_agn_cfg)},</div><div class='add'>+/* 5350 WiFi/WiMax */</div><div class='add'>+	{IWL_PCI_DEVICE(0x423A, 0x1001, iwl5350_agn_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x423A, 0x1021, iwl5350_agn_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x423B, 0x1011, iwl5350_agn_cfg)},</div><div class='ctx'> #endif /* CONFIG_IWL5000 */</div><div class='ctx'> 	{0}</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/iwl-calib.c b/drivers/net/wireless/iwlwifi/iwl-calib.c<br/>index ef49440bd7f6..72fbf47229db 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-calib.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/iwlwifi/iwl-calib.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-calib.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/iwlwifi/iwl-calib.c</a></div><div class='hunk'>@@ -66,6 +66,66 @@</div><div class='ctx'> #include "iwl-core.h"</div><div class='ctx'> #include "iwl-calib.h"</div><div class='ctx'> </div><div class='add'>+/*****************************************************************************</div><div class='add'>+ * INIT calibrations framework</div><div class='add'>+ *****************************************************************************/</div><div class='add'>+</div><div class='add'>+ int iwl_send_calib_results(struct iwl_priv *priv)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+	int i = 0;</div><div class='add'>+</div><div class='add'>+	struct iwl_host_cmd hcmd = {</div><div class='add'>+		.id = REPLY_PHY_CALIBRATION_CMD,</div><div class='add'>+		.meta.flags = CMD_SIZE_HUGE,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; IWL_CALIB_MAX; i++)</div><div class='add'>+		if (priv-&gt;calib_results[i].buf) {</div><div class='add'>+			hcmd.len = priv-&gt;calib_results[i].buf_len;</div><div class='add'>+			hcmd.data = priv-&gt;calib_results[i].buf;</div><div class='add'>+			ret = iwl_send_cmd_sync(priv, &amp;hcmd);</div><div class='add'>+			if (ret)</div><div class='add'>+				goto err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+err:</div><div class='add'>+	IWL_ERROR("Error %d iteration %d\n", ret, i);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(iwl_send_calib_results);</div><div class='add'>+</div><div class='add'>+int iwl_calib_set(struct iwl_calib_result *res, const u8 *buf, int len)</div><div class='add'>+{</div><div class='add'>+	if (res-&gt;buf_len != len) {</div><div class='add'>+		kfree(res-&gt;buf);</div><div class='add'>+		res-&gt;buf = kzalloc(len, GFP_ATOMIC);</div><div class='add'>+	}</div><div class='add'>+	if (unlikely(res-&gt;buf == NULL))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	res-&gt;buf_len = len;</div><div class='add'>+	memcpy(res-&gt;buf, buf, len);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(iwl_calib_set);</div><div class='add'>+</div><div class='add'>+void iwl_calib_free_results(struct iwl_priv *priv)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; IWL_CALIB_MAX; i++) {</div><div class='add'>+		kfree(priv-&gt;calib_results[i].buf);</div><div class='add'>+		priv-&gt;calib_results[i].buf = NULL;</div><div class='add'>+		priv-&gt;calib_results[i].buf_len = 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*****************************************************************************</div><div class='add'>+ * RUNTIME calibrations framework</div><div class='add'>+ *****************************************************************************/</div><div class='add'>+</div><div class='ctx'> /* "false alarms" are signals that our DSP tries to lock onto,</div><div class='ctx'>  *   but then determines that they are either noise, or transmissions</div><div class='ctx'>  *   from a distant wireless network (also "noise", really) that get</div><div class='hunk'>@@ -748,13 +808,11 @@ void iwl_chain_noise_calibration(struct iwl_priv *priv,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Save for use within RXON, TX, SCAN commands, etc. */</div><div class='add'>+	priv-&gt;chain_noise_data.active_chains = active_chains;</div><div class='ctx'> 	IWL_DEBUG_CALIB("active_chains (bitwise) = 0x%x\n",</div><div class='ctx'> 			active_chains);</div><div class='ctx'> </div><div class='del'>-	/* Save for use within RXON, TX, SCAN commands, etc. */</div><div class='del'>-	/*priv-&gt;valid_antenna = active_chains;*/</div><div class='del'>-	/*FIXME: should be reflected in RX chains in RXON */</div><div class='del'>-</div><div class='ctx'> 	/* Analyze noise for rx balance */</div><div class='ctx'> 	average_noise[0] = ((data-&gt;chain_noise_a)/CAL_NUM_OF_BEACONS);</div><div class='ctx'> 	average_noise[1] = ((data-&gt;chain_noise_b)/CAL_NUM_OF_BEACONS);</div><div class='hunk'>@@ -779,6 +837,15 @@ void iwl_chain_noise_calibration(struct iwl_priv *priv,</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;cfg-&gt;ops-&gt;utils-&gt;gain_computation(priv, average_noise,</div><div class='ctx'> 		min_average_noise_antenna_i, min_average_noise);</div><div class='add'>+</div><div class='add'>+	/* Some power changes may have been made during the calibration.</div><div class='add'>+	 * Update and commit the RXON</div><div class='add'>+	 */</div><div class='add'>+	if (priv-&gt;cfg-&gt;ops-&gt;lib-&gt;update_chain_flags)</div><div class='add'>+		priv-&gt;cfg-&gt;ops-&gt;lib-&gt;update_chain_flags(priv);</div><div class='add'>+</div><div class='add'>+	data-&gt;state = IWL_CHAIN_NOISE_DONE;</div><div class='add'>+	iwl_power_enable_management(priv);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(iwl_chain_noise_calibration);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/iwl-commands.h b/drivers/net/wireless/iwlwifi/iwl-commands.h<br/>index 28b5b09996ed..8d04e966ad48 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-commands.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/iwlwifi/iwl-commands.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-commands.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/iwlwifi/iwl-commands.h</a></div><div class='hunk'>@@ -163,6 +163,13 @@ enum {</div><div class='ctx'> /* iwl_cmd_header flags value */</div><div class='ctx'> #define IWL_CMD_FAILED_MSK 0x40</div><div class='ctx'> </div><div class='add'>+#define SEQ_TO_QUEUE(s)	(((s) &gt;&gt; 8) &amp; 0x1f)</div><div class='add'>+#define QUEUE_TO_SEQ(q)	(((q) &amp; 0x1f) &lt;&lt; 8)</div><div class='add'>+#define SEQ_TO_INDEX(s)	((s) &amp; 0xff)</div><div class='add'>+#define INDEX_TO_SEQ(i)	((i) &amp; 0xff)</div><div class='add'>+#define SEQ_HUGE_FRAME	__constant_cpu_to_le16(0x4000)</div><div class='add'>+#define SEQ_RX_FRAME	__constant_cpu_to_le16(0x8000)</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * struct iwl_cmd_header</div><div class='ctx'>  *</div><div class='hunk'>@@ -171,7 +178,7 @@ enum {</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_cmd_header {</div><div class='ctx'> 	u8 cmd;		/* Command ID:  REPLY_RXON, etc. */</div><div class='del'>-	u8 flags;	/* IWL_CMD_* */</div><div class='add'>+	u8 flags;	/* 0:5 reserved, 6 abort, 7 internal */</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The driver sets up the sequence number to values of its chosing.</div><div class='ctx'> 	 * uCode does not use this value, but passes it back to the driver</div><div class='hunk'>@@ -187,11 +194,12 @@ struct iwl_cmd_header {</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * The Linux driver uses the following format:</div><div class='ctx'> 	 *</div><div class='del'>-	 *  0:7    index/position within Tx queue</div><div class='del'>-	 *  8:13   Tx queue selection</div><div class='del'>-	 * 14:14   driver sets this to indicate command is in the 'huge'</div><div class='del'>-	 *         storage at the end of the command buffers, i.e. scan cmd</div><div class='del'>-	 * 15:15   uCode sets this in uCode-originated response/notification</div><div class='add'>+	 *  0:7		tfd index - position within TX queue</div><div class='add'>+	 *  8:12	TX queue id</div><div class='add'>+	 *  13		reserved</div><div class='add'>+	 *  14		huge - driver sets this to indicate command is in the</div><div class='add'>+	 *  		'huge' storage at the end of the command buffers</div><div class='add'>+	 *  15		unsolicited RX or uCode-originated notification</div><div class='ctx'> 	 */</div><div class='ctx'> 	__le16 sequence;</div><div class='ctx'> </div><div class='hunk'>@@ -2026,8 +2034,8 @@ struct iwl4965_spectrum_notification {</div><div class='ctx'>  *   bit 2 - '0' PM have to walk up every DTIM</div><div class='ctx'>  *           '1' PM could sleep over DTIM till listen Interval.</div><div class='ctx'>  * PCI power managed</div><div class='del'>- *   bit 3 - '0' (PCI_LINK_CTRL &amp; 0x1)</div><div class='del'>- *           '1' !(PCI_LINK_CTRL &amp; 0x1)</div><div class='add'>+ *   bit 3 - '0' (PCI_CFG_LINK_CTRL &amp; 0x1)</div><div class='add'>+ *           '1' !(PCI_CFG_LINK_CTRL &amp; 0x1)</div><div class='ctx'>  * Force sleep Modes</div><div class='ctx'>  *   bit 31/30- '00' use both mac/xtal sleeps</div><div class='ctx'>  *              '01' force Mac sleep</div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c<br/>index 80f2f84defa8..4c312c55f90c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-core.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/iwlwifi/iwl-core.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/iwlwifi/iwl-core.c</a></div><div class='hunk'>@@ -306,14 +306,14 @@ void iwl_reset_qos(struct iwl_priv *priv)</div><div class='ctx'> 	spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='ctx'> 	priv-&gt;qos_data.qos_active = 0;</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;iw_mode == IEEE80211_IF_TYPE_IBSS) {</div><div class='add'>+	if (priv-&gt;iw_mode == NL80211_IFTYPE_ADHOC) {</div><div class='ctx'> 		if (priv-&gt;qos_data.qos_enable)</div><div class='ctx'> 			priv-&gt;qos_data.qos_active = 1;</div><div class='ctx'> 		if (!(priv-&gt;active_rate &amp; 0xfff0)) {</div><div class='ctx'> 			cw_min = 31;</div><div class='ctx'> 			is_legacy = 1;</div><div class='ctx'> 		}</div><div class='del'>-	} else if (priv-&gt;iw_mode == IEEE80211_IF_TYPE_AP) {</div><div class='add'>+	} else if (priv-&gt;iw_mode == NL80211_IFTYPE_AP) {</div><div class='ctx'> 		if (priv-&gt;qos_data.qos_enable)</div><div class='ctx'> 			priv-&gt;qos_data.qos_active = 1;</div><div class='ctx'> 	} else if (!(priv-&gt;staging_rxon.flags &amp; RXON_FLG_SHORT_SLOT_MSK)) {</div><div class='hunk'>@@ -399,8 +399,8 @@ static void iwlcore_init_ht_hw_capab(const struct iwl_priv *priv,</div><div class='ctx'> </div><div class='ctx'> 	ht_info-&gt;cap |= (u16)IEEE80211_HT_CAP_GRN_FLD;</div><div class='ctx'> 	ht_info-&gt;cap |= (u16)IEEE80211_HT_CAP_SGI_20;</div><div class='del'>-	ht_info-&gt;cap |= (u16)(IEEE80211_HT_CAP_MIMO_PS &amp;</div><div class='del'>-			     (IWL_MIMO_PS_NONE &lt;&lt; 2));</div><div class='add'>+	ht_info-&gt;cap |= (u16)(IEEE80211_HT_CAP_SM_PS &amp;</div><div class='add'>+			     (WLAN_HT_CAP_SM_PS_DISABLED &lt;&lt; 2));</div><div class='ctx'> </div><div class='ctx'> 	max_bit_rate = MAX_BIT_RATE_20_MHZ;</div><div class='ctx'> 	if (priv-&gt;hw_params.fat_channel &amp; BIT(band)) {</div><div class='hunk'>@@ -646,8 +646,14 @@ void iwl_set_rxon_ht(struct iwl_priv *priv, struct iwl_ht_info *ht_info)</div><div class='ctx'> 	struct iwl_rxon_cmd *rxon = &amp;priv-&gt;staging_rxon;</div><div class='ctx'> 	u32 val;</div><div class='ctx'> </div><div class='del'>-	if (!ht_info-&gt;is_ht)</div><div class='add'>+	if (!ht_info-&gt;is_ht) {</div><div class='add'>+		rxon-&gt;flags &amp;= ~(RXON_FLG_CHANNEL_MODE_MIXED_MSK |</div><div class='add'>+			RXON_FLG_CHANNEL_MODE_PURE_40_MSK |</div><div class='add'>+			RXON_FLG_CTRL_CHANNEL_LOC_HI_MSK |</div><div class='add'>+			RXON_FLG_FAT_PROT_MSK |</div><div class='add'>+			RXON_FLG_HT_PROT_MSK);</div><div class='ctx'> 		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Set up channel bandwidth:  20 MHz only, or 20/40 mixed if fat ok */</div><div class='ctx'> 	if (iwl_is_fat_tx_allowed(priv, NULL))</div><div class='hunk'>@@ -697,8 +703,12 @@ void iwl_set_rxon_ht(struct iwl_priv *priv, struct iwl_ht_info *ht_info)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(iwl_set_rxon_ht);</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Determine how many receiver/antenna chains to use.</div><div class='add'>+#define IWL_NUM_RX_CHAINS_MULTIPLE	3</div><div class='add'>+#define IWL_NUM_RX_CHAINS_SINGLE	2</div><div class='add'>+#define IWL_NUM_IDLE_CHAINS_DUAL	2</div><div class='add'>+#define IWL_NUM_IDLE_CHAINS_SINGLE	1</div><div class='add'>+</div><div class='add'>+/* Determine how many receiver/antenna chains to use.</div><div class='ctx'>  * More provides better reception via diversity.  Fewer saves power.</div><div class='ctx'>  * MIMO (dual stream) requires at least 2, but works better with 3.</div><div class='ctx'>  * This does not determine *which* chains to use, just how many.</div><div class='hunk'>@@ -709,10 +719,11 @@ static int iwl_get_active_rx_chain_count(struct iwl_priv *priv)</div><div class='ctx'> 	bool is_cam = !test_bit(STATUS_POWER_PMI, &amp;priv-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	/* # of Rx chains to use when expecting MIMO. */</div><div class='del'>-	if (is_single || (!is_cam &amp;&amp; (priv-&gt;ps_mode == IWL_MIMO_PS_STATIC)))</div><div class='del'>-		return 2;</div><div class='add'>+	if (is_single || (!is_cam &amp;&amp; (priv-&gt;current_ht_config.sm_ps ==</div><div class='add'>+						 WLAN_HT_CAP_SM_PS_STATIC)))</div><div class='add'>+		return IWL_NUM_RX_CHAINS_SINGLE;</div><div class='ctx'> 	else</div><div class='del'>-		return 3;</div><div class='add'>+		return IWL_NUM_RX_CHAINS_MULTIPLE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int iwl_get_idle_rx_chain_count(struct iwl_priv *priv, int active_cnt)</div><div class='hunk'>@@ -720,17 +731,19 @@ static int iwl_get_idle_rx_chain_count(struct iwl_priv *priv, int active_cnt)</div><div class='ctx'> 	int idle_cnt;</div><div class='ctx'> 	bool is_cam = !test_bit(STATUS_POWER_PMI, &amp;priv-&gt;status);</div><div class='ctx'> 	/* # Rx chains when idling and maybe trying to save power */</div><div class='del'>-	switch (priv-&gt;ps_mode) {</div><div class='del'>-	case IWL_MIMO_PS_STATIC:</div><div class='del'>-	case IWL_MIMO_PS_DYNAMIC:</div><div class='del'>-		idle_cnt = (is_cam) ? 2 : 1;</div><div class='add'>+	switch (priv-&gt;current_ht_config.sm_ps) {</div><div class='add'>+	case WLAN_HT_CAP_SM_PS_STATIC:</div><div class='add'>+	case WLAN_HT_CAP_SM_PS_DYNAMIC:</div><div class='add'>+		idle_cnt = (is_cam) ? IWL_NUM_IDLE_CHAINS_DUAL :</div><div class='add'>+					IWL_NUM_IDLE_CHAINS_SINGLE;</div><div class='ctx'> 		break;</div><div class='del'>-	case IWL_MIMO_PS_NONE:</div><div class='del'>-		idle_cnt = (is_cam) ? active_cnt : 1;</div><div class='add'>+	case WLAN_HT_CAP_SM_PS_DISABLED:</div><div class='add'>+		idle_cnt = (is_cam) ? active_cnt : IWL_NUM_IDLE_CHAINS_SINGLE;</div><div class='ctx'> 		break;</div><div class='del'>-	case IWL_MIMO_PS_INVALID:</div><div class='add'>+	case WLAN_HT_CAP_SM_PS_INVALID:</div><div class='ctx'> 	default:</div><div class='del'>-		IWL_ERROR("invalide mimo ps mode %d\n", priv-&gt;ps_mode);</div><div class='add'>+		IWL_ERROR("invalide mimo ps mode %d\n",</div><div class='add'>+			   priv-&gt;current_ht_config.sm_ps);</div><div class='ctx'> 		WARN_ON(1);</div><div class='ctx'> 		idle_cnt = -1;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -738,6 +751,17 @@ static int iwl_get_idle_rx_chain_count(struct iwl_priv *priv, int active_cnt)</div><div class='ctx'> 	return idle_cnt;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* up to 4 chains */</div><div class='add'>+static u8 iwl_count_chain_bitmap(u32 chain_bitmap)</div><div class='add'>+{</div><div class='add'>+	u8 res;</div><div class='add'>+	res = (chain_bitmap &amp; BIT(0)) &gt;&gt; 0;</div><div class='add'>+	res += (chain_bitmap &amp; BIT(1)) &gt;&gt; 1;</div><div class='add'>+	res += (chain_bitmap &amp; BIT(2)) &gt;&gt; 2;</div><div class='add'>+	res += (chain_bitmap &amp; BIT(4)) &gt;&gt; 4;</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * iwl_set_rxon_chain - Set up Rx chain usage in "staging" RXON image</div><div class='ctx'>  *</div><div class='hunk'>@@ -748,37 +772,47 @@ void iwl_set_rxon_chain(struct iwl_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	bool is_single = is_single_rx_stream(priv);</div><div class='ctx'> 	bool is_cam = !test_bit(STATUS_POWER_PMI, &amp;priv-&gt;status);</div><div class='del'>-	u8 idle_rx_cnt, active_rx_cnt;</div><div class='add'>+	u8 idle_rx_cnt, active_rx_cnt, valid_rx_cnt;</div><div class='add'>+	u32 active_chains;</div><div class='ctx'> 	u16 rx_chain;</div><div class='ctx'> </div><div class='ctx'> 	/* Tell uCode which antennas are actually connected.</div><div class='ctx'> 	 * Before first association, we assume all antennas are connected.</div><div class='ctx'> 	 * Just after first association, iwl_chain_noise_calibration()</div><div class='ctx'> 	 *    checks which antennas actually *are* connected. */</div><div class='del'>-	rx_chain = priv-&gt;hw_params.valid_rx_ant &lt;&lt; RXON_RX_CHAIN_VALID_POS;</div><div class='add'>+	 if (priv-&gt;chain_noise_data.active_chains)</div><div class='add'>+		active_chains = priv-&gt;chain_noise_data.active_chains;</div><div class='add'>+	else</div><div class='add'>+		active_chains = priv-&gt;hw_params.valid_rx_ant;</div><div class='add'>+</div><div class='add'>+	rx_chain = active_chains &lt;&lt; RXON_RX_CHAIN_VALID_POS;</div><div class='ctx'> </div><div class='ctx'> 	/* How many receivers should we use? */</div><div class='ctx'> 	active_rx_cnt = iwl_get_active_rx_chain_count(priv);</div><div class='ctx'> 	idle_rx_cnt = iwl_get_idle_rx_chain_count(priv, active_rx_cnt);</div><div class='ctx'> </div><div class='del'>-	/* correct rx chain count accoridng hw settings */</div><div class='del'>-	if (priv-&gt;hw_params.rx_chains_num &lt; active_rx_cnt)</div><div class='del'>-		active_rx_cnt = priv-&gt;hw_params.rx_chains_num;</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;hw_params.rx_chains_num &lt; idle_rx_cnt)</div><div class='del'>-		idle_rx_cnt = priv-&gt;hw_params.rx_chains_num;</div><div class='add'>+	/* correct rx chain count according hw settings</div><div class='add'>+	 * and chain noise calibration</div><div class='add'>+	 */</div><div class='add'>+	valid_rx_cnt = iwl_count_chain_bitmap(active_chains);</div><div class='add'>+	if (valid_rx_cnt &lt; active_rx_cnt)</div><div class='add'>+		active_rx_cnt = valid_rx_cnt;</div><div class='add'>+</div><div class='add'>+	if (valid_rx_cnt &lt; idle_rx_cnt)</div><div class='add'>+		idle_rx_cnt = valid_rx_cnt;</div><div class='ctx'> </div><div class='ctx'> 	rx_chain |= active_rx_cnt &lt;&lt; RXON_RX_CHAIN_MIMO_CNT_POS;</div><div class='ctx'> 	rx_chain |= idle_rx_cnt  &lt;&lt; RXON_RX_CHAIN_CNT_POS;</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;staging_rxon.rx_chain = cpu_to_le16(rx_chain);</div><div class='ctx'> </div><div class='del'>-	if (!is_single &amp;&amp; (active_rx_cnt &gt;= 2) &amp;&amp; is_cam)</div><div class='add'>+	if (!is_single &amp;&amp; (active_rx_cnt &gt;= IWL_NUM_RX_CHAINS_SINGLE) &amp;&amp; is_cam)</div><div class='ctx'> 		priv-&gt;staging_rxon.rx_chain |= RXON_RX_CHAIN_MIMO_FORCE_MSK;</div><div class='ctx'> 	else</div><div class='ctx'> 		priv-&gt;staging_rxon.rx_chain &amp;= ~RXON_RX_CHAIN_MIMO_FORCE_MSK;</div><div class='ctx'> </div><div class='del'>-	IWL_DEBUG_ASSOC("rx_chain=0x%Xi active=%d idle=%d\n",</div><div class='add'>+	IWL_DEBUG_ASSOC("rx_chain=0x%X active=%d idle=%d\n",</div><div class='ctx'> 			priv-&gt;staging_rxon.rx_chain,</div><div class='ctx'> 			active_rx_cnt, idle_rx_cnt);</div><div class='ctx'> </div><div class='hunk'>@@ -788,7 +822,7 @@ void iwl_set_rxon_chain(struct iwl_priv *priv)</div><div class='ctx'> EXPORT_SYMBOL(iwl_set_rxon_chain);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * iwlcore_set_rxon_channel - Set the phymode and channel values in staging RXON</div><div class='add'>+ * iwl_set_rxon_channel - Set the phymode and channel values in staging RXON</div><div class='ctx'>  * @phymode: MODE_IEEE80211A sets to 5.2GHz; all else set to 2.4GHz</div><div class='ctx'>  * @channel: Any channel valid for the requested phymode</div><div class='ctx'> </div><div class='hunk'>@@ -797,10 +831,11 @@ EXPORT_SYMBOL(iwl_set_rxon_chain);</div><div class='ctx'>  * NOTE:  Does not commit to the hardware; it sets appropriate bit fields</div><div class='ctx'>  * in the staging RXON flag structure based on the phymode</div><div class='ctx'>  */</div><div class='del'>-int iwl_set_rxon_channel(struct iwl_priv *priv,</div><div class='del'>-				enum ieee80211_band band,</div><div class='del'>-				u16 channel)</div><div class='add'>+int iwl_set_rxon_channel(struct iwl_priv *priv, struct ieee80211_channel *ch)</div><div class='ctx'> {</div><div class='add'>+	enum ieee80211_band band = ch-&gt;band;</div><div class='add'>+	u16 channel = ieee80211_frequency_to_channel(ch-&gt;center_freq);</div><div class='add'>+</div><div class='ctx'> 	if (!iwl_get_channel_info(priv, band, channel)) {</div><div class='ctx'> 		IWL_DEBUG_INFO("Could not set channel to %d [%d]\n",</div><div class='ctx'> 			       channel, band);</div><div class='hunk'>@@ -834,6 +869,10 @@ int iwl_setup_mac(struct iwl_priv *priv)</div><div class='ctx'> 	/* Tell mac80211 our characteristics */</div><div class='ctx'> 	hw-&gt;flags = IEEE80211_HW_SIGNAL_DBM |</div><div class='ctx'> 		    IEEE80211_HW_NOISE_DBM;</div><div class='add'>+	hw-&gt;wiphy-&gt;interface_modes =</div><div class='add'>+		BIT(NL80211_IFTYPE_AP) |</div><div class='add'>+		BIT(NL80211_IFTYPE_STATION) |</div><div class='add'>+		BIT(NL80211_IFTYPE_ADHOC);</div><div class='ctx'> 	/* Default value; 4 EDCA QOS priorities */</div><div class='ctx'> 	hw-&gt;queues = 4;</div><div class='ctx'> 	/* queues to support 11n aggregation */</div><div class='hunk'>@@ -891,7 +930,6 @@ int iwl_init_drv(struct iwl_priv *priv)</div><div class='ctx'> 	spin_lock_init(&amp;priv-&gt;power_data.lock);</div><div class='ctx'> 	spin_lock_init(&amp;priv-&gt;sta_lock);</div><div class='ctx'> 	spin_lock_init(&amp;priv-&gt;hcmd_lock);</div><div class='del'>-	spin_lock_init(&amp;priv-&gt;lq_mngr.lock);</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;priv-&gt;free_frames);</div><div class='ctx'> </div><div class='hunk'>@@ -905,10 +943,10 @@ int iwl_init_drv(struct iwl_priv *priv)</div><div class='ctx'> 	priv-&gt;ieee_rates = NULL;</div><div class='ctx'> 	priv-&gt;band = IEEE80211_BAND_2GHZ;</div><div class='ctx'> </div><div class='del'>-	priv-&gt;iw_mode = IEEE80211_IF_TYPE_STA;</div><div class='add'>+	priv-&gt;iw_mode = NL80211_IFTYPE_STATION;</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;use_ant_b_for_management_frame = 1; /* start with ant B */</div><div class='del'>-	priv-&gt;ps_mode = IWL_MIMO_PS_NONE;</div><div class='add'>+	priv-&gt;current_ht_config.sm_ps = WLAN_HT_CAP_SM_PS_DISABLED;</div><div class='ctx'> </div><div class='ctx'> 	/* Choose which receivers/antennas to use */</div><div class='ctx'> 	iwl_set_rxon_chain(priv);</div><div class='hunk'>@@ -922,8 +960,6 @@ int iwl_init_drv(struct iwl_priv *priv)</div><div class='ctx'> 	priv-&gt;qos_data.qos_active = 0;</div><div class='ctx'> 	priv-&gt;qos_data.qos_cap.val = 0;</div><div class='ctx'> </div><div class='del'>-	iwl_set_rxon_channel(priv, IEEE80211_BAND_2GHZ, 6);</div><div class='del'>-</div><div class='ctx'> 	priv-&gt;rates_mask = IWL_RATES_MASK;</div><div class='ctx'> 	/* If power management is turned on, default to AC mode */</div><div class='ctx'> 	priv-&gt;power_mode = IWL_POWER_AC;</div><div class='hunk'>@@ -950,22 +986,6 @@ err:</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(iwl_init_drv);</div><div class='ctx'> </div><div class='del'>-void iwl_free_calib_results(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	kfree(priv-&gt;calib_results.lo_res);</div><div class='del'>-	priv-&gt;calib_results.lo_res = NULL;</div><div class='del'>-	priv-&gt;calib_results.lo_res_len = 0;</div><div class='del'>-</div><div class='del'>-	kfree(priv-&gt;calib_results.tx_iq_res);</div><div class='del'>-	priv-&gt;calib_results.tx_iq_res = NULL;</div><div class='del'>-	priv-&gt;calib_results.tx_iq_res_len = 0;</div><div class='del'>-</div><div class='del'>-	kfree(priv-&gt;calib_results.tx_iq_perd_res);</div><div class='del'>-	priv-&gt;calib_results.tx_iq_perd_res = NULL;</div><div class='del'>-	priv-&gt;calib_results.tx_iq_perd_res_len = 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_free_calib_results);</div><div class='del'>-</div><div class='ctx'> int iwl_set_tx_power(struct iwl_priv *priv, s8 tx_power, bool force)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='hunk'>@@ -993,10 +1013,9 @@ int iwl_set_tx_power(struct iwl_priv *priv, s8 tx_power, bool force)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(iwl_set_tx_power);</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> void iwl_uninit_drv(struct iwl_priv *priv)</div><div class='ctx'> {</div><div class='del'>-	iwl_free_calib_results(priv);</div><div class='add'>+	iwl_calib_free_results(priv);</div><div class='ctx'> 	iwlcore_free_geos(priv);</div><div class='ctx'> 	iwl_free_channel_map(priv);</div><div class='ctx'> 	kfree(priv-&gt;scan);</div><div class='hunk'>@@ -1150,7 +1169,6 @@ int iwl_verify_ucode(struct iwl_priv *priv)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(iwl_verify_ucode);</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> static const char *desc_lookup(int i)</div><div class='ctx'> {</div><div class='ctx'> 	switch (i) {</div><div class='hunk'>@@ -1231,9 +1249,9 @@ EXPORT_SYMBOL(iwl_dump_nic_error_log);</div><div class='ctx'> /**</div><div class='ctx'>  * iwl_print_event_log - Dump error event log to syslog</div><div class='ctx'>  *</div><div class='del'>- * NOTE: Must be called with iwl4965_grab_nic_access() already obtained!</div><div class='add'>+ * NOTE: Must be called with iwl_grab_nic_access() already obtained!</div><div class='ctx'>  */</div><div class='del'>-void iwl_print_event_log(struct iwl_priv *priv, u32 start_idx,</div><div class='add'>+static void iwl_print_event_log(struct iwl_priv *priv, u32 start_idx,</div><div class='ctx'> 				u32 num_events, u32 mode)</div><div class='ctx'> {</div><div class='ctx'> 	u32 i;</div><div class='hunk'>@@ -1274,8 +1292,6 @@ void iwl_print_event_log(struct iwl_priv *priv, u32 start_idx,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(iwl_print_event_log);</div><div class='del'>-</div><div class='ctx'> </div><div class='ctx'> void iwl_dump_nic_event_log(struct iwl_priv *priv)</div><div class='ctx'> {</div><div class='hunk'>@@ -1391,7 +1407,7 @@ void iwl_radio_kill_sw_disable_radio(struct iwl_priv *priv)</div><div class='ctx'> </div><div class='ctx'> 	iwl_scan_cancel(priv);</div><div class='ctx'> 	/* FIXME: This is a workaround for AP */</div><div class='del'>-	if (priv-&gt;iw_mode != IEEE80211_IF_TYPE_AP) {</div><div class='add'>+	if (priv-&gt;iw_mode != NL80211_IFTYPE_AP) {</div><div class='ctx'> 		spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='ctx'> 		iwl_write32(priv, CSR_UCODE_DRV_GP1_SET,</div><div class='ctx'> 			    CSR_UCODE_SW_BIT_RFKILL);</div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h<br/>index 64f139e97444..288b6a800e03 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-core.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/iwlwifi/iwl-core.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-core.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/iwlwifi/iwl-core.h</a></div><div class='hunk'>@@ -184,14 +184,10 @@ struct iwl_cfg {</div><div class='ctx'> struct ieee80211_hw *iwl_alloc_all(struct iwl_cfg *cfg,</div><div class='ctx'> 		struct ieee80211_ops *hw_ops);</div><div class='ctx'> void iwl_hw_detect(struct iwl_priv *priv);</div><div class='del'>-</div><div class='ctx'> void iwl_clear_stations_table(struct iwl_priv *priv);</div><div class='del'>-void iwl_free_calib_results(struct iwl_priv *priv);</div><div class='ctx'> void iwl_reset_qos(struct iwl_priv *priv);</div><div class='ctx'> void iwl_set_rxon_chain(struct iwl_priv *priv);</div><div class='del'>-int iwl_set_rxon_channel(struct iwl_priv *priv,</div><div class='del'>-				enum ieee80211_band band,</div><div class='del'>-				u16 channel);</div><div class='add'>+int iwl_set_rxon_channel(struct iwl_priv *priv, struct ieee80211_channel *ch);</div><div class='ctx'> void iwl_set_rxon_ht(struct iwl_priv *priv, struct iwl_ht_info *ht_info);</div><div class='ctx'> u8 iwl_is_fat_tx_allowed(struct iwl_priv *priv,</div><div class='ctx'> 			 struct ieee80211_ht_info *sta_ht_inf);</div><div class='hunk'>@@ -218,7 +214,6 @@ void iwl_rx_replenish(struct iwl_priv *priv);</div><div class='ctx'> int iwl_rx_init(struct iwl_priv *priv, struct iwl_rx_queue *rxq);</div><div class='ctx'> int iwl_rx_agg_start(struct iwl_priv *priv, const u8 *addr, int tid, u16 ssn);</div><div class='ctx'> int iwl_rx_agg_stop(struct iwl_priv *priv, const u8 *addr, int tid);</div><div class='del'>-/* FIXME: remove when TX is moved to iwl core */</div><div class='ctx'> int iwl_rx_queue_restock(struct iwl_priv *priv);</div><div class='ctx'> int iwl_rx_queue_space(const struct iwl_rx_queue *q);</div><div class='ctx'> void iwl_rx_allocate(struct iwl_priv *priv);</div><div class='hunk'>@@ -237,11 +232,7 @@ void iwl_rx_statistics(struct iwl_priv *priv,</div><div class='ctx'> ******************************************************/</div><div class='ctx'> int iwl_txq_ctx_reset(struct iwl_priv *priv);</div><div class='ctx'> int iwl_tx_skb(struct iwl_priv *priv, struct sk_buff *skb);</div><div class='del'>-/* FIXME: remove when free Tx is fully merged into iwlcore */</div><div class='del'>-int iwl_hw_txq_free_tfd(struct iwl_priv *priv, struct iwl_tx_queue *txq);</div><div class='ctx'> void iwl_hw_txq_ctx_free(struct iwl_priv *priv);</div><div class='del'>-int iwl_hw_txq_attach_buf_to_tfd(struct iwl_priv *priv, void *tfd,</div><div class='del'>-					dma_addr_t addr, u16 len);</div><div class='ctx'> int iwl_txq_update_write_ptr(struct iwl_priv *priv, struct iwl_tx_queue *txq);</div><div class='ctx'> int iwl_tx_agg_start(struct iwl_priv *priv, const u8 *ra, u16 tid, u16 *ssn);</div><div class='ctx'> int iwl_tx_agg_stop(struct iwl_priv *priv , const u8 *ra, u16 tid);</div><div class='hunk'>@@ -256,6 +247,7 @@ int iwl_set_tx_power(struct iwl_priv *priv, s8 tx_power, bool force);</div><div class='ctx'>  * RF -Kill - here and not in iwl-rfkill.h to be available when</div><div class='ctx'>  * RF-kill subsystem is not compiled.</div><div class='ctx'>  ****************************************************/</div><div class='add'>+void iwl_rf_kill(struct iwl_priv *priv);</div><div class='ctx'> void iwl_radio_kill_sw_disable_radio(struct iwl_priv *priv);</div><div class='ctx'> int iwl_radio_kill_sw_enable_radio(struct iwl_priv *priv);</div><div class='ctx'> </div><div class='hunk'>@@ -286,11 +278,17 @@ static inline __le32 iwl_hw_set_rate_n_flags(u8 rate, u32 flags)</div><div class='ctx'> void iwl_init_scan_params(struct iwl_priv *priv);</div><div class='ctx'> int iwl_scan_cancel(struct iwl_priv *priv);</div><div class='ctx'> int iwl_scan_cancel_timeout(struct iwl_priv *priv, unsigned long ms);</div><div class='del'>-const char *iwl_escape_essid(const char *essid, u8 essid_len);</div><div class='ctx'> int iwl_scan_initiate(struct iwl_priv *priv);</div><div class='ctx'> void iwl_setup_rx_scan_handlers(struct iwl_priv *priv);</div><div class='ctx'> void iwl_setup_scan_deferred_work(struct iwl_priv *priv);</div><div class='ctx'> </div><div class='add'>+/*******************************************************************************</div><div class='add'>+ * Calibrations - implemented in iwl-calib.c</div><div class='add'>+ ******************************************************************************/</div><div class='add'>+int iwl_send_calib_results(struct iwl_priv *priv);</div><div class='add'>+int iwl_calib_set(struct iwl_calib_result *res, const u8 *buf, int len);</div><div class='add'>+void iwl_calib_free_results(struct iwl_priv *priv);</div><div class='add'>+</div><div class='ctx'> /*****************************************************</div><div class='ctx'>  *   S e n d i n g     H o s t     C o m m a n d s   *</div><div class='ctx'>  *****************************************************/</div><div class='hunk'>@@ -312,8 +310,6 @@ int iwl_enqueue_hcmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd);</div><div class='ctx'> /*****************************************************</div><div class='ctx'> *  Error Handling Debugging</div><div class='ctx'> ******************************************************/</div><div class='del'>-void iwl_print_event_log(struct iwl_priv *priv, u32 start_idx,</div><div class='del'>-			 u32 num_events, u32 mode);</div><div class='ctx'> void iwl_dump_nic_error_log(struct iwl_priv *priv);</div><div class='ctx'> void iwl_dump_nic_event_log(struct iwl_priv *priv);</div><div class='ctx'> </div><div class='hunk'>@@ -337,8 +333,7 @@ void iwl_dump_nic_event_log(struct iwl_priv *priv);</div><div class='ctx'> #define STATUS_SCAN_HW		15</div><div class='ctx'> #define STATUS_POWER_PMI	16</div><div class='ctx'> #define STATUS_FW_ERROR		17</div><div class='del'>-#define STATUS_CONF_PENDING	18</div><div class='del'>-#define STATUS_MODE_PENDING	19</div><div class='add'>+#define STATUS_MODE_PENDING	18</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static inline int iwl_is_ready(struct iwl_priv *priv)</div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/iwl-csr.h b/drivers/net/wireless/iwlwifi/iwl-csr.h<br/>index 52629fbd835a..662edf4f8d22 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-csr.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/iwlwifi/iwl-csr.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-csr.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/iwlwifi/iwl-csr.h</a></div><div class='hunk'>@@ -64,7 +64,7 @@</div><div class='ctx'> #define CSR_BASE    (0x000)</div><div class='ctx'> </div><div class='ctx'> #define CSR_HW_IF_CONFIG_REG    (CSR_BASE+0x000) /* hardware interface config */</div><div class='del'>-#define CSR_INT_COALESCING      (CSR_BASE+0x004) /* accum ints, 32-usec units */</div><div class='add'>+#define CSR_INT_COALESCING     (CSR_BASE+0x004) /* accum ints, 32-usec units */</div><div class='ctx'> #define CSR_INT                 (CSR_BASE+0x008) /* host interrupt status/ack */</div><div class='ctx'> #define CSR_INT_MASK            (CSR_BASE+0x00c) /* host interrupt enable */</div><div class='ctx'> #define CSR_FH_INT_STATUS       (CSR_BASE+0x010) /* busmaster int status/ack*/</div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/iwl-debug.h b/drivers/net/wireless/iwlwifi/iwl-debug.h<br/>index d2daa174df22..e548d67f87fd 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-debug.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/iwlwifi/iwl-debug.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-debug.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/iwlwifi/iwl-debug.h</a></div><div class='hunk'>@@ -110,11 +110,12 @@ static inline void iwl_dbgfs_unregister(struct iwl_priv *priv)</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define IWL_DL_INFO          (1 &lt;&lt; 0)</div><div class='del'>-#define IWL_DL_MAC80211      (1 &lt;&lt; 1)</div><div class='del'>-#define IWL_DL_HOST_COMMAND  (1 &lt;&lt; 2)</div><div class='del'>-#define IWL_DL_STATE         (1 &lt;&lt; 3)</div><div class='add'>+#define IWL_DL_INFO		(1 &lt;&lt; 0)</div><div class='add'>+#define IWL_DL_MAC80211		(1 &lt;&lt; 1)</div><div class='add'>+#define IWL_DL_HCMD		(1 &lt;&lt; 2)</div><div class='add'>+#define IWL_DL_STATE		(1 &lt;&lt; 3)</div><div class='ctx'> #define IWL_DL_MACDUMP		(1 &lt;&lt; 4)</div><div class='add'>+#define IWL_DL_HCMD_DUMP	(1 &lt;&lt; 5)</div><div class='ctx'> #define IWL_DL_RADIO         (1 &lt;&lt; 7)</div><div class='ctx'> #define IWL_DL_POWER         (1 &lt;&lt; 8)</div><div class='ctx'> #define IWL_DL_TEMP          (1 &lt;&lt; 9)</div><div class='hunk'>@@ -162,7 +163,8 @@ static inline void iwl_dbgfs_unregister(struct iwl_priv *priv)</div><div class='ctx'> #define IWL_DEBUG_ISR(f, a...)    IWL_DEBUG(IWL_DL_ISR, f, ## a)</div><div class='ctx'> #define IWL_DEBUG_LED(f, a...) IWL_DEBUG(IWL_DL_LED, f, ## a)</div><div class='ctx'> #define IWL_DEBUG_WEP(f, a...)    IWL_DEBUG(IWL_DL_WEP, f, ## a)</div><div class='del'>-#define IWL_DEBUG_HC(f, a...) IWL_DEBUG(IWL_DL_HOST_COMMAND, f, ## a)</div><div class='add'>+#define IWL_DEBUG_HC(f, a...) IWL_DEBUG(IWL_DL_HCMD, f, ## a)</div><div class='add'>+#define IWL_DEBUG_HC_DUMP(f, a...) IWL_DEBUG(IWL_DL_HCMD_DUMP, f, ## a)</div><div class='ctx'> #define IWL_DEBUG_CALIB(f, a...) IWL_DEBUG(IWL_DL_CALIB, f, ## a)</div><div class='ctx'> #define IWL_DEBUG_FW(f, a...) IWL_DEBUG(IWL_DL_FW, f, ## a)</div><div class='ctx'> #define IWL_DEBUG_RF_KILL(f, a...) IWL_DEBUG(IWL_DL_RF_KILL, f, ## a)</div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h<br/>index cdfb343c7ec6..c018121085e9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-dev.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/iwlwifi/iwl-dev.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-dev.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/iwlwifi/iwl-dev.h</a></div><div class='hunk'>@@ -225,12 +225,6 @@ struct iwl_frame {</div><div class='ctx'> 	struct list_head list;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define SEQ_TO_QUEUE(x)  ((x &gt;&gt; 8) &amp; 0xbf)</div><div class='del'>-#define QUEUE_TO_SEQ(x)  ((x &amp; 0xbf) &lt;&lt; 8)</div><div class='del'>-#define SEQ_TO_INDEX(x) ((u8)(x &amp; 0xff))</div><div class='del'>-#define INDEX_TO_SEQ(x) ((u8)(x &amp; 0xff))</div><div class='del'>-#define SEQ_HUGE_FRAME  (0x4000)</div><div class='del'>-#define SEQ_RX_FRAME    __constant_cpu_to_le16(0x8000)</div><div class='ctx'> #define SEQ_TO_SN(seq) (((seq) &amp; IEEE80211_SCTL_SEQ) &gt;&gt; 4)</div><div class='ctx'> #define SN_TO_SEQ(ssn) (((ssn) &lt;&lt; 4) &amp; IEEE80211_SCTL_SEQ)</div><div class='ctx'> #define MAX_SN ((IEEE80211_SCTL_SEQ) &gt;&gt; 4)</div><div class='hunk'>@@ -412,6 +406,7 @@ struct iwl_ht_info {</div><div class='ctx'> 	/* self configuration data */</div><div class='ctx'> 	u8 is_ht;</div><div class='ctx'> 	u8 supported_chan_width;</div><div class='add'>+	u8 sm_ps;</div><div class='ctx'> 	u8 is_green_field;</div><div class='ctx'> 	u8 sgf;			/* HT_SHORT_GI_* short guard interval */</div><div class='ctx'> 	u8 max_amsdu_size;</div><div class='hunk'>@@ -570,50 +565,31 @@ struct iwl_hw_params {</div><div class='ctx'> #define IWL_RX_STATS(x) (&amp;x-&gt;u.rx_frame.stats)</div><div class='ctx'> #define IWL_RX_DATA(x) (IWL_RX_HDR(x)-&gt;payload)</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /******************************************************************************</div><div class='ctx'>  *</div><div class='del'>- * Functions implemented in iwl-base.c which are forward declared here</div><div class='del'>- * for use by iwl-*.c</div><div class='add'>+ * Functions implemented in core module which are forward declared here</div><div class='add'>+ * for use by iwl-[4-5].c</div><div class='ctx'>  *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-struct iwl_addsta_cmd;</div><div class='del'>-extern int iwl_send_add_sta(struct iwl_priv *priv,</div><div class='del'>-			    struct iwl_addsta_cmd *sta, u8 flags);</div><div class='del'>-u8 iwl_add_station_flags(struct iwl_priv *priv, const u8 *addr, int is_ap,</div><div class='del'>-			 u8 flags, struct ieee80211_ht_info *ht_info);</div><div class='del'>-extern unsigned int iwl4965_fill_beacon_frame(struct iwl_priv *priv,</div><div class='del'>-					struct ieee80211_hdr *hdr,</div><div class='del'>-					const u8 *dest, int left);</div><div class='del'>-extern void iwl4965_update_chain_flags(struct iwl_priv *priv);</div><div class='del'>-int iwl4965_set_pwr_src(struct iwl_priv *priv, enum iwl_pwr_src src);</div><div class='del'>-extern int iwl4965_set_power(struct iwl_priv *priv, void *cmd);</div><div class='del'>-</div><div class='del'>-extern const u8 iwl_bcast_addr[ETH_ALEN];</div><div class='del'>-</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Functions implemented in iwl-[34]*.c which are forward declared here</div><div class='del'>- * for use by iwl-base.c</div><div class='del'>- *</div><div class='del'>- * NOTE:  The implementation of these functions are hardware specific</div><div class='del'>- * which is why they are in the hardware specific files (vs. iwl-base.c)</div><div class='add'>+ * NOTE:  The implementation of these functions are not hardware specific</div><div class='add'>+ * which is why they are in the core module files.</div><div class='ctx'>  *</div><div class='ctx'>  * Naming convention --</div><div class='del'>- * iwl4965_         &lt;-- Its part of iwlwifi (should be changed to iwl4965_)</div><div class='del'>- * iwl4965_hw_      &lt;-- Hardware specific (implemented in iwl-XXXX.c by all HW)</div><div class='add'>+ * iwl_         &lt;-- Is part of iwlwifi</div><div class='ctx'>  * iwlXXXX_     &lt;-- Hardware specific (implemented in iwl-XXXX.c for XXXX)</div><div class='ctx'>  * iwl4965_bg_      &lt;-- Called from work queue context</div><div class='ctx'>  * iwl4965_mac_     &lt;-- mac80211 callback</div><div class='ctx'>  *</div><div class='ctx'>  ****************************************************************************/</div><div class='add'>+struct iwl_addsta_cmd;</div><div class='add'>+extern int iwl_send_add_sta(struct iwl_priv *priv,</div><div class='add'>+			    struct iwl_addsta_cmd *sta, u8 flags);</div><div class='add'>+extern u8 iwl_add_station_flags(struct iwl_priv *priv, const u8 *addr,</div><div class='add'>+			int is_ap, u8 flags, struct ieee80211_ht_info *ht_info);</div><div class='add'>+extern void iwl4965_update_chain_flags(struct iwl_priv *priv);</div><div class='add'>+extern int iwl4965_set_pwr_src(struct iwl_priv *priv, enum iwl_pwr_src src);</div><div class='add'>+extern const u8 iwl_bcast_addr[ETH_ALEN];</div><div class='ctx'> extern int iwl_rxq_stop(struct iwl_priv *priv);</div><div class='ctx'> extern void iwl_txq_ctx_stop(struct iwl_priv *priv);</div><div class='del'>-extern unsigned int iwl4965_hw_get_beacon_cmd(struct iwl_priv *priv,</div><div class='del'>-				 struct iwl_frame *frame, u8 rate);</div><div class='del'>-extern void iwl4965_disable_events(struct iwl_priv *priv);</div><div class='del'>-</div><div class='del'>-extern int iwl4965_hw_channel_switch(struct iwl_priv *priv, u16 channel);</div><div class='ctx'> extern int iwl_queue_space(const struct iwl_queue *q);</div><div class='ctx'> static inline int iwl_queue_used(const struct iwl_queue *q, int i)</div><div class='ctx'> {</div><div class='hunk'>@@ -636,12 +612,6 @@ static inline u8 get_cmd_index(struct iwl_queue *q, u32 index, int is_huge)</div><div class='ctx'> </div><div class='ctx'> struct iwl_priv;</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Forward declare iwl-4965.c functions for iwl-base.c</div><div class='del'>- */</div><div class='del'>-extern void iwl4965_rf_kill_ct_config(struct iwl_priv *priv);</div><div class='del'>-int iwl4965_check_empty_hw_queue(struct iwl_priv *priv, int sta_id,</div><div class='del'>-					u8 tid, int txq_id);</div><div class='ctx'> </div><div class='ctx'> /* Structures, enum, and defines specific to the 4965 */</div><div class='ctx'> </div><div class='hunk'>@@ -656,11 +626,6 @@ struct iwl_kw {</div><div class='ctx'> #define IWL_CHANNEL_WIDTH_20MHZ   0</div><div class='ctx'> #define IWL_CHANNEL_WIDTH_40MHZ   1</div><div class='ctx'> </div><div class='del'>-#define IWL_MIMO_PS_STATIC        0</div><div class='del'>-#define IWL_MIMO_PS_NONE          3</div><div class='del'>-#define IWL_MIMO_PS_DYNAMIC       1</div><div class='del'>-#define IWL_MIMO_PS_INVALID       2</div><div class='del'>-</div><div class='ctx'> #define IWL_OPERATION_MODE_AUTO     0</div><div class='ctx'> #define IWL_OPERATION_MODE_HT_ONLY  1</div><div class='ctx'> #define IWL_OPERATION_MODE_MIXED    2</div><div class='hunk'>@@ -671,18 +636,6 @@ struct iwl_kw {</div><div class='ctx'> </div><div class='ctx'> #define TX_POWER_IWL_ILLEGAL_VOLTAGE -10000</div><div class='ctx'> </div><div class='del'>-struct iwl4965_lq_mngr {</div><div class='del'>-	spinlock_t lock;</div><div class='del'>-	s32 max_window_size;</div><div class='del'>-	s32 *expected_tpt;</div><div class='del'>-	u8 *next_higher_rate;</div><div class='del'>-	u8 *next_lower_rate;</div><div class='del'>-	unsigned long stamp;</div><div class='del'>-	unsigned long stamp_last;</div><div class='del'>-	u32 flush_time;</div><div class='del'>-	u32 tx_packets;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /* Sensitivity and chain noise calibration */</div><div class='ctx'> #define INTERFERENCE_DATA_AVAILABLE	__constant_cpu_to_le32(1)</div><div class='ctx'> #define INITIALIZATION_VALUE		0xFFFF</div><div class='hunk'>@@ -727,8 +680,9 @@ enum iwl4965_false_alarm_state {</div><div class='ctx'> </div><div class='ctx'> enum iwl4965_chain_noise_state {</div><div class='ctx'> 	IWL_CHAIN_NOISE_ALIVE = 0,  /* must be 0 */</div><div class='del'>-	IWL_CHAIN_NOISE_ACCUMULATE = 1,</div><div class='del'>-	IWL_CHAIN_NOISE_CALIBRATED = 2,</div><div class='add'>+	IWL_CHAIN_NOISE_ACCUMULATE,</div><div class='add'>+	IWL_CHAIN_NOISE_CALIBRATED,</div><div class='add'>+	IWL_CHAIN_NOISE_DONE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum iwl4965_calib_enabled_state {</div><div class='hunk'>@@ -745,13 +699,10 @@ struct statistics_general_data {</div><div class='ctx'> 	u32 beacon_energy_c;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct iwl_calib_results {</div><div class='del'>-	void *tx_iq_res;</div><div class='del'>-	void *tx_iq_perd_res;</div><div class='del'>-	void *lo_res;</div><div class='del'>-	u32 tx_iq_res_len;</div><div class='del'>-	u32 tx_iq_perd_res_len;</div><div class='del'>-	u32 lo_res_len;</div><div class='add'>+/* Opaque calibration results */</div><div class='add'>+struct iwl_calib_result {</div><div class='add'>+	void *buf;</div><div class='add'>+	size_t buf_len;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum ucode_type {</div><div class='hunk'>@@ -789,17 +740,18 @@ struct iwl_sensitivity_data {</div><div class='ctx'> </div><div class='ctx'> /* Chain noise (differential Rx gain) calib data */</div><div class='ctx'> struct iwl_chain_noise_data {</div><div class='del'>-	u8 state;</div><div class='del'>-	u16 beacon_count;</div><div class='add'>+	u32 active_chains;</div><div class='ctx'> 	u32 chain_noise_a;</div><div class='ctx'> 	u32 chain_noise_b;</div><div class='ctx'> 	u32 chain_noise_c;</div><div class='ctx'> 	u32 chain_signal_a;</div><div class='ctx'> 	u32 chain_signal_b;</div><div class='ctx'> 	u32 chain_signal_c;</div><div class='add'>+	u16 beacon_count;</div><div class='ctx'> 	u8 disconn_array[NUM_RX_CHAINS];</div><div class='ctx'> 	u8 delta_gain_code[NUM_RX_CHAINS];</div><div class='ctx'> 	u8 radio_write;</div><div class='add'>+	u8 state;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define	EEPROM_SEM_TIMEOUT 10		/* milliseconds */</div><div class='hunk'>@@ -813,6 +765,7 @@ enum {</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #define IWL_MAX_NUM_QUEUES	20 /* FIXME: do dynamic allocation */</div><div class='add'>+#define IWL_CALIB_MAX  3</div><div class='ctx'> </div><div class='ctx'> struct iwl_priv {</div><div class='ctx'> </div><div class='hunk'>@@ -828,7 +781,6 @@ struct iwl_priv {</div><div class='ctx'> </div><div class='ctx'> 	enum ieee80211_band band;</div><div class='ctx'> 	int alloc_rxb_skb;</div><div class='del'>-	bool add_radiotap;</div><div class='ctx'> </div><div class='ctx'> 	void (*rx_handlers[REPLY_MAX])(struct iwl_priv *priv,</div><div class='ctx'> 				       struct iwl_rx_mem_buffer *rxb);</div><div class='hunk'>@@ -857,7 +809,7 @@ struct iwl_priv {</div><div class='ctx'> 	s32 last_temperature;</div><div class='ctx'> </div><div class='ctx'> 	/* init calibration results */</div><div class='del'>-	struct iwl_calib_results calib_results;</div><div class='add'>+	struct iwl_calib_result calib_results[IWL_CALIB_MAX];</div><div class='ctx'> </div><div class='ctx'> 	/* Scan related variables */</div><div class='ctx'> 	unsigned long last_scan_jiffies;</div><div class='hunk'>@@ -939,9 +891,6 @@ struct iwl_priv {</div><div class='ctx'> 	u8 last_phy_res[100];</div><div class='ctx'> </div><div class='ctx'> 	/* Rate scaling data */</div><div class='del'>-	struct iwl4965_lq_mngr lq_mngr;</div><div class='del'>-</div><div class='del'>-	/* Rate scaling data */</div><div class='ctx'> 	s8 data_retry_limit;</div><div class='ctx'> 	u8 retry_rate;</div><div class='ctx'> </div><div class='hunk'>@@ -1005,7 +954,7 @@ struct iwl_priv {</div><div class='ctx'> 	u8 *eeprom;</div><div class='ctx'> 	struct iwl_eeprom_calib_info *calib_info;</div><div class='ctx'> </div><div class='del'>-	enum ieee80211_if_types iw_mode;</div><div class='add'>+	enum nl80211_iftype iw_mode;</div><div class='ctx'> </div><div class='ctx'> 	struct sk_buff *ibss_beacon;</div><div class='ctx'> </div><div class='hunk'>@@ -1025,7 +974,6 @@ struct iwl_priv {</div><div class='ctx'> 	 * hardware */</div><div class='ctx'> 	u16 assoc_id;</div><div class='ctx'> 	u16 assoc_capability;</div><div class='del'>-	u8 ps_mode;</div><div class='ctx'> </div><div class='ctx'> 	struct iwl_qos_info qos_data;</div><div class='ctx'> </div><div class='hunk'>@@ -1047,6 +995,7 @@ struct iwl_priv {</div><div class='ctx'> </div><div class='ctx'> 	struct tasklet_struct irq_tasklet;</div><div class='ctx'> </div><div class='add'>+	struct delayed_work set_power_save;</div><div class='ctx'> 	struct delayed_work init_alive_start;</div><div class='ctx'> 	struct delayed_work alive_start;</div><div class='ctx'> 	struct delayed_work scan_check;</div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/iwl-fh.h b/drivers/net/wireless/iwlwifi/iwl-fh.h<br/>index cd11c0ca2991..a72efdf6d1dd 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-fh.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/iwlwifi/iwl-fh.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-fh.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/iwlwifi/iwl-fh.h</a></div><div class='hunk'>@@ -247,8 +247,8 @@</div><div class='ctx'> #define FH_RCSR_CHNL0_RX_CONFIG_RBDBC_SIZE_MSK (0x00F00000) /* bits 20-23 */</div><div class='ctx'> #define FH_RCSR_CHNL0_RX_CONFIG_DMA_CHNL_EN_MSK (0xC0000000) /* bits 30-31*/</div><div class='ctx'> </div><div class='del'>-#define FH_RCSR_RX_CONFIG_RBDCB_SIZE_BITSHIFT	(20)</div><div class='del'>-#define FH_RCSR_RX_CONFIG_REG_IRQ_RBTH_BITSHIFT	(4)</div><div class='add'>+#define FH_RCSR_RX_CONFIG_RBDCB_SIZE_POS	(20)</div><div class='add'>+#define FH_RCSR_RX_CONFIG_REG_IRQ_RBTH_POS	(4)</div><div class='ctx'> #define RX_RB_TIMEOUT	(0x10)</div><div class='ctx'> </div><div class='ctx'> #define FH_RCSR_RX_CONFIG_CHNL_EN_PAUSE_VAL         (0x00000000)</div><div class='hunk'>@@ -260,8 +260,9 @@</div><div class='ctx'> #define FH_RCSR_RX_CONFIG_REG_VAL_RB_SIZE_12K   (0x00020000)</div><div class='ctx'> #define FH_RCSR_RX_CONFIG_REG_VAL_RB_SIZE_16K   (0x00030000)</div><div class='ctx'> </div><div class='del'>-#define FH_RCSR_CHNL0_RX_CONFIG_IRQ_DEST_NO_INT_VAL       (0x00000000)</div><div class='del'>-#define FH_RCSR_CHNL0_RX_CONFIG_IRQ_DEST_INT_HOST_VAL     (0x00001000)</div><div class='add'>+#define FH_RCSR_CHNL0_RX_IGNORE_RXF_EMPTY              (0x00000004)</div><div class='add'>+#define FH_RCSR_CHNL0_RX_CONFIG_IRQ_DEST_NO_INT_VAL    (0x00000000)</div><div class='add'>+#define FH_RCSR_CHNL0_RX_CONFIG_IRQ_DEST_INT_HOST_VAL  (0x00001000)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/iwl-hcmd.c b/drivers/net/wireless/iwlwifi/iwl-hcmd.c<br/>index 2eb03eea1908..8300f3d00a06 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-hcmd.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/iwlwifi/iwl-hcmd.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-hcmd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/iwlwifi/iwl-hcmd.c</a></div><div class='hunk'>@@ -120,8 +120,18 @@ static int iwl_generic_cmd_callback(struct iwl_priv *priv,</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	IWL_DEBUG_HC("back from %s (0x%08X)\n",</div><div class='del'>-			get_cmd_string(cmd-&gt;hdr.cmd), pkt-&gt;hdr.flags);</div><div class='add'>+#ifdef CONFIG_IWLWIFI_DEBUG</div><div class='add'>+	switch (cmd-&gt;hdr.cmd) {</div><div class='add'>+	case REPLY_TX_LINK_QUALITY_CMD:</div><div class='add'>+	case SENSITIVITY_CMD:</div><div class='add'>+		IWL_DEBUG_HC_DUMP("back from %s (0x%08X)\n",</div><div class='add'>+				get_cmd_string(cmd-&gt;hdr.cmd), pkt-&gt;hdr.flags);</div><div class='add'>+				break;</div><div class='add'>+	default:</div><div class='add'>+		IWL_DEBUG_HC("back from %s (0x%08X)\n",</div><div class='add'>+				get_cmd_string(cmd-&gt;hdr.cmd), pkt-&gt;hdr.flags);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	/* Let iwl_tx_complete free the response skb */</div><div class='ctx'> 	return 1;</div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/iwl-io.h b/drivers/net/wireless/iwlwifi/iwl-io.h<br/>index 5bc3df432d2d..9740fcc1805e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-io.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/iwlwifi/iwl-io.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-io.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/iwlwifi/iwl-io.h</a></div><div class='hunk'>@@ -61,7 +61,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define _iwl_write32(priv, ofs, val) writel((val), (priv)-&gt;hw_base + (ofs))</div><div class='add'>+#define _iwl_write32(priv, ofs, val) iowrite32((val), (priv)-&gt;hw_base + (ofs))</div><div class='ctx'> #ifdef CONFIG_IWLWIFI_DEBUG</div><div class='ctx'> static inline void __iwl_write32(const char *f, u32 l, struct iwl_priv *priv,</div><div class='ctx'> 				 u32 ofs, u32 val)</div><div class='hunk'>@@ -75,7 +75,7 @@ static inline void __iwl_write32(const char *f, u32 l, struct iwl_priv *priv,</div><div class='ctx'> #define iwl_write32(priv, ofs, val) _iwl_write32(priv, ofs, val)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#define _iwl_read32(priv, ofs) readl((priv)-&gt;hw_base + (ofs))</div><div class='add'>+#define _iwl_read32(priv, ofs) ioread32((priv)-&gt;hw_base + (ofs))</div><div class='ctx'> #ifdef CONFIG_IWLWIFI_DEBUG</div><div class='ctx'> static inline u32 __iwl_read32(char *f, u32 l, struct iwl_priv *priv, u32 ofs)</div><div class='ctx'> {</div><div class='hunk'>@@ -155,28 +155,10 @@ static inline void __iwl_clear_bit(const char *f, u32 l,</div><div class='ctx'> static inline int _iwl_grab_nic_access(struct iwl_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	u32 gp_ctl;</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_IWLWIFI_DEBUG</div><div class='ctx'> 	if (atomic_read(&amp;priv-&gt;restrict_refcnt))</div><div class='ctx'> 		return 0;</div><div class='ctx'> #endif</div><div class='del'>-	if (test_bit(STATUS_RF_KILL_HW, &amp;priv-&gt;status) ||</div><div class='del'>-	    test_bit(STATUS_RF_KILL_SW, &amp;priv-&gt;status)) {</div><div class='del'>-		IWL_WARNING("WARNING: Requesting MAC access during RFKILL "</div><div class='del'>-			"wakes up NIC\n");</div><div class='del'>-</div><div class='del'>-		/* 10 msec allows time for NIC to complete its data save */</div><div class='del'>-		gp_ctl = _iwl_read32(priv, CSR_GP_CNTRL);</div><div class='del'>-		if (gp_ctl &amp; CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY) {</div><div class='del'>-			IWL_DEBUG_RF_KILL("Wait for complete power-down, "</div><div class='del'>-				"gpctl = 0x%08x\n", gp_ctl);</div><div class='del'>-			mdelay(10);</div><div class='del'>-		} else</div><div class='del'>-			IWL_DEBUG_RF_KILL("power-down complete, "</div><div class='del'>-					  "gpctl = 0x%08x\n", gp_ctl);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* this bit wakes up the NIC */</div><div class='ctx'> 	_iwl_set_bit(priv, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);</div><div class='ctx'> 	ret = _iwl_poll_bit(priv, CSR_GP_CNTRL,</div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/iwl-power.c b/drivers/net/wireless/iwlwifi/iwl-power.c<br/>index a099c9e30e55..60a03d2d2d0e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-power.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/iwlwifi/iwl-power.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-power.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/iwlwifi/iwl-power.c</a></div><div class='hunk'>@@ -152,9 +152,10 @@ static u16 iwl_get_auto_power_mode(struct iwl_priv *priv)</div><div class='ctx'> /* initialize to default */</div><div class='ctx'> static int iwl_power_init_handle(struct iwl_priv *priv)</div><div class='ctx'> {</div><div class='del'>-	int ret = 0, i;</div><div class='ctx'> 	struct iwl_power_mgr *pow_data;</div><div class='ctx'> 	int size = sizeof(struct iwl_power_vec_entry) * IWL_POWER_MAX;</div><div class='add'>+	struct iwl_powertable_cmd *cmd;</div><div class='add'>+	int i;</div><div class='ctx'> 	u16 pci_pm;</div><div class='ctx'> </div><div class='ctx'> 	IWL_DEBUG_POWER("Initialize power \n");</div><div class='hunk'>@@ -167,25 +168,19 @@ static int iwl_power_init_handle(struct iwl_priv *priv)</div><div class='ctx'> 	memcpy(&amp;pow_data-&gt;pwr_range_1[0], &amp;range_1[0], size);</div><div class='ctx'> 	memcpy(&amp;pow_data-&gt;pwr_range_2[0], &amp;range_2[0], size);</div><div class='ctx'> </div><div class='del'>-	ret = pci_read_config_word(priv-&gt;pci_dev,</div><div class='del'>-				  PCI_LINK_CTRL, &amp;pci_pm);</div><div class='del'>-	if (ret != 0)</div><div class='del'>-		return 0;</div><div class='del'>-	else {</div><div class='del'>-		struct iwl_powertable_cmd *cmd;</div><div class='add'>+	pci_read_config_word(priv-&gt;pci_dev, PCI_CFG_LINK_CTRL, &amp;pci_pm);</div><div class='ctx'> </div><div class='del'>-		IWL_DEBUG_POWER("adjust power command flags\n");</div><div class='add'>+	IWL_DEBUG_POWER("adjust power command flags\n");</div><div class='ctx'> </div><div class='del'>-		for (i = 0; i &lt; IWL_POWER_MAX; i++) {</div><div class='del'>-			cmd = &amp;pow_data-&gt;pwr_range_0[i].cmd;</div><div class='add'>+	for (i = 0; i &lt; IWL_POWER_MAX; i++) {</div><div class='add'>+		cmd = &amp;pow_data-&gt;pwr_range_0[i].cmd;</div><div class='ctx'> </div><div class='del'>-			if (pci_pm &amp; 0x1)</div><div class='del'>-				cmd-&gt;flags &amp;= ~IWL_POWER_PCI_PM_MSK;</div><div class='del'>-			else</div><div class='del'>-				cmd-&gt;flags |= IWL_POWER_PCI_PM_MSK;</div><div class='del'>-		}</div><div class='add'>+		if (pci_pm &amp; PCI_CFG_LINK_CTRL_VAL_L0S_EN)</div><div class='add'>+			cmd-&gt;flags &amp;= ~IWL_POWER_PCI_PM_MSK;</div><div class='add'>+		else</div><div class='add'>+			cmd-&gt;flags |= IWL_POWER_PCI_PM_MSK;</div><div class='ctx'> 	}</div><div class='del'>-	return ret;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* adjust power command according to dtim period and power level*/</div><div class='hunk'>@@ -255,17 +250,26 @@ static int iwl_update_power_command(struct iwl_priv *priv,</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * calucaute the final power mode index</div><div class='add'>+ * compute the final power mode index</div><div class='ctx'>  */</div><div class='del'>-int iwl_power_update_mode(struct iwl_priv *priv, u8 refresh)</div><div class='add'>+int iwl_power_update_mode(struct iwl_priv *priv, bool force)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_power_mgr *setting = &amp;(priv-&gt;power_data);</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	u16 uninitialized_var(final_mode);</div><div class='ctx'> </div><div class='del'>-       /* If on battery, set to 3,</div><div class='del'>-	* if plugged into AC power, set to CAM ("continuously aware mode"),</div><div class='del'>-	* else user level */</div><div class='add'>+	/* Don't update the RX chain when chain noise calibration is running */</div><div class='add'>+	if (priv-&gt;chain_noise_data.state != IWL_CHAIN_NOISE_DONE &amp;&amp;</div><div class='add'>+	    priv-&gt;chain_noise_data.state != IWL_CHAIN_NOISE_ALIVE) {</div><div class='add'>+		IWL_DEBUG_POWER("Cannot update the power, chain noise "</div><div class='add'>+			"calibration running: %d\n",</div><div class='add'>+			priv-&gt;chain_noise_data.state);</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If on battery, set to 3,</div><div class='add'>+	 * if plugged into AC power, set to CAM ("continuously aware mode"),</div><div class='add'>+	 * else user level */</div><div class='ctx'> </div><div class='ctx'> 	switch (setting-&gt;system_power_setting) {</div><div class='ctx'> 	case IWL_POWER_SYS_AUTO:</div><div class='hunk'>@@ -286,11 +290,11 @@ int iwl_power_update_mode(struct iwl_priv *priv, u8 refresh)</div><div class='ctx'> 		final_mode = setting-&gt;critical_power_setting;</div><div class='ctx'> </div><div class='ctx'> 	/* driver only support CAM for non STA network */</div><div class='del'>-	if (priv-&gt;iw_mode != IEEE80211_IF_TYPE_STA)</div><div class='add'>+	if (priv-&gt;iw_mode != NL80211_IFTYPE_STATION)</div><div class='ctx'> 		final_mode = IWL_POWER_MODE_CAM;</div><div class='ctx'> </div><div class='ctx'> 	if (!iwl_is_rfkill(priv) &amp;&amp; !setting-&gt;power_disabled &amp;&amp;</div><div class='del'>-	    ((setting-&gt;power_mode != final_mode) || refresh)) {</div><div class='add'>+	    ((setting-&gt;power_mode != final_mode) || force)) {</div><div class='ctx'> 		struct iwl_powertable_cmd cmd;</div><div class='ctx'> </div><div class='ctx'> 		if (final_mode != IWL_POWER_MODE_CAM)</div><div class='hunk'>@@ -324,7 +328,7 @@ EXPORT_SYMBOL(iwl_power_update_mode);</div><div class='ctx'>  * this will be usefull for rate scale to disable PM during heavy</div><div class='ctx'>  * Tx/Rx activities</div><div class='ctx'>  */</div><div class='del'>-int iwl_power_disable_management(struct iwl_priv *priv)</div><div class='add'>+int iwl_power_disable_management(struct iwl_priv *priv, u32 ms)</div><div class='ctx'> {</div><div class='ctx'> 	u16 prev_mode;</div><div class='ctx'> 	int ret = 0;</div><div class='hunk'>@@ -337,6 +341,11 @@ int iwl_power_disable_management(struct iwl_priv *priv)</div><div class='ctx'> 	ret = iwl_power_update_mode(priv, 0);</div><div class='ctx'> 	priv-&gt;power_data.power_disabled = 1;</div><div class='ctx'> 	priv-&gt;power_data.user_power_setting = prev_mode;</div><div class='add'>+	cancel_delayed_work(&amp;priv-&gt;set_power_save);</div><div class='add'>+	if (ms)</div><div class='add'>+		queue_delayed_work(priv-&gt;workqueue, &amp;priv-&gt;set_power_save,</div><div class='add'>+				   msecs_to_jiffies(ms));</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -359,35 +368,26 @@ EXPORT_SYMBOL(iwl_power_enable_management);</div><div class='ctx'> /* set user_power_setting */</div><div class='ctx'> int iwl_power_set_user_mode(struct iwl_priv *priv, u16 mode)</div><div class='ctx'> {</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='ctx'> 	if (mode &gt; IWL_POWER_LIMIT)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;power_data.user_power_setting = mode;</div><div class='ctx'> </div><div class='del'>-	ret = iwl_power_update_mode(priv, 0);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='add'>+	return iwl_power_update_mode(priv, 0);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(iwl_power_set_user_mode);</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /* set system_power_setting. This should be set by over all</div><div class='ctx'>  * PM application.</div><div class='ctx'>  */</div><div class='ctx'> int iwl_power_set_system_mode(struct iwl_priv *priv, u16 mode)</div><div class='ctx'> {</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='ctx'> 	if (mode &gt; IWL_POWER_LIMIT)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;power_data.system_power_setting = mode;</div><div class='ctx'> </div><div class='del'>-	ret = iwl_power_update_mode(priv, 0);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='add'>+	return iwl_power_update_mode(priv, 0);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(iwl_power_set_system_mode);</div><div class='ctx'> </div><div class='hunk'>@@ -431,3 +431,35 @@ int iwl_power_temperature_change(struct iwl_priv *priv)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(iwl_power_temperature_change);</div><div class='add'>+</div><div class='add'>+static void iwl_bg_set_power_save(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct iwl_priv *priv = container_of(work,</div><div class='add'>+				struct iwl_priv, set_power_save.work);</div><div class='add'>+	IWL_DEBUG(IWL_DL_STATE, "update power\n");</div><div class='add'>+</div><div class='add'>+	if (test_bit(STATUS_EXIT_PENDING, &amp;priv-&gt;status))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	/* on starting association we disable power managment</div><div class='add'>+	 * until association, if association failed then this</div><div class='add'>+	 * timer will expire and enable PM again.</div><div class='add'>+	 */</div><div class='add'>+	if (!iwl_is_associated(priv))</div><div class='add'>+		iwl_power_enable_management(priv);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;mutex);</div><div class='add'>+}</div><div class='add'>+void iwl_setup_power_deferred_work(struct iwl_priv *priv)</div><div class='add'>+{</div><div class='add'>+	INIT_DELAYED_WORK(&amp;priv-&gt;set_power_save, iwl_bg_set_power_save);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(iwl_setup_power_deferred_work);</div><div class='add'>+</div><div class='add'>+void iwl_power_cancel_timeout(struct iwl_priv *priv)</div><div class='add'>+{</div><div class='add'>+	cancel_delayed_work(&amp;priv-&gt;set_power_save);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(iwl_power_cancel_timeout);</div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/iwl-power.h b/drivers/net/wireless/iwlwifi/iwl-power.h<br/>index abcbbf96a84e..df484a90ae64 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-power.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/iwlwifi/iwl-power.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-power.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/iwlwifi/iwl-power.h</a></div><div class='hunk'>@@ -72,14 +72,16 @@ struct iwl_power_mgr {</div><div class='ctx'> 	/* final power level that used to calculate final power command */</div><div class='ctx'> 	u8 power_mode;</div><div class='ctx'> 	u8 user_power_setting; /* set by user through mac80211 or sysfs */</div><div class='del'>-	u8 system_power_setting; /* set by kernel syatem tools */</div><div class='add'>+	u8 system_power_setting; /* set by kernel system tools */</div><div class='ctx'> 	u8 critical_power_setting; /* set if driver over heated */</div><div class='ctx'> 	u8 is_battery_active; /* DC/AC power */</div><div class='ctx'> 	u8 power_disabled; /* flag to disable using power saving level */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int iwl_power_update_mode(struct iwl_priv *priv, u8 refresh);</div><div class='del'>-int iwl_power_disable_management(struct iwl_priv *priv);</div><div class='add'>+void iwl_setup_power_deferred_work(struct iwl_priv *priv);</div><div class='add'>+void iwl_power_cancel_timeout(struct iwl_priv *priv);</div><div class='add'>+int iwl_power_update_mode(struct iwl_priv *priv, bool force);</div><div class='add'>+int iwl_power_disable_management(struct iwl_priv *priv, u32 ms);</div><div class='ctx'> int iwl_power_enable_management(struct iwl_priv *priv);</div><div class='ctx'> int iwl_power_set_user_mode(struct iwl_priv *priv, u16 mode);</div><div class='ctx'> int iwl_power_set_system_mode(struct iwl_priv *priv, u16 mode);</div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/iwl-rx.c b/drivers/net/wireless/iwlwifi/iwl-rx.c<br/>index e81bfc42a7cb..7cde9d76ff5d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-rx.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/iwlwifi/iwl-rx.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-rx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/iwlwifi/iwl-rx.c</a></div><div class='hunk'>@@ -376,7 +376,9 @@ int iwl_rx_init(struct iwl_priv *priv, struct iwl_rx_queue *rxq)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	unsigned int rb_size;</div><div class='add'>+	u32 rb_size;</div><div class='add'>+	const u32 rfdnlog = RX_QUEUE_SIZE_LOG; /* 256 RBDs */</div><div class='add'>+	const u32 rb_timeout = 0; /* FIXME: RX_RB_TIMEOUT why this stalls RX */</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='ctx'> 	ret = iwl_grab_nic_access(priv);</div><div class='hunk'>@@ -398,26 +400,32 @@ int iwl_rx_init(struct iwl_priv *priv, struct iwl_rx_queue *rxq)</div><div class='ctx'> </div><div class='ctx'> 	/* Tell device where to find RBD circular buffer in DRAM */</div><div class='ctx'> 	iwl_write_direct32(priv, FH_RSCSR_CHNL0_RBDCB_BASE_REG,</div><div class='del'>-			   rxq-&gt;dma_addr &gt;&gt; 8);</div><div class='add'>+			   (u32)(rxq-&gt;dma_addr &gt;&gt; 8));</div><div class='ctx'> </div><div class='ctx'> 	/* Tell device where in DRAM to update its Rx status */</div><div class='ctx'> 	iwl_write_direct32(priv, FH_RSCSR_CHNL0_STTS_WPTR_REG,</div><div class='ctx'> 			   (priv-&gt;shared_phys + priv-&gt;rb_closed_offset) &gt;&gt; 4);</div><div class='ctx'> </div><div class='del'>-	/* Enable Rx DMA, enable host interrupt, Rx buffer size 4k, 256 RBDs */</div><div class='add'>+	/* Enable Rx DMA</div><div class='add'>+	 * FH_RCSR_CHNL0_RX_IGNORE_RXF_EMPTY is set becuase of HW bug in</div><div class='add'>+	 *      the credit mechanism in 5000 HW RX FIFO</div><div class='add'>+	 * Direct rx interrupts to hosts</div><div class='add'>+	 * Rx buffer size 4 or 8k</div><div class='add'>+	 * RB timeout 0x10</div><div class='add'>+	 * 256 RBDs</div><div class='add'>+	 */</div><div class='ctx'> 	iwl_write_direct32(priv, FH_MEM_RCSR_CHNL0_CONFIG_REG,</div><div class='ctx'> 			   FH_RCSR_RX_CONFIG_CHNL_EN_ENABLE_VAL |</div><div class='add'>+			   FH_RCSR_CHNL0_RX_IGNORE_RXF_EMPTY |</div><div class='ctx'> 			   FH_RCSR_CHNL0_RX_CONFIG_IRQ_DEST_INT_HOST_VAL |</div><div class='del'>-			   rb_size |</div><div class='del'>-			     /* 0x10 &lt;&lt; 4 | */</div><div class='del'>-			   (RX_QUEUE_SIZE_LOG &lt;&lt;</div><div class='del'>-			      FH_RCSR_RX_CONFIG_RBDCB_SIZE_BITSHIFT));</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * iwl_write32(priv,CSR_INT_COAL_REG,0);</div><div class='del'>-	 */</div><div class='add'>+			   rb_size|</div><div class='add'>+			   (rb_timeout &lt;&lt; FH_RCSR_RX_CONFIG_REG_IRQ_RBTH_POS)|</div><div class='add'>+			   (rfdnlog &lt;&lt; FH_RCSR_RX_CONFIG_RBDCB_SIZE_POS));</div><div class='ctx'> </div><div class='ctx'> 	iwl_release_nic_access(priv);</div><div class='add'>+</div><div class='add'>+	iwl_write32(priv, CSR_INT_COALESCING, 0x40);</div><div class='add'>+</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -789,107 +797,6 @@ static inline void iwl_dbg_report_frame(struct iwl_priv *priv,</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static void iwl_add_radiotap(struct iwl_priv *priv,</div><div class='del'>-				 struct sk_buff *skb,</div><div class='del'>-				 struct iwl_rx_phy_res *rx_start,</div><div class='del'>-				 struct ieee80211_rx_status *stats,</div><div class='del'>-				 u32 ampdu_status)</div><div class='del'>-{</div><div class='del'>-	s8 signal = stats-&gt;signal;</div><div class='del'>-	s8 noise = 0;</div><div class='del'>-	int rate = stats-&gt;rate_idx;</div><div class='del'>-	u64 tsf = stats-&gt;mactime;</div><div class='del'>-	__le16 antenna;</div><div class='del'>-	__le16 phy_flags_hw = rx_start-&gt;phy_flags;</div><div class='del'>-	struct iwl4965_rt_rx_hdr {</div><div class='del'>-		struct ieee80211_radiotap_header rt_hdr;</div><div class='del'>-		__le64 rt_tsf;		/* TSF */</div><div class='del'>-		u8 rt_flags;		/* radiotap packet flags */</div><div class='del'>-		u8 rt_rate;		/* rate in 500kb/s */</div><div class='del'>-		__le16 rt_channelMHz;	/* channel in MHz */</div><div class='del'>-		__le16 rt_chbitmask;	/* channel bitfield */</div><div class='del'>-		s8 rt_dbmsignal;	/* signal in dBm, kluged to signed */</div><div class='del'>-		s8 rt_dbmnoise;</div><div class='del'>-		u8 rt_antenna;		/* antenna number */</div><div class='del'>-	} __attribute__ ((packed)) *iwl4965_rt;</div><div class='del'>-</div><div class='del'>-	/* TODO: We won't have enough headroom for HT frames. Fix it later. */</div><div class='del'>-	if (skb_headroom(skb) &lt; sizeof(*iwl4965_rt)) {</div><div class='del'>-		if (net_ratelimit())</div><div class='del'>-			printk(KERN_ERR "not enough headroom [%d] for "</div><div class='del'>-			       "radiotap head [%zd]\n",</div><div class='del'>-			       skb_headroom(skb), sizeof(*iwl4965_rt));</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* put radiotap header in front of 802.11 header and data */</div><div class='del'>-	iwl4965_rt = (void *)skb_push(skb, sizeof(*iwl4965_rt));</div><div class='del'>-</div><div class='del'>-	/* initialise radiotap header */</div><div class='del'>-	iwl4965_rt-&gt;rt_hdr.it_version = PKTHDR_RADIOTAP_VERSION;</div><div class='del'>-	iwl4965_rt-&gt;rt_hdr.it_pad = 0;</div><div class='del'>-</div><div class='del'>-	/* total header + data */</div><div class='del'>-	put_unaligned_le16(sizeof(*iwl4965_rt), &amp;iwl4965_rt-&gt;rt_hdr.it_len);</div><div class='del'>-</div><div class='del'>-	/* Indicate all the fields we add to the radiotap header */</div><div class='del'>-	put_unaligned_le32((1 &lt;&lt; IEEE80211_RADIOTAP_TSFT) |</div><div class='del'>-			   (1 &lt;&lt; IEEE80211_RADIOTAP_FLAGS) |</div><div class='del'>-			   (1 &lt;&lt; IEEE80211_RADIOTAP_RATE) |</div><div class='del'>-			   (1 &lt;&lt; IEEE80211_RADIOTAP_CHANNEL) |</div><div class='del'>-			   (1 &lt;&lt; IEEE80211_RADIOTAP_DBM_ANTSIGNAL) |</div><div class='del'>-			   (1 &lt;&lt; IEEE80211_RADIOTAP_DBM_ANTNOISE) |</div><div class='del'>-			   (1 &lt;&lt; IEEE80211_RADIOTAP_ANTENNA),</div><div class='del'>-			   &amp;(iwl4965_rt-&gt;rt_hdr.it_present));</div><div class='del'>-</div><div class='del'>-	/* Zero the flags, we'll add to them as we go */</div><div class='del'>-	iwl4965_rt-&gt;rt_flags = 0;</div><div class='del'>-</div><div class='del'>-	put_unaligned_le64(tsf, &amp;iwl4965_rt-&gt;rt_tsf);</div><div class='del'>-</div><div class='del'>-	iwl4965_rt-&gt;rt_dbmsignal = signal;</div><div class='del'>-	iwl4965_rt-&gt;rt_dbmnoise = noise;</div><div class='del'>-</div><div class='del'>-	/* Convert the channel frequency and set the flags */</div><div class='del'>-	put_unaligned(cpu_to_le16(stats-&gt;freq), &amp;iwl4965_rt-&gt;rt_channelMHz);</div><div class='del'>-	if (!(phy_flags_hw &amp; RX_RES_PHY_FLAGS_BAND_24_MSK))</div><div class='del'>-		put_unaligned_le16(IEEE80211_CHAN_OFDM | IEEE80211_CHAN_5GHZ,</div><div class='del'>-				   &amp;iwl4965_rt-&gt;rt_chbitmask);</div><div class='del'>-	else if (phy_flags_hw &amp; RX_RES_PHY_FLAGS_MOD_CCK_MSK)</div><div class='del'>-		put_unaligned_le16(IEEE80211_CHAN_CCK | IEEE80211_CHAN_2GHZ,</div><div class='del'>-				   &amp;iwl4965_rt-&gt;rt_chbitmask);</div><div class='del'>-	else	/* 802.11g */</div><div class='del'>-		put_unaligned_le16(IEEE80211_CHAN_OFDM | IEEE80211_CHAN_2GHZ,</div><div class='del'>-				   &amp;iwl4965_rt-&gt;rt_chbitmask);</div><div class='del'>-</div><div class='del'>-	if (rate == -1)</div><div class='del'>-		iwl4965_rt-&gt;rt_rate = 0;</div><div class='del'>-	else</div><div class='del'>-		iwl4965_rt-&gt;rt_rate = iwl_rates[rate].ieee;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * "antenna number"</div><div class='del'>-	 *</div><div class='del'>-	 * It seems that the antenna field in the phy flags value</div><div class='del'>-	 * is actually a bitfield. This is undefined by radiotap,</div><div class='del'>-	 * it wants an actual antenna number but I always get "7"</div><div class='del'>-	 * for most legacy frames I receive indicating that the</div><div class='del'>-	 * same frame was received on all three RX chains.</div><div class='del'>-	 *</div><div class='del'>-	 * I think this field should be removed in favour of a</div><div class='del'>-	 * new 802.11n radiotap field "RX chains" that is defined</div><div class='del'>-	 * as a bitmask.</div><div class='del'>-	 */</div><div class='del'>-	antenna = phy_flags_hw &amp; RX_RES_PHY_FLAGS_ANTENNA_MSK;</div><div class='del'>-	iwl4965_rt-&gt;rt_antenna = le16_to_cpu(antenna) &gt;&gt; 4;</div><div class='del'>-</div><div class='del'>-	/* set the preamble flag if appropriate */</div><div class='del'>-	if (phy_flags_hw &amp; RX_RES_PHY_FLAGS_SHORT_PREAMBLE_MSK)</div><div class='del'>-		iwl4965_rt-&gt;rt_flags |= IEEE80211_RADIOTAP_F_SHORTPRE;</div><div class='del'>-</div><div class='del'>-	stats-&gt;flag |= RX_FLAG_RADIOTAP;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void iwl_update_rx_stats(struct iwl_priv *priv, u16 fc, u16 len)</div><div class='ctx'> {</div><div class='ctx'> 	/* 0 - mgmt, 1 - cnt, 2 - data */</div><div class='hunk'>@@ -1074,9 +981,6 @@ static void iwl_pass_packet_to_mac80211(struct iwl_priv *priv,</div><div class='ctx'> 	    iwl_set_decrypted_flag(priv, hdr, ampdu_status, stats))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;add_radiotap)</div><div class='del'>-		iwl_add_radiotap(priv, rxb-&gt;skb, rx_start, stats, ampdu_status);</div><div class='del'>-</div><div class='ctx'> 	iwl_update_rx_stats(priv, le16_to_cpu(hdr-&gt;frame_control), len);</div><div class='ctx'> 	ieee80211_rx_irqsafe(priv-&gt;hw, rxb-&gt;skb, stats);</div><div class='ctx'> 	priv-&gt;alloc_rxb_skb--;</div><div class='hunk'>@@ -1130,10 +1034,10 @@ static int iwl_is_network_packet(struct iwl_priv *priv,</div><div class='ctx'> 	/* Filter incoming packets to determine if they are targeted toward</div><div class='ctx'> 	 * this network, discarding packets coming from ourselves */</div><div class='ctx'> 	switch (priv-&gt;iw_mode) {</div><div class='del'>-	case IEEE80211_IF_TYPE_IBSS: /* Header: Dest. | Source    | BSSID */</div><div class='add'>+	case NL80211_IFTYPE_ADHOC: /* Header: Dest. | Source    | BSSID */</div><div class='ctx'> 		/* packets to our IBSS update information */</div><div class='ctx'> 		return !compare_ether_addr(header-&gt;addr3, priv-&gt;bssid);</div><div class='del'>-	case IEEE80211_IF_TYPE_STA: /* Header: Dest. | AP{BSSID} | Source */</div><div class='add'>+	case NL80211_IFTYPE_STATION: /* Header: Dest. | AP{BSSID} | Source */</div><div class='ctx'> 		/* packets to our IBSS update information */</div><div class='ctx'> 		return !compare_ether_addr(header-&gt;addr2, priv-&gt;bssid);</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -1171,7 +1075,6 @@ void iwl_rx_reply_rx(struct iwl_priv *priv,</div><div class='ctx'> 	if (rx_status.band == IEEE80211_BAND_5GHZ)</div><div class='ctx'> 		rx_status.rate_idx -= IWL_FIRST_OFDM_RATE;</div><div class='ctx'> </div><div class='del'>-	rx_status.antenna = 0;</div><div class='ctx'> 	rx_status.flag = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* TSF isn't reliable. In order to allow smooth user experience,</div><div class='hunk'>@@ -1253,8 +1156,28 @@ void iwl_rx_reply_rx(struct iwl_priv *priv,</div><div class='ctx'> 		rx_status.signal, rx_status.noise, rx_status.signal,</div><div class='ctx'> 		(unsigned long long)rx_status.mactime);</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * "antenna number"</div><div class='add'>+	 *</div><div class='add'>+	 * It seems that the antenna field in the phy flags value</div><div class='add'>+	 * is actually a bitfield. This is undefined by radiotap,</div><div class='add'>+	 * it wants an actual antenna number but I always get "7"</div><div class='add'>+	 * for most legacy frames I receive indicating that the</div><div class='add'>+	 * same frame was received on all three RX chains.</div><div class='add'>+	 *</div><div class='add'>+	 * I think this field should be removed in favour of a</div><div class='add'>+	 * new 802.11n radiotap field "RX chains" that is defined</div><div class='add'>+	 * as a bitmask.</div><div class='add'>+	 */</div><div class='add'>+	rx_status.antenna = le16_to_cpu(rx_start-&gt;phy_flags &amp;</div><div class='add'>+					RX_RES_PHY_FLAGS_ANTENNA_MSK) &gt;&gt; 4;</div><div class='add'>+</div><div class='add'>+	/* set the preamble flag if appropriate */</div><div class='add'>+	if (rx_start-&gt;phy_flags &amp; RX_RES_PHY_FLAGS_SHORT_PREAMBLE_MSK)</div><div class='add'>+		rx_status.flag |= RX_FLAG_SHORTPRE;</div><div class='add'>+</div><div class='ctx'> 	/* Take shortcut when only in monitor mode */</div><div class='del'>-	if (priv-&gt;iw_mode == IEEE80211_IF_TYPE_MNTR) {</div><div class='add'>+	if (priv-&gt;iw_mode == NL80211_IFTYPE_MONITOR) {</div><div class='ctx'> 		iwl_pass_packet_to_mac80211(priv, include_phy,</div><div class='ctx'> 						 rxb, &amp;rx_status);</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -1271,7 +1194,7 @@ void iwl_rx_reply_rx(struct iwl_priv *priv,</div><div class='ctx'> 	switch (fc &amp; IEEE80211_FCTL_FTYPE) {</div><div class='ctx'> 	case IEEE80211_FTYPE_MGMT:</div><div class='ctx'> 	case IEEE80211_FTYPE_DATA:</div><div class='del'>-		if (priv-&gt;iw_mode == IEEE80211_IF_TYPE_AP)</div><div class='add'>+		if (priv-&gt;iw_mode == NL80211_IFTYPE_AP)</div><div class='ctx'> 			iwl_update_ps_mode(priv, fc  &amp; IEEE80211_FCTL_PM,</div><div class='ctx'> 						header-&gt;addr2);</div><div class='ctx'> 		/* fall through */</div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/iwl-scan.c b/drivers/net/wireless/iwlwifi/iwl-scan.c<br/>index 6c8ac3a87d54..3b0bee331a33 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-scan.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/iwlwifi/iwl-scan.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-scan.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/iwlwifi/iwl-scan.c</a></div><div class='hunk'>@@ -88,7 +88,7 @@ static int iwl_is_empty_essid(const char *essid, int essid_len)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-const char *iwl_escape_essid(const char *essid, u8 essid_len)</div><div class='add'>+static const char *iwl_escape_essid(const char *essid, u8 essid_len)</div><div class='ctx'> {</div><div class='ctx'> 	static char escaped[IW_ESSID_MAX_SIZE * 2 + 1];</div><div class='ctx'> 	const char *s = essid;</div><div class='hunk'>@@ -111,7 +111,6 @@ const char *iwl_escape_essid(const char *essid, u8 essid_len)</div><div class='ctx'> 	*d = '\0';</div><div class='ctx'> 	return escaped;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(iwl_escape_essid);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * iwl_scan_cancel - Cancel any currently executing HW scan</div><div class='hunk'>@@ -464,11 +463,6 @@ void iwl_init_scan_params(struct iwl_priv *priv)</div><div class='ctx'> </div><div class='ctx'> int iwl_scan_initiate(struct iwl_priv *priv)</div><div class='ctx'> {</div><div class='del'>-	if (priv-&gt;iw_mode == IEEE80211_IF_TYPE_AP) {</div><div class='del'>-		IWL_ERROR("APs don't scan.\n");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if (!iwl_is_ready_rf(priv)) {</div><div class='ctx'> 		IWL_DEBUG_SCAN("Aborting scan due to not ready.\n");</div><div class='ctx'> 		return -EIO;</div><div class='hunk'>@@ -480,8 +474,7 @@ int iwl_scan_initiate(struct iwl_priv *priv)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (test_bit(STATUS_SCAN_ABORTING, &amp;priv-&gt;status)) {</div><div class='del'>-		IWL_DEBUG_SCAN("Scan request while abort pending.  "</div><div class='del'>-			       "Queuing.\n");</div><div class='add'>+		IWL_DEBUG_SCAN("Scan request while abort pending\n");</div><div class='ctx'> 		return -EAGAIN;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -710,7 +703,7 @@ static void iwl_bg_request_scan(struct work_struct *data)</div><div class='ctx'> 	u16 cmd_len;</div><div class='ctx'> 	enum ieee80211_band band;</div><div class='ctx'> 	u8 n_probes = 2;</div><div class='del'>-	u8 rx_chain = 0x7; /* bitmap: ABC chains */</div><div class='add'>+	u8 rx_chain = priv-&gt;hw_params.valid_rx_ant;</div><div class='ctx'> </div><div class='ctx'> 	conf = ieee80211_get_hw_conf(priv-&gt;hw);</div><div class='ctx'> </div><div class='hunk'>@@ -850,7 +843,7 @@ static void iwl_bg_request_scan(struct work_struct *data)</div><div class='ctx'> </div><div class='ctx'> 		/* Force use of chains B and C (0x6) for scan Rx for 4965</div><div class='ctx'> 		 * Avoid A (0x1) because of its off-channel reception on A-band.</div><div class='del'>-		 * MIMO is not used here, but value is required */</div><div class='add'>+		 */</div><div class='ctx'> 		if ((priv-&gt;hw_rev &amp; CSR_HW_REV_TYPE_MSK) == CSR_HW_REV_TYPE_4965)</div><div class='ctx'> 			rx_chain = 0x6;</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -858,6 +851,7 @@ static void iwl_bg_request_scan(struct work_struct *data)</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* MIMO is not used here, but value is required */</div><div class='ctx'> 	scan-&gt;rx_chain = RXON_RX_CHAIN_DRIVER_FORCE_MSK |</div><div class='ctx'> 				cpu_to_le16((0x7 &lt;&lt; RXON_RX_CHAIN_VALID_POS) |</div><div class='ctx'> 				(rx_chain &lt;&lt; RXON_RX_CHAIN_FORCE_SEL_POS) |</div><div class='hunk'>@@ -869,7 +863,7 @@ static void iwl_bg_request_scan(struct work_struct *data)</div><div class='ctx'> </div><div class='ctx'> 	scan-&gt;tx_cmd.len = cpu_to_le16(cmd_len);</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;iw_mode == IEEE80211_IF_TYPE_MNTR)</div><div class='add'>+	if (priv-&gt;iw_mode == NL80211_IFTYPE_MONITOR)</div><div class='ctx'> 		scan-&gt;filter_flags = RXON_FILTER_PROMISC_MSK;</div><div class='ctx'> </div><div class='ctx'> 	scan-&gt;filter_flags |= (RXON_FILTER_ACCEPT_GRP_MSK |</div><div class='hunk'>@@ -922,10 +916,29 @@ static void iwl_bg_abort_scan(struct work_struct *work)</div><div class='ctx'> 	mutex_unlock(&amp;priv-&gt;mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void iwl_bg_scan_completed(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct iwl_priv *priv =</div><div class='add'>+	    container_of(work, struct iwl_priv, scan_completed);</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_SCAN("SCAN complete scan\n");</div><div class='add'>+</div><div class='add'>+	if (test_bit(STATUS_EXIT_PENDING, &amp;priv-&gt;status))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ieee80211_scan_completed(priv-&gt;hw);</div><div class='add'>+</div><div class='add'>+	/* Since setting the TXPOWER may have been deferred while</div><div class='add'>+	 * performing the scan, fire one off */</div><div class='add'>+	mutex_lock(&amp;priv-&gt;mutex);</div><div class='add'>+	iwl_set_tx_power(priv, priv-&gt;tx_power_user_lmt, true);</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> void iwl_setup_scan_deferred_work(struct iwl_priv *priv)</div><div class='ctx'> {</div><div class='del'>-	/*  FIXME: move here when resolved PENDING</div><div class='del'>-	 *  INIT_WORK(&amp;priv-&gt;scan_completed, iwl_bg_scan_completed); */</div><div class='add'>+	INIT_WORK(&amp;priv-&gt;scan_completed, iwl_bg_scan_completed);</div><div class='ctx'> 	INIT_WORK(&amp;priv-&gt;request_scan, iwl_bg_request_scan);</div><div class='ctx'> 	INIT_WORK(&amp;priv-&gt;abort_scan, iwl_bg_abort_scan);</div><div class='ctx'> 	INIT_DELAYED_WORK(&amp;priv-&gt;scan_check, iwl_bg_scan_check);</div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/iwl-sta.c b/drivers/net/wireless/iwlwifi/iwl-sta.c<br/>index 6283a3a707f5..61797f3f8d5c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-sta.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/iwlwifi/iwl-sta.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-sta.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/iwlwifi/iwl-sta.c</a></div><div class='hunk'>@@ -47,8 +47,8 @@ u8 iwl_find_station(struct iwl_priv *priv, const u8 *addr)</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	DECLARE_MAC_BUF(mac);</div><div class='ctx'> </div><div class='del'>-	if ((priv-&gt;iw_mode == IEEE80211_IF_TYPE_IBSS) ||</div><div class='del'>-	    (priv-&gt;iw_mode == IEEE80211_IF_TYPE_AP))</div><div class='add'>+	if ((priv-&gt;iw_mode == NL80211_IFTYPE_ADHOC) ||</div><div class='add'>+	    (priv-&gt;iw_mode == NL80211_IFTYPE_AP))</div><div class='ctx'> 		start = IWL_STA_ID;</div><div class='ctx'> </div><div class='ctx'> 	if (is_broadcast_ether_addr(addr))</div><div class='hunk'>@@ -74,7 +74,7 @@ EXPORT_SYMBOL(iwl_find_station);</div><div class='ctx'> </div><div class='ctx'> int iwl_get_ra_sta_id(struct iwl_priv *priv, struct ieee80211_hdr *hdr)</div><div class='ctx'> {</div><div class='del'>-	if (priv-&gt;iw_mode == IEEE80211_IF_TYPE_STA) {</div><div class='add'>+	if (priv-&gt;iw_mode == NL80211_IFTYPE_STATION) {</div><div class='ctx'> 		return IWL_AP_ID;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		u8 *da = ieee80211_get_DA(hdr);</div><div class='hunk'>@@ -191,20 +191,20 @@ static void iwl_set_ht_add_station(struct iwl_priv *priv, u8 index,</div><div class='ctx'> 	if (!sta_ht_inf || !sta_ht_inf-&gt;ht_supported)</div><div class='ctx'> 		goto done;</div><div class='ctx'> </div><div class='del'>-	mimo_ps_mode = (sta_ht_inf-&gt;cap &amp; IEEE80211_HT_CAP_MIMO_PS) &gt;&gt; 2;</div><div class='add'>+	mimo_ps_mode = (sta_ht_inf-&gt;cap &amp; IEEE80211_HT_CAP_SM_PS) &gt;&gt; 2;</div><div class='ctx'> </div><div class='ctx'> 	sta_flags = priv-&gt;stations[index].sta.station_flags;</div><div class='ctx'> </div><div class='ctx'> 	sta_flags &amp;= ~(STA_FLG_RTS_MIMO_PROT_MSK | STA_FLG_MIMO_DIS_MSK);</div><div class='ctx'> </div><div class='ctx'> 	switch (mimo_ps_mode) {</div><div class='del'>-	case WLAN_HT_CAP_MIMO_PS_STATIC:</div><div class='add'>+	case WLAN_HT_CAP_SM_PS_STATIC:</div><div class='ctx'> 		sta_flags |= STA_FLG_MIMO_DIS_MSK;</div><div class='ctx'> 		break;</div><div class='del'>-	case WLAN_HT_CAP_MIMO_PS_DYNAMIC:</div><div class='add'>+	case WLAN_HT_CAP_SM_PS_DYNAMIC:</div><div class='ctx'> 		sta_flags |= STA_FLG_RTS_MIMO_PROT_MSK;</div><div class='ctx'> 		break;</div><div class='del'>-	case WLAN_HT_CAP_MIMO_PS_DISABLED:</div><div class='add'>+	case WLAN_HT_CAP_SM_PS_DISABLED:</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		IWL_WARNING("Invalid MIMO PS mode %d\n", mimo_ps_mode);</div><div class='hunk'>@@ -286,7 +286,7 @@ u8 iwl_add_station_flags(struct iwl_priv *priv, const u8 *addr, int is_ap,</div><div class='ctx'> </div><div class='ctx'> 	/* BCAST station and IBSS stations do not work in HT mode */</div><div class='ctx'> 	if (sta_id != priv-&gt;hw_params.bcast_sta_id &amp;&amp;</div><div class='del'>-	    priv-&gt;iw_mode != IEEE80211_IF_TYPE_IBSS)</div><div class='add'>+	    priv-&gt;iw_mode != NL80211_IFTYPE_ADHOC)</div><div class='ctx'> 		iwl_set_ht_add_station(priv, sta_id, ht_info);</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;priv-&gt;sta_lock, flags_spin);</div><div class='hunk'>@@ -817,7 +817,7 @@ int iwl_send_lq_cmd(struct iwl_priv *priv,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	if ((lq-&gt;sta_id == 0xFF) &amp;&amp;</div><div class='del'>-	    (priv-&gt;iw_mode == IEEE80211_IF_TYPE_IBSS))</div><div class='add'>+	    (priv-&gt;iw_mode == NL80211_IFTYPE_ADHOC))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (lq-&gt;sta_id == 0xFF)</div><div class='hunk'>@@ -904,7 +904,7 @@ int iwl_rxon_add_station(struct iwl_priv *priv, const u8 *addr, int is_ap)</div><div class='ctx'> </div><div class='ctx'> 	if ((is_ap) &amp;&amp;</div><div class='ctx'> 	    (conf-&gt;flags &amp; IEEE80211_CONF_SUPPORT_HT_MODE) &amp;&amp;</div><div class='del'>-	    (priv-&gt;iw_mode == IEEE80211_IF_TYPE_STA))</div><div class='add'>+	    (priv-&gt;iw_mode == NL80211_IFTYPE_STATION))</div><div class='ctx'> 		sta_id = iwl_add_station_flags(priv, addr, is_ap,</div><div class='ctx'> 						   0, cur_ht_config);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -938,11 +938,11 @@ int iwl_get_sta_id(struct iwl_priv *priv, struct ieee80211_hdr *hdr)</div><div class='ctx'> </div><div class='ctx'> 	/* If we are a client station in a BSS network, use the special</div><div class='ctx'> 	 * AP station entry (that's the only station we communicate with) */</div><div class='del'>-	case IEEE80211_IF_TYPE_STA:</div><div class='add'>+	case NL80211_IFTYPE_STATION:</div><div class='ctx'> 		return IWL_AP_ID;</div><div class='ctx'> </div><div class='ctx'> 	/* If we are an AP, then find the station, or use BCAST */</div><div class='del'>-	case IEEE80211_IF_TYPE_AP:</div><div class='add'>+	case NL80211_IFTYPE_AP:</div><div class='ctx'> 		sta_id = iwl_find_station(priv, hdr-&gt;addr1);</div><div class='ctx'> 		if (sta_id != IWL_INVALID_STATION)</div><div class='ctx'> 			return sta_id;</div><div class='hunk'>@@ -950,7 +950,7 @@ int iwl_get_sta_id(struct iwl_priv *priv, struct ieee80211_hdr *hdr)</div><div class='ctx'> </div><div class='ctx'> 	/* If this frame is going out to an IBSS network, find the station,</div><div class='ctx'> 	 * or create a new station table entry */</div><div class='del'>-	case IEEE80211_IF_TYPE_IBSS:</div><div class='add'>+	case NL80211_IFTYPE_ADHOC:</div><div class='ctx'> 		sta_id = iwl_find_station(priv, hdr-&gt;addr1);</div><div class='ctx'> 		if (sta_id != IWL_INVALID_STATION)</div><div class='ctx'> 			return sta_id;</div><div class='hunk'>@@ -968,6 +968,11 @@ int iwl_get_sta_id(struct iwl_priv *priv, struct ieee80211_hdr *hdr)</div><div class='ctx'> 		iwl_print_hex_dump(priv, IWL_DL_DROP, (u8 *) hdr, sizeof(*hdr));</div><div class='ctx'> 		return priv-&gt;hw_params.bcast_sta_id;</div><div class='ctx'> </div><div class='add'>+	/* If we are in monitor mode, use BCAST. This is required for</div><div class='add'>+	 * packet injection. */</div><div class='add'>+	case NL80211_IFTYPE_MONITOR:</div><div class='add'>+		return priv-&gt;hw_params.bcast_sta_id;</div><div class='add'>+</div><div class='ctx'> 	default:</div><div class='ctx'> 		IWL_WARNING("Unknown mode of operation: %d\n", priv-&gt;iw_mode);</div><div class='ctx'> 		return priv-&gt;hw_params.bcast_sta_id;</div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/iwl-tx.c b/drivers/net/wireless/iwlwifi/iwl-tx.c<br/>index 78b1a7a4ca40..907a53ebc6e4 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-tx.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/iwlwifi/iwl-tx.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-tx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/iwlwifi/iwl-tx.c</a></div><div class='hunk'>@@ -63,7 +63,7 @@ static const u16 default_tid_to_tx_fifo[] = {</div><div class='ctx'>  * Does NOT advance any TFD circular buffer read/write indexes</div><div class='ctx'>  * Does NOT free the TFD itself (which is within circular buffer)</div><div class='ctx'>  */</div><div class='del'>-int iwl_hw_txq_free_tfd(struct iwl_priv *priv, struct iwl_tx_queue *txq)</div><div class='add'>+static int iwl_hw_txq_free_tfd(struct iwl_priv *priv, struct iwl_tx_queue *txq)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_tfd_frame *bd_tmp = (struct iwl_tfd_frame *)&amp;txq-&gt;bd[0];</div><div class='ctx'> 	struct iwl_tfd_frame *bd = &amp;bd_tmp[txq-&gt;q.read_ptr];</div><div class='hunk'>@@ -115,10 +115,8 @@ int iwl_hw_txq_free_tfd(struct iwl_priv *priv, struct iwl_tx_queue *txq)</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(iwl_hw_txq_free_tfd);</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-int iwl_hw_txq_attach_buf_to_tfd(struct iwl_priv *priv, void *ptr,</div><div class='add'>+static int iwl_hw_txq_attach_buf_to_tfd(struct iwl_priv *priv, void *ptr,</div><div class='ctx'> 				 dma_addr_t addr, u16 len)</div><div class='ctx'> {</div><div class='ctx'> 	int index, is_odd;</div><div class='hunk'>@@ -126,7 +124,7 @@ int iwl_hw_txq_attach_buf_to_tfd(struct iwl_priv *priv, void *ptr,</div><div class='ctx'> 	u32 num_tbs = IWL_GET_BITS(*tfd, num_tbs);</div><div class='ctx'> </div><div class='ctx'> 	/* Each TFD can point to a maximum 20 Tx buffers */</div><div class='del'>-	if ((num_tbs &gt;= MAX_NUM_OF_TBS) || (num_tbs &lt; 0)) {</div><div class='add'>+	if (num_tbs &gt;= MAX_NUM_OF_TBS) {</div><div class='ctx'> 		IWL_ERROR("Error can not send more than %d chunks\n",</div><div class='ctx'> 			  MAX_NUM_OF_TBS);</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -151,7 +149,6 @@ int iwl_hw_txq_attach_buf_to_tfd(struct iwl_priv *priv, void *ptr,</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(iwl_hw_txq_attach_buf_to_tfd);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * iwl_txq_update_write_ptr - Send new write index to hardware</div><div class='hunk'>@@ -478,7 +475,6 @@ void iwl_hw_txq_ctx_free(struct iwl_priv *priv)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(iwl_hw_txq_ctx_free);</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * iwl_txq_ctx_reset - Reset TX queue context</div><div class='ctx'>  * Destroys all DMA structures and initialise them again</div><div class='hunk'>@@ -545,6 +541,7 @@ int iwl_txq_ctx_reset(struct iwl_priv *priv)</div><div class='ctx'>  error_kw:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * iwl_txq_ctx_stop - Stop all Tx DMA channels, free Tx queue memory</div><div class='ctx'>  */</div><div class='hunk'>@@ -796,11 +793,6 @@ int iwl_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)</div><div class='ctx'> 		goto drop_unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!priv-&gt;vif) {</div><div class='del'>-		IWL_DEBUG_DROP("Dropping - !priv-&gt;vif\n");</div><div class='del'>-		goto drop_unlock;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if ((ieee80211_get_tx_rate(priv-&gt;hw, info)-&gt;hw_value &amp; 0xFF) ==</div><div class='ctx'> 	     IWL_INVALID_RATE) {</div><div class='ctx'> 		IWL_ERROR("ERROR: No TX rate available.\n");</div><div class='hunk'>@@ -822,16 +814,18 @@ int iwl_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	/* drop all data frame if we are not associated */</div><div class='ctx'> 	if (ieee80211_is_data(fc) &amp;&amp;</div><div class='del'>-	   (!iwl_is_associated(priv) ||</div><div class='del'>-	    ((priv-&gt;iw_mode == IEEE80211_IF_TYPE_STA) &amp;&amp; !priv-&gt;assoc_id) ||</div><div class='del'>-	    !priv-&gt;assoc_station_added)) {</div><div class='add'>+	    (priv-&gt;iw_mode != NL80211_IFTYPE_MONITOR ||</div><div class='add'>+	    !(info-&gt;flags &amp; IEEE80211_TX_CTL_INJECTED)) &amp;&amp; /* packet injection */</div><div class='add'>+	    (!iwl_is_associated(priv) ||</div><div class='add'>+	     ((priv-&gt;iw_mode == NL80211_IFTYPE_STATION) &amp;&amp; !priv-&gt;assoc_id) ||</div><div class='add'>+	     !priv-&gt;assoc_station_added)) {</div><div class='ctx'> 		IWL_DEBUG_DROP("Dropping - !iwl_is_associated\n");</div><div class='ctx'> 		goto drop_unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-	hdr_len = ieee80211_get_hdrlen(le16_to_cpu(fc));</div><div class='add'>+	hdr_len = ieee80211_hdrlen(fc);</div><div class='ctx'> </div><div class='ctx'> 	/* Find (or create) index into station table for destination station */</div><div class='ctx'> 	sta_id = iwl_get_sta_id(priv, hdr);</div><div class='hunk'>@@ -849,7 +843,7 @@ int iwl_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)</div><div class='ctx'> 	txq_id = swq_id;</div><div class='ctx'> 	if (ieee80211_is_data_qos(fc)) {</div><div class='ctx'> 		qc = ieee80211_get_qos_ctl(hdr);</div><div class='del'>-		tid = qc[0] &amp; 0xf;</div><div class='add'>+		tid = qc[0] &amp; IEEE80211_QOS_CTL_TID_MASK;</div><div class='ctx'> 		seq_number = priv-&gt;stations[sta_id].tid[tid].seq_number;</div><div class='ctx'> 		seq_number &amp;= IEEE80211_SCTL_SEQ;</div><div class='ctx'> 		hdr-&gt;seq_ctrl = hdr-&gt;seq_ctrl &amp;</div><div class='hunk'>@@ -1064,7 +1058,7 @@ int iwl_enqueue_hcmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd)</div><div class='ctx'> 	out_cmd-&gt;hdr.sequence = cpu_to_le16(QUEUE_TO_SEQ(IWL_CMD_QUEUE_NUM) |</div><div class='ctx'> 			INDEX_TO_SEQ(q-&gt;write_ptr));</div><div class='ctx'> 	if (out_cmd-&gt;meta.flags &amp; CMD_SIZE_HUGE)</div><div class='del'>-		out_cmd-&gt;hdr.sequence |= cpu_to_le16(SEQ_HUGE_FRAME);</div><div class='add'>+		out_cmd-&gt;hdr.sequence |= SEQ_HUGE_FRAME;</div><div class='ctx'> 	len = (idx == TFD_CMD_SLOTS) ?</div><div class='ctx'> 			IWL_MAX_SCAN_SIZE : sizeof(struct iwl_cmd);</div><div class='ctx'> 	phys_addr = pci_map_single(priv-&gt;pci_dev, out_cmd, len,</div><div class='hunk'>@@ -1072,12 +1066,26 @@ int iwl_enqueue_hcmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd)</div><div class='ctx'> 	phys_addr += offsetof(struct iwl_cmd, hdr);</div><div class='ctx'> 	iwl_hw_txq_attach_buf_to_tfd(priv, tfd, phys_addr, fix_size);</div><div class='ctx'> </div><div class='del'>-	IWL_DEBUG_HC("Sending command %s (#%x), seq: 0x%04X, "</div><div class='del'>-		     "%d bytes at %d[%d]:%d\n",</div><div class='del'>-		     get_cmd_string(out_cmd-&gt;hdr.cmd),</div><div class='del'>-		     out_cmd-&gt;hdr.cmd, le16_to_cpu(out_cmd-&gt;hdr.sequence),</div><div class='del'>-		     fix_size, q-&gt;write_ptr, idx, IWL_CMD_QUEUE_NUM);</div><div class='del'>-</div><div class='add'>+#ifdef CONFIG_IWLWIFI_DEBUG</div><div class='add'>+	switch (out_cmd-&gt;hdr.cmd) {</div><div class='add'>+	case REPLY_TX_LINK_QUALITY_CMD:</div><div class='add'>+	case SENSITIVITY_CMD:</div><div class='add'>+		IWL_DEBUG_HC_DUMP("Sending command %s (#%x), seq: 0x%04X, "</div><div class='add'>+				"%d bytes at %d[%d]:%d\n",</div><div class='add'>+				get_cmd_string(out_cmd-&gt;hdr.cmd),</div><div class='add'>+				out_cmd-&gt;hdr.cmd,</div><div class='add'>+				le16_to_cpu(out_cmd-&gt;hdr.sequence), fix_size,</div><div class='add'>+				q-&gt;write_ptr, idx, IWL_CMD_QUEUE_NUM);</div><div class='add'>+				break;</div><div class='add'>+	default:</div><div class='add'>+		IWL_DEBUG_HC("Sending command %s (#%x), seq: 0x%04X, "</div><div class='add'>+				"%d bytes at %d[%d]:%d\n",</div><div class='add'>+				get_cmd_string(out_cmd-&gt;hdr.cmd),</div><div class='add'>+				out_cmd-&gt;hdr.cmd,</div><div class='add'>+				le16_to_cpu(out_cmd-&gt;hdr.sequence), fix_size,</div><div class='add'>+				q-&gt;write_ptr, idx, IWL_CMD_QUEUE_NUM);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='ctx'> 	txq-&gt;need_update = 1;</div><div class='ctx'> </div><div class='ctx'> 	/* Set up entry in queue's byte count circular buffer */</div><div class='hunk'>@@ -1185,17 +1193,16 @@ void iwl_tx_cmd_complete(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb)</div><div class='ctx'> 	u16 sequence = le16_to_cpu(pkt-&gt;hdr.sequence);</div><div class='ctx'> 	int txq_id = SEQ_TO_QUEUE(sequence);</div><div class='ctx'> 	int index = SEQ_TO_INDEX(sequence);</div><div class='del'>-	int huge = sequence &amp; SEQ_HUGE_FRAME;</div><div class='ctx'> 	int cmd_index;</div><div class='add'>+	bool huge = !!(pkt-&gt;hdr.sequence &amp; SEQ_HUGE_FRAME);</div><div class='ctx'> 	struct iwl_cmd *cmd;</div><div class='ctx'> </div><div class='ctx'> 	/* If a Tx command is being handled and it isn't in the actual</div><div class='ctx'> 	 * command queue then there a command routing bug has been introduced</div><div class='ctx'> 	 * in the queue management code. */</div><div class='del'>-	if (txq_id != IWL_CMD_QUEUE_NUM)</div><div class='del'>-		IWL_ERROR("Error wrong command queue %d command id 0x%X\n",</div><div class='del'>-			  txq_id, pkt-&gt;hdr.cmd);</div><div class='del'>-	BUG_ON(txq_id != IWL_CMD_QUEUE_NUM);</div><div class='add'>+	if (WARN(txq_id != IWL_CMD_QUEUE_NUM,</div><div class='add'>+		 "wrong command queue %d, command id 0x%X\n", txq_id, pkt-&gt;hdr.cmd))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	cmd_index = get_cmd_index(&amp;priv-&gt;txq[IWL_CMD_QUEUE_NUM].q, index, huge);</div><div class='ctx'> 	cmd = priv-&gt;txq[IWL_CMD_QUEUE_NUM].cmd[cmd_index];</div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c<br/>index b775d5bab668..d15a2c997954 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/iwlwifi/iwl3945-base.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/iwlwifi/iwl3945-base.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/iwlwifi/iwl3945-base.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/iwlwifi/iwl3945-base.c</a></div><div class='hunk'>@@ -1160,7 +1160,7 @@ static int iwl3945_commit_rxon(struct iwl3945_priv *priv)</div><div class='ctx'> 	/* If we have set the ASSOC_MSK and we are in BSS mode then</div><div class='ctx'> 	 * add the IWL_AP_ID to the station rate table */</div><div class='ctx'> 	if (iwl3945_is_associated(priv) &amp;&amp;</div><div class='del'>-	    (priv-&gt;iw_mode == IEEE80211_IF_TYPE_STA))</div><div class='add'>+	    (priv-&gt;iw_mode == NL80211_IFTYPE_STATION))</div><div class='ctx'> 		if (iwl3945_add_station(priv, priv-&gt;active_rxon.bssid_addr, 1, 0)</div><div class='ctx'> 		    == IWL_INVALID_STATION) {</div><div class='ctx'> 			IWL_ERROR("Error adding AP address for transmit.\n");</div><div class='hunk'>@@ -1447,8 +1447,8 @@ unsigned int iwl3945_fill_beacon_frame(struct iwl3945_priv *priv,</div><div class='ctx'> {</div><div class='ctx'> </div><div class='ctx'> 	if (!iwl3945_is_associated(priv) || !priv-&gt;ibss_beacon ||</div><div class='del'>-	    ((priv-&gt;iw_mode != IEEE80211_IF_TYPE_IBSS) &amp;&amp;</div><div class='del'>-	     (priv-&gt;iw_mode != IEEE80211_IF_TYPE_AP)))</div><div class='add'>+	    ((priv-&gt;iw_mode != NL80211_IFTYPE_ADHOC) &amp;&amp;</div><div class='add'>+	     (priv-&gt;iw_mode != NL80211_IFTYPE_AP)))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (priv-&gt;ibss_beacon-&gt;len &gt; left)</div><div class='hunk'>@@ -1746,14 +1746,14 @@ static void iwl3945_reset_qos(struct iwl3945_priv *priv)</div><div class='ctx'> 	spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='ctx'> 	priv-&gt;qos_data.qos_active = 0;</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;iw_mode == IEEE80211_IF_TYPE_IBSS) {</div><div class='add'>+	if (priv-&gt;iw_mode == NL80211_IFTYPE_ADHOC) {</div><div class='ctx'> 		if (priv-&gt;qos_data.qos_enable)</div><div class='ctx'> 			priv-&gt;qos_data.qos_active = 1;</div><div class='ctx'> 		if (!(priv-&gt;active_rate &amp; 0xfff0)) {</div><div class='ctx'> 			cw_min = 31;</div><div class='ctx'> 			is_legacy = 1;</div><div class='ctx'> 		}</div><div class='del'>-	} else if (priv-&gt;iw_mode == IEEE80211_IF_TYPE_AP) {</div><div class='add'>+	} else if (priv-&gt;iw_mode == NL80211_IFTYPE_AP) {</div><div class='ctx'> 		if (priv-&gt;qos_data.qos_enable)</div><div class='ctx'> 			priv-&gt;qos_data.qos_active = 1;</div><div class='ctx'> 	} else if (!(priv-&gt;staging_rxon.flags &amp; RXON_FLG_SHORT_SLOT_MSK)) {</div><div class='hunk'>@@ -2120,7 +2120,7 @@ static void iwl3945_setup_rxon_timing(struct iwl3945_priv *priv)</div><div class='ctx'> 	beacon_int = priv-&gt;beacon_int;</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;iw_mode == IEEE80211_IF_TYPE_STA) {</div><div class='add'>+	if (priv-&gt;iw_mode == NL80211_IFTYPE_STATION) {</div><div class='ctx'> 		if (beacon_int == 0) {</div><div class='ctx'> 			priv-&gt;rxon_timing.beacon_interval = cpu_to_le16(100);</div><div class='ctx'> 			priv-&gt;rxon_timing.beacon_init_val = cpu_to_le32(102400);</div><div class='hunk'>@@ -2156,7 +2156,7 @@ static void iwl3945_setup_rxon_timing(struct iwl3945_priv *priv)</div><div class='ctx'> </div><div class='ctx'> static int iwl3945_scan_initiate(struct iwl3945_priv *priv)</div><div class='ctx'> {</div><div class='del'>-	if (priv-&gt;iw_mode == IEEE80211_IF_TYPE_AP) {</div><div class='add'>+	if (priv-&gt;iw_mode == NL80211_IFTYPE_AP) {</div><div class='ctx'> 		IWL_ERROR("APs don't scan.\n");</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2218,7 +2218,7 @@ static void iwl3945_set_flags_for_phymode(struct iwl3945_priv *priv,</div><div class='ctx'> 		else</div><div class='ctx'> 			priv-&gt;staging_rxon.flags &amp;= ~RXON_FLG_SHORT_SLOT_MSK;</div><div class='ctx'> </div><div class='del'>-		if (priv-&gt;iw_mode == IEEE80211_IF_TYPE_IBSS)</div><div class='add'>+		if (priv-&gt;iw_mode == NL80211_IFTYPE_ADHOC)</div><div class='ctx'> 			priv-&gt;staging_rxon.flags &amp;= ~RXON_FLG_SHORT_SLOT_MSK;</div><div class='ctx'> </div><div class='ctx'> 		priv-&gt;staging_rxon.flags |= RXON_FLG_BAND_24G_MSK;</div><div class='hunk'>@@ -2237,23 +2237,23 @@ static void iwl3945_connection_init_rx_config(struct iwl3945_priv *priv)</div><div class='ctx'> 	memset(&amp;priv-&gt;staging_rxon, 0, sizeof(priv-&gt;staging_rxon));</div><div class='ctx'> </div><div class='ctx'> 	switch (priv-&gt;iw_mode) {</div><div class='del'>-	case IEEE80211_IF_TYPE_AP:</div><div class='add'>+	case NL80211_IFTYPE_AP:</div><div class='ctx'> 		priv-&gt;staging_rxon.dev_type = RXON_DEV_TYPE_AP;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case IEEE80211_IF_TYPE_STA:</div><div class='add'>+	case NL80211_IFTYPE_STATION:</div><div class='ctx'> 		priv-&gt;staging_rxon.dev_type = RXON_DEV_TYPE_ESS;</div><div class='ctx'> 		priv-&gt;staging_rxon.filter_flags = RXON_FILTER_ACCEPT_GRP_MSK;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case IEEE80211_IF_TYPE_IBSS:</div><div class='add'>+	case NL80211_IFTYPE_ADHOC:</div><div class='ctx'> 		priv-&gt;staging_rxon.dev_type = RXON_DEV_TYPE_IBSS;</div><div class='ctx'> 		priv-&gt;staging_rxon.flags = RXON_FLG_SHORT_PREAMBLE_MSK;</div><div class='ctx'> 		priv-&gt;staging_rxon.filter_flags = RXON_FILTER_BCON_AWARE_MSK |</div><div class='ctx'> 						  RXON_FILTER_ACCEPT_GRP_MSK;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case IEEE80211_IF_TYPE_MNTR:</div><div class='add'>+	case NL80211_IFTYPE_MONITOR:</div><div class='ctx'> 		priv-&gt;staging_rxon.dev_type = RXON_DEV_TYPE_SNIFFER;</div><div class='ctx'> 		priv-&gt;staging_rxon.filter_flags = RXON_FILTER_PROMISC_MSK |</div><div class='ctx'> 		    RXON_FILTER_CTL2HOST_MSK | RXON_FILTER_ACCEPT_GRP_MSK;</div><div class='hunk'>@@ -2282,7 +2282,7 @@ static void iwl3945_connection_init_rx_config(struct iwl3945_priv *priv)</div><div class='ctx'> 	 * in some case A channels are all non IBSS</div><div class='ctx'> 	 * in this case force B/G channel</div><div class='ctx'> 	 */</div><div class='del'>-	if ((priv-&gt;iw_mode == IEEE80211_IF_TYPE_IBSS) &amp;&amp;</div><div class='add'>+	if ((priv-&gt;iw_mode == NL80211_IFTYPE_ADHOC) &amp;&amp;</div><div class='ctx'> 	    !(is_channel_ibss(ch_info)))</div><div class='ctx'> 		ch_info = &amp;priv-&gt;channel_info[0];</div><div class='ctx'> </div><div class='hunk'>@@ -2302,7 +2302,7 @@ static void iwl3945_connection_init_rx_config(struct iwl3945_priv *priv)</div><div class='ctx'> </div><div class='ctx'> static int iwl3945_set_mode(struct iwl3945_priv *priv, int mode)</div><div class='ctx'> {</div><div class='del'>-	if (mode == IEEE80211_IF_TYPE_IBSS) {</div><div class='add'>+	if (mode == NL80211_IFTYPE_ADHOC) {</div><div class='ctx'> 		const struct iwl3945_channel_info *ch_info;</div><div class='ctx'> </div><div class='ctx'> 		ch_info = iwl3945_get_channel_info(priv,</div><div class='hunk'>@@ -2469,11 +2469,11 @@ static int iwl3945_get_sta_id(struct iwl3945_priv *priv, struct ieee80211_hdr *h</div><div class='ctx'> </div><div class='ctx'> 	/* If we are a client station in a BSS network, use the special</div><div class='ctx'> 	 * AP station entry (that's the only station we communicate with) */</div><div class='del'>-	case IEEE80211_IF_TYPE_STA:</div><div class='add'>+	case NL80211_IFTYPE_STATION:</div><div class='ctx'> 		return IWL_AP_ID;</div><div class='ctx'> </div><div class='ctx'> 	/* If we are an AP, then find the station, or use BCAST */</div><div class='del'>-	case IEEE80211_IF_TYPE_AP:</div><div class='add'>+	case NL80211_IFTYPE_AP:</div><div class='ctx'> 		sta_id = iwl3945_hw_find_station(priv, hdr-&gt;addr1);</div><div class='ctx'> 		if (sta_id != IWL_INVALID_STATION)</div><div class='ctx'> 			return sta_id;</div><div class='hunk'>@@ -2481,7 +2481,7 @@ static int iwl3945_get_sta_id(struct iwl3945_priv *priv, struct ieee80211_hdr *h</div><div class='ctx'> </div><div class='ctx'> 	/* If this frame is going out to an IBSS network, find the station,</div><div class='ctx'> 	 * or create a new station table entry */</div><div class='del'>-	case IEEE80211_IF_TYPE_IBSS: {</div><div class='add'>+	case NL80211_IFTYPE_ADHOC: {</div><div class='ctx'> 		DECLARE_MAC_BUF(mac);</div><div class='ctx'> </div><div class='ctx'> 		/* Create new station table entry */</div><div class='hunk'>@@ -2502,7 +2502,7 @@ static int iwl3945_get_sta_id(struct iwl3945_priv *priv, struct ieee80211_hdr *h</div><div class='ctx'> 	}</div><div class='ctx'> 	/* If we are in monitor mode, use BCAST. This is required for</div><div class='ctx'> 	 * packet injection. */</div><div class='del'>-	case IEEE80211_IF_TYPE_MNTR:</div><div class='add'>+	case NL80211_IFTYPE_MONITOR:</div><div class='ctx'> 		return priv-&gt;hw_setting.bcast_sta_id;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='hunk'>@@ -2565,16 +2565,16 @@ static int iwl3945_tx_skb(struct iwl3945_priv *priv, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	/* drop all data frame if we are not associated */</div><div class='ctx'> 	if (ieee80211_is_data(fc) &amp;&amp;</div><div class='del'>-	    (priv-&gt;iw_mode != IEEE80211_IF_TYPE_MNTR) &amp;&amp; /* packet injection */</div><div class='add'>+	    (priv-&gt;iw_mode != NL80211_IFTYPE_MONITOR) &amp;&amp; /* packet injection */</div><div class='ctx'> 	    (!iwl3945_is_associated(priv) ||</div><div class='del'>-	     ((priv-&gt;iw_mode == IEEE80211_IF_TYPE_STA) &amp;&amp; !priv-&gt;assoc_id))) {</div><div class='add'>+	     ((priv-&gt;iw_mode == NL80211_IFTYPE_STATION) &amp;&amp; !priv-&gt;assoc_id))) {</div><div class='ctx'> 		IWL_DEBUG_DROP("Dropping - !iwl3945_is_associated\n");</div><div class='ctx'> 		goto drop_unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-	hdr_len = ieee80211_get_hdrlen(le16_to_cpu(fc));</div><div class='add'>+	hdr_len = ieee80211_hdrlen(fc);</div><div class='ctx'> </div><div class='ctx'> 	/* Find (or create) index into station table for destination station */</div><div class='ctx'> 	sta_id = iwl3945_get_sta_id(priv, hdr);</div><div class='hunk'>@@ -2590,7 +2590,7 @@ static int iwl3945_tx_skb(struct iwl3945_priv *priv, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	if (ieee80211_is_data_qos(fc)) {</div><div class='ctx'> 		qc = ieee80211_get_qos_ctl(hdr);</div><div class='del'>-		tid = qc[0] &amp; 0xf;</div><div class='add'>+		tid = qc[0] &amp; IEEE80211_QOS_CTL_TID_MASK;</div><div class='ctx'> 		seq_number = priv-&gt;stations[sta_id].tid[tid].seq_number &amp;</div><div class='ctx'> 				IEEE80211_SCTL_SEQ;</div><div class='ctx'> 		hdr-&gt;seq_ctrl = cpu_to_le16(seq_number) |</div><div class='hunk'>@@ -2709,7 +2709,7 @@ static int iwl3945_tx_skb(struct iwl3945_priv *priv, struct sk_buff *skb)</div><div class='ctx'> 			   sizeof(out_cmd-&gt;cmd.tx));</div><div class='ctx'> </div><div class='ctx'> 	iwl3945_print_hex_dump(IWL_DL_TX, (u8 *)out_cmd-&gt;cmd.tx.hdr,</div><div class='del'>-			   ieee80211_get_hdrlen(le16_to_cpu(fc)));</div><div class='add'>+			   ieee80211_hdrlen(fc));</div><div class='ctx'> </div><div class='ctx'> 	/* Tell device the write index *just past* this latest filled TFD */</div><div class='ctx'> 	q-&gt;write_ptr = iwl_queue_inc_wrap(q-&gt;write_ptr, q-&gt;n_bd);</div><div class='hunk'>@@ -2806,7 +2806,7 @@ static void iwl3945_radio_kill_sw(struct iwl3945_priv *priv, int disable_radio)</div><div class='ctx'> 	if (disable_radio) {</div><div class='ctx'> 		iwl3945_scan_cancel(priv);</div><div class='ctx'> 		/* FIXME: This is a workaround for AP */</div><div class='del'>-		if (priv-&gt;iw_mode != IEEE80211_IF_TYPE_AP) {</div><div class='add'>+		if (priv-&gt;iw_mode != NL80211_IFTYPE_AP) {</div><div class='ctx'> 			spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='ctx'> 			iwl3945_write32(priv, CSR_UCODE_DRV_GP1_SET,</div><div class='ctx'> 				    CSR_UCODE_SW_BIT_RFKILL);</div><div class='hunk'>@@ -3161,7 +3161,7 @@ static void iwl3945_rx_beacon_notif(struct iwl3945_priv *priv,</div><div class='ctx'> 		le32_to_cpu(beacon-&gt;low_tsf), rate);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	if ((priv-&gt;iw_mode == IEEE80211_IF_TYPE_AP) &amp;&amp;</div><div class='add'>+	if ((priv-&gt;iw_mode == NL80211_IFTYPE_AP) &amp;&amp;</div><div class='ctx'> 	    (!test_bit(STATUS_EXIT_PENDING, &amp;priv-&gt;status)))</div><div class='ctx'> 		queue_work(priv-&gt;workqueue, &amp;priv-&gt;beacon_update);</div><div class='ctx'> }</div><div class='hunk'>@@ -4782,8 +4782,11 @@ static void iwl3945_free_channel_map(struct iwl3945_priv *priv)</div><div class='ctx'> /* For active scan, listen ACTIVE_DWELL_TIME (msec) on each channel after</div><div class='ctx'>  * sending probe req.  This should be set long enough to hear probe responses</div><div class='ctx'>  * from more than one AP.  */</div><div class='del'>-#define IWL_ACTIVE_DWELL_TIME_24    (20)	/* all times in msec */</div><div class='del'>-#define IWL_ACTIVE_DWELL_TIME_52    (10)</div><div class='add'>+#define IWL_ACTIVE_DWELL_TIME_24    (30)	/* all times in msec */</div><div class='add'>+#define IWL_ACTIVE_DWELL_TIME_52    (20)</div><div class='add'>+</div><div class='add'>+#define IWL_ACTIVE_DWELL_FACTOR_24GHZ (3)</div><div class='add'>+#define IWL_ACTIVE_DWELL_FACTOR_52GHZ (2)</div><div class='ctx'> </div><div class='ctx'> /* For faster active scanning, scan will move to the next channel if fewer than</div><div class='ctx'>  * PLCP_QUIET_THRESH packets are heard on this channel within</div><div class='hunk'>@@ -4792,7 +4795,7 @@ static void iwl3945_free_channel_map(struct iwl3945_priv *priv)</div><div class='ctx'>  * no other traffic).</div><div class='ctx'>  * Disable "quiet" feature by setting PLCP_QUIET_THRESH to 0. */</div><div class='ctx'> #define IWL_PLCP_QUIET_THRESH       __constant_cpu_to_le16(1)	/* packets */</div><div class='del'>-#define IWL_ACTIVE_QUIET_TIME       __constant_cpu_to_le16(5)	/* msec */</div><div class='add'>+#define IWL_ACTIVE_QUIET_TIME       __constant_cpu_to_le16(10)	/* msec */</div><div class='ctx'> </div><div class='ctx'> /* For passive scan, listen PASSIVE_DWELL_TIME (msec) on each channel.</div><div class='ctx'>  * Must be set longer than active dwell time.</div><div class='hunk'>@@ -4802,19 +4805,23 @@ static void iwl3945_free_channel_map(struct iwl3945_priv *priv)</div><div class='ctx'> #define IWL_PASSIVE_DWELL_BASE      (100)</div><div class='ctx'> #define IWL_CHANNEL_TUNE_TIME       5</div><div class='ctx'> </div><div class='add'>+#define IWL_SCAN_PROBE_MASK(n)	 cpu_to_le32((BIT(n) | (BIT(n) - BIT(1))))</div><div class='add'>+</div><div class='ctx'> static inline u16 iwl3945_get_active_dwell_time(struct iwl3945_priv *priv,</div><div class='del'>-						enum ieee80211_band band)</div><div class='add'>+						enum ieee80211_band band,</div><div class='add'>+						u8 n_probes)</div><div class='ctx'> {</div><div class='ctx'> 	if (band == IEEE80211_BAND_5GHZ)</div><div class='del'>-		return IWL_ACTIVE_DWELL_TIME_52;</div><div class='add'>+		return IWL_ACTIVE_DWELL_TIME_52 +</div><div class='add'>+			IWL_ACTIVE_DWELL_FACTOR_52GHZ * (n_probes + 1);</div><div class='ctx'> 	else</div><div class='del'>-		return IWL_ACTIVE_DWELL_TIME_24;</div><div class='add'>+		return IWL_ACTIVE_DWELL_TIME_24 +</div><div class='add'>+			IWL_ACTIVE_DWELL_FACTOR_24GHZ * (n_probes + 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u16 iwl3945_get_passive_dwell_time(struct iwl3945_priv *priv,</div><div class='ctx'> 					  enum ieee80211_band band)</div><div class='ctx'> {</div><div class='del'>-	u16 active = iwl3945_get_active_dwell_time(priv, band);</div><div class='ctx'> 	u16 passive = (band == IEEE80211_BAND_2GHZ) ?</div><div class='ctx'> 	    IWL_PASSIVE_DWELL_BASE + IWL_PASSIVE_DWELL_TIME_24 :</div><div class='ctx'> 	    IWL_PASSIVE_DWELL_BASE + IWL_PASSIVE_DWELL_TIME_52;</div><div class='hunk'>@@ -4829,15 +4836,12 @@ static u16 iwl3945_get_passive_dwell_time(struct iwl3945_priv *priv,</div><div class='ctx'> 		passive = (passive * 98) / 100 - IWL_CHANNEL_TUNE_TIME * 2;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (passive &lt;= active)</div><div class='del'>-		passive = active + 1;</div><div class='del'>-</div><div class='ctx'> 	return passive;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int iwl3945_get_channels_for_scan(struct iwl3945_priv *priv,</div><div class='ctx'> 					 enum ieee80211_band band,</div><div class='del'>-				     u8 is_active, u8 direct_mask,</div><div class='add'>+				     u8 is_active, u8 n_probes,</div><div class='ctx'> 				     struct iwl3945_scan_channel *scan_ch)</div><div class='ctx'> {</div><div class='ctx'> 	const struct ieee80211_channel *channels = NULL;</div><div class='hunk'>@@ -4853,9 +4857,12 @@ static int iwl3945_get_channels_for_scan(struct iwl3945_priv *priv,</div><div class='ctx'> </div><div class='ctx'> 	channels = sband-&gt;channels;</div><div class='ctx'> </div><div class='del'>-	active_dwell = iwl3945_get_active_dwell_time(priv, band);</div><div class='add'>+	active_dwell = iwl3945_get_active_dwell_time(priv, band, n_probes);</div><div class='ctx'> 	passive_dwell = iwl3945_get_passive_dwell_time(priv, band);</div><div class='ctx'> </div><div class='add'>+	if (passive_dwell &lt;= active_dwell)</div><div class='add'>+		passive_dwell = active_dwell + 1;</div><div class='add'>+</div><div class='ctx'> 	for (i = 0, added = 0; i &lt; sband-&gt;n_channels; i++) {</div><div class='ctx'> 		if (channels[i].flags &amp; IEEE80211_CHAN_DISABLED)</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -4875,8 +4882,8 @@ static int iwl3945_get_channels_for_scan(struct iwl3945_priv *priv,</div><div class='ctx'> 		else</div><div class='ctx'> 			scan_ch-&gt;type = 1;	/* active */</div><div class='ctx'> </div><div class='del'>-		if (scan_ch-&gt;type &amp; 1)</div><div class='del'>-			scan_ch-&gt;type |= (direct_mask &lt;&lt; 1);</div><div class='add'>+		if ((scan_ch-&gt;type &amp; 1) &amp;&amp; n_probes)</div><div class='add'>+			scan_ch-&gt;type |= IWL_SCAN_PROBE_MASK(n_probes);</div><div class='ctx'> </div><div class='ctx'> 		scan_ch-&gt;active_dwell = cpu_to_le16(active_dwell);</div><div class='ctx'> 		scan_ch-&gt;passive_dwell = cpu_to_le16(passive_dwell);</div><div class='hunk'>@@ -6052,7 +6059,7 @@ static void iwl3945_bg_set_monitor(struct work_struct *work)</div><div class='ctx'> 	if (!iwl3945_is_ready(priv))</div><div class='ctx'> 		IWL_DEBUG(IWL_DL_STATE, "leave - not ready\n");</div><div class='ctx'> 	else</div><div class='del'>-		if (iwl3945_set_mode(priv, IEEE80211_IF_TYPE_MNTR) != 0)</div><div class='add'>+		if (iwl3945_set_mode(priv, NL80211_IFTYPE_MONITOR) != 0)</div><div class='ctx'> 			IWL_ERROR("iwl3945_set_mode() failed\n");</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;priv-&gt;mutex);</div><div class='hunk'>@@ -6093,7 +6100,7 @@ static void iwl3945_bg_request_scan(struct work_struct *data)</div><div class='ctx'> 	int rc = 0;</div><div class='ctx'> 	struct iwl3945_scan_cmd *scan;</div><div class='ctx'> 	struct ieee80211_conf *conf = NULL;</div><div class='del'>-	u8 direct_mask;</div><div class='add'>+	u8 n_probes = 2;</div><div class='ctx'> 	enum ieee80211_band band;</div><div class='ctx'> </div><div class='ctx'> 	conf = ieee80211_get_hw_conf(priv-&gt;hw);</div><div class='hunk'>@@ -6201,7 +6208,7 @@ static void iwl3945_bg_request_scan(struct work_struct *data)</div><div class='ctx'> 		scan-&gt;direct_scan[0].len = priv-&gt;direct_ssid_len;</div><div class='ctx'> 		memcpy(scan-&gt;direct_scan[0].ssid,</div><div class='ctx'> 		       priv-&gt;direct_ssid, priv-&gt;direct_ssid_len);</div><div class='del'>-		direct_mask = 1;</div><div class='add'>+		n_probes++;</div><div class='ctx'> 	} else if (!iwl3945_is_associated(priv) &amp;&amp; priv-&gt;essid_len) {</div><div class='ctx'> 		IWL_DEBUG_SCAN</div><div class='ctx'> 		  ("Kicking off one direct scan for '%s' when not associated\n",</div><div class='hunk'>@@ -6209,11 +6216,9 @@ static void iwl3945_bg_request_scan(struct work_struct *data)</div><div class='ctx'> 		scan-&gt;direct_scan[0].id = WLAN_EID_SSID;</div><div class='ctx'> 		scan-&gt;direct_scan[0].len = priv-&gt;essid_len;</div><div class='ctx'> 		memcpy(scan-&gt;direct_scan[0].ssid, priv-&gt;essid, priv-&gt;essid_len);</div><div class='del'>-		direct_mask = 1;</div><div class='del'>-	} else {</div><div class='add'>+		n_probes++;</div><div class='add'>+	} else</div><div class='ctx'> 		IWL_DEBUG_SCAN("Kicking off one indirect scan.\n");</div><div class='del'>-		direct_mask = 0;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	/* We don't build a direct scan probe request; the uCode will do</div><div class='ctx'> 	 * that based on the direct_mask added to each channel entry */</div><div class='hunk'>@@ -6243,21 +6248,13 @@ static void iwl3945_bg_request_scan(struct work_struct *data)</div><div class='ctx'> 	/* select Rx antennas */</div><div class='ctx'> 	scan-&gt;flags |= iwl3945_get_antenna_flags(priv);</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;iw_mode == IEEE80211_IF_TYPE_MNTR)</div><div class='add'>+	if (priv-&gt;iw_mode == NL80211_IFTYPE_MONITOR)</div><div class='ctx'> 		scan-&gt;filter_flags = RXON_FILTER_PROMISC_MSK;</div><div class='ctx'> </div><div class='del'>-	if (direct_mask)</div><div class='del'>-		scan-&gt;channel_count =</div><div class='del'>-			iwl3945_get_channels_for_scan(</div><div class='del'>-				priv, band, 1, /* active */</div><div class='del'>-				direct_mask,</div><div class='del'>-				(void *)&amp;scan-&gt;data[le16_to_cpu(scan-&gt;tx_cmd.len)]);</div><div class='del'>-	else</div><div class='del'>-		scan-&gt;channel_count =</div><div class='del'>-			iwl3945_get_channels_for_scan(</div><div class='del'>-				priv, band, 0, /* passive */</div><div class='del'>-				direct_mask,</div><div class='del'>-				(void *)&amp;scan-&gt;data[le16_to_cpu(scan-&gt;tx_cmd.len)]);</div><div class='add'>+	scan-&gt;channel_count =</div><div class='add'>+		iwl3945_get_channels_for_scan(priv, band, 1, /* active */</div><div class='add'>+					      n_probes,</div><div class='add'>+			(void *)&amp;scan-&gt;data[le16_to_cpu(scan-&gt;tx_cmd.len)]);</div><div class='ctx'> </div><div class='ctx'> 	cmd.len += le16_to_cpu(scan-&gt;tx_cmd.len) +</div><div class='ctx'> 	    scan-&gt;channel_count * sizeof(struct iwl3945_scan_channel);</div><div class='hunk'>@@ -6320,16 +6317,13 @@ static void iwl3945_bg_rx_replenish(struct work_struct *data)</div><div class='ctx'> </div><div class='ctx'> #define IWL_DELAY_NEXT_SCAN (HZ*2)</div><div class='ctx'> </div><div class='del'>-static void iwl3945_bg_post_associate(struct work_struct *data)</div><div class='add'>+static void iwl3945_post_associate(struct iwl3945_priv *priv)</div><div class='ctx'> {</div><div class='del'>-	struct iwl3945_priv *priv = container_of(data, struct iwl3945_priv,</div><div class='del'>-					     post_associate.work);</div><div class='del'>-</div><div class='ctx'> 	int rc = 0;</div><div class='ctx'> 	struct ieee80211_conf *conf = NULL;</div><div class='ctx'> 	DECLARE_MAC_BUF(mac);</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;iw_mode == IEEE80211_IF_TYPE_AP) {</div><div class='add'>+	if (priv-&gt;iw_mode == NL80211_IFTYPE_AP) {</div><div class='ctx'> 		IWL_ERROR("%s Should not be called in AP mode\n", __func__);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -6342,12 +6336,9 @@ static void iwl3945_bg_post_associate(struct work_struct *data)</div><div class='ctx'> 	if (test_bit(STATUS_EXIT_PENDING, &amp;priv-&gt;status))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;priv-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;vif || !priv-&gt;is_open) {</div><div class='del'>-		mutex_unlock(&amp;priv-&gt;mutex);</div><div class='add'>+	if (!priv-&gt;vif || !priv-&gt;is_open)</div><div class='ctx'> 		return;</div><div class='del'>-	}</div><div class='add'>+</div><div class='ctx'> 	iwl3945_scan_cancel_timeout(priv, 200);</div><div class='ctx'> </div><div class='ctx'> 	conf = ieee80211_get_hw_conf(priv-&gt;hw);</div><div class='hunk'>@@ -6381,7 +6372,7 @@ static void iwl3945_bg_post_associate(struct work_struct *data)</div><div class='ctx'> 		else</div><div class='ctx'> 			priv-&gt;staging_rxon.flags &amp;= ~RXON_FLG_SHORT_SLOT_MSK;</div><div class='ctx'> </div><div class='del'>-		if (priv-&gt;iw_mode == IEEE80211_IF_TYPE_IBSS)</div><div class='add'>+		if (priv-&gt;iw_mode == NL80211_IFTYPE_ADHOC)</div><div class='ctx'> 			priv-&gt;staging_rxon.flags &amp;= ~RXON_FLG_SHORT_SLOT_MSK;</div><div class='ctx'> </div><div class='ctx'> 	}</div><div class='hunk'>@@ -6389,11 +6380,11 @@ static void iwl3945_bg_post_associate(struct work_struct *data)</div><div class='ctx'> 	iwl3945_commit_rxon(priv);</div><div class='ctx'> </div><div class='ctx'> 	switch (priv-&gt;iw_mode) {</div><div class='del'>-	case IEEE80211_IF_TYPE_STA:</div><div class='add'>+	case NL80211_IFTYPE_STATION:</div><div class='ctx'> 		iwl3945_rate_scale_init(priv-&gt;hw, IWL_AP_ID);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case IEEE80211_IF_TYPE_IBSS:</div><div class='add'>+	case NL80211_IFTYPE_ADHOC:</div><div class='ctx'> </div><div class='ctx'> 		/* clear out the station table */</div><div class='ctx'> 		iwl3945_clear_stations_table(priv);</div><div class='hunk'>@@ -6419,7 +6410,6 @@ static void iwl3945_bg_post_associate(struct work_struct *data)</div><div class='ctx'> </div><div class='ctx'> 	/* we have just associated, don't start scan too early */</div><div class='ctx'> 	priv-&gt;next_scan_jiffies = jiffies + IWL_DELAY_NEXT_SCAN;</div><div class='del'>-	mutex_unlock(&amp;priv-&gt;mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void iwl3945_bg_abort_scan(struct work_struct *work)</div><div class='hunk'>@@ -6567,7 +6557,6 @@ static void iwl3945_mac_stop(struct ieee80211_hw *hw)</div><div class='ctx'> 		 */</div><div class='ctx'> 		mutex_lock(&amp;priv-&gt;mutex);</div><div class='ctx'> 		iwl3945_scan_cancel_timeout(priv, 100);</div><div class='del'>-		cancel_delayed_work(&amp;priv-&gt;post_associate);</div><div class='ctx'> 		mutex_unlock(&amp;priv-&gt;mutex);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -6650,8 +6639,6 @@ static int iwl3945_mac_config(struct ieee80211_hw *hw, struct ieee80211_conf *co</div><div class='ctx'> 	mutex_lock(&amp;priv-&gt;mutex);</div><div class='ctx'> 	IWL_DEBUG_MAC80211("enter to channel %d\n", conf-&gt;channel-&gt;hw_value);</div><div class='ctx'> </div><div class='del'>-	priv-&gt;add_radiotap = !!(conf-&gt;flags &amp; IEEE80211_CONF_RADIOTAP);</div><div class='del'>-</div><div class='ctx'> 	if (!iwl3945_is_ready(priv)) {</div><div class='ctx'> 		IWL_DEBUG_MAC80211("leave - not ready\n");</div><div class='ctx'> 		ret = -EIO;</div><div class='hunk'>@@ -6767,7 +6754,7 @@ static void iwl3945_config_ap(struct iwl3945_priv *priv)</div><div class='ctx'> 				priv-&gt;staging_rxon.flags &amp;=</div><div class='ctx'> 					~RXON_FLG_SHORT_SLOT_MSK;</div><div class='ctx'> </div><div class='del'>-			if (priv-&gt;iw_mode == IEEE80211_IF_TYPE_IBSS)</div><div class='add'>+			if (priv-&gt;iw_mode == NL80211_IFTYPE_ADHOC)</div><div class='ctx'> 				priv-&gt;staging_rxon.flags &amp;=</div><div class='ctx'> 					~RXON_FLG_SHORT_SLOT_MSK;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -6804,7 +6791,7 @@ static int iwl3945_mac_config_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* handle this temporarily here */</div><div class='del'>-	if (priv-&gt;iw_mode == IEEE80211_IF_TYPE_IBSS &amp;&amp;</div><div class='add'>+	if (priv-&gt;iw_mode == NL80211_IFTYPE_ADHOC &amp;&amp;</div><div class='ctx'> 	    conf-&gt;changed &amp; IEEE80211_IFCC_BEACON) {</div><div class='ctx'> 		struct sk_buff *beacon = ieee80211_beacon_get(hw, vif);</div><div class='ctx'> 		if (!beacon)</div><div class='hunk'>@@ -6816,7 +6803,7 @@ static int iwl3945_mac_config_interface(struct ieee80211_hw *hw,</div><div class='ctx'> </div><div class='ctx'> 	/* XXX: this MUST use conf-&gt;mac_addr */</div><div class='ctx'> </div><div class='del'>-	if ((priv-&gt;iw_mode == IEEE80211_IF_TYPE_AP) &amp;&amp;</div><div class='add'>+	if ((priv-&gt;iw_mode == NL80211_IFTYPE_AP) &amp;&amp;</div><div class='ctx'> 	    (!conf-&gt;ssid_len)) {</div><div class='ctx'> 		IWL_DEBUG_MAC80211</div><div class='ctx'> 		    ("Leaving in AP mode because HostAPD is not ready.\n");</div><div class='hunk'>@@ -6839,7 +6826,7 @@ static int iwl3945_mac_config_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 	    !(priv-&gt;hw-&gt;flags &amp; IEEE80211_HW_NO_PROBE_FILTERING)) {</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;iw_mode == IEEE80211_IF_TYPE_AP) {</div><div class='add'>+	if (priv-&gt;iw_mode == NL80211_IFTYPE_AP) {</div><div class='ctx'> 		if (!conf-&gt;bssid) {</div><div class='ctx'> 			conf-&gt;bssid = priv-&gt;mac_addr;</div><div class='ctx'> 			memcpy(priv-&gt;bssid, priv-&gt;mac_addr, ETH_ALEN);</div><div class='hunk'>@@ -6874,11 +6861,11 @@ static int iwl3945_mac_config_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 		 * to verify) - jpk */</div><div class='ctx'> 		memcpy(priv-&gt;bssid, conf-&gt;bssid, ETH_ALEN);</div><div class='ctx'> </div><div class='del'>-		if (priv-&gt;iw_mode == IEEE80211_IF_TYPE_AP)</div><div class='add'>+		if (priv-&gt;iw_mode == NL80211_IFTYPE_AP)</div><div class='ctx'> 			iwl3945_config_ap(priv);</div><div class='ctx'> 		else {</div><div class='ctx'> 			rc = iwl3945_commit_rxon(priv);</div><div class='del'>-			if ((priv-&gt;iw_mode == IEEE80211_IF_TYPE_STA) &amp;&amp; rc)</div><div class='add'>+			if ((priv-&gt;iw_mode == NL80211_IFTYPE_STATION) &amp;&amp; rc)</div><div class='ctx'> 				iwl3945_add_station(priv,</div><div class='ctx'> 					priv-&gt;active_rxon.bssid_addr, 1, 0);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -6914,7 +6901,7 @@ static void iwl3945_configure_filter(struct ieee80211_hw *hw,</div><div class='ctx'> </div><div class='ctx'> 	if (changed_flags &amp; (*total_flags) &amp; FIF_OTHER_BSS) {</div><div class='ctx'> 		IWL_DEBUG_MAC80211("Enter: type %d (0x%x, 0x%x)\n",</div><div class='del'>-				   IEEE80211_IF_TYPE_MNTR,</div><div class='add'>+				   NL80211_IFTYPE_MONITOR,</div><div class='ctx'> 				   changed_flags, *total_flags);</div><div class='ctx'> 		/* queue work 'cuz mac80211 is holding a lock which</div><div class='ctx'> 		 * prevents us from issuing (synchronous) f/w cmds */</div><div class='hunk'>@@ -6935,7 +6922,6 @@ static void iwl3945_mac_remove_interface(struct ieee80211_hw *hw,</div><div class='ctx'> </div><div class='ctx'> 	if (iwl3945_is_ready_rf(priv)) {</div><div class='ctx'> 		iwl3945_scan_cancel_timeout(priv, 100);</div><div class='del'>-		cancel_delayed_work(&amp;priv-&gt;post_associate);</div><div class='ctx'> 		priv-&gt;staging_rxon.filter_flags &amp;= ~RXON_FILTER_ASSOC_MSK;</div><div class='ctx'> 		iwl3945_commit_rxon(priv);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -6950,6 +6936,63 @@ static void iwl3945_mac_remove_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 	IWL_DEBUG_MAC80211("leave\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define IWL_DELAY_NEXT_SCAN_AFTER_ASSOC (HZ*6)</div><div class='add'>+</div><div class='add'>+static void iwl3945_bss_info_changed(struct ieee80211_hw *hw,</div><div class='add'>+				     struct ieee80211_vif *vif,</div><div class='add'>+				     struct ieee80211_bss_conf *bss_conf,</div><div class='add'>+				     u32 changes)</div><div class='add'>+{</div><div class='add'>+	struct iwl3945_priv *priv = hw-&gt;priv;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_MAC80211("changes = 0x%X\n", changes);</div><div class='add'>+</div><div class='add'>+	if (changes &amp; BSS_CHANGED_ERP_PREAMBLE) {</div><div class='add'>+		IWL_DEBUG_MAC80211("ERP_PREAMBLE %d\n",</div><div class='add'>+				   bss_conf-&gt;use_short_preamble);</div><div class='add'>+		if (bss_conf-&gt;use_short_preamble)</div><div class='add'>+			priv-&gt;staging_rxon.flags |= RXON_FLG_SHORT_PREAMBLE_MSK;</div><div class='add'>+		else</div><div class='add'>+			priv-&gt;staging_rxon.flags &amp;= ~RXON_FLG_SHORT_PREAMBLE_MSK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (changes &amp; BSS_CHANGED_ERP_CTS_PROT) {</div><div class='add'>+		IWL_DEBUG_MAC80211("ERP_CTS %d\n", bss_conf-&gt;use_cts_prot);</div><div class='add'>+		if (bss_conf-&gt;use_cts_prot &amp;&amp; (priv-&gt;band != IEEE80211_BAND_5GHZ))</div><div class='add'>+			priv-&gt;staging_rxon.flags |= RXON_FLG_TGG_PROTECT_MSK;</div><div class='add'>+		else</div><div class='add'>+			priv-&gt;staging_rxon.flags &amp;= ~RXON_FLG_TGG_PROTECT_MSK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (changes &amp; BSS_CHANGED_ASSOC) {</div><div class='add'>+		IWL_DEBUG_MAC80211("ASSOC %d\n", bss_conf-&gt;assoc);</div><div class='add'>+		/* This should never happen as this function should</div><div class='add'>+		 * never be called from interrupt context. */</div><div class='add'>+		if (WARN_ON_ONCE(in_interrupt()))</div><div class='add'>+			return;</div><div class='add'>+		if (bss_conf-&gt;assoc) {</div><div class='add'>+			priv-&gt;assoc_id = bss_conf-&gt;aid;</div><div class='add'>+			priv-&gt;beacon_int = bss_conf-&gt;beacon_int;</div><div class='add'>+			priv-&gt;timestamp0 = bss_conf-&gt;timestamp &amp; 0xFFFFFFFF;</div><div class='add'>+			priv-&gt;timestamp1 = (bss_conf-&gt;timestamp &gt;&gt; 32) &amp;</div><div class='add'>+					     0xFFFFFFFF;</div><div class='add'>+			priv-&gt;assoc_capability = bss_conf-&gt;assoc_capability;</div><div class='add'>+			priv-&gt;next_scan_jiffies = jiffies +</div><div class='add'>+					IWL_DELAY_NEXT_SCAN_AFTER_ASSOC;</div><div class='add'>+			mutex_lock(&amp;priv-&gt;mutex);</div><div class='add'>+			iwl3945_post_associate(priv);</div><div class='add'>+			mutex_unlock(&amp;priv-&gt;mutex);</div><div class='add'>+		} else {</div><div class='add'>+			priv-&gt;assoc_id = 0;</div><div class='add'>+			IWL_DEBUG_MAC80211("DISASSOC %d\n", bss_conf-&gt;assoc);</div><div class='add'>+		}</div><div class='add'>+	} else if (changes &amp;&amp; iwl3945_is_associated(priv) &amp;&amp; priv-&gt;assoc_id) {</div><div class='add'>+			IWL_DEBUG_MAC80211("Associated Changes %d\n", changes);</div><div class='add'>+			iwl3945_send_rxon_assoc(priv);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int iwl3945_mac_hw_scan(struct ieee80211_hw *hw, u8 *ssid, size_t len)</div><div class='ctx'> {</div><div class='ctx'> 	int rc = 0;</div><div class='hunk'>@@ -6967,7 +7010,7 @@ static int iwl3945_mac_hw_scan(struct ieee80211_hw *hw, u8 *ssid, size_t len)</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;iw_mode == IEEE80211_IF_TYPE_AP) {	/* APs don't scan */</div><div class='add'>+	if (priv-&gt;iw_mode == NL80211_IFTYPE_AP) {	/* APs don't scan */</div><div class='ctx'> 		rc = -EIO;</div><div class='ctx'> 		IWL_ERROR("ERROR: APs don't scan\n");</div><div class='ctx'> 		goto out_unlock;</div><div class='hunk'>@@ -7109,7 +7152,7 @@ static int iwl3945_mac_conf_tx(struct ieee80211_hw *hw, u16 queue,</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;priv-&gt;mutex);</div><div class='del'>-	if (priv-&gt;iw_mode == IEEE80211_IF_TYPE_AP)</div><div class='add'>+	if (priv-&gt;iw_mode == NL80211_IFTYPE_AP)</div><div class='ctx'> 		iwl3945_activate_qos(priv, 1);</div><div class='ctx'> 	else if (priv-&gt;assoc_id &amp;&amp; iwl3945_is_associated(priv))</div><div class='ctx'> 		iwl3945_activate_qos(priv, 0);</div><div class='hunk'>@@ -7182,8 +7225,6 @@ static void iwl3945_mac_reset_tsf(struct ieee80211_hw *hw)</div><div class='ctx'> </div><div class='ctx'> 	iwl3945_reset_qos(priv);</div><div class='ctx'> </div><div class='del'>-	cancel_delayed_work(&amp;priv-&gt;post_associate);</div><div class='del'>-</div><div class='ctx'> 	spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='ctx'> 	priv-&gt;assoc_id = 0;</div><div class='ctx'> 	priv-&gt;assoc_capability = 0;</div><div class='hunk'>@@ -7198,7 +7239,7 @@ static void iwl3945_mac_reset_tsf(struct ieee80211_hw *hw)</div><div class='ctx'> 	priv-&gt;beacon_int = priv-&gt;hw-&gt;conf.beacon_int;</div><div class='ctx'> 	priv-&gt;timestamp1 = 0;</div><div class='ctx'> 	priv-&gt;timestamp0 = 0;</div><div class='del'>-	if ((priv-&gt;iw_mode == IEEE80211_IF_TYPE_STA))</div><div class='add'>+	if ((priv-&gt;iw_mode == NL80211_IFTYPE_STATION))</div><div class='ctx'> 		priv-&gt;beacon_int = 0;</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='hunk'>@@ -7212,14 +7253,14 @@ static void iwl3945_mac_reset_tsf(struct ieee80211_hw *hw)</div><div class='ctx'> 	/* we are restarting association process</div><div class='ctx'> 	 * clear RXON_FILTER_ASSOC_MSK bit</div><div class='ctx'> 	*/</div><div class='del'>-	if (priv-&gt;iw_mode != IEEE80211_IF_TYPE_AP) {</div><div class='add'>+	if (priv-&gt;iw_mode != NL80211_IFTYPE_AP) {</div><div class='ctx'> 		iwl3945_scan_cancel_timeout(priv, 100);</div><div class='ctx'> 		priv-&gt;staging_rxon.filter_flags &amp;= ~RXON_FILTER_ASSOC_MSK;</div><div class='ctx'> 		iwl3945_commit_rxon(priv);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Per mac80211.h: This is only used in IBSS mode... */</div><div class='del'>-	if (priv-&gt;iw_mode != IEEE80211_IF_TYPE_IBSS) {</div><div class='add'>+	if (priv-&gt;iw_mode != NL80211_IFTYPE_ADHOC) {</div><div class='ctx'> </div><div class='ctx'> 		IWL_DEBUG_MAC80211("leave - not in IBSS\n");</div><div class='ctx'> 		mutex_unlock(&amp;priv-&gt;mutex);</div><div class='hunk'>@@ -7248,7 +7289,7 @@ static int iwl3945_mac_beacon_update(struct ieee80211_hw *hw, struct sk_buff *sk</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;iw_mode != IEEE80211_IF_TYPE_IBSS) {</div><div class='add'>+	if (priv-&gt;iw_mode != NL80211_IFTYPE_ADHOC) {</div><div class='ctx'> 		IWL_DEBUG_MAC80211("leave - not IBSS\n");</div><div class='ctx'> 		mutex_unlock(&amp;priv-&gt;mutex);</div><div class='ctx'> 		return -EIO;</div><div class='hunk'>@@ -7268,7 +7309,7 @@ static int iwl3945_mac_beacon_update(struct ieee80211_hw *hw, struct sk_buff *sk</div><div class='ctx'> </div><div class='ctx'> 	iwl3945_reset_qos(priv);</div><div class='ctx'> </div><div class='del'>-	queue_work(priv-&gt;workqueue, &amp;priv-&gt;post_associate.work);</div><div class='add'>+	iwl3945_post_associate(priv);</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;priv-&gt;mutex);</div><div class='ctx'> </div><div class='hunk'>@@ -7329,15 +7370,6 @@ static ssize_t show_temperature(struct device *d,</div><div class='ctx'> </div><div class='ctx'> static DEVICE_ATTR(temperature, S_IRUGO, show_temperature, NULL);</div><div class='ctx'> </div><div class='del'>-static ssize_t show_rs_window(struct device *d,</div><div class='del'>-			      struct device_attribute *attr,</div><div class='del'>-			      char *buf)</div><div class='del'>-{</div><div class='del'>-	struct iwl3945_priv *priv = d-&gt;driver_data;</div><div class='del'>-	return iwl3945_fill_rs_info(priv-&gt;hw, buf, IWL_AP_ID);</div><div class='del'>-}</div><div class='del'>-static DEVICE_ATTR(rs_window, S_IRUGO, show_rs_window, NULL);</div><div class='del'>-</div><div class='ctx'> static ssize_t show_tx_power(struct device *d,</div><div class='ctx'> 			     struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='hunk'>@@ -7767,7 +7799,6 @@ static void iwl3945_setup_deferred_work(struct iwl3945_priv *priv)</div><div class='ctx'> 	INIT_WORK(&amp;priv-&gt;rf_kill, iwl3945_bg_rf_kill);</div><div class='ctx'> 	INIT_WORK(&amp;priv-&gt;beacon_update, iwl3945_bg_beacon_update);</div><div class='ctx'> 	INIT_WORK(&amp;priv-&gt;set_monitor, iwl3945_bg_set_monitor);</div><div class='del'>-	INIT_DELAYED_WORK(&amp;priv-&gt;post_associate, iwl3945_bg_post_associate);</div><div class='ctx'> 	INIT_DELAYED_WORK(&amp;priv-&gt;init_alive_start, iwl3945_bg_init_alive_start);</div><div class='ctx'> 	INIT_DELAYED_WORK(&amp;priv-&gt;alive_start, iwl3945_bg_alive_start);</div><div class='ctx'> 	INIT_DELAYED_WORK(&amp;priv-&gt;scan_check, iwl3945_bg_scan_check);</div><div class='hunk'>@@ -7785,7 +7816,6 @@ static void iwl3945_cancel_deferred_work(struct iwl3945_priv *priv)</div><div class='ctx'> 	cancel_delayed_work_sync(&amp;priv-&gt;init_alive_start);</div><div class='ctx'> 	cancel_delayed_work(&amp;priv-&gt;scan_check);</div><div class='ctx'> 	cancel_delayed_work(&amp;priv-&gt;alive_start);</div><div class='del'>-	cancel_delayed_work(&amp;priv-&gt;post_associate);</div><div class='ctx'> 	cancel_work_sync(&amp;priv-&gt;beacon_update);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -7801,7 +7831,6 @@ static struct attribute *iwl3945_sysfs_entries[] = {</div><div class='ctx'> #endif</div><div class='ctx'> 	&amp;dev_attr_power_level.attr,</div><div class='ctx'> 	&amp;dev_attr_retry_rate.attr,</div><div class='del'>-	&amp;dev_attr_rs_window.attr,</div><div class='ctx'> 	&amp;dev_attr_statistics.attr,</div><div class='ctx'> 	&amp;dev_attr_status.attr,</div><div class='ctx'> 	&amp;dev_attr_temperature.attr,</div><div class='hunk'>@@ -7830,6 +7859,7 @@ static struct ieee80211_ops iwl3945_hw_ops = {</div><div class='ctx'> 	.conf_tx = iwl3945_mac_conf_tx,</div><div class='ctx'> 	.get_tsf = iwl3945_mac_get_tsf,</div><div class='ctx'> 	.reset_tsf = iwl3945_mac_reset_tsf,</div><div class='add'>+	.bss_info_changed = iwl3945_bss_info_changed,</div><div class='ctx'> 	.hw_scan = iwl3945_mac_hw_scan</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -7868,6 +7898,7 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e</div><div class='ctx'> 	SET_IEEE80211_DEV(hw, &amp;pdev-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	hw-&gt;rate_control_algorithm = "iwl-3945-rs";</div><div class='add'>+	hw-&gt;sta_data_size = sizeof(struct iwl3945_sta_priv);</div><div class='ctx'> </div><div class='ctx'> 	IWL_DEBUG_INFO("*** LOAD DRIVER ***\n");</div><div class='ctx'> 	priv = hw-&gt;priv;</div><div class='hunk'>@@ -7890,6 +7921,11 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e</div><div class='ctx'> 	hw-&gt;flags = IEEE80211_HW_SIGNAL_DBM |</div><div class='ctx'> 		    IEEE80211_HW_NOISE_DBM;</div><div class='ctx'> </div><div class='add'>+	hw-&gt;wiphy-&gt;interface_modes =</div><div class='add'>+		BIT(NL80211_IFTYPE_AP) |</div><div class='add'>+		BIT(NL80211_IFTYPE_STATION) |</div><div class='add'>+		BIT(NL80211_IFTYPE_ADHOC);</div><div class='add'>+</div><div class='ctx'> 	/* 4 EDCA QOS priorities */</div><div class='ctx'> 	hw-&gt;queues = 4;</div><div class='ctx'> </div><div class='hunk'>@@ -7951,7 +7987,7 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e</div><div class='ctx'> 		IWL_DEBUG_INFO("Radio disabled.\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	priv-&gt;iw_mode = IEEE80211_IF_TYPE_STA;</div><div class='add'>+	priv-&gt;iw_mode = NL80211_IFTYPE_STATION;</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_INFO DRV_NAME</div><div class='ctx'> 		": Detected Intel Wireless WiFi Link %s\n", priv-&gt;cfg-&gt;name);</div><div class='hunk'>@@ -8331,6 +8367,8 @@ static void __exit iwl3945_exit(void)</div><div class='ctx'> 	iwl3945_rate_control_unregister();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+MODULE_FIRMWARE("iwlwifi-3945" IWL3945_UCODE_API ".ucode");</div><div class='add'>+</div><div class='ctx'> module_param_named(antenna, iwl3945_param_antenna, int, 0444);</div><div class='ctx'> MODULE_PARM_DESC(antenna, "select antenna (1=Main, 2=Aux, default 0 [both])");</div><div class='ctx'> module_param_named(disable, iwl3945_param_disable, int, 0444);</div><div class='head'>diff --git a/drivers/net/wireless/libertas/assoc.c b/drivers/net/wireless/libertas/assoc.c<br/>index a267d6e65f03..92be60415d04 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/libertas/assoc.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/libertas/assoc.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/libertas/assoc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/libertas/assoc.c</a></div><div class='hunk'>@@ -8,6 +8,7 @@</div><div class='ctx'> #include "scan.h"</div><div class='ctx'> #include "cmd.h"</div><div class='ctx'> </div><div class='add'>+static int lbs_adhoc_post(struct lbs_private *priv, struct cmd_header *resp);</div><div class='ctx'> </div><div class='ctx'> static const u8 bssid_any[ETH_ALEN]  __attribute__ ((aligned (2))) =</div><div class='ctx'> 	{ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };</div><div class='hunk'>@@ -20,12 +21,88 @@ static const u8 bssid_off[ETH_ALEN]  __attribute__ ((aligned (2))) =</div><div class='ctx'> #define CAPINFO_MASK	(~(0xda00))</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ *  @brief This function finds common rates between rates and card rates.</div><div class='add'>+ *</div><div class='add'>+ * It will fill common rates in rates as output if found.</div><div class='add'>+ *</div><div class='add'>+ * NOTE: Setting the MSB of the basic rates need to be taken</div><div class='add'>+ *   care, either before or after calling this function</div><div class='add'>+ *</div><div class='add'>+ *  @param priv     A pointer to struct lbs_private structure</div><div class='add'>+ *  @param rates       the buffer which keeps input and output</div><div class='add'>+ *  @param rates_size  the size of rate1 buffer; new size of buffer on return</div><div class='add'>+ *</div><div class='add'>+ *  @return            0 on success, or -1 on error</div><div class='add'>+ */</div><div class='add'>+static int get_common_rates(struct lbs_private *priv,</div><div class='add'>+	u8 *rates,</div><div class='add'>+	u16 *rates_size)</div><div class='add'>+{</div><div class='add'>+	u8 *card_rates = lbs_bg_rates;</div><div class='add'>+	size_t num_card_rates = sizeof(lbs_bg_rates);</div><div class='add'>+	int ret = 0, i, j;</div><div class='add'>+	u8 tmp[30];</div><div class='add'>+	size_t tmp_size = 0;</div><div class='add'>+</div><div class='add'>+	/* For each rate in card_rates that exists in rate1, copy to tmp */</div><div class='add'>+	for (i = 0; card_rates[i] &amp;&amp; (i &lt; num_card_rates); i++) {</div><div class='add'>+		for (j = 0; rates[j] &amp;&amp; (j &lt; *rates_size); j++) {</div><div class='add'>+			if (rates[j] == card_rates[i])</div><div class='add'>+				tmp[tmp_size++] = card_rates[i];</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	lbs_deb_hex(LBS_DEB_JOIN, "AP rates    ", rates, *rates_size);</div><div class='add'>+	lbs_deb_hex(LBS_DEB_JOIN, "card rates  ", card_rates, num_card_rates);</div><div class='add'>+	lbs_deb_hex(LBS_DEB_JOIN, "common rates", tmp, tmp_size);</div><div class='add'>+	lbs_deb_join("TX data rate 0x%02x\n", priv-&gt;cur_rate);</div><div class='add'>+</div><div class='add'>+	if (!priv-&gt;enablehwauto) {</div><div class='add'>+		for (i = 0; i &lt; tmp_size; i++) {</div><div class='add'>+			if (tmp[i] == priv-&gt;cur_rate)</div><div class='add'>+				goto done;</div><div class='add'>+		}</div><div class='add'>+		lbs_pr_alert("Previously set fixed data rate %#x isn't "</div><div class='add'>+		       "compatible with the network.\n", priv-&gt;cur_rate);</div><div class='add'>+		ret = -1;</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+	ret = 0;</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	memset(rates, 0, *rates_size);</div><div class='add'>+	*rates_size = min_t(int, tmp_size, *rates_size);</div><div class='add'>+	memcpy(rates, tmp, *rates_size);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *  @brief Sets the MSB on basic rates as the firmware requires</div><div class='add'>+ *</div><div class='add'>+ * Scan through an array and set the MSB for basic data rates.</div><div class='add'>+ *</div><div class='add'>+ *  @param rates     buffer of data rates</div><div class='add'>+ *  @param len       size of buffer</div><div class='add'>+ */</div><div class='add'>+static void lbs_set_basic_rate_flags(u8 *rates, size_t len)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; len; i++) {</div><div class='add'>+		if (rates[i] == 0x02 || rates[i] == 0x04 ||</div><div class='add'>+		    rates[i] == 0x0b || rates[i] == 0x16)</div><div class='add'>+			rates[i] |= 0x80;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *  @brief Associate to a specific BSS discovered in a scan</div><div class='ctx'>  *</div><div class='ctx'>  *  @param priv      A pointer to struct lbs_private structure</div><div class='del'>- *  @param pbssdesc  Pointer to the BSS descriptor to associate with.</div><div class='add'>+ *  @param assoc_req The association request describing the BSS to associate with</div><div class='ctx'>  *</div><div class='ctx'>  *  @return          0-success, otherwise fail</div><div class='ctx'>  */</div><div class='hunk'>@@ -33,29 +110,29 @@ static int lbs_associate(struct lbs_private *priv,</div><div class='ctx'> 	struct assoc_request *assoc_req)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='add'>+	u8 preamble = RADIO_PREAMBLE_LONG;</div><div class='ctx'> </div><div class='ctx'> 	lbs_deb_enter(LBS_DEB_ASSOC);</div><div class='ctx'> </div><div class='ctx'> 	ret = lbs_prepare_and_send_command(priv, CMD_802_11_AUTHENTICATE,</div><div class='ctx'> 				    0, CMD_OPTION_WAITFORRSP,</div><div class='ctx'> 				    0, assoc_req-&gt;bss.bssid);</div><div class='del'>-</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto done;</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='del'>-	/* set preamble to firmware */</div><div class='add'>+	/* Use short preamble only when both the BSS and firmware support it */</div><div class='ctx'> 	if ((priv-&gt;capability &amp; WLAN_CAPABILITY_SHORT_PREAMBLE) &amp;&amp;</div><div class='ctx'> 	    (assoc_req-&gt;bss.capability &amp; WLAN_CAPABILITY_SHORT_PREAMBLE))</div><div class='del'>-		priv-&gt;preamble = CMD_TYPE_SHORT_PREAMBLE;</div><div class='del'>-	else</div><div class='del'>-		priv-&gt;preamble = CMD_TYPE_LONG_PREAMBLE;</div><div class='add'>+		preamble = RADIO_PREAMBLE_SHORT;</div><div class='ctx'> </div><div class='del'>-	lbs_set_radio_control(priv);</div><div class='add'>+	ret = lbs_set_radio(priv, preamble, 1);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	ret = lbs_prepare_and_send_command(priv, CMD_802_11_ASSOCIATE,</div><div class='ctx'> 				    0, CMD_OPTION_WAITFORRSP, 0, assoc_req);</div><div class='ctx'> </div><div class='del'>-done:</div><div class='add'>+out:</div><div class='ctx'> 	lbs_deb_leave_args(LBS_DEB_ASSOC, "ret %d", ret);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -64,17 +141,22 @@ done:</div><div class='ctx'>  *  @brief Join an adhoc network found in a previous scan</div><div class='ctx'>  *</div><div class='ctx'>  *  @param priv         A pointer to struct lbs_private structure</div><div class='del'>- *  @param pbssdesc     Pointer to a BSS descriptor found in a previous scan</div><div class='del'>- *                      to attempt to join</div><div class='add'>+ *  @param assoc_req    The association request describing the BSS to join</div><div class='ctx'>  *</div><div class='del'>- *  @return             0--success, -1--fail</div><div class='add'>+ *  @return             0 on success, error on failure</div><div class='ctx'>  */</div><div class='del'>-static int lbs_join_adhoc_network(struct lbs_private *priv,</div><div class='add'>+static int lbs_adhoc_join(struct lbs_private *priv,</div><div class='ctx'> 	struct assoc_request *assoc_req)</div><div class='ctx'> {</div><div class='add'>+	struct cmd_ds_802_11_ad_hoc_join cmd;</div><div class='ctx'> 	struct bss_descriptor *bss = &amp;assoc_req-&gt;bss;</div><div class='add'>+	u8 preamble = RADIO_PREAMBLE_LONG;</div><div class='add'>+	DECLARE_MAC_BUF(mac);</div><div class='add'>+	u16 ratesize = 0;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='add'>+	lbs_deb_enter(LBS_DEB_ASSOC);</div><div class='add'>+</div><div class='ctx'> 	lbs_deb_join("current SSID '%s', ssid length %u\n",</div><div class='ctx'> 		escape_essid(priv-&gt;curbssparams.ssid,</div><div class='ctx'> 		priv-&gt;curbssparams.ssid_len),</div><div class='hunk'>@@ -106,29 +188,106 @@ static int lbs_join_adhoc_network(struct lbs_private *priv,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Use shortpreamble only when both creator and card supports</div><div class='del'>-	   short preamble */</div><div class='del'>-	if (!(bss-&gt;capability &amp; WLAN_CAPABILITY_SHORT_PREAMBLE) ||</div><div class='del'>-	    !(priv-&gt;capability &amp; WLAN_CAPABILITY_SHORT_PREAMBLE)) {</div><div class='del'>-		lbs_deb_join("AdhocJoin: Long preamble\n");</div><div class='del'>-		priv-&gt;preamble = CMD_TYPE_LONG_PREAMBLE;</div><div class='del'>-	} else {</div><div class='add'>+	/* Use short preamble only when both the BSS and firmware support it */</div><div class='add'>+	if ((priv-&gt;capability &amp; WLAN_CAPABILITY_SHORT_PREAMBLE) &amp;&amp;</div><div class='add'>+	    (bss-&gt;capability &amp; WLAN_CAPABILITY_SHORT_PREAMBLE)) {</div><div class='ctx'> 		lbs_deb_join("AdhocJoin: Short preamble\n");</div><div class='del'>-		priv-&gt;preamble = CMD_TYPE_SHORT_PREAMBLE;</div><div class='add'>+		preamble = RADIO_PREAMBLE_SHORT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	lbs_set_radio_control(priv);</div><div class='add'>+	ret = lbs_set_radio(priv, preamble, 1);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	lbs_deb_join("AdhocJoin: channel = %d\n", assoc_req-&gt;channel);</div><div class='ctx'> 	lbs_deb_join("AdhocJoin: band = %c\n", assoc_req-&gt;band);</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;adhoccreate = 0;</div><div class='add'>+	priv-&gt;curbssparams.channel = bss-&gt;channel;</div><div class='ctx'> </div><div class='del'>-	ret = lbs_prepare_and_send_command(priv, CMD_802_11_AD_HOC_JOIN,</div><div class='del'>-				    0, CMD_OPTION_WAITFORRSP,</div><div class='del'>-				    OID_802_11_SSID, assoc_req);</div><div class='add'>+	/* Build the join command */</div><div class='add'>+	memset(&amp;cmd, 0, sizeof(cmd));</div><div class='add'>+	cmd.hdr.size = cpu_to_le16(sizeof(cmd));</div><div class='add'>+</div><div class='add'>+	cmd.bss.type = CMD_BSS_TYPE_IBSS;</div><div class='add'>+	cmd.bss.beaconperiod = cpu_to_le16(bss-&gt;beaconperiod);</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;cmd.bss.bssid, &amp;bss-&gt;bssid, ETH_ALEN);</div><div class='add'>+	memcpy(&amp;cmd.bss.ssid, &amp;bss-&gt;ssid, bss-&gt;ssid_len);</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;cmd.bss.phyparamset, &amp;bss-&gt;phyparamset,</div><div class='add'>+	       sizeof(union ieeetypes_phyparamset));</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;cmd.bss.ssparamset, &amp;bss-&gt;ssparamset,</div><div class='add'>+	       sizeof(union IEEEtypes_ssparamset));</div><div class='add'>+</div><div class='add'>+	cmd.bss.capability = cpu_to_le16(bss-&gt;capability &amp; CAPINFO_MASK);</div><div class='add'>+	lbs_deb_join("ADHOC_J_CMD: tmpcap=%4X CAPINFO_MASK=%4X\n",</div><div class='add'>+	       bss-&gt;capability, CAPINFO_MASK);</div><div class='add'>+</div><div class='add'>+	/* information on BSSID descriptor passed to FW */</div><div class='add'>+	lbs_deb_join("ADHOC_J_CMD: BSSID = %s, SSID = '%s'\n",</div><div class='add'>+			print_mac(mac, cmd.bss.bssid), cmd.bss.ssid);</div><div class='add'>+</div><div class='add'>+	/* Only v8 and below support setting these */</div><div class='add'>+	if (priv-&gt;fwrelease &lt; 0x09000000) {</div><div class='add'>+		/* failtimeout */</div><div class='add'>+		cmd.failtimeout = cpu_to_le16(MRVDRV_ASSOCIATION_TIME_OUT);</div><div class='add'>+		/* probedelay */</div><div class='add'>+		cmd.probedelay = cpu_to_le16(CMD_SCAN_PROBE_DELAY_TIME);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Copy Data rates from the rates recorded in scan response */</div><div class='add'>+	memset(cmd.bss.rates, 0, sizeof(cmd.bss.rates));</div><div class='add'>+	ratesize = min_t(u16, sizeof(cmd.bss.rates), MAX_RATES);</div><div class='add'>+	memcpy(cmd.bss.rates, bss-&gt;rates, ratesize);</div><div class='add'>+	if (get_common_rates(priv, cmd.bss.rates, &amp;ratesize)) {</div><div class='add'>+		lbs_deb_join("ADHOC_JOIN: get_common_rates returned error.\n");</div><div class='add'>+		ret = -1;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Copy the ad-hoc creation rates into Current BSS state structure */</div><div class='add'>+	memset(&amp;priv-&gt;curbssparams.rates, 0, sizeof(priv-&gt;curbssparams.rates));</div><div class='add'>+	memcpy(&amp;priv-&gt;curbssparams.rates, cmd.bss.rates, ratesize);</div><div class='add'>+</div><div class='add'>+	/* Set MSB on basic rates as the firmware requires, but _after_</div><div class='add'>+	 * copying to current bss rates.</div><div class='add'>+	 */</div><div class='add'>+	lbs_set_basic_rate_flags(cmd.bss.rates, ratesize);</div><div class='add'>+</div><div class='add'>+	cmd.bss.ssparamset.ibssparamset.atimwindow = cpu_to_le16(bss-&gt;atimwindow);</div><div class='add'>+</div><div class='add'>+	if (assoc_req-&gt;secinfo.wep_enabled) {</div><div class='add'>+		u16 tmp = le16_to_cpu(cmd.bss.capability);</div><div class='add'>+		tmp |= WLAN_CAPABILITY_PRIVACY;</div><div class='add'>+		cmd.bss.capability = cpu_to_le16(tmp);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;psmode == LBS802_11POWERMODEMAX_PSP) {</div><div class='add'>+		__le32 local_ps_mode = cpu_to_le32(LBS802_11POWERMODECAM);</div><div class='add'>+</div><div class='add'>+		/* wake up first */</div><div class='add'>+		ret = lbs_prepare_and_send_command(priv, CMD_802_11_PS_MODE,</div><div class='add'>+						   CMD_ACT_SET, 0, 0,</div><div class='add'>+						   &amp;local_ps_mode);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ret = -1;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (lbs_parse_dnld_countryinfo_11d(priv, bss)) {</div><div class='add'>+		ret = -1;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = lbs_cmd_with_response(priv, CMD_802_11_AD_HOC_JOIN, &amp;cmd);</div><div class='add'>+	if (ret == 0)</div><div class='add'>+		ret = lbs_adhoc_post(priv, (struct cmd_header *) &amp;cmd);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='add'>+	lbs_deb_leave_args(LBS_DEB_ASSOC, "ret %d", ret);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -136,39 +295,131 @@ out:</div><div class='ctx'>  *  @brief Start an Adhoc Network</div><div class='ctx'>  *</div><div class='ctx'>  *  @param priv         A pointer to struct lbs_private structure</div><div class='del'>- *  @param adhocssid    The ssid of the Adhoc Network</div><div class='del'>- *  @return             0--success, -1--fail</div><div class='add'>+ *  @param assoc_req    The association request describing the BSS to start</div><div class='add'>+ *</div><div class='add'>+ *  @return             0 on success, error on failure</div><div class='ctx'>  */</div><div class='del'>-static int lbs_start_adhoc_network(struct lbs_private *priv,</div><div class='add'>+static int lbs_adhoc_start(struct lbs_private *priv,</div><div class='ctx'> 	struct assoc_request *assoc_req)</div><div class='ctx'> {</div><div class='add'>+	struct cmd_ds_802_11_ad_hoc_start cmd;</div><div class='add'>+	u8 preamble = RADIO_PREAMBLE_LONG;</div><div class='add'>+	size_t ratesize = 0;</div><div class='add'>+	u16 tmpcap = 0;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	priv-&gt;adhoccreate = 1;</div><div class='add'>+	lbs_deb_enter(LBS_DEB_ASSOC);</div><div class='ctx'> </div><div class='ctx'> 	if (priv-&gt;capability &amp; WLAN_CAPABILITY_SHORT_PREAMBLE) {</div><div class='del'>-		lbs_deb_join("AdhocStart: Short preamble\n");</div><div class='del'>-		priv-&gt;preamble = CMD_TYPE_SHORT_PREAMBLE;</div><div class='del'>-	} else {</div><div class='del'>-		lbs_deb_join("AdhocStart: Long preamble\n");</div><div class='del'>-		priv-&gt;preamble = CMD_TYPE_LONG_PREAMBLE;</div><div class='add'>+		lbs_deb_join("ADHOC_START: Will use short preamble\n");</div><div class='add'>+		preamble = RADIO_PREAMBLE_SHORT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	lbs_set_radio_control(priv);</div><div class='add'>+	ret = lbs_set_radio(priv, preamble, 1);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='del'>-	lbs_deb_join("AdhocStart: channel = %d\n", assoc_req-&gt;channel);</div><div class='del'>-	lbs_deb_join("AdhocStart: band = %d\n", assoc_req-&gt;band);</div><div class='add'>+	/* Build the start command */</div><div class='add'>+	memset(&amp;cmd, 0, sizeof(cmd));</div><div class='add'>+	cmd.hdr.size = cpu_to_le16(sizeof(cmd));</div><div class='ctx'> </div><div class='del'>-	ret = lbs_prepare_and_send_command(priv, CMD_802_11_AD_HOC_START,</div><div class='del'>-				    0, CMD_OPTION_WAITFORRSP, 0, assoc_req);</div><div class='add'>+	memcpy(cmd.ssid, assoc_req-&gt;ssid, assoc_req-&gt;ssid_len);</div><div class='add'>+</div><div class='add'>+	lbs_deb_join("ADHOC_START: SSID '%s', ssid length %u\n",</div><div class='add'>+		escape_essid(assoc_req-&gt;ssid, assoc_req-&gt;ssid_len),</div><div class='add'>+		assoc_req-&gt;ssid_len);</div><div class='add'>+</div><div class='add'>+	cmd.bsstype = CMD_BSS_TYPE_IBSS;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;beacon_period == 0)</div><div class='add'>+		priv-&gt;beacon_period = MRVDRV_BEACON_INTERVAL;</div><div class='add'>+	cmd.beaconperiod = cpu_to_le16(priv-&gt;beacon_period);</div><div class='add'>+</div><div class='add'>+	WARN_ON(!assoc_req-&gt;channel);</div><div class='add'>+</div><div class='add'>+	/* set Physical parameter set */</div><div class='add'>+	cmd.phyparamset.dsparamset.elementid = MFIE_TYPE_DS_SET;</div><div class='add'>+	cmd.phyparamset.dsparamset.len = 1;</div><div class='add'>+	cmd.phyparamset.dsparamset.currentchan = assoc_req-&gt;channel;</div><div class='add'>+</div><div class='add'>+	/* set IBSS parameter set */</div><div class='add'>+	cmd.ssparamset.ibssparamset.elementid = MFIE_TYPE_IBSS_SET;</div><div class='add'>+	cmd.ssparamset.ibssparamset.len = 2;</div><div class='add'>+	cmd.ssparamset.ibssparamset.atimwindow = 0;</div><div class='add'>+</div><div class='add'>+	/* set capability info */</div><div class='add'>+	tmpcap = WLAN_CAPABILITY_IBSS;</div><div class='add'>+	if (assoc_req-&gt;secinfo.wep_enabled) {</div><div class='add'>+		lbs_deb_join("ADHOC_START: WEP enabled, setting privacy on\n");</div><div class='add'>+		tmpcap |= WLAN_CAPABILITY_PRIVACY;</div><div class='add'>+	} else</div><div class='add'>+		lbs_deb_join("ADHOC_START: WEP disabled, setting privacy off\n");</div><div class='add'>+</div><div class='add'>+	cmd.capability = cpu_to_le16(tmpcap);</div><div class='add'>+</div><div class='add'>+	/* Only v8 and below support setting probe delay */</div><div class='add'>+	if (priv-&gt;fwrelease &lt; 0x09000000)</div><div class='add'>+		cmd.probedelay = cpu_to_le16(CMD_SCAN_PROBE_DELAY_TIME);</div><div class='add'>+</div><div class='add'>+	ratesize = min(sizeof(cmd.rates), sizeof(lbs_bg_rates));</div><div class='add'>+	memcpy(cmd.rates, lbs_bg_rates, ratesize);</div><div class='add'>+</div><div class='add'>+	/* Copy the ad-hoc creating rates into Current BSS state structure */</div><div class='add'>+	memset(&amp;priv-&gt;curbssparams.rates, 0, sizeof(priv-&gt;curbssparams.rates));</div><div class='add'>+	memcpy(&amp;priv-&gt;curbssparams.rates, &amp;cmd.rates, ratesize);</div><div class='ctx'> </div><div class='add'>+	/* Set MSB on basic rates as the firmware requires, but _after_</div><div class='add'>+	 * copying to current bss rates.</div><div class='add'>+	 */</div><div class='add'>+	lbs_set_basic_rate_flags(cmd.rates, ratesize);</div><div class='add'>+</div><div class='add'>+	lbs_deb_join("ADHOC_START: rates=%02x %02x %02x %02x\n",</div><div class='add'>+	       cmd.rates[0], cmd.rates[1], cmd.rates[2], cmd.rates[3]);</div><div class='add'>+</div><div class='add'>+	if (lbs_create_dnld_countryinfo_11d(priv)) {</div><div class='add'>+		lbs_deb_join("ADHOC_START: dnld_countryinfo_11d failed\n");</div><div class='add'>+		ret = -1;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	lbs_deb_join("ADHOC_START: Starting Ad-Hoc BSS on channel %d, band %d\n",</div><div class='add'>+		     assoc_req-&gt;channel, assoc_req-&gt;band);</div><div class='add'>+</div><div class='add'>+	priv-&gt;adhoccreate = 1;</div><div class='add'>+	priv-&gt;mode = IW_MODE_ADHOC;</div><div class='add'>+</div><div class='add'>+	ret = lbs_cmd_with_response(priv, CMD_802_11_AD_HOC_START, &amp;cmd);</div><div class='add'>+	if (ret == 0)</div><div class='add'>+		ret = lbs_adhoc_post(priv, (struct cmd_header *) &amp;cmd);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	lbs_deb_leave_args(LBS_DEB_ASSOC, "ret %d", ret);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int lbs_stop_adhoc_network(struct lbs_private *priv)</div><div class='add'>+/**</div><div class='add'>+ *  @brief Stop and Ad-Hoc network and exit Ad-Hoc mode</div><div class='add'>+ *</div><div class='add'>+ *  @param priv         A pointer to struct lbs_private structure</div><div class='add'>+ *  @return             0 on success, or an error</div><div class='add'>+ */</div><div class='add'>+int lbs_adhoc_stop(struct lbs_private *priv)</div><div class='ctx'> {</div><div class='del'>-	return lbs_prepare_and_send_command(priv, CMD_802_11_AD_HOC_STOP,</div><div class='del'>-				     0, CMD_OPTION_WAITFORRSP, 0, NULL);</div><div class='add'>+	struct cmd_ds_802_11_ad_hoc_stop cmd;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lbs_deb_enter(LBS_DEB_JOIN);</div><div class='add'>+</div><div class='add'>+	memset(&amp;cmd, 0, sizeof (cmd));</div><div class='add'>+	cmd.hdr.size = cpu_to_le16 (sizeof (cmd));</div><div class='add'>+</div><div class='add'>+	ret = lbs_cmd_with_response(priv, CMD_802_11_AD_HOC_STOP, &amp;cmd);</div><div class='add'>+</div><div class='add'>+	/* Clean up everything even if there was an error */</div><div class='add'>+	lbs_mac_event_disconnected(priv);</div><div class='add'>+</div><div class='add'>+	lbs_deb_leave_args(LBS_DEB_ASSOC, "ret %d", ret);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int match_bss_no_security(struct lbs_802_11_security *secinfo,</div><div class='hunk'>@@ -480,14 +731,14 @@ static int assoc_helper_essid(struct lbs_private *priv,</div><div class='ctx'> 		if (bss != NULL) {</div><div class='ctx'> 			lbs_deb_assoc("SSID found, will join\n");</div><div class='ctx'> 			memcpy(&amp;assoc_req-&gt;bss, bss, sizeof(struct bss_descriptor));</div><div class='del'>-			lbs_join_adhoc_network(priv, assoc_req);</div><div class='add'>+			lbs_adhoc_join(priv, assoc_req);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* else send START command */</div><div class='ctx'> 			lbs_deb_assoc("SSID not found, creating adhoc network\n");</div><div class='ctx'> 			memcpy(&amp;assoc_req-&gt;bss.ssid, &amp;assoc_req-&gt;ssid,</div><div class='ctx'> 				IW_ESSID_MAX_SIZE);</div><div class='ctx'> 			assoc_req-&gt;bss.ssid_len = assoc_req-&gt;ssid_len;</div><div class='del'>-			lbs_start_adhoc_network(priv, assoc_req);</div><div class='add'>+			lbs_adhoc_start(priv, assoc_req);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -520,7 +771,7 @@ static int assoc_helper_bssid(struct lbs_private *priv,</div><div class='ctx'> 		ret = lbs_associate(priv, assoc_req);</div><div class='ctx'> 		lbs_deb_assoc("ASSOC: lbs_associate(bssid) returned %d\n", ret);</div><div class='ctx'> 	} else if (assoc_req-&gt;mode == IW_MODE_ADHOC) {</div><div class='del'>-		lbs_join_adhoc_network(priv, assoc_req);</div><div class='add'>+		lbs_adhoc_join(priv, assoc_req);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='hunk'>@@ -572,11 +823,7 @@ static int assoc_helper_mode(struct lbs_private *priv,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;mode = assoc_req-&gt;mode;</div><div class='del'>-	ret = lbs_prepare_and_send_command(priv,</div><div class='del'>-				    CMD_802_11_SNMP_MIB,</div><div class='del'>-				    0, CMD_OPTION_WAITFORRSP,</div><div class='del'>-				    OID_802_11_INFRASTRUCTURE_MODE,</div><div class='del'>-		/* Shoot me now */  (void *) (size_t) assoc_req-&gt;mode);</div><div class='add'>+	ret = lbs_set_snmp_mib(priv, SNMP_MIB_OID_BSS_TYPE, assoc_req-&gt;mode);</div><div class='ctx'> </div><div class='ctx'> done:</div><div class='ctx'> 	lbs_deb_leave_args(LBS_DEB_ASSOC, "ret %d", ret);</div><div class='hunk'>@@ -1029,7 +1276,9 @@ void lbs_association_worker(struct work_struct *work)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (priv-&gt;mode == IW_MODE_INFRA) {</div><div class='ctx'> 		if (should_deauth_infrastructure(priv, assoc_req)) {</div><div class='del'>-			ret = lbs_send_deauthentication(priv);</div><div class='add'>+			ret = lbs_cmd_80211_deauthenticate(priv,</div><div class='add'>+							   priv-&gt;curbssparams.bssid,</div><div class='add'>+							   WLAN_REASON_DEAUTH_LEAVING);</div><div class='ctx'> 			if (ret) {</div><div class='ctx'> 				lbs_deb_assoc("Deauthentication due to new "</div><div class='ctx'> 					"configuration request failed: %d\n",</div><div class='hunk'>@@ -1038,7 +1287,7 @@ void lbs_association_worker(struct work_struct *work)</div><div class='ctx'> 		}</div><div class='ctx'> 	} else if (priv-&gt;mode == IW_MODE_ADHOC) {</div><div class='ctx'> 		if (should_stop_adhoc(priv, assoc_req)) {</div><div class='del'>-			ret = lbs_stop_adhoc_network(priv);</div><div class='add'>+			ret = lbs_adhoc_stop(priv);</div><div class='ctx'> 			if (ret) {</div><div class='ctx'> 				lbs_deb_assoc("Teardown of AdHoc network due to "</div><div class='ctx'> 					"new configuration request failed: %d\n",</div><div class='hunk'>@@ -1214,94 +1463,6 @@ struct assoc_request *lbs_get_association_request(struct lbs_private *priv)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *  @brief This function finds common rates between rate1 and card rates.</div><div class='del'>- *</div><div class='del'>- * It will fill common rates in rate1 as output if found.</div><div class='del'>- *</div><div class='del'>- * NOTE: Setting the MSB of the basic rates need to be taken</div><div class='del'>- *   care, either before or after calling this function</div><div class='del'>- *</div><div class='del'>- *  @param priv     A pointer to struct lbs_private structure</div><div class='del'>- *  @param rate1       the buffer which keeps input and output</div><div class='del'>- *  @param rate1_size  the size of rate1 buffer; new size of buffer on return</div><div class='del'>- *</div><div class='del'>- *  @return            0 or -1</div><div class='del'>- */</div><div class='del'>-static int get_common_rates(struct lbs_private *priv,</div><div class='del'>-	u8 *rates,</div><div class='del'>-	u16 *rates_size)</div><div class='del'>-{</div><div class='del'>-	u8 *card_rates = lbs_bg_rates;</div><div class='del'>-	size_t num_card_rates = sizeof(lbs_bg_rates);</div><div class='del'>-	int ret = 0, i, j;</div><div class='del'>-	u8 tmp[30];</div><div class='del'>-	size_t tmp_size = 0;</div><div class='del'>-</div><div class='del'>-	/* For each rate in card_rates that exists in rate1, copy to tmp */</div><div class='del'>-	for (i = 0; card_rates[i] &amp;&amp; (i &lt; num_card_rates); i++) {</div><div class='del'>-		for (j = 0; rates[j] &amp;&amp; (j &lt; *rates_size); j++) {</div><div class='del'>-			if (rates[j] == card_rates[i])</div><div class='del'>-				tmp[tmp_size++] = card_rates[i];</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	lbs_deb_hex(LBS_DEB_JOIN, "AP rates    ", rates, *rates_size);</div><div class='del'>-	lbs_deb_hex(LBS_DEB_JOIN, "card rates  ", card_rates, num_card_rates);</div><div class='del'>-	lbs_deb_hex(LBS_DEB_JOIN, "common rates", tmp, tmp_size);</div><div class='del'>-	lbs_deb_join("TX data rate 0x%02x\n", priv-&gt;cur_rate);</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;enablehwauto) {</div><div class='del'>-		for (i = 0; i &lt; tmp_size; i++) {</div><div class='del'>-			if (tmp[i] == priv-&gt;cur_rate)</div><div class='del'>-				goto done;</div><div class='del'>-		}</div><div class='del'>-		lbs_pr_alert("Previously set fixed data rate %#x isn't "</div><div class='del'>-		       "compatible with the network.\n", priv-&gt;cur_rate);</div><div class='del'>-		ret = -1;</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-	ret = 0;</div><div class='del'>-</div><div class='del'>-done:</div><div class='del'>-	memset(rates, 0, *rates_size);</div><div class='del'>-	*rates_size = min_t(int, tmp_size, *rates_size);</div><div class='del'>-	memcpy(rates, tmp, *rates_size);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *  @brief Sets the MSB on basic rates as the firmware requires</div><div class='del'>- *</div><div class='del'>- * Scan through an array and set the MSB for basic data rates.</div><div class='del'>- *</div><div class='del'>- *  @param rates     buffer of data rates</div><div class='del'>- *  @param len       size of buffer</div><div class='del'>- */</div><div class='del'>-static void lbs_set_basic_rate_flags(u8 *rates, size_t len)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; len; i++) {</div><div class='del'>-		if (rates[i] == 0x02 || rates[i] == 0x04 ||</div><div class='del'>-		    rates[i] == 0x0b || rates[i] == 0x16)</div><div class='del'>-			rates[i] |= 0x80;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *  @brief Send Deauthentication Request</div><div class='del'>- *</div><div class='del'>- *  @param priv      A pointer to struct lbs_private structure</div><div class='del'>- *  @return          0--success, -1--fail</div><div class='del'>- */</div><div class='del'>-int lbs_send_deauthentication(struct lbs_private *priv)</div><div class='del'>-{</div><div class='del'>-	return lbs_prepare_and_send_command(priv, CMD_802_11_DEAUTHENTICATE,</div><div class='del'>-				     0, CMD_OPTION_WAITFORRSP, 0, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  *  @brief This function prepares command of authenticate.</div><div class='ctx'>  *</div><div class='ctx'>  *  @param priv      A pointer to struct lbs_private structure</div><div class='hunk'>@@ -1353,26 +1514,37 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int lbs_cmd_80211_deauthenticate(struct lbs_private *priv,</div><div class='del'>-				   struct cmd_ds_command *cmd)</div><div class='add'>+/**</div><div class='add'>+ *  @brief Deauthenticate from a specific BSS</div><div class='add'>+ *</div><div class='add'>+ *  @param priv        A pointer to struct lbs_private structure</div><div class='add'>+ *  @param bssid       The specific BSS to deauthenticate from</div><div class='add'>+ *  @param reason      The 802.11 sec. 7.3.1.7 Reason Code for deauthenticating</div><div class='add'>+ *</div><div class='add'>+ *  @return            0 on success, error on failure</div><div class='add'>+ */</div><div class='add'>+int lbs_cmd_80211_deauthenticate(struct lbs_private *priv, u8 bssid[ETH_ALEN],</div><div class='add'>+				 u16 reason)</div><div class='ctx'> {</div><div class='del'>-	struct cmd_ds_802_11_deauthenticate *dauth = &amp;cmd-&gt;params.deauth;</div><div class='add'>+	struct cmd_ds_802_11_deauthenticate cmd;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	lbs_deb_enter(LBS_DEB_JOIN);</div><div class='ctx'> </div><div class='del'>-	cmd-&gt;command = cpu_to_le16(CMD_802_11_DEAUTHENTICATE);</div><div class='del'>-	cmd-&gt;size = cpu_to_le16(sizeof(struct cmd_ds_802_11_deauthenticate) +</div><div class='del'>-			     S_DS_GEN);</div><div class='add'>+	memset(&amp;cmd, 0, sizeof(cmd));</div><div class='add'>+	cmd.hdr.size = cpu_to_le16(sizeof(cmd));</div><div class='add'>+	memcpy(cmd.macaddr, &amp;bssid[0], ETH_ALEN);</div><div class='add'>+	cmd.reasoncode = cpu_to_le16(reason);</div><div class='ctx'> </div><div class='del'>-	/* set AP MAC address */</div><div class='del'>-	memmove(dauth-&gt;macaddr, priv-&gt;curbssparams.bssid, ETH_ALEN);</div><div class='add'>+	ret = lbs_cmd_with_response(priv, CMD_802_11_DEAUTHENTICATE, &amp;cmd);</div><div class='ctx'> </div><div class='del'>-	/* Reason code 3 = Station is leaving */</div><div class='del'>-#define REASON_CODE_STA_LEAVING 3</div><div class='del'>-	dauth-&gt;reasoncode = cpu_to_le16(REASON_CODE_STA_LEAVING);</div><div class='add'>+	/* Clean up everything even if there was an error; can't assume that</div><div class='add'>+	 * we're still authenticated to the AP after trying to deauth.</div><div class='add'>+	 */</div><div class='add'>+	lbs_mac_event_disconnected(priv);</div><div class='ctx'> </div><div class='ctx'> 	lbs_deb_leave(LBS_DEB_JOIN);</div><div class='del'>-	return 0;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int lbs_cmd_80211_associate(struct lbs_private *priv,</div><div class='hunk'>@@ -1489,231 +1661,6 @@ done:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int lbs_cmd_80211_ad_hoc_start(struct lbs_private *priv,</div><div class='del'>-				 struct cmd_ds_command *cmd, void *pdata_buf)</div><div class='del'>-{</div><div class='del'>-	struct cmd_ds_802_11_ad_hoc_start *adhs = &amp;cmd-&gt;params.ads;</div><div class='del'>-	int ret = 0;</div><div class='del'>-	int cmdappendsize = 0;</div><div class='del'>-	struct assoc_request *assoc_req = pdata_buf;</div><div class='del'>-	u16 tmpcap = 0;</div><div class='del'>-	size_t ratesize = 0;</div><div class='del'>-</div><div class='del'>-	lbs_deb_enter(LBS_DEB_JOIN);</div><div class='del'>-</div><div class='del'>-	if (!priv) {</div><div class='del'>-		ret = -1;</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cmd-&gt;command = cpu_to_le16(CMD_802_11_AD_HOC_START);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Fill in the parameters for 2 data structures:</div><div class='del'>-	 *   1. cmd_ds_802_11_ad_hoc_start command</div><div class='del'>-	 *   2. priv-&gt;scantable[i]</div><div class='del'>-	 *</div><div class='del'>-	 * Driver will fill up SSID, bsstype,IBSS param, Physical Param,</div><div class='del'>-	 *   probe delay, and cap info.</div><div class='del'>-	 *</div><div class='del'>-	 * Firmware will fill up beacon period, DTIM, Basic rates</div><div class='del'>-	 *   and operational rates.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	memset(adhs-&gt;ssid, 0, IW_ESSID_MAX_SIZE);</div><div class='del'>-	memcpy(adhs-&gt;ssid, assoc_req-&gt;ssid, assoc_req-&gt;ssid_len);</div><div class='del'>-</div><div class='del'>-	lbs_deb_join("ADHOC_S_CMD: SSID '%s', ssid length %u\n",</div><div class='del'>-		escape_essid(assoc_req-&gt;ssid, assoc_req-&gt;ssid_len),</div><div class='del'>-		assoc_req-&gt;ssid_len);</div><div class='del'>-</div><div class='del'>-	/* set the BSS type */</div><div class='del'>-	adhs-&gt;bsstype = CMD_BSS_TYPE_IBSS;</div><div class='del'>-	priv-&gt;mode = IW_MODE_ADHOC;</div><div class='del'>-	if (priv-&gt;beacon_period == 0)</div><div class='del'>-		priv-&gt;beacon_period = MRVDRV_BEACON_INTERVAL;</div><div class='del'>-	adhs-&gt;beaconperiod = cpu_to_le16(priv-&gt;beacon_period);</div><div class='del'>-</div><div class='del'>-	/* set Physical param set */</div><div class='del'>-#define DS_PARA_IE_ID   3</div><div class='del'>-#define DS_PARA_IE_LEN  1</div><div class='del'>-</div><div class='del'>-	adhs-&gt;phyparamset.dsparamset.elementid = DS_PARA_IE_ID;</div><div class='del'>-	adhs-&gt;phyparamset.dsparamset.len = DS_PARA_IE_LEN;</div><div class='del'>-</div><div class='del'>-	WARN_ON(!assoc_req-&gt;channel);</div><div class='del'>-</div><div class='del'>-	lbs_deb_join("ADHOC_S_CMD: Creating ADHOC on channel %d\n",</div><div class='del'>-		     assoc_req-&gt;channel);</div><div class='del'>-</div><div class='del'>-	adhs-&gt;phyparamset.dsparamset.currentchan = assoc_req-&gt;channel;</div><div class='del'>-</div><div class='del'>-	/* set IBSS param set */</div><div class='del'>-#define IBSS_PARA_IE_ID   6</div><div class='del'>-#define IBSS_PARA_IE_LEN  2</div><div class='del'>-</div><div class='del'>-	adhs-&gt;ssparamset.ibssparamset.elementid = IBSS_PARA_IE_ID;</div><div class='del'>-	adhs-&gt;ssparamset.ibssparamset.len = IBSS_PARA_IE_LEN;</div><div class='del'>-	adhs-&gt;ssparamset.ibssparamset.atimwindow = 0;</div><div class='del'>-</div><div class='del'>-	/* set capability info */</div><div class='del'>-	tmpcap = WLAN_CAPABILITY_IBSS;</div><div class='del'>-	if (assoc_req-&gt;secinfo.wep_enabled) {</div><div class='del'>-		lbs_deb_join("ADHOC_S_CMD: WEP enabled, "</div><div class='del'>-			"setting privacy on\n");</div><div class='del'>-		tmpcap |= WLAN_CAPABILITY_PRIVACY;</div><div class='del'>-	} else {</div><div class='del'>-		lbs_deb_join("ADHOC_S_CMD: WEP disabled, "</div><div class='del'>-			"setting privacy off\n");</div><div class='del'>-	}</div><div class='del'>-	adhs-&gt;capability = cpu_to_le16(tmpcap);</div><div class='del'>-</div><div class='del'>-	/* probedelay */</div><div class='del'>-	adhs-&gt;probedelay = cpu_to_le16(CMD_SCAN_PROBE_DELAY_TIME);</div><div class='del'>-</div><div class='del'>-	memset(adhs-&gt;rates, 0, sizeof(adhs-&gt;rates));</div><div class='del'>-	ratesize = min(sizeof(adhs-&gt;rates), sizeof(lbs_bg_rates));</div><div class='del'>-	memcpy(adhs-&gt;rates, lbs_bg_rates, ratesize);</div><div class='del'>-</div><div class='del'>-	/* Copy the ad-hoc creating rates into Current BSS state structure */</div><div class='del'>-	memset(&amp;priv-&gt;curbssparams.rates, 0, sizeof(priv-&gt;curbssparams.rates));</div><div class='del'>-	memcpy(&amp;priv-&gt;curbssparams.rates, &amp;adhs-&gt;rates, ratesize);</div><div class='del'>-</div><div class='del'>-	/* Set MSB on basic rates as the firmware requires, but _after_</div><div class='del'>-	 * copying to current bss rates.</div><div class='del'>-	 */</div><div class='del'>-	lbs_set_basic_rate_flags(adhs-&gt;rates, ratesize);</div><div class='del'>-</div><div class='del'>-	lbs_deb_join("ADHOC_S_CMD: rates=%02x %02x %02x %02x \n",</div><div class='del'>-	       adhs-&gt;rates[0], adhs-&gt;rates[1], adhs-&gt;rates[2], adhs-&gt;rates[3]);</div><div class='del'>-</div><div class='del'>-	lbs_deb_join("ADHOC_S_CMD: AD HOC Start command is ready\n");</div><div class='del'>-</div><div class='del'>-	if (lbs_create_dnld_countryinfo_11d(priv)) {</div><div class='del'>-		lbs_deb_join("ADHOC_S_CMD: dnld_countryinfo_11d failed\n");</div><div class='del'>-		ret = -1;</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cmd-&gt;size = cpu_to_le16(sizeof(struct cmd_ds_802_11_ad_hoc_start) +</div><div class='del'>-				S_DS_GEN + cmdappendsize);</div><div class='del'>-</div><div class='del'>-	ret = 0;</div><div class='del'>-done:</div><div class='del'>-	lbs_deb_leave_args(LBS_DEB_JOIN, "ret %d", ret);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int lbs_cmd_80211_ad_hoc_stop(struct cmd_ds_command *cmd)</div><div class='del'>-{</div><div class='del'>-	cmd-&gt;command = cpu_to_le16(CMD_802_11_AD_HOC_STOP);</div><div class='del'>-	cmd-&gt;size = cpu_to_le16(S_DS_GEN);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int lbs_cmd_80211_ad_hoc_join(struct lbs_private *priv,</div><div class='del'>-				struct cmd_ds_command *cmd, void *pdata_buf)</div><div class='del'>-{</div><div class='del'>-	struct cmd_ds_802_11_ad_hoc_join *join_cmd = &amp;cmd-&gt;params.adj;</div><div class='del'>-	struct assoc_request *assoc_req = pdata_buf;</div><div class='del'>-	struct bss_descriptor *bss = &amp;assoc_req-&gt;bss;</div><div class='del'>-	int cmdappendsize = 0;</div><div class='del'>-	int ret = 0;</div><div class='del'>-	u16 ratesize = 0;</div><div class='del'>-	DECLARE_MAC_BUF(mac);</div><div class='del'>-</div><div class='del'>-	lbs_deb_enter(LBS_DEB_JOIN);</div><div class='del'>-</div><div class='del'>-	cmd-&gt;command = cpu_to_le16(CMD_802_11_AD_HOC_JOIN);</div><div class='del'>-</div><div class='del'>-	join_cmd-&gt;bss.type = CMD_BSS_TYPE_IBSS;</div><div class='del'>-	join_cmd-&gt;bss.beaconperiod = cpu_to_le16(bss-&gt;beaconperiod);</div><div class='del'>-</div><div class='del'>-	memcpy(&amp;join_cmd-&gt;bss.bssid, &amp;bss-&gt;bssid, ETH_ALEN);</div><div class='del'>-	memcpy(&amp;join_cmd-&gt;bss.ssid, &amp;bss-&gt;ssid, bss-&gt;ssid_len);</div><div class='del'>-</div><div class='del'>-	memcpy(&amp;join_cmd-&gt;bss.phyparamset, &amp;bss-&gt;phyparamset,</div><div class='del'>-	       sizeof(union ieeetypes_phyparamset));</div><div class='del'>-</div><div class='del'>-	memcpy(&amp;join_cmd-&gt;bss.ssparamset, &amp;bss-&gt;ssparamset,</div><div class='del'>-	       sizeof(union IEEEtypes_ssparamset));</div><div class='del'>-</div><div class='del'>-	join_cmd-&gt;bss.capability = cpu_to_le16(bss-&gt;capability &amp; CAPINFO_MASK);</div><div class='del'>-	lbs_deb_join("ADHOC_J_CMD: tmpcap=%4X CAPINFO_MASK=%4X\n",</div><div class='del'>-	       bss-&gt;capability, CAPINFO_MASK);</div><div class='del'>-</div><div class='del'>-	/* information on BSSID descriptor passed to FW */</div><div class='del'>-	lbs_deb_join(</div><div class='del'>-	       "ADHOC_J_CMD: BSSID = %s, SSID = '%s'\n",</div><div class='del'>-	       print_mac(mac, join_cmd-&gt;bss.bssid),</div><div class='del'>-	       join_cmd-&gt;bss.ssid);</div><div class='del'>-</div><div class='del'>-	/* failtimeout */</div><div class='del'>-	join_cmd-&gt;failtimeout = cpu_to_le16(MRVDRV_ASSOCIATION_TIME_OUT);</div><div class='del'>-</div><div class='del'>-	/* probedelay */</div><div class='del'>-	join_cmd-&gt;probedelay = cpu_to_le16(CMD_SCAN_PROBE_DELAY_TIME);</div><div class='del'>-</div><div class='del'>-	priv-&gt;curbssparams.channel = bss-&gt;channel;</div><div class='del'>-</div><div class='del'>-	/* Copy Data rates from the rates recorded in scan response */</div><div class='del'>-	memset(join_cmd-&gt;bss.rates, 0, sizeof(join_cmd-&gt;bss.rates));</div><div class='del'>-	ratesize = min_t(u16, sizeof(join_cmd-&gt;bss.rates), MAX_RATES);</div><div class='del'>-	memcpy(join_cmd-&gt;bss.rates, bss-&gt;rates, ratesize);</div><div class='del'>-	if (get_common_rates(priv, join_cmd-&gt;bss.rates, &amp;ratesize)) {</div><div class='del'>-		lbs_deb_join("ADHOC_J_CMD: get_common_rates returns error.\n");</div><div class='del'>-		ret = -1;</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Copy the ad-hoc creating rates into Current BSS state structure */</div><div class='del'>-	memset(&amp;priv-&gt;curbssparams.rates, 0, sizeof(priv-&gt;curbssparams.rates));</div><div class='del'>-	memcpy(&amp;priv-&gt;curbssparams.rates, join_cmd-&gt;bss.rates, ratesize);</div><div class='del'>-</div><div class='del'>-	/* Set MSB on basic rates as the firmware requires, but _after_</div><div class='del'>-	 * copying to current bss rates.</div><div class='del'>-	 */</div><div class='del'>-	lbs_set_basic_rate_flags(join_cmd-&gt;bss.rates, ratesize);</div><div class='del'>-</div><div class='del'>-	join_cmd-&gt;bss.ssparamset.ibssparamset.atimwindow =</div><div class='del'>-	    cpu_to_le16(bss-&gt;atimwindow);</div><div class='del'>-</div><div class='del'>-	if (assoc_req-&gt;secinfo.wep_enabled) {</div><div class='del'>-		u16 tmp = le16_to_cpu(join_cmd-&gt;bss.capability);</div><div class='del'>-		tmp |= WLAN_CAPABILITY_PRIVACY;</div><div class='del'>-		join_cmd-&gt;bss.capability = cpu_to_le16(tmp);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;psmode == LBS802_11POWERMODEMAX_PSP) {</div><div class='del'>-		/* wake up first */</div><div class='del'>-		__le32 Localpsmode;</div><div class='del'>-</div><div class='del'>-		Localpsmode = cpu_to_le32(LBS802_11POWERMODECAM);</div><div class='del'>-		ret = lbs_prepare_and_send_command(priv,</div><div class='del'>-					    CMD_802_11_PS_MODE,</div><div class='del'>-					    CMD_ACT_SET,</div><div class='del'>-					    0, 0, &amp;Localpsmode);</div><div class='del'>-</div><div class='del'>-		if (ret) {</div><div class='del'>-			ret = -1;</div><div class='del'>-			goto done;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (lbs_parse_dnld_countryinfo_11d(priv, bss)) {</div><div class='del'>-		ret = -1;</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cmd-&gt;size = cpu_to_le16(sizeof(struct cmd_ds_802_11_ad_hoc_join) +</div><div class='del'>-				S_DS_GEN + cmdappendsize);</div><div class='del'>-</div><div class='del'>-done:</div><div class='del'>-	lbs_deb_leave_args(LBS_DEB_JOIN, "ret %d", ret);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> int lbs_ret_80211_associate(struct lbs_private *priv,</div><div class='ctx'> 			      struct cmd_ds_command *resp)</div><div class='ctx'> {</div><div class='hunk'>@@ -1815,34 +1762,19 @@ done:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int lbs_ret_80211_disassociate(struct lbs_private *priv)</div><div class='del'>-{</div><div class='del'>-	lbs_deb_enter(LBS_DEB_JOIN);</div><div class='del'>-</div><div class='del'>-	lbs_mac_event_disconnected(priv);</div><div class='del'>-</div><div class='del'>-	lbs_deb_leave(LBS_DEB_JOIN);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int lbs_ret_80211_ad_hoc_start(struct lbs_private *priv,</div><div class='del'>-				 struct cmd_ds_command *resp)</div><div class='add'>+static int lbs_adhoc_post(struct lbs_private *priv, struct cmd_header *resp)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	u16 command = le16_to_cpu(resp-&gt;command);</div><div class='ctx'> 	u16 result = le16_to_cpu(resp-&gt;result);</div><div class='del'>-	struct cmd_ds_802_11_ad_hoc_result *padhocresult;</div><div class='add'>+	struct cmd_ds_802_11_ad_hoc_result *adhoc_resp;</div><div class='ctx'> 	union iwreq_data wrqu;</div><div class='ctx'> 	struct bss_descriptor *bss;</div><div class='ctx'> 	DECLARE_MAC_BUF(mac);</div><div class='ctx'> </div><div class='ctx'> 	lbs_deb_enter(LBS_DEB_JOIN);</div><div class='ctx'> </div><div class='del'>-	padhocresult = &amp;resp-&gt;params.result;</div><div class='del'>-</div><div class='del'>-	lbs_deb_join("ADHOC_RESP: size = %d\n", le16_to_cpu(resp-&gt;size));</div><div class='del'>-	lbs_deb_join("ADHOC_RESP: command = %x\n", command);</div><div class='del'>-	lbs_deb_join("ADHOC_RESP: result = %x\n", result);</div><div class='add'>+	adhoc_resp = (struct cmd_ds_802_11_ad_hoc_result *) resp;</div><div class='ctx'> </div><div class='ctx'> 	if (!priv-&gt;in_progress_assoc_req) {</div><div class='ctx'> 		lbs_deb_join("ADHOC_RESP: no in-progress association "</div><div class='hunk'>@@ -1856,26 +1788,19 @@ int lbs_ret_80211_ad_hoc_start(struct lbs_private *priv,</div><div class='ctx'> 	 * Join result code 0 --&gt; SUCCESS</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (result) {</div><div class='del'>-		lbs_deb_join("ADHOC_RESP: failed\n");</div><div class='add'>+		lbs_deb_join("ADHOC_RESP: failed (result 0x%X)\n", result);</div><div class='ctx'> 		if (priv-&gt;connect_status == LBS_CONNECTED)</div><div class='ctx'> 			lbs_mac_event_disconnected(priv);</div><div class='ctx'> 		ret = -1;</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Now the join cmd should be successful</div><div class='del'>-	 * If BSSID has changed use SSID to compare instead of BSSID</div><div class='del'>-	 */</div><div class='del'>-	lbs_deb_join("ADHOC_RESP: associated to '%s'\n",</div><div class='del'>-		escape_essid(bss-&gt;ssid, bss-&gt;ssid_len));</div><div class='del'>-</div><div class='ctx'> 	/* Send a Media Connected event, according to the Spec */</div><div class='ctx'> 	priv-&gt;connect_status = LBS_CONNECTED;</div><div class='ctx'> </div><div class='ctx'> 	if (command == CMD_RET(CMD_802_11_AD_HOC_START)) {</div><div class='ctx'> 		/* Update the created network descriptor with the new BSSID */</div><div class='del'>-		memcpy(bss-&gt;bssid, padhocresult-&gt;bssid, ETH_ALEN);</div><div class='add'>+		memcpy(bss-&gt;bssid, adhoc_resp-&gt;bssid, ETH_ALEN);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Set the BSSID from the joined/started descriptor */</div><div class='hunk'>@@ -1894,22 +1819,13 @@ int lbs_ret_80211_ad_hoc_start(struct lbs_private *priv,</div><div class='ctx'> 	wrqu.ap_addr.sa_family = ARPHRD_ETHER;</div><div class='ctx'> 	wireless_send_event(priv-&gt;dev, SIOCGIWAP, &amp;wrqu, NULL);</div><div class='ctx'> </div><div class='del'>-	lbs_deb_join("ADHOC_RESP: - Joined/Started Ad Hoc\n");</div><div class='del'>-	lbs_deb_join("ADHOC_RESP: channel = %d\n", priv-&gt;curbssparams.channel);</div><div class='del'>-	lbs_deb_join("ADHOC_RESP: BSSID = %s\n",</div><div class='del'>-		     print_mac(mac, padhocresult-&gt;bssid));</div><div class='add'>+	lbs_deb_join("ADHOC_RESP: Joined/started '%s', BSSID %s, channel %d\n",</div><div class='add'>+		     escape_essid(bss-&gt;ssid, bss-&gt;ssid_len),</div><div class='add'>+		     print_mac(mac, priv-&gt;curbssparams.bssid),</div><div class='add'>+		     priv-&gt;curbssparams.channel);</div><div class='ctx'> </div><div class='ctx'> done:</div><div class='ctx'> 	lbs_deb_leave_args(LBS_DEB_JOIN, "ret %d", ret);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int lbs_ret_80211_ad_hoc_stop(struct lbs_private *priv)</div><div class='del'>-{</div><div class='del'>-	lbs_deb_enter(LBS_DEB_JOIN);</div><div class='del'>-</div><div class='del'>-	lbs_mac_event_disconnected(priv);</div><div class='del'>-</div><div class='del'>-	lbs_deb_leave(LBS_DEB_JOIN);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/net/wireless/libertas/assoc.h b/drivers/net/wireless/libertas/assoc.h<br/>index c516fbe518fd..8b7336dd02a3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/libertas/assoc.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/libertas/assoc.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/libertas/assoc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/libertas/assoc.h</a></div><div class='hunk'>@@ -12,28 +12,18 @@ struct cmd_ds_command;</div><div class='ctx'> int lbs_cmd_80211_authenticate(struct lbs_private *priv,</div><div class='ctx'> 					struct cmd_ds_command *cmd,</div><div class='ctx'> 					void *pdata_buf);</div><div class='del'>-int lbs_cmd_80211_ad_hoc_join(struct lbs_private *priv,</div><div class='del'>-				       struct cmd_ds_command *cmd,</div><div class='del'>-				       void *pdata_buf);</div><div class='del'>-int lbs_cmd_80211_ad_hoc_stop(struct cmd_ds_command *cmd);</div><div class='del'>-int lbs_cmd_80211_ad_hoc_start(struct lbs_private *priv,</div><div class='del'>-					struct cmd_ds_command *cmd,</div><div class='del'>-					void *pdata_buf);</div><div class='add'>+</div><div class='add'>+int lbs_adhoc_stop(struct lbs_private *priv);</div><div class='add'>+</div><div class='ctx'> int lbs_cmd_80211_deauthenticate(struct lbs_private *priv,</div><div class='del'>-					  struct cmd_ds_command *cmd);</div><div class='add'>+				 u8 bssid[ETH_ALEN], u16 reason);</div><div class='ctx'> int lbs_cmd_80211_associate(struct lbs_private *priv,</div><div class='ctx'> 				     struct cmd_ds_command *cmd,</div><div class='ctx'> 				     void *pdata_buf);</div><div class='ctx'> </div><div class='ctx'> int lbs_ret_80211_ad_hoc_start(struct lbs_private *priv,</div><div class='ctx'> 					struct cmd_ds_command *resp);</div><div class='del'>-int lbs_ret_80211_ad_hoc_stop(struct lbs_private *priv);</div><div class='del'>-int lbs_ret_80211_disassociate(struct lbs_private *priv);</div><div class='ctx'> int lbs_ret_80211_associate(struct lbs_private *priv,</div><div class='ctx'> 				     struct cmd_ds_command *resp);</div><div class='ctx'> </div><div class='del'>-int lbs_stop_adhoc_network(struct lbs_private *priv);</div><div class='del'>-</div><div class='del'>-int lbs_send_deauthentication(struct lbs_private *priv);</div><div class='del'>-</div><div class='ctx'> #endif /* _LBS_ASSOC_H */</div><div class='head'>diff --git a/drivers/net/wireless/libertas/cmd.c b/drivers/net/wireless/libertas/cmd.c<br/>index 75427e61898d..297696de2da0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/libertas/cmd.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/libertas/cmd.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/libertas/cmd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/libertas/cmd.c</a></div><div class='hunk'>@@ -480,181 +480,166 @@ int lbs_cmd_802_11_key_material(struct lbs_private *priv, uint16_t cmd_action,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int lbs_cmd_802_11_reset(struct cmd_ds_command *cmd, int cmd_action)</div><div class='del'>-{</div><div class='del'>-	struct cmd_ds_802_11_reset *reset = &amp;cmd-&gt;params.reset;</div><div class='del'>-</div><div class='del'>-	lbs_deb_enter(LBS_DEB_CMD);</div><div class='del'>-</div><div class='del'>-	cmd-&gt;command = cpu_to_le16(CMD_802_11_RESET);</div><div class='del'>-	cmd-&gt;size = cpu_to_le16(sizeof(struct cmd_ds_802_11_reset) + S_DS_GEN);</div><div class='del'>-	reset-&gt;action = cpu_to_le16(cmd_action);</div><div class='del'>-</div><div class='del'>-	lbs_deb_leave(LBS_DEB_CMD);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int lbs_cmd_802_11_snmp_mib(struct lbs_private *priv,</div><div class='del'>-				    struct cmd_ds_command *cmd,</div><div class='del'>-				    int cmd_action,</div><div class='del'>-				    int cmd_oid, void *pdata_buf)</div><div class='add'>+/**</div><div class='add'>+ *  @brief Set an SNMP MIB value</div><div class='add'>+ *</div><div class='add'>+ *  @param priv    	A pointer to struct lbs_private structure</div><div class='add'>+ *  @param oid  	The OID to set in the firmware</div><div class='add'>+ *  @param val  	Value to set the OID to</div><div class='add'>+ *</div><div class='add'>+ *  @return 	   	0 on success, error on failure</div><div class='add'>+ */</div><div class='add'>+int lbs_set_snmp_mib(struct lbs_private *priv, u32 oid, u16 val)</div><div class='ctx'> {</div><div class='del'>-	struct cmd_ds_802_11_snmp_mib *pSNMPMIB = &amp;cmd-&gt;params.smib;</div><div class='del'>-	u8 ucTemp;</div><div class='add'>+	struct cmd_ds_802_11_snmp_mib cmd;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	lbs_deb_enter(LBS_DEB_CMD);</div><div class='ctx'> </div><div class='del'>-	lbs_deb_cmd("SNMP_CMD: cmd_oid = 0x%x\n", cmd_oid);</div><div class='del'>-</div><div class='del'>-	cmd-&gt;command = cpu_to_le16(CMD_802_11_SNMP_MIB);</div><div class='del'>-	cmd-&gt;size = cpu_to_le16(sizeof(*pSNMPMIB) + S_DS_GEN);</div><div class='del'>-</div><div class='del'>-	switch (cmd_oid) {</div><div class='del'>-	case OID_802_11_INFRASTRUCTURE_MODE:</div><div class='del'>-	{</div><div class='del'>-		u8 mode = (u8) (size_t) pdata_buf;</div><div class='del'>-		pSNMPMIB-&gt;querytype = cpu_to_le16(CMD_ACT_SET);</div><div class='del'>-		pSNMPMIB-&gt;oid = cpu_to_le16((u16) DESIRED_BSSTYPE_I);</div><div class='del'>-		pSNMPMIB-&gt;bufsize = cpu_to_le16(sizeof(u8));</div><div class='del'>-		if (mode == IW_MODE_ADHOC) {</div><div class='del'>-			ucTemp = SNMP_MIB_VALUE_ADHOC;</div><div class='del'>-		} else {</div><div class='del'>-			/* Infra and Auto modes */</div><div class='del'>-			ucTemp = SNMP_MIB_VALUE_INFRA;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		memmove(pSNMPMIB-&gt;value, &amp;ucTemp, sizeof(u8));</div><div class='add'>+	memset(&amp;cmd, 0, sizeof (cmd));</div><div class='add'>+	cmd.hdr.size = cpu_to_le16(sizeof(cmd));</div><div class='add'>+	cmd.action = cpu_to_le16(CMD_ACT_SET);</div><div class='add'>+	cmd.oid = cpu_to_le16((u16) oid);</div><div class='ctx'> </div><div class='add'>+	switch (oid) {</div><div class='add'>+	case SNMP_MIB_OID_BSS_TYPE:</div><div class='add'>+		cmd.bufsize = cpu_to_le16(sizeof(u8));</div><div class='add'>+		cmd.value[0] = (val == IW_MODE_ADHOC) ? 2 : 1;</div><div class='ctx'> 		break;</div><div class='add'>+	case SNMP_MIB_OID_11D_ENABLE:</div><div class='add'>+	case SNMP_MIB_OID_FRAG_THRESHOLD:</div><div class='add'>+	case SNMP_MIB_OID_RTS_THRESHOLD:</div><div class='add'>+	case SNMP_MIB_OID_SHORT_RETRY_LIMIT:</div><div class='add'>+	case SNMP_MIB_OID_LONG_RETRY_LIMIT:</div><div class='add'>+		cmd.bufsize = cpu_to_le16(sizeof(u16));</div><div class='add'>+		*((__le16 *)(&amp;cmd.value)) = cpu_to_le16(val);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		lbs_deb_cmd("SNMP_CMD: (set) unhandled OID 0x%x\n", oid);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	case OID_802_11D_ENABLE:</div><div class='del'>-		{</div><div class='del'>-			u32 ulTemp;</div><div class='del'>-</div><div class='del'>-			pSNMPMIB-&gt;oid = cpu_to_le16((u16) DOT11D_I);</div><div class='del'>-</div><div class='del'>-			if (cmd_action == CMD_ACT_SET) {</div><div class='del'>-				pSNMPMIB-&gt;querytype = cpu_to_le16(CMD_ACT_SET);</div><div class='del'>-				pSNMPMIB-&gt;bufsize = cpu_to_le16(sizeof(u16));</div><div class='del'>-				ulTemp = *(u32 *)pdata_buf;</div><div class='del'>-				*((__le16 *)(pSNMPMIB-&gt;value)) =</div><div class='del'>-				    cpu_to_le16((u16) ulTemp);</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	case OID_802_11_FRAGMENTATION_THRESHOLD:</div><div class='del'>-		{</div><div class='del'>-			u32 ulTemp;</div><div class='del'>-</div><div class='del'>-			pSNMPMIB-&gt;oid = cpu_to_le16((u16) FRAGTHRESH_I);</div><div class='del'>-</div><div class='del'>-			if (cmd_action == CMD_ACT_GET) {</div><div class='del'>-				pSNMPMIB-&gt;querytype = cpu_to_le16(CMD_ACT_GET);</div><div class='del'>-			} else if (cmd_action == CMD_ACT_SET) {</div><div class='del'>-				pSNMPMIB-&gt;querytype = cpu_to_le16(CMD_ACT_SET);</div><div class='del'>-				pSNMPMIB-&gt;bufsize = cpu_to_le16(sizeof(u16));</div><div class='del'>-				ulTemp = *((u32 *) pdata_buf);</div><div class='del'>-				*((__le16 *)(pSNMPMIB-&gt;value)) =</div><div class='del'>-				    cpu_to_le16((u16) ulTemp);</div><div class='add'>+	lbs_deb_cmd("SNMP_CMD: (set) oid 0x%x, oid size 0x%x, value 0x%x\n",</div><div class='add'>+		    le16_to_cpu(cmd.oid), le16_to_cpu(cmd.bufsize), val);</div><div class='ctx'> </div><div class='del'>-			}</div><div class='add'>+	ret = lbs_cmd_with_response(priv, CMD_802_11_SNMP_MIB, &amp;cmd);</div><div class='ctx'> </div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='add'>+out:</div><div class='add'>+	lbs_deb_leave_args(LBS_DEB_CMD, "ret %d", ret);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	case OID_802_11_RTS_THRESHOLD:</div><div class='del'>-		{</div><div class='add'>+/**</div><div class='add'>+ *  @brief Get an SNMP MIB value</div><div class='add'>+ *</div><div class='add'>+ *  @param priv    	A pointer to struct lbs_private structure</div><div class='add'>+ *  @param oid  	The OID to retrieve from the firmware</div><div class='add'>+ *  @param out_val  	Location for the returned value</div><div class='add'>+ *</div><div class='add'>+ *  @return 	   	0 on success, error on failure</div><div class='add'>+ */</div><div class='add'>+int lbs_get_snmp_mib(struct lbs_private *priv, u32 oid, u16 *out_val)</div><div class='add'>+{</div><div class='add'>+	struct cmd_ds_802_11_snmp_mib cmd;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-			u32 ulTemp;</div><div class='del'>-			pSNMPMIB-&gt;oid = cpu_to_le16(RTSTHRESH_I);</div><div class='add'>+	lbs_deb_enter(LBS_DEB_CMD);</div><div class='ctx'> </div><div class='del'>-			if (cmd_action == CMD_ACT_GET) {</div><div class='del'>-				pSNMPMIB-&gt;querytype = cpu_to_le16(CMD_ACT_GET);</div><div class='del'>-			} else if (cmd_action == CMD_ACT_SET) {</div><div class='del'>-				pSNMPMIB-&gt;querytype = cpu_to_le16(CMD_ACT_SET);</div><div class='del'>-				pSNMPMIB-&gt;bufsize = cpu_to_le16(sizeof(u16));</div><div class='del'>-				ulTemp = *((u32 *)pdata_buf);</div><div class='del'>-				*(__le16 *)(pSNMPMIB-&gt;value) =</div><div class='del'>-				    cpu_to_le16((u16) ulTemp);</div><div class='add'>+	memset(&amp;cmd, 0, sizeof (cmd));</div><div class='add'>+	cmd.hdr.size = cpu_to_le16(sizeof(cmd));</div><div class='add'>+	cmd.action = cpu_to_le16(CMD_ACT_GET);</div><div class='add'>+	cmd.oid = cpu_to_le16(oid);</div><div class='ctx'> </div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	case OID_802_11_TX_RETRYCOUNT:</div><div class='del'>-		pSNMPMIB-&gt;oid = cpu_to_le16((u16) SHORT_RETRYLIM_I);</div><div class='del'>-</div><div class='del'>-		if (cmd_action == CMD_ACT_GET) {</div><div class='del'>-			pSNMPMIB-&gt;querytype = cpu_to_le16(CMD_ACT_GET);</div><div class='del'>-		} else if (cmd_action == CMD_ACT_SET) {</div><div class='del'>-			pSNMPMIB-&gt;querytype = cpu_to_le16(CMD_ACT_SET);</div><div class='del'>-			pSNMPMIB-&gt;bufsize = cpu_to_le16(sizeof(u16));</div><div class='del'>-			*((__le16 *)(pSNMPMIB-&gt;value)) =</div><div class='del'>-			    cpu_to_le16((u16) priv-&gt;txretrycount);</div><div class='del'>-		}</div><div class='add'>+	ret = lbs_cmd_with_response(priv, CMD_802_11_SNMP_MIB, &amp;cmd);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='add'>+	switch (le16_to_cpu(cmd.bufsize)) {</div><div class='add'>+	case sizeof(u8):</div><div class='add'>+		if (oid == SNMP_MIB_OID_BSS_TYPE) {</div><div class='add'>+			if (cmd.value[0] == 2)</div><div class='add'>+				*out_val = IW_MODE_ADHOC;</div><div class='add'>+			else</div><div class='add'>+				*out_val = IW_MODE_INFRA;</div><div class='add'>+		} else</div><div class='add'>+			*out_val = cmd.value[0];</div><div class='add'>+		break;</div><div class='add'>+	case sizeof(u16):</div><div class='add'>+		*out_val = le16_to_cpu(*((__le16 *)(&amp;cmd.value)));</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='add'>+		lbs_deb_cmd("SNMP_CMD: (get) unhandled OID 0x%x size %d\n",</div><div class='add'>+		            oid, le16_to_cpu(cmd.bufsize));</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	lbs_deb_cmd(</div><div class='del'>-	       "SNMP_CMD: command=0x%x, size=0x%x, seqnum=0x%x, result=0x%x\n",</div><div class='del'>-	       le16_to_cpu(cmd-&gt;command), le16_to_cpu(cmd-&gt;size),</div><div class='del'>-	       le16_to_cpu(cmd-&gt;seqnum), le16_to_cpu(cmd-&gt;result));</div><div class='del'>-</div><div class='del'>-	lbs_deb_cmd(</div><div class='del'>-	       "SNMP_CMD: action 0x%x, oid 0x%x, oidsize 0x%x, value 0x%x\n",</div><div class='del'>-	       le16_to_cpu(pSNMPMIB-&gt;querytype), le16_to_cpu(pSNMPMIB-&gt;oid),</div><div class='del'>-	       le16_to_cpu(pSNMPMIB-&gt;bufsize),</div><div class='del'>-	       le16_to_cpu(*(__le16 *) pSNMPMIB-&gt;value));</div><div class='del'>-</div><div class='del'>-	lbs_deb_leave(LBS_DEB_CMD);</div><div class='del'>-	return 0;</div><div class='add'>+out:</div><div class='add'>+	lbs_deb_leave_args(LBS_DEB_CMD, "ret %d", ret);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int lbs_cmd_802_11_rf_tx_power(struct cmd_ds_command *cmd,</div><div class='del'>-				       u16 cmd_action, void *pdata_buf)</div><div class='add'>+/**</div><div class='add'>+ *  @brief Get the min, max, and current TX power</div><div class='add'>+ *</div><div class='add'>+ *  @param priv    	A pointer to struct lbs_private structure</div><div class='add'>+ *  @param curlevel  	Current power level in dBm</div><div class='add'>+ *  @param minlevel  	Minimum supported power level in dBm (optional)</div><div class='add'>+ *  @param maxlevel  	Maximum supported power level in dBm (optional)</div><div class='add'>+ *</div><div class='add'>+ *  @return 	   	0 on success, error on failure</div><div class='add'>+ */</div><div class='add'>+int lbs_get_tx_power(struct lbs_private *priv, s16 *curlevel, s16 *minlevel,</div><div class='add'>+		     s16 *maxlevel)</div><div class='ctx'> {</div><div class='del'>-</div><div class='del'>-	struct cmd_ds_802_11_rf_tx_power *prtp = &amp;cmd-&gt;params.txp;</div><div class='add'>+	struct cmd_ds_802_11_rf_tx_power cmd;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	lbs_deb_enter(LBS_DEB_CMD);</div><div class='ctx'> </div><div class='del'>-	cmd-&gt;size =</div><div class='del'>-	    cpu_to_le16((sizeof(struct cmd_ds_802_11_rf_tx_power)) + S_DS_GEN);</div><div class='del'>-	cmd-&gt;command = cpu_to_le16(CMD_802_11_RF_TX_POWER);</div><div class='del'>-	prtp-&gt;action = cpu_to_le16(cmd_action);</div><div class='add'>+	memset(&amp;cmd, 0, sizeof(cmd));</div><div class='add'>+	cmd.hdr.size = cpu_to_le16(sizeof(cmd));</div><div class='add'>+	cmd.action = cpu_to_le16(CMD_ACT_GET);</div><div class='add'>+</div><div class='add'>+	ret = lbs_cmd_with_response(priv, CMD_802_11_RF_TX_POWER, &amp;cmd);</div><div class='add'>+	if (ret == 0) {</div><div class='add'>+		*curlevel = le16_to_cpu(cmd.curlevel);</div><div class='add'>+		if (minlevel)</div><div class='add'>+			*minlevel = le16_to_cpu(cmd.minlevel);</div><div class='add'>+		if (maxlevel)</div><div class='add'>+			*maxlevel = le16_to_cpu(cmd.maxlevel);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	lbs_deb_cmd("RF_TX_POWER_CMD: size:%d cmd:0x%x Act:%d\n",</div><div class='del'>-		    le16_to_cpu(cmd-&gt;size), le16_to_cpu(cmd-&gt;command),</div><div class='del'>-		    le16_to_cpu(prtp-&gt;action));</div><div class='add'>+	lbs_deb_leave(LBS_DEB_CMD);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	switch (cmd_action) {</div><div class='del'>-	case CMD_ACT_TX_POWER_OPT_GET:</div><div class='del'>-		prtp-&gt;action = cpu_to_le16(CMD_ACT_GET);</div><div class='del'>-		prtp-&gt;currentlevel = 0;</div><div class='del'>-		break;</div><div class='add'>+/**</div><div class='add'>+ *  @brief Set the TX power</div><div class='add'>+ *</div><div class='add'>+ *  @param priv    	A pointer to struct lbs_private structure</div><div class='add'>+ *  @param dbm  	The desired power level in dBm</div><div class='add'>+ *</div><div class='add'>+ *  @return 	   	0 on success, error on failure</div><div class='add'>+ */</div><div class='add'>+int lbs_set_tx_power(struct lbs_private *priv, s16 dbm)</div><div class='add'>+{</div><div class='add'>+	struct cmd_ds_802_11_rf_tx_power cmd;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	case CMD_ACT_TX_POWER_OPT_SET_HIGH:</div><div class='del'>-		prtp-&gt;action = cpu_to_le16(CMD_ACT_SET);</div><div class='del'>-		prtp-&gt;currentlevel = cpu_to_le16(CMD_ACT_TX_POWER_INDEX_HIGH);</div><div class='del'>-		break;</div><div class='add'>+	lbs_deb_enter(LBS_DEB_CMD);</div><div class='ctx'> </div><div class='del'>-	case CMD_ACT_TX_POWER_OPT_SET_MID:</div><div class='del'>-		prtp-&gt;action = cpu_to_le16(CMD_ACT_SET);</div><div class='del'>-		prtp-&gt;currentlevel = cpu_to_le16(CMD_ACT_TX_POWER_INDEX_MID);</div><div class='del'>-		break;</div><div class='add'>+	memset(&amp;cmd, 0, sizeof(cmd));</div><div class='add'>+	cmd.hdr.size = cpu_to_le16(sizeof(cmd));</div><div class='add'>+	cmd.action = cpu_to_le16(CMD_ACT_SET);</div><div class='add'>+	cmd.curlevel = cpu_to_le16(dbm);</div><div class='ctx'> </div><div class='del'>-	case CMD_ACT_TX_POWER_OPT_SET_LOW:</div><div class='del'>-		prtp-&gt;action = cpu_to_le16(CMD_ACT_SET);</div><div class='del'>-		prtp-&gt;currentlevel = cpu_to_le16(*((u16 *) pdata_buf));</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='add'>+	lbs_deb_cmd("SET_RF_TX_POWER: %d dBm\n", dbm);</div><div class='add'>+</div><div class='add'>+	ret = lbs_cmd_with_response(priv, CMD_802_11_RF_TX_POWER, &amp;cmd);</div><div class='ctx'> </div><div class='ctx'> 	lbs_deb_leave(LBS_DEB_CMD);</div><div class='del'>-	return 0;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int lbs_cmd_802_11_monitor_mode(struct cmd_ds_command *cmd,</div><div class='hunk'>@@ -838,7 +823,9 @@ int lbs_update_channel(struct lbs_private *priv)</div><div class='ctx'> int lbs_set_channel(struct lbs_private *priv, u8 channel)</div><div class='ctx'> {</div><div class='ctx'> 	struct cmd_ds_802_11_rf_channel cmd;</div><div class='add'>+#ifdef DEBUG</div><div class='ctx'> 	u8 old_channel = priv-&gt;curbssparams.channel;</div><div class='add'>+#endif</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	lbs_deb_enter(LBS_DEB_CMD);</div><div class='hunk'>@@ -1033,9 +1020,9 @@ int lbs_mesh_access(struct lbs_private *priv, uint16_t cmd_action,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int lbs_mesh_config_send(struct lbs_private *priv,</div><div class='del'>-			 struct cmd_ds_mesh_config *cmd,</div><div class='del'>-			 uint16_t action, uint16_t type)</div><div class='add'>+static int __lbs_mesh_config_send(struct lbs_private *priv,</div><div class='add'>+				  struct cmd_ds_mesh_config *cmd,</div><div class='add'>+				  uint16_t action, uint16_t type)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -1054,6 +1041,19 @@ int lbs_mesh_config_send(struct lbs_private *priv,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int lbs_mesh_config_send(struct lbs_private *priv,</div><div class='add'>+			 struct cmd_ds_mesh_config *cmd,</div><div class='add'>+			 uint16_t action, uint16_t type)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!(priv-&gt;fwcapinfo &amp; FW_CAPINFO_PERSISTENT_CONFIG))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	ret = __lbs_mesh_config_send(priv, cmd, action, type);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* This function is the CMD_MESH_CONFIG legacy function.  It only handles the</div><div class='ctx'>  * START and STOP actions.  The extended actions supported by CMD_MESH_CONFIG</div><div class='ctx'>  * are all handled by preparing a struct cmd_ds_mesh_config and passing it to</div><div class='hunk'>@@ -1095,7 +1095,7 @@ int lbs_mesh_config(struct lbs_private *priv, uint16_t action, uint16_t chan)</div><div class='ctx'> 		    action, priv-&gt;mesh_tlv, chan,</div><div class='ctx'> 		    escape_essid(priv-&gt;mesh_ssid, priv-&gt;mesh_ssid_len));</div><div class='ctx'> </div><div class='del'>-	return lbs_mesh_config_send(priv, &amp;cmd, action, priv-&gt;mesh_tlv);</div><div class='add'>+	return __lbs_mesh_config_send(priv, &amp;cmd, action, priv-&gt;mesh_tlv);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int lbs_cmd_bcn_ctrl(struct lbs_private * priv,</div><div class='hunk'>@@ -1256,41 +1256,47 @@ void lbs_complete_command(struct lbs_private *priv, struct cmd_ctrl_node *cmd,</div><div class='ctx'> 	priv-&gt;cur_cmd = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int lbs_set_radio_control(struct lbs_private *priv)</div><div class='add'>+int lbs_set_radio(struct lbs_private *priv, u8 preamble, u8 radio_on)</div><div class='ctx'> {</div><div class='del'>-	int ret = 0;</div><div class='ctx'> 	struct cmd_ds_802_11_radio_control cmd;</div><div class='add'>+	int ret = -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	lbs_deb_enter(LBS_DEB_CMD);</div><div class='ctx'> </div><div class='ctx'> 	cmd.hdr.size = cpu_to_le16(sizeof(cmd));</div><div class='ctx'> 	cmd.action = cpu_to_le16(CMD_ACT_SET);</div><div class='ctx'> </div><div class='del'>-	switch (priv-&gt;preamble) {</div><div class='del'>-	case CMD_TYPE_SHORT_PREAMBLE:</div><div class='del'>-		cmd.control = cpu_to_le16(SET_SHORT_PREAMBLE);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CMD_TYPE_LONG_PREAMBLE:</div><div class='del'>-		cmd.control = cpu_to_le16(SET_LONG_PREAMBLE);</div><div class='del'>-		break;</div><div class='add'>+	/* Only v8 and below support setting the preamble */</div><div class='add'>+	if (priv-&gt;fwrelease &lt; 0x09000000) {</div><div class='add'>+		switch (preamble) {</div><div class='add'>+		case RADIO_PREAMBLE_SHORT:</div><div class='add'>+			if (!(priv-&gt;capability &amp; WLAN_CAPABILITY_SHORT_PREAMBLE))</div><div class='add'>+				goto out;</div><div class='add'>+			/* Fall through */</div><div class='add'>+		case RADIO_PREAMBLE_AUTO:</div><div class='add'>+		case RADIO_PREAMBLE_LONG:</div><div class='add'>+			cmd.control = cpu_to_le16(preamble);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	case CMD_TYPE_AUTO_PREAMBLE:</div><div class='del'>-	default:</div><div class='del'>-		cmd.control = cpu_to_le16(SET_AUTO_PREAMBLE);</div><div class='del'>-		break;</div><div class='add'>+	if (radio_on)</div><div class='add'>+		cmd.control |= cpu_to_le16(0x1);</div><div class='add'>+	else {</div><div class='add'>+		cmd.control &amp;= cpu_to_le16(~0x1);</div><div class='add'>+		priv-&gt;txpower_cur = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;radioon)</div><div class='del'>-		cmd.control |= cpu_to_le16(TURN_ON_RF);</div><div class='del'>-	else</div><div class='del'>-		cmd.control &amp;= cpu_to_le16(~TURN_ON_RF);</div><div class='add'>+	lbs_deb_cmd("RADIO_CONTROL: radio %s, preamble %d\n",</div><div class='add'>+		    radio_on ? "ON" : "OFF", preamble);</div><div class='ctx'> </div><div class='del'>-	lbs_deb_cmd("RADIO_SET: radio %d, preamble %d\n", priv-&gt;radioon,</div><div class='del'>-		    priv-&gt;preamble);</div><div class='add'>+	priv-&gt;radio_on = radio_on;</div><div class='ctx'> </div><div class='ctx'> 	ret = lbs_cmd_with_response(priv, CMD_802_11_RADIO_CONTROL, &amp;cmd);</div><div class='ctx'> </div><div class='add'>+out:</div><div class='ctx'> 	lbs_deb_leave_args(LBS_DEB_CMD, "ret %d", ret);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -1380,55 +1386,25 @@ int lbs_prepare_and_send_command(struct lbs_private *priv,</div><div class='ctx'> 		ret = lbs_cmd_80211_associate(priv, cmdptr, pdata_buf);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case CMD_802_11_DEAUTHENTICATE:</div><div class='del'>-		ret = lbs_cmd_80211_deauthenticate(priv, cmdptr);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CMD_802_11_AD_HOC_START:</div><div class='del'>-		ret = lbs_cmd_80211_ad_hoc_start(priv, cmdptr, pdata_buf);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CMD_802_11_RESET:</div><div class='del'>-		ret = lbs_cmd_802_11_reset(cmdptr, cmd_action);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='ctx'> 	case CMD_802_11_AUTHENTICATE:</div><div class='ctx'> 		ret = lbs_cmd_80211_authenticate(priv, cmdptr, pdata_buf);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case CMD_802_11_SNMP_MIB:</div><div class='del'>-		ret = lbs_cmd_802_11_snmp_mib(priv, cmdptr,</div><div class='del'>-					       cmd_action, cmd_oid, pdata_buf);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='ctx'> 	case CMD_MAC_REG_ACCESS:</div><div class='ctx'> 	case CMD_BBP_REG_ACCESS:</div><div class='ctx'> 	case CMD_RF_REG_ACCESS:</div><div class='ctx'> 		ret = lbs_cmd_reg_access(cmdptr, cmd_action, pdata_buf);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case CMD_802_11_RF_TX_POWER:</div><div class='del'>-		ret = lbs_cmd_802_11_rf_tx_power(cmdptr,</div><div class='del'>-						 cmd_action, pdata_buf);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='ctx'> 	case CMD_802_11_MONITOR_MODE:</div><div class='ctx'> 		ret = lbs_cmd_802_11_monitor_mode(cmdptr,</div><div class='ctx'> 				          cmd_action, pdata_buf);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case CMD_802_11_AD_HOC_JOIN:</div><div class='del'>-		ret = lbs_cmd_80211_ad_hoc_join(priv, cmdptr, pdata_buf);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='ctx'> 	case CMD_802_11_RSSI:</div><div class='ctx'> 		ret = lbs_cmd_802_11_rssi(priv, cmdptr);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case CMD_802_11_AD_HOC_STOP:</div><div class='del'>-		ret = lbs_cmd_80211_ad_hoc_stop(cmdptr);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='ctx'> 	case CMD_802_11_SET_AFC:</div><div class='ctx'> 	case CMD_802_11_GET_AFC:</div><div class='ctx'> </div><div class='hunk'>@@ -1953,6 +1929,70 @@ void lbs_ps_confirm_sleep(struct lbs_private *priv)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * @brief Configures the transmission power control functionality.</div><div class='add'>+ *</div><div class='add'>+ * @param priv		A pointer to struct lbs_private structure</div><div class='add'>+ * @param enable	Transmission power control enable</div><div class='add'>+ * @param p0		Power level when link quality is good (dBm).</div><div class='add'>+ * @param p1		Power level when link quality is fair (dBm).</div><div class='add'>+ * @param p2		Power level when link quality is poor (dBm).</div><div class='add'>+ * @param usesnr	Use Signal to Noise Ratio in TPC</div><div class='add'>+ *</div><div class='add'>+ * @return 0 on success</div><div class='add'>+ */</div><div class='add'>+int lbs_set_tpc_cfg(struct lbs_private *priv, int enable, int8_t p0, int8_t p1,</div><div class='add'>+		int8_t p2, int usesnr)</div><div class='add'>+{</div><div class='add'>+	struct cmd_ds_802_11_tpc_cfg cmd;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	memset(&amp;cmd, 0, sizeof(cmd));</div><div class='add'>+	cmd.hdr.size = cpu_to_le16(sizeof(cmd));</div><div class='add'>+	cmd.action = cpu_to_le16(CMD_ACT_SET);</div><div class='add'>+	cmd.enable = !!enable;</div><div class='add'>+	cmd.usesnr = !!usesnr;</div><div class='add'>+	cmd.P0 = p0;</div><div class='add'>+	cmd.P1 = p1;</div><div class='add'>+	cmd.P2 = p2;</div><div class='add'>+</div><div class='add'>+	ret = lbs_cmd_with_response(priv, CMD_802_11_TPC_CFG, &amp;cmd);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * @brief Configures the power adaptation settings.</div><div class='add'>+ *</div><div class='add'>+ * @param priv		A pointer to struct lbs_private structure</div><div class='add'>+ * @param enable	Power adaptation enable</div><div class='add'>+ * @param p0		Power level for 1, 2, 5.5 and 11 Mbps (dBm).</div><div class='add'>+ * @param p1		Power level for 6, 9, 12, 18, 22, 24 and 36 Mbps (dBm).</div><div class='add'>+ * @param p2		Power level for 48 and 54 Mbps (dBm).</div><div class='add'>+ *</div><div class='add'>+ * @return 0 on Success</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+int lbs_set_power_adapt_cfg(struct lbs_private *priv, int enable, int8_t p0,</div><div class='add'>+		int8_t p1, int8_t p2)</div><div class='add'>+{</div><div class='add'>+	struct cmd_ds_802_11_pa_cfg cmd;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	memset(&amp;cmd, 0, sizeof(cmd));</div><div class='add'>+	cmd.hdr.size = cpu_to_le16(sizeof(cmd));</div><div class='add'>+	cmd.action = cpu_to_le16(CMD_ACT_SET);</div><div class='add'>+	cmd.enable = !!enable;</div><div class='add'>+	cmd.P0 = p0;</div><div class='add'>+	cmd.P1 = p1;</div><div class='add'>+	cmd.P2 = p2;</div><div class='add'>+</div><div class='add'>+	ret = lbs_cmd_with_response(priv, CMD_802_11_PA_CFG , &amp;cmd);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> static struct cmd_ctrl_node *__lbs_cmd_async(struct lbs_private *priv,</div><div class='ctx'> 	uint16_t command, struct cmd_header *in_cmd, int in_cmd_size,</div><div class='ctx'> 	int (*callback)(struct lbs_private *, unsigned long, struct cmd_header *),</div><div class='head'>diff --git a/drivers/net/wireless/libertas/cmd.h b/drivers/net/wireless/libertas/cmd.h<br/>index a53b51f8bdb4..36be4c9703e0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/libertas/cmd.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/libertas/cmd.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/libertas/cmd.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/libertas/cmd.h</a></div><div class='hunk'>@@ -26,6 +26,18 @@ int __lbs_cmd(struct lbs_private *priv, uint16_t command,</div><div class='ctx'> 	      int (*callback)(struct lbs_private *, unsigned long, struct cmd_header *),</div><div class='ctx'> 	      unsigned long callback_arg);</div><div class='ctx'> </div><div class='add'>+int lbs_set_power_adapt_cfg(struct lbs_private *priv, int enable, int8_t p0,</div><div class='add'>+		int8_t p1, int8_t p2);</div><div class='add'>+</div><div class='add'>+int lbs_set_tpc_cfg(struct lbs_private *priv, int enable, int8_t p0, int8_t p1,</div><div class='add'>+		int8_t p2, int usesnr);</div><div class='add'>+</div><div class='add'>+int lbs_set_power_adapt_cfg(struct lbs_private *priv, int enable, int8_t p0,</div><div class='add'>+		int8_t p1, int8_t p2);</div><div class='add'>+</div><div class='add'>+int lbs_set_tpc_cfg(struct lbs_private *priv, int enable, int8_t p0, int8_t p1,</div><div class='add'>+		int8_t p2, int usesnr);</div><div class='add'>+</div><div class='ctx'> int lbs_cmd_copyback(struct lbs_private *priv, unsigned long extra,</div><div class='ctx'> 		     struct cmd_header *resp);</div><div class='ctx'> </div><div class='hunk'>@@ -61,4 +73,14 @@ int lbs_cmd_802_11_enable_rsn(struct lbs_private *priv, uint16_t cmd_action,</div><div class='ctx'> int lbs_cmd_802_11_key_material(struct lbs_private *priv, uint16_t cmd_action,</div><div class='ctx'> 				struct assoc_request *assoc);</div><div class='ctx'> </div><div class='add'>+int lbs_get_tx_power(struct lbs_private *priv, s16 *curlevel, s16 *minlevel,</div><div class='add'>+		     s16 *maxlevel);</div><div class='add'>+int lbs_set_tx_power(struct lbs_private *priv, s16 dbm);</div><div class='add'>+</div><div class='add'>+int lbs_set_radio(struct lbs_private *priv, u8 preamble, u8 radio_on);</div><div class='add'>+</div><div class='add'>+int lbs_set_snmp_mib(struct lbs_private *priv, u32 oid, u16 val);</div><div class='add'>+</div><div class='add'>+int lbs_get_snmp_mib(struct lbs_private *priv, u32 oid, u16 *out_val);</div><div class='add'>+</div><div class='ctx'> #endif /* _LBS_CMD_H */</div><div class='head'>diff --git a/drivers/net/wireless/libertas/cmdresp.c b/drivers/net/wireless/libertas/cmdresp.c<br/>index 24de3c3cf877..bcf2a9756fb6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/libertas/cmdresp.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/libertas/cmdresp.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/libertas/cmdresp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/libertas/cmdresp.c</a></div><div class='hunk'>@@ -146,63 +146,6 @@ static int lbs_ret_reg_access(struct lbs_private *priv,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int lbs_ret_802_11_snmp_mib(struct lbs_private *priv,</div><div class='del'>-				    struct cmd_ds_command *resp)</div><div class='del'>-{</div><div class='del'>-	struct cmd_ds_802_11_snmp_mib *smib = &amp;resp-&gt;params.smib;</div><div class='del'>-	u16 oid = le16_to_cpu(smib-&gt;oid);</div><div class='del'>-	u16 querytype = le16_to_cpu(smib-&gt;querytype);</div><div class='del'>-</div><div class='del'>-	lbs_deb_enter(LBS_DEB_CMD);</div><div class='del'>-</div><div class='del'>-	lbs_deb_cmd("SNMP_RESP: oid 0x%x, querytype 0x%x\n", oid,</div><div class='del'>-	       querytype);</div><div class='del'>-	lbs_deb_cmd("SNMP_RESP: Buf size %d\n", le16_to_cpu(smib-&gt;bufsize));</div><div class='del'>-</div><div class='del'>-	if (querytype == CMD_ACT_GET) {</div><div class='del'>-		switch (oid) {</div><div class='del'>-		case FRAGTHRESH_I:</div><div class='del'>-			priv-&gt;fragthsd =</div><div class='del'>-				le16_to_cpu(*((__le16 *)(smib-&gt;value)));</div><div class='del'>-			lbs_deb_cmd("SNMP_RESP: frag threshold %u\n",</div><div class='del'>-				    priv-&gt;fragthsd);</div><div class='del'>-			break;</div><div class='del'>-		case RTSTHRESH_I:</div><div class='del'>-			priv-&gt;rtsthsd =</div><div class='del'>-				le16_to_cpu(*((__le16 *)(smib-&gt;value)));</div><div class='del'>-			lbs_deb_cmd("SNMP_RESP: rts threshold %u\n",</div><div class='del'>-				    priv-&gt;rtsthsd);</div><div class='del'>-			break;</div><div class='del'>-		case SHORT_RETRYLIM_I:</div><div class='del'>-			priv-&gt;txretrycount =</div><div class='del'>-				le16_to_cpu(*((__le16 *)(smib-&gt;value)));</div><div class='del'>-			lbs_deb_cmd("SNMP_RESP: tx retry count %u\n",</div><div class='del'>-				    priv-&gt;rtsthsd);</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	lbs_deb_enter(LBS_DEB_CMD);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int lbs_ret_802_11_rf_tx_power(struct lbs_private *priv,</div><div class='del'>-				       struct cmd_ds_command *resp)</div><div class='del'>-{</div><div class='del'>-	struct cmd_ds_802_11_rf_tx_power *rtp = &amp;resp-&gt;params.txp;</div><div class='del'>-</div><div class='del'>-	lbs_deb_enter(LBS_DEB_CMD);</div><div class='del'>-</div><div class='del'>-	priv-&gt;txpowerlevel = le16_to_cpu(rtp-&gt;currentlevel);</div><div class='del'>-</div><div class='del'>-	lbs_deb_cmd("TX power currently %d\n", priv-&gt;txpowerlevel);</div><div class='del'>-</div><div class='del'>-	lbs_deb_leave(LBS_DEB_CMD);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int lbs_ret_802_11_rssi(struct lbs_private *priv,</div><div class='ctx'> 				struct cmd_ds_command *resp)</div><div class='ctx'> {</div><div class='hunk'>@@ -273,24 +216,6 @@ static inline int handle_cmd_response(struct lbs_private *priv,</div><div class='ctx'> 		ret = lbs_ret_80211_associate(priv, resp);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case CMD_RET(CMD_802_11_DISASSOCIATE):</div><div class='del'>-	case CMD_RET(CMD_802_11_DEAUTHENTICATE):</div><div class='del'>-		ret = lbs_ret_80211_disassociate(priv);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CMD_RET(CMD_802_11_AD_HOC_START):</div><div class='del'>-	case CMD_RET(CMD_802_11_AD_HOC_JOIN):</div><div class='del'>-		ret = lbs_ret_80211_ad_hoc_start(priv, resp);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CMD_RET(CMD_802_11_SNMP_MIB):</div><div class='del'>-		ret = lbs_ret_802_11_snmp_mib(priv, resp);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CMD_RET(CMD_802_11_RF_TX_POWER):</div><div class='del'>-		ret = lbs_ret_802_11_rf_tx_power(priv, resp);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='ctx'> 	case CMD_RET(CMD_802_11_SET_AFC):</div><div class='ctx'> 	case CMD_RET(CMD_802_11_GET_AFC):</div><div class='ctx'> 		spin_lock_irqsave(&amp;priv-&gt;driver_lock, flags);</div><div class='hunk'>@@ -300,7 +225,6 @@ static inline int handle_cmd_response(struct lbs_private *priv,</div><div class='ctx'> </div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case CMD_RET(CMD_802_11_RESET):</div><div class='ctx'> 	case CMD_RET(CMD_802_11_AUTHENTICATE):</div><div class='ctx'> 	case CMD_RET(CMD_802_11_BEACON_STOP):</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -309,10 +233,6 @@ static inline int handle_cmd_response(struct lbs_private *priv,</div><div class='ctx'> 		ret = lbs_ret_802_11_rssi(priv, resp);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case CMD_RET(CMD_802_11_AD_HOC_STOP):</div><div class='del'>-		ret = lbs_ret_80211_ad_hoc_stop(priv);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='ctx'> 	case CMD_RET(CMD_802_11D_DOMAIN_INFO):</div><div class='ctx'> 		ret = lbs_ret_802_11d_domain_info(resp);</div><div class='ctx'> 		break;</div><div class='head'>diff --git a/drivers/net/wireless/libertas/decl.h b/drivers/net/wireless/libertas/decl.h<br/>index a8ac974dacac..1a8888cceadc 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/libertas/decl.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/libertas/decl.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/libertas/decl.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/libertas/decl.h</a></div><div class='hunk'>@@ -34,7 +34,6 @@ int lbs_process_event(struct lbs_private *priv, u32 event);</div><div class='ctx'> void lbs_queue_event(struct lbs_private *priv, u32 event);</div><div class='ctx'> void lbs_notify_command_response(struct lbs_private *priv, u8 resp_idx);</div><div class='ctx'> </div><div class='del'>-int lbs_set_radio_control(struct lbs_private *priv);</div><div class='ctx'> u32 lbs_fw_index_to_data_rate(u8 index);</div><div class='ctx'> u8 lbs_data_rate_to_fw_index(u32 rate);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/libertas/defs.h b/drivers/net/wireless/libertas/defs.h<br/>index 12e687550bce..076a636e8f62 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/libertas/defs.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/libertas/defs.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/libertas/defs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/libertas/defs.h</a></div><div class='hunk'>@@ -189,6 +189,14 @@ static inline void lbs_deb_hex(unsigned int grp, const char *prompt, u8 *buf, in</div><div class='ctx'> #define MRVDRV_CMD_UPLD_RDY		0x0008</div><div class='ctx'> #define MRVDRV_CARDEVENT		0x0010</div><div class='ctx'> </div><div class='add'>+/* Automatic TX control default levels */</div><div class='add'>+#define POW_ADAPT_DEFAULT_P0 13</div><div class='add'>+#define POW_ADAPT_DEFAULT_P1 15</div><div class='add'>+#define POW_ADAPT_DEFAULT_P2 18</div><div class='add'>+#define TPC_DEFAULT_P0 5</div><div class='add'>+#define TPC_DEFAULT_P1 10</div><div class='add'>+#define TPC_DEFAULT_P2 13</div><div class='add'>+</div><div class='ctx'> /** TxPD status */</div><div class='ctx'> </div><div class='ctx'> /*	Station firmware use TxPD status field to report final Tx transmit</div><div class='hunk'>@@ -243,6 +251,9 @@ static inline void lbs_deb_hex(unsigned int grp, const char *prompt, u8 *buf, in</div><div class='ctx'> </div><div class='ctx'> #define	CMD_F_HOSTCMD		(1 &lt;&lt; 0)</div><div class='ctx'> #define FW_CAPINFO_WPA  	(1 &lt;&lt; 0)</div><div class='add'>+#define FW_CAPINFO_FIRMWARE_UPGRADE	(1 &lt;&lt; 13)</div><div class='add'>+#define FW_CAPINFO_BOOT2_UPGRADE	(1&lt;&lt;14)</div><div class='add'>+#define FW_CAPINFO_PERSISTENT_CONFIG	(1&lt;&lt;15)</div><div class='ctx'> </div><div class='ctx'> #define KEY_LEN_WPA_AES			16</div><div class='ctx'> #define KEY_LEN_WPA_TKIP		32</div><div class='hunk'>@@ -316,7 +327,8 @@ enum PS_STATE {</div><div class='ctx'> enum DNLD_STATE {</div><div class='ctx'> 	DNLD_RES_RECEIVED,</div><div class='ctx'> 	DNLD_DATA_SENT,</div><div class='del'>-	DNLD_CMD_SENT</div><div class='add'>+	DNLD_CMD_SENT,</div><div class='add'>+	DNLD_BOOTCMD_SENT,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /** LBS_MEDIA_STATE */</div><div class='hunk'>@@ -339,27 +351,6 @@ enum mv_ms_type {</div><div class='ctx'> 	MVMS_EVENT</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/** SNMP_MIB_INDEX_e */</div><div class='del'>-enum SNMP_MIB_INDEX_e {</div><div class='del'>-	DESIRED_BSSTYPE_I = 0,</div><div class='del'>-	OP_RATESET_I,</div><div class='del'>-	BCNPERIOD_I,</div><div class='del'>-	DTIMPERIOD_I,</div><div class='del'>-	ASSOCRSP_TIMEOUT_I,</div><div class='del'>-	RTSTHRESH_I,</div><div class='del'>-	SHORT_RETRYLIM_I,</div><div class='del'>-	LONG_RETRYLIM_I,</div><div class='del'>-	FRAGTHRESH_I,</div><div class='del'>-	DOT11D_I,</div><div class='del'>-	DOT11H_I,</div><div class='del'>-	MANUFID_I,</div><div class='del'>-	PRODID_I,</div><div class='del'>-	MANUF_OUI_I,</div><div class='del'>-	MANUF_NAME_I,</div><div class='del'>-	MANUF_PRODNAME_I,</div><div class='del'>-	MANUF_PRODVER_I,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /** KEY_TYPE_ID */</div><div class='ctx'> enum KEY_TYPE_ID {</div><div class='ctx'> 	KEY_TYPE_ID_WEP = 0,</div><div class='hunk'>@@ -374,12 +365,6 @@ enum KEY_INFO_WPA {</div><div class='ctx'> 	KEY_INFO_WPA_ENABLED = 0x04</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/** SNMP_MIB_VALUE_e */</div><div class='del'>-enum SNMP_MIB_VALUE_e {</div><div class='del'>-	SNMP_MIB_VALUE_INFRA = 1,</div><div class='del'>-	SNMP_MIB_VALUE_ADHOC</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /* Default values for fwt commands. */</div><div class='ctx'> #define FWT_DEFAULT_METRIC 0</div><div class='ctx'> #define FWT_DEFAULT_DIR 1</div><div class='head'>diff --git a/drivers/net/wireless/libertas/dev.h b/drivers/net/wireless/libertas/dev.h<br/>index f5bb40c54d85..f6f3753da303 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/libertas/dev.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/libertas/dev.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/libertas/dev.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/libertas/dev.h</a></div><div class='hunk'>@@ -58,6 +58,7 @@ struct lbs_802_11_security {</div><div class='ctx'> 	u8 WPA2enabled;</div><div class='ctx'> 	u8 wep_enabled;</div><div class='ctx'> 	u8 auth_mode;</div><div class='add'>+	u32 key_mgmt;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /** Current Basic Service Set State Structure */</div><div class='hunk'>@@ -240,9 +241,6 @@ struct lbs_private {</div><div class='ctx'> 	uint16_t enablehwauto;</div><div class='ctx'> 	uint16_t ratebitmap;</div><div class='ctx'> </div><div class='del'>-	u32 fragthsd;</div><div class='del'>-	u32 rtsthsd;</div><div class='del'>-</div><div class='ctx'> 	u8 txretrycount;</div><div class='ctx'> </div><div class='ctx'> 	/** Tx-related variables (for single packet tx) */</div><div class='hunk'>@@ -253,7 +251,9 @@ struct lbs_private {</div><div class='ctx'> 	u32 connect_status;</div><div class='ctx'> 	u32 mesh_connect_status;</div><div class='ctx'> 	u16 regioncode;</div><div class='del'>-	u16 txpowerlevel;</div><div class='add'>+	s16 txpower_cur;</div><div class='add'>+	s16 txpower_min;</div><div class='add'>+	s16 txpower_max;</div><div class='ctx'> </div><div class='ctx'> 	/** POWER MANAGEMENT AND PnP SUPPORT */</div><div class='ctx'> 	u8 surpriseremoved;</div><div class='hunk'>@@ -291,8 +291,7 @@ struct lbs_private {</div><div class='ctx'> 	u16 nextSNRNF;</div><div class='ctx'> 	u16 numSNRNF;</div><div class='ctx'> </div><div class='del'>-	u8 radioon;</div><div class='del'>-	u32 preamble;</div><div class='add'>+	u8 radio_on;</div><div class='ctx'> </div><div class='ctx'> 	/** data rate stuff */</div><div class='ctx'> 	u8 cur_rate;</div><div class='head'>diff --git a/drivers/net/wireless/libertas/host.h b/drivers/net/wireless/libertas/host.h<br/>index c92e41b4faf4..5004d7679c02 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/libertas/host.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/libertas/host.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/libertas/host.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/libertas/host.h</a></div><div class='hunk'>@@ -9,17 +9,6 @@</div><div class='ctx'> #define DEFAULT_AD_HOC_CHANNEL			6</div><div class='ctx'> #define	DEFAULT_AD_HOC_CHANNEL_A		36</div><div class='ctx'> </div><div class='del'>-/** IEEE 802.11 oids */</div><div class='del'>-#define OID_802_11_SSID				0x00008002</div><div class='del'>-#define OID_802_11_INFRASTRUCTURE_MODE		0x00008008</div><div class='del'>-#define OID_802_11_FRAGMENTATION_THRESHOLD	0x00008009</div><div class='del'>-#define OID_802_11_RTS_THRESHOLD		0x0000800A</div><div class='del'>-#define OID_802_11_TX_ANTENNA_SELECTED		0x0000800D</div><div class='del'>-#define OID_802_11_SUPPORTED_RATES		0x0000800E</div><div class='del'>-#define OID_802_11_STATISTICS			0x00008012</div><div class='del'>-#define OID_802_11_TX_RETRYCOUNT		0x0000801D</div><div class='del'>-#define OID_802_11D_ENABLE			0x00008020</div><div class='del'>-</div><div class='ctx'> #define CMD_OPTION_WAITFORRSP			0x0002</div><div class='ctx'> </div><div class='ctx'> /** Host command IDs */</div><div class='hunk'>@@ -61,7 +50,6 @@</div><div class='ctx'> #define CMD_RF_REG_MAP				0x0023</div><div class='ctx'> #define CMD_802_11_DEAUTHENTICATE		0x0024</div><div class='ctx'> #define CMD_802_11_REASSOCIATE			0x0025</div><div class='del'>-#define CMD_802_11_DISASSOCIATE			0x0026</div><div class='ctx'> #define CMD_MAC_CONTROL				0x0028</div><div class='ctx'> #define CMD_802_11_AD_HOC_START			0x002b</div><div class='ctx'> #define CMD_802_11_AD_HOC_JOIN			0x002c</div><div class='hunk'>@@ -84,6 +72,7 @@</div><div class='ctx'> #define CMD_802_11_INACTIVITY_TIMEOUT		0x0067</div><div class='ctx'> #define CMD_802_11_SLEEP_PERIOD			0x0068</div><div class='ctx'> #define CMD_802_11_TPC_CFG			0x0072</div><div class='add'>+#define CMD_802_11_PA_CFG			0x0073</div><div class='ctx'> #define CMD_802_11_FW_WAKE_METHOD		0x0074</div><div class='ctx'> #define CMD_802_11_SUBSCRIBE_EVENT		0x0075</div><div class='ctx'> #define CMD_802_11_RATE_ADAPT_RATESET		0x0076</div><div class='hunk'>@@ -153,11 +142,6 @@</div><div class='ctx'> #define CMD_ACT_MAC_ALL_MULTICAST_ENABLE	0x0100</div><div class='ctx'> #define CMD_ACT_MAC_STRICT_PROTECTION_ENABLE	0x0400</div><div class='ctx'> </div><div class='del'>-/* Define action or option for CMD_802_11_RADIO_CONTROL */</div><div class='del'>-#define CMD_TYPE_AUTO_PREAMBLE		0x0001</div><div class='del'>-#define CMD_TYPE_SHORT_PREAMBLE		0x0002</div><div class='del'>-#define CMD_TYPE_LONG_PREAMBLE		0x0003</div><div class='del'>-</div><div class='ctx'> /* Event flags for CMD_802_11_SUBSCRIBE_EVENT */</div><div class='ctx'> #define CMD_SUBSCRIBE_RSSI_LOW		0x0001</div><div class='ctx'> #define CMD_SUBSCRIBE_SNR_LOW		0x0002</div><div class='hunk'>@@ -166,28 +150,14 @@</div><div class='ctx'> #define CMD_SUBSCRIBE_RSSI_HIGH		0x0010</div><div class='ctx'> #define CMD_SUBSCRIBE_SNR_HIGH		0x0020</div><div class='ctx'> </div><div class='del'>-#define TURN_ON_RF			0x01</div><div class='del'>-#define RADIO_ON			0x01</div><div class='del'>-#define RADIO_OFF			0x00</div><div class='del'>-</div><div class='del'>-#define SET_AUTO_PREAMBLE		0x05</div><div class='del'>-#define SET_SHORT_PREAMBLE		0x03</div><div class='del'>-#define SET_LONG_PREAMBLE		0x01</div><div class='add'>+#define RADIO_PREAMBLE_LONG	0x00</div><div class='add'>+#define RADIO_PREAMBLE_SHORT	0x02</div><div class='add'>+#define RADIO_PREAMBLE_AUTO	0x04</div><div class='ctx'> </div><div class='ctx'> /* Define action or option for CMD_802_11_RF_CHANNEL */</div><div class='ctx'> #define CMD_OPT_802_11_RF_CHANNEL_GET	0x00</div><div class='ctx'> #define CMD_OPT_802_11_RF_CHANNEL_SET	0x01</div><div class='ctx'> </div><div class='del'>-/* Define action or option for CMD_802_11_RF_TX_POWER */</div><div class='del'>-#define CMD_ACT_TX_POWER_OPT_GET	0x0000</div><div class='del'>-#define CMD_ACT_TX_POWER_OPT_SET_HIGH	0x8007</div><div class='del'>-#define CMD_ACT_TX_POWER_OPT_SET_MID	0x8004</div><div class='del'>-#define CMD_ACT_TX_POWER_OPT_SET_LOW	0x8000</div><div class='del'>-</div><div class='del'>-#define CMD_ACT_TX_POWER_INDEX_HIGH	0x0007</div><div class='del'>-#define CMD_ACT_TX_POWER_INDEX_MID	0x0004</div><div class='del'>-#define CMD_ACT_TX_POWER_INDEX_LOW	0x0000</div><div class='del'>-</div><div class='ctx'> /* Define action or option for CMD_802_11_DATA_RATE */</div><div class='ctx'> #define CMD_ACT_SET_TX_AUTO		0x0000</div><div class='ctx'> #define CMD_ACT_SET_TX_FIX_RATE		0x0001</div><div class='hunk'>@@ -210,6 +180,19 @@</div><div class='ctx'> #define CMD_WAKE_METHOD_COMMAND_INT	0x0001</div><div class='ctx'> #define CMD_WAKE_METHOD_GPIO		0x0002</div><div class='ctx'> </div><div class='add'>+/* Object IDs for CMD_802_11_SNMP_MIB */</div><div class='add'>+#define SNMP_MIB_OID_BSS_TYPE		0x0000</div><div class='add'>+#define SNMP_MIB_OID_OP_RATE_SET	0x0001</div><div class='add'>+#define SNMP_MIB_OID_BEACON_PERIOD	0x0002  /* Reserved on v9+ */</div><div class='add'>+#define SNMP_MIB_OID_DTIM_PERIOD	0x0003  /* Reserved on v9+ */</div><div class='add'>+#define SNMP_MIB_OID_ASSOC_TIMEOUT	0x0004  /* Reserved on v9+ */</div><div class='add'>+#define SNMP_MIB_OID_RTS_THRESHOLD	0x0005</div><div class='add'>+#define SNMP_MIB_OID_SHORT_RETRY_LIMIT	0x0006</div><div class='add'>+#define SNMP_MIB_OID_LONG_RETRY_LIMIT	0x0007</div><div class='add'>+#define SNMP_MIB_OID_FRAG_THRESHOLD	0x0008</div><div class='add'>+#define SNMP_MIB_OID_11D_ENABLE		0x0009</div><div class='add'>+#define SNMP_MIB_OID_11H_ENABLE		0x000A</div><div class='add'>+</div><div class='ctx'> /* Define action or option for CMD_BT_ACCESS */</div><div class='ctx'> enum cmd_bt_access_opts {</div><div class='ctx'> 	/* The bt commands start at 5 instead of 1 because the old dft commands</div><div class='head'>diff --git a/drivers/net/wireless/libertas/hostcmd.h b/drivers/net/wireless/libertas/hostcmd.h<br/>index 913b480211a9..d9f9a12a739e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/libertas/hostcmd.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/libertas/hostcmd.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/libertas/hostcmd.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/libertas/hostcmd.h</a></div><div class='hunk'>@@ -151,10 +151,6 @@ struct cmd_ds_get_hw_spec {</div><div class='ctx'> 	__le32 fwcapinfo;</div><div class='ctx'> } __attribute__ ((packed));</div><div class='ctx'> </div><div class='del'>-struct cmd_ds_802_11_reset {</div><div class='del'>-	__le16 action;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> struct cmd_ds_802_11_subscribe_event {</div><div class='ctx'> 	struct cmd_header hdr;</div><div class='ctx'> </div><div class='hunk'>@@ -232,7 +228,9 @@ struct cmd_ds_802_11_authenticate {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct cmd_ds_802_11_deauthenticate {</div><div class='del'>-	u8 macaddr[6];</div><div class='add'>+	struct cmd_header hdr;</div><div class='add'>+</div><div class='add'>+	u8 macaddr[ETH_ALEN];</div><div class='ctx'> 	__le16 reasoncode;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -251,20 +249,10 @@ struct cmd_ds_802_11_associate {</div><div class='ctx'> #endif</div><div class='ctx'> } __attribute__ ((packed));</div><div class='ctx'> </div><div class='del'>-struct cmd_ds_802_11_disassociate {</div><div class='del'>-	u8 destmacaddr[6];</div><div class='del'>-	__le16 reasoncode;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> struct cmd_ds_802_11_associate_rsp {</div><div class='ctx'> 	struct ieeetypes_assocrsp assocRsp;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct cmd_ds_802_11_ad_hoc_result {</div><div class='del'>-	u8 pad[3];</div><div class='del'>-	u8 bssid[ETH_ALEN];</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> struct cmd_ds_802_11_set_wep {</div><div class='ctx'> 	struct cmd_header hdr;</div><div class='ctx'> </div><div class='hunk'>@@ -309,7 +297,9 @@ struct cmd_ds_802_11_get_stat {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct cmd_ds_802_11_snmp_mib {</div><div class='del'>-	__le16 querytype;</div><div class='add'>+	struct cmd_header hdr;</div><div class='add'>+</div><div class='add'>+	__le16 action;</div><div class='ctx'> 	__le16 oid;</div><div class='ctx'> 	__le16 bufsize;</div><div class='ctx'> 	u8 value[128];</div><div class='hunk'>@@ -435,8 +425,12 @@ struct cmd_ds_802_11_mac_address {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct cmd_ds_802_11_rf_tx_power {</div><div class='add'>+	struct cmd_header hdr;</div><div class='add'>+</div><div class='ctx'> 	__le16 action;</div><div class='del'>-	__le16 currentlevel;</div><div class='add'>+	__le16 curlevel;</div><div class='add'>+	s8 maxlevel;</div><div class='add'>+	s8 minlevel;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct cmd_ds_802_11_rf_antenna {</div><div class='hunk'>@@ -507,10 +501,12 @@ struct cmd_ds_802_11_rate_adapt_rateset {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct cmd_ds_802_11_ad_hoc_start {</div><div class='add'>+	struct cmd_header hdr;</div><div class='add'>+</div><div class='ctx'> 	u8 ssid[IW_ESSID_MAX_SIZE];</div><div class='ctx'> 	u8 bsstype;</div><div class='ctx'> 	__le16 beaconperiod;</div><div class='del'>-	u8 dtimperiod;</div><div class='add'>+	u8 dtimperiod;   /* Reserved on v9 and later */</div><div class='ctx'> 	union IEEEtypes_ssparamset ssparamset;</div><div class='ctx'> 	union ieeetypes_phyparamset phyparamset;</div><div class='ctx'> 	__le16 probedelay;</div><div class='hunk'>@@ -519,9 +515,16 @@ struct cmd_ds_802_11_ad_hoc_start {</div><div class='ctx'> 	u8 tlv_memory_size_pad[100];</div><div class='ctx'> } __attribute__ ((packed));</div><div class='ctx'> </div><div class='add'>+struct cmd_ds_802_11_ad_hoc_result {</div><div class='add'>+	struct cmd_header hdr;</div><div class='add'>+</div><div class='add'>+	u8 pad[3];</div><div class='add'>+	u8 bssid[ETH_ALEN];</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct adhoc_bssdesc {</div><div class='del'>-	u8 bssid[6];</div><div class='del'>-	u8 ssid[32];</div><div class='add'>+	u8 bssid[ETH_ALEN];</div><div class='add'>+	u8 ssid[IW_ESSID_MAX_SIZE];</div><div class='ctx'> 	u8 type;</div><div class='ctx'> 	__le16 beaconperiod;</div><div class='ctx'> 	u8 dtimperiod;</div><div class='hunk'>@@ -539,10 +542,15 @@ struct adhoc_bssdesc {</div><div class='ctx'> } __attribute__ ((packed));</div><div class='ctx'> </div><div class='ctx'> struct cmd_ds_802_11_ad_hoc_join {</div><div class='add'>+	struct cmd_header hdr;</div><div class='add'>+</div><div class='ctx'> 	struct adhoc_bssdesc bss;</div><div class='del'>-	__le16 failtimeout;</div><div class='del'>-	__le16 probedelay;</div><div class='add'>+	__le16 failtimeout;   /* Reserved on v9 and later */</div><div class='add'>+	__le16 probedelay;    /* Reserved on v9 and later */</div><div class='add'>+} __attribute__ ((packed));</div><div class='ctx'> </div><div class='add'>+struct cmd_ds_802_11_ad_hoc_stop {</div><div class='add'>+	struct cmd_header hdr;</div><div class='ctx'> } __attribute__ ((packed));</div><div class='ctx'> </div><div class='ctx'> struct cmd_ds_802_11_enable_rsn {</div><div class='hunk'>@@ -597,14 +605,28 @@ struct cmd_ds_802_11_eeprom_access {</div><div class='ctx'> } __attribute__ ((packed));</div><div class='ctx'> </div><div class='ctx'> struct cmd_ds_802_11_tpc_cfg {</div><div class='add'>+	struct cmd_header hdr;</div><div class='add'>+</div><div class='ctx'> 	__le16 action;</div><div class='del'>-	u8 enable;</div><div class='del'>-	s8 P0;</div><div class='del'>-	s8 P1;</div><div class='del'>-	s8 P2;</div><div class='del'>-	u8 usesnr;</div><div class='add'>+	uint8_t enable;</div><div class='add'>+	int8_t P0;</div><div class='add'>+	int8_t P1;</div><div class='add'>+	int8_t P2;</div><div class='add'>+	uint8_t usesnr;</div><div class='ctx'> } __attribute__ ((packed));</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+struct cmd_ds_802_11_pa_cfg {</div><div class='add'>+	struct cmd_header hdr;</div><div class='add'>+</div><div class='add'>+	__le16 action;</div><div class='add'>+	uint8_t enable;</div><div class='add'>+	int8_t P0;</div><div class='add'>+	int8_t P1;</div><div class='add'>+	int8_t P2;</div><div class='add'>+} __attribute__ ((packed));</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> struct cmd_ds_802_11_led_ctrl {</div><div class='ctx'> 	__le16 action;</div><div class='ctx'> 	__le16 numled;</div><div class='hunk'>@@ -693,21 +715,13 @@ struct cmd_ds_command {</div><div class='ctx'> 	union {</div><div class='ctx'> 		struct cmd_ds_802_11_ps_mode psmode;</div><div class='ctx'> 		struct cmd_ds_802_11_associate associate;</div><div class='del'>-		struct cmd_ds_802_11_deauthenticate deauth;</div><div class='del'>-		struct cmd_ds_802_11_ad_hoc_start ads;</div><div class='del'>-		struct cmd_ds_802_11_reset reset;</div><div class='del'>-		struct cmd_ds_802_11_ad_hoc_result result;</div><div class='ctx'> 		struct cmd_ds_802_11_authenticate auth;</div><div class='ctx'> 		struct cmd_ds_802_11_get_stat gstat;</div><div class='ctx'> 		struct cmd_ds_802_3_get_stat gstat_8023;</div><div class='del'>-		struct cmd_ds_802_11_snmp_mib smib;</div><div class='del'>-		struct cmd_ds_802_11_rf_tx_power txp;</div><div class='ctx'> 		struct cmd_ds_802_11_rf_antenna rant;</div><div class='ctx'> 		struct cmd_ds_802_11_monitor_mode monitor;</div><div class='del'>-		struct cmd_ds_802_11_ad_hoc_join adj;</div><div class='ctx'> 		struct cmd_ds_802_11_rssi rssi;</div><div class='ctx'> 		struct cmd_ds_802_11_rssi_rsp rssirsp;</div><div class='del'>-		struct cmd_ds_802_11_disassociate dassociate;</div><div class='ctx'> 		struct cmd_ds_mac_reg_access macreg;</div><div class='ctx'> 		struct cmd_ds_bbp_reg_access bbpreg;</div><div class='ctx'> 		struct cmd_ds_rf_reg_access rfreg;</div><div class='head'>diff --git a/drivers/net/wireless/libertas/if_cs.c b/drivers/net/wireless/libertas/if_cs.c<br/>index 8941919001bb..842a08d1f106 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/libertas/if_cs.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/libertas/if_cs.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/libertas/if_cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/libertas/if_cs.c</a></div><div class='hunk'>@@ -713,7 +713,7 @@ static int if_cs_host_to_card(struct lbs_private *priv,</div><div class='ctx'> 		ret = if_cs_send_cmd(priv, buf, nb);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		lbs_pr_err("%s: unsupported type %d\n", __FUNCTION__, type);</div><div class='add'>+		lbs_pr_err("%s: unsupported type %d\n", __func__, type);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	lbs_deb_leave_args(LBS_DEB_CS, "ret %d", ret);</div><div class='hunk'>@@ -791,7 +791,7 @@ static int if_cs_probe(struct pcmcia_device *p_dev)</div><div class='ctx'> 	tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;</div><div class='ctx'> 	if ((ret = pcmcia_get_first_tuple(p_dev, &amp;tuple)) != 0 ||</div><div class='ctx'> 	    (ret = pcmcia_get_tuple_data(p_dev, &amp;tuple)) != 0 ||</div><div class='del'>-	    (ret = pcmcia_parse_tuple(p_dev, &amp;tuple, &amp;parse)) != 0)</div><div class='add'>+	    (ret = pcmcia_parse_tuple(&amp;tuple, &amp;parse)) != 0)</div><div class='ctx'> 	{</div><div class='ctx'> 		lbs_pr_err("error in pcmcia_get_first_tuple etc\n");</div><div class='ctx'> 		goto out1;</div><div class='head'>diff --git a/drivers/net/wireless/libertas/if_usb.c b/drivers/net/wireless/libertas/if_usb.c<br/>index 632c291404ab..cafbccb74143 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/libertas/if_usb.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/libertas/if_usb.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/libertas/if_usb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/libertas/if_usb.c</a></div><div class='hunk'>@@ -39,7 +39,10 @@ MODULE_DEVICE_TABLE(usb, if_usb_table);</div><div class='ctx'> </div><div class='ctx'> static void if_usb_receive(struct urb *urb);</div><div class='ctx'> static void if_usb_receive_fwload(struct urb *urb);</div><div class='del'>-static int if_usb_prog_firmware(struct if_usb_card *cardp);</div><div class='add'>+static int __if_usb_prog_firmware(struct if_usb_card *cardp,</div><div class='add'>+					const char *fwname, int cmd);</div><div class='add'>+static int if_usb_prog_firmware(struct if_usb_card *cardp,</div><div class='add'>+					const char *fwname, int cmd);</div><div class='ctx'> static int if_usb_host_to_card(struct lbs_private *priv, uint8_t type,</div><div class='ctx'> 			       uint8_t *payload, uint16_t nb);</div><div class='ctx'> static int usb_tx_block(struct if_usb_card *cardp, uint8_t *payload,</div><div class='hunk'>@@ -48,6 +51,62 @@ static void if_usb_free(struct if_usb_card *cardp);</div><div class='ctx'> static int if_usb_submit_rx_urb(struct if_usb_card *cardp);</div><div class='ctx'> static int if_usb_reset_device(struct if_usb_card *cardp);</div><div class='ctx'> </div><div class='add'>+/* sysfs hooks */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *  Set function to write firmware to device's persistent memory</div><div class='add'>+ */</div><div class='add'>+static ssize_t if_usb_firmware_set(struct device *dev,</div><div class='add'>+		struct device_attribute *attr, const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct lbs_private *priv = to_net_dev(dev)-&gt;priv;</div><div class='add'>+	struct if_usb_card *cardp = priv-&gt;card;</div><div class='add'>+	char fwname[FIRMWARE_NAME_MAX];</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	sscanf(buf, "%29s", fwname); /* FIRMWARE_NAME_MAX - 1 = 29 */</div><div class='add'>+	ret = if_usb_prog_firmware(cardp, fwname, BOOT_CMD_UPDATE_FW);</div><div class='add'>+	if (ret == 0)</div><div class='add'>+		return count;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * lbs_flash_fw attribute to be exported per ethX interface through sysfs</div><div class='add'>+ * (/sys/class/net/ethX/lbs_flash_fw).  Use this like so to write firmware to</div><div class='add'>+ * the device's persistent memory:</div><div class='add'>+ * echo usb8388-5.126.0.p5.bin &gt; /sys/class/net/ethX/lbs_flash_fw</div><div class='add'>+ */</div><div class='add'>+static DEVICE_ATTR(lbs_flash_fw, 0200, NULL, if_usb_firmware_set);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *  Set function to write firmware to device's persistent memory</div><div class='add'>+ */</div><div class='add'>+static ssize_t if_usb_boot2_set(struct device *dev,</div><div class='add'>+		struct device_attribute *attr, const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct lbs_private *priv = to_net_dev(dev)-&gt;priv;</div><div class='add'>+	struct if_usb_card *cardp = priv-&gt;card;</div><div class='add'>+	char fwname[FIRMWARE_NAME_MAX];</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	sscanf(buf, "%29s", fwname); /* FIRMWARE_NAME_MAX - 1 = 29 */</div><div class='add'>+	ret = if_usb_prog_firmware(cardp, fwname, BOOT_CMD_UPDATE_BOOT2);</div><div class='add'>+	if (ret == 0)</div><div class='add'>+		return count;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * lbs_flash_boot2 attribute to be exported per ethX interface through sysfs</div><div class='add'>+ * (/sys/class/net/ethX/lbs_flash_boot2).  Use this like so to write firmware</div><div class='add'>+ * to the device's persistent memory:</div><div class='add'>+ * echo usb8388-5.126.0.p5.bin &gt; /sys/class/net/ethX/lbs_flash_boot2</div><div class='add'>+ */</div><div class='add'>+static DEVICE_ATTR(lbs_flash_boot2, 0200, NULL, if_usb_boot2_set);</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  *  @brief  call back function to handle the status of the URB</div><div class='ctx'>  *  @param urb 		pointer to urb structure</div><div class='hunk'>@@ -66,10 +125,10 @@ static void if_usb_write_bulk_callback(struct urb *urb)</div><div class='ctx'> 		lbs_deb_usb2(&amp;urb-&gt;dev-&gt;dev, "Actual length transmitted %d\n",</div><div class='ctx'> 			     urb-&gt;actual_length);</div><div class='ctx'> </div><div class='del'>-		/* Used for both firmware TX and regular TX.  priv isn't</div><div class='del'>-		 * valid at firmware load time.</div><div class='add'>+		/* Boot commands such as UPDATE_FW and UPDATE_BOOT2 are not</div><div class='add'>+		 * passed up to the lbs level.</div><div class='ctx'> 		 */</div><div class='del'>-		if (priv)</div><div class='add'>+		if (priv &amp;&amp; priv-&gt;dnld_sent != DNLD_BOOTCMD_SENT)</div><div class='ctx'> 			lbs_host_to_card_done(priv);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* print the failure status number for debug */</div><div class='hunk'>@@ -231,7 +290,7 @@ static int if_usb_probe(struct usb_interface *intf,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Upload firmware */</div><div class='del'>-	if (if_usb_prog_firmware(cardp)) {</div><div class='add'>+	if (__if_usb_prog_firmware(cardp, lbs_fw_name, BOOT_CMD_FW_BY_USB)) {</div><div class='ctx'> 		lbs_deb_usbd(&amp;udev-&gt;dev, "FW upload failed\n");</div><div class='ctx'> 		goto err_prog_firmware;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -260,6 +319,12 @@ static int if_usb_probe(struct usb_interface *intf,</div><div class='ctx'> 	usb_get_dev(udev);</div><div class='ctx'> 	usb_set_intfdata(intf, cardp);</div><div class='ctx'> </div><div class='add'>+	if (device_create_file(&amp;priv-&gt;dev-&gt;dev, &amp;dev_attr_lbs_flash_fw))</div><div class='add'>+		lbs_pr_err("cannot register lbs_flash_fw attribute\n");</div><div class='add'>+</div><div class='add'>+	if (device_create_file(&amp;priv-&gt;dev-&gt;dev, &amp;dev_attr_lbs_flash_boot2))</div><div class='add'>+		lbs_pr_err("cannot register lbs_flash_boot2 attribute\n");</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err_start_card:</div><div class='hunk'>@@ -285,6 +350,9 @@ static void if_usb_disconnect(struct usb_interface *intf)</div><div class='ctx'> </div><div class='ctx'> 	lbs_deb_enter(LBS_DEB_MAIN);</div><div class='ctx'> </div><div class='add'>+	device_remove_file(&amp;priv-&gt;dev-&gt;dev, &amp;dev_attr_lbs_flash_boot2);</div><div class='add'>+	device_remove_file(&amp;priv-&gt;dev-&gt;dev, &amp;dev_attr_lbs_flash_fw);</div><div class='add'>+</div><div class='ctx'> 	cardp-&gt;surprise_removed = 1;</div><div class='ctx'> </div><div class='ctx'> 	if (priv) {</div><div class='hunk'>@@ -371,11 +439,10 @@ static int if_usb_reset_device(struct if_usb_card *cardp)</div><div class='ctx'> 	*(__le32 *)cardp-&gt;ep_out_buf = cpu_to_le32(CMD_TYPE_REQUEST);</div><div class='ctx'> </div><div class='ctx'> 	cmd-&gt;command = cpu_to_le16(CMD_802_11_RESET);</div><div class='del'>-	cmd-&gt;size = cpu_to_le16(sizeof(struct cmd_ds_802_11_reset) + S_DS_GEN);</div><div class='add'>+	cmd-&gt;size = cpu_to_le16(sizeof(struct cmd_header));</div><div class='ctx'> 	cmd-&gt;result = cpu_to_le16(0);</div><div class='ctx'> 	cmd-&gt;seqnum = cpu_to_le16(0x5a5a);</div><div class='del'>-	cmd-&gt;params.reset.action = cpu_to_le16(CMD_ACT_HALT);</div><div class='del'>-	usb_tx_block(cardp, cardp-&gt;ep_out_buf, 4 + S_DS_GEN + sizeof(struct cmd_ds_802_11_reset));</div><div class='add'>+	usb_tx_block(cardp, cardp-&gt;ep_out_buf, 4 + sizeof(struct cmd_header));</div><div class='ctx'> </div><div class='ctx'> 	msleep(100);</div><div class='ctx'> 	ret = usb_reset_device(cardp-&gt;udev);</div><div class='hunk'>@@ -510,7 +577,7 @@ static void if_usb_receive_fwload(struct urb *urb)</div><div class='ctx'> 		if (le16_to_cpu(cardp-&gt;udev-&gt;descriptor.bcdDevice) &lt; 0x3106) {</div><div class='ctx'> 			kfree_skb(skb);</div><div class='ctx'> 			if_usb_submit_rx_urb_fwload(cardp);</div><div class='del'>-			cardp-&gt;bootcmdresp = 1;</div><div class='add'>+			cardp-&gt;bootcmdresp = BOOT_CMD_RESP_OK;</div><div class='ctx'> 			lbs_deb_usbd(&amp;cardp-&gt;udev-&gt;dev,</div><div class='ctx'> 				     "Received valid boot command response\n");</div><div class='ctx'> 			return;</div><div class='hunk'>@@ -526,7 +593,9 @@ static void if_usb_receive_fwload(struct urb *urb)</div><div class='ctx'> 				lbs_pr_info("boot cmd response wrong magic number (0x%x)\n",</div><div class='ctx'> 					    le32_to_cpu(bootcmdresp.magic));</div><div class='ctx'> 			}</div><div class='del'>-		} else if (bootcmdresp.cmd != BOOT_CMD_FW_BY_USB) {</div><div class='add'>+		} else if ((bootcmdresp.cmd != BOOT_CMD_FW_BY_USB) &amp;&amp;</div><div class='add'>+			   (bootcmdresp.cmd != BOOT_CMD_UPDATE_FW) &amp;&amp;</div><div class='add'>+			   (bootcmdresp.cmd != BOOT_CMD_UPDATE_BOOT2)) {</div><div class='ctx'> 			lbs_pr_info("boot cmd response cmd_tag error (%d)\n",</div><div class='ctx'> 				    bootcmdresp.cmd);</div><div class='ctx'> 		} else if (bootcmdresp.result != BOOT_CMD_RESP_OK) {</div><div class='hunk'>@@ -564,8 +633,8 @@ static void if_usb_receive_fwload(struct urb *urb)</div><div class='ctx'> </div><div class='ctx'> 	kfree_skb(skb);</div><div class='ctx'> </div><div class='del'>-	/* reschedule timer for 200ms hence */</div><div class='del'>-	mod_timer(&amp;cardp-&gt;fw_timeout, jiffies + (HZ/5));</div><div class='add'>+	/* Give device 5s to either write firmware to its RAM or eeprom */</div><div class='add'>+	mod_timer(&amp;cardp-&gt;fw_timeout, jiffies + (HZ*5));</div><div class='ctx'> </div><div class='ctx'> 	if (cardp-&gt;fwfinalblk) {</div><div class='ctx'> 		cardp-&gt;fwdnldover = 1;</div><div class='hunk'>@@ -809,7 +878,54 @@ static int check_fwfile_format(const uint8_t *data, uint32_t totlen)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int if_usb_prog_firmware(struct if_usb_card *cardp)</div><div class='add'>+/**</div><div class='add'>+*  @brief This function programs the firmware subject to cmd</div><div class='add'>+*</div><div class='add'>+*  @param cardp             the if_usb_card descriptor</div><div class='add'>+*         fwname            firmware or boot2 image file name</div><div class='add'>+*         cmd               either BOOT_CMD_FW_BY_USB, BOOT_CMD_UPDATE_FW,</div><div class='add'>+*                           or BOOT_CMD_UPDATE_BOOT2.</div><div class='add'>+*  @return     0 or error code</div><div class='add'>+*/</div><div class='add'>+static int if_usb_prog_firmware(struct if_usb_card *cardp,</div><div class='add'>+				const char *fwname, int cmd)</div><div class='add'>+{</div><div class='add'>+	struct lbs_private *priv = cardp-&gt;priv;</div><div class='add'>+	unsigned long flags, caps;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	caps = priv-&gt;fwcapinfo;</div><div class='add'>+	if (((cmd == BOOT_CMD_UPDATE_FW) &amp;&amp; !(caps &amp; FW_CAPINFO_FIRMWARE_UPGRADE)) ||</div><div class='add'>+	    ((cmd == BOOT_CMD_UPDATE_BOOT2) &amp;&amp; !(caps &amp; FW_CAPINFO_BOOT2_UPGRADE)))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	/* Ensure main thread is idle. */</div><div class='add'>+	spin_lock_irqsave(&amp;priv-&gt;driver_lock, flags);</div><div class='add'>+	while (priv-&gt;cur_cmd != NULL || priv-&gt;dnld_sent != DNLD_RES_RECEIVED) {</div><div class='add'>+		spin_unlock_irqrestore(&amp;priv-&gt;driver_lock, flags);</div><div class='add'>+		if (wait_event_interruptible(priv-&gt;waitq,</div><div class='add'>+				(priv-&gt;cur_cmd == NULL &amp;&amp;</div><div class='add'>+				priv-&gt;dnld_sent == DNLD_RES_RECEIVED))) {</div><div class='add'>+			return -ERESTARTSYS;</div><div class='add'>+		}</div><div class='add'>+		spin_lock_irqsave(&amp;priv-&gt;driver_lock, flags);</div><div class='add'>+	}</div><div class='add'>+	priv-&gt;dnld_sent = DNLD_BOOTCMD_SENT;</div><div class='add'>+	spin_unlock_irqrestore(&amp;priv-&gt;driver_lock, flags);</div><div class='add'>+</div><div class='add'>+	ret = __if_usb_prog_firmware(cardp, fwname, cmd);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;priv-&gt;driver_lock, flags);</div><div class='add'>+	priv-&gt;dnld_sent = DNLD_RES_RECEIVED;</div><div class='add'>+	spin_unlock_irqrestore(&amp;priv-&gt;driver_lock, flags);</div><div class='add'>+</div><div class='add'>+	wake_up_interruptible(&amp;priv-&gt;waitq);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __if_usb_prog_firmware(struct if_usb_card *cardp,</div><div class='add'>+					const char *fwname, int cmd)</div><div class='ctx'> {</div><div class='ctx'> 	int i = 0;</div><div class='ctx'> 	static int reset_count = 10;</div><div class='hunk'>@@ -817,20 +933,32 @@ static int if_usb_prog_firmware(struct if_usb_card *cardp)</div><div class='ctx'> </div><div class='ctx'> 	lbs_deb_enter(LBS_DEB_USB);</div><div class='ctx'> </div><div class='del'>-	if ((ret = request_firmware(&amp;cardp-&gt;fw, lbs_fw_name,</div><div class='del'>-				    &amp;cardp-&gt;udev-&gt;dev)) &lt; 0) {</div><div class='add'>+	ret = request_firmware(&amp;cardp-&gt;fw, fwname, &amp;cardp-&gt;udev-&gt;dev);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='ctx'> 		lbs_pr_err("request_firmware() failed with %#x\n", ret);</div><div class='del'>-		lbs_pr_err("firmware %s not found\n", lbs_fw_name);</div><div class='add'>+		lbs_pr_err("firmware %s not found\n", fwname);</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (check_fwfile_format(cardp-&gt;fw-&gt;data, cardp-&gt;fw-&gt;size))</div><div class='add'>+	if (check_fwfile_format(cardp-&gt;fw-&gt;data, cardp-&gt;fw-&gt;size)) {</div><div class='add'>+		ret = -EINVAL;</div><div class='ctx'> 		goto release_fw;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Cancel any pending usb business */</div><div class='add'>+	usb_kill_urb(cardp-&gt;rx_urb);</div><div class='add'>+	usb_kill_urb(cardp-&gt;tx_urb);</div><div class='add'>+</div><div class='add'>+	cardp-&gt;fwlastblksent = 0;</div><div class='add'>+	cardp-&gt;fwdnldover = 0;</div><div class='add'>+	cardp-&gt;totalbytes = 0;</div><div class='add'>+	cardp-&gt;fwfinalblk = 0;</div><div class='add'>+	cardp-&gt;bootcmdresp = 0;</div><div class='ctx'> </div><div class='ctx'> restart:</div><div class='ctx'> 	if (if_usb_submit_rx_urb_fwload(cardp) &lt; 0) {</div><div class='ctx'> 		lbs_deb_usbd(&amp;cardp-&gt;udev-&gt;dev, "URB submission is failed\n");</div><div class='del'>-		ret = -1;</div><div class='add'>+		ret = -EIO;</div><div class='ctx'> 		goto release_fw;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -838,8 +966,7 @@ restart:</div><div class='ctx'> 	do {</div><div class='ctx'> 		int j = 0;</div><div class='ctx'> 		i++;</div><div class='del'>-		/* Issue Boot command = 1, Boot from Download-FW */</div><div class='del'>-		if_usb_issue_boot_command(cardp, BOOT_CMD_FW_BY_USB);</div><div class='add'>+		if_usb_issue_boot_command(cardp, cmd);</div><div class='ctx'> 		/* wait for command response */</div><div class='ctx'> 		do {</div><div class='ctx'> 			j++;</div><div class='hunk'>@@ -847,12 +974,21 @@ restart:</div><div class='ctx'> 		} while (cardp-&gt;bootcmdresp == 0 &amp;&amp; j &lt; 10);</div><div class='ctx'> 	} while (cardp-&gt;bootcmdresp == 0 &amp;&amp; i &lt; 5);</div><div class='ctx'> </div><div class='del'>-	if (cardp-&gt;bootcmdresp &lt;= 0) {</div><div class='add'>+	if (cardp-&gt;bootcmdresp == BOOT_CMD_RESP_NOT_SUPPORTED) {</div><div class='add'>+		/* Return to normal operation */</div><div class='add'>+		ret = -EOPNOTSUPP;</div><div class='add'>+		usb_kill_urb(cardp-&gt;rx_urb);</div><div class='add'>+		usb_kill_urb(cardp-&gt;tx_urb);</div><div class='add'>+		if (if_usb_submit_rx_urb(cardp) &lt; 0)</div><div class='add'>+			ret = -EIO;</div><div class='add'>+		goto release_fw;</div><div class='add'>+	} else if (cardp-&gt;bootcmdresp &lt;= 0) {</div><div class='ctx'> 		if (--reset_count &gt;= 0) {</div><div class='ctx'> 			if_usb_reset_device(cardp);</div><div class='ctx'> 			goto restart;</div><div class='ctx'> 		}</div><div class='del'>-		return -1;</div><div class='add'>+		ret = -EIO;</div><div class='add'>+		goto release_fw;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	i = 0;</div><div class='hunk'>@@ -882,7 +1018,7 @@ restart:</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		lbs_pr_info("FW download failure, time = %d ms\n", i * 100);</div><div class='del'>-		ret = -1;</div><div class='add'>+		ret = -EIO;</div><div class='ctx'> 		goto release_fw;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/libertas/if_usb.h b/drivers/net/wireless/libertas/if_usb.h<br/>index 5771a83a43f0..5ba0aee0eb2f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/libertas/if_usb.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/libertas/if_usb.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/libertas/if_usb.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/libertas/if_usb.h</a></div><div class='hunk'>@@ -30,6 +30,7 @@ struct bootcmd</div><div class='ctx'> </div><div class='ctx'> #define BOOT_CMD_RESP_OK		0x0001</div><div class='ctx'> #define BOOT_CMD_RESP_FAIL		0x0000</div><div class='add'>+#define BOOT_CMD_RESP_NOT_SUPPORTED	0x0002</div><div class='ctx'> </div><div class='ctx'> struct bootcmdresp</div><div class='ctx'> {</div><div class='hunk'>@@ -50,6 +51,10 @@ struct if_usb_card {</div><div class='ctx'> 	uint8_t ep_in;</div><div class='ctx'> 	uint8_t ep_out;</div><div class='ctx'> </div><div class='add'>+	/* bootcmdresp == 0 means command is pending</div><div class='add'>+	 * bootcmdresp &lt; 0 means error</div><div class='add'>+	 * bootcmdresp &gt; 0 is a BOOT_CMD_RESP_* from firmware</div><div class='add'>+	 */</div><div class='ctx'> 	int8_t bootcmdresp;</div><div class='ctx'> </div><div class='ctx'> 	int ep_in_size;</div><div class='head'>diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c<br/>index bd32ac0b4e07..73dc8c72402a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/libertas/main.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/libertas/main.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/libertas/main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/libertas/main.c</a></div><div class='hunk'>@@ -291,9 +291,11 @@ static ssize_t lbs_rtap_set(struct device *dev,</div><div class='ctx'> 			if (priv-&gt;infra_open || priv-&gt;mesh_open)</div><div class='ctx'> 				return -EBUSY;</div><div class='ctx'> 			if (priv-&gt;mode == IW_MODE_INFRA)</div><div class='del'>-				lbs_send_deauthentication(priv);</div><div class='add'>+				lbs_cmd_80211_deauthenticate(priv,</div><div class='add'>+							     priv-&gt;curbssparams.bssid,</div><div class='add'>+							     WLAN_REASON_DEAUTH_LEAVING);</div><div class='ctx'> 			else if (priv-&gt;mode == IW_MODE_ADHOC)</div><div class='del'>-				lbs_stop_adhoc_network(priv);</div><div class='add'>+				lbs_adhoc_stop(priv);</div><div class='ctx'> 			lbs_add_rtap(priv);</div><div class='ctx'> 		}</div><div class='ctx'> 		priv-&gt;monitormode = monitor_mode;</div><div class='hunk'>@@ -956,17 +958,24 @@ EXPORT_SYMBOL_GPL(lbs_resume);</div><div class='ctx'> static int lbs_setup_firmware(struct lbs_private *priv)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = -1;</div><div class='add'>+	s16 curlevel = 0, minlevel = 0, maxlevel = 0;</div><div class='ctx'> </div><div class='ctx'> 	lbs_deb_enter(LBS_DEB_FW);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Read MAC address from HW</div><div class='del'>-	 */</div><div class='add'>+	/* Read MAC address from firmware */</div><div class='ctx'> 	memset(priv-&gt;current_addr, 0xff, ETH_ALEN);</div><div class='ctx'> 	ret = lbs_update_hw_spec(priv);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto done;</div><div class='ctx'> </div><div class='add'>+	/* Read power levels if available */</div><div class='add'>+	ret = lbs_get_tx_power(priv, &amp;curlevel, &amp;minlevel, &amp;maxlevel);</div><div class='add'>+	if (ret == 0) {</div><div class='add'>+		priv-&gt;txpower_cur = curlevel;</div><div class='add'>+		priv-&gt;txpower_min = minlevel;</div><div class='add'>+		priv-&gt;txpower_max = maxlevel;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	lbs_set_mac_control(priv);</div><div class='ctx'> done:</div><div class='ctx'> 	lbs_deb_leave_args(LBS_DEB_FW, "ret %d", ret);</div><div class='hunk'>@@ -1042,7 +1051,7 @@ static int lbs_init_adapter(struct lbs_private *priv)</div><div class='ctx'> 	priv-&gt;mode = IW_MODE_INFRA;</div><div class='ctx'> 	priv-&gt;curbssparams.channel = DEFAULT_AD_HOC_CHANNEL;</div><div class='ctx'> 	priv-&gt;mac_control = CMD_ACT_MAC_RX_ON | CMD_ACT_MAC_TX_ON;</div><div class='del'>-	priv-&gt;radioon = RADIO_ON;</div><div class='add'>+	priv-&gt;radio_on = 1;</div><div class='ctx'> 	priv-&gt;enablehwauto = 1;</div><div class='ctx'> 	priv-&gt;capability = WLAN_CAPABILITY_SHORT_PREAMBLE;</div><div class='ctx'> 	priv-&gt;psmode = LBS802_11POWERMODECAM;</div><div class='hunk'>@@ -1196,7 +1205,13 @@ void lbs_remove_card(struct lbs_private *priv)</div><div class='ctx'> 	cancel_delayed_work_sync(&amp;priv-&gt;scan_work);</div><div class='ctx'> 	cancel_delayed_work_sync(&amp;priv-&gt;assoc_work);</div><div class='ctx'> 	cancel_work_sync(&amp;priv-&gt;mcast_work);</div><div class='add'>+</div><div class='add'>+	/* worker thread destruction blocks on the in-flight command which</div><div class='add'>+	 * should have been cleared already in lbs_stop_card().</div><div class='add'>+	 */</div><div class='add'>+	lbs_deb_main("destroying worker thread\n");</div><div class='ctx'> 	destroy_workqueue(priv-&gt;work_thread);</div><div class='add'>+	lbs_deb_main("done destroying worker thread\n");</div><div class='ctx'> </div><div class='ctx'> 	if (priv-&gt;psmode == LBS802_11POWERMODEMAX_PSP) {</div><div class='ctx'> 		priv-&gt;psmode = LBS802_11POWERMODECAM;</div><div class='hunk'>@@ -1314,14 +1329,26 @@ void lbs_stop_card(struct lbs_private *priv)</div><div class='ctx'> 		device_remove_file(&amp;dev-&gt;dev, &amp;dev_attr_lbs_rtap);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Flush pending command nodes */</div><div class='add'>+	/* Delete the timeout of the currently processing command */</div><div class='ctx'> 	del_timer_sync(&amp;priv-&gt;command_timer);</div><div class='add'>+</div><div class='add'>+	/* Flush pending command nodes */</div><div class='ctx'> 	spin_lock_irqsave(&amp;priv-&gt;driver_lock, flags);</div><div class='add'>+	lbs_deb_main("clearing pending commands\n");</div><div class='ctx'> 	list_for_each_entry(cmdnode, &amp;priv-&gt;cmdpendingq, list) {</div><div class='ctx'> 		cmdnode-&gt;result = -ENOENT;</div><div class='ctx'> 		cmdnode-&gt;cmdwaitqwoken = 1;</div><div class='ctx'> 		wake_up_interruptible(&amp;cmdnode-&gt;cmdwait_q);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	/* Flush the command the card is currently processing */</div><div class='add'>+	if (priv-&gt;cur_cmd) {</div><div class='add'>+		lbs_deb_main("clearing current command\n");</div><div class='add'>+		priv-&gt;cur_cmd-&gt;result = -ENOENT;</div><div class='add'>+		priv-&gt;cur_cmd-&gt;cmdwaitqwoken = 1;</div><div class='add'>+		wake_up_interruptible(&amp;priv-&gt;cur_cmd-&gt;cmdwait_q);</div><div class='add'>+	}</div><div class='add'>+	lbs_deb_main("done clearing commands\n");</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;priv-&gt;driver_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	unregister_netdev(dev);</div><div class='head'>diff --git a/drivers/net/wireless/libertas/scan.c b/drivers/net/wireless/libertas/scan.c<br/>index 4b274562f965..8f66903641b9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/libertas/scan.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/libertas/scan.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/libertas/scan.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/libertas/scan.c</a></div><div class='hunk'>@@ -944,6 +944,11 @@ int lbs_set_scan(struct net_device *dev, struct iw_request_info *info,</div><div class='ctx'> </div><div class='ctx'> 	lbs_deb_enter(LBS_DEB_WEXT);</div><div class='ctx'> </div><div class='add'>+	if (!priv-&gt;radio_on) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (!netif_running(dev)) {</div><div class='ctx'> 		ret = -ENETDOWN;</div><div class='ctx'> 		goto out;</div><div class='head'>diff --git a/drivers/net/wireless/libertas/wext.c b/drivers/net/wireless/libertas/wext.c<br/>index 8b3ed77860b3..82c3e5a50ea6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/libertas/wext.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/libertas/wext.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/libertas/wext.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/libertas/wext.c</a></div><div class='hunk'>@@ -30,6 +30,14 @@ static inline void lbs_postpone_association_work(struct lbs_private *priv)</div><div class='ctx'> 	queue_delayed_work(priv-&gt;work_thread, &amp;priv-&gt;assoc_work, HZ / 2);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void lbs_do_association_work(struct lbs_private *priv)</div><div class='add'>+{</div><div class='add'>+	if (priv-&gt;surpriseremoved)</div><div class='add'>+		return;</div><div class='add'>+	cancel_delayed_work(&amp;priv-&gt;assoc_work);</div><div class='add'>+	queue_delayed_work(priv-&gt;work_thread, &amp;priv-&gt;assoc_work, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void lbs_cancel_association_work(struct lbs_private *priv)</div><div class='ctx'> {</div><div class='ctx'> 	cancel_delayed_work(&amp;priv-&gt;assoc_work);</div><div class='hunk'>@@ -120,34 +128,6 @@ static struct chan_freq_power *find_cfp_by_band_and_freq(</div><div class='ctx'> 	return cfp;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *  @brief Set Radio On/OFF</div><div class='del'>- *</div><div class='del'>- *  @param priv                 A pointer to struct lbs_private structure</div><div class='del'>- *  @option 			Radio Option</div><div class='del'>- *  @return 	   		0 --success, otherwise fail</div><div class='del'>- */</div><div class='del'>-static int lbs_radio_ioctl(struct lbs_private *priv, u8 option)</div><div class='del'>-{</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	lbs_deb_enter(LBS_DEB_WEXT);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;radioon != option) {</div><div class='del'>-		lbs_deb_wext("switching radio %s\n", option ? "on" : "off");</div><div class='del'>-		priv-&gt;radioon = option;</div><div class='del'>-</div><div class='del'>-		ret = lbs_prepare_and_send_command(priv,</div><div class='del'>-					    CMD_802_11_RADIO_CONTROL,</div><div class='del'>-					    CMD_ACT_SET,</div><div class='del'>-					    CMD_OPTION_WAITFORRSP, 0, NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	lbs_deb_leave_args(LBS_DEB_WEXT, "ret %d", ret);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  *  @brief Copy active data rates based on adapter mode and status</div><div class='ctx'>  *</div><div class='hunk'>@@ -294,21 +274,17 @@ static int lbs_set_rts(struct net_device *dev, struct iw_request_info *info,</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	struct lbs_private *priv = dev-&gt;priv;</div><div class='del'>-	u32 rthr = vwrq-&gt;value;</div><div class='add'>+	u32 val = vwrq-&gt;value;</div><div class='ctx'> </div><div class='ctx'> 	lbs_deb_enter(LBS_DEB_WEXT);</div><div class='ctx'> </div><div class='del'>-	if (vwrq-&gt;disabled) {</div><div class='del'>-		priv-&gt;rtsthsd = rthr = MRVDRV_RTS_MAX_VALUE;</div><div class='del'>-	} else {</div><div class='del'>-		if (rthr &lt; MRVDRV_RTS_MIN_VALUE || rthr &gt; MRVDRV_RTS_MAX_VALUE)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		priv-&gt;rtsthsd = rthr;</div><div class='del'>-	}</div><div class='add'>+	if (vwrq-&gt;disabled)</div><div class='add'>+		val = MRVDRV_RTS_MAX_VALUE;</div><div class='add'>+</div><div class='add'>+	if (val &gt; MRVDRV_RTS_MAX_VALUE) /* min rts value is 0 */</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	ret = lbs_prepare_and_send_command(priv, CMD_802_11_SNMP_MIB,</div><div class='del'>-				    CMD_ACT_SET, CMD_OPTION_WAITFORRSP,</div><div class='del'>-				    OID_802_11_RTS_THRESHOLD, &amp;rthr);</div><div class='add'>+	ret = lbs_set_snmp_mib(priv, SNMP_MIB_OID_RTS_THRESHOLD, (u16) val);</div><div class='ctx'> </div><div class='ctx'> 	lbs_deb_leave_args(LBS_DEB_WEXT, "ret %d", ret);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -317,21 +293,18 @@ static int lbs_set_rts(struct net_device *dev, struct iw_request_info *info,</div><div class='ctx'> static int lbs_get_rts(struct net_device *dev, struct iw_request_info *info,</div><div class='ctx'> 			struct iw_param *vwrq, char *extra)</div><div class='ctx'> {</div><div class='del'>-	int ret = 0;</div><div class='ctx'> 	struct lbs_private *priv = dev-&gt;priv;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	u16 val = 0;</div><div class='ctx'> </div><div class='ctx'> 	lbs_deb_enter(LBS_DEB_WEXT);</div><div class='ctx'> </div><div class='del'>-	priv-&gt;rtsthsd = 0;</div><div class='del'>-	ret = lbs_prepare_and_send_command(priv, CMD_802_11_SNMP_MIB,</div><div class='del'>-				    CMD_ACT_GET, CMD_OPTION_WAITFORRSP,</div><div class='del'>-				    OID_802_11_RTS_THRESHOLD, NULL);</div><div class='add'>+	ret = lbs_get_snmp_mib(priv, SNMP_MIB_OID_RTS_THRESHOLD, &amp;val);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	vwrq-&gt;value = priv-&gt;rtsthsd;</div><div class='del'>-	vwrq-&gt;disabled = ((vwrq-&gt;value &lt; MRVDRV_RTS_MIN_VALUE)</div><div class='del'>-			  || (vwrq-&gt;value &gt; MRVDRV_RTS_MAX_VALUE));</div><div class='add'>+	vwrq-&gt;value = val;</div><div class='add'>+	vwrq-&gt;disabled = val &gt; MRVDRV_RTS_MAX_VALUE; /* min rts value is 0 */</div><div class='ctx'> 	vwrq-&gt;fixed = 1;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='hunk'>@@ -342,24 +315,19 @@ out:</div><div class='ctx'> static int lbs_set_frag(struct net_device *dev, struct iw_request_info *info,</div><div class='ctx'> 			 struct iw_param *vwrq, char *extra)</div><div class='ctx'> {</div><div class='del'>-	int ret = 0;</div><div class='del'>-	u32 fthr = vwrq-&gt;value;</div><div class='ctx'> 	struct lbs_private *priv = dev-&gt;priv;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	u32 val = vwrq-&gt;value;</div><div class='ctx'> </div><div class='ctx'> 	lbs_deb_enter(LBS_DEB_WEXT);</div><div class='ctx'> </div><div class='del'>-	if (vwrq-&gt;disabled) {</div><div class='del'>-		priv-&gt;fragthsd = fthr = MRVDRV_FRAG_MAX_VALUE;</div><div class='del'>-	} else {</div><div class='del'>-		if (fthr &lt; MRVDRV_FRAG_MIN_VALUE</div><div class='del'>-		    || fthr &gt; MRVDRV_FRAG_MAX_VALUE)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		priv-&gt;fragthsd = fthr;</div><div class='del'>-	}</div><div class='add'>+	if (vwrq-&gt;disabled)</div><div class='add'>+		val = MRVDRV_FRAG_MAX_VALUE;</div><div class='add'>+</div><div class='add'>+	if (val &lt; MRVDRV_FRAG_MIN_VALUE || val &gt; MRVDRV_FRAG_MAX_VALUE)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	ret = lbs_prepare_and_send_command(priv, CMD_802_11_SNMP_MIB,</div><div class='del'>-				    CMD_ACT_SET, CMD_OPTION_WAITFORRSP,</div><div class='del'>-				    OID_802_11_FRAGMENTATION_THRESHOLD, &amp;fthr);</div><div class='add'>+	ret = lbs_set_snmp_mib(priv, SNMP_MIB_OID_FRAG_THRESHOLD, (u16) val);</div><div class='ctx'> </div><div class='ctx'> 	lbs_deb_leave_args(LBS_DEB_WEXT, "ret %d", ret);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -368,22 +336,19 @@ static int lbs_set_frag(struct net_device *dev, struct iw_request_info *info,</div><div class='ctx'> static int lbs_get_frag(struct net_device *dev, struct iw_request_info *info,</div><div class='ctx'> 			 struct iw_param *vwrq, char *extra)</div><div class='ctx'> {</div><div class='del'>-	int ret = 0;</div><div class='ctx'> 	struct lbs_private *priv = dev-&gt;priv;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	u16 val = 0;</div><div class='ctx'> </div><div class='ctx'> 	lbs_deb_enter(LBS_DEB_WEXT);</div><div class='ctx'> </div><div class='del'>-	priv-&gt;fragthsd = 0;</div><div class='del'>-	ret = lbs_prepare_and_send_command(priv,</div><div class='del'>-				    CMD_802_11_SNMP_MIB,</div><div class='del'>-				    CMD_ACT_GET, CMD_OPTION_WAITFORRSP,</div><div class='del'>-				    OID_802_11_FRAGMENTATION_THRESHOLD, NULL);</div><div class='add'>+	ret = lbs_get_snmp_mib(priv, SNMP_MIB_OID_FRAG_THRESHOLD, &amp;val);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	vwrq-&gt;value = priv-&gt;fragthsd;</div><div class='del'>-	vwrq-&gt;disabled = ((vwrq-&gt;value &lt; MRVDRV_FRAG_MIN_VALUE)</div><div class='del'>-			  || (vwrq-&gt;value &gt; MRVDRV_FRAG_MAX_VALUE));</div><div class='add'>+	vwrq-&gt;value = val;</div><div class='add'>+	vwrq-&gt;disabled = ((val &lt; MRVDRV_FRAG_MIN_VALUE)</div><div class='add'>+			  || (val &gt; MRVDRV_FRAG_MAX_VALUE));</div><div class='ctx'> 	vwrq-&gt;fixed = 1;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='hunk'>@@ -410,7 +375,7 @@ static int mesh_wlan_get_mode(struct net_device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	lbs_deb_enter(LBS_DEB_WEXT);</div><div class='ctx'> </div><div class='del'>-	*uwrq = IW_MODE_REPEAT ;</div><div class='add'>+	*uwrq = IW_MODE_REPEAT;</div><div class='ctx'> </div><div class='ctx'> 	lbs_deb_leave(LBS_DEB_WEXT);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -420,28 +385,30 @@ static int lbs_get_txpow(struct net_device *dev,</div><div class='ctx'> 			  struct iw_request_info *info,</div><div class='ctx'> 			  struct iw_param *vwrq, char *extra)</div><div class='ctx'> {</div><div class='del'>-	int ret = 0;</div><div class='ctx'> 	struct lbs_private *priv = dev-&gt;priv;</div><div class='add'>+	s16 curlevel = 0;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	lbs_deb_enter(LBS_DEB_WEXT);</div><div class='ctx'> </div><div class='del'>-	ret = lbs_prepare_and_send_command(priv,</div><div class='del'>-				    CMD_802_11_RF_TX_POWER,</div><div class='del'>-				    CMD_ACT_TX_POWER_OPT_GET,</div><div class='del'>-				    CMD_OPTION_WAITFORRSP, 0, NULL);</div><div class='add'>+	if (!priv-&gt;radio_on) {</div><div class='add'>+		lbs_deb_wext("tx power off\n");</div><div class='add'>+		vwrq-&gt;value = 0;</div><div class='add'>+		vwrq-&gt;disabled = 1;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	ret = lbs_get_tx_power(priv, &amp;curlevel, NULL, NULL);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	lbs_deb_wext("tx power level %d dbm\n", priv-&gt;txpowerlevel);</div><div class='del'>-	vwrq-&gt;value = priv-&gt;txpowerlevel;</div><div class='add'>+	lbs_deb_wext("tx power level %d dbm\n", curlevel);</div><div class='add'>+	priv-&gt;txpower_cur = curlevel;</div><div class='add'>+</div><div class='add'>+	vwrq-&gt;value = curlevel;</div><div class='ctx'> 	vwrq-&gt;fixed = 1;</div><div class='del'>-	if (priv-&gt;radioon) {</div><div class='del'>-		vwrq-&gt;disabled = 0;</div><div class='del'>-		vwrq-&gt;flags = IW_TXPOW_DBM;</div><div class='del'>-	} else {</div><div class='del'>-		vwrq-&gt;disabled = 1;</div><div class='del'>-	}</div><div class='add'>+	vwrq-&gt;disabled = 0;</div><div class='add'>+	vwrq-&gt;flags = IW_TXPOW_DBM;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	lbs_deb_leave_args(LBS_DEB_WEXT, "ret %d", ret);</div><div class='hunk'>@@ -451,31 +418,44 @@ out:</div><div class='ctx'> static int lbs_set_retry(struct net_device *dev, struct iw_request_info *info,</div><div class='ctx'> 			  struct iw_param *vwrq, char *extra)</div><div class='ctx'> {</div><div class='del'>-	int ret = 0;</div><div class='ctx'> 	struct lbs_private *priv = dev-&gt;priv;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	u16 slimit = 0, llimit = 0;</div><div class='ctx'> </div><div class='ctx'> 	lbs_deb_enter(LBS_DEB_WEXT);</div><div class='ctx'> </div><div class='del'>-	if (vwrq-&gt;flags == IW_RETRY_LIMIT) {</div><div class='del'>-		/* The MAC has a 4-bit Total_Tx_Count register</div><div class='del'>-		   Total_Tx_Count = 1 + Tx_Retry_Count */</div><div class='add'>+        if ((vwrq-&gt;flags &amp; IW_RETRY_TYPE) != IW_RETRY_LIMIT)</div><div class='add'>+                return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	/* The MAC has a 4-bit Total_Tx_Count register</div><div class='add'>+	   Total_Tx_Count = 1 + Tx_Retry_Count */</div><div class='ctx'> #define TX_RETRY_MIN 0</div><div class='ctx'> #define TX_RETRY_MAX 14</div><div class='del'>-		if (vwrq-&gt;value &lt; TX_RETRY_MIN || vwrq-&gt;value &gt; TX_RETRY_MAX)</div><div class='del'>-			return -EINVAL;</div><div class='add'>+	if (vwrq-&gt;value &lt; TX_RETRY_MIN || vwrq-&gt;value &gt; TX_RETRY_MAX)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-		/* Adding 1 to convert retry count to try count */</div><div class='del'>-		priv-&gt;txretrycount = vwrq-&gt;value + 1;</div><div class='add'>+	/* Add 1 to convert retry count to try count */</div><div class='add'>+	if (vwrq-&gt;flags &amp; IW_RETRY_SHORT)</div><div class='add'>+		slimit = (u16) (vwrq-&gt;value + 1);</div><div class='add'>+	else if (vwrq-&gt;flags &amp; IW_RETRY_LONG)</div><div class='add'>+		llimit = (u16) (vwrq-&gt;value + 1);</div><div class='add'>+	else</div><div class='add'>+		slimit = llimit = (u16) (vwrq-&gt;value + 1); /* set both */</div><div class='ctx'> </div><div class='del'>-		ret = lbs_prepare_and_send_command(priv, CMD_802_11_SNMP_MIB,</div><div class='del'>-					    CMD_ACT_SET,</div><div class='del'>-					    CMD_OPTION_WAITFORRSP,</div><div class='del'>-					    OID_802_11_TX_RETRYCOUNT, NULL);</div><div class='add'>+	if (llimit) {</div><div class='add'>+		ret = lbs_set_snmp_mib(priv, SNMP_MIB_OID_LONG_RETRY_LIMIT,</div><div class='add'>+				       llimit);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	if (slimit) {</div><div class='add'>+		/* txretrycount follows the short retry limit */</div><div class='add'>+		priv-&gt;txretrycount = slimit;</div><div class='add'>+		ret = lbs_set_snmp_mib(priv, SNMP_MIB_OID_SHORT_RETRY_LIMIT,</div><div class='add'>+				       slimit);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto out;</div><div class='del'>-	} else {</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='hunk'>@@ -488,22 +468,30 @@ static int lbs_get_retry(struct net_device *dev, struct iw_request_info *info,</div><div class='ctx'> {</div><div class='ctx'> 	struct lbs_private *priv = dev-&gt;priv;</div><div class='ctx'> 	int ret = 0;</div><div class='add'>+	u16 val = 0;</div><div class='ctx'> </div><div class='ctx'> 	lbs_deb_enter(LBS_DEB_WEXT);</div><div class='ctx'> </div><div class='del'>-	priv-&gt;txretrycount = 0;</div><div class='del'>-	ret = lbs_prepare_and_send_command(priv,</div><div class='del'>-				    CMD_802_11_SNMP_MIB,</div><div class='del'>-				    CMD_ACT_GET, CMD_OPTION_WAITFORRSP,</div><div class='del'>-				    OID_802_11_TX_RETRYCOUNT, NULL);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='ctx'> 	vwrq-&gt;disabled = 0;</div><div class='del'>-	if (!vwrq-&gt;flags) {</div><div class='del'>-		vwrq-&gt;flags = IW_RETRY_LIMIT;</div><div class='add'>+</div><div class='add'>+	if (vwrq-&gt;flags &amp; IW_RETRY_LONG) {</div><div class='add'>+		ret = lbs_get_snmp_mib(priv, SNMP_MIB_OID_LONG_RETRY_LIMIT, &amp;val);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		/* Subtract 1 to convert try count to retry count */</div><div class='add'>+		vwrq-&gt;value = val - 1;</div><div class='add'>+		vwrq-&gt;flags = IW_RETRY_LIMIT | IW_RETRY_LONG;</div><div class='add'>+	} else {</div><div class='add'>+		ret = lbs_get_snmp_mib(priv, SNMP_MIB_OID_SHORT_RETRY_LIMIT, &amp;val);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		/* txretry count follows the short retry limit */</div><div class='add'>+		priv-&gt;txretrycount = val;</div><div class='ctx'> 		/* Subtract 1 to convert try count to retry count */</div><div class='del'>-		vwrq-&gt;value = priv-&gt;txretrycount - 1;</div><div class='add'>+		vwrq-&gt;value = val - 1;</div><div class='add'>+		vwrq-&gt;flags = IW_RETRY_LIMIT | IW_RETRY_SHORT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='hunk'>@@ -693,22 +681,12 @@ static int lbs_get_range(struct net_device *dev, struct iw_request_info *info,</div><div class='ctx'> </div><div class='ctx'> 	range-&gt;sensitivity = 0;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Setup the supported power level ranges</div><div class='del'>-	 */</div><div class='add'>+	/* Setup the supported power level ranges */</div><div class='ctx'> 	memset(range-&gt;txpower, 0, sizeof(range-&gt;txpower));</div><div class='del'>-	range-&gt;txpower[0] = 5;</div><div class='del'>-	range-&gt;txpower[1] = 7;</div><div class='del'>-	range-&gt;txpower[2] = 9;</div><div class='del'>-	range-&gt;txpower[3] = 11;</div><div class='del'>-	range-&gt;txpower[4] = 13;</div><div class='del'>-	range-&gt;txpower[5] = 15;</div><div class='del'>-	range-&gt;txpower[6] = 17;</div><div class='del'>-	range-&gt;txpower[7] = 19;</div><div class='del'>-</div><div class='del'>-	range-&gt;num_txpower = 8;</div><div class='del'>-	range-&gt;txpower_capa = IW_TXPOW_DBM;</div><div class='del'>-	range-&gt;txpower_capa |= IW_TXPOW_RANGE;</div><div class='add'>+	range-&gt;txpower_capa = IW_TXPOW_DBM | IW_TXPOW_RANGE;</div><div class='add'>+	range-&gt;txpower[0] = priv-&gt;txpower_min;</div><div class='add'>+	range-&gt;txpower[1] = priv-&gt;txpower_max;</div><div class='add'>+	range-&gt;num_txpower = 2;</div><div class='ctx'> </div><div class='ctx'> 	range-&gt;event_capa[0] = (IW_EVENT_CAPA_K_0 |</div><div class='ctx'> 				IW_EVENT_CAPA_MASK(SIOCGIWAP) |</div><div class='hunk'>@@ -998,9 +976,11 @@ static int lbs_mesh_set_freq(struct net_device *dev,</div><div class='ctx'> 	if (fwrq-&gt;m != priv-&gt;curbssparams.channel) {</div><div class='ctx'> 		lbs_deb_wext("mesh channel change forces eth disconnect\n");</div><div class='ctx'> 		if (priv-&gt;mode == IW_MODE_INFRA)</div><div class='del'>-			lbs_send_deauthentication(priv);</div><div class='add'>+			lbs_cmd_80211_deauthenticate(priv,</div><div class='add'>+						     priv-&gt;curbssparams.bssid,</div><div class='add'>+						     WLAN_REASON_DEAUTH_LEAVING);</div><div class='ctx'> 		else if (priv-&gt;mode == IW_MODE_ADHOC)</div><div class='del'>-			lbs_stop_adhoc_network(priv);</div><div class='add'>+			lbs_adhoc_stop(priv);</div><div class='ctx'> 	}</div><div class='ctx'> 	lbs_mesh_config(priv, CMD_ACT_MESH_CONFIG_START, fwrq-&gt;m);</div><div class='ctx'> 	lbs_update_channel(priv);</div><div class='hunk'>@@ -1045,6 +1025,18 @@ static int lbs_set_rate(struct net_device *dev, struct iw_request_info *info,</div><div class='ctx'> 				new_rate);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='add'>+		if (priv-&gt;fwrelease &lt; 0x09000000) {</div><div class='add'>+			ret = lbs_set_power_adapt_cfg(priv, 0,</div><div class='add'>+					POW_ADAPT_DEFAULT_P0,</div><div class='add'>+					POW_ADAPT_DEFAULT_P1,</div><div class='add'>+					POW_ADAPT_DEFAULT_P2);</div><div class='add'>+			if (ret)</div><div class='add'>+				goto out;</div><div class='add'>+		}</div><div class='add'>+		ret = lbs_set_tpc_cfg(priv, 0, TPC_DEFAULT_P0, TPC_DEFAULT_P1,</div><div class='add'>+				TPC_DEFAULT_P2, 1);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Try the newer command first (Firmware Spec 5.1 and above) */</div><div class='hunk'>@@ -1612,12 +1604,26 @@ static int lbs_set_encodeext(struct net_device *dev,</div><div class='ctx'> 			set_bit(ASSOC_FLAG_SECINFO, &amp;assoc_req-&gt;flags);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		disable_wep (assoc_req);</div><div class='add'>+		/* Only disable wep if necessary: can't waste time here. */</div><div class='add'>+		if (priv-&gt;mac_control &amp; CMD_ACT_MAC_WEP_ENABLE)</div><div class='add'>+			disable_wep(assoc_req);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	if (ret == 0) {</div><div class='del'>-		lbs_postpone_association_work(priv);</div><div class='add'>+		/* 802.1x and WPA rekeying must happen as quickly as possible,</div><div class='add'>+		 * especially during the 4-way handshake; thus if in</div><div class='add'>+		 * infrastructure mode, and either (a) 802.1x is enabled or</div><div class='add'>+		 * (b) WPA is being used, set the key right away.</div><div class='add'>+		 */</div><div class='add'>+		if (assoc_req-&gt;mode == IW_MODE_INFRA &amp;&amp;</div><div class='add'>+		    ((assoc_req-&gt;secinfo.key_mgmt &amp; IW_AUTH_KEY_MGMT_802_1X) ||</div><div class='add'>+		     (assoc_req-&gt;secinfo.key_mgmt &amp; IW_AUTH_KEY_MGMT_PSK) ||</div><div class='add'>+		      assoc_req-&gt;secinfo.WPAenabled ||</div><div class='add'>+		      assoc_req-&gt;secinfo.WPA2enabled)) {</div><div class='add'>+			lbs_do_association_work(priv);</div><div class='add'>+		} else</div><div class='add'>+			lbs_postpone_association_work(priv);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		lbs_cancel_association_work(priv);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1725,13 +1731,17 @@ static int lbs_set_auth(struct net_device *dev,</div><div class='ctx'> 	case IW_AUTH_TKIP_COUNTERMEASURES:</div><div class='ctx'> 	case IW_AUTH_CIPHER_PAIRWISE:</div><div class='ctx'> 	case IW_AUTH_CIPHER_GROUP:</div><div class='del'>-	case IW_AUTH_KEY_MGMT:</div><div class='ctx'> 	case IW_AUTH_DROP_UNENCRYPTED:</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * libertas does not use these parameters</div><div class='ctx'> 		 */</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='add'>+	case IW_AUTH_KEY_MGMT:</div><div class='add'>+		assoc_req-&gt;secinfo.key_mgmt = dwrq-&gt;value;</div><div class='add'>+		updated = 1;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='ctx'> 	case IW_AUTH_WPA_VERSION:</div><div class='ctx'> 		if (dwrq-&gt;value &amp; IW_AUTH_WPA_VERSION_DISABLED) {</div><div class='ctx'> 			assoc_req-&gt;secinfo.WPAenabled = 0;</div><div class='hunk'>@@ -1811,6 +1821,10 @@ static int lbs_get_auth(struct net_device *dev,</div><div class='ctx'> 	lbs_deb_enter(LBS_DEB_WEXT);</div><div class='ctx'> </div><div class='ctx'> 	switch (dwrq-&gt;flags &amp; IW_AUTH_INDEX) {</div><div class='add'>+	case IW_AUTH_KEY_MGMT:</div><div class='add'>+		dwrq-&gt;value = priv-&gt;secinfo.key_mgmt;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='ctx'> 	case IW_AUTH_WPA_VERSION:</div><div class='ctx'> 		dwrq-&gt;value = 0;</div><div class='ctx'> 		if (priv-&gt;secinfo.WPAenabled)</div><div class='hunk'>@@ -1844,39 +1858,77 @@ static int lbs_set_txpow(struct net_device *dev, struct iw_request_info *info,</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	struct lbs_private *priv = dev-&gt;priv;</div><div class='del'>-</div><div class='del'>-	u16 dbm;</div><div class='add'>+	s16 dbm = (s16) vwrq-&gt;value;</div><div class='ctx'> </div><div class='ctx'> 	lbs_deb_enter(LBS_DEB_WEXT);</div><div class='ctx'> </div><div class='ctx'> 	if (vwrq-&gt;disabled) {</div><div class='del'>-		lbs_radio_ioctl(priv, RADIO_OFF);</div><div class='del'>-		return 0;</div><div class='add'>+		lbs_set_radio(priv, RADIO_PREAMBLE_AUTO, 0);</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	priv-&gt;preamble = CMD_TYPE_AUTO_PREAMBLE;</div><div class='del'>-</div><div class='del'>-	lbs_radio_ioctl(priv, RADIO_ON);</div><div class='add'>+	if (vwrq-&gt;fixed == 0) {</div><div class='add'>+		/* User requests automatic tx power control, however there are</div><div class='add'>+		 * many auto tx settings.  For now use firmware defaults until</div><div class='add'>+		 * we come up with a good way to expose these to the user. */</div><div class='add'>+		if (priv-&gt;fwrelease &lt; 0x09000000) {</div><div class='add'>+			ret = lbs_set_power_adapt_cfg(priv, 1,</div><div class='add'>+					POW_ADAPT_DEFAULT_P0,</div><div class='add'>+					POW_ADAPT_DEFAULT_P1,</div><div class='add'>+					POW_ADAPT_DEFAULT_P2);</div><div class='add'>+			if (ret)</div><div class='add'>+				goto out;</div><div class='add'>+		}</div><div class='add'>+		ret = lbs_set_tpc_cfg(priv, 0, TPC_DEFAULT_P0, TPC_DEFAULT_P1,</div><div class='add'>+				TPC_DEFAULT_P2, 1);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out;</div><div class='add'>+		dbm = priv-&gt;txpower_max;</div><div class='add'>+	} else {</div><div class='add'>+		/* Userspace check in iwrange if it should use dBm or mW,</div><div class='add'>+		 * therefore this should never happen... Jean II */</div><div class='add'>+		if ((vwrq-&gt;flags &amp; IW_TXPOW_TYPE) != IW_TXPOW_DBM) {</div><div class='add'>+			ret = -EOPNOTSUPP;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	/* Userspace check in iwrange if it should use dBm or mW,</div><div class='del'>-	 * therefore this should never happen... Jean II */</div><div class='del'>-	if ((vwrq-&gt;flags &amp; IW_TXPOW_TYPE) == IW_TXPOW_MWATT) {</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-	} else</div><div class='del'>-		dbm = (u16) vwrq-&gt;value;</div><div class='add'>+		/* Validate requested power level against firmware allowed</div><div class='add'>+		 * levels */</div><div class='add'>+		if (priv-&gt;txpower_min &amp;&amp; (dbm &lt; priv-&gt;txpower_min)) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	/* auto tx power control */</div><div class='add'>+		if (priv-&gt;txpower_max &amp;&amp; (dbm &gt; priv-&gt;txpower_max)) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		if (priv-&gt;fwrelease &lt; 0x09000000) {</div><div class='add'>+			ret = lbs_set_power_adapt_cfg(priv, 0,</div><div class='add'>+					POW_ADAPT_DEFAULT_P0,</div><div class='add'>+					POW_ADAPT_DEFAULT_P1,</div><div class='add'>+					POW_ADAPT_DEFAULT_P2);</div><div class='add'>+			if (ret)</div><div class='add'>+				goto out;</div><div class='add'>+		}</div><div class='add'>+		ret = lbs_set_tpc_cfg(priv, 0, TPC_DEFAULT_P0, TPC_DEFAULT_P1,</div><div class='add'>+				TPC_DEFAULT_P2, 1);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (vwrq-&gt;fixed == 0)</div><div class='del'>-		dbm = 0xffff;</div><div class='add'>+	/* If the radio was off, turn it on */</div><div class='add'>+	if (!priv-&gt;radio_on) {</div><div class='add'>+		ret = lbs_set_radio(priv, RADIO_PREAMBLE_AUTO, 1);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	lbs_deb_wext("txpower set %d dbm\n", dbm);</div><div class='add'>+	lbs_deb_wext("txpower set %d dBm\n", dbm);</div><div class='ctx'> </div><div class='del'>-	ret = lbs_prepare_and_send_command(priv,</div><div class='del'>-				    CMD_802_11_RF_TX_POWER,</div><div class='del'>-				    CMD_ACT_TX_POWER_OPT_SET_LOW,</div><div class='del'>-				    CMD_OPTION_WAITFORRSP, 0, (void *)&amp;dbm);</div><div class='add'>+	ret = lbs_set_tx_power(priv, dbm);</div><div class='ctx'> </div><div class='add'>+out:</div><div class='ctx'> 	lbs_deb_leave_args(LBS_DEB_WEXT, "ret %d", ret);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -1928,6 +1980,11 @@ static int lbs_set_essid(struct net_device *dev, struct iw_request_info *info,</div><div class='ctx'> </div><div class='ctx'> 	lbs_deb_enter(LBS_DEB_WEXT);</div><div class='ctx'> </div><div class='add'>+	if (!priv-&gt;radio_on) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Check the size of the string */</div><div class='ctx'> 	if (in_ssid_len &gt; IW_ESSID_MAX_SIZE) {</div><div class='ctx'> 		ret = -E2BIG;</div><div class='hunk'>@@ -2005,6 +2062,11 @@ static int lbs_mesh_set_essid(struct net_device *dev,</div><div class='ctx'> </div><div class='ctx'> 	lbs_deb_enter(LBS_DEB_WEXT);</div><div class='ctx'> </div><div class='add'>+	if (!priv-&gt;radio_on) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Check the size of the string */</div><div class='ctx'> 	if (dwrq-&gt;length &gt; IW_ESSID_MAX_SIZE) {</div><div class='ctx'> 		ret = -E2BIG;</div><div class='hunk'>@@ -2046,6 +2108,9 @@ static int lbs_set_wap(struct net_device *dev, struct iw_request_info *info,</div><div class='ctx'> </div><div class='ctx'> 	lbs_deb_enter(LBS_DEB_WEXT);</div><div class='ctx'> </div><div class='add'>+	if (!priv-&gt;radio_on)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	if (awrq-&gt;sa_family != ARPHRD_ETHER)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/libertas_tf/Makefile b/drivers/net/wireless/libertas_tf/Makefile<br/>new file mode 100644<br/>index 000000000000..ff5544d6ac9d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/libertas_tf/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/libertas_tf/Makefile</a></div><div class='hunk'>@@ -0,0 +1,6 @@</div><div class='add'>+libertas_tf-objs := main.o cmd.o</div><div class='add'>+</div><div class='add'>+libertas_tf_usb-objs += if_usb.o</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_LIBERTAS_THINFIRM) += libertas_tf.o</div><div class='add'>+obj-$(CONFIG_LIBERTAS_THINFIRM_USB) += libertas_tf_usb.o</div><div class='head'>diff --git a/drivers/net/wireless/libertas_tf/cmd.c b/drivers/net/wireless/libertas_tf/cmd.c<br/>new file mode 100644<br/>index 000000000000..fdbcf8ba3e8a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/libertas_tf/cmd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/libertas_tf/cmd.c</a></div><div class='hunk'>@@ -0,0 +1,669 @@</div><div class='add'>+/*</div><div class='add'>+ *  Copyright (C) 2008, cozybit Inc.</div><div class='add'>+ *  Copyright (C) 2003-2006, Marvell International Ltd.</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License, or (at</div><div class='add'>+ *  your option) any later version.</div><div class='add'>+ */</div><div class='add'>+#include "libertas_tf.h"</div><div class='add'>+</div><div class='add'>+static const struct channel_range channel_ranges[] = {</div><div class='add'>+	{ LBTF_REGDOMAIN_US,		1, 12 },</div><div class='add'>+	{ LBTF_REGDOMAIN_CA,		1, 12 },</div><div class='add'>+	{ LBTF_REGDOMAIN_EU,		1, 14 },</div><div class='add'>+	{ LBTF_REGDOMAIN_JP,		1, 14 },</div><div class='add'>+	{ LBTF_REGDOMAIN_SP,		1, 14 },</div><div class='add'>+	{ LBTF_REGDOMAIN_FR,		1, 14 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u16 lbtf_region_code_to_index[MRVDRV_MAX_REGION_CODE] =</div><div class='add'>+{</div><div class='add'>+	LBTF_REGDOMAIN_US, LBTF_REGDOMAIN_CA, LBTF_REGDOMAIN_EU,</div><div class='add'>+	LBTF_REGDOMAIN_SP, LBTF_REGDOMAIN_FR, LBTF_REGDOMAIN_JP,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct cmd_ctrl_node *lbtf_get_cmd_ctrl_node(struct lbtf_private *priv);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *  lbtf_cmd_copyback - Simple callback that copies response back into command</div><div class='add'>+ *</div><div class='add'>+ *  @priv	A pointer to struct lbtf_private structure</div><div class='add'>+ *  @extra	A pointer to the original command structure for which</div><div class='add'>+ *		'resp' is a response</div><div class='add'>+ *  @resp	A pointer to the command response</div><div class='add'>+ *</div><div class='add'>+ *  Returns: 0 on success, error on failure</div><div class='add'>+ */</div><div class='add'>+int lbtf_cmd_copyback(struct lbtf_private *priv, unsigned long extra,</div><div class='add'>+		     struct cmd_header *resp)</div><div class='add'>+{</div><div class='add'>+	struct cmd_header *buf = (void *)extra;</div><div class='add'>+	uint16_t copy_len;</div><div class='add'>+</div><div class='add'>+	copy_len = min(le16_to_cpu(buf-&gt;size), le16_to_cpu(resp-&gt;size));</div><div class='add'>+	memcpy(buf, resp, copy_len);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(lbtf_cmd_copyback);</div><div class='add'>+</div><div class='add'>+#define CHAN_TO_IDX(chan) ((chan) - 1)</div><div class='add'>+</div><div class='add'>+static void lbtf_geo_init(struct lbtf_private *priv)</div><div class='add'>+{</div><div class='add'>+	const struct channel_range *range = channel_ranges;</div><div class='add'>+	u8 ch;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(channel_ranges); i++)</div><div class='add'>+		if (channel_ranges[i].regdomain == priv-&gt;regioncode) {</div><div class='add'>+			range = &amp;channel_ranges[i];</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	for (ch = priv-&gt;range.start; ch &lt; priv-&gt;range.end; ch++)</div><div class='add'>+		priv-&gt;channels[CHAN_TO_IDX(ch)].flags = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *  lbtf_update_hw_spec: Updates the hardware details.</div><div class='add'>+ *</div><div class='add'>+ *  @priv    	A pointer to struct lbtf_private structure</div><div class='add'>+ *</div><div class='add'>+ *  Returns: 0 on success, error on failure</div><div class='add'>+ */</div><div class='add'>+int lbtf_update_hw_spec(struct lbtf_private *priv)</div><div class='add'>+{</div><div class='add'>+	struct cmd_ds_get_hw_spec cmd;</div><div class='add'>+	int ret = -1;</div><div class='add'>+	u32 i;</div><div class='add'>+	DECLARE_MAC_BUF(mac);</div><div class='add'>+</div><div class='add'>+	memset(&amp;cmd, 0, sizeof(cmd));</div><div class='add'>+	cmd.hdr.size = cpu_to_le16(sizeof(cmd));</div><div class='add'>+	memcpy(cmd.permanentaddr, priv-&gt;current_addr, ETH_ALEN);</div><div class='add'>+	ret = lbtf_cmd_with_response(priv, CMD_GET_HW_SPEC, &amp;cmd);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	priv-&gt;fwcapinfo = le32_to_cpu(cmd.fwcapinfo);</div><div class='add'>+</div><div class='add'>+	/* The firmware release is in an interesting format: the patch</div><div class='add'>+	 * level is in the most significant nibble ... so fix that: */</div><div class='add'>+	priv-&gt;fwrelease = le32_to_cpu(cmd.fwrelease);</div><div class='add'>+	priv-&gt;fwrelease = (priv-&gt;fwrelease &lt;&lt; 8) |</div><div class='add'>+		(priv-&gt;fwrelease &gt;&gt; 24 &amp; 0xff);</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "libertastf: %s, fw %u.%u.%up%u, cap 0x%08x\n",</div><div class='add'>+		print_mac(mac, cmd.permanentaddr),</div><div class='add'>+		priv-&gt;fwrelease &gt;&gt; 24 &amp; 0xff,</div><div class='add'>+		priv-&gt;fwrelease &gt;&gt; 16 &amp; 0xff,</div><div class='add'>+		priv-&gt;fwrelease &gt;&gt;  8 &amp; 0xff,</div><div class='add'>+		priv-&gt;fwrelease       &amp; 0xff,</div><div class='add'>+		priv-&gt;fwcapinfo);</div><div class='add'>+</div><div class='add'>+	/* Clamp region code to 8-bit since FW spec indicates that it should</div><div class='add'>+	 * only ever be 8-bit, even though the field size is 16-bit.  Some</div><div class='add'>+	 * firmware returns non-zero high 8 bits here.</div><div class='add'>+	 */</div><div class='add'>+	priv-&gt;regioncode = le16_to_cpu(cmd.regioncode) &amp; 0xFF;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MRVDRV_MAX_REGION_CODE; i++) {</div><div class='add'>+		/* use the region code to search for the index */</div><div class='add'>+		if (priv-&gt;regioncode == lbtf_region_code_to_index[i])</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* if it's unidentified region code, use the default (USA) */</div><div class='add'>+	if (i &gt;= MRVDRV_MAX_REGION_CODE)</div><div class='add'>+		priv-&gt;regioncode = 0x10;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;current_addr[0] == 0xff)</div><div class='add'>+		memmove(priv-&gt;current_addr, cmd.permanentaddr, ETH_ALEN);</div><div class='add'>+</div><div class='add'>+	SET_IEEE80211_PERM_ADDR(priv-&gt;hw, priv-&gt;current_addr);</div><div class='add'>+</div><div class='add'>+	lbtf_geo_init(priv);</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *  lbtf_set_channel: Set the radio channel</div><div class='add'>+ *</div><div class='add'>+ *  @priv	A pointer to struct lbtf_private structure</div><div class='add'>+ *  @channel	The desired channel, or 0 to clear a locked channel</div><div class='add'>+ *</div><div class='add'>+ *  Returns: 0 on success, error on failure</div><div class='add'>+ */</div><div class='add'>+int lbtf_set_channel(struct lbtf_private *priv, u8 channel)</div><div class='add'>+{</div><div class='add'>+	struct cmd_ds_802_11_rf_channel cmd;</div><div class='add'>+</div><div class='add'>+	cmd.hdr.size = cpu_to_le16(sizeof(cmd));</div><div class='add'>+	cmd.action = cpu_to_le16(CMD_OPT_802_11_RF_CHANNEL_SET);</div><div class='add'>+	cmd.channel = cpu_to_le16(channel);</div><div class='add'>+</div><div class='add'>+	return lbtf_cmd_with_response(priv, CMD_802_11_RF_CHANNEL, &amp;cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int lbtf_beacon_set(struct lbtf_private *priv, struct sk_buff *beacon)</div><div class='add'>+{</div><div class='add'>+	struct cmd_ds_802_11_beacon_set cmd;</div><div class='add'>+	int size;</div><div class='add'>+</div><div class='add'>+	if (beacon-&gt;len &gt; MRVL_MAX_BCN_SIZE)</div><div class='add'>+		return -1;</div><div class='add'>+	size =  sizeof(cmd) - sizeof(cmd.beacon) + beacon-&gt;len;</div><div class='add'>+	cmd.hdr.size = cpu_to_le16(size);</div><div class='add'>+	cmd.len = cpu_to_le16(beacon-&gt;len);</div><div class='add'>+	memcpy(cmd.beacon, (u8 *) beacon-&gt;data, beacon-&gt;len);</div><div class='add'>+</div><div class='add'>+	lbtf_cmd_async(priv, CMD_802_11_BEACON_SET, &amp;cmd.hdr, size);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int lbtf_beacon_ctrl(struct lbtf_private *priv, bool beacon_enable,</div><div class='add'>+		     int beacon_int) {</div><div class='add'>+	struct cmd_ds_802_11_beacon_control cmd;</div><div class='add'>+</div><div class='add'>+	cmd.hdr.size = cpu_to_le16(sizeof(cmd));</div><div class='add'>+	cmd.action = cpu_to_le16(CMD_ACT_SET);</div><div class='add'>+	cmd.beacon_enable = cpu_to_le16(beacon_enable);</div><div class='add'>+	cmd.beacon_period = cpu_to_le16(beacon_int);</div><div class='add'>+</div><div class='add'>+	lbtf_cmd_async(priv, CMD_802_11_BEACON_CTRL, &amp;cmd.hdr, sizeof(cmd));</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void lbtf_queue_cmd(struct lbtf_private *priv,</div><div class='add'>+			  struct cmd_ctrl_node *cmdnode)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	if (!cmdnode)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!cmdnode-&gt;cmdbuf-&gt;size)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	cmdnode-&gt;result = 0;</div><div class='add'>+	spin_lock_irqsave(&amp;priv-&gt;driver_lock, flags);</div><div class='add'>+	list_add_tail(&amp;cmdnode-&gt;list, &amp;priv-&gt;cmdpendingq);</div><div class='add'>+	spin_unlock_irqrestore(&amp;priv-&gt;driver_lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void lbtf_submit_command(struct lbtf_private *priv,</div><div class='add'>+			       struct cmd_ctrl_node *cmdnode)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	struct cmd_header *cmd;</div><div class='add'>+	uint16_t cmdsize;</div><div class='add'>+	uint16_t command;</div><div class='add'>+	int timeo = 5 * HZ;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	cmd = cmdnode-&gt;cmdbuf;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;priv-&gt;driver_lock, flags);</div><div class='add'>+	priv-&gt;cur_cmd = cmdnode;</div><div class='add'>+	cmdsize = le16_to_cpu(cmd-&gt;size);</div><div class='add'>+	command = le16_to_cpu(cmd-&gt;command);</div><div class='add'>+	ret = priv-&gt;hw_host_to_card(priv, MVMS_CMD, (u8 *) cmd, cmdsize);</div><div class='add'>+	spin_unlock_irqrestore(&amp;priv-&gt;driver_lock, flags);</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		/* Let the timer kick in and retry, and potentially reset</div><div class='add'>+		   the whole thing if the condition persists */</div><div class='add'>+		timeo = HZ;</div><div class='add'>+</div><div class='add'>+	/* Setup the timer after transmit command */</div><div class='add'>+	mod_timer(&amp;priv-&gt;command_timer, jiffies + timeo);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *  This function inserts command node to cmdfreeq</div><div class='add'>+ *  after cleans it. Requires priv-&gt;driver_lock held.</div><div class='add'>+ */</div><div class='add'>+static void __lbtf_cleanup_and_insert_cmd(struct lbtf_private *priv,</div><div class='add'>+					 struct cmd_ctrl_node *cmdnode)</div><div class='add'>+{</div><div class='add'>+	if (!cmdnode)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	cmdnode-&gt;callback = NULL;</div><div class='add'>+	cmdnode-&gt;callback_arg = 0;</div><div class='add'>+</div><div class='add'>+	memset(cmdnode-&gt;cmdbuf, 0, LBS_CMD_BUFFER_SIZE);</div><div class='add'>+</div><div class='add'>+	list_add_tail(&amp;cmdnode-&gt;list, &amp;priv-&gt;cmdfreeq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void lbtf_cleanup_and_insert_cmd(struct lbtf_private *priv,</div><div class='add'>+	struct cmd_ctrl_node *ptempcmd)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;priv-&gt;driver_lock, flags);</div><div class='add'>+	__lbtf_cleanup_and_insert_cmd(priv, ptempcmd);</div><div class='add'>+	spin_unlock_irqrestore(&amp;priv-&gt;driver_lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void lbtf_complete_command(struct lbtf_private *priv, struct cmd_ctrl_node *cmd,</div><div class='add'>+			  int result)</div><div class='add'>+{</div><div class='add'>+	cmd-&gt;result = result;</div><div class='add'>+	cmd-&gt;cmdwaitqwoken = 1;</div><div class='add'>+	wake_up_interruptible(&amp;cmd-&gt;cmdwait_q);</div><div class='add'>+</div><div class='add'>+	if (!cmd-&gt;callback)</div><div class='add'>+		__lbtf_cleanup_and_insert_cmd(priv, cmd);</div><div class='add'>+	priv-&gt;cur_cmd = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int lbtf_cmd_set_mac_multicast_addr(struct lbtf_private *priv)</div><div class='add'>+{</div><div class='add'>+	struct cmd_ds_mac_multicast_addr cmd;</div><div class='add'>+</div><div class='add'>+	cmd.hdr.size = cpu_to_le16(sizeof(cmd));</div><div class='add'>+	cmd.action = cpu_to_le16(CMD_ACT_SET);</div><div class='add'>+</div><div class='add'>+	cmd.nr_of_adrs = cpu_to_le16((u16) priv-&gt;nr_of_multicastmacaddr);</div><div class='add'>+	memcpy(cmd.maclist, priv-&gt;multicastlist,</div><div class='add'>+	       priv-&gt;nr_of_multicastmacaddr * ETH_ALEN);</div><div class='add'>+</div><div class='add'>+	lbtf_cmd_async(priv, CMD_MAC_MULTICAST_ADR, &amp;cmd.hdr, sizeof(cmd));</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void lbtf_set_mode(struct lbtf_private *priv, enum lbtf_mode mode)</div><div class='add'>+{</div><div class='add'>+	struct cmd_ds_set_mode cmd;</div><div class='add'>+</div><div class='add'>+	cmd.hdr.size = cpu_to_le16(sizeof(cmd));</div><div class='add'>+	cmd.mode = cpu_to_le16(mode);</div><div class='add'>+	lbtf_cmd_async(priv, CMD_802_11_SET_MODE, &amp;cmd.hdr, sizeof(cmd));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void lbtf_set_bssid(struct lbtf_private *priv, bool activate, u8 *bssid)</div><div class='add'>+{</div><div class='add'>+	struct cmd_ds_set_bssid cmd;</div><div class='add'>+</div><div class='add'>+	cmd.hdr.size = cpu_to_le16(sizeof(cmd));</div><div class='add'>+	cmd.activate = activate ? 1 : 0;</div><div class='add'>+	if (activate)</div><div class='add'>+		memcpy(cmd.bssid, bssid, ETH_ALEN);</div><div class='add'>+</div><div class='add'>+	lbtf_cmd_async(priv, CMD_802_11_SET_BSSID, &amp;cmd.hdr, sizeof(cmd));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int lbtf_set_mac_address(struct lbtf_private *priv, uint8_t *mac_addr)</div><div class='add'>+{</div><div class='add'>+	struct cmd_ds_802_11_mac_address cmd;</div><div class='add'>+</div><div class='add'>+	cmd.hdr.size = cpu_to_le16(sizeof(cmd));</div><div class='add'>+	cmd.action = cpu_to_le16(CMD_ACT_SET);</div><div class='add'>+</div><div class='add'>+	memcpy(cmd.macadd, mac_addr, ETH_ALEN);</div><div class='add'>+</div><div class='add'>+	lbtf_cmd_async(priv, CMD_802_11_MAC_ADDRESS, &amp;cmd.hdr, sizeof(cmd));</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int lbtf_set_radio_control(struct lbtf_private *priv)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+	struct cmd_ds_802_11_radio_control cmd;</div><div class='add'>+</div><div class='add'>+	cmd.hdr.size = cpu_to_le16(sizeof(cmd));</div><div class='add'>+	cmd.action = cpu_to_le16(CMD_ACT_SET);</div><div class='add'>+</div><div class='add'>+	switch (priv-&gt;preamble) {</div><div class='add'>+	case CMD_TYPE_SHORT_PREAMBLE:</div><div class='add'>+		cmd.control = cpu_to_le16(SET_SHORT_PREAMBLE);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case CMD_TYPE_LONG_PREAMBLE:</div><div class='add'>+		cmd.control = cpu_to_le16(SET_LONG_PREAMBLE);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case CMD_TYPE_AUTO_PREAMBLE:</div><div class='add'>+	default:</div><div class='add'>+		cmd.control = cpu_to_le16(SET_AUTO_PREAMBLE);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;radioon)</div><div class='add'>+		cmd.control |= cpu_to_le16(TURN_ON_RF);</div><div class='add'>+	else</div><div class='add'>+		cmd.control &amp;= cpu_to_le16(~TURN_ON_RF);</div><div class='add'>+</div><div class='add'>+	ret = lbtf_cmd_with_response(priv, CMD_802_11_RADIO_CONTROL, &amp;cmd);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void lbtf_set_mac_control(struct lbtf_private *priv)</div><div class='add'>+{</div><div class='add'>+	struct cmd_ds_mac_control cmd;</div><div class='add'>+	cmd.hdr.size = cpu_to_le16(sizeof(cmd));</div><div class='add'>+	cmd.action = cpu_to_le16(priv-&gt;mac_control);</div><div class='add'>+	cmd.reserved = 0;</div><div class='add'>+</div><div class='add'>+	lbtf_cmd_async(priv, CMD_MAC_CONTROL,</div><div class='add'>+		&amp;cmd.hdr, sizeof(cmd));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *  lbtf_allocate_cmd_buffer - Allocates cmd buffer, links it to free cmd queue</div><div class='add'>+ *</div><div class='add'>+ *  @priv	A pointer to struct lbtf_private structure</div><div class='add'>+ *</div><div class='add'>+ *  Returns: 0 on success.</div><div class='add'>+ */</div><div class='add'>+int lbtf_allocate_cmd_buffer(struct lbtf_private *priv)</div><div class='add'>+{</div><div class='add'>+	u32 bufsize;</div><div class='add'>+	u32 i;</div><div class='add'>+	struct cmd_ctrl_node *cmdarray;</div><div class='add'>+</div><div class='add'>+	/* Allocate and initialize the command array */</div><div class='add'>+	bufsize = sizeof(struct cmd_ctrl_node) * LBS_NUM_CMD_BUFFERS;</div><div class='add'>+	cmdarray = kzalloc(bufsize, GFP_KERNEL);</div><div class='add'>+	if (!cmdarray)</div><div class='add'>+		return -1;</div><div class='add'>+	priv-&gt;cmd_array = cmdarray;</div><div class='add'>+</div><div class='add'>+	/* Allocate and initialize each command buffer in the command array */</div><div class='add'>+	for (i = 0; i &lt; LBS_NUM_CMD_BUFFERS; i++) {</div><div class='add'>+		cmdarray[i].cmdbuf = kzalloc(LBS_CMD_BUFFER_SIZE, GFP_KERNEL);</div><div class='add'>+		if (!cmdarray[i].cmdbuf)</div><div class='add'>+			return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; LBS_NUM_CMD_BUFFERS; i++) {</div><div class='add'>+		init_waitqueue_head(&amp;cmdarray[i].cmdwait_q);</div><div class='add'>+		lbtf_cleanup_and_insert_cmd(priv, &amp;cmdarray[i]);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *  lbtf_free_cmd_buffer - Frees the cmd buffer.</div><div class='add'>+ *</div><div class='add'>+ *  @priv	A pointer to struct lbtf_private structure</div><div class='add'>+ *</div><div class='add'>+ *  Returns: 0</div><div class='add'>+ */</div><div class='add'>+int lbtf_free_cmd_buffer(struct lbtf_private *priv)</div><div class='add'>+{</div><div class='add'>+	struct cmd_ctrl_node *cmdarray;</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	/* need to check if cmd array is allocated or not */</div><div class='add'>+	if (priv-&gt;cmd_array == NULL)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	cmdarray = priv-&gt;cmd_array;</div><div class='add'>+</div><div class='add'>+	/* Release shared memory buffers */</div><div class='add'>+	for (i = 0; i &lt; LBS_NUM_CMD_BUFFERS; i++) {</div><div class='add'>+		kfree(cmdarray[i].cmdbuf);</div><div class='add'>+		cmdarray[i].cmdbuf = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Release cmd_ctrl_node */</div><div class='add'>+	kfree(priv-&gt;cmd_array);</div><div class='add'>+	priv-&gt;cmd_array = NULL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *  lbtf_get_cmd_ctrl_node - Gets free cmd node from free cmd queue.</div><div class='add'>+ *</div><div class='add'>+ *  @priv		A pointer to struct lbtf_private structure</div><div class='add'>+ *</div><div class='add'>+ *  Returns: pointer to a struct cmd_ctrl_node or NULL if none available.</div><div class='add'>+ */</div><div class='add'>+static struct cmd_ctrl_node *lbtf_get_cmd_ctrl_node(struct lbtf_private *priv)</div><div class='add'>+{</div><div class='add'>+	struct cmd_ctrl_node *tempnode;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	if (!priv)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;priv-&gt;driver_lock, flags);</div><div class='add'>+</div><div class='add'>+	if (!list_empty(&amp;priv-&gt;cmdfreeq)) {</div><div class='add'>+		tempnode = list_first_entry(&amp;priv-&gt;cmdfreeq,</div><div class='add'>+					    struct cmd_ctrl_node, list);</div><div class='add'>+		list_del(&amp;tempnode-&gt;list);</div><div class='add'>+	} else</div><div class='add'>+		tempnode = NULL;</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;priv-&gt;driver_lock, flags);</div><div class='add'>+</div><div class='add'>+	return tempnode;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *  lbtf_execute_next_command: execute next command in cmd pending queue.</div><div class='add'>+ *</div><div class='add'>+ *  @priv     A pointer to struct lbtf_private structure</div><div class='add'>+ *</div><div class='add'>+ *  Returns: 0 on success.</div><div class='add'>+ */</div><div class='add'>+int lbtf_execute_next_command(struct lbtf_private *priv)</div><div class='add'>+{</div><div class='add'>+	struct cmd_ctrl_node *cmdnode = NULL;</div><div class='add'>+	struct cmd_header *cmd;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	/* Debug group is LBS_DEB_THREAD and not LBS_DEB_HOST, because the</div><div class='add'>+	 * only caller to us is lbtf_thread() and we get even when a</div><div class='add'>+	 * data packet is received */</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;priv-&gt;driver_lock, flags);</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;cur_cmd) {</div><div class='add'>+		spin_unlock_irqrestore(&amp;priv-&gt;driver_lock, flags);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!list_empty(&amp;priv-&gt;cmdpendingq)) {</div><div class='add'>+		cmdnode = list_first_entry(&amp;priv-&gt;cmdpendingq,</div><div class='add'>+					   struct cmd_ctrl_node, list);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cmdnode) {</div><div class='add'>+		cmd = cmdnode-&gt;cmdbuf;</div><div class='add'>+</div><div class='add'>+		list_del(&amp;cmdnode-&gt;list);</div><div class='add'>+		spin_unlock_irqrestore(&amp;priv-&gt;driver_lock, flags);</div><div class='add'>+		lbtf_submit_command(priv, cmdnode);</div><div class='add'>+	} else</div><div class='add'>+		spin_unlock_irqrestore(&amp;priv-&gt;driver_lock, flags);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct cmd_ctrl_node *__lbtf_cmd_async(struct lbtf_private *priv,</div><div class='add'>+	uint16_t command, struct cmd_header *in_cmd, int in_cmd_size,</div><div class='add'>+	int (*callback)(struct lbtf_private *, unsigned long,</div><div class='add'>+			struct cmd_header *),</div><div class='add'>+	unsigned long callback_arg)</div><div class='add'>+{</div><div class='add'>+	struct cmd_ctrl_node *cmdnode;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;surpriseremoved)</div><div class='add'>+		return ERR_PTR(-ENOENT);</div><div class='add'>+</div><div class='add'>+	cmdnode = lbtf_get_cmd_ctrl_node(priv);</div><div class='add'>+	if (cmdnode == NULL) {</div><div class='add'>+		/* Wake up main thread to execute next command */</div><div class='add'>+		queue_work(lbtf_wq, &amp;priv-&gt;cmd_work);</div><div class='add'>+		return ERR_PTR(-ENOBUFS);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cmdnode-&gt;callback = callback;</div><div class='add'>+	cmdnode-&gt;callback_arg = callback_arg;</div><div class='add'>+</div><div class='add'>+	/* Copy the incoming command to the buffer */</div><div class='add'>+	memcpy(cmdnode-&gt;cmdbuf, in_cmd, in_cmd_size);</div><div class='add'>+</div><div class='add'>+	/* Set sequence number, clean result, move to buffer */</div><div class='add'>+	priv-&gt;seqnum++;</div><div class='add'>+	cmdnode-&gt;cmdbuf-&gt;command = cpu_to_le16(command);</div><div class='add'>+	cmdnode-&gt;cmdbuf-&gt;size    = cpu_to_le16(in_cmd_size);</div><div class='add'>+	cmdnode-&gt;cmdbuf-&gt;seqnum  = cpu_to_le16(priv-&gt;seqnum);</div><div class='add'>+	cmdnode-&gt;cmdbuf-&gt;result  = 0;</div><div class='add'>+	cmdnode-&gt;cmdwaitqwoken = 0;</div><div class='add'>+	lbtf_queue_cmd(priv, cmdnode);</div><div class='add'>+	queue_work(lbtf_wq, &amp;priv-&gt;cmd_work);</div><div class='add'>+</div><div class='add'>+	return cmdnode;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void lbtf_cmd_async(struct lbtf_private *priv, uint16_t command,</div><div class='add'>+	struct cmd_header *in_cmd, int in_cmd_size)</div><div class='add'>+{</div><div class='add'>+	__lbtf_cmd_async(priv, command, in_cmd, in_cmd_size, NULL, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int __lbtf_cmd(struct lbtf_private *priv, uint16_t command,</div><div class='add'>+	      struct cmd_header *in_cmd, int in_cmd_size,</div><div class='add'>+	      int (*callback)(struct lbtf_private *,</div><div class='add'>+			      unsigned long, struct cmd_header *),</div><div class='add'>+	      unsigned long callback_arg)</div><div class='add'>+{</div><div class='add'>+	struct cmd_ctrl_node *cmdnode;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	cmdnode = __lbtf_cmd_async(priv, command, in_cmd, in_cmd_size,</div><div class='add'>+				  callback, callback_arg);</div><div class='add'>+	if (IS_ERR(cmdnode))</div><div class='add'>+		return PTR_ERR(cmdnode);</div><div class='add'>+</div><div class='add'>+	might_sleep();</div><div class='add'>+	ret = wait_event_interruptible(cmdnode-&gt;cmdwait_q,</div><div class='add'>+				       cmdnode-&gt;cmdwaitqwoken);</div><div class='add'>+       if (ret)	{</div><div class='add'>+		printk(KERN_DEBUG</div><div class='add'>+		       "libertastf: command 0x%04x interrupted by signal",</div><div class='add'>+		       command);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;priv-&gt;driver_lock, flags);</div><div class='add'>+	ret = cmdnode-&gt;result;</div><div class='add'>+	if (ret)</div><div class='add'>+		printk(KERN_DEBUG "libertastf: command 0x%04x failed: %d\n",</div><div class='add'>+			    command, ret);</div><div class='add'>+</div><div class='add'>+	__lbtf_cleanup_and_insert_cmd(priv, cmdnode);</div><div class='add'>+	spin_unlock_irqrestore(&amp;priv-&gt;driver_lock, flags);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(__lbtf_cmd);</div><div class='add'>+</div><div class='add'>+/* Call holding driver_lock */</div><div class='add'>+void lbtf_cmd_response_rx(struct lbtf_private *priv)</div><div class='add'>+{</div><div class='add'>+	priv-&gt;cmd_response_rxed = 1;</div><div class='add'>+	queue_work(lbtf_wq, &amp;priv-&gt;cmd_work);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(lbtf_cmd_response_rx);</div><div class='add'>+</div><div class='add'>+int lbtf_process_rx_command(struct lbtf_private *priv)</div><div class='add'>+{</div><div class='add'>+	uint16_t respcmd, curcmd;</div><div class='add'>+	struct cmd_header *resp;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	uint16_t result;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;lock);</div><div class='add'>+	spin_lock_irqsave(&amp;priv-&gt;driver_lock, flags);</div><div class='add'>+</div><div class='add'>+	if (!priv-&gt;cur_cmd) {</div><div class='add'>+		ret = -1;</div><div class='add'>+		spin_unlock_irqrestore(&amp;priv-&gt;driver_lock, flags);</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	resp = (void *)priv-&gt;cmd_resp_buff;</div><div class='add'>+	curcmd = le16_to_cpu(priv-&gt;cur_cmd-&gt;cmdbuf-&gt;command);</div><div class='add'>+	respcmd = le16_to_cpu(resp-&gt;command);</div><div class='add'>+	result = le16_to_cpu(resp-&gt;result);</div><div class='add'>+</div><div class='add'>+	if (net_ratelimit())</div><div class='add'>+		printk(KERN_DEBUG "libertastf: cmd response 0x%04x, seq %d, size %d\n",</div><div class='add'>+			respcmd, le16_to_cpu(resp-&gt;seqnum),</div><div class='add'>+			le16_to_cpu(resp-&gt;size));</div><div class='add'>+</div><div class='add'>+	if (resp-&gt;seqnum != priv-&gt;cur_cmd-&gt;cmdbuf-&gt;seqnum) {</div><div class='add'>+		spin_unlock_irqrestore(&amp;priv-&gt;driver_lock, flags);</div><div class='add'>+		ret = -1;</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+	if (respcmd != CMD_RET(curcmd)) {</div><div class='add'>+		spin_unlock_irqrestore(&amp;priv-&gt;driver_lock, flags);</div><div class='add'>+		ret = -1;</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (resp-&gt;result == cpu_to_le16(0x0004)) {</div><div class='add'>+		/* 0x0004 means -EAGAIN. Drop the response, let it time out</div><div class='add'>+		   and be resubmitted */</div><div class='add'>+		spin_unlock_irqrestore(&amp;priv-&gt;driver_lock, flags);</div><div class='add'>+		ret = -1;</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Now we got response from FW, cancel the command timer */</div><div class='add'>+	del_timer(&amp;priv-&gt;command_timer);</div><div class='add'>+	priv-&gt;cmd_timed_out = 0;</div><div class='add'>+	if (priv-&gt;nr_retries)</div><div class='add'>+		priv-&gt;nr_retries = 0;</div><div class='add'>+</div><div class='add'>+	/* If the command is not successful, cleanup and return failure */</div><div class='add'>+	if ((result != 0 || !(respcmd &amp; 0x8000))) {</div><div class='add'>+		/*</div><div class='add'>+		 * Handling errors here</div><div class='add'>+		 */</div><div class='add'>+		switch (respcmd) {</div><div class='add'>+		case CMD_RET(CMD_GET_HW_SPEC):</div><div class='add'>+		case CMD_RET(CMD_802_11_RESET):</div><div class='add'>+			printk(KERN_DEBUG "libertastf: reset failed\n");</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		}</div><div class='add'>+		lbtf_complete_command(priv, priv-&gt;cur_cmd, result);</div><div class='add'>+		spin_unlock_irqrestore(&amp;priv-&gt;driver_lock, flags);</div><div class='add'>+</div><div class='add'>+		ret = -1;</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;priv-&gt;driver_lock, flags);</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;cur_cmd &amp;&amp; priv-&gt;cur_cmd-&gt;callback) {</div><div class='add'>+		ret = priv-&gt;cur_cmd-&gt;callback(priv, priv-&gt;cur_cmd-&gt;callback_arg,</div><div class='add'>+				resp);</div><div class='add'>+	}</div><div class='add'>+	spin_lock_irqsave(&amp;priv-&gt;driver_lock, flags);</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;cur_cmd) {</div><div class='add'>+		/* Clean up and Put current command back to cmdfreeq */</div><div class='add'>+		lbtf_complete_command(priv, priv-&gt;cur_cmd, result);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;priv-&gt;driver_lock, flags);</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;lock);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/libertas_tf/if_usb.c b/drivers/net/wireless/libertas_tf/if_usb.c<br/>new file mode 100644<br/>index 000000000000..1cc03a8dd67a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/libertas_tf/if_usb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/libertas_tf/if_usb.c</a></div><div class='hunk'>@@ -0,0 +1,766 @@</div><div class='add'>+/*</div><div class='add'>+ *  Copyright (C) 2008, cozybit Inc.</div><div class='add'>+ *  Copyright (C) 2003-2006, Marvell International Ltd.</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License, or (at</div><div class='add'>+ *  your option) any later version.</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/firmware.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/usb.h&gt;</div><div class='add'>+</div><div class='add'>+#define DRV_NAME "lbtf_usb"</div><div class='add'>+</div><div class='add'>+#include "libertas_tf.h"</div><div class='add'>+#include "if_usb.h"</div><div class='add'>+</div><div class='add'>+#define MESSAGE_HEADER_LEN	4</div><div class='add'>+</div><div class='add'>+static char *lbtf_fw_name = "lbtf_usb.bin";</div><div class='add'>+module_param_named(fw_name, lbtf_fw_name, charp, 0644);</div><div class='add'>+</div><div class='add'>+static struct usb_device_id if_usb_table[] = {</div><div class='add'>+	/* Enter the device signature inside */</div><div class='add'>+	{ USB_DEVICE(0x1286, 0x2001) },</div><div class='add'>+	{ USB_DEVICE(0x05a3, 0x8388) },</div><div class='add'>+	{}	/* Terminating entry */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_DEVICE_TABLE(usb, if_usb_table);</div><div class='add'>+</div><div class='add'>+static void if_usb_receive(struct urb *urb);</div><div class='add'>+static void if_usb_receive_fwload(struct urb *urb);</div><div class='add'>+static int if_usb_prog_firmware(struct if_usb_card *cardp);</div><div class='add'>+static int if_usb_host_to_card(struct lbtf_private *priv, uint8_t type,</div><div class='add'>+			       uint8_t *payload, uint16_t nb);</div><div class='add'>+static int usb_tx_block(struct if_usb_card *cardp, uint8_t *payload,</div><div class='add'>+			uint16_t nb, u8 data);</div><div class='add'>+static void if_usb_free(struct if_usb_card *cardp);</div><div class='add'>+static int if_usb_submit_rx_urb(struct if_usb_card *cardp);</div><div class='add'>+static int if_usb_reset_device(struct if_usb_card *cardp);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *  if_usb_wrike_bulk_callback -  call back to handle URB status</div><div class='add'>+ *</div><div class='add'>+ *  @param urb 		pointer to urb structure</div><div class='add'>+ */</div><div class='add'>+static void if_usb_write_bulk_callback(struct urb *urb)</div><div class='add'>+{</div><div class='add'>+	if (urb-&gt;status != 0)</div><div class='add'>+		printk(KERN_INFO "libertastf: URB in failure status: %d\n",</div><div class='add'>+		       urb-&gt;status);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *  if_usb_free - free tx/rx urb, skb and rx buffer</div><div class='add'>+ *</div><div class='add'>+ *  @param cardp	pointer if_usb_card</div><div class='add'>+ */</div><div class='add'>+static void if_usb_free(struct if_usb_card *cardp)</div><div class='add'>+{</div><div class='add'>+	/* Unlink tx &amp; rx urb */</div><div class='add'>+	usb_kill_urb(cardp-&gt;tx_urb);</div><div class='add'>+	usb_kill_urb(cardp-&gt;rx_urb);</div><div class='add'>+	usb_kill_urb(cardp-&gt;cmd_urb);</div><div class='add'>+</div><div class='add'>+	usb_free_urb(cardp-&gt;tx_urb);</div><div class='add'>+	cardp-&gt;tx_urb = NULL;</div><div class='add'>+</div><div class='add'>+	usb_free_urb(cardp-&gt;rx_urb);</div><div class='add'>+	cardp-&gt;rx_urb = NULL;</div><div class='add'>+</div><div class='add'>+	usb_free_urb(cardp-&gt;cmd_urb);</div><div class='add'>+	cardp-&gt;cmd_urb = NULL;</div><div class='add'>+</div><div class='add'>+	kfree(cardp-&gt;ep_out_buf);</div><div class='add'>+	cardp-&gt;ep_out_buf = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void if_usb_setup_firmware(struct lbtf_private *priv)</div><div class='add'>+{</div><div class='add'>+	struct if_usb_card *cardp = priv-&gt;card;</div><div class='add'>+	struct cmd_ds_set_boot2_ver b2_cmd;</div><div class='add'>+</div><div class='add'>+	if_usb_submit_rx_urb(cardp);</div><div class='add'>+	b2_cmd.hdr.size = cpu_to_le16(sizeof(b2_cmd));</div><div class='add'>+	b2_cmd.action = 0;</div><div class='add'>+	b2_cmd.version = cardp-&gt;boot2_version;</div><div class='add'>+</div><div class='add'>+	if (lbtf_cmd_with_response(priv, CMD_SET_BOOT2_VER, &amp;b2_cmd))</div><div class='add'>+		printk(KERN_INFO "libertastf: setting boot2 version failed\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void if_usb_fw_timeo(unsigned long priv)</div><div class='add'>+{</div><div class='add'>+	struct if_usb_card *cardp = (void *)priv;</div><div class='add'>+</div><div class='add'>+	if (!cardp-&gt;fwdnldover)</div><div class='add'>+		/* Download timed out */</div><div class='add'>+		cardp-&gt;priv-&gt;surpriseremoved = 1;</div><div class='add'>+	wake_up(&amp;cardp-&gt;fw_wq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *  if_usb_probe - sets the configuration values</div><div class='add'>+ *</div><div class='add'>+ *  @ifnum	interface number</div><div class='add'>+ *  @id		pointer to usb_device_id</div><div class='add'>+ *</div><div class='add'>+ *  Returns: 0 on success, error code on failure</div><div class='add'>+ */</div><div class='add'>+static int if_usb_probe(struct usb_interface *intf,</div><div class='add'>+			const struct usb_device_id *id)</div><div class='add'>+{</div><div class='add'>+	struct usb_device *udev;</div><div class='add'>+	struct usb_host_interface *iface_desc;</div><div class='add'>+	struct usb_endpoint_descriptor *endpoint;</div><div class='add'>+	struct lbtf_private *priv;</div><div class='add'>+	struct if_usb_card *cardp;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	udev = interface_to_usbdev(intf);</div><div class='add'>+</div><div class='add'>+	cardp = kzalloc(sizeof(struct if_usb_card), GFP_KERNEL);</div><div class='add'>+	if (!cardp)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	setup_timer(&amp;cardp-&gt;fw_timeout, if_usb_fw_timeo, (unsigned long)cardp);</div><div class='add'>+	init_waitqueue_head(&amp;cardp-&gt;fw_wq);</div><div class='add'>+</div><div class='add'>+	cardp-&gt;udev = udev;</div><div class='add'>+	iface_desc = intf-&gt;cur_altsetting;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; iface_desc-&gt;desc.bNumEndpoints; ++i) {</div><div class='add'>+		endpoint = &amp;iface_desc-&gt;endpoint[i].desc;</div><div class='add'>+		if (usb_endpoint_is_bulk_in(endpoint)) {</div><div class='add'>+			cardp-&gt;ep_in_size =</div><div class='add'>+				le16_to_cpu(endpoint-&gt;wMaxPacketSize);</div><div class='add'>+			cardp-&gt;ep_in = usb_endpoint_num(endpoint);</div><div class='add'>+		} else if (usb_endpoint_is_bulk_out(endpoint)) {</div><div class='add'>+			cardp-&gt;ep_out_size =</div><div class='add'>+				le16_to_cpu(endpoint-&gt;wMaxPacketSize);</div><div class='add'>+			cardp-&gt;ep_out = usb_endpoint_num(endpoint);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (!cardp-&gt;ep_out_size || !cardp-&gt;ep_in_size)</div><div class='add'>+		/* Endpoints not found */</div><div class='add'>+		goto dealloc;</div><div class='add'>+</div><div class='add'>+	cardp-&gt;rx_urb = usb_alloc_urb(0, GFP_KERNEL);</div><div class='add'>+	if (!cardp-&gt;rx_urb)</div><div class='add'>+		goto dealloc;</div><div class='add'>+</div><div class='add'>+	cardp-&gt;tx_urb = usb_alloc_urb(0, GFP_KERNEL);</div><div class='add'>+	if (!cardp-&gt;tx_urb)</div><div class='add'>+		goto dealloc;</div><div class='add'>+</div><div class='add'>+	cardp-&gt;cmd_urb = usb_alloc_urb(0, GFP_KERNEL);</div><div class='add'>+	if (!cardp-&gt;cmd_urb)</div><div class='add'>+		goto dealloc;</div><div class='add'>+</div><div class='add'>+	cardp-&gt;ep_out_buf = kmalloc(MRVDRV_ETH_TX_PACKET_BUFFER_SIZE,</div><div class='add'>+				    GFP_KERNEL);</div><div class='add'>+	if (!cardp-&gt;ep_out_buf)</div><div class='add'>+		goto dealloc;</div><div class='add'>+</div><div class='add'>+	priv = lbtf_add_card(cardp, &amp;udev-&gt;dev);</div><div class='add'>+	if (!priv)</div><div class='add'>+		goto dealloc;</div><div class='add'>+</div><div class='add'>+	cardp-&gt;priv = priv;</div><div class='add'>+</div><div class='add'>+	priv-&gt;hw_host_to_card = if_usb_host_to_card;</div><div class='add'>+	priv-&gt;hw_prog_firmware = if_usb_prog_firmware;</div><div class='add'>+	priv-&gt;hw_reset_device = if_usb_reset_device;</div><div class='add'>+	cardp-&gt;boot2_version = udev-&gt;descriptor.bcdDevice;</div><div class='add'>+</div><div class='add'>+	usb_get_dev(udev);</div><div class='add'>+	usb_set_intfdata(intf, cardp);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+dealloc:</div><div class='add'>+	if_usb_free(cardp);</div><div class='add'>+error:</div><div class='add'>+	return -ENOMEM;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *  if_usb_disconnect -  free resource and cleanup</div><div class='add'>+ *</div><div class='add'>+ *  @intf	USB interface structure</div><div class='add'>+ */</div><div class='add'>+static void if_usb_disconnect(struct usb_interface *intf)</div><div class='add'>+{</div><div class='add'>+	struct if_usb_card *cardp = usb_get_intfdata(intf);</div><div class='add'>+	struct lbtf_private *priv = (struct lbtf_private *) cardp-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if_usb_reset_device(cardp);</div><div class='add'>+</div><div class='add'>+	if (priv)</div><div class='add'>+		lbtf_remove_card(priv);</div><div class='add'>+</div><div class='add'>+	/* Unlink and free urb */</div><div class='add'>+	if_usb_free(cardp);</div><div class='add'>+</div><div class='add'>+	usb_set_intfdata(intf, NULL);</div><div class='add'>+	usb_put_dev(interface_to_usbdev(intf));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *  if_usb_send_fw_pkt -  This function downloads the FW</div><div class='add'>+ *</div><div class='add'>+ *  @priv	pointer to struct lbtf_private</div><div class='add'>+ *</div><div class='add'>+ *  Returns: 0</div><div class='add'>+ */</div><div class='add'>+static int if_usb_send_fw_pkt(struct if_usb_card *cardp)</div><div class='add'>+{</div><div class='add'>+	struct fwdata *fwdata = cardp-&gt;ep_out_buf;</div><div class='add'>+	u8 *firmware = (u8 *) cardp-&gt;fw-&gt;data;</div><div class='add'>+</div><div class='add'>+	/* If we got a CRC failure on the last block, back</div><div class='add'>+	   up and retry it */</div><div class='add'>+	if (!cardp-&gt;CRC_OK) {</div><div class='add'>+		cardp-&gt;totalbytes = cardp-&gt;fwlastblksent;</div><div class='add'>+		cardp-&gt;fwseqnum--;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* struct fwdata (which we sent to the card) has an</div><div class='add'>+	   extra __le32 field in between the header and the data,</div><div class='add'>+	   which is not in the struct fwheader in the actual</div><div class='add'>+	   firmware binary. Insert the seqnum in the middle... */</div><div class='add'>+	memcpy(&amp;fwdata-&gt;hdr, &amp;firmware[cardp-&gt;totalbytes],</div><div class='add'>+	       sizeof(struct fwheader));</div><div class='add'>+</div><div class='add'>+	cardp-&gt;fwlastblksent = cardp-&gt;totalbytes;</div><div class='add'>+	cardp-&gt;totalbytes += sizeof(struct fwheader);</div><div class='add'>+</div><div class='add'>+	memcpy(fwdata-&gt;data, &amp;firmware[cardp-&gt;totalbytes],</div><div class='add'>+	       le32_to_cpu(fwdata-&gt;hdr.datalength));</div><div class='add'>+</div><div class='add'>+	fwdata-&gt;seqnum = cpu_to_le32(++cardp-&gt;fwseqnum);</div><div class='add'>+	cardp-&gt;totalbytes += le32_to_cpu(fwdata-&gt;hdr.datalength);</div><div class='add'>+</div><div class='add'>+	usb_tx_block(cardp, cardp-&gt;ep_out_buf, sizeof(struct fwdata) +</div><div class='add'>+		     le32_to_cpu(fwdata-&gt;hdr.datalength), 0);</div><div class='add'>+</div><div class='add'>+	if (fwdata-&gt;hdr.dnldcmd == cpu_to_le32(FW_HAS_LAST_BLOCK))</div><div class='add'>+		/* Host has finished FW downloading</div><div class='add'>+		 * Donwloading FW JUMP BLOCK</div><div class='add'>+		 */</div><div class='add'>+		cardp-&gt;fwfinalblk = 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int if_usb_reset_device(struct if_usb_card *cardp)</div><div class='add'>+{</div><div class='add'>+	struct cmd_ds_802_11_reset *cmd = cardp-&gt;ep_out_buf + 4;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	*(__le32 *)cardp-&gt;ep_out_buf = cpu_to_le32(CMD_TYPE_REQUEST);</div><div class='add'>+</div><div class='add'>+	cmd-&gt;hdr.command = cpu_to_le16(CMD_802_11_RESET);</div><div class='add'>+	cmd-&gt;hdr.size = cpu_to_le16(sizeof(struct cmd_ds_802_11_reset));</div><div class='add'>+	cmd-&gt;hdr.result = cpu_to_le16(0);</div><div class='add'>+	cmd-&gt;hdr.seqnum = cpu_to_le16(0x5a5a);</div><div class='add'>+	cmd-&gt;action = cpu_to_le16(CMD_ACT_HALT);</div><div class='add'>+	usb_tx_block(cardp, cardp-&gt;ep_out_buf,</div><div class='add'>+		     4 + sizeof(struct cmd_ds_802_11_reset), 0);</div><div class='add'>+</div><div class='add'>+	msleep(100);</div><div class='add'>+	ret = usb_reset_device(cardp-&gt;udev);</div><div class='add'>+	msleep(100);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(if_usb_reset_device);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *  usb_tx_block - transfer data to the device</div><div class='add'>+ *</div><div class='add'>+ *  @priv 	pointer to struct lbtf_private</div><div class='add'>+ *  @payload	pointer to payload data</div><div class='add'>+ *  @nb		data length</div><div class='add'>+ *  @data	non-zero for data, zero for commands</div><div class='add'>+ *</div><div class='add'>+ *  Returns: 0 on success, nonzero otherwise.</div><div class='add'>+ */</div><div class='add'>+static int usb_tx_block(struct if_usb_card *cardp, uint8_t *payload,</div><div class='add'>+			uint16_t nb, u8 data)</div><div class='add'>+{</div><div class='add'>+	struct urb *urb;</div><div class='add'>+</div><div class='add'>+	/* check if device is removed */</div><div class='add'>+	if (cardp-&gt;priv-&gt;surpriseremoved)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	if (data)</div><div class='add'>+		urb = cardp-&gt;tx_urb;</div><div class='add'>+	else</div><div class='add'>+		urb = cardp-&gt;cmd_urb;</div><div class='add'>+</div><div class='add'>+	usb_fill_bulk_urb(urb, cardp-&gt;udev,</div><div class='add'>+			  usb_sndbulkpipe(cardp-&gt;udev,</div><div class='add'>+					  cardp-&gt;ep_out),</div><div class='add'>+			  payload, nb, if_usb_write_bulk_callback, cardp);</div><div class='add'>+</div><div class='add'>+	urb-&gt;transfer_flags |= URB_ZERO_PACKET;</div><div class='add'>+</div><div class='add'>+	if (usb_submit_urb(urb, GFP_ATOMIC))</div><div class='add'>+		return -1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __if_usb_submit_rx_urb(struct if_usb_card *cardp,</div><div class='add'>+				  void (*callbackfn)(struct urb *urb))</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	skb = dev_alloc_skb(MRVDRV_ETH_RX_PACKET_BUFFER_SIZE);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	cardp-&gt;rx_skb = skb;</div><div class='add'>+</div><div class='add'>+	/* Fill the receive configuration URB and initialise the Rx call back */</div><div class='add'>+	usb_fill_bulk_urb(cardp-&gt;rx_urb, cardp-&gt;udev,</div><div class='add'>+			  usb_rcvbulkpipe(cardp-&gt;udev, cardp-&gt;ep_in),</div><div class='add'>+			  (void *) (skb-&gt;tail),</div><div class='add'>+			  MRVDRV_ETH_RX_PACKET_BUFFER_SIZE, callbackfn, cardp);</div><div class='add'>+</div><div class='add'>+	cardp-&gt;rx_urb-&gt;transfer_flags |= URB_ZERO_PACKET;</div><div class='add'>+</div><div class='add'>+	if (usb_submit_urb(cardp-&gt;rx_urb, GFP_ATOMIC)) {</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		cardp-&gt;rx_skb = NULL;</div><div class='add'>+		return -1;</div><div class='add'>+	} else</div><div class='add'>+		return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int if_usb_submit_rx_urb_fwload(struct if_usb_card *cardp)</div><div class='add'>+{</div><div class='add'>+	return __if_usb_submit_rx_urb(cardp, &amp;if_usb_receive_fwload);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int if_usb_submit_rx_urb(struct if_usb_card *cardp)</div><div class='add'>+{</div><div class='add'>+	return __if_usb_submit_rx_urb(cardp, &amp;if_usb_receive);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void if_usb_receive_fwload(struct urb *urb)</div><div class='add'>+{</div><div class='add'>+	struct if_usb_card *cardp = urb-&gt;context;</div><div class='add'>+	struct sk_buff *skb = cardp-&gt;rx_skb;</div><div class='add'>+	struct fwsyncheader *syncfwheader;</div><div class='add'>+	struct bootcmdresp bcmdresp;</div><div class='add'>+</div><div class='add'>+	if (urb-&gt;status) {</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cardp-&gt;fwdnldover) {</div><div class='add'>+		__le32 *tmp = (__le32 *)(skb-&gt;data);</div><div class='add'>+</div><div class='add'>+		if (tmp[0] == cpu_to_le32(CMD_TYPE_INDICATION) &amp;&amp;</div><div class='add'>+		    tmp[1] == cpu_to_le32(MACREG_INT_CODE_FIRMWARE_READY))</div><div class='add'>+			/* Firmware ready event received */</div><div class='add'>+			wake_up(&amp;cardp-&gt;fw_wq);</div><div class='add'>+		else</div><div class='add'>+			if_usb_submit_rx_urb_fwload(cardp);</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	if (cardp-&gt;bootcmdresp &lt;= 0) {</div><div class='add'>+		memcpy(&amp;bcmdresp, skb-&gt;data, sizeof(bcmdresp));</div><div class='add'>+</div><div class='add'>+		if (le16_to_cpu(cardp-&gt;udev-&gt;descriptor.bcdDevice) &lt; 0x3106) {</div><div class='add'>+			kfree_skb(skb);</div><div class='add'>+			if_usb_submit_rx_urb_fwload(cardp);</div><div class='add'>+			cardp-&gt;bootcmdresp = 1;</div><div class='add'>+			/* Received valid boot command response */</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+		if (bcmdresp.magic != cpu_to_le32(BOOT_CMD_MAGIC_NUMBER)) {</div><div class='add'>+			if (bcmdresp.magic == cpu_to_le32(CMD_TYPE_REQUEST) ||</div><div class='add'>+			    bcmdresp.magic == cpu_to_le32(CMD_TYPE_DATA) ||</div><div class='add'>+			    bcmdresp.magic == cpu_to_le32(CMD_TYPE_INDICATION))</div><div class='add'>+				cardp-&gt;bootcmdresp = -1;</div><div class='add'>+		} else if (bcmdresp.cmd == BOOT_CMD_FW_BY_USB &amp;&amp;</div><div class='add'>+			   bcmdresp.result == BOOT_CMD_RESP_OK)</div><div class='add'>+			cardp-&gt;bootcmdresp = 1;</div><div class='add'>+</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		if_usb_submit_rx_urb_fwload(cardp);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	syncfwheader = kmalloc(sizeof(struct fwsyncheader), GFP_ATOMIC);</div><div class='add'>+	if (!syncfwheader) {</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(syncfwheader, skb-&gt;data, sizeof(struct fwsyncheader));</div><div class='add'>+</div><div class='add'>+	if (!syncfwheader-&gt;cmd)</div><div class='add'>+		cardp-&gt;CRC_OK = 1;</div><div class='add'>+	else</div><div class='add'>+		cardp-&gt;CRC_OK = 0;</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+</div><div class='add'>+	/* reschedule timer for 200ms hence */</div><div class='add'>+	mod_timer(&amp;cardp-&gt;fw_timeout, jiffies + (HZ/5));</div><div class='add'>+</div><div class='add'>+	if (cardp-&gt;fwfinalblk) {</div><div class='add'>+		cardp-&gt;fwdnldover = 1;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if_usb_send_fw_pkt(cardp);</div><div class='add'>+</div><div class='add'>+ exit:</div><div class='add'>+	if_usb_submit_rx_urb_fwload(cardp);</div><div class='add'>+</div><div class='add'>+	kfree(syncfwheader);</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define MRVDRV_MIN_PKT_LEN	30</div><div class='add'>+</div><div class='add'>+static inline void process_cmdtypedata(int recvlength, struct sk_buff *skb,</div><div class='add'>+				       struct if_usb_card *cardp,</div><div class='add'>+				       struct lbtf_private *priv)</div><div class='add'>+{</div><div class='add'>+	if (recvlength &gt; MRVDRV_ETH_RX_PACKET_BUFFER_SIZE + MESSAGE_HEADER_LEN</div><div class='add'>+	    || recvlength &lt; MRVDRV_MIN_PKT_LEN) {</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb_put(skb, recvlength);</div><div class='add'>+	skb_pull(skb, MESSAGE_HEADER_LEN);</div><div class='add'>+	lbtf_rx(priv, skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void process_cmdrequest(int recvlength, uint8_t *recvbuff,</div><div class='add'>+				      struct sk_buff *skb,</div><div class='add'>+				      struct if_usb_card *cardp,</div><div class='add'>+				      struct lbtf_private *priv)</div><div class='add'>+{</div><div class='add'>+	if (recvlength &gt; LBS_CMD_BUFFER_SIZE) {</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!in_interrupt())</div><div class='add'>+		BUG();</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;priv-&gt;driver_lock);</div><div class='add'>+	memcpy(priv-&gt;cmd_resp_buff, recvbuff + MESSAGE_HEADER_LEN,</div><div class='add'>+	       recvlength - MESSAGE_HEADER_LEN);</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+	lbtf_cmd_response_rx(priv);</div><div class='add'>+	spin_unlock(&amp;priv-&gt;driver_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *  if_usb_receive - read data received from the device.</div><div class='add'>+ *</div><div class='add'>+ *  @urb		pointer to struct urb</div><div class='add'>+ */</div><div class='add'>+static void if_usb_receive(struct urb *urb)</div><div class='add'>+{</div><div class='add'>+	struct if_usb_card *cardp = urb-&gt;context;</div><div class='add'>+	struct sk_buff *skb = cardp-&gt;rx_skb;</div><div class='add'>+	struct lbtf_private *priv = cardp-&gt;priv;</div><div class='add'>+	int recvlength = urb-&gt;actual_length;</div><div class='add'>+	uint8_t *recvbuff = NULL;</div><div class='add'>+	uint32_t recvtype = 0;</div><div class='add'>+	__le32 *pkt = (__le32 *) skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	if (recvlength) {</div><div class='add'>+		if (urb-&gt;status) {</div><div class='add'>+			kfree_skb(skb);</div><div class='add'>+			goto setup_for_next;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		recvbuff = skb-&gt;data;</div><div class='add'>+		recvtype = le32_to_cpu(pkt[0]);</div><div class='add'>+	} else if (urb-&gt;status) {</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (recvtype) {</div><div class='add'>+	case CMD_TYPE_DATA:</div><div class='add'>+		process_cmdtypedata(recvlength, skb, cardp, priv);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case CMD_TYPE_REQUEST:</div><div class='add'>+		process_cmdrequest(recvlength, recvbuff, skb, cardp, priv);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case CMD_TYPE_INDICATION:</div><div class='add'>+	{</div><div class='add'>+		/* Event cause handling */</div><div class='add'>+		u32 event_cause = le32_to_cpu(pkt[1]);</div><div class='add'>+</div><div class='add'>+		/* Icky undocumented magic special case */</div><div class='add'>+		if (event_cause &amp; 0xffff0000) {</div><div class='add'>+			u16 tmp;</div><div class='add'>+			u8 retrycnt;</div><div class='add'>+			u8 failure;</div><div class='add'>+</div><div class='add'>+			tmp = event_cause &gt;&gt; 16;</div><div class='add'>+			retrycnt = tmp &amp; 0x00ff;</div><div class='add'>+			failure = (tmp &amp; 0xff00) &gt;&gt; 8;</div><div class='add'>+			lbtf_send_tx_feedback(priv, retrycnt, failure);</div><div class='add'>+		} else if (event_cause == LBTF_EVENT_BCN_SENT)</div><div class='add'>+			lbtf_bcn_sent(priv);</div><div class='add'>+		else</div><div class='add'>+			printk(KERN_DEBUG</div><div class='add'>+			       "Unsupported notification %d received\n",</div><div class='add'>+			       event_cause);</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	default:</div><div class='add'>+		printk(KERN_DEBUG "libertastf: unknown command type 0x%X\n",</div><div class='add'>+			     recvtype);</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+setup_for_next:</div><div class='add'>+	if_usb_submit_rx_urb(cardp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *  if_usb_host_to_card -  Download data to the device</div><div class='add'>+ *</div><div class='add'>+ *  @priv		pointer to struct lbtf_private structure</div><div class='add'>+ *  @type		type of data</div><div class='add'>+ *  @buf		pointer to data buffer</div><div class='add'>+ *  @len		number of bytes</div><div class='add'>+ *</div><div class='add'>+ *  Returns: 0 on success, nonzero otherwise</div><div class='add'>+ */</div><div class='add'>+static int if_usb_host_to_card(struct lbtf_private *priv, uint8_t type,</div><div class='add'>+			       uint8_t *payload, uint16_t nb)</div><div class='add'>+{</div><div class='add'>+	struct if_usb_card *cardp = priv-&gt;card;</div><div class='add'>+	u8 data = 0;</div><div class='add'>+</div><div class='add'>+	if (type == MVMS_CMD) {</div><div class='add'>+		*(__le32 *)cardp-&gt;ep_out_buf = cpu_to_le32(CMD_TYPE_REQUEST);</div><div class='add'>+	} else {</div><div class='add'>+		*(__le32 *)cardp-&gt;ep_out_buf = cpu_to_le32(CMD_TYPE_DATA);</div><div class='add'>+		data = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy((cardp-&gt;ep_out_buf + MESSAGE_HEADER_LEN), payload, nb);</div><div class='add'>+</div><div class='add'>+	return usb_tx_block(cardp, cardp-&gt;ep_out_buf, nb + MESSAGE_HEADER_LEN,</div><div class='add'>+			    data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *  if_usb_issue_boot_command - Issue boot command to Boot2.</div><div class='add'>+ *</div><div class='add'>+ *  @ivalue   1 boots from FW by USB-Download, 2 boots from FW in EEPROM.</div><div class='add'>+ *</div><div class='add'>+ *  Returns: 0</div><div class='add'>+ */</div><div class='add'>+static int if_usb_issue_boot_command(struct if_usb_card *cardp, int ivalue)</div><div class='add'>+{</div><div class='add'>+	struct bootcmd *bootcmd = cardp-&gt;ep_out_buf;</div><div class='add'>+</div><div class='add'>+	/* Prepare command */</div><div class='add'>+	bootcmd-&gt;magic = cpu_to_le32(BOOT_CMD_MAGIC_NUMBER);</div><div class='add'>+	bootcmd-&gt;cmd = ivalue;</div><div class='add'>+	memset(bootcmd-&gt;pad, 0, sizeof(bootcmd-&gt;pad));</div><div class='add'>+</div><div class='add'>+	/* Issue command */</div><div class='add'>+	usb_tx_block(cardp, cardp-&gt;ep_out_buf, sizeof(*bootcmd), 0);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *  check_fwfile_format - Check the validity of Boot2/FW image.</div><div class='add'>+ *</div><div class='add'>+ *  @data	pointer to image</div><div class='add'>+ *  @totlen	image length</div><div class='add'>+ *</div><div class='add'>+ *  Returns: 0 if the image is valid, nonzero otherwise.</div><div class='add'>+ */</div><div class='add'>+static int check_fwfile_format(const u8 *data, u32 totlen)</div><div class='add'>+{</div><div class='add'>+	u32 bincmd, exit;</div><div class='add'>+	u32 blksize, offset, len;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = 1;</div><div class='add'>+	exit = len = 0;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		struct fwheader *fwh = (void *) data;</div><div class='add'>+</div><div class='add'>+		bincmd = le32_to_cpu(fwh-&gt;dnldcmd);</div><div class='add'>+		blksize = le32_to_cpu(fwh-&gt;datalength);</div><div class='add'>+		switch (bincmd) {</div><div class='add'>+		case FW_HAS_DATA_TO_RECV:</div><div class='add'>+			offset = sizeof(struct fwheader) + blksize;</div><div class='add'>+			data += offset;</div><div class='add'>+			len += offset;</div><div class='add'>+			if (len &gt;= totlen)</div><div class='add'>+				exit = 1;</div><div class='add'>+			break;</div><div class='add'>+		case FW_HAS_LAST_BLOCK:</div><div class='add'>+			exit = 1;</div><div class='add'>+			ret = 0;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			exit = 1;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	} while (!exit);</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		printk(KERN_INFO</div><div class='add'>+		       "libertastf: firmware file format check failed\n");</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int if_usb_prog_firmware(struct if_usb_card *cardp)</div><div class='add'>+{</div><div class='add'>+	int i = 0;</div><div class='add'>+	static int reset_count = 10;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	ret = request_firmware(&amp;cardp-&gt;fw, lbtf_fw_name, &amp;cardp-&gt;udev-&gt;dev);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		printk(KERN_INFO "libertastf: firmware %s not found\n",</div><div class='add'>+		       lbtf_fw_name);</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (check_fwfile_format(cardp-&gt;fw-&gt;data, cardp-&gt;fw-&gt;size))</div><div class='add'>+		goto release_fw;</div><div class='add'>+</div><div class='add'>+restart:</div><div class='add'>+	if (if_usb_submit_rx_urb_fwload(cardp) &lt; 0) {</div><div class='add'>+		ret = -1;</div><div class='add'>+		goto release_fw;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cardp-&gt;bootcmdresp = 0;</div><div class='add'>+	do {</div><div class='add'>+		int j = 0;</div><div class='add'>+		i++;</div><div class='add'>+		/* Issue Boot command = 1, Boot from Download-FW */</div><div class='add'>+		if_usb_issue_boot_command(cardp, BOOT_CMD_FW_BY_USB);</div><div class='add'>+		/* wait for command response */</div><div class='add'>+		do {</div><div class='add'>+			j++;</div><div class='add'>+			msleep_interruptible(100);</div><div class='add'>+		} while (cardp-&gt;bootcmdresp == 0 &amp;&amp; j &lt; 10);</div><div class='add'>+	} while (cardp-&gt;bootcmdresp == 0 &amp;&amp; i &lt; 5);</div><div class='add'>+</div><div class='add'>+	if (cardp-&gt;bootcmdresp &lt;= 0) {</div><div class='add'>+		if (--reset_count &gt;= 0) {</div><div class='add'>+			if_usb_reset_device(cardp);</div><div class='add'>+			goto restart;</div><div class='add'>+		}</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	i = 0;</div><div class='add'>+</div><div class='add'>+	cardp-&gt;totalbytes = 0;</div><div class='add'>+	cardp-&gt;fwlastblksent = 0;</div><div class='add'>+	cardp-&gt;CRC_OK = 1;</div><div class='add'>+	cardp-&gt;fwdnldover = 0;</div><div class='add'>+	cardp-&gt;fwseqnum = -1;</div><div class='add'>+	cardp-&gt;totalbytes = 0;</div><div class='add'>+	cardp-&gt;fwfinalblk = 0;</div><div class='add'>+</div><div class='add'>+	/* Send the first firmware packet... */</div><div class='add'>+	if_usb_send_fw_pkt(cardp);</div><div class='add'>+</div><div class='add'>+	/* ... and wait for the process to complete */</div><div class='add'>+	wait_event_interruptible(cardp-&gt;fw_wq, cardp-&gt;priv-&gt;surpriseremoved ||</div><div class='add'>+					       cardp-&gt;fwdnldover);</div><div class='add'>+</div><div class='add'>+	del_timer_sync(&amp;cardp-&gt;fw_timeout);</div><div class='add'>+	usb_kill_urb(cardp-&gt;rx_urb);</div><div class='add'>+</div><div class='add'>+	if (!cardp-&gt;fwdnldover) {</div><div class='add'>+		printk(KERN_INFO "libertastf: failed to load fw,"</div><div class='add'>+				 " resetting device!\n");</div><div class='add'>+		if (--reset_count &gt;= 0) {</div><div class='add'>+			if_usb_reset_device(cardp);</div><div class='add'>+			goto restart;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		printk(KERN_INFO "libertastf: fw download failure\n");</div><div class='add'>+		ret = -1;</div><div class='add'>+		goto release_fw;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cardp-&gt;priv-&gt;fw_ready = 1;</div><div class='add'>+</div><div class='add'>+ release_fw:</div><div class='add'>+	release_firmware(cardp-&gt;fw);</div><div class='add'>+	cardp-&gt;fw = NULL;</div><div class='add'>+</div><div class='add'>+	if_usb_setup_firmware(cardp-&gt;priv);</div><div class='add'>+</div><div class='add'>+ done:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(if_usb_prog_firmware);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define if_usb_suspend NULL</div><div class='add'>+#define if_usb_resume NULL</div><div class='add'>+</div><div class='add'>+static struct usb_driver if_usb_driver = {</div><div class='add'>+	.name = DRV_NAME,</div><div class='add'>+	.probe = if_usb_probe,</div><div class='add'>+	.disconnect = if_usb_disconnect,</div><div class='add'>+	.id_table = if_usb_table,</div><div class='add'>+	.suspend = if_usb_suspend,</div><div class='add'>+	.resume = if_usb_resume,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init if_usb_init_module(void)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	ret = usb_register(&amp;if_usb_driver);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit if_usb_exit_module(void)</div><div class='add'>+{</div><div class='add'>+	usb_deregister(&amp;if_usb_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(if_usb_init_module);</div><div class='add'>+module_exit(if_usb_exit_module);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("8388 USB WLAN Thinfirm Driver");</div><div class='add'>+MODULE_AUTHOR("Cozybit Inc.");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/net/wireless/libertas_tf/if_usb.h b/drivers/net/wireless/libertas_tf/if_usb.h<br/>new file mode 100644<br/>index 000000000000..6fa5b3f59efe<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/libertas_tf/if_usb.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/libertas_tf/if_usb.h</a></div><div class='hunk'>@@ -0,0 +1,98 @@</div><div class='add'>+/*</div><div class='add'>+ *  Copyright (C) 2008, cozybit Inc.</div><div class='add'>+ *  Copyright (C) 2003-2006, Marvell International Ltd.</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License, or (at</div><div class='add'>+ *  your option) any later version.</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/wait.h&gt;</div><div class='add'>+#include &lt;linux/timer.h&gt;</div><div class='add'>+</div><div class='add'>+struct lbtf_private;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+  * This file contains definition for USB interface.</div><div class='add'>+  */</div><div class='add'>+#define CMD_TYPE_REQUEST		0xF00DFACE</div><div class='add'>+#define CMD_TYPE_DATA			0xBEADC0DE</div><div class='add'>+#define CMD_TYPE_INDICATION		0xBEEFFACE</div><div class='add'>+</div><div class='add'>+#define BOOT_CMD_FW_BY_USB		0x01</div><div class='add'>+#define BOOT_CMD_FW_IN_EEPROM		0x02</div><div class='add'>+#define BOOT_CMD_UPDATE_BOOT2		0x03</div><div class='add'>+#define BOOT_CMD_UPDATE_FW		0x04</div><div class='add'>+#define BOOT_CMD_MAGIC_NUMBER		0x4C56524D   /* LVRM */</div><div class='add'>+</div><div class='add'>+struct bootcmd {</div><div class='add'>+	__le32	magic;</div><div class='add'>+	uint8_t	cmd;</div><div class='add'>+	uint8_t	pad[11];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define BOOT_CMD_RESP_OK		0x0001</div><div class='add'>+#define BOOT_CMD_RESP_FAIL		0x0000</div><div class='add'>+</div><div class='add'>+struct bootcmdresp {</div><div class='add'>+	__le32	magic;</div><div class='add'>+	uint8_t	cmd;</div><div class='add'>+	uint8_t	result;</div><div class='add'>+	uint8_t	pad[2];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/** USB card description structure*/</div><div class='add'>+struct if_usb_card {</div><div class='add'>+	struct usb_device *udev;</div><div class='add'>+	struct urb *rx_urb, *tx_urb, *cmd_urb;</div><div class='add'>+	struct lbtf_private *priv;</div><div class='add'>+</div><div class='add'>+	struct sk_buff *rx_skb;</div><div class='add'>+</div><div class='add'>+	uint8_t ep_in;</div><div class='add'>+	uint8_t ep_out;</div><div class='add'>+</div><div class='add'>+	int8_t bootcmdresp;</div><div class='add'>+</div><div class='add'>+	int ep_in_size;</div><div class='add'>+</div><div class='add'>+	void *ep_out_buf;</div><div class='add'>+	int ep_out_size;</div><div class='add'>+</div><div class='add'>+	const struct firmware *fw;</div><div class='add'>+	struct timer_list fw_timeout;</div><div class='add'>+	wait_queue_head_t fw_wq;</div><div class='add'>+	uint32_t fwseqnum;</div><div class='add'>+	uint32_t totalbytes;</div><div class='add'>+	uint32_t fwlastblksent;</div><div class='add'>+	uint8_t CRC_OK;</div><div class='add'>+	uint8_t fwdnldover;</div><div class='add'>+	uint8_t fwfinalblk;</div><div class='add'>+</div><div class='add'>+	__le16 boot2_version;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/** fwheader */</div><div class='add'>+struct fwheader {</div><div class='add'>+	__le32 dnldcmd;</div><div class='add'>+	__le32 baseaddr;</div><div class='add'>+	__le32 datalength;</div><div class='add'>+	__le32 CRC;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define FW_MAX_DATA_BLK_SIZE	600</div><div class='add'>+/** FWData */</div><div class='add'>+struct fwdata {</div><div class='add'>+	struct fwheader hdr;</div><div class='add'>+	__le32 seqnum;</div><div class='add'>+	uint8_t data[0];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/** fwsyncheader */</div><div class='add'>+struct fwsyncheader {</div><div class='add'>+	__le32 cmd;</div><div class='add'>+	__le32 seqnum;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define FW_HAS_DATA_TO_RECV		0x00000001</div><div class='add'>+#define FW_HAS_LAST_BLOCK		0x00000004</div><div class='head'>diff --git a/drivers/net/wireless/libertas_tf/libertas_tf.h b/drivers/net/wireless/libertas_tf/libertas_tf.h<br/>new file mode 100644<br/>index 000000000000..8995cd7c29bf<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/libertas_tf/libertas_tf.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/libertas_tf/libertas_tf.h</a></div><div class='hunk'>@@ -0,0 +1,514 @@</div><div class='add'>+/*</div><div class='add'>+ *  Copyright (C) 2008, cozybit Inc.</div><div class='add'>+ *  Copyright (C) 2007, Red Hat, Inc.</div><div class='add'>+ *  Copyright (C) 2003-2006, Marvell International Ltd.</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License, or (at</div><div class='add'>+ *  your option) any later version.</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/kthread.h&gt;</div><div class='add'>+#include &lt;net/mac80211.h&gt;</div><div class='add'>+</div><div class='add'>+#ifndef DRV_NAME</div><div class='add'>+#define DRV_NAME "libertas_tf"</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define	MRVL_DEFAULT_RETRIES			9</div><div class='add'>+#define MRVL_PER_PACKET_RATE			0x10</div><div class='add'>+#define MRVL_MAX_BCN_SIZE			440</div><div class='add'>+#define CMD_OPTION_WAITFORRSP			0x0002</div><div class='add'>+</div><div class='add'>+/* Return command are almost always the same as the host command, but with</div><div class='add'>+ * bit 15 set high.  There are a few exceptions, though...</div><div class='add'>+ */</div><div class='add'>+#define CMD_RET(cmd)			(0x8000 | cmd)</div><div class='add'>+</div><div class='add'>+/* Command codes */</div><div class='add'>+#define CMD_GET_HW_SPEC				0x0003</div><div class='add'>+#define CMD_802_11_RESET			0x0005</div><div class='add'>+#define CMD_MAC_MULTICAST_ADR			0x0010</div><div class='add'>+#define CMD_802_11_RADIO_CONTROL		0x001c</div><div class='add'>+#define CMD_802_11_RF_CHANNEL			0x001d</div><div class='add'>+#define CMD_802_11_RF_TX_POWER			0x001e</div><div class='add'>+#define CMD_MAC_CONTROL				0x0028</div><div class='add'>+#define CMD_802_11_MAC_ADDRESS			0x004d</div><div class='add'>+#define	CMD_SET_BOOT2_VER			0x00a5</div><div class='add'>+#define CMD_802_11_BEACON_CTRL			0x00b0</div><div class='add'>+#define CMD_802_11_BEACON_SET			0x00cb</div><div class='add'>+#define CMD_802_11_SET_MODE			0x00cc</div><div class='add'>+#define CMD_802_11_SET_BSSID			0x00cd</div><div class='add'>+</div><div class='add'>+#define CMD_ACT_GET			0x0000</div><div class='add'>+#define CMD_ACT_SET			0x0001</div><div class='add'>+</div><div class='add'>+/* Define action or option for CMD_802_11_RESET */</div><div class='add'>+#define CMD_ACT_HALT			0x0003</div><div class='add'>+</div><div class='add'>+/* Define action or option for CMD_MAC_CONTROL */</div><div class='add'>+#define CMD_ACT_MAC_RX_ON			0x0001</div><div class='add'>+#define CMD_ACT_MAC_TX_ON			0x0002</div><div class='add'>+#define CMD_ACT_MAC_MULTICAST_ENABLE		0x0020</div><div class='add'>+#define CMD_ACT_MAC_BROADCAST_ENABLE		0x0040</div><div class='add'>+#define CMD_ACT_MAC_PROMISCUOUS_ENABLE		0x0080</div><div class='add'>+#define CMD_ACT_MAC_ALL_MULTICAST_ENABLE	0x0100</div><div class='add'>+</div><div class='add'>+/* Define action or option for CMD_802_11_RADIO_CONTROL */</div><div class='add'>+#define CMD_TYPE_AUTO_PREAMBLE		0x0001</div><div class='add'>+#define CMD_TYPE_SHORT_PREAMBLE		0x0002</div><div class='add'>+#define CMD_TYPE_LONG_PREAMBLE		0x0003</div><div class='add'>+</div><div class='add'>+#define TURN_ON_RF			0x01</div><div class='add'>+#define RADIO_ON			0x01</div><div class='add'>+#define RADIO_OFF			0x00</div><div class='add'>+</div><div class='add'>+#define SET_AUTO_PREAMBLE		0x05</div><div class='add'>+#define SET_SHORT_PREAMBLE		0x03</div><div class='add'>+#define SET_LONG_PREAMBLE		0x01</div><div class='add'>+</div><div class='add'>+/* Define action or option for CMD_802_11_RF_CHANNEL */</div><div class='add'>+#define CMD_OPT_802_11_RF_CHANNEL_GET	0x00</div><div class='add'>+#define CMD_OPT_802_11_RF_CHANNEL_SET	0x01</div><div class='add'>+</div><div class='add'>+/* Codes for CMD_802_11_SET_MODE */</div><div class='add'>+enum lbtf_mode {</div><div class='add'>+	LBTF_PASSIVE_MODE,</div><div class='add'>+	LBTF_STA_MODE,</div><div class='add'>+	LBTF_AP_MODE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/** Card Event definition */</div><div class='add'>+#define MACREG_INT_CODE_FIRMWARE_READY		48</div><div class='add'>+/** Buffer Constants */</div><div class='add'>+</div><div class='add'>+/*	The size of SQ memory PPA, DPA are 8 DWORDs, that keep the physical</div><div class='add'>+*	addresses of TxPD buffers. Station has only 8 TxPD available, Whereas</div><div class='add'>+*	driver has more local TxPDs. Each TxPD on the host memory is associated</div><div class='add'>+*	with a Tx control node. The driver maintains 8 RxPD descriptors for</div><div class='add'>+*	station firmware to store Rx packet information.</div><div class='add'>+*</div><div class='add'>+*	Current version of MAC has a 32x6 multicast address buffer.</div><div class='add'>+*</div><div class='add'>+*	802.11b can have up to  14 channels, the driver keeps the</div><div class='add'>+*	BSSID(MAC address) of each APs or Ad hoc stations it has sensed.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#define MRVDRV_MAX_MULTICAST_LIST_SIZE	32</div><div class='add'>+#define LBS_NUM_CMD_BUFFERS             10</div><div class='add'>+#define LBS_CMD_BUFFER_SIZE             (2 * 1024)</div><div class='add'>+#define MRVDRV_MAX_CHANNEL_SIZE		14</div><div class='add'>+#define MRVDRV_SNAP_HEADER_LEN          8</div><div class='add'>+</div><div class='add'>+#define	LBS_UPLD_SIZE			2312</div><div class='add'>+#define DEV_NAME_LEN			32</div><div class='add'>+</div><div class='add'>+/** Misc constants */</div><div class='add'>+/* This section defines 802.11 specific contants */</div><div class='add'>+</div><div class='add'>+#define MRVDRV_MAX_REGION_CODE			6</div><div class='add'>+/**</div><div class='add'>+ * the table to keep region code</div><div class='add'>+ */</div><div class='add'>+#define LBTF_REGDOMAIN_US	0x10</div><div class='add'>+#define LBTF_REGDOMAIN_CA	0x20</div><div class='add'>+#define LBTF_REGDOMAIN_EU	0x30</div><div class='add'>+#define LBTF_REGDOMAIN_SP	0x31</div><div class='add'>+#define LBTF_REGDOMAIN_FR	0x32</div><div class='add'>+#define LBTF_REGDOMAIN_JP	0x40</div><div class='add'>+</div><div class='add'>+#define SBI_EVENT_CAUSE_SHIFT		3</div><div class='add'>+</div><div class='add'>+/** RxPD status */</div><div class='add'>+</div><div class='add'>+#define MRVDRV_RXPD_STATUS_OK                0x0001</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* This is for firmware specific length */</div><div class='add'>+#define EXTRA_LEN	36</div><div class='add'>+</div><div class='add'>+#define MRVDRV_ETH_TX_PACKET_BUFFER_SIZE \</div><div class='add'>+	(ETH_FRAME_LEN + sizeof(struct txpd) + EXTRA_LEN)</div><div class='add'>+</div><div class='add'>+#define MRVDRV_ETH_RX_PACKET_BUFFER_SIZE \</div><div class='add'>+	(ETH_FRAME_LEN + sizeof(struct rxpd) \</div><div class='add'>+	 + MRVDRV_SNAP_HEADER_LEN + EXTRA_LEN)</div><div class='add'>+</div><div class='add'>+#define	CMD_F_HOSTCMD		(1 &lt;&lt; 0)</div><div class='add'>+#define FW_CAPINFO_WPA  	(1 &lt;&lt; 0)</div><div class='add'>+</div><div class='add'>+#define RF_ANTENNA_1		0x1</div><div class='add'>+#define RF_ANTENNA_2		0x2</div><div class='add'>+#define RF_ANTENNA_AUTO		0xFFFF</div><div class='add'>+</div><div class='add'>+#define LBTF_EVENT_BCN_SENT	55</div><div class='add'>+</div><div class='add'>+/** Global Variable Declaration */</div><div class='add'>+/** mv_ms_type */</div><div class='add'>+enum mv_ms_type {</div><div class='add'>+	MVMS_DAT = 0,</div><div class='add'>+	MVMS_CMD = 1,</div><div class='add'>+	MVMS_TXDONE = 2,</div><div class='add'>+	MVMS_EVENT</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern struct workqueue_struct *lbtf_wq;</div><div class='add'>+</div><div class='add'>+struct lbtf_private;</div><div class='add'>+</div><div class='add'>+struct lbtf_offset_value {</div><div class='add'>+	u32 offset;</div><div class='add'>+	u32 value;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct channel_range {</div><div class='add'>+	u8 regdomain;</div><div class='add'>+	u8 start;</div><div class='add'>+	u8 end; /* exclusive (channel must be less than end) */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct if_usb_card;</div><div class='add'>+</div><div class='add'>+/** Private structure for the MV device */</div><div class='add'>+struct lbtf_private {</div><div class='add'>+	void *card;</div><div class='add'>+	struct ieee80211_hw *hw;</div><div class='add'>+</div><div class='add'>+	/* Command response buffer */</div><div class='add'>+	u8 cmd_resp_buff[LBS_UPLD_SIZE];</div><div class='add'>+	/* Download sent:</div><div class='add'>+	   bit0 1/0=data_sent/data_tx_done,</div><div class='add'>+	   bit1 1/0=cmd_sent/cmd_tx_done,</div><div class='add'>+	   all other bits reserved 0 */</div><div class='add'>+	struct ieee80211_vif *vif;</div><div class='add'>+</div><div class='add'>+	struct work_struct cmd_work;</div><div class='add'>+	struct work_struct tx_work;</div><div class='add'>+	/** Hardware access */</div><div class='add'>+	int (*hw_host_to_card) (struct lbtf_private *priv, u8 type, u8 *payload, u16 nb);</div><div class='add'>+	int (*hw_prog_firmware) (struct if_usb_card *cardp);</div><div class='add'>+	int (*hw_reset_device) (struct if_usb_card *cardp);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	/** Wlan adapter data structure*/</div><div class='add'>+	/** STATUS variables */</div><div class='add'>+	u32 fwrelease;</div><div class='add'>+	u32 fwcapinfo;</div><div class='add'>+	/* protected with big lock */</div><div class='add'>+</div><div class='add'>+	struct mutex lock;</div><div class='add'>+</div><div class='add'>+	/** command-related variables */</div><div class='add'>+	u16 seqnum;</div><div class='add'>+	/* protected by big lock */</div><div class='add'>+</div><div class='add'>+	struct cmd_ctrl_node *cmd_array;</div><div class='add'>+	/** Current command */</div><div class='add'>+	struct cmd_ctrl_node *cur_cmd;</div><div class='add'>+	/** command Queues */</div><div class='add'>+	/** Free command buffers */</div><div class='add'>+	struct list_head cmdfreeq;</div><div class='add'>+	/** Pending command buffers */</div><div class='add'>+	struct list_head cmdpendingq;</div><div class='add'>+</div><div class='add'>+	/** spin locks */</div><div class='add'>+	spinlock_t driver_lock;</div><div class='add'>+</div><div class='add'>+	/** Timers */</div><div class='add'>+	struct timer_list command_timer;</div><div class='add'>+	int nr_retries;</div><div class='add'>+	int cmd_timed_out;</div><div class='add'>+</div><div class='add'>+	u8 cmd_response_rxed;</div><div class='add'>+</div><div class='add'>+	/** capability Info used in Association, start, join */</div><div class='add'>+	u16 capability;</div><div class='add'>+</div><div class='add'>+	/** MAC address information */</div><div class='add'>+	u8 current_addr[ETH_ALEN];</div><div class='add'>+	u8 multicastlist[MRVDRV_MAX_MULTICAST_LIST_SIZE][ETH_ALEN];</div><div class='add'>+	u32 nr_of_multicastmacaddr;</div><div class='add'>+	int cur_freq;</div><div class='add'>+</div><div class='add'>+	struct sk_buff *skb_to_tx;</div><div class='add'>+	struct sk_buff *tx_skb;</div><div class='add'>+</div><div class='add'>+	/** NIC Operation characteristics */</div><div class='add'>+	u16 mac_control;</div><div class='add'>+	u16 regioncode;</div><div class='add'>+	struct channel_range range;</div><div class='add'>+</div><div class='add'>+	u8 radioon;</div><div class='add'>+	u32 preamble;</div><div class='add'>+</div><div class='add'>+	struct ieee80211_channel channels[14];</div><div class='add'>+	struct ieee80211_rate rates[12];</div><div class='add'>+	struct ieee80211_supported_band band;</div><div class='add'>+	struct lbtf_offset_value offsetvalue;</div><div class='add'>+</div><div class='add'>+	u8 fw_ready;</div><div class='add'>+	u8 surpriseremoved;</div><div class='add'>+	struct sk_buff_head bc_ps_buf;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* 802.11-related definitions */</div><div class='add'>+</div><div class='add'>+/* TxPD descriptor */</div><div class='add'>+struct txpd {</div><div class='add'>+	/* Current Tx packet status */</div><div class='add'>+	__le32 tx_status;</div><div class='add'>+	/* Tx control */</div><div class='add'>+	__le32 tx_control;</div><div class='add'>+	__le32 tx_packet_location;</div><div class='add'>+	/* Tx packet length */</div><div class='add'>+	__le16 tx_packet_length;</div><div class='add'>+	/* First 2 byte of destination MAC address */</div><div class='add'>+	u8 tx_dest_addr_high[2];</div><div class='add'>+	/* Last 4 byte of destination MAC address */</div><div class='add'>+	u8 tx_dest_addr_low[4];</div><div class='add'>+	/* Pkt Priority */</div><div class='add'>+	u8 priority;</div><div class='add'>+	/* Pkt Trasnit Power control */</div><div class='add'>+	u8 powermgmt;</div><div class='add'>+	/* Time the packet has been queued in the driver (units = 2ms) */</div><div class='add'>+	u8 pktdelay_2ms;</div><div class='add'>+	/* reserved */</div><div class='add'>+	u8 reserved1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* RxPD Descriptor */</div><div class='add'>+struct rxpd {</div><div class='add'>+	/* Current Rx packet status */</div><div class='add'>+	__le16 status;</div><div class='add'>+</div><div class='add'>+	/* SNR */</div><div class='add'>+	u8 snr;</div><div class='add'>+</div><div class='add'>+	/* Tx control */</div><div class='add'>+	u8 rx_control;</div><div class='add'>+</div><div class='add'>+	/* Pkt length */</div><div class='add'>+	__le16 pkt_len;</div><div class='add'>+</div><div class='add'>+	/* Noise Floor */</div><div class='add'>+	u8 nf;</div><div class='add'>+</div><div class='add'>+	/* Rx Packet Rate */</div><div class='add'>+	u8 rx_rate;</div><div class='add'>+</div><div class='add'>+	/* Pkt addr */</div><div class='add'>+	__le32 pkt_ptr;</div><div class='add'>+</div><div class='add'>+	/* Next Rx RxPD addr */</div><div class='add'>+	__le32 next_rxpd_ptr;</div><div class='add'>+</div><div class='add'>+	/* Pkt Priority */</div><div class='add'>+	u8 priority;</div><div class='add'>+	u8 reserved[3];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct cmd_header {</div><div class='add'>+	__le16 command;</div><div class='add'>+	__le16 size;</div><div class='add'>+	__le16 seqnum;</div><div class='add'>+	__le16 result;</div><div class='add'>+} __attribute__ ((packed));</div><div class='add'>+</div><div class='add'>+struct cmd_ctrl_node {</div><div class='add'>+	struct list_head list;</div><div class='add'>+	int result;</div><div class='add'>+	/* command response */</div><div class='add'>+	int (*callback)(struct lbtf_private *,</div><div class='add'>+			unsigned long, struct cmd_header *);</div><div class='add'>+	unsigned long callback_arg;</div><div class='add'>+	/* command data */</div><div class='add'>+	struct cmd_header *cmdbuf;</div><div class='add'>+	/* wait queue */</div><div class='add'>+	u16 cmdwaitqwoken;</div><div class='add'>+	wait_queue_head_t cmdwait_q;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Define data structure for CMD_GET_HW_SPEC</div><div class='add'>+ * This structure defines the response for the GET_HW_SPEC command</div><div class='add'>+ */</div><div class='add'>+struct cmd_ds_get_hw_spec {</div><div class='add'>+	struct cmd_header hdr;</div><div class='add'>+</div><div class='add'>+	/* HW Interface version number */</div><div class='add'>+	__le16 hwifversion;</div><div class='add'>+	/* HW version number */</div><div class='add'>+	__le16 version;</div><div class='add'>+	/* Max number of TxPD FW can handle */</div><div class='add'>+	__le16 nr_txpd;</div><div class='add'>+	/* Max no of Multicast address */</div><div class='add'>+	__le16 nr_mcast_adr;</div><div class='add'>+	/* MAC address */</div><div class='add'>+	u8 permanentaddr[6];</div><div class='add'>+</div><div class='add'>+	/* region Code */</div><div class='add'>+	__le16 regioncode;</div><div class='add'>+</div><div class='add'>+	/* Number of antenna used */</div><div class='add'>+	__le16 nr_antenna;</div><div class='add'>+</div><div class='add'>+	/* FW release number, example 0x01030304 = 2.3.4p1 */</div><div class='add'>+	__le32 fwrelease;</div><div class='add'>+</div><div class='add'>+	/* Base Address of TxPD queue */</div><div class='add'>+	__le32 wcb_base;</div><div class='add'>+	/* Read Pointer of RxPd queue */</div><div class='add'>+	__le32 rxpd_rdptr;</div><div class='add'>+</div><div class='add'>+	/* Write Pointer of RxPd queue */</div><div class='add'>+	__le32 rxpd_wrptr;</div><div class='add'>+</div><div class='add'>+	/*FW/HW capability */</div><div class='add'>+	__le32 fwcapinfo;</div><div class='add'>+} __attribute__ ((packed));</div><div class='add'>+</div><div class='add'>+struct cmd_ds_mac_control {</div><div class='add'>+	struct cmd_header hdr;</div><div class='add'>+	__le16 action;</div><div class='add'>+	u16 reserved;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct cmd_ds_802_11_mac_address {</div><div class='add'>+	struct cmd_header hdr;</div><div class='add'>+</div><div class='add'>+	__le16 action;</div><div class='add'>+	uint8_t macadd[ETH_ALEN];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct cmd_ds_mac_multicast_addr {</div><div class='add'>+	struct cmd_header hdr;</div><div class='add'>+</div><div class='add'>+	__le16 action;</div><div class='add'>+	__le16 nr_of_adrs;</div><div class='add'>+	u8 maclist[ETH_ALEN * MRVDRV_MAX_MULTICAST_LIST_SIZE];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct cmd_ds_set_mode {</div><div class='add'>+	struct cmd_header hdr;</div><div class='add'>+</div><div class='add'>+	__le16 mode;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct cmd_ds_set_bssid {</div><div class='add'>+	struct cmd_header hdr;</div><div class='add'>+</div><div class='add'>+	u8 bssid[6];</div><div class='add'>+	u8 activate;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct cmd_ds_802_11_radio_control {</div><div class='add'>+	struct cmd_header hdr;</div><div class='add'>+</div><div class='add'>+	__le16 action;</div><div class='add'>+	__le16 control;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+struct cmd_ds_802_11_rf_channel {</div><div class='add'>+	struct cmd_header hdr;</div><div class='add'>+</div><div class='add'>+	__le16 action;</div><div class='add'>+	__le16 channel;</div><div class='add'>+	__le16 rftype;      /* unused */</div><div class='add'>+	__le16 reserved;    /* unused */</div><div class='add'>+	u8 channellist[32]; /* unused */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct cmd_ds_set_boot2_ver {</div><div class='add'>+	struct cmd_header hdr;</div><div class='add'>+</div><div class='add'>+	__le16 action;</div><div class='add'>+	__le16 version;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct cmd_ds_802_11_reset {</div><div class='add'>+	struct cmd_header hdr;</div><div class='add'>+</div><div class='add'>+	__le16 action;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct cmd_ds_802_11_beacon_control {</div><div class='add'>+	struct cmd_header hdr;</div><div class='add'>+</div><div class='add'>+	__le16 action;</div><div class='add'>+	__le16 beacon_enable;</div><div class='add'>+	__le16 beacon_period;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct cmd_ds_802_11_beacon_set {</div><div class='add'>+	struct cmd_header hdr;</div><div class='add'>+</div><div class='add'>+	__le16 len;</div><div class='add'>+	u8 beacon[MRVL_MAX_BCN_SIZE];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct lbtf_private;</div><div class='add'>+struct cmd_ctrl_node;</div><div class='add'>+</div><div class='add'>+/** Function Prototype Declaration */</div><div class='add'>+void lbtf_set_mac_control(struct lbtf_private *priv);</div><div class='add'>+</div><div class='add'>+int lbtf_free_cmd_buffer(struct lbtf_private *priv);</div><div class='add'>+</div><div class='add'>+int lbtf_allocate_cmd_buffer(struct lbtf_private *priv);</div><div class='add'>+int lbtf_execute_next_command(struct lbtf_private *priv);</div><div class='add'>+int lbtf_set_radio_control(struct lbtf_private *priv);</div><div class='add'>+int lbtf_update_hw_spec(struct lbtf_private *priv);</div><div class='add'>+int lbtf_cmd_set_mac_multicast_addr(struct lbtf_private *priv);</div><div class='add'>+void lbtf_set_mode(struct lbtf_private *priv, enum lbtf_mode mode);</div><div class='add'>+void lbtf_set_bssid(struct lbtf_private *priv, bool activate, u8 *bssid);</div><div class='add'>+int lbtf_set_mac_address(struct lbtf_private *priv, uint8_t *mac_addr);</div><div class='add'>+</div><div class='add'>+int lbtf_set_channel(struct lbtf_private *priv, u8 channel);</div><div class='add'>+</div><div class='add'>+int lbtf_beacon_set(struct lbtf_private *priv, struct sk_buff *beacon);</div><div class='add'>+int lbtf_beacon_ctrl(struct lbtf_private *priv, bool beacon_enable,</div><div class='add'>+		     int beacon_int);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+int lbtf_process_rx_command(struct lbtf_private *priv);</div><div class='add'>+void lbtf_complete_command(struct lbtf_private *priv, struct cmd_ctrl_node *cmd,</div><div class='add'>+			  int result);</div><div class='add'>+void lbtf_cmd_response_rx(struct lbtf_private *priv);</div><div class='add'>+</div><div class='add'>+/* main.c */</div><div class='add'>+struct chan_freq_power *lbtf_get_region_cfp_table(u8 region,</div><div class='add'>+	int *cfp_no);</div><div class='add'>+struct lbtf_private *lbtf_add_card(void *card, struct device *dmdev);</div><div class='add'>+int lbtf_remove_card(struct lbtf_private *priv);</div><div class='add'>+int lbtf_start_card(struct lbtf_private *priv);</div><div class='add'>+int lbtf_rx(struct lbtf_private *priv, struct sk_buff *skb);</div><div class='add'>+void lbtf_send_tx_feedback(struct lbtf_private *priv, u8 retrycnt, u8 fail);</div><div class='add'>+void lbtf_bcn_sent(struct lbtf_private *priv);</div><div class='add'>+</div><div class='add'>+/* support functions for cmd.c */</div><div class='add'>+/* lbtf_cmd() infers the size of the buffer to copy data back into, from</div><div class='add'>+   the size of the target of the pointer. Since the command to be sent</div><div class='add'>+   may often be smaller, that size is set in cmd-&gt;size by the caller.*/</div><div class='add'>+#define lbtf_cmd(priv, cmdnr, cmd, cb, cb_arg)	({		\</div><div class='add'>+	uint16_t __sz = le16_to_cpu((cmd)-&gt;hdr.size);		\</div><div class='add'>+	(cmd)-&gt;hdr.size = cpu_to_le16(sizeof(*(cmd)));		\</div><div class='add'>+	__lbtf_cmd(priv, cmdnr, &amp;(cmd)-&gt;hdr, __sz, cb, cb_arg);	\</div><div class='add'>+})</div><div class='add'>+</div><div class='add'>+#define lbtf_cmd_with_response(priv, cmdnr, cmd)	\</div><div class='add'>+	lbtf_cmd(priv, cmdnr, cmd, lbtf_cmd_copyback, (unsigned long) (cmd))</div><div class='add'>+</div><div class='add'>+void lbtf_cmd_async(struct lbtf_private *priv, uint16_t command,</div><div class='add'>+	struct cmd_header *in_cmd, int in_cmd_size);</div><div class='add'>+</div><div class='add'>+int __lbtf_cmd(struct lbtf_private *priv, uint16_t command,</div><div class='add'>+	      struct cmd_header *in_cmd, int in_cmd_size,</div><div class='add'>+	      int (*callback)(struct lbtf_private *, unsigned long,</div><div class='add'>+			      struct cmd_header *),</div><div class='add'>+	      unsigned long callback_arg);</div><div class='add'>+</div><div class='add'>+int lbtf_cmd_copyback(struct lbtf_private *priv, unsigned long extra,</div><div class='add'>+		     struct cmd_header *resp);</div><div class='head'>diff --git a/drivers/net/wireless/libertas_tf/main.c b/drivers/net/wireless/libertas_tf/main.c<br/>new file mode 100644<br/>index 000000000000..feff945ad856<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/libertas_tf/main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/libertas_tf/main.c</a></div><div class='hunk'>@@ -0,0 +1,662 @@</div><div class='add'>+/*</div><div class='add'>+ *  Copyright (C) 2008, cozybit Inc.</div><div class='add'>+ *  Copyright (C) 2003-2006, Marvell International Ltd.</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License, or (at</div><div class='add'>+ *  your option) any later version.</div><div class='add'>+ */</div><div class='add'>+#include "libertas_tf.h"</div><div class='add'>+#include "linux/etherdevice.h"</div><div class='add'>+</div><div class='add'>+#define DRIVER_RELEASE_VERSION "004.p0"</div><div class='add'>+/* thinfirm version: 5.132.X.pX */</div><div class='add'>+#define LBTF_FW_VER_MIN		0x05840300</div><div class='add'>+#define LBTF_FW_VER_MAX		0x0584ffff</div><div class='add'>+#define QOS_CONTROL_LEN		2</div><div class='add'>+</div><div class='add'>+static const char lbtf_driver_version[] = "THINFIRM-USB8388-" DRIVER_RELEASE_VERSION;</div><div class='add'>+struct workqueue_struct *lbtf_wq;</div><div class='add'>+</div><div class='add'>+static const struct ieee80211_channel lbtf_channels[] = {</div><div class='add'>+	{ .center_freq = 2412, .hw_value = 1 },</div><div class='add'>+	{ .center_freq = 2417, .hw_value = 2 },</div><div class='add'>+	{ .center_freq = 2422, .hw_value = 3 },</div><div class='add'>+	{ .center_freq = 2427, .hw_value = 4 },</div><div class='add'>+	{ .center_freq = 2432, .hw_value = 5 },</div><div class='add'>+	{ .center_freq = 2437, .hw_value = 6 },</div><div class='add'>+	{ .center_freq = 2442, .hw_value = 7 },</div><div class='add'>+	{ .center_freq = 2447, .hw_value = 8 },</div><div class='add'>+	{ .center_freq = 2452, .hw_value = 9 },</div><div class='add'>+	{ .center_freq = 2457, .hw_value = 10 },</div><div class='add'>+	{ .center_freq = 2462, .hw_value = 11 },</div><div class='add'>+	{ .center_freq = 2467, .hw_value = 12 },</div><div class='add'>+	{ .center_freq = 2472, .hw_value = 13 },</div><div class='add'>+	{ .center_freq = 2484, .hw_value = 14 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* This table contains the hardware specific values for the modulation rates. */</div><div class='add'>+static const struct ieee80211_rate lbtf_rates[] = {</div><div class='add'>+	{ .bitrate = 10,</div><div class='add'>+	  .hw_value = 0, },</div><div class='add'>+	{ .bitrate = 20,</div><div class='add'>+	  .hw_value = 1,</div><div class='add'>+	  .flags = IEEE80211_RATE_SHORT_PREAMBLE },</div><div class='add'>+	{ .bitrate = 55,</div><div class='add'>+	  .hw_value = 2,</div><div class='add'>+	  .flags = IEEE80211_RATE_SHORT_PREAMBLE },</div><div class='add'>+	{ .bitrate = 110,</div><div class='add'>+	  .hw_value = 3,</div><div class='add'>+	  .flags = IEEE80211_RATE_SHORT_PREAMBLE },</div><div class='add'>+	{ .bitrate = 60,</div><div class='add'>+	  .hw_value = 5,</div><div class='add'>+	  .flags = 0 },</div><div class='add'>+	{ .bitrate = 90,</div><div class='add'>+	  .hw_value = 6,</div><div class='add'>+	  .flags = 0 },</div><div class='add'>+	{ .bitrate = 120,</div><div class='add'>+	  .hw_value = 7,</div><div class='add'>+	  .flags = 0 },</div><div class='add'>+	{ .bitrate = 180,</div><div class='add'>+	  .hw_value = 8,</div><div class='add'>+	  .flags = 0 },</div><div class='add'>+	{ .bitrate = 240,</div><div class='add'>+	  .hw_value = 9,</div><div class='add'>+	  .flags = 0 },</div><div class='add'>+	{ .bitrate = 360,</div><div class='add'>+	  .hw_value = 10,</div><div class='add'>+	  .flags = 0 },</div><div class='add'>+	{ .bitrate = 480,</div><div class='add'>+	  .hw_value = 11,</div><div class='add'>+	  .flags = 0 },</div><div class='add'>+	{ .bitrate = 540,</div><div class='add'>+	  .hw_value = 12,</div><div class='add'>+	  .flags = 0 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void lbtf_cmd_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct lbtf_private *priv = container_of(work, struct lbtf_private,</div><div class='add'>+					 cmd_work);</div><div class='add'>+	spin_lock_irq(&amp;priv-&gt;driver_lock);</div><div class='add'>+	/* command response? */</div><div class='add'>+	if (priv-&gt;cmd_response_rxed) {</div><div class='add'>+		priv-&gt;cmd_response_rxed = 0;</div><div class='add'>+		spin_unlock_irq(&amp;priv-&gt;driver_lock);</div><div class='add'>+		lbtf_process_rx_command(priv);</div><div class='add'>+		spin_lock_irq(&amp;priv-&gt;driver_lock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;cmd_timed_out &amp;&amp; priv-&gt;cur_cmd) {</div><div class='add'>+		struct cmd_ctrl_node *cmdnode = priv-&gt;cur_cmd;</div><div class='add'>+</div><div class='add'>+		if (++priv-&gt;nr_retries &gt; 10) {</div><div class='add'>+			lbtf_complete_command(priv, cmdnode,</div><div class='add'>+					      -ETIMEDOUT);</div><div class='add'>+			priv-&gt;nr_retries = 0;</div><div class='add'>+		} else {</div><div class='add'>+			priv-&gt;cur_cmd = NULL;</div><div class='add'>+</div><div class='add'>+			/* Stick it back at the _top_ of the pending</div><div class='add'>+			 * queue for immediate resubmission */</div><div class='add'>+			list_add(&amp;cmdnode-&gt;list, &amp;priv-&gt;cmdpendingq);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	priv-&gt;cmd_timed_out = 0;</div><div class='add'>+	spin_unlock_irq(&amp;priv-&gt;driver_lock);</div><div class='add'>+</div><div class='add'>+	if (!priv-&gt;fw_ready)</div><div class='add'>+		return;</div><div class='add'>+	/* Execute the next command */</div><div class='add'>+	if (!priv-&gt;cur_cmd)</div><div class='add'>+		lbtf_execute_next_command(priv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *  lbtf_setup_firmware: initialize firmware.</div><div class='add'>+ *</div><div class='add'>+ *  @priv    A pointer to struct lbtf_private structure</div><div class='add'>+ *</div><div class='add'>+ *  Returns: 0 on success.</div><div class='add'>+ */</div><div class='add'>+static int lbtf_setup_firmware(struct lbtf_private *priv)</div><div class='add'>+{</div><div class='add'>+	int ret = -1;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Read priv address from HW</div><div class='add'>+	 */</div><div class='add'>+	memset(priv-&gt;current_addr, 0xff, ETH_ALEN);</div><div class='add'>+	ret = lbtf_update_hw_spec(priv);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ret = -1;</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	lbtf_set_mac_control(priv);</div><div class='add'>+	lbtf_set_radio_control(priv);</div><div class='add'>+</div><div class='add'>+	ret = 0;</div><div class='add'>+done:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *  This function handles the timeout of command sending.</div><div class='add'>+ *  It will re-send the same command again.</div><div class='add'>+ */</div><div class='add'>+static void command_timer_fn(unsigned long data)</div><div class='add'>+{</div><div class='add'>+	struct lbtf_private *priv = (struct lbtf_private *)data;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;priv-&gt;driver_lock, flags);</div><div class='add'>+</div><div class='add'>+	if (!priv-&gt;cur_cmd) {</div><div class='add'>+		printk(KERN_DEBUG "libertastf: command timer expired; "</div><div class='add'>+				  "no pending command\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	printk(KERN_DEBUG "libertas: command %x timed out\n",</div><div class='add'>+		le16_to_cpu(priv-&gt;cur_cmd-&gt;cmdbuf-&gt;command));</div><div class='add'>+</div><div class='add'>+	priv-&gt;cmd_timed_out = 1;</div><div class='add'>+	queue_work(lbtf_wq, &amp;priv-&gt;cmd_work);</div><div class='add'>+out:</div><div class='add'>+	spin_unlock_irqrestore(&amp;priv-&gt;driver_lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lbtf_init_adapter(struct lbtf_private *priv)</div><div class='add'>+{</div><div class='add'>+	memset(priv-&gt;current_addr, 0xff, ETH_ALEN);</div><div class='add'>+	mutex_init(&amp;priv-&gt;lock);</div><div class='add'>+</div><div class='add'>+	priv-&gt;vif = NULL;</div><div class='add'>+	setup_timer(&amp;priv-&gt;command_timer, command_timer_fn,</div><div class='add'>+		(unsigned long)priv);</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;priv-&gt;cmdfreeq);</div><div class='add'>+	INIT_LIST_HEAD(&amp;priv-&gt;cmdpendingq);</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;priv-&gt;driver_lock);</div><div class='add'>+</div><div class='add'>+	/* Allocate the command buffers */</div><div class='add'>+	if (lbtf_allocate_cmd_buffer(priv))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void lbtf_free_adapter(struct lbtf_private *priv)</div><div class='add'>+{</div><div class='add'>+	lbtf_free_cmd_buffer(priv);</div><div class='add'>+	del_timer(&amp;priv-&gt;command_timer);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lbtf_op_tx(struct ieee80211_hw *hw, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct lbtf_private *priv = hw-&gt;priv;</div><div class='add'>+</div><div class='add'>+	priv-&gt;skb_to_tx = skb;</div><div class='add'>+	queue_work(lbtf_wq, &amp;priv-&gt;tx_work);</div><div class='add'>+	/*</div><div class='add'>+	 * queue will be restarted when we receive transmission feedback if</div><div class='add'>+	 * there are no buffered multicast frames to send</div><div class='add'>+	 */</div><div class='add'>+	ieee80211_stop_queues(priv-&gt;hw);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void lbtf_tx_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct lbtf_private *priv = container_of(work, struct lbtf_private,</div><div class='add'>+					 tx_work);</div><div class='add'>+	unsigned int len;</div><div class='add'>+	struct ieee80211_tx_info *info;</div><div class='add'>+	struct txpd *txpd;</div><div class='add'>+	struct sk_buff *skb = NULL;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if ((priv-&gt;vif-&gt;type == NL80211_IFTYPE_AP) &amp;&amp;</div><div class='add'>+	    (!skb_queue_empty(&amp;priv-&gt;bc_ps_buf)))</div><div class='add'>+		skb = skb_dequeue(&amp;priv-&gt;bc_ps_buf);</div><div class='add'>+	else if (priv-&gt;skb_to_tx) {</div><div class='add'>+		skb = priv-&gt;skb_to_tx;</div><div class='add'>+		priv-&gt;skb_to_tx = NULL;</div><div class='add'>+	} else</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	len = skb-&gt;len;</div><div class='add'>+	info  = IEEE80211_SKB_CB(skb);</div><div class='add'>+	txpd = (struct txpd *)  skb_push(skb, sizeof(struct txpd));</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;surpriseremoved) {</div><div class='add'>+		dev_kfree_skb_any(skb);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(txpd, 0, sizeof(struct txpd));</div><div class='add'>+	/* Activate per-packet rate selection */</div><div class='add'>+	txpd-&gt;tx_control |= cpu_to_le32(MRVL_PER_PACKET_RATE |</div><div class='add'>+			     ieee80211_get_tx_rate(priv-&gt;hw, info)-&gt;hw_value);</div><div class='add'>+</div><div class='add'>+	/* copy destination address from 802.11 header */</div><div class='add'>+	memcpy(txpd-&gt;tx_dest_addr_high, skb-&gt;data + sizeof(struct txpd) + 4,</div><div class='add'>+		ETH_ALEN);</div><div class='add'>+	txpd-&gt;tx_packet_length = cpu_to_le16(len);</div><div class='add'>+	txpd-&gt;tx_packet_location = cpu_to_le32(sizeof(struct txpd));</div><div class='add'>+	BUG_ON(priv-&gt;tx_skb);</div><div class='add'>+	spin_lock_irq(&amp;priv-&gt;driver_lock);</div><div class='add'>+	priv-&gt;tx_skb = skb;</div><div class='add'>+	err = priv-&gt;hw_host_to_card(priv, MVMS_DAT, skb-&gt;data, skb-&gt;len);</div><div class='add'>+	spin_unlock_irq(&amp;priv-&gt;driver_lock);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_kfree_skb_any(skb);</div><div class='add'>+		priv-&gt;tx_skb = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lbtf_op_start(struct ieee80211_hw *hw)</div><div class='add'>+{</div><div class='add'>+	struct lbtf_private *priv = hw-&gt;priv;</div><div class='add'>+	void *card = priv-&gt;card;</div><div class='add'>+	int ret = -1;</div><div class='add'>+</div><div class='add'>+	if (!priv-&gt;fw_ready)</div><div class='add'>+		/* Upload firmware */</div><div class='add'>+		if (priv-&gt;hw_prog_firmware(card))</div><div class='add'>+			goto err_prog_firmware;</div><div class='add'>+</div><div class='add'>+	/* poke the firmware */</div><div class='add'>+	priv-&gt;capability = WLAN_CAPABILITY_SHORT_PREAMBLE;</div><div class='add'>+	priv-&gt;radioon = RADIO_ON;</div><div class='add'>+	priv-&gt;mac_control = CMD_ACT_MAC_RX_ON | CMD_ACT_MAC_TX_ON;</div><div class='add'>+	ret = lbtf_setup_firmware(priv);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_prog_firmware;</div><div class='add'>+</div><div class='add'>+	if ((priv-&gt;fwrelease &lt; LBTF_FW_VER_MIN) ||</div><div class='add'>+	    (priv-&gt;fwrelease &gt; LBTF_FW_VER_MAX)) {</div><div class='add'>+		ret = -1;</div><div class='add'>+		goto err_prog_firmware;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "libertastf: Marvell WLAN 802.11 thinfirm adapter\n");</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_prog_firmware:</div><div class='add'>+	priv-&gt;hw_reset_device(card);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void lbtf_op_stop(struct ieee80211_hw *hw)</div><div class='add'>+{</div><div class='add'>+	struct lbtf_private *priv = hw-&gt;priv;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	struct cmd_ctrl_node *cmdnode;</div><div class='add'>+	/* Flush pending command nodes */</div><div class='add'>+	spin_lock_irqsave(&amp;priv-&gt;driver_lock, flags);</div><div class='add'>+	list_for_each_entry(cmdnode, &amp;priv-&gt;cmdpendingq, list) {</div><div class='add'>+		cmdnode-&gt;result = -ENOENT;</div><div class='add'>+		cmdnode-&gt;cmdwaitqwoken = 1;</div><div class='add'>+		wake_up_interruptible(&amp;cmdnode-&gt;cmdwait_q);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;priv-&gt;driver_lock, flags);</div><div class='add'>+	cancel_work_sync(&amp;priv-&gt;cmd_work);</div><div class='add'>+	cancel_work_sync(&amp;priv-&gt;tx_work);</div><div class='add'>+	while ((skb = skb_dequeue(&amp;priv-&gt;bc_ps_buf)))</div><div class='add'>+		dev_kfree_skb_any(skb);</div><div class='add'>+	priv-&gt;radioon = RADIO_OFF;</div><div class='add'>+	lbtf_set_radio_control(priv);</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lbtf_op_add_interface(struct ieee80211_hw *hw,</div><div class='add'>+			struct ieee80211_if_init_conf *conf)</div><div class='add'>+{</div><div class='add'>+	struct lbtf_private *priv = hw-&gt;priv;</div><div class='add'>+	if (priv-&gt;vif != NULL)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	priv-&gt;vif = conf-&gt;vif;</div><div class='add'>+	switch (conf-&gt;type) {</div><div class='add'>+	case NL80211_IFTYPE_MESH_POINT:</div><div class='add'>+	case NL80211_IFTYPE_AP:</div><div class='add'>+		lbtf_set_mode(priv, LBTF_AP_MODE);</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_IFTYPE_STATION:</div><div class='add'>+		lbtf_set_mode(priv, LBTF_STA_MODE);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		priv-&gt;vif = NULL;</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+	lbtf_set_mac_address(priv, (u8 *) conf-&gt;mac_addr);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void lbtf_op_remove_interface(struct ieee80211_hw *hw,</div><div class='add'>+			struct ieee80211_if_init_conf *conf)</div><div class='add'>+{</div><div class='add'>+	struct lbtf_private *priv = hw-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;vif-&gt;type == NL80211_IFTYPE_AP ||</div><div class='add'>+	    priv-&gt;vif-&gt;type == NL80211_IFTYPE_MESH_POINT)</div><div class='add'>+		lbtf_beacon_ctrl(priv, 0, 0);</div><div class='add'>+	lbtf_set_mode(priv, LBTF_PASSIVE_MODE);</div><div class='add'>+	lbtf_set_bssid(priv, 0, NULL);</div><div class='add'>+	priv-&gt;vif = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lbtf_op_config(struct ieee80211_hw *hw, struct ieee80211_conf *conf)</div><div class='add'>+{</div><div class='add'>+	struct lbtf_private *priv = hw-&gt;priv;</div><div class='add'>+	if (conf-&gt;channel-&gt;center_freq != priv-&gt;cur_freq) {</div><div class='add'>+		priv-&gt;cur_freq = conf-&gt;channel-&gt;center_freq;</div><div class='add'>+		lbtf_set_channel(priv, conf-&gt;channel-&gt;hw_value);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lbtf_op_config_interface(struct ieee80211_hw *hw,</div><div class='add'>+			struct ieee80211_vif *vif,</div><div class='add'>+			struct ieee80211_if_conf *conf)</div><div class='add'>+{</div><div class='add'>+	struct lbtf_private *priv = hw-&gt;priv;</div><div class='add'>+	struct sk_buff *beacon;</div><div class='add'>+</div><div class='add'>+	switch (priv-&gt;vif-&gt;type) {</div><div class='add'>+	case NL80211_IFTYPE_AP:</div><div class='add'>+	case NL80211_IFTYPE_MESH_POINT:</div><div class='add'>+		beacon = ieee80211_beacon_get(hw, vif);</div><div class='add'>+		if (beacon) {</div><div class='add'>+			lbtf_beacon_set(priv, beacon);</div><div class='add'>+			kfree_skb(beacon);</div><div class='add'>+			lbtf_beacon_ctrl(priv, 1, hw-&gt;conf.beacon_int);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (conf-&gt;bssid) {</div><div class='add'>+		u8 null_bssid[ETH_ALEN] = {0};</div><div class='add'>+		bool activate = compare_ether_addr(conf-&gt;bssid, null_bssid);</div><div class='add'>+		lbtf_set_bssid(priv, activate, conf-&gt;bssid);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define SUPPORTED_FIF_FLAGS  (FIF_PROMISC_IN_BSS | FIF_ALLMULTI)</div><div class='add'>+static void lbtf_op_configure_filter(struct ieee80211_hw *hw,</div><div class='add'>+			unsigned int changed_flags,</div><div class='add'>+			unsigned int *new_flags,</div><div class='add'>+			int mc_count, struct dev_mc_list *mclist)</div><div class='add'>+{</div><div class='add'>+	struct lbtf_private *priv = hw-&gt;priv;</div><div class='add'>+	int old_mac_control = priv-&gt;mac_control;</div><div class='add'>+	int i;</div><div class='add'>+	changed_flags &amp;= SUPPORTED_FIF_FLAGS;</div><div class='add'>+	*new_flags &amp;= SUPPORTED_FIF_FLAGS;</div><div class='add'>+</div><div class='add'>+	if (!changed_flags)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (*new_flags &amp; (FIF_PROMISC_IN_BSS))</div><div class='add'>+		priv-&gt;mac_control |= CMD_ACT_MAC_PROMISCUOUS_ENABLE;</div><div class='add'>+	else</div><div class='add'>+		priv-&gt;mac_control &amp;= ~CMD_ACT_MAC_PROMISCUOUS_ENABLE;</div><div class='add'>+	if (*new_flags &amp; (FIF_ALLMULTI) ||</div><div class='add'>+	    mc_count &gt; MRVDRV_MAX_MULTICAST_LIST_SIZE) {</div><div class='add'>+		priv-&gt;mac_control |= CMD_ACT_MAC_ALL_MULTICAST_ENABLE;</div><div class='add'>+		priv-&gt;mac_control &amp;= ~CMD_ACT_MAC_MULTICAST_ENABLE;</div><div class='add'>+	} else if (mc_count) {</div><div class='add'>+		priv-&gt;mac_control |= CMD_ACT_MAC_MULTICAST_ENABLE;</div><div class='add'>+		priv-&gt;mac_control &amp;= ~CMD_ACT_MAC_ALL_MULTICAST_ENABLE;</div><div class='add'>+		priv-&gt;nr_of_multicastmacaddr = mc_count;</div><div class='add'>+		for (i = 0; i &lt; mc_count; i++) {</div><div class='add'>+			if (!mclist)</div><div class='add'>+				break;</div><div class='add'>+			memcpy(&amp;priv-&gt;multicastlist[i], mclist-&gt;da_addr,</div><div class='add'>+					ETH_ALEN);</div><div class='add'>+			mclist = mclist-&gt;next;</div><div class='add'>+		}</div><div class='add'>+		lbtf_cmd_set_mac_multicast_addr(priv);</div><div class='add'>+	} else {</div><div class='add'>+		priv-&gt;mac_control &amp;= ~(CMD_ACT_MAC_MULTICAST_ENABLE |</div><div class='add'>+				       CMD_ACT_MAC_ALL_MULTICAST_ENABLE);</div><div class='add'>+		if (priv-&gt;nr_of_multicastmacaddr) {</div><div class='add'>+			priv-&gt;nr_of_multicastmacaddr = 0;</div><div class='add'>+			lbtf_cmd_set_mac_multicast_addr(priv);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;mac_control != old_mac_control)</div><div class='add'>+		lbtf_set_mac_control(priv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void lbtf_op_bss_info_changed(struct ieee80211_hw *hw,</div><div class='add'>+			struct ieee80211_vif *vif,</div><div class='add'>+			struct ieee80211_bss_conf *bss_conf,</div><div class='add'>+			u32 changes)</div><div class='add'>+{</div><div class='add'>+	struct lbtf_private *priv = hw-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (changes &amp; BSS_CHANGED_ERP_PREAMBLE) {</div><div class='add'>+		if (bss_conf-&gt;use_short_preamble)</div><div class='add'>+			priv-&gt;preamble = CMD_TYPE_SHORT_PREAMBLE;</div><div class='add'>+		else</div><div class='add'>+			priv-&gt;preamble = CMD_TYPE_LONG_PREAMBLE;</div><div class='add'>+		lbtf_set_radio_control(priv);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct ieee80211_ops lbtf_ops = {</div><div class='add'>+	.tx			= lbtf_op_tx,</div><div class='add'>+	.start			= lbtf_op_start,</div><div class='add'>+	.stop			= lbtf_op_stop,</div><div class='add'>+	.add_interface		= lbtf_op_add_interface,</div><div class='add'>+	.remove_interface	= lbtf_op_remove_interface,</div><div class='add'>+	.config			= lbtf_op_config,</div><div class='add'>+	.config_interface	= lbtf_op_config_interface,</div><div class='add'>+	.configure_filter	= lbtf_op_configure_filter,</div><div class='add'>+	.bss_info_changed	= lbtf_op_bss_info_changed,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int lbtf_rx(struct lbtf_private *priv, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_rx_status stats;</div><div class='add'>+	struct rxpd *prxpd;</div><div class='add'>+	int need_padding;</div><div class='add'>+	unsigned int flags;</div><div class='add'>+	struct ieee80211_hdr *hdr;</div><div class='add'>+</div><div class='add'>+	prxpd = (struct rxpd *) skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	stats.flag = 0;</div><div class='add'>+	if (!(prxpd-&gt;status &amp; cpu_to_le16(MRVDRV_RXPD_STATUS_OK)))</div><div class='add'>+		stats.flag |= RX_FLAG_FAILED_FCS_CRC;</div><div class='add'>+	stats.freq = priv-&gt;cur_freq;</div><div class='add'>+	stats.band = IEEE80211_BAND_2GHZ;</div><div class='add'>+	stats.signal = prxpd-&gt;snr;</div><div class='add'>+	stats.noise = prxpd-&gt;nf;</div><div class='add'>+	stats.qual = prxpd-&gt;snr - prxpd-&gt;nf;</div><div class='add'>+	/* Marvell rate index has a hole at value 4 */</div><div class='add'>+	if (prxpd-&gt;rx_rate &gt; 4)</div><div class='add'>+		--prxpd-&gt;rx_rate;</div><div class='add'>+	stats.rate_idx = prxpd-&gt;rx_rate;</div><div class='add'>+	skb_pull(skb, sizeof(struct rxpd));</div><div class='add'>+</div><div class='add'>+	hdr = (struct ieee80211_hdr *)skb-&gt;data;</div><div class='add'>+	flags = le32_to_cpu(*(__le32 *)(skb-&gt;data + 4));</div><div class='add'>+</div><div class='add'>+	need_padding = ieee80211_is_data_qos(hdr-&gt;frame_control);</div><div class='add'>+	need_padding ^= ieee80211_has_a4(hdr-&gt;frame_control);</div><div class='add'>+	need_padding ^= ieee80211_is_data_qos(hdr-&gt;frame_control) &amp;&amp;</div><div class='add'>+			(*ieee80211_get_qos_ctl(hdr) &amp;</div><div class='add'>+			 IEEE80211_QOS_CONTROL_A_MSDU_PRESENT);</div><div class='add'>+</div><div class='add'>+	if (need_padding) {</div><div class='add'>+		memmove(skb-&gt;data + 2, skb-&gt;data, skb-&gt;len);</div><div class='add'>+		skb_reserve(skb, 2);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ieee80211_rx_irqsafe(priv-&gt;hw, skb, &amp;stats);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(lbtf_rx);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * lbtf_add_card: Add and initialize the card, no fw upload yet.</div><div class='add'>+ *</div><div class='add'>+ *  @card    A pointer to card</div><div class='add'>+ *</div><div class='add'>+ *  Returns: pointer to struct lbtf_priv.</div><div class='add'>+ */</div><div class='add'>+struct lbtf_private *lbtf_add_card(void *card, struct device *dmdev)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hw *hw;</div><div class='add'>+	struct lbtf_private *priv = NULL;</div><div class='add'>+</div><div class='add'>+	hw = ieee80211_alloc_hw(sizeof(struct lbtf_private), &amp;lbtf_ops);</div><div class='add'>+	if (!hw)</div><div class='add'>+		goto done;</div><div class='add'>+</div><div class='add'>+	priv = hw-&gt;priv;</div><div class='add'>+	if (lbtf_init_adapter(priv))</div><div class='add'>+		goto err_init_adapter;</div><div class='add'>+</div><div class='add'>+	priv-&gt;hw = hw;</div><div class='add'>+	priv-&gt;card = card;</div><div class='add'>+	priv-&gt;tx_skb = NULL;</div><div class='add'>+</div><div class='add'>+	hw-&gt;queues = 1;</div><div class='add'>+	hw-&gt;flags = IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING;</div><div class='add'>+	hw-&gt;extra_tx_headroom = sizeof(struct txpd);</div><div class='add'>+	memcpy(priv-&gt;channels, lbtf_channels, sizeof(lbtf_channels));</div><div class='add'>+	memcpy(priv-&gt;rates, lbtf_rates, sizeof(lbtf_rates));</div><div class='add'>+	priv-&gt;band.n_bitrates = ARRAY_SIZE(lbtf_rates);</div><div class='add'>+	priv-&gt;band.bitrates = priv-&gt;rates;</div><div class='add'>+	priv-&gt;band.n_channels = ARRAY_SIZE(lbtf_channels);</div><div class='add'>+	priv-&gt;band.channels = priv-&gt;channels;</div><div class='add'>+	hw-&gt;wiphy-&gt;bands[IEEE80211_BAND_2GHZ] = &amp;priv-&gt;band;</div><div class='add'>+	skb_queue_head_init(&amp;priv-&gt;bc_ps_buf);</div><div class='add'>+</div><div class='add'>+	SET_IEEE80211_DEV(hw, dmdev);</div><div class='add'>+</div><div class='add'>+	INIT_WORK(&amp;priv-&gt;cmd_work, lbtf_cmd_work);</div><div class='add'>+	INIT_WORK(&amp;priv-&gt;tx_work, lbtf_tx_work);</div><div class='add'>+	if (ieee80211_register_hw(hw))</div><div class='add'>+		goto err_init_adapter;</div><div class='add'>+</div><div class='add'>+	goto done;</div><div class='add'>+</div><div class='add'>+err_init_adapter:</div><div class='add'>+	lbtf_free_adapter(priv);</div><div class='add'>+	ieee80211_free_hw(hw);</div><div class='add'>+	priv = NULL;</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	return priv;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(lbtf_add_card);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+int lbtf_remove_card(struct lbtf_private *priv)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hw *hw = priv-&gt;hw;</div><div class='add'>+</div><div class='add'>+	priv-&gt;surpriseremoved = 1;</div><div class='add'>+	del_timer(&amp;priv-&gt;command_timer);</div><div class='add'>+	lbtf_free_adapter(priv);</div><div class='add'>+	priv-&gt;hw = NULL;</div><div class='add'>+	ieee80211_unregister_hw(hw);</div><div class='add'>+	ieee80211_free_hw(hw);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(lbtf_remove_card);</div><div class='add'>+</div><div class='add'>+void lbtf_send_tx_feedback(struct lbtf_private *priv, u8 retrycnt, u8 fail)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(priv-&gt;tx_skb);</div><div class='add'>+	memset(&amp;info-&gt;status, 0, sizeof(info-&gt;status));</div><div class='add'>+	/*</div><div class='add'>+	 * Commented out, otherwise we never go beyond 1Mbit/s using mac80211</div><div class='add'>+	 * default pid rc algorithm.</div><div class='add'>+	 *</div><div class='add'>+	 * info-&gt;status.retry_count = MRVL_DEFAULT_RETRIES - retrycnt;</div><div class='add'>+	 */</div><div class='add'>+	info-&gt;status.excessive_retries = fail ? 1 : 0;</div><div class='add'>+	if (!(info-&gt;flags &amp; IEEE80211_TX_CTL_NO_ACK) &amp;&amp; !fail)</div><div class='add'>+		info-&gt;flags |= IEEE80211_TX_STAT_ACK;</div><div class='add'>+	skb_pull(priv-&gt;tx_skb, sizeof(struct txpd));</div><div class='add'>+	ieee80211_tx_status_irqsafe(priv-&gt;hw, priv-&gt;tx_skb);</div><div class='add'>+	priv-&gt;tx_skb = NULL;</div><div class='add'>+	if (!priv-&gt;skb_to_tx &amp;&amp; skb_queue_empty(&amp;priv-&gt;bc_ps_buf))</div><div class='add'>+		ieee80211_wake_queues(priv-&gt;hw);</div><div class='add'>+	else</div><div class='add'>+		queue_work(lbtf_wq, &amp;priv-&gt;tx_work);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(lbtf_send_tx_feedback);</div><div class='add'>+</div><div class='add'>+void lbtf_bcn_sent(struct lbtf_private *priv)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb = NULL;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;vif-&gt;type != NL80211_IFTYPE_AP)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (skb_queue_empty(&amp;priv-&gt;bc_ps_buf)) {</div><div class='add'>+		bool tx_buff_bc = 0;</div><div class='add'>+</div><div class='add'>+		while ((skb = ieee80211_get_buffered_bc(priv-&gt;hw, priv-&gt;vif))) {</div><div class='add'>+			skb_queue_tail(&amp;priv-&gt;bc_ps_buf, skb);</div><div class='add'>+			tx_buff_bc = 1;</div><div class='add'>+		}</div><div class='add'>+		if (tx_buff_bc) {</div><div class='add'>+			ieee80211_stop_queues(priv-&gt;hw);</div><div class='add'>+			queue_work(lbtf_wq, &amp;priv-&gt;tx_work);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb = ieee80211_beacon_get(priv-&gt;hw, priv-&gt;vif);</div><div class='add'>+</div><div class='add'>+	if (skb) {</div><div class='add'>+		lbtf_beacon_set(priv, skb);</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(lbtf_bcn_sent);</div><div class='add'>+</div><div class='add'>+static int __init lbtf_init_module(void)</div><div class='add'>+{</div><div class='add'>+	lbtf_wq = create_workqueue("libertastf");</div><div class='add'>+	if (lbtf_wq == NULL) {</div><div class='add'>+		printk(KERN_ERR "libertastf: couldn't create workqueue\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit lbtf_exit_module(void)</div><div class='add'>+{</div><div class='add'>+	destroy_workqueue(lbtf_wq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(lbtf_init_module);</div><div class='add'>+module_exit(lbtf_exit_module);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("Libertas WLAN Thinfirm Driver Library");</div><div class='add'>+MODULE_AUTHOR("Cozybit Inc.");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c<br/>index 248d31a7aa33..1a019e98dac3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/mac80211_hwsim.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/mac80211_hwsim.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/mac80211_hwsim.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/mac80211_hwsim.c</a></div><div class='hunk'>@@ -14,6 +14,8 @@</div><div class='ctx'>  * - RX filtering based on filter configuration (data-&gt;rx_filter)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;net/mac80211.h&gt;</div><div class='ctx'> #include &lt;net/ieee80211_radiotap.h&gt;</div><div class='ctx'> #include &lt;linux/if_arp.h&gt;</div><div class='hunk'>@@ -28,11 +30,56 @@ static int radios = 2;</div><div class='ctx'> module_param(radios, int, 0444);</div><div class='ctx'> MODULE_PARM_DESC(radios, "Number of simulated radios");</div><div class='ctx'> </div><div class='add'>+struct hwsim_vif_priv {</div><div class='add'>+	u32 magic;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define HWSIM_VIF_MAGIC	0x69537748</div><div class='add'>+</div><div class='add'>+static inline void hwsim_check_magic(struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct hwsim_vif_priv *vp = (void *)vif-&gt;drv_priv;</div><div class='add'>+	WARN_ON(vp-&gt;magic != HWSIM_VIF_MAGIC);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void hwsim_set_magic(struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct hwsim_vif_priv *vp = (void *)vif-&gt;drv_priv;</div><div class='add'>+	vp-&gt;magic = HWSIM_VIF_MAGIC;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void hwsim_clear_magic(struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct hwsim_vif_priv *vp = (void *)vif-&gt;drv_priv;</div><div class='add'>+	vp-&gt;magic = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct hwsim_sta_priv {</div><div class='add'>+	u32 magic;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define HWSIM_STA_MAGIC	0x6d537748</div><div class='add'>+</div><div class='add'>+static inline void hwsim_check_sta_magic(struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	struct hwsim_sta_priv *sp = (void *)sta-&gt;drv_priv;</div><div class='add'>+	WARN_ON(sp-&gt;magic != HWSIM_VIF_MAGIC);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void hwsim_set_sta_magic(struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	struct hwsim_sta_priv *sp = (void *)sta-&gt;drv_priv;</div><div class='add'>+	sp-&gt;magic = HWSIM_VIF_MAGIC;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void hwsim_clear_sta_magic(struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	struct hwsim_sta_priv *sp = (void *)sta-&gt;drv_priv;</div><div class='add'>+	sp-&gt;magic = 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static struct class *hwsim_class;</div><div class='ctx'> </div><div class='del'>-static struct ieee80211_hw **hwsim_radios;</div><div class='del'>-static int hwsim_radio_count;</div><div class='ctx'> static struct net_device *hwsim_mon; /* global monitor netdev */</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -68,7 +115,12 @@ static const struct ieee80211_rate hwsim_rates[] = {</div><div class='ctx'> 	{ .bitrate = 540 }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static spinlock_t hwsim_radio_lock;</div><div class='add'>+static struct list_head hwsim_radios;</div><div class='add'>+</div><div class='ctx'> struct mac80211_hwsim_data {</div><div class='add'>+	struct list_head list;</div><div class='add'>+	struct ieee80211_hw *hw;</div><div class='ctx'> 	struct device *dev;</div><div class='ctx'> 	struct ieee80211_supported_band band;</div><div class='ctx'> 	struct ieee80211_channel channels[ARRAY_SIZE(hwsim_channels)];</div><div class='hunk'>@@ -144,11 +196,11 @@ static void mac80211_hwsim_monitor_rx(struct ieee80211_hw *hw,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int mac80211_hwsim_tx_frame(struct ieee80211_hw *hw,</div><div class='del'>-				   struct sk_buff *skb)</div><div class='add'>+static bool mac80211_hwsim_tx_frame(struct ieee80211_hw *hw,</div><div class='add'>+				    struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct mac80211_hwsim_data *data = hw-&gt;priv;</div><div class='del'>-	int i, ack = 0;</div><div class='add'>+	struct mac80211_hwsim_data *data = hw-&gt;priv, *data2;</div><div class='add'>+	bool ack = false;</div><div class='ctx'> 	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb-&gt;data;</div><div class='ctx'> 	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);</div><div class='ctx'> 	struct ieee80211_rx_status rx_status;</div><div class='hunk'>@@ -161,13 +213,13 @@ static int mac80211_hwsim_tx_frame(struct ieee80211_hw *hw,</div><div class='ctx'> 	/* TODO: simulate signal strength (and optional packet drop) */</div><div class='ctx'> </div><div class='ctx'> 	/* Copy skb to all enabled radios that are on the current frequency */</div><div class='del'>-	for (i = 0; i &lt; hwsim_radio_count; i++) {</div><div class='del'>-		struct mac80211_hwsim_data *data2;</div><div class='add'>+	spin_lock(&amp;hwsim_radio_lock);</div><div class='add'>+	list_for_each_entry(data2, &amp;hwsim_radios, list) {</div><div class='ctx'> 		struct sk_buff *nskb;</div><div class='ctx'> </div><div class='del'>-		if (hwsim_radios[i] == NULL || hwsim_radios[i] == hw)</div><div class='add'>+		if (data == data2)</div><div class='ctx'> 			continue;</div><div class='del'>-		data2 = hwsim_radios[i]-&gt;priv;</div><div class='add'>+</div><div class='ctx'> 		if (!data2-&gt;started || !data2-&gt;radio_enabled ||</div><div class='ctx'> 		    data-&gt;channel-&gt;center_freq != data2-&gt;channel-&gt;center_freq)</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -176,11 +228,12 @@ static int mac80211_hwsim_tx_frame(struct ieee80211_hw *hw,</div><div class='ctx'> 		if (nskb == NULL)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (memcmp(hdr-&gt;addr1, hwsim_radios[i]-&gt;wiphy-&gt;perm_addr,</div><div class='add'>+		if (memcmp(hdr-&gt;addr1, data2-&gt;hw-&gt;wiphy-&gt;perm_addr,</div><div class='ctx'> 			   ETH_ALEN) == 0)</div><div class='del'>-			ack = 1;</div><div class='del'>-		ieee80211_rx_irqsafe(hwsim_radios[i], nskb, &amp;rx_status);</div><div class='add'>+			ack = true;</div><div class='add'>+		ieee80211_rx_irqsafe(data2-&gt;hw, nskb, &amp;rx_status);</div><div class='ctx'> 	}</div><div class='add'>+	spin_unlock(&amp;hwsim_radio_lock);</div><div class='ctx'> </div><div class='ctx'> 	return ack;</div><div class='ctx'> }</div><div class='hunk'>@@ -189,7 +242,7 @@ static int mac80211_hwsim_tx_frame(struct ieee80211_hw *hw,</div><div class='ctx'> static int mac80211_hwsim_tx(struct ieee80211_hw *hw, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct mac80211_hwsim_data *data = hw-&gt;priv;</div><div class='del'>-	int ack;</div><div class='add'>+	bool ack;</div><div class='ctx'> 	struct ieee80211_tx_info *txi;</div><div class='ctx'> </div><div class='ctx'> 	mac80211_hwsim_monitor_rx(hw, skb);</div><div class='hunk'>@@ -210,6 +263,12 @@ static int mac80211_hwsim_tx(struct ieee80211_hw *hw, struct sk_buff *skb)</div><div class='ctx'> 	ack = mac80211_hwsim_tx_frame(hw, skb);</div><div class='ctx'> </div><div class='ctx'> 	txi = IEEE80211_SKB_CB(skb);</div><div class='add'>+</div><div class='add'>+	if (txi-&gt;control.vif)</div><div class='add'>+		hwsim_check_magic(txi-&gt;control.vif);</div><div class='add'>+	if (txi-&gt;control.sta)</div><div class='add'>+		hwsim_check_sta_magic(txi-&gt;control.sta);</div><div class='add'>+</div><div class='ctx'> 	memset(&amp;txi-&gt;status, 0, sizeof(txi-&gt;status));</div><div class='ctx'> 	if (!(txi-&gt;flags &amp; IEEE80211_TX_CTL_NO_ACK)) {</div><div class='ctx'> 		if (ack)</div><div class='hunk'>@@ -246,6 +305,7 @@ static int mac80211_hwsim_add_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 	printk(KERN_DEBUG "%s:%s (type=%d mac_addr=%s)\n",</div><div class='ctx'> 	       wiphy_name(hw-&gt;wiphy), __func__, conf-&gt;type,</div><div class='ctx'> 	       print_mac(mac, conf-&gt;mac_addr));</div><div class='add'>+	hwsim_set_magic(conf-&gt;vif);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -257,6 +317,8 @@ static void mac80211_hwsim_remove_interface(</div><div class='ctx'> 	printk(KERN_DEBUG "%s:%s (type=%d mac_addr=%s)\n",</div><div class='ctx'> 	       wiphy_name(hw-&gt;wiphy), __func__, conf-&gt;type,</div><div class='ctx'> 	       print_mac(mac, conf-&gt;mac_addr));</div><div class='add'>+	hwsim_check_magic(conf-&gt;vif);</div><div class='add'>+	hwsim_clear_magic(conf-&gt;vif);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -267,7 +329,9 @@ static void mac80211_hwsim_beacon_tx(void *arg, u8 *mac,</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	struct ieee80211_tx_info *info;</div><div class='ctx'> </div><div class='del'>-	if (vif-&gt;type != IEEE80211_IF_TYPE_AP)</div><div class='add'>+	hwsim_check_magic(vif);</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type != NL80211_IFTYPE_AP)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	skb = ieee80211_beacon_get(hw, vif);</div><div class='hunk'>@@ -341,7 +405,45 @@ static void mac80211_hwsim_configure_filter(struct ieee80211_hw *hw,</div><div class='ctx'> 	*total_flags = data-&gt;rx_filter;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int mac80211_hwsim_config_interface(struct ieee80211_hw *hw,</div><div class='add'>+					   struct ieee80211_vif *vif,</div><div class='add'>+					   struct ieee80211_if_conf *conf)</div><div class='add'>+{</div><div class='add'>+	hwsim_check_magic(vif);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mac80211_hwsim_bss_info_changed(struct ieee80211_hw *hw,</div><div class='add'>+					    struct ieee80211_vif *vif,</div><div class='add'>+					    struct ieee80211_bss_conf *info,</div><div class='add'>+					    u32 changed)</div><div class='add'>+{</div><div class='add'>+	hwsim_check_magic(vif);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mac80211_hwsim_sta_notify(struct ieee80211_hw *hw,</div><div class='add'>+				      struct ieee80211_vif *vif,</div><div class='add'>+				      enum sta_notify_cmd cmd,</div><div class='add'>+				      struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	hwsim_check_magic(vif);</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case STA_NOTIFY_ADD:</div><div class='add'>+		hwsim_set_sta_magic(sta);</div><div class='add'>+		break;</div><div class='add'>+	case STA_NOTIFY_REMOVE:</div><div class='add'>+		hwsim_clear_sta_magic(sta);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='ctx'> </div><div class='add'>+static int mac80211_hwsim_set_tim(struct ieee80211_hw *hw,</div><div class='add'>+				  struct ieee80211_sta *sta,</div><div class='add'>+				  bool set)</div><div class='add'>+{</div><div class='add'>+	hwsim_check_sta_magic(sta);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static const struct ieee80211_ops mac80211_hwsim_ops =</div><div class='ctx'> {</div><div class='hunk'>@@ -352,23 +454,30 @@ static const struct ieee80211_ops mac80211_hwsim_ops =</div><div class='ctx'> 	.remove_interface = mac80211_hwsim_remove_interface,</div><div class='ctx'> 	.config = mac80211_hwsim_config,</div><div class='ctx'> 	.configure_filter = mac80211_hwsim_configure_filter,</div><div class='add'>+	.config_interface = mac80211_hwsim_config_interface,</div><div class='add'>+	.bss_info_changed = mac80211_hwsim_bss_info_changed,</div><div class='add'>+	.sta_notify = mac80211_hwsim_sta_notify,</div><div class='add'>+	.set_tim = mac80211_hwsim_set_tim,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static void mac80211_hwsim_free(void)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; hwsim_radio_count; i++) {</div><div class='del'>-		if (hwsim_radios[i]) {</div><div class='del'>-			struct mac80211_hwsim_data *data;</div><div class='del'>-			data = hwsim_radios[i]-&gt;priv;</div><div class='del'>-			ieee80211_unregister_hw(hwsim_radios[i]);</div><div class='del'>-			device_unregister(data-&gt;dev);</div><div class='del'>-			ieee80211_free_hw(hwsim_radios[i]);</div><div class='del'>-		}</div><div class='add'>+	struct list_head tmplist, *i, *tmp;</div><div class='add'>+	struct mac80211_hwsim_data *data;</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;tmplist);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;hwsim_radio_lock);</div><div class='add'>+	list_for_each_safe(i, tmp, &amp;hwsim_radios)</div><div class='add'>+		list_move(i, &amp;tmplist);</div><div class='add'>+	spin_unlock_bh(&amp;hwsim_radio_lock);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(data, &amp;tmplist, list) {</div><div class='add'>+		ieee80211_unregister_hw(data-&gt;hw);</div><div class='add'>+		device_unregister(data-&gt;dev);</div><div class='add'>+		ieee80211_free_hw(data-&gt;hw);</div><div class='ctx'> 	}</div><div class='del'>-	kfree(hwsim_radios);</div><div class='ctx'> 	class_destroy(hwsim_class);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -398,42 +507,37 @@ static int __init init_mac80211_hwsim(void)</div><div class='ctx'> 	struct ieee80211_hw *hw;</div><div class='ctx'> 	DECLARE_MAC_BUF(mac);</div><div class='ctx'> </div><div class='del'>-	if (radios &lt; 1 || radios &gt; 65535)</div><div class='add'>+	if (radios &lt; 1 || radios &gt; 100)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	hwsim_radio_count = radios;</div><div class='del'>-	hwsim_radios = kcalloc(hwsim_radio_count,</div><div class='del'>-			       sizeof(struct ieee80211_hw *), GFP_KERNEL);</div><div class='del'>-	if (hwsim_radios == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	spin_lock_init(&amp;hwsim_radio_lock);</div><div class='add'>+	INIT_LIST_HEAD(&amp;hwsim_radios);</div><div class='ctx'> </div><div class='ctx'> 	hwsim_class = class_create(THIS_MODULE, "mac80211_hwsim");</div><div class='del'>-	if (IS_ERR(hwsim_class)) {</div><div class='del'>-		kfree(hwsim_radios);</div><div class='add'>+	if (IS_ERR(hwsim_class))</div><div class='ctx'> 		return PTR_ERR(hwsim_class);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	memset(addr, 0, ETH_ALEN);</div><div class='ctx'> 	addr[0] = 0x02;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; hwsim_radio_count; i++) {</div><div class='add'>+	for (i = 0; i &lt; radios; i++) {</div><div class='ctx'> 		printk(KERN_DEBUG "mac80211_hwsim: Initializing radio %d\n",</div><div class='ctx'> 		       i);</div><div class='ctx'> 		hw = ieee80211_alloc_hw(sizeof(*data), &amp;mac80211_hwsim_ops);</div><div class='del'>-		if (hw == NULL) {</div><div class='add'>+		if (!hw) {</div><div class='ctx'> 			printk(KERN_DEBUG "mac80211_hwsim: ieee80211_alloc_hw "</div><div class='ctx'> 			       "failed\n");</div><div class='ctx'> 			err = -ENOMEM;</div><div class='ctx'> 			goto failed;</div><div class='ctx'> 		}</div><div class='del'>-		hwsim_radios[i] = hw;</div><div class='del'>-</div><div class='ctx'> 		data = hw-&gt;priv;</div><div class='del'>-		data-&gt;dev = device_create_drvdata(hwsim_class, NULL, 0, hw,</div><div class='del'>-						"hwsim%d", i);</div><div class='add'>+		data-&gt;hw = hw;</div><div class='add'>+</div><div class='add'>+		data-&gt;dev = device_create(hwsim_class, NULL, 0, hw,</div><div class='add'>+					  "hwsim%d", i);</div><div class='ctx'> 		if (IS_ERR(data-&gt;dev)) {</div><div class='ctx'> 			printk(KERN_DEBUG</div><div class='del'>-			       "mac80211_hwsim: device_create_drvdata "</div><div class='add'>+			       "mac80211_hwsim: device_create "</div><div class='ctx'> 			       "failed (%ld)\n", PTR_ERR(data-&gt;dev));</div><div class='ctx'> 			err = -ENOMEM;</div><div class='ctx'> 			goto failed_drvdata;</div><div class='hunk'>@@ -446,7 +550,15 @@ static int __init init_mac80211_hwsim(void)</div><div class='ctx'> 		SET_IEEE80211_PERM_ADDR(hw, addr);</div><div class='ctx'> </div><div class='ctx'> 		hw-&gt;channel_change_time = 1;</div><div class='del'>-		hw-&gt;queues = 1;</div><div class='add'>+		hw-&gt;queues = 4;</div><div class='add'>+		hw-&gt;wiphy-&gt;interface_modes =</div><div class='add'>+			BIT(NL80211_IFTYPE_STATION) |</div><div class='add'>+			BIT(NL80211_IFTYPE_AP);</div><div class='add'>+		hw-&gt;ampdu_queues = 1;</div><div class='add'>+</div><div class='add'>+		/* ask mac80211 to reserve space for magic */</div><div class='add'>+		hw-&gt;vif_data_size = sizeof(struct hwsim_vif_priv);</div><div class='add'>+		hw-&gt;sta_data_size = sizeof(struct hwsim_sta_priv);</div><div class='ctx'> </div><div class='ctx'> 		memcpy(data-&gt;channels, hwsim_channels, sizeof(hwsim_channels));</div><div class='ctx'> 		memcpy(data-&gt;rates, hwsim_rates, sizeof(hwsim_rates));</div><div class='hunk'>@@ -454,6 +566,19 @@ static int __init init_mac80211_hwsim(void)</div><div class='ctx'> 		data-&gt;band.n_channels = ARRAY_SIZE(hwsim_channels);</div><div class='ctx'> 		data-&gt;band.bitrates = data-&gt;rates;</div><div class='ctx'> 		data-&gt;band.n_bitrates = ARRAY_SIZE(hwsim_rates);</div><div class='add'>+		data-&gt;band.ht_info.ht_supported = 1;</div><div class='add'>+		data-&gt;band.ht_info.cap = IEEE80211_HT_CAP_SUP_WIDTH |</div><div class='add'>+			IEEE80211_HT_CAP_GRN_FLD |</div><div class='add'>+			IEEE80211_HT_CAP_SGI_40 |</div><div class='add'>+			IEEE80211_HT_CAP_DSSSCCK40;</div><div class='add'>+		data-&gt;band.ht_info.ampdu_factor = 0x3;</div><div class='add'>+		data-&gt;band.ht_info.ampdu_density = 0x6;</div><div class='add'>+		memset(data-&gt;band.ht_info.supp_mcs_set, 0,</div><div class='add'>+		       sizeof(data-&gt;band.ht_info.supp_mcs_set));</div><div class='add'>+		data-&gt;band.ht_info.supp_mcs_set[0] = 0xff;</div><div class='add'>+		data-&gt;band.ht_info.supp_mcs_set[1] = 0xff;</div><div class='add'>+		data-&gt;band.ht_info.supp_mcs_set[12] =</div><div class='add'>+			IEEE80211_HT_CAP_MCS_TX_DEFINED;</div><div class='ctx'> 		hw-&gt;wiphy-&gt;bands[IEEE80211_BAND_2GHZ] = &amp;data-&gt;band;</div><div class='ctx'> </div><div class='ctx'> 		err = ieee80211_register_hw(hw);</div><div class='hunk'>@@ -469,6 +594,8 @@ static int __init init_mac80211_hwsim(void)</div><div class='ctx'> </div><div class='ctx'> 		setup_timer(&amp;data-&gt;beacon_timer, mac80211_hwsim_beacon,</div><div class='ctx'> 			    (unsigned long) hw);</div><div class='add'>+</div><div class='add'>+		list_add_tail(&amp;data-&gt;list, &amp;hwsim_radios);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	hwsim_mon = alloc_netdev(0, "hwsim%d", hwsim_mon_setup);</div><div class='hunk'>@@ -500,7 +627,6 @@ failed_hw:</div><div class='ctx'> 	device_unregister(data-&gt;dev);</div><div class='ctx'> failed_drvdata:</div><div class='ctx'> 	ieee80211_free_hw(hw);</div><div class='del'>-	hwsim_radios[i] = NULL;</div><div class='ctx'> failed:</div><div class='ctx'> 	mac80211_hwsim_free();</div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -509,8 +635,7 @@ failed:</div><div class='ctx'> </div><div class='ctx'> static void __exit exit_mac80211_hwsim(void)</div><div class='ctx'> {</div><div class='del'>-	printk(KERN_DEBUG "mac80211_hwsim: unregister %d radios\n",</div><div class='del'>-	       hwsim_radio_count);</div><div class='add'>+	printk(KERN_DEBUG "mac80211_hwsim: unregister radios\n");</div><div class='ctx'> </div><div class='ctx'> 	unregister_netdev(hwsim_mon);</div><div class='ctx'> 	mac80211_hwsim_free();</div><div class='head'>diff --git a/drivers/net/wireless/netwave_cs.c b/drivers/net/wireless/netwave_cs.c<br/>index f479c1af6782..a670f36b5f3f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/netwave_cs.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/netwave_cs.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/netwave_cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/netwave_cs.c</a></div><div class='hunk'>@@ -398,7 +398,7 @@ static int netwave_probe(struct pcmcia_device *link)</div><div class='ctx'>     link-&gt;io.IOAddrLines = 5;</div><div class='ctx'>     </div><div class='ctx'>     /* Interrupt setup */</div><div class='del'>-    link-&gt;irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_HANDLE_PRESENT;</div><div class='add'>+    link-&gt;irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_HANDLE_PRESENT;</div><div class='ctx'>     link-&gt;irq.IRQInfo1 = IRQ_LEVEL_ID;</div><div class='ctx'>     link-&gt;irq.Handler = &amp;netwave_interrupt;</div><div class='ctx'>     </div><div class='hunk'>@@ -749,9 +749,10 @@ static int netwave_pcmcia_config(struct pcmcia_device *link) {</div><div class='ctx'>     for (i = j = 0x0; j &lt; 0x400; j += 0x20) {</div><div class='ctx'> 	link-&gt;io.BasePort1 = j ^ 0x300;</div><div class='ctx'> 	i = pcmcia_request_io(link, &amp;link-&gt;io);</div><div class='del'>-	if (i == CS_SUCCESS) break;</div><div class='add'>+	if (i == 0)</div><div class='add'>+		break;</div><div class='ctx'>     }</div><div class='del'>-    if (i != CS_SUCCESS) {</div><div class='add'>+    if (i != 0) {</div><div class='ctx'> 	cs_error(link, RequestIO, i);</div><div class='ctx'> 	goto failed;</div><div class='ctx'>     }</div><div class='head'>diff --git a/drivers/net/wireless/orinoco.c b/drivers/net/wireless/orinoco.c<br/>index 36c004e15602..50904771f291 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/orinoco.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/orinoco.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/orinoco.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/orinoco.c</a></div><div class='hunk'>@@ -79,15 +79,21 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include &lt;linux/ethtool.h&gt;</div><div class='add'>+#include &lt;linux/firmware.h&gt;</div><div class='ctx'> #include &lt;linux/if_arp.h&gt;</div><div class='ctx'> #include &lt;linux/wireless.h&gt;</div><div class='ctx'> #include &lt;net/iw_handler.h&gt;</div><div class='ctx'> #include &lt;net/ieee80211.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/scatterlist.h&gt;</div><div class='add'>+#include &lt;linux/crypto.h&gt;</div><div class='add'>+</div><div class='ctx'> #include "hermes_rid.h"</div><div class='add'>+#include "hermes_dld.h"</div><div class='ctx'> #include "orinoco.h"</div><div class='ctx'> </div><div class='ctx'> /********************************************************************/</div><div class='hunk'>@@ -241,6 +247,74 @@ static int __orinoco_program_rids(struct net_device *dev);</div><div class='ctx'> static void __orinoco_set_multicast_list(struct net_device *dev);</div><div class='ctx'> </div><div class='ctx'> /********************************************************************/</div><div class='add'>+/* Michael MIC crypto setup                                         */</div><div class='add'>+/********************************************************************/</div><div class='add'>+#define MICHAEL_MIC_LEN 8</div><div class='add'>+static int orinoco_mic_init(struct orinoco_private *priv)</div><div class='add'>+{</div><div class='add'>+	priv-&gt;tx_tfm_mic = crypto_alloc_hash("michael_mic", 0, 0);</div><div class='add'>+	if (IS_ERR(priv-&gt;tx_tfm_mic)) {</div><div class='add'>+		printk(KERN_DEBUG "orinoco_mic_init: could not allocate "</div><div class='add'>+		       "crypto API michael_mic\n");</div><div class='add'>+		priv-&gt;tx_tfm_mic = NULL;</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;rx_tfm_mic = crypto_alloc_hash("michael_mic", 0, 0);</div><div class='add'>+	if (IS_ERR(priv-&gt;rx_tfm_mic)) {</div><div class='add'>+		printk(KERN_DEBUG "orinoco_mic_init: could not allocate "</div><div class='add'>+		       "crypto API michael_mic\n");</div><div class='add'>+		priv-&gt;rx_tfm_mic = NULL;</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void orinoco_mic_free(struct orinoco_private *priv)</div><div class='add'>+{</div><div class='add'>+	if (priv-&gt;tx_tfm_mic)</div><div class='add'>+		crypto_free_hash(priv-&gt;tx_tfm_mic);</div><div class='add'>+	if (priv-&gt;rx_tfm_mic)</div><div class='add'>+		crypto_free_hash(priv-&gt;rx_tfm_mic);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int michael_mic(struct crypto_hash *tfm_michael, u8 *key,</div><div class='add'>+		       u8 *da, u8 *sa, u8 priority,</div><div class='add'>+		       u8 *data, size_t data_len, u8 *mic)</div><div class='add'>+{</div><div class='add'>+	struct hash_desc desc;</div><div class='add'>+	struct scatterlist sg[2];</div><div class='add'>+	u8 hdr[ETH_HLEN + 2]; /* size of header + padding */</div><div class='add'>+</div><div class='add'>+	if (tfm_michael == NULL) {</div><div class='add'>+		printk(KERN_WARNING "michael_mic: tfm_michael == NULL\n");</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Copy header into buffer. We need the padding on the end zeroed */</div><div class='add'>+	memcpy(&amp;hdr[0], da, ETH_ALEN);</div><div class='add'>+	memcpy(&amp;hdr[ETH_ALEN], sa, ETH_ALEN);</div><div class='add'>+	hdr[ETH_ALEN*2] = priority;</div><div class='add'>+	hdr[ETH_ALEN*2+1] = 0;</div><div class='add'>+	hdr[ETH_ALEN*2+2] = 0;</div><div class='add'>+	hdr[ETH_ALEN*2+3] = 0;</div><div class='add'>+</div><div class='add'>+	/* Use scatter gather to MIC header and data in one go */</div><div class='add'>+	sg_init_table(sg, 2);</div><div class='add'>+	sg_set_buf(&amp;sg[0], hdr, sizeof(hdr));</div><div class='add'>+	sg_set_buf(&amp;sg[1], data, data_len);</div><div class='add'>+</div><div class='add'>+	if (crypto_hash_setkey(tfm_michael, key, MIC_KEYLEN))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	desc.tfm = tfm_michael;</div><div class='add'>+	desc.flags = 0;</div><div class='add'>+	return crypto_hash_digest(&amp;desc, sg, data_len + sizeof(hdr),</div><div class='add'>+				  mic);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/********************************************************************/</div><div class='ctx'> /* Internal helper functions                                        */</div><div class='ctx'> /********************************************************************/</div><div class='ctx'> </div><div class='hunk'>@@ -273,12 +347,19 @@ static inline void set_port_type(struct orinoco_private *priv)</div><div class='ctx'> #define ORINOCO_MAX_BSS_COUNT	64</div><div class='ctx'> static int orinoco_bss_data_allocate(struct orinoco_private *priv)</div><div class='ctx'> {</div><div class='del'>-	if (priv-&gt;bss_data)</div><div class='add'>+	if (priv-&gt;bss_xbss_data)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	priv-&gt;bss_data =</div><div class='del'>-	    kzalloc(ORINOCO_MAX_BSS_COUNT * sizeof(bss_element), GFP_KERNEL);</div><div class='del'>-	if (!priv-&gt;bss_data) {</div><div class='add'>+	if (priv-&gt;has_ext_scan)</div><div class='add'>+		priv-&gt;bss_xbss_data = kzalloc(ORINOCO_MAX_BSS_COUNT *</div><div class='add'>+					      sizeof(struct xbss_element),</div><div class='add'>+					      GFP_KERNEL);</div><div class='add'>+	else</div><div class='add'>+		priv-&gt;bss_xbss_data = kzalloc(ORINOCO_MAX_BSS_COUNT *</div><div class='add'>+					      sizeof(struct bss_element),</div><div class='add'>+					      GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (!priv-&gt;bss_xbss_data) {</div><div class='ctx'> 		printk(KERN_WARNING "Out of memory allocating beacons");</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -287,18 +368,319 @@ static int orinoco_bss_data_allocate(struct orinoco_private *priv)</div><div class='ctx'> </div><div class='ctx'> static void orinoco_bss_data_free(struct orinoco_private *priv)</div><div class='ctx'> {</div><div class='del'>-	kfree(priv-&gt;bss_data);</div><div class='del'>-	priv-&gt;bss_data = NULL;</div><div class='add'>+	kfree(priv-&gt;bss_xbss_data);</div><div class='add'>+	priv-&gt;bss_xbss_data = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define PRIV_BSS	((struct bss_element *)priv-&gt;bss_xbss_data)</div><div class='add'>+#define PRIV_XBSS	((struct xbss_element *)priv-&gt;bss_xbss_data)</div><div class='ctx'> static void orinoco_bss_data_init(struct orinoco_private *priv)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;priv-&gt;bss_free_list);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;priv-&gt;bss_list);</div><div class='del'>-	for (i = 0; i &lt; ORINOCO_MAX_BSS_COUNT; i++)</div><div class='del'>-		list_add_tail(&amp;priv-&gt;bss_data[i].list, &amp;priv-&gt;bss_free_list);</div><div class='add'>+	if (priv-&gt;has_ext_scan)</div><div class='add'>+		for (i = 0; i &lt; ORINOCO_MAX_BSS_COUNT; i++)</div><div class='add'>+			list_add_tail(&amp;(PRIV_XBSS[i].list),</div><div class='add'>+				      &amp;priv-&gt;bss_free_list);</div><div class='add'>+	else</div><div class='add'>+		for (i = 0; i &lt; ORINOCO_MAX_BSS_COUNT; i++)</div><div class='add'>+			list_add_tail(&amp;(PRIV_BSS[i].list),</div><div class='add'>+				      &amp;priv-&gt;bss_free_list);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u8 *orinoco_get_ie(u8 *data, size_t len,</div><div class='add'>+				 enum ieee80211_mfie eid)</div><div class='add'>+{</div><div class='add'>+	u8 *p = data;</div><div class='add'>+	while ((p + 2) &lt; (data + len)) {</div><div class='add'>+		if (p[0] == eid)</div><div class='add'>+			return p;</div><div class='add'>+		p += p[1] + 2;</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define WPA_OUI_TYPE	"\x00\x50\xF2\x01"</div><div class='add'>+#define WPA_SELECTOR_LEN 4</div><div class='add'>+static inline u8 *orinoco_get_wpa_ie(u8 *data, size_t len)</div><div class='add'>+{</div><div class='add'>+	u8 *p = data;</div><div class='add'>+	while ((p + 2 + WPA_SELECTOR_LEN) &lt; (data + len)) {</div><div class='add'>+		if ((p[0] == MFIE_TYPE_GENERIC) &amp;&amp;</div><div class='add'>+		    (memcmp(&amp;p[2], WPA_OUI_TYPE, WPA_SELECTOR_LEN) == 0))</div><div class='add'>+			return p;</div><div class='add'>+		p += p[1] + 2;</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/********************************************************************/</div><div class='add'>+/* Download functionality                                           */</div><div class='add'>+/********************************************************************/</div><div class='add'>+</div><div class='add'>+struct fw_info {</div><div class='add'>+	char *pri_fw;</div><div class='add'>+	char *sta_fw;</div><div class='add'>+	char *ap_fw;</div><div class='add'>+	u32 pda_addr;</div><div class='add'>+	u16 pda_size;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const static struct fw_info orinoco_fw[] = {</div><div class='add'>+	{ "", "agere_sta_fw.bin", "agere_ap_fw.bin", 0x00390000, 1000 },</div><div class='add'>+	{ "", "prism_sta_fw.bin", "prism_ap_fw.bin", 0, 1024 },</div><div class='add'>+	{ "symbol_sp24t_prim_fw", "symbol_sp24t_sec_fw", "", 0x00003100, 0x100 }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Structure used to access fields in FW</div><div class='add'>+ * Make sure LE decoding macros are used</div><div class='add'>+ */</div><div class='add'>+struct orinoco_fw_header {</div><div class='add'>+	char hdr_vers[6];       /* ASCII string for header version */</div><div class='add'>+	__le16 headersize;      /* Total length of header */</div><div class='add'>+	__le32 entry_point;     /* NIC entry point */</div><div class='add'>+	__le32 blocks;          /* Number of blocks to program */</div><div class='add'>+	__le32 block_offset;    /* Offset of block data from eof header */</div><div class='add'>+	__le32 pdr_offset;      /* Offset to PDR data from eof header */</div><div class='add'>+	__le32 pri_offset;      /* Offset to primary plug data */</div><div class='add'>+	__le32 compat_offset;   /* Offset to compatibility data*/</div><div class='add'>+	char signature[0];      /* FW signature length headersize-20 */</div><div class='add'>+} __attribute__ ((packed));</div><div class='add'>+</div><div class='add'>+/* Download either STA or AP firmware into the card. */</div><div class='add'>+static int</div><div class='add'>+orinoco_dl_firmware(struct orinoco_private *priv,</div><div class='add'>+		    const struct fw_info *fw,</div><div class='add'>+		    int ap)</div><div class='add'>+{</div><div class='add'>+	/* Plug Data Area (PDA) */</div><div class='add'>+	__le16 pda[512] = { 0 };</div><div class='add'>+</div><div class='add'>+	hermes_t *hw = &amp;priv-&gt;hw;</div><div class='add'>+	const struct firmware *fw_entry;</div><div class='add'>+	const struct orinoco_fw_header *hdr;</div><div class='add'>+	const unsigned char *first_block;</div><div class='add'>+	const unsigned char *end;</div><div class='add'>+	const char *firmware;</div><div class='add'>+	struct net_device *dev = priv-&gt;ndev;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (ap)</div><div class='add'>+		firmware = fw-&gt;ap_fw;</div><div class='add'>+	else</div><div class='add'>+		firmware = fw-&gt;sta_fw;</div><div class='add'>+</div><div class='add'>+	printk(KERN_DEBUG "%s: Attempting to download firmware %s\n",</div><div class='add'>+	       dev-&gt;name, firmware);</div><div class='add'>+</div><div class='add'>+	/* Read current plug data */</div><div class='add'>+	err = hermes_read_pda(hw, pda, fw-&gt;pda_addr,</div><div class='add'>+			      min_t(u16, fw-&gt;pda_size, sizeof(pda)), 0);</div><div class='add'>+	printk(KERN_DEBUG "%s: Read PDA returned %d\n", dev-&gt;name, err);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = request_firmware(&amp;fw_entry, firmware, priv-&gt;dev);</div><div class='add'>+	if (err) {</div><div class='add'>+		printk(KERN_ERR "%s: Cannot find firmware %s\n",</div><div class='add'>+		       dev-&gt;name, firmware);</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hdr = (const struct orinoco_fw_header *) fw_entry-&gt;data;</div><div class='add'>+</div><div class='add'>+	/* Enable aux port to allow programming */</div><div class='add'>+	err = hermesi_program_init(hw, le32_to_cpu(hdr-&gt;entry_point));</div><div class='add'>+	printk(KERN_DEBUG "%s: Program init returned %d\n", dev-&gt;name, err);</div><div class='add'>+	if (err != 0)</div><div class='add'>+		goto abort;</div><div class='add'>+</div><div class='add'>+	/* Program data */</div><div class='add'>+	first_block = (fw_entry-&gt;data +</div><div class='add'>+		       le16_to_cpu(hdr-&gt;headersize) +</div><div class='add'>+		       le32_to_cpu(hdr-&gt;block_offset));</div><div class='add'>+	end = fw_entry-&gt;data + fw_entry-&gt;size;</div><div class='add'>+</div><div class='add'>+	err = hermes_program(hw, first_block, end);</div><div class='add'>+	printk(KERN_DEBUG "%s: Program returned %d\n", dev-&gt;name, err);</div><div class='add'>+	if (err != 0)</div><div class='add'>+		goto abort;</div><div class='add'>+</div><div class='add'>+	/* Update production data */</div><div class='add'>+	first_block = (fw_entry-&gt;data +</div><div class='add'>+		       le16_to_cpu(hdr-&gt;headersize) +</div><div class='add'>+		       le32_to_cpu(hdr-&gt;pdr_offset));</div><div class='add'>+</div><div class='add'>+	err = hermes_apply_pda_with_defaults(hw, first_block, pda);</div><div class='add'>+	printk(KERN_DEBUG "%s: Apply PDA returned %d\n", dev-&gt;name, err);</div><div class='add'>+	if (err)</div><div class='add'>+		goto abort;</div><div class='add'>+</div><div class='add'>+	/* Tell card we've finished */</div><div class='add'>+	err = hermesi_program_end(hw);</div><div class='add'>+	printk(KERN_DEBUG "%s: Program end returned %d\n", dev-&gt;name, err);</div><div class='add'>+	if (err != 0)</div><div class='add'>+		goto abort;</div><div class='add'>+</div><div class='add'>+	/* Check if we're running */</div><div class='add'>+	printk(KERN_DEBUG "%s: hermes_present returned %d\n",</div><div class='add'>+	       dev-&gt;name, hermes_present(hw));</div><div class='add'>+</div><div class='add'>+abort:</div><div class='add'>+	release_firmware(fw_entry);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* End markers */</div><div class='add'>+#define TEXT_END	0x1A		/* End of text header */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Process a firmware image - stop the card, load the firmware, reset</div><div class='add'>+ * the card and make sure it responds.  For the secondary firmware take</div><div class='add'>+ * care of the PDA - read it and then write it on top of the firmware.</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+symbol_dl_image(struct orinoco_private *priv, const struct fw_info *fw,</div><div class='add'>+		const unsigned char *image, const unsigned char *end,</div><div class='add'>+		int secondary)</div><div class='add'>+{</div><div class='add'>+	hermes_t *hw = &amp;priv-&gt;hw;</div><div class='add'>+	int ret;</div><div class='add'>+	const unsigned char *ptr;</div><div class='add'>+	const unsigned char *first_block;</div><div class='add'>+</div><div class='add'>+	/* Plug Data Area (PDA) */</div><div class='add'>+	__le16 pda[256];</div><div class='add'>+</div><div class='add'>+	/* Binary block begins after the 0x1A marker */</div><div class='add'>+	ptr = image;</div><div class='add'>+	while (*ptr++ != TEXT_END);</div><div class='add'>+	first_block = ptr;</div><div class='add'>+</div><div class='add'>+	/* Read the PDA from EEPROM */</div><div class='add'>+	if (secondary) {</div><div class='add'>+		ret = hermes_read_pda(hw, pda, fw-&gt;pda_addr, sizeof(pda), 1);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Stop the firmware, so that it can be safely rewritten */</div><div class='add'>+	if (priv-&gt;stop_fw) {</div><div class='add'>+		ret = priv-&gt;stop_fw(priv, 1);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Program the adapter with new firmware */</div><div class='add'>+	ret = hermes_program(hw, first_block, end);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Write the PDA to the adapter */</div><div class='add'>+	if (secondary) {</div><div class='add'>+		size_t len = hermes_blocks_length(first_block);</div><div class='add'>+		ptr = first_block + len;</div><div class='add'>+		ret = hermes_apply_pda(hw, ptr, pda);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Run the firmware */</div><div class='add'>+	if (priv-&gt;stop_fw) {</div><div class='add'>+		ret = priv-&gt;stop_fw(priv, 0);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Reset hermes chip and make sure it responds */</div><div class='add'>+	ret = hermes_init(hw);</div><div class='add'>+</div><div class='add'>+	/* hermes_reset() should return 0 with the secondary firmware */</div><div class='add'>+	if (secondary &amp;&amp; ret != 0)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	/* And this should work with any firmware */</div><div class='add'>+	if (!hermes_present(hw))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Download the firmware into the card, this also does a PCMCIA soft</div><div class='add'>+ * reset on the card, to make sure it's in a sane state.</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+symbol_dl_firmware(struct orinoco_private *priv,</div><div class='add'>+		   const struct fw_info *fw)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = priv-&gt;ndev;</div><div class='add'>+	int ret;</div><div class='add'>+	const struct firmware *fw_entry;</div><div class='add'>+</div><div class='add'>+	if (request_firmware(&amp;fw_entry, fw-&gt;pri_fw,</div><div class='add'>+			     priv-&gt;dev) != 0) {</div><div class='add'>+		printk(KERN_ERR "%s: Cannot find firmware: %s\n",</div><div class='add'>+		       dev-&gt;name, fw-&gt;pri_fw);</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Load primary firmware */</div><div class='add'>+	ret = symbol_dl_image(priv, fw, fw_entry-&gt;data,</div><div class='add'>+			      fw_entry-&gt;data + fw_entry-&gt;size, 0);</div><div class='add'>+	release_firmware(fw_entry);</div><div class='add'>+	if (ret) {</div><div class='add'>+		printk(KERN_ERR "%s: Primary firmware download failed\n",</div><div class='add'>+		       dev-&gt;name);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (request_firmware(&amp;fw_entry, fw-&gt;sta_fw,</div><div class='add'>+			     priv-&gt;dev) != 0) {</div><div class='add'>+		printk(KERN_ERR "%s: Cannot find firmware: %s\n",</div><div class='add'>+		       dev-&gt;name, fw-&gt;sta_fw);</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Load secondary firmware */</div><div class='add'>+	ret = symbol_dl_image(priv, fw, fw_entry-&gt;data,</div><div class='add'>+			      fw_entry-&gt;data + fw_entry-&gt;size, 1);</div><div class='add'>+	release_firmware(fw_entry);</div><div class='add'>+	if (ret) {</div><div class='add'>+		printk(KERN_ERR "%s: Secondary firmware download failed\n",</div><div class='add'>+		       dev-&gt;name);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int orinoco_download(struct orinoco_private *priv)</div><div class='add'>+{</div><div class='add'>+	int err = 0;</div><div class='add'>+	/* Reload firmware */</div><div class='add'>+	switch (priv-&gt;firmware_type) {</div><div class='add'>+	case FIRMWARE_TYPE_AGERE:</div><div class='add'>+		/* case FIRMWARE_TYPE_INTERSIL: */</div><div class='add'>+		err = orinoco_dl_firmware(priv,</div><div class='add'>+					  &amp;orinoco_fw[priv-&gt;firmware_type], 0);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case FIRMWARE_TYPE_SYMBOL:</div><div class='add'>+		err = symbol_dl_firmware(priv,</div><div class='add'>+					 &amp;orinoco_fw[priv-&gt;firmware_type]);</div><div class='add'>+		break;</div><div class='add'>+	case FIRMWARE_TYPE_INTERSIL:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	/* TODO: if we fail we probably need to reinitialise</div><div class='add'>+	 * the driver */</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /********************************************************************/</div><div class='hunk'>@@ -453,8 +835,7 @@ static int orinoco_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	u16 txfid = priv-&gt;txfid;</div><div class='ctx'> 	struct ethhdr *eh;</div><div class='del'>-	int data_off;</div><div class='del'>-	struct hermes_tx_descriptor desc;</div><div class='add'>+	int tx_control;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	if (! netif_running(dev)) {</div><div class='hunk'>@@ -486,23 +867,54 @@ static int orinoco_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	if (skb-&gt;len &lt; ETH_HLEN)</div><div class='ctx'> 		goto drop;</div><div class='ctx'> </div><div class='del'>-	eh = (struct ethhdr *)skb-&gt;data;</div><div class='add'>+	tx_control = HERMES_TXCTRL_TX_OK | HERMES_TXCTRL_TX_EX;</div><div class='ctx'> </div><div class='del'>-	memset(&amp;desc, 0, sizeof(desc));</div><div class='del'>- 	desc.tx_control = cpu_to_le16(HERMES_TXCTRL_TX_OK | HERMES_TXCTRL_TX_EX);</div><div class='del'>-	err = hermes_bap_pwrite(hw, USER_BAP, &amp;desc, sizeof(desc), txfid, 0);</div><div class='del'>-	if (err) {</div><div class='del'>-		if (net_ratelimit())</div><div class='del'>-			printk(KERN_ERR "%s: Error %d writing Tx descriptor "</div><div class='del'>-			       "to BAP\n", dev-&gt;name, err);</div><div class='del'>-		goto busy;</div><div class='add'>+	if (priv-&gt;encode_alg == IW_ENCODE_ALG_TKIP)</div><div class='add'>+		tx_control |= (priv-&gt;tx_key &lt;&lt; HERMES_MIC_KEY_ID_SHIFT) |</div><div class='add'>+			HERMES_TXCTRL_MIC;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;has_alt_txcntl) {</div><div class='add'>+		/* WPA enabled firmwares have tx_cntl at the end of</div><div class='add'>+		 * the 802.11 header.  So write zeroed descriptor and</div><div class='add'>+		 * 802.11 header at the same time</div><div class='add'>+		 */</div><div class='add'>+		char desc[HERMES_802_3_OFFSET];</div><div class='add'>+		__le16 *txcntl = (__le16 *) &amp;desc[HERMES_TXCNTL2_OFFSET];</div><div class='add'>+</div><div class='add'>+		memset(&amp;desc, 0, sizeof(desc));</div><div class='add'>+</div><div class='add'>+		*txcntl = cpu_to_le16(tx_control);</div><div class='add'>+		err = hermes_bap_pwrite(hw, USER_BAP, &amp;desc, sizeof(desc),</div><div class='add'>+					txfid, 0);</div><div class='add'>+		if (err) {</div><div class='add'>+			if (net_ratelimit())</div><div class='add'>+				printk(KERN_ERR "%s: Error %d writing Tx "</div><div class='add'>+				       "descriptor to BAP\n", dev-&gt;name, err);</div><div class='add'>+			goto busy;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		struct hermes_tx_descriptor desc;</div><div class='add'>+</div><div class='add'>+		memset(&amp;desc, 0, sizeof(desc));</div><div class='add'>+</div><div class='add'>+		desc.tx_control = cpu_to_le16(tx_control);</div><div class='add'>+		err = hermes_bap_pwrite(hw, USER_BAP, &amp;desc, sizeof(desc),</div><div class='add'>+					txfid, 0);</div><div class='add'>+		if (err) {</div><div class='add'>+			if (net_ratelimit())</div><div class='add'>+				printk(KERN_ERR "%s: Error %d writing Tx "</div><div class='add'>+				       "descriptor to BAP\n", dev-&gt;name, err);</div><div class='add'>+			goto busy;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Clear the 802.11 header and data length fields - some</div><div class='add'>+		 * firmwares (e.g. Lucent/Agere 8.xx) appear to get confused</div><div class='add'>+		 * if this isn't done. */</div><div class='add'>+		hermes_clear_words(hw, HERMES_DATA0,</div><div class='add'>+				   HERMES_802_3_OFFSET - HERMES_802_11_OFFSET);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Clear the 802.11 header and data length fields - some</div><div class='del'>-	 * firmwares (e.g. Lucent/Agere 8.xx) appear to get confused</div><div class='del'>-	 * if this isn't done. */</div><div class='del'>-	hermes_clear_words(hw, HERMES_DATA0,</div><div class='del'>-			   HERMES_802_3_OFFSET - HERMES_802_11_OFFSET);</div><div class='add'>+	eh = (struct ethhdr *)skb-&gt;data;</div><div class='ctx'> </div><div class='ctx'> 	/* Encapsulate Ethernet-II frames */</div><div class='ctx'> 	if (ntohs(eh-&gt;h_proto) &gt; ETH_DATA_LEN) { /* Ethernet-II frame */</div><div class='hunk'>@@ -513,33 +925,65 @@ static int orinoco_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 		/* Strip destination and source from the data */</div><div class='ctx'> 		skb_pull(skb, 2 * ETH_ALEN);</div><div class='del'>-		data_off = HERMES_802_2_OFFSET + sizeof(encaps_hdr);</div><div class='ctx'> </div><div class='ctx'> 		/* And move them to a separate header */</div><div class='ctx'> 		memcpy(&amp;hdr.eth, eh, 2 * ETH_ALEN);</div><div class='ctx'> 		hdr.eth.h_proto = htons(sizeof(encaps_hdr) + skb-&gt;len);</div><div class='ctx'> 		memcpy(hdr.encap, encaps_hdr, sizeof(encaps_hdr));</div><div class='ctx'> </div><div class='del'>-		err = hermes_bap_pwrite(hw, USER_BAP, &amp;hdr, sizeof(hdr),</div><div class='del'>-					txfid, HERMES_802_3_OFFSET);</div><div class='del'>-		if (err) {</div><div class='del'>-			if (net_ratelimit())</div><div class='del'>-				printk(KERN_ERR "%s: Error %d writing packet "</div><div class='del'>-				       "header to BAP\n", dev-&gt;name, err);</div><div class='del'>-			goto busy;</div><div class='add'>+		/* Insert the SNAP header */</div><div class='add'>+		if (skb_headroom(skb) &lt; sizeof(hdr)) {</div><div class='add'>+			printk(KERN_ERR</div><div class='add'>+			       "%s: Not enough headroom for 802.2 headers %d\n",</div><div class='add'>+			       dev-&gt;name, skb_headroom(skb));</div><div class='add'>+			goto drop;</div><div class='ctx'> 		}</div><div class='del'>-	} else { /* IEEE 802.3 frame */</div><div class='del'>-		data_off = HERMES_802_3_OFFSET;</div><div class='add'>+		eh = (struct ethhdr *) skb_push(skb, sizeof(hdr));</div><div class='add'>+		memcpy(eh, &amp;hdr, sizeof(hdr));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = hermes_bap_pwrite(hw, USER_BAP, skb-&gt;data, skb-&gt;len,</div><div class='del'>-				txfid, data_off);</div><div class='add'>+				txfid, HERMES_802_3_OFFSET);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		printk(KERN_ERR "%s: Error %d writing packet to BAP\n",</div><div class='ctx'> 		       dev-&gt;name, err);</div><div class='ctx'> 		goto busy;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Calculate Michael MIC */</div><div class='add'>+	if (priv-&gt;encode_alg == IW_ENCODE_ALG_TKIP) {</div><div class='add'>+		u8 mic_buf[MICHAEL_MIC_LEN + 1];</div><div class='add'>+		u8 *mic;</div><div class='add'>+		size_t offset;</div><div class='add'>+		size_t len;</div><div class='add'>+</div><div class='add'>+		if (skb-&gt;len % 2) {</div><div class='add'>+			/* MIC start is on an odd boundary */</div><div class='add'>+			mic_buf[0] = skb-&gt;data[skb-&gt;len - 1];</div><div class='add'>+			mic = &amp;mic_buf[1];</div><div class='add'>+			offset = skb-&gt;len - 1;</div><div class='add'>+			len = MICHAEL_MIC_LEN + 1;</div><div class='add'>+		} else {</div><div class='add'>+			mic = &amp;mic_buf[0];</div><div class='add'>+			offset = skb-&gt;len;</div><div class='add'>+			len = MICHAEL_MIC_LEN;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		michael_mic(priv-&gt;tx_tfm_mic,</div><div class='add'>+			    priv-&gt;tkip_key[priv-&gt;tx_key].tx_mic,</div><div class='add'>+			    eh-&gt;h_dest, eh-&gt;h_source, 0 /* priority */,</div><div class='add'>+			    skb-&gt;data + ETH_HLEN, skb-&gt;len - ETH_HLEN, mic);</div><div class='add'>+</div><div class='add'>+		/* Write the MIC */</div><div class='add'>+		err = hermes_bap_pwrite(hw, USER_BAP, &amp;mic_buf[0], len,</div><div class='add'>+					txfid, HERMES_802_3_OFFSET + offset);</div><div class='add'>+		if (err) {</div><div class='add'>+			printk(KERN_ERR "%s: Error %d writing MIC to BAP\n",</div><div class='add'>+			       dev-&gt;name, err);</div><div class='add'>+			goto busy;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Finally, we actually initiate the send */</div><div class='ctx'> 	netif_stop_queue(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -554,7 +998,7 @@ static int orinoco_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;trans_start = jiffies;</div><div class='del'>-	stats-&gt;tx_bytes += data_off + skb-&gt;len;</div><div class='add'>+	stats-&gt;tx_bytes += HERMES_802_3_OFFSET + skb-&gt;len;</div><div class='ctx'> 	goto ok;</div><div class='ctx'> </div><div class='ctx'>  drop:</div><div class='hunk'>@@ -834,21 +1278,48 @@ static void orinoco_rx_monitor(struct net_device *dev, u16 rxfid,</div><div class='ctx'> 	stats-&gt;rx_dropped++;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Get tsc from the firmware */</div><div class='add'>+static int orinoco_hw_get_tkip_iv(struct orinoco_private *priv, int key,</div><div class='add'>+				  u8 *tsc)</div><div class='add'>+{</div><div class='add'>+	hermes_t *hw = &amp;priv-&gt;hw;</div><div class='add'>+	int err = 0;</div><div class='add'>+	u8 tsc_arr[4][IW_ENCODE_SEQ_MAX_SIZE];</div><div class='add'>+</div><div class='add'>+	if ((key &lt; 0) || (key &gt; 4))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	err = hermes_read_ltv(hw, USER_BAP, HERMES_RID_CURRENT_TKIP_IV,</div><div class='add'>+			      sizeof(tsc_arr), NULL, &amp;tsc_arr);</div><div class='add'>+	if (!err)</div><div class='add'>+		memcpy(tsc, &amp;tsc_arr[key][0], sizeof(tsc_arr[0]));</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void __orinoco_ev_rx(struct net_device *dev, hermes_t *hw)</div><div class='ctx'> {</div><div class='ctx'> 	struct orinoco_private *priv = netdev_priv(dev);</div><div class='ctx'> 	struct net_device_stats *stats = &amp;priv-&gt;stats;</div><div class='ctx'> 	struct iw_statistics *wstats = &amp;priv-&gt;wstats;</div><div class='ctx'> 	struct sk_buff *skb = NULL;</div><div class='del'>-	u16 rxfid, status, fc;</div><div class='add'>+	u16 rxfid, status;</div><div class='ctx'> 	int length;</div><div class='del'>-	struct hermes_rx_descriptor desc;</div><div class='del'>-	struct ethhdr *hdr;</div><div class='add'>+	struct hermes_rx_descriptor *desc;</div><div class='add'>+	struct orinoco_rx_data *rx_data;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='add'>+	desc = kmalloc(sizeof(*desc), GFP_ATOMIC);</div><div class='add'>+	if (!desc) {</div><div class='add'>+		printk(KERN_WARNING</div><div class='add'>+		       "%s: Can't allocate space for RX descriptor\n",</div><div class='add'>+		       dev-&gt;name);</div><div class='add'>+		goto update_stats;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	rxfid = hermes_read_regn(hw, RXFID);</div><div class='ctx'> </div><div class='del'>-	err = hermes_bap_pread(hw, IRQ_BAP, &amp;desc, sizeof(desc),</div><div class='add'>+	err = hermes_bap_pread(hw, IRQ_BAP, desc, sizeof(*desc),</div><div class='ctx'> 			       rxfid, 0);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		printk(KERN_ERR "%s: error %d reading Rx descriptor. "</div><div class='hunk'>@@ -856,7 +1327,7 @@ static void __orinoco_ev_rx(struct net_device *dev, hermes_t *hw)</div><div class='ctx'> 		goto update_stats;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	status = le16_to_cpu(desc.status);</div><div class='add'>+	status = le16_to_cpu(desc-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	if (status &amp; HERMES_RXSTAT_BADCRC) {</div><div class='ctx'> 		DEBUG(1, "%s: Bad CRC on Rx. Frame dropped.\n",</div><div class='hunk'>@@ -867,8 +1338,8 @@ static void __orinoco_ev_rx(struct net_device *dev, hermes_t *hw)</div><div class='ctx'> </div><div class='ctx'> 	/* Handle frames in monitor mode */</div><div class='ctx'> 	if (priv-&gt;iw_mode == IW_MODE_MONITOR) {</div><div class='del'>-		orinoco_rx_monitor(dev, rxfid, &amp;desc);</div><div class='del'>-		return;</div><div class='add'>+		orinoco_rx_monitor(dev, rxfid, desc);</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (status &amp; HERMES_RXSTAT_UNDECRYPTABLE) {</div><div class='hunk'>@@ -878,15 +1349,14 @@ static void __orinoco_ev_rx(struct net_device *dev, hermes_t *hw)</div><div class='ctx'> 		goto update_stats;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	length = le16_to_cpu(desc.data_len);</div><div class='del'>-	fc = le16_to_cpu(desc.frame_ctl);</div><div class='add'>+	length = le16_to_cpu(desc-&gt;data_len);</div><div class='ctx'> </div><div class='ctx'> 	/* Sanity checks */</div><div class='ctx'> 	if (length &lt; 3) { /* No for even an 802.2 LLC header */</div><div class='ctx'> 		/* At least on Symbol firmware with PCF we get quite a</div><div class='ctx'>                    lot of these legitimately - Poll frames with no</div><div class='ctx'>                    data. */</div><div class='del'>-		return;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (length &gt; IEEE80211_DATA_LEN) {</div><div class='ctx'> 		printk(KERN_WARNING "%s: Oversized frame received (%d bytes)\n",</div><div class='hunk'>@@ -895,6 +1365,11 @@ static void __orinoco_ev_rx(struct net_device *dev, hermes_t *hw)</div><div class='ctx'> 		goto update_stats;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Payload size does not include Michael MIC. Increase payload</div><div class='add'>+	 * size to read it together with the data. */</div><div class='add'>+	if (status &amp; HERMES_RXSTAT_MIC)</div><div class='add'>+		length += MICHAEL_MIC_LEN;</div><div class='add'>+</div><div class='ctx'> 	/* We need space for the packet data itself, plus an ethernet</div><div class='ctx'> 	   header, plus 2 bytes so we can align the IP header on a</div><div class='ctx'> 	   32bit boundary, plus 1 byte so we can read in odd length</div><div class='hunk'>@@ -921,6 +1396,100 @@ static void __orinoco_ev_rx(struct net_device *dev, hermes_t *hw)</div><div class='ctx'> 		goto drop;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Add desc and skb to rx queue */</div><div class='add'>+	rx_data = kzalloc(sizeof(*rx_data), GFP_ATOMIC);</div><div class='add'>+	if (!rx_data) {</div><div class='add'>+		printk(KERN_WARNING "%s: Can't allocate RX packet\n",</div><div class='add'>+			dev-&gt;name);</div><div class='add'>+		goto drop;</div><div class='add'>+	}</div><div class='add'>+	rx_data-&gt;desc = desc;</div><div class='add'>+	rx_data-&gt;skb = skb;</div><div class='add'>+	list_add_tail(&amp;rx_data-&gt;list, &amp;priv-&gt;rx_list);</div><div class='add'>+	tasklet_schedule(&amp;priv-&gt;rx_tasklet);</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+drop:</div><div class='add'>+	dev_kfree_skb_irq(skb);</div><div class='add'>+update_stats:</div><div class='add'>+	stats-&gt;rx_errors++;</div><div class='add'>+	stats-&gt;rx_dropped++;</div><div class='add'>+out:</div><div class='add'>+	kfree(desc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void orinoco_rx(struct net_device *dev,</div><div class='add'>+		       struct hermes_rx_descriptor *desc,</div><div class='add'>+		       struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct orinoco_private *priv = netdev_priv(dev);</div><div class='add'>+	struct net_device_stats *stats = &amp;priv-&gt;stats;</div><div class='add'>+	u16 status, fc;</div><div class='add'>+	int length;</div><div class='add'>+	struct ethhdr *hdr;</div><div class='add'>+</div><div class='add'>+	status = le16_to_cpu(desc-&gt;status);</div><div class='add'>+	length = le16_to_cpu(desc-&gt;data_len);</div><div class='add'>+	fc = le16_to_cpu(desc-&gt;frame_ctl);</div><div class='add'>+</div><div class='add'>+	/* Calculate and check MIC */</div><div class='add'>+	if (status &amp; HERMES_RXSTAT_MIC) {</div><div class='add'>+		int key_id = ((status &amp; HERMES_RXSTAT_MIC_KEY_ID) &gt;&gt;</div><div class='add'>+			      HERMES_MIC_KEY_ID_SHIFT);</div><div class='add'>+		u8 mic[MICHAEL_MIC_LEN];</div><div class='add'>+		u8 *rxmic;</div><div class='add'>+		u8 *src = (fc &amp; IEEE80211_FCTL_FROMDS) ?</div><div class='add'>+			desc-&gt;addr3 : desc-&gt;addr2;</div><div class='add'>+</div><div class='add'>+		/* Extract Michael MIC from payload */</div><div class='add'>+		rxmic = skb-&gt;data + skb-&gt;len - MICHAEL_MIC_LEN;</div><div class='add'>+</div><div class='add'>+		skb_trim(skb, skb-&gt;len - MICHAEL_MIC_LEN);</div><div class='add'>+		length -= MICHAEL_MIC_LEN;</div><div class='add'>+</div><div class='add'>+		michael_mic(priv-&gt;rx_tfm_mic,</div><div class='add'>+			    priv-&gt;tkip_key[key_id].rx_mic,</div><div class='add'>+			    desc-&gt;addr1,</div><div class='add'>+			    src,</div><div class='add'>+			    0, /* priority or QoS? */</div><div class='add'>+			    skb-&gt;data,</div><div class='add'>+			    skb-&gt;len,</div><div class='add'>+			    &amp;mic[0]);</div><div class='add'>+</div><div class='add'>+		if (memcmp(mic, rxmic,</div><div class='add'>+			   MICHAEL_MIC_LEN)) {</div><div class='add'>+			union iwreq_data wrqu;</div><div class='add'>+			struct iw_michaelmicfailure wxmic;</div><div class='add'>+			DECLARE_MAC_BUF(mac);</div><div class='add'>+</div><div class='add'>+			printk(KERN_WARNING "%s: "</div><div class='add'>+			       "Invalid Michael MIC in data frame from %s, "</div><div class='add'>+			       "using key %i\n",</div><div class='add'>+			       dev-&gt;name, print_mac(mac, src), key_id);</div><div class='add'>+</div><div class='add'>+			/* TODO: update stats */</div><div class='add'>+</div><div class='add'>+			/* Notify userspace */</div><div class='add'>+			memset(&amp;wxmic, 0, sizeof(wxmic));</div><div class='add'>+			wxmic.flags = key_id &amp; IW_MICFAILURE_KEY_ID;</div><div class='add'>+			wxmic.flags |= (desc-&gt;addr1[0] &amp; 1) ?</div><div class='add'>+				IW_MICFAILURE_GROUP : IW_MICFAILURE_PAIRWISE;</div><div class='add'>+			wxmic.src_addr.sa_family = ARPHRD_ETHER;</div><div class='add'>+			memcpy(wxmic.src_addr.sa_data, src, ETH_ALEN);</div><div class='add'>+</div><div class='add'>+			(void) orinoco_hw_get_tkip_iv(priv, key_id,</div><div class='add'>+						      &amp;wxmic.tsc[0]);</div><div class='add'>+</div><div class='add'>+			memset(&amp;wrqu, 0, sizeof(wrqu));</div><div class='add'>+			wrqu.data.length = sizeof(wxmic);</div><div class='add'>+			wireless_send_event(dev, IWEVMICHAELMICFAILURE, &amp;wrqu,</div><div class='add'>+					    (char *) &amp;wxmic);</div><div class='add'>+</div><div class='add'>+			goto drop;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Handle decapsulation</div><div class='ctx'> 	 * In most cases, the firmware tell us about SNAP frames.</div><div class='ctx'> 	 * For some reason, the SNAP frames sent by LinkSys APs</div><div class='hunk'>@@ -939,11 +1508,11 @@ static void __orinoco_ev_rx(struct net_device *dev, hermes_t *hw)</div><div class='ctx'> 		hdr = (struct ethhdr *)skb_push(skb, ETH_HLEN);</div><div class='ctx'> 		hdr-&gt;h_proto = htons(length);</div><div class='ctx'> 	}</div><div class='del'>-	memcpy(hdr-&gt;h_dest, desc.addr1, ETH_ALEN);</div><div class='add'>+	memcpy(hdr-&gt;h_dest, desc-&gt;addr1, ETH_ALEN);</div><div class='ctx'> 	if (fc &amp; IEEE80211_FCTL_FROMDS)</div><div class='del'>-		memcpy(hdr-&gt;h_source, desc.addr3, ETH_ALEN);</div><div class='add'>+		memcpy(hdr-&gt;h_source, desc-&gt;addr3, ETH_ALEN);</div><div class='ctx'> 	else</div><div class='del'>-		memcpy(hdr-&gt;h_source, desc.addr2, ETH_ALEN);</div><div class='add'>+		memcpy(hdr-&gt;h_source, desc-&gt;addr2, ETH_ALEN);</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;last_rx = jiffies;</div><div class='ctx'> 	skb-&gt;protocol = eth_type_trans(skb, dev);</div><div class='hunk'>@@ -952,7 +1521,7 @@ static void __orinoco_ev_rx(struct net_device *dev, hermes_t *hw)</div><div class='ctx'> 		skb-&gt;pkt_type = PACKET_OTHERHOST;</div><div class='ctx'> 	</div><div class='ctx'> 	/* Process the wireless stats if needed */</div><div class='del'>-	orinoco_stat_gather(dev, skb, &amp;desc);</div><div class='add'>+	orinoco_stat_gather(dev, skb, desc);</div><div class='ctx'> </div><div class='ctx'> 	/* Pass the packet to the networking stack */</div><div class='ctx'> 	netif_rx(skb);</div><div class='hunk'>@@ -961,13 +1530,33 @@ static void __orinoco_ev_rx(struct net_device *dev, hermes_t *hw)</div><div class='ctx'> </div><div class='ctx'> 	return;</div><div class='ctx'> </div><div class='del'>- drop:	</div><div class='del'>-	dev_kfree_skb_irq(skb);</div><div class='del'>- update_stats:</div><div class='add'>+ drop:</div><div class='add'>+	dev_kfree_skb(skb);</div><div class='ctx'> 	stats-&gt;rx_errors++;</div><div class='ctx'> 	stats-&gt;rx_dropped++;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void orinoco_rx_isr_tasklet(unsigned long data)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = (struct net_device *) data;</div><div class='add'>+	struct orinoco_private *priv = netdev_priv(dev);</div><div class='add'>+	struct orinoco_rx_data *rx_data, *temp;</div><div class='add'>+	struct hermes_rx_descriptor *desc;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	/* extract desc and skb from queue */</div><div class='add'>+	list_for_each_entry_safe(rx_data, temp, &amp;priv-&gt;rx_list, list) {</div><div class='add'>+		desc = rx_data-&gt;desc;</div><div class='add'>+		skb = rx_data-&gt;skb;</div><div class='add'>+		list_del(&amp;rx_data-&gt;list);</div><div class='add'>+		kfree(rx_data);</div><div class='add'>+</div><div class='add'>+		orinoco_rx(dev, desc, skb);</div><div class='add'>+</div><div class='add'>+		kfree(desc);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /********************************************************************/</div><div class='ctx'> /* Rx path (info frames)                                            */</div><div class='ctx'> /********************************************************************/</div><div class='hunk'>@@ -1087,52 +1676,172 @@ static void orinoco_join_ap(struct work_struct *work)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Send new BSSID to userspace */</div><div class='del'>-static void orinoco_send_wevents(struct work_struct *work)</div><div class='add'>+static void orinoco_send_bssid_wevent(struct orinoco_private *priv)</div><div class='ctx'> {</div><div class='del'>-	struct orinoco_private *priv =</div><div class='del'>-		container_of(work, struct orinoco_private, wevent_work);</div><div class='ctx'> 	struct net_device *dev = priv-&gt;ndev;</div><div class='ctx'> 	struct hermes *hw = &amp;priv-&gt;hw;</div><div class='ctx'> 	union iwreq_data wrqu;</div><div class='ctx'> 	int err;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	if (orinoco_lock(priv, &amp;flags) != 0)</div><div class='del'>-		return;</div><div class='ctx'> </div><div class='ctx'> 	err = hermes_read_ltv(hw, IRQ_BAP, HERMES_RID_CURRENTBSSID,</div><div class='ctx'> 			      ETH_ALEN, NULL, wrqu.ap_addr.sa_data);</div><div class='ctx'> 	if (err != 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	wrqu.ap_addr.sa_family = ARPHRD_ETHER;</div><div class='ctx'> </div><div class='ctx'> 	/* Send event to user space */</div><div class='ctx'> 	wireless_send_event(dev, SIOCGIWAP, &amp;wrqu, NULL);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>- out:</div><div class='del'>-	orinoco_unlock(priv, &amp;flags);</div><div class='add'>+static void orinoco_send_assocreqie_wevent(struct orinoco_private *priv)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = priv-&gt;ndev;</div><div class='add'>+	struct hermes *hw = &amp;priv-&gt;hw;</div><div class='add'>+	union iwreq_data wrqu;</div><div class='add'>+	int err;</div><div class='add'>+	u8 buf[88];</div><div class='add'>+	u8 *ie;</div><div class='add'>+</div><div class='add'>+	if (!priv-&gt;has_wpa)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	err = hermes_read_ltv(hw, IRQ_BAP, HERMES_RID_CURRENT_ASSOC_REQ_INFO,</div><div class='add'>+			      sizeof(buf), NULL, &amp;buf);</div><div class='add'>+	if (err != 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ie = orinoco_get_wpa_ie(buf, sizeof(buf));</div><div class='add'>+	if (ie) {</div><div class='add'>+		int rem = sizeof(buf) - (ie - &amp;buf[0]);</div><div class='add'>+		wrqu.data.length = ie[1] + 2;</div><div class='add'>+		if (wrqu.data.length &gt; rem)</div><div class='add'>+			wrqu.data.length = rem;</div><div class='add'>+</div><div class='add'>+		if (wrqu.data.length)</div><div class='add'>+			/* Send event to user space */</div><div class='add'>+			wireless_send_event(dev, IWEVASSOCREQIE, &amp;wrqu, ie);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void orinoco_send_assocrespie_wevent(struct orinoco_private *priv)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = priv-&gt;ndev;</div><div class='add'>+	struct hermes *hw = &amp;priv-&gt;hw;</div><div class='add'>+	union iwreq_data wrqu;</div><div class='add'>+	int err;</div><div class='add'>+	u8 buf[88]; /* TODO: verify max size or IW_GENERIC_IE_MAX */</div><div class='add'>+	u8 *ie;</div><div class='add'>+</div><div class='add'>+	if (!priv-&gt;has_wpa)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	err = hermes_read_ltv(hw, IRQ_BAP, HERMES_RID_CURRENT_ASSOC_RESP_INFO,</div><div class='add'>+			      sizeof(buf), NULL, &amp;buf);</div><div class='add'>+	if (err != 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ie = orinoco_get_wpa_ie(buf, sizeof(buf));</div><div class='add'>+	if (ie) {</div><div class='add'>+		int rem = sizeof(buf) - (ie - &amp;buf[0]);</div><div class='add'>+		wrqu.data.length = ie[1] + 2;</div><div class='add'>+		if (wrqu.data.length &gt; rem)</div><div class='add'>+			wrqu.data.length = rem;</div><div class='add'>+</div><div class='add'>+		if (wrqu.data.length)</div><div class='add'>+			/* Send event to user space */</div><div class='add'>+			wireless_send_event(dev, IWEVASSOCRESPIE, &amp;wrqu, ie);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void orinoco_send_wevents(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct orinoco_private *priv =</div><div class='add'>+		container_of(work, struct orinoco_private, wevent_work);</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	if (orinoco_lock(priv, &amp;flags) != 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	orinoco_send_assocreqie_wevent(priv);</div><div class='add'>+	orinoco_send_assocrespie_wevent(priv);</div><div class='add'>+	orinoco_send_bssid_wevent(priv);</div><div class='add'>+</div><div class='add'>+	orinoco_unlock(priv, &amp;flags);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static inline void orinoco_clear_scan_results(struct orinoco_private *priv,</div><div class='ctx'> 					      unsigned long scan_age)</div><div class='ctx'> {</div><div class='del'>-	bss_element *bss;</div><div class='del'>-	bss_element *tmp_bss;</div><div class='del'>-</div><div class='del'>-	/* Blow away current list of scan results */</div><div class='del'>-	list_for_each_entry_safe(bss, tmp_bss, &amp;priv-&gt;bss_list, list) {</div><div class='del'>-		if (!scan_age ||</div><div class='del'>-		    time_after(jiffies, bss-&gt;last_scanned + scan_age)) {</div><div class='del'>-			list_move_tail(&amp;bss-&gt;list, &amp;priv-&gt;bss_free_list);</div><div class='del'>-			/* Don't blow away -&gt;list, just BSS data */</div><div class='del'>-			memset(bss, 0, sizeof(bss-&gt;bss));</div><div class='del'>-			bss-&gt;last_scanned = 0;</div><div class='add'>+	if (priv-&gt;has_ext_scan) {</div><div class='add'>+		struct xbss_element *bss;</div><div class='add'>+		struct xbss_element *tmp_bss;</div><div class='add'>+</div><div class='add'>+		/* Blow away current list of scan results */</div><div class='add'>+		list_for_each_entry_safe(bss, tmp_bss, &amp;priv-&gt;bss_list, list) {</div><div class='add'>+			if (!scan_age ||</div><div class='add'>+			    time_after(jiffies, bss-&gt;last_scanned + scan_age)) {</div><div class='add'>+				list_move_tail(&amp;bss-&gt;list,</div><div class='add'>+					       &amp;priv-&gt;bss_free_list);</div><div class='add'>+				/* Don't blow away -&gt;list, just BSS data */</div><div class='add'>+				memset(&amp;bss-&gt;bss, 0, sizeof(bss-&gt;bss));</div><div class='add'>+				bss-&gt;last_scanned = 0;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		struct bss_element *bss;</div><div class='add'>+		struct bss_element *tmp_bss;</div><div class='add'>+</div><div class='add'>+		/* Blow away current list of scan results */</div><div class='add'>+		list_for_each_entry_safe(bss, tmp_bss, &amp;priv-&gt;bss_list, list) {</div><div class='add'>+			if (!scan_age ||</div><div class='add'>+			    time_after(jiffies, bss-&gt;last_scanned + scan_age)) {</div><div class='add'>+				list_move_tail(&amp;bss-&gt;list,</div><div class='add'>+					       &amp;priv-&gt;bss_free_list);</div><div class='add'>+				/* Don't blow away -&gt;list, just BSS data */</div><div class='add'>+				memset(&amp;bss-&gt;bss, 0, sizeof(bss-&gt;bss));</div><div class='add'>+				bss-&gt;last_scanned = 0;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void orinoco_add_ext_scan_result(struct orinoco_private *priv,</div><div class='add'>+					struct agere_ext_scan_info *atom)</div><div class='add'>+{</div><div class='add'>+	struct xbss_element *bss = NULL;</div><div class='add'>+	int found = 0;</div><div class='add'>+</div><div class='add'>+	/* Try to update an existing bss first */</div><div class='add'>+	list_for_each_entry(bss, &amp;priv-&gt;bss_list, list) {</div><div class='add'>+		if (compare_ether_addr(bss-&gt;bss.bssid, atom-&gt;bssid))</div><div class='add'>+			continue;</div><div class='add'>+		/* ESSID lengths */</div><div class='add'>+		if (bss-&gt;bss.data[1] != atom-&gt;data[1])</div><div class='add'>+			continue;</div><div class='add'>+		if (memcmp(&amp;bss-&gt;bss.data[2], &amp;atom-&gt;data[2],</div><div class='add'>+			   atom-&gt;data[1]))</div><div class='add'>+			continue;</div><div class='add'>+		found = 1;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Grab a bss off the free list */</div><div class='add'>+	if (!found &amp;&amp; !list_empty(&amp;priv-&gt;bss_free_list)) {</div><div class='add'>+		bss = list_entry(priv-&gt;bss_free_list.next,</div><div class='add'>+				 struct xbss_element, list);</div><div class='add'>+		list_del(priv-&gt;bss_free_list.next);</div><div class='add'>+</div><div class='add'>+		list_add_tail(&amp;bss-&gt;list, &amp;priv-&gt;bss_list);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (bss) {</div><div class='add'>+		/* Always update the BSS to get latest beacon info */</div><div class='add'>+		memcpy(&amp;bss-&gt;bss, atom, sizeof(bss-&gt;bss));</div><div class='add'>+		bss-&gt;last_scanned = jiffies;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int orinoco_process_scan_results(struct net_device *dev,</div><div class='ctx'> 					unsigned char *buf,</div><div class='ctx'> 					int len)</div><div class='hunk'>@@ -1194,7 +1903,7 @@ static int orinoco_process_scan_results(struct net_device *dev,</div><div class='ctx'> 	/* Read the entries one by one */</div><div class='ctx'> 	for (; offset + atom_len &lt;= len; offset += atom_len) {</div><div class='ctx'> 		int found = 0;</div><div class='del'>-		bss_element *bss = NULL;</div><div class='add'>+		struct bss_element *bss = NULL;</div><div class='ctx'> </div><div class='ctx'> 		/* Get next atom */</div><div class='ctx'> 		atom = (union hermes_scan_info *) (buf + offset);</div><div class='hunk'>@@ -1216,7 +1925,7 @@ static int orinoco_process_scan_results(struct net_device *dev,</div><div class='ctx'> 		/* Grab a bss off the free list */</div><div class='ctx'> 		if (!found &amp;&amp; !list_empty(&amp;priv-&gt;bss_free_list)) {</div><div class='ctx'> 			bss = list_entry(priv-&gt;bss_free_list.next,</div><div class='del'>-					 bss_element, list);</div><div class='add'>+					 struct bss_element, list);</div><div class='ctx'> 			list_del(priv-&gt;bss_free_list.next);</div><div class='ctx'> </div><div class='ctx'> 			list_add_tail(&amp;bss-&gt;list, &amp;priv-&gt;bss_list);</div><div class='hunk'>@@ -1404,6 +2113,63 @@ static void __orinoco_ev_info(struct net_device *dev, hermes_t *hw)</div><div class='ctx'> 		kfree(buf);</div><div class='ctx'> 	}</div><div class='ctx'> 	break;</div><div class='add'>+	case HERMES_INQ_CHANNELINFO:</div><div class='add'>+	{</div><div class='add'>+		struct agere_ext_scan_info *bss;</div><div class='add'>+</div><div class='add'>+		if (!priv-&gt;scan_inprogress) {</div><div class='add'>+			printk(KERN_DEBUG "%s: Got chaninfo without scan, "</div><div class='add'>+			       "len=%d\n", dev-&gt;name, len);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* An empty result indicates that the scan is complete */</div><div class='add'>+		if (len == 0) {</div><div class='add'>+			union iwreq_data	wrqu;</div><div class='add'>+</div><div class='add'>+			/* Scan is no longer in progress */</div><div class='add'>+			priv-&gt;scan_inprogress = 0;</div><div class='add'>+</div><div class='add'>+			wrqu.data.length = 0;</div><div class='add'>+			wrqu.data.flags = 0;</div><div class='add'>+			wireless_send_event(dev, SIOCGIWSCAN, &amp;wrqu, NULL);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Sanity check */</div><div class='add'>+		else if (len &gt; sizeof(*bss)) {</div><div class='add'>+			printk(KERN_WARNING</div><div class='add'>+			       "%s: Ext scan results too large (%d bytes). "</div><div class='add'>+			       "Truncating results to %zd bytes.\n",</div><div class='add'>+			       dev-&gt;name, len, sizeof(*bss));</div><div class='add'>+			len = sizeof(*bss);</div><div class='add'>+		} else if (len &lt; (offsetof(struct agere_ext_scan_info,</div><div class='add'>+					   data) + 2)) {</div><div class='add'>+			/* Drop this result now so we don't have to</div><div class='add'>+			 * keep checking later */</div><div class='add'>+			printk(KERN_WARNING</div><div class='add'>+			       "%s: Ext scan results too short (%d bytes)\n",</div><div class='add'>+			       dev-&gt;name, len);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		bss = kmalloc(sizeof(*bss), GFP_ATOMIC);</div><div class='add'>+		if (bss == NULL)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		/* Read scan data */</div><div class='add'>+		err = hermes_bap_pread(hw, IRQ_BAP, (void *) bss, len,</div><div class='add'>+				       infofid, sizeof(info));</div><div class='add'>+		if (err) {</div><div class='add'>+			kfree(bss);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		orinoco_add_ext_scan_result(priv, bss);</div><div class='add'>+</div><div class='add'>+		kfree(bss);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> 	case HERMES_INQ_SEC_STAT_AGERE:</div><div class='ctx'> 		/* Security status (Agere specific) */</div><div class='ctx'> 		/* Ignore this frame for now */</div><div class='hunk'>@@ -1586,7 +2352,7 @@ static int __orinoco_hw_set_wap(struct orinoco_private *priv)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Change the WEP keys and/or the current keys.  Can be called</div><div class='del'>- * either from __orinoco_hw_setup_wep() or directly from</div><div class='add'>+ * either from __orinoco_hw_setup_enc() or directly from</div><div class='ctx'>  * orinoco_ioctl_setiwencode().  In the later case the association</div><div class='ctx'>  * with the AP is not broken (if the firmware can handle it),</div><div class='ctx'>  * which is needed for 802.1x implementations. */</div><div class='hunk'>@@ -1646,14 +2412,16 @@ static int __orinoco_hw_setup_wepkeys(struct orinoco_private *priv)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __orinoco_hw_setup_wep(struct orinoco_private *priv)</div><div class='add'>+static int __orinoco_hw_setup_enc(struct orinoco_private *priv)</div><div class='ctx'> {</div><div class='ctx'> 	hermes_t *hw = &amp;priv-&gt;hw;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	int master_wep_flag;</div><div class='ctx'> 	int auth_flag;</div><div class='add'>+	int enc_flag;</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;wep_on)</div><div class='add'>+	/* Setup WEP keys for WEP and WPA */</div><div class='add'>+	if (priv-&gt;encode_alg)</div><div class='ctx'> 		__orinoco_hw_setup_wepkeys(priv);</div><div class='ctx'> </div><div class='ctx'> 	if (priv-&gt;wep_restrict)</div><div class='hunk'>@@ -1661,9 +2429,16 @@ static int __orinoco_hw_setup_wep(struct orinoco_private *priv)</div><div class='ctx'> 	else</div><div class='ctx'> 		auth_flag = HERMES_AUTH_OPEN;</div><div class='ctx'> </div><div class='add'>+	if (priv-&gt;wpa_enabled)</div><div class='add'>+		enc_flag = 2;</div><div class='add'>+	else if (priv-&gt;encode_alg == IW_ENCODE_ALG_WEP)</div><div class='add'>+		enc_flag = 1;</div><div class='add'>+	else</div><div class='add'>+		enc_flag = 0;</div><div class='add'>+</div><div class='ctx'> 	switch (priv-&gt;firmware_type) {</div><div class='ctx'> 	case FIRMWARE_TYPE_AGERE: /* Agere style WEP */</div><div class='del'>-		if (priv-&gt;wep_on) {</div><div class='add'>+		if (priv-&gt;encode_alg == IW_ENCODE_ALG_WEP) {</div><div class='ctx'> 			/* Enable the shared-key authentication. */</div><div class='ctx'> 			err = hermes_write_wordrec(hw, USER_BAP,</div><div class='ctx'> 						   HERMES_RID_CNFAUTHENTICATION_AGERE,</div><div class='hunk'>@@ -1671,14 +2446,24 @@ static int __orinoco_hw_setup_wep(struct orinoco_private *priv)</div><div class='ctx'> 		}</div><div class='ctx'> 		err = hermes_write_wordrec(hw, USER_BAP,</div><div class='ctx'> 					   HERMES_RID_CNFWEPENABLED_AGERE,</div><div class='del'>-					   priv-&gt;wep_on);</div><div class='add'>+					   enc_flag);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='add'>+</div><div class='add'>+		if (priv-&gt;has_wpa) {</div><div class='add'>+			/* Set WPA key management */</div><div class='add'>+			err = hermes_write_wordrec(hw, USER_BAP,</div><div class='add'>+				  HERMES_RID_CNFSETWPAAUTHMGMTSUITE_AGERE,</div><div class='add'>+				  priv-&gt;key_mgmt);</div><div class='add'>+			if (err)</div><div class='add'>+				return err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case FIRMWARE_TYPE_INTERSIL: /* Intersil style WEP */</div><div class='ctx'> 	case FIRMWARE_TYPE_SYMBOL: /* Symbol style WEP */</div><div class='del'>-		if (priv-&gt;wep_on) {</div><div class='add'>+		if (priv-&gt;encode_alg == IW_ENCODE_ALG_WEP) {</div><div class='ctx'> 			if (priv-&gt;wep_restrict ||</div><div class='ctx'> 			    (priv-&gt;firmware_type == FIRMWARE_TYPE_SYMBOL))</div><div class='ctx'> 				master_wep_flag = HERMES_WEP_PRIVACY_INVOKED |</div><div class='hunk'>@@ -1710,6 +2495,84 @@ static int __orinoco_hw_setup_wep(struct orinoco_private *priv)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* key must be 32 bytes, including the tx and rx MIC keys.</div><div class='add'>+ * rsc must be 8 bytes</div><div class='add'>+ * tsc must be 8 bytes or NULL</div><div class='add'>+ */</div><div class='add'>+static int __orinoco_hw_set_tkip_key(hermes_t *hw, int key_idx, int set_tx,</div><div class='add'>+				     u8 *key, u8 *rsc, u8 *tsc)</div><div class='add'>+{</div><div class='add'>+	struct {</div><div class='add'>+		__le16 idx;</div><div class='add'>+		u8 rsc[IW_ENCODE_SEQ_MAX_SIZE];</div><div class='add'>+		u8 key[TKIP_KEYLEN];</div><div class='add'>+		u8 tx_mic[MIC_KEYLEN];</div><div class='add'>+		u8 rx_mic[MIC_KEYLEN];</div><div class='add'>+		u8 tsc[IW_ENCODE_SEQ_MAX_SIZE];</div><div class='add'>+	} __attribute__ ((packed)) buf;</div><div class='add'>+	int ret;</div><div class='add'>+	int err;</div><div class='add'>+	int k;</div><div class='add'>+	u16 xmitting;</div><div class='add'>+</div><div class='add'>+	key_idx &amp;= 0x3;</div><div class='add'>+</div><div class='add'>+	if (set_tx)</div><div class='add'>+		key_idx |= 0x8000;</div><div class='add'>+</div><div class='add'>+	buf.idx = cpu_to_le16(key_idx);</div><div class='add'>+	memcpy(buf.key, key,</div><div class='add'>+	       sizeof(buf.key) + sizeof(buf.tx_mic) + sizeof(buf.rx_mic));</div><div class='add'>+</div><div class='add'>+	if (rsc == NULL)</div><div class='add'>+		memset(buf.rsc, 0, sizeof(buf.rsc));</div><div class='add'>+	else</div><div class='add'>+		memcpy(buf.rsc, rsc, sizeof(buf.rsc));</div><div class='add'>+</div><div class='add'>+	if (tsc == NULL) {</div><div class='add'>+		memset(buf.tsc, 0, sizeof(buf.tsc));</div><div class='add'>+		buf.tsc[4] = 0x10;</div><div class='add'>+	} else {</div><div class='add'>+		memcpy(buf.tsc, tsc, sizeof(buf.tsc));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Wait upto 100ms for tx queue to empty */</div><div class='add'>+	k = 100;</div><div class='add'>+	do {</div><div class='add'>+		k--;</div><div class='add'>+		udelay(1000);</div><div class='add'>+		ret = hermes_read_wordrec(hw, USER_BAP, HERMES_RID_TXQUEUEEMPTY,</div><div class='add'>+					  &amp;xmitting);</div><div class='add'>+		if (ret)</div><div class='add'>+			break;</div><div class='add'>+	} while ((k &gt; 0) &amp;&amp; xmitting);</div><div class='add'>+</div><div class='add'>+	if (k == 0)</div><div class='add'>+		ret = -ETIMEDOUT;</div><div class='add'>+</div><div class='add'>+	err = HERMES_WRITE_RECORD(hw, USER_BAP,</div><div class='add'>+				  HERMES_RID_CNFADDDEFAULTTKIPKEY_AGERE,</div><div class='add'>+				  &amp;buf);</div><div class='add'>+</div><div class='add'>+	return ret ? ret : err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int orinoco_clear_tkip_key(struct orinoco_private *priv,</div><div class='add'>+				  int key_idx)</div><div class='add'>+{</div><div class='add'>+	hermes_t *hw = &amp;priv-&gt;hw;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	memset(&amp;priv-&gt;tkip_key[key_idx], 0, sizeof(priv-&gt;tkip_key[key_idx]));</div><div class='add'>+	err = hermes_write_wordrec(hw, USER_BAP,</div><div class='add'>+				   HERMES_RID_CNFREMDEFAULTTKIPKEY_AGERE,</div><div class='add'>+				   key_idx);</div><div class='add'>+	if (err)</div><div class='add'>+		printk(KERN_WARNING "%s: Error %d clearing TKIP key %d\n",</div><div class='add'>+		       priv-&gt;ndev-&gt;name, err, key_idx);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int __orinoco_program_rids(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct orinoco_private *priv = netdev_priv(dev);</div><div class='hunk'>@@ -1906,10 +2769,10 @@ static int __orinoco_program_rids(struct net_device *dev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Set up encryption */</div><div class='del'>-	if (priv-&gt;has_wep) {</div><div class='del'>-		err = __orinoco_hw_setup_wep(priv);</div><div class='add'>+	if (priv-&gt;has_wep || priv-&gt;has_wpa) {</div><div class='add'>+		err = __orinoco_hw_setup_enc(priv);</div><div class='ctx'> 		if (err) {</div><div class='del'>-			printk(KERN_ERR "%s: Error %d activating WEP\n",</div><div class='add'>+			printk(KERN_ERR "%s: Error %d activating encryption\n",</div><div class='ctx'> 			       dev-&gt;name, err);</div><div class='ctx'> 			return err;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2047,6 +2910,12 @@ static void orinoco_reset(struct work_struct *work)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (priv-&gt;do_fw_download) {</div><div class='add'>+		err = orinoco_download(priv);</div><div class='add'>+		if (err)</div><div class='add'>+			priv-&gt;do_fw_download = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	err = orinoco_reinit_firmware(dev);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		printk(KERN_ERR "%s: orinoco_reset: Error %d re-initializing firmware\n",</div><div class='hunk'>@@ -2258,6 +3127,10 @@ static int determine_firmware(struct net_device *dev)</div><div class='ctx'> 	priv-&gt;has_ibss = 1;</div><div class='ctx'> 	priv-&gt;has_wep = 0;</div><div class='ctx'> 	priv-&gt;has_big_wep = 0;</div><div class='add'>+	priv-&gt;has_alt_txcntl = 0;</div><div class='add'>+	priv-&gt;has_ext_scan = 0;</div><div class='add'>+	priv-&gt;has_wpa = 0;</div><div class='add'>+	priv-&gt;do_fw_download = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Determine capabilities from the firmware version */</div><div class='ctx'> 	switch (priv-&gt;firmware_type) {</div><div class='hunk'>@@ -2277,8 +3150,11 @@ static int determine_firmware(struct net_device *dev)</div><div class='ctx'> 		priv-&gt;has_pm = (firmver &gt;= 0x40020); /* Don't work in 7.52 ? */</div><div class='ctx'> 		priv-&gt;ibss_port = 1;</div><div class='ctx'> 		priv-&gt;has_hostscan = (firmver &gt;= 0x8000a);</div><div class='add'>+		priv-&gt;do_fw_download = 1;</div><div class='ctx'> 		priv-&gt;broken_monitor = (firmver &gt;= 0x80000);</div><div class='del'>-</div><div class='add'>+		priv-&gt;has_alt_txcntl = (firmver &gt;= 0x90000); /* All 9.x ? */</div><div class='add'>+		priv-&gt;has_ext_scan = (firmver &gt;= 0x90000); /* All 9.x ? */</div><div class='add'>+		priv-&gt;has_wpa = (firmver &gt;= 0x9002a);</div><div class='ctx'> 		/* Tested with Agere firmware :</div><div class='ctx'> 		 *	1.16 ; 4.08 ; 4.52 ; 6.04 ; 6.16 ; 7.28 =&gt; Jean II</div><div class='ctx'> 		 * Tested CableTron firmware : 4.32 =&gt; Anton */</div><div class='hunk'>@@ -2321,6 +3197,21 @@ static int determine_firmware(struct net_device *dev)</div><div class='ctx'> 			       firmver &gt;= 0x31000;</div><div class='ctx'> 		priv-&gt;has_preamble = (firmver &gt;= 0x20000);</div><div class='ctx'> 		priv-&gt;ibss_port = 4;</div><div class='add'>+</div><div class='add'>+		/* Symbol firmware is found on various cards, but</div><div class='add'>+		 * there has been no attempt to check firmware</div><div class='add'>+		 * download on non-spectrum_cs based cards.</div><div class='add'>+		 *</div><div class='add'>+		 * Given that the Agere firmware download works</div><div class='add'>+		 * differently, we should avoid doing a firmware</div><div class='add'>+		 * download with the Symbol algorithm on non-spectrum</div><div class='add'>+		 * cards.</div><div class='add'>+		 *</div><div class='add'>+		 * For now we can identify a spectrum_cs based card</div><div class='add'>+		 * because it has a firmware reset function.</div><div class='add'>+		 */</div><div class='add'>+		priv-&gt;do_fw_download = (priv-&gt;stop_fw != NULL);</div><div class='add'>+</div><div class='ctx'>  		priv-&gt;broken_disableport = (firmver == 0x25013) ||</div><div class='ctx'>  					   (firmver &gt;= 0x30000 &amp;&amp; firmver &lt;= 0x31000);</div><div class='ctx'> 		priv-&gt;has_hostscan = (firmver &gt;= 0x31001) ||</div><div class='hunk'>@@ -2391,6 +3282,20 @@ static int orinoco_init(struct net_device *dev)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (priv-&gt;do_fw_download) {</div><div class='add'>+		err = orinoco_download(priv);</div><div class='add'>+		if (err)</div><div class='add'>+			priv-&gt;do_fw_download = 0;</div><div class='add'>+</div><div class='add'>+		/* Check firmware version again */</div><div class='add'>+		err = determine_firmware(dev);</div><div class='add'>+		if (err != 0) {</div><div class='add'>+			printk(KERN_ERR "%s: Incompatible firmware, aborting\n",</div><div class='add'>+			       dev-&gt;name);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (priv-&gt;has_port3)</div><div class='ctx'> 		printk(KERN_DEBUG "%s: Ad-hoc demo mode supported\n", dev-&gt;name);</div><div class='ctx'> 	if (priv-&gt;has_ibss)</div><div class='hunk'>@@ -2403,6 +3308,20 @@ static int orinoco_init(struct net_device *dev)</div><div class='ctx'> 		else</div><div class='ctx'> 			printk("40-bit key\n");</div><div class='ctx'> 	}</div><div class='add'>+	if (priv-&gt;has_wpa) {</div><div class='add'>+		printk(KERN_DEBUG "%s: WPA-PSK supported\n", dev-&gt;name);</div><div class='add'>+		if (orinoco_mic_init(priv)) {</div><div class='add'>+			printk(KERN_ERR "%s: Failed to setup MIC crypto "</div><div class='add'>+			       "algorithm. Disabling WPA support\n", dev-&gt;name);</div><div class='add'>+			priv-&gt;has_wpa = 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Now we have the firmware capabilities, allocate appropiate</div><div class='add'>+	 * sized scan buffers */</div><div class='add'>+	if (orinoco_bss_data_allocate(priv))</div><div class='add'>+		goto out;</div><div class='add'>+	orinoco_bss_data_init(priv);</div><div class='ctx'> </div><div class='ctx'> 	/* Get the MAC address */</div><div class='ctx'> 	err = hermes_read_ltv(hw, USER_BAP, HERMES_RID_CNFOWNMACADDR,</div><div class='hunk'>@@ -2518,8 +3437,13 @@ static int orinoco_init(struct net_device *dev)</div><div class='ctx'> 	priv-&gt;channel = 0; /* use firmware default */</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;promiscuous = 0;</div><div class='del'>-	priv-&gt;wep_on = 0;</div><div class='add'>+	priv-&gt;encode_alg = IW_ENCODE_ALG_NONE;</div><div class='ctx'> 	priv-&gt;tx_key = 0;</div><div class='add'>+	priv-&gt;wpa_enabled = 0;</div><div class='add'>+	priv-&gt;tkip_cm_active = 0;</div><div class='add'>+	priv-&gt;key_mgmt = 0;</div><div class='add'>+	priv-&gt;wpa_ie_len = 0;</div><div class='add'>+	priv-&gt;wpa_ie = NULL;</div><div class='ctx'> </div><div class='ctx'> 	/* Make the hardware available, as long as it hasn't been</div><div class='ctx'> 	 * removed elsewhere (e.g. by PCMCIA hot unplug) */</div><div class='hunk'>@@ -2533,8 +3457,11 @@ static int orinoco_init(struct net_device *dev)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct net_device *alloc_orinocodev(int sizeof_card,</div><div class='del'>-				    int (*hard_reset)(struct orinoco_private *))</div><div class='add'>+struct net_device</div><div class='add'>+*alloc_orinocodev(int sizeof_card,</div><div class='add'>+		  struct device *device,</div><div class='add'>+		  int (*hard_reset)(struct orinoco_private *),</div><div class='add'>+		  int (*stop_fw)(struct orinoco_private *, int))</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	struct orinoco_private *priv;</div><div class='hunk'>@@ -2549,10 +3476,7 @@ struct net_device *alloc_orinocodev(int sizeof_card,</div><div class='ctx'> 				      + sizeof(struct orinoco_private));</div><div class='ctx'> 	else</div><div class='ctx'> 		priv-&gt;card = NULL;</div><div class='del'>-</div><div class='del'>-	if (orinoco_bss_data_allocate(priv))</div><div class='del'>-		goto err_out_free;</div><div class='del'>-	orinoco_bss_data_init(priv);</div><div class='add'>+	priv-&gt;dev = device;</div><div class='ctx'> </div><div class='ctx'> 	/* Setup / override net_device fields */</div><div class='ctx'> 	dev-&gt;init = orinoco_init;</div><div class='hunk'>@@ -2570,10 +3494,14 @@ struct net_device *alloc_orinocodev(int sizeof_card,</div><div class='ctx'> 	dev-&gt;set_multicast_list = orinoco_set_multicast_list;</div><div class='ctx'> 	/* we use the default eth_mac_addr for setting the MAC addr */</div><div class='ctx'> </div><div class='add'>+	/* Reserve space in skb for the SNAP header */</div><div class='add'>+	dev-&gt;hard_header_len += ENCAPS_OVERHEAD;</div><div class='add'>+</div><div class='ctx'> 	/* Set up default callbacks */</div><div class='ctx'> 	dev-&gt;open = orinoco_open;</div><div class='ctx'> 	dev-&gt;stop = orinoco_stop;</div><div class='ctx'> 	priv-&gt;hard_reset = hard_reset;</div><div class='add'>+	priv-&gt;stop_fw = stop_fw;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;priv-&gt;lock);</div><div class='ctx'> 	priv-&gt;open = 0;</div><div class='hunk'>@@ -2584,20 +3512,27 @@ struct net_device *alloc_orinocodev(int sizeof_card,</div><div class='ctx'> 	INIT_WORK(&amp;priv-&gt;join_work, orinoco_join_ap);</div><div class='ctx'> 	INIT_WORK(&amp;priv-&gt;wevent_work, orinoco_send_wevents);</div><div class='ctx'> </div><div class='add'>+	INIT_LIST_HEAD(&amp;priv-&gt;rx_list);</div><div class='add'>+	tasklet_init(&amp;priv-&gt;rx_tasklet, orinoco_rx_isr_tasklet,</div><div class='add'>+		     (unsigned long) dev);</div><div class='add'>+</div><div class='ctx'> 	netif_carrier_off(dev);</div><div class='ctx'> 	priv-&gt;last_linkstatus = 0xffff;</div><div class='ctx'> </div><div class='ctx'> 	return dev;</div><div class='del'>-</div><div class='del'>-err_out_free:</div><div class='del'>-	free_netdev(dev);</div><div class='del'>-	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void free_orinocodev(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct orinoco_private *priv = netdev_priv(dev);</div><div class='ctx'> </div><div class='add'>+	/* No need to empty priv-&gt;rx_list: if the tasklet is scheduled</div><div class='add'>+	 * when we call tasklet_kill it will run one final time,</div><div class='add'>+	 * emptying the list */</div><div class='add'>+	tasklet_kill(&amp;priv-&gt;rx_tasklet);</div><div class='add'>+	priv-&gt;wpa_ie_len = 0;</div><div class='add'>+	kfree(priv-&gt;wpa_ie);</div><div class='add'>+	orinoco_mic_free(priv);</div><div class='ctx'> 	orinoco_bss_data_free(priv);</div><div class='ctx'> 	free_netdev(dev);</div><div class='ctx'> }</div><div class='hunk'>@@ -2909,7 +3844,7 @@ static int orinoco_ioctl_getiwrange(struct net_device *dev,</div><div class='ctx'> 	memset(range, 0, sizeof(struct iw_range));</div><div class='ctx'> </div><div class='ctx'> 	range-&gt;we_version_compiled = WIRELESS_EXT;</div><div class='del'>-	range-&gt;we_version_source = 14;</div><div class='add'>+	range-&gt;we_version_source = 22;</div><div class='ctx'> </div><div class='ctx'> 	/* Set available channels/frequencies */</div><div class='ctx'> 	range-&gt;num_channels = NUM_CHANNELS;</div><div class='hunk'>@@ -2939,6 +3874,9 @@ static int orinoco_ioctl_getiwrange(struct net_device *dev,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (priv-&gt;has_wpa)</div><div class='add'>+		range-&gt;enc_capa = IW_ENC_CAPA_WPA | IW_ENC_CAPA_CIPHER_TKIP;</div><div class='add'>+</div><div class='ctx'> 	if ((priv-&gt;iw_mode == IW_MODE_ADHOC) &amp;&amp; (!SPY_NUMBER(priv))){</div><div class='ctx'> 		/* Quality stats meaningless in ad-hoc mode */</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -2986,6 +3924,11 @@ static int orinoco_ioctl_getiwrange(struct net_device *dev,</div><div class='ctx'> 	range-&gt;min_r_time = 0;</div><div class='ctx'> 	range-&gt;max_r_time = 65535 * 1000;	/* ??? */</div><div class='ctx'> </div><div class='add'>+	if (priv-&gt;firmware_type == FIRMWARE_TYPE_AGERE)</div><div class='add'>+		range-&gt;scan_capa = IW_SCAN_CAPA_ESSID;</div><div class='add'>+	else</div><div class='add'>+		range-&gt;scan_capa = IW_SCAN_CAPA_NONE;</div><div class='add'>+</div><div class='ctx'> 	/* Event capability (kernel) */</div><div class='ctx'> 	IW_EVENT_CAPA_SET_KERNEL(range-&gt;event_capa);</div><div class='ctx'> 	/* Event capability (driver) */</div><div class='hunk'>@@ -3005,7 +3948,7 @@ static int orinoco_ioctl_setiwencode(struct net_device *dev,</div><div class='ctx'> 	struct orinoco_private *priv = netdev_priv(dev);</div><div class='ctx'> 	int index = (erq-&gt;flags &amp; IW_ENCODE_INDEX) - 1;</div><div class='ctx'> 	int setindex = priv-&gt;tx_key;</div><div class='del'>-	int enable = priv-&gt;wep_on;</div><div class='add'>+	int encode_alg = priv-&gt;encode_alg;</div><div class='ctx'> 	int restricted = priv-&gt;wep_restrict;</div><div class='ctx'> 	u16 xlen = 0;</div><div class='ctx'> 	int err = -EINPROGRESS;		/* Call commit handler */</div><div class='hunk'>@@ -3026,6 +3969,10 @@ static int orinoco_ioctl_setiwencode(struct net_device *dev,</div><div class='ctx'> 	if (orinoco_lock(priv, &amp;flags) != 0)</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='add'>+	/* Clear any TKIP key we have */</div><div class='add'>+	if ((priv-&gt;has_wpa) &amp;&amp; (priv-&gt;encode_alg == IW_ENCODE_ALG_TKIP))</div><div class='add'>+		(void) orinoco_clear_tkip_key(priv, setindex);</div><div class='add'>+</div><div class='ctx'> 	if (erq-&gt;length &gt; 0) {</div><div class='ctx'> 		if ((index &lt; 0) || (index &gt;= ORINOCO_MAX_KEYS))</div><div class='ctx'> 			index = priv-&gt;tx_key;</div><div class='hunk'>@@ -3039,9 +3986,9 @@ static int orinoco_ioctl_setiwencode(struct net_device *dev,</div><div class='ctx'> 			xlen = 0;</div><div class='ctx'> </div><div class='ctx'> 		/* Switch on WEP if off */</div><div class='del'>-		if ((!enable) &amp;&amp; (xlen &gt; 0)) {</div><div class='add'>+		if ((encode_alg != IW_ENCODE_ALG_WEP) &amp;&amp; (xlen &gt; 0)) {</div><div class='ctx'> 			setindex = index;</div><div class='del'>-			enable = 1;</div><div class='add'>+			encode_alg = IW_ENCODE_ALG_WEP;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* Important note : if the user do "iwconfig eth0 enc off",</div><div class='hunk'>@@ -3063,7 +4010,7 @@ static int orinoco_ioctl_setiwencode(struct net_device *dev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (erq-&gt;flags &amp; IW_ENCODE_DISABLED)</div><div class='del'>-		enable = 0;</div><div class='add'>+		encode_alg = IW_ENCODE_ALG_NONE;</div><div class='ctx'> 	if (erq-&gt;flags &amp; IW_ENCODE_OPEN)</div><div class='ctx'> 		restricted = 0;</div><div class='ctx'> 	if (erq-&gt;flags &amp; IW_ENCODE_RESTRICTED)</div><div class='hunk'>@@ -3078,14 +4025,15 @@ static int orinoco_ioctl_setiwencode(struct net_device *dev,</div><div class='ctx'> 	priv-&gt;tx_key = setindex;</div><div class='ctx'> </div><div class='ctx'> 	/* Try fast key change if connected and only keys are changed */</div><div class='del'>-	if (priv-&gt;wep_on &amp;&amp; enable &amp;&amp; (priv-&gt;wep_restrict == restricted) &amp;&amp;</div><div class='add'>+	if ((priv-&gt;encode_alg == encode_alg) &amp;&amp;</div><div class='add'>+	    (priv-&gt;wep_restrict == restricted) &amp;&amp;</div><div class='ctx'> 	    netif_carrier_ok(dev)) {</div><div class='ctx'> 		err = __orinoco_hw_setup_wepkeys(priv);</div><div class='ctx'> 		/* No need to commit if successful */</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	priv-&gt;wep_on = enable;</div><div class='add'>+	priv-&gt;encode_alg = encode_alg;</div><div class='ctx'> 	priv-&gt;wep_restrict = restricted;</div><div class='ctx'> </div><div class='ctx'>  out:</div><div class='hunk'>@@ -3114,7 +4062,7 @@ static int orinoco_ioctl_getiwencode(struct net_device *dev,</div><div class='ctx'> 		index = priv-&gt;tx_key;</div><div class='ctx'> </div><div class='ctx'> 	erq-&gt;flags = 0;</div><div class='del'>-	if (! priv-&gt;wep_on)</div><div class='add'>+	if (!priv-&gt;encode_alg)</div><div class='ctx'> 		erq-&gt;flags |= IW_ENCODE_DISABLED;</div><div class='ctx'> 	erq-&gt;flags |= index + 1;</div><div class='ctx'> </div><div class='hunk'>@@ -3689,6 +4637,399 @@ static int orinoco_ioctl_getpower(struct net_device *dev,</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int orinoco_ioctl_set_encodeext(struct net_device *dev,</div><div class='add'>+				       struct iw_request_info *info,</div><div class='add'>+				       union iwreq_data *wrqu,</div><div class='add'>+				       char *extra)</div><div class='add'>+{</div><div class='add'>+	struct orinoco_private *priv = netdev_priv(dev);</div><div class='add'>+	struct iw_point *encoding = &amp;wrqu-&gt;encoding;</div><div class='add'>+	struct iw_encode_ext *ext = (struct iw_encode_ext *)extra;</div><div class='add'>+	int idx, alg = ext-&gt;alg, set_key = 1;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int err = -EINVAL;</div><div class='add'>+	u16 key_len;</div><div class='add'>+</div><div class='add'>+	if (orinoco_lock(priv, &amp;flags) != 0)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	/* Determine and validate the key index */</div><div class='add'>+	idx = encoding-&gt;flags &amp; IW_ENCODE_INDEX;</div><div class='add'>+	if (idx) {</div><div class='add'>+		if ((idx &lt; 1) || (idx &gt; WEP_KEYS))</div><div class='add'>+			goto out;</div><div class='add'>+		idx--;</div><div class='add'>+	} else</div><div class='add'>+		idx = priv-&gt;tx_key;</div><div class='add'>+</div><div class='add'>+	if (encoding-&gt;flags &amp; IW_ENCODE_DISABLED)</div><div class='add'>+	    alg = IW_ENCODE_ALG_NONE;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;has_wpa &amp;&amp; (alg != IW_ENCODE_ALG_TKIP)) {</div><div class='add'>+		/* Clear any TKIP TX key we had */</div><div class='add'>+		(void) orinoco_clear_tkip_key(priv, priv-&gt;tx_key);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ext-&gt;ext_flags &amp; IW_ENCODE_EXT_SET_TX_KEY) {</div><div class='add'>+		priv-&gt;tx_key = idx;</div><div class='add'>+		set_key = ((alg == IW_ENCODE_ALG_TKIP) ||</div><div class='add'>+			   (ext-&gt;key_len &gt; 0)) ? 1 : 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (set_key) {</div><div class='add'>+		/* Set the requested key first */</div><div class='add'>+		switch (alg) {</div><div class='add'>+		case IW_ENCODE_ALG_NONE:</div><div class='add'>+			priv-&gt;encode_alg = alg;</div><div class='add'>+			priv-&gt;keys[idx].len = 0;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case IW_ENCODE_ALG_WEP:</div><div class='add'>+			if (ext-&gt;key_len &gt; SMALL_KEY_SIZE)</div><div class='add'>+				key_len = LARGE_KEY_SIZE;</div><div class='add'>+			else if (ext-&gt;key_len &gt; 0)</div><div class='add'>+				key_len = SMALL_KEY_SIZE;</div><div class='add'>+			else</div><div class='add'>+				goto out;</div><div class='add'>+</div><div class='add'>+			priv-&gt;encode_alg = alg;</div><div class='add'>+			priv-&gt;keys[idx].len = cpu_to_le16(key_len);</div><div class='add'>+</div><div class='add'>+			key_len = min(ext-&gt;key_len, key_len);</div><div class='add'>+</div><div class='add'>+			memset(priv-&gt;keys[idx].data, 0, ORINOCO_MAX_KEY_SIZE);</div><div class='add'>+			memcpy(priv-&gt;keys[idx].data, ext-&gt;key, key_len);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case IW_ENCODE_ALG_TKIP:</div><div class='add'>+		{</div><div class='add'>+			hermes_t *hw = &amp;priv-&gt;hw;</div><div class='add'>+			u8 *tkip_iv = NULL;</div><div class='add'>+</div><div class='add'>+			if (!priv-&gt;has_wpa ||</div><div class='add'>+			    (ext-&gt;key_len &gt; sizeof(priv-&gt;tkip_key[0])))</div><div class='add'>+				goto out;</div><div class='add'>+</div><div class='add'>+			priv-&gt;encode_alg = alg;</div><div class='add'>+			memset(&amp;priv-&gt;tkip_key[idx], 0,</div><div class='add'>+			       sizeof(priv-&gt;tkip_key[idx]));</div><div class='add'>+			memcpy(&amp;priv-&gt;tkip_key[idx], ext-&gt;key, ext-&gt;key_len);</div><div class='add'>+</div><div class='add'>+			if (ext-&gt;ext_flags &amp; IW_ENCODE_EXT_RX_SEQ_VALID)</div><div class='add'>+				tkip_iv = &amp;ext-&gt;rx_seq[0];</div><div class='add'>+</div><div class='add'>+			err = __orinoco_hw_set_tkip_key(hw, idx,</div><div class='add'>+				 ext-&gt;ext_flags &amp; IW_ENCODE_EXT_SET_TX_KEY,</div><div class='add'>+				 (u8 *) &amp;priv-&gt;tkip_key[idx],</div><div class='add'>+				 tkip_iv, NULL);</div><div class='add'>+			if (err)</div><div class='add'>+				printk(KERN_ERR "%s: Error %d setting TKIP key"</div><div class='add'>+				       "\n", dev-&gt;name, err);</div><div class='add'>+</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		default:</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	err = -EINPROGRESS;</div><div class='add'>+ out:</div><div class='add'>+	orinoco_unlock(priv, &amp;flags);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int orinoco_ioctl_get_encodeext(struct net_device *dev,</div><div class='add'>+				       struct iw_request_info *info,</div><div class='add'>+				       union iwreq_data *wrqu,</div><div class='add'>+				       char *extra)</div><div class='add'>+{</div><div class='add'>+	struct orinoco_private *priv = netdev_priv(dev);</div><div class='add'>+	struct iw_point *encoding = &amp;wrqu-&gt;encoding;</div><div class='add'>+	struct iw_encode_ext *ext = (struct iw_encode_ext *)extra;</div><div class='add'>+	int idx, max_key_len;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (orinoco_lock(priv, &amp;flags) != 0)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	err = -EINVAL;</div><div class='add'>+	max_key_len = encoding-&gt;length - sizeof(*ext);</div><div class='add'>+	if (max_key_len &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	idx = encoding-&gt;flags &amp; IW_ENCODE_INDEX;</div><div class='add'>+	if (idx) {</div><div class='add'>+		if ((idx &lt; 1) || (idx &gt; WEP_KEYS))</div><div class='add'>+			goto out;</div><div class='add'>+		idx--;</div><div class='add'>+	} else</div><div class='add'>+		idx = priv-&gt;tx_key;</div><div class='add'>+</div><div class='add'>+	encoding-&gt;flags = idx + 1;</div><div class='add'>+	memset(ext, 0, sizeof(*ext));</div><div class='add'>+</div><div class='add'>+	ext-&gt;alg = priv-&gt;encode_alg;</div><div class='add'>+	switch (priv-&gt;encode_alg) {</div><div class='add'>+	case IW_ENCODE_ALG_NONE:</div><div class='add'>+		ext-&gt;key_len = 0;</div><div class='add'>+		encoding-&gt;flags |= IW_ENCODE_DISABLED;</div><div class='add'>+		break;</div><div class='add'>+	case IW_ENCODE_ALG_WEP:</div><div class='add'>+		ext-&gt;key_len = min_t(u16, le16_to_cpu(priv-&gt;keys[idx].len),</div><div class='add'>+				     max_key_len);</div><div class='add'>+		memcpy(ext-&gt;key, priv-&gt;keys[idx].data, ext-&gt;key_len);</div><div class='add'>+		encoding-&gt;flags |= IW_ENCODE_ENABLED;</div><div class='add'>+		break;</div><div class='add'>+	case IW_ENCODE_ALG_TKIP:</div><div class='add'>+		ext-&gt;key_len = min_t(u16, sizeof(struct orinoco_tkip_key),</div><div class='add'>+				     max_key_len);</div><div class='add'>+		memcpy(ext-&gt;key, &amp;priv-&gt;tkip_key[idx], ext-&gt;key_len);</div><div class='add'>+		encoding-&gt;flags |= IW_ENCODE_ENABLED;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = 0;</div><div class='add'>+ out:</div><div class='add'>+	orinoco_unlock(priv, &amp;flags);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int orinoco_ioctl_set_auth(struct net_device *dev,</div><div class='add'>+				  struct iw_request_info *info,</div><div class='add'>+				  union iwreq_data *wrqu, char *extra)</div><div class='add'>+{</div><div class='add'>+	struct orinoco_private *priv = netdev_priv(dev);</div><div class='add'>+	hermes_t *hw = &amp;priv-&gt;hw;</div><div class='add'>+	struct iw_param *param = &amp;wrqu-&gt;param;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int ret = -EINPROGRESS;</div><div class='add'>+</div><div class='add'>+	if (orinoco_lock(priv, &amp;flags) != 0)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	switch (param-&gt;flags &amp; IW_AUTH_INDEX) {</div><div class='add'>+	case IW_AUTH_WPA_VERSION:</div><div class='add'>+	case IW_AUTH_CIPHER_PAIRWISE:</div><div class='add'>+	case IW_AUTH_CIPHER_GROUP:</div><div class='add'>+	case IW_AUTH_RX_UNENCRYPTED_EAPOL:</div><div class='add'>+	case IW_AUTH_PRIVACY_INVOKED:</div><div class='add'>+	case IW_AUTH_DROP_UNENCRYPTED:</div><div class='add'>+		/*</div><div class='add'>+		 * orinoco does not use these parameters</div><div class='add'>+		 */</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case IW_AUTH_KEY_MGMT:</div><div class='add'>+		/* wl_lkm implies value 2 == PSK for Hermes I</div><div class='add'>+		 * which ties in with WEXT</div><div class='add'>+		 * no other hints tho :(</div><div class='add'>+		 */</div><div class='add'>+		priv-&gt;key_mgmt = param-&gt;value;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case IW_AUTH_TKIP_COUNTERMEASURES:</div><div class='add'>+		/* When countermeasures are enabled, shut down the</div><div class='add'>+		 * card; when disabled, re-enable the card. This must</div><div class='add'>+		 * take effect immediately.</div><div class='add'>+		 *</div><div class='add'>+		 * TODO: Make sure that the EAPOL message is getting</div><div class='add'>+		 *       out before card disabled</div><div class='add'>+		 */</div><div class='add'>+		if (param-&gt;value) {</div><div class='add'>+			priv-&gt;tkip_cm_active = 1;</div><div class='add'>+			ret = hermes_enable_port(hw, 0);</div><div class='add'>+		} else {</div><div class='add'>+			priv-&gt;tkip_cm_active = 0;</div><div class='add'>+			ret = hermes_disable_port(hw, 0);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case IW_AUTH_80211_AUTH_ALG:</div><div class='add'>+		if (param-&gt;value &amp; IW_AUTH_ALG_SHARED_KEY)</div><div class='add'>+			priv-&gt;wep_restrict = 1;</div><div class='add'>+		else if (param-&gt;value &amp; IW_AUTH_ALG_OPEN_SYSTEM)</div><div class='add'>+			priv-&gt;wep_restrict = 0;</div><div class='add'>+		else</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case IW_AUTH_WPA_ENABLED:</div><div class='add'>+		if (priv-&gt;has_wpa) {</div><div class='add'>+			priv-&gt;wpa_enabled = param-&gt;value ? 1 : 0;</div><div class='add'>+		} else {</div><div class='add'>+			if (param-&gt;value)</div><div class='add'>+				ret = -EOPNOTSUPP;</div><div class='add'>+			/* else silently accept disable of WPA */</div><div class='add'>+			priv-&gt;wpa_enabled = 0;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		ret = -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	orinoco_unlock(priv, &amp;flags);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int orinoco_ioctl_get_auth(struct net_device *dev,</div><div class='add'>+				  struct iw_request_info *info,</div><div class='add'>+				  union iwreq_data *wrqu, char *extra)</div><div class='add'>+{</div><div class='add'>+	struct orinoco_private *priv = netdev_priv(dev);</div><div class='add'>+	struct iw_param *param = &amp;wrqu-&gt;param;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (orinoco_lock(priv, &amp;flags) != 0)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	switch (param-&gt;flags &amp; IW_AUTH_INDEX) {</div><div class='add'>+	case IW_AUTH_KEY_MGMT:</div><div class='add'>+		param-&gt;value = priv-&gt;key_mgmt;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case IW_AUTH_TKIP_COUNTERMEASURES:</div><div class='add'>+		param-&gt;value = priv-&gt;tkip_cm_active;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case IW_AUTH_80211_AUTH_ALG:</div><div class='add'>+		if (priv-&gt;wep_restrict)</div><div class='add'>+			param-&gt;value = IW_AUTH_ALG_SHARED_KEY;</div><div class='add'>+		else</div><div class='add'>+			param-&gt;value = IW_AUTH_ALG_OPEN_SYSTEM;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case IW_AUTH_WPA_ENABLED:</div><div class='add'>+		param-&gt;value = priv-&gt;wpa_enabled;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		ret = -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	orinoco_unlock(priv, &amp;flags);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int orinoco_ioctl_set_genie(struct net_device *dev,</div><div class='add'>+				   struct iw_request_info *info,</div><div class='add'>+				   union iwreq_data *wrqu, char *extra)</div><div class='add'>+{</div><div class='add'>+	struct orinoco_private *priv = netdev_priv(dev);</div><div class='add'>+	u8 *buf;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if ((wrqu-&gt;data.length &gt; MAX_WPA_IE_LEN) ||</div><div class='add'>+	    (wrqu-&gt;data.length &amp;&amp; (extra == NULL)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (orinoco_lock(priv, &amp;flags) != 0)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	if (wrqu-&gt;data.length) {</div><div class='add'>+		buf = kmalloc(wrqu-&gt;data.length, GFP_KERNEL);</div><div class='add'>+		if (buf == NULL) {</div><div class='add'>+			err = -ENOMEM;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		memcpy(buf, extra, wrqu-&gt;data.length);</div><div class='add'>+		kfree(priv-&gt;wpa_ie);</div><div class='add'>+		priv-&gt;wpa_ie = buf;</div><div class='add'>+		priv-&gt;wpa_ie_len = wrqu-&gt;data.length;</div><div class='add'>+	} else {</div><div class='add'>+		kfree(priv-&gt;wpa_ie);</div><div class='add'>+		priv-&gt;wpa_ie = NULL;</div><div class='add'>+		priv-&gt;wpa_ie_len = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;wpa_ie) {</div><div class='add'>+		/* Looks like wl_lkm wants to check the auth alg, and</div><div class='add'>+		 * somehow pass it to the firmware.</div><div class='add'>+		 * Instead it just calls the key mgmt rid</div><div class='add'>+		 *   - we do this in set auth.</div><div class='add'>+		 */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	orinoco_unlock(priv, &amp;flags);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int orinoco_ioctl_get_genie(struct net_device *dev,</div><div class='add'>+				   struct iw_request_info *info,</div><div class='add'>+				   union iwreq_data *wrqu, char *extra)</div><div class='add'>+{</div><div class='add'>+	struct orinoco_private *priv = netdev_priv(dev);</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (orinoco_lock(priv, &amp;flags) != 0)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	if ((priv-&gt;wpa_ie_len == 0) || (priv-&gt;wpa_ie == NULL)) {</div><div class='add'>+		wrqu-&gt;data.length = 0;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (wrqu-&gt;data.length &lt; priv-&gt;wpa_ie_len) {</div><div class='add'>+		err = -E2BIG;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	wrqu-&gt;data.length = priv-&gt;wpa_ie_len;</div><div class='add'>+	memcpy(extra, priv-&gt;wpa_ie, priv-&gt;wpa_ie_len);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	orinoco_unlock(priv, &amp;flags);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int orinoco_ioctl_set_mlme(struct net_device *dev,</div><div class='add'>+				  struct iw_request_info *info,</div><div class='add'>+				  union iwreq_data *wrqu, char *extra)</div><div class='add'>+{</div><div class='add'>+	struct orinoco_private *priv = netdev_priv(dev);</div><div class='add'>+	hermes_t *hw = &amp;priv-&gt;hw;</div><div class='add'>+	struct iw_mlme *mlme = (struct iw_mlme *)extra;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (orinoco_lock(priv, &amp;flags) != 0)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	switch (mlme-&gt;cmd) {</div><div class='add'>+	case IW_MLME_DEAUTH:</div><div class='add'>+		/* silently ignore */</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case IW_MLME_DISASSOC:</div><div class='add'>+	{</div><div class='add'>+		struct {</div><div class='add'>+			u8 addr[ETH_ALEN];</div><div class='add'>+			__le16 reason_code;</div><div class='add'>+		} __attribute__ ((packed)) buf;</div><div class='add'>+</div><div class='add'>+		memcpy(buf.addr, mlme-&gt;addr.sa_data, ETH_ALEN);</div><div class='add'>+		buf.reason_code = cpu_to_le16(mlme-&gt;reason_code);</div><div class='add'>+		ret = HERMES_WRITE_RECORD(hw, USER_BAP,</div><div class='add'>+					  HERMES_RID_CNFDISASSOCIATE,</div><div class='add'>+					  &amp;buf);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	default:</div><div class='add'>+		ret = -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	orinoco_unlock(priv, &amp;flags);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int orinoco_ioctl_getretry(struct net_device *dev,</div><div class='ctx'> 				  struct iw_request_info *info,</div><div class='ctx'> 				  struct iw_param *rrq,</div><div class='hunk'>@@ -3947,14 +5288,15 @@ static int orinoco_ioctl_getrid(struct net_device *dev,</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Trigger a scan (look for other cells in the vicinity */</div><div class='add'>+/* Trigger a scan (look for other cells in the vicinity) */</div><div class='ctx'> static int orinoco_ioctl_setscan(struct net_device *dev,</div><div class='ctx'> 				 struct iw_request_info *info,</div><div class='del'>-				 struct iw_param *srq,</div><div class='add'>+				 struct iw_point *srq,</div><div class='ctx'> 				 char *extra)</div><div class='ctx'> {</div><div class='ctx'> 	struct orinoco_private *priv = netdev_priv(dev);</div><div class='ctx'> 	hermes_t *hw = &amp;priv-&gt;hw;</div><div class='add'>+	struct iw_scan_req *si = (struct iw_scan_req *) extra;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='hunk'>@@ -3986,7 +5328,6 @@ static int orinoco_ioctl_setscan(struct net_device *dev,</div><div class='ctx'> 	 * we access scan variables in priv is critical.</div><div class='ctx'> 	 *	o scan_inprogress : not touched by irq handler</div><div class='ctx'> 	 *	o scan_mode : not touched by irq handler</div><div class='del'>-	 *	o scan_len : synchronised with scan_result</div><div class='ctx'> 	 * Before modifying anything on those variables, please think hard !</div><div class='ctx'> 	 * Jean II */</div><div class='ctx'> </div><div class='hunk'>@@ -4016,13 +5357,43 @@ static int orinoco_ioctl_setscan(struct net_device *dev,</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 		case FIRMWARE_TYPE_AGERE:</div><div class='del'>-			err = hermes_write_wordrec(hw, USER_BAP,</div><div class='add'>+			if (priv-&gt;scan_mode &amp; IW_SCAN_THIS_ESSID) {</div><div class='add'>+				struct hermes_idstring idbuf;</div><div class='add'>+				size_t len = min(sizeof(idbuf.val),</div><div class='add'>+						 (size_t) si-&gt;essid_len);</div><div class='add'>+				idbuf.len = cpu_to_le16(len);</div><div class='add'>+				memcpy(idbuf.val, si-&gt;essid, len);</div><div class='add'>+</div><div class='add'>+				err = hermes_write_ltv(hw, USER_BAP,</div><div class='add'>+					       HERMES_RID_CNFSCANSSID_AGERE,</div><div class='add'>+					       HERMES_BYTES_TO_RECLEN(len + 2),</div><div class='add'>+					       &amp;idbuf);</div><div class='add'>+			} else</div><div class='add'>+				err = hermes_write_wordrec(hw, USER_BAP,</div><div class='ctx'> 						   HERMES_RID_CNFSCANSSID_AGERE,</div><div class='ctx'> 						   0);	/* Any ESSID */</div><div class='ctx'> 			if (err)</div><div class='ctx'> 				break;</div><div class='ctx'> </div><div class='del'>-			err = hermes_inquire(hw, HERMES_INQ_SCAN);</div><div class='add'>+			if (priv-&gt;has_ext_scan) {</div><div class='add'>+				/* Clear scan results at the start of</div><div class='add'>+				 * an extended scan */</div><div class='add'>+				orinoco_clear_scan_results(priv,</div><div class='add'>+						msecs_to_jiffies(15000));</div><div class='add'>+</div><div class='add'>+				/* TODO: Is this available on older firmware?</div><div class='add'>+				 *   Can we use it to scan specific channels</div><div class='add'>+				 *   for IW_SCAN_THIS_FREQ? */</div><div class='add'>+				err = hermes_write_wordrec(hw, USER_BAP,</div><div class='add'>+						HERMES_RID_CNFSCANCHANNELS2GHZ,</div><div class='add'>+						0x7FFF);</div><div class='add'>+				if (err)</div><div class='add'>+					goto out;</div><div class='add'>+</div><div class='add'>+				err = hermes_inquire(hw,</div><div class='add'>+						     HERMES_INQ_CHANNELINFO);</div><div class='add'>+			} else</div><div class='add'>+				err = hermes_inquire(hw, HERMES_INQ_SCAN);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else</div><div class='hunk'>@@ -4040,8 +5411,7 @@ static int orinoco_ioctl_setscan(struct net_device *dev,</div><div class='ctx'> #define MAX_CUSTOM_LEN 64</div><div class='ctx'> </div><div class='ctx'> /* Translate scan data returned from the card to a card independant</div><div class='del'>- * format that the Wireless Tools will understand - Jean II</div><div class='del'>- * Return message length or -errno for fatal errors */</div><div class='add'>+ * format that the Wireless Tools will understand - Jean II */</div><div class='ctx'> static inline char *orinoco_translate_scan(struct net_device *dev,</div><div class='ctx'> 					   struct iw_request_info *info,</div><div class='ctx'> 					   char *current_ev,</div><div class='hunk'>@@ -4053,9 +5423,10 @@ static inline char *orinoco_translate_scan(struct net_device *dev,</div><div class='ctx'> 	u16			capabilities;</div><div class='ctx'> 	u16			channel;</div><div class='ctx'> 	struct iw_event		iwe;		/* Temporary buffer */</div><div class='del'>-	char                   *p;</div><div class='ctx'> 	char custom[MAX_CUSTOM_LEN];</div><div class='ctx'> </div><div class='add'>+	memset(&amp;iwe, 0, sizeof(iwe));</div><div class='add'>+</div><div class='ctx'> 	/* First entry *MUST* be the AP MAC address */</div><div class='ctx'> 	iwe.cmd = SIOCGIWAP;</div><div class='ctx'> 	iwe.u.ap_addr.sa_family = ARPHRD_ETHER;</div><div class='hunk'>@@ -4077,8 +5448,8 @@ static inline char *orinoco_translate_scan(struct net_device *dev,</div><div class='ctx'> 	/* Add mode */</div><div class='ctx'> 	iwe.cmd = SIOCGIWMODE;</div><div class='ctx'> 	capabilities = le16_to_cpu(bss-&gt;a.capabilities);</div><div class='del'>-	if (capabilities &amp; 0x3) {</div><div class='del'>-		if (capabilities &amp; 0x1)</div><div class='add'>+	if (capabilities &amp; (WLAN_CAPABILITY_ESS | WLAN_CAPABILITY_IBSS)) {</div><div class='add'>+		if (capabilities &amp; WLAN_CAPABILITY_ESS)</div><div class='ctx'> 			iwe.u.mode = IW_MODE_MASTER;</div><div class='ctx'> 		else</div><div class='ctx'> 			iwe.u.mode = IW_MODE_ADHOC;</div><div class='hunk'>@@ -4088,17 +5459,22 @@ static inline char *orinoco_translate_scan(struct net_device *dev,</div><div class='ctx'> </div><div class='ctx'> 	channel = bss-&gt;s.channel;</div><div class='ctx'> 	if ((channel &gt;= 1) &amp;&amp; (channel &lt;= NUM_CHANNELS)) {</div><div class='del'>-		/* Add frequency */</div><div class='add'>+		/* Add channel and frequency */</div><div class='ctx'> 		iwe.cmd = SIOCGIWFREQ;</div><div class='add'>+		iwe.u.freq.m = channel;</div><div class='add'>+		iwe.u.freq.e = 0;</div><div class='add'>+		current_ev = iwe_stream_add_event(info, current_ev, end_buf,</div><div class='add'>+						  &amp;iwe, IW_EV_FREQ_LEN);</div><div class='add'>+</div><div class='ctx'> 		iwe.u.freq.m = channel_frequency[channel-1] * 100000;</div><div class='ctx'> 		iwe.u.freq.e = 1;</div><div class='ctx'> 		current_ev = iwe_stream_add_event(info, current_ev, end_buf,</div><div class='ctx'> 						  &amp;iwe, IW_EV_FREQ_LEN);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Add quality statistics */</div><div class='add'>+	/* Add quality statistics. level and noise in dB. No link quality */</div><div class='ctx'> 	iwe.cmd = IWEVQUAL;</div><div class='del'>-	iwe.u.qual.updated = 0x10;	/* no link quality */</div><div class='add'>+	iwe.u.qual.updated = IW_QUAL_DBM | IW_QUAL_QUAL_INVALID;</div><div class='ctx'> 	iwe.u.qual.level = (__u8) le16_to_cpu(bss-&gt;a.level) - 0x95;</div><div class='ctx'> 	iwe.u.qual.noise = (__u8) le16_to_cpu(bss-&gt;a.noise) - 0x95;</div><div class='ctx'> 	/* Wireless tools prior to 27.pre22 will show link quality</div><div class='hunk'>@@ -4112,25 +5488,13 @@ static inline char *orinoco_translate_scan(struct net_device *dev,</div><div class='ctx'> </div><div class='ctx'> 	/* Add encryption capability */</div><div class='ctx'> 	iwe.cmd = SIOCGIWENCODE;</div><div class='del'>-	if (capabilities &amp; 0x10)</div><div class='add'>+	if (capabilities &amp; WLAN_CAPABILITY_PRIVACY)</div><div class='ctx'> 		iwe.u.data.flags = IW_ENCODE_ENABLED | IW_ENCODE_NOKEY;</div><div class='ctx'> 	else</div><div class='ctx'> 		iwe.u.data.flags = IW_ENCODE_DISABLED;</div><div class='ctx'> 	iwe.u.data.length = 0;</div><div class='ctx'> 	current_ev = iwe_stream_add_point(info, current_ev, end_buf,</div><div class='del'>-					  &amp;iwe, bss-&gt;a.essid);</div><div class='del'>-</div><div class='del'>-	/* Add EXTRA: Age to display seconds since last beacon/probe response</div><div class='del'>-	 * for given network. */</div><div class='del'>-	iwe.cmd = IWEVCUSTOM;</div><div class='del'>-	p = custom;</div><div class='del'>-	p += snprintf(p, MAX_CUSTOM_LEN - (p - custom),</div><div class='del'>-		      " Last beacon: %dms ago",</div><div class='del'>-		      jiffies_to_msecs(jiffies - last_scanned));</div><div class='del'>-	iwe.u.data.length = p - custom;</div><div class='del'>-	if (iwe.u.data.length)</div><div class='del'>-		current_ev = iwe_stream_add_point(info, current_ev, end_buf,</div><div class='del'>-						  &amp;iwe, custom);</div><div class='add'>+					  &amp;iwe, NULL);</div><div class='ctx'> </div><div class='ctx'> 	/* Bit rate is not available in Lucent/Agere firmwares */</div><div class='ctx'> 	if (priv-&gt;firmware_type != FIRMWARE_TYPE_AGERE) {</div><div class='hunk'>@@ -4152,7 +5516,8 @@ static inline char *orinoco_translate_scan(struct net_device *dev,</div><div class='ctx'> 			if (bss-&gt;p.rates[i] == 0x0)</div><div class='ctx'> 				break;</div><div class='ctx'> 			/* Bit rate given in 500 kb/s units (+ 0x80) */</div><div class='del'>-			iwe.u.bitrate.value = ((bss-&gt;p.rates[i] &amp; 0x7f) * 500000);</div><div class='add'>+			iwe.u.bitrate.value =</div><div class='add'>+				((bss-&gt;p.rates[i] &amp; 0x7f) * 500000);</div><div class='ctx'> 			current_val = iwe_stream_add_value(info, current_ev,</div><div class='ctx'> 							   current_val,</div><div class='ctx'> 							   end_buf, &amp;iwe,</div><div class='hunk'>@@ -4163,6 +5528,199 @@ static inline char *orinoco_translate_scan(struct net_device *dev,</div><div class='ctx'> 			current_ev = current_val;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Beacon interval */</div><div class='add'>+	iwe.cmd = IWEVCUSTOM;</div><div class='add'>+	iwe.u.data.length = snprintf(custom, MAX_CUSTOM_LEN,</div><div class='add'>+				     "bcn_int=%d",</div><div class='add'>+				     le16_to_cpu(bss-&gt;a.beacon_interv));</div><div class='add'>+	if (iwe.u.data.length)</div><div class='add'>+		current_ev = iwe_stream_add_point(info, current_ev, end_buf,</div><div class='add'>+						  &amp;iwe, custom);</div><div class='add'>+</div><div class='add'>+	/* Capabilites */</div><div class='add'>+	iwe.cmd = IWEVCUSTOM;</div><div class='add'>+	iwe.u.data.length = snprintf(custom, MAX_CUSTOM_LEN,</div><div class='add'>+				     "capab=0x%04x",</div><div class='add'>+				     capabilities);</div><div class='add'>+	if (iwe.u.data.length)</div><div class='add'>+		current_ev = iwe_stream_add_point(info, current_ev, end_buf,</div><div class='add'>+						  &amp;iwe, custom);</div><div class='add'>+</div><div class='add'>+	/* Add EXTRA: Age to display seconds since last beacon/probe response</div><div class='add'>+	 * for given network. */</div><div class='add'>+	iwe.cmd = IWEVCUSTOM;</div><div class='add'>+	iwe.u.data.length = snprintf(custom, MAX_CUSTOM_LEN,</div><div class='add'>+				     " Last beacon: %dms ago",</div><div class='add'>+				     jiffies_to_msecs(jiffies - last_scanned));</div><div class='add'>+	if (iwe.u.data.length)</div><div class='add'>+		current_ev = iwe_stream_add_point(info, current_ev, end_buf,</div><div class='add'>+						  &amp;iwe, custom);</div><div class='add'>+</div><div class='add'>+	return current_ev;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline char *orinoco_translate_ext_scan(struct net_device *dev,</div><div class='add'>+					       struct iw_request_info *info,</div><div class='add'>+					       char *current_ev,</div><div class='add'>+					       char *end_buf,</div><div class='add'>+					       struct agere_ext_scan_info *bss,</div><div class='add'>+					       unsigned int last_scanned)</div><div class='add'>+{</div><div class='add'>+	u16			capabilities;</div><div class='add'>+	u16			channel;</div><div class='add'>+	struct iw_event		iwe;		/* Temporary buffer */</div><div class='add'>+	char custom[MAX_CUSTOM_LEN];</div><div class='add'>+	u8 *ie;</div><div class='add'>+</div><div class='add'>+	memset(&amp;iwe, 0, sizeof(iwe));</div><div class='add'>+</div><div class='add'>+	/* First entry *MUST* be the AP MAC address */</div><div class='add'>+	iwe.cmd = SIOCGIWAP;</div><div class='add'>+	iwe.u.ap_addr.sa_family = ARPHRD_ETHER;</div><div class='add'>+	memcpy(iwe.u.ap_addr.sa_data, bss-&gt;bssid, ETH_ALEN);</div><div class='add'>+	current_ev = iwe_stream_add_event(info, current_ev, end_buf,</div><div class='add'>+					  &amp;iwe, IW_EV_ADDR_LEN);</div><div class='add'>+</div><div class='add'>+	/* Other entries will be displayed in the order we give them */</div><div class='add'>+</div><div class='add'>+	/* Add the ESSID */</div><div class='add'>+	ie = bss-&gt;data;</div><div class='add'>+	iwe.u.data.length = ie[1];</div><div class='add'>+	if (iwe.u.data.length) {</div><div class='add'>+		if (iwe.u.data.length &gt; 32)</div><div class='add'>+			iwe.u.data.length = 32;</div><div class='add'>+		iwe.cmd = SIOCGIWESSID;</div><div class='add'>+		iwe.u.data.flags = 1;</div><div class='add'>+		current_ev = iwe_stream_add_point(info, current_ev, end_buf,</div><div class='add'>+						  &amp;iwe, &amp;ie[2]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Add mode */</div><div class='add'>+	capabilities = le16_to_cpu(bss-&gt;capabilities);</div><div class='add'>+	if (capabilities &amp; (WLAN_CAPABILITY_ESS | WLAN_CAPABILITY_IBSS)) {</div><div class='add'>+		iwe.cmd = SIOCGIWMODE;</div><div class='add'>+		if (capabilities &amp; WLAN_CAPABILITY_ESS)</div><div class='add'>+			iwe.u.mode = IW_MODE_MASTER;</div><div class='add'>+		else</div><div class='add'>+			iwe.u.mode = IW_MODE_ADHOC;</div><div class='add'>+		current_ev = iwe_stream_add_event(info, current_ev, end_buf,</div><div class='add'>+						  &amp;iwe, IW_EV_UINT_LEN);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ie = orinoco_get_ie(bss-&gt;data, sizeof(bss-&gt;data), MFIE_TYPE_DS_SET);</div><div class='add'>+	channel = ie ? ie[2] : 0;</div><div class='add'>+	if ((channel &gt;= 1) &amp;&amp; (channel &lt;= NUM_CHANNELS)) {</div><div class='add'>+		/* Add channel and frequency */</div><div class='add'>+		iwe.cmd = SIOCGIWFREQ;</div><div class='add'>+		iwe.u.freq.m = channel;</div><div class='add'>+		iwe.u.freq.e = 0;</div><div class='add'>+		current_ev = iwe_stream_add_event(info, current_ev, end_buf,</div><div class='add'>+						  &amp;iwe, IW_EV_FREQ_LEN);</div><div class='add'>+</div><div class='add'>+		iwe.u.freq.m = channel_frequency[channel-1] * 100000;</div><div class='add'>+		iwe.u.freq.e = 1;</div><div class='add'>+		current_ev = iwe_stream_add_event(info, current_ev, end_buf,</div><div class='add'>+						  &amp;iwe, IW_EV_FREQ_LEN);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Add quality statistics. level and noise in dB. No link quality */</div><div class='add'>+	iwe.cmd = IWEVQUAL;</div><div class='add'>+	iwe.u.qual.updated = IW_QUAL_DBM | IW_QUAL_QUAL_INVALID;</div><div class='add'>+	iwe.u.qual.level = bss-&gt;level - 0x95;</div><div class='add'>+	iwe.u.qual.noise = bss-&gt;noise - 0x95;</div><div class='add'>+	/* Wireless tools prior to 27.pre22 will show link quality</div><div class='add'>+	 * anyway, so we provide a reasonable value. */</div><div class='add'>+	if (iwe.u.qual.level &gt; iwe.u.qual.noise)</div><div class='add'>+		iwe.u.qual.qual = iwe.u.qual.level - iwe.u.qual.noise;</div><div class='add'>+	else</div><div class='add'>+		iwe.u.qual.qual = 0;</div><div class='add'>+	current_ev = iwe_stream_add_event(info, current_ev, end_buf,</div><div class='add'>+					  &amp;iwe, IW_EV_QUAL_LEN);</div><div class='add'>+</div><div class='add'>+	/* Add encryption capability */</div><div class='add'>+	iwe.cmd = SIOCGIWENCODE;</div><div class='add'>+	if (capabilities &amp; WLAN_CAPABILITY_PRIVACY)</div><div class='add'>+		iwe.u.data.flags = IW_ENCODE_ENABLED | IW_ENCODE_NOKEY;</div><div class='add'>+	else</div><div class='add'>+		iwe.u.data.flags = IW_ENCODE_DISABLED;</div><div class='add'>+	iwe.u.data.length = 0;</div><div class='add'>+	current_ev = iwe_stream_add_point(info, current_ev, end_buf,</div><div class='add'>+					  &amp;iwe, NULL);</div><div class='add'>+</div><div class='add'>+	/* WPA IE */</div><div class='add'>+	ie = orinoco_get_wpa_ie(bss-&gt;data, sizeof(bss-&gt;data));</div><div class='add'>+	if (ie) {</div><div class='add'>+		iwe.cmd = IWEVGENIE;</div><div class='add'>+		iwe.u.data.length = ie[1] + 2;</div><div class='add'>+		current_ev = iwe_stream_add_point(info, current_ev, end_buf,</div><div class='add'>+						  &amp;iwe, ie);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* RSN IE */</div><div class='add'>+	ie = orinoco_get_ie(bss-&gt;data, sizeof(bss-&gt;data), MFIE_TYPE_RSN);</div><div class='add'>+	if (ie) {</div><div class='add'>+		iwe.cmd = IWEVGENIE;</div><div class='add'>+		iwe.u.data.length = ie[1] + 2;</div><div class='add'>+		current_ev = iwe_stream_add_point(info, current_ev, end_buf,</div><div class='add'>+						  &amp;iwe, ie);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ie = orinoco_get_ie(bss-&gt;data, sizeof(bss-&gt;data), MFIE_TYPE_RATES);</div><div class='add'>+	if (ie) {</div><div class='add'>+		char *p = current_ev + iwe_stream_lcp_len(info);</div><div class='add'>+		int i;</div><div class='add'>+</div><div class='add'>+		iwe.cmd = SIOCGIWRATE;</div><div class='add'>+		/* Those two flags are ignored... */</div><div class='add'>+		iwe.u.bitrate.fixed = iwe.u.bitrate.disabled = 0;</div><div class='add'>+</div><div class='add'>+		for (i = 2; i &lt; (ie[1] + 2); i++) {</div><div class='add'>+			iwe.u.bitrate.value = ((ie[i] &amp; 0x7F) * 500000);</div><div class='add'>+			p = iwe_stream_add_value(info, current_ev, p, end_buf,</div><div class='add'>+						 &amp;iwe, IW_EV_PARAM_LEN);</div><div class='add'>+		}</div><div class='add'>+		/* Check if we added any event */</div><div class='add'>+		if (p &gt; (current_ev + iwe_stream_lcp_len(info)))</div><div class='add'>+			current_ev = p;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Timestamp */</div><div class='add'>+	iwe.cmd = IWEVCUSTOM;</div><div class='add'>+	iwe.u.data.length =</div><div class='add'>+		snprintf(custom, MAX_CUSTOM_LEN, "tsf=%016llx",</div><div class='add'>+			 (unsigned long long) le64_to_cpu(bss-&gt;timestamp));</div><div class='add'>+	if (iwe.u.data.length)</div><div class='add'>+		current_ev = iwe_stream_add_point(info, current_ev, end_buf,</div><div class='add'>+						  &amp;iwe, custom);</div><div class='add'>+</div><div class='add'>+	/* Beacon interval */</div><div class='add'>+	iwe.cmd = IWEVCUSTOM;</div><div class='add'>+	iwe.u.data.length = snprintf(custom, MAX_CUSTOM_LEN,</div><div class='add'>+				     "bcn_int=%d",</div><div class='add'>+				     le16_to_cpu(bss-&gt;beacon_interval));</div><div class='add'>+	if (iwe.u.data.length)</div><div class='add'>+		current_ev = iwe_stream_add_point(info, current_ev, end_buf,</div><div class='add'>+						  &amp;iwe, custom);</div><div class='add'>+</div><div class='add'>+	/* Capabilites */</div><div class='add'>+	iwe.cmd = IWEVCUSTOM;</div><div class='add'>+	iwe.u.data.length = snprintf(custom, MAX_CUSTOM_LEN,</div><div class='add'>+				     "capab=0x%04x",</div><div class='add'>+				     capabilities);</div><div class='add'>+	if (iwe.u.data.length)</div><div class='add'>+		current_ev = iwe_stream_add_point(info, current_ev, end_buf,</div><div class='add'>+						  &amp;iwe, custom);</div><div class='add'>+</div><div class='add'>+	/* Add EXTRA: Age to display seconds since last beacon/probe response</div><div class='add'>+	 * for given network. */</div><div class='add'>+	iwe.cmd = IWEVCUSTOM;</div><div class='add'>+	iwe.u.data.length = snprintf(custom, MAX_CUSTOM_LEN,</div><div class='add'>+				     " Last beacon: %dms ago",</div><div class='add'>+				     jiffies_to_msecs(jiffies - last_scanned));</div><div class='add'>+	if (iwe.u.data.length)</div><div class='add'>+		current_ev = iwe_stream_add_point(info, current_ev, end_buf,</div><div class='add'>+						  &amp;iwe, custom);</div><div class='add'>+</div><div class='ctx'> 	return current_ev;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4173,7 +5731,6 @@ static int orinoco_ioctl_getscan(struct net_device *dev,</div><div class='ctx'> 				 char *extra)</div><div class='ctx'> {</div><div class='ctx'> 	struct orinoco_private *priv = netdev_priv(dev);</div><div class='del'>-	bss_element *bss;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	char *current_ev = extra;</div><div class='hunk'>@@ -4193,18 +5750,47 @@ static int orinoco_ioctl_getscan(struct net_device *dev,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry(bss, &amp;priv-&gt;bss_list, list) {</div><div class='del'>-		/* Translate to WE format this entry */</div><div class='del'>-		current_ev = orinoco_translate_scan(dev, info, current_ev,</div><div class='del'>-						    extra + srq-&gt;length,</div><div class='del'>-						    &amp;bss-&gt;bss,</div><div class='del'>-						    bss-&gt;last_scanned);</div><div class='del'>-</div><div class='del'>-		/* Check if there is space for one more entry */</div><div class='del'>-		if ((extra + srq-&gt;length - current_ev) &lt;= IW_EV_ADDR_LEN) {</div><div class='del'>-			/* Ask user space to try again with a bigger buffer */</div><div class='del'>-			err = -E2BIG;</div><div class='del'>-			goto out;</div><div class='add'>+	if (priv-&gt;has_ext_scan) {</div><div class='add'>+		struct xbss_element *bss;</div><div class='add'>+</div><div class='add'>+		list_for_each_entry(bss, &amp;priv-&gt;bss_list, list) {</div><div class='add'>+			/* Translate this entry to WE format */</div><div class='add'>+			current_ev =</div><div class='add'>+				orinoco_translate_ext_scan(dev, info,</div><div class='add'>+							   current_ev,</div><div class='add'>+							   extra + srq-&gt;length,</div><div class='add'>+							   &amp;bss-&gt;bss,</div><div class='add'>+							   bss-&gt;last_scanned);</div><div class='add'>+</div><div class='add'>+			/* Check if there is space for one more entry */</div><div class='add'>+			if ((extra + srq-&gt;length - current_ev)</div><div class='add'>+			    &lt;= IW_EV_ADDR_LEN) {</div><div class='add'>+				/* Ask user space to try again with a</div><div class='add'>+				 * bigger buffer */</div><div class='add'>+				err = -E2BIG;</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	} else {</div><div class='add'>+		struct bss_element *bss;</div><div class='add'>+</div><div class='add'>+		list_for_each_entry(bss, &amp;priv-&gt;bss_list, list) {</div><div class='add'>+			/* Translate this entry to WE format */</div><div class='add'>+			current_ev = orinoco_translate_scan(dev, info,</div><div class='add'>+							    current_ev,</div><div class='add'>+							    extra + srq-&gt;length,</div><div class='add'>+							    &amp;bss-&gt;bss,</div><div class='add'>+							    bss-&gt;last_scanned);</div><div class='add'>+</div><div class='add'>+			/* Check if there is space for one more entry */</div><div class='add'>+			if ((extra + srq-&gt;length - current_ev)</div><div class='add'>+			    &lt;= IW_EV_ADDR_LEN) {</div><div class='add'>+				/* Ask user space to try again with a</div><div class='add'>+				 * bigger buffer */</div><div class='add'>+				err = -E2BIG;</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -4295,39 +5881,48 @@ static const struct iw_priv_args orinoco_privtab[] = {</div><div class='ctx'>  * Structures to export the Wireless Handlers</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#define STD_IW_HANDLER(id, func) \</div><div class='add'>+	[IW_IOCTL_IDX(id)] = (iw_handler) func</div><div class='ctx'> static const iw_handler	orinoco_handler[] = {</div><div class='del'>-	[SIOCSIWCOMMIT-SIOCIWFIRST] = (iw_handler) orinoco_ioctl_commit,</div><div class='del'>-	[SIOCGIWNAME  -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_getname,</div><div class='del'>-	[SIOCSIWFREQ  -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_setfreq,</div><div class='del'>-	[SIOCGIWFREQ  -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_getfreq,</div><div class='del'>-	[SIOCSIWMODE  -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_setmode,</div><div class='del'>-	[SIOCGIWMODE  -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_getmode,</div><div class='del'>-	[SIOCSIWSENS  -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_setsens,</div><div class='del'>-	[SIOCGIWSENS  -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_getsens,</div><div class='del'>-	[SIOCGIWRANGE -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_getiwrange,</div><div class='del'>-	[SIOCSIWSPY   -SIOCIWFIRST] = (iw_handler) iw_handler_set_spy,</div><div class='del'>-	[SIOCGIWSPY   -SIOCIWFIRST] = (iw_handler) iw_handler_get_spy,</div><div class='del'>-	[SIOCSIWTHRSPY-SIOCIWFIRST] = (iw_handler) iw_handler_set_thrspy,</div><div class='del'>-	[SIOCGIWTHRSPY-SIOCIWFIRST] = (iw_handler) iw_handler_get_thrspy,</div><div class='del'>-	[SIOCSIWAP    -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_setwap,</div><div class='del'>-	[SIOCGIWAP    -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_getwap,</div><div class='del'>-	[SIOCSIWSCAN  -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_setscan,</div><div class='del'>-	[SIOCGIWSCAN  -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_getscan,</div><div class='del'>-	[SIOCSIWESSID -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_setessid,</div><div class='del'>-	[SIOCGIWESSID -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_getessid,</div><div class='del'>-	[SIOCSIWNICKN -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_setnick,</div><div class='del'>-	[SIOCGIWNICKN -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_getnick,</div><div class='del'>-	[SIOCSIWRATE  -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_setrate,</div><div class='del'>-	[SIOCGIWRATE  -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_getrate,</div><div class='del'>-	[SIOCSIWRTS   -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_setrts,</div><div class='del'>-	[SIOCGIWRTS   -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_getrts,</div><div class='del'>-	[SIOCSIWFRAG  -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_setfrag,</div><div class='del'>-	[SIOCGIWFRAG  -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_getfrag,</div><div class='del'>-	[SIOCGIWRETRY -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_getretry,</div><div class='del'>-	[SIOCSIWENCODE-SIOCIWFIRST] = (iw_handler) orinoco_ioctl_setiwencode,</div><div class='del'>-	[SIOCGIWENCODE-SIOCIWFIRST] = (iw_handler) orinoco_ioctl_getiwencode,</div><div class='del'>-	[SIOCSIWPOWER -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_setpower,</div><div class='del'>-	[SIOCGIWPOWER -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_getpower,</div><div class='add'>+	STD_IW_HANDLER(SIOCSIWCOMMIT,	orinoco_ioctl_commit),</div><div class='add'>+	STD_IW_HANDLER(SIOCGIWNAME,	orinoco_ioctl_getname),</div><div class='add'>+	STD_IW_HANDLER(SIOCSIWFREQ,	orinoco_ioctl_setfreq),</div><div class='add'>+	STD_IW_HANDLER(SIOCGIWFREQ,	orinoco_ioctl_getfreq),</div><div class='add'>+	STD_IW_HANDLER(SIOCSIWMODE,	orinoco_ioctl_setmode),</div><div class='add'>+	STD_IW_HANDLER(SIOCGIWMODE,	orinoco_ioctl_getmode),</div><div class='add'>+	STD_IW_HANDLER(SIOCSIWSENS,	orinoco_ioctl_setsens),</div><div class='add'>+	STD_IW_HANDLER(SIOCGIWSENS,	orinoco_ioctl_getsens),</div><div class='add'>+	STD_IW_HANDLER(SIOCGIWRANGE,	orinoco_ioctl_getiwrange),</div><div class='add'>+	STD_IW_HANDLER(SIOCSIWSPY,	iw_handler_set_spy),</div><div class='add'>+	STD_IW_HANDLER(SIOCGIWSPY,	iw_handler_get_spy),</div><div class='add'>+	STD_IW_HANDLER(SIOCSIWTHRSPY,	iw_handler_set_thrspy),</div><div class='add'>+	STD_IW_HANDLER(SIOCGIWTHRSPY,	iw_handler_get_thrspy),</div><div class='add'>+	STD_IW_HANDLER(SIOCSIWAP,	orinoco_ioctl_setwap),</div><div class='add'>+	STD_IW_HANDLER(SIOCGIWAP,	orinoco_ioctl_getwap),</div><div class='add'>+	STD_IW_HANDLER(SIOCSIWSCAN,	orinoco_ioctl_setscan),</div><div class='add'>+	STD_IW_HANDLER(SIOCGIWSCAN,	orinoco_ioctl_getscan),</div><div class='add'>+	STD_IW_HANDLER(SIOCSIWESSID,	orinoco_ioctl_setessid),</div><div class='add'>+	STD_IW_HANDLER(SIOCGIWESSID,	orinoco_ioctl_getessid),</div><div class='add'>+	STD_IW_HANDLER(SIOCSIWNICKN,	orinoco_ioctl_setnick),</div><div class='add'>+	STD_IW_HANDLER(SIOCGIWNICKN,	orinoco_ioctl_getnick),</div><div class='add'>+	STD_IW_HANDLER(SIOCSIWRATE,	orinoco_ioctl_setrate),</div><div class='add'>+	STD_IW_HANDLER(SIOCGIWRATE,	orinoco_ioctl_getrate),</div><div class='add'>+	STD_IW_HANDLER(SIOCSIWRTS,	orinoco_ioctl_setrts),</div><div class='add'>+	STD_IW_HANDLER(SIOCGIWRTS,	orinoco_ioctl_getrts),</div><div class='add'>+	STD_IW_HANDLER(SIOCSIWFRAG,	orinoco_ioctl_setfrag),</div><div class='add'>+	STD_IW_HANDLER(SIOCGIWFRAG,	orinoco_ioctl_getfrag),</div><div class='add'>+	STD_IW_HANDLER(SIOCGIWRETRY,	orinoco_ioctl_getretry),</div><div class='add'>+	STD_IW_HANDLER(SIOCSIWENCODE,	orinoco_ioctl_setiwencode),</div><div class='add'>+	STD_IW_HANDLER(SIOCGIWENCODE,	orinoco_ioctl_getiwencode),</div><div class='add'>+	STD_IW_HANDLER(SIOCSIWPOWER,	orinoco_ioctl_setpower),</div><div class='add'>+	STD_IW_HANDLER(SIOCGIWPOWER,	orinoco_ioctl_getpower),</div><div class='add'>+	STD_IW_HANDLER(SIOCSIWGENIE,	orinoco_ioctl_set_genie),</div><div class='add'>+	STD_IW_HANDLER(SIOCGIWGENIE,	orinoco_ioctl_get_genie),</div><div class='add'>+	STD_IW_HANDLER(SIOCSIWMLME,	orinoco_ioctl_set_mlme),</div><div class='add'>+	STD_IW_HANDLER(SIOCSIWAUTH,	orinoco_ioctl_set_auth),</div><div class='add'>+	STD_IW_HANDLER(SIOCGIWAUTH,	orinoco_ioctl_get_auth),</div><div class='add'>+	STD_IW_HANDLER(SIOCSIWENCODEEXT, orinoco_ioctl_set_encodeext),</div><div class='add'>+	STD_IW_HANDLER(SIOCGIWENCODEEXT, orinoco_ioctl_get_encodeext),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/orinoco.h b/drivers/net/wireless/orinoco.h<br/>index c6b1858abde8..981570bd3b9d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/orinoco.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/orinoco.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/orinoco.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/orinoco.h</a></div><div class='hunk'>@@ -9,6 +9,7 @@</div><div class='ctx'> </div><div class='ctx'> #define DRIVER_VERSION "0.15"</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/wireless.h&gt;</div><div class='ctx'> #include &lt;net/iw_handler.h&gt;</div><div class='hunk'>@@ -30,27 +31,57 @@ struct orinoco_key {</div><div class='ctx'> 	char data[ORINOCO_MAX_KEY_SIZE];</div><div class='ctx'> } __attribute__ ((packed));</div><div class='ctx'> </div><div class='add'>+#define TKIP_KEYLEN	16</div><div class='add'>+#define MIC_KEYLEN	8</div><div class='add'>+</div><div class='add'>+struct orinoco_tkip_key {</div><div class='add'>+	u8 tkip[TKIP_KEYLEN];</div><div class='add'>+	u8 tx_mic[MIC_KEYLEN];</div><div class='add'>+	u8 rx_mic[MIC_KEYLEN];</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> typedef enum {</div><div class='ctx'> 	FIRMWARE_TYPE_AGERE,</div><div class='ctx'> 	FIRMWARE_TYPE_INTERSIL,</div><div class='ctx'> 	FIRMWARE_TYPE_SYMBOL</div><div class='ctx'> } fwtype_t;</div><div class='ctx'> </div><div class='del'>-typedef struct {</div><div class='add'>+struct bss_element {</div><div class='ctx'> 	union hermes_scan_info bss;</div><div class='ctx'> 	unsigned long last_scanned;</div><div class='ctx'> 	struct list_head list;</div><div class='del'>-} bss_element;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct xbss_element {</div><div class='add'>+	struct agere_ext_scan_info bss;</div><div class='add'>+	unsigned long last_scanned;</div><div class='add'>+	struct list_head list;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hermes_rx_descriptor;</div><div class='add'>+</div><div class='add'>+struct orinoco_rx_data {</div><div class='add'>+	struct hermes_rx_descriptor *desc;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct list_head list;</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> struct orinoco_private {</div><div class='ctx'> 	void *card;	/* Pointer to card dependent structure */</div><div class='add'>+	struct device *dev;</div><div class='ctx'> 	int (*hard_reset)(struct orinoco_private *);</div><div class='add'>+	int (*stop_fw)(struct orinoco_private *, int);</div><div class='ctx'> </div><div class='ctx'> 	/* Synchronisation stuff */</div><div class='ctx'> 	spinlock_t lock;</div><div class='ctx'> 	int hw_unavailable;</div><div class='ctx'> 	struct work_struct reset_work;</div><div class='ctx'> </div><div class='add'>+	/* Interrupt tasklets */</div><div class='add'>+	struct tasklet_struct rx_tasklet;</div><div class='add'>+	struct list_head rx_list;</div><div class='add'>+	struct orinoco_rx_data *rx_data;</div><div class='add'>+</div><div class='ctx'> 	/* driver state */</div><div class='ctx'> 	int open;</div><div class='ctx'> 	u16 last_linkstatus;</div><div class='hunk'>@@ -83,13 +114,17 @@ struct orinoco_private {</div><div class='ctx'> 	unsigned int has_preamble:1;</div><div class='ctx'> 	unsigned int has_sensitivity:1;</div><div class='ctx'> 	unsigned int has_hostscan:1;</div><div class='add'>+	unsigned int has_alt_txcntl:1;</div><div class='add'>+	unsigned int has_ext_scan:1;</div><div class='add'>+	unsigned int has_wpa:1;</div><div class='add'>+	unsigned int do_fw_download:1;</div><div class='ctx'> 	unsigned int broken_disableport:1;</div><div class='ctx'> 	unsigned int broken_monitor:1;</div><div class='ctx'> </div><div class='ctx'> 	/* Configuration paramaters */</div><div class='ctx'> 	u32 iw_mode;</div><div class='ctx'> 	int prefer_port3;</div><div class='del'>-	u16 wep_on, wep_restrict, tx_key;</div><div class='add'>+	u16 encode_alg, wep_restrict, tx_key;</div><div class='ctx'> 	struct orinoco_key keys[ORINOCO_MAX_KEYS];</div><div class='ctx'> 	int bitratemode;</div><div class='ctx'>  	char nick[IW_ESSID_MAX_SIZE+1];</div><div class='hunk'>@@ -113,10 +148,22 @@ struct orinoco_private {</div><div class='ctx'> 	/* Scanning support */</div><div class='ctx'> 	struct list_head bss_list;</div><div class='ctx'> 	struct list_head bss_free_list;</div><div class='del'>-	bss_element *bss_data;</div><div class='add'>+	void *bss_xbss_data;</div><div class='ctx'> </div><div class='ctx'> 	int	scan_inprogress;	/* Scan pending... */</div><div class='ctx'> 	u32	scan_mode;		/* Type of scan done */</div><div class='add'>+</div><div class='add'>+	/* WPA support */</div><div class='add'>+	u8 *wpa_ie;</div><div class='add'>+	int wpa_ie_len;</div><div class='add'>+</div><div class='add'>+	struct orinoco_tkip_key tkip_key[ORINOCO_MAX_KEYS];</div><div class='add'>+	struct crypto_hash *rx_tfm_mic;</div><div class='add'>+	struct crypto_hash *tx_tfm_mic;</div><div class='add'>+</div><div class='add'>+	unsigned int wpa_enabled:1;</div><div class='add'>+	unsigned int tkip_cm_active:1;</div><div class='add'>+	unsigned int key_mgmt:3;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef ORINOCO_DEBUG</div><div class='hunk'>@@ -130,8 +177,10 @@ extern int orinoco_debug;</div><div class='ctx'> /* Exported prototypes                                              */</div><div class='ctx'> /********************************************************************/</div><div class='ctx'> </div><div class='del'>-extern struct net_device *alloc_orinocodev(int sizeof_card,</div><div class='del'>-					   int (*hard_reset)(struct orinoco_private *));</div><div class='add'>+extern struct net_device *alloc_orinocodev(</div><div class='add'>+	int sizeof_card, struct device *device,</div><div class='add'>+	int (*hard_reset)(struct orinoco_private *),</div><div class='add'>+	int (*stop_fw)(struct orinoco_private *, int));</div><div class='ctx'> extern void free_orinocodev(struct net_device *dev);</div><div class='ctx'> extern int __orinoco_up(struct net_device *dev);</div><div class='ctx'> extern int __orinoco_down(struct net_device *dev);</div><div class='head'>diff --git a/drivers/net/wireless/orinoco_cs.c b/drivers/net/wireless/orinoco_cs.c<br/>index 1c216e015f64..6fcf2bda7cdf 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/orinoco_cs.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/orinoco_cs.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/orinoco_cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/orinoco_cs.c</a></div><div class='hunk'>@@ -80,7 +80,7 @@ orinoco_cs_hard_reset(struct orinoco_private *priv)</div><div class='ctx'> 	/* We need atomic ops here, because we're not holding the lock */</div><div class='ctx'> 	set_bit(0, &amp;card-&gt;hard_reset_in_progress);</div><div class='ctx'> </div><div class='del'>-	err = pcmcia_reset_card(link, NULL);</div><div class='add'>+	err = pcmcia_reset_card(link-&gt;socket);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -109,7 +109,8 @@ orinoco_cs_probe(struct pcmcia_device *link)</div><div class='ctx'> 	struct orinoco_private *priv;</div><div class='ctx'> 	struct orinoco_pccard *card;</div><div class='ctx'> </div><div class='del'>-	dev = alloc_orinocodev(sizeof(*card), orinoco_cs_hard_reset);</div><div class='add'>+	dev = alloc_orinocodev(sizeof(*card), &amp;handle_to_dev(link),</div><div class='add'>+			       orinoco_cs_hard_reset, NULL);</div><div class='ctx'> 	if (! dev)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	priv = netdev_priv(dev);</div><div class='hunk'>@@ -120,7 +121,7 @@ orinoco_cs_probe(struct pcmcia_device *link)</div><div class='ctx'> 	link-&gt;priv = dev;</div><div class='ctx'> </div><div class='ctx'> 	/* Interrupt setup */</div><div class='del'>-	link-&gt;irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_HANDLE_PRESENT;</div><div class='add'>+	link-&gt;irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_HANDLE_PRESENT;</div><div class='ctx'> 	link-&gt;irq.IRQInfo1 = IRQ_LEVEL_ID;</div><div class='ctx'> 	link-&gt;irq.Handler = orinoco_interrupt;</div><div class='ctx'> 	link-&gt;irq.Instance = dev; </div><div class='hunk'>@@ -164,6 +165,70 @@ static void orinoco_cs_detach(struct pcmcia_device *link)</div><div class='ctx'> 		last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; \</div><div class='ctx'> 	} while (0)</div><div class='ctx'> </div><div class='add'>+static int orinoco_cs_config_check(struct pcmcia_device *p_dev,</div><div class='add'>+				   cistpl_cftable_entry_t *cfg,</div><div class='add'>+				   cistpl_cftable_entry_t *dflt,</div><div class='add'>+				   unsigned int vcc,</div><div class='add'>+				   void *priv_data)</div><div class='add'>+{</div><div class='add'>+	if (cfg-&gt;index == 0)</div><div class='add'>+		goto next_entry;</div><div class='add'>+</div><div class='add'>+	/* Use power settings for Vcc and Vpp if present */</div><div class='add'>+	/* Note that the CIS values need to be rescaled */</div><div class='add'>+	if (cfg-&gt;vcc.present &amp; (1 &lt;&lt; CISTPL_POWER_VNOM)) {</div><div class='add'>+		if (vcc != cfg-&gt;vcc.param[CISTPL_POWER_VNOM] / 10000) {</div><div class='add'>+			DEBUG(2, "spectrum_cs_config: Vcc mismatch (vcc = %d, CIS = %d)\n",  vcc, cfg-&gt;vcc.param[CISTPL_POWER_VNOM] / 10000);</div><div class='add'>+			if (!ignore_cis_vcc)</div><div class='add'>+				goto next_entry;</div><div class='add'>+		}</div><div class='add'>+	} else if (dflt-&gt;vcc.present &amp; (1 &lt;&lt; CISTPL_POWER_VNOM)) {</div><div class='add'>+		if (vcc != dflt-&gt;vcc.param[CISTPL_POWER_VNOM] / 10000) {</div><div class='add'>+			DEBUG(2, "spectrum_cs_config: Vcc mismatch (vcc = %d, CIS = %d)\n",  vcc, dflt-&gt;vcc.param[CISTPL_POWER_VNOM] / 10000);</div><div class='add'>+			if (!ignore_cis_vcc)</div><div class='add'>+				goto next_entry;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cfg-&gt;vpp1.present &amp; (1 &lt;&lt; CISTPL_POWER_VNOM))</div><div class='add'>+		p_dev-&gt;conf.Vpp =</div><div class='add'>+			cfg-&gt;vpp1.param[CISTPL_POWER_VNOM] / 10000;</div><div class='add'>+	else if (dflt-&gt;vpp1.present &amp; (1 &lt;&lt; CISTPL_POWER_VNOM))</div><div class='add'>+		p_dev-&gt;conf.Vpp =</div><div class='add'>+			dflt-&gt;vpp1.param[CISTPL_POWER_VNOM] / 10000;</div><div class='add'>+</div><div class='add'>+	/* Do we need to allocate an interrupt? */</div><div class='add'>+	p_dev-&gt;conf.Attributes |= CONF_ENABLE_IRQ;</div><div class='add'>+</div><div class='add'>+	/* IO window settings */</div><div class='add'>+	p_dev-&gt;io.NumPorts1 = p_dev-&gt;io.NumPorts2 = 0;</div><div class='add'>+	if ((cfg-&gt;io.nwin &gt; 0) || (dflt-&gt;io.nwin &gt; 0)) {</div><div class='add'>+		cistpl_io_t *io = (cfg-&gt;io.nwin) ? &amp;cfg-&gt;io : &amp;dflt-&gt;io;</div><div class='add'>+		p_dev-&gt;io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;</div><div class='add'>+		if (!(io-&gt;flags &amp; CISTPL_IO_8BIT))</div><div class='add'>+			p_dev-&gt;io.Attributes1 = IO_DATA_PATH_WIDTH_16;</div><div class='add'>+		if (!(io-&gt;flags &amp; CISTPL_IO_16BIT))</div><div class='add'>+			p_dev-&gt;io.Attributes1 = IO_DATA_PATH_WIDTH_8;</div><div class='add'>+		p_dev-&gt;io.IOAddrLines = io-&gt;flags &amp; CISTPL_IO_LINES_MASK;</div><div class='add'>+		p_dev-&gt;io.BasePort1 = io-&gt;win[0].base;</div><div class='add'>+		p_dev-&gt;io.NumPorts1 = io-&gt;win[0].len;</div><div class='add'>+		if (io-&gt;nwin &gt; 1) {</div><div class='add'>+			p_dev-&gt;io.Attributes2 = p_dev-&gt;io.Attributes1;</div><div class='add'>+			p_dev-&gt;io.BasePort2 = io-&gt;win[1].base;</div><div class='add'>+			p_dev-&gt;io.NumPorts2 = io-&gt;win[1].len;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* This reserves IO space but doesn't actually enable it */</div><div class='add'>+		if (pcmcia_request_io(p_dev, &amp;p_dev-&gt;io) != 0)</div><div class='add'>+			goto next_entry;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+next_entry:</div><div class='add'>+	pcmcia_disable_device(p_dev);</div><div class='add'>+	return -ENODEV;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int</div><div class='ctx'> orinoco_cs_config(struct pcmcia_device *link)</div><div class='ctx'> {</div><div class='hunk'>@@ -172,16 +237,8 @@ orinoco_cs_config(struct pcmcia_device *link)</div><div class='ctx'> 	struct orinoco_pccard *card = priv-&gt;card;</div><div class='ctx'> 	hermes_t *hw = &amp;priv-&gt;hw;</div><div class='ctx'> 	int last_fn, last_ret;</div><div class='del'>-	u_char buf[64];</div><div class='del'>-	config_info_t conf;</div><div class='del'>-	tuple_t tuple;</div><div class='del'>-	cisparse_t parse;</div><div class='ctx'> 	void __iomem *mem;</div><div class='ctx'> </div><div class='del'>-	/* Look up the current Vcc */</div><div class='del'>-	CS_CHECK(GetConfigurationInfo,</div><div class='del'>-		 pcmcia_get_configuration_info(link, &amp;conf));</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * In this loop, we scan the CIS for configuration table</div><div class='ctx'> 	 * entries, each of which describes a valid card</div><div class='hunk'>@@ -196,94 +253,14 @@ orinoco_cs_config(struct pcmcia_device *link)</div><div class='ctx'> 	 * and most client drivers will only use the CIS to fill in</div><div class='ctx'> 	 * implementation-defined details.</div><div class='ctx'> 	 */</div><div class='del'>-	tuple.Attributes = 0;</div><div class='del'>-	tuple.TupleData = buf;</div><div class='del'>-	tuple.TupleDataMax = sizeof(buf);</div><div class='del'>-	tuple.TupleOffset = 0;</div><div class='del'>-	tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;</div><div class='del'>-	CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &amp;tuple));</div><div class='del'>-	while (1) {</div><div class='del'>-		cistpl_cftable_entry_t *cfg = &amp;(parse.cftable_entry);</div><div class='del'>-		cistpl_cftable_entry_t dflt = { .index = 0 };</div><div class='del'>-</div><div class='del'>-		if ( (pcmcia_get_tuple_data(link, &amp;tuple) != 0)</div><div class='del'>-		    || (pcmcia_parse_tuple(link, &amp;tuple, &amp;parse) != 0))</div><div class='del'>-			goto next_entry;</div><div class='del'>-</div><div class='del'>-		if (cfg-&gt;flags &amp; CISTPL_CFTABLE_DEFAULT)</div><div class='del'>-			dflt = *cfg;</div><div class='del'>-		if (cfg-&gt;index == 0)</div><div class='del'>-			goto next_entry;</div><div class='del'>-		link-&gt;conf.ConfigIndex = cfg-&gt;index;</div><div class='del'>-</div><div class='del'>-		/* Use power settings for Vcc and Vpp if present */</div><div class='del'>-		/* Note that the CIS values need to be rescaled */</div><div class='del'>-		if (cfg-&gt;vcc.present &amp; (1 &lt;&lt; CISTPL_POWER_VNOM)) {</div><div class='del'>-			if (conf.Vcc != cfg-&gt;vcc.param[CISTPL_POWER_VNOM] / 10000) {</div><div class='del'>-				DEBUG(2, "orinoco_cs_config: Vcc mismatch (conf.Vcc = %d, cfg CIS = %d)\n",  conf.Vcc, cfg-&gt;vcc.param[CISTPL_POWER_VNOM] / 10000);</div><div class='del'>-				if (!ignore_cis_vcc)</div><div class='del'>-					goto next_entry;</div><div class='del'>-			}</div><div class='del'>-		} else if (dflt.vcc.present &amp; (1 &lt;&lt; CISTPL_POWER_VNOM)) {</div><div class='del'>-			if (conf.Vcc != dflt.vcc.param[CISTPL_POWER_VNOM] / 10000) {</div><div class='del'>-				DEBUG(2, "orinoco_cs_config: Vcc mismatch (conf.Vcc = %d, dflt CIS = %d)\n",  conf.Vcc, dflt.vcc.param[CISTPL_POWER_VNOM] / 10000);</div><div class='del'>-				if(!ignore_cis_vcc)</div><div class='del'>-					goto next_entry;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (cfg-&gt;vpp1.present &amp; (1 &lt;&lt; CISTPL_POWER_VNOM))</div><div class='del'>-			link-&gt;conf.Vpp =</div><div class='del'>-			    cfg-&gt;vpp1.param[CISTPL_POWER_VNOM] / 10000;</div><div class='del'>-		else if (dflt.vpp1.present &amp; (1 &lt;&lt; CISTPL_POWER_VNOM))</div><div class='del'>-			link-&gt;conf.Vpp =</div><div class='del'>-			    dflt.vpp1.param[CISTPL_POWER_VNOM] / 10000;</div><div class='del'>-		</div><div class='del'>-		/* Do we need to allocate an interrupt? */</div><div class='del'>-		link-&gt;conf.Attributes |= CONF_ENABLE_IRQ;</div><div class='del'>-</div><div class='del'>-		/* IO window settings */</div><div class='del'>-		link-&gt;io.NumPorts1 = link-&gt;io.NumPorts2 = 0;</div><div class='del'>-		if ((cfg-&gt;io.nwin &gt; 0) || (dflt.io.nwin &gt; 0)) {</div><div class='del'>-			cistpl_io_t *io =</div><div class='del'>-			    (cfg-&gt;io.nwin) ? &amp;cfg-&gt;io : &amp;dflt.io;</div><div class='del'>-			link-&gt;io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;</div><div class='del'>-			if (!(io-&gt;flags &amp; CISTPL_IO_8BIT))</div><div class='del'>-				link-&gt;io.Attributes1 =</div><div class='del'>-				    IO_DATA_PATH_WIDTH_16;</div><div class='del'>-			if (!(io-&gt;flags &amp; CISTPL_IO_16BIT))</div><div class='del'>-				link-&gt;io.Attributes1 =</div><div class='del'>-				    IO_DATA_PATH_WIDTH_8;</div><div class='del'>-			link-&gt;io.IOAddrLines =</div><div class='del'>-			    io-&gt;flags &amp; CISTPL_IO_LINES_MASK;</div><div class='del'>-			link-&gt;io.BasePort1 = io-&gt;win[0].base;</div><div class='del'>-			link-&gt;io.NumPorts1 = io-&gt;win[0].len;</div><div class='del'>-			if (io-&gt;nwin &gt; 1) {</div><div class='del'>-				link-&gt;io.Attributes2 =</div><div class='del'>-				    link-&gt;io.Attributes1;</div><div class='del'>-				link-&gt;io.BasePort2 = io-&gt;win[1].base;</div><div class='del'>-				link-&gt;io.NumPorts2 = io-&gt;win[1].len;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* This reserves IO space but doesn't actually enable it */</div><div class='del'>-			if (pcmcia_request_io(link, &amp;link-&gt;io) != 0)</div><div class='del'>-				goto next_entry;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-		/* If we got this far, we're cool! */</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-		</div><div class='del'>-	next_entry:</div><div class='del'>-		pcmcia_disable_device(link);</div><div class='del'>-		last_ret = pcmcia_get_next_tuple(link, &amp;tuple);</div><div class='del'>-		if (last_ret  == CS_NO_MORE_ITEMS) {</div><div class='add'>+	last_ret = pcmcia_loop_config(link, orinoco_cs_config_check, NULL);</div><div class='add'>+	if (last_ret) {</div><div class='add'>+		if (!ignore_cis_vcc)</div><div class='ctx'> 			printk(KERN_ERR PFX "GetNextTuple(): No matching "</div><div class='ctx'> 			       "CIS configuration.  Maybe you need the "</div><div class='ctx'> 			       "ignore_cis_vcc=1 parameter.\n");</div><div class='del'>-			goto cs_failed;</div><div class='del'>-		}</div><div class='add'>+		cs_error(link, RequestIO, last_ret);</div><div class='add'>+		goto failed;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -334,7 +311,6 @@ orinoco_cs_config(struct pcmcia_device *link)</div><div class='ctx'> 	       "0x%04x-0x%04x\n", dev-&gt;name, dev-&gt;dev.parent-&gt;bus_id,</div><div class='ctx'> 	       link-&gt;irq.AssignedIRQ, link-&gt;io.BasePort1,</div><div class='ctx'> 	       link-&gt;io.BasePort1 + link-&gt;io.NumPorts1 - 1);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'>  cs_failed:</div><div class='hunk'>@@ -402,6 +378,7 @@ static int orinoco_cs_resume(struct pcmcia_device *link)</div><div class='ctx'> 	struct orinoco_private *priv = netdev_priv(dev);</div><div class='ctx'> 	struct orinoco_pccard *card = priv-&gt;card;</div><div class='ctx'> 	int err = 0;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	if (! test_bit(0, &amp;card-&gt;hard_reset_in_progress)) {</div><div class='ctx'> 		err = orinoco_reinit_firmware(dev);</div><div class='hunk'>@@ -411,7 +388,7 @@ static int orinoco_cs_resume(struct pcmcia_device *link)</div><div class='ctx'> 			return -EIO;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		spin_lock(&amp;priv-&gt;lock);</div><div class='add'>+		spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 		netif_device_attach(dev);</div><div class='ctx'> 		priv-&gt;hw_unavailable--;</div><div class='hunk'>@@ -423,7 +400,7 @@ static int orinoco_cs_resume(struct pcmcia_device *link)</div><div class='ctx'> 				       dev-&gt;name, err);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		spin_unlock(&amp;priv-&gt;lock);</div><div class='add'>+		spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='head'>diff --git a/drivers/net/wireless/orinoco_nortel.c b/drivers/net/wireless/orinoco_nortel.c<br/>index 35ec5fcf81a6..2fc86596302e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/orinoco_nortel.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/orinoco_nortel.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/orinoco_nortel.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/orinoco_nortel.c</a></div><div class='hunk'>@@ -182,7 +182,8 @@ static int orinoco_nortel_init_one(struct pci_dev *pdev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate network device */</div><div class='del'>-	dev = alloc_orinocodev(sizeof(*card), orinoco_nortel_cor_reset);</div><div class='add'>+	dev = alloc_orinocodev(sizeof(*card), &amp;pdev-&gt;dev,</div><div class='add'>+			       orinoco_nortel_cor_reset, NULL);</div><div class='ctx'> 	if (!dev) {</div><div class='ctx'> 		printk(KERN_ERR PFX "Cannot allocate network device\n");</div><div class='ctx'> 		err = -ENOMEM;</div><div class='head'>diff --git a/drivers/net/wireless/orinoco_pci.c b/drivers/net/wireless/orinoco_pci.c<br/>index 2547d5dac0d3..4ebd638a073e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/orinoco_pci.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/orinoco_pci.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/orinoco_pci.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/orinoco_pci.c</a></div><div class='hunk'>@@ -139,7 +139,8 @@ static int orinoco_pci_init_one(struct pci_dev *pdev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate network device */</div><div class='del'>-	dev = alloc_orinocodev(sizeof(*card), orinoco_pci_cor_reset);</div><div class='add'>+	dev = alloc_orinocodev(sizeof(*card), &amp;pdev-&gt;dev,</div><div class='add'>+			       orinoco_pci_cor_reset, NULL);</div><div class='ctx'> 	if (!dev) {</div><div class='ctx'> 		printk(KERN_ERR PFX "Cannot allocate network device\n");</div><div class='ctx'> 		err = -ENOMEM;</div><div class='head'>diff --git a/drivers/net/wireless/orinoco_plx.c b/drivers/net/wireless/orinoco_plx.c<br/>index 98fe165337d1..ef761857bb38 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/orinoco_plx.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/orinoco_plx.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/orinoco_plx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/orinoco_plx.c</a></div><div class='hunk'>@@ -221,7 +221,8 @@ static int orinoco_plx_init_one(struct pci_dev *pdev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate network device */</div><div class='del'>-	dev = alloc_orinocodev(sizeof(*card), orinoco_plx_cor_reset);</div><div class='add'>+	dev = alloc_orinocodev(sizeof(*card), &amp;pdev-&gt;dev,</div><div class='add'>+			       orinoco_plx_cor_reset, NULL);</div><div class='ctx'> 	if (!dev) {</div><div class='ctx'> 		printk(KERN_ERR PFX "Cannot allocate network device\n");</div><div class='ctx'> 		err = -ENOMEM;</div><div class='head'>diff --git a/drivers/net/wireless/orinoco_tmd.c b/drivers/net/wireless/orinoco_tmd.c<br/>index df493185a4af..ede24ec309c0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/orinoco_tmd.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/orinoco_tmd.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/orinoco_tmd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/orinoco_tmd.c</a></div><div class='hunk'>@@ -124,7 +124,8 @@ static int orinoco_tmd_init_one(struct pci_dev *pdev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate network device */</div><div class='del'>-	dev = alloc_orinocodev(sizeof(*card), orinoco_tmd_cor_reset);</div><div class='add'>+	dev = alloc_orinocodev(sizeof(*card), &amp;pdev-&gt;dev,</div><div class='add'>+			       orinoco_tmd_cor_reset, NULL);</div><div class='ctx'> 	if (!dev) {</div><div class='ctx'> 		printk(KERN_ERR PFX "Cannot allocate network device\n");</div><div class='ctx'> 		err = -ENOMEM;</div><div class='head'>diff --git a/drivers/net/wireless/p54/p54.h b/drivers/net/wireless/p54/p54.h<br/>index 4801a363507b..1d0704fe146f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/p54/p54.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/p54/p54.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/p54/p54.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/p54/p54.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='del'>-#ifndef PRISM54_H</div><div class='del'>-#define PRISM54_H</div><div class='add'>+#ifndef P54_H</div><div class='add'>+#define P54_H</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Shared defines for all mac80211 Prism54 code</div><div class='hunk'>@@ -19,13 +19,24 @@ enum control_frame_types {</div><div class='ctx'> 	P54_CONTROL_TYPE_CHANNEL_CHANGE,</div><div class='ctx'> 	P54_CONTROL_TYPE_FREQDONE,</div><div class='ctx'> 	P54_CONTROL_TYPE_DCFINIT,</div><div class='del'>-	P54_CONTROL_TYPE_FREEQUEUE = 7,</div><div class='add'>+	P54_CONTROL_TYPE_ENCRYPTION,</div><div class='add'>+	P54_CONTROL_TYPE_TIM,</div><div class='add'>+	P54_CONTROL_TYPE_POWERMGT,</div><div class='add'>+	P54_CONTROL_TYPE_FREEQUEUE,</div><div class='ctx'> 	P54_CONTROL_TYPE_TXDONE,</div><div class='ctx'> 	P54_CONTROL_TYPE_PING,</div><div class='ctx'> 	P54_CONTROL_TYPE_STAT_READBACK,</div><div class='ctx'> 	P54_CONTROL_TYPE_BBP,</div><div class='ctx'> 	P54_CONTROL_TYPE_EEPROM_READBACK,</div><div class='del'>-	P54_CONTROL_TYPE_LED</div><div class='add'>+	P54_CONTROL_TYPE_LED,</div><div class='add'>+	P54_CONTROL_TYPE_GPIO,</div><div class='add'>+	P54_CONTROL_TYPE_TIMER,</div><div class='add'>+	P54_CONTROL_TYPE_MODULATION,</div><div class='add'>+	P54_CONTROL_TYPE_SYNTH_CONFIG,</div><div class='add'>+	P54_CONTROL_TYPE_DETECTOR_VALUE,</div><div class='add'>+	P54_CONTROL_TYPE_XBOW_SYNTH_CFG,</div><div class='add'>+	P54_CONTROL_TYPE_CCE_QUIET,</div><div class='add'>+	P54_CONTROL_TYPE_PSM_STA_UNLOCK,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct p54_control_hdr {</div><div class='hunk'>@@ -38,11 +49,15 @@ struct p54_control_hdr {</div><div class='ctx'> 	u8 data[0];</div><div class='ctx'> } __attribute__ ((packed));</div><div class='ctx'> </div><div class='del'>-#define EEPROM_READBACK_LEN (sizeof(struct p54_control_hdr) + 4 /* p54_eeprom_lm86 */)</div><div class='del'>-#define MAX_RX_SIZE (IEEE80211_MAX_RTS_THRESHOLD + sizeof(struct p54_control_hdr) + 20 /* length of struct p54_rx_hdr */ + 16 )</div><div class='add'>+#define EEPROM_READBACK_LEN 0x3fc</div><div class='ctx'> </div><div class='ctx'> #define ISL38XX_DEV_FIRMWARE_ADDR 0x20000</div><div class='ctx'> </div><div class='add'>+#define FW_FMAC 0x464d4143</div><div class='add'>+#define FW_LM86 0x4c4d3836</div><div class='add'>+#define FW_LM87 0x4c4d3837</div><div class='add'>+#define FW_LM20 0x4c4d3230</div><div class='add'>+</div><div class='ctx'> struct p54_common {</div><div class='ctx'> 	u32 rx_start;</div><div class='ctx'> 	u32 rx_end;</div><div class='hunk'>@@ -53,27 +68,43 @@ struct p54_common {</div><div class='ctx'> 	void (*stop)(struct ieee80211_hw *dev);</div><div class='ctx'> 	int mode;</div><div class='ctx'> 	u16 seqno;</div><div class='add'>+	u16 rx_mtu;</div><div class='add'>+	u8 headroom;</div><div class='add'>+	u8 tailroom;</div><div class='ctx'> 	struct mutex conf_mutex;</div><div class='ctx'> 	u8 mac_addr[ETH_ALEN];</div><div class='ctx'> 	u8 bssid[ETH_ALEN];</div><div class='add'>+	__le16 filter_type;</div><div class='ctx'> 	struct pda_iq_autocal_entry *iq_autocal;</div><div class='ctx'> 	unsigned int iq_autocal_len;</div><div class='ctx'> 	struct pda_channel_output_limit *output_limit;</div><div class='ctx'> 	unsigned int output_limit_len;</div><div class='ctx'> 	struct pda_pa_curve_data *curve_data;</div><div class='del'>-	__le16 rxhw;</div><div class='add'>+	unsigned int filter_flags;</div><div class='add'>+	u16 rxhw;</div><div class='ctx'> 	u8 version;</div><div class='add'>+	u8 rx_antenna;</div><div class='ctx'> 	unsigned int tx_hdr_len;</div><div class='ctx'> 	void *cached_vdcf;</div><div class='ctx'> 	unsigned int fw_var;</div><div class='del'>-	struct ieee80211_tx_queue_stats tx_stats[4];</div><div class='add'>+	unsigned int fw_interface;</div><div class='add'>+	unsigned int output_power;</div><div class='add'>+	u32 tsf_low32;</div><div class='add'>+	u32 tsf_high32;</div><div class='add'>+	struct ieee80211_tx_queue_stats tx_stats[8];</div><div class='add'>+	struct ieee80211_low_level_stats stats;</div><div class='add'>+	struct timer_list stats_timer;</div><div class='add'>+	struct completion stats_comp;</div><div class='add'>+	void *cached_stats;</div><div class='add'>+	int noise;</div><div class='add'>+	void *eeprom;</div><div class='add'>+	struct completion eeprom_comp;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int p54_rx(struct ieee80211_hw *dev, struct sk_buff *skb);</div><div class='del'>-void p54_parse_firmware(struct ieee80211_hw *dev, const struct firmware *fw);</div><div class='del'>-int p54_parse_eeprom(struct ieee80211_hw *dev, void *eeprom, int len);</div><div class='del'>-void p54_fill_eeprom_readback(struct p54_control_hdr *hdr);</div><div class='add'>+int p54_parse_firmware(struct ieee80211_hw *dev, const struct firmware *fw);</div><div class='add'>+int p54_read_eeprom(struct ieee80211_hw *dev);</div><div class='ctx'> struct ieee80211_hw *p54_init_common(size_t priv_data_len);</div><div class='ctx'> void p54_free_common(struct ieee80211_hw *dev);</div><div class='ctx'> </div><div class='del'>-#endif /* PRISM54_H */</div><div class='add'>+#endif /* P54_H */</div><div class='head'>diff --git a/drivers/net/wireless/p54/p54common.c b/drivers/net/wireless/p54/p54common.c<br/>index 29be3dc8ee09..117c7d3a52b0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/p54/p54common.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/p54/p54common.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/p54/p54common.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/p54/p54common.c</a></div><div class='hunk'>@@ -27,7 +27,7 @@ MODULE_DESCRIPTION("Softmac Prism54 common code");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_ALIAS("prism54common");</div><div class='ctx'> </div><div class='del'>-static struct ieee80211_rate p54_rates[] = {</div><div class='add'>+static struct ieee80211_rate p54_bgrates[] = {</div><div class='ctx'> 	{ .bitrate = 10, .hw_value = 0, .flags = IEEE80211_RATE_SHORT_PREAMBLE },</div><div class='ctx'> 	{ .bitrate = 20, .hw_value = 1, .flags = IEEE80211_RATE_SHORT_PREAMBLE },</div><div class='ctx'> 	{ .bitrate = 55, .hw_value = 2, .flags = IEEE80211_RATE_SHORT_PREAMBLE },</div><div class='hunk'>@@ -42,7 +42,7 @@ static struct ieee80211_rate p54_rates[] = {</div><div class='ctx'> 	{ .bitrate = 540, .hw_value = 11, },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct ieee80211_channel p54_channels[] = {</div><div class='add'>+static struct ieee80211_channel p54_bgchannels[] = {</div><div class='ctx'> 	{ .center_freq = 2412, .hw_value = 1, },</div><div class='ctx'> 	{ .center_freq = 2417, .hw_value = 2, },</div><div class='ctx'> 	{ .center_freq = 2422, .hw_value = 3, },</div><div class='hunk'>@@ -60,14 +60,69 @@ static struct ieee80211_channel p54_channels[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct ieee80211_supported_band band_2GHz = {</div><div class='del'>-	.channels = p54_channels,</div><div class='del'>-	.n_channels = ARRAY_SIZE(p54_channels),</div><div class='del'>-	.bitrates = p54_rates,</div><div class='del'>-	.n_bitrates = ARRAY_SIZE(p54_rates),</div><div class='add'>+	.channels = p54_bgchannels,</div><div class='add'>+	.n_channels = ARRAY_SIZE(p54_bgchannels),</div><div class='add'>+	.bitrates = p54_bgrates,</div><div class='add'>+	.n_bitrates = ARRAY_SIZE(p54_bgrates),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct ieee80211_rate p54_arates[] = {</div><div class='add'>+	{ .bitrate = 60, .hw_value = 4, },</div><div class='add'>+	{ .bitrate = 90, .hw_value = 5, },</div><div class='add'>+	{ .bitrate = 120, .hw_value = 6, },</div><div class='add'>+	{ .bitrate = 180, .hw_value = 7, },</div><div class='add'>+	{ .bitrate = 240, .hw_value = 8, },</div><div class='add'>+	{ .bitrate = 360, .hw_value = 9, },</div><div class='add'>+	{ .bitrate = 480, .hw_value = 10, },</div><div class='add'>+	{ .bitrate = 540, .hw_value = 11, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct ieee80211_channel p54_achannels[] = {</div><div class='add'>+	{ .center_freq = 4920 },</div><div class='add'>+	{ .center_freq = 4940 },</div><div class='add'>+	{ .center_freq = 4960 },</div><div class='add'>+	{ .center_freq = 4980 },</div><div class='add'>+	{ .center_freq = 5040 },</div><div class='add'>+	{ .center_freq = 5060 },</div><div class='add'>+	{ .center_freq = 5080 },</div><div class='add'>+	{ .center_freq = 5170 },</div><div class='add'>+	{ .center_freq = 5180 },</div><div class='add'>+	{ .center_freq = 5190 },</div><div class='add'>+	{ .center_freq = 5200 },</div><div class='add'>+	{ .center_freq = 5210 },</div><div class='add'>+	{ .center_freq = 5220 },</div><div class='add'>+	{ .center_freq = 5230 },</div><div class='add'>+	{ .center_freq = 5240 },</div><div class='add'>+	{ .center_freq = 5260 },</div><div class='add'>+	{ .center_freq = 5280 },</div><div class='add'>+	{ .center_freq = 5300 },</div><div class='add'>+	{ .center_freq = 5320 },</div><div class='add'>+	{ .center_freq = 5500 },</div><div class='add'>+	{ .center_freq = 5520 },</div><div class='add'>+	{ .center_freq = 5540 },</div><div class='add'>+	{ .center_freq = 5560 },</div><div class='add'>+	{ .center_freq = 5580 },</div><div class='add'>+	{ .center_freq = 5600 },</div><div class='add'>+	{ .center_freq = 5620 },</div><div class='add'>+	{ .center_freq = 5640 },</div><div class='add'>+	{ .center_freq = 5660 },</div><div class='add'>+	{ .center_freq = 5680 },</div><div class='add'>+	{ .center_freq = 5700 },</div><div class='add'>+	{ .center_freq = 5745 },</div><div class='add'>+	{ .center_freq = 5765 },</div><div class='add'>+	{ .center_freq = 5785 },</div><div class='add'>+	{ .center_freq = 5805 },</div><div class='add'>+	{ .center_freq = 5825 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct ieee80211_supported_band band_5GHz = {</div><div class='add'>+	.channels = p54_achannels,</div><div class='add'>+	.n_channels = ARRAY_SIZE(p54_achannels),</div><div class='add'>+	.bitrates = p54_arates,</div><div class='add'>+	.n_bitrates = ARRAY_SIZE(p54_arates),</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-void p54_parse_firmware(struct ieee80211_hw *dev, const struct firmware *fw)</div><div class='add'>+int p54_parse_firmware(struct ieee80211_hw *dev, const struct firmware *fw)</div><div class='ctx'> {</div><div class='ctx'> 	struct p54_common *priv = dev-&gt;priv;</div><div class='ctx'> 	struct bootrec_exp_if *exp_if;</div><div class='hunk'>@@ -79,7 +134,7 @@ void p54_parse_firmware(struct ieee80211_hw *dev, const struct firmware *fw)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (priv-&gt;rx_start)</div><div class='del'>-		return;</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	while (data &lt; end_data &amp;&amp; *data)</div><div class='ctx'> 		data++;</div><div class='hunk'>@@ -94,7 +149,9 @@ void p54_parse_firmware(struct ieee80211_hw *dev, const struct firmware *fw)</div><div class='ctx'> 		u32 code = le32_to_cpu(bootrec-&gt;code);</div><div class='ctx'> 		switch (code) {</div><div class='ctx'> 		case BR_CODE_COMPONENT_ID:</div><div class='del'>-			switch (be32_to_cpu(*(__be32 *)bootrec-&gt;data)) {</div><div class='add'>+			priv-&gt;fw_interface = be32_to_cpup((__be32 *)</div><div class='add'>+					     bootrec-&gt;data);</div><div class='add'>+			switch (priv-&gt;fw_interface) {</div><div class='ctx'> 			case FW_FMAC:</div><div class='ctx'> 				printk(KERN_INFO "p54: FreeMAC firmware\n");</div><div class='ctx'> 				break;</div><div class='hunk'>@@ -105,7 +162,7 @@ void p54_parse_firmware(struct ieee80211_hw *dev, const struct firmware *fw)</div><div class='ctx'> 				printk(KERN_INFO "p54: LM86 firmware\n");</div><div class='ctx'> 				break;</div><div class='ctx'> 			case FW_LM87:</div><div class='del'>-				printk(KERN_INFO "p54: LM87 firmware - not supported yet!\n");</div><div class='add'>+				printk(KERN_INFO "p54: LM87 firmware\n");</div><div class='ctx'> 				break;</div><div class='ctx'> 			default:</div><div class='ctx'> 				printk(KERN_INFO "p54: unknown firmware\n");</div><div class='hunk'>@@ -117,11 +174,21 @@ void p54_parse_firmware(struct ieee80211_hw *dev, const struct firmware *fw)</div><div class='ctx'> 			if (strnlen((unsigned char*)bootrec-&gt;data, 24) &lt; 24)</div><div class='ctx'> 				fw_version = (unsigned char*)bootrec-&gt;data;</div><div class='ctx'> 			break;</div><div class='del'>-		case BR_CODE_DESCR:</div><div class='del'>-			priv-&gt;rx_start = le32_to_cpu(((__le32 *)bootrec-&gt;data)[1]);</div><div class='add'>+		case BR_CODE_DESCR: {</div><div class='add'>+			struct bootrec_desc *desc =</div><div class='add'>+				(struct bootrec_desc *)bootrec-&gt;data;</div><div class='add'>+			priv-&gt;rx_start = le32_to_cpu(desc-&gt;rx_start);</div><div class='ctx'> 			/* FIXME add sanity checking */</div><div class='del'>-			priv-&gt;rx_end = le32_to_cpu(((__le32 *)bootrec-&gt;data)[2]) - 0x3500;</div><div class='add'>+			priv-&gt;rx_end = le32_to_cpu(desc-&gt;rx_end) - 0x3500;</div><div class='add'>+			priv-&gt;headroom = desc-&gt;headroom;</div><div class='add'>+			priv-&gt;tailroom = desc-&gt;tailroom;</div><div class='add'>+			if (le32_to_cpu(bootrec-&gt;len) == 11)</div><div class='add'>+				priv-&gt;rx_mtu = le16_to_cpu(bootrec-&gt;rx_mtu);</div><div class='add'>+			else</div><div class='add'>+				priv-&gt;rx_mtu = (size_t)</div><div class='add'>+					0x620 - priv-&gt;tx_hdr_len;</div><div class='ctx'> 			break;</div><div class='add'>+			}</div><div class='ctx'> 		case BR_CODE_EXPOSED_IF:</div><div class='ctx'> 			exp_if = (struct bootrec_exp_if *) bootrec-&gt;data;</div><div class='ctx'> 			for (i = 0; i &lt; (len * sizeof(*exp_if) / 4); i++)</div><div class='hunk'>@@ -146,23 +213,25 @@ void p54_parse_firmware(struct ieee80211_hw *dev, const struct firmware *fw)</div><div class='ctx'> </div><div class='ctx'> 	if (priv-&gt;fw_var &gt;= 0x300) {</div><div class='ctx'> 		/* Firmware supports QoS, use it! */</div><div class='del'>-		priv-&gt;tx_stats[0].limit = 3;</div><div class='del'>-		priv-&gt;tx_stats[1].limit = 4;</div><div class='del'>-		priv-&gt;tx_stats[2].limit = 3;</div><div class='del'>-		priv-&gt;tx_stats[3].limit = 1;</div><div class='add'>+		priv-&gt;tx_stats[4].limit = 3;</div><div class='add'>+		priv-&gt;tx_stats[5].limit = 4;</div><div class='add'>+		priv-&gt;tx_stats[6].limit = 3;</div><div class='add'>+		priv-&gt;tx_stats[7].limit = 1;</div><div class='ctx'> 		dev-&gt;queues = 4;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(p54_parse_firmware);</div><div class='ctx'> </div><div class='del'>-static int p54_convert_rev0_to_rev1(struct ieee80211_hw *dev,</div><div class='del'>-				    struct pda_pa_curve_data *curve_data)</div><div class='add'>+static int p54_convert_rev0(struct ieee80211_hw *dev,</div><div class='add'>+			    struct pda_pa_curve_data *curve_data)</div><div class='ctx'> {</div><div class='ctx'> 	struct p54_common *priv = dev-&gt;priv;</div><div class='del'>-	struct pda_pa_curve_data_sample_rev1 *rev1;</div><div class='del'>-	struct pda_pa_curve_data_sample_rev0 *rev0;</div><div class='add'>+	struct p54_pa_curve_data_sample *dst;</div><div class='add'>+	struct pda_pa_curve_data_sample_rev0 *src;</div><div class='ctx'> 	size_t cd_len = sizeof(*curve_data) +</div><div class='del'>-		(curve_data-&gt;points_per_channel*sizeof(*rev1) + 2) *</div><div class='add'>+		(curve_data-&gt;points_per_channel*sizeof(*dst) + 2) *</div><div class='ctx'> 		 curve_data-&gt;channels;</div><div class='ctx'> 	unsigned int i, j;</div><div class='ctx'> 	void *source, *target;</div><div class='hunk'>@@ -180,28 +249,68 @@ static int p54_convert_rev0_to_rev1(struct ieee80211_hw *dev,</div><div class='ctx'> 		*((__le16 *)target) = *freq;</div><div class='ctx'> 		target += sizeof(__le16);</div><div class='ctx'> 		for (j = 0; j &lt; curve_data-&gt;points_per_channel; j++) {</div><div class='del'>-			rev1 = target;</div><div class='del'>-			rev0 = source;</div><div class='add'>+			dst = target;</div><div class='add'>+			src = source;</div><div class='ctx'> </div><div class='del'>-			rev1-&gt;rf_power = rev0-&gt;rf_power;</div><div class='del'>-			rev1-&gt;pa_detector = rev0-&gt;pa_detector;</div><div class='del'>-			rev1-&gt;data_64qam = rev0-&gt;pcv;</div><div class='add'>+			dst-&gt;rf_power = src-&gt;rf_power;</div><div class='add'>+			dst-&gt;pa_detector = src-&gt;pa_detector;</div><div class='add'>+			dst-&gt;data_64qam = src-&gt;pcv;</div><div class='ctx'> 			/* "invent" the points for the other modulations */</div><div class='ctx'> #define SUB(x,y) (u8)((x) - (y)) &gt; (x) ? 0 : (x) - (y)</div><div class='del'>-			rev1-&gt;data_16qam = SUB(rev0-&gt;pcv, 12);</div><div class='del'>-			rev1-&gt;data_qpsk  = SUB(rev1-&gt;data_16qam, 12);</div><div class='del'>-			rev1-&gt;data_bpsk  = SUB(rev1-&gt;data_qpsk, 12);</div><div class='del'>-			rev1-&gt;data_barker= SUB(rev1-&gt;data_bpsk, 14);</div><div class='add'>+			dst-&gt;data_16qam = SUB(src-&gt;pcv, 12);</div><div class='add'>+			dst-&gt;data_qpsk = SUB(dst-&gt;data_16qam, 12);</div><div class='add'>+			dst-&gt;data_bpsk = SUB(dst-&gt;data_qpsk, 12);</div><div class='add'>+			dst-&gt;data_barker = SUB(dst-&gt;data_bpsk, 14);</div><div class='ctx'> #undef SUB</div><div class='del'>-			target += sizeof(*rev1);</div><div class='del'>-			source += sizeof(*rev0);</div><div class='add'>+			target += sizeof(*dst);</div><div class='add'>+			source += sizeof(*src);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int p54_parse_eeprom(struct ieee80211_hw *dev, void *eeprom, int len)</div><div class='add'>+static int p54_convert_rev1(struct ieee80211_hw *dev,</div><div class='add'>+			    struct pda_pa_curve_data *curve_data)</div><div class='add'>+{</div><div class='add'>+	struct p54_common *priv = dev-&gt;priv;</div><div class='add'>+	struct p54_pa_curve_data_sample *dst;</div><div class='add'>+	struct pda_pa_curve_data_sample_rev1 *src;</div><div class='add'>+	size_t cd_len = sizeof(*curve_data) +</div><div class='add'>+		(curve_data-&gt;points_per_channel*sizeof(*dst) + 2) *</div><div class='add'>+		 curve_data-&gt;channels;</div><div class='add'>+	unsigned int i, j;</div><div class='add'>+	void *source, *target;</div><div class='add'>+</div><div class='add'>+	priv-&gt;curve_data = kmalloc(cd_len, GFP_KERNEL);</div><div class='add'>+	if (!priv-&gt;curve_data)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	memcpy(priv-&gt;curve_data, curve_data, sizeof(*curve_data));</div><div class='add'>+	source = curve_data-&gt;data;</div><div class='add'>+	target = priv-&gt;curve_data-&gt;data;</div><div class='add'>+	for (i = 0; i &lt; curve_data-&gt;channels; i++) {</div><div class='add'>+		__le16 *freq = source;</div><div class='add'>+		source += sizeof(__le16);</div><div class='add'>+		*((__le16 *)target) = *freq;</div><div class='add'>+		target += sizeof(__le16);</div><div class='add'>+		for (j = 0; j &lt; curve_data-&gt;points_per_channel; j++) {</div><div class='add'>+			memcpy(target, source, sizeof(*src));</div><div class='add'>+</div><div class='add'>+			target += sizeof(*dst);</div><div class='add'>+			source += sizeof(*src);</div><div class='add'>+		}</div><div class='add'>+		source++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const char *p54_rf_chips[] = { "NULL", "Indigo?", "Duette",</div><div class='add'>+                              "Frisbee", "Xbow", "Longbow" };</div><div class='add'>+static int p54_init_xbow_synth(struct ieee80211_hw *dev);</div><div class='add'>+</div><div class='add'>+static int p54_parse_eeprom(struct ieee80211_hw *dev, void *eeprom, int len)</div><div class='ctx'> {</div><div class='ctx'> 	struct p54_common *priv = dev-&gt;priv;</div><div class='ctx'> 	struct eeprom_pda_wrap *wrap = NULL;</div><div class='hunk'>@@ -210,6 +319,7 @@ int p54_parse_eeprom(struct ieee80211_hw *dev, void *eeprom, int len)</div><div class='ctx'> 	void *tmp;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	u8 *end = (u8 *)eeprom + len;</div><div class='add'>+	DECLARE_MAC_BUF(mac);</div><div class='ctx'> </div><div class='ctx'> 	wrap = (struct eeprom_pda_wrap *) eeprom;</div><div class='ctx'> 	entry = (void *)wrap-&gt;data + le16_to_cpu(wrap-&gt;len);</div><div class='hunk'>@@ -250,27 +360,32 @@ int p54_parse_eeprom(struct ieee80211_hw *dev, void *eeprom, int len)</div><div class='ctx'> 			       entry-&gt;data[1]*sizeof(*priv-&gt;output_limit));</div><div class='ctx'> 			priv-&gt;output_limit_len = entry-&gt;data[1];</div><div class='ctx'> 			break;</div><div class='del'>-		case PDR_PRISM_PA_CAL_CURVE_DATA:</div><div class='del'>-			if (data_len &lt; sizeof(struct pda_pa_curve_data)) {</div><div class='add'>+		case PDR_PRISM_PA_CAL_CURVE_DATA: {</div><div class='add'>+			struct pda_pa_curve_data *curve_data =</div><div class='add'>+				(struct pda_pa_curve_data *)entry-&gt;data;</div><div class='add'>+			if (data_len &lt; sizeof(*curve_data)) {</div><div class='ctx'> 				err = -EINVAL;</div><div class='ctx'> 				goto err;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			if (((struct pda_pa_curve_data *)entry-&gt;data)-&gt;cal_method_rev) {</div><div class='del'>-				priv-&gt;curve_data = kmalloc(data_len, GFP_KERNEL);</div><div class='del'>-				if (!priv-&gt;curve_data) {</div><div class='del'>-					err = -ENOMEM;</div><div class='del'>-					goto err;</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-				memcpy(priv-&gt;curve_data, entry-&gt;data, data_len);</div><div class='del'>-			} else {</div><div class='del'>-				err = p54_convert_rev0_to_rev1(dev, (struct pda_pa_curve_data *)entry-&gt;data);</div><div class='del'>-				if (err)</div><div class='del'>-					goto err;</div><div class='add'>+			switch (curve_data-&gt;cal_method_rev) {</div><div class='add'>+			case 0:</div><div class='add'>+				err = p54_convert_rev0(dev, curve_data);</div><div class='add'>+				break;</div><div class='add'>+			case 1:</div><div class='add'>+				err = p54_convert_rev1(dev, curve_data);</div><div class='add'>+				break;</div><div class='add'>+			default:</div><div class='add'>+				printk(KERN_ERR "p54: unknown curve data "</div><div class='add'>+						"revision %d\n",</div><div class='add'>+						curve_data-&gt;cal_method_rev);</div><div class='add'>+				err = -ENODEV;</div><div class='add'>+				break;</div><div class='ctx'> 			}</div><div class='add'>+			if (err)</div><div class='add'>+				goto err;</div><div class='ctx'> </div><div class='del'>-			break;</div><div class='add'>+		}</div><div class='ctx'> 		case PDR_PRISM_ZIF_TX_IQ_CALIBRATION:</div><div class='ctx'> 			priv-&gt;iq_autocal = kmalloc(data_len, GFP_KERNEL);</div><div class='ctx'> 			if (!priv-&gt;iq_autocal) {</div><div class='hunk'>@@ -286,7 +401,7 @@ int p54_parse_eeprom(struct ieee80211_hw *dev, void *eeprom, int len)</div><div class='ctx'> 			while ((u8 *)tmp &lt; entry-&gt;data + data_len) {</div><div class='ctx'> 				struct bootrec_exp_if *exp_if = tmp;</div><div class='ctx'> 				if (le16_to_cpu(exp_if-&gt;if_id) == 0xF)</div><div class='del'>-					priv-&gt;rxhw = exp_if-&gt;variant &amp; cpu_to_le16(0x07);</div><div class='add'>+					priv-&gt;rxhw = le16_to_cpu(exp_if-&gt;variant) &amp; 0x07;</div><div class='ctx'> 				tmp += sizeof(struct bootrec_exp_if);</div><div class='ctx'> 			}</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -312,6 +427,37 @@ int p54_parse_eeprom(struct ieee80211_hw *dev, void *eeprom, int len)</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	switch (priv-&gt;rxhw) {</div><div class='add'>+	case 4: /* XBow */</div><div class='add'>+		p54_init_xbow_synth(dev);</div><div class='add'>+	case 1: /* Indigo? */</div><div class='add'>+	case 2: /* Duette */</div><div class='add'>+		dev-&gt;wiphy-&gt;bands[IEEE80211_BAND_5GHZ] = &amp;band_5GHz;</div><div class='add'>+	case 3: /* Frisbee */</div><div class='add'>+	case 5: /* Longbow */</div><div class='add'>+		dev-&gt;wiphy-&gt;bands[IEEE80211_BAND_2GHZ] = &amp;band_2GHz;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		printk(KERN_ERR "%s: unsupported RF-Chip\n",</div><div class='add'>+			wiphy_name(dev-&gt;wiphy));</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!is_valid_ether_addr(dev-&gt;wiphy-&gt;perm_addr)) {</div><div class='add'>+		u8 perm_addr[ETH_ALEN];</div><div class='add'>+</div><div class='add'>+		printk(KERN_WARNING "%s: Invalid hwaddr! Using randomly generated MAC addr\n",</div><div class='add'>+			wiphy_name(dev-&gt;wiphy));</div><div class='add'>+		random_ether_addr(perm_addr);</div><div class='add'>+		SET_IEEE80211_PERM_ADDR(dev, perm_addr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "%s: hwaddr %s, MAC:isl38%02x RF:%s\n",</div><div class='add'>+		wiphy_name(dev-&gt;wiphy),</div><div class='add'>+		print_mac(mac, dev-&gt;wiphy-&gt;perm_addr),</div><div class='add'>+		priv-&gt;version, p54_rf_chips[priv-&gt;rxhw]);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'>   err:</div><div class='hunk'>@@ -333,42 +479,56 @@ int p54_parse_eeprom(struct ieee80211_hw *dev, void *eeprom, int len)</div><div class='ctx'> 	printk(KERN_ERR "p54: eeprom parse failed!\n");</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(p54_parse_eeprom);</div><div class='ctx'> </div><div class='del'>-void p54_fill_eeprom_readback(struct p54_control_hdr *hdr)</div><div class='add'>+static int p54_rssi_to_dbm(struct ieee80211_hw *dev, int rssi)</div><div class='ctx'> {</div><div class='del'>-	struct p54_eeprom_lm86 *eeprom_hdr;</div><div class='del'>-</div><div class='del'>-	hdr-&gt;magic1 = cpu_to_le16(0x8000);</div><div class='del'>-	hdr-&gt;len = cpu_to_le16(sizeof(*eeprom_hdr) + 0x2000);</div><div class='del'>-	hdr-&gt;type = cpu_to_le16(P54_CONTROL_TYPE_EEPROM_READBACK);</div><div class='del'>-	hdr-&gt;retry1 = hdr-&gt;retry2 = 0;</div><div class='del'>-	eeprom_hdr = (struct p54_eeprom_lm86 *) hdr-&gt;data;</div><div class='del'>-	eeprom_hdr-&gt;offset = 0x0;</div><div class='del'>-	eeprom_hdr-&gt;len = cpu_to_le16(0x2000);</div><div class='add'>+	/* TODO: get the rssi_add &amp; rssi_mul data from the eeprom */</div><div class='add'>+	return ((rssi * 0x83) / 64 - 400) / 4;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(p54_fill_eeprom_readback);</div><div class='ctx'> </div><div class='del'>-static void p54_rx_data(struct ieee80211_hw *dev, struct sk_buff *skb)</div><div class='add'>+static int p54_rx_data(struct ieee80211_hw *dev, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='add'>+	struct p54_common *priv = dev-&gt;priv;</div><div class='ctx'> 	struct p54_rx_hdr *hdr = (struct p54_rx_hdr *) skb-&gt;data;</div><div class='ctx'> 	struct ieee80211_rx_status rx_status = {0};</div><div class='ctx'> 	u16 freq = le16_to_cpu(hdr-&gt;freq);</div><div class='add'>+	size_t header_len = sizeof(*hdr);</div><div class='add'>+	u32 tsf32;</div><div class='add'>+</div><div class='add'>+	if (!(hdr-&gt;magic &amp; cpu_to_le16(0x0001))) {</div><div class='add'>+		if (priv-&gt;filter_flags &amp; FIF_FCSFAIL)</div><div class='add'>+			rx_status.flag |= RX_FLAG_FAILED_FCS_CRC;</div><div class='add'>+		else</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	rx_status.signal = hdr-&gt;rssi;</div><div class='add'>+	rx_status.signal = p54_rssi_to_dbm(dev, hdr-&gt;rssi);</div><div class='add'>+	rx_status.noise = priv-&gt;noise;</div><div class='ctx'> 	/* XX correct? */</div><div class='ctx'> 	rx_status.qual = (100 * hdr-&gt;rssi) / 127;</div><div class='del'>-	rx_status.rate_idx = hdr-&gt;rate &amp; 0xf;</div><div class='add'>+	rx_status.rate_idx = (dev-&gt;conf.channel-&gt;band == IEEE80211_BAND_2GHZ ?</div><div class='add'>+			hdr-&gt;rate : (hdr-&gt;rate - 4)) &amp; 0xf;</div><div class='ctx'> 	rx_status.freq = freq;</div><div class='del'>-	rx_status.band = IEEE80211_BAND_2GHZ;</div><div class='add'>+	rx_status.band =  dev-&gt;conf.channel-&gt;band;</div><div class='ctx'> 	rx_status.antenna = hdr-&gt;antenna;</div><div class='del'>-	rx_status.mactime = le64_to_cpu(hdr-&gt;timestamp);</div><div class='add'>+</div><div class='add'>+	tsf32 = le32_to_cpu(hdr-&gt;tsf32);</div><div class='add'>+	if (tsf32 &lt; priv-&gt;tsf_low32)</div><div class='add'>+		priv-&gt;tsf_high32++;</div><div class='add'>+	rx_status.mactime = ((u64)priv-&gt;tsf_high32) &lt;&lt; 32 | tsf32;</div><div class='add'>+	priv-&gt;tsf_low32 = tsf32;</div><div class='add'>+</div><div class='ctx'> 	rx_status.flag |= RX_FLAG_TSFT;</div><div class='ctx'> </div><div class='del'>-	skb_pull(skb, sizeof(*hdr));</div><div class='add'>+	if (hdr-&gt;magic &amp; cpu_to_le16(0x4000))</div><div class='add'>+		header_len += hdr-&gt;align[0];</div><div class='add'>+</div><div class='add'>+	skb_pull(skb, header_len);</div><div class='ctx'> 	skb_trim(skb, le16_to_cpu(hdr-&gt;len));</div><div class='ctx'> </div><div class='ctx'> 	ieee80211_rx_irqsafe(dev, skb, &amp;rx_status);</div><div class='add'>+</div><div class='add'>+	return -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void inline p54_wake_free_queues(struct ieee80211_hw *dev)</div><div class='hunk'>@@ -377,7 +537,7 @@ static void inline p54_wake_free_queues(struct ieee80211_hw *dev)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; dev-&gt;queues; i++)</div><div class='del'>-		if (priv-&gt;tx_stats[i].len &lt; priv-&gt;tx_stats[i].limit)</div><div class='add'>+		if (priv-&gt;tx_stats[i + 4].len &lt; priv-&gt;tx_stats[i + 4].limit)</div><div class='ctx'> 			ieee80211_wake_queue(dev, i);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -387,11 +547,13 @@ static void p54_rx_frame_sent(struct ieee80211_hw *dev, struct sk_buff *skb)</div><div class='ctx'> 	struct p54_control_hdr *hdr = (struct p54_control_hdr *) skb-&gt;data;</div><div class='ctx'> 	struct p54_frame_sent_hdr *payload = (struct p54_frame_sent_hdr *) hdr-&gt;data;</div><div class='ctx'> 	struct sk_buff *entry = (struct sk_buff *) priv-&gt;tx_queue.next;</div><div class='del'>-	u32 addr = le32_to_cpu(hdr-&gt;req_id) - 0x70;</div><div class='add'>+	u32 addr = le32_to_cpu(hdr-&gt;req_id) - priv-&gt;headroom;</div><div class='ctx'> 	struct memrecord *range = NULL;</div><div class='ctx'> 	u32 freed = 0;</div><div class='ctx'> 	u32 last_addr = priv-&gt;rx_start;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> </div><div class='add'>+	spin_lock_irqsave(&amp;priv-&gt;tx_queue.lock, flags);</div><div class='ctx'> 	while (entry != (struct sk_buff *)&amp;priv-&gt;tx_queue) {</div><div class='ctx'> 		struct ieee80211_tx_info *info = IEEE80211_SKB_CB(entry);</div><div class='ctx'> 		range = (void *)info-&gt;driver_data;</div><div class='hunk'>@@ -412,13 +574,15 @@ static void p54_rx_frame_sent(struct ieee80211_hw *dev, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 			last_addr = range-&gt;end_addr;</div><div class='ctx'> 			__skb_unlink(entry, &amp;priv-&gt;tx_queue);</div><div class='add'>+			spin_unlock_irqrestore(&amp;priv-&gt;tx_queue.lock, flags);</div><div class='add'>+</div><div class='ctx'> 			memset(&amp;info-&gt;status, 0, sizeof(info-&gt;status));</div><div class='ctx'> 			entry_hdr = (struct p54_control_hdr *) entry-&gt;data;</div><div class='ctx'> 			entry_data = (struct p54_tx_control_allocdata *) entry_hdr-&gt;data;</div><div class='ctx'> 			if ((entry_hdr-&gt;magic1 &amp; cpu_to_le16(0x4000)) != 0)</div><div class='ctx'> 				pad = entry_data-&gt;align[0];</div><div class='ctx'> </div><div class='del'>-			priv-&gt;tx_stats[entry_data-&gt;hw_queue - 4].len--;</div><div class='add'>+			priv-&gt;tx_stats[entry_data-&gt;hw_queue].len--;</div><div class='ctx'> 			if (!(info-&gt;flags &amp; IEEE80211_TX_CTL_NO_ACK)) {</div><div class='ctx'> 				if (!(payload-&gt;status &amp; 0x01))</div><div class='ctx'> 					info-&gt;flags |= IEEE80211_TX_STAT_ACK;</div><div class='hunk'>@@ -426,21 +590,60 @@ static void p54_rx_frame_sent(struct ieee80211_hw *dev, struct sk_buff *skb)</div><div class='ctx'> 					info-&gt;status.excessive_retries = 1;</div><div class='ctx'> 			}</div><div class='ctx'> 			info-&gt;status.retry_count = payload-&gt;retries - 1;</div><div class='del'>-			info-&gt;status.ack_signal = le16_to_cpu(payload-&gt;ack_rssi);</div><div class='add'>+			info-&gt;status.ack_signal = p54_rssi_to_dbm(dev,</div><div class='add'>+					le16_to_cpu(payload-&gt;ack_rssi));</div><div class='ctx'> 			skb_pull(entry, sizeof(*hdr) + pad + sizeof(*entry_data));</div><div class='ctx'> 			ieee80211_tx_status_irqsafe(dev, entry);</div><div class='del'>-			break;</div><div class='add'>+			goto out;</div><div class='ctx'> 		} else</div><div class='ctx'> 			last_addr = range-&gt;end_addr;</div><div class='ctx'> 		entry = entry-&gt;next;</div><div class='ctx'> 	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;priv-&gt;tx_queue.lock, flags);</div><div class='ctx'> </div><div class='add'>+out:</div><div class='ctx'> 	if (freed &gt;= IEEE80211_MAX_RTS_THRESHOLD + 0x170 +</div><div class='ctx'> 	    sizeof(struct p54_control_hdr))</div><div class='ctx'> 		p54_wake_free_queues(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void p54_rx_control(struct ieee80211_hw *dev, struct sk_buff *skb)</div><div class='add'>+static void p54_rx_eeprom_readback(struct ieee80211_hw *dev,</div><div class='add'>+				   struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct p54_control_hdr *hdr = (struct p54_control_hdr *) skb-&gt;data;</div><div class='add'>+	struct p54_eeprom_lm86 *eeprom = (struct p54_eeprom_lm86 *) hdr-&gt;data;</div><div class='add'>+	struct p54_common *priv = dev-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (!priv-&gt;eeprom)</div><div class='add'>+		return ;</div><div class='add'>+</div><div class='add'>+	memcpy(priv-&gt;eeprom, eeprom-&gt;data, le16_to_cpu(eeprom-&gt;len));</div><div class='add'>+</div><div class='add'>+	complete(&amp;priv-&gt;eeprom_comp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void p54_rx_stats(struct ieee80211_hw *dev, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct p54_common *priv = dev-&gt;priv;</div><div class='add'>+	struct p54_control_hdr *hdr = (struct p54_control_hdr *) skb-&gt;data;</div><div class='add'>+	struct p54_statistics *stats = (struct p54_statistics *) hdr-&gt;data;</div><div class='add'>+	u32 tsf32 = le32_to_cpu(stats-&gt;tsf32);</div><div class='add'>+</div><div class='add'>+	if (tsf32 &lt; priv-&gt;tsf_low32)</div><div class='add'>+		priv-&gt;tsf_high32++;</div><div class='add'>+	priv-&gt;tsf_low32 = tsf32;</div><div class='add'>+</div><div class='add'>+	priv-&gt;stats.dot11RTSFailureCount = le32_to_cpu(stats-&gt;rts_fail);</div><div class='add'>+	priv-&gt;stats.dot11RTSSuccessCount = le32_to_cpu(stats-&gt;rts_success);</div><div class='add'>+	priv-&gt;stats.dot11FCSErrorCount = le32_to_cpu(stats-&gt;rx_bad_fcs);</div><div class='add'>+</div><div class='add'>+	priv-&gt;noise = p54_rssi_to_dbm(dev, le32_to_cpu(stats-&gt;noise));</div><div class='add'>+	complete(&amp;priv-&gt;stats_comp);</div><div class='add'>+</div><div class='add'>+	mod_timer(&amp;priv-&gt;stats_timer, jiffies + 5 * HZ);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int p54_rx_control(struct ieee80211_hw *dev, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct p54_control_hdr *hdr = (struct p54_control_hdr *) skb-&gt;data;</div><div class='ctx'> </div><div class='hunk'>@@ -450,36 +653,30 @@ static void p54_rx_control(struct ieee80211_hw *dev, struct sk_buff *skb)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case P54_CONTROL_TYPE_BBP:</div><div class='ctx'> 		break;</div><div class='add'>+	case P54_CONTROL_TYPE_STAT_READBACK:</div><div class='add'>+		p54_rx_stats(dev, skb);</div><div class='add'>+		break;</div><div class='add'>+	case P54_CONTROL_TYPE_EEPROM_READBACK:</div><div class='add'>+		p54_rx_eeprom_readback(dev, skb);</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		printk(KERN_DEBUG "%s: not handling 0x%02x type control frame\n",</div><div class='ctx'> 		       wiphy_name(dev-&gt;wiphy), le16_to_cpu(hdr-&gt;type));</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* returns zero if skb can be reused */</div><div class='ctx'> int p54_rx(struct ieee80211_hw *dev, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	u8 type = le16_to_cpu(*((__le16 *)skb-&gt;data)) &gt;&gt; 8;</div><div class='del'>-	switch (type) {</div><div class='del'>-	case 0x00:</div><div class='del'>-	case 0x01:</div><div class='del'>-		p54_rx_data(dev, skb);</div><div class='del'>-		return -1;</div><div class='del'>-	case 0x4d:</div><div class='del'>-		/* TODO: do something better... but then again, I've never seen this happen */</div><div class='del'>-		printk(KERN_ERR "%s: Received fault. Probably need to restart hardware now..\n",</div><div class='del'>-		       wiphy_name(dev-&gt;wiphy));</div><div class='del'>-		break;</div><div class='del'>-	case 0x80:</div><div class='del'>-		p54_rx_control(dev, skb);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		printk(KERN_ERR "%s: unknown frame RXed (0x%02x)\n",</div><div class='del'>-		       wiphy_name(dev-&gt;wiphy), type);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='add'>+</div><div class='add'>+	if (type == 0x80)</div><div class='add'>+		return p54_rx_control(dev, skb);</div><div class='add'>+	else</div><div class='add'>+		return p54_rx_data(dev, skb);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(p54_rx);</div><div class='ctx'> </div><div class='hunk'>@@ -503,7 +700,7 @@ static void p54_assign_address(struct ieee80211_hw *dev, struct sk_buff *skb,</div><div class='ctx'> 	u32 target_addr = priv-&gt;rx_start;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	unsigned int left;</div><div class='del'>-	len = (len + 0x170 + 3) &amp; ~0x3; /* 0x70 headroom, 0x100 tailroom */</div><div class='add'>+	len = (len + priv-&gt;headroom + priv-&gt;tailroom + 3) &amp; ~0x3;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;priv-&gt;tx_queue.lock, flags);</div><div class='ctx'> 	left = skb_queue_len(&amp;priv-&gt;tx_queue);</div><div class='hunk'>@@ -538,14 +735,74 @@ static void p54_assign_address(struct ieee80211_hw *dev, struct sk_buff *skb,</div><div class='ctx'> 		range-&gt;start_addr = target_addr;</div><div class='ctx'> 		range-&gt;end_addr = target_addr + len;</div><div class='ctx'> 		__skb_queue_after(&amp;priv-&gt;tx_queue, target_skb, skb);</div><div class='del'>-		if (largest_hole &lt; IEEE80211_MAX_RTS_THRESHOLD + 0x170 +</div><div class='add'>+		if (largest_hole &lt; priv-&gt;rx_mtu + priv-&gt;headroom +</div><div class='add'>+				   priv-&gt;tailroom +</div><div class='ctx'> 				   sizeof(struct p54_control_hdr))</div><div class='ctx'> 			ieee80211_stop_queues(dev);</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;priv-&gt;tx_queue.lock, flags);</div><div class='ctx'> </div><div class='del'>-	data-&gt;req_id = cpu_to_le32(target_addr + 0x70);</div><div class='add'>+	data-&gt;req_id = cpu_to_le32(target_addr + priv-&gt;headroom);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int p54_read_eeprom(struct ieee80211_hw *dev)</div><div class='add'>+{</div><div class='add'>+	struct p54_common *priv = dev-&gt;priv;</div><div class='add'>+	struct p54_control_hdr *hdr = NULL;</div><div class='add'>+	struct p54_eeprom_lm86 *eeprom_hdr;</div><div class='add'>+	size_t eeprom_size = 0x2020, offset = 0, blocksize;</div><div class='add'>+	int ret = -ENOMEM;</div><div class='add'>+	void *eeprom = NULL;</div><div class='add'>+</div><div class='add'>+	hdr = (struct p54_control_hdr *)kzalloc(sizeof(*hdr) +</div><div class='add'>+		sizeof(*eeprom_hdr) + EEPROM_READBACK_LEN, GFP_KERNEL);</div><div class='add'>+	if (!hdr)</div><div class='add'>+		goto free;</div><div class='add'>+</div><div class='add'>+	priv-&gt;eeprom = kzalloc(EEPROM_READBACK_LEN, GFP_KERNEL);</div><div class='add'>+	if (!priv-&gt;eeprom)</div><div class='add'>+		goto free;</div><div class='add'>+</div><div class='add'>+	eeprom = kzalloc(eeprom_size, GFP_KERNEL);</div><div class='add'>+	if (!eeprom)</div><div class='add'>+		goto free;</div><div class='add'>+</div><div class='add'>+	hdr-&gt;magic1 = cpu_to_le16(0x8000);</div><div class='add'>+	hdr-&gt;type = cpu_to_le16(P54_CONTROL_TYPE_EEPROM_READBACK);</div><div class='add'>+	hdr-&gt;retry1 = hdr-&gt;retry2 = 0;</div><div class='add'>+	eeprom_hdr = (struct p54_eeprom_lm86 *) hdr-&gt;data;</div><div class='add'>+</div><div class='add'>+	while (eeprom_size) {</div><div class='add'>+		blocksize = min(eeprom_size, (size_t)EEPROM_READBACK_LEN);</div><div class='add'>+		hdr-&gt;len = cpu_to_le16(blocksize + sizeof(*eeprom_hdr));</div><div class='add'>+		eeprom_hdr-&gt;offset = cpu_to_le16(offset);</div><div class='add'>+		eeprom_hdr-&gt;len = cpu_to_le16(blocksize);</div><div class='add'>+		p54_assign_address(dev, NULL, hdr, le16_to_cpu(hdr-&gt;len) +</div><div class='add'>+				   sizeof(*hdr));</div><div class='add'>+		priv-&gt;tx(dev, hdr, le16_to_cpu(hdr-&gt;len) + sizeof(*hdr), 0);</div><div class='add'>+</div><div class='add'>+		if (!wait_for_completion_interruptible_timeout(&amp;priv-&gt;eeprom_comp, HZ)) {</div><div class='add'>+			printk(KERN_ERR "%s: device does not respond!\n",</div><div class='add'>+				wiphy_name(dev-&gt;wiphy));</div><div class='add'>+			ret = -EBUSY;</div><div class='add'>+			goto free;</div><div class='add'>+	        }</div><div class='add'>+</div><div class='add'>+		memcpy(eeprom + offset, priv-&gt;eeprom, blocksize);</div><div class='add'>+		offset += blocksize;</div><div class='add'>+		eeprom_size -= blocksize;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = p54_parse_eeprom(dev, eeprom, offset);</div><div class='add'>+free:</div><div class='add'>+	kfree(priv-&gt;eeprom);</div><div class='add'>+	priv-&gt;eeprom = NULL;</div><div class='add'>+	kfree(hdr);</div><div class='add'>+	kfree(eeprom);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(p54_read_eeprom);</div><div class='ctx'> </div><div class='ctx'> static int p54_tx(struct ieee80211_hw *dev, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='hunk'>@@ -559,7 +816,7 @@ static int p54_tx(struct ieee80211_hw *dev, struct sk_buff *skb)</div><div class='ctx'> 	u8 rate;</div><div class='ctx'> 	u8 cts_rate = 0x20;</div><div class='ctx'> </div><div class='del'>-	current_queue = &amp;priv-&gt;tx_stats[skb_get_queue_mapping(skb)];</div><div class='add'>+	current_queue = &amp;priv-&gt;tx_stats[skb_get_queue_mapping(skb) + 4];</div><div class='ctx'> 	if (unlikely(current_queue-&gt;len &gt; current_queue-&gt;limit))</div><div class='ctx'> 		return NETDEV_TX_BUSY;</div><div class='ctx'> 	current_queue-&gt;len++;</div><div class='hunk'>@@ -601,7 +858,7 @@ static int p54_tx(struct ieee80211_hw *dev, struct sk_buff *skb)</div><div class='ctx'> 	txhdr-&gt;hw_queue = skb_get_queue_mapping(skb) + 4;</div><div class='ctx'> 	txhdr-&gt;tx_antenna = (info-&gt;antenna_sel_tx == 0) ?</div><div class='ctx'> 		2 : info-&gt;antenna_sel_tx - 1;</div><div class='del'>-	txhdr-&gt;output_power = 0x7f; // HW Maximum</div><div class='add'>+	txhdr-&gt;output_power = priv-&gt;output_power;</div><div class='ctx'> 	txhdr-&gt;cts_rate = (info-&gt;flags &amp; IEEE80211_TX_CTL_NO_ACK) ?</div><div class='ctx'> 			  0 : cts_rate;</div><div class='ctx'> 	if (padding)</div><div class='hunk'>@@ -628,12 +885,12 @@ static int p54_tx(struct ieee80211_hw *dev, struct sk_buff *skb)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int p54_set_filter(struct ieee80211_hw *dev, u16 filter_type,</div><div class='del'>-			  const u8 *dst, const u8 *src, u8 antenna,</div><div class='del'>-			  u32 magic3, u32 magic8, u32 magic9)</div><div class='add'>+			  const u8 *bssid)</div><div class='ctx'> {</div><div class='ctx'> 	struct p54_common *priv = dev-&gt;priv;</div><div class='ctx'> 	struct p54_control_hdr *hdr;</div><div class='ctx'> 	struct p54_tx_control_filter *filter;</div><div class='add'>+	size_t data_len;</div><div class='ctx'> </div><div class='ctx'> 	hdr = kzalloc(sizeof(*hdr) + sizeof(*filter) +</div><div class='ctx'> 		      priv-&gt;tx_hdr_len, GFP_ATOMIC);</div><div class='hunk'>@@ -644,25 +901,35 @@ static int p54_set_filter(struct ieee80211_hw *dev, u16 filter_type,</div><div class='ctx'> </div><div class='ctx'> 	filter = (struct p54_tx_control_filter *) hdr-&gt;data;</div><div class='ctx'> 	hdr-&gt;magic1 = cpu_to_le16(0x8001);</div><div class='del'>-	hdr-&gt;len = cpu_to_le16(sizeof(*filter));</div><div class='del'>-	p54_assign_address(dev, NULL, hdr, sizeof(*hdr) + sizeof(*filter));</div><div class='ctx'> 	hdr-&gt;type = cpu_to_le16(P54_CONTROL_TYPE_FILTER_SET);</div><div class='ctx'> </div><div class='del'>-	filter-&gt;filter_type = cpu_to_le16(filter_type);</div><div class='del'>-	memcpy(filter-&gt;dst, dst, ETH_ALEN);</div><div class='del'>-	if (!src)</div><div class='del'>-		memset(filter-&gt;src, ~0, ETH_ALEN);</div><div class='add'>+	priv-&gt;filter_type = filter-&gt;filter_type = cpu_to_le16(filter_type);</div><div class='add'>+	memcpy(filter-&gt;mac_addr, priv-&gt;mac_addr, ETH_ALEN);</div><div class='add'>+	if (!bssid)</div><div class='add'>+		memset(filter-&gt;bssid, ~0, ETH_ALEN);</div><div class='ctx'> 	else</div><div class='del'>-		memcpy(filter-&gt;src, src, ETH_ALEN);</div><div class='del'>-	filter-&gt;antenna = antenna;</div><div class='del'>-	filter-&gt;magic3 = cpu_to_le32(magic3);</div><div class='del'>-	filter-&gt;rx_addr = cpu_to_le32(priv-&gt;rx_end);</div><div class='del'>-	filter-&gt;max_rx = cpu_to_le16(0x0620);	/* FIXME: for usb ver 1.. maybe */</div><div class='del'>-	filter-&gt;rxhw = priv-&gt;rxhw;</div><div class='del'>-	filter-&gt;magic8 = cpu_to_le16(magic8);</div><div class='del'>-	filter-&gt;magic9 = cpu_to_le16(magic9);</div><div class='del'>-</div><div class='del'>-	priv-&gt;tx(dev, hdr, sizeof(*hdr) + sizeof(*filter), 1);</div><div class='add'>+		memcpy(filter-&gt;bssid, bssid, ETH_ALEN);</div><div class='add'>+</div><div class='add'>+	filter-&gt;rx_antenna = priv-&gt;rx_antenna;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;fw_var &lt; 0x500) {</div><div class='add'>+		data_len = P54_TX_CONTROL_FILTER_V1_LEN;</div><div class='add'>+		filter-&gt;v1.basic_rate_mask = cpu_to_le32(0x15F);</div><div class='add'>+		filter-&gt;v1.rx_addr = cpu_to_le32(priv-&gt;rx_end);</div><div class='add'>+		filter-&gt;v1.max_rx = cpu_to_le16(priv-&gt;rx_mtu);</div><div class='add'>+		filter-&gt;v1.rxhw = cpu_to_le16(priv-&gt;rxhw);</div><div class='add'>+		filter-&gt;v1.wakeup_timer = cpu_to_le16(500);</div><div class='add'>+	} else {</div><div class='add'>+		data_len = P54_TX_CONTROL_FILTER_V2_LEN;</div><div class='add'>+		filter-&gt;v2.rx_addr = cpu_to_le32(priv-&gt;rx_end);</div><div class='add'>+		filter-&gt;v2.max_rx = cpu_to_le16(priv-&gt;rx_mtu);</div><div class='add'>+		filter-&gt;v2.rxhw = cpu_to_le16(priv-&gt;rxhw);</div><div class='add'>+		filter-&gt;v2.timer = cpu_to_le16(1000);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hdr-&gt;len = cpu_to_le16(data_len);</div><div class='add'>+	p54_assign_address(dev, NULL, hdr, sizeof(*hdr) + data_len);</div><div class='add'>+	priv-&gt;tx(dev, hdr, sizeof(*hdr) + data_len, 1);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -672,12 +939,10 @@ static int p54_set_freq(struct ieee80211_hw *dev, __le16 freq)</div><div class='ctx'> 	struct p54_control_hdr *hdr;</div><div class='ctx'> 	struct p54_tx_control_channel *chan;</div><div class='ctx'> 	unsigned int i;</div><div class='del'>-	size_t payload_len = sizeof(*chan) + sizeof(u32)*2 +</div><div class='del'>-			     sizeof(*chan-&gt;curve_data) *</div><div class='del'>-			     priv-&gt;curve_data-&gt;points_per_channel;</div><div class='add'>+	size_t data_len;</div><div class='ctx'> 	void *entry;</div><div class='ctx'> </div><div class='del'>-	hdr = kzalloc(sizeof(*hdr) + payload_len +</div><div class='add'>+	hdr = kzalloc(sizeof(*hdr) + sizeof(*chan) +</div><div class='ctx'> 		      priv-&gt;tx_hdr_len, GFP_KERNEL);</div><div class='ctx'> 	if (!hdr)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -687,12 +952,11 @@ static int p54_set_freq(struct ieee80211_hw *dev, __le16 freq)</div><div class='ctx'> 	chan = (struct p54_tx_control_channel *) hdr-&gt;data;</div><div class='ctx'> </div><div class='ctx'> 	hdr-&gt;magic1 = cpu_to_le16(0x8001);</div><div class='del'>-	hdr-&gt;len = cpu_to_le16(sizeof(*chan));</div><div class='add'>+</div><div class='ctx'> 	hdr-&gt;type = cpu_to_le16(P54_CONTROL_TYPE_CHANNEL_CHANGE);</div><div class='del'>-	p54_assign_address(dev, NULL, hdr, sizeof(*hdr) + payload_len);</div><div class='ctx'> </div><div class='del'>-	chan-&gt;magic1 = cpu_to_le16(0x1);</div><div class='del'>-	chan-&gt;magic2 = cpu_to_le16(0x0);</div><div class='add'>+	chan-&gt;flags = cpu_to_le16(0x1);</div><div class='add'>+	chan-&gt;dwell = cpu_to_le16(0x0);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; priv-&gt;iq_autocal_len; i++) {</div><div class='ctx'> 		if (priv-&gt;iq_autocal[i].freq != freq)</div><div class='hunk'>@@ -710,35 +974,51 @@ static int p54_set_freq(struct ieee80211_hw *dev, __le16 freq)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		chan-&gt;val_barker = 0x38;</div><div class='del'>-		chan-&gt;val_bpsk = priv-&gt;output_limit[i].val_bpsk;</div><div class='del'>-		chan-&gt;val_qpsk = priv-&gt;output_limit[i].val_qpsk;</div><div class='del'>-		chan-&gt;val_16qam = priv-&gt;output_limit[i].val_16qam;</div><div class='del'>-		chan-&gt;val_64qam = priv-&gt;output_limit[i].val_64qam;</div><div class='add'>+		chan-&gt;val_bpsk = chan-&gt;dup_bpsk =</div><div class='add'>+			priv-&gt;output_limit[i].val_bpsk;</div><div class='add'>+		chan-&gt;val_qpsk = chan-&gt;dup_qpsk =</div><div class='add'>+			priv-&gt;output_limit[i].val_qpsk;</div><div class='add'>+		chan-&gt;val_16qam = chan-&gt;dup_16qam =</div><div class='add'>+			priv-&gt;output_limit[i].val_16qam;</div><div class='add'>+		chan-&gt;val_64qam = chan-&gt;dup_64qam =</div><div class='add'>+			priv-&gt;output_limit[i].val_64qam;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (i == priv-&gt;output_limit_len)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='del'>-	chan-&gt;pa_points_per_curve = priv-&gt;curve_data-&gt;points_per_channel;</div><div class='del'>-</div><div class='ctx'> 	entry = priv-&gt;curve_data-&gt;data;</div><div class='ctx'> 	for (i = 0; i &lt; priv-&gt;curve_data-&gt;channels; i++) {</div><div class='ctx'> 		if (*((__le16 *)entry) != freq) {</div><div class='ctx'> 			entry += sizeof(__le16);</div><div class='del'>-			entry += sizeof(struct pda_pa_curve_data_sample_rev1) *</div><div class='del'>-				 chan-&gt;pa_points_per_curve;</div><div class='add'>+			entry += sizeof(struct p54_pa_curve_data_sample) *</div><div class='add'>+				 priv-&gt;curve_data-&gt;points_per_channel;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		entry += sizeof(__le16);</div><div class='add'>+		chan-&gt;pa_points_per_curve =</div><div class='add'>+			min(priv-&gt;curve_data-&gt;points_per_channel, (u8) 8);</div><div class='add'>+</div><div class='ctx'> 		memcpy(chan-&gt;curve_data, entry, sizeof(*chan-&gt;curve_data) *</div><div class='ctx'> 		       chan-&gt;pa_points_per_curve);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	memcpy(hdr-&gt;data + payload_len - 4, &amp;chan-&gt;val_bpsk, 4);</div><div class='add'>+	if (priv-&gt;fw_var &lt; 0x500) {</div><div class='add'>+		data_len = P54_TX_CONTROL_CHANNEL_V1_LEN;</div><div class='add'>+		chan-&gt;v1.rssical_mul = cpu_to_le16(130);</div><div class='add'>+		chan-&gt;v1.rssical_add = cpu_to_le16(0xfe70);</div><div class='add'>+	} else {</div><div class='add'>+		data_len = P54_TX_CONTROL_CHANNEL_V2_LEN;</div><div class='add'>+		chan-&gt;v2.rssical_mul = cpu_to_le16(130);</div><div class='add'>+		chan-&gt;v2.rssical_add = cpu_to_le16(0xfe70);</div><div class='add'>+		chan-&gt;v2.basic_rate_mask = cpu_to_le32(0x15f);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	priv-&gt;tx(dev, hdr, sizeof(*hdr) + payload_len, 1);</div><div class='add'>+	hdr-&gt;len = cpu_to_le16(data_len);</div><div class='add'>+	p54_assign_address(dev, NULL, hdr, sizeof(*hdr) + data_len);</div><div class='add'>+	priv-&gt;tx(dev, hdr, sizeof(*hdr) + data_len, 1);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'>  err:</div><div class='hunk'>@@ -846,12 +1126,25 @@ static int p54_start(struct ieee80211_hw *dev)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (!priv-&gt;cached_stats) {</div><div class='add'>+		priv-&gt;cached_stats = kzalloc(sizeof(struct p54_statistics) +</div><div class='add'>+			priv-&gt;tx_hdr_len + sizeof(struct p54_control_hdr),</div><div class='add'>+			GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+		if (!priv-&gt;cached_stats) {</div><div class='add'>+			kfree(priv-&gt;cached_vdcf);</div><div class='add'>+			priv-&gt;cached_vdcf = NULL;</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	err = priv-&gt;open(dev);</div><div class='ctx'> 	if (!err)</div><div class='del'>-		priv-&gt;mode = IEEE80211_IF_TYPE_MNTR;</div><div class='add'>+		priv-&gt;mode = NL80211_IFTYPE_MONITOR;</div><div class='ctx'> </div><div class='ctx'> 	p54_init_vdcf(dev);</div><div class='ctx'> </div><div class='add'>+	mod_timer(&amp;priv-&gt;stats_timer, jiffies + HZ);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -859,10 +1152,13 @@ static void p54_stop(struct ieee80211_hw *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct p54_common *priv = dev-&gt;priv;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	del_timer(&amp;priv-&gt;stats_timer);</div><div class='ctx'> 	while ((skb = skb_dequeue(&amp;priv-&gt;tx_queue)))</div><div class='ctx'> 		kfree_skb(skb);</div><div class='ctx'> 	priv-&gt;stop(dev);</div><div class='del'>-	priv-&gt;mode = IEEE80211_IF_TYPE_INVALID;</div><div class='add'>+	priv-&gt;tsf_high32 = priv-&gt;tsf_low32 = 0;</div><div class='add'>+	priv-&gt;mode = NL80211_IFTYPE_UNSPECIFIED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int p54_add_interface(struct ieee80211_hw *dev,</div><div class='hunk'>@@ -870,11 +1166,11 @@ static int p54_add_interface(struct ieee80211_hw *dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct p54_common *priv = dev-&gt;priv;</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;mode != IEEE80211_IF_TYPE_MNTR)</div><div class='add'>+	if (priv-&gt;mode != NL80211_IFTYPE_MONITOR)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 	switch (conf-&gt;type) {</div><div class='del'>-	case IEEE80211_IF_TYPE_STA:</div><div class='add'>+	case NL80211_IFTYPE_STATION:</div><div class='ctx'> 		priv-&gt;mode = conf-&gt;type;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -883,12 +1179,11 @@ static int p54_add_interface(struct ieee80211_hw *dev,</div><div class='ctx'> </div><div class='ctx'> 	memcpy(priv-&gt;mac_addr, conf-&gt;mac_addr, ETH_ALEN);</div><div class='ctx'> </div><div class='del'>-	p54_set_filter(dev, 0, priv-&gt;mac_addr, NULL, 0, 1, 0, 0xF642);</div><div class='del'>-	p54_set_filter(dev, 0, priv-&gt;mac_addr, NULL, 1, 0, 0, 0xF642);</div><div class='add'>+	p54_set_filter(dev, 0, NULL);</div><div class='ctx'> </div><div class='ctx'> 	switch (conf-&gt;type) {</div><div class='del'>-	case IEEE80211_IF_TYPE_STA:</div><div class='del'>-		p54_set_filter(dev, 1, priv-&gt;mac_addr, NULL, 0, 0x15F, 0x1F4, 0);</div><div class='add'>+	case NL80211_IFTYPE_STATION:</div><div class='add'>+		p54_set_filter(dev, 1, NULL);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		BUG();	/* impossible */</div><div class='hunk'>@@ -904,9 +1199,9 @@ static void p54_remove_interface(struct ieee80211_hw *dev,</div><div class='ctx'> 				 struct ieee80211_if_init_conf *conf)</div><div class='ctx'> {</div><div class='ctx'> 	struct p54_common *priv = dev-&gt;priv;</div><div class='del'>-	priv-&gt;mode = IEEE80211_IF_TYPE_MNTR;</div><div class='add'>+	priv-&gt;mode = NL80211_IFTYPE_MONITOR;</div><div class='ctx'> 	memset(priv-&gt;mac_addr, 0, ETH_ALEN);</div><div class='del'>-	p54_set_filter(dev, 0, priv-&gt;mac_addr, NULL, 2, 0, 0, 0);</div><div class='add'>+	p54_set_filter(dev, 0, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int p54_config(struct ieee80211_hw *dev, struct ieee80211_conf *conf)</div><div class='hunk'>@@ -915,6 +1210,9 @@ static int p54_config(struct ieee80211_hw *dev, struct ieee80211_conf *conf)</div><div class='ctx'> 	struct p54_common *priv = dev-&gt;priv;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;priv-&gt;conf_mutex);</div><div class='add'>+	priv-&gt;rx_antenna = (conf-&gt;antenna_sel_rx == 0) ?</div><div class='add'>+		2 : conf-&gt;antenna_sel_tx - 1;</div><div class='add'>+	priv-&gt;output_power = conf-&gt;power_level &lt;&lt; 2;</div><div class='ctx'> 	ret = p54_set_freq(dev, cpu_to_le16(conf-&gt;channel-&gt;center_freq));</div><div class='ctx'> 	p54_set_vdcf(dev);</div><div class='ctx'> 	mutex_unlock(&amp;priv-&gt;conf_mutex);</div><div class='hunk'>@@ -928,8 +1226,7 @@ static int p54_config_interface(struct ieee80211_hw *dev,</div><div class='ctx'> 	struct p54_common *priv = dev-&gt;priv;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;priv-&gt;conf_mutex);</div><div class='del'>-	p54_set_filter(dev, 0, priv-&gt;mac_addr, conf-&gt;bssid, 0, 1, 0, 0xF642);</div><div class='del'>-	p54_set_filter(dev, 0, priv-&gt;mac_addr, conf-&gt;bssid, 2, 0, 0, 0);</div><div class='add'>+	p54_set_filter(dev, 0, conf-&gt;bssid);</div><div class='ctx'> 	p54_set_leds(dev, 1, !is_multicast_ether_addr(conf-&gt;bssid), 0);</div><div class='ctx'> 	memcpy(priv-&gt;bssid, conf-&gt;bssid, ETH_ALEN);</div><div class='ctx'> 	mutex_unlock(&amp;priv-&gt;conf_mutex);</div><div class='hunk'>@@ -943,15 +1240,28 @@ static void p54_configure_filter(struct ieee80211_hw *dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct p54_common *priv = dev-&gt;priv;</div><div class='ctx'> </div><div class='del'>-	*total_flags &amp;= FIF_BCN_PRBRESP_PROMISC;</div><div class='add'>+	*total_flags &amp;= FIF_BCN_PRBRESP_PROMISC |</div><div class='add'>+			FIF_PROMISC_IN_BSS |</div><div class='add'>+			FIF_FCSFAIL;</div><div class='add'>+</div><div class='add'>+	priv-&gt;filter_flags = *total_flags;</div><div class='ctx'> </div><div class='ctx'> 	if (changed_flags &amp; FIF_BCN_PRBRESP_PROMISC) {</div><div class='ctx'> 		if (*total_flags &amp; FIF_BCN_PRBRESP_PROMISC)</div><div class='del'>-			p54_set_filter(dev, 0, priv-&gt;mac_addr,</div><div class='del'>-				       NULL, 2, 0, 0, 0);</div><div class='add'>+			p54_set_filter(dev, le16_to_cpu(priv-&gt;filter_type),</div><div class='add'>+				 NULL);</div><div class='add'>+		else</div><div class='add'>+			p54_set_filter(dev, le16_to_cpu(priv-&gt;filter_type),</div><div class='add'>+				 priv-&gt;bssid);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (changed_flags &amp; FIF_PROMISC_IN_BSS) {</div><div class='add'>+		if (*total_flags &amp; FIF_PROMISC_IN_BSS)</div><div class='add'>+			p54_set_filter(dev, le16_to_cpu(priv-&gt;filter_type) |</div><div class='add'>+				0x8, NULL);</div><div class='ctx'> 		else</div><div class='del'>-			p54_set_filter(dev, 0, priv-&gt;mac_addr,</div><div class='del'>-				       priv-&gt;bssid, 2, 0, 0, 0);</div><div class='add'>+			p54_set_filter(dev, le16_to_cpu(priv-&gt;filter_type) &amp;</div><div class='add'>+				~0x8, priv-&gt;bssid);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -975,10 +1285,67 @@ static int p54_conf_tx(struct ieee80211_hw *dev, u16 queue,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int p54_init_xbow_synth(struct ieee80211_hw *dev)</div><div class='add'>+{</div><div class='add'>+	struct p54_common *priv = dev-&gt;priv;</div><div class='add'>+	struct p54_control_hdr *hdr;</div><div class='add'>+	struct p54_tx_control_xbow_synth *xbow;</div><div class='add'>+</div><div class='add'>+	hdr = kzalloc(sizeof(*hdr) + sizeof(*xbow) +</div><div class='add'>+		      priv-&gt;tx_hdr_len, GFP_KERNEL);</div><div class='add'>+	if (!hdr)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	hdr = (void *)hdr + priv-&gt;tx_hdr_len;</div><div class='add'>+	hdr-&gt;magic1 = cpu_to_le16(0x8001);</div><div class='add'>+	hdr-&gt;len = cpu_to_le16(sizeof(*xbow));</div><div class='add'>+	hdr-&gt;type = cpu_to_le16(P54_CONTROL_TYPE_XBOW_SYNTH_CFG);</div><div class='add'>+	p54_assign_address(dev, NULL, hdr, sizeof(*hdr) + sizeof(*xbow));</div><div class='add'>+</div><div class='add'>+	xbow = (struct p54_tx_control_xbow_synth *) hdr-&gt;data;</div><div class='add'>+	xbow-&gt;magic1 = cpu_to_le16(0x1);</div><div class='add'>+	xbow-&gt;magic2 = cpu_to_le16(0x2);</div><div class='add'>+	xbow-&gt;freq = cpu_to_le16(5390);</div><div class='add'>+</div><div class='add'>+	priv-&gt;tx(dev, hdr, sizeof(*hdr) + sizeof(*xbow), 1);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void p54_statistics_timer(unsigned long data)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hw *dev = (struct ieee80211_hw *) data;</div><div class='add'>+	struct p54_common *priv = dev-&gt;priv;</div><div class='add'>+	struct p54_control_hdr *hdr;</div><div class='add'>+	struct p54_statistics *stats;</div><div class='add'>+</div><div class='add'>+	BUG_ON(!priv-&gt;cached_stats);</div><div class='add'>+</div><div class='add'>+	hdr = (void *)priv-&gt;cached_stats + priv-&gt;tx_hdr_len;</div><div class='add'>+	hdr-&gt;magic1 = cpu_to_le16(0x8000);</div><div class='add'>+	hdr-&gt;len = cpu_to_le16(sizeof(*stats));</div><div class='add'>+	hdr-&gt;type = cpu_to_le16(P54_CONTROL_TYPE_STAT_READBACK);</div><div class='add'>+	p54_assign_address(dev, NULL, hdr, sizeof(*hdr) + sizeof(*stats));</div><div class='add'>+</div><div class='add'>+	priv-&gt;tx(dev, hdr, sizeof(*hdr) + sizeof(*stats), 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int p54_get_stats(struct ieee80211_hw *dev,</div><div class='ctx'> 			 struct ieee80211_low_level_stats *stats)</div><div class='ctx'> {</div><div class='del'>-	/* TODO */</div><div class='add'>+	struct p54_common *priv = dev-&gt;priv;</div><div class='add'>+</div><div class='add'>+	del_timer(&amp;priv-&gt;stats_timer);</div><div class='add'>+	p54_statistics_timer((unsigned long)dev);</div><div class='add'>+</div><div class='add'>+	if (!wait_for_completion_interruptible_timeout(&amp;priv-&gt;stats_comp, HZ)) {</div><div class='add'>+		printk(KERN_ERR "%s: device does not respond!\n",</div><div class='add'>+			wiphy_name(dev-&gt;wiphy));</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(stats, &amp;priv-&gt;stats, sizeof(*stats));</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -987,7 +1354,7 @@ static int p54_get_tx_stats(struct ieee80211_hw *dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct p54_common *priv = dev-&gt;priv;</div><div class='ctx'> </div><div class='del'>-	memcpy(stats, &amp;priv-&gt;tx_stats, sizeof(stats[0]) * dev-&gt;queues);</div><div class='add'>+	memcpy(stats, &amp;priv-&gt;tx_stats[4], sizeof(stats[0]) * dev-&gt;queues);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1016,22 +1383,32 @@ struct ieee80211_hw *p54_init_common(size_t priv_data_len)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	priv = dev-&gt;priv;</div><div class='del'>-	priv-&gt;mode = IEEE80211_IF_TYPE_INVALID;</div><div class='add'>+	priv-&gt;mode = NL80211_IFTYPE_UNSPECIFIED;</div><div class='ctx'> 	skb_queue_head_init(&amp;priv-&gt;tx_queue);</div><div class='del'>-	dev-&gt;wiphy-&gt;bands[IEEE80211_BAND_2GHZ] = &amp;band_2GHz;</div><div class='ctx'> 	dev-&gt;flags = IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING | /* not sure */</div><div class='ctx'> 		     IEEE80211_HW_RX_INCLUDES_FCS |</div><div class='del'>-		     IEEE80211_HW_SIGNAL_UNSPEC;</div><div class='add'>+		     IEEE80211_HW_SIGNAL_DBM |</div><div class='add'>+		     IEEE80211_HW_NOISE_DBM;</div><div class='add'>+</div><div class='add'>+	dev-&gt;wiphy-&gt;interface_modes = BIT(NL80211_IFTYPE_STATION);</div><div class='add'>+</div><div class='ctx'> 	dev-&gt;channel_change_time = 1000;	/* TODO: find actual value */</div><div class='del'>-	dev-&gt;max_signal = 127;</div><div class='ctx'> </div><div class='del'>-	priv-&gt;tx_stats[0].limit = 5;</div><div class='add'>+	priv-&gt;tx_stats[0].limit = 1;</div><div class='add'>+	priv-&gt;tx_stats[1].limit = 1;</div><div class='add'>+	priv-&gt;tx_stats[2].limit = 1;</div><div class='add'>+	priv-&gt;tx_stats[3].limit = 1;</div><div class='add'>+	priv-&gt;tx_stats[4].limit = 5;</div><div class='ctx'> 	dev-&gt;queues = 1;</div><div class='del'>-</div><div class='add'>+	priv-&gt;noise = -94;</div><div class='ctx'> 	dev-&gt;extra_tx_headroom = sizeof(struct p54_control_hdr) + 4 +</div><div class='ctx'> 				 sizeof(struct p54_tx_control_allocdata);</div><div class='ctx'> </div><div class='ctx'> 	mutex_init(&amp;priv-&gt;conf_mutex);</div><div class='add'>+	init_completion(&amp;priv-&gt;eeprom_comp);</div><div class='add'>+	init_completion(&amp;priv-&gt;stats_comp);</div><div class='add'>+	setup_timer(&amp;priv-&gt;stats_timer, p54_statistics_timer,</div><div class='add'>+		(unsigned long)dev);</div><div class='ctx'> </div><div class='ctx'> 	return dev;</div><div class='ctx'> }</div><div class='hunk'>@@ -1040,6 +1417,7 @@ EXPORT_SYMBOL_GPL(p54_init_common);</div><div class='ctx'> void p54_free_common(struct ieee80211_hw *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct p54_common *priv = dev-&gt;priv;</div><div class='add'>+	kfree(priv-&gt;cached_stats);</div><div class='ctx'> 	kfree(priv-&gt;iq_autocal);</div><div class='ctx'> 	kfree(priv-&gt;output_limit);</div><div class='ctx'> 	kfree(priv-&gt;curve_data);</div><div class='head'>diff --git a/drivers/net/wireless/p54/p54common.h b/drivers/net/wireless/p54/p54common.h<br/>index 8db6c0e8e540..2fa994cfcfed 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/p54/p54common.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/p54/p54common.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/p54/p54common.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/p54/p54common.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='del'>-#ifndef PRISM54COMMON_H</div><div class='del'>-#define PRISM54COMMON_H</div><div class='add'>+#ifndef P54COMMON_H</div><div class='add'>+#define P54COMMON_H</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Common code specific definitions for mac80211 Prism54 drivers</div><div class='hunk'>@@ -18,7 +18,8 @@</div><div class='ctx'> struct bootrec {</div><div class='ctx'> 	__le32 code;</div><div class='ctx'> 	__le32 len;</div><div class='del'>-	u32 data[0];</div><div class='add'>+	u32 data[10];</div><div class='add'>+	__le16 rx_mtu;</div><div class='ctx'> } __attribute__((packed));</div><div class='ctx'> </div><div class='ctx'> struct bootrec_exp_if {</div><div class='hunk'>@@ -29,6 +30,17 @@ struct bootrec_exp_if {</div><div class='ctx'> 	__le16 top_compat;</div><div class='ctx'> } __attribute__((packed));</div><div class='ctx'> </div><div class='add'>+struct bootrec_desc {</div><div class='add'>+	__le16 modes;</div><div class='add'>+	__le16 flags;</div><div class='add'>+	__le32 rx_start;</div><div class='add'>+	__le32 rx_end;</div><div class='add'>+	u8 headroom;</div><div class='add'>+	u8 tailroom;</div><div class='add'>+	u8 unimportant[6];</div><div class='add'>+	u8 rates[16];</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='ctx'> #define BR_CODE_MIN			0x80000000</div><div class='ctx'> #define BR_CODE_COMPONENT_ID		0x80000001</div><div class='ctx'> #define BR_CODE_COMPONENT_VERSION	0x80000002</div><div class='hunk'>@@ -39,11 +51,6 @@ struct bootrec_exp_if {</div><div class='ctx'> #define BR_CODE_END_OF_BRA		0xFF0000FF</div><div class='ctx'> #define LEGACY_BR_CODE_END_OF_BRA	0xFFFFFFFF</div><div class='ctx'> </div><div class='del'>-#define FW_FMAC 0x464d4143</div><div class='del'>-#define FW_LM86 0x4c4d3836</div><div class='del'>-#define FW_LM87 0x4c4d3837</div><div class='del'>-#define FW_LM20 0x4c4d3230</div><div class='del'>-</div><div class='ctx'> /* PDA defines are Copyright (C) 2005 Nokia Corporation (taken from islsm_pda.h) */</div><div class='ctx'> </div><div class='ctx'> struct pda_entry {</div><div class='hunk'>@@ -89,6 +96,16 @@ struct pda_pa_curve_data_sample_rev1 {</div><div class='ctx'> 	u8 data_qpsk;</div><div class='ctx'> 	u8 data_16qam;</div><div class='ctx'> 	u8 data_64qam;</div><div class='add'>+} __attribute__ ((packed));</div><div class='add'>+</div><div class='add'>+struct p54_pa_curve_data_sample {</div><div class='add'>+	u8 rf_power;</div><div class='add'>+	u8 pa_detector;</div><div class='add'>+	u8 data_barker;</div><div class='add'>+	u8 data_bpsk;</div><div class='add'>+	u8 data_qpsk;</div><div class='add'>+	u8 data_16qam;</div><div class='add'>+	u8 data_64qam;</div><div class='ctx'> 	u8 padding;</div><div class='ctx'> } __attribute__ ((packed));</div><div class='ctx'> </div><div class='hunk'>@@ -169,8 +186,9 @@ struct p54_rx_hdr {</div><div class='ctx'> 	u8 rssi;</div><div class='ctx'> 	u8 quality;</div><div class='ctx'> 	u16 unknown2;</div><div class='del'>-	__le64 timestamp;</div><div class='del'>-	u8 data[0];</div><div class='add'>+	__le32 tsf32;</div><div class='add'>+	__le32 unalloc0;</div><div class='add'>+	u8 align[0];</div><div class='ctx'> } __attribute__ ((packed));</div><div class='ctx'> </div><div class='ctx'> struct p54_frame_sent_hdr {</div><div class='hunk'>@@ -198,22 +216,37 @@ struct p54_tx_control_allocdata {</div><div class='ctx'> </div><div class='ctx'> struct p54_tx_control_filter {</div><div class='ctx'> 	__le16 filter_type;</div><div class='del'>-	u8 dst[ETH_ALEN];</div><div class='del'>-	u8 src[ETH_ALEN];</div><div class='del'>-	u8 antenna;</div><div class='del'>-	u8 debug;</div><div class='del'>-	__le32 magic3;</div><div class='del'>-	u8 rates[8];	// FIXME: what's this for?</div><div class='del'>-	__le32 rx_addr;</div><div class='del'>-	__le16 max_rx;</div><div class='del'>-	__le16 rxhw;</div><div class='del'>-	__le16 magic8;</div><div class='del'>-	__le16 magic9;</div><div class='add'>+	u8 mac_addr[ETH_ALEN];</div><div class='add'>+	u8 bssid[ETH_ALEN];</div><div class='add'>+	u8 rx_antenna;</div><div class='add'>+	u8 rx_align;</div><div class='add'>+	union {</div><div class='add'>+		struct {</div><div class='add'>+			__le32 basic_rate_mask;</div><div class='add'>+			u8 rts_rates[8];</div><div class='add'>+			__le32 rx_addr;</div><div class='add'>+			__le16 max_rx;</div><div class='add'>+			__le16 rxhw;</div><div class='add'>+			__le16 wakeup_timer;</div><div class='add'>+			__le16 unalloc0;</div><div class='add'>+		} v1 __attribute__ ((packed));</div><div class='add'>+		struct {</div><div class='add'>+			__le32 rx_addr;</div><div class='add'>+			__le16 max_rx;</div><div class='add'>+			__le16 rxhw;</div><div class='add'>+			__le16 timer;</div><div class='add'>+			__le16 unalloc0;</div><div class='add'>+			__le32 unalloc1;</div><div class='add'>+		} v2 __attribute__ ((packed));</div><div class='add'>+	} __attribute__ ((packed));</div><div class='ctx'> } __attribute__ ((packed));</div><div class='ctx'> </div><div class='add'>+#define P54_TX_CONTROL_FILTER_V1_LEN (sizeof(struct p54_tx_control_filter))</div><div class='add'>+#define P54_TX_CONTROL_FILTER_V2_LEN (sizeof(struct p54_tx_control_filter)-8)</div><div class='add'>+</div><div class='ctx'> struct p54_tx_control_channel {</div><div class='del'>-	__le16 magic1;</div><div class='del'>-	__le16 magic2;</div><div class='add'>+	__le16 flags;</div><div class='add'>+	__le16 dwell;</div><div class='ctx'> 	u8 padding1[20];</div><div class='ctx'> 	struct pda_iq_autocal_entry iq_autocal;</div><div class='ctx'> 	u8 pa_points_per_curve;</div><div class='hunk'>@@ -222,10 +255,29 @@ struct p54_tx_control_channel {</div><div class='ctx'> 	u8 val_qpsk;</div><div class='ctx'> 	u8 val_16qam;</div><div class='ctx'> 	u8 val_64qam;</div><div class='del'>-	struct pda_pa_curve_data_sample_rev1 curve_data[0];</div><div class='del'>-	/* additional padding/data after curve_data */</div><div class='add'>+	struct p54_pa_curve_data_sample curve_data[8];</div><div class='add'>+	u8 dup_bpsk;</div><div class='add'>+	u8 dup_qpsk;</div><div class='add'>+	u8 dup_16qam;</div><div class='add'>+	u8 dup_64qam;</div><div class='add'>+	union {</div><div class='add'>+		struct {</div><div class='add'>+			__le16 rssical_mul;</div><div class='add'>+			__le16 rssical_add;</div><div class='add'>+		} v1 __attribute__ ((packed));</div><div class='add'>+</div><div class='add'>+		struct {</div><div class='add'>+			__le32 basic_rate_mask;</div><div class='add'>+			 u8 rts_rates[8];</div><div class='add'>+			__le16 rssical_mul;</div><div class='add'>+			__le16 rssical_add;</div><div class='add'>+		} v2 __attribute__ ((packed));</div><div class='add'>+	} __attribute__ ((packed));</div><div class='ctx'> } __attribute__ ((packed));</div><div class='ctx'> </div><div class='add'>+#define P54_TX_CONTROL_CHANNEL_V1_LEN (sizeof(struct p54_tx_control_channel)-12)</div><div class='add'>+#define P54_TX_CONTROL_CHANNEL_V2_LEN (sizeof(struct p54_tx_control_channel))</div><div class='add'>+</div><div class='ctx'> struct p54_tx_control_led {</div><div class='ctx'> 	__le16 mode;</div><div class='ctx'> 	__le16 led_temporary;</div><div class='hunk'>@@ -250,4 +302,24 @@ struct p54_tx_control_vdcf {</div><div class='ctx'> 	__le16 frameburst;</div><div class='ctx'> } __attribute__ ((packed));</div><div class='ctx'> </div><div class='del'>-#endif /* PRISM54COMMON_H */</div><div class='add'>+struct p54_statistics {</div><div class='add'>+	__le32 rx_success;</div><div class='add'>+	__le32 rx_bad_fcs;</div><div class='add'>+	__le32 rx_abort;</div><div class='add'>+	__le32 rx_abort_phy;</div><div class='add'>+	__le32 rts_success;</div><div class='add'>+	__le32 rts_fail;</div><div class='add'>+	__le32 tsf32;</div><div class='add'>+	__le32 airtime;</div><div class='add'>+	__le32 noise;</div><div class='add'>+	__le32 unkn[10]; /* CCE / CCA / RADAR */</div><div class='add'>+} __attribute__ ((packed));</div><div class='add'>+</div><div class='add'>+struct p54_tx_control_xbow_synth {</div><div class='add'>+	__le16 magic1;</div><div class='add'>+	__le16 magic2;</div><div class='add'>+	__le16 freq;</div><div class='add'>+	u32 padding[5];</div><div class='add'>+} __attribute__ ((packed));</div><div class='add'>+</div><div class='add'>+#endif /* P54COMMON_H */</div><div class='head'>diff --git a/drivers/net/wireless/p54/p54pci.c b/drivers/net/wireless/p54/p54pci.c<br/>index 7dd4add4bf4e..1c2a02a741af 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/p54/p54pci.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/p54/p54pci.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/p54/p54pci.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/p54/p54pci.c</a></div><div class='hunk'>@@ -3,6 +3,7 @@</div><div class='ctx'>  * Linux device driver for PCI based Prism54</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2006, Michael Wu &lt;flamingice@sourmilk.net&gt;</div><div class='add'>+ * Copyright (c) 2008, Christian Lamparter &lt;chunkeey@web.de&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * Based on the islsm (softmac prism54) driver, which is:</div><div class='ctx'>  * Copyright 2004-2006 Jean-Baptiste Note &lt;jean-baptiste.note@m4x.org&gt;, et al.</div><div class='hunk'>@@ -71,16 +72,18 @@ static int p54p_upload_firmware(struct ieee80211_hw *dev)</div><div class='ctx'> 	P54P_WRITE(ctrl_stat, reg);</div><div class='ctx'> 	wmb();</div><div class='ctx'> </div><div class='del'>-	mdelay(50);</div><div class='del'>-</div><div class='ctx'> 	err = request_firmware(&amp;fw_entry, "isl3886", &amp;priv-&gt;pdev-&gt;dev);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		printk(KERN_ERR "%s (prism54pci): cannot find firmware "</div><div class='add'>+		printk(KERN_ERR "%s (p54pci): cannot find firmware "</div><div class='ctx'> 		       "(isl3886)\n", pci_name(priv-&gt;pdev));</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	p54_parse_firmware(dev, fw_entry);</div><div class='add'>+	err = p54_parse_firmware(dev, fw_entry);</div><div class='add'>+	if (err) {</div><div class='add'>+		release_firmware(fw_entry);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	data = (__le32 *) fw_entry-&gt;data;</div><div class='ctx'> 	remains = fw_entry-&gt;size;</div><div class='hunk'>@@ -121,162 +124,147 @@ static int p54p_upload_firmware(struct ieee80211_hw *dev)</div><div class='ctx'> 	wmb();</div><div class='ctx'> 	udelay(10);</div><div class='ctx'> </div><div class='add'>+	/* wait for the firmware to boot properly */</div><div class='add'>+	mdelay(100);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static irqreturn_t p54p_simple_interrupt(int irq, void *dev_id)</div><div class='add'>+static void p54p_refill_rx_ring(struct ieee80211_hw *dev,</div><div class='add'>+	int ring_index, struct p54p_desc *ring, u32 ring_limit,</div><div class='add'>+	struct sk_buff **rx_buf)</div><div class='ctx'> {</div><div class='del'>-	struct p54p_priv *priv = (struct p54p_priv *) dev_id;</div><div class='del'>-	__le32 reg;</div><div class='del'>-</div><div class='del'>-	reg = P54P_READ(int_ident);</div><div class='del'>-	P54P_WRITE(int_ack, reg);</div><div class='add'>+	struct p54p_priv *priv = dev-&gt;priv;</div><div class='add'>+	struct p54p_ring_control *ring_control = priv-&gt;ring_control;</div><div class='add'>+	u32 limit, idx, i;</div><div class='ctx'> </div><div class='del'>-	if (reg &amp; P54P_READ(int_enable))</div><div class='del'>-		complete(&amp;priv-&gt;boot_comp);</div><div class='add'>+	idx = le32_to_cpu(ring_control-&gt;host_idx[ring_index]);</div><div class='add'>+	limit = idx;</div><div class='add'>+	limit -= le32_to_cpu(ring_control-&gt;device_idx[ring_index]);</div><div class='add'>+	limit = ring_limit - limit;</div><div class='ctx'> </div><div class='del'>-	return IRQ_HANDLED;</div><div class='del'>-}</div><div class='add'>+	i = idx % ring_limit;</div><div class='add'>+	while (limit-- &gt; 1) {</div><div class='add'>+		struct p54p_desc *desc = &amp;ring[i];</div><div class='ctx'> </div><div class='del'>-static int p54p_read_eeprom(struct ieee80211_hw *dev)</div><div class='del'>-{</div><div class='del'>-	struct p54p_priv *priv = dev-&gt;priv;</div><div class='del'>-	struct p54p_ring_control *ring_control = priv-&gt;ring_control;</div><div class='del'>-	int err;</div><div class='del'>-	struct p54_control_hdr *hdr;</div><div class='del'>-	void *eeprom;</div><div class='del'>-	dma_addr_t rx_mapping, tx_mapping;</div><div class='del'>-	u16 alen;</div><div class='add'>+		if (!desc-&gt;host_addr) {</div><div class='add'>+			struct sk_buff *skb;</div><div class='add'>+			dma_addr_t mapping;</div><div class='add'>+			skb = dev_alloc_skb(priv-&gt;common.rx_mtu + 32);</div><div class='add'>+			if (!skb)</div><div class='add'>+				break;</div><div class='ctx'> </div><div class='del'>-	init_completion(&amp;priv-&gt;boot_comp);</div><div class='del'>-	err = request_irq(priv-&gt;pdev-&gt;irq, &amp;p54p_simple_interrupt,</div><div class='del'>-			  IRQF_SHARED, "prism54pci", priv);</div><div class='del'>-	if (err) {</div><div class='del'>-		printk(KERN_ERR "%s (prism54pci): failed to register IRQ handler\n",</div><div class='del'>-		       pci_name(priv-&gt;pdev));</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='add'>+			mapping = pci_map_single(priv-&gt;pdev,</div><div class='add'>+						 skb_tail_pointer(skb),</div><div class='add'>+						 priv-&gt;common.rx_mtu + 32,</div><div class='add'>+						 PCI_DMA_FROMDEVICE);</div><div class='add'>+			desc-&gt;host_addr = cpu_to_le32(mapping);</div><div class='add'>+			desc-&gt;device_addr = 0;	// FIXME: necessary?</div><div class='add'>+			desc-&gt;len = cpu_to_le16(priv-&gt;common.rx_mtu + 32);</div><div class='add'>+			desc-&gt;flags = 0;</div><div class='add'>+			rx_buf[i] = skb;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	eeprom = kmalloc(0x2010 + EEPROM_READBACK_LEN, GFP_KERNEL);</div><div class='del'>-	if (!eeprom) {</div><div class='del'>-		printk(KERN_ERR "%s (prism54pci): no memory for eeprom!\n",</div><div class='del'>-		       pci_name(priv-&gt;pdev));</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto out;</div><div class='add'>+		i++;</div><div class='add'>+		idx++;</div><div class='add'>+		i %= ring_limit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	memset(ring_control, 0, sizeof(*ring_control));</div><div class='del'>-	P54P_WRITE(ring_control_base, cpu_to_le32(priv-&gt;ring_control_dma));</div><div class='del'>-	P54P_READ(ring_control_base);</div><div class='del'>-	udelay(10);</div><div class='del'>-</div><div class='del'>-	P54P_WRITE(int_enable, cpu_to_le32(ISL38XX_INT_IDENT_INIT));</div><div class='del'>-	P54P_READ(int_enable);</div><div class='del'>-	udelay(10);</div><div class='add'>+	wmb();</div><div class='add'>+	ring_control-&gt;host_idx[ring_index] = cpu_to_le32(idx);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	P54P_WRITE(dev_int, cpu_to_le32(ISL38XX_DEV_INT_RESET));</div><div class='add'>+static void p54p_check_rx_ring(struct ieee80211_hw *dev, u32 *index,</div><div class='add'>+	int ring_index, struct p54p_desc *ring, u32 ring_limit,</div><div class='add'>+	struct sk_buff **rx_buf)</div><div class='add'>+{</div><div class='add'>+	struct p54p_priv *priv = dev-&gt;priv;</div><div class='add'>+	struct p54p_ring_control *ring_control = priv-&gt;ring_control;</div><div class='add'>+	struct p54p_desc *desc;</div><div class='add'>+	u32 idx, i;</div><div class='add'>+</div><div class='add'>+	i = (*index) % ring_limit;</div><div class='add'>+	(*index) = idx = le32_to_cpu(ring_control-&gt;device_idx[ring_index]);</div><div class='add'>+	idx %= ring_limit;</div><div class='add'>+	while (i != idx) {</div><div class='add'>+		u16 len;</div><div class='add'>+		struct sk_buff *skb;</div><div class='add'>+		desc = &amp;ring[i];</div><div class='add'>+		len = le16_to_cpu(desc-&gt;len);</div><div class='add'>+		skb = rx_buf[i];</div><div class='add'>+</div><div class='add'>+		if (!skb) {</div><div class='add'>+			i++;</div><div class='add'>+			i %= ring_limit;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		skb_put(skb, len);</div><div class='add'>+</div><div class='add'>+		if (p54_rx(dev, skb)) {</div><div class='add'>+			pci_unmap_single(priv-&gt;pdev,</div><div class='add'>+					 le32_to_cpu(desc-&gt;host_addr),</div><div class='add'>+					 priv-&gt;common.rx_mtu + 32,</div><div class='add'>+					 PCI_DMA_FROMDEVICE);</div><div class='add'>+			rx_buf[i] = NULL;</div><div class='add'>+			desc-&gt;host_addr = 0;</div><div class='add'>+		} else {</div><div class='add'>+			skb_trim(skb, 0);</div><div class='add'>+			desc-&gt;len = cpu_to_le16(priv-&gt;common.rx_mtu + 32);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	if (!wait_for_completion_interruptible_timeout(&amp;priv-&gt;boot_comp, HZ)) {</div><div class='del'>-		printk(KERN_ERR "%s (prism54pci): Cannot boot firmware!\n",</div><div class='del'>-		       pci_name(priv-&gt;pdev));</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-		goto out;</div><div class='add'>+		i++;</div><div class='add'>+		i %= ring_limit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	P54P_WRITE(int_enable, cpu_to_le32(ISL38XX_INT_IDENT_UPDATE));</div><div class='del'>-	P54P_READ(int_enable);</div><div class='add'>+	p54p_refill_rx_ring(dev, ring_index, ring, ring_limit, rx_buf);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	hdr = eeprom + 0x2010;</div><div class='del'>-	p54_fill_eeprom_readback(hdr);</div><div class='del'>-	hdr-&gt;req_id = cpu_to_le32(priv-&gt;common.rx_start);</div><div class='add'>+/* caller must hold priv-&gt;lock */</div><div class='add'>+static void p54p_check_tx_ring(struct ieee80211_hw *dev, u32 *index,</div><div class='add'>+	int ring_index, struct p54p_desc *ring, u32 ring_limit,</div><div class='add'>+	void **tx_buf)</div><div class='add'>+{</div><div class='add'>+	struct p54p_priv *priv = dev-&gt;priv;</div><div class='add'>+	struct p54p_ring_control *ring_control = priv-&gt;ring_control;</div><div class='add'>+	struct p54p_desc *desc;</div><div class='add'>+	u32 idx, i;</div><div class='ctx'> </div><div class='del'>-	rx_mapping = pci_map_single(priv-&gt;pdev, eeprom,</div><div class='del'>-				    0x2010, PCI_DMA_FROMDEVICE);</div><div class='del'>-	tx_mapping = pci_map_single(priv-&gt;pdev, (void *)hdr,</div><div class='del'>-				    EEPROM_READBACK_LEN, PCI_DMA_TODEVICE);</div><div class='add'>+	i = (*index) % ring_limit;</div><div class='add'>+	(*index) = idx = le32_to_cpu(ring_control-&gt;device_idx[1]);</div><div class='add'>+	idx %= ring_limit;</div><div class='ctx'> </div><div class='del'>-	ring_control-&gt;rx_mgmt[0].host_addr = cpu_to_le32(rx_mapping);</div><div class='del'>-	ring_control-&gt;rx_mgmt[0].len = cpu_to_le16(0x2010);</div><div class='del'>-	ring_control-&gt;tx_data[0].host_addr = cpu_to_le32(tx_mapping);</div><div class='del'>-	ring_control-&gt;tx_data[0].device_addr = hdr-&gt;req_id;</div><div class='del'>-	ring_control-&gt;tx_data[0].len = cpu_to_le16(EEPROM_READBACK_LEN);</div><div class='add'>+	while (i != idx) {</div><div class='add'>+		desc = &amp;ring[i];</div><div class='add'>+		kfree(tx_buf[i]);</div><div class='add'>+		tx_buf[i] = NULL;</div><div class='ctx'> </div><div class='del'>-	ring_control-&gt;host_idx[2] = cpu_to_le32(1);</div><div class='del'>-	ring_control-&gt;host_idx[1] = cpu_to_le32(1);</div><div class='add'>+		pci_unmap_single(priv-&gt;pdev, le32_to_cpu(desc-&gt;host_addr),</div><div class='add'>+				 le16_to_cpu(desc-&gt;len), PCI_DMA_TODEVICE);</div><div class='ctx'> </div><div class='del'>-	wmb();</div><div class='del'>-	mdelay(100);</div><div class='del'>-	P54P_WRITE(dev_int, cpu_to_le32(ISL38XX_DEV_INT_UPDATE));</div><div class='add'>+		desc-&gt;host_addr = 0;</div><div class='add'>+		desc-&gt;device_addr = 0;</div><div class='add'>+		desc-&gt;len = 0;</div><div class='add'>+		desc-&gt;flags = 0;</div><div class='ctx'> </div><div class='del'>-	wait_for_completion_interruptible_timeout(&amp;priv-&gt;boot_comp, HZ);</div><div class='del'>-	wait_for_completion_interruptible_timeout(&amp;priv-&gt;boot_comp, HZ);</div><div class='del'>-</div><div class='del'>-	pci_unmap_single(priv-&gt;pdev, tx_mapping,</div><div class='del'>-			 EEPROM_READBACK_LEN, PCI_DMA_TODEVICE);</div><div class='del'>-	pci_unmap_single(priv-&gt;pdev, rx_mapping,</div><div class='del'>-			 0x2010, PCI_DMA_FROMDEVICE);</div><div class='del'>-</div><div class='del'>-	alen = le16_to_cpu(ring_control-&gt;rx_mgmt[0].len);</div><div class='del'>-	if (le32_to_cpu(ring_control-&gt;device_idx[2]) != 1 ||</div><div class='del'>-	    alen &lt; 0x10) {</div><div class='del'>-		printk(KERN_ERR "%s (prism54pci): Cannot read eeprom!\n",</div><div class='del'>-		       pci_name(priv-&gt;pdev));</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-		goto out;</div><div class='add'>+		i++;</div><div class='add'>+		i %= ring_limit;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	p54_parse_eeprom(dev, (u8 *)eeprom + 0x10, alen - 0x10);</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-	kfree(eeprom);</div><div class='del'>-	P54P_WRITE(int_enable, cpu_to_le32(0));</div><div class='del'>-	P54P_READ(int_enable);</div><div class='del'>-	udelay(10);</div><div class='del'>-	free_irq(priv-&gt;pdev-&gt;irq, priv);</div><div class='del'>-	P54P_WRITE(dev_int, cpu_to_le32(ISL38XX_DEV_INT_RESET));</div><div class='del'>-	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void p54p_refill_rx_ring(struct ieee80211_hw *dev)</div><div class='add'>+static void p54p_rx_tasklet(unsigned long dev_id)</div><div class='ctx'> {</div><div class='add'>+	struct ieee80211_hw *dev = (struct ieee80211_hw *)dev_id;</div><div class='ctx'> 	struct p54p_priv *priv = dev-&gt;priv;</div><div class='ctx'> 	struct p54p_ring_control *ring_control = priv-&gt;ring_control;</div><div class='del'>-	u32 limit, host_idx, idx;</div><div class='ctx'> </div><div class='del'>-	host_idx = le32_to_cpu(ring_control-&gt;host_idx[0]);</div><div class='del'>-	limit = host_idx;</div><div class='del'>-	limit -= le32_to_cpu(ring_control-&gt;device_idx[0]);</div><div class='del'>-	limit = ARRAY_SIZE(ring_control-&gt;rx_data) - limit;</div><div class='del'>-</div><div class='del'>-	idx = host_idx % ARRAY_SIZE(ring_control-&gt;rx_data);</div><div class='del'>-	while (limit-- &gt; 1) {</div><div class='del'>-		struct p54p_desc *desc = &amp;ring_control-&gt;rx_data[idx];</div><div class='del'>-</div><div class='del'>-		if (!desc-&gt;host_addr) {</div><div class='del'>-			struct sk_buff *skb;</div><div class='del'>-			dma_addr_t mapping;</div><div class='del'>-			skb = dev_alloc_skb(MAX_RX_SIZE);</div><div class='del'>-			if (!skb)</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			mapping = pci_map_single(priv-&gt;pdev,</div><div class='del'>-						 skb_tail_pointer(skb),</div><div class='del'>-						 MAX_RX_SIZE,</div><div class='del'>-						 PCI_DMA_FROMDEVICE);</div><div class='del'>-			desc-&gt;host_addr = cpu_to_le32(mapping);</div><div class='del'>-			desc-&gt;device_addr = 0;	// FIXME: necessary?</div><div class='del'>-			desc-&gt;len = cpu_to_le16(MAX_RX_SIZE);</div><div class='del'>-			desc-&gt;flags = 0;</div><div class='del'>-			priv-&gt;rx_buf[idx] = skb;</div><div class='del'>-		}</div><div class='add'>+	p54p_check_rx_ring(dev, &amp;priv-&gt;rx_idx_mgmt, 2, ring_control-&gt;rx_mgmt,</div><div class='add'>+		ARRAY_SIZE(ring_control-&gt;rx_mgmt), priv-&gt;rx_buf_mgmt);</div><div class='ctx'> </div><div class='del'>-		idx++;</div><div class='del'>-		host_idx++;</div><div class='del'>-		idx %= ARRAY_SIZE(ring_control-&gt;rx_data);</div><div class='del'>-	}</div><div class='add'>+	p54p_check_rx_ring(dev, &amp;priv-&gt;rx_idx_data, 0, ring_control-&gt;rx_data,</div><div class='add'>+		ARRAY_SIZE(ring_control-&gt;rx_data), priv-&gt;rx_buf_data);</div><div class='ctx'> </div><div class='ctx'> 	wmb();</div><div class='del'>-	ring_control-&gt;host_idx[0] = cpu_to_le32(host_idx);</div><div class='add'>+	P54P_WRITE(dev_int, cpu_to_le32(ISL38XX_DEV_INT_UPDATE));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static irqreturn_t p54p_interrupt(int irq, void *dev_id)</div><div class='hunk'>@@ -298,65 +286,18 @@ static irqreturn_t p54p_interrupt(int irq, void *dev_id)</div><div class='ctx'> 	reg &amp;= P54P_READ(int_enable);</div><div class='ctx'> </div><div class='ctx'> 	if (reg &amp; cpu_to_le32(ISL38XX_INT_IDENT_UPDATE)) {</div><div class='del'>-		struct p54p_desc *desc;</div><div class='del'>-		u32 idx, i;</div><div class='del'>-		i = priv-&gt;tx_idx;</div><div class='del'>-		i %= ARRAY_SIZE(ring_control-&gt;tx_data);</div><div class='del'>-		priv-&gt;tx_idx = idx = le32_to_cpu(ring_control-&gt;device_idx[1]);</div><div class='del'>-		idx %= ARRAY_SIZE(ring_control-&gt;tx_data);</div><div class='del'>-</div><div class='del'>-		while (i != idx) {</div><div class='del'>-			desc = &amp;ring_control-&gt;tx_data[i];</div><div class='del'>-			if (priv-&gt;tx_buf[i]) {</div><div class='del'>-				kfree(priv-&gt;tx_buf[i]);</div><div class='del'>-				priv-&gt;tx_buf[i] = NULL;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			pci_unmap_single(priv-&gt;pdev, le32_to_cpu(desc-&gt;host_addr),</div><div class='del'>-					 le16_to_cpu(desc-&gt;len), PCI_DMA_TODEVICE);</div><div class='del'>-</div><div class='del'>-			desc-&gt;host_addr = 0;</div><div class='del'>-			desc-&gt;device_addr = 0;</div><div class='del'>-			desc-&gt;len = 0;</div><div class='del'>-			desc-&gt;flags = 0;</div><div class='del'>-</div><div class='del'>-			i++;</div><div class='del'>-			i %= ARRAY_SIZE(ring_control-&gt;tx_data);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		i = priv-&gt;rx_idx;</div><div class='del'>-		i %= ARRAY_SIZE(ring_control-&gt;rx_data);</div><div class='del'>-		priv-&gt;rx_idx = idx = le32_to_cpu(ring_control-&gt;device_idx[0]);</div><div class='del'>-		idx %= ARRAY_SIZE(ring_control-&gt;rx_data);</div><div class='del'>-		while (i != idx) {</div><div class='del'>-			u16 len;</div><div class='del'>-			struct sk_buff *skb;</div><div class='del'>-			desc = &amp;ring_control-&gt;rx_data[i];</div><div class='del'>-			len = le16_to_cpu(desc-&gt;len);</div><div class='del'>-			skb = priv-&gt;rx_buf[i];</div><div class='add'>+		p54p_check_tx_ring(dev, &amp;priv-&gt;tx_idx_mgmt,</div><div class='add'>+				   3, ring_control-&gt;tx_mgmt,</div><div class='add'>+				   ARRAY_SIZE(ring_control-&gt;tx_mgmt),</div><div class='add'>+				   priv-&gt;tx_buf_mgmt);</div><div class='ctx'> </div><div class='del'>-			skb_put(skb, len);</div><div class='add'>+		p54p_check_tx_ring(dev, &amp;priv-&gt;tx_idx_data,</div><div class='add'>+				   1, ring_control-&gt;tx_data,</div><div class='add'>+				   ARRAY_SIZE(ring_control-&gt;tx_data),</div><div class='add'>+				   priv-&gt;tx_buf_data);</div><div class='ctx'> </div><div class='del'>-			if (p54_rx(dev, skb)) {</div><div class='del'>-				pci_unmap_single(priv-&gt;pdev,</div><div class='del'>-						 le32_to_cpu(desc-&gt;host_addr),</div><div class='del'>-						 MAX_RX_SIZE, PCI_DMA_FROMDEVICE);</div><div class='add'>+		tasklet_schedule(&amp;priv-&gt;rx_tasklet);</div><div class='ctx'> </div><div class='del'>-				priv-&gt;rx_buf[i] = NULL;</div><div class='del'>-				desc-&gt;host_addr = 0;</div><div class='del'>-			} else {</div><div class='del'>-				skb_trim(skb, 0);</div><div class='del'>-				desc-&gt;len = cpu_to_le16(MAX_RX_SIZE);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			i++;</div><div class='del'>-			i %= ARRAY_SIZE(ring_control-&gt;rx_data);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		p54p_refill_rx_ring(dev);</div><div class='del'>-</div><div class='del'>-		wmb();</div><div class='del'>-		P54P_WRITE(dev_int, cpu_to_le32(ISL38XX_DEV_INT_UPDATE));</div><div class='ctx'> 	} else if (reg &amp; cpu_to_le32(ISL38XX_INT_IDENT_INIT))</div><div class='ctx'> 		complete(&amp;priv-&gt;boot_comp);</div><div class='ctx'> </div><div class='hunk'>@@ -392,7 +333,7 @@ static void p54p_tx(struct ieee80211_hw *dev, struct p54_control_hdr *data,</div><div class='ctx'> 	ring_control-&gt;host_idx[1] = cpu_to_le32(idx + 1);</div><div class='ctx'> </div><div class='ctx'> 	if (free_on_tx)</div><div class='del'>-		priv-&gt;tx_buf[i] = data;</div><div class='add'>+		priv-&gt;tx_buf_data[i] = data;</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='ctx'> </div><div class='hunk'>@@ -412,7 +353,7 @@ static int p54p_open(struct ieee80211_hw *dev)</div><div class='ctx'> </div><div class='ctx'> 	init_completion(&amp;priv-&gt;boot_comp);</div><div class='ctx'> 	err = request_irq(priv-&gt;pdev-&gt;irq, &amp;p54p_interrupt,</div><div class='del'>-			  IRQF_SHARED, "prism54pci", dev);</div><div class='add'>+			  IRQF_SHARED, "p54pci", dev);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		printk(KERN_ERR "%s: failed to register IRQ handler\n",</div><div class='ctx'> 		       wiphy_name(dev-&gt;wiphy));</div><div class='hunk'>@@ -420,10 +361,19 @@ static int p54p_open(struct ieee80211_hw *dev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	memset(priv-&gt;ring_control, 0, sizeof(*priv-&gt;ring_control));</div><div class='del'>-	priv-&gt;rx_idx = priv-&gt;tx_idx = 0;</div><div class='del'>-	p54p_refill_rx_ring(dev);</div><div class='add'>+	err = p54p_upload_firmware(dev);</div><div class='add'>+	if (err) {</div><div class='add'>+		free_irq(priv-&gt;pdev-&gt;irq, dev);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+	priv-&gt;rx_idx_data = priv-&gt;tx_idx_data = 0;</div><div class='add'>+	priv-&gt;rx_idx_mgmt = priv-&gt;tx_idx_mgmt = 0;</div><div class='add'>+</div><div class='add'>+	p54p_refill_rx_ring(dev, 0, priv-&gt;ring_control-&gt;rx_data,</div><div class='add'>+		ARRAY_SIZE(priv-&gt;ring_control-&gt;rx_data), priv-&gt;rx_buf_data);</div><div class='ctx'> </div><div class='del'>-	p54p_upload_firmware(dev);</div><div class='add'>+	p54p_refill_rx_ring(dev, 2, priv-&gt;ring_control-&gt;rx_mgmt,</div><div class='add'>+		ARRAY_SIZE(priv-&gt;ring_control-&gt;rx_mgmt), priv-&gt;rx_buf_mgmt);</div><div class='ctx'> </div><div class='ctx'> 	P54P_WRITE(ring_control_base, cpu_to_le32(priv-&gt;ring_control_dma));</div><div class='ctx'> 	P54P_READ(ring_control_base);</div><div class='hunk'>@@ -465,6 +415,8 @@ static void p54p_stop(struct ieee80211_hw *dev)</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	struct p54p_desc *desc;</div><div class='ctx'> </div><div class='add'>+	tasklet_kill(&amp;priv-&gt;rx_tasklet);</div><div class='add'>+</div><div class='ctx'> 	P54P_WRITE(int_enable, cpu_to_le32(0));</div><div class='ctx'> 	P54P_READ(int_enable);</div><div class='ctx'> 	udelay(10);</div><div class='hunk'>@@ -473,26 +425,53 @@ static void p54p_stop(struct ieee80211_hw *dev)</div><div class='ctx'> </div><div class='ctx'> 	P54P_WRITE(dev_int, cpu_to_le32(ISL38XX_DEV_INT_RESET));</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(priv-&gt;rx_buf); i++) {</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(priv-&gt;rx_buf_data); i++) {</div><div class='ctx'> 		desc = &amp;ring_control-&gt;rx_data[i];</div><div class='ctx'> 		if (desc-&gt;host_addr)</div><div class='del'>-			pci_unmap_single(priv-&gt;pdev, le32_to_cpu(desc-&gt;host_addr),</div><div class='del'>-					 MAX_RX_SIZE, PCI_DMA_FROMDEVICE);</div><div class='del'>-		kfree_skb(priv-&gt;rx_buf[i]);</div><div class='del'>-		priv-&gt;rx_buf[i] = NULL;</div><div class='add'>+			pci_unmap_single(priv-&gt;pdev,</div><div class='add'>+					 le32_to_cpu(desc-&gt;host_addr),</div><div class='add'>+					 priv-&gt;common.rx_mtu + 32,</div><div class='add'>+					 PCI_DMA_FROMDEVICE);</div><div class='add'>+		kfree_skb(priv-&gt;rx_buf_data[i]);</div><div class='add'>+		priv-&gt;rx_buf_data[i] = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(priv-&gt;rx_buf_mgmt); i++) {</div><div class='add'>+		desc = &amp;ring_control-&gt;rx_mgmt[i];</div><div class='add'>+		if (desc-&gt;host_addr)</div><div class='add'>+			pci_unmap_single(priv-&gt;pdev,</div><div class='add'>+					 le32_to_cpu(desc-&gt;host_addr),</div><div class='add'>+					 priv-&gt;common.rx_mtu + 32,</div><div class='add'>+					 PCI_DMA_FROMDEVICE);</div><div class='add'>+		kfree_skb(priv-&gt;rx_buf_mgmt[i]);</div><div class='add'>+		priv-&gt;rx_buf_mgmt[i] = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(priv-&gt;tx_buf); i++) {</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(priv-&gt;tx_buf_data); i++) {</div><div class='ctx'> 		desc = &amp;ring_control-&gt;tx_data[i];</div><div class='ctx'> 		if (desc-&gt;host_addr)</div><div class='del'>-			pci_unmap_single(priv-&gt;pdev, le32_to_cpu(desc-&gt;host_addr),</div><div class='del'>-					 le16_to_cpu(desc-&gt;len), PCI_DMA_TODEVICE);</div><div class='add'>+			pci_unmap_single(priv-&gt;pdev,</div><div class='add'>+					 le32_to_cpu(desc-&gt;host_addr),</div><div class='add'>+					 le16_to_cpu(desc-&gt;len),</div><div class='add'>+					 PCI_DMA_TODEVICE);</div><div class='ctx'> </div><div class='del'>-		kfree(priv-&gt;tx_buf[i]);</div><div class='del'>-		priv-&gt;tx_buf[i] = NULL;</div><div class='add'>+		kfree(priv-&gt;tx_buf_data[i]);</div><div class='add'>+		priv-&gt;tx_buf_data[i] = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	memset(ring_control, 0, sizeof(ring_control));</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(priv-&gt;tx_buf_mgmt); i++) {</div><div class='add'>+		desc = &amp;ring_control-&gt;tx_mgmt[i];</div><div class='add'>+		if (desc-&gt;host_addr)</div><div class='add'>+			pci_unmap_single(priv-&gt;pdev,</div><div class='add'>+					 le32_to_cpu(desc-&gt;host_addr),</div><div class='add'>+					 le16_to_cpu(desc-&gt;len),</div><div class='add'>+					 PCI_DMA_TODEVICE);</div><div class='add'>+</div><div class='add'>+		kfree(priv-&gt;tx_buf_mgmt[i]);</div><div class='add'>+		priv-&gt;tx_buf_mgmt[i] = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(ring_control, 0, sizeof(*ring_control));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __devinit p54p_probe(struct pci_dev *pdev,</div><div class='hunk'>@@ -506,7 +485,7 @@ static int __devinit p54p_probe(struct pci_dev *pdev,</div><div class='ctx'> </div><div class='ctx'> 	err = pci_enable_device(pdev);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		printk(KERN_ERR "%s (prism54pci): Cannot enable new PCI device\n",</div><div class='add'>+		printk(KERN_ERR "%s (p54pci): Cannot enable new PCI device\n",</div><div class='ctx'> 		       pci_name(pdev));</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -514,22 +493,22 @@ static int __devinit p54p_probe(struct pci_dev *pdev,</div><div class='ctx'> 	mem_addr = pci_resource_start(pdev, 0);</div><div class='ctx'> 	mem_len = pci_resource_len(pdev, 0);</div><div class='ctx'> 	if (mem_len &lt; sizeof(struct p54p_csr)) {</div><div class='del'>-		printk(KERN_ERR "%s (prism54pci): Too short PCI resources\n",</div><div class='add'>+		printk(KERN_ERR "%s (p54pci): Too short PCI resources\n",</div><div class='ctx'> 		       pci_name(pdev));</div><div class='ctx'> 		pci_disable_device(pdev);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = pci_request_regions(pdev, "prism54pci");</div><div class='add'>+	err = pci_request_regions(pdev, "p54pci");</div><div class='ctx'> 	if (err) {</div><div class='del'>-		printk(KERN_ERR "%s (prism54pci): Cannot obtain PCI resources\n",</div><div class='add'>+		printk(KERN_ERR "%s (p54pci): Cannot obtain PCI resources\n",</div><div class='ctx'> 		       pci_name(pdev));</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (pci_set_dma_mask(pdev, DMA_32BIT_MASK) ||</div><div class='ctx'> 	    pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK)) {</div><div class='del'>-		printk(KERN_ERR "%s (prism54pci): No suitable DMA available\n",</div><div class='add'>+		printk(KERN_ERR "%s (p54pci): No suitable DMA available\n",</div><div class='ctx'> 		       pci_name(pdev));</div><div class='ctx'> 		goto err_free_reg;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -542,7 +521,7 @@ static int __devinit p54p_probe(struct pci_dev *pdev,</div><div class='ctx'> </div><div class='ctx'> 	dev = p54_init_common(sizeof(*priv));</div><div class='ctx'> 	if (!dev) {</div><div class='del'>-		printk(KERN_ERR "%s (prism54pci): ieee80211 alloc failed\n",</div><div class='add'>+		printk(KERN_ERR "%s (p54pci): ieee80211 alloc failed\n",</div><div class='ctx'> 		       pci_name(pdev));</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto err_free_reg;</div><div class='hunk'>@@ -556,7 +535,7 @@ static int __devinit p54p_probe(struct pci_dev *pdev,</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;map = ioremap(mem_addr, mem_len);</div><div class='ctx'> 	if (!priv-&gt;map) {</div><div class='del'>-		printk(KERN_ERR "%s (prism54pci): Cannot map device memory\n",</div><div class='add'>+		printk(KERN_ERR "%s (p54pci): Cannot map device memory\n",</div><div class='ctx'> 		       pci_name(pdev));</div><div class='ctx'> 		err = -EINVAL;	// TODO: use a better error code?</div><div class='ctx'> 		goto err_free_dev;</div><div class='hunk'>@@ -565,39 +544,31 @@ static int __devinit p54p_probe(struct pci_dev *pdev,</div><div class='ctx'> 	priv-&gt;ring_control = pci_alloc_consistent(pdev, sizeof(*priv-&gt;ring_control),</div><div class='ctx'> 						  &amp;priv-&gt;ring_control_dma);</div><div class='ctx'> 	if (!priv-&gt;ring_control) {</div><div class='del'>-		printk(KERN_ERR "%s (prism54pci): Cannot allocate rings\n",</div><div class='add'>+		printk(KERN_ERR "%s (p54pci): Cannot allocate rings\n",</div><div class='ctx'> 		       pci_name(pdev));</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto err_iounmap;</div><div class='ctx'> 	}</div><div class='del'>-	memset(priv-&gt;ring_control, 0, sizeof(*priv-&gt;ring_control));</div><div class='del'>-</div><div class='del'>-	err = p54p_upload_firmware(dev);</div><div class='del'>-	if (err)</div><div class='del'>-		goto err_free_desc;</div><div class='del'>-</div><div class='del'>-	err = p54p_read_eeprom(dev);</div><div class='del'>-	if (err)</div><div class='del'>-		goto err_free_desc;</div><div class='del'>-</div><div class='ctx'> 	priv-&gt;common.open = p54p_open;</div><div class='ctx'> 	priv-&gt;common.stop = p54p_stop;</div><div class='ctx'> 	priv-&gt;common.tx = p54p_tx;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;priv-&gt;lock);</div><div class='add'>+	tasklet_init(&amp;priv-&gt;rx_tasklet, p54p_rx_tasklet, (unsigned long)dev);</div><div class='add'>+</div><div class='add'>+	p54p_open(dev);</div><div class='add'>+	err = p54_read_eeprom(dev);</div><div class='add'>+	p54p_stop(dev);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_free_desc;</div><div class='ctx'> </div><div class='ctx'> 	err = ieee80211_register_hw(dev);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		printk(KERN_ERR "%s (prism54pci): Cannot register netdevice\n",</div><div class='add'>+		printk(KERN_ERR "%s (p54pci): Cannot register netdevice\n",</div><div class='ctx'> 		       pci_name(pdev));</div><div class='ctx'> 		goto err_free_common;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "%s: hwaddr %s, isl38%02x\n",</div><div class='del'>-	       wiphy_name(dev-&gt;wiphy),</div><div class='del'>-	       print_mac(mac, dev-&gt;wiphy-&gt;perm_addr),</div><div class='del'>-	       priv-&gt;common.version);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'>  err_free_common:</div><div class='hunk'>@@ -645,7 +616,7 @@ static int p54p_suspend(struct pci_dev *pdev, pm_message_t state)</div><div class='ctx'> 	struct ieee80211_hw *dev = pci_get_drvdata(pdev);</div><div class='ctx'> 	struct p54p_priv *priv = dev-&gt;priv;</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;common.mode != IEEE80211_IF_TYPE_INVALID) {</div><div class='add'>+	if (priv-&gt;common.mode != NL80211_IFTYPE_UNSPECIFIED) {</div><div class='ctx'> 		ieee80211_stop_queues(dev);</div><div class='ctx'> 		p54p_stop(dev);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -663,7 +634,7 @@ static int p54p_resume(struct pci_dev *pdev)</div><div class='ctx'> 	pci_set_power_state(pdev, PCI_D0);</div><div class='ctx'> 	pci_restore_state(pdev);</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;common.mode != IEEE80211_IF_TYPE_INVALID) {</div><div class='add'>+	if (priv-&gt;common.mode != NL80211_IFTYPE_UNSPECIFIED) {</div><div class='ctx'> 		p54p_open(dev);</div><div class='ctx'> 		ieee80211_wake_queues(dev);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -673,7 +644,7 @@ static int p54p_resume(struct pci_dev *pdev)</div><div class='ctx'> #endif /* CONFIG_PM */</div><div class='ctx'> </div><div class='ctx'> static struct pci_driver p54p_driver = {</div><div class='del'>-	.name		= "prism54pci",</div><div class='add'>+	.name		= "p54pci",</div><div class='ctx'> 	.id_table	= p54p_table,</div><div class='ctx'> 	.probe		= p54p_probe,</div><div class='ctx'> 	.remove		= __devexit_p(p54p_remove),</div><div class='head'>diff --git a/drivers/net/wireless/p54/p54pci.h b/drivers/net/wireless/p54/p54pci.h<br/>index 5bedd7af385d..4a6778070afc 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/p54/p54pci.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/p54/p54pci.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/p54/p54pci.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/p54/p54pci.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='del'>-#ifndef PRISM54PCI_H</div><div class='del'>-#define PRISM54PCI_H</div><div class='add'>+#ifndef P54PCI_H</div><div class='add'>+#define P54PCI_H</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Defines for PCI based mac80211 Prism54 driver</div><div class='hunk'>@@ -68,7 +68,7 @@ struct p54p_csr {</div><div class='ctx'> } __attribute__ ((packed));</div><div class='ctx'> </div><div class='ctx'> /* usb backend only needs the register defines above */</div><div class='del'>-#ifndef PRISM54USB_H</div><div class='add'>+#ifndef P54USB_H</div><div class='ctx'> struct p54p_desc {</div><div class='ctx'> 	__le32 host_addr;</div><div class='ctx'> 	__le32 device_addr;</div><div class='hunk'>@@ -92,15 +92,19 @@ struct p54p_priv {</div><div class='ctx'> 	struct p54_common common;</div><div class='ctx'> 	struct pci_dev *pdev;</div><div class='ctx'> 	struct p54p_csr __iomem *map;</div><div class='add'>+	struct tasklet_struct rx_tasklet;</div><div class='ctx'> </div><div class='ctx'> 	spinlock_t lock;</div><div class='ctx'> 	struct p54p_ring_control *ring_control;</div><div class='ctx'> 	dma_addr_t ring_control_dma;</div><div class='del'>-	u32 rx_idx, tx_idx;</div><div class='del'>-	struct sk_buff *rx_buf[8];</div><div class='del'>-	void *tx_buf[32];</div><div class='add'>+	u32 rx_idx_data, tx_idx_data;</div><div class='add'>+	u32 rx_idx_mgmt, tx_idx_mgmt;</div><div class='add'>+	struct sk_buff *rx_buf_data[8];</div><div class='add'>+	struct sk_buff *rx_buf_mgmt[4];</div><div class='add'>+	void *tx_buf_data[32];</div><div class='add'>+	void *tx_buf_mgmt[4];</div><div class='ctx'> 	struct completion boot_comp;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#endif /* PRISM54USB_H */</div><div class='del'>-#endif /* PRISM54PCI_H */</div><div class='add'>+#endif /* P54USB_H */</div><div class='add'>+#endif /* P54PCI_H */</div><div class='head'>diff --git a/drivers/net/wireless/p54/p54usb.c b/drivers/net/wireless/p54/p54usb.c<br/>index cbaca23a9453..75d749bccb0d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/p54/p54usb.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/p54/p54usb.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/p54/p54usb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/p54/p54usb.c</a></div><div class='hunk'>@@ -39,6 +39,7 @@ static struct usb_device_id p54u_table[] __devinitdata = {</div><div class='ctx'> 	{USB_DEVICE(0x0846, 0x4200)},	/* Netgear WG121 */</div><div class='ctx'> 	{USB_DEVICE(0x0846, 0x4210)},	/* Netgear WG121 the second ? */</div><div class='ctx'> 	{USB_DEVICE(0x0846, 0x4220)},	/* Netgear WG111 */</div><div class='add'>+	{USB_DEVICE(0x09aa, 0x1000)},	/* Spinnaker Proto board */</div><div class='ctx'> 	{USB_DEVICE(0x0cde, 0x0006)},	/* Medion 40900, Roper Europe */</div><div class='ctx'> 	{USB_DEVICE(0x124a, 0x4023)},	/* Shuttle PN15, Airvast WM168g, IOGear GWU513 */</div><div class='ctx'> 	{USB_DEVICE(0x1915, 0x2234)},	/* Linksys WUSB54G OEM */</div><div class='hunk'>@@ -63,8 +64,8 @@ static struct usb_device_id p54u_table[] __devinitdata = {</div><div class='ctx'> 	{USB_DEVICE(0x0cde, 0x0006)},   /* Medion MD40900 */</div><div class='ctx'> 	{USB_DEVICE(0x0cde, 0x0008)},	/* Sagem XG703A */</div><div class='ctx'> 	{USB_DEVICE(0x0d8e, 0x3762)},	/* DLink DWL-G120 Cohiba */</div><div class='del'>-	{USB_DEVICE(0x09aa, 0x1000)},	/* Spinnaker Proto board */</div><div class='ctx'> 	{USB_DEVICE(0x124a, 0x4025)},	/* IOGear GWU513 (GW3887IK chip) */</div><div class='add'>+	{USB_DEVICE(0x1260, 0xee22)},	/* SMC 2862W-G version 2 */</div><div class='ctx'> 	{USB_DEVICE(0x13b1, 0x000a)},	/* Linksys WUSB54G ver 2 */</div><div class='ctx'> 	{USB_DEVICE(0x13B1, 0x000C)},	/* Linksys WUSB54AG */</div><div class='ctx'> 	{USB_DEVICE(0x1435, 0x0427)},	/* Inventel UR054G */</div><div class='hunk'>@@ -91,11 +92,16 @@ static void p54u_rx_cb(struct urb *urb)</div><div class='ctx'> </div><div class='ctx'> 	skb_unlink(skb, &amp;priv-&gt;rx_queue);</div><div class='ctx'> 	skb_put(skb, urb-&gt;actual_length);</div><div class='del'>-	if (!priv-&gt;hw_type)</div><div class='del'>-		skb_pull(skb, sizeof(struct net2280_tx_hdr));</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;hw_type == P54U_NET2280)</div><div class='add'>+		skb_pull(skb, priv-&gt;common.tx_hdr_len);</div><div class='add'>+	if (priv-&gt;common.fw_interface == FW_LM87) {</div><div class='add'>+		skb_pull(skb, 4);</div><div class='add'>+		skb_put(skb, 4);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (p54_rx(dev, skb)) {</div><div class='del'>-		skb = dev_alloc_skb(MAX_RX_SIZE);</div><div class='add'>+		skb = dev_alloc_skb(priv-&gt;common.rx_mtu + 32);</div><div class='ctx'> 		if (unlikely(!skb)) {</div><div class='ctx'> 			usb_free_urb(urb);</div><div class='ctx'> 			/* TODO check rx queue length and refill *somewhere* */</div><div class='hunk'>@@ -109,9 +115,12 @@ static void p54u_rx_cb(struct urb *urb)</div><div class='ctx'> 		urb-&gt;context = skb;</div><div class='ctx'> 		skb_queue_tail(&amp;priv-&gt;rx_queue, skb);</div><div class='ctx'> 	} else {</div><div class='del'>-		if (!priv-&gt;hw_type)</div><div class='del'>-			skb_push(skb, sizeof(struct net2280_tx_hdr));</div><div class='del'>-</div><div class='add'>+		if (priv-&gt;hw_type == P54U_NET2280)</div><div class='add'>+			skb_push(skb, priv-&gt;common.tx_hdr_len);</div><div class='add'>+		if (priv-&gt;common.fw_interface == FW_LM87) {</div><div class='add'>+			skb_push(skb, 4);</div><div class='add'>+			skb_put(skb, 4);</div><div class='add'>+		}</div><div class='ctx'> 		skb_reset_tail_pointer(skb);</div><div class='ctx'> 		skb_trim(skb, 0);</div><div class='ctx'> 		if (urb-&gt;transfer_buffer != skb_tail_pointer(skb)) {</div><div class='hunk'>@@ -145,7 +154,7 @@ static int p54u_init_urbs(struct ieee80211_hw *dev)</div><div class='ctx'> 	struct p54u_rx_info *info;</div><div class='ctx'> </div><div class='ctx'> 	while (skb_queue_len(&amp;priv-&gt;rx_queue) &lt; 32) {</div><div class='del'>-		skb = __dev_alloc_skb(MAX_RX_SIZE, GFP_KERNEL);</div><div class='add'>+		skb = __dev_alloc_skb(priv-&gt;common.rx_mtu + 32, GFP_KERNEL);</div><div class='ctx'> 		if (!skb)</div><div class='ctx'> 			break;</div><div class='ctx'> 		entry = usb_alloc_urb(0, GFP_KERNEL);</div><div class='hunk'>@@ -153,7 +162,10 @@ static int p54u_init_urbs(struct ieee80211_hw *dev)</div><div class='ctx'> 			kfree_skb(skb);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		usb_fill_bulk_urb(entry, priv-&gt;udev, usb_rcvbulkpipe(priv-&gt;udev, P54U_PIPE_DATA), skb_tail_pointer(skb), MAX_RX_SIZE, p54u_rx_cb, skb);</div><div class='add'>+		usb_fill_bulk_urb(entry, priv-&gt;udev,</div><div class='add'>+				  usb_rcvbulkpipe(priv-&gt;udev, P54U_PIPE_DATA),</div><div class='add'>+				  skb_tail_pointer(skb),</div><div class='add'>+				  priv-&gt;common.rx_mtu + 32, p54u_rx_cb, skb);</div><div class='ctx'> 		info = (struct p54u_rx_info *) skb-&gt;cb;</div><div class='ctx'> 		info-&gt;urb = entry;</div><div class='ctx'> 		info-&gt;dev = dev;</div><div class='hunk'>@@ -207,6 +219,42 @@ static void p54u_tx_3887(struct ieee80211_hw *dev, struct p54_control_hdr *data,</div><div class='ctx'> 	usb_submit_urb(data_urb, GFP_ATOMIC);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static __le32 p54u_lm87_chksum(const u32 *data, size_t length)</div><div class='add'>+{</div><div class='add'>+	u32 chk = 0;</div><div class='add'>+</div><div class='add'>+	length &gt;&gt;= 2;</div><div class='add'>+	while (length--) {</div><div class='add'>+		chk ^= *data++;</div><div class='add'>+		chk = (chk &gt;&gt; 5) ^ (chk &lt;&lt; 3);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return cpu_to_le32(chk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void p54u_tx_lm87(struct ieee80211_hw *dev,</div><div class='add'>+			 struct p54_control_hdr *data,</div><div class='add'>+			 size_t len, int free_on_tx)</div><div class='add'>+{</div><div class='add'>+	struct p54u_priv *priv = dev-&gt;priv;</div><div class='add'>+	struct urb *data_urb;</div><div class='add'>+	struct lm87_tx_hdr *hdr = (void *)data - sizeof(*hdr);</div><div class='add'>+</div><div class='add'>+	data_urb = usb_alloc_urb(0, GFP_ATOMIC);</div><div class='add'>+	if (!data_urb)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	hdr-&gt;chksum = p54u_lm87_chksum((u32 *)data, len);</div><div class='add'>+	hdr-&gt;device_addr = data-&gt;req_id;</div><div class='add'>+</div><div class='add'>+	usb_fill_bulk_urb(data_urb, priv-&gt;udev,</div><div class='add'>+		usb_sndbulkpipe(priv-&gt;udev, P54U_PIPE_DATA), hdr,</div><div class='add'>+		len + sizeof(*hdr), free_on_tx ? p54u_tx_free_cb : p54u_tx_cb,</div><div class='add'>+		dev);</div><div class='add'>+</div><div class='add'>+	usb_submit_urb(data_urb, GFP_ATOMIC);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void p54u_tx_net2280(struct ieee80211_hw *dev, struct p54_control_hdr *data,</div><div class='ctx'> 			    size_t len, int free_on_tx)</div><div class='ctx'> {</div><div class='hunk'>@@ -312,73 +360,6 @@ static int p54u_bulk_msg(struct p54u_priv *priv, unsigned int ep,</div><div class='ctx'> 			    data, len, &amp;alen, 2000);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int p54u_read_eeprom(struct ieee80211_hw *dev)</div><div class='del'>-{</div><div class='del'>-	struct p54u_priv *priv = dev-&gt;priv;</div><div class='del'>-	void *buf;</div><div class='del'>-	struct p54_control_hdr *hdr;</div><div class='del'>-	int err, alen;</div><div class='del'>-	size_t offset = priv-&gt;hw_type ? 0x10 : 0x20;</div><div class='del'>-</div><div class='del'>-	buf = kmalloc(0x2020, GFP_KERNEL);</div><div class='del'>-	if (!buf) {</div><div class='del'>-		printk(KERN_ERR "prism54usb: cannot allocate memory for "</div><div class='del'>-		       "eeprom readback!\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;hw_type) {</div><div class='del'>-		*((u32 *) buf) = priv-&gt;common.rx_start;</div><div class='del'>-		err = p54u_bulk_msg(priv, P54U_PIPE_DATA, buf, sizeof(u32));</div><div class='del'>-		if (err) {</div><div class='del'>-			printk(KERN_ERR "prism54usb: addr send failed\n");</div><div class='del'>-			goto fail;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		struct net2280_reg_write *reg = buf;</div><div class='del'>-		reg-&gt;port = cpu_to_le16(NET2280_DEV_U32);</div><div class='del'>-		reg-&gt;addr = cpu_to_le32(P54U_DEV_BASE);</div><div class='del'>-		reg-&gt;val = cpu_to_le32(ISL38XX_DEV_INT_DATA);</div><div class='del'>-		err = p54u_bulk_msg(priv, P54U_PIPE_DEV, buf, sizeof(*reg));</div><div class='del'>-		if (err) {</div><div class='del'>-			printk(KERN_ERR "prism54usb: dev_int send failed\n");</div><div class='del'>-			goto fail;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hdr = buf + priv-&gt;common.tx_hdr_len;</div><div class='del'>-	p54_fill_eeprom_readback(hdr);</div><div class='del'>-	hdr-&gt;req_id = cpu_to_le32(priv-&gt;common.rx_start);</div><div class='del'>-	if (priv-&gt;common.tx_hdr_len) {</div><div class='del'>-		struct net2280_tx_hdr *tx_hdr = buf;</div><div class='del'>-		tx_hdr-&gt;device_addr = hdr-&gt;req_id;</div><div class='del'>-		tx_hdr-&gt;len = cpu_to_le16(EEPROM_READBACK_LEN);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* we can just pretend to send 0x2000 bytes of nothing in the headers */</div><div class='del'>-	err = p54u_bulk_msg(priv, P54U_PIPE_DATA, buf,</div><div class='del'>-			    EEPROM_READBACK_LEN + priv-&gt;common.tx_hdr_len);</div><div class='del'>-	if (err) {</div><div class='del'>-		printk(KERN_ERR "prism54usb: eeprom req send failed\n");</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = usb_bulk_msg(priv-&gt;udev,</div><div class='del'>-			   usb_rcvbulkpipe(priv-&gt;udev, P54U_PIPE_DATA),</div><div class='del'>-			   buf, 0x2020, &amp;alen, 1000);</div><div class='del'>-	if (!err &amp;&amp; alen &gt; offset) {</div><div class='del'>-		p54_parse_eeprom(dev, (u8 *)buf + offset, alen - offset);</div><div class='del'>-	} else {</div><div class='del'>-		printk(KERN_ERR "prism54usb: eeprom read failed!\n");</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>- fail:</div><div class='del'>-	kfree(buf);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int p54u_upload_firmware_3887(struct ieee80211_hw *dev)</div><div class='ctx'> {</div><div class='ctx'> 	static char start_string[] = "~~~~&lt;\r";</div><div class='hunk'>@@ -412,7 +393,9 @@ static int p54u_upload_firmware_3887(struct ieee80211_hw *dev)</div><div class='ctx'> 		goto err_req_fw_failed;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	p54_parse_firmware(dev, fw_entry);</div><div class='add'>+	err = p54_parse_firmware(dev, fw_entry);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_upload_failed;</div><div class='ctx'> </div><div class='ctx'> 	left = block_size = min((size_t)P54U_FW_BLOCK, fw_entry-&gt;size);</div><div class='ctx'> 	strcpy(buf, start_string);</div><div class='hunk'>@@ -458,7 +441,7 @@ static int p54u_upload_firmware_3887(struct ieee80211_hw *dev)</div><div class='ctx'> </div><div class='ctx'> 		err = p54u_bulk_msg(priv, P54U_PIPE_DATA, buf, block_size);</div><div class='ctx'> 		if (err) {</div><div class='del'>-			printk(KERN_ERR "prism54usb: firmware upload failed!\n");</div><div class='add'>+			printk(KERN_ERR "p54usb: firmware upload failed!\n");</div><div class='ctx'> 			goto err_upload_failed;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -469,7 +452,7 @@ static int p54u_upload_firmware_3887(struct ieee80211_hw *dev)</div><div class='ctx'> 	*((__le32 *)buf) = cpu_to_le32(~crc32_le(~0, fw_entry-&gt;data, fw_entry-&gt;size));</div><div class='ctx'> 	err = p54u_bulk_msg(priv, P54U_PIPE_DATA, buf, sizeof(u32));</div><div class='ctx'> 	if (err) {</div><div class='del'>-		printk(KERN_ERR "prism54usb: firmware upload failed!\n");</div><div class='add'>+		printk(KERN_ERR "p54usb: firmware upload failed!\n");</div><div class='ctx'> 		goto err_upload_failed;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -480,13 +463,13 @@ static int p54u_upload_firmware_3887(struct ieee80211_hw *dev)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		if (alen &gt; 5 &amp;&amp; !memcmp(buf, "ERROR", 5)) {</div><div class='del'>-			printk(KERN_INFO "prism54usb: firmware upload failed!\n");</div><div class='add'>+			printk(KERN_INFO "p54usb: firmware upload failed!\n");</div><div class='ctx'> 			err = -EINVAL;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (time_after(jiffies, timeout)) {</div><div class='del'>-			printk(KERN_ERR "prism54usb: firmware boot timed out!\n");</div><div class='add'>+			printk(KERN_ERR "p54usb: firmware boot timed out!\n");</div><div class='ctx'> 			err = -ETIMEDOUT;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -498,7 +481,7 @@ static int p54u_upload_firmware_3887(struct ieee80211_hw *dev)</div><div class='ctx'> 	buf[1] = '\r';</div><div class='ctx'> 	err = p54u_bulk_msg(priv, P54U_PIPE_DATA, buf, 2);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		printk(KERN_ERR "prism54usb: firmware boot failed!\n");</div><div class='add'>+		printk(KERN_ERR "p54usb: firmware boot failed!\n");</div><div class='ctx'> 		goto err_upload_failed;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -549,7 +532,12 @@ static int p54u_upload_firmware_net2280(struct ieee80211_hw *dev)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	p54_parse_firmware(dev, fw_entry);</div><div class='add'>+	err = p54_parse_firmware(dev, fw_entry);</div><div class='add'>+	if (err) {</div><div class='add'>+		kfree(buf);</div><div class='add'>+		release_firmware(fw_entry);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> #define P54U_WRITE(type, addr, data) \</div><div class='ctx'> 	do {\</div><div class='hunk'>@@ -660,7 +648,7 @@ static int p54u_upload_firmware_net2280(struct ieee80211_hw *dev)</div><div class='ctx'> </div><div class='ctx'> 		err = p54u_bulk_msg(priv, P54U_PIPE_DATA, buf, block_len);</div><div class='ctx'> 		if (err) {</div><div class='del'>-			printk(KERN_ERR "prism54usb: firmware block upload "</div><div class='add'>+			printk(KERN_ERR "p54usb: firmware block upload "</div><div class='ctx'> 			       "failed\n");</div><div class='ctx'> 			goto fail;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -694,7 +682,7 @@ static int p54u_upload_firmware_net2280(struct ieee80211_hw *dev)</div><div class='ctx'> 			  0x002C | (unsigned long)&amp;devreg-&gt;direct_mem_win);</div><div class='ctx'> 		if (!(reg &amp; cpu_to_le32(ISL38XX_DMA_STATUS_DONE)) ||</div><div class='ctx'> 		    !(reg &amp; cpu_to_le32(ISL38XX_DMA_STATUS_READY))) {</div><div class='del'>-			printk(KERN_ERR "prism54usb: firmware DMA transfer "</div><div class='add'>+			printk(KERN_ERR "p54usb: firmware DMA transfer "</div><div class='ctx'> 			       "failed\n");</div><div class='ctx'> 			goto fail;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -802,7 +790,7 @@ static int __devinit p54u_probe(struct usb_interface *intf,</div><div class='ctx'> </div><div class='ctx'> 	dev = p54_init_common(sizeof(*priv));</div><div class='ctx'> 	if (!dev) {</div><div class='del'>-		printk(KERN_ERR "prism54usb: ieee80211 alloc failed\n");</div><div class='add'>+		printk(KERN_ERR "p54usb: ieee80211 alloc failed\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -833,49 +821,40 @@ static int __devinit p54u_probe(struct usb_interface *intf,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	priv-&gt;common.open = p54u_open;</div><div class='del'>-</div><div class='add'>+	priv-&gt;common.stop = p54u_stop;</div><div class='ctx'> 	if (recognized_pipes &lt; P54U_PIPE_NUMBER) {</div><div class='ctx'> 		priv-&gt;hw_type = P54U_3887;</div><div class='del'>-		priv-&gt;common.tx = p54u_tx_3887;</div><div class='add'>+		err = p54u_upload_firmware_3887(dev);</div><div class='add'>+		if (priv-&gt;common.fw_interface == FW_LM87) {</div><div class='add'>+			dev-&gt;extra_tx_headroom += sizeof(struct lm87_tx_hdr);</div><div class='add'>+			priv-&gt;common.tx_hdr_len = sizeof(struct lm87_tx_hdr);</div><div class='add'>+			priv-&gt;common.tx = p54u_tx_lm87;</div><div class='add'>+		} else</div><div class='add'>+			priv-&gt;common.tx = p54u_tx_3887;</div><div class='ctx'> 	} else {</div><div class='add'>+		priv-&gt;hw_type = P54U_NET2280;</div><div class='ctx'> 		dev-&gt;extra_tx_headroom += sizeof(struct net2280_tx_hdr);</div><div class='ctx'> 		priv-&gt;common.tx_hdr_len = sizeof(struct net2280_tx_hdr);</div><div class='ctx'> 		priv-&gt;common.tx = p54u_tx_net2280;</div><div class='del'>-	}</div><div class='del'>-	priv-&gt;common.stop = p54u_stop;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;hw_type)</div><div class='del'>-		err = p54u_upload_firmware_3887(dev);</div><div class='del'>-	else</div><div class='ctx'> 		err = p54u_upload_firmware_net2280(dev);</div><div class='add'>+	}</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err_free_dev;</div><div class='ctx'> </div><div class='del'>-	err = p54u_read_eeprom(dev);</div><div class='add'>+	skb_queue_head_init(&amp;priv-&gt;rx_queue);</div><div class='add'>+</div><div class='add'>+	p54u_open(dev);</div><div class='add'>+	err = p54_read_eeprom(dev);</div><div class='add'>+	p54u_stop(dev);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err_free_dev;</div><div class='ctx'> </div><div class='del'>-	if (!is_valid_ether_addr(dev-&gt;wiphy-&gt;perm_addr)) {</div><div class='del'>-		u8 perm_addr[ETH_ALEN];</div><div class='del'>-</div><div class='del'>-		printk(KERN_WARNING "prism54usb: Invalid hwaddr! Using randomly generated MAC addr\n");</div><div class='del'>-		random_ether_addr(perm_addr);</div><div class='del'>-		SET_IEEE80211_PERM_ADDR(dev, perm_addr);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	skb_queue_head_init(&amp;priv-&gt;rx_queue);</div><div class='del'>-</div><div class='ctx'> 	err = ieee80211_register_hw(dev);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		printk(KERN_ERR "prism54usb: Cannot register netdevice\n");</div><div class='add'>+		printk(KERN_ERR "p54usb: Cannot register netdevice\n");</div><div class='ctx'> 		goto err_free_dev;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "%s: hwaddr %s, isl38%02x\n",</div><div class='del'>-	       wiphy_name(dev-&gt;wiphy),</div><div class='del'>-	       print_mac(mac, dev-&gt;wiphy-&gt;perm_addr),</div><div class='del'>-	       priv-&gt;common.version);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'>  err_free_dev:</div><div class='hunk'>@@ -902,7 +881,7 @@ static void __devexit p54u_disconnect(struct usb_interface *intf)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct usb_driver p54u_driver = {</div><div class='del'>-	.name	= "prism54usb",</div><div class='add'>+	.name	= "p54usb",</div><div class='ctx'> 	.id_table = p54u_table,</div><div class='ctx'> 	.probe = p54u_probe,</div><div class='ctx'> 	.disconnect = p54u_disconnect,</div><div class='head'>diff --git a/drivers/net/wireless/p54/p54usb.h b/drivers/net/wireless/p54/p54usb.h<br/>index d1896b396c1c..5b8fe91379c3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/p54/p54usb.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/p54/p54usb.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/p54/p54usb.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/p54/p54usb.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='del'>-#ifndef PRISM54USB_H</div><div class='del'>-#define PRISM54USB_H</div><div class='add'>+#ifndef P54USB_H</div><div class='add'>+#define P54USB_H</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Defines for USB based mac80211 Prism54 driver</div><div class='hunk'>@@ -72,6 +72,11 @@ struct net2280_tx_hdr {</div><div class='ctx'> 	u8 padding[8];</div><div class='ctx'> } __attribute__((packed));</div><div class='ctx'> </div><div class='add'>+struct lm87_tx_hdr {</div><div class='add'>+	__le32 device_addr;</div><div class='add'>+	__le32 chksum;</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='ctx'> /* Some flags for the isl hardware registers controlling DMA inside the</div><div class='ctx'>  * chip */</div><div class='ctx'> #define ISL38XX_DMA_STATUS_DONE			0x00000001</div><div class='hunk'>@@ -130,4 +135,4 @@ struct p54u_priv {</div><div class='ctx'> 	struct sk_buff_head rx_queue;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#endif /* PRISM54USB_H */</div><div class='add'>+#endif /* P54USB_H */</div><div class='head'>diff --git a/drivers/net/wireless/prism54/isl_ioctl.c b/drivers/net/wireless/prism54/isl_ioctl.c<br/>index 3d75a7137d3c..16e68f4b654a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/prism54/isl_ioctl.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/prism54/isl_ioctl.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/prism54/isl_ioctl.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/prism54/isl_ioctl.c</a></div><div class='hunk'>@@ -71,7 +71,7 @@ prism54_mib_mode_helper(islpci_private *priv, u32 iw_mode)</div><div class='ctx'> 	if (iw_mode == IW_MODE_REPEAT || iw_mode == IW_MODE_SECOND) {</div><div class='ctx'> 		printk(KERN_DEBUG</div><div class='ctx'> 		       "%s(): Sorry, Repeater mode and Secondary mode "</div><div class='del'>-		       "are not yet supported by this driver.\n", __FUNCTION__);</div><div class='add'>+		       "are not yet supported by this driver.\n", __func__);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -333,7 +333,7 @@ prism54_set_mode(struct net_device *ndev, struct iw_request_info *info,</div><div class='ctx'> 	if (*uwrq &gt; IW_MODE_MONITOR || *uwrq &lt; IW_MODE_AUTO) {</div><div class='ctx'> 		printk(KERN_DEBUG</div><div class='ctx'> 		       "%s: %s() You passed a non-valid init_mode.\n",</div><div class='del'>-		       priv-&gt;ndev-&gt;name, __FUNCTION__);</div><div class='add'>+		       priv-&gt;ndev-&gt;name, __func__);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1234,7 +1234,7 @@ prism54_set_txpower(struct net_device *ndev, struct iw_request_info *info,</div><div class='ctx'> 		/* don't know how to disable radio */</div><div class='ctx'> 		printk(KERN_DEBUG</div><div class='ctx'> 		       "%s: %s() disabling radio is not yet supported.\n",</div><div class='del'>-		       priv-&gt;ndev-&gt;name, __FUNCTION__);</div><div class='add'>+		       priv-&gt;ndev-&gt;name, __func__);</div><div class='ctx'> 		return -ENOTSUPP;</div><div class='ctx'> 	} else if (vwrq-&gt;fixed)</div><div class='ctx'> 		/* currently only fixed value is supported */</div><div class='hunk'>@@ -1242,7 +1242,7 @@ prism54_set_txpower(struct net_device *ndev, struct iw_request_info *info,</div><div class='ctx'> 	else {</div><div class='ctx'> 		printk(KERN_DEBUG</div><div class='ctx'> 		       "%s: %s() auto power will be implemented later.\n",</div><div class='del'>-		       priv-&gt;ndev-&gt;name, __FUNCTION__);</div><div class='add'>+		       priv-&gt;ndev-&gt;name, __func__);</div><div class='ctx'> 		return -ENOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c<br/>index 963960dc30f2..1404a5717520 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/ray_cs.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/ray_cs.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/ray_cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/ray_cs.c</a></div><div class='hunk'>@@ -325,7 +325,7 @@ static int ray_probe(struct pcmcia_device *p_dev)</div><div class='ctx'>     p_dev-&gt;io.IOAddrLines = 5;</div><div class='ctx'> </div><div class='ctx'>     /* Interrupt setup. For PCMCIA, driver takes what's given */</div><div class='del'>-    p_dev-&gt;irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_HANDLE_PRESENT;</div><div class='add'>+    p_dev-&gt;irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_HANDLE_PRESENT;</div><div class='ctx'>     p_dev-&gt;irq.IRQInfo1 = IRQ_LEVEL_ID;</div><div class='ctx'>     p_dev-&gt;irq.Handler = &amp;ray_interrupt;</div><div class='ctx'> </div><div class='hunk'>@@ -798,9 +798,9 @@ static void ray_release(struct pcmcia_device *link)</div><div class='ctx'>     iounmap(local-&gt;amem);</div><div class='ctx'>     /* Do bother checking to see if these succeed or not */</div><div class='ctx'>     i = pcmcia_release_window(local-&gt;amem_handle);</div><div class='del'>-    if ( i != CS_SUCCESS ) DEBUG(0,"ReleaseWindow(local-&gt;amem) ret = %x\n",i);</div><div class='add'>+    if ( i != 0 ) DEBUG(0,"ReleaseWindow(local-&gt;amem) ret = %x\n",i);</div><div class='ctx'>     i = pcmcia_release_window(local-&gt;rmem_handle);</div><div class='del'>-    if ( i != CS_SUCCESS ) DEBUG(0,"ReleaseWindow(local-&gt;rmem) ret = %x\n",i);</div><div class='add'>+    if ( i != 0 ) DEBUG(0,"ReleaseWindow(local-&gt;rmem) ret = %x\n",i);</div><div class='ctx'>     pcmcia_disable_device(link);</div><div class='ctx'> </div><div class='ctx'>     DEBUG(2,"ray_release ending\n");</div><div class='head'>diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c<br/>index 00e965b9da75..2b414899dfa0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/rndis_wlan.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/rndis_wlan.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/rndis_wlan.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/rndis_wlan.c</a></div><div class='hunk'>@@ -1627,7 +1627,6 @@ static int rndis_iw_set_encode_ext(struct net_device *dev,</div><div class='ctx'> static int rndis_iw_set_scan(struct net_device *dev,</div><div class='ctx'>     struct iw_request_info *info, union iwreq_data *wrqu, char *extra)</div><div class='ctx'> {</div><div class='del'>-	struct iw_param *param = &amp;wrqu-&gt;param;</div><div class='ctx'> 	struct usbnet *usbdev = dev-&gt;priv;</div><div class='ctx'> 	union iwreq_data evt;</div><div class='ctx'> 	int ret = -EINVAL;</div><div class='hunk'>@@ -1635,7 +1634,7 @@ static int rndis_iw_set_scan(struct net_device *dev,</div><div class='ctx'> </div><div class='ctx'> 	devdbg(usbdev, "SIOCSIWSCAN");</div><div class='ctx'> </div><div class='del'>-	if (param-&gt;flags == 0) {</div><div class='add'>+	if (wrqu-&gt;data.flags == 0) {</div><div class='ctx'> 		tmp = ccpu2(1);</div><div class='ctx'> 		ret = rndis_set_oid(usbdev, OID_802_11_BSSID_LIST_SCAN, &amp;tmp,</div><div class='ctx'> 								sizeof(tmp));</div><div class='head'>diff --git a/drivers/net/wireless/rt2x00/Kconfig b/drivers/net/wireless/rt2x00/Kconfig<br/>index d485a86bba75..f839ce044afd 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/rt2x00/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/rt2x00/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/rt2x00/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/rt2x00/Kconfig</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='del'>-config RT2X00</div><div class='del'>-	tristate "Ralink driver support"</div><div class='add'>+menuconfig RT2X00</div><div class='add'>+	bool "Ralink driver support"</div><div class='ctx'> 	depends on MAC80211 &amp;&amp; WLAN_80211 &amp;&amp; EXPERIMENTAL</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  This will enable the experimental support for the Ralink drivers,</div><div class='hunk'>@@ -17,31 +17,6 @@ config RT2X00</div><div class='ctx'> </div><div class='ctx'> if RT2X00</div><div class='ctx'> </div><div class='del'>-config RT2X00_LIB</div><div class='del'>-	tristate</div><div class='del'>-</div><div class='del'>-config RT2X00_LIB_PCI</div><div class='del'>-	tristate</div><div class='del'>-	select RT2X00_LIB</div><div class='del'>-</div><div class='del'>-config RT2X00_LIB_USB</div><div class='del'>-	tristate</div><div class='del'>-	select RT2X00_LIB</div><div class='del'>-</div><div class='del'>-config RT2X00_LIB_FIRMWARE</div><div class='del'>-	boolean</div><div class='del'>-	depends on RT2X00_LIB</div><div class='del'>-	select FW_LOADER</div><div class='del'>-</div><div class='del'>-config RT2X00_LIB_RFKILL</div><div class='del'>-	boolean</div><div class='del'>-	depends on RT2X00_LIB</div><div class='del'>-	select RFKILL</div><div class='del'>-</div><div class='del'>-config RT2X00_LIB_LEDS</div><div class='del'>-	boolean</div><div class='del'>-	depends on RT2X00_LIB &amp;&amp; NEW_LEDS</div><div class='del'>-</div><div class='ctx'> config RT2400PCI</div><div class='ctx'> 	tristate "Ralink rt2400 (PCI/PCMCIA) support"</div><div class='ctx'> 	depends on PCI</div><div class='hunk'>@@ -53,23 +28,6 @@ config RT2400PCI</div><div class='ctx'> </div><div class='ctx'> 	  When compiled as a module, this driver will be called "rt2400pci.ko".</div><div class='ctx'> </div><div class='del'>-config RT2400PCI_RFKILL</div><div class='del'>-	bool "Ralink rt2400 rfkill support"</div><div class='del'>-	depends on RT2400PCI</div><div class='del'>-	select RT2X00_LIB_RFKILL</div><div class='del'>-	---help---</div><div class='del'>-	  This adds support for integrated rt2400 hardware that features a</div><div class='del'>-	  hardware button to control the radio state.</div><div class='del'>-	  This feature depends on the RF switch subsystem rfkill.</div><div class='del'>-</div><div class='del'>-config RT2400PCI_LEDS</div><div class='del'>-	bool "Ralink rt2400 leds support"</div><div class='del'>-	depends on RT2400PCI &amp;&amp; NEW_LEDS</div><div class='del'>-	select LEDS_CLASS</div><div class='del'>-	select RT2X00_LIB_LEDS</div><div class='del'>-	---help---</div><div class='del'>-	  This adds support for led triggers provided my mac80211.</div><div class='del'>-</div><div class='ctx'> config RT2500PCI</div><div class='ctx'> 	tristate "Ralink rt2500 (PCI/PCMCIA) support"</div><div class='ctx'> 	depends on PCI</div><div class='hunk'>@@ -81,28 +39,12 @@ config RT2500PCI</div><div class='ctx'> </div><div class='ctx'> 	  When compiled as a module, this driver will be called "rt2500pci.ko".</div><div class='ctx'> </div><div class='del'>-config RT2500PCI_RFKILL</div><div class='del'>-	bool "Ralink rt2500 rfkill support"</div><div class='del'>-	depends on RT2500PCI</div><div class='del'>-	select RT2X00_LIB_RFKILL</div><div class='del'>-	---help---</div><div class='del'>-	  This adds support for integrated rt2500 hardware that features a</div><div class='del'>-	  hardware button to control the radio state.</div><div class='del'>-	  This feature depends on the RF switch subsystem rfkill.</div><div class='del'>-</div><div class='del'>-config RT2500PCI_LEDS</div><div class='del'>-	bool "Ralink rt2500 leds support"</div><div class='del'>-	depends on RT2500PCI &amp;&amp; NEW_LEDS</div><div class='del'>-	select LEDS_CLASS</div><div class='del'>-	select RT2X00_LIB_LEDS</div><div class='del'>-	---help---</div><div class='del'>-	  This adds support for led triggers provided my mac80211.</div><div class='del'>-</div><div class='ctx'> config RT61PCI</div><div class='ctx'> 	tristate "Ralink rt2501/rt61 (PCI/PCMCIA) support"</div><div class='ctx'> 	depends on PCI</div><div class='ctx'> 	select RT2X00_LIB_PCI</div><div class='ctx'> 	select RT2X00_LIB_FIRMWARE</div><div class='add'>+	select RT2X00_LIB_CRYPTO</div><div class='ctx'> 	select CRC_ITU_T</div><div class='ctx'> 	select EEPROM_93CX6</div><div class='ctx'> 	---help---</div><div class='hunk'>@@ -111,23 +53,6 @@ config RT61PCI</div><div class='ctx'> </div><div class='ctx'> 	  When compiled as a module, this driver will be called "rt61pci.ko".</div><div class='ctx'> </div><div class='del'>-config RT61PCI_RFKILL</div><div class='del'>-	bool "Ralink rt2501/rt61 rfkill support"</div><div class='del'>-	depends on RT61PCI</div><div class='del'>-	select RT2X00_LIB_RFKILL</div><div class='del'>-	---help---</div><div class='del'>-	  This adds support for integrated rt61 hardware that features a</div><div class='del'>-	  hardware button to control the radio state.</div><div class='del'>-	  This feature depends on the RF switch subsystem rfkill.</div><div class='del'>-</div><div class='del'>-config RT61PCI_LEDS</div><div class='del'>-	bool "Ralink rt2501/rt61 leds support"</div><div class='del'>-	depends on RT61PCI &amp;&amp; NEW_LEDS</div><div class='del'>-	select LEDS_CLASS</div><div class='del'>-	select RT2X00_LIB_LEDS</div><div class='del'>-	---help---</div><div class='del'>-	  This adds support for led triggers provided my mac80211.</div><div class='del'>-</div><div class='ctx'> config RT2500USB</div><div class='ctx'> 	tristate "Ralink rt2500 (USB) support"</div><div class='ctx'> 	depends on USB</div><div class='hunk'>@@ -138,19 +63,12 @@ config RT2500USB</div><div class='ctx'> </div><div class='ctx'> 	  When compiled as a module, this driver will be called "rt2500usb.ko".</div><div class='ctx'> </div><div class='del'>-config RT2500USB_LEDS</div><div class='del'>-	bool "Ralink rt2500 leds support"</div><div class='del'>-	depends on RT2500USB &amp;&amp; NEW_LEDS</div><div class='del'>-	select LEDS_CLASS</div><div class='del'>-	select RT2X00_LIB_LEDS</div><div class='del'>-	---help---</div><div class='del'>-	  This adds support for led triggers provided my mac80211.</div><div class='del'>-</div><div class='ctx'> config RT73USB</div><div class='ctx'> 	tristate "Ralink rt2501/rt73 (USB) support"</div><div class='ctx'> 	depends on USB</div><div class='ctx'> 	select RT2X00_LIB_USB</div><div class='ctx'> 	select RT2X00_LIB_FIRMWARE</div><div class='add'>+	select RT2X00_LIB_CRYPTO</div><div class='ctx'> 	select CRC_ITU_T</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  This adds support for rt2501 wireless chipset family.</div><div class='hunk'>@@ -158,13 +76,37 @@ config RT73USB</div><div class='ctx'> </div><div class='ctx'> 	  When compiled as a module, this driver will be called "rt73usb.ko".</div><div class='ctx'> </div><div class='del'>-config RT73USB_LEDS</div><div class='del'>-	bool "Ralink rt2501/rt73 leds support"</div><div class='del'>-	depends on RT73USB &amp;&amp; NEW_LEDS</div><div class='del'>-	select LEDS_CLASS</div><div class='del'>-	select RT2X00_LIB_LEDS</div><div class='del'>-	---help---</div><div class='del'>-	  This adds support for led triggers provided my mac80211.</div><div class='add'>+config RT2X00_LIB_PCI</div><div class='add'>+	tristate</div><div class='add'>+	select RT2X00_LIB</div><div class='add'>+</div><div class='add'>+config RT2X00_LIB_USB</div><div class='add'>+	tristate</div><div class='add'>+	select RT2X00_LIB</div><div class='add'>+</div><div class='add'>+config RT2X00_LIB</div><div class='add'>+	tristate</div><div class='add'>+</div><div class='add'>+config RT2X00_LIB_FIRMWARE</div><div class='add'>+	boolean</div><div class='add'>+	select FW_LOADER</div><div class='add'>+</div><div class='add'>+config RT2X00_LIB_CRYPTO</div><div class='add'>+	boolean</div><div class='add'>+</div><div class='add'>+config RT2X00_LIB_RFKILL</div><div class='add'>+	boolean</div><div class='add'>+	default y if (RT2X00_LIB=y &amp;&amp; RFKILL=y) || (RT2X00_LIB=m &amp;&amp; RFKILL!=n)</div><div class='add'>+</div><div class='add'>+comment "rt2x00 rfkill support disabled due to modularized RFKILL and built-in rt2x00"</div><div class='add'>+	depends on RT2X00_LIB=y &amp;&amp; RFKILL=m</div><div class='add'>+</div><div class='add'>+config RT2X00_LIB_LEDS</div><div class='add'>+	boolean</div><div class='add'>+	default y if (RT2X00_LIB=y &amp;&amp; LEDS_CLASS=y) || (RT2X00_LIB=m &amp;&amp; LEDS_CLASS!=n)</div><div class='add'>+</div><div class='add'>+comment "rt2x00 leds support disabled due to modularized LEDS_CLASS and built-in rt2x00"</div><div class='add'>+	depends on RT2X00_LIB=y &amp;&amp; LEDS_CLASS=m</div><div class='ctx'> </div><div class='ctx'> config RT2X00_LIB_DEBUGFS</div><div class='ctx'> 	bool "Ralink debugfs support"</div><div class='head'>diff --git a/drivers/net/wireless/rt2x00/Makefile b/drivers/net/wireless/rt2x00/Makefile<br/>index 1087dbcf1a04..917cb4f3b038 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/rt2x00/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/rt2x00/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/rt2x00/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/rt2x00/Makefile</a></div><div class='hunk'>@@ -3,6 +3,7 @@ rt2x00lib-y				+= rt2x00mac.o</div><div class='ctx'> rt2x00lib-y				+= rt2x00config.o</div><div class='ctx'> rt2x00lib-y				+= rt2x00queue.o</div><div class='ctx'> rt2x00lib-$(CONFIG_RT2X00_LIB_DEBUGFS)	+= rt2x00debug.o</div><div class='add'>+rt2x00lib-$(CONFIG_RT2X00_LIB_CRYPTO)	+= rt2x00crypto.o</div><div class='ctx'> rt2x00lib-$(CONFIG_RT2X00_LIB_RFKILL)	+= rt2x00rfkill.o</div><div class='ctx'> rt2x00lib-$(CONFIG_RT2X00_LIB_FIRMWARE)	+= rt2x00firmware.o</div><div class='ctx'> rt2x00lib-$(CONFIG_RT2X00_LIB_LEDS)	+= rt2x00leds.o</div><div class='head'>diff --git a/drivers/net/wireless/rt2x00/rt2400pci.c b/drivers/net/wireless/rt2x00/rt2400pci.c<br/>index 4c0538d6099b..08cb9eec16a6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/rt2x00/rt2400pci.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/rt2x00/rt2400pci.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/rt2x00/rt2400pci.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/rt2x00/rt2400pci.c</a></div><div class='hunk'>@@ -231,7 +231,7 @@ static const struct rt2x00debug rt2400pci_rt2x00debug = {</div><div class='ctx'> };</div><div class='ctx'> #endif /* CONFIG_RT2X00_LIB_DEBUGFS */</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_RT2400PCI_RFKILL</div><div class='add'>+#ifdef CONFIG_RT2X00_LIB_RFKILL</div><div class='ctx'> static int rt2400pci_rfkill_poll(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> {</div><div class='ctx'> 	u32 reg;</div><div class='hunk'>@@ -241,9 +241,9 @@ static int rt2400pci_rfkill_poll(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='ctx'> #define rt2400pci_rfkill_poll	NULL</div><div class='del'>-#endif /* CONFIG_RT2400PCI_RFKILL */</div><div class='add'>+#endif /* CONFIG_RT2X00_LIB_RFKILL */</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_RT2400PCI_LEDS</div><div class='add'>+#ifdef CONFIG_RT2X00_LIB_LEDS</div><div class='ctx'> static void rt2400pci_brightness_set(struct led_classdev *led_cdev,</div><div class='ctx'> 				     enum led_brightness brightness)</div><div class='ctx'> {</div><div class='hunk'>@@ -288,7 +288,7 @@ static void rt2400pci_init_led(struct rt2x00_dev *rt2x00dev,</div><div class='ctx'> 	led-&gt;led_dev.blink_set = rt2400pci_blink_set;</div><div class='ctx'> 	led-&gt;flags = LED_INITIALIZED;</div><div class='ctx'> }</div><div class='del'>-#endif /* CONFIG_RT2400PCI_LEDS */</div><div class='add'>+#endif /* CONFIG_RT2X00_LIB_LEDS */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Configuration handlers.</div><div class='hunk'>@@ -1241,7 +1241,7 @@ static irqreturn_t rt2400pci_interrupt(int irq, void *dev_instance)</div><div class='ctx'> 	if (!reg)</div><div class='ctx'> 		return IRQ_NONE;</div><div class='ctx'> </div><div class='del'>-	if (!test_bit(DEVICE_ENABLED_RADIO, &amp;rt2x00dev-&gt;flags))</div><div class='add'>+	if (!test_bit(DEVICE_STATE_ENABLED_RADIO, &amp;rt2x00dev-&gt;flags))</div><div class='ctx'> 		return IRQ_HANDLED;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1374,22 +1374,22 @@ static int rt2400pci_init_eeprom(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Store led mode, for correct led behaviour.</div><div class='ctx'> 	 */</div><div class='del'>-#ifdef CONFIG_RT2400PCI_LEDS</div><div class='add'>+#ifdef CONFIG_RT2X00_LIB_LEDS</div><div class='ctx'> 	value = rt2x00_get_field16(eeprom, EEPROM_ANTENNA_LED_MODE);</div><div class='ctx'> </div><div class='ctx'> 	rt2400pci_init_led(rt2x00dev, &amp;rt2x00dev-&gt;led_radio, LED_TYPE_RADIO);</div><div class='ctx'> 	if (value == LED_MODE_TXRX_ACTIVITY)</div><div class='ctx'> 		rt2400pci_init_led(rt2x00dev, &amp;rt2x00dev-&gt;led_qual,</div><div class='ctx'> 				   LED_TYPE_ACTIVITY);</div><div class='del'>-#endif /* CONFIG_RT2400PCI_LEDS */</div><div class='add'>+#endif /* CONFIG_RT2X00_LIB_LEDS */</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Detect if this device has an hardware controlled radio.</div><div class='ctx'> 	 */</div><div class='del'>-#ifdef CONFIG_RT2400PCI_RFKILL</div><div class='add'>+#ifdef CONFIG_RT2X00_LIB_RFKILL</div><div class='ctx'> 	if (rt2x00_get_field16(eeprom, EEPROM_ANTENNA_HARDWARE_RADIO))</div><div class='ctx'> 		__set_bit(CONFIG_SUPPORT_HW_BUTTON, &amp;rt2x00dev-&gt;flags);</div><div class='del'>-#endif /* CONFIG_RT2400PCI_RFKILL */</div><div class='add'>+#endif /* CONFIG_RT2X00_LIB_RFKILL */</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Check if the BBP tuning should be enabled.</div><div class='hunk'>@@ -1404,7 +1404,7 @@ static int rt2400pci_init_eeprom(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'>  * RF value list for RF2420 &amp; RF2421</div><div class='ctx'>  * Supports: 2.4 GHz</div><div class='ctx'>  */</div><div class='del'>-static const struct rf_channel rf_vals_bg[] = {</div><div class='add'>+static const struct rf_channel rf_vals_b[] = {</div><div class='ctx'> 	{ 1,  0x00022058, 0x000c1fda, 0x00000101, 0 },</div><div class='ctx'> 	{ 2,  0x00022058, 0x000c1fee, 0x00000101, 0 },</div><div class='ctx'> 	{ 3,  0x00022058, 0x000c2002, 0x00000101, 0 },</div><div class='hunk'>@@ -1421,10 +1421,11 @@ static const struct rf_channel rf_vals_bg[] = {</div><div class='ctx'> 	{ 14, 0x00022058, 0x000c20fa, 0x00000101, 0 },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void rt2400pci_probe_hw_mode(struct rt2x00_dev *rt2x00dev)</div><div class='add'>+static int rt2400pci_probe_hw_mode(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct hw_mode_spec *spec = &amp;rt2x00dev-&gt;spec;</div><div class='del'>-	u8 *txpower;</div><div class='add'>+	struct channel_info *info;</div><div class='add'>+	char *tx_power;</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1440,23 +1441,28 @@ static void rt2400pci_probe_hw_mode(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> 						   EEPROM_MAC_ADDR_0));</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Convert tx_power array in eeprom.</div><div class='del'>-	 */</div><div class='del'>-	txpower = rt2x00_eeprom_addr(rt2x00dev, EEPROM_TXPOWER_START);</div><div class='del'>-	for (i = 0; i &lt; 14; i++)</div><div class='del'>-		txpower[i] = TXPOWER_FROM_DEV(txpower[i]);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='ctx'> 	 * Initialize hw_mode information.</div><div class='ctx'> 	 */</div><div class='ctx'> 	spec-&gt;supported_bands = SUPPORT_BAND_2GHZ;</div><div class='ctx'> 	spec-&gt;supported_rates = SUPPORT_RATE_CCK;</div><div class='del'>-	spec-&gt;tx_power_a = NULL;</div><div class='del'>-	spec-&gt;tx_power_bg = txpower;</div><div class='del'>-	spec-&gt;tx_power_default = DEFAULT_TXPOWER;</div><div class='ctx'> </div><div class='del'>-	spec-&gt;num_channels = ARRAY_SIZE(rf_vals_bg);</div><div class='del'>-	spec-&gt;channels = rf_vals_bg;</div><div class='add'>+	spec-&gt;num_channels = ARRAY_SIZE(rf_vals_b);</div><div class='add'>+	spec-&gt;channels = rf_vals_b;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Create channel information array</div><div class='add'>+	 */</div><div class='add'>+	info = kzalloc(spec-&gt;num_channels * sizeof(*info), GFP_KERNEL);</div><div class='add'>+	if (!info)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	spec-&gt;channels_info = info;</div><div class='add'>+</div><div class='add'>+	tx_power = rt2x00_eeprom_addr(rt2x00dev, EEPROM_TXPOWER_START);</div><div class='add'>+	for (i = 0; i &lt; 14; i++)</div><div class='add'>+		info[i].tx_power1 = TXPOWER_FROM_DEV(tx_power[i]);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int rt2400pci_probe_hw(struct rt2x00_dev *rt2x00dev)</div><div class='hunk'>@@ -1477,7 +1483,9 @@ static int rt2400pci_probe_hw(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Initialize hw specifications.</div><div class='ctx'> 	 */</div><div class='del'>-	rt2400pci_probe_hw_mode(rt2x00dev);</div><div class='add'>+	retval = rt2400pci_probe_hw_mode(rt2x00dev);</div><div class='add'>+	if (retval)</div><div class='add'>+		return retval;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * This device requires the atim queue and DMA-mapped skbs.</div><div class='head'>diff --git a/drivers/net/wireless/rt2x00/rt2400pci.h b/drivers/net/wireless/rt2x00/rt2400pci.h<br/>index bc5564258228..bbff381ce396 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/rt2x00/rt2400pci.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/rt2x00/rt2400pci.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/rt2x00/rt2400pci.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/rt2x00/rt2400pci.h</a></div><div class='hunk'>@@ -938,19 +938,13 @@</div><div class='ctx'> #define MAX_TXPOWER	62</div><div class='ctx'> #define DEFAULT_TXPOWER	39</div><div class='ctx'> </div><div class='del'>-#define TXPOWER_FROM_DEV(__txpower)					\</div><div class='del'>-({									\</div><div class='del'>-	((__txpower) &gt; MAX_TXPOWER) ? DEFAULT_TXPOWER - MIN_TXPOWER :	\</div><div class='del'>-	((__txpower) &lt; MIN_TXPOWER) ? DEFAULT_TXPOWER - MIN_TXPOWER :	\</div><div class='del'>-	(((__txpower) - MAX_TXPOWER) + MIN_TXPOWER);			\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-#define TXPOWER_TO_DEV(__txpower)			\</div><div class='del'>-({							\</div><div class='del'>-	(__txpower) += MIN_TXPOWER;			\</div><div class='del'>-	((__txpower) &lt;= MIN_TXPOWER) ? MAX_TXPOWER :	\</div><div class='del'>-	(((__txpower) &gt;= MAX_TXPOWER) ? MIN_TXPOWER :	\</div><div class='del'>-	(MAX_TXPOWER - ((__txpower) - MIN_TXPOWER)));	\</div><div class='del'>-})</div><div class='add'>+#define __CLAMP_TX(__txpower) \</div><div class='add'>+	clamp_t(char, (__txpower), MIN_TXPOWER, MAX_TXPOWER)</div><div class='add'>+</div><div class='add'>+#define TXPOWER_FROM_DEV(__txpower) \</div><div class='add'>+	((__CLAMP_TX(__txpower) - MAX_TXPOWER) + MIN_TXPOWER)</div><div class='add'>+</div><div class='add'>+#define TXPOWER_TO_DEV(__txpower) \</div><div class='add'>+	MAX_TXPOWER - (__CLAMP_TX(__txpower) - MIN_TXPOWER)</div><div class='ctx'> </div><div class='ctx'> #endif /* RT2400PCI_H */</div><div class='head'>diff --git a/drivers/net/wireless/rt2x00/rt2500pci.c b/drivers/net/wireless/rt2x00/rt2500pci.c<br/>index 181a146b4768..ef42cc04a2d7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/rt2x00/rt2500pci.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/rt2x00/rt2500pci.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/rt2x00/rt2500pci.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/rt2x00/rt2500pci.c</a></div><div class='hunk'>@@ -231,7 +231,7 @@ static const struct rt2x00debug rt2500pci_rt2x00debug = {</div><div class='ctx'> };</div><div class='ctx'> #endif /* CONFIG_RT2X00_LIB_DEBUGFS */</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_RT2500PCI_RFKILL</div><div class='add'>+#ifdef CONFIG_RT2X00_LIB_RFKILL</div><div class='ctx'> static int rt2500pci_rfkill_poll(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> {</div><div class='ctx'> 	u32 reg;</div><div class='hunk'>@@ -241,9 +241,9 @@ static int rt2500pci_rfkill_poll(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='ctx'> #define rt2500pci_rfkill_poll	NULL</div><div class='del'>-#endif /* CONFIG_RT2500PCI_RFKILL */</div><div class='add'>+#endif /* CONFIG_RT2X00_LIB_RFKILL */</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_RT2500PCI_LEDS</div><div class='add'>+#ifdef CONFIG_RT2X00_LIB_LEDS</div><div class='ctx'> static void rt2500pci_brightness_set(struct led_classdev *led_cdev,</div><div class='ctx'> 				     enum led_brightness brightness)</div><div class='ctx'> {</div><div class='hunk'>@@ -288,7 +288,7 @@ static void rt2500pci_init_led(struct rt2x00_dev *rt2x00dev,</div><div class='ctx'> 	led-&gt;led_dev.blink_set = rt2500pci_blink_set;</div><div class='ctx'> 	led-&gt;flags = LED_INITIALIZED;</div><div class='ctx'> }</div><div class='del'>-#endif /* CONFIG_RT2500PCI_LEDS */</div><div class='add'>+#endif /* CONFIG_RT2X00_LIB_LEDS */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Configuration handlers.</div><div class='hunk'>@@ -1316,6 +1316,8 @@ static void rt2500pci_fill_rxdone(struct queue_entry *entry,</div><div class='ctx'> </div><div class='ctx'> 	if (rt2x00_get_field32(word0, RXD_W0_OFDM))</div><div class='ctx'> 		rxdesc-&gt;dev_flags |= RXDONE_SIGNAL_PLCP;</div><div class='add'>+	else</div><div class='add'>+		rxdesc-&gt;dev_flags |= RXDONE_SIGNAL_BITRATE;</div><div class='ctx'> 	if (rt2x00_get_field32(word0, RXD_W0_MY_BSS))</div><div class='ctx'> 		rxdesc-&gt;dev_flags |= RXDONE_MY_BSS;</div><div class='ctx'> }</div><div class='hunk'>@@ -1377,7 +1379,7 @@ static irqreturn_t rt2500pci_interrupt(int irq, void *dev_instance)</div><div class='ctx'> 	if (!reg)</div><div class='ctx'> 		return IRQ_NONE;</div><div class='ctx'> </div><div class='del'>-	if (!test_bit(DEVICE_ENABLED_RADIO, &amp;rt2x00dev-&gt;flags))</div><div class='add'>+	if (!test_bit(DEVICE_STATE_ENABLED_RADIO, &amp;rt2x00dev-&gt;flags))</div><div class='ctx'> 		return IRQ_HANDLED;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1531,22 +1533,22 @@ static int rt2500pci_init_eeprom(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Store led mode, for correct led behaviour.</div><div class='ctx'> 	 */</div><div class='del'>-#ifdef CONFIG_RT2500PCI_LEDS</div><div class='add'>+#ifdef CONFIG_RT2X00_LIB_LEDS</div><div class='ctx'> 	value = rt2x00_get_field16(eeprom, EEPROM_ANTENNA_LED_MODE);</div><div class='ctx'> </div><div class='ctx'> 	rt2500pci_init_led(rt2x00dev, &amp;rt2x00dev-&gt;led_radio, LED_TYPE_RADIO);</div><div class='ctx'> 	if (value == LED_MODE_TXRX_ACTIVITY)</div><div class='ctx'> 		rt2500pci_init_led(rt2x00dev, &amp;rt2x00dev-&gt;led_qual,</div><div class='ctx'> 				   LED_TYPE_ACTIVITY);</div><div class='del'>-#endif /* CONFIG_RT2500PCI_LEDS */</div><div class='add'>+#endif /* CONFIG_RT2X00_LIB_LEDS */</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Detect if this device has an hardware controlled radio.</div><div class='ctx'> 	 */</div><div class='del'>-#ifdef CONFIG_RT2500PCI_RFKILL</div><div class='add'>+#ifdef CONFIG_RT2X00_LIB_RFKILL</div><div class='ctx'> 	if (rt2x00_get_field16(eeprom, EEPROM_ANTENNA_HARDWARE_RADIO))</div><div class='ctx'> 		__set_bit(CONFIG_SUPPORT_HW_BUTTON, &amp;rt2x00dev-&gt;flags);</div><div class='del'>-#endif /* CONFIG_RT2500PCI_RFKILL */</div><div class='add'>+#endif /* CONFIG_RT2X00_LIB_RFKILL */</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Check if the BBP tuning should be enabled.</div><div class='hunk'>@@ -1721,10 +1723,11 @@ static const struct rf_channel rf_vals_5222[] = {</div><div class='ctx'> 	{ 161, 0x00022020, 0x000090be, 0x00000101, 0x00000a07 },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void rt2500pci_probe_hw_mode(struct rt2x00_dev *rt2x00dev)</div><div class='add'>+static int rt2500pci_probe_hw_mode(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct hw_mode_spec *spec = &amp;rt2x00dev-&gt;spec;</div><div class='del'>-	u8 *txpower;</div><div class='add'>+	struct channel_info *info;</div><div class='add'>+	char *tx_power;</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1741,20 +1744,10 @@ static void rt2500pci_probe_hw_mode(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> 						   EEPROM_MAC_ADDR_0));</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Convert tx_power array in eeprom.</div><div class='del'>-	 */</div><div class='del'>-	txpower = rt2x00_eeprom_addr(rt2x00dev, EEPROM_TXPOWER_START);</div><div class='del'>-	for (i = 0; i &lt; 14; i++)</div><div class='del'>-		txpower[i] = TXPOWER_FROM_DEV(txpower[i]);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='ctx'> 	 * Initialize hw_mode information.</div><div class='ctx'> 	 */</div><div class='ctx'> 	spec-&gt;supported_bands = SUPPORT_BAND_2GHZ;</div><div class='ctx'> 	spec-&gt;supported_rates = SUPPORT_RATE_CCK | SUPPORT_RATE_OFDM;</div><div class='del'>-	spec-&gt;tx_power_a = NULL;</div><div class='del'>-	spec-&gt;tx_power_bg = txpower;</div><div class='del'>-	spec-&gt;tx_power_default = DEFAULT_TXPOWER;</div><div class='ctx'> </div><div class='ctx'> 	if (rt2x00_rf(&amp;rt2x00dev-&gt;chip, RF2522)) {</div><div class='ctx'> 		spec-&gt;num_channels = ARRAY_SIZE(rf_vals_bg_2522);</div><div class='hunk'>@@ -1776,6 +1769,26 @@ static void rt2500pci_probe_hw_mode(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> 		spec-&gt;num_channels = ARRAY_SIZE(rf_vals_5222);</div><div class='ctx'> 		spec-&gt;channels = rf_vals_5222;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Create channel information array</div><div class='add'>+	 */</div><div class='add'>+	info = kzalloc(spec-&gt;num_channels * sizeof(*info), GFP_KERNEL);</div><div class='add'>+	if (!info)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	spec-&gt;channels_info = info;</div><div class='add'>+</div><div class='add'>+	tx_power = rt2x00_eeprom_addr(rt2x00dev, EEPROM_TXPOWER_START);</div><div class='add'>+	for (i = 0; i &lt; 14; i++)</div><div class='add'>+		info[i].tx_power1 = TXPOWER_FROM_DEV(tx_power[i]);</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;num_channels &gt; 14) {</div><div class='add'>+		for (i = 14; i &lt; spec-&gt;num_channels; i++)</div><div class='add'>+			info[i].tx_power1 = DEFAULT_TXPOWER;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int rt2500pci_probe_hw(struct rt2x00_dev *rt2x00dev)</div><div class='hunk'>@@ -1796,7 +1809,9 @@ static int rt2500pci_probe_hw(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Initialize hw specifications.</div><div class='ctx'> 	 */</div><div class='del'>-	rt2500pci_probe_hw_mode(rt2x00dev);</div><div class='add'>+	retval = rt2500pci_probe_hw_mode(rt2x00dev);</div><div class='add'>+	if (retval)</div><div class='add'>+		return retval;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * This device requires the atim queue and DMA-mapped skbs.</div><div class='head'>diff --git a/drivers/net/wireless/rt2x00/rt2500pci.h b/drivers/net/wireless/rt2x00/rt2500pci.h<br/>index 42f376929ea9..8c26bef6cf49 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/rt2x00/rt2500pci.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/rt2x00/rt2500pci.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/rt2x00/rt2500pci.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/rt2x00/rt2500pci.h</a></div><div class='hunk'>@@ -1223,17 +1223,10 @@</div><div class='ctx'> #define MAX_TXPOWER	31</div><div class='ctx'> #define DEFAULT_TXPOWER	24</div><div class='ctx'> </div><div class='del'>-#define TXPOWER_FROM_DEV(__txpower)		\</div><div class='del'>-({						\</div><div class='del'>-	((__txpower) &gt; MAX_TXPOWER) ?		\</div><div class='del'>-		DEFAULT_TXPOWER : (__txpower);	\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-#define TXPOWER_TO_DEV(__txpower)			\</div><div class='del'>-({							\</div><div class='del'>-	((__txpower) &lt;= MIN_TXPOWER) ? MIN_TXPOWER :	\</div><div class='del'>-	(((__txpower) &gt;= MAX_TXPOWER) ? MAX_TXPOWER :	\</div><div class='del'>-	(__txpower));					\</div><div class='del'>-})</div><div class='add'>+#define TXPOWER_FROM_DEV(__txpower) \</div><div class='add'>+	(((u8)(__txpower)) &gt; MAX_TXPOWER) ? DEFAULT_TXPOWER : (__txpower)</div><div class='add'>+</div><div class='add'>+#define TXPOWER_TO_DEV(__txpower) \</div><div class='add'>+	clamp_t(char, __txpower, MIN_TXPOWER, MAX_TXPOWER)</div><div class='ctx'> </div><div class='ctx'> #endif /* RT2500PCI_H */</div><div class='head'>diff --git a/drivers/net/wireless/rt2x00/rt2500usb.c b/drivers/net/wireless/rt2x00/rt2500usb.c<br/>index cd5af656932d..d3bf7bba611a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/rt2x00/rt2500usb.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/rt2x00/rt2500usb.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/rt2x00/rt2500usb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/rt2x00/rt2500usb.c</a></div><div class='hunk'>@@ -288,7 +288,7 @@ static const struct rt2x00debug rt2500usb_rt2x00debug = {</div><div class='ctx'> };</div><div class='ctx'> #endif /* CONFIG_RT2X00_LIB_DEBUGFS */</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_RT2500USB_LEDS</div><div class='add'>+#ifdef CONFIG_RT2X00_LIB_LEDS</div><div class='ctx'> static void rt2500usb_brightness_set(struct led_classdev *led_cdev,</div><div class='ctx'> 				     enum led_brightness brightness)</div><div class='ctx'> {</div><div class='hunk'>@@ -333,7 +333,7 @@ static void rt2500usb_init_led(struct rt2x00_dev *rt2x00dev,</div><div class='ctx'> 	led-&gt;led_dev.blink_set = rt2500usb_blink_set;</div><div class='ctx'> 	led-&gt;flags = LED_INITIALIZED;</div><div class='ctx'> }</div><div class='del'>-#endif /* CONFIG_RT2500USB_LEDS */</div><div class='add'>+#endif /* CONFIG_RT2X00_LIB_LEDS */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Configuration handlers.</div><div class='hunk'>@@ -384,7 +384,7 @@ static void rt2500usb_config_intf(struct rt2x00_dev *rt2x00dev,</div><div class='ctx'> 		rt2500usb_register_read(rt2x00dev, TXRX_CSR20, &amp;reg);</div><div class='ctx'> 		rt2x00_set_field16(&amp;reg, TXRX_CSR20_OFFSET, bcn_preload &gt;&gt; 6);</div><div class='ctx'> 		rt2x00_set_field16(&amp;reg, TXRX_CSR20_BCN_EXPECT_WINDOW,</div><div class='del'>-				   2 * (conf-&gt;type != IEEE80211_IF_TYPE_STA));</div><div class='add'>+				   2 * (conf-&gt;type != NL80211_IFTYPE_STATION));</div><div class='ctx'> 		rt2500usb_register_write(rt2x00dev, TXRX_CSR20, reg);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='hunk'>@@ -1114,8 +1114,7 @@ static void rt2500usb_write_tx_desc(struct rt2x00_dev *rt2x00dev,</div><div class='ctx'> 	rt2x00_set_field32(&amp;word, TXD_W0_NEW_SEQ,</div><div class='ctx'> 			   test_bit(ENTRY_TXD_FIRST_FRAGMENT, &amp;txdesc-&gt;flags));</div><div class='ctx'> 	rt2x00_set_field32(&amp;word, TXD_W0_IFS, txdesc-&gt;ifs);</div><div class='del'>-	rt2x00_set_field32(&amp;word, TXD_W0_DATABYTE_COUNT,</div><div class='del'>-			   skb-&gt;len - skbdesc-&gt;desc_len);</div><div class='add'>+	rt2x00_set_field32(&amp;word, TXD_W0_DATABYTE_COUNT, skb-&gt;len);</div><div class='ctx'> 	rt2x00_set_field32(&amp;word, TXD_W0_CIPHER, CIPHER_NONE);</div><div class='ctx'> 	rt2x00_desc_write(txd, 0, word);</div><div class='ctx'> }</div><div class='hunk'>@@ -1134,7 +1133,6 @@ static void rt2500usb_write_beacon(struct queue_entry *entry)</div><div class='ctx'> 	int pipe = usb_sndbulkpipe(usb_dev, 1);</div><div class='ctx'> 	int length;</div><div class='ctx'> 	u16 reg;</div><div class='del'>-	u32 word, len;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Add the descriptor in front of the skb.</div><div class='hunk'>@@ -1144,17 +1142,6 @@ static void rt2500usb_write_beacon(struct queue_entry *entry)</div><div class='ctx'> 	skbdesc-&gt;desc = entry-&gt;skb-&gt;data;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Adjust the beacon databyte count. The current number is</div><div class='del'>-	 * calculated before this function gets called, but falsely</div><div class='del'>-	 * assumes that the descriptor was already present in the SKB.</div><div class='del'>-	 */</div><div class='del'>-	rt2x00_desc_read(skbdesc-&gt;desc, 0, &amp;word);</div><div class='del'>-	len  = rt2x00_get_field32(word, TXD_W0_DATABYTE_COUNT);</div><div class='del'>-	len += skbdesc-&gt;desc_len;</div><div class='del'>-	rt2x00_set_field32(&amp;word, TXD_W0_DATABYTE_COUNT, len);</div><div class='del'>-	rt2x00_desc_write(skbdesc-&gt;desc, 0, word);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='ctx'> 	 * Disable beaconing while we are reloading the beacon data,</div><div class='ctx'> 	 * otherwise we might be sending out invalid data.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -1280,6 +1267,8 @@ static void rt2500usb_fill_rxdone(struct queue_entry *entry,</div><div class='ctx'> </div><div class='ctx'> 	if (rt2x00_get_field32(word0, RXD_W0_OFDM))</div><div class='ctx'> 		rxdesc-&gt;dev_flags |= RXDONE_SIGNAL_PLCP;</div><div class='add'>+	else</div><div class='add'>+		rxdesc-&gt;dev_flags |= RXDONE_SIGNAL_BITRATE;</div><div class='ctx'> 	if (rt2x00_get_field32(word0, RXD_W0_MY_BSS))</div><div class='ctx'> 		rxdesc-&gt;dev_flags |= RXDONE_MY_BSS;</div><div class='ctx'> </div><div class='hunk'>@@ -1297,7 +1286,7 @@ static void rt2500usb_beacondone(struct urb *urb)</div><div class='ctx'> 	struct queue_entry *entry = (struct queue_entry *)urb-&gt;context;</div><div class='ctx'> 	struct queue_entry_priv_usb_bcn *bcn_priv = entry-&gt;priv_data;</div><div class='ctx'> </div><div class='del'>-	if (!test_bit(DEVICE_ENABLED_RADIO, &amp;entry-&gt;queue-&gt;rt2x00dev-&gt;flags))</div><div class='add'>+	if (!test_bit(DEVICE_STATE_ENABLED_RADIO, &amp;entry-&gt;queue-&gt;rt2x00dev-&gt;flags))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1484,14 +1473,14 @@ static int rt2500usb_init_eeprom(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Store led mode, for correct led behaviour.</div><div class='ctx'> 	 */</div><div class='del'>-#ifdef CONFIG_RT2500USB_LEDS</div><div class='add'>+#ifdef CONFIG_RT2X00_LIB_LEDS</div><div class='ctx'> 	value = rt2x00_get_field16(eeprom, EEPROM_ANTENNA_LED_MODE);</div><div class='ctx'> </div><div class='ctx'> 	rt2500usb_init_led(rt2x00dev, &amp;rt2x00dev-&gt;led_radio, LED_TYPE_RADIO);</div><div class='ctx'> 	if (value == LED_MODE_TXRX_ACTIVITY)</div><div class='ctx'> 		rt2500usb_init_led(rt2x00dev, &amp;rt2x00dev-&gt;led_qual,</div><div class='ctx'> 				   LED_TYPE_ACTIVITY);</div><div class='del'>-#endif /* CONFIG_RT2500USB_LEDS */</div><div class='add'>+#endif /* CONFIG_RT2X00_LIB_LEDS */</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Check if the BBP tuning should be disabled.</div><div class='hunk'>@@ -1665,10 +1654,11 @@ static const struct rf_channel rf_vals_5222[] = {</div><div class='ctx'> 	{ 161, 0x00022020, 0x000090be, 0x00000101, 0x00000a07 },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void rt2500usb_probe_hw_mode(struct rt2x00_dev *rt2x00dev)</div><div class='add'>+static int rt2500usb_probe_hw_mode(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct hw_mode_spec *spec = &amp;rt2x00dev-&gt;spec;</div><div class='del'>-	u8 *txpower;</div><div class='add'>+	struct channel_info *info;</div><div class='add'>+	char *tx_power;</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1687,20 +1677,10 @@ static void rt2500usb_probe_hw_mode(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> 						   EEPROM_MAC_ADDR_0));</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Convert tx_power array in eeprom.</div><div class='del'>-	 */</div><div class='del'>-	txpower = rt2x00_eeprom_addr(rt2x00dev, EEPROM_TXPOWER_START);</div><div class='del'>-	for (i = 0; i &lt; 14; i++)</div><div class='del'>-		txpower[i] = TXPOWER_FROM_DEV(txpower[i]);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='ctx'> 	 * Initialize hw_mode information.</div><div class='ctx'> 	 */</div><div class='ctx'> 	spec-&gt;supported_bands = SUPPORT_BAND_2GHZ;</div><div class='ctx'> 	spec-&gt;supported_rates = SUPPORT_RATE_CCK | SUPPORT_RATE_OFDM;</div><div class='del'>-	spec-&gt;tx_power_a = NULL;</div><div class='del'>-	spec-&gt;tx_power_bg = txpower;</div><div class='del'>-	spec-&gt;tx_power_default = DEFAULT_TXPOWER;</div><div class='ctx'> </div><div class='ctx'> 	if (rt2x00_rf(&amp;rt2x00dev-&gt;chip, RF2522)) {</div><div class='ctx'> 		spec-&gt;num_channels = ARRAY_SIZE(rf_vals_bg_2522);</div><div class='hunk'>@@ -1722,6 +1702,26 @@ static void rt2500usb_probe_hw_mode(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> 		spec-&gt;num_channels = ARRAY_SIZE(rf_vals_5222);</div><div class='ctx'> 		spec-&gt;channels = rf_vals_5222;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Create channel information array</div><div class='add'>+	 */</div><div class='add'>+	info = kzalloc(spec-&gt;num_channels * sizeof(*info), GFP_KERNEL);</div><div class='add'>+	if (!info)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	spec-&gt;channels_info = info;</div><div class='add'>+</div><div class='add'>+	tx_power = rt2x00_eeprom_addr(rt2x00dev, EEPROM_TXPOWER_START);</div><div class='add'>+	for (i = 0; i &lt; 14; i++)</div><div class='add'>+		info[i].tx_power1 = TXPOWER_FROM_DEV(tx_power[i]);</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;num_channels &gt; 14) {</div><div class='add'>+		for (i = 14; i &lt; spec-&gt;num_channels; i++)</div><div class='add'>+			info[i].tx_power1 = DEFAULT_TXPOWER;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int rt2500usb_probe_hw(struct rt2x00_dev *rt2x00dev)</div><div class='hunk'>@@ -1742,7 +1742,9 @@ static int rt2500usb_probe_hw(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Initialize hw specifications.</div><div class='ctx'> 	 */</div><div class='del'>-	rt2500usb_probe_hw_mode(rt2x00dev);</div><div class='add'>+	retval = rt2500usb_probe_hw_mode(rt2x00dev);</div><div class='add'>+	if (retval)</div><div class='add'>+		return retval;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * This device requires the atim queue</div><div class='head'>diff --git a/drivers/net/wireless/rt2x00/rt2500usb.h b/drivers/net/wireless/rt2x00/rt2500usb.h<br/>index 4769ffeb4cc6..89e5ed24e4f7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/rt2x00/rt2500usb.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/rt2x00/rt2500usb.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/rt2x00/rt2500usb.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/rt2x00/rt2500usb.h</a></div><div class='hunk'>@@ -825,17 +825,10 @@</div><div class='ctx'> #define MAX_TXPOWER	31</div><div class='ctx'> #define DEFAULT_TXPOWER	24</div><div class='ctx'> </div><div class='del'>-#define TXPOWER_FROM_DEV(__txpower)		\</div><div class='del'>-({						\</div><div class='del'>-	((__txpower) &gt; MAX_TXPOWER) ?		\</div><div class='del'>-		DEFAULT_TXPOWER : (__txpower);	\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-#define TXPOWER_TO_DEV(__txpower)			\</div><div class='del'>-({							\</div><div class='del'>-	((__txpower) &lt;= MIN_TXPOWER) ? MIN_TXPOWER :	\</div><div class='del'>-	(((__txpower) &gt;= MAX_TXPOWER) ? MAX_TXPOWER :	\</div><div class='del'>-	(__txpower));					\</div><div class='del'>-})</div><div class='add'>+#define TXPOWER_FROM_DEV(__txpower) \</div><div class='add'>+	(((u8)(__txpower)) &gt; MAX_TXPOWER) ? DEFAULT_TXPOWER : (__txpower)</div><div class='add'>+</div><div class='add'>+#define TXPOWER_TO_DEV(__txpower) \</div><div class='add'>+	clamp_t(char, __txpower, MIN_TXPOWER, MAX_TXPOWER)</div><div class='ctx'> </div><div class='ctx'> #endif /* RT2500USB_H */</div><div class='head'>diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h<br/>index 8b10ea41b204..1359a3768404 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/rt2x00/rt2x00.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/rt2x00/rt2x00.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/rt2x00/rt2x00.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/rt2x00/rt2x00.h</a></div><div class='hunk'>@@ -44,7 +44,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Module information.</div><div class='ctx'>  */</div><div class='del'>-#define DRV_VERSION	"2.1.8"</div><div class='add'>+#define DRV_VERSION	"2.2.1"</div><div class='ctx'> #define DRV_PROJECT	"http://rt2x00.serialmonkey.com"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -53,11 +53,11 @@</div><div class='ctx'>  */</div><div class='ctx'> #define DEBUG_PRINTK_MSG(__dev, __kernlvl, __lvl, __msg, __args...)	\</div><div class='ctx'> 	printk(__kernlvl "%s -&gt; %s: %s - " __msg,			\</div><div class='del'>-	       wiphy_name((__dev)-&gt;hw-&gt;wiphy), __FUNCTION__, __lvl, ##__args)</div><div class='add'>+	       wiphy_name((__dev)-&gt;hw-&gt;wiphy), __func__, __lvl, ##__args)</div><div class='ctx'> </div><div class='ctx'> #define DEBUG_PRINTK_PROBE(__kernlvl, __lvl, __msg, __args...)	\</div><div class='ctx'> 	printk(__kernlvl "%s -&gt; %s: %s - " __msg,		\</div><div class='del'>-	       KBUILD_MODNAME, __FUNCTION__, __lvl, ##__args)</div><div class='add'>+	       KBUILD_MODNAME, __func__, __lvl, ##__args)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_RT2X00_DEBUG</div><div class='ctx'> #define DEBUG_PRINTK(__dev, __kernlvl, __lvl, __msg, __args...)	\</div><div class='hunk'>@@ -144,6 +144,17 @@ struct rf_channel {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Channel information structure</div><div class='add'>+ */</div><div class='add'>+struct channel_info {</div><div class='add'>+	unsigned int flags;</div><div class='add'>+#define GEOGRAPHY_ALLOWED	0x00000001</div><div class='add'>+</div><div class='add'>+	short tx_power1;</div><div class='add'>+	short tx_power2;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Antenna setup values.</div><div class='ctx'>  */</div><div class='ctx'> struct antenna_setup {</div><div class='hunk'>@@ -394,10 +405,7 @@ static inline struct rt2x00_intf* vif_to_intf(struct ieee80211_vif *vif)</div><div class='ctx'>  * @num_channels: Number of supported channels. This is used as array size</div><div class='ctx'>  *	for @tx_power_a, @tx_power_bg and @channels.</div><div class='ctx'>  * @channels: Device/chipset specific channel values (See &amp;struct rf_channel).</div><div class='del'>- * @tx_power_a: TX power values for all 5.2GHz channels (may be NULL).</div><div class='del'>- * @tx_power_bg: TX power values for all 2.4GHz channels (may be NULL).</div><div class='del'>- * @tx_power_default: Default TX power value to use when either</div><div class='del'>- *	@tx_power_a or @tx_power_bg is missing.</div><div class='add'>+ * @channels_info: Additional information for channels (See &amp;struct channel_info).</div><div class='ctx'>  */</div><div class='ctx'> struct hw_mode_spec {</div><div class='ctx'> 	unsigned int supported_bands;</div><div class='hunk'>@@ -410,10 +418,7 @@ struct hw_mode_spec {</div><div class='ctx'> </div><div class='ctx'> 	unsigned int num_channels;</div><div class='ctx'> 	const struct rf_channel *channels;</div><div class='del'>-</div><div class='del'>-	const u8 *tx_power_a;</div><div class='del'>-	const u8 *tx_power_bg;</div><div class='del'>-	u8 tx_power_default;</div><div class='add'>+	const struct channel_info *channels_info;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -425,7 +430,9 @@ struct hw_mode_spec {</div><div class='ctx'>  */</div><div class='ctx'> struct rt2x00lib_conf {</div><div class='ctx'> 	struct ieee80211_conf *conf;</div><div class='add'>+</div><div class='ctx'> 	struct rf_channel rf;</div><div class='add'>+	struct channel_info channel;</div><div class='ctx'> </div><div class='ctx'> 	struct antenna_setup ant;</div><div class='ctx'> </div><div class='hunk'>@@ -452,6 +459,23 @@ struct rt2x00lib_erp {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Configuration structure for hardware encryption.</div><div class='add'>+ */</div><div class='add'>+struct rt2x00lib_crypto {</div><div class='add'>+	enum cipher cipher;</div><div class='add'>+</div><div class='add'>+	enum set_key_cmd cmd;</div><div class='add'>+	const u8 *address;</div><div class='add'>+</div><div class='add'>+	u32 bssidx;</div><div class='add'>+	u32 aid;</div><div class='add'>+</div><div class='add'>+	u8 key[16];</div><div class='add'>+	u8 tx_mic[8];</div><div class='add'>+	u8 rx_mic[8];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Configuration structure wrapper around the</div><div class='ctx'>  * rt2x00 interface configuration handler.</div><div class='ctx'>  */</div><div class='hunk'>@@ -459,7 +483,7 @@ struct rt2x00intf_conf {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Interface type</div><div class='ctx'> 	 */</div><div class='del'>-	enum ieee80211_if_types type;</div><div class='add'>+	enum nl80211_iftype type;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * TSF sync value, this is dependant on the operation type.</div><div class='hunk'>@@ -547,6 +571,12 @@ struct rt2x00lib_ops {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Configuration handlers.</div><div class='ctx'> 	 */</div><div class='add'>+	int (*config_shared_key) (struct rt2x00_dev *rt2x00dev,</div><div class='add'>+				  struct rt2x00lib_crypto *crypto,</div><div class='add'>+				  struct ieee80211_key_conf *key);</div><div class='add'>+	int (*config_pairwise_key) (struct rt2x00_dev *rt2x00dev,</div><div class='add'>+				    struct rt2x00lib_crypto *crypto,</div><div class='add'>+				    struct ieee80211_key_conf *key);</div><div class='ctx'> 	void (*config_filter) (struct rt2x00_dev *rt2x00dev,</div><div class='ctx'> 			       const unsigned int filter_flags);</div><div class='ctx'> 	void (*config_intf) (struct rt2x00_dev *rt2x00dev,</div><div class='hunk'>@@ -599,17 +629,16 @@ enum rt2x00_flags {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Device state flags</div><div class='ctx'> 	 */</div><div class='del'>-	DEVICE_PRESENT,</div><div class='del'>-	DEVICE_REGISTERED_HW,</div><div class='del'>-	DEVICE_INITIALIZED,</div><div class='del'>-	DEVICE_STARTED,</div><div class='del'>-	DEVICE_STARTED_SUSPEND,</div><div class='del'>-	DEVICE_ENABLED_RADIO,</div><div class='del'>-	DEVICE_DISABLED_RADIO_HW,</div><div class='del'>-	DEVICE_DIRTY_CONFIG,</div><div class='add'>+	DEVICE_STATE_PRESENT,</div><div class='add'>+	DEVICE_STATE_REGISTERED_HW,</div><div class='add'>+	DEVICE_STATE_INITIALIZED,</div><div class='add'>+	DEVICE_STATE_STARTED,</div><div class='add'>+	DEVICE_STATE_STARTED_SUSPEND,</div><div class='add'>+	DEVICE_STATE_ENABLED_RADIO,</div><div class='add'>+	DEVICE_STATE_DISABLED_RADIO_HW,</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Driver features</div><div class='add'>+	 * Driver requirements</div><div class='ctx'> 	 */</div><div class='ctx'> 	DRIVER_REQUIRE_FIRMWARE,</div><div class='ctx'> 	DRIVER_REQUIRE_BEACON_GUARD,</div><div class='hunk'>@@ -618,9 +647,14 @@ enum rt2x00_flags {</div><div class='ctx'> 	DRIVER_REQUIRE_DMA,</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Driver configuration</div><div class='add'>+	 * Driver features</div><div class='ctx'> 	 */</div><div class='ctx'> 	CONFIG_SUPPORT_HW_BUTTON,</div><div class='add'>+	CONFIG_SUPPORT_HW_CRYPTO,</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Driver configuration</div><div class='add'>+	 */</div><div class='ctx'> 	CONFIG_FRAME_TYPE,</div><div class='ctx'> 	CONFIG_RF_SEQUENCE,</div><div class='ctx'> 	CONFIG_EXTERNAL_LNA_A,</div><div class='hunk'>@@ -769,6 +803,11 @@ struct rt2x00_dev {</div><div class='ctx'> 	u32 *rf;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='add'>+	 * LNA gain</div><div class='add'>+	 */</div><div class='add'>+	short lna_gain;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='ctx'> 	 * USB Max frame size (for rt2500usb &amp; rt73usb).</div><div class='ctx'> 	 */</div><div class='ctx'> 	u16 usb_maxpacket;</div><div class='hunk'>@@ -966,6 +1005,13 @@ void rt2x00mac_configure_filter(struct ieee80211_hw *hw,</div><div class='ctx'> 				unsigned int changed_flags,</div><div class='ctx'> 				unsigned int *total_flags,</div><div class='ctx'> 				int mc_count, struct dev_addr_list *mc_list);</div><div class='add'>+#ifdef CONFIG_RT2X00_LIB_CRYPTO</div><div class='add'>+int rt2x00mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,</div><div class='add'>+		      const u8 *local_address, const u8 *address,</div><div class='add'>+		      struct ieee80211_key_conf *key);</div><div class='add'>+#else</div><div class='add'>+#define rt2x00mac_set_key	NULL</div><div class='add'>+#endif /* CONFIG_RT2X00_LIB_CRYPTO */</div><div class='ctx'> int rt2x00mac_get_stats(struct ieee80211_hw *hw,</div><div class='ctx'> 			struct ieee80211_low_level_stats *stats);</div><div class='ctx'> int rt2x00mac_get_tx_stats(struct ieee80211_hw *hw,</div><div class='head'>diff --git a/drivers/net/wireless/rt2x00/rt2x00config.c b/drivers/net/wireless/rt2x00/rt2x00config.c<br/>index d134c3be539a..4d5e87b015a0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/rt2x00/rt2x00config.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/rt2x00/rt2x00config.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/rt2x00/rt2x00config.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/rt2x00/rt2x00config.c</a></div><div class='hunk'>@@ -31,7 +31,7 @@</div><div class='ctx'> </div><div class='ctx'> void rt2x00lib_config_intf(struct rt2x00_dev *rt2x00dev,</div><div class='ctx'> 			   struct rt2x00_intf *intf,</div><div class='del'>-			   enum ieee80211_if_types type,</div><div class='add'>+			   enum nl80211_iftype type,</div><div class='ctx'> 			   u8 *mac, u8 *bssid)</div><div class='ctx'> {</div><div class='ctx'> 	struct rt2x00intf_conf conf;</div><div class='hunk'>@@ -40,11 +40,11 @@ void rt2x00lib_config_intf(struct rt2x00_dev *rt2x00dev,</div><div class='ctx'> 	conf.type = type;</div><div class='ctx'> </div><div class='ctx'> 	switch (type) {</div><div class='del'>-	case IEEE80211_IF_TYPE_IBSS:</div><div class='del'>-	case IEEE80211_IF_TYPE_AP:</div><div class='add'>+	case NL80211_IFTYPE_ADHOC:</div><div class='add'>+	case NL80211_IFTYPE_AP:</div><div class='ctx'> 		conf.sync = TSF_SYNC_BEACON;</div><div class='ctx'> 		break;</div><div class='del'>-	case IEEE80211_IF_TYPE_STA:</div><div class='add'>+	case NL80211_IFTYPE_STATION:</div><div class='ctx'> 		conf.sync = TSF_SYNC_INFRA;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -121,7 +121,7 @@ void rt2x00lib_config_antenna(struct rt2x00_dev *rt2x00dev,</div><div class='ctx'> 	 * Antenna setup changes require the RX to be disabled,</div><div class='ctx'> 	 * else the changes will be ignored by the device.</div><div class='ctx'> 	 */</div><div class='del'>-	if (test_bit(DEVICE_ENABLED_RADIO, &amp;rt2x00dev-&gt;flags))</div><div class='add'>+	if (test_bit(DEVICE_STATE_ENABLED_RADIO, &amp;rt2x00dev-&gt;flags))</div><div class='ctx'> 		rt2x00lib_toggle_rx(rt2x00dev, STATE_RADIO_RX_OFF_LINK);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -136,7 +136,7 @@ void rt2x00lib_config_antenna(struct rt2x00_dev *rt2x00dev,</div><div class='ctx'> 	rt2x00dev-&gt;link.ant.active.rx = libconf.ant.rx;</div><div class='ctx'> 	rt2x00dev-&gt;link.ant.active.tx = libconf.ant.tx;</div><div class='ctx'> </div><div class='del'>-	if (test_bit(DEVICE_ENABLED_RADIO, &amp;rt2x00dev-&gt;flags))</div><div class='add'>+	if (test_bit(DEVICE_STATE_ENABLED_RADIO, &amp;rt2x00dev-&gt;flags))</div><div class='ctx'> 		rt2x00lib_toggle_rx(rt2x00dev, STATE_RADIO_RX_ON_LINK);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -245,6 +245,10 @@ config:</div><div class='ctx'> 		memcpy(&amp;libconf.rf,</div><div class='ctx'> 		       &amp;rt2x00dev-&gt;spec.channels[conf-&gt;channel-&gt;hw_value],</div><div class='ctx'> 		       sizeof(libconf.rf));</div><div class='add'>+</div><div class='add'>+		memcpy(&amp;libconf.channel,</div><div class='add'>+		       &amp;rt2x00dev-&gt;spec.channels_info[conf-&gt;channel-&gt;hw_value],</div><div class='add'>+		       sizeof(libconf.channel));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (flags &amp; CONFIG_UPDATE_ANTENNA) {</div><div class='head'>diff --git a/drivers/net/wireless/rt2x00/rt2x00crypto.c b/drivers/net/wireless/rt2x00/rt2x00crypto.c<br/>new file mode 100644<br/>index 000000000000..5a858e5106c4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/rt2x00/rt2x00crypto.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/rt2x00/rt2x00crypto.c</a></div><div class='hunk'>@@ -0,0 +1,215 @@</div><div class='add'>+/*</div><div class='add'>+	Copyright (C) 2004 - 2008 rt2x00 SourceForge Project</div><div class='add'>+	&lt;http://rt2x00.serialmonkey.com&gt;</div><div class='add'>+</div><div class='add'>+	This program is free software; you can redistribute it and/or modify</div><div class='add'>+	it under the terms of the GNU General Public License as published by</div><div class='add'>+	the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+	(at your option) any later version.</div><div class='add'>+</div><div class='add'>+	This program is distributed in the hope that it will be useful,</div><div class='add'>+	but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</div><div class='add'>+	GNU General Public License for more details.</div><div class='add'>+</div><div class='add'>+	You should have received a copy of the GNU General Public License</div><div class='add'>+	along with this program; if not, write to the</div><div class='add'>+	Free Software Foundation, Inc.,</div><div class='add'>+	59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+	Module: rt2x00lib</div><div class='add'>+	Abstract: rt2x00 crypto specific routines.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+</div><div class='add'>+#include "rt2x00.h"</div><div class='add'>+#include "rt2x00lib.h"</div><div class='add'>+</div><div class='add'>+enum cipher rt2x00crypto_key_to_cipher(struct ieee80211_key_conf *key)</div><div class='add'>+{</div><div class='add'>+	switch (key-&gt;alg) {</div><div class='add'>+	case ALG_WEP:</div><div class='add'>+		if (key-&gt;keylen == LEN_WEP40)</div><div class='add'>+			return CIPHER_WEP64;</div><div class='add'>+		else</div><div class='add'>+			return CIPHER_WEP128;</div><div class='add'>+	case ALG_TKIP:</div><div class='add'>+		return CIPHER_TKIP;</div><div class='add'>+	case ALG_CCMP:</div><div class='add'>+		return CIPHER_AES;</div><div class='add'>+	default:</div><div class='add'>+		return CIPHER_NONE;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+unsigned int rt2x00crypto_tx_overhead(struct ieee80211_tx_info *tx_info)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_key_conf *key = tx_info-&gt;control.hw_key;</div><div class='add'>+	unsigned int overhead = 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Extend frame length to include IV/EIV/ICV/MMIC,</div><div class='add'>+	 * note that these lengths should only be added when</div><div class='add'>+	 * mac80211 does not generate it.</div><div class='add'>+	 */</div><div class='add'>+	overhead += key-&gt;icv_len;</div><div class='add'>+</div><div class='add'>+	if (!(key-&gt;flags &amp; IEEE80211_KEY_FLAG_GENERATE_IV))</div><div class='add'>+		overhead += key-&gt;iv_len;</div><div class='add'>+</div><div class='add'>+	if (!(key-&gt;flags &amp; IEEE80211_KEY_FLAG_GENERATE_MMIC)) {</div><div class='add'>+		if (key-&gt;alg == ALG_TKIP)</div><div class='add'>+			overhead += 8;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return overhead;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void rt2x00crypto_tx_remove_iv(struct sk_buff *skb, unsigned int iv_len)</div><div class='add'>+{</div><div class='add'>+	struct skb_frame_desc *skbdesc = get_skb_frame_desc(skb);</div><div class='add'>+	unsigned int header_length = ieee80211_get_hdrlen_from_skb(skb);</div><div class='add'>+</div><div class='add'>+	if (unlikely(!iv_len))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Copy IV/EIV data */</div><div class='add'>+	if (iv_len &gt;= 4)</div><div class='add'>+		memcpy(&amp;skbdesc-&gt;iv, skb-&gt;data + header_length, 4);</div><div class='add'>+	if (iv_len &gt;= 8)</div><div class='add'>+		memcpy(&amp;skbdesc-&gt;eiv, skb-&gt;data + header_length + 4, 4);</div><div class='add'>+</div><div class='add'>+	/* Move ieee80211 header */</div><div class='add'>+	memmove(skb-&gt;data + iv_len, skb-&gt;data, header_length);</div><div class='add'>+</div><div class='add'>+	/* Pull buffer to correct size */</div><div class='add'>+	skb_pull(skb, iv_len);</div><div class='add'>+</div><div class='add'>+	/* IV/EIV data has officially be stripped */</div><div class='add'>+	skbdesc-&gt;flags |= FRAME_DESC_IV_STRIPPED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void rt2x00crypto_tx_insert_iv(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct skb_frame_desc *skbdesc = get_skb_frame_desc(skb);</div><div class='add'>+	unsigned int header_length = ieee80211_get_hdrlen_from_skb(skb);</div><div class='add'>+	const unsigned int iv_len =</div><div class='add'>+	    ((!!(skbdesc-&gt;iv)) * 4) + ((!!(skbdesc-&gt;eiv)) * 4);</div><div class='add'>+</div><div class='add'>+	if (!(skbdesc-&gt;flags &amp; FRAME_DESC_IV_STRIPPED))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	skb_push(skb, iv_len);</div><div class='add'>+</div><div class='add'>+	/* Move ieee80211 header */</div><div class='add'>+	memmove(skb-&gt;data, skb-&gt;data + iv_len, header_length);</div><div class='add'>+</div><div class='add'>+	/* Copy IV/EIV data */</div><div class='add'>+	if (iv_len &gt;= 4)</div><div class='add'>+		memcpy(skb-&gt;data + header_length, &amp;skbdesc-&gt;iv, 4);</div><div class='add'>+	if (iv_len &gt;= 8)</div><div class='add'>+		memcpy(skb-&gt;data + header_length + 4, &amp;skbdesc-&gt;eiv, 4);</div><div class='add'>+</div><div class='add'>+	/* IV/EIV data has returned into the frame */</div><div class='add'>+	skbdesc-&gt;flags &amp;= ~FRAME_DESC_IV_STRIPPED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void rt2x00crypto_rx_insert_iv(struct sk_buff *skb, unsigned int align,</div><div class='add'>+			       unsigned int header_length,</div><div class='add'>+			       struct rxdone_entry_desc *rxdesc)</div><div class='add'>+{</div><div class='add'>+	unsigned int payload_len = rxdesc-&gt;size - header_length;</div><div class='add'>+	unsigned int iv_len;</div><div class='add'>+	unsigned int icv_len;</div><div class='add'>+	unsigned int transfer = 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * WEP64/WEP128: Provides IV &amp; ICV</div><div class='add'>+	 * TKIP: Provides IV/EIV &amp; ICV</div><div class='add'>+	 * AES: Provies IV/EIV &amp; ICV</div><div class='add'>+	 */</div><div class='add'>+	switch (rxdesc-&gt;cipher) {</div><div class='add'>+	case CIPHER_WEP64:</div><div class='add'>+	case CIPHER_WEP128:</div><div class='add'>+		iv_len = 4;</div><div class='add'>+		icv_len = 4;</div><div class='add'>+		break;</div><div class='add'>+	case CIPHER_TKIP:</div><div class='add'>+		iv_len = 8;</div><div class='add'>+		icv_len = 4;</div><div class='add'>+		break;</div><div class='add'>+	case CIPHER_AES:</div><div class='add'>+		iv_len = 8;</div><div class='add'>+		icv_len = 8;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		/* Unsupport type */</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Make room for new data, note that we increase both</div><div class='add'>+	 * headsize and tailsize when required. The tailsize is</div><div class='add'>+	 * only needed when ICV data needs to be inserted and</div><div class='add'>+	 * the padding is smaller then the ICV data.</div><div class='add'>+	 * When alignment requirements is greater then the</div><div class='add'>+	 * ICV data we must trim the skb to the correct size</div><div class='add'>+	 * because we need to remove the extra bytes.</div><div class='add'>+	 */</div><div class='add'>+	skb_push(skb, iv_len + align);</div><div class='add'>+	if (align &lt; icv_len)</div><div class='add'>+		skb_put(skb, icv_len - align);</div><div class='add'>+	else if (align &gt; icv_len)</div><div class='add'>+		skb_trim(skb, rxdesc-&gt;size + iv_len + icv_len);</div><div class='add'>+</div><div class='add'>+	/* Move ieee80211 header */</div><div class='add'>+	memmove(skb-&gt;data + transfer,</div><div class='add'>+		skb-&gt;data + transfer + iv_len + align,</div><div class='add'>+		header_length);</div><div class='add'>+	transfer += header_length;</div><div class='add'>+</div><div class='add'>+	/* Copy IV data */</div><div class='add'>+	if (iv_len &gt;= 4) {</div><div class='add'>+		memcpy(skb-&gt;data + transfer, &amp;rxdesc-&gt;iv, 4);</div><div class='add'>+		transfer += 4;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Copy EIV data */</div><div class='add'>+	if (iv_len &gt;= 8) {</div><div class='add'>+		memcpy(skb-&gt;data + transfer, &amp;rxdesc-&gt;eiv, 4);</div><div class='add'>+		transfer += 4;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Move payload */</div><div class='add'>+	if (align) {</div><div class='add'>+		memmove(skb-&gt;data + transfer,</div><div class='add'>+			skb-&gt;data + transfer + align,</div><div class='add'>+			payload_len);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * NOTE: Always count the payload as transfered,</div><div class='add'>+	 * even when alignment was set to zero. This is required</div><div class='add'>+	 * for determining the correct offset for the ICV data.</div><div class='add'>+	 */</div><div class='add'>+	transfer += payload_len;</div><div class='add'>+</div><div class='add'>+	/* Copy ICV data */</div><div class='add'>+	if (icv_len &gt;= 4) {</div><div class='add'>+		memcpy(skb-&gt;data + transfer, &amp;rxdesc-&gt;icv, 4);</div><div class='add'>+		/*</div><div class='add'>+		 * AES appends 8 bytes, we can't fill the upper</div><div class='add'>+		 * 4 bytes, but mac80211 doesn't care about what</div><div class='add'>+		 * we provide here anyway and strips it immediately.</div><div class='add'>+		 */</div><div class='add'>+		transfer += icv_len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* IV/EIV/ICV has been inserted into frame */</div><div class='add'>+	rxdesc-&gt;size = transfer;</div><div class='add'>+	rxdesc-&gt;flags &amp;= ~RX_FLAG_IV_STRIPPED;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/rt2x00/rt2x00debug.c b/drivers/net/wireless/rt2x00/rt2x00debug.c<br/>index 6bee1d611bbf..5cf4c859e39d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/rt2x00/rt2x00debug.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/rt2x00/rt2x00debug.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/rt2x00/rt2x00debug.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/rt2x00/rt2x00debug.c</a></div><div class='hunk'>@@ -35,6 +35,13 @@</div><div class='ctx'> </div><div class='ctx'> #define MAX_LINE_LENGTH 64</div><div class='ctx'> </div><div class='add'>+struct rt2x00debug_crypto {</div><div class='add'>+	unsigned long success;</div><div class='add'>+	unsigned long icv_error;</div><div class='add'>+	unsigned long mic_error;</div><div class='add'>+	unsigned long key_error;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct rt2x00debug_intf {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Pointer to driver structure where</div><div class='hunk'>@@ -63,6 +70,7 @@ struct rt2x00debug_intf {</div><div class='ctx'> 	 *   - queue folder</div><div class='ctx'> 	 *     - frame dump file</div><div class='ctx'> 	 *     - queue stats file</div><div class='add'>+	 *     - crypto stats file</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct dentry *driver_folder;</div><div class='ctx'> 	struct dentry *driver_entry;</div><div class='hunk'>@@ -80,6 +88,7 @@ struct rt2x00debug_intf {</div><div class='ctx'> 	struct dentry *queue_folder;</div><div class='ctx'> 	struct dentry *queue_frame_dump_entry;</div><div class='ctx'> 	struct dentry *queue_stats_entry;</div><div class='add'>+	struct dentry *crypto_stats_entry;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The frame dump file only allows a single reader,</div><div class='hunk'>@@ -98,6 +107,12 @@ struct rt2x00debug_intf {</div><div class='ctx'> 	wait_queue_head_t frame_dump_waitqueue;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='add'>+	 * HW crypto statistics.</div><div class='add'>+	 * All statistics are stored seperately per cipher type.</div><div class='add'>+	 */</div><div class='add'>+	struct rt2x00debug_crypto crypto_stats[CIPHER_MAX];</div><div class='add'>+</div><div class='add'>+	/*</div><div class='ctx'> 	 * Driver and chipset files will use a data buffer</div><div class='ctx'> 	 * that has been created in advance. This will simplify</div><div class='ctx'> 	 * the code since we can use the debugfs functions.</div><div class='hunk'>@@ -114,6 +129,25 @@ struct rt2x00debug_intf {</div><div class='ctx'> 	unsigned int offset_rf;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+void rt2x00debug_update_crypto(struct rt2x00_dev *rt2x00dev,</div><div class='add'>+			       enum cipher cipher, enum rx_crypto status)</div><div class='add'>+{</div><div class='add'>+	struct rt2x00debug_intf *intf = rt2x00dev-&gt;debugfs_intf;</div><div class='add'>+</div><div class='add'>+	if (cipher == CIPHER_TKIP_NO_MIC)</div><div class='add'>+		cipher = CIPHER_TKIP;</div><div class='add'>+	if (cipher == CIPHER_NONE || cipher &gt; CIPHER_MAX)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Remove CIPHER_NONE index */</div><div class='add'>+	cipher--;</div><div class='add'>+</div><div class='add'>+	intf-&gt;crypto_stats[cipher].success += (status == RX_CRYPTO_SUCCESS);</div><div class='add'>+	intf-&gt;crypto_stats[cipher].icv_error += (status == RX_CRYPTO_FAIL_ICV);</div><div class='add'>+	intf-&gt;crypto_stats[cipher].mic_error += (status == RX_CRYPTO_FAIL_MIC);</div><div class='add'>+	intf-&gt;crypto_stats[cipher].key_error += (status == RX_CRYPTO_FAIL_KEY);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void rt2x00debug_dump_frame(struct rt2x00_dev *rt2x00dev,</div><div class='ctx'> 			    enum rt2x00_dump_type type, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='hunk'>@@ -327,6 +361,59 @@ static const struct file_operations rt2x00debug_fop_queue_stats = {</div><div class='ctx'> 	.release	= rt2x00debug_file_release,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_RT2X00_LIB_CRYPTO</div><div class='add'>+static ssize_t rt2x00debug_read_crypto_stats(struct file *file,</div><div class='add'>+					     char __user *buf,</div><div class='add'>+					     size_t length,</div><div class='add'>+					     loff_t *offset)</div><div class='add'>+{</div><div class='add'>+	struct rt2x00debug_intf *intf = file-&gt;private_data;</div><div class='add'>+	char *name[] = { "WEP64", "WEP128", "TKIP", "AES" };</div><div class='add'>+	char *data;</div><div class='add'>+	char *temp;</div><div class='add'>+	size_t size;</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	if (*offset)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	data = kzalloc((1 + CIPHER_MAX)* MAX_LINE_LENGTH, GFP_KERNEL);</div><div class='add'>+	if (!data)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	temp = data;</div><div class='add'>+	temp += sprintf(data, "cipher\tsuccess\ticv err\tmic err\tkey err\n");</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; CIPHER_MAX; i++) {</div><div class='add'>+		temp += sprintf(temp, "%s\t%lu\t%lu\t%lu\t%lu\n", name[i],</div><div class='add'>+				intf-&gt;crypto_stats[i].success,</div><div class='add'>+				intf-&gt;crypto_stats[i].icv_error,</div><div class='add'>+				intf-&gt;crypto_stats[i].mic_error,</div><div class='add'>+				intf-&gt;crypto_stats[i].key_error);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	size = strlen(data);</div><div class='add'>+	size = min(size, length);</div><div class='add'>+</div><div class='add'>+	if (copy_to_user(buf, data, size)) {</div><div class='add'>+		kfree(data);</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kfree(data);</div><div class='add'>+</div><div class='add'>+	*offset += size;</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations rt2x00debug_fop_crypto_stats = {</div><div class='add'>+	.owner		= THIS_MODULE,</div><div class='add'>+	.read		= rt2x00debug_read_crypto_stats,</div><div class='add'>+	.open		= rt2x00debug_file_open,</div><div class='add'>+	.release	= rt2x00debug_file_release,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #define RT2X00DEBUGFS_OPS_READ(__name, __format, __type)	\</div><div class='ctx'> static ssize_t rt2x00debug_read_##__name(struct file *file,	\</div><div class='ctx'> 					 char __user *buf,	\</div><div class='hunk'>@@ -569,6 +656,13 @@ void rt2x00debug_register(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> 	    debugfs_create_file("queue", S_IRUSR, intf-&gt;queue_folder,</div><div class='ctx'> 				intf, &amp;rt2x00debug_fop_queue_stats);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_RT2X00_LIB_CRYPTO</div><div class='add'>+	if (test_bit(CONFIG_SUPPORT_HW_CRYPTO, &amp;rt2x00dev-&gt;flags))</div><div class='add'>+		intf-&gt;crypto_stats_entry =</div><div class='add'>+		    debugfs_create_file("crypto", S_IRUGO, intf-&gt;queue_folder,</div><div class='add'>+					intf, &amp;rt2x00debug_fop_crypto_stats);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	return;</div><div class='ctx'> </div><div class='ctx'> exit:</div><div class='hunk'>@@ -587,6 +681,9 @@ void rt2x00debug_deregister(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> </div><div class='ctx'> 	skb_queue_purge(&amp;intf-&gt;frame_dump_skbqueue);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_RT2X00_LIB_CRYPTO</div><div class='add'>+	debugfs_remove(intf-&gt;crypto_stats_entry);</div><div class='add'>+#endif</div><div class='ctx'> 	debugfs_remove(intf-&gt;queue_stats_entry);</div><div class='ctx'> 	debugfs_remove(intf-&gt;queue_frame_dump_entry);</div><div class='ctx'> 	debugfs_remove(intf-&gt;queue_folder);</div><div class='head'>diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c<br/>index f42283ad7b02..86840e3585e8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/rt2x00/rt2x00dev.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/rt2x00/rt2x00dev.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/rt2x00/rt2x00dev.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/rt2x00/rt2x00dev.c</a></div><div class='hunk'>@@ -34,7 +34,7 @@</div><div class='ctx'>  */</div><div class='ctx'> void rt2x00lib_reset_link_tuner(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> {</div><div class='del'>-	if (!test_bit(DEVICE_ENABLED_RADIO, &amp;rt2x00dev-&gt;flags))</div><div class='add'>+	if (!test_bit(DEVICE_STATE_ENABLED_RADIO, &amp;rt2x00dev-&gt;flags))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -94,8 +94,8 @@ int rt2x00lib_enable_radio(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> 	 * Don't enable the radio twice.</div><div class='ctx'> 	 * And check if the hardware button has been disabled.</div><div class='ctx'> 	 */</div><div class='del'>-	if (test_bit(DEVICE_ENABLED_RADIO, &amp;rt2x00dev-&gt;flags) ||</div><div class='del'>-	    test_bit(DEVICE_DISABLED_RADIO_HW, &amp;rt2x00dev-&gt;flags))</div><div class='add'>+	if (test_bit(DEVICE_STATE_ENABLED_RADIO, &amp;rt2x00dev-&gt;flags) ||</div><div class='add'>+	    test_bit(DEVICE_STATE_DISABLED_RADIO_HW, &amp;rt2x00dev-&gt;flags))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -117,7 +117,7 @@ int rt2x00lib_enable_radio(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> 	rt2x00leds_led_radio(rt2x00dev, true);</div><div class='ctx'> 	rt2x00led_led_activity(rt2x00dev, true);</div><div class='ctx'> </div><div class='del'>-	__set_bit(DEVICE_ENABLED_RADIO, &amp;rt2x00dev-&gt;flags);</div><div class='add'>+	set_bit(DEVICE_STATE_ENABLED_RADIO, &amp;rt2x00dev-&gt;flags);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Enable RX.</div><div class='hunk'>@@ -134,7 +134,7 @@ int rt2x00lib_enable_radio(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> </div><div class='ctx'> void rt2x00lib_disable_radio(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> {</div><div class='del'>-	if (!__test_and_clear_bit(DEVICE_ENABLED_RADIO, &amp;rt2x00dev-&gt;flags))</div><div class='add'>+	if (!test_and_clear_bit(DEVICE_STATE_ENABLED_RADIO, &amp;rt2x00dev-&gt;flags))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -354,7 +354,7 @@ static void rt2x00lib_link_tuner(struct work_struct *work)</div><div class='ctx'> 	 * When the radio is shutting down we should</div><div class='ctx'> 	 * immediately cease all link tuning.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!test_bit(DEVICE_ENABLED_RADIO, &amp;rt2x00dev-&gt;flags))</div><div class='add'>+	if (!test_bit(DEVICE_STATE_ENABLED_RADIO, &amp;rt2x00dev-&gt;flags))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -431,7 +431,7 @@ static void rt2x00lib_intf_scheduled_iter(void *data, u8 *mac,</div><div class='ctx'> 	 * note that in the spinlock protected area above the delayed_flags</div><div class='ctx'> 	 * have been cleared correctly.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!test_bit(DEVICE_ENABLED_RADIO, &amp;rt2x00dev-&gt;flags))</div><div class='add'>+	if (!test_bit(DEVICE_STATE_ENABLED_RADIO, &amp;rt2x00dev-&gt;flags))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (delayed_flags &amp; DELAYED_UPDATE_BEACON)</div><div class='hunk'>@@ -467,8 +467,8 @@ static void rt2x00lib_beacondone_iter(void *data, u8 *mac,</div><div class='ctx'> 	struct rt2x00_dev *rt2x00dev = data;</div><div class='ctx'> 	struct rt2x00_intf *intf = vif_to_intf(vif);</div><div class='ctx'> </div><div class='del'>-	if (vif-&gt;type != IEEE80211_IF_TYPE_AP &amp;&amp;</div><div class='del'>-	    vif-&gt;type != IEEE80211_IF_TYPE_IBSS)</div><div class='add'>+	if (vif-&gt;type != NL80211_IFTYPE_AP &amp;&amp;</div><div class='add'>+	    vif-&gt;type != NL80211_IFTYPE_ADHOC)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -484,7 +484,7 @@ static void rt2x00lib_beacondone_iter(void *data, u8 *mac,</div><div class='ctx'> </div><div class='ctx'> void rt2x00lib_beacondone(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> {</div><div class='del'>-	if (!test_bit(DEVICE_ENABLED_RADIO, &amp;rt2x00dev-&gt;flags))</div><div class='add'>+	if (!test_bit(DEVICE_STATE_ENABLED_RADIO, &amp;rt2x00dev-&gt;flags))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	ieee80211_iterate_active_interfaces_atomic(rt2x00dev-&gt;hw,</div><div class='hunk'>@@ -508,6 +508,15 @@ void rt2x00lib_txdone(struct queue_entry *entry,</div><div class='ctx'> 	rt2x00queue_unmap_skb(rt2x00dev, entry-&gt;skb);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='add'>+	 * If the IV/EIV data was stripped from the frame before it was</div><div class='add'>+	 * passed to the hardware, we should now reinsert it again because</div><div class='add'>+	 * mac80211 will expect the the same data to be present it the</div><div class='add'>+	 * frame as it was passed to us.</div><div class='add'>+	 */</div><div class='add'>+	if (test_bit(CONFIG_SUPPORT_HW_CRYPTO, &amp;rt2x00dev-&gt;flags))</div><div class='add'>+		rt2x00crypto_tx_insert_iv(entry-&gt;skb);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='ctx'> 	 * Send frame to debugfs immediately, after this call is completed</div><div class='ctx'> 	 * we are going to overwrite the skb-&gt;cb array.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -563,7 +572,7 @@ void rt2x00lib_txdone(struct queue_entry *entry,</div><div class='ctx'> </div><div class='ctx'> 	rt2x00dev-&gt;ops-&gt;lib-&gt;init_txentry(rt2x00dev, entry);</div><div class='ctx'> </div><div class='del'>-	__clear_bit(ENTRY_OWNER_DEVICE_DATA, &amp;entry-&gt;flags);</div><div class='add'>+	clear_bit(ENTRY_OWNER_DEVICE_DATA, &amp;entry-&gt;flags);</div><div class='ctx'> 	rt2x00queue_index_inc(entry-&gt;queue, Q_INDEX_DONE);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -585,7 +594,7 @@ void rt2x00lib_rxdone(struct rt2x00_dev *rt2x00dev,</div><div class='ctx'> 	struct ieee80211_supported_band *sband;</div><div class='ctx'> 	struct ieee80211_hdr *hdr;</div><div class='ctx'> 	const struct rt2x00_rate *rate;</div><div class='del'>-	unsigned int header_size;</div><div class='add'>+	unsigned int header_length;</div><div class='ctx'> 	unsigned int align;</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	int idx = -1;</div><div class='hunk'>@@ -613,10 +622,19 @@ void rt2x00lib_rxdone(struct rt2x00_dev *rt2x00dev,</div><div class='ctx'> 	 * The data behind the ieee80211 header must be</div><div class='ctx'> 	 * aligned on a 4 byte boundary.</div><div class='ctx'> 	 */</div><div class='del'>-	header_size = ieee80211_get_hdrlen_from_skb(entry-&gt;skb);</div><div class='del'>-	align = ((unsigned long)(entry-&gt;skb-&gt;data + header_size)) &amp; 3;</div><div class='add'>+	header_length = ieee80211_get_hdrlen_from_skb(entry-&gt;skb);</div><div class='add'>+	align = ((unsigned long)(entry-&gt;skb-&gt;data + header_length)) &amp; 3;</div><div class='ctx'> </div><div class='del'>-	if (align) {</div><div class='add'>+	/*</div><div class='add'>+	 * Hardware might have stripped the IV/EIV/ICV data,</div><div class='add'>+	 * in that case it is possible that the data was</div><div class='add'>+	 * provided seperately (through hardware descriptor)</div><div class='add'>+	 * in which case we should reinsert the data into the frame.</div><div class='add'>+	 */</div><div class='add'>+	if ((rxdesc.flags &amp; RX_FLAG_IV_STRIPPED)) {</div><div class='add'>+		rt2x00crypto_rx_insert_iv(entry-&gt;skb, align,</div><div class='add'>+					  header_length, &amp;rxdesc);</div><div class='add'>+	} else if (align) {</div><div class='ctx'> 		skb_push(entry-&gt;skb, align);</div><div class='ctx'> 		/* Move entire frame in 1 command */</div><div class='ctx'> 		memmove(entry-&gt;skb-&gt;data, entry-&gt;skb-&gt;data + align,</div><div class='hunk'>@@ -635,7 +653,7 @@ void rt2x00lib_rxdone(struct rt2x00_dev *rt2x00dev,</div><div class='ctx'> </div><div class='ctx'> 		if (((rxdesc.dev_flags &amp; RXDONE_SIGNAL_PLCP) &amp;&amp;</div><div class='ctx'> 		     (rate-&gt;plcp == rxdesc.signal)) ||</div><div class='del'>-		    (!(rxdesc.dev_flags &amp; RXDONE_SIGNAL_PLCP) &amp;&amp;</div><div class='add'>+		    ((rxdesc.dev_flags &amp; RXDONE_SIGNAL_BITRATE) &amp;&amp;</div><div class='ctx'> 		      (rate-&gt;bitrate == rxdesc.signal))) {</div><div class='ctx'> 			idx = i;</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -657,6 +675,10 @@ void rt2x00lib_rxdone(struct rt2x00_dev *rt2x00dev,</div><div class='ctx'> 	    (rxdesc.dev_flags &amp; RXDONE_MY_BSS))</div><div class='ctx'> 		rt2x00lib_update_link_stats(&amp;rt2x00dev-&gt;link, rxdesc.rssi);</div><div class='ctx'> </div><div class='add'>+	rt2x00debug_update_crypto(rt2x00dev,</div><div class='add'>+				  rxdesc.cipher,</div><div class='add'>+				  rxdesc.cipher_status);</div><div class='add'>+</div><div class='ctx'> 	rt2x00dev-&gt;link.qual.rx_success++;</div><div class='ctx'> </div><div class='ctx'> 	rx_status-&gt;mactime = rxdesc.timestamp;</div><div class='hunk'>@@ -796,7 +818,6 @@ static int rt2x00lib_probe_hw_modes(struct rt2x00_dev *rt2x00dev,</div><div class='ctx'> 	struct ieee80211_rate *rates;</div><div class='ctx'> 	unsigned int num_rates;</div><div class='ctx'> 	unsigned int i;</div><div class='del'>-	unsigned char tx_power;</div><div class='ctx'> </div><div class='ctx'> 	num_rates = 0;</div><div class='ctx'> 	if (spec-&gt;supported_rates &amp; SUPPORT_RATE_CCK)</div><div class='hunk'>@@ -822,20 +843,9 @@ static int rt2x00lib_probe_hw_modes(struct rt2x00_dev *rt2x00dev,</div><div class='ctx'> 	 * Initialize Channel list.</div><div class='ctx'> 	 */</div><div class='ctx'> 	for (i = 0; i &lt; spec-&gt;num_channels; i++) {</div><div class='del'>-		if (spec-&gt;channels[i].channel &lt;= 14) {</div><div class='del'>-			if (spec-&gt;tx_power_bg)</div><div class='del'>-				tx_power = spec-&gt;tx_power_bg[i];</div><div class='del'>-			else</div><div class='del'>-				tx_power = spec-&gt;tx_power_default;</div><div class='del'>-		} else {</div><div class='del'>-			if (spec-&gt;tx_power_a)</div><div class='del'>-				tx_power = spec-&gt;tx_power_a[i];</div><div class='del'>-			else</div><div class='del'>-				tx_power = spec-&gt;tx_power_default;</div><div class='del'>-		}</div><div class='del'>-</div><div class='ctx'> 		rt2x00lib_channel(&amp;channels[i],</div><div class='del'>-				  spec-&gt;channels[i].channel, tx_power, i);</div><div class='add'>+				  spec-&gt;channels[i].channel,</div><div class='add'>+				  spec-&gt;channels_info[i].tx_power1, i);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -878,7 +888,7 @@ static int rt2x00lib_probe_hw_modes(struct rt2x00_dev *rt2x00dev,</div><div class='ctx'> </div><div class='ctx'> static void rt2x00lib_remove_hw(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> {</div><div class='del'>-	if (test_bit(DEVICE_REGISTERED_HW, &amp;rt2x00dev-&gt;flags))</div><div class='add'>+	if (test_bit(DEVICE_STATE_REGISTERED_HW, &amp;rt2x00dev-&gt;flags))</div><div class='ctx'> 		ieee80211_unregister_hw(rt2x00dev-&gt;hw);</div><div class='ctx'> </div><div class='ctx'> 	if (likely(rt2x00dev-&gt;hw-&gt;wiphy-&gt;bands[IEEE80211_BAND_2GHZ])) {</div><div class='hunk'>@@ -887,6 +897,8 @@ static void rt2x00lib_remove_hw(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> 		rt2x00dev-&gt;hw-&gt;wiphy-&gt;bands[IEEE80211_BAND_2GHZ] = NULL;</div><div class='ctx'> 		rt2x00dev-&gt;hw-&gt;wiphy-&gt;bands[IEEE80211_BAND_5GHZ] = NULL;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	kfree(rt2x00dev-&gt;spec.channels_info);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int rt2x00lib_probe_hw(struct rt2x00_dev *rt2x00dev)</div><div class='hunk'>@@ -894,6 +906,9 @@ static int rt2x00lib_probe_hw(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> 	struct hw_mode_spec *spec = &amp;rt2x00dev-&gt;spec;</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='add'>+	if (test_bit(DEVICE_STATE_REGISTERED_HW, &amp;rt2x00dev-&gt;flags))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Initialize HW modes.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -915,7 +930,7 @@ static int rt2x00lib_probe_hw(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> 		return status;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	__set_bit(DEVICE_REGISTERED_HW, &amp;rt2x00dev-&gt;flags);</div><div class='add'>+	set_bit(DEVICE_STATE_REGISTERED_HW, &amp;rt2x00dev-&gt;flags);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -925,7 +940,7 @@ static int rt2x00lib_probe_hw(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'>  */</div><div class='ctx'> static void rt2x00lib_uninitialize(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> {</div><div class='del'>-	if (!__test_and_clear_bit(DEVICE_INITIALIZED, &amp;rt2x00dev-&gt;flags))</div><div class='add'>+	if (!test_and_clear_bit(DEVICE_STATE_INITIALIZED, &amp;rt2x00dev-&gt;flags))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -948,7 +963,7 @@ static int rt2x00lib_initialize(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> {</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='del'>-	if (test_bit(DEVICE_INITIALIZED, &amp;rt2x00dev-&gt;flags))</div><div class='add'>+	if (test_bit(DEVICE_STATE_INITIALIZED, &amp;rt2x00dev-&gt;flags))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -967,7 +982,7 @@ static int rt2x00lib_initialize(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> 		return status;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	__set_bit(DEVICE_INITIALIZED, &amp;rt2x00dev-&gt;flags);</div><div class='add'>+	set_bit(DEVICE_STATE_INITIALIZED, &amp;rt2x00dev-&gt;flags);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Register the extra components.</div><div class='hunk'>@@ -981,7 +996,7 @@ int rt2x00lib_start(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> {</div><div class='ctx'> 	int retval;</div><div class='ctx'> </div><div class='del'>-	if (test_bit(DEVICE_STARTED, &amp;rt2x00dev-&gt;flags))</div><div class='add'>+	if (test_bit(DEVICE_STATE_STARTED, &amp;rt2x00dev-&gt;flags))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -999,28 +1014,18 @@ int rt2x00lib_start(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> 	if (retval)</div><div class='ctx'> 		return retval;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Enable radio.</div><div class='del'>-	 */</div><div class='del'>-	retval = rt2x00lib_enable_radio(rt2x00dev);</div><div class='del'>-	if (retval) {</div><div class='del'>-		rt2x00lib_uninitialize(rt2x00dev);</div><div class='del'>-		return retval;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	rt2x00dev-&gt;intf_ap_count = 0;</div><div class='ctx'> 	rt2x00dev-&gt;intf_sta_count = 0;</div><div class='ctx'> 	rt2x00dev-&gt;intf_associated = 0;</div><div class='ctx'> </div><div class='del'>-	__set_bit(DEVICE_STARTED, &amp;rt2x00dev-&gt;flags);</div><div class='del'>-	__set_bit(DEVICE_DIRTY_CONFIG, &amp;rt2x00dev-&gt;flags);</div><div class='add'>+	set_bit(DEVICE_STATE_STARTED, &amp;rt2x00dev-&gt;flags);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void rt2x00lib_stop(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> {</div><div class='del'>-	if (!test_bit(DEVICE_STARTED, &amp;rt2x00dev-&gt;flags))</div><div class='add'>+	if (!test_and_clear_bit(DEVICE_STATE_STARTED, &amp;rt2x00dev-&gt;flags))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1032,8 +1037,6 @@ void rt2x00lib_stop(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> 	rt2x00dev-&gt;intf_ap_count = 0;</div><div class='ctx'> 	rt2x00dev-&gt;intf_sta_count = 0;</div><div class='ctx'> 	rt2x00dev-&gt;intf_associated = 0;</div><div class='del'>-</div><div class='del'>-	__clear_bit(DEVICE_STARTED, &amp;rt2x00dev-&gt;flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1049,6 +1052,11 @@ int rt2x00lib_probe_dev(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> 	 */</div><div class='ctx'> 	rt2x00dev-&gt;hw-&gt;vif_data_size = sizeof(struct rt2x00_intf);</div><div class='ctx'> </div><div class='add'>+	rt2x00dev-&gt;hw-&gt;wiphy-&gt;interface_modes =</div><div class='add'>+	    BIT(NL80211_IFTYPE_AP) |</div><div class='add'>+	    BIT(NL80211_IFTYPE_STATION) |</div><div class='add'>+	    BIT(NL80211_IFTYPE_ADHOC);</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Let the driver probe the device to detect the capabilities.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -1088,7 +1096,7 @@ int rt2x00lib_probe_dev(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> 	rt2x00rfkill_allocate(rt2x00dev);</div><div class='ctx'> 	rt2x00debug_register(rt2x00dev);</div><div class='ctx'> </div><div class='del'>-	__set_bit(DEVICE_PRESENT, &amp;rt2x00dev-&gt;flags);</div><div class='add'>+	set_bit(DEVICE_STATE_PRESENT, &amp;rt2x00dev-&gt;flags);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1101,7 +1109,7 @@ EXPORT_SYMBOL_GPL(rt2x00lib_probe_dev);</div><div class='ctx'> </div><div class='ctx'> void rt2x00lib_remove_dev(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> {</div><div class='del'>-	__clear_bit(DEVICE_PRESENT, &amp;rt2x00dev-&gt;flags);</div><div class='add'>+	clear_bit(DEVICE_STATE_PRESENT, &amp;rt2x00dev-&gt;flags);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Disable radio.</div><div class='hunk'>@@ -1146,14 +1154,15 @@ int rt2x00lib_suspend(struct rt2x00_dev *rt2x00dev, pm_message_t state)</div><div class='ctx'> 	int retval;</div><div class='ctx'> </div><div class='ctx'> 	NOTICE(rt2x00dev, "Going to sleep.\n");</div><div class='del'>-	__clear_bit(DEVICE_PRESENT, &amp;rt2x00dev-&gt;flags);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Only continue if mac80211 has open interfaces.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!test_bit(DEVICE_STARTED, &amp;rt2x00dev-&gt;flags))</div><div class='add'>+	if (!test_and_clear_bit(DEVICE_STATE_PRESENT, &amp;rt2x00dev-&gt;flags) ||</div><div class='add'>+	    !test_bit(DEVICE_STATE_STARTED, &amp;rt2x00dev-&gt;flags))</div><div class='ctx'> 		goto exit;</div><div class='del'>-	__set_bit(DEVICE_STARTED_SUSPEND, &amp;rt2x00dev-&gt;flags);</div><div class='add'>+</div><div class='add'>+	set_bit(DEVICE_STATE_STARTED_SUSPEND, &amp;rt2x00dev-&gt;flags);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Disable radio.</div><div class='hunk'>@@ -1203,8 +1212,8 @@ static void rt2x00lib_resume_intf(void *data, u8 *mac,</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Master or Ad-hoc mode require a new beacon update.</div><div class='ctx'> 	 */</div><div class='del'>-	if (vif-&gt;type == IEEE80211_IF_TYPE_AP ||</div><div class='del'>-	    vif-&gt;type == IEEE80211_IF_TYPE_IBSS)</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_AP ||</div><div class='add'>+	    vif-&gt;type == NL80211_IFTYPE_ADHOC)</div><div class='ctx'> 		intf-&gt;delayed_flags |= DELAYED_UPDATE_BEACON;</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock(&amp;intf-&gt;lock);</div><div class='hunk'>@@ -1225,7 +1234,7 @@ int rt2x00lib_resume(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Only continue if mac80211 had open interfaces.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!__test_and_clear_bit(DEVICE_STARTED_SUSPEND, &amp;rt2x00dev-&gt;flags))</div><div class='add'>+	if (!test_and_clear_bit(DEVICE_STATE_STARTED_SUSPEND, &amp;rt2x00dev-&gt;flags))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1252,7 +1261,7 @@ int rt2x00lib_resume(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We are ready again to receive requests from mac80211.</div><div class='ctx'> 	 */</div><div class='del'>-	__set_bit(DEVICE_PRESENT, &amp;rt2x00dev-&gt;flags);</div><div class='add'>+	set_bit(DEVICE_STATE_PRESENT, &amp;rt2x00dev-&gt;flags);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * It is possible that during that mac80211 has attempted</div><div class='hunk'>@@ -1272,7 +1281,7 @@ int rt2x00lib_resume(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> exit:</div><div class='del'>-	rt2x00lib_disable_radio(rt2x00dev);</div><div class='add'>+	rt2x00lib_stop(rt2x00dev);</div><div class='ctx'> 	rt2x00lib_uninitialize(rt2x00dev);</div><div class='ctx'> 	rt2x00debug_deregister(rt2x00dev);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/rt2x00/rt2x00lib.h b/drivers/net/wireless/rt2x00/rt2x00lib.h<br/>index c5fb3a72cf37..797eb619aa0a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/rt2x00/rt2x00lib.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/rt2x00/rt2x00lib.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/rt2x00/rt2x00lib.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/rt2x00/rt2x00lib.h</a></div><div class='hunk'>@@ -88,7 +88,7 @@ void rt2x00lib_stop(struct rt2x00_dev *rt2x00dev);</div><div class='ctx'>  */</div><div class='ctx'> void rt2x00lib_config_intf(struct rt2x00_dev *rt2x00dev,</div><div class='ctx'> 			   struct rt2x00_intf *intf,</div><div class='del'>-			   enum ieee80211_if_types type,</div><div class='add'>+			   enum nl80211_iftype type,</div><div class='ctx'> 			   u8 *mac, u8 *bssid);</div><div class='ctx'> void rt2x00lib_config_erp(struct rt2x00_dev *rt2x00dev,</div><div class='ctx'> 			  struct rt2x00_intf *intf,</div><div class='hunk'>@@ -181,6 +181,8 @@ void rt2x00debug_register(struct rt2x00_dev *rt2x00dev);</div><div class='ctx'> void rt2x00debug_deregister(struct rt2x00_dev *rt2x00dev);</div><div class='ctx'> void rt2x00debug_dump_frame(struct rt2x00_dev *rt2x00dev,</div><div class='ctx'> 			    enum rt2x00_dump_type type, struct sk_buff *skb);</div><div class='add'>+void rt2x00debug_update_crypto(struct rt2x00_dev *rt2x00dev,</div><div class='add'>+			       enum cipher cipher, enum rx_crypto status);</div><div class='ctx'> #else</div><div class='ctx'> static inline void rt2x00debug_register(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -195,9 +197,54 @@ static inline void rt2x00debug_dump_frame(struct rt2x00_dev *rt2x00dev,</div><div class='ctx'> 					  struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static inline void rt2x00debug_update_crypto(struct rt2x00_dev *rt2x00dev,</div><div class='add'>+					     enum cipher cipher,</div><div class='add'>+					     enum rx_crypto status)</div><div class='add'>+{</div><div class='add'>+}</div><div class='ctx'> #endif /* CONFIG_RT2X00_LIB_DEBUGFS */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Crypto handlers.</div><div class='add'>+ */</div><div class='add'>+#ifdef CONFIG_RT2X00_LIB_CRYPTO</div><div class='add'>+enum cipher rt2x00crypto_key_to_cipher(struct ieee80211_key_conf *key);</div><div class='add'>+unsigned int rt2x00crypto_tx_overhead(struct ieee80211_tx_info *tx_info);</div><div class='add'>+void rt2x00crypto_tx_remove_iv(struct sk_buff *skb, unsigned int iv_len);</div><div class='add'>+void rt2x00crypto_tx_insert_iv(struct sk_buff *skb);</div><div class='add'>+void rt2x00crypto_rx_insert_iv(struct sk_buff *skb, unsigned int align,</div><div class='add'>+			       unsigned int header_length,</div><div class='add'>+			       struct rxdone_entry_desc *rxdesc);</div><div class='add'>+#else</div><div class='add'>+static inline enum cipher rt2x00crypto_key_to_cipher(struct ieee80211_key_conf *key)</div><div class='add'>+{</div><div class='add'>+	return CIPHER_NONE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned int rt2x00crypto_tx_overhead(struct ieee80211_tx_info *tx_info)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void rt2x00crypto_tx_remove_iv(struct sk_buff *skb,</div><div class='add'>+					     unsigned int iv_len)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void rt2x00crypto_tx_insert_iv(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void rt2x00crypto_rx_insert_iv(struct sk_buff *skb,</div><div class='add'>+					     unsigned int align,</div><div class='add'>+					     unsigned int header_length,</div><div class='add'>+					     struct rxdone_entry_desc *rxdesc)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * RFkill handlers.</div><div class='ctx'>  */</div><div class='ctx'> #ifdef CONFIG_RT2X00_LIB_RFKILL</div><div class='head'>diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c<br/>index d06507388635..2c6cc5c374ff 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/rt2x00/rt2x00mac.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/rt2x00/rt2x00mac.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/rt2x00/rt2x00mac.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/rt2x00/rt2x00mac.c</a></div><div class='hunk'>@@ -36,21 +36,22 @@ static int rt2x00mac_tx_rts_cts(struct rt2x00_dev *rt2x00dev,</div><div class='ctx'> 	struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(frag_skb);</div><div class='ctx'> 	struct ieee80211_tx_info *rts_info;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='del'>-	int size;</div><div class='add'>+	unsigned int data_length;</div><div class='add'>+	int retval = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (tx_info-&gt;flags &amp; IEEE80211_TX_CTL_USE_CTS_PROTECT)</div><div class='del'>-		size = sizeof(struct ieee80211_cts);</div><div class='add'>+		data_length = sizeof(struct ieee80211_cts);</div><div class='ctx'> 	else</div><div class='del'>-		size = sizeof(struct ieee80211_rts);</div><div class='add'>+		data_length = sizeof(struct ieee80211_rts);</div><div class='ctx'> </div><div class='del'>-	skb = dev_alloc_skb(size + rt2x00dev-&gt;hw-&gt;extra_tx_headroom);</div><div class='del'>-	if (!skb) {</div><div class='add'>+	skb = dev_alloc_skb(data_length + rt2x00dev-&gt;hw-&gt;extra_tx_headroom);</div><div class='add'>+	if (unlikely(!skb)) {</div><div class='ctx'> 		WARNING(rt2x00dev, "Failed to create RTS/CTS frame.\n");</div><div class='del'>-		return NETDEV_TX_BUSY;</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	skb_reserve(skb, rt2x00dev-&gt;hw-&gt;extra_tx_headroom);</div><div class='del'>-	skb_put(skb, size);</div><div class='add'>+	skb_put(skb, data_length);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Copy TX information over from original frame to</div><div class='hunk'>@@ -63,7 +64,6 @@ static int rt2x00mac_tx_rts_cts(struct rt2x00_dev *rt2x00dev,</div><div class='ctx'> 	 */</div><div class='ctx'> 	memcpy(skb-&gt;cb, frag_skb-&gt;cb, sizeof(skb-&gt;cb));</div><div class='ctx'> 	rts_info = IEEE80211_SKB_CB(skb);</div><div class='del'>-	rts_info-&gt;control.hw_key = NULL;</div><div class='ctx'> 	rts_info-&gt;flags &amp;= ~IEEE80211_TX_CTL_USE_RTS_CTS;</div><div class='ctx'> 	rts_info-&gt;flags &amp;= ~IEEE80211_TX_CTL_USE_CTS_PROTECT;</div><div class='ctx'> 	rts_info-&gt;flags &amp;= ~IEEE80211_TX_CTL_REQ_TX_STATUS;</div><div class='hunk'>@@ -73,22 +73,33 @@ static int rt2x00mac_tx_rts_cts(struct rt2x00_dev *rt2x00dev,</div><div class='ctx'> 	else</div><div class='ctx'> 		rts_info-&gt;flags &amp;= ~IEEE80211_TX_CTL_NO_ACK;</div><div class='ctx'> </div><div class='add'>+	skb-&gt;do_not_encrypt = 1;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * RTS/CTS frame should use the length of the frame plus any</div><div class='add'>+	 * encryption overhead that will be added by the hardware.</div><div class='add'>+	 */</div><div class='add'>+#ifdef CONFIG_RT2X00_LIB_CRYPTO</div><div class='add'>+	if (!frag_skb-&gt;do_not_encrypt)</div><div class='add'>+		data_length += rt2x00crypto_tx_overhead(tx_info);</div><div class='add'>+#endif /* CONFIG_RT2X00_LIB_CRYPTO */</div><div class='add'>+</div><div class='ctx'> 	if (tx_info-&gt;flags &amp; IEEE80211_TX_CTL_USE_CTS_PROTECT)</div><div class='ctx'> 		ieee80211_ctstoself_get(rt2x00dev-&gt;hw, tx_info-&gt;control.vif,</div><div class='del'>-					frag_skb-&gt;data, size, tx_info,</div><div class='add'>+					frag_skb-&gt;data, data_length, tx_info,</div><div class='ctx'> 					(struct ieee80211_cts *)(skb-&gt;data));</div><div class='ctx'> 	else</div><div class='ctx'> 		ieee80211_rts_get(rt2x00dev-&gt;hw, tx_info-&gt;control.vif,</div><div class='del'>-				  frag_skb-&gt;data, size, tx_info,</div><div class='add'>+				  frag_skb-&gt;data, data_length, tx_info,</div><div class='ctx'> 				  (struct ieee80211_rts *)(skb-&gt;data));</div><div class='ctx'> </div><div class='del'>-	if (rt2x00queue_write_tx_frame(queue, skb)) {</div><div class='add'>+	retval = rt2x00queue_write_tx_frame(queue, skb);</div><div class='add'>+	if (retval) {</div><div class='ctx'> 		dev_kfree_skb_any(skb);</div><div class='ctx'> 		WARNING(rt2x00dev, "Failed to send RTS/CTS frame.\n");</div><div class='del'>-		return NETDEV_TX_BUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return NETDEV_TX_OK;</div><div class='add'>+	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int rt2x00mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb)</div><div class='hunk'>@@ -106,11 +117,8 @@ int rt2x00mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb)</div><div class='ctx'> 	 * Note that we can only stop the TX queues inside the TX path</div><div class='ctx'> 	 * due to possible race conditions in mac80211.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!test_bit(DEVICE_PRESENT, &amp;rt2x00dev-&gt;flags)) {</div><div class='del'>-		ieee80211_stop_queues(hw);</div><div class='del'>-		dev_kfree_skb_any(skb);</div><div class='del'>-		return NETDEV_TX_OK;</div><div class='del'>-	}</div><div class='add'>+	if (!test_bit(DEVICE_STATE_PRESENT, &amp;rt2x00dev-&gt;flags))</div><div class='add'>+		goto exit_fail;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Determine which queue to put packet on.</div><div class='hunk'>@@ -141,26 +149,25 @@ int rt2x00mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb)</div><div class='ctx'> 	if ((tx_info-&gt;flags &amp; (IEEE80211_TX_CTL_USE_RTS_CTS |</div><div class='ctx'> 			       IEEE80211_TX_CTL_USE_CTS_PROTECT)) &amp;&amp;</div><div class='ctx'> 	    !rt2x00dev-&gt;ops-&gt;hw-&gt;set_rts_threshold) {</div><div class='del'>-		if (rt2x00queue_available(queue) &lt;= 1) {</div><div class='del'>-			ieee80211_stop_queue(rt2x00dev-&gt;hw, qid);</div><div class='del'>-			return NETDEV_TX_BUSY;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (rt2x00mac_tx_rts_cts(rt2x00dev, queue, skb)) {</div><div class='del'>-			ieee80211_stop_queue(rt2x00dev-&gt;hw, qid);</div><div class='del'>-			return NETDEV_TX_BUSY;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+		if (rt2x00queue_available(queue) &lt;= 1)</div><div class='add'>+			goto exit_fail;</div><div class='ctx'> </div><div class='del'>-	if (rt2x00queue_write_tx_frame(queue, skb)) {</div><div class='del'>-		ieee80211_stop_queue(rt2x00dev-&gt;hw, qid);</div><div class='del'>-		return NETDEV_TX_BUSY;</div><div class='add'>+		if (rt2x00mac_tx_rts_cts(rt2x00dev, queue, skb))</div><div class='add'>+			goto exit_fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (rt2x00queue_write_tx_frame(queue, skb))</div><div class='add'>+		goto exit_fail;</div><div class='add'>+</div><div class='ctx'> 	if (rt2x00queue_threshold(queue))</div><div class='ctx'> 		ieee80211_stop_queue(rt2x00dev-&gt;hw, qid);</div><div class='ctx'> </div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='add'>+</div><div class='add'>+ exit_fail:</div><div class='add'>+	ieee80211_stop_queue(rt2x00dev-&gt;hw, qid);</div><div class='add'>+	dev_kfree_skb_any(skb);</div><div class='add'>+	return NETDEV_TX_OK;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(rt2x00mac_tx);</div><div class='ctx'> </div><div class='hunk'>@@ -168,7 +175,7 @@ int rt2x00mac_start(struct ieee80211_hw *hw)</div><div class='ctx'> {</div><div class='ctx'> 	struct rt2x00_dev *rt2x00dev = hw-&gt;priv;</div><div class='ctx'> </div><div class='del'>-	if (!test_bit(DEVICE_PRESENT, &amp;rt2x00dev-&gt;flags))</div><div class='add'>+	if (!test_bit(DEVICE_STATE_PRESENT, &amp;rt2x00dev-&gt;flags))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	return rt2x00lib_start(rt2x00dev);</div><div class='hunk'>@@ -179,7 +186,7 @@ void rt2x00mac_stop(struct ieee80211_hw *hw)</div><div class='ctx'> {</div><div class='ctx'> 	struct rt2x00_dev *rt2x00dev = hw-&gt;priv;</div><div class='ctx'> </div><div class='del'>-	if (!test_bit(DEVICE_PRESENT, &amp;rt2x00dev-&gt;flags))</div><div class='add'>+	if (!test_bit(DEVICE_STATE_PRESENT, &amp;rt2x00dev-&gt;flags))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	rt2x00lib_stop(rt2x00dev);</div><div class='hunk'>@@ -199,12 +206,12 @@ int rt2x00mac_add_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 	 * Don't allow interfaces to be added</div><div class='ctx'> 	 * the device has disappeared.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!test_bit(DEVICE_PRESENT, &amp;rt2x00dev-&gt;flags) ||</div><div class='del'>-	    !test_bit(DEVICE_STARTED, &amp;rt2x00dev-&gt;flags))</div><div class='add'>+	if (!test_bit(DEVICE_STATE_PRESENT, &amp;rt2x00dev-&gt;flags) ||</div><div class='add'>+	    !test_bit(DEVICE_STATE_STARTED, &amp;rt2x00dev-&gt;flags))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	switch (conf-&gt;type) {</div><div class='del'>-	case IEEE80211_IF_TYPE_AP:</div><div class='add'>+	case NL80211_IFTYPE_AP:</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * We don't support mixed combinations of</div><div class='ctx'> 		 * sta and ap interfaces.</div><div class='hunk'>@@ -220,8 +227,8 @@ int rt2x00mac_add_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 			return -ENOBUFS;</div><div class='ctx'> </div><div class='ctx'> 		break;</div><div class='del'>-	case IEEE80211_IF_TYPE_STA:</div><div class='del'>-	case IEEE80211_IF_TYPE_IBSS:</div><div class='add'>+	case NL80211_IFTYPE_STATION:</div><div class='add'>+	case NL80211_IFTYPE_ADHOC:</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * We don't support mixed combinations of</div><div class='ctx'> 		 * sta and ap interfaces.</div><div class='hunk'>@@ -249,7 +256,7 @@ int rt2x00mac_add_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 	 */</div><div class='ctx'> 	for (i = 0; i &lt; queue-&gt;limit; i++) {</div><div class='ctx'> 		entry = &amp;queue-&gt;entries[i];</div><div class='del'>-		if (!__test_and_set_bit(ENTRY_BCN_ASSIGNED, &amp;entry-&gt;flags))</div><div class='add'>+		if (!test_and_set_bit(ENTRY_BCN_ASSIGNED, &amp;entry-&gt;flags))</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -261,7 +268,7 @@ int rt2x00mac_add_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 	 * increase interface count and start initialization.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	if (conf-&gt;type == IEEE80211_IF_TYPE_AP)</div><div class='add'>+	if (conf-&gt;type == NL80211_IFTYPE_AP)</div><div class='ctx'> 		rt2x00dev-&gt;intf_ap_count++;</div><div class='ctx'> 	else</div><div class='ctx'> 		rt2x00dev-&gt;intf_sta_count++;</div><div class='hunk'>@@ -270,7 +277,7 @@ int rt2x00mac_add_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 	spin_lock_init(&amp;intf-&gt;seqlock);</div><div class='ctx'> 	intf-&gt;beacon = entry;</div><div class='ctx'> </div><div class='del'>-	if (conf-&gt;type == IEEE80211_IF_TYPE_AP)</div><div class='add'>+	if (conf-&gt;type == NL80211_IFTYPE_AP)</div><div class='ctx'> 		memcpy(&amp;intf-&gt;bssid, conf-&gt;mac_addr, ETH_ALEN);</div><div class='ctx'> 	memcpy(&amp;intf-&gt;mac, conf-&gt;mac_addr, ETH_ALEN);</div><div class='ctx'> </div><div class='hunk'>@@ -303,12 +310,12 @@ void rt2x00mac_remove_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 	 * either the device has disappeared or when</div><div class='ctx'> 	 * no interface is present.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!test_bit(DEVICE_PRESENT, &amp;rt2x00dev-&gt;flags) ||</div><div class='del'>-	    (conf-&gt;type == IEEE80211_IF_TYPE_AP &amp;&amp; !rt2x00dev-&gt;intf_ap_count) ||</div><div class='del'>-	    (conf-&gt;type != IEEE80211_IF_TYPE_AP &amp;&amp; !rt2x00dev-&gt;intf_sta_count))</div><div class='add'>+	if (!test_bit(DEVICE_STATE_PRESENT, &amp;rt2x00dev-&gt;flags) ||</div><div class='add'>+	    (conf-&gt;type == NL80211_IFTYPE_AP &amp;&amp; !rt2x00dev-&gt;intf_ap_count) ||</div><div class='add'>+	    (conf-&gt;type != NL80211_IFTYPE_AP &amp;&amp; !rt2x00dev-&gt;intf_sta_count))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (conf-&gt;type == IEEE80211_IF_TYPE_AP)</div><div class='add'>+	if (conf-&gt;type == NL80211_IFTYPE_AP)</div><div class='ctx'> 		rt2x00dev-&gt;intf_ap_count--;</div><div class='ctx'> 	else</div><div class='ctx'> 		rt2x00dev-&gt;intf_sta_count--;</div><div class='hunk'>@@ -317,59 +324,59 @@ void rt2x00mac_remove_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 	 * Release beacon entry so it is available for</div><div class='ctx'> 	 * new interfaces again.</div><div class='ctx'> 	 */</div><div class='del'>-	__clear_bit(ENTRY_BCN_ASSIGNED, &amp;intf-&gt;beacon-&gt;flags);</div><div class='add'>+	clear_bit(ENTRY_BCN_ASSIGNED, &amp;intf-&gt;beacon-&gt;flags);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Make sure the bssid and mac address registers</div><div class='ctx'> 	 * are cleared to prevent false ACKing of frames.</div><div class='ctx'> 	 */</div><div class='ctx'> 	rt2x00lib_config_intf(rt2x00dev, intf,</div><div class='del'>-			      IEEE80211_IF_TYPE_INVALID, NULL, NULL);</div><div class='add'>+			      NL80211_IFTYPE_UNSPECIFIED, NULL, NULL);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(rt2x00mac_remove_interface);</div><div class='ctx'> </div><div class='ctx'> int rt2x00mac_config(struct ieee80211_hw *hw, struct ieee80211_conf *conf)</div><div class='ctx'> {</div><div class='ctx'> 	struct rt2x00_dev *rt2x00dev = hw-&gt;priv;</div><div class='del'>-	int force_reconfig;</div><div class='add'>+	int radio_on;</div><div class='add'>+	int status;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Mac80211 might be calling this function while we are trying</div><div class='ctx'> 	 * to remove the device or perhaps suspending it.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!test_bit(DEVICE_PRESENT, &amp;rt2x00dev-&gt;flags))</div><div class='add'>+	if (!test_bit(DEVICE_STATE_PRESENT, &amp;rt2x00dev-&gt;flags))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Check if we need to disable the radio,</div><div class='del'>-	 * if this is not the case, at least the RX must be disabled.</div><div class='add'>+	 * Only change device state when the radio is enabled. It does not</div><div class='add'>+	 * matter what parameters we have configured when the radio is disabled</div><div class='add'>+	 * because we won't be able to send or receive anyway. Also note that</div><div class='add'>+	 * some configuration parameters (e.g. channel and antenna values) can</div><div class='add'>+	 * only be set when the radio is enabled.</div><div class='ctx'> 	 */</div><div class='del'>-	if (test_bit(DEVICE_ENABLED_RADIO, &amp;rt2x00dev-&gt;flags)) {</div><div class='del'>-		if (!conf-&gt;radio_enabled)</div><div class='del'>-			rt2x00lib_disable_radio(rt2x00dev);</div><div class='del'>-		else</div><div class='del'>-			rt2x00lib_toggle_rx(rt2x00dev, STATE_RADIO_RX_OFF);</div><div class='del'>-	}</div><div class='add'>+	radio_on = test_bit(DEVICE_STATE_ENABLED_RADIO, &amp;rt2x00dev-&gt;flags);</div><div class='add'>+	if (conf-&gt;radio_enabled) {</div><div class='add'>+		/* For programming the values, we have to turn RX off */</div><div class='add'>+		rt2x00lib_toggle_rx(rt2x00dev, STATE_RADIO_RX_OFF);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * When the DEVICE_DIRTY_CONFIG flag is set, the device has recently</div><div class='del'>-	 * been started and the configuration must be forced upon the hardware.</div><div class='del'>-	 * Otherwise registers will not be intialized correctly and could</div><div class='del'>-	 * result in non-working hardware because essential registers aren't</div><div class='del'>-	 * initialized.</div><div class='del'>-	 */</div><div class='del'>-	force_reconfig =</div><div class='del'>-	    __test_and_clear_bit(DEVICE_DIRTY_CONFIG, &amp;rt2x00dev-&gt;flags);</div><div class='add'>+		/* Enable the radio */</div><div class='add'>+		status = rt2x00lib_enable_radio(rt2x00dev);</div><div class='add'>+		if (unlikely(status))</div><div class='add'>+			return status;</div><div class='ctx'> </div><div class='del'>-	rt2x00lib_config(rt2x00dev, conf, force_reconfig);</div><div class='add'>+		/*</div><div class='add'>+		 * When we've just turned on the radio, we want to reprogram</div><div class='add'>+		 * everything to ensure a consistent state</div><div class='add'>+		 */</div><div class='add'>+		rt2x00lib_config(rt2x00dev, conf, !radio_on);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Reenable RX only if the radio should be on.</div><div class='del'>-	 */</div><div class='del'>-	if (test_bit(DEVICE_ENABLED_RADIO, &amp;rt2x00dev-&gt;flags))</div><div class='add'>+		/* Turn RX back on */</div><div class='ctx'> 		rt2x00lib_toggle_rx(rt2x00dev, STATE_RADIO_RX_ON);</div><div class='del'>-	else if (conf-&gt;radio_enabled)</div><div class='del'>-		return rt2x00lib_enable_radio(rt2x00dev);</div><div class='add'>+	} else {</div><div class='add'>+		/* Disable the radio */</div><div class='add'>+		rt2x00lib_disable_radio(rt2x00dev);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -388,7 +395,7 @@ int rt2x00mac_config_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 	 * Mac80211 might be calling this function while we are trying</div><div class='ctx'> 	 * to remove the device or perhaps suspending it.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!test_bit(DEVICE_PRESENT, &amp;rt2x00dev-&gt;flags))</div><div class='add'>+	if (!test_bit(DEVICE_STATE_PRESENT, &amp;rt2x00dev-&gt;flags))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;intf-&gt;lock);</div><div class='hunk'>@@ -467,6 +474,91 @@ void rt2x00mac_configure_filter(struct ieee80211_hw *hw,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(rt2x00mac_configure_filter);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_RT2X00_LIB_CRYPTO</div><div class='add'>+int rt2x00mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,</div><div class='add'>+		      const u8 *local_address, const u8 *address,</div><div class='add'>+		      struct ieee80211_key_conf *key)</div><div class='add'>+{</div><div class='add'>+	struct rt2x00_dev *rt2x00dev = hw-&gt;priv;</div><div class='add'>+	int (*set_key) (struct rt2x00_dev *rt2x00dev,</div><div class='add'>+			struct rt2x00lib_crypto *crypto,</div><div class='add'>+			struct ieee80211_key_conf *key);</div><div class='add'>+	struct rt2x00lib_crypto crypto;</div><div class='add'>+</div><div class='add'>+	if (!test_bit(CONFIG_SUPPORT_HW_CRYPTO, &amp;rt2x00dev-&gt;flags))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	else if (key-&gt;keylen &gt; 32)</div><div class='add'>+		return -ENOSPC;</div><div class='add'>+</div><div class='add'>+	memset(&amp;crypto, 0, sizeof(crypto));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * When in STA mode, bssidx is always 0 otherwise local_address[5]</div><div class='add'>+	 * contains the bss number, see BSS_ID_MASK comments for details.</div><div class='add'>+	 */</div><div class='add'>+	if (rt2x00dev-&gt;intf_sta_count)</div><div class='add'>+		crypto.bssidx = 0;</div><div class='add'>+	else</div><div class='add'>+		crypto.bssidx =</div><div class='add'>+		    local_address[5] &amp; (rt2x00dev-&gt;ops-&gt;max_ap_intf - 1);</div><div class='add'>+</div><div class='add'>+	crypto.cipher = rt2x00crypto_key_to_cipher(key);</div><div class='add'>+	if (crypto.cipher == CIPHER_NONE)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	crypto.cmd = cmd;</div><div class='add'>+	crypto.address = address;</div><div class='add'>+</div><div class='add'>+	if (crypto.cipher == CIPHER_TKIP) {</div><div class='add'>+		if (key-&gt;keylen &gt; NL80211_TKIP_DATA_OFFSET_ENCR_KEY)</div><div class='add'>+			memcpy(&amp;crypto.key,</div><div class='add'>+			       &amp;key-&gt;key[NL80211_TKIP_DATA_OFFSET_ENCR_KEY],</div><div class='add'>+			       sizeof(crypto.key));</div><div class='add'>+</div><div class='add'>+		if (key-&gt;keylen &gt; NL80211_TKIP_DATA_OFFSET_TX_MIC_KEY)</div><div class='add'>+			memcpy(&amp;crypto.tx_mic,</div><div class='add'>+			       &amp;key-&gt;key[NL80211_TKIP_DATA_OFFSET_TX_MIC_KEY],</div><div class='add'>+			       sizeof(crypto.tx_mic));</div><div class='add'>+</div><div class='add'>+		if (key-&gt;keylen &gt; NL80211_TKIP_DATA_OFFSET_RX_MIC_KEY)</div><div class='add'>+			memcpy(&amp;crypto.rx_mic,</div><div class='add'>+			       &amp;key-&gt;key[NL80211_TKIP_DATA_OFFSET_RX_MIC_KEY],</div><div class='add'>+			       sizeof(crypto.rx_mic));</div><div class='add'>+	} else</div><div class='add'>+		memcpy(&amp;crypto.key, &amp;key-&gt;key[0], key-&gt;keylen);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Each BSS has a maximum of 4 shared keys.</div><div class='add'>+	 * Shared key index values:</div><div class='add'>+	 *	0) BSS0 key0</div><div class='add'>+	 *	1) BSS0 key1</div><div class='add'>+	 *	...</div><div class='add'>+	 *	4) BSS1 key0</div><div class='add'>+	 *	...</div><div class='add'>+	 *	8) BSS2 key0</div><div class='add'>+	 *	...</div><div class='add'>+	 * Both pairwise as shared key indeces are determined by</div><div class='add'>+	 * driver. This is required because the hardware requires</div><div class='add'>+	 * keys to be assigned in correct order (When key 1 is</div><div class='add'>+	 * provided but key 0 is not, then the key is not found</div><div class='add'>+	 * by the hardware during RX).</div><div class='add'>+	 */</div><div class='add'>+	if (cmd == SET_KEY)</div><div class='add'>+		key-&gt;hw_key_idx = 0;</div><div class='add'>+</div><div class='add'>+	if (key-&gt;flags &amp; IEEE80211_KEY_FLAG_PAIRWISE)</div><div class='add'>+		set_key = rt2x00dev-&gt;ops-&gt;lib-&gt;config_pairwise_key;</div><div class='add'>+	else</div><div class='add'>+		set_key = rt2x00dev-&gt;ops-&gt;lib-&gt;config_shared_key;</div><div class='add'>+</div><div class='add'>+	if (!set_key)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return set_key(rt2x00dev, &amp;crypto, key);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(rt2x00mac_set_key);</div><div class='add'>+#endif /* CONFIG_RT2X00_LIB_CRYPTO */</div><div class='add'>+</div><div class='ctx'> int rt2x00mac_get_stats(struct ieee80211_hw *hw,</div><div class='ctx'> 			struct ieee80211_low_level_stats *stats)</div><div class='ctx'> {</div><div class='hunk'>@@ -575,10 +667,11 @@ int rt2x00mac_conf_tx(struct ieee80211_hw *hw, u16 queue_idx,</div><div class='ctx'> 		queue-&gt;cw_max = 10; /* cw_min: 2^10 = 1024. */</div><div class='ctx'> </div><div class='ctx'> 	queue-&gt;aifs = params-&gt;aifs;</div><div class='add'>+	queue-&gt;txop = params-&gt;txop;</div><div class='ctx'> </div><div class='ctx'> 	INFO(rt2x00dev,</div><div class='del'>-	     "Configured TX queue %d - CWmin: %d, CWmax: %d, Aifs: %d.\n",</div><div class='del'>-	     queue_idx, queue-&gt;cw_min, queue-&gt;cw_max, queue-&gt;aifs);</div><div class='add'>+	     "Configured TX queue %d - CWmin: %d, CWmax: %d, Aifs: %d, TXop: %d.\n",</div><div class='add'>+	     queue_idx, queue-&gt;cw_min, queue-&gt;cw_max, queue-&gt;aifs, queue-&gt;txop);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c<br/>index 898cdd7f57d9..451d410ecdae 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/rt2x00/rt2x00queue.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/rt2x00/rt2x00queue.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/rt2x00/rt2x00queue.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/rt2x00/rt2x00queue.c</a></div><div class='hunk'>@@ -33,10 +33,11 @@</div><div class='ctx'> struct sk_buff *rt2x00queue_alloc_rxskb(struct rt2x00_dev *rt2x00dev,</div><div class='ctx'> 					struct queue_entry *entry)</div><div class='ctx'> {</div><div class='del'>-	unsigned int frame_size;</div><div class='del'>-	unsigned int reserved_size;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	struct skb_frame_desc *skbdesc;</div><div class='add'>+	unsigned int frame_size;</div><div class='add'>+	unsigned int head_size = 0;</div><div class='add'>+	unsigned int tail_size = 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The frame size includes descriptor size, because the</div><div class='hunk'>@@ -49,16 +50,32 @@ struct sk_buff *rt2x00queue_alloc_rxskb(struct rt2x00_dev *rt2x00dev,</div><div class='ctx'> 	 * this means we need at least 3 bytes for moving the frame</div><div class='ctx'> 	 * into the correct offset.</div><div class='ctx'> 	 */</div><div class='del'>-	reserved_size = 4;</div><div class='add'>+	head_size = 4;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * For IV/EIV/ICV assembly we must make sure there is</div><div class='add'>+	 * at least 8 bytes bytes available in headroom for IV/EIV</div><div class='add'>+	 * and 4 bytes for ICV data as tailroon.</div><div class='add'>+	 */</div><div class='add'>+#ifdef CONFIG_RT2X00_LIB_CRYPTO</div><div class='add'>+	if (test_bit(CONFIG_SUPPORT_HW_CRYPTO, &amp;rt2x00dev-&gt;flags)) {</div><div class='add'>+		head_size += 8;</div><div class='add'>+		tail_size += 4;</div><div class='add'>+	}</div><div class='add'>+#endif /* CONFIG_RT2X00_LIB_CRYPTO */</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Allocate skbuffer.</div><div class='ctx'> 	 */</div><div class='del'>-	skb = dev_alloc_skb(frame_size + reserved_size);</div><div class='add'>+	skb = dev_alloc_skb(frame_size + head_size + tail_size);</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	skb_reserve(skb, reserved_size);</div><div class='add'>+	/*</div><div class='add'>+	 * Make sure we not have a frame with the requested bytes</div><div class='add'>+	 * available in the head and tail.</div><div class='add'>+	 */</div><div class='add'>+	skb_reserve(skb, head_size);</div><div class='ctx'> 	skb_put(skb, frame_size);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -83,8 +100,21 @@ void rt2x00queue_map_txskb(struct rt2x00_dev *rt2x00dev, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct skb_frame_desc *skbdesc = get_skb_frame_desc(skb);</div><div class='ctx'> </div><div class='del'>-	skbdesc-&gt;skb_dma = dma_map_single(rt2x00dev-&gt;dev, skb-&gt;data, skb-&gt;len,</div><div class='del'>-					  DMA_TO_DEVICE);</div><div class='add'>+	/*</div><div class='add'>+	 * If device has requested headroom, we should make sure that</div><div class='add'>+	 * is also mapped to the DMA so it can be used for transfering</div><div class='add'>+	 * additional descriptor information to the hardware.</div><div class='add'>+	 */</div><div class='add'>+	skb_push(skb, rt2x00dev-&gt;hw-&gt;extra_tx_headroom);</div><div class='add'>+</div><div class='add'>+	skbdesc-&gt;skb_dma =</div><div class='add'>+	    dma_map_single(rt2x00dev-&gt;dev, skb-&gt;data, skb-&gt;len, DMA_TO_DEVICE);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Restore data pointer to original location again.</div><div class='add'>+	 */</div><div class='add'>+	skb_pull(skb, rt2x00dev-&gt;hw-&gt;extra_tx_headroom);</div><div class='add'>+</div><div class='ctx'> 	skbdesc-&gt;flags |= SKBDESC_DMA_MAPPED_TX;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(rt2x00queue_map_txskb);</div><div class='hunk'>@@ -100,7 +130,12 @@ void rt2x00queue_unmap_skb(struct rt2x00_dev *rt2x00dev, struct sk_buff *skb)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (skbdesc-&gt;flags &amp; SKBDESC_DMA_MAPPED_TX) {</div><div class='del'>-		dma_unmap_single(rt2x00dev-&gt;dev, skbdesc-&gt;skb_dma, skb-&gt;len,</div><div class='add'>+		/*</div><div class='add'>+		 * Add headroom to the skb length, it has been removed</div><div class='add'>+		 * by the driver, but it was actually mapped to DMA.</div><div class='add'>+		 */</div><div class='add'>+		dma_unmap_single(rt2x00dev-&gt;dev, skbdesc-&gt;skb_dma,</div><div class='add'>+				 skb-&gt;len + rt2x00dev-&gt;hw-&gt;extra_tx_headroom,</div><div class='ctx'> 				 DMA_TO_DEVICE);</div><div class='ctx'> 		skbdesc-&gt;flags &amp;= ~SKBDESC_DMA_MAPPED_TX;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -120,7 +155,6 @@ static void rt2x00queue_create_tx_descriptor(struct queue_entry *entry,</div><div class='ctx'> {</div><div class='ctx'> 	struct rt2x00_dev *rt2x00dev = entry-&gt;queue-&gt;rt2x00dev;</div><div class='ctx'> 	struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(entry-&gt;skb);</div><div class='del'>-	struct rt2x00_intf *intf = vif_to_intf(tx_info-&gt;control.vif);</div><div class='ctx'> 	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)entry-&gt;skb-&gt;data;</div><div class='ctx'> 	struct ieee80211_rate *rate =</div><div class='ctx'> 	    ieee80211_get_tx_rate(rt2x00dev-&gt;hw, tx_info);</div><div class='hunk'>@@ -140,7 +174,7 @@ static void rt2x00queue_create_tx_descriptor(struct queue_entry *entry,</div><div class='ctx'> 	txdesc-&gt;cw_max = entry-&gt;queue-&gt;cw_max;</div><div class='ctx'> 	txdesc-&gt;aifs = entry-&gt;queue-&gt;aifs;</div><div class='ctx'> </div><div class='del'>-	/* Data length should be extended with 4 bytes for CRC */</div><div class='add'>+	/* Data length + CRC + IV/EIV/ICV/MMIC (when using encryption) */</div><div class='ctx'> 	data_length = entry-&gt;skb-&gt;len + 4;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -149,6 +183,35 @@ static void rt2x00queue_create_tx_descriptor(struct queue_entry *entry,</div><div class='ctx'> 	if (!(tx_info-&gt;flags &amp; IEEE80211_TX_CTL_NO_ACK))</div><div class='ctx'> 		__set_bit(ENTRY_TXD_ACK, &amp;txdesc-&gt;flags);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_RT2X00_LIB_CRYPTO</div><div class='add'>+	if (test_bit(CONFIG_SUPPORT_HW_CRYPTO, &amp;rt2x00dev-&gt;flags) &amp;&amp;</div><div class='add'>+	    !entry-&gt;skb-&gt;do_not_encrypt) {</div><div class='add'>+		struct ieee80211_key_conf *hw_key = tx_info-&gt;control.hw_key;</div><div class='add'>+</div><div class='add'>+		__set_bit(ENTRY_TXD_ENCRYPT, &amp;txdesc-&gt;flags);</div><div class='add'>+</div><div class='add'>+		txdesc-&gt;cipher = rt2x00crypto_key_to_cipher(hw_key);</div><div class='add'>+</div><div class='add'>+		if (hw_key-&gt;flags &amp; IEEE80211_KEY_FLAG_PAIRWISE)</div><div class='add'>+			__set_bit(ENTRY_TXD_ENCRYPT_PAIRWISE, &amp;txdesc-&gt;flags);</div><div class='add'>+</div><div class='add'>+		txdesc-&gt;key_idx = hw_key-&gt;hw_key_idx;</div><div class='add'>+		txdesc-&gt;iv_offset = ieee80211_get_hdrlen_from_skb(entry-&gt;skb);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Extend frame length to include all encryption overhead</div><div class='add'>+		 * that will be added by the hardware.</div><div class='add'>+		 */</div><div class='add'>+		data_length += rt2x00crypto_tx_overhead(tx_info);</div><div class='add'>+</div><div class='add'>+		if (!(hw_key-&gt;flags &amp; IEEE80211_KEY_FLAG_GENERATE_IV))</div><div class='add'>+			__set_bit(ENTRY_TXD_ENCRYPT_IV, &amp;txdesc-&gt;flags);</div><div class='add'>+</div><div class='add'>+		if (!(hw_key-&gt;flags &amp; IEEE80211_KEY_FLAG_GENERATE_MMIC))</div><div class='add'>+			__set_bit(ENTRY_TXD_ENCRYPT_MMIC, &amp;txdesc-&gt;flags);</div><div class='add'>+	}</div><div class='add'>+#endif /* CONFIG_RT2X00_LIB_CRYPTO */</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Check if this is a RTS/CTS frame</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -214,16 +277,22 @@ static void rt2x00queue_create_tx_descriptor(struct queue_entry *entry,</div><div class='ctx'> 	 * sequence counter given by mac80211.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (tx_info-&gt;flags &amp; IEEE80211_TX_CTL_ASSIGN_SEQ) {</div><div class='del'>-		spin_lock_irqsave(&amp;intf-&gt;seqlock, irqflags);</div><div class='add'>+		if (likely(tx_info-&gt;control.vif)) {</div><div class='add'>+			struct rt2x00_intf *intf;</div><div class='add'>+</div><div class='add'>+			intf = vif_to_intf(tx_info-&gt;control.vif);</div><div class='ctx'> </div><div class='del'>-		if (test_bit(ENTRY_TXD_FIRST_FRAGMENT, &amp;txdesc-&gt;flags))</div><div class='del'>-			intf-&gt;seqno += 0x10;</div><div class='del'>-		hdr-&gt;seq_ctrl &amp;= cpu_to_le16(IEEE80211_SCTL_FRAG);</div><div class='del'>-		hdr-&gt;seq_ctrl |= cpu_to_le16(intf-&gt;seqno);</div><div class='add'>+			spin_lock_irqsave(&amp;intf-&gt;seqlock, irqflags);</div><div class='ctx'> </div><div class='del'>-		spin_unlock_irqrestore(&amp;intf-&gt;seqlock, irqflags);</div><div class='add'>+			if (test_bit(ENTRY_TXD_FIRST_FRAGMENT, &amp;txdesc-&gt;flags))</div><div class='add'>+				intf-&gt;seqno += 0x10;</div><div class='add'>+			hdr-&gt;seq_ctrl &amp;= cpu_to_le16(IEEE80211_SCTL_FRAG);</div><div class='add'>+			hdr-&gt;seq_ctrl |= cpu_to_le16(intf-&gt;seqno);</div><div class='ctx'> </div><div class='del'>-		__set_bit(ENTRY_TXD_GENERATE_SEQ, &amp;txdesc-&gt;flags);</div><div class='add'>+			spin_unlock_irqrestore(&amp;intf-&gt;seqlock, irqflags);</div><div class='add'>+</div><div class='add'>+			__set_bit(ENTRY_TXD_GENERATE_SEQ, &amp;txdesc-&gt;flags);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -305,11 +374,12 @@ int rt2x00queue_write_tx_frame(struct data_queue *queue, struct sk_buff *skb)</div><div class='ctx'> 	struct queue_entry *entry = rt2x00queue_get_entry(queue, Q_INDEX);</div><div class='ctx'> 	struct txentry_desc txdesc;</div><div class='ctx'> 	struct skb_frame_desc *skbdesc;</div><div class='add'>+	unsigned int iv_len = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(rt2x00queue_full(queue)))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (__test_and_set_bit(ENTRY_OWNER_DEVICE_DATA, &amp;entry-&gt;flags)) {</div><div class='add'>+	if (test_and_set_bit(ENTRY_OWNER_DEVICE_DATA, &amp;entry-&gt;flags)) {</div><div class='ctx'> 		ERROR(queue-&gt;rt2x00dev,</div><div class='ctx'> 		      "Arrived at non-free entry in the non-full queue %d.\n"</div><div class='ctx'> 		      "Please file bug report to %s.\n",</div><div class='hunk'>@@ -325,22 +395,44 @@ int rt2x00queue_write_tx_frame(struct data_queue *queue, struct sk_buff *skb)</div><div class='ctx'> 	entry-&gt;skb = skb;</div><div class='ctx'> 	rt2x00queue_create_tx_descriptor(entry, &amp;txdesc);</div><div class='ctx'> </div><div class='add'>+	if (IEEE80211_SKB_CB(skb)-&gt;control.hw_key != NULL)</div><div class='add'>+		iv_len = IEEE80211_SKB_CB(skb)-&gt;control.hw_key-&gt;iv_len;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='del'>-	 * skb-&gt;cb array is now ours and we are free to use it.</div><div class='add'>+	 * All information is retreived from the skb-&gt;cb array,</div><div class='add'>+	 * now we should claim ownership of the driver part of that</div><div class='add'>+	 * array.</div><div class='ctx'> 	 */</div><div class='ctx'> 	skbdesc = get_skb_frame_desc(entry-&gt;skb);</div><div class='ctx'> 	memset(skbdesc, 0, sizeof(*skbdesc));</div><div class='ctx'> 	skbdesc-&gt;entry = entry;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * When hardware encryption is supported, and this frame</div><div class='add'>+	 * is to be encrypted, we should strip the IV/EIV data from</div><div class='add'>+	 * the frame so we can provide it to the driver seperately.</div><div class='add'>+	 */</div><div class='add'>+	if (test_bit(ENTRY_TXD_ENCRYPT, &amp;txdesc.flags) &amp;&amp;</div><div class='add'>+	    !test_bit(ENTRY_TXD_ENCRYPT_IV, &amp;txdesc.flags)) {</div><div class='add'>+		rt2x00crypto_tx_remove_iv(skb, iv_len);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * It could be possible that the queue was corrupted and this</div><div class='add'>+	 * call failed. Just drop the frame, we cannot rollback and pass</div><div class='add'>+	 * the frame to mac80211 because the skb-&gt;cb has now been tainted.</div><div class='add'>+	 */</div><div class='ctx'> 	if (unlikely(queue-&gt;rt2x00dev-&gt;ops-&gt;lib-&gt;write_tx_data(entry))) {</div><div class='del'>-		__clear_bit(ENTRY_OWNER_DEVICE_DATA, &amp;entry-&gt;flags);</div><div class='del'>-		return -EIO;</div><div class='add'>+		clear_bit(ENTRY_OWNER_DEVICE_DATA, &amp;entry-&gt;flags);</div><div class='add'>+		dev_kfree_skb_any(entry-&gt;skb);</div><div class='add'>+		entry-&gt;skb = NULL;</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (test_bit(DRIVER_REQUIRE_DMA, &amp;queue-&gt;rt2x00dev-&gt;flags))</div><div class='ctx'> 		rt2x00queue_map_txskb(queue-&gt;rt2x00dev, skb);</div><div class='ctx'> </div><div class='del'>-	__set_bit(ENTRY_DATA_PENDING, &amp;entry-&gt;flags);</div><div class='add'>+	set_bit(ENTRY_DATA_PENDING, &amp;entry-&gt;flags);</div><div class='ctx'> </div><div class='ctx'> 	rt2x00queue_index_inc(queue, Q_INDEX);</div><div class='ctx'> 	rt2x00queue_write_tx_descriptor(entry, &amp;txdesc);</div><div class='hunk'>@@ -653,6 +745,7 @@ static void rt2x00queue_init(struct rt2x00_dev *rt2x00dev,</div><div class='ctx'> </div><div class='ctx'> 	queue-&gt;rt2x00dev = rt2x00dev;</div><div class='ctx'> 	queue-&gt;qid = qid;</div><div class='add'>+	queue-&gt;txop = 0;</div><div class='ctx'> 	queue-&gt;aifs = 2;</div><div class='ctx'> 	queue-&gt;cw_min = 5;</div><div class='ctx'> 	queue-&gt;cw_max = 10;</div><div class='head'>diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.h b/drivers/net/wireless/rt2x00/rt2x00queue.h<br/>index ff78e52ce43c..9dbf04f0f04c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/rt2x00/rt2x00queue.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/rt2x00/rt2x00queue.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/rt2x00/rt2x00queue.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/rt2x00/rt2x00queue.h</a></div><div class='hunk'>@@ -87,10 +87,13 @@ enum data_queue_qid {</div><div class='ctx'>  *</div><div class='ctx'>  * @SKBDESC_DMA_MAPPED_RX: &amp;skb_dma field has been mapped for RX</div><div class='ctx'>  * @SKBDESC_DMA_MAPPED_TX: &amp;skb_dma field has been mapped for TX</div><div class='add'>+ * @FRAME_DESC_IV_STRIPPED: Frame contained a IV/EIV provided by</div><div class='add'>+ *	mac80211 but was stripped for processing by the driver.</div><div class='ctx'>  */</div><div class='ctx'> enum skb_frame_desc_flags {</div><div class='del'>-	SKBDESC_DMA_MAPPED_RX = (1 &lt;&lt; 0),</div><div class='del'>-	SKBDESC_DMA_MAPPED_TX = (1 &lt;&lt; 1),</div><div class='add'>+	SKBDESC_DMA_MAPPED_RX = 1 &lt;&lt; 0,</div><div class='add'>+	SKBDESC_DMA_MAPPED_TX = 1 &lt;&lt; 1,</div><div class='add'>+	FRAME_DESC_IV_STRIPPED = 1 &lt;&lt; 2,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -104,6 +107,8 @@ enum skb_frame_desc_flags {</div><div class='ctx'>  * @desc: Pointer to descriptor part of the frame.</div><div class='ctx'>  *	Note that this pointer could point to something outside</div><div class='ctx'>  *	of the scope of the skb-&gt;data pointer.</div><div class='add'>+ * @iv: IV data used during encryption/decryption.</div><div class='add'>+ * @eiv: EIV data used during encryption/decryption.</div><div class='ctx'>  * @skb_dma: (PCI-only) the DMA address associated with the sk buffer.</div><div class='ctx'>  * @entry: The entry to which this sk buffer belongs.</div><div class='ctx'>  */</div><div class='hunk'>@@ -113,6 +118,9 @@ struct skb_frame_desc {</div><div class='ctx'> 	unsigned int desc_len;</div><div class='ctx'> 	void *desc;</div><div class='ctx'> </div><div class='add'>+	__le32 iv;</div><div class='add'>+	__le32 eiv;</div><div class='add'>+</div><div class='ctx'> 	dma_addr_t skb_dma;</div><div class='ctx'> </div><div class='ctx'> 	struct queue_entry *entry;</div><div class='hunk'>@@ -132,13 +140,14 @@ static inline struct skb_frame_desc* get_skb_frame_desc(struct sk_buff *skb)</div><div class='ctx'> /**</div><div class='ctx'>  * enum rxdone_entry_desc_flags: Flags for &amp;struct rxdone_entry_desc</div><div class='ctx'>  *</div><div class='del'>- * @RXDONE_SIGNAL_PLCP: Does the signal field contain the plcp value,</div><div class='del'>- *	or does it contain the bitrate itself.</div><div class='add'>+ * @RXDONE_SIGNAL_PLCP: Signal field contains the plcp value.</div><div class='add'>+ * @RXDONE_SIGNAL_BITRATE: Signal field contains the bitrate value.</div><div class='ctx'>  * @RXDONE_MY_BSS: Does this frame originate from device's BSS.</div><div class='ctx'>  */</div><div class='ctx'> enum rxdone_entry_desc_flags {</div><div class='ctx'> 	RXDONE_SIGNAL_PLCP = 1 &lt;&lt; 0,</div><div class='del'>-	RXDONE_MY_BSS = 1 &lt;&lt; 1,</div><div class='add'>+	RXDONE_SIGNAL_BITRATE = 1 &lt;&lt; 1,</div><div class='add'>+	RXDONE_MY_BSS = 1 &lt;&lt; 2,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -152,7 +161,11 @@ enum rxdone_entry_desc_flags {</div><div class='ctx'>  * @size: Data size of the received frame.</div><div class='ctx'>  * @flags: MAC80211 receive flags (See &amp;enum mac80211_rx_flags).</div><div class='ctx'>  * @dev_flags: Ralink receive flags (See &amp;enum rxdone_entry_desc_flags).</div><div class='del'>-</div><div class='add'>+ * @cipher: Cipher type used during decryption.</div><div class='add'>+ * @cipher_status: Decryption status.</div><div class='add'>+ * @iv: IV data used during decryption.</div><div class='add'>+ * @eiv: EIV data used during decryption.</div><div class='add'>+ * @icv: ICV data used during decryption.</div><div class='ctx'>  */</div><div class='ctx'> struct rxdone_entry_desc {</div><div class='ctx'> 	u64 timestamp;</div><div class='hunk'>@@ -161,6 +174,12 @@ struct rxdone_entry_desc {</div><div class='ctx'> 	int size;</div><div class='ctx'> 	int flags;</div><div class='ctx'> 	int dev_flags;</div><div class='add'>+	u8 cipher;</div><div class='add'>+	u8 cipher_status;</div><div class='add'>+</div><div class='add'>+	__le32 iv;</div><div class='add'>+	__le32 eiv;</div><div class='add'>+	__le32 icv;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -206,6 +225,10 @@ struct txdone_entry_desc {</div><div class='ctx'>  * @ENTRY_TXD_BURST: This frame belongs to the same burst event.</div><div class='ctx'>  * @ENTRY_TXD_ACK: An ACK is required for this frame.</div><div class='ctx'>  * @ENTRY_TXD_RETRY_MODE: When set, the long retry count is used.</div><div class='add'>+ * @ENTRY_TXD_ENCRYPT: This frame should be encrypted.</div><div class='add'>+ * @ENTRY_TXD_ENCRYPT_PAIRWISE: Use pairwise key table (instead of shared).</div><div class='add'>+ * @ENTRY_TXD_ENCRYPT_IV: Generate IV/EIV in hardware.</div><div class='add'>+ * @ENTRY_TXD_ENCRYPT_MMIC: Generate MIC in hardware.</div><div class='ctx'>  */</div><div class='ctx'> enum txentry_desc_flags {</div><div class='ctx'> 	ENTRY_TXD_RTS_FRAME,</div><div class='hunk'>@@ -218,6 +241,10 @@ enum txentry_desc_flags {</div><div class='ctx'> 	ENTRY_TXD_BURST,</div><div class='ctx'> 	ENTRY_TXD_ACK,</div><div class='ctx'> 	ENTRY_TXD_RETRY_MODE,</div><div class='add'>+	ENTRY_TXD_ENCRYPT,</div><div class='add'>+	ENTRY_TXD_ENCRYPT_PAIRWISE,</div><div class='add'>+	ENTRY_TXD_ENCRYPT_IV,</div><div class='add'>+	ENTRY_TXD_ENCRYPT_MMIC,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -236,6 +263,9 @@ enum txentry_desc_flags {</div><div class='ctx'>  * @ifs: IFS value.</div><div class='ctx'>  * @cw_min: cwmin value.</div><div class='ctx'>  * @cw_max: cwmax value.</div><div class='add'>+ * @cipher: Cipher type used for encryption.</div><div class='add'>+ * @key_idx: Key index used for encryption.</div><div class='add'>+ * @iv_offset: Position where IV should be inserted by hardware.</div><div class='ctx'>  */</div><div class='ctx'> struct txentry_desc {</div><div class='ctx'> 	unsigned long flags;</div><div class='hunk'>@@ -252,6 +282,10 @@ struct txentry_desc {</div><div class='ctx'> 	short ifs;</div><div class='ctx'> 	short cw_min;</div><div class='ctx'> 	short cw_max;</div><div class='add'>+</div><div class='add'>+	enum cipher cipher;</div><div class='add'>+	u16 key_idx;</div><div class='add'>+	u16 iv_offset;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -335,6 +369,7 @@ enum queue_index {</div><div class='ctx'>  * @length: Number of frames in queue.</div><div class='ctx'>  * @index: Index pointers to entry positions in the queue,</div><div class='ctx'>  *	use &amp;enum queue_index to get a specific index field.</div><div class='add'>+ * @txop: maximum burst time.</div><div class='ctx'>  * @aifs: The aifs value for outgoing frames (field ignored in RX queue).</div><div class='ctx'>  * @cw_min: The cw min value for outgoing frames (field ignored in RX queue).</div><div class='ctx'>  * @cw_max: The cw max value for outgoing frames (field ignored in RX queue).</div><div class='hunk'>@@ -354,6 +389,7 @@ struct data_queue {</div><div class='ctx'> 	unsigned short length;</div><div class='ctx'> 	unsigned short index[Q_INDEX_MAX];</div><div class='ctx'> </div><div class='add'>+	unsigned short txop;</div><div class='ctx'> 	unsigned short aifs;</div><div class='ctx'> 	unsigned short cw_min;</div><div class='ctx'> 	unsigned short cw_max;</div><div class='hunk'>@@ -484,25 +520,51 @@ static inline int rt2x00queue_threshold(struct data_queue *queue)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * rt2x00_desc_read - Read a word from the hardware descriptor.</div><div class='add'>+ * _rt2x00_desc_read - Read a word from the hardware descriptor.</div><div class='add'>+ * @desc: Base descriptor address</div><div class='add'>+ * @word: Word index from where the descriptor should be read.</div><div class='add'>+ * @value: Address where the descriptor value should be written into.</div><div class='add'>+ */</div><div class='add'>+static inline void _rt2x00_desc_read(__le32 *desc, const u8 word, __le32 *value)</div><div class='add'>+{</div><div class='add'>+	*value = desc[word];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * rt2x00_desc_read - Read a word from the hardware descriptor, this</div><div class='add'>+ * function will take care of the byte ordering.</div><div class='ctx'>  * @desc: Base descriptor address</div><div class='ctx'>  * @word: Word index from where the descriptor should be read.</div><div class='ctx'>  * @value: Address where the descriptor value should be written into.</div><div class='ctx'>  */</div><div class='ctx'> static inline void rt2x00_desc_read(__le32 *desc, const u8 word, u32 *value)</div><div class='ctx'> {</div><div class='del'>-	*value = le32_to_cpu(desc[word]);</div><div class='add'>+	__le32 tmp;</div><div class='add'>+	_rt2x00_desc_read(desc, word, &amp;tmp);</div><div class='add'>+	*value = le32_to_cpu(tmp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * rt2x00_desc_write - write a word to the hardware descriptor, this</div><div class='add'>+ * function will take care of the byte ordering.</div><div class='add'>+ * @desc: Base descriptor address</div><div class='add'>+ * @word: Word index from where the descriptor should be written.</div><div class='add'>+ * @value: Value that should be written into the descriptor.</div><div class='add'>+ */</div><div class='add'>+static inline void _rt2x00_desc_write(__le32 *desc, const u8 word, __le32 value)</div><div class='add'>+{</div><div class='add'>+	desc[word] = value;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * rt2x00_desc_write - wrote a word to the hardware descriptor.</div><div class='add'>+ * rt2x00_desc_write - write a word to the hardware descriptor.</div><div class='ctx'>  * @desc: Base descriptor address</div><div class='ctx'>  * @word: Word index from where the descriptor should be written.</div><div class='ctx'>  * @value: Value that should be written into the descriptor.</div><div class='ctx'>  */</div><div class='ctx'> static inline void rt2x00_desc_write(__le32 *desc, const u8 word, u32 value)</div><div class='ctx'> {</div><div class='del'>-	desc[word] = cpu_to_le32(value);</div><div class='add'>+	_rt2x00_desc_write(desc, word, cpu_to_le32(value));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #endif /* RT2X00QUEUE_H */</div><div class='head'>diff --git a/drivers/net/wireless/rt2x00/rt2x00reg.h b/drivers/net/wireless/rt2x00/rt2x00reg.h<br/>index 2ea7866abd5d..c2fba7c9f05c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/rt2x00/rt2x00reg.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/rt2x00/rt2x00reg.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/rt2x00/rt2x00reg.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/rt2x00/rt2x00reg.h</a></div><div class='hunk'>@@ -27,6 +27,16 @@</div><div class='ctx'> #define RT2X00REG_H</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * RX crypto status</div><div class='add'>+ */</div><div class='add'>+enum rx_crypto {</div><div class='add'>+	RX_CRYPTO_SUCCESS = 0,</div><div class='add'>+	RX_CRYPTO_FAIL_ICV = 1,</div><div class='add'>+	RX_CRYPTO_FAIL_MIC = 2,</div><div class='add'>+	RX_CRYPTO_FAIL_KEY = 3,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Antenna values</div><div class='ctx'>  */</div><div class='ctx'> enum antenna {</div><div class='hunk'>@@ -104,7 +114,14 @@ enum cipher {</div><div class='ctx'>  */</div><div class='ctx'> 	CIPHER_CKIP64 = 5,</div><div class='ctx'> 	CIPHER_CKIP128 = 6,</div><div class='del'>-	CIPHER_TKIP_NO_MIC = 7,</div><div class='add'>+	CIPHER_TKIP_NO_MIC = 7, /* Don't send to device */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Max cipher type.</div><div class='add'>+ * Note that CIPHER_NONE isn't counted, and CKIP64 and CKIP128</div><div class='add'>+ * are excluded due to limitations in mac80211.</div><div class='add'>+ */</div><div class='add'>+	CIPHER_MAX = 4,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/drivers/net/wireless/rt2x00/rt2x00rfkill.c b/drivers/net/wireless/rt2x00/rt2x00rfkill.c<br/>index 04b29716d356..c3f53a92180a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/rt2x00/rt2x00rfkill.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/rt2x00/rt2x00rfkill.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/rt2x00/rt2x00rfkill.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/rt2x00/rt2x00rfkill.c</a></div><div class='hunk'>@@ -41,20 +41,19 @@ static int rt2x00rfkill_toggle_radio(void *data, enum rfkill_state state)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Only continue if there are enabled interfaces.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!test_bit(DEVICE_STARTED, &amp;rt2x00dev-&gt;flags))</div><div class='add'>+	if (!test_bit(DEVICE_STATE_STARTED, &amp;rt2x00dev-&gt;flags))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (state == RFKILL_STATE_UNBLOCKED) {</div><div class='del'>-		INFO(rt2x00dev, "Hardware button pressed, enabling radio.\n");</div><div class='del'>-		__clear_bit(DEVICE_DISABLED_RADIO_HW, &amp;rt2x00dev-&gt;flags);</div><div class='add'>+		INFO(rt2x00dev, "RFKILL event: enabling radio.\n");</div><div class='add'>+		clear_bit(DEVICE_STATE_DISABLED_RADIO_HW, &amp;rt2x00dev-&gt;flags);</div><div class='ctx'> 		retval = rt2x00lib_enable_radio(rt2x00dev);</div><div class='ctx'> 	} else if (state == RFKILL_STATE_SOFT_BLOCKED) {</div><div class='del'>-		INFO(rt2x00dev, "Hardware button pressed, disabling radio.\n");</div><div class='del'>-		__set_bit(DEVICE_DISABLED_RADIO_HW, &amp;rt2x00dev-&gt;flags);</div><div class='add'>+		INFO(rt2x00dev, "RFKILL event: disabling radio.\n");</div><div class='add'>+		set_bit(DEVICE_STATE_DISABLED_RADIO_HW, &amp;rt2x00dev-&gt;flags);</div><div class='ctx'> 		rt2x00lib_disable_radio(rt2x00dev);</div><div class='ctx'> 	} else {</div><div class='del'>-		WARNING(rt2x00dev, "Received unexpected rfkill state %d.\n",</div><div class='del'>-			state);</div><div class='add'>+		WARNING(rt2x00dev, "RFKILL event: unknown state %d.\n", state);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return retval;</div><div class='hunk'>@@ -64,7 +63,12 @@ static int rt2x00rfkill_get_state(void *data, enum rfkill_state *state)</div><div class='ctx'> {</div><div class='ctx'> 	struct rt2x00_dev *rt2x00dev = data;</div><div class='ctx'> </div><div class='del'>-	*state = rt2x00dev-&gt;rfkill-&gt;state;</div><div class='add'>+	/*</div><div class='add'>+	 * rfkill_poll reports 1 when the key has been pressed and the</div><div class='add'>+	 * radio should be blocked.</div><div class='add'>+	 */</div><div class='add'>+	*state = rt2x00dev-&gt;ops-&gt;lib-&gt;rfkill_poll(rt2x00dev) ?</div><div class='add'>+	    RFKILL_STATE_SOFT_BLOCKED : RFKILL_STATE_UNBLOCKED;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -73,19 +77,18 @@ static void rt2x00rfkill_poll(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	struct rt2x00_dev *rt2x00dev =</div><div class='ctx'> 	    container_of(work, struct rt2x00_dev, rfkill_work.work);</div><div class='del'>-	int state;</div><div class='add'>+	enum rfkill_state state;</div><div class='ctx'> </div><div class='del'>-	if (!test_bit(RFKILL_STATE_REGISTERED, &amp;rt2x00dev-&gt;rfkill_state))</div><div class='add'>+	if (!test_bit(RFKILL_STATE_REGISTERED, &amp;rt2x00dev-&gt;rfkill_state) ||</div><div class='add'>+	    !test_bit(CONFIG_SUPPORT_HW_BUTTON, &amp;rt2x00dev-&gt;flags))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * rfkill_poll reports 1 when the key has been pressed and the</div><div class='del'>-	 * radio should be blocked.</div><div class='add'>+	 * Poll latest state and report it to rfkill who should sort</div><div class='add'>+	 * out if the state should be toggled or not.</div><div class='ctx'> 	 */</div><div class='del'>-	state = !rt2x00dev-&gt;ops-&gt;lib-&gt;rfkill_poll(rt2x00dev) ?</div><div class='del'>-	    RFKILL_STATE_UNBLOCKED : RFKILL_STATE_SOFT_BLOCKED;</div><div class='del'>-</div><div class='del'>-	rfkill_force_state(rt2x00dev-&gt;rfkill, state);</div><div class='add'>+	if (!rt2x00rfkill_get_state(rt2x00dev, &amp;state))</div><div class='add'>+		rfkill_force_state(rt2x00dev-&gt;rfkill, state);</div><div class='ctx'> </div><div class='ctx'> 	queue_delayed_work(rt2x00dev-&gt;hw-&gt;workqueue,</div><div class='ctx'> 			   &amp;rt2x00dev-&gt;rfkill_work, RFKILL_POLL_INTERVAL);</div><div class='hunk'>@@ -93,8 +96,8 @@ static void rt2x00rfkill_poll(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> void rt2x00rfkill_register(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> {</div><div class='del'>-	if (!test_bit(CONFIG_SUPPORT_HW_BUTTON, &amp;rt2x00dev-&gt;flags) ||</div><div class='del'>-	    !test_bit(RFKILL_STATE_ALLOCATED, &amp;rt2x00dev-&gt;rfkill_state))</div><div class='add'>+	if (!test_bit(RFKILL_STATE_ALLOCATED, &amp;rt2x00dev-&gt;rfkill_state) ||</div><div class='add'>+	    test_bit(RFKILL_STATE_REGISTERED, &amp;rt2x00dev-&gt;rfkill_state))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (rfkill_register(rt2x00dev-&gt;rfkill)) {</div><div class='hunk'>@@ -114,7 +117,7 @@ void rt2x00rfkill_register(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> </div><div class='ctx'> void rt2x00rfkill_unregister(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> {</div><div class='del'>-	if (!test_bit(CONFIG_SUPPORT_HW_BUTTON, &amp;rt2x00dev-&gt;flags) ||</div><div class='add'>+	if (!test_bit(RFKILL_STATE_ALLOCATED, &amp;rt2x00dev-&gt;rfkill_state) ||</div><div class='ctx'> 	    !test_bit(RFKILL_STATE_REGISTERED, &amp;rt2x00dev-&gt;rfkill_state))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -127,21 +130,30 @@ void rt2x00rfkill_unregister(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> </div><div class='ctx'> void rt2x00rfkill_allocate(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> {</div><div class='del'>-	if (!test_bit(CONFIG_SUPPORT_HW_BUTTON, &amp;rt2x00dev-&gt;flags))</div><div class='add'>+	struct device *dev = wiphy_dev(rt2x00dev-&gt;hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (test_bit(RFKILL_STATE_ALLOCATED, &amp;rt2x00dev-&gt;rfkill_state))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	rt2x00dev-&gt;rfkill =</div><div class='del'>-	    rfkill_allocate(wiphy_dev(rt2x00dev-&gt;hw-&gt;wiphy), RFKILL_TYPE_WLAN);</div><div class='add'>+	rt2x00dev-&gt;rfkill = rfkill_allocate(dev, RFKILL_TYPE_WLAN);</div><div class='ctx'> 	if (!rt2x00dev-&gt;rfkill) {</div><div class='ctx'> 		ERROR(rt2x00dev, "Failed to allocate rfkill handler.\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	__set_bit(RFKILL_STATE_ALLOCATED, &amp;rt2x00dev-&gt;rfkill_state);</div><div class='add'>+</div><div class='ctx'> 	rt2x00dev-&gt;rfkill-&gt;name = rt2x00dev-&gt;ops-&gt;name;</div><div class='ctx'> 	rt2x00dev-&gt;rfkill-&gt;data = rt2x00dev;</div><div class='del'>-	rt2x00dev-&gt;rfkill-&gt;state = -1;</div><div class='ctx'> 	rt2x00dev-&gt;rfkill-&gt;toggle_radio = rt2x00rfkill_toggle_radio;</div><div class='del'>-	rt2x00dev-&gt;rfkill-&gt;get_state = rt2x00rfkill_get_state;</div><div class='add'>+	if (test_bit(CONFIG_SUPPORT_HW_BUTTON, &amp;rt2x00dev-&gt;flags)) {</div><div class='add'>+		rt2x00dev-&gt;rfkill-&gt;get_state = rt2x00rfkill_get_state;</div><div class='add'>+		rt2x00dev-&gt;rfkill-&gt;state =</div><div class='add'>+			rt2x00dev-&gt;ops-&gt;lib-&gt;rfkill_poll(rt2x00dev) ?</div><div class='add'>+			    RFKILL_STATE_SOFT_BLOCKED : RFKILL_STATE_UNBLOCKED;</div><div class='add'>+	} else {</div><div class='add'>+		rt2x00dev-&gt;rfkill-&gt;state = RFKILL_STATE_UNBLOCKED;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	INIT_DELAYED_WORK(&amp;rt2x00dev-&gt;rfkill_work, rt2x00rfkill_poll);</div><div class='ctx'> </div><div class='hunk'>@@ -150,8 +162,7 @@ void rt2x00rfkill_allocate(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> </div><div class='ctx'> void rt2x00rfkill_free(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> {</div><div class='del'>-	if (!test_bit(CONFIG_SUPPORT_HW_BUTTON, &amp;rt2x00dev-&gt;flags) ||</div><div class='del'>-	    !test_bit(RFKILL_STATE_ALLOCATED, &amp;rt2x00dev-&gt;rfkill_state))</div><div class='add'>+	if (!test_bit(RFKILL_STATE_ALLOCATED, &amp;rt2x00dev-&gt;flags))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	cancel_delayed_work_sync(&amp;rt2x00dev-&gt;rfkill_work);</div><div class='head'>diff --git a/drivers/net/wireless/rt2x00/rt2x00usb.c b/drivers/net/wireless/rt2x00/rt2x00usb.c<br/>index 2050227ea530..b73a7e0aeed4 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/rt2x00/rt2x00usb.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/rt2x00/rt2x00usb.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/rt2x00/rt2x00usb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/rt2x00/rt2x00usb.c</a></div><div class='hunk'>@@ -163,16 +163,11 @@ static void rt2x00usb_interrupt_txdone(struct urb *urb)</div><div class='ctx'> 	struct rt2x00_dev *rt2x00dev = entry-&gt;queue-&gt;rt2x00dev;</div><div class='ctx'> 	struct txdone_entry_desc txdesc;</div><div class='ctx'> </div><div class='del'>-	if (!test_bit(DEVICE_ENABLED_RADIO, &amp;rt2x00dev-&gt;flags) ||</div><div class='add'>+	if (!test_bit(DEVICE_STATE_ENABLED_RADIO, &amp;rt2x00dev-&gt;flags) ||</div><div class='ctx'> 	    !test_bit(ENTRY_OWNER_DEVICE_DATA, &amp;entry-&gt;flags))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Remove the descriptor data from the buffer.</div><div class='del'>-	 */</div><div class='del'>-	skb_pull(entry-&gt;skb, entry-&gt;queue-&gt;desc_size);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='ctx'> 	 * Obtain the status about this packet.</div><div class='ctx'> 	 * Note that when the status is 0 it does not mean the</div><div class='ctx'> 	 * frame was send out correctly. It only means the frame</div><div class='hunk'>@@ -224,6 +219,12 @@ int rt2x00usb_write_tx_data(struct queue_entry *entry)</div><div class='ctx'> 			  entry-&gt;skb-&gt;data, length,</div><div class='ctx'> 			  rt2x00usb_interrupt_txdone, entry);</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Make sure the skb-&gt;data pointer points to the frame, not the</div><div class='add'>+	 * descriptor.</div><div class='add'>+	 */</div><div class='add'>+	skb_pull(entry-&gt;skb, entry-&gt;queue-&gt;desc_size);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(rt2x00usb_write_tx_data);</div><div class='hunk'>@@ -232,7 +233,7 @@ static inline void rt2x00usb_kick_tx_entry(struct queue_entry *entry)</div><div class='ctx'> {</div><div class='ctx'> 	struct queue_entry_priv_usb *entry_priv = entry-&gt;priv_data;</div><div class='ctx'> </div><div class='del'>-	if (__test_and_clear_bit(ENTRY_DATA_PENDING, &amp;entry-&gt;flags))</div><div class='add'>+	if (test_and_clear_bit(ENTRY_DATA_PENDING, &amp;entry-&gt;flags))</div><div class='ctx'> 		usb_submit_urb(entry_priv-&gt;urb, GFP_ATOMIC);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -283,7 +284,7 @@ static void rt2x00usb_interrupt_rxdone(struct urb *urb)</div><div class='ctx'> 	struct skb_frame_desc *skbdesc = get_skb_frame_desc(entry-&gt;skb);</div><div class='ctx'> 	u8 rxd[32];</div><div class='ctx'> </div><div class='del'>-	if (!test_bit(DEVICE_ENABLED_RADIO, &amp;rt2x00dev-&gt;flags) ||</div><div class='add'>+	if (!test_bit(DEVICE_STATE_ENABLED_RADIO, &amp;rt2x00dev-&gt;flags) ||</div><div class='ctx'> 	    !test_bit(ENTRY_OWNER_DEVICE_DATA, &amp;entry-&gt;flags))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -293,7 +294,7 @@ static void rt2x00usb_interrupt_rxdone(struct urb *urb)</div><div class='ctx'> 	 * a problem.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (urb-&gt;actual_length &lt; entry-&gt;queue-&gt;desc_size || urb-&gt;status) {</div><div class='del'>-		__set_bit(ENTRY_OWNER_DEVICE_DATA, &amp;entry-&gt;flags);</div><div class='add'>+		set_bit(ENTRY_OWNER_DEVICE_DATA, &amp;entry-&gt;flags);</div><div class='ctx'> 		usb_submit_urb(urb, GFP_ATOMIC);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -361,7 +362,7 @@ void rt2x00usb_init_rxentry(struct rt2x00_dev *rt2x00dev,</div><div class='ctx'> 			  entry-&gt;skb-&gt;data, entry-&gt;skb-&gt;len,</div><div class='ctx'> 			  rt2x00usb_interrupt_rxdone, entry);</div><div class='ctx'> </div><div class='del'>-	__set_bit(ENTRY_OWNER_DEVICE_DATA, &amp;entry-&gt;flags);</div><div class='add'>+	set_bit(ENTRY_OWNER_DEVICE_DATA, &amp;entry-&gt;flags);</div><div class='ctx'> 	usb_submit_urb(entry_priv-&gt;urb, GFP_ATOMIC);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(rt2x00usb_init_rxentry);</div><div class='head'>diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c<br/>index 087e90b328cd..a461620b489f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/rt2x00/rt61pci.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/rt2x00/rt61pci.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/rt2x00/rt61pci.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/rt2x00/rt61pci.c</a></div><div class='hunk'>@@ -38,6 +38,13 @@</div><div class='ctx'> #include "rt61pci.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Allow hardware encryption to be disabled.</div><div class='add'>+ */</div><div class='add'>+static int modparam_nohwcrypt = 0;</div><div class='add'>+module_param_named(nohwcrypt, modparam_nohwcrypt, bool, S_IRUGO);</div><div class='add'>+MODULE_PARM_DESC(nohwcrypt, "Disable hardware encryption.");</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Register access.</div><div class='ctx'>  * BBP and RF register require indirect register access,</div><div class='ctx'>  * and use the CSR registers PHY_CSR3 and PHY_CSR4 to achieve this.</div><div class='hunk'>@@ -156,7 +163,7 @@ rf_write:</div><div class='ctx'> 	rt2x00_rf_write(rt2x00dev, word, value);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_RT61PCI_LEDS</div><div class='add'>+#ifdef CONFIG_RT2X00_LIB_LEDS</div><div class='ctx'> /*</div><div class='ctx'>  * This function is only called from rt61pci_led_brightness()</div><div class='ctx'>  * make gcc happy by placing this function inside the</div><div class='hunk'>@@ -188,7 +195,7 @@ static void rt61pci_mcu_request(struct rt2x00_dev *rt2x00dev,</div><div class='ctx'> 	rt2x00_set_field32(&amp;reg, HOST_CMD_CSR_INTERRUPT_MCU, 1);</div><div class='ctx'> 	rt2x00pci_register_write(rt2x00dev, HOST_CMD_CSR, reg);</div><div class='ctx'> }</div><div class='del'>-#endif /* CONFIG_RT61PCI_LEDS */</div><div class='add'>+#endif /* CONFIG_RT2X00_LIB_LEDS */</div><div class='ctx'> </div><div class='ctx'> static void rt61pci_eepromregister_read(struct eeprom_93cx6 *eeprom)</div><div class='ctx'> {</div><div class='hunk'>@@ -264,7 +271,7 @@ static const struct rt2x00debug rt61pci_rt2x00debug = {</div><div class='ctx'> };</div><div class='ctx'> #endif /* CONFIG_RT2X00_LIB_DEBUGFS */</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_RT61PCI_RFKILL</div><div class='add'>+#ifdef CONFIG_RT2X00_LIB_RFKILL</div><div class='ctx'> static int rt61pci_rfkill_poll(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> {</div><div class='ctx'> 	u32 reg;</div><div class='hunk'>@@ -274,9 +281,9 @@ static int rt61pci_rfkill_poll(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='ctx'> #define rt61pci_rfkill_poll	NULL</div><div class='del'>-#endif /* CONFIG_RT61PCI_RFKILL */</div><div class='add'>+#endif /* CONFIG_RT2X00_LIB_RFKILL */</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_RT61PCI_LEDS</div><div class='add'>+#ifdef CONFIG_RT2X00_LIB_LEDS</div><div class='ctx'> static void rt61pci_brightness_set(struct led_classdev *led_cdev,</div><div class='ctx'> 				   enum led_brightness brightness)</div><div class='ctx'> {</div><div class='hunk'>@@ -341,11 +348,209 @@ static void rt61pci_init_led(struct rt2x00_dev *rt2x00dev,</div><div class='ctx'> 	led-&gt;led_dev.blink_set = rt61pci_blink_set;</div><div class='ctx'> 	led-&gt;flags = LED_INITIALIZED;</div><div class='ctx'> }</div><div class='del'>-#endif /* CONFIG_RT61PCI_LEDS */</div><div class='add'>+#endif /* CONFIG_RT2X00_LIB_LEDS */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Configuration handlers.</div><div class='ctx'>  */</div><div class='add'>+static int rt61pci_config_shared_key(struct rt2x00_dev *rt2x00dev,</div><div class='add'>+				     struct rt2x00lib_crypto *crypto,</div><div class='add'>+				     struct ieee80211_key_conf *key)</div><div class='add'>+{</div><div class='add'>+	struct hw_key_entry key_entry;</div><div class='add'>+	struct rt2x00_field32 field;</div><div class='add'>+	u32 mask;</div><div class='add'>+	u32 reg;</div><div class='add'>+</div><div class='add'>+	if (crypto-&gt;cmd == SET_KEY) {</div><div class='add'>+		/*</div><div class='add'>+		 * rt2x00lib can't determine the correct free</div><div class='add'>+		 * key_idx for shared keys. We have 1 register</div><div class='add'>+		 * with key valid bits. The goal is simple, read</div><div class='add'>+		 * the register, if that is full we have no slots</div><div class='add'>+		 * left.</div><div class='add'>+		 * Note that each BSS is allowed to have up to 4</div><div class='add'>+		 * shared keys, so put a mask over the allowed</div><div class='add'>+		 * entries.</div><div class='add'>+		 */</div><div class='add'>+		mask = (0xf &lt;&lt; crypto-&gt;bssidx);</div><div class='add'>+</div><div class='add'>+		rt2x00pci_register_read(rt2x00dev, SEC_CSR0, &amp;reg);</div><div class='add'>+		reg &amp;= mask;</div><div class='add'>+</div><div class='add'>+		if (reg &amp;&amp; reg == mask)</div><div class='add'>+			return -ENOSPC;</div><div class='add'>+</div><div class='add'>+		key-&gt;hw_key_idx += reg ? ffz(reg) : 0;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Upload key to hardware</div><div class='add'>+		 */</div><div class='add'>+		memcpy(key_entry.key, crypto-&gt;key,</div><div class='add'>+		       sizeof(key_entry.key));</div><div class='add'>+		memcpy(key_entry.tx_mic, crypto-&gt;tx_mic,</div><div class='add'>+		       sizeof(key_entry.tx_mic));</div><div class='add'>+		memcpy(key_entry.rx_mic, crypto-&gt;rx_mic,</div><div class='add'>+		       sizeof(key_entry.rx_mic));</div><div class='add'>+</div><div class='add'>+		reg = SHARED_KEY_ENTRY(key-&gt;hw_key_idx);</div><div class='add'>+		rt2x00pci_register_multiwrite(rt2x00dev, reg,</div><div class='add'>+					      &amp;key_entry, sizeof(key_entry));</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * The cipher types are stored over 2 registers.</div><div class='add'>+		 * bssidx 0 and 1 keys are stored in SEC_CSR1 and</div><div class='add'>+		 * bssidx 1 and 2 keys are stored in SEC_CSR5.</div><div class='add'>+		 * Using the correct defines correctly will cause overhead,</div><div class='add'>+		 * so just calculate the correct offset.</div><div class='add'>+		 */</div><div class='add'>+		if (key-&gt;hw_key_idx &lt; 8) {</div><div class='add'>+			field.bit_offset = (3 * key-&gt;hw_key_idx);</div><div class='add'>+			field.bit_mask = 0x7 &lt;&lt; field.bit_offset;</div><div class='add'>+</div><div class='add'>+			rt2x00pci_register_read(rt2x00dev, SEC_CSR1, &amp;reg);</div><div class='add'>+			rt2x00_set_field32(&amp;reg, field, crypto-&gt;cipher);</div><div class='add'>+			rt2x00pci_register_write(rt2x00dev, SEC_CSR1, reg);</div><div class='add'>+		} else {</div><div class='add'>+			field.bit_offset = (3 * (key-&gt;hw_key_idx - 8));</div><div class='add'>+			field.bit_mask = 0x7 &lt;&lt; field.bit_offset;</div><div class='add'>+</div><div class='add'>+			rt2x00pci_register_read(rt2x00dev, SEC_CSR5, &amp;reg);</div><div class='add'>+			rt2x00_set_field32(&amp;reg, field, crypto-&gt;cipher);</div><div class='add'>+			rt2x00pci_register_write(rt2x00dev, SEC_CSR5, reg);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * The driver does not support the IV/EIV generation</div><div class='add'>+		 * in hardware. However it doesn't support the IV/EIV</div><div class='add'>+		 * inside the ieee80211 frame either, but requires it</div><div class='add'>+		 * to be provided seperately for the descriptor.</div><div class='add'>+		 * rt2x00lib will cut the IV/EIV data out of all frames</div><div class='add'>+		 * given to us by mac80211, but we must tell mac80211</div><div class='add'>+		 * to generate the IV/EIV data.</div><div class='add'>+		 */</div><div class='add'>+		key-&gt;flags |= IEEE80211_KEY_FLAG_GENERATE_IV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * SEC_CSR0 contains only single-bit fields to indicate</div><div class='add'>+	 * a particular key is valid. Because using the FIELD32()</div><div class='add'>+	 * defines directly will cause a lot of overhead we use</div><div class='add'>+	 * a calculation to determine the correct bit directly.</div><div class='add'>+	 */</div><div class='add'>+	mask = 1 &lt;&lt; key-&gt;hw_key_idx;</div><div class='add'>+</div><div class='add'>+	rt2x00pci_register_read(rt2x00dev, SEC_CSR0, &amp;reg);</div><div class='add'>+	if (crypto-&gt;cmd == SET_KEY)</div><div class='add'>+		reg |= mask;</div><div class='add'>+	else if (crypto-&gt;cmd == DISABLE_KEY)</div><div class='add'>+		reg &amp;= ~mask;</div><div class='add'>+	rt2x00pci_register_write(rt2x00dev, SEC_CSR0, reg);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rt61pci_config_pairwise_key(struct rt2x00_dev *rt2x00dev,</div><div class='add'>+				       struct rt2x00lib_crypto *crypto,</div><div class='add'>+				       struct ieee80211_key_conf *key)</div><div class='add'>+{</div><div class='add'>+	struct hw_pairwise_ta_entry addr_entry;</div><div class='add'>+	struct hw_key_entry key_entry;</div><div class='add'>+	u32 mask;</div><div class='add'>+	u32 reg;</div><div class='add'>+</div><div class='add'>+	if (crypto-&gt;cmd == SET_KEY) {</div><div class='add'>+		/*</div><div class='add'>+		 * rt2x00lib can't determine the correct free</div><div class='add'>+		 * key_idx for pairwise keys. We have 2 registers</div><div class='add'>+		 * with key valid bits. The goal is simple, read</div><div class='add'>+		 * the first register, if that is full move to</div><div class='add'>+		 * the next register.</div><div class='add'>+		 * When both registers are full, we drop the key,</div><div class='add'>+		 * otherwise we use the first invalid entry.</div><div class='add'>+		 */</div><div class='add'>+		rt2x00pci_register_read(rt2x00dev, SEC_CSR2, &amp;reg);</div><div class='add'>+		if (reg &amp;&amp; reg == ~0) {</div><div class='add'>+			key-&gt;hw_key_idx = 32;</div><div class='add'>+			rt2x00pci_register_read(rt2x00dev, SEC_CSR3, &amp;reg);</div><div class='add'>+			if (reg &amp;&amp; reg == ~0)</div><div class='add'>+				return -ENOSPC;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		key-&gt;hw_key_idx += reg ? ffz(reg) : 0;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Upload key to hardware</div><div class='add'>+		 */</div><div class='add'>+		memcpy(key_entry.key, crypto-&gt;key,</div><div class='add'>+		       sizeof(key_entry.key));</div><div class='add'>+		memcpy(key_entry.tx_mic, crypto-&gt;tx_mic,</div><div class='add'>+		       sizeof(key_entry.tx_mic));</div><div class='add'>+		memcpy(key_entry.rx_mic, crypto-&gt;rx_mic,</div><div class='add'>+		       sizeof(key_entry.rx_mic));</div><div class='add'>+</div><div class='add'>+		memset(&amp;addr_entry, 0, sizeof(addr_entry));</div><div class='add'>+		memcpy(&amp;addr_entry, crypto-&gt;address, ETH_ALEN);</div><div class='add'>+		addr_entry.cipher = crypto-&gt;cipher;</div><div class='add'>+</div><div class='add'>+		reg = PAIRWISE_KEY_ENTRY(key-&gt;hw_key_idx);</div><div class='add'>+		rt2x00pci_register_multiwrite(rt2x00dev, reg,</div><div class='add'>+					      &amp;key_entry, sizeof(key_entry));</div><div class='add'>+</div><div class='add'>+		reg = PAIRWISE_TA_ENTRY(key-&gt;hw_key_idx);</div><div class='add'>+		rt2x00pci_register_multiwrite(rt2x00dev, reg,</div><div class='add'>+					      &amp;addr_entry, sizeof(addr_entry));</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Enable pairwise lookup table for given BSS idx,</div><div class='add'>+		 * without this received frames will not be decrypted</div><div class='add'>+		 * by the hardware.</div><div class='add'>+		 */</div><div class='add'>+		rt2x00pci_register_read(rt2x00dev, SEC_CSR4, &amp;reg);</div><div class='add'>+		reg |= (1 &lt;&lt; crypto-&gt;bssidx);</div><div class='add'>+		rt2x00pci_register_write(rt2x00dev, SEC_CSR4, reg);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * The driver does not support the IV/EIV generation</div><div class='add'>+		 * in hardware. However it doesn't support the IV/EIV</div><div class='add'>+		 * inside the ieee80211 frame either, but requires it</div><div class='add'>+		 * to be provided seperately for the descriptor.</div><div class='add'>+		 * rt2x00lib will cut the IV/EIV data out of all frames</div><div class='add'>+		 * given to us by mac80211, but we must tell mac80211</div><div class='add'>+		 * to generate the IV/EIV data.</div><div class='add'>+		 */</div><div class='add'>+		key-&gt;flags |= IEEE80211_KEY_FLAG_GENERATE_IV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * SEC_CSR2 and SEC_CSR3 contain only single-bit fields to indicate</div><div class='add'>+	 * a particular key is valid. Because using the FIELD32()</div><div class='add'>+	 * defines directly will cause a lot of overhead we use</div><div class='add'>+	 * a calculation to determine the correct bit directly.</div><div class='add'>+	 */</div><div class='add'>+	if (key-&gt;hw_key_idx &lt; 32) {</div><div class='add'>+		mask = 1 &lt;&lt; key-&gt;hw_key_idx;</div><div class='add'>+</div><div class='add'>+		rt2x00pci_register_read(rt2x00dev, SEC_CSR2, &amp;reg);</div><div class='add'>+		if (crypto-&gt;cmd == SET_KEY)</div><div class='add'>+			reg |= mask;</div><div class='add'>+		else if (crypto-&gt;cmd == DISABLE_KEY)</div><div class='add'>+			reg &amp;= ~mask;</div><div class='add'>+		rt2x00pci_register_write(rt2x00dev, SEC_CSR2, reg);</div><div class='add'>+	} else {</div><div class='add'>+		mask = 1 &lt;&lt; (key-&gt;hw_key_idx - 32);</div><div class='add'>+</div><div class='add'>+		rt2x00pci_register_read(rt2x00dev, SEC_CSR3, &amp;reg);</div><div class='add'>+		if (crypto-&gt;cmd == SET_KEY)</div><div class='add'>+			reg |= mask;</div><div class='add'>+		else if (crypto-&gt;cmd == DISABLE_KEY)</div><div class='add'>+			reg &amp;= ~mask;</div><div class='add'>+		rt2x00pci_register_write(rt2x00dev, SEC_CSR3, reg);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void rt61pci_config_filter(struct rt2x00_dev *rt2x00dev,</div><div class='ctx'> 				  const unsigned int filter_flags)</div><div class='ctx'> {</div><div class='hunk'>@@ -440,6 +645,30 @@ static void rt61pci_config_erp(struct rt2x00_dev *rt2x00dev,</div><div class='ctx'> 	rt2x00pci_register_write(rt2x00dev, TXRX_CSR4, reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+static void rt61pci_config_lna_gain(struct rt2x00_dev *rt2x00dev,</div><div class='add'>+				    struct rt2x00lib_conf *libconf)</div><div class='add'>+{</div><div class='add'>+	u16 eeprom;</div><div class='add'>+	short lna_gain = 0;</div><div class='add'>+</div><div class='add'>+	if (libconf-&gt;band == IEEE80211_BAND_2GHZ) {</div><div class='add'>+		if (test_bit(CONFIG_EXTERNAL_LNA_BG, &amp;rt2x00dev-&gt;flags))</div><div class='add'>+			lna_gain += 14;</div><div class='add'>+</div><div class='add'>+		rt2x00_eeprom_read(rt2x00dev, EEPROM_RSSI_OFFSET_BG, &amp;eeprom);</div><div class='add'>+		lna_gain -= rt2x00_get_field16(eeprom, EEPROM_RSSI_OFFSET_BG_1);</div><div class='add'>+	} else {</div><div class='add'>+		if (test_bit(CONFIG_EXTERNAL_LNA_A, &amp;rt2x00dev-&gt;flags))</div><div class='add'>+			lna_gain += 14;</div><div class='add'>+</div><div class='add'>+		rt2x00_eeprom_read(rt2x00dev, EEPROM_RSSI_OFFSET_A, &amp;eeprom);</div><div class='add'>+		lna_gain -= rt2x00_get_field16(eeprom, EEPROM_RSSI_OFFSET_A_1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rt2x00dev-&gt;lna_gain = lna_gain;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void rt61pci_config_phymode(struct rt2x00_dev *rt2x00dev,</div><div class='ctx'> 				   const int basic_rate_mask)</div><div class='ctx'> {</div><div class='hunk'>@@ -758,6 +987,9 @@ static void rt61pci_config(struct rt2x00_dev *rt2x00dev,</div><div class='ctx'> 			   struct rt2x00lib_conf *libconf,</div><div class='ctx'> 			   const unsigned int flags)</div><div class='ctx'> {</div><div class='add'>+	/* Always recalculate LNA gain before changing configuration */</div><div class='add'>+	rt61pci_config_lna_gain(rt2x00dev, libconf);</div><div class='add'>+</div><div class='ctx'> 	if (flags &amp; CONFIG_UPDATE_PHYMODE)</div><div class='ctx'> 		rt61pci_config_phymode(rt2x00dev, libconf-&gt;basic_rates);</div><div class='ctx'> 	if (flags &amp; CONFIG_UPDATE_CHANNEL)</div><div class='hunk'>@@ -1246,16 +1478,6 @@ static int rt61pci_init_registers(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> </div><div class='ctx'> 	rt2x00pci_register_write(rt2x00dev, M2H_CMD_DONE_CSR, 0xffffffff);</div><div class='ctx'> </div><div class='del'>-	rt2x00pci_register_read(rt2x00dev, AC_TXOP_CSR0, &amp;reg);</div><div class='del'>-	rt2x00_set_field32(&amp;reg, AC_TXOP_CSR0_AC0_TX_OP, 0);</div><div class='del'>-	rt2x00_set_field32(&amp;reg, AC_TXOP_CSR0_AC1_TX_OP, 0);</div><div class='del'>-	rt2x00pci_register_write(rt2x00dev, AC_TXOP_CSR0, reg);</div><div class='del'>-</div><div class='del'>-	rt2x00pci_register_read(rt2x00dev, AC_TXOP_CSR1, &amp;reg);</div><div class='del'>-	rt2x00_set_field32(&amp;reg, AC_TXOP_CSR1_AC2_TX_OP, 192);</div><div class='del'>-	rt2x00_set_field32(&amp;reg, AC_TXOP_CSR1_AC3_TX_OP, 48);</div><div class='del'>-	rt2x00pci_register_write(rt2x00dev, AC_TXOP_CSR1, reg);</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Clear all beacons</div><div class='ctx'> 	 * For the Beacon base registers we only need to clear</div><div class='hunk'>@@ -1533,8 +1755,8 @@ static int rt61pci_set_device_state(struct rt2x00_dev *rt2x00dev,</div><div class='ctx'>  * TX descriptor initialization</div><div class='ctx'>  */</div><div class='ctx'> static void rt61pci_write_tx_desc(struct rt2x00_dev *rt2x00dev,</div><div class='del'>-				    struct sk_buff *skb,</div><div class='del'>-				    struct txentry_desc *txdesc)</div><div class='add'>+				  struct sk_buff *skb,</div><div class='add'>+				  struct txentry_desc *txdesc)</div><div class='ctx'> {</div><div class='ctx'> 	struct skb_frame_desc *skbdesc = get_skb_frame_desc(skb);</div><div class='ctx'> 	__le32 *txd = skbdesc-&gt;desc;</div><div class='hunk'>@@ -1548,7 +1770,7 @@ static void rt61pci_write_tx_desc(struct rt2x00_dev *rt2x00dev,</div><div class='ctx'> 	rt2x00_set_field32(&amp;word, TXD_W1_AIFSN, txdesc-&gt;aifs);</div><div class='ctx'> 	rt2x00_set_field32(&amp;word, TXD_W1_CWMIN, txdesc-&gt;cw_min);</div><div class='ctx'> 	rt2x00_set_field32(&amp;word, TXD_W1_CWMAX, txdesc-&gt;cw_max);</div><div class='del'>-	rt2x00_set_field32(&amp;word, TXD_W1_IV_OFFSET, IEEE80211_HEADER);</div><div class='add'>+	rt2x00_set_field32(&amp;word, TXD_W1_IV_OFFSET, txdesc-&gt;iv_offset);</div><div class='ctx'> 	rt2x00_set_field32(&amp;word, TXD_W1_HW_SEQUENCE,</div><div class='ctx'> 			   test_bit(ENTRY_TXD_GENERATE_SEQ, &amp;txdesc-&gt;flags));</div><div class='ctx'> 	rt2x00_set_field32(&amp;word, TXD_W1_BUFFER_COUNT, 1);</div><div class='hunk'>@@ -1561,6 +1783,11 @@ static void rt61pci_write_tx_desc(struct rt2x00_dev *rt2x00dev,</div><div class='ctx'> 	rt2x00_set_field32(&amp;word, TXD_W2_PLCP_LENGTH_HIGH, txdesc-&gt;length_high);</div><div class='ctx'> 	rt2x00_desc_write(txd, 2, word);</div><div class='ctx'> </div><div class='add'>+	if (test_bit(ENTRY_TXD_ENCRYPT, &amp;txdesc-&gt;flags)) {</div><div class='add'>+		_rt2x00_desc_write(txd, 3, skbdesc-&gt;iv);</div><div class='add'>+		_rt2x00_desc_write(txd, 4, skbdesc-&gt;eiv);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	rt2x00_desc_read(txd, 5, &amp;word);</div><div class='ctx'> 	rt2x00_set_field32(&amp;word, TXD_W5_PID_TYPE, skbdesc-&gt;entry-&gt;queue-&gt;qid);</div><div class='ctx'> 	rt2x00_set_field32(&amp;word, TXD_W5_PID_SUBTYPE,</div><div class='hunk'>@@ -1595,11 +1822,15 @@ static void rt61pci_write_tx_desc(struct rt2x00_dev *rt2x00dev,</div><div class='ctx'> 	rt2x00_set_field32(&amp;word, TXD_W0_IFS, txdesc-&gt;ifs);</div><div class='ctx'> 	rt2x00_set_field32(&amp;word, TXD_W0_RETRY_MODE,</div><div class='ctx'> 			   test_bit(ENTRY_TXD_RETRY_MODE, &amp;txdesc-&gt;flags));</div><div class='del'>-	rt2x00_set_field32(&amp;word, TXD_W0_TKIP_MIC, 0);</div><div class='add'>+	rt2x00_set_field32(&amp;word, TXD_W0_TKIP_MIC,</div><div class='add'>+			   test_bit(ENTRY_TXD_ENCRYPT_MMIC, &amp;txdesc-&gt;flags));</div><div class='add'>+	rt2x00_set_field32(&amp;word, TXD_W0_KEY_TABLE,</div><div class='add'>+			   test_bit(ENTRY_TXD_ENCRYPT_PAIRWISE, &amp;txdesc-&gt;flags));</div><div class='add'>+	rt2x00_set_field32(&amp;word, TXD_W0_KEY_INDEX, txdesc-&gt;key_idx);</div><div class='ctx'> 	rt2x00_set_field32(&amp;word, TXD_W0_DATABYTE_COUNT, skb-&gt;len);</div><div class='ctx'> 	rt2x00_set_field32(&amp;word, TXD_W0_BURST,</div><div class='ctx'> 			   test_bit(ENTRY_TXD_BURST, &amp;txdesc-&gt;flags));</div><div class='del'>-	rt2x00_set_field32(&amp;word, TXD_W0_CIPHER_ALG, CIPHER_NONE);</div><div class='add'>+	rt2x00_set_field32(&amp;word, TXD_W0_CIPHER_ALG, txdesc-&gt;cipher);</div><div class='ctx'> 	rt2x00_desc_write(txd, 0, word);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1676,40 +1907,27 @@ static void rt61pci_kick_tx_queue(struct rt2x00_dev *rt2x00dev,</div><div class='ctx'>  */</div><div class='ctx'> static int rt61pci_agc_to_rssi(struct rt2x00_dev *rt2x00dev, int rxd_w1)</div><div class='ctx'> {</div><div class='del'>-	u16 eeprom;</div><div class='del'>-	u8 offset;</div><div class='add'>+	u8 offset = rt2x00dev-&gt;lna_gain;</div><div class='ctx'> 	u8 lna;</div><div class='ctx'> </div><div class='ctx'> 	lna = rt2x00_get_field32(rxd_w1, RXD_W1_RSSI_LNA);</div><div class='ctx'> 	switch (lna) {</div><div class='ctx'> 	case 3:</div><div class='del'>-		offset = 90;</div><div class='add'>+		offset += 90;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 2:</div><div class='del'>-		offset = 74;</div><div class='add'>+		offset += 74;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 1:</div><div class='del'>-		offset = 64;</div><div class='add'>+		offset += 64;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (rt2x00dev-&gt;rx_status.band == IEEE80211_BAND_5GHZ) {</div><div class='del'>-		if (test_bit(CONFIG_EXTERNAL_LNA_A, &amp;rt2x00dev-&gt;flags))</div><div class='del'>-			offset += 14;</div><div class='del'>-</div><div class='ctx'> 		if (lna == 3 || lna == 2)</div><div class='ctx'> 			offset += 10;</div><div class='del'>-</div><div class='del'>-		rt2x00_eeprom_read(rt2x00dev, EEPROM_RSSI_OFFSET_A, &amp;eeprom);</div><div class='del'>-		offset -= rt2x00_get_field16(eeprom, EEPROM_RSSI_OFFSET_A_1);</div><div class='del'>-	} else {</div><div class='del'>-		if (test_bit(CONFIG_EXTERNAL_LNA_BG, &amp;rt2x00dev-&gt;flags))</div><div class='del'>-			offset += 14;</div><div class='del'>-</div><div class='del'>-		rt2x00_eeprom_read(rt2x00dev, EEPROM_RSSI_OFFSET_BG, &amp;eeprom);</div><div class='del'>-		offset -= rt2x00_get_field16(eeprom, EEPROM_RSSI_OFFSET_BG_1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return rt2x00_get_field32(rxd_w1, RXD_W1_RSSI_AGC) * 2 - offset;</div><div class='hunk'>@@ -1718,6 +1936,7 @@ static int rt61pci_agc_to_rssi(struct rt2x00_dev *rt2x00dev, int rxd_w1)</div><div class='ctx'> static void rt61pci_fill_rxdone(struct queue_entry *entry,</div><div class='ctx'> 			        struct rxdone_entry_desc *rxdesc)</div><div class='ctx'> {</div><div class='add'>+	struct rt2x00_dev *rt2x00dev = entry-&gt;queue-&gt;rt2x00dev;</div><div class='ctx'> 	struct queue_entry_priv_pci *entry_priv = entry-&gt;priv_data;</div><div class='ctx'> 	u32 word0;</div><div class='ctx'> 	u32 word1;</div><div class='hunk'>@@ -1728,6 +1947,38 @@ static void rt61pci_fill_rxdone(struct queue_entry *entry,</div><div class='ctx'> 	if (rt2x00_get_field32(word0, RXD_W0_CRC_ERROR))</div><div class='ctx'> 		rxdesc-&gt;flags |= RX_FLAG_FAILED_FCS_CRC;</div><div class='ctx'> </div><div class='add'>+	if (test_bit(CONFIG_SUPPORT_HW_CRYPTO, &amp;rt2x00dev-&gt;flags)) {</div><div class='add'>+		rxdesc-&gt;cipher =</div><div class='add'>+		    rt2x00_get_field32(word0, RXD_W0_CIPHER_ALG);</div><div class='add'>+		rxdesc-&gt;cipher_status =</div><div class='add'>+		    rt2x00_get_field32(word0, RXD_W0_CIPHER_ERROR);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rxdesc-&gt;cipher != CIPHER_NONE) {</div><div class='add'>+		_rt2x00_desc_read(entry_priv-&gt;desc, 2, &amp;rxdesc-&gt;iv);</div><div class='add'>+		_rt2x00_desc_read(entry_priv-&gt;desc, 3, &amp;rxdesc-&gt;eiv);</div><div class='add'>+		_rt2x00_desc_read(entry_priv-&gt;desc, 4, &amp;rxdesc-&gt;icv);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Hardware has stripped IV/EIV data from 802.11 frame during</div><div class='add'>+		 * decryption. It has provided the data seperately but rt2x00lib</div><div class='add'>+		 * should decide if it should be reinserted.</div><div class='add'>+		 */</div><div class='add'>+		rxdesc-&gt;flags |= RX_FLAG_IV_STRIPPED;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * FIXME: Legacy driver indicates that the frame does</div><div class='add'>+		 * contain the Michael Mic. Unfortunately, in rt2x00</div><div class='add'>+		 * the MIC seems to be missing completely...</div><div class='add'>+		 */</div><div class='add'>+		rxdesc-&gt;flags |= RX_FLAG_MMIC_STRIPPED;</div><div class='add'>+</div><div class='add'>+		if (rxdesc-&gt;cipher_status == RX_CRYPTO_SUCCESS)</div><div class='add'>+			rxdesc-&gt;flags |= RX_FLAG_DECRYPTED;</div><div class='add'>+		else if (rxdesc-&gt;cipher_status == RX_CRYPTO_FAIL_MIC)</div><div class='add'>+			rxdesc-&gt;flags |= RX_FLAG_MMIC_ERROR;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Obtain the status about this packet.</div><div class='ctx'> 	 * When frame was received with an OFDM bitrate,</div><div class='hunk'>@@ -1735,11 +1986,13 @@ static void rt61pci_fill_rxdone(struct queue_entry *entry,</div><div class='ctx'> 	 * a CCK bitrate the signal is the rate in 100kbit/s.</div><div class='ctx'> 	 */</div><div class='ctx'> 	rxdesc-&gt;signal = rt2x00_get_field32(word1, RXD_W1_SIGNAL);</div><div class='del'>-	rxdesc-&gt;rssi = rt61pci_agc_to_rssi(entry-&gt;queue-&gt;rt2x00dev, word1);</div><div class='add'>+	rxdesc-&gt;rssi = rt61pci_agc_to_rssi(rt2x00dev, word1);</div><div class='ctx'> 	rxdesc-&gt;size = rt2x00_get_field32(word0, RXD_W0_DATABYTE_COUNT);</div><div class='ctx'> </div><div class='ctx'> 	if (rt2x00_get_field32(word0, RXD_W0_OFDM))</div><div class='ctx'> 		rxdesc-&gt;dev_flags |= RXDONE_SIGNAL_PLCP;</div><div class='add'>+	else</div><div class='add'>+		rxdesc-&gt;dev_flags |= RXDONE_SIGNAL_BITRATE;</div><div class='ctx'> 	if (rt2x00_get_field32(word0, RXD_W0_MY_BSS))</div><div class='ctx'> 		rxdesc-&gt;dev_flags |= RXDONE_MY_BSS;</div><div class='ctx'> }</div><div class='hunk'>@@ -1860,7 +2113,7 @@ static irqreturn_t rt61pci_interrupt(int irq, void *dev_instance)</div><div class='ctx'> 	if (!reg &amp;&amp; !reg_mcu)</div><div class='ctx'> 		return IRQ_NONE;</div><div class='ctx'> </div><div class='del'>-	if (!test_bit(DEVICE_ENABLED_RADIO, &amp;rt2x00dev-&gt;flags))</div><div class='add'>+	if (!test_bit(DEVICE_STATE_ENABLED_RADIO, &amp;rt2x00dev-&gt;flags))</div><div class='ctx'> 		return IRQ_HANDLED;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -2060,10 +2313,10 @@ static int rt61pci_init_eeprom(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Detect if this device has an hardware controlled radio.</div><div class='ctx'> 	 */</div><div class='del'>-#ifdef CONFIG_RT61PCI_RFKILL</div><div class='add'>+#ifdef CONFIG_RT2X00_LIB_RFKILL</div><div class='ctx'> 	if (rt2x00_get_field16(eeprom, EEPROM_ANTENNA_HARDWARE_RADIO))</div><div class='ctx'> 		__set_bit(CONFIG_SUPPORT_HW_BUTTON, &amp;rt2x00dev-&gt;flags);</div><div class='del'>-#endif /* CONFIG_RT61PCI_RFKILL */</div><div class='add'>+#endif /* CONFIG_RT2X00_LIB_RFKILL */</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Read frequency offset and RF programming sequence.</div><div class='hunk'>@@ -2121,7 +2374,7 @@ static int rt61pci_init_eeprom(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> 	 * If the eeprom value is invalid,</div><div class='ctx'> 	 * switch to default led mode.</div><div class='ctx'> 	 */</div><div class='del'>-#ifdef CONFIG_RT61PCI_LEDS</div><div class='add'>+#ifdef CONFIG_RT2X00_LIB_LEDS</div><div class='ctx'> 	rt2x00_eeprom_read(rt2x00dev, EEPROM_LED, &amp;eeprom);</div><div class='ctx'> 	value = rt2x00_get_field16(eeprom, EEPROM_LED_LED_MODE);</div><div class='ctx'> </div><div class='hunk'>@@ -2155,7 +2408,7 @@ static int rt61pci_init_eeprom(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> 	rt2x00_set_field16(&amp;rt2x00dev-&gt;led_mcu_reg, MCU_LEDCS_POLARITY_READY_A,</div><div class='ctx'> 			   rt2x00_get_field16(eeprom,</div><div class='ctx'> 					      EEPROM_LED_POLARITY_RDY_A));</div><div class='del'>-#endif /* CONFIG_RT61PCI_LEDS */</div><div class='add'>+#endif /* CONFIG_RT2X00_LIB_LEDS */</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -2274,10 +2527,11 @@ static const struct rf_channel rf_vals_seq[] = {</div><div class='ctx'> 	{ 46, 0x00002ccc, 0x000049a6, 0x0009be55, 0x000c0a23 },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void rt61pci_probe_hw_mode(struct rt2x00_dev *rt2x00dev)</div><div class='add'>+static int rt61pci_probe_hw_mode(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct hw_mode_spec *spec = &amp;rt2x00dev-&gt;spec;</div><div class='del'>-	u8 *txpower;</div><div class='add'>+	struct channel_info *info;</div><div class='add'>+	char *tx_power;</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -2294,20 +2548,10 @@ static void rt61pci_probe_hw_mode(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> 						   EEPROM_MAC_ADDR_0));</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Convert tx_power array in eeprom.</div><div class='del'>-	 */</div><div class='del'>-	txpower = rt2x00_eeprom_addr(rt2x00dev, EEPROM_TXPOWER_G_START);</div><div class='del'>-	for (i = 0; i &lt; 14; i++)</div><div class='del'>-		txpower[i] = TXPOWER_FROM_DEV(txpower[i]);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='ctx'> 	 * Initialize hw_mode information.</div><div class='ctx'> 	 */</div><div class='ctx'> 	spec-&gt;supported_bands = SUPPORT_BAND_2GHZ;</div><div class='ctx'> 	spec-&gt;supported_rates = SUPPORT_RATE_CCK | SUPPORT_RATE_OFDM;</div><div class='del'>-	spec-&gt;tx_power_a = NULL;</div><div class='del'>-	spec-&gt;tx_power_bg = txpower;</div><div class='del'>-	spec-&gt;tx_power_default = DEFAULT_TXPOWER;</div><div class='ctx'> </div><div class='ctx'> 	if (!test_bit(CONFIG_RF_SEQUENCE, &amp;rt2x00dev-&gt;flags)) {</div><div class='ctx'> 		spec-&gt;num_channels = 14;</div><div class='hunk'>@@ -2321,13 +2565,28 @@ static void rt61pci_probe_hw_mode(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> 	    rt2x00_rf(&amp;rt2x00dev-&gt;chip, RF5325)) {</div><div class='ctx'> 		spec-&gt;supported_bands |= SUPPORT_BAND_5GHZ;</div><div class='ctx'> 		spec-&gt;num_channels = ARRAY_SIZE(rf_vals_seq);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		txpower = rt2x00_eeprom_addr(rt2x00dev, EEPROM_TXPOWER_A_START);</div><div class='del'>-		for (i = 0; i &lt; 14; i++)</div><div class='del'>-			txpower[i] = TXPOWER_FROM_DEV(txpower[i]);</div><div class='add'>+	/*</div><div class='add'>+	 * Create channel information array</div><div class='add'>+	 */</div><div class='add'>+	info = kzalloc(spec-&gt;num_channels * sizeof(*info), GFP_KERNEL);</div><div class='add'>+	if (!info)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-		spec-&gt;tx_power_a = txpower;</div><div class='add'>+	spec-&gt;channels_info = info;</div><div class='add'>+</div><div class='add'>+	tx_power = rt2x00_eeprom_addr(rt2x00dev, EEPROM_TXPOWER_G_START);</div><div class='add'>+	for (i = 0; i &lt; 14; i++)</div><div class='add'>+		info[i].tx_power1 = TXPOWER_FROM_DEV(tx_power[i]);</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;num_channels &gt; 14) {</div><div class='add'>+		tx_power = rt2x00_eeprom_addr(rt2x00dev, EEPROM_TXPOWER_A_START);</div><div class='add'>+		for (i = 14; i &lt; spec-&gt;num_channels; i++)</div><div class='add'>+			info[i].tx_power1 = TXPOWER_FROM_DEV(tx_power[i]);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int rt61pci_probe_hw(struct rt2x00_dev *rt2x00dev)</div><div class='hunk'>@@ -2348,13 +2607,17 @@ static int rt61pci_probe_hw(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Initialize hw specifications.</div><div class='ctx'> 	 */</div><div class='del'>-	rt61pci_probe_hw_mode(rt2x00dev);</div><div class='add'>+	retval = rt61pci_probe_hw_mode(rt2x00dev);</div><div class='add'>+	if (retval)</div><div class='add'>+		return retval;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * This device requires firmware and DMA mapped skbs.</div><div class='ctx'> 	 */</div><div class='ctx'> 	__set_bit(DRIVER_REQUIRE_FIRMWARE, &amp;rt2x00dev-&gt;flags);</div><div class='ctx'> 	__set_bit(DRIVER_REQUIRE_DMA, &amp;rt2x00dev-&gt;flags);</div><div class='add'>+	if (!modparam_nohwcrypt)</div><div class='add'>+		__set_bit(CONFIG_SUPPORT_HW_CRYPTO, &amp;rt2x00dev-&gt;flags);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Set the rssi offset.</div><div class='hunk'>@@ -2381,6 +2644,63 @@ static int rt61pci_set_retry_limit(struct ieee80211_hw *hw,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int rt61pci_conf_tx(struct ieee80211_hw *hw, u16 queue_idx,</div><div class='add'>+			   const struct ieee80211_tx_queue_params *params)</div><div class='add'>+{</div><div class='add'>+	struct rt2x00_dev *rt2x00dev = hw-&gt;priv;</div><div class='add'>+	struct data_queue *queue;</div><div class='add'>+	struct rt2x00_field32 field;</div><div class='add'>+	int retval;</div><div class='add'>+	u32 reg;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * First pass the configuration through rt2x00lib, that will</div><div class='add'>+	 * update the queue settings and validate the input. After that</div><div class='add'>+	 * we are free to update the registers based on the value</div><div class='add'>+	 * in the queue parameter.</div><div class='add'>+	 */</div><div class='add'>+	retval = rt2x00mac_conf_tx(hw, queue_idx, params);</div><div class='add'>+	if (retval)</div><div class='add'>+		return retval;</div><div class='add'>+</div><div class='add'>+	queue = rt2x00queue_get_queue(rt2x00dev, queue_idx);</div><div class='add'>+</div><div class='add'>+	/* Update WMM TXOP register */</div><div class='add'>+	if (queue_idx &lt; 2) {</div><div class='add'>+		field.bit_offset = queue_idx * 16;</div><div class='add'>+		field.bit_mask = 0xffff &lt;&lt; field.bit_offset;</div><div class='add'>+</div><div class='add'>+		rt2x00pci_register_read(rt2x00dev, AC_TXOP_CSR0, &amp;reg);</div><div class='add'>+		rt2x00_set_field32(&amp;reg, field, queue-&gt;txop);</div><div class='add'>+		rt2x00pci_register_write(rt2x00dev, AC_TXOP_CSR0, reg);</div><div class='add'>+	} else if (queue_idx &lt; 4) {</div><div class='add'>+		field.bit_offset = (queue_idx - 2) * 16;</div><div class='add'>+		field.bit_mask = 0xffff &lt;&lt; field.bit_offset;</div><div class='add'>+</div><div class='add'>+		rt2x00pci_register_read(rt2x00dev, AC_TXOP_CSR1, &amp;reg);</div><div class='add'>+		rt2x00_set_field32(&amp;reg, field, queue-&gt;txop);</div><div class='add'>+		rt2x00pci_register_write(rt2x00dev, AC_TXOP_CSR1, reg);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Update WMM registers */</div><div class='add'>+	field.bit_offset = queue_idx * 4;</div><div class='add'>+	field.bit_mask = 0xf &lt;&lt; field.bit_offset;</div><div class='add'>+</div><div class='add'>+	rt2x00pci_register_read(rt2x00dev, AIFSN_CSR, &amp;reg);</div><div class='add'>+	rt2x00_set_field32(&amp;reg, field, queue-&gt;aifs);</div><div class='add'>+	rt2x00pci_register_write(rt2x00dev, AIFSN_CSR, reg);</div><div class='add'>+</div><div class='add'>+	rt2x00pci_register_read(rt2x00dev, CWMIN_CSR, &amp;reg);</div><div class='add'>+	rt2x00_set_field32(&amp;reg, field, queue-&gt;cw_min);</div><div class='add'>+	rt2x00pci_register_write(rt2x00dev, CWMIN_CSR, reg);</div><div class='add'>+</div><div class='add'>+	rt2x00pci_register_read(rt2x00dev, CWMAX_CSR, &amp;reg);</div><div class='add'>+	rt2x00_set_field32(&amp;reg, field, queue-&gt;cw_max);</div><div class='add'>+	rt2x00pci_register_write(rt2x00dev, CWMAX_CSR, reg);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static u64 rt61pci_get_tsf(struct ieee80211_hw *hw)</div><div class='ctx'> {</div><div class='ctx'> 	struct rt2x00_dev *rt2x00dev = hw-&gt;priv;</div><div class='hunk'>@@ -2404,10 +2724,11 @@ static const struct ieee80211_ops rt61pci_mac80211_ops = {</div><div class='ctx'> 	.config			= rt2x00mac_config,</div><div class='ctx'> 	.config_interface	= rt2x00mac_config_interface,</div><div class='ctx'> 	.configure_filter	= rt2x00mac_configure_filter,</div><div class='add'>+	.set_key		= rt2x00mac_set_key,</div><div class='ctx'> 	.get_stats		= rt2x00mac_get_stats,</div><div class='ctx'> 	.set_retry_limit	= rt61pci_set_retry_limit,</div><div class='ctx'> 	.bss_info_changed	= rt2x00mac_bss_info_changed,</div><div class='del'>-	.conf_tx		= rt2x00mac_conf_tx,</div><div class='add'>+	.conf_tx		= rt61pci_conf_tx,</div><div class='ctx'> 	.get_tx_stats		= rt2x00mac_get_tx_stats,</div><div class='ctx'> 	.get_tsf		= rt61pci_get_tsf,</div><div class='ctx'> };</div><div class='hunk'>@@ -2432,6 +2753,8 @@ static const struct rt2x00lib_ops rt61pci_rt2x00_ops = {</div><div class='ctx'> 	.write_beacon		= rt61pci_write_beacon,</div><div class='ctx'> 	.kick_tx_queue		= rt61pci_kick_tx_queue,</div><div class='ctx'> 	.fill_rxdone		= rt61pci_fill_rxdone,</div><div class='add'>+	.config_shared_key	= rt61pci_config_shared_key,</div><div class='add'>+	.config_pairwise_key	= rt61pci_config_pairwise_key,</div><div class='ctx'> 	.config_filter		= rt61pci_config_filter,</div><div class='ctx'> 	.config_intf		= rt61pci_config_intf,</div><div class='ctx'> 	.config_erp		= rt61pci_config_erp,</div><div class='head'>diff --git a/drivers/net/wireless/rt2x00/rt61pci.h b/drivers/net/wireless/rt2x00/rt61pci.h<br/>index 1004d5b899e6..8ec1451308cc 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/rt2x00/rt61pci.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/rt2x00/rt61pci.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/rt2x00/rt61pci.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/rt2x00/rt61pci.h</a></div><div class='hunk'>@@ -134,6 +134,16 @@</div><div class='ctx'> #define PAIRWISE_KEY_TABLE_BASE		0x1200</div><div class='ctx'> #define PAIRWISE_TA_TABLE_BASE		0x1a00</div><div class='ctx'> </div><div class='add'>+#define SHARED_KEY_ENTRY(__idx) \</div><div class='add'>+	( SHARED_KEY_TABLE_BASE + \</div><div class='add'>+		((__idx) * sizeof(struct hw_key_entry)) )</div><div class='add'>+#define PAIRWISE_KEY_ENTRY(__idx) \</div><div class='add'>+	( PAIRWISE_KEY_TABLE_BASE + \</div><div class='add'>+		((__idx) * sizeof(struct hw_key_entry)) )</div><div class='add'>+#define PAIRWISE_TA_ENTRY(__idx) \</div><div class='add'>+	( PAIRWISE_TA_TABLE_BASE + \</div><div class='add'>+		((__idx) * sizeof(struct hw_pairwise_ta_entry)) )</div><div class='add'>+</div><div class='ctx'> struct hw_key_entry {</div><div class='ctx'> 	u8 key[16];</div><div class='ctx'> 	u8 tx_mic[8];</div><div class='hunk'>@@ -142,7 +152,8 @@ struct hw_key_entry {</div><div class='ctx'> </div><div class='ctx'> struct hw_pairwise_ta_entry {</div><div class='ctx'> 	u8 address[6];</div><div class='del'>-	u8 reserved[2];</div><div class='add'>+	u8 cipher;</div><div class='add'>+	u8 reserved;</div><div class='ctx'> } __attribute__ ((packed));</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -662,6 +673,10 @@ struct hw_pairwise_ta_entry {</div><div class='ctx'>  * SEC_CSR4: Pairwise key table lookup control.</div><div class='ctx'>  */</div><div class='ctx'> #define SEC_CSR4			0x30b0</div><div class='add'>+#define SEC_CSR4_ENABLE_BSS0		FIELD32(0x00000001)</div><div class='add'>+#define SEC_CSR4_ENABLE_BSS1		FIELD32(0x00000002)</div><div class='add'>+#define SEC_CSR4_ENABLE_BSS2		FIELD32(0x00000004)</div><div class='add'>+#define SEC_CSR4_ENABLE_BSS3		FIELD32(0x00000008)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * SEC_CSR5: shared key table security mode register.</div><div class='hunk'>@@ -1428,8 +1443,10 @@ struct hw_pairwise_ta_entry {</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Word4</div><div class='add'>+ * ICV: Received ICV of originally encrypted.</div><div class='add'>+ * NOTE: This is a guess, the official definition is "reserved"</div><div class='ctx'>  */</div><div class='del'>-#define RXD_W4_RESERVED			FIELD32(0xffffffff)</div><div class='add'>+#define RXD_W4_ICV			FIELD32(0xffffffff)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * the above 20-byte is called RXINFO and will be DMAed to MAC RX block</div><div class='hunk'>@@ -1465,17 +1482,10 @@ struct hw_pairwise_ta_entry {</div><div class='ctx'> #define MAX_TXPOWER	31</div><div class='ctx'> #define DEFAULT_TXPOWER	24</div><div class='ctx'> </div><div class='del'>-#define TXPOWER_FROM_DEV(__txpower)		\</div><div class='del'>-({						\</div><div class='del'>-	((__txpower) &gt; MAX_TXPOWER) ?		\</div><div class='del'>-		DEFAULT_TXPOWER : (__txpower);	\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-#define TXPOWER_TO_DEV(__txpower)			\</div><div class='del'>-({							\</div><div class='del'>-	((__txpower) &lt;= MIN_TXPOWER) ? MIN_TXPOWER :	\</div><div class='del'>-	(((__txpower) &gt;= MAX_TXPOWER) ? MAX_TXPOWER :	\</div><div class='del'>-	(__txpower));					\</div><div class='del'>-})</div><div class='add'>+#define TXPOWER_FROM_DEV(__txpower) \</div><div class='add'>+	(((u8)(__txpower)) &gt; MAX_TXPOWER) ? DEFAULT_TXPOWER : (__txpower)</div><div class='add'>+</div><div class='add'>+#define TXPOWER_TO_DEV(__txpower) \</div><div class='add'>+	clamp_t(char, __txpower, MIN_TXPOWER, MAX_TXPOWER)</div><div class='ctx'> </div><div class='ctx'> #endif /* RT61PCI_H */</div><div class='head'>diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c<br/>index 9761eaaa08be..934f8e03c5aa 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/rt2x00/rt73usb.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/rt2x00/rt73usb.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/rt2x00/rt73usb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/rt2x00/rt73usb.c</a></div><div class='hunk'>@@ -37,6 +37,13 @@</div><div class='ctx'> #include "rt73usb.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Allow hardware encryption to be disabled.</div><div class='add'>+ */</div><div class='add'>+static int modparam_nohwcrypt = 0;</div><div class='add'>+module_param_named(nohwcrypt, modparam_nohwcrypt, bool, S_IRUGO);</div><div class='add'>+MODULE_PARM_DESC(nohwcrypt, "Disable hardware encryption.");</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Register access.</div><div class='ctx'>  * All access to the CSR registers will go through the methods</div><div class='ctx'>  * rt73usb_register_read and rt73usb_register_write.</div><div class='hunk'>@@ -285,7 +292,7 @@ static const struct rt2x00debug rt73usb_rt2x00debug = {</div><div class='ctx'> };</div><div class='ctx'> #endif /* CONFIG_RT2X00_LIB_DEBUGFS */</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_RT73USB_LEDS</div><div class='add'>+#ifdef CONFIG_RT2X00_LIB_LEDS</div><div class='ctx'> static void rt73usb_brightness_set(struct led_classdev *led_cdev,</div><div class='ctx'> 				   enum led_brightness brightness)</div><div class='ctx'> {</div><div class='hunk'>@@ -352,11 +359,224 @@ static void rt73usb_init_led(struct rt2x00_dev *rt2x00dev,</div><div class='ctx'> 	led-&gt;led_dev.blink_set = rt73usb_blink_set;</div><div class='ctx'> 	led-&gt;flags = LED_INITIALIZED;</div><div class='ctx'> }</div><div class='del'>-#endif /* CONFIG_RT73USB_LEDS */</div><div class='add'>+#endif /* CONFIG_RT2X00_LIB_LEDS */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Configuration handlers.</div><div class='ctx'>  */</div><div class='add'>+static int rt73usb_config_shared_key(struct rt2x00_dev *rt2x00dev,</div><div class='add'>+				     struct rt2x00lib_crypto *crypto,</div><div class='add'>+				     struct ieee80211_key_conf *key)</div><div class='add'>+{</div><div class='add'>+	struct hw_key_entry key_entry;</div><div class='add'>+	struct rt2x00_field32 field;</div><div class='add'>+	int timeout;</div><div class='add'>+	u32 mask;</div><div class='add'>+	u32 reg;</div><div class='add'>+</div><div class='add'>+	if (crypto-&gt;cmd == SET_KEY) {</div><div class='add'>+		/*</div><div class='add'>+		 * rt2x00lib can't determine the correct free</div><div class='add'>+		 * key_idx for shared keys. We have 1 register</div><div class='add'>+		 * with key valid bits. The goal is simple, read</div><div class='add'>+		 * the register, if that is full we have no slots</div><div class='add'>+		 * left.</div><div class='add'>+		 * Note that each BSS is allowed to have up to 4</div><div class='add'>+		 * shared keys, so put a mask over the allowed</div><div class='add'>+		 * entries.</div><div class='add'>+		 */</div><div class='add'>+		mask = (0xf &lt;&lt; crypto-&gt;bssidx);</div><div class='add'>+</div><div class='add'>+		rt73usb_register_read(rt2x00dev, SEC_CSR0, &amp;reg);</div><div class='add'>+		reg &amp;= mask;</div><div class='add'>+</div><div class='add'>+		if (reg &amp;&amp; reg == mask)</div><div class='add'>+			return -ENOSPC;</div><div class='add'>+</div><div class='add'>+		key-&gt;hw_key_idx += reg ? ffz(reg) : 0;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Upload key to hardware</div><div class='add'>+		 */</div><div class='add'>+		memcpy(key_entry.key, crypto-&gt;key,</div><div class='add'>+		       sizeof(key_entry.key));</div><div class='add'>+		memcpy(key_entry.tx_mic, crypto-&gt;tx_mic,</div><div class='add'>+		       sizeof(key_entry.tx_mic));</div><div class='add'>+		memcpy(key_entry.rx_mic, crypto-&gt;rx_mic,</div><div class='add'>+		       sizeof(key_entry.rx_mic));</div><div class='add'>+</div><div class='add'>+		reg = SHARED_KEY_ENTRY(key-&gt;hw_key_idx);</div><div class='add'>+		timeout = REGISTER_TIMEOUT32(sizeof(key_entry));</div><div class='add'>+		rt2x00usb_vendor_request_large_buff(rt2x00dev, USB_MULTI_WRITE,</div><div class='add'>+						    USB_VENDOR_REQUEST_OUT, reg,</div><div class='add'>+						    &amp;key_entry,</div><div class='add'>+						    sizeof(key_entry),</div><div class='add'>+						    timeout);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * The cipher types are stored over 2 registers.</div><div class='add'>+		 * bssidx 0 and 1 keys are stored in SEC_CSR1 and</div><div class='add'>+		 * bssidx 1 and 2 keys are stored in SEC_CSR5.</div><div class='add'>+		 * Using the correct defines correctly will cause overhead,</div><div class='add'>+		 * so just calculate the correct offset.</div><div class='add'>+		 */</div><div class='add'>+		if (key-&gt;hw_key_idx &lt; 8) {</div><div class='add'>+			field.bit_offset = (3 * key-&gt;hw_key_idx);</div><div class='add'>+			field.bit_mask = 0x7 &lt;&lt; field.bit_offset;</div><div class='add'>+</div><div class='add'>+			rt73usb_register_read(rt2x00dev, SEC_CSR1, &amp;reg);</div><div class='add'>+			rt2x00_set_field32(&amp;reg, field, crypto-&gt;cipher);</div><div class='add'>+			rt73usb_register_write(rt2x00dev, SEC_CSR1, reg);</div><div class='add'>+		} else {</div><div class='add'>+			field.bit_offset = (3 * (key-&gt;hw_key_idx - 8));</div><div class='add'>+			field.bit_mask = 0x7 &lt;&lt; field.bit_offset;</div><div class='add'>+</div><div class='add'>+			rt73usb_register_read(rt2x00dev, SEC_CSR5, &amp;reg);</div><div class='add'>+			rt2x00_set_field32(&amp;reg, field, crypto-&gt;cipher);</div><div class='add'>+			rt73usb_register_write(rt2x00dev, SEC_CSR5, reg);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * The driver does not support the IV/EIV generation</div><div class='add'>+		 * in hardware. However it doesn't support the IV/EIV</div><div class='add'>+		 * inside the ieee80211 frame either, but requires it</div><div class='add'>+		 * to be provided seperately for the descriptor.</div><div class='add'>+		 * rt2x00lib will cut the IV/EIV data out of all frames</div><div class='add'>+		 * given to us by mac80211, but we must tell mac80211</div><div class='add'>+		 * to generate the IV/EIV data.</div><div class='add'>+		 */</div><div class='add'>+		key-&gt;flags |= IEEE80211_KEY_FLAG_GENERATE_IV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * SEC_CSR0 contains only single-bit fields to indicate</div><div class='add'>+	 * a particular key is valid. Because using the FIELD32()</div><div class='add'>+	 * defines directly will cause a lot of overhead we use</div><div class='add'>+	 * a calculation to determine the correct bit directly.</div><div class='add'>+	 */</div><div class='add'>+	mask = 1 &lt;&lt; key-&gt;hw_key_idx;</div><div class='add'>+</div><div class='add'>+	rt73usb_register_read(rt2x00dev, SEC_CSR0, &amp;reg);</div><div class='add'>+	if (crypto-&gt;cmd == SET_KEY)</div><div class='add'>+		reg |= mask;</div><div class='add'>+	else if (crypto-&gt;cmd == DISABLE_KEY)</div><div class='add'>+		reg &amp;= ~mask;</div><div class='add'>+	rt73usb_register_write(rt2x00dev, SEC_CSR0, reg);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rt73usb_config_pairwise_key(struct rt2x00_dev *rt2x00dev,</div><div class='add'>+				       struct rt2x00lib_crypto *crypto,</div><div class='add'>+				       struct ieee80211_key_conf *key)</div><div class='add'>+{</div><div class='add'>+	struct hw_pairwise_ta_entry addr_entry;</div><div class='add'>+	struct hw_key_entry key_entry;</div><div class='add'>+	int timeout;</div><div class='add'>+	u32 mask;</div><div class='add'>+	u32 reg;</div><div class='add'>+</div><div class='add'>+	if (crypto-&gt;cmd == SET_KEY) {</div><div class='add'>+		/*</div><div class='add'>+		 * rt2x00lib can't determine the correct free</div><div class='add'>+		 * key_idx for pairwise keys. We have 2 registers</div><div class='add'>+		 * with key valid bits. The goal is simple, read</div><div class='add'>+		 * the first register, if that is full move to</div><div class='add'>+		 * the next register.</div><div class='add'>+		 * When both registers are full, we drop the key,</div><div class='add'>+		 * otherwise we use the first invalid entry.</div><div class='add'>+		 */</div><div class='add'>+		rt73usb_register_read(rt2x00dev, SEC_CSR2, &amp;reg);</div><div class='add'>+		if (reg &amp;&amp; reg == ~0) {</div><div class='add'>+			key-&gt;hw_key_idx = 32;</div><div class='add'>+			rt73usb_register_read(rt2x00dev, SEC_CSR3, &amp;reg);</div><div class='add'>+			if (reg &amp;&amp; reg == ~0)</div><div class='add'>+				return -ENOSPC;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		key-&gt;hw_key_idx += reg ? ffz(reg) : 0;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Upload key to hardware</div><div class='add'>+		 */</div><div class='add'>+		memcpy(key_entry.key, crypto-&gt;key,</div><div class='add'>+		       sizeof(key_entry.key));</div><div class='add'>+		memcpy(key_entry.tx_mic, crypto-&gt;tx_mic,</div><div class='add'>+		       sizeof(key_entry.tx_mic));</div><div class='add'>+		memcpy(key_entry.rx_mic, crypto-&gt;rx_mic,</div><div class='add'>+		       sizeof(key_entry.rx_mic));</div><div class='add'>+</div><div class='add'>+		reg = PAIRWISE_KEY_ENTRY(key-&gt;hw_key_idx);</div><div class='add'>+		timeout = REGISTER_TIMEOUT32(sizeof(key_entry));</div><div class='add'>+		rt2x00usb_vendor_request_large_buff(rt2x00dev, USB_MULTI_WRITE,</div><div class='add'>+						    USB_VENDOR_REQUEST_OUT, reg,</div><div class='add'>+						    &amp;key_entry,</div><div class='add'>+						    sizeof(key_entry),</div><div class='add'>+						    timeout);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Send the address and cipher type to the hardware register.</div><div class='add'>+		 * This data fits within the CSR cache size, so we can use</div><div class='add'>+		 * rt73usb_register_multiwrite() directly.</div><div class='add'>+		 */</div><div class='add'>+		memset(&amp;addr_entry, 0, sizeof(addr_entry));</div><div class='add'>+		memcpy(&amp;addr_entry, crypto-&gt;address, ETH_ALEN);</div><div class='add'>+		addr_entry.cipher = crypto-&gt;cipher;</div><div class='add'>+</div><div class='add'>+		reg = PAIRWISE_TA_ENTRY(key-&gt;hw_key_idx);</div><div class='add'>+		rt73usb_register_multiwrite(rt2x00dev, reg,</div><div class='add'>+					    &amp;addr_entry, sizeof(addr_entry));</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Enable pairwise lookup table for given BSS idx,</div><div class='add'>+		 * without this received frames will not be decrypted</div><div class='add'>+		 * by the hardware.</div><div class='add'>+		 */</div><div class='add'>+		rt73usb_register_read(rt2x00dev, SEC_CSR4, &amp;reg);</div><div class='add'>+		reg |= (1 &lt;&lt; crypto-&gt;bssidx);</div><div class='add'>+		rt73usb_register_write(rt2x00dev, SEC_CSR4, reg);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * The driver does not support the IV/EIV generation</div><div class='add'>+		 * in hardware. However it doesn't support the IV/EIV</div><div class='add'>+		 * inside the ieee80211 frame either, but requires it</div><div class='add'>+		 * to be provided seperately for the descriptor.</div><div class='add'>+		 * rt2x00lib will cut the IV/EIV data out of all frames</div><div class='add'>+		 * given to us by mac80211, but we must tell mac80211</div><div class='add'>+		 * to generate the IV/EIV data.</div><div class='add'>+		 */</div><div class='add'>+		key-&gt;flags |= IEEE80211_KEY_FLAG_GENERATE_IV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * SEC_CSR2 and SEC_CSR3 contain only single-bit fields to indicate</div><div class='add'>+	 * a particular key is valid. Because using the FIELD32()</div><div class='add'>+	 * defines directly will cause a lot of overhead we use</div><div class='add'>+	 * a calculation to determine the correct bit directly.</div><div class='add'>+	 */</div><div class='add'>+	if (key-&gt;hw_key_idx &lt; 32) {</div><div class='add'>+		mask = 1 &lt;&lt; key-&gt;hw_key_idx;</div><div class='add'>+</div><div class='add'>+		rt73usb_register_read(rt2x00dev, SEC_CSR2, &amp;reg);</div><div class='add'>+		if (crypto-&gt;cmd == SET_KEY)</div><div class='add'>+			reg |= mask;</div><div class='add'>+		else if (crypto-&gt;cmd == DISABLE_KEY)</div><div class='add'>+			reg &amp;= ~mask;</div><div class='add'>+		rt73usb_register_write(rt2x00dev, SEC_CSR2, reg);</div><div class='add'>+	} else {</div><div class='add'>+		mask = 1 &lt;&lt; (key-&gt;hw_key_idx - 32);</div><div class='add'>+</div><div class='add'>+		rt73usb_register_read(rt2x00dev, SEC_CSR3, &amp;reg);</div><div class='add'>+		if (crypto-&gt;cmd == SET_KEY)</div><div class='add'>+			reg |= mask;</div><div class='add'>+		else if (crypto-&gt;cmd == DISABLE_KEY)</div><div class='add'>+			reg &amp;= ~mask;</div><div class='add'>+		rt73usb_register_write(rt2x00dev, SEC_CSR3, reg);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void rt73usb_config_filter(struct rt2x00_dev *rt2x00dev,</div><div class='ctx'> 				  const unsigned int filter_flags)</div><div class='ctx'> {</div><div class='hunk'>@@ -451,6 +671,26 @@ static void rt73usb_config_erp(struct rt2x00_dev *rt2x00dev,</div><div class='ctx'> 	rt73usb_register_write(rt2x00dev, TXRX_CSR4, reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void rt73usb_config_lna_gain(struct rt2x00_dev *rt2x00dev,</div><div class='add'>+				    struct rt2x00lib_conf *libconf)</div><div class='add'>+{</div><div class='add'>+	u16 eeprom;</div><div class='add'>+	short lna_gain = 0;</div><div class='add'>+</div><div class='add'>+	if (libconf-&gt;band == IEEE80211_BAND_2GHZ) {</div><div class='add'>+		if (test_bit(CONFIG_EXTERNAL_LNA_BG, &amp;rt2x00dev-&gt;flags))</div><div class='add'>+			lna_gain += 14;</div><div class='add'>+</div><div class='add'>+		rt2x00_eeprom_read(rt2x00dev, EEPROM_RSSI_OFFSET_BG, &amp;eeprom);</div><div class='add'>+		lna_gain -= rt2x00_get_field16(eeprom, EEPROM_RSSI_OFFSET_BG_1);</div><div class='add'>+	} else {</div><div class='add'>+		rt2x00_eeprom_read(rt2x00dev, EEPROM_RSSI_OFFSET_A, &amp;eeprom);</div><div class='add'>+		lna_gain -= rt2x00_get_field16(eeprom, EEPROM_RSSI_OFFSET_A_1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rt2x00dev-&gt;lna_gain = lna_gain;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void rt73usb_config_phymode(struct rt2x00_dev *rt2x00dev,</div><div class='ctx'> 				   const int basic_rate_mask)</div><div class='ctx'> {</div><div class='hunk'>@@ -705,6 +945,9 @@ static void rt73usb_config(struct rt2x00_dev *rt2x00dev,</div><div class='ctx'> 			   struct rt2x00lib_conf *libconf,</div><div class='ctx'> 			   const unsigned int flags)</div><div class='ctx'> {</div><div class='add'>+	/* Always recalculate LNA gain before changing configuration */</div><div class='add'>+	rt73usb_config_lna_gain(rt2x00dev, libconf);</div><div class='add'>+</div><div class='ctx'> 	if (flags &amp; CONFIG_UPDATE_PHYMODE)</div><div class='ctx'> 		rt73usb_config_phymode(rt2x00dev, libconf-&gt;basic_rates);</div><div class='ctx'> 	if (flags &amp; CONFIG_UPDATE_CHANNEL)</div><div class='hunk'>@@ -1034,16 +1277,6 @@ static int rt73usb_init_registers(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> 	rt73usb_register_write(rt2x00dev, PHY_CSR6, 0x00080606);</div><div class='ctx'> 	rt73usb_register_write(rt2x00dev, PHY_CSR7, 0x00000408);</div><div class='ctx'> </div><div class='del'>-	rt73usb_register_read(rt2x00dev, AC_TXOP_CSR0, &amp;reg);</div><div class='del'>-	rt2x00_set_field32(&amp;reg, AC_TXOP_CSR0_AC0_TX_OP, 0);</div><div class='del'>-	rt2x00_set_field32(&amp;reg, AC_TXOP_CSR0_AC1_TX_OP, 0);</div><div class='del'>-	rt73usb_register_write(rt2x00dev, AC_TXOP_CSR0, reg);</div><div class='del'>-</div><div class='del'>-	rt73usb_register_read(rt2x00dev, AC_TXOP_CSR1, &amp;reg);</div><div class='del'>-	rt2x00_set_field32(&amp;reg, AC_TXOP_CSR1_AC2_TX_OP, 192);</div><div class='del'>-	rt2x00_set_field32(&amp;reg, AC_TXOP_CSR1_AC3_TX_OP, 48);</div><div class='del'>-	rt73usb_register_write(rt2x00dev, AC_TXOP_CSR1, reg);</div><div class='del'>-</div><div class='ctx'> 	rt73usb_register_read(rt2x00dev, MAC_CSR9, &amp;reg);</div><div class='ctx'> 	rt2x00_set_field32(&amp;reg, MAC_CSR9_CW_SELECT, 0);</div><div class='ctx'> 	rt73usb_register_write(rt2x00dev, MAC_CSR9, reg);</div><div class='hunk'>@@ -1265,8 +1498,8 @@ static int rt73usb_set_device_state(struct rt2x00_dev *rt2x00dev,</div><div class='ctx'>  * TX descriptor initialization</div><div class='ctx'>  */</div><div class='ctx'> static void rt73usb_write_tx_desc(struct rt2x00_dev *rt2x00dev,</div><div class='del'>-				    struct sk_buff *skb,</div><div class='del'>-				    struct txentry_desc *txdesc)</div><div class='add'>+				  struct sk_buff *skb,</div><div class='add'>+				  struct txentry_desc *txdesc)</div><div class='ctx'> {</div><div class='ctx'> 	struct skb_frame_desc *skbdesc = get_skb_frame_desc(skb);</div><div class='ctx'> 	__le32 *txd = skbdesc-&gt;desc;</div><div class='hunk'>@@ -1280,7 +1513,7 @@ static void rt73usb_write_tx_desc(struct rt2x00_dev *rt2x00dev,</div><div class='ctx'> 	rt2x00_set_field32(&amp;word, TXD_W1_AIFSN, txdesc-&gt;aifs);</div><div class='ctx'> 	rt2x00_set_field32(&amp;word, TXD_W1_CWMIN, txdesc-&gt;cw_min);</div><div class='ctx'> 	rt2x00_set_field32(&amp;word, TXD_W1_CWMAX, txdesc-&gt;cw_max);</div><div class='del'>-	rt2x00_set_field32(&amp;word, TXD_W1_IV_OFFSET, IEEE80211_HEADER);</div><div class='add'>+	rt2x00_set_field32(&amp;word, TXD_W1_IV_OFFSET, txdesc-&gt;iv_offset);</div><div class='ctx'> 	rt2x00_set_field32(&amp;word, TXD_W1_HW_SEQUENCE,</div><div class='ctx'> 			   test_bit(ENTRY_TXD_GENERATE_SEQ, &amp;txdesc-&gt;flags));</div><div class='ctx'> 	rt2x00_desc_write(txd, 1, word);</div><div class='hunk'>@@ -1292,6 +1525,11 @@ static void rt73usb_write_tx_desc(struct rt2x00_dev *rt2x00dev,</div><div class='ctx'> 	rt2x00_set_field32(&amp;word, TXD_W2_PLCP_LENGTH_HIGH, txdesc-&gt;length_high);</div><div class='ctx'> 	rt2x00_desc_write(txd, 2, word);</div><div class='ctx'> </div><div class='add'>+	if (test_bit(ENTRY_TXD_ENCRYPT, &amp;txdesc-&gt;flags)) {</div><div class='add'>+		_rt2x00_desc_write(txd, 3, skbdesc-&gt;iv);</div><div class='add'>+		_rt2x00_desc_write(txd, 4, skbdesc-&gt;eiv);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	rt2x00_desc_read(txd, 5, &amp;word);</div><div class='ctx'> 	rt2x00_set_field32(&amp;word, TXD_W5_TX_POWER,</div><div class='ctx'> 			   TXPOWER_TO_DEV(rt2x00dev-&gt;tx_power));</div><div class='hunk'>@@ -1313,12 +1551,15 @@ static void rt73usb_write_tx_desc(struct rt2x00_dev *rt2x00dev,</div><div class='ctx'> 	rt2x00_set_field32(&amp;word, TXD_W0_IFS, txdesc-&gt;ifs);</div><div class='ctx'> 	rt2x00_set_field32(&amp;word, TXD_W0_RETRY_MODE,</div><div class='ctx'> 			   test_bit(ENTRY_TXD_RETRY_MODE, &amp;txdesc-&gt;flags));</div><div class='del'>-	rt2x00_set_field32(&amp;word, TXD_W0_TKIP_MIC, 0);</div><div class='del'>-	rt2x00_set_field32(&amp;word, TXD_W0_DATABYTE_COUNT,</div><div class='del'>-			   skb-&gt;len - skbdesc-&gt;desc_len);</div><div class='add'>+	rt2x00_set_field32(&amp;word, TXD_W0_TKIP_MIC,</div><div class='add'>+			   test_bit(ENTRY_TXD_ENCRYPT_MMIC, &amp;txdesc-&gt;flags));</div><div class='add'>+	rt2x00_set_field32(&amp;word, TXD_W0_KEY_TABLE,</div><div class='add'>+			   test_bit(ENTRY_TXD_ENCRYPT_PAIRWISE, &amp;txdesc-&gt;flags));</div><div class='add'>+	rt2x00_set_field32(&amp;word, TXD_W0_KEY_INDEX, txdesc-&gt;key_idx);</div><div class='add'>+	rt2x00_set_field32(&amp;word, TXD_W0_DATABYTE_COUNT, skb-&gt;len);</div><div class='ctx'> 	rt2x00_set_field32(&amp;word, TXD_W0_BURST2,</div><div class='ctx'> 			   test_bit(ENTRY_TXD_BURST, &amp;txdesc-&gt;flags));</div><div class='del'>-	rt2x00_set_field32(&amp;word, TXD_W0_CIPHER_ALG, CIPHER_NONE);</div><div class='add'>+	rt2x00_set_field32(&amp;word, TXD_W0_CIPHER_ALG, txdesc-&gt;cipher);</div><div class='ctx'> 	rt2x00_desc_write(txd, 0, word);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1331,7 +1572,6 @@ static void rt73usb_write_beacon(struct queue_entry *entry)</div><div class='ctx'> 	struct skb_frame_desc *skbdesc = get_skb_frame_desc(entry-&gt;skb);</div><div class='ctx'> 	unsigned int beacon_base;</div><div class='ctx'> 	u32 reg;</div><div class='del'>-	u32 word, len;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Add the descriptor in front of the skb.</div><div class='hunk'>@@ -1341,17 +1581,6 @@ static void rt73usb_write_beacon(struct queue_entry *entry)</div><div class='ctx'> 	skbdesc-&gt;desc = entry-&gt;skb-&gt;data;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Adjust the beacon databyte count. The current number is</div><div class='del'>-	 * calculated before this function gets called, but falsely</div><div class='del'>-	 * assumes that the descriptor was already present in the SKB.</div><div class='del'>-	 */</div><div class='del'>-	rt2x00_desc_read(skbdesc-&gt;desc, 0, &amp;word);</div><div class='del'>-	len  = rt2x00_get_field32(word, TXD_W0_DATABYTE_COUNT);</div><div class='del'>-	len += skbdesc-&gt;desc_len;</div><div class='del'>-	rt2x00_set_field32(&amp;word, TXD_W0_DATABYTE_COUNT, len);</div><div class='del'>-	rt2x00_desc_write(skbdesc-&gt;desc, 0, word);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='ctx'> 	 * Disable beaconing while we are reloading the beacon data,</div><div class='ctx'> 	 * otherwise we might be sending out invalid data.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -1422,20 +1651,19 @@ static void rt73usb_kick_tx_queue(struct rt2x00_dev *rt2x00dev,</div><div class='ctx'>  */</div><div class='ctx'> static int rt73usb_agc_to_rssi(struct rt2x00_dev *rt2x00dev, int rxd_w1)</div><div class='ctx'> {</div><div class='del'>-	u16 eeprom;</div><div class='del'>-	u8 offset;</div><div class='add'>+	u8 offset = rt2x00dev-&gt;lna_gain;</div><div class='ctx'> 	u8 lna;</div><div class='ctx'> </div><div class='ctx'> 	lna = rt2x00_get_field32(rxd_w1, RXD_W1_RSSI_LNA);</div><div class='ctx'> 	switch (lna) {</div><div class='ctx'> 	case 3:</div><div class='del'>-		offset = 90;</div><div class='add'>+		offset += 90;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 2:</div><div class='del'>-		offset = 74;</div><div class='add'>+		offset += 74;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 1:</div><div class='del'>-		offset = 64;</div><div class='add'>+		offset += 64;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -1451,15 +1679,6 @@ static int rt73usb_agc_to_rssi(struct rt2x00_dev *rt2x00dev, int rxd_w1)</div><div class='ctx'> 			else if (lna == 2)</div><div class='ctx'> 				offset += 8;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		rt2x00_eeprom_read(rt2x00dev, EEPROM_RSSI_OFFSET_A, &amp;eeprom);</div><div class='del'>-		offset -= rt2x00_get_field16(eeprom, EEPROM_RSSI_OFFSET_A_1);</div><div class='del'>-	} else {</div><div class='del'>-		if (test_bit(CONFIG_EXTERNAL_LNA_BG, &amp;rt2x00dev-&gt;flags))</div><div class='del'>-			offset += 14;</div><div class='del'>-</div><div class='del'>-		rt2x00_eeprom_read(rt2x00dev, EEPROM_RSSI_OFFSET_BG, &amp;eeprom);</div><div class='del'>-		offset -= rt2x00_get_field16(eeprom, EEPROM_RSSI_OFFSET_BG_1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return rt2x00_get_field32(rxd_w1, RXD_W1_RSSI_AGC) * 2 - offset;</div><div class='hunk'>@@ -1468,6 +1687,7 @@ static int rt73usb_agc_to_rssi(struct rt2x00_dev *rt2x00dev, int rxd_w1)</div><div class='ctx'> static void rt73usb_fill_rxdone(struct queue_entry *entry,</div><div class='ctx'> 			        struct rxdone_entry_desc *rxdesc)</div><div class='ctx'> {</div><div class='add'>+	struct rt2x00_dev *rt2x00dev = entry-&gt;queue-&gt;rt2x00dev;</div><div class='ctx'> 	struct skb_frame_desc *skbdesc = get_skb_frame_desc(entry-&gt;skb);</div><div class='ctx'> 	__le32 *rxd = (__le32 *)entry-&gt;skb-&gt;data;</div><div class='ctx'> 	u32 word0;</div><div class='hunk'>@@ -1489,6 +1709,38 @@ static void rt73usb_fill_rxdone(struct queue_entry *entry,</div><div class='ctx'> 	if (rt2x00_get_field32(word0, RXD_W0_CRC_ERROR))</div><div class='ctx'> 		rxdesc-&gt;flags |= RX_FLAG_FAILED_FCS_CRC;</div><div class='ctx'> </div><div class='add'>+	if (test_bit(CONFIG_SUPPORT_HW_CRYPTO, &amp;rt2x00dev-&gt;flags)) {</div><div class='add'>+		rxdesc-&gt;cipher =</div><div class='add'>+		    rt2x00_get_field32(word0, RXD_W0_CIPHER_ALG);</div><div class='add'>+		rxdesc-&gt;cipher_status =</div><div class='add'>+		    rt2x00_get_field32(word0, RXD_W0_CIPHER_ERROR);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rxdesc-&gt;cipher != CIPHER_NONE) {</div><div class='add'>+		_rt2x00_desc_read(rxd, 2, &amp;rxdesc-&gt;iv);</div><div class='add'>+		_rt2x00_desc_read(rxd, 3, &amp;rxdesc-&gt;eiv);</div><div class='add'>+		_rt2x00_desc_read(rxd, 4, &amp;rxdesc-&gt;icv);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Hardware has stripped IV/EIV data from 802.11 frame during</div><div class='add'>+		 * decryption. It has provided the data seperately but rt2x00lib</div><div class='add'>+		 * should decide if it should be reinserted.</div><div class='add'>+		 */</div><div class='add'>+		rxdesc-&gt;flags |= RX_FLAG_IV_STRIPPED;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * FIXME: Legacy driver indicates that the frame does</div><div class='add'>+		 * contain the Michael Mic. Unfortunately, in rt2x00</div><div class='add'>+		 * the MIC seems to be missing completely...</div><div class='add'>+		 */</div><div class='add'>+		rxdesc-&gt;flags |= RX_FLAG_MMIC_STRIPPED;</div><div class='add'>+</div><div class='add'>+		if (rxdesc-&gt;cipher_status == RX_CRYPTO_SUCCESS)</div><div class='add'>+			rxdesc-&gt;flags |= RX_FLAG_DECRYPTED;</div><div class='add'>+		else if (rxdesc-&gt;cipher_status == RX_CRYPTO_FAIL_MIC)</div><div class='add'>+			rxdesc-&gt;flags |= RX_FLAG_MMIC_ERROR;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Obtain the status about this packet.</div><div class='ctx'> 	 * When frame was received with an OFDM bitrate,</div><div class='hunk'>@@ -1496,11 +1748,13 @@ static void rt73usb_fill_rxdone(struct queue_entry *entry,</div><div class='ctx'> 	 * a CCK bitrate the signal is the rate in 100kbit/s.</div><div class='ctx'> 	 */</div><div class='ctx'> 	rxdesc-&gt;signal = rt2x00_get_field32(word1, RXD_W1_SIGNAL);</div><div class='del'>-	rxdesc-&gt;rssi = rt73usb_agc_to_rssi(entry-&gt;queue-&gt;rt2x00dev, word1);</div><div class='add'>+	rxdesc-&gt;rssi = rt73usb_agc_to_rssi(rt2x00dev, word1);</div><div class='ctx'> 	rxdesc-&gt;size = rt2x00_get_field32(word0, RXD_W0_DATABYTE_COUNT);</div><div class='ctx'> </div><div class='ctx'> 	if (rt2x00_get_field32(word0, RXD_W0_OFDM))</div><div class='ctx'> 		rxdesc-&gt;dev_flags |= RXDONE_SIGNAL_PLCP;</div><div class='add'>+	else</div><div class='add'>+		rxdesc-&gt;dev_flags |= RXDONE_SIGNAL_BITRATE;</div><div class='ctx'> 	if (rt2x00_get_field32(word0, RXD_W0_MY_BSS))</div><div class='ctx'> 		rxdesc-&gt;dev_flags |= RXDONE_MY_BSS;</div><div class='ctx'> </div><div class='hunk'>@@ -1678,7 +1932,7 @@ static int rt73usb_init_eeprom(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Store led settings, for correct led behaviour.</div><div class='ctx'> 	 */</div><div class='del'>-#ifdef CONFIG_RT73USB_LEDS</div><div class='add'>+#ifdef CONFIG_RT2X00_LIB_LEDS</div><div class='ctx'> 	rt2x00_eeprom_read(rt2x00dev, EEPROM_LED, &amp;eeprom);</div><div class='ctx'> </div><div class='ctx'> 	rt73usb_init_led(rt2x00dev, &amp;rt2x00dev-&gt;led_radio, LED_TYPE_RADIO);</div><div class='hunk'>@@ -1711,7 +1965,7 @@ static int rt73usb_init_eeprom(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> 	rt2x00_set_field16(&amp;rt2x00dev-&gt;led_mcu_reg, MCU_LEDCS_POLARITY_READY_A,</div><div class='ctx'> 			   rt2x00_get_field16(eeprom,</div><div class='ctx'> 					      EEPROM_LED_POLARITY_RDY_A));</div><div class='del'>-#endif /* CONFIG_RT73USB_LEDS */</div><div class='add'>+#endif /* CONFIG_RT2X00_LIB_LEDS */</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1852,10 +2106,11 @@ static const struct rf_channel rf_vals_5225_2527[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static void rt73usb_probe_hw_mode(struct rt2x00_dev *rt2x00dev)</div><div class='add'>+static int rt73usb_probe_hw_mode(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct hw_mode_spec *spec = &amp;rt2x00dev-&gt;spec;</div><div class='del'>-	u8 *txpower;</div><div class='add'>+	struct channel_info *info;</div><div class='add'>+	char *tx_power;</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1872,20 +2127,10 @@ static void rt73usb_probe_hw_mode(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> 						   EEPROM_MAC_ADDR_0));</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Convert tx_power array in eeprom.</div><div class='del'>-	 */</div><div class='del'>-	txpower = rt2x00_eeprom_addr(rt2x00dev, EEPROM_TXPOWER_G_START);</div><div class='del'>-	for (i = 0; i &lt; 14; i++)</div><div class='del'>-		txpower[i] = TXPOWER_FROM_DEV(txpower[i]);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='ctx'> 	 * Initialize hw_mode information.</div><div class='ctx'> 	 */</div><div class='ctx'> 	spec-&gt;supported_bands = SUPPORT_BAND_2GHZ;</div><div class='ctx'> 	spec-&gt;supported_rates = SUPPORT_RATE_CCK | SUPPORT_RATE_OFDM;</div><div class='del'>-	spec-&gt;tx_power_a = NULL;</div><div class='del'>-	spec-&gt;tx_power_bg = txpower;</div><div class='del'>-	spec-&gt;tx_power_default = DEFAULT_TXPOWER;</div><div class='ctx'> </div><div class='ctx'> 	if (rt2x00_rf(&amp;rt2x00dev-&gt;chip, RF2528)) {</div><div class='ctx'> 		spec-&gt;num_channels = ARRAY_SIZE(rf_vals_bg_2528);</div><div class='hunk'>@@ -1903,14 +2148,26 @@ static void rt73usb_probe_hw_mode(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> 		spec-&gt;channels = rf_vals_5225_2527;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (rt2x00_rf(&amp;rt2x00dev-&gt;chip, RF5225) ||</div><div class='del'>-	    rt2x00_rf(&amp;rt2x00dev-&gt;chip, RF5226)) {</div><div class='del'>-		txpower = rt2x00_eeprom_addr(rt2x00dev, EEPROM_TXPOWER_A_START);</div><div class='del'>-		for (i = 0; i &lt; 14; i++)</div><div class='del'>-			txpower[i] = TXPOWER_FROM_DEV(txpower[i]);</div><div class='add'>+	/*</div><div class='add'>+	 * Create channel information array</div><div class='add'>+	 */</div><div class='add'>+	info = kzalloc(spec-&gt;num_channels * sizeof(*info), GFP_KERNEL);</div><div class='add'>+	if (!info)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-		spec-&gt;tx_power_a = txpower;</div><div class='add'>+	spec-&gt;channels_info = info;</div><div class='add'>+</div><div class='add'>+	tx_power = rt2x00_eeprom_addr(rt2x00dev, EEPROM_TXPOWER_G_START);</div><div class='add'>+	for (i = 0; i &lt; 14; i++)</div><div class='add'>+		info[i].tx_power1 = TXPOWER_FROM_DEV(tx_power[i]);</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;num_channels &gt; 14) {</div><div class='add'>+		tx_power = rt2x00_eeprom_addr(rt2x00dev, EEPROM_TXPOWER_A_START);</div><div class='add'>+		for (i = 14; i &lt; spec-&gt;num_channels; i++)</div><div class='add'>+			info[i].tx_power1 = TXPOWER_FROM_DEV(tx_power[i]);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int rt73usb_probe_hw(struct rt2x00_dev *rt2x00dev)</div><div class='hunk'>@@ -1931,13 +2188,17 @@ static int rt73usb_probe_hw(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Initialize hw specifications.</div><div class='ctx'> 	 */</div><div class='del'>-	rt73usb_probe_hw_mode(rt2x00dev);</div><div class='add'>+	retval = rt73usb_probe_hw_mode(rt2x00dev);</div><div class='add'>+	if (retval)</div><div class='add'>+		return retval;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * This device requires firmware.</div><div class='ctx'> 	 */</div><div class='ctx'> 	__set_bit(DRIVER_REQUIRE_FIRMWARE, &amp;rt2x00dev-&gt;flags);</div><div class='ctx'> 	__set_bit(DRIVER_REQUIRE_SCHEDULED, &amp;rt2x00dev-&gt;flags);</div><div class='add'>+	if (!modparam_nohwcrypt)</div><div class='add'>+		__set_bit(CONFIG_SUPPORT_HW_CRYPTO, &amp;rt2x00dev-&gt;flags);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Set the rssi offset.</div><div class='hunk'>@@ -1964,6 +2225,63 @@ static int rt73usb_set_retry_limit(struct ieee80211_hw *hw,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int rt73usb_conf_tx(struct ieee80211_hw *hw, u16 queue_idx,</div><div class='add'>+			   const struct ieee80211_tx_queue_params *params)</div><div class='add'>+{</div><div class='add'>+	struct rt2x00_dev *rt2x00dev = hw-&gt;priv;</div><div class='add'>+	struct data_queue *queue;</div><div class='add'>+	struct rt2x00_field32 field;</div><div class='add'>+	int retval;</div><div class='add'>+	u32 reg;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * First pass the configuration through rt2x00lib, that will</div><div class='add'>+	 * update the queue settings and validate the input. After that</div><div class='add'>+	 * we are free to update the registers based on the value</div><div class='add'>+	 * in the queue parameter.</div><div class='add'>+	 */</div><div class='add'>+	retval = rt2x00mac_conf_tx(hw, queue_idx, params);</div><div class='add'>+	if (retval)</div><div class='add'>+		return retval;</div><div class='add'>+</div><div class='add'>+	queue = rt2x00queue_get_queue(rt2x00dev, queue_idx);</div><div class='add'>+</div><div class='add'>+	/* Update WMM TXOP register */</div><div class='add'>+	if (queue_idx &lt; 2) {</div><div class='add'>+		field.bit_offset = queue_idx * 16;</div><div class='add'>+		field.bit_mask = 0xffff &lt;&lt; field.bit_offset;</div><div class='add'>+</div><div class='add'>+		rt73usb_register_read(rt2x00dev, AC_TXOP_CSR0, &amp;reg);</div><div class='add'>+		rt2x00_set_field32(&amp;reg, field, queue-&gt;txop);</div><div class='add'>+		rt73usb_register_write(rt2x00dev, AC_TXOP_CSR0, reg);</div><div class='add'>+	} else if (queue_idx &lt; 4) {</div><div class='add'>+		field.bit_offset = (queue_idx - 2) * 16;</div><div class='add'>+		field.bit_mask = 0xffff &lt;&lt; field.bit_offset;</div><div class='add'>+</div><div class='add'>+		rt73usb_register_read(rt2x00dev, AC_TXOP_CSR1, &amp;reg);</div><div class='add'>+		rt2x00_set_field32(&amp;reg, field, queue-&gt;txop);</div><div class='add'>+		rt73usb_register_write(rt2x00dev, AC_TXOP_CSR1, reg);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Update WMM registers */</div><div class='add'>+	field.bit_offset = queue_idx * 4;</div><div class='add'>+	field.bit_mask = 0xf &lt;&lt; field.bit_offset;</div><div class='add'>+</div><div class='add'>+	rt73usb_register_read(rt2x00dev, AIFSN_CSR, &amp;reg);</div><div class='add'>+	rt2x00_set_field32(&amp;reg, field, queue-&gt;aifs);</div><div class='add'>+	rt73usb_register_write(rt2x00dev, AIFSN_CSR, reg);</div><div class='add'>+</div><div class='add'>+	rt73usb_register_read(rt2x00dev, CWMIN_CSR, &amp;reg);</div><div class='add'>+	rt2x00_set_field32(&amp;reg, field, queue-&gt;cw_min);</div><div class='add'>+	rt73usb_register_write(rt2x00dev, CWMIN_CSR, reg);</div><div class='add'>+</div><div class='add'>+	rt73usb_register_read(rt2x00dev, CWMAX_CSR, &amp;reg);</div><div class='add'>+	rt2x00_set_field32(&amp;reg, field, queue-&gt;cw_max);</div><div class='add'>+	rt73usb_register_write(rt2x00dev, CWMAX_CSR, reg);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #if 0</div><div class='ctx'> /*</div><div class='ctx'>  * Mac80211 demands get_tsf must be atomic.</div><div class='hunk'>@@ -1997,10 +2315,11 @@ static const struct ieee80211_ops rt73usb_mac80211_ops = {</div><div class='ctx'> 	.config			= rt2x00mac_config,</div><div class='ctx'> 	.config_interface	= rt2x00mac_config_interface,</div><div class='ctx'> 	.configure_filter	= rt2x00mac_configure_filter,</div><div class='add'>+	.set_key		= rt2x00mac_set_key,</div><div class='ctx'> 	.get_stats		= rt2x00mac_get_stats,</div><div class='ctx'> 	.set_retry_limit	= rt73usb_set_retry_limit,</div><div class='ctx'> 	.bss_info_changed	= rt2x00mac_bss_info_changed,</div><div class='del'>-	.conf_tx		= rt2x00mac_conf_tx,</div><div class='add'>+	.conf_tx		= rt73usb_conf_tx,</div><div class='ctx'> 	.get_tx_stats		= rt2x00mac_get_tx_stats,</div><div class='ctx'> 	.get_tsf		= rt73usb_get_tsf,</div><div class='ctx'> };</div><div class='hunk'>@@ -2024,6 +2343,8 @@ static const struct rt2x00lib_ops rt73usb_rt2x00_ops = {</div><div class='ctx'> 	.get_tx_data_len	= rt73usb_get_tx_data_len,</div><div class='ctx'> 	.kick_tx_queue		= rt73usb_kick_tx_queue,</div><div class='ctx'> 	.fill_rxdone		= rt73usb_fill_rxdone,</div><div class='add'>+	.config_shared_key	= rt73usb_config_shared_key,</div><div class='add'>+	.config_pairwise_key	= rt73usb_config_pairwise_key,</div><div class='ctx'> 	.config_filter		= rt73usb_config_filter,</div><div class='ctx'> 	.config_intf		= rt73usb_config_intf,</div><div class='ctx'> 	.config_erp		= rt73usb_config_erp,</div><div class='head'>diff --git a/drivers/net/wireless/rt2x00/rt73usb.h b/drivers/net/wireless/rt2x00/rt73usb.h<br/>index 148493501011..868386c457f6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/rt2x00/rt73usb.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/rt2x00/rt73usb.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/rt2x00/rt73usb.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/rt2x00/rt73usb.h</a></div><div class='hunk'>@@ -92,6 +92,16 @@</div><div class='ctx'> #define PAIRWISE_KEY_TABLE_BASE		0x1200</div><div class='ctx'> #define PAIRWISE_TA_TABLE_BASE		0x1a00</div><div class='ctx'> </div><div class='add'>+#define SHARED_KEY_ENTRY(__idx) \</div><div class='add'>+	( SHARED_KEY_TABLE_BASE + \</div><div class='add'>+		((__idx) * sizeof(struct hw_key_entry)) )</div><div class='add'>+#define PAIRWISE_KEY_ENTRY(__idx) \</div><div class='add'>+	( PAIRWISE_KEY_TABLE_BASE + \</div><div class='add'>+		((__idx) * sizeof(struct hw_key_entry)) )</div><div class='add'>+#define PAIRWISE_TA_ENTRY(__idx) \</div><div class='add'>+	( PAIRWISE_TA_TABLE_BASE + \</div><div class='add'>+		((__idx) * sizeof(struct hw_pairwise_ta_entry)) )</div><div class='add'>+</div><div class='ctx'> struct hw_key_entry {</div><div class='ctx'> 	u8 key[16];</div><div class='ctx'> 	u8 tx_mic[8];</div><div class='hunk'>@@ -100,7 +110,8 @@ struct hw_key_entry {</div><div class='ctx'> </div><div class='ctx'> struct hw_pairwise_ta_entry {</div><div class='ctx'> 	u8 address[6];</div><div class='del'>-	u8 reserved[2];</div><div class='add'>+	u8 cipher;</div><div class='add'>+	u8 reserved;</div><div class='ctx'> } __attribute__ ((packed));</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -563,6 +574,10 @@ struct hw_pairwise_ta_entry {</div><div class='ctx'>  * SEC_CSR4: Pairwise key table lookup control.</div><div class='ctx'>  */</div><div class='ctx'> #define SEC_CSR4			0x30b0</div><div class='add'>+#define SEC_CSR4_ENABLE_BSS0		FIELD32(0x00000001)</div><div class='add'>+#define SEC_CSR4_ENABLE_BSS1		FIELD32(0x00000002)</div><div class='add'>+#define SEC_CSR4_ENABLE_BSS2		FIELD32(0x00000004)</div><div class='add'>+#define SEC_CSR4_ENABLE_BSS3		FIELD32(0x00000008)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * SEC_CSR5: shared key table security mode register.</div><div class='hunk'>@@ -1010,8 +1025,10 @@ struct hw_pairwise_ta_entry {</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Word4</div><div class='add'>+ * ICV: Received ICV of originally encrypted.</div><div class='add'>+ * NOTE: This is a guess, the official definition is "reserved"</div><div class='ctx'>  */</div><div class='del'>-#define RXD_W4_RESERVED			FIELD32(0xffffffff)</div><div class='add'>+#define RXD_W4_ICV			FIELD32(0xffffffff)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * the above 20-byte is called RXINFO and will be DMAed to MAC RX block</div><div class='hunk'>@@ -1033,17 +1050,10 @@ struct hw_pairwise_ta_entry {</div><div class='ctx'> #define MAX_TXPOWER	31</div><div class='ctx'> #define DEFAULT_TXPOWER	24</div><div class='ctx'> </div><div class='del'>-#define TXPOWER_FROM_DEV(__txpower)		\</div><div class='del'>-({						\</div><div class='del'>-	((__txpower) &gt; MAX_TXPOWER) ?		\</div><div class='del'>-		DEFAULT_TXPOWER : (__txpower);	\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-#define TXPOWER_TO_DEV(__txpower)			\</div><div class='del'>-({							\</div><div class='del'>-	((__txpower) &lt;= MIN_TXPOWER) ? MIN_TXPOWER :	\</div><div class='del'>-	(((__txpower) &gt;= MAX_TXPOWER) ? MAX_TXPOWER :	\</div><div class='del'>-	(__txpower));					\</div><div class='del'>-})</div><div class='add'>+#define TXPOWER_FROM_DEV(__txpower) \</div><div class='add'>+	(((u8)(__txpower)) &gt; MAX_TXPOWER) ? DEFAULT_TXPOWER : (__txpower)</div><div class='add'>+</div><div class='add'>+#define TXPOWER_TO_DEV(__txpower) \</div><div class='add'>+	clamp_t(char, __txpower, MIN_TXPOWER, MAX_TXPOWER)</div><div class='ctx'> </div><div class='ctx'> #endif /* RT73USB_H */</div><div class='head'>diff --git a/drivers/net/wireless/rtl8180.h b/drivers/net/wireless/rtl8180.h<br/>index 082a11f93beb..8721282a8185 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/rtl8180.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/rtl8180.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/rtl8180.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/rtl8180.h</a></div><div class='hunk'>@@ -24,20 +24,6 @@</div><div class='ctx'> #define ANAPARAM_PWR1_SHIFT	20</div><div class='ctx'> #define ANAPARAM_PWR1_MASK	(0x7F &lt;&lt; ANAPARAM_PWR1_SHIFT)</div><div class='ctx'> </div><div class='del'>-enum rtl8180_tx_desc_flags {</div><div class='del'>-	RTL8180_TX_DESC_FLAG_NO_ENC	= (1 &lt;&lt; 15),</div><div class='del'>-	RTL8180_TX_DESC_FLAG_TX_OK	= (1 &lt;&lt; 15),</div><div class='del'>-	RTL8180_TX_DESC_FLAG_SPLCP	= (1 &lt;&lt; 16),</div><div class='del'>-	RTL8180_TX_DESC_FLAG_RX_UNDER	= (1 &lt;&lt; 16),</div><div class='del'>-	RTL8180_TX_DESC_FLAG_MOREFRAG	= (1 &lt;&lt; 17),</div><div class='del'>-	RTL8180_TX_DESC_FLAG_CTS	= (1 &lt;&lt; 18),</div><div class='del'>-	RTL8180_TX_DESC_FLAG_RTS	= (1 &lt;&lt; 23),</div><div class='del'>-	RTL8180_TX_DESC_FLAG_LS		= (1 &lt;&lt; 28),</div><div class='del'>-	RTL8180_TX_DESC_FLAG_FS		= (1 &lt;&lt; 29),</div><div class='del'>-	RTL8180_TX_DESC_FLAG_DMA	= (1 &lt;&lt; 30),</div><div class='del'>-	RTL8180_TX_DESC_FLAG_OWN	= (1 &lt;&lt; 31)</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> struct rtl8180_tx_desc {</div><div class='ctx'> 	__le32 flags;</div><div class='ctx'> 	__le16 rts_duration;</div><div class='hunk'>@@ -52,23 +38,6 @@ struct rtl8180_tx_desc {</div><div class='ctx'> 	u32 reserved[2];</div><div class='ctx'> } __attribute__ ((packed));</div><div class='ctx'> </div><div class='del'>-enum rtl8180_rx_desc_flags {</div><div class='del'>-	RTL8180_RX_DESC_FLAG_ICV_ERR	= (1 &lt;&lt; 12),</div><div class='del'>-	RTL8180_RX_DESC_FLAG_CRC32_ERR	= (1 &lt;&lt; 13),</div><div class='del'>-	RTL8180_RX_DESC_FLAG_PM		= (1 &lt;&lt; 14),</div><div class='del'>-	RTL8180_RX_DESC_FLAG_RX_ERR	= (1 &lt;&lt; 15),</div><div class='del'>-	RTL8180_RX_DESC_FLAG_BCAST	= (1 &lt;&lt; 16),</div><div class='del'>-	RTL8180_RX_DESC_FLAG_PAM	= (1 &lt;&lt; 17),</div><div class='del'>-	RTL8180_RX_DESC_FLAG_MCAST	= (1 &lt;&lt; 18),</div><div class='del'>-	RTL8180_RX_DESC_FLAG_SPLCP	= (1 &lt;&lt; 25),</div><div class='del'>-	RTL8180_RX_DESC_FLAG_FOF	= (1 &lt;&lt; 26),</div><div class='del'>-	RTL8180_RX_DESC_FLAG_DMA_FAIL	= (1 &lt;&lt; 27),</div><div class='del'>-	RTL8180_RX_DESC_FLAG_LS		= (1 &lt;&lt; 28),</div><div class='del'>-	RTL8180_RX_DESC_FLAG_FS		= (1 &lt;&lt; 29),</div><div class='del'>-	RTL8180_RX_DESC_FLAG_EOR	= (1 &lt;&lt; 30),</div><div class='del'>-	RTL8180_RX_DESC_FLAG_OWN	= (1 &lt;&lt; 31)</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> struct rtl8180_rx_desc {</div><div class='ctx'> 	__le32 flags;</div><div class='ctx'> 	__le32 flags2;</div><div class='head'>diff --git a/drivers/net/wireless/rtl8180_dev.c b/drivers/net/wireless/rtl8180_dev.c<br/>index b7172a12c057..df7e78ee8a88 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/rtl8180_dev.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/rtl8180_dev.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/rtl8180_dev.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/rtl8180_dev.c</a></div><div class='hunk'>@@ -110,12 +110,12 @@ static void rtl8180_handle_rx(struct ieee80211_hw *dev)</div><div class='ctx'> 		struct sk_buff *skb = priv-&gt;rx_buf[priv-&gt;rx_idx];</div><div class='ctx'> 		u32 flags = le32_to_cpu(entry-&gt;flags);</div><div class='ctx'> </div><div class='del'>-		if (flags &amp; RTL8180_RX_DESC_FLAG_OWN)</div><div class='add'>+		if (flags &amp; RTL818X_RX_DESC_FLAG_OWN)</div><div class='ctx'> 			return;</div><div class='ctx'> </div><div class='del'>-		if (unlikely(flags &amp; (RTL8180_RX_DESC_FLAG_DMA_FAIL |</div><div class='del'>-				      RTL8180_RX_DESC_FLAG_FOF |</div><div class='del'>-				      RTL8180_RX_DESC_FLAG_RX_ERR)))</div><div class='add'>+		if (unlikely(flags &amp; (RTL818X_RX_DESC_FLAG_DMA_FAIL |</div><div class='add'>+				      RTL818X_RX_DESC_FLAG_FOF |</div><div class='add'>+				      RTL818X_RX_DESC_FLAG_RX_ERR)))</div><div class='ctx'> 			goto done;</div><div class='ctx'> 		else {</div><div class='ctx'> 			u32 flags2 = le32_to_cpu(entry-&gt;flags2);</div><div class='hunk'>@@ -140,7 +140,7 @@ static void rtl8180_handle_rx(struct ieee80211_hw *dev)</div><div class='ctx'> 			rx_status.band = dev-&gt;conf.channel-&gt;band;</div><div class='ctx'> 			rx_status.mactime = le64_to_cpu(entry-&gt;tsft);</div><div class='ctx'> 			rx_status.flag |= RX_FLAG_TSFT;</div><div class='del'>-			if (flags &amp; RTL8180_RX_DESC_FLAG_CRC32_ERR)</div><div class='add'>+			if (flags &amp; RTL818X_RX_DESC_FLAG_CRC32_ERR)</div><div class='ctx'> 				rx_status.flag |= RX_FLAG_FAILED_FCS_CRC;</div><div class='ctx'> </div><div class='ctx'> 			ieee80211_rx_irqsafe(dev, skb, &amp;rx_status);</div><div class='hunk'>@@ -154,10 +154,10 @@ static void rtl8180_handle_rx(struct ieee80211_hw *dev)</div><div class='ctx'> </div><div class='ctx'> 	done:</div><div class='ctx'> 		entry-&gt;rx_buf = cpu_to_le32(*((dma_addr_t *)skb-&gt;cb));</div><div class='del'>-		entry-&gt;flags = cpu_to_le32(RTL8180_RX_DESC_FLAG_OWN |</div><div class='add'>+		entry-&gt;flags = cpu_to_le32(RTL818X_RX_DESC_FLAG_OWN |</div><div class='ctx'> 					   MAX_RX_SIZE);</div><div class='ctx'> 		if (priv-&gt;rx_idx == 31)</div><div class='del'>-			entry-&gt;flags |= cpu_to_le32(RTL8180_RX_DESC_FLAG_EOR);</div><div class='add'>+			entry-&gt;flags |= cpu_to_le32(RTL818X_RX_DESC_FLAG_EOR);</div><div class='ctx'> 		priv-&gt;rx_idx = (priv-&gt;rx_idx + 1) % 32;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -173,7 +173,7 @@ static void rtl8180_handle_tx(struct ieee80211_hw *dev, unsigned int prio)</div><div class='ctx'> 		struct ieee80211_tx_info *info;</div><div class='ctx'> 		u32 flags = le32_to_cpu(entry-&gt;flags);</div><div class='ctx'> </div><div class='del'>-		if (flags &amp; RTL8180_TX_DESC_FLAG_OWN)</div><div class='add'>+		if (flags &amp; RTL818X_TX_DESC_FLAG_OWN)</div><div class='ctx'> 			return;</div><div class='ctx'> </div><div class='ctx'> 		ring-&gt;idx = (ring-&gt;idx + 1) % ring-&gt;entries;</div><div class='hunk'>@@ -185,7 +185,7 @@ static void rtl8180_handle_tx(struct ieee80211_hw *dev, unsigned int prio)</div><div class='ctx'> 		memset(&amp;info-&gt;status, 0, sizeof(info-&gt;status));</div><div class='ctx'> </div><div class='ctx'> 		if (!(info-&gt;flags &amp; IEEE80211_TX_CTL_NO_ACK)) {</div><div class='del'>-			if (flags &amp; RTL8180_TX_DESC_FLAG_TX_OK)</div><div class='add'>+			if (flags &amp; RTL818X_TX_DESC_FLAG_TX_OK)</div><div class='ctx'> 				info-&gt;flags |= IEEE80211_TX_STAT_ACK;</div><div class='ctx'> 			else</div><div class='ctx'> 				info-&gt;status.excessive_retries = 1;</div><div class='hunk'>@@ -252,20 +252,20 @@ static int rtl8180_tx(struct ieee80211_hw *dev, struct sk_buff *skb)</div><div class='ctx'> 	mapping = pci_map_single(priv-&gt;pdev, skb-&gt;data,</div><div class='ctx'> 				 skb-&gt;len, PCI_DMA_TODEVICE);</div><div class='ctx'> </div><div class='del'>-	tx_flags = RTL8180_TX_DESC_FLAG_OWN | RTL8180_TX_DESC_FLAG_FS |</div><div class='del'>-		   RTL8180_TX_DESC_FLAG_LS |</div><div class='add'>+	tx_flags = RTL818X_TX_DESC_FLAG_OWN | RTL818X_TX_DESC_FLAG_FS |</div><div class='add'>+		   RTL818X_TX_DESC_FLAG_LS |</div><div class='ctx'> 		   (ieee80211_get_tx_rate(dev, info)-&gt;hw_value &lt;&lt; 24) |</div><div class='ctx'> 		   skb-&gt;len;</div><div class='ctx'> </div><div class='ctx'> 	if (priv-&gt;r8185)</div><div class='del'>-		tx_flags |= RTL8180_TX_DESC_FLAG_DMA |</div><div class='del'>-			    RTL8180_TX_DESC_FLAG_NO_ENC;</div><div class='add'>+		tx_flags |= RTL818X_TX_DESC_FLAG_DMA |</div><div class='add'>+			    RTL818X_TX_DESC_FLAG_NO_ENC;</div><div class='ctx'> </div><div class='ctx'> 	if (info-&gt;flags &amp; IEEE80211_TX_CTL_USE_RTS_CTS) {</div><div class='del'>-		tx_flags |= RTL8180_TX_DESC_FLAG_RTS;</div><div class='add'>+		tx_flags |= RTL818X_TX_DESC_FLAG_RTS;</div><div class='ctx'> 		tx_flags |= ieee80211_get_rts_cts_rate(dev, info)-&gt;hw_value &lt;&lt; 19;</div><div class='ctx'> 	} else if (info-&gt;flags &amp; IEEE80211_TX_CTL_USE_CTS_PROTECT) {</div><div class='del'>-		tx_flags |= RTL8180_TX_DESC_FLAG_CTS;</div><div class='add'>+		tx_flags |= RTL818X_TX_DESC_FLAG_CTS;</div><div class='ctx'> 		tx_flags |= ieee80211_get_rts_cts_rate(dev, info)-&gt;hw_value &lt;&lt; 19;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -292,8 +292,8 @@ static int rtl8180_tx(struct ieee80211_hw *dev, struct sk_buff *skb)</div><div class='ctx'> 	entry-&gt;plcp_len = cpu_to_le16(plcp_len);</div><div class='ctx'> 	entry-&gt;tx_buf = cpu_to_le32(mapping);</div><div class='ctx'> 	entry-&gt;frame_len = cpu_to_le32(skb-&gt;len);</div><div class='del'>-	entry-&gt;flags2 = info-&gt;control.alt_retry_rate_idx &gt;= 0 ?</div><div class='del'>-		ieee80211_get_alt_retry_rate(dev, info)-&gt;bitrate &lt;&lt; 4 : 0;</div><div class='add'>+	entry-&gt;flags2 = info-&gt;control.retries[0].rate_idx &gt;= 0 ?</div><div class='add'>+		ieee80211_get_alt_retry_rate(dev, info, 0)-&gt;bitrate &lt;&lt; 4 : 0;</div><div class='ctx'> 	entry-&gt;retry_limit = info-&gt;control.retry_limit;</div><div class='ctx'> 	entry-&gt;flags = cpu_to_le32(tx_flags);</div><div class='ctx'> 	__skb_queue_tail(&amp;ring-&gt;queue, skb);</div><div class='hunk'>@@ -446,10 +446,10 @@ static int rtl8180_init_rx_ring(struct ieee80211_hw *dev)</div><div class='ctx'> 		*mapping = pci_map_single(priv-&gt;pdev, skb_tail_pointer(skb),</div><div class='ctx'> 					  MAX_RX_SIZE, PCI_DMA_FROMDEVICE);</div><div class='ctx'> 		entry-&gt;rx_buf = cpu_to_le32(*mapping);</div><div class='del'>-		entry-&gt;flags = cpu_to_le32(RTL8180_RX_DESC_FLAG_OWN |</div><div class='add'>+		entry-&gt;flags = cpu_to_le32(RTL818X_RX_DESC_FLAG_OWN |</div><div class='ctx'> 					   MAX_RX_SIZE);</div><div class='ctx'> 	}</div><div class='del'>-	entry-&gt;flags |= cpu_to_le32(RTL8180_RX_DESC_FLAG_EOR);</div><div class='add'>+	entry-&gt;flags |= cpu_to_le32(RTL818X_RX_DESC_FLAG_EOR);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -615,7 +615,7 @@ static int rtl8180_start(struct ieee80211_hw *dev)</div><div class='ctx'> 	reg |= RTL818X_CMD_TX_ENABLE;</div><div class='ctx'> 	rtl818x_iowrite8(priv, &amp;priv-&gt;map-&gt;CMD, reg);</div><div class='ctx'> </div><div class='del'>-	priv-&gt;mode = IEEE80211_IF_TYPE_MNTR;</div><div class='add'>+	priv-&gt;mode = NL80211_IFTYPE_MONITOR;</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'>  err_free_rings:</div><div class='hunk'>@@ -633,7 +633,7 @@ static void rtl8180_stop(struct ieee80211_hw *dev)</div><div class='ctx'> 	u8 reg;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	priv-&gt;mode = IEEE80211_IF_TYPE_INVALID;</div><div class='add'>+	priv-&gt;mode = NL80211_IFTYPE_UNSPECIFIED;</div><div class='ctx'> </div><div class='ctx'> 	rtl818x_iowrite16(priv, &amp;priv-&gt;map-&gt;INT_MASK, 0);</div><div class='ctx'> </div><div class='hunk'>@@ -661,11 +661,11 @@ static int rtl8180_add_interface(struct ieee80211_hw *dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct rtl8180_priv *priv = dev-&gt;priv;</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;mode != IEEE80211_IF_TYPE_MNTR)</div><div class='add'>+	if (priv-&gt;mode != NL80211_IFTYPE_MONITOR)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 	switch (conf-&gt;type) {</div><div class='del'>-	case IEEE80211_IF_TYPE_STA:</div><div class='add'>+	case NL80211_IFTYPE_STATION:</div><div class='ctx'> 		priv-&gt;mode = conf-&gt;type;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -688,7 +688,7 @@ static void rtl8180_remove_interface(struct ieee80211_hw *dev,</div><div class='ctx'> 				     struct ieee80211_if_init_conf *conf)</div><div class='ctx'> {</div><div class='ctx'> 	struct rtl8180_priv *priv = dev-&gt;priv;</div><div class='del'>-	priv-&gt;mode = IEEE80211_IF_TYPE_MNTR;</div><div class='add'>+	priv-&gt;mode = NL80211_IFTYPE_MONITOR;</div><div class='ctx'> 	priv-&gt;vif = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -855,6 +855,7 @@ static int __devinit rtl8180_probe(struct pci_dev *pdev,</div><div class='ctx'> 	priv = dev-&gt;priv;</div><div class='ctx'> 	priv-&gt;pdev = pdev;</div><div class='ctx'> </div><div class='add'>+	dev-&gt;max_altrates = 1;</div><div class='ctx'> 	SET_IEEE80211_DEV(dev, &amp;pdev-&gt;dev);</div><div class='ctx'> 	pci_set_drvdata(pdev, dev);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/rtl8187.h b/drivers/net/wireless/rtl8187.h<br/>index 5a9515c99960..e82bb4d289e8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/rtl8187.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/rtl8187.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/rtl8187.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/rtl8187.h</a></div><div class='hunk'>@@ -58,12 +58,6 @@ struct rtl8187b_rx_hdr {</div><div class='ctx'> </div><div class='ctx'> /* {rtl8187,rtl8187b}_tx_info is in skb */</div><div class='ctx'> </div><div class='del'>-/* Tx flags are common between rtl8187 and rtl8187b */</div><div class='del'>-#define RTL8187_TX_FLAG_NO_ENCRYPT	(1 &lt;&lt; 15)</div><div class='del'>-#define RTL8187_TX_FLAG_MORE_FRAG	(1 &lt;&lt; 17)</div><div class='del'>-#define RTL8187_TX_FLAG_CTS		(1 &lt;&lt; 18)</div><div class='del'>-#define RTL8187_TX_FLAG_RTS		(1 &lt;&lt; 23)</div><div class='del'>-</div><div class='ctx'> struct rtl8187_tx_hdr {</div><div class='ctx'> 	__le32 flags;</div><div class='ctx'> 	__le16 rts_duration;</div><div class='head'>diff --git a/drivers/net/wireless/rtl8187_dev.c b/drivers/net/wireless/rtl8187_dev.c<br/>index ca5deb6244e6..431e3c78bf27 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/rtl8187_dev.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/rtl8187_dev.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/rtl8187_dev.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/rtl8187_dev.c</a></div><div class='hunk'>@@ -33,10 +33,13 @@ MODULE_LICENSE("GPL");</div><div class='ctx'> static struct usb_device_id rtl8187_table[] __devinitdata = {</div><div class='ctx'> 	/* Asus */</div><div class='ctx'> 	{USB_DEVICE(0x0b05, 0x171d), .driver_info = DEVICE_RTL8187},</div><div class='add'>+	/* Belkin */</div><div class='add'>+	{USB_DEVICE(0x050d, 0x705e), .driver_info = DEVICE_RTL8187B},</div><div class='ctx'> 	/* Realtek */</div><div class='ctx'> 	{USB_DEVICE(0x0bda, 0x8187), .driver_info = DEVICE_RTL8187},</div><div class='ctx'> 	{USB_DEVICE(0x0bda, 0x8189), .driver_info = DEVICE_RTL8187B},</div><div class='ctx'> 	{USB_DEVICE(0x0bda, 0x8197), .driver_info = DEVICE_RTL8187B},</div><div class='add'>+	{USB_DEVICE(0x0bda, 0x8198), .driver_info = DEVICE_RTL8187B},</div><div class='ctx'> 	/* Netgear */</div><div class='ctx'> 	{USB_DEVICE(0x0846, 0x6100), .driver_info = DEVICE_RTL8187},</div><div class='ctx'> 	{USB_DEVICE(0x0846, 0x6a00), .driver_info = DEVICE_RTL8187},</div><div class='hunk'>@@ -187,18 +190,18 @@ static int rtl8187_tx(struct ieee80211_hw *dev, struct sk_buff *skb)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	flags = skb-&gt;len;</div><div class='del'>-	flags |= RTL8187_TX_FLAG_NO_ENCRYPT;</div><div class='add'>+	flags |= RTL818X_TX_DESC_FLAG_NO_ENC;</div><div class='ctx'> </div><div class='ctx'> 	flags |= ieee80211_get_tx_rate(dev, info)-&gt;hw_value &lt;&lt; 24;</div><div class='ctx'> 	if (ieee80211_has_morefrags(((struct ieee80211_hdr *)skb-&gt;data)-&gt;frame_control))</div><div class='del'>-		flags |= RTL8187_TX_FLAG_MORE_FRAG;</div><div class='add'>+		flags |= RTL818X_TX_DESC_FLAG_MOREFRAG;</div><div class='ctx'> 	if (info-&gt;flags &amp; IEEE80211_TX_CTL_USE_RTS_CTS) {</div><div class='del'>-		flags |= RTL8187_TX_FLAG_RTS;</div><div class='add'>+		flags |= RTL818X_TX_DESC_FLAG_RTS;</div><div class='ctx'> 		flags |= ieee80211_get_rts_cts_rate(dev, info)-&gt;hw_value &lt;&lt; 19;</div><div class='ctx'> 		rts_dur = ieee80211_rts_duration(dev, priv-&gt;vif,</div><div class='ctx'> 						 skb-&gt;len, info);</div><div class='ctx'> 	} else if (info-&gt;flags &amp; IEEE80211_TX_CTL_USE_CTS_PROTECT) {</div><div class='del'>-		flags |= RTL8187_TX_FLAG_CTS;</div><div class='add'>+		flags |= RTL818X_TX_DESC_FLAG_CTS;</div><div class='ctx'> 		flags |= ieee80211_get_rts_cts_rate(dev, info)-&gt;hw_value &lt;&lt; 19;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -354,7 +357,7 @@ static void rtl8187_rx_cb(struct urb *urb)</div><div class='ctx'> 	rx_status.freq = dev-&gt;conf.channel-&gt;center_freq;</div><div class='ctx'> 	rx_status.band = dev-&gt;conf.channel-&gt;band;</div><div class='ctx'> 	rx_status.flag |= RX_FLAG_TSFT;</div><div class='del'>-	if (flags &amp; (1 &lt;&lt; 13))</div><div class='add'>+	if (flags &amp; RTL818X_RX_DESC_FLAG_CRC32_ERR)</div><div class='ctx'> 		rx_status.flag |= RX_FLAG_FAILED_FCS_CRC;</div><div class='ctx'> 	ieee80211_rx_irqsafe(dev, skb, &amp;rx_status);</div><div class='ctx'> </div><div class='hunk'>@@ -836,11 +839,11 @@ static int rtl8187_add_interface(struct ieee80211_hw *dev,</div><div class='ctx'> 	struct rtl8187_priv *priv = dev-&gt;priv;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;mode != IEEE80211_IF_TYPE_MNTR)</div><div class='add'>+	if (priv-&gt;mode != NL80211_IFTYPE_MONITOR)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 	switch (conf-&gt;type) {</div><div class='del'>-	case IEEE80211_IF_TYPE_STA:</div><div class='add'>+	case NL80211_IFTYPE_STATION:</div><div class='ctx'> 		priv-&gt;mode = conf-&gt;type;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -865,7 +868,7 @@ static void rtl8187_remove_interface(struct ieee80211_hw *dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct rtl8187_priv *priv = dev-&gt;priv;</div><div class='ctx'> 	mutex_lock(&amp;priv-&gt;conf_mutex);</div><div class='del'>-	priv-&gt;mode = IEEE80211_IF_TYPE_MNTR;</div><div class='add'>+	priv-&gt;mode = NL80211_IFTYPE_MONITOR;</div><div class='ctx'> 	priv-&gt;vif = NULL;</div><div class='ctx'> 	mutex_unlock(&amp;priv-&gt;conf_mutex);</div><div class='ctx'> }</div><div class='hunk'>@@ -1057,7 +1060,7 @@ static int __devinit rtl8187_probe(struct usb_interface *intf,</div><div class='ctx'> 	dev-&gt;wiphy-&gt;bands[IEEE80211_BAND_2GHZ] = &amp;priv-&gt;band;</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-	priv-&gt;mode = IEEE80211_IF_TYPE_MNTR;</div><div class='add'>+	priv-&gt;mode = NL80211_IFTYPE_MONITOR;</div><div class='ctx'> 	dev-&gt;flags = IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING |</div><div class='ctx'> 		     IEEE80211_HW_RX_INCLUDES_FCS;</div><div class='ctx'> </div><div class='hunk'>@@ -1184,6 +1187,8 @@ static int __devinit rtl8187_probe(struct usb_interface *intf,</div><div class='ctx'> 		dev-&gt;max_signal = 65;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	dev-&gt;wiphy-&gt;interface_modes = BIT(NL80211_IFTYPE_STATION);</div><div class='add'>+</div><div class='ctx'> 	if ((id-&gt;driver_info == DEVICE_RTL8187) &amp;&amp; priv-&gt;is_rtl8187b)</div><div class='ctx'> 		printk(KERN_INFO "rtl8187: inconsistency between id with OEM"</div><div class='ctx'> 		       " info!\n");</div><div class='head'>diff --git a/drivers/net/wireless/rtl818x.h b/drivers/net/wireless/rtl818x.h<br/>index 00900fe16fce..3538b15211b1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/rtl818x.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/rtl818x.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/rtl818x.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/rtl818x.h</a></div><div class='hunk'>@@ -193,4 +193,39 @@ struct rtl818x_rf_ops {</div><div class='ctx'> 	void (*set_chan)(struct ieee80211_hw *, struct ieee80211_conf *);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* Tx/Rx flags are common between RTL818X chips */</div><div class='add'>+</div><div class='add'>+enum rtl818x_tx_desc_flags {</div><div class='add'>+	RTL818X_TX_DESC_FLAG_NO_ENC	= (1 &lt;&lt; 15),</div><div class='add'>+	RTL818X_TX_DESC_FLAG_TX_OK	= (1 &lt;&lt; 15),</div><div class='add'>+	RTL818X_TX_DESC_FLAG_SPLCP	= (1 &lt;&lt; 16),</div><div class='add'>+	RTL818X_TX_DESC_FLAG_RX_UNDER	= (1 &lt;&lt; 16),</div><div class='add'>+	RTL818X_TX_DESC_FLAG_MOREFRAG	= (1 &lt;&lt; 17),</div><div class='add'>+	RTL818X_TX_DESC_FLAG_CTS	= (1 &lt;&lt; 18),</div><div class='add'>+	RTL818X_TX_DESC_FLAG_RTS	= (1 &lt;&lt; 23),</div><div class='add'>+	RTL818X_TX_DESC_FLAG_LS		= (1 &lt;&lt; 28),</div><div class='add'>+	RTL818X_TX_DESC_FLAG_FS		= (1 &lt;&lt; 29),</div><div class='add'>+	RTL818X_TX_DESC_FLAG_DMA	= (1 &lt;&lt; 30),</div><div class='add'>+	RTL818X_TX_DESC_FLAG_OWN	= (1 &lt;&lt; 31)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum rtl818x_rx_desc_flags {</div><div class='add'>+	RTL818X_RX_DESC_FLAG_ICV_ERR	= (1 &lt;&lt; 12),</div><div class='add'>+	RTL818X_RX_DESC_FLAG_CRC32_ERR	= (1 &lt;&lt; 13),</div><div class='add'>+	RTL818X_RX_DESC_FLAG_PM		= (1 &lt;&lt; 14),</div><div class='add'>+	RTL818X_RX_DESC_FLAG_RX_ERR	= (1 &lt;&lt; 15),</div><div class='add'>+	RTL818X_RX_DESC_FLAG_BCAST	= (1 &lt;&lt; 16),</div><div class='add'>+	RTL818X_RX_DESC_FLAG_PAM	= (1 &lt;&lt; 17),</div><div class='add'>+	RTL818X_RX_DESC_FLAG_MCAST	= (1 &lt;&lt; 18),</div><div class='add'>+	RTL818X_RX_DESC_FLAG_QOS	= (1 &lt;&lt; 19), /* RTL8187(B) only */</div><div class='add'>+	RTL818X_RX_DESC_FLAG_TRSW	= (1 &lt;&lt; 24), /* RTL8187(B) only */</div><div class='add'>+	RTL818X_RX_DESC_FLAG_SPLCP	= (1 &lt;&lt; 25),</div><div class='add'>+	RTL818X_RX_DESC_FLAG_FOF	= (1 &lt;&lt; 26),</div><div class='add'>+	RTL818X_RX_DESC_FLAG_DMA_FAIL	= (1 &lt;&lt; 27),</div><div class='add'>+	RTL818X_RX_DESC_FLAG_LS		= (1 &lt;&lt; 28),</div><div class='add'>+	RTL818X_RX_DESC_FLAG_FS		= (1 &lt;&lt; 29),</div><div class='add'>+	RTL818X_RX_DESC_FLAG_EOR	= (1 &lt;&lt; 30),</div><div class='add'>+	RTL818X_RX_DESC_FLAG_OWN	= (1 &lt;&lt; 31)</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #endif /* RTL818X_H */</div><div class='head'>diff --git a/drivers/net/wireless/spectrum_cs.c b/drivers/net/wireless/spectrum_cs.c<br/>index 98df9bc7836a..852789ad34b3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/spectrum_cs.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/spectrum_cs.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/spectrum_cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/spectrum_cs.c</a></div><div class='hunk'>@@ -25,7 +25,6 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/firmware.h&gt;</div><div class='ctx'> #include &lt;pcmcia/cs_types.h&gt;</div><div class='ctx'> #include &lt;pcmcia/cs.h&gt;</div><div class='ctx'> #include &lt;pcmcia/cistpl.h&gt;</div><div class='hunk'>@@ -34,9 +33,6 @@</div><div class='ctx'> </div><div class='ctx'> #include "orinoco.h"</div><div class='ctx'> </div><div class='del'>-static const char primary_fw_name[] = "symbol_sp24t_prim_fw";</div><div class='del'>-static const char secondary_fw_name[] = "symbol_sp24t_sec_fw";</div><div class='del'>-</div><div class='ctx'> /********************************************************************/</div><div class='ctx'> /* Module stuff							    */</div><div class='ctx'> /********************************************************************/</div><div class='hunk'>@@ -71,161 +67,11 @@ struct orinoco_pccard {</div><div class='ctx'> static int spectrum_cs_config(struct pcmcia_device *link);</div><div class='ctx'> static void spectrum_cs_release(struct pcmcia_device *link);</div><div class='ctx'> </div><div class='del'>-/********************************************************************/</div><div class='del'>-/* Firmware downloader						    */</div><div class='del'>-/********************************************************************/</div><div class='del'>-</div><div class='del'>-/* Position of PDA in the adapter memory */</div><div class='del'>-#define EEPROM_ADDR	0x3000</div><div class='del'>-#define EEPROM_LEN	0x200</div><div class='del'>-#define PDA_OFFSET	0x100</div><div class='del'>-</div><div class='del'>-#define PDA_ADDR	(EEPROM_ADDR + PDA_OFFSET)</div><div class='del'>-#define PDA_WORDS	((EEPROM_LEN - PDA_OFFSET) / 2)</div><div class='del'>-</div><div class='ctx'> /* Constants for the CISREG_CCSR register */</div><div class='ctx'> #define HCR_RUN		0x07	/* run firmware after reset */</div><div class='ctx'> #define HCR_IDLE	0x0E	/* don't run firmware after reset */</div><div class='ctx'> #define HCR_MEM16	0x10	/* memory width bit, should be preserved */</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * AUX port access.  To unlock the AUX port write the access keys to the</div><div class='del'>- * PARAM0-2 registers, then write HERMES_AUX_ENABLE to the HERMES_CONTROL</div><div class='del'>- * register.  Then read it and make sure it's HERMES_AUX_ENABLED.</div><div class='del'>- */</div><div class='del'>-#define HERMES_AUX_ENABLE	0x8000	/* Enable auxiliary port access */</div><div class='del'>-#define HERMES_AUX_DISABLE	0x4000	/* Disable to auxiliary port access */</div><div class='del'>-#define HERMES_AUX_ENABLED	0xC000	/* Auxiliary port is open */</div><div class='del'>-</div><div class='del'>-#define HERMES_AUX_PW0	0xFE01</div><div class='del'>-#define HERMES_AUX_PW1	0xDC23</div><div class='del'>-#define HERMES_AUX_PW2	0xBA45</div><div class='del'>-</div><div class='del'>-/* End markers */</div><div class='del'>-#define PDI_END		0x00000000	/* End of PDA */</div><div class='del'>-#define BLOCK_END	0xFFFFFFFF	/* Last image block */</div><div class='del'>-#define TEXT_END	0x1A		/* End of text header */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The following structures have little-endian fields denoted by</div><div class='del'>- * the leading underscore.  Don't access them directly - use inline</div><div class='del'>- * functions defined below.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The binary image to be downloaded consists of series of data blocks.</div><div class='del'>- * Each block has the following structure.</div><div class='del'>- */</div><div class='del'>-struct dblock {</div><div class='del'>-	__le32 addr;		/* adapter address where to write the block */</div><div class='del'>-	__le16 len;		/* length of the data only, in bytes */</div><div class='del'>-	char data[0];		/* data to be written */</div><div class='del'>-} __attribute__ ((packed));</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Plug Data References are located in in the image after the last data</div><div class='del'>- * block.  They refer to areas in the adapter memory where the plug data</div><div class='del'>- * items with matching ID should be written.</div><div class='del'>- */</div><div class='del'>-struct pdr {</div><div class='del'>-	__le32 id;		/* record ID */</div><div class='del'>-	__le32 addr;		/* adapter address where to write the data */</div><div class='del'>-	__le32 len;		/* expected length of the data, in bytes */</div><div class='del'>-	char next[0];		/* next PDR starts here */</div><div class='del'>-} __attribute__ ((packed));</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Plug Data Items are located in the EEPROM read from the adapter by</div><div class='del'>- * primary firmware.  They refer to the device-specific data that should</div><div class='del'>- * be plugged into the secondary firmware.</div><div class='del'>- */</div><div class='del'>-struct pdi {</div><div class='del'>-	__le16 len;		/* length of ID and data, in words */</div><div class='del'>-	__le16 id;		/* record ID */</div><div class='del'>-	char data[0];		/* plug data */</div><div class='del'>-} __attribute__ ((packed));</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Functions for access to little-endian data */</div><div class='del'>-static inline u32</div><div class='del'>-dblock_addr(const struct dblock *blk)</div><div class='del'>-{</div><div class='del'>-	return le32_to_cpu(blk-&gt;addr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u32</div><div class='del'>-dblock_len(const struct dblock *blk)</div><div class='del'>-{</div><div class='del'>-	return le16_to_cpu(blk-&gt;len);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u32</div><div class='del'>-pdr_id(const struct pdr *pdr)</div><div class='del'>-{</div><div class='del'>-	return le32_to_cpu(pdr-&gt;id);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u32</div><div class='del'>-pdr_addr(const struct pdr *pdr)</div><div class='del'>-{</div><div class='del'>-	return le32_to_cpu(pdr-&gt;addr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u32</div><div class='del'>-pdr_len(const struct pdr *pdr)</div><div class='del'>-{</div><div class='del'>-	return le32_to_cpu(pdr-&gt;len);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u32</div><div class='del'>-pdi_id(const struct pdi *pdi)</div><div class='del'>-{</div><div class='del'>-	return le16_to_cpu(pdi-&gt;id);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Return length of the data only, in bytes */</div><div class='del'>-static inline u32</div><div class='del'>-pdi_len(const struct pdi *pdi)</div><div class='del'>-{</div><div class='del'>-	return 2 * (le16_to_cpu(pdi-&gt;len) - 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Set address of the auxiliary port */</div><div class='del'>-static inline void</div><div class='del'>-spectrum_aux_setaddr(hermes_t *hw, u32 addr)</div><div class='del'>-{</div><div class='del'>-	hermes_write_reg(hw, HERMES_AUXPAGE, (u16) (addr &gt;&gt; 7));</div><div class='del'>-	hermes_write_reg(hw, HERMES_AUXOFFSET, (u16) (addr &amp; 0x7F));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Open access to the auxiliary port */</div><div class='del'>-static int</div><div class='del'>-spectrum_aux_open(hermes_t *hw)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* Already open? */</div><div class='del'>-	if (hermes_read_reg(hw, HERMES_CONTROL) == HERMES_AUX_ENABLED)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	hermes_write_reg(hw, HERMES_PARAM0, HERMES_AUX_PW0);</div><div class='del'>-	hermes_write_reg(hw, HERMES_PARAM1, HERMES_AUX_PW1);</div><div class='del'>-	hermes_write_reg(hw, HERMES_PARAM2, HERMES_AUX_PW2);</div><div class='del'>-	hermes_write_reg(hw, HERMES_CONTROL, HERMES_AUX_ENABLE);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 20; i++) {</div><div class='del'>-		udelay(10);</div><div class='del'>-		if (hermes_read_reg(hw, HERMES_CONTROL) ==</div><div class='del'>-		    HERMES_AUX_ENABLED)</div><div class='del'>-			return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return -EBUSY;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> </div><div class='ctx'> #define CS_CHECK(fn, ret) \</div><div class='ctx'>   do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)</div><div class='hunk'>@@ -292,275 +138,29 @@ spectrum_reset(struct pcmcia_device *link, int idle)</div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/********************************************************************/</div><div class='add'>+/* Device methods     						    */</div><div class='add'>+/********************************************************************/</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Scan PDR for the record with the specified RECORD_ID.</div><div class='del'>- * If it's not found, return NULL.</div><div class='del'>- */</div><div class='del'>-static struct pdr *</div><div class='del'>-spectrum_find_pdr(struct pdr *first_pdr, u32 record_id)</div><div class='del'>-{</div><div class='del'>-	struct pdr *pdr = first_pdr;</div><div class='del'>-</div><div class='del'>-	while (pdr_id(pdr) != PDI_END) {</div><div class='del'>-		/*</div><div class='del'>-		 * PDR area is currently not terminated by PDI_END.</div><div class='del'>-		 * It's followed by CRC records, which have the type</div><div class='del'>-		 * field where PDR has length.  The type can be 0 or 1.</div><div class='del'>-		 */</div><div class='del'>-		if (pdr_len(pdr) &lt; 2)</div><div class='del'>-			return NULL;</div><div class='del'>-</div><div class='del'>-		/* If the record ID matches, we are done */</div><div class='del'>-		if (pdr_id(pdr) == record_id)</div><div class='del'>-			return pdr;</div><div class='del'>-</div><div class='del'>-		pdr = (struct pdr *) pdr-&gt;next;</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Process one Plug Data Item - find corresponding PDR and plug it */</div><div class='del'>-static int</div><div class='del'>-spectrum_plug_pdi(hermes_t *hw, struct pdr *first_pdr, struct pdi *pdi)</div><div class='del'>-{</div><div class='del'>-	struct pdr *pdr;</div><div class='del'>-</div><div class='del'>-	/* Find the PDI corresponding to this PDR */</div><div class='del'>-	pdr = spectrum_find_pdr(first_pdr, pdi_id(pdi));</div><div class='del'>-</div><div class='del'>-	/* No match is found, safe to ignore */</div><div class='del'>-	if (!pdr)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* Lengths of the data in PDI and PDR must match */</div><div class='del'>-	if (pdi_len(pdi) != pdr_len(pdr))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	/* do the actual plugging */</div><div class='del'>-	spectrum_aux_setaddr(hw, pdr_addr(pdr));</div><div class='del'>-	hermes_write_bytes(hw, HERMES_AUXDATA, pdi-&gt;data, pdi_len(pdi));</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Read PDA from the adapter */</div><div class='del'>-static int</div><div class='del'>-spectrum_read_pda(hermes_t *hw, __le16 *pda, int pda_len)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	int pda_size;</div><div class='del'>-</div><div class='del'>-	/* Issue command to read EEPROM */</div><div class='del'>-	ret = hermes_docmd_wait(hw, HERMES_CMD_READMIF, 0, NULL);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	/* Open auxiliary port */</div><div class='del'>-	ret = spectrum_aux_open(hw);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	/* read PDA from EEPROM */</div><div class='del'>-	spectrum_aux_setaddr(hw, PDA_ADDR);</div><div class='del'>-	hermes_read_words(hw, HERMES_AUXDATA, pda, pda_len / 2);</div><div class='del'>-</div><div class='del'>-	/* Check PDA length */</div><div class='del'>-	pda_size = le16_to_cpu(pda[0]);</div><div class='del'>-	if (pda_size &gt; pda_len)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Parse PDA and write the records into the adapter */</div><div class='del'>-static int</div><div class='del'>-spectrum_apply_pda(hermes_t *hw, const struct dblock *first_block,</div><div class='del'>-		   __le16 *pda)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	struct pdi *pdi;</div><div class='del'>-	struct pdr *first_pdr;</div><div class='del'>-	const struct dblock *blk = first_block;</div><div class='del'>-</div><div class='del'>-	/* Skip all blocks to locate Plug Data References */</div><div class='del'>-	while (dblock_addr(blk) != BLOCK_END)</div><div class='del'>-		blk = (struct dblock *) &amp;blk-&gt;data[dblock_len(blk)];</div><div class='del'>-</div><div class='del'>-	first_pdr = (struct pdr *) blk;</div><div class='del'>-</div><div class='del'>-	/* Go through every PDI and plug them into the adapter */</div><div class='del'>-	pdi = (struct pdi *) (pda + 2);</div><div class='del'>-	while (pdi_id(pdi) != PDI_END) {</div><div class='del'>-		ret = spectrum_plug_pdi(hw, first_pdr, pdi);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		/* Increment to the next PDI */</div><div class='del'>-		pdi = (struct pdi *) &amp;pdi-&gt;data[pdi_len(pdi)];</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Load firmware blocks into the adapter */</div><div class='del'>-static int</div><div class='del'>-spectrum_load_blocks(hermes_t *hw, const struct dblock *first_block)</div><div class='del'>-{</div><div class='del'>-	const struct dblock *blk;</div><div class='del'>-	u32 blkaddr;</div><div class='del'>-	u32 blklen;</div><div class='del'>-</div><div class='del'>-	blk = first_block;</div><div class='del'>-	blkaddr = dblock_addr(blk);</div><div class='del'>-	blklen = dblock_len(blk);</div><div class='del'>-</div><div class='del'>-	while (dblock_addr(blk) != BLOCK_END) {</div><div class='del'>-		spectrum_aux_setaddr(hw, blkaddr);</div><div class='del'>-		hermes_write_bytes(hw, HERMES_AUXDATA, blk-&gt;data,</div><div class='del'>-				   blklen);</div><div class='del'>-</div><div class='del'>-		blk = (struct dblock *) &amp;blk-&gt;data[blklen];</div><div class='del'>-		blkaddr = dblock_addr(blk);</div><div class='del'>-		blklen = dblock_len(blk);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Process a firmware image - stop the card, load the firmware, reset</div><div class='del'>- * the card and make sure it responds.  For the secondary firmware take</div><div class='del'>- * care of the PDA - read it and then write it on top of the firmware.</div><div class='del'>- */</div><div class='ctx'> static int</div><div class='del'>-spectrum_dl_image(hermes_t *hw, struct pcmcia_device *link,</div><div class='del'>-		  const unsigned char *image, int secondary)</div><div class='add'>+spectrum_cs_hard_reset(struct orinoco_private *priv)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='del'>-	const unsigned char *ptr;</div><div class='del'>-	const struct dblock *first_block;</div><div class='del'>-</div><div class='del'>-	/* Plug Data Area (PDA) */</div><div class='del'>-	__le16 pda[PDA_WORDS];</div><div class='del'>-</div><div class='del'>-	/* Binary block begins after the 0x1A marker */</div><div class='del'>-	ptr = image;</div><div class='del'>-	while (*ptr++ != TEXT_END);</div><div class='del'>-	first_block = (const struct dblock *) ptr;</div><div class='del'>-</div><div class='del'>-	/* Read the PDA */</div><div class='del'>-	if (secondary) {</div><div class='del'>-		ret = spectrum_read_pda(hw, pda, sizeof(pda));</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Stop the firmware, so that it can be safely rewritten */</div><div class='del'>-	ret = spectrum_reset(link, 1);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	/* Program the adapter with new firmware */</div><div class='del'>-	ret = spectrum_load_blocks(hw, first_block);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	/* Write the PDA to the adapter */</div><div class='del'>-	if (secondary) {</div><div class='del'>-		ret = spectrum_apply_pda(hw, first_block, pda);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Run the firmware */</div><div class='del'>-	ret = spectrum_reset(link, 0);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	/* Reset hermes chip and make sure it responds */</div><div class='del'>-	ret = hermes_init(hw);</div><div class='del'>-</div><div class='del'>-	/* hermes_reset() should return 0 with the secondary firmware */</div><div class='del'>-	if (secondary &amp;&amp; ret != 0)</div><div class='del'>-		return -ENODEV;</div><div class='add'>+	struct orinoco_pccard *card = priv-&gt;card;</div><div class='add'>+	struct pcmcia_device *link = card-&gt;p_dev;</div><div class='ctx'> </div><div class='del'>-	/* And this should work with any firmware */</div><div class='del'>-	if (!hermes_present(hw))</div><div class='del'>-		return -ENODEV;</div><div class='add'>+	/* Soft reset using COR and HCR */</div><div class='add'>+	spectrum_reset(link, 0);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Download the firmware into the card, this also does a PCMCIA soft</div><div class='del'>- * reset on the card, to make sure it's in a sane state.</div><div class='del'>- */</div><div class='del'>-static int</div><div class='del'>-spectrum_dl_firmware(hermes_t *hw, struct pcmcia_device *link)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	const struct firmware *fw_entry;</div><div class='del'>-</div><div class='del'>-	if (request_firmware(&amp;fw_entry, primary_fw_name,</div><div class='del'>-			     &amp;handle_to_dev(link)) != 0) {</div><div class='del'>-		printk(KERN_ERR PFX "Cannot find firmware: %s\n",</div><div class='del'>-		       primary_fw_name);</div><div class='del'>-		return -ENOENT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Load primary firmware */</div><div class='del'>-	ret = spectrum_dl_image(hw, link, fw_entry-&gt;data, 0);</div><div class='del'>-	release_firmware(fw_entry);</div><div class='del'>-	if (ret) {</div><div class='del'>-		printk(KERN_ERR PFX "Primary firmware download failed\n");</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (request_firmware(&amp;fw_entry, secondary_fw_name,</div><div class='del'>-			     &amp;handle_to_dev(link)) != 0) {</div><div class='del'>-		printk(KERN_ERR PFX "Cannot find firmware: %s\n",</div><div class='del'>-		       secondary_fw_name);</div><div class='del'>-		return -ENOENT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Load secondary firmware */</div><div class='del'>-	ret = spectrum_dl_image(hw, link, fw_entry-&gt;data, 1);</div><div class='del'>-	release_firmware(fw_entry);</div><div class='del'>-	if (ret) {</div><div class='del'>-		printk(KERN_ERR PFX "Secondary firmware download failed\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/********************************************************************/</div><div class='del'>-/* Device methods     						    */</div><div class='del'>-/********************************************************************/</div><div class='del'>-</div><div class='ctx'> static int</div><div class='del'>-spectrum_cs_hard_reset(struct orinoco_private *priv)</div><div class='add'>+spectrum_cs_stop_firmware(struct orinoco_private *priv, int idle)</div><div class='ctx'> {</div><div class='ctx'> 	struct orinoco_pccard *card = priv-&gt;card;</div><div class='ctx'> 	struct pcmcia_device *link = card-&gt;p_dev;</div><div class='del'>-	int err;</div><div class='ctx'> </div><div class='del'>-	if (!hermes_present(&amp;priv-&gt;hw)) {</div><div class='del'>-		/* The firmware needs to be reloaded */</div><div class='del'>-		if (spectrum_dl_firmware(&amp;priv-&gt;hw, link) != 0) {</div><div class='del'>-			printk(KERN_ERR PFX "Firmware download failed\n");</div><div class='del'>-			err = -ENODEV;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		/* Soft reset using COR and HCR */</div><div class='del'>-		spectrum_reset(link, 0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	return spectrum_reset(link, idle);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /********************************************************************/</div><div class='hunk'>@@ -582,7 +182,9 @@ spectrum_cs_probe(struct pcmcia_device *link)</div><div class='ctx'> 	struct orinoco_private *priv;</div><div class='ctx'> 	struct orinoco_pccard *card;</div><div class='ctx'> </div><div class='del'>-	dev = alloc_orinocodev(sizeof(*card), spectrum_cs_hard_reset);</div><div class='add'>+	dev = alloc_orinocodev(sizeof(*card), &amp;handle_to_dev(link),</div><div class='add'>+			       spectrum_cs_hard_reset,</div><div class='add'>+			       spectrum_cs_stop_firmware);</div><div class='ctx'> 	if (! dev)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	priv = netdev_priv(dev);</div><div class='hunk'>@@ -593,7 +195,7 @@ spectrum_cs_probe(struct pcmcia_device *link)</div><div class='ctx'> 	link-&gt;priv = dev;</div><div class='ctx'> </div><div class='ctx'> 	/* Interrupt setup */</div><div class='del'>-	link-&gt;irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_HANDLE_PRESENT;</div><div class='add'>+	link-&gt;irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_HANDLE_PRESENT;</div><div class='ctx'> 	link-&gt;irq.IRQInfo1 = IRQ_LEVEL_ID;</div><div class='ctx'> 	link-&gt;irq.Handler = orinoco_interrupt;</div><div class='ctx'> 	link-&gt;irq.Instance = dev; </div><div class='hunk'>@@ -633,6 +235,70 @@ static void spectrum_cs_detach(struct pcmcia_device *link)</div><div class='ctx'>  * device available to the system.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+static int spectrum_cs_config_check(struct pcmcia_device *p_dev,</div><div class='add'>+				    cistpl_cftable_entry_t *cfg,</div><div class='add'>+				    cistpl_cftable_entry_t *dflt,</div><div class='add'>+				    unsigned int vcc,</div><div class='add'>+				    void *priv_data)</div><div class='add'>+{</div><div class='add'>+	if (cfg-&gt;index == 0)</div><div class='add'>+		goto next_entry;</div><div class='add'>+</div><div class='add'>+	/* Use power settings for Vcc and Vpp if present */</div><div class='add'>+	/* Note that the CIS values need to be rescaled */</div><div class='add'>+	if (cfg-&gt;vcc.present &amp; (1 &lt;&lt; CISTPL_POWER_VNOM)) {</div><div class='add'>+		if (vcc != cfg-&gt;vcc.param[CISTPL_POWER_VNOM] / 10000) {</div><div class='add'>+			DEBUG(2, "spectrum_cs_config: Vcc mismatch (vcc = %d, CIS = %d)\n",  vcc, cfg-&gt;vcc.param[CISTPL_POWER_VNOM] / 10000);</div><div class='add'>+			if (!ignore_cis_vcc)</div><div class='add'>+				goto next_entry;</div><div class='add'>+		}</div><div class='add'>+	} else if (dflt-&gt;vcc.present &amp; (1 &lt;&lt; CISTPL_POWER_VNOM)) {</div><div class='add'>+		if (vcc != dflt-&gt;vcc.param[CISTPL_POWER_VNOM] / 10000) {</div><div class='add'>+			DEBUG(2, "spectrum_cs_config: Vcc mismatch (vcc = %d, CIS = %d)\n",  vcc, dflt-&gt;vcc.param[CISTPL_POWER_VNOM] / 10000);</div><div class='add'>+			if (!ignore_cis_vcc)</div><div class='add'>+				goto next_entry;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cfg-&gt;vpp1.present &amp; (1 &lt;&lt; CISTPL_POWER_VNOM))</div><div class='add'>+		p_dev-&gt;conf.Vpp =</div><div class='add'>+			cfg-&gt;vpp1.param[CISTPL_POWER_VNOM] / 10000;</div><div class='add'>+	else if (dflt-&gt;vpp1.present &amp; (1 &lt;&lt; CISTPL_POWER_VNOM))</div><div class='add'>+		p_dev-&gt;conf.Vpp =</div><div class='add'>+			dflt-&gt;vpp1.param[CISTPL_POWER_VNOM] / 10000;</div><div class='add'>+</div><div class='add'>+	/* Do we need to allocate an interrupt? */</div><div class='add'>+	p_dev-&gt;conf.Attributes |= CONF_ENABLE_IRQ;</div><div class='add'>+</div><div class='add'>+	/* IO window settings */</div><div class='add'>+	p_dev-&gt;io.NumPorts1 = p_dev-&gt;io.NumPorts2 = 0;</div><div class='add'>+	if ((cfg-&gt;io.nwin &gt; 0) || (dflt-&gt;io.nwin &gt; 0)) {</div><div class='add'>+		cistpl_io_t *io = (cfg-&gt;io.nwin) ? &amp;cfg-&gt;io : &amp;dflt-&gt;io;</div><div class='add'>+		p_dev-&gt;io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;</div><div class='add'>+		if (!(io-&gt;flags &amp; CISTPL_IO_8BIT))</div><div class='add'>+			p_dev-&gt;io.Attributes1 = IO_DATA_PATH_WIDTH_16;</div><div class='add'>+		if (!(io-&gt;flags &amp; CISTPL_IO_16BIT))</div><div class='add'>+			p_dev-&gt;io.Attributes1 = IO_DATA_PATH_WIDTH_8;</div><div class='add'>+		p_dev-&gt;io.IOAddrLines = io-&gt;flags &amp; CISTPL_IO_LINES_MASK;</div><div class='add'>+		p_dev-&gt;io.BasePort1 = io-&gt;win[0].base;</div><div class='add'>+		p_dev-&gt;io.NumPorts1 = io-&gt;win[0].len;</div><div class='add'>+		if (io-&gt;nwin &gt; 1) {</div><div class='add'>+			p_dev-&gt;io.Attributes2 = p_dev-&gt;io.Attributes1;</div><div class='add'>+			p_dev-&gt;io.BasePort2 = io-&gt;win[1].base;</div><div class='add'>+			p_dev-&gt;io.NumPorts2 = io-&gt;win[1].len;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* This reserves IO space but doesn't actually enable it */</div><div class='add'>+		if (pcmcia_request_io(p_dev, &amp;p_dev-&gt;io) != 0)</div><div class='add'>+			goto next_entry;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+next_entry:</div><div class='add'>+	pcmcia_disable_device(p_dev);</div><div class='add'>+	return -ENODEV;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int</div><div class='ctx'> spectrum_cs_config(struct pcmcia_device *link)</div><div class='ctx'> {</div><div class='hunk'>@@ -641,16 +307,8 @@ spectrum_cs_config(struct pcmcia_device *link)</div><div class='ctx'> 	struct orinoco_pccard *card = priv-&gt;card;</div><div class='ctx'> 	hermes_t *hw = &amp;priv-&gt;hw;</div><div class='ctx'> 	int last_fn, last_ret;</div><div class='del'>-	u_char buf[64];</div><div class='del'>-	config_info_t conf;</div><div class='del'>-	tuple_t tuple;</div><div class='del'>-	cisparse_t parse;</div><div class='ctx'> 	void __iomem *mem;</div><div class='ctx'> </div><div class='del'>-	/* Look up the current Vcc */</div><div class='del'>-	CS_CHECK(GetConfigurationInfo,</div><div class='del'>-		 pcmcia_get_configuration_info(link, &amp;conf));</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * In this loop, we scan the CIS for configuration table</div><div class='ctx'> 	 * entries, each of which describes a valid card</div><div class='hunk'>@@ -665,94 +323,14 @@ spectrum_cs_config(struct pcmcia_device *link)</div><div class='ctx'> 	 * and most client drivers will only use the CIS to fill in</div><div class='ctx'> 	 * implementation-defined details.</div><div class='ctx'> 	 */</div><div class='del'>-	tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;</div><div class='del'>-	tuple.Attributes = 0;</div><div class='del'>-	tuple.TupleData = buf;</div><div class='del'>-	tuple.TupleDataMax = sizeof(buf);</div><div class='del'>-	tuple.TupleOffset = 0;</div><div class='del'>-	CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &amp;tuple));</div><div class='del'>-	while (1) {</div><div class='del'>-		cistpl_cftable_entry_t *cfg = &amp;(parse.cftable_entry);</div><div class='del'>-		cistpl_cftable_entry_t dflt = { .index = 0 };</div><div class='del'>-</div><div class='del'>-		if ( (pcmcia_get_tuple_data(link, &amp;tuple) != 0)</div><div class='del'>-		    || (pcmcia_parse_tuple(link, &amp;tuple, &amp;parse) != 0))</div><div class='del'>-			goto next_entry;</div><div class='del'>-</div><div class='del'>-		if (cfg-&gt;flags &amp; CISTPL_CFTABLE_DEFAULT)</div><div class='del'>-			dflt = *cfg;</div><div class='del'>-		if (cfg-&gt;index == 0)</div><div class='del'>-			goto next_entry;</div><div class='del'>-		link-&gt;conf.ConfigIndex = cfg-&gt;index;</div><div class='del'>-</div><div class='del'>-		/* Use power settings for Vcc and Vpp if present */</div><div class='del'>-		/* Note that the CIS values need to be rescaled */</div><div class='del'>-		if (cfg-&gt;vcc.present &amp; (1 &lt;&lt; CISTPL_POWER_VNOM)) {</div><div class='del'>-			if (conf.Vcc != cfg-&gt;vcc.param[CISTPL_POWER_VNOM] / 10000) {</div><div class='del'>-				DEBUG(2, "spectrum_cs_config: Vcc mismatch (conf.Vcc = %d, CIS = %d)\n",  conf.Vcc, cfg-&gt;vcc.param[CISTPL_POWER_VNOM] / 10000);</div><div class='del'>-				if (!ignore_cis_vcc)</div><div class='del'>-					goto next_entry;</div><div class='del'>-			}</div><div class='del'>-		} else if (dflt.vcc.present &amp; (1 &lt;&lt; CISTPL_POWER_VNOM)) {</div><div class='del'>-			if (conf.Vcc != dflt.vcc.param[CISTPL_POWER_VNOM] / 10000) {</div><div class='del'>-				DEBUG(2, "spectrum_cs_config: Vcc mismatch (conf.Vcc = %d, CIS = %d)\n",  conf.Vcc, dflt.vcc.param[CISTPL_POWER_VNOM] / 10000);</div><div class='del'>-				if(!ignore_cis_vcc)</div><div class='del'>-					goto next_entry;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (cfg-&gt;vpp1.present &amp; (1 &lt;&lt; CISTPL_POWER_VNOM))</div><div class='del'>-			link-&gt;conf.Vpp =</div><div class='del'>-			    cfg-&gt;vpp1.param[CISTPL_POWER_VNOM] / 10000;</div><div class='del'>-		else if (dflt.vpp1.present &amp; (1 &lt;&lt; CISTPL_POWER_VNOM))</div><div class='del'>-			link-&gt;conf.Vpp =</div><div class='del'>-			    dflt.vpp1.param[CISTPL_POWER_VNOM] / 10000;</div><div class='del'>-		</div><div class='del'>-		/* Do we need to allocate an interrupt? */</div><div class='del'>-		link-&gt;conf.Attributes |= CONF_ENABLE_IRQ;</div><div class='del'>-</div><div class='del'>-		/* IO window settings */</div><div class='del'>-		link-&gt;io.NumPorts1 = link-&gt;io.NumPorts2 = 0;</div><div class='del'>-		if ((cfg-&gt;io.nwin &gt; 0) || (dflt.io.nwin &gt; 0)) {</div><div class='del'>-			cistpl_io_t *io =</div><div class='del'>-			    (cfg-&gt;io.nwin) ? &amp;cfg-&gt;io : &amp;dflt.io;</div><div class='del'>-			link-&gt;io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;</div><div class='del'>-			if (!(io-&gt;flags &amp; CISTPL_IO_8BIT))</div><div class='del'>-				link-&gt;io.Attributes1 =</div><div class='del'>-				    IO_DATA_PATH_WIDTH_16;</div><div class='del'>-			if (!(io-&gt;flags &amp; CISTPL_IO_16BIT))</div><div class='del'>-				link-&gt;io.Attributes1 =</div><div class='del'>-				    IO_DATA_PATH_WIDTH_8;</div><div class='del'>-			link-&gt;io.IOAddrLines =</div><div class='del'>-			    io-&gt;flags &amp; CISTPL_IO_LINES_MASK;</div><div class='del'>-			link-&gt;io.BasePort1 = io-&gt;win[0].base;</div><div class='del'>-			link-&gt;io.NumPorts1 = io-&gt;win[0].len;</div><div class='del'>-			if (io-&gt;nwin &gt; 1) {</div><div class='del'>-				link-&gt;io.Attributes2 =</div><div class='del'>-				    link-&gt;io.Attributes1;</div><div class='del'>-				link-&gt;io.BasePort2 = io-&gt;win[1].base;</div><div class='del'>-				link-&gt;io.NumPorts2 = io-&gt;win[1].len;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* This reserves IO space but doesn't actually enable it */</div><div class='del'>-			if (pcmcia_request_io(link, &amp;link-&gt;io) != 0)</div><div class='del'>-				goto next_entry;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-		/* If we got this far, we're cool! */</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-		</div><div class='del'>-	next_entry:</div><div class='del'>-		pcmcia_disable_device(link);</div><div class='del'>-		last_ret = pcmcia_get_next_tuple(link, &amp;tuple);</div><div class='del'>-		if (last_ret  == CS_NO_MORE_ITEMS) {</div><div class='add'>+	last_ret = pcmcia_loop_config(link, spectrum_cs_config_check, NULL);</div><div class='add'>+	if (last_ret) {</div><div class='add'>+		if (!ignore_cis_vcc)</div><div class='ctx'> 			printk(KERN_ERR PFX "GetNextTuple(): No matching "</div><div class='ctx'> 			       "CIS configuration.  Maybe you need the "</div><div class='ctx'> 			       "ignore_cis_vcc=1 parameter.\n");</div><div class='del'>-			goto cs_failed;</div><div class='del'>-		}</div><div class='add'>+		cs_error(link, RequestIO, last_ret);</div><div class='add'>+		goto failed;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -784,7 +362,7 @@ spectrum_cs_config(struct pcmcia_device *link)</div><div class='ctx'> 	dev-&gt;irq = link-&gt;irq.AssignedIRQ;</div><div class='ctx'> 	card-&gt;node.major = card-&gt;node.minor = 0;</div><div class='ctx'> </div><div class='del'>-	/* Reset card and download firmware */</div><div class='add'>+	/* Reset card */</div><div class='ctx'> 	if (spectrum_cs_hard_reset(priv) != 0) {</div><div class='ctx'> 		goto failed;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -848,10 +426,11 @@ spectrum_cs_suspend(struct pcmcia_device *link)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = link-&gt;priv;</div><div class='ctx'> 	struct orinoco_private *priv = netdev_priv(dev);</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Mark the device as stopped, to block IO until later */</div><div class='del'>-	spin_lock(&amp;priv-&gt;lock);</div><div class='add'>+	spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	err = __orinoco_down(dev);</div><div class='ctx'> 	if (err)</div><div class='hunk'>@@ -861,7 +440,7 @@ spectrum_cs_suspend(struct pcmcia_device *link)</div><div class='ctx'> 	netif_device_detach(dev);</div><div class='ctx'> 	priv-&gt;hw_unavailable++;</div><div class='ctx'> </div><div class='del'>-	spin_unlock(&amp;priv-&gt;lock);</div><div class='add'>+	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/wavelan.c b/drivers/net/wireless/wavelan.c<br/>index 136220b5ca81..e939a73ff794 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/wavelan.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/wavelan.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/wavelan.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/wavelan.c</a></div><div class='hunk'>@@ -4387,7 +4387,7 @@ MODULE_LICENSE("GPL");</div><div class='ctx'>  *</div><div class='ctx'>  * Thanks go also to:</div><div class='ctx'>  *	James Ashton (jaa101@syseng.anu.edu.au),</div><div class='del'>- *	Alan Cox (alan@redhat.com),</div><div class='add'>+ *	Alan Cox (alan@lxorguk.ukuu.org.uk),</div><div class='ctx'>  *	Allan Creighton (allanc@cs.usyd.edu.au),</div><div class='ctx'>  *	Matthew Geier (matthew@cs.usyd.edu.au),</div><div class='ctx'>  *	Remo di Giovanni (remo@cs.usyd.edu.au),</div><div class='head'>diff --git a/drivers/net/wireless/wavelan.p.h b/drivers/net/wireless/wavelan.p.h<br/>index b33ac47dd8df..44d31bbf39e4 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/wavelan.p.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/wavelan.p.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/wavelan.p.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/wavelan.p.h</a></div><div class='hunk'>@@ -186,7 +186,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Thanks go also to:</div><div class='ctx'>  *	James Ashton &lt;jaa101@syseng.anu.edu.au&gt;,</div><div class='del'>- *	Alan Cox &lt;alan@redhat.com&gt;,</div><div class='add'>+ *	Alan Cox &lt;alan@lxorguk.ukuu.org.uk&gt;,</div><div class='ctx'>  *	Allan Creighton &lt;allanc@cs.usyd.edu.au&gt;,</div><div class='ctx'>  *	Matthew Geier &lt;matthew@cs.usyd.edu.au&gt;,</div><div class='ctx'>  *	Remo di Giovanni &lt;remo@cs.usyd.edu.au&gt;,</div><div class='head'>diff --git a/drivers/net/wireless/wavelan_cs.c b/drivers/net/wireless/wavelan_cs.c<br/>index 00a3559e5aa4..e124b1d6267a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/wavelan_cs.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/wavelan_cs.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/wavelan_cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/wavelan_cs.c</a></div><div class='hunk'>@@ -3702,7 +3702,7 @@ wv_pcmcia_reset(struct net_device *	dev)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'>   i = pcmcia_access_configuration_register(link, &amp;reg);</div><div class='del'>-  if(i != CS_SUCCESS)</div><div class='add'>+  if (i != 0)</div><div class='ctx'>     {</div><div class='ctx'>       cs_error(link, AccessConfigurationRegister, i);</div><div class='ctx'>       return FALSE;</div><div class='hunk'>@@ -3716,7 +3716,7 @@ wv_pcmcia_reset(struct net_device *	dev)</div><div class='ctx'>   reg.Action = CS_WRITE;</div><div class='ctx'>   reg.Value = reg.Value | COR_SW_RESET;</div><div class='ctx'>   i = pcmcia_access_configuration_register(link, &amp;reg);</div><div class='del'>-  if(i != CS_SUCCESS)</div><div class='add'>+  if (i != 0)</div><div class='ctx'>     {</div><div class='ctx'>       cs_error(link, AccessConfigurationRegister, i);</div><div class='ctx'>       return FALSE;</div><div class='hunk'>@@ -3725,7 +3725,7 @@ wv_pcmcia_reset(struct net_device *	dev)</div><div class='ctx'>   reg.Action = CS_WRITE;</div><div class='ctx'>   reg.Value = COR_LEVEL_IRQ | COR_CONFIG;</div><div class='ctx'>   i = pcmcia_access_configuration_register(link, &amp;reg);</div><div class='del'>-  if(i != CS_SUCCESS)</div><div class='add'>+  if (i != 0)</div><div class='ctx'>     {</div><div class='ctx'>       cs_error(link, AccessConfigurationRegister, i);</div><div class='ctx'>       return FALSE;</div><div class='hunk'>@@ -3903,7 +3903,7 @@ wv_pcmcia_config(struct pcmcia_device *	link)</div><div class='ctx'>   do</div><div class='ctx'>     {</div><div class='ctx'>       i = pcmcia_request_io(link, &amp;link-&gt;io);</div><div class='del'>-      if(i != CS_SUCCESS)</div><div class='add'>+      if (i != 0)</div><div class='ctx'> 	{</div><div class='ctx'> 	  cs_error(link, RequestIO, i);</div><div class='ctx'> 	  break;</div><div class='hunk'>@@ -3914,7 +3914,7 @@ wv_pcmcia_config(struct pcmcia_device *	link)</div><div class='ctx'>        * actually assign a handler to the interrupt.</div><div class='ctx'>        */</div><div class='ctx'>       i = pcmcia_request_irq(link, &amp;link-&gt;irq);</div><div class='del'>-      if(i != CS_SUCCESS)</div><div class='add'>+      if (i != 0)</div><div class='ctx'> 	{</div><div class='ctx'> 	  cs_error(link, RequestIRQ, i);</div><div class='ctx'> 	  break;</div><div class='hunk'>@@ -3926,7 +3926,7 @@ wv_pcmcia_config(struct pcmcia_device *	link)</div><div class='ctx'>        */</div><div class='ctx'>       link-&gt;conf.ConfigIndex = 1;</div><div class='ctx'>       i = pcmcia_request_configuration(link, &amp;link-&gt;conf);</div><div class='del'>-      if(i != CS_SUCCESS)</div><div class='add'>+      if (i != 0)</div><div class='ctx'> 	{</div><div class='ctx'> 	  cs_error(link, RequestConfiguration, i);</div><div class='ctx'> 	  break;</div><div class='hunk'>@@ -3942,7 +3942,7 @@ wv_pcmcia_config(struct pcmcia_device *	link)</div><div class='ctx'>       req.Base = req.Size = 0;</div><div class='ctx'>       req.AccessSpeed = mem_speed;</div><div class='ctx'>       i = pcmcia_request_window(&amp;link, &amp;req, &amp;link-&gt;win);</div><div class='del'>-      if(i != CS_SUCCESS)</div><div class='add'>+      if (i != 0)</div><div class='ctx'> 	{</div><div class='ctx'> 	  cs_error(link, RequestWindow, i);</div><div class='ctx'> 	  break;</div><div class='hunk'>@@ -3954,7 +3954,7 @@ wv_pcmcia_config(struct pcmcia_device *	link)</div><div class='ctx'> </div><div class='ctx'>       mem.CardOffset = 0; mem.Page = 0;</div><div class='ctx'>       i = pcmcia_map_mem_page(link-&gt;win, &amp;mem);</div><div class='del'>-      if(i != CS_SUCCESS)</div><div class='add'>+      if (i != 0)</div><div class='ctx'> 	{</div><div class='ctx'> 	  cs_error(link, MapMemPage, i);</div><div class='ctx'> 	  break;</div><div class='hunk'>@@ -4496,7 +4496,7 @@ wavelan_probe(struct pcmcia_device *p_dev)</div><div class='ctx'>   p_dev-&gt;io.IOAddrLines = 3;</div><div class='ctx'> </div><div class='ctx'>   /* Interrupt setup */</div><div class='del'>-  p_dev-&gt;irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_HANDLE_PRESENT;</div><div class='add'>+  p_dev-&gt;irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_HANDLE_PRESENT;</div><div class='ctx'>   p_dev-&gt;irq.IRQInfo1 = IRQ_LEVEL_ID;</div><div class='ctx'>   p_dev-&gt;irq.Handler = wavelan_interrupt;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/wl3501_cs.c b/drivers/net/wireless/wl3501_cs.c<br/>index 377141995e36..68789c6e1ce9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/wl3501_cs.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/wl3501_cs.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/wl3501_cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/wl3501_cs.c</a></div><div class='hunk'>@@ -79,7 +79,7 @@ static int pc_debug = PCMCIA_DEBUG;</div><div class='ctx'> module_param(pc_debug, int, 0);</div><div class='ctx'> #define dprintk(n, format, args...) \</div><div class='ctx'> 	{ if (pc_debug &gt; (n)) \</div><div class='del'>-		printk(KERN_INFO "%s: " format "\n", __FUNCTION__ , ##args); }</div><div class='add'>+		printk(KERN_INFO "%s: " format "\n", __func__ , ##args); }</div><div class='ctx'> #else</div><div class='ctx'> #define dprintk(n, format, args...)</div><div class='ctx'> #endif</div><div class='hunk'>@@ -470,7 +470,7 @@ static int wl3501_pwr_mgmt(struct wl3501_card *this, int suspend)</div><div class='ctx'> 			spin_unlock_irqrestore(&amp;this-&gt;lock, flags);</div><div class='ctx'> 			rc = wait_event_interruptible(this-&gt;wait,</div><div class='ctx'> 				this-&gt;sig_pwr_mgmt_confirm.status != 255);</div><div class='del'>-			printk(KERN_INFO "%s: %s status=%d\n", __FUNCTION__,</div><div class='add'>+			printk(KERN_INFO "%s: %s status=%d\n", __func__,</div><div class='ctx'> 			       suspend ? "suspend" : "resume",</div><div class='ctx'> 			       this-&gt;sig_pwr_mgmt_confirm.status);</div><div class='ctx'> 			goto out;</div><div class='hunk'>@@ -1199,7 +1199,7 @@ static int wl3501_reset_board(struct wl3501_card *this)</div><div class='ctx'> 		}</div><div class='ctx'> 		WL3501_NOPLOOP(10);</div><div class='ctx'> 	}</div><div class='del'>-	printk(KERN_WARNING "%s: failed to reset the board!\n", __FUNCTION__);</div><div class='add'>+	printk(KERN_WARNING "%s: failed to reset the board!\n", __func__);</div><div class='ctx'> 	rc = -ENODEV;</div><div class='ctx'> out:</div><div class='ctx'> 	return rc;</div><div class='hunk'>@@ -1250,7 +1250,7 @@ static int wl3501_init_firmware(struct wl3501_card *this)</div><div class='ctx'> out:</div><div class='ctx'> 	return rc;</div><div class='ctx'> fail:</div><div class='del'>-	printk(KERN_WARNING "%s: failed!\n", __FUNCTION__);</div><div class='add'>+	printk(KERN_WARNING "%s: failed!\n", __func__);</div><div class='ctx'> 	goto out;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1917,7 +1917,7 @@ static int wl3501_probe(struct pcmcia_device *p_dev)</div><div class='ctx'> 	p_dev-&gt;io.IOAddrLines	= 5;</div><div class='ctx'> </div><div class='ctx'> 	/* Interrupt setup */</div><div class='del'>-	p_dev-&gt;irq.Attributes	= IRQ_TYPE_EXCLUSIVE | IRQ_HANDLE_PRESENT;</div><div class='add'>+	p_dev-&gt;irq.Attributes	= IRQ_TYPE_DYNAMIC_SHARING | IRQ_HANDLE_PRESENT;</div><div class='ctx'> 	p_dev-&gt;irq.IRQInfo1	= IRQ_LEVEL_ID;</div><div class='ctx'> 	p_dev-&gt;irq.Handler = wl3501_interrupt;</div><div class='ctx'> </div><div class='hunk'>@@ -1977,10 +1977,10 @@ static int wl3501_config(struct pcmcia_device *link)</div><div class='ctx'> 		link-&gt;io.BasePort1 = j;</div><div class='ctx'> 		link-&gt;io.BasePort2 = link-&gt;io.BasePort1 + 0x10;</div><div class='ctx'> 		i = pcmcia_request_io(link, &amp;link-&gt;io);</div><div class='del'>-		if (i == CS_SUCCESS)</div><div class='add'>+		if (i == 0)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='del'>-	if (i != CS_SUCCESS) {</div><div class='add'>+	if (i != 0) {</div><div class='ctx'> 		cs_error(link, RequestIO, i);</div><div class='ctx'> 		goto failed;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/net/wireless/zd1211rw/Makefile b/drivers/net/wireless/zd1211rw/Makefile<br/>index cc36126cee88..1907eafb9b16 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/zd1211rw/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/zd1211rw/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/zd1211rw/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/zd1211rw/Makefile</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> obj-$(CONFIG_ZD1211RW) += zd1211rw.o</div><div class='ctx'> </div><div class='del'>-zd1211rw-objs := zd_chip.o zd_ieee80211.o zd_mac.o \</div><div class='add'>+zd1211rw-objs := zd_chip.o zd_mac.o \</div><div class='ctx'> 		zd_rf_al2230.o zd_rf_rf2959.o \</div><div class='ctx'> 		zd_rf_al7230b.o zd_rf_uw2453.o \</div><div class='ctx'> 		zd_rf.o zd_usb.o</div><div class='head'>diff --git a/drivers/net/wireless/zd1211rw/zd_chip.c b/drivers/net/wireless/zd1211rw/zd_chip.c<br/>index 0acb5c345734..e0ac58b8ff1f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/zd1211rw/zd_chip.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/zd1211rw/zd_chip.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/zd1211rw/zd_chip.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/zd1211rw/zd_chip.c</a></div><div class='hunk'>@@ -28,7 +28,6 @@</div><div class='ctx'> </div><div class='ctx'> #include "zd_def.h"</div><div class='ctx'> #include "zd_chip.h"</div><div class='del'>-#include "zd_ieee80211.h"</div><div class='ctx'> #include "zd_mac.h"</div><div class='ctx'> #include "zd_rf.h"</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/zd1211rw/zd_ieee80211.c b/drivers/net/wireless/zd1211rw/zd_ieee80211.c<br/>deleted file mode 100644<br/>index d8dc41ec0e5d..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/zd1211rw/zd_ieee80211.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/zd1211rw/zd_ieee80211.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,100 +0,0 @@</div><div class='del'>-/* ZD1211 USB-WLAN driver for Linux</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2005-2007 Ulrich Kunitz &lt;kune@deine-taler.de&gt;</div><div class='del'>- * Copyright (C) 2006-2007 Daniel Drake &lt;dsd@gentoo.org&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * In the long term, we'll probably find a better way of handling regulatory</div><div class='del'>- * requirements outside of the driver.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;net/mac80211.h&gt;</div><div class='del'>-</div><div class='del'>-#include "zd_ieee80211.h"</div><div class='del'>-#include "zd_mac.h"</div><div class='del'>-</div><div class='del'>-struct channel_range {</div><div class='del'>-	u8 regdomain;</div><div class='del'>-	u8 start;</div><div class='del'>-	u8 end; /* exclusive (channel must be less than end) */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct channel_range channel_ranges[] = {</div><div class='del'>-	{ ZD_REGDOMAIN_FCC,		1, 12 },</div><div class='del'>-	{ ZD_REGDOMAIN_IC,		1, 12 },</div><div class='del'>-	{ ZD_REGDOMAIN_ETSI,		1, 14 },</div><div class='del'>-	{ ZD_REGDOMAIN_JAPAN,		1, 14 },</div><div class='del'>-	{ ZD_REGDOMAIN_SPAIN,		1, 14 },</div><div class='del'>-	{ ZD_REGDOMAIN_FRANCE,		1, 14 },</div><div class='del'>-</div><div class='del'>-	/* Japan originally only had channel 14 available (see CHNL_ID 0x40 in</div><div class='del'>-	 * 802.11). However, in 2001 the range was extended to include channels</div><div class='del'>-	 * 1-13. The ZyDAS devices still use the old region code but are</div><div class='del'>-	 * designed to allow the extra channel access in Japan. */</div><div class='del'>-	{ ZD_REGDOMAIN_JAPAN_ADD,	1, 15 },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct channel_range *zd_channel_range(u8 regdomain)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(channel_ranges); i++) {</div><div class='del'>-		const struct channel_range *range = &amp;channel_ranges[i];</div><div class='del'>-		if (range-&gt;regdomain == regdomain)</div><div class='del'>-			return range;</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define CHAN_TO_IDX(chan) ((chan) - 1)</div><div class='del'>-</div><div class='del'>-static void unmask_bg_channels(struct ieee80211_hw *hw,</div><div class='del'>-	const struct channel_range *range,</div><div class='del'>-	struct ieee80211_supported_band *sband)</div><div class='del'>-{</div><div class='del'>-	u8 channel;</div><div class='del'>-</div><div class='del'>-	for (channel = range-&gt;start; channel &lt; range-&gt;end; channel++) {</div><div class='del'>-		struct ieee80211_channel *chan =</div><div class='del'>-			&amp;sband-&gt;channels[CHAN_TO_IDX(channel)];</div><div class='del'>-		chan-&gt;flags = 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void zd_geo_init(struct ieee80211_hw *hw, u8 regdomain)</div><div class='del'>-{</div><div class='del'>-	struct zd_mac *mac = zd_hw_mac(hw);</div><div class='del'>-	const struct channel_range *range;</div><div class='del'>-</div><div class='del'>-	dev_dbg(zd_mac_dev(mac), "regdomain %#02x\n", regdomain);</div><div class='del'>-</div><div class='del'>-	range = zd_channel_range(regdomain);</div><div class='del'>-	if (!range) {</div><div class='del'>-		/* The vendor driver overrides the regulatory domain and</div><div class='del'>-		 * allowed channel registers and unconditionally restricts</div><div class='del'>-		 * available channels to 1-11 everywhere. Match their</div><div class='del'>-		 * questionable behaviour only for regdomains which we don't</div><div class='del'>-		 * recognise. */</div><div class='del'>-		dev_warn(zd_mac_dev(mac), "Unrecognised regulatory domain: "</div><div class='del'>-			"%#02x. Defaulting to FCC.\n", regdomain);</div><div class='del'>-		range = zd_channel_range(ZD_REGDOMAIN_FCC);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	unmask_bg_channels(hw, range, &amp;mac-&gt;band);</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/drivers/net/wireless/zd1211rw/zd_ieee80211.h b/drivers/net/wireless/zd1211rw/zd_ieee80211.h<br/>deleted file mode 100644<br/>index 26b79f197587..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/zd1211rw/zd_ieee80211.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/zd1211rw/zd_ieee80211.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,95 +0,0 @@</div><div class='del'>-/* ZD1211 USB-WLAN driver for Linux</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2005-2007 Ulrich Kunitz &lt;kune@deine-taler.de&gt;</div><div class='del'>- * Copyright (C) 2006-2007 Daniel Drake &lt;dsd@gentoo.org&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _ZD_IEEE80211_H</div><div class='del'>-#define _ZD_IEEE80211_H</div><div class='del'>-</div><div class='del'>-#include &lt;net/mac80211.h&gt;</div><div class='del'>-</div><div class='del'>-/* Additional definitions from the standards.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define ZD_REGDOMAIN_FCC	0x10</div><div class='del'>-#define ZD_REGDOMAIN_IC		0x20</div><div class='del'>-#define ZD_REGDOMAIN_ETSI	0x30</div><div class='del'>-#define ZD_REGDOMAIN_SPAIN	0x31</div><div class='del'>-#define ZD_REGDOMAIN_FRANCE	0x32</div><div class='del'>-#define ZD_REGDOMAIN_JAPAN_ADD	0x40</div><div class='del'>-#define ZD_REGDOMAIN_JAPAN	0x41</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	MIN_CHANNEL24 = 1,</div><div class='del'>-	MAX_CHANNEL24 = 14,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void zd_geo_init(struct ieee80211_hw *hw, u8 regdomain);</div><div class='del'>-</div><div class='del'>-#define ZD_PLCP_SERVICE_LENGTH_EXTENSION 0x80</div><div class='del'>-</div><div class='del'>-struct ofdm_plcp_header {</div><div class='del'>-	u8 prefix[3];</div><div class='del'>-	__le16 service;</div><div class='del'>-} __attribute__((packed));</div><div class='del'>-</div><div class='del'>-static inline u8 zd_ofdm_plcp_header_rate(const struct ofdm_plcp_header *header)</div><div class='del'>-{</div><div class='del'>-	return header-&gt;prefix[0] &amp; 0xf;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* The following defines give the encoding of the 4-bit rate field in the</div><div class='del'>- * OFDM (802.11a/802.11g) PLCP header. Notify that these values are used to</div><div class='del'>- * define the zd-rate values for OFDM.</div><div class='del'>- *</div><div class='del'>- * See the struct zd_ctrlset definition in zd_mac.h.</div><div class='del'>- */</div><div class='del'>-#define ZD_OFDM_PLCP_RATE_6M	0xb</div><div class='del'>-#define ZD_OFDM_PLCP_RATE_9M	0xf</div><div class='del'>-#define ZD_OFDM_PLCP_RATE_12M	0xa</div><div class='del'>-#define ZD_OFDM_PLCP_RATE_18M	0xe</div><div class='del'>-#define ZD_OFDM_PLCP_RATE_24M	0x9</div><div class='del'>-#define ZD_OFDM_PLCP_RATE_36M	0xd</div><div class='del'>-#define ZD_OFDM_PLCP_RATE_48M	0x8</div><div class='del'>-#define ZD_OFDM_PLCP_RATE_54M	0xc</div><div class='del'>-</div><div class='del'>-struct cck_plcp_header {</div><div class='del'>-	u8 signal;</div><div class='del'>-	u8 service;</div><div class='del'>-	__le16 length;</div><div class='del'>-	__le16 crc16;</div><div class='del'>-} __attribute__((packed));</div><div class='del'>-</div><div class='del'>-static inline u8 zd_cck_plcp_header_signal(const struct cck_plcp_header *header)</div><div class='del'>-{</div><div class='del'>-	return header-&gt;signal;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* These defines give the encodings of the signal field in the 802.11b PLCP</div><div class='del'>- * header. The signal field gives the bit rate of the following packet. Even</div><div class='del'>- * if technically wrong we use CCK here also for the 1 MBit/s and 2 MBit/s</div><div class='del'>- * rate to stay consistent with Zydas and our use of the term.</div><div class='del'>- *</div><div class='del'>- * Notify that these values are *not* used in the zd-rates.</div><div class='del'>- */</div><div class='del'>-#define ZD_CCK_PLCP_SIGNAL_1M	0x0a</div><div class='del'>-#define ZD_CCK_PLCP_SIGNAL_2M	0x14</div><div class='del'>-#define ZD_CCK_PLCP_SIGNAL_5M5	0x37</div><div class='del'>-#define ZD_CCK_PLCP_SIGNAL_11M	0x6e</div><div class='del'>-</div><div class='del'>-#endif /* _ZD_IEEE80211_H */</div><div class='head'>diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c b/drivers/net/wireless/zd1211rw/zd_mac.c<br/>index 4d7b98b05030..fe1867b25ff7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/zd1211rw/zd_mac.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/zd1211rw/zd_mac.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/zd1211rw/zd_mac.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/zd1211rw/zd_mac.c</a></div><div class='hunk'>@@ -3,7 +3,7 @@</div><div class='ctx'>  * Copyright (C) 2005-2007 Ulrich Kunitz &lt;kune@deine-taler.de&gt;</div><div class='ctx'>  * Copyright (C) 2006-2007 Daniel Drake &lt;dsd@gentoo.org&gt;</div><div class='ctx'>  * Copyright (C) 2006-2007 Michael Wu &lt;flamingice@sourmilk.net&gt;</div><div class='del'>- * Copyright (c) 2007 Luis R. Rodriguez &lt;mcgrof@winlab.rutgers.edu&gt;</div><div class='add'>+ * Copyright (C) 2007-2008 Luis R. Rodriguez &lt;mcgrof@winlab.rutgers.edu&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of the GNU General Public License as published by</div><div class='hunk'>@@ -29,9 +29,23 @@</div><div class='ctx'> #include "zd_def.h"</div><div class='ctx'> #include "zd_chip.h"</div><div class='ctx'> #include "zd_mac.h"</div><div class='del'>-#include "zd_ieee80211.h"</div><div class='ctx'> #include "zd_rf.h"</div><div class='ctx'> </div><div class='add'>+struct zd_reg_alpha2_map {</div><div class='add'>+	u32 reg;</div><div class='add'>+	char alpha2[2];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct zd_reg_alpha2_map reg_alpha2_map[] = {</div><div class='add'>+	{ ZD_REGDOMAIN_FCC, "US" },</div><div class='add'>+	{ ZD_REGDOMAIN_IC, "CA" },</div><div class='add'>+	{ ZD_REGDOMAIN_ETSI, "DE" }, /* Generic ETSI, use most restrictive */</div><div class='add'>+	{ ZD_REGDOMAIN_JAPAN, "JP" },</div><div class='add'>+	{ ZD_REGDOMAIN_JAPAN_ADD, "JP" },</div><div class='add'>+	{ ZD_REGDOMAIN_SPAIN, "ES" },</div><div class='add'>+	{ ZD_REGDOMAIN_FRANCE, "FR" },</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* This table contains the hardware specific values for the modulation rates. */</div><div class='ctx'> static const struct ieee80211_rate zd_rates[] = {</div><div class='ctx'> 	{ .bitrate = 10,</div><div class='hunk'>@@ -95,6 +109,21 @@ static void housekeeping_init(struct zd_mac *mac);</div><div class='ctx'> static void housekeeping_enable(struct zd_mac *mac);</div><div class='ctx'> static void housekeeping_disable(struct zd_mac *mac);</div><div class='ctx'> </div><div class='add'>+static int zd_reg2alpha2(u8 regdomain, char *alpha2)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+	struct zd_reg_alpha2_map *reg_map;</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(reg_alpha2_map); i++) {</div><div class='add'>+		reg_map = &amp;reg_alpha2_map[i];</div><div class='add'>+		if (regdomain == reg_map-&gt;reg) {</div><div class='add'>+			alpha2[0] = reg_map-&gt;alpha2[0];</div><div class='add'>+			alpha2[1] = reg_map-&gt;alpha2[1];</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int zd_mac_preinit_hw(struct ieee80211_hw *hw)</div><div class='ctx'> {</div><div class='ctx'> 	int r;</div><div class='hunk'>@@ -115,6 +144,7 @@ int zd_mac_init_hw(struct ieee80211_hw *hw)</div><div class='ctx'> 	int r;</div><div class='ctx'> 	struct zd_mac *mac = zd_hw_mac(hw);</div><div class='ctx'> 	struct zd_chip *chip = &amp;mac-&gt;chip;</div><div class='add'>+	char alpha2[2];</div><div class='ctx'> 	u8 default_regdomain;</div><div class='ctx'> </div><div class='ctx'> 	r = zd_chip_enable_int(chip);</div><div class='hunk'>@@ -139,7 +169,9 @@ int zd_mac_init_hw(struct ieee80211_hw *hw)</div><div class='ctx'> 	if (r)</div><div class='ctx'> 		goto disable_int;</div><div class='ctx'> </div><div class='del'>-	zd_geo_init(hw, mac-&gt;regdomain);</div><div class='add'>+	r = zd_reg2alpha2(mac-&gt;regdomain, alpha2);</div><div class='add'>+	if (!r)</div><div class='add'>+		regulatory_hint(hw-&gt;wiphy, alpha2, NULL);</div><div class='ctx'> </div><div class='ctx'> 	r = 0;</div><div class='ctx'> disable_int:</div><div class='hunk'>@@ -579,7 +611,7 @@ static int filter_ack(struct ieee80211_hw *hw, struct ieee80211_hdr *rx_hdr,</div><div class='ctx'> </div><div class='ctx'> 	q = &amp;zd_hw_mac(hw)-&gt;ack_wait_queue;</div><div class='ctx'> 	spin_lock_irqsave(&amp;q-&gt;lock, flags);</div><div class='del'>-	for (skb = q-&gt;next; skb != (struct sk_buff *)q; skb = skb-&gt;next) {</div><div class='add'>+	skb_queue_walk(q, skb) {</div><div class='ctx'> 		struct ieee80211_hdr *tx_hdr;</div><div class='ctx'> </div><div class='ctx'> 		tx_hdr = (struct ieee80211_hdr *)skb-&gt;data;</div><div class='hunk'>@@ -684,15 +716,15 @@ static int zd_op_add_interface(struct ieee80211_hw *hw,</div><div class='ctx'> {</div><div class='ctx'> 	struct zd_mac *mac = zd_hw_mac(hw);</div><div class='ctx'> </div><div class='del'>-	/* using IEEE80211_IF_TYPE_INVALID to indicate no mode selected */</div><div class='del'>-	if (mac-&gt;type != IEEE80211_IF_TYPE_INVALID)</div><div class='add'>+	/* using NL80211_IFTYPE_UNSPECIFIED to indicate no mode selected */</div><div class='add'>+	if (mac-&gt;type != NL80211_IFTYPE_UNSPECIFIED)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 	switch (conf-&gt;type) {</div><div class='del'>-	case IEEE80211_IF_TYPE_MNTR:</div><div class='del'>-	case IEEE80211_IF_TYPE_MESH_POINT:</div><div class='del'>-	case IEEE80211_IF_TYPE_STA:</div><div class='del'>-	case IEEE80211_IF_TYPE_IBSS:</div><div class='add'>+	case NL80211_IFTYPE_MONITOR:</div><div class='add'>+	case NL80211_IFTYPE_MESH_POINT:</div><div class='add'>+	case NL80211_IFTYPE_STATION:</div><div class='add'>+	case NL80211_IFTYPE_ADHOC:</div><div class='ctx'> 		mac-&gt;type = conf-&gt;type;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -706,7 +738,7 @@ static void zd_op_remove_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 				    struct ieee80211_if_init_conf *conf)</div><div class='ctx'> {</div><div class='ctx'> 	struct zd_mac *mac = zd_hw_mac(hw);</div><div class='del'>-	mac-&gt;type = IEEE80211_IF_TYPE_INVALID;</div><div class='add'>+	mac-&gt;type = NL80211_IFTYPE_UNSPECIFIED;</div><div class='ctx'> 	zd_set_beacon_interval(&amp;mac-&gt;chip, 0);</div><div class='ctx'> 	zd_write_mac_addr(&amp;mac-&gt;chip, NULL);</div><div class='ctx'> }</div><div class='hunk'>@@ -725,8 +757,8 @@ static int zd_op_config_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 	int associated;</div><div class='ctx'> 	int r;</div><div class='ctx'> </div><div class='del'>-	if (mac-&gt;type == IEEE80211_IF_TYPE_MESH_POINT ||</div><div class='del'>-	    mac-&gt;type == IEEE80211_IF_TYPE_IBSS) {</div><div class='add'>+	if (mac-&gt;type == NL80211_IFTYPE_MESH_POINT ||</div><div class='add'>+	    mac-&gt;type == NL80211_IFTYPE_ADHOC) {</div><div class='ctx'> 		associated = true;</div><div class='ctx'> 		if (conf-&gt;changed &amp; IEEE80211_IFCC_BEACON) {</div><div class='ctx'> 			struct sk_buff *beacon = ieee80211_beacon_get(hw, vif);</div><div class='hunk'>@@ -753,7 +785,7 @@ static int zd_op_config_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void zd_process_intr(struct work_struct *work)</div><div class='add'>+static void zd_process_intr(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	u16 int_status;</div><div class='ctx'> 	struct zd_mac *mac = container_of(work, struct zd_mac, process_intr);</div><div class='hunk'>@@ -923,7 +955,7 @@ struct ieee80211_hw *zd_mac_alloc_hw(struct usb_interface *intf)</div><div class='ctx'> 	spin_lock_init(&amp;mac-&gt;lock);</div><div class='ctx'> 	mac-&gt;hw = hw;</div><div class='ctx'> </div><div class='del'>-	mac-&gt;type = IEEE80211_IF_TYPE_INVALID;</div><div class='add'>+	mac-&gt;type = NL80211_IFTYPE_UNSPECIFIED;</div><div class='ctx'> </div><div class='ctx'> 	memcpy(mac-&gt;channels, zd_channels, sizeof(zd_channels));</div><div class='ctx'> 	memcpy(mac-&gt;rates, zd_rates, sizeof(zd_rates));</div><div class='hunk'>@@ -937,6 +969,11 @@ struct ieee80211_hw *zd_mac_alloc_hw(struct usb_interface *intf)</div><div class='ctx'> 	hw-&gt;flags = IEEE80211_HW_RX_INCLUDES_FCS |</div><div class='ctx'> 		    IEEE80211_HW_SIGNAL_DB;</div><div class='ctx'> </div><div class='add'>+	hw-&gt;wiphy-&gt;interface_modes =</div><div class='add'>+		BIT(NL80211_IFTYPE_MESH_POINT) |</div><div class='add'>+		BIT(NL80211_IFTYPE_STATION) |</div><div class='add'>+		BIT(NL80211_IFTYPE_ADHOC);</div><div class='add'>+</div><div class='ctx'> 	hw-&gt;max_signal = 100;</div><div class='ctx'> 	hw-&gt;queues = 1;</div><div class='ctx'> 	hw-&gt;extra_tx_headroom = sizeof(struct zd_ctrlset);</div><div class='head'>diff --git a/drivers/net/wireless/zd1211rw/zd_mac.h b/drivers/net/wireless/zd1211rw/zd_mac.h<br/>index 18c1d56d3dd7..4c05d3ee4c37 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/zd1211rw/zd_mac.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/zd1211rw/zd_mac.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/zd1211rw/zd_mac.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/zd1211rw/zd_mac.h</a></div><div class='hunk'>@@ -25,7 +25,6 @@</div><div class='ctx'> #include &lt;net/mac80211.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "zd_chip.h"</div><div class='del'>-#include "zd_ieee80211.h"</div><div class='ctx'> </div><div class='ctx'> struct zd_ctrlset {</div><div class='ctx'> 	u8     modulation;</div><div class='hunk'>@@ -187,6 +186,70 @@ struct zd_mac {</div><div class='ctx'> 	unsigned int pass_ctrl:1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define ZD_REGDOMAIN_FCC	0x10</div><div class='add'>+#define ZD_REGDOMAIN_IC		0x20</div><div class='add'>+#define ZD_REGDOMAIN_ETSI	0x30</div><div class='add'>+#define ZD_REGDOMAIN_SPAIN	0x31</div><div class='add'>+#define ZD_REGDOMAIN_FRANCE	0x32</div><div class='add'>+#define ZD_REGDOMAIN_JAPAN_ADD	0x40</div><div class='add'>+#define ZD_REGDOMAIN_JAPAN	0x41</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	MIN_CHANNEL24 = 1,</div><div class='add'>+	MAX_CHANNEL24 = 14,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define ZD_PLCP_SERVICE_LENGTH_EXTENSION 0x80</div><div class='add'>+</div><div class='add'>+struct ofdm_plcp_header {</div><div class='add'>+	u8 prefix[3];</div><div class='add'>+	__le16 service;</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+static inline u8 zd_ofdm_plcp_header_rate(const struct ofdm_plcp_header *header)</div><div class='add'>+{</div><div class='add'>+	return header-&gt;prefix[0] &amp; 0xf;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* The following defines give the encoding of the 4-bit rate field in the</div><div class='add'>+ * OFDM (802.11a/802.11g) PLCP header. Notify that these values are used to</div><div class='add'>+ * define the zd-rate values for OFDM.</div><div class='add'>+ *</div><div class='add'>+ * See the struct zd_ctrlset definition in zd_mac.h.</div><div class='add'>+ */</div><div class='add'>+#define ZD_OFDM_PLCP_RATE_6M	0xb</div><div class='add'>+#define ZD_OFDM_PLCP_RATE_9M	0xf</div><div class='add'>+#define ZD_OFDM_PLCP_RATE_12M	0xa</div><div class='add'>+#define ZD_OFDM_PLCP_RATE_18M	0xe</div><div class='add'>+#define ZD_OFDM_PLCP_RATE_24M	0x9</div><div class='add'>+#define ZD_OFDM_PLCP_RATE_36M	0xd</div><div class='add'>+#define ZD_OFDM_PLCP_RATE_48M	0x8</div><div class='add'>+#define ZD_OFDM_PLCP_RATE_54M	0xc</div><div class='add'>+</div><div class='add'>+struct cck_plcp_header {</div><div class='add'>+	u8 signal;</div><div class='add'>+	u8 service;</div><div class='add'>+	__le16 length;</div><div class='add'>+	__le16 crc16;</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+static inline u8 zd_cck_plcp_header_signal(const struct cck_plcp_header *header)</div><div class='add'>+{</div><div class='add'>+	return header-&gt;signal;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* These defines give the encodings of the signal field in the 802.11b PLCP</div><div class='add'>+ * header. The signal field gives the bit rate of the following packet. Even</div><div class='add'>+ * if technically wrong we use CCK here also for the 1 MBit/s and 2 MBit/s</div><div class='add'>+ * rate to stay consistent with Zydas and our use of the term.</div><div class='add'>+ *</div><div class='add'>+ * Notify that these values are *not* used in the zd-rates.</div><div class='add'>+ */</div><div class='add'>+#define ZD_CCK_PLCP_SIGNAL_1M	0x0a</div><div class='add'>+#define ZD_CCK_PLCP_SIGNAL_2M	0x14</div><div class='add'>+#define ZD_CCK_PLCP_SIGNAL_5M5	0x37</div><div class='add'>+#define ZD_CCK_PLCP_SIGNAL_11M	0x6e</div><div class='add'>+</div><div class='ctx'> static inline struct zd_mac *zd_hw_mac(struct ieee80211_hw *hw)</div><div class='ctx'> {</div><div class='ctx'> 	return hw-&gt;priv;</div><div class='head'>diff --git a/drivers/net/wireless/zd1211rw/zd_rf.c b/drivers/net/wireless/zd1211rw/zd_rf.c<br/>index ec4129312813..7207bfd2e6cd 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/zd1211rw/zd_rf.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/wireless/zd1211rw/zd_rf.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/wireless/zd1211rw/zd_rf.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/wireless/zd1211rw/zd_rf.c</a></div><div class='hunk'>@@ -23,7 +23,7 @@</div><div class='ctx'> </div><div class='ctx'> #include "zd_def.h"</div><div class='ctx'> #include "zd_rf.h"</div><div class='del'>-#include "zd_ieee80211.h"</div><div class='add'>+#include "zd_mac.h"</div><div class='ctx'> #include "zd_chip.h"</div><div class='ctx'> </div><div class='ctx'> static const char * const rfs[] = {</div><div class='head'>diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c<br/>index c749bdba214c..c6948d8f53f6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/xen-netfront.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/net/xen-netfront.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/net/xen-netfront.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/net/xen-netfront.c</a></div><div class='hunk'>@@ -239,11 +239,14 @@ static void xennet_alloc_rx_buffers(struct net_device *dev)</div><div class='ctx'> 	 */</div><div class='ctx'> 	batch_target = np-&gt;rx_target - (req_prod - np-&gt;rx.rsp_cons);</div><div class='ctx'> 	for (i = skb_queue_len(&amp;np-&gt;rx_batch); i &lt; batch_target; i++) {</div><div class='del'>-		skb = __netdev_alloc_skb(dev, RX_COPY_THRESHOLD,</div><div class='add'>+		skb = __netdev_alloc_skb(dev, RX_COPY_THRESHOLD + NET_IP_ALIGN,</div><div class='ctx'> 					 GFP_ATOMIC | __GFP_NOWARN);</div><div class='ctx'> 		if (unlikely(!skb))</div><div class='ctx'> 			goto no_skb;</div><div class='ctx'> </div><div class='add'>+		/* Align ip header to a 16 bytes boundary */</div><div class='add'>+		skb_reserve(skb, NET_IP_ALIGN);</div><div class='add'>+</div><div class='ctx'> 		page = alloc_page(GFP_ATOMIC | __GFP_NOWARN);</div><div class='ctx'> 		if (!page) {</div><div class='ctx'> 			kfree_skb(skb);</div><div class='hunk'>@@ -471,7 +474,7 @@ static int xennet_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	unsigned int offset = offset_in_page(data);</div><div class='ctx'> 	unsigned int len = skb_headlen(skb);</div><div class='ctx'> </div><div class='del'>-	frags += (offset + len + PAGE_SIZE - 1) / PAGE_SIZE;</div><div class='add'>+	frags += DIV_ROUND_UP(offset + len, PAGE_SIZE);</div><div class='ctx'> 	if (unlikely(frags &gt; MAX_SKB_FRAGS + 1)) {</div><div class='ctx'> 		printk(KERN_ALERT "xennet: skb rides the rocket: %d frags\n",</div><div class='ctx'> 		       frags);</div><div class='hunk'>@@ -1794,10 +1797,10 @@ static struct xenbus_driver netfront = {</div><div class='ctx'> </div><div class='ctx'> static int __init netif_init(void)</div><div class='ctx'> {</div><div class='del'>-	if (!is_running_on_xen())</div><div class='add'>+	if (!xen_domain())</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	if (is_initial_xendomain())</div><div class='add'>+	if (xen_initial_domain())</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_INFO "Initialising Xen virtual ethernet driver.\n");</div><div class='hunk'>@@ -1809,7 +1812,7 @@ module_init(netif_init);</div><div class='ctx'> </div><div class='ctx'> static void __exit netif_exit(void)</div><div class='ctx'> {</div><div class='del'>-	if (is_initial_xendomain())</div><div class='add'>+	if (xen_initial_domain())</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	xenbus_unregister_driver(&amp;netfront);</div><div class='head'>diff --git a/drivers/nubus/nubus.c b/drivers/nubus/nubus.c<br/>index 2f047e573d86..f5f75844954c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/nubus/nubus.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/nubus/nubus.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/nubus/nubus.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/nubus/nubus.c</a></div><div class='hunk'>@@ -126,7 +126,7 @@ static void nubus_advance(unsigned char **ptr, int len, int map)</div><div class='ctx'> 	{</div><div class='ctx'> 		while(not_useful(p,map))</div><div class='ctx'> 			p++;</div><div class='del'>-			p++;</div><div class='add'>+		p++;</div><div class='ctx'> 		len--;</div><div class='ctx'> 	}</div><div class='ctx'> 	*ptr = p;</div><div class='head'>diff --git a/drivers/of/base.c b/drivers/of/base.c<br/>index ad8ac1a8af28..7c79e94a35ea 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/of/base.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/of/base.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/of/base.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/of/base.c</a></div><div class='hunk'>@@ -410,7 +410,7 @@ struct of_modalias_table {</div><div class='ctx'> 	char *modalias;</div><div class='ctx'> };</div><div class='ctx'> static struct of_modalias_table of_modalias_table[] = {</div><div class='del'>-	/* Empty for now; add entries as needed */</div><div class='add'>+	{ "fsl,mcu-mpc8349emitx", "mcu-mpc8349emitx" },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -420,13 +420,12 @@ static struct of_modalias_table of_modalias_table[] = {</div><div class='ctx'>  * @len:	Length of modalias value</div><div class='ctx'>  *</div><div class='ctx'>  * Based on the value of the compatible property, this routine will determine</div><div class='del'>- * an appropriate modalias value for a particular device tree node.  Three</div><div class='del'>- * separate methods are used to derive a modalias value.</div><div class='add'>+ * an appropriate modalias value for a particular device tree node.  Two</div><div class='add'>+ * separate methods are attempted to derive a modalias value.</div><div class='ctx'>  *</div><div class='ctx'>  * First method is to lookup the compatible value in of_modalias_table.</div><div class='del'>- * Second is to look for a "linux,&lt;modalias&gt;" entry in the compatible list</div><div class='del'>- * and used that for modalias.  Third is to strip off the manufacturer</div><div class='del'>- * prefix from the first compatible entry and use the remainder as modalias</div><div class='add'>+ * Second is to strip off the manufacturer prefix from the first</div><div class='add'>+ * compatible entry and use the remainder as modalias</div><div class='ctx'>  *</div><div class='ctx'>  * This routine returns 0 on success</div><div class='ctx'>  */</div><div class='hunk'>@@ -449,21 +448,7 @@ int of_modalias_node(struct device_node *node, char *modalias, int len)</div><div class='ctx'> 	if (!compatible)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	/* 2. search for linux,&lt;modalias&gt; entry */</div><div class='del'>-	p = compatible;</div><div class='del'>-	while (cplen &gt; 0) {</div><div class='del'>-		if (!strncmp(p, "linux,", 6)) {</div><div class='del'>-			p += 6;</div><div class='del'>-			strlcpy(modalias, p, len);</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		i = strlen(p) + 1;</div><div class='del'>-		p += i;</div><div class='del'>-		cplen -= i;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* 3. take first compatible entry and strip manufacturer */</div><div class='add'>+	/* 2. take first compatible entry and strip manufacturer */</div><div class='ctx'> 	p = strchr(compatible, ',');</div><div class='ctx'> 	if (!p)</div><div class='ctx'> 		return -ENODEV;</div><div class='hunk'>@@ -473,3 +458,112 @@ int of_modalias_node(struct device_node *node, char *modalias, int len)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(of_modalias_node);</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * of_parse_phandles_with_args - Find a node pointed by phandle in a list</div><div class='add'>+ * @np:		pointer to a device tree node containing a list</div><div class='add'>+ * @list_name:	property name that contains a list</div><div class='add'>+ * @cells_name:	property name that specifies phandles' arguments count</div><div class='add'>+ * @index:	index of a phandle to parse out</div><div class='add'>+ * @out_node:	pointer to device_node struct pointer (will be filled)</div><div class='add'>+ * @out_args:	pointer to arguments pointer (will be filled)</div><div class='add'>+ *</div><div class='add'>+ * This function is useful to parse lists of phandles and their arguments.</div><div class='add'>+ * Returns 0 on success and fills out_node and out_args, on error returns</div><div class='add'>+ * appropriate errno value.</div><div class='add'>+ *</div><div class='add'>+ * Example:</div><div class='add'>+ *</div><div class='add'>+ * phandle1: node1 {</div><div class='add'>+ * 	#list-cells = &lt;2&gt;;</div><div class='add'>+ * }</div><div class='add'>+ *</div><div class='add'>+ * phandle2: node2 {</div><div class='add'>+ * 	#list-cells = &lt;1&gt;;</div><div class='add'>+ * }</div><div class='add'>+ *</div><div class='add'>+ * node3 {</div><div class='add'>+ * 	list = &lt;&amp;phandle1 1 2 &amp;phandle2 3&gt;;</div><div class='add'>+ * }</div><div class='add'>+ *</div><div class='add'>+ * To get a device_node of the `node2' node you may call this:</div><div class='add'>+ * of_parse_phandles_with_args(node3, "list", "#list-cells", 2, &amp;node2, &amp;args);</div><div class='add'>+ */</div><div class='add'>+int of_parse_phandles_with_args(struct device_node *np, const char *list_name,</div><div class='add'>+				const char *cells_name, int index,</div><div class='add'>+				struct device_node **out_node,</div><div class='add'>+				const void **out_args)</div><div class='add'>+{</div><div class='add'>+	int ret = -EINVAL;</div><div class='add'>+	const u32 *list;</div><div class='add'>+	const u32 *list_end;</div><div class='add'>+	int size;</div><div class='add'>+	int cur_index = 0;</div><div class='add'>+	struct device_node *node = NULL;</div><div class='add'>+	const void *args;</div><div class='add'>+</div><div class='add'>+	list = of_get_property(np, list_name, &amp;size);</div><div class='add'>+	if (!list) {</div><div class='add'>+		ret = -ENOENT;</div><div class='add'>+		goto err0;</div><div class='add'>+	}</div><div class='add'>+	list_end = list + size / sizeof(*list);</div><div class='add'>+</div><div class='add'>+	while (list &lt; list_end) {</div><div class='add'>+		const u32 *cells;</div><div class='add'>+		const phandle *phandle;</div><div class='add'>+</div><div class='add'>+		phandle = list;</div><div class='add'>+		args = list + 1;</div><div class='add'>+</div><div class='add'>+		/* one cell hole in the list = &lt;&gt;; */</div><div class='add'>+		if (!*phandle) {</div><div class='add'>+			list++;</div><div class='add'>+			goto next;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		node = of_find_node_by_phandle(*phandle);</div><div class='add'>+		if (!node) {</div><div class='add'>+			pr_debug("%s: could not find phandle\n",</div><div class='add'>+				 np-&gt;full_name);</div><div class='add'>+			goto err0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		cells = of_get_property(node, cells_name, &amp;size);</div><div class='add'>+		if (!cells || size != sizeof(*cells)) {</div><div class='add'>+			pr_debug("%s: could not get %s for %s\n",</div><div class='add'>+				 np-&gt;full_name, cells_name, node-&gt;full_name);</div><div class='add'>+			goto err1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Next phandle is at offset of one phandle cell + #cells */</div><div class='add'>+		list += 1 + *cells;</div><div class='add'>+		if (list &gt; list_end) {</div><div class='add'>+			pr_debug("%s: insufficient arguments length\n",</div><div class='add'>+				 np-&gt;full_name);</div><div class='add'>+			goto err1;</div><div class='add'>+		}</div><div class='add'>+next:</div><div class='add'>+		if (cur_index == index)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		of_node_put(node);</div><div class='add'>+		node = NULL;</div><div class='add'>+		cur_index++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!node) {</div><div class='add'>+		ret = -ENOENT;</div><div class='add'>+		goto err0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*out_node = node;</div><div class='add'>+	*out_args = args;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+err1:</div><div class='add'>+	of_node_put(node);</div><div class='add'>+err0:</div><div class='add'>+	pr_debug("%s failed with status %d\n", __func__, ret);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(of_parse_phandles_with_args);</div><div class='head'>diff --git a/drivers/of/gpio.c b/drivers/of/gpio.c<br/>index 1c9cab844f10..7cd7301b5839 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/of/gpio.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/of/gpio.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/of/gpio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/of/gpio.c</a></div><div class='hunk'>@@ -28,78 +28,35 @@</div><div class='ctx'>  */</div><div class='ctx'> int of_get_gpio(struct device_node *np, int index)</div><div class='ctx'> {</div><div class='del'>-	int ret = -EINVAL;</div><div class='add'>+	int ret;</div><div class='ctx'> 	struct device_node *gc;</div><div class='ctx'> 	struct of_gpio_chip *of_gc = NULL;</div><div class='ctx'> 	int size;</div><div class='del'>-	const u32 *gpios;</div><div class='del'>-	u32 nr_cells;</div><div class='del'>-	int i;</div><div class='ctx'> 	const void *gpio_spec;</div><div class='ctx'> 	const u32 *gpio_cells;</div><div class='del'>-	int gpio_index = 0;</div><div class='ctx'> </div><div class='del'>-	gpios = of_get_property(np, "gpios", &amp;size);</div><div class='del'>-	if (!gpios) {</div><div class='del'>-		ret = -ENOENT;</div><div class='add'>+	ret = of_parse_phandles_with_args(np, "gpios", "#gpio-cells", index,</div><div class='add'>+					  &amp;gc, &amp;gpio_spec);</div><div class='add'>+	if (ret) {</div><div class='add'>+		pr_debug("%s: can't parse gpios property\n", __func__);</div><div class='ctx'> 		goto err0;</div><div class='ctx'> 	}</div><div class='del'>-	nr_cells = size / sizeof(u32);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; nr_cells; gpio_index++) {</div><div class='del'>-		const phandle *gpio_phandle;</div><div class='del'>-</div><div class='del'>-		gpio_phandle = gpios + i;</div><div class='del'>-		gpio_spec = gpio_phandle + 1;</div><div class='del'>-</div><div class='del'>-		/* one cell hole in the gpios = &lt;&gt;; */</div><div class='del'>-		if (!*gpio_phandle) {</div><div class='del'>-			if (gpio_index == index)</div><div class='del'>-				return -ENOENT;</div><div class='del'>-			i++;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		gc = of_find_node_by_phandle(*gpio_phandle);</div><div class='del'>-		if (!gc) {</div><div class='del'>-			pr_debug("%s: could not find phandle for gpios\n",</div><div class='del'>-				 np-&gt;full_name);</div><div class='del'>-			goto err0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		of_gc = gc-&gt;data;</div><div class='del'>-		if (!of_gc) {</div><div class='del'>-			pr_debug("%s: gpio controller %s isn't registered\n",</div><div class='del'>-				 np-&gt;full_name, gc-&gt;full_name);</div><div class='del'>-			goto err1;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		gpio_cells = of_get_property(gc, "#gpio-cells", &amp;size);</div><div class='del'>-		if (!gpio_cells || size != sizeof(*gpio_cells) ||</div><div class='del'>-				*gpio_cells != of_gc-&gt;gpio_cells) {</div><div class='del'>-			pr_debug("%s: wrong #gpio-cells for %s\n",</div><div class='del'>-				 np-&gt;full_name, gc-&gt;full_name);</div><div class='del'>-			goto err1;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Next phandle is at phandle cells + #gpio-cells */</div><div class='del'>-		i += sizeof(*gpio_phandle) / sizeof(u32) + *gpio_cells;</div><div class='del'>-		if (i &gt;= nr_cells + 1) {</div><div class='del'>-			pr_debug("%s: insufficient gpio-spec length\n",</div><div class='del'>-				 np-&gt;full_name);</div><div class='del'>-			goto err1;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (gpio_index == index)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		of_gc = NULL;</div><div class='del'>-		of_node_put(gc);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='add'>+	of_gc = gc-&gt;data;</div><div class='ctx'> 	if (!of_gc) {</div><div class='del'>-		ret = -ENOENT;</div><div class='del'>-		goto err0;</div><div class='add'>+		pr_debug("%s: gpio controller %s isn't registered\n",</div><div class='add'>+			 np-&gt;full_name, gc-&gt;full_name);</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto err1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	gpio_cells = of_get_property(gc, "#gpio-cells", &amp;size);</div><div class='add'>+	if (!gpio_cells || size != sizeof(*gpio_cells) ||</div><div class='add'>+			*gpio_cells != of_gc-&gt;gpio_cells) {</div><div class='add'>+		pr_debug("%s: wrong #gpio-cells for %s\n",</div><div class='add'>+			 np-&gt;full_name, gc-&gt;full_name);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto err1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = of_gc-&gt;xlate(of_gc, np, gpio_spec);</div><div class='head'>diff --git a/drivers/oprofile/buffer_sync.c b/drivers/oprofile/buffer_sync.c<br/>index 9304c4555079..ed982273fb8b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/oprofile/buffer_sync.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/oprofile/buffer_sync.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/oprofile/buffer_sync.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/oprofile/buffer_sync.c</a></div><div class='hunk'>@@ -5,6 +5,7 @@</div><div class='ctx'>  * @remark Read the file COPYING</div><div class='ctx'>  *</div><div class='ctx'>  * @author John Levon &lt;levon@movementarian.org&gt;</div><div class='add'>+ * @author Barry Kasindorf</div><div class='ctx'>  *</div><div class='ctx'>  * This is the core of the buffer management. Each</div><div class='ctx'>  * CPU buffer is processed and entered into the</div><div class='hunk'>@@ -33,7 +34,7 @@</div><div class='ctx'> #include "event_buffer.h"</div><div class='ctx'> #include "cpu_buffer.h"</div><div class='ctx'> #include "buffer_sync.h"</div><div class='del'>- </div><div class='add'>+</div><div class='ctx'> static LIST_HEAD(dying_tasks);</div><div class='ctx'> static LIST_HEAD(dead_tasks);</div><div class='ctx'> static cpumask_t marked_cpus = CPU_MASK_NONE;</div><div class='hunk'>@@ -48,10 +49,11 @@ static void process_task_mortuary(void);</div><div class='ctx'>  * Can be invoked from softirq via RCU callback due to</div><div class='ctx'>  * call_rcu() of the task struct, hence the _irqsave.</div><div class='ctx'>  */</div><div class='del'>-static int task_free_notify(struct notifier_block * self, unsigned long val, void * data)</div><div class='add'>+static int</div><div class='add'>+task_free_notify(struct notifier_block *self, unsigned long val, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	struct task_struct * task = data;</div><div class='add'>+	struct task_struct *task = data;</div><div class='ctx'> 	spin_lock_irqsave(&amp;task_mortuary, flags);</div><div class='ctx'> 	list_add(&amp;task-&gt;tasks, &amp;dying_tasks);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;task_mortuary, flags);</div><div class='hunk'>@@ -62,13 +64,14 @@ static int task_free_notify(struct notifier_block * self, unsigned long val, voi</div><div class='ctx'> /* The task is on its way out. A sync of the buffer means we can catch</div><div class='ctx'>  * any remaining samples for this task.</div><div class='ctx'>  */</div><div class='del'>-static int task_exit_notify(struct notifier_block * self, unsigned long val, void * data)</div><div class='add'>+static int</div><div class='add'>+task_exit_notify(struct notifier_block *self, unsigned long val, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	/* To avoid latency problems, we only process the current CPU,</div><div class='ctx'> 	 * hoping that most samples for the task are on this CPU</div><div class='ctx'> 	 */</div><div class='ctx'> 	sync_buffer(raw_smp_processor_id());</div><div class='del'>-  	return 0;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -77,11 +80,12 @@ static int task_exit_notify(struct notifier_block * self, unsigned long val, voi</div><div class='ctx'>  * we don't lose any. This does not have to be exact, it's a QoI issue</div><div class='ctx'>  * only.</div><div class='ctx'>  */</div><div class='del'>-static int munmap_notify(struct notifier_block * self, unsigned long val, void * data)</div><div class='add'>+static int</div><div class='add'>+munmap_notify(struct notifier_block *self, unsigned long val, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long addr = (unsigned long)data;</div><div class='del'>-	struct mm_struct * mm = current-&gt;mm;</div><div class='del'>-	struct vm_area_struct * mpnt;</div><div class='add'>+	struct mm_struct *mm = current-&gt;mm;</div><div class='add'>+	struct vm_area_struct *mpnt;</div><div class='ctx'> </div><div class='ctx'> 	down_read(&amp;mm-&gt;mmap_sem);</div><div class='ctx'> </div><div class='hunk'>@@ -99,11 +103,12 @@ static int munmap_notify(struct notifier_block * self, unsigned long val, void *</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- </div><div class='add'>+</div><div class='ctx'> /* We need to be told about new modules so we don't attribute to a previously</div><div class='ctx'>  * loaded module, or drop the samples on the floor.</div><div class='ctx'>  */</div><div class='del'>-static int module_load_notify(struct notifier_block * self, unsigned long val, void * data)</div><div class='add'>+static int</div><div class='add'>+module_load_notify(struct notifier_block *self, unsigned long val, void *data)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_MODULES</div><div class='ctx'> 	if (val != MODULE_STATE_COMING)</div><div class='hunk'>@@ -118,7 +123,7 @@ static int module_load_notify(struct notifier_block * self, unsigned long val, v</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- </div><div class='add'>+</div><div class='ctx'> static struct notifier_block task_free_nb = {</div><div class='ctx'> 	.notifier_call	= task_free_notify,</div><div class='ctx'> };</div><div class='hunk'>@@ -135,7 +140,7 @@ static struct notifier_block module_load_nb = {</div><div class='ctx'> 	.notifier_call = module_load_notify,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>- </div><div class='add'>+</div><div class='ctx'> static void end_sync(void)</div><div class='ctx'> {</div><div class='ctx'> 	end_cpu_work();</div><div class='hunk'>@@ -208,14 +213,14 @@ static inline unsigned long fast_get_dcookie(struct path *path)</div><div class='ctx'>  * not strictly necessary but allows oprofile to associate</div><div class='ctx'>  * shared-library samples with particular applications</div><div class='ctx'>  */</div><div class='del'>-static unsigned long get_exec_dcookie(struct mm_struct * mm)</div><div class='add'>+static unsigned long get_exec_dcookie(struct mm_struct *mm)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long cookie = NO_COOKIE;</div><div class='del'>-	struct vm_area_struct * vma;</div><div class='del'>- </div><div class='add'>+	struct vm_area_struct *vma;</div><div class='add'>+</div><div class='ctx'> 	if (!mm)</div><div class='ctx'> 		goto out;</div><div class='del'>- </div><div class='add'>+</div><div class='ctx'> 	for (vma = mm-&gt;mmap; vma; vma = vma-&gt;vm_next) {</div><div class='ctx'> 		if (!vma-&gt;vm_file)</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -235,13 +240,14 @@ out:</div><div class='ctx'>  * sure to do this lookup before a mm-&gt;mmap modification happens so</div><div class='ctx'>  * we don't lose track.</div><div class='ctx'>  */</div><div class='del'>-static unsigned long lookup_dcookie(struct mm_struct * mm, unsigned long addr, off_t * offset)</div><div class='add'>+static unsigned long</div><div class='add'>+lookup_dcookie(struct mm_struct *mm, unsigned long addr, off_t *offset)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long cookie = NO_COOKIE;</div><div class='del'>-	struct vm_area_struct * vma;</div><div class='add'>+	struct vm_area_struct *vma;</div><div class='ctx'> </div><div class='ctx'> 	for (vma = find_vma(mm, addr); vma; vma = vma-&gt;vm_next) {</div><div class='del'>- </div><div class='add'>+</div><div class='ctx'> 		if (addr &lt; vma-&gt;vm_start || addr &gt;= vma-&gt;vm_end)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='hunk'>@@ -263,9 +269,20 @@ static unsigned long lookup_dcookie(struct mm_struct * mm, unsigned long addr, o</div><div class='ctx'> 	return cookie;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void increment_tail(struct oprofile_cpu_buffer *b)</div><div class='add'>+{</div><div class='add'>+	unsigned long new_tail = b-&gt;tail_pos + 1;</div><div class='add'>+</div><div class='add'>+	rmb();	/* be sure fifo pointers are synchromized */</div><div class='add'>+</div><div class='add'>+	if (new_tail &lt; b-&gt;buffer_size)</div><div class='add'>+		b-&gt;tail_pos = new_tail;</div><div class='add'>+	else</div><div class='add'>+		b-&gt;tail_pos = 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static unsigned long last_cookie = INVALID_COOKIE;</div><div class='del'>- </div><div class='add'>+</div><div class='ctx'> static void add_cpu_switch(int i)</div><div class='ctx'> {</div><div class='ctx'> 	add_event_entry(ESCAPE_CODE);</div><div class='hunk'>@@ -278,16 +295,16 @@ static void add_kernel_ctx_switch(unsigned int in_kernel)</div><div class='ctx'> {</div><div class='ctx'> 	add_event_entry(ESCAPE_CODE);</div><div class='ctx'> 	if (in_kernel)</div><div class='del'>-		add_event_entry(KERNEL_ENTER_SWITCH_CODE); </div><div class='add'>+		add_event_entry(KERNEL_ENTER_SWITCH_CODE);</div><div class='ctx'> 	else</div><div class='del'>-		add_event_entry(KERNEL_EXIT_SWITCH_CODE); </div><div class='add'>+		add_event_entry(KERNEL_EXIT_SWITCH_CODE);</div><div class='ctx'> }</div><div class='del'>- </div><div class='add'>+</div><div class='ctx'> static void</div><div class='del'>-add_user_ctx_switch(struct task_struct const * task, unsigned long cookie)</div><div class='add'>+add_user_ctx_switch(struct task_struct const *task, unsigned long cookie)</div><div class='ctx'> {</div><div class='ctx'> 	add_event_entry(ESCAPE_CODE);</div><div class='del'>-	add_event_entry(CTX_SWITCH_CODE); </div><div class='add'>+	add_event_entry(CTX_SWITCH_CODE);</div><div class='ctx'> 	add_event_entry(task-&gt;pid);</div><div class='ctx'> 	add_event_entry(cookie);</div><div class='ctx'> 	/* Another code for daemon back-compat */</div><div class='hunk'>@@ -296,7 +313,7 @@ add_user_ctx_switch(struct task_struct const * task, unsigned long cookie)</div><div class='ctx'> 	add_event_entry(task-&gt;tgid);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- </div><div class='add'>+</div><div class='ctx'> static void add_cookie_switch(unsigned long cookie)</div><div class='ctx'> {</div><div class='ctx'> 	add_event_entry(ESCAPE_CODE);</div><div class='hunk'>@@ -304,13 +321,78 @@ static void add_cookie_switch(unsigned long cookie)</div><div class='ctx'> 	add_event_entry(cookie);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- </div><div class='add'>+</div><div class='ctx'> static void add_trace_begin(void)</div><div class='ctx'> {</div><div class='ctx'> 	add_event_entry(ESCAPE_CODE);</div><div class='ctx'> 	add_event_entry(TRACE_BEGIN_CODE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_OPROFILE_IBS</div><div class='add'>+</div><div class='add'>+#define IBS_FETCH_CODE_SIZE	2</div><div class='add'>+#define IBS_OP_CODE_SIZE	5</div><div class='add'>+#define IBS_EIP(offset)				\</div><div class='add'>+	(((struct op_sample *)&amp;cpu_buf-&gt;buffer[(offset)])-&gt;eip)</div><div class='add'>+#define IBS_EVENT(offset)				\</div><div class='add'>+	(((struct op_sample *)&amp;cpu_buf-&gt;buffer[(offset)])-&gt;event)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Add IBS fetch and op entries to event buffer</div><div class='add'>+ */</div><div class='add'>+static void add_ibs_begin(struct oprofile_cpu_buffer *cpu_buf, int code,</div><div class='add'>+	int in_kernel, struct mm_struct *mm)</div><div class='add'>+{</div><div class='add'>+	unsigned long rip;</div><div class='add'>+	int i, count;</div><div class='add'>+	unsigned long ibs_cookie = 0;</div><div class='add'>+	off_t offset;</div><div class='add'>+</div><div class='add'>+	increment_tail(cpu_buf);	/* move to RIP entry */</div><div class='add'>+</div><div class='add'>+	rip = IBS_EIP(cpu_buf-&gt;tail_pos);</div><div class='add'>+</div><div class='add'>+#ifdef __LP64__</div><div class='add'>+	rip += IBS_EVENT(cpu_buf-&gt;tail_pos) &lt;&lt; 32;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	if (mm) {</div><div class='add'>+		ibs_cookie = lookup_dcookie(mm, rip, &amp;offset);</div><div class='add'>+</div><div class='add'>+		if (ibs_cookie == NO_COOKIE)</div><div class='add'>+			offset = rip;</div><div class='add'>+		if (ibs_cookie == INVALID_COOKIE) {</div><div class='add'>+			atomic_inc(&amp;oprofile_stats.sample_lost_no_mapping);</div><div class='add'>+			offset = rip;</div><div class='add'>+		}</div><div class='add'>+		if (ibs_cookie != last_cookie) {</div><div class='add'>+			add_cookie_switch(ibs_cookie);</div><div class='add'>+			last_cookie = ibs_cookie;</div><div class='add'>+		}</div><div class='add'>+	} else</div><div class='add'>+		offset = rip;</div><div class='add'>+</div><div class='add'>+	add_event_entry(ESCAPE_CODE);</div><div class='add'>+	add_event_entry(code);</div><div class='add'>+	add_event_entry(offset);	/* Offset from Dcookie */</div><div class='add'>+</div><div class='add'>+	/* we send the Dcookie offset, but send the raw Linear Add also*/</div><div class='add'>+	add_event_entry(IBS_EIP(cpu_buf-&gt;tail_pos));</div><div class='add'>+	add_event_entry(IBS_EVENT(cpu_buf-&gt;tail_pos));</div><div class='add'>+</div><div class='add'>+	if (code == IBS_FETCH_CODE)</div><div class='add'>+		count = IBS_FETCH_CODE_SIZE;	/*IBS FETCH is 2 int64s*/</div><div class='add'>+	else</div><div class='add'>+		count = IBS_OP_CODE_SIZE;	/*IBS OP is 5 int64s*/</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; count; i++) {</div><div class='add'>+		increment_tail(cpu_buf);</div><div class='add'>+		add_event_entry(IBS_EIP(cpu_buf-&gt;tail_pos));</div><div class='add'>+		add_event_entry(IBS_EVENT(cpu_buf-&gt;tail_pos));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> static void add_sample_entry(unsigned long offset, unsigned long event)</div><div class='ctx'> {</div><div class='hunk'>@@ -319,13 +401,13 @@ static void add_sample_entry(unsigned long offset, unsigned long event)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int add_us_sample(struct mm_struct * mm, struct op_sample * s)</div><div class='add'>+static int add_us_sample(struct mm_struct *mm, struct op_sample *s)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long cookie;</div><div class='ctx'> 	off_t offset;</div><div class='del'>- </div><div class='del'>- 	cookie = lookup_dcookie(mm, s-&gt;eip, &amp;offset);</div><div class='del'>- </div><div class='add'>+</div><div class='add'>+	cookie = lookup_dcookie(mm, s-&gt;eip, &amp;offset);</div><div class='add'>+</div><div class='ctx'> 	if (cookie == INVALID_COOKIE) {</div><div class='ctx'> 		atomic_inc(&amp;oprofile_stats.sample_lost_no_mapping);</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -341,13 +423,13 @@ static int add_us_sample(struct mm_struct * mm, struct op_sample * s)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- </div><div class='add'>+</div><div class='ctx'> /* Add a sample to the global event buffer. If possible the</div><div class='ctx'>  * sample is converted into a persistent dentry/offset pair</div><div class='ctx'>  * for later lookup from userspace.</div><div class='ctx'>  */</div><div class='ctx'> static int</div><div class='del'>-add_sample(struct mm_struct * mm, struct op_sample * s, int in_kernel)</div><div class='add'>+add_sample(struct mm_struct *mm, struct op_sample *s, int in_kernel)</div><div class='ctx'> {</div><div class='ctx'> 	if (in_kernel) {</div><div class='ctx'> 		add_sample_entry(s-&gt;eip, s-&gt;event);</div><div class='hunk'>@@ -359,9 +441,9 @@ add_sample(struct mm_struct * mm, struct op_sample * s, int in_kernel)</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>- </div><div class='ctx'> </div><div class='del'>-static void release_mm(struct mm_struct * mm)</div><div class='add'>+</div><div class='add'>+static void release_mm(struct mm_struct *mm)</div><div class='ctx'> {</div><div class='ctx'> 	if (!mm)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -370,9 +452,9 @@ static void release_mm(struct mm_struct * mm)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static struct mm_struct * take_tasks_mm(struct task_struct * task)</div><div class='add'>+static struct mm_struct *take_tasks_mm(struct task_struct *task)</div><div class='ctx'> {</div><div class='del'>-	struct mm_struct * mm = get_task_mm(task);</div><div class='add'>+	struct mm_struct *mm = get_task_mm(task);</div><div class='ctx'> 	if (mm)</div><div class='ctx'> 		down_read(&amp;mm-&gt;mmap_sem);</div><div class='ctx'> 	return mm;</div><div class='hunk'>@@ -383,10 +465,10 @@ static inline int is_code(unsigned long val)</div><div class='ctx'> {</div><div class='ctx'> 	return val == ESCAPE_CODE;</div><div class='ctx'> }</div><div class='del'>- </div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> /* "acquire" as many cpu buffer slots as we can */</div><div class='del'>-static unsigned long get_slots(struct oprofile_cpu_buffer * b)</div><div class='add'>+static unsigned long get_slots(struct oprofile_cpu_buffer *b)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long head = b-&gt;head_pos;</div><div class='ctx'> 	unsigned long tail = b-&gt;tail_pos;</div><div class='hunk'>@@ -412,19 +494,6 @@ static unsigned long get_slots(struct oprofile_cpu_buffer * b)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static void increment_tail(struct oprofile_cpu_buffer * b)</div><div class='del'>-{</div><div class='del'>-	unsigned long new_tail = b-&gt;tail_pos + 1;</div><div class='del'>-</div><div class='del'>-	rmb();</div><div class='del'>-</div><div class='del'>-	if (new_tail &lt; b-&gt;buffer_size)</div><div class='del'>-		b-&gt;tail_pos = new_tail;</div><div class='del'>-	else</div><div class='del'>-		b-&gt;tail_pos = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> /* Move tasks along towards death. Any tasks on dead_tasks</div><div class='ctx'>  * will definitely have no remaining references in any</div><div class='ctx'>  * CPU buffers at this point, because we use two lists,</div><div class='hunk'>@@ -435,8 +504,8 @@ static void process_task_mortuary(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	LIST_HEAD(local_dead_tasks);</div><div class='del'>-	struct task_struct * task;</div><div class='del'>-	struct task_struct * ttask;</div><div class='add'>+	struct task_struct *task;</div><div class='add'>+	struct task_struct *ttask;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;task_mortuary, flags);</div><div class='ctx'> </div><div class='hunk'>@@ -493,7 +562,7 @@ void sync_buffer(int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	struct oprofile_cpu_buffer *cpu_buf = &amp;per_cpu(cpu_buffer, cpu);</div><div class='ctx'> 	struct mm_struct *mm = NULL;</div><div class='del'>-	struct task_struct * new;</div><div class='add'>+	struct task_struct *new;</div><div class='ctx'> 	unsigned long cookie = 0;</div><div class='ctx'> 	int in_kernel = 1;</div><div class='ctx'> 	unsigned int i;</div><div class='hunk'>@@ -501,7 +570,7 @@ void sync_buffer(int cpu)</div><div class='ctx'> 	unsigned long available;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;buffer_mutex);</div><div class='del'>- </div><div class='add'>+</div><div class='ctx'> 	add_cpu_switch(cpu);</div><div class='ctx'> </div><div class='ctx'> 	/* Remember, only we can modify tail_pos */</div><div class='hunk'>@@ -509,8 +578,8 @@ void sync_buffer(int cpu)</div><div class='ctx'> 	available = get_slots(cpu_buf);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; available; ++i) {</div><div class='del'>-		struct op_sample * s = &amp;cpu_buf-&gt;buffer[cpu_buf-&gt;tail_pos];</div><div class='del'>- </div><div class='add'>+		struct op_sample *s = &amp;cpu_buf-&gt;buffer[cpu_buf-&gt;tail_pos];</div><div class='add'>+</div><div class='ctx'> 		if (is_code(s-&gt;eip)) {</div><div class='ctx'> 			if (s-&gt;event &lt;= CPU_IS_KERNEL) {</div><div class='ctx'> 				/* kernel/userspace switch */</div><div class='hunk'>@@ -521,8 +590,18 @@ void sync_buffer(int cpu)</div><div class='ctx'> 			} else if (s-&gt;event == CPU_TRACE_BEGIN) {</div><div class='ctx'> 				state = sb_bt_start;</div><div class='ctx'> 				add_trace_begin();</div><div class='add'>+#ifdef CONFIG_OPROFILE_IBS</div><div class='add'>+			} else if (s-&gt;event == IBS_FETCH_BEGIN) {</div><div class='add'>+				state = sb_bt_start;</div><div class='add'>+				add_ibs_begin(cpu_buf,</div><div class='add'>+					IBS_FETCH_CODE, in_kernel, mm);</div><div class='add'>+			} else if (s-&gt;event == IBS_OP_BEGIN) {</div><div class='add'>+				state = sb_bt_start;</div><div class='add'>+				add_ibs_begin(cpu_buf,</div><div class='add'>+					IBS_OP_CODE, in_kernel, mm);</div><div class='add'>+#endif</div><div class='ctx'> 			} else {</div><div class='del'>-				struct mm_struct * oldmm = mm;</div><div class='add'>+				struct mm_struct *oldmm = mm;</div><div class='ctx'> </div><div class='ctx'> 				/* userspace context switch */</div><div class='ctx'> 				new = (struct task_struct *)s-&gt;event;</div><div class='hunk'>@@ -533,13 +612,11 @@ void sync_buffer(int cpu)</div><div class='ctx'> 					cookie = get_exec_dcookie(mm);</div><div class='ctx'> 				add_user_ctx_switch(new, cookie);</div><div class='ctx'> 			}</div><div class='del'>-		} else {</div><div class='del'>-			if (state &gt;= sb_bt_start &amp;&amp;</div><div class='del'>-			    !add_sample(mm, s, in_kernel)) {</div><div class='del'>-				if (state == sb_bt_start) {</div><div class='del'>-					state = sb_bt_ignore;</div><div class='del'>-					atomic_inc(&amp;oprofile_stats.bt_lost_no_mapping);</div><div class='del'>-				}</div><div class='add'>+		} else if (state &gt;= sb_bt_start &amp;&amp;</div><div class='add'>+			   !add_sample(mm, s, in_kernel)) {</div><div class='add'>+			if (state == sb_bt_start) {</div><div class='add'>+				state = sb_bt_ignore;</div><div class='add'>+				atomic_inc(&amp;oprofile_stats.bt_lost_no_mapping);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/oprofile/cpu_buffer.c b/drivers/oprofile/cpu_buffer.c<br/>index 7ba78e6d210e..e1bd5a937f6c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/oprofile/cpu_buffer.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/oprofile/cpu_buffer.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/oprofile/cpu_buffer.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/oprofile/cpu_buffer.c</a></div><div class='hunk'>@@ -5,6 +5,7 @@</div><div class='ctx'>  * @remark Read the file COPYING</div><div class='ctx'>  *</div><div class='ctx'>  * @author John Levon &lt;levon@movementarian.org&gt;</div><div class='add'>+ * @author Barry Kasindorf &lt;barry.kasindorf@amd.com&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * Each CPU has a local buffer that stores PC value/event</div><div class='ctx'>  * pairs. We also log context switches when we notice them.</div><div class='hunk'>@@ -209,7 +210,7 @@ static int log_sample(struct oprofile_cpu_buffer * cpu_buf, unsigned long pc,</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int oprofile_begin_trace(struct oprofile_cpu_buffer * cpu_buf)</div><div class='add'>+static int oprofile_begin_trace(struct oprofile_cpu_buffer *cpu_buf)</div><div class='ctx'> {</div><div class='ctx'> 	if (nr_available_slots(cpu_buf) &lt; 4) {</div><div class='ctx'> 		cpu_buf-&gt;sample_lost_overflow++;</div><div class='hunk'>@@ -254,6 +255,75 @@ void oprofile_add_sample(struct pt_regs * const regs, unsigned long event)</div><div class='ctx'> 	oprofile_add_ext_sample(pc, regs, event, is_kernel);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_OPROFILE_IBS</div><div class='add'>+</div><div class='add'>+#define MAX_IBS_SAMPLE_SIZE	14</div><div class='add'>+static int log_ibs_sample(struct oprofile_cpu_buffer *cpu_buf,</div><div class='add'>+	unsigned long pc, int is_kernel, unsigned  int *ibs, int ibs_code)</div><div class='add'>+{</div><div class='add'>+	struct task_struct *task;</div><div class='add'>+</div><div class='add'>+	cpu_buf-&gt;sample_received++;</div><div class='add'>+</div><div class='add'>+	if (nr_available_slots(cpu_buf) &lt; MAX_IBS_SAMPLE_SIZE) {</div><div class='add'>+		cpu_buf-&gt;sample_lost_overflow++;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	is_kernel = !!is_kernel;</div><div class='add'>+</div><div class='add'>+	/* notice a switch from user-&gt;kernel or vice versa */</div><div class='add'>+	if (cpu_buf-&gt;last_is_kernel != is_kernel) {</div><div class='add'>+		cpu_buf-&gt;last_is_kernel = is_kernel;</div><div class='add'>+		add_code(cpu_buf, is_kernel);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* notice a task switch */</div><div class='add'>+	if (!is_kernel) {</div><div class='add'>+		task = current;</div><div class='add'>+</div><div class='add'>+		if (cpu_buf-&gt;last_task != task) {</div><div class='add'>+			cpu_buf-&gt;last_task = task;</div><div class='add'>+			add_code(cpu_buf, (unsigned long)task);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	add_code(cpu_buf, ibs_code);</div><div class='add'>+	add_sample(cpu_buf, ibs[0], ibs[1]);</div><div class='add'>+	add_sample(cpu_buf, ibs[2], ibs[3]);</div><div class='add'>+	add_sample(cpu_buf, ibs[4], ibs[5]);</div><div class='add'>+</div><div class='add'>+	if (ibs_code == IBS_OP_BEGIN) {</div><div class='add'>+	add_sample(cpu_buf, ibs[6], ibs[7]);</div><div class='add'>+	add_sample(cpu_buf, ibs[8], ibs[9]);</div><div class='add'>+	add_sample(cpu_buf, ibs[10], ibs[11]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void oprofile_add_ibs_sample(struct pt_regs *const regs,</div><div class='add'>+				unsigned int * const ibs_sample, u8 code)</div><div class='add'>+{</div><div class='add'>+	int is_kernel = !user_mode(regs);</div><div class='add'>+	unsigned long pc = profile_pc(regs);</div><div class='add'>+</div><div class='add'>+	struct oprofile_cpu_buffer *cpu_buf =</div><div class='add'>+			 &amp;per_cpu(cpu_buffer, smp_processor_id());</div><div class='add'>+</div><div class='add'>+	if (!backtrace_depth) {</div><div class='add'>+		log_ibs_sample(cpu_buf, pc, is_kernel, ibs_sample, code);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* if log_sample() fails we can't backtrace since we lost the source</div><div class='add'>+	* of this event */</div><div class='add'>+	if (log_ibs_sample(cpu_buf, pc, is_kernel, ibs_sample, code))</div><div class='add'>+		oprofile_ops.backtrace(regs, backtrace_depth);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> void oprofile_add_pc(unsigned long pc, int is_kernel, unsigned long event)</div><div class='ctx'> {</div><div class='ctx'> 	struct oprofile_cpu_buffer *cpu_buf = &amp;__get_cpu_var(cpu_buffer);</div><div class='hunk'>@@ -296,7 +366,7 @@ static void wq_sync_buffer(struct work_struct *work)</div><div class='ctx'> 	struct oprofile_cpu_buffer * b =</div><div class='ctx'> 		container_of(work, struct oprofile_cpu_buffer, work.work);</div><div class='ctx'> 	if (b-&gt;cpu != smp_processor_id()) {</div><div class='del'>-		printk("WQ on CPU%d, prefer CPU%d\n",</div><div class='add'>+		printk(KERN_DEBUG "WQ on CPU%d, prefer CPU%d\n",</div><div class='ctx'> 		       smp_processor_id(), b-&gt;cpu);</div><div class='ctx'> 	}</div><div class='ctx'> 	sync_buffer(b-&gt;cpu);</div><div class='head'>diff --git a/drivers/oprofile/cpu_buffer.h b/drivers/oprofile/cpu_buffer.h<br/>index c3e366b52261..9c44d004da69 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/oprofile/cpu_buffer.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/oprofile/cpu_buffer.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/oprofile/cpu_buffer.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/oprofile/cpu_buffer.h</a></div><div class='hunk'>@@ -55,5 +55,7 @@ void cpu_buffer_reset(struct oprofile_cpu_buffer * cpu_buf);</div><div class='ctx'> /* transient events for the CPU buffer -&gt; event buffer */</div><div class='ctx'> #define CPU_IS_KERNEL 1</div><div class='ctx'> #define CPU_TRACE_BEGIN 2</div><div class='add'>+#define IBS_FETCH_BEGIN 3</div><div class='add'>+#define IBS_OP_BEGIN    4</div><div class='ctx'> </div><div class='ctx'> #endif /* OPROFILE_CPU_BUFFER_H */</div><div class='head'>diff --git a/drivers/parport/ChangeLog b/drivers/parport/ChangeLog<br/>index db717c1d62a5..8565bbbeb6ec 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/parport/ChangeLog?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/parport/ChangeLog</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/parport/ChangeLog?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/parport/ChangeLog</a></div><div class='hunk'>@@ -311,7 +311,7 @@</div><div class='ctx'> 	* ieee1284_ops.c (parport_ieee1284_read_nibble): Reset nAutoFd</div><div class='ctx'> 	on timeout.  Matches 2.2.x behaviour.</div><div class='ctx'> </div><div class='del'>-2001-03-02  Andrew Morton &lt;andrewm@uow.edu.au&gt;</div><div class='add'>+2001-03-02  Andrew Morton</div><div class='ctx'> </div><div class='ctx'> 	* parport_pc.c (registered_parport): New static variable.</div><div class='ctx'> 	(parport_pc_find_ports): Set it when we register PCI driver.</div><div class='head'>diff --git a/drivers/parport/ieee1284.c b/drivers/parport/ieee1284.c<br/>index e97059415ab4..ac2a805ac7ea 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/parport/ieee1284.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/parport/ieee1284.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/parport/ieee1284.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/parport/ieee1284.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* $Id: parport_ieee1284.c,v 1.4 1997/10/19 21:37:21 philip Exp $</div><div class='add'>+/*</div><div class='ctx'>  * IEEE-1284 implementation for parport.</div><div class='ctx'>  *</div><div class='ctx'>  * Authors: Phil Blundell &lt;philb@gnu.org&gt;</div><div class='head'>diff --git a/drivers/parport/parport_cs.c b/drivers/parport/parport_cs.c<br/>index 00e1d9620f7c..b1899e9c1f65 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/parport/parport_cs.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/parport/parport_cs.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/parport/parport_cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/parport/parport_cs.c</a></div><div class='hunk'>@@ -149,52 +149,44 @@ static void parport_detach(struct pcmcia_device *link)</div><div class='ctx'> #define CS_CHECK(fn, ret) \</div><div class='ctx'> do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)</div><div class='ctx'> </div><div class='add'>+static int parport_config_check(struct pcmcia_device *p_dev,</div><div class='add'>+				cistpl_cftable_entry_t *cfg,</div><div class='add'>+				cistpl_cftable_entry_t *dflt,</div><div class='add'>+				unsigned int vcc,</div><div class='add'>+				void *priv_data)</div><div class='add'>+{</div><div class='add'>+	if ((cfg-&gt;io.nwin &gt; 0) || (dflt-&gt;io.nwin &gt; 0)) {</div><div class='add'>+		cistpl_io_t *io = (cfg-&gt;io.nwin) ? &amp;cfg-&gt;io : &amp;dflt-&gt;io;</div><div class='add'>+		if (epp_mode)</div><div class='add'>+			p_dev-&gt;conf.ConfigIndex |= FORCE_EPP_MODE;</div><div class='add'>+		p_dev-&gt;io.BasePort1 = io-&gt;win[0].base;</div><div class='add'>+		p_dev-&gt;io.NumPorts1 = io-&gt;win[0].len;</div><div class='add'>+		p_dev-&gt;io.IOAddrLines = io-&gt;flags &amp; CISTPL_IO_LINES_MASK;</div><div class='add'>+		if (io-&gt;nwin == 2) {</div><div class='add'>+			p_dev-&gt;io.BasePort2 = io-&gt;win[1].base;</div><div class='add'>+			p_dev-&gt;io.NumPorts2 = io-&gt;win[1].len;</div><div class='add'>+		}</div><div class='add'>+		if (pcmcia_request_io(p_dev, &amp;p_dev-&gt;io) != 0)</div><div class='add'>+			return -ENODEV;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int parport_config(struct pcmcia_device *link)</div><div class='ctx'> {</div><div class='ctx'>     parport_info_t *info = link-&gt;priv;</div><div class='del'>-    tuple_t tuple;</div><div class='del'>-    u_short buf[128];</div><div class='del'>-    cisparse_t parse;</div><div class='del'>-    cistpl_cftable_entry_t *cfg = &amp;parse.cftable_entry;</div><div class='del'>-    cistpl_cftable_entry_t dflt = { 0 };</div><div class='ctx'>     struct parport *p;</div><div class='ctx'>     int last_ret, last_fn;</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     DEBUG(0, "parport_config(0x%p)\n", link);</div><div class='del'>-    </div><div class='del'>-    tuple.TupleData = (cisdata_t *)buf;</div><div class='del'>-    tuple.TupleOffset = 0; tuple.TupleDataMax = 255;</div><div class='del'>-    tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;</div><div class='del'>-    tuple.Attributes = 0;</div><div class='del'>-    CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &amp;tuple));</div><div class='del'>-    while (1) {</div><div class='del'>-	if (pcmcia_get_tuple_data(link, &amp;tuple) != 0 ||</div><div class='del'>-		pcmcia_parse_tuple(link, &amp;tuple, &amp;parse) != 0)</div><div class='del'>-	    goto next_entry;</div><div class='del'>-</div><div class='del'>-	if ((cfg-&gt;io.nwin &gt; 0) || (dflt.io.nwin &gt; 0)) {</div><div class='del'>-	    cistpl_io_t *io = (cfg-&gt;io.nwin) ? &amp;cfg-&gt;io : &amp;dflt.io;</div><div class='del'>-	    link-&gt;conf.ConfigIndex = cfg-&gt;index;</div><div class='del'>-	    if (epp_mode)</div><div class='del'>-		link-&gt;conf.ConfigIndex |= FORCE_EPP_MODE;</div><div class='del'>-	    link-&gt;io.BasePort1 = io-&gt;win[0].base;</div><div class='del'>-	    link-&gt;io.NumPorts1 = io-&gt;win[0].len;</div><div class='del'>-	    link-&gt;io.IOAddrLines = io-&gt;flags &amp; CISTPL_IO_LINES_MASK;</div><div class='del'>-	    if (io-&gt;nwin == 2) {</div><div class='del'>-		link-&gt;io.BasePort2 = io-&gt;win[1].base;</div><div class='del'>-		link-&gt;io.NumPorts2 = io-&gt;win[1].len;</div><div class='del'>-	    }</div><div class='del'>-	    if (pcmcia_request_io(link, &amp;link-&gt;io) != 0)</div><div class='del'>-		goto next_entry;</div><div class='del'>-	    /* If we've got this far, we're done */</div><div class='del'>-	    break;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-    next_entry:</div><div class='del'>-	if (cfg-&gt;flags &amp; CISTPL_CFTABLE_DEFAULT) dflt = *cfg;</div><div class='del'>-	CS_CHECK(GetNextTuple, pcmcia_get_next_tuple(link, &amp;tuple));</div><div class='add'>+</div><div class='add'>+    last_ret = pcmcia_loop_config(link, parport_config_check, NULL);</div><div class='add'>+    if (last_ret) {</div><div class='add'>+	    cs_error(link, RequestIO, last_ret);</div><div class='add'>+	    goto failed;</div><div class='ctx'>     }</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &amp;link-&gt;irq));</div><div class='ctx'>     CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &amp;link-&gt;conf));</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/parport/parport_sunbpp.c b/drivers/parport/parport_sunbpp.c<br/>index 9d595aa91e46..065f229580d5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/parport/parport_sunbpp.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/parport/parport_sunbpp.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/parport/parport_sunbpp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/parport/parport_sunbpp.c</a></div><div class='hunk'>@@ -26,6 +26,8 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/parport.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -34,7 +36,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/oplib.h&gt;           /* OpenProm Library */</div><div class='del'>-#include &lt;asm/sbus.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;             /* BPP uses LSI 64854 for DMA */</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/sunbpp.h&gt;</div><div class='hunk'>@@ -285,38 +286,37 @@ static struct parport_operations parport_sunbpp_ops =</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __devinit init_one_port(struct sbus_dev *sdev)</div><div class='add'>+static int __devinit bpp_probe(struct of_device *op, const struct of_device_id *match)</div><div class='ctx'> {</div><div class='del'>-	struct parport *p;</div><div class='del'>-	/* at least in theory there may be a "we don't dma" case */</div><div class='ctx'> 	struct parport_operations *ops;</div><div class='del'>-	void __iomem *base;</div><div class='del'>-	int irq, dma, err = 0, size;</div><div class='ctx'> 	struct bpp_regs __iomem *regs;</div><div class='add'>+	int irq, dma, err = 0, size;</div><div class='ctx'> 	unsigned char value_tcr;</div><div class='add'>+	void __iomem *base;</div><div class='add'>+	struct parport *p;</div><div class='ctx'> </div><div class='del'>-	irq = sdev-&gt;irqs[0];</div><div class='del'>-	base = sbus_ioremap(&amp;sdev-&gt;resource[0], 0,</div><div class='del'>-			    sdev-&gt;reg_addrs[0].reg_size, </div><div class='del'>-			    "sunbpp");</div><div class='add'>+	irq = op-&gt;irqs[0];</div><div class='add'>+	base = of_ioremap(&amp;op-&gt;resource[0], 0,</div><div class='add'>+			  resource_size(&amp;op-&gt;resource[0]),</div><div class='add'>+			  "sunbpp");</div><div class='ctx'> 	if (!base)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	size = sdev-&gt;reg_addrs[0].reg_size;</div><div class='add'>+	size = resource_size(&amp;op-&gt;resource[0]);</div><div class='ctx'> 	dma = PARPORT_DMA_NONE;</div><div class='ctx'> </div><div class='ctx'> 	ops = kmalloc(sizeof(struct parport_operations), GFP_KERNEL);</div><div class='ctx'>         if (!ops)</div><div class='ctx'> 		goto out_unmap;</div><div class='ctx'> </div><div class='del'>-        memcpy (ops, &amp;parport_sunbpp_ops, sizeof (struct parport_operations));</div><div class='add'>+        memcpy (ops, &amp;parport_sunbpp_ops, sizeof(struct parport_operations));</div><div class='ctx'> </div><div class='ctx'> 	dprintk(("register_port\n"));</div><div class='ctx'> 	if (!(p = parport_register_port((unsigned long)base, irq, dma, ops)))</div><div class='ctx'> 		goto out_free_ops;</div><div class='ctx'> </div><div class='ctx'> 	p-&gt;size = size;</div><div class='del'>-	p-&gt;dev = &amp;sdev-&gt;ofdev.dev;</div><div class='add'>+	p-&gt;dev = &amp;op-&gt;dev;</div><div class='ctx'> </div><div class='ctx'> 	if ((err = request_irq(p-&gt;irq, parport_irq_handler,</div><div class='ctx'> 			       IRQF_SHARED, p-&gt;name, p)) != 0) {</div><div class='hunk'>@@ -333,7 +333,7 @@ static int __devinit init_one_port(struct sbus_dev *sdev)</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_INFO "%s: sunbpp at 0x%lx\n", p-&gt;name, p-&gt;base);</div><div class='ctx'> </div><div class='del'>-	dev_set_drvdata(&amp;sdev-&gt;ofdev.dev, p);</div><div class='add'>+	dev_set_drvdata(&amp;op-&gt;dev, p);</div><div class='ctx'> </div><div class='ctx'> 	parport_announce_port(p);</div><div class='ctx'> </div><div class='hunk'>@@ -346,21 +346,14 @@ out_free_ops:</div><div class='ctx'> 	kfree(ops);</div><div class='ctx'> </div><div class='ctx'> out_unmap:</div><div class='del'>-	sbus_iounmap(base, size);</div><div class='add'>+	of_iounmap(&amp;op-&gt;resource[0], base, size);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit bpp_probe(struct of_device *dev, const struct of_device_id *match)</div><div class='del'>-{</div><div class='del'>-	struct sbus_dev *sdev = to_sbus_device(&amp;dev-&gt;dev);</div><div class='del'>-</div><div class='del'>-	return init_one_port(sdev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __devexit bpp_remove(struct of_device *dev)</div><div class='add'>+static int __devexit bpp_remove(struct of_device *op)</div><div class='ctx'> {</div><div class='del'>-	struct parport *p = dev_get_drvdata(&amp;dev-&gt;dev);</div><div class='add'>+	struct parport *p = dev_get_drvdata(&amp;op-&gt;dev);</div><div class='ctx'> 	struct parport_operations *ops = p-&gt;ops;</div><div class='ctx'> </div><div class='ctx'> 	parport_remove_port(p);</div><div class='hunk'>@@ -370,16 +363,16 @@ static int __devexit bpp_remove(struct of_device *dev)</div><div class='ctx'> 		free_irq(p-&gt;irq, p);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	sbus_iounmap((void __iomem *) p-&gt;base, p-&gt;size);</div><div class='add'>+	of_iounmap(&amp;op-&gt;resource[0], (void __iomem *) p-&gt;base, p-&gt;size);</div><div class='ctx'> 	parport_put_port(p);</div><div class='ctx'> 	kfree(ops);</div><div class='ctx'> </div><div class='del'>-	dev_set_drvdata(&amp;dev-&gt;dev, NULL);</div><div class='add'>+	dev_set_drvdata(&amp;op-&gt;dev, NULL);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct of_device_id bpp_match[] = {</div><div class='add'>+static const struct of_device_id bpp_match[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.name = "SUNW,bpp",</div><div class='ctx'> 	},</div><div class='hunk'>@@ -397,7 +390,7 @@ static struct of_platform_driver bpp_sbus_driver = {</div><div class='ctx'> </div><div class='ctx'> static int __init parport_sunbpp_init(void)</div><div class='ctx'> {</div><div class='del'>-	return of_register_driver(&amp;bpp_sbus_driver, &amp;sbus_bus_type);</div><div class='add'>+	return of_register_driver(&amp;bpp_sbus_driver, &amp;of_bus_type);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit parport_sunbpp_exit(void)</div><div class='head'>diff --git a/drivers/parport/probe.c b/drivers/parport/probe.c<br/>index cd565bb4e1a9..0f6550719bcf 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/parport/probe.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/parport/probe.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/parport/probe.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/parport/probe.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* $Id: parport_probe.c,v 1.1 1999/07/03 08:56:17 davem Exp $</div><div class='add'>+/*</div><div class='ctx'>  * Parallel port device probing code</div><div class='ctx'>  *</div><div class='ctx'>  * Authors:    Carsten Gross, carsten@sol.wohnheim.uni-ulm.de</div><div class='head'>diff --git a/drivers/parport/share.c b/drivers/parport/share.c<br/>index a8a62bbbb576..0ebca450ed29 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/parport/share.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/parport/share.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/parport/share.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/parport/share.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* $Id: parport_share.c,v 1.15 1998/01/11 12:06:17 philip Exp $</div><div class='add'>+/*</div><div class='ctx'>  * Parallel-port resource manager code.</div><div class='ctx'>  * </div><div class='ctx'>  * Authors: David Campbell &lt;campbell@tirian.che.curtin.edu.au&gt;</div><div class='head'>diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile<br/>index 7d63f8ced24b..4b47f4ece5b7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pci/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/pci/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pci/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pci/Makefile</a></div><div class='hunk'>@@ -26,6 +26,8 @@ obj-$(CONFIG_HT_IRQ) += htirq.o</div><div class='ctx'> # Build Intel IOMMU support</div><div class='ctx'> obj-$(CONFIG_DMAR) += dmar.o iova.o intel-iommu.o</div><div class='ctx'> </div><div class='add'>+obj-$(CONFIG_INTR_REMAP) += dmar.o intr_remapping.o</div><div class='add'>+</div><div class='ctx'> #</div><div class='ctx'> # Some architectures use the generic PCI setup functions</div><div class='ctx'> #</div><div class='head'>diff --git a/drivers/pci/dmar.c b/drivers/pci/dmar.c<br/>index 8bf86ae2333f..e842e756308a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pci/dmar.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/pci/dmar.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pci/dmar.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pci/dmar.c</a></div><div class='hunk'>@@ -19,15 +19,18 @@</div><div class='ctx'>  * Author: Shaohua Li &lt;shaohua.li@intel.com&gt;</div><div class='ctx'>  * Author: Anil S Keshavamurthy &lt;anil.s.keshavamurthy@intel.com&gt;</div><div class='ctx'>  *</div><div class='del'>- * This file implements early detection/parsing of DMA Remapping Devices</div><div class='add'>+ * This file implements early detection/parsing of Remapping Devices</div><div class='ctx'>  * reported to OS through BIOS via DMA remapping reporting (DMAR) ACPI</div><div class='ctx'>  * tables.</div><div class='add'>+ *</div><div class='add'>+ * These routines are used by both DMA-remapping and Interrupt-remapping</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/dmar.h&gt;</div><div class='del'>-#include "iova.h"</div><div class='del'>-#include "intel-iommu.h"</div><div class='add'>+#include &lt;linux/iova.h&gt;</div><div class='add'>+#include &lt;linux/intel-iommu.h&gt;</div><div class='add'>+#include &lt;linux/timer.h&gt;</div><div class='ctx'> </div><div class='ctx'> #undef PREFIX</div><div class='ctx'> #define PREFIX "DMAR:"</div><div class='hunk'>@@ -37,7 +40,6 @@</div><div class='ctx'>  * these units are not supported by the architecture.</div><div class='ctx'>  */</div><div class='ctx'> LIST_HEAD(dmar_drhd_units);</div><div class='del'>-LIST_HEAD(dmar_rmrr_units);</div><div class='ctx'> </div><div class='ctx'> static struct acpi_table_header * __initdata dmar_tbl;</div><div class='ctx'> </div><div class='hunk'>@@ -53,11 +55,6 @@ static void __init dmar_register_drhd_unit(struct dmar_drhd_unit *drhd)</div><div class='ctx'> 		list_add(&amp;drhd-&gt;list, &amp;dmar_drhd_units);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __init dmar_register_rmrr_unit(struct dmar_rmrr_unit *rmrr)</div><div class='del'>-{</div><div class='del'>-	list_add(&amp;rmrr-&gt;list, &amp;dmar_rmrr_units);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int __init dmar_parse_one_dev_scope(struct acpi_dmar_device_scope *scope,</div><div class='ctx'> 					   struct pci_dev **dev, u16 segment)</div><div class='ctx'> {</div><div class='hunk'>@@ -172,19 +169,37 @@ dmar_parse_one_drhd(struct acpi_dmar_header *header)</div><div class='ctx'> 	struct acpi_dmar_hardware_unit *drhd;</div><div class='ctx'> 	struct dmar_drhd_unit *dmaru;</div><div class='ctx'> 	int ret = 0;</div><div class='del'>-	static int include_all;</div><div class='ctx'> </div><div class='ctx'> 	dmaru = kzalloc(sizeof(*dmaru), GFP_KERNEL);</div><div class='ctx'> 	if (!dmaru)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='add'>+	dmaru-&gt;hdr = header;</div><div class='ctx'> 	drhd = (struct acpi_dmar_hardware_unit *)header;</div><div class='ctx'> 	dmaru-&gt;reg_base_addr = drhd-&gt;address;</div><div class='ctx'> 	dmaru-&gt;include_all = drhd-&gt;flags &amp; 0x1; /* BIT0: INCLUDE_ALL */</div><div class='ctx'> </div><div class='add'>+	ret = alloc_iommu(dmaru);</div><div class='add'>+	if (ret) {</div><div class='add'>+		kfree(dmaru);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+	dmar_register_drhd_unit(dmaru);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init</div><div class='add'>+dmar_parse_dev(struct dmar_drhd_unit *dmaru)</div><div class='add'>+{</div><div class='add'>+	struct acpi_dmar_hardware_unit *drhd;</div><div class='add'>+	static int include_all;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	drhd = (struct acpi_dmar_hardware_unit *) dmaru-&gt;hdr;</div><div class='add'>+</div><div class='ctx'> 	if (!dmaru-&gt;include_all)</div><div class='ctx'> 		ret = dmar_parse_dev_scope((void *)(drhd + 1),</div><div class='del'>-				((void *)drhd) + header-&gt;length,</div><div class='add'>+				((void *)drhd) + drhd-&gt;header.length,</div><div class='ctx'> 				&amp;dmaru-&gt;devices_cnt, &amp;dmaru-&gt;devices,</div><div class='ctx'> 				drhd-&gt;segment);</div><div class='ctx'> 	else {</div><div class='hunk'>@@ -197,37 +212,59 @@ dmar_parse_one_drhd(struct acpi_dmar_header *header)</div><div class='ctx'> 		include_all = 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (ret || (dmaru-&gt;devices_cnt == 0 &amp;&amp; !dmaru-&gt;include_all))</div><div class='add'>+	if (ret || (dmaru-&gt;devices_cnt == 0 &amp;&amp; !dmaru-&gt;include_all)) {</div><div class='add'>+		list_del(&amp;dmaru-&gt;list);</div><div class='ctx'> 		kfree(dmaru);</div><div class='del'>-	else</div><div class='del'>-		dmar_register_drhd_unit(dmaru);</div><div class='add'>+	}</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_DMAR</div><div class='add'>+LIST_HEAD(dmar_rmrr_units);</div><div class='add'>+</div><div class='add'>+static void __init dmar_register_rmrr_unit(struct dmar_rmrr_unit *rmrr)</div><div class='add'>+{</div><div class='add'>+	list_add(&amp;rmrr-&gt;list, &amp;dmar_rmrr_units);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> static int __init</div><div class='ctx'> dmar_parse_one_rmrr(struct acpi_dmar_header *header)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_dmar_reserved_memory *rmrr;</div><div class='ctx'> 	struct dmar_rmrr_unit *rmrru;</div><div class='del'>-	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	rmrru = kzalloc(sizeof(*rmrru), GFP_KERNEL);</div><div class='ctx'> 	if (!rmrru)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='add'>+	rmrru-&gt;hdr = header;</div><div class='ctx'> 	rmrr = (struct acpi_dmar_reserved_memory *)header;</div><div class='ctx'> 	rmrru-&gt;base_address = rmrr-&gt;base_address;</div><div class='ctx'> 	rmrru-&gt;end_address = rmrr-&gt;end_address;</div><div class='add'>+</div><div class='add'>+	dmar_register_rmrr_unit(rmrru);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init</div><div class='add'>+rmrr_parse_dev(struct dmar_rmrr_unit *rmrru)</div><div class='add'>+{</div><div class='add'>+	struct acpi_dmar_reserved_memory *rmrr;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	rmrr = (struct acpi_dmar_reserved_memory *) rmrru-&gt;hdr;</div><div class='ctx'> 	ret = dmar_parse_dev_scope((void *)(rmrr + 1),</div><div class='del'>-		((void *)rmrr) + header-&gt;length,</div><div class='add'>+		((void *)rmrr) + rmrr-&gt;header.length,</div><div class='ctx'> 		&amp;rmrru-&gt;devices_cnt, &amp;rmrru-&gt;devices, rmrr-&gt;segment);</div><div class='ctx'> </div><div class='del'>-	if (ret || (rmrru-&gt;devices_cnt == 0))</div><div class='add'>+	if (ret || (rmrru-&gt;devices_cnt == 0)) {</div><div class='add'>+		list_del(&amp;rmrru-&gt;list);</div><div class='ctx'> 		kfree(rmrru);</div><div class='del'>-	else</div><div class='del'>-		dmar_register_rmrr_unit(rmrru);</div><div class='add'>+	}</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> static void __init</div><div class='ctx'> dmar_table_print_dmar_entry(struct acpi_dmar_header *header)</div><div class='hunk'>@@ -252,6 +289,7 @@ dmar_table_print_dmar_entry(struct acpi_dmar_header *header)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * parse_dmar_table - parses the DMA reporting table</div><div class='ctx'>  */</div><div class='hunk'>@@ -284,7 +322,9 @@ parse_dmar_table(void)</div><div class='ctx'> 			ret = dmar_parse_one_drhd(entry_header);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case ACPI_DMAR_TYPE_RESERVED_MEMORY:</div><div class='add'>+#ifdef CONFIG_DMAR</div><div class='ctx'> 			ret = dmar_parse_one_rmrr(entry_header);</div><div class='add'>+#endif</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			printk(KERN_WARNING PREFIX</div><div class='hunk'>@@ -300,15 +340,77 @@ parse_dmar_table(void)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int dmar_pci_device_match(struct pci_dev *devices[], int cnt,</div><div class='add'>+			  struct pci_dev *dev)</div><div class='add'>+{</div><div class='add'>+	int index;</div><div class='add'>+</div><div class='add'>+	while (dev) {</div><div class='add'>+		for (index = 0; index &lt; cnt; index++)</div><div class='add'>+			if (dev == devices[index])</div><div class='add'>+				return 1;</div><div class='ctx'> </div><div class='del'>-int __init dmar_table_init(void)</div><div class='add'>+		/* Check our parent */</div><div class='add'>+		dev = dev-&gt;bus-&gt;self;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct dmar_drhd_unit *</div><div class='add'>+dmar_find_matched_drhd_unit(struct pci_dev *dev)</div><div class='ctx'> {</div><div class='add'>+	struct dmar_drhd_unit *drhd = NULL;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(drhd, &amp;dmar_drhd_units, list) {</div><div class='add'>+		if (drhd-&gt;include_all || dmar_pci_device_match(drhd-&gt;devices,</div><div class='add'>+						drhd-&gt;devices_cnt, dev))</div><div class='add'>+			return drhd;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int __init dmar_dev_scope_init(void)</div><div class='add'>+{</div><div class='add'>+	struct dmar_drhd_unit *drhd;</div><div class='add'>+	int ret = -ENODEV;</div><div class='add'>+</div><div class='add'>+	for_each_drhd_unit(drhd) {</div><div class='add'>+		ret = dmar_parse_dev(drhd);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_DMAR</div><div class='add'>+	{</div><div class='add'>+		struct dmar_rmrr_unit *rmrr;</div><div class='add'>+		for_each_rmrr_units(rmrr) {</div><div class='add'>+			ret = rmrr_parse_dev(rmrr);</div><div class='add'>+			if (ret)</div><div class='add'>+				return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+int __init dmar_table_init(void)</div><div class='add'>+{</div><div class='add'>+	static int dmar_table_initialized;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	if (dmar_table_initialized)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	dmar_table_initialized = 1;</div><div class='add'>+</div><div class='ctx'> 	ret = parse_dmar_table();</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		printk(KERN_INFO PREFIX "parse DMAR table failure.\n");</div><div class='add'>+		if (ret != -ENODEV)</div><div class='add'>+			printk(KERN_INFO PREFIX "parse DMAR table failure.\n");</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -317,9 +419,14 @@ int __init dmar_table_init(void)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_DMAR</div><div class='ctx'> 	if (list_empty(&amp;dmar_rmrr_units))</div><div class='ctx'> 		printk(KERN_INFO PREFIX "No RMRR found\n");</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_INTR_REMAP</div><div class='add'>+	parse_ioapics_under_ir();</div><div class='add'>+#endif</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -341,3 +448,255 @@ int __init early_dmar_detect(void)</div><div class='ctx'> </div><div class='ctx'> 	return (ACPI_SUCCESS(status) ? 1 : 0);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+void __init detect_intel_iommu(void)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = early_dmar_detect();</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_DMAR</div><div class='add'>+	{</div><div class='add'>+		struct acpi_table_dmar *dmar;</div><div class='add'>+		/*</div><div class='add'>+		 * for now we will disable dma-remapping when interrupt</div><div class='add'>+		 * remapping is enabled.</div><div class='add'>+		 * When support for queued invalidation for IOTLB invalidation</div><div class='add'>+		 * is added, we will not need this any more.</div><div class='add'>+		 */</div><div class='add'>+		dmar = (struct acpi_table_dmar *) dmar_tbl;</div><div class='add'>+		if (ret &amp;&amp; cpu_has_x2apic &amp;&amp; dmar-&gt;flags &amp; 0x1) {</div><div class='add'>+			printk(KERN_INFO</div><div class='add'>+			       "Queued invalidation will be enabled to support "</div><div class='add'>+			       "x2apic and Intr-remapping.\n");</div><div class='add'>+			printk(KERN_INFO</div><div class='add'>+			       "Disabling IOMMU detection, because of missing "</div><div class='add'>+			       "queued invalidation support for IOTLB "</div><div class='add'>+			       "invalidation\n");</div><div class='add'>+			printk(KERN_INFO</div><div class='add'>+			       "Use \"nox2apic\", if you want to use Intel "</div><div class='add'>+			       " IOMMU for DMA-remapping and don't care about "</div><div class='add'>+			       " x2apic support\n");</div><div class='add'>+</div><div class='add'>+			dmar_disabled = 1;</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (ret &amp;&amp; !no_iommu &amp;&amp; !iommu_detected &amp;&amp; !swiotlb &amp;&amp;</div><div class='add'>+		    !dmar_disabled)</div><div class='add'>+			iommu_detected = 1;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+int alloc_iommu(struct dmar_drhd_unit *drhd)</div><div class='add'>+{</div><div class='add'>+	struct intel_iommu *iommu;</div><div class='add'>+	int map_size;</div><div class='add'>+	u32 ver;</div><div class='add'>+	static int iommu_allocated = 0;</div><div class='add'>+</div><div class='add'>+	iommu = kzalloc(sizeof(*iommu), GFP_KERNEL);</div><div class='add'>+	if (!iommu)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	iommu-&gt;seq_id = iommu_allocated++;</div><div class='add'>+</div><div class='add'>+	iommu-&gt;reg = ioremap(drhd-&gt;reg_base_addr, PAGE_SIZE_4K);</div><div class='add'>+	if (!iommu-&gt;reg) {</div><div class='add'>+		printk(KERN_ERR "IOMMU: can't map the region\n");</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+	iommu-&gt;cap = dmar_readq(iommu-&gt;reg + DMAR_CAP_REG);</div><div class='add'>+	iommu-&gt;ecap = dmar_readq(iommu-&gt;reg + DMAR_ECAP_REG);</div><div class='add'>+</div><div class='add'>+	/* the registers might be more than one page */</div><div class='add'>+	map_size = max_t(int, ecap_max_iotlb_offset(iommu-&gt;ecap),</div><div class='add'>+		cap_max_fault_reg_offset(iommu-&gt;cap));</div><div class='add'>+	map_size = PAGE_ALIGN_4K(map_size);</div><div class='add'>+	if (map_size &gt; PAGE_SIZE_4K) {</div><div class='add'>+		iounmap(iommu-&gt;reg);</div><div class='add'>+		iommu-&gt;reg = ioremap(drhd-&gt;reg_base_addr, map_size);</div><div class='add'>+		if (!iommu-&gt;reg) {</div><div class='add'>+			printk(KERN_ERR "IOMMU: can't map the region\n");</div><div class='add'>+			goto error;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ver = readl(iommu-&gt;reg + DMAR_VER_REG);</div><div class='add'>+	pr_debug("IOMMU %llx: ver %d:%d cap %llx ecap %llx\n",</div><div class='add'>+		drhd-&gt;reg_base_addr, DMAR_VER_MAJOR(ver), DMAR_VER_MINOR(ver),</div><div class='add'>+		iommu-&gt;cap, iommu-&gt;ecap);</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;iommu-&gt;register_lock);</div><div class='add'>+</div><div class='add'>+	drhd-&gt;iommu = iommu;</div><div class='add'>+	return 0;</div><div class='add'>+error:</div><div class='add'>+	kfree(iommu);</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void free_iommu(struct intel_iommu *iommu)</div><div class='add'>+{</div><div class='add'>+	if (!iommu)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_DMAR</div><div class='add'>+	free_dmar_iommu(iommu);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	if (iommu-&gt;reg)</div><div class='add'>+		iounmap(iommu-&gt;reg);</div><div class='add'>+	kfree(iommu);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Reclaim all the submitted descriptors which have completed its work.</div><div class='add'>+ */</div><div class='add'>+static inline void reclaim_free_desc(struct q_inval *qi)</div><div class='add'>+{</div><div class='add'>+	while (qi-&gt;desc_status[qi-&gt;free_tail] == QI_DONE) {</div><div class='add'>+		qi-&gt;desc_status[qi-&gt;free_tail] = QI_FREE;</div><div class='add'>+		qi-&gt;free_tail = (qi-&gt;free_tail + 1) % QI_LENGTH;</div><div class='add'>+		qi-&gt;free_cnt++;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Submit the queued invalidation descriptor to the remapping</div><div class='add'>+ * hardware unit and wait for its completion.</div><div class='add'>+ */</div><div class='add'>+void qi_submit_sync(struct qi_desc *desc, struct intel_iommu *iommu)</div><div class='add'>+{</div><div class='add'>+	struct q_inval *qi = iommu-&gt;qi;</div><div class='add'>+	struct qi_desc *hw, wait_desc;</div><div class='add'>+	int wait_index, index;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	if (!qi)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	hw = qi-&gt;desc;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;qi-&gt;q_lock);</div><div class='add'>+	while (qi-&gt;free_cnt &lt; 3) {</div><div class='add'>+		spin_unlock(&amp;qi-&gt;q_lock);</div><div class='add'>+		cpu_relax();</div><div class='add'>+		spin_lock(&amp;qi-&gt;q_lock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	index = qi-&gt;free_head;</div><div class='add'>+	wait_index = (index + 1) % QI_LENGTH;</div><div class='add'>+</div><div class='add'>+	qi-&gt;desc_status[index] = qi-&gt;desc_status[wait_index] = QI_IN_USE;</div><div class='add'>+</div><div class='add'>+	hw[index] = *desc;</div><div class='add'>+</div><div class='add'>+	wait_desc.low = QI_IWD_STATUS_DATA(2) | QI_IWD_STATUS_WRITE | QI_IWD_TYPE;</div><div class='add'>+	wait_desc.high = virt_to_phys(&amp;qi-&gt;desc_status[wait_index]);</div><div class='add'>+</div><div class='add'>+	hw[wait_index] = wait_desc;</div><div class='add'>+</div><div class='add'>+	__iommu_flush_cache(iommu, &amp;hw[index], sizeof(struct qi_desc));</div><div class='add'>+	__iommu_flush_cache(iommu, &amp;hw[wait_index], sizeof(struct qi_desc));</div><div class='add'>+</div><div class='add'>+	qi-&gt;free_head = (qi-&gt;free_head + 2) % QI_LENGTH;</div><div class='add'>+	qi-&gt;free_cnt -= 2;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;iommu-&gt;register_lock, flags);</div><div class='add'>+	/*</div><div class='add'>+	 * update the HW tail register indicating the presence of</div><div class='add'>+	 * new descriptors.</div><div class='add'>+	 */</div><div class='add'>+	writel(qi-&gt;free_head &lt;&lt; 4, iommu-&gt;reg + DMAR_IQT_REG);</div><div class='add'>+	spin_unlock_irqrestore(&amp;iommu-&gt;register_lock, flags);</div><div class='add'>+</div><div class='add'>+	while (qi-&gt;desc_status[wait_index] != QI_DONE) {</div><div class='add'>+		spin_unlock(&amp;qi-&gt;q_lock);</div><div class='add'>+		cpu_relax();</div><div class='add'>+		spin_lock(&amp;qi-&gt;q_lock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	qi-&gt;desc_status[index] = QI_DONE;</div><div class='add'>+</div><div class='add'>+	reclaim_free_desc(qi);</div><div class='add'>+	spin_unlock(&amp;qi-&gt;q_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Flush the global interrupt entry cache.</div><div class='add'>+ */</div><div class='add'>+void qi_global_iec(struct intel_iommu *iommu)</div><div class='add'>+{</div><div class='add'>+	struct qi_desc desc;</div><div class='add'>+</div><div class='add'>+	desc.low = QI_IEC_TYPE;</div><div class='add'>+	desc.high = 0;</div><div class='add'>+</div><div class='add'>+	qi_submit_sync(&amp;desc, iommu);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Enable Queued Invalidation interface. This is a must to support</div><div class='add'>+ * interrupt-remapping. Also used by DMA-remapping, which replaces</div><div class='add'>+ * register based IOTLB invalidation.</div><div class='add'>+ */</div><div class='add'>+int dmar_enable_qi(struct intel_iommu *iommu)</div><div class='add'>+{</div><div class='add'>+	u32 cmd, sts;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	struct q_inval *qi;</div><div class='add'>+</div><div class='add'>+	if (!ecap_qis(iommu-&gt;ecap))</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * queued invalidation is already setup and enabled.</div><div class='add'>+	 */</div><div class='add'>+	if (iommu-&gt;qi)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	iommu-&gt;qi = kmalloc(sizeof(*qi), GFP_KERNEL);</div><div class='add'>+	if (!iommu-&gt;qi)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	qi = iommu-&gt;qi;</div><div class='add'>+</div><div class='add'>+	qi-&gt;desc = (void *)(get_zeroed_page(GFP_KERNEL));</div><div class='add'>+	if (!qi-&gt;desc) {</div><div class='add'>+		kfree(qi);</div><div class='add'>+		iommu-&gt;qi = 0;</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	qi-&gt;desc_status = kmalloc(QI_LENGTH * sizeof(int), GFP_KERNEL);</div><div class='add'>+	if (!qi-&gt;desc_status) {</div><div class='add'>+		free_page((unsigned long) qi-&gt;desc);</div><div class='add'>+		kfree(qi);</div><div class='add'>+		iommu-&gt;qi = 0;</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	qi-&gt;free_head = qi-&gt;free_tail = 0;</div><div class='add'>+	qi-&gt;free_cnt = QI_LENGTH;</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;qi-&gt;q_lock);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;iommu-&gt;register_lock, flags);</div><div class='add'>+	/* write zero to the tail reg */</div><div class='add'>+	writel(0, iommu-&gt;reg + DMAR_IQT_REG);</div><div class='add'>+</div><div class='add'>+	dmar_writeq(iommu-&gt;reg + DMAR_IQA_REG, virt_to_phys(qi-&gt;desc));</div><div class='add'>+</div><div class='add'>+	cmd = iommu-&gt;gcmd | DMA_GCMD_QIE;</div><div class='add'>+	iommu-&gt;gcmd |= DMA_GCMD_QIE;</div><div class='add'>+	writel(cmd, iommu-&gt;reg + DMAR_GCMD_REG);</div><div class='add'>+</div><div class='add'>+	/* Make sure hardware complete it */</div><div class='add'>+	IOMMU_WAIT_OP(iommu, DMAR_GSTS_REG, readl, (sts &amp; DMA_GSTS_QIES), sts);</div><div class='add'>+	spin_unlock_irqrestore(&amp;iommu-&gt;register_lock, flags);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/pci/hotplug/ibmphp_ebda.c b/drivers/pci/hotplug/ibmphp_ebda.c<br/>index 8467d0287325..7d27631e6e62 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pci/hotplug/ibmphp_ebda.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/pci/hotplug/ibmphp_ebda.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pci/hotplug/ibmphp_ebda.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pci/hotplug/ibmphp_ebda.c</a></div><div class='hunk'>@@ -276,7 +276,7 @@ int __init ibmphp_access_ebda (void)</div><div class='ctx'> 	iounmap (io_mem);</div><div class='ctx'> 	debug ("returned ebda segment: %x\n", ebda_seg);</div><div class='ctx'> 	</div><div class='del'>-	io_mem = ioremap (ebda_seg&lt;&lt;4, 65000);</div><div class='add'>+	io_mem = ioremap(ebda_seg&lt;&lt;4, 1024);</div><div class='ctx'> 	if (!io_mem )</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	next_offset = 0x180;</div><div class='head'>diff --git a/drivers/pci/hotplug/rpaphp_slot.c b/drivers/pci/hotplug/rpaphp_slot.c<br/>index 9b714ea93d20..50884507b8be 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pci/hotplug/rpaphp_slot.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/pci/hotplug/rpaphp_slot.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pci/hotplug/rpaphp_slot.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pci/hotplug/rpaphp_slot.c</a></div><div class='hunk'>@@ -147,9 +147,5 @@ int rpaphp_register_slot(struct slot *slot)</div><div class='ctx'> 	list_add(&amp;slot-&gt;rpaphp_slot_list, &amp;rpaphp_slot_head);</div><div class='ctx'> 	info("Slot [%s] registered\n", slot-&gt;name);</div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='del'>-sysfs_fail:</div><div class='del'>-	pci_hp_deregister(php_slot);</div><div class='del'>-	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c<br/>index c3edcdc08e72..fc5f2dbf5323 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pci/intel-iommu.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/pci/intel-iommu.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pci/intel-iommu.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pci/intel-iommu.c</a></div><div class='hunk'>@@ -33,8 +33,8 @@</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> #include &lt;linux/mempool.h&gt;</div><div class='ctx'> #include &lt;linux/timer.h&gt;</div><div class='del'>-#include "iova.h"</div><div class='del'>-#include "intel-iommu.h"</div><div class='add'>+#include &lt;linux/iova.h&gt;</div><div class='add'>+#include &lt;linux/intel-iommu.h&gt;</div><div class='ctx'> #include &lt;asm/proto.h&gt; /* force_iommu in this header in x86-64*/</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #include &lt;asm/iommu.h&gt;</div><div class='hunk'>@@ -49,8 +49,6 @@</div><div class='ctx'> </div><div class='ctx'> #define DEFAULT_DOMAIN_ADDRESS_WIDTH 48</div><div class='ctx'> </div><div class='del'>-#define DMAR_OPERATION_TIMEOUT ((cycles_t) tsc_khz*10*1000) /* 10sec */</div><div class='del'>-</div><div class='ctx'> #define DOMAIN_MAX_ADDR(gaw) ((((u64)1) &lt;&lt; gaw) - 1)</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -58,8 +56,6 @@ static void flush_unmaps_timeout(unsigned long data);</div><div class='ctx'> </div><div class='ctx'> DEFINE_TIMER(unmap_timer,  flush_unmaps_timeout, 0, 0);</div><div class='ctx'> </div><div class='del'>-static struct intel_iommu *g_iommus;</div><div class='del'>-</div><div class='ctx'> #define HIGH_WATER_MARK 250</div><div class='ctx'> struct deferred_flush_tables {</div><div class='ctx'> 	int next;</div><div class='hunk'>@@ -80,7 +76,7 @@ static long list_size;</div><div class='ctx'> </div><div class='ctx'> static void domain_remove_dev_info(struct dmar_domain *domain);</div><div class='ctx'> </div><div class='del'>-static int dmar_disabled;</div><div class='add'>+int dmar_disabled;</div><div class='ctx'> static int __initdata dmar_map_gfx = 1;</div><div class='ctx'> static int dmar_forcedac;</div><div class='ctx'> static int intel_iommu_strict;</div><div class='hunk'>@@ -160,7 +156,7 @@ static inline void *alloc_domain_mem(void)</div><div class='ctx'> 	return iommu_kmem_cache_alloc(iommu_domain_cache);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void free_domain_mem(void *vaddr)</div><div class='add'>+static void free_domain_mem(void *vaddr)</div><div class='ctx'> {</div><div class='ctx'> 	kmem_cache_free(iommu_domain_cache, vaddr);</div><div class='ctx'> }</div><div class='hunk'>@@ -185,13 +181,6 @@ void free_iova_mem(struct iova *iova)</div><div class='ctx'> 	kmem_cache_free(iommu_iova_cache, iova);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void __iommu_flush_cache(</div><div class='del'>-	struct intel_iommu *iommu, void *addr, int size)</div><div class='del'>-{</div><div class='del'>-	if (!ecap_coherent(iommu-&gt;ecap))</div><div class='del'>-		clflush_cache_range(addr, size);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* Gets context entry for a given bus and devfn */</div><div class='ctx'> static struct context_entry * device_to_context_entry(struct intel_iommu *iommu,</div><div class='ctx'> 		u8 bus, u8 devfn)</div><div class='hunk'>@@ -488,19 +477,6 @@ static int iommu_alloc_root_entry(struct intel_iommu *iommu)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define IOMMU_WAIT_OP(iommu, offset, op, cond, sts) \</div><div class='del'>-{\</div><div class='del'>-	cycles_t start_time = get_cycles();\</div><div class='del'>-	while (1) {\</div><div class='del'>-		sts = op (iommu-&gt;reg + offset);\</div><div class='del'>-		if (cond)\</div><div class='del'>-			break;\</div><div class='del'>-		if (DMAR_OPERATION_TIMEOUT &lt; (get_cycles() - start_time))\</div><div class='del'>-			panic("DMAR hardware is malfunctioning\n");\</div><div class='del'>-		cpu_relax();\</div><div class='del'>-	}\</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void iommu_set_root_entry(struct intel_iommu *iommu)</div><div class='ctx'> {</div><div class='ctx'> 	void *addr;</div><div class='hunk'>@@ -990,6 +966,8 @@ static int iommu_init_domains(struct intel_iommu *iommu)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	spin_lock_init(&amp;iommu-&gt;lock);</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * if Caching mode is set, then invalid translations are tagged</div><div class='ctx'> 	 * with domainid 0. Hence we need to pre-allocate it.</div><div class='hunk'>@@ -998,62 +976,15 @@ static int iommu_init_domains(struct intel_iommu *iommu)</div><div class='ctx'> 		set_bit(0, iommu-&gt;domain_ids);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-static struct intel_iommu *alloc_iommu(struct intel_iommu *iommu,</div><div class='del'>-					struct dmar_drhd_unit *drhd)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	int map_size;</div><div class='del'>-	u32 ver;</div><div class='del'>-</div><div class='del'>-	iommu-&gt;reg = ioremap(drhd-&gt;reg_base_addr, PAGE_SIZE_4K);</div><div class='del'>-	if (!iommu-&gt;reg) {</div><div class='del'>-		printk(KERN_ERR "IOMMU: can't map the region\n");</div><div class='del'>-		goto error;</div><div class='del'>-	}</div><div class='del'>-	iommu-&gt;cap = dmar_readq(iommu-&gt;reg + DMAR_CAP_REG);</div><div class='del'>-	iommu-&gt;ecap = dmar_readq(iommu-&gt;reg + DMAR_ECAP_REG);</div><div class='del'>-</div><div class='del'>-	/* the registers might be more than one page */</div><div class='del'>-	map_size = max_t(int, ecap_max_iotlb_offset(iommu-&gt;ecap),</div><div class='del'>-		cap_max_fault_reg_offset(iommu-&gt;cap));</div><div class='del'>-	map_size = PAGE_ALIGN_4K(map_size);</div><div class='del'>-	if (map_size &gt; PAGE_SIZE_4K) {</div><div class='del'>-		iounmap(iommu-&gt;reg);</div><div class='del'>-		iommu-&gt;reg = ioremap(drhd-&gt;reg_base_addr, map_size);</div><div class='del'>-		if (!iommu-&gt;reg) {</div><div class='del'>-			printk(KERN_ERR "IOMMU: can't map the region\n");</div><div class='del'>-			goto error;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ver = readl(iommu-&gt;reg + DMAR_VER_REG);</div><div class='del'>-	pr_debug("IOMMU %llx: ver %d:%d cap %llx ecap %llx\n",</div><div class='del'>-		drhd-&gt;reg_base_addr, DMAR_VER_MAJOR(ver), DMAR_VER_MINOR(ver),</div><div class='del'>-		iommu-&gt;cap, iommu-&gt;ecap);</div><div class='del'>-	ret = iommu_init_domains(iommu);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto error_unmap;</div><div class='del'>-	spin_lock_init(&amp;iommu-&gt;lock);</div><div class='del'>-	spin_lock_init(&amp;iommu-&gt;register_lock);</div><div class='ctx'> </div><div class='del'>-	drhd-&gt;iommu = iommu;</div><div class='del'>-	return iommu;</div><div class='del'>-error_unmap:</div><div class='del'>-	iounmap(iommu-&gt;reg);</div><div class='del'>-error:</div><div class='del'>-	kfree(iommu);</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='ctx'> </div><div class='ctx'> static void domain_exit(struct dmar_domain *domain);</div><div class='del'>-static void free_iommu(struct intel_iommu *iommu)</div><div class='add'>+</div><div class='add'>+void free_dmar_iommu(struct intel_iommu *iommu)</div><div class='ctx'> {</div><div class='ctx'> 	struct dmar_domain *domain;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	if (!iommu)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='ctx'> 	i = find_first_bit(iommu-&gt;domain_ids, cap_ndoms(iommu-&gt;cap));</div><div class='ctx'> 	for (; i &lt; cap_ndoms(iommu-&gt;cap); ) {</div><div class='ctx'> 		domain = iommu-&gt;domains[i];</div><div class='hunk'>@@ -1078,10 +1009,6 @@ static void free_iommu(struct intel_iommu *iommu)</div><div class='ctx'> </div><div class='ctx'> 	/* free context mapping */</div><div class='ctx'> 	free_context_table(iommu);</div><div class='del'>-</div><div class='del'>-	if (iommu-&gt;reg)</div><div class='del'>-		iounmap(iommu-&gt;reg);</div><div class='del'>-	kfree(iommu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct dmar_domain * iommu_alloc_domain(struct intel_iommu *iommu)</div><div class='hunk'>@@ -1414,7 +1341,7 @@ static void domain_remove_dev_info(struct dmar_domain *domain)</div><div class='ctx'>  * find_domain</div><div class='ctx'>  * Note: we use struct pci_dev-&gt;dev.archdata.iommu stores the info</div><div class='ctx'>  */</div><div class='del'>-struct dmar_domain *</div><div class='add'>+static struct dmar_domain *</div><div class='ctx'> find_domain(struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct device_domain_info *info;</div><div class='hunk'>@@ -1426,37 +1353,6 @@ find_domain(struct pci_dev *pdev)</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dmar_pci_device_match(struct pci_dev *devices[], int cnt,</div><div class='del'>-     struct pci_dev *dev)</div><div class='del'>-{</div><div class='del'>-	int index;</div><div class='del'>-</div><div class='del'>-	while (dev) {</div><div class='del'>-		for (index = 0; index &lt; cnt; index++)</div><div class='del'>-			if (dev == devices[index])</div><div class='del'>-				return 1;</div><div class='del'>-</div><div class='del'>-		/* Check our parent */</div><div class='del'>-		dev = dev-&gt;bus-&gt;self;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct dmar_drhd_unit *</div><div class='del'>-dmar_find_matched_drhd_unit(struct pci_dev *dev)</div><div class='del'>-{</div><div class='del'>-	struct dmar_drhd_unit *drhd = NULL;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(drhd, &amp;dmar_drhd_units, list) {</div><div class='del'>-		if (drhd-&gt;include_all || dmar_pci_device_match(drhd-&gt;devices,</div><div class='del'>-						drhd-&gt;devices_cnt, dev))</div><div class='del'>-			return drhd;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* domain is initialized */</div><div class='ctx'> static struct dmar_domain *get_domain_for_dev(struct pci_dev *pdev, int gaw)</div><div class='ctx'> {</div><div class='hunk'>@@ -1729,8 +1625,6 @@ int __init init_dmars(void)</div><div class='ctx'> 	 * endfor</div><div class='ctx'> 	 */</div><div class='ctx'> 	for_each_drhd_unit(drhd) {</div><div class='del'>-		if (drhd-&gt;ignored)</div><div class='del'>-			continue;</div><div class='ctx'> 		g_num_of_iommus++;</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * lock not needed as this is only incremented in the single</div><div class='hunk'>@@ -1739,12 +1633,6 @@ int __init init_dmars(void)</div><div class='ctx'> 		 */</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	g_iommus = kzalloc(g_num_of_iommus * sizeof(*iommu), GFP_KERNEL);</div><div class='del'>-	if (!g_iommus) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto error;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	deferred_flush = kzalloc(g_num_of_iommus *</div><div class='ctx'> 		sizeof(struct deferred_flush_tables), GFP_KERNEL);</div><div class='ctx'> 	if (!deferred_flush) {</div><div class='hunk'>@@ -1752,16 +1640,15 @@ int __init init_dmars(void)</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	i = 0;</div><div class='ctx'> 	for_each_drhd_unit(drhd) {</div><div class='ctx'> 		if (drhd-&gt;ignored)</div><div class='ctx'> 			continue;</div><div class='del'>-		iommu = alloc_iommu(&amp;g_iommus[i], drhd);</div><div class='del'>-		i++;</div><div class='del'>-		if (!iommu) {</div><div class='del'>-			ret = -ENOMEM;</div><div class='add'>+</div><div class='add'>+		iommu = drhd-&gt;iommu;</div><div class='add'>+</div><div class='add'>+		ret = iommu_init_domains(iommu);</div><div class='add'>+		if (ret)</div><div class='ctx'> 			goto error;</div><div class='del'>-		}</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * TBD:</div><div class='hunk'>@@ -1845,7 +1732,6 @@ error:</div><div class='ctx'> 		iommu = drhd-&gt;iommu;</div><div class='ctx'> 		free_iommu(iommu);</div><div class='ctx'> 	}</div><div class='del'>-	kfree(g_iommus);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2002,7 +1888,10 @@ static void flush_unmaps(void)</div><div class='ctx'> 	/* just flush them all */</div><div class='ctx'> 	for (i = 0; i &lt; g_num_of_iommus; i++) {</div><div class='ctx'> 		if (deferred_flush[i].next) {</div><div class='del'>-			iommu_flush_iotlb_global(&amp;g_iommus[i], 0);</div><div class='add'>+			struct intel_iommu *iommu =</div><div class='add'>+				deferred_flush[i].domain[0]-&gt;iommu;</div><div class='add'>+</div><div class='add'>+			iommu_flush_iotlb_global(iommu, 0);</div><div class='ctx'> 			for (j = 0; j &lt; deferred_flush[i].next; j++) {</div><div class='ctx'> 				__free_iova(&amp;deferred_flush[i].domain[j]-&gt;iovad,</div><div class='ctx'> 						deferred_flush[i].iova[j]);</div><div class='hunk'>@@ -2032,7 +1921,8 @@ static void add_unmap(struct dmar_domain *dom, struct iova *iova)</div><div class='ctx'> 	if (list_size == HIGH_WATER_MARK)</div><div class='ctx'> 		flush_unmaps();</div><div class='ctx'> </div><div class='del'>-	iommu_id = dom-&gt;iommu - g_iommus;</div><div class='add'>+	iommu_id = dom-&gt;iommu-&gt;seq_id;</div><div class='add'>+</div><div class='ctx'> 	next = deferred_flush[iommu_id].next;</div><div class='ctx'> 	deferred_flush[iommu_id].domain[next] = dom;</div><div class='ctx'> 	deferred_flush[iommu_id].iova[next] = iova;</div><div class='hunk'>@@ -2348,38 +2238,6 @@ static void __init iommu_exit_mempool(void)</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int blacklist_iommu(const struct dmi_system_id *id)</div><div class='del'>-{</div><div class='del'>-	printk(KERN_INFO "%s detected; disabling IOMMU\n",</div><div class='del'>-	       id-&gt;ident);</div><div class='del'>-	dmar_disabled = 1;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct dmi_system_id __initdata intel_iommu_dmi_table[] = {</div><div class='del'>-	{	/* Some DG33BU BIOS revisions advertised non-existent VT-d */</div><div class='del'>-		.callback = blacklist_iommu,</div><div class='del'>-		.ident = "Intel DG33BU",</div><div class='del'>-		{	DMI_MATCH(DMI_BOARD_VENDOR, "Intel Corporation"),</div><div class='del'>-			DMI_MATCH(DMI_BOARD_NAME, "DG33BU"),</div><div class='del'>-		}</div><div class='del'>-	},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void __init detect_intel_iommu(void)</div><div class='del'>-{</div><div class='del'>-	if (swiotlb || no_iommu || iommu_detected || dmar_disabled)</div><div class='del'>-		return;</div><div class='del'>-	if (early_dmar_detect()) {</div><div class='del'>-		dmi_check_system(intel_iommu_dmi_table);</div><div class='del'>-		if (dmar_disabled)</div><div class='del'>-			return;</div><div class='del'>-		iommu_detected = 1;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void __init init_no_remapping_devices(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct dmar_drhd_unit *drhd;</div><div class='hunk'>@@ -2426,12 +2284,19 @@ int __init intel_iommu_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	if (no_iommu || swiotlb || dmar_disabled)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='ctx'> 	if (dmar_table_init())</div><div class='ctx'> 		return 	-ENODEV;</div><div class='ctx'> </div><div class='add'>+	if (dmar_dev_scope_init())</div><div class='add'>+		return 	-ENODEV;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Check the need for DMA-remapping initialization now.</div><div class='add'>+	 * Above initialization will also be used by Interrupt-remapping.</div><div class='add'>+	 */</div><div class='add'>+	if (no_iommu || swiotlb || dmar_disabled)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='ctx'> 	iommu_init_mempool();</div><div class='ctx'> 	dmar_init_reserved_ranges();</div><div class='ctx'> </div><div class='hunk'>@@ -2453,3 +2318,111 @@ int __init intel_iommu_init(void)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void intel_iommu_domain_exit(struct dmar_domain *domain)</div><div class='add'>+{</div><div class='add'>+	u64 end;</div><div class='add'>+</div><div class='add'>+	/* Domain 0 is reserved, so dont process it */</div><div class='add'>+	if (!domain)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	end = DOMAIN_MAX_ADDR(domain-&gt;gaw);</div><div class='add'>+	end = end &amp; (~PAGE_MASK_4K);</div><div class='add'>+</div><div class='add'>+	/* clear ptes */</div><div class='add'>+	dma_pte_clear_range(domain, 0, end);</div><div class='add'>+</div><div class='add'>+	/* free page tables */</div><div class='add'>+	dma_pte_free_pagetable(domain, 0, end);</div><div class='add'>+</div><div class='add'>+	iommu_free_domain(domain);</div><div class='add'>+	free_domain_mem(domain);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(intel_iommu_domain_exit);</div><div class='add'>+</div><div class='add'>+struct dmar_domain *intel_iommu_domain_alloc(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct dmar_drhd_unit *drhd;</div><div class='add'>+	struct dmar_domain *domain;</div><div class='add'>+	struct intel_iommu *iommu;</div><div class='add'>+</div><div class='add'>+	drhd = dmar_find_matched_drhd_unit(pdev);</div><div class='add'>+	if (!drhd) {</div><div class='add'>+		printk(KERN_ERR "intel_iommu_domain_alloc: drhd == NULL\n");</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iommu = drhd-&gt;iommu;</div><div class='add'>+	if (!iommu) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+			"intel_iommu_domain_alloc: iommu == NULL\n");</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+	domain = iommu_alloc_domain(iommu);</div><div class='add'>+	if (!domain) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+			"intel_iommu_domain_alloc: domain == NULL\n");</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+	if (domain_init(domain, DEFAULT_DOMAIN_ADDRESS_WIDTH)) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+			"intel_iommu_domain_alloc: domain_init() failed\n");</div><div class='add'>+		intel_iommu_domain_exit(domain);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+	return domain;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(intel_iommu_domain_alloc);</div><div class='add'>+</div><div class='add'>+int intel_iommu_context_mapping(</div><div class='add'>+	struct dmar_domain *domain, struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+	rc = domain_context_mapping(domain, pdev);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(intel_iommu_context_mapping);</div><div class='add'>+</div><div class='add'>+int intel_iommu_page_mapping(</div><div class='add'>+	struct dmar_domain *domain, dma_addr_t iova,</div><div class='add'>+	u64 hpa, size_t size, int prot)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+	rc = domain_page_mapping(domain, iova, hpa, size, prot);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(intel_iommu_page_mapping);</div><div class='add'>+</div><div class='add'>+void intel_iommu_detach_dev(struct dmar_domain *domain, u8 bus, u8 devfn)</div><div class='add'>+{</div><div class='add'>+	detach_domain_for_dev(domain, bus, devfn);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(intel_iommu_detach_dev);</div><div class='add'>+</div><div class='add'>+struct dmar_domain *</div><div class='add'>+intel_iommu_find_domain(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	return find_domain(pdev);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(intel_iommu_find_domain);</div><div class='add'>+</div><div class='add'>+int intel_iommu_found(void)</div><div class='add'>+{</div><div class='add'>+	return g_num_of_iommus;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(intel_iommu_found);</div><div class='add'>+</div><div class='add'>+u64 intel_iommu_iova_to_pfn(struct dmar_domain *domain, u64 iova)</div><div class='add'>+{</div><div class='add'>+	struct dma_pte *pte;</div><div class='add'>+	u64 pfn;</div><div class='add'>+</div><div class='add'>+	pfn = 0;</div><div class='add'>+	pte = addr_to_dma_pte(domain, iova);</div><div class='add'>+</div><div class='add'>+	if (pte)</div><div class='add'>+		pfn = dma_pte_addr(*pte);</div><div class='add'>+</div><div class='add'>+	return pfn &gt;&gt; PAGE_SHIFT_4K;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(intel_iommu_iova_to_pfn);</div><div class='head'>diff --git a/drivers/pci/intr_remapping.c b/drivers/pci/intr_remapping.c<br/>new file mode 100644<br/>index 000000000000..738d4c89581c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pci/intr_remapping.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pci/intr_remapping.c</a></div><div class='hunk'>@@ -0,0 +1,471 @@</div><div class='add'>+#include &lt;linux/dmar.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/jiffies.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='add'>+#include &lt;asm/io_apic.h&gt;</div><div class='add'>+#include &lt;linux/intel-iommu.h&gt;</div><div class='add'>+#include "intr_remapping.h"</div><div class='add'>+</div><div class='add'>+static struct ioapic_scope ir_ioapic[MAX_IO_APICS];</div><div class='add'>+static int ir_ioapic_num;</div><div class='add'>+int intr_remapping_enabled;</div><div class='add'>+</div><div class='add'>+static struct {</div><div class='add'>+	struct intel_iommu *iommu;</div><div class='add'>+	u16 irte_index;</div><div class='add'>+	u16 sub_handle;</div><div class='add'>+	u8  irte_mask;</div><div class='add'>+} irq_2_iommu[NR_IRQS];</div><div class='add'>+</div><div class='add'>+static DEFINE_SPINLOCK(irq_2_ir_lock);</div><div class='add'>+</div><div class='add'>+int irq_remapped(int irq)</div><div class='add'>+{</div><div class='add'>+	if (irq &gt; NR_IRQS)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (!irq_2_iommu[irq].iommu)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int get_irte(int irq, struct irte *entry)</div><div class='add'>+{</div><div class='add'>+	int index;</div><div class='add'>+</div><div class='add'>+	if (!entry || irq &gt; NR_IRQS)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;irq_2_ir_lock);</div><div class='add'>+	if (!irq_2_iommu[irq].iommu) {</div><div class='add'>+		spin_unlock(&amp;irq_2_ir_lock);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	index = irq_2_iommu[irq].irte_index + irq_2_iommu[irq].sub_handle;</div><div class='add'>+	*entry = *(irq_2_iommu[irq].iommu-&gt;ir_table-&gt;base + index);</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;irq_2_ir_lock);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int alloc_irte(struct intel_iommu *iommu, int irq, u16 count)</div><div class='add'>+{</div><div class='add'>+	struct ir_table *table = iommu-&gt;ir_table;</div><div class='add'>+	u16 index, start_index;</div><div class='add'>+	unsigned int mask = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!count)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * start the IRTE search from index 0.</div><div class='add'>+	 */</div><div class='add'>+	index = start_index = 0;</div><div class='add'>+</div><div class='add'>+	if (count &gt; 1) {</div><div class='add'>+		count = __roundup_pow_of_two(count);</div><div class='add'>+		mask = ilog2(count);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (mask &gt; ecap_max_handle_mask(iommu-&gt;ecap)) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "Requested mask %x exceeds the max invalidation handle"</div><div class='add'>+		       " mask value %Lx\n", mask,</div><div class='add'>+		       ecap_max_handle_mask(iommu-&gt;ecap));</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;irq_2_ir_lock);</div><div class='add'>+	do {</div><div class='add'>+		for (i = index; i &lt; index + count; i++)</div><div class='add'>+			if  (table-&gt;base[i].present)</div><div class='add'>+				break;</div><div class='add'>+		/* empty index found */</div><div class='add'>+		if (i == index + count)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		index = (index + count) % INTR_REMAP_TABLE_ENTRIES;</div><div class='add'>+</div><div class='add'>+		if (index == start_index) {</div><div class='add'>+			spin_unlock(&amp;irq_2_ir_lock);</div><div class='add'>+			printk(KERN_ERR "can't allocate an IRTE\n");</div><div class='add'>+			return -1;</div><div class='add'>+		}</div><div class='add'>+	} while (1);</div><div class='add'>+</div><div class='add'>+	for (i = index; i &lt; index + count; i++)</div><div class='add'>+		table-&gt;base[i].present = 1;</div><div class='add'>+</div><div class='add'>+	irq_2_iommu[irq].iommu = iommu;</div><div class='add'>+	irq_2_iommu[irq].irte_index =  index;</div><div class='add'>+	irq_2_iommu[irq].sub_handle = 0;</div><div class='add'>+	irq_2_iommu[irq].irte_mask = mask;</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;irq_2_ir_lock);</div><div class='add'>+</div><div class='add'>+	return index;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void qi_flush_iec(struct intel_iommu *iommu, int index, int mask)</div><div class='add'>+{</div><div class='add'>+	struct qi_desc desc;</div><div class='add'>+</div><div class='add'>+	desc.low = QI_IEC_IIDEX(index) | QI_IEC_TYPE | QI_IEC_IM(mask)</div><div class='add'>+		   | QI_IEC_SELECTIVE;</div><div class='add'>+	desc.high = 0;</div><div class='add'>+</div><div class='add'>+	qi_submit_sync(&amp;desc, iommu);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int map_irq_to_irte_handle(int irq, u16 *sub_handle)</div><div class='add'>+{</div><div class='add'>+	int index;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;irq_2_ir_lock);</div><div class='add'>+	if (irq &gt;= NR_IRQS || !irq_2_iommu[irq].iommu) {</div><div class='add'>+		spin_unlock(&amp;irq_2_ir_lock);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*sub_handle = irq_2_iommu[irq].sub_handle;</div><div class='add'>+	index = irq_2_iommu[irq].irte_index;</div><div class='add'>+	spin_unlock(&amp;irq_2_ir_lock);</div><div class='add'>+	return index;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int set_irte_irq(int irq, struct intel_iommu *iommu, u16 index, u16 subhandle)</div><div class='add'>+{</div><div class='add'>+	spin_lock(&amp;irq_2_ir_lock);</div><div class='add'>+	if (irq &gt;= NR_IRQS || irq_2_iommu[irq].iommu) {</div><div class='add'>+		spin_unlock(&amp;irq_2_ir_lock);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	irq_2_iommu[irq].iommu = iommu;</div><div class='add'>+	irq_2_iommu[irq].irte_index = index;</div><div class='add'>+	irq_2_iommu[irq].sub_handle = subhandle;</div><div class='add'>+	irq_2_iommu[irq].irte_mask = 0;</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;irq_2_ir_lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int clear_irte_irq(int irq, struct intel_iommu *iommu, u16 index)</div><div class='add'>+{</div><div class='add'>+	spin_lock(&amp;irq_2_ir_lock);</div><div class='add'>+	if (irq &gt;= NR_IRQS || !irq_2_iommu[irq].iommu) {</div><div class='add'>+		spin_unlock(&amp;irq_2_ir_lock);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	irq_2_iommu[irq].iommu = NULL;</div><div class='add'>+	irq_2_iommu[irq].irte_index = 0;</div><div class='add'>+	irq_2_iommu[irq].sub_handle = 0;</div><div class='add'>+	irq_2_iommu[irq].irte_mask = 0;</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;irq_2_ir_lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int modify_irte(int irq, struct irte *irte_modified)</div><div class='add'>+{</div><div class='add'>+	int index;</div><div class='add'>+	struct irte *irte;</div><div class='add'>+	struct intel_iommu *iommu;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;irq_2_ir_lock);</div><div class='add'>+	if (irq &gt;= NR_IRQS || !irq_2_iommu[irq].iommu) {</div><div class='add'>+		spin_unlock(&amp;irq_2_ir_lock);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iommu = irq_2_iommu[irq].iommu;</div><div class='add'>+</div><div class='add'>+	index = irq_2_iommu[irq].irte_index + irq_2_iommu[irq].sub_handle;</div><div class='add'>+	irte = &amp;iommu-&gt;ir_table-&gt;base[index];</div><div class='add'>+</div><div class='add'>+	set_64bit((unsigned long *)irte, irte_modified-&gt;low | (1 &lt;&lt; 1));</div><div class='add'>+	__iommu_flush_cache(iommu, irte, sizeof(*irte));</div><div class='add'>+</div><div class='add'>+	qi_flush_iec(iommu, index, 0);</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;irq_2_ir_lock);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int flush_irte(int irq)</div><div class='add'>+{</div><div class='add'>+	int index;</div><div class='add'>+	struct intel_iommu *iommu;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;irq_2_ir_lock);</div><div class='add'>+	if (irq &gt;= NR_IRQS || !irq_2_iommu[irq].iommu) {</div><div class='add'>+		spin_unlock(&amp;irq_2_ir_lock);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iommu = irq_2_iommu[irq].iommu;</div><div class='add'>+</div><div class='add'>+	index = irq_2_iommu[irq].irte_index + irq_2_iommu[irq].sub_handle;</div><div class='add'>+</div><div class='add'>+	qi_flush_iec(iommu, index, irq_2_iommu[irq].irte_mask);</div><div class='add'>+	spin_unlock(&amp;irq_2_ir_lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct intel_iommu *map_ioapic_to_ir(int apic)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MAX_IO_APICS; i++)</div><div class='add'>+		if (ir_ioapic[i].id == apic)</div><div class='add'>+			return ir_ioapic[i].iommu;</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct intel_iommu *map_dev_to_ir(struct pci_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct dmar_drhd_unit *drhd;</div><div class='add'>+</div><div class='add'>+	drhd = dmar_find_matched_drhd_unit(dev);</div><div class='add'>+	if (!drhd)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	return drhd-&gt;iommu;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int free_irte(int irq)</div><div class='add'>+{</div><div class='add'>+	int index, i;</div><div class='add'>+	struct irte *irte;</div><div class='add'>+	struct intel_iommu *iommu;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;irq_2_ir_lock);</div><div class='add'>+	if (irq &gt;= NR_IRQS || !irq_2_iommu[irq].iommu) {</div><div class='add'>+		spin_unlock(&amp;irq_2_ir_lock);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iommu = irq_2_iommu[irq].iommu;</div><div class='add'>+</div><div class='add'>+	index = irq_2_iommu[irq].irte_index + irq_2_iommu[irq].sub_handle;</div><div class='add'>+	irte = &amp;iommu-&gt;ir_table-&gt;base[index];</div><div class='add'>+</div><div class='add'>+	if (!irq_2_iommu[irq].sub_handle) {</div><div class='add'>+		for (i = 0; i &lt; (1 &lt;&lt; irq_2_iommu[irq].irte_mask); i++)</div><div class='add'>+			set_64bit((unsigned long *)irte, 0);</div><div class='add'>+		qi_flush_iec(iommu, index, irq_2_iommu[irq].irte_mask);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	irq_2_iommu[irq].iommu = NULL;</div><div class='add'>+	irq_2_iommu[irq].irte_index = 0;</div><div class='add'>+	irq_2_iommu[irq].sub_handle = 0;</div><div class='add'>+	irq_2_iommu[irq].irte_mask = 0;</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;irq_2_ir_lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iommu_set_intr_remapping(struct intel_iommu *iommu, int mode)</div><div class='add'>+{</div><div class='add'>+	u64 addr;</div><div class='add'>+	u32 cmd, sts;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	addr = virt_to_phys((void *)iommu-&gt;ir_table-&gt;base);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;iommu-&gt;register_lock, flags);</div><div class='add'>+</div><div class='add'>+	dmar_writeq(iommu-&gt;reg + DMAR_IRTA_REG,</div><div class='add'>+		    (addr) | IR_X2APIC_MODE(mode) | INTR_REMAP_TABLE_REG_SIZE);</div><div class='add'>+</div><div class='add'>+	/* Set interrupt-remapping table pointer */</div><div class='add'>+	cmd = iommu-&gt;gcmd | DMA_GCMD_SIRTP;</div><div class='add'>+	writel(cmd, iommu-&gt;reg + DMAR_GCMD_REG);</div><div class='add'>+</div><div class='add'>+	IOMMU_WAIT_OP(iommu, DMAR_GSTS_REG,</div><div class='add'>+		      readl, (sts &amp; DMA_GSTS_IRTPS), sts);</div><div class='add'>+	spin_unlock_irqrestore(&amp;iommu-&gt;register_lock, flags);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * global invalidation of interrupt entry cache before enabling</div><div class='add'>+	 * interrupt-remapping.</div><div class='add'>+	 */</div><div class='add'>+	qi_global_iec(iommu);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;iommu-&gt;register_lock, flags);</div><div class='add'>+</div><div class='add'>+	/* Enable interrupt-remapping */</div><div class='add'>+	cmd = iommu-&gt;gcmd | DMA_GCMD_IRE;</div><div class='add'>+	iommu-&gt;gcmd |= DMA_GCMD_IRE;</div><div class='add'>+	writel(cmd, iommu-&gt;reg + DMAR_GCMD_REG);</div><div class='add'>+</div><div class='add'>+	IOMMU_WAIT_OP(iommu, DMAR_GSTS_REG,</div><div class='add'>+		      readl, (sts &amp; DMA_GSTS_IRES), sts);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;iommu-&gt;register_lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int setup_intr_remapping(struct intel_iommu *iommu, int mode)</div><div class='add'>+{</div><div class='add'>+	struct ir_table *ir_table;</div><div class='add'>+	struct page *pages;</div><div class='add'>+</div><div class='add'>+	ir_table = iommu-&gt;ir_table = kzalloc(sizeof(struct ir_table),</div><div class='add'>+					     GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (!iommu-&gt;ir_table)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	pages = alloc_pages(GFP_KERNEL | __GFP_ZERO, INTR_REMAP_PAGE_ORDER);</div><div class='add'>+</div><div class='add'>+	if (!pages) {</div><div class='add'>+		printk(KERN_ERR "failed to allocate pages of order %d\n",</div><div class='add'>+		       INTR_REMAP_PAGE_ORDER);</div><div class='add'>+		kfree(iommu-&gt;ir_table);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ir_table-&gt;base = page_address(pages);</div><div class='add'>+</div><div class='add'>+	iommu_set_intr_remapping(iommu, mode);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int __init enable_intr_remapping(int eim)</div><div class='add'>+{</div><div class='add'>+	struct dmar_drhd_unit *drhd;</div><div class='add'>+	int setup = 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * check for the Interrupt-remapping support</div><div class='add'>+	 */</div><div class='add'>+	for_each_drhd_unit(drhd) {</div><div class='add'>+		struct intel_iommu *iommu = drhd-&gt;iommu;</div><div class='add'>+</div><div class='add'>+		if (!ecap_ir_support(iommu-&gt;ecap))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (eim &amp;&amp; !ecap_eim_support(iommu-&gt;ecap)) {</div><div class='add'>+			printk(KERN_INFO "DRHD %Lx: EIM not supported by DRHD, "</div><div class='add'>+			       " ecap %Lx\n", drhd-&gt;reg_base_addr, iommu-&gt;ecap);</div><div class='add'>+			return -1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Enable queued invalidation for all the DRHD's.</div><div class='add'>+	 */</div><div class='add'>+	for_each_drhd_unit(drhd) {</div><div class='add'>+		int ret;</div><div class='add'>+		struct intel_iommu *iommu = drhd-&gt;iommu;</div><div class='add'>+		ret = dmar_enable_qi(iommu);</div><div class='add'>+</div><div class='add'>+		if (ret) {</div><div class='add'>+			printk(KERN_ERR "DRHD %Lx: failed to enable queued, "</div><div class='add'>+			       " invalidation, ecap %Lx, ret %d\n",</div><div class='add'>+			       drhd-&gt;reg_base_addr, iommu-&gt;ecap, ret);</div><div class='add'>+			return -1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Setup Interrupt-remapping for all the DRHD's now.</div><div class='add'>+	 */</div><div class='add'>+	for_each_drhd_unit(drhd) {</div><div class='add'>+		struct intel_iommu *iommu = drhd-&gt;iommu;</div><div class='add'>+</div><div class='add'>+		if (!ecap_ir_support(iommu-&gt;ecap))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (setup_intr_remapping(iommu, eim))</div><div class='add'>+			goto error;</div><div class='add'>+</div><div class='add'>+		setup = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!setup)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	intr_remapping_enabled = 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	/*</div><div class='add'>+	 * handle error condition gracefully here!</div><div class='add'>+	 */</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ir_parse_ioapic_scope(struct acpi_dmar_header *header,</div><div class='add'>+				 struct intel_iommu *iommu)</div><div class='add'>+{</div><div class='add'>+	struct acpi_dmar_hardware_unit *drhd;</div><div class='add'>+	struct acpi_dmar_device_scope *scope;</div><div class='add'>+	void *start, *end;</div><div class='add'>+</div><div class='add'>+	drhd = (struct acpi_dmar_hardware_unit *)header;</div><div class='add'>+</div><div class='add'>+	start = (void *)(drhd + 1);</div><div class='add'>+	end = ((void *)drhd) + header-&gt;length;</div><div class='add'>+</div><div class='add'>+	while (start &lt; end) {</div><div class='add'>+		scope = start;</div><div class='add'>+		if (scope-&gt;entry_type == ACPI_DMAR_SCOPE_TYPE_IOAPIC) {</div><div class='add'>+			if (ir_ioapic_num == MAX_IO_APICS) {</div><div class='add'>+				printk(KERN_WARNING "Exceeded Max IO APICS\n");</div><div class='add'>+				return -1;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			printk(KERN_INFO "IOAPIC id %d under DRHD base"</div><div class='add'>+			       " 0x%Lx\n", scope-&gt;enumeration_id,</div><div class='add'>+			       drhd-&gt;address);</div><div class='add'>+</div><div class='add'>+			ir_ioapic[ir_ioapic_num].iommu = iommu;</div><div class='add'>+			ir_ioapic[ir_ioapic_num].id = scope-&gt;enumeration_id;</div><div class='add'>+			ir_ioapic_num++;</div><div class='add'>+		}</div><div class='add'>+		start += scope-&gt;length;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Finds the assocaition between IOAPIC's and its Interrupt-remapping</div><div class='add'>+ * hardware unit.</div><div class='add'>+ */</div><div class='add'>+int __init parse_ioapics_under_ir(void)</div><div class='add'>+{</div><div class='add'>+	struct dmar_drhd_unit *drhd;</div><div class='add'>+	int ir_supported = 0;</div><div class='add'>+</div><div class='add'>+	for_each_drhd_unit(drhd) {</div><div class='add'>+		struct intel_iommu *iommu = drhd-&gt;iommu;</div><div class='add'>+</div><div class='add'>+		if (ecap_ir_support(iommu-&gt;ecap)) {</div><div class='add'>+			if (ir_parse_ioapic_scope(drhd-&gt;hdr, iommu))</div><div class='add'>+				return -1;</div><div class='add'>+</div><div class='add'>+			ir_supported = 1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ir_supported &amp;&amp; ir_ioapic_num != nr_ioapics) {</div><div class='add'>+		printk(KERN_WARNING</div><div class='add'>+		       "Not all IO-APIC's listed under remapping hardware\n");</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ir_supported;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/pci/intr_remapping.h b/drivers/pci/intr_remapping.h<br/>new file mode 100644<br/>index 000000000000..ca48f0df8ac9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pci/intr_remapping.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pci/intr_remapping.h</a></div><div class='hunk'>@@ -0,0 +1,8 @@</div><div class='add'>+#include &lt;linux/intel-iommu.h&gt;</div><div class='add'>+</div><div class='add'>+struct ioapic_scope {</div><div class='add'>+	struct intel_iommu *iommu;</div><div class='add'>+	unsigned int id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define IR_X2APIC_MODE(mode) (mode ? (1 &lt;&lt; 11) : 0)</div><div class='head'>diff --git a/drivers/pci/iova.c b/drivers/pci/iova.c<br/>index 3ef4ac064315..2287116e9822 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pci/iova.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/pci/iova.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pci/iova.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pci/iova.c</a></div><div class='hunk'>@@ -7,7 +7,7 @@</div><div class='ctx'>  * Author: Anil S Keshavamurthy &lt;anil.s.keshavamurthy@intel.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include "iova.h"</div><div class='add'>+#include &lt;linux/iova.h&gt;</div><div class='ctx'> </div><div class='ctx'> void</div><div class='ctx'> init_iova_domain(struct iova_domain *iovad, unsigned long pfn_32bit)</div><div class='head'>diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c<br/>index 36698e57b97f..dd9161a054e1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pci/probe.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/pci/probe.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pci/probe.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pci/probe.c</a></div><div class='hunk'>@@ -1237,8 +1237,11 @@ EXPORT_SYMBOL(pci_scan_bridge);</div><div class='ctx'> EXPORT_SYMBOL_GPL(pci_scan_child_bus);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static int __init pci_sort_bf_cmp(const struct pci_dev *a, const struct pci_dev *b)</div><div class='add'>+static int __init pci_sort_bf_cmp(const struct device *d_a, const struct device *d_b)</div><div class='ctx'> {</div><div class='add'>+	const struct pci_dev *a = to_pci_dev(d_a);</div><div class='add'>+	const struct pci_dev *b = to_pci_dev(d_b);</div><div class='add'>+</div><div class='ctx'> 	if      (pci_domain_nr(a-&gt;bus) &lt; pci_domain_nr(b-&gt;bus)) return -1;</div><div class='ctx'> 	else if (pci_domain_nr(a-&gt;bus) &gt; pci_domain_nr(b-&gt;bus)) return  1;</div><div class='ctx'> </div><div class='hunk'>@@ -1251,50 +1254,7 @@ static int __init pci_sort_bf_cmp(const struct pci_dev *a, const struct pci_dev</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Yes, this forcably breaks the klist abstraction temporarily.  It</div><div class='del'>- * just wants to sort the klist, not change reference counts and</div><div class='del'>- * take/drop locks rapidly in the process.  It does all this while</div><div class='del'>- * holding the lock for the list, so objects can't otherwise be</div><div class='del'>- * added/removed while we're swizzling.</div><div class='del'>- */</div><div class='del'>-static void __init pci_insertion_sort_klist(struct pci_dev *a, struct list_head *list)</div><div class='del'>-{</div><div class='del'>-	struct list_head *pos;</div><div class='del'>-	struct klist_node *n;</div><div class='del'>-	struct device *dev;</div><div class='del'>-	struct pci_dev *b;</div><div class='del'>-</div><div class='del'>-	list_for_each(pos, list) {</div><div class='del'>-		n = container_of(pos, struct klist_node, n_node);</div><div class='del'>-		dev = container_of(n, struct device, knode_bus);</div><div class='del'>-		b = to_pci_dev(dev);</div><div class='del'>-		if (pci_sort_bf_cmp(a, b) &lt;= 0) {</div><div class='del'>-			list_move_tail(&amp;a-&gt;dev.knode_bus.n_node, &amp;b-&gt;dev.knode_bus.n_node);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	list_move_tail(&amp;a-&gt;dev.knode_bus.n_node, list);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void __init pci_sort_breadthfirst(void)</div><div class='ctx'> {</div><div class='del'>-	LIST_HEAD(sorted_devices);</div><div class='del'>-	struct list_head *pos, *tmp;</div><div class='del'>-	struct klist_node *n;</div><div class='del'>-	struct device *dev;</div><div class='del'>-	struct pci_dev *pdev;</div><div class='del'>-	struct klist *device_klist;</div><div class='del'>-</div><div class='del'>-	device_klist = bus_get_device_klist(&amp;pci_bus_type);</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;device_klist-&gt;k_lock);</div><div class='del'>-	list_for_each_safe(pos, tmp, &amp;device_klist-&gt;k_list) {</div><div class='del'>-		n = container_of(pos, struct klist_node, n_node);</div><div class='del'>-		dev = container_of(n, struct device, knode_bus);</div><div class='del'>-		pdev = to_pci_dev(dev);</div><div class='del'>-		pci_insertion_sort_klist(pdev, &amp;sorted_devices);</div><div class='del'>-	}</div><div class='del'>-	list_splice(&amp;sorted_devices, &amp;device_klist-&gt;k_list);</div><div class='del'>-	spin_unlock(&amp;device_klist-&gt;k_lock);</div><div class='add'>+	bus_sort_breadthfirst(&amp;pci_bus_type, &amp;pci_sort_bf_cmp);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c<br/>index 9236e7f869c8..e872ac925b4b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pci/quirks.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/pci/quirks.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pci/quirks.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pci/quirks.c</a></div><div class='hunk'>@@ -1561,8 +1561,7 @@ static void pci_do_fixups(struct pci_dev *dev, struct pci_fixup *f, struct pci_f</div><div class='ctx'> 		if ((f-&gt;vendor == dev-&gt;vendor || f-&gt;vendor == (u16) PCI_ANY_ID) &amp;&amp;</div><div class='ctx'>  		    (f-&gt;device == dev-&gt;device || f-&gt;device == (u16) PCI_ANY_ID)) {</div><div class='ctx'> #ifdef DEBUG</div><div class='del'>-			dev_dbg(&amp;dev-&gt;dev, "calling ");</div><div class='del'>-			print_fn_descriptor_symbol("%s\n", f-&gt;hook);</div><div class='add'>+			dev_dbg(&amp;dev-&gt;dev, "calling %pF\n", f-&gt;hook);</div><div class='ctx'> #endif</div><div class='ctx'> 			f-&gt;hook(dev);</div><div class='ctx'> 		}</div><div class='head'>diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c<br/>index 3abbfad9ddab..d5e2106760f8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pci/setup-bus.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/pci/setup-bus.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pci/setup-bus.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pci/setup-bus.c</a></div><div class='hunk'>@@ -378,11 +378,10 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned long mask, unsigned long</div><div class='ctx'> 	align = 0;</div><div class='ctx'> 	min_align = 0;</div><div class='ctx'> 	for (order = 0; order &lt;= max_order; order++) {</div><div class='del'>-#ifdef CONFIG_RESOURCES_64BIT</div><div class='del'>-		resource_size_t align1 = 1ULL &lt;&lt; (order + 20);</div><div class='del'>-#else</div><div class='del'>-		resource_size_t align1 = 1U &lt;&lt; (order + 20);</div><div class='del'>-#endif</div><div class='add'>+		resource_size_t align1 = 1;</div><div class='add'>+</div><div class='add'>+		align1 &lt;&lt;= (order + 20);</div><div class='add'>+</div><div class='ctx'> 		if (!align)</div><div class='ctx'> 			min_align = align1;</div><div class='ctx'> 		else if (ALIGN(align + min_align, min_align) &lt; align1)</div><div class='head'>diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig<br/>index e0f884034c9f..f57eeae3830a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pcmcia/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/pcmcia/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pcmcia/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pcmcia/Kconfig</a></div><div class='hunk'>@@ -220,7 +220,8 @@ config PCMCIA_PXA2XX</div><div class='ctx'> 	tristate "PXA2xx support"</div><div class='ctx'> 	depends on ARM &amp;&amp; ARCH_PXA &amp;&amp; PCMCIA</div><div class='ctx'> 	depends on (ARCH_LUBBOCK || MACH_MAINSTONE || PXA_SHARPSL \</div><div class='del'>-		    || MACH_ARMCORE || ARCH_PXA_PALM)</div><div class='add'>+		    || MACH_ARMCORE || ARCH_PXA_PALM || TRIZEPS_PCMCIA \</div><div class='add'>+		    || ARCH_VIPER)</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say Y here to include support for the PXA2xx PCMCIA controller</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/pcmcia/Makefile b/drivers/pcmcia/Makefile<br/>index 269a9e913ba2..b46c60b72708 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pcmcia/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/pcmcia/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pcmcia/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pcmcia/Makefile</a></div><div class='hunk'>@@ -2,10 +2,6 @@</div><div class='ctx'> # Makefile for the kernel pcmcia subsystem (c/o David Hinds)</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-ifeq ($(CONFIG_PCMCIA_DEBUG),y)</div><div class='del'>-EXTRA_CFLAGS += -DDEBUG</div><div class='del'>-endif</div><div class='del'>-</div><div class='ctx'> pcmcia_core-y					+= cs.o cistpl.o rsrc_mgr.o socket_sysfs.o</div><div class='ctx'> pcmcia_core-$(CONFIG_CARDBUS)			+= cardbus.o</div><div class='ctx'> obj-$(CONFIG_PCCARD)				+= pcmcia_core.o</div><div class='hunk'>@@ -29,7 +25,6 @@ obj-$(CONFIG_PCMCIA_M8XX)			+= m8xx_pcmcia.o</div><div class='ctx'> obj-$(CONFIG_HD64465_PCMCIA)			+= hd64465_ss.o</div><div class='ctx'> obj-$(CONFIG_PCMCIA_SA1100)			+= sa11xx_core.o sa1100_cs.o</div><div class='ctx'> obj-$(CONFIG_PCMCIA_SA1111)			+= sa11xx_core.o sa1111_cs.o</div><div class='del'>-obj-$(CONFIG_PCMCIA_PXA2XX)                     += pxa2xx_core.o pxa2xx_cs.o</div><div class='ctx'> obj-$(CONFIG_M32R_PCC)				+= m32r_pcc.o</div><div class='ctx'> obj-$(CONFIG_M32R_CFC)				+= m32r_cfc.o</div><div class='ctx'> obj-$(CONFIG_PCMCIA_AU1X00)			+= au1x00_ss.o</div><div class='hunk'>@@ -68,9 +63,15 @@ sa1100_cs-$(CONFIG_SA1100_H3600)		+= sa1100_h3600.o</div><div class='ctx'> sa1100_cs-$(CONFIG_SA1100_SHANNON)		+= sa1100_shannon.o</div><div class='ctx'> sa1100_cs-$(CONFIG_SA1100_SIMPAD)		+= sa1100_simpad.o</div><div class='ctx'> </div><div class='del'>-pxa2xx_cs-$(CONFIG_ARCH_LUBBOCK)		+= pxa2xx_lubbock.o sa1111_generic.o</div><div class='del'>-pxa2xx_cs-$(CONFIG_MACH_MAINSTONE)		+= pxa2xx_mainstone.o</div><div class='del'>-pxa2xx_cs-$(CONFIG_PXA_SHARPSL)			+= pxa2xx_sharpsl.o</div><div class='del'>-pxa2xx_cs-$(CONFIG_MACH_ARMCORE)		+= pxa2xx_cm_x270.o</div><div class='del'>-pxa2xx_cs-$(CONFIG_MACH_PALMTX)		+= pxa2xx_palmtx.o</div><div class='add'>+pxa2xx_lubbock_cs-y				+= pxa2xx_lubbock.o sa1111_generic.o</div><div class='add'>+pxa2xx_cm_x2xx_cs-y				+= pxa2xx_cm_x2xx.o pxa2xx_cm_x255.o pxa2xx_cm_x270.o</div><div class='add'>+pxa2xx-obj-$(CONFIG_ARCH_LUBBOCK)		+= pxa2xx_lubbock_cs.o</div><div class='add'>+pxa2xx-obj-$(CONFIG_MACH_MAINSTONE)		+= pxa2xx_mainstone.o</div><div class='add'>+pxa2xx-obj-$(CONFIG_PXA_SHARPSL)		+= pxa2xx_sharpsl.o</div><div class='add'>+pxa2xx-obj-$(CONFIG_MACH_ARMCORE)		+= pxa2xx_cm_x2xx_cs.o</div><div class='add'>+pxa2xx-obj-$(CONFIG_ARCH_VIPER)			+= pxa2xx_viper.o</div><div class='add'>+pxa2xx-obj-$(CONFIG_TRIZEPS_PCMCIA)		+= pxa2xx_trizeps.o</div><div class='add'>+pxa2xx-obj-$(CONFIG_MACH_PALMTX)		+= pxa2xx_palmtx.o</div><div class='add'>+pxa2xx-obj-$(CONFIG_MACH_PALMLD)		+= pxa2xx_palmld.o</div><div class='ctx'> </div><div class='add'>+obj-$(CONFIG_PCMCIA_PXA2XX)			+= pxa2xx_core.o $(pxa2xx-obj-y)</div><div class='head'>diff --git a/drivers/pcmcia/au1000_generic.c b/drivers/pcmcia/au1000_generic.c<br/>index 75e8f8505e47..fc1de46fd20a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pcmcia/au1000_generic.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/pcmcia/au1000_generic.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pcmcia/au1000_generic.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pcmcia/au1000_generic.c</a></div><div class='hunk'>@@ -292,7 +292,7 @@ au1x00_pcmcia_set_io_map(struct pcmcia_socket *sock, struct pccard_io_map *map)</div><div class='ctx'> 		skt-&gt;spd_io[map-&gt;map] = speed;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	map-&gt;start=(ioaddr_t)(u32)skt-&gt;virt_io;</div><div class='add'>+	map-&gt;start=(unsigned int)(u32)skt-&gt;virt_io;</div><div class='ctx'> 	map-&gt;stop=map-&gt;start+MAP_SIZE;</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/pcmcia/au1000_generic.h b/drivers/pcmcia/au1000_generic.h<br/>index a53ef5902518..13a4fbc58711 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pcmcia/au1000_generic.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/pcmcia/au1000_generic.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pcmcia/au1000_generic.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pcmcia/au1000_generic.h</a></div><div class='hunk'>@@ -116,7 +116,7 @@ struct au1000_pcmcia_socket {</div><div class='ctx'> 	struct resource		res_attr;</div><div class='ctx'> </div><div class='ctx'> 	void *                 	virt_io;</div><div class='del'>-	ioaddr_t              	phys_io;</div><div class='add'>+	unsigned int		phys_io;</div><div class='ctx'> 	unsigned int           	phys_attr;</div><div class='ctx'> 	unsigned int           	phys_mem;</div><div class='ctx'> 	unsigned short        	speed_io, speed_attr, speed_mem;</div><div class='head'>diff --git a/drivers/pcmcia/au1000_pb1x00.c b/drivers/pcmcia/au1000_pb1x00.c<br/>index aa1cd4d3aa29..d6b4bd1db7d7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pcmcia/au1000_pb1x00.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/pcmcia/au1000_pb1x00.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pcmcia/au1000_pb1x00.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pcmcia/au1000_pb1x00.c</a></div><div class='hunk'>@@ -37,7 +37,6 @@</div><div class='ctx'> #include &lt;pcmcia/ss.h&gt;</div><div class='ctx'> #include &lt;pcmcia/cistpl.h&gt;</div><div class='ctx'> #include &lt;pcmcia/bus_ops.h&gt;</div><div class='del'>-#include "cs_internal.h"</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='head'>diff --git a/drivers/pcmcia/au1000_xxs1500.c b/drivers/pcmcia/au1000_xxs1500.c<br/>index 8a9b18cee847..9627390835ca 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pcmcia/au1000_xxs1500.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/pcmcia/au1000_xxs1500.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pcmcia/au1000_xxs1500.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pcmcia/au1000_xxs1500.c</a></div><div class='hunk'>@@ -41,7 +41,6 @@</div><div class='ctx'> #include &lt;pcmcia/ss.h&gt;</div><div class='ctx'> #include &lt;pcmcia/cistpl.h&gt;</div><div class='ctx'> #include &lt;pcmcia/bus_ops.h&gt;</div><div class='del'>-#include "cs_internal.h"</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='head'>diff --git a/drivers/pcmcia/cardbus.c b/drivers/pcmcia/cardbus.c<br/>index 911ca0e8dfc2..db77e1f3309a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pcmcia/cardbus.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/pcmcia/cardbus.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pcmcia/cardbus.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pcmcia/cardbus.c</a></div><div class='hunk'>@@ -238,7 +238,7 @@ int __ref cb_alloc(struct pcmcia_socket * s)</div><div class='ctx'> 	pci_bus_add_devices(bus);</div><div class='ctx'> </div><div class='ctx'> 	s-&gt;irq.AssignedIRQ = s-&gt;pci_irq;</div><div class='del'>-	return CS_SUCCESS;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void cb_free(struct pcmcia_socket * s)</div><div class='head'>diff --git a/drivers/pcmcia/cistpl.c b/drivers/pcmcia/cistpl.c<br/>index 65129b54eb09..dcce9f5d8465 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pcmcia/cistpl.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/pcmcia/cistpl.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pcmcia/cistpl.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pcmcia/cistpl.c</a></div><div class='hunk'>@@ -92,7 +92,8 @@ set_cis_map(struct pcmcia_socket *s, unsigned int card_offset, unsigned int flag</div><div class='ctx'> 	if (!(s-&gt;features &amp; SS_CAP_STATIC_MAP) &amp;&amp; (mem-&gt;res == NULL)) {</div><div class='ctx'> 		mem-&gt;res = pcmcia_find_mem_region(0, s-&gt;map_size, s-&gt;map_size, 0, s);</div><div class='ctx'> 		if (mem-&gt;res == NULL) {</div><div class='del'>-			printk(KERN_NOTICE "cs: unable to map card memory!\n");</div><div class='add'>+			dev_printk(KERN_NOTICE, &amp;s-&gt;dev,</div><div class='add'>+				   "cs: unable to map card memory!\n");</div><div class='ctx'> 			return NULL;</div><div class='ctx'> 		}</div><div class='ctx'> 		s-&gt;cis_virt = NULL;</div><div class='hunk'>@@ -265,13 +266,13 @@ EXPORT_SYMBOL(pcmcia_write_cis_mem);</div><div class='ctx'> ======================================================================*/</div><div class='ctx'> </div><div class='ctx'> static void read_cis_cache(struct pcmcia_socket *s, int attr, u_int addr,</div><div class='del'>-			   u_int len, void *ptr)</div><div class='add'>+			   size_t len, void *ptr)</div><div class='ctx'> {</div><div class='ctx'>     struct cis_cache_entry *cis;</div><div class='ctx'>     int ret;</div><div class='ctx'> </div><div class='ctx'>     if (s-&gt;fake_cis) {</div><div class='del'>-	if (s-&gt;fake_cis_len &gt; addr+len)</div><div class='add'>+	if (s-&gt;fake_cis_len &gt;= addr+len)</div><div class='ctx'> 	    memcpy(ptr, s-&gt;fake_cis+addr, len);</div><div class='ctx'> 	else</div><div class='ctx'> 	    memset(ptr, 0xff, len);</div><div class='hunk'>@@ -351,7 +352,9 @@ int verify_cis_cache(struct pcmcia_socket *s)</div><div class='ctx'> </div><div class='ctx'> 	buf = kmalloc(256, GFP_KERNEL);</div><div class='ctx'> 	if (buf == NULL)</div><div class='del'>-		return -1;</div><div class='add'>+		dev_printk(KERN_WARNING, &amp;s-&gt;dev,</div><div class='add'>+			   "no memory for verifying CIS\n");</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	list_for_each_entry(cis, &amp;s-&gt;cis_cache, node) {</div><div class='ctx'> 		int len = cis-&gt;len;</div><div class='ctx'> </div><div class='hunk'>@@ -380,18 +383,22 @@ int verify_cis_cache(struct pcmcia_socket *s)</div><div class='ctx'>     </div><div class='ctx'> ======================================================================*/</div><div class='ctx'> </div><div class='del'>-int pcmcia_replace_cis(struct pcmcia_socket *s, cisdump_t *cis)</div><div class='add'>+int pcmcia_replace_cis(struct pcmcia_socket *s,</div><div class='add'>+		       const u8 *data, const size_t len)</div><div class='ctx'> {</div><div class='del'>-    kfree(s-&gt;fake_cis);</div><div class='del'>-    s-&gt;fake_cis = NULL;</div><div class='del'>-    if (cis-&gt;Length &gt; CISTPL_MAX_CIS_SIZE)</div><div class='del'>-	return CS_BAD_SIZE;</div><div class='del'>-    s-&gt;fake_cis = kmalloc(cis-&gt;Length, GFP_KERNEL);</div><div class='del'>-    if (s-&gt;fake_cis == NULL)</div><div class='del'>-	return CS_OUT_OF_RESOURCE;</div><div class='del'>-    s-&gt;fake_cis_len = cis-&gt;Length;</div><div class='del'>-    memcpy(s-&gt;fake_cis, cis-&gt;Data, cis-&gt;Length);</div><div class='del'>-    return CS_SUCCESS;</div><div class='add'>+	if (len &gt; CISTPL_MAX_CIS_SIZE) {</div><div class='add'>+		dev_printk(KERN_WARNING, &amp;s-&gt;dev, "replacement CIS too big\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	kfree(s-&gt;fake_cis);</div><div class='add'>+	s-&gt;fake_cis = kmalloc(len, GFP_KERNEL);</div><div class='add'>+	if (s-&gt;fake_cis == NULL) {</div><div class='add'>+		dev_printk(KERN_WARNING, &amp;s-&gt;dev, "no memory to replace CIS\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	s-&gt;fake_cis_len = len;</div><div class='add'>+	memcpy(s-&gt;fake_cis, data, len);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(pcmcia_replace_cis);</div><div class='ctx'> </div><div class='hunk'>@@ -418,9 +425,9 @@ int pccard_get_next_tuple(struct pcmcia_socket *s, unsigned int func, tuple_t *t</div><div class='ctx'> int pccard_get_first_tuple(struct pcmcia_socket *s, unsigned int function, tuple_t *tuple)</div><div class='ctx'> {</div><div class='ctx'>     if (!s)</div><div class='del'>-	return CS_BAD_HANDLE;</div><div class='add'>+	return -EINVAL;</div><div class='ctx'>     if (!(s-&gt;state &amp; SOCKET_PRESENT))</div><div class='del'>-	return CS_NO_CARD;</div><div class='add'>+	return -ENODEV;</div><div class='ctx'>     tuple-&gt;TupleLink = tuple-&gt;Flags = 0;</div><div class='ctx'> #ifdef CONFIG_CARDBUS</div><div class='ctx'>     if (s-&gt;state &amp; SOCKET_CARDBUS) {</div><div class='hunk'>@@ -440,10 +447,10 @@ int pccard_get_first_tuple(struct pcmcia_socket *s, unsigned int function, tuple</div><div class='ctx'> 	!(tuple-&gt;Attributes &amp; TUPLE_RETURN_COMMON)) {</div><div class='ctx'> 	cisdata_t req = tuple-&gt;DesiredTuple;</div><div class='ctx'> 	tuple-&gt;DesiredTuple = CISTPL_LONGLINK_MFC;</div><div class='del'>-	if (pccard_get_next_tuple(s, function, tuple) == CS_SUCCESS) {</div><div class='add'>+	if (pccard_get_next_tuple(s, function, tuple) == 0) {</div><div class='ctx'> 	    tuple-&gt;DesiredTuple = CISTPL_LINKTARGET;</div><div class='del'>-	    if (pccard_get_next_tuple(s, function, tuple) != CS_SUCCESS)</div><div class='del'>-		return CS_NO_MORE_ITEMS;</div><div class='add'>+	    if (pccard_get_next_tuple(s, function, tuple) != 0)</div><div class='add'>+		return -ENOSPC;</div><div class='ctx'> 	} else</div><div class='ctx'> 	    tuple-&gt;CISOffset = tuple-&gt;TupleLink = 0;</div><div class='ctx'> 	tuple-&gt;DesiredTuple = req;</div><div class='hunk'>@@ -498,9 +505,9 @@ int pccard_get_next_tuple(struct pcmcia_socket *s, unsigned int function, tuple_</div><div class='ctx'>     int ofs, i, attr;</div><div class='ctx'> </div><div class='ctx'>     if (!s)</div><div class='del'>-	return CS_BAD_HANDLE;</div><div class='add'>+	return -EINVAL;</div><div class='ctx'>     if (!(s-&gt;state &amp; SOCKET_PRESENT))</div><div class='del'>-	return CS_NO_CARD;</div><div class='add'>+	return -ENODEV;</div><div class='ctx'> </div><div class='ctx'>     link[1] = tuple-&gt;TupleLink;</div><div class='ctx'>     ofs = tuple-&gt;CISOffset + tuple-&gt;TupleLink;</div><div class='hunk'>@@ -519,7 +526,7 @@ int pccard_get_next_tuple(struct pcmcia_socket *s, unsigned int function, tuple_</div><div class='ctx'> 	/* End of chain?  Follow long link if possible */</div><div class='ctx'> 	if (link[0] == CISTPL_END) {</div><div class='ctx'> 	    if ((ofs = follow_link(s, tuple)) &lt; 0)</div><div class='del'>-		return CS_NO_MORE_ITEMS;</div><div class='add'>+		return -ENOSPC;</div><div class='ctx'> 	    attr = SPACE(tuple-&gt;Flags);</div><div class='ctx'> 	    read_cis_cache(s, attr, ofs, 2, link);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -577,13 +584,13 @@ int pccard_get_next_tuple(struct pcmcia_socket *s, unsigned int function, tuple_</div><div class='ctx'>     }</div><div class='ctx'>     if (i == MAX_TUPLES) {</div><div class='ctx'> 	cs_dbg(s, 1, "cs: overrun in pcmcia_get_next_tuple\n");</div><div class='del'>-	return CS_NO_MORE_ITEMS;</div><div class='add'>+	return -ENOSPC;</div><div class='ctx'>     }</div><div class='ctx'>     </div><div class='ctx'>     tuple-&gt;TupleCode = link[0];</div><div class='ctx'>     tuple-&gt;TupleLink = link[1];</div><div class='ctx'>     tuple-&gt;CISOffset = ofs + 2;</div><div class='del'>-    return CS_SUCCESS;</div><div class='add'>+    return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(pccard_get_next_tuple);</div><div class='ctx'> </div><div class='hunk'>@@ -596,18 +603,18 @@ int pccard_get_tuple_data(struct pcmcia_socket *s, tuple_t *tuple)</div><div class='ctx'>     u_int len;</div><div class='ctx'> </div><div class='ctx'>     if (!s)</div><div class='del'>-	return CS_BAD_HANDLE;</div><div class='add'>+	return -EINVAL;</div><div class='ctx'> </div><div class='ctx'>     if (tuple-&gt;TupleLink &lt; tuple-&gt;TupleOffset)</div><div class='del'>-	return CS_NO_MORE_ITEMS;</div><div class='add'>+	return -ENOSPC;</div><div class='ctx'>     len = tuple-&gt;TupleLink - tuple-&gt;TupleOffset;</div><div class='ctx'>     tuple-&gt;TupleDataLen = tuple-&gt;TupleLink;</div><div class='ctx'>     if (len == 0)</div><div class='del'>-	return CS_SUCCESS;</div><div class='add'>+	return 0;</div><div class='ctx'>     read_cis_cache(s, SPACE(tuple-&gt;Flags),</div><div class='ctx'> 		   tuple-&gt;CISOffset + tuple-&gt;TupleOffset,</div><div class='ctx'> 		   _MIN(len, tuple-&gt;TupleDataMax), tuple-&gt;TupleData);</div><div class='del'>-    return CS_SUCCESS;</div><div class='add'>+    return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(pccard_get_tuple_data);</div><div class='ctx'> </div><div class='hunk'>@@ -640,25 +647,31 @@ static int parse_device(tuple_t *tuple, cistpl_device_t *device)</div><div class='ctx'> 	case 3: device-&gt;dev[i].speed = 150; break;</div><div class='ctx'> 	case 4: device-&gt;dev[i].speed = 100; break;</div><div class='ctx'> 	case 7:</div><div class='del'>-	    if (++p == q) return CS_BAD_TUPLE;</div><div class='add'>+	    if (++p == q)</div><div class='add'>+		    return -EINVAL;</div><div class='ctx'> 	    device-&gt;dev[i].speed = SPEED_CVT(*p);</div><div class='ctx'> 	    while (*p &amp; 0x80)</div><div class='del'>-		if (++p == q) return CS_BAD_TUPLE;</div><div class='add'>+		if (++p == q)</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 	    break;</div><div class='ctx'> 	default:</div><div class='del'>-	    return CS_BAD_TUPLE;</div><div class='add'>+	    return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (++p == q) return CS_BAD_TUPLE;</div><div class='del'>-	if (*p == 0xff) break;</div><div class='add'>+	if (++p == q)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (*p == 0xff)</div><div class='add'>+		break;</div><div class='ctx'> 	scale = *p &amp; 7;</div><div class='del'>-	if (scale == 7) return CS_BAD_TUPLE;</div><div class='add'>+	if (scale == 7)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	device-&gt;dev[i].size = ((*p &gt;&gt; 3) + 1) * (512 &lt;&lt; (scale*2));</div><div class='ctx'> 	device-&gt;ndev++;</div><div class='del'>-	if (++p == q) break;</div><div class='add'>+	if (++p == q)</div><div class='add'>+		break;</div><div class='ctx'>     }</div><div class='ctx'>     </div><div class='del'>-    return CS_SUCCESS;</div><div class='add'>+    return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*====================================================================*/</div><div class='hunk'>@@ -667,12 +680,12 @@ static int parse_checksum(tuple_t *tuple, cistpl_checksum_t *csum)</div><div class='ctx'> {</div><div class='ctx'>     u_char *p;</div><div class='ctx'>     if (tuple-&gt;TupleDataLen &lt; 5)</div><div class='del'>-	return CS_BAD_TUPLE;</div><div class='add'>+	return -EINVAL;</div><div class='ctx'>     p = (u_char *) tuple-&gt;TupleData;</div><div class='ctx'>     csum-&gt;addr = tuple-&gt;CISOffset + get_unaligned_le16(p) - 2;</div><div class='ctx'>     csum-&gt;len = get_unaligned_le16(p + 2);</div><div class='ctx'>     csum-&gt;sum = *(p + 4);</div><div class='del'>-    return CS_SUCCESS;</div><div class='add'>+    return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*====================================================================*/</div><div class='hunk'>@@ -680,9 +693,9 @@ static int parse_checksum(tuple_t *tuple, cistpl_checksum_t *csum)</div><div class='ctx'> static int parse_longlink(tuple_t *tuple, cistpl_longlink_t *link)</div><div class='ctx'> {</div><div class='ctx'>     if (tuple-&gt;TupleDataLen &lt; 4)</div><div class='del'>-	return CS_BAD_TUPLE;</div><div class='add'>+	return -EINVAL;</div><div class='ctx'>     link-&gt;addr = get_unaligned_le32(tuple-&gt;TupleData);</div><div class='del'>-    return CS_SUCCESS;</div><div class='add'>+    return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*====================================================================*/</div><div class='hunk'>@@ -697,13 +710,13 @@ static int parse_longlink_mfc(tuple_t *tuple,</div><div class='ctx'>     </div><div class='ctx'>     link-&gt;nfn = *p; p++;</div><div class='ctx'>     if (tuple-&gt;TupleDataLen &lt;= link-&gt;nfn*5)</div><div class='del'>-	return CS_BAD_TUPLE;</div><div class='add'>+	return -EINVAL;</div><div class='ctx'>     for (i = 0; i &lt; link-&gt;nfn; i++) {</div><div class='ctx'> 	link-&gt;fn[i].space = *p; p++;</div><div class='ctx'> 	link-&gt;fn[i].addr = get_unaligned_le32(p);</div><div class='ctx'> 	p += 4;</div><div class='ctx'>     }</div><div class='del'>-    return CS_SUCCESS;</div><div class='add'>+    return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*====================================================================*/</div><div class='hunk'>@@ -713,24 +726,27 @@ static int parse_strings(u_char *p, u_char *q, int max,</div><div class='ctx'> {</div><div class='ctx'>     int i, j, ns;</div><div class='ctx'> </div><div class='del'>-    if (p == q) return CS_BAD_TUPLE;</div><div class='add'>+    if (p == q)</div><div class='add'>+	    return -EINVAL;</div><div class='ctx'>     ns = 0; j = 0;</div><div class='ctx'>     for (i = 0; i &lt; max; i++) {</div><div class='del'>-	if (*p == 0xff) break;</div><div class='add'>+	if (*p == 0xff)</div><div class='add'>+		break;</div><div class='ctx'> 	ofs[i] = j;</div><div class='ctx'> 	ns++;</div><div class='ctx'> 	for (;;) {</div><div class='ctx'> 	    s[j++] = (*p == 0xff) ? '\0' : *p;</div><div class='ctx'> 	    if ((*p == '\0') || (*p == 0xff)) break;</div><div class='del'>-	    if (++p == q) return CS_BAD_TUPLE;</div><div class='add'>+	    if (++p == q)</div><div class='add'>+		    return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	if ((*p == 0xff) || (++p == q)) break;</div><div class='ctx'>     }</div><div class='ctx'>     if (found) {</div><div class='ctx'> 	*found = ns;</div><div class='del'>-	return CS_SUCCESS;</div><div class='add'>+	return 0;</div><div class='ctx'>     } else {</div><div class='del'>-	return (ns == max) ? CS_SUCCESS : CS_BAD_TUPLE;</div><div class='add'>+	return (ns == max) ? 0 : -EINVAL;</div><div class='ctx'>     }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -745,7 +761,8 @@ static int parse_vers_1(tuple_t *tuple, cistpl_vers_1_t *vers_1)</div><div class='ctx'>     </div><div class='ctx'>     vers_1-&gt;major = *p; p++;</div><div class='ctx'>     vers_1-&gt;minor = *p; p++;</div><div class='del'>-    if (p &gt;= q) return CS_BAD_TUPLE;</div><div class='add'>+    if (p &gt;= q)</div><div class='add'>+	    return -EINVAL;</div><div class='ctx'> </div><div class='ctx'>     return parse_strings(p, q, CISTPL_VERS_1_MAX_PROD_STRINGS,</div><div class='ctx'> 			 vers_1-&gt;str, vers_1-&gt;ofs, &amp;vers_1-&gt;ns);</div><div class='hunk'>@@ -781,7 +798,7 @@ static int parse_jedec(tuple_t *tuple, cistpl_jedec_t *jedec)</div><div class='ctx'> 	p += 2;</div><div class='ctx'>     }</div><div class='ctx'>     jedec-&gt;nid = nid;</div><div class='del'>-    return CS_SUCCESS;</div><div class='add'>+    return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*====================================================================*/</div><div class='hunk'>@@ -789,10 +806,10 @@ static int parse_jedec(tuple_t *tuple, cistpl_jedec_t *jedec)</div><div class='ctx'> static int parse_manfid(tuple_t *tuple, cistpl_manfid_t *m)</div><div class='ctx'> {</div><div class='ctx'>     if (tuple-&gt;TupleDataLen &lt; 4)</div><div class='del'>-	return CS_BAD_TUPLE;</div><div class='add'>+	return -EINVAL;</div><div class='ctx'>     m-&gt;manf = get_unaligned_le16(tuple-&gt;TupleData);</div><div class='ctx'>     m-&gt;card = get_unaligned_le16(tuple-&gt;TupleData + 2);</div><div class='del'>-    return CS_SUCCESS;</div><div class='add'>+    return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*====================================================================*/</div><div class='hunk'>@@ -801,11 +818,11 @@ static int parse_funcid(tuple_t *tuple, cistpl_funcid_t *f)</div><div class='ctx'> {</div><div class='ctx'>     u_char *p;</div><div class='ctx'>     if (tuple-&gt;TupleDataLen &lt; 2)</div><div class='del'>-	return CS_BAD_TUPLE;</div><div class='add'>+	return -EINVAL;</div><div class='ctx'>     p = (u_char *)tuple-&gt;TupleData;</div><div class='ctx'>     f-&gt;func = p[0];</div><div class='ctx'>     f-&gt;sysinit = p[1];</div><div class='del'>-    return CS_SUCCESS;</div><div class='add'>+    return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*====================================================================*/</div><div class='hunk'>@@ -815,12 +832,12 @@ static int parse_funce(tuple_t *tuple, cistpl_funce_t *f)</div><div class='ctx'>     u_char *p;</div><div class='ctx'>     int i;</div><div class='ctx'>     if (tuple-&gt;TupleDataLen &lt; 1)</div><div class='del'>-	return CS_BAD_TUPLE;</div><div class='add'>+	return -EINVAL;</div><div class='ctx'>     p = (u_char *)tuple-&gt;TupleData;</div><div class='ctx'>     f-&gt;type = p[0];</div><div class='ctx'>     for (i = 1; i &lt; tuple-&gt;TupleDataLen; i++)</div><div class='ctx'> 	f-&gt;data[i-1] = p[i];</div><div class='del'>-    return CS_SUCCESS;</div><div class='add'>+    return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*====================================================================*/</div><div class='hunk'>@@ -834,7 +851,7 @@ static int parse_config(tuple_t *tuple, cistpl_config_t *config)</div><div class='ctx'>     rasz = *p &amp; 0x03;</div><div class='ctx'>     rmsz = (*p &amp; 0x3c) &gt;&gt; 2;</div><div class='ctx'>     if (tuple-&gt;TupleDataLen &lt; rasz+rmsz+4)</div><div class='del'>-	return CS_BAD_TUPLE;</div><div class='add'>+	return -EINVAL;</div><div class='ctx'>     config-&gt;last_idx = *(++p);</div><div class='ctx'>     p++;</div><div class='ctx'>     config-&gt;base = 0;</div><div class='hunk'>@@ -846,7 +863,7 @@ static int parse_config(tuple_t *tuple, cistpl_config_t *config)</div><div class='ctx'>     for (i = 0; i &lt;= rmsz; i++)</div><div class='ctx'> 	config-&gt;rmask[i&gt;&gt;2] += p[i] &lt;&lt; (8*(i%4));</div><div class='ctx'>     config-&gt;subtuples = tuple-&gt;TupleDataLen - (rasz+rmsz+4);</div><div class='del'>-    return CS_SUCCESS;</div><div class='add'>+    return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*======================================================================</div><div class='hunk'>@@ -1002,10 +1019,12 @@ static u_char *parse_mem(u_char *p, u_char *q, cistpl_mem_t *mem)</div><div class='ctx'> </div><div class='ctx'> static u_char *parse_irq(u_char *p, u_char *q, cistpl_irq_t *irq)</div><div class='ctx'> {</div><div class='del'>-    if (p == q) return NULL;</div><div class='add'>+    if (p == q)</div><div class='add'>+	    return NULL;</div><div class='ctx'>     irq-&gt;IRQInfo1 = *p; p++;</div><div class='ctx'>     if (irq-&gt;IRQInfo1 &amp; IRQ_INFO2_VALID) {</div><div class='del'>-	if (p+2 &gt; q) return NULL;</div><div class='add'>+	if (p+2 &gt; q)</div><div class='add'>+		return NULL;</div><div class='ctx'> 	irq-&gt;IRQInfo2 = (p[1]&lt;&lt;8) + p[0];</div><div class='ctx'> 	p += 2;</div><div class='ctx'>     }</div><div class='hunk'>@@ -1026,7 +1045,8 @@ static int parse_cftable_entry(tuple_t *tuple,</div><div class='ctx'>     if (*p &amp; 0x40)</div><div class='ctx'> 	entry-&gt;flags |= CISTPL_CFTABLE_DEFAULT;</div><div class='ctx'>     if (*p &amp; 0x80) {</div><div class='del'>-	if (++p == q) return CS_BAD_TUPLE;</div><div class='add'>+	if (++p == q)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	if (*p &amp; 0x10)</div><div class='ctx'> 	    entry-&gt;flags |= CISTPL_CFTABLE_BVDS;</div><div class='ctx'> 	if (*p &amp; 0x20)</div><div class='hunk'>@@ -1040,30 +1060,35 @@ static int parse_cftable_entry(tuple_t *tuple,</div><div class='ctx'> 	entry-&gt;interface = 0;</div><div class='ctx'> </div><div class='ctx'>     /* Process optional features */</div><div class='del'>-    if (++p == q) return CS_BAD_TUPLE;</div><div class='add'>+    if (++p == q)</div><div class='add'>+	    return -EINVAL;</div><div class='ctx'>     features = *p; p++;</div><div class='ctx'> </div><div class='ctx'>     /* Power options */</div><div class='ctx'>     if ((features &amp; 3) &gt; 0) {</div><div class='ctx'> 	p = parse_power(p, q, &amp;entry-&gt;vcc);</div><div class='del'>-	if (p == NULL) return CS_BAD_TUPLE;</div><div class='add'>+	if (p == NULL)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'>     } else</div><div class='ctx'> 	entry-&gt;vcc.present = 0;</div><div class='ctx'>     if ((features &amp; 3) &gt; 1) {</div><div class='ctx'> 	p = parse_power(p, q, &amp;entry-&gt;vpp1);</div><div class='del'>-	if (p == NULL) return CS_BAD_TUPLE;</div><div class='add'>+	if (p == NULL)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'>     } else</div><div class='ctx'> 	entry-&gt;vpp1.present = 0;</div><div class='ctx'>     if ((features &amp; 3) &gt; 2) {</div><div class='ctx'> 	p = parse_power(p, q, &amp;entry-&gt;vpp2);</div><div class='del'>-	if (p == NULL) return CS_BAD_TUPLE;</div><div class='add'>+	if (p == NULL)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'>     } else</div><div class='ctx'> 	entry-&gt;vpp2.present = 0;</div><div class='ctx'> </div><div class='ctx'>     /* Timing options */</div><div class='ctx'>     if (features &amp; 0x04) {</div><div class='ctx'> 	p = parse_timing(p, q, &amp;entry-&gt;timing);</div><div class='del'>-	if (p == NULL) return CS_BAD_TUPLE;</div><div class='add'>+	if (p == NULL)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'>     } else {</div><div class='ctx'> 	entry-&gt;timing.wait = 0;</div><div class='ctx'> 	entry-&gt;timing.ready = 0;</div><div class='hunk'>@@ -1073,14 +1098,16 @@ static int parse_cftable_entry(tuple_t *tuple,</div><div class='ctx'>     /* I/O window options */</div><div class='ctx'>     if (features &amp; 0x08) {</div><div class='ctx'> 	p = parse_io(p, q, &amp;entry-&gt;io);</div><div class='del'>-	if (p == NULL) return CS_BAD_TUPLE;</div><div class='add'>+	if (p == NULL)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'>     } else</div><div class='ctx'> 	entry-&gt;io.nwin = 0;</div><div class='ctx'>     </div><div class='ctx'>     /* Interrupt options */</div><div class='ctx'>     if (features &amp; 0x10) {</div><div class='ctx'> 	p = parse_irq(p, q, &amp;entry-&gt;irq);</div><div class='del'>-	if (p == NULL) return CS_BAD_TUPLE;</div><div class='add'>+	if (p == NULL)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'>     } else</div><div class='ctx'> 	entry-&gt;irq.IRQInfo1 = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1094,7 +1121,8 @@ static int parse_cftable_entry(tuple_t *tuple,</div><div class='ctx'> 	entry-&gt;mem.win[0].card_addr = 0;</div><div class='ctx'> 	entry-&gt;mem.win[0].host_addr = 0;</div><div class='ctx'> 	p += 2;</div><div class='del'>-	if (p &gt; q) return CS_BAD_TUPLE;</div><div class='add'>+	if (p &gt; q)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	break;</div><div class='ctx'>     case 0x40:</div><div class='ctx'> 	entry-&gt;mem.nwin = 1;</div><div class='hunk'>@@ -1102,26 +1130,30 @@ static int parse_cftable_entry(tuple_t *tuple,</div><div class='ctx'> 	entry-&gt;mem.win[0].card_addr = get_unaligned_le16(p + 2) &lt;&lt; 8;</div><div class='ctx'> 	entry-&gt;mem.win[0].host_addr = 0;</div><div class='ctx'> 	p += 4;</div><div class='del'>-	if (p &gt; q) return CS_BAD_TUPLE;</div><div class='add'>+	if (p &gt; q)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	break;</div><div class='ctx'>     case 0x60:</div><div class='ctx'> 	p = parse_mem(p, q, &amp;entry-&gt;mem);</div><div class='del'>-	if (p == NULL) return CS_BAD_TUPLE;</div><div class='add'>+	if (p == NULL)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	break;</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     /* Misc features */</div><div class='ctx'>     if (features &amp; 0x80) {</div><div class='del'>-	if (p == q) return CS_BAD_TUPLE;</div><div class='add'>+	if (p == q)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	entry-&gt;flags |= (*p &lt;&lt; 8);</div><div class='ctx'> 	while (*p &amp; 0x80)</div><div class='del'>-	    if (++p == q) return CS_BAD_TUPLE;</div><div class='add'>+	    if (++p == q)</div><div class='add'>+		    return -EINVAL;</div><div class='ctx'> 	p++;</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     entry-&gt;subtuples = q-p;</div><div class='ctx'>     </div><div class='del'>-    return CS_SUCCESS;</div><div class='add'>+    return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*====================================================================*/</div><div class='hunk'>@@ -1132,12 +1164,12 @@ static int parse_bar(tuple_t *tuple, cistpl_bar_t *bar)</div><div class='ctx'> {</div><div class='ctx'>     u_char *p;</div><div class='ctx'>     if (tuple-&gt;TupleDataLen &lt; 6)</div><div class='del'>-	return CS_BAD_TUPLE;</div><div class='add'>+	return -EINVAL;</div><div class='ctx'>     p = (u_char *)tuple-&gt;TupleData;</div><div class='ctx'>     bar-&gt;attr = *p;</div><div class='ctx'>     p += 2;</div><div class='ctx'>     bar-&gt;size = get_unaligned_le32(p);</div><div class='del'>-    return CS_SUCCESS;</div><div class='add'>+    return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int parse_config_cb(tuple_t *tuple, cistpl_config_t *config)</div><div class='hunk'>@@ -1146,12 +1178,12 @@ static int parse_config_cb(tuple_t *tuple, cistpl_config_t *config)</div><div class='ctx'>     </div><div class='ctx'>     p = (u_char *)tuple-&gt;TupleData;</div><div class='ctx'>     if ((*p != 3) || (tuple-&gt;TupleDataLen &lt; 6))</div><div class='del'>-	return CS_BAD_TUPLE;</div><div class='add'>+	return -EINVAL;</div><div class='ctx'>     config-&gt;last_idx = *(++p);</div><div class='ctx'>     p++;</div><div class='ctx'>     config-&gt;base = get_unaligned_le32(p);</div><div class='ctx'>     config-&gt;subtuples = tuple-&gt;TupleDataLen - 6;</div><div class='del'>-    return CS_SUCCESS;</div><div class='add'>+    return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int parse_cftable_entry_cb(tuple_t *tuple,</div><div class='hunk'>@@ -1167,29 +1199,34 @@ static int parse_cftable_entry_cb(tuple_t *tuple,</div><div class='ctx'> 	entry-&gt;flags |= CISTPL_CFTABLE_DEFAULT;</div><div class='ctx'> </div><div class='ctx'>     /* Process optional features */</div><div class='del'>-    if (++p == q) return CS_BAD_TUPLE;</div><div class='add'>+    if (++p == q)</div><div class='add'>+	    return -EINVAL;</div><div class='ctx'>     features = *p; p++;</div><div class='ctx'> </div><div class='ctx'>     /* Power options */</div><div class='ctx'>     if ((features &amp; 3) &gt; 0) {</div><div class='ctx'> 	p = parse_power(p, q, &amp;entry-&gt;vcc);</div><div class='del'>-	if (p == NULL) return CS_BAD_TUPLE;</div><div class='add'>+	if (p == NULL)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'>     } else</div><div class='ctx'> 	entry-&gt;vcc.present = 0;</div><div class='ctx'>     if ((features &amp; 3) &gt; 1) {</div><div class='ctx'> 	p = parse_power(p, q, &amp;entry-&gt;vpp1);</div><div class='del'>-	if (p == NULL) return CS_BAD_TUPLE;</div><div class='add'>+	if (p == NULL)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'>     } else</div><div class='ctx'> 	entry-&gt;vpp1.present = 0;</div><div class='ctx'>     if ((features &amp; 3) &gt; 2) {</div><div class='ctx'> 	p = parse_power(p, q, &amp;entry-&gt;vpp2);</div><div class='del'>-	if (p == NULL) return CS_BAD_TUPLE;</div><div class='add'>+	if (p == NULL)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'>     } else</div><div class='ctx'> 	entry-&gt;vpp2.present = 0;</div><div class='ctx'> </div><div class='ctx'>     /* I/O window options */</div><div class='ctx'>     if (features &amp; 0x08) {</div><div class='del'>-	if (p == q) return CS_BAD_TUPLE;</div><div class='add'>+	if (p == q)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	entry-&gt;io = *p; p++;</div><div class='ctx'>     } else</div><div class='ctx'> 	entry-&gt;io = 0;</div><div class='hunk'>@@ -1197,32 +1234,37 @@ static int parse_cftable_entry_cb(tuple_t *tuple,</div><div class='ctx'>     /* Interrupt options */</div><div class='ctx'>     if (features &amp; 0x10) {</div><div class='ctx'> 	p = parse_irq(p, q, &amp;entry-&gt;irq);</div><div class='del'>-	if (p == NULL) return CS_BAD_TUPLE;</div><div class='add'>+	if (p == NULL)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'>     } else</div><div class='ctx'> 	entry-&gt;irq.IRQInfo1 = 0;</div><div class='ctx'> </div><div class='ctx'>     if (features &amp; 0x20) {</div><div class='del'>-	if (p == q) return CS_BAD_TUPLE;</div><div class='add'>+	if (p == q)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	entry-&gt;mem = *p; p++;</div><div class='ctx'>     } else</div><div class='ctx'> 	entry-&gt;mem = 0;</div><div class='ctx'> </div><div class='ctx'>     /* Misc features */</div><div class='ctx'>     if (features &amp; 0x80) {</div><div class='del'>-	if (p == q) return CS_BAD_TUPLE;</div><div class='add'>+	if (p == q)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	entry-&gt;flags |= (*p &lt;&lt; 8);</div><div class='ctx'> 	if (*p &amp; 0x80) {</div><div class='del'>-	    if (++p == q) return CS_BAD_TUPLE;</div><div class='add'>+	    if (++p == q)</div><div class='add'>+		    return -EINVAL;</div><div class='ctx'> 	    entry-&gt;flags |= (*p &lt;&lt; 16);</div><div class='ctx'> 	}</div><div class='ctx'> 	while (*p &amp; 0x80)</div><div class='del'>-	    if (++p == q) return CS_BAD_TUPLE;</div><div class='add'>+	    if (++p == q)</div><div class='add'>+		    return -EINVAL;</div><div class='ctx'> 	p++;</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     entry-&gt;subtuples = q-p;</div><div class='ctx'>     </div><div class='del'>-    return CS_SUCCESS;</div><div class='add'>+    return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='hunk'>@@ -1248,7 +1290,7 @@ static int parse_device_geo(tuple_t *tuple, cistpl_device_geo_t *geo)</div><div class='ctx'> 	p += 6;</div><div class='ctx'>     }</div><div class='ctx'>     geo-&gt;ngeo = n;</div><div class='del'>-    return CS_SUCCESS;</div><div class='add'>+    return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*====================================================================*/</div><div class='hunk'>@@ -1258,7 +1300,7 @@ static int parse_vers_2(tuple_t *tuple, cistpl_vers_2_t *v2)</div><div class='ctx'>     u_char *p, *q;</div><div class='ctx'> </div><div class='ctx'>     if (tuple-&gt;TupleDataLen &lt; 10)</div><div class='del'>-	return CS_BAD_TUPLE;</div><div class='add'>+	return -EINVAL;</div><div class='ctx'>     </div><div class='ctx'>     p = tuple-&gt;TupleData;</div><div class='ctx'>     q = p + tuple-&gt;TupleDataLen;</div><div class='hunk'>@@ -1282,15 +1324,18 @@ static int parse_org(tuple_t *tuple, cistpl_org_t *org)</div><div class='ctx'>     </div><div class='ctx'>     p = tuple-&gt;TupleData;</div><div class='ctx'>     q = p + tuple-&gt;TupleDataLen;</div><div class='del'>-    if (p == q) return CS_BAD_TUPLE;</div><div class='add'>+    if (p == q)</div><div class='add'>+	    return -EINVAL;</div><div class='ctx'>     org-&gt;data_org = *p;</div><div class='del'>-    if (++p == q) return CS_BAD_TUPLE;</div><div class='add'>+    if (++p == q)</div><div class='add'>+	    return -EINVAL;</div><div class='ctx'>     for (i = 0; i &lt; 30; i++) {</div><div class='ctx'> 	org-&gt;desc[i] = *p;</div><div class='ctx'> 	if (*p == '\0') break;</div><div class='del'>-	if (++p == q) return CS_BAD_TUPLE;</div><div class='add'>+	if (++p == q)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'>     }</div><div class='del'>-    return CS_SUCCESS;</div><div class='add'>+    return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*====================================================================*/</div><div class='hunk'>@@ -1300,7 +1345,7 @@ static int parse_format(tuple_t *tuple, cistpl_format_t *fmt)</div><div class='ctx'>     u_char *p;</div><div class='ctx'> </div><div class='ctx'>     if (tuple-&gt;TupleDataLen &lt; 10)</div><div class='del'>-	return CS_BAD_TUPLE;</div><div class='add'>+	return -EINVAL;</div><div class='ctx'> </div><div class='ctx'>     p = tuple-&gt;TupleData;</div><div class='ctx'> </div><div class='hunk'>@@ -1309,17 +1354,17 @@ static int parse_format(tuple_t *tuple, cistpl_format_t *fmt)</div><div class='ctx'>     fmt-&gt;offset = get_unaligned_le32(p + 2);</div><div class='ctx'>     fmt-&gt;length = get_unaligned_le32(p + 6);</div><div class='ctx'> </div><div class='del'>-    return CS_SUCCESS;</div><div class='add'>+    return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*====================================================================*/</div><div class='ctx'> </div><div class='del'>-int pccard_parse_tuple(tuple_t *tuple, cisparse_t *parse)</div><div class='add'>+int pcmcia_parse_tuple(tuple_t *tuple, cisparse_t *parse)</div><div class='ctx'> {</div><div class='del'>-    int ret = CS_SUCCESS;</div><div class='add'>+    int ret = 0;</div><div class='ctx'>     </div><div class='ctx'>     if (tuple-&gt;TupleDataLen &gt; tuple-&gt;TupleDataMax)</div><div class='del'>-	return CS_BAD_TUPLE;</div><div class='add'>+	return -EINVAL;</div><div class='ctx'>     switch (tuple-&gt;TupleCode) {</div><div class='ctx'>     case CISTPL_DEVICE:</div><div class='ctx'>     case CISTPL_DEVICE_A:</div><div class='hunk'>@@ -1387,15 +1432,17 @@ int pccard_parse_tuple(tuple_t *tuple, cisparse_t *parse)</div><div class='ctx'> 	break;</div><div class='ctx'>     case CISTPL_NO_LINK:</div><div class='ctx'>     case CISTPL_LINKTARGET:</div><div class='del'>-	ret = CS_SUCCESS;</div><div class='add'>+	ret = 0;</div><div class='ctx'> 	break;</div><div class='ctx'>     default:</div><div class='del'>-	ret = CS_UNSUPPORTED_FUNCTION;</div><div class='add'>+	ret = -EINVAL;</div><div class='ctx'> 	break;</div><div class='ctx'>     }</div><div class='add'>+    if (ret)</div><div class='add'>+	    __cs_dbg(0, "parse_tuple failed %d\n", ret);</div><div class='ctx'>     return ret;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(pccard_parse_tuple);</div><div class='add'>+EXPORT_SYMBOL(pcmcia_parse_tuple);</div><div class='ctx'> </div><div class='ctx'> /*======================================================================</div><div class='ctx'> </div><div class='hunk'>@@ -1410,18 +1457,22 @@ int pccard_read_tuple(struct pcmcia_socket *s, unsigned int function, cisdata_t</div><div class='ctx'>     int ret;</div><div class='ctx'> </div><div class='ctx'>     buf = kmalloc(256, GFP_KERNEL);</div><div class='del'>-    if (buf == NULL)</div><div class='del'>-	return CS_OUT_OF_RESOURCE;</div><div class='add'>+    if (buf == NULL) {</div><div class='add'>+	    dev_printk(KERN_WARNING, &amp;s-&gt;dev, "no memory to read tuple\n");</div><div class='add'>+	    return -ENOMEM;</div><div class='add'>+    }</div><div class='ctx'>     tuple.DesiredTuple = code;</div><div class='ctx'>     tuple.Attributes = TUPLE_RETURN_COMMON;</div><div class='ctx'>     ret = pccard_get_first_tuple(s, function, &amp;tuple);</div><div class='del'>-    if (ret != CS_SUCCESS) goto done;</div><div class='add'>+    if (ret != 0)</div><div class='add'>+	    goto done;</div><div class='ctx'>     tuple.TupleData = buf;</div><div class='ctx'>     tuple.TupleOffset = 0;</div><div class='ctx'>     tuple.TupleDataMax = 255;</div><div class='ctx'>     ret = pccard_get_tuple_data(s, &amp;tuple);</div><div class='del'>-    if (ret != CS_SUCCESS) goto done;</div><div class='del'>-    ret = pccard_parse_tuple(&amp;tuple, parse);</div><div class='add'>+    if (ret != 0)</div><div class='add'>+	    goto done;</div><div class='add'>+    ret = pcmcia_parse_tuple(&amp;tuple, parse);</div><div class='ctx'> done:</div><div class='ctx'>     kfree(buf);</div><div class='ctx'>     return ret;</div><div class='hunk'>@@ -1446,37 +1497,40 @@ int pccard_validate_cis(struct pcmcia_socket *s, unsigned int function, unsigned</div><div class='ctx'>     int ret, reserved, dev_ok = 0, ident_ok = 0;</div><div class='ctx'> </div><div class='ctx'>     if (!s)</div><div class='del'>-	return CS_BAD_HANDLE;</div><div class='add'>+	return -EINVAL;</div><div class='ctx'> </div><div class='ctx'>     tuple = kmalloc(sizeof(*tuple), GFP_KERNEL);</div><div class='del'>-    if (tuple == NULL)</div><div class='del'>-	return CS_OUT_OF_RESOURCE;</div><div class='add'>+    if (tuple == NULL) {</div><div class='add'>+	    dev_printk(KERN_WARNING, &amp;s-&gt;dev, "no memory to validate CIS\n");</div><div class='add'>+	    return -ENOMEM;</div><div class='add'>+    }</div><div class='ctx'>     p = kmalloc(sizeof(*p), GFP_KERNEL);</div><div class='ctx'>     if (p == NULL) {</div><div class='del'>-	kfree(tuple);</div><div class='del'>-	return CS_OUT_OF_RESOURCE;</div><div class='add'>+	    kfree(tuple);</div><div class='add'>+	    dev_printk(KERN_WARNING, &amp;s-&gt;dev, "no memory to validate CIS\n");</div><div class='add'>+	    return -ENOMEM;</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     count = reserved = 0;</div><div class='ctx'>     tuple-&gt;DesiredTuple = RETURN_FIRST_TUPLE;</div><div class='ctx'>     tuple-&gt;Attributes = TUPLE_RETURN_COMMON;</div><div class='ctx'>     ret = pccard_get_first_tuple(s, function, tuple);</div><div class='del'>-    if (ret != CS_SUCCESS)</div><div class='add'>+    if (ret != 0)</div><div class='ctx'> 	goto done;</div><div class='ctx'> </div><div class='ctx'>     /* First tuple should be DEVICE; we should really have either that</div><div class='ctx'>        or a CFTABLE_ENTRY of some sort */</div><div class='ctx'>     if ((tuple-&gt;TupleCode == CISTPL_DEVICE) ||</div><div class='del'>-	(pccard_read_tuple(s, function, CISTPL_CFTABLE_ENTRY, p) == CS_SUCCESS) ||</div><div class='del'>-	(pccard_read_tuple(s, function, CISTPL_CFTABLE_ENTRY_CB, p) == CS_SUCCESS))</div><div class='add'>+	(pccard_read_tuple(s, function, CISTPL_CFTABLE_ENTRY, p) == 0) ||</div><div class='add'>+	(pccard_read_tuple(s, function, CISTPL_CFTABLE_ENTRY_CB, p) == 0))</div><div class='ctx'> 	dev_ok++;</div><div class='ctx'> </div><div class='ctx'>     /* All cards should have a MANFID tuple, and/or a VERS_1 or VERS_2</div><div class='ctx'>        tuple, for card identification.  Certain old D-Link and Linksys</div><div class='ctx'>        cards have only a broken VERS_2 tuple; hence the bogus test. */</div><div class='del'>-    if ((pccard_read_tuple(s, function, CISTPL_MANFID, p) == CS_SUCCESS) ||</div><div class='del'>-	(pccard_read_tuple(s, function, CISTPL_VERS_1, p) == CS_SUCCESS) ||</div><div class='del'>-	(pccard_read_tuple(s, function, CISTPL_VERS_2, p) != CS_NO_MORE_ITEMS))</div><div class='add'>+    if ((pccard_read_tuple(s, function, CISTPL_MANFID, p) == 0) ||</div><div class='add'>+	(pccard_read_tuple(s, function, CISTPL_VERS_1, p) == 0) ||</div><div class='add'>+	(pccard_read_tuple(s, function, CISTPL_VERS_2, p) != -ENOSPC))</div><div class='ctx'> 	ident_ok++;</div><div class='ctx'> </div><div class='ctx'>     if (!dev_ok &amp;&amp; !ident_ok)</div><div class='hunk'>@@ -1484,7 +1538,8 @@ int pccard_validate_cis(struct pcmcia_socket *s, unsigned int function, unsigned</div><div class='ctx'> </div><div class='ctx'>     for (count = 1; count &lt; MAX_TUPLES; count++) {</div><div class='ctx'> 	ret = pccard_get_next_tuple(s, function, tuple);</div><div class='del'>-	if (ret != CS_SUCCESS) break;</div><div class='add'>+	if (ret != 0)</div><div class='add'>+		break;</div><div class='ctx'> 	if (((tuple-&gt;TupleCode &gt; 0x23) &amp;&amp; (tuple-&gt;TupleCode &lt; 0x40)) ||</div><div class='ctx'> 	    ((tuple-&gt;TupleCode &gt; 0x47) &amp;&amp; (tuple-&gt;TupleCode &lt; 0x80)) ||</div><div class='ctx'> 	    ((tuple-&gt;TupleCode &gt; 0x90) &amp;&amp; (tuple-&gt;TupleCode &lt; 0xff)))</div><div class='hunk'>@@ -1499,6 +1554,6 @@ done:</div><div class='ctx'> 	    *info = count;</div><div class='ctx'>     kfree(tuple);</div><div class='ctx'>     kfree(p);</div><div class='del'>-    return CS_SUCCESS;</div><div class='add'>+    return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(pccard_validate_cis);</div><div class='head'>diff --git a/drivers/pcmcia/cs.c b/drivers/pcmcia/cs.c<br/>index d1207393fc3e..c68c5d338285 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pcmcia/cs.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/pcmcia/cs.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pcmcia/cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pcmcia/cs.c</a></div><div class='hunk'>@@ -61,7 +61,7 @@ INT_MODULE_PARM(unreset_limit,	30);		/* unreset_check's */</div><div class='ctx'> /* Access speed for attribute memory windows */</div><div class='ctx'> INT_MODULE_PARM(cis_speed,	300);		/* ns */</div><div class='ctx'> </div><div class='del'>-#ifdef DEBUG</div><div class='add'>+#ifdef CONFIG_PCMCIA_DEBUG</div><div class='ctx'> static int pc_debug;</div><div class='ctx'> </div><div class='ctx'> module_param(pc_debug, int, 0644);</div><div class='hunk'>@@ -247,7 +247,8 @@ int pcmcia_register_socket(struct pcmcia_socket *socket)</div><div class='ctx'> </div><div class='ctx'> 	wait_for_completion(&amp;socket-&gt;thread_done);</div><div class='ctx'> 	if (!socket-&gt;thread) {</div><div class='del'>-		printk(KERN_WARNING "PCMCIA: warning: socket thread for socket %p did not start\n", socket);</div><div class='add'>+		dev_printk(KERN_WARNING, &amp;socket-&gt;dev,</div><div class='add'>+			   "PCMCIA: warning: socket thread did not start\n");</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -366,16 +367,16 @@ static int socket_reset(struct pcmcia_socket *skt)</div><div class='ctx'> 		skt-&gt;ops-&gt;get_status(skt, &amp;status);</div><div class='ctx'> </div><div class='ctx'> 		if (!(status &amp; SS_DETECT))</div><div class='del'>-			return CS_NO_CARD;</div><div class='add'>+			return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 		if (status &amp; SS_READY)</div><div class='del'>-			return CS_SUCCESS;</div><div class='add'>+			return 0;</div><div class='ctx'> </div><div class='ctx'> 		msleep(unreset_check * 10);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	cs_err(skt, "time out after reset.\n");</div><div class='del'>-	return CS_GENERAL_FAILURE;</div><div class='add'>+	return -ETIMEDOUT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -412,7 +413,8 @@ static void socket_shutdown(struct pcmcia_socket *s)</div><div class='ctx'> </div><div class='ctx'> 	s-&gt;ops-&gt;get_status(s, &amp;status);</div><div class='ctx'> 	if (status &amp; SS_POWERON) {</div><div class='del'>-		printk(KERN_ERR "PCMCIA: socket %p: *** DANGER *** unable to remove socket power\n", s);</div><div class='add'>+		dev_printk(KERN_ERR, &amp;s-&gt;dev,</div><div class='add'>+			   "*** DANGER *** unable to remove socket power\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	cs_socket_put(s);</div><div class='hunk'>@@ -426,14 +428,14 @@ static int socket_setup(struct pcmcia_socket *skt, int initial_delay)</div><div class='ctx'> </div><div class='ctx'> 	skt-&gt;ops-&gt;get_status(skt, &amp;status);</div><div class='ctx'> 	if (!(status &amp; SS_DETECT))</div><div class='del'>-		return CS_NO_CARD;</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	msleep(initial_delay * 10);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 100; i++) {</div><div class='ctx'> 		skt-&gt;ops-&gt;get_status(skt, &amp;status);</div><div class='ctx'> 		if (!(status &amp; SS_DETECT))</div><div class='del'>-			return CS_NO_CARD;</div><div class='add'>+			return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 		if (!(status &amp; SS_PENDING))</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -443,13 +445,13 @@ static int socket_setup(struct pcmcia_socket *skt, int initial_delay)</div><div class='ctx'> </div><div class='ctx'> 	if (status &amp; SS_PENDING) {</div><div class='ctx'> 		cs_err(skt, "voltage interrogation timed out.\n");</div><div class='del'>-		return CS_GENERAL_FAILURE;</div><div class='add'>+		return -ETIMEDOUT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (status &amp; SS_CARDBUS) {</div><div class='ctx'> 		if (!(skt-&gt;features &amp; SS_CAP_CARDBUS)) {</div><div class='ctx'> 			cs_err(skt, "cardbus cards are not supported.\n");</div><div class='del'>-			return CS_BAD_TYPE;</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> 		skt-&gt;state |= SOCKET_CARDBUS;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -463,7 +465,7 @@ static int socket_setup(struct pcmcia_socket *skt, int initial_delay)</div><div class='ctx'> 		skt-&gt;socket.Vcc = skt-&gt;socket.Vpp = 50;</div><div class='ctx'> 	else {</div><div class='ctx'> 		cs_err(skt, "unsupported voltage key.\n");</div><div class='del'>-		return CS_BAD_TYPE;</div><div class='add'>+		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (skt-&gt;power_hook)</div><div class='hunk'>@@ -480,7 +482,7 @@ static int socket_setup(struct pcmcia_socket *skt, int initial_delay)</div><div class='ctx'> 	skt-&gt;ops-&gt;get_status(skt, &amp;status);</div><div class='ctx'> 	if (!(status &amp; SS_POWERON)) {</div><div class='ctx'> 		cs_err(skt, "unable to apply power.\n");</div><div class='del'>-		return CS_BAD_TYPE;</div><div class='add'>+		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	status = socket_reset(skt);</div><div class='hunk'>@@ -502,15 +504,16 @@ static int socket_insert(struct pcmcia_socket *skt)</div><div class='ctx'> 	cs_dbg(skt, 4, "insert\n");</div><div class='ctx'> </div><div class='ctx'> 	if (!cs_socket_get(skt))</div><div class='del'>-		return CS_NO_CARD;</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	ret = socket_setup(skt, setup_delay);</div><div class='del'>-	if (ret == CS_SUCCESS) {</div><div class='add'>+	if (ret == 0) {</div><div class='ctx'> 		skt-&gt;state |= SOCKET_PRESENT;</div><div class='ctx'> </div><div class='del'>-		printk(KERN_NOTICE "pccard: %s card inserted into slot %d\n",</div><div class='del'>-		       (skt-&gt;state &amp; SOCKET_CARDBUS) ? "CardBus" : "PCMCIA",</div><div class='del'>-		       skt-&gt;sock);</div><div class='add'>+		dev_printk(KERN_NOTICE, &amp;skt-&gt;dev,</div><div class='add'>+			   "pccard: %s card inserted into slot %d\n",</div><div class='add'>+			   (skt-&gt;state &amp; SOCKET_CARDBUS) ? "CardBus" : "PCMCIA",</div><div class='add'>+			   skt-&gt;sock);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_CARDBUS</div><div class='ctx'> 		if (skt-&gt;state &amp; SOCKET_CARDBUS) {</div><div class='hunk'>@@ -531,7 +534,7 @@ static int socket_insert(struct pcmcia_socket *skt)</div><div class='ctx'> static int socket_suspend(struct pcmcia_socket *skt)</div><div class='ctx'> {</div><div class='ctx'> 	if (skt-&gt;state &amp; SOCKET_SUSPEND)</div><div class='del'>-		return CS_IN_USE;</div><div class='add'>+		return -EBUSY;</div><div class='ctx'> </div><div class='ctx'> 	send_event(skt, CS_EVENT_PM_SUSPEND, CS_EVENT_PRI_LOW);</div><div class='ctx'> 	skt-&gt;socket = dead_socket;</div><div class='hunk'>@@ -540,7 +543,7 @@ static int socket_suspend(struct pcmcia_socket *skt)</div><div class='ctx'> 		skt-&gt;ops-&gt;suspend(skt);</div><div class='ctx'> 	skt-&gt;state |= SOCKET_SUSPEND;</div><div class='ctx'> </div><div class='del'>-	return CS_SUCCESS;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -553,7 +556,7 @@ static int socket_resume(struct pcmcia_socket *skt)</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (!(skt-&gt;state &amp; SOCKET_SUSPEND))</div><div class='del'>-		return CS_IN_USE;</div><div class='add'>+		return -EBUSY;</div><div class='ctx'> </div><div class='ctx'> 	skt-&gt;socket = dead_socket;</div><div class='ctx'> 	skt-&gt;ops-&gt;init(skt);</div><div class='hunk'>@@ -565,7 +568,7 @@ static int socket_resume(struct pcmcia_socket *skt)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = socket_setup(skt, resume_delay);</div><div class='del'>-	if (ret == CS_SUCCESS) {</div><div class='add'>+	if (ret == 0) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * FIXME: need a better check here for cardbus cards.</div><div class='ctx'> 		 */</div><div class='hunk'>@@ -590,12 +593,13 @@ static int socket_resume(struct pcmcia_socket *skt)</div><div class='ctx'> </div><div class='ctx'> 	skt-&gt;state &amp;= ~SOCKET_SUSPEND;</div><div class='ctx'> </div><div class='del'>-	return CS_SUCCESS;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void socket_remove(struct pcmcia_socket *skt)</div><div class='ctx'> {</div><div class='del'>-	printk(KERN_NOTICE "pccard: card ejected from slot %d\n", skt-&gt;sock);</div><div class='add'>+	dev_printk(KERN_NOTICE, &amp;skt-&gt;dev,</div><div class='add'>+		   "pccard: card ejected from slot %d\n", skt-&gt;sock);</div><div class='ctx'> 	socket_shutdown(skt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -641,8 +645,8 @@ static int pccardd(void *__skt)</div><div class='ctx'> 	/* register with the device core */</div><div class='ctx'> 	ret = device_register(&amp;skt-&gt;dev);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		printk(KERN_WARNING "PCMCIA: unable to register socket 0x%p\n",</div><div class='del'>-			skt);</div><div class='add'>+		dev_printk(KERN_WARNING, &amp;skt-&gt;dev,</div><div class='add'>+			   "PCMCIA: unable to register socket\n");</div><div class='ctx'> 		skt-&gt;thread = NULL;</div><div class='ctx'> 		complete(&amp;skt-&gt;thread_done);</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -748,7 +752,7 @@ EXPORT_SYMBOL(pccard_register_pcmcia);</div><div class='ctx'>  * CIS register.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-int pccard_reset_card(struct pcmcia_socket *skt)</div><div class='add'>+int pcmcia_reset_card(struct pcmcia_socket *skt)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -757,15 +761,15 @@ int pccard_reset_card(struct pcmcia_socket *skt)</div><div class='ctx'> 	mutex_lock(&amp;skt-&gt;skt_mutex);</div><div class='ctx'> 	do {</div><div class='ctx'> 		if (!(skt-&gt;state &amp; SOCKET_PRESENT)) {</div><div class='del'>-			ret = CS_NO_CARD;</div><div class='add'>+			ret = -ENODEV;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (skt-&gt;state &amp; SOCKET_SUSPEND) {</div><div class='del'>-			ret = CS_IN_USE;</div><div class='add'>+			ret = -EBUSY;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (skt-&gt;state &amp; SOCKET_CARDBUS) {</div><div class='del'>-			ret = CS_UNSUPPORTED_FUNCTION;</div><div class='add'>+			ret = -EPERM;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -774,20 +778,20 @@ int pccard_reset_card(struct pcmcia_socket *skt)</div><div class='ctx'> 			send_event(skt, CS_EVENT_RESET_PHYSICAL, CS_EVENT_PRI_LOW);</div><div class='ctx'> 			if (skt-&gt;callback)</div><div class='ctx'> 				skt-&gt;callback-&gt;suspend(skt);</div><div class='del'>-			if (socket_reset(skt) == CS_SUCCESS) {</div><div class='add'>+			if (socket_reset(skt) == 0) {</div><div class='ctx'> 				send_event(skt, CS_EVENT_CARD_RESET, CS_EVENT_PRI_LOW);</div><div class='ctx'> 				if (skt-&gt;callback)</div><div class='ctx'> 					skt-&gt;callback-&gt;resume(skt);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		ret = CS_SUCCESS;</div><div class='add'>+		ret = 0;</div><div class='ctx'> 	} while (0);</div><div class='ctx'> 	mutex_unlock(&amp;skt-&gt;skt_mutex);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> } /* reset_card */</div><div class='del'>-EXPORT_SYMBOL(pccard_reset_card);</div><div class='add'>+EXPORT_SYMBOL(pcmcia_reset_card);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* These shut down or wake up a socket.  They are sort of user</div><div class='hunk'>@@ -802,11 +806,11 @@ int pcmcia_suspend_card(struct pcmcia_socket *skt)</div><div class='ctx'> 	mutex_lock(&amp;skt-&gt;skt_mutex);</div><div class='ctx'> 	do {</div><div class='ctx'> 		if (!(skt-&gt;state &amp; SOCKET_PRESENT)) {</div><div class='del'>-			ret = CS_NO_CARD;</div><div class='add'>+			ret = -ENODEV;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (skt-&gt;state &amp; SOCKET_CARDBUS) {</div><div class='del'>-			ret = CS_UNSUPPORTED_FUNCTION;</div><div class='add'>+			ret = -EPERM;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (skt-&gt;callback) {</div><div class='hunk'>@@ -832,11 +836,11 @@ int pcmcia_resume_card(struct pcmcia_socket *skt)</div><div class='ctx'> 	mutex_lock(&amp;skt-&gt;skt_mutex);</div><div class='ctx'> 	do {</div><div class='ctx'> 		if (!(skt-&gt;state &amp; SOCKET_PRESENT)) {</div><div class='del'>-			ret = CS_NO_CARD;</div><div class='add'>+			ret = -ENODEV;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (skt-&gt;state &amp; SOCKET_CARDBUS) {</div><div class='del'>-			ret = CS_UNSUPPORTED_FUNCTION;</div><div class='add'>+			ret = -EPERM;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		ret = socket_resume(skt);</div><div class='hunk'>@@ -892,7 +896,7 @@ int pcmcia_insert_card(struct pcmcia_socket *skt)</div><div class='ctx'> 			ret = -EBUSY;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		if (socket_insert(skt) == CS_NO_CARD) {</div><div class='add'>+		if (socket_insert(skt) == -ENODEV) {</div><div class='ctx'> 			ret = -ENODEV;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='head'>diff --git a/drivers/pcmcia/cs_internal.h b/drivers/pcmcia/cs_internal.h<br/>index 63dc1a28bda2..79615e6d540b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pcmcia/cs_internal.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/pcmcia/cs_internal.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pcmcia/cs_internal.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pcmcia/cs_internal.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * cs_internal.h</div><div class='add'>+ * cs_internal.h -- definitions internal to the PCMCIA core modules</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of the GNU General Public License version 2 as</div><div class='hunk'>@@ -10,6 +10,12 @@</div><div class='ctx'>  * are Copyright (C) 1999 David A. Hinds.  All Rights Reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * (C) 1999		David A. Hinds</div><div class='add'>+ * (C) 2003 - 2008	Dominik Brodowski</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * This file contains definitions _only_ needed by the PCMCIA core modules.</div><div class='add'>+ * It must not be included by PCMCIA socket drivers or by PCMCIA device</div><div class='add'>+ * drivers.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _LINUX_CS_INTERNAL_H</div><div class='hunk'>@@ -18,29 +24,24 @@</div><div class='ctx'> #include &lt;linux/kref.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Flags in client state */</div><div class='del'>-#define CLIENT_CONFIG_LOCKED	0x0001</div><div class='del'>-#define CLIENT_IRQ_REQ		0x0002</div><div class='del'>-#define CLIENT_IO_REQ		0x0004</div><div class='del'>-#define CLIENT_UNBOUND		0x0008</div><div class='del'>-#define CLIENT_STALE		0x0010</div><div class='ctx'> #define CLIENT_WIN_REQ(i)	(0x1&lt;&lt;(i))</div><div class='del'>-#define CLIENT_CARDBUS		0x8000</div><div class='ctx'> </div><div class='ctx'> /* Each card function gets one of these guys */</div><div class='ctx'> typedef struct config_t {</div><div class='ctx'> 	struct kref	ref;</div><div class='del'>-    u_int		state;</div><div class='del'>-    u_int		Attributes;</div><div class='del'>-    u_int		IntType;</div><div class='del'>-    u_int		ConfigBase;</div><div class='del'>-    u_char		Status, Pin, Copy, Option, ExtStatus;</div><div class='del'>-    u_int		CardValues;</div><div class='del'>-    io_req_t		io;</div><div class='del'>-    struct {</div><div class='del'>-	u_int		Attributes;</div><div class='del'>-    } irq;</div><div class='add'>+	unsigned int	state;</div><div class='add'>+	unsigned int	Attributes;</div><div class='add'>+	unsigned int	IntType;</div><div class='add'>+	unsigned int	ConfigBase;</div><div class='add'>+	unsigned char	Status, Pin, Copy, Option, ExtStatus;</div><div class='add'>+	unsigned int	CardValues;</div><div class='add'>+	io_req_t	io;</div><div class='add'>+	struct {</div><div class='add'>+		u_int	Attributes;</div><div class='add'>+	} irq;</div><div class='ctx'> } config_t;</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> struct cis_cache_entry {</div><div class='ctx'> 	struct list_head	node;</div><div class='ctx'> 	unsigned int		addr;</div><div class='hunk'>@@ -49,6 +50,30 @@ struct cis_cache_entry {</div><div class='ctx'> 	unsigned char		cache[0];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct pccard_resource_ops {</div><div class='add'>+	int	(*validate_mem)		(struct pcmcia_socket *s);</div><div class='add'>+	int	(*adjust_io_region)	(struct resource *res,</div><div class='add'>+					 unsigned long r_start,</div><div class='add'>+					 unsigned long r_end,</div><div class='add'>+					 struct pcmcia_socket *s);</div><div class='add'>+	struct resource* (*find_io)	(unsigned long base, int num,</div><div class='add'>+					 unsigned long align,</div><div class='add'>+					 struct pcmcia_socket *s);</div><div class='add'>+	struct resource* (*find_mem)	(unsigned long base, unsigned long num,</div><div class='add'>+					 unsigned long align, int low,</div><div class='add'>+					 struct pcmcia_socket *s);</div><div class='add'>+	int	(*add_io)		(struct pcmcia_socket *s,</div><div class='add'>+					 unsigned int action,</div><div class='add'>+					 unsigned long r_start,</div><div class='add'>+					 unsigned long r_end);</div><div class='add'>+	int	(*add_mem)		(struct pcmcia_socket *s,</div><div class='add'>+					 unsigned int action,</div><div class='add'>+					 unsigned long r_start,</div><div class='add'>+					 unsigned long r_end);</div><div class='add'>+	int	(*init)			(struct pcmcia_socket *s);</div><div class='add'>+	void	(*exit)			(struct pcmcia_socket *s);</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* Flags in config state */</div><div class='ctx'> #define CONFIG_LOCKED		0x01</div><div class='ctx'> #define CONFIG_IRQ_REQ		0x02</div><div class='hunk'>@@ -59,7 +84,6 @@ struct cis_cache_entry {</div><div class='ctx'> #define SOCKET_INUSE		0x0010</div><div class='ctx'> #define SOCKET_SUSPEND		0x0080</div><div class='ctx'> #define SOCKET_WIN_REQ(i)	(0x0100&lt;&lt;(i))</div><div class='del'>-#define SOCKET_REGION_INFO	0x4000</div><div class='ctx'> #define SOCKET_CARDBUS		0x8000</div><div class='ctx'> #define SOCKET_CARDBUS_CONFIG	0x10000</div><div class='ctx'> </div><div class='hunk'>@@ -83,69 +107,153 @@ static inline void cs_socket_put(struct pcmcia_socket *skt)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* In cardbus.c */</div><div class='del'>-int cb_alloc(struct pcmcia_socket *s);</div><div class='del'>-void cb_free(struct pcmcia_socket *s);</div><div class='del'>-int read_cb_mem(struct pcmcia_socket *s, int space, u_int addr, u_int len, void *ptr);</div><div class='add'>+#ifdef CONFIG_PCMCIA_DEBUG</div><div class='add'>+extern int cs_debug_level(int);</div><div class='ctx'> </div><div class='del'>-/* In cistpl.c */</div><div class='del'>-int pcmcia_read_cis_mem(struct pcmcia_socket *s, int attr,</div><div class='del'>-		 u_int addr, u_int len, void *ptr);</div><div class='del'>-void pcmcia_write_cis_mem(struct pcmcia_socket *s, int attr,</div><div class='del'>-		   u_int addr, u_int len, void *ptr);</div><div class='del'>-void release_cis_mem(struct pcmcia_socket *s);</div><div class='del'>-void destroy_cis_cache(struct pcmcia_socket *s);</div><div class='add'>+#define cs_dbg(skt, lvl, fmt, arg...) do {		\</div><div class='add'>+	if (cs_debug_level(lvl))			\</div><div class='add'>+		dev_printk(KERN_DEBUG, &amp;skt-&gt;dev,	\</div><div class='add'>+		 "cs: " fmt, ## arg);			\</div><div class='add'>+} while (0)</div><div class='add'>+#define __cs_dbg(lvl, fmt, arg...) do {			\</div><div class='add'>+	if (cs_debug_level(lvl))			\</div><div class='add'>+		printk(KERN_DEBUG 			\</div><div class='add'>+		 "cs: " fmt, ## arg);			\</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+#define cs_dbg(skt, lvl, fmt, arg...) do { } while (0)</div><div class='add'>+#define __cs_dbg(lvl, fmt, arg...) do { } while (0)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define cs_err(skt, fmt, arg...) \</div><div class='add'>+	dev_printk(KERN_ERR, &amp;skt-&gt;dev, "cs: " fmt, ## arg)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Stuff internal to module "pcmcia_core":</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* cistpl.c */</div><div class='ctx'> int verify_cis_cache(struct pcmcia_socket *s);</div><div class='del'>-int pccard_read_tuple(struct pcmcia_socket *s, unsigned int function, cisdata_t code, void *parse);</div><div class='ctx'> </div><div class='del'>-/* In rsrc_mgr */</div><div class='del'>-int pcmcia_validate_mem(struct pcmcia_socket *s);</div><div class='del'>-struct resource *pcmcia_find_io_region(unsigned long base, int num, unsigned long align,</div><div class='del'>-		   struct pcmcia_socket *s);</div><div class='del'>-int pcmcia_adjust_io_region(struct resource *res, unsigned long r_start,</div><div class='del'>-		     unsigned long r_end, struct pcmcia_socket *s);</div><div class='del'>-struct resource *pcmcia_find_mem_region(u_long base, u_long num, u_long align,</div><div class='del'>-		    int low, struct pcmcia_socket *s);</div><div class='add'>+/* rsrc_mgr.c */</div><div class='ctx'> void release_resource_db(struct pcmcia_socket *s);</div><div class='ctx'> </div><div class='del'>-/* In socket_sysfs.c */</div><div class='add'>+/* socket_sysfs.c */</div><div class='ctx'> extern int pccard_sysfs_add_socket(struct device *dev);</div><div class='ctx'> extern void pccard_sysfs_remove_socket(struct device *dev);</div><div class='ctx'> </div><div class='del'>-/* In cs.c */</div><div class='del'>-extern struct rw_semaphore pcmcia_socket_list_rwsem;</div><div class='del'>-extern struct list_head pcmcia_socket_list;</div><div class='del'>-int pcmcia_get_window(struct pcmcia_socket *s, window_handle_t *handle, int idx, win_req_t *req);</div><div class='del'>-int pccard_get_configuration_info(struct pcmcia_socket *s, struct pcmcia_device *p_dev, config_info_t *config);</div><div class='del'>-int pccard_reset_card(struct pcmcia_socket *skt);</div><div class='add'>+/* cardbus.c */</div><div class='add'>+int cb_alloc(struct pcmcia_socket *s);</div><div class='add'>+void cb_free(struct pcmcia_socket *s);</div><div class='add'>+int read_cb_mem(struct pcmcia_socket *s, int space, u_int addr, u_int len,</div><div class='add'>+		void *ptr);</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Stuff exported by module "pcmcia_core" to module "pcmcia"</div><div class='add'>+ */</div><div class='add'>+</div><div class='ctx'> struct pcmcia_callback{</div><div class='ctx'> 	struct module	*owner;</div><div class='del'>-	int		(*event) (struct pcmcia_socket *s, event_t event, int priority);</div><div class='add'>+	int		(*event) (struct pcmcia_socket *s,</div><div class='add'>+				  event_t event, int priority);</div><div class='ctx'> 	void		(*requery) (struct pcmcia_socket *s, int new_cis);</div><div class='ctx'> 	int		(*suspend) (struct pcmcia_socket *s);</div><div class='ctx'> 	int		(*resume) (struct pcmcia_socket *s);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* cs.c */</div><div class='add'>+extern struct rw_semaphore pcmcia_socket_list_rwsem;</div><div class='add'>+extern struct list_head pcmcia_socket_list;</div><div class='add'>+extern struct class pcmcia_socket_class;</div><div class='add'>+</div><div class='add'>+int pcmcia_get_window(struct pcmcia_socket *s,</div><div class='add'>+		      window_handle_t *handle,</div><div class='add'>+		      int idx,</div><div class='add'>+		      win_req_t *req);</div><div class='ctx'> int pccard_register_pcmcia(struct pcmcia_socket *s, struct pcmcia_callback *c);</div><div class='add'>+struct pcmcia_socket *pcmcia_get_socket_by_nr(unsigned int nr);</div><div class='ctx'> </div><div class='del'>-#define cs_socket_name(skt)	((skt)-&gt;dev.bus_id)</div><div class='add'>+int pcmcia_suspend_card(struct pcmcia_socket *skt);</div><div class='add'>+int pcmcia_resume_card(struct pcmcia_socket *skt);</div><div class='ctx'> </div><div class='del'>-#ifdef DEBUG</div><div class='del'>-extern int cs_debug_level(int);</div><div class='add'>+int pcmcia_eject_card(struct pcmcia_socket *skt);</div><div class='add'>+int pcmcia_insert_card(struct pcmcia_socket *skt);</div><div class='ctx'> </div><div class='del'>-#define cs_dbg(skt, lvl, fmt, arg...) do {		\</div><div class='del'>-	if (cs_debug_level(lvl))			\</div><div class='del'>-		printk(KERN_DEBUG "cs: %s: " fmt, 	\</div><div class='del'>-		       cs_socket_name(skt) , ## arg);	\</div><div class='del'>-} while (0)</div><div class='add'>+struct pcmcia_socket *pcmcia_get_socket(struct pcmcia_socket *skt);</div><div class='add'>+void pcmcia_put_socket(struct pcmcia_socket *skt);</div><div class='ctx'> </div><div class='del'>-#else</div><div class='del'>-#define cs_dbg(skt, lvl, fmt, arg...) do { } while (0)</div><div class='del'>-#endif</div><div class='add'>+/* cistpl.c */</div><div class='add'>+int pcmcia_read_cis_mem(struct pcmcia_socket *s, int attr,</div><div class='add'>+			u_int addr, u_int len, void *ptr);</div><div class='add'>+void pcmcia_write_cis_mem(struct pcmcia_socket *s, int attr,</div><div class='add'>+			  u_int addr, u_int len, void *ptr);</div><div class='add'>+void release_cis_mem(struct pcmcia_socket *s);</div><div class='add'>+void destroy_cis_cache(struct pcmcia_socket *s);</div><div class='add'>+int pccard_read_tuple(struct pcmcia_socket *s, unsigned int function,</div><div class='add'>+		      cisdata_t code, void *parse);</div><div class='add'>+int pcmcia_replace_cis(struct pcmcia_socket *s,</div><div class='add'>+		       const u8 *data, const size_t len);</div><div class='add'>+int pccard_validate_cis(struct pcmcia_socket *s, unsigned int function,</div><div class='add'>+			unsigned int *count);</div><div class='ctx'> </div><div class='del'>-#define cs_err(skt, fmt, arg...) \</div><div class='del'>-	printk(KERN_ERR "cs: %s: " fmt, (skt)-&gt;dev.bus_id , ## arg)</div><div class='add'>+/* rsrc_mgr.c */</div><div class='add'>+int pcmcia_validate_mem(struct pcmcia_socket *s);</div><div class='add'>+struct resource *pcmcia_find_io_region(unsigned long base,</div><div class='add'>+				       int num,</div><div class='add'>+				       unsigned long align,</div><div class='add'>+				       struct pcmcia_socket *s);</div><div class='add'>+int pcmcia_adjust_io_region(struct resource *res,</div><div class='add'>+			    unsigned long r_start,</div><div class='add'>+			    unsigned long r_end,</div><div class='add'>+			    struct pcmcia_socket *s);</div><div class='add'>+struct resource *pcmcia_find_mem_region(u_long base,</div><div class='add'>+					u_long num,</div><div class='add'>+					u_long align,</div><div class='add'>+					int low,</div><div class='add'>+					struct pcmcia_socket *s);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Stuff internal to module "pcmcia".</div><div class='add'>+ */</div><div class='add'>+/* ds.c */</div><div class='add'>+extern struct bus_type pcmcia_bus_type;</div><div class='add'>+</div><div class='add'>+/* pcmcia_resource.c */</div><div class='add'>+extern int pcmcia_release_configuration(struct pcmcia_device *p_dev);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PCMCIA_IOCTL</div><div class='add'>+/* ds.c */</div><div class='add'>+extern spinlock_t pcmcia_dev_list_lock;</div><div class='add'>+</div><div class='add'>+extern struct pcmcia_device *pcmcia_get_dev(struct pcmcia_device *p_dev);</div><div class='add'>+extern void pcmcia_put_dev(struct pcmcia_device *p_dev);</div><div class='add'>+</div><div class='add'>+struct pcmcia_device *pcmcia_device_add(struct pcmcia_socket *s,</div><div class='add'>+					unsigned int function);</div><div class='add'>+</div><div class='add'>+/* pcmcia_ioctl.c */</div><div class='add'>+extern void __init pcmcia_setup_ioctl(void);</div><div class='add'>+extern void __exit pcmcia_cleanup_ioctl(void);</div><div class='add'>+extern void handle_event(struct pcmcia_socket *s, event_t event);</div><div class='add'>+extern int handle_request(struct pcmcia_socket *s, event_t event);</div><div class='add'>+</div><div class='add'>+#else /* CONFIG_PCMCIA_IOCTL */</div><div class='add'>+</div><div class='add'>+static inline void __init pcmcia_setup_ioctl(void) { return; }</div><div class='add'>+static inline void __exit pcmcia_cleanup_ioctl(void) { return; }</div><div class='add'>+static inline void handle_event(struct pcmcia_socket *s, event_t event)</div><div class='add'>+{</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+static inline int handle_request(struct pcmcia_socket *s, event_t event)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_PCMCIA_IOCTL */</div><div class='ctx'> </div><div class='ctx'> #endif /* _LINUX_CS_INTERNAL_H */</div><div class='head'>diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c<br/>index 34c83d3ca0fa..795660255490 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pcmcia/ds.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/pcmcia/ds.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pcmcia/ds.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pcmcia/ds.c</a></div><div class='hunk'>@@ -32,7 +32,6 @@</div><div class='ctx'> #include &lt;pcmcia/ss.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "cs_internal.h"</div><div class='del'>-#include "ds_internal.h"</div><div class='ctx'> </div><div class='ctx'> /*====================================================================*/</div><div class='ctx'> </div><div class='hunk'>@@ -42,17 +41,22 @@ MODULE_AUTHOR("David Hinds &lt;dahinds@users.sourceforge.net&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("PCMCIA Driver Services");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='del'>-#ifdef DEBUG</div><div class='add'>+#ifdef CONFIG_PCMCIA_DEBUG</div><div class='ctx'> int ds_pc_debug;</div><div class='ctx'> </div><div class='ctx'> module_param_named(pc_debug, ds_pc_debug, int, 0644);</div><div class='ctx'> </div><div class='ctx'> #define ds_dbg(lvl, fmt, arg...) do {				\</div><div class='del'>-	if (ds_pc_debug &gt; (lvl))					\</div><div class='add'>+	if (ds_pc_debug &gt; (lvl))				\</div><div class='ctx'> 		printk(KERN_DEBUG "ds: " fmt , ## arg);		\</div><div class='ctx'> } while (0)</div><div class='add'>+#define ds_dev_dbg(lvl, dev, fmt, arg...) do {				\</div><div class='add'>+	if (ds_pc_debug &gt; (lvl))					\</div><div class='add'>+		dev_printk(KERN_DEBUG, dev, "ds: " fmt , ## arg);	\</div><div class='add'>+} while (0)</div><div class='ctx'> #else</div><div class='ctx'> #define ds_dbg(lvl, fmt, arg...) do { } while (0)</div><div class='add'>+#define ds_dev_dbg(lvl, dev, fmt, arg...) do { } while (0)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> spinlock_t pcmcia_dev_list_lock;</div><div class='hunk'>@@ -64,42 +68,19 @@ spinlock_t pcmcia_dev_list_lock;</div><div class='ctx'> /* String tables for error messages */</div><div class='ctx'> </div><div class='ctx'> typedef struct lookup_t {</div><div class='del'>-    int key;</div><div class='del'>-    char *msg;</div><div class='add'>+    const int key;</div><div class='add'>+    const char *msg;</div><div class='ctx'> } lookup_t;</div><div class='ctx'> </div><div class='ctx'> static const lookup_t error_table[] = {</div><div class='del'>-    { CS_SUCCESS,		"Operation succeeded" },</div><div class='del'>-    { CS_BAD_ADAPTER,		"Bad adapter" },</div><div class='del'>-    { CS_BAD_ATTRIBUTE, 	"Bad attribute", },</div><div class='del'>-    { CS_BAD_BASE,		"Bad base address" },</div><div class='del'>-    { CS_BAD_EDC,		"Bad EDC" },</div><div class='del'>-    { CS_BAD_IRQ,		"Bad IRQ" },</div><div class='del'>-    { CS_BAD_OFFSET,		"Bad offset" },</div><div class='del'>-    { CS_BAD_PAGE,		"Bad page number" },</div><div class='del'>-    { CS_READ_FAILURE,		"Read failure" },</div><div class='del'>-    { CS_BAD_SIZE,		"Bad size" },</div><div class='del'>-    { CS_BAD_SOCKET,		"Bad socket" },</div><div class='del'>-    { CS_BAD_TYPE,		"Bad type" },</div><div class='del'>-    { CS_BAD_VCC,		"Bad Vcc" },</div><div class='del'>-    { CS_BAD_VPP,		"Bad Vpp" },</div><div class='del'>-    { CS_BAD_WINDOW,		"Bad window" },</div><div class='del'>-    { CS_WRITE_FAILURE,		"Write failure" },</div><div class='del'>-    { CS_NO_CARD,		"No card present" },</div><div class='del'>-    { CS_UNSUPPORTED_FUNCTION,	"Usupported function" },</div><div class='del'>-    { CS_UNSUPPORTED_MODE,	"Unsupported mode" },</div><div class='del'>-    { CS_BAD_SPEED,		"Bad speed" },</div><div class='del'>-    { CS_BUSY,			"Resource busy" },</div><div class='del'>-    { CS_GENERAL_FAILURE,	"General failure" },</div><div class='del'>-    { CS_WRITE_PROTECTED,	"Write protected" },</div><div class='del'>-    { CS_BAD_ARG_LENGTH,	"Bad argument length" },</div><div class='del'>-    { CS_BAD_ARGS,		"Bad arguments" },</div><div class='del'>-    { CS_CONFIGURATION_LOCKED,	"Configuration locked" },</div><div class='del'>-    { CS_IN_USE,		"Resource in use" },</div><div class='del'>-    { CS_NO_MORE_ITEMS,		"No more items" },</div><div class='del'>-    { CS_OUT_OF_RESOURCE,	"Out of resource" },</div><div class='del'>-    { CS_BAD_HANDLE,		"Bad handle" },</div><div class='del'>-    { CS_BAD_TUPLE,		"Bad CIS tuple" }</div><div class='add'>+    { 0,			"Operation succeeded" },</div><div class='add'>+    { -EIO,			"Input/Output error" },</div><div class='add'>+    { -ENODEV,			"No card present" },</div><div class='add'>+    { -EINVAL,			"Bad parameter" },</div><div class='add'>+    { -EACCES,			"Configuration locked" },</div><div class='add'>+    { -EBUSY,			"Resource in use" },</div><div class='add'>+    { -ENOSPC,			"No more items" },</div><div class='add'>+    { -ENOMEM,			"Out of resource" },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -155,46 +136,32 @@ static const lookup_t service_table[] = {</div><div class='ctx'>     { ReplaceCIS,			"ReplaceCIS" }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static int pcmcia_report_error(struct pcmcia_device *p_dev, error_info_t *err)</div><div class='add'>+const char *pcmcia_error_func(int func)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='del'>-	char *serv;</div><div class='del'>-</div><div class='del'>-	if (!p_dev)</div><div class='del'>-		printk(KERN_NOTICE);</div><div class='del'>-	else</div><div class='del'>-		printk(KERN_NOTICE "%s: ", p_dev-&gt;dev.bus_id);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(service_table); i++)</div><div class='del'>-		if (service_table[i].key == err-&gt;func)</div><div class='del'>-			break;</div><div class='del'>-	if (i &lt; ARRAY_SIZE(service_table))</div><div class='del'>-		serv = service_table[i].msg;</div><div class='del'>-	else</div><div class='del'>-		serv = "Unknown service number";</div><div class='add'>+		if (service_table[i].key == func)</div><div class='add'>+			return service_table[i].msg;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(error_table); i++)</div><div class='del'>-		if (error_table[i].key == err-&gt;retcode)</div><div class='del'>-			break;</div><div class='del'>-	if (i &lt; ARRAY_SIZE(error_table))</div><div class='del'>-		printk("%s: %s\n", serv, error_table[i].msg);</div><div class='del'>-	else</div><div class='del'>-		printk("%s: Unknown error code %#x\n", serv, err-&gt;retcode);</div><div class='add'>+	return "Unknown service number";</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(pcmcia_error_func);</div><div class='ctx'> </div><div class='del'>-	return CS_SUCCESS;</div><div class='del'>-} /* report_error */</div><div class='add'>+const char *pcmcia_error_ret(int ret)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(error_table); i++)</div><div class='add'>+		if (error_table[i].key == ret)</div><div class='add'>+			return error_table[i].msg;</div><div class='ctx'> </div><div class='del'>-/* end of code which was in cs.c before */</div><div class='add'>+	return "unknown";</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(pcmcia_error_ret);</div><div class='ctx'> </div><div class='ctx'> /*======================================================================*/</div><div class='ctx'> </div><div class='del'>-void cs_error(struct pcmcia_device *p_dev, int func, int ret)</div><div class='del'>-{</div><div class='del'>-	error_info_t err = { func, ret };</div><div class='del'>-	pcmcia_report_error(p_dev, &amp;err);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(cs_error);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static void pcmcia_check_driver(struct pcmcia_driver *p_drv)</div><div class='hunk'>@@ -391,7 +358,7 @@ static void pcmcia_release_function(struct kref *ref)</div><div class='ctx'> static void pcmcia_release_dev(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct pcmcia_device *p_dev = to_pcmcia_dev(dev);</div><div class='del'>-	ds_dbg(1, "releasing device %s\n", p_dev-&gt;dev.bus_id);</div><div class='add'>+	ds_dev_dbg(1, dev, "releasing device\n");</div><div class='ctx'> 	pcmcia_put_socket(p_dev-&gt;socket);</div><div class='ctx'> 	kfree(p_dev-&gt;devname);</div><div class='ctx'> 	kref_put(&amp;p_dev-&gt;function_config-&gt;ref, pcmcia_release_function);</div><div class='hunk'>@@ -401,7 +368,7 @@ static void pcmcia_release_dev(struct device *dev)</div><div class='ctx'> static void pcmcia_add_device_later(struct pcmcia_socket *s, int mfc)</div><div class='ctx'> {</div><div class='ctx'> 	if (!s-&gt;pcmcia_state.device_add_pending) {</div><div class='del'>-		ds_dbg(1, "scheduling to add %s secondary"</div><div class='add'>+		ds_dev_dbg(1, &amp;s-&gt;dev, "scheduling to add %s secondary"</div><div class='ctx'> 		       " device to %d\n", mfc ? "mfc" : "pfc", s-&gt;sock);</div><div class='ctx'> 		s-&gt;pcmcia_state.device_add_pending = 1;</div><div class='ctx'> 		s-&gt;pcmcia_state.mfc_pfc = mfc;</div><div class='hunk'>@@ -439,8 +406,7 @@ static int pcmcia_device_probe(struct device * dev)</div><div class='ctx'> 	 */</div><div class='ctx'> 	did = p_dev-&gt;dev.driver_data;</div><div class='ctx'> </div><div class='del'>-	ds_dbg(1, "trying to bind %s to %s\n", p_dev-&gt;dev.bus_id,</div><div class='del'>-	       p_drv-&gt;drv.name);</div><div class='add'>+	ds_dev_dbg(1, dev, "trying to bind to %s\n", p_drv-&gt;drv.name);</div><div class='ctx'> </div><div class='ctx'> 	if ((!p_drv-&gt;probe) || (!p_dev-&gt;function_config) ||</div><div class='ctx'> 	    (!try_module_get(p_drv-&gt;owner))) {</div><div class='hunk'>@@ -455,15 +421,16 @@ static int pcmcia_device_probe(struct device * dev)</div><div class='ctx'> 		p_dev-&gt;conf.ConfigBase = cis_config.base;</div><div class='ctx'> 		p_dev-&gt;conf.Present = cis_config.rmask[0];</div><div class='ctx'> 	} else {</div><div class='del'>-		printk(KERN_INFO "pcmcia: could not parse base and rmask0 of CIS\n");</div><div class='add'>+		dev_printk(KERN_INFO, dev,</div><div class='add'>+			   "pcmcia: could not parse base and rmask0 of CIS\n");</div><div class='ctx'> 		p_dev-&gt;conf.ConfigBase = 0;</div><div class='ctx'> 		p_dev-&gt;conf.Present = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = p_drv-&gt;probe(p_dev);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		ds_dbg(1, "binding %s to %s failed with %d\n",</div><div class='del'>-		       p_dev-&gt;dev.bus_id, p_drv-&gt;drv.name, ret);</div><div class='add'>+		ds_dev_dbg(1, dev, "binding to %s failed with %d\n",</div><div class='add'>+			   p_drv-&gt;drv.name, ret);</div><div class='ctx'> 		goto put_module;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -490,8 +457,9 @@ static void pcmcia_card_remove(struct pcmcia_socket *s, struct pcmcia_device *le</div><div class='ctx'> 	struct pcmcia_device	*tmp;</div><div class='ctx'> 	unsigned long		flags;</div><div class='ctx'> </div><div class='del'>-	ds_dbg(2, "pcmcia_card_remove(%d) %s\n", s-&gt;sock,</div><div class='del'>-	       leftover ? leftover-&gt;devname : "");</div><div class='add'>+	ds_dev_dbg(2, leftover ? &amp;leftover-&gt;dev : &amp;s-&gt;dev,</div><div class='add'>+		   "pcmcia_card_remove(%d) %s\n", s-&gt;sock,</div><div class='add'>+		   leftover ? leftover-&gt;devname : "");</div><div class='ctx'> </div><div class='ctx'> 	if (!leftover)</div><div class='ctx'> 		s-&gt;device_count = 0;</div><div class='hunk'>@@ -508,7 +476,7 @@ static void pcmcia_card_remove(struct pcmcia_socket *s, struct pcmcia_device *le</div><div class='ctx'> 		p_dev-&gt;_removed=1;</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;pcmcia_dev_list_lock, flags);</div><div class='ctx'> </div><div class='del'>-		ds_dbg(2, "unregistering device %s\n", p_dev-&gt;dev.bus_id);</div><div class='add'>+		ds_dev_dbg(2, &amp;p_dev-&gt;dev, "unregistering device\n");</div><div class='ctx'> 		device_unregister(&amp;p_dev-&gt;dev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -525,7 +493,7 @@ static int pcmcia_device_remove(struct device * dev)</div><div class='ctx'> 	p_dev = to_pcmcia_dev(dev);</div><div class='ctx'> 	p_drv = to_pcmcia_drv(dev-&gt;driver);</div><div class='ctx'> </div><div class='del'>-	ds_dbg(1, "removing device %s\n", p_dev-&gt;dev.bus_id);</div><div class='add'>+	ds_dev_dbg(1, dev, "removing device\n");</div><div class='ctx'> </div><div class='ctx'> 	/* If we're removing the primary module driving a</div><div class='ctx'> 	 * pseudo multi-function card, we need to unbind</div><div class='hunk'>@@ -548,13 +516,15 @@ static int pcmcia_device_remove(struct device * dev)</div><div class='ctx'> </div><div class='ctx'> 	/* check for proper unloading */</div><div class='ctx'> 	if (p_dev-&gt;_irq || p_dev-&gt;_io || p_dev-&gt;_locked)</div><div class='del'>-		printk(KERN_INFO "pcmcia: driver %s did not release config properly\n",</div><div class='del'>-		       p_drv-&gt;drv.name);</div><div class='add'>+		dev_printk(KERN_INFO, dev,</div><div class='add'>+			"pcmcia: driver %s did not release config properly\n",</div><div class='add'>+			p_drv-&gt;drv.name);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; MAX_WIN; i++)</div><div class='ctx'> 		if (p_dev-&gt;_win &amp; CLIENT_WIN_REQ(i))</div><div class='del'>-			printk(KERN_INFO "pcmcia: driver %s did not release windows properly\n",</div><div class='del'>-			       p_drv-&gt;drv.name);</div><div class='add'>+			dev_printk(KERN_INFO, dev,</div><div class='add'>+			  "pcmcia: driver %s did not release window properly\n",</div><div class='add'>+			   p_drv-&gt;drv.name);</div><div class='ctx'> </div><div class='ctx'> 	/* references from pcmcia_probe_device */</div><div class='ctx'> 	pcmcia_put_dev(p_dev);</div><div class='hunk'>@@ -603,8 +573,9 @@ static int pcmcia_device_query(struct pcmcia_device *p_dev)</div><div class='ctx'> 		}</div><div class='ctx'> 		if (!pccard_read_tuple(p_dev-&gt;socket, p_dev-&gt;func,</div><div class='ctx'> 				      CISTPL_DEVICE_GEO, devgeo)) {</div><div class='del'>-			ds_dbg(0, "mem device geometry probably means "</div><div class='del'>-			       "FUNCID_MEMORY\n");</div><div class='add'>+			ds_dev_dbg(0, &amp;p_dev-&gt;dev,</div><div class='add'>+				   "mem device geometry probably means "</div><div class='add'>+				   "FUNCID_MEMORY\n");</div><div class='ctx'> 			p_dev-&gt;func_id = CISTPL_FUNCID_MEMORY;</div><div class='ctx'> 			p_dev-&gt;has_func_id = 1;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -685,7 +656,7 @@ struct pcmcia_device * pcmcia_device_add(struct pcmcia_socket *s, unsigned int f</div><div class='ctx'> 	if (!p_dev-&gt;devname)</div><div class='ctx'> 		goto err_free;</div><div class='ctx'> 	sprintf (p_dev-&gt;devname, "pcmcia%s", p_dev-&gt;dev.bus_id);</div><div class='del'>-	ds_dbg(3, "devname is %s\n", p_dev-&gt;devname);</div><div class='add'>+	ds_dev_dbg(3, &amp;p_dev-&gt;dev, "devname is %s\n", p_dev-&gt;devname);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;pcmcia_dev_list_lock, flags);</div><div class='ctx'> </div><div class='hunk'>@@ -706,7 +677,7 @@ struct pcmcia_device * pcmcia_device_add(struct pcmcia_socket *s, unsigned int f</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;pcmcia_dev_list_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	if (!p_dev-&gt;function_config) {</div><div class='del'>-		ds_dbg(3, "creating config_t for %s\n", p_dev-&gt;dev.bus_id);</div><div class='add'>+		ds_dev_dbg(3, &amp;p_dev-&gt;dev, "creating config_t\n");</div><div class='ctx'> 		p_dev-&gt;function_config = kzalloc(sizeof(struct config_t),</div><div class='ctx'> 						 GFP_KERNEL);</div><div class='ctx'> 		if (!p_dev-&gt;function_config)</div><div class='hunk'>@@ -714,8 +685,9 @@ struct pcmcia_device * pcmcia_device_add(struct pcmcia_socket *s, unsigned int f</div><div class='ctx'> 		kref_init(&amp;p_dev-&gt;function_config-&gt;ref);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	printk(KERN_NOTICE "pcmcia: registering new device %s\n",</div><div class='del'>-	       p_dev-&gt;devname);</div><div class='add'>+	dev_printk(KERN_NOTICE, &amp;p_dev-&gt;dev,</div><div class='add'>+		   "pcmcia: registering new device %s\n",</div><div class='add'>+		   p_dev-&gt;devname);</div><div class='ctx'> </div><div class='ctx'> 	pcmcia_device_query(p_dev);</div><div class='ctx'> </div><div class='hunk'>@@ -750,19 +722,20 @@ static int pcmcia_card_add(struct pcmcia_socket *s)</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!(s-&gt;resource_setup_done)) {</div><div class='del'>-		ds_dbg(3, "no resources available, delaying card_add\n");</div><div class='add'>+		ds_dev_dbg(3, &amp;s-&gt;dev,</div><div class='add'>+			   "no resources available, delaying card_add\n");</div><div class='ctx'> 		return -EAGAIN; /* try again, but later... */</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (pcmcia_validate_mem(s)) {</div><div class='del'>-		ds_dbg(3, "validating mem resources failed, "</div><div class='add'>+		ds_dev_dbg(3, &amp;s-&gt;dev, "validating mem resources failed, "</div><div class='ctx'> 		       "delaying card_add\n");</div><div class='ctx'> 		return -EAGAIN; /* try again, but later... */</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = pccard_validate_cis(s, BIND_FN_ALL, &amp;no_chains);</div><div class='ctx'> 	if (ret || !no_chains) {</div><div class='del'>-		ds_dbg(0, "invalid CIS or invalid resources\n");</div><div class='add'>+		ds_dev_dbg(0, &amp;s-&gt;dev, "invalid CIS or invalid resources\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -783,7 +756,7 @@ static void pcmcia_delayed_add_device(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	struct pcmcia_socket *s =</div><div class='ctx'> 		container_of(work, struct pcmcia_socket, device_add);</div><div class='del'>-	ds_dbg(1, "adding additional device to %d\n", s-&gt;sock);</div><div class='add'>+	ds_dev_dbg(1, &amp;s-&gt;dev, "adding additional device to %d\n", s-&gt;sock);</div><div class='ctx'> 	pcmcia_device_add(s, s-&gt;pcmcia_state.mfc_pfc);</div><div class='ctx'> 	s-&gt;pcmcia_state.device_add_pending = 0;</div><div class='ctx'> 	s-&gt;pcmcia_state.mfc_pfc = 0;</div><div class='hunk'>@@ -793,8 +766,7 @@ static int pcmcia_requery(struct device *dev, void * _data)</div><div class='ctx'> {</div><div class='ctx'> 	struct pcmcia_device *p_dev = to_pcmcia_dev(dev);</div><div class='ctx'> 	if (!p_dev-&gt;dev.driver) {</div><div class='del'>-		ds_dbg(1, "update device information for %s\n",</div><div class='del'>-		       p_dev-&gt;dev.bus_id);</div><div class='add'>+		ds_dev_dbg(1, dev, "update device information\n");</div><div class='ctx'> 		pcmcia_device_query(p_dev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -808,7 +780,7 @@ static void pcmcia_bus_rescan(struct pcmcia_socket *skt, int new_cis)</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	/* must be called with skt_mutex held */</div><div class='del'>-	ds_dbg(0, "re-scanning socket %d\n", skt-&gt;sock);</div><div class='add'>+	ds_dev_dbg(0, &amp;skt-&gt;dev, "re-scanning socket %d\n", skt-&gt;sock);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;pcmcia_dev_list_lock, flags);</div><div class='ctx'> 	if (list_empty(&amp;skt-&gt;devices_list))</div><div class='hunk'>@@ -859,17 +831,17 @@ static int pcmcia_load_firmware(struct pcmcia_device *dev, char * filename)</div><div class='ctx'> 	int ret = -ENOMEM;</div><div class='ctx'> 	int no_funcs;</div><div class='ctx'> 	int old_funcs;</div><div class='del'>-	cisdump_t *cis;</div><div class='ctx'> 	cistpl_longlink_mfc_t mfc;</div><div class='ctx'> </div><div class='ctx'> 	if (!filename)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	ds_dbg(1, "trying to load CIS file %s\n", filename);</div><div class='add'>+	ds_dev_dbg(1, &amp;dev-&gt;dev, "trying to load CIS file %s\n", filename);</div><div class='ctx'> </div><div class='ctx'> 	if (strlen(filename) &gt; (FIRMWARE_NAME_MAX - 1)) {</div><div class='del'>-		printk(KERN_WARNING "pcmcia: CIS filename is too long [%s]\n",</div><div class='del'>-			filename);</div><div class='add'>+		dev_printk(KERN_WARNING, &amp;dev-&gt;dev,</div><div class='add'>+			   "pcmcia: CIS filename is too long [%s]\n",</div><div class='add'>+			   filename);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -878,23 +850,16 @@ static int pcmcia_load_firmware(struct pcmcia_device *dev, char * filename)</div><div class='ctx'> 	if (request_firmware(&amp;fw, path, &amp;dev-&gt;dev) == 0) {</div><div class='ctx'> 		if (fw-&gt;size &gt;= CISTPL_MAX_CIS_SIZE) {</div><div class='ctx'> 			ret = -EINVAL;</div><div class='del'>-			printk(KERN_ERR "pcmcia: CIS override is too big\n");</div><div class='add'>+			dev_printk(KERN_ERR, &amp;dev-&gt;dev,</div><div class='add'>+				   "pcmcia: CIS override is too big\n");</div><div class='ctx'> 			goto release;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		cis = kzalloc(sizeof(cisdump_t), GFP_KERNEL);</div><div class='del'>-		if (!cis) {</div><div class='del'>-			ret = -ENOMEM;</div><div class='del'>-			goto release;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		cis-&gt;Length = fw-&gt;size + 1;</div><div class='del'>-		memcpy(cis-&gt;Data, fw-&gt;data, fw-&gt;size);</div><div class='del'>-</div><div class='del'>-		if (!pcmcia_replace_cis(s, cis))</div><div class='add'>+		if (!pcmcia_replace_cis(s, fw-&gt;data, fw-&gt;size))</div><div class='ctx'> 			ret = 0;</div><div class='ctx'> 		else {</div><div class='del'>-			printk(KERN_ERR "pcmcia: CIS override failed\n");</div><div class='add'>+			dev_printk(KERN_ERR, &amp;dev-&gt;dev,</div><div class='add'>+				   "pcmcia: CIS override failed\n");</div><div class='ctx'> 			goto release;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -998,14 +963,14 @@ static inline int pcmcia_devmatch(struct pcmcia_device *dev,</div><div class='ctx'> 		 * after it has re-checked that there is no possible module</div><div class='ctx'> 		 * with a prod_id/manf_id/card_id match.</div><div class='ctx'> 		 */</div><div class='del'>-		ds_dbg(0, "skipping FUNC_ID match for %s until userspace "</div><div class='del'>-		       "interaction\n", dev-&gt;dev.bus_id);</div><div class='add'>+		ds_dev_dbg(0, &amp;dev-&gt;dev,</div><div class='add'>+			"skipping FUNC_ID match until userspace interaction\n");</div><div class='ctx'> 		if (!dev-&gt;allow_func_id_match)</div><div class='ctx'> 			return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (did-&gt;match_flags &amp; PCMCIA_DEV_ID_MATCH_FAKE_CIS) {</div><div class='del'>-		ds_dbg(0, "device %s needs a fake CIS\n", dev-&gt;dev.bus_id);</div><div class='add'>+		ds_dev_dbg(0, &amp;dev-&gt;dev, "device needs a fake CIS\n");</div><div class='ctx'> 		if (!dev-&gt;socket-&gt;fake_cis)</div><div class='ctx'> 			pcmcia_load_firmware(dev, did-&gt;cisfile);</div><div class='ctx'> </div><div class='hunk'>@@ -1037,11 +1002,9 @@ static int pcmcia_bus_match(struct device * dev, struct device_driver * drv) {</div><div class='ctx'> 	/* match dynamic devices first */</div><div class='ctx'> 	spin_lock(&amp;p_drv-&gt;dynids.lock);</div><div class='ctx'> 	list_for_each_entry(dynid, &amp;p_drv-&gt;dynids.list, node) {</div><div class='del'>-		ds_dbg(3, "trying to match %s to %s\n", dev-&gt;bus_id,</div><div class='del'>-		       drv-&gt;name);</div><div class='add'>+		ds_dev_dbg(3, dev, "trying to match to %s\n", drv-&gt;name);</div><div class='ctx'> 		if (pcmcia_devmatch(p_dev, &amp;dynid-&gt;id)) {</div><div class='del'>-			ds_dbg(0, "matched %s to %s\n", dev-&gt;bus_id,</div><div class='del'>-			       drv-&gt;name);</div><div class='add'>+			ds_dev_dbg(0, dev, "matched to %s\n", drv-&gt;name);</div><div class='ctx'> 			spin_unlock(&amp;p_drv-&gt;dynids.lock);</div><div class='ctx'> 			return 1;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1051,18 +1014,15 @@ static int pcmcia_bus_match(struct device * dev, struct device_driver * drv) {</div><div class='ctx'> #ifdef CONFIG_PCMCIA_IOCTL</div><div class='ctx'> 	/* matching by cardmgr */</div><div class='ctx'> 	if (p_dev-&gt;cardmgr == p_drv) {</div><div class='del'>-		ds_dbg(0, "cardmgr matched %s to %s\n", dev-&gt;bus_id,</div><div class='del'>-		       drv-&gt;name);</div><div class='add'>+		ds_dev_dbg(0, dev, "cardmgr matched to %s\n", drv-&gt;name);</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	while (did &amp;&amp; did-&gt;match_flags) {</div><div class='del'>-		ds_dbg(3, "trying to match %s to %s\n", dev-&gt;bus_id,</div><div class='del'>-		       drv-&gt;name);</div><div class='add'>+		ds_dev_dbg(3, dev, "trying to match to %s\n", drv-&gt;name);</div><div class='ctx'> 		if (pcmcia_devmatch(p_dev, did)) {</div><div class='del'>-			ds_dbg(0, "matched %s to %s\n", dev-&gt;bus_id,</div><div class='del'>-			       drv-&gt;name);</div><div class='add'>+			ds_dev_dbg(0, dev, "matched to %s\n", drv-&gt;name);</div><div class='ctx'> 			return 1;</div><div class='ctx'> 		}</div><div class='ctx'> 		did++;</div><div class='hunk'>@@ -1268,7 +1228,7 @@ static int pcmcia_dev_suspend(struct device * dev, pm_message_t state)</div><div class='ctx'> 	if (p_dev-&gt;suspended)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	ds_dbg(2, "suspending %s\n", dev-&gt;bus_id);</div><div class='add'>+	ds_dev_dbg(2, dev, "suspending\n");</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;driver)</div><div class='ctx'> 		p_drv = to_pcmcia_drv(dev-&gt;driver);</div><div class='hunk'>@@ -1279,15 +1239,16 @@ static int pcmcia_dev_suspend(struct device * dev, pm_message_t state)</div><div class='ctx'> 	if (p_drv-&gt;suspend) {</div><div class='ctx'> 		ret = p_drv-&gt;suspend(p_dev);</div><div class='ctx'> 		if (ret) {</div><div class='del'>-			printk(KERN_ERR "pcmcia: device %s (driver %s) did "</div><div class='del'>-			       "not want to go to sleep (%d)\n",</div><div class='del'>-			       p_dev-&gt;devname, p_drv-&gt;drv.name, ret);</div><div class='add'>+			dev_printk(KERN_ERR, dev,</div><div class='add'>+				   "pcmcia: device %s (driver %s) did "</div><div class='add'>+				   "not want to go to sleep (%d)\n",</div><div class='add'>+				   p_dev-&gt;devname, p_drv-&gt;drv.name, ret);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (p_dev-&gt;device_no == p_dev-&gt;func) {</div><div class='del'>-		ds_dbg(2, "releasing configuration for %s\n", dev-&gt;bus_id);</div><div class='add'>+		ds_dev_dbg(2, dev, "releasing configuration\n");</div><div class='ctx'> 		pcmcia_release_configuration(p_dev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1307,7 +1268,7 @@ static int pcmcia_dev_resume(struct device * dev)</div><div class='ctx'> 	if (!p_dev-&gt;suspended)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	ds_dbg(2, "resuming %s\n", dev-&gt;bus_id);</div><div class='add'>+	ds_dev_dbg(2, dev, "resuming\n");</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;driver)</div><div class='ctx'> 		p_drv = to_pcmcia_drv(dev-&gt;driver);</div><div class='hunk'>@@ -1316,7 +1277,7 @@ static int pcmcia_dev_resume(struct device * dev)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	if (p_dev-&gt;device_no == p_dev-&gt;func) {</div><div class='del'>-		ds_dbg(2, "requesting configuration for %s\n", dev-&gt;bus_id);</div><div class='add'>+		ds_dev_dbg(2, dev, "requesting configuration\n");</div><div class='ctx'> 		ret = pcmcia_request_configuration(p_dev, &amp;p_dev-&gt;conf);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto out;</div><div class='hunk'>@@ -1358,14 +1319,14 @@ static int pcmcia_bus_resume_callback(struct device *dev, void * _data)</div><div class='ctx'> </div><div class='ctx'> static int pcmcia_bus_resume(struct pcmcia_socket *skt)</div><div class='ctx'> {</div><div class='del'>-	ds_dbg(2, "resuming socket %d\n", skt-&gt;sock);</div><div class='add'>+	ds_dev_dbg(2, &amp;skt-&gt;dev, "resuming socket %d\n", skt-&gt;sock);</div><div class='ctx'> 	bus_for_each_dev(&amp;pcmcia_bus_type, NULL, skt, pcmcia_bus_resume_callback);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int pcmcia_bus_suspend(struct pcmcia_socket *skt)</div><div class='ctx'> {</div><div class='del'>-	ds_dbg(2, "suspending socket %d\n", skt-&gt;sock);</div><div class='add'>+	ds_dev_dbg(2, &amp;skt-&gt;dev, "suspending socket %d\n", skt-&gt;sock);</div><div class='ctx'> 	if (bus_for_each_dev(&amp;pcmcia_bus_type, NULL, skt,</div><div class='ctx'> 			     pcmcia_bus_suspend_callback)) {</div><div class='ctx'> 		pcmcia_bus_resume(skt);</div><div class='hunk'>@@ -1391,13 +1352,14 @@ static int ds_event(struct pcmcia_socket *skt, event_t event, int priority)</div><div class='ctx'> 	struct pcmcia_socket *s = pcmcia_get_socket(skt);</div><div class='ctx'> </div><div class='ctx'> 	if (!s) {</div><div class='del'>-		printk(KERN_ERR "PCMCIA obtaining reference to socket %p " \</div><div class='del'>-			"failed, event 0x%x lost!\n", skt, event);</div><div class='add'>+		dev_printk(KERN_ERR, &amp;skt-&gt;dev,</div><div class='add'>+			   "PCMCIA obtaining reference to socket "	\</div><div class='add'>+			   "failed, event 0x%x lost!\n", event);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ds_dbg(1, "ds_event(0x%06x, %d, 0x%p)\n",</div><div class='del'>-	       event, priority, skt);</div><div class='add'>+	ds_dev_dbg(1, &amp;skt-&gt;dev, "ds_event(0x%06x, %d, 0x%p)\n",</div><div class='add'>+		   event, priority, skt);</div><div class='ctx'> </div><div class='ctx'> 	switch (event) {</div><div class='ctx'> 	case CS_EVENT_CARD_REMOVAL:</div><div class='hunk'>@@ -1472,7 +1434,8 @@ static int __devinit pcmcia_bus_add_socket(struct device *dev,</div><div class='ctx'> </div><div class='ctx'> 	socket = pcmcia_get_socket(socket);</div><div class='ctx'> 	if (!socket) {</div><div class='del'>-		printk(KERN_ERR "PCMCIA obtaining reference to socket %p failed\n", socket);</div><div class='add'>+		dev_printk(KERN_ERR, dev,</div><div class='add'>+			   "PCMCIA obtaining reference to socket failed\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1492,7 +1455,7 @@ static int __devinit pcmcia_bus_add_socket(struct device *dev,</div><div class='ctx'> </div><div class='ctx'> 	ret = pccard_register_pcmcia(socket, &amp;pcmcia_bus_callback);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		printk(KERN_ERR "PCMCIA registration PCCard core failed for socket %p\n", socket);</div><div class='add'>+		dev_printk(KERN_ERR, dev, "PCMCIA registration failed\n");</div><div class='ctx'> 		pcmcia_put_socket(socket);</div><div class='ctx'> 		return (ret);</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/pcmcia/ds_internal.h b/drivers/pcmcia/ds_internal.h<br/>deleted file mode 100644<br/>index 3a2b25e6ed73..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pcmcia/ds_internal.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/pcmcia/ds_internal.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,23 +0,0 @@</div><div class='del'>-/* ds_internal.h - internal header for 16-bit PCMCIA devices management */</div><div class='del'>-</div><div class='del'>-extern spinlock_t pcmcia_dev_list_lock;</div><div class='del'>-extern struct bus_type pcmcia_bus_type;</div><div class='del'>-</div><div class='del'>-extern struct pcmcia_device * pcmcia_get_dev(struct pcmcia_device *p_dev);</div><div class='del'>-extern void pcmcia_put_dev(struct pcmcia_device *p_dev);</div><div class='del'>-</div><div class='del'>-struct pcmcia_device * pcmcia_device_add(struct pcmcia_socket *s, unsigned int function);</div><div class='del'>-</div><div class='del'>-extern int pcmcia_release_configuration(struct pcmcia_device *p_dev);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PCMCIA_IOCTL</div><div class='del'>-extern void __init pcmcia_setup_ioctl(void);</div><div class='del'>-extern void __exit pcmcia_cleanup_ioctl(void);</div><div class='del'>-extern void handle_event(struct pcmcia_socket *s, event_t event);</div><div class='del'>-extern int handle_request(struct pcmcia_socket *s, event_t event);</div><div class='del'>-#else</div><div class='del'>-static inline void __init pcmcia_setup_ioctl(void) { return; }</div><div class='del'>-static inline void __exit pcmcia_cleanup_ioctl(void) { return; }</div><div class='del'>-static inline void handle_event(struct pcmcia_socket *s, event_t event) { return; }</div><div class='del'>-static inline int handle_request(struct pcmcia_socket *s, event_t event) { return CS_SUCCESS; }</div><div class='del'>-#endif</div><div class='head'>diff --git a/drivers/pcmcia/hd64465_ss.c b/drivers/pcmcia/hd64465_ss.c<br/>index fb2bc1fb015d..117dc12ab438 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pcmcia/hd64465_ss.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/pcmcia/hd64465_ss.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pcmcia/hd64465_ss.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pcmcia/hd64465_ss.c</a></div><div class='hunk'>@@ -46,7 +46,6 @@</div><div class='ctx'> #include &lt;pcmcia/cistpl.h&gt;</div><div class='ctx'> #include &lt;pcmcia/ds.h&gt;</div><div class='ctx'> #include &lt;pcmcia/ss.h&gt;</div><div class='del'>-#include "cs_internal.h"</div><div class='ctx'> </div><div class='ctx'> #define MODNAME "hd64465_ss"</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/pcmcia/i82365.c b/drivers/pcmcia/i82365.c<br/>index 68f6b2702bc4..71653ab84890 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pcmcia/i82365.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/pcmcia/i82365.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pcmcia/i82365.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pcmcia/i82365.c</a></div><div class='hunk'>@@ -63,7 +63,7 @@</div><div class='ctx'> #include "vg468.h"</div><div class='ctx'> #include "ricoh.h"</div><div class='ctx'> </div><div class='del'>-#ifdef DEBUG</div><div class='add'>+#ifdef CONFIG_PCMCIA_DEBUG</div><div class='ctx'> static const char version[] =</div><div class='ctx'> "i82365.c 1.265 1999/11/10 18:36:21 (David Hinds)";</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/pcmcia/m32r_cfc.c b/drivers/pcmcia/m32r_cfc.c<br/>index 3616da227152..2ab4f22c21de 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pcmcia/m32r_cfc.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/pcmcia/m32r_cfc.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pcmcia/m32r_cfc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pcmcia/m32r_cfc.c</a></div><div class='hunk'>@@ -38,7 +38,7 @@</div><div class='ctx'> </div><div class='ctx'> #include "m32r_cfc.h"</div><div class='ctx'> </div><div class='del'>-#ifdef DEBUG</div><div class='add'>+#ifdef CONFIG_PCMCIA_DEBUG</div><div class='ctx'> static int m32r_cfc_debug;</div><div class='ctx'> module_param(m32r_cfc_debug, int, 0644);</div><div class='ctx'> #define debug(lvl, fmt, arg...) do {				\</div><div class='hunk'>@@ -505,7 +505,7 @@ static int _pcc_set_socket(u_short sock, socket_state_t *state)</div><div class='ctx'> 		pcc_set(sock,(unsigned int)PLD_CFBUFCR,1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-#ifdef DEBUG</div><div class='add'>+#ifdef CONFIG_PCMCIA_DEBUG</div><div class='ctx'> 	if(state-&gt;flags &amp; SS_IOCARD){</div><div class='ctx'> 		debug(3, ":IOCARD");</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/pcmcia/m32r_pcc.c b/drivers/pcmcia/m32r_pcc.c<br/>index 2b42b7155e34..2f108c23dbd9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pcmcia/m32r_pcc.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/pcmcia/m32r_pcc.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pcmcia/m32r_pcc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pcmcia/m32r_pcc.c</a></div><div class='hunk'>@@ -45,7 +45,7 @@</div><div class='ctx'> </div><div class='ctx'> #define PCC_DEBUG_DBEX</div><div class='ctx'> </div><div class='del'>-#ifdef DEBUG</div><div class='add'>+#ifdef CONFIG_PCMCIA_DEBUG</div><div class='ctx'> static int m32r_pcc_debug;</div><div class='ctx'> module_param(m32r_pcc_debug, int, 0644);</div><div class='ctx'> #define debug(lvl, fmt, arg...) do {				\</div><div class='hunk'>@@ -460,7 +460,7 @@ static int _pcc_set_socket(u_short sock, socket_state_t *state)</div><div class='ctx'> </div><div class='ctx'> 	pcc_set(sock,PCCSIGCR,reg);</div><div class='ctx'> </div><div class='del'>-#ifdef DEBUG</div><div class='add'>+#ifdef CONFIG_PCMCIA_DEBUG</div><div class='ctx'> 	if(state-&gt;flags &amp; SS_IOCARD){</div><div class='ctx'> 		debug(3, ":IOCARD");</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/pcmcia/m8xx_pcmcia.c b/drivers/pcmcia/m8xx_pcmcia.c<br/>index ff66604e90d4..d1ad0966392d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pcmcia/m8xx_pcmcia.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/pcmcia/m8xx_pcmcia.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pcmcia/m8xx_pcmcia.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pcmcia/m8xx_pcmcia.c</a></div><div class='hunk'>@@ -64,8 +64,8 @@</div><div class='ctx'> #include &lt;pcmcia/cs.h&gt;</div><div class='ctx'> #include &lt;pcmcia/ss.h&gt;</div><div class='ctx'> </div><div class='del'>-#ifdef PCMCIA_DEBUG</div><div class='del'>-static int pc_debug = PCMCIA_DEBUG;</div><div class='add'>+#ifdef CONFIG_PCMCIA_DEBUG</div><div class='add'>+static int pc_debug;</div><div class='ctx'> module_param(pc_debug, int, 0);</div><div class='ctx'> #define dprintk(args...) printk(KERN_DEBUG "m8xx_pcmcia: " args);</div><div class='ctx'> #else</div><div class='head'>diff --git a/drivers/pcmcia/o2micro.h b/drivers/pcmcia/o2micro.h<br/>index a234ce1967a3..5554015a7813 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pcmcia/o2micro.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/pcmcia/o2micro.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pcmcia/o2micro.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pcmcia/o2micro.h</a></div><div class='hunk'>@@ -140,7 +140,8 @@ static int o2micro_override(struct yenta_socket *socket)</div><div class='ctx'> 		a = config_readb(socket, O2_RESERVED1);</div><div class='ctx'> 		b = config_readb(socket, O2_RESERVED2);</div><div class='ctx'> </div><div class='del'>-		printk(KERN_INFO "Yenta O2: res at 0x94/0xD4: %02x/%02x\n", a, b);</div><div class='add'>+		dev_printk(KERN_INFO, &amp;socket-&gt;dev-&gt;dev,</div><div class='add'>+			   "O2: res at 0x94/0xD4: %02x/%02x\n", a, b);</div><div class='ctx'> </div><div class='ctx'> 		switch (socket-&gt;dev-&gt;device) {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -153,7 +154,9 @@ static int o2micro_override(struct yenta_socket *socket)</div><div class='ctx'> 		case PCI_DEVICE_ID_O2_6812:</div><div class='ctx'> 		case PCI_DEVICE_ID_O2_6832:</div><div class='ctx'> 		case PCI_DEVICE_ID_O2_6836:</div><div class='del'>-			printk(KERN_INFO "Yenta O2: old bridge, disabling read prefetch/write burst\n");</div><div class='add'>+			dev_printk(KERN_INFO, &amp;socket-&gt;dev-&gt;dev,</div><div class='add'>+				   "Yenta O2: old bridge, disabling read "</div><div class='add'>+				   "prefetch/write burst\n");</div><div class='ctx'> 			config_writeb(socket, O2_RESERVED1,</div><div class='ctx'> 			              a &amp; ~(O2_RES_READ_PREFETCH | O2_RES_WRITE_BURST));</div><div class='ctx'> 			config_writeb(socket, O2_RESERVED2,</div><div class='hunk'>@@ -161,7 +164,8 @@ static int o2micro_override(struct yenta_socket *socket)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		default:</div><div class='del'>-			printk(KERN_INFO "Yenta O2: enabling read prefetch/write burst\n");</div><div class='add'>+			dev_printk(KERN_INFO , &amp;socket-&gt;dev-&gt;dev,</div><div class='add'>+				   "O2: enabling read prefetch/write burst\n");</div><div class='ctx'> 			config_writeb(socket, O2_RESERVED1,</div><div class='ctx'> 			              a | O2_RES_READ_PREFETCH | O2_RES_WRITE_BURST);</div><div class='ctx'> 			config_writeb(socket, O2_RESERVED2,</div><div class='head'>diff --git a/drivers/pcmcia/pcmcia_ioctl.c b/drivers/pcmcia/pcmcia_ioctl.c<br/>index 419f97fc9a62..1703b20cad5d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pcmcia/pcmcia_ioctl.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/pcmcia/pcmcia_ioctl.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pcmcia/pcmcia_ioctl.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pcmcia/pcmcia_ioctl.c</a></div><div class='hunk'>@@ -38,7 +38,6 @@</div><div class='ctx'> #include &lt;pcmcia/ss.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "cs_internal.h"</div><div class='del'>-#include "ds_internal.h"</div><div class='ctx'> </div><div class='ctx'> static int major_dev = -1;</div><div class='ctx'> </div><div class='hunk'>@@ -58,7 +57,7 @@ typedef struct user_info_t {</div><div class='ctx'> } user_info_t;</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#ifdef DEBUG</div><div class='add'>+#ifdef CONFIG_PCMCIA_DEBUG</div><div class='ctx'> extern int ds_pc_debug;</div><div class='ctx'> </div><div class='ctx'> #define ds_dbg(lvl, fmt, arg...) do {		\</div><div class='hunk'>@@ -149,7 +148,7 @@ static int adjust_irq(struct pcmcia_socket *s, adjust_t *adj)</div><div class='ctx'> </div><div class='ctx'> 	irq = adj-&gt;resource.irq.IRQ;</div><div class='ctx'> 	if ((irq &lt; 0) || (irq &gt; 15))</div><div class='del'>-		return CS_BAD_IRQ;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (adj-&gt;Action != REMOVE_MANAGED_RESOURCE)</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -167,7 +166,7 @@ static int adjust_irq(struct pcmcia_socket *s, adjust_t *adj)</div><div class='ctx'> #else</div><div class='ctx'> </div><div class='ctx'> static inline int adjust_irq(struct pcmcia_socket *s, adjust_t *adj) {</div><div class='del'>-	return CS_SUCCESS;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='hunk'>@@ -175,7 +174,7 @@ static inline int adjust_irq(struct pcmcia_socket *s, adjust_t *adj) {</div><div class='ctx'> static int pcmcia_adjust_resource_info(adjust_t *adj)</div><div class='ctx'> {</div><div class='ctx'> 	struct pcmcia_socket *s;</div><div class='del'>-	int ret = CS_UNSUPPORTED_FUNCTION;</div><div class='add'>+	int ret = -ENOSYS;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	down_read(&amp;pcmcia_socket_list_rwsem);</div><div class='hunk'>@@ -248,7 +247,7 @@ static int pccard_get_status(struct pcmcia_socket *s,</div><div class='ctx'> 	if (s-&gt;state &amp; SOCKET_SUSPEND)</div><div class='ctx'> 		status-&gt;CardState |= CS_EVENT_PM_SUSPEND;</div><div class='ctx'> 	if (!(s-&gt;state &amp; SOCKET_PRESENT))</div><div class='del'>-		return CS_NO_CARD;</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	c = (p_dev) ? p_dev-&gt;function_config : NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -274,7 +273,7 @@ static int pccard_get_status(struct pcmcia_socket *s,</div><div class='ctx'> 			status-&gt;CardState |=</div><div class='ctx'> 				(reg &amp; ESR_REQ_ATTN) ? CS_EVENT_REQUEST_ATTENTION : 0;</div><div class='ctx'> 		}</div><div class='del'>-		return CS_SUCCESS;</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	status-&gt;CardState |=</div><div class='ctx'> 		(val &amp; SS_WRPROT) ? CS_EVENT_WRITE_PROTECT : 0;</div><div class='hunk'>@@ -284,9 +283,81 @@ static int pccard_get_status(struct pcmcia_socket *s,</div><div class='ctx'> 		(val &amp; SS_BATWARN) ? CS_EVENT_BATTERY_LOW : 0;</div><div class='ctx'> 	status-&gt;CardState |=</div><div class='ctx'> 		(val &amp; SS_READY) ? CS_EVENT_READY_CHANGE : 0;</div><div class='del'>-	return CS_SUCCESS;</div><div class='add'>+	return 0;</div><div class='ctx'> } /* pccard_get_status */</div><div class='ctx'> </div><div class='add'>+int pccard_get_configuration_info(struct pcmcia_socket *s,</div><div class='add'>+				  struct pcmcia_device *p_dev,</div><div class='add'>+				  config_info_t *config)</div><div class='add'>+{</div><div class='add'>+	config_t *c;</div><div class='add'>+</div><div class='add'>+	if (!(s-&gt;state &amp; SOCKET_PRESENT))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_CARDBUS</div><div class='add'>+	if (s-&gt;state &amp; SOCKET_CARDBUS) {</div><div class='add'>+		memset(config, 0, sizeof(config_info_t));</div><div class='add'>+		config-&gt;Vcc = s-&gt;socket.Vcc;</div><div class='add'>+		config-&gt;Vpp1 = config-&gt;Vpp2 = s-&gt;socket.Vpp;</div><div class='add'>+		config-&gt;Option = s-&gt;cb_dev-&gt;subordinate-&gt;number;</div><div class='add'>+		if (s-&gt;state &amp; SOCKET_CARDBUS_CONFIG) {</div><div class='add'>+			config-&gt;Attributes = CONF_VALID_CLIENT;</div><div class='add'>+			config-&gt;IntType = INT_CARDBUS;</div><div class='add'>+			config-&gt;AssignedIRQ = s-&gt;irq.AssignedIRQ;</div><div class='add'>+			if (config-&gt;AssignedIRQ)</div><div class='add'>+				config-&gt;Attributes |= CONF_ENABLE_IRQ;</div><div class='add'>+			if (s-&gt;io[0].res) {</div><div class='add'>+				config-&gt;BasePort1 = s-&gt;io[0].res-&gt;start;</div><div class='add'>+				config-&gt;NumPorts1 = s-&gt;io[0].res-&gt;end -</div><div class='add'>+					config-&gt;BasePort1 + 1;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	if (p_dev) {</div><div class='add'>+		c = p_dev-&gt;function_config;</div><div class='add'>+		config-&gt;Function = p_dev-&gt;func;</div><div class='add'>+	} else {</div><div class='add'>+		c = NULL;</div><div class='add'>+		config-&gt;Function = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((c == NULL) || !(c-&gt;state &amp; CONFIG_LOCKED)) {</div><div class='add'>+		config-&gt;Attributes = 0;</div><div class='add'>+		config-&gt;Vcc = s-&gt;socket.Vcc;</div><div class='add'>+		config-&gt;Vpp1 = config-&gt;Vpp2 = s-&gt;socket.Vpp;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	config-&gt;Attributes = c-&gt;Attributes | CONF_VALID_CLIENT;</div><div class='add'>+	config-&gt;Vcc = s-&gt;socket.Vcc;</div><div class='add'>+	config-&gt;Vpp1 = config-&gt;Vpp2 = s-&gt;socket.Vpp;</div><div class='add'>+	config-&gt;IntType = c-&gt;IntType;</div><div class='add'>+	config-&gt;ConfigBase = c-&gt;ConfigBase;</div><div class='add'>+	config-&gt;Status = c-&gt;Status;</div><div class='add'>+	config-&gt;Pin = c-&gt;Pin;</div><div class='add'>+	config-&gt;Copy = c-&gt;Copy;</div><div class='add'>+	config-&gt;Option = c-&gt;Option;</div><div class='add'>+	config-&gt;ExtStatus = c-&gt;ExtStatus;</div><div class='add'>+	config-&gt;Present = config-&gt;CardValues = c-&gt;CardValues;</div><div class='add'>+	config-&gt;IRQAttributes = c-&gt;irq.Attributes;</div><div class='add'>+	config-&gt;AssignedIRQ = s-&gt;irq.AssignedIRQ;</div><div class='add'>+	config-&gt;BasePort1 = c-&gt;io.BasePort1;</div><div class='add'>+	config-&gt;NumPorts1 = c-&gt;io.NumPorts1;</div><div class='add'>+	config-&gt;Attributes1 = c-&gt;io.Attributes1;</div><div class='add'>+	config-&gt;BasePort2 = c-&gt;io.BasePort2;</div><div class='add'>+	config-&gt;NumPorts2 = c-&gt;io.NumPorts2;</div><div class='add'>+	config-&gt;Attributes2 = c-&gt;io.Attributes2;</div><div class='add'>+	config-&gt;IOAddrLines = c-&gt;io.IOAddrLines;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+} /* pccard_get_configuration_info */</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> /*======================================================================</div><div class='ctx'> </div><div class='ctx'>     These manage a ring buffer of events pending for one user process</div><div class='hunk'>@@ -764,7 +835,7 @@ static int ds_ioctl(struct inode * inode, struct file * file,</div><div class='ctx'>     case DS_GET_CONFIGURATION_INFO:</div><div class='ctx'> 	if (buf-&gt;config.Function &amp;&amp;</div><div class='ctx'> 	   (buf-&gt;config.Function &gt;= s-&gt;functions))</div><div class='del'>-	    ret = CS_BAD_ARGS;</div><div class='add'>+	    ret = -EINVAL;</div><div class='ctx'> 	else {</div><div class='ctx'> 	    struct pcmcia_device *p_dev = get_pcmcia_device(s, buf-&gt;config.Function);</div><div class='ctx'> 	    ret = pccard_get_configuration_info(s, p_dev, &amp;buf-&gt;config);</div><div class='hunk'>@@ -787,15 +858,15 @@ static int ds_ioctl(struct inode * inode, struct file * file,</div><div class='ctx'> 	break;</div><div class='ctx'>     case DS_PARSE_TUPLE:</div><div class='ctx'> 	buf-&gt;tuple.TupleData = buf-&gt;tuple_parse.data;</div><div class='del'>-	ret = pccard_parse_tuple(&amp;buf-&gt;tuple, &amp;buf-&gt;tuple_parse.parse);</div><div class='add'>+	ret = pcmcia_parse_tuple(&amp;buf-&gt;tuple, &amp;buf-&gt;tuple_parse.parse);</div><div class='ctx'> 	break;</div><div class='ctx'>     case DS_RESET_CARD:</div><div class='del'>-	ret = pccard_reset_card(s);</div><div class='add'>+	ret = pcmcia_reset_card(s);</div><div class='ctx'> 	break;</div><div class='ctx'>     case DS_GET_STATUS:</div><div class='ctx'> 	    if (buf-&gt;status.Function &amp;&amp;</div><div class='ctx'> 		(buf-&gt;status.Function &gt;= s-&gt;functions))</div><div class='del'>-		    ret = CS_BAD_ARGS;</div><div class='add'>+		    ret = -EINVAL;</div><div class='ctx'> 	    else {</div><div class='ctx'> 		    struct pcmcia_device *p_dev = get_pcmcia_device(s, buf-&gt;status.Function);</div><div class='ctx'> 		    ret = pccard_get_status(s, p_dev, &amp;buf-&gt;status);</div><div class='hunk'>@@ -826,7 +897,7 @@ static int ds_ioctl(struct inode * inode, struct file * file,</div><div class='ctx'> 	    goto free_out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = CS_BAD_ARGS;</div><div class='add'>+	ret = -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (!(buf-&gt;conf_reg.Function &amp;&amp;</div><div class='ctx'> 	     (buf-&gt;conf_reg.Function &gt;= s-&gt;functions))) {</div><div class='hunk'>@@ -867,7 +938,7 @@ static int ds_ioctl(struct inode * inode, struct file * file,</div><div class='ctx'> 			   &amp;buf-&gt;win_info.map);</div><div class='ctx'> 	break;</div><div class='ctx'>     case DS_REPLACE_CIS:</div><div class='del'>-	ret = pcmcia_replace_cis(s, &amp;buf-&gt;cisdump);</div><div class='add'>+	ret = pcmcia_replace_cis(s, buf-&gt;cisdump.Data, buf-&gt;cisdump.Length);</div><div class='ctx'> 	break;</div><div class='ctx'>     case DS_BIND_REQUEST:</div><div class='ctx'> 	if (!capable(CAP_SYS_ADMIN)) {</div><div class='hunk'>@@ -889,22 +960,19 @@ static int ds_ioctl(struct inode * inode, struct file * file,</div><div class='ctx'> 	err = -EINVAL;</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='del'>-    if ((err == 0) &amp;&amp; (ret != CS_SUCCESS)) {</div><div class='add'>+    if ((err == 0) &amp;&amp; (ret != 0)) {</div><div class='ctx'> 	ds_dbg(2, "ds_ioctl: ret = %d\n", ret);</div><div class='ctx'> 	switch (ret) {</div><div class='del'>-	case CS_BAD_SOCKET: case CS_NO_CARD:</div><div class='del'>-	    err = -ENODEV; break;</div><div class='del'>-	case CS_BAD_ARGS: case CS_BAD_ATTRIBUTE: case CS_BAD_IRQ:</div><div class='del'>-	case CS_BAD_TUPLE:</div><div class='del'>-	    err = -EINVAL; break;</div><div class='del'>-	case CS_IN_USE:</div><div class='del'>-	    err = -EBUSY; break;</div><div class='del'>-	case CS_OUT_OF_RESOURCE:</div><div class='add'>+	case -ENODEV:</div><div class='add'>+	case -EINVAL:</div><div class='add'>+	case -EBUSY:</div><div class='add'>+	case -ENOSYS:</div><div class='add'>+	    err = ret;</div><div class='add'>+	    break;</div><div class='add'>+	case -ENOMEM:</div><div class='ctx'> 	    err = -ENOSPC; break;</div><div class='del'>-	case CS_NO_MORE_ITEMS:</div><div class='add'>+	case -ENOSPC:</div><div class='ctx'> 	    err = -ENODATA; break;</div><div class='del'>-	case CS_UNSUPPORTED_FUNCTION:</div><div class='del'>-	    err = -ENOSYS; break;</div><div class='ctx'> 	default:</div><div class='ctx'> 	    err = -EIO; break;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/pcmcia/pcmcia_resource.c b/drivers/pcmcia/pcmcia_resource.c<br/>index 4884a18cf9e6..afea2b2558b5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pcmcia/pcmcia_resource.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/pcmcia/pcmcia_resource.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pcmcia/pcmcia_resource.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pcmcia/pcmcia_resource.c</a></div><div class='hunk'>@@ -29,7 +29,6 @@</div><div class='ctx'> #include &lt;pcmcia/ds.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "cs_internal.h"</div><div class='del'>-#include "ds_internal.h"</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* Access speed for IO windows */</div><div class='hunk'>@@ -44,16 +43,17 @@ static u8 pcmcia_used_irq[NR_IRQS];</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#ifdef DEBUG</div><div class='add'>+#ifdef CONFIG_PCMCIA_DEBUG</div><div class='ctx'> extern int ds_pc_debug;</div><div class='ctx'> </div><div class='ctx'> #define ds_dbg(skt, lvl, fmt, arg...) do {			\</div><div class='ctx'> 	if (ds_pc_debug &gt;= lvl)					\</div><div class='del'>-		printk(KERN_DEBUG "pcmcia_resource: %s: " fmt,	\</div><div class='del'>-			cs_socket_name(skt) , ## arg);		\</div><div class='add'>+		dev_printk(KERN_DEBUG, &amp;skt-&gt;dev,		\</div><div class='add'>+			   "pcmcia_resource: " fmt,		\</div><div class='add'>+			   ## arg);				\</div><div class='ctx'> } while (0)</div><div class='ctx'> #else</div><div class='del'>-#define ds_dbg(lvl, fmt, arg...) do { } while (0)</div><div class='add'>+#define ds_dbg(skt, lvl, fmt, arg...) do { } while (0)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -168,13 +168,13 @@ int pcmcia_access_configuration_register(struct pcmcia_device *p_dev,</div><div class='ctx'> 	u_char val;</div><div class='ctx'> </div><div class='ctx'> 	if (!p_dev || !p_dev-&gt;function_config)</div><div class='del'>-		return CS_NO_CARD;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	s = p_dev-&gt;socket;</div><div class='ctx'> 	c = p_dev-&gt;function_config;</div><div class='ctx'> </div><div class='ctx'> 	if (!(c-&gt;state &amp; CONFIG_LOCKED))</div><div class='del'>-		return CS_CONFIGURATION_LOCKED;</div><div class='add'>+		return -EACCES;</div><div class='ctx'> </div><div class='ctx'> 	addr = (c-&gt;ConfigBase + reg-&gt;Offset) &gt;&gt; 1;</div><div class='ctx'> </div><div class='hunk'>@@ -188,93 +188,14 @@ int pcmcia_access_configuration_register(struct pcmcia_device *p_dev,</div><div class='ctx'> 		pcmcia_write_cis_mem(s, 1, addr, 1, &amp;val);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		return CS_BAD_ARGS;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	return CS_SUCCESS;</div><div class='add'>+	return 0;</div><div class='ctx'> } /* pcmcia_access_configuration_register */</div><div class='ctx'> EXPORT_SYMBOL(pcmcia_access_configuration_register);</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-int pccard_get_configuration_info(struct pcmcia_socket *s,</div><div class='del'>-				  struct pcmcia_device *p_dev,</div><div class='del'>-				  config_info_t *config)</div><div class='del'>-{</div><div class='del'>-	config_t *c;</div><div class='del'>-</div><div class='del'>-	if (!(s-&gt;state &amp; SOCKET_PRESENT))</div><div class='del'>-		return CS_NO_CARD;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_CARDBUS</div><div class='del'>-	if (s-&gt;state &amp; SOCKET_CARDBUS) {</div><div class='del'>-		memset(config, 0, sizeof(config_info_t));</div><div class='del'>-		config-&gt;Vcc = s-&gt;socket.Vcc;</div><div class='del'>-		config-&gt;Vpp1 = config-&gt;Vpp2 = s-&gt;socket.Vpp;</div><div class='del'>-		config-&gt;Option = s-&gt;cb_dev-&gt;subordinate-&gt;number;</div><div class='del'>-		if (s-&gt;state &amp; SOCKET_CARDBUS_CONFIG) {</div><div class='del'>-			config-&gt;Attributes = CONF_VALID_CLIENT;</div><div class='del'>-			config-&gt;IntType = INT_CARDBUS;</div><div class='del'>-			config-&gt;AssignedIRQ = s-&gt;irq.AssignedIRQ;</div><div class='del'>-			if (config-&gt;AssignedIRQ)</div><div class='del'>-				config-&gt;Attributes |= CONF_ENABLE_IRQ;</div><div class='del'>-			if (s-&gt;io[0].res) {</div><div class='del'>-				config-&gt;BasePort1 = s-&gt;io[0].res-&gt;start;</div><div class='del'>-				config-&gt;NumPorts1 = s-&gt;io[0].res-&gt;end - config-&gt;BasePort1 + 1;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		return CS_SUCCESS;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (p_dev) {</div><div class='del'>-		c = p_dev-&gt;function_config;</div><div class='del'>-		config-&gt;Function = p_dev-&gt;func;</div><div class='del'>-	} else {</div><div class='del'>-		c = NULL;</div><div class='del'>-		config-&gt;Function = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((c == NULL) || !(c-&gt;state &amp; CONFIG_LOCKED)) {</div><div class='del'>-		config-&gt;Attributes = 0;</div><div class='del'>-		config-&gt;Vcc = s-&gt;socket.Vcc;</div><div class='del'>-		config-&gt;Vpp1 = config-&gt;Vpp2 = s-&gt;socket.Vpp;</div><div class='del'>-		return CS_SUCCESS;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	config-&gt;Attributes = c-&gt;Attributes | CONF_VALID_CLIENT;</div><div class='del'>-	config-&gt;Vcc = s-&gt;socket.Vcc;</div><div class='del'>-	config-&gt;Vpp1 = config-&gt;Vpp2 = s-&gt;socket.Vpp;</div><div class='del'>-	config-&gt;IntType = c-&gt;IntType;</div><div class='del'>-	config-&gt;ConfigBase = c-&gt;ConfigBase;</div><div class='del'>-	config-&gt;Status = c-&gt;Status;</div><div class='del'>-	config-&gt;Pin = c-&gt;Pin;</div><div class='del'>-	config-&gt;Copy = c-&gt;Copy;</div><div class='del'>-	config-&gt;Option = c-&gt;Option;</div><div class='del'>-	config-&gt;ExtStatus = c-&gt;ExtStatus;</div><div class='del'>-	config-&gt;Present = config-&gt;CardValues = c-&gt;CardValues;</div><div class='del'>-	config-&gt;IRQAttributes = c-&gt;irq.Attributes;</div><div class='del'>-	config-&gt;AssignedIRQ = s-&gt;irq.AssignedIRQ;</div><div class='del'>-	config-&gt;BasePort1 = c-&gt;io.BasePort1;</div><div class='del'>-	config-&gt;NumPorts1 = c-&gt;io.NumPorts1;</div><div class='del'>-	config-&gt;Attributes1 = c-&gt;io.Attributes1;</div><div class='del'>-	config-&gt;BasePort2 = c-&gt;io.BasePort2;</div><div class='del'>-	config-&gt;NumPorts2 = c-&gt;io.NumPorts2;</div><div class='del'>-	config-&gt;Attributes2 = c-&gt;io.Attributes2;</div><div class='del'>-	config-&gt;IOAddrLines = c-&gt;io.IOAddrLines;</div><div class='del'>-</div><div class='del'>-	return CS_SUCCESS;</div><div class='del'>-} /* pccard_get_configuration_info */</div><div class='del'>-</div><div class='del'>-int pcmcia_get_configuration_info(struct pcmcia_device *p_dev,</div><div class='del'>-				  config_info_t *config)</div><div class='del'>-{</div><div class='del'>-	return pccard_get_configuration_info(p_dev-&gt;socket, p_dev,</div><div class='del'>-					     config);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(pcmcia_get_configuration_info);</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> /** pcmcia_get_window</div><div class='ctx'>  */</div><div class='ctx'> int pcmcia_get_window(struct pcmcia_socket *s, window_handle_t *handle,</div><div class='hunk'>@@ -284,12 +205,12 @@ int pcmcia_get_window(struct pcmcia_socket *s, window_handle_t *handle,</div><div class='ctx'> 	int w;</div><div class='ctx'> </div><div class='ctx'> 	if (!s || !(s-&gt;state &amp; SOCKET_PRESENT))</div><div class='del'>-		return CS_NO_CARD;</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	for (w = idx; w &lt; MAX_WIN; w++)</div><div class='ctx'> 		if (s-&gt;state &amp; SOCKET_WIN_REQ(w))</div><div class='ctx'> 			break;</div><div class='ctx'> 	if (w == MAX_WIN)</div><div class='del'>-		return CS_NO_MORE_ITEMS;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	win = &amp;s-&gt;win[w];</div><div class='ctx'> 	req-&gt;Base = win-&gt;ctl.res-&gt;start;</div><div class='ctx'> 	req-&gt;Size = win-&gt;ctl.res-&gt;end - win-&gt;ctl.res-&gt;start + 1;</div><div class='hunk'>@@ -304,7 +225,7 @@ int pcmcia_get_window(struct pcmcia_socket *s, window_handle_t *handle,</div><div class='ctx'> 	if (win-&gt;ctl.flags &amp; MAP_USE_WAIT)</div><div class='ctx'> 		req-&gt;Attributes |= WIN_USE_WAIT;</div><div class='ctx'> 	*handle = win;</div><div class='del'>-	return CS_SUCCESS;</div><div class='add'>+	return 0;</div><div class='ctx'> } /* pcmcia_get_window */</div><div class='ctx'> EXPORT_SYMBOL(pcmcia_get_window);</div><div class='ctx'> </div><div class='hunk'>@@ -316,10 +237,10 @@ EXPORT_SYMBOL(pcmcia_get_window);</div><div class='ctx'> int pcmcia_get_mem_page(window_handle_t win, memreq_t *req)</div><div class='ctx'> {</div><div class='ctx'> 	if ((win == NULL) || (win-&gt;magic != WINDOW_MAGIC))</div><div class='del'>-		return CS_BAD_HANDLE;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	req-&gt;Page = 0;</div><div class='ctx'> 	req-&gt;CardOffset = win-&gt;ctl.card_start;</div><div class='del'>-	return CS_SUCCESS;</div><div class='add'>+	return 0;</div><div class='ctx'> } /* pcmcia_get_mem_page */</div><div class='ctx'> EXPORT_SYMBOL(pcmcia_get_mem_page);</div><div class='ctx'> </div><div class='hunk'>@@ -328,14 +249,18 @@ int pcmcia_map_mem_page(window_handle_t win, memreq_t *req)</div><div class='ctx'> {</div><div class='ctx'> 	struct pcmcia_socket *s;</div><div class='ctx'> 	if ((win == NULL) || (win-&gt;magic != WINDOW_MAGIC))</div><div class='del'>-		return CS_BAD_HANDLE;</div><div class='del'>-	if (req-&gt;Page != 0)</div><div class='del'>-		return CS_BAD_PAGE;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	s = win-&gt;sock;</div><div class='add'>+	if (req-&gt;Page != 0) {</div><div class='add'>+		ds_dbg(s, 0, "failure: requested page is zero\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> 	win-&gt;ctl.card_start = req-&gt;CardOffset;</div><div class='del'>-	if (s-&gt;ops-&gt;set_mem_map(s, &amp;win-&gt;ctl) != 0)</div><div class='del'>-		return CS_BAD_OFFSET;</div><div class='del'>-	return CS_SUCCESS;</div><div class='add'>+	if (s-&gt;ops-&gt;set_mem_map(s, &amp;win-&gt;ctl) != 0) {</div><div class='add'>+		ds_dbg(s, 0, "failed to set_mem_map\n");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='ctx'> } /* pcmcia_map_mem_page */</div><div class='ctx'> EXPORT_SYMBOL(pcmcia_map_mem_page);</div><div class='ctx'> </div><div class='hunk'>@@ -354,9 +279,9 @@ int pcmcia_modify_configuration(struct pcmcia_device *p_dev,</div><div class='ctx'> 	c = p_dev-&gt;function_config;</div><div class='ctx'> </div><div class='ctx'> 	if (!(s-&gt;state &amp; SOCKET_PRESENT))</div><div class='del'>-		return CS_NO_CARD;</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	if (!(c-&gt;state &amp; CONFIG_LOCKED))</div><div class='del'>-		return CS_CONFIGURATION_LOCKED;</div><div class='add'>+		return -EACCES;</div><div class='ctx'> </div><div class='ctx'> 	if (mod-&gt;Attributes &amp; CONF_IRQ_CHANGE_VALID) {</div><div class='ctx'> 		if (mod-&gt;Attributes &amp; CONF_ENABLE_IRQ) {</div><div class='hunk'>@@ -369,20 +294,28 @@ int pcmcia_modify_configuration(struct pcmcia_device *p_dev,</div><div class='ctx'> 		s-&gt;ops-&gt;set_socket(s, &amp;s-&gt;socket);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (mod-&gt;Attributes &amp; CONF_VCC_CHANGE_VALID)</div><div class='del'>-		return CS_BAD_VCC;</div><div class='add'>+	if (mod-&gt;Attributes &amp; CONF_VCC_CHANGE_VALID) {</div><div class='add'>+		ds_dbg(s, 0, "changing Vcc is not allowed at this time\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* We only allow changing Vpp1 and Vpp2 to the same value */</div><div class='ctx'> 	if ((mod-&gt;Attributes &amp; CONF_VPP1_CHANGE_VALID) &amp;&amp;</div><div class='ctx'> 	    (mod-&gt;Attributes &amp; CONF_VPP2_CHANGE_VALID)) {</div><div class='ctx'> 		if (mod-&gt;Vpp1 != mod-&gt;Vpp2)</div><div class='del'>-			return CS_BAD_VPP;</div><div class='add'>+			ds_dbg(s, 0, "Vpp1 and Vpp2 must be the same\n");</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 		s-&gt;socket.Vpp = mod-&gt;Vpp1;</div><div class='del'>-		if (s-&gt;ops-&gt;set_socket(s, &amp;s-&gt;socket))</div><div class='del'>-			return CS_BAD_VPP;</div><div class='add'>+		if (s-&gt;ops-&gt;set_socket(s, &amp;s-&gt;socket)) {</div><div class='add'>+			dev_printk(KERN_WARNING, &amp;s-&gt;dev,</div><div class='add'>+				   "Unable to set VPP\n");</div><div class='add'>+			return -EIO;</div><div class='add'>+		}</div><div class='ctx'> 	} else if ((mod-&gt;Attributes &amp; CONF_VPP1_CHANGE_VALID) ||</div><div class='del'>-		   (mod-&gt;Attributes &amp; CONF_VPP2_CHANGE_VALID))</div><div class='del'>-		return CS_BAD_VPP;</div><div class='add'>+		   (mod-&gt;Attributes &amp; CONF_VPP2_CHANGE_VALID)) {</div><div class='add'>+		ds_dbg(s, 0, "changing Vcc is not allowed at this time\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (mod-&gt;Attributes &amp; CONF_IO_CHANGE_WIDTH) {</div><div class='ctx'> 		pccard_io_map io_off = { 0, 0, 0, 0, 1 };</div><div class='hunk'>@@ -406,7 +339,7 @@ int pcmcia_modify_configuration(struct pcmcia_device *p_dev,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return CS_SUCCESS;</div><div class='add'>+	return 0;</div><div class='ctx'> } /* modify_configuration */</div><div class='ctx'> EXPORT_SYMBOL(pcmcia_modify_configuration);</div><div class='ctx'> </div><div class='hunk'>@@ -441,7 +374,7 @@ int pcmcia_release_configuration(struct pcmcia_device *p_dev)</div><div class='ctx'> 			}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return CS_SUCCESS;</div><div class='add'>+	return 0;</div><div class='ctx'> } /* pcmcia_release_configuration */</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -459,7 +392,7 @@ static int pcmcia_release_io(struct pcmcia_device *p_dev, io_req_t *req)</div><div class='ctx'> 	config_t *c = p_dev-&gt;function_config;</div><div class='ctx'> </div><div class='ctx'> 	if (!p_dev-&gt;_io )</div><div class='del'>-		return CS_BAD_HANDLE;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	p_dev-&gt;_io = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -467,7 +400,7 @@ static int pcmcia_release_io(struct pcmcia_device *p_dev, io_req_t *req)</div><div class='ctx'> 	    (c-&gt;io.NumPorts1 != req-&gt;NumPorts1) ||</div><div class='ctx'> 	    (c-&gt;io.BasePort2 != req-&gt;BasePort2) ||</div><div class='ctx'> 	    (c-&gt;io.NumPorts2 != req-&gt;NumPorts2))</div><div class='del'>-		return CS_BAD_ARGS;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	c-&gt;state &amp;= ~CONFIG_IO_REQ;</div><div class='ctx'> </div><div class='hunk'>@@ -475,7 +408,7 @@ static int pcmcia_release_io(struct pcmcia_device *p_dev, io_req_t *req)</div><div class='ctx'> 	if (req-&gt;NumPorts2)</div><div class='ctx'> 		release_io_space(s, req-&gt;BasePort2, req-&gt;NumPorts2);</div><div class='ctx'> </div><div class='del'>-	return CS_SUCCESS;</div><div class='add'>+	return 0;</div><div class='ctx'> } /* pcmcia_release_io */</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -485,15 +418,19 @@ static int pcmcia_release_irq(struct pcmcia_device *p_dev, irq_req_t *req)</div><div class='ctx'> 	config_t *c= p_dev-&gt;function_config;</div><div class='ctx'> </div><div class='ctx'> 	if (!p_dev-&gt;_irq)</div><div class='del'>-		return CS_BAD_HANDLE;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	p_dev-&gt;_irq = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (c-&gt;state &amp; CONFIG_LOCKED)</div><div class='del'>-		return CS_CONFIGURATION_LOCKED;</div><div class='del'>-	if (c-&gt;irq.Attributes != req-&gt;Attributes)</div><div class='del'>-		return CS_BAD_ATTRIBUTE;</div><div class='del'>-	if (s-&gt;irq.AssignedIRQ != req-&gt;AssignedIRQ)</div><div class='del'>-		return CS_BAD_IRQ;</div><div class='add'>+		return -EACCES;</div><div class='add'>+	if (c-&gt;irq.Attributes != req-&gt;Attributes) {</div><div class='add'>+		ds_dbg(s, 0, "IRQ attributes must match assigned ones\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (s-&gt;irq.AssignedIRQ != req-&gt;AssignedIRQ) {</div><div class='add'>+		ds_dbg(s, 0, "IRQ must match assigned one\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> 	if (--s-&gt;irq.Config == 0) {</div><div class='ctx'> 		c-&gt;state &amp;= ~CONFIG_IRQ_REQ;</div><div class='ctx'> 		s-&gt;irq.AssignedIRQ = 0;</div><div class='hunk'>@@ -507,7 +444,7 @@ static int pcmcia_release_irq(struct pcmcia_device *p_dev, irq_req_t *req)</div><div class='ctx'> 	pcmcia_used_irq[req-&gt;AssignedIRQ]--;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	return CS_SUCCESS;</div><div class='add'>+	return 0;</div><div class='ctx'> } /* pcmcia_release_irq */</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -516,10 +453,10 @@ int pcmcia_release_window(window_handle_t win)</div><div class='ctx'> 	struct pcmcia_socket *s;</div><div class='ctx'> </div><div class='ctx'> 	if ((win == NULL) || (win-&gt;magic != WINDOW_MAGIC))</div><div class='del'>-		return CS_BAD_HANDLE;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	s = win-&gt;sock;</div><div class='ctx'> 	if (!(win-&gt;handle-&gt;_win &amp; CLIENT_WIN_REQ(win-&gt;index)))</div><div class='del'>-		return CS_BAD_HANDLE;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* Shut down memory window */</div><div class='ctx'> 	win-&gt;ctl.flags &amp;= ~MAP_ACTIVE;</div><div class='hunk'>@@ -536,7 +473,7 @@ int pcmcia_release_window(window_handle_t win)</div><div class='ctx'> </div><div class='ctx'> 	win-&gt;magic = 0;</div><div class='ctx'> </div><div class='del'>-	return CS_SUCCESS;</div><div class='add'>+	return 0;</div><div class='ctx'> } /* pcmcia_release_window */</div><div class='ctx'> EXPORT_SYMBOL(pcmcia_release_window);</div><div class='ctx'> </div><div class='hunk'>@@ -551,18 +488,23 @@ int pcmcia_request_configuration(struct pcmcia_device *p_dev,</div><div class='ctx'> 	pccard_io_map iomap;</div><div class='ctx'> </div><div class='ctx'> 	if (!(s-&gt;state &amp; SOCKET_PRESENT))</div><div class='del'>-		return CS_NO_CARD;</div><div class='add'>+		return -ENODEV;;</div><div class='ctx'> </div><div class='del'>-	if (req-&gt;IntType &amp; INT_CARDBUS)</div><div class='del'>-		return CS_UNSUPPORTED_MODE;</div><div class='add'>+	if (req-&gt;IntType &amp; INT_CARDBUS) {</div><div class='add'>+		ds_dbg(p_dev-&gt;socket, 0, "IntType may not be INT_CARDBUS\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> 	c = p_dev-&gt;function_config;</div><div class='ctx'> 	if (c-&gt;state &amp; CONFIG_LOCKED)</div><div class='del'>-		return CS_CONFIGURATION_LOCKED;</div><div class='add'>+		return -EACCES;</div><div class='ctx'> </div><div class='ctx'> 	/* Do power control.  We don't allow changes in Vcc. */</div><div class='ctx'> 	s-&gt;socket.Vpp = req-&gt;Vpp;</div><div class='del'>-	if (s-&gt;ops-&gt;set_socket(s, &amp;s-&gt;socket))</div><div class='del'>-		return CS_BAD_VPP;</div><div class='add'>+	if (s-&gt;ops-&gt;set_socket(s, &amp;s-&gt;socket)) {</div><div class='add'>+		dev_printk(KERN_WARNING, &amp;s-&gt;dev,</div><div class='add'>+			   "Unable to set socket state\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Pick memory or I/O card, DMA mode, interrupt */</div><div class='ctx'> 	c-&gt;IntType = req-&gt;IntType;</div><div class='hunk'>@@ -651,7 +593,7 @@ int pcmcia_request_configuration(struct pcmcia_device *p_dev,</div><div class='ctx'> </div><div class='ctx'> 	c-&gt;state |= CONFIG_LOCKED;</div><div class='ctx'> 	p_dev-&gt;_locked = 1;</div><div class='del'>-	return CS_SUCCESS;</div><div class='add'>+	return 0;</div><div class='ctx'> } /* pcmcia_request_configuration */</div><div class='ctx'> EXPORT_SYMBOL(pcmcia_request_configuration);</div><div class='ctx'> </div><div class='hunk'>@@ -667,37 +609,48 @@ int pcmcia_request_io(struct pcmcia_device *p_dev, io_req_t *req)</div><div class='ctx'> 	config_t *c;</div><div class='ctx'> </div><div class='ctx'> 	if (!(s-&gt;state &amp; SOCKET_PRESENT))</div><div class='del'>-		return CS_NO_CARD;</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	if (!req)</div><div class='del'>-		return CS_UNSUPPORTED_MODE;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	c = p_dev-&gt;function_config;</div><div class='ctx'> 	if (c-&gt;state &amp; CONFIG_LOCKED)</div><div class='del'>-		return CS_CONFIGURATION_LOCKED;</div><div class='del'>-	if (c-&gt;state &amp; CONFIG_IO_REQ)</div><div class='del'>-		return CS_IN_USE;</div><div class='del'>-	if (req-&gt;Attributes1 &amp; (IO_SHARED | IO_FORCE_ALIAS_ACCESS))</div><div class='del'>-		return CS_BAD_ATTRIBUTE;</div><div class='add'>+		return -EACCES;</div><div class='add'>+	if (c-&gt;state &amp; CONFIG_IO_REQ) {</div><div class='add'>+		ds_dbg(s, 0, "IO already configured\n");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+	if (req-&gt;Attributes1 &amp; (IO_SHARED | IO_FORCE_ALIAS_ACCESS)) {</div><div class='add'>+		ds_dbg(s, 0, "bad attribute setting for IO region 1\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> 	if ((req-&gt;NumPorts2 &gt; 0) &amp;&amp;</div><div class='del'>-	    (req-&gt;Attributes2 &amp; (IO_SHARED | IO_FORCE_ALIAS_ACCESS)))</div><div class='del'>-		return CS_BAD_ATTRIBUTE;</div><div class='add'>+	    (req-&gt;Attributes2 &amp; (IO_SHARED | IO_FORCE_ALIAS_ACCESS))) {</div><div class='add'>+		ds_dbg(s, 0, "bad attribute setting for IO region 2\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	ds_dbg(s, 1, "trying to allocate resource 1\n");</div><div class='ctx'> 	if (alloc_io_space(s, req-&gt;Attributes1, &amp;req-&gt;BasePort1,</div><div class='del'>-			   req-&gt;NumPorts1, req-&gt;IOAddrLines))</div><div class='del'>-		return CS_IN_USE;</div><div class='add'>+			   req-&gt;NumPorts1, req-&gt;IOAddrLines)) {</div><div class='add'>+		ds_dbg(s, 0, "allocation of resource 1 failed\n");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (req-&gt;NumPorts2) {</div><div class='add'>+		ds_dbg(s, 1, "trying to allocate resource 2\n");</div><div class='ctx'> 		if (alloc_io_space(s, req-&gt;Attributes2, &amp;req-&gt;BasePort2,</div><div class='ctx'> 				   req-&gt;NumPorts2, req-&gt;IOAddrLines)) {</div><div class='add'>+			ds_dbg(s, 0, "allocation of resource 2 failed\n");</div><div class='ctx'> 			release_io_space(s, req-&gt;BasePort1, req-&gt;NumPorts1);</div><div class='del'>-			return CS_IN_USE;</div><div class='add'>+			return -EBUSY;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	c-&gt;io = *req;</div><div class='ctx'> 	c-&gt;state |= CONFIG_IO_REQ;</div><div class='ctx'> 	p_dev-&gt;_io = 1;</div><div class='del'>-	return CS_SUCCESS;</div><div class='add'>+	return 0;</div><div class='ctx'> } /* pcmcia_request_io */</div><div class='ctx'> EXPORT_SYMBOL(pcmcia_request_io);</div><div class='ctx'> </div><div class='hunk'>@@ -723,16 +676,18 @@ int pcmcia_request_irq(struct pcmcia_device *p_dev, irq_req_t *req)</div><div class='ctx'> {</div><div class='ctx'> 	struct pcmcia_socket *s = p_dev-&gt;socket;</div><div class='ctx'> 	config_t *c;</div><div class='del'>-	int ret = CS_IN_USE, irq = 0;</div><div class='add'>+	int ret = -EINVAL, irq = 0;</div><div class='ctx'> 	int type;</div><div class='ctx'> </div><div class='ctx'> 	if (!(s-&gt;state &amp; SOCKET_PRESENT))</div><div class='del'>-		return CS_NO_CARD;</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	c = p_dev-&gt;function_config;</div><div class='ctx'> 	if (c-&gt;state &amp; CONFIG_LOCKED)</div><div class='del'>-		return CS_CONFIGURATION_LOCKED;</div><div class='del'>-	if (c-&gt;state &amp; CONFIG_IRQ_REQ)</div><div class='del'>-		return CS_IN_USE;</div><div class='add'>+		return -EACCES;</div><div class='add'>+	if (c-&gt;state &amp; CONFIG_IRQ_REQ) {</div><div class='add'>+		ds_dbg(s, 0, "IRQ already configured\n");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Decide what type of interrupt we are registering */</div><div class='ctx'> 	type = 0;</div><div class='hunk'>@@ -795,15 +750,19 @@ int pcmcia_request_irq(struct pcmcia_device *p_dev, irq_req_t *req)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ret &amp;&amp; (req-&gt;Attributes &amp; IRQ_HANDLE_PRESENT)) {</div><div class='del'>-		if (request_irq(irq, req-&gt;Handler, type,  p_dev-&gt;devname, req-&gt;Instance))</div><div class='del'>-			return CS_IN_USE;</div><div class='add'>+		ret = request_irq(irq, req-&gt;Handler, type,</div><div class='add'>+				  p_dev-&gt;devname, req-&gt;Instance);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Make sure the fact the request type was overridden is passed back */</div><div class='ctx'> 	if (type == IRQF_SHARED &amp;&amp; !(req-&gt;Attributes &amp; IRQ_TYPE_DYNAMIC_SHARING)) {</div><div class='ctx'> 		req-&gt;Attributes |= IRQ_TYPE_DYNAMIC_SHARING;</div><div class='del'>-		printk(KERN_WARNING "pcmcia: request for exclusive IRQ could not be fulfilled.\n");</div><div class='del'>-		printk(KERN_WARNING "pcmcia: the driver needs updating to supported shared IRQ lines.\n");</div><div class='add'>+		dev_printk(KERN_WARNING, &amp;p_dev-&gt;dev, "pcmcia: "</div><div class='add'>+			"request for exclusive IRQ could not be fulfilled.\n");</div><div class='add'>+		dev_printk(KERN_WARNING, &amp;p_dev-&gt;dev, "pcmcia: the driver "</div><div class='add'>+			"needs updating to supported shared IRQ lines.\n");</div><div class='ctx'> 	}</div><div class='ctx'> 	c-&gt;irq.Attributes = req-&gt;Attributes;</div><div class='ctx'> 	s-&gt;irq.AssignedIRQ = req-&gt;AssignedIRQ = irq;</div><div class='hunk'>@@ -816,7 +775,7 @@ int pcmcia_request_irq(struct pcmcia_device *p_dev, irq_req_t *req)</div><div class='ctx'> 	pcmcia_used_irq[irq]++;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	return CS_SUCCESS;</div><div class='add'>+	return 0;</div><div class='ctx'> } /* pcmcia_request_irq */</div><div class='ctx'> EXPORT_SYMBOL(pcmcia_request_irq);</div><div class='ctx'> </div><div class='hunk'>@@ -834,9 +793,11 @@ int pcmcia_request_window(struct pcmcia_device **p_dev, win_req_t *req, window_h</div><div class='ctx'> 	int w;</div><div class='ctx'> </div><div class='ctx'> 	if (!(s-&gt;state &amp; SOCKET_PRESENT))</div><div class='del'>-		return CS_NO_CARD;</div><div class='del'>-	if (req-&gt;Attributes &amp; (WIN_PAGED | WIN_SHARED))</div><div class='del'>-		return CS_BAD_ATTRIBUTE;</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	if (req-&gt;Attributes &amp; (WIN_PAGED | WIN_SHARED)) {</div><div class='add'>+		ds_dbg(s, 0, "bad attribute setting for iomem region\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Window size defaults to smallest available */</div><div class='ctx'> 	if (req-&gt;Size == 0)</div><div class='hunk'>@@ -844,19 +805,25 @@ int pcmcia_request_window(struct pcmcia_device **p_dev, win_req_t *req, window_h</div><div class='ctx'> 	align = (((s-&gt;features &amp; SS_CAP_MEM_ALIGN) ||</div><div class='ctx'> 		  (req-&gt;Attributes &amp; WIN_STRICT_ALIGN)) ?</div><div class='ctx'> 		 req-&gt;Size : s-&gt;map_size);</div><div class='del'>-	if (req-&gt;Size &amp; (s-&gt;map_size-1))</div><div class='del'>-		return CS_BAD_SIZE;</div><div class='add'>+	if (req-&gt;Size &amp; (s-&gt;map_size-1)) {</div><div class='add'>+		ds_dbg(s, 0, "invalid map size\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> 	if ((req-&gt;Base &amp;&amp; (s-&gt;features &amp; SS_CAP_STATIC_MAP)) ||</div><div class='del'>-	    (req-&gt;Base &amp; (align-1)))</div><div class='del'>-		return CS_BAD_BASE;</div><div class='add'>+	    (req-&gt;Base &amp; (align-1))) {</div><div class='add'>+		ds_dbg(s, 0, "invalid base address\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> 	if (req-&gt;Base)</div><div class='ctx'> 		align = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate system memory window */</div><div class='ctx'> 	for (w = 0; w &lt; MAX_WIN; w++)</div><div class='ctx'> 		if (!(s-&gt;state &amp; SOCKET_WIN_REQ(w))) break;</div><div class='del'>-	if (w == MAX_WIN)</div><div class='del'>-		return CS_OUT_OF_RESOURCE;</div><div class='add'>+	if (w == MAX_WIN) {</div><div class='add'>+		ds_dbg(s, 0, "all windows are used already\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	win = &amp;s-&gt;win[w];</div><div class='ctx'> 	win-&gt;magic = WINDOW_MAGIC;</div><div class='hunk'>@@ -867,8 +834,10 @@ int pcmcia_request_window(struct pcmcia_device **p_dev, win_req_t *req, window_h</div><div class='ctx'> 	if (!(s-&gt;features &amp; SS_CAP_STATIC_MAP)) {</div><div class='ctx'> 		win-&gt;ctl.res = pcmcia_find_mem_region(req-&gt;Base, req-&gt;Size, align,</div><div class='ctx'> 						      (req-&gt;Attributes &amp; WIN_MAP_BELOW_1MB), s);</div><div class='del'>-		if (!win-&gt;ctl.res)</div><div class='del'>-			return CS_IN_USE;</div><div class='add'>+		if (!win-&gt;ctl.res) {</div><div class='add'>+			ds_dbg(s, 0, "allocating mem region failed\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	(*p_dev)-&gt;_win |= CLIENT_WIN_REQ(w);</div><div class='ctx'> </div><div class='hunk'>@@ -885,8 +854,10 @@ int pcmcia_request_window(struct pcmcia_device **p_dev, win_req_t *req, window_h</div><div class='ctx'> 	if (req-&gt;Attributes &amp; WIN_USE_WAIT)</div><div class='ctx'> 		win-&gt;ctl.flags |= MAP_USE_WAIT;</div><div class='ctx'> 	win-&gt;ctl.card_start = 0;</div><div class='del'>-	if (s-&gt;ops-&gt;set_mem_map(s, &amp;win-&gt;ctl) != 0)</div><div class='del'>-		return CS_BAD_ARGS;</div><div class='add'>+	if (s-&gt;ops-&gt;set_mem_map(s, &amp;win-&gt;ctl) != 0) {</div><div class='add'>+		ds_dbg(s, 0, "failed to set memory mapping\n");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='ctx'> 	s-&gt;state |= SOCKET_WIN_REQ(w);</div><div class='ctx'> </div><div class='ctx'> 	/* Return window handle */</div><div class='hunk'>@@ -897,7 +868,7 @@ int pcmcia_request_window(struct pcmcia_device **p_dev, win_req_t *req, window_h</div><div class='ctx'> 	}</div><div class='ctx'> 	*wh = win;</div><div class='ctx'> </div><div class='del'>-	return CS_SUCCESS;</div><div class='add'>+	return 0;</div><div class='ctx'> } /* pcmcia_request_window */</div><div class='ctx'> EXPORT_SYMBOL(pcmcia_request_window);</div><div class='ctx'> </div><div class='hunk'>@@ -909,3 +880,79 @@ void pcmcia_disable_device(struct pcmcia_device *p_dev) {</div><div class='ctx'> 		pcmcia_release_window(p_dev-&gt;win);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(pcmcia_disable_device);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+struct pcmcia_cfg_mem {</div><div class='add'>+	tuple_t tuple;</div><div class='add'>+	cisparse_t parse;</div><div class='add'>+	u8 buf[256];</div><div class='add'>+	cistpl_cftable_entry_t dflt;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pcmcia_loop_config() - loop over configuration options</div><div class='add'>+ * @p_dev:	the struct pcmcia_device which we need to loop for.</div><div class='add'>+ * @conf_check:	function to call for each configuration option.</div><div class='add'>+ *		It gets passed the struct pcmcia_device, the CIS data</div><div class='add'>+ *		describing the configuration option, and private data</div><div class='add'>+ *		being passed to pcmcia_loop_config()</div><div class='add'>+ * @priv_data:	private data to be passed to the conf_check function.</div><div class='add'>+ *</div><div class='add'>+ * pcmcia_loop_config() loops over all configuration options, and calls</div><div class='add'>+ * the driver-specific conf_check() for each one, checking whether</div><div class='add'>+ * it is a valid one.</div><div class='add'>+ */</div><div class='add'>+int pcmcia_loop_config(struct pcmcia_device *p_dev,</div><div class='add'>+		       int	(*conf_check)	(struct pcmcia_device *p_dev,</div><div class='add'>+						 cistpl_cftable_entry_t *cfg,</div><div class='add'>+						 cistpl_cftable_entry_t *dflt,</div><div class='add'>+						 unsigned int vcc,</div><div class='add'>+						 void *priv_data),</div><div class='add'>+		       void *priv_data)</div><div class='add'>+{</div><div class='add'>+	struct pcmcia_cfg_mem *cfg_mem;</div><div class='add'>+</div><div class='add'>+	tuple_t *tuple;</div><div class='add'>+	int ret = -ENODEV;</div><div class='add'>+	unsigned int vcc;</div><div class='add'>+</div><div class='add'>+	cfg_mem = kzalloc(sizeof(struct pcmcia_cfg_mem), GFP_KERNEL);</div><div class='add'>+	if (cfg_mem == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* get the current Vcc setting */</div><div class='add'>+	vcc = p_dev-&gt;socket-&gt;socket.Vcc;</div><div class='add'>+</div><div class='add'>+	tuple = &amp;cfg_mem-&gt;tuple;</div><div class='add'>+	tuple-&gt;TupleData = cfg_mem-&gt;buf;</div><div class='add'>+	tuple-&gt;TupleDataMax = 255;</div><div class='add'>+	tuple-&gt;TupleOffset = 0;</div><div class='add'>+	tuple-&gt;DesiredTuple = CISTPL_CFTABLE_ENTRY;</div><div class='add'>+	tuple-&gt;Attributes = 0;</div><div class='add'>+</div><div class='add'>+	ret = pcmcia_get_first_tuple(p_dev, tuple);</div><div class='add'>+	while (!ret) {</div><div class='add'>+		cistpl_cftable_entry_t *cfg = &amp;cfg_mem-&gt;parse.cftable_entry;</div><div class='add'>+</div><div class='add'>+		if (pcmcia_get_tuple_data(p_dev, tuple))</div><div class='add'>+			goto next_entry;</div><div class='add'>+</div><div class='add'>+		if (pcmcia_parse_tuple(tuple, &amp;cfg_mem-&gt;parse))</div><div class='add'>+			goto next_entry;</div><div class='add'>+</div><div class='add'>+		/* default values */</div><div class='add'>+		p_dev-&gt;conf.ConfigIndex = cfg-&gt;index;</div><div class='add'>+		if (cfg-&gt;flags &amp; CISTPL_CFTABLE_DEFAULT)</div><div class='add'>+			cfg_mem-&gt;dflt = *cfg;</div><div class='add'>+</div><div class='add'>+		ret = conf_check(p_dev, cfg, &amp;cfg_mem-&gt;dflt, vcc, priv_data);</div><div class='add'>+		if (!ret)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+next_entry:</div><div class='add'>+		ret = pcmcia_get_next_tuple(p_dev, tuple);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(pcmcia_loop_config);</div><div class='head'>diff --git a/drivers/pcmcia/pxa2xx_base.c b/drivers/pcmcia/pxa2xx_base.c<br/>index 1b07af5a2ed3..bb9ddb9532e3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pcmcia/pxa2xx_base.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/pcmcia/pxa2xx_base.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pcmcia/pxa2xx_base.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pcmcia/pxa2xx_base.c</a></div><div class='hunk'>@@ -30,12 +30,12 @@</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;mach/pxa-regs.h&gt;</div><div class='ctx'> #include &lt;mach/pxa2xx-regs.h&gt;</div><div class='add'>+#include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;pcmcia/cs_types.h&gt;</div><div class='ctx'> #include &lt;pcmcia/ss.h&gt;</div><div class='ctx'> #include &lt;pcmcia/cistpl.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "cs_internal.h"</div><div class='ctx'> #include "soc_common.h"</div><div class='ctx'> #include "pxa2xx_base.h"</div><div class='ctx'> </div><div class='hunk'>@@ -166,18 +166,32 @@ pxa2xx_pcmcia_frequency_change(struct soc_pcmcia_socket *skt,</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+static void pxa2xx_configure_sockets(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct pcmcia_low_level *ops = dev-&gt;platform_data;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We have at least one socket, so set MECR:CIT</div><div class='add'>+	 * (Card Is There)</div><div class='add'>+	 */</div><div class='add'>+	MECR |= MECR_CIT;</div><div class='add'>+</div><div class='add'>+	/* Set MECR:NOS (Number Of Sockets) */</div><div class='add'>+	if (ops-&gt;nr &gt; 1 || machine_is_viper())</div><div class='add'>+		MECR |= MECR_NOS;</div><div class='add'>+	else</div><div class='add'>+		MECR &amp;= ~MECR_NOS;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int __pxa2xx_drv_pcmcia_probe(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct pcmcia_low_level *ops;</div><div class='del'>-	int first, nr;</div><div class='ctx'> </div><div class='ctx'> 	if (!dev || !dev-&gt;platform_data)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	ops = (struct pcmcia_low_level *)dev-&gt;platform_data;</div><div class='del'>-	first = ops-&gt;first;</div><div class='del'>-	nr = ops-&gt;nr;</div><div class='ctx'> </div><div class='ctx'> 	/* Provide our PXA2xx specific timing routines. */</div><div class='ctx'> 	ops-&gt;set_timing  = pxa2xx_pcmcia_set_timing;</div><div class='hunk'>@@ -185,21 +199,10 @@ int __pxa2xx_drv_pcmcia_probe(struct device *dev)</div><div class='ctx'> 	ops-&gt;frequency_change = pxa2xx_pcmcia_frequency_change;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	ret = soc_common_drv_pcmcia_probe(dev, ops, first, nr);</div><div class='add'>+	ret = soc_common_drv_pcmcia_probe(dev, ops, ops-&gt;first, ops-&gt;nr);</div><div class='ctx'> </div><div class='del'>-	if (ret == 0) {</div><div class='del'>-		/*</div><div class='del'>-		 * We have at least one socket, so set MECR:CIT</div><div class='del'>-		 * (Card Is There)</div><div class='del'>-		 */</div><div class='del'>-		MECR |= MECR_CIT;</div><div class='del'>-</div><div class='del'>-		/* Set MECR:NOS (Number Of Sockets) */</div><div class='del'>-		if (nr &gt; 1)</div><div class='del'>-			MECR |= MECR_NOS;</div><div class='del'>-		else</div><div class='del'>-			MECR &amp;= ~MECR_NOS;</div><div class='del'>-	}</div><div class='add'>+	if (!ret)</div><div class='add'>+		pxa2xx_configure_sockets(dev);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -223,11 +226,7 @@ static int pxa2xx_drv_pcmcia_suspend(struct platform_device *dev, pm_message_t s</div><div class='ctx'> </div><div class='ctx'> static int pxa2xx_drv_pcmcia_resume(struct platform_device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct pcmcia_low_level *ops = dev-&gt;dev.platform_data;</div><div class='del'>-	int nr = ops ? ops-&gt;nr : 0;</div><div class='del'>-</div><div class='del'>-	MECR = nr &gt; 1 ? MECR_CIT | MECR_NOS : (nr &gt; 0 ? MECR_CIT : 0);</div><div class='del'>-</div><div class='add'>+	pxa2xx_configure_sockets(&amp;dev-&gt;dev);</div><div class='ctx'> 	return pcmcia_socket_dev_resume(&amp;dev-&gt;dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/pcmcia/pxa2xx_cm_x255.c b/drivers/pcmcia/pxa2xx_cm_x255.c<br/>new file mode 100644<br/>index 000000000000..7c8bcb476622<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pcmcia/pxa2xx_cm_x255.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pcmcia/pxa2xx_cm_x255.c</a></div><div class='hunk'>@@ -0,0 +1,154 @@</div><div class='add'>+/*</div><div class='add'>+ * linux/drivers/pcmcia/pxa/pxa_cm_x255.c</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * Compulab Ltd., 2003, 2007, 2008</div><div class='add'>+ * Mike Rapoport &lt;mike@compulab.co.il&gt;</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/gpio.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/mach-types.h&gt;</div><div class='add'>+#include &lt;mach/pxa-regs.h&gt;</div><div class='add'>+</div><div class='add'>+#include "soc_common.h"</div><div class='add'>+</div><div class='add'>+#define GPIO_PCMCIA_SKTSEL	(54)</div><div class='add'>+#define GPIO_PCMCIA_S0_CD_VALID	(16)</div><div class='add'>+#define GPIO_PCMCIA_S1_CD_VALID	(17)</div><div class='add'>+#define GPIO_PCMCIA_S0_RDYINT	(6)</div><div class='add'>+#define GPIO_PCMCIA_S1_RDYINT	(8)</div><div class='add'>+#define GPIO_PCMCIA_RESET	(9)</div><div class='add'>+</div><div class='add'>+#define PCMCIA_S0_CD_VALID	IRQ_GPIO(GPIO_PCMCIA_S0_CD_VALID)</div><div class='add'>+#define PCMCIA_S1_CD_VALID	IRQ_GPIO(GPIO_PCMCIA_S1_CD_VALID)</div><div class='add'>+#define PCMCIA_S0_RDYINT	IRQ_GPIO(GPIO_PCMCIA_S0_RDYINT)</div><div class='add'>+#define PCMCIA_S1_RDYINT	IRQ_GPIO(GPIO_PCMCIA_S1_RDYINT)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static struct pcmcia_irqs irqs[] = {</div><div class='add'>+	{ 0, PCMCIA_S0_CD_VALID, "PCMCIA0 CD" },</div><div class='add'>+	{ 1, PCMCIA_S1_CD_VALID, "PCMCIA1 CD" },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int cmx255_pcmcia_hw_init(struct soc_pcmcia_socket *skt)</div><div class='add'>+{</div><div class='add'>+	int ret = gpio_request(GPIO_PCMCIA_RESET, "PCCard reset");</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	gpio_direction_output(GPIO_PCMCIA_RESET, 0);</div><div class='add'>+</div><div class='add'>+	skt-&gt;irq = skt-&gt;nr == 0 ? PCMCIA_S0_RDYINT : PCMCIA_S1_RDYINT;</div><div class='add'>+	ret = soc_pcmcia_request_irqs(skt, irqs, ARRAY_SIZE(irqs));</div><div class='add'>+	if (!ret)</div><div class='add'>+		gpio_free(GPIO_PCMCIA_RESET);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cmx255_pcmcia_shutdown(struct soc_pcmcia_socket *skt)</div><div class='add'>+{</div><div class='add'>+	soc_pcmcia_free_irqs(skt, irqs, ARRAY_SIZE(irqs));</div><div class='add'>+	gpio_free(GPIO_PCMCIA_RESET);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void cmx255_pcmcia_socket_state(struct soc_pcmcia_socket *skt,</div><div class='add'>+				       struct pcmcia_state *state)</div><div class='add'>+{</div><div class='add'>+	int cd = skt-&gt;nr ? GPIO_PCMCIA_S1_CD_VALID : GPIO_PCMCIA_S0_CD_VALID;</div><div class='add'>+	int rdy = skt-&gt;nr ? GPIO_PCMCIA_S0_RDYINT : GPIO_PCMCIA_S1_RDYINT;</div><div class='add'>+</div><div class='add'>+	state-&gt;detect = !gpio_get_value(cd);</div><div class='add'>+	state-&gt;ready  = !!gpio_get_value(rdy);</div><div class='add'>+	state-&gt;bvd1   = 1;</div><div class='add'>+	state-&gt;bvd2   = 1;</div><div class='add'>+	state-&gt;vs_3v  = 0;</div><div class='add'>+	state-&gt;vs_Xv  = 0;</div><div class='add'>+	state-&gt;wrprot = 0;  /* not available */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int cmx255_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,</div><div class='add'>+					  const socket_state_t *state)</div><div class='add'>+{</div><div class='add'>+	switch (skt-&gt;nr) {</div><div class='add'>+	case 0:</div><div class='add'>+		if (state-&gt;flags &amp; SS_RESET) {</div><div class='add'>+			gpio_set_value(GPIO_PCMCIA_SKTSEL, 0);</div><div class='add'>+			udelay(1);</div><div class='add'>+			gpio_set_value(GPIO_PCMCIA_RESET, 1);</div><div class='add'>+			udelay(10);</div><div class='add'>+			gpio_set_value(GPIO_PCMCIA_RESET, 0);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		if (state-&gt;flags &amp; SS_RESET) {</div><div class='add'>+			gpio_set_value(GPIO_PCMCIA_SKTSEL, 1);</div><div class='add'>+			udelay(1);</div><div class='add'>+			gpio_set_value(GPIO_PCMCIA_RESET, 1);</div><div class='add'>+			udelay(10);</div><div class='add'>+			gpio_set_value(GPIO_PCMCIA_RESET, 0);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cmx255_pcmcia_socket_init(struct soc_pcmcia_socket *skt)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cmx255_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static struct pcmcia_low_level cmx255_pcmcia_ops __initdata = {</div><div class='add'>+	.owner			= THIS_MODULE,</div><div class='add'>+	.hw_init		= cmx255_pcmcia_hw_init,</div><div class='add'>+	.hw_shutdown		= cmx255_pcmcia_shutdown,</div><div class='add'>+	.socket_state		= cmx255_pcmcia_socket_state,</div><div class='add'>+	.configure_socket	= cmx255_pcmcia_configure_socket,</div><div class='add'>+	.socket_init		= cmx255_pcmcia_socket_init,</div><div class='add'>+	.socket_suspend		= cmx255_pcmcia_socket_suspend,</div><div class='add'>+	.nr			= 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device *cmx255_pcmcia_device;</div><div class='add'>+</div><div class='add'>+int __init cmx255_pcmcia_init(void)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	cmx255_pcmcia_device = platform_device_alloc("pxa2xx-pcmcia", -1);</div><div class='add'>+</div><div class='add'>+	if (!cmx255_pcmcia_device)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ret = platform_device_add_data(cmx255_pcmcia_device, &amp;cmx255_pcmcia_ops,</div><div class='add'>+				       sizeof(cmx255_pcmcia_ops));</div><div class='add'>+</div><div class='add'>+	if (ret == 0) {</div><div class='add'>+		printk(KERN_INFO "Registering cm-x255 PCMCIA interface.\n");</div><div class='add'>+		ret = platform_device_add(cmx255_pcmcia_device);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		platform_device_put(cmx255_pcmcia_device);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __exit cmx255_pcmcia_exit(void)</div><div class='add'>+{</div><div class='add'>+	platform_device_unregister(cmx255_pcmcia_device);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/pcmcia/pxa2xx_cm_x270.c b/drivers/pcmcia/pxa2xx_cm_x270.c<br/>index bcff5cfed051..6c3aac377126 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pcmcia/pxa2xx_cm_x270.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/pcmcia/pxa2xx_cm_x270.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pcmcia/pxa2xx_cm_x270.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pcmcia/pxa2xx_cm_x270.c</a></div><div class='hunk'>@@ -105,13 +105,10 @@ static struct pcmcia_low_level cmx270_pcmcia_ops __initdata = {</div><div class='ctx'> </div><div class='ctx'> static struct platform_device *cmx270_pcmcia_device;</div><div class='ctx'> </div><div class='del'>-static int __init cmx270_pcmcia_init(void)</div><div class='add'>+int __init cmx270_pcmcia_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (!machine_is_armcore())</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='ctx'> 	cmx270_pcmcia_device = platform_device_alloc("pxa2xx-pcmcia", -1);</div><div class='ctx'> </div><div class='ctx'> 	if (!cmx270_pcmcia_device)</div><div class='hunk'>@@ -131,14 +128,7 @@ static int __init cmx270_pcmcia_init(void)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __exit cmx270_pcmcia_exit(void)</div><div class='add'>+void __exit cmx270_pcmcia_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	platform_device_unregister(cmx270_pcmcia_device);</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-module_init(cmx270_pcmcia_init);</div><div class='del'>-module_exit(cmx270_pcmcia_exit);</div><div class='del'>-</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_AUTHOR("Mike Rapoport &lt;mike@compulab.co.il&gt;");</div><div class='del'>-MODULE_DESCRIPTION("CM-x270 PCMCIA driver");</div><div class='head'>diff --git a/drivers/pcmcia/pxa2xx_cm_x2xx.c b/drivers/pcmcia/pxa2xx_cm_x2xx.c<br/>new file mode 100644<br/>index 000000000000..4f09506ad8d4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pcmcia/pxa2xx_cm_x2xx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pcmcia/pxa2xx_cm_x2xx.c</a></div><div class='hunk'>@@ -0,0 +1,49 @@</div><div class='add'>+/*</div><div class='add'>+ * linux/drivers/pcmcia/pxa/pxa_cm_x2xx.c</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * Compulab Ltd., 2003, 2007, 2008</div><div class='add'>+ * Mike Rapoport &lt;mike@compulab.co.il&gt;</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/system.h&gt;</div><div class='add'>+#include &lt;asm/mach-types.h&gt;</div><div class='add'>+#include &lt;mach/system.h&gt;</div><div class='add'>+</div><div class='add'>+int cmx255_pcmcia_init(void);</div><div class='add'>+int cmx270_pcmcia_init(void);</div><div class='add'>+void cmx255_pcmcia_exit(void);</div><div class='add'>+void cmx270_pcmcia_exit(void);</div><div class='add'>+</div><div class='add'>+static int __init cmx2xx_pcmcia_init(void)</div><div class='add'>+{</div><div class='add'>+	int ret = -ENODEV;</div><div class='add'>+</div><div class='add'>+	if (machine_is_armcore() &amp;&amp; cpu_is_pxa25x())</div><div class='add'>+		ret = cmx255_pcmcia_init();</div><div class='add'>+	else if (machine_is_armcore() &amp;&amp; cpu_is_pxa27x())</div><div class='add'>+		ret = cmx270_pcmcia_init();</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit cmx2xx_pcmcia_exit(void)</div><div class='add'>+{</div><div class='add'>+	if (machine_is_armcore() &amp;&amp; cpu_is_pxa25x())</div><div class='add'>+		cmx255_pcmcia_exit();</div><div class='add'>+	else if (machine_is_armcore() &amp;&amp; cpu_is_pxa27x())</div><div class='add'>+		cmx270_pcmcia_exit();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(cmx2xx_pcmcia_init);</div><div class='add'>+module_exit(cmx2xx_pcmcia_exit);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_AUTHOR("Mike Rapoport &lt;mike@compulab.co.il&gt;");</div><div class='add'>+MODULE_DESCRIPTION("CM-x2xx PCMCIA driver");</div><div class='head'>diff --git a/drivers/pcmcia/pxa2xx_palmld.c b/drivers/pcmcia/pxa2xx_palmld.c<br/>new file mode 100644<br/>index 000000000000..1736c67e547e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pcmcia/pxa2xx_palmld.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pcmcia/pxa2xx_palmld.c</a></div><div class='hunk'>@@ -0,0 +1,151 @@</div><div class='add'>+/*</div><div class='add'>+ * linux/drivers/pcmcia/pxa2xx_palmld.c</div><div class='add'>+ *</div><div class='add'>+ * Driver for Palm LifeDrive PCMCIA</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2006 Alex Osborne &lt;ato@meshy.org&gt;</div><div class='add'>+ * Copyright (C) 2007-2008 Marek Vasut &lt;marek.vasut@gmail.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/gpio.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/mach-types.h&gt;</div><div class='add'>+#include &lt;mach/palmld.h&gt;</div><div class='add'>+#include "soc_common.h"</div><div class='add'>+</div><div class='add'>+static int palmld_pcmcia_hw_init(struct soc_pcmcia_socket *skt)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = gpio_request(GPIO_NR_PALMLD_PCMCIA_POWER, "PCMCIA PWR");</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err1;</div><div class='add'>+	ret = gpio_direction_output(GPIO_NR_PALMLD_PCMCIA_POWER, 0);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err2;</div><div class='add'>+</div><div class='add'>+	ret = gpio_request(GPIO_NR_PALMLD_PCMCIA_RESET, "PCMCIA RST");</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err2;</div><div class='add'>+	ret = gpio_direction_output(GPIO_NR_PALMLD_PCMCIA_RESET, 1);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err3;</div><div class='add'>+</div><div class='add'>+	ret = gpio_request(GPIO_NR_PALMLD_PCMCIA_READY, "PCMCIA RDY");</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err3;</div><div class='add'>+	ret = gpio_direction_input(GPIO_NR_PALMLD_PCMCIA_READY);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err4;</div><div class='add'>+</div><div class='add'>+	skt-&gt;irq = IRQ_GPIO(GPIO_NR_PALMLD_PCMCIA_READY);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err4:</div><div class='add'>+	gpio_free(GPIO_NR_PALMLD_PCMCIA_READY);</div><div class='add'>+err3:</div><div class='add'>+	gpio_free(GPIO_NR_PALMLD_PCMCIA_RESET);</div><div class='add'>+err2:</div><div class='add'>+	gpio_free(GPIO_NR_PALMLD_PCMCIA_POWER);</div><div class='add'>+err1:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void palmld_pcmcia_hw_shutdown(struct soc_pcmcia_socket *skt)</div><div class='add'>+{</div><div class='add'>+	gpio_free(GPIO_NR_PALMLD_PCMCIA_READY);</div><div class='add'>+	gpio_free(GPIO_NR_PALMLD_PCMCIA_RESET);</div><div class='add'>+	gpio_free(GPIO_NR_PALMLD_PCMCIA_POWER);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void palmld_pcmcia_socket_state(struct soc_pcmcia_socket *skt,</div><div class='add'>+					struct pcmcia_state *state)</div><div class='add'>+{</div><div class='add'>+	state-&gt;detect = 1; /* always inserted */</div><div class='add'>+	state-&gt;ready  = !!gpio_get_value(GPIO_NR_PALMLD_PCMCIA_READY);</div><div class='add'>+	state-&gt;bvd1   = 1;</div><div class='add'>+	state-&gt;bvd2   = 1;</div><div class='add'>+	state-&gt;wrprot = 0;</div><div class='add'>+	state-&gt;vs_3v  = 1;</div><div class='add'>+	state-&gt;vs_Xv  = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int palmld_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,</div><div class='add'>+					const socket_state_t *state)</div><div class='add'>+{</div><div class='add'>+	gpio_set_value(GPIO_NR_PALMLD_PCMCIA_POWER, 1);</div><div class='add'>+	gpio_set_value(GPIO_NR_PALMLD_PCMCIA_RESET,</div><div class='add'>+			!!(state-&gt;flags &amp; SS_RESET));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void palmld_pcmcia_socket_init(struct soc_pcmcia_socket *skt)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void palmld_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct pcmcia_low_level palmld_pcmcia_ops = {</div><div class='add'>+	.owner			= THIS_MODULE,</div><div class='add'>+</div><div class='add'>+	.first			= 0,</div><div class='add'>+	.nr			= 2,</div><div class='add'>+</div><div class='add'>+	.hw_init		= palmld_pcmcia_hw_init,</div><div class='add'>+	.hw_shutdown		= palmld_pcmcia_hw_shutdown,</div><div class='add'>+</div><div class='add'>+	.socket_state		= palmld_pcmcia_socket_state,</div><div class='add'>+	.configure_socket	= palmld_pcmcia_configure_socket,</div><div class='add'>+</div><div class='add'>+	.socket_init		= palmld_pcmcia_socket_init,</div><div class='add'>+	.socket_suspend		= palmld_pcmcia_socket_suspend,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device *palmld_pcmcia_device;</div><div class='add'>+</div><div class='add'>+static int __init palmld_pcmcia_init(void)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!machine_is_palmld())</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	palmld_pcmcia_device = platform_device_alloc("pxa2xx-pcmcia", -1);</div><div class='add'>+	if (!palmld_pcmcia_device)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ret = platform_device_add_data(palmld_pcmcia_device, &amp;palmld_pcmcia_ops,</div><div class='add'>+					sizeof(palmld_pcmcia_ops));</div><div class='add'>+</div><div class='add'>+	if (!ret)</div><div class='add'>+		ret = platform_device_add(palmld_pcmcia_device);</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		platform_device_put(palmld_pcmcia_device);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit palmld_pcmcia_exit(void)</div><div class='add'>+{</div><div class='add'>+	platform_device_unregister(palmld_pcmcia_device);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(palmld_pcmcia_init);</div><div class='add'>+module_exit(palmld_pcmcia_exit);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Alex Osborne &lt;ato@meshy.org&gt;,"</div><div class='add'>+	    " Marek Vasut &lt;marek.vasut@gmail.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("PCMCIA support for Palm LifeDrive");</div><div class='add'>+MODULE_ALIAS("platform:pxa2xx-pcmcia");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/pcmcia/pxa2xx_trizeps4.c b/drivers/pcmcia/pxa2xx_trizeps4.c<br/>new file mode 100644<br/>index 000000000000..36c7a0b324d2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pcmcia/pxa2xx_trizeps4.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pcmcia/pxa2xx_trizeps4.c</a></div><div class='hunk'>@@ -0,0 +1,256 @@</div><div class='add'>+/*</div><div class='add'>+ * linux/drivers/pcmcia/pxa2xx_trizeps4.c</div><div class='add'>+ *</div><div class='add'>+ * TRIZEPS PCMCIA specific routines.</div><div class='add'>+ *</div><div class='add'>+ * Author:	Jürgen Schindele</div><div class='add'>+ * Created:	20 02, 2006</div><div class='add'>+ * Copyright:	Jürgen Schindele</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/gpio.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/mach-types.h&gt;</div><div class='add'>+#include &lt;asm/irq.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/pxa-regs.h&gt;</div><div class='add'>+#include &lt;mach/trizeps4.h&gt;</div><div class='add'>+</div><div class='add'>+#include "soc_common.h"</div><div class='add'>+</div><div class='add'>+extern void board_pcmcia_power(int power);</div><div class='add'>+</div><div class='add'>+static struct pcmcia_irqs irqs[] = {</div><div class='add'>+	{ 0, IRQ_GPIO(GPIO_PCD), "cs0_cd" }</div><div class='add'>+	/* on other baseboards we can have more inputs */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int trizeps_pcmcia_hw_init(struct soc_pcmcia_socket *skt)</div><div class='add'>+{</div><div class='add'>+	int ret, i;</div><div class='add'>+	/* we dont have voltage/card/ready detection</div><div class='add'>+	 * so we dont need interrupts for it</div><div class='add'>+	 */</div><div class='add'>+	switch (skt-&gt;nr) {</div><div class='add'>+	case 0:</div><div class='add'>+		if (gpio_request(GPIO_PRDY, "cf_irq") &lt; 0) {</div><div class='add'>+			pr_err("%s: sock %d unable to request gpio %d\n", __func__,</div><div class='add'>+				skt-&gt;nr, GPIO_PRDY);</div><div class='add'>+			return -EBUSY;</div><div class='add'>+		}</div><div class='add'>+		if (gpio_direction_input(GPIO_PRDY) &lt; 0) {</div><div class='add'>+			pr_err("%s: sock %d unable to set input gpio %d\n", __func__,</div><div class='add'>+				skt-&gt;nr, GPIO_PRDY);</div><div class='add'>+			gpio_free(GPIO_PRDY);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		skt-&gt;irq = IRQ_GPIO(GPIO_PRDY);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+#ifndef CONFIG_MACH_TRIZEPS_CONXS</div><div class='add'>+	case 1:</div><div class='add'>+#endif</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	/* release the reset of this card */</div><div class='add'>+	pr_debug("%s: sock %d irq %d\n", __func__, skt-&gt;nr, skt-&gt;irq);</div><div class='add'>+</div><div class='add'>+	/* supplementory irqs for the socket */</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(irqs); i++) {</div><div class='add'>+		if (irqs[i].sock != skt-&gt;nr)</div><div class='add'>+			continue;</div><div class='add'>+		if (gpio_request(IRQ_TO_GPIO(irqs[i].irq), irqs[i].str) &lt; 0) {</div><div class='add'>+			pr_err("%s: sock %d unable to request gpio %d\n",</div><div class='add'>+				__func__, skt-&gt;nr, IRQ_TO_GPIO(irqs[i].irq));</div><div class='add'>+			ret = -EBUSY;</div><div class='add'>+			goto error;</div><div class='add'>+		}</div><div class='add'>+		if (gpio_direction_input(IRQ_TO_GPIO(irqs[i].irq)) &lt; 0) {</div><div class='add'>+			pr_err("%s: sock %d unable to set input gpio %d\n",</div><div class='add'>+				__func__, skt-&gt;nr, IRQ_TO_GPIO(irqs[i].irq));</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto error;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return soc_pcmcia_request_irqs(skt, irqs, ARRAY_SIZE(irqs));</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	for (; i &gt;= 0; i--) {</div><div class='add'>+		gpio_free(IRQ_TO_GPIO(irqs[i].irq));</div><div class='add'>+	}</div><div class='add'>+	return (ret);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void trizeps_pcmcia_hw_shutdown(struct soc_pcmcia_socket *skt)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	/* free allocated gpio's */</div><div class='add'>+	gpio_free(GPIO_PRDY);</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(irqs); i++)</div><div class='add'>+		gpio_free(IRQ_TO_GPIO(irqs[i].irq));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned long trizeps_pcmcia_status[2];</div><div class='add'>+</div><div class='add'>+static void trizeps_pcmcia_socket_state(struct soc_pcmcia_socket *skt,</div><div class='add'>+				struct pcmcia_state *state)</div><div class='add'>+{</div><div class='add'>+	unsigned short status = 0, change;</div><div class='add'>+	status = CFSR_readw();</div><div class='add'>+	change = (status ^ trizeps_pcmcia_status[skt-&gt;nr]) &amp;</div><div class='add'>+				ConXS_CFSR_BVD_MASK;</div><div class='add'>+	if (change) {</div><div class='add'>+		trizeps_pcmcia_status[skt-&gt;nr] = status;</div><div class='add'>+		if (status &amp; ConXS_CFSR_BVD1) {</div><div class='add'>+			/* enable_irq empty */</div><div class='add'>+		} else {</div><div class='add'>+			/* disable_irq empty */</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (skt-&gt;nr) {</div><div class='add'>+	case 0:</div><div class='add'>+		/* just fill in fix states */</div><div class='add'>+		state-&gt;detect = gpio_get_value(GPIO_PCD) ? 0 : 1;</div><div class='add'>+		state-&gt;ready  = gpio_get_value(GPIO_PRDY) ? 1 : 0;</div><div class='add'>+		state-&gt;bvd1   = (status &amp; ConXS_CFSR_BVD1) ? 1 : 0;</div><div class='add'>+		state-&gt;bvd2   = (status &amp; ConXS_CFSR_BVD2) ? 1 : 0;</div><div class='add'>+		state-&gt;vs_3v  = (status &amp; ConXS_CFSR_VS1) ? 0 : 1;</div><div class='add'>+		state-&gt;vs_Xv  = (status &amp; ConXS_CFSR_VS2) ? 0 : 1;</div><div class='add'>+		state-&gt;wrprot = 0;	/* not available */</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+#ifndef CONFIG_MACH_TRIZEPS_CONXS</div><div class='add'>+	/* on ConXS we only have one slot. Second is inactive */</div><div class='add'>+	case 1:</div><div class='add'>+		state-&gt;detect = 0;</div><div class='add'>+		state-&gt;ready  = 0;</div><div class='add'>+		state-&gt;bvd1   = 0;</div><div class='add'>+		state-&gt;bvd2   = 0;</div><div class='add'>+		state-&gt;vs_3v  = 0;</div><div class='add'>+		state-&gt;vs_Xv  = 0;</div><div class='add'>+		state-&gt;wrprot = 0;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int trizeps_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,</div><div class='add'>+				const socket_state_t *state)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+	unsigned short power = 0;</div><div class='add'>+</div><div class='add'>+	/* we do nothing here just check a bit */</div><div class='add'>+	switch (state-&gt;Vcc) {</div><div class='add'>+	case 0:  power &amp;= 0xfc; break;</div><div class='add'>+	case 33: power |= ConXS_BCR_S0_VCC_3V3; break;</div><div class='add'>+	case 50:</div><div class='add'>+		pr_err("%s(): Vcc 5V not supported in socket\n", __func__);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		pr_err("%s(): bad Vcc %u\n", __func__, state-&gt;Vcc);</div><div class='add'>+		ret = -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (state-&gt;Vpp) {</div><div class='add'>+	case 0:  power &amp;= 0xf3; break;</div><div class='add'>+	case 33: power |= ConXS_BCR_S0_VPP_3V3; break;</div><div class='add'>+	case 120:</div><div class='add'>+		pr_err("%s(): Vpp 12V not supported in socket\n", __func__);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		if (state-&gt;Vpp != state-&gt;Vcc) {</div><div class='add'>+			pr_err("%s(): bad Vpp %u\n", __func__, state-&gt;Vpp);</div><div class='add'>+			ret = -1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (skt-&gt;nr) {</div><div class='add'>+	case 0:			 /* we only have 3.3V */</div><div class='add'>+		board_pcmcia_power(power);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+#ifndef CONFIG_MACH_TRIZEPS_CONXS</div><div class='add'>+	/* on ConXS we only have one slot. Second is inactive */</div><div class='add'>+	case 1:</div><div class='add'>+#endif</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void trizeps_pcmcia_socket_init(struct soc_pcmcia_socket *skt)</div><div class='add'>+{</div><div class='add'>+	/* default is on */</div><div class='add'>+	board_pcmcia_power(0x9);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void trizeps_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)</div><div class='add'>+{</div><div class='add'>+	board_pcmcia_power(0x0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct pcmcia_low_level trizeps_pcmcia_ops = {</div><div class='add'>+	.owner			= THIS_MODULE,</div><div class='add'>+	.hw_init		= trizeps_pcmcia_hw_init,</div><div class='add'>+	.hw_shutdown		= trizeps_pcmcia_hw_shutdown,</div><div class='add'>+	.socket_state		= trizeps_pcmcia_socket_state,</div><div class='add'>+	.configure_socket	= trizeps_pcmcia_configure_socket,</div><div class='add'>+	.socket_init		= trizeps_pcmcia_socket_init,</div><div class='add'>+	.socket_suspend		= trizeps_pcmcia_socket_suspend,</div><div class='add'>+#ifdef CONFIG_MACH_TRIZEPS_CONXS</div><div class='add'>+	.nr			= 1,</div><div class='add'>+#else</div><div class='add'>+	.nr			= 2,</div><div class='add'>+#endif</div><div class='add'>+	.first			= 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device *trizeps_pcmcia_device;</div><div class='add'>+</div><div class='add'>+static int __init trizeps_pcmcia_init(void)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	trizeps_pcmcia_device = platform_device_alloc("pxa2xx-pcmcia", -1);</div><div class='add'>+	if (!trizeps_pcmcia_device)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ret = platform_device_add_data(trizeps_pcmcia_device,</div><div class='add'>+			&amp;trizeps_pcmcia_ops, sizeof(trizeps_pcmcia_ops));</div><div class='add'>+</div><div class='add'>+	if (ret == 0)</div><div class='add'>+		ret = platform_device_add(trizeps_pcmcia_device);</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		platform_device_put(trizeps_pcmcia_device);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit trizeps_pcmcia_exit(void)</div><div class='add'>+{</div><div class='add'>+	platform_device_unregister(trizeps_pcmcia_device);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+fs_initcall(trizeps_pcmcia_init);</div><div class='add'>+module_exit(trizeps_pcmcia_exit);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_AUTHOR("Juergen Schindele");</div><div class='add'>+MODULE_ALIAS("platform:pxa2xx-pcmcia");</div><div class='head'>diff --git a/drivers/pcmcia/pxa2xx_viper.c b/drivers/pcmcia/pxa2xx_viper.c<br/>new file mode 100644<br/>index 000000000000..dd10481be7bf<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pcmcia/pxa2xx_viper.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pcmcia/pxa2xx_viper.c</a></div><div class='hunk'>@@ -0,0 +1,179 @@</div><div class='add'>+/*</div><div class='add'>+ * VIPER PCMCIA support</div><div class='add'>+ *   Copyright 2004 Arcom Control Systems</div><div class='add'>+ *</div><div class='add'>+ * Maintained by Marc Zyngier &lt;maz@misterjones.org&gt;</div><div class='add'>+ * 			      &lt;marc.zyngier@altran.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * Based on:</div><div class='add'>+ *   iPAQ h2200 PCMCIA support</div><div class='add'>+ *   Copyright 2004 Koen Kooi &lt;koen@vestingbar.nl&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file is subject to the terms and conditions of the GNU General Public</div><div class='add'>+ * License.  See the file COPYING in the main directory of this archive for</div><div class='add'>+ * more details.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/gpio.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;pcmcia/ss.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/irq.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;mach/pxa-regs.h&gt;</div><div class='add'>+#include &lt;mach/viper.h&gt;</div><div class='add'>+#include &lt;asm/mach-types.h&gt;</div><div class='add'>+</div><div class='add'>+#include "soc_common.h"</div><div class='add'>+#include "pxa2xx_base.h"</div><div class='add'>+</div><div class='add'>+static struct pcmcia_irqs irqs[] = {</div><div class='add'>+	{ 0, gpio_to_irq(VIPER_CF_CD_GPIO),  "PCMCIA_CD" }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int viper_pcmcia_hw_init(struct soc_pcmcia_socket *skt)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	skt-&gt;irq = gpio_to_irq(VIPER_CF_RDY_GPIO);</div><div class='add'>+</div><div class='add'>+	if (gpio_request(VIPER_CF_CD_GPIO, "CF detect"))</div><div class='add'>+		goto err_request_cd;</div><div class='add'>+</div><div class='add'>+	if (gpio_request(VIPER_CF_RDY_GPIO, "CF ready"))</div><div class='add'>+		goto err_request_rdy;</div><div class='add'>+</div><div class='add'>+	if (gpio_request(VIPER_CF_POWER_GPIO, "CF power"))</div><div class='add'>+		goto err_request_pwr;</div><div class='add'>+</div><div class='add'>+	local_irq_save(flags);</div><div class='add'>+</div><div class='add'>+	/* GPIO 82 is the CF power enable line. initially off */</div><div class='add'>+	if (gpio_direction_output(VIPER_CF_POWER_GPIO, 0) ||</div><div class='add'>+	    gpio_direction_input(VIPER_CF_CD_GPIO) ||</div><div class='add'>+	    gpio_direction_input(VIPER_CF_RDY_GPIO)) {</div><div class='add'>+		local_irq_restore(flags);</div><div class='add'>+		goto err_dir;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	local_irq_restore(flags);</div><div class='add'>+</div><div class='add'>+	return soc_pcmcia_request_irqs(skt, irqs, ARRAY_SIZE(irqs));</div><div class='add'>+</div><div class='add'>+err_dir:</div><div class='add'>+	gpio_free(VIPER_CF_POWER_GPIO);</div><div class='add'>+err_request_pwr:</div><div class='add'>+	gpio_free(VIPER_CF_RDY_GPIO);</div><div class='add'>+err_request_rdy:</div><div class='add'>+	gpio_free(VIPER_CF_CD_GPIO);</div><div class='add'>+err_request_cd:</div><div class='add'>+	printk(KERN_ERR "viper: Failed to setup PCMCIA GPIOs\n");</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Release all resources.</div><div class='add'>+ */</div><div class='add'>+static void viper_pcmcia_hw_shutdown(struct soc_pcmcia_socket *skt)</div><div class='add'>+{</div><div class='add'>+	soc_pcmcia_free_irqs(skt, irqs, ARRAY_SIZE(irqs));</div><div class='add'>+	gpio_free(VIPER_CF_POWER_GPIO);</div><div class='add'>+	gpio_free(VIPER_CF_RDY_GPIO);</div><div class='add'>+	gpio_free(VIPER_CF_CD_GPIO);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void viper_pcmcia_socket_state(struct soc_pcmcia_socket *skt,</div><div class='add'>+				      struct pcmcia_state *state)</div><div class='add'>+{</div><div class='add'>+	state-&gt;detect = gpio_get_value(VIPER_CF_CD_GPIO) ? 0 : 1;</div><div class='add'>+	state-&gt;ready  = gpio_get_value(VIPER_CF_RDY_GPIO) ? 1 : 0;</div><div class='add'>+	state-&gt;bvd1   = 1;</div><div class='add'>+	state-&gt;bvd2   = 1;</div><div class='add'>+	state-&gt;wrprot = 0;</div><div class='add'>+	state-&gt;vs_3v  = 1; /* Can only apply 3.3V */</div><div class='add'>+	state-&gt;vs_Xv  = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int viper_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,</div><div class='add'>+					 const socket_state_t *state)</div><div class='add'>+{</div><div class='add'>+	/* Silently ignore Vpp, output enable, speaker enable. */</div><div class='add'>+	viper_cf_rst(state-&gt;flags &amp; SS_RESET);</div><div class='add'>+</div><div class='add'>+	/* Apply socket voltage */</div><div class='add'>+	switch (state-&gt;Vcc) {</div><div class='add'>+	case 0:</div><div class='add'>+		gpio_set_value(VIPER_CF_POWER_GPIO, 0);</div><div class='add'>+		break;</div><div class='add'>+	case 33:</div><div class='add'>+		gpio_set_value(VIPER_CF_POWER_GPIO, 1);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		printk(KERN_ERR "%s: Unsupported Vcc:%d\n",</div><div class='add'>+		       __func__, state-&gt;Vcc);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void viper_pcmcia_socket_init(struct soc_pcmcia_socket *skt)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void viper_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct pcmcia_low_level viper_pcmcia_ops __initdata = {</div><div class='add'>+	.owner          	= THIS_MODULE,</div><div class='add'>+	.hw_init        	= viper_pcmcia_hw_init,</div><div class='add'>+	.hw_shutdown		= viper_pcmcia_hw_shutdown,</div><div class='add'>+	.socket_state		= viper_pcmcia_socket_state,</div><div class='add'>+	.configure_socket	= viper_pcmcia_configure_socket,</div><div class='add'>+	.socket_init		= viper_pcmcia_socket_init,</div><div class='add'>+	.socket_suspend		= viper_pcmcia_socket_suspend,</div><div class='add'>+	.nr         		= 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device *viper_pcmcia_device;</div><div class='add'>+</div><div class='add'>+static int __init viper_pcmcia_init(void)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!machine_is_viper())</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	viper_pcmcia_device = platform_device_alloc("pxa2xx-pcmcia", -1);</div><div class='add'>+	if (!viper_pcmcia_device)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ret = platform_device_add_data(viper_pcmcia_device,</div><div class='add'>+				       &amp;viper_pcmcia_ops,</div><div class='add'>+				       sizeof(viper_pcmcia_ops));</div><div class='add'>+</div><div class='add'>+	if (!ret)</div><div class='add'>+		ret = platform_device_add(viper_pcmcia_device);</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		platform_device_put(viper_pcmcia_device);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit viper_pcmcia_exit(void)</div><div class='add'>+{</div><div class='add'>+	platform_device_unregister(viper_pcmcia_device);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(viper_pcmcia_init);</div><div class='add'>+module_exit(viper_pcmcia_exit);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/pcmcia/rsrc_nonstatic.c b/drivers/pcmcia/rsrc_nonstatic.c<br/>index 203e579ebbd2..17f4ecf1c0c5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pcmcia/rsrc_nonstatic.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/pcmcia/rsrc_nonstatic.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pcmcia/rsrc_nonstatic.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pcmcia/rsrc_nonstatic.c</a></div><div class='hunk'>@@ -122,19 +122,22 @@ static void free_region(struct resource *res)</div><div class='ctx'> </div><div class='ctx'> static int add_interval(struct resource_map *map, u_long base, u_long num)</div><div class='ctx'> {</div><div class='del'>-    struct resource_map *p, *q;</div><div class='add'>+	struct resource_map *p, *q;</div><div class='ctx'> </div><div class='del'>-    for (p = map; ; p = p-&gt;next) {</div><div class='del'>-	if ((p != map) &amp;&amp; (p-&gt;base+p-&gt;num-1 &gt;= base))</div><div class='del'>-	    return -1;</div><div class='del'>-	if ((p-&gt;next == map) || (p-&gt;next-&gt;base &gt; base+num-1))</div><div class='del'>-	    break;</div><div class='del'>-    }</div><div class='del'>-    q = kmalloc(sizeof(struct resource_map), GFP_KERNEL);</div><div class='del'>-    if (!q) return CS_OUT_OF_RESOURCE;</div><div class='del'>-    q-&gt;base = base; q-&gt;num = num;</div><div class='del'>-    q-&gt;next = p-&gt;next; p-&gt;next = q;</div><div class='del'>-    return CS_SUCCESS;</div><div class='add'>+	for (p = map; ; p = p-&gt;next) {</div><div class='add'>+		if ((p != map) &amp;&amp; (p-&gt;base+p-&gt;num-1 &gt;= base))</div><div class='add'>+			return -1;</div><div class='add'>+		if ((p-&gt;next == map) || (p-&gt;next-&gt;base &gt; base+num-1))</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	q = kmalloc(sizeof(struct resource_map), GFP_KERNEL);</div><div class='add'>+	if (!q) {</div><div class='add'>+		printk(KERN_WARNING "out of memory to update resources\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	q-&gt;base = base; q-&gt;num = num;</div><div class='add'>+	q-&gt;next = p-&gt;next; p-&gt;next = q;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*====================================================================*/</div><div class='hunk'>@@ -166,7 +169,10 @@ static int sub_interval(struct resource_map *map, u_long base, u_long num)</div><div class='ctx'> 	    } else {</div><div class='ctx'> 		/* Split the block into two pieces */</div><div class='ctx'> 		p = kmalloc(sizeof(struct resource_map), GFP_KERNEL);</div><div class='del'>-		if (!p) return CS_OUT_OF_RESOURCE;</div><div class='add'>+		if (!p) {</div><div class='add'>+		    printk(KERN_WARNING "out of memory to update resources\n");</div><div class='add'>+		    return -ENOMEM;</div><div class='add'>+		}</div><div class='ctx'> 		p-&gt;base = base+num;</div><div class='ctx'> 		p-&gt;num = q-&gt;base+q-&gt;num - p-&gt;base;</div><div class='ctx'> 		q-&gt;num = base - q-&gt;base;</div><div class='hunk'>@@ -174,7 +180,7 @@ static int sub_interval(struct resource_map *map, u_long base, u_long num)</div><div class='ctx'> 	    }</div><div class='ctx'> 	}</div><div class='ctx'>     }</div><div class='del'>-    return CS_SUCCESS;</div><div class='add'>+    return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*======================================================================</div><div class='hunk'>@@ -194,13 +200,14 @@ static void do_io_probe(struct pcmcia_socket *s, unsigned int base,</div><div class='ctx'>     int any;</div><div class='ctx'>     u_char *b, hole, most;</div><div class='ctx'> </div><div class='del'>-    printk(KERN_INFO "cs: IO port probe %#x-%#x:",</div><div class='del'>-	   base, base+num-1);</div><div class='add'>+    dev_printk(KERN_INFO, &amp;s-&gt;dev, "cs: IO port probe %#x-%#x:",</div><div class='add'>+	       base, base+num-1);</div><div class='ctx'> </div><div class='ctx'>     /* First, what does a floating port look like? */</div><div class='ctx'>     b = kzalloc(256, GFP_KERNEL);</div><div class='ctx'>     if (!b) {</div><div class='del'>-            printk(KERN_ERR "do_io_probe: unable to kmalloc 256 bytes");</div><div class='add'>+	    dev_printk(KERN_ERR, &amp;s-&gt;dev,</div><div class='add'>+		   "do_io_probe: unable to kmalloc 256 bytes");</div><div class='ctx'>             return;</div><div class='ctx'>     }</div><div class='ctx'>     for (i = base, most = 0; i &lt; base+num; i += 8) {</div><div class='hunk'>@@ -366,8 +373,8 @@ static int do_mem_probe(u_long base, u_long num, struct pcmcia_socket *s)</div><div class='ctx'>     struct socket_data *s_data = s-&gt;resource_data;</div><div class='ctx'>     u_long i, j, bad, fail, step;</div><div class='ctx'> </div><div class='del'>-    printk(KERN_INFO "cs: memory probe 0x%06lx-0x%06lx:",</div><div class='del'>-	   base, base+num-1);</div><div class='add'>+    dev_printk(KERN_INFO, &amp;s-&gt;dev, "cs: memory probe 0x%06lx-0x%06lx:",</div><div class='add'>+	       base, base+num-1);</div><div class='ctx'>     bad = fail = 0;</div><div class='ctx'>     step = (num &lt; 0x20000) ? 0x2000 : ((num&gt;&gt;4) &amp; ~0x1fff);</div><div class='ctx'>     /* don't allow too large steps */</div><div class='hunk'>@@ -431,8 +438,8 @@ static int validate_mem(struct pcmcia_socket *s, unsigned int probe_mask)</div><div class='ctx'> 	if (probe_mask &amp; MEM_PROBE_HIGH) {</div><div class='ctx'> 		if (inv_probe(s_data-&gt;mem_db.next, s) &gt; 0)</div><div class='ctx'> 			return 0;</div><div class='del'>-		printk(KERN_NOTICE "cs: warning: no high memory space "</div><div class='del'>-		       "available!\n");</div><div class='add'>+		dev_printk(KERN_NOTICE, &amp;s-&gt;dev,</div><div class='add'>+			   "cs: warning: no high memory space available!\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -794,10 +801,11 @@ static int nonstatic_autoadd_resources(struct pcmcia_socket *s)</div><div class='ctx'> 		if (res-&gt;flags &amp; IORESOURCE_IO) {</div><div class='ctx'> 			if (res == &amp;ioport_resource)</div><div class='ctx'> 				continue;</div><div class='del'>-			printk(KERN_INFO "pcmcia: parent PCI bridge I/O "</div><div class='del'>-				"window: 0x%llx - 0x%llx\n",</div><div class='del'>-				(unsigned long long)res-&gt;start,</div><div class='del'>-				(unsigned long long)res-&gt;end);</div><div class='add'>+			dev_printk(KERN_INFO, &amp;s-&gt;cb_dev-&gt;dev,</div><div class='add'>+				   "pcmcia: parent PCI bridge I/O "</div><div class='add'>+				   "window: 0x%llx - 0x%llx\n",</div><div class='add'>+				   (unsigned long long)res-&gt;start,</div><div class='add'>+				   (unsigned long long)res-&gt;end);</div><div class='ctx'> 			if (!adjust_io(s, ADD_MANAGED_RESOURCE, res-&gt;start, res-&gt;end))</div><div class='ctx'> 				done |= IORESOURCE_IO;</div><div class='ctx'> </div><div class='hunk'>@@ -806,10 +814,11 @@ static int nonstatic_autoadd_resources(struct pcmcia_socket *s)</div><div class='ctx'> 		if (res-&gt;flags &amp; IORESOURCE_MEM) {</div><div class='ctx'> 			if (res == &amp;iomem_resource)</div><div class='ctx'> 				continue;</div><div class='del'>-			printk(KERN_INFO "pcmcia: parent PCI bridge Memory "</div><div class='del'>-				"window: 0x%llx - 0x%llx\n",</div><div class='del'>-				(unsigned long long)res-&gt;start,</div><div class='del'>-				(unsigned long long)res-&gt;end);</div><div class='add'>+			dev_printk(KERN_INFO, &amp;s-&gt;cb_dev-&gt;dev,</div><div class='add'>+				   "pcmcia: parent PCI bridge Memory "</div><div class='add'>+				   "window: 0x%llx - 0x%llx\n",</div><div class='add'>+				   (unsigned long long)res-&gt;start,</div><div class='add'>+				   (unsigned long long)res-&gt;end);</div><div class='ctx'> 			if (!adjust_memory(s, ADD_MANAGED_RESOURCE, res-&gt;start, res-&gt;end))</div><div class='ctx'> 				done |= IORESOURCE_MEM;</div><div class='ctx'> 		}</div><div class='head'>diff --git a/drivers/pcmcia/soc_common.c b/drivers/pcmcia/soc_common.c<br/>index da3972153226..f49ac6666153 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pcmcia/soc_common.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/pcmcia/soc_common.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pcmcia/soc_common.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pcmcia/soc_common.c</a></div><div class='hunk'>@@ -54,7 +54,7 @@</div><div class='ctx'> #include &lt;mach/pxa-regs.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef DEBUG</div><div class='add'>+#ifdef CONFIG_PCMCIA_DEBUG</div><div class='ctx'> </div><div class='ctx'> static int pc_debug;</div><div class='ctx'> module_param(pc_debug, int, 0644);</div><div class='head'>diff --git a/drivers/pcmcia/soc_common.h b/drivers/pcmcia/soc_common.h<br/>index 91ef6a0da3ab..38c67375f363 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pcmcia/soc_common.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/pcmcia/soc_common.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pcmcia/soc_common.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pcmcia/soc_common.h</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'> #include &lt;pcmcia/cs.h&gt;</div><div class='ctx'> #include &lt;pcmcia/ss.h&gt;</div><div class='ctx'> #include &lt;pcmcia/cistpl.h&gt;</div><div class='del'>-#include "cs_internal.h"</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> struct device;</div><div class='hunk'>@@ -137,7 +136,7 @@ extern int soc_common_drv_pcmcia_probe(struct device *dev, struct pcmcia_low_lev</div><div class='ctx'> extern int soc_common_drv_pcmcia_remove(struct device *dev);</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#ifdef DEBUG</div><div class='add'>+#ifdef CONFIG_PCMCIA_DEBUG</div><div class='ctx'> </div><div class='ctx'> extern void soc_pcmcia_debug(struct soc_pcmcia_socket *skt, const char *func,</div><div class='ctx'> 			     int lvl, const char *fmt, ...);</div><div class='head'>diff --git a/drivers/pcmcia/socket_sysfs.c b/drivers/pcmcia/socket_sysfs.c<br/>index 006a29e91d83..ff9a3bb3c88d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pcmcia/socket_sysfs.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/pcmcia/socket_sysfs.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pcmcia/socket_sysfs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pcmcia/socket_sysfs.c</a></div><div class='hunk'>@@ -316,27 +316,18 @@ static ssize_t pccard_store_cis(struct kobject *kobj,</div><div class='ctx'> 				char *buf, loff_t off, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct pcmcia_socket *s = to_socket(container_of(kobj, struct device, kobj));</div><div class='del'>-	cisdump_t *cis;</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='ctx'> 	if (off)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (count &gt;= 0x200)</div><div class='add'>+	if (count &gt;= CISTPL_MAX_CIS_SIZE)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (!(s-&gt;state &amp; SOCKET_PRESENT))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	cis = kzalloc(sizeof(cisdump_t), GFP_KERNEL);</div><div class='del'>-	if (!cis)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	cis-&gt;Length = count + 1;</div><div class='del'>-	memcpy(cis-&gt;Data, buf, count);</div><div class='del'>-</div><div class='del'>-	error = pcmcia_replace_cis(s, cis);</div><div class='del'>-	kfree(cis);</div><div class='add'>+	error = pcmcia_replace_cis(s, buf, count);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/pcmcia/tcic.c b/drivers/pcmcia/tcic.c<br/>index 5792bd5c54f9..2a613e920fd4 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pcmcia/tcic.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/pcmcia/tcic.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pcmcia/tcic.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pcmcia/tcic.c</a></div><div class='hunk'>@@ -55,7 +55,7 @@</div><div class='ctx'> #include &lt;pcmcia/ss.h&gt;</div><div class='ctx'> #include "tcic.h"</div><div class='ctx'> </div><div class='del'>-#ifdef DEBUG</div><div class='add'>+#ifdef CONFIG_PCMCIA_DEBUG</div><div class='ctx'> static int pc_debug;</div><div class='ctx'> </div><div class='ctx'> module_param(pc_debug, int, 0644);</div><div class='head'>diff --git a/drivers/pcmcia/ti113x.h b/drivers/pcmcia/ti113x.h<br/>index 129db7bd06c3..aaa70227bfb0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pcmcia/ti113x.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/pcmcia/ti113x.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pcmcia/ti113x.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pcmcia/ti113x.h</a></div><div class='hunk'>@@ -339,8 +339,8 @@ static void ti12xx_irqroute_func0(struct yenta_socket *socket)</div><div class='ctx'> </div><div class='ctx'> 	mfunc = mfunc_old = config_readl(socket, TI122X_MFUNC);</div><div class='ctx'> 	devctl = config_readb(socket, TI113X_DEVICE_CONTROL);</div><div class='del'>-	printk(KERN_INFO "Yenta TI: socket %s, mfunc 0x%08x, devctl 0x%02x\n",</div><div class='del'>-	       pci_name(socket-&gt;dev), mfunc, devctl);</div><div class='add'>+	dev_printk(KERN_INFO, &amp;socket-&gt;dev-&gt;dev,</div><div class='add'>+		   "TI: mfunc 0x%08x, devctl 0x%02x\n", mfunc, devctl);</div><div class='ctx'> </div><div class='ctx'> 	/* make sure PCI interrupts are enabled before probing */</div><div class='ctx'> 	ti_init(socket);</div><div class='hunk'>@@ -354,8 +354,8 @@ static void ti12xx_irqroute_func0(struct yenta_socket *socket)</div><div class='ctx'> 	 * We're here which means PCI interrupts are _not_ delivered. try to</div><div class='ctx'> 	 * find the right setting (all serial or parallel)</div><div class='ctx'> 	 */</div><div class='del'>-	printk(KERN_INFO "Yenta TI: socket %s probing PCI interrupt failed, trying to fix\n",</div><div class='del'>-	       pci_name(socket-&gt;dev));</div><div class='add'>+	dev_printk(KERN_INFO, &amp;socket-&gt;dev-&gt;dev,</div><div class='add'>+		   "TI: probing PCI interrupt failed, trying to fix\n");</div><div class='ctx'> </div><div class='ctx'> 	/* for serial PCI make sure MFUNC3 is set to IRQSER */</div><div class='ctx'> 	if ((devctl &amp; TI113X_DCR_IMODE_MASK) == TI12XX_DCR_IMODE_ALL_SERIAL) {</div><div class='hunk'>@@ -379,8 +379,8 @@ static void ti12xx_irqroute_func0(struct yenta_socket *socket)</div><div class='ctx'> </div><div class='ctx'> 				pci_irq_status = yenta_probe_cb_irq(socket);</div><div class='ctx'> 				if (pci_irq_status == 1) {</div><div class='del'>-					printk(KERN_INFO "Yenta TI: socket %s all-serial interrupts ok\n",</div><div class='del'>-					       pci_name(socket-&gt;dev));</div><div class='add'>+					dev_printk(KERN_INFO, &amp;socket-&gt;dev-&gt;dev,</div><div class='add'>+					    "TI: all-serial interrupts ok\n");</div><div class='ctx'> 					mfunc_old = mfunc;</div><div class='ctx'> 					goto out;</div><div class='ctx'> 				}</div><div class='hunk'>@@ -395,8 +395,8 @@ static void ti12xx_irqroute_func0(struct yenta_socket *socket)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* serial PCI interrupts not working fall back to parallel */</div><div class='del'>-		printk(KERN_INFO "Yenta TI: socket %s falling back to parallel PCI interrupts\n",</div><div class='del'>-		       pci_name(socket-&gt;dev));</div><div class='add'>+		dev_printk(KERN_INFO, &amp;socket-&gt;dev-&gt;dev,</div><div class='add'>+			   "TI: falling back to parallel PCI interrupts\n");</div><div class='ctx'> 		devctl &amp;= ~TI113X_DCR_IMODE_MASK;</div><div class='ctx'> 		devctl |= TI113X_DCR_IMODE_SERIAL; /* serial ISA could be right */</div><div class='ctx'> 		config_writeb(socket, TI113X_DEVICE_CONTROL, devctl);</div><div class='hunk'>@@ -427,8 +427,8 @@ static void ti12xx_irqroute_func0(struct yenta_socket *socket)</div><div class='ctx'> 	pci_irq_status = yenta_probe_cb_irq(socket);</div><div class='ctx'> 	if (pci_irq_status == 1) {</div><div class='ctx'> 		mfunc_old = mfunc;</div><div class='del'>-		printk(KERN_INFO "Yenta TI: socket %s parallel PCI interrupts ok\n",</div><div class='del'>-		       pci_name(socket-&gt;dev));</div><div class='add'>+		dev_printk(KERN_INFO, &amp;socket-&gt;dev-&gt;dev,</div><div class='add'>+			   "TI: parallel PCI interrupts ok\n");</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* not working, back to old value */</div><div class='ctx'> 		mfunc = mfunc_old;</div><div class='hunk'>@@ -440,8 +440,9 @@ static void ti12xx_irqroute_func0(struct yenta_socket *socket)</div><div class='ctx'> out:</div><div class='ctx'> 	if (pci_irq_status &lt; 1) {</div><div class='ctx'> 		socket-&gt;cb_irq = 0;</div><div class='del'>-		printk(KERN_INFO "Yenta TI: socket %s no PCI interrupts. Fish. Please report.\n",</div><div class='del'>-		       pci_name(socket-&gt;dev));</div><div class='add'>+		dev_printk(KERN_INFO, &amp;socket-&gt;dev-&gt;dev,</div><div class='add'>+			   "Yenta TI: no PCI interrupts. Fish. "</div><div class='add'>+			   "Please report.\n");</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -513,8 +514,9 @@ static void ti12xx_irqroute_func1(struct yenta_socket *socket)</div><div class='ctx'> </div><div class='ctx'> 	mfunc = mfunc_old = config_readl(socket, TI122X_MFUNC);</div><div class='ctx'> 	devctl = config_readb(socket, TI113X_DEVICE_CONTROL);</div><div class='del'>-	printk(KERN_INFO "Yenta TI: socket %s, mfunc 0x%08x, devctl 0x%02x\n",</div><div class='del'>-	       pci_name(socket-&gt;dev), mfunc, devctl);</div><div class='add'>+	dev_printk(KERN_INFO, &amp;socket-&gt;dev-&gt;dev,</div><div class='add'>+		   "TI: mfunc 0x%08x, devctl 0x%02x\n",</div><div class='add'>+		   mfunc, devctl);</div><div class='ctx'> </div><div class='ctx'> 	/* if IRQs are configured as tied, align irq of func1 with func0 */</div><div class='ctx'> 	sysctl = config_readl(socket, TI113X_SYSTEM_CONTROL);</div><div class='hunk'>@@ -533,9 +535,8 @@ static void ti12xx_irqroute_func1(struct yenta_socket *socket)</div><div class='ctx'> 	 * We're here which means PCI interrupts are _not_ delivered. try to</div><div class='ctx'> 	 * find the right setting</div><div class='ctx'> 	 */</div><div class='del'>-	printk(KERN_INFO "Yenta TI: socket %s probing PCI interrupt failed, trying to fix\n",</div><div class='del'>-	       pci_name(socket-&gt;dev));</div><div class='del'>-</div><div class='add'>+	dev_printk(KERN_INFO, &amp;socket-&gt;dev-&gt;dev,</div><div class='add'>+		   "TI: probing PCI interrupt failed, trying to fix\n");</div><div class='ctx'> </div><div class='ctx'> 	/* if all serial: set INTRTIE, probe again */</div><div class='ctx'> 	if ((devctl &amp; TI113X_DCR_IMODE_MASK) == TI12XX_DCR_IMODE_ALL_SERIAL) {</div><div class='hunk'>@@ -544,8 +545,8 @@ static void ti12xx_irqroute_func1(struct yenta_socket *socket)</div><div class='ctx'> 		if (ti12xx_tie_interrupts(socket, &amp;old_irq)) {</div><div class='ctx'> 			pci_irq_status = yenta_probe_cb_irq(socket);</div><div class='ctx'> 			if (pci_irq_status == 1) {</div><div class='del'>-				printk(KERN_INFO "Yenta TI: socket %s all-serial interrupts, tied ok\n",</div><div class='del'>-				       pci_name(socket-&gt;dev));</div><div class='add'>+				dev_printk(KERN_INFO, &amp;socket-&gt;dev-&gt;dev,</div><div class='add'>+					"TI: all-serial interrupts, tied ok\n");</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='hunk'>@@ -582,8 +583,8 @@ static void ti12xx_irqroute_func1(struct yenta_socket *socket)</div><div class='ctx'> </div><div class='ctx'> 			pci_irq_status = yenta_probe_cb_irq(socket);</div><div class='ctx'> 			if (pci_irq_status == 1) {</div><div class='del'>-				printk(KERN_INFO "Yenta TI: socket %s parallel PCI interrupts ok\n",</div><div class='del'>-				       pci_name(socket-&gt;dev));</div><div class='add'>+				dev_printk(KERN_INFO, &amp;socket-&gt;dev-&gt;dev,</div><div class='add'>+					   "TI: parallel PCI interrupts ok\n");</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='hunk'>@@ -593,13 +594,13 @@ static void ti12xx_irqroute_func1(struct yenta_socket *socket)</div><div class='ctx'> 			if (pci_irq_status == -1)</div><div class='ctx'> 				goto out;</div><div class='ctx'> 		}</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 		/* still nothing: set INTRTIE */</div><div class='ctx'> 		if (ti12xx_tie_interrupts(socket, &amp;old_irq)) {</div><div class='ctx'> 			pci_irq_status = yenta_probe_cb_irq(socket);</div><div class='ctx'> 			if (pci_irq_status == 1) {</div><div class='del'>-				printk(KERN_INFO "Yenta TI: socket %s parallel PCI interrupts, tied ok\n",</div><div class='del'>-				       pci_name(socket-&gt;dev));</div><div class='add'>+				dev_printk(KERN_INFO, &amp;socket-&gt;dev-&gt;dev,</div><div class='add'>+				    "TI: parallel PCI interrupts, tied ok\n");</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='hunk'>@@ -610,8 +611,8 @@ static void ti12xx_irqroute_func1(struct yenta_socket *socket)</div><div class='ctx'> out:</div><div class='ctx'> 	if (pci_irq_status &lt; 1) {</div><div class='ctx'> 		socket-&gt;cb_irq = 0;</div><div class='del'>-		printk(KERN_INFO "Yenta TI: socket %s no PCI interrupts. Fish. Please report.\n",</div><div class='del'>-		       pci_name(socket-&gt;dev));</div><div class='add'>+		dev_printk(KERN_INFO, &amp;socket-&gt;dev-&gt;dev,</div><div class='add'>+			   "TI: no PCI interrupts. Fish. Please report.\n");</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -815,11 +816,13 @@ static int ti12xx_override(struct yenta_socket *socket)</div><div class='ctx'> 	/* make sure that memory burst is active */</div><div class='ctx'> 	val_orig = val = config_readl(socket, TI113X_SYSTEM_CONTROL);</div><div class='ctx'> 	if (disable_clkrun &amp;&amp; PCI_FUNC(socket-&gt;dev-&gt;devfn) == 0) {</div><div class='del'>-		printk(KERN_INFO "Yenta: Disabling CLKRUN feature\n");</div><div class='add'>+		dev_printk(KERN_INFO, &amp;socket-&gt;dev-&gt;dev,</div><div class='add'>+			   "Disabling CLKRUN feature\n");</div><div class='ctx'> 		val |= TI113X_SCR_KEEPCLK;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!(val &amp; TI122X_SCR_MRBURSTUP)) {</div><div class='del'>-		printk(KERN_INFO "Yenta: Enabling burst memory read transactions\n");</div><div class='add'>+		dev_printk(KERN_INFO, &amp;socket-&gt;dev-&gt;dev,</div><div class='add'>+			   "Enabling burst memory read transactions\n");</div><div class='ctx'> 		val |= TI122X_SCR_MRBURSTUP;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (val_orig != val)</div><div class='hunk'>@@ -830,10 +833,12 @@ static int ti12xx_override(struct yenta_socket *socket)</div><div class='ctx'> 	 * CSC interrupts to PCI rather than INTVAL.</div><div class='ctx'> 	 */</div><div class='ctx'> 	val = config_readb(socket, TI1250_DIAGNOSTIC);</div><div class='del'>-	printk(KERN_INFO "Yenta: Using %s to route CSC interrupts to PCI\n",</div><div class='del'>-		(val &amp; TI1250_DIAG_PCI_CSC) ? "CSCINT" : "INTVAL");</div><div class='del'>-	printk(KERN_INFO "Yenta: Routing CardBus interrupts to %s\n",</div><div class='del'>-		(val &amp; TI1250_DIAG_PCI_IREQ) ? "PCI" : "ISA");</div><div class='add'>+	dev_printk(KERN_INFO, &amp;socket-&gt;dev-&gt;dev,</div><div class='add'>+		   "Using %s to route CSC interrupts to PCI\n",</div><div class='add'>+		   (val &amp; TI1250_DIAG_PCI_CSC) ? "CSCINT" : "INTVAL");</div><div class='add'>+	dev_printk(KERN_INFO, &amp;socket-&gt;dev-&gt;dev,</div><div class='add'>+		   "Routing CardBus interrupts to %s\n",</div><div class='add'>+		   (val &amp; TI1250_DIAG_PCI_IREQ) ? "PCI" : "ISA");</div><div class='ctx'> </div><div class='ctx'> 	/* do irqrouting, depending on function */</div><div class='ctx'> 	if (PCI_FUNC(socket-&gt;dev-&gt;devfn) == 0)</div><div class='hunk'>@@ -858,8 +863,9 @@ static int ti1250_override(struct yenta_socket *socket)</div><div class='ctx'> 		diag |= TI1250_DIAG_PCI_CSC | TI1250_DIAG_PCI_IREQ;</div><div class='ctx'> </div><div class='ctx'> 	if (diag != old) {</div><div class='del'>-		printk(KERN_INFO "Yenta: adjusting diagnostic: %02x -&gt; %02x\n",</div><div class='del'>-			old, diag);</div><div class='add'>+		dev_printk(KERN_INFO, &amp;socket-&gt;dev-&gt;dev,</div><div class='add'>+			   "adjusting diagnostic: %02x -&gt; %02x\n",</div><div class='add'>+			   old, diag);</div><div class='ctx'> 		config_writeb(socket, TI1250_DIAGNOSTIC, diag);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -924,7 +930,9 @@ static void ene_tune_bridge(struct pcmcia_socket *sock, struct pci_bus *bus)</div><div class='ctx'> 		/* default to clear TLTEnable bit, old behaviour */</div><div class='ctx'> 		test_c9 &amp;= ~ENE_TEST_C9_TLTENABLE;</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "yenta EnE: chaning testregister 0xC9, %02x -&gt; %02x\n", old_c9, test_c9);</div><div class='add'>+	dev_printk(KERN_INFO, &amp;socket-&gt;dev-&gt;dev,</div><div class='add'>+		   "EnE: chaning testregister 0xC9, %02x -&gt; %02x\n",</div><div class='add'>+		   old_c9, test_c9);</div><div class='ctx'> 	config_writeb(socket, ENE_TEST_C9, test_c9);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/pcmcia/yenta_socket.c b/drivers/pcmcia/yenta_socket.c<br/>index 0ab1fb65cdc3..3ecd7c99d8eb 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pcmcia/yenta_socket.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/pcmcia/yenta_socket.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pcmcia/yenta_socket.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pcmcia/yenta_socket.c</a></div><div class='hunk'>@@ -38,11 +38,7 @@ static int pwr_irqs_off;</div><div class='ctx'> module_param(pwr_irqs_off, bool, 0644);</div><div class='ctx'> MODULE_PARM_DESC(pwr_irqs_off, "Force IRQs off during power-on of slot. Use only when seeing IRQ storms!");</div><div class='ctx'> </div><div class='del'>-#if 0</div><div class='del'>-#define debug(x,args...) printk(KERN_DEBUG "%s: " x, __func__ , ##args)</div><div class='del'>-#else</div><div class='del'>-#define debug(x,args...)</div><div class='del'>-#endif</div><div class='add'>+#define debug(x, s, args...) dev_dbg(&amp;s-&gt;dev-&gt;dev, x, ##args)</div><div class='ctx'> </div><div class='ctx'> /* Don't ask.. */</div><div class='ctx'> #define to_cycles(ns)	((ns)/120)</div><div class='hunk'>@@ -69,13 +65,13 @@ MODULE_PARM_DESC (override_bios, "yenta ignore bios resource allocation");</div><div class='ctx'> static inline u32 cb_readl(struct yenta_socket *socket, unsigned reg)</div><div class='ctx'> {</div><div class='ctx'> 	u32 val = readl(socket-&gt;base + reg);</div><div class='del'>-	debug("%p %04x %08x\n", socket, reg, val);</div><div class='add'>+	debug("%04x %08x\n", socket, reg, val);</div><div class='ctx'> 	return val;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void cb_writel(struct yenta_socket *socket, unsigned reg, u32 val)</div><div class='ctx'> {</div><div class='del'>-	debug("%p %04x %08x\n", socket, reg, val);</div><div class='add'>+	debug("%04x %08x\n", socket, reg, val);</div><div class='ctx'> 	writel(val, socket-&gt;base + reg);</div><div class='ctx'> 	readl(socket-&gt;base + reg); /* avoid problems with PCI write posting */</div><div class='ctx'> }</div><div class='hunk'>@@ -84,7 +80,7 @@ static inline u8 config_readb(struct yenta_socket *socket, unsigned offset)</div><div class='ctx'> {</div><div class='ctx'> 	u8 val;</div><div class='ctx'> 	pci_read_config_byte(socket-&gt;dev, offset, &amp;val);</div><div class='del'>-	debug("%p %04x %02x\n", socket, offset, val);</div><div class='add'>+	debug("%04x %02x\n", socket, offset, val);</div><div class='ctx'> 	return val;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -92,7 +88,7 @@ static inline u16 config_readw(struct yenta_socket *socket, unsigned offset)</div><div class='ctx'> {</div><div class='ctx'> 	u16 val;</div><div class='ctx'> 	pci_read_config_word(socket-&gt;dev, offset, &amp;val);</div><div class='del'>-	debug("%p %04x %04x\n", socket, offset, val);</div><div class='add'>+	debug("%04x %04x\n", socket, offset, val);</div><div class='ctx'> 	return val;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -100,32 +96,32 @@ static inline u32 config_readl(struct yenta_socket *socket, unsigned offset)</div><div class='ctx'> {</div><div class='ctx'> 	u32 val;</div><div class='ctx'> 	pci_read_config_dword(socket-&gt;dev, offset, &amp;val);</div><div class='del'>-	debug("%p %04x %08x\n", socket, offset, val);</div><div class='add'>+	debug("%04x %08x\n", socket, offset, val);</div><div class='ctx'> 	return val;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void config_writeb(struct yenta_socket *socket, unsigned offset, u8 val)</div><div class='ctx'> {</div><div class='del'>-	debug("%p %04x %02x\n", socket, offset, val);</div><div class='add'>+	debug("%04x %02x\n", socket, offset, val);</div><div class='ctx'> 	pci_write_config_byte(socket-&gt;dev, offset, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void config_writew(struct yenta_socket *socket, unsigned offset, u16 val)</div><div class='ctx'> {</div><div class='del'>-	debug("%p %04x %04x\n", socket, offset, val);</div><div class='add'>+	debug("%04x %04x\n", socket, offset, val);</div><div class='ctx'> 	pci_write_config_word(socket-&gt;dev, offset, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void config_writel(struct yenta_socket *socket, unsigned offset, u32 val)</div><div class='ctx'> {</div><div class='del'>-	debug("%p %04x %08x\n", socket, offset, val);</div><div class='add'>+	debug("%04x %08x\n", socket, offset, val);</div><div class='ctx'> 	pci_write_config_dword(socket-&gt;dev, offset, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline u8 exca_readb(struct yenta_socket *socket, unsigned reg)</div><div class='ctx'> {</div><div class='ctx'> 	u8 val = readb(socket-&gt;base + 0x800 + reg);</div><div class='del'>-	debug("%p %04x %02x\n", socket, reg, val);</div><div class='add'>+	debug("%04x %02x\n", socket, reg, val);</div><div class='ctx'> 	return val;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -134,20 +130,20 @@ static inline u8 exca_readw(struct yenta_socket *socket, unsigned reg)</div><div class='ctx'> 	u16 val;</div><div class='ctx'> 	val = readb(socket-&gt;base + 0x800 + reg);</div><div class='ctx'> 	val |= readb(socket-&gt;base + 0x800 + reg + 1) &lt;&lt; 8;</div><div class='del'>-	debug("%p %04x %04x\n", socket, reg, val);</div><div class='add'>+	debug("%04x %04x\n", socket, reg, val);</div><div class='ctx'> 	return val;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void exca_writeb(struct yenta_socket *socket, unsigned reg, u8 val)</div><div class='ctx'> {</div><div class='del'>-	debug("%p %04x %02x\n", socket, reg, val);</div><div class='add'>+	debug("%04x %02x\n", socket, reg, val);</div><div class='ctx'> 	writeb(val, socket-&gt;base + 0x800 + reg);</div><div class='ctx'> 	readb(socket-&gt;base + 0x800 + reg); /* PCI write posting... */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void exca_writew(struct yenta_socket *socket, unsigned reg, u16 val)</div><div class='ctx'> {</div><div class='del'>-	debug("%p %04x %04x\n", socket, reg, val);</div><div class='add'>+	debug("%04x %04x\n", socket, reg, val);</div><div class='ctx'> 	writeb(val, socket-&gt;base + 0x800 + reg);</div><div class='ctx'> 	writeb(val &gt;&gt; 8, socket-&gt;base + 0x800 + reg + 1);</div><div class='ctx'> </div><div class='hunk'>@@ -207,7 +203,7 @@ static int yenta_get_status(struct pcmcia_socket *sock, unsigned int *value)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 	if (state &amp; CB_CBCARD) {</div><div class='del'>-		val |= SS_CARDBUS;	</div><div class='add'>+		val |= SS_CARDBUS;</div><div class='ctx'> 		val |= (state &amp; CB_CARDSTS) ? SS_STSCHG : 0;</div><div class='ctx'> 		val |= (state &amp; (CB_CDETECT1 | CB_CDETECT2)) ? 0 : SS_DETECT;</div><div class='ctx'> 		val |= (state &amp; CB_PWRCYCLE) ? SS_POWERON | SS_READY : 0;</div><div class='hunk'>@@ -650,8 +646,10 @@ static int yenta_allocate_res(struct yenta_socket *socket, int nr, unsigned type</div><div class='ctx'> 		root = pci_find_parent_resource(socket-&gt;dev, res);</div><div class='ctx'> 		if (root &amp;&amp; (request_resource(root, res) == 0))</div><div class='ctx'> 			return 0;</div><div class='del'>-		printk(KERN_INFO "yenta %s: Preassigned resource %d busy or not available, reconfiguring...\n",</div><div class='del'>-				pci_name(socket-&gt;dev), nr);</div><div class='add'>+		dev_printk(KERN_INFO, &amp;socket-&gt;dev-&gt;dev,</div><div class='add'>+			   "Preassigned resource %d busy or not available, "</div><div class='add'>+			   "reconfiguring...\n",</div><div class='add'>+			   nr);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (type &amp; IORESOURCE_IO) {</div><div class='hunk'>@@ -674,8 +672,9 @@ static int yenta_allocate_res(struct yenta_socket *socket, int nr, unsigned type</div><div class='ctx'> 			return 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "yenta %s: no resource of type %x available, trying to continue...\n",</div><div class='del'>-	       pci_name(socket-&gt;dev), type);</div><div class='add'>+	dev_printk(KERN_INFO, &amp;socket-&gt;dev-&gt;dev,</div><div class='add'>+		   "no resource of type %x available, trying to continue...\n",</div><div class='add'>+		   type);</div><div class='ctx'> 	res-&gt;start = res-&gt;end = res-&gt;flags = 0;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -923,7 +922,8 @@ static int yenta_probe_cb_irq(struct yenta_socket *socket)</div><div class='ctx'> 	socket-&gt;probe_status = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (request_irq(socket-&gt;cb_irq, yenta_probe_handler, IRQF_SHARED, "yenta", socket)) {</div><div class='del'>-		printk(KERN_WARNING "Yenta: request_irq() in yenta_probe_cb_irq() failed!\n");</div><div class='add'>+		dev_printk(KERN_WARNING, &amp;socket-&gt;dev-&gt;dev,</div><div class='add'>+			   "request_irq() in yenta_probe_cb_irq() failed!\n");</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -960,8 +960,9 @@ static void yenta_get_socket_capabilities(struct yenta_socket *socket, u32 isa_i</div><div class='ctx'> 	else</div><div class='ctx'> 		socket-&gt;socket.irq_mask = 0;</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "Yenta: ISA IRQ mask 0x%04x, PCI irq %d\n",</div><div class='del'>-	       socket-&gt;socket.irq_mask, socket-&gt;cb_irq);</div><div class='add'>+	dev_printk(KERN_INFO, &amp;socket-&gt;dev-&gt;dev,</div><div class='add'>+		   "ISA IRQ mask 0x%04x, PCI irq %d\n",</div><div class='add'>+		   socket-&gt;socket.irq_mask, socket-&gt;cb_irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1051,8 +1052,9 @@ static void yenta_fixup_parent_bridge(struct pci_bus *cardbus_bridge)</div><div class='ctx'> </div><div class='ctx'> 	/* Show that the wanted subordinate number is not possible: */</div><div class='ctx'> 	if (cardbus_bridge-&gt;subordinate &gt; upper_limit)</div><div class='del'>-		printk(KERN_WARNING "Yenta: Upper limit for fixing this "</div><div class='del'>-			"bridge's parent bridge: #%02x\n", upper_limit);</div><div class='add'>+		dev_printk(KERN_WARNING, &amp;cardbus_bridge-&gt;dev,</div><div class='add'>+			   "Upper limit for fixing this "</div><div class='add'>+			   "bridge's parent bridge: #%02x\n", upper_limit);</div><div class='ctx'> </div><div class='ctx'> 	/* If we have room to increase the bridge's subordinate number, */</div><div class='ctx'> 	if (bridge_to_fix-&gt;subordinate &lt; upper_limit) {</div><div class='hunk'>@@ -1061,10 +1063,11 @@ static void yenta_fixup_parent_bridge(struct pci_bus *cardbus_bridge)</div><div class='ctx'> 		unsigned char subordinate_to_assign =</div><div class='ctx'> 			min(cardbus_bridge-&gt;subordinate, upper_limit);</div><div class='ctx'> </div><div class='del'>-		printk(KERN_INFO "Yenta: Raising subordinate bus# of parent "</div><div class='del'>-			"bus (#%02x) from #%02x to #%02x\n",</div><div class='del'>-			bridge_to_fix-&gt;number,</div><div class='del'>-			bridge_to_fix-&gt;subordinate, subordinate_to_assign);</div><div class='add'>+		dev_printk(KERN_INFO, &amp;bridge_to_fix-&gt;dev,</div><div class='add'>+			   "Raising subordinate bus# of parent "</div><div class='add'>+			   "bus (#%02x) from #%02x to #%02x\n",</div><div class='add'>+			   bridge_to_fix-&gt;number,</div><div class='add'>+			   bridge_to_fix-&gt;subordinate, subordinate_to_assign);</div><div class='ctx'> </div><div class='ctx'> 		/* Save the new subordinate in the bus struct of the bridge */</div><div class='ctx'> 		bridge_to_fix-&gt;subordinate = subordinate_to_assign;</div><div class='hunk'>@@ -1091,8 +1094,8 @@ static int __devinit yenta_probe (struct pci_dev *dev, const struct pci_device_i</div><div class='ctx'> 	 * Bail out if so.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!dev-&gt;subordinate) {</div><div class='del'>-		printk(KERN_ERR "Yenta: no bus associated with %s! "</div><div class='del'>-			"(try 'pci=assign-busses')\n", pci_name(dev));</div><div class='add'>+		dev_printk(KERN_ERR, &amp;dev-&gt;dev, "no bus associated! "</div><div class='add'>+			   "(try 'pci=assign-busses')\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1127,7 +1130,7 @@ static int __devinit yenta_probe (struct pci_dev *dev, const struct pci_device_i</div><div class='ctx'> 		goto disable;</div><div class='ctx'> </div><div class='ctx'> 	if (!pci_resource_start(dev, 0)) {</div><div class='del'>-		printk(KERN_ERR "No cardbus resource!\n");</div><div class='add'>+		dev_printk(KERN_ERR, &amp;dev-&gt;dev, "No cardbus resource!\n");</div><div class='ctx'> 		ret = -ENODEV;</div><div class='ctx'> 		goto release;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1146,8 +1149,8 @@ static int __devinit yenta_probe (struct pci_dev *dev, const struct pci_device_i</div><div class='ctx'> 	 * report the subsystem vendor and device for help debugging</div><div class='ctx'> 	 * the irq stuff...</div><div class='ctx'> 	 */</div><div class='del'>-	printk(KERN_INFO "Yenta: CardBus bridge found at %s [%04x:%04x]\n",</div><div class='del'>-		pci_name(dev), dev-&gt;subsystem_vendor, dev-&gt;subsystem_device);</div><div class='add'>+	dev_printk(KERN_INFO, &amp;dev-&gt;dev, "CardBus bridge found [%04x:%04x]\n",</div><div class='add'>+		   dev-&gt;subsystem_vendor, dev-&gt;subsystem_device);</div><div class='ctx'> </div><div class='ctx'> 	yenta_config_init(socket);</div><div class='ctx'> </div><div class='hunk'>@@ -1179,8 +1182,12 @@ static int __devinit yenta_probe (struct pci_dev *dev, const struct pci_device_i</div><div class='ctx'> 		socket-&gt;poll_timer.data = (unsigned long)socket;</div><div class='ctx'> 		socket-&gt;poll_timer.expires = jiffies + HZ;</div><div class='ctx'> 		add_timer(&amp;socket-&gt;poll_timer);</div><div class='del'>-		printk(KERN_INFO "Yenta: no PCI IRQ, CardBus support disabled for this socket.\n"</div><div class='del'>-		       KERN_INFO "Yenta: check your BIOS CardBus, BIOS IRQ or ACPI settings.\n");</div><div class='add'>+		dev_printk(KERN_INFO, &amp;dev-&gt;dev,</div><div class='add'>+			   "no PCI IRQ, CardBus support disabled for this "</div><div class='add'>+			   "socket.\n");</div><div class='add'>+		dev_printk(KERN_INFO, &amp;dev-&gt;dev,</div><div class='add'>+			   "check your BIOS CardBus, BIOS IRQ or ACPI "</div><div class='add'>+			   "settings.\n");</div><div class='ctx'> 	} else {</div><div class='ctx'> 		socket-&gt;socket.features |= SS_CAP_CARDBUS;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1188,7 +1195,8 @@ static int __devinit yenta_probe (struct pci_dev *dev, const struct pci_device_i</div><div class='ctx'> 	/* Figure out what the dang thing can do for the PCMCIA layer... */</div><div class='ctx'> 	yenta_interrogate(socket);</div><div class='ctx'> 	yenta_get_socket_capabilities(socket, isa_interrupts);</div><div class='del'>-	printk(KERN_INFO "Socket status: %08x\n", cb_readl(socket, CB_SOCKET_STATE));</div><div class='add'>+	dev_printk(KERN_INFO, &amp;dev-&gt;dev,</div><div class='add'>+		   "Socket status: %08x\n", cb_readl(socket, CB_SOCKET_STATE));</div><div class='ctx'> </div><div class='ctx'> 	yenta_fixup_parent_bridge(dev-&gt;subordinate);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/pnp/Makefile b/drivers/pnp/Makefile<br/>index 26f5abc9c3f7..e83f34f1b5ba 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pnp/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/pnp/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pnp/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pnp/Makefile</a></div><div class='hunk'>@@ -2,12 +2,15 @@</div><div class='ctx'> # Makefile for the Linux Plug-and-Play Support.</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-obj-y		:= core.o card.o driver.o resource.o manager.o support.o interface.o quirks.o system.o</div><div class='add'>+obj-y		:= core.o card.o driver.o resource.o manager.o support.o interface.o quirks.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_PNPACPI)		+= pnpacpi/</div><div class='ctx'> obj-$(CONFIG_PNPBIOS)		+= pnpbios/</div><div class='ctx'> obj-$(CONFIG_ISAPNP)		+= isapnp/</div><div class='ctx'> </div><div class='add'>+# pnp_system_init goes after pnpacpi/pnpbios init</div><div class='add'>+obj-y				+= system.o</div><div class='add'>+</div><div class='ctx'> ifeq ($(CONFIG_PNP_DEBUG),y)</div><div class='ctx'> EXTRA_CFLAGS += -DDEBUG</div><div class='ctx'> endif</div><div class='head'>diff --git a/drivers/pnp/base.h b/drivers/pnp/base.h<br/>index 9fd7bb9b7dce..3b8b9d3cb03d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pnp/base.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/pnp/base.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pnp/base.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pnp/base.h</a></div><div class='hunk'>@@ -4,6 +4,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> extern spinlock_t pnp_lock;</div><div class='add'>+extern struct device_attribute pnp_interface_attrs[];</div><div class='ctx'> void *pnp_alloc(long size);</div><div class='ctx'> </div><div class='ctx'> int pnp_register_protocol(struct pnp_protocol *protocol);</div><div class='hunk'>@@ -16,7 +17,6 @@ struct pnp_card *pnp_alloc_card(struct pnp_protocol *, int id, char *pnpid);</div><div class='ctx'> </div><div class='ctx'> int pnp_add_device(struct pnp_dev *dev);</div><div class='ctx'> struct pnp_id *pnp_add_id(struct pnp_dev *dev, char *id);</div><div class='del'>-int pnp_interface_attach_device(struct pnp_dev *dev);</div><div class='ctx'> </div><div class='ctx'> int pnp_add_card(struct pnp_card *card);</div><div class='ctx'> void pnp_remove_card(struct pnp_card *card);</div><div class='hunk'>@@ -147,7 +147,7 @@ char *pnp_resource_type_name(struct resource *res);</div><div class='ctx'> void dbg_pnp_show_resources(struct pnp_dev *dev, char *desc);</div><div class='ctx'> </div><div class='ctx'> void pnp_free_resources(struct pnp_dev *dev);</div><div class='del'>-int pnp_resource_type(struct resource *res);</div><div class='add'>+unsigned long pnp_resource_type(struct resource *res);</div><div class='ctx'> </div><div class='ctx'> struct pnp_resource {</div><div class='ctx'> 	struct list_head list;</div><div class='head'>diff --git a/drivers/pnp/core.c b/drivers/pnp/core.c<br/>index a411582bcd72..817fe626e15b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pnp/core.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/pnp/core.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pnp/core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pnp/core.c</a></div><div class='hunk'>@@ -159,21 +159,13 @@ struct pnp_dev *pnp_alloc_dev(struct pnp_protocol *protocol, int id, char *pnpid</div><div class='ctx'> </div><div class='ctx'> int __pnp_add_device(struct pnp_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='ctx'> 	pnp_fixup_device(dev);</div><div class='ctx'> 	dev-&gt;status = PNP_READY;</div><div class='ctx'> 	spin_lock(&amp;pnp_lock);</div><div class='ctx'> 	list_add_tail(&amp;dev-&gt;global_list, &amp;pnp_global);</div><div class='ctx'> 	list_add_tail(&amp;dev-&gt;protocol_list, &amp;dev-&gt;protocol-&gt;devices);</div><div class='ctx'> 	spin_unlock(&amp;pnp_lock);</div><div class='del'>-</div><div class='del'>-	ret = device_register(&amp;dev-&gt;dev);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	pnp_interface_attach_device(dev);</div><div class='del'>-	return 0;</div><div class='add'>+	return device_register(&amp;dev-&gt;dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -218,7 +210,6 @@ void __pnp_remove_device(struct pnp_dev *dev)</div><div class='ctx'> </div><div class='ctx'> static int __init pnp_init(void)</div><div class='ctx'> {</div><div class='del'>-	printk(KERN_INFO "Linux Plug and Play Support v0.97 (c) Adam Belay\n");</div><div class='ctx'> 	return bus_register(&amp;pnp_bus_type);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/pnp/driver.c b/drivers/pnp/driver.c<br/>index d3f869ee1d92..e3f7e89c4dfb 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pnp/driver.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/pnp/driver.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pnp/driver.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pnp/driver.c</a></div><div class='hunk'>@@ -206,6 +206,7 @@ struct bus_type pnp_bus_type = {</div><div class='ctx'> 	.remove  = pnp_device_remove,</div><div class='ctx'> 	.suspend = pnp_bus_suspend,</div><div class='ctx'> 	.resume  = pnp_bus_resume,</div><div class='add'>+	.dev_attrs = pnp_interface_attrs,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int pnp_register_driver(struct pnp_driver *drv)</div><div class='head'>diff --git a/drivers/pnp/interface.c b/drivers/pnp/interface.c<br/>index a876ecf7028c..478a4a739c00 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pnp/interface.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/pnp/interface.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pnp/interface.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pnp/interface.c</a></div><div class='hunk'>@@ -243,8 +243,6 @@ static ssize_t pnp_show_options(struct device *dmdev,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static DEVICE_ATTR(options, S_IRUGO, pnp_show_options, NULL);</div><div class='del'>-</div><div class='ctx'> static ssize_t pnp_show_current_resources(struct device *dmdev,</div><div class='ctx'> 					  struct device_attribute *attr,</div><div class='ctx'> 					  char *buf)</div><div class='hunk'>@@ -420,9 +418,6 @@ done:</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static DEVICE_ATTR(resources, S_IRUGO | S_IWUSR,</div><div class='del'>-		   pnp_show_current_resources, pnp_set_current_resources);</div><div class='del'>-</div><div class='ctx'> static ssize_t pnp_show_current_ids(struct device *dmdev,</div><div class='ctx'> 				    struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='hunk'>@@ -437,27 +432,11 @@ static ssize_t pnp_show_current_ids(struct device *dmdev,</div><div class='ctx'> 	return (str - buf);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static DEVICE_ATTR(id, S_IRUGO, pnp_show_current_ids, NULL);</div><div class='del'>-</div><div class='del'>-int pnp_interface_attach_device(struct pnp_dev *dev)</div><div class='del'>-{</div><div class='del'>-	int rc = device_create_file(&amp;dev-&gt;dev, &amp;dev_attr_options);</div><div class='del'>-</div><div class='del'>-	if (rc)</div><div class='del'>-		goto err;</div><div class='del'>-	rc = device_create_file(&amp;dev-&gt;dev, &amp;dev_attr_resources);</div><div class='del'>-	if (rc)</div><div class='del'>-		goto err_opt;</div><div class='del'>-	rc = device_create_file(&amp;dev-&gt;dev, &amp;dev_attr_id);</div><div class='del'>-	if (rc)</div><div class='del'>-		goto err_res;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-err_res:</div><div class='del'>-	device_remove_file(&amp;dev-&gt;dev, &amp;dev_attr_resources);</div><div class='del'>-err_opt:</div><div class='del'>-	device_remove_file(&amp;dev-&gt;dev, &amp;dev_attr_options);</div><div class='del'>-err:</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='add'>+struct device_attribute pnp_interface_attrs[] = {</div><div class='add'>+	__ATTR(resources, S_IRUGO | S_IWUSR,</div><div class='add'>+		   pnp_show_current_resources,</div><div class='add'>+		   pnp_set_current_resources),</div><div class='add'>+	__ATTR(options, S_IRUGO, pnp_show_options, NULL),</div><div class='add'>+	__ATTR(id, S_IRUGO, pnp_show_current_ids, NULL),</div><div class='add'>+	__ATTR_NULL,</div><div class='add'>+};</div><div class='head'>diff --git a/drivers/pnp/isapnp/core.c b/drivers/pnp/isapnp/core.c<br/>index 101a835e8759..46455fbab6d5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pnp/isapnp/core.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/pnp/isapnp/core.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pnp/isapnp/core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pnp/isapnp/core.c</a></div><div class='hunk'>@@ -1012,7 +1012,7 @@ static int __init isapnp_init(void)</div><div class='ctx'> 		printk(KERN_INFO "isapnp: ISA Plug &amp; Play support disabled\n");</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='del'>-#ifdef CONFIG_PPC_MERGE</div><div class='add'>+#ifdef CONFIG_PPC</div><div class='ctx'> 	if (check_legacy_ioport(_PIDXR) || check_legacy_ioport(_PNPWRP))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/pnp/pnpacpi/core.c b/drivers/pnp/pnpacpi/core.c<br/>index c1b9ea34977b..53561d72b4ee 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pnp/pnpacpi/core.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/pnp/pnpacpi/core.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pnp/pnpacpi/core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pnp/pnpacpi/core.c</a></div><div class='hunk'>@@ -268,7 +268,7 @@ static int __init pnpacpi_init(void)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-subsys_initcall(pnpacpi_init);</div><div class='add'>+fs_initcall(pnpacpi_init);</div><div class='ctx'> </div><div class='ctx'> static int __init pnpacpi_setup(char *str)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/pnp/pnpbios/core.c b/drivers/pnp/pnpbios/core.c<br/>index 19a4be1a9a31..2bfe13369df5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pnp/pnpbios/core.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/pnp/pnpbios/core.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pnp/pnpbios/core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pnp/pnpbios/core.c</a></div><div class='hunk'>@@ -519,7 +519,7 @@ static int __init pnpbios_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_PPC_MERGE)</div><div class='add'>+#if defined(CONFIG_PPC)</div><div class='ctx'> 	if (check_legacy_ioport(PNPBIOS_BASE))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -571,13 +571,13 @@ static int __init pnpbios_init(void)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-subsys_initcall(pnpbios_init);</div><div class='add'>+fs_initcall(pnpbios_init);</div><div class='ctx'> </div><div class='ctx'> static int __init pnpbios_thread_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct task_struct *task;</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_PPC_MERGE)</div><div class='add'>+#if defined(CONFIG_PPC)</div><div class='ctx'> 	if (check_legacy_ioport(PNPBIOS_BASE))</div><div class='ctx'> 		return 0;</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/pnp/quirks.c b/drivers/pnp/quirks.c<br/>index 0bdf9b8a5e58..c144bd575611 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pnp/quirks.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/pnp/quirks.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pnp/quirks.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pnp/quirks.c</a></div><div class='hunk'>@@ -245,7 +245,7 @@ static void quirk_system_pci_resources(struct pnp_dev *dev)</div><div class='ctx'> 	 */</div><div class='ctx'> 	for_each_pci_dev(pdev) {</div><div class='ctx'> 		for (i = 0; i &lt; DEVICE_COUNT_RESOURCE; i++) {</div><div class='del'>-			unsigned int type;</div><div class='add'>+			unsigned long type;</div><div class='ctx'> </div><div class='ctx'> 			type = pci_resource_flags(pdev, i) &amp;</div><div class='ctx'> 					(IORESOURCE_IO | IORESOURCE_MEM);</div><div class='hunk'>@@ -338,8 +338,7 @@ void pnp_fixup_device(struct pnp_dev *dev)</div><div class='ctx'> 		if (!compare_pnp_id(dev-&gt;id, f-&gt;id))</div><div class='ctx'> 			continue;</div><div class='ctx'> #ifdef DEBUG</div><div class='del'>-		dev_dbg(&amp;dev-&gt;dev, "%s: calling ", f-&gt;id);</div><div class='del'>-		print_fn_descriptor_symbol("%s\n", f-&gt;quirk_function);</div><div class='add'>+		dev_dbg(&amp;dev-&gt;dev, "%s: calling %pF\n", f-&gt;id, f-&gt;quirk_function);</div><div class='ctx'> #endif</div><div class='ctx'> 		f-&gt;quirk_function(dev);</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c<br/>index 4cfe3a1efdfb..dbae23acdd5b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pnp/resource.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/pnp/resource.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/pnp/resource.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/pnp/resource.c</a></div><div class='hunk'>@@ -467,14 +467,14 @@ int pnp_check_dma(struct pnp_dev *dev, struct resource *res)</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int pnp_resource_type(struct resource *res)</div><div class='add'>+unsigned long pnp_resource_type(struct resource *res)</div><div class='ctx'> {</div><div class='ctx'> 	return res-&gt;flags &amp; (IORESOURCE_IO  | IORESOURCE_MEM |</div><div class='ctx'> 			     IORESOURCE_IRQ | IORESOURCE_DMA);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct resource *pnp_get_resource(struct pnp_dev *dev,</div><div class='del'>-				  unsigned int type, unsigned int num)</div><div class='add'>+				  unsigned long type, unsigned int num)</div><div class='ctx'> {</div><div class='ctx'> 	struct pnp_resource *pnp_res;</div><div class='ctx'> 	struct resource *res;</div><div class='head'>diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig<br/>index 9ce55850271a..63bb57910445 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/power/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/power/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/power/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/power/Kconfig</a></div><div class='hunk'>@@ -56,10 +56,10 @@ config BATTERY_TOSA</div><div class='ctx'> 	  Say Y to enable support for the battery on the Sharp Zaurus</div><div class='ctx'> 	  SL-6000 (tosa) models.</div><div class='ctx'> </div><div class='del'>-config BATTERY_PALMTX</div><div class='del'>-	tristate "Palm T|X battery"</div><div class='del'>-	depends on MACH_PALMTX</div><div class='add'>+config BATTERY_WM97XX</div><div class='add'>+	bool "WM97xx generic battery driver"</div><div class='add'>+	depends on TOUCHSCREEN_WM97XX=y</div><div class='ctx'> 	help</div><div class='del'>-	  Say Y to enable support for the battery in Palm T|X.</div><div class='add'>+	  Say Y to enable support for battery measured by WM97xx aux port.</div><div class='ctx'> </div><div class='ctx'> endif # POWER_SUPPLY</div><div class='head'>diff --git a/drivers/power/Makefile b/drivers/power/Makefile<br/>index 4706bf8ff459..4e20026cc45a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/power/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/power/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/power/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/power/Makefile</a></div><div class='hunk'>@@ -21,4 +21,4 @@ obj-$(CONFIG_BATTERY_DS2760)	+= ds2760_battery.o</div><div class='ctx'> obj-$(CONFIG_BATTERY_PMU)	+= pmu_battery.o</div><div class='ctx'> obj-$(CONFIG_BATTERY_OLPC)	+= olpc_battery.o</div><div class='ctx'> obj-$(CONFIG_BATTERY_TOSA)	+= tosa_battery.o</div><div class='del'>-obj-$(CONFIG_BATTERY_PALMTX)	+= palmtx_battery.o</div><div class='add'>+obj-$(CONFIG_BATTERY_WM97XX)	+= wm97xx_battery.o
\ No newline at end of file</div><div class='head'>diff --git a/drivers/power/olpc_battery.c b/drivers/power/olpc_battery.c<br/>index 32570af3c5c9..5fbca2681baa 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/power/olpc_battery.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/power/olpc_battery.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/power/olpc_battery.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/power/olpc_battery.c</a></div><div class='hunk'>@@ -205,9 +205,9 @@ static int olpc_bat_get_property(struct power_supply *psy,</div><div class='ctx'> 				 union power_supply_propval *val)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='del'>-	int16_t ec_word;</div><div class='add'>+	__be16 ec_word;</div><div class='ctx'> 	uint8_t ec_byte;</div><div class='del'>-	uint64_t ser_buf;</div><div class='add'>+	__be64 ser_buf;</div><div class='ctx'> </div><div class='ctx'> 	ret = olpc_ec_cmd(EC_BAT_STATUS, NULL, 0, &amp;ec_byte, 1);</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -257,16 +257,14 @@ static int olpc_bat_get_property(struct power_supply *psy,</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='ctx'> </div><div class='del'>-		ec_word = be16_to_cpu(ec_word);</div><div class='del'>-		val-&gt;intval = ec_word * 9760L / 32;</div><div class='add'>+		val-&gt;intval = (int)be16_to_cpu(ec_word) * 9760L / 32;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case POWER_SUPPLY_PROP_CURRENT_AVG:</div><div class='ctx'> 		ret = olpc_ec_cmd(EC_BAT_CURRENT, NULL, 0, (void *)&amp;ec_word, 2);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='ctx'> </div><div class='del'>-		ec_word = be16_to_cpu(ec_word);</div><div class='del'>-		val-&gt;intval = ec_word * 15625L / 120;</div><div class='add'>+		val-&gt;intval = (int)be16_to_cpu(ec_word) * 15625L / 120;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case POWER_SUPPLY_PROP_CAPACITY:</div><div class='ctx'> 		ret = olpc_ec_cmd(EC_BAT_SOC, NULL, 0, &amp;ec_byte, 1);</div><div class='hunk'>@@ -278,24 +276,22 @@ static int olpc_bat_get_property(struct power_supply *psy,</div><div class='ctx'> 		ret = olpc_ec_cmd(EC_BAT_TEMP, NULL, 0, (void *)&amp;ec_word, 2);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='del'>-		ec_word = be16_to_cpu(ec_word);</div><div class='del'>-		val-&gt;intval = ec_word * 100 / 256;</div><div class='add'>+</div><div class='add'>+		val-&gt;intval = (int)be16_to_cpu(ec_word) * 100 / 256;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case POWER_SUPPLY_PROP_TEMP_AMBIENT:</div><div class='ctx'> 		ret = olpc_ec_cmd(EC_AMB_TEMP, NULL, 0, (void *)&amp;ec_word, 2);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='ctx'> </div><div class='del'>-		ec_word = be16_to_cpu(ec_word);</div><div class='del'>-		val-&gt;intval = ec_word * 100 / 256;</div><div class='add'>+		val-&gt;intval = (int)be16_to_cpu(ec_word) * 100 / 256;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case POWER_SUPPLY_PROP_CHARGE_COUNTER:</div><div class='ctx'> 		ret = olpc_ec_cmd(EC_BAT_ACR, NULL, 0, (void *)&amp;ec_word, 2);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='ctx'> </div><div class='del'>-		ec_word = be16_to_cpu(ec_word);</div><div class='del'>-		val-&gt;intval = ec_word * 6250 / 15;</div><div class='add'>+		val-&gt;intval = (int)be16_to_cpu(ec_word) * 6250 / 15;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case POWER_SUPPLY_PROP_SERIAL_NUMBER:</div><div class='ctx'> 		ret = olpc_ec_cmd(EC_BAT_SERIAL, NULL, 0, (void *)&amp;ser_buf, 8);</div><div class='head'>diff --git a/drivers/power/palmtx_battery.c b/drivers/power/palmtx_battery.c<br/>deleted file mode 100644<br/>index 7035bfa41c62..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/power/palmtx_battery.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/power/palmtx_battery.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,198 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * linux/drivers/power/palmtx_battery.c</div><div class='del'>- *</div><div class='del'>- * Battery measurement code for Palm T|X Handheld computer</div><div class='del'>- *</div><div class='del'>- * based on tosa_battery.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2008 Marek Vasut &lt;marek.vasut@gmail.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/power_supply.h&gt;</div><div class='del'>-#include &lt;linux/wm97xx.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/gpio.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/mach-types.h&gt;</div><div class='del'>-#include &lt;mach/palmtx.h&gt;</div><div class='del'>-</div><div class='del'>-static DEFINE_MUTEX(bat_lock);</div><div class='del'>-static struct work_struct bat_work;</div><div class='del'>-struct mutex work_lock;</div><div class='del'>-int bat_status = POWER_SUPPLY_STATUS_DISCHARGING;</div><div class='del'>-</div><div class='del'>-static unsigned long palmtx_read_bat(struct power_supply *bat_ps)</div><div class='del'>-{</div><div class='del'>-	return wm97xx_read_aux_adc(bat_ps-&gt;dev-&gt;parent-&gt;driver_data,</div><div class='del'>-				    WM97XX_AUX_ID3) * 1000 / 414;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned long palmtx_read_temp(struct power_supply *bat_ps)</div><div class='del'>-{</div><div class='del'>-	return wm97xx_read_aux_adc(bat_ps-&gt;dev-&gt;parent-&gt;driver_data,</div><div class='del'>-				    WM97XX_AUX_ID2);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int palmtx_bat_get_property(struct power_supply *bat_ps,</div><div class='del'>-			    enum power_supply_property psp,</div><div class='del'>-			    union power_supply_propval *val)</div><div class='del'>-{</div><div class='del'>-	switch (psp) {</div><div class='del'>-	case POWER_SUPPLY_PROP_STATUS:</div><div class='del'>-		val-&gt;intval = bat_status;</div><div class='del'>-		break;</div><div class='del'>-	case POWER_SUPPLY_PROP_TECHNOLOGY:</div><div class='del'>-		val-&gt;intval = POWER_SUPPLY_TECHNOLOGY_LIPO;</div><div class='del'>-		break;</div><div class='del'>-	case POWER_SUPPLY_PROP_VOLTAGE_NOW:</div><div class='del'>-		val-&gt;intval = palmtx_read_bat(bat_ps);</div><div class='del'>-		break;</div><div class='del'>-	case POWER_SUPPLY_PROP_VOLTAGE_MAX:</div><div class='del'>-	case POWER_SUPPLY_PROP_VOLTAGE_MAX_DESIGN:</div><div class='del'>-		val-&gt;intval = PALMTX_BAT_MAX_VOLTAGE;</div><div class='del'>-		break;</div><div class='del'>-	case POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN:</div><div class='del'>-		val-&gt;intval = PALMTX_BAT_MIN_VOLTAGE;</div><div class='del'>-		break;</div><div class='del'>-	case POWER_SUPPLY_PROP_TEMP:</div><div class='del'>-		val-&gt;intval = palmtx_read_temp(bat_ps);</div><div class='del'>-		break;</div><div class='del'>-	case POWER_SUPPLY_PROP_PRESENT:</div><div class='del'>-		val-&gt;intval = 1;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void palmtx_bat_external_power_changed(struct power_supply *bat_ps)</div><div class='del'>-{</div><div class='del'>-	schedule_work(&amp;bat_work);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *status_text[] = {</div><div class='del'>-	[POWER_SUPPLY_STATUS_UNKNOWN] =		"Unknown",</div><div class='del'>-	[POWER_SUPPLY_STATUS_CHARGING] =	"Charging",</div><div class='del'>-	[POWER_SUPPLY_STATUS_DISCHARGING] =	"Discharging",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void palmtx_bat_update(struct power_supply *bat_ps)</div><div class='del'>-{</div><div class='del'>-	int old_status = bat_status;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;work_lock);</div><div class='del'>-</div><div class='del'>-	bat_status = gpio_get_value(GPIO_NR_PALMTX_POWER_DETECT) ?</div><div class='del'>-				    POWER_SUPPLY_STATUS_CHARGING :</div><div class='del'>-				    POWER_SUPPLY_STATUS_DISCHARGING;</div><div class='del'>-</div><div class='del'>-	if (old_status != bat_status) {</div><div class='del'>-		pr_debug("%s %s -&gt; %s\n", bat_ps-&gt;name,</div><div class='del'>-				status_text[old_status],</div><div class='del'>-				status_text[bat_status]);</div><div class='del'>-		power_supply_changed(bat_ps);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;work_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static enum power_supply_property palmtx_bat_main_props[] = {</div><div class='del'>-	POWER_SUPPLY_PROP_STATUS,</div><div class='del'>-	POWER_SUPPLY_PROP_TECHNOLOGY,</div><div class='del'>-	POWER_SUPPLY_PROP_VOLTAGE_NOW,</div><div class='del'>-	POWER_SUPPLY_PROP_VOLTAGE_MAX,</div><div class='del'>-	POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN,</div><div class='del'>-	POWER_SUPPLY_PROP_TEMP,</div><div class='del'>-	POWER_SUPPLY_PROP_PRESENT,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct power_supply bat_ps = {</div><div class='del'>-	.name			= "main-battery",</div><div class='del'>-	.type			= POWER_SUPPLY_TYPE_BATTERY,</div><div class='del'>-	.properties		= palmtx_bat_main_props,</div><div class='del'>-	.num_properties		= ARRAY_SIZE(palmtx_bat_main_props),</div><div class='del'>-	.get_property		= palmtx_bat_get_property,</div><div class='del'>-	.external_power_changed = palmtx_bat_external_power_changed,</div><div class='del'>-	.use_for_apm		= 1,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void palmtx_bat_work(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	palmtx_bat_update(&amp;bat_ps);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-static int palmtx_bat_suspend(struct platform_device *dev, pm_message_t state)</div><div class='del'>-{</div><div class='del'>-	flush_scheduled_work();</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int palmtx_bat_resume(struct platform_device *dev)</div><div class='del'>-{</div><div class='del'>-	schedule_work(&amp;bat_work);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-#define palmtx_bat_suspend NULL</div><div class='del'>-#define palmtx_bat_resume NULL</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static int __devinit palmtx_bat_probe(struct platform_device *dev)</div><div class='del'>-{</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (!machine_is_palmtx())</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	mutex_init(&amp;work_lock);</div><div class='del'>-</div><div class='del'>-	INIT_WORK(&amp;bat_work, palmtx_bat_work);</div><div class='del'>-</div><div class='del'>-	ret = power_supply_register(&amp;dev-&gt;dev, &amp;bat_ps);</div><div class='del'>-	if (!ret)</div><div class='del'>-		schedule_work(&amp;bat_work);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __devexit palmtx_bat_remove(struct platform_device *dev)</div><div class='del'>-{</div><div class='del'>-	power_supply_unregister(&amp;bat_ps);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct platform_driver palmtx_bat_driver = {</div><div class='del'>-	.driver.name	= "wm97xx-battery",</div><div class='del'>-	.driver.owner	= THIS_MODULE,</div><div class='del'>-	.probe		= palmtx_bat_probe,</div><div class='del'>-	.remove		= __devexit_p(palmtx_bat_remove),</div><div class='del'>-	.suspend	= palmtx_bat_suspend,</div><div class='del'>-	.resume		= palmtx_bat_resume,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init palmtx_bat_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;palmtx_bat_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit palmtx_bat_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;palmtx_bat_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(palmtx_bat_init);</div><div class='del'>-module_exit(palmtx_bat_exit);</div><div class='del'>-</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_AUTHOR("Marek Vasut &lt;marek.vasut@gmail.com&gt;");</div><div class='del'>-MODULE_DESCRIPTION("Palm T|X battery driver");</div><div class='head'>diff --git a/drivers/power/power_supply_core.c b/drivers/power/power_supply_core.c<br/>index cb1ccb472921..3007695f90c8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/power/power_supply_core.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/power/power_supply_core.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/power/power_supply_core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/power/power_supply_core.c</a></div><div class='hunk'>@@ -91,8 +91,8 @@ int power_supply_register(struct device *parent, struct power_supply *psy)</div><div class='ctx'> {</div><div class='ctx'> 	int rc = 0;</div><div class='ctx'> </div><div class='del'>-	psy-&gt;dev = device_create_drvdata(power_supply_class, parent, 0,</div><div class='del'>-					 psy, "%s", psy-&gt;name);</div><div class='add'>+	psy-&gt;dev = device_create(power_supply_class, parent, 0, psy,</div><div class='add'>+				 "%s", psy-&gt;name);</div><div class='ctx'> 	if (IS_ERR(psy-&gt;dev)) {</div><div class='ctx'> 		rc = PTR_ERR(psy-&gt;dev);</div><div class='ctx'> 		goto dev_create_failed;</div><div class='head'>diff --git a/drivers/power/wm97xx_battery.c b/drivers/power/wm97xx_battery.c<br/>new file mode 100644<br/>index 000000000000..8bde92126d34<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/power/wm97xx_battery.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/power/wm97xx_battery.c</a></div><div class='hunk'>@@ -0,0 +1,272 @@</div><div class='add'>+/*</div><div class='add'>+ * linux/drivers/power/wm97xx_battery.c</div><div class='add'>+ *</div><div class='add'>+ * Battery measurement code for WM97xx</div><div class='add'>+ *</div><div class='add'>+ * based on tosa_battery.c</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2008 Marek Vasut &lt;marek.vasut@gmail.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/power_supply.h&gt;</div><div class='add'>+#include &lt;linux/wm97xx.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/gpio.h&gt;</div><div class='add'>+#include &lt;linux/wm97xx_batt.h&gt;</div><div class='add'>+</div><div class='add'>+static DEFINE_MUTEX(bat_lock);</div><div class='add'>+static struct work_struct bat_work;</div><div class='add'>+struct mutex work_lock;</div><div class='add'>+static int bat_status = POWER_SUPPLY_STATUS_UNKNOWN;</div><div class='add'>+static struct wm97xx_batt_info *pdata;</div><div class='add'>+static enum power_supply_property *prop;</div><div class='add'>+</div><div class='add'>+static unsigned long wm97xx_read_bat(struct power_supply *bat_ps)</div><div class='add'>+{</div><div class='add'>+	return wm97xx_read_aux_adc(bat_ps-&gt;dev-&gt;parent-&gt;driver_data,</div><div class='add'>+					pdata-&gt;batt_aux) * pdata-&gt;batt_mult /</div><div class='add'>+					pdata-&gt;batt_div;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned long wm97xx_read_temp(struct power_supply *bat_ps)</div><div class='add'>+{</div><div class='add'>+	return wm97xx_read_aux_adc(bat_ps-&gt;dev-&gt;parent-&gt;driver_data,</div><div class='add'>+					pdata-&gt;temp_aux) * pdata-&gt;temp_mult /</div><div class='add'>+					pdata-&gt;temp_div;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wm97xx_bat_get_property(struct power_supply *bat_ps,</div><div class='add'>+			    enum power_supply_property psp,</div><div class='add'>+			    union power_supply_propval *val)</div><div class='add'>+{</div><div class='add'>+	switch (psp) {</div><div class='add'>+	case POWER_SUPPLY_PROP_STATUS:</div><div class='add'>+		val-&gt;intval = bat_status;</div><div class='add'>+		break;</div><div class='add'>+	case POWER_SUPPLY_PROP_TECHNOLOGY:</div><div class='add'>+		val-&gt;intval = pdata-&gt;batt_tech;</div><div class='add'>+		break;</div><div class='add'>+	case POWER_SUPPLY_PROP_VOLTAGE_NOW:</div><div class='add'>+		if (pdata-&gt;batt_aux &gt;= 0)</div><div class='add'>+			val-&gt;intval = wm97xx_read_bat(bat_ps);</div><div class='add'>+		else</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		break;</div><div class='add'>+	case POWER_SUPPLY_PROP_TEMP:</div><div class='add'>+		if (pdata-&gt;temp_aux &gt;= 0)</div><div class='add'>+			val-&gt;intval = wm97xx_read_temp(bat_ps);</div><div class='add'>+		else</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		break;</div><div class='add'>+	case POWER_SUPPLY_PROP_VOLTAGE_MAX:</div><div class='add'>+		if (pdata-&gt;max_voltage &gt;= 0)</div><div class='add'>+			val-&gt;intval = pdata-&gt;max_voltage;</div><div class='add'>+		else</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		break;</div><div class='add'>+	case POWER_SUPPLY_PROP_VOLTAGE_MIN:</div><div class='add'>+		if (pdata-&gt;min_voltage &gt;= 0)</div><div class='add'>+			val-&gt;intval = pdata-&gt;min_voltage;</div><div class='add'>+		else</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		break;</div><div class='add'>+	case POWER_SUPPLY_PROP_PRESENT:</div><div class='add'>+		val-&gt;intval = 1;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void wm97xx_bat_external_power_changed(struct power_supply *bat_ps)</div><div class='add'>+{</div><div class='add'>+	schedule_work(&amp;bat_work);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void wm97xx_bat_update(struct power_supply *bat_ps)</div><div class='add'>+{</div><div class='add'>+	int old_status = bat_status;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;work_lock);</div><div class='add'>+</div><div class='add'>+	bat_status = (pdata-&gt;charge_gpio &gt;= 0) ?</div><div class='add'>+			(gpio_get_value(pdata-&gt;charge_gpio) ?</div><div class='add'>+			POWER_SUPPLY_STATUS_DISCHARGING :</div><div class='add'>+			POWER_SUPPLY_STATUS_CHARGING) :</div><div class='add'>+			POWER_SUPPLY_STATUS_UNKNOWN;</div><div class='add'>+</div><div class='add'>+	if (old_status != bat_status) {</div><div class='add'>+		pr_debug("%s: %i -&gt; %i\n", bat_ps-&gt;name, old_status,</div><div class='add'>+					bat_status);</div><div class='add'>+		power_supply_changed(bat_ps);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;work_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct power_supply bat_ps = {</div><div class='add'>+	.type			= POWER_SUPPLY_TYPE_BATTERY,</div><div class='add'>+	.get_property		= wm97xx_bat_get_property,</div><div class='add'>+	.external_power_changed = wm97xx_bat_external_power_changed,</div><div class='add'>+	.use_for_apm		= 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void wm97xx_bat_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	wm97xx_bat_update(&amp;bat_ps);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+static int wm97xx_bat_suspend(struct platform_device *dev, pm_message_t state)</div><div class='add'>+{</div><div class='add'>+	flush_scheduled_work();</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wm97xx_bat_resume(struct platform_device *dev)</div><div class='add'>+{</div><div class='add'>+	schedule_work(&amp;bat_work);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+#define wm97xx_bat_suspend NULL</div><div class='add'>+#define wm97xx_bat_resume NULL</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static int __devinit wm97xx_bat_probe(struct platform_device *dev)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+	int props = 1;	/* POWER_SUPPLY_PROP_PRESENT */</div><div class='add'>+	int i = 0;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;id != -1)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mutex_init(&amp;work_lock);</div><div class='add'>+</div><div class='add'>+	if (!pdata) {</div><div class='add'>+		dev_err(&amp;dev-&gt;dev, "Please use wm97xx_bat_set_pdata\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pdata-&gt;charge_gpio &gt;= 0 &amp;&amp; gpio_is_valid(pdata-&gt;charge_gpio)) {</div><div class='add'>+		ret = gpio_request(pdata-&gt;charge_gpio, "BATT CHRG");</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err;</div><div class='add'>+		ret = gpio_direction_input(pdata-&gt;charge_gpio);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err2;</div><div class='add'>+		props++;	/* POWER_SUPPLY_PROP_STATUS */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pdata-&gt;batt_tech &gt;= 0)</div><div class='add'>+		props++;	/* POWER_SUPPLY_PROP_TECHNOLOGY */</div><div class='add'>+	if (pdata-&gt;temp_aux &gt;= 0)</div><div class='add'>+		props++;	/* POWER_SUPPLY_PROP_TEMP */</div><div class='add'>+	if (pdata-&gt;batt_aux &gt;= 0)</div><div class='add'>+		props++;	/* POWER_SUPPLY_PROP_VOLTAGE_NOW */</div><div class='add'>+	if (pdata-&gt;max_voltage &gt;= 0)</div><div class='add'>+		props++;	/* POWER_SUPPLY_PROP_VOLTAGE_MAX */</div><div class='add'>+	if (pdata-&gt;min_voltage &gt;= 0)</div><div class='add'>+		props++;	/* POWER_SUPPLY_PROP_VOLTAGE_MIN */</div><div class='add'>+</div><div class='add'>+	prop = kzalloc(props * sizeof(*prop), GFP_KERNEL);</div><div class='add'>+	if (!prop)</div><div class='add'>+		goto err2;</div><div class='add'>+</div><div class='add'>+	prop[i++] = POWER_SUPPLY_PROP_PRESENT;</div><div class='add'>+	if (pdata-&gt;charge_gpio &gt;= 0)</div><div class='add'>+		prop[i++] = POWER_SUPPLY_PROP_STATUS;</div><div class='add'>+	if (pdata-&gt;batt_tech &gt;= 0)</div><div class='add'>+		prop[i++] = POWER_SUPPLY_PROP_TECHNOLOGY;</div><div class='add'>+	if (pdata-&gt;temp_aux &gt;= 0)</div><div class='add'>+		prop[i++] = POWER_SUPPLY_PROP_TEMP;</div><div class='add'>+	if (pdata-&gt;batt_aux &gt;= 0)</div><div class='add'>+		prop[i++] = POWER_SUPPLY_PROP_VOLTAGE_NOW;</div><div class='add'>+	if (pdata-&gt;max_voltage &gt;= 0)</div><div class='add'>+		prop[i++] = POWER_SUPPLY_PROP_VOLTAGE_MAX;</div><div class='add'>+	if (pdata-&gt;min_voltage &gt;= 0)</div><div class='add'>+		prop[i++] = POWER_SUPPLY_PROP_VOLTAGE_MIN;</div><div class='add'>+</div><div class='add'>+	INIT_WORK(&amp;bat_work, wm97xx_bat_work);</div><div class='add'>+</div><div class='add'>+	if (!pdata-&gt;batt_name) {</div><div class='add'>+		dev_info(&amp;dev-&gt;dev, "Please consider setting proper battery "</div><div class='add'>+				"name in platform definition file, falling "</div><div class='add'>+				"back to name \"wm97xx-batt\"\n");</div><div class='add'>+		bat_ps.name = "wm97xx-batt";</div><div class='add'>+	} else</div><div class='add'>+		bat_ps.name = pdata-&gt;batt_name;</div><div class='add'>+</div><div class='add'>+	bat_ps.properties = prop;</div><div class='add'>+	bat_ps.num_properties = props;</div><div class='add'>+</div><div class='add'>+	ret = power_supply_register(&amp;dev-&gt;dev, &amp;bat_ps);</div><div class='add'>+	if (!ret)</div><div class='add'>+		schedule_work(&amp;bat_work);</div><div class='add'>+	else</div><div class='add'>+		goto err3;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+err3:</div><div class='add'>+	kfree(prop);</div><div class='add'>+err2:</div><div class='add'>+	gpio_free(pdata-&gt;charge_gpio);</div><div class='add'>+err:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devexit wm97xx_bat_remove(struct platform_device *dev)</div><div class='add'>+{</div><div class='add'>+	if (pdata &amp;&amp; pdata-&gt;charge_gpio &amp;&amp; pdata-&gt;charge_gpio &gt;= 0)</div><div class='add'>+		gpio_free(pdata-&gt;charge_gpio);</div><div class='add'>+	flush_scheduled_work();</div><div class='add'>+	power_supply_unregister(&amp;bat_ps);</div><div class='add'>+	kfree(prop);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct platform_driver wm97xx_bat_driver = {</div><div class='add'>+	.driver	= {</div><div class='add'>+		.name	= "wm97xx-battery",</div><div class='add'>+		.owner	= THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+	.probe		= wm97xx_bat_probe,</div><div class='add'>+	.remove		= __devexit_p(wm97xx_bat_remove),</div><div class='add'>+	.suspend	= wm97xx_bat_suspend,</div><div class='add'>+	.resume		= wm97xx_bat_resume,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init wm97xx_bat_init(void)</div><div class='add'>+{</div><div class='add'>+	return platform_driver_register(&amp;wm97xx_bat_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit wm97xx_bat_exit(void)</div><div class='add'>+{</div><div class='add'>+	platform_driver_unregister(&amp;wm97xx_bat_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init wm97xx_bat_set_pdata(struct wm97xx_batt_info *data)</div><div class='add'>+{</div><div class='add'>+	pdata = data;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(wm97xx_bat_set_pdata);</div><div class='add'>+</div><div class='add'>+module_init(wm97xx_bat_init);</div><div class='add'>+module_exit(wm97xx_bat_exit);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_AUTHOR("Marek Vasut &lt;marek.vasut@gmail.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("WM97xx battery driver");</div><div class='head'>diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig<br/>index a656128f1fdd..4dada6ee1119 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/regulator/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/regulator/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/regulator/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/regulator/Kconfig</a></div><div class='hunk'>@@ -56,4 +56,28 @@ config REGULATOR_BQ24022</div><div class='ctx'> 	  charging select between 100 mA and 500 mA charging current</div><div class='ctx'> 	  limit.</div><div class='ctx'> </div><div class='add'>+config REGULATOR_WM8350</div><div class='add'>+	tristate "Wolfson Microelectroncis WM8350 AudioPlus PMIC"</div><div class='add'>+	depends on MFD_WM8350</div><div class='add'>+	select REGULATOR</div><div class='add'>+	help</div><div class='add'>+	  This driver provides support for the voltage and current regulators</div><div class='add'>+          of the WM8350 AudioPlus PMIC.</div><div class='add'>+</div><div class='add'>+config REGULATOR_WM8400</div><div class='add'>+	tristate "Wolfson Microelectroncis WM8400 AudioPlus PMIC"</div><div class='add'>+	depends on MFD_WM8400</div><div class='add'>+	select REGULATOR</div><div class='add'>+	help</div><div class='add'>+	  This driver provides support for the voltage regulators of the</div><div class='add'>+	  WM8400 AudioPlus PMIC.</div><div class='add'>+</div><div class='add'>+config REGULATOR_DA903X</div><div class='add'>+	tristate "Support regulators on Dialog Semiconductor DA9030/DA9034 PMIC"</div><div class='add'>+	depends on PMIC_DA903X</div><div class='add'>+	select REGULATOR</div><div class='add'>+	help</div><div class='add'>+	  Say y here to support the BUCKs and LDOs regulators found on</div><div class='add'>+	  Dialog Semiconductor DA9030/DA9034 PMIC.</div><div class='add'>+</div><div class='ctx'> endmenu</div><div class='head'>diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile<br/>index ac2c64efe65c..254d40c02ee8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/regulator/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/regulator/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/regulator/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/regulator/Makefile</a></div><div class='hunk'>@@ -8,5 +8,8 @@ obj-$(CONFIG_REGULATOR_FIXED_VOLTAGE) += fixed.o</div><div class='ctx'> obj-$(CONFIG_REGULATOR_VIRTUAL_CONSUMER) += virtual.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_REGULATOR_BQ24022) += bq24022.o</div><div class='add'>+obj-$(CONFIG_REGULATOR_WM8350) += wm8350-regulator.o</div><div class='add'>+obj-$(CONFIG_REGULATOR_WM8400) += wm8400-regulator.o</div><div class='add'>+obj-$(CONFIG_REGULATOR_DA903X)	+= da903x.o</div><div class='ctx'> </div><div class='ctx'> ccflags-$(CONFIG_REGULATOR_DEBUG) += -DDEBUG</div><div class='head'>diff --git a/drivers/regulator/bq24022.c b/drivers/regulator/bq24022.c<br/>index 263699d6152d..366565aba865 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/regulator/bq24022.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/regulator/bq24022.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/regulator/bq24022.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/regulator/bq24022.c</a></div><div class='hunk'>@@ -18,13 +18,13 @@</div><div class='ctx'> #include &lt;linux/regulator/bq24022.h&gt;</div><div class='ctx'> #include &lt;linux/regulator/driver.h&gt;</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> static int bq24022_set_current_limit(struct regulator_dev *rdev,</div><div class='ctx'> 					int min_uA, int max_uA)</div><div class='ctx'> {</div><div class='del'>-	struct platform_device *pdev = rdev_get_drvdata(rdev);</div><div class='del'>-	struct bq24022_mach_info *pdata = pdev-&gt;dev.platform_data;</div><div class='add'>+	struct bq24022_mach_info *pdata = rdev_get_drvdata(rdev);</div><div class='ctx'> </div><div class='del'>-	dev_dbg(&amp;pdev-&gt;dev, "setting current limit to %s mA\n",</div><div class='add'>+	dev_dbg(rdev_get_dev(rdev), "setting current limit to %s mA\n",</div><div class='ctx'> 		max_uA &gt;= 500000 ? "500" : "100");</div><div class='ctx'> </div><div class='ctx'> 	/* REVISIT: maybe return error if min_uA != 0 ? */</div><div class='hunk'>@@ -34,18 +34,16 @@ static int bq24022_set_current_limit(struct regulator_dev *rdev,</div><div class='ctx'> </div><div class='ctx'> static int bq24022_get_current_limit(struct regulator_dev *rdev)</div><div class='ctx'> {</div><div class='del'>-	struct platform_device *pdev = rdev_get_drvdata(rdev);</div><div class='del'>-	struct bq24022_mach_info *pdata = pdev-&gt;dev.platform_data;</div><div class='add'>+	struct bq24022_mach_info *pdata = rdev_get_drvdata(rdev);</div><div class='ctx'> </div><div class='ctx'> 	return gpio_get_value(pdata-&gt;gpio_iset2) ? 500000 : 100000;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bq24022_enable(struct regulator_dev *rdev)</div><div class='ctx'> {</div><div class='del'>-	struct platform_device *pdev = rdev_get_drvdata(rdev);</div><div class='del'>-	struct bq24022_mach_info *pdata = pdev-&gt;dev.platform_data;</div><div class='add'>+	struct bq24022_mach_info *pdata = rdev_get_drvdata(rdev);</div><div class='ctx'> </div><div class='del'>-	dev_dbg(&amp;pdev-&gt;dev, "enabling charger\n");</div><div class='add'>+	dev_dbg(rdev_get_dev(rdev), "enabling charger\n");</div><div class='ctx'> </div><div class='ctx'> 	gpio_set_value(pdata-&gt;gpio_nce, 0);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -53,10 +51,9 @@ static int bq24022_enable(struct regulator_dev *rdev)</div><div class='ctx'> </div><div class='ctx'> static int bq24022_disable(struct regulator_dev *rdev)</div><div class='ctx'> {</div><div class='del'>-	struct platform_device *pdev = rdev_get_drvdata(rdev);</div><div class='del'>-	struct bq24022_mach_info *pdata = pdev-&gt;dev.platform_data;</div><div class='add'>+	struct bq24022_mach_info *pdata = rdev_get_drvdata(rdev);</div><div class='ctx'> </div><div class='del'>-	dev_dbg(&amp;pdev-&gt;dev, "disabling charger\n");</div><div class='add'>+	dev_dbg(rdev_get_dev(rdev), "disabling charger\n");</div><div class='ctx'> </div><div class='ctx'> 	gpio_set_value(pdata-&gt;gpio_nce, 1);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -108,7 +105,7 @@ static int __init bq24022_probe(struct platform_device *pdev)</div><div class='ctx'> 	ret = gpio_direction_output(pdata-&gt;gpio_iset2, 0);</div><div class='ctx'> 	ret = gpio_direction_output(pdata-&gt;gpio_nce, 1);</div><div class='ctx'> </div><div class='del'>-	bq24022 = regulator_register(&amp;bq24022_desc, pdev);</div><div class='add'>+	bq24022 = regulator_register(&amp;bq24022_desc, &amp;pdev-&gt;dev, pdata);</div><div class='ctx'> 	if (IS_ERR(bq24022)) {</div><div class='ctx'> 		dev_dbg(&amp;pdev-&gt;dev, "couldn't register regulator\n");</div><div class='ctx'> 		ret = PTR_ERR(bq24022);</div><div class='head'>diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c<br/>index 9c7986261568..02a774424e8d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/regulator/core.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/regulator/core.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/regulator/core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/regulator/core.c</a></div><div class='hunk'>@@ -2,8 +2,9 @@</div><div class='ctx'>  * core.c  --  Voltage/Current Regulator framework.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2007, 2008 Wolfson Microelectronics PLC.</div><div class='add'>+ * Copyright 2008 SlimLogic Ltd.</div><div class='ctx'>  *</div><div class='del'>- * Author: Liam Girdwood &lt;liam.girdwood@wolfsonmicro.com&gt;</div><div class='add'>+ * Author: Liam Girdwood &lt;lrg@slimlogic.co.uk&gt;</div><div class='ctx'>  *</div><div class='ctx'>  *  This program is free software; you can redistribute  it and/or modify it</div><div class='ctx'>  *  under  the terms of  the GNU General  Public License as published by the</div><div class='hunk'>@@ -64,14 +65,9 @@ struct regulator_map {</div><div class='ctx'> 	struct list_head list;</div><div class='ctx'> 	struct device *dev;</div><div class='ctx'> 	const char *supply;</div><div class='del'>-	const char *regulator;</div><div class='add'>+	struct regulator_dev *regulator;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static inline struct regulator_dev *to_rdev(struct device *d)</div><div class='del'>-{</div><div class='del'>-	return container_of(d, struct regulator_dev, dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * struct regulator</div><div class='ctx'>  *</div><div class='hunk'>@@ -227,7 +223,7 @@ static ssize_t device_requested_uA_show(struct device *dev,</div><div class='ctx'> static ssize_t regulator_uV_show(struct device *dev,</div><div class='ctx'> 				struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='del'>-	struct regulator_dev *rdev = to_rdev(dev);</div><div class='add'>+	struct regulator_dev *rdev = dev_get_drvdata(dev);</div><div class='ctx'> 	ssize_t ret;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;rdev-&gt;mutex);</div><div class='hunk'>@@ -240,15 +236,31 @@ static ssize_t regulator_uV_show(struct device *dev,</div><div class='ctx'> static ssize_t regulator_uA_show(struct device *dev,</div><div class='ctx'> 				struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='del'>-	struct regulator_dev *rdev = to_rdev(dev);</div><div class='add'>+	struct regulator_dev *rdev = dev_get_drvdata(dev);</div><div class='ctx'> </div><div class='ctx'> 	return sprintf(buf, "%d\n", _regulator_get_current_limit(rdev));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static ssize_t regulator_name_show(struct device *dev,</div><div class='add'>+			     struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct regulator_dev *rdev = dev_get_drvdata(dev);</div><div class='add'>+	const char *name;</div><div class='add'>+</div><div class='add'>+	if (rdev-&gt;constraints-&gt;name)</div><div class='add'>+		name = rdev-&gt;constraints-&gt;name;</div><div class='add'>+	else if (rdev-&gt;desc-&gt;name)</div><div class='add'>+		name = rdev-&gt;desc-&gt;name;</div><div class='add'>+	else</div><div class='add'>+		name = "";</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "%s\n", name);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static ssize_t regulator_opmode_show(struct device *dev,</div><div class='ctx'> 				    struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='del'>-	struct regulator_dev *rdev = to_rdev(dev);</div><div class='add'>+	struct regulator_dev *rdev = dev_get_drvdata(dev);</div><div class='ctx'> 	int mode = _regulator_get_mode(rdev);</div><div class='ctx'> </div><div class='ctx'> 	switch (mode) {</div><div class='hunk'>@@ -267,7 +279,7 @@ static ssize_t regulator_opmode_show(struct device *dev,</div><div class='ctx'> static ssize_t regulator_state_show(struct device *dev,</div><div class='ctx'> 				   struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='del'>-	struct regulator_dev *rdev = to_rdev(dev);</div><div class='add'>+	struct regulator_dev *rdev = dev_get_drvdata(dev);</div><div class='ctx'> 	int state = _regulator_is_enabled(rdev);</div><div class='ctx'> </div><div class='ctx'> 	if (state &gt; 0)</div><div class='hunk'>@@ -281,7 +293,7 @@ static ssize_t regulator_state_show(struct device *dev,</div><div class='ctx'> static ssize_t regulator_min_uA_show(struct device *dev,</div><div class='ctx'> 				    struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='del'>-	struct regulator_dev *rdev = to_rdev(dev);</div><div class='add'>+	struct regulator_dev *rdev = dev_get_drvdata(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (!rdev-&gt;constraints)</div><div class='ctx'> 		return sprintf(buf, "constraint not defined\n");</div><div class='hunk'>@@ -292,7 +304,7 @@ static ssize_t regulator_min_uA_show(struct device *dev,</div><div class='ctx'> static ssize_t regulator_max_uA_show(struct device *dev,</div><div class='ctx'> 				    struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='del'>-	struct regulator_dev *rdev = to_rdev(dev);</div><div class='add'>+	struct regulator_dev *rdev = dev_get_drvdata(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (!rdev-&gt;constraints)</div><div class='ctx'> 		return sprintf(buf, "constraint not defined\n");</div><div class='hunk'>@@ -303,7 +315,7 @@ static ssize_t regulator_max_uA_show(struct device *dev,</div><div class='ctx'> static ssize_t regulator_min_uV_show(struct device *dev,</div><div class='ctx'> 				    struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='del'>-	struct regulator_dev *rdev = to_rdev(dev);</div><div class='add'>+	struct regulator_dev *rdev = dev_get_drvdata(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (!rdev-&gt;constraints)</div><div class='ctx'> 		return sprintf(buf, "constraint not defined\n");</div><div class='hunk'>@@ -314,7 +326,7 @@ static ssize_t regulator_min_uV_show(struct device *dev,</div><div class='ctx'> static ssize_t regulator_max_uV_show(struct device *dev,</div><div class='ctx'> 				    struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='del'>-	struct regulator_dev *rdev = to_rdev(dev);</div><div class='add'>+	struct regulator_dev *rdev = dev_get_drvdata(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (!rdev-&gt;constraints)</div><div class='ctx'> 		return sprintf(buf, "constraint not defined\n");</div><div class='hunk'>@@ -325,7 +337,7 @@ static ssize_t regulator_max_uV_show(struct device *dev,</div><div class='ctx'> static ssize_t regulator_total_uA_show(struct device *dev,</div><div class='ctx'> 				      struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='del'>-	struct regulator_dev *rdev = to_rdev(dev);</div><div class='add'>+	struct regulator_dev *rdev = dev_get_drvdata(dev);</div><div class='ctx'> 	struct regulator *regulator;</div><div class='ctx'> 	int uA = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -339,14 +351,14 @@ static ssize_t regulator_total_uA_show(struct device *dev,</div><div class='ctx'> static ssize_t regulator_num_users_show(struct device *dev,</div><div class='ctx'> 				      struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='del'>-	struct regulator_dev *rdev = to_rdev(dev);</div><div class='add'>+	struct regulator_dev *rdev = dev_get_drvdata(dev);</div><div class='ctx'> 	return sprintf(buf, "%d\n", rdev-&gt;use_count);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t regulator_type_show(struct device *dev,</div><div class='ctx'> 				  struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='del'>-	struct regulator_dev *rdev = to_rdev(dev);</div><div class='add'>+	struct regulator_dev *rdev = dev_get_drvdata(dev);</div><div class='ctx'> </div><div class='ctx'> 	switch (rdev-&gt;desc-&gt;type) {</div><div class='ctx'> 	case REGULATOR_VOLTAGE:</div><div class='hunk'>@@ -360,7 +372,7 @@ static ssize_t regulator_type_show(struct device *dev,</div><div class='ctx'> static ssize_t regulator_suspend_mem_uV_show(struct device *dev,</div><div class='ctx'> 				struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='del'>-	struct regulator_dev *rdev = to_rdev(dev);</div><div class='add'>+	struct regulator_dev *rdev = dev_get_drvdata(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (!rdev-&gt;constraints)</div><div class='ctx'> 		return sprintf(buf, "not defined\n");</div><div class='hunk'>@@ -370,7 +382,7 @@ static ssize_t regulator_suspend_mem_uV_show(struct device *dev,</div><div class='ctx'> static ssize_t regulator_suspend_disk_uV_show(struct device *dev,</div><div class='ctx'> 				struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='del'>-	struct regulator_dev *rdev = to_rdev(dev);</div><div class='add'>+	struct regulator_dev *rdev = dev_get_drvdata(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (!rdev-&gt;constraints)</div><div class='ctx'> 		return sprintf(buf, "not defined\n");</div><div class='hunk'>@@ -380,7 +392,7 @@ static ssize_t regulator_suspend_disk_uV_show(struct device *dev,</div><div class='ctx'> static ssize_t regulator_suspend_standby_uV_show(struct device *dev,</div><div class='ctx'> 				struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='del'>-	struct regulator_dev *rdev = to_rdev(dev);</div><div class='add'>+	struct regulator_dev *rdev = dev_get_drvdata(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (!rdev-&gt;constraints)</div><div class='ctx'> 		return sprintf(buf, "not defined\n");</div><div class='hunk'>@@ -406,7 +418,7 @@ static ssize_t suspend_opmode_show(struct regulator_dev *rdev,</div><div class='ctx'> static ssize_t regulator_suspend_mem_mode_show(struct device *dev,</div><div class='ctx'> 				struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='del'>-	struct regulator_dev *rdev = to_rdev(dev);</div><div class='add'>+	struct regulator_dev *rdev = dev_get_drvdata(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (!rdev-&gt;constraints)</div><div class='ctx'> 		return sprintf(buf, "not defined\n");</div><div class='hunk'>@@ -417,7 +429,7 @@ static ssize_t regulator_suspend_mem_mode_show(struct device *dev,</div><div class='ctx'> static ssize_t regulator_suspend_disk_mode_show(struct device *dev,</div><div class='ctx'> 				struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='del'>-	struct regulator_dev *rdev = to_rdev(dev);</div><div class='add'>+	struct regulator_dev *rdev = dev_get_drvdata(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (!rdev-&gt;constraints)</div><div class='ctx'> 		return sprintf(buf, "not defined\n");</div><div class='hunk'>@@ -428,7 +440,7 @@ static ssize_t regulator_suspend_disk_mode_show(struct device *dev,</div><div class='ctx'> static ssize_t regulator_suspend_standby_mode_show(struct device *dev,</div><div class='ctx'> 				struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='del'>-	struct regulator_dev *rdev = to_rdev(dev);</div><div class='add'>+	struct regulator_dev *rdev = dev_get_drvdata(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (!rdev-&gt;constraints)</div><div class='ctx'> 		return sprintf(buf, "not defined\n");</div><div class='hunk'>@@ -439,7 +451,7 @@ static ssize_t regulator_suspend_standby_mode_show(struct device *dev,</div><div class='ctx'> static ssize_t regulator_suspend_mem_state_show(struct device *dev,</div><div class='ctx'> 				   struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='del'>-	struct regulator_dev *rdev = to_rdev(dev);</div><div class='add'>+	struct regulator_dev *rdev = dev_get_drvdata(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (!rdev-&gt;constraints)</div><div class='ctx'> 		return sprintf(buf, "not defined\n");</div><div class='hunk'>@@ -453,7 +465,7 @@ static ssize_t regulator_suspend_mem_state_show(struct device *dev,</div><div class='ctx'> static ssize_t regulator_suspend_disk_state_show(struct device *dev,</div><div class='ctx'> 				   struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='del'>-	struct regulator_dev *rdev = to_rdev(dev);</div><div class='add'>+	struct regulator_dev *rdev = dev_get_drvdata(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (!rdev-&gt;constraints)</div><div class='ctx'> 		return sprintf(buf, "not defined\n");</div><div class='hunk'>@@ -467,7 +479,7 @@ static ssize_t regulator_suspend_disk_state_show(struct device *dev,</div><div class='ctx'> static ssize_t regulator_suspend_standby_state_show(struct device *dev,</div><div class='ctx'> 				   struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='del'>-	struct regulator_dev *rdev = to_rdev(dev);</div><div class='add'>+	struct regulator_dev *rdev = dev_get_drvdata(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (!rdev-&gt;constraints)</div><div class='ctx'> 		return sprintf(buf, "not defined\n");</div><div class='hunk'>@@ -477,7 +489,9 @@ static ssize_t regulator_suspend_standby_state_show(struct device *dev,</div><div class='ctx'> 	else</div><div class='ctx'> 		return sprintf(buf, "disabled\n");</div><div class='ctx'> }</div><div class='add'>+</div><div class='ctx'> static struct device_attribute regulator_dev_attrs[] = {</div><div class='add'>+	__ATTR(name, 0444, regulator_name_show, NULL),</div><div class='ctx'> 	__ATTR(microvolts, 0444, regulator_uV_show, NULL),</div><div class='ctx'> 	__ATTR(microamps, 0444, regulator_uA_show, NULL),</div><div class='ctx'> 	__ATTR(opmode, 0444, regulator_opmode_show, NULL),</div><div class='hunk'>@@ -512,7 +526,7 @@ static struct device_attribute regulator_dev_attrs[] = {</div><div class='ctx'> </div><div class='ctx'> static void regulator_dev_release(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct regulator_dev *rdev = to_rdev(dev);</div><div class='add'>+	struct regulator_dev *rdev = dev_get_drvdata(dev);</div><div class='ctx'> 	kfree(rdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -569,8 +583,11 @@ static int suspend_set_state(struct regulator_dev *rdev,</div><div class='ctx'> </div><div class='ctx'> 	/* enable &amp; disable are mandatory for suspend control */</div><div class='ctx'> 	if (!rdev-&gt;desc-&gt;ops-&gt;set_suspend_enable ||</div><div class='del'>-		!rdev-&gt;desc-&gt;ops-&gt;set_suspend_disable)</div><div class='add'>+		!rdev-&gt;desc-&gt;ops-&gt;set_suspend_disable) {</div><div class='add'>+		printk(KERN_ERR "%s: no way to set suspend state\n",</div><div class='add'>+			__func__);</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (rstate-&gt;enabled)</div><div class='ctx'> 		ret = rdev-&gt;desc-&gt;ops-&gt;set_suspend_enable(rdev);</div><div class='hunk'>@@ -656,6 +673,155 @@ static void print_constraints(struct regulator_dev *rdev)</div><div class='ctx'> 	printk(KERN_INFO "regulator: %s: %s\n", rdev-&gt;desc-&gt;name, buf);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * set_machine_constraints - sets regulator constraints</div><div class='add'>+ * @regulator: regulator source</div><div class='add'>+ *</div><div class='add'>+ * Allows platform initialisation code to define and constrain</div><div class='add'>+ * regulator circuits e.g. valid voltage/current ranges, etc.  NOTE:</div><div class='add'>+ * Constraints *must* be set by platform code in order for some</div><div class='add'>+ * regulator operations to proceed i.e. set_voltage, set_current_limit,</div><div class='add'>+ * set_mode.</div><div class='add'>+ */</div><div class='add'>+static int set_machine_constraints(struct regulator_dev *rdev,</div><div class='add'>+	struct regulation_constraints *constraints)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+	const char *name;</div><div class='add'>+	struct regulator_ops *ops = rdev-&gt;desc-&gt;ops;</div><div class='add'>+</div><div class='add'>+	if (constraints-&gt;name)</div><div class='add'>+		name = constraints-&gt;name;</div><div class='add'>+	else if (rdev-&gt;desc-&gt;name)</div><div class='add'>+		name = rdev-&gt;desc-&gt;name;</div><div class='add'>+	else</div><div class='add'>+		name = "regulator";</div><div class='add'>+</div><div class='add'>+	rdev-&gt;constraints = constraints;</div><div class='add'>+</div><div class='add'>+	/* do we need to apply the constraint voltage */</div><div class='add'>+	if (rdev-&gt;constraints-&gt;apply_uV &amp;&amp;</div><div class='add'>+		rdev-&gt;constraints-&gt;min_uV == rdev-&gt;constraints-&gt;max_uV &amp;&amp;</div><div class='add'>+		ops-&gt;set_voltage) {</div><div class='add'>+		ret = ops-&gt;set_voltage(rdev,</div><div class='add'>+			rdev-&gt;constraints-&gt;min_uV, rdev-&gt;constraints-&gt;max_uV);</div><div class='add'>+			if (ret &lt; 0) {</div><div class='add'>+				printk(KERN_ERR "%s: failed to apply %duV constraint to %s\n",</div><div class='add'>+				       __func__,</div><div class='add'>+				       rdev-&gt;constraints-&gt;min_uV, name);</div><div class='add'>+				rdev-&gt;constraints = NULL;</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* are we enabled at boot time by firmware / bootloader */</div><div class='add'>+	if (rdev-&gt;constraints-&gt;boot_on)</div><div class='add'>+		rdev-&gt;use_count = 1;</div><div class='add'>+</div><div class='add'>+	/* do we need to setup our suspend state */</div><div class='add'>+	if (constraints-&gt;initial_state) {</div><div class='add'>+		ret = suspend_prepare(rdev, constraints-&gt;initial_state);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			printk(KERN_ERR "%s: failed to set suspend state for %s\n",</div><div class='add'>+			       __func__, name);</div><div class='add'>+			rdev-&gt;constraints = NULL;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* if always_on is set then turn the regulator on if it's not</div><div class='add'>+	 * already on. */</div><div class='add'>+	if (constraints-&gt;always_on &amp;&amp; ops-&gt;enable &amp;&amp;</div><div class='add'>+	    ((ops-&gt;is_enabled &amp;&amp; !ops-&gt;is_enabled(rdev)) ||</div><div class='add'>+	     (!ops-&gt;is_enabled &amp;&amp; !constraints-&gt;boot_on))) {</div><div class='add'>+		ret = ops-&gt;enable(rdev);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			printk(KERN_ERR "%s: failed to enable %s\n",</div><div class='add'>+			       __func__, name);</div><div class='add'>+			rdev-&gt;constraints = NULL;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	print_constraints(rdev);</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * set_supply - set regulator supply regulator</div><div class='add'>+ * @regulator: regulator name</div><div class='add'>+ * @supply: supply regulator name</div><div class='add'>+ *</div><div class='add'>+ * Called by platform initialisation code to set the supply regulator for this</div><div class='add'>+ * regulator. This ensures that a regulators supply will also be enabled by the</div><div class='add'>+ * core if it's child is enabled.</div><div class='add'>+ */</div><div class='add'>+static int set_supply(struct regulator_dev *rdev,</div><div class='add'>+	struct regulator_dev *supply_rdev)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = sysfs_create_link(&amp;rdev-&gt;dev.kobj, &amp;supply_rdev-&gt;dev.kobj,</div><div class='add'>+				"supply");</div><div class='add'>+	if (err) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "%s: could not add device link %s err %d\n",</div><div class='add'>+		       __func__, supply_rdev-&gt;dev.kobj.name, err);</div><div class='add'>+		       goto out;</div><div class='add'>+	}</div><div class='add'>+	rdev-&gt;supply = supply_rdev;</div><div class='add'>+	list_add(&amp;rdev-&gt;slist, &amp;supply_rdev-&gt;supply_list);</div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * set_consumer_device_supply: Bind a regulator to a symbolic supply</div><div class='add'>+ * @regulator: regulator source</div><div class='add'>+ * @dev:       device the supply applies to</div><div class='add'>+ * @supply:    symbolic name for supply</div><div class='add'>+ *</div><div class='add'>+ * Allows platform initialisation code to map physical regulator</div><div class='add'>+ * sources to symbolic names for supplies for use by devices.  Devices</div><div class='add'>+ * should use these symbolic names to request regulators, avoiding the</div><div class='add'>+ * need to provide board-specific regulator names as platform data.</div><div class='add'>+ */</div><div class='add'>+static int set_consumer_device_supply(struct regulator_dev *rdev,</div><div class='add'>+	struct device *consumer_dev, const char *supply)</div><div class='add'>+{</div><div class='add'>+	struct regulator_map *node;</div><div class='add'>+</div><div class='add'>+	if (supply == NULL)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	node = kmalloc(sizeof(struct regulator_map), GFP_KERNEL);</div><div class='add'>+	if (node == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	node-&gt;regulator = rdev;</div><div class='add'>+	node-&gt;dev = consumer_dev;</div><div class='add'>+	node-&gt;supply = supply;</div><div class='add'>+</div><div class='add'>+	list_add(&amp;node-&gt;list, &amp;regulator_map_list);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void unset_consumer_device_supply(struct regulator_dev *rdev,</div><div class='add'>+	struct device *consumer_dev)</div><div class='add'>+{</div><div class='add'>+	struct regulator_map *node, *n;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(node, n, &amp;regulator_map_list, list) {</div><div class='add'>+		if (rdev == node-&gt;regulator &amp;&amp;</div><div class='add'>+			consumer_dev == node-&gt;dev) {</div><div class='add'>+			list_del(&amp;node-&gt;list);</div><div class='add'>+			kfree(node);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #define REG_STR_SIZE	32</div><div class='ctx'> </div><div class='ctx'> static struct regulator *create_regulator(struct regulator_dev *rdev,</div><div class='hunk'>@@ -746,7 +912,6 @@ struct regulator *regulator_get(struct device *dev, const char *id)</div><div class='ctx'> 	struct regulator_dev *rdev;</div><div class='ctx'> 	struct regulator_map *map;</div><div class='ctx'> 	struct regulator *regulator = ERR_PTR(-ENODEV);</div><div class='del'>-	const char *supply = id;</div><div class='ctx'> </div><div class='ctx'> 	if (id == NULL) {</div><div class='ctx'> 		printk(KERN_ERR "regulator: get() with no identifier\n");</div><div class='hunk'>@@ -758,15 +923,9 @@ struct regulator *regulator_get(struct device *dev, const char *id)</div><div class='ctx'> 	list_for_each_entry(map, &amp;regulator_map_list, list) {</div><div class='ctx'> 		if (dev == map-&gt;dev &amp;&amp;</div><div class='ctx'> 		    strcmp(map-&gt;supply, id) == 0) {</div><div class='del'>-			supply = map-&gt;regulator;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(rdev, &amp;regulator_list, list) {</div><div class='del'>-		if (strcmp(supply, rdev-&gt;desc-&gt;name) == 0 &amp;&amp;</div><div class='del'>-		    try_module_get(rdev-&gt;owner))</div><div class='add'>+			rdev = map-&gt;regulator;</div><div class='ctx'> 			goto found;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	printk(KERN_ERR "regulator: Unable to get requested regulator: %s\n",</div><div class='ctx'> 	       id);</div><div class='hunk'>@@ -774,12 +933,16 @@ struct regulator *regulator_get(struct device *dev, const char *id)</div><div class='ctx'> 	return regulator;</div><div class='ctx'> </div><div class='ctx'> found:</div><div class='add'>+	if (!try_module_get(rdev-&gt;owner))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='ctx'> 	regulator = create_regulator(rdev, dev, id);</div><div class='ctx'> 	if (regulator == NULL) {</div><div class='ctx'> 		regulator = ERR_PTR(-ENOMEM);</div><div class='ctx'> 		module_put(rdev-&gt;owner);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+out:</div><div class='ctx'> 	mutex_unlock(&amp;regulator_list_mutex);</div><div class='ctx'> 	return regulator;</div><div class='ctx'> }</div><div class='hunk'>@@ -1559,11 +1722,12 @@ EXPORT_SYMBOL_GPL(regulator_notifier_call_chain);</div><div class='ctx'>  * Returns 0 on success.</div><div class='ctx'>  */</div><div class='ctx'> struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc,</div><div class='del'>-					  void *reg_data)</div><div class='add'>+	struct device *dev, void *driver_data)</div><div class='ctx'> {</div><div class='ctx'> 	static atomic_t regulator_no = ATOMIC_INIT(0);</div><div class='ctx'> 	struct regulator_dev *rdev;</div><div class='del'>-	int ret;</div><div class='add'>+	struct regulator_init_data *init_data = dev-&gt;platform_data;</div><div class='add'>+	int ret, i;</div><div class='ctx'> </div><div class='ctx'> 	if (regulator_desc == NULL)</div><div class='ctx'> 		return ERR_PTR(-EINVAL);</div><div class='hunk'>@@ -1575,6 +1739,9 @@ struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc,</div><div class='ctx'> 	    !regulator_desc-&gt;type == REGULATOR_CURRENT)</div><div class='ctx'> 		return ERR_PTR(-EINVAL);</div><div class='ctx'> </div><div class='add'>+	if (!init_data)</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+</div><div class='ctx'> 	rdev = kzalloc(sizeof(struct regulator_dev), GFP_KERNEL);</div><div class='ctx'> 	if (rdev == NULL)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='hunk'>@@ -1582,7 +1749,7 @@ struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc,</div><div class='ctx'> 	mutex_lock(&amp;regulator_list_mutex);</div><div class='ctx'> </div><div class='ctx'> 	mutex_init(&amp;rdev-&gt;mutex);</div><div class='del'>-	rdev-&gt;reg_data = reg_data;</div><div class='add'>+	rdev-&gt;reg_data = driver_data;</div><div class='ctx'> 	rdev-&gt;owner = regulator_desc-&gt;owner;</div><div class='ctx'> 	rdev-&gt;desc = regulator_desc;</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;rdev-&gt;consumer_list);</div><div class='hunk'>@@ -1591,20 +1758,68 @@ struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc,</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;rdev-&gt;slist);</div><div class='ctx'> 	BLOCKING_INIT_NOTIFIER_HEAD(&amp;rdev-&gt;notifier);</div><div class='ctx'> </div><div class='add'>+	/* preform any regulator specific init */</div><div class='add'>+	if (init_data-&gt;regulator_init) {</div><div class='add'>+		ret = init_data-&gt;regulator_init(rdev-&gt;reg_data);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			kfree(rdev);</div><div class='add'>+			rdev = ERR_PTR(ret);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* set regulator constraints */</div><div class='add'>+	ret = set_machine_constraints(rdev, &amp;init_data-&gt;constraints);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		kfree(rdev);</div><div class='add'>+		rdev = ERR_PTR(ret);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* register with sysfs */</div><div class='ctx'> 	rdev-&gt;dev.class = &amp;regulator_class;</div><div class='del'>-	device_initialize(&amp;rdev-&gt;dev);</div><div class='add'>+	rdev-&gt;dev.parent = dev;</div><div class='ctx'> 	snprintf(rdev-&gt;dev.bus_id, sizeof(rdev-&gt;dev.bus_id),</div><div class='del'>-		 "regulator_%ld_%s",</div><div class='del'>-		 (unsigned long)atomic_inc_return(&amp;regulator_no) - 1,</div><div class='del'>-		 regulator_desc-&gt;name);</div><div class='del'>-</div><div class='del'>-	ret = device_add(&amp;rdev-&gt;dev);</div><div class='del'>-	if (ret == 0)</div><div class='del'>-		list_add(&amp;rdev-&gt;list, &amp;regulator_list);</div><div class='del'>-	else {</div><div class='add'>+		 "regulator.%d", atomic_inc_return(&amp;regulator_no) - 1);</div><div class='add'>+	ret = device_register(&amp;rdev-&gt;dev);</div><div class='add'>+	if (ret != 0) {</div><div class='ctx'> 		kfree(rdev);</div><div class='ctx'> 		rdev = ERR_PTR(ret);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(&amp;rdev-&gt;dev, rdev);</div><div class='add'>+</div><div class='add'>+	/* set supply regulator if it exists */</div><div class='add'>+	if (init_data-&gt;supply_regulator_dev) {</div><div class='add'>+		ret = set_supply(rdev,</div><div class='add'>+			dev_get_drvdata(init_data-&gt;supply_regulator_dev));</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			device_unregister(&amp;rdev-&gt;dev);</div><div class='add'>+			kfree(rdev);</div><div class='add'>+			rdev = ERR_PTR(ret);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	/* add consumers devices */</div><div class='add'>+	for (i = 0; i &lt; init_data-&gt;num_consumer_supplies; i++) {</div><div class='add'>+		ret = set_consumer_device_supply(rdev,</div><div class='add'>+			init_data-&gt;consumer_supplies[i].dev,</div><div class='add'>+			init_data-&gt;consumer_supplies[i].supply);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			for (--i; i &gt;= 0; i--)</div><div class='add'>+				unset_consumer_device_supply(rdev,</div><div class='add'>+					init_data-&gt;consumer_supplies[i].dev);</div><div class='add'>+			device_unregister(&amp;rdev-&gt;dev);</div><div class='add'>+			kfree(rdev);</div><div class='add'>+			rdev = ERR_PTR(ret);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_add(&amp;rdev-&gt;list, &amp;regulator_list);</div><div class='add'>+out:</div><div class='ctx'> 	mutex_unlock(&amp;regulator_list_mutex);</div><div class='ctx'> 	return rdev;</div><div class='ctx'> }</div><div class='hunk'>@@ -1631,187 +1846,6 @@ void regulator_unregister(struct regulator_dev *rdev)</div><div class='ctx'> EXPORT_SYMBOL_GPL(regulator_unregister);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * regulator_set_supply - set regulator supply regulator</div><div class='del'>- * @regulator: regulator name</div><div class='del'>- * @supply: supply regulator name</div><div class='del'>- *</div><div class='del'>- * Called by platform initialisation code to set the supply regulator for this</div><div class='del'>- * regulator. This ensures that a regulators supply will also be enabled by the</div><div class='del'>- * core if it's child is enabled.</div><div class='del'>- */</div><div class='del'>-int regulator_set_supply(const char *regulator, const char *supply)</div><div class='del'>-{</div><div class='del'>-	struct regulator_dev *rdev, *supply_rdev;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (regulator == NULL || supply == NULL)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;regulator_list_mutex);</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(rdev, &amp;regulator_list, list) {</div><div class='del'>-		if (!strcmp(rdev-&gt;desc-&gt;name, regulator))</div><div class='del'>-			goto found_regulator;</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;regulator_list_mutex);</div><div class='del'>-	return -ENODEV;</div><div class='del'>-</div><div class='del'>-found_regulator:</div><div class='del'>-	list_for_each_entry(supply_rdev, &amp;regulator_list, list) {</div><div class='del'>-		if (!strcmp(supply_rdev-&gt;desc-&gt;name, supply))</div><div class='del'>-			goto found_supply;</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;regulator_list_mutex);</div><div class='del'>-	return -ENODEV;</div><div class='del'>-</div><div class='del'>-found_supply:</div><div class='del'>-	err = sysfs_create_link(&amp;rdev-&gt;dev.kobj, &amp;supply_rdev-&gt;dev.kobj,</div><div class='del'>-				"supply");</div><div class='del'>-	if (err) {</div><div class='del'>-		printk(KERN_ERR</div><div class='del'>-		       "%s: could not add device link %s err %d\n",</div><div class='del'>-		       __func__, supply_rdev-&gt;dev.kobj.name, err);</div><div class='del'>-		       goto out;</div><div class='del'>-	}</div><div class='del'>-	rdev-&gt;supply = supply_rdev;</div><div class='del'>-	list_add(&amp;rdev-&gt;slist, &amp;supply_rdev-&gt;supply_list);</div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;regulator_list_mutex);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(regulator_set_supply);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * regulator_get_supply - get regulator supply regulator</div><div class='del'>- * @regulator: regulator name</div><div class='del'>- *</div><div class='del'>- * Returns the supply supply regulator name or NULL if no supply regulator</div><div class='del'>- * exists (i.e the regulator is supplied directly from USB, Line, Battery, etc)</div><div class='del'>- */</div><div class='del'>-const char *regulator_get_supply(const char *regulator)</div><div class='del'>-{</div><div class='del'>-	struct regulator_dev *rdev;</div><div class='del'>-</div><div class='del'>-	if (regulator == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;regulator_list_mutex);</div><div class='del'>-	list_for_each_entry(rdev, &amp;regulator_list, list) {</div><div class='del'>-		if (!strcmp(rdev-&gt;desc-&gt;name, regulator))</div><div class='del'>-			goto found;</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;regulator_list_mutex);</div><div class='del'>-	return NULL;</div><div class='del'>-</div><div class='del'>-found:</div><div class='del'>-	mutex_unlock(&amp;regulator_list_mutex);</div><div class='del'>-	if (rdev-&gt;supply)</div><div class='del'>-		return rdev-&gt;supply-&gt;desc-&gt;name;</div><div class='del'>-	else</div><div class='del'>-		return NULL;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(regulator_get_supply);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * regulator_set_machine_constraints - sets regulator constraints</div><div class='del'>- * @regulator: regulator source</div><div class='del'>- *</div><div class='del'>- * Allows platform initialisation code to define and constrain</div><div class='del'>- * regulator circuits e.g. valid voltage/current ranges, etc.  NOTE:</div><div class='del'>- * Constraints *must* be set by platform code in order for some</div><div class='del'>- * regulator operations to proceed i.e. set_voltage, set_current_limit,</div><div class='del'>- * set_mode.</div><div class='del'>- */</div><div class='del'>-int regulator_set_machine_constraints(const char *regulator_name,</div><div class='del'>-	struct regulation_constraints *constraints)</div><div class='del'>-{</div><div class='del'>-	struct regulator_dev *rdev;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (regulator_name == NULL)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;regulator_list_mutex);</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(rdev, &amp;regulator_list, list) {</div><div class='del'>-		if (!strcmp(regulator_name, rdev-&gt;desc-&gt;name))</div><div class='del'>-			goto found;</div><div class='del'>-	}</div><div class='del'>-	ret = -ENODEV;</div><div class='del'>-	goto out;</div><div class='del'>-</div><div class='del'>-found:</div><div class='del'>-	mutex_lock(&amp;rdev-&gt;mutex);</div><div class='del'>-	rdev-&gt;constraints = constraints;</div><div class='del'>-</div><div class='del'>-	/* do we need to apply the constraint voltage */</div><div class='del'>-	if (rdev-&gt;constraints-&gt;apply_uV &amp;&amp;</div><div class='del'>-		rdev-&gt;constraints-&gt;min_uV == rdev-&gt;constraints-&gt;max_uV &amp;&amp;</div><div class='del'>-		rdev-&gt;desc-&gt;ops-&gt;set_voltage) {</div><div class='del'>-		ret = rdev-&gt;desc-&gt;ops-&gt;set_voltage(rdev,</div><div class='del'>-			rdev-&gt;constraints-&gt;min_uV, rdev-&gt;constraints-&gt;max_uV);</div><div class='del'>-			if (ret &lt; 0) {</div><div class='del'>-				printk(KERN_ERR "%s: failed to apply %duV"</div><div class='del'>-					" constraint\n", __func__,</div><div class='del'>-					rdev-&gt;constraints-&gt;min_uV);</div><div class='del'>-				rdev-&gt;constraints = NULL;</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* are we enabled at boot time by firmware / bootloader */</div><div class='del'>-	if (rdev-&gt;constraints-&gt;boot_on)</div><div class='del'>-		rdev-&gt;use_count = 1;</div><div class='del'>-</div><div class='del'>-	/* do we need to setup our suspend state */</div><div class='del'>-	if (constraints-&gt;initial_state)</div><div class='del'>-		ret = suspend_prepare(rdev, constraints-&gt;initial_state);</div><div class='del'>-</div><div class='del'>-	print_constraints(rdev);</div><div class='del'>-	mutex_unlock(&amp;rdev-&gt;mutex);</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;regulator_list_mutex);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(regulator_set_machine_constraints);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * regulator_set_device_supply: Bind a regulator to a symbolic supply</div><div class='del'>- * @regulator: regulator source</div><div class='del'>- * @dev:       device the supply applies to</div><div class='del'>- * @supply:    symbolic name for supply</div><div class='del'>- *</div><div class='del'>- * Allows platform initialisation code to map physical regulator</div><div class='del'>- * sources to symbolic names for supplies for use by devices.  Devices</div><div class='del'>- * should use these symbolic names to request regulators, avoiding the</div><div class='del'>- * need to provide board-specific regulator names as platform data.</div><div class='del'>- */</div><div class='del'>-int regulator_set_device_supply(const char *regulator, struct device *dev,</div><div class='del'>-				const char *supply)</div><div class='del'>-{</div><div class='del'>-	struct regulator_map *node;</div><div class='del'>-</div><div class='del'>-	if (regulator == NULL || supply == NULL)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	node = kmalloc(sizeof(struct regulator_map), GFP_KERNEL);</div><div class='del'>-	if (node == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	node-&gt;regulator = regulator;</div><div class='del'>-	node-&gt;dev = dev;</div><div class='del'>-	node-&gt;supply = supply;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;regulator_list_mutex);</div><div class='del'>-	list_add(&amp;node-&gt;list, &amp;regulator_map_list);</div><div class='del'>-	mutex_unlock(&amp;regulator_list_mutex);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(regulator_set_device_supply);</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * regulator_suspend_prepare: prepare regulators for system wide suspend</div><div class='ctx'>  * @state: system suspend state</div><div class='ctx'>  *</div><div class='hunk'>@@ -1893,6 +1927,18 @@ int rdev_get_id(struct regulator_dev *rdev)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(rdev_get_id);</div><div class='ctx'> </div><div class='add'>+struct device *rdev_get_dev(struct regulator_dev *rdev)</div><div class='add'>+{</div><div class='add'>+	return &amp;rdev-&gt;dev;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(rdev_get_dev);</div><div class='add'>+</div><div class='add'>+void *regulator_get_init_drvdata(struct regulator_init_data *reg_init_data)</div><div class='add'>+{</div><div class='add'>+	return reg_init_data-&gt;driver_data;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(regulator_get_init_drvdata);</div><div class='add'>+</div><div class='ctx'> static int __init regulator_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	printk(KERN_INFO "regulator: core version %s\n", REGULATOR_VERSION);</div><div class='head'>diff --git a/drivers/regulator/da903x.c b/drivers/regulator/da903x.c<br/>new file mode 100644<br/>index 000000000000..3688e339db87<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/regulator/da903x.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/regulator/da903x.c</a></div><div class='hunk'>@@ -0,0 +1,513 @@</div><div class='add'>+/*</div><div class='add'>+ * Regulators driver for Dialog Semiconductor DA903x</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2006-2008 Marvell International Ltd.</div><div class='add'>+ * Copyright (C) 2008 Compulab Ltd.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/regulator/driver.h&gt;</div><div class='add'>+#include &lt;linux/regulator/machine.h&gt;</div><div class='add'>+#include &lt;linux/mfd/da903x.h&gt;</div><div class='add'>+</div><div class='add'>+/* DA9030 Registers */</div><div class='add'>+#define DA9030_INVAL		(-1)</div><div class='add'>+#define DA9030_LDO1011		(0x10)</div><div class='add'>+#define DA9030_LDO15		(0x11)</div><div class='add'>+#define DA9030_LDO1416		(0x12)</div><div class='add'>+#define DA9030_LDO1819		(0x13)</div><div class='add'>+#define DA9030_LDO17		(0x14)</div><div class='add'>+#define DA9030_BUCK2DVM1	(0x15)</div><div class='add'>+#define DA9030_BUCK2DVM2	(0x16)</div><div class='add'>+#define DA9030_RCTL11		(0x17)</div><div class='add'>+#define DA9030_RCTL21		(0x18)</div><div class='add'>+#define DA9030_LDO1		(0x90)</div><div class='add'>+#define DA9030_LDO23		(0x91)</div><div class='add'>+#define DA9030_LDO45		(0x92)</div><div class='add'>+#define DA9030_LDO6		(0x93)</div><div class='add'>+#define DA9030_LDO78		(0x94)</div><div class='add'>+#define DA9030_LDO912		(0x95)</div><div class='add'>+#define DA9030_BUCK		(0x96)</div><div class='add'>+#define DA9030_RCTL12		(0x97)</div><div class='add'>+#define DA9030_RCTL22		(0x98)</div><div class='add'>+#define DA9030_LDO_UNLOCK	(0xa0)</div><div class='add'>+#define DA9030_LDO_UNLOCK_MASK	(0xe0)</div><div class='add'>+#define DA9034_OVER1		(0x10)</div><div class='add'>+</div><div class='add'>+/* DA9034 Registers */</div><div class='add'>+#define DA9034_INVAL		(-1)</div><div class='add'>+#define DA9034_OVER2		(0x11)</div><div class='add'>+#define DA9034_OVER3		(0x12)</div><div class='add'>+#define DA9034_LDO643		(0x13)</div><div class='add'>+#define DA9034_LDO987		(0x14)</div><div class='add'>+#define DA9034_LDO1110		(0x15)</div><div class='add'>+#define DA9034_LDO1312		(0x16)</div><div class='add'>+#define DA9034_LDO1514		(0x17)</div><div class='add'>+#define DA9034_VCC1		(0x20)</div><div class='add'>+#define DA9034_ADTV1		(0x23)</div><div class='add'>+#define DA9034_ADTV2		(0x24)</div><div class='add'>+#define DA9034_AVRC		(0x25)</div><div class='add'>+#define DA9034_CDTV1		(0x26)</div><div class='add'>+#define DA9034_CDTV2		(0x27)</div><div class='add'>+#define DA9034_CVRC		(0x28)</div><div class='add'>+#define DA9034_SDTV1		(0x29)</div><div class='add'>+#define DA9034_SDTV2		(0x2a)</div><div class='add'>+#define DA9034_SVRC		(0x2b)</div><div class='add'>+#define DA9034_MDTV1		(0x32)</div><div class='add'>+#define DA9034_MDTV2		(0x33)</div><div class='add'>+#define DA9034_MVRC		(0x34)</div><div class='add'>+</div><div class='add'>+struct da903x_regulator_info {</div><div class='add'>+	struct regulator_desc desc;</div><div class='add'>+</div><div class='add'>+	int	min_uV;</div><div class='add'>+	int	max_uV;</div><div class='add'>+	int	step_uV;</div><div class='add'>+	int	vol_reg;</div><div class='add'>+	int	vol_shift;</div><div class='add'>+	int	vol_nbits;</div><div class='add'>+	int	update_reg;</div><div class='add'>+	int	update_bit;</div><div class='add'>+	int	enable_reg;</div><div class='add'>+	int	enable_bit;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline int check_range(struct da903x_regulator_info *info,</div><div class='add'>+				int min_uV, int max_uV)</div><div class='add'>+{</div><div class='add'>+	if (min_uV &lt; info-&gt;min_uV || min_uV &gt; info-&gt;max_uV)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* DA9030/DA9034 common operations */</div><div class='add'>+static int da903x_set_ldo_voltage(struct regulator_dev *rdev,</div><div class='add'>+				  int min_uV, int max_uV)</div><div class='add'>+{</div><div class='add'>+	struct da903x_regulator_info *info = rdev_get_drvdata(rdev);</div><div class='add'>+	struct device *da9034_dev = rdev_get_dev(rdev)-&gt;parent;</div><div class='add'>+	uint8_t val, mask;</div><div class='add'>+</div><div class='add'>+	if (check_range(info, min_uV, max_uV)) {</div><div class='add'>+		pr_err("invalid voltage range (%d, %d) uV", min_uV, max_uV);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	val = (min_uV - info-&gt;min_uV + info-&gt;step_uV - 1) / info-&gt;step_uV;</div><div class='add'>+	val &lt;&lt;= info-&gt;vol_shift;</div><div class='add'>+	mask = ((1 &lt;&lt; info-&gt;vol_nbits) - 1)  &lt;&lt; info-&gt;vol_shift;</div><div class='add'>+</div><div class='add'>+	return da903x_update(da9034_dev, info-&gt;vol_reg, val, mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int da903x_get_voltage(struct regulator_dev *rdev)</div><div class='add'>+{</div><div class='add'>+	struct da903x_regulator_info *info = rdev_get_drvdata(rdev);</div><div class='add'>+	struct device *da9034_dev = rdev_get_dev(rdev)-&gt;parent;</div><div class='add'>+	uint8_t val, mask;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = da903x_read(da9034_dev, info-&gt;vol_reg, &amp;val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	mask = ((1 &lt;&lt; info-&gt;vol_nbits) - 1)  &lt;&lt; info-&gt;vol_shift;</div><div class='add'>+	val = (val &amp; mask) &gt;&gt; info-&gt;vol_shift;</div><div class='add'>+</div><div class='add'>+	return info-&gt;min_uV + info-&gt;step_uV * val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int da903x_enable(struct regulator_dev *rdev)</div><div class='add'>+{</div><div class='add'>+	struct da903x_regulator_info *info = rdev_get_drvdata(rdev);</div><div class='add'>+	struct device *da9034_dev = rdev_get_dev(rdev)-&gt;parent;</div><div class='add'>+</div><div class='add'>+	return da903x_set_bits(da9034_dev, info-&gt;enable_reg,</div><div class='add'>+					1 &lt;&lt; info-&gt;enable_bit);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int da903x_disable(struct regulator_dev *rdev)</div><div class='add'>+{</div><div class='add'>+	struct da903x_regulator_info *info = rdev_get_drvdata(rdev);</div><div class='add'>+	struct device *da9034_dev = rdev_get_dev(rdev)-&gt;parent;</div><div class='add'>+</div><div class='add'>+	return da903x_clr_bits(da9034_dev, info-&gt;enable_reg,</div><div class='add'>+					1 &lt;&lt; info-&gt;enable_bit);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int da903x_is_enabled(struct regulator_dev *rdev)</div><div class='add'>+{</div><div class='add'>+	struct da903x_regulator_info *info = rdev_get_drvdata(rdev);</div><div class='add'>+	struct device *da9034_dev = rdev_get_dev(rdev)-&gt;parent;</div><div class='add'>+	uint8_t reg_val;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = da903x_read(da9034_dev, info-&gt;enable_reg, &amp;reg_val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return reg_val &amp; (1 &lt;&lt; info-&gt;enable_bit);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* DA9030 specific operations */</div><div class='add'>+static int da9030_set_ldo1_15_voltage(struct regulator_dev *rdev,</div><div class='add'>+				       int min_uV, int max_uV)</div><div class='add'>+{</div><div class='add'>+	struct da903x_regulator_info *info = rdev_get_drvdata(rdev);</div><div class='add'>+	struct device *da903x_dev = rdev_get_dev(rdev)-&gt;parent;</div><div class='add'>+	uint8_t val, mask;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (check_range(info, min_uV, max_uV)) {</div><div class='add'>+		pr_err("invalid voltage range (%d, %d) uV", min_uV, max_uV);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	val = (min_uV - info-&gt;min_uV + info-&gt;step_uV - 1) / info-&gt;step_uV;</div><div class='add'>+	val &lt;&lt;= info-&gt;vol_shift;</div><div class='add'>+	mask = ((1 &lt;&lt; info-&gt;vol_nbits) - 1)  &lt;&lt; info-&gt;vol_shift;</div><div class='add'>+	val |= DA9030_LDO_UNLOCK; /* have to set UNLOCK bits */</div><div class='add'>+	mask |= DA9030_LDO_UNLOCK_MASK;</div><div class='add'>+</div><div class='add'>+	/* write twice */</div><div class='add'>+	ret = da903x_update(da903x_dev, info-&gt;vol_reg, val, mask);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return da903x_update(da903x_dev, info-&gt;vol_reg, val, mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int da9030_set_ldo14_voltage(struct regulator_dev *rdev,</div><div class='add'>+				  int min_uV, int max_uV)</div><div class='add'>+{</div><div class='add'>+	struct da903x_regulator_info *info = rdev_get_drvdata(rdev);</div><div class='add'>+	struct device *da903x_dev = rdev_get_dev(rdev)-&gt;parent;</div><div class='add'>+	uint8_t val, mask;</div><div class='add'>+	int thresh;</div><div class='add'>+</div><div class='add'>+	if (check_range(info, min_uV, max_uV)) {</div><div class='add'>+		pr_err("invalid voltage range (%d, %d) uV", min_uV, max_uV);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	thresh = (info-&gt;max_uV + info-&gt;min_uV) / 2;</div><div class='add'>+	if (min_uV &lt; thresh) {</div><div class='add'>+		val = (thresh - min_uV + info-&gt;step_uV - 1) / info-&gt;step_uV;</div><div class='add'>+		val |= 0x4;</div><div class='add'>+	} else {</div><div class='add'>+		val = (min_uV - thresh + info-&gt;step_uV - 1) / info-&gt;step_uV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	val &lt;&lt;= info-&gt;vol_shift;</div><div class='add'>+	mask = ((1 &lt;&lt; info-&gt;vol_nbits) - 1)  &lt;&lt; info-&gt;vol_shift;</div><div class='add'>+</div><div class='add'>+	return da903x_update(da903x_dev, info-&gt;vol_reg, val, mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int da9030_get_ldo14_voltage(struct regulator_dev *rdev)</div><div class='add'>+{</div><div class='add'>+	struct da903x_regulator_info *info = rdev_get_drvdata(rdev);</div><div class='add'>+	struct device *da903x_dev = rdev_get_dev(rdev)-&gt;parent;</div><div class='add'>+	uint8_t val, mask;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = da903x_read(da903x_dev, info-&gt;vol_reg, &amp;val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	mask = ((1 &lt;&lt; info-&gt;vol_nbits) - 1)  &lt;&lt; info-&gt;vol_shift;</div><div class='add'>+	val = (val &amp; mask) &gt;&gt; info-&gt;vol_shift;</div><div class='add'>+</div><div class='add'>+	if (val &amp; 0x4)</div><div class='add'>+		return info-&gt;min_uV + info-&gt;step_uV * (3 - (val &amp; ~0x4));</div><div class='add'>+	else</div><div class='add'>+		return (info-&gt;max_uV + info-&gt;min_uV) / 2 +</div><div class='add'>+			info-&gt;step_uV * (val &amp; ~0x4);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* DA9034 specific operations */</div><div class='add'>+static int da9034_set_dvc_voltage(struct regulator_dev *rdev,</div><div class='add'>+				  int min_uV, int max_uV)</div><div class='add'>+{</div><div class='add'>+	struct da903x_regulator_info *info = rdev_get_drvdata(rdev);</div><div class='add'>+	struct device *da9034_dev = rdev_get_dev(rdev)-&gt;parent;</div><div class='add'>+	uint8_t val, mask;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (check_range(info, min_uV, max_uV)) {</div><div class='add'>+		pr_err("invalid voltage range (%d, %d) uV", min_uV, max_uV);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	val = (min_uV - info-&gt;min_uV + info-&gt;step_uV - 1) / info-&gt;step_uV;</div><div class='add'>+	val &lt;&lt;= info-&gt;vol_shift;</div><div class='add'>+	mask = ((1 &lt;&lt; info-&gt;vol_nbits) - 1)  &lt;&lt; info-&gt;vol_shift;</div><div class='add'>+</div><div class='add'>+	ret = da903x_update(da9034_dev, info-&gt;vol_reg, val, mask);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = da903x_set_bits(da9034_dev, info-&gt;update_reg,</div><div class='add'>+					1 &lt;&lt; info-&gt;update_bit);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int da9034_set_ldo12_voltage(struct regulator_dev *rdev,</div><div class='add'>+				    int min_uV, int max_uV)</div><div class='add'>+{</div><div class='add'>+	struct da903x_regulator_info *info = rdev_get_drvdata(rdev);</div><div class='add'>+	struct device *da9034_dev = rdev_get_dev(rdev)-&gt;parent;</div><div class='add'>+	uint8_t val, mask;</div><div class='add'>+</div><div class='add'>+	if (check_range(info, min_uV, max_uV)) {</div><div class='add'>+		pr_err("invalid voltage range (%d, %d) uV", min_uV, max_uV);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	val = (min_uV - info-&gt;min_uV + info-&gt;step_uV - 1) / info-&gt;step_uV;</div><div class='add'>+	val = (val &gt; 7 || val &lt; 20) ? 8 : val - 12;</div><div class='add'>+	val &lt;&lt;= info-&gt;vol_shift;</div><div class='add'>+	mask = ((1 &lt;&lt; info-&gt;vol_nbits) - 1)  &lt;&lt; info-&gt;vol_shift;</div><div class='add'>+</div><div class='add'>+	return da903x_update(da9034_dev, info-&gt;vol_reg, val, mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int da9034_get_ldo12_voltage(struct regulator_dev *rdev)</div><div class='add'>+{</div><div class='add'>+	struct da903x_regulator_info *info = rdev_get_drvdata(rdev);</div><div class='add'>+	struct device *da9034_dev = rdev_get_dev(rdev)-&gt;parent;</div><div class='add'>+	uint8_t val, mask;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = da903x_read(da9034_dev, info-&gt;vol_reg, &amp;val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	mask = ((1 &lt;&lt; info-&gt;vol_nbits) - 1)  &lt;&lt; info-&gt;vol_shift;</div><div class='add'>+	val = (val &amp; mask) &gt;&gt; info-&gt;vol_shift;</div><div class='add'>+</div><div class='add'>+	if (val &gt;= 8)</div><div class='add'>+		return 2700000 + info-&gt;step_uV * (val - 8);</div><div class='add'>+</div><div class='add'>+	return info-&gt;min_uV + info-&gt;step_uV * val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct regulator_ops da903x_regulator_ldo_ops = {</div><div class='add'>+	.set_voltage	= da903x_set_ldo_voltage,</div><div class='add'>+	.get_voltage	= da903x_get_voltage,</div><div class='add'>+	.enable		= da903x_enable,</div><div class='add'>+	.disable	= da903x_disable,</div><div class='add'>+	.is_enabled	= da903x_is_enabled,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* NOTE: this is dedicated for the insane DA9030 LDO14 */</div><div class='add'>+static struct regulator_ops da9030_regulator_ldo14_ops = {</div><div class='add'>+	.set_voltage	= da9030_set_ldo14_voltage,</div><div class='add'>+	.get_voltage	= da9030_get_ldo14_voltage,</div><div class='add'>+	.enable		= da903x_enable,</div><div class='add'>+	.disable	= da903x_disable,</div><div class='add'>+	.is_enabled	= da903x_is_enabled,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* NOTE: this is dedicated for the DA9030 LDO1 and LDO15 that have locks  */</div><div class='add'>+static struct regulator_ops da9030_regulator_ldo1_15_ops = {</div><div class='add'>+	.set_voltage	= da9030_set_ldo1_15_voltage,</div><div class='add'>+	.get_voltage	= da903x_get_voltage,</div><div class='add'>+	.enable		= da903x_enable,</div><div class='add'>+	.disable	= da903x_disable,</div><div class='add'>+	.is_enabled	= da903x_is_enabled,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct regulator_ops da9034_regulator_dvc_ops = {</div><div class='add'>+	.set_voltage	= da9034_set_dvc_voltage,</div><div class='add'>+	.get_voltage	= da903x_get_voltage,</div><div class='add'>+	.enable		= da903x_enable,</div><div class='add'>+	.disable	= da903x_disable,</div><div class='add'>+	.is_enabled	= da903x_is_enabled,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* NOTE: this is dedicated for the insane LDO12 */</div><div class='add'>+static struct regulator_ops da9034_regulator_ldo12_ops = {</div><div class='add'>+	.set_voltage	= da9034_set_ldo12_voltage,</div><div class='add'>+	.get_voltage	= da9034_get_ldo12_voltage,</div><div class='add'>+	.enable		= da903x_enable,</div><div class='add'>+	.disable	= da903x_disable,</div><div class='add'>+	.is_enabled	= da903x_is_enabled,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define DA903x_LDO(_pmic, _id, min, max, step, vreg, shift, nbits, ereg, ebit)	\</div><div class='add'>+{									\</div><div class='add'>+	.desc	= {							\</div><div class='add'>+		.name	= "LDO" #_id,					\</div><div class='add'>+		.ops	= &amp;da903x_regulator_ldo_ops,			\</div><div class='add'>+		.type	= REGULATOR_VOLTAGE,				\</div><div class='add'>+		.id	= _pmic##_ID_LDO##_id,				\</div><div class='add'>+		.owner	= THIS_MODULE,					\</div><div class='add'>+	},								\</div><div class='add'>+	.min_uV		= (min) * 1000,					\</div><div class='add'>+	.max_uV		= (max) * 1000,					\</div><div class='add'>+	.step_uV	= (step) * 1000,				\</div><div class='add'>+	.vol_reg	= _pmic##_##vreg,				\</div><div class='add'>+	.vol_shift	= (shift),					\</div><div class='add'>+	.vol_nbits	= (nbits),					\</div><div class='add'>+	.enable_reg	= _pmic##_##ereg,				\</div><div class='add'>+	.enable_bit	= (ebit),					\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define DA9034_DVC(_id, min, max, step, vreg, nbits, ureg, ubit, ereg, ebit) \</div><div class='add'>+{									\</div><div class='add'>+	.desc	= {							\</div><div class='add'>+		.name	= #_id,						\</div><div class='add'>+		.ops	= &amp;da9034_regulator_dvc_ops,			\</div><div class='add'>+		.type	= REGULATOR_VOLTAGE,				\</div><div class='add'>+		.id	= DA9034_ID_##_id,				\</div><div class='add'>+		.owner	= THIS_MODULE,					\</div><div class='add'>+	},								\</div><div class='add'>+	.min_uV		= (min) * 1000,					\</div><div class='add'>+	.max_uV		= (max) * 1000,					\</div><div class='add'>+	.step_uV	= (step) * 1000,				\</div><div class='add'>+	.vol_reg	= DA9034_##vreg,				\</div><div class='add'>+	.vol_shift	= (0),						\</div><div class='add'>+	.vol_nbits	= (nbits),					\</div><div class='add'>+	.update_reg	= DA9034_##ureg,				\</div><div class='add'>+	.update_bit	= (ubit),					\</div><div class='add'>+	.enable_reg	= DA9034_##ereg,				\</div><div class='add'>+	.enable_bit	= (ebit),					\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define DA9034_LDO(_id, min, max, step, vreg, shift, nbits, ereg, ebit)	\</div><div class='add'>+	DA903x_LDO(DA9034, _id, min, max, step, vreg, shift, nbits, ereg, ebit)</div><div class='add'>+</div><div class='add'>+#define DA9030_LDO(_id, min, max, step, vreg, shift, nbits, ereg, ebit)	\</div><div class='add'>+	DA903x_LDO(DA9030, _id, min, max, step, vreg, shift, nbits, ereg, ebit)</div><div class='add'>+</div><div class='add'>+static struct da903x_regulator_info da903x_regulator_info[] = {</div><div class='add'>+	/* DA9030 */</div><div class='add'>+	DA9030_LDO( 1, 1200, 3200, 100,    LDO1, 0, 5, RCTL12, 1),</div><div class='add'>+	DA9030_LDO( 2, 1800, 3200, 100,   LDO23, 0, 4, RCTL12, 2),</div><div class='add'>+	DA9030_LDO( 3, 1800, 3200, 100,   LDO23, 4, 4, RCTL12, 3),</div><div class='add'>+	DA9030_LDO( 4, 1800, 3200, 100,   LDO45, 0, 4, RCTL12, 4),</div><div class='add'>+	DA9030_LDO( 5, 1800, 3200, 100,   LDO45, 4, 4, RCTL12, 5),</div><div class='add'>+	DA9030_LDO( 6, 1800, 3200, 100,    LDO6, 0, 4, RCTL12, 6),</div><div class='add'>+	DA9030_LDO( 7, 1800, 3200, 100,   LDO78, 0, 4, RCTL12, 7),</div><div class='add'>+	DA9030_LDO( 8, 1800, 3200, 100,   LDO78, 4, 4, RCTL22, 0),</div><div class='add'>+	DA9030_LDO( 9, 1800, 3200, 100,  LDO912, 0, 4, RCTL22, 1),</div><div class='add'>+	DA9030_LDO(10, 1800, 3200, 100, LDO1011, 0, 4, RCTL22, 2),</div><div class='add'>+	DA9030_LDO(11, 1800, 3200, 100, LDO1011, 4, 4, RCTL22, 3),</div><div class='add'>+	DA9030_LDO(12, 1800, 3200, 100,  LDO912, 4, 4, RCTL22, 4),</div><div class='add'>+	DA9030_LDO(14, 2760, 2940,  30, LDO1416, 0, 3, RCTL11, 4),</div><div class='add'>+	DA9030_LDO(15, 1100, 2650,  50,	  LDO15, 0, 5, RCTL11, 5),</div><div class='add'>+	DA9030_LDO(16, 1100, 2650,  50, LDO1416, 3, 5, RCTL11, 6),</div><div class='add'>+	DA9030_LDO(17, 1800, 3200, 100,   LDO17, 0, 4, RCTL11, 7),</div><div class='add'>+	DA9030_LDO(18, 1800, 3200, 100, LDO1819, 0, 4, RCTL21, 2),</div><div class='add'>+	DA9030_LDO(19, 1800, 3200, 100, LDO1819, 4, 4, RCTL21, 1),</div><div class='add'>+	DA9030_LDO(13, 2100, 2100, 0, INVAL, 0, 0, RCTL11, 3), /* fixed @2.1V */</div><div class='add'>+</div><div class='add'>+	/* DA9034 */</div><div class='add'>+	DA9034_DVC(BUCK1, 725, 1500, 25, ADTV1, 5, VCC1, 0, OVER1, 0),</div><div class='add'>+	DA9034_DVC(BUCK2, 725, 1500, 25, CDTV1, 5, VCC1, 2, OVER1, 1),</div><div class='add'>+	DA9034_DVC(LDO2,  725, 1500, 25, SDTV1, 5, VCC1, 4, OVER1, 2),</div><div class='add'>+	DA9034_DVC(LDO1, 1700, 2075, 25, MDTV1, 4, VCC1, 6, OVER3, 4),</div><div class='add'>+</div><div class='add'>+	DA9034_LDO( 3, 1800, 3300, 100,  LDO643, 0, 4, OVER3, 5),</div><div class='add'>+	DA9034_LDO( 4, 1800, 2900,1100,  LDO643, 4, 1, OVER3, 6),</div><div class='add'>+	DA9034_LDO( 6, 2500, 2850,  50,  LDO643, 5, 3, OVER2, 0),</div><div class='add'>+	DA9034_LDO( 7, 2700, 3050,  50,  LDO987, 0, 3, OVER2, 1),</div><div class='add'>+	DA9034_LDO( 8, 2700, 2850,  50,  LDO987, 3, 2, OVER2, 2),</div><div class='add'>+	DA9034_LDO( 9, 2700, 3050,  50,  LDO987, 5, 3, OVER2, 3),</div><div class='add'>+	DA9034_LDO(10, 2700, 3050,  50, LDO1110, 0, 3, OVER2, 4),</div><div class='add'>+	DA9034_LDO(11, 1800, 3300, 100, LDO1110, 4, 4, OVER2, 5),</div><div class='add'>+	DA9034_LDO(12, 1700, 3050,  50, LDO1312, 0, 4, OVER3, 6),</div><div class='add'>+	DA9034_LDO(13, 1800, 3300, 100, LDO1312, 4, 4, OVER2, 7),</div><div class='add'>+	DA9034_LDO(14, 1800, 3300, 100, LDO1514, 0, 4, OVER3, 0),</div><div class='add'>+	DA9034_LDO(15, 1800, 3300, 100, LDO1514, 4, 4, OVER3, 1),</div><div class='add'>+	DA9034_LDO(5, 3100, 3100, 0, INVAL, 0, 0, OVER3, 7), /* fixed @3.1V */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline struct da903x_regulator_info *find_regulator_info(int id)</div><div class='add'>+{</div><div class='add'>+	struct da903x_regulator_info *ri;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(da903x_regulator_info); i++) {</div><div class='add'>+		ri = &amp;da903x_regulator_info[i];</div><div class='add'>+		if (ri-&gt;desc.id == id)</div><div class='add'>+			return ri;</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devinit da903x_regulator_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct da903x_regulator_info *ri = NULL;</div><div class='add'>+	struct regulator_dev *rdev;</div><div class='add'>+</div><div class='add'>+	ri = find_regulator_info(pdev-&gt;id);</div><div class='add'>+	if (ri == NULL) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "invalid regulator ID specified\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Workaround for the weird LDO12 voltage setting */</div><div class='add'>+	if (ri-&gt;desc.id == DA9034_ID_LDO12)</div><div class='add'>+		ri-&gt;desc.ops = &amp;da9034_regulator_ldo12_ops;</div><div class='add'>+</div><div class='add'>+	if (ri-&gt;desc.id == DA9030_ID_LDO14)</div><div class='add'>+		ri-&gt;desc.ops = &amp;da9030_regulator_ldo14_ops;</div><div class='add'>+</div><div class='add'>+	if (ri-&gt;desc.id == DA9030_ID_LDO1 || ri-&gt;desc.id == DA9030_ID_LDO15)</div><div class='add'>+		ri-&gt;desc.ops = &amp;da9030_regulator_ldo1_15_ops;</div><div class='add'>+</div><div class='add'>+	rdev = regulator_register(&amp;ri-&gt;desc, pdev-&gt;dev.parent, ri);</div><div class='add'>+	if (IS_ERR(rdev)) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "failed to register regulator %s\n",</div><div class='add'>+				ri-&gt;desc.name);</div><div class='add'>+		return PTR_ERR(rdev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	platform_set_drvdata(pdev, rdev);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devexit da903x_regulator_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct regulator_dev *rdev = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	regulator_unregister(rdev);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct platform_driver da903x_regulator_driver = {</div><div class='add'>+	.driver	= {</div><div class='add'>+		.name	= "da903x-regulator",</div><div class='add'>+		.owner	= THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+	.probe		= da903x_regulator_probe,</div><div class='add'>+	.remove		= da903x_regulator_remove,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init da903x_regulator_init(void)</div><div class='add'>+{</div><div class='add'>+	return platform_driver_register(&amp;da903x_regulator_driver);</div><div class='add'>+}</div><div class='add'>+module_init(da903x_regulator_init);</div><div class='add'>+</div><div class='add'>+static void __exit da903x_regulator_exit(void)</div><div class='add'>+{</div><div class='add'>+	platform_driver_unregister(&amp;da903x_regulator_driver);</div><div class='add'>+}</div><div class='add'>+module_exit(da903x_regulator_exit);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_AUTHOR("Eric Miao &lt;eric.miao@marvell.com&gt;"</div><div class='add'>+	      "Mike Rapoport &lt;mike@compulab.co.il&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Regulator Driver for Dialog Semiconductor DA903X PMIC");</div><div class='add'>+MODULE_ALIAS("platform:da903x-regulator");</div><div class='head'>diff --git a/drivers/regulator/wm8350-regulator.c b/drivers/regulator/wm8350-regulator.c<br/>new file mode 100644<br/>index 000000000000..1f44b17e23b1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/regulator/wm8350-regulator.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/regulator/wm8350-regulator.c</a></div><div class='hunk'>@@ -0,0 +1,1431 @@</div><div class='add'>+/*</div><div class='add'>+ * wm8350.c  --  Voltage and current regulation for the Wolfson WM8350 PMIC</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2007, 2008 Wolfson Microelectronics PLC.</div><div class='add'>+ *</div><div class='add'>+ * Author: Liam Girdwood</div><div class='add'>+ *         linux@wolfsonmicro.com</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute  it and/or modify it</div><div class='add'>+ *  under  the terms of  the GNU General  Public License as published by the</div><div class='add'>+ *  Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='add'>+ *  option) any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/bitops.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/mfd/wm8350/core.h&gt;</div><div class='add'>+#include &lt;linux/mfd/wm8350/pmic.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/regulator/driver.h&gt;</div><div class='add'>+#include &lt;linux/regulator/machine.h&gt;</div><div class='add'>+</div><div class='add'>+/* Microamps */</div><div class='add'>+static const int isink_cur[] = {</div><div class='add'>+	4,</div><div class='add'>+	5,</div><div class='add'>+	6,</div><div class='add'>+	7,</div><div class='add'>+	8,</div><div class='add'>+	10,</div><div class='add'>+	11,</div><div class='add'>+	14,</div><div class='add'>+	16,</div><div class='add'>+	19,</div><div class='add'>+	23,</div><div class='add'>+	27,</div><div class='add'>+	32,</div><div class='add'>+	39,</div><div class='add'>+	46,</div><div class='add'>+	54,</div><div class='add'>+	65,</div><div class='add'>+	77,</div><div class='add'>+	92,</div><div class='add'>+	109,</div><div class='add'>+	130,</div><div class='add'>+	154,</div><div class='add'>+	183,</div><div class='add'>+	218,</div><div class='add'>+	259,</div><div class='add'>+	308,</div><div class='add'>+	367,</div><div class='add'>+	436,</div><div class='add'>+	518,</div><div class='add'>+	616,</div><div class='add'>+	733,</div><div class='add'>+	872,</div><div class='add'>+	1037,</div><div class='add'>+	1233,</div><div class='add'>+	1466,</div><div class='add'>+	1744,</div><div class='add'>+	2073,</div><div class='add'>+	2466,</div><div class='add'>+	2933,</div><div class='add'>+	3487,</div><div class='add'>+	4147,</div><div class='add'>+	4932,</div><div class='add'>+	5865,</div><div class='add'>+	6975,</div><div class='add'>+	8294,</div><div class='add'>+	9864,</div><div class='add'>+	11730,</div><div class='add'>+	13949,</div><div class='add'>+	16589,</div><div class='add'>+	19728,</div><div class='add'>+	23460,</div><div class='add'>+	27899,</div><div class='add'>+	33178,</div><div class='add'>+	39455,</div><div class='add'>+	46920,</div><div class='add'>+	55798,</div><div class='add'>+	66355,</div><div class='add'>+	78910,</div><div class='add'>+	93840,</div><div class='add'>+	111596,</div><div class='add'>+	132710,</div><div class='add'>+	157820,</div><div class='add'>+	187681,</div><div class='add'>+	223191</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int get_isink_val(int min_uA, int max_uA, u16 *setting)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = ARRAY_SIZE(isink_cur) - 1; i &gt;= 0; i--) {</div><div class='add'>+		if (min_uA &lt;= isink_cur[i] &amp;&amp; max_uA &gt;= isink_cur[i]) {</div><div class='add'>+			*setting = i;</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int wm8350_ldo_val_to_mvolts(unsigned int val)</div><div class='add'>+{</div><div class='add'>+	if (val &lt; 16)</div><div class='add'>+		return (val * 50) + 900;</div><div class='add'>+	else</div><div class='add'>+		return ((val - 16) * 100) + 1800;</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned int wm8350_ldo_mvolts_to_val(int mV)</div><div class='add'>+{</div><div class='add'>+	if (mV &lt; 1800)</div><div class='add'>+		return (mV - 900) / 50;</div><div class='add'>+	else</div><div class='add'>+		return ((mV - 1800) / 100) + 16;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int wm8350_dcdc_val_to_mvolts(unsigned int val)</div><div class='add'>+{</div><div class='add'>+	return (val * 25) + 850;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned int wm8350_dcdc_mvolts_to_val(int mV)</div><div class='add'>+{</div><div class='add'>+	return (mV - 850) / 25;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wm8350_isink_set_current(struct regulator_dev *rdev, int min_uA,</div><div class='add'>+	int max_uA)</div><div class='add'>+{</div><div class='add'>+	struct wm8350 *wm8350 = rdev_get_drvdata(rdev);</div><div class='add'>+	int isink = rdev_get_id(rdev);</div><div class='add'>+	u16 val, setting;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = get_isink_val(min_uA, max_uA, &amp;setting);</div><div class='add'>+	if (ret != 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	switch (isink) {</div><div class='add'>+	case WM8350_ISINK_A:</div><div class='add'>+		val = wm8350_reg_read(wm8350, WM8350_CURRENT_SINK_DRIVER_A) &amp;</div><div class='add'>+		    ~WM8350_CS1_ISEL_MASK;</div><div class='add'>+		wm8350_reg_write(wm8350, WM8350_CURRENT_SINK_DRIVER_A,</div><div class='add'>+				 val | setting);</div><div class='add'>+		break;</div><div class='add'>+	case WM8350_ISINK_B:</div><div class='add'>+		val = wm8350_reg_read(wm8350, WM8350_CURRENT_SINK_DRIVER_B) &amp;</div><div class='add'>+		    ~WM8350_CS1_ISEL_MASK;</div><div class='add'>+		wm8350_reg_write(wm8350, WM8350_CURRENT_SINK_DRIVER_B,</div><div class='add'>+				 val | setting);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wm8350_isink_get_current(struct regulator_dev *rdev)</div><div class='add'>+{</div><div class='add'>+	struct wm8350 *wm8350 = rdev_get_drvdata(rdev);</div><div class='add'>+	int isink = rdev_get_id(rdev);</div><div class='add'>+	u16 val;</div><div class='add'>+</div><div class='add'>+	switch (isink) {</div><div class='add'>+	case WM8350_ISINK_A:</div><div class='add'>+		val = wm8350_reg_read(wm8350, WM8350_CURRENT_SINK_DRIVER_A) &amp;</div><div class='add'>+		    WM8350_CS1_ISEL_MASK;</div><div class='add'>+		break;</div><div class='add'>+	case WM8350_ISINK_B:</div><div class='add'>+		val = wm8350_reg_read(wm8350, WM8350_CURRENT_SINK_DRIVER_B) &amp;</div><div class='add'>+		    WM8350_CS1_ISEL_MASK;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return (isink_cur[val] + 50) / 100;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* turn on ISINK followed by DCDC */</div><div class='add'>+static int wm8350_isink_enable(struct regulator_dev *rdev)</div><div class='add'>+{</div><div class='add'>+	struct wm8350 *wm8350 = rdev_get_drvdata(rdev);</div><div class='add'>+	int isink = rdev_get_id(rdev);</div><div class='add'>+</div><div class='add'>+	switch (isink) {</div><div class='add'>+	case WM8350_ISINK_A:</div><div class='add'>+		switch (wm8350-&gt;pmic.isink_A_dcdc) {</div><div class='add'>+		case WM8350_DCDC_2:</div><div class='add'>+		case WM8350_DCDC_5:</div><div class='add'>+			wm8350_set_bits(wm8350, WM8350_POWER_MGMT_7,</div><div class='add'>+					WM8350_CS1_ENA);</div><div class='add'>+			wm8350_set_bits(wm8350, WM8350_CSA_FLASH_CONTROL,</div><div class='add'>+					WM8350_CS1_DRIVE);</div><div class='add'>+			wm8350_set_bits(wm8350, WM8350_DCDC_LDO_REQUESTED,</div><div class='add'>+					1 &lt;&lt; (wm8350-&gt;pmic.isink_A_dcdc -</div><div class='add'>+					      WM8350_DCDC_1));</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case WM8350_ISINK_B:</div><div class='add'>+		switch (wm8350-&gt;pmic.isink_B_dcdc) {</div><div class='add'>+		case WM8350_DCDC_2:</div><div class='add'>+		case WM8350_DCDC_5:</div><div class='add'>+			wm8350_set_bits(wm8350, WM8350_POWER_MGMT_7,</div><div class='add'>+					WM8350_CS2_ENA);</div><div class='add'>+			wm8350_set_bits(wm8350, WM8350_CSB_FLASH_CONTROL,</div><div class='add'>+					WM8350_CS2_DRIVE);</div><div class='add'>+			wm8350_set_bits(wm8350, WM8350_DCDC_LDO_REQUESTED,</div><div class='add'>+					1 &lt;&lt; (wm8350-&gt;pmic.isink_B_dcdc -</div><div class='add'>+					      WM8350_DCDC_1));</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wm8350_isink_disable(struct regulator_dev *rdev)</div><div class='add'>+{</div><div class='add'>+	struct wm8350 *wm8350 = rdev_get_drvdata(rdev);</div><div class='add'>+	int isink = rdev_get_id(rdev);</div><div class='add'>+</div><div class='add'>+	switch (isink) {</div><div class='add'>+	case WM8350_ISINK_A:</div><div class='add'>+		switch (wm8350-&gt;pmic.isink_A_dcdc) {</div><div class='add'>+		case WM8350_DCDC_2:</div><div class='add'>+		case WM8350_DCDC_5:</div><div class='add'>+			wm8350_clear_bits(wm8350, WM8350_DCDC_LDO_REQUESTED,</div><div class='add'>+					  1 &lt;&lt; (wm8350-&gt;pmic.isink_A_dcdc -</div><div class='add'>+						WM8350_DCDC_1));</div><div class='add'>+			wm8350_clear_bits(wm8350, WM8350_POWER_MGMT_7,</div><div class='add'>+					  WM8350_CS1_ENA);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case WM8350_ISINK_B:</div><div class='add'>+		switch (wm8350-&gt;pmic.isink_B_dcdc) {</div><div class='add'>+		case WM8350_DCDC_2:</div><div class='add'>+		case WM8350_DCDC_5:</div><div class='add'>+			wm8350_clear_bits(wm8350, WM8350_DCDC_LDO_REQUESTED,</div><div class='add'>+					  1 &lt;&lt; (wm8350-&gt;pmic.isink_B_dcdc -</div><div class='add'>+						WM8350_DCDC_1));</div><div class='add'>+			wm8350_clear_bits(wm8350, WM8350_POWER_MGMT_7,</div><div class='add'>+					  WM8350_CS2_ENA);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wm8350_isink_is_enabled(struct regulator_dev *rdev)</div><div class='add'>+{</div><div class='add'>+	struct wm8350 *wm8350 = rdev_get_drvdata(rdev);</div><div class='add'>+	int isink = rdev_get_id(rdev);</div><div class='add'>+</div><div class='add'>+	switch (isink) {</div><div class='add'>+	case WM8350_ISINK_A:</div><div class='add'>+		return wm8350_reg_read(wm8350, WM8350_CURRENT_SINK_DRIVER_A) &amp;</div><div class='add'>+		    0x8000;</div><div class='add'>+	case WM8350_ISINK_B:</div><div class='add'>+		return wm8350_reg_read(wm8350, WM8350_CURRENT_SINK_DRIVER_B) &amp;</div><div class='add'>+		    0x8000;</div><div class='add'>+	}</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int wm8350_isink_set_flash(struct wm8350 *wm8350, int isink, u16 mode,</div><div class='add'>+			   u16 trigger, u16 duration, u16 on_ramp, u16 off_ramp,</div><div class='add'>+			   u16 drive)</div><div class='add'>+{</div><div class='add'>+	switch (isink) {</div><div class='add'>+	case WM8350_ISINK_A:</div><div class='add'>+		wm8350_reg_write(wm8350, WM8350_CSA_FLASH_CONTROL,</div><div class='add'>+				 (mode ? WM8350_CS1_FLASH_MODE : 0) |</div><div class='add'>+				 (trigger ? WM8350_CS1_TRIGSRC : 0) |</div><div class='add'>+				 duration | on_ramp | off_ramp | drive);</div><div class='add'>+		break;</div><div class='add'>+	case WM8350_ISINK_B:</div><div class='add'>+		wm8350_reg_write(wm8350, WM8350_CSB_FLASH_CONTROL,</div><div class='add'>+				 (mode ? WM8350_CS2_FLASH_MODE : 0) |</div><div class='add'>+				 (trigger ? WM8350_CS2_TRIGSRC : 0) |</div><div class='add'>+				 duration | on_ramp | off_ramp | drive);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(wm8350_isink_set_flash);</div><div class='add'>+</div><div class='add'>+static int wm8350_dcdc_set_voltage(struct regulator_dev *rdev, int min_uV,</div><div class='add'>+	int max_uV)</div><div class='add'>+{</div><div class='add'>+	struct wm8350 *wm8350 = rdev_get_drvdata(rdev);</div><div class='add'>+	int volt_reg, dcdc = rdev_get_id(rdev), mV,</div><div class='add'>+		min_mV = min_uV / 1000, max_mV = max_uV / 1000;</div><div class='add'>+	u16 val;</div><div class='add'>+</div><div class='add'>+	if (min_mV &lt; 850 || min_mV &gt; 4025)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (max_mV &lt; 850 || max_mV &gt; 4025)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* step size is 25mV */</div><div class='add'>+	mV = (min_mV - 826) / 25;</div><div class='add'>+	if (wm8350_dcdc_val_to_mvolts(mV) &gt; max_mV)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	BUG_ON(wm8350_dcdc_val_to_mvolts(mV) &lt; min_mV);</div><div class='add'>+</div><div class='add'>+	switch (dcdc) {</div><div class='add'>+	case WM8350_DCDC_1:</div><div class='add'>+		volt_reg = WM8350_DCDC1_CONTROL;</div><div class='add'>+		break;</div><div class='add'>+	case WM8350_DCDC_3:</div><div class='add'>+		volt_reg = WM8350_DCDC3_CONTROL;</div><div class='add'>+		break;</div><div class='add'>+	case WM8350_DCDC_4:</div><div class='add'>+		volt_reg = WM8350_DCDC4_CONTROL;</div><div class='add'>+		break;</div><div class='add'>+	case WM8350_DCDC_6:</div><div class='add'>+		volt_reg = WM8350_DCDC6_CONTROL;</div><div class='add'>+		break;</div><div class='add'>+	case WM8350_DCDC_2:</div><div class='add'>+	case WM8350_DCDC_5:</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* all DCDCs have same mV bits */</div><div class='add'>+	val = wm8350_reg_read(wm8350, volt_reg) &amp; ~WM8350_DC1_VSEL_MASK;</div><div class='add'>+	wm8350_reg_write(wm8350, volt_reg, val | mV);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wm8350_dcdc_get_voltage(struct regulator_dev *rdev)</div><div class='add'>+{</div><div class='add'>+	struct wm8350 *wm8350 = rdev_get_drvdata(rdev);</div><div class='add'>+	int volt_reg, dcdc = rdev_get_id(rdev);</div><div class='add'>+	u16 val;</div><div class='add'>+</div><div class='add'>+	switch (dcdc) {</div><div class='add'>+	case WM8350_DCDC_1:</div><div class='add'>+		volt_reg = WM8350_DCDC1_CONTROL;</div><div class='add'>+		break;</div><div class='add'>+	case WM8350_DCDC_3:</div><div class='add'>+		volt_reg = WM8350_DCDC3_CONTROL;</div><div class='add'>+		break;</div><div class='add'>+	case WM8350_DCDC_4:</div><div class='add'>+		volt_reg = WM8350_DCDC4_CONTROL;</div><div class='add'>+		break;</div><div class='add'>+	case WM8350_DCDC_6:</div><div class='add'>+		volt_reg = WM8350_DCDC6_CONTROL;</div><div class='add'>+		break;</div><div class='add'>+	case WM8350_DCDC_2:</div><div class='add'>+	case WM8350_DCDC_5:</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* all DCDCs have same mV bits */</div><div class='add'>+	val = wm8350_reg_read(wm8350, volt_reg) &amp; WM8350_DC1_VSEL_MASK;</div><div class='add'>+	return wm8350_dcdc_val_to_mvolts(val) * 1000;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wm8350_dcdc_set_suspend_voltage(struct regulator_dev *rdev, int uV)</div><div class='add'>+{</div><div class='add'>+	struct wm8350 *wm8350 = rdev_get_drvdata(rdev);</div><div class='add'>+	int volt_reg, mV = uV / 1000, dcdc = rdev_get_id(rdev);</div><div class='add'>+	u16 val;</div><div class='add'>+</div><div class='add'>+	dev_dbg(wm8350-&gt;dev, "%s %d mV %d\n", __func__, dcdc, mV);</div><div class='add'>+</div><div class='add'>+	if (mV &amp;&amp; (mV &lt; 850 || mV &gt; 4025)) {</div><div class='add'>+		dev_err(wm8350-&gt;dev,</div><div class='add'>+			"DCDC%d suspend voltage %d mV out of range\n",</div><div class='add'>+			dcdc, mV);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (mV == 0)</div><div class='add'>+		mV = 850;</div><div class='add'>+</div><div class='add'>+	switch (dcdc) {</div><div class='add'>+	case WM8350_DCDC_1:</div><div class='add'>+		volt_reg = WM8350_DCDC1_LOW_POWER;</div><div class='add'>+		break;</div><div class='add'>+	case WM8350_DCDC_3:</div><div class='add'>+		volt_reg = WM8350_DCDC3_LOW_POWER;</div><div class='add'>+		break;</div><div class='add'>+	case WM8350_DCDC_4:</div><div class='add'>+		volt_reg = WM8350_DCDC4_LOW_POWER;</div><div class='add'>+		break;</div><div class='add'>+	case WM8350_DCDC_6:</div><div class='add'>+		volt_reg = WM8350_DCDC6_LOW_POWER;</div><div class='add'>+		break;</div><div class='add'>+	case WM8350_DCDC_2:</div><div class='add'>+	case WM8350_DCDC_5:</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* all DCDCs have same mV bits */</div><div class='add'>+	val = wm8350_reg_read(wm8350, volt_reg) &amp; ~WM8350_DC1_VSEL_MASK;</div><div class='add'>+	wm8350_reg_write(wm8350, volt_reg,</div><div class='add'>+			 val | wm8350_dcdc_mvolts_to_val(mV));</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wm8350_dcdc_set_suspend_enable(struct regulator_dev *rdev)</div><div class='add'>+{</div><div class='add'>+	struct wm8350 *wm8350 = rdev_get_drvdata(rdev);</div><div class='add'>+	int dcdc = rdev_get_id(rdev);</div><div class='add'>+	u16 val;</div><div class='add'>+</div><div class='add'>+	switch (dcdc) {</div><div class='add'>+	case WM8350_DCDC_1:</div><div class='add'>+		val = wm8350_reg_read(wm8350, WM8350_DCDC1_LOW_POWER)</div><div class='add'>+			&amp; ~WM8350_DCDC_HIB_MODE_MASK;</div><div class='add'>+		wm8350_reg_write(wm8350, WM8350_DCDC1_LOW_POWER,</div><div class='add'>+			wm8350-&gt;pmic.dcdc1_hib_mode);</div><div class='add'>+		break;</div><div class='add'>+	case WM8350_DCDC_3:</div><div class='add'>+		val = wm8350_reg_read(wm8350, WM8350_DCDC3_LOW_POWER)</div><div class='add'>+			&amp; ~WM8350_DCDC_HIB_MODE_MASK;</div><div class='add'>+		wm8350_reg_write(wm8350, WM8350_DCDC3_LOW_POWER,</div><div class='add'>+			wm8350-&gt;pmic.dcdc3_hib_mode);</div><div class='add'>+		break;</div><div class='add'>+	case WM8350_DCDC_4:</div><div class='add'>+		val = wm8350_reg_read(wm8350, WM8350_DCDC4_LOW_POWER)</div><div class='add'>+			&amp; ~WM8350_DCDC_HIB_MODE_MASK;</div><div class='add'>+		wm8350_reg_write(wm8350, WM8350_DCDC4_LOW_POWER,</div><div class='add'>+			wm8350-&gt;pmic.dcdc4_hib_mode);</div><div class='add'>+		break;</div><div class='add'>+	case WM8350_DCDC_6:</div><div class='add'>+		val = wm8350_reg_read(wm8350, WM8350_DCDC6_LOW_POWER)</div><div class='add'>+			&amp; ~WM8350_DCDC_HIB_MODE_MASK;</div><div class='add'>+		wm8350_reg_write(wm8350, WM8350_DCDC6_LOW_POWER,</div><div class='add'>+			wm8350-&gt;pmic.dcdc6_hib_mode);</div><div class='add'>+		break;</div><div class='add'>+	case WM8350_DCDC_2:</div><div class='add'>+	case WM8350_DCDC_5:</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wm8350_dcdc_set_suspend_disable(struct regulator_dev *rdev)</div><div class='add'>+{</div><div class='add'>+	struct wm8350 *wm8350 = rdev_get_drvdata(rdev);</div><div class='add'>+	int dcdc = rdev_get_id(rdev);</div><div class='add'>+	u16 val;</div><div class='add'>+</div><div class='add'>+	switch (dcdc) {</div><div class='add'>+	case WM8350_DCDC_1:</div><div class='add'>+		val = wm8350_reg_read(wm8350, WM8350_DCDC1_LOW_POWER);</div><div class='add'>+		wm8350-&gt;pmic.dcdc1_hib_mode = val &amp; WM8350_DCDC_HIB_MODE_MASK;</div><div class='add'>+		wm8350_reg_write(wm8350, WM8350_DCDC1_LOW_POWER,</div><div class='add'>+			WM8350_DCDC_HIB_MODE_DIS);</div><div class='add'>+		break;</div><div class='add'>+	case WM8350_DCDC_3:</div><div class='add'>+		val = wm8350_reg_read(wm8350, WM8350_DCDC3_LOW_POWER);</div><div class='add'>+		wm8350-&gt;pmic.dcdc3_hib_mode = val &amp; WM8350_DCDC_HIB_MODE_MASK;</div><div class='add'>+		wm8350_reg_write(wm8350, WM8350_DCDC3_LOW_POWER,</div><div class='add'>+			WM8350_DCDC_HIB_MODE_DIS);</div><div class='add'>+		break;</div><div class='add'>+	case WM8350_DCDC_4:</div><div class='add'>+		val = wm8350_reg_read(wm8350, WM8350_DCDC4_LOW_POWER);</div><div class='add'>+		wm8350-&gt;pmic.dcdc4_hib_mode = val &amp; WM8350_DCDC_HIB_MODE_MASK;</div><div class='add'>+		wm8350_reg_write(wm8350, WM8350_DCDC4_LOW_POWER,</div><div class='add'>+			WM8350_DCDC_HIB_MODE_DIS);</div><div class='add'>+		break;</div><div class='add'>+	case WM8350_DCDC_6:</div><div class='add'>+		val = wm8350_reg_read(wm8350, WM8350_DCDC6_LOW_POWER);</div><div class='add'>+		wm8350-&gt;pmic.dcdc6_hib_mode = val &amp; WM8350_DCDC_HIB_MODE_MASK;</div><div class='add'>+		wm8350_reg_write(wm8350, WM8350_DCDC6_LOW_POWER,</div><div class='add'>+			WM8350_DCDC_HIB_MODE_DIS);</div><div class='add'>+		break;</div><div class='add'>+	case WM8350_DCDC_2:</div><div class='add'>+	case WM8350_DCDC_5:</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wm8350_dcdc25_set_suspend_enable(struct regulator_dev *rdev)</div><div class='add'>+{</div><div class='add'>+	struct wm8350 *wm8350 = rdev_get_drvdata(rdev);</div><div class='add'>+	int dcdc = rdev_get_id(rdev);</div><div class='add'>+	u16 val;</div><div class='add'>+</div><div class='add'>+	switch (dcdc) {</div><div class='add'>+	case WM8350_DCDC_2:</div><div class='add'>+		val = wm8350_reg_read(wm8350, WM8350_DCDC2_CONTROL)</div><div class='add'>+		    &amp; ~WM8350_DC2_HIB_MODE_MASK;</div><div class='add'>+		wm8350_reg_write(wm8350, WM8350_DCDC2_CONTROL, val |</div><div class='add'>+				 WM8350_DC2_HIB_MODE_ACTIVE);</div><div class='add'>+		break;</div><div class='add'>+	case WM8350_DCDC_5:</div><div class='add'>+		val = wm8350_reg_read(wm8350, WM8350_DCDC5_CONTROL)</div><div class='add'>+		    &amp; ~WM8350_DC2_HIB_MODE_MASK;</div><div class='add'>+		wm8350_reg_write(wm8350, WM8350_DCDC5_CONTROL, val |</div><div class='add'>+				 WM8350_DC5_HIB_MODE_ACTIVE);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wm8350_dcdc25_set_suspend_disable(struct regulator_dev *rdev)</div><div class='add'>+{</div><div class='add'>+	struct wm8350 *wm8350 = rdev_get_drvdata(rdev);</div><div class='add'>+	int dcdc = rdev_get_id(rdev);</div><div class='add'>+	u16 val;</div><div class='add'>+</div><div class='add'>+	switch (dcdc) {</div><div class='add'>+	case WM8350_DCDC_2:</div><div class='add'>+		val = wm8350_reg_read(wm8350, WM8350_DCDC2_CONTROL)</div><div class='add'>+		    &amp; ~WM8350_DC2_HIB_MODE_MASK;</div><div class='add'>+		wm8350_reg_write(wm8350, WM8350_DCDC2_CONTROL, val |</div><div class='add'>+				 WM8350_DC2_HIB_MODE_DISABLE);</div><div class='add'>+		break;</div><div class='add'>+	case WM8350_DCDC_5:</div><div class='add'>+		val = wm8350_reg_read(wm8350, WM8350_DCDC5_CONTROL)</div><div class='add'>+		    &amp; ~WM8350_DC2_HIB_MODE_MASK;</div><div class='add'>+		wm8350_reg_write(wm8350, WM8350_DCDC5_CONTROL, val |</div><div class='add'>+				 WM8350_DC2_HIB_MODE_DISABLE);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wm8350_dcdc_set_suspend_mode(struct regulator_dev *rdev,</div><div class='add'>+	unsigned int mode)</div><div class='add'>+{</div><div class='add'>+	struct wm8350 *wm8350 = rdev_get_drvdata(rdev);</div><div class='add'>+	int dcdc = rdev_get_id(rdev);</div><div class='add'>+	u16 *hib_mode;</div><div class='add'>+</div><div class='add'>+	switch (dcdc) {</div><div class='add'>+	case WM8350_DCDC_1:</div><div class='add'>+		hib_mode = &amp;wm8350-&gt;pmic.dcdc1_hib_mode;</div><div class='add'>+		break;</div><div class='add'>+	case WM8350_DCDC_3:</div><div class='add'>+		hib_mode = &amp;wm8350-&gt;pmic.dcdc3_hib_mode;</div><div class='add'>+		break;</div><div class='add'>+	case WM8350_DCDC_4:</div><div class='add'>+		hib_mode = &amp;wm8350-&gt;pmic.dcdc4_hib_mode;</div><div class='add'>+		break;</div><div class='add'>+	case WM8350_DCDC_6:</div><div class='add'>+		hib_mode = &amp;wm8350-&gt;pmic.dcdc6_hib_mode;</div><div class='add'>+		break;</div><div class='add'>+	case WM8350_DCDC_2:</div><div class='add'>+	case WM8350_DCDC_5:</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (mode) {</div><div class='add'>+	case REGULATOR_MODE_NORMAL:</div><div class='add'>+		*hib_mode = WM8350_DCDC_HIB_MODE_IMAGE;</div><div class='add'>+		break;</div><div class='add'>+	case REGULATOR_MODE_IDLE:</div><div class='add'>+		*hib_mode = WM8350_DCDC_HIB_MODE_STANDBY;</div><div class='add'>+		break;</div><div class='add'>+	case REGULATOR_MODE_STANDBY:</div><div class='add'>+		*hib_mode = WM8350_DCDC_HIB_MODE_LDO_IM;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wm8350_ldo_set_suspend_voltage(struct regulator_dev *rdev, int uV)</div><div class='add'>+{</div><div class='add'>+	struct wm8350 *wm8350 = rdev_get_drvdata(rdev);</div><div class='add'>+	int volt_reg, mV = uV / 1000, ldo = rdev_get_id(rdev);</div><div class='add'>+	u16 val;</div><div class='add'>+</div><div class='add'>+	dev_dbg(wm8350-&gt;dev, "%s %d mV %d\n", __func__, ldo, mV);</div><div class='add'>+</div><div class='add'>+	if (mV &lt; 900 || mV &gt; 3300) {</div><div class='add'>+		dev_err(wm8350-&gt;dev, "LDO%d voltage %d mV out of range\n",</div><div class='add'>+			ldo, mV);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (ldo) {</div><div class='add'>+	case WM8350_LDO_1:</div><div class='add'>+		volt_reg = WM8350_LDO1_LOW_POWER;</div><div class='add'>+		break;</div><div class='add'>+	case WM8350_LDO_2:</div><div class='add'>+		volt_reg = WM8350_LDO2_LOW_POWER;</div><div class='add'>+		break;</div><div class='add'>+	case WM8350_LDO_3:</div><div class='add'>+		volt_reg = WM8350_LDO3_LOW_POWER;</div><div class='add'>+		break;</div><div class='add'>+	case WM8350_LDO_4:</div><div class='add'>+		volt_reg = WM8350_LDO4_LOW_POWER;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* all LDOs have same mV bits */</div><div class='add'>+	val = wm8350_reg_read(wm8350, volt_reg) &amp; ~WM8350_LDO1_VSEL_MASK;</div><div class='add'>+	wm8350_reg_write(wm8350, volt_reg,</div><div class='add'>+			 val | wm8350_ldo_mvolts_to_val(mV));</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wm8350_ldo_set_suspend_enable(struct regulator_dev *rdev)</div><div class='add'>+{</div><div class='add'>+	struct wm8350 *wm8350 = rdev_get_drvdata(rdev);</div><div class='add'>+	int volt_reg, ldo = rdev_get_id(rdev);</div><div class='add'>+	u16 val;</div><div class='add'>+</div><div class='add'>+	switch (ldo) {</div><div class='add'>+	case WM8350_LDO_1:</div><div class='add'>+		volt_reg = WM8350_LDO1_LOW_POWER;</div><div class='add'>+		break;</div><div class='add'>+	case WM8350_LDO_2:</div><div class='add'>+		volt_reg = WM8350_LDO2_LOW_POWER;</div><div class='add'>+		break;</div><div class='add'>+	case WM8350_LDO_3:</div><div class='add'>+		volt_reg = WM8350_LDO3_LOW_POWER;</div><div class='add'>+		break;</div><div class='add'>+	case WM8350_LDO_4:</div><div class='add'>+		volt_reg = WM8350_LDO4_LOW_POWER;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* all LDOs have same mV bits */</div><div class='add'>+	val = wm8350_reg_read(wm8350, volt_reg) &amp; ~WM8350_LDO1_HIB_MODE_MASK;</div><div class='add'>+	wm8350_reg_write(wm8350, volt_reg, val);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wm8350_ldo_set_suspend_disable(struct regulator_dev *rdev)</div><div class='add'>+{</div><div class='add'>+	struct wm8350 *wm8350 = rdev_get_drvdata(rdev);</div><div class='add'>+	int volt_reg, ldo = rdev_get_id(rdev);</div><div class='add'>+	u16 val;</div><div class='add'>+</div><div class='add'>+	switch (ldo) {</div><div class='add'>+	case WM8350_LDO_1:</div><div class='add'>+		volt_reg = WM8350_LDO1_LOW_POWER;</div><div class='add'>+		break;</div><div class='add'>+	case WM8350_LDO_2:</div><div class='add'>+		volt_reg = WM8350_LDO2_LOW_POWER;</div><div class='add'>+		break;</div><div class='add'>+	case WM8350_LDO_3:</div><div class='add'>+		volt_reg = WM8350_LDO3_LOW_POWER;</div><div class='add'>+		break;</div><div class='add'>+	case WM8350_LDO_4:</div><div class='add'>+		volt_reg = WM8350_LDO4_LOW_POWER;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* all LDOs have same mV bits */</div><div class='add'>+	val = wm8350_reg_read(wm8350, volt_reg) &amp; ~WM8350_LDO1_HIB_MODE_MASK;</div><div class='add'>+	wm8350_reg_write(wm8350, volt_reg, WM8350_LDO1_HIB_MODE_DIS);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wm8350_ldo_set_voltage(struct regulator_dev *rdev, int min_uV,</div><div class='add'>+	int max_uV)</div><div class='add'>+{</div><div class='add'>+	struct wm8350 *wm8350 = rdev_get_drvdata(rdev);</div><div class='add'>+	int volt_reg, ldo = rdev_get_id(rdev), mV, min_mV = min_uV / 1000,</div><div class='add'>+		max_mV = max_uV / 1000;</div><div class='add'>+	u16 val;</div><div class='add'>+</div><div class='add'>+	if (min_mV &lt; 900 || min_mV &gt; 3300)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (max_mV &lt; 900 || max_mV &gt; 3300)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (min_mV &lt; 1800) {</div><div class='add'>+		/* step size is 50mV &lt; 1800mV */</div><div class='add'>+		mV = (min_mV - 851) / 50;</div><div class='add'>+		if (wm8350_ldo_val_to_mvolts(mV) &gt; max_mV)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		BUG_ON(wm8350_ldo_val_to_mvolts(mV) &lt; min_mV);</div><div class='add'>+	} else {</div><div class='add'>+		/* step size is 100mV &gt; 1800mV */</div><div class='add'>+		mV = ((min_mV - 1701) / 100) + 16;</div><div class='add'>+		if (wm8350_ldo_val_to_mvolts(mV) &gt; max_mV)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		BUG_ON(wm8350_ldo_val_to_mvolts(mV) &lt; min_mV);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (ldo) {</div><div class='add'>+	case WM8350_LDO_1:</div><div class='add'>+		volt_reg = WM8350_LDO1_CONTROL;</div><div class='add'>+		break;</div><div class='add'>+	case WM8350_LDO_2:</div><div class='add'>+		volt_reg = WM8350_LDO2_CONTROL;</div><div class='add'>+		break;</div><div class='add'>+	case WM8350_LDO_3:</div><div class='add'>+		volt_reg = WM8350_LDO3_CONTROL;</div><div class='add'>+		break;</div><div class='add'>+	case WM8350_LDO_4:</div><div class='add'>+		volt_reg = WM8350_LDO4_CONTROL;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* all LDOs have same mV bits */</div><div class='add'>+	val = wm8350_reg_read(wm8350, volt_reg) &amp; ~WM8350_LDO1_VSEL_MASK;</div><div class='add'>+	wm8350_reg_write(wm8350, volt_reg, val | mV);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wm8350_ldo_get_voltage(struct regulator_dev *rdev)</div><div class='add'>+{</div><div class='add'>+	struct wm8350 *wm8350 = rdev_get_drvdata(rdev);</div><div class='add'>+	int volt_reg, ldo = rdev_get_id(rdev);</div><div class='add'>+	u16 val;</div><div class='add'>+</div><div class='add'>+	switch (ldo) {</div><div class='add'>+	case WM8350_LDO_1:</div><div class='add'>+		volt_reg = WM8350_LDO1_CONTROL;</div><div class='add'>+		break;</div><div class='add'>+	case WM8350_LDO_2:</div><div class='add'>+		volt_reg = WM8350_LDO2_CONTROL;</div><div class='add'>+		break;</div><div class='add'>+	case WM8350_LDO_3:</div><div class='add'>+		volt_reg = WM8350_LDO3_CONTROL;</div><div class='add'>+		break;</div><div class='add'>+	case WM8350_LDO_4:</div><div class='add'>+		volt_reg = WM8350_LDO4_CONTROL;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* all LDOs have same mV bits */</div><div class='add'>+	val = wm8350_reg_read(wm8350, volt_reg) &amp; WM8350_LDO1_VSEL_MASK;</div><div class='add'>+	return wm8350_ldo_val_to_mvolts(val) * 1000;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int wm8350_dcdc_set_slot(struct wm8350 *wm8350, int dcdc, u16 start,</div><div class='add'>+			 u16 stop, u16 fault)</div><div class='add'>+{</div><div class='add'>+	int slot_reg;</div><div class='add'>+	u16 val;</div><div class='add'>+</div><div class='add'>+	dev_dbg(wm8350-&gt;dev, "%s %d start %d stop %d\n",</div><div class='add'>+		__func__, dcdc, start, stop);</div><div class='add'>+</div><div class='add'>+	/* slot valid ? */</div><div class='add'>+	if (start &gt; 15 || stop &gt; 15)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	switch (dcdc) {</div><div class='add'>+	case WM8350_DCDC_1:</div><div class='add'>+		slot_reg = WM8350_DCDC1_TIMEOUTS;</div><div class='add'>+		break;</div><div class='add'>+	case WM8350_DCDC_2:</div><div class='add'>+		slot_reg = WM8350_DCDC2_TIMEOUTS;</div><div class='add'>+		break;</div><div class='add'>+	case WM8350_DCDC_3:</div><div class='add'>+		slot_reg = WM8350_DCDC3_TIMEOUTS;</div><div class='add'>+		break;</div><div class='add'>+	case WM8350_DCDC_4:</div><div class='add'>+		slot_reg = WM8350_DCDC4_TIMEOUTS;</div><div class='add'>+		break;</div><div class='add'>+	case WM8350_DCDC_5:</div><div class='add'>+		slot_reg = WM8350_DCDC5_TIMEOUTS;</div><div class='add'>+		break;</div><div class='add'>+	case WM8350_DCDC_6:</div><div class='add'>+		slot_reg = WM8350_DCDC6_TIMEOUTS;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	val = wm8350_reg_read(wm8350, slot_reg) &amp;</div><div class='add'>+	    ~(WM8350_DC1_ENSLOT_MASK | WM8350_DC1_SDSLOT_MASK |</div><div class='add'>+	      WM8350_DC1_ERRACT_MASK);</div><div class='add'>+	wm8350_reg_write(wm8350, slot_reg,</div><div class='add'>+			 val | (start &lt;&lt; WM8350_DC1_ENSLOT_SHIFT) |</div><div class='add'>+			 (stop &lt;&lt; WM8350_DC1_SDSLOT_SHIFT) |</div><div class='add'>+			 (fault &lt;&lt; WM8350_DC1_ERRACT_SHIFT));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(wm8350_dcdc_set_slot);</div><div class='add'>+</div><div class='add'>+int wm8350_ldo_set_slot(struct wm8350 *wm8350, int ldo, u16 start, u16 stop)</div><div class='add'>+{</div><div class='add'>+	int slot_reg;</div><div class='add'>+	u16 val;</div><div class='add'>+</div><div class='add'>+	dev_dbg(wm8350-&gt;dev, "%s %d start %d stop %d\n",</div><div class='add'>+		__func__, ldo, start, stop);</div><div class='add'>+</div><div class='add'>+	/* slot valid ? */</div><div class='add'>+	if (start &gt; 15 || stop &gt; 15)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	switch (ldo) {</div><div class='add'>+	case WM8350_LDO_1:</div><div class='add'>+		slot_reg = WM8350_LDO1_TIMEOUTS;</div><div class='add'>+		break;</div><div class='add'>+	case WM8350_LDO_2:</div><div class='add'>+		slot_reg = WM8350_LDO2_TIMEOUTS;</div><div class='add'>+		break;</div><div class='add'>+	case WM8350_LDO_3:</div><div class='add'>+		slot_reg = WM8350_LDO3_TIMEOUTS;</div><div class='add'>+		break;</div><div class='add'>+	case WM8350_LDO_4:</div><div class='add'>+		slot_reg = WM8350_LDO4_TIMEOUTS;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	val = wm8350_reg_read(wm8350, slot_reg) &amp; ~WM8350_LDO1_SDSLOT_MASK;</div><div class='add'>+	wm8350_reg_write(wm8350, slot_reg, val | ((start &lt;&lt; 10) | (stop &lt;&lt; 6)));</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(wm8350_ldo_set_slot);</div><div class='add'>+</div><div class='add'>+int wm8350_dcdc25_set_mode(struct wm8350 *wm8350, int dcdc, u16 mode,</div><div class='add'>+			   u16 ilim, u16 ramp, u16 feedback)</div><div class='add'>+{</div><div class='add'>+	u16 val;</div><div class='add'>+</div><div class='add'>+	dev_dbg(wm8350-&gt;dev, "%s %d mode: %s %s\n", __func__, dcdc,</div><div class='add'>+		mode ? "normal" : "boost", ilim ? "low" : "normal");</div><div class='add'>+</div><div class='add'>+	switch (dcdc) {</div><div class='add'>+	case WM8350_DCDC_2:</div><div class='add'>+		val = wm8350_reg_read(wm8350, WM8350_DCDC2_CONTROL)</div><div class='add'>+		    &amp; ~(WM8350_DC2_MODE_MASK | WM8350_DC2_ILIM_MASK |</div><div class='add'>+			WM8350_DC2_RMP_MASK | WM8350_DC2_FBSRC_MASK);</div><div class='add'>+		wm8350_reg_write(wm8350, WM8350_DCDC2_CONTROL, val |</div><div class='add'>+				 (mode &lt;&lt; WM8350_DC2_MODE_SHIFT) |</div><div class='add'>+				 (ilim &lt;&lt; WM8350_DC2_ILIM_SHIFT) |</div><div class='add'>+				 (ramp &lt;&lt; WM8350_DC2_RMP_SHIFT) |</div><div class='add'>+				 (feedback &lt;&lt; WM8350_DC2_FBSRC_SHIFT));</div><div class='add'>+		break;</div><div class='add'>+	case WM8350_DCDC_5:</div><div class='add'>+		val = wm8350_reg_read(wm8350, WM8350_DCDC5_CONTROL)</div><div class='add'>+		    &amp; ~(WM8350_DC5_MODE_MASK | WM8350_DC5_ILIM_MASK |</div><div class='add'>+			WM8350_DC5_RMP_MASK | WM8350_DC5_FBSRC_MASK);</div><div class='add'>+		wm8350_reg_write(wm8350, WM8350_DCDC5_CONTROL, val |</div><div class='add'>+				 (mode &lt;&lt; WM8350_DC5_MODE_SHIFT) |</div><div class='add'>+				 (ilim &lt;&lt; WM8350_DC5_ILIM_SHIFT) |</div><div class='add'>+				 (ramp &lt;&lt; WM8350_DC5_RMP_SHIFT) |</div><div class='add'>+				 (feedback &lt;&lt; WM8350_DC5_FBSRC_SHIFT));</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(wm8350_dcdc25_set_mode);</div><div class='add'>+</div><div class='add'>+static int wm8350_dcdc_enable(struct regulator_dev *rdev)</div><div class='add'>+{</div><div class='add'>+	struct wm8350 *wm8350 = rdev_get_drvdata(rdev);</div><div class='add'>+	int dcdc = rdev_get_id(rdev);</div><div class='add'>+	u16 shift;</div><div class='add'>+</div><div class='add'>+	if (dcdc &lt; WM8350_DCDC_1 || dcdc &gt; WM8350_DCDC_6)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	shift = dcdc - WM8350_DCDC_1;</div><div class='add'>+	wm8350_set_bits(wm8350, WM8350_DCDC_LDO_REQUESTED, 1 &lt;&lt; shift);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wm8350_dcdc_disable(struct regulator_dev *rdev)</div><div class='add'>+{</div><div class='add'>+	struct wm8350 *wm8350 = rdev_get_drvdata(rdev);</div><div class='add'>+	int dcdc = rdev_get_id(rdev);</div><div class='add'>+	u16 shift;</div><div class='add'>+</div><div class='add'>+	if (dcdc &lt; WM8350_DCDC_1 || dcdc &gt; WM8350_DCDC_6)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	shift = dcdc - WM8350_DCDC_1;</div><div class='add'>+	wm8350_clear_bits(wm8350, WM8350_DCDC_LDO_REQUESTED, 1 &lt;&lt; shift);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wm8350_ldo_enable(struct regulator_dev *rdev)</div><div class='add'>+{</div><div class='add'>+	struct wm8350 *wm8350 = rdev_get_drvdata(rdev);</div><div class='add'>+	int ldo = rdev_get_id(rdev);</div><div class='add'>+	u16 shift;</div><div class='add'>+</div><div class='add'>+	if (ldo &lt; WM8350_LDO_1 || ldo &gt; WM8350_LDO_4)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	shift = (ldo - WM8350_LDO_1) + 8;</div><div class='add'>+	wm8350_set_bits(wm8350, WM8350_DCDC_LDO_REQUESTED, 1 &lt;&lt; shift);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wm8350_ldo_disable(struct regulator_dev *rdev)</div><div class='add'>+{</div><div class='add'>+	struct wm8350 *wm8350 = rdev_get_drvdata(rdev);</div><div class='add'>+	int ldo = rdev_get_id(rdev);</div><div class='add'>+	u16 shift;</div><div class='add'>+</div><div class='add'>+	if (ldo &lt; WM8350_LDO_1 || ldo &gt; WM8350_LDO_4)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	shift = (ldo - WM8350_LDO_1) + 8;</div><div class='add'>+	wm8350_clear_bits(wm8350, WM8350_DCDC_LDO_REQUESTED, 1 &lt;&lt; shift);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int force_continuous_enable(struct wm8350 *wm8350, int dcdc, int enable)</div><div class='add'>+{</div><div class='add'>+	int reg = 0, ret;</div><div class='add'>+</div><div class='add'>+	switch (dcdc) {</div><div class='add'>+	case WM8350_DCDC_1:</div><div class='add'>+		reg = WM8350_DCDC1_FORCE_PWM;</div><div class='add'>+		break;</div><div class='add'>+	case WM8350_DCDC_3:</div><div class='add'>+		reg = WM8350_DCDC3_FORCE_PWM;</div><div class='add'>+		break;</div><div class='add'>+	case WM8350_DCDC_4:</div><div class='add'>+		reg = WM8350_DCDC4_FORCE_PWM;</div><div class='add'>+		break;</div><div class='add'>+	case WM8350_DCDC_6:</div><div class='add'>+		reg = WM8350_DCDC6_FORCE_PWM;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (enable)</div><div class='add'>+		ret = wm8350_set_bits(wm8350, reg,</div><div class='add'>+			WM8350_DCDC1_FORCE_PWM_ENA);</div><div class='add'>+	else</div><div class='add'>+		ret = wm8350_clear_bits(wm8350, reg,</div><div class='add'>+			WM8350_DCDC1_FORCE_PWM_ENA);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wm8350_dcdc_set_mode(struct regulator_dev *rdev, unsigned int mode)</div><div class='add'>+{</div><div class='add'>+	struct wm8350 *wm8350 = rdev_get_drvdata(rdev);</div><div class='add'>+	int dcdc = rdev_get_id(rdev);</div><div class='add'>+	u16 val;</div><div class='add'>+</div><div class='add'>+	if (dcdc &lt; WM8350_DCDC_1 || dcdc &gt; WM8350_DCDC_6)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (dcdc == WM8350_DCDC_2 || dcdc == WM8350_DCDC_5)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	val = 1 &lt;&lt; (dcdc - WM8350_DCDC_1);</div><div class='add'>+</div><div class='add'>+	switch (mode) {</div><div class='add'>+	case REGULATOR_MODE_FAST:</div><div class='add'>+		/* force continuous mode */</div><div class='add'>+		wm8350_set_bits(wm8350, WM8350_DCDC_ACTIVE_OPTIONS, val);</div><div class='add'>+		wm8350_clear_bits(wm8350, WM8350_DCDC_SLEEP_OPTIONS, val);</div><div class='add'>+		force_continuous_enable(wm8350, dcdc, 1);</div><div class='add'>+		break;</div><div class='add'>+	case REGULATOR_MODE_NORMAL:</div><div class='add'>+		/* active / pulse skipping */</div><div class='add'>+		wm8350_set_bits(wm8350, WM8350_DCDC_ACTIVE_OPTIONS, val);</div><div class='add'>+		wm8350_clear_bits(wm8350, WM8350_DCDC_SLEEP_OPTIONS, val);</div><div class='add'>+		force_continuous_enable(wm8350, dcdc, 0);</div><div class='add'>+		break;</div><div class='add'>+	case REGULATOR_MODE_IDLE:</div><div class='add'>+		/* standby mode */</div><div class='add'>+		force_continuous_enable(wm8350, dcdc, 0);</div><div class='add'>+		wm8350_clear_bits(wm8350, WM8350_DCDC_SLEEP_OPTIONS, val);</div><div class='add'>+		wm8350_clear_bits(wm8350, WM8350_DCDC_ACTIVE_OPTIONS, val);</div><div class='add'>+		break;</div><div class='add'>+	case REGULATOR_MODE_STANDBY:</div><div class='add'>+		/* LDO mode */</div><div class='add'>+		force_continuous_enable(wm8350, dcdc, 0);</div><div class='add'>+		wm8350_set_bits(wm8350, WM8350_DCDC_SLEEP_OPTIONS, val);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int wm8350_dcdc_get_mode(struct regulator_dev *rdev)</div><div class='add'>+{</div><div class='add'>+	struct wm8350 *wm8350 = rdev_get_drvdata(rdev);</div><div class='add'>+	int dcdc = rdev_get_id(rdev);</div><div class='add'>+	u16 mask, sleep, active, force;</div><div class='add'>+	int mode = REGULATOR_MODE_NORMAL;</div><div class='add'>+</div><div class='add'>+	if (dcdc &lt; WM8350_DCDC_1 || dcdc &gt; WM8350_DCDC_6)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (dcdc == WM8350_DCDC_2 || dcdc == WM8350_DCDC_5)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mask = 1 &lt;&lt; (dcdc - WM8350_DCDC_1);</div><div class='add'>+	active = wm8350_reg_read(wm8350, WM8350_DCDC_ACTIVE_OPTIONS) &amp; mask;</div><div class='add'>+	sleep = wm8350_reg_read(wm8350, WM8350_DCDC_SLEEP_OPTIONS) &amp; mask;</div><div class='add'>+	force = wm8350_reg_read(wm8350, WM8350_DCDC1_FORCE_PWM)</div><div class='add'>+	    &amp; WM8350_DCDC1_FORCE_PWM_ENA;</div><div class='add'>+	dev_dbg(wm8350-&gt;dev, "mask %x active %x sleep %x force %x",</div><div class='add'>+		mask, active, sleep, force);</div><div class='add'>+</div><div class='add'>+	if (active &amp;&amp; !sleep) {</div><div class='add'>+		if (force)</div><div class='add'>+			mode = REGULATOR_MODE_FAST;</div><div class='add'>+		else</div><div class='add'>+			mode = REGULATOR_MODE_NORMAL;</div><div class='add'>+	} else if (!active &amp;&amp; !sleep)</div><div class='add'>+		mode = REGULATOR_MODE_IDLE;</div><div class='add'>+	else if (!sleep)</div><div class='add'>+		mode = REGULATOR_MODE_STANDBY;</div><div class='add'>+</div><div class='add'>+	return mode;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int wm8350_ldo_get_mode(struct regulator_dev *rdev)</div><div class='add'>+{</div><div class='add'>+	return REGULATOR_MODE_NORMAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct wm8350_dcdc_efficiency {</div><div class='add'>+	int uA_load_min;</div><div class='add'>+	int uA_load_max;</div><div class='add'>+	unsigned int mode;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct wm8350_dcdc_efficiency dcdc1_6_efficiency[] = {</div><div class='add'>+	{0, 10000, REGULATOR_MODE_STANDBY},       /* 0 - 10mA - LDO */</div><div class='add'>+	{10000, 100000, REGULATOR_MODE_IDLE},     /* 10mA - 100mA - Standby */</div><div class='add'>+	{100000, 1000000, REGULATOR_MODE_NORMAL}, /* &gt; 100mA - Active */</div><div class='add'>+	{-1, -1, REGULATOR_MODE_NORMAL},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct wm8350_dcdc_efficiency dcdc3_4_efficiency[] = {</div><div class='add'>+	{0, 10000, REGULATOR_MODE_STANDBY},      /* 0 - 10mA - LDO */</div><div class='add'>+	{10000, 100000, REGULATOR_MODE_IDLE},    /* 10mA - 100mA - Standby */</div><div class='add'>+	{100000, 800000, REGULATOR_MODE_NORMAL}, /* &gt; 100mA - Active */</div><div class='add'>+	{-1, -1, REGULATOR_MODE_NORMAL},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static unsigned int get_mode(int uA, const struct wm8350_dcdc_efficiency *eff)</div><div class='add'>+{</div><div class='add'>+	int i = 0;</div><div class='add'>+</div><div class='add'>+	while (eff[i].uA_load_min != -1) {</div><div class='add'>+		if (uA &gt;= eff[i].uA_load_min &amp;&amp; uA &lt;= eff[i].uA_load_max)</div><div class='add'>+			return eff[i].mode;</div><div class='add'>+	}</div><div class='add'>+	return REGULATOR_MODE_NORMAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Query the regulator for it's most efficient mode @ uV,uA</div><div class='add'>+ * WM8350 regulator efficiency is pretty similar over</div><div class='add'>+ * different input and output uV.</div><div class='add'>+ */</div><div class='add'>+static unsigned int wm8350_dcdc_get_optimum_mode(struct regulator_dev *rdev,</div><div class='add'>+						 int input_uV, int output_uV,</div><div class='add'>+						 int output_uA)</div><div class='add'>+{</div><div class='add'>+	int dcdc = rdev_get_id(rdev), mode;</div><div class='add'>+</div><div class='add'>+	switch (dcdc) {</div><div class='add'>+	case WM8350_DCDC_1:</div><div class='add'>+	case WM8350_DCDC_6:</div><div class='add'>+		mode = get_mode(output_uA, dcdc1_6_efficiency);</div><div class='add'>+		break;</div><div class='add'>+	case WM8350_DCDC_3:</div><div class='add'>+	case WM8350_DCDC_4:</div><div class='add'>+		mode = get_mode(output_uA, dcdc3_4_efficiency);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		mode = REGULATOR_MODE_NORMAL;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return mode;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wm8350_dcdc_is_enabled(struct regulator_dev *rdev)</div><div class='add'>+{</div><div class='add'>+	struct wm8350 *wm8350 = rdev_get_drvdata(rdev);</div><div class='add'>+	int dcdc = rdev_get_id(rdev), shift;</div><div class='add'>+</div><div class='add'>+	if (dcdc &lt; WM8350_DCDC_1 || dcdc &gt; WM8350_DCDC_6)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	shift = dcdc - WM8350_DCDC_1;</div><div class='add'>+	return wm8350_reg_read(wm8350, WM8350_DCDC_LDO_REQUESTED)</div><div class='add'>+	    &amp; (1 &lt;&lt; shift);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wm8350_ldo_is_enabled(struct regulator_dev *rdev)</div><div class='add'>+{</div><div class='add'>+	struct wm8350 *wm8350 = rdev_get_drvdata(rdev);</div><div class='add'>+	int ldo = rdev_get_id(rdev), shift;</div><div class='add'>+</div><div class='add'>+	if (ldo &lt; WM8350_LDO_1 || ldo &gt; WM8350_LDO_4)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	shift = (ldo - WM8350_LDO_1) + 8;</div><div class='add'>+	return wm8350_reg_read(wm8350, WM8350_DCDC_LDO_REQUESTED)</div><div class='add'>+	    &amp; (1 &lt;&lt; shift);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct regulator_ops wm8350_dcdc_ops = {</div><div class='add'>+	.set_voltage = wm8350_dcdc_set_voltage,</div><div class='add'>+	.get_voltage = wm8350_dcdc_get_voltage,</div><div class='add'>+	.enable = wm8350_dcdc_enable,</div><div class='add'>+	.disable = wm8350_dcdc_disable,</div><div class='add'>+	.get_mode = wm8350_dcdc_get_mode,</div><div class='add'>+	.set_mode = wm8350_dcdc_set_mode,</div><div class='add'>+	.get_optimum_mode = wm8350_dcdc_get_optimum_mode,</div><div class='add'>+	.is_enabled = wm8350_dcdc_is_enabled,</div><div class='add'>+	.set_suspend_voltage = wm8350_dcdc_set_suspend_voltage,</div><div class='add'>+	.set_suspend_enable = wm8350_dcdc_set_suspend_enable,</div><div class='add'>+	.set_suspend_disable = wm8350_dcdc_set_suspend_disable,</div><div class='add'>+	.set_suspend_mode = wm8350_dcdc_set_suspend_mode,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct regulator_ops wm8350_dcdc2_5_ops = {</div><div class='add'>+	.enable = wm8350_dcdc_enable,</div><div class='add'>+	.disable = wm8350_dcdc_disable,</div><div class='add'>+	.is_enabled = wm8350_dcdc_is_enabled,</div><div class='add'>+	.set_suspend_enable = wm8350_dcdc25_set_suspend_enable,</div><div class='add'>+	.set_suspend_disable = wm8350_dcdc25_set_suspend_disable,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct regulator_ops wm8350_ldo_ops = {</div><div class='add'>+	.set_voltage = wm8350_ldo_set_voltage,</div><div class='add'>+	.get_voltage = wm8350_ldo_get_voltage,</div><div class='add'>+	.enable = wm8350_ldo_enable,</div><div class='add'>+	.disable = wm8350_ldo_disable,</div><div class='add'>+	.is_enabled = wm8350_ldo_is_enabled,</div><div class='add'>+	.get_mode = wm8350_ldo_get_mode,</div><div class='add'>+	.set_suspend_voltage = wm8350_ldo_set_suspend_voltage,</div><div class='add'>+	.set_suspend_enable = wm8350_ldo_set_suspend_enable,</div><div class='add'>+	.set_suspend_disable = wm8350_ldo_set_suspend_disable,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct regulator_ops wm8350_isink_ops = {</div><div class='add'>+	.set_current_limit = wm8350_isink_set_current,</div><div class='add'>+	.get_current_limit = wm8350_isink_get_current,</div><div class='add'>+	.enable = wm8350_isink_enable,</div><div class='add'>+	.disable = wm8350_isink_disable,</div><div class='add'>+	.is_enabled = wm8350_isink_is_enabled,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct regulator_desc wm8350_reg[NUM_WM8350_REGULATORS] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "DCDC1",</div><div class='add'>+		.id = WM8350_DCDC_1,</div><div class='add'>+		.ops = &amp;wm8350_dcdc_ops,</div><div class='add'>+		.irq = WM8350_IRQ_UV_DC1,</div><div class='add'>+		.type = REGULATOR_VOLTAGE,</div><div class='add'>+		.owner = THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "DCDC2",</div><div class='add'>+		.id = WM8350_DCDC_2,</div><div class='add'>+		.ops = &amp;wm8350_dcdc2_5_ops,</div><div class='add'>+		.irq = WM8350_IRQ_UV_DC2,</div><div class='add'>+		.type = REGULATOR_VOLTAGE,</div><div class='add'>+		.owner = THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "DCDC3",</div><div class='add'>+		.id = WM8350_DCDC_3,</div><div class='add'>+		.ops = &amp;wm8350_dcdc_ops,</div><div class='add'>+		.irq = WM8350_IRQ_UV_DC3,</div><div class='add'>+		.type = REGULATOR_VOLTAGE,</div><div class='add'>+		.owner = THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "DCDC4",</div><div class='add'>+		.id = WM8350_DCDC_4,</div><div class='add'>+		.ops = &amp;wm8350_dcdc_ops,</div><div class='add'>+		.irq = WM8350_IRQ_UV_DC4,</div><div class='add'>+		.type = REGULATOR_VOLTAGE,</div><div class='add'>+		.owner = THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "DCDC5",</div><div class='add'>+		.id = WM8350_DCDC_5,</div><div class='add'>+		.ops = &amp;wm8350_dcdc2_5_ops,</div><div class='add'>+		.irq = WM8350_IRQ_UV_DC5,</div><div class='add'>+		.type = REGULATOR_VOLTAGE,</div><div class='add'>+		.owner = THIS_MODULE,</div><div class='add'>+	 },</div><div class='add'>+	{</div><div class='add'>+		.name = "DCDC6",</div><div class='add'>+		.id = WM8350_DCDC_6,</div><div class='add'>+		.ops = &amp;wm8350_dcdc_ops,</div><div class='add'>+		.irq = WM8350_IRQ_UV_DC6,</div><div class='add'>+		.type = REGULATOR_VOLTAGE,</div><div class='add'>+		.owner = THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "LDO1",</div><div class='add'>+		.id = WM8350_LDO_1,</div><div class='add'>+		.ops = &amp;wm8350_ldo_ops,</div><div class='add'>+		.irq = WM8350_IRQ_UV_LDO1,</div><div class='add'>+		.type = REGULATOR_VOLTAGE,</div><div class='add'>+		.owner = THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "LDO2",</div><div class='add'>+		.id = WM8350_LDO_2,</div><div class='add'>+		.ops = &amp;wm8350_ldo_ops,</div><div class='add'>+		.irq = WM8350_IRQ_UV_LDO2,</div><div class='add'>+		.type = REGULATOR_VOLTAGE,</div><div class='add'>+		.owner = THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "LDO3",</div><div class='add'>+		.id = WM8350_LDO_3,</div><div class='add'>+		.ops = &amp;wm8350_ldo_ops,</div><div class='add'>+		.irq = WM8350_IRQ_UV_LDO3,</div><div class='add'>+		.type = REGULATOR_VOLTAGE,</div><div class='add'>+		.owner = THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "LDO4",</div><div class='add'>+		.id = WM8350_LDO_4,</div><div class='add'>+		.ops = &amp;wm8350_ldo_ops,</div><div class='add'>+		.irq = WM8350_IRQ_UV_LDO4,</div><div class='add'>+		.type = REGULATOR_VOLTAGE,</div><div class='add'>+		.owner = THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "ISINKA",</div><div class='add'>+		.id = WM8350_ISINK_A,</div><div class='add'>+		.ops = &amp;wm8350_isink_ops,</div><div class='add'>+		.irq = WM8350_IRQ_CS1,</div><div class='add'>+		.type = REGULATOR_CURRENT,</div><div class='add'>+		.owner = THIS_MODULE,</div><div class='add'>+	 },</div><div class='add'>+	{</div><div class='add'>+		.name = "ISINKB",</div><div class='add'>+		.id = WM8350_ISINK_B,</div><div class='add'>+		.ops = &amp;wm8350_isink_ops,</div><div class='add'>+		.irq = WM8350_IRQ_CS2,</div><div class='add'>+		.type = REGULATOR_CURRENT,</div><div class='add'>+		.owner = THIS_MODULE,</div><div class='add'>+	 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void pmic_uv_handler(struct wm8350 *wm8350, int irq, void *data)</div><div class='add'>+{</div><div class='add'>+	struct regulator_dev *rdev = (struct regulator_dev *)data;</div><div class='add'>+</div><div class='add'>+	if (irq == WM8350_IRQ_CS1 || irq == WM8350_IRQ_CS2)</div><div class='add'>+		regulator_notifier_call_chain(rdev,</div><div class='add'>+					      REGULATOR_EVENT_REGULATION_OUT,</div><div class='add'>+					      wm8350);</div><div class='add'>+	else</div><div class='add'>+		regulator_notifier_call_chain(rdev,</div><div class='add'>+					      REGULATOR_EVENT_UNDER_VOLTAGE,</div><div class='add'>+					      wm8350);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wm8350_regulator_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct wm8350 *wm8350 = dev_get_drvdata(&amp;pdev-&gt;dev);</div><div class='add'>+	struct regulator_dev *rdev;</div><div class='add'>+	int ret;</div><div class='add'>+	u16 val;</div><div class='add'>+</div><div class='add'>+	if (pdev-&gt;id &lt; WM8350_DCDC_1 || pdev-&gt;id &gt; WM8350_ISINK_B)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	/* do any regulatior specific init */</div><div class='add'>+	switch (pdev-&gt;id) {</div><div class='add'>+	case WM8350_DCDC_1:</div><div class='add'>+		val = wm8350_reg_read(wm8350, WM8350_DCDC1_LOW_POWER);</div><div class='add'>+		wm8350-&gt;pmic.dcdc1_hib_mode = val &amp; WM8350_DCDC_HIB_MODE_MASK;</div><div class='add'>+		break;</div><div class='add'>+	case WM8350_DCDC_3:</div><div class='add'>+		val = wm8350_reg_read(wm8350, WM8350_DCDC3_LOW_POWER);</div><div class='add'>+		wm8350-&gt;pmic.dcdc3_hib_mode = val &amp; WM8350_DCDC_HIB_MODE_MASK;</div><div class='add'>+		break;</div><div class='add'>+	case WM8350_DCDC_4:</div><div class='add'>+		val = wm8350_reg_read(wm8350, WM8350_DCDC4_LOW_POWER);</div><div class='add'>+		wm8350-&gt;pmic.dcdc4_hib_mode = val &amp; WM8350_DCDC_HIB_MODE_MASK;</div><div class='add'>+		break;</div><div class='add'>+	case WM8350_DCDC_6:</div><div class='add'>+		val = wm8350_reg_read(wm8350, WM8350_DCDC6_LOW_POWER);</div><div class='add'>+		wm8350-&gt;pmic.dcdc6_hib_mode = val &amp; WM8350_DCDC_HIB_MODE_MASK;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	/* register regulator */</div><div class='add'>+	rdev = regulator_register(&amp;wm8350_reg[pdev-&gt;id], &amp;pdev-&gt;dev,</div><div class='add'>+				  dev_get_drvdata(&amp;pdev-&gt;dev));</div><div class='add'>+	if (IS_ERR(rdev)) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "failed to register %s\n",</div><div class='add'>+			wm8350_reg[pdev-&gt;id].name);</div><div class='add'>+		return PTR_ERR(rdev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* register regulator IRQ */</div><div class='add'>+	ret = wm8350_register_irq(wm8350, wm8350_reg[pdev-&gt;id].irq,</div><div class='add'>+				  pmic_uv_handler, rdev);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		regulator_unregister(rdev);</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "failed to register regulator %s IRQ\n",</div><div class='add'>+			wm8350_reg[pdev-&gt;id].name);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	wm8350_unmask_irq(wm8350, wm8350_reg[pdev-&gt;id].irq);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wm8350_regulator_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct regulator_dev *rdev = platform_get_drvdata(pdev);</div><div class='add'>+	struct wm8350 *wm8350 = rdev_get_drvdata(rdev);</div><div class='add'>+</div><div class='add'>+	wm8350_mask_irq(wm8350, wm8350_reg[pdev-&gt;id].irq);</div><div class='add'>+	wm8350_free_irq(wm8350, wm8350_reg[pdev-&gt;id].irq);</div><div class='add'>+</div><div class='add'>+	regulator_unregister(rdev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int wm8350_register_regulator(struct wm8350 *wm8350, int reg,</div><div class='add'>+			      struct regulator_init_data *initdata)</div><div class='add'>+{</div><div class='add'>+	struct platform_device *pdev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (wm8350-&gt;pmic.pdev[reg])</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	pdev = platform_device_alloc("wm8350-regulator", reg);</div><div class='add'>+	if (!pdev)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	wm8350-&gt;pmic.pdev[reg] = pdev;</div><div class='add'>+</div><div class='add'>+	initdata-&gt;driver_data = wm8350;</div><div class='add'>+</div><div class='add'>+	pdev-&gt;dev.platform_data = initdata;</div><div class='add'>+	pdev-&gt;dev.parent = wm8350-&gt;dev;</div><div class='add'>+	platform_set_drvdata(pdev, wm8350);</div><div class='add'>+</div><div class='add'>+	ret = platform_device_add(pdev);</div><div class='add'>+</div><div class='add'>+	if (ret != 0) {</div><div class='add'>+		dev_err(wm8350-&gt;dev, "Failed to register regulator %d: %d\n",</div><div class='add'>+			reg, ret);</div><div class='add'>+		platform_device_del(pdev);</div><div class='add'>+		wm8350-&gt;pmic.pdev[reg] = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(wm8350_register_regulator);</div><div class='add'>+</div><div class='add'>+static struct platform_driver wm8350_regulator_driver = {</div><div class='add'>+	.probe = wm8350_regulator_probe,</div><div class='add'>+	.remove = wm8350_regulator_remove,</div><div class='add'>+	.driver		= {</div><div class='add'>+		.name	= "wm8350-regulator",</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init wm8350_regulator_init(void)</div><div class='add'>+{</div><div class='add'>+	return platform_driver_register(&amp;wm8350_regulator_driver);</div><div class='add'>+}</div><div class='add'>+subsys_initcall(wm8350_regulator_init);</div><div class='add'>+</div><div class='add'>+static void __exit wm8350_regulator_exit(void)</div><div class='add'>+{</div><div class='add'>+	platform_driver_unregister(&amp;wm8350_regulator_driver);</div><div class='add'>+}</div><div class='add'>+module_exit(wm8350_regulator_exit);</div><div class='add'>+</div><div class='add'>+/* Module information */</div><div class='add'>+MODULE_AUTHOR("Liam Girdwood");</div><div class='add'>+MODULE_DESCRIPTION("WM8350 voltage and current regulator driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/regulator/wm8400-regulator.c b/drivers/regulator/wm8400-regulator.c<br/>new file mode 100644<br/>index 000000000000..48b372e038a8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/regulator/wm8400-regulator.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/regulator/wm8400-regulator.c</a></div><div class='hunk'>@@ -0,0 +1,368 @@</div><div class='add'>+/*</div><div class='add'>+ * Regulator support for WM8400</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2008 Wolfson Microelectronics PLC.</div><div class='add'>+ *</div><div class='add'>+ * Author: Mark Brown &lt;broonie@opensource.wolfsonmicro.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public License as</div><div class='add'>+ * published by the Free Software Foundation; either version 2 of the</div><div class='add'>+ * License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bug.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/regulator/driver.h&gt;</div><div class='add'>+#include &lt;linux/mfd/wm8400-private.h&gt;</div><div class='add'>+</div><div class='add'>+static int wm8400_ldo_is_enabled(struct regulator_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct wm8400 *wm8400 = rdev_get_drvdata(dev);</div><div class='add'>+	u16 val;</div><div class='add'>+</div><div class='add'>+	val = wm8400_reg_read(wm8400, WM8400_LDO1_CONTROL + rdev_get_id(dev));</div><div class='add'>+	return (val &amp; WM8400_LDO1_ENA) != 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wm8400_ldo_enable(struct regulator_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct wm8400 *wm8400 = rdev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	return wm8400_set_bits(wm8400, WM8400_LDO1_CONTROL + rdev_get_id(dev),</div><div class='add'>+			       WM8400_LDO1_ENA, WM8400_LDO1_ENA);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wm8400_ldo_disable(struct regulator_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct wm8400 *wm8400 = rdev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	return wm8400_set_bits(wm8400, WM8400_LDO1_CONTROL + rdev_get_id(dev),</div><div class='add'>+			       WM8400_LDO1_ENA, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wm8400_ldo_get_voltage(struct regulator_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct wm8400 *wm8400 = rdev_get_drvdata(dev);</div><div class='add'>+	u16 val;</div><div class='add'>+</div><div class='add'>+	val = wm8400_reg_read(wm8400, WM8400_LDO1_CONTROL + rdev_get_id(dev));</div><div class='add'>+	val &amp;= WM8400_LDO1_VSEL_MASK;</div><div class='add'>+</div><div class='add'>+	if (val &lt; 15)</div><div class='add'>+		return 900000 + (val * 50000);</div><div class='add'>+	else</div><div class='add'>+		return 1600000 + ((val - 14) * 100000);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wm8400_ldo_set_voltage(struct regulator_dev *dev,</div><div class='add'>+				  int min_uV, int max_uV)</div><div class='add'>+{</div><div class='add'>+	struct wm8400 *wm8400 = rdev_get_drvdata(dev);</div><div class='add'>+	u16 val;</div><div class='add'>+</div><div class='add'>+	if (min_uV &lt; 900000 || min_uV &gt; 3300000)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (min_uV &lt; 1700000) {</div><div class='add'>+		/* Steps of 50mV from 900mV;  */</div><div class='add'>+		val = (min_uV - 850001) / 50000;</div><div class='add'>+</div><div class='add'>+		if ((val * 50000) + 900000 &gt; max_uV)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		BUG_ON((val * 50000) + 900000 &lt; min_uV);</div><div class='add'>+	} else {</div><div class='add'>+		/* Steps of 100mV from 1700mV */</div><div class='add'>+		val = ((min_uV - 1600001) / 100000);</div><div class='add'>+</div><div class='add'>+		if ((val * 100000) + 1700000 &gt; max_uV)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		BUG_ON((val * 100000) + 1700000 &lt; min_uV);</div><div class='add'>+</div><div class='add'>+		val += 0xf;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return wm8400_set_bits(wm8400, WM8400_LDO1_CONTROL + rdev_get_id(dev),</div><div class='add'>+			       WM8400_LDO1_VSEL_MASK, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct regulator_ops wm8400_ldo_ops = {</div><div class='add'>+	.is_enabled = wm8400_ldo_is_enabled,</div><div class='add'>+	.enable = wm8400_ldo_enable,</div><div class='add'>+	.disable = wm8400_ldo_disable,</div><div class='add'>+	.get_voltage = wm8400_ldo_get_voltage,</div><div class='add'>+	.set_voltage = wm8400_ldo_set_voltage,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int wm8400_dcdc_is_enabled(struct regulator_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct wm8400 *wm8400 = rdev_get_drvdata(dev);</div><div class='add'>+	int offset = (rdev_get_id(dev) - WM8400_DCDC1) * 2;</div><div class='add'>+	u16 val;</div><div class='add'>+</div><div class='add'>+	val = wm8400_reg_read(wm8400, WM8400_DCDC1_CONTROL_1 + offset);</div><div class='add'>+	return (val &amp; WM8400_DC1_ENA) != 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wm8400_dcdc_enable(struct regulator_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct wm8400 *wm8400 = rdev_get_drvdata(dev);</div><div class='add'>+	int offset = (rdev_get_id(dev) - WM8400_DCDC1) * 2;</div><div class='add'>+</div><div class='add'>+	return wm8400_set_bits(wm8400, WM8400_DCDC1_CONTROL_1 + offset,</div><div class='add'>+			       WM8400_DC1_ENA, WM8400_DC1_ENA);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wm8400_dcdc_disable(struct regulator_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct wm8400 *wm8400 = rdev_get_drvdata(dev);</div><div class='add'>+	int offset = (rdev_get_id(dev) - WM8400_DCDC1) * 2;</div><div class='add'>+</div><div class='add'>+	return wm8400_set_bits(wm8400, WM8400_DCDC1_CONTROL_1 + offset,</div><div class='add'>+			       WM8400_DC1_ENA, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wm8400_dcdc_get_voltage(struct regulator_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct wm8400 *wm8400 = rdev_get_drvdata(dev);</div><div class='add'>+	u16 val;</div><div class='add'>+	int offset = (rdev_get_id(dev) - WM8400_DCDC1) * 2;</div><div class='add'>+</div><div class='add'>+	val = wm8400_reg_read(wm8400, WM8400_DCDC1_CONTROL_1 + offset);</div><div class='add'>+	val &amp;= WM8400_DC1_VSEL_MASK;</div><div class='add'>+</div><div class='add'>+	return 850000 + (25000 * val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wm8400_dcdc_set_voltage(struct regulator_dev *dev,</div><div class='add'>+				  int min_uV, int max_uV)</div><div class='add'>+{</div><div class='add'>+	struct wm8400 *wm8400 = rdev_get_drvdata(dev);</div><div class='add'>+	u16 val;</div><div class='add'>+	int offset = (rdev_get_id(dev) - WM8400_DCDC1) * 2;</div><div class='add'>+</div><div class='add'>+	if (min_uV &lt; 850000)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	val = (min_uV - 825001) / 25000;</div><div class='add'>+</div><div class='add'>+	if (850000 + (25000 * val) &gt; max_uV)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	BUG_ON(850000 + (25000 * val) &lt; min_uV);</div><div class='add'>+</div><div class='add'>+	return wm8400_set_bits(wm8400, WM8400_DCDC1_CONTROL_1 + offset,</div><div class='add'>+			       WM8400_DC1_VSEL_MASK, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int wm8400_dcdc_get_mode(struct regulator_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct wm8400 *wm8400 = rdev_get_drvdata(dev);</div><div class='add'>+	int offset = (rdev_get_id(dev) - WM8400_DCDC1) * 2;</div><div class='add'>+	u16 data[2];</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = wm8400_block_read(wm8400, WM8400_DCDC1_CONTROL_1 + offset, 2,</div><div class='add'>+				data);</div><div class='add'>+	if (ret != 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Datasheet: hibernate */</div><div class='add'>+	if (data[0] &amp; WM8400_DC1_SLEEP)</div><div class='add'>+		return REGULATOR_MODE_STANDBY;</div><div class='add'>+</div><div class='add'>+	/* Datasheet: standby */</div><div class='add'>+	if (!(data[0] &amp; WM8400_DC1_ACTIVE))</div><div class='add'>+		return REGULATOR_MODE_IDLE;</div><div class='add'>+</div><div class='add'>+	/* Datasheet: active with or without force PWM */</div><div class='add'>+	if (data[1] &amp; WM8400_DC1_FRC_PWM)</div><div class='add'>+		return REGULATOR_MODE_FAST;</div><div class='add'>+	else</div><div class='add'>+		return REGULATOR_MODE_NORMAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wm8400_dcdc_set_mode(struct regulator_dev *dev, unsigned int mode)</div><div class='add'>+{</div><div class='add'>+	struct wm8400 *wm8400 = rdev_get_drvdata(dev);</div><div class='add'>+	int offset = (rdev_get_id(dev) - WM8400_DCDC1) * 2;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	switch (mode) {</div><div class='add'>+	case REGULATOR_MODE_FAST:</div><div class='add'>+		/* Datasheet: active with force PWM */</div><div class='add'>+		ret = wm8400_set_bits(wm8400, WM8400_DCDC1_CONTROL_2 + offset,</div><div class='add'>+				      WM8400_DC1_FRC_PWM, WM8400_DC1_FRC_PWM);</div><div class='add'>+		if (ret != 0)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		return wm8400_set_bits(wm8400, WM8400_DCDC1_CONTROL_1 + offset,</div><div class='add'>+				       WM8400_DC1_ACTIVE | WM8400_DC1_SLEEP,</div><div class='add'>+				       WM8400_DC1_ACTIVE);</div><div class='add'>+</div><div class='add'>+	case REGULATOR_MODE_NORMAL:</div><div class='add'>+		/* Datasheet: active */</div><div class='add'>+		ret = wm8400_set_bits(wm8400, WM8400_DCDC1_CONTROL_2 + offset,</div><div class='add'>+				      WM8400_DC1_FRC_PWM, 0);</div><div class='add'>+		if (ret != 0)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		return wm8400_set_bits(wm8400, WM8400_DCDC1_CONTROL_1 + offset,</div><div class='add'>+				       WM8400_DC1_ACTIVE | WM8400_DC1_SLEEP,</div><div class='add'>+				       WM8400_DC1_ACTIVE);</div><div class='add'>+</div><div class='add'>+	case REGULATOR_MODE_IDLE:</div><div class='add'>+		/* Datasheet: standby */</div><div class='add'>+		ret = wm8400_set_bits(wm8400, WM8400_DCDC1_CONTROL_1 + offset,</div><div class='add'>+				      WM8400_DC1_ACTIVE, 0);</div><div class='add'>+		if (ret != 0)</div><div class='add'>+			return ret;</div><div class='add'>+		return wm8400_set_bits(wm8400, WM8400_DCDC1_CONTROL_1 + offset,</div><div class='add'>+				       WM8400_DC1_SLEEP, 0);</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int wm8400_dcdc_get_optimum_mode(struct regulator_dev *dev,</div><div class='add'>+						 int input_uV, int output_uV,</div><div class='add'>+						 int load_uA)</div><div class='add'>+{</div><div class='add'>+	return REGULATOR_MODE_NORMAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct regulator_ops wm8400_dcdc_ops = {</div><div class='add'>+	.is_enabled = wm8400_dcdc_is_enabled,</div><div class='add'>+	.enable = wm8400_dcdc_enable,</div><div class='add'>+	.disable = wm8400_dcdc_disable,</div><div class='add'>+	.get_voltage = wm8400_dcdc_get_voltage,</div><div class='add'>+	.set_voltage = wm8400_dcdc_set_voltage,</div><div class='add'>+	.get_mode = wm8400_dcdc_get_mode,</div><div class='add'>+	.set_mode = wm8400_dcdc_set_mode,</div><div class='add'>+	.get_optimum_mode = wm8400_dcdc_get_optimum_mode,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct regulator_desc regulators[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "LDO1",</div><div class='add'>+		.id = WM8400_LDO1,</div><div class='add'>+		.ops = &amp;wm8400_ldo_ops,</div><div class='add'>+		.type = REGULATOR_VOLTAGE,</div><div class='add'>+		.owner = THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "LDO2",</div><div class='add'>+		.id = WM8400_LDO2,</div><div class='add'>+		.ops = &amp;wm8400_ldo_ops,</div><div class='add'>+		.type = REGULATOR_VOLTAGE,</div><div class='add'>+		.owner = THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "LDO3",</div><div class='add'>+		.id = WM8400_LDO3,</div><div class='add'>+		.ops = &amp;wm8400_ldo_ops,</div><div class='add'>+		.type = REGULATOR_VOLTAGE,</div><div class='add'>+		.owner = THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "LDO4",</div><div class='add'>+		.id = WM8400_LDO4,</div><div class='add'>+		.ops = &amp;wm8400_ldo_ops,</div><div class='add'>+		.type = REGULATOR_VOLTAGE,</div><div class='add'>+		.owner = THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "DCDC1",</div><div class='add'>+		.id = WM8400_DCDC1,</div><div class='add'>+		.ops = &amp;wm8400_dcdc_ops,</div><div class='add'>+		.type = REGULATOR_VOLTAGE,</div><div class='add'>+		.owner = THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "DCDC2",</div><div class='add'>+		.id = WM8400_DCDC2,</div><div class='add'>+		.ops = &amp;wm8400_dcdc_ops,</div><div class='add'>+		.type = REGULATOR_VOLTAGE,</div><div class='add'>+		.owner = THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init wm8400_regulator_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct regulator_dev *rdev;</div><div class='add'>+</div><div class='add'>+	rdev = regulator_register(&amp;regulators[pdev-&gt;id], &amp;pdev-&gt;dev,</div><div class='add'>+		pdev-&gt;dev.driver_data);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(rdev))</div><div class='add'>+		return PTR_ERR(rdev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devexit wm8400_regulator_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct regulator_dev *rdev = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	regulator_unregister(rdev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct platform_driver wm8400_regulator_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = "wm8400-regulator",</div><div class='add'>+	},</div><div class='add'>+	.probe = wm8400_regulator_probe,</div><div class='add'>+	.remove = __devexit_p(wm8400_regulator_remove),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * wm8400_register_regulator - enable software control of a WM8400 regulator</div><div class='add'>+ *</div><div class='add'>+ * This function enables software control of a WM8400 regulator via</div><div class='add'>+ * the regulator API.  It is intended to be called from the</div><div class='add'>+ * platform_init() callback of the WM8400 MFD driver.</div><div class='add'>+ *</div><div class='add'>+ * @param dev      The WM8400 device to operate on.</div><div class='add'>+ * @param reg      The regulator to control.</div><div class='add'>+ * @param initdata Regulator initdata for the regulator.</div><div class='add'>+ */</div><div class='add'>+int wm8400_register_regulator(struct device *dev, int reg,</div><div class='add'>+			      struct regulator_init_data *initdata)</div><div class='add'>+{</div><div class='add'>+	struct wm8400 *wm8400 = dev-&gt;driver_data;</div><div class='add'>+</div><div class='add'>+	if (wm8400-&gt;regulators[reg].name)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	initdata-&gt;driver_data = wm8400;</div><div class='add'>+</div><div class='add'>+	wm8400-&gt;regulators[reg].name = "wm8400-regulator";</div><div class='add'>+	wm8400-&gt;regulators[reg].id = reg;</div><div class='add'>+	wm8400-&gt;regulators[reg].dev.parent = dev;</div><div class='add'>+	wm8400-&gt;regulators[reg].dev.driver_data = wm8400;</div><div class='add'>+	wm8400-&gt;regulators[reg].dev.platform_data = initdata;</div><div class='add'>+</div><div class='add'>+	return platform_device_register(&amp;wm8400-&gt;regulators[reg]);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(wm8400_register_regulator);</div><div class='add'>+</div><div class='add'>+static int __init wm8400_regulator_init(void)</div><div class='add'>+{</div><div class='add'>+	return platform_driver_register(&amp;wm8400_regulator_driver);</div><div class='add'>+}</div><div class='add'>+module_init(wm8400_regulator_init);</div><div class='add'>+</div><div class='add'>+static void __exit wm8400_regulator_exit(void)</div><div class='add'>+{</div><div class='add'>+	platform_driver_unregister(&amp;wm8400_regulator_driver);</div><div class='add'>+}</div><div class='add'>+module_exit(wm8400_regulator_exit);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Mark Brown &lt;broonie@opensource.wolfsonmicro.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("WM8400 regulator driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_ALIAS("platform:wm8400-regulator");</div><div class='head'>diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig<br/>index 9a9755c92fad..f660ef3e5b29 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/rtc/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/rtc/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/rtc/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/rtc/Kconfig</a></div><div class='hunk'>@@ -220,22 +220,22 @@ config RTC_DRV_PCF8583</div><div class='ctx'> 	  will be called rtc-pcf8583.</div><div class='ctx'> </div><div class='ctx'> config RTC_DRV_M41T80</div><div class='del'>-	tristate "ST M41T80/81/82/83/84/85/87"</div><div class='add'>+	tristate "ST M41T65/M41T80/81/82/83/84/85/87"</div><div class='ctx'> 	help</div><div class='del'>-	  If you say Y here you will get support for the</div><div class='del'>-	  ST M41T80 RTC chips series. Currently following chips are</div><div class='del'>-	  supported: M41T80, M41T81, M41T82, M41T83, M41ST84, M41ST85</div><div class='del'>-	  and M41ST87.</div><div class='add'>+	  If you say Y here you will get support for the ST M41T60</div><div class='add'>+	  and M41T80 RTC chips series. Currently, the following chips are</div><div class='add'>+	  supported: M41T65, M41T80, M41T81, M41T82, M41T83, M41ST84,</div><div class='add'>+	  M41ST85, and M41ST87.</div><div class='ctx'> </div><div class='ctx'> 	  This driver can also be built as a module. If so, the module</div><div class='ctx'> 	  will be called rtc-m41t80.</div><div class='ctx'> </div><div class='ctx'> config RTC_DRV_M41T80_WDT</div><div class='del'>-	bool "ST M41T80 series RTC watchdog timer"</div><div class='add'>+	bool "ST M41T65/M41T80 series RTC watchdog timer"</div><div class='ctx'> 	depends on RTC_DRV_M41T80</div><div class='ctx'> 	help</div><div class='ctx'> 	  If you say Y here you will get support for the</div><div class='del'>-	  watchdog timer in ST M41T80 RTC chips series.</div><div class='add'>+	  watchdog timer in the ST M41T60 and M41T80 RTC chips series.</div><div class='ctx'> </div><div class='ctx'> config RTC_DRV_TWL92330</div><div class='ctx'> 	boolean "TI TWL92330/Menelaus"</div><div class='hunk'>@@ -319,6 +319,15 @@ config RTC_DRV_RS5C348</div><div class='ctx'> 	  This driver can also be built as a module. If so, the module</div><div class='ctx'> 	  will be called rtc-rs5c348.</div><div class='ctx'> </div><div class='add'>+config RTC_DRV_DS3234</div><div class='add'>+	tristate "Maxim/Dallas DS3234"</div><div class='add'>+	help</div><div class='add'>+	  If you say yes here you get support for the</div><div class='add'>+	  Maxim/Dallas DS3234 SPI RTC chip.</div><div class='add'>+</div><div class='add'>+	  This driver can also be built as a module. If so, the module</div><div class='add'>+	  will be called rtc-ds3234.</div><div class='add'>+</div><div class='ctx'> endif # SPI_MASTER</div><div class='ctx'> </div><div class='ctx'> comment "Platform RTC drivers"</div><div class='hunk'>@@ -329,7 +338,7 @@ comment "Platform RTC drivers"</div><div class='ctx'> </div><div class='ctx'> config RTC_DRV_CMOS</div><div class='ctx'> 	tristate "PC-style 'CMOS'"</div><div class='del'>-	depends on X86 || ALPHA || ARM || M32R || ATARI || PPC || MIPS</div><div class='add'>+	depends on X86 || ALPHA || ARM || M32R || ATARI || PPC || MIPS || SPARC64</div><div class='ctx'> 	default y if X86</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say "yes" here to get direct support for the real time clock</div><div class='hunk'>@@ -352,6 +361,11 @@ config RTC_DRV_DS1216</div><div class='ctx'> 	help</div><div class='ctx'> 	  If you say yes here you get support for the Dallas DS1216 RTC chips.</div><div class='ctx'> </div><div class='add'>+config RTC_DRV_DS1286</div><div class='add'>+	tristate "Dallas DS1286"</div><div class='add'>+	help</div><div class='add'>+	  If you say yes here you get support for the Dallas DS1286 RTC chips.</div><div class='add'>+</div><div class='ctx'> config RTC_DRV_DS1302</div><div class='ctx'> 	tristate "Dallas DS1302"</div><div class='ctx'> 	depends on SH_SECUREEDGE5410</div><div class='hunk'>@@ -405,15 +419,36 @@ config RTC_DRV_M48T86</div><div class='ctx'> 	  This driver can also be built as a module. If so, the module</div><div class='ctx'> 	  will be called rtc-m48t86.</div><div class='ctx'> </div><div class='add'>+config RTC_DRV_M48T35</div><div class='add'>+	tristate "ST M48T35"</div><div class='add'>+	help</div><div class='add'>+	  If you say Y here you will get support for the</div><div class='add'>+	  ST M48T35 RTC chip.</div><div class='add'>+</div><div class='add'>+	  This driver can also be built as a module, if so, the module</div><div class='add'>+	  will be called "rtc-m48t35".</div><div class='add'>+</div><div class='ctx'> config RTC_DRV_M48T59</div><div class='del'>-	tristate "ST M48T59"</div><div class='add'>+	tristate "ST M48T59/M48T08/M48T02"</div><div class='ctx'> 	help</div><div class='ctx'> 	  If you say Y here you will get support for the</div><div class='del'>-	  ST M48T59 RTC chip.</div><div class='add'>+	  ST M48T59 RTC chip and compatible ST M48T08 and M48T02.</div><div class='add'>+</div><div class='add'>+	  These chips are usually found in Sun SPARC and UltraSPARC</div><div class='add'>+	  workstations.</div><div class='ctx'> </div><div class='ctx'> 	  This driver can also be built as a module, if so, the module</div><div class='ctx'> 	  will be called "rtc-m48t59".</div><div class='ctx'> </div><div class='add'>+config RTC_DRV_BQ4802</div><div class='add'>+	tristate "TI BQ4802"</div><div class='add'>+	help</div><div class='add'>+	  If you say Y here you will get support for the TI</div><div class='add'>+	  BQ4802 RTC chip.</div><div class='add'>+</div><div class='add'>+	  This driver can also be built as a module. If so, the module</div><div class='add'>+	  will be called rtc-bq4802.</div><div class='add'>+</div><div class='ctx'> config RTC_DRV_V3020</div><div class='ctx'> 	tristate "EM Microelectronic V3020"</div><div class='ctx'> 	help</div><div class='hunk'>@@ -577,10 +612,24 @@ config RTC_DRV_RS5C313</div><div class='ctx'> </div><div class='ctx'> config RTC_DRV_PPC</div><div class='ctx'>        tristate "PowerPC machine dependent RTC support"</div><div class='del'>-       depends on PPC_MERGE</div><div class='add'>+       depends on PPC</div><div class='ctx'>        help</div><div class='ctx'> 	 The PowerPC kernel has machine-specific functions for accessing</div><div class='ctx'> 	 the RTC. This exposes that functionality through the generic RTC</div><div class='ctx'> 	 class.</div><div class='ctx'> </div><div class='add'>+config RTC_DRV_SUN4V</div><div class='add'>+	bool "SUN4V Hypervisor RTC"</div><div class='add'>+	depends on SPARC64</div><div class='add'>+	help</div><div class='add'>+	  If you say Y here you will get support for the Hypervisor</div><div class='add'>+	  based RTC on SUN4V systems.</div><div class='add'>+</div><div class='add'>+config RTC_DRV_STARFIRE</div><div class='add'>+	bool "Starfire RTC"</div><div class='add'>+	depends on SPARC64</div><div class='add'>+	help</div><div class='add'>+	  If you say Y here you will get support for the RTC found on</div><div class='add'>+	  Starfire systems.</div><div class='add'>+</div><div class='ctx'> endif # RTC_CLASS</div><div class='head'>diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile<br/>index 18622ef84cab..d05928b3ca94 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/rtc/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/rtc/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/rtc/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/rtc/Makefile</a></div><div class='hunk'>@@ -23,6 +23,7 @@ obj-$(CONFIG_RTC_DRV_AT91SAM9)	+= rtc-at91sam9.o</div><div class='ctx'> obj-$(CONFIG_RTC_DRV_BFIN)	+= rtc-bfin.o</div><div class='ctx'> obj-$(CONFIG_RTC_DRV_CMOS)	+= rtc-cmos.o</div><div class='ctx'> obj-$(CONFIG_RTC_DRV_DS1216)	+= rtc-ds1216.o</div><div class='add'>+obj-$(CONFIG_RTC_DRV_DS1286)	+= rtc-ds1286.o</div><div class='ctx'> obj-$(CONFIG_RTC_DRV_DS1302)	+= rtc-ds1302.o</div><div class='ctx'> obj-$(CONFIG_RTC_DRV_DS1305)	+= rtc-ds1305.o</div><div class='ctx'> obj-$(CONFIG_RTC_DRV_DS1307)	+= rtc-ds1307.o</div><div class='hunk'>@@ -31,13 +32,18 @@ obj-$(CONFIG_RTC_DRV_DS1511)	+= rtc-ds1511.o</div><div class='ctx'> obj-$(CONFIG_RTC_DRV_DS1553)	+= rtc-ds1553.o</div><div class='ctx'> obj-$(CONFIG_RTC_DRV_DS1672)	+= rtc-ds1672.o</div><div class='ctx'> obj-$(CONFIG_RTC_DRV_DS1742)	+= rtc-ds1742.o</div><div class='add'>+obj-$(CONFIG_RTC_DRV_DS3234)	+= rtc-ds3234.o</div><div class='ctx'> obj-$(CONFIG_RTC_DRV_EP93XX)	+= rtc-ep93xx.o</div><div class='ctx'> obj-$(CONFIG_RTC_DRV_FM3130)	+= rtc-fm3130.o</div><div class='ctx'> obj-$(CONFIG_RTC_DRV_ISL1208)	+= rtc-isl1208.o</div><div class='ctx'> obj-$(CONFIG_RTC_DRV_M41T80)	+= rtc-m41t80.o</div><div class='ctx'> obj-$(CONFIG_RTC_DRV_M41T94)	+= rtc-m41t94.o</div><div class='add'>+obj-$(CONFIG_RTC_DRV_M48T35)	+= rtc-m48t35.o</div><div class='ctx'> obj-$(CONFIG_RTC_DRV_M48T59)	+= rtc-m48t59.o</div><div class='ctx'> obj-$(CONFIG_RTC_DRV_M48T86)	+= rtc-m48t86.o</div><div class='add'>+obj-$(CONFIG_RTC_DRV_BQ4802)	+= rtc-bq4802.o</div><div class='add'>+obj-$(CONFIG_RTC_DRV_SUN4V)	+= rtc-sun4v.o</div><div class='add'>+obj-$(CONFIG_RTC_DRV_STARFIRE)	+= rtc-starfire.o</div><div class='ctx'> obj-$(CONFIG_RTC_DRV_MAX6900)	+= rtc-max6900.o</div><div class='ctx'> obj-$(CONFIG_RTC_DRV_MAX6902)	+= rtc-max6902.o</div><div class='ctx'> obj-$(CONFIG_RTC_DRV_OMAP)	+= rtc-omap.o</div><div class='head'>diff --git a/drivers/rtc/rtc-at91rm9200.c b/drivers/rtc/rtc-at91rm9200.c<br/>index 4e888cc8be5b..37082616482b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/rtc/rtc-at91rm9200.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/rtc/rtc-at91rm9200.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/rtc/rtc-at91rm9200.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/rtc/rtc-at91rm9200.c</a></div><div class='hunk'>@@ -29,10 +29,10 @@</div><div class='ctx'> #include &lt;linux/completion.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;mach/at91_rtc.h&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#define AT91_RTC_FREQ		1</div><div class='ctx'> #define AT91_RTC_EPOCH		1900UL	/* just like arch/arm/common/rtctime.c */</div><div class='ctx'> </div><div class='ctx'> static DECLARE_COMPLETION(at91_rtc_updated);</div><div class='hunk'>@@ -228,8 +228,6 @@ static int at91_rtc_proc(struct device *dev, struct seq_file *seq)</div><div class='ctx'> 			(imr &amp; AT91_RTC_ACKUPD) ? "yes" : "no");</div><div class='ctx'> 	seq_printf(seq, "periodic_IRQ\t: %s\n",</div><div class='ctx'> 			(imr &amp; AT91_RTC_SECEV) ? "yes" : "no");</div><div class='del'>-	seq_printf(seq, "periodic_freq\t: %ld\n",</div><div class='del'>-			(unsigned long) AT91_RTC_FREQ);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/rtc/rtc-bq4802.c b/drivers/rtc/rtc-bq4802.c<br/>new file mode 100644<br/>index 000000000000..189a018bdf34<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/rtc/rtc-bq4802.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/rtc/rtc-bq4802.c</a></div><div class='hunk'>@@ -0,0 +1,230 @@</div><div class='add'>+/* rtc-bq4802.c: TI BQ4802 RTC driver.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2008 David S. Miller &lt;davem@davemloft.net&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/rtc.h&gt;</div><div class='add'>+#include &lt;linux/bcd.h&gt;</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("David S. Miller &lt;davem@davemloft.net&gt;");</div><div class='add'>+MODULE_DESCRIPTION("TI BQ4802 RTC driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='add'>+struct bq4802 {</div><div class='add'>+	void __iomem		*regs;</div><div class='add'>+	unsigned long		ioport;</div><div class='add'>+	struct rtc_device	*rtc;</div><div class='add'>+	spinlock_t		lock;</div><div class='add'>+	struct resource		*r;</div><div class='add'>+	u8 (*read)(struct bq4802 *, int);</div><div class='add'>+	void (*write)(struct bq4802 *, int, u8);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u8 bq4802_read_io(struct bq4802 *p, int off)</div><div class='add'>+{</div><div class='add'>+	return inb(p-&gt;ioport + off);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bq4802_write_io(struct bq4802 *p, int off, u8 val)</div><div class='add'>+{</div><div class='add'>+	outb(val, p-&gt;ioport + off);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 bq4802_read_mem(struct bq4802 *p, int off)</div><div class='add'>+{</div><div class='add'>+	return readb(p-&gt;regs + off);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bq4802_write_mem(struct bq4802 *p, int off, u8 val)</div><div class='add'>+{</div><div class='add'>+	writeb(val, p-&gt;regs + off);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bq4802_read_time(struct device *dev, struct rtc_time *tm)</div><div class='add'>+{</div><div class='add'>+	struct platform_device *pdev = to_platform_device(dev);</div><div class='add'>+	struct bq4802 *p = platform_get_drvdata(pdev);</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	unsigned int century;</div><div class='add'>+	u8 val;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;p-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	val = p-&gt;read(p, 0x0e);</div><div class='add'>+	p-&gt;write(p, 0xe, val | 0x08);</div><div class='add'>+</div><div class='add'>+	tm-&gt;tm_sec = p-&gt;read(p, 0x00);</div><div class='add'>+	tm-&gt;tm_min = p-&gt;read(p, 0x02);</div><div class='add'>+	tm-&gt;tm_hour = p-&gt;read(p, 0x04);</div><div class='add'>+	tm-&gt;tm_mday = p-&gt;read(p, 0x06);</div><div class='add'>+	tm-&gt;tm_mon = p-&gt;read(p, 0x09);</div><div class='add'>+	tm-&gt;tm_year = p-&gt;read(p, 0x0a);</div><div class='add'>+	tm-&gt;tm_wday = p-&gt;read(p, 0x08);</div><div class='add'>+	century = p-&gt;read(p, 0x0f);</div><div class='add'>+</div><div class='add'>+	p-&gt;write(p, 0x0e, val);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;p-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	BCD_TO_BIN(tm-&gt;tm_sec);</div><div class='add'>+	BCD_TO_BIN(tm-&gt;tm_min);</div><div class='add'>+	BCD_TO_BIN(tm-&gt;tm_hour);</div><div class='add'>+	BCD_TO_BIN(tm-&gt;tm_mday);</div><div class='add'>+	BCD_TO_BIN(tm-&gt;tm_mon);</div><div class='add'>+	BCD_TO_BIN(tm-&gt;tm_year);</div><div class='add'>+	BCD_TO_BIN(tm-&gt;tm_wday);</div><div class='add'>+	BCD_TO_BIN(century);</div><div class='add'>+</div><div class='add'>+	tm-&gt;tm_year += (century * 100);</div><div class='add'>+	tm-&gt;tm_year -= 1900;</div><div class='add'>+</div><div class='add'>+	tm-&gt;tm_mon--;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bq4802_set_time(struct device *dev, struct rtc_time *tm)</div><div class='add'>+{</div><div class='add'>+	struct platform_device *pdev = to_platform_device(dev);</div><div class='add'>+	struct bq4802 *p = platform_get_drvdata(pdev);</div><div class='add'>+	u8 sec, min, hrs, day, mon, yrs, century, val;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	unsigned int year;</div><div class='add'>+</div><div class='add'>+	year = tm-&gt;tm_year + 1900;</div><div class='add'>+	century = year / 100;</div><div class='add'>+	yrs = year % 100;</div><div class='add'>+</div><div class='add'>+	mon = tm-&gt;tm_mon + 1;   /* tm_mon starts at zero */</div><div class='add'>+	day = tm-&gt;tm_mday;</div><div class='add'>+	hrs = tm-&gt;tm_hour;</div><div class='add'>+	min = tm-&gt;tm_min;</div><div class='add'>+	sec = tm-&gt;tm_sec;</div><div class='add'>+</div><div class='add'>+	BIN_TO_BCD(sec);</div><div class='add'>+	BIN_TO_BCD(min);</div><div class='add'>+	BIN_TO_BCD(hrs);</div><div class='add'>+	BIN_TO_BCD(day);</div><div class='add'>+	BIN_TO_BCD(mon);</div><div class='add'>+	BIN_TO_BCD(yrs);</div><div class='add'>+	BIN_TO_BCD(century);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;p-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	val = p-&gt;read(p, 0x0e);</div><div class='add'>+	p-&gt;write(p, 0x0e, val | 0x08);</div><div class='add'>+</div><div class='add'>+	p-&gt;write(p, 0x00, sec);</div><div class='add'>+	p-&gt;write(p, 0x02, min);</div><div class='add'>+	p-&gt;write(p, 0x04, hrs);</div><div class='add'>+	p-&gt;write(p, 0x06, day);</div><div class='add'>+	p-&gt;write(p, 0x09, mon);</div><div class='add'>+	p-&gt;write(p, 0x0a, yrs);</div><div class='add'>+	p-&gt;write(p, 0x0f, century);</div><div class='add'>+</div><div class='add'>+	p-&gt;write(p, 0x0e, val);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;p-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct rtc_class_ops bq4802_ops = {</div><div class='add'>+	.read_time	= bq4802_read_time,</div><div class='add'>+	.set_time	= bq4802_set_time,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __devinit bq4802_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct bq4802 *p = kzalloc(sizeof(*p), GFP_KERNEL);</div><div class='add'>+	int err = -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (!p)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;p-&gt;lock);</div><div class='add'>+</div><div class='add'>+	p-&gt;r = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='add'>+	if (!p-&gt;r) {</div><div class='add'>+		p-&gt;r = platform_get_resource(pdev, IORESOURCE_IO, 0);</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		if (!p-&gt;r)</div><div class='add'>+			goto out_free;</div><div class='add'>+	}</div><div class='add'>+	if (p-&gt;r-&gt;flags &amp; IORESOURCE_IO) {</div><div class='add'>+		p-&gt;ioport = p-&gt;r-&gt;start;</div><div class='add'>+		p-&gt;read = bq4802_read_io;</div><div class='add'>+		p-&gt;write = bq4802_write_io;</div><div class='add'>+	} else if (p-&gt;r-&gt;flags &amp; IORESOURCE_MEM) {</div><div class='add'>+		p-&gt;regs = ioremap(p-&gt;r-&gt;start, resource_size(p-&gt;r));</div><div class='add'>+		p-&gt;read = bq4802_read_mem;</div><div class='add'>+		p-&gt;write = bq4802_write_mem;</div><div class='add'>+	} else {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto out_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	p-&gt;rtc = rtc_device_register("bq4802", &amp;pdev-&gt;dev,</div><div class='add'>+				     &amp;bq4802_ops, THIS_MODULE);</div><div class='add'>+	if (IS_ERR(p-&gt;rtc)) {</div><div class='add'>+		err = PTR_ERR(p-&gt;rtc);</div><div class='add'>+		goto out_iounmap;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	platform_set_drvdata(pdev, p);</div><div class='add'>+	err = 0;</div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='add'>+</div><div class='add'>+out_iounmap:</div><div class='add'>+	if (p-&gt;r-&gt;flags &amp; IORESOURCE_MEM)</div><div class='add'>+		iounmap(p-&gt;regs);</div><div class='add'>+out_free:</div><div class='add'>+	kfree(p);</div><div class='add'>+	goto out;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devexit bq4802_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct bq4802 *p = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	rtc_device_unregister(p-&gt;rtc);</div><div class='add'>+	if (p-&gt;r-&gt;flags &amp; IORESOURCE_MEM)</div><div class='add'>+		iounmap(p-&gt;regs);</div><div class='add'>+</div><div class='add'>+	platform_set_drvdata(pdev, NULL);</div><div class='add'>+</div><div class='add'>+	kfree(p);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* work with hotplug and coldplug */</div><div class='add'>+MODULE_ALIAS("platform:rtc-bq4802");</div><div class='add'>+</div><div class='add'>+static struct platform_driver bq4802_driver = {</div><div class='add'>+	.driver		= {</div><div class='add'>+		.name	= "rtc-bq4802",</div><div class='add'>+		.owner	= THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+	.probe		= bq4802_probe,</div><div class='add'>+	.remove		= __devexit_p(bq4802_remove),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init bq4802_init(void)</div><div class='add'>+{</div><div class='add'>+	return platform_driver_register(&amp;bq4802_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit bq4802_exit(void)</div><div class='add'>+{</div><div class='add'>+	platform_driver_unregister(&amp;bq4802_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(bq4802_init);</div><div class='add'>+module_exit(bq4802_exit);</div><div class='head'>diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c<br/>index b184367637d0..963ad0b6a4e9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/rtc/rtc-cmos.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/rtc/rtc-cmos.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/rtc/rtc-cmos.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/rtc/rtc-cmos.c</a></div><div class='hunk'>@@ -636,7 +636,7 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq)</div><div class='ctx'> 	 */</div><div class='ctx'> #if	defined(CONFIG_ATARI)</div><div class='ctx'> 	address_space = 64;</div><div class='del'>-#elif defined(__i386__) || defined(__x86_64__) || defined(__arm__)</div><div class='add'>+#elif defined(__i386__) || defined(__x86_64__) || defined(__arm__) || defined(__sparc__)</div><div class='ctx'> 	address_space = 128;</div><div class='ctx'> #else</div><div class='ctx'> #warning Assuming 128 bytes of RTC+NVRAM address space, not 64 bytes.</div><div class='hunk'>@@ -699,7 +699,8 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq)</div><div class='ctx'> 	/* FIXME teach the alarm code how to handle binary mode;</div><div class='ctx'> 	 * &lt;asm-generic/rtc.h&gt; doesn't know 12-hour mode either.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!(rtc_control &amp; RTC_24H) || (rtc_control &amp; (RTC_DM_BINARY))) {</div><div class='add'>+	if (is_valid_irq(rtc_irq) &amp;&amp;</div><div class='add'>+	    (!(rtc_control &amp; RTC_24H) || (rtc_control &amp; (RTC_DM_BINARY)))) {</div><div class='ctx'> 		dev_dbg(dev, "only 24-hr BCD mode supported\n");</div><div class='ctx'> 		retval = -ENXIO;</div><div class='ctx'> 		goto cleanup1;</div><div class='hunk'>@@ -912,6 +913,92 @@ static inline int cmos_poweroff(struct device *dev)</div><div class='ctx'>  * predate even PNPBIOS should set up platform_bus devices.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#ifdef	CONFIG_ACPI</div><div class='add'>+</div><div class='add'>+#include &lt;linux/acpi.h&gt;</div><div class='add'>+</div><div class='add'>+#ifdef	CONFIG_PM</div><div class='add'>+static u32 rtc_handler(void *context)</div><div class='add'>+{</div><div class='add'>+	acpi_clear_event(ACPI_EVENT_RTC);</div><div class='add'>+	acpi_disable_event(ACPI_EVENT_RTC, 0);</div><div class='add'>+	return ACPI_INTERRUPT_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void rtc_wake_setup(void)</div><div class='add'>+{</div><div class='add'>+	acpi_install_fixed_event_handler(ACPI_EVENT_RTC, rtc_handler, NULL);</div><div class='add'>+	/*</div><div class='add'>+	 * After the RTC handler is installed, the Fixed_RTC event should</div><div class='add'>+	 * be disabled. Only when the RTC alarm is set will it be enabled.</div><div class='add'>+	 */</div><div class='add'>+	acpi_clear_event(ACPI_EVENT_RTC);</div><div class='add'>+	acpi_disable_event(ACPI_EVENT_RTC, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtc_wake_on(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	acpi_clear_event(ACPI_EVENT_RTC);</div><div class='add'>+	acpi_enable_event(ACPI_EVENT_RTC, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtc_wake_off(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	acpi_disable_event(ACPI_EVENT_RTC, 0);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+#define rtc_wake_setup()	do{}while(0)</div><div class='add'>+#define rtc_wake_on		NULL</div><div class='add'>+#define rtc_wake_off		NULL</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* Every ACPI platform has a mc146818 compatible "cmos rtc".  Here we find</div><div class='add'>+ * its device node and pass extra config data.  This helps its driver use</div><div class='add'>+ * capabilities that the now-obsolete mc146818 didn't have, and informs it</div><div class='add'>+ * that this board's RTC is wakeup-capable (per ACPI spec).</div><div class='add'>+ */</div><div class='add'>+static struct cmos_rtc_board_info acpi_rtc_info;</div><div class='add'>+</div><div class='add'>+static void __devinit</div><div class='add'>+cmos_wake_setup(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	if (acpi_disabled)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	rtc_wake_setup();</div><div class='add'>+	acpi_rtc_info.wake_on = rtc_wake_on;</div><div class='add'>+	acpi_rtc_info.wake_off = rtc_wake_off;</div><div class='add'>+</div><div class='add'>+	/* workaround bug in some ACPI tables */</div><div class='add'>+	if (acpi_gbl_FADT.month_alarm &amp;&amp; !acpi_gbl_FADT.day_alarm) {</div><div class='add'>+		dev_dbg(dev, "bogus FADT month_alarm (%d)\n",</div><div class='add'>+			acpi_gbl_FADT.month_alarm);</div><div class='add'>+		acpi_gbl_FADT.month_alarm = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	acpi_rtc_info.rtc_day_alarm = acpi_gbl_FADT.day_alarm;</div><div class='add'>+	acpi_rtc_info.rtc_mon_alarm = acpi_gbl_FADT.month_alarm;</div><div class='add'>+	acpi_rtc_info.rtc_century = acpi_gbl_FADT.century;</div><div class='add'>+</div><div class='add'>+	/* NOTE:  S4_RTC_WAKE is NOT currently useful to Linux */</div><div class='add'>+	if (acpi_gbl_FADT.flags &amp; ACPI_FADT_S4_RTC_WAKE)</div><div class='add'>+		dev_info(dev, "RTC can wake from S4\n");</div><div class='add'>+</div><div class='add'>+	dev-&gt;platform_data = &amp;acpi_rtc_info;</div><div class='add'>+</div><div class='add'>+	/* RTC always wakes from S1/S2/S3, and often S4/STD */</div><div class='add'>+	device_init_wakeup(dev, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+static void __devinit</div><div class='add'>+cmos_wake_setup(struct device *dev)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #ifdef	CONFIG_PNP</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/pnp.h&gt;</div><div class='hunk'>@@ -919,6 +1006,8 @@ static inline int cmos_poweroff(struct device *dev)</div><div class='ctx'> static int __devinit</div><div class='ctx'> cmos_pnp_probe(struct pnp_dev *pnp, const struct pnp_device_id *id)</div><div class='ctx'> {</div><div class='add'>+	cmos_wake_setup(&amp;pnp-&gt;dev);</div><div class='add'>+</div><div class='ctx'> 	if (pnp_port_start(pnp,0) == 0x70 &amp;&amp; !pnp_irq_valid(pnp,0))</div><div class='ctx'> 		/* Some machines contain a PNP entry for the RTC, but</div><div class='ctx'> 		 * don't define the IRQ. It should always be safe to</div><div class='hunk'>@@ -996,6 +1085,7 @@ static struct pnp_driver cmos_pnp_driver = {</div><div class='ctx'> </div><div class='ctx'> static int __init cmos_platform_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='add'>+	cmos_wake_setup(&amp;pdev-&gt;dev);</div><div class='ctx'> 	return cmos_do_probe(&amp;pdev-&gt;dev,</div><div class='ctx'> 			platform_get_resource(pdev, IORESOURCE_IO, 0),</div><div class='ctx'> 			platform_get_irq(pdev, 0));</div><div class='hunk'>@@ -1030,29 +1120,32 @@ static struct platform_driver cmos_platform_driver = {</div><div class='ctx'> </div><div class='ctx'> static int __init cmos_init(void)</div><div class='ctx'> {</div><div class='add'>+	int retval = 0;</div><div class='add'>+</div><div class='ctx'> #ifdef	CONFIG_PNP</div><div class='del'>-	if (pnp_platform_devices)</div><div class='del'>-		return pnp_register_driver(&amp;cmos_pnp_driver);</div><div class='del'>-	else</div><div class='del'>-		return platform_driver_probe(&amp;cmos_platform_driver,</div><div class='del'>-			cmos_platform_probe);</div><div class='del'>-#else</div><div class='del'>-	return platform_driver_probe(&amp;cmos_platform_driver,</div><div class='del'>-			cmos_platform_probe);</div><div class='del'>-#endif /* CONFIG_PNP */</div><div class='add'>+	pnp_register_driver(&amp;cmos_pnp_driver);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	if (!cmos_rtc.dev)</div><div class='add'>+		retval = platform_driver_probe(&amp;cmos_platform_driver,</div><div class='add'>+					       cmos_platform_probe);</div><div class='add'>+</div><div class='add'>+	if (retval == 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+#ifdef	CONFIG_PNP</div><div class='add'>+	pnp_unregister_driver(&amp;cmos_pnp_driver);</div><div class='add'>+#endif</div><div class='add'>+	return retval;</div><div class='ctx'> }</div><div class='ctx'> module_init(cmos_init);</div><div class='ctx'> </div><div class='ctx'> static void __exit cmos_exit(void)</div><div class='ctx'> {</div><div class='ctx'> #ifdef	CONFIG_PNP</div><div class='del'>-	if (pnp_platform_devices)</div><div class='del'>-		pnp_unregister_driver(&amp;cmos_pnp_driver);</div><div class='del'>-	else</div><div class='del'>-		platform_driver_unregister(&amp;cmos_platform_driver);</div><div class='del'>-#else</div><div class='add'>+	pnp_unregister_driver(&amp;cmos_pnp_driver);</div><div class='add'>+#endif</div><div class='ctx'> 	platform_driver_unregister(&amp;cmos_platform_driver);</div><div class='del'>-#endif /* CONFIG_PNP */</div><div class='ctx'> }</div><div class='ctx'> module_exit(cmos_exit);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c<br/>index 52e2743b04ec..079e9ed907e0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/rtc/rtc-dev.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/rtc/rtc-dev.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/rtc/rtc-dev.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/rtc/rtc-dev.c</a></div><div class='hunk'>@@ -432,9 +432,15 @@ static int rtc_dev_release(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='ctx'> 	struct rtc_device *rtc = file-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_RTC_INTF_DEV_UIE_EMUL</div><div class='del'>-	clear_uie(rtc);</div><div class='del'>-#endif</div><div class='add'>+	/* We shut down the repeating IRQs that userspace enabled,</div><div class='add'>+	 * since nothing is listening to them.</div><div class='add'>+	 *  - Update (UIE) ... currently only managed through ioctls</div><div class='add'>+	 *  - Periodic (PIE) ... also used through rtc_*() interface calls</div><div class='add'>+	 *</div><div class='add'>+	 * Leave the alarm alone; it may be set to trigger a system wakeup</div><div class='add'>+	 * later, or be used by kernel code, and is a one-shot event anyway.</div><div class='add'>+	 */</div><div class='add'>+	rtc_dev_ioctl(file, RTC_UIE_OFF, 0);</div><div class='ctx'> 	rtc_irq_set_state(rtc, NULL, 0);</div><div class='ctx'> </div><div class='ctx'> 	if (rtc-&gt;ops-&gt;release)</div><div class='head'>diff --git a/drivers/rtc/rtc-ds1286.c b/drivers/rtc/rtc-ds1286.c<br/>new file mode 100644<br/>index 000000000000..4fcb16bbff4a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/rtc/rtc-ds1286.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/rtc/rtc-ds1286.c</a></div><div class='hunk'>@@ -0,0 +1,410 @@</div><div class='add'>+/*</div><div class='add'>+ * DS1286 Real Time Clock interface for Linux</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 1998, 1999, 2000 Ralf Baechle</div><div class='add'>+ * Copyright (C) 2008 Thomas Bogendoerfer</div><div class='add'>+ *</div><div class='add'>+ * Based on code written by Paul Gortmaker.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms of the GNU General Public License as published by the</div><div class='add'>+ * Free Software Foundation; either version 2 of the License, or (at your</div><div class='add'>+ * option) any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/rtc.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/bcd.h&gt;</div><div class='add'>+#include &lt;linux/ds1286.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+</div><div class='add'>+#define DRV_VERSION		"1.0"</div><div class='add'>+</div><div class='add'>+struct ds1286_priv {</div><div class='add'>+	struct rtc_device *rtc;</div><div class='add'>+	u32 __iomem *rtcregs;</div><div class='add'>+	size_t size;</div><div class='add'>+	unsigned long baseaddr;</div><div class='add'>+	spinlock_t lock;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline u8 ds1286_rtc_read(struct ds1286_priv *priv, int reg)</div><div class='add'>+{</div><div class='add'>+	return __raw_readl(&amp;priv-&gt;rtcregs[reg]) &amp; 0xff;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void ds1286_rtc_write(struct ds1286_priv *priv, u8 data, int reg)</div><div class='add'>+{</div><div class='add'>+	__raw_writel(data, &amp;priv-&gt;rtcregs[reg]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_RTC_INTF_DEV</div><div class='add'>+</div><div class='add'>+static int ds1286_ioctl(struct device *dev, unsigned int cmd, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	struct ds1286_priv *priv = dev_get_drvdata(dev);</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	unsigned char val;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case RTC_AIE_OFF:</div><div class='add'>+		/* Mask alarm int. enab. bit	*/</div><div class='add'>+		spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='add'>+		val = ds1286_rtc_read(priv, RTC_CMD);</div><div class='add'>+		val |=  RTC_TDM;</div><div class='add'>+		ds1286_rtc_write(priv, val, RTC_CMD);</div><div class='add'>+		spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='add'>+		break;</div><div class='add'>+	case RTC_AIE_ON:</div><div class='add'>+		/* Allow alarm interrupts.	*/</div><div class='add'>+		spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='add'>+		val = ds1286_rtc_read(priv, RTC_CMD);</div><div class='add'>+		val &amp;=  ~RTC_TDM;</div><div class='add'>+		ds1286_rtc_write(priv, val, RTC_CMD);</div><div class='add'>+		spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='add'>+		break;</div><div class='add'>+	case RTC_WIE_OFF:</div><div class='add'>+		/* Mask watchdog int. enab. bit	*/</div><div class='add'>+		spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='add'>+		val = ds1286_rtc_read(priv, RTC_CMD);</div><div class='add'>+		val |= RTC_WAM;</div><div class='add'>+		ds1286_rtc_write(priv, val, RTC_CMD);</div><div class='add'>+		spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='add'>+		break;</div><div class='add'>+	case RTC_WIE_ON:</div><div class='add'>+		/* Allow watchdog interrupts.	*/</div><div class='add'>+		spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='add'>+		val = ds1286_rtc_read(priv, RTC_CMD);</div><div class='add'>+		val &amp;= ~RTC_WAM;</div><div class='add'>+		ds1286_rtc_write(priv, val, RTC_CMD);</div><div class='add'>+		spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -ENOIOCTLCMD;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+#define ds1286_ioctl    NULL</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PROC_FS</div><div class='add'>+</div><div class='add'>+static int ds1286_proc(struct device *dev, struct seq_file *seq)</div><div class='add'>+{</div><div class='add'>+	struct ds1286_priv *priv = dev_get_drvdata(dev);</div><div class='add'>+	unsigned char month, cmd, amode;</div><div class='add'>+	const char *s;</div><div class='add'>+</div><div class='add'>+	month = ds1286_rtc_read(priv, RTC_MONTH);</div><div class='add'>+	seq_printf(seq,</div><div class='add'>+		   "oscillator\t: %s\n"</div><div class='add'>+		   "square_wave\t: %s\n",</div><div class='add'>+		   (month &amp; RTC_EOSC) ? "disabled" : "enabled",</div><div class='add'>+		   (month &amp; RTC_ESQW) ? "disabled" : "enabled");</div><div class='add'>+</div><div class='add'>+	amode = ((ds1286_rtc_read(priv, RTC_MINUTES_ALARM) &amp; 0x80) &gt;&gt; 5) |</div><div class='add'>+		((ds1286_rtc_read(priv, RTC_HOURS_ALARM) &amp; 0x80) &gt;&gt; 6) |</div><div class='add'>+		((ds1286_rtc_read(priv, RTC_DAY_ALARM) &amp; 0x80) &gt;&gt; 7);</div><div class='add'>+	switch (amode) {</div><div class='add'>+	case 7:</div><div class='add'>+		s = "each minute";</div><div class='add'>+		break;</div><div class='add'>+	case 3:</div><div class='add'>+		s = "minutes match";</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		s = "hours and minutes match";</div><div class='add'>+		break;</div><div class='add'>+	case 0:</div><div class='add'>+		s = "days, hours and minutes match";</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		s = "invalid";</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	seq_printf(seq, "alarm_mode\t: %s\n", s);</div><div class='add'>+</div><div class='add'>+	cmd = ds1286_rtc_read(priv, RTC_CMD);</div><div class='add'>+	seq_printf(seq,</div><div class='add'>+		   "alarm_enable\t: %s\n"</div><div class='add'>+		   "wdog_alarm\t: %s\n"</div><div class='add'>+		   "alarm_mask\t: %s\n"</div><div class='add'>+		   "wdog_alarm_mask\t: %s\n"</div><div class='add'>+		   "interrupt_mode\t: %s\n"</div><div class='add'>+		   "INTB_mode\t: %s_active\n"</div><div class='add'>+		   "interrupt_pins\t: %s\n",</div><div class='add'>+		   (cmd &amp; RTC_TDF) ? "yes" : "no",</div><div class='add'>+		   (cmd &amp; RTC_WAF) ? "yes" : "no",</div><div class='add'>+		   (cmd &amp; RTC_TDM) ? "disabled" : "enabled",</div><div class='add'>+		   (cmd &amp; RTC_WAM) ? "disabled" : "enabled",</div><div class='add'>+		   (cmd &amp; RTC_PU_LVL) ? "pulse" : "level",</div><div class='add'>+		   (cmd &amp; RTC_IBH_LO) ? "low" : "high",</div><div class='add'>+		   (cmd &amp; RTC_IPSW) ? "unswapped" : "swapped");</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+#define ds1286_proc     NULL</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static int ds1286_read_time(struct device *dev, struct rtc_time *tm)</div><div class='add'>+{</div><div class='add'>+	struct ds1286_priv *priv = dev_get_drvdata(dev);</div><div class='add'>+	unsigned char save_control;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	unsigned long uip_watchdog = jiffies;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * read RTC once any update in progress is done. The update</div><div class='add'>+	 * can take just over 2ms. We wait 10 to 20ms. There is no need to</div><div class='add'>+	 * to poll-wait (up to 1s - eeccch) for the falling edge of RTC_UIP.</div><div class='add'>+	 * If you need to know *exactly* when a second has started, enable</div><div class='add'>+	 * periodic update complete interrupts, (via ioctl) and then</div><div class='add'>+	 * immediately read /dev/rtc which will block until you get the IRQ.</div><div class='add'>+	 * Once the read clears, read the RTC time (again via ioctl). Easy.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	if (ds1286_rtc_read(priv, RTC_CMD) &amp; RTC_TE)</div><div class='add'>+		while (time_before(jiffies, uip_watchdog + 2*HZ/100))</div><div class='add'>+			barrier();</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Only the values that we read from the RTC are set. We leave</div><div class='add'>+	 * tm_wday, tm_yday and tm_isdst untouched. Even though the</div><div class='add'>+	 * RTC has RTC_DAY_OF_WEEK, we ignore it, as it is only updated</div><div class='add'>+	 * by the RTC when initially set to a non-zero value.</div><div class='add'>+	 */</div><div class='add'>+	spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='add'>+	save_control = ds1286_rtc_read(priv, RTC_CMD);</div><div class='add'>+	ds1286_rtc_write(priv, (save_control|RTC_TE), RTC_CMD);</div><div class='add'>+</div><div class='add'>+	tm-&gt;tm_sec = ds1286_rtc_read(priv, RTC_SECONDS);</div><div class='add'>+	tm-&gt;tm_min = ds1286_rtc_read(priv, RTC_MINUTES);</div><div class='add'>+	tm-&gt;tm_hour = ds1286_rtc_read(priv, RTC_HOURS) &amp; 0x3f;</div><div class='add'>+	tm-&gt;tm_mday = ds1286_rtc_read(priv, RTC_DATE);</div><div class='add'>+	tm-&gt;tm_mon = ds1286_rtc_read(priv, RTC_MONTH) &amp; 0x1f;</div><div class='add'>+	tm-&gt;tm_year = ds1286_rtc_read(priv, RTC_YEAR);</div><div class='add'>+</div><div class='add'>+	ds1286_rtc_write(priv, save_control, RTC_CMD);</div><div class='add'>+	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	tm-&gt;tm_sec = bcd2bin(tm-&gt;tm_sec);</div><div class='add'>+	tm-&gt;tm_min = bcd2bin(tm-&gt;tm_min);</div><div class='add'>+	tm-&gt;tm_hour = bcd2bin(tm-&gt;tm_hour);</div><div class='add'>+	tm-&gt;tm_mday = bcd2bin(tm-&gt;tm_mday);</div><div class='add'>+	tm-&gt;tm_mon = bcd2bin(tm-&gt;tm_mon);</div><div class='add'>+	tm-&gt;tm_year = bcd2bin(tm-&gt;tm_year);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Account for differences between how the RTC uses the values</div><div class='add'>+	 * and how they are defined in a struct rtc_time;</div><div class='add'>+	 */</div><div class='add'>+	if (tm-&gt;tm_year &lt; 45)</div><div class='add'>+		tm-&gt;tm_year += 30;</div><div class='add'>+	tm-&gt;tm_year += 40;</div><div class='add'>+	if (tm-&gt;tm_year &lt; 70)</div><div class='add'>+		tm-&gt;tm_year += 100;</div><div class='add'>+</div><div class='add'>+	tm-&gt;tm_mon--;</div><div class='add'>+</div><div class='add'>+	return rtc_valid_tm(tm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ds1286_set_time(struct device *dev, struct rtc_time *tm)</div><div class='add'>+{</div><div class='add'>+	struct ds1286_priv *priv = dev_get_drvdata(dev);</div><div class='add'>+	unsigned char mon, day, hrs, min, sec;</div><div class='add'>+	unsigned char save_control;</div><div class='add'>+	unsigned int yrs;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	yrs = tm-&gt;tm_year + 1900;</div><div class='add'>+	mon = tm-&gt;tm_mon + 1;   /* tm_mon starts at zero */</div><div class='add'>+	day = tm-&gt;tm_mday;</div><div class='add'>+	hrs = tm-&gt;tm_hour;</div><div class='add'>+	min = tm-&gt;tm_min;</div><div class='add'>+	sec = tm-&gt;tm_sec;</div><div class='add'>+</div><div class='add'>+	if (yrs &lt; 1970)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	yrs -= 1940;</div><div class='add'>+	if (yrs &gt; 255)    /* They are unsigned */</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (yrs &gt;= 100)</div><div class='add'>+		yrs -= 100;</div><div class='add'>+</div><div class='add'>+	sec = bin2bcd(sec);</div><div class='add'>+	min = bin2bcd(min);</div><div class='add'>+	hrs = bin2bcd(hrs);</div><div class='add'>+	day = bin2bcd(day);</div><div class='add'>+	mon = bin2bcd(mon);</div><div class='add'>+	yrs = bin2bcd(yrs);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='add'>+	save_control = ds1286_rtc_read(priv, RTC_CMD);</div><div class='add'>+	ds1286_rtc_write(priv, (save_control|RTC_TE), RTC_CMD);</div><div class='add'>+</div><div class='add'>+	ds1286_rtc_write(priv, yrs, RTC_YEAR);</div><div class='add'>+	ds1286_rtc_write(priv, mon, RTC_MONTH);</div><div class='add'>+	ds1286_rtc_write(priv, day, RTC_DATE);</div><div class='add'>+	ds1286_rtc_write(priv, hrs, RTC_HOURS);</div><div class='add'>+	ds1286_rtc_write(priv, min, RTC_MINUTES);</div><div class='add'>+	ds1286_rtc_write(priv, sec, RTC_SECONDS);</div><div class='add'>+	ds1286_rtc_write(priv, 0, RTC_HUNDREDTH_SECOND);</div><div class='add'>+</div><div class='add'>+	ds1286_rtc_write(priv, save_control, RTC_CMD);</div><div class='add'>+	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ds1286_read_alarm(struct device *dev, struct rtc_wkalrm *alm)</div><div class='add'>+{</div><div class='add'>+	struct ds1286_priv *priv = dev_get_drvdata(dev);</div><div class='add'>+	unsigned char cmd;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Only the values that we read from the RTC are set. That</div><div class='add'>+	 * means only tm_wday, tm_hour, tm_min.</div><div class='add'>+	 */</div><div class='add'>+	spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='add'>+	alm-&gt;time.tm_min = ds1286_rtc_read(priv, RTC_MINUTES_ALARM) &amp; 0x7f;</div><div class='add'>+	alm-&gt;time.tm_hour = ds1286_rtc_read(priv, RTC_HOURS_ALARM)  &amp; 0x1f;</div><div class='add'>+	alm-&gt;time.tm_wday = ds1286_rtc_read(priv, RTC_DAY_ALARM)    &amp; 0x07;</div><div class='add'>+	cmd = ds1286_rtc_read(priv, RTC_CMD);</div><div class='add'>+	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	alm-&gt;time.tm_min = bcd2bin(alm-&gt;time.tm_min);</div><div class='add'>+	alm-&gt;time.tm_hour = bcd2bin(alm-&gt;time.tm_hour);</div><div class='add'>+	alm-&gt;time.tm_sec = 0;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ds1286_set_alarm(struct device *dev, struct rtc_wkalrm *alm)</div><div class='add'>+{</div><div class='add'>+	struct ds1286_priv *priv = dev_get_drvdata(dev);</div><div class='add'>+	unsigned char hrs, min, sec;</div><div class='add'>+</div><div class='add'>+	hrs = alm-&gt;time.tm_hour;</div><div class='add'>+	min = alm-&gt;time.tm_min;</div><div class='add'>+	sec = alm-&gt;time.tm_sec;</div><div class='add'>+</div><div class='add'>+	if (hrs &gt;= 24)</div><div class='add'>+		hrs = 0xff;</div><div class='add'>+</div><div class='add'>+	if (min &gt;= 60)</div><div class='add'>+		min = 0xff;</div><div class='add'>+</div><div class='add'>+	if (sec != 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	min = bin2bcd(min);</div><div class='add'>+	hrs = bin2bcd(hrs);</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;priv-&gt;lock);</div><div class='add'>+	ds1286_rtc_write(priv, hrs, RTC_HOURS_ALARM);</div><div class='add'>+	ds1286_rtc_write(priv, min, RTC_MINUTES_ALARM);</div><div class='add'>+	spin_unlock(&amp;priv-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct rtc_class_ops ds1286_ops = {</div><div class='add'>+	.ioctl   	= ds1286_ioctl,</div><div class='add'>+	.proc   	= ds1286_proc,</div><div class='add'>+	.read_time	= ds1286_read_time,</div><div class='add'>+	.set_time	= ds1286_set_time,</div><div class='add'>+	.read_alarm	= ds1286_read_alarm,</div><div class='add'>+	.set_alarm	= ds1286_set_alarm,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __devinit ds1286_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct rtc_device *rtc;</div><div class='add'>+	struct resource *res;</div><div class='add'>+	struct ds1286_priv *priv;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='add'>+	if (!res)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	priv = kzalloc(sizeof(struct ds1286_priv), GFP_KERNEL);</div><div class='add'>+	if (!priv)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	priv-&gt;size = res-&gt;end - res-&gt;start + 1;</div><div class='add'>+	if (!request_mem_region(res-&gt;start, priv-&gt;size, pdev-&gt;name)) {</div><div class='add'>+		ret = -EBUSY;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	priv-&gt;baseaddr = res-&gt;start;</div><div class='add'>+	priv-&gt;rtcregs = ioremap(priv-&gt;baseaddr, priv-&gt;size);</div><div class='add'>+	if (!priv-&gt;rtcregs) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	spin_lock_init(&amp;priv-&gt;lock);</div><div class='add'>+	rtc = rtc_device_register("ds1286", &amp;pdev-&gt;dev,</div><div class='add'>+				  &amp;ds1286_ops, THIS_MODULE);</div><div class='add'>+	if (IS_ERR(rtc)) {</div><div class='add'>+		ret = PTR_ERR(rtc);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	priv-&gt;rtc = rtc;</div><div class='add'>+	platform_set_drvdata(pdev, priv);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	if (priv-&gt;rtc)</div><div class='add'>+		rtc_device_unregister(priv-&gt;rtc);</div><div class='add'>+	if (priv-&gt;rtcregs)</div><div class='add'>+		iounmap(priv-&gt;rtcregs);</div><div class='add'>+	if (priv-&gt;baseaddr)</div><div class='add'>+		release_mem_region(priv-&gt;baseaddr, priv-&gt;size);</div><div class='add'>+	kfree(priv);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devexit ds1286_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct ds1286_priv *priv = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	rtc_device_unregister(priv-&gt;rtc);</div><div class='add'>+	iounmap(priv-&gt;rtcregs);</div><div class='add'>+	release_mem_region(priv-&gt;baseaddr, priv-&gt;size);</div><div class='add'>+	kfree(priv);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct platform_driver ds1286_platform_driver = {</div><div class='add'>+	.driver		= {</div><div class='add'>+		.name	= "rtc-ds1286",</div><div class='add'>+		.owner	= THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+	.probe		= ds1286_probe,</div><div class='add'>+	.remove		= __devexit_p(ds1286_remove),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init ds1286_init(void)</div><div class='add'>+{</div><div class='add'>+	return platform_driver_register(&amp;ds1286_platform_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit ds1286_exit(void)</div><div class='add'>+{</div><div class='add'>+	platform_driver_unregister(&amp;ds1286_platform_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Thomas Bogendoerfer &lt;tsbogend@alpha.franken.de&gt;");</div><div class='add'>+MODULE_DESCRIPTION("DS1286 RTC driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_VERSION(DRV_VERSION);</div><div class='add'>+MODULE_ALIAS("platform:rtc-ds1286");</div><div class='add'>+</div><div class='add'>+module_init(ds1286_init);</div><div class='add'>+module_exit(ds1286_exit);</div><div class='head'>diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c<br/>index bbf97e65202a..4fcf0734a6ef 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/rtc/rtc-ds1307.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/rtc/rtc-ds1307.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/rtc/rtc-ds1307.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/rtc/rtc-ds1307.c</a></div><div class='hunk'>@@ -23,10 +23,6 @@</div><div class='ctx'>  * to have set the chip up as a clock (turning on the oscillator and</div><div class='ctx'>  * setting the date and time), Linux can ignore the non-clock features.</div><div class='ctx'>  * That's a natural job for a factory or repair bench.</div><div class='del'>- *</div><div class='del'>- * This is currently a simple no-alarms driver.  If your board has the</div><div class='del'>- * alarm irq wired up on a ds1337 or ds1339, and you want to use that,</div><div class='del'>- * then look at the rtc-rs5c372 driver for code to steal...</div><div class='ctx'>  */</div><div class='ctx'> enum ds_type {</div><div class='ctx'> 	ds_1307,</div><div class='hunk'>@@ -67,6 +63,7 @@ enum ds_type {</div><div class='ctx'> #	define DS1307_BIT_RS0		0x01</div><div class='ctx'> #define DS1337_REG_CONTROL	0x0e</div><div class='ctx'> #	define DS1337_BIT_nEOSC		0x80</div><div class='add'>+#	define DS1339_BIT_BBSQI		0x20</div><div class='ctx'> #	define DS1337_BIT_RS2		0x10</div><div class='ctx'> #	define DS1337_BIT_RS1		0x08</div><div class='ctx'> #	define DS1337_BIT_INTCN		0x04</div><div class='hunk'>@@ -83,19 +80,22 @@ enum ds_type {</div><div class='ctx'> #	define DS1337_BIT_OSF		0x80</div><div class='ctx'> #	define DS1337_BIT_A2I		0x02</div><div class='ctx'> #	define DS1337_BIT_A1I		0x01</div><div class='add'>+#define DS1339_REG_ALARM1_SECS	0x07</div><div class='ctx'> #define DS1339_REG_TRICKLE	0x10</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> struct ds1307 {</div><div class='ctx'> 	u8			reg_addr;</div><div class='del'>-	bool			has_nvram;</div><div class='del'>-	u8			regs[8];</div><div class='add'>+	u8			regs[11];</div><div class='ctx'> 	enum ds_type		type;</div><div class='add'>+	unsigned long		flags;</div><div class='add'>+#define HAS_NVRAM	0		/* bit 0 == sysfs file active */</div><div class='add'>+#define HAS_ALARM	1		/* bit 1 == irq claimed */</div><div class='ctx'> 	struct i2c_msg		msg[2];</div><div class='ctx'> 	struct i2c_client	*client;</div><div class='del'>-	struct i2c_client	dev;</div><div class='ctx'> 	struct rtc_device	*rtc;</div><div class='add'>+	struct work_struct	work;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct chip_desc {</div><div class='hunk'>@@ -132,12 +132,79 @@ static const struct i2c_device_id ds1307_id[] = {</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(i2c, ds1307_id);</div><div class='ctx'> </div><div class='add'>+/*----------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The IRQ logic includes a "real" handler running in IRQ context just</div><div class='add'>+ * long enough to schedule this workqueue entry.   We need a task context</div><div class='add'>+ * to talk to the RTC, since I2C I/O calls require that; and disable the</div><div class='add'>+ * IRQ until we clear its status on the chip, so that this handler can</div><div class='add'>+ * work with any type of triggering (not just falling edge).</div><div class='add'>+ *</div><div class='add'>+ * The ds1337 and ds1339 both have two alarms, but we only use the first</div><div class='add'>+ * one (with a "seconds" field).  For ds1337 we expect nINTA is our alarm</div><div class='add'>+ * signal; ds1339 chips have only one alarm signal.</div><div class='add'>+ */</div><div class='add'>+static void ds1307_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct ds1307		*ds1307;</div><div class='add'>+	struct i2c_client	*client;</div><div class='add'>+	struct mutex		*lock;</div><div class='add'>+	int			stat, control;</div><div class='add'>+</div><div class='add'>+	ds1307 = container_of(work, struct ds1307, work);</div><div class='add'>+	client = ds1307-&gt;client;</div><div class='add'>+	lock = &amp;ds1307-&gt;rtc-&gt;ops_lock;</div><div class='add'>+</div><div class='add'>+	mutex_lock(lock);</div><div class='add'>+	stat = i2c_smbus_read_byte_data(client, DS1337_REG_STATUS);</div><div class='add'>+	if (stat &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (stat &amp; DS1337_BIT_A1I) {</div><div class='add'>+		stat &amp;= ~DS1337_BIT_A1I;</div><div class='add'>+		i2c_smbus_write_byte_data(client, DS1337_REG_STATUS, stat);</div><div class='add'>+</div><div class='add'>+		control = i2c_smbus_read_byte_data(client, DS1337_REG_CONTROL);</div><div class='add'>+		if (control &lt; 0)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		control &amp;= ~DS1337_BIT_A1IE;</div><div class='add'>+		i2c_smbus_write_byte_data(client, DS1337_REG_CONTROL, control);</div><div class='add'>+</div><div class='add'>+		/* rtc_update_irq() assumes that it is called</div><div class='add'>+		 * from IRQ-disabled context.</div><div class='add'>+		 */</div><div class='add'>+		local_irq_disable();</div><div class='add'>+		rtc_update_irq(ds1307-&gt;rtc, 1, RTC_AF | RTC_IRQF);</div><div class='add'>+		local_irq_enable();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	if (test_bit(HAS_ALARM, &amp;ds1307-&gt;flags))</div><div class='add'>+		enable_irq(client-&gt;irq);</div><div class='add'>+	mutex_unlock(lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t ds1307_irq(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	struct i2c_client	*client = dev_id;</div><div class='add'>+	struct ds1307		*ds1307 = i2c_get_clientdata(client);</div><div class='add'>+</div><div class='add'>+	disable_irq_nosync(irq);</div><div class='add'>+	schedule_work(&amp;ds1307-&gt;work);</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------------*/</div><div class='add'>+</div><div class='ctx'> static int ds1307_get_time(struct device *dev, struct rtc_time *t)</div><div class='ctx'> {</div><div class='ctx'> 	struct ds1307	*ds1307 = dev_get_drvdata(dev);</div><div class='ctx'> 	int		tmp;</div><div class='ctx'> </div><div class='ctx'> 	/* read the RTC date and time registers all at once */</div><div class='add'>+	ds1307-&gt;reg_addr = 0;</div><div class='ctx'> 	ds1307-&gt;msg[1].flags = I2C_M_RD;</div><div class='ctx'> 	ds1307-&gt;msg[1].len = 7;</div><div class='ctx'> </div><div class='hunk'>@@ -231,9 +298,186 @@ static int ds1307_set_time(struct device *dev, struct rtc_time *t)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int ds1307_read_alarm(struct device *dev, struct rtc_wkalrm *t)</div><div class='add'>+{</div><div class='add'>+	struct i2c_client       *client = to_i2c_client(dev);</div><div class='add'>+	struct ds1307		*ds1307 = i2c_get_clientdata(client);</div><div class='add'>+	int			ret;</div><div class='add'>+</div><div class='add'>+	if (!test_bit(HAS_ALARM, &amp;ds1307-&gt;flags))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* read all ALARM1, ALARM2, and status registers at once */</div><div class='add'>+	ds1307-&gt;reg_addr = DS1339_REG_ALARM1_SECS;</div><div class='add'>+	ds1307-&gt;msg[1].flags = I2C_M_RD;</div><div class='add'>+	ds1307-&gt;msg[1].len = 9;</div><div class='add'>+</div><div class='add'>+	ret = i2c_transfer(to_i2c_adapter(client-&gt;dev.parent),</div><div class='add'>+			ds1307-&gt;msg, 2);</div><div class='add'>+	if (ret != 2) {</div><div class='add'>+		dev_err(dev, "%s error %d\n", "alarm read", ret);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev, "%s: %02x %02x %02x %02x, %02x %02x %02x, %02x %02x\n",</div><div class='add'>+			"alarm read",</div><div class='add'>+			ds1307-&gt;regs[0], ds1307-&gt;regs[1],</div><div class='add'>+			ds1307-&gt;regs[2], ds1307-&gt;regs[3],</div><div class='add'>+			ds1307-&gt;regs[4], ds1307-&gt;regs[5],</div><div class='add'>+			ds1307-&gt;regs[6], ds1307-&gt;regs[7],</div><div class='add'>+			ds1307-&gt;regs[8]);</div><div class='add'>+</div><div class='add'>+	/* report alarm time (ALARM1); assume 24 hour and day-of-month modes,</div><div class='add'>+	 * and that all four fields are checked matches</div><div class='add'>+	 */</div><div class='add'>+	t-&gt;time.tm_sec = bcd2bin(ds1307-&gt;regs[0] &amp; 0x7f);</div><div class='add'>+	t-&gt;time.tm_min = bcd2bin(ds1307-&gt;regs[1] &amp; 0x7f);</div><div class='add'>+	t-&gt;time.tm_hour = bcd2bin(ds1307-&gt;regs[2] &amp; 0x3f);</div><div class='add'>+	t-&gt;time.tm_mday = bcd2bin(ds1307-&gt;regs[3] &amp; 0x3f);</div><div class='add'>+	t-&gt;time.tm_mon = -1;</div><div class='add'>+	t-&gt;time.tm_year = -1;</div><div class='add'>+	t-&gt;time.tm_wday = -1;</div><div class='add'>+	t-&gt;time.tm_yday = -1;</div><div class='add'>+	t-&gt;time.tm_isdst = -1;</div><div class='add'>+</div><div class='add'>+	/* ... and status */</div><div class='add'>+	t-&gt;enabled = !!(ds1307-&gt;regs[7] &amp; DS1337_BIT_A1IE);</div><div class='add'>+	t-&gt;pending = !!(ds1307-&gt;regs[8] &amp; DS1337_BIT_A1I);</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev, "%s secs=%d, mins=%d, "</div><div class='add'>+		"hours=%d, mday=%d, enabled=%d, pending=%d\n",</div><div class='add'>+		"alarm read", t-&gt;time.tm_sec, t-&gt;time.tm_min,</div><div class='add'>+		t-&gt;time.tm_hour, t-&gt;time.tm_mday,</div><div class='add'>+		t-&gt;enabled, t-&gt;pending);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ds1307_set_alarm(struct device *dev, struct rtc_wkalrm *t)</div><div class='add'>+{</div><div class='add'>+	struct i2c_client       *client = to_i2c_client(dev);</div><div class='add'>+	struct ds1307		*ds1307 = i2c_get_clientdata(client);</div><div class='add'>+	unsigned char		*buf = ds1307-&gt;regs;</div><div class='add'>+	u8			control, status;</div><div class='add'>+	int			ret;</div><div class='add'>+</div><div class='add'>+	if (!test_bit(HAS_ALARM, &amp;ds1307-&gt;flags))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev, "%s secs=%d, mins=%d, "</div><div class='add'>+		"hours=%d, mday=%d, enabled=%d, pending=%d\n",</div><div class='add'>+		"alarm set", t-&gt;time.tm_sec, t-&gt;time.tm_min,</div><div class='add'>+		t-&gt;time.tm_hour, t-&gt;time.tm_mday,</div><div class='add'>+		t-&gt;enabled, t-&gt;pending);</div><div class='add'>+</div><div class='add'>+	/* read current status of both alarms and the chip */</div><div class='add'>+	ds1307-&gt;reg_addr = DS1339_REG_ALARM1_SECS;</div><div class='add'>+	ds1307-&gt;msg[1].flags = I2C_M_RD;</div><div class='add'>+	ds1307-&gt;msg[1].len = 9;</div><div class='add'>+</div><div class='add'>+	ret = i2c_transfer(to_i2c_adapter(client-&gt;dev.parent),</div><div class='add'>+			ds1307-&gt;msg, 2);</div><div class='add'>+	if (ret != 2) {</div><div class='add'>+		dev_err(dev, "%s error %d\n", "alarm write", ret);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+	control = ds1307-&gt;regs[7];</div><div class='add'>+	status = ds1307-&gt;regs[8];</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev, "%s: %02x %02x %02x %02x, %02x %02x %02x, %02x %02x\n",</div><div class='add'>+			"alarm set (old status)",</div><div class='add'>+			ds1307-&gt;regs[0], ds1307-&gt;regs[1],</div><div class='add'>+			ds1307-&gt;regs[2], ds1307-&gt;regs[3],</div><div class='add'>+			ds1307-&gt;regs[4], ds1307-&gt;regs[5],</div><div class='add'>+			ds1307-&gt;regs[6], control, status);</div><div class='add'>+</div><div class='add'>+	/* set ALARM1, using 24 hour and day-of-month modes */</div><div class='add'>+	*buf++ = DS1339_REG_ALARM1_SECS;	/* first register addr */</div><div class='add'>+	buf[0] = bin2bcd(t-&gt;time.tm_sec);</div><div class='add'>+	buf[1] = bin2bcd(t-&gt;time.tm_min);</div><div class='add'>+	buf[2] = bin2bcd(t-&gt;time.tm_hour);</div><div class='add'>+	buf[3] = bin2bcd(t-&gt;time.tm_mday);</div><div class='add'>+</div><div class='add'>+	/* set ALARM2 to non-garbage */</div><div class='add'>+	buf[4] = 0;</div><div class='add'>+	buf[5] = 0;</div><div class='add'>+	buf[6] = 0;</div><div class='add'>+</div><div class='add'>+	/* optionally enable ALARM1 */</div><div class='add'>+	buf[7] = control &amp; ~(DS1337_BIT_A1IE | DS1337_BIT_A2IE);</div><div class='add'>+	if (t-&gt;enabled) {</div><div class='add'>+		dev_dbg(dev, "alarm IRQ armed\n");</div><div class='add'>+		buf[7] |= DS1337_BIT_A1IE;	/* only ALARM1 is used */</div><div class='add'>+	}</div><div class='add'>+	buf[8] = status &amp; ~(DS1337_BIT_A1I | DS1337_BIT_A2I);</div><div class='add'>+</div><div class='add'>+	ds1307-&gt;msg[1].flags = 0;</div><div class='add'>+	ds1307-&gt;msg[1].len = 10;</div><div class='add'>+</div><div class='add'>+	ret = i2c_transfer(to_i2c_adapter(client-&gt;dev.parent),</div><div class='add'>+			&amp;ds1307-&gt;msg[1], 1);</div><div class='add'>+	if (ret != 1) {</div><div class='add'>+		dev_err(dev, "can't set alarm time\n");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ds1307_ioctl(struct device *dev, unsigned int cmd, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	struct i2c_client	*client = to_i2c_client(dev);</div><div class='add'>+	struct ds1307		*ds1307 = i2c_get_clientdata(client);</div><div class='add'>+	int			ret;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case RTC_AIE_OFF:</div><div class='add'>+		if (!test_bit(HAS_ALARM, &amp;ds1307-&gt;flags))</div><div class='add'>+			return -ENOTTY;</div><div class='add'>+</div><div class='add'>+		ret = i2c_smbus_read_byte_data(client, DS1337_REG_CONTROL);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		ret &amp;= ~DS1337_BIT_A1IE;</div><div class='add'>+</div><div class='add'>+		ret = i2c_smbus_write_byte_data(client,</div><div class='add'>+						DS1337_REG_CONTROL, ret);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case RTC_AIE_ON:</div><div class='add'>+		if (!test_bit(HAS_ALARM, &amp;ds1307-&gt;flags))</div><div class='add'>+			return -ENOTTY;</div><div class='add'>+</div><div class='add'>+		ret = i2c_smbus_read_byte_data(client, DS1337_REG_CONTROL);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		ret |= DS1337_BIT_A1IE;</div><div class='add'>+</div><div class='add'>+		ret = i2c_smbus_write_byte_data(client,</div><div class='add'>+						DS1337_REG_CONTROL, ret);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		return -ENOIOCTLCMD;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct rtc_class_ops ds13xx_rtc_ops = {</div><div class='ctx'> 	.read_time	= ds1307_get_time,</div><div class='ctx'> 	.set_time	= ds1307_set_time,</div><div class='add'>+	.read_alarm	= ds1307_read_alarm,</div><div class='add'>+	.set_alarm	= ds1307_set_alarm,</div><div class='add'>+	.ioctl		= ds1307_ioctl,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*----------------------------------------------------------------------*/</div><div class='hunk'>@@ -327,6 +571,7 @@ static int __devinit ds1307_probe(struct i2c_client *client,</div><div class='ctx'> 	int			tmp;</div><div class='ctx'> 	const struct chip_desc	*chip = &amp;chips[id-&gt;driver_data];</div><div class='ctx'> 	struct i2c_adapter	*adapter = to_i2c_adapter(client-&gt;dev.parent);</div><div class='add'>+	int			want_irq = false;</div><div class='ctx'> </div><div class='ctx'> 	if (!i2c_check_functionality(adapter,</div><div class='ctx'> 			I2C_FUNC_I2C | I2C_FUNC_SMBUS_WRITE_BYTE_DATA))</div><div class='hunk'>@@ -353,6 +598,12 @@ static int __devinit ds1307_probe(struct i2c_client *client,</div><div class='ctx'> 	switch (ds1307-&gt;type) {</div><div class='ctx'> 	case ds_1337:</div><div class='ctx'> 	case ds_1339:</div><div class='add'>+		/* has IRQ? */</div><div class='add'>+		if (ds1307-&gt;client-&gt;irq &gt; 0 &amp;&amp; chip-&gt;alarm) {</div><div class='add'>+			INIT_WORK(&amp;ds1307-&gt;work, ds1307_work);</div><div class='add'>+			want_irq = true;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		ds1307-&gt;reg_addr = DS1337_REG_CONTROL;</div><div class='ctx'> 		ds1307-&gt;msg[1].len = 2;</div><div class='ctx'> </div><div class='hunk'>@@ -369,8 +620,20 @@ static int __devinit ds1307_probe(struct i2c_client *client,</div><div class='ctx'> </div><div class='ctx'> 		/* oscillator off?  turn it on, so clock can tick. */</div><div class='ctx'> 		if (ds1307-&gt;regs[0] &amp; DS1337_BIT_nEOSC)</div><div class='del'>-			i2c_smbus_write_byte_data(client, DS1337_REG_CONTROL,</div><div class='del'>-				ds1307-&gt;regs[0] &amp; ~DS1337_BIT_nEOSC);</div><div class='add'>+			ds1307-&gt;regs[0] &amp;= ~DS1337_BIT_nEOSC;</div><div class='add'>+</div><div class='add'>+		/* Using IRQ?  Disable the square wave and both alarms.</div><div class='add'>+		 * For ds1339, be sure alarms can trigger when we're</div><div class='add'>+		 * running on Vbackup (BBSQI); we assume ds1337 will</div><div class='add'>+		 * ignore that bit</div><div class='add'>+		 */</div><div class='add'>+		if (want_irq) {</div><div class='add'>+			ds1307-&gt;regs[0] |= DS1337_BIT_INTCN | DS1339_BIT_BBSQI;</div><div class='add'>+			ds1307-&gt;regs[0] &amp;= ~(DS1337_BIT_A2IE | DS1337_BIT_A1IE);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		i2c_smbus_write_byte_data(client, DS1337_REG_CONTROL,</div><div class='add'>+							ds1307-&gt;regs[0]);</div><div class='ctx'> </div><div class='ctx'> 		/* oscillator fault?  clear flag, and warn */</div><div class='ctx'> 		if (ds1307-&gt;regs[1] &amp; DS1337_BIT_OSF) {</div><div class='hunk'>@@ -495,10 +758,22 @@ read_rtc:</div><div class='ctx'> 		goto exit_free;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (want_irq) {</div><div class='add'>+		err = request_irq(client-&gt;irq, ds1307_irq, 0,</div><div class='add'>+			  ds1307-&gt;rtc-&gt;name, client);</div><div class='add'>+		if (err) {</div><div class='add'>+			dev_err(&amp;client-&gt;dev,</div><div class='add'>+				"unable to request IRQ!\n");</div><div class='add'>+			goto exit_irq;</div><div class='add'>+		}</div><div class='add'>+		set_bit(HAS_ALARM, &amp;ds1307-&gt;flags);</div><div class='add'>+		dev_dbg(&amp;client-&gt;dev, "got IRQ %d\n", client-&gt;irq);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (chip-&gt;nvram56) {</div><div class='ctx'> 		err = sysfs_create_bin_file(&amp;client-&gt;dev.kobj, &amp;nvram);</div><div class='ctx'> 		if (err == 0) {</div><div class='del'>-			ds1307-&gt;has_nvram = true;</div><div class='add'>+			set_bit(HAS_NVRAM, &amp;ds1307-&gt;flags);</div><div class='ctx'> 			dev_info(&amp;client-&gt;dev, "56 bytes nvram\n");</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -512,7 +787,9 @@ exit_bad:</div><div class='ctx'> 			ds1307-&gt;regs[2], ds1307-&gt;regs[3],</div><div class='ctx'> 			ds1307-&gt;regs[4], ds1307-&gt;regs[5],</div><div class='ctx'> 			ds1307-&gt;regs[6]);</div><div class='del'>-</div><div class='add'>+exit_irq:</div><div class='add'>+	if (ds1307-&gt;rtc)</div><div class='add'>+		rtc_device_unregister(ds1307-&gt;rtc);</div><div class='ctx'> exit_free:</div><div class='ctx'> 	kfree(ds1307);</div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -520,9 +797,14 @@ exit_free:</div><div class='ctx'> </div><div class='ctx'> static int __devexit ds1307_remove(struct i2c_client *client)</div><div class='ctx'> {</div><div class='del'>-	struct ds1307	*ds1307 = i2c_get_clientdata(client);</div><div class='add'>+	struct ds1307		*ds1307 = i2c_get_clientdata(client);</div><div class='add'>+</div><div class='add'>+	if (test_and_clear_bit(HAS_ALARM, &amp;ds1307-&gt;flags)) {</div><div class='add'>+		free_irq(client-&gt;irq, client);</div><div class='add'>+		cancel_work_sync(&amp;ds1307-&gt;work);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (ds1307-&gt;has_nvram)</div><div class='add'>+	if (test_and_clear_bit(HAS_NVRAM, &amp;ds1307-&gt;flags))</div><div class='ctx'> 		sysfs_remove_bin_file(&amp;client-&gt;dev.kobj, &amp;nvram);</div><div class='ctx'> </div><div class='ctx'> 	rtc_device_unregister(ds1307-&gt;rtc);</div><div class='head'>diff --git a/drivers/rtc/rtc-ds1374.c b/drivers/rtc/rtc-ds1374.c<br/>index a150418fba76..a5b0fc09f0c6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/rtc/rtc-ds1374.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/rtc/rtc-ds1374.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/rtc/rtc-ds1374.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/rtc/rtc-ds1374.c</a></div><div class='hunk'>@@ -429,12 +429,33 @@ static int __devexit ds1374_remove(struct i2c_client *client)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+static int ds1374_suspend(struct i2c_client *client, pm_message_t state)</div><div class='add'>+{</div><div class='add'>+	if (client-&gt;irq &gt;= 0 &amp;&amp; device_may_wakeup(&amp;client-&gt;dev))</div><div class='add'>+		enable_irq_wake(client-&gt;irq);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ds1374_resume(struct i2c_client *client)</div><div class='add'>+{</div><div class='add'>+	if (client-&gt;irq &gt;= 0 &amp;&amp; device_may_wakeup(&amp;client-&gt;dev))</div><div class='add'>+		disable_irq_wake(client-&gt;irq);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+#define ds1374_suspend	NULL</div><div class='add'>+#define ds1374_resume	NULL</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static struct i2c_driver ds1374_driver = {</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		.name = "rtc-ds1374",</div><div class='ctx'> 		.owner = THIS_MODULE,</div><div class='ctx'> 	},</div><div class='ctx'> 	.probe = ds1374_probe,</div><div class='add'>+	.suspend = ds1374_suspend,</div><div class='add'>+	.resume = ds1374_resume,</div><div class='ctx'> 	.remove = __devexit_p(ds1374_remove),</div><div class='ctx'> 	.id_table = ds1374_id,</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/rtc/rtc-ds1511.c b/drivers/rtc/rtc-ds1511.c<br/>index 0f0d27d1c4ca..86981d34fbb6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/rtc/rtc-ds1511.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/rtc/rtc-ds1511.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/rtc/rtc-ds1511.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/rtc/rtc-ds1511.c</a></div><div class='hunk'>@@ -379,18 +379,6 @@ ds1511_interrupt(int irq, void *dev_id)</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- static void</div><div class='del'>-ds1511_rtc_release(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	struct platform_device *pdev = to_platform_device(dev);</div><div class='del'>-	struct rtc_plat_data *pdata = platform_get_drvdata(pdev);</div><div class='del'>-</div><div class='del'>-	if (pdata-&gt;irq &gt;= 0) {</div><div class='del'>-		pdata-&gt;irqen = 0;</div><div class='del'>-		ds1511_rtc_update_alarm(pdata);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'>  static int</div><div class='ctx'> ds1511_rtc_ioctl(struct device *dev, unsigned int cmd, unsigned long arg)</div><div class='ctx'> {</div><div class='hunk'>@@ -428,7 +416,6 @@ static const struct rtc_class_ops ds1511_rtc_ops = {</div><div class='ctx'> 	.set_time	= ds1511_rtc_set_time,</div><div class='ctx'> 	.read_alarm	= ds1511_rtc_read_alarm,</div><div class='ctx'> 	.set_alarm	= ds1511_rtc_set_alarm,</div><div class='del'>-	.release	= ds1511_rtc_release,</div><div class='ctx'> 	.ioctl		= ds1511_rtc_ioctl,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/rtc/rtc-ds1553.c b/drivers/rtc/rtc-ds1553.c<br/>index a19f11415540..4ef59285b489 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/rtc/rtc-ds1553.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/rtc/rtc-ds1553.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/rtc/rtc-ds1553.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/rtc/rtc-ds1553.c</a></div><div class='hunk'>@@ -207,17 +207,6 @@ static irqreturn_t ds1553_rtc_interrupt(int irq, void *dev_id)</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ds1553_rtc_release(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	struct platform_device *pdev = to_platform_device(dev);</div><div class='del'>-	struct rtc_plat_data *pdata = platform_get_drvdata(pdev);</div><div class='del'>-</div><div class='del'>-	if (pdata-&gt;irq &gt;= 0) {</div><div class='del'>-		pdata-&gt;irqen = 0;</div><div class='del'>-		ds1553_rtc_update_alarm(pdata);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int ds1553_rtc_ioctl(struct device *dev, unsigned int cmd,</div><div class='ctx'> 			    unsigned long arg)</div><div class='ctx'> {</div><div class='hunk'>@@ -254,7 +243,6 @@ static const struct rtc_class_ops ds1553_rtc_ops = {</div><div class='ctx'> 	.set_time	= ds1553_rtc_set_time,</div><div class='ctx'> 	.read_alarm	= ds1553_rtc_read_alarm,</div><div class='ctx'> 	.set_alarm	= ds1553_rtc_set_alarm,</div><div class='del'>-	.release	= ds1553_rtc_release,</div><div class='ctx'> 	.ioctl		= ds1553_rtc_ioctl,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/rtc/rtc-ds1672.c b/drivers/rtc/rtc-ds1672.c<br/>index 6fa4556f5f5c..341d7a5b45a2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/rtc/rtc-ds1672.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/rtc/rtc-ds1672.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/rtc/rtc-ds1672.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/rtc/rtc-ds1672.c</a></div><div class='hunk'>@@ -9,17 +9,10 @@</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='ctx'> #include &lt;linux/rtc.h&gt;</div><div class='ctx'> </div><div class='del'>-#define DRV_VERSION "0.3"</div><div class='del'>-</div><div class='del'>-/* Addresses to scan: none. This chip cannot be detected. */</div><div class='del'>-static const unsigned short normal_i2c[] = { I2C_CLIENT_END };</div><div class='del'>-</div><div class='del'>-/* Insmod parameters */</div><div class='del'>-I2C_CLIENT_INSMOD;</div><div class='add'>+#define DRV_VERSION "0.4"</div><div class='ctx'> </div><div class='ctx'> /* Registers */</div><div class='ctx'> </div><div class='hunk'>@@ -29,8 +22,7 @@ I2C_CLIENT_INSMOD;</div><div class='ctx'> </div><div class='ctx'> #define DS1672_REG_CONTROL_EOSC	0x80</div><div class='ctx'> </div><div class='del'>-/* Prototypes */</div><div class='del'>-static int ds1672_probe(struct i2c_adapter *adapter, int address, int kind);</div><div class='add'>+static struct i2c_driver ds1672_driver;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * In the routines that deal directly with the ds1672 hardware, we use</div><div class='hunk'>@@ -44,8 +36,8 @@ static int ds1672_get_datetime(struct i2c_client *client, struct rtc_time *tm)</div><div class='ctx'> 	unsigned char buf[4];</div><div class='ctx'> </div><div class='ctx'> 	struct i2c_msg msgs[] = {</div><div class='del'>-		{ client-&gt;addr, 0, 1, &amp;addr },		/* setup read ptr */</div><div class='del'>-		{ client-&gt;addr, I2C_M_RD, 4, buf },	/* read date */</div><div class='add'>+		{client-&gt;addr, 0, 1, &amp;addr},	/* setup read ptr */</div><div class='add'>+		{client-&gt;addr, I2C_M_RD, 4, buf},	/* read date */</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	/* read date registers */</div><div class='hunk'>@@ -80,7 +72,7 @@ static int ds1672_set_mmss(struct i2c_client *client, unsigned long secs)</div><div class='ctx'> 	buf[2] = (secs &amp; 0x0000FF00) &gt;&gt; 8;</div><div class='ctx'> 	buf[3] = (secs &amp; 0x00FF0000) &gt;&gt; 16;</div><div class='ctx'> 	buf[4] = (secs &amp; 0xFF000000) &gt;&gt; 24;</div><div class='del'>-	buf[5] = 0;	/* set control reg to enable counting */</div><div class='add'>+	buf[5] = 0;		/* set control reg to enable counting */</div><div class='ctx'> </div><div class='ctx'> 	xfer = i2c_master_send(client, buf, 6);</div><div class='ctx'> 	if (xfer != 6) {</div><div class='hunk'>@@ -127,8 +119,8 @@ static int ds1672_get_control(struct i2c_client *client, u8 *status)</div><div class='ctx'> 	unsigned char addr = DS1672_REG_CONTROL;</div><div class='ctx'> </div><div class='ctx'> 	struct i2c_msg msgs[] = {</div><div class='del'>-		{ client-&gt;addr, 0, 1, &amp;addr },		/* setup read ptr */</div><div class='del'>-		{ client-&gt;addr, I2C_M_RD, 1, status },	/* read control */</div><div class='add'>+		{client-&gt;addr, 0, 1, &amp;addr},	/* setup read ptr */</div><div class='add'>+		{client-&gt;addr, I2C_M_RD, 1, status},	/* read control */</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	/* read control register */</div><div class='hunk'>@@ -141,7 +133,8 @@ static int ds1672_get_control(struct i2c_client *client, u8 *status)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* following are the sysfs callback functions */</div><div class='del'>-static ssize_t show_control(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='add'>+static ssize_t show_control(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			    char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct i2c_client *client = to_i2c_client(dev);</div><div class='ctx'> 	u8 control;</div><div class='hunk'>@@ -152,85 +145,46 @@ static ssize_t show_control(struct device *dev, struct device_attribute *attr, c</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	return sprintf(buf, "%s\n", (control &amp; DS1672_REG_CONTROL_EOSC)</div><div class='del'>-					? "disabled" : "enabled");</div><div class='add'>+		       ? "disabled" : "enabled");</div><div class='ctx'> }</div><div class='add'>+</div><div class='ctx'> static DEVICE_ATTR(control, S_IRUGO, show_control, NULL);</div><div class='ctx'> </div><div class='ctx'> static const struct rtc_class_ops ds1672_rtc_ops = {</div><div class='del'>-	.read_time	= ds1672_rtc_read_time,</div><div class='del'>-	.set_time	= ds1672_rtc_set_time,</div><div class='del'>-	.set_mmss	= ds1672_rtc_set_mmss,</div><div class='add'>+	.read_time = ds1672_rtc_read_time,</div><div class='add'>+	.set_time = ds1672_rtc_set_time,</div><div class='add'>+	.set_mmss = ds1672_rtc_set_mmss,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int ds1672_attach(struct i2c_adapter *adapter)</div><div class='add'>+static int ds1672_remove(struct i2c_client *client)</div><div class='ctx'> {</div><div class='del'>-	return i2c_probe(adapter, &amp;addr_data, ds1672_probe);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ds1672_detach(struct i2c_client *client)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='ctx'> 	struct rtc_device *rtc = i2c_get_clientdata(client);</div><div class='ctx'> </div><div class='del'>- 	if (rtc)</div><div class='add'>+	if (rtc)</div><div class='ctx'> 		rtc_device_unregister(rtc);</div><div class='ctx'> </div><div class='del'>-	if ((err = i2c_detach_client(client)))</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	kfree(client);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct i2c_driver ds1672_driver = {</div><div class='del'>-	.driver		= {</div><div class='del'>-		.name	= "ds1672",</div><div class='del'>-	},</div><div class='del'>-	.id		= I2C_DRIVERID_DS1672,</div><div class='del'>-	.attach_adapter = &amp;ds1672_attach,</div><div class='del'>-	.detach_client	= &amp;ds1672_detach,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int ds1672_probe(struct i2c_adapter *adapter, int address, int kind)</div><div class='add'>+static int ds1672_probe(struct i2c_client *client,</div><div class='add'>+			const struct i2c_device_id *id)</div><div class='ctx'> {</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	u8 control;</div><div class='del'>-	struct i2c_client *client;</div><div class='ctx'> 	struct rtc_device *rtc;</div><div class='ctx'> </div><div class='del'>-	dev_dbg(&amp;adapter-&gt;dev, "%s\n", __func__);</div><div class='add'>+	dev_dbg(&amp;client-&gt;dev, "%s\n", __func__);</div><div class='ctx'> </div><div class='del'>-	if (!i2c_check_functionality(adapter, I2C_FUNC_I2C)) {</div><div class='del'>-		err = -ENODEV;</div><div class='del'>-		goto exit;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!(client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL))) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto exit;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* I2C client */</div><div class='del'>-	client-&gt;addr = address;</div><div class='del'>-	client-&gt;driver = &amp;ds1672_driver;</div><div class='del'>-	client-&gt;adapter	= adapter;</div><div class='del'>-</div><div class='del'>-	strlcpy(client-&gt;name, ds1672_driver.driver.name, I2C_NAME_SIZE);</div><div class='del'>-</div><div class='del'>-	/* Inform the i2c layer */</div><div class='del'>-	if ((err = i2c_attach_client(client)))</div><div class='del'>-		goto exit_kfree;</div><div class='add'>+	if (!i2c_check_functionality(client-&gt;adapter, I2C_FUNC_I2C))</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	dev_info(&amp;client-&gt;dev, "chip found, driver version " DRV_VERSION "\n");</div><div class='ctx'> </div><div class='ctx'> 	rtc = rtc_device_register(ds1672_driver.driver.name, &amp;client-&gt;dev,</div><div class='del'>-				&amp;ds1672_rtc_ops, THIS_MODULE);</div><div class='add'>+				  &amp;ds1672_rtc_ops, THIS_MODULE);</div><div class='ctx'> </div><div class='del'>-	if (IS_ERR(rtc)) {</div><div class='del'>-		err = PTR_ERR(rtc);</div><div class='del'>-		goto exit_detach;</div><div class='del'>-	}</div><div class='add'>+	if (IS_ERR(rtc))</div><div class='add'>+		return PTR_ERR(rtc);</div><div class='ctx'> </div><div class='ctx'> 	i2c_set_clientdata(client, rtc);</div><div class='ctx'> </div><div class='hunk'>@@ -241,7 +195,7 @@ static int ds1672_probe(struct i2c_adapter *adapter, int address, int kind)</div><div class='ctx'> </div><div class='ctx'> 	if (control &amp; DS1672_REG_CONTROL_EOSC)</div><div class='ctx'> 		dev_warn(&amp;client-&gt;dev, "Oscillator not enabled. "</div><div class='del'>-					"Set time to enable.\n");</div><div class='add'>+			 "Set time to enable.\n");</div><div class='ctx'> </div><div class='ctx'> 	/* Register sysfs hooks */</div><div class='ctx'> 	err = device_create_file(&amp;client-&gt;dev, &amp;dev_attr_control);</div><div class='hunk'>@@ -250,19 +204,19 @@ static int ds1672_probe(struct i2c_adapter *adapter, int address, int kind)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>-exit_devreg:</div><div class='add'>+ exit_devreg:</div><div class='ctx'> 	rtc_device_unregister(rtc);</div><div class='del'>-</div><div class='del'>-exit_detach:</div><div class='del'>-	i2c_detach_client(client);</div><div class='del'>-</div><div class='del'>-exit_kfree:</div><div class='del'>-	kfree(client);</div><div class='del'>-</div><div class='del'>-exit:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct i2c_driver ds1672_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		   .name = "rtc-ds1672",</div><div class='add'>+		   },</div><div class='add'>+	.probe = &amp;ds1672_probe,</div><div class='add'>+	.remove = &amp;ds1672_remove,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int __init ds1672_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	return i2c_add_driver(&amp;ds1672_driver);</div><div class='head'>diff --git a/drivers/rtc/rtc-ds3234.c b/drivers/rtc/rtc-ds3234.c<br/>new file mode 100644<br/>index 000000000000..37d131d03f33<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/rtc/rtc-ds3234.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/rtc/rtc-ds3234.c</a></div><div class='hunk'>@@ -0,0 +1,290 @@</div><div class='add'>+/* drivers/rtc/rtc-ds3234.c</div><div class='add'>+ *</div><div class='add'>+ * Driver for Dallas Semiconductor (DS3234) SPI RTC with Integrated Crystal</div><div class='add'>+ * and SRAM.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2008 MIMOMax Wireless Ltd.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * Changelog:</div><div class='add'>+ *</div><div class='add'>+ * 07-May-2008: Dennis Aberilla &lt;denzzzhome@yahoo.com&gt;</div><div class='add'>+ *		- Created based on the max6902 code. Only implements the</div><div class='add'>+ *		  date/time keeping functions; no SRAM yet.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/rtc.h&gt;</div><div class='add'>+#include &lt;linux/spi/spi.h&gt;</div><div class='add'>+#include &lt;linux/bcd.h&gt;</div><div class='add'>+</div><div class='add'>+#define DS3234_REG_SECONDS	0x00</div><div class='add'>+#define DS3234_REG_MINUTES	0x01</div><div class='add'>+#define DS3234_REG_HOURS	0x02</div><div class='add'>+#define DS3234_REG_DAY		0x03</div><div class='add'>+#define DS3234_REG_DATE		0x04</div><div class='add'>+#define DS3234_REG_MONTH	0x05</div><div class='add'>+#define DS3234_REG_YEAR		0x06</div><div class='add'>+#define DS3234_REG_CENTURY	(1 &lt;&lt; 7) /* Bit 7 of the Month register */</div><div class='add'>+</div><div class='add'>+#define DS3234_REG_CONTROL	0x0E</div><div class='add'>+#define DS3234_REG_CONT_STAT	0x0F</div><div class='add'>+</div><div class='add'>+#undef DS3234_DEBUG</div><div class='add'>+</div><div class='add'>+struct ds3234 {</div><div class='add'>+	struct rtc_device *rtc;</div><div class='add'>+	u8 buf[8]; /* Burst read: addr + 7 regs */</div><div class='add'>+	u8 tx_buf[2];</div><div class='add'>+	u8 rx_buf[2];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void ds3234_set_reg(struct device *dev, unsigned char address,</div><div class='add'>+				unsigned char data)</div><div class='add'>+{</div><div class='add'>+	struct spi_device *spi = to_spi_device(dev);</div><div class='add'>+	unsigned char buf[2];</div><div class='add'>+</div><div class='add'>+	/* MSB must be '1' to indicate write */</div><div class='add'>+	buf[0] = address | 0x80;</div><div class='add'>+	buf[1] = data;</div><div class='add'>+</div><div class='add'>+	spi_write(spi, buf, 2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ds3234_get_reg(struct device *dev, unsigned char address,</div><div class='add'>+				unsigned char *data)</div><div class='add'>+{</div><div class='add'>+	struct spi_device *spi = to_spi_device(dev);</div><div class='add'>+	struct ds3234 *chip = dev_get_drvdata(dev);</div><div class='add'>+	struct spi_message message;</div><div class='add'>+	struct spi_transfer xfer;</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	if (!data)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Build our spi message */</div><div class='add'>+	spi_message_init(&amp;message);</div><div class='add'>+	memset(&amp;xfer, 0, sizeof(xfer));</div><div class='add'>+</div><div class='add'>+	/* Address + dummy tx byte */</div><div class='add'>+	xfer.len = 2;</div><div class='add'>+	xfer.tx_buf = chip-&gt;tx_buf;</div><div class='add'>+	xfer.rx_buf = chip-&gt;rx_buf;</div><div class='add'>+</div><div class='add'>+	chip-&gt;tx_buf[0] = address;</div><div class='add'>+	chip-&gt;tx_buf[1] = 0xff;</div><div class='add'>+</div><div class='add'>+	spi_message_add_tail(&amp;xfer, &amp;message);</div><div class='add'>+</div><div class='add'>+	/* do the i/o */</div><div class='add'>+	status = spi_sync(spi, &amp;message);</div><div class='add'>+	if (status == 0)</div><div class='add'>+		status = message.status;</div><div class='add'>+	else</div><div class='add'>+		return status;</div><div class='add'>+</div><div class='add'>+	*data = chip-&gt;rx_buf[1];</div><div class='add'>+</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ds3234_get_datetime(struct device *dev, struct rtc_time *dt)</div><div class='add'>+{</div><div class='add'>+	struct spi_device *spi = to_spi_device(dev);</div><div class='add'>+	struct ds3234 *chip = dev_get_drvdata(dev);</div><div class='add'>+	struct spi_message message;</div><div class='add'>+	struct spi_transfer xfer;</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	/* build the message */</div><div class='add'>+	spi_message_init(&amp;message);</div><div class='add'>+	memset(&amp;xfer, 0, sizeof(xfer));</div><div class='add'>+	xfer.len = 1 + 7;	/* Addr + 7 registers */</div><div class='add'>+	xfer.tx_buf = chip-&gt;buf;</div><div class='add'>+	xfer.rx_buf = chip-&gt;buf;</div><div class='add'>+	chip-&gt;buf[0] = 0x00;	/* Start address */</div><div class='add'>+	spi_message_add_tail(&amp;xfer, &amp;message);</div><div class='add'>+</div><div class='add'>+	/* do the i/o */</div><div class='add'>+	status = spi_sync(spi, &amp;message);</div><div class='add'>+	if (status == 0)</div><div class='add'>+		status = message.status;</div><div class='add'>+	else</div><div class='add'>+		return status;</div><div class='add'>+</div><div class='add'>+	/* Seconds, Minutes, Hours, Day, Date, Month, Year */</div><div class='add'>+	dt-&gt;tm_sec	= bcd2bin(chip-&gt;buf[1]);</div><div class='add'>+	dt-&gt;tm_min	= bcd2bin(chip-&gt;buf[2]);</div><div class='add'>+	dt-&gt;tm_hour	= bcd2bin(chip-&gt;buf[3] &amp; 0x3f);</div><div class='add'>+	dt-&gt;tm_wday	= bcd2bin(chip-&gt;buf[4]) - 1; /* 0 = Sun */</div><div class='add'>+	dt-&gt;tm_mday	= bcd2bin(chip-&gt;buf[5]);</div><div class='add'>+	dt-&gt;tm_mon	= bcd2bin(chip-&gt;buf[6] &amp; 0x1f) - 1; /* 0 = Jan */</div><div class='add'>+	dt-&gt;tm_year 	= bcd2bin(chip-&gt;buf[7] &amp; 0xff) + 100; /* Assume 20YY */</div><div class='add'>+</div><div class='add'>+#ifdef DS3234_DEBUG</div><div class='add'>+	dev_dbg(dev, "\n%s : Read RTC values\n", __func__);</div><div class='add'>+	dev_dbg(dev, "tm_hour: %i\n", dt-&gt;tm_hour);</div><div class='add'>+	dev_dbg(dev, "tm_min : %i\n", dt-&gt;tm_min);</div><div class='add'>+	dev_dbg(dev, "tm_sec : %i\n", dt-&gt;tm_sec);</div><div class='add'>+	dev_dbg(dev, "tm_wday: %i\n", dt-&gt;tm_wday);</div><div class='add'>+	dev_dbg(dev, "tm_mday: %i\n", dt-&gt;tm_mday);</div><div class='add'>+	dev_dbg(dev, "tm_mon : %i\n", dt-&gt;tm_mon);</div><div class='add'>+	dev_dbg(dev, "tm_year: %i\n", dt-&gt;tm_year);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ds3234_set_datetime(struct device *dev, struct rtc_time *dt)</div><div class='add'>+{</div><div class='add'>+#ifdef DS3234_DEBUG</div><div class='add'>+	dev_dbg(dev, "\n%s : Setting RTC values\n", __func__);</div><div class='add'>+	dev_dbg(dev, "tm_sec : %i\n", dt-&gt;tm_sec);</div><div class='add'>+	dev_dbg(dev, "tm_min : %i\n", dt-&gt;tm_min);</div><div class='add'>+	dev_dbg(dev, "tm_hour: %i\n", dt-&gt;tm_hour);</div><div class='add'>+	dev_dbg(dev, "tm_wday: %i\n", dt-&gt;tm_wday);</div><div class='add'>+	dev_dbg(dev, "tm_mday: %i\n", dt-&gt;tm_mday);</div><div class='add'>+	dev_dbg(dev, "tm_mon : %i\n", dt-&gt;tm_mon);</div><div class='add'>+	dev_dbg(dev, "tm_year: %i\n", dt-&gt;tm_year);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	ds3234_set_reg(dev, DS3234_REG_SECONDS, bin2bcd(dt-&gt;tm_sec));</div><div class='add'>+	ds3234_set_reg(dev, DS3234_REG_MINUTES, bin2bcd(dt-&gt;tm_min));</div><div class='add'>+	ds3234_set_reg(dev, DS3234_REG_HOURS, bin2bcd(dt-&gt;tm_hour) &amp; 0x3f);</div><div class='add'>+</div><div class='add'>+	/* 0 = Sun */</div><div class='add'>+	ds3234_set_reg(dev, DS3234_REG_DAY, bin2bcd(dt-&gt;tm_wday + 1));</div><div class='add'>+	ds3234_set_reg(dev, DS3234_REG_DATE, bin2bcd(dt-&gt;tm_mday));</div><div class='add'>+</div><div class='add'>+	/* 0 = Jan */</div><div class='add'>+	ds3234_set_reg(dev, DS3234_REG_MONTH, bin2bcd(dt-&gt;tm_mon + 1));</div><div class='add'>+</div><div class='add'>+	/* Assume 20YY although we just want to make sure not to go negative. */</div><div class='add'>+	if (dt-&gt;tm_year &gt; 100)</div><div class='add'>+		dt-&gt;tm_year -= 100;</div><div class='add'>+</div><div class='add'>+	ds3234_set_reg(dev, DS3234_REG_YEAR, bin2bcd(dt-&gt;tm_year));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ds3234_read_time(struct device *dev, struct rtc_time *tm)</div><div class='add'>+{</div><div class='add'>+	return ds3234_get_datetime(dev, tm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ds3234_set_time(struct device *dev, struct rtc_time *tm)</div><div class='add'>+{</div><div class='add'>+	return ds3234_set_datetime(dev, tm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct rtc_class_ops ds3234_rtc_ops = {</div><div class='add'>+	.read_time	= ds3234_read_time,</div><div class='add'>+	.set_time	= ds3234_set_time,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int ds3234_probe(struct spi_device *spi)</div><div class='add'>+{</div><div class='add'>+	struct rtc_device *rtc;</div><div class='add'>+	unsigned char tmp;</div><div class='add'>+	struct ds3234 *chip;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	rtc = rtc_device_register("ds3234",</div><div class='add'>+				&amp;spi-&gt;dev, &amp;ds3234_rtc_ops, THIS_MODULE);</div><div class='add'>+	if (IS_ERR(rtc))</div><div class='add'>+		return PTR_ERR(rtc);</div><div class='add'>+</div><div class='add'>+	spi-&gt;mode = SPI_MODE_3;</div><div class='add'>+	spi-&gt;bits_per_word = 8;</div><div class='add'>+	spi_setup(spi);</div><div class='add'>+</div><div class='add'>+	chip = kzalloc(sizeof(struct ds3234), GFP_KERNEL);</div><div class='add'>+	if (!chip) {</div><div class='add'>+		rtc_device_unregister(rtc);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	chip-&gt;rtc = rtc;</div><div class='add'>+	dev_set_drvdata(&amp;spi-&gt;dev, chip);</div><div class='add'>+</div><div class='add'>+	res = ds3234_get_reg(&amp;spi-&gt;dev, DS3234_REG_SECONDS, &amp;tmp);</div><div class='add'>+	if (res) {</div><div class='add'>+		rtc_device_unregister(rtc);</div><div class='add'>+		return res;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Control settings</div><div class='add'>+	 *</div><div class='add'>+	 * CONTROL_REG</div><div class='add'>+	 * BIT 7	6	5	4	3	2	1	0</div><div class='add'>+	 *     EOSC	BBSQW	CONV	RS2	RS1	INTCN	A2IE	A1IE</div><div class='add'>+	 *</div><div class='add'>+	 *     0	0	0	1	1	1	0	0</div><div class='add'>+	 *</div><div class='add'>+	 * CONTROL_STAT_REG</div><div class='add'>+	 * BIT 7	6	5	4	3	2	1	0</div><div class='add'>+	 *     OSF	BB32kHz	CRATE1	CRATE0	EN32kHz	BSY	A2F	A1F</div><div class='add'>+	 *</div><div class='add'>+	 *     1	0	0	0	1	0	0	0</div><div class='add'>+	 */</div><div class='add'>+	ds3234_get_reg(&amp;spi-&gt;dev, DS3234_REG_CONTROL, &amp;tmp);</div><div class='add'>+	ds3234_set_reg(&amp;spi-&gt;dev, DS3234_REG_CONTROL, tmp &amp; 0x1c);</div><div class='add'>+</div><div class='add'>+	ds3234_get_reg(&amp;spi-&gt;dev, DS3234_REG_CONT_STAT, &amp;tmp);</div><div class='add'>+	ds3234_set_reg(&amp;spi-&gt;dev, DS3234_REG_CONT_STAT, tmp &amp; 0x88);</div><div class='add'>+</div><div class='add'>+	/* Print our settings */</div><div class='add'>+	ds3234_get_reg(&amp;spi-&gt;dev, DS3234_REG_CONTROL, &amp;tmp);</div><div class='add'>+	dev_info(&amp;spi-&gt;dev, "Control Reg: 0x%02x\n", tmp);</div><div class='add'>+</div><div class='add'>+	ds3234_get_reg(&amp;spi-&gt;dev, DS3234_REG_CONT_STAT, &amp;tmp);</div><div class='add'>+	dev_info(&amp;spi-&gt;dev, "Ctrl/Stat Reg: 0x%02x\n", tmp);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __exit ds3234_remove(struct spi_device *spi)</div><div class='add'>+{</div><div class='add'>+	struct ds3234 *chip = platform_get_drvdata(spi);</div><div class='add'>+	struct rtc_device *rtc = chip-&gt;rtc;</div><div class='add'>+</div><div class='add'>+	if (rtc)</div><div class='add'>+		rtc_device_unregister(rtc);</div><div class='add'>+</div><div class='add'>+	kfree(chip);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct spi_driver ds3234_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name	 = "ds3234",</div><div class='add'>+		.bus	= &amp;spi_bus_type,</div><div class='add'>+		.owner	= THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+	.probe	 = ds3234_probe,</div><div class='add'>+	.remove = __devexit_p(ds3234_remove),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static __init int ds3234_init(void)</div><div class='add'>+{</div><div class='add'>+	printk(KERN_INFO "DS3234 SPI RTC Driver\n");</div><div class='add'>+	return spi_register_driver(&amp;ds3234_driver);</div><div class='add'>+}</div><div class='add'>+module_init(ds3234_init);</div><div class='add'>+</div><div class='add'>+static __exit void ds3234_exit(void)</div><div class='add'>+{</div><div class='add'>+	spi_unregister_driver(&amp;ds3234_driver);</div><div class='add'>+}</div><div class='add'>+module_exit(ds3234_exit);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("DS3234 SPI RTC driver");</div><div class='add'>+MODULE_AUTHOR("Dennis Aberilla &lt;denzzzhome@yahoo.com&gt;");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/rtc/rtc-m41t80.c b/drivers/rtc/rtc-m41t80.c<br/>index 24bc1689fc74..470fb2d29545 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/rtc/rtc-m41t80.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/rtc/rtc-m41t80.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/rtc/rtc-m41t80.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/rtc/rtc-m41t80.c</a></div><div class='hunk'>@@ -56,21 +56,27 @@</div><div class='ctx'> #define M41T80_ALHOUR_HT	(1 &lt;&lt; 6)	/* HT: Halt Update Bit */</div><div class='ctx'> #define M41T80_FLAGS_AF		(1 &lt;&lt; 6)	/* AF: Alarm Flag Bit */</div><div class='ctx'> #define M41T80_FLAGS_BATT_LOW	(1 &lt;&lt; 4)	/* BL: Battery Low Bit */</div><div class='add'>+#define M41T80_WATCHDOG_RB2	(1 &lt;&lt; 7)	/* RB: Watchdog resolution */</div><div class='add'>+#define M41T80_WATCHDOG_RB1	(1 &lt;&lt; 1)	/* RB: Watchdog resolution */</div><div class='add'>+#define M41T80_WATCHDOG_RB0	(1 &lt;&lt; 0)	/* RB: Watchdog resolution */</div><div class='ctx'> </div><div class='del'>-#define M41T80_FEATURE_HT	(1 &lt;&lt; 0)</div><div class='del'>-#define M41T80_FEATURE_BL	(1 &lt;&lt; 1)</div><div class='add'>+#define M41T80_FEATURE_HT	(1 &lt;&lt; 0)	/* Halt feature */</div><div class='add'>+#define M41T80_FEATURE_BL	(1 &lt;&lt; 1)	/* Battery low indicator */</div><div class='add'>+#define M41T80_FEATURE_SQ	(1 &lt;&lt; 2)	/* Squarewave feature */</div><div class='add'>+#define M41T80_FEATURE_WD	(1 &lt;&lt; 3)	/* Extra watchdog resolution */</div><div class='ctx'> </div><div class='ctx'> #define DRV_VERSION "0.05"</div><div class='ctx'> </div><div class='ctx'> static const struct i2c_device_id m41t80_id[] = {</div><div class='del'>-	{ "m41t80", 0 },</div><div class='del'>-	{ "m41t81", M41T80_FEATURE_HT },</div><div class='del'>-	{ "m41t81s", M41T80_FEATURE_HT | M41T80_FEATURE_BL },</div><div class='del'>-	{ "m41t82", M41T80_FEATURE_HT | M41T80_FEATURE_BL },</div><div class='del'>-	{ "m41t83", M41T80_FEATURE_HT | M41T80_FEATURE_BL },</div><div class='del'>-	{ "m41st84", M41T80_FEATURE_HT | M41T80_FEATURE_BL },</div><div class='del'>-	{ "m41st85", M41T80_FEATURE_HT | M41T80_FEATURE_BL },</div><div class='del'>-	{ "m41st87", M41T80_FEATURE_HT | M41T80_FEATURE_BL },</div><div class='add'>+	{ "m41t65", M41T80_FEATURE_HT | M41T80_FEATURE_WD },</div><div class='add'>+	{ "m41t80", M41T80_FEATURE_SQ },</div><div class='add'>+	{ "m41t81", M41T80_FEATURE_HT | M41T80_FEATURE_SQ},</div><div class='add'>+	{ "m41t81s", M41T80_FEATURE_HT | M41T80_FEATURE_BL | M41T80_FEATURE_SQ },</div><div class='add'>+	{ "m41t82", M41T80_FEATURE_HT | M41T80_FEATURE_BL | M41T80_FEATURE_SQ },</div><div class='add'>+	{ "m41t83", M41T80_FEATURE_HT | M41T80_FEATURE_BL | M41T80_FEATURE_SQ },</div><div class='add'>+	{ "m41st84", M41T80_FEATURE_HT | M41T80_FEATURE_BL | M41T80_FEATURE_SQ },</div><div class='add'>+	{ "m41st85", M41T80_FEATURE_HT | M41T80_FEATURE_BL | M41T80_FEATURE_SQ },</div><div class='add'>+	{ "m41st87", M41T80_FEATURE_HT | M41T80_FEATURE_BL | M41T80_FEATURE_SQ },</div><div class='ctx'> 	{ }</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(i2c, m41t80_id);</div><div class='hunk'>@@ -386,8 +392,12 @@ static ssize_t m41t80_sysfs_show_sqwfreq(struct device *dev,</div><div class='ctx'> 				struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct i2c_client *client = to_i2c_client(dev);</div><div class='add'>+	struct m41t80_data *clientdata = i2c_get_clientdata(client);</div><div class='ctx'> 	int val;</div><div class='ctx'> </div><div class='add'>+	if (!(clientdata-&gt;features &amp; M41T80_FEATURE_SQ))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	val = i2c_smbus_read_byte_data(client, M41T80_REG_SQW);</div><div class='ctx'> 	if (val &lt; 0)</div><div class='ctx'> 		return -EIO;</div><div class='hunk'>@@ -408,9 +418,13 @@ static ssize_t m41t80_sysfs_set_sqwfreq(struct device *dev,</div><div class='ctx'> 				const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct i2c_client *client = to_i2c_client(dev);</div><div class='add'>+	struct m41t80_data *clientdata = i2c_get_clientdata(client);</div><div class='ctx'> 	int almon, sqw;</div><div class='ctx'> 	int val = simple_strtoul(buf, NULL, 0);</div><div class='ctx'> </div><div class='add'>+	if (!(clientdata-&gt;features &amp; M41T80_FEATURE_SQ))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	if (val) {</div><div class='ctx'> 		if (!is_power_of_2(val))</div><div class='ctx'> 			return -EINVAL;</div><div class='hunk'>@@ -499,6 +513,8 @@ static void wdt_ping(void)</div><div class='ctx'> 			.buf	= i2c_data,</div><div class='ctx'> 		},</div><div class='ctx'> 	};</div><div class='add'>+	struct m41t80_data *clientdata = i2c_get_clientdata(save_client);</div><div class='add'>+</div><div class='ctx'> 	i2c_data[0] = 0x09;		/* watchdog register */</div><div class='ctx'> </div><div class='ctx'> 	if (wdt_margin &gt; 31)</div><div class='hunk'>@@ -509,6 +525,13 @@ static void wdt_ping(void)</div><div class='ctx'> 		 */</div><div class='ctx'> 		i2c_data[1] = wdt_margin&lt;&lt;2 | 0x82;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * M41T65 has three bits for watchdog resolution.  Don't set bit 7, as</div><div class='add'>+	 * that would be an invalid resolution.</div><div class='add'>+	 */</div><div class='add'>+	if (clientdata-&gt;features &amp; M41T80_FEATURE_WD)</div><div class='add'>+		i2c_data[1] &amp;= ~M41T80_WATCHDOG_RB2;</div><div class='add'>+</div><div class='ctx'> 	i2c_transfer(save_client-&gt;adapter, msgs1, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/rtc/rtc-m48t35.c b/drivers/rtc/rtc-m48t35.c<br/>new file mode 100644<br/>index 000000000000..0b2197559940<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/rtc/rtc-m48t35.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/rtc/rtc-m48t35.c</a></div><div class='hunk'>@@ -0,0 +1,235 @@</div><div class='add'>+/*</div><div class='add'>+ * Driver for the SGS-Thomson M48T35 Timekeeper RAM chip</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2000 Silicon Graphics, Inc.</div><div class='add'>+ * Written by Ulf Carlsson (ulfc@engr.sgi.com)</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2008 Thomas Bogendoerfer</div><div class='add'>+ *</div><div class='add'>+ * Based on code written by Paul Gortmaker.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms of the GNU General Public License as published by the</div><div class='add'>+ * Free Software Foundation; either version 2 of the License, or (at your</div><div class='add'>+ * option) any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/rtc.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/bcd.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+</div><div class='add'>+#define DRV_VERSION		"1.0"</div><div class='add'>+</div><div class='add'>+struct m48t35_rtc {</div><div class='add'>+	u8	pad[0x7ff8];    /* starts at 0x7ff8 */</div><div class='add'>+	u8	control;</div><div class='add'>+	u8	sec;</div><div class='add'>+	u8	min;</div><div class='add'>+	u8	hour;</div><div class='add'>+	u8	day;</div><div class='add'>+	u8	date;</div><div class='add'>+	u8	month;</div><div class='add'>+	u8	year;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define M48T35_RTC_SET		0x80</div><div class='add'>+#define M48T35_RTC_READ		0x40</div><div class='add'>+</div><div class='add'>+struct m48t35_priv {</div><div class='add'>+	struct rtc_device *rtc;</div><div class='add'>+	struct m48t35_rtc __iomem *reg;</div><div class='add'>+	size_t size;</div><div class='add'>+	unsigned long baseaddr;</div><div class='add'>+	spinlock_t lock;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int m48t35_read_time(struct device *dev, struct rtc_time *tm)</div><div class='add'>+{</div><div class='add'>+	struct m48t35_priv *priv = dev_get_drvdata(dev);</div><div class='add'>+	u8 control;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Only the values that we read from the RTC are set. We leave</div><div class='add'>+	 * tm_wday, tm_yday and tm_isdst untouched. Even though the</div><div class='add'>+	 * RTC has RTC_DAY_OF_WEEK, we ignore it, as it is only updated</div><div class='add'>+	 * by the RTC when initially set to a non-zero value.</div><div class='add'>+	 */</div><div class='add'>+	spin_lock_irq(&amp;priv-&gt;lock);</div><div class='add'>+	control = readb(&amp;priv-&gt;reg-&gt;control);</div><div class='add'>+	writeb(control | M48T35_RTC_READ, &amp;priv-&gt;reg-&gt;control);</div><div class='add'>+	tm-&gt;tm_sec = readb(&amp;priv-&gt;reg-&gt;sec);</div><div class='add'>+	tm-&gt;tm_min = readb(&amp;priv-&gt;reg-&gt;min);</div><div class='add'>+	tm-&gt;tm_hour = readb(&amp;priv-&gt;reg-&gt;hour);</div><div class='add'>+	tm-&gt;tm_mday = readb(&amp;priv-&gt;reg-&gt;date);</div><div class='add'>+	tm-&gt;tm_mon = readb(&amp;priv-&gt;reg-&gt;month);</div><div class='add'>+	tm-&gt;tm_year = readb(&amp;priv-&gt;reg-&gt;year);</div><div class='add'>+	writeb(control, &amp;priv-&gt;reg-&gt;control);</div><div class='add'>+	spin_unlock_irq(&amp;priv-&gt;lock);</div><div class='add'>+</div><div class='add'>+	tm-&gt;tm_sec = bcd2bin(tm-&gt;tm_sec);</div><div class='add'>+	tm-&gt;tm_min = bcd2bin(tm-&gt;tm_min);</div><div class='add'>+	tm-&gt;tm_hour = bcd2bin(tm-&gt;tm_hour);</div><div class='add'>+	tm-&gt;tm_mday = bcd2bin(tm-&gt;tm_mday);</div><div class='add'>+	tm-&gt;tm_mon = bcd2bin(tm-&gt;tm_mon);</div><div class='add'>+	tm-&gt;tm_year = bcd2bin(tm-&gt;tm_year);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Account for differences between how the RTC uses the values</div><div class='add'>+	 * and how they are defined in a struct rtc_time;</div><div class='add'>+	 */</div><div class='add'>+	tm-&gt;tm_year += 70;</div><div class='add'>+	if (tm-&gt;tm_year &lt;= 69)</div><div class='add'>+		tm-&gt;tm_year += 100;</div><div class='add'>+</div><div class='add'>+	tm-&gt;tm_mon--;</div><div class='add'>+	return rtc_valid_tm(tm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int m48t35_set_time(struct device *dev, struct rtc_time *tm)</div><div class='add'>+{</div><div class='add'>+	struct m48t35_priv *priv = dev_get_drvdata(dev);</div><div class='add'>+	unsigned char mon, day, hrs, min, sec;</div><div class='add'>+	unsigned int yrs;</div><div class='add'>+	u8 control;</div><div class='add'>+</div><div class='add'>+	yrs = tm-&gt;tm_year + 1900;</div><div class='add'>+	mon = tm-&gt;tm_mon + 1;   /* tm_mon starts at zero */</div><div class='add'>+	day = tm-&gt;tm_mday;</div><div class='add'>+	hrs = tm-&gt;tm_hour;</div><div class='add'>+	min = tm-&gt;tm_min;</div><div class='add'>+	sec = tm-&gt;tm_sec;</div><div class='add'>+</div><div class='add'>+	if (yrs &lt; 1970)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	yrs -= 1970;</div><div class='add'>+	if (yrs &gt; 255)    /* They are unsigned */</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (yrs &gt; 169)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (yrs &gt;= 100)</div><div class='add'>+		yrs -= 100;</div><div class='add'>+</div><div class='add'>+	sec = bin2bcd(sec);</div><div class='add'>+	min = bin2bcd(min);</div><div class='add'>+	hrs = bin2bcd(hrs);</div><div class='add'>+	day = bin2bcd(day);</div><div class='add'>+	mon = bin2bcd(mon);</div><div class='add'>+	yrs = bin2bcd(yrs);</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(&amp;priv-&gt;lock);</div><div class='add'>+	control = readb(&amp;priv-&gt;reg-&gt;control);</div><div class='add'>+	writeb(control | M48T35_RTC_SET, &amp;priv-&gt;reg-&gt;control);</div><div class='add'>+	writeb(yrs, &amp;priv-&gt;reg-&gt;year);</div><div class='add'>+	writeb(mon, &amp;priv-&gt;reg-&gt;month);</div><div class='add'>+	writeb(day, &amp;priv-&gt;reg-&gt;date);</div><div class='add'>+	writeb(hrs, &amp;priv-&gt;reg-&gt;hour);</div><div class='add'>+	writeb(min, &amp;priv-&gt;reg-&gt;min);</div><div class='add'>+	writeb(sec, &amp;priv-&gt;reg-&gt;sec);</div><div class='add'>+	writeb(control, &amp;priv-&gt;reg-&gt;control);</div><div class='add'>+	spin_unlock_irq(&amp;priv-&gt;lock);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct rtc_class_ops m48t35_ops = {</div><div class='add'>+	.read_time	= m48t35_read_time,</div><div class='add'>+	.set_time	= m48t35_set_time,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __devinit m48t35_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct rtc_device *rtc;</div><div class='add'>+	struct resource *res;</div><div class='add'>+	struct m48t35_priv *priv;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='add'>+	if (!res)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	priv = kzalloc(sizeof(struct m48t35_priv), GFP_KERNEL);</div><div class='add'>+	if (!priv)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	priv-&gt;size = res-&gt;end - res-&gt;start + 1;</div><div class='add'>+	/*</div><div class='add'>+	 * kludge: remove the #ifndef after ioc3 resource</div><div class='add'>+	 * conflicts are resolved</div><div class='add'>+	 */</div><div class='add'>+#ifndef CONFIG_SGI_IP27</div><div class='add'>+	if (!request_mem_region(res-&gt;start, priv-&gt;size, pdev-&gt;name)) {</div><div class='add'>+		ret = -EBUSY;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	priv-&gt;baseaddr = res-&gt;start;</div><div class='add'>+	priv-&gt;reg = ioremap(priv-&gt;baseaddr, priv-&gt;size);</div><div class='add'>+	if (!priv-&gt;reg) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	spin_lock_init(&amp;priv-&gt;lock);</div><div class='add'>+	rtc = rtc_device_register("m48t35", &amp;pdev-&gt;dev,</div><div class='add'>+				  &amp;m48t35_ops, THIS_MODULE);</div><div class='add'>+	if (IS_ERR(rtc)) {</div><div class='add'>+		ret = PTR_ERR(rtc);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	priv-&gt;rtc = rtc;</div><div class='add'>+	platform_set_drvdata(pdev, priv);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	if (priv-&gt;rtc)</div><div class='add'>+		rtc_device_unregister(priv-&gt;rtc);</div><div class='add'>+	if (priv-&gt;reg)</div><div class='add'>+		iounmap(priv-&gt;reg);</div><div class='add'>+	if (priv-&gt;baseaddr)</div><div class='add'>+		release_mem_region(priv-&gt;baseaddr, priv-&gt;size);</div><div class='add'>+	kfree(priv);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devexit m48t35_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct m48t35_priv *priv = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	rtc_device_unregister(priv-&gt;rtc);</div><div class='add'>+	iounmap(priv-&gt;reg);</div><div class='add'>+#ifndef CONFIG_SGI_IP27</div><div class='add'>+	release_mem_region(priv-&gt;baseaddr, priv-&gt;size);</div><div class='add'>+#endif</div><div class='add'>+	kfree(priv);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct platform_driver m48t35_platform_driver = {</div><div class='add'>+	.driver		= {</div><div class='add'>+		.name	= "rtc-m48t35",</div><div class='add'>+		.owner	= THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+	.probe		= m48t35_probe,</div><div class='add'>+	.remove		= __devexit_p(m48t35_remove),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init m48t35_init(void)</div><div class='add'>+{</div><div class='add'>+	return platform_driver_register(&amp;m48t35_platform_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit m48t35_exit(void)</div><div class='add'>+{</div><div class='add'>+	platform_driver_unregister(&amp;m48t35_platform_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Thomas Bogendoerfer &lt;tsbogend@alpha.franken.de&gt;");</div><div class='add'>+MODULE_DESCRIPTION("M48T35 RTC driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_VERSION(DRV_VERSION);</div><div class='add'>+MODULE_ALIAS("platform:rtc-m48t35");</div><div class='add'>+</div><div class='add'>+module_init(m48t35_init);</div><div class='add'>+module_exit(m48t35_exit);</div><div class='head'>diff --git a/drivers/rtc/rtc-m48t59.c b/drivers/rtc/rtc-m48t59.c<br/>index 013e6c103b9c..ce4eff6a8d51 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/rtc/rtc-m48t59.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/rtc/rtc-m48t59.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/rtc/rtc-m48t59.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/rtc/rtc-m48t59.c</a></div><div class='hunk'>@@ -24,8 +24,9 @@</div><div class='ctx'> #define NO_IRQ	(-1)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#define M48T59_READ(reg)	pdata-&gt;read_byte(dev, reg)</div><div class='del'>-#define M48T59_WRITE(val, reg)	pdata-&gt;write_byte(dev, reg, val)</div><div class='add'>+#define M48T59_READ(reg) (pdata-&gt;read_byte(dev, pdata-&gt;offset + reg))</div><div class='add'>+#define M48T59_WRITE(val, reg) \</div><div class='add'>+	(pdata-&gt;write_byte(dev, pdata-&gt;offset + reg, val))</div><div class='ctx'> </div><div class='ctx'> #define M48T59_SET_BITS(mask, reg)	\</div><div class='ctx'> 	M48T59_WRITE((M48T59_READ(reg) | (mask)), (reg))</div><div class='hunk'>@@ -34,7 +35,6 @@</div><div class='ctx'> </div><div class='ctx'> struct m48t59_private {</div><div class='ctx'> 	void __iomem *ioaddr;</div><div class='del'>-	unsigned int size; /* iomem size */</div><div class='ctx'> 	int irq;</div><div class='ctx'> 	struct rtc_device *rtc;</div><div class='ctx'> 	spinlock_t lock; /* serialize the NVRAM and RTC access */</div><div class='hunk'>@@ -82,7 +82,8 @@ static int m48t59_rtc_read_time(struct device *dev, struct rtc_time *tm)</div><div class='ctx'> 	tm-&gt;tm_mday	= BCD2BIN(M48T59_READ(M48T59_MDAY));</div><div class='ctx'> </div><div class='ctx'> 	val = M48T59_READ(M48T59_WDAY);</div><div class='del'>-	if ((val &amp; M48T59_WDAY_CEB) &amp;&amp; (val &amp; M48T59_WDAY_CB)) {</div><div class='add'>+	if ((pdata-&gt;type == M48T59RTC_TYPE_M48T59) &amp;&amp;</div><div class='add'>+	    (val &amp; M48T59_WDAY_CEB) &amp;&amp; (val &amp; M48T59_WDAY_CB)) {</div><div class='ctx'> 		dev_dbg(dev, "Century bit is enabled\n");</div><div class='ctx'> 		tm-&gt;tm_year += 100;	/* one century */</div><div class='ctx'> 	}</div><div class='hunk'>@@ -126,7 +127,7 @@ static int m48t59_rtc_set_time(struct device *dev, struct rtc_time *tm)</div><div class='ctx'> 	M48T59_WRITE((BIN2BCD(tm-&gt;tm_mon + 1) &amp; 0x1F), M48T59_MONTH);</div><div class='ctx'> 	M48T59_WRITE(BIN2BCD(tm-&gt;tm_year % 100), M48T59_YEAR);</div><div class='ctx'> </div><div class='del'>-	if (tm-&gt;tm_year/100)</div><div class='add'>+	if (pdata-&gt;type == M48T59RTC_TYPE_M48T59 &amp;&amp; (tm-&gt;tm_year / 100))</div><div class='ctx'> 		val = (M48T59_WDAY_CEB | M48T59_WDAY_CB);</div><div class='ctx'> 	val |= (BIN2BCD(tm-&gt;tm_wday) &amp; 0x07);</div><div class='ctx'> 	M48T59_WRITE(val, M48T59_WDAY);</div><div class='hunk'>@@ -310,6 +311,11 @@ static const struct rtc_class_ops m48t59_rtc_ops = {</div><div class='ctx'> 	.proc		= m48t59_rtc_proc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct rtc_class_ops m48t02_rtc_ops = {</div><div class='add'>+	.read_time	= m48t59_rtc_read_time,</div><div class='add'>+	.set_time	= m48t59_rtc_set_time,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static ssize_t m48t59_nvram_read(struct kobject *kobj,</div><div class='ctx'> 				struct bin_attribute *bin_attr,</div><div class='ctx'> 				char *buf, loff_t pos, size_t size)</div><div class='hunk'>@@ -321,7 +327,7 @@ static ssize_t m48t59_nvram_read(struct kobject *kobj,</div><div class='ctx'> 	ssize_t cnt = 0;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	for (; size &gt; 0 &amp;&amp; pos &lt; M48T59_NVRAM_SIZE; cnt++, size--) {</div><div class='add'>+	for (; size &gt; 0 &amp;&amp; pos &lt; pdata-&gt;offset; cnt++, size--) {</div><div class='ctx'> 		spin_lock_irqsave(&amp;m48t59-&gt;lock, flags);</div><div class='ctx'> 		*buf++ = M48T59_READ(cnt);</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;m48t59-&gt;lock, flags);</div><div class='hunk'>@@ -341,7 +347,7 @@ static ssize_t m48t59_nvram_write(struct kobject *kobj,</div><div class='ctx'> 	ssize_t cnt = 0;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	for (; size &gt; 0 &amp;&amp; pos &lt; M48T59_NVRAM_SIZE; cnt++, size--) {</div><div class='add'>+	for (; size &gt; 0 &amp;&amp; pos &lt; pdata-&gt;offset; cnt++, size--) {</div><div class='ctx'> 		spin_lock_irqsave(&amp;m48t59-&gt;lock, flags);</div><div class='ctx'> 		M48T59_WRITE(*buf++, cnt);</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;m48t59-&gt;lock, flags);</div><div class='hunk'>@@ -358,7 +364,6 @@ static struct bin_attribute m48t59_nvram_attr = {</div><div class='ctx'> 	},</div><div class='ctx'> 	.read = m48t59_nvram_read,</div><div class='ctx'> 	.write = m48t59_nvram_write,</div><div class='del'>-	.size = M48T59_NVRAM_SIZE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __devinit m48t59_rtc_probe(struct platform_device *pdev)</div><div class='hunk'>@@ -367,6 +372,8 @@ static int __devinit m48t59_rtc_probe(struct platform_device *pdev)</div><div class='ctx'> 	struct m48t59_private *m48t59 = NULL;</div><div class='ctx'> 	struct resource *res;</div><div class='ctx'> 	int ret = -ENOMEM;</div><div class='add'>+	char *name;</div><div class='add'>+	const struct rtc_class_ops *ops;</div><div class='ctx'> </div><div class='ctx'> 	/* This chip could be memory-mapped or I/O-mapped */</div><div class='ctx'> 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='hunk'>@@ -391,6 +398,8 @@ static int __devinit m48t59_rtc_probe(struct platform_device *pdev)</div><div class='ctx'> 			/* Ensure we only kmalloc platform data once */</div><div class='ctx'> 			pdev-&gt;dev.platform_data = pdata;</div><div class='ctx'> 		}</div><div class='add'>+		if (!pdata-&gt;type)</div><div class='add'>+			pdata-&gt;type = M48T59RTC_TYPE_M48T59;</div><div class='ctx'> </div><div class='ctx'> 		/* Try to use the generic memory read/write ops */</div><div class='ctx'> 		if (!pdata-&gt;write_byte)</div><div class='hunk'>@@ -403,10 +412,14 @@ static int __devinit m48t59_rtc_probe(struct platform_device *pdev)</div><div class='ctx'> 	if (!m48t59)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	m48t59-&gt;size = res-&gt;end - res-&gt;start + 1;</div><div class='del'>-	m48t59-&gt;ioaddr = ioremap(res-&gt;start, m48t59-&gt;size);</div><div class='del'>-	if (!m48t59-&gt;ioaddr)</div><div class='del'>-		goto out;</div><div class='add'>+	m48t59-&gt;ioaddr = pdata-&gt;ioaddr;</div><div class='add'>+</div><div class='add'>+	if (!m48t59-&gt;ioaddr) {</div><div class='add'>+		/* ioaddr not mapped externally */</div><div class='add'>+		m48t59-&gt;ioaddr = ioremap(res-&gt;start, res-&gt;end - res-&gt;start + 1);</div><div class='add'>+		if (!m48t59-&gt;ioaddr)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Try to get irq number. We also can work in</div><div class='ctx'> 	 * the mode without IRQ.</div><div class='hunk'>@@ -421,14 +434,36 @@ static int __devinit m48t59_rtc_probe(struct platform_device *pdev)</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='add'>+	switch (pdata-&gt;type) {</div><div class='add'>+	case M48T59RTC_TYPE_M48T59:</div><div class='add'>+		name = "m48t59";</div><div class='add'>+		ops = &amp;m48t59_rtc_ops;</div><div class='add'>+		pdata-&gt;offset = 0x1ff0;</div><div class='add'>+		break;</div><div class='add'>+	case M48T59RTC_TYPE_M48T02:</div><div class='add'>+		name = "m48t02";</div><div class='add'>+		ops = &amp;m48t02_rtc_ops;</div><div class='add'>+		pdata-&gt;offset = 0x7f0;</div><div class='add'>+		break;</div><div class='add'>+	case M48T59RTC_TYPE_M48T08:</div><div class='add'>+		name = "m48t08";</div><div class='add'>+		ops = &amp;m48t02_rtc_ops;</div><div class='add'>+		pdata-&gt;offset = 0x1ff0;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Unknown RTC type\n");</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	m48t59-&gt;rtc = rtc_device_register("m48t59", &amp;pdev-&gt;dev,</div><div class='del'>-				&amp;m48t59_rtc_ops, THIS_MODULE);</div><div class='add'>+	m48t59-&gt;rtc = rtc_device_register(name, &amp;pdev-&gt;dev, ops, THIS_MODULE);</div><div class='ctx'> 	if (IS_ERR(m48t59-&gt;rtc)) {</div><div class='ctx'> 		ret = PTR_ERR(m48t59-&gt;rtc);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	m48t59_nvram_attr.size = pdata-&gt;offset;</div><div class='add'>+</div><div class='ctx'> 	ret = sysfs_create_bin_file(&amp;pdev-&gt;dev.kobj, &amp;m48t59_nvram_attr);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -452,11 +487,12 @@ out:</div><div class='ctx'> static int __devexit m48t59_rtc_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct m48t59_private *m48t59 = platform_get_drvdata(pdev);</div><div class='add'>+	struct m48t59_plat_data *pdata = pdev-&gt;dev.platform_data;</div><div class='ctx'> </div><div class='ctx'> 	sysfs_remove_bin_file(&amp;pdev-&gt;dev.kobj, &amp;m48t59_nvram_attr);</div><div class='ctx'> 	if (!IS_ERR(m48t59-&gt;rtc))</div><div class='ctx'> 		rtc_device_unregister(m48t59-&gt;rtc);</div><div class='del'>-	if (m48t59-&gt;ioaddr)</div><div class='add'>+	if (m48t59-&gt;ioaddr &amp;&amp; !pdata-&gt;ioaddr)</div><div class='ctx'> 		iounmap(m48t59-&gt;ioaddr);</div><div class='ctx'> 	if (m48t59-&gt;irq != NO_IRQ)</div><div class='ctx'> 		free_irq(m48t59-&gt;irq, &amp;pdev-&gt;dev);</div><div class='hunk'>@@ -491,5 +527,5 @@ module_init(m48t59_rtc_init);</div><div class='ctx'> module_exit(m48t59_rtc_exit);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Mark Zhan &lt;rongkai.zhan@windriver.com&gt;");</div><div class='del'>-MODULE_DESCRIPTION("M48T59 RTC driver");</div><div class='add'>+MODULE_DESCRIPTION("M48T59/M48T02/M48T08 RTC driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/rtc/rtc-max6900.c b/drivers/rtc/rtc-max6900.c<br/>index ded3c0abad83..12c9cd25cad8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/rtc/rtc-max6900.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/rtc/rtc-max6900.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/rtc/rtc-max6900.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/rtc/rtc-max6900.c</a></div><div class='hunk'>@@ -17,19 +17,18 @@</div><div class='ctx'> #include &lt;linux/rtc.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> </div><div class='del'>-#define DRV_NAME "max6900"</div><div class='del'>-#define DRV_VERSION "0.1"</div><div class='add'>+#define DRV_VERSION "0.2"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * register indices</div><div class='ctx'>  */</div><div class='del'>-#define MAX6900_REG_SC			0	/* seconds	00-59 */</div><div class='del'>-#define MAX6900_REG_MN			1	/* minutes	00-59 */</div><div class='del'>-#define MAX6900_REG_HR			2	/* hours	00-23 */</div><div class='del'>-#define MAX6900_REG_DT			3	/* day of month	00-31 */</div><div class='del'>-#define MAX6900_REG_MO			4	/* month	01-12 */</div><div class='del'>-#define MAX6900_REG_DW			5	/* day of week	 1-7  */</div><div class='del'>-#define MAX6900_REG_YR			6	/* year		00-99 */</div><div class='add'>+#define MAX6900_REG_SC			0	/* seconds      00-59 */</div><div class='add'>+#define MAX6900_REG_MN			1	/* minutes      00-59 */</div><div class='add'>+#define MAX6900_REG_HR			2	/* hours        00-23 */</div><div class='add'>+#define MAX6900_REG_DT			3	/* day of month 00-31 */</div><div class='add'>+#define MAX6900_REG_MO			4	/* month        01-12 */</div><div class='add'>+#define MAX6900_REG_DW			5	/* day of week   1-7  */</div><div class='add'>+#define MAX6900_REG_YR			6	/* year         00-99 */</div><div class='ctx'> #define MAX6900_REG_CT			7	/* control */</div><div class='ctx'> 						/* register 8 is undocumented */</div><div class='ctx'> #define MAX6900_REG_CENTURY		9	/* century */</div><div class='hunk'>@@ -39,7 +38,6 @@</div><div class='ctx'> </div><div class='ctx'> #define MAX6900_REG_CT_WP		(1 &lt;&lt; 7)	/* Write Protect */</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * register read/write commands</div><div class='ctx'>  */</div><div class='hunk'>@@ -52,16 +50,7 @@</div><div class='ctx'> </div><div class='ctx'> #define MAX6900_IDLE_TIME_AFTER_WRITE	3	/* specification says 2.5 mS */</div><div class='ctx'> </div><div class='del'>-#define MAX6900_I2C_ADDR		0xa0</div><div class='del'>-</div><div class='del'>-static const unsigned short normal_i2c[] = {</div><div class='del'>-	MAX6900_I2C_ADDR &gt;&gt; 1,</div><div class='del'>-	I2C_CLIENT_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-I2C_CLIENT_INSMOD;			/* defines addr_data */</div><div class='del'>-</div><div class='del'>-static int max6900_probe(struct i2c_adapter *adapter, int addr, int kind);</div><div class='add'>+static struct i2c_driver max6900_driver;</div><div class='ctx'> </div><div class='ctx'> static int max6900_i2c_read_regs(struct i2c_client *client, u8 *buf)</div><div class='ctx'> {</div><div class='hunk'>@@ -69,36 +58,35 @@ static int max6900_i2c_read_regs(struct i2c_client *client, u8 *buf)</div><div class='ctx'> 	u8 reg_century_read[1] = { MAX6900_REG_CENTURY_READ };</div><div class='ctx'> 	struct i2c_msg msgs[4] = {</div><div class='ctx'> 		{</div><div class='del'>-			.addr	= client-&gt;addr,</div><div class='del'>-			.flags	= 0, /* write */</div><div class='del'>-			.len	= sizeof(reg_burst_read),</div><div class='del'>-			.buf	= reg_burst_read</div><div class='del'>-		},</div><div class='add'>+		 .addr = client-&gt;addr,</div><div class='add'>+		 .flags = 0,	/* write */</div><div class='add'>+		 .len = sizeof(reg_burst_read),</div><div class='add'>+		 .buf = reg_burst_read}</div><div class='add'>+		,</div><div class='ctx'> 		{</div><div class='del'>-			.addr	= client-&gt;addr,</div><div class='del'>-			.flags	= I2C_M_RD,</div><div class='del'>-			.len	= MAX6900_BURST_LEN,</div><div class='del'>-			.buf	= buf</div><div class='del'>-		},</div><div class='add'>+		 .addr = client-&gt;addr,</div><div class='add'>+		 .flags = I2C_M_RD,</div><div class='add'>+		 .len = MAX6900_BURST_LEN,</div><div class='add'>+		 .buf = buf}</div><div class='add'>+		,</div><div class='ctx'> 		{</div><div class='del'>-			.addr	= client-&gt;addr,</div><div class='del'>-			.flags	= 0, /* write */</div><div class='del'>-			.len	= sizeof(reg_century_read),</div><div class='del'>-			.buf	= reg_century_read</div><div class='del'>-		},</div><div class='add'>+		 .addr = client-&gt;addr,</div><div class='add'>+		 .flags = 0,	/* write */</div><div class='add'>+		 .len = sizeof(reg_century_read),</div><div class='add'>+		 .buf = reg_century_read}</div><div class='add'>+		,</div><div class='ctx'> 		{</div><div class='del'>-			.addr	= client-&gt;addr,</div><div class='del'>-			.flags	= I2C_M_RD,</div><div class='del'>-			.len	= sizeof(buf[MAX6900_REG_CENTURY]),</div><div class='del'>-			.buf	= &amp;buf[MAX6900_REG_CENTURY]</div><div class='del'>-		}</div><div class='add'>+		 .addr = client-&gt;addr,</div><div class='add'>+		 .flags = I2C_M_RD,</div><div class='add'>+		 .len = sizeof(buf[MAX6900_REG_CENTURY]),</div><div class='add'>+		 .buf = &amp;buf[MAX6900_REG_CENTURY]</div><div class='add'>+		 }</div><div class='ctx'> 	};</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	rc = i2c_transfer(client-&gt;adapter, msgs, ARRAY_SIZE(msgs));</div><div class='ctx'> 	if (rc != ARRAY_SIZE(msgs)) {</div><div class='del'>-		dev_err(&amp;client-&gt;dev, "%s: register read failed\n",</div><div class='del'>-			__func__);</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "%s: register read failed\n", __func__);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -109,20 +97,18 @@ static int max6900_i2c_write_regs(struct i2c_client *client, u8 const *buf)</div><div class='ctx'> 	u8 i2c_century_buf[1 + 1] = { MAX6900_REG_CENTURY_WRITE };</div><div class='ctx'> 	struct i2c_msg century_msgs[1] = {</div><div class='ctx'> 		{</div><div class='del'>-			.addr	= client-&gt;addr,</div><div class='del'>-			.flags	= 0, /* write */</div><div class='del'>-			.len	= sizeof(i2c_century_buf),</div><div class='del'>-			.buf	= i2c_century_buf</div><div class='del'>-		}</div><div class='add'>+		 .addr = client-&gt;addr,</div><div class='add'>+		 .flags = 0,	/* write */</div><div class='add'>+		 .len = sizeof(i2c_century_buf),</div><div class='add'>+		 .buf = i2c_century_buf}</div><div class='ctx'> 	};</div><div class='ctx'> 	u8 i2c_burst_buf[MAX6900_BURST_LEN + 1] = { MAX6900_REG_BURST_WRITE };</div><div class='ctx'> 	struct i2c_msg burst_msgs[1] = {</div><div class='ctx'> 		{</div><div class='del'>-			.addr	= client-&gt;addr,</div><div class='del'>-			.flags	= 0, /* write */</div><div class='del'>-			.len	= sizeof(i2c_burst_buf),</div><div class='del'>-			.buf	= i2c_burst_buf</div><div class='del'>-		}</div><div class='add'>+		 .addr = client-&gt;addr,</div><div class='add'>+		 .flags = 0,	/* write */</div><div class='add'>+		 .len = sizeof(i2c_burst_buf),</div><div class='add'>+		 .buf = i2c_burst_buf}</div><div class='ctx'> 	};</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='hunk'>@@ -133,10 +119,12 @@ static int max6900_i2c_write_regs(struct i2c_client *client, u8 const *buf)</div><div class='ctx'> 	 * bit as part of the burst write.</div><div class='ctx'> 	 */</div><div class='ctx'> 	i2c_century_buf[1] = buf[MAX6900_REG_CENTURY];</div><div class='add'>+</div><div class='ctx'> 	rc = i2c_transfer(client-&gt;adapter, century_msgs,</div><div class='ctx'> 			  ARRAY_SIZE(century_msgs));</div><div class='ctx'> 	if (rc != ARRAY_SIZE(century_msgs))</div><div class='ctx'> 		goto write_failed;</div><div class='add'>+</div><div class='ctx'> 	msleep(MAX6900_IDLE_TIME_AFTER_WRITE);</div><div class='ctx'> </div><div class='ctx'> 	memcpy(&amp;i2c_burst_buf[1], buf, MAX6900_BURST_LEN);</div><div class='hunk'>@@ -148,45 +136,11 @@ static int max6900_i2c_write_regs(struct i2c_client *client, u8 const *buf)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>-write_failed:</div><div class='del'>-	dev_err(&amp;client-&gt;dev, "%s: register write failed\n",</div><div class='del'>-		__func__);</div><div class='add'>+ write_failed:</div><div class='add'>+	dev_err(&amp;client-&gt;dev, "%s: register write failed\n", __func__);</div><div class='ctx'> 	return -EIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int max6900_i2c_validate_client(struct i2c_client *client)</div><div class='del'>-{</div><div class='del'>-	u8 regs[MAX6900_REG_LEN];</div><div class='del'>-	u8 zero_mask[] = {</div><div class='del'>-		0x80,	/* seconds */</div><div class='del'>-		0x80,	/* minutes */</div><div class='del'>-		0x40,	/* hours */</div><div class='del'>-		0xc0,	/* day of month */</div><div class='del'>-		0xe0,	/* month */</div><div class='del'>-		0xf8,	/* day of week */</div><div class='del'>-		0x00,	/* year */</div><div class='del'>-		0x7f,	/* control */</div><div class='del'>-	};</div><div class='del'>-	int i;</div><div class='del'>-	int rc;</div><div class='del'>-	int reserved;</div><div class='del'>-</div><div class='del'>-	reserved = i2c_smbus_read_byte_data(client, MAX6900_REG_RESERVED_READ);</div><div class='del'>-	if (reserved != 0x07)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	rc = max6900_i2c_read_regs(client, regs);</div><div class='del'>-	if (rc &lt; 0)</div><div class='del'>-		return rc;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(zero_mask); ++i) {</div><div class='del'>-		if (regs[i] &amp; zero_mask[i])</div><div class='del'>-			return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int max6900_i2c_read_time(struct i2c_client *client, struct rtc_time *tm)</div><div class='ctx'> {</div><div class='ctx'> 	int rc;</div><div class='hunk'>@@ -202,7 +156,7 @@ static int max6900_i2c_read_time(struct i2c_client *client, struct rtc_time *tm)</div><div class='ctx'> 	tm-&gt;tm_mday = BCD2BIN(regs[MAX6900_REG_DT]);</div><div class='ctx'> 	tm-&gt;tm_mon = BCD2BIN(regs[MAX6900_REG_MO]) - 1;</div><div class='ctx'> 	tm-&gt;tm_year = BCD2BIN(regs[MAX6900_REG_YR]) +</div><div class='del'>-		      BCD2BIN(regs[MAX6900_REG_CENTURY]) * 100 - 1900;</div><div class='add'>+	    BCD2BIN(regs[MAX6900_REG_CENTURY]) * 100 - 1900;</div><div class='ctx'> 	tm-&gt;tm_wday = BCD2BIN(regs[MAX6900_REG_DW]);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -211,7 +165,7 @@ static int max6900_i2c_read_time(struct i2c_client *client, struct rtc_time *tm)</div><div class='ctx'> static int max6900_i2c_clear_write_protect(struct i2c_client *client)</div><div class='ctx'> {</div><div class='ctx'> 	int rc;</div><div class='del'>-	rc = i2c_smbus_write_byte_data (client, MAX6900_REG_CONTROL_WRITE, 0);</div><div class='add'>+	rc = i2c_smbus_write_byte_data(client, MAX6900_REG_CONTROL_WRITE, 0);</div><div class='ctx'> 	if (rc &lt; 0) {</div><div class='ctx'> 		dev_err(&amp;client-&gt;dev, "%s: control register write failed\n",</div><div class='ctx'> 			__func__);</div><div class='hunk'>@@ -220,8 +174,8 @@ static int max6900_i2c_clear_write_protect(struct i2c_client *client)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int max6900_i2c_set_time(struct i2c_client *client,</div><div class='del'>-				struct rtc_time const *tm)</div><div class='add'>+static int</div><div class='add'>+max6900_i2c_set_time(struct i2c_client *client, struct rtc_time const *tm)</div><div class='ctx'> {</div><div class='ctx'> 	u8 regs[MAX6900_REG_LEN];</div><div class='ctx'> 	int rc;</div><div class='hunk'>@@ -258,89 +212,49 @@ static int max6900_rtc_set_time(struct device *dev, struct rtc_time *tm)</div><div class='ctx'> 	return max6900_i2c_set_time(to_i2c_client(dev), tm);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int max6900_attach_adapter(struct i2c_adapter *adapter)</div><div class='del'>-{</div><div class='del'>-	return i2c_probe(adapter, &amp;addr_data, max6900_probe);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int max6900_detach_client(struct i2c_client *client)</div><div class='add'>+static int max6900_remove(struct i2c_client *client)</div><div class='ctx'> {</div><div class='del'>-	struct rtc_device *const rtc = i2c_get_clientdata(client);</div><div class='add'>+	struct rtc_device *rtc = i2c_get_clientdata(client);</div><div class='ctx'> </div><div class='ctx'> 	if (rtc)</div><div class='ctx'> 		rtc_device_unregister(rtc);</div><div class='ctx'> </div><div class='del'>-	return i2c_detach_client(client);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct i2c_driver max6900_driver = {</div><div class='del'>-	.driver		= {</div><div class='del'>-		.name	= DRV_NAME,</div><div class='del'>-	},</div><div class='del'>-	.id		= I2C_DRIVERID_MAX6900,</div><div class='del'>-	.attach_adapter = max6900_attach_adapter,</div><div class='del'>-	.detach_client	= max6900_detach_client,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static const struct rtc_class_ops max6900_rtc_ops = {</div><div class='del'>-	.read_time	= max6900_rtc_read_time,</div><div class='del'>-	.set_time	= max6900_rtc_set_time,</div><div class='add'>+	.read_time = max6900_rtc_read_time,</div><div class='add'>+	.set_time = max6900_rtc_set_time,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int max6900_probe(struct i2c_adapter *adapter, int addr, int kind)</div><div class='add'>+static int</div><div class='add'>+max6900_probe(struct i2c_client *client, const struct i2c_device_id *id)</div><div class='ctx'> {</div><div class='del'>-	int rc = 0;</div><div class='del'>-	struct i2c_client *client = NULL;</div><div class='del'>-	struct rtc_device *rtc = NULL;</div><div class='del'>-</div><div class='del'>-	if (!i2c_check_functionality(adapter, I2C_FUNC_I2C)) {</div><div class='del'>-		rc = -ENODEV;</div><div class='del'>-		goto failout;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);</div><div class='del'>-	if (client == NULL) {</div><div class='del'>-		rc = -ENOMEM;</div><div class='del'>-		goto failout;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	client-&gt;addr = addr;</div><div class='del'>-	client-&gt;adapter = adapter;</div><div class='del'>-	client-&gt;driver = &amp;max6900_driver;</div><div class='del'>-	strlcpy(client-&gt;name, DRV_NAME, I2C_NAME_SIZE);</div><div class='del'>-</div><div class='del'>-	if (kind &lt; 0) {</div><div class='del'>-		rc = max6900_i2c_validate_client(client);</div><div class='del'>-		if (rc &lt; 0)</div><div class='del'>-			goto failout;</div><div class='del'>-	}</div><div class='add'>+	struct rtc_device *rtc;</div><div class='ctx'> </div><div class='del'>-	rc = i2c_attach_client(client);</div><div class='del'>-	if (rc &lt; 0)</div><div class='del'>-		goto failout;</div><div class='add'>+	if (!i2c_check_functionality(client-&gt;adapter, I2C_FUNC_I2C))</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	dev_info(&amp;client-&gt;dev,</div><div class='del'>-		 "chip found, driver version " DRV_VERSION "\n");</div><div class='add'>+	dev_info(&amp;client-&gt;dev, "chip found, driver version " DRV_VERSION "\n");</div><div class='ctx'> </div><div class='ctx'> 	rtc = rtc_device_register(max6900_driver.driver.name,</div><div class='del'>-				  &amp;client-&gt;dev,</div><div class='del'>-				  &amp;max6900_rtc_ops, THIS_MODULE);</div><div class='del'>-	if (IS_ERR(rtc)) {</div><div class='del'>-		rc = PTR_ERR(rtc);</div><div class='del'>-		goto failout_detach;</div><div class='del'>-	}</div><div class='add'>+				  &amp;client-&gt;dev, &amp;max6900_rtc_ops, THIS_MODULE);</div><div class='add'>+	if (IS_ERR(rtc))</div><div class='add'>+		return PTR_ERR(rtc);</div><div class='ctx'> </div><div class='ctx'> 	i2c_set_clientdata(client, rtc);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='del'>-failout_detach:</div><div class='del'>-	i2c_detach_client(client);</div><div class='del'>-failout:</div><div class='del'>-	kfree(client);</div><div class='del'>-	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct i2c_driver max6900_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		   .name = "rtc-max6900",</div><div class='add'>+		   },</div><div class='add'>+	.probe = max6900_probe,</div><div class='add'>+	.remove = max6900_remove,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int __init max6900_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	return i2c_add_driver(&amp;max6900_driver);</div><div class='hunk'>@@ -352,6 +266,7 @@ static void __exit max6900_exit(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("Maxim MAX6900 RTC driver");</div><div class='add'>+MODULE_AUTHOR("Dale Farnsworth &lt;dale@farnsworth.org&gt;");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_VERSION(DRV_VERSION);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/rtc/rtc-pcf8563.c b/drivers/rtc/rtc-pcf8563.c<br/>index 748a502a6355..a829f20ad6d6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/rtc/rtc-pcf8563.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/rtc/rtc-pcf8563.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/rtc/rtc-pcf8563.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/rtc/rtc-pcf8563.c</a></div><div class='hunk'>@@ -179,58 +179,6 @@ struct pcf8563_limit</div><div class='ctx'> 	unsigned char max;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int pcf8563_validate_client(struct i2c_client *client)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	static const struct pcf8563_limit pattern[] = {</div><div class='del'>-		/* register, mask, min, max */</div><div class='del'>-		{ PCF8563_REG_SC,	0x7F,	0,	59	},</div><div class='del'>-		{ PCF8563_REG_MN,	0x7F,	0,	59	},</div><div class='del'>-		{ PCF8563_REG_HR,	0x3F,	0,	23	},</div><div class='del'>-		{ PCF8563_REG_DM,	0x3F,	0,	31	},</div><div class='del'>-		{ PCF8563_REG_MO,	0x1F,	0,	12	},</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	/* check limits (only registers with bcd values) */</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(pattern); i++) {</div><div class='del'>-		int xfer;</div><div class='del'>-		unsigned char value;</div><div class='del'>-		unsigned char buf = pattern[i].reg;</div><div class='del'>-</div><div class='del'>-		struct i2c_msg msgs[] = {</div><div class='del'>-			{ client-&gt;addr, 0, 1, &amp;buf },</div><div class='del'>-			{ client-&gt;addr, I2C_M_RD, 1, &amp;buf },</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		xfer = i2c_transfer(client-&gt;adapter, msgs, ARRAY_SIZE(msgs));</div><div class='del'>-</div><div class='del'>-		if (xfer != ARRAY_SIZE(msgs)) {</div><div class='del'>-			dev_err(&amp;client-&gt;dev,</div><div class='del'>-				"%s: could not read register 0x%02X\n",</div><div class='del'>-				__func__, pattern[i].reg);</div><div class='del'>-</div><div class='del'>-			return -EIO;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		value = BCD2BIN(buf &amp; pattern[i].mask);</div><div class='del'>-</div><div class='del'>-		if (value &gt; pattern[i].max ||</div><div class='del'>-			value &lt; pattern[i].min) {</div><div class='del'>-			dev_dbg(&amp;client-&gt;dev,</div><div class='del'>-				"%s: pattern=%d, reg=%x, mask=0x%02x, min=%d, "</div><div class='del'>-				"max=%d, value=%d, raw=0x%02X\n",</div><div class='del'>-				__func__, i, pattern[i].reg, pattern[i].mask,</div><div class='del'>-				pattern[i].min, pattern[i].max,</div><div class='del'>-				value, buf);</div><div class='del'>-</div><div class='del'>-			return -ENODEV;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int pcf8563_rtc_read_time(struct device *dev, struct rtc_time *tm)</div><div class='ctx'> {</div><div class='ctx'> 	return pcf8563_get_datetime(to_i2c_client(dev), tm);</div><div class='hunk'>@@ -262,12 +210,6 @@ static int pcf8563_probe(struct i2c_client *client,</div><div class='ctx'> 	if (!pcf8563)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	/* Verify the chip is really an PCF8563 */</div><div class='del'>-	if (pcf8563_validate_client(client) &lt; 0) {</div><div class='del'>-		err = -ENODEV;</div><div class='del'>-		goto exit_kfree;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	dev_info(&amp;client-&gt;dev, "chip found, driver version " DRV_VERSION "\n");</div><div class='ctx'> </div><div class='ctx'> 	pcf8563-&gt;rtc = rtc_device_register(pcf8563_driver.driver.name,</div><div class='head'>diff --git a/drivers/rtc/rtc-pl030.c b/drivers/rtc/rtc-pl030.c<br/>index 8448eeb9d675..826153552157 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/rtc/rtc-pl030.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/rtc/rtc-pl030.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/rtc/rtc-pl030.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/rtc/rtc-pl030.c</a></div><div class='hunk'>@@ -34,15 +34,6 @@ static irqreturn_t pl030_interrupt(int irq, void *dev_id)</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int pl030_open(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void pl030_release(struct device *dev)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int pl030_ioctl(struct device *dev, unsigned int cmd, unsigned long arg)</div><div class='ctx'> {</div><div class='ctx'> 	return -ENOIOCTLCMD;</div><div class='hunk'>@@ -104,8 +95,6 @@ static int pl030_set_time(struct device *dev, struct rtc_time *tm)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct rtc_class_ops pl030_ops = {</div><div class='del'>-	.open		= pl030_open,</div><div class='del'>-	.release	= pl030_release,</div><div class='ctx'> 	.ioctl		= pl030_ioctl,</div><div class='ctx'> 	.read_time	= pl030_read_time,</div><div class='ctx'> 	.set_time	= pl030_set_time,</div><div class='head'>diff --git a/drivers/rtc/rtc-pl031.c b/drivers/rtc/rtc-pl031.c<br/>index 08b4610ec5a6..333eec689d2f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/rtc/rtc-pl031.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/rtc/rtc-pl031.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/rtc/rtc-pl031.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/rtc/rtc-pl031.c</a></div><div class='hunk'>@@ -45,18 +45,6 @@ static irqreturn_t pl031_interrupt(int irq, void *dev_id)</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int pl031_open(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * We request IRQ in pl031_probe, so nothing to do here...</div><div class='del'>-	 */</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void pl031_release(struct device *dev)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int pl031_ioctl(struct device *dev, unsigned int cmd, unsigned long arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct pl031_local *ldata = dev_get_drvdata(dev);</div><div class='hunk'>@@ -118,8 +106,6 @@ static int pl031_set_alarm(struct device *dev, struct rtc_wkalrm *alarm)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct rtc_class_ops pl031_ops = {</div><div class='del'>-	.open = pl031_open,</div><div class='del'>-	.release = pl031_release,</div><div class='ctx'> 	.ioctl = pl031_ioctl,</div><div class='ctx'> 	.read_time = pl031_read_time,</div><div class='ctx'> 	.set_time = pl031_set_time,</div><div class='head'>diff --git a/drivers/rtc/rtc-rs5c372.c b/drivers/rtc/rtc-rs5c372.c<br/>index 56caf6b2c3e5..8b561958fb1e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/rtc/rtc-rs5c372.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/rtc/rtc-rs5c372.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/rtc/rtc-rs5c372.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/rtc/rtc-rs5c372.c</a></div><div class='hunk'>@@ -1,8 +1,9 @@</div><div class='ctx'> /*</div><div class='del'>- * An I2C driver for Ricoh RS5C372 and RV5C38[67] RTCs</div><div class='add'>+ * An I2C driver for Ricoh RS5C372, R2025S/D and RV5C38[67] RTCs</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2005 Pavel Mironchik &lt;pmironchik@optifacio.net&gt;</div><div class='ctx'>  * Copyright (C) 2006 Tower Technologies</div><div class='add'>+ * Copyright (C) 2008 Paul Mundt</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of the GNU General Public License version 2 as</div><div class='hunk'>@@ -13,7 +14,7 @@</div><div class='ctx'> #include &lt;linux/rtc.h&gt;</div><div class='ctx'> #include &lt;linux/bcd.h&gt;</div><div class='ctx'> </div><div class='del'>-#define DRV_VERSION "0.5"</div><div class='add'>+#define DRV_VERSION "0.6"</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -51,7 +52,8 @@</div><div class='ctx'> #	define RS5C_CTRL1_CT4		(4 &lt;&lt; 0)	/* 1 Hz level irq */</div><div class='ctx'> #define RS5C_REG_CTRL2		15</div><div class='ctx'> #	define RS5C372_CTRL2_24		(1 &lt;&lt; 5)</div><div class='del'>-#	define RS5C_CTRL2_XSTP		(1 &lt;&lt; 4)</div><div class='add'>+#	define R2025_CTRL2_XST		(1 &lt;&lt; 5)</div><div class='add'>+#	define RS5C_CTRL2_XSTP		(1 &lt;&lt; 4)	/* only if !R2025S/D */</div><div class='ctx'> #	define RS5C_CTRL2_CTFG		(1 &lt;&lt; 2)</div><div class='ctx'> #	define RS5C_CTRL2_AAFG		(1 &lt;&lt; 1)	/* or WAFG */</div><div class='ctx'> #	define RS5C_CTRL2_BAFG		(1 &lt;&lt; 0)	/* or DAFG */</div><div class='hunk'>@@ -63,6 +65,7 @@</div><div class='ctx'> </div><div class='ctx'> enum rtc_type {</div><div class='ctx'> 	rtc_undef = 0,</div><div class='add'>+	rtc_r2025sd,</div><div class='ctx'> 	rtc_rs5c372a,</div><div class='ctx'> 	rtc_rs5c372b,</div><div class='ctx'> 	rtc_rv5c386,</div><div class='hunk'>@@ -70,6 +73,7 @@ enum rtc_type {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct i2c_device_id rs5c372_id[] = {</div><div class='add'>+	{ "r2025sd", rtc_r2025sd },</div><div class='ctx'> 	{ "rs5c372a", rtc_rs5c372a },</div><div class='ctx'> 	{ "rs5c372b", rtc_rs5c372b },</div><div class='ctx'> 	{ "rv5c386", rtc_rv5c386 },</div><div class='hunk'>@@ -89,6 +93,7 @@ struct rs5c372 {</div><div class='ctx'> 	enum rtc_type		type;</div><div class='ctx'> 	unsigned		time24:1;</div><div class='ctx'> 	unsigned		has_irq:1;</div><div class='add'>+	unsigned		smbus:1;</div><div class='ctx'> 	char			buf[17];</div><div class='ctx'> 	char			*regs;</div><div class='ctx'> };</div><div class='hunk'>@@ -106,10 +111,25 @@ static int rs5c_get_regs(struct rs5c372 *rs5c)</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * The first method doesn't work with the iop3xx adapter driver, on at</div><div class='ctx'> 	 * least 80219 chips; this works around that bug.</div><div class='add'>+	 *</div><div class='add'>+	 * The third method on the other hand doesn't work for the SMBus-only</div><div class='add'>+	 * configurations, so we use the the first method there, stripping off</div><div class='add'>+	 * the extra register in the process.</div><div class='ctx'> 	 */</div><div class='del'>-	if ((i2c_transfer(client-&gt;adapter, msgs, 1)) != 1) {</div><div class='del'>-		dev_warn(&amp;client-&gt;dev, "can't read registers\n");</div><div class='del'>-		return -EIO;</div><div class='add'>+	if (rs5c-&gt;smbus) {</div><div class='add'>+		int addr = RS5C_ADDR(RS5C372_REG_SECS);</div><div class='add'>+		int size = sizeof(rs5c-&gt;buf) - 1;</div><div class='add'>+</div><div class='add'>+		if (i2c_smbus_read_i2c_block_data(client, addr, size,</div><div class='add'>+						  rs5c-&gt;buf + 1) != size) {</div><div class='add'>+			dev_warn(&amp;client-&gt;dev, "can't read registers\n");</div><div class='add'>+			return -EIO;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		if ((i2c_transfer(client-&gt;adapter, msgs, 1)) != 1) {</div><div class='add'>+			dev_warn(&amp;client-&gt;dev, "can't read registers\n");</div><div class='add'>+			return -EIO;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(&amp;client-&gt;dev,</div><div class='hunk'>@@ -187,6 +207,7 @@ static int rs5c372_set_datetime(struct i2c_client *client, struct rtc_time *tm)</div><div class='ctx'> {</div><div class='ctx'> 	struct rs5c372	*rs5c = i2c_get_clientdata(client);</div><div class='ctx'> 	unsigned char	buf[8];</div><div class='add'>+	int		addr;</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(&amp;client-&gt;dev, "%s: tm is secs=%d, mins=%d, hours=%d "</div><div class='ctx'> 		"mday=%d, mon=%d, year=%d, wday=%d\n",</div><div class='hunk'>@@ -194,16 +215,16 @@ static int rs5c372_set_datetime(struct i2c_client *client, struct rtc_time *tm)</div><div class='ctx'> 		tm-&gt;tm_sec, tm-&gt;tm_min, tm-&gt;tm_hour,</div><div class='ctx'> 		tm-&gt;tm_mday, tm-&gt;tm_mon, tm-&gt;tm_year, tm-&gt;tm_wday);</div><div class='ctx'> </div><div class='del'>-	buf[0] = RS5C_ADDR(RS5C372_REG_SECS);</div><div class='del'>-	buf[1] = BIN2BCD(tm-&gt;tm_sec);</div><div class='del'>-	buf[2] = BIN2BCD(tm-&gt;tm_min);</div><div class='del'>-	buf[3] = rs5c_hr2reg(rs5c, tm-&gt;tm_hour);</div><div class='del'>-	buf[4] = BIN2BCD(tm-&gt;tm_wday);</div><div class='del'>-	buf[5] = BIN2BCD(tm-&gt;tm_mday);</div><div class='del'>-	buf[6] = BIN2BCD(tm-&gt;tm_mon + 1);</div><div class='del'>-	buf[7] = BIN2BCD(tm-&gt;tm_year - 100);</div><div class='add'>+	addr   = RS5C_ADDR(RS5C372_REG_SECS);</div><div class='add'>+	buf[0] = BIN2BCD(tm-&gt;tm_sec);</div><div class='add'>+	buf[1] = BIN2BCD(tm-&gt;tm_min);</div><div class='add'>+	buf[2] = rs5c_hr2reg(rs5c, tm-&gt;tm_hour);</div><div class='add'>+	buf[3] = BIN2BCD(tm-&gt;tm_wday);</div><div class='add'>+	buf[4] = BIN2BCD(tm-&gt;tm_mday);</div><div class='add'>+	buf[5] = BIN2BCD(tm-&gt;tm_mon + 1);</div><div class='add'>+	buf[6] = BIN2BCD(tm-&gt;tm_year - 100);</div><div class='ctx'> </div><div class='del'>-	if ((i2c_master_send(client, buf, 8)) != 8) {</div><div class='add'>+	if (i2c_smbus_write_i2c_block_data(client, addr, sizeof(buf), buf) &lt; 0) {</div><div class='ctx'> 		dev_err(&amp;client-&gt;dev, "%s: write error\n", __func__);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -266,16 +287,16 @@ rs5c_rtc_ioctl(struct device *dev, unsigned int cmd, unsigned long arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct i2c_client	*client = to_i2c_client(dev);</div><div class='ctx'> 	struct rs5c372		*rs5c = i2c_get_clientdata(client);</div><div class='del'>-	unsigned char		buf[2];</div><div class='del'>-	int			status;</div><div class='add'>+	unsigned char		buf;</div><div class='add'>+	int			status, addr;</div><div class='ctx'> </div><div class='del'>-	buf[1] = rs5c-&gt;regs[RS5C_REG_CTRL1];</div><div class='add'>+	buf = rs5c-&gt;regs[RS5C_REG_CTRL1];</div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case RTC_UIE_OFF:</div><div class='ctx'> 	case RTC_UIE_ON:</div><div class='ctx'> 		/* some 327a modes use a different IRQ pin for 1Hz irqs */</div><div class='ctx'> 		if (rs5c-&gt;type == rtc_rs5c372a</div><div class='del'>-				&amp;&amp; (buf[1] &amp; RS5C372A_CTRL1_SL1))</div><div class='add'>+				&amp;&amp; (buf &amp; RS5C372A_CTRL1_SL1))</div><div class='ctx'> 			return -ENOIOCTLCMD;</div><div class='ctx'> 	case RTC_AIE_OFF:</div><div class='ctx'> 	case RTC_AIE_ON:</div><div class='hunk'>@@ -293,28 +314,30 @@ rs5c_rtc_ioctl(struct device *dev, unsigned int cmd, unsigned long arg)</div><div class='ctx'> 	if (status &lt; 0)</div><div class='ctx'> 		return status;</div><div class='ctx'> </div><div class='del'>-	buf[0] = RS5C_ADDR(RS5C_REG_CTRL1);</div><div class='add'>+	addr = RS5C_ADDR(RS5C_REG_CTRL1);</div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case RTC_AIE_OFF:	/* alarm off */</div><div class='del'>-		buf[1] &amp;= ~RS5C_CTRL1_AALE;</div><div class='add'>+		buf &amp;= ~RS5C_CTRL1_AALE;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case RTC_AIE_ON:	/* alarm on */</div><div class='del'>-		buf[1] |= RS5C_CTRL1_AALE;</div><div class='add'>+		buf |= RS5C_CTRL1_AALE;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case RTC_UIE_OFF:	/* update off */</div><div class='del'>-		buf[1] &amp;= ~RS5C_CTRL1_CT_MASK;</div><div class='add'>+		buf &amp;= ~RS5C_CTRL1_CT_MASK;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case RTC_UIE_ON:	/* update on */</div><div class='del'>-		buf[1] &amp;= ~RS5C_CTRL1_CT_MASK;</div><div class='del'>-		buf[1] |= RS5C_CTRL1_CT4;</div><div class='add'>+		buf &amp;= ~RS5C_CTRL1_CT_MASK;</div><div class='add'>+		buf |= RS5C_CTRL1_CT4;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	if ((i2c_master_send(client, buf, 2)) != 2) {</div><div class='add'>+</div><div class='add'>+	if (i2c_smbus_write_byte_data(client, addr, buf) &lt; 0) {</div><div class='ctx'> 		printk(KERN_WARNING "%s: can't update alarm\n",</div><div class='ctx'> 			rs5c-&gt;rtc-&gt;name);</div><div class='ctx'> 		status = -EIO;</div><div class='ctx'> 	} else</div><div class='del'>-		rs5c-&gt;regs[RS5C_REG_CTRL1] = buf[1];</div><div class='add'>+		rs5c-&gt;regs[RS5C_REG_CTRL1] = buf;</div><div class='add'>+</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -364,8 +387,8 @@ static int rs5c_set_alarm(struct device *dev, struct rtc_wkalrm *t)</div><div class='ctx'> {</div><div class='ctx'> 	struct i2c_client	*client = to_i2c_client(dev);</div><div class='ctx'> 	struct rs5c372		*rs5c = i2c_get_clientdata(client);</div><div class='del'>-	int			status;</div><div class='del'>-	unsigned char		buf[4];</div><div class='add'>+	int			status, addr, i;</div><div class='add'>+	unsigned char		buf[3];</div><div class='ctx'> </div><div class='ctx'> 	/* only handle up to 24 hours in the future, like RTC_ALM_SET */</div><div class='ctx'> 	if (t-&gt;time.tm_mday != -1</div><div class='hunk'>@@ -380,33 +403,36 @@ static int rs5c_set_alarm(struct device *dev, struct rtc_wkalrm *t)</div><div class='ctx'> 	if (status &lt; 0)</div><div class='ctx'> 		return status;</div><div class='ctx'> 	if (rs5c-&gt;regs[RS5C_REG_CTRL1] &amp; RS5C_CTRL1_AALE) {</div><div class='del'>-		buf[0] = RS5C_ADDR(RS5C_REG_CTRL1);</div><div class='del'>-		buf[1] = rs5c-&gt;regs[RS5C_REG_CTRL1] &amp; ~RS5C_CTRL1_AALE;</div><div class='del'>-		if (i2c_master_send(client, buf, 2) != 2) {</div><div class='add'>+		addr = RS5C_ADDR(RS5C_REG_CTRL1);</div><div class='add'>+		buf[0] = rs5c-&gt;regs[RS5C_REG_CTRL1] &amp; ~RS5C_CTRL1_AALE;</div><div class='add'>+		if (i2c_smbus_write_byte_data(client, addr, buf[0]) &lt; 0) {</div><div class='ctx'> 			pr_debug("%s: can't disable alarm\n", rs5c-&gt;rtc-&gt;name);</div><div class='ctx'> 			return -EIO;</div><div class='ctx'> 		}</div><div class='del'>-		rs5c-&gt;regs[RS5C_REG_CTRL1] = buf[1];</div><div class='add'>+		rs5c-&gt;regs[RS5C_REG_CTRL1] = buf[0];</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* set alarm */</div><div class='del'>-	buf[0] = RS5C_ADDR(RS5C_REG_ALARM_A_MIN);</div><div class='del'>-	buf[1] = BIN2BCD(t-&gt;time.tm_min);</div><div class='del'>-	buf[2] = rs5c_hr2reg(rs5c, t-&gt;time.tm_hour);</div><div class='del'>-	buf[3] = 0x7f;	/* any/all days */</div><div class='del'>-	if ((i2c_master_send(client, buf, 4)) != 4) {</div><div class='del'>-		pr_debug("%s: can't set alarm time\n", rs5c-&gt;rtc-&gt;name);</div><div class='del'>-		return -EIO;</div><div class='add'>+	buf[0] = BIN2BCD(t-&gt;time.tm_min);</div><div class='add'>+	buf[1] = rs5c_hr2reg(rs5c, t-&gt;time.tm_hour);</div><div class='add'>+	buf[2] = 0x7f;	/* any/all days */</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; sizeof(buf); i++) {</div><div class='add'>+		addr = RS5C_ADDR(RS5C_REG_ALARM_A_MIN + i);</div><div class='add'>+		if (i2c_smbus_write_byte_data(client, addr, buf[i]) &lt; 0) {</div><div class='add'>+			pr_debug("%s: can't set alarm time\n", rs5c-&gt;rtc-&gt;name);</div><div class='add'>+			return -EIO;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* ... and maybe enable its irq */</div><div class='ctx'> 	if (t-&gt;enabled) {</div><div class='del'>-		buf[0] = RS5C_ADDR(RS5C_REG_CTRL1);</div><div class='del'>-		buf[1] = rs5c-&gt;regs[RS5C_REG_CTRL1] | RS5C_CTRL1_AALE;</div><div class='del'>-		if ((i2c_master_send(client, buf, 2)) != 2)</div><div class='add'>+		addr = RS5C_ADDR(RS5C_REG_CTRL1);</div><div class='add'>+		buf[0] = rs5c-&gt;regs[RS5C_REG_CTRL1] | RS5C_CTRL1_AALE;</div><div class='add'>+		if (i2c_smbus_write_byte_data(client, addr, buf[0]) &lt; 0)</div><div class='ctx'> 			printk(KERN_WARNING "%s: can't enable alarm\n",</div><div class='ctx'> 				rs5c-&gt;rtc-&gt;name);</div><div class='del'>-		rs5c-&gt;regs[RS5C_REG_CTRL1] = buf[1];</div><div class='add'>+		rs5c-&gt;regs[RS5C_REG_CTRL1] = buf[0];</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -503,18 +529,81 @@ static void rs5c_sysfs_unregister(struct device *dev)</div><div class='ctx'> </div><div class='ctx'> static struct i2c_driver rs5c372_driver;</div><div class='ctx'> </div><div class='add'>+static int rs5c_oscillator_setup(struct rs5c372 *rs5c372)</div><div class='add'>+{</div><div class='add'>+	unsigned char buf[2];</div><div class='add'>+	int addr, i, ret = 0;</div><div class='add'>+</div><div class='add'>+	if (rs5c372-&gt;type == rtc_r2025sd) {</div><div class='add'>+		if (!(rs5c372-&gt;regs[RS5C_REG_CTRL2] &amp; R2025_CTRL2_XST))</div><div class='add'>+			return ret;</div><div class='add'>+		rs5c372-&gt;regs[RS5C_REG_CTRL2] &amp;= ~R2025_CTRL2_XST;</div><div class='add'>+	} else {</div><div class='add'>+		if (!(rs5c372-&gt;regs[RS5C_REG_CTRL2] &amp; RS5C_CTRL2_XSTP))</div><div class='add'>+			return ret;</div><div class='add'>+		rs5c372-&gt;regs[RS5C_REG_CTRL2] &amp;= ~RS5C_CTRL2_XSTP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	addr   = RS5C_ADDR(RS5C_REG_CTRL1);</div><div class='add'>+	buf[0] = rs5c372-&gt;regs[RS5C_REG_CTRL1];</div><div class='add'>+	buf[1] = rs5c372-&gt;regs[RS5C_REG_CTRL2];</div><div class='add'>+</div><div class='add'>+	/* use 24hr mode */</div><div class='add'>+	switch (rs5c372-&gt;type) {</div><div class='add'>+	case rtc_rs5c372a:</div><div class='add'>+	case rtc_rs5c372b:</div><div class='add'>+		buf[1] |= RS5C372_CTRL2_24;</div><div class='add'>+		rs5c372-&gt;time24 = 1;</div><div class='add'>+		break;</div><div class='add'>+	case rtc_r2025sd:</div><div class='add'>+	case rtc_rv5c386:</div><div class='add'>+	case rtc_rv5c387a:</div><div class='add'>+		buf[0] |= RV5C387_CTRL1_24;</div><div class='add'>+		rs5c372-&gt;time24 = 1;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		/* impossible */</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; sizeof(buf); i++) {</div><div class='add'>+		addr = RS5C_ADDR(RS5C_REG_CTRL1 + i);</div><div class='add'>+		ret = i2c_smbus_write_byte_data(rs5c372-&gt;client, addr, buf[i]);</div><div class='add'>+		if (unlikely(ret &lt; 0))</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rs5c372-&gt;regs[RS5C_REG_CTRL1] = buf[0];</div><div class='add'>+	rs5c372-&gt;regs[RS5C_REG_CTRL2] = buf[1];</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int rs5c372_probe(struct i2c_client *client,</div><div class='ctx'> 			 const struct i2c_device_id *id)</div><div class='ctx'> {</div><div class='ctx'> 	int err = 0;</div><div class='add'>+	int smbus_mode = 0;</div><div class='ctx'> 	struct rs5c372 *rs5c372;</div><div class='ctx'> 	struct rtc_time tm;</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(&amp;client-&gt;dev, "%s\n", __func__);</div><div class='ctx'> </div><div class='del'>-	if (!i2c_check_functionality(client-&gt;adapter, I2C_FUNC_I2C)) {</div><div class='del'>-		err = -ENODEV;</div><div class='del'>-		goto exit;</div><div class='add'>+	if (!i2c_check_functionality(client-&gt;adapter, I2C_FUNC_I2C |</div><div class='add'>+			I2C_FUNC_SMBUS_BYTE_DATA | I2C_FUNC_SMBUS_I2C_BLOCK)) {</div><div class='add'>+		/*</div><div class='add'>+		 * If we don't have any master mode adapter, try breaking</div><div class='add'>+		 * it down in to the barest of capabilities.</div><div class='add'>+		 */</div><div class='add'>+		if (i2c_check_functionality(client-&gt;adapter,</div><div class='add'>+				I2C_FUNC_SMBUS_BYTE_DATA |</div><div class='add'>+				I2C_FUNC_SMBUS_I2C_BLOCK))</div><div class='add'>+			smbus_mode = 1;</div><div class='add'>+		else {</div><div class='add'>+			/* Still no good, give up */</div><div class='add'>+			err = -ENODEV;</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!(rs5c372 = kzalloc(sizeof(struct rs5c372), GFP_KERNEL))) {</div><div class='hunk'>@@ -528,6 +617,7 @@ static int rs5c372_probe(struct i2c_client *client,</div><div class='ctx'> </div><div class='ctx'> 	/* we read registers 0x0f then 0x00-0x0f; skip the first one */</div><div class='ctx'> 	rs5c372-&gt;regs = &amp;rs5c372-&gt;buf[1];</div><div class='add'>+	rs5c372-&gt;smbus = smbus_mode;</div><div class='ctx'> </div><div class='ctx'> 	err = rs5c_get_regs(rs5c372);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='hunk'>@@ -543,6 +633,7 @@ static int rs5c372_probe(struct i2c_client *client,</div><div class='ctx'> 		if (rs5c372-&gt;regs[RS5C_REG_CTRL2] &amp; RS5C372_CTRL2_24)</div><div class='ctx'> 			rs5c372-&gt;time24 = 1;</div><div class='ctx'> 		break;</div><div class='add'>+	case rtc_r2025sd:</div><div class='ctx'> 	case rtc_rv5c386:</div><div class='ctx'> 	case rtc_rv5c387a:</div><div class='ctx'> 		if (rs5c372-&gt;regs[RS5C_REG_CTRL1] &amp; RV5C387_CTRL1_24)</div><div class='hunk'>@@ -558,39 +649,14 @@ static int rs5c372_probe(struct i2c_client *client,</div><div class='ctx'> </div><div class='ctx'> 	/* if the oscillator lost power and no other software (like</div><div class='ctx'> 	 * the bootloader) set it up, do it here.</div><div class='add'>+	 *</div><div class='add'>+	 * The R2025S/D does this a little differently than the other</div><div class='add'>+	 * parts, so we special case that..</div><div class='ctx'> 	 */</div><div class='del'>-	if (rs5c372-&gt;regs[RS5C_REG_CTRL2] &amp; RS5C_CTRL2_XSTP) {</div><div class='del'>-		unsigned char buf[3];</div><div class='del'>-</div><div class='del'>-		rs5c372-&gt;regs[RS5C_REG_CTRL2] &amp;= ~RS5C_CTRL2_XSTP;</div><div class='del'>-</div><div class='del'>-		buf[0] = RS5C_ADDR(RS5C_REG_CTRL1);</div><div class='del'>-		buf[1] = rs5c372-&gt;regs[RS5C_REG_CTRL1];</div><div class='del'>-		buf[2] = rs5c372-&gt;regs[RS5C_REG_CTRL2];</div><div class='del'>-</div><div class='del'>-		/* use 24hr mode */</div><div class='del'>-		switch (rs5c372-&gt;type) {</div><div class='del'>-		case rtc_rs5c372a:</div><div class='del'>-		case rtc_rs5c372b:</div><div class='del'>-			buf[2] |= RS5C372_CTRL2_24;</div><div class='del'>-			rs5c372-&gt;time24 = 1;</div><div class='del'>-			break;</div><div class='del'>-		case rtc_rv5c386:</div><div class='del'>-		case rtc_rv5c387a:</div><div class='del'>-			buf[1] |= RV5C387_CTRL1_24;</div><div class='del'>-			rs5c372-&gt;time24 = 1;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			/* impossible */</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if ((i2c_master_send(client, buf, 3)) != 3) {</div><div class='del'>-			dev_err(&amp;client-&gt;dev, "setup error\n");</div><div class='del'>-			goto exit_kfree;</div><div class='del'>-		}</div><div class='del'>-		rs5c372-&gt;regs[RS5C_REG_CTRL1] = buf[1];</div><div class='del'>-		rs5c372-&gt;regs[RS5C_REG_CTRL2] = buf[2];</div><div class='add'>+	err = rs5c_oscillator_setup(rs5c372);</div><div class='add'>+	if (unlikely(err &lt; 0)) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "setup error\n");</div><div class='add'>+		goto exit_kfree;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (rs5c372_get_datetime(client, &amp;tm) &lt; 0)</div><div class='hunk'>@@ -598,6 +664,7 @@ static int rs5c372_probe(struct i2c_client *client,</div><div class='ctx'> </div><div class='ctx'> 	dev_info(&amp;client-&gt;dev, "%s found, %s, driver version " DRV_VERSION "\n",</div><div class='ctx'> 			({ char *s; switch (rs5c372-&gt;type) {</div><div class='add'>+			case rtc_r2025sd:	s = "r2025sd"; break;</div><div class='ctx'> 			case rtc_rs5c372a:	s = "rs5c372a"; break;</div><div class='ctx'> 			case rtc_rs5c372b:	s = "rs5c372b"; break;</div><div class='ctx'> 			case rtc_rv5c386:	s = "rv5c386"; break;</div><div class='hunk'>@@ -667,7 +734,8 @@ module_exit(rs5c372_exit);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR(</div><div class='ctx'> 		"Pavel Mironchik &lt;pmironchik@optifacio.net&gt;, "</div><div class='del'>-		"Alessandro Zummo &lt;a.zummo@towertech.it&gt;");</div><div class='add'>+		"Alessandro Zummo &lt;a.zummo@towertech.it&gt;, "</div><div class='add'>+		"Paul Mundt &lt;lethal@linux-sh.org&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Ricoh RS5C372 RTC driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_VERSION(DRV_VERSION);</div><div class='head'>diff --git a/drivers/rtc/rtc-sh.c b/drivers/rtc/rtc-sh.c<br/>index 1f88e9e914ec..fcead4c4cd1f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/rtc/rtc-sh.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/rtc/rtc-sh.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/rtc/rtc-sh.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/rtc/rtc-sh.c</a></div><div class='hunk'>@@ -257,12 +257,6 @@ static inline void sh_rtc_setaie(struct device *dev, unsigned int enable)</div><div class='ctx'> 	spin_unlock_irq(&amp;rtc-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void sh_rtc_release(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	sh_rtc_setpie(dev, 0);</div><div class='del'>-	sh_rtc_setaie(dev, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int sh_rtc_proc(struct device *dev, struct seq_file *seq)</div><div class='ctx'> {</div><div class='ctx'> 	struct sh_rtc *rtc = dev_get_drvdata(dev);</div><div class='hunk'>@@ -559,7 +553,6 @@ static int sh_rtc_irq_set_freq(struct device *dev, int freq)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct rtc_class_ops sh_rtc_ops = {</div><div class='del'>-	.release	= sh_rtc_release,</div><div class='ctx'> 	.ioctl		= sh_rtc_ioctl,</div><div class='ctx'> 	.read_time	= sh_rtc_read_time,</div><div class='ctx'> 	.set_time	= sh_rtc_set_time,</div><div class='head'>diff --git a/drivers/rtc/rtc-starfire.c b/drivers/rtc/rtc-starfire.c<br/>new file mode 100644<br/>index 000000000000..7ccb0dd700af<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/rtc/rtc-starfire.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/rtc/rtc-starfire.c</a></div><div class='hunk'>@@ -0,0 +1,120 @@</div><div class='add'>+/* rtc-starfire.c: Starfire platform RTC driver.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2008 David S. Miller &lt;davem@davemloft.net&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/time.h&gt;</div><div class='add'>+#include &lt;linux/rtc.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/oplib.h&gt;</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("David S. Miller &lt;davem@davemloft.net&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Starfire RTC driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='add'>+struct starfire_rtc {</div><div class='add'>+	struct rtc_device	*rtc;</div><div class='add'>+	spinlock_t		lock;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u32 starfire_get_time(void)</div><div class='add'>+{</div><div class='add'>+	static char obp_gettod[32];</div><div class='add'>+	static u32 unix_tod;</div><div class='add'>+</div><div class='add'>+	sprintf(obp_gettod, "h# %08x unix-gettod",</div><div class='add'>+		(unsigned int) (long) &amp;unix_tod);</div><div class='add'>+	prom_feval(obp_gettod);</div><div class='add'>+</div><div class='add'>+	return unix_tod;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int starfire_read_time(struct device *dev, struct rtc_time *tm)</div><div class='add'>+{</div><div class='add'>+	struct starfire_rtc *p = dev_get_drvdata(dev);</div><div class='add'>+	unsigned long flags, secs;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;p-&gt;lock, flags);</div><div class='add'>+	secs = starfire_get_time();</div><div class='add'>+	spin_unlock_irqrestore(&amp;p-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	rtc_time_to_tm(secs, tm);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int starfire_set_time(struct device *dev, struct rtc_time *tm)</div><div class='add'>+{</div><div class='add'>+	unsigned long secs;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = rtc_tm_to_time(tm, &amp;secs);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* Do nothing, time is set using the service processor</div><div class='add'>+	 * console on this platform.</div><div class='add'>+	 */</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct rtc_class_ops starfire_rtc_ops = {</div><div class='add'>+	.read_time	= starfire_read_time,</div><div class='add'>+	.set_time	= starfire_set_time,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __devinit starfire_rtc_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct starfire_rtc *p = kzalloc(sizeof(*p), GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (!p)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;p-&gt;lock);</div><div class='add'>+</div><div class='add'>+	p-&gt;rtc = rtc_device_register("starfire", &amp;pdev-&gt;dev,</div><div class='add'>+				     &amp;starfire_rtc_ops, THIS_MODULE);</div><div class='add'>+	if (IS_ERR(p-&gt;rtc)) {</div><div class='add'>+		int err = PTR_ERR(p-&gt;rtc);</div><div class='add'>+		kfree(p);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+	platform_set_drvdata(pdev, p);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devexit starfire_rtc_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct starfire_rtc *p = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	rtc_device_unregister(p-&gt;rtc);</div><div class='add'>+	kfree(p);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct platform_driver starfire_rtc_driver = {</div><div class='add'>+	.driver		= {</div><div class='add'>+		.name	= "rtc-starfire",</div><div class='add'>+		.owner	= THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+	.probe		= starfire_rtc_probe,</div><div class='add'>+	.remove		= __devexit_p(starfire_rtc_remove),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init starfire_rtc_init(void)</div><div class='add'>+{</div><div class='add'>+	return platform_driver_register(&amp;starfire_rtc_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit starfire_rtc_exit(void)</div><div class='add'>+{</div><div class='add'>+	platform_driver_unregister(&amp;starfire_rtc_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(starfire_rtc_init);</div><div class='add'>+module_exit(starfire_rtc_exit);</div><div class='head'>diff --git a/drivers/rtc/rtc-stk17ta8.c b/drivers/rtc/rtc-stk17ta8.c<br/>index 31d3c8c28588..9a7e920315fa 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/rtc/rtc-stk17ta8.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/rtc/rtc-stk17ta8.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/rtc/rtc-stk17ta8.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/rtc/rtc-stk17ta8.c</a></div><div class='hunk'>@@ -215,17 +215,6 @@ static irqreturn_t stk17ta8_rtc_interrupt(int irq, void *dev_id)</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void stk17ta8_rtc_release(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	struct platform_device *pdev = to_platform_device(dev);</div><div class='del'>-	struct rtc_plat_data *pdata = platform_get_drvdata(pdev);</div><div class='del'>-</div><div class='del'>-	if (pdata-&gt;irq &gt;= 0) {</div><div class='del'>-		pdata-&gt;irqen = 0;</div><div class='del'>-		stk17ta8_rtc_update_alarm(pdata);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int stk17ta8_rtc_ioctl(struct device *dev, unsigned int cmd,</div><div class='ctx'> 			    unsigned long arg)</div><div class='ctx'> {</div><div class='hunk'>@@ -254,7 +243,6 @@ static const struct rtc_class_ops stk17ta8_rtc_ops = {</div><div class='ctx'> 	.set_time	= stk17ta8_rtc_set_time,</div><div class='ctx'> 	.read_alarm	= stk17ta8_rtc_read_alarm,</div><div class='ctx'> 	.set_alarm	= stk17ta8_rtc_set_alarm,</div><div class='del'>-	.release	= stk17ta8_rtc_release,</div><div class='ctx'> 	.ioctl		= stk17ta8_rtc_ioctl,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/rtc/rtc-sun4v.c b/drivers/rtc/rtc-sun4v.c<br/>new file mode 100644<br/>index 000000000000..2012ccbb4a53<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/rtc/rtc-sun4v.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/rtc/rtc-sun4v.c</a></div><div class='hunk'>@@ -0,0 +1,153 @@</div><div class='add'>+/* rtc-sun4c.c: Hypervisor based RTC for SUN4V systems.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2008 David S. Miller &lt;davem@davemloft.net&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/time.h&gt;</div><div class='add'>+#include &lt;linux/rtc.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/hypervisor.h&gt;</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("David S. Miller &lt;davem@davemloft.net&gt;");</div><div class='add'>+MODULE_DESCRIPTION("SUN4V RTC driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='add'>+struct sun4v_rtc {</div><div class='add'>+	struct rtc_device	*rtc;</div><div class='add'>+	spinlock_t		lock;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static unsigned long hypervisor_get_time(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long ret, time;</div><div class='add'>+	int retries = 10000;</div><div class='add'>+</div><div class='add'>+retry:</div><div class='add'>+	ret = sun4v_tod_get(&amp;time);</div><div class='add'>+	if (ret == HV_EOK)</div><div class='add'>+		return time;</div><div class='add'>+	if (ret == HV_EWOULDBLOCK) {</div><div class='add'>+		if (--retries &gt; 0) {</div><div class='add'>+			udelay(100);</div><div class='add'>+			goto retry;</div><div class='add'>+		}</div><div class='add'>+		printk(KERN_WARNING "SUN4V: tod_get() timed out.\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	printk(KERN_WARNING "SUN4V: tod_get() not supported.\n");</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sun4v_read_time(struct device *dev, struct rtc_time *tm)</div><div class='add'>+{</div><div class='add'>+	struct sun4v_rtc *p = dev_get_drvdata(dev);</div><div class='add'>+	unsigned long flags, secs;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;p-&gt;lock, flags);</div><div class='add'>+	secs = hypervisor_get_time();</div><div class='add'>+	spin_unlock_irqrestore(&amp;p-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	rtc_time_to_tm(secs, tm);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hypervisor_set_time(unsigned long secs)</div><div class='add'>+{</div><div class='add'>+	unsigned long ret;</div><div class='add'>+	int retries = 10000;</div><div class='add'>+</div><div class='add'>+retry:</div><div class='add'>+	ret = sun4v_tod_set(secs);</div><div class='add'>+	if (ret == HV_EOK)</div><div class='add'>+		return 0;</div><div class='add'>+	if (ret == HV_EWOULDBLOCK) {</div><div class='add'>+		if (--retries &gt; 0) {</div><div class='add'>+			udelay(100);</div><div class='add'>+			goto retry;</div><div class='add'>+		}</div><div class='add'>+		printk(KERN_WARNING "SUN4V: tod_set() timed out.\n");</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+	}</div><div class='add'>+	printk(KERN_WARNING "SUN4V: tod_set() not supported.\n");</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sun4v_set_time(struct device *dev, struct rtc_time *tm)</div><div class='add'>+{</div><div class='add'>+	struct sun4v_rtc *p = dev_get_drvdata(dev);</div><div class='add'>+	unsigned long flags, secs;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = rtc_tm_to_time(tm, &amp;secs);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;p-&gt;lock, flags);</div><div class='add'>+	err = hypervisor_set_time(secs);</div><div class='add'>+	spin_unlock_irqrestore(&amp;p-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct rtc_class_ops sun4v_rtc_ops = {</div><div class='add'>+	.read_time	= sun4v_read_time,</div><div class='add'>+	.set_time	= sun4v_set_time,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __devinit sun4v_rtc_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct sun4v_rtc *p = kzalloc(sizeof(*p), GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (!p)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;p-&gt;lock);</div><div class='add'>+</div><div class='add'>+	p-&gt;rtc = rtc_device_register("sun4v", &amp;pdev-&gt;dev,</div><div class='add'>+				     &amp;sun4v_rtc_ops, THIS_MODULE);</div><div class='add'>+	if (IS_ERR(p-&gt;rtc)) {</div><div class='add'>+		int err = PTR_ERR(p-&gt;rtc);</div><div class='add'>+		kfree(p);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+	platform_set_drvdata(pdev, p);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devexit sun4v_rtc_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct sun4v_rtc *p = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	rtc_device_unregister(p-&gt;rtc);</div><div class='add'>+	kfree(p);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct platform_driver sun4v_rtc_driver = {</div><div class='add'>+	.driver		= {</div><div class='add'>+		.name	= "rtc-sun4v",</div><div class='add'>+		.owner	= THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+	.probe		= sun4v_rtc_probe,</div><div class='add'>+	.remove		= __devexit_p(sun4v_rtc_remove),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init sun4v_rtc_init(void)</div><div class='add'>+{</div><div class='add'>+	return platform_driver_register(&amp;sun4v_rtc_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit sun4v_rtc_exit(void)</div><div class='add'>+{</div><div class='add'>+	platform_driver_unregister(&amp;sun4v_rtc_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(sun4v_rtc_init);</div><div class='add'>+module_exit(sun4v_rtc_exit);</div><div class='head'>diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c<br/>index acb78017e7d0..0a225ccda026 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/block/dasd.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/s390/block/dasd.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/block/dasd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/block/dasd.c</a></div><div class='hunk'>@@ -215,7 +215,7 @@ static int dasd_state_known_to_basic(struct dasd_device *device)</div><div class='ctx'> 			return rc;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* register 'device' debug area, used for all DBF_DEV_XXX calls */</div><div class='del'>-	device-&gt;debug_area = debug_register(device-&gt;cdev-&gt;dev.bus_id, 1, 1,</div><div class='add'>+	device-&gt;debug_area = debug_register(dev_name(&amp;device-&gt;cdev-&gt;dev), 1, 1,</div><div class='ctx'> 					    8 * sizeof(long));</div><div class='ctx'> 	debug_register_view(device-&gt;debug_area, &amp;debug_sprintf_view);</div><div class='ctx'> 	debug_set_level(device-&gt;debug_area, DBF_WARNING);</div><div class='hunk'>@@ -933,7 +933,7 @@ static void dasd_handle_killed_request(struct ccw_device *cdev,</div><div class='ctx'> 		MESSAGE(KERN_DEBUG,</div><div class='ctx'> 			"invalid status in handle_killed_request: "</div><div class='ctx'> 			"bus_id %s, status %02x",</div><div class='del'>-			cdev-&gt;dev.bus_id, cqr-&gt;status);</div><div class='add'>+			dev_name(&amp;cdev-&gt;dev), cqr-&gt;status);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -942,7 +942,7 @@ static void dasd_handle_killed_request(struct ccw_device *cdev,</div><div class='ctx'> 	    device != dasd_device_from_cdev_locked(cdev) ||</div><div class='ctx'> 	    strncmp(device-&gt;discipline-&gt;ebcname, (char *) &amp;cqr-&gt;magic, 4)) {</div><div class='ctx'> 		MESSAGE(KERN_DEBUG, "invalid device in request: bus_id %s",</div><div class='del'>-			cdev-&gt;dev.bus_id);</div><div class='add'>+			dev_name(&amp;cdev-&gt;dev));</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -982,11 +982,11 @@ void dasd_int_handler(struct ccw_device *cdev, unsigned long intparm,</div><div class='ctx'> 			break;</div><div class='ctx'> 		case -ETIMEDOUT:</div><div class='ctx'> 			printk(KERN_WARNING"%s(%s): request timed out\n",</div><div class='del'>-			       __func__, cdev-&gt;dev.bus_id);</div><div class='add'>+			       __func__, dev_name(&amp;cdev-&gt;dev));</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			printk(KERN_WARNING"%s(%s): unknown error %ld\n",</div><div class='del'>-			       __func__, cdev-&gt;dev.bus_id, PTR_ERR(irb));</div><div class='add'>+			       __func__, dev_name(&amp;cdev-&gt;dev), PTR_ERR(irb));</div><div class='ctx'> 		}</div><div class='ctx'> 		dasd_handle_killed_request(cdev, intparm);</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -995,7 +995,7 @@ void dasd_int_handler(struct ccw_device *cdev, unsigned long intparm,</div><div class='ctx'> 	now = get_clock();</div><div class='ctx'> </div><div class='ctx'> 	DBF_EVENT(DBF_ERR, "Interrupt: bus_id %s CS/DS %04x ip %08x",</div><div class='del'>-		  cdev-&gt;dev.bus_id, ((irb-&gt;scsw.cmd.cstat &lt;&lt; 8) |</div><div class='add'>+		  dev_name(&amp;cdev-&gt;dev), ((irb-&gt;scsw.cmd.cstat &lt;&lt; 8) |</div><div class='ctx'> 		  irb-&gt;scsw.cmd.dstat), (unsigned int) intparm);</div><div class='ctx'> </div><div class='ctx'> 	/* check for unsolicited interrupts */</div><div class='hunk'>@@ -1019,7 +1019,7 @@ void dasd_int_handler(struct ccw_device *cdev, unsigned long intparm,</div><div class='ctx'> 	if (!device ||</div><div class='ctx'> 	    strncmp(device-&gt;discipline-&gt;ebcname, (char *) &amp;cqr-&gt;magic, 4)) {</div><div class='ctx'> 		MESSAGE(KERN_DEBUG, "invalid device in request: bus_id %s",</div><div class='del'>-			cdev-&gt;dev.bus_id);</div><div class='add'>+			dev_name(&amp;cdev-&gt;dev));</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1037,7 +1037,7 @@ void dasd_int_handler(struct ccw_device *cdev, unsigned long intparm,</div><div class='ctx'> 	if (cqr-&gt;status != DASD_CQR_IN_IO) {</div><div class='ctx'> 		MESSAGE(KERN_DEBUG,</div><div class='ctx'> 			"invalid status: bus_id %s, status %02x",</div><div class='del'>-			cdev-&gt;dev.bus_id, cqr-&gt;status);</div><div class='add'>+			dev_name(&amp;cdev-&gt;dev), cqr-&gt;status);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	DBF_DEV_EVENT(DBF_DEBUG, device, "Int: CS/DS 0x%04x for cqr %p",</div><div class='hunk'>@@ -2134,14 +2134,14 @@ int dasd_generic_probe(struct ccw_device *cdev,</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		printk(KERN_WARNING</div><div class='ctx'> 		       "dasd_generic_probe: could not set ccw-device options "</div><div class='del'>-		       "for %s\n", cdev-&gt;dev.bus_id);</div><div class='add'>+		       "for %s\n", dev_name(&amp;cdev-&gt;dev));</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> 	ret = dasd_add_sysfs_files(cdev);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		printk(KERN_WARNING</div><div class='ctx'> 		       "dasd_generic_probe: could not add sysfs entries "</div><div class='del'>-		       "for %s\n", cdev-&gt;dev.bus_id);</div><div class='add'>+		       "for %s\n", dev_name(&amp;cdev-&gt;dev));</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> 	cdev-&gt;handler = &amp;dasd_int_handler;</div><div class='hunk'>@@ -2152,13 +2152,13 @@ int dasd_generic_probe(struct ccw_device *cdev,</div><div class='ctx'> 	 * initial probe.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if ((dasd_get_feature(cdev, DASD_FEATURE_INITIAL_ONLINE) &gt; 0 ) ||</div><div class='del'>-	    (dasd_autodetect &amp;&amp; dasd_busid_known(cdev-&gt;dev.bus_id) != 0))</div><div class='add'>+	    (dasd_autodetect &amp;&amp; dasd_busid_known(dev_name(&amp;cdev-&gt;dev)) != 0))</div><div class='ctx'> 		ret = ccw_device_set_online(cdev);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		printk(KERN_WARNING</div><div class='ctx'> 		       "dasd_generic_probe: could not initially "</div><div class='ctx'> 		       "online ccw-device %s; return code: %d\n",</div><div class='del'>-		       cdev-&gt;dev.bus_id, ret);</div><div class='add'>+		       dev_name(&amp;cdev-&gt;dev), ret);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2224,7 +2224,7 @@ int dasd_generic_set_online(struct ccw_device *cdev,</div><div class='ctx'> 		        printk (KERN_WARNING</div><div class='ctx'> 				"dasd_generic couldn't online device %s "</div><div class='ctx'> 				"- discipline DIAG not available\n",</div><div class='del'>-				cdev-&gt;dev.bus_id);</div><div class='add'>+				dev_name(&amp;cdev-&gt;dev));</div><div class='ctx'> 			dasd_delete_device(device);</div><div class='ctx'> 			return -ENODEV;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2248,7 +2248,7 @@ int dasd_generic_set_online(struct ccw_device *cdev,</div><div class='ctx'> 		printk (KERN_WARNING</div><div class='ctx'> 			"dasd_generic couldn't online device %s "</div><div class='ctx'> 			"with discipline %s rc=%i\n",</div><div class='del'>-			cdev-&gt;dev.bus_id, discipline-&gt;name, rc);</div><div class='add'>+			dev_name(&amp;cdev-&gt;dev), discipline-&gt;name, rc);</div><div class='ctx'> 		module_put(discipline-&gt;owner);</div><div class='ctx'> 		module_put(base_discipline-&gt;owner);</div><div class='ctx'> 		dasd_delete_device(device);</div><div class='hunk'>@@ -2259,7 +2259,7 @@ int dasd_generic_set_online(struct ccw_device *cdev,</div><div class='ctx'> 	if (device-&gt;state &lt;= DASD_STATE_KNOWN) {</div><div class='ctx'> 		printk (KERN_WARNING</div><div class='ctx'> 			"dasd_generic discipline not found for %s\n",</div><div class='del'>-			cdev-&gt;dev.bus_id);</div><div class='add'>+			dev_name(&amp;cdev-&gt;dev));</div><div class='ctx'> 		rc = -ENODEV;</div><div class='ctx'> 		dasd_set_target_state(device, DASD_STATE_NEW);</div><div class='ctx'> 		if (device-&gt;block)</div><div class='hunk'>@@ -2267,7 +2267,7 @@ int dasd_generic_set_online(struct ccw_device *cdev,</div><div class='ctx'> 		dasd_delete_device(device);</div><div class='ctx'> 	} else</div><div class='ctx'> 		pr_debug("dasd_generic device %s found\n",</div><div class='del'>-				cdev-&gt;dev.bus_id);</div><div class='add'>+				dev_name(&amp;cdev-&gt;dev));</div><div class='ctx'> </div><div class='ctx'> 	/* FIXME: we have to wait for the root device but we don't want</div><div class='ctx'> 	 * to wait for each single device but for all at once. */</div><div class='head'>diff --git a/drivers/s390/block/dasd_3990_erp.c b/drivers/s390/block/dasd_3990_erp.c<br/>index 5c6e6f331cb0..b8f9c00633f3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/block/dasd_3990_erp.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/s390/block/dasd_3990_erp.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/block/dasd_3990_erp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/block/dasd_3990_erp.c</a></div><div class='hunk'>@@ -1397,7 +1397,7 @@ static struct dasd_ccw_req *dasd_3990_erp_inspect_alias(</div><div class='ctx'> 			DEV_MESSAGE(KERN_ERR, cqr-&gt;startdev,</div><div class='ctx'> 				    "ERP on alias device for request %p,"</div><div class='ctx'> 				    " recover on base device %s", cqr,</div><div class='del'>-				    cqr-&gt;block-&gt;base-&gt;cdev-&gt;dev.bus_id);</div><div class='add'>+				    dev_name(&amp;cqr-&gt;block-&gt;base-&gt;cdev-&gt;dev));</div><div class='ctx'> 		}</div><div class='ctx'> 		dasd_eckd_reset_ccw_to_base_io(cqr);</div><div class='ctx'> 		erp-&gt;startdev = cqr-&gt;block-&gt;base;</div><div class='head'>diff --git a/drivers/s390/block/dasd_devmap.c b/drivers/s390/block/dasd_devmap.c<br/>index cd3335c1c307..921443b01d16 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/block/dasd_devmap.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/s390/block/dasd_devmap.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/block/dasd_devmap.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/block/dasd_devmap.c</a></div><div class='hunk'>@@ -515,9 +515,9 @@ dasd_devmap_from_cdev(struct ccw_device *cdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct dasd_devmap *devmap;</div><div class='ctx'> </div><div class='del'>-	devmap = dasd_find_busid(cdev-&gt;dev.bus_id);</div><div class='add'>+	devmap = dasd_find_busid(dev_name(&amp;cdev-&gt;dev));</div><div class='ctx'> 	if (IS_ERR(devmap))</div><div class='del'>-		devmap = dasd_add_busid(cdev-&gt;dev.bus_id,</div><div class='add'>+		devmap = dasd_add_busid(dev_name(&amp;cdev-&gt;dev),</div><div class='ctx'> 					DASD_FEATURE_DEFAULT);</div><div class='ctx'> 	return devmap;</div><div class='ctx'> }</div><div class='hunk'>@@ -584,7 +584,7 @@ dasd_delete_device(struct dasd_device *device)</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	/* First remove device pointer from devmap. */</div><div class='del'>-	devmap = dasd_find_busid(device-&gt;cdev-&gt;dev.bus_id);</div><div class='add'>+	devmap = dasd_find_busid(dev_name(&amp;device-&gt;cdev-&gt;dev));</div><div class='ctx'> 	BUG_ON(IS_ERR(devmap));</div><div class='ctx'> 	spin_lock(&amp;dasd_devmap_lock);</div><div class='ctx'> 	if (devmap-&gt;device != device) {</div><div class='hunk'>@@ -674,7 +674,7 @@ dasd_ro_show(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='ctx'> 	struct dasd_devmap *devmap;</div><div class='ctx'> 	int ro_flag;</div><div class='ctx'> </div><div class='del'>-	devmap = dasd_find_busid(dev-&gt;bus_id);</div><div class='add'>+	devmap = dasd_find_busid(dev_name(dev));</div><div class='ctx'> 	if (!IS_ERR(devmap))</div><div class='ctx'> 		ro_flag = (devmap-&gt;features &amp; DASD_FEATURE_READONLY) != 0;</div><div class='ctx'> 	else</div><div class='hunk'>@@ -723,7 +723,7 @@ dasd_erplog_show(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='ctx'> 	struct dasd_devmap *devmap;</div><div class='ctx'> 	int erplog;</div><div class='ctx'> </div><div class='del'>-	devmap = dasd_find_busid(dev-&gt;bus_id);</div><div class='add'>+	devmap = dasd_find_busid(dev_name(dev));</div><div class='ctx'> 	if (!IS_ERR(devmap))</div><div class='ctx'> 		erplog = (devmap-&gt;features &amp; DASD_FEATURE_ERPLOG) != 0;</div><div class='ctx'> 	else</div><div class='hunk'>@@ -770,7 +770,7 @@ dasd_use_diag_show(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='ctx'> 	struct dasd_devmap *devmap;</div><div class='ctx'> 	int use_diag;</div><div class='ctx'> </div><div class='del'>-	devmap = dasd_find_busid(dev-&gt;bus_id);</div><div class='add'>+	devmap = dasd_find_busid(dev_name(dev));</div><div class='ctx'> 	if (!IS_ERR(devmap))</div><div class='ctx'> 		use_diag = (devmap-&gt;features &amp; DASD_FEATURE_USEDIAG) != 0;</div><div class='ctx'> 	else</div><div class='hunk'>@@ -876,7 +876,7 @@ dasd_alias_show(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='ctx'> 	struct dasd_devmap *devmap;</div><div class='ctx'> 	int alias;</div><div class='ctx'> </div><div class='del'>-	devmap = dasd_find_busid(dev-&gt;bus_id);</div><div class='add'>+	devmap = dasd_find_busid(dev_name(dev));</div><div class='ctx'> 	spin_lock(&amp;dasd_devmap_lock);</div><div class='ctx'> 	if (IS_ERR(devmap) || strlen(devmap-&gt;uid.vendor) == 0) {</div><div class='ctx'> 		spin_unlock(&amp;dasd_devmap_lock);</div><div class='hunk'>@@ -899,7 +899,7 @@ dasd_vendor_show(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='ctx'> 	struct dasd_devmap *devmap;</div><div class='ctx'> 	char *vendor;</div><div class='ctx'> </div><div class='del'>-	devmap = dasd_find_busid(dev-&gt;bus_id);</div><div class='add'>+	devmap = dasd_find_busid(dev_name(dev));</div><div class='ctx'> 	spin_lock(&amp;dasd_devmap_lock);</div><div class='ctx'> 	if (!IS_ERR(devmap) &amp;&amp; strlen(devmap-&gt;uid.vendor) &gt; 0)</div><div class='ctx'> 		vendor = devmap-&gt;uid.vendor;</div><div class='hunk'>@@ -924,7 +924,7 @@ dasd_uid_show(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='ctx'> 	char ua_string[3];</div><div class='ctx'> 	struct dasd_uid *uid;</div><div class='ctx'> </div><div class='del'>-	devmap = dasd_find_busid(dev-&gt;bus_id);</div><div class='add'>+	devmap = dasd_find_busid(dev_name(dev));</div><div class='ctx'> 	spin_lock(&amp;dasd_devmap_lock);</div><div class='ctx'> 	if (IS_ERR(devmap) || strlen(devmap-&gt;uid.vendor) == 0) {</div><div class='ctx'> 		spin_unlock(&amp;dasd_devmap_lock);</div><div class='hunk'>@@ -972,7 +972,7 @@ dasd_eer_show(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='ctx'> 	struct dasd_devmap *devmap;</div><div class='ctx'> 	int eer_flag;</div><div class='ctx'> </div><div class='del'>-	devmap = dasd_find_busid(dev-&gt;bus_id);</div><div class='add'>+	devmap = dasd_find_busid(dev_name(dev));</div><div class='ctx'> 	if (!IS_ERR(devmap) &amp;&amp; devmap-&gt;device)</div><div class='ctx'> 		eer_flag = dasd_eer_enabled(devmap-&gt;device);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -1034,7 +1034,7 @@ dasd_get_uid(struct ccw_device *cdev, struct dasd_uid *uid)</div><div class='ctx'> {</div><div class='ctx'> 	struct dasd_devmap *devmap;</div><div class='ctx'> </div><div class='del'>-	devmap = dasd_find_busid(cdev-&gt;dev.bus_id);</div><div class='add'>+	devmap = dasd_find_busid(dev_name(&amp;cdev-&gt;dev));</div><div class='ctx'> 	if (IS_ERR(devmap))</div><div class='ctx'> 		return PTR_ERR(devmap);</div><div class='ctx'> 	spin_lock(&amp;dasd_devmap_lock);</div><div class='hunk'>@@ -1057,7 +1057,7 @@ dasd_set_uid(struct ccw_device *cdev, struct dasd_uid *uid)</div><div class='ctx'> {</div><div class='ctx'> 	struct dasd_devmap *devmap;</div><div class='ctx'> </div><div class='del'>-	devmap = dasd_find_busid(cdev-&gt;dev.bus_id);</div><div class='add'>+	devmap = dasd_find_busid(dev_name(&amp;cdev-&gt;dev));</div><div class='ctx'> 	if (IS_ERR(devmap))</div><div class='ctx'> 		return PTR_ERR(devmap);</div><div class='ctx'> </div><div class='hunk'>@@ -1077,7 +1077,7 @@ dasd_get_feature(struct ccw_device *cdev, int feature)</div><div class='ctx'> {</div><div class='ctx'> 	struct dasd_devmap *devmap;</div><div class='ctx'> </div><div class='del'>-	devmap = dasd_find_busid(cdev-&gt;dev.bus_id);</div><div class='add'>+	devmap = dasd_find_busid(dev_name(&amp;cdev-&gt;dev));</div><div class='ctx'> 	if (IS_ERR(devmap))</div><div class='ctx'> 		return PTR_ERR(devmap);</div><div class='ctx'> </div><div class='hunk'>@@ -1093,7 +1093,7 @@ dasd_set_feature(struct ccw_device *cdev, int feature, int flag)</div><div class='ctx'> {</div><div class='ctx'> 	struct dasd_devmap *devmap;</div><div class='ctx'> </div><div class='del'>-	devmap = dasd_find_busid(cdev-&gt;dev.bus_id);</div><div class='add'>+	devmap = dasd_find_busid(dev_name(&amp;cdev-&gt;dev));</div><div class='ctx'> 	if (IS_ERR(devmap))</div><div class='ctx'> 		return PTR_ERR(devmap);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/s390/block/dasd_diag.c b/drivers/s390/block/dasd_diag.c<br/>index 85fcb4371054..7844461a995b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/block/dasd_diag.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/s390/block/dasd_diag.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/block/dasd_diag.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/block/dasd_diag.c</a></div><div class='hunk'>@@ -544,7 +544,7 @@ static struct dasd_ccw_req *dasd_diag_build_cp(struct dasd_device *memdev,</div><div class='ctx'> 	}</div><div class='ctx'> 	cqr-&gt;retries = DIAG_MAX_RETRIES;</div><div class='ctx'> 	cqr-&gt;buildclk = get_clock();</div><div class='del'>-	if (req-&gt;cmd_flags &amp; REQ_FAILFAST)</div><div class='add'>+	if (blk_noretry_request(req))</div><div class='ctx'> 		set_bit(DASD_CQR_FLAGS_FAILFAST, &amp;cqr-&gt;flags);</div><div class='ctx'> 	cqr-&gt;startdev = memdev;</div><div class='ctx'> 	cqr-&gt;memdev = memdev;</div><div class='head'>diff --git a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.c<br/>index 773b3fe275b2..2e60d5f968c8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/block/dasd_eckd.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/s390/block/dasd_eckd.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/block/dasd_eckd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/block/dasd_eckd.c</a></div><div class='hunk'>@@ -6,6 +6,8 @@</div><div class='ctx'>  *		    Martin Schwidefsky &lt;schwidefsky@de.ibm.com&gt;</div><div class='ctx'>  * Bugreports.to..: &lt;Linux390@de.ibm.com&gt;</div><div class='ctx'>  * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999,2000</div><div class='add'>+ * EMC Symmetrix ioctl Copyright EMC Corporation, 2008</div><div class='add'>+ * Author.........: Nigel Hislop &lt;hislop_nigel@emc.com&gt;</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -84,7 +86,7 @@ dasd_eckd_probe (struct ccw_device *cdev)</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		printk(KERN_WARNING</div><div class='ctx'> 		       "dasd_eckd_probe: could not set ccw-device options "</div><div class='del'>-		       "for %s\n", cdev-&gt;dev.bus_id);</div><div class='add'>+		       "for %s\n", dev_name(&amp;cdev-&gt;dev));</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> 	ret = dasd_generic_probe(cdev, &amp;dasd_eckd_discipline);</div><div class='hunk'>@@ -1501,12 +1503,27 @@ static void dasd_eckd_handle_unsolicited_interrupt(struct dasd_device *device,</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* just report other unsolicited interrupts */</div><div class='del'>-	DEV_MESSAGE(KERN_DEBUG, device, "%s",</div><div class='del'>-		    "unsolicited interrupt received");</div><div class='del'>-	device-&gt;discipline-&gt;dump_sense(device, NULL, irb);</div><div class='del'>-	dasd_schedule_device_bh(device);</div><div class='add'>+	if ((irb-&gt;scsw.cmd.cc == 1) &amp;&amp;</div><div class='add'>+	    (irb-&gt;scsw.cmd.fctl &amp; SCSW_FCTL_START_FUNC) &amp;&amp;</div><div class='add'>+	    (irb-&gt;scsw.cmd.actl &amp; SCSW_ACTL_START_PEND) &amp;&amp;</div><div class='add'>+	    (irb-&gt;scsw.cmd.stctl &amp; SCSW_STCTL_STATUS_PEND)) {</div><div class='add'>+		/* fake irb do nothing, they are handled elsewhere */</div><div class='add'>+		dasd_schedule_device_bh(device);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!(irb-&gt;esw.esw0.erw.cons)) {</div><div class='add'>+		/* just report other unsolicited interrupts */</div><div class='add'>+		DEV_MESSAGE(KERN_ERR, device, "%s",</div><div class='add'>+			    "unsolicited interrupt received");</div><div class='add'>+	} else {</div><div class='add'>+		DEV_MESSAGE(KERN_ERR, device, "%s",</div><div class='add'>+			    "unsolicited interrupt received "</div><div class='add'>+			    "(sense available)");</div><div class='add'>+		device-&gt;discipline-&gt;dump_sense(device, NULL, irb);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	dasd_schedule_device_bh(device);</div><div class='ctx'> 	return;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1683,7 +1700,7 @@ static struct dasd_ccw_req *dasd_eckd_build_cp(struct dasd_device *startdev,</div><div class='ctx'> 			recid++;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	if (req-&gt;cmd_flags &amp; REQ_FAILFAST)</div><div class='add'>+	if (blk_noretry_request(req))</div><div class='ctx'> 		set_bit(DASD_CQR_FLAGS_FAILFAST, &amp;cqr-&gt;flags);</div><div class='ctx'> 	cqr-&gt;startdev = startdev;</div><div class='ctx'> 	cqr-&gt;memdev = startdev;</div><div class='hunk'>@@ -2068,6 +2085,103 @@ dasd_eckd_set_attrib(struct dasd_device *device, void __user *argp)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Issue syscall I/O to EMC Symmetrix array.</div><div class='add'>+ * CCWs are PSF and RSSD</div><div class='add'>+ */</div><div class='add'>+static int dasd_symm_io(struct dasd_device *device, void __user *argp)</div><div class='add'>+{</div><div class='add'>+	struct dasd_symmio_parms usrparm;</div><div class='add'>+	char *psf_data, *rssd_result;</div><div class='add'>+	struct dasd_ccw_req *cqr;</div><div class='add'>+	struct ccw1 *ccw;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	/* Copy parms from caller */</div><div class='add'>+	rc = -EFAULT;</div><div class='add'>+	if (copy_from_user(&amp;usrparm, argp, sizeof(usrparm)))</div><div class='add'>+		goto out;</div><div class='add'>+#ifndef CONFIG_64BIT</div><div class='add'>+	/* Make sure pointers are sane even on 31 bit. */</div><div class='add'>+	if ((usrparm.psf_data &gt;&gt; 32) != 0 || (usrparm.rssd_result &gt;&gt; 32) != 0) {</div><div class='add'>+		rc = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	/* alloc I/O data area */</div><div class='add'>+	psf_data = kzalloc(usrparm.psf_data_len, GFP_KERNEL | GFP_DMA);</div><div class='add'>+	rssd_result = kzalloc(usrparm.rssd_result_len, GFP_KERNEL | GFP_DMA);</div><div class='add'>+	if (!psf_data || !rssd_result) {</div><div class='add'>+		rc = -ENOMEM;</div><div class='add'>+		goto out_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* get syscall header from user space */</div><div class='add'>+	rc = -EFAULT;</div><div class='add'>+	if (copy_from_user(psf_data,</div><div class='add'>+			   (void __user *)(unsigned long) usrparm.psf_data,</div><div class='add'>+			   usrparm.psf_data_len))</div><div class='add'>+		goto out_free;</div><div class='add'>+</div><div class='add'>+	/* sanity check on syscall header */</div><div class='add'>+	if (psf_data[0] != 0x17 &amp;&amp; psf_data[1] != 0xce) {</div><div class='add'>+		rc = -EINVAL;</div><div class='add'>+		goto out_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* setup CCWs for PSF + RSSD */</div><div class='add'>+	cqr = dasd_smalloc_request("ECKD", 2 , 0, device);</div><div class='add'>+	if (IS_ERR(cqr)) {</div><div class='add'>+		DEV_MESSAGE(KERN_WARNING, device, "%s",</div><div class='add'>+			"Could not allocate initialization request");</div><div class='add'>+		rc = PTR_ERR(cqr);</div><div class='add'>+		goto out_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cqr-&gt;startdev = device;</div><div class='add'>+	cqr-&gt;memdev = device;</div><div class='add'>+	cqr-&gt;retries = 3;</div><div class='add'>+	cqr-&gt;expires = 10 * HZ;</div><div class='add'>+	cqr-&gt;buildclk = get_clock();</div><div class='add'>+	cqr-&gt;status = DASD_CQR_FILLED;</div><div class='add'>+</div><div class='add'>+	/* Build the ccws */</div><div class='add'>+	ccw = cqr-&gt;cpaddr;</div><div class='add'>+</div><div class='add'>+	/* PSF ccw */</div><div class='add'>+	ccw-&gt;cmd_code = DASD_ECKD_CCW_PSF;</div><div class='add'>+	ccw-&gt;count = usrparm.psf_data_len;</div><div class='add'>+	ccw-&gt;flags |= CCW_FLAG_CC;</div><div class='add'>+	ccw-&gt;cda = (__u32)(addr_t) psf_data;</div><div class='add'>+</div><div class='add'>+	ccw++;</div><div class='add'>+</div><div class='add'>+	/* RSSD ccw  */</div><div class='add'>+	ccw-&gt;cmd_code = DASD_ECKD_CCW_RSSD;</div><div class='add'>+	ccw-&gt;count = usrparm.rssd_result_len;</div><div class='add'>+	ccw-&gt;flags = CCW_FLAG_SLI ;</div><div class='add'>+	ccw-&gt;cda = (__u32)(addr_t) rssd_result;</div><div class='add'>+</div><div class='add'>+	rc = dasd_sleep_on(cqr);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto out_sfree;</div><div class='add'>+</div><div class='add'>+	rc = -EFAULT;</div><div class='add'>+	if (copy_to_user((void __user *)(unsigned long) usrparm.rssd_result,</div><div class='add'>+			   rssd_result, usrparm.rssd_result_len))</div><div class='add'>+		goto out_sfree;</div><div class='add'>+	rc = 0;</div><div class='add'>+</div><div class='add'>+out_sfree:</div><div class='add'>+	dasd_sfree_request(cqr, cqr-&gt;memdev);</div><div class='add'>+out_free:</div><div class='add'>+	kfree(rssd_result);</div><div class='add'>+	kfree(psf_data);</div><div class='add'>+out:</div><div class='add'>+	DBF_DEV_EVENT(DBF_WARNING, device, "Symmetrix ioctl: rc=%d", rc);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int</div><div class='ctx'> dasd_eckd_ioctl(struct dasd_block *block, unsigned int cmd, void __user *argp)</div><div class='ctx'> {</div><div class='hunk'>@@ -2086,6 +2200,8 @@ dasd_eckd_ioctl(struct dasd_block *block, unsigned int cmd, void __user *argp)</div><div class='ctx'> 		return dasd_eckd_reserve(device);</div><div class='ctx'> 	case BIODASDSLCK:</div><div class='ctx'> 		return dasd_eckd_steal_lock(device);</div><div class='add'>+	case BIODASDSYMMIO:</div><div class='add'>+		return dasd_symm_io(device, argp);</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -ENOIOCTLCMD;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2145,13 +2261,13 @@ static void dasd_eckd_dump_sense(struct dasd_device *device,</div><div class='ctx'> 	/* dump the sense data */</div><div class='ctx'> 	len = sprintf(page,  KERN_ERR PRINTK_HEADER</div><div class='ctx'> 		      " I/O status report for device %s:\n",</div><div class='del'>-		      device-&gt;cdev-&gt;dev.bus_id);</div><div class='add'>+		      dev_name(&amp;device-&gt;cdev-&gt;dev));</div><div class='ctx'> 	len += sprintf(page + len, KERN_ERR PRINTK_HEADER</div><div class='ctx'> 		       " in req: %p CS: 0x%02X DS: 0x%02X\n", req,</div><div class='ctx'> 		       irb-&gt;scsw.cmd.cstat, irb-&gt;scsw.cmd.dstat);</div><div class='ctx'> 	len += sprintf(page + len, KERN_ERR PRINTK_HEADER</div><div class='ctx'> 		       " device %s: Failing CCW: %p\n",</div><div class='del'>-		       device-&gt;cdev-&gt;dev.bus_id,</div><div class='add'>+		       dev_name(&amp;device-&gt;cdev-&gt;dev),</div><div class='ctx'> 		       (void *) (addr_t) irb-&gt;scsw.cmd.cpa);</div><div class='ctx'> 	if (irb-&gt;esw.esw0.erw.cons) {</div><div class='ctx'> 		for (sl = 0; sl &lt; 4; sl++) {</div><div class='head'>diff --git a/drivers/s390/block/dasd_eer.c b/drivers/s390/block/dasd_eer.c<br/>index bf512ac75b9e..892e2878d61b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/block/dasd_eer.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/s390/block/dasd_eer.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/block/dasd_eer.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/block/dasd_eer.c</a></div><div class='hunk'>@@ -309,7 +309,8 @@ static void dasd_eer_write_standard_trigger(struct dasd_device *device,</div><div class='ctx'> 	do_gettimeofday(&amp;tv);</div><div class='ctx'> 	header.tv_sec = tv.tv_sec;</div><div class='ctx'> 	header.tv_usec = tv.tv_usec;</div><div class='del'>-	strncpy(header.busid, device-&gt;cdev-&gt;dev.bus_id, DASD_EER_BUSID_SIZE);</div><div class='add'>+	strncpy(header.busid, dev_name(&amp;device-&gt;cdev-&gt;dev),</div><div class='add'>+		DASD_EER_BUSID_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;bufferlock, flags);</div><div class='ctx'> 	list_for_each_entry(eerb, &amp;bufferlist, list) {</div><div class='hunk'>@@ -349,7 +350,8 @@ static void dasd_eer_write_snss_trigger(struct dasd_device *device,</div><div class='ctx'> 	do_gettimeofday(&amp;tv);</div><div class='ctx'> 	header.tv_sec = tv.tv_sec;</div><div class='ctx'> 	header.tv_usec = tv.tv_usec;</div><div class='del'>-	strncpy(header.busid, device-&gt;cdev-&gt;dev.bus_id, DASD_EER_BUSID_SIZE);</div><div class='add'>+	strncpy(header.busid, dev_name(&amp;device-&gt;cdev-&gt;dev),</div><div class='add'>+		DASD_EER_BUSID_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;bufferlock, flags);</div><div class='ctx'> 	list_for_each_entry(eerb, &amp;bufferlist, list) {</div><div class='head'>diff --git a/drivers/s390/block/dasd_fba.c b/drivers/s390/block/dasd_fba.c<br/>index aa0c533423a5..7d442aeff3d1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/block/dasd_fba.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/s390/block/dasd_fba.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/block/dasd_fba.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/block/dasd_fba.c</a></div><div class='hunk'>@@ -355,7 +355,7 @@ static struct dasd_ccw_req *dasd_fba_build_cp(struct dasd_device * memdev,</div><div class='ctx'> 			recid++;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	if (req-&gt;cmd_flags &amp; REQ_FAILFAST)</div><div class='add'>+	if (blk_noretry_request(req))</div><div class='ctx'> 		set_bit(DASD_CQR_FLAGS_FAILFAST, &amp;cqr-&gt;flags);</div><div class='ctx'> 	cqr-&gt;startdev = memdev;</div><div class='ctx'> 	cqr-&gt;memdev = memdev;</div><div class='hunk'>@@ -451,13 +451,13 @@ dasd_fba_dump_sense(struct dasd_device *device, struct dasd_ccw_req * req,</div><div class='ctx'> 	}</div><div class='ctx'> 	len = sprintf(page, KERN_ERR PRINTK_HEADER</div><div class='ctx'> 		      " I/O status report for device %s:\n",</div><div class='del'>-		      device-&gt;cdev-&gt;dev.bus_id);</div><div class='add'>+		      dev_name(&amp;device-&gt;cdev-&gt;dev));</div><div class='ctx'> 	len += sprintf(page + len, KERN_ERR PRINTK_HEADER</div><div class='ctx'> 		       " in req: %p CS: 0x%02X DS: 0x%02X\n", req,</div><div class='ctx'> 		       irb-&gt;scsw.cmd.cstat, irb-&gt;scsw.cmd.dstat);</div><div class='ctx'> 	len += sprintf(page + len, KERN_ERR PRINTK_HEADER</div><div class='ctx'> 		       " device %s: Failing CCW: %p\n",</div><div class='del'>-		       device-&gt;cdev-&gt;dev.bus_id,</div><div class='add'>+		       dev_name(&amp;device-&gt;cdev-&gt;dev),</div><div class='ctx'> 		       (void *) (addr_t) irb-&gt;scsw.cmd.cpa);</div><div class='ctx'> 	if (irb-&gt;esw.esw0.erw.cons) {</div><div class='ctx'> 		for (sl = 0; sl &lt; 4; sl++) {</div><div class='head'>diff --git a/drivers/s390/block/dasd_int.h b/drivers/s390/block/dasd_int.h<br/>index 31ecaa4a40e4..489d5fe488fb 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/block/dasd_int.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/s390/block/dasd_int.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/block/dasd_int.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/block/dasd_int.h</a></div><div class='hunk'>@@ -126,7 +126,7 @@ do { \</div><div class='ctx'> #define DEV_MESSAGE(d_loglevel,d_device,d_string,d_args...)\</div><div class='ctx'> do { \</div><div class='ctx'> 	printk(d_loglevel PRINTK_HEADER " %s: " d_string "\n", \</div><div class='del'>-	       d_device-&gt;cdev-&gt;dev.bus_id, d_args); \</div><div class='add'>+	       dev_name(&amp;d_device-&gt;cdev-&gt;dev), d_args); \</div><div class='ctx'> 	DBF_DEV_EVENT(DBF_ALERT, d_device, d_string, d_args); \</div><div class='ctx'> } while(0)</div><div class='ctx'> </div><div class='hunk'>@@ -140,7 +140,7 @@ do { \</div><div class='ctx'> #define DEV_MESSAGE_LOG(d_loglevel,d_device,d_string,d_args...)\</div><div class='ctx'> do { \</div><div class='ctx'> 	printk(d_loglevel PRINTK_HEADER " %s: " d_string "\n", \</div><div class='del'>-	       d_device-&gt;cdev-&gt;dev.bus_id, d_args); \</div><div class='add'>+	       dev_name(&amp;d_device-&gt;cdev-&gt;dev), d_args); \</div><div class='ctx'> } while(0)</div><div class='ctx'> </div><div class='ctx'> #define MESSAGE_LOG(d_loglevel,d_string,d_args...)\</div><div class='head'>diff --git a/drivers/s390/block/dasd_proc.c b/drivers/s390/block/dasd_proc.c<br/>index 03c0e40a92ff..9088de84b45d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/block/dasd_proc.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/s390/block/dasd_proc.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/block/dasd_proc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/block/dasd_proc.c</a></div><div class='hunk'>@@ -67,7 +67,7 @@ dasd_devices_show(struct seq_file *m, void *v)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Print device number. */</div><div class='del'>-	seq_printf(m, "%s", device-&gt;cdev-&gt;dev.bus_id);</div><div class='add'>+	seq_printf(m, "%s", dev_name(&amp;device-&gt;cdev-&gt;dev));</div><div class='ctx'> 	/* Print discipline string. */</div><div class='ctx'> 	if (device != NULL &amp;&amp; device-&gt;discipline != NULL)</div><div class='ctx'> 		seq_printf(m, "(%s)", device-&gt;discipline-&gt;name);</div><div class='hunk'>@@ -76,7 +76,8 @@ dasd_devices_show(struct seq_file *m, void *v)</div><div class='ctx'> 	/* Print kdev. */</div><div class='ctx'> 	if (block-&gt;gdp)</div><div class='ctx'> 		seq_printf(m, " at (%3d:%6d)",</div><div class='del'>-			   block-&gt;gdp-&gt;major, block-&gt;gdp-&gt;first_minor);</div><div class='add'>+			   MAJOR(disk_devt(block-&gt;gdp)),</div><div class='add'>+			   MINOR(disk_devt(block-&gt;gdp)));</div><div class='ctx'> 	else</div><div class='ctx'> 		seq_printf(m, "  at (???:??????)");</div><div class='ctx'> 	/* Print device name. */</div><div class='head'>diff --git a/drivers/s390/block/dcssblk.c b/drivers/s390/block/dcssblk.c<br/>index 711b3004b3e6..a7ff167d5b81 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/block/dcssblk.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/s390/block/dcssblk.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/block/dcssblk.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/block/dcssblk.c</a></div><div class='hunk'>@@ -31,7 +31,6 @@</div><div class='ctx'> #define PRINT_WARN(x...)  printk(KERN_WARNING DCSSBLK_NAME " warning: " x)</div><div class='ctx'> #define PRINT_ERR(x...)	  printk(KERN_ERR DCSSBLK_NAME " error: " x)</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> static int dcssblk_open(struct inode *inode, struct file *filp);</div><div class='ctx'> static int dcssblk_release(struct inode *inode, struct file *filp);</div><div class='ctx'> static int dcssblk_make_request(struct request_queue *q, struct bio *bio);</div><div class='hunk'>@@ -48,6 +47,30 @@ static struct block_device_operations dcssblk_devops = {</div><div class='ctx'> 	.direct_access 	= dcssblk_direct_access,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct dcssblk_dev_info {</div><div class='add'>+	struct list_head lh;</div><div class='add'>+	struct device dev;</div><div class='add'>+	char segment_name[BUS_ID_SIZE];</div><div class='add'>+	atomic_t use_count;</div><div class='add'>+	struct gendisk *gd;</div><div class='add'>+	unsigned long start;</div><div class='add'>+	unsigned long end;</div><div class='add'>+	int segment_type;</div><div class='add'>+	unsigned char save_pending;</div><div class='add'>+	unsigned char is_shared;</div><div class='add'>+	struct request_queue *dcssblk_queue;</div><div class='add'>+	int num_of_segments;</div><div class='add'>+	struct list_head seg_list;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct segment_info {</div><div class='add'>+	struct list_head lh;</div><div class='add'>+	char segment_name[BUS_ID_SIZE];</div><div class='add'>+	unsigned long start;</div><div class='add'>+	unsigned long end;</div><div class='add'>+	int segment_type;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static ssize_t dcssblk_add_store(struct device * dev, struct device_attribute *attr, const char * buf,</div><div class='ctx'> 				  size_t count);</div><div class='ctx'> static ssize_t dcssblk_remove_store(struct device * dev, struct device_attribute *attr, const char * buf,</div><div class='hunk'>@@ -58,30 +81,20 @@ static ssize_t dcssblk_save_show(struct device *dev, struct device_attribute *at</div><div class='ctx'> static ssize_t dcssblk_shared_store(struct device * dev, struct device_attribute *attr, const char * buf,</div><div class='ctx'> 				  size_t count);</div><div class='ctx'> static ssize_t dcssblk_shared_show(struct device *dev, struct device_attribute *attr, char *buf);</div><div class='add'>+static ssize_t dcssblk_seglist_show(struct device *dev,</div><div class='add'>+				struct device_attribute *attr,</div><div class='add'>+				char *buf);</div><div class='ctx'> </div><div class='ctx'> static DEVICE_ATTR(add, S_IWUSR, NULL, dcssblk_add_store);</div><div class='ctx'> static DEVICE_ATTR(remove, S_IWUSR, NULL, dcssblk_remove_store);</div><div class='del'>-static DEVICE_ATTR(save, S_IWUSR | S_IRUGO, dcssblk_save_show,</div><div class='add'>+static DEVICE_ATTR(save, S_IWUSR | S_IRUSR, dcssblk_save_show,</div><div class='ctx'> 		   dcssblk_save_store);</div><div class='del'>-static DEVICE_ATTR(shared, S_IWUSR | S_IRUGO, dcssblk_shared_show,</div><div class='add'>+static DEVICE_ATTR(shared, S_IWUSR | S_IRUSR, dcssblk_shared_show,</div><div class='ctx'> 		   dcssblk_shared_store);</div><div class='add'>+static DEVICE_ATTR(seglist, S_IRUSR, dcssblk_seglist_show, NULL);</div><div class='ctx'> </div><div class='ctx'> static struct device *dcssblk_root_dev;</div><div class='ctx'> </div><div class='del'>-struct dcssblk_dev_info {</div><div class='del'>-	struct list_head lh;</div><div class='del'>-	struct device dev;</div><div class='del'>-	char segment_name[BUS_ID_SIZE];</div><div class='del'>-	atomic_t use_count;</div><div class='del'>-	struct gendisk *gd;</div><div class='del'>-	unsigned long start;</div><div class='del'>-	unsigned long end;</div><div class='del'>-	int segment_type;</div><div class='del'>-	unsigned char save_pending;</div><div class='del'>-	unsigned char is_shared;</div><div class='del'>-	struct request_queue *dcssblk_queue;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static LIST_HEAD(dcssblk_devices);</div><div class='ctx'> static struct rw_semaphore dcssblk_devices_sem;</div><div class='ctx'> </div><div class='hunk'>@@ -91,8 +104,15 @@ static struct rw_semaphore dcssblk_devices_sem;</div><div class='ctx'> static void</div><div class='ctx'> dcssblk_release_segment(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	PRINT_DEBUG("segment release fn called for %s\n", dev-&gt;bus_id);</div><div class='del'>-	kfree(container_of(dev, struct dcssblk_dev_info, dev));</div><div class='add'>+	struct dcssblk_dev_info *dev_info;</div><div class='add'>+	struct segment_info *entry, *temp;</div><div class='add'>+</div><div class='add'>+	dev_info = container_of(dev, struct dcssblk_dev_info, dev);</div><div class='add'>+	list_for_each_entry_safe(entry, temp, &amp;dev_info-&gt;seg_list, lh) {</div><div class='add'>+		list_del(&amp;entry-&gt;lh);</div><div class='add'>+		kfree(entry);</div><div class='add'>+	}</div><div class='add'>+	kfree(dev_info);</div><div class='ctx'> 	module_put(THIS_MODULE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -114,7 +134,7 @@ dcssblk_assign_free_minor(struct dcssblk_dev_info *dev_info)</div><div class='ctx'> 		found = 0;</div><div class='ctx'> 		// test if minor available</div><div class='ctx'> 		list_for_each_entry(entry, &amp;dcssblk_devices, lh)</div><div class='del'>-			if (minor == entry-&gt;gd-&gt;first_minor)</div><div class='add'>+			if (minor == MINOR(disk_devt(entry-&gt;gd)))</div><div class='ctx'> 				found++;</div><div class='ctx'> 		if (!found) break; // got unused minor</div><div class='ctx'> 	}</div><div class='hunk'>@@ -142,6 +162,169 @@ dcssblk_get_device_by_name(char *name)</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * get the struct segment_info from seg_list</div><div class='add'>+ * for the given name.</div><div class='add'>+ * down_read(&amp;dcssblk_devices_sem) must be held.</div><div class='add'>+ */</div><div class='add'>+static struct segment_info *</div><div class='add'>+dcssblk_get_segment_by_name(char *name)</div><div class='add'>+{</div><div class='add'>+	struct dcssblk_dev_info *dev_info;</div><div class='add'>+	struct segment_info *entry;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(dev_info, &amp;dcssblk_devices, lh) {</div><div class='add'>+		list_for_each_entry(entry, &amp;dev_info-&gt;seg_list, lh) {</div><div class='add'>+			if (!strcmp(name, entry-&gt;segment_name))</div><div class='add'>+				return entry;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * get the highest address of the multi-segment block.</div><div class='add'>+ */</div><div class='add'>+static unsigned long</div><div class='add'>+dcssblk_find_highest_addr(struct dcssblk_dev_info *dev_info)</div><div class='add'>+{</div><div class='add'>+	unsigned long highest_addr;</div><div class='add'>+	struct segment_info *entry;</div><div class='add'>+</div><div class='add'>+	highest_addr = 0;</div><div class='add'>+	list_for_each_entry(entry, &amp;dev_info-&gt;seg_list, lh) {</div><div class='add'>+		if (highest_addr &lt; entry-&gt;end)</div><div class='add'>+			highest_addr = entry-&gt;end;</div><div class='add'>+	}</div><div class='add'>+	return highest_addr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * get the lowest address of the multi-segment block.</div><div class='add'>+ */</div><div class='add'>+static unsigned long</div><div class='add'>+dcssblk_find_lowest_addr(struct dcssblk_dev_info *dev_info)</div><div class='add'>+{</div><div class='add'>+	int set_first;</div><div class='add'>+	unsigned long lowest_addr;</div><div class='add'>+	struct segment_info *entry;</div><div class='add'>+</div><div class='add'>+	set_first = 0;</div><div class='add'>+	lowest_addr = 0;</div><div class='add'>+	list_for_each_entry(entry, &amp;dev_info-&gt;seg_list, lh) {</div><div class='add'>+		if (set_first == 0) {</div><div class='add'>+			lowest_addr = entry-&gt;start;</div><div class='add'>+			set_first = 1;</div><div class='add'>+		} else {</div><div class='add'>+			if (lowest_addr &gt; entry-&gt;start)</div><div class='add'>+				lowest_addr = entry-&gt;start;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return lowest_addr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Check continuity of segments.</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+dcssblk_is_continuous(struct dcssblk_dev_info *dev_info)</div><div class='add'>+{</div><div class='add'>+	int i, j, rc;</div><div class='add'>+	struct segment_info *sort_list, *entry, temp;</div><div class='add'>+</div><div class='add'>+	if (dev_info-&gt;num_of_segments &lt;= 1)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	sort_list = kzalloc(</div><div class='add'>+			sizeof(struct segment_info) * dev_info-&gt;num_of_segments,</div><div class='add'>+			GFP_KERNEL);</div><div class='add'>+	if (sort_list == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	i = 0;</div><div class='add'>+	list_for_each_entry(entry, &amp;dev_info-&gt;seg_list, lh) {</div><div class='add'>+		memcpy(&amp;sort_list[i], entry, sizeof(struct segment_info));</div><div class='add'>+		i++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* sort segments */</div><div class='add'>+	for (i = 0; i &lt; dev_info-&gt;num_of_segments; i++)</div><div class='add'>+		for (j = 0; j &lt; dev_info-&gt;num_of_segments; j++)</div><div class='add'>+			if (sort_list[j].start &gt; sort_list[i].start) {</div><div class='add'>+				memcpy(&amp;temp, &amp;sort_list[i],</div><div class='add'>+					sizeof(struct segment_info));</div><div class='add'>+				memcpy(&amp;sort_list[i], &amp;sort_list[j],</div><div class='add'>+					sizeof(struct segment_info));</div><div class='add'>+				memcpy(&amp;sort_list[j], &amp;temp,</div><div class='add'>+					sizeof(struct segment_info));</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+	/* check continuity */</div><div class='add'>+	for (i = 0; i &lt; dev_info-&gt;num_of_segments - 1; i++) {</div><div class='add'>+		if ((sort_list[i].end + 1) != sort_list[i+1].start) {</div><div class='add'>+			PRINT_ERR("Segment %s is not contiguous with "</div><div class='add'>+				"segment %s\n",</div><div class='add'>+				sort_list[i].segment_name,</div><div class='add'>+				sort_list[i+1].segment_name);</div><div class='add'>+			rc = -EINVAL;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		/* EN and EW are allowed in a block device */</div><div class='add'>+		if (sort_list[i].segment_type != sort_list[i+1].segment_type) {</div><div class='add'>+			if (!(sort_list[i].segment_type &amp; SEGMENT_EXCLUSIVE) ||</div><div class='add'>+				(sort_list[i].segment_type == SEG_TYPE_ER) ||</div><div class='add'>+				!(sort_list[i+1].segment_type &amp;</div><div class='add'>+				SEGMENT_EXCLUSIVE) ||</div><div class='add'>+				(sort_list[i+1].segment_type == SEG_TYPE_ER)) {</div><div class='add'>+				PRINT_ERR("Segment %s has different type from "</div><div class='add'>+					"segment %s\n",</div><div class='add'>+					sort_list[i].segment_name,</div><div class='add'>+					sort_list[i+1].segment_name);</div><div class='add'>+				rc = -EINVAL;</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	rc = 0;</div><div class='add'>+out:</div><div class='add'>+	kfree(sort_list);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Load a segment</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+dcssblk_load_segment(char *name, struct segment_info **seg_info)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	/* already loaded? */</div><div class='add'>+	down_read(&amp;dcssblk_devices_sem);</div><div class='add'>+	*seg_info = dcssblk_get_segment_by_name(name);</div><div class='add'>+	up_read(&amp;dcssblk_devices_sem);</div><div class='add'>+	if (*seg_info != NULL)</div><div class='add'>+		return -EEXIST;</div><div class='add'>+</div><div class='add'>+	/* get a struct segment_info */</div><div class='add'>+	*seg_info = kzalloc(sizeof(struct segment_info), GFP_KERNEL);</div><div class='add'>+	if (*seg_info == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	strcpy((*seg_info)-&gt;segment_name, name);</div><div class='add'>+</div><div class='add'>+	/* load the segment */</div><div class='add'>+	rc = segment_load(name, SEGMENT_SHARED,</div><div class='add'>+			&amp;(*seg_info)-&gt;start, &amp;(*seg_info)-&gt;end);</div><div class='add'>+	if (rc &lt; 0) {</div><div class='add'>+		segment_warning(rc, (*seg_info)-&gt;segment_name);</div><div class='add'>+		kfree(*seg_info);</div><div class='add'>+	} else {</div><div class='add'>+		INIT_LIST_HEAD(&amp;(*seg_info)-&gt;lh);</div><div class='add'>+		(*seg_info)-&gt;segment_type = rc;</div><div class='add'>+	}</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void dcssblk_unregister_callback(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	device_unregister(dev);</div><div class='hunk'>@@ -165,6 +348,7 @@ static ssize_t</div><div class='ctx'> dcssblk_shared_store(struct device *dev, struct device_attribute *attr, const char *inbuf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct dcssblk_dev_info *dev_info;</div><div class='add'>+	struct segment_info *entry, *temp;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	if ((count &gt; 1) &amp;&amp; (inbuf[1] != '\n') &amp;&amp; (inbuf[1] != '\0'))</div><div class='hunk'>@@ -172,46 +356,46 @@ dcssblk_shared_store(struct device *dev, struct device_attribute *attr, const ch</div><div class='ctx'> 	down_write(&amp;dcssblk_devices_sem);</div><div class='ctx'> 	dev_info = container_of(dev, struct dcssblk_dev_info, dev);</div><div class='ctx'> 	if (atomic_read(&amp;dev_info-&gt;use_count)) {</div><div class='del'>-		PRINT_ERR("share: segment %s is busy!\n",</div><div class='del'>-			  dev_info-&gt;segment_name);</div><div class='ctx'> 		rc = -EBUSY;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (inbuf[0] == '1') {</div><div class='del'>-		// reload segment in shared mode</div><div class='del'>-		rc = segment_modify_shared(dev_info-&gt;segment_name,</div><div class='del'>-					   SEGMENT_SHARED);</div><div class='del'>-		if (rc &lt; 0) {</div><div class='del'>-			BUG_ON(rc == -EINVAL);</div><div class='del'>-			if (rc != -EAGAIN)</div><div class='del'>-				goto removeseg;</div><div class='del'>-		} else {</div><div class='del'>-			dev_info-&gt;is_shared = 1;</div><div class='del'>-			switch (dev_info-&gt;segment_type) {</div><div class='del'>-				case SEG_TYPE_SR:</div><div class='del'>-				case SEG_TYPE_ER:</div><div class='del'>-				case SEG_TYPE_SC:</div><div class='del'>-					set_disk_ro(dev_info-&gt;gd,1);</div><div class='add'>+		/* reload segments in shared mode */</div><div class='add'>+		list_for_each_entry(entry, &amp;dev_info-&gt;seg_list, lh) {</div><div class='add'>+			rc = segment_modify_shared(entry-&gt;segment_name,</div><div class='add'>+						SEGMENT_SHARED);</div><div class='add'>+			if (rc &lt; 0) {</div><div class='add'>+				BUG_ON(rc == -EINVAL);</div><div class='add'>+				if (rc != -EAGAIN)</div><div class='add'>+					goto removeseg;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='add'>+		dev_info-&gt;is_shared = 1;</div><div class='add'>+		switch (dev_info-&gt;segment_type) {</div><div class='add'>+		case SEG_TYPE_SR:</div><div class='add'>+		case SEG_TYPE_ER:</div><div class='add'>+		case SEG_TYPE_SC:</div><div class='add'>+			set_disk_ro(dev_info-&gt;gd, 1);</div><div class='add'>+		}</div><div class='ctx'> 	} else if (inbuf[0] == '0') {</div><div class='del'>-		// reload segment in exclusive mode</div><div class='add'>+		/* reload segments in exclusive mode */</div><div class='ctx'> 		if (dev_info-&gt;segment_type == SEG_TYPE_SC) {</div><div class='ctx'> 			PRINT_ERR("Segment type SC (%s) cannot be loaded in "</div><div class='del'>-				  "non-shared mode\n", dev_info-&gt;segment_name);</div><div class='add'>+				"non-shared mode\n", dev_info-&gt;segment_name);</div><div class='ctx'> 			rc = -EINVAL;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='del'>-		rc = segment_modify_shared(dev_info-&gt;segment_name,</div><div class='del'>-					   SEGMENT_EXCLUSIVE);</div><div class='del'>-		if (rc &lt; 0) {</div><div class='del'>-			BUG_ON(rc == -EINVAL);</div><div class='del'>-			if (rc != -EAGAIN)</div><div class='del'>-				goto removeseg;</div><div class='del'>-		} else {</div><div class='del'>-			dev_info-&gt;is_shared = 0;</div><div class='del'>-			set_disk_ro(dev_info-&gt;gd, 0);</div><div class='add'>+		list_for_each_entry(entry, &amp;dev_info-&gt;seg_list, lh) {</div><div class='add'>+			rc = segment_modify_shared(entry-&gt;segment_name,</div><div class='add'>+						   SEGMENT_EXCLUSIVE);</div><div class='add'>+			if (rc &lt; 0) {</div><div class='add'>+				BUG_ON(rc == -EINVAL);</div><div class='add'>+				if (rc != -EAGAIN)</div><div class='add'>+					goto removeseg;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='add'>+		dev_info-&gt;is_shared = 0;</div><div class='add'>+		set_disk_ro(dev_info-&gt;gd, 0);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		rc = -EINVAL;</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -220,8 +404,14 @@ dcssblk_shared_store(struct device *dev, struct device_attribute *attr, const ch</div><div class='ctx'> 	goto out;</div><div class='ctx'> </div><div class='ctx'> removeseg:</div><div class='del'>-	PRINT_ERR("Could not reload segment %s, removing it now!\n",</div><div class='del'>-			dev_info-&gt;segment_name);</div><div class='add'>+	PRINT_ERR("Could not reload segment(s) of the device %s, removing "</div><div class='add'>+		"segment(s) now!\n",</div><div class='add'>+		dev_info-&gt;segment_name);</div><div class='add'>+	temp = entry;</div><div class='add'>+	list_for_each_entry(entry, &amp;dev_info-&gt;seg_list, lh) {</div><div class='add'>+		if (entry != temp)</div><div class='add'>+			segment_unload(entry-&gt;segment_name);</div><div class='add'>+	}</div><div class='ctx'> 	list_del(&amp;dev_info-&gt;lh);</div><div class='ctx'> </div><div class='ctx'> 	del_gendisk(dev_info-&gt;gd);</div><div class='hunk'>@@ -254,6 +444,7 @@ static ssize_t</div><div class='ctx'> dcssblk_save_store(struct device *dev, struct device_attribute *attr, const char *inbuf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct dcssblk_dev_info *dev_info;</div><div class='add'>+	struct segment_info *entry;</div><div class='ctx'> </div><div class='ctx'> 	if ((count &gt; 1) &amp;&amp; (inbuf[1] != '\n') &amp;&amp; (inbuf[1] != '\0'))</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -263,14 +454,16 @@ dcssblk_save_store(struct device *dev, struct device_attribute *attr, const char</div><div class='ctx'> 	if (inbuf[0] == '1') {</div><div class='ctx'> 		if (atomic_read(&amp;dev_info-&gt;use_count) == 0) {</div><div class='ctx'> 			// device is idle =&gt; we save immediately</div><div class='del'>-			PRINT_INFO("Saving segment %s\n",</div><div class='add'>+			PRINT_INFO("Saving segment(s) of the device %s\n",</div><div class='ctx'> 				   dev_info-&gt;segment_name);</div><div class='del'>-			segment_save(dev_info-&gt;segment_name);</div><div class='add'>+			list_for_each_entry(entry, &amp;dev_info-&gt;seg_list, lh) {</div><div class='add'>+				segment_save(entry-&gt;segment_name);</div><div class='add'>+			}</div><div class='ctx'> 		}  else {</div><div class='ctx'> 			// device is busy =&gt; we save it when it becomes</div><div class='ctx'> 			// idle in dcssblk_release</div><div class='del'>-			PRINT_INFO("Segment %s is currently busy, it will "</div><div class='del'>-				   "be saved when it becomes idle...\n",</div><div class='add'>+			PRINT_INFO("Device %s is currently busy, segment(s) "</div><div class='add'>+				   "will be saved when it becomes idle...\n",</div><div class='ctx'> 				   dev_info-&gt;segment_name);</div><div class='ctx'> 			dev_info-&gt;save_pending = 1;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -279,7 +472,8 @@ dcssblk_save_store(struct device *dev, struct device_attribute *attr, const char</div><div class='ctx'> 			// device is busy &amp; the user wants to undo his save</div><div class='ctx'> 			// request</div><div class='ctx'> 			dev_info-&gt;save_pending = 0;</div><div class='del'>-			PRINT_INFO("Pending save for segment %s deactivated\n",</div><div class='add'>+			PRINT_INFO("Pending save for segment(s) of the device "</div><div class='add'>+					"%s deactivated\n",</div><div class='ctx'> 					dev_info-&gt;segment_name);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -291,66 +485,123 @@ dcssblk_save_store(struct device *dev, struct device_attribute *attr, const char</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * device attribute for showing all segments in a device</div><div class='add'>+ */</div><div class='add'>+static ssize_t</div><div class='add'>+dcssblk_seglist_show(struct device *dev, struct device_attribute *attr,</div><div class='add'>+		char *buf)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	struct dcssblk_dev_info *dev_info;</div><div class='add'>+	struct segment_info *entry;</div><div class='add'>+</div><div class='add'>+	down_read(&amp;dcssblk_devices_sem);</div><div class='add'>+	dev_info = container_of(dev, struct dcssblk_dev_info, dev);</div><div class='add'>+	i = 0;</div><div class='add'>+	buf[0] = '\0';</div><div class='add'>+	list_for_each_entry(entry, &amp;dev_info-&gt;seg_list, lh) {</div><div class='add'>+		strcpy(&amp;buf[i], entry-&gt;segment_name);</div><div class='add'>+		i += strlen(entry-&gt;segment_name);</div><div class='add'>+		buf[i] = '\n';</div><div class='add'>+		i++;</div><div class='add'>+	}</div><div class='add'>+	up_read(&amp;dcssblk_devices_sem);</div><div class='add'>+	return i;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * device attribute for adding devices</div><div class='ctx'>  */</div><div class='ctx'> static ssize_t</div><div class='ctx'> dcssblk_add_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)</div><div class='ctx'> {</div><div class='del'>-	int rc, i;</div><div class='add'>+	int rc, i, j, num_of_segments;</div><div class='ctx'> 	struct dcssblk_dev_info *dev_info;</div><div class='add'>+	struct segment_info *seg_info, *temp;</div><div class='ctx'> 	char *local_buf;</div><div class='ctx'> 	unsigned long seg_byte_size;</div><div class='ctx'> </div><div class='ctx'> 	dev_info = NULL;</div><div class='add'>+	seg_info = NULL;</div><div class='ctx'> 	if (dev != dcssblk_root_dev) {</div><div class='ctx'> 		rc = -EINVAL;</div><div class='ctx'> 		goto out_nobuf;</div><div class='ctx'> 	}</div><div class='add'>+	if ((count &lt; 1) || (buf[0] == '\0') || (buf[0] == '\n')) {</div><div class='add'>+		rc = -ENAMETOOLONG;</div><div class='add'>+		goto out_nobuf;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	local_buf = kmalloc(count + 1, GFP_KERNEL);</div><div class='ctx'> 	if (local_buf == NULL) {</div><div class='ctx'> 		rc = -ENOMEM;</div><div class='ctx'> 		goto out_nobuf;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * parse input</div><div class='ctx'> 	 */</div><div class='add'>+	num_of_segments = 0;</div><div class='ctx'> 	for (i = 0; ((buf[i] != '\0') &amp;&amp; (buf[i] != '\n') &amp;&amp; i &lt; count); i++) {</div><div class='del'>-		local_buf[i] = toupper(buf[i]);</div><div class='add'>+		for (j = i; (buf[j] != ':') &amp;&amp;</div><div class='add'>+			(buf[j] != '\0') &amp;&amp;</div><div class='add'>+			(buf[j] != '\n') &amp;&amp;</div><div class='add'>+			j &lt; count; j++) {</div><div class='add'>+			local_buf[j-i] = toupper(buf[j]);</div><div class='add'>+		}</div><div class='add'>+		local_buf[j-i] = '\0';</div><div class='add'>+		if (((j - i) == 0) || ((j - i) &gt; 8)) {</div><div class='add'>+			rc = -ENAMETOOLONG;</div><div class='add'>+			goto seg_list_del;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		rc = dcssblk_load_segment(local_buf, &amp;seg_info);</div><div class='add'>+		if (rc &lt; 0)</div><div class='add'>+			goto seg_list_del;</div><div class='add'>+		/*</div><div class='add'>+		 * get a struct dcssblk_dev_info</div><div class='add'>+		 */</div><div class='add'>+		if (num_of_segments == 0) {</div><div class='add'>+			dev_info = kzalloc(sizeof(struct dcssblk_dev_info),</div><div class='add'>+					GFP_KERNEL);</div><div class='add'>+			if (dev_info == NULL) {</div><div class='add'>+				rc = -ENOMEM;</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+			strcpy(dev_info-&gt;segment_name, local_buf);</div><div class='add'>+			dev_info-&gt;segment_type = seg_info-&gt;segment_type;</div><div class='add'>+			INIT_LIST_HEAD(&amp;dev_info-&gt;seg_list);</div><div class='add'>+		}</div><div class='add'>+		list_add_tail(&amp;seg_info-&gt;lh, &amp;dev_info-&gt;seg_list);</div><div class='add'>+		num_of_segments++;</div><div class='add'>+		i = j;</div><div class='add'>+</div><div class='add'>+		if ((buf[j] == '\0') || (buf[j] == '\n'))</div><div class='add'>+			break;</div><div class='ctx'> 	}</div><div class='del'>-	local_buf[i] = '\0';</div><div class='del'>-	if ((i == 0) || (i &gt; 8)) {</div><div class='add'>+</div><div class='add'>+	/* no trailing colon at the end of the input */</div><div class='add'>+	if ((i &gt; 0) &amp;&amp; (buf[i-1] == ':')) {</div><div class='ctx'> 		rc = -ENAMETOOLONG;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * already loaded?</div><div class='del'>-	 */</div><div class='del'>-	down_read(&amp;dcssblk_devices_sem);</div><div class='del'>-	dev_info = dcssblk_get_device_by_name(local_buf);</div><div class='del'>-	up_read(&amp;dcssblk_devices_sem);</div><div class='del'>-	if (dev_info != NULL) {</div><div class='del'>-		PRINT_WARN("Segment %s already loaded!\n", local_buf);</div><div class='del'>-		rc = -EEXIST;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * get a struct dcssblk_dev_info</div><div class='del'>-	 */</div><div class='del'>-	dev_info = kzalloc(sizeof(struct dcssblk_dev_info), GFP_KERNEL);</div><div class='del'>-	if (dev_info == NULL) {</div><div class='del'>-		rc = -ENOMEM;</div><div class='del'>-		goto out;</div><div class='add'>+		goto seg_list_del;</div><div class='ctx'> 	}</div><div class='add'>+	strlcpy(local_buf, buf, i + 1);</div><div class='add'>+	dev_info-&gt;num_of_segments = num_of_segments;</div><div class='add'>+	rc = dcssblk_is_continuous(dev_info);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		goto seg_list_del;</div><div class='add'>+</div><div class='add'>+	dev_info-&gt;start = dcssblk_find_lowest_addr(dev_info);</div><div class='add'>+	dev_info-&gt;end = dcssblk_find_highest_addr(dev_info);</div><div class='ctx'> </div><div class='del'>-	strcpy(dev_info-&gt;segment_name, local_buf);</div><div class='del'>-	strlcpy(dev_info-&gt;dev.bus_id, local_buf, BUS_ID_SIZE);</div><div class='add'>+	dev_set_name(&amp;dev_info-&gt;dev, dev_info-&gt;segment_name);</div><div class='ctx'> 	dev_info-&gt;dev.release = dcssblk_release_segment;</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;dev_info-&gt;lh);</div><div class='del'>-</div><div class='ctx'> 	dev_info-&gt;gd = alloc_disk(DCSSBLK_MINORS_PER_DISK);</div><div class='ctx'> 	if (dev_info-&gt;gd == NULL) {</div><div class='ctx'> 		rc = -ENOMEM;</div><div class='del'>-		goto free_dev_info;</div><div class='add'>+		goto seg_list_del;</div><div class='ctx'> 	}</div><div class='ctx'> 	dev_info-&gt;gd-&gt;major = dcssblk_major;</div><div class='ctx'> 	dev_info-&gt;gd-&gt;fops = &amp;dcssblk_devops;</div><div class='hunk'>@@ -360,59 +611,43 @@ dcssblk_add_store(struct device *dev, struct device_attribute *attr, const char</div><div class='ctx'> 	dev_info-&gt;gd-&gt;driverfs_dev = &amp;dev_info-&gt;dev;</div><div class='ctx'> 	blk_queue_make_request(dev_info-&gt;dcssblk_queue, dcssblk_make_request);</div><div class='ctx'> 	blk_queue_hardsect_size(dev_info-&gt;dcssblk_queue, 4096);</div><div class='del'>-	/*</div><div class='del'>-	 * load the segment</div><div class='del'>-	 */</div><div class='del'>-	rc = segment_load(local_buf, SEGMENT_SHARED,</div><div class='del'>-				&amp;dev_info-&gt;start, &amp;dev_info-&gt;end);</div><div class='del'>-	if (rc &lt; 0) {</div><div class='del'>-		segment_warning(rc, dev_info-&gt;segment_name);</div><div class='del'>-		goto dealloc_gendisk;</div><div class='del'>-	}</div><div class='add'>+</div><div class='ctx'> 	seg_byte_size = (dev_info-&gt;end - dev_info-&gt;start + 1);</div><div class='ctx'> 	set_capacity(dev_info-&gt;gd, seg_byte_size &gt;&gt; 9); // size in sectors</div><div class='del'>-	PRINT_INFO("Loaded segment %s, size = %lu Byte, "</div><div class='add'>+	PRINT_INFO("Loaded segment(s) %s, size = %lu Byte, "</div><div class='ctx'> 		   "capacity = %lu (512 Byte) sectors\n", local_buf,</div><div class='ctx'> 		   seg_byte_size, seg_byte_size &gt;&gt; 9);</div><div class='ctx'> </div><div class='del'>-	dev_info-&gt;segment_type = rc;</div><div class='ctx'> 	dev_info-&gt;save_pending = 0;</div><div class='ctx'> 	dev_info-&gt;is_shared = 1;</div><div class='ctx'> 	dev_info-&gt;dev.parent = dcssblk_root_dev;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * get minor, add to list</div><div class='add'>+	 *get minor, add to list</div><div class='ctx'> 	 */</div><div class='ctx'> 	down_write(&amp;dcssblk_devices_sem);</div><div class='del'>-	if (dcssblk_get_device_by_name(local_buf)) {</div><div class='del'>-		up_write(&amp;dcssblk_devices_sem);</div><div class='add'>+	if (dcssblk_get_segment_by_name(local_buf)) {</div><div class='ctx'> 		rc = -EEXIST;</div><div class='del'>-		goto unload_seg;</div><div class='add'>+		goto release_gd;</div><div class='ctx'> 	}</div><div class='ctx'> 	rc = dcssblk_assign_free_minor(dev_info);</div><div class='del'>-	if (rc) {</div><div class='del'>-		up_write(&amp;dcssblk_devices_sem);</div><div class='del'>-		PRINT_ERR("No free minor number available! "</div><div class='del'>-			  "Unloading segment...\n");</div><div class='del'>-		goto unload_seg;</div><div class='del'>-	}</div><div class='add'>+	if (rc)</div><div class='add'>+		goto release_gd;</div><div class='ctx'> 	sprintf(dev_info-&gt;gd-&gt;disk_name, "dcssblk%d",</div><div class='del'>-		dev_info-&gt;gd-&gt;first_minor);</div><div class='add'>+		MINOR(disk_devt(dev_info-&gt;gd)));</div><div class='ctx'> 	list_add_tail(&amp;dev_info-&gt;lh, &amp;dcssblk_devices);</div><div class='ctx'> </div><div class='ctx'> 	if (!try_module_get(THIS_MODULE)) {</div><div class='ctx'> 		rc = -ENODEV;</div><div class='del'>-		goto list_del;</div><div class='add'>+		goto dev_list_del;</div><div class='ctx'> 	}</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * register the device</div><div class='ctx'> 	 */</div><div class='ctx'> 	rc = device_register(&amp;dev_info-&gt;dev);</div><div class='ctx'> 	if (rc) {</div><div class='del'>-		PRINT_ERR("Segment %s could not be registered RC=%d\n",</div><div class='del'>-				local_buf, rc);</div><div class='ctx'> 		module_put(THIS_MODULE);</div><div class='del'>-		goto list_del;</div><div class='add'>+		goto dev_list_del;</div><div class='ctx'> 	}</div><div class='ctx'> 	get_device(&amp;dev_info-&gt;dev);</div><div class='ctx'> 	rc = device_create_file(&amp;dev_info-&gt;dev, &amp;dev_attr_shared);</div><div class='hunk'>@@ -421,6 +656,9 @@ dcssblk_add_store(struct device *dev, struct device_attribute *attr, const char</div><div class='ctx'> 	rc = device_create_file(&amp;dev_info-&gt;dev, &amp;dev_attr_save);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto unregister_dev;</div><div class='add'>+	rc = device_create_file(&amp;dev_info-&gt;dev, &amp;dev_attr_seglist);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto unregister_dev;</div><div class='ctx'> </div><div class='ctx'> 	add_disk(dev_info-&gt;gd);</div><div class='ctx'> </div><div class='hunk'>@@ -434,7 +672,6 @@ dcssblk_add_store(struct device *dev, struct device_attribute *attr, const char</div><div class='ctx'> 			set_disk_ro(dev_info-&gt;gd,0);</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='del'>-	PRINT_DEBUG("Segment %s loaded successfully\n", local_buf);</div><div class='ctx'> 	up_write(&amp;dcssblk_devices_sem);</div><div class='ctx'> 	rc = count;</div><div class='ctx'> 	goto out;</div><div class='hunk'>@@ -445,20 +682,27 @@ unregister_dev:</div><div class='ctx'> 	dev_info-&gt;gd-&gt;queue = NULL;</div><div class='ctx'> 	put_disk(dev_info-&gt;gd);</div><div class='ctx'> 	device_unregister(&amp;dev_info-&gt;dev);</div><div class='del'>-	segment_unload(dev_info-&gt;segment_name);</div><div class='add'>+	list_for_each_entry(seg_info, &amp;dev_info-&gt;seg_list, lh) {</div><div class='add'>+		segment_unload(seg_info-&gt;segment_name);</div><div class='add'>+	}</div><div class='ctx'> 	put_device(&amp;dev_info-&gt;dev);</div><div class='ctx'> 	up_write(&amp;dcssblk_devices_sem);</div><div class='ctx'> 	goto out;</div><div class='del'>-list_del:</div><div class='add'>+dev_list_del:</div><div class='ctx'> 	list_del(&amp;dev_info-&gt;lh);</div><div class='del'>-	up_write(&amp;dcssblk_devices_sem);</div><div class='del'>-unload_seg:</div><div class='del'>-	segment_unload(local_buf);</div><div class='del'>-dealloc_gendisk:</div><div class='add'>+release_gd:</div><div class='ctx'> 	blk_cleanup_queue(dev_info-&gt;dcssblk_queue);</div><div class='ctx'> 	dev_info-&gt;gd-&gt;queue = NULL;</div><div class='ctx'> 	put_disk(dev_info-&gt;gd);</div><div class='del'>-free_dev_info:</div><div class='add'>+	up_write(&amp;dcssblk_devices_sem);</div><div class='add'>+seg_list_del:</div><div class='add'>+	if (dev_info == NULL)</div><div class='add'>+		goto out;</div><div class='add'>+	list_for_each_entry_safe(seg_info, temp, &amp;dev_info-&gt;seg_list, lh) {</div><div class='add'>+		list_del(&amp;seg_info-&gt;lh);</div><div class='add'>+		segment_unload(seg_info-&gt;segment_name);</div><div class='add'>+		kfree(seg_info);</div><div class='add'>+	}</div><div class='ctx'> 	kfree(dev_info);</div><div class='ctx'> out:</div><div class='ctx'> 	kfree(local_buf);</div><div class='hunk'>@@ -473,6 +717,7 @@ static ssize_t</div><div class='ctx'> dcssblk_remove_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct dcssblk_dev_info *dev_info;</div><div class='add'>+	struct segment_info *entry;</div><div class='ctx'> 	int rc, i;</div><div class='ctx'> 	char *local_buf;</div><div class='ctx'> </div><div class='hunk'>@@ -499,26 +744,28 @@ dcssblk_remove_store(struct device *dev, struct device_attribute *attr, const ch</div><div class='ctx'> 	dev_info = dcssblk_get_device_by_name(local_buf);</div><div class='ctx'> 	if (dev_info == NULL) {</div><div class='ctx'> 		up_write(&amp;dcssblk_devices_sem);</div><div class='del'>-		PRINT_WARN("Segment %s is not loaded!\n", local_buf);</div><div class='add'>+		PRINT_WARN("Device %s is not loaded!\n", local_buf);</div><div class='ctx'> 		rc = -ENODEV;</div><div class='ctx'> 		goto out_buf;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (atomic_read(&amp;dev_info-&gt;use_count) != 0) {</div><div class='ctx'> 		up_write(&amp;dcssblk_devices_sem);</div><div class='del'>-		PRINT_WARN("Segment %s is in use!\n", local_buf);</div><div class='add'>+		PRINT_WARN("Device %s is in use!\n", local_buf);</div><div class='ctx'> 		rc = -EBUSY;</div><div class='ctx'> 		goto out_buf;</div><div class='ctx'> 	}</div><div class='del'>-	list_del(&amp;dev_info-&gt;lh);</div><div class='ctx'> </div><div class='add'>+	list_del(&amp;dev_info-&gt;lh);</div><div class='ctx'> 	del_gendisk(dev_info-&gt;gd);</div><div class='ctx'> 	blk_cleanup_queue(dev_info-&gt;dcssblk_queue);</div><div class='ctx'> 	dev_info-&gt;gd-&gt;queue = NULL;</div><div class='ctx'> 	put_disk(dev_info-&gt;gd);</div><div class='ctx'> 	device_unregister(&amp;dev_info-&gt;dev);</div><div class='del'>-	segment_unload(dev_info-&gt;segment_name);</div><div class='del'>-	PRINT_DEBUG("Segment %s unloaded successfully\n",</div><div class='del'>-			dev_info-&gt;segment_name);</div><div class='add'>+</div><div class='add'>+	/* unload all related segments */</div><div class='add'>+	list_for_each_entry(entry, &amp;dev_info-&gt;seg_list, lh)</div><div class='add'>+		segment_unload(entry-&gt;segment_name);</div><div class='add'>+</div><div class='ctx'> 	put_device(&amp;dev_info-&gt;dev);</div><div class='ctx'> 	up_write(&amp;dcssblk_devices_sem);</div><div class='ctx'> </div><div class='hunk'>@@ -550,6 +797,7 @@ static int</div><div class='ctx'> dcssblk_release(struct inode *inode, struct file *filp)</div><div class='ctx'> {</div><div class='ctx'> 	struct dcssblk_dev_info *dev_info;</div><div class='add'>+	struct segment_info *entry;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	dev_info = inode-&gt;i_bdev-&gt;bd_disk-&gt;private_data;</div><div class='hunk'>@@ -560,9 +808,11 @@ dcssblk_release(struct inode *inode, struct file *filp)</div><div class='ctx'> 	down_write(&amp;dcssblk_devices_sem);</div><div class='ctx'> 	if (atomic_dec_and_test(&amp;dev_info-&gt;use_count)</div><div class='ctx'> 	    &amp;&amp; (dev_info-&gt;save_pending)) {</div><div class='del'>-		PRINT_INFO("Segment %s became idle and is being saved now\n",</div><div class='add'>+		PRINT_INFO("Device %s became idle and is being saved now\n",</div><div class='ctx'> 			    dev_info-&gt;segment_name);</div><div class='del'>-		segment_save(dev_info-&gt;segment_name);</div><div class='add'>+		list_for_each_entry(entry, &amp;dev_info-&gt;seg_list, lh) {</div><div class='add'>+			segment_save(entry-&gt;segment_name);</div><div class='add'>+		}</div><div class='ctx'> 		dev_info-&gt;save_pending = 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	up_write(&amp;dcssblk_devices_sem);</div><div class='hunk'>@@ -602,7 +852,8 @@ dcssblk_make_request(struct request_queue *q, struct bio *bio)</div><div class='ctx'> 		case SEG_TYPE_SC:</div><div class='ctx'> 			/* cannot write to these segments */</div><div class='ctx'> 			if (bio_data_dir(bio) == WRITE) {</div><div class='del'>-				PRINT_WARN("rejecting write to ro segment %s\n", dev_info-&gt;dev.bus_id);</div><div class='add'>+				PRINT_WARN("rejecting write to ro device %s\n",</div><div class='add'>+					   dev_name(&amp;dev_info-&gt;dev));</div><div class='ctx'> 				goto fail;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -657,7 +908,7 @@ static void</div><div class='ctx'> dcssblk_check_params(void)</div><div class='ctx'> {</div><div class='ctx'> 	int rc, i, j, k;</div><div class='del'>-	char buf[9];</div><div class='add'>+	char buf[DCSSBLK_PARM_LEN + 1];</div><div class='ctx'> 	struct dcssblk_dev_info *dev_info;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; (i &lt; DCSSBLK_PARM_LEN) &amp;&amp; (dcssblk_segments[i] != '\0');</div><div class='hunk'>@@ -665,15 +916,16 @@ dcssblk_check_params(void)</div><div class='ctx'> 		for (j = i; (dcssblk_segments[j] != ',')  &amp;&amp;</div><div class='ctx'> 			    (dcssblk_segments[j] != '\0') &amp;&amp;</div><div class='ctx'> 			    (dcssblk_segments[j] != '(')  &amp;&amp;</div><div class='del'>-			    (j - i) &lt; 8; j++)</div><div class='add'>+			    (j &lt; DCSSBLK_PARM_LEN); j++)</div><div class='ctx'> 		{</div><div class='ctx'> 			buf[j-i] = dcssblk_segments[j];</div><div class='ctx'> 		}</div><div class='ctx'> 		buf[j-i] = '\0';</div><div class='ctx'> 		rc = dcssblk_add_store(dcssblk_root_dev, NULL, buf, j-i);</div><div class='ctx'> 		if ((rc &gt;= 0) &amp;&amp; (dcssblk_segments[j] == '(')) {</div><div class='del'>-			for (k = 0; buf[k] != '\0'; k++)</div><div class='add'>+			for (k = 0; (buf[k] != ':') &amp;&amp; (buf[k] != '\0'); k++)</div><div class='ctx'> 				buf[k] = toupper(buf[k]);</div><div class='add'>+			buf[k] = '\0';</div><div class='ctx'> 			if (!strncmp(&amp;dcssblk_segments[j], "(local)", 7)) {</div><div class='ctx'> 				down_read(&amp;dcssblk_devices_sem);</div><div class='ctx'> 				dev_info = dcssblk_get_device_by_name(buf);</div><div class='hunk'>@@ -740,10 +992,12 @@ module_exit(dcssblk_exit);</div><div class='ctx'> </div><div class='ctx'> module_param_string(segments, dcssblk_segments, DCSSBLK_PARM_LEN, 0444);</div><div class='ctx'> MODULE_PARM_DESC(segments, "Name of DCSS segment(s) to be loaded, "</div><div class='del'>-		 "comma-separated list, each name max. 8 chars.\n"</div><div class='del'>-		 "Adding \"(local)\" to segment name equals echoing 0 to "</div><div class='del'>-		 "/sys/devices/dcssblk/&lt;segment name&gt;/shared after loading "</div><div class='del'>-		 "the segment - \n"</div><div class='del'>-		 "e.g. segments=\"mydcss1,mydcss2,mydcss3(local)\"");</div><div class='add'>+		 "comma-separated list, names in each set separated "</div><div class='add'>+		 "by commas are separated by colons, each set contains "</div><div class='add'>+		 "names of contiguous segments and each name max. 8 chars.\n"</div><div class='add'>+		 "Adding \"(local)\" to the end of each set equals echoing 0 "</div><div class='add'>+		 "to /sys/devices/dcssblk/&lt;device name&gt;/shared after loading "</div><div class='add'>+		 "the contiguous segments - \n"</div><div class='add'>+		 "e.g. segments=\"mydcss1,mydcss2:mydcss3,mydcss4(local)\"");</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/s390/block/xpram.c b/drivers/s390/block/xpram.c<br/>index dd9b986389a2..03916989ed2d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/block/xpram.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/s390/block/xpram.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/block/xpram.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/block/xpram.c</a></div><div class='hunk'>@@ -56,6 +56,7 @@ typedef struct {</div><div class='ctx'> static xpram_device_t xpram_devices[XPRAM_MAX_DEVS];</div><div class='ctx'> static unsigned int xpram_sizes[XPRAM_MAX_DEVS];</div><div class='ctx'> static struct gendisk *xpram_disks[XPRAM_MAX_DEVS];</div><div class='add'>+static struct request_queue *xpram_queues[XPRAM_MAX_DEVS];</div><div class='ctx'> static unsigned int xpram_pages;</div><div class='ctx'> static int xpram_devs;</div><div class='ctx'> </div><div class='hunk'>@@ -330,18 +331,22 @@ static int __init xpram_setup_sizes(unsigned long pages)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct request_queue *xpram_queue;</div><div class='del'>-</div><div class='ctx'> static int __init xpram_setup_blkdev(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long offset;</div><div class='ctx'> 	int i, rc = -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; xpram_devs; i++) {</div><div class='del'>-		struct gendisk *disk = alloc_disk(1);</div><div class='del'>-		if (!disk)</div><div class='add'>+		xpram_disks[i] = alloc_disk(1);</div><div class='add'>+		if (!xpram_disks[i])</div><div class='add'>+			goto out;</div><div class='add'>+		xpram_queues[i] = blk_alloc_queue(GFP_KERNEL);</div><div class='add'>+		if (!xpram_queues[i]) {</div><div class='add'>+			put_disk(xpram_disks[i]);</div><div class='ctx'> 			goto out;</div><div class='del'>-		xpram_disks[i] = disk;</div><div class='add'>+		}</div><div class='add'>+		blk_queue_make_request(xpram_queues[i], xpram_make_request);</div><div class='add'>+		blk_queue_hardsect_size(xpram_queues[i], 4096);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -352,18 +357,6 @@ static int __init xpram_setup_blkdev(void)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Assign the other needed values: make request function, sizes and</div><div class='del'>-	 * hardsect size. All the minor devices feature the same value.</div><div class='del'>-	 */</div><div class='del'>-	xpram_queue = blk_alloc_queue(GFP_KERNEL);</div><div class='del'>-	if (!xpram_queue) {</div><div class='del'>-		rc = -ENOMEM;</div><div class='del'>-		goto out_unreg;</div><div class='del'>-	}</div><div class='del'>-	blk_queue_make_request(xpram_queue, xpram_make_request);</div><div class='del'>-	blk_queue_hardsect_size(xpram_queue, 4096);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='ctx'> 	 * Setup device structures.</div><div class='ctx'> 	 */</div><div class='ctx'> 	offset = 0;</div><div class='hunk'>@@ -377,18 +370,18 @@ static int __init xpram_setup_blkdev(void)</div><div class='ctx'> 		disk-&gt;first_minor = i;</div><div class='ctx'> 		disk-&gt;fops = &amp;xpram_devops;</div><div class='ctx'> 		disk-&gt;private_data = &amp;xpram_devices[i];</div><div class='del'>-		disk-&gt;queue = xpram_queue;</div><div class='add'>+		disk-&gt;queue = xpram_queues[i];</div><div class='ctx'> 		sprintf(disk-&gt;disk_name, "slram%d", i);</div><div class='ctx'> 		set_capacity(disk, xpram_sizes[i] &lt;&lt; 1);</div><div class='ctx'> 		add_disk(disk);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='del'>-out_unreg:</div><div class='del'>-	unregister_blkdev(XPRAM_MAJOR, XPRAM_NAME);</div><div class='ctx'> out:</div><div class='del'>-	while (i--)</div><div class='add'>+	while (i--) {</div><div class='add'>+		blk_cleanup_queue(xpram_queues[i]);</div><div class='ctx'> 		put_disk(xpram_disks[i]);</div><div class='add'>+	}</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -400,10 +393,10 @@ static void __exit xpram_exit(void)</div><div class='ctx'> 	int i;</div><div class='ctx'> 	for (i = 0; i &lt; xpram_devs; i++) {</div><div class='ctx'> 		del_gendisk(xpram_disks[i]);</div><div class='add'>+		blk_cleanup_queue(xpram_queues[i]);</div><div class='ctx'> 		put_disk(xpram_disks[i]);</div><div class='ctx'> 	}</div><div class='ctx'> 	unregister_blkdev(XPRAM_MAJOR, XPRAM_NAME);</div><div class='del'>-	blk_cleanup_queue(xpram_queue);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init xpram_init(void)</div><div class='head'>diff --git a/drivers/s390/char/con3215.c b/drivers/s390/char/con3215.c<br/>index d3ec9b55ab35..9ab06e0dad40 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/char/con3215.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/s390/char/con3215.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/char/con3215.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/char/con3215.c</a></div><div class='hunk'>@@ -21,6 +21,7 @@</div><div class='ctx'> #include &lt;linux/console.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/reboot.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='hunk'>@@ -88,7 +89,6 @@ struct raw3215_info {</div><div class='ctx'> 	int count;		      /* number of bytes in output buffer */</div><div class='ctx'> 	int written;		      /* number of bytes in write requests */</div><div class='ctx'> 	struct tty_struct *tty;	      /* pointer to tty structure if present */</div><div class='del'>-	struct tasklet_struct tasklet;</div><div class='ctx'> 	struct raw3215_req *queued_read; /* pointer to queued read requests */</div><div class='ctx'> 	struct raw3215_req *queued_write;/* pointer to queued write requests */</div><div class='ctx'> 	wait_queue_head_t empty_wait; /* wait queue for flushing */</div><div class='hunk'>@@ -341,21 +341,14 @@ raw3215_try_io(struct raw3215_info *raw)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * The bottom half handler routine for 3215 devices. It tries to start</div><div class='del'>- * the next IO and wakes up processes waiting on the tty.</div><div class='add'>+ * Try to start the next IO and wake up processes waiting on the tty.</div><div class='ctx'>  */</div><div class='del'>-static void</div><div class='del'>-raw3215_tasklet(void *data)</div><div class='add'>+static void raw3215_next_io(struct raw3215_info *raw)</div><div class='ctx'> {</div><div class='del'>-	struct raw3215_info *raw;</div><div class='ctx'> 	struct tty_struct *tty;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	raw = (struct raw3215_info *) data;</div><div class='del'>-	spin_lock_irqsave(get_ccwdev_lock(raw-&gt;cdev), flags);</div><div class='ctx'> 	raw3215_mk_write_req(raw);</div><div class='ctx'> 	raw3215_try_io(raw);</div><div class='del'>-	spin_unlock_irqrestore(get_ccwdev_lock(raw-&gt;cdev), flags);</div><div class='ctx'> 	tty = raw-&gt;tty;</div><div class='ctx'> 	if (tty != NULL &amp;&amp;</div><div class='ctx'> 	    RAW3215_BUFFER_SIZE - raw-&gt;count &gt;= RAW3215_MIN_SPACE) {</div><div class='hunk'>@@ -380,7 +373,7 @@ raw3215_irq(struct ccw_device *cdev, unsigned long intparm, struct irb *irb)</div><div class='ctx'> 	cstat = irb-&gt;scsw.cmd.cstat;</div><div class='ctx'> 	dstat = irb-&gt;scsw.cmd.dstat;</div><div class='ctx'> 	if (cstat != 0)</div><div class='del'>-		tasklet_schedule(&amp;raw-&gt;tasklet);</div><div class='add'>+		raw3215_next_io(raw);</div><div class='ctx'> 	if (dstat &amp; 0x01) { /* we got a unit exception */</div><div class='ctx'> 		dstat &amp;= ~0x01;	 /* we can ignore it */</div><div class='ctx'> 	}</div><div class='hunk'>@@ -390,7 +383,7 @@ raw3215_irq(struct ccw_device *cdev, unsigned long intparm, struct irb *irb)</div><div class='ctx'> 			break;</div><div class='ctx'> 		/* Attention interrupt, someone hit the enter key */</div><div class='ctx'> 		raw3215_mk_read_req(raw);</div><div class='del'>-		tasklet_schedule(&amp;raw-&gt;tasklet);</div><div class='add'>+		raw3215_next_io(raw);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x08:</div><div class='ctx'> 	case 0x0C:</div><div class='hunk'>@@ -448,7 +441,7 @@ raw3215_irq(struct ccw_device *cdev, unsigned long intparm, struct irb *irb)</div><div class='ctx'> 		    raw-&gt;queued_read == NULL) {</div><div class='ctx'> 			wake_up_interruptible(&amp;raw-&gt;empty_wait);</div><div class='ctx'> 		}</div><div class='del'>-		tasklet_schedule(&amp;raw-&gt;tasklet);</div><div class='add'>+		raw3215_next_io(raw);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		/* Strange interrupt, I'll do my best to clean up */</div><div class='hunk'>@@ -460,7 +453,7 @@ raw3215_irq(struct ccw_device *cdev, unsigned long intparm, struct irb *irb)</div><div class='ctx'> 			raw-&gt;flags &amp;= ~RAW3215_WORKING;</div><div class='ctx'> 			raw3215_free_req(req);</div><div class='ctx'> 		}</div><div class='del'>-		tasklet_schedule(&amp;raw-&gt;tasklet);</div><div class='add'>+		raw3215_next_io(raw);</div><div class='ctx'> 	}</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='hunk'>@@ -674,9 +667,6 @@ raw3215_probe (struct ccw_device *cdev)</div><div class='ctx'> 		kfree(raw);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='del'>-	tasklet_init(&amp;raw-&gt;tasklet,</div><div class='del'>-		     (void (*)(unsigned long)) raw3215_tasklet,</div><div class='del'>-		     (unsigned long) raw);</div><div class='ctx'> 	init_waitqueue_head(&amp;raw-&gt;empty_wait);</div><div class='ctx'> </div><div class='ctx'> 	cdev-&gt;dev.driver_data = raw;</div><div class='hunk'>@@ -775,11 +765,11 @@ static struct tty_driver *con3215_device(struct console *c, int *index)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * panic() calls console_unblank before the system enters a</div><div class='del'>- * disabled, endless loop.</div><div class='add'>+ * panic() calls con3215_flush through a panic_notifier</div><div class='add'>+ * before the system enters a disabled, endless loop.</div><div class='ctx'>  */</div><div class='ctx'> static void</div><div class='del'>-con3215_unblank(void)</div><div class='add'>+con3215_flush(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct raw3215_info *raw;</div><div class='ctx'> 	unsigned long flags;</div><div class='hunk'>@@ -790,6 +780,23 @@ con3215_unblank(void)</div><div class='ctx'> 	spin_unlock_irqrestore(get_ccwdev_lock(raw-&gt;cdev), flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int con3215_notify(struct notifier_block *self,</div><div class='add'>+			  unsigned long event, void *data)</div><div class='add'>+{</div><div class='add'>+	con3215_flush();</div><div class='add'>+	return NOTIFY_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct notifier_block on_panic_nb = {</div><div class='add'>+	.notifier_call = con3215_notify,</div><div class='add'>+	.priority = 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct notifier_block on_reboot_nb = {</div><div class='add'>+	.notifier_call = con3215_notify,</div><div class='add'>+	.priority = 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  *  The console structure for the 3215 console</div><div class='ctx'>  */</div><div class='hunk'>@@ -797,7 +804,6 @@ static struct console con3215 = {</div><div class='ctx'> 	.name	 = "ttyS",</div><div class='ctx'> 	.write	 = con3215_write,</div><div class='ctx'> 	.device	 = con3215_device,</div><div class='del'>-	.unblank = con3215_unblank,</div><div class='ctx'> 	.flags	 = CON_PRINTBUFFER,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -846,9 +852,6 @@ con3215_init(void)</div><div class='ctx'> 	cdev-&gt;handler = raw3215_irq;</div><div class='ctx'> </div><div class='ctx'> 	raw-&gt;flags |= RAW3215_FIXED;</div><div class='del'>-	tasklet_init(&amp;raw-&gt;tasklet,</div><div class='del'>-		     (void (*)(unsigned long)) raw3215_tasklet,</div><div class='del'>-		     (unsigned long) raw);</div><div class='ctx'> 	init_waitqueue_head(&amp;raw-&gt;empty_wait);</div><div class='ctx'> </div><div class='ctx'> 	/* Request the console irq */</div><div class='hunk'>@@ -859,6 +862,8 @@ con3215_init(void)</div><div class='ctx'> 		raw3215[0] = NULL;</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='add'>+	atomic_notifier_chain_register(&amp;panic_notifier_list, &amp;on_panic_nb);</div><div class='add'>+	register_reboot_notifier(&amp;on_reboot_nb);</div><div class='ctx'> 	register_console(&amp;con3215);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/s390/char/con3270.c b/drivers/s390/char/con3270.c<br/>index 3c07974886ed..d028d2ee83dd 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/char/con3270.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/s390/char/con3270.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/char/con3270.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/char/con3270.c</a></div><div class='hunk'>@@ -15,6 +15,7 @@</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/reboot.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/ccwdev.h&gt;</div><div class='ctx'> #include &lt;asm/cio.h&gt;</div><div class='hunk'>@@ -528,11 +529,11 @@ con3270_wait_write(struct con3270 *cp)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * panic() calls console_unblank before the system enters a</div><div class='del'>- * disabled, endless loop.</div><div class='add'>+ * panic() calls con3270_flush through a panic_notifier</div><div class='add'>+ * before the system enters a disabled, endless loop.</div><div class='ctx'>  */</div><div class='ctx'> static void</div><div class='del'>-con3270_unblank(void)</div><div class='add'>+con3270_flush(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct con3270 *cp;</div><div class='ctx'> 	unsigned long flags;</div><div class='hunk'>@@ -554,6 +555,23 @@ con3270_unblank(void)</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;cp-&gt;view.lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int con3270_notify(struct notifier_block *self,</div><div class='add'>+			  unsigned long event, void *data)</div><div class='add'>+{</div><div class='add'>+	con3270_flush();</div><div class='add'>+	return NOTIFY_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct notifier_block on_panic_nb = {</div><div class='add'>+	.notifier_call = con3270_notify,</div><div class='add'>+	.priority = 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct notifier_block on_reboot_nb = {</div><div class='add'>+	.notifier_call = con3270_notify,</div><div class='add'>+	.priority = 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  *  The console structure for the 3270 console</div><div class='ctx'>  */</div><div class='hunk'>@@ -561,7 +579,6 @@ static struct console con3270 = {</div><div class='ctx'> 	.name	 = "tty3270",</div><div class='ctx'> 	.write	 = con3270_write,</div><div class='ctx'> 	.device	 = con3270_device,</div><div class='del'>-	.unblank = con3270_unblank,</div><div class='ctx'> 	.flags	 = CON_PRINTBUFFER,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -623,6 +640,8 @@ con3270_init(void)</div><div class='ctx'> 	condev-&gt;cline-&gt;len = 0;</div><div class='ctx'> 	con3270_create_status(condev);</div><div class='ctx'> 	condev-&gt;input = alloc_string(&amp;condev-&gt;freemem, 80);</div><div class='add'>+	atomic_notifier_chain_register(&amp;panic_notifier_list, &amp;on_panic_nb);</div><div class='add'>+	register_reboot_notifier(&amp;on_reboot_nb);</div><div class='ctx'> 	register_console(&amp;con3270);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/s390/char/fs3270.c b/drivers/s390/char/fs3270.c<br/>index d18e6d2e0b49..40759c33477d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/char/fs3270.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/s390/char/fs3270.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/char/fs3270.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/char/fs3270.c</a></div><div class='hunk'>@@ -418,25 +418,22 @@ fs3270_open(struct inode *inode, struct file *filp)</div><div class='ctx'> {</div><div class='ctx'> 	struct fs3270 *fp;</div><div class='ctx'> 	struct idal_buffer *ib;</div><div class='del'>-	int minor, rc;</div><div class='add'>+	int minor, rc = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (imajor(filp-&gt;f_path.dentry-&gt;d_inode) != IBM_FS3270_MAJOR)</div><div class='ctx'> 		return -ENODEV;</div><div class='del'>-	lock_kernel();</div><div class='ctx'> 	minor = iminor(filp-&gt;f_path.dentry-&gt;d_inode);</div><div class='ctx'> 	/* Check for minor 0 multiplexer. */</div><div class='ctx'> 	if (minor == 0) {</div><div class='del'>-		struct tty_struct *tty;</div><div class='del'>-		mutex_lock(&amp;tty_mutex);</div><div class='del'>-		tty = get_current_tty();</div><div class='add'>+		struct tty_struct *tty = get_current_tty();</div><div class='ctx'> 		if (!tty || tty-&gt;driver-&gt;major != IBM_TTY3270_MAJOR) {</div><div class='del'>-			mutex_unlock(&amp;tty_mutex);</div><div class='del'>-			rc = -ENODEV;</div><div class='del'>-			goto out;</div><div class='add'>+			tty_kref_put(tty);</div><div class='add'>+			return -ENODEV;</div><div class='ctx'> 		}</div><div class='ctx'> 		minor = tty-&gt;index + RAW3270_FIRSTMINOR;</div><div class='del'>-		mutex_unlock(&amp;tty_mutex);</div><div class='add'>+		tty_kref_put(tty);</div><div class='ctx'> 	}</div><div class='add'>+	lock_kernel();</div><div class='ctx'> 	/* Check if some other program is already using fullscreen mode. */</div><div class='ctx'> 	fp = (struct fs3270 *) raw3270_find_view(&amp;fs3270_fn, minor);</div><div class='ctx'> 	if (!IS_ERR(fp)) {</div><div class='hunk'>@@ -478,7 +475,7 @@ fs3270_open(struct inode *inode, struct file *filp)</div><div class='ctx'> 	filp-&gt;private_data = fp;</div><div class='ctx'> out:</div><div class='ctx'> 	unlock_kernel();</div><div class='del'>-	return 0;</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/drivers/s390/char/raw3270.c b/drivers/s390/char/raw3270.c<br/>index c3dee900a5c8..0b15cf107ec9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/char/raw3270.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/s390/char/raw3270.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/char/raw3270.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/char/raw3270.c</a></div><div class='hunk'>@@ -1168,19 +1168,17 @@ static int raw3270_create_attributes(struct raw3270 *rp)</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	rp-&gt;clttydev = device_create_drvdata(class3270, &amp;rp-&gt;cdev-&gt;dev,</div><div class='del'>-					     MKDEV(IBM_TTY3270_MAJOR, rp-&gt;minor),</div><div class='del'>-					     NULL,</div><div class='del'>-					     "tty%s", rp-&gt;cdev-&gt;dev.bus_id);</div><div class='add'>+	rp-&gt;clttydev = device_create(class3270, &amp;rp-&gt;cdev-&gt;dev,</div><div class='add'>+				     MKDEV(IBM_TTY3270_MAJOR, rp-&gt;minor), NULL,</div><div class='add'>+				     "tty%s", dev_name(&amp;rp-&gt;cdev-&gt;dev));</div><div class='ctx'> 	if (IS_ERR(rp-&gt;clttydev)) {</div><div class='ctx'> 		rc = PTR_ERR(rp-&gt;clttydev);</div><div class='ctx'> 		goto out_ttydev;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rp-&gt;cltubdev = device_create_drvdata(class3270, &amp;rp-&gt;cdev-&gt;dev,</div><div class='del'>-					     MKDEV(IBM_FS3270_MAJOR, rp-&gt;minor),</div><div class='del'>-					     NULL,</div><div class='del'>-					     "tub%s", rp-&gt;cdev-&gt;dev.bus_id);</div><div class='add'>+	rp-&gt;cltubdev = device_create(class3270, &amp;rp-&gt;cdev-&gt;dev,</div><div class='add'>+				     MKDEV(IBM_FS3270_MAJOR, rp-&gt;minor), NULL,</div><div class='add'>+				     "tub%s", dev_name(&amp;rp-&gt;cdev-&gt;dev));</div><div class='ctx'> 	if (!IS_ERR(rp-&gt;cltubdev))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/s390/char/sclp_con.c b/drivers/s390/char/sclp_con.c<br/>index 7e619c534bf4..9a25c4bd1421 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/char/sclp_con.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/s390/char/sclp_con.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/char/sclp_con.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/char/sclp_con.c</a></div><div class='hunk'>@@ -16,6 +16,7 @@</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='ctx'> #include &lt;linux/termios.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/reboot.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "sclp.h"</div><div class='ctx'> #include "sclp_rw.h"</div><div class='hunk'>@@ -172,7 +173,7 @@ sclp_console_device(struct console *c, int *index)</div><div class='ctx'>  * will be flushed to the SCLP.</div><div class='ctx'>  */</div><div class='ctx'> static void</div><div class='del'>-sclp_console_unblank(void)</div><div class='add'>+sclp_console_flush(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='hunk'>@@ -188,6 +189,24 @@ sclp_console_unblank(void)</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;sclp_con_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int</div><div class='add'>+sclp_console_notify(struct notifier_block *self,</div><div class='add'>+			  unsigned long event, void *data)</div><div class='add'>+{</div><div class='add'>+	sclp_console_flush();</div><div class='add'>+	return NOTIFY_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct notifier_block on_panic_nb = {</div><div class='add'>+	.notifier_call = sclp_console_notify,</div><div class='add'>+	.priority = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct notifier_block on_reboot_nb = {</div><div class='add'>+	.notifier_call = sclp_console_notify,</div><div class='add'>+	.priority = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * used to register the SCLP console to the kernel and to</div><div class='ctx'>  * give printk necessary information</div><div class='hunk'>@@ -197,7 +216,6 @@ static struct console sclp_console =</div><div class='ctx'> 	.name = sclp_console_name,</div><div class='ctx'> 	.write = sclp_console_write,</div><div class='ctx'> 	.device = sclp_console_device,</div><div class='del'>-	.unblank = sclp_console_unblank,</div><div class='ctx'> 	.flags = CON_PRINTBUFFER,</div><div class='ctx'> 	.index = 0 /* ttyS0 */</div><div class='ctx'> };</div><div class='hunk'>@@ -241,6 +259,8 @@ sclp_console_init(void)</div><div class='ctx'> 	sclp_con_width_htab = 8;</div><div class='ctx'> </div><div class='ctx'> 	/* enable printk-access to this driver */</div><div class='add'>+	atomic_notifier_chain_register(&amp;panic_notifier_list, &amp;on_panic_nb);</div><div class='add'>+	register_reboot_notifier(&amp;on_reboot_nb);</div><div class='ctx'> 	register_console(&amp;sclp_console);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/s390/char/sclp_vt220.c b/drivers/s390/char/sclp_vt220.c<br/>index ad51738c4261..9854f19f5e62 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/char/sclp_vt220.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/s390/char/sclp_vt220.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/char/sclp_vt220.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/char/sclp_vt220.c</a></div><div class='hunk'>@@ -24,6 +24,8 @@</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/reboot.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include "sclp.h"</div><div class='ctx'> </div><div class='hunk'>@@ -743,24 +745,30 @@ sclp_vt220_con_device(struct console *c, int *index)</div><div class='ctx'> 	return sclp_vt220_driver;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * This routine is called from panic when the kernel is going to give up.</div><div class='del'>- * We have to make sure that all buffers will be flushed to the SCLP.</div><div class='del'>- * Note that this function may be called from within an interrupt context.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-sclp_vt220_con_unblank(void)</div><div class='add'>+static int</div><div class='add'>+sclp_vt220_notify(struct notifier_block *self,</div><div class='add'>+			  unsigned long event, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	__sclp_vt220_flush_buffer();</div><div class='add'>+	return NOTIFY_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct notifier_block on_panic_nb = {</div><div class='add'>+	.notifier_call = sclp_vt220_notify,</div><div class='add'>+	.priority = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct notifier_block on_reboot_nb = {</div><div class='add'>+	.notifier_call = sclp_vt220_notify,</div><div class='add'>+	.priority = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* Structure needed to register with printk */</div><div class='ctx'> static struct console sclp_vt220_console =</div><div class='ctx'> {</div><div class='ctx'> 	.name = SCLP_VT220_CONSOLE_NAME,</div><div class='ctx'> 	.write = sclp_vt220_con_write,</div><div class='ctx'> 	.device = sclp_vt220_con_device,</div><div class='del'>-	.unblank = sclp_vt220_con_unblank,</div><div class='ctx'> 	.flags = CON_PRINTBUFFER,</div><div class='ctx'> 	.index = SCLP_VT220_CONSOLE_INDEX</div><div class='ctx'> };</div><div class='hunk'>@@ -776,6 +784,8 @@ sclp_vt220_con_init(void)</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return rc;</div><div class='ctx'> 	/* Attach linux console */</div><div class='add'>+	atomic_notifier_chain_register(&amp;panic_notifier_list, &amp;on_panic_nb);</div><div class='add'>+	register_reboot_notifier(&amp;on_reboot_nb);</div><div class='ctx'> 	register_console(&amp;sclp_vt220_console);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/s390/char/tape_3590.c b/drivers/s390/char/tape_3590.c<br/>index 839987618ffd..4005c44a404c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/char/tape_3590.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/s390/char/tape_3590.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/char/tape_3590.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/char/tape_3590.c</a></div><div class='hunk'>@@ -910,7 +910,7 @@ tape_3590_erp_swap(struct tape_device *device, struct tape_request *request,</div><div class='ctx'> 	 * should proceed with the new tape... this</div><div class='ctx'> 	 * should probably be done in user space!</div><div class='ctx'> 	 */</div><div class='del'>-	PRINT_WARN("(%s): Swap Tape Device!\n", device-&gt;cdev-&gt;dev.bus_id);</div><div class='add'>+	PRINT_WARN("(%s): Swap Tape Device!\n", dev_name(&amp;device-&gt;cdev-&gt;dev));</div><div class='ctx'> 	return tape_3590_erp_basic(device, request, irb, -EIO);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1003,40 +1003,43 @@ tape_3590_print_mim_msg_f0(struct tape_device *device, struct irb *irb)</div><div class='ctx'> 	/* Exception Message */</div><div class='ctx'> 	switch (sense-&gt;fmt.f70.emc) {</div><div class='ctx'> 	case 0x02:</div><div class='del'>-		PRINT_WARN("(%s): Data degraded\n", device-&gt;cdev-&gt;dev.bus_id);</div><div class='add'>+		PRINT_WARN("(%s): Data degraded\n",</div><div class='add'>+			   dev_name(&amp;device-&gt;cdev-&gt;dev));</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x03:</div><div class='ctx'> 		PRINT_WARN("(%s): Data degraded in partion %i\n",</div><div class='del'>-			   device-&gt;cdev-&gt;dev.bus_id, sense-&gt;fmt.f70.mp);</div><div class='add'>+			   dev_name(&amp;device-&gt;cdev-&gt;dev), sense-&gt;fmt.f70.mp);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x04:</div><div class='del'>-		PRINT_WARN("(%s): Medium degraded\n", device-&gt;cdev-&gt;dev.bus_id);</div><div class='add'>+		PRINT_WARN("(%s): Medium degraded\n",</div><div class='add'>+			   dev_name(&amp;device-&gt;cdev-&gt;dev));</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x05:</div><div class='ctx'> 		PRINT_WARN("(%s): Medium degraded in partition %i\n",</div><div class='del'>-			   device-&gt;cdev-&gt;dev.bus_id, sense-&gt;fmt.f70.mp);</div><div class='add'>+			   dev_name(&amp;device-&gt;cdev-&gt;dev), sense-&gt;fmt.f70.mp);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x06:</div><div class='del'>-		PRINT_WARN("(%s): Block 0 Error\n", device-&gt;cdev-&gt;dev.bus_id);</div><div class='add'>+		PRINT_WARN("(%s): Block 0 Error\n",</div><div class='add'>+			   dev_name(&amp;device-&gt;cdev-&gt;dev));</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x07:</div><div class='ctx'> 		PRINT_WARN("(%s): Medium Exception 0x%02x\n",</div><div class='del'>-			   device-&gt;cdev-&gt;dev.bus_id, sense-&gt;fmt.f70.md);</div><div class='add'>+			   dev_name(&amp;device-&gt;cdev-&gt;dev), sense-&gt;fmt.f70.md);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		PRINT_WARN("(%s): MIM ExMsg: 0x%02x\n",</div><div class='del'>-			   device-&gt;cdev-&gt;dev.bus_id, sense-&gt;fmt.f70.emc);</div><div class='add'>+			   dev_name(&amp;device-&gt;cdev-&gt;dev), sense-&gt;fmt.f70.emc);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Service Message */</div><div class='ctx'> 	switch (sense-&gt;fmt.f70.smc) {</div><div class='ctx'> 	case 0x02:</div><div class='ctx'> 		PRINT_WARN("(%s): Reference Media maintenance procedure %i\n",</div><div class='del'>-			   device-&gt;cdev-&gt;dev.bus_id, sense-&gt;fmt.f70.md);</div><div class='add'>+			   dev_name(&amp;device-&gt;cdev-&gt;dev), sense-&gt;fmt.f70.md);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		PRINT_WARN("(%s): MIM ServiceMsg: 0x%02x\n",</div><div class='del'>-			   device-&gt;cdev-&gt;dev.bus_id, sense-&gt;fmt.f70.smc);</div><div class='add'>+			   dev_name(&amp;device-&gt;cdev-&gt;dev), sense-&gt;fmt.f70.smc);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -1054,101 +1057,101 @@ tape_3590_print_io_sim_msg_f1(struct tape_device *device, struct irb *irb)</div><div class='ctx'> 	switch (sense-&gt;fmt.f71.emc) {</div><div class='ctx'> 	case 0x01:</div><div class='ctx'> 		PRINT_WARN("(%s): Effect of failure is unknown\n",</div><div class='del'>-			   device-&gt;cdev-&gt;dev.bus_id);</div><div class='add'>+			   dev_name(&amp;device-&gt;cdev-&gt;dev));</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x02:</div><div class='ctx'> 		PRINT_WARN("(%s): CU Exception - no performance impact\n",</div><div class='del'>-			   device-&gt;cdev-&gt;dev.bus_id);</div><div class='add'>+			   dev_name(&amp;device-&gt;cdev-&gt;dev));</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x03:</div><div class='ctx'> 		PRINT_WARN("(%s): CU Exception on channel interface 0x%02x\n",</div><div class='del'>-			   device-&gt;cdev-&gt;dev.bus_id, sense-&gt;fmt.f71.md[0]);</div><div class='add'>+			   dev_name(&amp;device-&gt;cdev-&gt;dev), sense-&gt;fmt.f71.md[0]);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x04:</div><div class='ctx'> 		PRINT_WARN("(%s): CU Exception on device path 0x%02x\n",</div><div class='del'>-			   device-&gt;cdev-&gt;dev.bus_id, sense-&gt;fmt.f71.md[0]);</div><div class='add'>+			   dev_name(&amp;device-&gt;cdev-&gt;dev), sense-&gt;fmt.f71.md[0]);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x05:</div><div class='ctx'> 		PRINT_WARN("(%s): CU Exception on library path 0x%02x\n",</div><div class='del'>-			   device-&gt;cdev-&gt;dev.bus_id, sense-&gt;fmt.f71.md[0]);</div><div class='add'>+			   dev_name(&amp;device-&gt;cdev-&gt;dev), sense-&gt;fmt.f71.md[0]);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x06:</div><div class='ctx'> 		PRINT_WARN("(%s): CU Exception on node 0x%02x\n",</div><div class='del'>-			   device-&gt;cdev-&gt;dev.bus_id, sense-&gt;fmt.f71.md[0]);</div><div class='add'>+			   dev_name(&amp;device-&gt;cdev-&gt;dev), sense-&gt;fmt.f71.md[0]);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x07:</div><div class='ctx'> 		PRINT_WARN("(%s): CU Exception on partition 0x%02x\n",</div><div class='del'>-			   device-&gt;cdev-&gt;dev.bus_id, sense-&gt;fmt.f71.md[0]);</div><div class='add'>+			   dev_name(&amp;device-&gt;cdev-&gt;dev), sense-&gt;fmt.f71.md[0]);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		PRINT_WARN("(%s): SIM ExMsg: 0x%02x\n",</div><div class='del'>-			   device-&gt;cdev-&gt;dev.bus_id, sense-&gt;fmt.f71.emc);</div><div class='add'>+			   dev_name(&amp;device-&gt;cdev-&gt;dev), sense-&gt;fmt.f71.emc);</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Service Message */</div><div class='ctx'> 	switch (sense-&gt;fmt.f71.smc) {</div><div class='ctx'> 	case 0x01:</div><div class='ctx'> 		PRINT_WARN("(%s): Repair impact is unknown\n",</div><div class='del'>-			   device-&gt;cdev-&gt;dev.bus_id);</div><div class='add'>+			   dev_name(&amp;device-&gt;cdev-&gt;dev));</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x02:</div><div class='ctx'> 		PRINT_WARN("(%s): Repair will not impact cu performance\n",</div><div class='del'>-			   device-&gt;cdev-&gt;dev.bus_id);</div><div class='add'>+			   dev_name(&amp;device-&gt;cdev-&gt;dev));</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x03:</div><div class='ctx'> 		if (sense-&gt;fmt.f71.mdf == 0)</div><div class='ctx'> 			PRINT_WARN("(%s): Repair will disable node "</div><div class='ctx'> 				   "0x%x on CU\n",</div><div class='del'>-				   device-&gt;cdev-&gt;dev.bus_id,</div><div class='add'>+				   dev_name(&amp;device-&gt;cdev-&gt;dev),</div><div class='ctx'> 				   sense-&gt;fmt.f71.md[1]);</div><div class='ctx'> 		else</div><div class='ctx'> 			PRINT_WARN("(%s): Repair will disable nodes "</div><div class='ctx'> 				   "(0x%x-0x%x) on CU\n",</div><div class='del'>-				   device-&gt;cdev-&gt;dev.bus_id,</div><div class='add'>+				   dev_name(&amp;device-&gt;cdev-&gt;dev),</div><div class='ctx'> 				   sense-&gt;fmt.f71.md[1], sense-&gt;fmt.f71.md[2]);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x04:</div><div class='ctx'> 		if (sense-&gt;fmt.f71.mdf == 0)</div><div class='ctx'> 			PRINT_WARN("(%s): Repair will disable cannel path "</div><div class='ctx'> 				   "0x%x on CU\n",</div><div class='del'>-				   device-&gt;cdev-&gt;dev.bus_id,</div><div class='add'>+				   dev_name(&amp;device-&gt;cdev-&gt;dev),</div><div class='ctx'> 				   sense-&gt;fmt.f71.md[1]);</div><div class='ctx'> 		else</div><div class='ctx'> 			PRINT_WARN("(%s): Repair will disable cannel paths "</div><div class='ctx'> 				   "(0x%x-0x%x) on CU\n",</div><div class='del'>-				   device-&gt;cdev-&gt;dev.bus_id,</div><div class='add'>+				   dev_name(&amp;device-&gt;cdev-&gt;dev),</div><div class='ctx'> 				   sense-&gt;fmt.f71.md[1], sense-&gt;fmt.f71.md[2]);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x05:</div><div class='ctx'> 		if (sense-&gt;fmt.f71.mdf == 0)</div><div class='ctx'> 			PRINT_WARN("(%s): Repair will disable device path "</div><div class='ctx'> 				   "0x%x on CU\n",</div><div class='del'>-				   device-&gt;cdev-&gt;dev.bus_id,</div><div class='add'>+				   dev_name(&amp;device-&gt;cdev-&gt;dev),</div><div class='ctx'> 				   sense-&gt;fmt.f71.md[1]);</div><div class='ctx'> 		else</div><div class='ctx'> 			PRINT_WARN("(%s): Repair will disable device paths "</div><div class='ctx'> 				   "(0x%x-0x%x) on CU\n",</div><div class='del'>-				   device-&gt;cdev-&gt;dev.bus_id,</div><div class='add'>+				   dev_name(&amp;device-&gt;cdev-&gt;dev),</div><div class='ctx'> 				   sense-&gt;fmt.f71.md[1], sense-&gt;fmt.f71.md[2]);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x06:</div><div class='ctx'> 		if (sense-&gt;fmt.f71.mdf == 0)</div><div class='ctx'> 			PRINT_WARN("(%s): Repair will disable library path "</div><div class='ctx'> 				   "0x%x on CU\n",</div><div class='del'>-				   device-&gt;cdev-&gt;dev.bus_id,</div><div class='add'>+				   dev_name(&amp;device-&gt;cdev-&gt;dev),</div><div class='ctx'> 				   sense-&gt;fmt.f71.md[1]);</div><div class='ctx'> 		else</div><div class='ctx'> 			PRINT_WARN("(%s): Repair will disable library paths "</div><div class='ctx'> 				   "(0x%x-0x%x) on CU\n",</div><div class='del'>-				   device-&gt;cdev-&gt;dev.bus_id,</div><div class='add'>+				   dev_name(&amp;device-&gt;cdev-&gt;dev),</div><div class='ctx'> 				   sense-&gt;fmt.f71.md[1], sense-&gt;fmt.f71.md[2]);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x07:</div><div class='ctx'> 		PRINT_WARN("(%s): Repair will disable access to CU\n",</div><div class='del'>-			   device-&gt;cdev-&gt;dev.bus_id);</div><div class='add'>+			   dev_name(&amp;device-&gt;cdev-&gt;dev));</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		PRINT_WARN("(%s): SIM ServiceMsg: 0x%02x\n",</div><div class='del'>-			   device-&gt;cdev-&gt;dev.bus_id, sense-&gt;fmt.f71.smc);</div><div class='add'>+			   dev_name(&amp;device-&gt;cdev-&gt;dev), sense-&gt;fmt.f71.smc);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1165,104 +1168,104 @@ tape_3590_print_dev_sim_msg_f2(struct tape_device *device, struct irb *irb)</div><div class='ctx'> 	switch (sense-&gt;fmt.f71.emc) {</div><div class='ctx'> 	case 0x01:</div><div class='ctx'> 		PRINT_WARN("(%s): Effect of failure is unknown\n",</div><div class='del'>-			   device-&gt;cdev-&gt;dev.bus_id);</div><div class='add'>+			   dev_name(&amp;device-&gt;cdev-&gt;dev));</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x02:</div><div class='ctx'> 		PRINT_WARN("(%s): DV Exception - no performance impact\n",</div><div class='del'>-			   device-&gt;cdev-&gt;dev.bus_id);</div><div class='add'>+			   dev_name(&amp;device-&gt;cdev-&gt;dev));</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x03:</div><div class='ctx'> 		PRINT_WARN("(%s): DV Exception on channel interface 0x%02x\n",</div><div class='del'>-			   device-&gt;cdev-&gt;dev.bus_id, sense-&gt;fmt.f71.md[0]);</div><div class='add'>+			   dev_name(&amp;device-&gt;cdev-&gt;dev), sense-&gt;fmt.f71.md[0]);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x04:</div><div class='ctx'> 		PRINT_WARN("(%s): DV Exception on loader 0x%02x\n",</div><div class='del'>-			   device-&gt;cdev-&gt;dev.bus_id, sense-&gt;fmt.f71.md[0]);</div><div class='add'>+			   dev_name(&amp;device-&gt;cdev-&gt;dev), sense-&gt;fmt.f71.md[0]);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x05:</div><div class='ctx'> 		PRINT_WARN("(%s): DV Exception on message display 0x%02x\n",</div><div class='del'>-			   device-&gt;cdev-&gt;dev.bus_id, sense-&gt;fmt.f71.md[0]);</div><div class='add'>+			   dev_name(&amp;device-&gt;cdev-&gt;dev), sense-&gt;fmt.f71.md[0]);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x06:</div><div class='ctx'> 		PRINT_WARN("(%s): DV Exception in tape path\n",</div><div class='del'>-			   device-&gt;cdev-&gt;dev.bus_id);</div><div class='add'>+			   dev_name(&amp;device-&gt;cdev-&gt;dev));</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x07:</div><div class='ctx'> 		PRINT_WARN("(%s): DV Exception in drive\n",</div><div class='del'>-			   device-&gt;cdev-&gt;dev.bus_id);</div><div class='add'>+			   dev_name(&amp;device-&gt;cdev-&gt;dev));</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		PRINT_WARN("(%s): DSIM ExMsg: 0x%02x\n",</div><div class='del'>-			   device-&gt;cdev-&gt;dev.bus_id, sense-&gt;fmt.f71.emc);</div><div class='add'>+			   dev_name(&amp;device-&gt;cdev-&gt;dev), sense-&gt;fmt.f71.emc);</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Service Message */</div><div class='ctx'> 	switch (sense-&gt;fmt.f71.smc) {</div><div class='ctx'> 	case 0x01:</div><div class='ctx'> 		PRINT_WARN("(%s): Repair impact is unknown\n",</div><div class='del'>-			   device-&gt;cdev-&gt;dev.bus_id);</div><div class='add'>+			   dev_name(&amp;device-&gt;cdev-&gt;dev));</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x02:</div><div class='ctx'> 		PRINT_WARN("(%s): Repair will not impact device performance\n",</div><div class='del'>-			   device-&gt;cdev-&gt;dev.bus_id);</div><div class='add'>+			   dev_name(&amp;device-&gt;cdev-&gt;dev));</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x03:</div><div class='ctx'> 		if (sense-&gt;fmt.f71.mdf == 0)</div><div class='ctx'> 			PRINT_WARN("(%s): Repair will disable channel path "</div><div class='ctx'> 				   "0x%x on DV\n",</div><div class='del'>-				   device-&gt;cdev-&gt;dev.bus_id,</div><div class='add'>+				   dev_name(&amp;device-&gt;cdev-&gt;dev),</div><div class='ctx'> 				   sense-&gt;fmt.f71.md[1]);</div><div class='ctx'> 		else</div><div class='ctx'> 			PRINT_WARN("(%s): Repair will disable channel path "</div><div class='ctx'> 				   "(0x%x-0x%x) on DV\n",</div><div class='del'>-				   device-&gt;cdev-&gt;dev.bus_id,</div><div class='add'>+				   dev_name(&amp;device-&gt;cdev-&gt;dev),</div><div class='ctx'> 				   sense-&gt;fmt.f71.md[1], sense-&gt;fmt.f71.md[2]);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x04:</div><div class='ctx'> 		if (sense-&gt;fmt.f71.mdf == 0)</div><div class='ctx'> 			PRINT_WARN("(%s): Repair will disable interface 0x%x "</div><div class='ctx'> 				   "on DV\n",</div><div class='del'>-				   device-&gt;cdev-&gt;dev.bus_id,</div><div class='add'>+				   dev_name(&amp;device-&gt;cdev-&gt;dev),</div><div class='ctx'> 				   sense-&gt;fmt.f71.md[1]);</div><div class='ctx'> 		else</div><div class='ctx'> 			PRINT_WARN("(%s): Repair will disable interfaces "</div><div class='ctx'> 				   "(0x%x-0x%x) on DV\n",</div><div class='del'>-				   device-&gt;cdev-&gt;dev.bus_id,</div><div class='add'>+				   dev_name(&amp;device-&gt;cdev-&gt;dev),</div><div class='ctx'> 				   sense-&gt;fmt.f71.md[1], sense-&gt;fmt.f71.md[2]);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x05:</div><div class='ctx'> 		if (sense-&gt;fmt.f71.mdf == 0)</div><div class='ctx'> 			PRINT_WARN("(%s): Repair will disable loader 0x%x "</div><div class='ctx'> 				   "on DV\n",</div><div class='del'>-				   device-&gt;cdev-&gt;dev.bus_id,</div><div class='add'>+				   dev_name(&amp;device-&gt;cdev-&gt;dev),</div><div class='ctx'> 				   sense-&gt;fmt.f71.md[1]);</div><div class='ctx'> 		else</div><div class='ctx'> 			PRINT_WARN("(%s): Repair will disable loader "</div><div class='ctx'> 				   "(0x%x-0x%x) on DV\n",</div><div class='del'>-				   device-&gt;cdev-&gt;dev.bus_id,</div><div class='add'>+				   dev_name(&amp;device-&gt;cdev-&gt;dev),</div><div class='ctx'> 				   sense-&gt;fmt.f71.md[1], sense-&gt;fmt.f71.md[2]);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x07:</div><div class='ctx'> 		PRINT_WARN("(%s): Repair will disable access to DV\n",</div><div class='del'>-			   device-&gt;cdev-&gt;dev.bus_id);</div><div class='add'>+			   dev_name(&amp;device-&gt;cdev-&gt;dev));</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x08:</div><div class='ctx'> 		if (sense-&gt;fmt.f71.mdf == 0)</div><div class='ctx'> 			PRINT_WARN("(%s): Repair will disable message "</div><div class='ctx'> 				   "display 0x%x on DV\n",</div><div class='del'>-				   device-&gt;cdev-&gt;dev.bus_id,</div><div class='add'>+				   dev_name(&amp;device-&gt;cdev-&gt;dev),</div><div class='ctx'> 				   sense-&gt;fmt.f71.md[1]);</div><div class='ctx'> 		else</div><div class='ctx'> 			PRINT_WARN("(%s): Repair will disable message "</div><div class='ctx'> 				   "displays (0x%x-0x%x) on DV\n",</div><div class='del'>-				   device-&gt;cdev-&gt;dev.bus_id,</div><div class='add'>+				   dev_name(&amp;device-&gt;cdev-&gt;dev),</div><div class='ctx'> 				   sense-&gt;fmt.f71.md[1], sense-&gt;fmt.f71.md[2]);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x09:</div><div class='del'>-		PRINT_WARN("(%s): Clean DV\n", device-&gt;cdev-&gt;dev.bus_id);</div><div class='add'>+		PRINT_WARN("(%s): Clean DV\n", dev_name(&amp;device-&gt;cdev-&gt;dev));</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		PRINT_WARN("(%s): DSIM ServiceMsg: 0x%02x\n",</div><div class='del'>-			   device-&gt;cdev-&gt;dev.bus_id, sense-&gt;fmt.f71.smc);</div><div class='add'>+			   dev_name(&amp;device-&gt;cdev-&gt;dev), sense-&gt;fmt.f71.smc);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1279,18 +1282,18 @@ tape_3590_print_era_msg(struct tape_device *device, struct irb *irb)</div><div class='ctx'> 		return;</div><div class='ctx'> 	if ((sense-&gt;mc &gt; 0) &amp;&amp; (sense-&gt;mc &lt; TAPE_3590_MAX_MSG)) {</div><div class='ctx'> 		if (tape_3590_msg[sense-&gt;mc] != NULL)</div><div class='del'>-			PRINT_WARN("(%s): %s\n", device-&gt;cdev-&gt;dev.bus_id,</div><div class='add'>+			PRINT_WARN("(%s): %s\n", dev_name(&amp;device-&gt;cdev-&gt;dev),</div><div class='ctx'> 				   tape_3590_msg[sense-&gt;mc]);</div><div class='ctx'> 		else {</div><div class='ctx'> 			PRINT_WARN("(%s): Message Code 0x%x\n",</div><div class='del'>-				   device-&gt;cdev-&gt;dev.bus_id, sense-&gt;mc);</div><div class='add'>+				   dev_name(&amp;device-&gt;cdev-&gt;dev), sense-&gt;mc);</div><div class='ctx'> 		}</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (sense-&gt;mc == 0xf0) {</div><div class='ctx'> 		/* Standard Media Information Message */</div><div class='ctx'> 		PRINT_WARN("(%s): MIM SEV=%i, MC=%02x, ES=%x/%x, "</div><div class='del'>-			   "RC=%02x-%04x-%02x\n", device-&gt;cdev-&gt;dev.bus_id,</div><div class='add'>+			   "RC=%02x-%04x-%02x\n", dev_name(&amp;device-&gt;cdev-&gt;dev),</div><div class='ctx'> 			   sense-&gt;fmt.f70.sev, sense-&gt;mc,</div><div class='ctx'> 			   sense-&gt;fmt.f70.emc, sense-&gt;fmt.f70.smc,</div><div class='ctx'> 			   sense-&gt;fmt.f70.refcode, sense-&gt;fmt.f70.mid,</div><div class='hunk'>@@ -1302,7 +1305,7 @@ tape_3590_print_era_msg(struct tape_device *device, struct irb *irb)</div><div class='ctx'> 		/* Standard I/O Subsystem Service Information Message */</div><div class='ctx'> 		PRINT_WARN("(%s): IOSIM SEV=%i, DEVTYPE=3590/%02x, "</div><div class='ctx'> 			   "MC=%02x, ES=%x/%x, REF=0x%04x-0x%04x-0x%04x\n",</div><div class='del'>-			   device-&gt;cdev-&gt;dev.bus_id, sense-&gt;fmt.f71.sev,</div><div class='add'>+			   dev_name(&amp;device-&gt;cdev-&gt;dev), sense-&gt;fmt.f71.sev,</div><div class='ctx'> 			   device-&gt;cdev-&gt;id.dev_model,</div><div class='ctx'> 			   sense-&gt;mc, sense-&gt;fmt.f71.emc,</div><div class='ctx'> 			   sense-&gt;fmt.f71.smc, sense-&gt;fmt.f71.refcode1,</div><div class='hunk'>@@ -1314,7 +1317,7 @@ tape_3590_print_era_msg(struct tape_device *device, struct irb *irb)</div><div class='ctx'> 		/* Standard Device Service Information Message */</div><div class='ctx'> 		PRINT_WARN("(%s): DEVSIM SEV=%i, DEVTYPE=3590/%02x, "</div><div class='ctx'> 			   "MC=%02x, ES=%x/%x, REF=0x%04x-0x%04x-0x%04x\n",</div><div class='del'>-			   device-&gt;cdev-&gt;dev.bus_id, sense-&gt;fmt.f71.sev,</div><div class='add'>+			   dev_name(&amp;device-&gt;cdev-&gt;dev), sense-&gt;fmt.f71.sev,</div><div class='ctx'> 			   device-&gt;cdev-&gt;id.dev_model,</div><div class='ctx'> 			   sense-&gt;mc, sense-&gt;fmt.f71.emc,</div><div class='ctx'> 			   sense-&gt;fmt.f71.smc, sense-&gt;fmt.f71.refcode1,</div><div class='hunk'>@@ -1327,7 +1330,7 @@ tape_3590_print_era_msg(struct tape_device *device, struct irb *irb)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	PRINT_WARN("(%s): Device Message(%x)\n",</div><div class='del'>-		   device-&gt;cdev-&gt;dev.bus_id, sense-&gt;mc);</div><div class='add'>+		   dev_name(&amp;device-&gt;cdev-&gt;dev), sense-&gt;mc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int tape_3590_crypt_error(struct tape_device *device,</div><div class='hunk'>@@ -1336,10 +1339,11 @@ static int tape_3590_crypt_error(struct tape_device *device,</div><div class='ctx'> 	u8 cu_rc, ekm_rc1;</div><div class='ctx'> 	u16 ekm_rc2;</div><div class='ctx'> 	u32 drv_rc;</div><div class='del'>-	char *bus_id, *sense;</div><div class='add'>+	const char *bus_id;</div><div class='add'>+	char *sense;</div><div class='ctx'> </div><div class='ctx'> 	sense = ((struct tape_3590_sense *) irb-&gt;ecw)-&gt;fmt.data;</div><div class='del'>-	bus_id = device-&gt;cdev-&gt;dev.bus_id;</div><div class='add'>+	bus_id = dev_name(&amp;device-&gt;cdev-&gt;dev);</div><div class='ctx'> 	cu_rc = sense[0];</div><div class='ctx'> 	drv_rc = *((u32*) &amp;sense[5]) &amp; 0xffffff;</div><div class='ctx'> 	ekm_rc1 = sense[9];</div><div class='hunk'>@@ -1440,7 +1444,7 @@ tape_3590_unit_check(struct tape_device *device, struct tape_request *request,</div><div class='ctx'> 		 * "device intervention" is not very meaningfull</div><div class='ctx'> 		 */</div><div class='ctx'> 		PRINT_WARN("(%s): Tape operation when medium not loaded\n",</div><div class='del'>-			   device-&gt;cdev-&gt;dev.bus_id);</div><div class='add'>+			   dev_name(&amp;device-&gt;cdev-&gt;dev));</div><div class='ctx'> 		tape_med_state_set(device, MS_UNLOADED);</div><div class='ctx'> 		tape_3590_schedule_work(device, TO_CRYPT_OFF);</div><div class='ctx'> 		return tape_3590_erp_basic(device, request, irb, -ENOMEDIUM);</div><div class='hunk'>@@ -1487,18 +1491,18 @@ tape_3590_unit_check(struct tape_device *device, struct tape_request *request,</div><div class='ctx'> </div><div class='ctx'> 	case 0x6020:</div><div class='ctx'> 		PRINT_WARN("(%s): Cartridge of wrong type ?\n",</div><div class='del'>-			   device-&gt;cdev-&gt;dev.bus_id);</div><div class='add'>+			   dev_name(&amp;device-&gt;cdev-&gt;dev));</div><div class='ctx'> 		return tape_3590_erp_basic(device, request, irb, -EMEDIUMTYPE);</div><div class='ctx'> </div><div class='ctx'> 	case 0x8011:</div><div class='ctx'> 		PRINT_WARN("(%s): Another host has reserved the tape device\n",</div><div class='del'>-			   device-&gt;cdev-&gt;dev.bus_id);</div><div class='add'>+			   dev_name(&amp;device-&gt;cdev-&gt;dev));</div><div class='ctx'> 		return tape_3590_erp_basic(device, request, irb, -EPERM);</div><div class='ctx'> 	case 0x8013:</div><div class='ctx'> 		PRINT_WARN("(%s): Another host has privileged access to the "</div><div class='del'>-			   "tape device\n", device-&gt;cdev-&gt;dev.bus_id);</div><div class='add'>+			   "tape device\n", dev_name(&amp;device-&gt;cdev-&gt;dev));</div><div class='ctx'> 		PRINT_WARN("(%s): To solve the problem unload the current "</div><div class='del'>-			   "cartridge!\n", device-&gt;cdev-&gt;dev.bus_id);</div><div class='add'>+			   "cartridge!\n", dev_name(&amp;device-&gt;cdev-&gt;dev));</div><div class='ctx'> 		return tape_3590_erp_basic(device, request, irb, -EPERM);</div><div class='ctx'> 	default:</div><div class='ctx'> 		return tape_3590_erp_basic(device, request, irb, -EIO);</div><div class='head'>diff --git a/drivers/s390/char/tape_block.c b/drivers/s390/char/tape_block.c<br/>index 95da72bc17e8..a25b8bf54f41 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/char/tape_block.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/s390/char/tape_block.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/char/tape_block.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/char/tape_block.c</a></div><div class='hunk'>@@ -278,7 +278,7 @@ tapeblock_cleanup_device(struct tape_device *device)</div><div class='ctx'> </div><div class='ctx'> 	if (!device-&gt;blk_data.disk) {</div><div class='ctx'> 		PRINT_ERR("(%s): No gendisk to clean up!\n",</div><div class='del'>-			device-&gt;cdev-&gt;dev.bus_id);</div><div class='add'>+			dev_name(&amp;device-&gt;cdev-&gt;dev));</div><div class='ctx'> 		goto cleanup_queue;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/s390/char/tape_class.c b/drivers/s390/char/tape_class.c<br/>index 12c2a5aaf31b..ddc914ccea8f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/char/tape_class.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/s390/char/tape_class.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/char/tape_class.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/char/tape_class.c</a></div><div class='hunk'>@@ -69,9 +69,9 @@ struct tape_class_device *register_tape_dev(</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto fail_with_cdev;</div><div class='ctx'> </div><div class='del'>-	tcd-&gt;class_device = device_create_drvdata(tape_class, device,</div><div class='del'>-						  tcd-&gt;char_device-&gt;dev,</div><div class='del'>-						  NULL, "%s", tcd-&gt;device_name);</div><div class='add'>+	tcd-&gt;class_device = device_create(tape_class, device,</div><div class='add'>+					  tcd-&gt;char_device-&gt;dev, NULL,</div><div class='add'>+					  "%s", tcd-&gt;device_name);</div><div class='ctx'> 	rc = IS_ERR(tcd-&gt;class_device) ? PTR_ERR(tcd-&gt;class_device) : 0;</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto fail_with_cdev;</div><div class='head'>diff --git a/drivers/s390/char/tape_core.c b/drivers/s390/char/tape_core.c<br/>index 181a5441af16..d7073dbf825c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/char/tape_core.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/s390/char/tape_core.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/char/tape_core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/char/tape_core.c</a></div><div class='hunk'>@@ -215,12 +215,12 @@ tape_med_state_set(struct tape_device *device, enum tape_medium_state newstate)</div><div class='ctx'> 	case MS_UNLOADED:</div><div class='ctx'> 		device-&gt;tape_generic_status |= GMT_DR_OPEN(~0);</div><div class='ctx'> 		PRINT_INFO("(%s): Tape is unloaded\n",</div><div class='del'>-			   device-&gt;cdev-&gt;dev.bus_id);</div><div class='add'>+			   dev_name(&amp;device-&gt;cdev-&gt;dev));</div><div class='ctx'> 		break;</div><div class='ctx'> 	case MS_LOADED:</div><div class='ctx'> 		device-&gt;tape_generic_status &amp;= ~GMT_DR_OPEN(~0);</div><div class='ctx'> 		PRINT_INFO("(%s): Tape has been mounted\n",</div><div class='del'>-			   device-&gt;cdev-&gt;dev.bus_id);</div><div class='add'>+			   dev_name(&amp;device-&gt;cdev-&gt;dev));</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		// print nothing</div><div class='hunk'>@@ -415,7 +415,7 @@ tape_generic_offline(struct tape_device *device)</div><div class='ctx'> 				device-&gt;cdev_id);</div><div class='ctx'> 			PRINT_WARN("(%s): Set offline failed "</div><div class='ctx'> 				"- drive in use.\n",</div><div class='del'>-				device-&gt;cdev-&gt;dev.bus_id);</div><div class='add'>+				dev_name(&amp;device-&gt;cdev-&gt;dev));</div><div class='ctx'> 			spin_unlock_irq(get_ccwdev_lock(device-&gt;cdev));</div><div class='ctx'> 			return -EBUSY;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -538,7 +538,8 @@ tape_generic_probe(struct ccw_device *cdev)</div><div class='ctx'> 	ret = sysfs_create_group(&amp;cdev-&gt;dev.kobj, &amp;tape_attr_group);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		tape_put_device(device);</div><div class='del'>-		PRINT_ERR("probe failed for tape device %s\n", cdev-&gt;dev.bus_id);</div><div class='add'>+		PRINT_ERR("probe failed for tape device %s\n",</div><div class='add'>+			  dev_name(&amp;cdev-&gt;dev));</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> 	cdev-&gt;dev.driver_data = device;</div><div class='hunk'>@@ -546,7 +547,7 @@ tape_generic_probe(struct ccw_device *cdev)</div><div class='ctx'> 	device-&gt;cdev = cdev;</div><div class='ctx'> 	ccw_device_get_id(cdev, &amp;dev_id);</div><div class='ctx'> 	device-&gt;cdev_id = devid_to_int(&amp;dev_id);</div><div class='del'>-	PRINT_INFO("tape device %s found\n", cdev-&gt;dev.bus_id);</div><div class='add'>+	PRINT_INFO("tape device %s found\n", dev_name(&amp;cdev-&gt;dev));</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -616,7 +617,7 @@ tape_generic_remove(struct ccw_device *cdev)</div><div class='ctx'> 				device-&gt;cdev_id);</div><div class='ctx'> 			PRINT_WARN("(%s): Drive in use vanished - "</div><div class='ctx'> 				"expect trouble!\n",</div><div class='del'>-				device-&gt;cdev-&gt;dev.bus_id);</div><div class='add'>+				dev_name(&amp;device-&gt;cdev-&gt;dev));</div><div class='ctx'> 			PRINT_WARN("State was %i\n", device-&gt;tape_state);</div><div class='ctx'> 			tape_state_set(device, TS_NOT_OPER);</div><div class='ctx'> 			__tape_discard_requests(device);</div><div class='hunk'>@@ -840,7 +841,7 @@ tape_dump_sense(struct tape_device* device, struct tape_request *request,</div><div class='ctx'> 	PRINT_INFO("-------------------------------------------------\n");</div><div class='ctx'> 	PRINT_INFO("DSTAT : %02x  CSTAT: %02x	CPA: %04x\n",</div><div class='ctx'> 		   irb-&gt;scsw.cmd.dstat, irb-&gt;scsw.cmd.cstat, irb-&gt;scsw.cmd.cpa);</div><div class='del'>-	PRINT_INFO("DEVICE: %s\n", device-&gt;cdev-&gt;dev.bus_id);</div><div class='add'>+	PRINT_INFO("DEVICE: %s\n", dev_name(&amp;device-&gt;cdev-&gt;dev));</div><div class='ctx'> 	if (request != NULL)</div><div class='ctx'> 		PRINT_INFO("OP	  : %s\n", tape_op_verbose[request-&gt;op]);</div><div class='ctx'> </div><div class='hunk'>@@ -1051,7 +1052,7 @@ __tape_do_irq (struct ccw_device *cdev, unsigned long intparm, struct irb *irb)</div><div class='ctx'> 	device = (struct tape_device *) cdev-&gt;dev.driver_data;</div><div class='ctx'> 	if (device == NULL) {</div><div class='ctx'> 		PRINT_ERR("could not get device structure for %s "</div><div class='del'>-			  "in interrupt\n", cdev-&gt;dev.bus_id);</div><div class='add'>+			  "in interrupt\n", dev_name(&amp;cdev-&gt;dev));</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	request = (struct tape_request *) intparm;</div><div class='hunk'>@@ -1064,13 +1065,13 @@ __tape_do_irq (struct ccw_device *cdev, unsigned long intparm, struct irb *irb)</div><div class='ctx'> 		switch (PTR_ERR(irb)) {</div><div class='ctx'> 			case -ETIMEDOUT:</div><div class='ctx'> 				PRINT_WARN("(%s): Request timed out\n",</div><div class='del'>-					cdev-&gt;dev.bus_id);</div><div class='add'>+					dev_name(&amp;cdev-&gt;dev));</div><div class='ctx'> 			case -EIO:</div><div class='ctx'> 				__tape_end_request(device, request, -EIO);</div><div class='ctx'> 				break;</div><div class='ctx'> 			default:</div><div class='ctx'> 				PRINT_ERR("(%s): Unexpected i/o error %li\n",</div><div class='del'>-					cdev-&gt;dev.bus_id,</div><div class='add'>+					dev_name(&amp;cdev-&gt;dev),</div><div class='ctx'> 					PTR_ERR(irb));</div><div class='ctx'> 		}</div><div class='ctx'> 		return;</div><div class='head'>diff --git a/drivers/s390/char/tape_proc.c b/drivers/s390/char/tape_proc.c<br/>index e7c888c14e71..8a376af926a7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/char/tape_proc.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/s390/char/tape_proc.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/char/tape_proc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/char/tape_proc.c</a></div><div class='hunk'>@@ -52,7 +52,7 @@ static int tape_proc_show(struct seq_file *m, void *v)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	spin_lock_irq(get_ccwdev_lock(device-&gt;cdev));</div><div class='ctx'> 	seq_printf(m, "%d\t", (int) n);</div><div class='del'>-	seq_printf(m, "%-10.10s ", device-&gt;cdev-&gt;dev.bus_id);</div><div class='add'>+	seq_printf(m, "%-10.10s ", dev_name(&amp;device-&gt;cdev-&gt;dev));</div><div class='ctx'> 	seq_printf(m, "%04X/", device-&gt;cdev-&gt;id.cu_type);</div><div class='ctx'> 	seq_printf(m, "%02X\t", device-&gt;cdev-&gt;id.cu_model);</div><div class='ctx'> 	seq_printf(m, "%04X/", device-&gt;cdev-&gt;id.dev_type);</div><div class='head'>diff --git a/drivers/s390/char/tape_std.c b/drivers/s390/char/tape_std.c<br/>index cc8fd781ee22..5bd573d144d6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/char/tape_std.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/s390/char/tape_std.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/char/tape_std.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/char/tape_std.c</a></div><div class='hunk'>@@ -47,7 +47,7 @@ tape_std_assign_timeout(unsigned long data)</div><div class='ctx'> 	rc = tape_cancel_io(device, request);</div><div class='ctx'> 	if(rc)</div><div class='ctx'> 		PRINT_ERR("(%s): Assign timeout: Cancel failed with rc = %i\n",</div><div class='del'>-			device-&gt;cdev-&gt;dev.bus_id, rc);</div><div class='add'>+			dev_name(&amp;device-&gt;cdev-&gt;dev), rc);</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -83,7 +83,7 @@ tape_std_assign(struct tape_device *device)</div><div class='ctx'> </div><div class='ctx'> 	if (rc != 0) {</div><div class='ctx'> 		PRINT_WARN("%s: assign failed - device might be busy\n",</div><div class='del'>-			device-&gt;cdev-&gt;dev.bus_id);</div><div class='add'>+			dev_name(&amp;device-&gt;cdev-&gt;dev));</div><div class='ctx'> 		DBF_EVENT(3, "%08x: assign failed - device might be busy\n",</div><div class='ctx'> 			device-&gt;cdev_id);</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -106,7 +106,7 @@ tape_std_unassign (struct tape_device *device)</div><div class='ctx'> 		DBF_EVENT(3, "(%08x): Can't unassign device\n",</div><div class='ctx'> 			device-&gt;cdev_id);</div><div class='ctx'> 		PRINT_WARN("(%s): Can't unassign device - device gone\n",</div><div class='del'>-			device-&gt;cdev-&gt;dev.bus_id);</div><div class='add'>+			dev_name(&amp;device-&gt;cdev-&gt;dev));</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -120,7 +120,8 @@ tape_std_unassign (struct tape_device *device)</div><div class='ctx'> </div><div class='ctx'> 	if ((rc = tape_do_io(device, request)) != 0) {</div><div class='ctx'> 		DBF_EVENT(3, "%08x: Unassign failed\n", device-&gt;cdev_id);</div><div class='del'>-		PRINT_WARN("%s: Unassign failed\n", device-&gt;cdev-&gt;dev.bus_id);</div><div class='add'>+		PRINT_WARN("%s: Unassign failed\n",</div><div class='add'>+			   dev_name(&amp;device-&gt;cdev-&gt;dev));</div><div class='ctx'> 	} else {</div><div class='ctx'> 		DBF_EVENT(3, "%08x: Tape unassigned\n", device-&gt;cdev_id);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -634,10 +635,10 @@ tape_std_mtcompression(struct tape_device *device, int mt_count)</div><div class='ctx'> 		DBF_EXCEPTION(6, "xcom parm\n");</div><div class='ctx'> 		if (*device-&gt;modeset_byte &amp; 0x08)</div><div class='ctx'> 			PRINT_INFO("(%s) Compression is currently on\n",</div><div class='del'>-				   device-&gt;cdev-&gt;dev.bus_id);</div><div class='add'>+				   dev_name(&amp;device-&gt;cdev-&gt;dev));</div><div class='ctx'> 		else</div><div class='ctx'> 			PRINT_INFO("(%s) Compression is currently off\n",</div><div class='del'>-				   device-&gt;cdev-&gt;dev.bus_id);</div><div class='add'>+				   dev_name(&amp;device-&gt;cdev-&gt;dev));</div><div class='ctx'> 		PRINT_INFO("Use 1 to switch compression on, 0 to "</div><div class='ctx'> 			   "switch it off\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='head'>diff --git a/drivers/s390/char/vmlogrdr.c b/drivers/s390/char/vmlogrdr.c<br/>index c31faefa2b3b..24762727bc27 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/char/vmlogrdr.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/s390/char/vmlogrdr.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/char/vmlogrdr.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/char/vmlogrdr.c</a></div><div class='hunk'>@@ -724,8 +724,7 @@ static int vmlogrdr_register_device(struct vmlogrdr_priv_t *priv)</div><div class='ctx'> </div><div class='ctx'> 	dev = kzalloc(sizeof(struct device), GFP_KERNEL);</div><div class='ctx'> 	if (dev) {</div><div class='del'>-		snprintf(dev-&gt;bus_id, BUS_ID_SIZE, "%s",</div><div class='del'>-			 priv-&gt;internal_name);</div><div class='add'>+		dev_set_name(dev, priv-&gt;internal_name);</div><div class='ctx'> 		dev-&gt;bus = &amp;iucv_bus;</div><div class='ctx'> 		dev-&gt;parent = iucv_root;</div><div class='ctx'> 		dev-&gt;driver = &amp;vmlogrdr_driver;</div><div class='hunk'>@@ -748,10 +747,10 @@ static int vmlogrdr_register_device(struct vmlogrdr_priv_t *priv)</div><div class='ctx'> 		device_unregister(dev);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='del'>-	priv-&gt;class_device = device_create_drvdata(vmlogrdr_class, dev,</div><div class='del'>-						   MKDEV(vmlogrdr_major,</div><div class='del'>-							 priv-&gt;minor_num),</div><div class='del'>-						   priv, "%s", dev-&gt;bus_id);</div><div class='add'>+	priv-&gt;class_device = device_create(vmlogrdr_class, dev,</div><div class='add'>+					   MKDEV(vmlogrdr_major,</div><div class='add'>+						 priv-&gt;minor_num),</div><div class='add'>+					   priv, "%s", dev_name(dev));</div><div class='ctx'> 	if (IS_ERR(priv-&gt;class_device)) {</div><div class='ctx'> 		ret = PTR_ERR(priv-&gt;class_device);</div><div class='ctx'> 		priv-&gt;class_device=NULL;</div><div class='head'>diff --git a/drivers/s390/char/vmur.c b/drivers/s390/char/vmur.c<br/>index c1f352b84868..9020eba620ee 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/char/vmur.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/s390/char/vmur.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/char/vmur.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/char/vmur.c</a></div><div class='hunk'>@@ -886,19 +886,18 @@ static int ur_set_online(struct ccw_device *cdev)</div><div class='ctx'> 		goto fail_free_cdev;</div><div class='ctx'> 	if (urd-&gt;cdev-&gt;id.cu_type == READER_PUNCH_DEVTYPE) {</div><div class='ctx'> 		if (urd-&gt;class == DEV_CLASS_UR_I)</div><div class='del'>-			sprintf(node_id, "vmrdr-%s", cdev-&gt;dev.bus_id);</div><div class='add'>+			sprintf(node_id, "vmrdr-%s", dev_name(&amp;cdev-&gt;dev));</div><div class='ctx'> 		if (urd-&gt;class == DEV_CLASS_UR_O)</div><div class='del'>-			sprintf(node_id, "vmpun-%s", cdev-&gt;dev.bus_id);</div><div class='add'>+			sprintf(node_id, "vmpun-%s", dev_name(&amp;cdev-&gt;dev));</div><div class='ctx'> 	} else if (urd-&gt;cdev-&gt;id.cu_type == PRINTER_DEVTYPE) {</div><div class='del'>-		sprintf(node_id, "vmprt-%s", cdev-&gt;dev.bus_id);</div><div class='add'>+		sprintf(node_id, "vmprt-%s", dev_name(&amp;cdev-&gt;dev));</div><div class='ctx'> 	} else {</div><div class='ctx'> 		rc = -EOPNOTSUPP;</div><div class='ctx'> 		goto fail_free_cdev;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	urd-&gt;device = device_create_drvdata(vmur_class, NULL,</div><div class='del'>-					    urd-&gt;char_device-&gt;dev, NULL,</div><div class='del'>-					    "%s", node_id);</div><div class='add'>+	urd-&gt;device = device_create(vmur_class, NULL, urd-&gt;char_device-&gt;dev,</div><div class='add'>+				    NULL, "%s", node_id);</div><div class='ctx'> 	if (IS_ERR(urd-&gt;device)) {</div><div class='ctx'> 		rc = PTR_ERR(urd-&gt;device);</div><div class='ctx'> 		TRACE("ur_set_online: device_create rc=%d\n", rc);</div><div class='head'>diff --git a/drivers/s390/cio/blacklist.c b/drivers/s390/cio/blacklist.c<br/>index 0bfcbbe375c4..2f547b840ef0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/cio/blacklist.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/s390/cio/blacklist.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/cio/blacklist.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/cio/blacklist.c</a></div><div class='hunk'>@@ -24,6 +24,7 @@</div><div class='ctx'> #include "cio.h"</div><div class='ctx'> #include "cio_debug.h"</div><div class='ctx'> #include "css.h"</div><div class='add'>+#include "device.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * "Blacklisting" of certain devices:</div><div class='hunk'>@@ -191,9 +192,9 @@ static int blacklist_parse_parameters(char *str, range_action action,</div><div class='ctx'> 			rc = blacklist_range(ra, from_ssid, to_ssid, from, to,</div><div class='ctx'> 					     msgtrigger);</div><div class='ctx'> 			if (rc)</div><div class='del'>-				totalrc = 1;</div><div class='add'>+				totalrc = -EINVAL;</div><div class='ctx'> 		} else</div><div class='del'>-			totalrc = 1;</div><div class='add'>+			totalrc = -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return totalrc;</div><div class='hunk'>@@ -240,8 +241,10 @@ static int blacklist_parse_proc_parameters(char *buf)</div><div class='ctx'> 		rc = blacklist_parse_parameters(buf, free, 0);</div><div class='ctx'> 	else if (strcmp("add", parm) == 0)</div><div class='ctx'> 		rc = blacklist_parse_parameters(buf, add, 0);</div><div class='add'>+	else if (strcmp("purge", parm) == 0)</div><div class='add'>+		return ccw_purge_blacklisted();</div><div class='ctx'> 	else</div><div class='del'>-		return 1;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	css_schedule_reprobe();</div><div class='ctx'> </div><div class='hunk'>@@ -353,7 +356,7 @@ cio_ignore_write(struct file *file, const char __user *user_buf,</div><div class='ctx'> 	}</div><div class='ctx'> 	ret = blacklist_parse_proc_parameters(buf);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		rc = -EINVAL;</div><div class='add'>+		rc = ret;</div><div class='ctx'> 	else</div><div class='ctx'> 		rc = user_len;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/s390/cio/ccwgroup.c b/drivers/s390/cio/ccwgroup.c<br/>index 9a50f245774b..3ac2c2019f5e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/cio/ccwgroup.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/s390/cio/ccwgroup.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/cio/ccwgroup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/cio/ccwgroup.c</a></div><div class='hunk'>@@ -269,8 +269,7 @@ int ccwgroup_create_from_string(struct device *root, unsigned int creator_id,</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	snprintf (gdev-&gt;dev.bus_id, BUS_ID_SIZE, "%s",</div><div class='del'>-			gdev-&gt;cdev[0]-&gt;dev.bus_id);</div><div class='add'>+	dev_set_name(&amp;gdev-&gt;dev, "%s", dev_name(&amp;gdev-&gt;cdev[0]-&gt;dev));</div><div class='ctx'> </div><div class='ctx'> 	rc = device_add(&amp;gdev-&gt;dev);</div><div class='ctx'> 	if (rc)</div><div class='head'>diff --git a/drivers/s390/cio/chp.c b/drivers/s390/cio/chp.c<br/>index f1216cf6fa8f..1246f61a5338 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/cio/chp.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/s390/cio/chp.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/cio/chp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/cio/chp.c</a></div><div class='hunk'>@@ -393,8 +393,7 @@ int chp_new(struct chp_id chpid)</div><div class='ctx'> 	chp-&gt;state = 1;</div><div class='ctx'> 	chp-&gt;dev.parent = &amp;channel_subsystems[chpid.cssid]-&gt;device;</div><div class='ctx'> 	chp-&gt;dev.release = chp_release;</div><div class='del'>-	snprintf(chp-&gt;dev.bus_id, BUS_ID_SIZE, "chp%x.%02x", chpid.cssid,</div><div class='del'>-		 chpid.id);</div><div class='add'>+	dev_set_name(&amp;chp-&gt;dev, "chp%x.%02x", chpid.cssid, chpid.id);</div><div class='ctx'> </div><div class='ctx'> 	/* Obtain channel path description and fill it in. */</div><div class='ctx'> 	ret = chsc_determine_base_channel_path_desc(chpid, &amp;chp-&gt;desc);</div><div class='head'>diff --git a/drivers/s390/cio/chsc_sch.c b/drivers/s390/cio/chsc_sch.c<br/>index 91ca87aa9f97..f49f0e502b8d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/cio/chsc_sch.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/s390/cio/chsc_sch.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/cio/chsc_sch.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/cio/chsc_sch.c</a></div><div class='hunk'>@@ -261,7 +261,7 @@ static int chsc_examine_irb(struct chsc_request *request)</div><div class='ctx'> {</div><div class='ctx'> 	int backed_up;</div><div class='ctx'> </div><div class='del'>-	if (!scsw_stctl(&amp;request-&gt;irb.scsw) &amp; SCSW_STCTL_STATUS_PEND)</div><div class='add'>+	if (!(scsw_stctl(&amp;request-&gt;irb.scsw) &amp; SCSW_STCTL_STATUS_PEND))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	backed_up = scsw_cstat(&amp;request-&gt;irb.scsw) &amp; SCHN_STAT_CHAIN_CHECK;</div><div class='ctx'> 	request-&gt;irb.scsw.cmd.cstat &amp;= ~SCHN_STAT_CHAIN_CHECK;</div><div class='head'>diff --git a/drivers/s390/cio/cio.c b/drivers/s390/cio/cio.c<br/>index 326f4cc7f92c..3db2c386546f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/cio/cio.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/s390/cio/cio.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/cio/cio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/cio/cio.c</a></div><div class='hunk'>@@ -114,6 +114,7 @@ cio_tpi(void)</div><div class='ctx'> 	struct tpi_info *tpi_info;</div><div class='ctx'> 	struct subchannel *sch;</div><div class='ctx'> 	struct irb *irb;</div><div class='add'>+	int irq_context;</div><div class='ctx'> </div><div class='ctx'> 	tpi_info = (struct tpi_info *) __LC_SUBCHANNEL_ID;</div><div class='ctx'> 	if (tpi (NULL) != 1)</div><div class='hunk'>@@ -126,7 +127,9 @@ cio_tpi(void)</div><div class='ctx'> 	sch = (struct subchannel *)(unsigned long)tpi_info-&gt;intparm;</div><div class='ctx'> 	if (!sch)</div><div class='ctx'> 		return 1;</div><div class='del'>-	local_bh_disable();</div><div class='add'>+	irq_context = in_interrupt();</div><div class='add'>+	if (!irq_context)</div><div class='add'>+		local_bh_disable();</div><div class='ctx'> 	irq_enter ();</div><div class='ctx'> 	spin_lock(sch-&gt;lock);</div><div class='ctx'> 	memcpy(&amp;sch-&gt;schib.scsw, &amp;irb-&gt;scsw, sizeof(union scsw));</div><div class='hunk'>@@ -134,7 +137,8 @@ cio_tpi(void)</div><div class='ctx'> 		sch-&gt;driver-&gt;irq(sch);</div><div class='ctx'> 	spin_unlock(sch-&gt;lock);</div><div class='ctx'> 	irq_exit ();</div><div class='del'>-	_local_bh_enable();</div><div class='add'>+	if (!irq_context)</div><div class='add'>+		_local_bh_enable();</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -153,7 +157,7 @@ cio_start_handle_notoper(struct subchannel *sch, __u8 lpm)</div><div class='ctx'> 	CIO_MSG_EVENT(2, "cio_start: 'not oper' status for "</div><div class='ctx'> 		      "subchannel 0.%x.%04x!\n", sch-&gt;schid.ssid,</div><div class='ctx'> 		      sch-&gt;schid.sch_no);</div><div class='del'>-	sprintf(dbf_text, "no%s", sch-&gt;dev.bus_id);</div><div class='add'>+	sprintf(dbf_text, "no%s", dev_name(&amp;sch-&gt;dev));</div><div class='ctx'> 	CIO_TRACE_EVENT(0, dbf_text);</div><div class='ctx'> 	CIO_HEX_EVENT(0, &amp;sch-&gt;schib, sizeof (struct schib));</div><div class='ctx'> </div><div class='hunk'>@@ -171,7 +175,7 @@ cio_start_key (struct subchannel *sch,	/* subchannel structure */</div><div class='ctx'> 	union orb *orb;</div><div class='ctx'> </div><div class='ctx'> 	CIO_TRACE_EVENT(4, "stIO");</div><div class='del'>-	CIO_TRACE_EVENT(4, sch-&gt;dev.bus_id);</div><div class='add'>+	CIO_TRACE_EVENT(4, dev_name(&amp;sch-&gt;dev));</div><div class='ctx'> </div><div class='ctx'> 	orb = &amp;to_io_private(sch)-&gt;orb;</div><div class='ctx'> 	memset(orb, 0, sizeof(union orb));</div><div class='hunk'>@@ -232,7 +236,7 @@ cio_resume (struct subchannel *sch)</div><div class='ctx'> 	int ccode;</div><div class='ctx'> </div><div class='ctx'> 	CIO_TRACE_EVENT (4, "resIO");</div><div class='del'>-	CIO_TRACE_EVENT (4, sch-&gt;dev.bus_id);</div><div class='add'>+	CIO_TRACE_EVENT(4, dev_name(&amp;sch-&gt;dev));</div><div class='ctx'> </div><div class='ctx'> 	ccode = rsch (sch-&gt;schid);</div><div class='ctx'> </div><div class='hunk'>@@ -269,7 +273,7 @@ cio_halt(struct subchannel *sch)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	CIO_TRACE_EVENT (2, "haltIO");</div><div class='del'>-	CIO_TRACE_EVENT (2, sch-&gt;dev.bus_id);</div><div class='add'>+	CIO_TRACE_EVENT(2, dev_name(&amp;sch-&gt;dev));</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Issue "Halt subchannel" and process condition code</div><div class='hunk'>@@ -304,7 +308,7 @@ cio_clear(struct subchannel *sch)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	CIO_TRACE_EVENT (2, "clearIO");</div><div class='del'>-	CIO_TRACE_EVENT (2, sch-&gt;dev.bus_id);</div><div class='add'>+	CIO_TRACE_EVENT(2, dev_name(&amp;sch-&gt;dev));</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Issue "Clear subchannel" and process condition code</div><div class='hunk'>@@ -340,7 +344,7 @@ cio_cancel (struct subchannel *sch)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	CIO_TRACE_EVENT (2, "cancelIO");</div><div class='del'>-	CIO_TRACE_EVENT (2, sch-&gt;dev.bus_id);</div><div class='add'>+	CIO_TRACE_EVENT(2, dev_name(&amp;sch-&gt;dev));</div><div class='ctx'> </div><div class='ctx'> 	ccode = xsch (sch-&gt;schid);</div><div class='ctx'> </div><div class='hunk'>@@ -404,7 +408,7 @@ int cio_enable_subchannel(struct subchannel *sch, u32 intparm)</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	CIO_TRACE_EVENT (2, "ensch");</div><div class='del'>-	CIO_TRACE_EVENT (2, sch-&gt;dev.bus_id);</div><div class='add'>+	CIO_TRACE_EVENT(2, dev_name(&amp;sch-&gt;dev));</div><div class='ctx'> </div><div class='ctx'> 	if (sch_is_pseudo_sch(sch))</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -454,7 +458,7 @@ int cio_disable_subchannel(struct subchannel *sch)</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	CIO_TRACE_EVENT (2, "dissch");</div><div class='del'>-	CIO_TRACE_EVENT (2, sch-&gt;dev.bus_id);</div><div class='add'>+	CIO_TRACE_EVENT(2, dev_name(&amp;sch-&gt;dev));</div><div class='ctx'> </div><div class='ctx'> 	if (sch_is_pseudo_sch(sch))</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -571,8 +575,10 @@ int cio_validate_subchannel(struct subchannel *sch, struct subchannel_id schid)</div><div class='ctx'> 	}</div><div class='ctx'> 	mutex_init(&amp;sch-&gt;reg_mutex);</div><div class='ctx'> 	/* Set a name for the subchannel */</div><div class='del'>-	snprintf (sch-&gt;dev.bus_id, BUS_ID_SIZE, "0.%x.%04x", schid.ssid,</div><div class='del'>-		  schid.sch_no);</div><div class='add'>+	if (cio_is_console(schid))</div><div class='add'>+		sch-&gt;dev.init_name = cio_get_console_sch_name(schid);</div><div class='add'>+	else</div><div class='add'>+		dev_set_name(&amp;sch-&gt;dev, "0.%x.%04x", schid.ssid, schid.sch_no);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The first subchannel that is not-operational (ccode==3)</div><div class='hunk'>@@ -677,6 +683,7 @@ do_IRQ (struct pt_regs *regs)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_CCW_CONSOLE</div><div class='ctx'> static struct subchannel console_subchannel;</div><div class='add'>+static char console_sch_name[10] = "0.x.xxxx";</div><div class='ctx'> static struct io_subchannel_private console_priv;</div><div class='ctx'> static int console_subchannel_in_use;</div><div class='ctx'> </div><div class='hunk'>@@ -827,6 +834,12 @@ cio_get_console_subchannel(void)</div><div class='ctx'> 	return &amp;console_subchannel;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+const char *cio_get_console_sch_name(struct subchannel_id schid)</div><div class='add'>+{</div><div class='add'>+	snprintf(console_sch_name, 10, "0.%x.%04x", schid.ssid, schid.sch_no);</div><div class='add'>+	return (const char *)console_sch_name;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='ctx'> static int</div><div class='ctx'> __disable_subchannel_easy(struct subchannel_id schid, struct schib *schib)</div><div class='hunk'>@@ -846,19 +859,6 @@ __disable_subchannel_easy(struct subchannel_id schid, struct schib *schib)</div><div class='ctx'> 	return -EBUSY; /* uhm... */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* we can't use the normal udelay here, since it enables external interrupts */</div><div class='del'>-</div><div class='del'>-static void udelay_reset(unsigned long usecs)</div><div class='del'>-{</div><div class='del'>-	uint64_t start_cc, end_cc;</div><div class='del'>-</div><div class='del'>-	asm volatile ("STCK %0" : "=m" (start_cc));</div><div class='del'>-	do {</div><div class='del'>-		cpu_relax();</div><div class='del'>-		asm volatile ("STCK %0" : "=m" (end_cc));</div><div class='del'>-	} while (((end_cc - start_cc)/4096) &lt; usecs);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int</div><div class='ctx'> __clear_io_subchannel_easy(struct subchannel_id schid)</div><div class='ctx'> {</div><div class='hunk'>@@ -874,7 +874,7 @@ __clear_io_subchannel_easy(struct subchannel_id schid)</div><div class='ctx'> 			if (schid_equal(&amp;ti.schid, &amp;schid))</div><div class='ctx'> 				return 0;</div><div class='ctx'> 		}</div><div class='del'>-		udelay_reset(100);</div><div class='add'>+		udelay_simple(100);</div><div class='ctx'> 	}</div><div class='ctx'> 	return -EBUSY;</div><div class='ctx'> }</div><div class='hunk'>@@ -882,7 +882,7 @@ __clear_io_subchannel_easy(struct subchannel_id schid)</div><div class='ctx'> static void __clear_chsc_subchannel_easy(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* It seems we can only wait for a bit here :/ */</div><div class='del'>-	udelay_reset(100);</div><div class='add'>+	udelay_simple(100);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int pgm_check_occured;</div><div class='hunk'>@@ -892,7 +892,7 @@ static void cio_reset_pgm_check_handler(void)</div><div class='ctx'> 	pgm_check_occured = 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int stsch_reset(struct subchannel_id schid, volatile struct schib *addr)</div><div class='add'>+static int stsch_reset(struct subchannel_id schid, struct schib *addr)</div><div class='ctx'> {</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/s390/cio/cio.h b/drivers/s390/cio/cio.h<br/>index 3b236d20e835..0fb24784e925 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/cio/cio.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/s390/cio/cio.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/cio/cio.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/cio/cio.h</a></div><div class='hunk'>@@ -117,11 +117,15 @@ extern int cio_is_console(struct subchannel_id);</div><div class='ctx'> extern struct subchannel *cio_get_console_subchannel(void);</div><div class='ctx'> extern spinlock_t * cio_get_console_lock(void);</div><div class='ctx'> extern void *cio_get_console_priv(void);</div><div class='add'>+extern const char *cio_get_console_sch_name(struct subchannel_id schid);</div><div class='add'>+extern const char *cio_get_console_cdev_name(struct subchannel *sch);</div><div class='ctx'> #else</div><div class='ctx'> #define cio_is_console(schid) 0</div><div class='ctx'> #define cio_get_console_subchannel() NULL</div><div class='ctx'> #define cio_get_console_lock() NULL</div><div class='ctx'> #define cio_get_console_priv() NULL</div><div class='add'>+#define cio_get_console_sch_name(schid) NULL</div><div class='add'>+#define cio_get_console_cdev_name(sch) NULL</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/s390/cio/css.c b/drivers/s390/cio/css.c<br/>index 1261e1a9e8cd..76bbb1e74c29 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/cio/css.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/s390/cio/css.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/cio/css.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/cio/css.c</a></div><div class='hunk'>@@ -698,7 +698,7 @@ static int __init setup_css(int nr)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	css-&gt;pseudo_subchannel-&gt;dev.parent = &amp;css-&gt;device;</div><div class='ctx'> 	css-&gt;pseudo_subchannel-&gt;dev.release = css_subchannel_release;</div><div class='del'>-	sprintf(css-&gt;pseudo_subchannel-&gt;dev.bus_id, "defunct");</div><div class='add'>+	dev_set_name(&amp;css-&gt;pseudo_subchannel-&gt;dev, "defunct");</div><div class='ctx'> 	ret = cio_create_sch_lock(css-&gt;pseudo_subchannel);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		kfree(css-&gt;pseudo_subchannel);</div><div class='hunk'>@@ -707,7 +707,7 @@ static int __init setup_css(int nr)</div><div class='ctx'> 	mutex_init(&amp;css-&gt;mutex);</div><div class='ctx'> 	css-&gt;valid = 1;</div><div class='ctx'> 	css-&gt;cssid = nr;</div><div class='del'>-	sprintf(css-&gt;device.bus_id, "css%x", nr);</div><div class='add'>+	dev_set_name(&amp;css-&gt;device, "css%x", nr);</div><div class='ctx'> 	css-&gt;device.release = channel_subsystem_release;</div><div class='ctx'> 	tod_high = (u32) (get_clock() &gt;&gt; 32);</div><div class='ctx'> 	css_generate_pgid(css, tod_high);</div><div class='head'>diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c<br/>index 28221030b886..4e78c82194b4 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/cio/device.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/s390/cio/device.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/cio/device.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/cio/device.c</a></div><div class='hunk'>@@ -31,6 +31,7 @@</div><div class='ctx'> #include "device.h"</div><div class='ctx'> #include "ioasm.h"</div><div class='ctx'> #include "io_sch.h"</div><div class='add'>+#include "blacklist.h"</div><div class='ctx'> </div><div class='ctx'> static struct timer_list recovery_timer;</div><div class='ctx'> static DEFINE_SPINLOCK(recovery_lock);</div><div class='hunk'>@@ -296,36 +297,33 @@ static void ccw_device_unregister(struct ccw_device *cdev)</div><div class='ctx'> 		device_del(&amp;cdev-&gt;dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ccw_device_remove_orphan_cb(struct device *dev)</div><div class='add'>+static void ccw_device_remove_orphan_cb(struct work_struct *work)</div><div class='ctx'> {</div><div class='del'>-	struct ccw_device *cdev = to_ccwdev(dev);</div><div class='add'>+	struct ccw_device_private *priv;</div><div class='add'>+	struct ccw_device *cdev;</div><div class='ctx'> </div><div class='add'>+	priv = container_of(work, struct ccw_device_private, kick_work);</div><div class='add'>+	cdev = priv-&gt;cdev;</div><div class='ctx'> 	ccw_device_unregister(cdev);</div><div class='ctx'> 	put_device(&amp;cdev-&gt;dev);</div><div class='add'>+	/* Release cdev reference for workqueue processing. */</div><div class='add'>+	put_device(&amp;cdev-&gt;dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ccw_device_remove_sch_cb(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	struct subchannel *sch;</div><div class='del'>-</div><div class='del'>-	sch = to_subchannel(dev);</div><div class='del'>-	css_sch_device_unregister(sch);</div><div class='del'>-	/* Reset intparm to zeroes. */</div><div class='del'>-	sch-&gt;schib.pmcw.intparm = 0;</div><div class='del'>-	cio_modify(sch);</div><div class='del'>-	put_device(&amp;sch-&gt;dev);</div><div class='del'>-}</div><div class='add'>+static void ccw_device_call_sch_unregister(struct work_struct *work);</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> ccw_device_remove_disconnected(struct ccw_device *cdev)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	int rc;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Forced offline in disconnected state means</div><div class='ctx'> 	 * 'throw away device'.</div><div class='ctx'> 	 */</div><div class='add'>+	/* Get cdev reference for workqueue processing. */</div><div class='add'>+	if (!get_device(&amp;cdev-&gt;dev))</div><div class='add'>+		return;</div><div class='ctx'> 	if (ccw_device_is_orphan(cdev)) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Deregister ccw device.</div><div class='hunk'>@@ -335,23 +333,13 @@ ccw_device_remove_disconnected(struct ccw_device *cdev)</div><div class='ctx'> 		spin_lock_irqsave(cdev-&gt;ccwlock, flags);</div><div class='ctx'> 		cdev-&gt;private-&gt;state = DEV_STATE_NOT_OPER;</div><div class='ctx'> 		spin_unlock_irqrestore(cdev-&gt;ccwlock, flags);</div><div class='del'>-		rc = device_schedule_callback(&amp;cdev-&gt;dev,</div><div class='del'>-					      ccw_device_remove_orphan_cb);</div><div class='del'>-		if (rc)</div><div class='del'>-			CIO_MSG_EVENT(0, "Couldn't unregister orphan "</div><div class='del'>-				      "0.%x.%04x\n",</div><div class='del'>-				      cdev-&gt;private-&gt;dev_id.ssid,</div><div class='del'>-				      cdev-&gt;private-&gt;dev_id.devno);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	/* Deregister subchannel, which will kill the ccw device. */</div><div class='del'>-	rc = device_schedule_callback(cdev-&gt;dev.parent,</div><div class='del'>-				      ccw_device_remove_sch_cb);</div><div class='del'>-	if (rc)</div><div class='del'>-		CIO_MSG_EVENT(0, "Couldn't unregister disconnected device "</div><div class='del'>-			      "0.%x.%04x\n",</div><div class='del'>-			      cdev-&gt;private-&gt;dev_id.ssid,</div><div class='del'>-			      cdev-&gt;private-&gt;dev_id.devno);</div><div class='add'>+		PREPARE_WORK(&amp;cdev-&gt;private-&gt;kick_work,</div><div class='add'>+				ccw_device_remove_orphan_cb);</div><div class='add'>+	} else</div><div class='add'>+		/* Deregister subchannel, which will kill the ccw device. */</div><div class='add'>+		PREPARE_WORK(&amp;cdev-&gt;private-&gt;kick_work,</div><div class='add'>+				ccw_device_call_sch_unregister);</div><div class='add'>+	queue_work(slow_path_wq, &amp;cdev-&gt;private-&gt;kick_work);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -970,12 +958,17 @@ static void ccw_device_call_sch_unregister(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> 	priv = container_of(work, struct ccw_device_private, kick_work);</div><div class='ctx'> 	cdev = priv-&gt;cdev;</div><div class='add'>+	/* Get subchannel reference for local processing. */</div><div class='add'>+	if (!get_device(cdev-&gt;dev.parent))</div><div class='add'>+		return;</div><div class='ctx'> 	sch = to_subchannel(cdev-&gt;dev.parent);</div><div class='ctx'> 	css_sch_device_unregister(sch);</div><div class='ctx'> 	/* Reset intparm to zeroes. */</div><div class='ctx'> 	sch-&gt;schib.pmcw.intparm = 0;</div><div class='ctx'> 	cio_modify(sch);</div><div class='add'>+	/* Release cdev reference for workqueue processing.*/</div><div class='ctx'> 	put_device(&amp;cdev-&gt;dev);</div><div class='add'>+	/* Release subchannel reference for local processing. */</div><div class='ctx'> 	put_device(&amp;sch-&gt;dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1001,6 +994,8 @@ io_subchannel_recog_done(struct ccw_device *cdev)</div><div class='ctx'> 		PREPARE_WORK(&amp;cdev-&gt;private-&gt;kick_work,</div><div class='ctx'> 			     ccw_device_call_sch_unregister);</div><div class='ctx'> 		queue_work(slow_path_wq, &amp;cdev-&gt;private-&gt;kick_work);</div><div class='add'>+		/* Release subchannel reference for asynchronous recognition. */</div><div class='add'>+		put_device(&amp;sch-&gt;dev);</div><div class='ctx'> 		if (atomic_dec_and_test(&amp;ccw_device_init_count))</div><div class='ctx'> 			wake_up(&amp;ccw_device_init_wq);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1040,8 +1035,11 @@ io_subchannel_recog(struct ccw_device *cdev, struct subchannel *sch)</div><div class='ctx'> 	init_timer(&amp;priv-&gt;timer);</div><div class='ctx'> </div><div class='ctx'> 	/* Set an initial name for the device. */</div><div class='del'>-	snprintf (cdev-&gt;dev.bus_id, BUS_ID_SIZE, "0.%x.%04x",</div><div class='del'>-		  sch-&gt;schid.ssid, sch-&gt;schib.pmcw.dev);</div><div class='add'>+	if (cio_is_console(sch-&gt;schid))</div><div class='add'>+		cdev-&gt;dev.init_name = cio_get_console_cdev_name(sch);</div><div class='add'>+	else</div><div class='add'>+		dev_set_name(&amp;cdev-&gt;dev, "0.%x.%04x",</div><div class='add'>+			     sch-&gt;schid.ssid, sch-&gt;schib.pmcw.dev);</div><div class='ctx'> </div><div class='ctx'> 	/* Increase counter of devices currently in recognition. */</div><div class='ctx'> 	atomic_inc(&amp;ccw_device_init_count);</div><div class='hunk'>@@ -1106,7 +1104,7 @@ static void io_subchannel_irq(struct subchannel *sch)</div><div class='ctx'> 	cdev = sch_get_cdev(sch);</div><div class='ctx'> </div><div class='ctx'> 	CIO_TRACE_EVENT(3, "IRQ");</div><div class='del'>-	CIO_TRACE_EVENT(3, sch-&gt;dev.bus_id);</div><div class='add'>+	CIO_TRACE_EVENT(3, dev_name(&amp;sch-&gt;dev));</div><div class='ctx'> 	if (cdev)</div><div class='ctx'> 		dev_fsm_event(cdev, DEV_EVENT_INTERRUPT);</div><div class='ctx'> }</div><div class='hunk'>@@ -1476,6 +1474,45 @@ static void ccw_device_schedule_recovery(void)</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;recovery_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int purge_fn(struct device *dev, void *data)</div><div class='add'>+{</div><div class='add'>+	struct ccw_device *cdev = to_ccwdev(dev);</div><div class='add'>+	struct ccw_device_private *priv = cdev-&gt;private;</div><div class='add'>+	int unreg;</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(cdev-&gt;ccwlock);</div><div class='add'>+	unreg = is_blacklisted(priv-&gt;dev_id.ssid, priv-&gt;dev_id.devno) &amp;&amp;</div><div class='add'>+		(priv-&gt;state == DEV_STATE_OFFLINE);</div><div class='add'>+	spin_unlock_irq(cdev-&gt;ccwlock);</div><div class='add'>+	if (!unreg)</div><div class='add'>+		goto out;</div><div class='add'>+	if (!get_device(&amp;cdev-&gt;dev))</div><div class='add'>+		goto out;</div><div class='add'>+	CIO_MSG_EVENT(3, "ccw: purging 0.%x.%04x\n", priv-&gt;dev_id.ssid,</div><div class='add'>+		      priv-&gt;dev_id.devno);</div><div class='add'>+	PREPARE_WORK(&amp;cdev-&gt;private-&gt;kick_work, ccw_device_call_sch_unregister);</div><div class='add'>+	queue_work(slow_path_wq, &amp;cdev-&gt;private-&gt;kick_work);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	/* Abort loop in case of pending signal. */</div><div class='add'>+	if (signal_pending(current))</div><div class='add'>+		return -EINTR;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ccw_purge_blacklisted - purge unused, blacklisted devices</div><div class='add'>+ *</div><div class='add'>+ * Unregister all ccw devices that are offline and on the blacklist.</div><div class='add'>+ */</div><div class='add'>+int ccw_purge_blacklisted(void)</div><div class='add'>+{</div><div class='add'>+	CIO_MSG_EVENT(2, "ccw: purging blacklisted devices\n");</div><div class='add'>+	bus_for_each_dev(&amp;ccw_bus_type, NULL, NULL, purge_fn);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void device_set_disconnected(struct ccw_device *cdev)</div><div class='ctx'> {</div><div class='ctx'> 	if (!cdev)</div><div class='hunk'>@@ -1492,7 +1529,7 @@ void ccw_device_set_notoper(struct ccw_device *cdev)</div><div class='ctx'> 	struct subchannel *sch = to_subchannel(cdev-&gt;dev.parent);</div><div class='ctx'> </div><div class='ctx'> 	CIO_TRACE_EVENT(2, "notoper");</div><div class='del'>-	CIO_TRACE_EVENT(2, sch-&gt;dev.bus_id);</div><div class='add'>+	CIO_TRACE_EVENT(2, dev_name(&amp;sch-&gt;dev));</div><div class='ctx'> 	ccw_device_set_timeout(cdev, 0);</div><div class='ctx'> 	cio_disable_subchannel(sch);</div><div class='ctx'> 	cdev-&gt;private-&gt;state = DEV_STATE_NOT_OPER;</div><div class='hunk'>@@ -1591,6 +1628,7 @@ static int io_subchannel_sch_event(struct subchannel *sch, int slow)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_CCW_CONSOLE</div><div class='ctx'> static struct ccw_device console_cdev;</div><div class='add'>+static char console_cdev_name[10] = "0.x.xxxx";</div><div class='ctx'> static struct ccw_device_private console_private;</div><div class='ctx'> static int console_cdev_in_use;</div><div class='ctx'> </div><div class='hunk'>@@ -1661,6 +1699,14 @@ ccw_device_probe_console(void)</div><div class='ctx'> 	console_cdev.online = 1;</div><div class='ctx'> 	return &amp;console_cdev;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+const char *cio_get_console_cdev_name(struct subchannel *sch)</div><div class='add'>+{</div><div class='add'>+	snprintf(console_cdev_name, 10, "0.%x.%04x",</div><div class='add'>+		 sch-&gt;schid.ssid, sch-&gt;schib.pmcw.dev);</div><div class='add'>+	return (const char *)console_cdev_name;</div><div class='add'>+}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1673,7 +1719,7 @@ __ccwdev_check_busid(struct device *dev, void *id)</div><div class='ctx'> </div><div class='ctx'> 	bus_id = id;</div><div class='ctx'> </div><div class='del'>-	return (strncmp(bus_id, dev-&gt;bus_id, BUS_ID_SIZE) == 0);</div><div class='add'>+	return (strncmp(bus_id, dev_name(dev), BUS_ID_SIZE) == 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/drivers/s390/cio/device.h b/drivers/s390/cio/device.h<br/>index 6f5c3f2b3587..104ed669db43 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/cio/device.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/s390/cio/device.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/cio/device.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/cio/device.h</a></div><div class='hunk'>@@ -86,6 +86,7 @@ int ccw_device_is_orphan(struct ccw_device *);</div><div class='ctx'> int ccw_device_recognition(struct ccw_device *);</div><div class='ctx'> int ccw_device_online(struct ccw_device *);</div><div class='ctx'> int ccw_device_offline(struct ccw_device *);</div><div class='add'>+int ccw_purge_blacklisted(void);</div><div class='ctx'> </div><div class='ctx'> /* Function prototypes for device status and basic sense stuff. */</div><div class='ctx'> void ccw_device_accumulate_irb(struct ccw_device *, struct irb *);</div><div class='head'>diff --git a/drivers/s390/cio/device_fsm.c b/drivers/s390/cio/device_fsm.c<br/>index 84cc9ea346db..10bc03940fb3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/cio/device_fsm.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/s390/cio/device_fsm.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/cio/device_fsm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/cio/device_fsm.c</a></div><div class='hunk'>@@ -52,8 +52,10 @@ static void ccw_timeout_log(struct ccw_device *cdev)</div><div class='ctx'> 	printk(KERN_WARNING "cio: orb:\n");</div><div class='ctx'> 	print_hex_dump(KERN_WARNING, "cio:  ", DUMP_PREFIX_NONE, 16, 1,</div><div class='ctx'> 		       orb, sizeof(*orb), 0);</div><div class='del'>-	printk(KERN_WARNING "cio: ccw device bus id: %s\n", cdev-&gt;dev.bus_id);</div><div class='del'>-	printk(KERN_WARNING "cio: subchannel bus id: %s\n", sch-&gt;dev.bus_id);</div><div class='add'>+	printk(KERN_WARNING "cio: ccw device bus id: %s\n",</div><div class='add'>+	       dev_name(&amp;cdev-&gt;dev));</div><div class='add'>+	printk(KERN_WARNING "cio: subchannel bus id: %s\n",</div><div class='add'>+	       dev_name(&amp;sch-&gt;dev));</div><div class='ctx'> 	printk(KERN_WARNING "cio: subchannel lpm: %02x, opm: %02x, "</div><div class='ctx'> 	       "vpm: %02x\n", sch-&gt;lpm, sch-&gt;opm, sch-&gt;vpm);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/s390/cio/device_ops.c b/drivers/s390/cio/device_ops.c<br/>index ee1a28310fbb..eabcc42d63df 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/cio/device_ops.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/s390/cio/device_ops.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/cio/device_ops.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/cio/device_ops.c</a></div><div class='hunk'>@@ -498,7 +498,7 @@ ccw_device_stlck(struct ccw_device *cdev)</div><div class='ctx'> 	sch = to_subchannel(cdev-&gt;dev.parent);</div><div class='ctx'> 	</div><div class='ctx'> 	CIO_TRACE_EVENT(2, "stl lock");</div><div class='del'>-	CIO_TRACE_EVENT(2, cdev-&gt;dev.bus_id);</div><div class='add'>+	CIO_TRACE_EVENT(2, dev_name(&amp;cdev-&gt;dev));</div><div class='ctx'> </div><div class='ctx'> 	buf = kmalloc(32*sizeof(char), GFP_DMA|GFP_KERNEL);</div><div class='ctx'> 	if (!buf)</div><div class='head'>diff --git a/drivers/s390/cio/io_sch.h b/drivers/s390/cio/io_sch.h<br/>index 3f8f1cf69c76..c4f3e7c9a854 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/cio/io_sch.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/s390/cio/io_sch.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/cio/io_sch.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/cio/io_sch.h</a></div><div class='hunk'>@@ -123,7 +123,7 @@ struct ccw_device_private {</div><div class='ctx'> 	void *cmb_wait;			/* deferred cmb enable/disable */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static inline int ssch(struct subchannel_id schid, volatile union orb *addr)</div><div class='add'>+static inline int ssch(struct subchannel_id schid, union orb *addr)</div><div class='ctx'> {</div><div class='ctx'> 	register struct subchannel_id reg1 asm("1") = schid;</div><div class='ctx'> 	int ccode = -EIO;</div><div class='hunk'>@@ -134,7 +134,9 @@ static inline int ssch(struct subchannel_id schid, volatile union orb *addr)</div><div class='ctx'> 		"	srl	%0,28\n"</div><div class='ctx'> 		"1:\n"</div><div class='ctx'> 		EX_TABLE(0b, 1b)</div><div class='del'>-		: "+d" (ccode) : "d" (reg1), "a" (addr), "m" (*addr) : "cc");</div><div class='add'>+		: "+d" (ccode)</div><div class='add'>+		: "d" (reg1), "a" (addr), "m" (*addr)</div><div class='add'>+		: "cc", "memory");</div><div class='ctx'> 	return ccode;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -147,7 +149,9 @@ static inline int rsch(struct subchannel_id schid)</div><div class='ctx'> 		"	rsch\n"</div><div class='ctx'> 		"	ipm	%0\n"</div><div class='ctx'> 		"	srl	%0,28"</div><div class='del'>-		: "=d" (ccode) : "d" (reg1) : "cc");</div><div class='add'>+		: "=d" (ccode)</div><div class='add'>+		: "d" (reg1)</div><div class='add'>+		: "cc", "memory");</div><div class='ctx'> 	return ccode;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -160,7 +164,9 @@ static inline int csch(struct subchannel_id schid)</div><div class='ctx'> 		"	csch\n"</div><div class='ctx'> 		"	ipm	%0\n"</div><div class='ctx'> 		"	srl	%0,28"</div><div class='del'>-		: "=d" (ccode) : "d" (reg1) : "cc");</div><div class='add'>+		: "=d" (ccode)</div><div class='add'>+		: "d" (reg1)</div><div class='add'>+		: "cc");</div><div class='ctx'> 	return ccode;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -173,7 +179,9 @@ static inline int hsch(struct subchannel_id schid)</div><div class='ctx'> 		"	hsch\n"</div><div class='ctx'> 		"	ipm	%0\n"</div><div class='ctx'> 		"	srl	%0,28"</div><div class='del'>-		: "=d" (ccode) : "d" (reg1) : "cc");</div><div class='add'>+		: "=d" (ccode)</div><div class='add'>+		: "d" (reg1)</div><div class='add'>+		: "cc");</div><div class='ctx'> 	return ccode;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -186,7 +194,9 @@ static inline int xsch(struct subchannel_id schid)</div><div class='ctx'> 		"	.insn	rre,0xb2760000,%1,0\n"</div><div class='ctx'> 		"	ipm	%0\n"</div><div class='ctx'> 		"	srl	%0,28"</div><div class='del'>-		: "=d" (ccode) : "d" (reg1) : "cc");</div><div class='add'>+		: "=d" (ccode)</div><div class='add'>+		: "d" (reg1)</div><div class='add'>+		: "cc");</div><div class='ctx'> 	return ccode;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/s390/cio/ioasm.h b/drivers/s390/cio/ioasm.h<br/>index 9fa2ac13ac85..759262792633 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/cio/ioasm.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/s390/cio/ioasm.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/cio/ioasm.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/cio/ioasm.h</a></div><div class='hunk'>@@ -23,38 +23,39 @@ struct tpi_info {</div><div class='ctx'>  * Some S390 specific IO instructions as inline</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static inline int stsch(struct subchannel_id schid,</div><div class='del'>-			    volatile struct schib *addr)</div><div class='add'>+static inline int stsch(struct subchannel_id schid, struct schib *addr)</div><div class='ctx'> {</div><div class='ctx'> 	register struct subchannel_id reg1 asm ("1") = schid;</div><div class='ctx'> 	int ccode;</div><div class='ctx'> </div><div class='ctx'> 	asm volatile(</div><div class='del'>-		"	stsch	0(%2)\n"</div><div class='add'>+		"	stsch	0(%3)\n"</div><div class='ctx'> 		"	ipm	%0\n"</div><div class='ctx'> 		"	srl	%0,28"</div><div class='del'>-		: "=d" (ccode) : "d" (reg1), "a" (addr), "m" (*addr) : "cc");</div><div class='add'>+		: "=d" (ccode), "=m" (*addr)</div><div class='add'>+		: "d" (reg1), "a" (addr)</div><div class='add'>+		: "cc");</div><div class='ctx'> 	return ccode;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int stsch_err(struct subchannel_id schid,</div><div class='del'>-				volatile struct schib *addr)</div><div class='add'>+static inline int stsch_err(struct subchannel_id schid, struct schib *addr)</div><div class='ctx'> {</div><div class='ctx'> 	register struct subchannel_id reg1 asm ("1") = schid;</div><div class='ctx'> 	int ccode = -EIO;</div><div class='ctx'> </div><div class='ctx'> 	asm volatile(</div><div class='del'>-		"	stsch	0(%2)\n"</div><div class='add'>+		"	stsch	0(%3)\n"</div><div class='ctx'> 		"0:	ipm	%0\n"</div><div class='ctx'> 		"	srl	%0,28\n"</div><div class='ctx'> 		"1:\n"</div><div class='ctx'> 		EX_TABLE(0b,1b)</div><div class='del'>-		: "+d" (ccode) : "d" (reg1), "a" (addr), "m" (*addr) : "cc");</div><div class='add'>+		: "+d" (ccode), "=m" (*addr)</div><div class='add'>+		: "d" (reg1), "a" (addr)</div><div class='add'>+		: "cc");</div><div class='ctx'> 	return ccode;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int msch(struct subchannel_id schid,</div><div class='del'>-			   volatile struct schib *addr)</div><div class='add'>+static inline int msch(struct subchannel_id schid, struct schib *addr)</div><div class='ctx'> {</div><div class='ctx'> 	register struct subchannel_id reg1 asm ("1") = schid;</div><div class='ctx'> 	int ccode;</div><div class='hunk'>@@ -63,12 +64,13 @@ static inline int msch(struct subchannel_id schid,</div><div class='ctx'> 		"	msch	0(%2)\n"</div><div class='ctx'> 		"	ipm	%0\n"</div><div class='ctx'> 		"	srl	%0,28"</div><div class='del'>-		: "=d" (ccode) : "d" (reg1), "a" (addr), "m" (*addr) : "cc");</div><div class='add'>+		: "=d" (ccode)</div><div class='add'>+		: "d" (reg1), "a" (addr), "m" (*addr)</div><div class='add'>+		: "cc");</div><div class='ctx'> 	return ccode;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int msch_err(struct subchannel_id schid,</div><div class='del'>-			       volatile struct schib *addr)</div><div class='add'>+static inline int msch_err(struct subchannel_id schid, struct schib *addr)</div><div class='ctx'> {</div><div class='ctx'> 	register struct subchannel_id reg1 asm ("1") = schid;</div><div class='ctx'> 	int ccode = -EIO;</div><div class='hunk'>@@ -79,33 +81,38 @@ static inline int msch_err(struct subchannel_id schid,</div><div class='ctx'> 		"	srl	%0,28\n"</div><div class='ctx'> 		"1:\n"</div><div class='ctx'> 		EX_TABLE(0b,1b)</div><div class='del'>-		: "+d" (ccode) : "d" (reg1), "a" (addr), "m" (*addr) : "cc");</div><div class='add'>+		: "+d" (ccode)</div><div class='add'>+		: "d" (reg1), "a" (addr), "m" (*addr)</div><div class='add'>+		: "cc");</div><div class='ctx'> 	return ccode;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int tsch(struct subchannel_id schid,</div><div class='del'>-			   volatile struct irb *addr)</div><div class='add'>+static inline int tsch(struct subchannel_id schid, struct irb *addr)</div><div class='ctx'> {</div><div class='ctx'> 	register struct subchannel_id reg1 asm ("1") = schid;</div><div class='ctx'> 	int ccode;</div><div class='ctx'> </div><div class='ctx'> 	asm volatile(</div><div class='del'>-		"	tsch	0(%2)\n"</div><div class='add'>+		"	tsch	0(%3)\n"</div><div class='ctx'> 		"	ipm	%0\n"</div><div class='ctx'> 		"	srl	%0,28"</div><div class='del'>-		: "=d" (ccode) : "d" (reg1), "a" (addr), "m" (*addr) : "cc");</div><div class='add'>+		: "=d" (ccode), "=m" (*addr)</div><div class='add'>+		: "d" (reg1), "a" (addr)</div><div class='add'>+		: "cc");</div><div class='ctx'> 	return ccode;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int tpi( volatile struct tpi_info *addr)</div><div class='add'>+static inline int tpi(struct tpi_info *addr)</div><div class='ctx'> {</div><div class='ctx'> 	int ccode;</div><div class='ctx'> </div><div class='ctx'> 	asm volatile(</div><div class='del'>-		"	tpi	0(%1)\n"</div><div class='add'>+		"	tpi	0(%2)\n"</div><div class='ctx'> 		"	ipm	%0\n"</div><div class='ctx'> 		"	srl	%0,28"</div><div class='del'>-		: "=d" (ccode) : "a" (addr), "m" (*addr) : "cc");</div><div class='add'>+		: "=d" (ccode), "=m" (*addr)</div><div class='add'>+		: "a" (addr)</div><div class='add'>+		: "cc");</div><div class='ctx'> 	return ccode;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/s390/cio/qdio.h b/drivers/s390/cio/qdio.h<br/>index c1a70985abfa..e3ea1d5f2810 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/cio/qdio.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/s390/cio/qdio.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/cio/qdio.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/cio/qdio.h</a></div><div class='hunk'>@@ -16,6 +16,14 @@</div><div class='ctx'> #define QDIO_BUSY_BIT_GIVE_UP		2000000	/* 2 seconds = eternity */</div><div class='ctx'> #define QDIO_INPUT_THRESHOLD		500	/* 500 microseconds */</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * if an asynchronous HiperSockets queue runs full, the 10 seconds timer wait</div><div class='add'>+ * till next initiative to give transmitted skbs back to the stack is too long.</div><div class='add'>+ * Therefore polling is started in case of multicast queue is filled more</div><div class='add'>+ * than 50 percent.</div><div class='add'>+ */</div><div class='add'>+#define QDIO_IQDIO_POLL_LVL		65	/* HS multicast queue */</div><div class='add'>+</div><div class='ctx'> enum qdio_irq_states {</div><div class='ctx'> 	QDIO_IRQ_STATE_INACTIVE,</div><div class='ctx'> 	QDIO_IRQ_STATE_ESTABLISHED,</div><div class='hunk'>@@ -195,6 +203,9 @@ struct qdio_output_q {</div><div class='ctx'> 	/* PCIs are enabled for the queue */</div><div class='ctx'> 	int pci_out_enabled;</div><div class='ctx'> </div><div class='add'>+	/* IQDIO: output multiple buffers (enhanced SIGA) */</div><div class='add'>+	int use_enh_siga;</div><div class='add'>+</div><div class='ctx'> 	/* timer to check for more outbound work */</div><div class='ctx'> 	struct timer_list timer;</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/s390/cio/qdio_debug.c b/drivers/s390/cio/qdio_debug.c<br/>index 337aa3087a78..b5390821434f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/cio/qdio_debug.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/s390/cio/qdio_debug.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/cio/qdio_debug.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/cio/qdio_debug.c</a></div><div class='hunk'>@@ -155,7 +155,7 @@ static int qstat_seq_open(struct inode *inode, struct file *filp)</div><div class='ctx'> static void get_queue_name(struct qdio_q *q, struct ccw_device *cdev, char *name)</div><div class='ctx'> {</div><div class='ctx'> 	memset(name, 0, sizeof(name));</div><div class='del'>-	sprintf(name, "%s", cdev-&gt;dev.bus_id);</div><div class='add'>+	sprintf(name, "%s", dev_name(&amp;cdev-&gt;dev));</div><div class='ctx'> 	if (q-&gt;is_input_q)</div><div class='ctx'> 		sprintf(name + strlen(name), "_input");</div><div class='ctx'> 	else</div><div class='head'>diff --git a/drivers/s390/cio/qdio_main.c b/drivers/s390/cio/qdio_main.c<br/>index e6eabc853422..a50682d2a0fa 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/cio/qdio_main.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/s390/cio/qdio_main.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/cio/qdio_main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/cio/qdio_main.c</a></div><div class='hunk'>@@ -316,6 +316,9 @@ static inline int qdio_do_siga_output(struct qdio_q *q, unsigned int *busy_bit)</div><div class='ctx'> 	unsigned int fc = 0;</div><div class='ctx'> 	unsigned long schid;</div><div class='ctx'> </div><div class='add'>+	if (q-&gt;u.out.use_enh_siga) {</div><div class='add'>+		fc = 3;</div><div class='add'>+	}</div><div class='ctx'> 	if (!is_qebsm(q))</div><div class='ctx'> 		schid = *((u32 *)&amp;q-&gt;irq_ptr-&gt;schid);</div><div class='ctx'> 	else {</div><div class='hunk'>@@ -851,6 +854,12 @@ static void __qdio_outbound_processing(struct qdio_q *q)</div><div class='ctx'> 	if (queue_type(q) == QDIO_IQDIO_QFMT &amp;&amp; !multicast_outbound(q))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	if ((queue_type(q) == QDIO_IQDIO_QFMT) &amp;&amp;</div><div class='add'>+	    (atomic_read(&amp;q-&gt;nr_buf_used)) &gt; QDIO_IQDIO_POLL_LVL) {</div><div class='add'>+		tasklet_schedule(&amp;q-&gt;tasklet);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (q-&gt;u.out.pci_out_enabled)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -956,7 +965,7 @@ static void qdio_handle_activate_check(struct ccw_device *cdev,</div><div class='ctx'> 	char dbf_text[15];</div><div class='ctx'> </div><div class='ctx'> 	QDIO_DBF_TEXT2(1, trace, "ick2");</div><div class='del'>-	sprintf(dbf_text, "%s", cdev-&gt;dev.bus_id);</div><div class='add'>+	sprintf(dbf_text, "%s", dev_name(&amp;cdev-&gt;dev));</div><div class='ctx'> 	QDIO_DBF_TEXT2(1, trace, dbf_text);</div><div class='ctx'> 	QDIO_DBF_HEX2(0, trace, &amp;intparm, sizeof(int));</div><div class='ctx'> 	QDIO_DBF_HEX2(0, trace, &amp;dstat, sizeof(int));</div><div class='hunk'>@@ -1443,6 +1452,8 @@ int qdio_establish(struct qdio_initialize *init_data)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	qdio_setup_ssqd_info(irq_ptr);</div><div class='add'>+	sprintf(dbf_text, "qDmmwc%2x", irq_ptr-&gt;ssqd_desc.mmwc);</div><div class='add'>+	QDIO_DBF_TEXT2(0, setup, dbf_text);</div><div class='ctx'> 	sprintf(dbf_text, "qib ac%2x", irq_ptr-&gt;qib.ac);</div><div class='ctx'> 	QDIO_DBF_TEXT2(0, setup, dbf_text);</div><div class='ctx'> </div><div class='hunk'>@@ -1615,12 +1626,21 @@ static void handle_outbound(struct qdio_q *q, unsigned int callflags,</div><div class='ctx'> 		if (multicast_outbound(q))</div><div class='ctx'> 			qdio_kick_outbound_q(q);</div><div class='ctx'> 		else</div><div class='del'>-			/*</div><div class='del'>-			 * One siga-w per buffer required for unicast</div><div class='del'>-			 * HiperSockets.</div><div class='del'>-			 */</div><div class='del'>-			while (count--)</div><div class='add'>+			if ((q-&gt;irq_ptr-&gt;ssqd_desc.mmwc &gt; 1) &amp;&amp;</div><div class='add'>+			    (count &gt; 1) &amp;&amp;</div><div class='add'>+			    (count &lt;= q-&gt;irq_ptr-&gt;ssqd_desc.mmwc)) {</div><div class='add'>+				/* exploit enhanced SIGA */</div><div class='add'>+				q-&gt;u.out.use_enh_siga = 1;</div><div class='ctx'> 				qdio_kick_outbound_q(q);</div><div class='add'>+			} else {</div><div class='add'>+				/*</div><div class='add'>+				* One siga-w per buffer required for unicast</div><div class='add'>+				* HiperSockets.</div><div class='add'>+				*/</div><div class='add'>+				q-&gt;u.out.use_enh_siga = 0;</div><div class='add'>+				while (count--)</div><div class='add'>+					qdio_kick_outbound_q(q);</div><div class='add'>+			}</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/s390/crypto/ap_bus.c b/drivers/s390/crypto/ap_bus.c<br/>index 62b6b55230d0..326db1e827c4 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/crypto/ap_bus.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/s390/crypto/ap_bus.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/crypto/ap_bus.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/crypto/ap_bus.c</a></div><div class='hunk'>@@ -892,8 +892,8 @@ static void ap_scan_bus(struct work_struct *unused)</div><div class='ctx'> </div><div class='ctx'> 		ap_dev-&gt;device.bus = &amp;ap_bus_type;</div><div class='ctx'> 		ap_dev-&gt;device.parent = ap_root_device;</div><div class='del'>-		snprintf(ap_dev-&gt;device.bus_id, BUS_ID_SIZE, "card%02x",</div><div class='del'>-			 AP_QID_DEVICE(ap_dev-&gt;qid));</div><div class='add'>+		dev_set_name(&amp;ap_dev-&gt;device, "card%02x",</div><div class='add'>+			     AP_QID_DEVICE(ap_dev-&gt;qid));</div><div class='ctx'> 		ap_dev-&gt;device.release = ap_device_release;</div><div class='ctx'> 		rc = device_register(&amp;ap_dev-&gt;device);</div><div class='ctx'> 		if (rc) {</div><div class='head'>diff --git a/drivers/s390/kvm/kvm_virtio.c b/drivers/s390/kvm/kvm_virtio.c<br/>index 292b60da6dc7..ff4a6931bb8e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/kvm/kvm_virtio.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/s390/kvm/kvm_virtio.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/kvm/kvm_virtio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/kvm/kvm_virtio.c</a></div><div class='hunk'>@@ -24,6 +24,7 @@</div><div class='ctx'> #include &lt;asm/kvm_virtio.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/s390_ext.h&gt;</div><div class='add'>+#include &lt;asm/s390_rdev.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define VIRTIO_SUBCODE_64 0x0D00</div><div class='ctx'> </div><div class='hunk'>@@ -241,10 +242,7 @@ static struct virtio_config_ops kvm_vq_configspace_ops = {</div><div class='ctx'>  * The root device for the kvm virtio devices.</div><div class='ctx'>  * This makes them appear as /sys/devices/kvm_s390/0,1,2 not /sys/devices/0,1,2.</div><div class='ctx'>  */</div><div class='del'>-static struct device kvm_root = {</div><div class='del'>-	.parent = NULL,</div><div class='del'>-	.bus_id = "kvm_s390",</div><div class='del'>-};</div><div class='add'>+static struct device *kvm_root;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * adds a new device and register it with virtio</div><div class='hunk'>@@ -261,7 +259,7 @@ static void add_kvm_device(struct kvm_device_desc *d, unsigned int offset)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	kdev-&gt;vdev.dev.parent = &amp;kvm_root;</div><div class='add'>+	kdev-&gt;vdev.dev.parent = kvm_root;</div><div class='ctx'> 	kdev-&gt;vdev.id.device = d-&gt;type;</div><div class='ctx'> 	kdev-&gt;vdev.config = &amp;kvm_vq_configspace_ops;</div><div class='ctx'> 	kdev-&gt;desc = d;</div><div class='hunk'>@@ -317,15 +315,16 @@ static int __init kvm_devices_init(void)</div><div class='ctx'> 	if (!MACHINE_IS_KVM)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	rc = device_register(&amp;kvm_root);</div><div class='del'>-	if (rc) {</div><div class='add'>+	kvm_root = s390_root_dev_register("kvm_s390");</div><div class='add'>+	if (IS_ERR(kvm_root)) {</div><div class='add'>+		rc = PTR_ERR(kvm_root);</div><div class='ctx'> 		printk(KERN_ERR "Could not register kvm_s390 root device");</div><div class='ctx'> 		return rc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	rc = vmem_add_mapping(PFN_PHYS(max_pfn), PAGE_SIZE);</div><div class='ctx'> 	if (rc) {</div><div class='del'>-		device_unregister(&amp;kvm_root);</div><div class='add'>+		s390_root_dev_unregister(kvm_root);</div><div class='ctx'> 		return rc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/s390/net/claw.c b/drivers/s390/net/claw.c<br/>index e10ac9ab2d44..f5e618562c5f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/net/claw.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/s390/net/claw.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/net/claw.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/net/claw.c</a></div><div class='hunk'>@@ -299,7 +299,7 @@ claw_probe(struct ccwgroup_device *cgdev)</div><div class='ctx'> 		probe_error(cgdev);</div><div class='ctx'> 		put_device(&amp;cgdev-&gt;dev);</div><div class='ctx'> 		printk(KERN_WARNING "add_files failed %s %s Exit Line %d \n",</div><div class='del'>-			cgdev-&gt;cdev[0]-&gt;dev.bus_id,__func__,__LINE__);</div><div class='add'>+			dev_name(&amp;cgdev-&gt;cdev[0]-&gt;dev), __func__, __LINE__);</div><div class='ctx'> 		CLAW_DBF_TEXT_(2, setup, "probex%d", rc);</div><div class='ctx'> 		return rc;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -584,7 +584,7 @@ claw_irq_handler(struct ccw_device *cdev,</div><div class='ctx'> 	if (!cdev-&gt;dev.driver_data) {</div><div class='ctx'>                 printk(KERN_WARNING "claw: unsolicited interrupt for device:"</div><div class='ctx'> 		 	"%s received c-%02x d-%02x\n",</div><div class='del'>-		       cdev-&gt;dev.bus_id, irb-&gt;scsw.cmd.cstat,</div><div class='add'>+		       dev_name(&amp;cdev-&gt;dev), irb-&gt;scsw.cmd.cstat,</div><div class='ctx'> 		       irb-&gt;scsw.cmd.dstat);</div><div class='ctx'> 		CLAW_DBF_TEXT(2, trace, "badirq");</div><div class='ctx'>                 return;</div><div class='hunk'>@@ -598,7 +598,7 @@ claw_irq_handler(struct ccw_device *cdev,</div><div class='ctx'> 		p_ch = &amp;privptr-&gt;channel[WRITE];</div><div class='ctx'> 	else {</div><div class='ctx'> 		printk(KERN_WARNING "claw: Can't determine channel for "</div><div class='del'>-			"interrupt, device %s\n", cdev-&gt;dev.bus_id);</div><div class='add'>+			"interrupt, device %s\n", dev_name(&amp;cdev-&gt;dev));</div><div class='ctx'> 		CLAW_DBF_TEXT(2, trace, "badchan");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -662,7 +662,7 @@ claw_irq_handler(struct ccw_device *cdev,</div><div class='ctx'> 			printk(KERN_WARNING "claw: unsolicited "</div><div class='ctx'> 				"interrupt for device:"</div><div class='ctx'> 				"%s received c-%02x d-%02x\n",</div><div class='del'>-				cdev-&gt;dev.bus_id,</div><div class='add'>+				dev_name(&amp;cdev-&gt;dev),</div><div class='ctx'> 				irb-&gt;scsw.cmd.cstat,</div><div class='ctx'> 				irb-&gt;scsw.cmd.dstat);</div><div class='ctx'> 			return;</div><div class='hunk'>@@ -1136,19 +1136,20 @@ ccw_check_return_code(struct ccw_device *cdev, int return_code)</div><div class='ctx'> 			break;</div><div class='ctx'> 		case -ENODEV:</div><div class='ctx'> 			printk(KERN_EMERG "%s: Missing device called "</div><div class='del'>-				"for IO ENODEV\n", cdev-&gt;dev.bus_id);</div><div class='add'>+				"for IO ENODEV\n", dev_name(&amp;cdev-&gt;dev));</div><div class='ctx'> 			break;</div><div class='ctx'> 		case -EIO:</div><div class='ctx'> 			printk(KERN_EMERG "%s: Status pending... EIO \n",</div><div class='del'>-				cdev-&gt;dev.bus_id);</div><div class='add'>+				dev_name(&amp;cdev-&gt;dev));</div><div class='ctx'> 			break;</div><div class='ctx'> 		case -EINVAL:</div><div class='ctx'> 			printk(KERN_EMERG "%s: Invalid Dev State EINVAL \n",</div><div class='del'>-				cdev-&gt;dev.bus_id);</div><div class='add'>+				dev_name(&amp;cdev-&gt;dev));</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			printk(KERN_EMERG "%s: Unknown error in "</div><div class='del'>-				 "Do_IO %d\n",cdev-&gt;dev.bus_id, return_code);</div><div class='add'>+				 "Do_IO %d\n", dev_name(&amp;cdev-&gt;dev),</div><div class='add'>+			       return_code);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	CLAW_DBF_TEXT(4, trace, "ccwret");</div><div class='hunk'>@@ -2848,11 +2849,11 @@ add_channel(struct ccw_device *cdev,int i,struct claw_privbk *privptr)</div><div class='ctx'> 	struct chbk *p_ch;</div><div class='ctx'> 	struct ccw_dev_id dev_id;</div><div class='ctx'> </div><div class='del'>-	CLAW_DBF_TEXT_(2, setup, "%s", cdev-&gt;dev.bus_id);</div><div class='add'>+	CLAW_DBF_TEXT_(2, setup, "%s", dev_name(&amp;cdev-&gt;dev));</div><div class='ctx'> 	privptr-&gt;channel[i].flag  = i+1;   /* Read is 1 Write is 2 */</div><div class='ctx'> 	p_ch = &amp;privptr-&gt;channel[i];</div><div class='ctx'> 	p_ch-&gt;cdev = cdev;</div><div class='del'>-	snprintf(p_ch-&gt;id, CLAW_ID_SIZE, "cl-%s", cdev-&gt;dev.bus_id);</div><div class='add'>+	snprintf(p_ch-&gt;id, CLAW_ID_SIZE, "cl-%s", dev_name(&amp;cdev-&gt;dev));</div><div class='ctx'> 	ccw_device_get_id(cdev, &amp;dev_id);</div><div class='ctx'> 	p_ch-&gt;devno = dev_id.devno;</div><div class='ctx'> 	if ((p_ch-&gt;irb = kzalloc(sizeof (struct irb),GFP_KERNEL)) == NULL) {</div><div class='hunk'>@@ -2879,7 +2880,8 @@ claw_new_device(struct ccwgroup_device *cgdev)</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct ccw_dev_id dev_id;</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "claw: add for %s\n",cgdev-&gt;cdev[READ]-&gt;dev.bus_id);</div><div class='add'>+	printk(KERN_INFO "claw: add for %s\n",</div><div class='add'>+	       dev_name(&amp;cgdev-&gt;cdev[READ]-&gt;dev));</div><div class='ctx'> 	CLAW_DBF_TEXT(2, setup, "new_dev");</div><div class='ctx'> 	privptr = cgdev-&gt;dev.driver_data;</div><div class='ctx'> 	cgdev-&gt;cdev[READ]-&gt;dev.driver_data = privptr;</div><div class='hunk'>@@ -2903,14 +2905,16 @@ claw_new_device(struct ccwgroup_device *cgdev)</div><div class='ctx'> 	if (ret != 0) {</div><div class='ctx'> 		printk(KERN_WARNING</div><div class='ctx'> 			"claw: ccw_device_set_online %s READ failed "</div><div class='del'>-			"with ret = %d\n",cgdev-&gt;cdev[READ]-&gt;dev.bus_id,ret);</div><div class='add'>+		       "with ret = %d\n", dev_name(&amp;cgdev-&gt;cdev[READ]-&gt;dev),</div><div class='add'>+		       ret);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	ret = ccw_device_set_online(cgdev-&gt;cdev[WRITE]);</div><div class='ctx'> 	if (ret != 0) {</div><div class='ctx'> 		printk(KERN_WARNING</div><div class='ctx'> 			"claw: ccw_device_set_online %s WRITE failed "</div><div class='del'>-			"with ret = %d\n",cgdev-&gt;cdev[WRITE]-&gt;dev.bus_id, ret);</div><div class='add'>+		       "with ret = %d\n", dev_name(&amp;cgdev-&gt;cdev[WRITE]-&gt;dev),</div><div class='add'>+		       ret);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	dev = alloc_netdev(0,"claw%d",claw_init_netdevice);</div><div class='hunk'>@@ -2986,7 +2990,7 @@ claw_shutdown_device(struct ccwgroup_device *cgdev)</div><div class='ctx'> 	struct net_device *ndev;</div><div class='ctx'> 	int	ret;</div><div class='ctx'> </div><div class='del'>-	CLAW_DBF_TEXT_(2, setup, "%s", cgdev-&gt;dev.bus_id);</div><div class='add'>+	CLAW_DBF_TEXT_(2, setup, "%s", dev_name(&amp;cgdev-&gt;dev));</div><div class='ctx'> 	priv = cgdev-&gt;dev.driver_data;</div><div class='ctx'> 	if (!priv)</div><div class='ctx'> 		return -ENODEV;</div><div class='hunk'>@@ -3016,11 +3020,11 @@ claw_remove_device(struct ccwgroup_device *cgdev)</div><div class='ctx'> 	struct claw_privbk *priv;</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(!cgdev);</div><div class='del'>-	CLAW_DBF_TEXT_(2, setup, "%s", cgdev-&gt;dev.bus_id);</div><div class='add'>+	CLAW_DBF_TEXT_(2, setup, "%s", dev_name(&amp;cgdev-&gt;dev));</div><div class='ctx'> 	priv = cgdev-&gt;dev.driver_data;</div><div class='ctx'> 	BUG_ON(!priv);</div><div class='ctx'> 	printk(KERN_INFO "claw: %s() called %s will be removed.\n",</div><div class='del'>-			__func__,cgdev-&gt;cdev[0]-&gt;dev.bus_id);</div><div class='add'>+			__func__, dev_name(&amp;cgdev-&gt;cdev[0]-&gt;dev));</div><div class='ctx'> 	if (cgdev-&gt;state == CCWGROUP_ONLINE)</div><div class='ctx'> 		claw_shutdown_device(cgdev);</div><div class='ctx'> 	claw_remove_files(&amp;cgdev-&gt;dev);</div><div class='head'>diff --git a/drivers/s390/net/claw.h b/drivers/s390/net/claw.h<br/>index 1a89d989f348..005072c420d3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/net/claw.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/s390/net/claw.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/net/claw.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/net/claw.h</a></div><div class='hunk'>@@ -85,7 +85,7 @@</div><div class='ctx'> #define CLAW_MAX_DEV            256        /*      max claw devices          */</div><div class='ctx'> #define MAX_NAME_LEN            8          /* host name, adapter name length */</div><div class='ctx'> #define CLAW_FRAME_SIZE         4096</div><div class='del'>-#define CLAW_ID_SIZE            BUS_ID_SIZE+3</div><div class='add'>+#define CLAW_ID_SIZE		20+3</div><div class='ctx'> </div><div class='ctx'> /* state machine codes used in claw_irq_handler */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/s390/net/ctcm_main.c b/drivers/s390/net/ctcm_main.c<br/>index b11fec24c7d2..a4e29836a2aa 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/net/ctcm_main.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/s390/net/ctcm_main.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/net/ctcm_main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/net/ctcm_main.c</a></div><div class='hunk'>@@ -277,18 +277,18 @@ static long ctcm_check_irb_error(struct ccw_device *cdev, struct irb *irb)</div><div class='ctx'> </div><div class='ctx'> 	CTCM_DBF_TEXT_(ERROR, CTC_DBF_WARN,</div><div class='ctx'> 			"irb error %ld on device %s\n",</div><div class='del'>-				PTR_ERR(irb), cdev-&gt;dev.bus_id);</div><div class='add'>+				PTR_ERR(irb), dev_name(&amp;cdev-&gt;dev));</div><div class='ctx'> </div><div class='ctx'> 	switch (PTR_ERR(irb)) {</div><div class='ctx'> 	case -EIO:</div><div class='del'>-		ctcm_pr_warn("i/o-error on device %s\n", cdev-&gt;dev.bus_id);</div><div class='add'>+		ctcm_pr_warn("i/o-error on device %s\n", dev_name(&amp;cdev-&gt;dev));</div><div class='ctx'> 		break;</div><div class='ctx'> 	case -ETIMEDOUT:</div><div class='del'>-		ctcm_pr_warn("timeout on device %s\n", cdev-&gt;dev.bus_id);</div><div class='add'>+		ctcm_pr_warn("timeout on device %s\n", dev_name(&amp;cdev-&gt;dev));</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		ctcm_pr_warn("unknown error %ld on device %s\n",</div><div class='del'>-				PTR_ERR(irb), cdev-&gt;dev.bus_id);</div><div class='add'>+				PTR_ERR(irb), dev_name(&amp;cdev-&gt;dev));</div><div class='ctx'> 	}</div><div class='ctx'> 	return PTR_ERR(irb);</div><div class='ctx'> }</div><div class='hunk'>@@ -1182,7 +1182,7 @@ static void ctcm_irq_handler(struct ccw_device *cdev,</div><div class='ctx'> 	int dstat;</div><div class='ctx'> </div><div class='ctx'> 	CTCM_DBF_TEXT_(TRACE, CTC_DBF_DEBUG,</div><div class='del'>-		"Enter %s(%s)", CTCM_FUNTAIL, &amp;cdev-&gt;dev.bus_id);</div><div class='add'>+		"Enter %s(%s)", CTCM_FUNTAIL, dev_name(&amp;cdev-&gt;dev));</div><div class='ctx'> </div><div class='ctx'> 	if (ctcm_check_irb_error(cdev, irb))</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -1208,14 +1208,14 @@ static void ctcm_irq_handler(struct ccw_device *cdev,</div><div class='ctx'> 		ch = priv-&gt;channel[WRITE];</div><div class='ctx'> 	else {</div><div class='ctx'> 		ctcm_pr_err("ctcm: Can't determine channel for interrupt, "</div><div class='del'>-			   "device %s\n", cdev-&gt;dev.bus_id);</div><div class='add'>+			   "device %s\n", dev_name(&amp;cdev-&gt;dev));</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dev = ch-&gt;netdev;</div><div class='ctx'> 	if (dev == NULL) {</div><div class='ctx'> 		ctcm_pr_crit("ctcm: %s dev=NULL bus_id=%s, ch=0x%p\n",</div><div class='del'>-				__func__, cdev-&gt;dev.bus_id, ch);</div><div class='add'>+				__func__, dev_name(&amp;cdev-&gt;dev), ch);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1329,7 +1329,7 @@ static int add_channel(struct ccw_device *cdev, enum channel_types type,</div><div class='ctx'> </div><div class='ctx'> 	CTCM_DBF_TEXT_(SETUP, CTC_DBF_INFO,</div><div class='ctx'> 		"%s(%s), type %d, proto %d",</div><div class='del'>-			__func__, cdev-&gt;dev.bus_id,	type, priv-&gt;protocol);</div><div class='add'>+			__func__, dev_name(&amp;cdev-&gt;dev),	type, priv-&gt;protocol);</div><div class='ctx'> </div><div class='ctx'> 	ch = kzalloc(sizeof(struct channel), GFP_KERNEL);</div><div class='ctx'> 	if (ch == NULL)</div><div class='hunk'>@@ -1358,7 +1358,7 @@ static int add_channel(struct ccw_device *cdev, enum channel_types type,</div><div class='ctx'> 					goto nomem_return;</div><div class='ctx'> </div><div class='ctx'> 	ch-&gt;cdev = cdev;</div><div class='del'>-	snprintf(ch-&gt;id, CTCM_ID_SIZE, "ch-%s", cdev-&gt;dev.bus_id);</div><div class='add'>+	snprintf(ch-&gt;id, CTCM_ID_SIZE, "ch-%s", dev_name(&amp;cdev-&gt;dev));</div><div class='ctx'> 	ch-&gt;type = type;</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='hunk'>@@ -1518,8 +1518,8 @@ static int ctcm_new_device(struct ccwgroup_device *cgdev)</div><div class='ctx'> </div><div class='ctx'> 	type = get_channel_type(&amp;cdev0-&gt;id);</div><div class='ctx'> </div><div class='del'>-	snprintf(read_id, CTCM_ID_SIZE, "ch-%s", cdev0-&gt;dev.bus_id);</div><div class='del'>-	snprintf(write_id, CTCM_ID_SIZE, "ch-%s", cdev1-&gt;dev.bus_id);</div><div class='add'>+	snprintf(read_id, CTCM_ID_SIZE, "ch-%s", dev_name(&amp;cdev0-&gt;dev));</div><div class='add'>+	snprintf(write_id, CTCM_ID_SIZE, "ch-%s", dev_name(&amp;cdev1-&gt;dev));</div><div class='ctx'> </div><div class='ctx'> 	ret = add_channel(cdev0, type, priv);</div><div class='ctx'> 	if (ret)</div><div class='head'>diff --git a/drivers/s390/net/ctcm_main.h b/drivers/s390/net/ctcm_main.h<br/>index 8e10ee86a5ee..d77cce3fe4d4 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/net/ctcm_main.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/s390/net/ctcm_main.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/net/ctcm_main.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/net/ctcm_main.h</a></div><div class='hunk'>@@ -104,7 +104,7 @@</div><div class='ctx'> #define READ			0</div><div class='ctx'> #define WRITE			1</div><div class='ctx'> </div><div class='del'>-#define CTCM_ID_SIZE		BUS_ID_SIZE+3</div><div class='add'>+#define CTCM_ID_SIZE		20+3</div><div class='ctx'> </div><div class='ctx'> struct ctcm_profile {</div><div class='ctx'> 	unsigned long maxmulti;</div><div class='head'>diff --git a/drivers/s390/net/ctcm_mpc.c b/drivers/s390/net/ctcm_mpc.c<br/>index cbe470493bf0..19f5d5ed85e0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/net/ctcm_mpc.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/s390/net/ctcm_mpc.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/net/ctcm_mpc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/net/ctcm_mpc.c</a></div><div class='hunk'>@@ -1673,7 +1673,7 @@ static int mpc_validate_xid(struct mpcg_info *mpcginfo)</div><div class='ctx'> </div><div class='ctx'> done:</div><div class='ctx'> 	if (rc) {</div><div class='del'>-		ctcm_pr_info("ctcmpc	   :  %s() failed\n", __FUNCTION__);</div><div class='add'>+		ctcm_pr_info("ctcmpc	   :  %s() failed\n", __func__);</div><div class='ctx'> 		priv-&gt;xid-&gt;xid2_flag2 = 0x40;</div><div class='ctx'> 		grp-&gt;saved_xid2-&gt;xid2_flag2 = 0x40;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/s390/net/lcs.c b/drivers/s390/net/lcs.c<br/>index 9bcfa04d863b..0825be87e5a0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/net/lcs.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/s390/net/lcs.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/net/lcs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/net/lcs.c</a></div><div class='hunk'>@@ -492,7 +492,7 @@ lcs_start_channel(struct lcs_channel *channel)</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	LCS_DBF_TEXT_(4,trace,"ssch%s", channel-&gt;ccwdev-&gt;dev.bus_id);</div><div class='add'>+	LCS_DBF_TEXT_(4, trace,"ssch%s", dev_name(&amp;channel-&gt;ccwdev-&gt;dev));</div><div class='ctx'> 	spin_lock_irqsave(get_ccwdev_lock(channel-&gt;ccwdev), flags);</div><div class='ctx'> 	rc = ccw_device_start(channel-&gt;ccwdev,</div><div class='ctx'> 			      channel-&gt;ccws + channel-&gt;io_idx, 0, 0,</div><div class='hunk'>@@ -501,7 +501,8 @@ lcs_start_channel(struct lcs_channel *channel)</div><div class='ctx'> 		channel-&gt;state = LCS_CH_STATE_RUNNING;</div><div class='ctx'> 	spin_unlock_irqrestore(get_ccwdev_lock(channel-&gt;ccwdev), flags);</div><div class='ctx'> 	if (rc) {</div><div class='del'>-		LCS_DBF_TEXT_(4,trace,"essh%s", channel-&gt;ccwdev-&gt;dev.bus_id);</div><div class='add'>+		LCS_DBF_TEXT_(4,trace,"essh%s",</div><div class='add'>+			      dev_name(&amp;channel-&gt;ccwdev-&gt;dev));</div><div class='ctx'> 		PRINT_ERR("Error in starting channel, rc=%d!\n", rc);</div><div class='ctx'> 	}</div><div class='ctx'> 	return rc;</div><div class='hunk'>@@ -514,12 +515,13 @@ lcs_clear_channel(struct lcs_channel *channel)</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	LCS_DBF_TEXT(4,trace,"clearch");</div><div class='del'>-	LCS_DBF_TEXT_(4,trace,"%s", channel-&gt;ccwdev-&gt;dev.bus_id);</div><div class='add'>+	LCS_DBF_TEXT_(4, trace, "%s", dev_name(&amp;channel-&gt;ccwdev-&gt;dev));</div><div class='ctx'> 	spin_lock_irqsave(get_ccwdev_lock(channel-&gt;ccwdev), flags);</div><div class='ctx'> 	rc = ccw_device_clear(channel-&gt;ccwdev, (addr_t) channel);</div><div class='ctx'> 	spin_unlock_irqrestore(get_ccwdev_lock(channel-&gt;ccwdev), flags);</div><div class='ctx'> 	if (rc) {</div><div class='del'>-		LCS_DBF_TEXT_(4,trace,"ecsc%s", channel-&gt;ccwdev-&gt;dev.bus_id);</div><div class='add'>+		LCS_DBF_TEXT_(4, trace, "ecsc%s",</div><div class='add'>+			      dev_name(&amp;channel-&gt;ccwdev-&gt;dev));</div><div class='ctx'> 		return rc;</div><div class='ctx'> 	}</div><div class='ctx'> 	wait_event(channel-&gt;wait_q, (channel-&gt;state == LCS_CH_STATE_CLEARED));</div><div class='hunk'>@@ -540,13 +542,14 @@ lcs_stop_channel(struct lcs_channel *channel)</div><div class='ctx'> 	if (channel-&gt;state == LCS_CH_STATE_STOPPED)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	LCS_DBF_TEXT(4,trace,"haltsch");</div><div class='del'>-	LCS_DBF_TEXT_(4,trace,"%s", channel-&gt;ccwdev-&gt;dev.bus_id);</div><div class='add'>+	LCS_DBF_TEXT_(4, trace, "%s", dev_name(&amp;channel-&gt;ccwdev-&gt;dev));</div><div class='ctx'> 	channel-&gt;state = LCS_CH_STATE_INIT;</div><div class='ctx'> 	spin_lock_irqsave(get_ccwdev_lock(channel-&gt;ccwdev), flags);</div><div class='ctx'> 	rc = ccw_device_halt(channel-&gt;ccwdev, (addr_t) channel);</div><div class='ctx'> 	spin_unlock_irqrestore(get_ccwdev_lock(channel-&gt;ccwdev), flags);</div><div class='ctx'> 	if (rc) {</div><div class='del'>-		LCS_DBF_TEXT_(4,trace,"ehsc%s", channel-&gt;ccwdev-&gt;dev.bus_id);</div><div class='add'>+		LCS_DBF_TEXT_(4, trace, "ehsc%s",</div><div class='add'>+			      dev_name(&amp;channel-&gt;ccwdev-&gt;dev));</div><div class='ctx'> 		return rc;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Asynchronous halt initialted. Wait for its completion. */</div><div class='hunk'>@@ -632,10 +635,11 @@ __lcs_resume_channel(struct lcs_channel *channel)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	if (channel-&gt;ccws[channel-&gt;io_idx].flags &amp; CCW_FLAG_SUSPEND)</div><div class='ctx'> 		return 0;</div><div class='del'>-	LCS_DBF_TEXT_(5, trace, "rsch%s", channel-&gt;ccwdev-&gt;dev.bus_id);</div><div class='add'>+	LCS_DBF_TEXT_(5, trace, "rsch%s", dev_name(&amp;channel-&gt;ccwdev-&gt;dev));</div><div class='ctx'> 	rc = ccw_device_resume(channel-&gt;ccwdev);</div><div class='ctx'> 	if (rc) {</div><div class='del'>-		LCS_DBF_TEXT_(4, trace, "ersc%s", channel-&gt;ccwdev-&gt;dev.bus_id);</div><div class='add'>+		LCS_DBF_TEXT_(4, trace, "ersc%s",</div><div class='add'>+			      dev_name(&amp;channel-&gt;ccwdev-&gt;dev));</div><div class='ctx'> 		PRINT_ERR("Error in lcs_resume_channel: rc=%d\n",rc);</div><div class='ctx'> 	} else</div><div class='ctx'> 		channel-&gt;state = LCS_CH_STATE_RUNNING;</div><div class='hunk'>@@ -1302,18 +1306,18 @@ lcs_check_irb_error(struct ccw_device *cdev, struct irb *irb)</div><div class='ctx'> </div><div class='ctx'> 	switch (PTR_ERR(irb)) {</div><div class='ctx'> 	case -EIO:</div><div class='del'>-		PRINT_WARN("i/o-error on device %s\n", cdev-&gt;dev.bus_id);</div><div class='add'>+		PRINT_WARN("i/o-error on device %s\n", dev_name(&amp;cdev-&gt;dev));</div><div class='ctx'> 		LCS_DBF_TEXT(2, trace, "ckirberr");</div><div class='ctx'> 		LCS_DBF_TEXT_(2, trace, "  rc%d", -EIO);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case -ETIMEDOUT:</div><div class='del'>-		PRINT_WARN("timeout on device %s\n", cdev-&gt;dev.bus_id);</div><div class='add'>+		PRINT_WARN("timeout on device %s\n", dev_name(&amp;cdev-&gt;dev));</div><div class='ctx'> 		LCS_DBF_TEXT(2, trace, "ckirberr");</div><div class='ctx'> 		LCS_DBF_TEXT_(2, trace, "  rc%d", -ETIMEDOUT);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		PRINT_WARN("unknown error %ld on device %s\n", PTR_ERR(irb),</div><div class='del'>-			   cdev-&gt;dev.bus_id);</div><div class='add'>+			   dev_name(&amp;cdev-&gt;dev));</div><div class='ctx'> 		LCS_DBF_TEXT(2, trace, "ckirberr");</div><div class='ctx'> 		LCS_DBF_TEXT(2, trace, "  rc???");</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1390,7 +1394,7 @@ lcs_irq(struct ccw_device *cdev, unsigned long intparm, struct irb *irb)</div><div class='ctx'> </div><div class='ctx'> 	cstat = irb-&gt;scsw.cmd.cstat;</div><div class='ctx'> 	dstat = irb-&gt;scsw.cmd.dstat;</div><div class='del'>-	LCS_DBF_TEXT_(5, trace, "Rint%s",cdev-&gt;dev.bus_id);</div><div class='add'>+	LCS_DBF_TEXT_(5, trace, "Rint%s", dev_name(&amp;cdev-&gt;dev));</div><div class='ctx'> 	LCS_DBF_TEXT_(5, trace, "%4x%4x", irb-&gt;scsw.cmd.cstat,</div><div class='ctx'> 		      irb-&gt;scsw.cmd.dstat);</div><div class='ctx'> 	LCS_DBF_TEXT_(5, trace, "%4x%4x", irb-&gt;scsw.cmd.fctl,</div><div class='hunk'>@@ -1400,7 +1404,7 @@ lcs_irq(struct ccw_device *cdev, unsigned long intparm, struct irb *irb)</div><div class='ctx'> 	rc = lcs_get_problem(cdev, irb);</div><div class='ctx'> 	if (rc || (dstat &amp; DEV_STAT_UNIT_EXCEP)) {</div><div class='ctx'> 		PRINT_WARN("check on device %s, dstat=0x%X, cstat=0x%X \n",</div><div class='del'>-			    cdev-&gt;dev.bus_id, dstat, cstat);</div><div class='add'>+			    dev_name(&amp;cdev-&gt;dev), dstat, cstat);</div><div class='ctx'> 		if (rc) {</div><div class='ctx'> 			channel-&gt;state = LCS_CH_STATE_ERROR;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1463,7 +1467,7 @@ lcs_tasklet(unsigned long data)</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	channel = (struct lcs_channel *) data;</div><div class='del'>-	LCS_DBF_TEXT_(5, trace, "tlet%s",channel-&gt;ccwdev-&gt;dev.bus_id);</div><div class='add'>+	LCS_DBF_TEXT_(5, trace, "tlet%s", dev_name(&amp;channel-&gt;ccwdev-&gt;dev));</div><div class='ctx'> </div><div class='ctx'> 	/* Check for processed buffers. */</div><div class='ctx'> 	iob = channel-&gt;iob;</div><div class='hunk'>@@ -2244,7 +2248,7 @@ lcs_recovery(void *ptr)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	LCS_DBF_TEXT(4, trace, "recover2");</div><div class='ctx'> 	gdev = card-&gt;gdev;</div><div class='del'>-	PRINT_WARN("Recovery of device %s started...\n", gdev-&gt;dev.bus_id);</div><div class='add'>+	PRINT_WARN("Recovery of device %s started...\n", dev_name(&amp;gdev-&gt;dev));</div><div class='ctx'> 	rc = __lcs_shutdown_device(gdev, 1);</div><div class='ctx'> 	rc = lcs_new_device(gdev);</div><div class='ctx'> 	if (!rc)</div><div class='head'>diff --git a/drivers/s390/net/netiucv.c b/drivers/s390/net/netiucv.c<br/>index 9242b5acc66b..0fea51e34b57 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/net/netiucv.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/s390/net/netiucv.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/net/netiucv.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/net/netiucv.c</a></div><div class='hunk'>@@ -1724,7 +1724,7 @@ static int netiucv_register_device(struct net_device *ndev)</div><div class='ctx'> 	IUCV_DBF_TEXT(trace, 3, __func__);</div><div class='ctx'> </div><div class='ctx'> 	if (dev) {</div><div class='del'>-		snprintf(dev-&gt;bus_id, BUS_ID_SIZE, "net%s", ndev-&gt;name);</div><div class='add'>+		dev_set_name(dev, "net%s", ndev-&gt;name);</div><div class='ctx'> 		dev-&gt;bus = &amp;iucv_bus;</div><div class='ctx'> 		dev-&gt;parent = iucv_root;</div><div class='ctx'> 		/*</div><div class='head'>diff --git a/drivers/s390/net/qeth_core.h b/drivers/s390/net/qeth_core.h<br/>index bf8a75c92f28..af6d60458513 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/net/qeth_core.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/s390/net/qeth_core.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/net/qeth_core.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/net/qeth_core.h</a></div><div class='hunk'>@@ -90,11 +90,11 @@ struct qeth_dbf_info {</div><div class='ctx'> #define CARD_RDEV(card) card-&gt;read.ccwdev</div><div class='ctx'> #define CARD_WDEV(card) card-&gt;write.ccwdev</div><div class='ctx'> #define CARD_DDEV(card) card-&gt;data.ccwdev</div><div class='del'>-#define CARD_BUS_ID(card) card-&gt;gdev-&gt;dev.bus_id</div><div class='del'>-#define CARD_RDEV_ID(card) card-&gt;read.ccwdev-&gt;dev.bus_id</div><div class='del'>-#define CARD_WDEV_ID(card) card-&gt;write.ccwdev-&gt;dev.bus_id</div><div class='del'>-#define CARD_DDEV_ID(card) card-&gt;data.ccwdev-&gt;dev.bus_id</div><div class='del'>-#define CHANNEL_ID(channel) channel-&gt;ccwdev-&gt;dev.bus_id</div><div class='add'>+#define CARD_BUS_ID(card) dev_name(&amp;card-&gt;gdev-&gt;dev)</div><div class='add'>+#define CARD_RDEV_ID(card) dev_name(&amp;card-&gt;read.ccwdev-&gt;dev)</div><div class='add'>+#define CARD_WDEV_ID(card) dev_name(&amp;card-&gt;write.ccwdev-&gt;dev)</div><div class='add'>+#define CARD_DDEV_ID(card) dev_name(&amp;card-&gt;data.ccwdev-&gt;dev)</div><div class='add'>+#define CHANNEL_ID(channel) dev_name(&amp;channel-&gt;ccwdev-&gt;dev)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * card stuff</div><div class='head'>diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c<br/>index c7ab1b864516..7de410d5be4a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/net/qeth_core_main.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/s390/net/qeth_core_main.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/net/qeth_core_main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/net/qeth_core_main.c</a></div><div class='hunk'>@@ -745,7 +745,7 @@ static int qeth_get_problem(struct ccw_device *cdev, struct irb *irb)</div><div class='ctx'> 		     SCHN_STAT_PROT_CHECK | SCHN_STAT_PROG_CHECK)) {</div><div class='ctx'> 		QETH_DBF_TEXT(TRACE, 2, "CGENCHK");</div><div class='ctx'> 		PRINT_WARN("check on device %s, dstat=x%x, cstat=x%x ",</div><div class='del'>-			   cdev-&gt;dev.bus_id, dstat, cstat);</div><div class='add'>+			   dev_name(&amp;cdev-&gt;dev), dstat, cstat);</div><div class='ctx'> 		print_hex_dump(KERN_WARNING, "qeth: irb ", DUMP_PREFIX_OFFSET,</div><div class='ctx'> 				16, 1, irb, 64, 1);</div><div class='ctx'> 		return 1;</div><div class='hunk'>@@ -760,7 +760,7 @@ static int qeth_get_problem(struct ccw_device *cdev, struct irb *irb)</div><div class='ctx'> 		if (sense[SENSE_COMMAND_REJECT_BYTE] &amp;</div><div class='ctx'> 		    SENSE_COMMAND_REJECT_FLAG) {</div><div class='ctx'> 			QETH_DBF_TEXT(TRACE, 2, "CMDREJi");</div><div class='del'>-			return 0;</div><div class='add'>+			return 1;</div><div class='ctx'> 		}</div><div class='ctx'> 		if ((sense[2] == 0xaf) &amp;&amp; (sense[3] == 0xfe)) {</div><div class='ctx'> 			QETH_DBF_TEXT(TRACE, 2, "AFFE");</div><div class='hunk'>@@ -784,12 +784,12 @@ static long __qeth_check_irb_error(struct ccw_device *cdev,</div><div class='ctx'> </div><div class='ctx'> 	switch (PTR_ERR(irb)) {</div><div class='ctx'> 	case -EIO:</div><div class='del'>-		PRINT_WARN("i/o-error on device %s\n", cdev-&gt;dev.bus_id);</div><div class='add'>+		PRINT_WARN("i/o-error on device %s\n", dev_name(&amp;cdev-&gt;dev));</div><div class='ctx'> 		QETH_DBF_TEXT(TRACE, 2, "ckirberr");</div><div class='ctx'> 		QETH_DBF_TEXT_(TRACE, 2, "  rc%d", -EIO);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case -ETIMEDOUT:</div><div class='del'>-		PRINT_WARN("timeout on device %s\n", cdev-&gt;dev.bus_id);</div><div class='add'>+		PRINT_WARN("timeout on device %s\n", dev_name(&amp;cdev-&gt;dev));</div><div class='ctx'> 		QETH_DBF_TEXT(TRACE, 2, "ckirberr");</div><div class='ctx'> 		QETH_DBF_TEXT_(TRACE, 2, "  rc%d", -ETIMEDOUT);</div><div class='ctx'> 		if (intparm == QETH_RCD_PARM) {</div><div class='hunk'>@@ -803,7 +803,7 @@ static long __qeth_check_irb_error(struct ccw_device *cdev,</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		PRINT_WARN("unknown error %ld on device %s\n", PTR_ERR(irb),</div><div class='del'>-			   cdev-&gt;dev.bus_id);</div><div class='add'>+			   dev_name(&amp;cdev-&gt;dev));</div><div class='ctx'> 		QETH_DBF_TEXT(TRACE, 2, "ckirberr");</div><div class='ctx'> 		QETH_DBF_TEXT(TRACE, 2, "  rc???");</div><div class='ctx'> 	}</div><div class='hunk'>@@ -884,6 +884,7 @@ static void qeth_irq(struct ccw_device *cdev, unsigned long intparm,</div><div class='ctx'> 		}</div><div class='ctx'> 		rc = qeth_get_problem(cdev, irb);</div><div class='ctx'> 		if (rc) {</div><div class='add'>+			qeth_clear_ipacmd_list(card);</div><div class='ctx'> 			qeth_schedule_recovery(card);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -4081,7 +4082,7 @@ static int qeth_core_probe_device(struct ccwgroup_device *gdev)</div><div class='ctx'> 	if (!get_device(dev))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	QETH_DBF_TEXT_(SETUP, 2, "%s", gdev-&gt;dev.bus_id);</div><div class='add'>+	QETH_DBF_TEXT_(SETUP, 2, "%s", dev_name(&amp;gdev-&gt;dev));</div><div class='ctx'> </div><div class='ctx'> 	card = qeth_alloc_card();</div><div class='ctx'> 	if (!card) {</div><div class='hunk'>@@ -4147,6 +4148,7 @@ static void qeth_core_remove_device(struct ccwgroup_device *gdev)</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	struct qeth_card *card = dev_get_drvdata(&amp;gdev-&gt;dev);</div><div class='ctx'> </div><div class='add'>+	QETH_DBF_TEXT(SETUP, 2, "removedv");</div><div class='ctx'> 	if (card-&gt;discipline.ccwgdriver) {</div><div class='ctx'> 		card-&gt;discipline.ccwgdriver-&gt;remove(gdev);</div><div class='ctx'> 		qeth_core_free_discipline(card);</div><div class='head'>diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c<br/>index 3ac3cc1e03cc..955ba7a31b90 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/net/qeth_l2_main.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/s390/net/qeth_l2_main.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/net/qeth_l2_main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/net/qeth_l2_main.c</a></div><div class='hunk'>@@ -395,7 +395,8 @@ static int qeth_l2_stop_card(struct qeth_card *card, int recovery_mode)</div><div class='ctx'> 	}</div><div class='ctx'> 	if (card-&gt;state == CARD_STATE_SOFTSETUP) {</div><div class='ctx'> 		qeth_l2_process_vlans(card, 1);</div><div class='del'>-		qeth_l2_del_all_mc(card);</div><div class='add'>+		if (!card-&gt;use_hard_stop)</div><div class='add'>+			qeth_l2_del_all_mc(card);</div><div class='ctx'> 		qeth_clear_ipacmd_list(card);</div><div class='ctx'> 		card-&gt;state = CARD_STATE_HARDSETUP;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -559,7 +560,8 @@ static int qeth_l2_request_initial_mac(struct qeth_card *card)</div><div class='ctx'> 			"device %s: x%x\n", CARD_BUS_ID(card), rc);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (card-&gt;info.guestlan) {</div><div class='add'>+	if ((card-&gt;info.type == QETH_CARD_TYPE_IQD) || </div><div class='add'>+	    (card-&gt;info.guestlan)) {</div><div class='ctx'> 		rc = qeth_setadpparms_change_macaddr(card);</div><div class='ctx'> 		if (rc) {</div><div class='ctx'> 			QETH_DBF_MESSAGE(2, "couldn't get MAC address on "</div><div class='hunk'>@@ -825,7 +827,6 @@ static int qeth_l2_open(struct net_device *dev)</div><div class='ctx'> 	}</div><div class='ctx'> 	card-&gt;data.state = CH_STATE_UP;</div><div class='ctx'> 	card-&gt;state = CARD_STATE_UP;</div><div class='del'>-	card-&gt;dev-&gt;flags |= IFF_UP;</div><div class='ctx'> 	netif_start_queue(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (!card-&gt;lan_online &amp;&amp; netif_carrier_ok(dev))</div><div class='hunk'>@@ -840,7 +841,6 @@ static int qeth_l2_stop(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	QETH_DBF_TEXT(TRACE, 4, "qethstop");</div><div class='ctx'> 	netif_tx_disable(dev);</div><div class='del'>-	card-&gt;dev-&gt;flags &amp;= ~IFF_UP;</div><div class='ctx'> 	if (card-&gt;state == CARD_STATE_UP)</div><div class='ctx'> 		card-&gt;state = CARD_STATE_SOFTSETUP;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1137,9 +1137,13 @@ static int qeth_l2_recover(void *ptr)</div><div class='ctx'> 	if (!rc)</div><div class='ctx'> 		PRINT_INFO("Device %s successfully recovered!\n",</div><div class='ctx'> 			   CARD_BUS_ID(card));</div><div class='del'>-	else</div><div class='add'>+	else {</div><div class='add'>+		rtnl_lock();</div><div class='add'>+		dev_close(card-&gt;dev);</div><div class='add'>+		rtnl_unlock();</div><div class='ctx'> 		PRINT_INFO("Device %s could not be recovered!\n",</div><div class='ctx'> 			   CARD_BUS_ID(card));</div><div class='add'>+	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c<br/>index dd72c3c20165..99547dea44de 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/net/qeth_l3_main.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/s390/net/qeth_l3_main.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/net/qeth_l3_main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/net/qeth_l3_main.c</a></div><div class='hunk'>@@ -2795,7 +2795,6 @@ static int qeth_l3_open(struct net_device *dev)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	card-&gt;data.state = CH_STATE_UP;</div><div class='ctx'> 	card-&gt;state = CARD_STATE_UP;</div><div class='del'>-	card-&gt;dev-&gt;flags |= IFF_UP;</div><div class='ctx'> 	netif_start_queue(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (!card-&gt;lan_online &amp;&amp; netif_carrier_ok(dev))</div><div class='hunk'>@@ -2809,7 +2808,6 @@ static int qeth_l3_stop(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	QETH_DBF_TEXT(TRACE, 4, "qethstop");</div><div class='ctx'> 	netif_tx_disable(dev);</div><div class='del'>-	card-&gt;dev-&gt;flags &amp;= ~IFF_UP;</div><div class='ctx'> 	if (card-&gt;state == CARD_STATE_UP)</div><div class='ctx'> 		card-&gt;state = CARD_STATE_SOFTSETUP;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -3218,9 +3216,13 @@ static int qeth_l3_recover(void *ptr)</div><div class='ctx'> 	if (!rc)</div><div class='ctx'> 		PRINT_INFO("Device %s successfully recovered!\n",</div><div class='ctx'> 			   CARD_BUS_ID(card));</div><div class='del'>-	else</div><div class='add'>+	else {</div><div class='add'>+		rtnl_lock();</div><div class='add'>+		dev_close(card-&gt;dev);</div><div class='add'>+		rtnl_unlock();</div><div class='ctx'> 		PRINT_INFO("Device %s could not be recovered!\n",</div><div class='ctx'> 			   CARD_BUS_ID(card));</div><div class='add'>+	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/s390/s390_rdev.c b/drivers/s390/s390_rdev.c<br/>index 3c7145d9f9a1..64371c05a3b3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/s390_rdev.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/s390/s390_rdev.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/s390_rdev.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/s390_rdev.c</a></div><div class='hunk'>@@ -30,7 +30,7 @@ s390_root_dev_register(const char *name)</div><div class='ctx'> 	dev = kzalloc(sizeof(struct device), GFP_KERNEL);</div><div class='ctx'> 	if (!dev)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='del'>-	strncpy(dev-&gt;bus_id, name, min(strlen(name), (size_t)BUS_ID_SIZE));</div><div class='add'>+	dev_set_name(dev, name);</div><div class='ctx'> 	dev-&gt;release = s390_root_dev_release;</div><div class='ctx'> 	ret = device_register(dev);</div><div class='ctx'> 	if (ret) {</div><div class='head'>diff --git a/drivers/s390/scsi/zfcp_aux.c b/drivers/s390/scsi/zfcp_aux.c<br/>index 90abfd06ed55..3b56220fb900 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/scsi/zfcp_aux.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/s390/scsi/zfcp_aux.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/scsi/zfcp_aux.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/scsi/zfcp_aux.c</a></div><div class='hunk'>@@ -88,11 +88,13 @@ static int __init zfcp_device_setup(char *devstr)</div><div class='ctx'> 	strncpy(zfcp_data.init_busid, token, BUS_ID_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	token = strsep(&amp;str, ",");</div><div class='del'>-	if (!token || strict_strtoull(token, 0, &amp;zfcp_data.init_wwpn))</div><div class='add'>+	if (!token || strict_strtoull(token, 0,</div><div class='add'>+				(unsigned long long *) &amp;zfcp_data.init_wwpn))</div><div class='ctx'> 		goto err_out;</div><div class='ctx'> </div><div class='ctx'> 	token = strsep(&amp;str, ",");</div><div class='del'>-	if (!token || strict_strtoull(token, 0, &amp;zfcp_data.init_fcp_lun))</div><div class='add'>+	if (!token || strict_strtoull(token, 0,</div><div class='add'>+				(unsigned long long *) &amp;zfcp_data.init_fcp_lun))</div><div class='ctx'> 		goto err_out;</div><div class='ctx'> </div><div class='ctx'> 	kfree(str);</div><div class='hunk'>@@ -100,24 +102,10 @@ static int __init zfcp_device_setup(char *devstr)</div><div class='ctx'> </div><div class='ctx'>  err_out:</div><div class='ctx'> 	kfree(str);</div><div class='del'>-	pr_err("zfcp: Parse error for device parameter string %s, "</div><div class='del'>-	       "device not attached.\n", devstr);</div><div class='add'>+	pr_err("zfcp: %s is not a valid SCSI device\n", devstr);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct zfcp_adapter *zfcp_get_adapter_by_busid(char *bus_id)</div><div class='del'>-{</div><div class='del'>-	struct zfcp_adapter *adapter;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(adapter, &amp;zfcp_data.adapter_list_head, list)</div><div class='del'>-		if ((strncmp(bus_id, adapter-&gt;ccw_device-&gt;dev.bus_id,</div><div class='del'>-			     BUS_ID_SIZE) == 0) &amp;&amp;</div><div class='del'>-		    !(atomic_read(&amp;adapter-&gt;status) &amp;</div><div class='del'>-		      ZFCP_STATUS_COMMON_REMOVE))</div><div class='del'>-		    return adapter;</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void __init zfcp_init_device_configure(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct zfcp_adapter *adapter;</div><div class='hunk'>@@ -141,7 +129,12 @@ static void __init zfcp_init_device_configure(void)</div><div class='ctx'> 		goto out_unit;</div><div class='ctx'> 	up(&amp;zfcp_data.config_sema);</div><div class='ctx'> 	ccw_device_set_online(adapter-&gt;ccw_device);</div><div class='add'>+</div><div class='ctx'> 	zfcp_erp_wait(adapter);</div><div class='add'>+	wait_event(adapter-&gt;erp_done_wqh,</div><div class='add'>+		   !(atomic_read(&amp;unit-&gt;status) &amp;</div><div class='add'>+				ZFCP_STATUS_UNIT_SCSI_WORK_PENDING));</div><div class='add'>+</div><div class='ctx'> 	down(&amp;zfcp_data.config_sema);</div><div class='ctx'> 	zfcp_unit_put(unit);</div><div class='ctx'> out_unit:</div><div class='hunk'>@@ -180,9 +173,9 @@ static int __init zfcp_module_init(void)</div><div class='ctx'> 	if (!zfcp_data.gid_pn_cache)</div><div class='ctx'> 		goto out_gid_cache;</div><div class='ctx'> </div><div class='del'>-	INIT_LIST_HEAD(&amp;zfcp_data.adapter_list_head);</div><div class='del'>-	INIT_LIST_HEAD(&amp;zfcp_data.adapter_remove_lh);</div><div class='add'>+	zfcp_data.work_queue = create_singlethread_workqueue("zfcp_wq");</div><div class='ctx'> </div><div class='add'>+	INIT_LIST_HEAD(&amp;zfcp_data.adapter_list_head);</div><div class='ctx'> 	sema_init(&amp;zfcp_data.config_sema, 1);</div><div class='ctx'> 	rwlock_init(&amp;zfcp_data.config_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -193,13 +186,14 @@ static int __init zfcp_module_init(void)</div><div class='ctx'> </div><div class='ctx'> 	retval = misc_register(&amp;zfcp_cfdc_misc);</div><div class='ctx'> 	if (retval) {</div><div class='del'>-		pr_err("zfcp: registration of misc device zfcp_cfdc failed\n");</div><div class='add'>+		pr_err("zfcp: Registering the misc device zfcp_cfdc failed\n");</div><div class='ctx'> 		goto out_misc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	retval = zfcp_ccw_register();</div><div class='ctx'> 	if (retval) {</div><div class='del'>-		pr_err("zfcp: Registration with common I/O layer failed.\n");</div><div class='add'>+		pr_err("zfcp: The zfcp device driver could not register with "</div><div class='add'>+		       "the common I/O layer\n");</div><div class='ctx'> 		goto out_ccw_register;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -231,8 +225,7 @@ module_init(zfcp_module_init);</div><div class='ctx'>  *</div><div class='ctx'>  * Returns: pointer to zfcp_unit or NULL</div><div class='ctx'>  */</div><div class='del'>-struct zfcp_unit *zfcp_get_unit_by_lun(struct zfcp_port *port,</div><div class='del'>-				       fcp_lun_t fcp_lun)</div><div class='add'>+struct zfcp_unit *zfcp_get_unit_by_lun(struct zfcp_port *port, u64 fcp_lun)</div><div class='ctx'> {</div><div class='ctx'> 	struct zfcp_unit *unit;</div><div class='ctx'> </div><div class='hunk'>@@ -251,7 +244,7 @@ struct zfcp_unit *zfcp_get_unit_by_lun(struct zfcp_port *port,</div><div class='ctx'>  * Returns: pointer to zfcp_port or NULL</div><div class='ctx'>  */</div><div class='ctx'> struct zfcp_port *zfcp_get_port_by_wwpn(struct zfcp_adapter *adapter,</div><div class='del'>-					wwn_t wwpn)</div><div class='add'>+					u64 wwpn)</div><div class='ctx'> {</div><div class='ctx'> 	struct zfcp_port *port;</div><div class='ctx'> </div><div class='hunk'>@@ -276,7 +269,7 @@ static void zfcp_sysfs_unit_release(struct device *dev)</div><div class='ctx'>  *</div><div class='ctx'>  * Sets up some unit internal structures and creates sysfs entry.</div><div class='ctx'>  */</div><div class='del'>-struct zfcp_unit *zfcp_unit_enqueue(struct zfcp_port *port, fcp_lun_t fcp_lun)</div><div class='add'>+struct zfcp_unit *zfcp_unit_enqueue(struct zfcp_port *port, u64 fcp_lun)</div><div class='ctx'> {</div><div class='ctx'> 	struct zfcp_unit *unit;</div><div class='ctx'> </div><div class='hunk'>@@ -290,7 +283,8 @@ struct zfcp_unit *zfcp_unit_enqueue(struct zfcp_port *port, fcp_lun_t fcp_lun)</div><div class='ctx'> 	unit-&gt;port = port;</div><div class='ctx'> 	unit-&gt;fcp_lun = fcp_lun;</div><div class='ctx'> </div><div class='del'>-	snprintf(unit-&gt;sysfs_device.bus_id, BUS_ID_SIZE, "0x%016llx", fcp_lun);</div><div class='add'>+	dev_set_name(&amp;unit-&gt;sysfs_device, "0x%016llx",</div><div class='add'>+		     (unsigned long long) fcp_lun);</div><div class='ctx'> 	unit-&gt;sysfs_device.parent = &amp;port-&gt;sysfs_device;</div><div class='ctx'> 	unit-&gt;sysfs_device.release = zfcp_sysfs_unit_release;</div><div class='ctx'> 	dev_set_drvdata(&amp;unit-&gt;sysfs_device, unit);</div><div class='hunk'>@@ -323,7 +317,6 @@ struct zfcp_unit *zfcp_unit_enqueue(struct zfcp_port *port, fcp_lun_t fcp_lun)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	zfcp_unit_get(unit);</div><div class='del'>-	unit-&gt;scsi_lun = scsilun_to_int((struct scsi_lun *)&amp;unit-&gt;fcp_lun);</div><div class='ctx'> </div><div class='ctx'> 	write_lock_irq(&amp;zfcp_data.config_lock);</div><div class='ctx'> 	list_add_tail(&amp;unit-&gt;list, &amp;port-&gt;unit_list_head);</div><div class='hunk'>@@ -332,7 +325,6 @@ struct zfcp_unit *zfcp_unit_enqueue(struct zfcp_port *port, fcp_lun_t fcp_lun)</div><div class='ctx'> </div><div class='ctx'> 	write_unlock_irq(&amp;zfcp_data.config_lock);</div><div class='ctx'> </div><div class='del'>-	port-&gt;units++;</div><div class='ctx'> 	zfcp_port_get(port);</div><div class='ctx'> </div><div class='ctx'> 	return unit;</div><div class='hunk'>@@ -351,11 +343,10 @@ err_out_free:</div><div class='ctx'>  */</div><div class='ctx'> void zfcp_unit_dequeue(struct zfcp_unit *unit)</div><div class='ctx'> {</div><div class='del'>-	zfcp_unit_wait(unit);</div><div class='add'>+	wait_event(unit-&gt;remove_wq, atomic_read(&amp;unit-&gt;refcount) == 0);</div><div class='ctx'> 	write_lock_irq(&amp;zfcp_data.config_lock);</div><div class='ctx'> 	list_del(&amp;unit-&gt;list);</div><div class='ctx'> 	write_unlock_irq(&amp;zfcp_data.config_lock);</div><div class='del'>-	unit-&gt;port-&gt;units--;</div><div class='ctx'> 	zfcp_port_put(unit-&gt;port);</div><div class='ctx'> 	sysfs_remove_group(&amp;unit-&gt;sysfs_device.kobj, &amp;zfcp_sysfs_unit_attrs);</div><div class='ctx'> 	device_unregister(&amp;unit-&gt;sysfs_device);</div><div class='hunk'>@@ -416,11 +407,6 @@ static void zfcp_free_low_mem_buffers(struct zfcp_adapter *adapter)</div><div class='ctx'> 		mempool_destroy(adapter-&gt;pool.data_gid_pn);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void zfcp_dummy_release(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * zfcp_status_read_refill - refill the long running status_read_requests</div><div class='ctx'>  * @adapter: ptr to struct zfcp_adapter for which the buffers should be refilled</div><div class='hunk'>@@ -450,19 +436,6 @@ static void _zfcp_status_read_scheduler(struct work_struct *work)</div><div class='ctx'> 					     stat_work));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int zfcp_nameserver_enqueue(struct zfcp_adapter *adapter)</div><div class='del'>-{</div><div class='del'>-	struct zfcp_port *port;</div><div class='del'>-</div><div class='del'>-	port = zfcp_port_enqueue(adapter, 0, ZFCP_STATUS_PORT_WKA,</div><div class='del'>-				 ZFCP_DID_DIRECTORY_SERVICE);</div><div class='del'>-	if (IS_ERR(port))</div><div class='del'>-		return PTR_ERR(port);</div><div class='del'>-	zfcp_port_put(port);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * zfcp_adapter_enqueue - enqueue a new adapter to the list</div><div class='ctx'>  * @ccw_device: pointer to the struct cc_device</div><div class='hunk'>@@ -508,7 +481,6 @@ int zfcp_adapter_enqueue(struct ccw_device *ccw_device)</div><div class='ctx'> 	init_waitqueue_head(&amp;adapter-&gt;erp_done_wqh);</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;adapter-&gt;port_list_head);</div><div class='del'>-	INIT_LIST_HEAD(&amp;adapter-&gt;port_remove_lh);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;adapter-&gt;erp_ready_head);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;adapter-&gt;erp_running_head);</div><div class='ctx'> </div><div class='hunk'>@@ -518,7 +490,7 @@ int zfcp_adapter_enqueue(struct ccw_device *ccw_device)</div><div class='ctx'> 	spin_lock_init(&amp;adapter-&gt;san_dbf_lock);</div><div class='ctx'> 	spin_lock_init(&amp;adapter-&gt;scsi_dbf_lock);</div><div class='ctx'> 	spin_lock_init(&amp;adapter-&gt;rec_dbf_lock);</div><div class='del'>-	spin_lock_init(&amp;adapter-&gt;req_q.lock);</div><div class='add'>+	spin_lock_init(&amp;adapter-&gt;req_q_lock);</div><div class='ctx'> </div><div class='ctx'> 	rwlock_init(&amp;adapter-&gt;erp_lock);</div><div class='ctx'> 	rwlock_init(&amp;adapter-&gt;abort_lock);</div><div class='hunk'>@@ -537,28 +509,15 @@ int zfcp_adapter_enqueue(struct ccw_device *ccw_device)</div><div class='ctx'> 			       &amp;zfcp_sysfs_adapter_attrs))</div><div class='ctx'> 		goto sysfs_failed;</div><div class='ctx'> </div><div class='del'>-	adapter-&gt;generic_services.parent = &amp;adapter-&gt;ccw_device-&gt;dev;</div><div class='del'>-	adapter-&gt;generic_services.release = zfcp_dummy_release;</div><div class='del'>-	snprintf(adapter-&gt;generic_services.bus_id, BUS_ID_SIZE,</div><div class='del'>-		 "generic_services");</div><div class='del'>-</div><div class='del'>-	if (device_register(&amp;adapter-&gt;generic_services))</div><div class='del'>-		goto generic_services_failed;</div><div class='del'>-</div><div class='ctx'> 	write_lock_irq(&amp;zfcp_data.config_lock);</div><div class='ctx'> 	atomic_clear_mask(ZFCP_STATUS_COMMON_REMOVE, &amp;adapter-&gt;status);</div><div class='ctx'> 	list_add_tail(&amp;adapter-&gt;list, &amp;zfcp_data.adapter_list_head);</div><div class='ctx'> 	write_unlock_irq(&amp;zfcp_data.config_lock);</div><div class='ctx'> </div><div class='del'>-	zfcp_data.adapters++;</div><div class='del'>-</div><div class='del'>-	zfcp_nameserver_enqueue(adapter);</div><div class='add'>+	zfcp_fc_nameserver_init(adapter);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>-generic_services_failed:</div><div class='del'>-	sysfs_remove_group(&amp;ccw_device-&gt;dev.kobj,</div><div class='del'>-			   &amp;zfcp_sysfs_adapter_attrs);</div><div class='ctx'> sysfs_failed:</div><div class='ctx'> 	zfcp_adapter_debug_unregister(adapter);</div><div class='ctx'> debug_register_failed:</div><div class='hunk'>@@ -585,7 +544,6 @@ void zfcp_adapter_dequeue(struct zfcp_adapter *adapter)</div><div class='ctx'> 	cancel_work_sync(&amp;adapter-&gt;scan_work);</div><div class='ctx'> 	cancel_work_sync(&amp;adapter-&gt;stat_work);</div><div class='ctx'> 	zfcp_adapter_scsi_unregister(adapter);</div><div class='del'>-	device_unregister(&amp;adapter-&gt;generic_services);</div><div class='ctx'> 	sysfs_remove_group(&amp;adapter-&gt;ccw_device-&gt;dev.kobj,</div><div class='ctx'> 			   &amp;zfcp_sysfs_adapter_attrs);</div><div class='ctx'> 	dev_set_drvdata(&amp;adapter-&gt;ccw_device-&gt;dev, NULL);</div><div class='hunk'>@@ -603,9 +561,6 @@ void zfcp_adapter_dequeue(struct zfcp_adapter *adapter)</div><div class='ctx'> 	list_del(&amp;adapter-&gt;list);</div><div class='ctx'> 	write_unlock_irq(&amp;zfcp_data.config_lock);</div><div class='ctx'> </div><div class='del'>-	/* decrease number of adapters in list */</div><div class='del'>-	zfcp_data.adapters--;</div><div class='del'>-</div><div class='ctx'> 	zfcp_qdio_free(adapter);</div><div class='ctx'> </div><div class='ctx'> 	zfcp_free_low_mem_buffers(adapter);</div><div class='hunk'>@@ -633,21 +588,19 @@ static void zfcp_sysfs_port_release(struct device *dev)</div><div class='ctx'>  * d_id is used to enqueue ports with a well known address like the Directory</div><div class='ctx'>  * Service for nameserver lookup.</div><div class='ctx'>  */</div><div class='del'>-struct zfcp_port *zfcp_port_enqueue(struct zfcp_adapter *adapter, wwn_t wwpn,</div><div class='add'>+struct zfcp_port *zfcp_port_enqueue(struct zfcp_adapter *adapter, u64 wwpn,</div><div class='ctx'> 				     u32 status, u32 d_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct zfcp_port *port;</div><div class='ctx'> 	int retval;</div><div class='del'>-	char *bus_id;</div><div class='ctx'> </div><div class='ctx'> 	port = kzalloc(sizeof(struct zfcp_port), GFP_KERNEL);</div><div class='ctx'> 	if (!port)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='ctx'> 	init_waitqueue_head(&amp;port-&gt;remove_wq);</div><div class='del'>-</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;port-&gt;unit_list_head);</div><div class='del'>-	INIT_LIST_HEAD(&amp;port-&gt;unit_remove_lh);</div><div class='add'>+	INIT_WORK(&amp;port-&gt;gid_pn_work, zfcp_erp_port_strategy_open_lookup);</div><div class='ctx'> </div><div class='ctx'> 	port-&gt;adapter = adapter;</div><div class='ctx'> 	port-&gt;d_id = d_id;</div><div class='hunk'>@@ -657,34 +610,8 @@ struct zfcp_port *zfcp_port_enqueue(struct zfcp_adapter *adapter, wwn_t wwpn,</div><div class='ctx'> 	atomic_set_mask(status | ZFCP_STATUS_COMMON_REMOVE, &amp;port-&gt;status);</div><div class='ctx'> 	atomic_set(&amp;port-&gt;refcount, 0);</div><div class='ctx'> </div><div class='del'>-	if (status &amp; ZFCP_STATUS_PORT_WKA) {</div><div class='del'>-		switch (d_id) {</div><div class='del'>-		case ZFCP_DID_DIRECTORY_SERVICE:</div><div class='del'>-			bus_id = "directory";</div><div class='del'>-			break;</div><div class='del'>-		case ZFCP_DID_MANAGEMENT_SERVICE:</div><div class='del'>-			bus_id = "management";</div><div class='del'>-			break;</div><div class='del'>-		case ZFCP_DID_KEY_DISTRIBUTION_SERVICE:</div><div class='del'>-			bus_id = "key_distribution";</div><div class='del'>-			break;</div><div class='del'>-		case ZFCP_DID_ALIAS_SERVICE:</div><div class='del'>-			bus_id = "alias";</div><div class='del'>-			break;</div><div class='del'>-		case ZFCP_DID_TIME_SERVICE:</div><div class='del'>-			bus_id = "time";</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			kfree(port);</div><div class='del'>-			return ERR_PTR(-EINVAL);</div><div class='del'>-		}</div><div class='del'>-		snprintf(port-&gt;sysfs_device.bus_id, BUS_ID_SIZE, "%s", bus_id);</div><div class='del'>-		port-&gt;sysfs_device.parent = &amp;adapter-&gt;generic_services;</div><div class='del'>-	} else {</div><div class='del'>-		snprintf(port-&gt;sysfs_device.bus_id,</div><div class='del'>-			 BUS_ID_SIZE, "0x%016llx", wwpn);</div><div class='del'>-		port-&gt;sysfs_device.parent = &amp;adapter-&gt;ccw_device-&gt;dev;</div><div class='del'>-	}</div><div class='add'>+	dev_set_name(&amp;port-&gt;sysfs_device, "0x%016llx", wwpn);</div><div class='add'>+	port-&gt;sysfs_device.parent = &amp;adapter-&gt;ccw_device-&gt;dev;</div><div class='ctx'> </div><div class='ctx'> 	port-&gt;sysfs_device.release = zfcp_sysfs_port_release;</div><div class='ctx'> 	dev_set_drvdata(&amp;port-&gt;sysfs_device, port);</div><div class='hunk'>@@ -700,12 +627,8 @@ struct zfcp_port *zfcp_port_enqueue(struct zfcp_adapter *adapter, wwn_t wwpn,</div><div class='ctx'> 	if (device_register(&amp;port-&gt;sysfs_device))</div><div class='ctx'> 		goto err_out_free;</div><div class='ctx'> </div><div class='del'>-	if (status &amp; ZFCP_STATUS_PORT_WKA)</div><div class='del'>-		retval = sysfs_create_group(&amp;port-&gt;sysfs_device.kobj,</div><div class='del'>-					    &amp;zfcp_sysfs_ns_port_attrs);</div><div class='del'>-	else</div><div class='del'>-		retval = sysfs_create_group(&amp;port-&gt;sysfs_device.kobj,</div><div class='del'>-					    &amp;zfcp_sysfs_port_attrs);</div><div class='add'>+	retval = sysfs_create_group(&amp;port-&gt;sysfs_device.kobj,</div><div class='add'>+				    &amp;zfcp_sysfs_port_attrs);</div><div class='ctx'> </div><div class='ctx'> 	if (retval) {</div><div class='ctx'> 		device_unregister(&amp;port-&gt;sysfs_device);</div><div class='hunk'>@@ -718,10 +641,6 @@ struct zfcp_port *zfcp_port_enqueue(struct zfcp_adapter *adapter, wwn_t wwpn,</div><div class='ctx'> 	list_add_tail(&amp;port-&gt;list, &amp;adapter-&gt;port_list_head);</div><div class='ctx'> 	atomic_clear_mask(ZFCP_STATUS_COMMON_REMOVE, &amp;port-&gt;status);</div><div class='ctx'> 	atomic_set_mask(ZFCP_STATUS_COMMON_RUNNING, &amp;port-&gt;status);</div><div class='del'>-	if (d_id == ZFCP_DID_DIRECTORY_SERVICE)</div><div class='del'>-		if (!adapter-&gt;nameserver_port)</div><div class='del'>-			adapter-&gt;nameserver_port = port;</div><div class='del'>-	adapter-&gt;ports++;</div><div class='ctx'> </div><div class='ctx'> 	write_unlock_irq(&amp;zfcp_data.config_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -740,21 +659,15 @@ err_out:</div><div class='ctx'>  */</div><div class='ctx'> void zfcp_port_dequeue(struct zfcp_port *port)</div><div class='ctx'> {</div><div class='del'>-	zfcp_port_wait(port);</div><div class='add'>+	wait_event(port-&gt;remove_wq, atomic_read(&amp;port-&gt;refcount) == 0);</div><div class='ctx'> 	write_lock_irq(&amp;zfcp_data.config_lock);</div><div class='ctx'> 	list_del(&amp;port-&gt;list);</div><div class='del'>-	port-&gt;adapter-&gt;ports--;</div><div class='ctx'> 	write_unlock_irq(&amp;zfcp_data.config_lock);</div><div class='ctx'> 	if (port-&gt;rport)</div><div class='ctx'> 		fc_remote_port_delete(port-&gt;rport);</div><div class='ctx'> 	port-&gt;rport = NULL;</div><div class='ctx'> 	zfcp_adapter_put(port-&gt;adapter);</div><div class='del'>-	if (atomic_read(&amp;port-&gt;status) &amp; ZFCP_STATUS_PORT_WKA)</div><div class='del'>-		sysfs_remove_group(&amp;port-&gt;sysfs_device.kobj,</div><div class='del'>-				   &amp;zfcp_sysfs_ns_port_attrs);</div><div class='del'>-	else</div><div class='del'>-		sysfs_remove_group(&amp;port-&gt;sysfs_device.kobj,</div><div class='del'>-				   &amp;zfcp_sysfs_port_attrs);</div><div class='add'>+	sysfs_remove_group(&amp;port-&gt;sysfs_device.kobj, &amp;zfcp_sysfs_port_attrs);</div><div class='ctx'> 	device_unregister(&amp;port-&gt;sysfs_device);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/s390/scsi/zfcp_ccw.c b/drivers/s390/scsi/zfcp_ccw.c<br/>index 51b6a05f4d12..b04038c74786 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/scsi/zfcp_ccw.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/s390/scsi/zfcp_ccw.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/scsi/zfcp_ccw.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/scsi/zfcp_ccw.c</a></div><div class='hunk'>@@ -25,7 +25,8 @@ static int zfcp_ccw_probe(struct ccw_device *ccw_device)</div><div class='ctx'> 	down(&amp;zfcp_data.config_sema);</div><div class='ctx'> 	if (zfcp_adapter_enqueue(ccw_device)) {</div><div class='ctx'> 		dev_err(&amp;ccw_device-&gt;dev,</div><div class='del'>-			"Setup of data structures failed.\n");</div><div class='add'>+			"Setting up data structures for the "</div><div class='add'>+			"FCP adapter failed\n");</div><div class='ctx'> 		retval = -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	up(&amp;zfcp_data.config_sema);</div><div class='hunk'>@@ -46,6 +47,8 @@ static void zfcp_ccw_remove(struct ccw_device *ccw_device)</div><div class='ctx'> 	struct zfcp_adapter *adapter;</div><div class='ctx'> 	struct zfcp_port *port, *p;</div><div class='ctx'> 	struct zfcp_unit *unit, *u;</div><div class='add'>+	LIST_HEAD(unit_remove_lh);</div><div class='add'>+	LIST_HEAD(port_remove_lh);</div><div class='ctx'> </div><div class='ctx'> 	ccw_device_set_offline(ccw_device);</div><div class='ctx'> 	down(&amp;zfcp_data.config_sema);</div><div class='hunk'>@@ -54,26 +57,26 @@ static void zfcp_ccw_remove(struct ccw_device *ccw_device)</div><div class='ctx'> 	write_lock_irq(&amp;zfcp_data.config_lock);</div><div class='ctx'> 	list_for_each_entry_safe(port, p, &amp;adapter-&gt;port_list_head, list) {</div><div class='ctx'> 		list_for_each_entry_safe(unit, u, &amp;port-&gt;unit_list_head, list) {</div><div class='del'>-			list_move(&amp;unit-&gt;list, &amp;port-&gt;unit_remove_lh);</div><div class='add'>+			list_move(&amp;unit-&gt;list, &amp;unit_remove_lh);</div><div class='ctx'> 			atomic_set_mask(ZFCP_STATUS_COMMON_REMOVE,</div><div class='ctx'> 					&amp;unit-&gt;status);</div><div class='ctx'> 		}</div><div class='del'>-		list_move(&amp;port-&gt;list, &amp;adapter-&gt;port_remove_lh);</div><div class='add'>+		list_move(&amp;port-&gt;list, &amp;port_remove_lh);</div><div class='ctx'> 		atomic_set_mask(ZFCP_STATUS_COMMON_REMOVE, &amp;port-&gt;status);</div><div class='ctx'> 	}</div><div class='ctx'> 	atomic_set_mask(ZFCP_STATUS_COMMON_REMOVE, &amp;adapter-&gt;status);</div><div class='ctx'> 	write_unlock_irq(&amp;zfcp_data.config_lock);</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry_safe(port, p, &amp;adapter-&gt;port_remove_lh, list) {</div><div class='del'>-		list_for_each_entry_safe(unit, u, &amp;port-&gt;unit_remove_lh, list) {</div><div class='del'>-			if (atomic_test_mask(ZFCP_STATUS_UNIT_REGISTERED,</div><div class='del'>-				&amp;unit-&gt;status))</div><div class='add'>+	list_for_each_entry_safe(port, p, &amp;port_remove_lh, list) {</div><div class='add'>+		list_for_each_entry_safe(unit, u, &amp;unit_remove_lh, list) {</div><div class='add'>+			if (atomic_read(&amp;unit-&gt;status) &amp;</div><div class='add'>+			    ZFCP_STATUS_UNIT_REGISTERED)</div><div class='ctx'> 				scsi_remove_device(unit-&gt;device);</div><div class='ctx'> 			zfcp_unit_dequeue(unit);</div><div class='ctx'> 		}</div><div class='ctx'> 		zfcp_port_dequeue(port);</div><div class='ctx'> 	}</div><div class='del'>-	zfcp_adapter_wait(adapter);</div><div class='add'>+	wait_event(adapter-&gt;remove_wq, atomic_read(&amp;adapter-&gt;refcount) == 0);</div><div class='ctx'> 	zfcp_adapter_dequeue(adapter);</div><div class='ctx'> </div><div class='ctx'> 	up(&amp;zfcp_data.config_sema);</div><div class='hunk'>@@ -156,15 +159,18 @@ static int zfcp_ccw_notify(struct ccw_device *ccw_device, int event)</div><div class='ctx'> </div><div class='ctx'> 	switch (event) {</div><div class='ctx'> 	case CIO_GONE:</div><div class='del'>-		dev_warn(&amp;adapter-&gt;ccw_device-&gt;dev, "device gone\n");</div><div class='add'>+		dev_warn(&amp;adapter-&gt;ccw_device-&gt;dev,</div><div class='add'>+			 "The FCP device has been detached\n");</div><div class='ctx'> 		zfcp_erp_adapter_shutdown(adapter, 0, 87, NULL);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CIO_NO_PATH:</div><div class='del'>-		dev_warn(&amp;adapter-&gt;ccw_device-&gt;dev, "no path\n");</div><div class='add'>+		dev_warn(&amp;adapter-&gt;ccw_device-&gt;dev,</div><div class='add'>+			 "The CHPID for the FCP device is offline\n");</div><div class='ctx'> 		zfcp_erp_adapter_shutdown(adapter, 0, 88, NULL);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CIO_OPER:</div><div class='del'>-		dev_info(&amp;adapter-&gt;ccw_device-&gt;dev, "operational again\n");</div><div class='add'>+		dev_info(&amp;adapter-&gt;ccw_device-&gt;dev,</div><div class='add'>+			 "The FCP device is operational again\n");</div><div class='ctx'> 		zfcp_erp_modify_adapter_status(adapter, 11, NULL,</div><div class='ctx'> 					       ZFCP_STATUS_COMMON_RUNNING,</div><div class='ctx'> 					       ZFCP_SET);</div><div class='hunk'>@@ -220,3 +226,20 @@ int __init zfcp_ccw_register(void)</div><div class='ctx'> {</div><div class='ctx'> 	return ccw_driver_register(&amp;zfcp_ccw_driver);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * zfcp_get_adapter_by_busid - find zfcp_adapter struct</div><div class='add'>+ * @busid: bus id string of zfcp adapter to find</div><div class='add'>+ */</div><div class='add'>+struct zfcp_adapter *zfcp_get_adapter_by_busid(char *busid)</div><div class='add'>+{</div><div class='add'>+	struct ccw_device *ccw_device;</div><div class='add'>+	struct zfcp_adapter *adapter = NULL;</div><div class='add'>+</div><div class='add'>+	ccw_device = get_ccwdev_by_busid(&amp;zfcp_ccw_driver, busid);</div><div class='add'>+	if (ccw_device) {</div><div class='add'>+		adapter = dev_get_drvdata(&amp;ccw_device-&gt;dev);</div><div class='add'>+		put_device(&amp;ccw_device-&gt;dev);</div><div class='add'>+	}</div><div class='add'>+	return adapter;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/s390/scsi/zfcp_dbf.c b/drivers/s390/scsi/zfcp_dbf.c<br/>index fca48b88fc53..060f5f2352ec 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/scsi/zfcp_dbf.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/s390/scsi/zfcp_dbf.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/scsi/zfcp_dbf.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/scsi/zfcp_dbf.c</a></div><div class='hunk'>@@ -318,6 +318,26 @@ void zfcp_hba_dbf_event_qdio(struct zfcp_adapter *adapter,</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;adapter-&gt;hba_dbf_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * zfcp_hba_dbf_event_berr - trace event for bit error threshold</div><div class='add'>+ * @adapter: adapter affected by this QDIO related event</div><div class='add'>+ * @req: fsf request</div><div class='add'>+ */</div><div class='add'>+void zfcp_hba_dbf_event_berr(struct zfcp_adapter *adapter,</div><div class='add'>+			     struct zfcp_fsf_req *req)</div><div class='add'>+{</div><div class='add'>+	struct zfcp_hba_dbf_record *r = &amp;adapter-&gt;hba_dbf_buf;</div><div class='add'>+	struct fsf_status_read_buffer *sr_buf = req-&gt;data;</div><div class='add'>+	struct fsf_bit_error_payload *err = &amp;sr_buf-&gt;payload.bit_error;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;adapter-&gt;hba_dbf_lock, flags);</div><div class='add'>+	memset(r, 0, sizeof(*r));</div><div class='add'>+	strncpy(r-&gt;tag, "berr", ZFCP_DBF_TAG_SIZE);</div><div class='add'>+	memcpy(&amp;r-&gt;u.berr, err, sizeof(struct fsf_bit_error_payload));</div><div class='add'>+	debug_event(adapter-&gt;hba_dbf, 0, r, sizeof(*r));</div><div class='add'>+	spin_unlock_irqrestore(&amp;adapter-&gt;hba_dbf_lock, flags);</div><div class='add'>+}</div><div class='ctx'> static void zfcp_hba_dbf_view_response(char **p,</div><div class='ctx'> 				       struct zfcp_hba_dbf_record_response *r)</div><div class='ctx'> {</div><div class='hunk'>@@ -399,6 +419,30 @@ static void zfcp_hba_dbf_view_qdio(char **p, struct zfcp_hba_dbf_record_qdio *r)</div><div class='ctx'> 	zfcp_dbf_out(p, "sbal_count", "0x%02x", r-&gt;sbal_count);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void zfcp_hba_dbf_view_berr(char **p, struct fsf_bit_error_payload *r)</div><div class='add'>+{</div><div class='add'>+	zfcp_dbf_out(p, "link_failures", "%d", r-&gt;link_failure_error_count);</div><div class='add'>+	zfcp_dbf_out(p, "loss_of_sync_err", "%d", r-&gt;loss_of_sync_error_count);</div><div class='add'>+	zfcp_dbf_out(p, "loss_of_sig_err", "%d", r-&gt;loss_of_signal_error_count);</div><div class='add'>+	zfcp_dbf_out(p, "prim_seq_err", "%d",</div><div class='add'>+		     r-&gt;primitive_sequence_error_count);</div><div class='add'>+	zfcp_dbf_out(p, "inval_trans_word_err", "%d",</div><div class='add'>+		     r-&gt;invalid_transmission_word_error_count);</div><div class='add'>+	zfcp_dbf_out(p, "CRC_errors", "%d", r-&gt;crc_error_count);</div><div class='add'>+	zfcp_dbf_out(p, "prim_seq_event_to", "%d",</div><div class='add'>+		     r-&gt;primitive_sequence_event_timeout_count);</div><div class='add'>+	zfcp_dbf_out(p, "elast_buf_overrun_err", "%d",</div><div class='add'>+		     r-&gt;elastic_buffer_overrun_error_count);</div><div class='add'>+	zfcp_dbf_out(p, "adv_rec_buf2buf_cred", "%d",</div><div class='add'>+		     r-&gt;advertised_receive_b2b_credit);</div><div class='add'>+	zfcp_dbf_out(p, "curr_rec_buf2buf_cred", "%d",</div><div class='add'>+		     r-&gt;current_receive_b2b_credit);</div><div class='add'>+	zfcp_dbf_out(p, "adv_trans_buf2buf_cred", "%d",</div><div class='add'>+		     r-&gt;advertised_transmit_b2b_credit);</div><div class='add'>+	zfcp_dbf_out(p, "curr_trans_buf2buf_cred", "%d",</div><div class='add'>+		     r-&gt;current_transmit_b2b_credit);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int zfcp_hba_dbf_view_format(debug_info_t *id, struct debug_view *view,</div><div class='ctx'> 				    char *out_buf, const char *in_buf)</div><div class='ctx'> {</div><div class='hunk'>@@ -418,6 +462,8 @@ static int zfcp_hba_dbf_view_format(debug_info_t *id, struct debug_view *view,</div><div class='ctx'> 		zfcp_hba_dbf_view_status(&amp;p, &amp;r-&gt;u.status);</div><div class='ctx'> 	else if (strncmp(r-&gt;tag, "qdio", ZFCP_DBF_TAG_SIZE) == 0)</div><div class='ctx'> 		zfcp_hba_dbf_view_qdio(&amp;p, &amp;r-&gt;u.qdio);</div><div class='add'>+	else if (strncmp(r-&gt;tag, "berr", ZFCP_DBF_TAG_SIZE) == 0)</div><div class='add'>+		zfcp_hba_dbf_view_berr(&amp;p, &amp;r-&gt;u.berr);</div><div class='ctx'> </div><div class='ctx'> 	p += sprintf(p, "\n");</div><div class='ctx'> 	return p - out_buf;</div><div class='hunk'>@@ -519,14 +565,14 @@ static const char *zfcp_rec_dbf_ids[] = {</div><div class='ctx'> 	[75]	= "physical port recovery escalation after failed port "</div><div class='ctx'> 		  "recovery",</div><div class='ctx'> 	[76]	= "port recovery escalation after failed unit recovery",</div><div class='del'>-	[77]	= "recovery opening nameserver port",</div><div class='add'>+	[77]	= "",</div><div class='ctx'> 	[78]	= "duplicate request id",</div><div class='ctx'> 	[79]	= "link down",</div><div class='ctx'> 	[80]	= "exclusive read-only unit access unsupported",</div><div class='ctx'> 	[81]	= "shared read-write unit access unsupported",</div><div class='ctx'> 	[82]	= "incoming rscn",</div><div class='ctx'> 	[83]	= "incoming wwpn",</div><div class='del'>-	[84]	= "",</div><div class='add'>+	[84]	= "wka port handle not valid close port",</div><div class='ctx'> 	[85]	= "online",</div><div class='ctx'> 	[86]	= "offline",</div><div class='ctx'> 	[87]	= "ccw device gone",</div><div class='hunk'>@@ -570,7 +616,7 @@ static const char *zfcp_rec_dbf_ids[] = {</div><div class='ctx'> 	[125]	= "need newer zfcp",</div><div class='ctx'> 	[126]	= "need newer microcode",</div><div class='ctx'> 	[127]	= "arbitrated loop not supported",</div><div class='del'>-	[128]	= "unknown topology",</div><div class='add'>+	[128]	= "",</div><div class='ctx'> 	[129]	= "qtcb size mismatch",</div><div class='ctx'> 	[130]	= "unknown fsf status ecd",</div><div class='ctx'> 	[131]	= "fcp request too big",</div><div class='hunk'>@@ -829,9 +875,9 @@ void zfcp_rec_dbf_event_action(u8 id2, struct zfcp_erp_action *erp_action)</div><div class='ctx'> void zfcp_san_dbf_event_ct_request(struct zfcp_fsf_req *fsf_req)</div><div class='ctx'> {</div><div class='ctx'> 	struct zfcp_send_ct *ct = (struct zfcp_send_ct *)fsf_req-&gt;data;</div><div class='del'>-	struct zfcp_port *port = ct-&gt;port;</div><div class='del'>-	struct zfcp_adapter *adapter = port-&gt;adapter;</div><div class='del'>-	struct ct_hdr *hdr = zfcp_sg_to_address(ct-&gt;req);</div><div class='add'>+	struct zfcp_wka_port *wka_port = ct-&gt;wka_port;</div><div class='add'>+	struct zfcp_adapter *adapter = wka_port-&gt;adapter;</div><div class='add'>+	struct ct_hdr *hdr = sg_virt(ct-&gt;req);</div><div class='ctx'> 	struct zfcp_san_dbf_record *r = &amp;adapter-&gt;san_dbf_buf;</div><div class='ctx'> 	struct zfcp_san_dbf_record_ct_request *oct = &amp;r-&gt;u.ct_req;</div><div class='ctx'> 	unsigned long flags;</div><div class='hunk'>@@ -842,7 +888,7 @@ void zfcp_san_dbf_event_ct_request(struct zfcp_fsf_req *fsf_req)</div><div class='ctx'> 	r-&gt;fsf_reqid = (unsigned long)fsf_req;</div><div class='ctx'> 	r-&gt;fsf_seqno = fsf_req-&gt;seq_no;</div><div class='ctx'> 	r-&gt;s_id = fc_host_port_id(adapter-&gt;scsi_host);</div><div class='del'>-	r-&gt;d_id = port-&gt;d_id;</div><div class='add'>+	r-&gt;d_id = wka_port-&gt;d_id;</div><div class='ctx'> 	oct-&gt;cmd_req_code = hdr-&gt;cmd_rsp_code;</div><div class='ctx'> 	oct-&gt;revision = hdr-&gt;revision;</div><div class='ctx'> 	oct-&gt;gs_type = hdr-&gt;gs_type;</div><div class='hunk'>@@ -863,9 +909,9 @@ void zfcp_san_dbf_event_ct_request(struct zfcp_fsf_req *fsf_req)</div><div class='ctx'> void zfcp_san_dbf_event_ct_response(struct zfcp_fsf_req *fsf_req)</div><div class='ctx'> {</div><div class='ctx'> 	struct zfcp_send_ct *ct = (struct zfcp_send_ct *)fsf_req-&gt;data;</div><div class='del'>-	struct zfcp_port *port = ct-&gt;port;</div><div class='del'>-	struct zfcp_adapter *adapter = port-&gt;adapter;</div><div class='del'>-	struct ct_hdr *hdr = zfcp_sg_to_address(ct-&gt;resp);</div><div class='add'>+	struct zfcp_wka_port *wka_port = ct-&gt;wka_port;</div><div class='add'>+	struct zfcp_adapter *adapter = wka_port-&gt;adapter;</div><div class='add'>+	struct ct_hdr *hdr = sg_virt(ct-&gt;resp);</div><div class='ctx'> 	struct zfcp_san_dbf_record *r = &amp;adapter-&gt;san_dbf_buf;</div><div class='ctx'> 	struct zfcp_san_dbf_record_ct_response *rct = &amp;r-&gt;u.ct_resp;</div><div class='ctx'> 	unsigned long flags;</div><div class='hunk'>@@ -875,7 +921,7 @@ void zfcp_san_dbf_event_ct_response(struct zfcp_fsf_req *fsf_req)</div><div class='ctx'> 	strncpy(r-&gt;tag, "rctc", ZFCP_DBF_TAG_SIZE);</div><div class='ctx'> 	r-&gt;fsf_reqid = (unsigned long)fsf_req;</div><div class='ctx'> 	r-&gt;fsf_seqno = fsf_req-&gt;seq_no;</div><div class='del'>-	r-&gt;s_id = port-&gt;d_id;</div><div class='add'>+	r-&gt;s_id = wka_port-&gt;d_id;</div><div class='ctx'> 	r-&gt;d_id = fc_host_port_id(adapter-&gt;scsi_host);</div><div class='ctx'> 	rct-&gt;cmd_rsp_code = hdr-&gt;cmd_rsp_code;</div><div class='ctx'> 	rct-&gt;revision = hdr-&gt;revision;</div><div class='hunk'>@@ -922,8 +968,8 @@ void zfcp_san_dbf_event_els_request(struct zfcp_fsf_req *fsf_req)</div><div class='ctx'> </div><div class='ctx'> 	zfcp_san_dbf_event_els("oels", 2, fsf_req,</div><div class='ctx'> 			       fc_host_port_id(els-&gt;adapter-&gt;scsi_host),</div><div class='del'>-			       els-&gt;d_id, *(u8 *) zfcp_sg_to_address(els-&gt;req),</div><div class='del'>-			       zfcp_sg_to_address(els-&gt;req), els-&gt;req-&gt;length);</div><div class='add'>+			       els-&gt;d_id, *(u8 *) sg_virt(els-&gt;req),</div><div class='add'>+			       sg_virt(els-&gt;req), els-&gt;req-&gt;length);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -936,8 +982,7 @@ void zfcp_san_dbf_event_els_response(struct zfcp_fsf_req *fsf_req)</div><div class='ctx'> </div><div class='ctx'> 	zfcp_san_dbf_event_els("rels", 2, fsf_req, els-&gt;d_id,</div><div class='ctx'> 			       fc_host_port_id(els-&gt;adapter-&gt;scsi_host),</div><div class='del'>-			       *(u8 *)zfcp_sg_to_address(els-&gt;req),</div><div class='del'>-			       zfcp_sg_to_address(els-&gt;resp),</div><div class='add'>+			       *(u8 *)sg_virt(els-&gt;req), sg_virt(els-&gt;resp),</div><div class='ctx'> 			       els-&gt;resp-&gt;length);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/s390/scsi/zfcp_dbf.h b/drivers/s390/scsi/zfcp_dbf.h<br/>index 0ddb18449d11..e8f450801fea 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/scsi/zfcp_dbf.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/s390/scsi/zfcp_dbf.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/scsi/zfcp_dbf.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/scsi/zfcp_dbf.h</a></div><div class='hunk'>@@ -151,6 +151,7 @@ struct zfcp_hba_dbf_record {</div><div class='ctx'> 		struct zfcp_hba_dbf_record_response response;</div><div class='ctx'> 		struct zfcp_hba_dbf_record_status status;</div><div class='ctx'> 		struct zfcp_hba_dbf_record_qdio qdio;</div><div class='add'>+		struct fsf_bit_error_payload berr;</div><div class='ctx'> 	} u;</div><div class='ctx'> } __attribute__ ((packed));</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/s390/scsi/zfcp_def.h b/drivers/s390/scsi/zfcp_def.h<br/>index 67f45fc62f53..9ce4c75bd190 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/scsi/zfcp_def.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/s390/scsi/zfcp_def.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/scsi/zfcp_def.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/scsi/zfcp_def.h</a></div><div class='hunk'>@@ -39,29 +39,6 @@</div><div class='ctx'> </div><div class='ctx'> /********************* GENERAL DEFINES *********************************/</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * zfcp_sg_to_address - determine kernel address from struct scatterlist</div><div class='del'>- * @list: struct scatterlist</div><div class='del'>- * Return: kernel address</div><div class='del'>- */</div><div class='del'>-static inline void *</div><div class='del'>-zfcp_sg_to_address(struct scatterlist *list)</div><div class='del'>-{</div><div class='del'>-	return sg_virt(list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * zfcp_address_to_sg - set up struct scatterlist from kernel address</div><div class='del'>- * @address: kernel address</div><div class='del'>- * @list: struct scatterlist</div><div class='del'>- * @size: buffer size</div><div class='del'>- */</div><div class='del'>-static inline void</div><div class='del'>-zfcp_address_to_sg(void *address, struct scatterlist *list, unsigned int size)</div><div class='del'>-{</div><div class='del'>-	sg_set_buf(list, address, size);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #define REQUEST_LIST_SIZE 128</div><div class='ctx'> </div><div class='ctx'> /********************* SCSI SPECIFIC DEFINES *********************************/</div><div class='hunk'>@@ -101,11 +78,6 @@ zfcp_address_to_sg(void *address, struct scatterlist *list, unsigned int size)</div><div class='ctx'> </div><div class='ctx'> /*************** FIBRE CHANNEL PROTOCOL SPECIFIC DEFINES ********************/</div><div class='ctx'> </div><div class='del'>-typedef unsigned long long wwn_t;</div><div class='del'>-typedef unsigned long long fcp_lun_t;</div><div class='del'>-/* data length field may be at variable position in FCP-2 FCP_CMND IU */</div><div class='del'>-typedef unsigned int       fcp_dl_t;</div><div class='del'>-</div><div class='ctx'> /* timeout for name-server lookup (in seconds) */</div><div class='ctx'> #define ZFCP_NS_GID_PN_TIMEOUT		10</div><div class='ctx'> </div><div class='hunk'>@@ -129,7 +101,7 @@ typedef unsigned int       fcp_dl_t;</div><div class='ctx'> </div><div class='ctx'> /* FCP(-2) FCP_CMND IU */</div><div class='ctx'> struct fcp_cmnd_iu {</div><div class='del'>-	fcp_lun_t fcp_lun;	   /* FCP logical unit number */</div><div class='add'>+	u64 fcp_lun;	   /* FCP logical unit number */</div><div class='ctx'> 	u8  crn;	           /* command reference number */</div><div class='ctx'> 	u8  reserved0:5;	   /* reserved */</div><div class='ctx'> 	u8  task_attribute:3;	   /* task attribute */</div><div class='hunk'>@@ -204,7 +176,7 @@ struct fcp_rscn_element {</div><div class='ctx'> struct fcp_logo {</div><div class='ctx'>         u32 command;</div><div class='ctx'>         u32 nport_did;</div><div class='del'>-        wwn_t nport_wwpn;</div><div class='add'>+	u64 nport_wwpn;</div><div class='ctx'> } __attribute__((packed));</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -218,13 +190,6 @@ struct fcp_logo {</div><div class='ctx'> #define ZFCP_LS_RSCN			0x61</div><div class='ctx'> #define ZFCP_LS_RNID			0x78</div><div class='ctx'> </div><div class='del'>-struct zfcp_ls_rjt_par {</div><div class='del'>-	u8 action;</div><div class='del'>- 	u8 reason_code;</div><div class='del'>- 	u8 reason_expl;</div><div class='del'>- 	u8 vendor_unique;</div><div class='del'>-} __attribute__ ((packed));</div><div class='del'>-</div><div class='ctx'> struct zfcp_ls_adisc {</div><div class='ctx'> 	u8		code;</div><div class='ctx'> 	u8		field[3];</div><div class='hunk'>@@ -234,20 +199,6 @@ struct zfcp_ls_adisc {</div><div class='ctx'> 	u32		nport_id;</div><div class='ctx'> } __attribute__ ((packed));</div><div class='ctx'> </div><div class='del'>-struct zfcp_ls_adisc_acc {</div><div class='del'>-	u8		code;</div><div class='del'>-	u8		field[3];</div><div class='del'>-	u32		hard_nport_id;</div><div class='del'>-	u64		wwpn;</div><div class='del'>-	u64		wwnn;</div><div class='del'>-	u32		nport_id;</div><div class='del'>-} __attribute__ ((packed));</div><div class='del'>-</div><div class='del'>-struct zfcp_rc_entry {</div><div class='del'>-	u8 code;</div><div class='del'>-	const char *description;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * FC-GS-2 stuff</div><div class='ctx'>  */</div><div class='hunk'>@@ -281,9 +232,7 @@ struct zfcp_rc_entry {</div><div class='ctx'> #define ZFCP_STATUS_COMMON_RUNNING		0x40000000</div><div class='ctx'> #define ZFCP_STATUS_COMMON_ERP_FAILED		0x20000000</div><div class='ctx'> #define ZFCP_STATUS_COMMON_UNBLOCKED		0x10000000</div><div class='del'>-#define ZFCP_STATUS_COMMON_OPENING              0x08000000</div><div class='ctx'> #define ZFCP_STATUS_COMMON_OPEN                 0x04000000</div><div class='del'>-#define ZFCP_STATUS_COMMON_CLOSING              0x02000000</div><div class='ctx'> #define ZFCP_STATUS_COMMON_ERP_INUSE		0x01000000</div><div class='ctx'> #define ZFCP_STATUS_COMMON_ACCESS_DENIED	0x00800000</div><div class='ctx'> #define ZFCP_STATUS_COMMON_ACCESS_BOXED		0x00400000</div><div class='hunk'>@@ -291,16 +240,15 @@ struct zfcp_rc_entry {</div><div class='ctx'> </div><div class='ctx'> /* adapter status */</div><div class='ctx'> #define ZFCP_STATUS_ADAPTER_QDIOUP		0x00000002</div><div class='del'>-#define ZFCP_STATUS_ADAPTER_REGISTERED		0x00000004</div><div class='ctx'> #define ZFCP_STATUS_ADAPTER_XCONFIG_OK		0x00000008</div><div class='ctx'> #define ZFCP_STATUS_ADAPTER_HOST_CON_INIT	0x00000010</div><div class='ctx'> #define ZFCP_STATUS_ADAPTER_ERP_THREAD_UP	0x00000020</div><div class='ctx'> #define ZFCP_STATUS_ADAPTER_ERP_THREAD_KILL	0x00000080</div><div class='ctx'> #define ZFCP_STATUS_ADAPTER_ERP_PENDING		0x00000100</div><div class='ctx'> #define ZFCP_STATUS_ADAPTER_LINK_UNPLUGGED	0x00000200</div><div class='del'>-#define ZFCP_STATUS_ADAPTER_XPORT_OK		0x00000800</div><div class='ctx'> </div><div class='ctx'> /* FC-PH/FC-GS well-known address identifiers for generic services */</div><div class='add'>+#define ZFCP_DID_WKA				0xFFFFF0</div><div class='ctx'> #define ZFCP_DID_MANAGEMENT_SERVICE		0xFFFFFA</div><div class='ctx'> #define ZFCP_DID_TIME_SERVICE			0xFFFFFB</div><div class='ctx'> #define ZFCP_DID_DIRECTORY_SERVICE		0xFFFFFC</div><div class='hunk'>@@ -312,29 +260,27 @@ struct zfcp_rc_entry {</div><div class='ctx'> #define ZFCP_STATUS_PORT_DID_DID		0x00000002</div><div class='ctx'> #define ZFCP_STATUS_PORT_PHYS_CLOSING		0x00000004</div><div class='ctx'> #define ZFCP_STATUS_PORT_NO_WWPN		0x00000008</div><div class='del'>-#define ZFCP_STATUS_PORT_NO_SCSI_ID		0x00000010</div><div class='ctx'> #define ZFCP_STATUS_PORT_INVALID_WWPN		0x00000020</div><div class='ctx'> </div><div class='del'>-/* for ports with well known addresses */</div><div class='del'>-#define ZFCP_STATUS_PORT_WKA \</div><div class='del'>-		(ZFCP_STATUS_PORT_NO_WWPN | \</div><div class='del'>-		 ZFCP_STATUS_PORT_NO_SCSI_ID)</div><div class='add'>+/* well known address (WKA) port status*/</div><div class='add'>+enum zfcp_wka_status {</div><div class='add'>+	ZFCP_WKA_PORT_OFFLINE,</div><div class='add'>+	ZFCP_WKA_PORT_CLOSING,</div><div class='add'>+	ZFCP_WKA_PORT_OPENING,</div><div class='add'>+	ZFCP_WKA_PORT_ONLINE,</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> /* logical unit status */</div><div class='del'>-#define ZFCP_STATUS_UNIT_TEMPORARY		0x00000002</div><div class='ctx'> #define ZFCP_STATUS_UNIT_SHARED			0x00000004</div><div class='ctx'> #define ZFCP_STATUS_UNIT_READONLY		0x00000008</div><div class='ctx'> #define ZFCP_STATUS_UNIT_REGISTERED		0x00000010</div><div class='ctx'> #define ZFCP_STATUS_UNIT_SCSI_WORK_PENDING	0x00000020</div><div class='ctx'> </div><div class='ctx'> /* FSF request status (this does not have a common part) */</div><div class='del'>-#define ZFCP_STATUS_FSFREQ_NOT_INIT		0x00000000</div><div class='del'>-#define ZFCP_STATUS_FSFREQ_POOL  		0x00000001</div><div class='ctx'> #define ZFCP_STATUS_FSFREQ_TASK_MANAGEMENT	0x00000002</div><div class='ctx'> #define ZFCP_STATUS_FSFREQ_COMPLETED		0x00000004</div><div class='ctx'> #define ZFCP_STATUS_FSFREQ_ERROR		0x00000008</div><div class='ctx'> #define ZFCP_STATUS_FSFREQ_CLEANUP		0x00000010</div><div class='del'>-#define ZFCP_STATUS_FSFREQ_ABORTING		0x00000020</div><div class='ctx'> #define ZFCP_STATUS_FSFREQ_ABORTSUCCEEDED	0x00000040</div><div class='ctx'> #define ZFCP_STATUS_FSFREQ_ABORTNOTNEEDED       0x00000080</div><div class='ctx'> #define ZFCP_STATUS_FSFREQ_ABORTED              0x00000100</div><div class='hunk'>@@ -379,7 +325,7 @@ struct ct_hdr {</div><div class='ctx'>  * a port name is required */</div><div class='ctx'> struct ct_iu_gid_pn_req {</div><div class='ctx'> 	struct ct_hdr header;</div><div class='del'>-	wwn_t wwpn;</div><div class='add'>+	u64 wwpn;</div><div class='ctx'> } __attribute__ ((packed));</div><div class='ctx'> </div><div class='ctx'> /* FS_ACC IU and data unit for GID_PN nameserver request */</div><div class='hunk'>@@ -388,11 +334,9 @@ struct ct_iu_gid_pn_resp {</div><div class='ctx'> 	u32 d_id;</div><div class='ctx'> } __attribute__ ((packed));</div><div class='ctx'> </div><div class='del'>-typedef void (*zfcp_send_ct_handler_t)(unsigned long);</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * struct zfcp_send_ct - used to pass parameters to function zfcp_fsf_send_ct</div><div class='del'>- * @port: port where the request is sent to</div><div class='add'>+ * @wka_port: port where the request is sent to</div><div class='ctx'>  * @req: scatter-gather list for request</div><div class='ctx'>  * @resp: scatter-gather list for response</div><div class='ctx'>  * @req_count: number of elements in request scatter-gather list</div><div class='hunk'>@@ -404,12 +348,12 @@ typedef void (*zfcp_send_ct_handler_t)(unsigned long);</div><div class='ctx'>  * @status: used to pass error status to calling function</div><div class='ctx'>  */</div><div class='ctx'> struct zfcp_send_ct {</div><div class='del'>-	struct zfcp_port *port;</div><div class='add'>+	struct zfcp_wka_port *wka_port;</div><div class='ctx'> 	struct scatterlist *req;</div><div class='ctx'> 	struct scatterlist *resp;</div><div class='ctx'> 	unsigned int req_count;</div><div class='ctx'> 	unsigned int resp_count;</div><div class='del'>-	zfcp_send_ct_handler_t handler;</div><div class='add'>+	void (*handler)(unsigned long);</div><div class='ctx'> 	unsigned long handler_data;</div><div class='ctx'> 	int timeout;</div><div class='ctx'> 	struct completion *completion;</div><div class='hunk'>@@ -426,8 +370,6 @@ struct zfcp_gid_pn_data {</div><div class='ctx'>         struct zfcp_port *port;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-typedef void (*zfcp_send_els_handler_t)(unsigned long);</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * struct zfcp_send_els - used to pass parameters to function zfcp_fsf_send_els</div><div class='ctx'>  * @adapter: adapter where request is sent from</div><div class='hunk'>@@ -451,22 +393,28 @@ struct zfcp_send_els {</div><div class='ctx'> 	struct scatterlist *resp;</div><div class='ctx'> 	unsigned int req_count;</div><div class='ctx'> 	unsigned int resp_count;</div><div class='del'>-	zfcp_send_els_handler_t handler;</div><div class='add'>+	void (*handler)(unsigned long);</div><div class='ctx'> 	unsigned long handler_data;</div><div class='ctx'> 	struct completion *completion;</div><div class='ctx'> 	int ls_code;</div><div class='ctx'> 	int status;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct zfcp_wka_port {</div><div class='add'>+	struct zfcp_adapter	*adapter;</div><div class='add'>+	wait_queue_head_t	completion_wq;</div><div class='add'>+	enum zfcp_wka_status	status;</div><div class='add'>+	atomic_t		refcount;</div><div class='add'>+	u32			d_id;</div><div class='add'>+	u32			handle;</div><div class='add'>+	struct mutex		mutex;</div><div class='add'>+	struct delayed_work	work;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct zfcp_qdio_queue {</div><div class='del'>-	struct qdio_buffer *sbal[QDIO_MAX_BUFFERS_PER_Q]; /* SBALs */</div><div class='del'>-	u8		   first;	      /* index of next free bfr</div><div class='del'>-						 in queue (free_count&gt;0) */</div><div class='del'>-	atomic_t           count;	      /* number of free buffers</div><div class='del'>-						 in queue */</div><div class='del'>-	spinlock_t	   lock;	      /* lock for operations on queue */</div><div class='del'>-	int                pci_batch;	      /* SBALs since PCI indication</div><div class='del'>-						 was last set */</div><div class='add'>+	struct qdio_buffer *sbal[QDIO_MAX_BUFFERS_PER_Q];</div><div class='add'>+	u8		   first;	/* index of next free bfr in queue */</div><div class='add'>+	atomic_t           count;	/* number of free buffers in queue */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct zfcp_erp_action {</div><div class='hunk'>@@ -475,7 +423,7 @@ struct zfcp_erp_action {</div><div class='ctx'> 	struct zfcp_adapter *adapter; /* device which should be recovered */</div><div class='ctx'> 	struct zfcp_port *port;</div><div class='ctx'> 	struct zfcp_unit *unit;</div><div class='del'>-	volatile u32 status;	      /* recovery status */</div><div class='add'>+	u32		status;	      /* recovery status */</div><div class='ctx'> 	u32 step;	              /* active step of this erp action */</div><div class='ctx'> 	struct zfcp_fsf_req *fsf_req; /* fsf request currently pending</div><div class='ctx'> 					 for this action */</div><div class='hunk'>@@ -506,8 +454,8 @@ struct zfcp_adapter {</div><div class='ctx'> 	atomic_t                refcount;          /* reference count */</div><div class='ctx'> 	wait_queue_head_t	remove_wq;         /* can be used to wait for</div><div class='ctx'> 						      refcount drop to zero */</div><div class='del'>-	wwn_t			peer_wwnn;	   /* P2P peer WWNN */</div><div class='del'>-	wwn_t			peer_wwpn;	   /* P2P peer WWPN */</div><div class='add'>+	u64			peer_wwnn;	   /* P2P peer WWNN */</div><div class='add'>+	u64			peer_wwpn;	   /* P2P peer WWPN */</div><div class='ctx'> 	u32			peer_d_id;	   /* P2P peer D_ID */</div><div class='ctx'> 	struct ccw_device       *ccw_device;	   /* S/390 ccw device */</div><div class='ctx'> 	u32			hydra_version;	   /* Hydra version */</div><div class='hunk'>@@ -518,13 +466,13 @@ struct zfcp_adapter {</div><div class='ctx'> 	u16			timer_ticks;       /* time int for a tick */</div><div class='ctx'> 	struct Scsi_Host	*scsi_host;	   /* Pointer to mid-layer */</div><div class='ctx'> 	struct list_head	port_list_head;	   /* remote port list */</div><div class='del'>-	struct list_head        port_remove_lh;    /* head of ports to be</div><div class='del'>-						      removed */</div><div class='del'>-	u32			ports;	           /* number of remote ports */</div><div class='ctx'> 	unsigned long		req_no;		   /* unique FSF req number */</div><div class='ctx'> 	struct list_head	*req_list;	   /* list of pending reqs */</div><div class='ctx'> 	spinlock_t		req_list_lock;	   /* request list lock */</div><div class='ctx'> 	struct zfcp_qdio_queue	req_q;		   /* request queue */</div><div class='add'>+	spinlock_t		req_q_lock;	   /* for operations on queue */</div><div class='add'>+	int			req_q_pci_batch;   /* SBALs since PCI indication</div><div class='add'>+						      was last set */</div><div class='ctx'> 	u32			fsf_req_seq_no;	   /* FSF cmnd seq number */</div><div class='ctx'> 	wait_queue_head_t	request_wq;	   /* can be used to wait for</div><div class='ctx'> 						      more avaliable SBALs */</div><div class='hunk'>@@ -548,7 +496,7 @@ struct zfcp_adapter {</div><div class='ctx'> 						      actions */</div><div class='ctx'> 	u32			erp_low_mem_count; /* nr of erp actions waiting</div><div class='ctx'> 						      for memory */</div><div class='del'>-	struct zfcp_port	*nameserver_port;  /* adapter's nameserver */</div><div class='add'>+	struct zfcp_wka_port	nsp;		   /* adapter's nameserver */</div><div class='ctx'> 	debug_info_t		*rec_dbf;</div><div class='ctx'> 	debug_info_t		*hba_dbf;</div><div class='ctx'> 	debug_info_t		*san_dbf;          /* debug feature areas */</div><div class='hunk'>@@ -563,11 +511,11 @@ struct zfcp_adapter {</div><div class='ctx'> 	struct zfcp_scsi_dbf_record	scsi_dbf_buf;</div><div class='ctx'> 	struct zfcp_adapter_mempool	pool;      /* Adapter memory pools */</div><div class='ctx'> 	struct qdio_initialize  qdio_init_data;    /* for qdio_establish */</div><div class='del'>-	struct device           generic_services;  /* directory for WKA ports */</div><div class='ctx'> 	struct fc_host_statistics *fc_stats;</div><div class='ctx'> 	struct fsf_qtcb_bottom_port *stats_reset_data;</div><div class='ctx'> 	unsigned long		stats_reset;</div><div class='ctx'> 	struct work_struct	scan_work;</div><div class='add'>+	atomic_t		qdio_outb_full;	   /* queue full incidents */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct zfcp_port {</div><div class='hunk'>@@ -579,18 +527,16 @@ struct zfcp_port {</div><div class='ctx'> 						  refcount drop to zero */</div><div class='ctx'> 	struct zfcp_adapter    *adapter;       /* adapter used to access port */</div><div class='ctx'> 	struct list_head       unit_list_head; /* head of logical unit list */</div><div class='del'>-	struct list_head       unit_remove_lh; /* head of luns to be removed</div><div class='del'>-						  list */</div><div class='del'>-	u32		       units;	       /* # of logical units in list */</div><div class='ctx'> 	atomic_t	       status;	       /* status of this remote port */</div><div class='del'>-	wwn_t		       wwnn;	       /* WWNN if known */</div><div class='del'>-	wwn_t		       wwpn;	       /* WWPN */</div><div class='add'>+	u64		       wwnn;	       /* WWNN if known */</div><div class='add'>+	u64		       wwpn;	       /* WWPN */</div><div class='ctx'> 	u32		       d_id;	       /* D_ID */</div><div class='ctx'> 	u32		       handle;	       /* handle assigned by FSF */</div><div class='ctx'> 	struct zfcp_erp_action erp_action;     /* pending error recovery */</div><div class='ctx'>         atomic_t               erp_counter;</div><div class='ctx'> 	u32                    maxframe_size;</div><div class='ctx'> 	u32                    supported_classes;</div><div class='add'>+	struct work_struct     gid_pn_work;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct zfcp_unit {</div><div class='hunk'>@@ -601,8 +547,7 @@ struct zfcp_unit {</div><div class='ctx'> 						  refcount drop to zero */</div><div class='ctx'> 	struct zfcp_port       *port;	       /* remote port of unit */</div><div class='ctx'> 	atomic_t	       status;	       /* status of this logical unit */</div><div class='del'>-	unsigned int	       scsi_lun;       /* own SCSI LUN */</div><div class='del'>-	fcp_lun_t	       fcp_lun;	       /* own FCP_LUN */</div><div class='add'>+	u64		       fcp_lun;	       /* own FCP_LUN */</div><div class='ctx'> 	u32		       handle;	       /* handle assigned by FSF */</div><div class='ctx'>         struct scsi_device     *device;        /* scsi device struct pointer */</div><div class='ctx'> 	struct zfcp_erp_action erp_action;     /* pending error recovery */</div><div class='hunk'>@@ -625,7 +570,7 @@ struct zfcp_fsf_req {</div><div class='ctx'> 	u8			sbal_response;	/* SBAL used in interrupt */</div><div class='ctx'> 	wait_queue_head_t      completion_wq;  /* can be used by a routine</div><div class='ctx'> 						  to wait for completion */</div><div class='del'>-	volatile u32	       status;	       /* status of this request */</div><div class='add'>+	u32			status;	       /* status of this request */</div><div class='ctx'> 	u32		       fsf_command;    /* FSF Command copy */</div><div class='ctx'> 	struct fsf_qtcb	       *qtcb;	       /* address of associated QTCB */</div><div class='ctx'> 	u32		       seq_no;         /* Sequence number of request */</div><div class='hunk'>@@ -638,29 +583,28 @@ struct zfcp_fsf_req {</div><div class='ctx'> 	unsigned long long     issued;         /* request sent time (STCK) */</div><div class='ctx'> 	struct zfcp_unit       *unit;</div><div class='ctx'> 	void			(*handler)(struct zfcp_fsf_req *);</div><div class='add'>+	u16			qdio_outb_usage;/* usage of outbound queue */</div><div class='add'>+	u16			qdio_inb_usage;	/* usage of inbound queue */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* driver data */</div><div class='ctx'> struct zfcp_data {</div><div class='ctx'> 	struct scsi_host_template scsi_host_template;</div><div class='ctx'> 	struct scsi_transport_template *scsi_transport_template;</div><div class='del'>-        atomic_t                status;             /* Module status flags */</div><div class='ctx'> 	struct list_head	adapter_list_head;  /* head of adapter list */</div><div class='del'>-	struct list_head	adapter_remove_lh;  /* head of adapters to be</div><div class='del'>-						       removed */</div><div class='del'>-	u32			adapters;	    /* # of adapters in list */</div><div class='ctx'> 	rwlock_t                config_lock;        /* serialises changes</div><div class='ctx'> 						       to adapter/port/unit</div><div class='ctx'> 						       lists */</div><div class='ctx'> 	struct semaphore        config_sema;        /* serialises configuration</div><div class='ctx'> 						       changes */</div><div class='ctx'> 	atomic_t		loglevel;            /* current loglevel */</div><div class='del'>-	char                    init_busid[BUS_ID_SIZE];</div><div class='del'>-	wwn_t                   init_wwpn;</div><div class='del'>-	fcp_lun_t               init_fcp_lun;</div><div class='del'>-	struct kmem_cache		*fsf_req_qtcb_cache;</div><div class='del'>-	struct kmem_cache		*sr_buffer_cache;</div><div class='del'>-	struct kmem_cache		*gid_pn_cache;</div><div class='add'>+	char			init_busid[20];</div><div class='add'>+	u64			init_wwpn;</div><div class='add'>+	u64			init_fcp_lun;</div><div class='add'>+	struct kmem_cache	*fsf_req_qtcb_cache;</div><div class='add'>+	struct kmem_cache	*sr_buffer_cache;</div><div class='add'>+	struct kmem_cache	*gid_pn_cache;</div><div class='add'>+	struct workqueue_struct	*work_queue;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* struct used by memory pools for fsf_requests */</div><div class='hunk'>@@ -677,14 +621,7 @@ struct zfcp_fsf_req_qtcb {</div><div class='ctx'> #define ZFCP_SET                0x00000100</div><div class='ctx'> #define ZFCP_CLEAR              0x00000200</div><div class='ctx'> </div><div class='del'>-#ifndef atomic_test_mask</div><div class='del'>-#define atomic_test_mask(mask, target) \</div><div class='del'>-           ((atomic_read(target) &amp; mask) == mask)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define zfcp_get_busid_by_adapter(adapter) (adapter-&gt;ccw_device-&gt;dev.bus_id)</div><div class='del'>-#define zfcp_get_busid_by_port(port) (zfcp_get_busid_by_adapter(port-&gt;adapter))</div><div class='del'>-#define zfcp_get_busid_by_unit(unit) (zfcp_get_busid_by_port(unit-&gt;port))</div><div class='add'>+#define zfcp_get_busid_by_adapter(adapter) (dev_name(&amp;adapter-&gt;ccw_device-&gt;dev))</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Helper functions for request ID management.</div><div class='hunk'>@@ -745,12 +682,6 @@ zfcp_unit_put(struct zfcp_unit *unit)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void</div><div class='del'>-zfcp_unit_wait(struct zfcp_unit *unit)</div><div class='del'>-{</div><div class='del'>-	wait_event(unit-&gt;remove_wq, atomic_read(&amp;unit-&gt;refcount) == 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='ctx'> zfcp_port_get(struct zfcp_port *port)</div><div class='ctx'> {</div><div class='ctx'> 	atomic_inc(&amp;port-&gt;refcount);</div><div class='hunk'>@@ -764,12 +695,6 @@ zfcp_port_put(struct zfcp_port *port)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void</div><div class='del'>-zfcp_port_wait(struct zfcp_port *port)</div><div class='del'>-{</div><div class='del'>-	wait_event(port-&gt;remove_wq, atomic_read(&amp;port-&gt;refcount) == 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='ctx'> zfcp_adapter_get(struct zfcp_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	atomic_inc(&amp;adapter-&gt;refcount);</div><div class='hunk'>@@ -782,10 +707,4 @@ zfcp_adapter_put(struct zfcp_adapter *adapter)</div><div class='ctx'> 		wake_up(&amp;adapter-&gt;remove_wq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void</div><div class='del'>-zfcp_adapter_wait(struct zfcp_adapter *adapter)</div><div class='del'>-{</div><div class='del'>-	wait_event(adapter-&gt;remove_wq, atomic_read(&amp;adapter-&gt;refcount) == 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #endif /* ZFCP_DEF_H */</div><div class='head'>diff --git a/drivers/s390/scsi/zfcp_erp.c b/drivers/s390/scsi/zfcp_erp.c<br/>index 643ac4bba5b5..9040f738ff33 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/scsi/zfcp_erp.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/s390/scsi/zfcp_erp.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/scsi/zfcp_erp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/scsi/zfcp_erp.c</a></div><div class='hunk'>@@ -23,7 +23,6 @@ enum zfcp_erp_steps {</div><div class='ctx'> 	ZFCP_ERP_STEP_FSF_XCONFIG	= 0x0001,</div><div class='ctx'> 	ZFCP_ERP_STEP_PHYS_PORT_CLOSING	= 0x0010,</div><div class='ctx'> 	ZFCP_ERP_STEP_PORT_CLOSING	= 0x0100,</div><div class='del'>-	ZFCP_ERP_STEP_NAMESERVER_OPEN	= 0x0200,</div><div class='ctx'> 	ZFCP_ERP_STEP_NAMESERVER_LOOKUP	= 0x0400,</div><div class='ctx'> 	ZFCP_ERP_STEP_PORT_OPENING	= 0x0800,</div><div class='ctx'> 	ZFCP_ERP_STEP_UNIT_CLOSING	= 0x1000,</div><div class='hunk'>@@ -532,8 +531,7 @@ static void _zfcp_erp_port_reopen_all(struct zfcp_adapter *adapter,</div><div class='ctx'> 	struct zfcp_port *port;</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(port, &amp;adapter-&gt;port_list_head, list)</div><div class='del'>-		if (!(atomic_read(&amp;port-&gt;status) &amp; ZFCP_STATUS_PORT_WKA))</div><div class='del'>-			_zfcp_erp_port_reopen(port, clear, id, ref);</div><div class='add'>+		_zfcp_erp_port_reopen(port, clear, id, ref);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void _zfcp_erp_unit_reopen_all(struct zfcp_port *port, int clear, u8 id,</div><div class='hunk'>@@ -669,8 +667,6 @@ static int zfcp_erp_adapter_strategy_open_fsf_xport(struct zfcp_erp_action *act)</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct zfcp_adapter *adapter = act-&gt;adapter;</div><div class='ctx'> </div><div class='del'>-	atomic_clear_mask(ZFCP_STATUS_ADAPTER_XPORT_OK, &amp;adapter-&gt;status);</div><div class='del'>-</div><div class='ctx'> 	write_lock_irq(&amp;adapter-&gt;erp_lock);</div><div class='ctx'> 	zfcp_erp_action_to_running(act);</div><div class='ctx'> 	write_unlock_irq(&amp;adapter-&gt;erp_lock);</div><div class='hunk'>@@ -741,8 +737,7 @@ static int zfcp_erp_adapter_strategy_generic(struct zfcp_erp_action *act,</div><div class='ctx'> 				       ZFCP_STATUS_COMMON_OPEN, ZFCP_CLEAR);</div><div class='ctx'>  failed_qdio:</div><div class='ctx'> 	atomic_clear_mask(ZFCP_STATUS_ADAPTER_XCONFIG_OK |</div><div class='del'>-			  ZFCP_STATUS_ADAPTER_LINK_UNPLUGGED |</div><div class='del'>-			  ZFCP_STATUS_ADAPTER_XPORT_OK,</div><div class='add'>+			  ZFCP_STATUS_ADAPTER_LINK_UNPLUGGED,</div><div class='ctx'> 			  &amp;act-&gt;adapter-&gt;status);</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='hunk'>@@ -751,15 +746,11 @@ static int zfcp_erp_adapter_strategy(struct zfcp_erp_action *act)</div><div class='ctx'> {</div><div class='ctx'> 	int retval;</div><div class='ctx'> </div><div class='del'>-	atomic_set_mask(ZFCP_STATUS_COMMON_CLOSING, &amp;act-&gt;adapter-&gt;status);</div><div class='ctx'> 	zfcp_erp_adapter_strategy_generic(act, 1); /* close */</div><div class='del'>-	atomic_clear_mask(ZFCP_STATUS_COMMON_CLOSING, &amp;act-&gt;adapter-&gt;status);</div><div class='ctx'> 	if (act-&gt;status &amp; ZFCP_STATUS_ERP_CLOSE_ONLY)</div><div class='ctx'> 		return ZFCP_ERP_EXIT;</div><div class='ctx'> </div><div class='del'>-	atomic_set_mask(ZFCP_STATUS_COMMON_OPENING, &amp;act-&gt;adapter-&gt;status);</div><div class='ctx'> 	retval = zfcp_erp_adapter_strategy_generic(act, 0); /* open */</div><div class='del'>-	atomic_clear_mask(ZFCP_STATUS_COMMON_OPENING, &amp;act-&gt;adapter-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	if (retval == ZFCP_ERP_FAILED)</div><div class='ctx'> 		ssleep(8);</div><div class='hunk'>@@ -783,10 +774,7 @@ static int zfcp_erp_port_forced_strategy_close(struct zfcp_erp_action *act)</div><div class='ctx'> </div><div class='ctx'> static void zfcp_erp_port_strategy_clearstati(struct zfcp_port *port)</div><div class='ctx'> {</div><div class='del'>-	atomic_clear_mask(ZFCP_STATUS_COMMON_OPENING |</div><div class='del'>-			  ZFCP_STATUS_COMMON_CLOSING |</div><div class='del'>-			  ZFCP_STATUS_COMMON_ACCESS_DENIED |</div><div class='del'>-			  ZFCP_STATUS_PORT_DID_DID |</div><div class='add'>+	atomic_clear_mask(ZFCP_STATUS_COMMON_ACCESS_DENIED |</div><div class='ctx'> 			  ZFCP_STATUS_PORT_PHYS_CLOSING |</div><div class='ctx'> 			  ZFCP_STATUS_PORT_INVALID_WWPN,</div><div class='ctx'> 			  &amp;port-&gt;status);</div><div class='hunk'>@@ -839,73 +827,12 @@ static int zfcp_erp_port_strategy_open_port(struct zfcp_erp_action *erp_action)</div><div class='ctx'> 	return ZFCP_ERP_CONTINUES;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void zfcp_erp_port_strategy_open_ns_wake(struct zfcp_erp_action *ns_act)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	struct zfcp_adapter *adapter = ns_act-&gt;adapter;</div><div class='del'>-	struct zfcp_erp_action *act, *tmp;</div><div class='del'>-	int status;</div><div class='del'>-</div><div class='del'>-	read_lock_irqsave(&amp;adapter-&gt;erp_lock, flags);</div><div class='del'>-	list_for_each_entry_safe(act, tmp, &amp;adapter-&gt;erp_running_head, list) {</div><div class='del'>-		if (act-&gt;step == ZFCP_ERP_STEP_NAMESERVER_OPEN) {</div><div class='del'>-			status = atomic_read(&amp;adapter-&gt;nameserver_port-&gt;status);</div><div class='del'>-			if (status &amp; ZFCP_STATUS_COMMON_ERP_FAILED)</div><div class='del'>-				zfcp_erp_port_failed(act-&gt;port, 27, NULL);</div><div class='del'>-			zfcp_erp_action_ready(act);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	read_unlock_irqrestore(&amp;adapter-&gt;erp_lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int zfcp_erp_port_strategy_open_nameserver(struct zfcp_erp_action *act)</div><div class='del'>-{</div><div class='del'>-	int retval;</div><div class='del'>-</div><div class='del'>-	switch (act-&gt;step) {</div><div class='del'>-	case ZFCP_ERP_STEP_UNINITIALIZED:</div><div class='del'>-	case ZFCP_ERP_STEP_PHYS_PORT_CLOSING:</div><div class='del'>-	case ZFCP_ERP_STEP_PORT_CLOSING:</div><div class='del'>-		return zfcp_erp_port_strategy_open_port(act);</div><div class='del'>-</div><div class='del'>-	case ZFCP_ERP_STEP_PORT_OPENING:</div><div class='del'>-		if (atomic_read(&amp;act-&gt;port-&gt;status) &amp; ZFCP_STATUS_COMMON_OPEN)</div><div class='del'>-			retval = ZFCP_ERP_SUCCEEDED;</div><div class='del'>-		else</div><div class='del'>-			retval = ZFCP_ERP_FAILED;</div><div class='del'>-		/* this is needed anyway  */</div><div class='del'>-		zfcp_erp_port_strategy_open_ns_wake(act);</div><div class='del'>-		return retval;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		return ZFCP_ERP_FAILED;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int zfcp_erp_port_strategy_open_lookup(struct zfcp_erp_action *act)</div><div class='del'>-{</div><div class='del'>-	int retval;</div><div class='del'>-</div><div class='del'>-	retval = zfcp_fc_ns_gid_pn_request(act);</div><div class='del'>-	if (retval == -ENOMEM)</div><div class='del'>-		return ZFCP_ERP_NOMEM;</div><div class='del'>-	act-&gt;step = ZFCP_ERP_STEP_NAMESERVER_LOOKUP;</div><div class='del'>-	if (retval)</div><div class='del'>-		return ZFCP_ERP_FAILED;</div><div class='del'>-	return ZFCP_ERP_CONTINUES;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int zfcp_erp_open_ptp_port(struct zfcp_erp_action *act)</div><div class='ctx'> {</div><div class='ctx'> 	struct zfcp_adapter *adapter = act-&gt;adapter;</div><div class='ctx'> 	struct zfcp_port *port = act-&gt;port;</div><div class='ctx'> </div><div class='ctx'> 	if (port-&gt;wwpn != adapter-&gt;peer_wwpn) {</div><div class='del'>-		dev_err(&amp;adapter-&gt;ccw_device-&gt;dev,</div><div class='del'>-			"Failed to open port 0x%016Lx, "</div><div class='del'>-			"Peer WWPN 0x%016Lx does not "</div><div class='del'>-			"match.\n", port-&gt;wwpn,</div><div class='del'>-			adapter-&gt;peer_wwpn);</div><div class='ctx'> 		zfcp_erp_port_failed(port, 25, NULL);</div><div class='ctx'> 		return ZFCP_ERP_FAILED;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -914,11 +841,25 @@ static int zfcp_erp_open_ptp_port(struct zfcp_erp_action *act)</div><div class='ctx'> 	return zfcp_erp_port_strategy_open_port(act);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void zfcp_erp_port_strategy_open_lookup(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	int retval;</div><div class='add'>+	struct zfcp_port *port = container_of(work, struct zfcp_port,</div><div class='add'>+					      gid_pn_work);</div><div class='add'>+</div><div class='add'>+	retval = zfcp_fc_ns_gid_pn(&amp;port-&gt;erp_action);</div><div class='add'>+	if (retval == -ENOMEM)</div><div class='add'>+		zfcp_erp_notify(&amp;port-&gt;erp_action, ZFCP_ERP_NOMEM);</div><div class='add'>+	port-&gt;erp_action.step = ZFCP_ERP_STEP_NAMESERVER_LOOKUP;</div><div class='add'>+	if (retval)</div><div class='add'>+		zfcp_erp_notify(&amp;port-&gt;erp_action, ZFCP_ERP_FAILED);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int zfcp_erp_port_strategy_open_common(struct zfcp_erp_action *act)</div><div class='ctx'> {</div><div class='ctx'> 	struct zfcp_adapter *adapter = act-&gt;adapter;</div><div class='ctx'> 	struct zfcp_port *port = act-&gt;port;</div><div class='del'>-	struct zfcp_port *ns_port = adapter-&gt;nameserver_port;</div><div class='ctx'> 	int p_status = atomic_read(&amp;port-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	switch (act-&gt;step) {</div><div class='hunk'>@@ -927,28 +868,10 @@ static int zfcp_erp_port_strategy_open_common(struct zfcp_erp_action *act)</div><div class='ctx'> 	case ZFCP_ERP_STEP_PORT_CLOSING:</div><div class='ctx'> 		if (fc_host_port_type(adapter-&gt;scsi_host) == FC_PORTTYPE_PTP)</div><div class='ctx'> 			return zfcp_erp_open_ptp_port(act);</div><div class='del'>-		if (!ns_port) {</div><div class='del'>-			dev_err(&amp;adapter-&gt;ccw_device-&gt;dev,</div><div class='del'>-				"Nameserver port unavailable.\n");</div><div class='del'>-			return ZFCP_ERP_FAILED;</div><div class='del'>-		}</div><div class='del'>-		if (!(atomic_read(&amp;ns_port-&gt;status) &amp;</div><div class='del'>-		      ZFCP_STATUS_COMMON_UNBLOCKED)) {</div><div class='del'>-			/* nameserver port may live again */</div><div class='del'>-			atomic_set_mask(ZFCP_STATUS_COMMON_RUNNING,</div><div class='del'>-					&amp;ns_port-&gt;status);</div><div class='del'>-			if (zfcp_erp_port_reopen(ns_port, 0, 77, act) &gt;= 0) {</div><div class='del'>-				act-&gt;step = ZFCP_ERP_STEP_NAMESERVER_OPEN;</div><div class='del'>-				return ZFCP_ERP_CONTINUES;</div><div class='del'>-			}</div><div class='del'>-			return ZFCP_ERP_FAILED;</div><div class='add'>+		if (!(p_status &amp; ZFCP_STATUS_PORT_DID_DID)) {</div><div class='add'>+			queue_work(zfcp_data.work_queue, &amp;port-&gt;gid_pn_work);</div><div class='add'>+			return ZFCP_ERP_CONTINUES;</div><div class='ctx'> 		}</div><div class='del'>-		/* else nameserver port is already open, fall through */</div><div class='del'>-	case ZFCP_ERP_STEP_NAMESERVER_OPEN:</div><div class='del'>-		if (!(atomic_read(&amp;ns_port-&gt;status) &amp; ZFCP_STATUS_COMMON_OPEN))</div><div class='del'>-			return ZFCP_ERP_FAILED;</div><div class='del'>-		return zfcp_erp_port_strategy_open_lookup(act);</div><div class='del'>-</div><div class='ctx'> 	case ZFCP_ERP_STEP_NAMESERVER_LOOKUP:</div><div class='ctx'> 		if (!(p_status &amp; ZFCP_STATUS_PORT_DID_DID)) {</div><div class='ctx'> 			if (p_status &amp; (ZFCP_STATUS_PORT_INVALID_WWPN)) {</div><div class='hunk'>@@ -961,25 +884,26 @@ static int zfcp_erp_port_strategy_open_common(struct zfcp_erp_action *act)</div><div class='ctx'> </div><div class='ctx'> 	case ZFCP_ERP_STEP_PORT_OPENING:</div><div class='ctx'> 		/* D_ID might have changed during open */</div><div class='del'>-		if ((p_status &amp; ZFCP_STATUS_COMMON_OPEN) &amp;&amp;</div><div class='del'>-		    (p_status &amp; ZFCP_STATUS_PORT_DID_DID))</div><div class='del'>-			return ZFCP_ERP_SUCCEEDED;</div><div class='add'>+		if (p_status &amp; ZFCP_STATUS_COMMON_OPEN) {</div><div class='add'>+			if (p_status &amp; ZFCP_STATUS_PORT_DID_DID)</div><div class='add'>+				return ZFCP_ERP_SUCCEEDED;</div><div class='add'>+			else {</div><div class='add'>+				act-&gt;step = ZFCP_ERP_STEP_PORT_CLOSING;</div><div class='add'>+				return ZFCP_ERP_CONTINUES;</div><div class='add'>+			}</div><div class='ctx'> 		/* fall through otherwise */</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return ZFCP_ERP_FAILED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int zfcp_erp_port_strategy_open(struct zfcp_erp_action *act)</div><div class='del'>-{</div><div class='del'>-	if (atomic_read(&amp;act-&gt;port-&gt;status) &amp; (ZFCP_STATUS_PORT_WKA))</div><div class='del'>-		return zfcp_erp_port_strategy_open_nameserver(act);</div><div class='del'>-	return zfcp_erp_port_strategy_open_common(act);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int zfcp_erp_port_strategy(struct zfcp_erp_action *erp_action)</div><div class='ctx'> {</div><div class='ctx'> 	struct zfcp_port *port = erp_action-&gt;port;</div><div class='ctx'> </div><div class='add'>+	if (atomic_read(&amp;port-&gt;status) &amp; ZFCP_STATUS_COMMON_NOESC)</div><div class='add'>+		goto close_init_done;</div><div class='add'>+</div><div class='ctx'> 	switch (erp_action-&gt;step) {</div><div class='ctx'> 	case ZFCP_ERP_STEP_UNINITIALIZED:</div><div class='ctx'> 		zfcp_erp_port_strategy_clearstati(port);</div><div class='hunk'>@@ -992,19 +916,17 @@ static int zfcp_erp_port_strategy(struct zfcp_erp_action *erp_action)</div><div class='ctx'> 			return ZFCP_ERP_FAILED;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+close_init_done:</div><div class='ctx'> 	if (erp_action-&gt;status &amp; ZFCP_STATUS_ERP_CLOSE_ONLY)</div><div class='ctx'> 		return ZFCP_ERP_EXIT;</div><div class='del'>-	else</div><div class='del'>-		return zfcp_erp_port_strategy_open(erp_action);</div><div class='ctx'> </div><div class='del'>-	return ZFCP_ERP_FAILED;</div><div class='add'>+	return zfcp_erp_port_strategy_open_common(erp_action);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void zfcp_erp_unit_strategy_clearstati(struct zfcp_unit *unit)</div><div class='ctx'> {</div><div class='del'>-	atomic_clear_mask(ZFCP_STATUS_COMMON_OPENING |</div><div class='del'>-			  ZFCP_STATUS_COMMON_CLOSING |</div><div class='del'>-			  ZFCP_STATUS_COMMON_ACCESS_DENIED |</div><div class='add'>+	atomic_clear_mask(ZFCP_STATUS_COMMON_ACCESS_DENIED |</div><div class='ctx'> 			  ZFCP_STATUS_UNIT_SHARED |</div><div class='ctx'> 			  ZFCP_STATUS_UNIT_READONLY,</div><div class='ctx'> 			  &amp;unit-&gt;status);</div><div class='hunk'>@@ -1065,8 +987,14 @@ static int zfcp_erp_strategy_check_unit(struct zfcp_unit *unit, int result)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ZFCP_ERP_FAILED :</div><div class='ctx'> 		atomic_inc(&amp;unit-&gt;erp_counter);</div><div class='del'>-		if (atomic_read(&amp;unit-&gt;erp_counter) &gt; ZFCP_MAX_ERPS)</div><div class='add'>+		if (atomic_read(&amp;unit-&gt;erp_counter) &gt; ZFCP_MAX_ERPS) {</div><div class='add'>+			dev_err(&amp;unit-&gt;port-&gt;adapter-&gt;ccw_device-&gt;dev,</div><div class='add'>+				"ERP failed for unit 0x%016Lx on "</div><div class='add'>+				"port 0x%016Lx\n",</div><div class='add'>+				(unsigned long long)unit-&gt;fcp_lun,</div><div class='add'>+				(unsigned long long)unit-&gt;port-&gt;wwpn);</div><div class='ctx'> 			zfcp_erp_unit_failed(unit, 21, NULL);</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1091,8 +1019,12 @@ static int zfcp_erp_strategy_check_port(struct zfcp_port *port, int result)</div><div class='ctx'> 			result = ZFCP_ERP_EXIT;</div><div class='ctx'> 		}</div><div class='ctx'> 		atomic_inc(&amp;port-&gt;erp_counter);</div><div class='del'>-		if (atomic_read(&amp;port-&gt;erp_counter) &gt; ZFCP_MAX_ERPS)</div><div class='add'>+		if (atomic_read(&amp;port-&gt;erp_counter) &gt; ZFCP_MAX_ERPS) {</div><div class='add'>+			dev_err(&amp;port-&gt;adapter-&gt;ccw_device-&gt;dev,</div><div class='add'>+				"ERP failed for remote port 0x%016Lx\n",</div><div class='add'>+				(unsigned long long)port-&gt;wwpn);</div><div class='ctx'> 			zfcp_erp_port_failed(port, 22, NULL);</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1114,8 +1046,12 @@ static int zfcp_erp_strategy_check_adapter(struct zfcp_adapter *adapter,</div><div class='ctx'> </div><div class='ctx'> 	case ZFCP_ERP_FAILED :</div><div class='ctx'> 		atomic_inc(&amp;adapter-&gt;erp_counter);</div><div class='del'>-		if (atomic_read(&amp;adapter-&gt;erp_counter) &gt; ZFCP_MAX_ERPS)</div><div class='add'>+		if (atomic_read(&amp;adapter-&gt;erp_counter) &gt; ZFCP_MAX_ERPS) {</div><div class='add'>+			dev_err(&amp;adapter-&gt;ccw_device-&gt;dev,</div><div class='add'>+				"ERP cannot recover an error "</div><div class='add'>+				"on the FCP device\n");</div><div class='ctx'> 			zfcp_erp_adapter_failed(adapter, 23, NULL);</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1250,9 +1186,10 @@ static void zfcp_erp_scsi_scan(struct work_struct *work)</div><div class='ctx'> 	struct zfcp_unit *unit = p-&gt;unit;</div><div class='ctx'> 	struct fc_rport *rport = unit-&gt;port-&gt;rport;</div><div class='ctx'> 	scsi_scan_target(&amp;rport-&gt;dev, 0, rport-&gt;scsi_target_id,</div><div class='del'>-			 unit-&gt;scsi_lun, 0);</div><div class='add'>+			 scsilun_to_int((struct scsi_lun *)&amp;unit-&gt;fcp_lun), 0);</div><div class='ctx'> 	atomic_clear_mask(ZFCP_STATUS_UNIT_SCSI_WORK_PENDING, &amp;unit-&gt;status);</div><div class='ctx'> 	zfcp_unit_put(unit);</div><div class='add'>+	wake_up(&amp;unit-&gt;port-&gt;adapter-&gt;erp_done_wqh);</div><div class='ctx'> 	kfree(p);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1263,9 +1200,9 @@ static void zfcp_erp_schedule_work(struct zfcp_unit *unit)</div><div class='ctx'> 	p = kzalloc(sizeof(*p), GFP_KERNEL);</div><div class='ctx'> 	if (!p) {</div><div class='ctx'> 		dev_err(&amp;unit-&gt;port-&gt;adapter-&gt;ccw_device-&gt;dev,</div><div class='del'>-			"Out of resources. Could not register unit "</div><div class='del'>-			"0x%016Lx on port 0x%016Lx with SCSI stack.\n",</div><div class='del'>-			unit-&gt;fcp_lun, unit-&gt;port-&gt;wwpn);</div><div class='add'>+			"Registering unit 0x%016Lx on port 0x%016Lx failed\n",</div><div class='add'>+			(unsigned long long)unit-&gt;fcp_lun,</div><div class='add'>+			(unsigned long long)unit-&gt;port-&gt;wwpn);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1273,7 +1210,7 @@ static void zfcp_erp_schedule_work(struct zfcp_unit *unit)</div><div class='ctx'> 	atomic_set_mask(ZFCP_STATUS_UNIT_SCSI_WORK_PENDING, &amp;unit-&gt;status);</div><div class='ctx'> 	INIT_WORK(&amp;p-&gt;work, zfcp_erp_scsi_scan);</div><div class='ctx'> 	p-&gt;unit = unit;</div><div class='del'>-	schedule_work(&amp;p-&gt;work);</div><div class='add'>+	queue_work(zfcp_data.work_queue, &amp;p-&gt;work);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void zfcp_erp_rport_register(struct zfcp_port *port)</div><div class='hunk'>@@ -1286,8 +1223,8 @@ static void zfcp_erp_rport_register(struct zfcp_port *port)</div><div class='ctx'> 	port-&gt;rport = fc_remote_port_add(port-&gt;adapter-&gt;scsi_host, 0, &amp;ids);</div><div class='ctx'> 	if (!port-&gt;rport) {</div><div class='ctx'> 		dev_err(&amp;port-&gt;adapter-&gt;ccw_device-&gt;dev,</div><div class='del'>-			"Failed registration of rport "</div><div class='del'>-			"0x%016Lx.\n", port-&gt;wwpn);</div><div class='add'>+			"Registering port 0x%016Lx failed\n",</div><div class='add'>+			(unsigned long long)port-&gt;wwpn);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1299,12 +1236,12 @@ static void zfcp_erp_rport_register(struct zfcp_port *port)</div><div class='ctx'> static void zfcp_erp_rports_del(struct zfcp_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	struct zfcp_port *port;</div><div class='del'>-	list_for_each_entry(port, &amp;adapter-&gt;port_list_head, list)</div><div class='del'>-		if (port-&gt;rport &amp;&amp; !(atomic_read(&amp;port-&gt;status) &amp;</div><div class='del'>-					ZFCP_STATUS_PORT_WKA)) {</div><div class='del'>-			fc_remote_port_delete(port-&gt;rport);</div><div class='del'>-			port-&gt;rport = NULL;</div><div class='del'>-		}</div><div class='add'>+	list_for_each_entry(port, &amp;adapter-&gt;port_list_head, list) {</div><div class='add'>+		if (!port-&gt;rport)</div><div class='add'>+			continue;</div><div class='add'>+		fc_remote_port_delete(port-&gt;rport);</div><div class='add'>+		port-&gt;rport = NULL;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void zfcp_erp_action_cleanup(struct zfcp_erp_action *act, int result)</div><div class='hunk'>@@ -1439,7 +1376,7 @@ static int zfcp_erp_thread(void *data)</div><div class='ctx'> 	struct zfcp_erp_action *act;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	daemonize("zfcperp%s", adapter-&gt;ccw_device-&gt;dev.bus_id);</div><div class='add'>+	daemonize("zfcperp%s", dev_name(&amp;adapter-&gt;ccw_device-&gt;dev));</div><div class='ctx'> 	/* Block all signals */</div><div class='ctx'> 	siginitsetinv(&amp;current-&gt;blocked, 0);</div><div class='ctx'> 	atomic_set_mask(ZFCP_STATUS_ADAPTER_ERP_THREAD_UP, &amp;adapter-&gt;status);</div><div class='hunk'>@@ -1459,9 +1396,9 @@ static int zfcp_erp_thread(void *data)</div><div class='ctx'> 				zfcp_erp_wakeup(adapter);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		zfcp_rec_dbf_event_thread(4, adapter);</div><div class='add'>+		zfcp_rec_dbf_event_thread_lock(4, adapter);</div><div class='ctx'> 		down_interruptible(&amp;adapter-&gt;erp_ready_sem);</div><div class='del'>-		zfcp_rec_dbf_event_thread(5, adapter);</div><div class='add'>+		zfcp_rec_dbf_event_thread_lock(5, adapter);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	atomic_clear_mask(ZFCP_STATUS_ADAPTER_ERP_THREAD_UP, &amp;adapter-&gt;status);</div><div class='hunk'>@@ -1484,7 +1421,7 @@ int zfcp_erp_thread_setup(struct zfcp_adapter *adapter)</div><div class='ctx'> 	retval = kernel_thread(zfcp_erp_thread, adapter, SIGCHLD);</div><div class='ctx'> 	if (retval &lt; 0) {</div><div class='ctx'> 		dev_err(&amp;adapter-&gt;ccw_device-&gt;dev,</div><div class='del'>-			"Creation of ERP thread failed.\n");</div><div class='add'>+			"Creating an ERP thread for the FCP device failed.\n");</div><div class='ctx'> 		return retval;</div><div class='ctx'> 	}</div><div class='ctx'> 	wait_event(adapter-&gt;erp_thread_wqh,</div><div class='hunk'>@@ -1506,7 +1443,7 @@ void zfcp_erp_thread_kill(struct zfcp_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	atomic_set_mask(ZFCP_STATUS_ADAPTER_ERP_THREAD_KILL, &amp;adapter-&gt;status);</div><div class='ctx'> 	up(&amp;adapter-&gt;erp_ready_sem);</div><div class='del'>-	zfcp_rec_dbf_event_thread_lock(2, adapter);</div><div class='add'>+	zfcp_rec_dbf_event_thread_lock(3, adapter);</div><div class='ctx'> </div><div class='ctx'> 	wait_event(adapter-&gt;erp_thread_wqh,</div><div class='ctx'> 		   !(atomic_read(&amp;adapter-&gt;status) &amp;</div><div class='hunk'>@@ -1526,7 +1463,6 @@ void zfcp_erp_adapter_failed(struct zfcp_adapter *adapter, u8 id, void *ref)</div><div class='ctx'> {</div><div class='ctx'> 	zfcp_erp_modify_adapter_status(adapter, id, ref,</div><div class='ctx'> 				       ZFCP_STATUS_COMMON_ERP_FAILED, ZFCP_SET);</div><div class='del'>-	dev_err(&amp;adapter-&gt;ccw_device-&gt;dev, "Adapter ERP failed.\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1539,15 +1475,6 @@ void zfcp_erp_port_failed(struct zfcp_port *port, u8 id, void *ref)</div><div class='ctx'> {</div><div class='ctx'> 	zfcp_erp_modify_port_status(port, id, ref,</div><div class='ctx'> 				    ZFCP_STATUS_COMMON_ERP_FAILED, ZFCP_SET);</div><div class='del'>-</div><div class='del'>-	if (atomic_read(&amp;port-&gt;status) &amp; ZFCP_STATUS_PORT_WKA)</div><div class='del'>-		dev_err(&amp;port-&gt;adapter-&gt;ccw_device-&gt;dev,</div><div class='del'>-			"Port ERP failed for WKA port d_id=0x%06x.\n",</div><div class='del'>-			port-&gt;d_id);</div><div class='del'>-	else</div><div class='del'>-		dev_err(&amp;port-&gt;adapter-&gt;ccw_device-&gt;dev,</div><div class='del'>-			"Port ERP failed for port wwpn=0x%016Lx.\n",</div><div class='del'>-			port-&gt;wwpn);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1560,10 +1487,6 @@ void zfcp_erp_unit_failed(struct zfcp_unit *unit, u8 id, void *ref)</div><div class='ctx'> {</div><div class='ctx'> 	zfcp_erp_modify_unit_status(unit, id, ref,</div><div class='ctx'> 				    ZFCP_STATUS_COMMON_ERP_FAILED, ZFCP_SET);</div><div class='del'>-</div><div class='del'>-	dev_err(&amp;unit-&gt;port-&gt;adapter-&gt;ccw_device-&gt;dev,</div><div class='del'>-		"Unit ERP failed for unit 0x%016Lx on port 0x%016Lx.\n",</div><div class='del'>-		unit-&gt;fcp_lun, unit-&gt;port-&gt;wwpn);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1754,9 +1677,8 @@ static void zfcp_erp_port_access_changed(struct zfcp_port *port, u8 id,</div><div class='ctx'> </div><div class='ctx'> 	if (!(status &amp; (ZFCP_STATUS_COMMON_ACCESS_DENIED |</div><div class='ctx'> 			ZFCP_STATUS_COMMON_ACCESS_BOXED))) {</div><div class='del'>-		if (!(status &amp; ZFCP_STATUS_PORT_WKA))</div><div class='del'>-			list_for_each_entry(unit, &amp;port-&gt;unit_list_head, list)</div><div class='del'>-				zfcp_erp_unit_access_changed(unit, id, ref);</div><div class='add'>+		list_for_each_entry(unit, &amp;port-&gt;unit_list_head, list)</div><div class='add'>+				    zfcp_erp_unit_access_changed(unit, id, ref);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1779,10 +1701,7 @@ void zfcp_erp_adapter_access_changed(struct zfcp_adapter *adapter, u8 id,</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	read_lock_irqsave(&amp;zfcp_data.config_lock, flags);</div><div class='del'>-	if (adapter-&gt;nameserver_port)</div><div class='del'>-		zfcp_erp_port_access_changed(adapter-&gt;nameserver_port, id, ref);</div><div class='ctx'> 	list_for_each_entry(port, &amp;adapter-&gt;port_list_head, list)</div><div class='del'>-		if (port != adapter-&gt;nameserver_port)</div><div class='del'>-			zfcp_erp_port_access_changed(port, id, ref);</div><div class='add'>+		zfcp_erp_port_access_changed(port, id, ref);</div><div class='ctx'> 	read_unlock_irqrestore(&amp;zfcp_data.config_lock, flags);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/s390/scsi/zfcp_ext.h b/drivers/s390/scsi/zfcp_ext.h<br/>index edfdb21591f3..b5adeda93e1d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/scsi/zfcp_ext.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/s390/scsi/zfcp_ext.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/scsi/zfcp_ext.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/scsi/zfcp_ext.h</a></div><div class='hunk'>@@ -12,16 +12,14 @@</div><div class='ctx'> #include "zfcp_def.h"</div><div class='ctx'> </div><div class='ctx'> /* zfcp_aux.c */</div><div class='del'>-extern struct zfcp_unit *zfcp_get_unit_by_lun(struct zfcp_port *,</div><div class='del'>-					      fcp_lun_t);</div><div class='del'>-extern struct zfcp_port *zfcp_get_port_by_wwpn(struct zfcp_adapter *,</div><div class='del'>-					       wwn_t);</div><div class='add'>+extern struct zfcp_unit *zfcp_get_unit_by_lun(struct zfcp_port *, u64);</div><div class='add'>+extern struct zfcp_port *zfcp_get_port_by_wwpn(struct zfcp_adapter *, u64);</div><div class='ctx'> extern int zfcp_adapter_enqueue(struct ccw_device *);</div><div class='ctx'> extern void zfcp_adapter_dequeue(struct zfcp_adapter *);</div><div class='del'>-extern struct zfcp_port *zfcp_port_enqueue(struct zfcp_adapter *, wwn_t, u32,</div><div class='add'>+extern struct zfcp_port *zfcp_port_enqueue(struct zfcp_adapter *, u64, u32,</div><div class='ctx'> 					   u32);</div><div class='ctx'> extern void zfcp_port_dequeue(struct zfcp_port *);</div><div class='del'>-extern struct zfcp_unit *zfcp_unit_enqueue(struct zfcp_port *, fcp_lun_t);</div><div class='add'>+extern struct zfcp_unit *zfcp_unit_enqueue(struct zfcp_port *, u64);</div><div class='ctx'> extern void zfcp_unit_dequeue(struct zfcp_unit *);</div><div class='ctx'> extern int zfcp_reqlist_isempty(struct zfcp_adapter *);</div><div class='ctx'> extern void zfcp_sg_free_table(struct scatterlist *, int);</div><div class='hunk'>@@ -29,6 +27,7 @@ extern int zfcp_sg_setup_table(struct scatterlist *, int);</div><div class='ctx'> </div><div class='ctx'> /* zfcp_ccw.c */</div><div class='ctx'> extern int zfcp_ccw_register(void);</div><div class='add'>+extern struct zfcp_adapter *zfcp_get_adapter_by_busid(char *);</div><div class='ctx'> </div><div class='ctx'> /* zfcp_cfdc.c */</div><div class='ctx'> extern struct miscdevice zfcp_cfdc_misc;</div><div class='hunk'>@@ -50,6 +49,8 @@ extern void zfcp_hba_dbf_event_fsf_unsol(const char *, struct zfcp_adapter *,</div><div class='ctx'> 					 struct fsf_status_read_buffer *);</div><div class='ctx'> extern void zfcp_hba_dbf_event_qdio(struct zfcp_adapter *, unsigned int, int,</div><div class='ctx'> 				    int);</div><div class='add'>+extern void zfcp_hba_dbf_event_berr(struct zfcp_adapter *,</div><div class='add'>+				    struct zfcp_fsf_req *);</div><div class='ctx'> extern void zfcp_san_dbf_event_ct_request(struct zfcp_fsf_req *);</div><div class='ctx'> extern void zfcp_san_dbf_event_ct_response(struct zfcp_fsf_req *);</div><div class='ctx'> extern void zfcp_san_dbf_event_els_request(struct zfcp_fsf_req *);</div><div class='hunk'>@@ -91,17 +92,21 @@ extern void zfcp_erp_port_access_denied(struct zfcp_port *, u8, void *);</div><div class='ctx'> extern void zfcp_erp_unit_access_denied(struct zfcp_unit *, u8, void *);</div><div class='ctx'> extern void zfcp_erp_adapter_access_changed(struct zfcp_adapter *, u8, void *);</div><div class='ctx'> extern void zfcp_erp_timeout_handler(unsigned long);</div><div class='add'>+extern void zfcp_erp_port_strategy_open_lookup(struct work_struct *);</div><div class='ctx'> </div><div class='ctx'> /* zfcp_fc.c */</div><div class='ctx'> extern int zfcp_scan_ports(struct zfcp_adapter *);</div><div class='ctx'> extern void _zfcp_scan_ports_later(struct work_struct *);</div><div class='ctx'> extern void zfcp_fc_incoming_els(struct zfcp_fsf_req *);</div><div class='del'>-extern int zfcp_fc_ns_gid_pn_request(struct zfcp_erp_action *);</div><div class='add'>+extern int zfcp_fc_ns_gid_pn(struct zfcp_erp_action *);</div><div class='ctx'> extern void zfcp_fc_plogi_evaluate(struct zfcp_port *, struct fsf_plogi *);</div><div class='ctx'> extern void zfcp_test_link(struct zfcp_port *);</div><div class='add'>+extern void zfcp_fc_nameserver_init(struct zfcp_adapter *);</div><div class='ctx'> </div><div class='ctx'> /* zfcp_fsf.c */</div><div class='ctx'> extern int zfcp_fsf_open_port(struct zfcp_erp_action *);</div><div class='add'>+extern int zfcp_fsf_open_wka_port(struct zfcp_wka_port *);</div><div class='add'>+extern int zfcp_fsf_close_wka_port(struct zfcp_wka_port *);</div><div class='ctx'> extern int zfcp_fsf_close_port(struct zfcp_erp_action *);</div><div class='ctx'> extern int zfcp_fsf_close_physical_port(struct zfcp_erp_action *);</div><div class='ctx'> extern int zfcp_fsf_open_unit(struct zfcp_erp_action *);</div><div class='hunk'>@@ -135,10 +140,8 @@ extern struct zfcp_fsf_req *zfcp_fsf_abort_fcp_command(unsigned long,</div><div class='ctx'> extern int zfcp_qdio_allocate(struct zfcp_adapter *);</div><div class='ctx'> extern void zfcp_qdio_free(struct zfcp_adapter *);</div><div class='ctx'> extern int zfcp_qdio_send(struct zfcp_fsf_req *);</div><div class='del'>-extern volatile struct qdio_buffer_element *zfcp_qdio_sbale_req(</div><div class='del'>-						struct zfcp_fsf_req *);</div><div class='del'>-extern volatile struct qdio_buffer_element *zfcp_qdio_sbale_curr(</div><div class='del'>-						struct zfcp_fsf_req *);</div><div class='add'>+extern struct qdio_buffer_element *zfcp_qdio_sbale_req(struct zfcp_fsf_req *);</div><div class='add'>+extern struct qdio_buffer_element *zfcp_qdio_sbale_curr(struct zfcp_fsf_req *);</div><div class='ctx'> extern int zfcp_qdio_sbals_from_sg(struct zfcp_fsf_req *, unsigned long,</div><div class='ctx'> 				   struct scatterlist *, int);</div><div class='ctx'> extern int zfcp_qdio_open(struct zfcp_adapter *);</div><div class='hunk'>@@ -148,14 +151,12 @@ extern void zfcp_qdio_close(struct zfcp_adapter *);</div><div class='ctx'> extern struct zfcp_data zfcp_data;</div><div class='ctx'> extern int zfcp_adapter_scsi_register(struct zfcp_adapter *);</div><div class='ctx'> extern void zfcp_adapter_scsi_unregister(struct zfcp_adapter *);</div><div class='del'>-extern void zfcp_set_fcp_dl(struct fcp_cmnd_iu *, fcp_dl_t);</div><div class='ctx'> extern char *zfcp_get_fcp_sns_info_ptr(struct fcp_rsp_iu *);</div><div class='ctx'> extern struct fc_function_template zfcp_transport_functions;</div><div class='ctx'> </div><div class='ctx'> /* zfcp_sysfs.c */</div><div class='ctx'> extern struct attribute_group zfcp_sysfs_unit_attrs;</div><div class='ctx'> extern struct attribute_group zfcp_sysfs_adapter_attrs;</div><div class='del'>-extern struct attribute_group zfcp_sysfs_ns_port_attrs;</div><div class='ctx'> extern struct attribute_group zfcp_sysfs_port_attrs;</div><div class='ctx'> extern struct device_attribute *zfcp_sysfs_sdev_attrs[];</div><div class='ctx'> extern struct device_attribute *zfcp_sysfs_shost_attrs[];</div><div class='head'>diff --git a/drivers/s390/scsi/zfcp_fc.c b/drivers/s390/scsi/zfcp_fc.c<br/>index 56196c98c07b..1a7c80a77ff5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/scsi/zfcp_fc.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/s390/scsi/zfcp_fc.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/scsi/zfcp_fc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/scsi/zfcp_fc.c</a></div><div class='hunk'>@@ -39,6 +39,84 @@ struct zfcp_gpn_ft {</div><div class='ctx'> 	struct scatterlist sg_resp[ZFCP_GPN_FT_BUFFERS];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct zfcp_fc_ns_handler_data {</div><div class='add'>+	struct completion done;</div><div class='add'>+	void (*handler)(unsigned long);</div><div class='add'>+	unsigned long handler_data;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int zfcp_wka_port_get(struct zfcp_wka_port *wka_port)</div><div class='add'>+{</div><div class='add'>+	if (mutex_lock_interruptible(&amp;wka_port-&gt;mutex))</div><div class='add'>+		return -ERESTARTSYS;</div><div class='add'>+</div><div class='add'>+	if (wka_port-&gt;status != ZFCP_WKA_PORT_ONLINE) {</div><div class='add'>+		wka_port-&gt;status = ZFCP_WKA_PORT_OPENING;</div><div class='add'>+		if (zfcp_fsf_open_wka_port(wka_port))</div><div class='add'>+			wka_port-&gt;status = ZFCP_WKA_PORT_OFFLINE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;wka_port-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	wait_event_timeout(</div><div class='add'>+		wka_port-&gt;completion_wq,</div><div class='add'>+		wka_port-&gt;status == ZFCP_WKA_PORT_ONLINE ||</div><div class='add'>+		wka_port-&gt;status == ZFCP_WKA_PORT_OFFLINE,</div><div class='add'>+		HZ &gt;&gt; 1);</div><div class='add'>+</div><div class='add'>+	if (wka_port-&gt;status == ZFCP_WKA_PORT_ONLINE) {</div><div class='add'>+		atomic_inc(&amp;wka_port-&gt;refcount);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	return -EIO;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void zfcp_wka_port_offline(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct delayed_work *dw = container_of(work, struct delayed_work, work);</div><div class='add'>+	struct zfcp_wka_port *wka_port =</div><div class='add'>+			container_of(dw, struct zfcp_wka_port, work);</div><div class='add'>+</div><div class='add'>+	wait_event(wka_port-&gt;completion_wq,</div><div class='add'>+			atomic_read(&amp;wka_port-&gt;refcount) == 0);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;wka_port-&gt;mutex);</div><div class='add'>+	if ((atomic_read(&amp;wka_port-&gt;refcount) != 0) ||</div><div class='add'>+	    (wka_port-&gt;status != ZFCP_WKA_PORT_ONLINE))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	wka_port-&gt;status = ZFCP_WKA_PORT_CLOSING;</div><div class='add'>+	if (zfcp_fsf_close_wka_port(wka_port)) {</div><div class='add'>+		wka_port-&gt;status = ZFCP_WKA_PORT_OFFLINE;</div><div class='add'>+		wake_up(&amp;wka_port-&gt;completion_wq);</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;wka_port-&gt;mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void zfcp_wka_port_put(struct zfcp_wka_port *wka_port)</div><div class='add'>+{</div><div class='add'>+	if (atomic_dec_return(&amp;wka_port-&gt;refcount) != 0)</div><div class='add'>+		return;</div><div class='add'>+	/* wait 10 miliseconds, other reqs might pop in */</div><div class='add'>+	schedule_delayed_work(&amp;wka_port-&gt;work, HZ / 100);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void zfcp_fc_nameserver_init(struct zfcp_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	struct zfcp_wka_port *wka_port = &amp;adapter-&gt;nsp;</div><div class='add'>+</div><div class='add'>+	init_waitqueue_head(&amp;wka_port-&gt;completion_wq);</div><div class='add'>+</div><div class='add'>+	wka_port-&gt;adapter = adapter;</div><div class='add'>+	wka_port-&gt;d_id = ZFCP_DID_DIRECTORY_SERVICE;</div><div class='add'>+</div><div class='add'>+	wka_port-&gt;status = ZFCP_WKA_PORT_OFFLINE;</div><div class='add'>+	atomic_set(&amp;wka_port-&gt;refcount, 0);</div><div class='add'>+	mutex_init(&amp;wka_port-&gt;mutex);</div><div class='add'>+	INIT_DELAYED_WORK(&amp;wka_port-&gt;work, zfcp_wka_port_offline);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void _zfcp_fc_incoming_rscn(struct zfcp_fsf_req *fsf_req, u32 range,</div><div class='ctx'> 				   struct fcp_rscn_element *elem)</div><div class='ctx'> {</div><div class='hunk'>@@ -47,10 +125,8 @@ static void _zfcp_fc_incoming_rscn(struct zfcp_fsf_req *fsf_req, u32 range,</div><div class='ctx'> </div><div class='ctx'> 	read_lock_irqsave(&amp;zfcp_data.config_lock, flags);</div><div class='ctx'> 	list_for_each_entry(port, &amp;fsf_req-&gt;adapter-&gt;port_list_head, list) {</div><div class='del'>-		if (atomic_test_mask(ZFCP_STATUS_PORT_WKA, &amp;port-&gt;status))</div><div class='del'>-			continue;</div><div class='ctx'> 		/* FIXME: ZFCP_STATUS_PORT_DID_DID check is racy */</div><div class='del'>-		if (!atomic_test_mask(ZFCP_STATUS_PORT_DID_DID, &amp;port-&gt;status))</div><div class='add'>+		if (!(atomic_read(&amp;port-&gt;status) &amp; ZFCP_STATUS_PORT_DID_DID))</div><div class='ctx'> 			/* Try to connect to unused ports anyway. */</div><div class='ctx'> 			zfcp_erp_port_reopen(port,</div><div class='ctx'> 					     ZFCP_STATUS_COMMON_ERP_FAILED,</div><div class='hunk'>@@ -102,7 +178,7 @@ static void zfcp_fc_incoming_rscn(struct zfcp_fsf_req *fsf_req)</div><div class='ctx'> 	schedule_work(&amp;fsf_req-&gt;adapter-&gt;scan_work);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void zfcp_fc_incoming_wwpn(struct zfcp_fsf_req *req, wwn_t wwpn)</div><div class='add'>+static void zfcp_fc_incoming_wwpn(struct zfcp_fsf_req *req, u64 wwpn)</div><div class='ctx'> {</div><div class='ctx'> 	struct zfcp_adapter *adapter = req-&gt;adapter;</div><div class='ctx'> 	struct zfcp_port *port;</div><div class='hunk'>@@ -157,7 +233,18 @@ void zfcp_fc_incoming_els(struct zfcp_fsf_req *fsf_req)</div><div class='ctx'> 		zfcp_fc_incoming_rscn(fsf_req);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void zfcp_ns_gid_pn_handler(unsigned long data)</div><div class='add'>+static void zfcp_fc_ns_handler(unsigned long data)</div><div class='add'>+{</div><div class='add'>+	struct zfcp_fc_ns_handler_data *compl_rec =</div><div class='add'>+			(struct zfcp_fc_ns_handler_data *) data;</div><div class='add'>+</div><div class='add'>+	if (compl_rec-&gt;handler)</div><div class='add'>+		compl_rec-&gt;handler(compl_rec-&gt;handler_data);</div><div class='add'>+</div><div class='add'>+	complete(&amp;compl_rec-&gt;done);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void zfcp_fc_ns_gid_pn_eval(unsigned long data)</div><div class='ctx'> {</div><div class='ctx'> 	struct zfcp_gid_pn_data *gid_pn = (struct zfcp_gid_pn_data *) data;</div><div class='ctx'> 	struct zfcp_send_ct *ct = &amp;gid_pn-&gt;ct;</div><div class='hunk'>@@ -166,43 +253,31 @@ static void zfcp_ns_gid_pn_handler(unsigned long data)</div><div class='ctx'> 	struct zfcp_port *port = gid_pn-&gt;port;</div><div class='ctx'> </div><div class='ctx'> 	if (ct-&gt;status)</div><div class='del'>-		goto out;</div><div class='add'>+		return;</div><div class='ctx'> 	if (ct_iu_resp-&gt;header.cmd_rsp_code != ZFCP_CT_ACCEPT) {</div><div class='ctx'> 		atomic_set_mask(ZFCP_STATUS_PORT_INVALID_WWPN, &amp;port-&gt;status);</div><div class='del'>-		goto out;</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* paranoia */</div><div class='ctx'> 	if (ct_iu_req-&gt;wwpn != port-&gt;wwpn)</div><div class='del'>-		goto out;</div><div class='add'>+		return;</div><div class='ctx'> 	/* looks like a valid d_id */</div><div class='ctx'> 	port-&gt;d_id = ct_iu_resp-&gt;d_id &amp; ZFCP_DID_MASK;</div><div class='ctx'> 	atomic_set_mask(ZFCP_STATUS_PORT_DID_DID, &amp;port-&gt;status);</div><div class='del'>-out:</div><div class='del'>-	mempool_free(gid_pn, port-&gt;adapter-&gt;pool.data_gid_pn);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * zfcp_fc_ns_gid_pn_request - initiate GID_PN nameserver request</div><div class='del'>- * @erp_action: pointer to zfcp_erp_action where GID_PN request is needed</div><div class='del'>- * return: -ENOMEM on error, 0 otherwise</div><div class='del'>- */</div><div class='del'>-int zfcp_fc_ns_gid_pn_request(struct zfcp_erp_action *erp_action)</div><div class='add'>+int static zfcp_fc_ns_gid_pn_request(struct zfcp_erp_action *erp_action,</div><div class='add'>+				     struct zfcp_gid_pn_data *gid_pn)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='del'>-	struct zfcp_gid_pn_data *gid_pn;</div><div class='ctx'> 	struct zfcp_adapter *adapter = erp_action-&gt;adapter;</div><div class='del'>-</div><div class='del'>-	gid_pn = mempool_alloc(adapter-&gt;pool.data_gid_pn, GFP_ATOMIC);</div><div class='del'>-	if (!gid_pn)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	memset(gid_pn, 0, sizeof(*gid_pn));</div><div class='add'>+	struct zfcp_fc_ns_handler_data compl_rec;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/* setup parameters for send generic command */</div><div class='ctx'> 	gid_pn-&gt;port = erp_action-&gt;port;</div><div class='del'>-	gid_pn-&gt;ct.port = adapter-&gt;nameserver_port;</div><div class='del'>-	gid_pn-&gt;ct.handler = zfcp_ns_gid_pn_handler;</div><div class='del'>-	gid_pn-&gt;ct.handler_data = (unsigned long) gid_pn;</div><div class='add'>+	gid_pn-&gt;ct.wka_port = &amp;adapter-&gt;nsp;</div><div class='add'>+	gid_pn-&gt;ct.handler = zfcp_fc_ns_handler;</div><div class='add'>+	gid_pn-&gt;ct.handler_data = (unsigned long) &amp;compl_rec;</div><div class='ctx'> 	gid_pn-&gt;ct.timeout = ZFCP_NS_GID_PN_TIMEOUT;</div><div class='ctx'> 	gid_pn-&gt;ct.req = &amp;gid_pn-&gt;req;</div><div class='ctx'> 	gid_pn-&gt;ct.resp = &amp;gid_pn-&gt;resp;</div><div class='hunk'>@@ -222,10 +297,42 @@ int zfcp_fc_ns_gid_pn_request(struct zfcp_erp_action *erp_action)</div><div class='ctx'> 	gid_pn-&gt;ct_iu_req.header.max_res_size = ZFCP_CT_MAX_SIZE;</div><div class='ctx'> 	gid_pn-&gt;ct_iu_req.wwpn = erp_action-&gt;port-&gt;wwpn;</div><div class='ctx'> </div><div class='add'>+	init_completion(&amp;compl_rec.done);</div><div class='add'>+	compl_rec.handler = zfcp_fc_ns_gid_pn_eval;</div><div class='add'>+	compl_rec.handler_data = (unsigned long) gid_pn;</div><div class='ctx'> 	ret = zfcp_fsf_send_ct(&amp;gid_pn-&gt;ct, adapter-&gt;pool.fsf_req_erp,</div><div class='ctx'> 			       erp_action);</div><div class='add'>+	if (!ret)</div><div class='add'>+		wait_for_completion(&amp;compl_rec.done);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * zfcp_fc_ns_gid_pn_request - initiate GID_PN nameserver request</div><div class='add'>+ * @erp_action: pointer to zfcp_erp_action where GID_PN request is needed</div><div class='add'>+ * return: -ENOMEM on error, 0 otherwise</div><div class='add'>+ */</div><div class='add'>+int zfcp_fc_ns_gid_pn(struct zfcp_erp_action *erp_action)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct zfcp_gid_pn_data *gid_pn;</div><div class='add'>+	struct zfcp_adapter *adapter = erp_action-&gt;adapter;</div><div class='add'>+</div><div class='add'>+	gid_pn = mempool_alloc(adapter-&gt;pool.data_gid_pn, GFP_ATOMIC);</div><div class='add'>+	if (!gid_pn)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	memset(gid_pn, 0, sizeof(*gid_pn));</div><div class='add'>+</div><div class='add'>+	ret = zfcp_wka_port_get(&amp;adapter-&gt;nsp);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		mempool_free(gid_pn, adapter-&gt;pool.data_gid_pn);</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = zfcp_fc_ns_gid_pn_request(erp_action, gid_pn);</div><div class='add'>+</div><div class='add'>+	zfcp_wka_port_put(&amp;adapter-&gt;nsp);</div><div class='add'>+out:</div><div class='add'>+	mempool_free(gid_pn, adapter-&gt;pool.data_gid_pn);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -255,14 +362,14 @@ struct zfcp_els_adisc {</div><div class='ctx'> 	struct scatterlist req;</div><div class='ctx'> 	struct scatterlist resp;</div><div class='ctx'> 	struct zfcp_ls_adisc ls_adisc;</div><div class='del'>-	struct zfcp_ls_adisc_acc ls_adisc_acc;</div><div class='add'>+	struct zfcp_ls_adisc ls_adisc_acc;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void zfcp_fc_adisc_handler(unsigned long data)</div><div class='ctx'> {</div><div class='ctx'> 	struct zfcp_els_adisc *adisc = (struct zfcp_els_adisc *) data;</div><div class='ctx'> 	struct zfcp_port *port = adisc-&gt;els.port;</div><div class='del'>-	struct zfcp_ls_adisc_acc *ls_adisc = &amp;adisc-&gt;ls_adisc_acc;</div><div class='add'>+	struct zfcp_ls_adisc *ls_adisc = &amp;adisc-&gt;ls_adisc_acc;</div><div class='ctx'> </div><div class='ctx'> 	if (adisc-&gt;els.status) {</div><div class='ctx'> 		/* request rejected or timed out */</div><div class='hunk'>@@ -295,7 +402,7 @@ static int zfcp_fc_adisc(struct zfcp_port *port)</div><div class='ctx'> 	sg_init_one(adisc-&gt;els.req, &amp;adisc-&gt;ls_adisc,</div><div class='ctx'> 		    sizeof(struct zfcp_ls_adisc));</div><div class='ctx'> 	sg_init_one(adisc-&gt;els.resp, &amp;adisc-&gt;ls_adisc_acc,</div><div class='del'>-		    sizeof(struct zfcp_ls_adisc_acc));</div><div class='add'>+		    sizeof(struct zfcp_ls_adisc));</div><div class='ctx'> </div><div class='ctx'> 	adisc-&gt;els.req_count = 1;</div><div class='ctx'> 	adisc-&gt;els.resp_count = 1;</div><div class='hunk'>@@ -338,30 +445,6 @@ void zfcp_test_link(struct zfcp_port *port)</div><div class='ctx'> 		zfcp_erp_port_forced_reopen(port, 0, 65, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int zfcp_scan_get_nameserver(struct zfcp_adapter *adapter)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (!adapter-&gt;nameserver_port)</div><div class='del'>-		return -EINTR;</div><div class='del'>-</div><div class='del'>-	if (!atomic_test_mask(ZFCP_STATUS_COMMON_UNBLOCKED,</div><div class='del'>-			       &amp;adapter-&gt;nameserver_port-&gt;status)) {</div><div class='del'>-		ret = zfcp_erp_port_reopen(adapter-&gt;nameserver_port, 0, 148,</div><div class='del'>-					   NULL);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-		zfcp_erp_wait(adapter);</div><div class='del'>-	}</div><div class='del'>-	return !atomic_test_mask(ZFCP_STATUS_COMMON_UNBLOCKED,</div><div class='del'>-				  &amp;adapter-&gt;nameserver_port-&gt;status);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void zfcp_gpn_ft_handler(unsigned long _done)</div><div class='del'>-{</div><div class='del'>-	complete((struct completion *)_done);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void zfcp_free_sg_env(struct zfcp_gpn_ft *gpn_ft)</div><div class='ctx'> {</div><div class='ctx'> 	struct scatterlist *sg = &amp;gpn_ft-&gt;sg_req;</div><div class='hunk'>@@ -403,7 +486,7 @@ static int zfcp_scan_issue_gpn_ft(struct zfcp_gpn_ft *gpn_ft,</div><div class='ctx'> {</div><div class='ctx'> 	struct zfcp_send_ct *ct = &amp;gpn_ft-&gt;ct;</div><div class='ctx'> 	struct ct_iu_gpn_ft_req *req = sg_virt(&amp;gpn_ft-&gt;sg_req);</div><div class='del'>-	struct completion done;</div><div class='add'>+	struct zfcp_fc_ns_handler_data compl_rec;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/* prepare CT IU for GPN_FT */</div><div class='hunk'>@@ -420,19 +503,20 @@ static int zfcp_scan_issue_gpn_ft(struct zfcp_gpn_ft *gpn_ft,</div><div class='ctx'> 	req-&gt;fc4_type = ZFCP_CT_SCSI_FCP;</div><div class='ctx'> </div><div class='ctx'> 	/* prepare zfcp_send_ct */</div><div class='del'>-	ct-&gt;port = adapter-&gt;nameserver_port;</div><div class='del'>-	ct-&gt;handler = zfcp_gpn_ft_handler;</div><div class='del'>-	ct-&gt;handler_data = (unsigned long)&amp;done;</div><div class='add'>+	ct-&gt;wka_port = &amp;adapter-&gt;nsp;</div><div class='add'>+	ct-&gt;handler = zfcp_fc_ns_handler;</div><div class='add'>+	ct-&gt;handler_data = (unsigned long)&amp;compl_rec;</div><div class='ctx'> 	ct-&gt;timeout = 10;</div><div class='ctx'> 	ct-&gt;req = &amp;gpn_ft-&gt;sg_req;</div><div class='ctx'> 	ct-&gt;resp = gpn_ft-&gt;sg_resp;</div><div class='ctx'> 	ct-&gt;req_count = 1;</div><div class='ctx'> 	ct-&gt;resp_count = ZFCP_GPN_FT_BUFFERS;</div><div class='ctx'> </div><div class='del'>-	init_completion(&amp;done);</div><div class='add'>+	init_completion(&amp;compl_rec.done);</div><div class='add'>+	compl_rec.handler = NULL;</div><div class='ctx'> 	ret = zfcp_fsf_send_ct(ct, NULL, NULL);</div><div class='ctx'> 	if (!ret)</div><div class='del'>-		wait_for_completion(&amp;done);</div><div class='add'>+		wait_for_completion(&amp;compl_rec.done);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -442,9 +526,8 @@ static void zfcp_validate_port(struct zfcp_port *port)</div><div class='ctx'> </div><div class='ctx'> 	atomic_clear_mask(ZFCP_STATUS_COMMON_NOESC, &amp;port-&gt;status);</div><div class='ctx'> </div><div class='del'>-	if (port == adapter-&gt;nameserver_port)</div><div class='del'>-		return;</div><div class='del'>-	if ((port-&gt;supported_classes != 0) || (port-&gt;units != 0)) {</div><div class='add'>+	if ((port-&gt;supported_classes != 0) ||</div><div class='add'>+	    !list_empty(&amp;port-&gt;unit_list_head)) {</div><div class='ctx'> 		zfcp_port_put(port);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -460,7 +543,7 @@ static int zfcp_scan_eval_gpn_ft(struct zfcp_gpn_ft *gpn_ft)</div><div class='ctx'> 	struct scatterlist *sg = gpn_ft-&gt;sg_resp;</div><div class='ctx'> 	struct ct_hdr *hdr = sg_virt(sg);</div><div class='ctx'> 	struct gpn_ft_resp_acc *acc = sg_virt(sg);</div><div class='del'>-	struct zfcp_adapter *adapter = ct-&gt;port-&gt;adapter;</div><div class='add'>+	struct zfcp_adapter *adapter = ct-&gt;wka_port-&gt;adapter;</div><div class='ctx'> 	struct zfcp_port *port, *tmp;</div><div class='ctx'> 	u32 d_id;</div><div class='ctx'> 	int ret = 0, x, last = 0;</div><div class='hunk'>@@ -490,6 +573,9 @@ static int zfcp_scan_eval_gpn_ft(struct zfcp_gpn_ft *gpn_ft)</div><div class='ctx'> 		d_id = acc-&gt;port_id[0] &lt;&lt; 16 | acc-&gt;port_id[1] &lt;&lt; 8 |</div><div class='ctx'> 		       acc-&gt;port_id[2];</div><div class='ctx'> </div><div class='add'>+		/* don't attach ports with a well known address */</div><div class='add'>+		if ((d_id &amp; ZFCP_DID_WKA) == ZFCP_DID_WKA)</div><div class='add'>+			continue;</div><div class='ctx'> 		/* skip the adapter's port and known remote ports */</div><div class='ctx'> 		if (acc-&gt;wwpn == fc_host_port_name(adapter-&gt;scsi_host))</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -528,13 +614,15 @@ int zfcp_scan_ports(struct zfcp_adapter *adapter)</div><div class='ctx'> 	if (fc_host_port_type(adapter-&gt;scsi_host) != FC_PORTTYPE_NPORT)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	ret = zfcp_scan_get_nameserver(adapter);</div><div class='add'>+	ret = zfcp_wka_port_get(&amp;adapter-&gt;nsp);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	gpn_ft = zfcp_alloc_sg_env();</div><div class='del'>-	if (!gpn_ft)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	if (!gpn_ft) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 3; i++) {</div><div class='ctx'> 		ret = zfcp_scan_issue_gpn_ft(gpn_ft, adapter);</div><div class='hunk'>@@ -547,7 +635,8 @@ int zfcp_scan_ports(struct zfcp_adapter *adapter)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	zfcp_free_sg_env(gpn_ft);</div><div class='del'>-</div><div class='add'>+out:</div><div class='add'>+	zfcp_wka_port_put(&amp;adapter-&gt;nsp);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/s390/scsi/zfcp_fsf.c b/drivers/s390/scsi/zfcp_fsf.c<br/>index 49dbeb754e5f..5ae1d497e5ed 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/scsi/zfcp_fsf.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/s390/scsi/zfcp_fsf.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/scsi/zfcp_fsf.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/scsi/zfcp_fsf.c</a></div><div class='hunk'>@@ -6,6 +6,7 @@</div><div class='ctx'>  * Copyright IBM Corporation 2002, 2008</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/blktrace_api.h&gt;</div><div class='ctx'> #include "zfcp_ext.h"</div><div class='ctx'> </div><div class='ctx'> static void zfcp_fsf_request_timeout_handler(unsigned long data)</div><div class='hunk'>@@ -50,19 +51,16 @@ static u32 fsf_qtcb_type[] = {</div><div class='ctx'> 	[FSF_QTCB_UPLOAD_CONTROL_FILE] =  FSF_SUPPORT_COMMAND</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const char *zfcp_act_subtable_type[] = {</div><div class='del'>-	"unknown", "OS", "WWPN", "DID", "LUN"</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static void zfcp_act_eval_err(struct zfcp_adapter *adapter, u32 table)</div><div class='ctx'> {</div><div class='ctx'> 	u16 subtable = table &gt;&gt; 16;</div><div class='ctx'> 	u16 rule = table &amp; 0xffff;</div><div class='add'>+	const char *act_type[] = { "unknown", "OS", "WWPN", "DID", "LUN" };</div><div class='ctx'> </div><div class='del'>-	if (subtable &amp;&amp; subtable &lt; ARRAY_SIZE(zfcp_act_subtable_type))</div><div class='add'>+	if (subtable &amp;&amp; subtable &lt; ARRAY_SIZE(act_type))</div><div class='ctx'> 		dev_warn(&amp;adapter-&gt;ccw_device-&gt;dev,</div><div class='del'>-			 "Access denied in subtable %s, rule %d.\n",</div><div class='del'>-			 zfcp_act_subtable_type[subtable], rule);</div><div class='add'>+			 "Access denied according to ACT rule type %s, "</div><div class='add'>+			 "rule %d\n", act_type[subtable], rule);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void zfcp_fsf_access_denied_port(struct zfcp_fsf_req *req,</div><div class='hunk'>@@ -70,8 +68,8 @@ static void zfcp_fsf_access_denied_port(struct zfcp_fsf_req *req,</div><div class='ctx'> {</div><div class='ctx'> 	struct fsf_qtcb_header *header = &amp;req-&gt;qtcb-&gt;header;</div><div class='ctx'> 	dev_warn(&amp;req-&gt;adapter-&gt;ccw_device-&gt;dev,</div><div class='del'>-		 "Access denied, cannot send command to port 0x%016Lx.\n",</div><div class='del'>-		 port-&gt;wwpn);</div><div class='add'>+		 "Access denied to port 0x%016Lx\n",</div><div class='add'>+		 (unsigned long long)port-&gt;wwpn);</div><div class='ctx'> 	zfcp_act_eval_err(req-&gt;adapter, header-&gt;fsf_status_qual.halfword[0]);</div><div class='ctx'> 	zfcp_act_eval_err(req-&gt;adapter, header-&gt;fsf_status_qual.halfword[1]);</div><div class='ctx'> 	zfcp_erp_port_access_denied(port, 55, req);</div><div class='hunk'>@@ -83,8 +81,9 @@ static void zfcp_fsf_access_denied_unit(struct zfcp_fsf_req *req,</div><div class='ctx'> {</div><div class='ctx'> 	struct fsf_qtcb_header *header = &amp;req-&gt;qtcb-&gt;header;</div><div class='ctx'> 	dev_warn(&amp;req-&gt;adapter-&gt;ccw_device-&gt;dev,</div><div class='del'>-		 "Access denied for unit 0x%016Lx on port 0x%016Lx.\n",</div><div class='del'>-		 unit-&gt;fcp_lun, unit-&gt;port-&gt;wwpn);</div><div class='add'>+		 "Access denied to unit 0x%016Lx on port 0x%016Lx\n",</div><div class='add'>+		 (unsigned long long)unit-&gt;fcp_lun,</div><div class='add'>+		 (unsigned long long)unit-&gt;port-&gt;wwpn);</div><div class='ctx'> 	zfcp_act_eval_err(req-&gt;adapter, header-&gt;fsf_status_qual.halfword[0]);</div><div class='ctx'> 	zfcp_act_eval_err(req-&gt;adapter, header-&gt;fsf_status_qual.halfword[1]);</div><div class='ctx'> 	zfcp_erp_unit_access_denied(unit, 59, req);</div><div class='hunk'>@@ -93,9 +92,8 @@ static void zfcp_fsf_access_denied_unit(struct zfcp_fsf_req *req,</div><div class='ctx'> </div><div class='ctx'> static void zfcp_fsf_class_not_supp(struct zfcp_fsf_req *req)</div><div class='ctx'> {</div><div class='del'>-	dev_err(&amp;req-&gt;adapter-&gt;ccw_device-&gt;dev,</div><div class='del'>-		"Required FC class not supported by adapter, "</div><div class='del'>-		"shutting down adapter.\n");</div><div class='add'>+	dev_err(&amp;req-&gt;adapter-&gt;ccw_device-&gt;dev, "FCP device not "</div><div class='add'>+		"operational because of an unsupported FC class\n");</div><div class='ctx'> 	zfcp_erp_adapter_shutdown(req-&gt;adapter, 0, 123, req);</div><div class='ctx'> 	req-&gt;status |= ZFCP_STATUS_FSFREQ_ERROR;</div><div class='ctx'> }</div><div class='hunk'>@@ -171,42 +169,6 @@ static void zfcp_fsf_status_read_port_closed(struct zfcp_fsf_req *req)</div><div class='ctx'> 	read_unlock_irqrestore(&amp;zfcp_data.config_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void zfcp_fsf_bit_error_threshold(struct zfcp_fsf_req *req)</div><div class='del'>-{</div><div class='del'>-	struct zfcp_adapter *adapter = req-&gt;adapter;</div><div class='del'>-	struct fsf_status_read_buffer *sr_buf = req-&gt;data;</div><div class='del'>-	struct fsf_bit_error_payload *err = &amp;sr_buf-&gt;payload.bit_error;</div><div class='del'>-</div><div class='del'>-	dev_warn(&amp;adapter-&gt;ccw_device-&gt;dev,</div><div class='del'>-		 "Warning: bit error threshold data "</div><div class='del'>-		 "received for the adapter: "</div><div class='del'>-		 "link failures = %i, loss of sync errors = %i, "</div><div class='del'>-		 "loss of signal errors = %i, "</div><div class='del'>-		 "primitive sequence errors = %i, "</div><div class='del'>-		 "invalid transmission word errors = %i, "</div><div class='del'>-		 "CRC errors = %i).\n",</div><div class='del'>-		 err-&gt;link_failure_error_count,</div><div class='del'>-		 err-&gt;loss_of_sync_error_count,</div><div class='del'>-		 err-&gt;loss_of_signal_error_count,</div><div class='del'>-		 err-&gt;primitive_sequence_error_count,</div><div class='del'>-		 err-&gt;invalid_transmission_word_error_count,</div><div class='del'>-		 err-&gt;crc_error_count);</div><div class='del'>-	dev_warn(&amp;adapter-&gt;ccw_device-&gt;dev,</div><div class='del'>-		 "Additional bit error threshold data of the adapter: "</div><div class='del'>-		 "primitive sequence event time-outs = %i, "</div><div class='del'>-		 "elastic buffer overrun errors = %i, "</div><div class='del'>-		 "advertised receive buffer-to-buffer credit = %i, "</div><div class='del'>-		 "current receice buffer-to-buffer credit = %i, "</div><div class='del'>-		 "advertised transmit buffer-to-buffer credit = %i, "</div><div class='del'>-		 "current transmit buffer-to-buffer credit = %i).\n",</div><div class='del'>-		 err-&gt;primitive_sequence_event_timeout_count,</div><div class='del'>-		 err-&gt;elastic_buffer_overrun_error_count,</div><div class='del'>-		 err-&gt;advertised_receive_b2b_credit,</div><div class='del'>-		 err-&gt;current_receive_b2b_credit,</div><div class='del'>-		 err-&gt;advertised_transmit_b2b_credit,</div><div class='del'>-		 err-&gt;current_transmit_b2b_credit);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void zfcp_fsf_link_down_info_eval(struct zfcp_fsf_req *req, u8 id,</div><div class='ctx'> 					 struct fsf_link_down_info *link_down)</div><div class='ctx'> {</div><div class='hunk'>@@ -223,62 +185,66 @@ static void zfcp_fsf_link_down_info_eval(struct zfcp_fsf_req *req, u8 id,</div><div class='ctx'> 	switch (link_down-&gt;error_code) {</div><div class='ctx'> 	case FSF_PSQ_LINK_NO_LIGHT:</div><div class='ctx'> 		dev_warn(&amp;req-&gt;adapter-&gt;ccw_device-&gt;dev,</div><div class='del'>-			 "The local link is down: no light detected.\n");</div><div class='add'>+			 "There is no light signal from the local "</div><div class='add'>+			 "fibre channel cable\n");</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FSF_PSQ_LINK_WRAP_PLUG:</div><div class='ctx'> 		dev_warn(&amp;req-&gt;adapter-&gt;ccw_device-&gt;dev,</div><div class='del'>-			 "The local link is down: wrap plug detected.\n");</div><div class='add'>+			 "There is a wrap plug instead of a fibre "</div><div class='add'>+			 "channel cable\n");</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FSF_PSQ_LINK_NO_FCP:</div><div class='ctx'> 		dev_warn(&amp;req-&gt;adapter-&gt;ccw_device-&gt;dev,</div><div class='del'>-			 "The local link is down: "</div><div class='del'>-			 "adjacent node on link does not support FCP.\n");</div><div class='add'>+			 "The adjacent fibre channel node does not "</div><div class='add'>+			 "support FCP\n");</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FSF_PSQ_LINK_FIRMWARE_UPDATE:</div><div class='ctx'> 		dev_warn(&amp;req-&gt;adapter-&gt;ccw_device-&gt;dev,</div><div class='del'>-			 "The local link is down: "</div><div class='del'>-			 "firmware update in progress.\n");</div><div class='add'>+			 "The FCP device is suspended because of a "</div><div class='add'>+			 "firmware update\n");</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FSF_PSQ_LINK_INVALID_WWPN:</div><div class='ctx'> 		dev_warn(&amp;req-&gt;adapter-&gt;ccw_device-&gt;dev,</div><div class='del'>-			 "The local link is down: "</div><div class='del'>-			 "duplicate or invalid WWPN detected.\n");</div><div class='add'>+			 "The FCP device detected a WWPN that is "</div><div class='add'>+			 "duplicate or not valid\n");</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FSF_PSQ_LINK_NO_NPIV_SUPPORT:</div><div class='ctx'> 		dev_warn(&amp;req-&gt;adapter-&gt;ccw_device-&gt;dev,</div><div class='del'>-			 "The local link is down: "</div><div class='del'>-			 "no support for NPIV by Fabric.\n");</div><div class='add'>+			 "The fibre channel fabric does not support NPIV\n");</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FSF_PSQ_LINK_NO_FCP_RESOURCES:</div><div class='ctx'> 		dev_warn(&amp;req-&gt;adapter-&gt;ccw_device-&gt;dev,</div><div class='del'>-			 "The local link is down: "</div><div class='del'>-			 "out of resource in FCP daughtercard.\n");</div><div class='add'>+			 "The FCP adapter cannot support more NPIV ports\n");</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FSF_PSQ_LINK_NO_FABRIC_RESOURCES:</div><div class='ctx'> 		dev_warn(&amp;req-&gt;adapter-&gt;ccw_device-&gt;dev,</div><div class='del'>-			 "The local link is down: "</div><div class='del'>-			 "out of resource in Fabric.\n");</div><div class='add'>+			 "The adjacent switch cannot support "</div><div class='add'>+			 "more NPIV ports\n");</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FSF_PSQ_LINK_FABRIC_LOGIN_UNABLE:</div><div class='ctx'> 		dev_warn(&amp;req-&gt;adapter-&gt;ccw_device-&gt;dev,</div><div class='del'>-			 "The local link is down: "</div><div class='del'>-			 "unable to login to Fabric.\n");</div><div class='add'>+			 "The FCP adapter could not log in to the "</div><div class='add'>+			 "fibre channel fabric\n");</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FSF_PSQ_LINK_WWPN_ASSIGNMENT_CORRUPTED:</div><div class='ctx'> 		dev_warn(&amp;req-&gt;adapter-&gt;ccw_device-&gt;dev,</div><div class='del'>-			 "WWPN assignment file corrupted on adapter.\n");</div><div class='add'>+			 "The WWPN assignment file on the FCP adapter "</div><div class='add'>+			 "has been damaged\n");</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FSF_PSQ_LINK_MODE_TABLE_CURRUPTED:</div><div class='ctx'> 		dev_warn(&amp;req-&gt;adapter-&gt;ccw_device-&gt;dev,</div><div class='del'>-			 "Mode table corrupted on adapter.\n");</div><div class='add'>+			 "The mode table on the FCP adapter "</div><div class='add'>+			 "has been damaged\n");</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FSF_PSQ_LINK_NO_WWPN_ASSIGNMENT:</div><div class='ctx'> 		dev_warn(&amp;req-&gt;adapter-&gt;ccw_device-&gt;dev,</div><div class='del'>-			 "No WWPN for assignment table on adapter.\n");</div><div class='add'>+			 "All NPIV ports on the FCP adapter have "</div><div class='add'>+			 "been assigned\n");</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		dev_warn(&amp;req-&gt;adapter-&gt;ccw_device-&gt;dev,</div><div class='del'>-			 "The local link to adapter is down.\n");</div><div class='add'>+			 "The link between the FCP adapter and "</div><div class='add'>+			 "the FC fabric is down\n");</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='ctx'> 	zfcp_erp_adapter_failed(adapter, id, req);</div><div class='hunk'>@@ -286,27 +252,18 @@ out:</div><div class='ctx'> </div><div class='ctx'> static void zfcp_fsf_status_read_link_down(struct zfcp_fsf_req *req)</div><div class='ctx'> {</div><div class='del'>-	struct zfcp_adapter *adapter = req-&gt;adapter;</div><div class='ctx'> 	struct fsf_status_read_buffer *sr_buf = req-&gt;data;</div><div class='ctx'> 	struct fsf_link_down_info *ldi =</div><div class='ctx'> 		(struct fsf_link_down_info *) &amp;sr_buf-&gt;payload;</div><div class='ctx'> </div><div class='ctx'> 	switch (sr_buf-&gt;status_subtype) {</div><div class='ctx'> 	case FSF_STATUS_READ_SUB_NO_PHYSICAL_LINK:</div><div class='del'>-		dev_warn(&amp;adapter-&gt;ccw_device-&gt;dev,</div><div class='del'>-			 "Physical link is down.\n");</div><div class='ctx'> 		zfcp_fsf_link_down_info_eval(req, 38, ldi);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FSF_STATUS_READ_SUB_FDISC_FAILED:</div><div class='del'>-		dev_warn(&amp;adapter-&gt;ccw_device-&gt;dev,</div><div class='del'>-			 "Local link is down "</div><div class='del'>-			 "due to failed FDISC login.\n");</div><div class='ctx'> 		zfcp_fsf_link_down_info_eval(req, 39, ldi);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FSF_STATUS_READ_SUB_FIRMWARE_UPDATE:</div><div class='del'>-		dev_warn(&amp;adapter-&gt;ccw_device-&gt;dev,</div><div class='del'>-			 "Local link is down "</div><div class='del'>-			 "due to firmware update on adapter.\n");</div><div class='ctx'> 		zfcp_fsf_link_down_info_eval(req, 40, NULL);</div><div class='ctx'> 	};</div><div class='ctx'> }</div><div class='hunk'>@@ -335,14 +292,17 @@ static void zfcp_fsf_status_read_handler(struct zfcp_fsf_req *req)</div><div class='ctx'> 	case FSF_STATUS_READ_SENSE_DATA_AVAIL:</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FSF_STATUS_READ_BIT_ERROR_THRESHOLD:</div><div class='del'>-		zfcp_fsf_bit_error_threshold(req);</div><div class='add'>+		dev_warn(&amp;adapter-&gt;ccw_device-&gt;dev,</div><div class='add'>+			 "The error threshold for checksum statistics "</div><div class='add'>+			 "has been exceeded\n");</div><div class='add'>+		zfcp_hba_dbf_event_berr(adapter, req);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FSF_STATUS_READ_LINK_DOWN:</div><div class='ctx'> 		zfcp_fsf_status_read_link_down(req);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FSF_STATUS_READ_LINK_UP:</div><div class='ctx'> 		dev_info(&amp;adapter-&gt;ccw_device-&gt;dev,</div><div class='del'>-			 "Local link was replugged.\n");</div><div class='add'>+			 "The local link has been restored\n");</div><div class='ctx'> 		/* All ports should be marked as ready to run again */</div><div class='ctx'> 		zfcp_erp_modify_adapter_status(adapter, 30, NULL,</div><div class='ctx'> 					       ZFCP_STATUS_COMMON_RUNNING,</div><div class='hunk'>@@ -370,7 +330,7 @@ static void zfcp_fsf_status_read_handler(struct zfcp_fsf_req *req)</div><div class='ctx'> 	zfcp_fsf_req_free(req);</div><div class='ctx'> </div><div class='ctx'> 	atomic_inc(&amp;adapter-&gt;stat_miss);</div><div class='del'>-	schedule_work(&amp;adapter-&gt;stat_work);</div><div class='add'>+	queue_work(zfcp_data.work_queue, &amp;adapter-&gt;stat_work);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void zfcp_fsf_fsfstatus_qual_eval(struct zfcp_fsf_req *req)</div><div class='hunk'>@@ -386,8 +346,8 @@ static void zfcp_fsf_fsfstatus_qual_eval(struct zfcp_fsf_req *req)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FSF_SQ_NO_RECOM:</div><div class='ctx'> 		dev_err(&amp;req-&gt;adapter-&gt;ccw_device-&gt;dev,</div><div class='del'>-			"No recommendation could be given for a "</div><div class='del'>-			"problem on the adapter.\n");</div><div class='add'>+			"The FCP adapter reported a problem "</div><div class='add'>+			"that cannot be recovered\n");</div><div class='ctx'> 		zfcp_erp_adapter_shutdown(req-&gt;adapter, 0, 121, req);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -403,8 +363,7 @@ static void zfcp_fsf_fsfstatus_eval(struct zfcp_fsf_req *req)</div><div class='ctx'> 	switch (req-&gt;qtcb-&gt;header.fsf_status) {</div><div class='ctx'> 	case FSF_UNKNOWN_COMMAND:</div><div class='ctx'> 		dev_err(&amp;req-&gt;adapter-&gt;ccw_device-&gt;dev,</div><div class='del'>-			"Command issued by the device driver (0x%x) is "</div><div class='del'>-			"not known by the adapter.\n",</div><div class='add'>+			"The FCP adapter does not recognize the command 0x%x\n",</div><div class='ctx'> 			req-&gt;qtcb-&gt;header.fsf_command);</div><div class='ctx'> 		zfcp_erp_adapter_shutdown(req-&gt;adapter, 0, 120, req);</div><div class='ctx'> 		req-&gt;status |= ZFCP_STATUS_FSFREQ_ERROR;</div><div class='hunk'>@@ -435,11 +394,9 @@ static void zfcp_fsf_protstatus_eval(struct zfcp_fsf_req *req)</div><div class='ctx'> 		return;</div><div class='ctx'> 	case FSF_PROT_QTCB_VERSION_ERROR:</div><div class='ctx'> 		dev_err(&amp;adapter-&gt;ccw_device-&gt;dev,</div><div class='del'>-			"The QTCB version requested by zfcp (0x%x) is not "</div><div class='del'>-			"supported by the FCP adapter (lowest supported "</div><div class='del'>-			"0x%x, highest supported 0x%x).\n",</div><div class='del'>-			FSF_QTCB_CURRENT_VERSION, psq-&gt;word[0],</div><div class='del'>-			psq-&gt;word[1]);</div><div class='add'>+			"QTCB version 0x%x not supported by FCP adapter "</div><div class='add'>+			"(0x%x to 0x%x)\n", FSF_QTCB_CURRENT_VERSION,</div><div class='add'>+			psq-&gt;word[0], psq-&gt;word[1]);</div><div class='ctx'> 		zfcp_erp_adapter_shutdown(adapter, 0, 117, req);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FSF_PROT_ERROR_STATE:</div><div class='hunk'>@@ -449,8 +406,7 @@ static void zfcp_fsf_protstatus_eval(struct zfcp_fsf_req *req)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FSF_PROT_UNSUPP_QTCB_TYPE:</div><div class='ctx'> 		dev_err(&amp;adapter-&gt;ccw_device-&gt;dev,</div><div class='del'>-			"Packet header type used by the device driver is "</div><div class='del'>-			"incompatible with that used on the adapter.\n");</div><div class='add'>+			"The QTCB type is not supported by the FCP adapter\n");</div><div class='ctx'> 		zfcp_erp_adapter_shutdown(adapter, 0, 118, req);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FSF_PROT_HOST_CONNECTION_INITIALIZING:</div><div class='hunk'>@@ -459,7 +415,7 @@ static void zfcp_fsf_protstatus_eval(struct zfcp_fsf_req *req)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FSF_PROT_DUPLICATE_REQUEST_ID:</div><div class='ctx'> 		dev_err(&amp;adapter-&gt;ccw_device-&gt;dev,</div><div class='del'>-			"The request identifier 0x%Lx is ambiguous.\n",</div><div class='add'>+			"0x%Lx is an ambiguous request identifier\n",</div><div class='ctx'> 			(unsigned long long)qtcb-&gt;bottom.support.req_handle);</div><div class='ctx'> 		zfcp_erp_adapter_shutdown(adapter, 0, 78, req);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -479,9 +435,7 @@ static void zfcp_fsf_protstatus_eval(struct zfcp_fsf_req *req)</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		dev_err(&amp;adapter-&gt;ccw_device-&gt;dev,</div><div class='del'>-			"Transfer protocol status information"</div><div class='del'>-			"provided by the adapter (0x%x) "</div><div class='del'>-			"is not compatible with the device driver.\n",</div><div class='add'>+			"0x%x is not a valid transfer protocol status\n",</div><div class='ctx'> 			qtcb-&gt;prefix.prot_status);</div><div class='ctx'> 		zfcp_erp_adapter_shutdown(adapter, 0, 119, req);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -559,33 +513,17 @@ static int zfcp_fsf_exchange_config_evaluate(struct zfcp_fsf_req *req)</div><div class='ctx'> 		adapter-&gt;peer_wwpn = bottom-&gt;plogi_payload.wwpn;</div><div class='ctx'> 		adapter-&gt;peer_wwnn = bottom-&gt;plogi_payload.wwnn;</div><div class='ctx'> 		fc_host_port_type(shost) = FC_PORTTYPE_PTP;</div><div class='del'>-		if (req-&gt;erp_action)</div><div class='del'>-			dev_info(&amp;adapter-&gt;ccw_device-&gt;dev,</div><div class='del'>-				 "Point-to-Point fibrechannel "</div><div class='del'>-				 "configuration detected.\n");</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FSF_TOPO_FABRIC:</div><div class='ctx'> 		fc_host_port_type(shost) = FC_PORTTYPE_NPORT;</div><div class='del'>-		if (req-&gt;erp_action)</div><div class='del'>-			dev_info(&amp;adapter-&gt;ccw_device-&gt;dev,</div><div class='del'>-				 "Switched fabric fibrechannel "</div><div class='del'>-				 "network detected.\n");</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FSF_TOPO_AL:</div><div class='ctx'> 		fc_host_port_type(shost) = FC_PORTTYPE_NLPORT;</div><div class='del'>-		dev_err(&amp;adapter-&gt;ccw_device-&gt;dev,</div><div class='del'>-			"Unsupported arbitrated loop fibrechannel "</div><div class='del'>-			"topology detected, shutting down "</div><div class='del'>-			"adapter.\n");</div><div class='del'>-		zfcp_erp_adapter_shutdown(adapter, 0, 127, req);</div><div class='del'>-		return -EIO;</div><div class='ctx'> 	default:</div><div class='del'>-		fc_host_port_type(shost) = FC_PORTTYPE_UNKNOWN;</div><div class='ctx'> 		dev_err(&amp;adapter-&gt;ccw_device-&gt;dev,</div><div class='del'>-			"The fibrechannel topology reported by the"</div><div class='del'>-			" adapter is not known by the zfcp driver,"</div><div class='del'>-			" shutting down adapter.\n");</div><div class='del'>-		zfcp_erp_adapter_shutdown(adapter, 0, 128, req);</div><div class='add'>+			"Unknown or unsupported arbitrated loop "</div><div class='add'>+			"fibre channel topology detected\n");</div><div class='add'>+		zfcp_erp_adapter_shutdown(adapter, 0, 127, req);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -616,11 +554,9 @@ static void zfcp_fsf_exchange_config_data_handler(struct zfcp_fsf_req *req)</div><div class='ctx'> </div><div class='ctx'> 		if (bottom-&gt;max_qtcb_size &lt; sizeof(struct fsf_qtcb)) {</div><div class='ctx'> 			dev_err(&amp;adapter-&gt;ccw_device-&gt;dev,</div><div class='del'>-				"Maximum QTCB size (%d bytes) allowed by "</div><div class='del'>-				"the adapter is lower than the minimum "</div><div class='del'>-				"required by the driver (%ld bytes).\n",</div><div class='del'>-				bottom-&gt;max_qtcb_size,</div><div class='del'>-				sizeof(struct fsf_qtcb));</div><div class='add'>+				"FCP adapter maximum QTCB size (%d bytes) "</div><div class='add'>+				"is too small\n",</div><div class='add'>+				bottom-&gt;max_qtcb_size);</div><div class='ctx'> 			zfcp_erp_adapter_shutdown(adapter, 0, 129, req);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -656,15 +592,15 @@ static void zfcp_fsf_exchange_config_data_handler(struct zfcp_fsf_req *req)</div><div class='ctx'> </div><div class='ctx'> 	if (FSF_QTCB_CURRENT_VERSION &lt; bottom-&gt;low_qtcb_version) {</div><div class='ctx'> 		dev_err(&amp;adapter-&gt;ccw_device-&gt;dev,</div><div class='del'>-			"The adapter only supports newer control block "</div><div class='del'>-			"versions, try updated device driver.\n");</div><div class='add'>+			"The FCP adapter only supports newer "</div><div class='add'>+			"control block versions\n");</div><div class='ctx'> 		zfcp_erp_adapter_shutdown(adapter, 0, 125, req);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (FSF_QTCB_CURRENT_VERSION &gt; bottom-&gt;high_qtcb_version) {</div><div class='ctx'> 		dev_err(&amp;adapter-&gt;ccw_device-&gt;dev,</div><div class='del'>-			"The adapter only supports older control block "</div><div class='del'>-			"versions, consider a microcode upgrade.\n");</div><div class='add'>+			"The FCP adapter only supports older "</div><div class='add'>+			"control block versions\n");</div><div class='ctx'> 		zfcp_erp_adapter_shutdown(adapter, 0, 126, req);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -688,7 +624,6 @@ static void zfcp_fsf_exchange_port_evaluate(struct zfcp_fsf_req *req)</div><div class='ctx'> </div><div class='ctx'> static void zfcp_fsf_exchange_port_data_handler(struct zfcp_fsf_req *req)</div><div class='ctx'> {</div><div class='del'>-	struct zfcp_adapter *adapter = req-&gt;adapter;</div><div class='ctx'> 	struct fsf_qtcb *qtcb = req-&gt;qtcb;</div><div class='ctx'> </div><div class='ctx'> 	if (req-&gt;status &amp; ZFCP_STATUS_FSFREQ_ERROR)</div><div class='hunk'>@@ -697,38 +632,47 @@ static void zfcp_fsf_exchange_port_data_handler(struct zfcp_fsf_req *req)</div><div class='ctx'> 	switch (qtcb-&gt;header.fsf_status) {</div><div class='ctx'> 	case FSF_GOOD:</div><div class='ctx'> 		zfcp_fsf_exchange_port_evaluate(req);</div><div class='del'>-		atomic_set_mask(ZFCP_STATUS_ADAPTER_XPORT_OK, &amp;adapter-&gt;status);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FSF_EXCHANGE_CONFIG_DATA_INCOMPLETE:</div><div class='ctx'> 		zfcp_fsf_exchange_port_evaluate(req);</div><div class='del'>-		atomic_set_mask(ZFCP_STATUS_ADAPTER_XPORT_OK, &amp;adapter-&gt;status);</div><div class='ctx'> 		zfcp_fsf_link_down_info_eval(req, 43,</div><div class='ctx'> 			&amp;qtcb-&gt;header.fsf_status_qual.link_down_info);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int zfcp_fsf_sbal_check(struct zfcp_qdio_queue *queue)</div><div class='add'>+static int zfcp_fsf_sbal_check(struct zfcp_adapter *adapter)</div><div class='ctx'> {</div><div class='del'>-	spin_lock_bh(&amp;queue-&gt;lock);</div><div class='del'>-	if (atomic_read(&amp;queue-&gt;count))</div><div class='add'>+	struct zfcp_qdio_queue *req_q = &amp;adapter-&gt;req_q;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;adapter-&gt;req_q_lock);</div><div class='add'>+	if (atomic_read(&amp;req_q-&gt;count))</div><div class='ctx'> 		return 1;</div><div class='del'>-	spin_unlock_bh(&amp;queue-&gt;lock);</div><div class='add'>+	spin_unlock_bh(&amp;adapter-&gt;req_q_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int zfcp_fsf_sbal_available(struct zfcp_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	unsigned int count = atomic_read(&amp;adapter-&gt;req_q.count);</div><div class='add'>+	if (!count)</div><div class='add'>+		atomic_inc(&amp;adapter-&gt;qdio_outb_full);</div><div class='add'>+	return count &gt; 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int zfcp_fsf_req_sbal_get(struct zfcp_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	long ret;</div><div class='del'>-	struct zfcp_qdio_queue *req_q = &amp;adapter-&gt;req_q;</div><div class='ctx'> </div><div class='del'>-	spin_unlock_bh(&amp;req_q-&gt;lock);</div><div class='add'>+	spin_unlock_bh(&amp;adapter-&gt;req_q_lock);</div><div class='ctx'> 	ret = wait_event_interruptible_timeout(adapter-&gt;request_wq,</div><div class='del'>-					zfcp_fsf_sbal_check(req_q), 5 * HZ);</div><div class='add'>+					zfcp_fsf_sbal_check(adapter), 5 * HZ);</div><div class='ctx'> 	if (ret &gt; 0)</div><div class='ctx'> 		return 0;</div><div class='add'>+	if (!ret)</div><div class='add'>+		atomic_inc(&amp;adapter-&gt;qdio_outb_full);</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;req_q-&gt;lock);</div><div class='add'>+	spin_lock_bh(&amp;adapter-&gt;req_q_lock);</div><div class='ctx'> 	return -EIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -765,7 +709,7 @@ static struct zfcp_fsf_req *zfcp_fsf_req_create(struct zfcp_adapter *adapter,</div><div class='ctx'> 						u32 fsf_cmd, int req_flags,</div><div class='ctx'> 						mempool_t *pool)</div><div class='ctx'> {</div><div class='del'>-	volatile struct qdio_buffer_element *sbale;</div><div class='add'>+	struct qdio_buffer_element *sbale;</div><div class='ctx'> </div><div class='ctx'> 	struct zfcp_fsf_req *req;</div><div class='ctx'> 	struct zfcp_qdio_queue *req_q = &amp;adapter-&gt;req_q;</div><div class='hunk'>@@ -834,6 +778,7 @@ static int zfcp_fsf_req_send(struct zfcp_fsf_req *req)</div><div class='ctx'> 	list_add_tail(&amp;req-&gt;list, &amp;adapter-&gt;req_list[idx]);</div><div class='ctx'> 	spin_unlock(&amp;adapter-&gt;req_list_lock);</div><div class='ctx'> </div><div class='add'>+	req-&gt;qdio_outb_usage = atomic_read(&amp;req_q-&gt;count);</div><div class='ctx'> 	req-&gt;issued = get_clock();</div><div class='ctx'> 	if (zfcp_qdio_send(req)) {</div><div class='ctx'> 		/* Queues are down..... */</div><div class='hunk'>@@ -867,10 +812,10 @@ int zfcp_fsf_status_read(struct zfcp_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	struct zfcp_fsf_req *req;</div><div class='ctx'> 	struct fsf_status_read_buffer *sr_buf;</div><div class='del'>-	volatile struct qdio_buffer_element *sbale;</div><div class='add'>+	struct qdio_buffer_element *sbale;</div><div class='ctx'> 	int retval = -EIO;</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;adapter-&gt;req_q.lock);</div><div class='add'>+	spin_lock_bh(&amp;adapter-&gt;req_q_lock);</div><div class='ctx'> 	if (zfcp_fsf_req_sbal_get(adapter))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -910,7 +855,7 @@ failed_buf:</div><div class='ctx'> 	zfcp_fsf_req_free(req);</div><div class='ctx'> 	zfcp_hba_dbf_event_fsf_unsol("fail", adapter, NULL);</div><div class='ctx'> out:</div><div class='del'>-	spin_unlock_bh(&amp;adapter-&gt;req_q.lock);</div><div class='add'>+	spin_unlock_bh(&amp;adapter-&gt;req_q_lock);</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -980,11 +925,11 @@ struct zfcp_fsf_req *zfcp_fsf_abort_fcp_command(unsigned long old_req_id,</div><div class='ctx'> 						struct zfcp_unit *unit,</div><div class='ctx'> 						int req_flags)</div><div class='ctx'> {</div><div class='del'>-	volatile struct qdio_buffer_element *sbale;</div><div class='add'>+	struct qdio_buffer_element *sbale;</div><div class='ctx'> 	struct zfcp_fsf_req *req = NULL;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;adapter-&gt;req_q.lock);</div><div class='del'>-	if (!atomic_read(&amp;adapter-&gt;req_q.count))</div><div class='add'>+	spin_lock(&amp;adapter-&gt;req_q_lock);</div><div class='add'>+	if (!zfcp_fsf_sbal_available(adapter))</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	req = zfcp_fsf_req_create(adapter, FSF_QTCB_ABORT_FCP_CMND,</div><div class='ctx'> 				  req_flags, adapter-&gt;pool.fsf_req_abort);</div><div class='hunk'>@@ -1013,7 +958,7 @@ out_error_free:</div><div class='ctx'> 	zfcp_fsf_req_free(req);</div><div class='ctx'> 	req = NULL;</div><div class='ctx'> out:</div><div class='del'>-	spin_unlock(&amp;adapter-&gt;req_q.lock);</div><div class='add'>+	spin_unlock(&amp;adapter-&gt;req_q_lock);</div><div class='ctx'> 	return req;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1021,7 +966,6 @@ static void zfcp_fsf_send_ct_handler(struct zfcp_fsf_req *req)</div><div class='ctx'> {</div><div class='ctx'> 	struct zfcp_adapter *adapter = req-&gt;adapter;</div><div class='ctx'> 	struct zfcp_send_ct *send_ct = req-&gt;data;</div><div class='del'>-	struct zfcp_port *port = send_ct-&gt;port;</div><div class='ctx'> 	struct fsf_qtcb_header *header = &amp;req-&gt;qtcb-&gt;header;</div><div class='ctx'> </div><div class='ctx'> 	send_ct-&gt;status = -EINVAL;</div><div class='hunk'>@@ -1040,17 +984,14 @@ static void zfcp_fsf_send_ct_handler(struct zfcp_fsf_req *req)</div><div class='ctx'>         case FSF_ADAPTER_STATUS_AVAILABLE:</div><div class='ctx'>                 switch (header-&gt;fsf_status_qual.word[0]){</div><div class='ctx'>                 case FSF_SQ_INVOKE_LINK_TEST_PROCEDURE:</div><div class='del'>-			zfcp_test_link(port);</div><div class='ctx'>                 case FSF_SQ_ULP_DEPENDENT_ERP_REQUIRED:</div><div class='ctx'> 			req-&gt;status |= ZFCP_STATUS_FSFREQ_ERROR;</div><div class='ctx'> 			break;</div><div class='ctx'>                 }</div><div class='ctx'>                 break;</div><div class='ctx'> 	case FSF_ACCESS_DENIED:</div><div class='del'>-		zfcp_fsf_access_denied_port(req, port);</div><div class='ctx'> 		break;</div><div class='ctx'>         case FSF_PORT_BOXED:</div><div class='del'>-		zfcp_erp_port_boxed(port, 49, req);</div><div class='ctx'> 		req-&gt;status |= ZFCP_STATUS_FSFREQ_ERROR |</div><div class='ctx'> 			       ZFCP_STATUS_FSFREQ_RETRY;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1101,12 +1042,12 @@ static int zfcp_fsf_setup_sbals(struct zfcp_fsf_req *req,</div><div class='ctx'> int zfcp_fsf_send_ct(struct zfcp_send_ct *ct, mempool_t *pool,</div><div class='ctx'> 		     struct zfcp_erp_action *erp_action)</div><div class='ctx'> {</div><div class='del'>-	struct zfcp_port *port = ct-&gt;port;</div><div class='del'>-	struct zfcp_adapter *adapter = port-&gt;adapter;</div><div class='add'>+	struct zfcp_wka_port *wka_port = ct-&gt;wka_port;</div><div class='add'>+	struct zfcp_adapter *adapter = wka_port-&gt;adapter;</div><div class='ctx'> 	struct zfcp_fsf_req *req;</div><div class='ctx'> 	int ret = -EIO;</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;adapter-&gt;req_q.lock);</div><div class='add'>+	spin_lock_bh(&amp;adapter-&gt;req_q_lock);</div><div class='ctx'> 	if (zfcp_fsf_req_sbal_get(adapter))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -1123,7 +1064,7 @@ int zfcp_fsf_send_ct(struct zfcp_send_ct *ct, mempool_t *pool,</div><div class='ctx'> 		goto failed_send;</div><div class='ctx'> </div><div class='ctx'> 	req-&gt;handler = zfcp_fsf_send_ct_handler;</div><div class='del'>-	req-&gt;qtcb-&gt;header.port_handle = port-&gt;handle;</div><div class='add'>+	req-&gt;qtcb-&gt;header.port_handle = wka_port-&gt;handle;</div><div class='ctx'> 	req-&gt;qtcb-&gt;bottom.support.service_class = FSF_CLASS_3;</div><div class='ctx'> 	req-&gt;qtcb-&gt;bottom.support.timeout = ct-&gt;timeout;</div><div class='ctx'> 	req-&gt;data = ct;</div><div class='hunk'>@@ -1148,7 +1089,7 @@ failed_send:</div><div class='ctx'> 	if (erp_action)</div><div class='ctx'> 		erp_action-&gt;fsf_req = NULL;</div><div class='ctx'> out:</div><div class='del'>-	spin_unlock_bh(&amp;adapter-&gt;req_q.lock);</div><div class='add'>+	spin_unlock_bh(&amp;adapter-&gt;req_q_lock);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1218,8 +1159,8 @@ int zfcp_fsf_send_els(struct zfcp_send_els *els)</div><div class='ctx'> 		       ZFCP_STATUS_COMMON_UNBLOCKED)))</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;adapter-&gt;req_q.lock);</div><div class='del'>-	if (!atomic_read(&amp;adapter-&gt;req_q.count))</div><div class='add'>+	spin_lock(&amp;adapter-&gt;req_q_lock);</div><div class='add'>+	if (!zfcp_fsf_sbal_available(adapter))</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	req = zfcp_fsf_req_create(adapter, FSF_QTCB_SEND_ELS,</div><div class='ctx'> 				  ZFCP_REQ_AUTO_CLEANUP, NULL);</div><div class='hunk'>@@ -1228,8 +1169,8 @@ int zfcp_fsf_send_els(struct zfcp_send_els *els)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = zfcp_fsf_setup_sbals(req, els-&gt;req, els-&gt;resp,</div><div class='del'>-				   FSF_MAX_SBALS_PER_ELS_REQ);</div><div class='add'>+	ret = zfcp_fsf_setup_sbals(req, els-&gt;req, els-&gt;resp, 2);</div><div class='add'>+</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto failed_send;</div><div class='ctx'> </div><div class='hunk'>@@ -1252,19 +1193,19 @@ int zfcp_fsf_send_els(struct zfcp_send_els *els)</div><div class='ctx'> failed_send:</div><div class='ctx'> 	zfcp_fsf_req_free(req);</div><div class='ctx'> out:</div><div class='del'>-	spin_unlock(&amp;adapter-&gt;req_q.lock);</div><div class='add'>+	spin_unlock(&amp;adapter-&gt;req_q_lock);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int zfcp_fsf_exchange_config_data(struct zfcp_erp_action *erp_action)</div><div class='ctx'> {</div><div class='del'>-	volatile struct qdio_buffer_element *sbale;</div><div class='add'>+	struct qdio_buffer_element *sbale;</div><div class='ctx'> 	struct zfcp_fsf_req *req;</div><div class='ctx'> 	struct zfcp_adapter *adapter = erp_action-&gt;adapter;</div><div class='ctx'> 	int retval = -EIO;</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;adapter-&gt;req_q.lock);</div><div class='del'>-	if (!atomic_read(&amp;adapter-&gt;req_q.count))</div><div class='add'>+	spin_lock_bh(&amp;adapter-&gt;req_q_lock);</div><div class='add'>+	if (!zfcp_fsf_sbal_available(adapter))</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	req = zfcp_fsf_req_create(adapter,</div><div class='ctx'> 				  FSF_QTCB_EXCHANGE_CONFIG_DATA,</div><div class='hunk'>@@ -1295,18 +1236,18 @@ int zfcp_fsf_exchange_config_data(struct zfcp_erp_action *erp_action)</div><div class='ctx'> 		erp_action-&gt;fsf_req = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='del'>-	spin_unlock_bh(&amp;adapter-&gt;req_q.lock);</div><div class='add'>+	spin_unlock_bh(&amp;adapter-&gt;req_q_lock);</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int zfcp_fsf_exchange_config_data_sync(struct zfcp_adapter *adapter,</div><div class='ctx'> 				       struct fsf_qtcb_bottom_config *data)</div><div class='ctx'> {</div><div class='del'>-	volatile struct qdio_buffer_element *sbale;</div><div class='add'>+	struct qdio_buffer_element *sbale;</div><div class='ctx'> 	struct zfcp_fsf_req *req = NULL;</div><div class='ctx'> 	int retval = -EIO;</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;adapter-&gt;req_q.lock);</div><div class='add'>+	spin_lock_bh(&amp;adapter-&gt;req_q_lock);</div><div class='ctx'> 	if (zfcp_fsf_req_sbal_get(adapter))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -1334,7 +1275,7 @@ int zfcp_fsf_exchange_config_data_sync(struct zfcp_adapter *adapter,</div><div class='ctx'> 	zfcp_fsf_start_timer(req, ZFCP_FSF_REQUEST_TIMEOUT);</div><div class='ctx'> 	retval = zfcp_fsf_req_send(req);</div><div class='ctx'> out:</div><div class='del'>-	spin_unlock_bh(&amp;adapter-&gt;req_q.lock);</div><div class='add'>+	spin_unlock_bh(&amp;adapter-&gt;req_q_lock);</div><div class='ctx'> 	if (!retval)</div><div class='ctx'> 		wait_event(req-&gt;completion_wq,</div><div class='ctx'> 			   req-&gt;status &amp; ZFCP_STATUS_FSFREQ_COMPLETED);</div><div class='hunk'>@@ -1351,7 +1292,7 @@ out:</div><div class='ctx'>  */</div><div class='ctx'> int zfcp_fsf_exchange_port_data(struct zfcp_erp_action *erp_action)</div><div class='ctx'> {</div><div class='del'>-	volatile struct qdio_buffer_element *sbale;</div><div class='add'>+	struct qdio_buffer_element *sbale;</div><div class='ctx'> 	struct zfcp_fsf_req *req;</div><div class='ctx'> 	struct zfcp_adapter *adapter = erp_action-&gt;adapter;</div><div class='ctx'> 	int retval = -EIO;</div><div class='hunk'>@@ -1359,8 +1300,8 @@ int zfcp_fsf_exchange_port_data(struct zfcp_erp_action *erp_action)</div><div class='ctx'> 	if (!(adapter-&gt;adapter_features &amp; FSF_FEATURE_HBAAPI_MANAGEMENT))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;adapter-&gt;req_q.lock);</div><div class='del'>-	if (!atomic_read(&amp;adapter-&gt;req_q.count))</div><div class='add'>+	spin_lock_bh(&amp;adapter-&gt;req_q_lock);</div><div class='add'>+	if (!zfcp_fsf_sbal_available(adapter))</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	req = zfcp_fsf_req_create(adapter, FSF_QTCB_EXCHANGE_PORT_DATA,</div><div class='ctx'> 				  ZFCP_REQ_AUTO_CLEANUP,</div><div class='hunk'>@@ -1385,7 +1326,7 @@ int zfcp_fsf_exchange_port_data(struct zfcp_erp_action *erp_action)</div><div class='ctx'> 		erp_action-&gt;fsf_req = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='del'>-	spin_unlock_bh(&amp;adapter-&gt;req_q.lock);</div><div class='add'>+	spin_unlock_bh(&amp;adapter-&gt;req_q_lock);</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1398,15 +1339,15 @@ out:</div><div class='ctx'> int zfcp_fsf_exchange_port_data_sync(struct zfcp_adapter *adapter,</div><div class='ctx'> 				     struct fsf_qtcb_bottom_port *data)</div><div class='ctx'> {</div><div class='del'>-	volatile struct qdio_buffer_element *sbale;</div><div class='add'>+	struct qdio_buffer_element *sbale;</div><div class='ctx'> 	struct zfcp_fsf_req *req = NULL;</div><div class='ctx'> 	int retval = -EIO;</div><div class='ctx'> </div><div class='ctx'> 	if (!(adapter-&gt;adapter_features &amp; FSF_FEATURE_HBAAPI_MANAGEMENT))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;adapter-&gt;req_q.lock);</div><div class='del'>-	if (!atomic_read(&amp;adapter-&gt;req_q.count))</div><div class='add'>+	spin_lock_bh(&amp;adapter-&gt;req_q_lock);</div><div class='add'>+	if (!zfcp_fsf_sbal_available(adapter))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	req = zfcp_fsf_req_create(adapter, FSF_QTCB_EXCHANGE_PORT_DATA, 0,</div><div class='hunk'>@@ -1427,7 +1368,7 @@ int zfcp_fsf_exchange_port_data_sync(struct zfcp_adapter *adapter,</div><div class='ctx'> 	zfcp_fsf_start_timer(req, ZFCP_FSF_REQUEST_TIMEOUT);</div><div class='ctx'> 	retval = zfcp_fsf_req_send(req);</div><div class='ctx'> out:</div><div class='del'>-	spin_unlock_bh(&amp;adapter-&gt;req_q.lock);</div><div class='add'>+	spin_unlock_bh(&amp;adapter-&gt;req_q_lock);</div><div class='ctx'> 	if (!retval)</div><div class='ctx'> 		wait_event(req-&gt;completion_wq,</div><div class='ctx'> 			   req-&gt;status &amp; ZFCP_STATUS_FSFREQ_COMPLETED);</div><div class='hunk'>@@ -1443,7 +1384,7 @@ static void zfcp_fsf_open_port_handler(struct zfcp_fsf_req *req)</div><div class='ctx'> 	struct fsf_plogi *plogi;</div><div class='ctx'> </div><div class='ctx'> 	if (req-&gt;status &amp; ZFCP_STATUS_FSFREQ_ERROR)</div><div class='del'>-		goto skip_fsfstatus;</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	switch (header-&gt;fsf_status) {</div><div class='ctx'> 	case FSF_PORT_ALREADY_OPEN:</div><div class='hunk'>@@ -1453,9 +1394,9 @@ static void zfcp_fsf_open_port_handler(struct zfcp_fsf_req *req)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FSF_MAXIMUM_NUMBER_OF_PORTS_EXCEEDED:</div><div class='ctx'> 		dev_warn(&amp;req-&gt;adapter-&gt;ccw_device-&gt;dev,</div><div class='del'>-			 "The adapter is out of resources. The remote port "</div><div class='del'>-			 "0x%016Lx could not be opened, disabling it.\n",</div><div class='del'>-			 port-&gt;wwpn);</div><div class='add'>+			 "Not enough FCP adapter resources to open "</div><div class='add'>+			 "remote port 0x%016Lx\n",</div><div class='add'>+			 (unsigned long long)port-&gt;wwpn);</div><div class='ctx'> 		zfcp_erp_port_failed(port, 31, req);</div><div class='ctx'> 		req-&gt;status |= ZFCP_STATUS_FSFREQ_ERROR;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1467,8 +1408,8 @@ static void zfcp_fsf_open_port_handler(struct zfcp_fsf_req *req)</div><div class='ctx'> 			break;</div><div class='ctx'> 		case FSF_SQ_NO_RETRY_POSSIBLE:</div><div class='ctx'> 			dev_warn(&amp;req-&gt;adapter-&gt;ccw_device-&gt;dev,</div><div class='del'>-				 "The remote port 0x%016Lx could not be "</div><div class='del'>-				 "opened. Disabling it.\n", port-&gt;wwpn);</div><div class='add'>+				 "Remote port 0x%016Lx could not be opened\n",</div><div class='add'>+				 (unsigned long long)port-&gt;wwpn);</div><div class='ctx'> 			zfcp_erp_port_failed(port, 32, req);</div><div class='ctx'> 			req-&gt;status |= ZFCP_STATUS_FSFREQ_ERROR;</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -1496,9 +1437,6 @@ static void zfcp_fsf_open_port_handler(struct zfcp_fsf_req *req)</div><div class='ctx'> 		 * another GID_PN straight after a port has been opened.</div><div class='ctx'> 		 * Alternately, an ADISC/PDISC ELS should suffice, as well.</div><div class='ctx'> 		 */</div><div class='del'>-		if (atomic_read(&amp;port-&gt;status) &amp; ZFCP_STATUS_PORT_NO_WWPN)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='ctx'> 		plogi = (struct fsf_plogi *) req-&gt;qtcb-&gt;bottom.support.els;</div><div class='ctx'> 		if (req-&gt;qtcb-&gt;bottom.support.els1_length &gt;= sizeof(*plogi)) {</div><div class='ctx'> 			if (plogi-&gt;serv_param.wwpn != port-&gt;wwpn)</div><div class='hunk'>@@ -1514,9 +1452,6 @@ static void zfcp_fsf_open_port_handler(struct zfcp_fsf_req *req)</div><div class='ctx'> 		req-&gt;status |= ZFCP_STATUS_FSFREQ_ERROR;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-skip_fsfstatus:</div><div class='del'>-	atomic_clear_mask(ZFCP_STATUS_COMMON_OPENING, &amp;port-&gt;status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1526,12 +1461,12 @@ skip_fsfstatus:</div><div class='ctx'>  */</div><div class='ctx'> int zfcp_fsf_open_port(struct zfcp_erp_action *erp_action)</div><div class='ctx'> {</div><div class='del'>-	volatile struct qdio_buffer_element *sbale;</div><div class='add'>+	struct qdio_buffer_element *sbale;</div><div class='ctx'> 	struct zfcp_adapter *adapter = erp_action-&gt;adapter;</div><div class='ctx'> 	struct zfcp_fsf_req *req;</div><div class='ctx'> 	int retval = -EIO;</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;adapter-&gt;req_q.lock);</div><div class='add'>+	spin_lock_bh(&amp;adapter-&gt;req_q_lock);</div><div class='ctx'> 	if (zfcp_fsf_req_sbal_get(adapter))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -1553,7 +1488,6 @@ int zfcp_fsf_open_port(struct zfcp_erp_action *erp_action)</div><div class='ctx'> 	req-&gt;data = erp_action-&gt;port;</div><div class='ctx'> 	req-&gt;erp_action = erp_action;</div><div class='ctx'> 	erp_action-&gt;fsf_req = req;</div><div class='del'>-	atomic_set_mask(ZFCP_STATUS_COMMON_OPENING, &amp;erp_action-&gt;port-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	zfcp_fsf_start_erp_timer(req);</div><div class='ctx'> 	retval = zfcp_fsf_req_send(req);</div><div class='hunk'>@@ -1562,7 +1496,7 @@ int zfcp_fsf_open_port(struct zfcp_erp_action *erp_action)</div><div class='ctx'> 		erp_action-&gt;fsf_req = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='del'>-	spin_unlock_bh(&amp;adapter-&gt;req_q.lock);</div><div class='add'>+	spin_unlock_bh(&amp;adapter-&gt;req_q_lock);</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1571,7 +1505,7 @@ static void zfcp_fsf_close_port_handler(struct zfcp_fsf_req *req)</div><div class='ctx'> 	struct zfcp_port *port = req-&gt;data;</div><div class='ctx'> </div><div class='ctx'> 	if (req-&gt;status &amp; ZFCP_STATUS_FSFREQ_ERROR)</div><div class='del'>-		goto skip_fsfstatus;</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	switch (req-&gt;qtcb-&gt;header.fsf_status) {</div><div class='ctx'> 	case FSF_PORT_HANDLE_NOT_VALID:</div><div class='hunk'>@@ -1586,9 +1520,6 @@ static void zfcp_fsf_close_port_handler(struct zfcp_fsf_req *req)</div><div class='ctx'> 					    ZFCP_CLEAR);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-skip_fsfstatus:</div><div class='del'>-	atomic_clear_mask(ZFCP_STATUS_COMMON_CLOSING, &amp;port-&gt;status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1598,12 +1529,12 @@ skip_fsfstatus:</div><div class='ctx'>  */</div><div class='ctx'> int zfcp_fsf_close_port(struct zfcp_erp_action *erp_action)</div><div class='ctx'> {</div><div class='del'>-	volatile struct qdio_buffer_element *sbale;</div><div class='add'>+	struct qdio_buffer_element *sbale;</div><div class='ctx'> 	struct zfcp_adapter *adapter = erp_action-&gt;adapter;</div><div class='ctx'> 	struct zfcp_fsf_req *req;</div><div class='ctx'> 	int retval = -EIO;</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;adapter-&gt;req_q.lock);</div><div class='add'>+	spin_lock_bh(&amp;adapter-&gt;req_q_lock);</div><div class='ctx'> 	if (zfcp_fsf_req_sbal_get(adapter))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -1624,7 +1555,6 @@ int zfcp_fsf_close_port(struct zfcp_erp_action *erp_action)</div><div class='ctx'> 	req-&gt;erp_action = erp_action;</div><div class='ctx'> 	req-&gt;qtcb-&gt;header.port_handle = erp_action-&gt;port-&gt;handle;</div><div class='ctx'> 	erp_action-&gt;fsf_req = req;</div><div class='del'>-	atomic_set_mask(ZFCP_STATUS_COMMON_CLOSING, &amp;erp_action-&gt;port-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	zfcp_fsf_start_erp_timer(req);</div><div class='ctx'> 	retval = zfcp_fsf_req_send(req);</div><div class='hunk'>@@ -1633,7 +1563,131 @@ int zfcp_fsf_close_port(struct zfcp_erp_action *erp_action)</div><div class='ctx'> 		erp_action-&gt;fsf_req = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='del'>-	spin_unlock_bh(&amp;adapter-&gt;req_q.lock);</div><div class='add'>+	spin_unlock_bh(&amp;adapter-&gt;req_q_lock);</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void zfcp_fsf_open_wka_port_handler(struct zfcp_fsf_req *req)</div><div class='add'>+{</div><div class='add'>+	struct zfcp_wka_port *wka_port = req-&gt;data;</div><div class='add'>+	struct fsf_qtcb_header *header = &amp;req-&gt;qtcb-&gt;header;</div><div class='add'>+</div><div class='add'>+	if (req-&gt;status &amp; ZFCP_STATUS_FSFREQ_ERROR) {</div><div class='add'>+		wka_port-&gt;status = ZFCP_WKA_PORT_OFFLINE;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (header-&gt;fsf_status) {</div><div class='add'>+	case FSF_MAXIMUM_NUMBER_OF_PORTS_EXCEEDED:</div><div class='add'>+		dev_warn(&amp;req-&gt;adapter-&gt;ccw_device-&gt;dev,</div><div class='add'>+			 "Opening WKA port 0x%x failed\n", wka_port-&gt;d_id);</div><div class='add'>+	case FSF_ADAPTER_STATUS_AVAILABLE:</div><div class='add'>+		req-&gt;status |= ZFCP_STATUS_FSFREQ_ERROR;</div><div class='add'>+	case FSF_ACCESS_DENIED:</div><div class='add'>+		wka_port-&gt;status = ZFCP_WKA_PORT_OFFLINE;</div><div class='add'>+		break;</div><div class='add'>+	case FSF_PORT_ALREADY_OPEN:</div><div class='add'>+	case FSF_GOOD:</div><div class='add'>+		wka_port-&gt;handle = header-&gt;port_handle;</div><div class='add'>+		wka_port-&gt;status = ZFCP_WKA_PORT_ONLINE;</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	wake_up(&amp;wka_port-&gt;completion_wq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * zfcp_fsf_open_wka_port - create and send open wka-port request</div><div class='add'>+ * @wka_port: pointer to struct zfcp_wka_port</div><div class='add'>+ * Returns: 0 on success, error otherwise</div><div class='add'>+ */</div><div class='add'>+int zfcp_fsf_open_wka_port(struct zfcp_wka_port *wka_port)</div><div class='add'>+{</div><div class='add'>+	struct qdio_buffer_element *sbale;</div><div class='add'>+	struct zfcp_adapter *adapter = wka_port-&gt;adapter;</div><div class='add'>+	struct zfcp_fsf_req *req;</div><div class='add'>+	int retval = -EIO;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;adapter-&gt;req_q_lock);</div><div class='add'>+	if (zfcp_fsf_req_sbal_get(adapter))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	req = zfcp_fsf_req_create(adapter,</div><div class='add'>+				  FSF_QTCB_OPEN_PORT_WITH_DID,</div><div class='add'>+				  ZFCP_REQ_AUTO_CLEANUP,</div><div class='add'>+				  adapter-&gt;pool.fsf_req_erp);</div><div class='add'>+	if (unlikely(IS_ERR(req))) {</div><div class='add'>+		retval = PTR_ERR(req);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sbale = zfcp_qdio_sbale_req(req);</div><div class='add'>+	sbale[0].flags |= SBAL_FLAGS0_TYPE_READ;</div><div class='add'>+	sbale[1].flags |= SBAL_FLAGS_LAST_ENTRY;</div><div class='add'>+</div><div class='add'>+	req-&gt;handler = zfcp_fsf_open_wka_port_handler;</div><div class='add'>+	req-&gt;qtcb-&gt;bottom.support.d_id = wka_port-&gt;d_id;</div><div class='add'>+	req-&gt;data = wka_port;</div><div class='add'>+</div><div class='add'>+	zfcp_fsf_start_timer(req, ZFCP_FSF_REQUEST_TIMEOUT);</div><div class='add'>+	retval = zfcp_fsf_req_send(req);</div><div class='add'>+	if (retval)</div><div class='add'>+		zfcp_fsf_req_free(req);</div><div class='add'>+out:</div><div class='add'>+	spin_unlock_bh(&amp;adapter-&gt;req_q_lock);</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void zfcp_fsf_close_wka_port_handler(struct zfcp_fsf_req *req)</div><div class='add'>+{</div><div class='add'>+	struct zfcp_wka_port *wka_port = req-&gt;data;</div><div class='add'>+</div><div class='add'>+	if (req-&gt;qtcb-&gt;header.fsf_status == FSF_PORT_HANDLE_NOT_VALID) {</div><div class='add'>+		req-&gt;status |= ZFCP_STATUS_FSFREQ_ERROR;</div><div class='add'>+		zfcp_erp_adapter_reopen(wka_port-&gt;adapter, 0, 84, req);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	wka_port-&gt;status = ZFCP_WKA_PORT_OFFLINE;</div><div class='add'>+	wake_up(&amp;wka_port-&gt;completion_wq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * zfcp_fsf_close_wka_port - create and send close wka port request</div><div class='add'>+ * @erp_action: pointer to struct zfcp_erp_action</div><div class='add'>+ * Returns: 0 on success, error otherwise</div><div class='add'>+ */</div><div class='add'>+int zfcp_fsf_close_wka_port(struct zfcp_wka_port *wka_port)</div><div class='add'>+{</div><div class='add'>+	struct qdio_buffer_element *sbale;</div><div class='add'>+	struct zfcp_adapter *adapter = wka_port-&gt;adapter;</div><div class='add'>+	struct zfcp_fsf_req *req;</div><div class='add'>+	int retval = -EIO;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;adapter-&gt;req_q_lock);</div><div class='add'>+	if (zfcp_fsf_req_sbal_get(adapter))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	req = zfcp_fsf_req_create(adapter, FSF_QTCB_CLOSE_PORT,</div><div class='add'>+				  ZFCP_REQ_AUTO_CLEANUP,</div><div class='add'>+				  adapter-&gt;pool.fsf_req_erp);</div><div class='add'>+	if (unlikely(IS_ERR(req))) {</div><div class='add'>+		retval = PTR_ERR(req);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sbale = zfcp_qdio_sbale_req(req);</div><div class='add'>+	sbale[0].flags |= SBAL_FLAGS0_TYPE_READ;</div><div class='add'>+	sbale[1].flags |= SBAL_FLAGS_LAST_ENTRY;</div><div class='add'>+</div><div class='add'>+	req-&gt;handler = zfcp_fsf_close_wka_port_handler;</div><div class='add'>+	req-&gt;data = wka_port;</div><div class='add'>+	req-&gt;qtcb-&gt;header.port_handle = wka_port-&gt;handle;</div><div class='add'>+</div><div class='add'>+	zfcp_fsf_start_timer(req, ZFCP_FSF_REQUEST_TIMEOUT);</div><div class='add'>+	retval = zfcp_fsf_req_send(req);</div><div class='add'>+	if (retval)</div><div class='add'>+		zfcp_fsf_req_free(req);</div><div class='add'>+out:</div><div class='add'>+	spin_unlock_bh(&amp;adapter-&gt;req_q_lock);</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1695,12 +1749,12 @@ skip_fsfstatus:</div><div class='ctx'>  */</div><div class='ctx'> int zfcp_fsf_close_physical_port(struct zfcp_erp_action *erp_action)</div><div class='ctx'> {</div><div class='del'>-	volatile struct qdio_buffer_element *sbale;</div><div class='add'>+	struct qdio_buffer_element *sbale;</div><div class='ctx'> 	struct zfcp_adapter *adapter = erp_action-&gt;adapter;</div><div class='ctx'> 	struct zfcp_fsf_req *req;</div><div class='ctx'> 	int retval = -EIO;</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;adapter-&gt;req_q.lock);</div><div class='add'>+	spin_lock_bh(&amp;adapter-&gt;req_q_lock);</div><div class='ctx'> 	if (zfcp_fsf_req_sbal_get(adapter))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -1731,7 +1785,7 @@ int zfcp_fsf_close_physical_port(struct zfcp_erp_action *erp_action)</div><div class='ctx'> 		erp_action-&gt;fsf_req = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='del'>-	spin_unlock_bh(&amp;adapter-&gt;req_q.lock);</div><div class='add'>+	spin_unlock_bh(&amp;adapter-&gt;req_q_lock);</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1746,7 +1800,7 @@ static void zfcp_fsf_open_unit_handler(struct zfcp_fsf_req *req)</div><div class='ctx'> 	int exclusive, readwrite;</div><div class='ctx'> </div><div class='ctx'> 	if (req-&gt;status &amp; ZFCP_STATUS_FSFREQ_ERROR)</div><div class='del'>-		goto skip_fsfstatus;</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	atomic_clear_mask(ZFCP_STATUS_COMMON_ACCESS_DENIED |</div><div class='ctx'> 			  ZFCP_STATUS_COMMON_ACCESS_BOXED |</div><div class='hunk'>@@ -1774,14 +1828,12 @@ static void zfcp_fsf_open_unit_handler(struct zfcp_fsf_req *req)</div><div class='ctx'> 	case FSF_LUN_SHARING_VIOLATION:</div><div class='ctx'> 		if (header-&gt;fsf_status_qual.word[0])</div><div class='ctx'> 			dev_warn(&amp;adapter-&gt;ccw_device-&gt;dev,</div><div class='del'>-				 "FCP-LUN 0x%Lx at the remote port "</div><div class='del'>-				 "with WWPN 0x%Lx "</div><div class='del'>-				 "connected to the adapter "</div><div class='del'>-				 "is already in use in LPAR%d, CSS%d.\n",</div><div class='del'>-				 unit-&gt;fcp_lun,</div><div class='del'>-				 unit-&gt;port-&gt;wwpn,</div><div class='del'>-				 queue_designator-&gt;hla,</div><div class='del'>-				 queue_designator-&gt;cssid);</div><div class='add'>+				 "LUN 0x%Lx on port 0x%Lx is already in "</div><div class='add'>+				 "use by CSS%d, MIF Image ID %x\n",</div><div class='add'>+				 (unsigned long long)unit-&gt;fcp_lun,</div><div class='add'>+				 (unsigned long long)unit-&gt;port-&gt;wwpn,</div><div class='add'>+				 queue_designator-&gt;cssid,</div><div class='add'>+				 queue_designator-&gt;hla);</div><div class='ctx'> 		else</div><div class='ctx'> 			zfcp_act_eval_err(adapter,</div><div class='ctx'> 					  header-&gt;fsf_status_qual.word[2]);</div><div class='hunk'>@@ -1792,9 +1844,10 @@ static void zfcp_fsf_open_unit_handler(struct zfcp_fsf_req *req)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FSF_MAXIMUM_NUMBER_OF_LUNS_EXCEEDED:</div><div class='ctx'> 		dev_warn(&amp;adapter-&gt;ccw_device-&gt;dev,</div><div class='del'>-			 "The adapter ran out of resources. There is no "</div><div class='del'>-			 "handle available for unit 0x%016Lx on port 0x%016Lx.",</div><div class='del'>-			 unit-&gt;fcp_lun, unit-&gt;port-&gt;wwpn);</div><div class='add'>+			 "No handle is available for LUN "</div><div class='add'>+			 "0x%016Lx on port 0x%016Lx\n",</div><div class='add'>+			 (unsigned long long)unit-&gt;fcp_lun,</div><div class='add'>+			 (unsigned long long)unit-&gt;port-&gt;wwpn);</div><div class='ctx'> 		zfcp_erp_unit_failed(unit, 34, req);</div><div class='ctx'> 		/* fall through */</div><div class='ctx'> 	case FSF_INVALID_COMMAND_OPTION:</div><div class='hunk'>@@ -1831,26 +1884,29 @@ static void zfcp_fsf_open_unit_handler(struct zfcp_fsf_req *req)</div><div class='ctx'>                 		atomic_set_mask(ZFCP_STATUS_UNIT_READONLY,</div><div class='ctx'> 						&amp;unit-&gt;status);</div><div class='ctx'> 				dev_info(&amp;adapter-&gt;ccw_device-&gt;dev,</div><div class='del'>-					 "Read-only access for unit 0x%016Lx "</div><div class='del'>-					 "on port 0x%016Lx.\n",</div><div class='del'>-					 unit-&gt;fcp_lun, unit-&gt;port-&gt;wwpn);</div><div class='add'>+					 "SCSI device at LUN 0x%016Lx on port "</div><div class='add'>+					 "0x%016Lx opened read-only\n",</div><div class='add'>+					 (unsigned long long)unit-&gt;fcp_lun,</div><div class='add'>+					 (unsigned long long)unit-&gt;port-&gt;wwpn);</div><div class='ctx'>         		}</div><div class='ctx'> </div><div class='ctx'>         		if (exclusive &amp;&amp; !readwrite) {</div><div class='ctx'> 				dev_err(&amp;adapter-&gt;ccw_device-&gt;dev,</div><div class='del'>-					"Exclusive access of read-only unit "</div><div class='del'>-					"0x%016Lx on port 0x%016Lx not "</div><div class='del'>-					"supported, disabling unit.\n",</div><div class='del'>-					unit-&gt;fcp_lun, unit-&gt;port-&gt;wwpn);</div><div class='add'>+					"Exclusive read-only access not "</div><div class='add'>+					"supported (unit 0x%016Lx, "</div><div class='add'>+					"port 0x%016Lx)\n",</div><div class='add'>+					(unsigned long long)unit-&gt;fcp_lun,</div><div class='add'>+					(unsigned long long)unit-&gt;port-&gt;wwpn);</div><div class='ctx'> 				zfcp_erp_unit_failed(unit, 35, req);</div><div class='ctx'> 				req-&gt;status |= ZFCP_STATUS_FSFREQ_ERROR;</div><div class='ctx'> 				zfcp_erp_unit_shutdown(unit, 0, 80, req);</div><div class='ctx'>         		} else if (!exclusive &amp;&amp; readwrite) {</div><div class='ctx'> 				dev_err(&amp;adapter-&gt;ccw_device-&gt;dev,</div><div class='del'>-					"Shared access of read-write unit "</div><div class='del'>-					"0x%016Lx on port 0x%016Lx not "</div><div class='del'>-					"supported, disabling unit.\n",</div><div class='del'>-					unit-&gt;fcp_lun, unit-&gt;port-&gt;wwpn);</div><div class='add'>+					"Shared read-write access not "</div><div class='add'>+					"supported (unit 0x%016Lx, port "</div><div class='add'>+					"0x%016Lx\n)",</div><div class='add'>+					(unsigned long long)unit-&gt;fcp_lun,</div><div class='add'>+					(unsigned long long)unit-&gt;port-&gt;wwpn);</div><div class='ctx'> 				zfcp_erp_unit_failed(unit, 36, req);</div><div class='ctx'> 				req-&gt;status |= ZFCP_STATUS_FSFREQ_ERROR;</div><div class='ctx'> 				zfcp_erp_unit_shutdown(unit, 0, 81, req);</div><div class='hunk'>@@ -1858,9 +1914,6 @@ static void zfcp_fsf_open_unit_handler(struct zfcp_fsf_req *req)</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-skip_fsfstatus:</div><div class='del'>-	atomic_clear_mask(ZFCP_STATUS_COMMON_OPENING, &amp;unit-&gt;status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1870,12 +1923,12 @@ skip_fsfstatus:</div><div class='ctx'>  */</div><div class='ctx'> int zfcp_fsf_open_unit(struct zfcp_erp_action *erp_action)</div><div class='ctx'> {</div><div class='del'>-	volatile struct qdio_buffer_element *sbale;</div><div class='add'>+	struct qdio_buffer_element *sbale;</div><div class='ctx'> 	struct zfcp_adapter *adapter = erp_action-&gt;adapter;</div><div class='ctx'> 	struct zfcp_fsf_req *req;</div><div class='ctx'> 	int retval = -EIO;</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;adapter-&gt;req_q.lock);</div><div class='add'>+	spin_lock_bh(&amp;adapter-&gt;req_q_lock);</div><div class='ctx'> 	if (zfcp_fsf_req_sbal_get(adapter))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -1901,8 +1954,6 @@ int zfcp_fsf_open_unit(struct zfcp_erp_action *erp_action)</div><div class='ctx'> 	if (!(adapter-&gt;connection_features &amp; FSF_FEATURE_NPIV_MODE))</div><div class='ctx'> 		req-&gt;qtcb-&gt;bottom.support.option = FSF_OPEN_LUN_SUPPRESS_BOXING;</div><div class='ctx'> </div><div class='del'>-	atomic_set_mask(ZFCP_STATUS_COMMON_OPENING, &amp;erp_action-&gt;unit-&gt;status);</div><div class='del'>-</div><div class='ctx'> 	zfcp_fsf_start_erp_timer(req);</div><div class='ctx'> 	retval = zfcp_fsf_req_send(req);</div><div class='ctx'> 	if (retval) {</div><div class='hunk'>@@ -1910,7 +1961,7 @@ int zfcp_fsf_open_unit(struct zfcp_erp_action *erp_action)</div><div class='ctx'> 		erp_action-&gt;fsf_req = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='del'>-	spin_unlock_bh(&amp;adapter-&gt;req_q.lock);</div><div class='add'>+	spin_unlock_bh(&amp;adapter-&gt;req_q_lock);</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1919,7 +1970,7 @@ static void zfcp_fsf_close_unit_handler(struct zfcp_fsf_req *req)</div><div class='ctx'> 	struct zfcp_unit *unit = req-&gt;data;</div><div class='ctx'> </div><div class='ctx'> 	if (req-&gt;status &amp; ZFCP_STATUS_FSFREQ_ERROR)</div><div class='del'>-		goto skip_fsfstatus;</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	switch (req-&gt;qtcb-&gt;header.fsf_status) {</div><div class='ctx'> 	case FSF_PORT_HANDLE_NOT_VALID:</div><div class='hunk'>@@ -1949,8 +2000,6 @@ static void zfcp_fsf_close_unit_handler(struct zfcp_fsf_req *req)</div><div class='ctx'> 		atomic_clear_mask(ZFCP_STATUS_COMMON_OPEN, &amp;unit-&gt;status);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-skip_fsfstatus:</div><div class='del'>-	atomic_clear_mask(ZFCP_STATUS_COMMON_CLOSING, &amp;unit-&gt;status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1960,12 +2009,12 @@ skip_fsfstatus:</div><div class='ctx'>  */</div><div class='ctx'> int zfcp_fsf_close_unit(struct zfcp_erp_action *erp_action)</div><div class='ctx'> {</div><div class='del'>-	volatile struct qdio_buffer_element *sbale;</div><div class='add'>+	struct qdio_buffer_element *sbale;</div><div class='ctx'> 	struct zfcp_adapter *adapter = erp_action-&gt;adapter;</div><div class='ctx'> 	struct zfcp_fsf_req *req;</div><div class='ctx'> 	int retval = -EIO;</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;adapter-&gt;req_q.lock);</div><div class='add'>+	spin_lock_bh(&amp;adapter-&gt;req_q_lock);</div><div class='ctx'> 	if (zfcp_fsf_req_sbal_get(adapter))</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	req = zfcp_fsf_req_create(adapter, FSF_QTCB_CLOSE_LUN,</div><div class='hunk'>@@ -1986,7 +2035,6 @@ int zfcp_fsf_close_unit(struct zfcp_erp_action *erp_action)</div><div class='ctx'> 	req-&gt;data = erp_action-&gt;unit;</div><div class='ctx'> 	req-&gt;erp_action = erp_action;</div><div class='ctx'> 	erp_action-&gt;fsf_req = req;</div><div class='del'>-	atomic_set_mask(ZFCP_STATUS_COMMON_CLOSING, &amp;erp_action-&gt;unit-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	zfcp_fsf_start_erp_timer(req);</div><div class='ctx'> 	retval = zfcp_fsf_req_send(req);</div><div class='hunk'>@@ -1995,7 +2043,7 @@ int zfcp_fsf_close_unit(struct zfcp_erp_action *erp_action)</div><div class='ctx'> 		erp_action-&gt;fsf_req = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='del'>-	spin_unlock_bh(&amp;adapter-&gt;req_q.lock);</div><div class='add'>+	spin_unlock_bh(&amp;adapter-&gt;req_q_lock);</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2036,6 +2084,36 @@ static void zfcp_fsf_req_latency(struct zfcp_fsf_req *req)</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;unit-&gt;latencies.lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_BLK_DEV_IO_TRACE</div><div class='add'>+static void zfcp_fsf_trace_latency(struct zfcp_fsf_req *fsf_req)</div><div class='add'>+{</div><div class='add'>+	struct fsf_qual_latency_info *lat_inf;</div><div class='add'>+	struct scsi_cmnd *scsi_cmnd = (struct scsi_cmnd *)fsf_req-&gt;data;</div><div class='add'>+	struct request *req = scsi_cmnd-&gt;request;</div><div class='add'>+	struct zfcp_blk_drv_data trace;</div><div class='add'>+	int ticks = fsf_req-&gt;adapter-&gt;timer_ticks;</div><div class='add'>+</div><div class='add'>+	trace.flags = 0;</div><div class='add'>+	trace.magic = ZFCP_BLK_DRV_DATA_MAGIC;</div><div class='add'>+	if (fsf_req-&gt;adapter-&gt;adapter_features &amp; FSF_FEATURE_MEASUREMENT_DATA) {</div><div class='add'>+		trace.flags |= ZFCP_BLK_LAT_VALID;</div><div class='add'>+		lat_inf = &amp;fsf_req-&gt;qtcb-&gt;prefix.prot_status_qual.latency_info;</div><div class='add'>+		trace.channel_lat = lat_inf-&gt;channel_lat * ticks;</div><div class='add'>+		trace.fabric_lat = lat_inf-&gt;fabric_lat * ticks;</div><div class='add'>+	}</div><div class='add'>+	if (fsf_req-&gt;status &amp; ZFCP_STATUS_FSFREQ_ERROR)</div><div class='add'>+		trace.flags |= ZFCP_BLK_REQ_ERROR;</div><div class='add'>+	trace.inb_usage = fsf_req-&gt;qdio_inb_usage;</div><div class='add'>+	trace.outb_usage = fsf_req-&gt;qdio_outb_usage;</div><div class='add'>+</div><div class='add'>+	blk_add_driver_data(req-&gt;q, req, &amp;trace, sizeof(trace));</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline void zfcp_fsf_trace_latency(struct zfcp_fsf_req *fsf_req)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static void zfcp_fsf_send_fcp_command_task_handler(struct zfcp_fsf_req *req)</div><div class='ctx'> {</div><div class='ctx'> 	struct scsi_cmnd *scpnt = req-&gt;data;</div><div class='hunk'>@@ -2068,6 +2146,8 @@ static void zfcp_fsf_send_fcp_command_task_handler(struct zfcp_fsf_req *req)</div><div class='ctx'> 	if (req-&gt;adapter-&gt;adapter_features &amp; FSF_FEATURE_MEASUREMENT_DATA)</div><div class='ctx'> 		zfcp_fsf_req_latency(req);</div><div class='ctx'> </div><div class='add'>+	zfcp_fsf_trace_latency(req);</div><div class='add'>+</div><div class='ctx'> 	if (unlikely(fcp_rsp_iu-&gt;validity.bits.fcp_rsp_len_valid)) {</div><div class='ctx'> 		if (fcp_rsp_info[3] == RSP_CODE_GOOD)</div><div class='ctx'> 			set_host_byte(scpnt, DID_OK);</div><div class='hunk'>@@ -2156,21 +2236,21 @@ static void zfcp_fsf_send_fcp_command_handler(struct zfcp_fsf_req *req)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FSF_DIRECTION_INDICATOR_NOT_VALID:</div><div class='ctx'> 		dev_err(&amp;req-&gt;adapter-&gt;ccw_device-&gt;dev,</div><div class='del'>-			"Invalid data direction (%d) given for unit "</div><div class='del'>-			"0x%016Lx on port 0x%016Lx, shutting down "</div><div class='del'>-			"adapter.\n",</div><div class='add'>+			"Incorrect direction %d, unit 0x%016Lx on port "</div><div class='add'>+			"0x%016Lx closed\n",</div><div class='ctx'> 			req-&gt;qtcb-&gt;bottom.io.data_direction,</div><div class='del'>-			unit-&gt;fcp_lun, unit-&gt;port-&gt;wwpn);</div><div class='add'>+			(unsigned long long)unit-&gt;fcp_lun,</div><div class='add'>+			(unsigned long long)unit-&gt;port-&gt;wwpn);</div><div class='ctx'> 		zfcp_erp_adapter_shutdown(unit-&gt;port-&gt;adapter, 0, 133, req);</div><div class='ctx'> 		req-&gt;status |= ZFCP_STATUS_FSFREQ_ERROR;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FSF_CMND_LENGTH_NOT_VALID:</div><div class='ctx'> 		dev_err(&amp;req-&gt;adapter-&gt;ccw_device-&gt;dev,</div><div class='del'>-			"An invalid control-data-block length field (%d) "</div><div class='del'>-			"was found in a command for unit 0x%016Lx on port "</div><div class='del'>-			"0x%016Lx. Shutting down adapter.\n",</div><div class='add'>+			"Incorrect CDB length %d, unit 0x%016Lx on "</div><div class='add'>+			"port 0x%016Lx closed\n",</div><div class='ctx'> 			req-&gt;qtcb-&gt;bottom.io.fcp_cmnd_length,</div><div class='del'>-			unit-&gt;fcp_lun, unit-&gt;port-&gt;wwpn);</div><div class='add'>+			(unsigned long long)unit-&gt;fcp_lun,</div><div class='add'>+			(unsigned long long)unit-&gt;port-&gt;wwpn);</div><div class='ctx'> 		zfcp_erp_adapter_shutdown(unit-&gt;port-&gt;adapter, 0, 134, req);</div><div class='ctx'> 		req-&gt;status |= ZFCP_STATUS_FSFREQ_ERROR;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -2201,6 +2281,20 @@ skip_fsfstatus:</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void zfcp_set_fcp_dl(struct fcp_cmnd_iu *fcp_cmd, u32 fcp_dl)</div><div class='add'>+{</div><div class='add'>+	u32 *fcp_dl_ptr;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * fcp_dl_addr = start address of fcp_cmnd structure +</div><div class='add'>+	 * size of fixed part + size of dynamically sized add_dcp_cdb field</div><div class='add'>+	 * SEE FCP-2 documentation</div><div class='add'>+	 */</div><div class='add'>+	fcp_dl_ptr = (u32 *) ((unsigned char *) &amp;fcp_cmd[1] +</div><div class='add'>+			(fcp_cmd-&gt;add_fcp_cdb_length &lt;&lt; 2));</div><div class='add'>+	*fcp_dl_ptr = fcp_dl;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * zfcp_fsf_send_fcp_command_task - initiate an FCP command (for a SCSI command)</div><div class='ctx'>  * @adapter: adapter where scsi command is issued</div><div class='hunk'>@@ -2223,8 +2317,8 @@ int zfcp_fsf_send_fcp_command_task(struct zfcp_adapter *adapter,</div><div class='ctx'> 		       ZFCP_STATUS_COMMON_UNBLOCKED)))</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;adapter-&gt;req_q.lock);</div><div class='del'>-	if (!atomic_read(&amp;adapter-&gt;req_q.count))</div><div class='add'>+	spin_lock(&amp;adapter-&gt;req_q_lock);</div><div class='add'>+	if (!zfcp_fsf_sbal_available(adapter))</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	req = zfcp_fsf_req_create(adapter, FSF_QTCB_FCP_CMND, req_flags,</div><div class='ctx'> 				  adapter-&gt;pool.fsf_req_scsi);</div><div class='hunk'>@@ -2286,7 +2380,7 @@ int zfcp_fsf_send_fcp_command_task(struct zfcp_adapter *adapter,</div><div class='ctx'> 	memcpy(fcp_cmnd_iu-&gt;fcp_cdb, scsi_cmnd-&gt;cmnd, scsi_cmnd-&gt;cmd_len);</div><div class='ctx'> </div><div class='ctx'> 	req-&gt;qtcb-&gt;bottom.io.fcp_cmnd_length = sizeof(struct fcp_cmnd_iu) +</div><div class='del'>-		fcp_cmnd_iu-&gt;add_fcp_cdb_length + sizeof(fcp_dl_t);</div><div class='add'>+		fcp_cmnd_iu-&gt;add_fcp_cdb_length + sizeof(u32);</div><div class='ctx'> </div><div class='ctx'> 	real_bytes = zfcp_qdio_sbals_from_sg(req, sbtype,</div><div class='ctx'> 					     scsi_sglist(scsi_cmnd),</div><div class='hunk'>@@ -2296,10 +2390,10 @@ int zfcp_fsf_send_fcp_command_task(struct zfcp_adapter *adapter,</div><div class='ctx'> 			retval = -EIO;</div><div class='ctx'> 		else {</div><div class='ctx'> 			dev_err(&amp;adapter-&gt;ccw_device-&gt;dev,</div><div class='del'>-				"SCSI request too large. "</div><div class='del'>-				"Shutting down unit 0x%016Lx on port "</div><div class='del'>-				"0x%016Lx.\n", unit-&gt;fcp_lun,</div><div class='del'>-				unit-&gt;port-&gt;wwpn);</div><div class='add'>+				"Oversize data package, unit 0x%016Lx "</div><div class='add'>+				"on port 0x%016Lx closed\n",</div><div class='add'>+				(unsigned long long)unit-&gt;fcp_lun,</div><div class='add'>+				(unsigned long long)unit-&gt;port-&gt;wwpn);</div><div class='ctx'> 			zfcp_erp_unit_shutdown(unit, 0, 131, req);</div><div class='ctx'> 			retval = -EINVAL;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2322,7 +2416,7 @@ failed_scsi_cmnd:</div><div class='ctx'> 	zfcp_fsf_req_free(req);</div><div class='ctx'> 	scsi_cmnd-&gt;host_scribble = NULL;</div><div class='ctx'> out:</div><div class='del'>-	spin_unlock(&amp;adapter-&gt;req_q.lock);</div><div class='add'>+	spin_unlock(&amp;adapter-&gt;req_q_lock);</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2338,7 +2432,7 @@ struct zfcp_fsf_req *zfcp_fsf_send_fcp_ctm(struct zfcp_adapter *adapter,</div><div class='ctx'> 					   struct zfcp_unit *unit,</div><div class='ctx'> 					   u8 tm_flags, int req_flags)</div><div class='ctx'> {</div><div class='del'>-	volatile struct qdio_buffer_element *sbale;</div><div class='add'>+	struct qdio_buffer_element *sbale;</div><div class='ctx'> 	struct zfcp_fsf_req *req = NULL;</div><div class='ctx'> 	struct fcp_cmnd_iu *fcp_cmnd_iu;</div><div class='ctx'> </div><div class='hunk'>@@ -2346,8 +2440,8 @@ struct zfcp_fsf_req *zfcp_fsf_send_fcp_ctm(struct zfcp_adapter *adapter,</div><div class='ctx'> 		       ZFCP_STATUS_COMMON_UNBLOCKED)))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;adapter-&gt;req_q.lock);</div><div class='del'>-	if (!atomic_read(&amp;adapter-&gt;req_q.count))</div><div class='add'>+	spin_lock(&amp;adapter-&gt;req_q_lock);</div><div class='add'>+	if (!zfcp_fsf_sbal_available(adapter))</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	req = zfcp_fsf_req_create(adapter, FSF_QTCB_FCP_CMND, req_flags,</div><div class='ctx'> 				  adapter-&gt;pool.fsf_req_scsi);</div><div class='hunk'>@@ -2362,7 +2456,7 @@ struct zfcp_fsf_req *zfcp_fsf_send_fcp_ctm(struct zfcp_adapter *adapter,</div><div class='ctx'> 	req-&gt;qtcb-&gt;bottom.io.data_direction = FSF_DATADIR_CMND;</div><div class='ctx'> 	req-&gt;qtcb-&gt;bottom.io.service_class = FSF_CLASS_3;</div><div class='ctx'> 	req-&gt;qtcb-&gt;bottom.io.fcp_cmnd_length = 	sizeof(struct fcp_cmnd_iu) +</div><div class='del'>-						sizeof(fcp_dl_t);</div><div class='add'>+						sizeof(u32);</div><div class='ctx'> </div><div class='ctx'> 	sbale = zfcp_qdio_sbale_req(req);</div><div class='ctx'> 	sbale[0].flags |= SBAL_FLAGS0_TYPE_WRITE;</div><div class='hunk'>@@ -2379,7 +2473,7 @@ struct zfcp_fsf_req *zfcp_fsf_send_fcp_ctm(struct zfcp_adapter *adapter,</div><div class='ctx'> 	zfcp_fsf_req_free(req);</div><div class='ctx'> 	req = NULL;</div><div class='ctx'> out:</div><div class='del'>-	spin_unlock(&amp;adapter-&gt;req_q.lock);</div><div class='add'>+	spin_unlock(&amp;adapter-&gt;req_q_lock);</div><div class='ctx'> 	return req;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2398,7 +2492,7 @@ static void zfcp_fsf_control_file_handler(struct zfcp_fsf_req *req)</div><div class='ctx'> struct zfcp_fsf_req *zfcp_fsf_control_file(struct zfcp_adapter *adapter,</div><div class='ctx'> 					   struct zfcp_fsf_cfdc *fsf_cfdc)</div><div class='ctx'> {</div><div class='del'>-	volatile struct qdio_buffer_element *sbale;</div><div class='add'>+	struct qdio_buffer_element *sbale;</div><div class='ctx'> 	struct zfcp_fsf_req *req = NULL;</div><div class='ctx'> 	struct fsf_qtcb_bottom_support *bottom;</div><div class='ctx'> 	int direction, retval = -EIO, bytes;</div><div class='hunk'>@@ -2417,7 +2511,7 @@ struct zfcp_fsf_req *zfcp_fsf_control_file(struct zfcp_adapter *adapter,</div><div class='ctx'> 		return ERR_PTR(-EINVAL);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;adapter-&gt;req_q.lock);</div><div class='add'>+	spin_lock_bh(&amp;adapter-&gt;req_q_lock);</div><div class='ctx'> 	if (zfcp_fsf_req_sbal_get(adapter))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -2447,7 +2541,7 @@ struct zfcp_fsf_req *zfcp_fsf_control_file(struct zfcp_adapter *adapter,</div><div class='ctx'> 	zfcp_fsf_start_timer(req, ZFCP_FSF_REQUEST_TIMEOUT);</div><div class='ctx'> 	retval = zfcp_fsf_req_send(req);</div><div class='ctx'> out:</div><div class='del'>-	spin_unlock_bh(&amp;adapter-&gt;req_q.lock);</div><div class='add'>+	spin_unlock_bh(&amp;adapter-&gt;req_q_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (!retval) {</div><div class='ctx'> 		wait_event(req-&gt;completion_wq,</div><div class='head'>diff --git a/drivers/s390/scsi/zfcp_fsf.h b/drivers/s390/scsi/zfcp_fsf.h<br/>index bf94b4da0763..fa2a31780611 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/scsi/zfcp_fsf.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/s390/scsi/zfcp_fsf.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/scsi/zfcp_fsf.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/scsi/zfcp_fsf.h</a></div><div class='hunk'>@@ -71,13 +71,6 @@</div><div class='ctx'> #define FSF_MAXIMUM_NUMBER_OF_LUNS_EXCEEDED	0x00000041</div><div class='ctx'> #define FSF_ELS_COMMAND_REJECTED		0x00000050</div><div class='ctx'> #define FSF_GENERIC_COMMAND_REJECTED		0x00000051</div><div class='del'>-#define FSF_OPERATION_PARTIALLY_SUCCESSFUL	0x00000052</div><div class='del'>-#define FSF_AUTHORIZATION_FAILURE		0x00000053</div><div class='del'>-#define FSF_CFDC_ERROR_DETECTED			0x00000054</div><div class='del'>-#define FSF_CONTROL_FILE_UPDATE_ERROR		0x00000055</div><div class='del'>-#define FSF_CONTROL_FILE_TOO_LARGE		0x00000056</div><div class='del'>-#define FSF_ACCESS_CONFLICT_DETECTED		0x00000057</div><div class='del'>-#define FSF_CONFLICTS_OVERRULED			0x00000058</div><div class='ctx'> #define FSF_PORT_BOXED				0x00000059</div><div class='ctx'> #define FSF_LUN_BOXED				0x0000005A</div><div class='ctx'> #define FSF_EXCHANGE_CONFIG_DATA_INCOMPLETE	0x0000005B</div><div class='hunk'>@@ -85,9 +78,7 @@</div><div class='ctx'> #define FSF_REQUEST_SIZE_TOO_LARGE		0x00000061</div><div class='ctx'> #define FSF_RESPONSE_SIZE_TOO_LARGE		0x00000062</div><div class='ctx'> #define FSF_SBAL_MISMATCH			0x00000063</div><div class='del'>-#define FSF_OPEN_PORT_WITHOUT_PRLI		0x00000064</div><div class='ctx'> #define FSF_ADAPTER_STATUS_AVAILABLE		0x000000AD</div><div class='del'>-#define FSF_FCP_RSP_AVAILABLE			0x000000AF</div><div class='ctx'> #define FSF_UNKNOWN_COMMAND			0x000000E2</div><div class='ctx'> #define FSF_UNKNOWN_OP_SUBTYPE                  0x000000E3</div><div class='ctx'> #define FSF_INVALID_COMMAND_OPTION              0x000000E5</div><div class='hunk'>@@ -102,20 +93,9 @@</div><div class='ctx'> #define FSF_SQ_RETRY_IF_POSSIBLE		0x02</div><div class='ctx'> #define FSF_SQ_ULP_DEPENDENT_ERP_REQUIRED	0x03</div><div class='ctx'> #define FSF_SQ_INVOKE_LINK_TEST_PROCEDURE	0x04</div><div class='del'>-#define FSF_SQ_ULP_PROGRAMMING_ERROR		0x05</div><div class='ctx'> #define FSF_SQ_COMMAND_ABORTED			0x06</div><div class='ctx'> #define FSF_SQ_NO_RETRY_POSSIBLE		0x07</div><div class='ctx'> </div><div class='del'>-/* FSF status qualifier for CFDC commands */</div><div class='del'>-#define FSF_SQ_CFDC_HARDENED_ON_SE		0x00000000</div><div class='del'>-#define FSF_SQ_CFDC_COULD_NOT_HARDEN_ON_SE	0x00000001</div><div class='del'>-#define FSF_SQ_CFDC_COULD_NOT_HARDEN_ON_SE2	0x00000002</div><div class='del'>-/* CFDC subtable codes */</div><div class='del'>-#define FSF_SQ_CFDC_SUBTABLE_OS			0x0001</div><div class='del'>-#define FSF_SQ_CFDC_SUBTABLE_PORT_WWPN		0x0002</div><div class='del'>-#define FSF_SQ_CFDC_SUBTABLE_PORT_DID		0x0003</div><div class='del'>-#define FSF_SQ_CFDC_SUBTABLE_LUN		0x0004</div><div class='del'>-</div><div class='ctx'> /* FSF status qualifier (most significant 4 bytes), local link down */</div><div class='ctx'> #define FSF_PSQ_LINK_NO_LIGHT			0x00000004</div><div class='ctx'> #define FSF_PSQ_LINK_WRAP_PLUG			0x00000008</div><div class='hunk'>@@ -145,7 +125,6 @@</div><div class='ctx'> #define FSF_STATUS_READ_LINK_UP          	0x00000006</div><div class='ctx'> #define FSF_STATUS_READ_NOTIFICATION_LOST	0x00000009</div><div class='ctx'> #define FSF_STATUS_READ_CFDC_UPDATED		0x0000000A</div><div class='del'>-#define FSF_STATUS_READ_CFDC_HARDENED		0x0000000B</div><div class='ctx'> #define FSF_STATUS_READ_FEATURE_UPDATE_ALERT	0x0000000C</div><div class='ctx'> </div><div class='ctx'> /* status subtypes in status read buffer */</div><div class='hunk'>@@ -159,20 +138,9 @@</div><div class='ctx'> </div><div class='ctx'> /* status subtypes for unsolicited status notification lost */</div><div class='ctx'> #define FSF_STATUS_READ_SUB_INCOMING_ELS	0x00000001</div><div class='del'>-#define FSF_STATUS_READ_SUB_SENSE_DATA		0x00000002</div><div class='del'>-#define FSF_STATUS_READ_SUB_LINK_STATUS		0x00000004</div><div class='del'>-#define FSF_STATUS_READ_SUB_PORT_CLOSED		0x00000008</div><div class='del'>-#define FSF_STATUS_READ_SUB_BIT_ERROR_THRESHOLD	0x00000010</div><div class='ctx'> #define FSF_STATUS_READ_SUB_ACT_UPDATED		0x00000020</div><div class='del'>-#define FSF_STATUS_READ_SUB_ACT_HARDENED	0x00000040</div><div class='del'>-#define FSF_STATUS_READ_SUB_FEATURE_UPDATE_ALERT 0x00000080</div><div class='del'>-</div><div class='del'>-/* status subtypes for CFDC */</div><div class='del'>-#define FSF_STATUS_READ_SUB_CFDC_HARDENED_ON_SE	0x00000002</div><div class='del'>-#define FSF_STATUS_READ_SUB_CFDC_HARDENED_ON_SE2 0x0000000F</div><div class='ctx'> </div><div class='ctx'> /* topologie that is detected by the adapter */</div><div class='del'>-#define FSF_TOPO_ERROR				0x00000000</div><div class='ctx'> #define FSF_TOPO_P2P				0x00000001</div><div class='ctx'> #define FSF_TOPO_FABRIC				0x00000002</div><div class='ctx'> #define FSF_TOPO_AL				0x00000003</div><div class='hunk'>@@ -180,17 +148,13 @@</div><div class='ctx'> /* data direction for FCP commands */</div><div class='ctx'> #define FSF_DATADIR_WRITE			0x00000001</div><div class='ctx'> #define FSF_DATADIR_READ			0x00000002</div><div class='del'>-#define FSF_DATADIR_READ_WRITE			0x00000003</div><div class='ctx'> #define FSF_DATADIR_CMND			0x00000004</div><div class='ctx'> </div><div class='ctx'> /* fc service class */</div><div class='del'>-#define FSF_CLASS_1				0x00000001</div><div class='del'>-#define FSF_CLASS_2				0x00000002</div><div class='ctx'> #define FSF_CLASS_3				0x00000003</div><div class='ctx'> </div><div class='ctx'> /* SBAL chaining */</div><div class='ctx'> #define FSF_MAX_SBALS_PER_REQ			36</div><div class='del'>-#define FSF_MAX_SBALS_PER_ELS_REQ		2</div><div class='ctx'> </div><div class='ctx'> /* logging space behind QTCB */</div><div class='ctx'> #define FSF_QTCB_LOG_SIZE			1024</div><div class='hunk'>@@ -200,50 +164,16 @@</div><div class='ctx'> #define FSF_FEATURE_LUN_SHARING			0x00000004</div><div class='ctx'> #define FSF_FEATURE_NOTIFICATION_LOST		0x00000008</div><div class='ctx'> #define FSF_FEATURE_HBAAPI_MANAGEMENT           0x00000010</div><div class='del'>-#define FSF_FEATURE_ELS_CT_CHAINED_SBALS        0x00000020</div><div class='ctx'> #define FSF_FEATURE_UPDATE_ALERT		0x00000100</div><div class='ctx'> #define FSF_FEATURE_MEASUREMENT_DATA		0x00000200</div><div class='ctx'> </div><div class='ctx'> /* host connection features */</div><div class='ctx'> #define FSF_FEATURE_NPIV_MODE			0x00000001</div><div class='del'>-#define FSF_FEATURE_VM_ASSIGNED_WWPN		0x00000002</div><div class='ctx'> </div><div class='ctx'> /* option */</div><div class='ctx'> #define FSF_OPEN_LUN_SUPPRESS_BOXING		0x00000001</div><div class='del'>-#define FSF_OPEN_LUN_REPLICATE_SENSE		0x00000002</div><div class='del'>-</div><div class='del'>-/* adapter types */</div><div class='del'>-#define FSF_ADAPTER_TYPE_FICON                  0x00000001</div><div class='del'>-#define FSF_ADAPTER_TYPE_FICON_EXPRESS          0x00000002</div><div class='del'>-</div><div class='del'>-/* port types */</div><div class='del'>-#define FSF_HBA_PORTTYPE_UNKNOWN		0x00000001</div><div class='del'>-#define FSF_HBA_PORTTYPE_NOTPRESENT		0x00000003</div><div class='del'>-#define FSF_HBA_PORTTYPE_NPORT			0x00000005</div><div class='del'>-#define FSF_HBA_PORTTYPE_PTP			0x00000021</div><div class='del'>-/* following are not defined and used by FSF Spec</div><div class='del'>-   but are additionally defined by FC-HBA */</div><div class='del'>-#define FSF_HBA_PORTTYPE_OTHER			0x00000002</div><div class='del'>-#define FSF_HBA_PORTTYPE_NOTPRESENT		0x00000003</div><div class='del'>-#define FSF_HBA_PORTTYPE_NLPORT			0x00000006</div><div class='del'>-#define FSF_HBA_PORTTYPE_FLPORT			0x00000007</div><div class='del'>-#define FSF_HBA_PORTTYPE_FPORT			0x00000008</div><div class='del'>-#define FSF_HBA_PORTTYPE_LPORT			0x00000020</div><div class='del'>-</div><div class='del'>-/* port states */</div><div class='del'>-#define FSF_HBA_PORTSTATE_UNKNOWN		0x00000001</div><div class='del'>-#define FSF_HBA_PORTSTATE_ONLINE		0x00000002</div><div class='del'>-#define FSF_HBA_PORTSTATE_OFFLINE		0x00000003</div><div class='del'>-#define FSF_HBA_PORTSTATE_LINKDOWN		0x00000006</div><div class='del'>-#define FSF_HBA_PORTSTATE_ERROR			0x00000007</div><div class='del'>-</div><div class='del'>-/* IO states of adapter */</div><div class='del'>-#define FSF_IOSTAT_NPORT_RJT			0x00000004</div><div class='del'>-#define FSF_IOSTAT_FABRIC_RJT			0x00000005</div><div class='del'>-#define FSF_IOSTAT_LS_RJT			0x00000009</div><div class='ctx'> </div><div class='ctx'> /* open LUN access flags*/</div><div class='del'>-#define FSF_UNIT_ACCESS_OPEN_LUN_ALLOWED	0x01000000</div><div class='ctx'> #define FSF_UNIT_ACCESS_EXCLUSIVE		0x02000000</div><div class='ctx'> #define FSF_UNIT_ACCESS_OUTBOUND_TRANSFER	0x10000000</div><div class='ctx'> </div><div class='hunk'>@@ -265,11 +195,6 @@ struct fsf_queue_designator {</div><div class='ctx'> 	u32 res1;</div><div class='ctx'> } __attribute__ ((packed));</div><div class='ctx'> </div><div class='del'>-struct fsf_port_closed_payload {</div><div class='del'>-	struct fsf_queue_designator queue_designator;</div><div class='del'>-	u32                         port_handle;</div><div class='del'>-} __attribute__ ((packed));</div><div class='del'>-</div><div class='ctx'> struct fsf_bit_error_payload {</div><div class='ctx'> 	u32 res1;</div><div class='ctx'> 	u32 link_failure_error_count;</div><div class='hunk'>@@ -514,4 +439,16 @@ struct fsf_qtcb {</div><div class='ctx'> 	u8 log[FSF_QTCB_LOG_SIZE];</div><div class='ctx'> } __attribute__ ((packed));</div><div class='ctx'> </div><div class='add'>+struct zfcp_blk_drv_data {</div><div class='add'>+#define ZFCP_BLK_DRV_DATA_MAGIC			0x1</div><div class='add'>+	u32 magic;</div><div class='add'>+#define ZFCP_BLK_LAT_VALID			0x1</div><div class='add'>+#define ZFCP_BLK_REQ_ERROR			0x2</div><div class='add'>+	u16 flags;</div><div class='add'>+	u8 inb_usage;</div><div class='add'>+	u8 outb_usage;</div><div class='add'>+	u64 channel_lat;</div><div class='add'>+	u64 fabric_lat;</div><div class='add'>+} __attribute__ ((packed));</div><div class='add'>+</div><div class='ctx'> #endif				/* FSF_H */</div><div class='head'>diff --git a/drivers/s390/scsi/zfcp_qdio.c b/drivers/s390/scsi/zfcp_qdio.c<br/>index 69d632d851d9..664752f90b20 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/scsi/zfcp_qdio.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/s390/scsi/zfcp_qdio.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/scsi/zfcp_qdio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/scsi/zfcp_qdio.c</a></div><div class='hunk'>@@ -28,7 +28,7 @@ static int zfcp_qdio_buffers_enqueue(struct qdio_buffer **sbal)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static volatile struct qdio_buffer_element *</div><div class='add'>+static struct qdio_buffer_element *</div><div class='ctx'> zfcp_qdio_sbale(struct zfcp_qdio_queue *q, int sbal_idx, int sbale_idx)</div><div class='ctx'> {</div><div class='ctx'> 	return &amp;q-&gt;sbal[sbal_idx]-&gt;element[sbale_idx];</div><div class='hunk'>@@ -57,7 +57,7 @@ void zfcp_qdio_free(struct zfcp_adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> static void zfcp_qdio_handler_error(struct zfcp_adapter *adapter, u8 id)</div><div class='ctx'> {</div><div class='del'>-	dev_warn(&amp;adapter-&gt;ccw_device-&gt;dev, "QDIO problem occurred.\n");</div><div class='add'>+	dev_warn(&amp;adapter-&gt;ccw_device-&gt;dev, "A QDIO problem occurred\n");</div><div class='ctx'> </div><div class='ctx'> 	zfcp_erp_adapter_reopen(adapter,</div><div class='ctx'> 				ZFCP_STATUS_ADAPTER_LINK_UNPLUGGED |</div><div class='hunk'>@@ -115,6 +115,7 @@ static void zfcp_qdio_reqid_check(struct zfcp_adapter *adapter,</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;adapter-&gt;req_list_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	fsf_req-&gt;sbal_response = sbal_idx;</div><div class='add'>+	fsf_req-&gt;qdio_inb_usage = atomic_read(&amp;adapter-&gt;resp_q.count);</div><div class='ctx'> 	zfcp_fsf_req_complete(fsf_req);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -145,7 +146,7 @@ static void zfcp_qdio_int_resp(struct ccw_device *cdev, unsigned int qdio_err,</div><div class='ctx'> {</div><div class='ctx'> 	struct zfcp_adapter *adapter = (struct zfcp_adapter *) parm;</div><div class='ctx'> 	struct zfcp_qdio_queue *queue = &amp;adapter-&gt;resp_q;</div><div class='del'>-	volatile struct qdio_buffer_element *sbale;</div><div class='add'>+	struct qdio_buffer_element *sbale;</div><div class='ctx'> 	int sbal_idx, sbale_idx, sbal_no;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(qdio_err)) {</div><div class='hunk'>@@ -174,8 +175,8 @@ static void zfcp_qdio_int_resp(struct ccw_device *cdev, unsigned int qdio_err,</div><div class='ctx'> </div><div class='ctx'> 		if (unlikely(!(sbale-&gt;flags &amp; SBAL_FLAGS_LAST_ENTRY)))</div><div class='ctx'> 			dev_warn(&amp;adapter-&gt;ccw_device-&gt;dev,</div><div class='del'>-				 "Protocol violation by adapter. "</div><div class='del'>-				 "Continuing operations.\n");</div><div class='add'>+				 "A QDIO protocol error occurred, "</div><div class='add'>+				 "operations continue\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -190,8 +191,7 @@ static void zfcp_qdio_int_resp(struct ccw_device *cdev, unsigned int qdio_err,</div><div class='ctx'>  * @fsf_req: pointer to struct fsf_req</div><div class='ctx'>  * Returns: pointer to qdio_buffer_element (SBALE) structure</div><div class='ctx'>  */</div><div class='del'>-volatile struct qdio_buffer_element *</div><div class='del'>-zfcp_qdio_sbale_req(struct zfcp_fsf_req *req)</div><div class='add'>+struct qdio_buffer_element *zfcp_qdio_sbale_req(struct zfcp_fsf_req *req)</div><div class='ctx'> {</div><div class='ctx'> 	return zfcp_qdio_sbale(&amp;req-&gt;adapter-&gt;req_q, req-&gt;sbal_last, 0);</div><div class='ctx'> }</div><div class='hunk'>@@ -201,8 +201,7 @@ zfcp_qdio_sbale_req(struct zfcp_fsf_req *req)</div><div class='ctx'>  * @fsf_req: pointer to struct fsf_req</div><div class='ctx'>  * Returns: pointer to qdio_buffer_element (SBALE) structure</div><div class='ctx'>  */</div><div class='del'>-volatile struct qdio_buffer_element *</div><div class='del'>-zfcp_qdio_sbale_curr(struct zfcp_fsf_req *req)</div><div class='add'>+struct qdio_buffer_element *zfcp_qdio_sbale_curr(struct zfcp_fsf_req *req)</div><div class='ctx'> {</div><div class='ctx'> 	return zfcp_qdio_sbale(&amp;req-&gt;adapter-&gt;req_q, req-&gt;sbal_last,</div><div class='ctx'> 			       req-&gt;sbale_curr);</div><div class='hunk'>@@ -216,10 +215,10 @@ static void zfcp_qdio_sbal_limit(struct zfcp_fsf_req *fsf_req, int max_sbals)</div><div class='ctx'> 					% QDIO_MAX_BUFFERS_PER_Q;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static volatile struct qdio_buffer_element *</div><div class='add'>+static struct qdio_buffer_element *</div><div class='ctx'> zfcp_qdio_sbal_chain(struct zfcp_fsf_req *fsf_req, unsigned long sbtype)</div><div class='ctx'> {</div><div class='del'>-	volatile struct qdio_buffer_element *sbale;</div><div class='add'>+	struct qdio_buffer_element *sbale;</div><div class='ctx'> </div><div class='ctx'> 	/* set last entry flag in current SBALE of current SBAL */</div><div class='ctx'> 	sbale = zfcp_qdio_sbale_curr(fsf_req);</div><div class='hunk'>@@ -250,7 +249,7 @@ zfcp_qdio_sbal_chain(struct zfcp_fsf_req *fsf_req, unsigned long sbtype)</div><div class='ctx'> 	return sbale;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static volatile struct qdio_buffer_element *</div><div class='add'>+static struct qdio_buffer_element *</div><div class='ctx'> zfcp_qdio_sbale_next(struct zfcp_fsf_req *fsf_req, unsigned long sbtype)</div><div class='ctx'> {</div><div class='ctx'> 	if (fsf_req-&gt;sbale_curr == ZFCP_LAST_SBALE_PER_SBAL)</div><div class='hunk'>@@ -273,7 +272,7 @@ static int zfcp_qdio_fill_sbals(struct zfcp_fsf_req *fsf_req,</div><div class='ctx'> 				unsigned int sbtype, void *start_addr,</div><div class='ctx'> 				unsigned int total_length)</div><div class='ctx'> {</div><div class='del'>-	volatile struct qdio_buffer_element *sbale;</div><div class='add'>+	struct qdio_buffer_element *sbale;</div><div class='ctx'> 	unsigned long remaining, length;</div><div class='ctx'> 	void *addr;</div><div class='ctx'> </div><div class='hunk'>@@ -282,6 +281,7 @@ static int zfcp_qdio_fill_sbals(struct zfcp_fsf_req *fsf_req,</div><div class='ctx'> 	     addr += length, remaining -= length) {</div><div class='ctx'> 		sbale = zfcp_qdio_sbale_next(fsf_req, sbtype);</div><div class='ctx'> 		if (!sbale) {</div><div class='add'>+			atomic_inc(&amp;fsf_req-&gt;adapter-&gt;qdio_outb_full);</div><div class='ctx'> 			zfcp_qdio_undo_sbals(fsf_req);</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -307,7 +307,7 @@ static int zfcp_qdio_fill_sbals(struct zfcp_fsf_req *fsf_req,</div><div class='ctx'> int zfcp_qdio_sbals_from_sg(struct zfcp_fsf_req *fsf_req, unsigned long sbtype,</div><div class='ctx'> 			    struct scatterlist *sg, int max_sbals)</div><div class='ctx'> {</div><div class='del'>-	volatile struct qdio_buffer_element *sbale;</div><div class='add'>+	struct qdio_buffer_element *sbale;</div><div class='ctx'> 	int retval, bytes = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* figure out last allowed SBAL */</div><div class='hunk'>@@ -344,10 +344,10 @@ int zfcp_qdio_send(struct zfcp_fsf_req *fsf_req)</div><div class='ctx'> 	int first = fsf_req-&gt;sbal_first;</div><div class='ctx'> 	int count = fsf_req-&gt;sbal_number;</div><div class='ctx'> 	int retval, pci, pci_batch;</div><div class='del'>-	volatile struct qdio_buffer_element *sbale;</div><div class='add'>+	struct qdio_buffer_element *sbale;</div><div class='ctx'> </div><div class='ctx'> 	/* acknowledgements for transferred buffers */</div><div class='del'>-	pci_batch = req_q-&gt;pci_batch + count;</div><div class='add'>+	pci_batch = adapter-&gt;req_q_pci_batch + count;</div><div class='ctx'> 	if (unlikely(pci_batch &gt;= ZFCP_QDIO_PCI_INTERVAL)) {</div><div class='ctx'> 		pci_batch %= ZFCP_QDIO_PCI_INTERVAL;</div><div class='ctx'> 		pci = first + count - (pci_batch + 1);</div><div class='hunk'>@@ -367,7 +367,7 @@ int zfcp_qdio_send(struct zfcp_fsf_req *fsf_req)</div><div class='ctx'> 	atomic_sub(count, &amp;req_q-&gt;count);</div><div class='ctx'> 	req_q-&gt;first += count;</div><div class='ctx'> 	req_q-&gt;first %= QDIO_MAX_BUFFERS_PER_Q;</div><div class='del'>-	req_q-&gt;pci_batch = pci_batch;</div><div class='add'>+	adapter-&gt;req_q_pci_batch = pci_batch;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -418,14 +418,14 @@ void zfcp_qdio_close(struct zfcp_adapter *adapter)</div><div class='ctx'> 	struct zfcp_qdio_queue *req_q;</div><div class='ctx'> 	int first, count;</div><div class='ctx'> </div><div class='del'>-	if (!atomic_test_mask(ZFCP_STATUS_ADAPTER_QDIOUP, &amp;adapter-&gt;status))</div><div class='add'>+	if (!(atomic_read(&amp;adapter-&gt;status) &amp; ZFCP_STATUS_ADAPTER_QDIOUP))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/* clear QDIOUP flag, thus do_QDIO is not called during qdio_shutdown */</div><div class='ctx'> 	req_q = &amp;adapter-&gt;req_q;</div><div class='del'>-	spin_lock_bh(&amp;req_q-&gt;lock);</div><div class='add'>+	spin_lock_bh(&amp;adapter-&gt;req_q_lock);</div><div class='ctx'> 	atomic_clear_mask(ZFCP_STATUS_ADAPTER_QDIOUP, &amp;adapter-&gt;status);</div><div class='del'>-	spin_unlock_bh(&amp;req_q-&gt;lock);</div><div class='add'>+	spin_unlock_bh(&amp;adapter-&gt;req_q_lock);</div><div class='ctx'> </div><div class='ctx'> 	qdio_shutdown(adapter-&gt;ccw_device, QDIO_FLAG_CLEANUP_USING_CLEAR);</div><div class='ctx'> </div><div class='hunk'>@@ -438,7 +438,7 @@ void zfcp_qdio_close(struct zfcp_adapter *adapter)</div><div class='ctx'> 	}</div><div class='ctx'> 	req_q-&gt;first = 0;</div><div class='ctx'> 	atomic_set(&amp;req_q-&gt;count, 0);</div><div class='del'>-	req_q-&gt;pci_batch = 0;</div><div class='add'>+	adapter-&gt;req_q_pci_batch = 0;</div><div class='ctx'> 	adapter-&gt;resp_q.first = 0;</div><div class='ctx'> 	atomic_set(&amp;adapter-&gt;resp_q.count, 0);</div><div class='ctx'> }</div><div class='hunk'>@@ -450,23 +450,17 @@ void zfcp_qdio_close(struct zfcp_adapter *adapter)</div><div class='ctx'>  */</div><div class='ctx'> int zfcp_qdio_open(struct zfcp_adapter *adapter)</div><div class='ctx'> {</div><div class='del'>-	volatile struct qdio_buffer_element *sbale;</div><div class='add'>+	struct qdio_buffer_element *sbale;</div><div class='ctx'> 	int cc;</div><div class='ctx'> </div><div class='del'>-	if (atomic_test_mask(ZFCP_STATUS_ADAPTER_QDIOUP, &amp;adapter-&gt;status))</div><div class='add'>+	if (atomic_read(&amp;adapter-&gt;status) &amp; ZFCP_STATUS_ADAPTER_QDIOUP)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='del'>-	if (qdio_establish(&amp;adapter-&gt;qdio_init_data)) {</div><div class='del'>-		dev_err(&amp;adapter-&gt;ccw_device-&gt;dev,</div><div class='del'>-			 "Establish of QDIO queues failed.\n");</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='add'>+	if (qdio_establish(&amp;adapter-&gt;qdio_init_data))</div><div class='add'>+		goto failed_establish;</div><div class='ctx'> </div><div class='del'>-	if (qdio_activate(adapter-&gt;ccw_device)) {</div><div class='del'>-		dev_err(&amp;adapter-&gt;ccw_device-&gt;dev,</div><div class='del'>-			 "Activate of QDIO queues failed.\n");</div><div class='add'>+	if (qdio_activate(adapter-&gt;ccw_device))</div><div class='ctx'> 		goto failed_qdio;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	for (cc = 0; cc &lt; QDIO_MAX_BUFFERS_PER_Q; cc++) {</div><div class='ctx'> 		sbale = &amp;(adapter-&gt;resp_q.sbal[cc]-&gt;element[0]);</div><div class='hunk'>@@ -476,20 +470,20 @@ int zfcp_qdio_open(struct zfcp_adapter *adapter)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (do_QDIO(adapter-&gt;ccw_device, QDIO_FLAG_SYNC_INPUT, 0, 0,</div><div class='del'>-		     QDIO_MAX_BUFFERS_PER_Q)) {</div><div class='del'>-		dev_err(&amp;adapter-&gt;ccw_device-&gt;dev,</div><div class='del'>-			 "Init of QDIO response queue failed.\n");</div><div class='add'>+		     QDIO_MAX_BUFFERS_PER_Q))</div><div class='ctx'> 		goto failed_qdio;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	/* set index of first avalable SBALS / number of available SBALS */</div><div class='ctx'> 	adapter-&gt;req_q.first = 0;</div><div class='ctx'> 	atomic_set(&amp;adapter-&gt;req_q.count, QDIO_MAX_BUFFERS_PER_Q);</div><div class='del'>-	adapter-&gt;req_q.pci_batch = 0;</div><div class='add'>+	adapter-&gt;req_q_pci_batch = 0;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> failed_qdio:</div><div class='ctx'> 	qdio_shutdown(adapter-&gt;ccw_device, QDIO_FLAG_CLEANUP_USING_CLEAR);</div><div class='add'>+failed_establish:</div><div class='add'>+	dev_err(&amp;adapter-&gt;ccw_device-&gt;dev,</div><div class='add'>+		"Setting up the QDIO connection to the FCP adapter failed\n");</div><div class='ctx'> 	return -EIO;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/s390/scsi/zfcp_scsi.c b/drivers/s390/scsi/zfcp_scsi.c<br/>index aeae56b00b45..ca8f85f3dad4 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/scsi/zfcp_scsi.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/s390/scsi/zfcp_scsi.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/scsi/zfcp_scsi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/scsi/zfcp_scsi.c</a></div><div class='hunk'>@@ -21,20 +21,6 @@ char *zfcp_get_fcp_sns_info_ptr(struct fcp_rsp_iu *fcp_rsp_iu)</div><div class='ctx'> 	return fcp_sns_info_ptr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void zfcp_set_fcp_dl(struct fcp_cmnd_iu *fcp_cmd, fcp_dl_t fcp_dl)</div><div class='del'>-{</div><div class='del'>-	fcp_dl_t *fcp_dl_ptr;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * fcp_dl_addr = start address of fcp_cmnd structure +</div><div class='del'>-	 * size of fixed part + size of dynamically sized add_dcp_cdb field</div><div class='del'>-	 * SEE FCP-2 documentation</div><div class='del'>-	 */</div><div class='del'>-	fcp_dl_ptr = (fcp_dl_t *) ((unsigned char *) &amp;fcp_cmd[1] +</div><div class='del'>-				   (fcp_cmd-&gt;add_fcp_cdb_length &lt;&lt; 2));</div><div class='del'>-	*fcp_dl_ptr = fcp_dl;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void zfcp_scsi_slave_destroy(struct scsi_device *sdpnt)</div><div class='ctx'> {</div><div class='ctx'> 	struct zfcp_unit *unit = (struct zfcp_unit *) sdpnt-&gt;hostdata;</div><div class='hunk'>@@ -119,13 +105,17 @@ static struct zfcp_unit *zfcp_unit_lookup(struct zfcp_adapter *adapter,</div><div class='ctx'> {</div><div class='ctx'> 	struct zfcp_port *port;</div><div class='ctx'> 	struct zfcp_unit *unit;</div><div class='add'>+	int scsi_lun;</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(port, &amp;adapter-&gt;port_list_head, list) {</div><div class='ctx'> 		if (!port-&gt;rport || (id != port-&gt;rport-&gt;scsi_target_id))</div><div class='ctx'> 			continue;</div><div class='del'>-		list_for_each_entry(unit, &amp;port-&gt;unit_list_head, list)</div><div class='del'>-			if (lun == unit-&gt;scsi_lun)</div><div class='add'>+		list_for_each_entry(unit, &amp;port-&gt;unit_list_head, list) {</div><div class='add'>+			scsi_lun = scsilun_to_int(</div><div class='add'>+				(struct scsi_lun *)&amp;unit-&gt;fcp_lun);</div><div class='add'>+			if (lun == scsi_lun)</div><div class='ctx'> 				return unit;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return NULL;</div><div class='hunk'>@@ -183,7 +173,6 @@ static int zfcp_scsi_eh_abort_handler(struct scsi_cmnd *scpnt)</div><div class='ctx'> 		return retval;</div><div class='ctx'> 	}</div><div class='ctx'> 	fsf_req-&gt;data = NULL;</div><div class='del'>-	fsf_req-&gt;status |= ZFCP_STATUS_FSFREQ_ABORTING;</div><div class='ctx'> </div><div class='ctx'> 	/* don't access old fsf_req after releasing the abort_lock */</div><div class='ctx'> 	write_unlock_irqrestore(&amp;adapter-&gt;abort_lock, flags);</div><div class='hunk'>@@ -294,7 +283,8 @@ int zfcp_adapter_scsi_register(struct zfcp_adapter *adapter)</div><div class='ctx'> 					     sizeof (struct zfcp_adapter *));</div><div class='ctx'> 	if (!adapter-&gt;scsi_host) {</div><div class='ctx'> 		dev_err(&amp;adapter-&gt;ccw_device-&gt;dev,</div><div class='del'>-			"registration with SCSI stack failed.");</div><div class='add'>+			"Registering the FCP device with the "</div><div class='add'>+			"SCSI stack failed\n");</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -312,7 +302,6 @@ int zfcp_adapter_scsi_register(struct zfcp_adapter *adapter)</div><div class='ctx'> 		scsi_host_put(adapter-&gt;scsi_host);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='del'>-	atomic_set_mask(ZFCP_STATUS_ADAPTER_REGISTERED, &amp;adapter-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -336,7 +325,6 @@ void zfcp_adapter_scsi_unregister(struct zfcp_adapter *adapter)</div><div class='ctx'> 	scsi_remove_host(shost);</div><div class='ctx'> 	scsi_host_put(shost);</div><div class='ctx'> 	adapter-&gt;scsi_host = NULL;</div><div class='del'>-	atomic_clear_mask(ZFCP_STATUS_ADAPTER_REGISTERED, &amp;adapter-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/s390/scsi/zfcp_sysfs.c b/drivers/s390/scsi/zfcp_sysfs.c<br/>index 2e85c6c49e7d..ca9293ba1766 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/scsi/zfcp_sysfs.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/s390/scsi/zfcp_sysfs.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/s390/scsi/zfcp_sysfs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/s390/scsi/zfcp_sysfs.c</a></div><div class='hunk'>@@ -26,9 +26,9 @@ static ZFCP_DEV_ATTR(_feat, _name, S_IRUGO,				       \</div><div class='ctx'> ZFCP_DEFINE_ATTR(zfcp_adapter, adapter, status, "0x%08x\n",</div><div class='ctx'> 		 atomic_read(&amp;adapter-&gt;status));</div><div class='ctx'> ZFCP_DEFINE_ATTR(zfcp_adapter, adapter, peer_wwnn, "0x%016llx\n",</div><div class='del'>-		 adapter-&gt;peer_wwnn);</div><div class='add'>+		 (unsigned long long) adapter-&gt;peer_wwnn);</div><div class='ctx'> ZFCP_DEFINE_ATTR(zfcp_adapter, adapter, peer_wwpn, "0x%016llx\n",</div><div class='del'>-		 adapter-&gt;peer_wwpn);</div><div class='add'>+		 (unsigned long long) adapter-&gt;peer_wwpn);</div><div class='ctx'> ZFCP_DEFINE_ATTR(zfcp_adapter, adapter, peer_d_id, "0x%06x\n",</div><div class='ctx'> 		 adapter-&gt;peer_d_id);</div><div class='ctx'> ZFCP_DEFINE_ATTR(zfcp_adapter, adapter, card_version, "0x%04x\n",</div><div class='hunk'>@@ -135,8 +135,9 @@ static ssize_t zfcp_sysfs_port_remove_store(struct device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct zfcp_adapter *adapter = dev_get_drvdata(dev);</div><div class='ctx'> 	struct zfcp_port *port;</div><div class='del'>-	wwn_t wwpn;</div><div class='add'>+	u64 wwpn;</div><div class='ctx'> 	int retval = 0;</div><div class='add'>+	LIST_HEAD(port_remove_lh);</div><div class='ctx'> </div><div class='ctx'> 	down(&amp;zfcp_data.config_sema);</div><div class='ctx'> 	if (atomic_read(&amp;adapter-&gt;status) &amp; ZFCP_STATUS_COMMON_REMOVE) {</div><div class='hunk'>@@ -144,7 +145,7 @@ static ssize_t zfcp_sysfs_port_remove_store(struct device *dev,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (strict_strtoull(buf, 0, &amp;wwpn)) {</div><div class='add'>+	if (strict_strtoull(buf, 0, (unsigned long long *) &amp;wwpn)) {</div><div class='ctx'> 		retval = -EINVAL;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -154,7 +155,7 @@ static ssize_t zfcp_sysfs_port_remove_store(struct device *dev,</div><div class='ctx'> 	if (port &amp;&amp; (atomic_read(&amp;port-&gt;refcount) == 0)) {</div><div class='ctx'> 		zfcp_port_get(port);</div><div class='ctx'> 		atomic_set_mask(ZFCP_STATUS_COMMON_REMOVE, &amp;port-&gt;status);</div><div class='del'>-		list_move(&amp;port-&gt;list, &amp;adapter-&gt;port_remove_lh);</div><div class='add'>+		list_move(&amp;port-&gt;list, &amp;port_remove_lh);</div><div class='ctx'> 	} else</div><div class='ctx'> 		port = NULL;</div><div class='ctx'> 	write_unlock_irq(&amp;zfcp_data.config_lock);</div><div class='hunk'>@@ -200,7 +201,7 @@ static ssize_t zfcp_sysfs_unit_add_store(struct device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct zfcp_port *port = dev_get_drvdata(dev);</div><div class='ctx'> 	struct zfcp_unit *unit;</div><div class='del'>-	fcp_lun_t fcp_lun;</div><div class='add'>+	u64 fcp_lun;</div><div class='ctx'> 	int retval = -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	down(&amp;zfcp_data.config_sema);</div><div class='hunk'>@@ -209,7 +210,7 @@ static ssize_t zfcp_sysfs_unit_add_store(struct device *dev,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (strict_strtoull(buf, 0, &amp;fcp_lun))</div><div class='add'>+	if (strict_strtoull(buf, 0, (unsigned long long *) &amp;fcp_lun))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	unit = zfcp_unit_enqueue(port, fcp_lun);</div><div class='hunk'>@@ -233,8 +234,9 @@ static ssize_t zfcp_sysfs_unit_remove_store(struct device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct zfcp_port *port = dev_get_drvdata(dev);</div><div class='ctx'> 	struct zfcp_unit *unit;</div><div class='del'>-	fcp_lun_t fcp_lun;</div><div class='add'>+	u64 fcp_lun;</div><div class='ctx'> 	int retval = 0;</div><div class='add'>+	LIST_HEAD(unit_remove_lh);</div><div class='ctx'> </div><div class='ctx'> 	down(&amp;zfcp_data.config_sema);</div><div class='ctx'> 	if (atomic_read(&amp;port-&gt;status) &amp; ZFCP_STATUS_COMMON_REMOVE) {</div><div class='hunk'>@@ -242,7 +244,7 @@ static ssize_t zfcp_sysfs_unit_remove_store(struct device *dev,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (strict_strtoull(buf, 0, &amp;fcp_lun)) {</div><div class='add'>+	if (strict_strtoull(buf, 0, (unsigned long long *) &amp;fcp_lun)) {</div><div class='ctx'> 		retval = -EINVAL;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -252,7 +254,7 @@ static ssize_t zfcp_sysfs_unit_remove_store(struct device *dev,</div><div class='ctx'> 	if (unit &amp;&amp; (atomic_read(&amp;unit-&gt;refcount) == 0)) {</div><div class='ctx'> 		zfcp_unit_get(unit);</div><div class='ctx'> 		atomic_set_mask(ZFCP_STATUS_COMMON_REMOVE, &amp;unit-&gt;status);</div><div class='del'>-		list_move(&amp;unit-&gt;list, &amp;port-&gt;unit_remove_lh);</div><div class='add'>+		list_move(&amp;unit-&gt;list, &amp;unit_remove_lh);</div><div class='ctx'> 	} else</div><div class='ctx'> 		unit = NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -273,22 +275,7 @@ out:</div><div class='ctx'> }</div><div class='ctx'> static DEVICE_ATTR(unit_remove, S_IWUSR, NULL, zfcp_sysfs_unit_remove_store);</div><div class='ctx'> </div><div class='del'>-static struct attribute *zfcp_port_ns_attrs[] = {</div><div class='del'>-	&amp;dev_attr_port_failed.attr,</div><div class='del'>-	&amp;dev_attr_port_in_recovery.attr,</div><div class='del'>-	&amp;dev_attr_port_status.attr,</div><div class='del'>-	&amp;dev_attr_port_access_denied.attr,</div><div class='del'>-	NULL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * zfcp_sysfs_ns_port_attrs - sysfs attributes for nameserver</div><div class='del'>- */</div><div class='del'>-struct attribute_group zfcp_sysfs_ns_port_attrs = {</div><div class='del'>-	.attrs = zfcp_port_ns_attrs,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct attribute *zfcp_port_no_ns_attrs[] = {</div><div class='add'>+static struct attribute *zfcp_port_attrs[] = {</div><div class='ctx'> 	&amp;dev_attr_unit_add.attr,</div><div class='ctx'> 	&amp;dev_attr_unit_remove.attr,</div><div class='ctx'> 	&amp;dev_attr_port_failed.attr,</div><div class='hunk'>@@ -302,7 +289,7 @@ static struct attribute *zfcp_port_no_ns_attrs[] = {</div><div class='ctx'>  * zfcp_sysfs_port_attrs - sysfs attributes for all other ports</div><div class='ctx'>  */</div><div class='ctx'> struct attribute_group zfcp_sysfs_port_attrs = {</div><div class='del'>-	.attrs = zfcp_port_no_ns_attrs,</div><div class='add'>+	.attrs = zfcp_port_attrs,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct attribute *zfcp_unit_attrs[] = {</div><div class='hunk'>@@ -394,9 +381,11 @@ static ssize_t zfcp_sysfs_scsi_##_name##_show(struct device *dev,	\</div><div class='ctx'> static DEVICE_ATTR(_name, S_IRUGO, zfcp_sysfs_scsi_##_name##_show, NULL);</div><div class='ctx'> </div><div class='ctx'> ZFCP_DEFINE_SCSI_ATTR(hba_id, "%s\n",</div><div class='del'>-	unit-&gt;port-&gt;adapter-&gt;ccw_device-&gt;dev.bus_id);</div><div class='del'>-ZFCP_DEFINE_SCSI_ATTR(wwpn, "0x%016llx\n", unit-&gt;port-&gt;wwpn);</div><div class='del'>-ZFCP_DEFINE_SCSI_ATTR(fcp_lun, "0x%016llx\n", unit-&gt;fcp_lun);</div><div class='add'>+		      dev_name(&amp;unit-&gt;port-&gt;adapter-&gt;ccw_device-&gt;dev));</div><div class='add'>+ZFCP_DEFINE_SCSI_ATTR(wwpn, "0x%016llx\n",</div><div class='add'>+		      (unsigned long long) unit-&gt;port-&gt;wwpn);</div><div class='add'>+ZFCP_DEFINE_SCSI_ATTR(fcp_lun, "0x%016llx\n",</div><div class='add'>+		      (unsigned long long) unit-&gt;fcp_lun);</div><div class='ctx'> </div><div class='ctx'> struct device_attribute *zfcp_sysfs_sdev_attrs[] = {</div><div class='ctx'> 	&amp;dev_attr_fcp_lun,</div><div class='hunk'>@@ -487,10 +476,23 @@ ZFCP_SHOST_ATTR(megabytes, "%llu %llu\n",</div><div class='ctx'> ZFCP_SHOST_ATTR(seconds_active, "%llu\n",</div><div class='ctx'> 		(unsigned long long) stat_info.seconds_act);</div><div class='ctx'> </div><div class='add'>+static ssize_t zfcp_sysfs_adapter_q_full_show(struct device *dev,</div><div class='add'>+					      struct device_attribute *attr,</div><div class='add'>+					      char *buf)</div><div class='add'>+{</div><div class='add'>+	struct Scsi_Host *scsi_host = class_to_shost(dev);</div><div class='add'>+	struct zfcp_adapter *adapter =</div><div class='add'>+		(struct zfcp_adapter *) scsi_host-&gt;hostdata[0];</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "%d\n", atomic_read(&amp;adapter-&gt;qdio_outb_full));</div><div class='add'>+}</div><div class='add'>+static DEVICE_ATTR(queue_full, S_IRUGO, zfcp_sysfs_adapter_q_full_show, NULL);</div><div class='add'>+</div><div class='ctx'> struct device_attribute *zfcp_sysfs_shost_attrs[] = {</div><div class='ctx'> 	&amp;dev_attr_utilization,</div><div class='ctx'> 	&amp;dev_attr_requests,</div><div class='ctx'> 	&amp;dev_attr_megabytes,</div><div class='ctx'> 	&amp;dev_attr_seconds_active,</div><div class='add'>+	&amp;dev_attr_queue_full,</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/sbus/Makefile b/drivers/sbus/Makefile<br/>index 7b1d24d95308..e94dc25805f9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/sbus/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/sbus/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/sbus/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/sbus/Makefile</a></div><div class='hunk'>@@ -2,8 +2,4 @@</div><div class='ctx'> # Makefile for the linux kernel.</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-ifneq ($(ARCH),m68k)</div><div class='del'>-obj-y    := sbus.o dvma.o</div><div class='del'>-endif</div><div class='del'>-</div><div class='ctx'> obj-$(CONFIG_SBUSCHAR) += char/</div><div class='head'>diff --git a/drivers/sbus/char/Kconfig b/drivers/sbus/char/Kconfig<br/>index 400c65bfb8c7..73cde85d04d8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/sbus/char/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/sbus/char/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/sbus/char/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/sbus/char/Kconfig</a></div><div class='hunk'>@@ -13,16 +13,6 @@ config SUN_OPENPROMIO</div><div class='ctx'> </div><div class='ctx'> 	  If unsure, say Y.</div><div class='ctx'> </div><div class='del'>-config SUN_MOSTEK_RTC</div><div class='del'>-	tristate "Mostek real time clock support"</div><div class='del'>-	depends on SPARC32</div><div class='del'>-	help</div><div class='del'>-	  The Mostek RTC chip is used on all known Sun computers except</div><div class='del'>-	  some JavaStations. For a JavaStation you need to say Y both here</div><div class='del'>-	  and to "Enhanced Real Time Clock Support".</div><div class='del'>-</div><div class='del'>-	  Say Y here unless you are building a special purpose kernel.</div><div class='del'>-</div><div class='ctx'> config OBP_FLASH</div><div class='ctx'> 	tristate "OBP Flash Device support"</div><div class='ctx'> 	depends on SPARC64</div><div class='hunk'>@@ -30,26 +20,9 @@ config OBP_FLASH</div><div class='ctx'> 	  The OpenBoot PROM on Ultra systems is flashable. If you want to be</div><div class='ctx'> 	  able to upgrade the OBP firmware, say Y here.</div><div class='ctx'> </div><div class='del'>-config SUN_BPP</div><div class='del'>-	tristate "Bidirectional parallel port support (OBSOLETE)"</div><div class='del'>-	depends on EXPERIMENTAL</div><div class='del'>-	help</div><div class='del'>-	  Say Y here to support Sun's obsolete variant of IEEE1284</div><div class='del'>-	  bidirectional parallel port protocol as /dev/bppX.  Can be built on</div><div class='del'>-	  x86 machines.</div><div class='del'>-</div><div class='del'>-config SUN_VIDEOPIX</div><div class='del'>-	tristate "Videopix Frame Grabber (EXPERIMENTAL)"</div><div class='del'>-	depends on EXPERIMENTAL &amp;&amp; (BROKEN || !64BIT)</div><div class='del'>-	help</div><div class='del'>-	  Say Y here to support the Videopix Frame Grabber from Sun</div><div class='del'>-	  Microsystems, commonly found on SPARCstations.  This card, which is</div><div class='del'>-	  based on the Phillips SAA9051, can handle NTSC and PAL/SECAM and</div><div class='del'>-	  SVIDEO signals.</div><div class='del'>-</div><div class='ctx'> config TADPOLE_TS102_UCTRL</div><div class='ctx'> 	tristate "Tadpole TS102 Microcontroller support (EXPERIMENTAL)"</div><div class='del'>-	depends on EXPERIMENTAL &amp;&amp; SPARC32</div><div class='add'>+	depends on EXPERIMENTAL</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say Y here to directly support the TS102 Microcontroller interface</div><div class='ctx'> 	  on the Tadpole Sparcbook 3.  This device handles power-management</div><div class='head'>diff --git a/drivers/sbus/char/Makefile b/drivers/sbus/char/Makefile<br/>index 7ab060e9a5fe..78b6183c9866 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/sbus/char/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/sbus/char/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/sbus/char/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/sbus/char/Makefile</a></div><div class='hunk'>@@ -7,18 +7,12 @@</div><div class='ctx'> # Rewritten to use lists instead of if-statements.</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-vfc-objs := vfc_dev.o vfc_i2c.o</div><div class='ctx'> bbc-objs := bbc_i2c.o bbc_envctrl.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_ENVCTRL)			+= envctrl.o</div><div class='ctx'> obj-$(CONFIG_DISPLAY7SEG)		+= display7seg.o</div><div class='del'>-obj-$(CONFIG_WATCHDOG_CP1XXX)		+= cpwatchdog.o</div><div class='del'>-obj-$(CONFIG_WATCHDOG_RIO)		+= riowatchdog.o</div><div class='ctx'> obj-$(CONFIG_OBP_FLASH)			+= flash.o</div><div class='ctx'> obj-$(CONFIG_SUN_OPENPROMIO)		+= openprom.o</div><div class='del'>-obj-$(CONFIG_SUN_MOSTEK_RTC)		+= rtc.o</div><div class='del'>-obj-$(CONFIG_SUN_BPP)			+= bpp.o</div><div class='del'>-obj-$(CONFIG_SUN_VIDEOPIX)		+= vfc.o</div><div class='ctx'> obj-$(CONFIG_TADPOLE_TS102_UCTRL)	+= uctrl.o</div><div class='ctx'> obj-$(CONFIG_SUN_JSFLASH)		+= jsflash.o</div><div class='ctx'> obj-$(CONFIG_BBC_I2C)			+= bbc.o</div><div class='head'>diff --git a/drivers/sbus/char/bbc_envctrl.c b/drivers/sbus/char/bbc_envctrl.c<br/>index 0bde26989a23..15dab96d05e3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/sbus/char/bbc_envctrl.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/sbus/char/bbc_envctrl.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/sbus/char/bbc_envctrl.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/sbus/char/bbc_envctrl.c</a></div><div class='hunk'>@@ -1,15 +1,15 @@</div><div class='del'>-/* $Id: bbc_envctrl.c,v 1.4 2001/04/06 16:48:08 davem Exp $</div><div class='del'>- * bbc_envctrl.c: UltraSPARC-III environment control driver.</div><div class='add'>+/* bbc_envctrl.c: UltraSPARC-III environment control driver.</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2001 David S. Miller (davem@redhat.com)</div><div class='add'>+ * Copyright (C) 2001, 2008 David S. Miller (davem@davemloft.net)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kthread.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/kmod.h&gt;</div><div class='ctx'> #include &lt;linux/reboot.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_device.h&gt;</div><div class='ctx'> #include &lt;asm/oplib.h&gt;</div><div class='del'>-#include &lt;asm/ebus.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "bbc_i2c.h"</div><div class='ctx'> #include "max1617.h"</div><div class='hunk'>@@ -75,43 +75,8 @@ static struct temp_limits amb_temp_limits[2] = {</div><div class='ctx'> 	{ 65, 55, 40, 5, -5, -10 },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-enum fan_action { FAN_SLOWER, FAN_SAME, FAN_FASTER, FAN_FULLBLAST, FAN_STATE_MAX };</div><div class='del'>-</div><div class='del'>-struct bbc_cpu_temperature {</div><div class='del'>-	struct bbc_cpu_temperature	*next;</div><div class='del'>-</div><div class='del'>-	struct bbc_i2c_client		*client;</div><div class='del'>-	int				index;</div><div class='del'>-</div><div class='del'>-	/* Current readings, and history. */</div><div class='del'>-	s8				curr_cpu_temp;</div><div class='del'>-	s8				curr_amb_temp;</div><div class='del'>-	s8				prev_cpu_temp;</div><div class='del'>-	s8				prev_amb_temp;</div><div class='del'>-	s8				avg_cpu_temp;</div><div class='del'>-	s8				avg_amb_temp;</div><div class='del'>-</div><div class='del'>-	int				sample_tick;</div><div class='del'>-</div><div class='del'>-	enum fan_action			fan_todo[2];</div><div class='del'>-#define FAN_AMBIENT	0</div><div class='del'>-#define FAN_CPU		1</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct bbc_cpu_temperature *all_bbc_temps;</div><div class='del'>-</div><div class='del'>-struct bbc_fan_control {</div><div class='del'>-	struct bbc_fan_control 	*next;</div><div class='del'>-</div><div class='del'>-	struct bbc_i2c_client 	*client;</div><div class='del'>-	int 			index;</div><div class='del'>-</div><div class='del'>-	int			psupply_fan_on;</div><div class='del'>-	int			cpu_fan_speed;</div><div class='del'>-	int			system_fan_speed;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct bbc_fan_control *all_bbc_fans;</div><div class='add'>+static LIST_HEAD(all_temps);</div><div class='add'>+static LIST_HEAD(all_fans);</div><div class='ctx'> </div><div class='ctx'> #define CPU_FAN_REG	0xf0</div><div class='ctx'> #define SYS_FAN_REG	0xf2</div><div class='hunk'>@@ -330,7 +295,7 @@ static enum fan_action prioritize_fan_action(int which_fan)</div><div class='ctx'> 	 * recommend we do, and perform that action on all the</div><div class='ctx'> 	 * fans.</div><div class='ctx'> 	 */</div><div class='del'>-	for (tp = all_bbc_temps; tp; tp = tp-&gt;next) {</div><div class='add'>+	list_for_each_entry(tp, &amp;all_temps, glob_list) {</div><div class='ctx'> 		if (tp-&gt;fan_todo[which_fan] == FAN_FULLBLAST) {</div><div class='ctx'> 			decision = FAN_FULLBLAST;</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -439,7 +404,7 @@ static void fans_full_blast(void)</div><div class='ctx'> 	/* Since we will not be monitoring things anymore, put</div><div class='ctx'> 	 * the fans on full blast.</div><div class='ctx'> 	 */</div><div class='del'>-	for (fp = all_bbc_fans; fp; fp = fp-&gt;next) {</div><div class='add'>+	list_for_each_entry(fp, &amp;all_fans, glob_list) {</div><div class='ctx'> 		fp-&gt;cpu_fan_speed = FAN_SPEED_MAX;</div><div class='ctx'> 		fp-&gt;system_fan_speed = FAN_SPEED_MAX;</div><div class='ctx'> 		fp-&gt;psupply_fan_on = 1;</div><div class='hunk'>@@ -463,11 +428,11 @@ static int kenvctrld(void *__unused)</div><div class='ctx'> 		if (kthread_should_stop())</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		for (tp = all_bbc_temps; tp; tp = tp-&gt;next) {</div><div class='add'>+		list_for_each_entry(tp, &amp;all_temps, glob_list) {</div><div class='ctx'> 			get_current_temps(tp);</div><div class='ctx'> 			analyze_temps(tp, &amp;last_warning_jiffies);</div><div class='ctx'> 		}</div><div class='del'>-		for (fp = all_bbc_fans; fp; fp = fp-&gt;next)</div><div class='add'>+		list_for_each_entry(fp, &amp;all_fans, glob_list)</div><div class='ctx'> 			maybe_new_fan_speeds(fp);</div><div class='ctx'> 	}</div><div class='ctx'> 	printk(KERN_INFO "bbc_envctrl: kenvctrld exiting...\n");</div><div class='hunk'>@@ -477,7 +442,8 @@ static int kenvctrld(void *__unused)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void attach_one_temp(struct linux_ebus_child *echild, int temp_idx)</div><div class='add'>+static void attach_one_temp(struct bbc_i2c_bus *bp, struct of_device *op,</div><div class='add'>+			    int temp_idx)</div><div class='ctx'> {</div><div class='ctx'> 	struct bbc_cpu_temperature *tp;</div><div class='ctx'> </div><div class='hunk'>@@ -485,20 +451,17 @@ static void attach_one_temp(struct linux_ebus_child *echild, int temp_idx)</div><div class='ctx'> 	if (!tp)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	tp-&gt;client = bbc_i2c_attach(echild);</div><div class='add'>+	tp-&gt;client = bbc_i2c_attach(bp, op);</div><div class='ctx'> 	if (!tp-&gt;client) {</div><div class='ctx'> 		kfree(tp);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> 	tp-&gt;index = temp_idx;</div><div class='del'>-	{</div><div class='del'>-		struct bbc_cpu_temperature **tpp = &amp;all_bbc_temps;</div><div class='del'>-		while (*tpp)</div><div class='del'>-			tpp = &amp;((*tpp)-&gt;next);</div><div class='del'>-		tp-&gt;next = NULL;</div><div class='del'>-		*tpp = tp;</div><div class='del'>-	}</div><div class='add'>+</div><div class='add'>+	list_add(&amp;tp-&gt;glob_list, &amp;all_temps);</div><div class='add'>+	list_add(&amp;tp-&gt;bp_list, &amp;bp-&gt;temps);</div><div class='ctx'> </div><div class='ctx'> 	/* Tell it to convert once every 5 seconds, clear all cfg</div><div class='ctx'> 	 * bits.</div><div class='hunk'>@@ -524,7 +487,8 @@ static void attach_one_temp(struct linux_ebus_child *echild, int temp_idx)</div><div class='ctx'> 	tp-&gt;fan_todo[FAN_CPU] = FAN_SAME;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void attach_one_fan(struct linux_ebus_child *echild, int fan_idx)</div><div class='add'>+static void attach_one_fan(struct bbc_i2c_bus *bp, struct of_device *op,</div><div class='add'>+			   int fan_idx)</div><div class='ctx'> {</div><div class='ctx'> 	struct bbc_fan_control *fp;</div><div class='ctx'> </div><div class='hunk'>@@ -532,7 +496,7 @@ static void attach_one_fan(struct linux_ebus_child *echild, int fan_idx)</div><div class='ctx'> 	if (!fp)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	fp-&gt;client = bbc_i2c_attach(echild);</div><div class='add'>+	fp-&gt;client = bbc_i2c_attach(bp, op);</div><div class='ctx'> 	if (!fp-&gt;client) {</div><div class='ctx'> 		kfree(fp);</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -540,13 +504,8 @@ static void attach_one_fan(struct linux_ebus_child *echild, int fan_idx)</div><div class='ctx'> </div><div class='ctx'> 	fp-&gt;index = fan_idx;</div><div class='ctx'> </div><div class='del'>-	{</div><div class='del'>-		struct bbc_fan_control **fpp = &amp;all_bbc_fans;</div><div class='del'>-		while (*fpp)</div><div class='del'>-			fpp = &amp;((*fpp)-&gt;next);</div><div class='del'>-		fp-&gt;next = NULL;</div><div class='del'>-		*fpp = fp;</div><div class='del'>-	}</div><div class='add'>+	list_add(&amp;fp-&gt;glob_list, &amp;all_fans);</div><div class='add'>+	list_add(&amp;fp-&gt;bp_list, &amp;bp-&gt;fans);</div><div class='ctx'> </div><div class='ctx'> 	/* The i2c device controlling the fans is write-only.</div><div class='ctx'> 	 * So the only way to keep track of the current power</div><div class='hunk'>@@ -563,18 +522,18 @@ static void attach_one_fan(struct linux_ebus_child *echild, int fan_idx)</div><div class='ctx'> 	set_fan_speeds(fp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int bbc_envctrl_init(void)</div><div class='add'>+int bbc_envctrl_init(struct bbc_i2c_bus *bp)</div><div class='ctx'> {</div><div class='del'>-	struct linux_ebus_child *echild;</div><div class='add'>+	struct of_device *op;</div><div class='ctx'> 	int temp_index = 0;</div><div class='ctx'> 	int fan_index = 0;</div><div class='ctx'> 	int devidx = 0;</div><div class='ctx'> </div><div class='del'>-	while ((echild = bbc_i2c_getdev(devidx++)) != NULL) {</div><div class='del'>-		if (!strcmp(echild-&gt;prom_node-&gt;name, "temperature"))</div><div class='del'>-			attach_one_temp(echild, temp_index++);</div><div class='del'>-		if (!strcmp(echild-&gt;prom_node-&gt;name, "fan-control"))</div><div class='del'>-			attach_one_fan(echild, fan_index++);</div><div class='add'>+	while ((op = bbc_i2c_getdev(bp, devidx++)) != NULL) {</div><div class='add'>+		if (!strcmp(op-&gt;node-&gt;name, "temperature"))</div><div class='add'>+			attach_one_temp(bp, op, temp_index++);</div><div class='add'>+		if (!strcmp(op-&gt;node-&gt;name, "fan-control"))</div><div class='add'>+			attach_one_fan(bp, op, fan_index++);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (temp_index != 0 &amp;&amp; fan_index != 0) {</div><div class='ctx'> 		kenvctrld_task = kthread_run(kenvctrld, NULL, "kenvctrld");</div><div class='hunk'>@@ -597,26 +556,22 @@ static void destroy_one_fan(struct bbc_fan_control *fp)</div><div class='ctx'> 	kfree(fp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void bbc_envctrl_cleanup(void)</div><div class='add'>+void bbc_envctrl_cleanup(struct bbc_i2c_bus *bp)</div><div class='ctx'> {</div><div class='del'>-	struct bbc_cpu_temperature *tp;</div><div class='del'>-	struct bbc_fan_control *fp;</div><div class='add'>+	struct bbc_cpu_temperature *tp, *tpos;</div><div class='add'>+	struct bbc_fan_control *fp, *fpos;</div><div class='ctx'> </div><div class='ctx'> 	kthread_stop(kenvctrld_task);</div><div class='ctx'> </div><div class='del'>-	tp = all_bbc_temps;</div><div class='del'>-	while (tp != NULL) {</div><div class='del'>-		struct bbc_cpu_temperature *next = tp-&gt;next;</div><div class='add'>+	list_for_each_entry_safe(tp, tpos, &amp;bp-&gt;temps, bp_list) {</div><div class='add'>+		list_del(&amp;tp-&gt;bp_list);</div><div class='add'>+		list_del(&amp;tp-&gt;glob_list);</div><div class='ctx'> 		destroy_one_temp(tp);</div><div class='del'>-		tp = next;</div><div class='ctx'> 	}</div><div class='del'>-	all_bbc_temps = NULL;</div><div class='ctx'> </div><div class='del'>-	fp = all_bbc_fans;</div><div class='del'>-	while (fp != NULL) {</div><div class='del'>-		struct bbc_fan_control *next = fp-&gt;next;</div><div class='add'>+	list_for_each_entry_safe(fp, fpos, &amp;bp-&gt;fans, bp_list) {</div><div class='add'>+		list_del(&amp;fp-&gt;bp_list);</div><div class='add'>+		list_del(&amp;fp-&gt;glob_list);</div><div class='ctx'> 		destroy_one_fan(fp);</div><div class='del'>-		fp = next;</div><div class='ctx'> 	}</div><div class='del'>-	all_bbc_fans = NULL;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/sbus/char/bbc_i2c.c b/drivers/sbus/char/bbc_i2c.c<br/>index ac8ef2ce07fb..f08e169ba1b5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/sbus/char/bbc_i2c.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/sbus/char/bbc_i2c.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/sbus/char/bbc_i2c.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/sbus/char/bbc_i2c.c</a></div><div class='hunk'>@@ -1,8 +1,7 @@</div><div class='del'>-/* $Id: bbc_i2c.c,v 1.2 2001/04/02 09:59:08 davem Exp $</div><div class='del'>- * bbc_i2c.c: I2C low-level driver for BBC device on UltraSPARC-III</div><div class='add'>+/* bbc_i2c.c: I2C low-level driver for BBC device on UltraSPARC-III</div><div class='ctx'>  *            platforms.</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2001 David S. Miller (davem@redhat.com)</div><div class='add'>+ * Copyright (C) 2001, 2008 David S. Miller (davem@davemloft.net)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -14,9 +13,8 @@</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;asm/oplib.h&gt;</div><div class='del'>-#include &lt;asm/ebus.h&gt;</div><div class='del'>-#include &lt;asm/spitfire.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_device.h&gt;</div><div class='ctx'> #include &lt;asm/bbc.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -53,54 +51,12 @@</div><div class='ctx'>  * The second controller also connects to the smartcard reader, if present.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define NUM_CHILDREN	8</div><div class='del'>-struct bbc_i2c_bus {</div><div class='del'>-	struct bbc_i2c_bus		*next;</div><div class='del'>-	int				index;</div><div class='del'>-	spinlock_t			lock;</div><div class='del'>-	void				__iomem *i2c_bussel_reg;</div><div class='del'>-	void				__iomem *i2c_control_regs;</div><div class='del'>-	unsigned char			own, clock;</div><div class='del'>-</div><div class='del'>-	wait_queue_head_t		wq;</div><div class='del'>-	volatile int			waiting;</div><div class='del'>-</div><div class='del'>-	struct linux_ebus_device	*bus_edev;</div><div class='del'>-	struct {</div><div class='del'>-		struct linux_ebus_child	*device;</div><div class='del'>-		int			client_claimed;</div><div class='del'>-	} devs[NUM_CHILDREN];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct bbc_i2c_bus *all_bbc_i2c;</div><div class='del'>-</div><div class='del'>-struct bbc_i2c_client {</div><div class='del'>-	struct bbc_i2c_bus	*bp;</div><div class='del'>-	struct linux_ebus_child	*echild;</div><div class='del'>-	int			bus;</div><div class='del'>-	int			address;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int find_device(struct bbc_i2c_bus *bp, struct linux_ebus_child *echild)</div><div class='add'>+static void set_device_claimage(struct bbc_i2c_bus *bp, struct of_device *op, int val)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; NUM_CHILDREN; i++) {</div><div class='del'>-		if (bp-&gt;devs[i].device == echild) {</div><div class='del'>-			if (bp-&gt;devs[i].client_claimed)</div><div class='del'>-				return 0;</div><div class='del'>-			return 1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void set_device_claimage(struct bbc_i2c_bus *bp, struct linux_ebus_child *echild, int val)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; NUM_CHILDREN; i++) {</div><div class='del'>-		if (bp-&gt;devs[i].device == echild) {</div><div class='add'>+		if (bp-&gt;devs[i].device == op) {</div><div class='ctx'> 			bp-&gt;devs[i].client_claimed = val;</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -110,61 +66,47 @@ static void set_device_claimage(struct bbc_i2c_bus *bp, struct linux_ebus_child</div><div class='ctx'> #define claim_device(BP,ECHILD)		set_device_claimage(BP,ECHILD,1)</div><div class='ctx'> #define release_device(BP,ECHILD)	set_device_claimage(BP,ECHILD,0)</div><div class='ctx'> </div><div class='del'>-static struct bbc_i2c_bus *find_bus_for_device(struct linux_ebus_child *echild)</div><div class='add'>+struct of_device *bbc_i2c_getdev(struct bbc_i2c_bus *bp, int index)</div><div class='ctx'> {</div><div class='del'>-	struct bbc_i2c_bus *bp = all_bbc_i2c;</div><div class='add'>+	struct of_device *op = NULL;</div><div class='add'>+	int curidx = 0, i;</div><div class='ctx'> </div><div class='del'>-	while (bp != NULL) {</div><div class='del'>-		if (find_device(bp, echild) != 0)</div><div class='add'>+	for (i = 0; i &lt; NUM_CHILDREN; i++) {</div><div class='add'>+		if (!(op = bp-&gt;devs[i].device))</div><div class='ctx'> 			break;</div><div class='del'>-		bp = bp-&gt;next;</div><div class='add'>+		if (curidx == index)</div><div class='add'>+			goto out;</div><div class='add'>+		op = NULL;</div><div class='add'>+		curidx++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return bp;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct linux_ebus_child *bbc_i2c_getdev(int index)</div><div class='del'>-{</div><div class='del'>-	struct bbc_i2c_bus *bp = all_bbc_i2c;</div><div class='del'>-	struct linux_ebus_child *echild = NULL;</div><div class='del'>-	int curidx = 0;</div><div class='del'>-</div><div class='del'>-	while (bp != NULL) {</div><div class='del'>-		struct bbc_i2c_bus *next = bp-&gt;next;</div><div class='del'>-		int i;</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; NUM_CHILDREN; i++) {</div><div class='del'>-			if (!(echild = bp-&gt;devs[i].device))</div><div class='del'>-				break;</div><div class='del'>-			if (curidx == index)</div><div class='del'>-				goto out;</div><div class='del'>-			echild = NULL;</div><div class='del'>-			curidx++;</div><div class='del'>-		}</div><div class='del'>-		bp = next;</div><div class='del'>-	}</div><div class='ctx'> out:</div><div class='ctx'> 	if (curidx == index)</div><div class='del'>-		return echild;</div><div class='add'>+		return op;</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct bbc_i2c_client *bbc_i2c_attach(struct linux_ebus_child *echild)</div><div class='add'>+struct bbc_i2c_client *bbc_i2c_attach(struct bbc_i2c_bus *bp, struct of_device *op)</div><div class='ctx'> {</div><div class='del'>-	struct bbc_i2c_bus *bp = find_bus_for_device(echild);</div><div class='ctx'> 	struct bbc_i2c_client *client;</div><div class='add'>+	const u32 *reg;</div><div class='ctx'> </div><div class='del'>-	if (!bp)</div><div class='del'>-		return NULL;</div><div class='ctx'> 	client = kzalloc(sizeof(*client), GFP_KERNEL);</div><div class='ctx'> 	if (!client)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	client-&gt;bp = bp;</div><div class='del'>-	client-&gt;echild = echild;</div><div class='del'>-	client-&gt;bus = echild-&gt;resource[0].start;</div><div class='del'>-	client-&gt;address = echild-&gt;resource[1].start;</div><div class='add'>+	client-&gt;op = op;</div><div class='add'>+</div><div class='add'>+	reg = of_get_property(op-&gt;node, "reg", NULL);</div><div class='add'>+	if (!reg) {</div><div class='add'>+		kfree(client);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	claim_device(bp, echild);</div><div class='add'>+	client-&gt;bus = reg[0];</div><div class='add'>+	client-&gt;address = reg[1];</div><div class='add'>+</div><div class='add'>+	claim_device(bp, op);</div><div class='ctx'> </div><div class='ctx'> 	return client;</div><div class='ctx'> }</div><div class='hunk'>@@ -172,9 +114,9 @@ struct bbc_i2c_client *bbc_i2c_attach(struct linux_ebus_child *echild)</div><div class='ctx'> void bbc_i2c_detach(struct bbc_i2c_client *client)</div><div class='ctx'> {</div><div class='ctx'> 	struct bbc_i2c_bus *bp = client-&gt;bp;</div><div class='del'>-	struct linux_ebus_child *echild = client-&gt;echild;</div><div class='add'>+	struct of_device *op = client-&gt;op;</div><div class='ctx'> </div><div class='del'>-	release_device(bp, echild);</div><div class='add'>+	release_device(bp, op);</div><div class='ctx'> 	kfree(client);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -355,44 +297,43 @@ static void __init reset_one_i2c(struct bbc_i2c_bus *bp)</div><div class='ctx'> 	writeb(I2C_PCF_IDLE, bp-&gt;i2c_control_regs + 0x0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init attach_one_i2c(struct linux_ebus_device *edev, int index)</div><div class='add'>+static struct bbc_i2c_bus * __init attach_one_i2c(struct of_device *op, int index)</div><div class='ctx'> {</div><div class='ctx'> 	struct bbc_i2c_bus *bp;</div><div class='del'>-	struct linux_ebus_child *echild;</div><div class='add'>+	struct device_node *dp;</div><div class='ctx'> 	int entry;</div><div class='ctx'> </div><div class='ctx'> 	bp = kzalloc(sizeof(*bp), GFP_KERNEL);</div><div class='ctx'> 	if (!bp)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+		return NULL;</div><div class='ctx'> </div><div class='del'>-	bp-&gt;i2c_control_regs = ioremap(edev-&gt;resource[0].start, 0x2);</div><div class='add'>+	bp-&gt;i2c_control_regs = of_ioremap(&amp;op-&gt;resource[0], 0, 0x2, "bbc_i2c_regs");</div><div class='ctx'> 	if (!bp-&gt;i2c_control_regs)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='del'>-	if (edev-&gt;num_addrs == 2) {</div><div class='del'>-		bp-&gt;i2c_bussel_reg = ioremap(edev-&gt;resource[1].start, 0x1);</div><div class='del'>-		if (!bp-&gt;i2c_bussel_reg)</div><div class='del'>-			goto fail;</div><div class='del'>-	}</div><div class='add'>+	bp-&gt;i2c_bussel_reg = of_ioremap(&amp;op-&gt;resource[1], 0, 0x1, "bbc_i2c_bussel");</div><div class='add'>+	if (!bp-&gt;i2c_bussel_reg)</div><div class='add'>+		goto fail;</div><div class='ctx'> </div><div class='ctx'> 	bp-&gt;waiting = 0;</div><div class='ctx'> 	init_waitqueue_head(&amp;bp-&gt;wq);</div><div class='del'>-	if (request_irq(edev-&gt;irqs[0], bbc_i2c_interrupt,</div><div class='add'>+	if (request_irq(op-&gt;irqs[0], bbc_i2c_interrupt,</div><div class='ctx'> 			IRQF_SHARED, "bbc_i2c", bp))</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='ctx'> 	bp-&gt;index = index;</div><div class='del'>-	bp-&gt;bus_edev = edev;</div><div class='add'>+	bp-&gt;op = op;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;bp-&gt;lock);</div><div class='del'>-	bp-&gt;next = all_bbc_i2c;</div><div class='del'>-	all_bbc_i2c = bp;</div><div class='ctx'> </div><div class='ctx'> 	entry = 0;</div><div class='del'>-	for (echild = edev-&gt;children;</div><div class='del'>-	     echild &amp;&amp; entry &lt; 8;</div><div class='del'>-	     echild = echild-&gt;next, entry++) {</div><div class='del'>-		bp-&gt;devs[entry].device = echild;</div><div class='add'>+	for (dp = op-&gt;node-&gt;child;</div><div class='add'>+	     dp &amp;&amp; entry &lt; 8;</div><div class='add'>+	     dp = dp-&gt;sibling, entry++) {</div><div class='add'>+		struct of_device *child_op;</div><div class='add'>+</div><div class='add'>+		child_op = of_find_device_by_node(dp);</div><div class='add'>+		bp-&gt;devs[entry].device = child_op;</div><div class='ctx'> 		bp-&gt;devs[entry].client_claimed = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -406,86 +347,90 @@ static int __init attach_one_i2c(struct linux_ebus_device *edev, int index)</div><div class='ctx'> </div><div class='ctx'> 	reset_one_i2c(bp);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return bp;</div><div class='ctx'> </div><div class='ctx'> fail:</div><div class='ctx'> 	if (bp-&gt;i2c_bussel_reg)</div><div class='del'>-		iounmap(bp-&gt;i2c_bussel_reg);</div><div class='add'>+		of_iounmap(&amp;op-&gt;resource[1], bp-&gt;i2c_bussel_reg, 1);</div><div class='ctx'> 	if (bp-&gt;i2c_control_regs)</div><div class='del'>-		iounmap(bp-&gt;i2c_control_regs);</div><div class='add'>+		of_iounmap(&amp;op-&gt;resource[0], bp-&gt;i2c_control_regs, 2);</div><div class='ctx'> 	kfree(bp);</div><div class='del'>-	return -EINVAL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init bbc_present(void)</div><div class='del'>-{</div><div class='del'>-	struct linux_ebus *ebus = NULL;</div><div class='del'>-	struct linux_ebus_device *edev = NULL;</div><div class='del'>-</div><div class='del'>-	for_each_ebus(ebus) {</div><div class='del'>-		for_each_ebusdev(edev, ebus) {</div><div class='del'>-			if (!strcmp(edev-&gt;prom_node-&gt;name, "bbc"))</div><div class='del'>-				return 1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-extern int bbc_envctrl_init(void);</div><div class='del'>-extern void bbc_envctrl_cleanup(void);</div><div class='del'>-static void bbc_i2c_cleanup(void);</div><div class='add'>+extern int bbc_envctrl_init(struct bbc_i2c_bus *bp);</div><div class='add'>+extern void bbc_envctrl_cleanup(struct bbc_i2c_bus *bp);</div><div class='ctx'> </div><div class='del'>-static int __init bbc_i2c_init(void)</div><div class='add'>+static int __devinit bbc_i2c_probe(struct of_device *op,</div><div class='add'>+				   const struct of_device_id *match)</div><div class='ctx'> {</div><div class='del'>-	struct linux_ebus *ebus = NULL;</div><div class='del'>-	struct linux_ebus_device *edev = NULL;</div><div class='add'>+	struct bbc_i2c_bus *bp;</div><div class='ctx'> 	int err, index = 0;</div><div class='ctx'> </div><div class='del'>-	if ((tlb_type != cheetah &amp;&amp; tlb_type != cheetah_plus) ||</div><div class='del'>-	    !bbc_present())</div><div class='del'>-		return -ENODEV;</div><div class='add'>+	bp = attach_one_i2c(op, index);</div><div class='add'>+	if (!bp)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	for_each_ebus(ebus) {</div><div class='del'>-		for_each_ebusdev(edev, ebus) {</div><div class='del'>-			if (!strcmp(edev-&gt;prom_node-&gt;name, "i2c")) {</div><div class='del'>-				if (!attach_one_i2c(edev, index))</div><div class='del'>-					index++;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='add'>+	err = bbc_envctrl_init(bp);</div><div class='add'>+	if (err) {</div><div class='add'>+		free_irq(op-&gt;irqs[0], bp);</div><div class='add'>+		if (bp-&gt;i2c_bussel_reg)</div><div class='add'>+			of_iounmap(&amp;op-&gt;resource[0], bp-&gt;i2c_bussel_reg, 1);</div><div class='add'>+		if (bp-&gt;i2c_control_regs)</div><div class='add'>+			of_iounmap(&amp;op-&gt;resource[1], bp-&gt;i2c_control_regs, 2);</div><div class='add'>+		kfree(bp);</div><div class='add'>+	} else {</div><div class='add'>+		dev_set_drvdata(&amp;op-&gt;dev, bp);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!index)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	err = bbc_envctrl_init();</div><div class='del'>-	if (err)</div><div class='del'>-		bbc_i2c_cleanup();</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bbc_i2c_cleanup(void)</div><div class='add'>+static int __devexit bbc_i2c_remove(struct of_device *op)</div><div class='ctx'> {</div><div class='del'>-	struct bbc_i2c_bus *bp = all_bbc_i2c;</div><div class='add'>+	struct bbc_i2c_bus *bp = dev_get_drvdata(&amp;op-&gt;dev);</div><div class='add'>+</div><div class='add'>+	bbc_envctrl_cleanup(bp);</div><div class='add'>+</div><div class='add'>+	free_irq(op-&gt;irqs[0], bp);</div><div class='ctx'> </div><div class='del'>-	bbc_envctrl_cleanup();</div><div class='add'>+	if (bp-&gt;i2c_bussel_reg)</div><div class='add'>+		of_iounmap(&amp;op-&gt;resource[0], bp-&gt;i2c_bussel_reg, 1);</div><div class='add'>+	if (bp-&gt;i2c_control_regs)</div><div class='add'>+		of_iounmap(&amp;op-&gt;resource[1], bp-&gt;i2c_control_regs, 2);</div><div class='ctx'> </div><div class='del'>-	while (bp != NULL) {</div><div class='del'>-		struct bbc_i2c_bus *next = bp-&gt;next;</div><div class='add'>+	kfree(bp);</div><div class='ctx'> </div><div class='del'>-		free_irq(bp-&gt;bus_edev-&gt;irqs[0], bp);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		if (bp-&gt;i2c_bussel_reg)</div><div class='del'>-			iounmap(bp-&gt;i2c_bussel_reg);</div><div class='del'>-		if (bp-&gt;i2c_control_regs)</div><div class='del'>-			iounmap(bp-&gt;i2c_control_regs);</div><div class='add'>+static const struct of_device_id bbc_i2c_match[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "i2c",</div><div class='add'>+		.compatible = "SUNW,bbc-i2c",</div><div class='add'>+	},</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, bbc_i2c_match);</div><div class='ctx'> </div><div class='del'>-		kfree(bp);</div><div class='add'>+static struct of_platform_driver bbc_i2c_driver = {</div><div class='add'>+	.name		= "bbc_i2c",</div><div class='add'>+	.match_table	= bbc_i2c_match,</div><div class='add'>+	.probe		= bbc_i2c_probe,</div><div class='add'>+	.remove		= __devexit_p(bbc_i2c_remove),</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-		bp = next;</div><div class='del'>-	}</div><div class='del'>-	all_bbc_i2c = NULL;</div><div class='add'>+static int __init bbc_i2c_init(void)</div><div class='add'>+{</div><div class='add'>+	return of_register_driver(&amp;bbc_i2c_driver, &amp;of_bus_type);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit bbc_i2c_exit(void)</div><div class='add'>+{</div><div class='add'>+	of_unregister_driver(&amp;bbc_i2c_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(bbc_i2c_init);</div><div class='del'>-module_exit(bbc_i2c_cleanup);</div><div class='add'>+module_exit(bbc_i2c_exit);</div><div class='add'>+</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/sbus/char/bbc_i2c.h b/drivers/sbus/char/bbc_i2c.h<br/>index fb01bd17704b..83c4811b7b5e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/sbus/char/bbc_i2c.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/sbus/char/bbc_i2c.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/sbus/char/bbc_i2c.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/sbus/char/bbc_i2c.h</a></div><div class='hunk'>@@ -1,14 +1,79 @@</div><div class='del'>-/* $Id: bbc_i2c.h,v 1.2 2001/04/02 09:59:25 davem Exp $ */</div><div class='ctx'> #ifndef _BBC_I2C_H</div><div class='ctx'> #define _BBC_I2C_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/ebus.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_device.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='ctx'> </div><div class='del'>-struct bbc_i2c_client;</div><div class='add'>+struct bbc_i2c_client {</div><div class='add'>+	struct bbc_i2c_bus		*bp;</div><div class='add'>+	struct of_device		*op;</div><div class='add'>+	int				bus;</div><div class='add'>+	int				address;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum fan_action { FAN_SLOWER, FAN_SAME, FAN_FASTER, FAN_FULLBLAST, FAN_STATE_MAX };</div><div class='add'>+</div><div class='add'>+struct bbc_cpu_temperature {</div><div class='add'>+	struct list_head		bp_list;</div><div class='add'>+	struct list_head		glob_list;</div><div class='add'>+</div><div class='add'>+	struct bbc_i2c_client		*client;</div><div class='add'>+	int				index;</div><div class='add'>+</div><div class='add'>+	/* Current readings, and history. */</div><div class='add'>+	s8				curr_cpu_temp;</div><div class='add'>+	s8				curr_amb_temp;</div><div class='add'>+	s8				prev_cpu_temp;</div><div class='add'>+	s8				prev_amb_temp;</div><div class='add'>+	s8				avg_cpu_temp;</div><div class='add'>+	s8				avg_amb_temp;</div><div class='add'>+</div><div class='add'>+	int				sample_tick;</div><div class='add'>+</div><div class='add'>+	enum fan_action			fan_todo[2];</div><div class='add'>+#define FAN_AMBIENT	0</div><div class='add'>+#define FAN_CPU		1</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct bbc_fan_control {</div><div class='add'>+	struct list_head		bp_list;</div><div class='add'>+	struct list_head		glob_list;</div><div class='add'>+</div><div class='add'>+	struct bbc_i2c_client 		*client;</div><div class='add'>+	int 				index;</div><div class='add'>+</div><div class='add'>+	int				psupply_fan_on;</div><div class='add'>+	int				cpu_fan_speed;</div><div class='add'>+	int				system_fan_speed;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define NUM_CHILDREN	8</div><div class='add'>+</div><div class='add'>+struct bbc_i2c_bus {</div><div class='add'>+	struct bbc_i2c_bus		*next;</div><div class='add'>+	int				index;</div><div class='add'>+	spinlock_t			lock;</div><div class='add'>+	void				__iomem *i2c_bussel_reg;</div><div class='add'>+	void				__iomem *i2c_control_regs;</div><div class='add'>+	unsigned char			own, clock;</div><div class='add'>+</div><div class='add'>+	wait_queue_head_t		wq;</div><div class='add'>+	volatile int			waiting;</div><div class='add'>+</div><div class='add'>+	struct list_head		temps;</div><div class='add'>+	struct list_head		fans;</div><div class='add'>+</div><div class='add'>+	struct of_device		*op;</div><div class='add'>+	struct {</div><div class='add'>+		struct of_device	*device;</div><div class='add'>+		int			client_claimed;</div><div class='add'>+	} devs[NUM_CHILDREN];</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> /* Probing and attachment. */</div><div class='del'>-extern struct linux_ebus_child *bbc_i2c_getdev(int);</div><div class='del'>-extern struct bbc_i2c_client *bbc_i2c_attach(struct linux_ebus_child *);</div><div class='add'>+extern struct of_device *bbc_i2c_getdev(struct bbc_i2c_bus *, int);</div><div class='add'>+extern struct bbc_i2c_client *bbc_i2c_attach(struct bbc_i2c_bus *bp, struct of_device *);</div><div class='ctx'> extern void bbc_i2c_detach(struct bbc_i2c_client *);</div><div class='ctx'> </div><div class='ctx'> /* Register read/write.  NOTE: Blocking! */</div><div class='head'>diff --git a/drivers/sbus/char/bpp.c b/drivers/sbus/char/bpp.c<br/>deleted file mode 100644<br/>index bba21e053a1b..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/sbus/char/bpp.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/sbus/char/bpp.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1055 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * drivers/sbus/char/bpp.c</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 1995 Picture Elements</div><div class='del'>- *      Stephen Williams (steve@icarus.com)</div><div class='del'>- *      Gus Baldauf (gbaldauf@ix.netcom.com)</div><div class='del'>- *</div><div class='del'>- * Linux/SPARC port by Peter Zaitcev.</div><div class='del'>- * Integration into SPARC tree by Tom Dyas.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/fs.h&gt;</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;linux/timer.h&gt;</div><div class='del'>-#include &lt;linux/ioport.h&gt;</div><div class='del'>-#include &lt;linux/major.h&gt;</div><div class='del'>-#include &lt;linux/smp_lock.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-</div><div class='del'>-#if defined(__i386__)</div><div class='del'>-# include &lt;asm/system.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#if defined(__sparc__)</div><div class='del'>-# include &lt;linux/init.h&gt;</div><div class='del'>-# include &lt;linux/delay.h&gt;         /* udelay() */</div><div class='del'>-</div><div class='del'>-# include &lt;asm/oplib.h&gt;           /* OpenProm Library */</div><div class='del'>-# include &lt;asm/sbus.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;asm/bpp.h&gt;</div><div class='del'>-</div><div class='del'>-#define BPP_PROBE_CODE 0x55</div><div class='del'>-#define BPP_DELAY 100</div><div class='del'>-</div><div class='del'>-static const unsigned  BPP_MAJOR = LP_MAJOR;</div><div class='del'>-static const char *bpp_dev_name = "bpp";</div><div class='del'>-</div><div class='del'>-/* When switching from compatibility to a mode where I can read, try</div><div class='del'>-   the following mode first. */</div><div class='del'>-</div><div class='del'>-/* const unsigned char DEFAULT_ECP = 0x10; */</div><div class='del'>-static const unsigned char DEFAULT_ECP = 0x30;</div><div class='del'>-static const unsigned char DEFAULT_NIBBLE = 0x00;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * These are 1284 time constraints, in units of jiffies.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static const unsigned long TIME_PSetup = 1;</div><div class='del'>-static const unsigned long TIME_PResponse = 6;</div><div class='del'>-static const unsigned long TIME_IDLE_LIMIT = 2000;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * One instance per supported subdevice...</div><div class='del'>- */</div><div class='del'>-# define BPP_NO 3</div><div class='del'>-</div><div class='del'>-enum IEEE_Mode { COMPATIBILITY, NIBBLE, ECP, ECP_RLE, EPP };</div><div class='del'>-</div><div class='del'>-struct inst {</div><div class='del'>-      unsigned present  : 1; /* True if the hardware exists */</div><div class='del'>-      unsigned enhanced : 1; /* True if the hardware in "enhanced" */</div><div class='del'>-      unsigned opened   : 1; /* True if the device is opened already */</div><div class='del'>-      unsigned run_flag : 1; /* True if waiting for a repeate byte */</div><div class='del'>-</div><div class='del'>-      unsigned char direction; /* 0 --&gt; out, 0x20 --&gt; IN */</div><div class='del'>-      unsigned char pp_state; /* State of host controlled pins. */</div><div class='del'>-      enum IEEE_Mode mode;</div><div class='del'>-</div><div class='del'>-      unsigned char run_length;</div><div class='del'>-      unsigned char repeat_byte;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct inst instances[BPP_NO];</div><div class='del'>-</div><div class='del'>-#if defined(__i386__)</div><div class='del'>-</div><div class='del'>-static const unsigned short base_addrs[BPP_NO] = { 0x278, 0x378, 0x3bc };</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * These are for data access.</div><div class='del'>- * Control lines accesses are hidden in set_bits() and get_bits().</div><div class='del'>- * The exception is the probe procedure, which is system-dependent.</div><div class='del'>- */</div><div class='del'>-#define bpp_outb_p(data, base)  outb_p((data), (base))</div><div class='del'>-#define bpp_inb(base)  inb(base)</div><div class='del'>-#define bpp_inb_p(base)  inb_p(base)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This method takes the pin values mask and sets the hardware pins to</div><div class='del'>- * the requested value: 1 == high voltage, 0 == low voltage. This</div><div class='del'>- * burries the annoying PC bit inversion and preserves the direction</div><div class='del'>- * flag.</div><div class='del'>- */</div><div class='del'>-static void set_pins(unsigned short pins, unsigned minor)</div><div class='del'>-{</div><div class='del'>-      unsigned char bits = instances[minor].direction;  /* == 0x20 */</div><div class='del'>-</div><div class='del'>-      if (! (pins &amp; BPP_PP_nStrobe))   bits |= 1;</div><div class='del'>-      if (! (pins &amp; BPP_PP_nAutoFd))   bits |= 2;</div><div class='del'>-      if (   pins &amp; BPP_PP_nInit)      bits |= 4;</div><div class='del'>-      if (! (pins &amp; BPP_PP_nSelectIn)) bits |= 8;</div><div class='del'>-</div><div class='del'>-      instances[minor].pp_state = bits;</div><div class='del'>-</div><div class='del'>-      outb_p(bits, base_addrs[minor]+2);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned short get_pins(unsigned minor)</div><div class='del'>-{</div><div class='del'>-      unsigned short bits = 0;</div><div class='del'>-</div><div class='del'>-      unsigned value = instances[minor].pp_state;</div><div class='del'>-      if (! (value &amp; 0x01)) bits |= BPP_PP_nStrobe;</div><div class='del'>-      if (! (value &amp; 0x02)) bits |= BPP_PP_nAutoFd;</div><div class='del'>-      if (value &amp; 0x04)     bits |= BPP_PP_nInit;</div><div class='del'>-      if (! (value &amp; 0x08)) bits |= BPP_PP_nSelectIn;</div><div class='del'>-</div><div class='del'>-      value = inb_p(base_addrs[minor]+1);</div><div class='del'>-      if (value &amp; 0x08)     bits |= BPP_GP_nFault;</div><div class='del'>-      if (value &amp; 0x10)     bits |= BPP_GP_Select;</div><div class='del'>-      if (value &amp; 0x20)     bits |= BPP_GP_PError;</div><div class='del'>-      if (value &amp; 0x40)     bits |= BPP_GP_nAck;</div><div class='del'>-      if (! (value &amp; 0x80)) bits |= BPP_GP_Busy;</div><div class='del'>-</div><div class='del'>-      return bits;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* __i386__ */</div><div class='del'>-</div><div class='del'>-#if defined(__sparc__)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Register block</div><div class='del'>- */</div><div class='del'>-      /* DMA registers */</div><div class='del'>-#define BPP_CSR      0x00</div><div class='del'>-#define BPP_ADDR     0x04</div><div class='del'>-#define BPP_BCNT     0x08</div><div class='del'>-#define BPP_TST_CSR  0x0C</div><div class='del'>-      /* Parallel Port registers */</div><div class='del'>-#define BPP_HCR      0x10</div><div class='del'>-#define BPP_OCR      0x12</div><div class='del'>-#define BPP_DR       0x14</div><div class='del'>-#define BPP_TCR      0x15</div><div class='del'>-#define BPP_OR       0x16</div><div class='del'>-#define BPP_IR       0x17</div><div class='del'>-#define BPP_ICR      0x18</div><div class='del'>-#define BPP_SIZE     0x1A</div><div class='del'>-</div><div class='del'>-/* BPP_CSR.  Bits of type RW1 are cleared with writing '1'. */</div><div class='del'>-#define P_DEV_ID_MASK   0xf0000000      /* R   */</div><div class='del'>-#define P_DEV_ID_ZEBRA  0x40000000</div><div class='del'>-#define P_DEV_ID_L64854 0xa0000000      /*      == NCR 89C100+89C105. Pity. */</div><div class='del'>-#define P_NA_LOADED     0x08000000      /* R    NA wirtten but was not used */</div><div class='del'>-#define P_A_LOADED      0x04000000      /* R    */</div><div class='del'>-#define P_DMA_ON        0x02000000      /* R    DMA is not disabled */</div><div class='del'>-#define P_EN_NEXT       0x01000000      /* RW   */</div><div class='del'>-#define P_TCI_DIS       0x00800000      /* RW   TCI forbidden from interrupts */</div><div class='del'>-#define P_DIAG          0x00100000      /* RW   Disables draining and resetting</div><div class='del'>-                                                of P-FIFO on loading of P_ADDR*/</div><div class='del'>-#define P_BURST_SIZE    0x000c0000      /* RW   SBus burst size */</div><div class='del'>-#define P_BURST_8       0x00000000</div><div class='del'>-#define P_BURST_4       0x00040000</div><div class='del'>-#define P_BURST_1       0x00080000      /*      "No burst" write */</div><div class='del'>-#define P_TC            0x00004000      /* RW1  Term Count, can be cleared when</div><div class='del'>-                                           P_EN_NEXT=1 */</div><div class='del'>-#define P_EN_CNT        0x00002000      /* RW   */</div><div class='del'>-#define P_EN_DMA        0x00000200      /* RW   */</div><div class='del'>-#define P_WRITE         0x00000100      /* R    DMA dir, 1=to ram, 0=to port */</div><div class='del'>-#define P_RESET         0x00000080      /* RW   */</div><div class='del'>-#define P_SLAVE_ERR     0x00000040      /* RW1  Access size error */</div><div class='del'>-#define P_INVALIDATE    0x00000020      /* W    Drop P-FIFO */</div><div class='del'>-#define P_INT_EN        0x00000010      /* RW   OK to P_INT_PEND||P_ERR_PEND */</div><div class='del'>-#define P_DRAINING      0x0000000c      /* R    P-FIFO is draining to memory */</div><div class='del'>-#define P_ERR_PEND      0x00000002      /* R    */</div><div class='del'>-#define P_INT_PEND      0x00000001      /* R    */</div><div class='del'>-</div><div class='del'>-/* BPP_HCR. Time is in increments of SBus clock. */</div><div class='del'>-#define P_HCR_TEST      0x8000      /* Allows buried counters to be read */</div><div class='del'>-#define P_HCR_DSW       0x7f00      /* Data strobe width (in ticks) */</div><div class='del'>-#define P_HCR_DDS       0x007f      /* Data setup before strobe (in ticks) */</div><div class='del'>-</div><div class='del'>-/* BPP_OCR. */</div><div class='del'>-#define P_OCR_MEM_CLR   0x8000</div><div class='del'>-#define P_OCR_DATA_SRC  0x4000      /* )                  */</div><div class='del'>-#define P_OCR_DS_DSEL   0x2000      /* )  Bidirectional      */</div><div class='del'>-#define P_OCR_BUSY_DSEL 0x1000      /* )    selects            */</div><div class='del'>-#define P_OCR_ACK_DSEL  0x0800      /* )                  */</div><div class='del'>-#define P_OCR_EN_DIAG   0x0400</div><div class='del'>-#define P_OCR_BUSY_OP   0x0200      /* Busy operation */</div><div class='del'>-#define P_OCR_ACK_OP    0x0100      /* Ack operation */</div><div class='del'>-#define P_OCR_SRST      0x0080      /* Reset state machines. Not selfcleaning. */</div><div class='del'>-#define P_OCR_IDLE      0x0008      /* PP data transfer state machine is idle */</div><div class='del'>-#define P_OCR_V_ILCK    0x0002      /* Versatec faded. Zebra only. */</div><div class='del'>-#define P_OCR_EN_VER    0x0001      /* Enable Versatec (0 - enable). Zebra only. */</div><div class='del'>-</div><div class='del'>-/* BPP_TCR */</div><div class='del'>-#define P_TCR_DIR       0x08</div><div class='del'>-#define P_TCR_BUSY      0x04</div><div class='del'>-#define P_TCR_ACK       0x02</div><div class='del'>-#define P_TCR_DS        0x01        /* Strobe */</div><div class='del'>-</div><div class='del'>-/* BPP_OR */</div><div class='del'>-#define P_OR_V3         0x20        /* )                 */</div><div class='del'>-#define P_OR_V2         0x10        /* ) on Zebra only   */</div><div class='del'>-#define P_OR_V1         0x08        /* )                 */</div><div class='del'>-#define P_OR_INIT       0x04</div><div class='del'>-#define P_OR_AFXN       0x02        /* Auto Feed */</div><div class='del'>-#define P_OR_SLCT_IN    0x01</div><div class='del'>-</div><div class='del'>-/* BPP_IR */</div><div class='del'>-#define P_IR_PE         0x04</div><div class='del'>-#define P_IR_SLCT       0x02</div><div class='del'>-#define P_IR_ERR        0x01</div><div class='del'>-</div><div class='del'>-/* BPP_ICR */</div><div class='del'>-#define P_DS_IRQ        0x8000      /* RW1  */</div><div class='del'>-#define P_ACK_IRQ       0x4000      /* RW1  */</div><div class='del'>-#define P_BUSY_IRQ      0x2000      /* RW1  */</div><div class='del'>-#define P_PE_IRQ        0x1000      /* RW1  */</div><div class='del'>-#define P_SLCT_IRQ      0x0800      /* RW1  */</div><div class='del'>-#define P_ERR_IRQ       0x0400      /* RW1  */</div><div class='del'>-#define P_DS_IRQ_EN     0x0200      /* RW   Always on rising edge */</div><div class='del'>-#define P_ACK_IRQ_EN    0x0100      /* RW   Always on rising edge */</div><div class='del'>-#define P_BUSY_IRP      0x0080      /* RW   1= rising edge */</div><div class='del'>-#define P_BUSY_IRQ_EN   0x0040      /* RW   */</div><div class='del'>-#define P_PE_IRP        0x0020      /* RW   1= rising edge */</div><div class='del'>-#define P_PE_IRQ_EN     0x0010      /* RW   */</div><div class='del'>-#define P_SLCT_IRP      0x0008      /* RW   1= rising edge */</div><div class='del'>-#define P_SLCT_IRQ_EN   0x0004      /* RW   */</div><div class='del'>-#define P_ERR_IRP       0x0002      /* RW1  1= rising edge */</div><div class='del'>-#define P_ERR_IRQ_EN    0x0001      /* RW   */</div><div class='del'>-</div><div class='del'>-static void __iomem *base_addrs[BPP_NO];</div><div class='del'>-</div><div class='del'>-#define bpp_outb_p(data, base)	sbus_writeb(data, (base) + BPP_DR)</div><div class='del'>-#define bpp_inb_p(base)		sbus_readb((base) + BPP_DR)</div><div class='del'>-#define bpp_inb(base)		sbus_readb((base) + BPP_DR)</div><div class='del'>-</div><div class='del'>-static void set_pins(unsigned short pins, unsigned minor)</div><div class='del'>-{</div><div class='del'>-      void __iomem *base = base_addrs[minor];</div><div class='del'>-      unsigned char bits_tcr = 0, bits_or = 0;</div><div class='del'>-</div><div class='del'>-      if (instances[minor].direction &amp; 0x20) bits_tcr |= P_TCR_DIR;</div><div class='del'>-      if (   pins &amp; BPP_PP_nStrobe)          bits_tcr |= P_TCR_DS;</div><div class='del'>-</div><div class='del'>-      if (   pins &amp; BPP_PP_nAutoFd)          bits_or |= P_OR_AFXN;</div><div class='del'>-      if (! (pins &amp; BPP_PP_nInit))           bits_or |= P_OR_INIT;</div><div class='del'>-      if (! (pins &amp; BPP_PP_nSelectIn))       bits_or |= P_OR_SLCT_IN;</div><div class='del'>-</div><div class='del'>-      sbus_writeb(bits_or, base + BPP_OR);</div><div class='del'>-      sbus_writeb(bits_tcr, base + BPP_TCR);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * i386 people read output pins from a software image.</div><div class='del'>- * We may get them back from hardware.</div><div class='del'>- * Again, inversion of pins must he buried here.</div><div class='del'>- */</div><div class='del'>-static unsigned short get_pins(unsigned minor)</div><div class='del'>-{</div><div class='del'>-      void __iomem *base = base_addrs[minor];</div><div class='del'>-      unsigned short bits = 0;</div><div class='del'>-      unsigned value_tcr = sbus_readb(base + BPP_TCR);</div><div class='del'>-      unsigned value_ir = sbus_readb(base + BPP_IR);</div><div class='del'>-      unsigned value_or = sbus_readb(base + BPP_OR);</div><div class='del'>-</div><div class='del'>-      if (value_tcr &amp; P_TCR_DS)         bits |= BPP_PP_nStrobe;</div><div class='del'>-      if (value_or &amp; P_OR_AFXN)         bits |= BPP_PP_nAutoFd;</div><div class='del'>-      if (! (value_or &amp; P_OR_INIT))     bits |= BPP_PP_nInit;</div><div class='del'>-      if (! (value_or &amp; P_OR_SLCT_IN))  bits |= BPP_PP_nSelectIn;</div><div class='del'>-</div><div class='del'>-      if (value_ir &amp; P_IR_ERR)          bits |= BPP_GP_nFault;</div><div class='del'>-      if (! (value_ir &amp; P_IR_SLCT))     bits |= BPP_GP_Select;</div><div class='del'>-      if (! (value_ir &amp; P_IR_PE))       bits |= BPP_GP_PError;</div><div class='del'>-      if (! (value_tcr &amp; P_TCR_ACK))    bits |= BPP_GP_nAck;</div><div class='del'>-      if (value_tcr &amp; P_TCR_BUSY)       bits |= BPP_GP_Busy;</div><div class='del'>-</div><div class='del'>-      return bits;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* __sparc__ */</div><div class='del'>-</div><div class='del'>-static void snooze(unsigned long snooze_time, unsigned minor)</div><div class='del'>-{</div><div class='del'>-	schedule_timeout_uninterruptible(snooze_time + 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int wait_for(unsigned short set, unsigned short clr,</div><div class='del'>-               unsigned long delay, unsigned minor)</div><div class='del'>-{</div><div class='del'>-      unsigned short pins = get_pins(minor);</div><div class='del'>-</div><div class='del'>-      unsigned long extime = 0;</div><div class='del'>-</div><div class='del'>-      /*</div><div class='del'>-       * Try a real fast scan for the first jiffy, in case the device</div><div class='del'>-       * responds real good. The first while loop guesses an expire</div><div class='del'>-       * time accounting for possible wraparound of jiffies.</div><div class='del'>-       */</div><div class='del'>-      while (time_after_eq(jiffies, extime)) extime = jiffies + 1;</div><div class='del'>-      while ( (time_before(jiffies, extime))</div><div class='del'>-              &amp;&amp; (((pins &amp; set) != set) || ((pins &amp; clr) != 0)) ) {</div><div class='del'>-            pins = get_pins(minor);</div><div class='del'>-      }</div><div class='del'>-</div><div class='del'>-      delay -= 1;</div><div class='del'>-</div><div class='del'>-      /*</div><div class='del'>-       * If my delay expired or the pins are still not where I want</div><div class='del'>-       * them, then resort to using the timer and greatly reduce my</div><div class='del'>-       * sample rate. If the peripheral is going to be slow, this will</div><div class='del'>-       * give the CPU up to some more worthy process.</div><div class='del'>-       */</div><div class='del'>-      while ( delay &amp;&amp; (((pins &amp; set) != set) || ((pins &amp; clr) != 0)) ) {</div><div class='del'>-</div><div class='del'>-            snooze(1, minor);</div><div class='del'>-            pins = get_pins(minor);</div><div class='del'>-            delay -= 1;</div><div class='del'>-      }</div><div class='del'>-</div><div class='del'>-      if (delay == 0) return -1;</div><div class='del'>-      else return pins;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Return ZERO(0) If the negotiation succeeds, an errno otherwise. An</div><div class='del'>- * errno means something broke, and I do not yet know how to fix it.</div><div class='del'>- */</div><div class='del'>-static int negotiate(unsigned char mode, unsigned minor)</div><div class='del'>-{</div><div class='del'>-      int rc;</div><div class='del'>-      unsigned short pins = get_pins(minor);</div><div class='del'>-      if (pins &amp; BPP_PP_nSelectIn) return -EIO;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-        /* Event 0: Write the mode to the data lines */</div><div class='del'>-      bpp_outb_p(mode, base_addrs[minor]);</div><div class='del'>-</div><div class='del'>-      snooze(TIME_PSetup, minor);</div><div class='del'>-</div><div class='del'>-        /* Event 1: Strobe the mode code into the peripheral */</div><div class='del'>-      set_pins(BPP_PP_nSelectIn|BPP_PP_nStrobe|BPP_PP_nInit, minor);</div><div class='del'>-</div><div class='del'>-        /* Wait for Event 2: Peripheral responds as a 1284 device. */</div><div class='del'>-      rc = wait_for(BPP_GP_PError|BPP_GP_Select|BPP_GP_nFault,</div><div class='del'>-                BPP_GP_nAck,</div><div class='del'>-                TIME_PResponse,</div><div class='del'>-                minor);</div><div class='del'>-</div><div class='del'>-      if (rc == -1) return -ETIMEDOUT;</div><div class='del'>-</div><div class='del'>-        /* Event 3: latch extensibility request */</div><div class='del'>-      set_pins(BPP_PP_nSelectIn|BPP_PP_nInit, minor);</div><div class='del'>-</div><div class='del'>-        /* ... quick nap while peripheral ponders the byte i'm sending...*/</div><div class='del'>-      snooze(1, minor);</div><div class='del'>-</div><div class='del'>-        /* Event 4: restore strobe, to ACK peripheral's response. */</div><div class='del'>-      set_pins(BPP_PP_nSelectIn|BPP_PP_nAutoFd|BPP_PP_nStrobe|BPP_PP_nInit, minor);</div><div class='del'>-</div><div class='del'>-        /* Wait for Event 6: Peripheral latches response bits */</div><div class='del'>-      rc = wait_for(BPP_GP_nAck, 0, TIME_PSetup+TIME_PResponse, minor);</div><div class='del'>-      if (rc == -1) return -EIO;</div><div class='del'>-</div><div class='del'>-        /* A 1284 device cannot refuse nibble mode */</div><div class='del'>-      if (mode == DEFAULT_NIBBLE) return 0;</div><div class='del'>-</div><div class='del'>-      if (pins &amp; BPP_GP_Select) return 0;</div><div class='del'>-</div><div class='del'>-      return -EPROTONOSUPPORT;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int terminate(unsigned minor)</div><div class='del'>-{</div><div class='del'>-      int rc;</div><div class='del'>-</div><div class='del'>-        /* Event 22: Request termination of 1284 mode */</div><div class='del'>-      set_pins(BPP_PP_nAutoFd|BPP_PP_nStrobe|BPP_PP_nInit, minor);</div><div class='del'>-</div><div class='del'>-        /* Wait for Events 23 and 24: ACK termination request. */</div><div class='del'>-      rc = wait_for(BPP_GP_Busy|BPP_GP_nFault,</div><div class='del'>-                BPP_GP_nAck,</div><div class='del'>-                TIME_PSetup+TIME_PResponse,</div><div class='del'>-                minor);</div><div class='del'>-</div><div class='del'>-      instances[minor].direction = 0;</div><div class='del'>-      instances[minor].mode = COMPATIBILITY;</div><div class='del'>-</div><div class='del'>-      if (rc == -1) {</div><div class='del'>-          return -EIO;</div><div class='del'>-      }</div><div class='del'>-</div><div class='del'>-        /* Event 25: Handshake by lowering nAutoFd */</div><div class='del'>-      set_pins(BPP_PP_nStrobe|BPP_PP_nInit, minor);</div><div class='del'>-</div><div class='del'>-        /* Event 26: Peripheral wiggles lines... */</div><div class='del'>-</div><div class='del'>-        /* Event 27: Peripheral sets nAck HIGH to ack handshake */</div><div class='del'>-      rc = wait_for(BPP_GP_nAck, 0, TIME_PResponse, minor);</div><div class='del'>-      if (rc == -1) {</div><div class='del'>-          set_pins(BPP_PP_nAutoFd|BPP_PP_nStrobe|BPP_PP_nInit, minor);</div><div class='del'>-          return -EIO;</div><div class='del'>-      }</div><div class='del'>-</div><div class='del'>-        /* Event 28: Finish phase by raising nAutoFd */</div><div class='del'>-      set_pins(BPP_PP_nAutoFd|BPP_PP_nStrobe|BPP_PP_nInit, minor);</div><div class='del'>-</div><div class='del'>-      return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static DEFINE_SPINLOCK(bpp_open_lock);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Allow only one process to open the device at a time.</div><div class='del'>- */</div><div class='del'>-static int bpp_open(struct inode *inode, struct file *f)</div><div class='del'>-{</div><div class='del'>-      unsigned minor = iminor(inode);</div><div class='del'>-      int ret;</div><div class='del'>-</div><div class='del'>-      lock_kernel();</div><div class='del'>-      spin_lock(&amp;bpp_open_lock);</div><div class='del'>-      ret = 0;</div><div class='del'>-      if (minor &gt;= BPP_NO) {</div><div class='del'>-	      ret = -ENODEV;</div><div class='del'>-      } else {</div><div class='del'>-	      if (! instances[minor].present) {</div><div class='del'>-		      ret = -ENODEV;</div><div class='del'>-	      } else {</div><div class='del'>-		      if (instances[minor].opened) </div><div class='del'>-			      ret = -EBUSY;</div><div class='del'>-		      else</div><div class='del'>-			      instances[minor].opened = 1;</div><div class='del'>-	      }</div><div class='del'>-      }</div><div class='del'>-      spin_unlock(&amp;bpp_open_lock);</div><div class='del'>-      unlock_kernel();</div><div class='del'>-</div><div class='del'>-      return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * When the process closes the device, this method is called to clean</div><div class='del'>- * up and reset the hardware. Always leave the device in compatibility</div><div class='del'>- * mode as this is a reasonable place to clean up from messes made by</div><div class='del'>- * ioctls, or other mayhem.</div><div class='del'>- */</div><div class='del'>-static int bpp_release(struct inode *inode, struct file *f)</div><div class='del'>-{</div><div class='del'>-      unsigned minor = iminor(inode);</div><div class='del'>-</div><div class='del'>-      spin_lock(&amp;bpp_open_lock);</div><div class='del'>-      instances[minor].opened = 0;</div><div class='del'>-</div><div class='del'>-      if (instances[minor].mode != COMPATIBILITY)</div><div class='del'>-	      terminate(minor);</div><div class='del'>-</div><div class='del'>-      spin_unlock(&amp;bpp_open_lock);</div><div class='del'>-</div><div class='del'>-      return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static long read_nibble(unsigned minor, char __user *c, unsigned long cnt)</div><div class='del'>-{</div><div class='del'>-      unsigned long remaining = cnt;</div><div class='del'>-      long rc;</div><div class='del'>-</div><div class='del'>-      while (remaining &gt; 0) {</div><div class='del'>-          unsigned char byte = 0;</div><div class='del'>-          int pins;</div><div class='del'>-</div><div class='del'>-          /* Event 7: request nibble */</div><div class='del'>-          set_pins(BPP_PP_nSelectIn|BPP_PP_nStrobe, minor);</div><div class='del'>-</div><div class='del'>-          /* Wait for event 9: Peripher strobes first nibble */</div><div class='del'>-          pins = wait_for(0, BPP_GP_nAck, TIME_IDLE_LIMIT, minor);</div><div class='del'>-          if (pins == -1) return -ETIMEDOUT;</div><div class='del'>-</div><div class='del'>-          /* Event 10: I handshake nibble */</div><div class='del'>-          set_pins(BPP_PP_nSelectIn|BPP_PP_nStrobe|BPP_PP_nAutoFd, minor);</div><div class='del'>-          if (pins &amp; BPP_GP_nFault) byte |= 0x01;</div><div class='del'>-          if (pins &amp; BPP_GP_Select) byte |= 0x02;</div><div class='del'>-          if (pins &amp; BPP_GP_PError) byte |= 0x04;</div><div class='del'>-          if (pins &amp; BPP_GP_Busy)   byte |= 0x08;</div><div class='del'>-</div><div class='del'>-          /* Wait for event 11: Peripheral handshakes nibble */</div><div class='del'>-          rc = wait_for(BPP_GP_nAck, 0, TIME_PResponse, minor);</div><div class='del'>-</div><div class='del'>-          /* Event 7: request nibble */</div><div class='del'>-          set_pins(BPP_PP_nSelectIn|BPP_PP_nStrobe, minor);</div><div class='del'>-</div><div class='del'>-          /* Wait for event 9: Peripher strobes first nibble */</div><div class='del'>-          pins = wait_for(0, BPP_GP_nAck, TIME_PResponse, minor);</div><div class='del'>-          if (rc == -1) return -ETIMEDOUT;</div><div class='del'>-</div><div class='del'>-          /* Event 10: I handshake nibble */</div><div class='del'>-          set_pins(BPP_PP_nSelectIn|BPP_PP_nStrobe|BPP_PP_nAutoFd, minor);</div><div class='del'>-          if (pins &amp; BPP_GP_nFault) byte |= 0x10;</div><div class='del'>-          if (pins &amp; BPP_GP_Select) byte |= 0x20;</div><div class='del'>-          if (pins &amp; BPP_GP_PError) byte |= 0x40;</div><div class='del'>-          if (pins &amp; BPP_GP_Busy)   byte |= 0x80;</div><div class='del'>-</div><div class='del'>-          if (put_user(byte, c))</div><div class='del'>-		  return -EFAULT;</div><div class='del'>-          c += 1;</div><div class='del'>-          remaining -= 1;</div><div class='del'>-</div><div class='del'>-          /* Wait for event 11: Peripheral handshakes nibble */</div><div class='del'>-          rc = wait_for(BPP_GP_nAck, 0, TIME_PResponse, minor);</div><div class='del'>-          if (rc == -1) return -EIO;</div><div class='del'>-      }</div><div class='del'>-</div><div class='del'>-      return cnt - remaining;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static long read_ecp(unsigned minor, char __user *c, unsigned long cnt)</div><div class='del'>-{</div><div class='del'>-      unsigned long remaining;</div><div class='del'>-      long rc;</div><div class='del'>-</div><div class='del'>-        /* Turn ECP mode from forward to reverse if needed. */</div><div class='del'>-      if (! instances[minor].direction) {</div><div class='del'>-          unsigned short pins = get_pins(minor);</div><div class='del'>-</div><div class='del'>-            /* Event 38: Turn the bus around */</div><div class='del'>-          instances[minor].direction = 0x20;</div><div class='del'>-          pins &amp;= ~BPP_PP_nAutoFd;</div><div class='del'>-          set_pins(pins, minor);</div><div class='del'>-</div><div class='del'>-            /* Event 39: Set pins for reverse mode. */</div><div class='del'>-          snooze(TIME_PSetup, minor);</div><div class='del'>-          set_pins(BPP_PP_nStrobe|BPP_PP_nSelectIn, minor);</div><div class='del'>-</div><div class='del'>-            /* Wait for event 40: Peripheral ready to be strobed */</div><div class='del'>-          rc = wait_for(0, BPP_GP_PError, TIME_PResponse, minor);</div><div class='del'>-          if (rc == -1) return -ETIMEDOUT;</div><div class='del'>-      }</div><div class='del'>-</div><div class='del'>-      remaining = cnt;</div><div class='del'>-</div><div class='del'>-      while (remaining &gt; 0) {</div><div class='del'>-</div><div class='del'>-            /* If there is a run length for a repeated byte, repeat */</div><div class='del'>-            /* that byte a few times. */</div><div class='del'>-          if (instances[minor].run_length &amp;&amp; !instances[minor].run_flag) {</div><div class='del'>-</div><div class='del'>-              char buffer[128];</div><div class='del'>-              unsigned idx;</div><div class='del'>-              unsigned repeat = remaining &lt; instances[minor].run_length</div><div class='del'>-                                     ? remaining</div><div class='del'>-                               : instances[minor].run_length;</div><div class='del'>-</div><div class='del'>-              for (idx = 0 ;  idx &lt; repeat ;  idx += 1)</div><div class='del'>-                buffer[idx] = instances[minor].repeat_byte;</div><div class='del'>-</div><div class='del'>-              if (copy_to_user(c, buffer, repeat))</div><div class='del'>-		      return -EFAULT;</div><div class='del'>-              remaining -= repeat;</div><div class='del'>-              c += repeat;</div><div class='del'>-              instances[minor].run_length -= repeat;</div><div class='del'>-          }</div><div class='del'>-</div><div class='del'>-          if (remaining == 0) break;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-            /* Wait for Event 43: Data active on the bus. */</div><div class='del'>-          rc = wait_for(0, BPP_GP_nAck, TIME_IDLE_LIMIT, minor);</div><div class='del'>-          if (rc == -1) break;</div><div class='del'>-</div><div class='del'>-          if (rc &amp; BPP_GP_Busy) {</div><div class='del'>-                /* OK, this is data. read it in. */</div><div class='del'>-              unsigned char byte = bpp_inb(base_addrs[minor]);</div><div class='del'>-              if (put_user(byte, c))</div><div class='del'>-		      return -EFAULT;</div><div class='del'>-              c += 1;</div><div class='del'>-              remaining -= 1;</div><div class='del'>-</div><div class='del'>-              if (instances[minor].run_flag) {</div><div class='del'>-                  instances[minor].repeat_byte = byte;</div><div class='del'>-                  instances[minor].run_flag = 0;</div><div class='del'>-              }</div><div class='del'>-</div><div class='del'>-          } else {</div><div class='del'>-              unsigned char byte = bpp_inb(base_addrs[minor]);</div><div class='del'>-              if (byte &amp; 0x80) {</div><div class='del'>-                  printk("bpp%d: "</div><div class='del'>-                         "Ignoring ECP channel %u from device.\n",</div><div class='del'>-                         minor, byte &amp; 0x7f);</div><div class='del'>-              } else {</div><div class='del'>-                  instances[minor].run_length = byte;</div><div class='del'>-                  instances[minor].run_flag = 1;</div><div class='del'>-              }</div><div class='del'>-          }</div><div class='del'>-</div><div class='del'>-            /* Event 44: I got it. */</div><div class='del'>-          set_pins(BPP_PP_nStrobe|BPP_PP_nAutoFd|BPP_PP_nSelectIn, minor);</div><div class='del'>-</div><div class='del'>-            /* Wait for event 45: peripheral handshake */</div><div class='del'>-          rc = wait_for(BPP_GP_nAck, 0, TIME_PResponse, minor);</div><div class='del'>-          if (rc == -1) return -ETIMEDOUT;</div><div class='del'>-</div><div class='del'>-             /* Event 46: Finish handshake */</div><div class='del'>-          set_pins(BPP_PP_nStrobe|BPP_PP_nSelectIn, minor);</div><div class='del'>-</div><div class='del'>-      }</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-      return cnt - remaining;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t bpp_read(struct file *f, char __user *c, size_t cnt, loff_t * ppos)</div><div class='del'>-{</div><div class='del'>-      long rc;</div><div class='del'>-      unsigned minor = iminor(f-&gt;f_path.dentry-&gt;d_inode);</div><div class='del'>-      if (minor &gt;= BPP_NO) return -ENODEV;</div><div class='del'>-      if (!instances[minor].present) return -ENODEV;</div><div class='del'>-</div><div class='del'>-      switch (instances[minor].mode) {</div><div class='del'>-</div><div class='del'>-        default:</div><div class='del'>-          if (instances[minor].mode != COMPATIBILITY)</div><div class='del'>-            terminate(minor);</div><div class='del'>-</div><div class='del'>-          if (instances[minor].enhanced) {</div><div class='del'>-              /* For now, do all reads with ECP-RLE mode */</div><div class='del'>-              unsigned short pins;</div><div class='del'>-</div><div class='del'>-              rc = negotiate(DEFAULT_ECP, minor);</div><div class='del'>-              if (rc &lt; 0) break;</div><div class='del'>-</div><div class='del'>-              instances[minor].mode = ECP_RLE;</div><div class='del'>-</div><div class='del'>-              /* Event 30: set nAutoFd low to setup for ECP mode */</div><div class='del'>-              pins = get_pins(minor);</div><div class='del'>-              pins &amp;= ~BPP_PP_nAutoFd;</div><div class='del'>-              set_pins(pins, minor);</div><div class='del'>-</div><div class='del'>-              /* Wait for Event 31: peripheral ready */</div><div class='del'>-              rc = wait_for(BPP_GP_PError, 0, TIME_PResponse, minor);</div><div class='del'>-              if (rc == -1) return -ETIMEDOUT;</div><div class='del'>-</div><div class='del'>-              rc = read_ecp(minor, c, cnt);</div><div class='del'>-</div><div class='del'>-          } else {</div><div class='del'>-              rc = negotiate(DEFAULT_NIBBLE, minor);</div><div class='del'>-              if (rc &lt; 0) break;</div><div class='del'>-</div><div class='del'>-              instances[minor].mode = NIBBLE;</div><div class='del'>-</div><div class='del'>-              rc = read_nibble(minor, c, cnt);</div><div class='del'>-          }</div><div class='del'>-          break;</div><div class='del'>-</div><div class='del'>-        case NIBBLE:</div><div class='del'>-          rc = read_nibble(minor, c, cnt);</div><div class='del'>-          break;</div><div class='del'>-</div><div class='del'>-        case ECP:</div><div class='del'>-        case ECP_RLE:</div><div class='del'>-          rc = read_ecp(minor, c, cnt);</div><div class='del'>-          break;</div><div class='del'>-</div><div class='del'>-      }</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-      return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Compatibility mode handshaking is a matter of writing data,</div><div class='del'>- * strobing it, and waiting for the printer to stop being busy.</div><div class='del'>- */</div><div class='del'>-static long write_compat(unsigned minor, const char __user *c, unsigned long cnt)</div><div class='del'>-{</div><div class='del'>-      long rc;</div><div class='del'>-      unsigned short pins = get_pins(minor);</div><div class='del'>-</div><div class='del'>-      unsigned long remaining = cnt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-      while (remaining &gt; 0) {</div><div class='del'>-            unsigned char byte;</div><div class='del'>-</div><div class='del'>-            if (get_user(byte, c))</div><div class='del'>-		    return -EFAULT;</div><div class='del'>-            c += 1;</div><div class='del'>-</div><div class='del'>-            rc = wait_for(BPP_GP_nAck, BPP_GP_Busy, TIME_IDLE_LIMIT, minor);</div><div class='del'>-            if (rc == -1) return -ETIMEDOUT;</div><div class='del'>-</div><div class='del'>-            bpp_outb_p(byte, base_addrs[minor]);</div><div class='del'>-            remaining -= 1;</div><div class='del'>-          /* snooze(1, minor); */</div><div class='del'>-</div><div class='del'>-          pins &amp;= ~BPP_PP_nStrobe;</div><div class='del'>-          set_pins(pins, minor);</div><div class='del'>-</div><div class='del'>-          rc = wait_for(BPP_GP_Busy, 0, TIME_PResponse, minor);</div><div class='del'>-</div><div class='del'>-          pins |= BPP_PP_nStrobe;</div><div class='del'>-          set_pins(pins, minor);</div><div class='del'>-      }</div><div class='del'>-</div><div class='del'>-      return cnt - remaining;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Write data using ECP mode. Watch out that the port may be set up</div><div class='del'>- * for reading. If so, turn the port around.</div><div class='del'>- */</div><div class='del'>-static long write_ecp(unsigned minor, const char __user *c, unsigned long cnt)</div><div class='del'>-{</div><div class='del'>-      unsigned short pins = get_pins(minor);</div><div class='del'>-      unsigned long remaining = cnt;</div><div class='del'>-</div><div class='del'>-      if (instances[minor].direction) {</div><div class='del'>-          int rc;</div><div class='del'>-</div><div class='del'>-            /* Event 47 Request bus be turned around */</div><div class='del'>-          pins |= BPP_PP_nInit;</div><div class='del'>-          set_pins(pins, minor);</div><div class='del'>-</div><div class='del'>-            /* Wait for Event 49: Peripheral relinquished bus */</div><div class='del'>-          rc = wait_for(BPP_GP_PError, 0, TIME_PResponse, minor);</div><div class='del'>-</div><div class='del'>-          pins |= BPP_PP_nAutoFd;</div><div class='del'>-          instances[minor].direction = 0;</div><div class='del'>-          set_pins(pins, minor);</div><div class='del'>-      }</div><div class='del'>-</div><div class='del'>-      while (remaining &gt; 0) {</div><div class='del'>-          unsigned char byte;</div><div class='del'>-          int rc;</div><div class='del'>-</div><div class='del'>-          if (get_user(byte, c))</div><div class='del'>-		  return -EFAULT;</div><div class='del'>-</div><div class='del'>-          rc = wait_for(0, BPP_GP_Busy, TIME_PResponse, minor);</div><div class='del'>-          if (rc == -1) return -ETIMEDOUT;</div><div class='del'>-</div><div class='del'>-          c += 1;</div><div class='del'>-</div><div class='del'>-          bpp_outb_p(byte, base_addrs[minor]);</div><div class='del'>-</div><div class='del'>-          pins &amp;= ~BPP_PP_nStrobe;</div><div class='del'>-          set_pins(pins, minor);</div><div class='del'>-</div><div class='del'>-          pins |= BPP_PP_nStrobe;</div><div class='del'>-          rc = wait_for(BPP_GP_Busy, 0, TIME_PResponse, minor);</div><div class='del'>-          if (rc == -1) return -EIO;</div><div class='del'>-</div><div class='del'>-          set_pins(pins, minor);</div><div class='del'>-      }</div><div class='del'>-</div><div class='del'>-      return cnt - remaining;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Write to the peripheral. Be sensitive of the current mode. If I'm</div><div class='del'>- * in a mode that can be turned around (ECP) then just do</div><div class='del'>- * that. Otherwise, terminate and do my writing in compat mode. This</div><div class='del'>- * is the safest course as any device can handle it.</div><div class='del'>- */</div><div class='del'>-static ssize_t bpp_write(struct file *f, const char __user *c, size_t cnt, loff_t * ppos)</div><div class='del'>-{</div><div class='del'>-      long errno = 0;</div><div class='del'>-      unsigned minor = iminor(f-&gt;f_path.dentry-&gt;d_inode);</div><div class='del'>-      if (minor &gt;= BPP_NO) return -ENODEV;</div><div class='del'>-      if (!instances[minor].present) return -ENODEV;</div><div class='del'>-</div><div class='del'>-      switch (instances[minor].mode) {</div><div class='del'>-</div><div class='del'>-        case ECP:</div><div class='del'>-        case ECP_RLE:</div><div class='del'>-          errno = write_ecp(minor, c, cnt);</div><div class='del'>-          break;</div><div class='del'>-        case COMPATIBILITY:</div><div class='del'>-          errno = write_compat(minor, c, cnt);</div><div class='del'>-          break;</div><div class='del'>-        default:</div><div class='del'>-          terminate(minor);</div><div class='del'>-          errno = write_compat(minor, c, cnt);</div><div class='del'>-      }</div><div class='del'>-</div><div class='del'>-      return errno;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bpp_ioctl(struct inode *inode, struct file *f, unsigned int cmd,</div><div class='del'>-		 unsigned long arg)</div><div class='del'>-{</div><div class='del'>-      int errno = 0;</div><div class='del'>-</div><div class='del'>-      unsigned minor = iminor(inode);</div><div class='del'>-      if (minor &gt;= BPP_NO) return -ENODEV;</div><div class='del'>-      if (!instances[minor].present) return -ENODEV;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-      switch (cmd) {</div><div class='del'>-</div><div class='del'>-        case BPP_PUT_PINS:</div><div class='del'>-          set_pins(arg, minor);</div><div class='del'>-          break;</div><div class='del'>-</div><div class='del'>-        case BPP_GET_PINS:</div><div class='del'>-          errno = get_pins(minor);</div><div class='del'>-          break;</div><div class='del'>-</div><div class='del'>-        case BPP_PUT_DATA:</div><div class='del'>-          bpp_outb_p(arg, base_addrs[minor]);</div><div class='del'>-          break;</div><div class='del'>-</div><div class='del'>-        case BPP_GET_DATA:</div><div class='del'>-          errno = bpp_inb_p(base_addrs[minor]);</div><div class='del'>-          break;</div><div class='del'>-</div><div class='del'>-        case BPP_SET_INPUT:</div><div class='del'>-          if (arg)</div><div class='del'>-            if (instances[minor].enhanced) {</div><div class='del'>-                unsigned short bits = get_pins(minor);</div><div class='del'>-                instances[minor].direction = 0x20;</div><div class='del'>-                set_pins(bits, minor);</div><div class='del'>-            } else {</div><div class='del'>-                errno = -ENOTTY;</div><div class='del'>-            }</div><div class='del'>-          else {</div><div class='del'>-              unsigned short bits = get_pins(minor);</div><div class='del'>-              instances[minor].direction = 0x00;</div><div class='del'>-              set_pins(bits, minor);</div><div class='del'>-          }</div><div class='del'>-          break;</div><div class='del'>-</div><div class='del'>-        default:</div><div class='del'>-            errno = -EINVAL;</div><div class='del'>-      }</div><div class='del'>-</div><div class='del'>-      return errno;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct file_operations bpp_fops = {</div><div class='del'>-	.owner =	THIS_MODULE,</div><div class='del'>-	.read =		bpp_read,</div><div class='del'>-	.write =	bpp_write,</div><div class='del'>-	.ioctl =	bpp_ioctl,</div><div class='del'>-	.open =		bpp_open,</div><div class='del'>-	.release =	bpp_release,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#if defined(__i386__)</div><div class='del'>-</div><div class='del'>-#define collectLptPorts()  {}</div><div class='del'>-</div><div class='del'>-static void probeLptPort(unsigned idx)</div><div class='del'>-{</div><div class='del'>-      unsigned int testvalue;</div><div class='del'>-      const unsigned short lpAddr = base_addrs[idx];</div><div class='del'>-</div><div class='del'>-      instances[idx].present = 0;</div><div class='del'>-      instances[idx].enhanced = 0;</div><div class='del'>-      instances[idx].direction = 0;</div><div class='del'>-      instances[idx].mode = COMPATIBILITY;</div><div class='del'>-      instances[idx].run_length = 0;</div><div class='del'>-      instances[idx].run_flag = 0;</div><div class='del'>-      if (!request_region(lpAddr,3, bpp_dev_name)) return;</div><div class='del'>-</div><div class='del'>-      /*</div><div class='del'>-       * First, make sure the instance exists. Do this by writing to</div><div class='del'>-       * the data latch and reading the value back. If the port *is*</div><div class='del'>-       * present, test to see if it supports extended-mode</div><div class='del'>-       * operation. This will be required for IEEE1284 reverse</div><div class='del'>-       * transfers.</div><div class='del'>-       */</div><div class='del'>-</div><div class='del'>-      outb_p(BPP_PROBE_CODE, lpAddr);</div><div class='del'>-      for (testvalue=0; testvalue&lt;BPP_DELAY; testvalue++)</div><div class='del'>-            ;</div><div class='del'>-      testvalue = inb_p(lpAddr);</div><div class='del'>-      if (testvalue == BPP_PROBE_CODE) {</div><div class='del'>-            unsigned save;</div><div class='del'>-            instances[idx].present = 1;</div><div class='del'>-</div><div class='del'>-            save = inb_p(lpAddr+2);</div><div class='del'>-            for (testvalue=0; testvalue&lt;BPP_DELAY; testvalue++)</div><div class='del'>-                  ;</div><div class='del'>-            outb_p(save|0x20, lpAddr+2);</div><div class='del'>-            for (testvalue=0; testvalue&lt;BPP_DELAY; testvalue++)</div><div class='del'>-                  ;</div><div class='del'>-            outb_p(~BPP_PROBE_CODE, lpAddr);</div><div class='del'>-            for (testvalue=0; testvalue&lt;BPP_DELAY; testvalue++)</div><div class='del'>-                  ;</div><div class='del'>-            testvalue = inb_p(lpAddr);</div><div class='del'>-            if ((testvalue&amp;0xff) == (0xff&amp;~BPP_PROBE_CODE))</div><div class='del'>-                  instances[idx].enhanced = 0;</div><div class='del'>-            else</div><div class='del'>-                  instances[idx].enhanced = 1;</div><div class='del'>-            outb_p(save, lpAddr+2);</div><div class='del'>-      }</div><div class='del'>-      else {</div><div class='del'>-            release_region(lpAddr,3);</div><div class='del'>-      }</div><div class='del'>-      /*</div><div class='del'>-       * Leave the port in compat idle mode.</div><div class='del'>-       */</div><div class='del'>-      set_pins(BPP_PP_nAutoFd|BPP_PP_nStrobe|BPP_PP_nInit, idx);</div><div class='del'>-</div><div class='del'>-      printk("bpp%d: Port at 0x%03x: Enhanced mode %s\n", idx, base_addrs[idx],</div><div class='del'>-            instances[idx].enhanced? "SUPPORTED" : "UNAVAILABLE");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void freeLptPort(int idx)</div><div class='del'>-{</div><div class='del'>-      release_region(base_addrs[idx], 3);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#if defined(__sparc__)</div><div class='del'>-</div><div class='del'>-static void __iomem *map_bpp(struct sbus_dev *dev, int idx)</div><div class='del'>-{</div><div class='del'>-      return sbus_ioremap(&amp;dev-&gt;resource[0], 0, BPP_SIZE, "bpp");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int collectLptPorts(void)</div><div class='del'>-{</div><div class='del'>-	struct sbus_bus *bus;</div><div class='del'>-	struct sbus_dev *dev;</div><div class='del'>-	int count;</div><div class='del'>-</div><div class='del'>-	count = 0;</div><div class='del'>-	for_all_sbusdev(dev, bus) {</div><div class='del'>-		if (strcmp(dev-&gt;prom_name, "SUNW,bpp") == 0) {</div><div class='del'>-			if (count &gt;= BPP_NO) {</div><div class='del'>-				printk(KERN_NOTICE</div><div class='del'>-				       "bpp: More than %d bpp ports,"</div><div class='del'>-				       " rest is ignored\n", BPP_NO);</div><div class='del'>-				return count;</div><div class='del'>-			}</div><div class='del'>-			base_addrs[count] = map_bpp(dev, count);</div><div class='del'>-			count++;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void probeLptPort(unsigned idx)</div><div class='del'>-{</div><div class='del'>-      void __iomem *rp = base_addrs[idx];</div><div class='del'>-      __u32 csr;</div><div class='del'>-      char *brand;</div><div class='del'>-</div><div class='del'>-      instances[idx].present = 0;</div><div class='del'>-      instances[idx].enhanced = 0;</div><div class='del'>-      instances[idx].direction = 0;</div><div class='del'>-      instances[idx].mode = COMPATIBILITY;</div><div class='del'>-      instances[idx].run_length = 0;</div><div class='del'>-      instances[idx].run_flag = 0;</div><div class='del'>-</div><div class='del'>-      if (!rp) return;</div><div class='del'>-</div><div class='del'>-      instances[idx].present = 1;</div><div class='del'>-      instances[idx].enhanced = 1;   /* Sure */</div><div class='del'>-</div><div class='del'>-      csr = sbus_readl(rp + BPP_CSR);</div><div class='del'>-      if ((csr &amp; P_DRAINING) != 0 &amp;&amp; (csr &amp; P_ERR_PEND) == 0) {</div><div class='del'>-            udelay(20);</div><div class='del'>-            csr = sbus_readl(rp + BPP_CSR);</div><div class='del'>-            if ((csr &amp; P_DRAINING) != 0 &amp;&amp; (csr &amp; P_ERR_PEND) == 0) {</div><div class='del'>-                  printk("bpp%d: DRAINING still active (0x%08x)\n", idx, csr);</div><div class='del'>-            }</div><div class='del'>-      }</div><div class='del'>-      printk("bpp%d: reset with 0x%08x ..", idx, csr);</div><div class='del'>-      sbus_writel((csr | P_RESET) &amp; ~P_INT_EN, rp + BPP_CSR);</div><div class='del'>-      udelay(500);</div><div class='del'>-      sbus_writel(sbus_readl(rp + BPP_CSR) &amp; ~P_RESET, rp + BPP_CSR);</div><div class='del'>-      csr = sbus_readl(rp + BPP_CSR);</div><div class='del'>-      printk(" done with csr=0x%08x ocr=0x%04x\n",</div><div class='del'>-         csr, sbus_readw(rp + BPP_OCR));</div><div class='del'>-</div><div class='del'>-      switch (csr &amp; P_DEV_ID_MASK) {</div><div class='del'>-      case P_DEV_ID_ZEBRA:</div><div class='del'>-            brand = "Zebra";</div><div class='del'>-            break;</div><div class='del'>-      case P_DEV_ID_L64854:</div><div class='del'>-            brand = "DMA2";</div><div class='del'>-            break;</div><div class='del'>-      default:</div><div class='del'>-            brand = "Unknown";</div><div class='del'>-      }</div><div class='del'>-      printk("bpp%d: %s at %p\n", idx, brand, rp);</div><div class='del'>-</div><div class='del'>-      /*</div><div class='del'>-       * Leave the port in compat idle mode.</div><div class='del'>-       */</div><div class='del'>-      set_pins(BPP_PP_nAutoFd|BPP_PP_nStrobe|BPP_PP_nInit, idx);</div><div class='del'>-</div><div class='del'>-      return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void freeLptPort(int idx)</div><div class='del'>-{</div><div class='del'>-      sbus_iounmap(base_addrs[idx], BPP_SIZE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static int __init bpp_init(void)</div><div class='del'>-{</div><div class='del'>-	int rc;</div><div class='del'>-	unsigned idx;</div><div class='del'>-</div><div class='del'>-	rc = collectLptPorts();</div><div class='del'>-	if (rc == 0)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	rc = register_chrdev(BPP_MAJOR, bpp_dev_name, &amp;bpp_fops);</div><div class='del'>-	if (rc &lt; 0)</div><div class='del'>-		return rc;</div><div class='del'>-</div><div class='del'>-	for (idx = 0; idx &lt; BPP_NO; idx++) {</div><div class='del'>-		instances[idx].opened = 0;</div><div class='del'>-		probeLptPort(idx);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit bpp_cleanup(void)</div><div class='del'>-{</div><div class='del'>-	unsigned idx;</div><div class='del'>-</div><div class='del'>-	unregister_chrdev(BPP_MAJOR, bpp_dev_name);</div><div class='del'>-</div><div class='del'>-	for (idx = 0;  idx &lt; BPP_NO; idx++) {</div><div class='del'>-		if (instances[idx].present)</div><div class='del'>-			freeLptPort(idx);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(bpp_init);</div><div class='del'>-module_exit(bpp_cleanup);</div><div class='del'>-</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-</div><div class='head'>diff --git a/drivers/sbus/char/cpwatchdog.c b/drivers/sbus/char/cpwatchdog.c<br/>deleted file mode 100644<br/>index 23abfdfb44f1..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/sbus/char/cpwatchdog.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/sbus/char/cpwatchdog.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,858 +0,0 @@</div><div class='del'>-/* cpwatchdog.c - driver implementation for hardware watchdog</div><div class='del'>- * timers found on Sun Microsystems CP1400 and CP1500 boards.</div><div class='del'>- *</div><div class='del'>- * This device supports both the generic Linux watchdog </div><div class='del'>- * interface and Solaris-compatible ioctls as best it is</div><div class='del'>- * able.</div><div class='del'>- *</div><div class='del'>- * NOTE: 	CP1400 systems appear to have a defective intr_mask</div><div class='del'>- * 			register on the PLD, preventing the disabling of</div><div class='del'>- * 			timer interrupts.  We use a timer to periodically </div><div class='del'>- * 			reset 'stopped' watchdogs on affected platforms.</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2000 Eric Brower (ebrower@usa.net)</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/fs.h&gt;</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/major.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/miscdevice.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/ioport.h&gt;</div><div class='del'>-#include &lt;linux/timer.h&gt;</div><div class='del'>-#include &lt;linux/smp_lock.h&gt;</div><div class='del'>-#include &lt;linux/io.h&gt;</div><div class='del'>-#include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/ebus.h&gt;</div><div class='del'>-#include &lt;asm/oplib.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/watchdog.h&gt;</div><div class='del'>-</div><div class='del'>-#define WD_OBPNAME	"watchdog"</div><div class='del'>-#define WD_BADMODEL "SUNW,501-5336"</div><div class='del'>-#define WD_BTIMEOUT	(jiffies + (HZ * 1000))</div><div class='del'>-#define WD_BLIMIT	0xFFFF</div><div class='del'>-</div><div class='del'>-#define WD0_DEVNAME "watchdog0"</div><div class='del'>-#define WD1_DEVNAME "watchdog1"</div><div class='del'>-#define WD2_DEVNAME "watchdog2"</div><div class='del'>-</div><div class='del'>-#define WD0_MINOR	212</div><div class='del'>-#define WD1_MINOR	213	</div><div class='del'>-#define WD2_MINOR	214	</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Internal driver definitions</div><div class='del'>- */</div><div class='del'>-#define WD0_ID			0		/* Watchdog0						*/</div><div class='del'>-#define WD1_ID			1		/* Watchdog1						*/</div><div class='del'>-#define WD2_ID			2		/* Watchdog2						*/</div><div class='del'>-#define WD_NUMDEVS		3		/* Device contains 3 timers			*/</div><div class='del'>-</div><div class='del'>-#define WD_INTR_OFF		0		/* Interrupt disable value			*/</div><div class='del'>-#define WD_INTR_ON		1		/* Interrupt enable value			*/</div><div class='del'>-</div><div class='del'>-#define WD_STAT_INIT	0x01	/* Watchdog timer is initialized	*/</div><div class='del'>-#define WD_STAT_BSTOP	0x02	/* Watchdog timer is brokenstopped	*/</div><div class='del'>-#define WD_STAT_SVCD	0x04	/* Watchdog interrupt occurred		*/</div><div class='del'>-</div><div class='del'>-/* Register value definitions</div><div class='del'>- */</div><div class='del'>-#define WD0_INTR_MASK	0x01	/* Watchdog device interrupt masks	*/</div><div class='del'>-#define WD1_INTR_MASK	0x02</div><div class='del'>-#define WD2_INTR_MASK	0x04</div><div class='del'>-</div><div class='del'>-#define WD_S_RUNNING	0x01	/* Watchdog device status running	*/</div><div class='del'>-#define WD_S_EXPIRED	0x02	/* Watchdog device status expired	*/</div><div class='del'>-</div><div class='del'>-/* Sun uses Altera PLD EPF8820ATC144-4 </div><div class='del'>- * providing three hardware watchdogs:</div><div class='del'>- *</div><div class='del'>- * 	1) RIC - sends an interrupt when triggered</div><div class='del'>- * 	2) XIR - asserts XIR_B_RESET when triggered, resets CPU</div><div class='del'>- * 	3) POR - asserts POR_B_RESET when triggered, resets CPU, backplane, board</div><div class='del'>- *</div><div class='del'>- *** Timer register block definition (struct wd_timer_regblk)</div><div class='del'>- *</div><div class='del'>- * dcntr and limit registers (halfword access):      </div><div class='del'>- * -------------------</div><div class='del'>- * | 15 | ...| 1 | 0 |</div><div class='del'>- * -------------------</div><div class='del'>- * |-  counter val  -|</div><div class='del'>- * -------------------</div><div class='del'>- * dcntr - 	Current 16-bit downcounter value.</div><div class='del'>- * 			When downcounter reaches '0' watchdog expires.</div><div class='del'>- * 			Reading this register resets downcounter with 'limit' value.</div><div class='del'>- * limit - 	16-bit countdown value in 1/10th second increments.</div><div class='del'>- * 			Writing this register begins countdown with input value.</div><div class='del'>- * 			Reading from this register does not affect counter.</div><div class='del'>- * NOTES:	After watchdog reset, dcntr and limit contain '1'</div><div class='del'>- *</div><div class='del'>- * status register (byte access):</div><div class='del'>- * ---------------------------</div><div class='del'>- * | 7 | ... | 2 |  1  |  0  |</div><div class='del'>- * --------------+------------</div><div class='del'>- * |-   UNUSED  -| EXP | RUN |</div><div class='del'>- * ---------------------------</div><div class='del'>- * status-	Bit 0 - Watchdog is running</div><div class='del'>- * 			Bit 1 - Watchdog has expired</div><div class='del'>- *</div><div class='del'>- *** PLD register block definition (struct wd_pld_regblk)</div><div class='del'>- *</div><div class='del'>- * intr_mask register (byte access):</div><div class='del'>- * ---------------------------------</div><div class='del'>- * | 7 | ... | 3 |  2  |  1  |  0  |</div><div class='del'>- * +-------------+------------------</div><div class='del'>- * |-   UNUSED  -| WD3 | WD2 | WD1 |</div><div class='del'>- * ---------------------------------</div><div class='del'>- * WD3 -  1 == Interrupt disabled for watchdog 3</div><div class='del'>- * WD2 -  1 == Interrupt disabled for watchdog 2</div><div class='del'>- * WD1 -  1 == Interrupt disabled for watchdog 1</div><div class='del'>- *</div><div class='del'>- * pld_status register (byte access):</div><div class='del'>- * UNKNOWN, MAGICAL MYSTERY REGISTER</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-#define WD_TIMER_REGSZ	16</div><div class='del'>-#define WD0_OFF		0</div><div class='del'>-#define WD1_OFF		(WD_TIMER_REGSZ * 1)</div><div class='del'>-#define WD2_OFF		(WD_TIMER_REGSZ * 2)</div><div class='del'>-#define PLD_OFF		(WD_TIMER_REGSZ * 3)</div><div class='del'>-</div><div class='del'>-#define WD_DCNTR	0x00</div><div class='del'>-#define WD_LIMIT	0x04</div><div class='del'>-#define WD_STATUS	0x08</div><div class='del'>-</div><div class='del'>-#define PLD_IMASK	(PLD_OFF + 0x00)</div><div class='del'>-#define PLD_STATUS	(PLD_OFF + 0x04)</div><div class='del'>-</div><div class='del'>-/* Individual timer structure </div><div class='del'>- */</div><div class='del'>-struct wd_timer {</div><div class='del'>-	__u16			timeout;</div><div class='del'>-	__u8			intr_mask;</div><div class='del'>-	unsigned char		runstatus;</div><div class='del'>-	void __iomem		*regs;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Device structure</div><div class='del'>- */</div><div class='del'>-struct wd_device {</div><div class='del'>-	int				irq;</div><div class='del'>-	spinlock_t		lock;</div><div class='del'>-	unsigned char	isbaddoggie;	/* defective PLD */</div><div class='del'>-	unsigned char	opt_enable;</div><div class='del'>-	unsigned char	opt_reboot;</div><div class='del'>-	unsigned short	opt_timeout;</div><div class='del'>-	unsigned char	initialized;</div><div class='del'>-	struct wd_timer	watchdog[WD_NUMDEVS];</div><div class='del'>-	void __iomem	*regs;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct wd_device wd_dev = { </div><div class='del'>-		0, __SPIN_LOCK_UNLOCKED(wd_dev.lock), 0, 0, 0, 0,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct timer_list wd_timer;</div><div class='del'>-</div><div class='del'>-static int wd0_timeout = 0;</div><div class='del'>-static int wd1_timeout = 0;</div><div class='del'>-static int wd2_timeout = 0;</div><div class='del'>-</div><div class='del'>-#ifdef MODULE</div><div class='del'>-module_param	(wd0_timeout, int, 0);</div><div class='del'>-MODULE_PARM_DESC(wd0_timeout, "Default watchdog0 timeout in 1/10secs");</div><div class='del'>-module_param 	(wd1_timeout, int, 0);</div><div class='del'>-MODULE_PARM_DESC(wd1_timeout, "Default watchdog1 timeout in 1/10secs");</div><div class='del'>-module_param 	(wd2_timeout, int, 0);</div><div class='del'>-MODULE_PARM_DESC(wd2_timeout, "Default watchdog2 timeout in 1/10secs");</div><div class='del'>-</div><div class='del'>-MODULE_AUTHOR</div><div class='del'>-	("Eric Brower &lt;ebrower@usa.net&gt;");</div><div class='del'>-MODULE_DESCRIPTION</div><div class='del'>-	("Hardware watchdog driver for Sun Microsystems CP1400/1500");</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_SUPPORTED_DEVICE</div><div class='del'>-	("watchdog");</div><div class='del'>-#endif /* ifdef MODULE */</div><div class='del'>-</div><div class='del'>-/* Forward declarations of internal methods</div><div class='del'>- */</div><div class='del'>-#ifdef WD_DEBUG</div><div class='del'>-static void wd_dumpregs(void);</div><div class='del'>-#endif</div><div class='del'>-static irqreturn_t wd_interrupt(int irq, void *dev_id);</div><div class='del'>-static void wd_toggleintr(struct wd_timer* pTimer, int enable);</div><div class='del'>-static void wd_pingtimer(struct wd_timer* pTimer);</div><div class='del'>-static void wd_starttimer(struct wd_timer* pTimer);</div><div class='del'>-static void wd_resetbrokentimer(struct wd_timer* pTimer);</div><div class='del'>-static void wd_stoptimer(struct wd_timer* pTimer);</div><div class='del'>-static void wd_brokentimer(unsigned long data);</div><div class='del'>-static int  wd_getstatus(struct wd_timer* pTimer);</div><div class='del'>-</div><div class='del'>-/* PLD expects words to be written in LSB format,</div><div class='del'>- * so we must flip all words prior to writing them to regs</div><div class='del'>- */</div><div class='del'>-static inline unsigned short flip_word(unsigned short word)</div><div class='del'>-{</div><div class='del'>-	return ((word &amp; 0xff) &lt;&lt; 8) | ((word &gt;&gt; 8) &amp; 0xff);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define wd_writew(val, addr) 	(writew(flip_word(val), addr))</div><div class='del'>-#define wd_readw(addr) 			(flip_word(readw(addr)))</div><div class='del'>-#define wd_writeb(val, addr) 	(writeb(val, addr))</div><div class='del'>-#define wd_readb(addr) 			(readb(addr))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* CP1400s seem to have broken PLD implementations--</div><div class='del'>- * the interrupt_mask register cannot be written, so</div><div class='del'>- * no timer interrupts can be masked within the PLD.</div><div class='del'>- */</div><div class='del'>-static inline int wd_isbroken(void)</div><div class='del'>-{</div><div class='del'>-	/* we could test this by read/write/read/restore</div><div class='del'>-	 * on the interrupt mask register only if OBP</div><div class='del'>-	 * 'watchdog-enable?' == FALSE, but it seems </div><div class='del'>-	 * ubiquitous on CP1400s</div><div class='del'>-	 */</div><div class='del'>-	char val[32];</div><div class='del'>-	prom_getproperty(prom_root_node, "model", val, sizeof(val));</div><div class='del'>-	return((!strcmp(val, WD_BADMODEL)) ? 1 : 0);</div><div class='del'>-}</div><div class='del'>-		</div><div class='del'>-/* Retrieve watchdog-enable? option from OBP</div><div class='del'>- * Returns 0 if false, 1 if true</div><div class='del'>- */</div><div class='del'>-static inline int wd_opt_enable(void)</div><div class='del'>-{</div><div class='del'>-	int opt_node;</div><div class='del'>-</div><div class='del'>-	opt_node = prom_getchild(prom_root_node);</div><div class='del'>-	opt_node = prom_searchsiblings(opt_node, "options");</div><div class='del'>-	return((-1 == prom_getint(opt_node, "watchdog-enable?")) ? 0 : 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Retrieve watchdog-reboot? option from OBP</div><div class='del'>- * Returns 0 if false, 1 if true</div><div class='del'>- */</div><div class='del'>-static inline int wd_opt_reboot(void)</div><div class='del'>-{</div><div class='del'>-	int opt_node;</div><div class='del'>-</div><div class='del'>-	opt_node = prom_getchild(prom_root_node);</div><div class='del'>-	opt_node = prom_searchsiblings(opt_node, "options");</div><div class='del'>-	return((-1 == prom_getint(opt_node, "watchdog-reboot?")) ? 0 : 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Retrieve watchdog-timeout option from OBP</div><div class='del'>- * Returns OBP value, or 0 if not located</div><div class='del'>- */</div><div class='del'>-static inline int wd_opt_timeout(void)</div><div class='del'>-{</div><div class='del'>-	int opt_node;</div><div class='del'>-	char value[32];</div><div class='del'>-	char *p = value;</div><div class='del'>-</div><div class='del'>-	opt_node = prom_getchild(prom_root_node);</div><div class='del'>-	opt_node = prom_searchsiblings(opt_node, "options");</div><div class='del'>-	opt_node = prom_getproperty(opt_node, </div><div class='del'>-								"watchdog-timeout", </div><div class='del'>-								value, </div><div class='del'>-								sizeof(value));</div><div class='del'>-	if(-1 != opt_node) {</div><div class='del'>-		/* atoi implementation */</div><div class='del'>-		for(opt_node = 0; /* nop */; p++) {</div><div class='del'>-			if(*p &gt;= '0' &amp;&amp; *p &lt;= '9') {</div><div class='del'>-				opt_node = (10*opt_node)+(*p-'0');</div><div class='del'>-			}</div><div class='del'>-			else {</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return((-1 == opt_node) ? (0) : (opt_node)); </div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int wd_open(struct inode *inode, struct file *f)</div><div class='del'>-{</div><div class='del'>-	lock_kernel();</div><div class='del'>-	switch(iminor(inode))</div><div class='del'>-	{</div><div class='del'>-		case WD0_MINOR:</div><div class='del'>-			f-&gt;private_data = &amp;wd_dev.watchdog[WD0_ID];</div><div class='del'>-			break;</div><div class='del'>-		case WD1_MINOR:</div><div class='del'>-			f-&gt;private_data = &amp;wd_dev.watchdog[WD1_ID];</div><div class='del'>-			break;</div><div class='del'>-		case WD2_MINOR:</div><div class='del'>-			f-&gt;private_data = &amp;wd_dev.watchdog[WD2_ID];</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			unlock_kernel();</div><div class='del'>-			return(-ENODEV);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Register IRQ on first open of device */</div><div class='del'>-	if(0 == wd_dev.initialized)</div><div class='del'>-	{	</div><div class='del'>-		if (request_irq(wd_dev.irq, </div><div class='del'>-						&amp;wd_interrupt, </div><div class='del'>-						IRQF_SHARED,</div><div class='del'>-						WD_OBPNAME,</div><div class='del'>-						(void *)wd_dev.regs)) {</div><div class='del'>-			printk("%s: Cannot register IRQ %d\n", </div><div class='del'>-				WD_OBPNAME, wd_dev.irq);</div><div class='del'>-			unlock_kernel();</div><div class='del'>-			return(-EBUSY);</div><div class='del'>-		}</div><div class='del'>-		wd_dev.initialized = 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	unlock_kernel();</div><div class='del'>-	return(nonseekable_open(inode, f));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int wd_release(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int wd_ioctl(struct inode *inode, struct file *file, </div><div class='del'>-		     unsigned int cmd, unsigned long arg)</div><div class='del'>-{</div><div class='del'>-	int 	setopt 				= 0;</div><div class='del'>-	struct 	wd_timer* pTimer 	= (struct wd_timer*)file-&gt;private_data;</div><div class='del'>-	void __user *argp = (void __user *)arg;</div><div class='del'>-	struct 	watchdog_info info 	= {</div><div class='del'>-		0,</div><div class='del'>-		0,</div><div class='del'>-		"Altera EPF8820ATC144-4"</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	if(NULL == pTimer) {</div><div class='del'>-		return(-EINVAL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch(cmd)</div><div class='del'>-	{</div><div class='del'>-		/* Generic Linux IOCTLs */</div><div class='del'>-		case WDIOC_GETSUPPORT:</div><div class='del'>-			if(copy_to_user(argp, &amp;info, sizeof(struct watchdog_info))) {</div><div class='del'>-				return(-EFAULT);</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case WDIOC_GETSTATUS:</div><div class='del'>-		case WDIOC_GETBOOTSTATUS:</div><div class='del'>-			if (put_user(0, (int __user *)argp))</div><div class='del'>-				return -EFAULT;</div><div class='del'>-			break;</div><div class='del'>-		case WDIOC_KEEPALIVE:</div><div class='del'>-			wd_pingtimer(pTimer);</div><div class='del'>-			break;</div><div class='del'>-		case WDIOC_SETOPTIONS:</div><div class='del'>-			if(copy_from_user(&amp;setopt, argp, sizeof(unsigned int))) {</div><div class='del'>-				return -EFAULT;</div><div class='del'>-			}</div><div class='del'>-			if(setopt &amp; WDIOS_DISABLECARD) {</div><div class='del'>-				if(wd_dev.opt_enable) {</div><div class='del'>-					printk(</div><div class='del'>-						"%s: cannot disable watchdog in ENABLED mode\n",</div><div class='del'>-						WD_OBPNAME);</div><div class='del'>-					return(-EINVAL);</div><div class='del'>-				}</div><div class='del'>-				wd_stoptimer(pTimer);</div><div class='del'>-			}</div><div class='del'>-			else if(setopt &amp; WDIOS_ENABLECARD) {</div><div class='del'>-				wd_starttimer(pTimer);</div><div class='del'>-			}</div><div class='del'>-			else {</div><div class='del'>-				return(-EINVAL);</div><div class='del'>-			}	</div><div class='del'>-			break;</div><div class='del'>-		/* Solaris-compatible IOCTLs */</div><div class='del'>-		case WIOCGSTAT:</div><div class='del'>-			setopt = wd_getstatus(pTimer);</div><div class='del'>-			if(copy_to_user(argp, &amp;setopt, sizeof(unsigned int))) {</div><div class='del'>-				return(-EFAULT);</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case WIOCSTART:</div><div class='del'>-			wd_starttimer(pTimer);</div><div class='del'>-			break;</div><div class='del'>-		case WIOCSTOP:</div><div class='del'>-			if(wd_dev.opt_enable) {</div><div class='del'>-				printk("%s: cannot disable watchdog in ENABLED mode\n",</div><div class='del'>-					WD_OBPNAME);</div><div class='del'>-				return(-EINVAL);</div><div class='del'>-			}</div><div class='del'>-			wd_stoptimer(pTimer);</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			return(-EINVAL);</div><div class='del'>-	}</div><div class='del'>-	return(0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static long wd_compat_ioctl(struct file *file, unsigned int cmd,</div><div class='del'>-		unsigned long arg)</div><div class='del'>-{</div><div class='del'>-	int rval = -ENOIOCTLCMD;</div><div class='del'>-</div><div class='del'>-	switch (cmd) {</div><div class='del'>-	/* solaris ioctls are specific to this driver */</div><div class='del'>-	case WIOCSTART:</div><div class='del'>-	case WIOCSTOP:</div><div class='del'>-	case WIOCGSTAT:</div><div class='del'>-		lock_kernel();</div><div class='del'>-		rval = wd_ioctl(file-&gt;f_path.dentry-&gt;d_inode, file, cmd, arg);</div><div class='del'>-		unlock_kernel();</div><div class='del'>-		break;</div><div class='del'>-	/* everything else is handled by the generic compat layer */</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return rval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t wd_write(struct file 	*file, </div><div class='del'>-			const char	__user *buf, </div><div class='del'>-			size_t 		count, </div><div class='del'>-			loff_t 		*ppos)</div><div class='del'>-{</div><div class='del'>-	struct wd_timer* pTimer = (struct wd_timer*)file-&gt;private_data;</div><div class='del'>-</div><div class='del'>-	if(NULL == pTimer) {</div><div class='del'>-		return(-EINVAL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (count) {</div><div class='del'>-		wd_pingtimer(pTimer);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t wd_read(struct file * file, char __user *buffer,</div><div class='del'>-		        size_t count, loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-#ifdef WD_DEBUG</div><div class='del'>-	wd_dumpregs();</div><div class='del'>-	return(0);</div><div class='del'>-#else</div><div class='del'>-	return(-EINVAL);</div><div class='del'>-#endif /* ifdef WD_DEBUG */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static irqreturn_t wd_interrupt(int irq, void *dev_id)</div><div class='del'>-{</div><div class='del'>-	/* Only WD0 will interrupt-- others are NMI and we won't</div><div class='del'>-	 * see them here....</div><div class='del'>-	 */</div><div class='del'>-	spin_lock_irq(&amp;wd_dev.lock);</div><div class='del'>-	if((unsigned long)wd_dev.regs == (unsigned long)dev_id)</div><div class='del'>-	{</div><div class='del'>-		wd_stoptimer(&amp;wd_dev.watchdog[WD0_ID]);</div><div class='del'>-		wd_dev.watchdog[WD0_ID].runstatus |=  WD_STAT_SVCD;</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irq(&amp;wd_dev.lock);</div><div class='del'>-	return IRQ_HANDLED;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct file_operations wd_fops = {</div><div class='del'>-	.owner =	THIS_MODULE,</div><div class='del'>-	.ioctl =	wd_ioctl,</div><div class='del'>-	.compat_ioctl =	wd_compat_ioctl,</div><div class='del'>-	.open =		wd_open,</div><div class='del'>-	.write =	wd_write,</div><div class='del'>-	.read =		wd_read,</div><div class='del'>-	.release =	wd_release,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct miscdevice wd0_miscdev = { WD0_MINOR, WD0_DEVNAME, &amp;wd_fops };</div><div class='del'>-static struct miscdevice wd1_miscdev = { WD1_MINOR, WD1_DEVNAME, &amp;wd_fops };</div><div class='del'>-static struct miscdevice wd2_miscdev = { WD2_MINOR, WD2_DEVNAME, &amp;wd_fops };</div><div class='del'>-</div><div class='del'>-#ifdef WD_DEBUG</div><div class='del'>-static void wd_dumpregs(void)</div><div class='del'>-{</div><div class='del'>-	/* Reading from downcounters initiates watchdog countdown--</div><div class='del'>-	 * Example is included below for illustration purposes.</div><div class='del'>-	 */</div><div class='del'>-	int i;</div><div class='del'>-	printk("%s: dumping register values\n", WD_OBPNAME);</div><div class='del'>-	for(i = WD0_ID; i &lt; WD_NUMDEVS; ++i) {</div><div class='del'>-			/* printk("\t%s%i: dcntr  at 0x%lx: 0x%x\n", </div><div class='del'>-			 * 	WD_OBPNAME,</div><div class='del'>-		 	 *	i,</div><div class='del'>-			 *	(unsigned long)(&amp;wd_dev.watchdog[i].regs-&gt;dcntr), </div><div class='del'>-			 *	readw(&amp;wd_dev.watchdog[i].regs-&gt;dcntr));</div><div class='del'>-			 */</div><div class='del'>-			printk("\t%s%i: limit  at 0x%lx: 0x%x\n", </div><div class='del'>-				WD_OBPNAME,</div><div class='del'>-				i,</div><div class='del'>-				(unsigned long)(&amp;wd_dev.watchdog[i].regs-&gt;limit), </div><div class='del'>-				readw(&amp;wd_dev.watchdog[i].regs-&gt;limit));</div><div class='del'>-			printk("\t%s%i: status at 0x%lx: 0x%x\n", </div><div class='del'>-				WD_OBPNAME,</div><div class='del'>-				i,</div><div class='del'>-				(unsigned long)(&amp;wd_dev.watchdog[i].regs-&gt;status), </div><div class='del'>-				readb(&amp;wd_dev.watchdog[i].regs-&gt;status));</div><div class='del'>-			printk("\t%s%i: driver status: 0x%x\n",</div><div class='del'>-				WD_OBPNAME,</div><div class='del'>-				i,</div><div class='del'>-				wd_getstatus(&amp;wd_dev.watchdog[i]));</div><div class='del'>-	}</div><div class='del'>-	printk("\tintr_mask  at %p: 0x%x\n", </div><div class='del'>-		wd_dev.regs + PLD_IMASK,</div><div class='del'>-		readb(wd_dev.regs + PLD_IMASK));</div><div class='del'>-	printk("\tpld_status at %p: 0x%x\n", </div><div class='del'>-		wd_dev.regs + PLD_STATUS, </div><div class='del'>-		readb(wd_dev.regs + PLD_STATUS));</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* Enable or disable watchdog interrupts</div><div class='del'>- * Because of the CP1400 defect this should only be</div><div class='del'>- * called during initialzation or by wd_[start|stop]timer()</div><div class='del'>- *</div><div class='del'>- * pTimer 	- pointer to timer device, or NULL to indicate all timers </div><div class='del'>- * enable	- non-zero to enable interrupts, zero to disable</div><div class='del'>- */</div><div class='del'>-static void wd_toggleintr(struct wd_timer* pTimer, int enable)</div><div class='del'>-{</div><div class='del'>-	unsigned char curregs = wd_readb(wd_dev.regs + PLD_IMASK);</div><div class='del'>-	unsigned char setregs = </div><div class='del'>-		(NULL == pTimer) ? </div><div class='del'>-			(WD0_INTR_MASK | WD1_INTR_MASK | WD2_INTR_MASK) : </div><div class='del'>-			(pTimer-&gt;intr_mask);</div><div class='del'>-</div><div class='del'>-	(WD_INTR_ON == enable) ?</div><div class='del'>-		(curregs &amp;= ~setregs):</div><div class='del'>-		(curregs |=  setregs);</div><div class='del'>-</div><div class='del'>-	wd_writeb(curregs, wd_dev.regs + PLD_IMASK);</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Reset countdown timer with 'limit' value and continue countdown.</div><div class='del'>- * This will not start a stopped timer.</div><div class='del'>- *</div><div class='del'>- * pTimer	- pointer to timer device</div><div class='del'>- */</div><div class='del'>-static void wd_pingtimer(struct wd_timer* pTimer)</div><div class='del'>-{</div><div class='del'>-	if (wd_readb(pTimer-&gt;regs + WD_STATUS) &amp; WD_S_RUNNING) {</div><div class='del'>-		wd_readw(pTimer-&gt;regs + WD_DCNTR);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Stop a running watchdog timer-- the timer actually keeps</div><div class='del'>- * running, but the interrupt is masked so that no action is</div><div class='del'>- * taken upon expiration.</div><div class='del'>- *</div><div class='del'>- * pTimer	- pointer to timer device</div><div class='del'>- */</div><div class='del'>-static void wd_stoptimer(struct wd_timer* pTimer)</div><div class='del'>-{</div><div class='del'>-	if(wd_readb(pTimer-&gt;regs + WD_STATUS) &amp; WD_S_RUNNING) {</div><div class='del'>-		wd_toggleintr(pTimer, WD_INTR_OFF);</div><div class='del'>-</div><div class='del'>-		if(wd_dev.isbaddoggie) {</div><div class='del'>-			pTimer-&gt;runstatus |= WD_STAT_BSTOP;</div><div class='del'>-			wd_brokentimer((unsigned long)&amp;wd_dev);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Start a watchdog timer with the specified limit value</div><div class='del'>- * If the watchdog is running, it will be restarted with</div><div class='del'>- * the provided limit value.</div><div class='del'>- *</div><div class='del'>- * This function will enable interrupts on the specified</div><div class='del'>- * watchdog.</div><div class='del'>- *</div><div class='del'>- * pTimer	- pointer to timer device</div><div class='del'>- * limit	- limit (countdown) value in 1/10th seconds</div><div class='del'>- */</div><div class='del'>-static void wd_starttimer(struct wd_timer* pTimer)</div><div class='del'>-{</div><div class='del'>-	if(wd_dev.isbaddoggie) {</div><div class='del'>-		pTimer-&gt;runstatus &amp;= ~WD_STAT_BSTOP;</div><div class='del'>-	}</div><div class='del'>-	pTimer-&gt;runstatus &amp;= ~WD_STAT_SVCD;</div><div class='del'>-</div><div class='del'>-	wd_writew(pTimer-&gt;timeout, pTimer-&gt;regs + WD_LIMIT);</div><div class='del'>-	wd_toggleintr(pTimer, WD_INTR_ON);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Restarts timer with maximum limit value and</div><div class='del'>- * does not unset 'brokenstop' value.</div><div class='del'>- */</div><div class='del'>-static void wd_resetbrokentimer(struct wd_timer* pTimer)</div><div class='del'>-{</div><div class='del'>-	wd_toggleintr(pTimer, WD_INTR_ON);</div><div class='del'>-	wd_writew(WD_BLIMIT, pTimer-&gt;regs + WD_LIMIT);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Timer device initialization helper.</div><div class='del'>- * Returns 0 on success, other on failure</div><div class='del'>- */</div><div class='del'>-static int wd_inittimer(int whichdog)</div><div class='del'>-{</div><div class='del'>-	struct miscdevice 				*whichmisc;</div><div class='del'>-	void __iomem *whichregs;</div><div class='del'>-	char 							whichident[8];</div><div class='del'>-	int								whichmask;</div><div class='del'>-	__u16							whichlimit;</div><div class='del'>-</div><div class='del'>-	switch(whichdog)</div><div class='del'>-	{</div><div class='del'>-		case WD0_ID:</div><div class='del'>-			whichmisc = &amp;wd0_miscdev;</div><div class='del'>-			strcpy(whichident, "RIC");</div><div class='del'>-			whichregs = wd_dev.regs + WD0_OFF;</div><div class='del'>-			whichmask = WD0_INTR_MASK;</div><div class='del'>-			whichlimit= (0 == wd0_timeout) 	? </div><div class='del'>-						(wd_dev.opt_timeout): </div><div class='del'>-						(wd0_timeout);</div><div class='del'>-			break;</div><div class='del'>-		case WD1_ID:</div><div class='del'>-			whichmisc = &amp;wd1_miscdev;</div><div class='del'>-			strcpy(whichident, "XIR");</div><div class='del'>-			whichregs = wd_dev.regs + WD1_OFF;</div><div class='del'>-			whichmask = WD1_INTR_MASK;</div><div class='del'>-			whichlimit= (0 == wd1_timeout) 	? </div><div class='del'>-						(wd_dev.opt_timeout): </div><div class='del'>-						(wd1_timeout);</div><div class='del'>-			break;</div><div class='del'>-		case WD2_ID:</div><div class='del'>-			whichmisc = &amp;wd2_miscdev;</div><div class='del'>-			strcpy(whichident, "POR");</div><div class='del'>-			whichregs = wd_dev.regs + WD2_OFF;</div><div class='del'>-			whichmask = WD2_INTR_MASK;</div><div class='del'>-			whichlimit= (0 == wd2_timeout) 	? </div><div class='del'>-						(wd_dev.opt_timeout): </div><div class='del'>-						(wd2_timeout);</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			printk("%s: %s: invalid watchdog id: %i\n",</div><div class='del'>-				WD_OBPNAME, __func__, whichdog);</div><div class='del'>-			return(1);</div><div class='del'>-	}</div><div class='del'>-	if(0 != misc_register(whichmisc))</div><div class='del'>-	{</div><div class='del'>-		return(1);</div><div class='del'>-	}</div><div class='del'>-	wd_dev.watchdog[whichdog].regs			= whichregs;</div><div class='del'>-	wd_dev.watchdog[whichdog].timeout 		= whichlimit;</div><div class='del'>-	wd_dev.watchdog[whichdog].intr_mask		= whichmask;</div><div class='del'>-	wd_dev.watchdog[whichdog].runstatus 	&amp;= ~WD_STAT_BSTOP;</div><div class='del'>-	wd_dev.watchdog[whichdog].runstatus 	|= WD_STAT_INIT;</div><div class='del'>-</div><div class='del'>-	printk("%s%i: %s hardware watchdog [%01i.%i sec] %s\n", </div><div class='del'>-		WD_OBPNAME, </div><div class='del'>-		whichdog, </div><div class='del'>-		whichident, </div><div class='del'>-		wd_dev.watchdog[whichdog].timeout / 10,</div><div class='del'>-		wd_dev.watchdog[whichdog].timeout % 10,</div><div class='del'>-		(0 != wd_dev.opt_enable) ? "in ENABLED mode" : "");</div><div class='del'>-	return(0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Timer method called to reset stopped watchdogs--</div><div class='del'>- * because of the PLD bug on CP1400, we cannot mask</div><div class='del'>- * interrupts within the PLD so me must continually</div><div class='del'>- * reset the timers ad infinitum.</div><div class='del'>- */</div><div class='del'>-static void wd_brokentimer(unsigned long data)</div><div class='del'>-{</div><div class='del'>-	struct wd_device* pDev = (struct wd_device*)data;</div><div class='del'>-	int id, tripped = 0;</div><div class='del'>-</div><div class='del'>-	/* kill a running timer instance, in case we</div><div class='del'>-	 * were called directly instead of by kernel timer</div><div class='del'>-	 */</div><div class='del'>-	if(timer_pending(&amp;wd_timer)) {</div><div class='del'>-		del_timer(&amp;wd_timer);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for(id = WD0_ID; id &lt; WD_NUMDEVS; ++id) {</div><div class='del'>-		if(pDev-&gt;watchdog[id].runstatus &amp; WD_STAT_BSTOP) {</div><div class='del'>-			++tripped;</div><div class='del'>-			wd_resetbrokentimer(&amp;pDev-&gt;watchdog[id]);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if(tripped) {</div><div class='del'>-		/* there is at least one timer brokenstopped-- reschedule */</div><div class='del'>-		init_timer(&amp;wd_timer);</div><div class='del'>-		wd_timer.expires = WD_BTIMEOUT;</div><div class='del'>-		add_timer(&amp;wd_timer);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int wd_getstatus(struct wd_timer* pTimer)</div><div class='del'>-{</div><div class='del'>-	unsigned char stat = wd_readb(pTimer-&gt;regs + WD_STATUS);</div><div class='del'>-	unsigned char intr = wd_readb(wd_dev.regs + PLD_IMASK);</div><div class='del'>-	unsigned char ret  = WD_STOPPED;</div><div class='del'>-</div><div class='del'>-	/* determine STOPPED */</div><div class='del'>-	if(0 == stat ) { </div><div class='del'>-		return(ret);</div><div class='del'>-	}</div><div class='del'>-	/* determine EXPIRED vs FREERUN vs RUNNING */</div><div class='del'>-	else if(WD_S_EXPIRED &amp; stat) {</div><div class='del'>-		ret = WD_EXPIRED;</div><div class='del'>-	}</div><div class='del'>-	else if(WD_S_RUNNING &amp; stat) {</div><div class='del'>-		if(intr &amp; pTimer-&gt;intr_mask) {</div><div class='del'>-			ret = WD_FREERUN;</div><div class='del'>-		}</div><div class='del'>-		else {</div><div class='del'>-			/* Fudge WD_EXPIRED status for defective CP1400--</div><div class='del'>-			 * IF timer is running </div><div class='del'>-			 * 	AND brokenstop is set </div><div class='del'>-			 * 	AND an interrupt has been serviced</div><div class='del'>-			 * we are WD_EXPIRED.</div><div class='del'>-			 *</div><div class='del'>-			 * IF timer is running </div><div class='del'>-			 * 	AND brokenstop is set </div><div class='del'>-			 * 	AND no interrupt has been serviced</div><div class='del'>-			 * we are WD_FREERUN.</div><div class='del'>-			 */</div><div class='del'>-			if(wd_dev.isbaddoggie &amp;&amp; (pTimer-&gt;runstatus &amp; WD_STAT_BSTOP)) {</div><div class='del'>-				if(pTimer-&gt;runstatus &amp; WD_STAT_SVCD) {</div><div class='del'>-					ret = WD_EXPIRED;</div><div class='del'>-				}</div><div class='del'>-				else {</div><div class='del'>-					/* we could as well pretend we are expired */</div><div class='del'>-					ret = WD_FREERUN;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			else {</div><div class='del'>-				ret = WD_RUNNING;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* determine SERVICED */</div><div class='del'>-	if(pTimer-&gt;runstatus &amp; WD_STAT_SVCD) {</div><div class='del'>-		ret |= WD_SERVICED;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return(ret);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init wd_init(void)</div><div class='del'>-{</div><div class='del'>-	int 	id;</div><div class='del'>-	struct 	linux_ebus *ebus = NULL;</div><div class='del'>-	struct 	linux_ebus_device *edev = NULL;</div><div class='del'>-</div><div class='del'>-	for_each_ebus(ebus) {</div><div class='del'>-		for_each_ebusdev(edev, ebus) {</div><div class='del'>-			if (!strcmp(edev-&gt;ofdev.node-&gt;name, WD_OBPNAME))</div><div class='del'>-				goto ebus_done;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-ebus_done:</div><div class='del'>-	if(!edev) {</div><div class='del'>-		printk("%s: unable to locate device\n", WD_OBPNAME);</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	wd_dev.regs = </div><div class='del'>-		ioremap(edev-&gt;resource[0].start, 4 * WD_TIMER_REGSZ); /* ? */</div><div class='del'>-</div><div class='del'>-	if(NULL == wd_dev.regs) {</div><div class='del'>-		printk("%s: unable to map registers\n", WD_OBPNAME);</div><div class='del'>-		return(-ENODEV);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* initialize device structure from OBP parameters */</div><div class='del'>-	wd_dev.irq 			= edev-&gt;irqs[0];</div><div class='del'>-	wd_dev.opt_enable	= wd_opt_enable();</div><div class='del'>-	wd_dev.opt_reboot	= wd_opt_reboot();</div><div class='del'>-	wd_dev.opt_timeout	= wd_opt_timeout();</div><div class='del'>-	wd_dev.isbaddoggie	= wd_isbroken();</div><div class='del'>-</div><div class='del'>-	/* disable all interrupts unless watchdog-enabled? == true */</div><div class='del'>-	if(! wd_dev.opt_enable) {</div><div class='del'>-		wd_toggleintr(NULL, WD_INTR_OFF);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* register miscellaneous devices */</div><div class='del'>-	for(id = WD0_ID; id &lt; WD_NUMDEVS; ++id) {</div><div class='del'>-		if(0 != wd_inittimer(id)) {</div><div class='del'>-			printk("%s%i: unable to initialize\n", WD_OBPNAME, id);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* warn about possible defective PLD */</div><div class='del'>-	if(wd_dev.isbaddoggie) {</div><div class='del'>-		init_timer(&amp;wd_timer);</div><div class='del'>-		wd_timer.function 	= wd_brokentimer;</div><div class='del'>-		wd_timer.data		= (unsigned long)&amp;wd_dev;</div><div class='del'>-		wd_timer.expires	= WD_BTIMEOUT;</div><div class='del'>-</div><div class='del'>-		printk("%s: PLD defect workaround enabled for model %s\n",</div><div class='del'>-			WD_OBPNAME, WD_BADMODEL);</div><div class='del'>-	}</div><div class='del'>-	return(0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit wd_cleanup(void)</div><div class='del'>-{</div><div class='del'>-	int id;</div><div class='del'>-</div><div class='del'>-	/* if 'watchdog-enable?' == TRUE, timers are not stopped </div><div class='del'>-	 * when module is unloaded.  All brokenstopped timers will</div><div class='del'>-	 * also now eventually trip. </div><div class='del'>-	 */</div><div class='del'>-	for(id = WD0_ID; id &lt; WD_NUMDEVS; ++id) {</div><div class='del'>-		if(WD_S_RUNNING == wd_readb(wd_dev.watchdog[id].regs + WD_STATUS)) {</div><div class='del'>-			if(wd_dev.opt_enable) {</div><div class='del'>-				printk(KERN_WARNING "%s%i: timer not stopped at release\n",</div><div class='del'>-					WD_OBPNAME, id);</div><div class='del'>-			}</div><div class='del'>-			else {</div><div class='del'>-				wd_stoptimer(&amp;wd_dev.watchdog[id]);</div><div class='del'>-				if(wd_dev.watchdog[id].runstatus &amp; WD_STAT_BSTOP) {</div><div class='del'>-					wd_resetbrokentimer(&amp;wd_dev.watchdog[id]);</div><div class='del'>-					printk(KERN_WARNING </div><div class='del'>-							"%s%i: defect workaround disabled at release, "\</div><div class='del'>-							"timer expires in ~%01i sec\n",</div><div class='del'>-							WD_OBPNAME, id, </div><div class='del'>-							wd_readw(wd_dev.watchdog[id].regs + WD_LIMIT) / 10);</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if(wd_dev.isbaddoggie &amp;&amp; timer_pending(&amp;wd_timer)) {</div><div class='del'>-		del_timer(&amp;wd_timer);</div><div class='del'>-	}</div><div class='del'>-	if(0 != (wd_dev.watchdog[WD0_ID].runstatus &amp; WD_STAT_INIT)) {</div><div class='del'>-		misc_deregister(&amp;wd0_miscdev);</div><div class='del'>-	}</div><div class='del'>-	if(0 != (wd_dev.watchdog[WD1_ID].runstatus &amp; WD_STAT_INIT)) {</div><div class='del'>-		misc_deregister(&amp;wd1_miscdev);</div><div class='del'>-	}</div><div class='del'>-	if(0 != (wd_dev.watchdog[WD2_ID].runstatus &amp; WD_STAT_INIT)) {</div><div class='del'>-		misc_deregister(&amp;wd2_miscdev);</div><div class='del'>-	}</div><div class='del'>-	if(0 != wd_dev.initialized) {</div><div class='del'>-		free_irq(wd_dev.irq, (void *)wd_dev.regs);</div><div class='del'>-	}</div><div class='del'>-	iounmap(wd_dev.regs);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(wd_init);</div><div class='del'>-module_exit(wd_cleanup);</div><div class='head'>diff --git a/drivers/sbus/char/display7seg.c b/drivers/sbus/char/display7seg.c<br/>index d8f5c0ca236d..2550af4ae432 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/sbus/char/display7seg.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/sbus/char/display7seg.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/sbus/char/display7seg.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/sbus/char/display7seg.c</a></div><div class='hunk'>@@ -1,10 +1,7 @@</div><div class='del'>-/* $Id: display7seg.c,v 1.6 2002/01/08 16:00:16 davem Exp $</div><div class='del'>- *</div><div class='del'>- * display7seg - Driver implementation for the 7-segment display</div><div class='del'>- * present on Sun Microsystems CP1400 and CP1500</div><div class='add'>+/* display7seg.c - Driver implementation for the 7-segment display</div><div class='add'>+ *                 present on Sun Microsystems CP1400 and CP1500</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2000 Eric Brower (ebrower@usa.net)</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -16,22 +13,20 @@</div><div class='ctx'> #include &lt;linux/miscdevice.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;		/* request_region */</div><div class='ctx'> #include &lt;linux/smp_lock.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_device.h&gt;</div><div class='ctx'> #include &lt;asm/atomic.h&gt;</div><div class='del'>-#include &lt;asm/ebus.h&gt;			/* EBus device					*/</div><div class='del'>-#include &lt;asm/oplib.h&gt;			/* OpenProm Library 			*/</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;		/* put_/get_user			*/</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/display7seg.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define D7S_MINOR	193</div><div class='del'>-#define D7S_OBPNAME	"display7seg"</div><div class='del'>-#define D7S_DEVNAME "d7s"</div><div class='add'>+#define DRIVER_NAME	"d7s"</div><div class='add'>+#define PFX		DRIVER_NAME ": "</div><div class='ctx'> </div><div class='ctx'> static int sol_compat = 0;		/* Solaris compatibility mode	*/</div><div class='ctx'> </div><div class='del'>-#ifdef MODULE</div><div class='del'>-</div><div class='ctx'> /* Solaris compatibility flag -</div><div class='ctx'>  * The Solaris implementation omits support for several</div><div class='ctx'>  * documented driver features (ref Sun doc 806-0180-03).  </div><div class='hunk'>@@ -46,20 +41,20 @@ static int sol_compat = 0;		/* Solaris compatibility mode	*/</div><div class='ctx'>  * If you wish the device to operate as under Solaris,</div><div class='ctx'>  * omitting above features, set this parameter to non-zero.</div><div class='ctx'>  */</div><div class='del'>-module_param</div><div class='del'>-	(sol_compat, int, 0);</div><div class='del'>-MODULE_PARM_DESC</div><div class='del'>-	(sol_compat, </div><div class='del'>-	 "Disables documented functionality omitted from Solaris driver");</div><div class='del'>-</div><div class='del'>-MODULE_AUTHOR</div><div class='del'>-	("Eric Brower &lt;ebrower@usa.net&gt;");</div><div class='del'>-MODULE_DESCRIPTION</div><div class='del'>-	("7-Segment Display driver for Sun Microsystems CP1400/1500");</div><div class='add'>+module_param(sol_compat, int, 0);</div><div class='add'>+MODULE_PARM_DESC(sol_compat, </div><div class='add'>+		 "Disables documented functionality omitted from Solaris driver");</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Eric Brower &lt;ebrower@usa.net&gt;");</div><div class='add'>+MODULE_DESCRIPTION("7-Segment Display driver for Sun Microsystems CP1400/1500");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_SUPPORTED_DEVICE</div><div class='del'>-	("d7s");</div><div class='del'>-#endif /* ifdef MODULE */</div><div class='add'>+MODULE_SUPPORTED_DEVICE("d7s");</div><div class='add'>+</div><div class='add'>+struct d7s {</div><div class='add'>+	void __iomem	*regs;</div><div class='add'>+	bool		flipped;</div><div class='add'>+};</div><div class='add'>+struct d7s *d7s_device;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Register block address- see header for details</div><div class='hunk'>@@ -72,22 +67,6 @@ MODULE_SUPPORTED_DEVICE</div><div class='ctx'>  * FLIP		- Inverts display for upside-down mounted board</div><div class='ctx'>  * bits 0-4	- 7-segment display contents</div><div class='ctx'>  */</div><div class='del'>-static void __iomem* d7s_regs;</div><div class='del'>-</div><div class='del'>-static inline void d7s_free(void)</div><div class='del'>-{</div><div class='del'>-	iounmap(d7s_regs);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int d7s_obpflipped(void)</div><div class='del'>-{</div><div class='del'>-	int opt_node;</div><div class='del'>-</div><div class='del'>-	opt_node = prom_getchild(prom_root_node);</div><div class='del'>-	opt_node = prom_searchsiblings(opt_node, "options");</div><div class='del'>-	return ((-1 != prom_getintdefault(opt_node, "d7s-flipped?", -1)) ? 0 : 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static atomic_t d7s_users = ATOMIC_INIT(0);</div><div class='ctx'> </div><div class='ctx'> static int d7s_open(struct inode *inode, struct file *f)</div><div class='hunk'>@@ -106,12 +85,15 @@ static int d7s_release(struct inode *inode, struct file *f)</div><div class='ctx'> 	 * are not operating in solaris-compat mode</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (atomic_dec_and_test(&amp;d7s_users) &amp;&amp; !sol_compat) {</div><div class='del'>-		int regval = 0;</div><div class='del'>-</div><div class='del'>-		regval = readb(d7s_regs);</div><div class='del'>-		(0 == d7s_obpflipped())	? </div><div class='del'>-			writeb(regval |= D7S_FLIP,  d7s_regs): </div><div class='del'>-			writeb(regval &amp;= ~D7S_FLIP, d7s_regs);</div><div class='add'>+		struct d7s *p = d7s_device;</div><div class='add'>+		u8 regval = 0;</div><div class='add'>+</div><div class='add'>+		regval = readb(p-&gt;regs);</div><div class='add'>+		if (p-&gt;flipped)</div><div class='add'>+			regval |= D7S_FLIP;</div><div class='add'>+		else</div><div class='add'>+			regval &amp;= ~D7S_FLIP;</div><div class='add'>+		writeb(regval, p-&gt;regs);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -119,9 +101,10 @@ static int d7s_release(struct inode *inode, struct file *f)</div><div class='ctx'> </div><div class='ctx'> static long d7s_ioctl(struct file *file, unsigned int cmd, unsigned long arg)</div><div class='ctx'> {</div><div class='del'>-	__u8 regs = readb(d7s_regs);</div><div class='del'>-	__u8 ireg = 0;</div><div class='add'>+	struct d7s *p = d7s_device;</div><div class='add'>+	u8 regs = readb(p-&gt;regs);</div><div class='ctx'> 	int error = 0;</div><div class='add'>+	u8 ireg = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (D7S_MINOR != iminor(file-&gt;f_path.dentry-&gt;d_inode))</div><div class='ctx'> 		return -ENODEV;</div><div class='hunk'>@@ -129,18 +112,20 @@ static long d7s_ioctl(struct file *file, unsigned int cmd, unsigned long arg)</div><div class='ctx'> 	lock_kernel();</div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case D7SIOCWR:</div><div class='del'>-		/* assign device register values</div><div class='del'>-		 * we mask-out D7S_FLIP if in sol_compat mode</div><div class='add'>+		/* assign device register values we mask-out D7S_FLIP</div><div class='add'>+		 * if in sol_compat mode</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (get_user(ireg, (int __user *) arg)) {</div><div class='ctx'> 			error = -EFAULT;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		if (0 != sol_compat) {</div><div class='del'>-			(regs &amp; D7S_FLIP) ? </div><div class='del'>-				(ireg |= D7S_FLIP) : (ireg &amp;= ~D7S_FLIP);</div><div class='add'>+		if (sol_compat) {</div><div class='add'>+			if (regs &amp; D7S_FLIP)</div><div class='add'>+				ireg |= D7S_FLIP;</div><div class='add'>+			else</div><div class='add'>+				ireg &amp;= ~D7S_FLIP;</div><div class='ctx'> 		}</div><div class='del'>-		writeb(ireg, d7s_regs);</div><div class='add'>+		writeb(ireg, p-&gt;regs);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case D7SIOCRD:</div><div class='hunk'>@@ -158,9 +143,11 @@ static long d7s_ioctl(struct file *file, unsigned int cmd, unsigned long arg)</div><div class='ctx'> </div><div class='ctx'> 	case D7SIOCTM:</div><div class='ctx'> 		/* toggle device mode-- flip display orientation */</div><div class='del'>-		(regs &amp; D7S_FLIP) ? </div><div class='del'>-			(regs &amp;= ~D7S_FLIP) : (regs |= D7S_FLIP);</div><div class='del'>-		writeb(regs, d7s_regs);</div><div class='add'>+		if (regs &amp; D7S_FLIP)</div><div class='add'>+			regs &amp;= ~D7S_FLIP;</div><div class='add'>+		else</div><div class='add'>+			regs |= D7S_FLIP;</div><div class='add'>+		writeb(regs, p-&gt;regs);</div><div class='ctx'> 		break;</div><div class='ctx'> 	};</div><div class='ctx'> 	unlock_kernel();</div><div class='hunk'>@@ -176,69 +163,123 @@ static const struct file_operations d7s_fops = {</div><div class='ctx'> 	.release =		d7s_release,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct miscdevice d7s_miscdev = { D7S_MINOR, D7S_DEVNAME, &amp;d7s_fops };</div><div class='add'>+static struct miscdevice d7s_miscdev = {</div><div class='add'>+	.minor		= D7S_MINOR,</div><div class='add'>+	.name		= DRIVER_NAME,</div><div class='add'>+	.fops		= &amp;d7s_fops</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-static int __init d7s_init(void)</div><div class='add'>+static int __devinit d7s_probe(struct of_device *op,</div><div class='add'>+			       const struct of_device_id *match)</div><div class='ctx'> {</div><div class='del'>-	struct linux_ebus *ebus = NULL;</div><div class='del'>-	struct linux_ebus_device *edev = NULL;</div><div class='del'>-	int iTmp = 0, regs = 0;</div><div class='del'>-</div><div class='del'>-	for_each_ebus(ebus) {</div><div class='del'>-		for_each_ebusdev(edev, ebus) {</div><div class='del'>-			if (!strcmp(edev-&gt;prom_node-&gt;name, D7S_OBPNAME))</div><div class='del'>-				goto ebus_done;</div><div class='del'>-		}</div><div class='add'>+	struct device_node *opts;</div><div class='add'>+	int err = -EINVAL;</div><div class='add'>+	struct d7s *p;</div><div class='add'>+	u8 regs;</div><div class='add'>+</div><div class='add'>+	if (d7s_device)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	p = kzalloc(sizeof(*p), GFP_KERNEL);</div><div class='add'>+	err = -ENOMEM;</div><div class='add'>+	if (!p)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	p-&gt;regs = of_ioremap(&amp;op-&gt;resource[0], 0, sizeof(u8), "d7s");</div><div class='add'>+	if (!p-&gt;regs) {</div><div class='add'>+		printk(KERN_ERR PFX "Cannot map chip registers\n");</div><div class='add'>+		goto out_free;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-ebus_done:</div><div class='del'>-	if(!edev) {</div><div class='del'>-		printk("%s: unable to locate device\n", D7S_DEVNAME);</div><div class='del'>-		return -ENODEV;</div><div class='add'>+	err = misc_register(&amp;d7s_miscdev);</div><div class='add'>+	if (err) {</div><div class='add'>+		printk(KERN_ERR PFX "Unable to acquire miscdevice minor %i\n",</div><div class='add'>+		       D7S_MINOR);</div><div class='add'>+		goto out_iounmap;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	d7s_regs = ioremap(edev-&gt;resource[0].start, sizeof(__u8));</div><div class='del'>-</div><div class='del'>-	iTmp = misc_register(&amp;d7s_miscdev);</div><div class='del'>-	if (0 != iTmp) {</div><div class='del'>-		printk("%s: unable to acquire miscdevice minor %i\n",</div><div class='del'>-		       D7S_DEVNAME, D7S_MINOR);</div><div class='del'>-		iounmap(d7s_regs);</div><div class='del'>-		return iTmp;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* OBP option "d7s-flipped?" is honored as default</div><div class='del'>-	 * for the device, and reset default when detached</div><div class='add'>+	/* OBP option "d7s-flipped?" is honored as default for the</div><div class='add'>+	 * device, and reset default when detached</div><div class='ctx'> 	 */</div><div class='del'>-	regs = readb(d7s_regs);</div><div class='del'>-	iTmp = d7s_obpflipped();</div><div class='del'>-	(0 == iTmp) ? </div><div class='del'>-		writeb(regs |= D7S_FLIP,  d7s_regs): </div><div class='del'>-		writeb(regs &amp;= ~D7S_FLIP, d7s_regs);</div><div class='del'>-</div><div class='del'>-	printk("%s: 7-Segment Display%s at 0x%lx %s\n", </div><div class='del'>-	       D7S_DEVNAME,</div><div class='del'>-	       (0 == iTmp) ? (" (FLIPPED)") : (""),</div><div class='del'>-	       edev-&gt;resource[0].start,</div><div class='del'>-	       (0 != sol_compat) ? ("in sol_compat mode") : (""));</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	regs = readb(p-&gt;regs);</div><div class='add'>+	opts = of_find_node_by_path("/options");</div><div class='add'>+	if (opts &amp;&amp;</div><div class='add'>+	    of_get_property(opts, "d7s-flipped?", NULL))</div><div class='add'>+		p-&gt;flipped = true;</div><div class='add'>+</div><div class='add'>+	if (p-&gt;flipped)</div><div class='add'>+		regs |= D7S_FLIP;</div><div class='add'>+	else</div><div class='add'>+		regs &amp;= ~D7S_FLIP;</div><div class='add'>+</div><div class='add'>+	writeb(regs,  p-&gt;regs);</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO PFX "7-Segment Display%s at [%s:0x%lx] %s\n", </div><div class='add'>+	       op-&gt;node-&gt;full_name,</div><div class='add'>+	       (regs &amp; D7S_FLIP) ? " (FLIPPED)" : "",</div><div class='add'>+	       op-&gt;resource[0].start,</div><div class='add'>+	       sol_compat ? "in sol_compat mode" : "");</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(&amp;op-&gt;dev, p);</div><div class='add'>+	d7s_device = p;</div><div class='add'>+	err = 0;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='add'>+</div><div class='add'>+out_iounmap:</div><div class='add'>+	of_iounmap(&amp;op-&gt;resource[0], p-&gt;regs, sizeof(u8));</div><div class='add'>+</div><div class='add'>+out_free:</div><div class='add'>+	kfree(p);</div><div class='add'>+	goto out;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __exit d7s_cleanup(void)</div><div class='add'>+static int __devexit d7s_remove(struct of_device *op)</div><div class='ctx'> {</div><div class='del'>-	int regs = readb(d7s_regs);</div><div class='add'>+	struct d7s *p = dev_get_drvdata(&amp;op-&gt;dev);</div><div class='add'>+	u8 regs = readb(p-&gt;regs);</div><div class='ctx'> </div><div class='ctx'> 	/* Honor OBP d7s-flipped? unless operating in solaris-compat mode */</div><div class='del'>-	if (0 == sol_compat) {</div><div class='del'>-		(0 == d7s_obpflipped())	? </div><div class='del'>-			writeb(regs |= D7S_FLIP,  d7s_regs):</div><div class='del'>-			writeb(regs &amp;= ~D7S_FLIP, d7s_regs);</div><div class='add'>+	if (sol_compat) {</div><div class='add'>+		if (p-&gt;flipped)</div><div class='add'>+			regs |= D7S_FLIP;</div><div class='add'>+		else</div><div class='add'>+			regs &amp;= ~D7S_FLIP;</div><div class='add'>+		writeb(regs, p-&gt;regs);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	misc_deregister(&amp;d7s_miscdev);</div><div class='del'>-	d7s_free();</div><div class='add'>+	of_iounmap(&amp;op-&gt;resource[0], p-&gt;regs, sizeof(u8));</div><div class='add'>+	kfree(p);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct of_device_id d7s_match[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "display7seg",</div><div class='add'>+	},</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, d7s_match);</div><div class='add'>+</div><div class='add'>+static struct of_platform_driver d7s_driver = {</div><div class='add'>+	.name		= DRIVER_NAME,</div><div class='add'>+	.match_table	= d7s_match,</div><div class='add'>+	.probe		= d7s_probe,</div><div class='add'>+	.remove		= __devexit_p(d7s_remove),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init d7s_init(void)</div><div class='add'>+{</div><div class='add'>+	return of_register_driver(&amp;d7s_driver, &amp;of_bus_type);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit d7s_exit(void)</div><div class='add'>+{</div><div class='add'>+	of_unregister_driver(&amp;d7s_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(d7s_init);</div><div class='del'>-module_exit(d7s_cleanup);</div><div class='add'>+module_exit(d7s_exit);</div><div class='head'>diff --git a/drivers/sbus/char/envctrl.c b/drivers/sbus/char/envctrl.c<br/>index a408402426f8..58e583b61e60 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/sbus/char/envctrl.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/sbus/char/envctrl.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/sbus/char/envctrl.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/sbus/char/envctrl.c</a></div><div class='hunk'>@@ -1,5 +1,4 @@</div><div class='del'>-/* $Id: envctrl.c,v 1.25 2002/01/15 09:01:26 davem Exp $</div><div class='del'>- * envctrl.c: Temperature and Fan monitoring on Machines providing it.</div><div class='add'>+/* envctrl.c: Temperature and Fan monitoring on Machines providing it.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 1998  Eddie C. Dost  (ecd@skynet.be)</div><div class='ctx'>  * Copyright (C) 2000  Vinh Truong    (vinh.truong@eng.sun.com)</div><div class='hunk'>@@ -28,12 +27,16 @@</div><div class='ctx'> #include &lt;linux/kmod.h&gt;</div><div class='ctx'> #include &lt;linux/reboot.h&gt;</div><div class='ctx'> #include &lt;linux/smp_lock.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_device.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/ebus.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/envctrl.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='add'>+#define DRIVER_NAME	"envctrl"</div><div class='add'>+#define PFX		DRIVER_NAME ": "</div><div class='add'>+</div><div class='ctx'> #define ENVCTRL_MINOR	162</div><div class='ctx'> </div><div class='ctx'> #define PCF8584_ADDRESS	0x55</div><div class='hunk'>@@ -193,7 +196,7 @@ static void envtrl_i2c_test_pin(void)</div><div class='ctx'> 	} </div><div class='ctx'> </div><div class='ctx'> 	if (limit &lt;= 0)</div><div class='del'>-		printk(KERN_INFO "envctrl: Pin status will not clear.\n");</div><div class='add'>+		printk(KERN_INFO PFX "Pin status will not clear.\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Function Description: Test busy bit.</div><div class='hunk'>@@ -211,7 +214,7 @@ static void envctrl_i2c_test_bb(void)</div><div class='ctx'> 	} </div><div class='ctx'> </div><div class='ctx'> 	if (limit &lt;= 0)</div><div class='del'>-		printk(KERN_INFO "envctrl: Busy bit will not clear.\n");</div><div class='add'>+		printk(KERN_INFO PFX "Busy bit will not clear.\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Function Description: Send the address for a read access.</div><div class='hunk'>@@ -858,11 +861,10 @@ static void envctrl_init_voltage_status(struct i2c_child_t *pchild)</div><div class='ctx'> /* Function Description: Initialize i2c child device.</div><div class='ctx'>  * Return: None.</div><div class='ctx'>  */</div><div class='del'>-static void envctrl_init_i2c_child(struct linux_ebus_child *edev_child,</div><div class='add'>+static void envctrl_init_i2c_child(struct device_node *dp,</div><div class='ctx'> 				   struct i2c_child_t *pchild)</div><div class='ctx'> {</div><div class='ctx'> 	int len, i, tbls_size = 0;</div><div class='del'>-	struct device_node *dp = edev_child-&gt;prom_node;</div><div class='ctx'> 	const void *pval;</div><div class='ctx'> </div><div class='ctx'> 	/* Get device address. */</div><div class='hunk'>@@ -882,12 +884,12 @@ static void envctrl_init_i2c_child(struct linux_ebus_child *edev_child,</div><div class='ctx'> </div><div class='ctx'>                 pchild-&gt;tables = kmalloc(tbls_size, GFP_KERNEL);</div><div class='ctx'> 		if (pchild-&gt;tables == NULL){</div><div class='del'>-			printk("envctrl: Failed to allocate table.\n");</div><div class='add'>+			printk(KERN_ERR PFX "Failed to allocate table.\n");</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> 		pval = of_get_property(dp, "tables", &amp;len);</div><div class='ctx'>                 if (!pval || len &lt;= 0) {</div><div class='del'>-			printk("envctrl: Failed to get table.\n");</div><div class='add'>+			printk(KERN_ERR PFX "Failed to get table.\n");</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> 		memcpy(pchild-&gt;tables, pval, len);</div><div class='hunk'>@@ -993,14 +995,14 @@ static int kenvctrld(void *__unused)</div><div class='ctx'> 	struct i2c_child_t *cputemp;</div><div class='ctx'> </div><div class='ctx'> 	if (NULL == (cputemp = envctrl_get_i2c_child(ENVCTRL_CPUTEMP_MON))) {</div><div class='del'>-		printk(KERN_ERR </div><div class='del'>-		       "envctrl: kenvctrld unable to monitor CPU temp-- exiting\n");</div><div class='add'>+		printk(KERN_ERR  PFX</div><div class='add'>+		       "kenvctrld unable to monitor CPU temp-- exiting\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	poll_interval = 5000; /* TODO env_mon_interval */</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "envctrl: %s starting...\n", current-&gt;comm);</div><div class='add'>+	printk(KERN_INFO PFX "%s starting...\n", current-&gt;comm);</div><div class='ctx'> 	for (;;) {</div><div class='ctx'> 		msleep_interruptible(poll_interval);</div><div class='ctx'> </div><div class='hunk'>@@ -1022,54 +1024,35 @@ static int kenvctrld(void *__unused)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	printk(KERN_INFO "envctrl: %s exiting...\n", current-&gt;comm);</div><div class='add'>+	printk(KERN_INFO PFX "%s exiting...\n", current-&gt;comm);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init envctrl_init(void)</div><div class='add'>+static int __devinit envctrl_probe(struct of_device *op,</div><div class='add'>+				   const struct of_device_id *match)</div><div class='ctx'> {</div><div class='del'>-	struct linux_ebus *ebus = NULL;</div><div class='del'>-	struct linux_ebus_device *edev = NULL;</div><div class='del'>-	struct linux_ebus_child *edev_child = NULL;</div><div class='del'>-	int err, i = 0;</div><div class='del'>-</div><div class='del'>-	for_each_ebus(ebus) {</div><div class='del'>-		for_each_ebusdev(edev, ebus) {</div><div class='del'>-			if (!strcmp(edev-&gt;prom_node-&gt;name, "bbc")) {</div><div class='del'>-				/* If we find a boot-bus controller node,</div><div class='del'>-				 * then this envctrl driver is not for us.</div><div class='del'>-				 */</div><div class='del'>-				return -ENODEV;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	struct device_node *dp;</div><div class='add'>+	int index, err;</div><div class='ctx'> </div><div class='del'>-	/* Traverse through ebus and ebus device list for i2c device and</div><div class='del'>-	 * adc and gpio nodes.</div><div class='del'>-	 */</div><div class='del'>-	for_each_ebus(ebus) {</div><div class='del'>-		for_each_ebusdev(edev, ebus) {</div><div class='del'>-			if (!strcmp(edev-&gt;prom_node-&gt;name, "i2c")) {</div><div class='del'>-				i2c = ioremap(edev-&gt;resource[0].start, 0x2);</div><div class='del'>-				for_each_edevchild(edev, edev_child) {</div><div class='del'>-					if (!strcmp("gpio", edev_child-&gt;prom_node-&gt;name)) {</div><div class='del'>-						i2c_childlist[i].i2ctype = I2C_GPIO;</div><div class='del'>-						envctrl_init_i2c_child(edev_child, &amp;(i2c_childlist[i++]));</div><div class='del'>-					}</div><div class='del'>-					if (!strcmp("adc", edev_child-&gt;prom_node-&gt;name)) {</div><div class='del'>-						i2c_childlist[i].i2ctype = I2C_ADC;</div><div class='del'>-						envctrl_init_i2c_child(edev_child, &amp;(i2c_childlist[i++]));</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-				goto done;</div><div class='del'>-			}</div><div class='add'>+	if (i2c)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	i2c = of_ioremap(&amp;op-&gt;resource[0], 0, 0x2, DRIVER_NAME);</div><div class='add'>+	if (!i2c)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	index = 0;</div><div class='add'>+	dp = op-&gt;node-&gt;child;</div><div class='add'>+	while (dp) {</div><div class='add'>+		if (!strcmp(dp-&gt;name, "gpio")) {</div><div class='add'>+			i2c_childlist[index].i2ctype = I2C_GPIO;</div><div class='add'>+			envctrl_init_i2c_child(dp, &amp;(i2c_childlist[index++]));</div><div class='add'>+		} else if (!strcmp(dp-&gt;name, "adc")) {</div><div class='add'>+			i2c_childlist[index].i2ctype = I2C_ADC;</div><div class='add'>+			envctrl_init_i2c_child(dp, &amp;(i2c_childlist[index++]));</div><div class='ctx'> 		}</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-done:</div><div class='del'>-	if (!edev) {</div><div class='del'>-		printk("envctrl: I2C device not found.\n");</div><div class='del'>-		return -ENODEV;</div><div class='add'>+		dp = dp-&gt;sibling;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Set device address. */</div><div class='hunk'>@@ -1087,7 +1070,7 @@ done:</div><div class='ctx'> 	/* Register the device as a minor miscellaneous device. */</div><div class='ctx'> 	err = misc_register(&amp;envctrl_dev);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		printk("envctrl: Unable to get misc minor %d\n",</div><div class='add'>+		printk(KERN_ERR PFX "Unable to get misc minor %d\n",</div><div class='ctx'> 		       envctrl_dev.minor);</div><div class='ctx'> 		goto out_iounmap;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1096,12 +1079,12 @@ done:</div><div class='ctx'> 	 * a next child device, so we decrement before reverse-traversal of</div><div class='ctx'> 	 * child devices.</div><div class='ctx'> 	 */</div><div class='del'>-	printk("envctrl: initialized ");</div><div class='del'>-	for (--i; i &gt;= 0; --i) {</div><div class='add'>+	printk(KERN_INFO PFX "Initialized ");</div><div class='add'>+	for (--index; index &gt;= 0; --index) {</div><div class='ctx'> 		printk("[%s 0x%lx]%s", </div><div class='del'>-			(I2C_ADC == i2c_childlist[i].i2ctype) ? ("adc") : </div><div class='del'>-			((I2C_GPIO == i2c_childlist[i].i2ctype) ? ("gpio") : ("unknown")), </div><div class='del'>-			i2c_childlist[i].addr, (0 == i) ? ("\n") : (" "));</div><div class='add'>+			(I2C_ADC == i2c_childlist[index].i2ctype) ? "adc" : </div><div class='add'>+			((I2C_GPIO == i2c_childlist[index].i2ctype) ? "gpio" : "unknown"), </div><div class='add'>+			i2c_childlist[index].addr, (0 == index) ? "\n" : " ");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	kenvctrld_task = kthread_run(kenvctrld, NULL, "kenvctrld");</div><div class='hunk'>@@ -1115,26 +1098,54 @@ done:</div><div class='ctx'> out_deregister:</div><div class='ctx'> 	misc_deregister(&amp;envctrl_dev);</div><div class='ctx'> out_iounmap:</div><div class='del'>-	iounmap(i2c);</div><div class='del'>-	for (i = 0; i &lt; ENVCTRL_MAX_CPU * 2; i++)</div><div class='del'>-		kfree(i2c_childlist[i].tables);</div><div class='add'>+	of_iounmap(&amp;op-&gt;resource[0], i2c, 0x2);</div><div class='add'>+	for (index = 0; index &lt; ENVCTRL_MAX_CPU * 2; index++)</div><div class='add'>+		kfree(i2c_childlist[index].tables);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __exit envctrl_cleanup(void)</div><div class='add'>+static int __devexit envctrl_remove(struct of_device *op)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='add'>+	int index;</div><div class='ctx'> </div><div class='ctx'> 	kthread_stop(kenvctrld_task);</div><div class='ctx'> </div><div class='del'>-	iounmap(i2c);</div><div class='add'>+	of_iounmap(&amp;op-&gt;resource[0], i2c, 0x2);</div><div class='ctx'> 	misc_deregister(&amp;envctrl_dev);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; ENVCTRL_MAX_CPU * 2; i++)</div><div class='del'>-		kfree(i2c_childlist[i].tables);</div><div class='add'>+	for (index = 0; index &lt; ENVCTRL_MAX_CPU * 2; index++)</div><div class='add'>+		kfree(i2c_childlist[index].tables);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct of_device_id envctrl_match[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "i2c",</div><div class='add'>+		.compatible = "i2cpcf,8584",</div><div class='add'>+	},</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, envctrl_match);</div><div class='add'>+</div><div class='add'>+static struct of_platform_driver envctrl_driver = {</div><div class='add'>+	.name		= DRIVER_NAME,</div><div class='add'>+	.match_table	= envctrl_match,</div><div class='add'>+	.probe		= envctrl_probe,</div><div class='add'>+	.remove		= __devexit_p(envctrl_remove),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init envctrl_init(void)</div><div class='add'>+{</div><div class='add'>+	return of_register_driver(&amp;envctrl_driver, &amp;of_bus_type);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit envctrl_exit(void)</div><div class='add'>+{</div><div class='add'>+	of_unregister_driver(&amp;envctrl_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(envctrl_init);</div><div class='del'>-module_exit(envctrl_cleanup);</div><div class='add'>+module_exit(envctrl_exit);</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/sbus/char/flash.c b/drivers/sbus/char/flash.c<br/>index 7d95e151513a..41083472ff4f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/sbus/char/flash.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/sbus/char/flash.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/sbus/char/flash.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/sbus/char/flash.c</a></div><div class='hunk'>@@ -1,5 +1,4 @@</div><div class='del'>-/* $Id: flash.c,v 1.25 2001/12/21 04:56:16 davem Exp $</div><div class='del'>- * flash.c: Allow mmap access to the OBP Flash, for OBP updates.</div><div class='add'>+/* flash.c: Allow mmap access to the OBP Flash, for OBP updates.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 1997  Eddie C. Dost  (ecd@skynet.be)</div><div class='ctx'>  */</div><div class='hunk'>@@ -15,13 +14,13 @@</div><div class='ctx'> #include &lt;linux/smp_lock.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/sbus.h&gt;</div><div class='del'>-#include &lt;asm/ebus.h&gt;</div><div class='ctx'> #include &lt;asm/upa.h&gt;</div><div class='ctx'> </div><div class='ctx'> static DEFINE_SPINLOCK(flash_lock);</div><div class='hunk'>@@ -161,97 +160,68 @@ static const struct file_operations flash_fops = {</div><div class='ctx'> </div><div class='ctx'> static struct miscdevice flash_dev = { FLASH_MINOR, "flash", &amp;flash_fops };</div><div class='ctx'> </div><div class='del'>-static int __init flash_init(void)</div><div class='add'>+static int __devinit flash_probe(struct of_device *op,</div><div class='add'>+				 const struct of_device_id *match)</div><div class='ctx'> {</div><div class='del'>-	struct sbus_bus *sbus;</div><div class='del'>-	struct sbus_dev *sdev = NULL;</div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-	struct linux_ebus *ebus;</div><div class='del'>-	struct linux_ebus_device *edev = NULL;</div><div class='del'>-	struct linux_prom_registers regs[2];</div><div class='del'>-	int len, nregs;</div><div class='del'>-#endif</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	for_all_sbusdev(sdev, sbus) {</div><div class='del'>-		if (!strcmp(sdev-&gt;prom_name, "flashprom")) {</div><div class='del'>-			if (sdev-&gt;reg_addrs[0].phys_addr == sdev-&gt;reg_addrs[1].phys_addr) {</div><div class='del'>-				flash.read_base = ((unsigned long)sdev-&gt;reg_addrs[0].phys_addr) |</div><div class='del'>-					(((unsigned long)sdev-&gt;reg_addrs[0].which_io)&lt;&lt;32UL);</div><div class='del'>-				flash.read_size = sdev-&gt;reg_addrs[0].reg_size;</div><div class='del'>-				flash.write_base = flash.read_base;</div><div class='del'>-				flash.write_size = flash.read_size;</div><div class='del'>-			} else {</div><div class='del'>-				flash.read_base = ((unsigned long)sdev-&gt;reg_addrs[0].phys_addr) |</div><div class='del'>-					(((unsigned long)sdev-&gt;reg_addrs[0].which_io)&lt;&lt;32UL);</div><div class='del'>-				flash.read_size = sdev-&gt;reg_addrs[0].reg_size;</div><div class='del'>-				flash.write_base = ((unsigned long)sdev-&gt;reg_addrs[1].phys_addr) |</div><div class='del'>-					(((unsigned long)sdev-&gt;reg_addrs[1].which_io)&lt;&lt;32UL);</div><div class='del'>-				flash.write_size = sdev-&gt;reg_addrs[1].reg_size;</div><div class='del'>-			}</div><div class='del'>-			flash.busy = 0;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (!sdev) {</div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-		const struct linux_prom_registers *ebus_regs;</div><div class='del'>-</div><div class='del'>-		for_each_ebus(ebus) {</div><div class='del'>-			for_each_ebusdev(edev, ebus) {</div><div class='del'>-				if (!strcmp(edev-&gt;prom_node-&gt;name, "flashprom"))</div><div class='del'>-					goto ebus_done;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	ebus_done:</div><div class='del'>-		if (!edev)</div><div class='del'>-			return -ENODEV;</div><div class='del'>-</div><div class='del'>-		ebus_regs = of_get_property(edev-&gt;prom_node, "reg", &amp;len);</div><div class='del'>-		if (!ebus_regs || (len % sizeof(regs[0])) != 0) {</div><div class='del'>-			printk("flash: Strange reg property size %d\n", len);</div><div class='del'>-			return -ENODEV;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		nregs = len / sizeof(ebus_regs[0]);</div><div class='add'>+	struct device_node *dp = op-&gt;node;</div><div class='add'>+	struct device_node *parent;</div><div class='ctx'> </div><div class='del'>-		flash.read_base = edev-&gt;resource[0].start;</div><div class='del'>-		flash.read_size = ebus_regs[0].reg_size;</div><div class='add'>+	parent = dp-&gt;parent;</div><div class='ctx'> </div><div class='del'>-		if (nregs == 1) {</div><div class='del'>-			flash.write_base = edev-&gt;resource[0].start;</div><div class='del'>-			flash.write_size = ebus_regs[0].reg_size;</div><div class='del'>-		} else if (nregs == 2) {</div><div class='del'>-			flash.write_base = edev-&gt;resource[1].start;</div><div class='del'>-			flash.write_size = ebus_regs[1].reg_size;</div><div class='del'>-		} else {</div><div class='del'>-			printk("flash: Strange number of regs %d\n", nregs);</div><div class='del'>-			return -ENODEV;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		flash.busy = 0;</div><div class='del'>-</div><div class='del'>-#else</div><div class='add'>+	if (strcmp(parent-&gt;name, "sbus") &amp;&amp;</div><div class='add'>+	    strcmp(parent-&gt;name, "sbi") &amp;&amp;</div><div class='add'>+	    strcmp(parent-&gt;name, "ebus"))</div><div class='ctx'> 		return -ENODEV;</div><div class='del'>-#endif</div><div class='add'>+</div><div class='add'>+	flash.read_base = op-&gt;resource[0].start;</div><div class='add'>+	flash.read_size = resource_size(&amp;op-&gt;resource[0]);</div><div class='add'>+	if (op-&gt;resource[1].flags) {</div><div class='add'>+		flash.write_base = op-&gt;resource[1].start;</div><div class='add'>+		flash.write_size = resource_size(&amp;op-&gt;resource[1]);</div><div class='add'>+	} else {</div><div class='add'>+		flash.write_base = op-&gt;resource[0].start;</div><div class='add'>+		flash.write_size = resource_size(&amp;op-&gt;resource[0]);</div><div class='ctx'> 	}</div><div class='add'>+	flash.busy = 0;</div><div class='ctx'> </div><div class='del'>-	printk("OBP Flash: RD %lx[%lx] WR %lx[%lx]\n",</div><div class='add'>+	printk(KERN_INFO "%s: OBP Flash, RD %lx[%lx] WR %lx[%lx]\n",</div><div class='add'>+	       op-&gt;node-&gt;full_name,</div><div class='ctx'> 	       flash.read_base, flash.read_size,</div><div class='ctx'> 	       flash.write_base, flash.write_size);</div><div class='ctx'> </div><div class='del'>-	err = misc_register(&amp;flash_dev);</div><div class='del'>-	if (err) {</div><div class='del'>-		printk(KERN_ERR "flash: unable to get misc minor\n");</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='add'>+	return misc_register(&amp;flash_dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devexit flash_remove(struct of_device *op)</div><div class='add'>+{</div><div class='add'>+	misc_deregister(&amp;flash_dev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static const struct of_device_id flash_match[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "flashprom",</div><div class='add'>+	},</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, flash_match);</div><div class='add'>+</div><div class='add'>+static struct of_platform_driver flash_driver = {</div><div class='add'>+	.name		= "flash",</div><div class='add'>+	.match_table	= flash_match,</div><div class='add'>+	.probe		= flash_probe,</div><div class='add'>+	.remove		= __devexit_p(flash_remove),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init flash_init(void)</div><div class='add'>+{</div><div class='add'>+	return of_register_driver(&amp;flash_driver, &amp;of_bus_type);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void __exit flash_cleanup(void)</div><div class='ctx'> {</div><div class='del'>-	misc_deregister(&amp;flash_dev);</div><div class='add'>+	of_unregister_driver(&amp;flash_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(flash_init);</div><div class='head'>diff --git a/drivers/sbus/char/rtc.c b/drivers/sbus/char/rtc.c<br/>deleted file mode 100644<br/>index b0429917154d..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/sbus/char/rtc.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/sbus/char/rtc.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,275 +0,0 @@</div><div class='del'>-/* $Id: rtc.c,v 1.28 2001/10/08 22:19:51 davem Exp $</div><div class='del'>- *</div><div class='del'>- * Linux/SPARC Real Time Clock Driver</div><div class='del'>- * Copyright (C) 1996 Thomas K. Dyas (tdyas@eden.rutgers.edu)</div><div class='del'>- *</div><div class='del'>- * This is a little driver that lets a user-level program access</div><div class='del'>- * the SPARC Mostek real time clock chip. It is no use unless you</div><div class='del'>- * use the modified clock utility.</div><div class='del'>- *</div><div class='del'>- * Get the modified clock utility from:</div><div class='del'>- *   ftp://vger.kernel.org/pub/linux/Sparc/userland/clock.c</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/smp_lock.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/miscdevice.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/fcntl.h&gt;</div><div class='del'>-#include &lt;linux/poll.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/mostek.h&gt;</div><div class='del'>-#include &lt;asm/system.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='del'>-#include &lt;asm/rtc.h&gt;</div><div class='del'>-</div><div class='del'>-static int rtc_busy = 0;</div><div class='del'>-</div><div class='del'>-/* This is the structure layout used by drivers/char/rtc.c, we</div><div class='del'>- * support that driver's ioctls so that things are less messy in</div><div class='del'>- * userspace.</div><div class='del'>- */</div><div class='del'>-struct rtc_time_generic {</div><div class='del'>-	int tm_sec;</div><div class='del'>-	int tm_min;</div><div class='del'>-	int tm_hour;</div><div class='del'>-	int tm_mday;</div><div class='del'>-	int tm_mon;</div><div class='del'>-	int tm_year;</div><div class='del'>-	int tm_wday;</div><div class='del'>-	int tm_yday;</div><div class='del'>-	int tm_isdst;</div><div class='del'>-};</div><div class='del'>-#define RTC_AIE_ON	_IO('p', 0x01)	/* Alarm int. enable on		*/</div><div class='del'>-#define RTC_AIE_OFF	_IO('p', 0x02)	/* ... off			*/</div><div class='del'>-#define RTC_UIE_ON	_IO('p', 0x03)	/* Update int. enable on	*/</div><div class='del'>-#define RTC_UIE_OFF	_IO('p', 0x04)	/* ... off			*/</div><div class='del'>-#define RTC_PIE_ON	_IO('p', 0x05)	/* Periodic int. enable on	*/</div><div class='del'>-#define RTC_PIE_OFF	_IO('p', 0x06)	/* ... off			*/</div><div class='del'>-#define RTC_WIE_ON	_IO('p', 0x0f)  /* Watchdog int. enable on	*/</div><div class='del'>-#define RTC_WIE_OFF	_IO('p', 0x10)  /* ... off			*/</div><div class='del'>-#define RTC_RD_TIME	_IOR('p', 0x09, struct rtc_time_generic) /* Read RTC time   */</div><div class='del'>-#define RTC_SET_TIME	_IOW('p', 0x0a, struct rtc_time_generic) /* Set RTC time    */</div><div class='del'>-#define RTC_ALM_SET	_IOW('p', 0x07, struct rtc_time) /* Set alarm time  */</div><div class='del'>-#define RTC_ALM_READ	_IOR('p', 0x08, struct rtc_time) /* Read alarm time */</div><div class='del'>-#define RTC_IRQP_READ	_IOR('p', 0x0b, unsigned long)	 /* Read IRQ rate   */</div><div class='del'>-#define RTC_IRQP_SET	_IOW('p', 0x0c, unsigned long)	 /* Set IRQ rate    */</div><div class='del'>-#define RTC_EPOCH_READ	_IOR('p', 0x0d, unsigned long)	 /* Read epoch      */</div><div class='del'>-#define RTC_EPOCH_SET	_IOW('p', 0x0e, unsigned long)	 /* Set epoch       */</div><div class='del'>-#define RTC_WKALM_SET	_IOW('p', 0x0f, struct rtc_wkalrm)/* Set wakeup alarm*/</div><div class='del'>-#define RTC_WKALM_RD	_IOR('p', 0x10, struct rtc_wkalrm)/* Get wakeup alarm*/</div><div class='del'>-#define RTC_PLL_GET	_IOR('p', 0x11, struct rtc_pll_info)  /* Get PLL correction */</div><div class='del'>-#define RTC_PLL_SET	_IOW('p', 0x12, struct rtc_pll_info)  /* Set PLL correction */</div><div class='del'>-</div><div class='del'>-/* Retrieve the current date and time from the real time clock. */</div><div class='del'>-static void get_rtc_time(struct rtc_time *t)</div><div class='del'>-{</div><div class='del'>-	void __iomem *regs = mstk48t02_regs;</div><div class='del'>-	u8 tmp;</div><div class='del'>-</div><div class='del'>-	spin_lock_irq(&amp;mostek_lock);</div><div class='del'>-</div><div class='del'>-	tmp = mostek_read(regs + MOSTEK_CREG);</div><div class='del'>-	tmp |= MSTK_CREG_READ;</div><div class='del'>-	mostek_write(regs + MOSTEK_CREG, tmp);</div><div class='del'>-</div><div class='del'>-	t-&gt;sec = MSTK_REG_SEC(regs);</div><div class='del'>-	t-&gt;min = MSTK_REG_MIN(regs);</div><div class='del'>-	t-&gt;hour = MSTK_REG_HOUR(regs);</div><div class='del'>-	t-&gt;dow = MSTK_REG_DOW(regs);</div><div class='del'>-	t-&gt;dom = MSTK_REG_DOM(regs);</div><div class='del'>-	t-&gt;month = MSTK_REG_MONTH(regs);</div><div class='del'>-	t-&gt;year = MSTK_CVT_YEAR( MSTK_REG_YEAR(regs) );</div><div class='del'>-</div><div class='del'>-	tmp = mostek_read(regs + MOSTEK_CREG);</div><div class='del'>-	tmp &amp;= ~MSTK_CREG_READ;</div><div class='del'>-	mostek_write(regs + MOSTEK_CREG, tmp);</div><div class='del'>-</div><div class='del'>-	spin_unlock_irq(&amp;mostek_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Set the current date and time inthe real time clock. */</div><div class='del'>-void set_rtc_time(struct rtc_time *t)</div><div class='del'>-{</div><div class='del'>-	void __iomem *regs = mstk48t02_regs;</div><div class='del'>-	u8 tmp;</div><div class='del'>-</div><div class='del'>-	spin_lock_irq(&amp;mostek_lock);</div><div class='del'>-</div><div class='del'>-	tmp = mostek_read(regs + MOSTEK_CREG);</div><div class='del'>-	tmp |= MSTK_CREG_WRITE;</div><div class='del'>-	mostek_write(regs + MOSTEK_CREG, tmp);</div><div class='del'>-</div><div class='del'>-	MSTK_SET_REG_SEC(regs,t-&gt;sec);</div><div class='del'>-	MSTK_SET_REG_MIN(regs,t-&gt;min);</div><div class='del'>-	MSTK_SET_REG_HOUR(regs,t-&gt;hour);</div><div class='del'>-	MSTK_SET_REG_DOW(regs,t-&gt;dow);</div><div class='del'>-	MSTK_SET_REG_DOM(regs,t-&gt;dom);</div><div class='del'>-	MSTK_SET_REG_MONTH(regs,t-&gt;month);</div><div class='del'>-	MSTK_SET_REG_YEAR(regs,t-&gt;year - MSTK_YEAR_ZERO);</div><div class='del'>-</div><div class='del'>-	tmp = mostek_read(regs + MOSTEK_CREG);</div><div class='del'>-	tmp &amp;= ~MSTK_CREG_WRITE;</div><div class='del'>-	mostek_write(regs + MOSTEK_CREG, tmp);</div><div class='del'>-</div><div class='del'>-	spin_unlock_irq(&amp;mostek_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int put_rtc_time_generic(void __user *argp, struct rtc_time *tm)</div><div class='del'>-{</div><div class='del'>-	struct rtc_time_generic __user *utm = argp;</div><div class='del'>-</div><div class='del'>-	if (__put_user(tm-&gt;sec, &amp;utm-&gt;tm_sec) ||</div><div class='del'>-	    __put_user(tm-&gt;min, &amp;utm-&gt;tm_min) ||</div><div class='del'>-	    __put_user(tm-&gt;hour, &amp;utm-&gt;tm_hour) ||</div><div class='del'>-	    __put_user(tm-&gt;dom, &amp;utm-&gt;tm_mday) ||</div><div class='del'>-	    __put_user(tm-&gt;month, &amp;utm-&gt;tm_mon) ||</div><div class='del'>-	    __put_user(tm-&gt;year, &amp;utm-&gt;tm_year) ||</div><div class='del'>-	    __put_user(tm-&gt;dow, &amp;utm-&gt;tm_wday) ||</div><div class='del'>-	    __put_user(0, &amp;utm-&gt;tm_yday) ||</div><div class='del'>-	    __put_user(0, &amp;utm-&gt;tm_isdst))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int get_rtc_time_generic(struct rtc_time *tm, void __user *argp)</div><div class='del'>-{</div><div class='del'>-	struct rtc_time_generic __user *utm = argp;</div><div class='del'>-</div><div class='del'>-	if (__get_user(tm-&gt;sec, &amp;utm-&gt;tm_sec) ||</div><div class='del'>-	    __get_user(tm-&gt;min, &amp;utm-&gt;tm_min) ||</div><div class='del'>-	    __get_user(tm-&gt;hour, &amp;utm-&gt;tm_hour) ||</div><div class='del'>-	    __get_user(tm-&gt;dom, &amp;utm-&gt;tm_mday) ||</div><div class='del'>-	    __get_user(tm-&gt;month, &amp;utm-&gt;tm_mon) ||</div><div class='del'>-	    __get_user(tm-&gt;year, &amp;utm-&gt;tm_year) ||</div><div class='del'>-	    __get_user(tm-&gt;dow, &amp;utm-&gt;tm_wday))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int rtc_ioctl(struct inode *inode, struct file *file, unsigned int cmd,</div><div class='del'>-	unsigned long arg)</div><div class='del'>-{</div><div class='del'>-	struct rtc_time rtc_tm;</div><div class='del'>-	void __user *argp = (void __user *)arg;</div><div class='del'>-</div><div class='del'>-	switch (cmd) {</div><div class='del'>-	/* No interrupt support, return an error</div><div class='del'>-	 * compatible with drivers/char/rtc.c</div><div class='del'>-	 */</div><div class='del'>-	case RTC_AIE_OFF:</div><div class='del'>-	case RTC_AIE_ON:</div><div class='del'>-	case RTC_PIE_OFF:</div><div class='del'>-	case RTC_PIE_ON:</div><div class='del'>-	case RTC_UIE_OFF:</div><div class='del'>-	case RTC_UIE_ON:</div><div class='del'>-	case RTC_IRQP_READ:</div><div class='del'>-	case RTC_IRQP_SET:</div><div class='del'>-	case RTC_EPOCH_SET:</div><div class='del'>-	case RTC_EPOCH_READ:</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	case RTCGET:</div><div class='del'>-	case RTC_RD_TIME:</div><div class='del'>-		memset(&amp;rtc_tm, 0, sizeof(struct rtc_time));</div><div class='del'>-		get_rtc_time(&amp;rtc_tm);</div><div class='del'>-</div><div class='del'>-		if (cmd == RTCGET) {</div><div class='del'>-			if (copy_to_user(argp, &amp;rtc_tm,</div><div class='del'>-					 sizeof(struct rtc_time)))</div><div class='del'>-				return -EFAULT;</div><div class='del'>-		} else if (put_rtc_time_generic(argp, &amp;rtc_tm))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	case RTCSET:</div><div class='del'>-	case RTC_SET_TIME:</div><div class='del'>-		if (!capable(CAP_SYS_TIME))</div><div class='del'>-			return -EPERM;</div><div class='del'>-</div><div class='del'>-		if (cmd == RTCSET) {</div><div class='del'>-			if (copy_from_user(&amp;rtc_tm, argp,</div><div class='del'>-					   sizeof(struct rtc_time)))</div><div class='del'>-				return -EFAULT;</div><div class='del'>-		} else if (get_rtc_time_generic(&amp;rtc_tm, argp))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-</div><div class='del'>-		set_rtc_time(&amp;rtc_tm);</div><div class='del'>-</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int rtc_open(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	lock_kernel();</div><div class='del'>-	spin_lock_irq(&amp;mostek_lock);</div><div class='del'>-	if (rtc_busy) {</div><div class='del'>-		ret = -EBUSY;</div><div class='del'>-	} else {</div><div class='del'>-		rtc_busy = 1;</div><div class='del'>-		ret = 0;</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irq(&amp;mostek_lock);</div><div class='del'>-	unlock_kernel();</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int rtc_release(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	rtc_busy = 0;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct file_operations rtc_fops = {</div><div class='del'>-	.owner =	THIS_MODULE,</div><div class='del'>-	.llseek =	no_llseek,</div><div class='del'>-	.ioctl =	rtc_ioctl,</div><div class='del'>-	.open =		rtc_open,</div><div class='del'>-	.release =	rtc_release,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct miscdevice rtc_dev = { RTC_MINOR, "rtc", &amp;rtc_fops };</div><div class='del'>-</div><div class='del'>-static int __init rtc_sun_init(void)</div><div class='del'>-{</div><div class='del'>-	int error;</div><div class='del'>-</div><div class='del'>-	/* It is possible we are being driven by some other RTC chip</div><div class='del'>-	 * and thus another RTC driver is handling things.</div><div class='del'>-	 */</div><div class='del'>-	if (!mstk48t02_regs)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	error = misc_register(&amp;rtc_dev);</div><div class='del'>-	if (error) {</div><div class='del'>-		printk(KERN_ERR "rtc: unable to get misc minor for Mostek\n");</div><div class='del'>-		return error;</div><div class='del'>-	}</div><div class='del'>-	printk("rtc_sun_init: Registered Mostek RTC driver.\n");</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit rtc_sun_cleanup(void)</div><div class='del'>-{</div><div class='del'>-	misc_deregister(&amp;rtc_dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(rtc_sun_init);</div><div class='del'>-module_exit(rtc_sun_cleanup);</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/sbus/char/uctrl.c b/drivers/sbus/char/uctrl.c<br/>index 777637594acd..27993c37775d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/sbus/char/uctrl.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/sbus/char/uctrl.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/sbus/char/uctrl.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/sbus/char/uctrl.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='del'>-/* $Id: uctrl.c,v 1.12 2001/10/08 22:19:51 davem Exp $</div><div class='del'>- * uctrl.c: TS102 Microcontroller interface on Tadpole Sparcbook 3</div><div class='add'>+/* uctrl.c: TS102 Microcontroller interface on Tadpole Sparcbook 3</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 1999 Derrick J Brashear (shadow@dementia.org)</div><div class='add'>+ * Copyright 2008 David S. Miller (davem@davemloft.net)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -14,6 +14,8 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/miscdevice.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/openprom.h&gt;</div><div class='ctx'> #include &lt;asm/oplib.h&gt;</div><div class='hunk'>@@ -21,7 +23,6 @@</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='del'>-#include &lt;asm/sbus.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define UCTRL_MINOR	174</div><div class='ctx'> </div><div class='hunk'>@@ -33,26 +34,26 @@</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> struct uctrl_regs {</div><div class='del'>-	volatile u32 uctrl_intr;</div><div class='del'>-	volatile u32 uctrl_data;</div><div class='del'>-	volatile u32 uctrl_stat;</div><div class='del'>-	volatile u32 uctrl_xxx[5];</div><div class='add'>+	u32 uctrl_intr;</div><div class='add'>+	u32 uctrl_data;</div><div class='add'>+	u32 uctrl_stat;</div><div class='add'>+	u32 uctrl_xxx[5];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ts102_regs {</div><div class='del'>-	volatile u32 card_a_intr;</div><div class='del'>-	volatile u32 card_a_stat;</div><div class='del'>-	volatile u32 card_a_ctrl;</div><div class='del'>-	volatile u32 card_a_xxx;</div><div class='del'>-	volatile u32 card_b_intr;</div><div class='del'>-	volatile u32 card_b_stat;</div><div class='del'>-	volatile u32 card_b_ctrl;</div><div class='del'>-	volatile u32 card_b_xxx;</div><div class='del'>-	volatile u32 uctrl_intr;</div><div class='del'>-	volatile u32 uctrl_data;</div><div class='del'>-	volatile u32 uctrl_stat;</div><div class='del'>-	volatile u32 uctrl_xxx;</div><div class='del'>-	volatile u32 ts102_xxx[4];</div><div class='add'>+	u32 card_a_intr;</div><div class='add'>+	u32 card_a_stat;</div><div class='add'>+	u32 card_a_ctrl;</div><div class='add'>+	u32 card_a_xxx;</div><div class='add'>+	u32 card_b_intr;</div><div class='add'>+	u32 card_b_stat;</div><div class='add'>+	u32 card_b_ctrl;</div><div class='add'>+	u32 card_b_xxx;</div><div class='add'>+	u32 uctrl_intr;</div><div class='add'>+	u32 uctrl_data;</div><div class='add'>+	u32 uctrl_stat;</div><div class='add'>+	u32 uctrl_xxx;</div><div class='add'>+	u32 ts102_xxx[4];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Bits for uctrl_intr register */</div><div class='hunk'>@@ -186,17 +187,15 @@ enum uctrl_opcode {</div><div class='ctx'>   POWER_RESTART=0x83,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct uctrl_driver {</div><div class='del'>-	struct uctrl_regs *regs;</div><div class='add'>+static struct uctrl_driver {</div><div class='add'>+	struct uctrl_regs __iomem *regs;</div><div class='ctx'> 	int irq;</div><div class='ctx'> 	int pending;</div><div class='ctx'> 	struct uctrl_status status;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct uctrl_driver drv;</div><div class='add'>+} *global_driver;</div><div class='ctx'> </div><div class='del'>-static void uctrl_get_event_status(void);</div><div class='del'>-static void uctrl_get_external_status(void);</div><div class='add'>+static void uctrl_get_event_status(struct uctrl_driver *);</div><div class='add'>+static void uctrl_get_external_status(struct uctrl_driver *);</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='ctx'> uctrl_ioctl(struct inode *inode, struct file *file,</div><div class='hunk'>@@ -213,16 +212,14 @@ static int</div><div class='ctx'> uctrl_open(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='ctx'> 	lock_kernel();</div><div class='del'>-	uctrl_get_event_status();</div><div class='del'>-	uctrl_get_external_status();</div><div class='add'>+	uctrl_get_event_status(global_driver);</div><div class='add'>+	uctrl_get_external_status(global_driver);</div><div class='ctx'> 	unlock_kernel();</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static irqreturn_t uctrl_interrupt(int irq, void *dev_id)</div><div class='ctx'> {</div><div class='del'>-	struct uctrl_driver *driver = (struct uctrl_driver *)dev_id;</div><div class='del'>-	printk("in uctrl_interrupt\n");</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -244,11 +241,11 @@ static struct miscdevice uctrl_dev = {</div><div class='ctx'> { \</div><div class='ctx'>   unsigned int i; \</div><div class='ctx'>   for (i = 0; i &lt; 10000; i++) { \</div><div class='del'>-    if (UCTRL_STAT_TXNF_STA &amp; driver-&gt;regs-&gt;uctrl_stat) \</div><div class='add'>+      if (UCTRL_STAT_TXNF_STA &amp; sbus_readl(&amp;driver-&gt;regs-&gt;uctrl_stat)) \</div><div class='ctx'>       break; \</div><div class='ctx'>   } \</div><div class='ctx'>   dprintk(("write data 0x%02x\n", value)); \</div><div class='del'>-  driver-&gt;regs-&gt;uctrl_data = value; \</div><div class='add'>+  sbus_writel(value, &amp;driver-&gt;regs-&gt;uctrl_data); \</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Wait for something to read, read it, then clear the bit */</div><div class='hunk'>@@ -257,24 +254,23 @@ static struct miscdevice uctrl_dev = {</div><div class='ctx'>   unsigned int i; \</div><div class='ctx'>   value = 0; \</div><div class='ctx'>   for (i = 0; i &lt; 10000; i++) { \</div><div class='del'>-    if ((UCTRL_STAT_RXNE_STA &amp; driver-&gt;regs-&gt;uctrl_stat) == 0) \</div><div class='add'>+      if ((UCTRL_STAT_RXNE_STA &amp; sbus_readl(&amp;driver-&gt;regs-&gt;uctrl_stat)) == 0) \</div><div class='ctx'>       break; \</div><div class='ctx'>     udelay(1); \</div><div class='ctx'>   } \</div><div class='del'>-  value = driver-&gt;regs-&gt;uctrl_data; \</div><div class='add'>+  value = sbus_readl(&amp;driver-&gt;regs-&gt;uctrl_data); \</div><div class='ctx'>   dprintk(("read data 0x%02x\n", value)); \</div><div class='del'>-  driver-&gt;regs-&gt;uctrl_stat = UCTRL_STAT_RXNE_STA; \</div><div class='add'>+  sbus_writel(UCTRL_STAT_RXNE_STA, &amp;driver-&gt;regs-&gt;uctrl_stat); \</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void uctrl_do_txn(struct uctrl_txn *txn)</div><div class='add'>+static void uctrl_do_txn(struct uctrl_driver *driver, struct uctrl_txn *txn)</div><div class='ctx'> {</div><div class='del'>-	struct uctrl_driver *driver = &amp;drv;</div><div class='ctx'> 	int stat, incnt, outcnt, bytecnt, intr;</div><div class='ctx'> 	u32 byte;</div><div class='ctx'> </div><div class='del'>-	stat = driver-&gt;regs-&gt;uctrl_stat;</div><div class='del'>-	intr = driver-&gt;regs-&gt;uctrl_intr;</div><div class='del'>-	driver-&gt;regs-&gt;uctrl_stat = stat;</div><div class='add'>+	stat = sbus_readl(&amp;driver-&gt;regs-&gt;uctrl_stat);</div><div class='add'>+	intr = sbus_readl(&amp;driver-&gt;regs-&gt;uctrl_intr);</div><div class='add'>+	sbus_writel(stat, &amp;driver-&gt;regs-&gt;uctrl_stat);</div><div class='ctx'> </div><div class='ctx'> 	dprintk(("interrupt stat 0x%x int 0x%x\n", stat, intr));</div><div class='ctx'> </div><div class='hunk'>@@ -305,9 +301,8 @@ static void uctrl_do_txn(struct uctrl_txn *txn)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void uctrl_get_event_status(void)</div><div class='add'>+static void uctrl_get_event_status(struct uctrl_driver *driver)</div><div class='ctx'> {</div><div class='del'>-	struct uctrl_driver *driver = &amp;drv;</div><div class='ctx'> 	struct uctrl_txn txn;</div><div class='ctx'> 	u8 outbits[2];</div><div class='ctx'> </div><div class='hunk'>@@ -317,7 +312,7 @@ static void uctrl_get_event_status(void)</div><div class='ctx'> 	txn.inbuf = NULL;</div><div class='ctx'> 	txn.outbuf = outbits;</div><div class='ctx'> </div><div class='del'>-	uctrl_do_txn(&amp;txn);</div><div class='add'>+	uctrl_do_txn(driver, &amp;txn);</div><div class='ctx'> </div><div class='ctx'> 	dprintk(("bytes %x %x\n", (outbits[0] &amp; 0xff), (outbits[1] &amp; 0xff)));</div><div class='ctx'> 	driver-&gt;status.event_status = </div><div class='hunk'>@@ -325,9 +320,8 @@ static void uctrl_get_event_status(void)</div><div class='ctx'> 	dprintk(("ev is %x\n", driver-&gt;status.event_status));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void uctrl_get_external_status(void)</div><div class='add'>+static void uctrl_get_external_status(struct uctrl_driver *driver)</div><div class='ctx'> {</div><div class='del'>-	struct uctrl_driver *driver = &amp;drv;</div><div class='ctx'> 	struct uctrl_txn txn;</div><div class='ctx'> 	u8 outbits[2];</div><div class='ctx'> 	int i, v;</div><div class='hunk'>@@ -338,7 +332,7 @@ static void uctrl_get_external_status(void)</div><div class='ctx'> 	txn.inbuf = NULL;</div><div class='ctx'> 	txn.outbuf = outbits;</div><div class='ctx'> </div><div class='del'>-	uctrl_do_txn(&amp;txn);</div><div class='add'>+	uctrl_do_txn(driver, &amp;txn);</div><div class='ctx'> </div><div class='ctx'> 	dprintk(("bytes %x %x\n", (outbits[0] &amp; 0xff), (outbits[1] &amp; 0xff)));</div><div class='ctx'> 	driver-&gt;status.external_status = </div><div class='hunk'>@@ -354,71 +348,101 @@ static void uctrl_get_external_status(void)</div><div class='ctx'> 	</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init ts102_uctrl_init(void)</div><div class='add'>+static int __devinit uctrl_probe(struct of_device *op,</div><div class='add'>+				 const struct of_device_id *match)</div><div class='ctx'> {</div><div class='del'>-	struct uctrl_driver *driver = &amp;drv;</div><div class='del'>-	int len;</div><div class='del'>-	struct linux_prom_irqs tmp_irq[2];</div><div class='del'>-        unsigned int vaddr[2] = { 0, 0 };</div><div class='del'>-	int tmpnode, uctrlnode = prom_getchild(prom_root_node);</div><div class='del'>-	int err;</div><div class='add'>+	struct uctrl_driver *p;</div><div class='add'>+	int err = -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	tmpnode = prom_searchsiblings(uctrlnode, "obio");</div><div class='add'>+	p = kzalloc(sizeof(*p), GFP_KERNEL);</div><div class='add'>+	if (!p) {</div><div class='add'>+		printk(KERN_ERR "uctrl: Unable to allocate device struct.\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (tmpnode)</div><div class='del'>-	  uctrlnode = prom_getchild(tmpnode);</div><div class='add'>+	p-&gt;regs = of_ioremap(&amp;op-&gt;resource[0], 0,</div><div class='add'>+			     resource_size(&amp;op-&gt;resource[0]),</div><div class='add'>+			     "uctrl");</div><div class='add'>+	if (!p-&gt;regs) {</div><div class='add'>+		printk(KERN_ERR "uctrl: Unable to map registers.\n");</div><div class='add'>+		goto out_free;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	uctrlnode = prom_searchsiblings(uctrlnode, "uctrl");</div><div class='add'>+	p-&gt;irq = op-&gt;irqs[0];</div><div class='add'>+	err = request_irq(p-&gt;irq, uctrl_interrupt, 0, "uctrl", p);</div><div class='add'>+	if (err) {</div><div class='add'>+		printk(KERN_ERR "uctrl: Unable to register irq.\n");</div><div class='add'>+		goto out_iounmap;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (!uctrlnode)</div><div class='del'>-		return -ENODEV;</div><div class='add'>+	err = misc_register(&amp;uctrl_dev);</div><div class='add'>+	if (err) {</div><div class='add'>+		printk(KERN_ERR "uctrl: Unable to register misc device.\n");</div><div class='add'>+		goto out_free_irq;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	/* the prom mapped it for us */</div><div class='del'>-	len = prom_getproperty(uctrlnode, "address", (void *) vaddr,</div><div class='del'>-			       sizeof(vaddr));</div><div class='del'>-	driver-&gt;regs = (struct uctrl_regs *)vaddr[0];</div><div class='add'>+	sbus_writel(UCTRL_INTR_RXNE_REQ|UCTRL_INTR_RXNE_MSK, &amp;p-&gt;regs-&gt;uctrl_intr);</div><div class='add'>+	printk(KERN_INFO "%s: uctrl regs[0x%p] (irq %d)\n",</div><div class='add'>+	       op-&gt;node-&gt;full_name, p-&gt;regs, p-&gt;irq);</div><div class='add'>+	uctrl_get_event_status(p);</div><div class='add'>+	uctrl_get_external_status(p);</div><div class='ctx'> </div><div class='del'>-	len = prom_getproperty(uctrlnode, "intr", (char *) tmp_irq,</div><div class='del'>-			       sizeof(tmp_irq));</div><div class='add'>+	dev_set_drvdata(&amp;op-&gt;dev, p);</div><div class='add'>+	global_driver = p;</div><div class='ctx'> </div><div class='del'>-	/* Flush device */</div><div class='del'>-	READUCTLDATA(len);</div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='ctx'> </div><div class='del'>-	if(!driver-&gt;irq) </div><div class='del'>-		driver-&gt;irq = tmp_irq[0].pri;</div><div class='add'>+out_free_irq:</div><div class='add'>+	free_irq(p-&gt;irq, p);</div><div class='ctx'> </div><div class='del'>-	err = request_irq(driver-&gt;irq, uctrl_interrupt, 0, "uctrl", driver);</div><div class='del'>-	if (err) {</div><div class='del'>-		printk("%s: unable to register irq %d\n",</div><div class='del'>-		       __func__, driver-&gt;irq);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='add'>+out_iounmap:</div><div class='add'>+	of_iounmap(&amp;op-&gt;resource[0], p-&gt;regs, resource_size(&amp;op-&gt;resource[0]));</div><div class='ctx'> </div><div class='del'>-	if (misc_register(&amp;uctrl_dev)) {</div><div class='del'>-		printk("%s: unable to get misc minor %d\n",</div><div class='del'>-		       __func__, uctrl_dev.minor);</div><div class='del'>-		free_irq(driver-&gt;irq, driver);</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='add'>+out_free:</div><div class='add'>+	kfree(p);</div><div class='add'>+	goto out;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	driver-&gt;regs-&gt;uctrl_intr = UCTRL_INTR_RXNE_REQ|UCTRL_INTR_RXNE_MSK;</div><div class='del'>-	printk("uctrl: 0x%p (irq %d)\n", driver-&gt;regs, driver-&gt;irq);</div><div class='del'>-	uctrl_get_event_status();</div><div class='del'>-	uctrl_get_external_status();</div><div class='del'>-        return 0;</div><div class='add'>+static int __devexit uctrl_remove(struct of_device *op)</div><div class='add'>+{</div><div class='add'>+	struct uctrl_driver *p = dev_get_drvdata(&amp;op-&gt;dev);</div><div class='add'>+</div><div class='add'>+	if (p) {</div><div class='add'>+		misc_deregister(&amp;uctrl_dev);</div><div class='add'>+		free_irq(p-&gt;irq, p);</div><div class='add'>+		of_iounmap(&amp;op-&gt;resource[0], p-&gt;regs, resource_size(&amp;op-&gt;resource[0]));</div><div class='add'>+		kfree(p);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __exit ts102_uctrl_cleanup(void)</div><div class='add'>+static const struct of_device_id uctrl_match[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "uctrl",</div><div class='add'>+	},</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, uctrl_match);</div><div class='add'>+</div><div class='add'>+static struct of_platform_driver uctrl_driver = {</div><div class='add'>+	.name		= "uctrl",</div><div class='add'>+	.match_table	= uctrl_match,</div><div class='add'>+	.probe		= uctrl_probe,</div><div class='add'>+	.remove		= __devexit_p(uctrl_remove),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int __init uctrl_init(void)</div><div class='ctx'> {</div><div class='del'>-	struct uctrl_driver *driver = &amp;drv;</div><div class='add'>+	return of_register_driver(&amp;uctrl_driver, &amp;of_bus_type);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	misc_deregister(&amp;uctrl_dev);</div><div class='del'>-	if (driver-&gt;irq)</div><div class='del'>-		free_irq(driver-&gt;irq, driver);</div><div class='del'>-	if (driver-&gt;regs)</div><div class='del'>-		driver-&gt;regs = NULL;</div><div class='add'>+static void __exit uctrl_exit(void)</div><div class='add'>+{</div><div class='add'>+	of_unregister_driver(&amp;uctrl_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(ts102_uctrl_init);</div><div class='del'>-module_exit(ts102_uctrl_cleanup);</div><div class='add'>+module_init(uctrl_init);</div><div class='add'>+module_exit(uctrl_exit);</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/sbus/char/vfc.h b/drivers/sbus/char/vfc.h<br/>deleted file mode 100644<br/>index a5240c52aa0b..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/sbus/char/vfc.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/sbus/char/vfc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,171 +0,0 @@</div><div class='del'>-#ifndef _LINUX_VFC_H_</div><div class='del'>-#define _LINUX_VFC_H_</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The control register for the vfc is at offset 0x4000</div><div class='del'>- * The first field ram bank is located at offset 0x5000</div><div class='del'>- * The second field ram bank is at offset 0x7000</div><div class='del'>- * i2c_reg address the Phillips PCF8584(see notes in vfc_i2c.c) </div><div class='del'>- *    data and transmit register.</div><div class='del'>- * i2c_s1 controls register s1 of the PCF8584</div><div class='del'>- * i2c_write seems to be similar to i2c_write but I am not </div><div class='del'>- *    quite sure why sun uses it</div><div class='del'>- * </div><div class='del'>- * I am also not sure whether or not you can read the fram bank as a</div><div class='del'>- * whole or whether you must read each word individually from offset</div><div class='del'>- * 0x5000 as soon as I figure it out I will update this file */</div><div class='del'>-</div><div class='del'>-struct vfc_regs {</div><div class='del'>-	char pad1[0x4000];</div><div class='del'>-	unsigned int control;  /* Offset 0x4000 */</div><div class='del'>-	char pad2[0xffb];      /* from offset 0x4004 to 0x5000 */</div><div class='del'>-	unsigned int fram_bank1; /* Offset 0x5000 */</div><div class='del'>-	char pad3[0xffb];        /* from offset 0x5004 to 0x6000 */</div><div class='del'>-	unsigned int i2c_reg; /* Offset 0x6000 */</div><div class='del'>-	unsigned int i2c_magic2; /* Offset 0x6004 */</div><div class='del'>-	unsigned int i2c_s1;  /* Offset 0x6008 */</div><div class='del'>-	unsigned int i2c_write; /* Offset 0x600c */</div><div class='del'>-	char pad4[0xff0];     /* from offset 0x6010 to 0x7000 */</div><div class='del'>-	unsigned int fram_bank2; /* Offset 0x7000 */</div><div class='del'>-	char pad5[0x1000];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define VFC_SAA9051_NR (13)</div><div class='del'>-#define VFC_SAA9051_ADDR (0x8a)</div><div class='del'>-	/* The saa9051 returns the following for its status </div><div class='del'>-	 * bit 0 - 0</div><div class='del'>-	 * bit 1 - SECAM color detected (1=found,0=not found)</div><div class='del'>-	 * bit 2 - COLOR detected (1=found,0=not found)</div><div class='del'>-	 * bit 3 - 0</div><div class='del'>-	 * bit 4 - Field frequency bit (1=60Hz (NTSC), 0=50Hz (PAL))</div><div class='del'>-	 * bit 5 - 1</div><div class='del'>-	 * bit 6 - horizontal frequency lock (1=transmitter found,</div><div class='del'>-	 *                                    0=no transmitter)</div><div class='del'>-	 * bit 7 - Power on reset bit (1=reset,0=at least one successful </div><div class='del'>-	 *                                       read of the status byte)</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-#define VFC_SAA9051_PONRES (0x80)</div><div class='del'>-#define VFC_SAA9051_HLOCK (0x40)</div><div class='del'>-#define VFC_SAA9051_FD (0x10)</div><div class='del'>-#define VFC_SAA9051_CD (0x04)</div><div class='del'>-#define VFC_SAA9051_CS (0x02)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* The various saa9051 sub addresses */</div><div class='del'>-</div><div class='del'>-#define VFC_SAA9051_IDEL (0) </div><div class='del'>-#define VFC_SAA9051_HSY_START (1)</div><div class='del'>-#define VFC_SAA9051_HSY_STOP (2)</div><div class='del'>-#define VFC_SAA9051_HC_START (3)</div><div class='del'>-#define VFC_SAA9051_HC_STOP (4)</div><div class='del'>-#define VFC_SAA9051_HS_START (5)</div><div class='del'>-#define VFC_SAA9051_HORIZ_PEAK (6)</div><div class='del'>-#define VFC_SAA9051_HUE (7)</div><div class='del'>-#define VFC_SAA9051_C1 (8)</div><div class='del'>-#define VFC_SAA9051_C2 (9)</div><div class='del'>-#define VFC_SAA9051_C3 (0xa)</div><div class='del'>-#define VFC_SAA9051_SECAM_DELAY (0xb)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Bit settings for saa9051 sub address 0x06 */</div><div class='del'>-</div><div class='del'>-#define VFC_SAA9051_AP1 (0x01)</div><div class='del'>-#define VFC_SAA9051_AP2 (0x02)</div><div class='del'>-#define VFC_SAA9051_COR1 (0x04)</div><div class='del'>-#define VFC_SAA9051_COR2 (0x08)</div><div class='del'>-#define VFC_SAA9051_BP1 (0x10)</div><div class='del'>-#define VFC_SAA9051_BP2 (0x20)</div><div class='del'>-#define VFC_SAA9051_PF (0x40)</div><div class='del'>-#define VFC_SAA9051_BY (0x80)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Bit settings for saa9051 sub address 0x08 */</div><div class='del'>-</div><div class='del'>-#define VFC_SAA9051_CCFR0 (0x01)</div><div class='del'>-#define VFC_SAA9051_CCFR1 (0x02)</div><div class='del'>-#define VFC_SAA9051_YPN (0x04)</div><div class='del'>-#define VFC_SAA9051_ALT (0x08)</div><div class='del'>-#define VFC_SAA9051_CO (0x10)</div><div class='del'>-#define VFC_SAA9051_VTR (0x20)</div><div class='del'>-#define VFC_SAA9051_FS (0x40)</div><div class='del'>-#define VFC_SAA9051_HPLL (0x80)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Bit settings for saa9051 sub address 9 */</div><div class='del'>-</div><div class='del'>-#define VFC_SAA9051_SS0 (0x01)</div><div class='del'>-#define VFC_SAA9051_SS1 (0x02)</div><div class='del'>-#define VFC_SAA9051_AFCC (0x04)</div><div class='del'>-#define VFC_SAA9051_CI (0x08)</div><div class='del'>-#define VFC_SAA9051_SA9D4 (0x10) /* Don't care bit */</div><div class='del'>-#define VFC_SAA9051_OEC (0x20)</div><div class='del'>-#define VFC_SAA9051_OEY (0x40)</div><div class='del'>-#define VFC_SAA9051_VNL (0x80)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Bit settings for saa9051 sub address 0x0A */</div><div class='del'>-</div><div class='del'>-#define VFC_SAA9051_YDL0 (0x01)</div><div class='del'>-#define VFC_SAA9051_YDL1 (0x02)</div><div class='del'>-#define VFC_SAA9051_YDL2 (0x04)</div><div class='del'>-#define VFC_SAA9051_SS2 (0x08)</div><div class='del'>-#define VFC_SAA9051_SS3 (0x10)</div><div class='del'>-#define VFC_SAA9051_YC (0x20)</div><div class='del'>-#define VFC_SAA9051_CT (0x40)</div><div class='del'>-#define VFC_SAA9051_SYC (0x80)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define VFC_SAA9051_SA(a,b) ((a)-&gt;saa9051_state_array[(b)+1])</div><div class='del'>-#define vfc_update_saa9051(a) (vfc_i2c_sendbuf((a),VFC_SAA9051_ADDR,\</div><div class='del'>-					    (a)-&gt;saa9051_state_array,\</div><div class='del'>-					    VFC_SAA9051_NR))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-struct vfc_dev {</div><div class='del'>-	volatile struct vfc_regs __iomem *regs;</div><div class='del'>-	struct vfc_regs *phys_regs;</div><div class='del'>-	unsigned int control_reg;</div><div class='del'>-	struct mutex device_lock_mtx;</div><div class='del'>-	int instance;</div><div class='del'>-	int busy;</div><div class='del'>-	unsigned long which_io;</div><div class='del'>-	unsigned char saa9051_state_array[VFC_SAA9051_NR];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void captstat_reset(struct vfc_dev *);</div><div class='del'>-void memptr_reset(struct vfc_dev *);</div><div class='del'>-</div><div class='del'>-int vfc_pcf8584_init(struct vfc_dev *);</div><div class='del'>-void vfc_i2c_delay_no_busy(struct vfc_dev *, unsigned long);</div><div class='del'>-void vfc_i2c_delay(struct vfc_dev *);</div><div class='del'>-int vfc_i2c_sendbuf(struct vfc_dev *, unsigned char, char *, int) ;</div><div class='del'>-int vfc_i2c_recvbuf(struct vfc_dev *, unsigned char, char *, int) ;</div><div class='del'>-int vfc_i2c_reset_bus(struct vfc_dev *);</div><div class='del'>-int vfc_init_i2c_bus(struct vfc_dev *);</div><div class='del'>-</div><div class='del'>-#define VFC_CONTROL_DIAGMODE  0x10000000</div><div class='del'>-#define VFC_CONTROL_MEMPTR    0x20000000</div><div class='del'>-#define VFC_CONTROL_CAPTURE   0x02000000</div><div class='del'>-#define VFC_CONTROL_CAPTRESET 0x04000000</div><div class='del'>-</div><div class='del'>-#define VFC_STATUS_CAPTURE    0x08000000</div><div class='del'>-</div><div class='del'>-#ifdef VFC_IOCTL_DEBUG</div><div class='del'>-#define VFC_IOCTL_DEBUG_PRINTK(a) printk a</div><div class='del'>-#else</div><div class='del'>-#define VFC_IOCTL_DEBUG_PRINTK(a)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef VFC_I2C_DEBUG</div><div class='del'>-#define VFC_I2C_DEBUG_PRINTK(a) printk a</div><div class='del'>-#else</div><div class='del'>-#define VFC_I2C_DEBUG_PRINTK(a)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#endif /* _LINUX_VFC_H_ */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/drivers/sbus/char/vfc_dev.c b/drivers/sbus/char/vfc_dev.c<br/>deleted file mode 100644<br/>index 25181bb7d627..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/sbus/char/vfc_dev.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/sbus/char/vfc_dev.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,736 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * drivers/sbus/char/vfc_dev.c</div><div class='del'>- *</div><div class='del'>- * Driver for the Videopix Frame Grabber.</div><div class='del'>- * </div><div class='del'>- * In order to use the VFC you need to program the video controller</div><div class='del'>- * chip. This chip is the Phillips SAA9051.  You need to call their</div><div class='del'>- * documentation ordering line to get the docs.</div><div class='del'>- *</div><div class='del'>- * There is very little documentation on the VFC itself.  There is</div><div class='del'>- * some useful info that can be found in the manuals that come with</div><div class='del'>- * the card.  I will hopefully write some better docs at a later date.</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1996 Manish Vachharajani (mvachhar@noc.rutgers.edu)</div><div class='del'>- * */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/fs.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;linux/mutex.h&gt;</div><div class='del'>-#include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/smp_lock.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/openprom.h&gt;</div><div class='del'>-#include &lt;asm/oplib.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/system.h&gt;</div><div class='del'>-#include &lt;asm/sbus.h&gt;</div><div class='del'>-#include &lt;asm/page.h&gt;</div><div class='del'>-#include &lt;asm/pgtable.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='del'>-</div><div class='del'>-#define VFC_MAJOR (60)</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-#define VFC_IOCTL_DEBUG</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include "vfc.h"</div><div class='del'>-#include &lt;asm/vfc_ioctls.h&gt;</div><div class='del'>-</div><div class='del'>-static const struct file_operations vfc_fops;</div><div class='del'>-static struct vfc_dev **vfc_dev_lst;</div><div class='del'>-static char vfcstr[]="vfc";</div><div class='del'>-static unsigned char saa9051_init_array[VFC_SAA9051_NR] = {</div><div class='del'>-	0x00, 0x64, 0x72, 0x52,</div><div class='del'>-	0x36, 0x18, 0xff, 0x20,</div><div class='del'>-	0xfc, 0x77, 0xe3, 0x50,</div><div class='del'>-	0x3e</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void vfc_lock_device(struct vfc_dev *dev)</div><div class='del'>-{</div><div class='del'>-	mutex_lock(&amp;dev-&gt;device_lock_mtx);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void vfc_unlock_device(struct vfc_dev *dev)</div><div class='del'>-{</div><div class='del'>-	mutex_unlock(&amp;dev-&gt;device_lock_mtx);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void vfc_captstat_reset(struct vfc_dev *dev)</div><div class='del'>-{</div><div class='del'>-	dev-&gt;control_reg |= VFC_CONTROL_CAPTRESET;</div><div class='del'>-	sbus_writel(dev-&gt;control_reg, &amp;dev-&gt;regs-&gt;control);</div><div class='del'>-	dev-&gt;control_reg &amp;= ~VFC_CONTROL_CAPTRESET;</div><div class='del'>-	sbus_writel(dev-&gt;control_reg, &amp;dev-&gt;regs-&gt;control);</div><div class='del'>-	dev-&gt;control_reg |= VFC_CONTROL_CAPTRESET;</div><div class='del'>-	sbus_writel(dev-&gt;control_reg, &amp;dev-&gt;regs-&gt;control);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void vfc_memptr_reset(struct vfc_dev *dev)</div><div class='del'>-{</div><div class='del'>-	dev-&gt;control_reg |= VFC_CONTROL_MEMPTR;</div><div class='del'>-	sbus_writel(dev-&gt;control_reg, &amp;dev-&gt;regs-&gt;control);</div><div class='del'>-	dev-&gt;control_reg &amp;= ~VFC_CONTROL_MEMPTR;</div><div class='del'>-	sbus_writel(dev-&gt;control_reg, &amp;dev-&gt;regs-&gt;control);</div><div class='del'>-	dev-&gt;control_reg |= VFC_CONTROL_MEMPTR; </div><div class='del'>-	sbus_writel(dev-&gt;control_reg, &amp;dev-&gt;regs-&gt;control);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int vfc_csr_init(struct vfc_dev *dev)</div><div class='del'>-{</div><div class='del'>-	dev-&gt;control_reg = 0x80000000;</div><div class='del'>-	sbus_writel(dev-&gt;control_reg, &amp;dev-&gt;regs-&gt;control);</div><div class='del'>-	udelay(200); </div><div class='del'>-	dev-&gt;control_reg &amp;= ~0x80000000;</div><div class='del'>-	sbus_writel(dev-&gt;control_reg, &amp;dev-&gt;regs-&gt;control);</div><div class='del'>-	udelay(100); </div><div class='del'>-	sbus_writel(0x0f000000, &amp;dev-&gt;regs-&gt;i2c_magic2);</div><div class='del'>-</div><div class='del'>-	vfc_memptr_reset(dev);</div><div class='del'>-</div><div class='del'>-	dev-&gt;control_reg &amp;= ~VFC_CONTROL_DIAGMODE;</div><div class='del'>-	dev-&gt;control_reg &amp;= ~VFC_CONTROL_CAPTURE;</div><div class='del'>-	dev-&gt;control_reg |= 0x40000000;</div><div class='del'>-	sbus_writel(dev-&gt;control_reg, &amp;dev-&gt;regs-&gt;control);</div><div class='del'>-</div><div class='del'>-	vfc_captstat_reset(dev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int vfc_saa9051_init(struct vfc_dev *dev)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; VFC_SAA9051_NR; i++)</div><div class='del'>-		dev-&gt;saa9051_state_array[i] = saa9051_init_array[i];</div><div class='del'>-</div><div class='del'>-	vfc_i2c_sendbuf(dev,VFC_SAA9051_ADDR,</div><div class='del'>-			dev-&gt;saa9051_state_array, VFC_SAA9051_NR);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int init_vfc_hw(struct vfc_dev *dev)</div><div class='del'>-{</div><div class='del'>-	vfc_lock_device(dev);</div><div class='del'>-	vfc_csr_init(dev);</div><div class='del'>-</div><div class='del'>-	vfc_pcf8584_init(dev);</div><div class='del'>-	vfc_init_i2c_bus(dev); /* hopefully this doesn't undo the magic</div><div class='del'>-				  sun code above*/</div><div class='del'>-	vfc_saa9051_init(dev);</div><div class='del'>-	vfc_unlock_device(dev);</div><div class='del'>-	return 0; </div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int init_vfc_devstruct(struct vfc_dev *dev, int instance)</div><div class='del'>-{</div><div class='del'>-	dev-&gt;instance=instance;</div><div class='del'>-	mutex_init(&amp;dev-&gt;device_lock_mtx);</div><div class='del'>-	dev-&gt;control_reg=0;</div><div class='del'>-	dev-&gt;busy=0;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int init_vfc_device(struct sbus_dev *sdev,struct vfc_dev *dev,</div><div class='del'>-			   int instance)</div><div class='del'>-{</div><div class='del'>-	if(dev == NULL) {</div><div class='del'>-		printk(KERN_ERR "VFC: Bogus pointer passed\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-	printk("Initializing vfc%d\n",instance);</div><div class='del'>-	dev-&gt;regs = NULL;</div><div class='del'>-	dev-&gt;regs = (volatile struct vfc_regs __iomem *)</div><div class='del'>-		sbus_ioremap(&amp;sdev-&gt;resource[0], 0,</div><div class='del'>-			     sizeof(struct vfc_regs), vfcstr);</div><div class='del'>-	dev-&gt;which_io = sdev-&gt;reg_addrs[0].which_io;</div><div class='del'>-	dev-&gt;phys_regs = (struct vfc_regs *) sdev-&gt;reg_addrs[0].phys_addr;</div><div class='del'>-	if (dev-&gt;regs == NULL)</div><div class='del'>-		return -EIO;</div><div class='del'>-</div><div class='del'>-	printk("vfc%d: registers mapped at phys_addr: 0x%lx\n    virt_addr: 0x%lx\n",</div><div class='del'>-	       instance,(unsigned long)sdev-&gt;reg_addrs[0].phys_addr,(unsigned long)dev-&gt;regs);</div><div class='del'>-</div><div class='del'>-	if (init_vfc_devstruct(dev, instance))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	if (init_vfc_hw(dev))</div><div class='del'>-		return -EIO;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static struct vfc_dev *vfc_get_dev_ptr(int instance)</div><div class='del'>-{</div><div class='del'>-	return vfc_dev_lst[instance];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static DEFINE_SPINLOCK(vfc_dev_lock);</div><div class='del'>-</div><div class='del'>-static int vfc_open(struct inode *inode, struct file *file) </div><div class='del'>-{</div><div class='del'>-	struct vfc_dev *dev;</div><div class='del'>-</div><div class='del'>-	lock_kernel();</div><div class='del'>-	spin_lock(&amp;vfc_dev_lock);</div><div class='del'>-	dev = vfc_get_dev_ptr(iminor(inode));</div><div class='del'>-	if (dev == NULL) {</div><div class='del'>-		spin_unlock(&amp;vfc_dev_lock);</div><div class='del'>-		unlock_kernel();</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-	if (dev-&gt;busy) {</div><div class='del'>-		spin_unlock(&amp;vfc_dev_lock);</div><div class='del'>-		unlock_kernel();</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dev-&gt;busy = 1;</div><div class='del'>-	spin_unlock(&amp;vfc_dev_lock);</div><div class='del'>-</div><div class='del'>-	vfc_lock_device(dev);</div><div class='del'>-	</div><div class='del'>-	vfc_csr_init(dev);</div><div class='del'>-	vfc_pcf8584_init(dev);</div><div class='del'>-	vfc_init_i2c_bus(dev);</div><div class='del'>-	vfc_saa9051_init(dev);</div><div class='del'>-	vfc_memptr_reset(dev);</div><div class='del'>-	vfc_captstat_reset(dev);</div><div class='del'>-	</div><div class='del'>-	vfc_unlock_device(dev);</div><div class='del'>-	unlock_kernel();</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int vfc_release(struct inode *inode,struct file *file) </div><div class='del'>-{</div><div class='del'>-	struct vfc_dev *dev;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;vfc_dev_lock);</div><div class='del'>-	dev = vfc_get_dev_ptr(iminor(inode));</div><div class='del'>-	if (!dev || !dev-&gt;busy) {</div><div class='del'>-		spin_unlock(&amp;vfc_dev_lock);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	dev-&gt;busy = 0;</div><div class='del'>-	spin_unlock(&amp;vfc_dev_lock);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int vfc_debug(struct vfc_dev *dev, int cmd, void __user *argp)</div><div class='del'>-{</div><div class='del'>-	struct vfc_debug_inout inout;</div><div class='del'>-	unsigned char *buffer;</div><div class='del'>-</div><div class='del'>-	if (!capable(CAP_SYS_ADMIN))</div><div class='del'>-		return -EPERM;</div><div class='del'>-</div><div class='del'>-	switch(cmd) {</div><div class='del'>-	case VFC_I2C_SEND:</div><div class='del'>-		if(copy_from_user(&amp;inout, argp, sizeof(inout)))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-</div><div class='del'>-		buffer = kmalloc(inout.len, GFP_KERNEL);</div><div class='del'>-		if (buffer == NULL)</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-</div><div class='del'>-		if(copy_from_user(buffer, inout.buffer, inout.len)) {</div><div class='del'>-			kfree(buffer);</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-</div><div class='del'>-		vfc_lock_device(dev);</div><div class='del'>-		inout.ret=</div><div class='del'>-			vfc_i2c_sendbuf(dev,inout.addr &amp; 0xff,</div><div class='del'>-					buffer,inout.len);</div><div class='del'>-</div><div class='del'>-		if (copy_to_user(argp,&amp;inout,sizeof(inout))) {</div><div class='del'>-			vfc_unlock_device(dev);</div><div class='del'>-			kfree(buffer);</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		}</div><div class='del'>-		vfc_unlock_device(dev);</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-	case VFC_I2C_RECV:</div><div class='del'>-		if (copy_from_user(&amp;inout, argp, sizeof(inout)))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-</div><div class='del'>-		buffer = kzalloc(inout.len, GFP_KERNEL);</div><div class='del'>-		if (buffer == NULL)</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-</div><div class='del'>-		vfc_lock_device(dev);</div><div class='del'>-		inout.ret=</div><div class='del'>-			vfc_i2c_recvbuf(dev,inout.addr &amp; 0xff</div><div class='del'>-					,buffer,inout.len);</div><div class='del'>-		vfc_unlock_device(dev);</div><div class='del'>-		</div><div class='del'>-		if (copy_to_user(inout.buffer, buffer, inout.len)) {</div><div class='del'>-			kfree(buffer);</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		}</div><div class='del'>-		if (copy_to_user(argp,&amp;inout,sizeof(inout))) {</div><div class='del'>-			kfree(buffer);</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		}</div><div class='del'>-		kfree(buffer);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int vfc_capture_start(struct vfc_dev *dev)</div><div class='del'>-{</div><div class='del'>-	vfc_captstat_reset(dev);</div><div class='del'>-	dev-&gt;control_reg = sbus_readl(&amp;dev-&gt;regs-&gt;control);</div><div class='del'>-	if((dev-&gt;control_reg &amp; VFC_STATUS_CAPTURE)) {</div><div class='del'>-		printk(KERN_ERR "vfc%d: vfc capture status not reset\n",</div><div class='del'>-		       dev-&gt;instance);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	vfc_lock_device(dev);</div><div class='del'>-	dev-&gt;control_reg &amp;= ~VFC_CONTROL_CAPTURE;</div><div class='del'>-	sbus_writel(dev-&gt;control_reg, &amp;dev-&gt;regs-&gt;control);</div><div class='del'>-	dev-&gt;control_reg |= VFC_CONTROL_CAPTURE;</div><div class='del'>-	sbus_writel(dev-&gt;control_reg, &amp;dev-&gt;regs-&gt;control);</div><div class='del'>-	dev-&gt;control_reg &amp;= ~VFC_CONTROL_CAPTURE;</div><div class='del'>-	sbus_writel(dev-&gt;control_reg, &amp;dev-&gt;regs-&gt;control);</div><div class='del'>-	vfc_unlock_device(dev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int vfc_capture_poll(struct vfc_dev *dev)</div><div class='del'>-{</div><div class='del'>-	int timeout = 1000;</div><div class='del'>-</div><div class='del'>-	while (!timeout--) {</div><div class='del'>-		if (sbus_readl(&amp;dev-&gt;regs-&gt;control) &amp; VFC_STATUS_CAPTURE)</div><div class='del'>-			break;</div><div class='del'>-		vfc_i2c_delay_no_busy(dev, 100);</div><div class='del'>-	}</div><div class='del'>-	if(!timeout) {</div><div class='del'>-		printk(KERN_WARNING "vfc%d: capture timed out\n",</div><div class='del'>-		       dev-&gt;instance);</div><div class='del'>-		return -ETIMEDOUT;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int vfc_set_control_ioctl(struct inode *inode, struct file *file, </div><div class='del'>-			  struct vfc_dev *dev, unsigned long arg) </div><div class='del'>-{</div><div class='del'>-	int setcmd, ret = 0;</div><div class='del'>-</div><div class='del'>-	if (copy_from_user(&amp;setcmd,(void __user *)arg,sizeof(unsigned int)))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	VFC_IOCTL_DEBUG_PRINTK(("vfc%d: IOCTL(VFCSCTRL) arg=0x%x\n",</div><div class='del'>-				dev-&gt;instance,setcmd));</div><div class='del'>-</div><div class='del'>-	switch(setcmd) {</div><div class='del'>-	case MEMPRST:</div><div class='del'>-		vfc_lock_device(dev);</div><div class='del'>-		vfc_memptr_reset(dev);</div><div class='del'>-		vfc_unlock_device(dev);</div><div class='del'>-		ret=0;</div><div class='del'>-		break;</div><div class='del'>-	case CAPTRCMD:</div><div class='del'>-		vfc_capture_start(dev);</div><div class='del'>-		vfc_capture_poll(dev);</div><div class='del'>-		break;</div><div class='del'>-	case DIAGMODE:</div><div class='del'>-		if(capable(CAP_SYS_ADMIN)) {</div><div class='del'>-			vfc_lock_device(dev);</div><div class='del'>-			dev-&gt;control_reg |= VFC_CONTROL_DIAGMODE;</div><div class='del'>-			sbus_writel(dev-&gt;control_reg, &amp;dev-&gt;regs-&gt;control);</div><div class='del'>-			vfc_unlock_device(dev);</div><div class='del'>-			ret = 0;</div><div class='del'>-		} else {</div><div class='del'>-			ret = -EPERM; </div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case NORMMODE:</div><div class='del'>-		vfc_lock_device(dev);</div><div class='del'>-		dev-&gt;control_reg &amp;= ~VFC_CONTROL_DIAGMODE;</div><div class='del'>-		sbus_writel(dev-&gt;control_reg, &amp;dev-&gt;regs-&gt;control);</div><div class='del'>-		vfc_unlock_device(dev);</div><div class='del'>-		ret = 0;</div><div class='del'>-		break;</div><div class='del'>-	case CAPTRSTR:</div><div class='del'>-		vfc_capture_start(dev);</div><div class='del'>-		ret = 0;</div><div class='del'>-		break;</div><div class='del'>-	case CAPTRWAIT:</div><div class='del'>-		vfc_capture_poll(dev);</div><div class='del'>-		ret = 0;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		break;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int vfc_port_change_ioctl(struct inode *inode, struct file *file,</div><div class='del'>-				 struct vfc_dev *dev, unsigned long arg)</div><div class='del'>-{</div><div class='del'>-	int ret = 0;</div><div class='del'>-	int cmd;</div><div class='del'>-</div><div class='del'>-	if(copy_from_user(&amp;cmd, (void __user *)arg, sizeof(unsigned int))) {</div><div class='del'>-		VFC_IOCTL_DEBUG_PRINTK(("vfc%d: User passed bogus pointer to "</div><div class='del'>-					"vfc_port_change_ioctl\n",</div><div class='del'>-					dev-&gt;instance));</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	VFC_IOCTL_DEBUG_PRINTK(("vfc%d: IOCTL(VFCPORTCHG) arg=0x%x\n",</div><div class='del'>-				dev-&gt;instance, cmd));</div><div class='del'>-</div><div class='del'>-	switch(cmd) {</div><div class='del'>-	case 1:</div><div class='del'>-	case 2:</div><div class='del'>-		VFC_SAA9051_SA(dev,VFC_SAA9051_HSY_START) = 0x72; </div><div class='del'>-		VFC_SAA9051_SA(dev,VFC_SAA9051_HSY_STOP) = 0x52;</div><div class='del'>-		VFC_SAA9051_SA(dev,VFC_SAA9051_HC_START) = 0x36;</div><div class='del'>-		VFC_SAA9051_SA(dev,VFC_SAA9051_HC_STOP) = 0x18;</div><div class='del'>-		VFC_SAA9051_SA(dev,VFC_SAA9051_HORIZ_PEAK) = VFC_SAA9051_BP2;</div><div class='del'>-		VFC_SAA9051_SA(dev,VFC_SAA9051_C3) = VFC_SAA9051_CT | VFC_SAA9051_SS3;</div><div class='del'>-		VFC_SAA9051_SA(dev,VFC_SAA9051_SECAM_DELAY) = 0x3e;</div><div class='del'>-		break;</div><div class='del'>-	case 3:</div><div class='del'>-		VFC_SAA9051_SA(dev,VFC_SAA9051_HSY_START) = 0x3a;</div><div class='del'>-		VFC_SAA9051_SA(dev,VFC_SAA9051_HSY_STOP) = 0x17;</div><div class='del'>-		VFC_SAA9051_SA(dev,VFC_SAA9051_HC_START) = 0xfa;</div><div class='del'>-		VFC_SAA9051_SA(dev,VFC_SAA9051_HC_STOP) = 0xde;</div><div class='del'>-		VFC_SAA9051_SA(dev,VFC_SAA9051_HORIZ_PEAK) =</div><div class='del'>-			VFC_SAA9051_BY | VFC_SAA9051_PF | VFC_SAA9051_BP2;</div><div class='del'>-		VFC_SAA9051_SA(dev,VFC_SAA9051_C3) = VFC_SAA9051_YC;</div><div class='del'>-		VFC_SAA9051_SA(dev,VFC_SAA9051_SECAM_DELAY) = 0;</div><div class='del'>-		VFC_SAA9051_SA(dev,VFC_SAA9051_C2) &amp;=</div><div class='del'>-			~(VFC_SAA9051_SS0 | VFC_SAA9051_SS1);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		return ret;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch(cmd) {</div><div class='del'>-	case 1:</div><div class='del'>-		VFC_SAA9051_SA(dev,VFC_SAA9051_C2) |=</div><div class='del'>-			(VFC_SAA9051_SS0 | VFC_SAA9051_SS1);</div><div class='del'>-		break;</div><div class='del'>-	case 2:</div><div class='del'>-		VFC_SAA9051_SA(dev,VFC_SAA9051_C2) &amp;=</div><div class='del'>-			~(VFC_SAA9051_SS0 | VFC_SAA9051_SS1);</div><div class='del'>-		VFC_SAA9051_SA(dev,VFC_SAA9051_C2) |= VFC_SAA9051_SS0; </div><div class='del'>-		break;</div><div class='del'>-	case 3:</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		return ret;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	VFC_SAA9051_SA(dev,VFC_SAA9051_C3) &amp;= ~(VFC_SAA9051_SS2);</div><div class='del'>-	ret=vfc_update_saa9051(dev);</div><div class='del'>-	udelay(500);</div><div class='del'>-	VFC_SAA9051_SA(dev,VFC_SAA9051_C3) |= (VFC_SAA9051_SS2);</div><div class='del'>-	ret=vfc_update_saa9051(dev);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int vfc_set_video_ioctl(struct inode *inode, struct file *file,</div><div class='del'>-			       struct vfc_dev *dev, unsigned long arg)</div><div class='del'>-{</div><div class='del'>-	int ret = 0;</div><div class='del'>-	int cmd;</div><div class='del'>-</div><div class='del'>-	if(copy_from_user(&amp;cmd, (void __user *)arg, sizeof(unsigned int))) {</div><div class='del'>-		VFC_IOCTL_DEBUG_PRINTK(("vfc%d: User passed bogus pointer to "</div><div class='del'>-					"vfc_set_video_ioctl\n",</div><div class='del'>-					dev-&gt;instance));</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	VFC_IOCTL_DEBUG_PRINTK(("vfc%d: IOCTL(VFCSVID) arg=0x%x\n",</div><div class='del'>-				dev-&gt;instance, cmd));</div><div class='del'>-	switch(cmd) {</div><div class='del'>-	case STD_NTSC:</div><div class='del'>-		VFC_SAA9051_SA(dev,VFC_SAA9051_C1) &amp;= ~VFC_SAA9051_ALT;</div><div class='del'>-		VFC_SAA9051_SA(dev,VFC_SAA9051_C1) |= VFC_SAA9051_YPN | </div><div class='del'>-			VFC_SAA9051_CCFR0 | VFC_SAA9051_CCFR1 | VFC_SAA9051_FS;</div><div class='del'>-		ret = vfc_update_saa9051(dev);</div><div class='del'>-		break;</div><div class='del'>-	case STD_PAL:</div><div class='del'>-		VFC_SAA9051_SA(dev,VFC_SAA9051_C1) &amp;= ~(VFC_SAA9051_YPN | </div><div class='del'>-							VFC_SAA9051_CCFR1 | </div><div class='del'>-							VFC_SAA9051_CCFR0 |</div><div class='del'>-							VFC_SAA9051_FS);</div><div class='del'>-		VFC_SAA9051_SA(dev,VFC_SAA9051_C1) |= VFC_SAA9051_ALT;</div><div class='del'>-		ret = vfc_update_saa9051(dev);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case COLOR_ON:</div><div class='del'>-		VFC_SAA9051_SA(dev,VFC_SAA9051_C1) |= VFC_SAA9051_CO;</div><div class='del'>-		VFC_SAA9051_SA(dev,VFC_SAA9051_HORIZ_PEAK) &amp;=</div><div class='del'>-			~(VFC_SAA9051_BY | VFC_SAA9051_PF);</div><div class='del'>-		ret = vfc_update_saa9051(dev);</div><div class='del'>-		break;</div><div class='del'>-	case MONO:</div><div class='del'>-		VFC_SAA9051_SA(dev,VFC_SAA9051_C1) &amp;= ~(VFC_SAA9051_CO);</div><div class='del'>-		VFC_SAA9051_SA(dev,VFC_SAA9051_HORIZ_PEAK) |=</div><div class='del'>-			(VFC_SAA9051_BY | VFC_SAA9051_PF);</div><div class='del'>-		ret = vfc_update_saa9051(dev);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		break;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int vfc_get_video_ioctl(struct inode *inode, struct file *file,</div><div class='del'>-			       struct vfc_dev *dev, unsigned long arg)</div><div class='del'>-{</div><div class='del'>-	int ret = 0;</div><div class='del'>-	unsigned int status = NO_LOCK;</div><div class='del'>-	unsigned char buf[1];</div><div class='del'>-</div><div class='del'>-	if(vfc_i2c_recvbuf(dev, VFC_SAA9051_ADDR, buf, 1)) {</div><div class='del'>-		printk(KERN_ERR "vfc%d: Unable to get status\n",</div><div class='del'>-		       dev-&gt;instance);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if(buf[0] &amp; VFC_SAA9051_HLOCK) {</div><div class='del'>-		status = NO_LOCK;</div><div class='del'>-	} else if(buf[0] &amp; VFC_SAA9051_FD) {</div><div class='del'>-		if(buf[0] &amp; VFC_SAA9051_CD)</div><div class='del'>-			status = NTSC_COLOR;</div><div class='del'>-		else</div><div class='del'>-			status = NTSC_NOCOLOR;</div><div class='del'>-	} else {</div><div class='del'>-		if(buf[0] &amp; VFC_SAA9051_CD)</div><div class='del'>-			status = PAL_COLOR;</div><div class='del'>-		else</div><div class='del'>-			status = PAL_NOCOLOR;</div><div class='del'>-	}</div><div class='del'>-	VFC_IOCTL_DEBUG_PRINTK(("vfc%d: IOCTL(VFCGVID) returning status 0x%x; "</div><div class='del'>-				"buf[0]=%x\n", dev-&gt;instance, status, buf[0]));</div><div class='del'>-</div><div class='del'>-	if (copy_to_user((void __user *)arg,&amp;status,sizeof(unsigned int))) {</div><div class='del'>-		VFC_IOCTL_DEBUG_PRINTK(("vfc%d: User passed bogus pointer to "</div><div class='del'>-					"vfc_get_video_ioctl\n",</div><div class='del'>-					dev-&gt;instance));</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int vfc_ioctl(struct inode *inode, struct file *file, unsigned int cmd,</div><div class='del'>-	      unsigned long arg) </div><div class='del'>-{</div><div class='del'>-	int ret = 0;</div><div class='del'>-	unsigned int tmp;</div><div class='del'>-	struct vfc_dev *dev;</div><div class='del'>-	void __user *argp = (void __user *)arg;</div><div class='del'>-</div><div class='del'>-	dev = vfc_get_dev_ptr(iminor(inode));</div><div class='del'>-	if(dev == NULL)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	</div><div class='del'>-	switch(cmd &amp; 0x0000ffff) {</div><div class='del'>-	case VFCGCTRL:</div><div class='del'>-#if 0</div><div class='del'>-		VFC_IOCTL_DEBUG_PRINTK(("vfc%d: IOCTL(VFCGCTRL)\n", dev-&gt;instance));</div><div class='del'>-#endif</div><div class='del'>-		tmp = sbus_readl(&amp;dev-&gt;regs-&gt;control);</div><div class='del'>-		if(copy_to_user(argp, &amp;tmp, sizeof(unsigned int))) {</div><div class='del'>-			ret = -EFAULT;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		ret = 0;</div><div class='del'>-		break;</div><div class='del'>-	case VFCSCTRL:</div><div class='del'>-		ret = vfc_set_control_ioctl(inode, file, dev, arg);</div><div class='del'>-		break;</div><div class='del'>-	case VFCGVID:</div><div class='del'>-		ret = vfc_get_video_ioctl(inode, file, dev, arg);</div><div class='del'>-		break;</div><div class='del'>-	case VFCSVID:</div><div class='del'>-		ret = vfc_set_video_ioctl(inode, file, dev, arg);</div><div class='del'>-		break;</div><div class='del'>-	case VFCHUE:</div><div class='del'>-		VFC_IOCTL_DEBUG_PRINTK(("vfc%d: IOCTL(VFCHUE)\n", dev-&gt;instance));</div><div class='del'>-		if(copy_from_user(&amp;tmp,argp,sizeof(unsigned int))) {</div><div class='del'>-			VFC_IOCTL_DEBUG_PRINTK(("vfc%d: User passed bogus pointer "</div><div class='del'>-						"to IOCTL(VFCHUE)", dev-&gt;instance));</div><div class='del'>-			ret = -EFAULT;</div><div class='del'>-		} else {</div><div class='del'>-			VFC_SAA9051_SA(dev,VFC_SAA9051_HUE) = tmp;</div><div class='del'>-			vfc_update_saa9051(dev);</div><div class='del'>-			ret = 0;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case VFCPORTCHG:</div><div class='del'>-		ret = vfc_port_change_ioctl(inode, file, dev, arg);</div><div class='del'>-		break;</div><div class='del'>-	case VFCRDINFO:</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		VFC_IOCTL_DEBUG_PRINTK(("vfc%d: IOCTL(VFCRDINFO)\n", dev-&gt;instance));</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		ret = vfc_debug(vfc_get_dev_ptr(iminor(inode)), cmd, argp);</div><div class='del'>-		break;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int vfc_mmap(struct file *file, struct vm_area_struct *vma) </div><div class='del'>-{</div><div class='del'>-	unsigned int map_size, ret, map_offset;</div><div class='del'>-	struct vfc_dev *dev;</div><div class='del'>-	</div><div class='del'>-	dev = vfc_get_dev_ptr(iminor(file-&gt;f_path.dentry-&gt;d_inode));</div><div class='del'>-	if(dev == NULL)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	map_size = vma-&gt;vm_end - vma-&gt;vm_start;</div><div class='del'>-	if(map_size &gt; sizeof(struct vfc_regs)) </div><div class='del'>-		map_size = sizeof(struct vfc_regs);</div><div class='del'>-</div><div class='del'>-	vma-&gt;vm_flags |=</div><div class='del'>-		(VM_MAYREAD | VM_MAYWRITE | VM_MAYSHARE);</div><div class='del'>-	map_offset = (unsigned int) (long)dev-&gt;phys_regs;</div><div class='del'>-	ret = io_remap_pfn_range(vma, vma-&gt;vm_start,</div><div class='del'>-				  MK_IOSPACE_PFN(dev-&gt;which_io,</div><div class='del'>-					map_offset &gt;&gt; PAGE_SHIFT),</div><div class='del'>-				  map_size, vma-&gt;vm_page_prot);</div><div class='del'>-</div><div class='del'>-	if(ret)</div><div class='del'>-		return -EAGAIN;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static const struct file_operations vfc_fops = {</div><div class='del'>-	.owner =	THIS_MODULE,</div><div class='del'>-	.llseek =	no_llseek,</div><div class='del'>-	.ioctl =	vfc_ioctl,</div><div class='del'>-	.mmap =		vfc_mmap,</div><div class='del'>-	.open =		vfc_open,</div><div class='del'>-	.release =	vfc_release,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int vfc_probe(void)</div><div class='del'>-{</div><div class='del'>-	struct sbus_bus *sbus;</div><div class='del'>-	struct sbus_dev *sdev = NULL;</div><div class='del'>-	int ret;</div><div class='del'>-	int instance = 0, cards = 0;</div><div class='del'>-</div><div class='del'>-	for_all_sbusdev(sdev, sbus) {</div><div class='del'>-		if (strcmp(sdev-&gt;prom_name, "vfc") == 0) {</div><div class='del'>-			cards++;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!cards)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	vfc_dev_lst = kcalloc(cards + 1, sizeof(struct vfc_dev*), GFP_KERNEL);</div><div class='del'>-	if (vfc_dev_lst == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	vfc_dev_lst[cards] = NULL;</div><div class='del'>-</div><div class='del'>-	ret = register_chrdev(VFC_MAJOR, vfcstr, &amp;vfc_fops);</div><div class='del'>-	if(ret) {</div><div class='del'>-		printk(KERN_ERR "Unable to get major number %d\n", VFC_MAJOR);</div><div class='del'>-		kfree(vfc_dev_lst);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-	instance = 0;</div><div class='del'>-	for_all_sbusdev(sdev, sbus) {</div><div class='del'>-		if (strcmp(sdev-&gt;prom_name, "vfc") == 0) {</div><div class='del'>-			vfc_dev_lst[instance]=(struct vfc_dev *)</div><div class='del'>-				kmalloc(sizeof(struct vfc_dev), GFP_KERNEL);</div><div class='del'>-			if (vfc_dev_lst[instance] == NULL)</div><div class='del'>-				return -ENOMEM;</div><div class='del'>-			ret = init_vfc_device(sdev,</div><div class='del'>-					      vfc_dev_lst[instance],</div><div class='del'>-					      instance);</div><div class='del'>-			if(ret) {</div><div class='del'>-				printk(KERN_ERR "Unable to initialize"</div><div class='del'>-				       " vfc%d device\n",</div><div class='del'>-				       instance);</div><div class='del'>-			} else {</div><div class='del'>-			}</div><div class='del'>-		</div><div class='del'>-			instance++;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef MODULE</div><div class='del'>-int init_module(void)</div><div class='del'>-#else </div><div class='del'>-int vfc_init(void)</div><div class='del'>-#endif</div><div class='del'>-{</div><div class='del'>-	return vfc_probe();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef MODULE</div><div class='del'>-static void deinit_vfc_device(struct vfc_dev *dev)</div><div class='del'>-{</div><div class='del'>-	if(dev == NULL)</div><div class='del'>-		return;</div><div class='del'>-	sbus_iounmap(dev-&gt;regs, sizeof(struct vfc_regs));</div><div class='del'>-	kfree(dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void cleanup_module(void)</div><div class='del'>-{</div><div class='del'>-	struct vfc_dev **devp;</div><div class='del'>-</div><div class='del'>-	unregister_chrdev(VFC_MAJOR,vfcstr);</div><div class='del'>-</div><div class='del'>-	for (devp = vfc_dev_lst; *devp; devp++)</div><div class='del'>-		deinit_vfc_device(*devp);</div><div class='del'>-</div><div class='del'>-	kfree(vfc_dev_lst);</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-</div><div class='head'>diff --git a/drivers/sbus/char/vfc_i2c.c b/drivers/sbus/char/vfc_i2c.c<br/>deleted file mode 100644<br/>index 32b986e0ed78..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/sbus/char/vfc_i2c.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/sbus/char/vfc_i2c.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,335 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * drivers/sbus/char/vfc_i2c.c</div><div class='del'>- *</div><div class='del'>- * Driver for the Videopix Frame Grabber.</div><div class='del'>- * </div><div class='del'>- * Functions that support the Phillips i2c(I squared C) bus on the vfc</div><div class='del'>- *  Documentation for the Phillips I2C bus can be found on the </div><div class='del'>- *  phillips home page</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1996 Manish Vachharajani (mvachhar@noc.rutgers.edu)</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* NOTE: It seems to me that the documentation regarding the</div><div class='del'>-pcd8584t/pcf8584 does not show the correct way to address the i2c bus.</div><div class='del'>-Based on the information on the I2C bus itself and the remainder of</div><div class='del'>-the Phillips docs the following algorithms appear to be correct.  I am</div><div class='del'>-fairly certain that the flowcharts in the phillips docs are wrong. */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/wait.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;asm/openprom.h&gt;</div><div class='del'>-#include &lt;asm/oplib.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/system.h&gt;</div><div class='del'>-#include &lt;asm/sbus.h&gt;</div><div class='del'>-</div><div class='del'>-#if 0 </div><div class='del'>-#define VFC_I2C_DEBUG</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include "vfc.h"</div><div class='del'>-#include "vfc_i2c.h"</div><div class='del'>-</div><div class='del'>-#define WRITE_S1(__val) \</div><div class='del'>-	sbus_writel(__val, &amp;dev-&gt;regs-&gt;i2c_s1)</div><div class='del'>-#define WRITE_REG(__val) \</div><div class='del'>-	sbus_writel(__val, &amp;dev-&gt;regs-&gt;i2c_reg)</div><div class='del'>-</div><div class='del'>-#define VFC_I2C_READ (0x1)</div><div class='del'>-#define VFC_I2C_WRITE (0x0)</div><div class='del'>-     </div><div class='del'>-/****** </div><div class='del'>-  The i2c bus controller chip on the VFC is a pcd8584t, but</div><div class='del'>-  phillips claims it doesn't exist.  As far as I can tell it is</div><div class='del'>-  identical to the PCF8584 so I treat it like it is the pcf8584.</div><div class='del'>-  </div><div class='del'>-  NOTE: The pcf8584 only cares</div><div class='del'>-  about the msb of the word you feed it </div><div class='del'>-*****/</div><div class='del'>-</div><div class='del'>-int vfc_pcf8584_init(struct vfc_dev *dev) </div><div class='del'>-{</div><div class='del'>-	/* This will also choose register S0_OWN so we can set it. */</div><div class='del'>-	WRITE_S1(RESET);</div><div class='del'>-</div><div class='del'>-	/* The pcf8584 shifts this value left one bit and uses</div><div class='del'>-	 * it as its i2c bus address.</div><div class='del'>-	 */</div><div class='del'>-	WRITE_REG(0x55000000);</div><div class='del'>-</div><div class='del'>-	/* This will set the i2c bus at the same speed sun uses,</div><div class='del'>-	 * and set another magic bit.</div><div class='del'>-	 */</div><div class='del'>-	WRITE_S1(SELECT(S2));</div><div class='del'>-	WRITE_REG(0x14000000);</div><div class='del'>-	</div><div class='del'>-	/* Enable the serial port, idle the i2c bus and set</div><div class='del'>-	 * the data reg to s0.</div><div class='del'>-	 */</div><div class='del'>-	WRITE_S1(CLEAR_I2C_BUS);</div><div class='del'>-	udelay(100);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void vfc_i2c_delay_no_busy(struct vfc_dev *dev, unsigned long usecs) </div><div class='del'>-{</div><div class='del'>-	schedule_timeout_uninterruptible(usecs_to_jiffies(usecs));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void inline vfc_i2c_delay(struct vfc_dev *dev) </div><div class='del'>-{ </div><div class='del'>-	vfc_i2c_delay_no_busy(dev, 100);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int vfc_init_i2c_bus(struct vfc_dev *dev)</div><div class='del'>-{</div><div class='del'>-	WRITE_S1(ENABLE_SERIAL | SELECT(S0) | ACK);</div><div class='del'>-	vfc_i2c_reset_bus(dev);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int vfc_i2c_reset_bus(struct vfc_dev *dev) </div><div class='del'>-{</div><div class='del'>-	VFC_I2C_DEBUG_PRINTK((KERN_DEBUG "vfc%d: Resetting the i2c bus\n",</div><div class='del'>-			      dev-&gt;instance));</div><div class='del'>-	if(dev == NULL)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	if(dev-&gt;regs == NULL)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	WRITE_S1(SEND_I2C_STOP);</div><div class='del'>-	WRITE_S1(SEND_I2C_STOP | ACK);</div><div class='del'>-	vfc_i2c_delay(dev);</div><div class='del'>-	WRITE_S1(CLEAR_I2C_BUS);</div><div class='del'>-	VFC_I2C_DEBUG_PRINTK((KERN_DEBUG "vfc%d: I2C status %x\n",</div><div class='del'>-			      dev-&gt;instance,</div><div class='del'>-			      sbus_readl(&amp;dev-&gt;regs-&gt;i2c_s1)));</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int vfc_i2c_wait_for_bus(struct vfc_dev *dev)</div><div class='del'>-{</div><div class='del'>-	int timeout = 1000; </div><div class='del'>-</div><div class='del'>-	while(!(sbus_readl(&amp;dev-&gt;regs-&gt;i2c_s1) &amp; BB)) {</div><div class='del'>-		if(!(timeout--))</div><div class='del'>-			return -ETIMEDOUT;</div><div class='del'>-		vfc_i2c_delay(dev);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int vfc_i2c_wait_for_pin(struct vfc_dev *dev, int ack)</div><div class='del'>-{</div><div class='del'>-	int timeout = 1000; </div><div class='del'>-	int s1;</div><div class='del'>-</div><div class='del'>-	while ((s1 = sbus_readl(&amp;dev-&gt;regs-&gt;i2c_s1)) &amp; PIN) {</div><div class='del'>-		if (!(timeout--))</div><div class='del'>-			return -ETIMEDOUT;</div><div class='del'>-		vfc_i2c_delay(dev);</div><div class='del'>-	}</div><div class='del'>-	if (ack == VFC_I2C_ACK_CHECK) {</div><div class='del'>-		if(s1 &amp; LRB)</div><div class='del'>-			return -EIO; </div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define SHIFT(a) ((a) &lt;&lt; 24)</div><div class='del'>-static int vfc_i2c_xmit_addr(struct vfc_dev *dev, unsigned char addr,</div><div class='del'>-			     char mode)</div><div class='del'>-{ </div><div class='del'>-	int ret, raddr;</div><div class='del'>-#if 1</div><div class='del'>-	WRITE_S1(SEND_I2C_STOP | ACK);</div><div class='del'>-	WRITE_S1(SELECT(S0) | ENABLE_SERIAL);</div><div class='del'>-	vfc_i2c_delay(dev);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	switch(mode) {</div><div class='del'>-	case VFC_I2C_READ:</div><div class='del'>-		raddr = SHIFT(((unsigned int)addr | 0x1));</div><div class='del'>-		WRITE_REG(raddr);</div><div class='del'>-		VFC_I2C_DEBUG_PRINTK(("vfc%d: receiving from i2c addr 0x%x\n",</div><div class='del'>-				      dev-&gt;instance, addr | 0x1));</div><div class='del'>-		break;</div><div class='del'>-	case VFC_I2C_WRITE:</div><div class='del'>-		raddr = SHIFT((unsigned int)addr &amp; ~0x1);</div><div class='del'>-		WRITE_REG(raddr);</div><div class='del'>-		VFC_I2C_DEBUG_PRINTK(("vfc%d: sending to i2c addr 0x%x\n",</div><div class='del'>-				      dev-&gt;instance, addr &amp; ~0x1));</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	WRITE_S1(SEND_I2C_START);</div><div class='del'>-	vfc_i2c_delay(dev);</div><div class='del'>-	ret = vfc_i2c_wait_for_pin(dev,VFC_I2C_ACK_CHECK); /* We wait</div><div class='del'>-							      for the</div><div class='del'>-							      i2c send</div><div class='del'>-							      to finish</div><div class='del'>-							      here but</div><div class='del'>-							      Sun</div><div class='del'>-							      doesn't,</div><div class='del'>-							      hmm */</div><div class='del'>-	if (ret) {</div><div class='del'>-		printk(KERN_ERR "vfc%d: VFC xmit addr timed out or no ack\n",</div><div class='del'>-		       dev-&gt;instance);</div><div class='del'>-		return ret;</div><div class='del'>-	} else if (mode == VFC_I2C_READ) {</div><div class='del'>-		if ((ret = sbus_readl(&amp;dev-&gt;regs-&gt;i2c_reg) &amp; 0xff000000) != raddr) {</div><div class='del'>-			printk(KERN_WARNING </div><div class='del'>-			       "vfc%d: returned slave address "</div><div class='del'>-			       "mismatch(%x,%x)\n",</div><div class='del'>-			       dev-&gt;instance, raddr, ret);</div><div class='del'>-		}</div><div class='del'>-	}	</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int vfc_i2c_xmit_byte(struct vfc_dev *dev,unsigned char *byte)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	u32 val = SHIFT((unsigned int)*byte);</div><div class='del'>-</div><div class='del'>-	WRITE_REG(val);</div><div class='del'>-</div><div class='del'>-	ret = vfc_i2c_wait_for_pin(dev, VFC_I2C_ACK_CHECK); </div><div class='del'>-	switch(ret) {</div><div class='del'>-	case -ETIMEDOUT: </div><div class='del'>-		printk(KERN_ERR "vfc%d: VFC xmit byte timed out or no ack\n",</div><div class='del'>-		       dev-&gt;instance);</div><div class='del'>-		break;</div><div class='del'>-	case -EIO:</div><div class='del'>-		ret = XMIT_LAST_BYTE;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int vfc_i2c_recv_byte(struct vfc_dev *dev, unsigned char *byte,</div><div class='del'>-			     int last)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (last) {</div><div class='del'>-		WRITE_REG(NEGATIVE_ACK);</div><div class='del'>-		VFC_I2C_DEBUG_PRINTK(("vfc%d: sending negative ack\n",</div><div class='del'>-				      dev-&gt;instance));</div><div class='del'>-	} else {</div><div class='del'>-		WRITE_S1(ACK);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = vfc_i2c_wait_for_pin(dev, VFC_I2C_NO_ACK_CHECK);</div><div class='del'>-	if(ret) {</div><div class='del'>-		printk(KERN_ERR "vfc%d: "</div><div class='del'>-		       "VFC recv byte timed out\n",</div><div class='del'>-		       dev-&gt;instance);</div><div class='del'>-	}</div><div class='del'>-	*byte = (sbus_readl(&amp;dev-&gt;regs-&gt;i2c_reg)) &gt;&gt; 24;</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int vfc_i2c_recvbuf(struct vfc_dev *dev, unsigned char addr,</div><div class='del'>-		    char *buf, int count)</div><div class='del'>-{</div><div class='del'>-	int ret, last;</div><div class='del'>-</div><div class='del'>-	if(!(count &amp;&amp; buf &amp;&amp; dev &amp;&amp; dev-&gt;regs) )</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if ((ret = vfc_i2c_wait_for_bus(dev))) {</div><div class='del'>-		printk(KERN_ERR "vfc%d: VFC I2C bus busy\n", dev-&gt;instance);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((ret = vfc_i2c_xmit_addr(dev, addr, VFC_I2C_READ))) {</div><div class='del'>-		WRITE_S1(SEND_I2C_STOP);</div><div class='del'>-		vfc_i2c_delay(dev);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	last = 0;</div><div class='del'>-	while (count--) {</div><div class='del'>-		if (!count)</div><div class='del'>-			last = 1;</div><div class='del'>-		if ((ret = vfc_i2c_recv_byte(dev, buf, last))) {</div><div class='del'>-			printk(KERN_ERR "vfc%d: "</div><div class='del'>-			       "VFC error while receiving byte\n",</div><div class='del'>-			       dev-&gt;instance);</div><div class='del'>-			WRITE_S1(SEND_I2C_STOP);</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-		}</div><div class='del'>-		buf++;</div><div class='del'>-	}</div><div class='del'>-	WRITE_S1(SEND_I2C_STOP | ACK);</div><div class='del'>-	vfc_i2c_delay(dev);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int vfc_i2c_sendbuf(struct vfc_dev *dev, unsigned char addr, </div><div class='del'>-		    char *buf, int count) </div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	</div><div class='del'>-	if (!(buf &amp;&amp; dev &amp;&amp; dev-&gt;regs))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	</div><div class='del'>-	if ((ret = vfc_i2c_wait_for_bus(dev))) {</div><div class='del'>-		printk(KERN_ERR "vfc%d: VFC I2C bus busy\n", dev-&gt;instance);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if ((ret = vfc_i2c_xmit_addr(dev, addr, VFC_I2C_WRITE))) {</div><div class='del'>-		WRITE_S1(SEND_I2C_STOP);</div><div class='del'>-		vfc_i2c_delay(dev);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	while(count--) {</div><div class='del'>-		ret = vfc_i2c_xmit_byte(dev, buf);</div><div class='del'>-		switch(ret) {</div><div class='del'>-		case XMIT_LAST_BYTE:</div><div class='del'>-			VFC_I2C_DEBUG_PRINTK(("vfc%d: "</div><div class='del'>-					      "Receiver ended transmission with "</div><div class='del'>-					      " %d bytes remaining\n",</div><div class='del'>-					      dev-&gt;instance, count));</div><div class='del'>-			ret = 0;</div><div class='del'>-			goto done;</div><div class='del'>-			break;</div><div class='del'>-		case 0:</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			printk(KERN_ERR "vfc%d: "</div><div class='del'>-			       "VFC error while sending byte\n", dev-&gt;instance);</div><div class='del'>-			break;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		buf++;</div><div class='del'>-	}</div><div class='del'>-done:</div><div class='del'>-	WRITE_S1(SEND_I2C_STOP | ACK);</div><div class='del'>-	vfc_i2c_delay(dev);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/drivers/sbus/char/vfc_i2c.h b/drivers/sbus/char/vfc_i2c.h<br/>deleted file mode 100644<br/>index a2e6973209d5..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/sbus/char/vfc_i2c.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/sbus/char/vfc_i2c.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,44 +0,0 @@</div><div class='del'>-#ifndef _LINUX_VFC_I2C_H_</div><div class='del'>-#define _LINUX_VFC_I2C_H_</div><div class='del'>-</div><div class='del'>-/* control bits */</div><div class='del'>-#define PIN  (0x80000000)</div><div class='del'>-#define ESO  (0x40000000)</div><div class='del'>-#define ES1  (0x20000000)</div><div class='del'>-#define ES2  (0x10000000)</div><div class='del'>-#define ENI  (0x08000000)</div><div class='del'>-#define STA  (0x04000000)</div><div class='del'>-#define STO  (0x02000000)</div><div class='del'>-#define ACK  (0x01000000)</div><div class='del'>-</div><div class='del'>-/* status bits */</div><div class='del'>-#define STS  (0x20000000)</div><div class='del'>-#define BER  (0x10000000)</div><div class='del'>-#define LRB  (0x08000000)</div><div class='del'>-#define AAS  (0x04000000)</div><div class='del'>-#define LAB  (0x02000000)</div><div class='del'>-#define BB   (0x01000000)</div><div class='del'>-</div><div class='del'>-#define SEND_I2C_START (PIN | ESO | STA)</div><div class='del'>-#define SEND_I2C_STOP (PIN | ESO | STO)</div><div class='del'>-#define CLEAR_I2C_BUS (PIN | ESO | ACK)</div><div class='del'>-#define NEGATIVE_ACK ((ESO) &amp; ~ACK)</div><div class='del'>-</div><div class='del'>-#define SELECT(a) (a)</div><div class='del'>-#define S0 (PIN | ESO | ES1)</div><div class='del'>-#define S0_OWN (PIN)</div><div class='del'>-#define S2 (PIN | ES1)</div><div class='del'>-#define S3 (PIN | ES2)</div><div class='del'>-</div><div class='del'>-#define ENABLE_SERIAL (PIN | ESO)</div><div class='del'>-#define DISABLE_SERIAL (PIN)</div><div class='del'>-#define RESET (PIN)</div><div class='del'>-</div><div class='del'>-#define XMIT_LAST_BYTE (1)</div><div class='del'>-#define VFC_I2C_ACK_CHECK (1)</div><div class='del'>-#define VFC_I2C_NO_ACK_CHECK (0)</div><div class='del'>-</div><div class='del'>-#endif /* _LINUX_VFC_I2C_H_ */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/drivers/sbus/dvma.c b/drivers/sbus/dvma.c<br/>deleted file mode 100644<br/>index ab0d2de3324c..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/sbus/dvma.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/sbus/dvma.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,136 +0,0 @@</div><div class='del'>-/* dvma.c:  Routines that are used to access DMA on the Sparc SBus.</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/oplib.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/dma.h&gt;</div><div class='del'>-#include &lt;asm/sbus.h&gt;</div><div class='del'>-</div><div class='del'>-struct sbus_dma *dma_chain;</div><div class='del'>-</div><div class='del'>-static void __init init_one_dvma(struct sbus_dma *dma, int num_dma)</div><div class='del'>-{</div><div class='del'>-	printk("dma%d: ", num_dma);</div><div class='del'>-	</div><div class='del'>-	dma-&gt;next = NULL;</div><div class='del'>-	dma-&gt;running = 0;      /* No transfers going on as of yet */</div><div class='del'>-	dma-&gt;allocated = 0;    /* No one has allocated us yet */</div><div class='del'>-	switch(sbus_readl(dma-&gt;regs + DMA_CSR)&amp;DMA_DEVICE_ID) {</div><div class='del'>-	case DMA_VERS0:</div><div class='del'>-		dma-&gt;revision = dvmarev0;</div><div class='del'>-		printk("Revision 0 ");</div><div class='del'>-		break;</div><div class='del'>-	case DMA_ESCV1:</div><div class='del'>-		dma-&gt;revision = dvmaesc1;</div><div class='del'>-		printk("ESC Revision 1 ");</div><div class='del'>-		break;</div><div class='del'>-	case DMA_VERS1:</div><div class='del'>-		dma-&gt;revision = dvmarev1;</div><div class='del'>-		printk("Revision 1 ");</div><div class='del'>-		break;</div><div class='del'>-	case DMA_VERS2:</div><div class='del'>-		dma-&gt;revision = dvmarev2;</div><div class='del'>-		printk("Revision 2 ");</div><div class='del'>-		break;</div><div class='del'>-	case DMA_VERHME:</div><div class='del'>-		dma-&gt;revision = dvmahme;</div><div class='del'>-		printk("HME DVMA gate array ");</div><div class='del'>-		break;</div><div class='del'>-	case DMA_VERSPLUS:</div><div class='del'>-		dma-&gt;revision = dvmarevplus;</div><div class='del'>-		printk("Revision 1 PLUS ");</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		printk("unknown dma version %08x",</div><div class='del'>-		       sbus_readl(dma-&gt;regs + DMA_CSR) &amp; DMA_DEVICE_ID);</div><div class='del'>-		dma-&gt;allocated = 1;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	printk("\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Probe this SBus DMA module(s) */</div><div class='del'>-void __init dvma_init(struct sbus_bus *sbus)</div><div class='del'>-{</div><div class='del'>-	struct sbus_dev *this_dev;</div><div class='del'>-	struct sbus_dma *dma;</div><div class='del'>-	struct sbus_dma *dchain;</div><div class='del'>-	static int num_dma = 0;</div><div class='del'>-</div><div class='del'>-	for_each_sbusdev(this_dev, sbus) {</div><div class='del'>-		char *name = this_dev-&gt;prom_name;</div><div class='del'>-		int hme = 0;</div><div class='del'>-</div><div class='del'>-		if(!strcmp(name, "SUNW,fas"))</div><div class='del'>-			hme = 1;</div><div class='del'>-		else if(strcmp(name, "dma") &amp;&amp;</div><div class='del'>-			strcmp(name, "ledma") &amp;&amp;</div><div class='del'>-			strcmp(name, "espdma"))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		/* Found one... */</div><div class='del'>-		dma = kmalloc(sizeof(struct sbus_dma), GFP_ATOMIC);</div><div class='del'>-</div><div class='del'>-		dma-&gt;sdev = this_dev;</div><div class='del'>-</div><div class='del'>-		/* Put at end of dma chain */</div><div class='del'>-		dchain = dma_chain;</div><div class='del'>-		if(dchain) {</div><div class='del'>-			while(dchain-&gt;next)</div><div class='del'>-				dchain = dchain-&gt;next;</div><div class='del'>-			dchain-&gt;next = dma;</div><div class='del'>-		} else {</div><div class='del'>-			/* We're the first in line */</div><div class='del'>-			dma_chain = dma;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		dma-&gt;regs = sbus_ioremap(&amp;dma-&gt;sdev-&gt;resource[0], 0,</div><div class='del'>-					 dma-&gt;sdev-&gt;resource[0].end - dma-&gt;sdev-&gt;resource[0].start + 1,</div><div class='del'>-					 "dma");</div><div class='del'>-</div><div class='del'>-		dma-&gt;node = dma-&gt;sdev-&gt;prom_node;</div><div class='del'>-		</div><div class='del'>-		init_one_dvma(dma, num_dma++);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SUN4</div><div class='del'>-</div><div class='del'>-#include &lt;asm/sun4paddr.h&gt;</div><div class='del'>-</div><div class='del'>-void __init sun4_dvma_init(void)</div><div class='del'>-{</div><div class='del'>-	struct sbus_dma *dma;</div><div class='del'>-	struct resource r;</div><div class='del'>-</div><div class='del'>-	if(sun4_dma_physaddr) {</div><div class='del'>-		dma = kmalloc(sizeof(struct sbus_dma), GFP_ATOMIC);</div><div class='del'>-</div><div class='del'>-		/* No SBUS */</div><div class='del'>-		dma-&gt;sdev = NULL;</div><div class='del'>-</div><div class='del'>-		/* Only one DMA device */</div><div class='del'>-		dma_chain = dma;</div><div class='del'>-</div><div class='del'>-		memset(&amp;r, 0, sizeof(r));</div><div class='del'>-		r.start = sun4_dma_physaddr;</div><div class='del'>-		dma-&gt;regs = sbus_ioremap(&amp;r, 0, PAGE_SIZE, "dma");</div><div class='del'>-</div><div class='del'>-		/* No prom node */</div><div class='del'>-		dma-&gt;node = 0x0;</div><div class='del'>-</div><div class='del'>-		init_one_dvma(dma, 0);</div><div class='del'>-	} else {</div><div class='del'>-	  	dma_chain = NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/drivers/sbus/sbus.c b/drivers/sbus/sbus.c<br/>deleted file mode 100644<br/>index 9c129248466c..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/sbus/sbus.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/sbus/sbus.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,316 +0,0 @@</div><div class='del'>-/* sbus.c: SBus support routines.</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1995, 2006 David S. Miller (davem@davemloft.net)</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/device.h&gt;</div><div class='del'>-#include &lt;linux/of_device.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/system.h&gt;</div><div class='del'>-#include &lt;asm/sbus.h&gt;</div><div class='del'>-#include &lt;asm/dma.h&gt;</div><div class='del'>-#include &lt;asm/oplib.h&gt;</div><div class='del'>-#include &lt;asm/prom.h&gt;</div><div class='del'>-#include &lt;asm/bpp.h&gt;</div><div class='del'>-#include &lt;asm/irq.h&gt;</div><div class='del'>-</div><div class='del'>-static ssize_t</div><div class='del'>-show_sbusobppath_attr(struct device * dev, struct device_attribute * attr, char * buf)</div><div class='del'>-{</div><div class='del'>-	struct sbus_dev *sbus;</div><div class='del'>-</div><div class='del'>-	sbus = to_sbus_device(dev);</div><div class='del'>-</div><div class='del'>-	return snprintf (buf, PAGE_SIZE, "%s\n", sbus-&gt;ofdev.node-&gt;full_name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static DEVICE_ATTR(obppath, S_IRUSR | S_IRGRP | S_IROTH, show_sbusobppath_attr, NULL);</div><div class='del'>-</div><div class='del'>-struct sbus_bus *sbus_root;</div><div class='del'>-</div><div class='del'>-static void __init fill_sbus_device(struct device_node *dp, struct sbus_dev *sdev)</div><div class='del'>-{</div><div class='del'>-	struct dev_archdata *sd;</div><div class='del'>-	unsigned long base;</div><div class='del'>-	const void *pval;</div><div class='del'>-	int len, err;</div><div class='del'>-</div><div class='del'>-	sdev-&gt;prom_node = dp-&gt;node;</div><div class='del'>-	strcpy(sdev-&gt;prom_name, dp-&gt;name);</div><div class='del'>-</div><div class='del'>-	pval = of_get_property(dp, "reg", &amp;len);</div><div class='del'>-	sdev-&gt;num_registers = 0;</div><div class='del'>-	if (pval) {</div><div class='del'>-		memcpy(sdev-&gt;reg_addrs, pval, len);</div><div class='del'>-</div><div class='del'>-		sdev-&gt;num_registers =</div><div class='del'>-			len / sizeof(struct linux_prom_registers);</div><div class='del'>-</div><div class='del'>-		base = (unsigned long) sdev-&gt;reg_addrs[0].phys_addr;</div><div class='del'>-</div><div class='del'>-		/* Compute the slot number. */</div><div class='del'>-		if (base &gt;= SUN_SBUS_BVADDR &amp;&amp; sparc_cpu_model == sun4m)</div><div class='del'>-			sdev-&gt;slot = sbus_dev_slot(base);</div><div class='del'>-		else</div><div class='del'>-			sdev-&gt;slot = sdev-&gt;reg_addrs[0].which_io;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pval = of_get_property(dp, "ranges", &amp;len);</div><div class='del'>-	sdev-&gt;num_device_ranges = 0;</div><div class='del'>-	if (pval) {</div><div class='del'>-		memcpy(sdev-&gt;device_ranges, pval, len);</div><div class='del'>-		sdev-&gt;num_device_ranges =</div><div class='del'>-			len / sizeof(struct linux_prom_ranges);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	sbus_fill_device_irq(sdev);</div><div class='del'>-</div><div class='del'>-	sd = &amp;sdev-&gt;ofdev.dev.archdata;</div><div class='del'>-	sd-&gt;prom_node = dp;</div><div class='del'>-	sd-&gt;op = &amp;sdev-&gt;ofdev;</div><div class='del'>-</div><div class='del'>-	sdev-&gt;ofdev.node = dp;</div><div class='del'>-	if (sdev-&gt;parent)</div><div class='del'>-		sdev-&gt;ofdev.dev.parent = &amp;sdev-&gt;parent-&gt;ofdev.dev;</div><div class='del'>-	else</div><div class='del'>-		sdev-&gt;ofdev.dev.parent = &amp;sdev-&gt;bus-&gt;ofdev.dev;</div><div class='del'>-	sdev-&gt;ofdev.dev.bus = &amp;sbus_bus_type;</div><div class='del'>-	dev_set_name(&amp;sdev-&gt;ofdev.dev, "sbus[%08x]", dp-&gt;node);</div><div class='del'>-</div><div class='del'>-	if (of_device_register(&amp;sdev-&gt;ofdev) != 0)</div><div class='del'>-		printk(KERN_DEBUG "sbus: device registration error for %s!\n",</div><div class='del'>-		       dp-&gt;path_component_name);</div><div class='del'>-</div><div class='del'>-	/* WE HAVE BEEN INVADED BY ALIENS! */</div><div class='del'>-	err = sysfs_create_file(&amp;sdev-&gt;ofdev.dev.kobj, &amp;dev_attr_obppath.attr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __init sbus_bus_ranges_init(struct device_node *dp, struct sbus_bus *sbus)</div><div class='del'>-{</div><div class='del'>-	const void *pval;</div><div class='del'>-	int len;</div><div class='del'>-</div><div class='del'>-	pval = of_get_property(dp, "ranges", &amp;len);</div><div class='del'>-	sbus-&gt;num_sbus_ranges = 0;</div><div class='del'>-	if (pval) {</div><div class='del'>-		memcpy(sbus-&gt;sbus_ranges, pval, len);</div><div class='del'>-		sbus-&gt;num_sbus_ranges =</div><div class='del'>-			len / sizeof(struct linux_prom_ranges);</div><div class='del'>-</div><div class='del'>-		sbus_arch_bus_ranges_init(dp-&gt;parent, sbus);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __init __apply_ranges_to_regs(struct linux_prom_ranges *ranges,</div><div class='del'>-					  int num_ranges,</div><div class='del'>-					  struct linux_prom_registers *regs,</div><div class='del'>-					  int num_regs)</div><div class='del'>-{</div><div class='del'>-	if (num_ranges) {</div><div class='del'>-		int regnum;</div><div class='del'>-</div><div class='del'>-		for (regnum = 0; regnum &lt; num_regs; regnum++) {</div><div class='del'>-			int rngnum;</div><div class='del'>-</div><div class='del'>-			for (rngnum = 0; rngnum &lt; num_ranges; rngnum++) {</div><div class='del'>-				if (regs[regnum].which_io == ranges[rngnum].ot_child_space)</div><div class='del'>-					break;</div><div class='del'>-			}</div><div class='del'>-			if (rngnum == num_ranges) {</div><div class='del'>-				/* We used to flag this as an error.  Actually</div><div class='del'>-				 * some devices do not report the regs as we expect.</div><div class='del'>-				 * For example, see SUNW,pln device.  In that case</div><div class='del'>-				 * the reg property is in a format internal to that</div><div class='del'>-				 * node, ie. it is not in the SBUS register space</div><div class='del'>-				 * per se. -DaveM</div><div class='del'>-				 */</div><div class='del'>-				return;</div><div class='del'>-			}</div><div class='del'>-			regs[regnum].which_io = ranges[rngnum].ot_parent_space;</div><div class='del'>-			regs[regnum].phys_addr -= ranges[rngnum].ot_child_base;</div><div class='del'>-			regs[regnum].phys_addr += ranges[rngnum].ot_parent_base;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __init __fixup_regs_sdev(struct sbus_dev *sdev)</div><div class='del'>-{</div><div class='del'>-	if (sdev-&gt;num_registers != 0) {</div><div class='del'>-		struct sbus_dev *parent = sdev-&gt;parent;</div><div class='del'>-		int i;</div><div class='del'>-</div><div class='del'>-		while (parent != NULL) {</div><div class='del'>-			__apply_ranges_to_regs(parent-&gt;device_ranges,</div><div class='del'>-					       parent-&gt;num_device_ranges,</div><div class='del'>-					       sdev-&gt;reg_addrs,</div><div class='del'>-					       sdev-&gt;num_registers);</div><div class='del'>-</div><div class='del'>-			parent = parent-&gt;parent;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		__apply_ranges_to_regs(sdev-&gt;bus-&gt;sbus_ranges,</div><div class='del'>-				       sdev-&gt;bus-&gt;num_sbus_ranges,</div><div class='del'>-				       sdev-&gt;reg_addrs,</div><div class='del'>-				       sdev-&gt;num_registers);</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; sdev-&gt;num_registers; i++) {</div><div class='del'>-			struct resource *res = &amp;sdev-&gt;resource[i];</div><div class='del'>-</div><div class='del'>-			res-&gt;start = sdev-&gt;reg_addrs[i].phys_addr;</div><div class='del'>-			res-&gt;end = (res-&gt;start +</div><div class='del'>-				    (unsigned long)sdev-&gt;reg_addrs[i].reg_size - 1UL);</div><div class='del'>-			res-&gt;flags = IORESOURCE_IO |</div><div class='del'>-				(sdev-&gt;reg_addrs[i].which_io &amp; 0xff);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __init sbus_fixup_all_regs(struct sbus_dev *first_sdev)</div><div class='del'>-{</div><div class='del'>-	struct sbus_dev *sdev;</div><div class='del'>-</div><div class='del'>-	for (sdev = first_sdev; sdev; sdev = sdev-&gt;next) {</div><div class='del'>-		if (sdev-&gt;child)</div><div class='del'>-			sbus_fixup_all_regs(sdev-&gt;child);</div><div class='del'>-		__fixup_regs_sdev(sdev);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* We preserve the "probe order" of these bus and device lists to give</div><div class='del'>- * the same ordering as the old code.</div><div class='del'>- */</div><div class='del'>-static void __init sbus_insert(struct sbus_bus *sbus, struct sbus_bus **root)</div><div class='del'>-{</div><div class='del'>-	while (*root)</div><div class='del'>-		root = &amp;(*root)-&gt;next;</div><div class='del'>-	*root = sbus;</div><div class='del'>-	sbus-&gt;next = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __init sdev_insert(struct sbus_dev *sdev, struct sbus_dev **root)</div><div class='del'>-{</div><div class='del'>-	while (*root)</div><div class='del'>-		root = &amp;(*root)-&gt;next;</div><div class='del'>-	*root = sdev;</div><div class='del'>-	sdev-&gt;next = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __init walk_children(struct device_node *dp, struct sbus_dev *parent, struct sbus_bus *sbus)</div><div class='del'>-{</div><div class='del'>-	dp = dp-&gt;child;</div><div class='del'>-	while (dp) {</div><div class='del'>-		struct sbus_dev *sdev;</div><div class='del'>-</div><div class='del'>-		sdev = kzalloc(sizeof(struct sbus_dev), GFP_ATOMIC);</div><div class='del'>-		if (sdev) {</div><div class='del'>-			sdev_insert(sdev, &amp;parent-&gt;child);</div><div class='del'>-</div><div class='del'>-			sdev-&gt;bus = sbus;</div><div class='del'>-			sdev-&gt;parent = parent;</div><div class='del'>-			sdev-&gt;ofdev.dev.archdata.iommu =</div><div class='del'>-				sbus-&gt;ofdev.dev.archdata.iommu;</div><div class='del'>-			sdev-&gt;ofdev.dev.archdata.stc =</div><div class='del'>-				sbus-&gt;ofdev.dev.archdata.stc;</div><div class='del'>-</div><div class='del'>-			fill_sbus_device(dp, sdev);</div><div class='del'>-</div><div class='del'>-			walk_children(dp, sdev, sbus);</div><div class='del'>-		}</div><div class='del'>-		dp = dp-&gt;sibling;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __init build_one_sbus(struct device_node *dp, int num_sbus)</div><div class='del'>-{</div><div class='del'>-	struct sbus_bus *sbus;</div><div class='del'>-	unsigned int sbus_clock;</div><div class='del'>-	struct device_node *dev_dp;</div><div class='del'>-</div><div class='del'>-	sbus = kzalloc(sizeof(struct sbus_bus), GFP_ATOMIC);</div><div class='del'>-	if (!sbus)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	sbus_insert(sbus, &amp;sbus_root);</div><div class='del'>-	sbus-&gt;prom_node = dp-&gt;node;</div><div class='del'>-</div><div class='del'>-	sbus_setup_iommu(sbus, dp);</div><div class='del'>-</div><div class='del'>-	printk("sbus%d: ", num_sbus);</div><div class='del'>-</div><div class='del'>-	sbus_clock = of_getintprop_default(dp, "clock-frequency",</div><div class='del'>-					   (25*1000*1000));</div><div class='del'>-	sbus-&gt;clock_freq = sbus_clock;</div><div class='del'>-</div><div class='del'>-	printk("Clock %d.%d MHz\n", (int) ((sbus_clock/1000)/1000),</div><div class='del'>-	       (int) (((sbus_clock/1000)%1000 != 0) ? </div><div class='del'>-		      (((sbus_clock/1000)%1000) + 1000) : 0));</div><div class='del'>-</div><div class='del'>-	strcpy(sbus-&gt;prom_name, dp-&gt;name);</div><div class='del'>-</div><div class='del'>-	sbus_setup_arch_props(sbus, dp);</div><div class='del'>-</div><div class='del'>-	sbus_bus_ranges_init(dp, sbus);</div><div class='del'>-</div><div class='del'>-	sbus-&gt;ofdev.node = dp;</div><div class='del'>-	sbus-&gt;ofdev.dev.parent = NULL;</div><div class='del'>-	sbus-&gt;ofdev.dev.bus = &amp;sbus_bus_type;</div><div class='del'>-	dev_set_name(&amp;sbus-&gt;ofdev.dev, "sbus%d", num_sbus);</div><div class='del'>-</div><div class='del'>-	if (of_device_register(&amp;sbus-&gt;ofdev) != 0)</div><div class='del'>-		printk(KERN_DEBUG "sbus: device registration error for %s!\n",</div><div class='del'>-		       dev_name(&amp;sbus-&gt;ofdev.dev));</div><div class='del'>-</div><div class='del'>-	dev_dp = dp-&gt;child;</div><div class='del'>-	while (dev_dp) {</div><div class='del'>-		struct sbus_dev *sdev;</div><div class='del'>-</div><div class='del'>-		sdev = kzalloc(sizeof(struct sbus_dev), GFP_ATOMIC);</div><div class='del'>-		if (sdev) {</div><div class='del'>-			sdev_insert(sdev, &amp;sbus-&gt;devices);</div><div class='del'>-</div><div class='del'>-			sdev-&gt;bus = sbus;</div><div class='del'>-			sdev-&gt;parent = NULL;</div><div class='del'>-			sdev-&gt;ofdev.dev.archdata.iommu =</div><div class='del'>-				sbus-&gt;ofdev.dev.archdata.iommu;</div><div class='del'>-			sdev-&gt;ofdev.dev.archdata.stc =</div><div class='del'>-				sbus-&gt;ofdev.dev.archdata.stc;</div><div class='del'>-</div><div class='del'>-			fill_sbus_device(dev_dp, sdev);</div><div class='del'>-</div><div class='del'>-			walk_children(dev_dp, sdev, sbus);</div><div class='del'>-		}</div><div class='del'>-		dev_dp = dev_dp-&gt;sibling;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	sbus_fixup_all_regs(sbus-&gt;devices);</div><div class='del'>-</div><div class='del'>-	dvma_init(sbus);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init sbus_init(void)</div><div class='del'>-{</div><div class='del'>-	struct device_node *dp;</div><div class='del'>-	const char *sbus_name = "sbus";</div><div class='del'>-	int num_sbus = 0;</div><div class='del'>-</div><div class='del'>-	if (sbus_arch_preinit())</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (sparc_cpu_model == sun4d)</div><div class='del'>-		sbus_name = "sbi";</div><div class='del'>-</div><div class='del'>-	for_each_node_by_name(dp, sbus_name) {</div><div class='del'>-		build_one_sbus(dp, num_sbus);</div><div class='del'>-		num_sbus++;</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	sbus_arch_postinit();</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-subsys_initcall(sbus_init);</div><div class='head'>diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig<br/>index 4e0322b1c1ea..403ecad48d4b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/Kconfig</a></div><div class='hunk'>@@ -1325,14 +1325,6 @@ config SCSI_QLOGIC_FAS</div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='ctx'> 	  module will be called qlogicfas.</div><div class='ctx'> </div><div class='del'>-config SCSI_QLOGIC_FC_FIRMWARE</div><div class='del'>-	bool "Include loadable firmware in driver"</div><div class='del'>-	depends on SCSI_QLOGIC_FC</div><div class='del'>-  	help</div><div class='del'>-	  Say Y to include ISP2X00 Fabric Initiator/Target Firmware, with</div><div class='del'>-	  expanded LUN addressing and FcTape (FCP-2) support, in the</div><div class='del'>-	  qlogicfc driver. This is required on some platforms.</div><div class='del'>-</div><div class='ctx'> config SCSI_QLOGIC_1280</div><div class='ctx'> 	tristate "Qlogic QLA 1240/1x80/1x160 SCSI support"</div><div class='ctx'> 	depends on PCI &amp;&amp; SCSI</div><div class='hunk'>@@ -1648,6 +1640,7 @@ config ATARI_SCSI</div><div class='ctx'> 	tristate "Atari native SCSI support"</div><div class='ctx'> 	depends on ATARI &amp;&amp; SCSI</div><div class='ctx'> 	select SCSI_SPI_ATTRS</div><div class='add'>+	select NVRAM</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  If you have an Atari with built-in NCR5380 SCSI controller (TT,</div><div class='ctx'> 	  Falcon, ...) say Y to get it supported. Of course also, if you have</div><div class='hunk'>@@ -1678,14 +1671,6 @@ config ATARI_SCSI_RESET_BOOT</div><div class='ctx'> 	  boot process fractionally longer but may assist recovery from errors</div><div class='ctx'> 	  that leave the devices with SCSI operations partway completed.</div><div class='ctx'> </div><div class='del'>-config TT_DMA_EMUL</div><div class='del'>-	bool "Hades SCSI DMA emulator"</div><div class='del'>-	depends on ATARI_SCSI &amp;&amp; HADES</div><div class='del'>-	help</div><div class='del'>-	  This option enables code which emulates the TT SCSI DMA chip on the</div><div class='del'>-	  Hades. This increases the SCSI transfer rates at least ten times</div><div class='del'>-	  compared to PIO transfers.</div><div class='del'>-</div><div class='ctx'> config MAC_SCSI</div><div class='ctx'> 	bool "Macintosh NCR5380 SCSI"</div><div class='ctx'> 	depends on MAC &amp;&amp; SCSI=y</div><div class='head'>diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c<br/>index aa4e77c25273..8abfd06b5a72 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/aacraid/aachba.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/aacraid/aachba.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/aacraid/aachba.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/aacraid/aachba.c</a></div><div class='hunk'>@@ -1139,7 +1139,7 @@ static struct aac_srb * aac_scsi_common(struct fib * fib, struct scsi_cmnd * cmd</div><div class='ctx'> 	srbcmd-&gt;id       = cpu_to_le32(scmd_id(cmd));</div><div class='ctx'> 	srbcmd-&gt;lun      = cpu_to_le32(cmd-&gt;device-&gt;lun);</div><div class='ctx'> 	srbcmd-&gt;flags    = cpu_to_le32(flag);</div><div class='del'>-	timeout = cmd-&gt;timeout_per_command/HZ;</div><div class='add'>+	timeout = cmd-&gt;request-&gt;timeout/HZ;</div><div class='ctx'> 	if (timeout == 0)</div><div class='ctx'> 		timeout = 1;</div><div class='ctx'> 	srbcmd-&gt;timeout  = cpu_to_le32(timeout);  // timeout in seconds</div><div class='head'>diff --git a/drivers/scsi/atari_dma_emul.c b/drivers/scsi/atari_dma_emul.c<br/>deleted file mode 100644<br/>index cdc710ea00fa..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/atari_dma_emul.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/atari_dma_emul.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,468 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * atari_dma_emul.c -- TT SCSI DMA emulator for the Hades.</div><div class='del'>- *</div><div class='del'>- * Copyright 1997 Wout Klaren &lt;W.Klaren@inter.nl.net&gt;</div><div class='del'>- *</div><div class='del'>- * This file is subject to the terms and conditions of the GNU General Public</div><div class='del'>- * License.  See the file COPYING in the main directory of this archive</div><div class='del'>- * for more details.</div><div class='del'>- *</div><div class='del'>- * This code was written using the Hades TOS source code as a</div><div class='del'>- * reference. This source code can be found on the home page</div><div class='del'>- * of Medusa Computer Systems.</div><div class='del'>- *</div><div class='del'>- * Version 0.1, 1997-09-24.</div><div class='del'>- * </div><div class='del'>- * This code should be considered experimental. It has only been</div><div class='del'>- * tested on a Hades with a 68060. It might not work on a Hades</div><div class='del'>- * with a 68040. Make backups of your hard drives before using</div><div class='del'>- * this code.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/compiler.h&gt;</div><div class='del'>-#include &lt;asm/thread_info.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='del'>-</div><div class='del'>-#define hades_dma_ctrl		(*(unsigned char *) 0xffff8717)</div><div class='del'>-#define hades_psdm_reg		(*(unsigned char *) 0xffff8741)</div><div class='del'>-</div><div class='del'>-#define TRANSFER_SIZE		16</div><div class='del'>-</div><div class='del'>-struct m68040_frame {</div><div class='del'>-	unsigned long  effaddr;  /* effective address */</div><div class='del'>-	unsigned short ssw;      /* special status word */</div><div class='del'>-	unsigned short wb3s;     /* write back 3 status */</div><div class='del'>-	unsigned short wb2s;     /* write back 2 status */</div><div class='del'>-	unsigned short wb1s;     /* write back 1 status */</div><div class='del'>-	unsigned long  faddr;    /* fault address */</div><div class='del'>-	unsigned long  wb3a;     /* write back 3 address */</div><div class='del'>-	unsigned long  wb3d;     /* write back 3 data */</div><div class='del'>-	unsigned long  wb2a;     /* write back 2 address */</div><div class='del'>-	unsigned long  wb2d;     /* write back 2 data */</div><div class='del'>-	unsigned long  wb1a;     /* write back 1 address */</div><div class='del'>-	unsigned long  wb1dpd0;  /* write back 1 data/push data 0*/</div><div class='del'>-	unsigned long  pd1;      /* push data 1*/</div><div class='del'>-	unsigned long  pd2;      /* push data 2*/</div><div class='del'>-	unsigned long  pd3;      /* push data 3*/</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void writeback (unsigned short wbs, unsigned long wba,</div><div class='del'>-		       unsigned long wbd, void *old_buserr)</div><div class='del'>-{</div><div class='del'>-	mm_segment_t fs = get_fs();</div><div class='del'>-	static void *save_buserr;</div><div class='del'>-</div><div class='del'>-	__asm__ __volatile__ ("movec.l	%%vbr,%%a0\n\t"</div><div class='del'>-			      "move.l	%0,8(%%a0)\n\t"</div><div class='del'>-			      :</div><div class='del'>-			      : "r" (&amp;&amp;bus_error)</div><div class='del'>-			      : "a0" );</div><div class='del'>-</div><div class='del'>-	save_buserr = old_buserr;</div><div class='del'>-</div><div class='del'>-	set_fs (MAKE_MM_SEG(wbs &amp; WBTM_040));</div><div class='del'>-</div><div class='del'>-	switch (wbs &amp; WBSIZ_040) {</div><div class='del'>-	    case BA_SIZE_BYTE:</div><div class='del'>-		put_user (wbd &amp; 0xff, (char *)wba);</div><div class='del'>-		break;</div><div class='del'>-	    case BA_SIZE_WORD:</div><div class='del'>-		put_user (wbd &amp; 0xffff, (short *)wba);</div><div class='del'>-		break;</div><div class='del'>-	    case BA_SIZE_LONG:</div><div class='del'>-		put_user (wbd, (int *)wba);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	set_fs (fs);</div><div class='del'>-	return;</div><div class='del'>-</div><div class='del'>-bus_error:</div><div class='del'>-	__asm__ __volatile__ ("cmp.l	%0,2(%%sp)\n\t"</div><div class='del'>-			      "bcs.s	.jump_old\n\t"</div><div class='del'>-			      "cmp.l	%1,2(%%sp)\n\t"</div><div class='del'>-			      "bls.s	.restore_old\n"</div><div class='del'>-			".jump_old:\n\t"</div><div class='del'>-			      "move.l	%2,-(%%sp)\n\t"</div><div class='del'>-			      "rts\n"</div><div class='del'>-			".restore_old:\n\t"</div><div class='del'>-			      "move.l	%%a0,-(%%sp)\n\t"</div><div class='del'>-			      "movec.l	%%vbr,%%a0\n\t"</div><div class='del'>-			      "move.l	%2,8(%%a0)\n\t"</div><div class='del'>-			      "move.l	(%%sp)+,%%a0\n\t"</div><div class='del'>-			      "rte\n\t"</div><div class='del'>-			      :</div><div class='del'>-			      : "i" (writeback), "i" (&amp;&amp;bus_error),</div><div class='del'>-			        "m" (save_buserr) );</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * static inline void set_restdata_reg(unsigned char *cur_addr)</div><div class='del'>- *</div><div class='del'>- * Set the rest data register if necessary.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static inline void set_restdata_reg(unsigned char *cur_addr)</div><div class='del'>-{</div><div class='del'>-	if (((long) cur_addr &amp; ~3) != 0)</div><div class='del'>-		tt_scsi_dma.dma_restdata =</div><div class='del'>-			*((unsigned long *) ((long) cur_addr &amp; ~3));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * void hades_dma_emulator(int irq, void *dummy)</div><div class='del'>- * </div><div class='del'>- * This code emulates TT SCSI DMA on the Hades.</div><div class='del'>- * </div><div class='del'>- * Note the following:</div><div class='del'>- * </div><div class='del'>- * 1. When there is no byte available to read from the SCSI bus, or</div><div class='del'>- *    when a byte cannot yet bet written to the SCSI bus, a bus</div><div class='del'>- *    error occurs when reading or writing the pseudo DMA data</div><div class='del'>- *    register (hades_psdm_reg). We have to catch this bus error</div><div class='del'>- *    and try again to read or write the byte. If after several tries</div><div class='del'>- *    we still get a bus error, the interrupt handler is left. When</div><div class='del'>- *    the byte can be read or written, the interrupt handler is</div><div class='del'>- *    called again.</div><div class='del'>- * </div><div class='del'>- * 2. The SCSI interrupt must be disabled in this interrupt handler.</div><div class='del'>- * </div><div class='del'>- * 3. If we set the EOP signal, the SCSI controller still expects one</div><div class='del'>- *    byte to be read or written. Therefore the last byte is transferred</div><div class='del'>- *    separately, after setting the EOP signal.</div><div class='del'>- * </div><div class='del'>- * 4. When this function is left, the address pointer (start_addr) is</div><div class='del'>- *    converted to a physical address. Because it points one byte</div><div class='del'>- *    further than the last transferred byte, it can point outside the</div><div class='del'>- *    current page. If virt_to_phys() is called with this address we</div><div class='del'>- *    might get an access error. Therefore virt_to_phys() is called with</div><div class='del'>- *    start_addr - 1 if the count has reached zero. The result is</div><div class='del'>- *    increased with one.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static irqreturn_t hades_dma_emulator(int irq, void *dummy)</div><div class='del'>-{</div><div class='del'>-	unsigned long dma_base;</div><div class='del'>-	register unsigned long dma_cnt asm ("d3");</div><div class='del'>-	static long save_buserr;</div><div class='del'>-	register unsigned long save_sp asm ("d4");</div><div class='del'>-	register int tries asm ("d5");</div><div class='del'>-	register unsigned char *start_addr asm ("a3"), *end_addr asm ("a4");</div><div class='del'>-	register unsigned char *eff_addr;</div><div class='del'>-	register unsigned char *psdm_reg;</div><div class='del'>-	unsigned long rem;</div><div class='del'>-</div><div class='del'>-	atari_disable_irq(IRQ_TT_MFP_SCSI);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Read the dma address and count registers.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	dma_base = SCSI_DMA_READ_P(dma_addr);</div><div class='del'>-	dma_cnt = SCSI_DMA_READ_P(dma_cnt);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Check if DMA is still enabled.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if ((tt_scsi_dma.dma_ctrl &amp; 2) == 0)</div><div class='del'>-	{</div><div class='del'>-		atari_enable_irq(IRQ_TT_MFP_SCSI);</div><div class='del'>-		return IRQ_HANDLED;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (dma_cnt == 0)</div><div class='del'>-	{</div><div class='del'>-		printk(KERN_NOTICE "DMA emulation: count is zero.\n");</div><div class='del'>-		tt_scsi_dma.dma_ctrl &amp;= 0xfd;	/* DMA ready. */</div><div class='del'>-		atari_enable_irq(IRQ_TT_MFP_SCSI);</div><div class='del'>-		return IRQ_HANDLED;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Install new bus error routine.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	__asm__ __volatile__ ("movec.l	%%vbr,%%a0\n\t"</div><div class='del'>-			      "move.l	8(%%a0),%0\n\t"</div><div class='del'>-			      "move.l	%1,8(%%a0)\n\t"</div><div class='del'>-			      : "=&amp;r" (save_buserr)</div><div class='del'>-			      : "r" (&amp;&amp;scsi_bus_error)</div><div class='del'>-			      : "a0" );</div><div class='del'>-</div><div class='del'>-	hades_dma_ctrl &amp;= 0xfc;		/* Bus error and EOP off. */</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Save the stack pointer.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	__asm__ __volatile__ ("move.l	%%sp,%0\n\t"</div><div class='del'>-			      : "=&amp;r" (save_sp) );</div><div class='del'>-</div><div class='del'>-	tries = 100;			/* Maximum number of bus errors. */</div><div class='del'>-	start_addr = phys_to_virt(dma_base);</div><div class='del'>-	end_addr = start_addr + dma_cnt;</div><div class='del'>-</div><div class='del'>-scsi_loop:</div><div class='del'>-	dma_cnt--;</div><div class='del'>-	rem = dma_cnt &amp; (TRANSFER_SIZE - 1);</div><div class='del'>-	dma_cnt &amp;= ~(TRANSFER_SIZE - 1);</div><div class='del'>-	psdm_reg = &amp;hades_psdm_reg;</div><div class='del'>-</div><div class='del'>-	if (tt_scsi_dma.dma_ctrl &amp; 1)	/* Read or write? */</div><div class='del'>-	{</div><div class='del'>-		/*</div><div class='del'>-		 * SCSI write. Abort when count is zero.</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		switch (rem)</div><div class='del'>-		{</div><div class='del'>-		case 0:</div><div class='del'>-			while (dma_cnt &gt; 0)</div><div class='del'>-			{</div><div class='del'>-				dma_cnt -= TRANSFER_SIZE;</div><div class='del'>-</div><div class='del'>-				*psdm_reg = *start_addr++;</div><div class='del'>-		case 15:</div><div class='del'>-				*psdm_reg = *start_addr++;</div><div class='del'>-		case 14:</div><div class='del'>-				*psdm_reg = *start_addr++;</div><div class='del'>-		case 13:</div><div class='del'>-				*psdm_reg = *start_addr++;</div><div class='del'>-		case 12:</div><div class='del'>-				*psdm_reg = *start_addr++;</div><div class='del'>-		case 11:</div><div class='del'>-				*psdm_reg = *start_addr++;</div><div class='del'>-		case 10:</div><div class='del'>-				*psdm_reg = *start_addr++;</div><div class='del'>-		case 9:</div><div class='del'>-				*psdm_reg = *start_addr++;</div><div class='del'>-		case 8:</div><div class='del'>-				*psdm_reg = *start_addr++;</div><div class='del'>-		case 7:</div><div class='del'>-				*psdm_reg = *start_addr++;</div><div class='del'>-		case 6:</div><div class='del'>-				*psdm_reg = *start_addr++;</div><div class='del'>-		case 5:</div><div class='del'>-				*psdm_reg = *start_addr++;</div><div class='del'>-		case 4:</div><div class='del'>-				*psdm_reg = *start_addr++;</div><div class='del'>-		case 3:</div><div class='del'>-				*psdm_reg = *start_addr++;</div><div class='del'>-		case 2:</div><div class='del'>-				*psdm_reg = *start_addr++;</div><div class='del'>-		case 1:</div><div class='del'>-				*psdm_reg = *start_addr++;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		hades_dma_ctrl |= 1;	/* Set EOP. */</div><div class='del'>-		udelay(10);</div><div class='del'>-		*psdm_reg = *start_addr++;	/* Dummy byte. */</div><div class='del'>-		tt_scsi_dma.dma_ctrl &amp;= 0xfd;	/* DMA ready. */</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-	{</div><div class='del'>-		/*</div><div class='del'>-		 * SCSI read. Abort when count is zero.</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		switch (rem)</div><div class='del'>-		{</div><div class='del'>-		case 0:</div><div class='del'>-			while (dma_cnt &gt; 0)</div><div class='del'>-			{</div><div class='del'>-				dma_cnt -= TRANSFER_SIZE;</div><div class='del'>-</div><div class='del'>-				*start_addr++ = *psdm_reg;</div><div class='del'>-		case 15:</div><div class='del'>-				*start_addr++ = *psdm_reg;</div><div class='del'>-		case 14:</div><div class='del'>-				*start_addr++ = *psdm_reg;</div><div class='del'>-		case 13:</div><div class='del'>-				*start_addr++ = *psdm_reg;</div><div class='del'>-		case 12:</div><div class='del'>-				*start_addr++ = *psdm_reg;</div><div class='del'>-		case 11:</div><div class='del'>-				*start_addr++ = *psdm_reg;</div><div class='del'>-		case 10:</div><div class='del'>-				*start_addr++ = *psdm_reg;</div><div class='del'>-		case 9:</div><div class='del'>-				*start_addr++ = *psdm_reg;</div><div class='del'>-		case 8:</div><div class='del'>-				*start_addr++ = *psdm_reg;</div><div class='del'>-		case 7:</div><div class='del'>-				*start_addr++ = *psdm_reg;</div><div class='del'>-		case 6:</div><div class='del'>-				*start_addr++ = *psdm_reg;</div><div class='del'>-		case 5:</div><div class='del'>-				*start_addr++ = *psdm_reg;</div><div class='del'>-		case 4:</div><div class='del'>-				*start_addr++ = *psdm_reg;</div><div class='del'>-		case 3:</div><div class='del'>-				*start_addr++ = *psdm_reg;</div><div class='del'>-		case 2:</div><div class='del'>-				*start_addr++ = *psdm_reg;</div><div class='del'>-		case 1:</div><div class='del'>-				*start_addr++ = *psdm_reg;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		hades_dma_ctrl |= 1;	/* Set EOP. */</div><div class='del'>-		udelay(10);</div><div class='del'>-		*start_addr++ = *psdm_reg;</div><div class='del'>-		tt_scsi_dma.dma_ctrl &amp;= 0xfd;	/* DMA ready. */</div><div class='del'>-</div><div class='del'>-		set_restdata_reg(start_addr);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (start_addr != end_addr)</div><div class='del'>-		printk(KERN_CRIT "DMA emulation: FATAL: Count is not zero at end of transfer.\n");</div><div class='del'>-</div><div class='del'>-	dma_cnt = end_addr - start_addr;</div><div class='del'>-</div><div class='del'>-scsi_end:</div><div class='del'>-	dma_base = (dma_cnt == 0) ? virt_to_phys(start_addr - 1) + 1 :  </div><div class='del'>-				    virt_to_phys(start_addr);</div><div class='del'>-</div><div class='del'>-	SCSI_DMA_WRITE_P(dma_addr, dma_base);</div><div class='del'>-	SCSI_DMA_WRITE_P(dma_cnt, dma_cnt);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Restore old bus error routine.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	__asm__ __volatile__ ("movec.l	%%vbr,%%a0\n\t"</div><div class='del'>-			      "move.l	%0,8(%%a0)\n\t"</div><div class='del'>-			      :</div><div class='del'>-			      : "r" (save_buserr)</div><div class='del'>-			      : "a0" );</div><div class='del'>-</div><div class='del'>-	atari_enable_irq(IRQ_TT_MFP_SCSI);</div><div class='del'>-</div><div class='del'>-	return IRQ_HANDLED;</div><div class='del'>-</div><div class='del'>-scsi_bus_error:</div><div class='del'>-	/*</div><div class='del'>-	 * First check if the bus error is caused by our code.</div><div class='del'>-	 * If not, call the original handler.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	__asm__ __volatile__ ("cmp.l	%0,2(%%sp)\n\t"</div><div class='del'>-			      "bcs.s	.old_vector\n\t"</div><div class='del'>-			      "cmp.l	%1,2(%%sp)\n\t"</div><div class='del'>-			      "bls.s	.scsi_buserr\n"</div><div class='del'>-			".old_vector:\n\t"</div><div class='del'>-			      "move.l	%2,-(%%sp)\n\t"</div><div class='del'>-			      "rts\n"</div><div class='del'>-			".scsi_buserr:\n\t"</div><div class='del'>-			      :</div><div class='del'>-			      : "i" (&amp;&amp;scsi_loop), "i" (&amp;&amp;scsi_end),</div><div class='del'>-			        "m" (save_buserr) );</div><div class='del'>-</div><div class='del'>-	if (CPU_IS_060)</div><div class='del'>-	{</div><div class='del'>-		/*</div><div class='del'>-		 * Get effective address and restore the stack.</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		__asm__ __volatile__ ("move.l	8(%%sp),%0\n\t"</div><div class='del'>-				      "move.l	%1,%%sp\n\t"</div><div class='del'>-				      : "=a&amp;" (eff_addr)</div><div class='del'>-				      : "r" (save_sp) );</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-	{</div><div class='del'>-		register struct m68040_frame *frame;</div><div class='del'>-</div><div class='del'>-		__asm__ __volatile__ ("lea	8(%%sp),%0\n\t"</div><div class='del'>-				      : "=a&amp;" (frame) );</div><div class='del'>-</div><div class='del'>-		if (tt_scsi_dma.dma_ctrl &amp; 1)</div><div class='del'>-		{</div><div class='del'>-			/*</div><div class='del'>-			 * Bus error while writing.</div><div class='del'>-			 */</div><div class='del'>-</div><div class='del'>-			if (frame-&gt;wb3s &amp; WBV_040)</div><div class='del'>-			{</div><div class='del'>-				if (frame-&gt;wb3a == (long) &amp;hades_psdm_reg)</div><div class='del'>-					start_addr--;</div><div class='del'>-				else</div><div class='del'>-					writeback(frame-&gt;wb3s, frame-&gt;wb3a,</div><div class='del'>-						  frame-&gt;wb3d, &amp;&amp;scsi_bus_error);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (frame-&gt;wb2s &amp; WBV_040)</div><div class='del'>-			{</div><div class='del'>-				if (frame-&gt;wb2a == (long) &amp;hades_psdm_reg)</div><div class='del'>-					start_addr--;</div><div class='del'>-				else</div><div class='del'>-					writeback(frame-&gt;wb2s, frame-&gt;wb2a,</div><div class='del'>-						  frame-&gt;wb2d, &amp;&amp;scsi_bus_error);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (frame-&gt;wb1s &amp; WBV_040)</div><div class='del'>-			{</div><div class='del'>-				if (frame-&gt;wb1a == (long) &amp;hades_psdm_reg)</div><div class='del'>-					start_addr--;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		else</div><div class='del'>-		{</div><div class='del'>-			/*</div><div class='del'>-			 * Bus error while reading.</div><div class='del'>-			 */</div><div class='del'>-</div><div class='del'>-			if (frame-&gt;wb3s &amp; WBV_040)</div><div class='del'>-				writeback(frame-&gt;wb3s, frame-&gt;wb3a,</div><div class='del'>-					  frame-&gt;wb3d, &amp;&amp;scsi_bus_error);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		eff_addr = (unsigned char *) frame-&gt;faddr;</div><div class='del'>-</div><div class='del'>-		__asm__ __volatile__ ("move.l	%0,%%sp\n\t"</div><div class='del'>-				      :</div><div class='del'>-				      : "r" (save_sp) );</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dma_cnt = end_addr - start_addr;</div><div class='del'>-</div><div class='del'>-	if (eff_addr == &amp;hades_psdm_reg)</div><div class='del'>-	{</div><div class='del'>-		/*</div><div class='del'>-		 * Bus error occurred while reading the pseudo</div><div class='del'>-		 * DMA register. Time out.</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		tries--;</div><div class='del'>-</div><div class='del'>-		if (tries &lt;= 0)</div><div class='del'>-		{</div><div class='del'>-			if ((tt_scsi_dma.dma_ctrl &amp; 1) == 0)	/* Read or write? */</div><div class='del'>-				set_restdata_reg(start_addr);</div><div class='del'>-</div><div class='del'>-			if (dma_cnt &lt;= 1)</div><div class='del'>-				printk(KERN_CRIT "DMA emulation: Fatal "</div><div class='del'>-				       "error while %s the last byte.\n",</div><div class='del'>-				       (tt_scsi_dma.dma_ctrl &amp; 1)</div><div class='del'>-				       ? "writing" : "reading");</div><div class='del'>-</div><div class='del'>-			goto scsi_end;</div><div class='del'>-		}</div><div class='del'>-		else</div><div class='del'>-			goto scsi_loop;</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-	{</div><div class='del'>-		/*</div><div class='del'>-		 * Bus error during pseudo DMA transfer.</div><div class='del'>-		 * Terminate the DMA transfer.</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		hades_dma_ctrl |= 3;	/* Set EOP and bus error. */</div><div class='del'>-		if ((tt_scsi_dma.dma_ctrl &amp; 1) == 0)	/* Read or write? */</div><div class='del'>-			set_restdata_reg(start_addr);</div><div class='del'>-		goto scsi_end;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/scsi/atari_scsi.c b/drivers/scsi/atari_scsi.c<br/>index f5732d8f67fe..21fe07f9df87 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/atari_scsi.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/atari_scsi.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/atari_scsi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/atari_scsi.c</a></div><div class='hunk'>@@ -249,10 +249,6 @@ static int setup_hostid = -1;</div><div class='ctx'> module_param(setup_hostid, int, 0);</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_TT_DMA_EMUL)</div><div class='del'>-#include "atari_dma_emul.c"</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #if defined(REAL_DMA)</div><div class='ctx'> </div><div class='ctx'> static int scsi_dma_is_ignored_buserr(unsigned char dma_stat)</div><div class='hunk'>@@ -695,21 +691,8 @@ int atari_scsi_detect(struct scsi_host_template *host)</div><div class='ctx'> #ifdef REAL_DMA</div><div class='ctx'> 		tt_scsi_dma.dma_ctrl = 0;</div><div class='ctx'> 		atari_dma_residual = 0;</div><div class='del'>-#ifdef CONFIG_TT_DMA_EMUL</div><div class='del'>-		if (MACH_IS_HADES) {</div><div class='del'>-			if (request_irq(IRQ_AUTO_2, hades_dma_emulator,</div><div class='del'>-					 IRQ_TYPE_PRIO, "Hades DMA emulator",</div><div class='del'>-					 hades_dma_emulator)) {</div><div class='del'>-				printk(KERN_ERR "atari_scsi_detect: cannot allocate irq %d, aborting (MACH_IS_HADES)",IRQ_AUTO_2);</div><div class='del'>-				free_irq(IRQ_TT_MFP_SCSI, instance);</div><div class='del'>-				scsi_unregister(atari_scsi_host);</div><div class='del'>-				atari_stram_free(atari_dma_buffer);</div><div class='del'>-				atari_dma_buffer = 0;</div><div class='del'>-				return 0;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-#endif</div><div class='del'>-		if (MACH_IS_MEDUSA || MACH_IS_HADES) {</div><div class='add'>+</div><div class='add'>+		if (MACH_IS_MEDUSA) {</div><div class='ctx'> 			/* While the read overruns (described by Drew Eckhardt in</div><div class='ctx'> 			 * NCR5380.c) never happened on TTs, they do in fact on the Medusa</div><div class='ctx'> 			 * (This was the cause why SCSI didn't work right for so long</div><div class='hunk'>@@ -1007,11 +990,7 @@ static unsigned long atari_dma_xfer_len(unsigned long wanted_len,</div><div class='ctx'> 					Scsi_Cmnd *cmd, int write_flag)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long	possible_len, limit;</div><div class='del'>-#ifndef CONFIG_TT_DMA_EMUL</div><div class='del'>-	if (MACH_IS_HADES)</div><div class='del'>-		/* Hades has no SCSI DMA at all :-( Always force use of PIO */</div><div class='del'>-		return 0;</div><div class='del'>-#endif</div><div class='add'>+</div><div class='ctx'> 	if (IS_A_TT())</div><div class='ctx'> 		/* TT SCSI DMA can transfer arbitrary #bytes */</div><div class='ctx'> 		return wanted_len;</div><div class='head'>diff --git a/drivers/scsi/ch.c b/drivers/scsi/ch.c<br/>index 3c257fe0893e..88ecf94ad979 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/ch.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/ch.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/ch.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/ch.c</a></div><div class='hunk'>@@ -914,9 +914,9 @@ static int ch_probe(struct device *dev)</div><div class='ctx'> 	ch-&gt;minor = minor;</div><div class='ctx'> 	sprintf(ch-&gt;name,"ch%d",ch-&gt;minor);</div><div class='ctx'> </div><div class='del'>-	class_dev = device_create_drvdata(ch_sysfs_class, dev,</div><div class='del'>-					  MKDEV(SCSI_CHANGER_MAJOR, ch-&gt;minor),</div><div class='del'>-					  ch, "s%s", ch-&gt;name);</div><div class='add'>+	class_dev = device_create(ch_sysfs_class, dev,</div><div class='add'>+				  MKDEV(SCSI_CHANGER_MAJOR, ch-&gt;minor), ch,</div><div class='add'>+				  "s%s", ch-&gt;name);</div><div class='ctx'> 	if (IS_ERR(class_dev)) {</div><div class='ctx'> 		printk(KERN_WARNING "ch%d: device_create failed\n",</div><div class='ctx'> 		       ch-&gt;minor);</div><div class='head'>diff --git a/drivers/scsi/constants.c b/drivers/scsi/constants.c<br/>index 9785d7384199..4003deefb7d8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/constants.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/constants.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/constants.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/constants.c</a></div><div class='hunk'>@@ -1364,7 +1364,8 @@ EXPORT_SYMBOL(scsi_print_sense);</div><div class='ctx'> static const char * const hostbyte_table[]={</div><div class='ctx'> "DID_OK", "DID_NO_CONNECT", "DID_BUS_BUSY", "DID_TIME_OUT", "DID_BAD_TARGET",</div><div class='ctx'> "DID_ABORT", "DID_PARITY", "DID_ERROR", "DID_RESET", "DID_BAD_INTR",</div><div class='del'>-"DID_PASSTHROUGH", "DID_SOFT_ERROR", "DID_IMM_RETRY", "DID_REQUEUE"};</div><div class='add'>+"DID_PASSTHROUGH", "DID_SOFT_ERROR", "DID_IMM_RETRY", "DID_REQUEUE",</div><div class='add'>+"DID_TRANSPORT_DISRUPTED", "DID_TRANSPORT_FAILFAST" };</div><div class='ctx'> #define NUM_HOSTBYTE_STRS ARRAY_SIZE(hostbyte_table)</div><div class='ctx'> </div><div class='ctx'> static const char * const driverbyte_table[]={</div><div class='head'>diff --git a/drivers/scsi/device_handler/scsi_dh_alua.c b/drivers/scsi/device_handler/scsi_dh_alua.c<br/>index 708e475896b9..e356b43753ff 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/device_handler/scsi_dh_alua.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/device_handler/scsi_dh_alua.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/device_handler/scsi_dh_alua.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/device_handler/scsi_dh_alua.c</a></div><div class='hunk'>@@ -109,7 +109,8 @@ static struct request *get_alua_req(struct scsi_device *sdev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	rq-&gt;cmd_type = REQ_TYPE_BLOCK_PC;</div><div class='del'>-	rq-&gt;cmd_flags |= REQ_FAILFAST | REQ_NOMERGE;</div><div class='add'>+	rq-&gt;cmd_flags |= REQ_FAILFAST_DEV | REQ_FAILFAST_TRANSPORT |</div><div class='add'>+			 REQ_FAILFAST_DRIVER;</div><div class='ctx'> 	rq-&gt;retries = ALUA_FAILOVER_RETRIES;</div><div class='ctx'> 	rq-&gt;timeout = ALUA_FAILOVER_TIMEOUT;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/device_handler/scsi_dh_emc.c b/drivers/scsi/device_handler/scsi_dh_emc.c<br/>index ef693e8412e9..0e572d2c5b0a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/device_handler/scsi_dh_emc.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/device_handler/scsi_dh_emc.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/device_handler/scsi_dh_emc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/device_handler/scsi_dh_emc.c</a></div><div class='hunk'>@@ -84,7 +84,7 @@ struct clariion_dh_data {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * I/O buffer for both MODE_SELECT and INQUIRY commands.</div><div class='ctx'> 	 */</div><div class='del'>-	char buffer[CLARIION_BUFFER_SIZE];</div><div class='add'>+	unsigned char buffer[CLARIION_BUFFER_SIZE];</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * SCSI sense buffer for commands -- assumes serial issuance</div><div class='ctx'> 	 * and completion sequence of all commands for same multipath.</div><div class='hunk'>@@ -176,7 +176,7 @@ static int parse_sp_info_reply(struct scsi_device *sdev,</div><div class='ctx'> 		err = SCSI_DH_DEV_TEMP_BUSY;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	if (csdev-&gt;buffer[4] &lt; 0 || csdev-&gt;buffer[4] &gt; 2) {</div><div class='add'>+	if (csdev-&gt;buffer[4] &gt; 2) {</div><div class='ctx'> 		/* Invalid buffer format */</div><div class='ctx'> 		sdev_printk(KERN_NOTICE, sdev,</div><div class='ctx'> 			    "%s: invalid VPD page 0xC0 format\n",</div><div class='hunk'>@@ -278,7 +278,6 @@ static struct request *get_req(struct scsi_device *sdev, int cmd,</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	memset(rq-&gt;cmd, 0, BLK_MAX_CDB);</div><div class='ctx'> 	rq-&gt;cmd_len = COMMAND_SIZE(cmd);</div><div class='ctx'> 	rq-&gt;cmd[0] = cmd;</div><div class='ctx'> </div><div class='hunk'>@@ -304,7 +303,8 @@ static struct request *get_req(struct scsi_device *sdev, int cmd,</div><div class='ctx'> </div><div class='ctx'> 	rq-&gt;cmd[4] = len;</div><div class='ctx'> 	rq-&gt;cmd_type = REQ_TYPE_BLOCK_PC;</div><div class='del'>-	rq-&gt;cmd_flags |= REQ_FAILFAST;</div><div class='add'>+	rq-&gt;cmd_flags |= REQ_FAILFAST_DEV | REQ_FAILFAST_TRANSPORT |</div><div class='add'>+			 REQ_FAILFAST_DRIVER;</div><div class='ctx'> 	rq-&gt;timeout = CLARIION_TIMEOUT;</div><div class='ctx'> 	rq-&gt;retries = CLARIION_RETRIES;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/device_handler/scsi_dh_hp_sw.c b/drivers/scsi/device_handler/scsi_dh_hp_sw.c<br/>index a6a4ef3ad51c..9aec4ca64e56 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/device_handler/scsi_dh_hp_sw.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/device_handler/scsi_dh_hp_sw.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/device_handler/scsi_dh_hp_sw.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/device_handler/scsi_dh_hp_sw.c</a></div><div class='hunk'>@@ -112,9 +112,9 @@ static int hp_sw_tur(struct scsi_device *sdev, struct hp_sw_dh_data *h)</div><div class='ctx'> 		return SCSI_DH_RES_TEMP_UNAVAIL;</div><div class='ctx'> </div><div class='ctx'> 	req-&gt;cmd_type = REQ_TYPE_BLOCK_PC;</div><div class='del'>-	req-&gt;cmd_flags |= REQ_FAILFAST;</div><div class='add'>+	req-&gt;cmd_flags |= REQ_FAILFAST_DEV | REQ_FAILFAST_TRANSPORT |</div><div class='add'>+			  REQ_FAILFAST_DRIVER;</div><div class='ctx'> 	req-&gt;cmd_len = COMMAND_SIZE(TEST_UNIT_READY);</div><div class='del'>-	memset(req-&gt;cmd, 0, MAX_COMMAND_SIZE);</div><div class='ctx'> 	req-&gt;cmd[0] = TEST_UNIT_READY;</div><div class='ctx'> 	req-&gt;timeout = HP_SW_TIMEOUT;</div><div class='ctx'> 	req-&gt;sense = h-&gt;sense;</div><div class='hunk'>@@ -205,9 +205,9 @@ static int hp_sw_start_stop(struct scsi_device *sdev, struct hp_sw_dh_data *h)</div><div class='ctx'> 		return SCSI_DH_RES_TEMP_UNAVAIL;</div><div class='ctx'> </div><div class='ctx'> 	req-&gt;cmd_type = REQ_TYPE_BLOCK_PC;</div><div class='del'>-	req-&gt;cmd_flags |= REQ_FAILFAST;</div><div class='add'>+	req-&gt;cmd_flags |= REQ_FAILFAST_DEV | REQ_FAILFAST_TRANSPORT |</div><div class='add'>+			  REQ_FAILFAST_DRIVER;</div><div class='ctx'> 	req-&gt;cmd_len = COMMAND_SIZE(START_STOP);</div><div class='del'>-	memset(req-&gt;cmd, 0, MAX_COMMAND_SIZE);</div><div class='ctx'> 	req-&gt;cmd[0] = START_STOP;</div><div class='ctx'> 	req-&gt;cmd[4] = 1;	/* Start spin cycle */</div><div class='ctx'> 	req-&gt;timeout = HP_SW_TIMEOUT;</div><div class='head'>diff --git a/drivers/scsi/device_handler/scsi_dh_rdac.c b/drivers/scsi/device_handler/scsi_dh_rdac.c<br/>index 6e2f130d56de..a43c3ed4df28 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/device_handler/scsi_dh_rdac.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/device_handler/scsi_dh_rdac.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/device_handler/scsi_dh_rdac.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/device_handler/scsi_dh_rdac.c</a></div><div class='hunk'>@@ -225,10 +225,9 @@ static struct request *get_rdac_req(struct scsi_device *sdev,</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	memset(rq-&gt;cmd, 0, BLK_MAX_CDB);</div><div class='del'>-</div><div class='ctx'> 	rq-&gt;cmd_type = REQ_TYPE_BLOCK_PC;</div><div class='del'>-	rq-&gt;cmd_flags |= REQ_FAILFAST | REQ_NOMERGE;</div><div class='add'>+	rq-&gt;cmd_flags |= REQ_FAILFAST_DEV | REQ_FAILFAST_TRANSPORT |</div><div class='add'>+			 REQ_FAILFAST_DRIVER;</div><div class='ctx'> 	rq-&gt;retries = RDAC_RETRIES;</div><div class='ctx'> 	rq-&gt;timeout = RDAC_TIMEOUT;</div><div class='ctx'> </div><div class='hunk'>@@ -590,6 +589,8 @@ static const struct scsi_dh_devlist rdac_dev_list[] = {</div><div class='ctx'> 	{"STK", "OPENstorage D280"},</div><div class='ctx'> 	{"SUN", "CSM200_R"},</div><div class='ctx'> 	{"SUN", "LCSM100_F"},</div><div class='add'>+	{"DELL", "MD3000"},</div><div class='add'>+	{"DELL", "MD3000i"},</div><div class='ctx'> 	{NULL, NULL},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/dpt_i2o.c b/drivers/scsi/dpt_i2o.c<br/>index 1fe0901e8119..8aba4fdfb522 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/dpt_i2o.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/dpt_i2o.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/dpt_i2o.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/dpt_i2o.c</a></div><div class='hunk'>@@ -271,7 +271,7 @@ rebuild_sys_tab:</div><div class='ctx'> 		pHba-&gt;initialized = TRUE;</div><div class='ctx'> 		pHba-&gt;state &amp;= ~DPTI_STATE_RESET;</div><div class='ctx'> 		if (adpt_sysfs_class) {</div><div class='del'>-			struct device *dev = device_create_drvdata(adpt_sysfs_class,</div><div class='add'>+			struct device *dev = device_create(adpt_sysfs_class,</div><div class='ctx'> 				NULL, MKDEV(DPTI_I2O_MAJOR, pHba-&gt;unit), NULL,</div><div class='ctx'> 				"dpti%d", pHba-&gt;unit);</div><div class='ctx'> 			if (IS_ERR(dev)) {</div><div class='head'>diff --git a/drivers/scsi/esp_scsi.h b/drivers/scsi/esp_scsi.h<br/>index bb43a1388188..28e22acf87ea 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/esp_scsi.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/esp_scsi.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/esp_scsi.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/esp_scsi.h</a></div><div class='hunk'>@@ -521,7 +521,8 @@ struct esp {</div><div class='ctx'> </div><div class='ctx'> 	struct completion	*eh_reset;</div><div class='ctx'> </div><div class='del'>-	struct sbus_dma		*dma;</div><div class='add'>+	void			*dma;</div><div class='add'>+	int			dmarev;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* A front-end driver for the ESP chip should do the following in</div><div class='head'>diff --git a/drivers/scsi/gdth.c b/drivers/scsi/gdth.c<br/>index 822d5214692b..c387c15a2128 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/gdth.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/gdth.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/gdth.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/gdth.c</a></div><div class='hunk'>@@ -464,7 +464,6 @@ int __gdth_execute(struct scsi_device *sdev, gdth_cmd_str *gdtcmd, char *cmnd,</div><div class='ctx'> </div><div class='ctx'>     /* use request field to save the ptr. to completion struct. */</div><div class='ctx'>     scp-&gt;request = (struct request *)&amp;wait;</div><div class='del'>-    scp-&gt;timeout_per_command = timeout*HZ;</div><div class='ctx'>     scp-&gt;cmd_len = 12;</div><div class='ctx'>     scp-&gt;cmnd = cmnd;</div><div class='ctx'>     cmndinfo.priority = IOCTL_PRI;</div><div class='hunk'>@@ -1995,23 +1994,12 @@ static void gdth_putq(gdth_ha_str *ha, Scsi_Cmnd *scp, unchar priority)</div><div class='ctx'>     register Scsi_Cmnd *pscp;</div><div class='ctx'>     register Scsi_Cmnd *nscp;</div><div class='ctx'>     ulong flags;</div><div class='del'>-    unchar b, t;</div><div class='ctx'> </div><div class='ctx'>     TRACE(("gdth_putq() priority %d\n",priority));</div><div class='ctx'>     spin_lock_irqsave(&amp;ha-&gt;smp_lock, flags);</div><div class='ctx'> </div><div class='del'>-    if (!cmndinfo-&gt;internal_command) {</div><div class='add'>+    if (!cmndinfo-&gt;internal_command)</div><div class='ctx'>         cmndinfo-&gt;priority = priority;</div><div class='del'>-        b = scp-&gt;device-&gt;channel;</div><div class='del'>-        t = scp-&gt;device-&gt;id;</div><div class='del'>-        if (priority &gt;= DEFAULT_PRI) {</div><div class='del'>-            if ((b != ha-&gt;virt_bus &amp;&amp; ha-&gt;raw[BUS_L2P(ha,b)].lock) ||</div><div class='del'>-                (b==ha-&gt;virt_bus &amp;&amp; t&lt;MAX_HDRIVES &amp;&amp; ha-&gt;hdr[t].lock)) {</div><div class='del'>-                TRACE2(("gdth_putq(): locked IO -&gt;update_timeout()\n"));</div><div class='del'>-                cmndinfo-&gt;timeout = gdth_update_timeout(scp, 0);</div><div class='del'>-            }</div><div class='del'>-        }</div><div class='del'>-    }</div><div class='ctx'> </div><div class='ctx'>     if (ha-&gt;req_first==NULL) {</div><div class='ctx'>         ha-&gt;req_first = scp;                    /* queue was empty */</div><div class='hunk'>@@ -3899,6 +3887,39 @@ static const char *gdth_info(struct Scsi_Host *shp)</div><div class='ctx'>     return ((const char *)ha-&gt;binfo.type_string);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static enum blk_eh_timer_return gdth_timed_out(struct scsi_cmnd *scp)</div><div class='add'>+{</div><div class='add'>+	gdth_ha_str *ha = shost_priv(scp-&gt;device-&gt;host);</div><div class='add'>+	struct gdth_cmndinfo *cmndinfo = gdth_cmnd_priv(scp);</div><div class='add'>+	unchar b, t;</div><div class='add'>+	ulong flags;</div><div class='add'>+	enum blk_eh_timer_return retval = BLK_EH_NOT_HANDLED;</div><div class='add'>+</div><div class='add'>+	TRACE(("%s() cmd 0x%x\n", scp-&gt;cmnd[0], __func__));</div><div class='add'>+	b = scp-&gt;device-&gt;channel;</div><div class='add'>+	t = scp-&gt;device-&gt;id;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We don't really honor the command timeout, but we try to</div><div class='add'>+	 * honor 6 times of the actual command timeout! So reset the</div><div class='add'>+	 * timer if this is less than 6th timeout on this command!</div><div class='add'>+	 */</div><div class='add'>+	if (++cmndinfo-&gt;timeout_count &lt; 6)</div><div class='add'>+		retval = BLK_EH_RESET_TIMER;</div><div class='add'>+</div><div class='add'>+	/* Reset the timeout if it is locked IO */</div><div class='add'>+	spin_lock_irqsave(&amp;ha-&gt;smp_lock, flags);</div><div class='add'>+	if ((b != ha-&gt;virt_bus &amp;&amp; ha-&gt;raw[BUS_L2P(ha, b)].lock) ||</div><div class='add'>+	    (b == ha-&gt;virt_bus &amp;&amp; t &lt; MAX_HDRIVES &amp;&amp; ha-&gt;hdr[t].lock)) {</div><div class='add'>+		TRACE2(("%s(): locked IO, reset timeout\n", __func__));</div><div class='add'>+		retval = BLK_EH_RESET_TIMER;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;ha-&gt;smp_lock, flags);</div><div class='add'>+</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> static int gdth_eh_bus_reset(Scsi_Cmnd *scp)</div><div class='ctx'> {</div><div class='ctx'>     gdth_ha_str *ha = shost_priv(scp-&gt;device-&gt;host);</div><div class='hunk'>@@ -3992,7 +4013,7 @@ static int gdth_queuecommand(struct scsi_cmnd *scp,</div><div class='ctx'>     BUG_ON(!cmndinfo);</div><div class='ctx'> </div><div class='ctx'>     scp-&gt;scsi_done = done;</div><div class='del'>-    gdth_update_timeout(scp, scp-&gt;timeout_per_command * 6);</div><div class='add'>+    cmndinfo-&gt;timeout_count = 0;</div><div class='ctx'>     cmndinfo-&gt;priority = DEFAULT_PRI;</div><div class='ctx'> </div><div class='ctx'>     return __gdth_queuecommand(ha, scp, cmndinfo);</div><div class='hunk'>@@ -4096,12 +4117,10 @@ static int ioc_lockdrv(void __user *arg)</div><div class='ctx'>             ha-&gt;hdr[j].lock = 1;</div><div class='ctx'>             spin_unlock_irqrestore(&amp;ha-&gt;smp_lock, flags);</div><div class='ctx'>             gdth_wait_completion(ha, ha-&gt;bus_cnt, j);</div><div class='del'>-            gdth_stop_timeout(ha, ha-&gt;bus_cnt, j);</div><div class='ctx'>         } else {</div><div class='ctx'>             spin_lock_irqsave(&amp;ha-&gt;smp_lock, flags);</div><div class='ctx'>             ha-&gt;hdr[j].lock = 0;</div><div class='ctx'>             spin_unlock_irqrestore(&amp;ha-&gt;smp_lock, flags);</div><div class='del'>-            gdth_start_timeout(ha, ha-&gt;bus_cnt, j);</div><div class='ctx'>             gdth_next(ha);</div><div class='ctx'>         }</div><div class='ctx'>     } </div><div class='hunk'>@@ -4539,18 +4558,14 @@ static int gdth_ioctl(struct inode *inode, struct file *filep,</div><div class='ctx'>                 spin_lock_irqsave(&amp;ha-&gt;smp_lock, flags);</div><div class='ctx'>                 ha-&gt;raw[i].lock = 1;</div><div class='ctx'>                 spin_unlock_irqrestore(&amp;ha-&gt;smp_lock, flags);</div><div class='del'>-                for (j = 0; j &lt; ha-&gt;tid_cnt; ++j) {</div><div class='add'>+		for (j = 0; j &lt; ha-&gt;tid_cnt; ++j)</div><div class='ctx'>                     gdth_wait_completion(ha, i, j);</div><div class='del'>-                    gdth_stop_timeout(ha, i, j);</div><div class='del'>-                }</div><div class='ctx'>             } else {</div><div class='ctx'>                 spin_lock_irqsave(&amp;ha-&gt;smp_lock, flags);</div><div class='ctx'>                 ha-&gt;raw[i].lock = 0;</div><div class='ctx'>                 spin_unlock_irqrestore(&amp;ha-&gt;smp_lock, flags);</div><div class='del'>-                for (j = 0; j &lt; ha-&gt;tid_cnt; ++j) {</div><div class='del'>-                    gdth_start_timeout(ha, i, j);</div><div class='add'>+		for (j = 0; j &lt; ha-&gt;tid_cnt; ++j)</div><div class='ctx'>                     gdth_next(ha);</div><div class='del'>-                }</div><div class='ctx'>             }</div><div class='ctx'>         } </div><div class='ctx'>         break;</div><div class='hunk'>@@ -4644,6 +4659,7 @@ static struct scsi_host_template gdth_template = {</div><div class='ctx'>         .slave_configure        = gdth_slave_configure,</div><div class='ctx'>         .bios_param             = gdth_bios_param,</div><div class='ctx'>         .proc_info              = gdth_proc_info,</div><div class='add'>+	.eh_timed_out		= gdth_timed_out,</div><div class='ctx'>         .proc_name              = "gdth",</div><div class='ctx'>         .can_queue              = GDTH_MAXCMDS,</div><div class='ctx'>         .this_id                = -1,</div><div class='head'>diff --git a/drivers/scsi/gdth.h b/drivers/scsi/gdth.h<br/>index ca92476727cf..1646444e9bd5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/gdth.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/gdth.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/gdth.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/gdth.h</a></div><div class='hunk'>@@ -916,7 +916,7 @@ typedef struct {</div><div class='ctx'>         gdth_cmd_str *internal_cmd_str;         /* crier for internal messages*/</div><div class='ctx'>         dma_addr_t sense_paddr;                 /* sense dma-addr */</div><div class='ctx'>         unchar priority;</div><div class='del'>-        int timeout;</div><div class='add'>+	int timeout_count;			/* # of timeout calls */</div><div class='ctx'>         volatile int wait_for_completion;</div><div class='ctx'>         ushort status;</div><div class='ctx'>         ulong32 info;</div><div class='head'>diff --git a/drivers/scsi/gdth_proc.c b/drivers/scsi/gdth_proc.c<br/>index ce0228e26aec..59349a316e13 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/gdth_proc.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/gdth_proc.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/gdth_proc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/gdth_proc.c</a></div><div class='hunk'>@@ -748,69 +748,3 @@ static void gdth_wait_completion(gdth_ha_str *ha, int busnum, int id)</div><div class='ctx'>     }</div><div class='ctx'>     spin_unlock_irqrestore(&amp;ha-&gt;smp_lock, flags);</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-static void gdth_stop_timeout(gdth_ha_str *ha, int busnum, int id)</div><div class='del'>-{</div><div class='del'>-    ulong flags;</div><div class='del'>-    Scsi_Cmnd *scp;</div><div class='del'>-    unchar b, t;</div><div class='del'>-</div><div class='del'>-    spin_lock_irqsave(&amp;ha-&gt;smp_lock, flags);</div><div class='del'>-</div><div class='del'>-    for (scp = ha-&gt;req_first; scp; scp = (Scsi_Cmnd *)scp-&gt;SCp.ptr) {</div><div class='del'>-        struct gdth_cmndinfo *cmndinfo = gdth_cmnd_priv(scp);</div><div class='del'>-        if (!cmndinfo-&gt;internal_command) {</div><div class='del'>-            b = scp-&gt;device-&gt;channel;</div><div class='del'>-            t = scp-&gt;device-&gt;id;</div><div class='del'>-            if (t == (unchar)id &amp;&amp; b == (unchar)busnum) {</div><div class='del'>-                TRACE2(("gdth_stop_timeout(): update_timeout()\n"));</div><div class='del'>-                cmndinfo-&gt;timeout = gdth_update_timeout(scp, 0);</div><div class='del'>-            }</div><div class='del'>-        }</div><div class='del'>-    }</div><div class='del'>-    spin_unlock_irqrestore(&amp;ha-&gt;smp_lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void gdth_start_timeout(gdth_ha_str *ha, int busnum, int id)</div><div class='del'>-{</div><div class='del'>-    ulong flags;</div><div class='del'>-    Scsi_Cmnd *scp;</div><div class='del'>-    unchar b, t;</div><div class='del'>-</div><div class='del'>-    spin_lock_irqsave(&amp;ha-&gt;smp_lock, flags);</div><div class='del'>-</div><div class='del'>-    for (scp = ha-&gt;req_first; scp; scp = (Scsi_Cmnd *)scp-&gt;SCp.ptr) {</div><div class='del'>-        struct gdth_cmndinfo *cmndinfo = gdth_cmnd_priv(scp);</div><div class='del'>-        if (!cmndinfo-&gt;internal_command) {</div><div class='del'>-            b = scp-&gt;device-&gt;channel;</div><div class='del'>-            t = scp-&gt;device-&gt;id;</div><div class='del'>-            if (t == (unchar)id &amp;&amp; b == (unchar)busnum) {</div><div class='del'>-                TRACE2(("gdth_start_timeout(): update_timeout()\n"));</div><div class='del'>-                gdth_update_timeout(scp, cmndinfo-&gt;timeout);</div><div class='del'>-            }</div><div class='del'>-        }</div><div class='del'>-    }</div><div class='del'>-    spin_unlock_irqrestore(&amp;ha-&gt;smp_lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int gdth_update_timeout(Scsi_Cmnd *scp, int timeout)</div><div class='del'>-{</div><div class='del'>-    int oldto;</div><div class='del'>-</div><div class='del'>-    oldto = scp-&gt;timeout_per_command;</div><div class='del'>-    scp-&gt;timeout_per_command = timeout;</div><div class='del'>-</div><div class='del'>-    if (timeout == 0) {</div><div class='del'>-        del_timer(&amp;scp-&gt;eh_timeout);</div><div class='del'>-        scp-&gt;eh_timeout.data = (unsigned long) NULL;</div><div class='del'>-        scp-&gt;eh_timeout.expires = 0;</div><div class='del'>-    } else {</div><div class='del'>-        if (scp-&gt;eh_timeout.data != (unsigned long) NULL) </div><div class='del'>-            del_timer(&amp;scp-&gt;eh_timeout);</div><div class='del'>-        scp-&gt;eh_timeout.data = (unsigned long) scp;</div><div class='del'>-        scp-&gt;eh_timeout.expires = jiffies + timeout;</div><div class='del'>-        add_timer(&amp;scp-&gt;eh_timeout);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    return oldto;</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/scsi/gdth_proc.h b/drivers/scsi/gdth_proc.h<br/>index 45e6fdacf36e..9b900cc9ebe8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/gdth_proc.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/gdth_proc.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/gdth_proc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/gdth_proc.h</a></div><div class='hunk'>@@ -20,9 +20,6 @@ static char *gdth_ioctl_alloc(gdth_ha_str *ha, int size, int scratch,</div><div class='ctx'>                               ulong64 *paddr);</div><div class='ctx'> static void gdth_ioctl_free(gdth_ha_str *ha, int size, char *buf, ulong64 paddr);</div><div class='ctx'> static void gdth_wait_completion(gdth_ha_str *ha, int busnum, int id);</div><div class='del'>-static void gdth_stop_timeout(gdth_ha_str *ha, int busnum, int id);</div><div class='del'>-static void gdth_start_timeout(gdth_ha_str *ha, int busnum, int id);</div><div class='del'>-static int gdth_update_timeout(Scsi_Cmnd *scp, int timeout);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c<br/>index fed0b02ebc1d..3fdbb13e80a8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/hosts.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/hosts.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/hosts.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/hosts.c</a></div><div class='hunk'>@@ -464,7 +464,7 @@ static int __scsi_host_match(struct device *dev, void *data)</div><div class='ctx'> struct Scsi_Host *scsi_host_lookup(unsigned short hostnum)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *cdev;</div><div class='del'>-	struct Scsi_Host *shost = ERR_PTR(-ENXIO);</div><div class='add'>+	struct Scsi_Host *shost = NULL;</div><div class='ctx'> </div><div class='ctx'> 	cdev = class_find_device(&amp;shost_class, NULL, &amp;hostnum,</div><div class='ctx'> 				 __scsi_host_match);</div><div class='head'>diff --git a/drivers/scsi/ibmvscsi/ibmvfc.c b/drivers/scsi/ibmvscsi/ibmvfc.c<br/>index 4e0b7c8eb32e..7650707a40de 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/ibmvscsi/ibmvfc.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/ibmvscsi/ibmvfc.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/ibmvscsi/ibmvfc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/ibmvscsi/ibmvfc.c</a></div><div class='hunk'>@@ -2031,8 +2031,6 @@ static void ibmvfc_terminate_rport_io(struct fc_rport *rport)</div><div class='ctx'> 		spin_unlock_irqrestore(shost-&gt;host_lock, flags);</div><div class='ctx'> 	} else</div><div class='ctx'> 		ibmvfc_issue_fc_host_lip(shost);</div><div class='del'>-</div><div class='del'>-	scsi_target_unblock(&amp;rport-&gt;dev);</div><div class='ctx'> 	LEAVE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/ibmvscsi/ibmvscsi.c b/drivers/scsi/ibmvscsi/ibmvscsi.c<br/>index 7b1502c0ab6e..87e09f35d3d4 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/ibmvscsi/ibmvscsi.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/ibmvscsi/ibmvscsi.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/ibmvscsi/ibmvscsi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/ibmvscsi/ibmvscsi.c</a></div><div class='hunk'>@@ -756,7 +756,7 @@ static int ibmvscsi_queuecommand(struct scsi_cmnd *cmnd,</div><div class='ctx'> 	init_event_struct(evt_struct,</div><div class='ctx'> 			  handle_cmd_rsp,</div><div class='ctx'> 			  VIOSRP_SRP_FORMAT,</div><div class='del'>-			  cmnd-&gt;timeout_per_command/HZ);</div><div class='add'>+			  cmnd-&gt;request-&gt;timeout/HZ);</div><div class='ctx'> </div><div class='ctx'> 	evt_struct-&gt;cmnd = cmnd;</div><div class='ctx'> 	evt_struct-&gt;cmnd_done = done;</div><div class='head'>diff --git a/drivers/scsi/ide-scsi.c b/drivers/scsi/ide-scsi.c<br/>index 461331d3dc45..740bad435995 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/ide-scsi.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/ide-scsi.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/ide-scsi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/ide-scsi.c</a></div><div class='hunk'>@@ -40,7 +40,6 @@</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/hdreg.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/ide.h&gt;</div><div class='ctx'> #include &lt;linux/scatterlist.h&gt;</div><div class='hunk'>@@ -83,7 +82,6 @@ typedef struct ide_scsi_obj {</div><div class='ctx'> 	struct gendisk		*disk;</div><div class='ctx'> 	struct Scsi_Host	*host;</div><div class='ctx'> </div><div class='del'>-	struct ide_atapi_pc *pc;		/* Current packet command */</div><div class='ctx'> 	unsigned long transform;		/* SCSI cmd translation layer */</div><div class='ctx'> 	unsigned long log;			/* log flags */</div><div class='ctx'> } idescsi_scsi_t;</div><div class='hunk'>@@ -131,50 +129,6 @@ static inline idescsi_scsi_t *drive_to_idescsi(ide_drive_t *ide_drive)</div><div class='ctx'> 	return scsihost_to_idescsi(ide_drive-&gt;driver_data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- *	PIO data transfer routine using the scatter gather table.</div><div class='del'>- */</div><div class='del'>-static void ide_scsi_io_buffers(ide_drive_t *drive, struct ide_atapi_pc *pc,</div><div class='del'>-				unsigned int bcount, int write)</div><div class='del'>-{</div><div class='del'>-	ide_hwif_t *hwif = drive-&gt;hwif;</div><div class='del'>-	const struct ide_tp_ops *tp_ops = hwif-&gt;tp_ops;</div><div class='del'>-	xfer_func_t *xf = write ? tp_ops-&gt;output_data : tp_ops-&gt;input_data;</div><div class='del'>-	char *buf;</div><div class='del'>-	int count;</div><div class='del'>-</div><div class='del'>-	while (bcount) {</div><div class='del'>-		count = min(pc-&gt;sg-&gt;length - pc-&gt;b_count, bcount);</div><div class='del'>-		if (PageHighMem(sg_page(pc-&gt;sg))) {</div><div class='del'>-			unsigned long flags;</div><div class='del'>-</div><div class='del'>-			local_irq_save(flags);</div><div class='del'>-			buf = kmap_atomic(sg_page(pc-&gt;sg), KM_IRQ0) +</div><div class='del'>-					  pc-&gt;sg-&gt;offset;</div><div class='del'>-			xf(drive, NULL, buf + pc-&gt;b_count, count);</div><div class='del'>-			kunmap_atomic(buf - pc-&gt;sg-&gt;offset, KM_IRQ0);</div><div class='del'>-			local_irq_restore(flags);</div><div class='del'>-		} else {</div><div class='del'>-			buf = sg_virt(pc-&gt;sg);</div><div class='del'>-			xf(drive, NULL, buf + pc-&gt;b_count, count);</div><div class='del'>-		}</div><div class='del'>-		bcount -= count; pc-&gt;b_count += count;</div><div class='del'>-		if (pc-&gt;b_count == pc-&gt;sg-&gt;length) {</div><div class='del'>-			if (!--pc-&gt;sg_cnt)</div><div class='del'>-				break;</div><div class='del'>-			pc-&gt;sg = sg_next(pc-&gt;sg);</div><div class='del'>-			pc-&gt;b_count = 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (bcount) {</div><div class='del'>-		printk(KERN_ERR "%s: scatter gather table too small, %s\n",</div><div class='del'>-				drive-&gt;name, write ? "padding with zeros"</div><div class='del'>-						   : "discarding data");</div><div class='del'>-		ide_pad_transfer(drive, write, bcount);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void ide_scsi_hex_dump(u8 *data, int len)</div><div class='ctx'> {</div><div class='ctx'> 	print_hex_dump(KERN_CONT, "", DUMP_PREFIX_NONE, 16, 1, data, len, 0);</div><div class='hunk'>@@ -182,10 +136,10 @@ static void ide_scsi_hex_dump(u8 *data, int len)</div><div class='ctx'> </div><div class='ctx'> static int idescsi_end_request(ide_drive_t *, int, int);</div><div class='ctx'> </div><div class='del'>-static void ide_scsi_callback(ide_drive_t *drive)</div><div class='add'>+static void ide_scsi_callback(ide_drive_t *drive, int dsc)</div><div class='ctx'> {</div><div class='ctx'> 	idescsi_scsi_t *scsi = drive_to_idescsi(drive);</div><div class='del'>-	struct ide_atapi_pc *pc = scsi-&gt;pc;</div><div class='add'>+	struct ide_atapi_pc *pc = drive-&gt;pc;</div><div class='ctx'> </div><div class='ctx'> 	if (pc-&gt;flags &amp; PC_FLAG_TIMEDOUT)</div><div class='ctx'> 		debug_log("%s: got timed out packet %lu at %lu\n", __func__,</div><div class='hunk'>@@ -244,9 +198,9 @@ idescsi_atapi_error(ide_drive_t *drive, struct request *rq, u8 stat, u8 err)</div><div class='ctx'> {</div><div class='ctx'> 	ide_hwif_t *hwif = drive-&gt;hwif;</div><div class='ctx'> </div><div class='del'>-	if (hwif-&gt;tp_ops-&gt;read_status(hwif) &amp; (BUSY_STAT | DRQ_STAT))</div><div class='add'>+	if (hwif-&gt;tp_ops-&gt;read_status(hwif) &amp; (ATA_BUSY | ATA_DRQ))</div><div class='ctx'> 		/* force an abort */</div><div class='del'>-		hwif-&gt;tp_ops-&gt;exec_command(hwif, WIN_IDLEIMMEDIATE);</div><div class='add'>+		hwif-&gt;tp_ops-&gt;exec_command(hwif, ATA_CMD_IDLEIMMEDIATE);</div><div class='ctx'> </div><div class='ctx'> 	rq-&gt;errors++;</div><div class='ctx'> </div><div class='hunk'>@@ -312,49 +266,10 @@ static int idescsi_end_request (ide_drive_t *drive, int uptodate, int nrsecs)</div><div class='ctx'> 	spin_unlock_irqrestore(host-&gt;host_lock, flags);</div><div class='ctx'> 	kfree(pc);</div><div class='ctx'> 	blk_put_request(rq);</div><div class='del'>-	scsi-&gt;pc = NULL;</div><div class='add'>+	drive-&gt;pc = NULL;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline unsigned long get_timeout(struct ide_atapi_pc *pc)</div><div class='del'>-{</div><div class='del'>-	return max_t(unsigned long, WAIT_CMD, pc-&gt;timeout - jiffies);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int idescsi_expiry(ide_drive_t *drive)</div><div class='del'>-{</div><div class='del'>-	idescsi_scsi_t *scsi = drive_to_idescsi(drive);</div><div class='del'>-	struct ide_atapi_pc   *pc   = scsi-&gt;pc;</div><div class='del'>-</div><div class='del'>-	debug_log("%s called for %lu at %lu\n", __func__,</div><div class='del'>-		  pc-&gt;scsi_cmd-&gt;serial_number, jiffies);</div><div class='del'>-</div><div class='del'>-	pc-&gt;flags |= PC_FLAG_TIMEDOUT;</div><div class='del'>-</div><div class='del'>-	return 0;					/* we do not want the ide subsystem to retry */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	Our interrupt handler.</div><div class='del'>- */</div><div class='del'>-static ide_startstop_t idescsi_pc_intr (ide_drive_t *drive)</div><div class='del'>-{</div><div class='del'>-	idescsi_scsi_t *scsi = drive_to_idescsi(drive);</div><div class='del'>-	struct ide_atapi_pc *pc = scsi-&gt;pc;</div><div class='del'>-</div><div class='del'>-	return ide_pc_intr(drive, pc, idescsi_pc_intr, get_timeout(pc),</div><div class='del'>-			   idescsi_expiry, NULL, NULL, NULL,</div><div class='del'>-			   ide_scsi_io_buffers);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ide_startstop_t idescsi_transfer_pc(ide_drive_t *drive)</div><div class='del'>-{</div><div class='del'>-	idescsi_scsi_t *scsi = drive_to_idescsi(drive);</div><div class='del'>-</div><div class='del'>-	return ide_transfer_pc(drive, scsi-&gt;pc, idescsi_pc_intr,</div><div class='del'>-			       get_timeout(scsi-&gt;pc), idescsi_expiry);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline int idescsi_set_direction(struct ide_atapi_pc *pc)</div><div class='ctx'> {</div><div class='ctx'> 	switch (pc-&gt;c[0]) {</div><div class='hunk'>@@ -397,13 +312,10 @@ static int idescsi_map_sg(ide_drive_t *drive, struct ide_atapi_pc *pc)</div><div class='ctx'> static ide_startstop_t idescsi_issue_pc(ide_drive_t *drive,</div><div class='ctx'> 		struct ide_atapi_pc *pc)</div><div class='ctx'> {</div><div class='del'>-	idescsi_scsi_t *scsi = drive_to_idescsi(drive);</div><div class='del'>-</div><div class='ctx'> 	/* Set the current packet command */</div><div class='del'>-	scsi-&gt;pc = pc;</div><div class='add'>+	drive-&gt;pc = pc;</div><div class='ctx'> </div><div class='del'>-	return ide_issue_pc(drive, pc, idescsi_transfer_pc,</div><div class='del'>-			    get_timeout(pc), idescsi_expiry);</div><div class='add'>+	return ide_issue_pc(drive, ide_scsi_get_timeout(pc), ide_scsi_expiry);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -419,7 +331,8 @@ static ide_startstop_t idescsi_do_request (ide_drive_t *drive, struct request *r</div><div class='ctx'> 	if (blk_sense_request(rq) || blk_special_request(rq)) {</div><div class='ctx'> 		struct ide_atapi_pc *pc = (struct ide_atapi_pc *)rq-&gt;special;</div><div class='ctx'> </div><div class='del'>-		if (drive-&gt;using_dma &amp;&amp; !idescsi_map_sg(drive, pc))</div><div class='add'>+		if ((drive-&gt;dev_flags &amp; IDE_DFLAG_USING_DMA) &amp;&amp;</div><div class='add'>+		    idescsi_map_sg(drive, pc) == 0)</div><div class='ctx'> 			pc-&gt;flags |= PC_FLAG_DMA_OK;</div><div class='ctx'> </div><div class='ctx'> 		return idescsi_issue_pc(drive, pc);</div><div class='hunk'>@@ -430,21 +343,41 @@ static ide_startstop_t idescsi_do_request (ide_drive_t *drive, struct request *r</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_IDE_PROC_FS</div><div class='del'>-static void idescsi_add_settings(ide_drive_t *drive)</div><div class='del'>-{</div><div class='del'>-	idescsi_scsi_t *scsi = drive_to_idescsi(drive);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *			drive	setting name	read/write	data type	min	max	mul_factor	div_factor	data pointer		set function</div><div class='del'>- */</div><div class='del'>-	ide_add_setting(drive,	"bios_cyl",	SETTING_RW,	TYPE_INT,	0,	1023,	1,		1,		&amp;drive-&gt;bios_cyl,	NULL);</div><div class='del'>-	ide_add_setting(drive,	"bios_head",	SETTING_RW,	TYPE_BYTE,	0,	255,	1,		1,		&amp;drive-&gt;bios_head,	NULL);</div><div class='del'>-	ide_add_setting(drive,	"bios_sect",	SETTING_RW,	TYPE_BYTE,	0,	63,	1,		1,		&amp;drive-&gt;bios_sect,	NULL);</div><div class='del'>-	ide_add_setting(drive,	"transform",	SETTING_RW,	TYPE_INT,	0,	3,	1,		1,		&amp;scsi-&gt;transform,	NULL);</div><div class='del'>-	ide_add_setting(drive,	"log",		SETTING_RW,	TYPE_INT,	0,	1,	1,		1,		&amp;scsi-&gt;log,		NULL);</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-static inline void idescsi_add_settings(ide_drive_t *drive) { ; }</div><div class='add'>+#define ide_scsi_devset_get(name, field) \</div><div class='add'>+static int get_##name(ide_drive_t *drive) \</div><div class='add'>+{ \</div><div class='add'>+	idescsi_scsi_t *scsi = drive_to_idescsi(drive); \</div><div class='add'>+	return scsi-&gt;field; \</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define ide_scsi_devset_set(name, field) \</div><div class='add'>+static int set_##name(ide_drive_t *drive, int arg) \</div><div class='add'>+{ \</div><div class='add'>+	idescsi_scsi_t *scsi = drive_to_idescsi(drive); \</div><div class='add'>+	scsi-&gt;field = arg; \</div><div class='add'>+	return 0; \</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define ide_scsi_devset_rw_field(_name, _field) \</div><div class='add'>+ide_scsi_devset_get(_name, _field); \</div><div class='add'>+ide_scsi_devset_set(_name, _field); \</div><div class='add'>+IDE_DEVSET(_name, DS_SYNC, get_##_name, set_##_name);</div><div class='add'>+</div><div class='add'>+ide_devset_rw_field(bios_cyl, bios_cyl);</div><div class='add'>+ide_devset_rw_field(bios_head, bios_head);</div><div class='add'>+ide_devset_rw_field(bios_sect, bios_sect);</div><div class='add'>+</div><div class='add'>+ide_scsi_devset_rw_field(transform, transform);</div><div class='add'>+ide_scsi_devset_rw_field(log, log);</div><div class='add'>+</div><div class='add'>+static const struct ide_proc_devset idescsi_settings[] = {</div><div class='add'>+	IDE_PROC_DEVSET(bios_cyl,  0, 1023),</div><div class='add'>+	IDE_PROC_DEVSET(bios_head, 0,  255),</div><div class='add'>+	IDE_PROC_DEVSET(bios_sect, 0,	63),</div><div class='add'>+	IDE_PROC_DEVSET(log,	   0,	 1),</div><div class='add'>+	IDE_PROC_DEVSET(transform, 0,	 3),</div><div class='add'>+	{ 0 },</div><div class='add'>+};</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -452,16 +385,16 @@ static inline void idescsi_add_settings(ide_drive_t *drive) { ; }</div><div class='ctx'>  */</div><div class='ctx'> static void idescsi_setup (ide_drive_t *drive, idescsi_scsi_t *scsi)</div><div class='ctx'> {</div><div class='del'>-	if (drive-&gt;id &amp;&amp; (drive-&gt;id-&gt;config &amp; 0x0060) == 0x20)</div><div class='del'>-		set_bit(IDE_AFLAG_DRQ_INTERRUPT, &amp;drive-&gt;atapi_flags);</div><div class='ctx'> 	clear_bit(IDESCSI_SG_TRANSFORM, &amp;scsi-&gt;transform);</div><div class='ctx'> #if IDESCSI_DEBUG_LOG</div><div class='ctx'> 	set_bit(IDESCSI_LOG_CMD, &amp;scsi-&gt;log);</div><div class='ctx'> #endif /* IDESCSI_DEBUG_LOG */</div><div class='ctx'> </div><div class='del'>-	drive-&gt;pc_callback = ide_scsi_callback;</div><div class='add'>+	drive-&gt;pc_callback	 = ide_scsi_callback;</div><div class='add'>+	drive-&gt;pc_update_buffers = NULL;</div><div class='add'>+	drive-&gt;pc_io_buffers	 = ide_io_buffers;</div><div class='ctx'> </div><div class='del'>-	idescsi_add_settings(drive);</div><div class='add'>+	ide_proc_register_driver(drive, scsi-&gt;driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ide_scsi_remove(ide_drive_t *drive)</div><div class='hunk'>@@ -481,7 +414,7 @@ static void ide_scsi_remove(ide_drive_t *drive)</div><div class='ctx'> </div><div class='ctx'> 	ide_scsi_put(scsi);</div><div class='ctx'> </div><div class='del'>-	drive-&gt;scsi = 0;</div><div class='add'>+	drive-&gt;dev_flags &amp;= ~IDE_DFLAG_SCSI;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ide_scsi_probe(ide_drive_t *);</div><div class='hunk'>@@ -502,13 +435,12 @@ static ide_driver_t idescsi_driver = {</div><div class='ctx'> 	.probe			= ide_scsi_probe,</div><div class='ctx'> 	.remove			= ide_scsi_remove,</div><div class='ctx'> 	.version		= IDESCSI_VERSION,</div><div class='del'>-	.media			= ide_scsi,</div><div class='del'>-	.supports_dsc_overlap	= 0,</div><div class='ctx'> 	.do_request		= idescsi_do_request,</div><div class='ctx'> 	.end_request		= idescsi_end_request,</div><div class='ctx'> 	.error                  = idescsi_atapi_error,</div><div class='ctx'> #ifdef CONFIG_IDE_PROC_FS</div><div class='ctx'> 	.proc			= idescsi_proc,</div><div class='add'>+	.settings		= idescsi_settings,</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -612,7 +544,7 @@ static int idescsi_queue (struct scsi_cmnd *cmd,</div><div class='ctx'> 	pc-&gt;req_xfer = pc-&gt;buf_size = scsi_bufflen(cmd);</div><div class='ctx'> 	pc-&gt;scsi_cmd = cmd;</div><div class='ctx'> 	pc-&gt;done = done;</div><div class='del'>-	pc-&gt;timeout = jiffies + cmd-&gt;timeout_per_command;</div><div class='add'>+	pc-&gt;timeout = jiffies + cmd-&gt;request-&gt;timeout;</div><div class='ctx'> </div><div class='ctx'> 	if (test_bit(IDESCSI_LOG_CMD, &amp;scsi-&gt;log)) {</div><div class='ctx'> 		printk ("ide-scsi: %s: que %lu, cmd = ", drive-&gt;name, cmd-&gt;serial_number);</div><div class='hunk'>@@ -647,6 +579,8 @@ static int idescsi_eh_abort (struct scsi_cmnd *cmd)</div><div class='ctx'> 	int		busy;</div><div class='ctx'> 	int             ret   = FAILED;</div><div class='ctx'> </div><div class='add'>+	struct ide_atapi_pc *pc;</div><div class='add'>+</div><div class='ctx'> 	/* In idescsi_eh_abort we try to gently pry our command from the ide subsystem */</div><div class='ctx'> </div><div class='ctx'> 	if (test_bit(IDESCSI_LOG_CMD, &amp;scsi-&gt;log))</div><div class='hunk'>@@ -667,26 +601,27 @@ static int idescsi_eh_abort (struct scsi_cmnd *cmd)</div><div class='ctx'> 	spin_lock_irq(&amp;ide_lock);</div><div class='ctx'> </div><div class='ctx'> 	/* If there is no pc running we're done (our interrupt took care of it) */</div><div class='del'>-	if (!scsi-&gt;pc) {</div><div class='add'>+	pc = drive-&gt;pc;</div><div class='add'>+	if (pc == NULL) {</div><div class='ctx'> 		ret = SUCCESS;</div><div class='ctx'> 		goto ide_unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* It's somewhere in flight. Does ide subsystem agree? */</div><div class='del'>-	if (scsi-&gt;pc-&gt;scsi_cmd-&gt;serial_number == cmd-&gt;serial_number &amp;&amp; !busy &amp;&amp;</div><div class='del'>-	    elv_queue_empty(drive-&gt;queue) &amp;&amp; HWGROUP(drive)-&gt;rq != scsi-&gt;pc-&gt;rq) {</div><div class='add'>+	if (pc-&gt;scsi_cmd-&gt;serial_number == cmd-&gt;serial_number &amp;&amp; !busy &amp;&amp;</div><div class='add'>+	    elv_queue_empty(drive-&gt;queue) &amp;&amp; HWGROUP(drive)-&gt;rq != pc-&gt;rq) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * FIXME - not sure this condition can ever occur</div><div class='ctx'> 		 */</div><div class='ctx'> 		printk (KERN_ERR "ide-scsi: cmd aborted!\n");</div><div class='ctx'> </div><div class='del'>-		if (blk_sense_request(scsi-&gt;pc-&gt;rq))</div><div class='del'>-			kfree(scsi-&gt;pc-&gt;buf);</div><div class='add'>+		if (blk_sense_request(pc-&gt;rq))</div><div class='add'>+			kfree(pc-&gt;buf);</div><div class='ctx'> 		/* we need to call blk_put_request twice. */</div><div class='del'>-		blk_put_request(scsi-&gt;pc-&gt;rq);</div><div class='del'>-		blk_put_request(scsi-&gt;pc-&gt;rq);</div><div class='del'>-		kfree(scsi-&gt;pc);</div><div class='del'>-		scsi-&gt;pc = NULL;</div><div class='add'>+		blk_put_request(pc-&gt;rq);</div><div class='add'>+		blk_put_request(pc-&gt;rq);</div><div class='add'>+		kfree(pc);</div><div class='add'>+		drive-&gt;pc = NULL;</div><div class='ctx'> </div><div class='ctx'> 		ret = SUCCESS;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -708,6 +643,8 @@ static int idescsi_eh_reset (struct scsi_cmnd *cmd)</div><div class='ctx'> 	int             ready = 0;</div><div class='ctx'> 	int             ret   = SUCCESS;</div><div class='ctx'> </div><div class='add'>+	struct ide_atapi_pc *pc;</div><div class='add'>+</div><div class='ctx'> 	/* In idescsi_eh_reset we forcefully remove the command from the ide subsystem and reset the device. */</div><div class='ctx'> </div><div class='ctx'> 	if (test_bit(IDESCSI_LOG_CMD, &amp;scsi-&gt;log))</div><div class='hunk'>@@ -722,7 +659,9 @@ static int idescsi_eh_reset (struct scsi_cmnd *cmd)</div><div class='ctx'> 	spin_lock_irq(cmd-&gt;device-&gt;host-&gt;host_lock);</div><div class='ctx'> 	spin_lock(&amp;ide_lock);</div><div class='ctx'> </div><div class='del'>-	if (!scsi-&gt;pc || (req = scsi-&gt;pc-&gt;rq) != HWGROUP(drive)-&gt;rq || !HWGROUP(drive)-&gt;handler) {</div><div class='add'>+	pc = drive-&gt;pc;</div><div class='add'>+</div><div class='add'>+	if (pc == NULL || (req = pc-&gt;rq) != HWGROUP(drive)-&gt;rq || !HWGROUP(drive)-&gt;handler) {</div><div class='ctx'> 		printk (KERN_WARNING "ide-scsi: No active request in idescsi_eh_reset\n");</div><div class='ctx'> 		spin_unlock(&amp;ide_lock);</div><div class='ctx'> 		spin_unlock_irq(cmd-&gt;device-&gt;host-&gt;host_lock);</div><div class='hunk'>@@ -733,9 +672,9 @@ static int idescsi_eh_reset (struct scsi_cmnd *cmd)</div><div class='ctx'> 	if (__blk_end_request(req, -EIO, 0))</div><div class='ctx'> 		BUG();</div><div class='ctx'> 	if (blk_sense_request(req))</div><div class='del'>-		kfree(scsi-&gt;pc-&gt;buf);</div><div class='del'>-	kfree(scsi-&gt;pc);</div><div class='del'>-	scsi-&gt;pc = NULL;</div><div class='add'>+		kfree(pc-&gt;buf);</div><div class='add'>+	kfree(pc);</div><div class='add'>+	drive-&gt;pc = NULL;</div><div class='ctx'> 	blk_put_request(req);</div><div class='ctx'> </div><div class='ctx'> 	/* now nuke the drive queue */</div><div class='hunk'>@@ -811,6 +750,7 @@ static int ide_scsi_probe(ide_drive_t *drive)</div><div class='ctx'> 	struct gendisk *g;</div><div class='ctx'> 	static int warned;</div><div class='ctx'> 	int err = -ENOMEM;</div><div class='add'>+	u16 last_lun;</div><div class='ctx'> </div><div class='ctx'> 	if (!warned &amp;&amp; drive-&gt;media == ide_cdrom) {</div><div class='ctx'> 		printk(KERN_WARNING "ide-scsi is deprecated for cd burning! Use ide-cd and give dev=/dev/hdX as device\n");</div><div class='hunk'>@@ -821,12 +761,11 @@ static int ide_scsi_probe(ide_drive_t *drive)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	if (!strstr("ide-scsi", drive-&gt;driver_req) ||</div><div class='del'>-	    !drive-&gt;present ||</div><div class='ctx'> 	    drive-&gt;media == ide_disk ||</div><div class='ctx'> 	    !(host = scsi_host_alloc(&amp;idescsi_template,sizeof(idescsi_scsi_t))))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	drive-&gt;scsi = 1;</div><div class='add'>+	drive-&gt;dev_flags |= IDE_DFLAG_SCSI;</div><div class='ctx'> </div><div class='ctx'> 	g = alloc_disk(1 &lt;&lt; PARTN_BITS);</div><div class='ctx'> 	if (!g)</div><div class='hunk'>@@ -836,12 +775,12 @@ static int ide_scsi_probe(ide_drive_t *drive)</div><div class='ctx'> </div><div class='ctx'> 	host-&gt;max_id = 1;</div><div class='ctx'> </div><div class='del'>-	if (drive-&gt;id-&gt;last_lun)</div><div class='del'>-		debug_log("%s: id-&gt;last_lun=%u\n", drive-&gt;name,</div><div class='del'>-			  drive-&gt;id-&gt;last_lun);</div><div class='add'>+	last_lun = drive-&gt;id[ATA_ID_LAST_LUN];</div><div class='add'>+	if (last_lun)</div><div class='add'>+		debug_log("%s: last_lun=%u\n", drive-&gt;name, last_lun);</div><div class='ctx'> </div><div class='del'>-	if ((drive-&gt;id-&gt;last_lun &amp; 0x7) != 7)</div><div class='del'>-		host-&gt;max_lun = (drive-&gt;id-&gt;last_lun &amp; 0x7) + 1;</div><div class='add'>+	if ((last_lun &amp; 7) != 7)</div><div class='add'>+		host-&gt;max_lun = (last_lun &amp; 7) + 1;</div><div class='ctx'> 	else</div><div class='ctx'> 		host-&gt;max_lun = 1;</div><div class='ctx'> </div><div class='hunk'>@@ -852,7 +791,6 @@ static int ide_scsi_probe(ide_drive_t *drive)</div><div class='ctx'> 	idescsi-&gt;host = host;</div><div class='ctx'> 	idescsi-&gt;disk = g;</div><div class='ctx'> 	g-&gt;private_data = &amp;idescsi-&gt;driver;</div><div class='del'>-	ide_proc_register_driver(drive, &amp;idescsi_driver);</div><div class='ctx'> 	err = 0;</div><div class='ctx'> 	idescsi_setup(drive, idescsi);</div><div class='ctx'> 	g-&gt;fops = &amp;idescsi_ops;</div><div class='hunk'>@@ -868,7 +806,7 @@ static int ide_scsi_probe(ide_drive_t *drive)</div><div class='ctx'> </div><div class='ctx'> 	put_disk(g);</div><div class='ctx'> out_host_put:</div><div class='del'>-	drive-&gt;scsi = 0;</div><div class='add'>+	drive-&gt;dev_flags &amp;= ~IDE_DFLAG_SCSI;</div><div class='ctx'> 	scsi_host_put(host);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c<br/>index e7a3a6554425..d30eb7ba018e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/ipr.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/ipr.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/ipr.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/ipr.c</a></div><div class='hunk'>@@ -3670,7 +3670,8 @@ static int ipr_slave_configure(struct scsi_device *sdev)</div><div class='ctx'> 			sdev-&gt;no_uld_attach = 1;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (ipr_is_vset_device(res)) {</div><div class='del'>-			sdev-&gt;timeout = IPR_VSET_RW_TIMEOUT;</div><div class='add'>+			blk_queue_rq_timeout(sdev-&gt;request_queue,</div><div class='add'>+					     IPR_VSET_RW_TIMEOUT);</div><div class='ctx'> 			blk_queue_max_sectors(sdev-&gt;request_queue, IPR_VSET_MAX_SECTORS);</div><div class='ctx'> 		}</div><div class='ctx'> 		if (ipr_is_vset_device(res) || ipr_is_scsi_disk(res))</div><div class='head'>diff --git a/drivers/scsi/ips.c b/drivers/scsi/ips.c<br/>index bc9e6ddf41df..ef683f0d2b5a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/ips.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/ips.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/ips.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/ips.c</a></div><div class='hunk'>@@ -3818,7 +3818,7 @@ ips_send_cmd(ips_ha_t * ha, ips_scb_t * scb)</div><div class='ctx'> 		scb-&gt;cmd.dcdb.segment_4G = 0;</div><div class='ctx'> 		scb-&gt;cmd.dcdb.enhanced_sg = 0;</div><div class='ctx'> </div><div class='del'>-		TimeOut = scb-&gt;scsi_cmd-&gt;timeout_per_command;</div><div class='add'>+		TimeOut = scb-&gt;scsi_cmd-&gt;request-&gt;timeout;</div><div class='ctx'> </div><div class='ctx'> 		if (ha-&gt;subsys-&gt;param[4] &amp; 0x00100000) {	/* If NEW Tape DCDB is Supported */</div><div class='ctx'> 			if (!scb-&gt;sg_len) {</div><div class='head'>diff --git a/drivers/scsi/iscsi_tcp.c b/drivers/scsi/iscsi_tcp.c<br/>index 2a2f0094570f..ed6c54cae7b1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/iscsi_tcp.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/iscsi_tcp.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/iscsi_tcp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/iscsi_tcp.c</a></div><div class='hunk'>@@ -523,22 +523,20 @@ iscsi_tcp_cleanup_task(struct iscsi_conn *conn, struct iscsi_task *task)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * iscsi_data_rsp - SCSI Data-In Response processing</div><div class='add'>+ * iscsi_data_in - SCSI Data-In Response processing</div><div class='ctx'>  * @conn: iscsi connection</div><div class='ctx'>  * @task: scsi command task</div><div class='ctx'>  **/</div><div class='ctx'> static int</div><div class='del'>-iscsi_data_rsp(struct iscsi_conn *conn, struct iscsi_task *task)</div><div class='add'>+iscsi_data_in(struct iscsi_conn *conn, struct iscsi_task *task)</div><div class='ctx'> {</div><div class='ctx'> 	struct iscsi_tcp_conn *tcp_conn = conn-&gt;dd_data;</div><div class='ctx'> 	struct iscsi_tcp_task *tcp_task = task-&gt;dd_data;</div><div class='ctx'> 	struct iscsi_data_rsp *rhdr = (struct iscsi_data_rsp *)tcp_conn-&gt;in.hdr;</div><div class='del'>-	struct iscsi_session *session = conn-&gt;session;</div><div class='del'>-	struct scsi_cmnd *sc = task-&gt;sc;</div><div class='ctx'> 	int datasn = be32_to_cpu(rhdr-&gt;datasn);</div><div class='del'>-	unsigned total_in_length = scsi_in(sc)-&gt;length;</div><div class='add'>+	unsigned total_in_length = scsi_in(task-&gt;sc)-&gt;length;</div><div class='ctx'> </div><div class='del'>-	iscsi_update_cmdsn(session, (struct iscsi_nopin*)rhdr);</div><div class='add'>+	iscsi_update_cmdsn(conn-&gt;session, (struct iscsi_nopin*)rhdr);</div><div class='ctx'> 	if (tcp_conn-&gt;in.datalen == 0)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -558,23 +556,6 @@ iscsi_data_rsp(struct iscsi_conn *conn, struct iscsi_task *task)</div><div class='ctx'> 		return ISCSI_ERR_DATA_OFFSET;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (rhdr-&gt;flags &amp; ISCSI_FLAG_DATA_STATUS) {</div><div class='del'>-		sc-&gt;result = (DID_OK &lt;&lt; 16) | rhdr-&gt;cmd_status;</div><div class='del'>-		conn-&gt;exp_statsn = be32_to_cpu(rhdr-&gt;statsn) + 1;</div><div class='del'>-		if (rhdr-&gt;flags &amp; (ISCSI_FLAG_DATA_UNDERFLOW |</div><div class='del'>-		                   ISCSI_FLAG_DATA_OVERFLOW)) {</div><div class='del'>-			int res_count = be32_to_cpu(rhdr-&gt;residual_count);</div><div class='del'>-</div><div class='del'>-			if (res_count &gt; 0 &amp;&amp;</div><div class='del'>-			    (rhdr-&gt;flags &amp; ISCSI_FLAG_CMD_OVERFLOW ||</div><div class='del'>-			     res_count &lt;= total_in_length))</div><div class='del'>-				scsi_in(sc)-&gt;resid = res_count;</div><div class='del'>-			else</div><div class='del'>-				sc-&gt;result = (DID_BAD_TARGET &lt;&lt; 16) |</div><div class='del'>-					rhdr-&gt;cmd_status;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	conn-&gt;datain_pdus_cnt++;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -774,7 +755,7 @@ iscsi_tcp_hdr_dissect(struct iscsi_conn *conn, struct iscsi_hdr *hdr)</div><div class='ctx'> 		if (!task)</div><div class='ctx'> 			rc = ISCSI_ERR_BAD_ITT;</div><div class='ctx'> 		else</div><div class='del'>-			rc = iscsi_data_rsp(conn, task);</div><div class='add'>+			rc = iscsi_data_in(conn, task);</div><div class='ctx'> 		if (rc) {</div><div class='ctx'> 			spin_unlock(&amp;conn-&gt;session-&gt;lock);</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -998,7 +979,7 @@ iscsi_tcp_recv(read_descriptor_t *rd_desc, struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> error:</div><div class='ctx'> 	debug_tcp("Error receiving PDU, errno=%d\n", rc);</div><div class='del'>-	iscsi_conn_failure(conn, ISCSI_ERR_CONN_FAILED);</div><div class='add'>+	iscsi_conn_failure(conn, rc);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1117,8 +1098,10 @@ iscsi_xmit(struct iscsi_conn *conn)</div><div class='ctx'> </div><div class='ctx'> 	while (1) {</div><div class='ctx'> 		rc = iscsi_tcp_xmit_segment(tcp_conn, segment);</div><div class='del'>-		if (rc &lt; 0)</div><div class='add'>+		if (rc &lt; 0) {</div><div class='add'>+			rc = ISCSI_ERR_XMIT_FAILED;</div><div class='ctx'> 			goto error;</div><div class='add'>+		}</div><div class='ctx'> 		if (rc == 0)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='hunk'>@@ -1127,7 +1110,7 @@ iscsi_xmit(struct iscsi_conn *conn)</div><div class='ctx'> 		if (segment-&gt;total_copied &gt;= segment-&gt;total_size) {</div><div class='ctx'> 			if (segment-&gt;done != NULL) {</div><div class='ctx'> 				rc = segment-&gt;done(tcp_conn, segment);</div><div class='del'>-				if (rc &lt; 0)</div><div class='add'>+				if (rc != 0)</div><div class='ctx'> 					goto error;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1142,8 +1125,8 @@ error:</div><div class='ctx'> 	/* Transmit error. We could initiate error recovery</div><div class='ctx'> 	 * here. */</div><div class='ctx'> 	debug_tcp("Error sending PDU, errno=%d\n", rc);</div><div class='del'>-	iscsi_conn_failure(conn, ISCSI_ERR_CONN_FAILED);</div><div class='del'>-	return rc;</div><div class='add'>+	iscsi_conn_failure(conn, rc);</div><div class='add'>+	return -EIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1904,6 +1887,7 @@ static void iscsi_tcp_session_destroy(struct iscsi_cls_session *cls_session)</div><div class='ctx'> 	struct Scsi_Host *shost = iscsi_session_to_shost(cls_session);</div><div class='ctx'> </div><div class='ctx'> 	iscsi_r2tpool_free(cls_session-&gt;dd_data);</div><div class='add'>+	iscsi_session_teardown(cls_session);</div><div class='ctx'> </div><div class='ctx'> 	iscsi_host_remove(shost);</div><div class='ctx'> 	iscsi_host_free(shost);</div><div class='hunk'>@@ -1927,7 +1911,7 @@ static struct scsi_host_template iscsi_sht = {</div><div class='ctx'> 	.cmd_per_lun		= ISCSI_DEF_CMD_PER_LUN,</div><div class='ctx'> 	.eh_abort_handler       = iscsi_eh_abort,</div><div class='ctx'> 	.eh_device_reset_handler= iscsi_eh_device_reset,</div><div class='del'>-	.eh_host_reset_handler	= iscsi_eh_host_reset,</div><div class='add'>+	.eh_target_reset_handler= iscsi_eh_target_reset,</div><div class='ctx'> 	.use_clustering         = DISABLE_CLUSTERING,</div><div class='ctx'> 	.slave_configure        = iscsi_tcp_slave_configure,</div><div class='ctx'> 	.proc_name		= "iscsi_tcp",</div><div class='head'>diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c<br/>index 299e075a7b34..801c7cf54d2e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/libiscsi.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/libiscsi.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/libiscsi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/libiscsi.c</a></div><div class='hunk'>@@ -404,11 +404,6 @@ static void fail_command(struct iscsi_conn *conn, struct iscsi_task *task,</div><div class='ctx'> 		conn-&gt;session-&gt;queued_cmdsn--;</div><div class='ctx'> 	else</div><div class='ctx'> 		conn-&gt;session-&gt;tt-&gt;cleanup_task(conn, task);</div><div class='del'>-	/*</div><div class='del'>-	 * Check if cleanup_task dropped the lock and the command completed,</div><div class='del'>-	 */</div><div class='del'>-	if (!task-&gt;sc)</div><div class='del'>-		return;</div><div class='ctx'> </div><div class='ctx'> 	sc-&gt;result = err;</div><div class='ctx'> 	if (!scsi_bidi_cmnd(sc))</div><div class='hunk'>@@ -633,6 +628,40 @@ out:</div><div class='ctx'> 	__iscsi_put_task(task);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * iscsi_data_in_rsp - SCSI Data-In Response processing</div><div class='add'>+ * @conn: iscsi connection</div><div class='add'>+ * @hdr:  iscsi pdu</div><div class='add'>+ * @task: scsi command task</div><div class='add'>+ **/</div><div class='add'>+static void</div><div class='add'>+iscsi_data_in_rsp(struct iscsi_conn *conn, struct iscsi_hdr *hdr,</div><div class='add'>+		  struct iscsi_task *task)</div><div class='add'>+{</div><div class='add'>+	struct iscsi_data_rsp *rhdr = (struct iscsi_data_rsp *)hdr;</div><div class='add'>+	struct scsi_cmnd *sc = task-&gt;sc;</div><div class='add'>+</div><div class='add'>+	if (!(rhdr-&gt;flags &amp; ISCSI_FLAG_DATA_STATUS))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	sc-&gt;result = (DID_OK &lt;&lt; 16) | rhdr-&gt;cmd_status;</div><div class='add'>+	conn-&gt;exp_statsn = be32_to_cpu(rhdr-&gt;statsn) + 1;</div><div class='add'>+	if (rhdr-&gt;flags &amp; (ISCSI_FLAG_DATA_UNDERFLOW |</div><div class='add'>+	                   ISCSI_FLAG_DATA_OVERFLOW)) {</div><div class='add'>+		int res_count = be32_to_cpu(rhdr-&gt;residual_count);</div><div class='add'>+</div><div class='add'>+		if (res_count &gt; 0 &amp;&amp;</div><div class='add'>+		    (rhdr-&gt;flags &amp; ISCSI_FLAG_CMD_OVERFLOW ||</div><div class='add'>+		     res_count &lt;= scsi_in(sc)-&gt;length))</div><div class='add'>+			scsi_in(sc)-&gt;resid = res_count;</div><div class='add'>+		else</div><div class='add'>+			sc-&gt;result = (DID_BAD_TARGET &lt;&lt; 16) | rhdr-&gt;cmd_status;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	conn-&gt;scsirsp_pdus_cnt++;</div><div class='add'>+	__iscsi_put_task(task);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void iscsi_tmf_rsp(struct iscsi_conn *conn, struct iscsi_hdr *hdr)</div><div class='ctx'> {</div><div class='ctx'> 	struct iscsi_tm_rsp *tmf = (struct iscsi_tm_rsp *)hdr;</div><div class='hunk'>@@ -818,12 +847,7 @@ int __iscsi_complete_pdu(struct iscsi_conn *conn, struct iscsi_hdr *hdr,</div><div class='ctx'> 		iscsi_scsi_cmd_rsp(conn, hdr, task, data, datalen);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ISCSI_OP_SCSI_DATA_IN:</div><div class='del'>-		if (hdr-&gt;flags &amp; ISCSI_FLAG_DATA_STATUS) {</div><div class='del'>-			conn-&gt;scsirsp_pdus_cnt++;</div><div class='del'>-			iscsi_update_cmdsn(session,</div><div class='del'>-					   (struct iscsi_nopin*) hdr);</div><div class='del'>-			__iscsi_put_task(task);</div><div class='del'>-		}</div><div class='add'>+		iscsi_data_in_rsp(conn, hdr, task);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ISCSI_OP_LOGOUT_RSP:</div><div class='ctx'> 		iscsi_update_cmdsn(session, (struct iscsi_nopin*)hdr);</div><div class='hunk'>@@ -954,6 +978,38 @@ struct iscsi_task *iscsi_itt_to_ctask(struct iscsi_conn *conn, itt_t itt)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(iscsi_itt_to_ctask);</div><div class='ctx'> </div><div class='add'>+void iscsi_session_failure(struct iscsi_cls_session *cls_session,</div><div class='add'>+			   enum iscsi_err err)</div><div class='add'>+{</div><div class='add'>+	struct iscsi_session *session = cls_session-&gt;dd_data;</div><div class='add'>+	struct iscsi_conn *conn;</div><div class='add'>+	struct device *dev;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;session-&gt;lock, flags);</div><div class='add'>+	conn = session-&gt;leadconn;</div><div class='add'>+	if (session-&gt;state == ISCSI_STATE_TERMINATE || !conn) {</div><div class='add'>+		spin_unlock_irqrestore(&amp;session-&gt;lock, flags);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev = get_device(&amp;conn-&gt;cls_conn-&gt;dev);</div><div class='add'>+	spin_unlock_irqrestore(&amp;session-&gt;lock, flags);</div><div class='add'>+	if (!dev)</div><div class='add'>+	        return;</div><div class='add'>+	/*</div><div class='add'>+	 * if the host is being removed bypass the connection</div><div class='add'>+	 * recovery initialization because we are going to kill</div><div class='add'>+	 * the session.</div><div class='add'>+	 */</div><div class='add'>+	if (err == ISCSI_ERR_INVALID_HOST)</div><div class='add'>+		iscsi_conn_error_event(conn-&gt;cls_conn, err);</div><div class='add'>+	else</div><div class='add'>+		iscsi_conn_failure(conn, err);</div><div class='add'>+	put_device(dev);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(iscsi_session_failure);</div><div class='add'>+</div><div class='ctx'> void iscsi_conn_failure(struct iscsi_conn *conn, enum iscsi_err err)</div><div class='ctx'> {</div><div class='ctx'> 	struct iscsi_session *session = conn-&gt;session;</div><div class='hunk'>@@ -968,9 +1024,10 @@ void iscsi_conn_failure(struct iscsi_conn *conn, enum iscsi_err err)</div><div class='ctx'> 	if (conn-&gt;stop_stage == 0)</div><div class='ctx'> 		session-&gt;state = ISCSI_STATE_FAILED;</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;session-&gt;lock, flags);</div><div class='add'>+</div><div class='ctx'> 	set_bit(ISCSI_SUSPEND_BIT, &amp;conn-&gt;suspend_tx);</div><div class='ctx'> 	set_bit(ISCSI_SUSPEND_BIT, &amp;conn-&gt;suspend_rx);</div><div class='del'>-	iscsi_conn_error(conn-&gt;cls_conn, err);</div><div class='add'>+	iscsi_conn_error_event(conn-&gt;cls_conn, err);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(iscsi_conn_failure);</div><div class='ctx'> </div><div class='hunk'>@@ -1194,15 +1251,13 @@ int iscsi_queuecommand(struct scsi_cmnd *sc, void (*done)(struct scsi_cmnd *))</div><div class='ctx'> 		switch (session-&gt;state) {</div><div class='ctx'> 		case ISCSI_STATE_IN_RECOVERY:</div><div class='ctx'> 			reason = FAILURE_SESSION_IN_RECOVERY;</div><div class='del'>-			sc-&gt;result = DID_IMM_RETRY &lt;&lt; 16;</div><div class='del'>-			break;</div><div class='add'>+			goto reject;</div><div class='ctx'> 		case ISCSI_STATE_LOGGING_OUT:</div><div class='ctx'> 			reason = FAILURE_SESSION_LOGGING_OUT;</div><div class='del'>-			sc-&gt;result = DID_IMM_RETRY &lt;&lt; 16;</div><div class='del'>-			break;</div><div class='add'>+			goto reject;</div><div class='ctx'> 		case ISCSI_STATE_RECOVERY_FAILED:</div><div class='ctx'> 			reason = FAILURE_SESSION_RECOVERY_TIMEOUT;</div><div class='del'>-			sc-&gt;result = DID_NO_CONNECT &lt;&lt; 16;</div><div class='add'>+			sc-&gt;result = DID_TRANSPORT_FAILFAST &lt;&lt; 16;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case ISCSI_STATE_TERMINATE:</div><div class='ctx'> 			reason = FAILURE_SESSION_TERMINATE;</div><div class='hunk'>@@ -1267,7 +1322,7 @@ reject:</div><div class='ctx'> 	spin_unlock(&amp;session-&gt;lock);</div><div class='ctx'> 	debug_scsi("cmd 0x%x rejected (%d)\n", sc-&gt;cmnd[0], reason);</div><div class='ctx'> 	spin_lock(host-&gt;host_lock);</div><div class='del'>-	return SCSI_MLQUEUE_HOST_BUSY;</div><div class='add'>+	return SCSI_MLQUEUE_TARGET_BUSY;</div><div class='ctx'> </div><div class='ctx'> fault:</div><div class='ctx'> 	spin_unlock(&amp;session-&gt;lock);</div><div class='hunk'>@@ -1307,7 +1362,7 @@ void iscsi_session_recovery_timedout(struct iscsi_cls_session *cls_session)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(iscsi_session_recovery_timedout);</div><div class='ctx'> </div><div class='del'>-int iscsi_eh_host_reset(struct scsi_cmnd *sc)</div><div class='add'>+int iscsi_eh_target_reset(struct scsi_cmnd *sc)</div><div class='ctx'> {</div><div class='ctx'> 	struct iscsi_cls_session *cls_session;</div><div class='ctx'> 	struct iscsi_session *session;</div><div class='hunk'>@@ -1321,7 +1376,7 @@ int iscsi_eh_host_reset(struct scsi_cmnd *sc)</div><div class='ctx'> 	spin_lock_bh(&amp;session-&gt;lock);</div><div class='ctx'> 	if (session-&gt;state == ISCSI_STATE_TERMINATE) {</div><div class='ctx'> failed:</div><div class='del'>-		debug_scsi("failing host reset: session terminated "</div><div class='add'>+		debug_scsi("failing target reset: session terminated "</div><div class='ctx'> 			   "[CID %d age %d]\n", conn-&gt;id, session-&gt;age);</div><div class='ctx'> 		spin_unlock_bh(&amp;session-&gt;lock);</div><div class='ctx'> 		mutex_unlock(&amp;session-&gt;eh_mutex);</div><div class='hunk'>@@ -1336,7 +1391,7 @@ failed:</div><div class='ctx'> 	 */</div><div class='ctx'> 	iscsi_conn_failure(conn, ISCSI_ERR_CONN_FAILED);</div><div class='ctx'> </div><div class='del'>-	debug_scsi("iscsi_eh_host_reset wait for relogin\n");</div><div class='add'>+	debug_scsi("iscsi_eh_target_reset wait for relogin\n");</div><div class='ctx'> 	wait_event_interruptible(conn-&gt;ehwait,</div><div class='ctx'> 				 session-&gt;state == ISCSI_STATE_TERMINATE ||</div><div class='ctx'> 				 session-&gt;state == ISCSI_STATE_LOGGED_IN ||</div><div class='hunk'>@@ -1348,14 +1403,14 @@ failed:</div><div class='ctx'> 	spin_lock_bh(&amp;session-&gt;lock);</div><div class='ctx'> 	if (session-&gt;state == ISCSI_STATE_LOGGED_IN)</div><div class='ctx'> 		iscsi_session_printk(KERN_INFO, session,</div><div class='del'>-				     "host reset succeeded\n");</div><div class='add'>+				     "target reset succeeded\n");</div><div class='ctx'> 	else</div><div class='ctx'> 		goto failed;</div><div class='ctx'> 	spin_unlock_bh(&amp;session-&gt;lock);</div><div class='ctx'> 	mutex_unlock(&amp;session-&gt;eh_mutex);</div><div class='ctx'> 	return SUCCESS;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(iscsi_eh_host_reset);</div><div class='add'>+EXPORT_SYMBOL_GPL(iscsi_eh_target_reset);</div><div class='ctx'> </div><div class='ctx'> static void iscsi_tmf_timedout(unsigned long data)</div><div class='ctx'> {</div><div class='hunk'>@@ -1456,7 +1511,7 @@ static void fail_all_commands(struct iscsi_conn *conn, unsigned lun,</div><div class='ctx'> 		if (lun == task-&gt;sc-&gt;device-&gt;lun || lun == -1) {</div><div class='ctx'> 			debug_scsi("failing in progress sc %p itt 0x%x\n",</div><div class='ctx'> 				   task-&gt;sc, task-&gt;itt);</div><div class='del'>-			fail_command(conn, task, DID_BUS_BUSY &lt;&lt; 16);</div><div class='add'>+			fail_command(conn, task, error &lt;&lt; 16);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -1476,12 +1531,12 @@ static void iscsi_start_tx(struct iscsi_conn *conn)</div><div class='ctx'> 		scsi_queue_work(conn-&gt;session-&gt;host, &amp;conn-&gt;xmitwork);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static enum scsi_eh_timer_return iscsi_eh_cmd_timed_out(struct scsi_cmnd *scmd)</div><div class='add'>+static enum blk_eh_timer_return iscsi_eh_cmd_timed_out(struct scsi_cmnd *scmd)</div><div class='ctx'> {</div><div class='ctx'> 	struct iscsi_cls_session *cls_session;</div><div class='ctx'> 	struct iscsi_session *session;</div><div class='ctx'> 	struct iscsi_conn *conn;</div><div class='del'>-	enum scsi_eh_timer_return rc = EH_NOT_HANDLED;</div><div class='add'>+	enum blk_eh_timer_return rc = BLK_EH_NOT_HANDLED;</div><div class='ctx'> </div><div class='ctx'> 	cls_session = starget_to_session(scsi_target(scmd-&gt;device));</div><div class='ctx'> 	session = cls_session-&gt;dd_data;</div><div class='hunk'>@@ -1494,14 +1549,14 @@ static enum scsi_eh_timer_return iscsi_eh_cmd_timed_out(struct scsi_cmnd *scmd)</div><div class='ctx'> 		 * We are probably in the middle of iscsi recovery so let</div><div class='ctx'> 		 * that complete and handle the error.</div><div class='ctx'> 		 */</div><div class='del'>-		rc = EH_RESET_TIMER;</div><div class='add'>+		rc = BLK_EH_RESET_TIMER;</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	conn = session-&gt;leadconn;</div><div class='ctx'> 	if (!conn) {</div><div class='ctx'> 		/* In the middle of shuting down */</div><div class='del'>-		rc = EH_RESET_TIMER;</div><div class='add'>+		rc = BLK_EH_RESET_TIMER;</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1513,20 +1568,21 @@ static enum scsi_eh_timer_return iscsi_eh_cmd_timed_out(struct scsi_cmnd *scmd)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (time_before_eq(conn-&gt;last_recv + (conn-&gt;recv_timeout * HZ) +</div><div class='ctx'> 			    (conn-&gt;ping_timeout * HZ), jiffies))</div><div class='del'>-		rc = EH_RESET_TIMER;</div><div class='add'>+		rc = BLK_EH_RESET_TIMER;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * if we are about to check the transport then give the command</div><div class='ctx'> 	 * more time</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (time_before_eq(conn-&gt;last_recv + (conn-&gt;recv_timeout * HZ),</div><div class='ctx'> 			   jiffies))</div><div class='del'>-		rc = EH_RESET_TIMER;</div><div class='add'>+		rc = BLK_EH_RESET_TIMER;</div><div class='ctx'> 	/* if in the middle of checking the transport then give us more time */</div><div class='ctx'> 	if (conn-&gt;ping_task)</div><div class='del'>-		rc = EH_RESET_TIMER;</div><div class='add'>+		rc = BLK_EH_RESET_TIMER;</div><div class='ctx'> done:</div><div class='ctx'> 	spin_unlock(&amp;session-&gt;lock);</div><div class='del'>-	debug_scsi("return %s\n", rc == EH_RESET_TIMER ? "timer reset" : "nh");</div><div class='add'>+	debug_scsi("return %s\n", rc == BLK_EH_RESET_TIMER ?</div><div class='add'>+					"timer reset" : "nh");</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1768,10 +1824,10 @@ int iscsi_eh_device_reset(struct scsi_cmnd *sc)</div><div class='ctx'> </div><div class='ctx'> 	iscsi_suspend_tx(conn);</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;session-&gt;lock);</div><div class='add'>+	spin_lock_bh(&amp;session-&gt;lock);</div><div class='ctx'> 	fail_all_commands(conn, sc-&gt;device-&gt;lun, DID_ERROR);</div><div class='ctx'> 	conn-&gt;tmf_state = TMF_INITIAL;</div><div class='del'>-	spin_unlock(&amp;session-&gt;lock);</div><div class='add'>+	spin_unlock_bh(&amp;session-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	iscsi_start_tx(conn);</div><div class='ctx'> 	goto done;</div><div class='hunk'>@@ -1877,6 +1933,7 @@ struct Scsi_Host *iscsi_host_alloc(struct scsi_host_template *sht,</div><div class='ctx'> 				   int dd_data_size, uint16_t qdepth)</div><div class='ctx'> {</div><div class='ctx'> 	struct Scsi_Host *shost;</div><div class='add'>+	struct iscsi_host *ihost;</div><div class='ctx'> </div><div class='ctx'> 	shost = scsi_host_alloc(sht, sizeof(struct iscsi_host) + dd_data_size);</div><div class='ctx'> 	if (!shost)</div><div class='hunk'>@@ -1891,22 +1948,43 @@ struct Scsi_Host *iscsi_host_alloc(struct scsi_host_template *sht,</div><div class='ctx'> 		qdepth = ISCSI_DEF_CMD_PER_LUN;</div><div class='ctx'> 	}</div><div class='ctx'> 	shost-&gt;cmd_per_lun = qdepth;</div><div class='add'>+</div><div class='add'>+	ihost = shost_priv(shost);</div><div class='add'>+	spin_lock_init(&amp;ihost-&gt;lock);</div><div class='add'>+	ihost-&gt;state = ISCSI_HOST_SETUP;</div><div class='add'>+	ihost-&gt;num_sessions = 0;</div><div class='add'>+	init_waitqueue_head(&amp;ihost-&gt;session_removal_wq);</div><div class='ctx'> 	return shost;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(iscsi_host_alloc);</div><div class='ctx'> </div><div class='add'>+static void iscsi_notify_host_removed(struct iscsi_cls_session *cls_session)</div><div class='add'>+{</div><div class='add'>+	iscsi_session_failure(cls_session, ISCSI_ERR_INVALID_HOST);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * iscsi_host_remove - remove host and sessions</div><div class='ctx'>  * @shost: scsi host</div><div class='ctx'>  *</div><div class='del'>- * This will also remove any sessions attached to the host, but if userspace</div><div class='del'>- * is managing the session at the same time this will break. TODO: add</div><div class='del'>- * refcounting to the netlink iscsi interface so a rmmod or host hot unplug</div><div class='del'>- * does not remove the memory from under us.</div><div class='add'>+ * If there are any sessions left, this will initiate the removal and wait</div><div class='add'>+ * for the completion.</div><div class='ctx'>  */</div><div class='ctx'> void iscsi_host_remove(struct Scsi_Host *shost)</div><div class='ctx'> {</div><div class='del'>-	iscsi_host_for_each_session(shost, iscsi_session_teardown);</div><div class='add'>+	struct iscsi_host *ihost = shost_priv(shost);</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;ihost-&gt;lock, flags);</div><div class='add'>+	ihost-&gt;state = ISCSI_HOST_REMOVED;</div><div class='add'>+	spin_unlock_irqrestore(&amp;ihost-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	iscsi_host_for_each_session(shost, iscsi_notify_host_removed);</div><div class='add'>+	wait_event_interruptible(ihost-&gt;session_removal_wq,</div><div class='add'>+				 ihost-&gt;num_sessions == 0);</div><div class='add'>+	if (signal_pending(current))</div><div class='add'>+		flush_signals(current);</div><div class='add'>+</div><div class='ctx'> 	scsi_remove_host(shost);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(iscsi_host_remove);</div><div class='hunk'>@@ -1922,6 +2000,27 @@ void iscsi_host_free(struct Scsi_Host *shost)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(iscsi_host_free);</div><div class='ctx'> </div><div class='add'>+static void iscsi_host_dec_session_cnt(struct Scsi_Host *shost)</div><div class='add'>+{</div><div class='add'>+	struct iscsi_host *ihost = shost_priv(shost);</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	shost = scsi_host_get(shost);</div><div class='add'>+	if (!shost) {</div><div class='add'>+		printk(KERN_ERR "Invalid state. Cannot notify host removal "</div><div class='add'>+		      "of session teardown event because host already "</div><div class='add'>+		      "removed.\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;ihost-&gt;lock, flags);</div><div class='add'>+	ihost-&gt;num_sessions--;</div><div class='add'>+	if (ihost-&gt;num_sessions == 0)</div><div class='add'>+		wake_up(&amp;ihost-&gt;session_removal_wq);</div><div class='add'>+	spin_unlock_irqrestore(&amp;ihost-&gt;lock, flags);</div><div class='add'>+	scsi_host_put(shost);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * iscsi_session_setup - create iscsi cls session and host and session</div><div class='ctx'>  * @iscsit: iscsi transport template</div><div class='hunk'>@@ -1942,9 +2041,19 @@ iscsi_session_setup(struct iscsi_transport *iscsit, struct Scsi_Host *shost,</div><div class='ctx'> 		    uint16_t cmds_max, int cmd_task_size,</div><div class='ctx'> 		    uint32_t initial_cmdsn, unsigned int id)</div><div class='ctx'> {</div><div class='add'>+	struct iscsi_host *ihost = shost_priv(shost);</div><div class='ctx'> 	struct iscsi_session *session;</div><div class='ctx'> 	struct iscsi_cls_session *cls_session;</div><div class='ctx'> 	int cmd_i, scsi_cmds, total_cmds = cmds_max;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;ihost-&gt;lock, flags);</div><div class='add'>+	if (ihost-&gt;state == ISCSI_HOST_REMOVED) {</div><div class='add'>+		spin_unlock_irqrestore(&amp;ihost-&gt;lock, flags);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+	ihost-&gt;num_sessions++;</div><div class='add'>+	spin_unlock_irqrestore(&amp;ihost-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	if (!total_cmds)</div><div class='ctx'> 		total_cmds = ISCSI_DEF_XMIT_CMDS_MAX;</div><div class='hunk'>@@ -1957,7 +2066,7 @@ iscsi_session_setup(struct iscsi_transport *iscsit, struct Scsi_Host *shost,</div><div class='ctx'> 		printk(KERN_ERR "iscsi: invalid can_queue of %d. can_queue "</div><div class='ctx'> 		       "must be a power of two that is at least %d.\n",</div><div class='ctx'> 		       total_cmds, ISCSI_TOTAL_CMDS_MIN);</div><div class='del'>-		return NULL;</div><div class='add'>+		goto dec_session_count;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (total_cmds &gt; ISCSI_TOTAL_CMDS_MAX) {</div><div class='hunk'>@@ -1981,7 +2090,7 @@ iscsi_session_setup(struct iscsi_transport *iscsit, struct Scsi_Host *shost,</div><div class='ctx'> 	cls_session = iscsi_alloc_session(shost, iscsit,</div><div class='ctx'> 					  sizeof(struct iscsi_session));</div><div class='ctx'> 	if (!cls_session)</div><div class='del'>-		return NULL;</div><div class='add'>+		goto dec_session_count;</div><div class='ctx'> 	session = cls_session-&gt;dd_data;</div><div class='ctx'> 	session-&gt;cls_session = cls_session;</div><div class='ctx'> 	session-&gt;host = shost;</div><div class='hunk'>@@ -2020,6 +2129,7 @@ iscsi_session_setup(struct iscsi_transport *iscsit, struct Scsi_Host *shost,</div><div class='ctx'> </div><div class='ctx'> 	if (iscsi_add_session(cls_session, id))</div><div class='ctx'> 		goto cls_session_fail;</div><div class='add'>+</div><div class='ctx'> 	return cls_session;</div><div class='ctx'> </div><div class='ctx'> cls_session_fail:</div><div class='hunk'>@@ -2028,6 +2138,8 @@ module_get_fail:</div><div class='ctx'> 	iscsi_pool_free(&amp;session-&gt;cmdpool);</div><div class='ctx'> cmdpool_alloc_fail:</div><div class='ctx'> 	iscsi_free_session(cls_session);</div><div class='add'>+dec_session_count:</div><div class='add'>+	iscsi_host_dec_session_cnt(shost);</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(iscsi_session_setup);</div><div class='hunk'>@@ -2043,6 +2155,7 @@ void iscsi_session_teardown(struct iscsi_cls_session *cls_session)</div><div class='ctx'> {</div><div class='ctx'> 	struct iscsi_session *session = cls_session-&gt;dd_data;</div><div class='ctx'> 	struct module *owner = cls_session-&gt;transport-&gt;owner;</div><div class='add'>+	struct Scsi_Host *shost = session-&gt;host;</div><div class='ctx'> </div><div class='ctx'> 	iscsi_pool_free(&amp;session-&gt;cmdpool);</div><div class='ctx'> </div><div class='hunk'>@@ -2055,6 +2168,7 @@ void iscsi_session_teardown(struct iscsi_cls_session *cls_session)</div><div class='ctx'> 	kfree(session-&gt;ifacename);</div><div class='ctx'> </div><div class='ctx'> 	iscsi_destroy_session(cls_session);</div><div class='add'>+	iscsi_host_dec_session_cnt(shost);</div><div class='ctx'> 	module_put(owner);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(iscsi_session_teardown);</div><div class='hunk'>@@ -2334,8 +2448,10 @@ static void iscsi_start_session_recovery(struct iscsi_session *session,</div><div class='ctx'> 	 * flush queues.</div><div class='ctx'> 	 */</div><div class='ctx'> 	spin_lock_bh(&amp;session-&gt;lock);</div><div class='del'>-	fail_all_commands(conn, -1,</div><div class='del'>-			STOP_CONN_RECOVER ? DID_BUS_BUSY : DID_ERROR);</div><div class='add'>+	if (flag == STOP_CONN_RECOVER)</div><div class='add'>+		fail_all_commands(conn, -1, DID_TRANSPORT_DISRUPTED);</div><div class='add'>+	else</div><div class='add'>+		fail_all_commands(conn, -1, DID_ERROR);</div><div class='ctx'> 	flush_control_queues(session, conn);</div><div class='ctx'> 	spin_unlock_bh(&amp;session-&gt;lock);</div><div class='ctx'> 	mutex_unlock(&amp;session-&gt;eh_mutex);</div><div class='head'>diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c<br/>index 48ee8c7f5bdd..e15501170698 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/libsas/sas_ata.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/libsas/sas_ata.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/libsas/sas_ata.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/libsas/sas_ata.c</a></div><div class='hunk'>@@ -294,10 +294,10 @@ static void sas_ata_post_internal(struct ata_queued_cmd *qc)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int sas_ata_scr_write(struct ata_port *ap, unsigned int sc_reg_in,</div><div class='add'>+static int sas_ata_scr_write(struct ata_link *link, unsigned int sc_reg_in,</div><div class='ctx'> 			      u32 val)</div><div class='ctx'> {</div><div class='del'>-	struct domain_device *dev = ap-&gt;private_data;</div><div class='add'>+	struct domain_device *dev = link-&gt;ap-&gt;private_data;</div><div class='ctx'> </div><div class='ctx'> 	SAS_DPRINTK("STUB %s\n", __func__);</div><div class='ctx'> 	switch (sc_reg_in) {</div><div class='hunk'>@@ -319,10 +319,10 @@ static int sas_ata_scr_write(struct ata_port *ap, unsigned int sc_reg_in,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int sas_ata_scr_read(struct ata_port *ap, unsigned int sc_reg_in,</div><div class='add'>+static int sas_ata_scr_read(struct ata_link *link, unsigned int sc_reg_in,</div><div class='ctx'> 			    u32 *val)</div><div class='ctx'> {</div><div class='del'>-	struct domain_device *dev = ap-&gt;private_data;</div><div class='add'>+	struct domain_device *dev = link-&gt;ap-&gt;private_data;</div><div class='ctx'> </div><div class='ctx'> 	SAS_DPRINTK("STUB %s\n", __func__);</div><div class='ctx'> 	switch (sc_reg_in) {</div><div class='hunk'>@@ -398,7 +398,7 @@ void sas_ata_task_abort(struct sas_task *task)</div><div class='ctx'> </div><div class='ctx'> 	/* Bounce SCSI-initiated commands to the SCSI EH */</div><div class='ctx'> 	if (qc-&gt;scsicmd) {</div><div class='del'>-		scsi_req_abort_cmd(qc-&gt;scsicmd);</div><div class='add'>+		blk_abort_request(qc-&gt;scsicmd-&gt;request);</div><div class='ctx'> 		scsi_schedule_eh(qc-&gt;scsicmd-&gt;device-&gt;host);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/scsi/libsas/sas_internal.h b/drivers/scsi/libsas/sas_internal.h<br/>index b4f9368f116a..0001374bd6b2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/libsas/sas_internal.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/libsas/sas_internal.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/libsas/sas_internal.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/libsas/sas_internal.h</a></div><div class='hunk'>@@ -55,7 +55,7 @@ void sas_unregister_phys(struct sas_ha_struct *sas_ha);</div><div class='ctx'> int  sas_register_ports(struct sas_ha_struct *sas_ha);</div><div class='ctx'> void sas_unregister_ports(struct sas_ha_struct *sas_ha);</div><div class='ctx'> </div><div class='del'>-enum scsi_eh_timer_return sas_scsi_timed_out(struct scsi_cmnd *);</div><div class='add'>+enum blk_eh_timer_return sas_scsi_timed_out(struct scsi_cmnd *);</div><div class='ctx'> </div><div class='ctx'> int  sas_init_queue(struct sas_ha_struct *sas_ha);</div><div class='ctx'> int  sas_init_events(struct sas_ha_struct *sas_ha);</div><div class='head'>diff --git a/drivers/scsi/libsas/sas_scsi_host.c b/drivers/scsi/libsas/sas_scsi_host.c<br/>index a8e3ef309070..744838780ada 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/libsas/sas_scsi_host.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/libsas/sas_scsi_host.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/libsas/sas_scsi_host.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/libsas/sas_scsi_host.c</a></div><div class='hunk'>@@ -673,43 +673,43 @@ out:</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-enum scsi_eh_timer_return sas_scsi_timed_out(struct scsi_cmnd *cmd)</div><div class='add'>+enum blk_eh_timer_return sas_scsi_timed_out(struct scsi_cmnd *cmd)</div><div class='ctx'> {</div><div class='ctx'> 	struct sas_task *task = TO_SAS_TASK(cmd);</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	if (!task) {</div><div class='del'>-		cmd-&gt;timeout_per_command /= 2;</div><div class='add'>+		cmd-&gt;request-&gt;timeout /= 2;</div><div class='ctx'> 		SAS_DPRINTK("command 0x%p, task 0x%p, gone: %s\n",</div><div class='del'>-			    cmd, task, (cmd-&gt;timeout_per_command ?</div><div class='del'>-			    "EH_RESET_TIMER" : "EH_NOT_HANDLED"));</div><div class='del'>-		if (!cmd-&gt;timeout_per_command)</div><div class='del'>-			return EH_NOT_HANDLED;</div><div class='del'>-		return EH_RESET_TIMER;</div><div class='add'>+			    cmd, task, (cmd-&gt;request-&gt;timeout ?</div><div class='add'>+			    "BLK_EH_RESET_TIMER" : "BLK_EH_NOT_HANDLED"));</div><div class='add'>+		if (!cmd-&gt;request-&gt;timeout)</div><div class='add'>+			return BLK_EH_NOT_HANDLED;</div><div class='add'>+		return BLK_EH_RESET_TIMER;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;task-&gt;task_state_lock, flags);</div><div class='ctx'> 	BUG_ON(task-&gt;task_state_flags &amp; SAS_TASK_STATE_ABORTED);</div><div class='ctx'> 	if (task-&gt;task_state_flags &amp; SAS_TASK_STATE_DONE) {</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;task-&gt;task_state_lock, flags);</div><div class='del'>-		SAS_DPRINTK("command 0x%p, task 0x%p, timed out: EH_HANDLED\n",</div><div class='del'>-			    cmd, task);</div><div class='del'>-		return EH_HANDLED;</div><div class='add'>+		SAS_DPRINTK("command 0x%p, task 0x%p, timed out: "</div><div class='add'>+			    "BLK_EH_HANDLED\n", cmd, task);</div><div class='add'>+		return BLK_EH_HANDLED;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!(task-&gt;task_state_flags &amp; SAS_TASK_AT_INITIATOR)) {</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;task-&gt;task_state_lock, flags);</div><div class='ctx'> 		SAS_DPRINTK("command 0x%p, task 0x%p, not at initiator: "</div><div class='del'>-			    "EH_RESET_TIMER\n",</div><div class='add'>+			    "BLK_EH_RESET_TIMER\n",</div><div class='ctx'> 			    cmd, task);</div><div class='del'>-		return EH_RESET_TIMER;</div><div class='add'>+		return BLK_EH_RESET_TIMER;</div><div class='ctx'> 	}</div><div class='ctx'> 	task-&gt;task_state_flags |= SAS_TASK_STATE_ABORTED;</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;task-&gt;task_state_lock, flags);</div><div class='ctx'> </div><div class='del'>-	SAS_DPRINTK("command 0x%p, task 0x%p, timed out: EH_NOT_HANDLED\n",</div><div class='add'>+	SAS_DPRINTK("command 0x%p, task 0x%p, timed out: BLK_EH_NOT_HANDLED\n",</div><div class='ctx'> 		    cmd, task);</div><div class='ctx'> </div><div class='del'>-	return EH_NOT_HANDLED;</div><div class='add'>+	return BLK_EH_NOT_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int sas_ioctl(struct scsi_device *sdev, int cmd, void __user *arg)</div><div class='hunk'>@@ -1039,7 +1039,7 @@ void sas_task_abort(struct sas_task *task)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	scsi_req_abort_cmd(sc);</div><div class='add'>+	blk_abort_request(sc-&gt;request);</div><div class='ctx'> 	scsi_schedule_eh(sc-&gt;device-&gt;host);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h<br/>index e0e018d12653..60a9e6e9384b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/lpfc/lpfc.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/lpfc/lpfc.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/lpfc/lpfc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/lpfc/lpfc.h</a></div><div class='hunk'>@@ -34,7 +34,14 @@ struct lpfc_sli2_slim;</div><div class='ctx'> #define LPFC_IOCB_LIST_CNT	2250	/* list of IOCBs for fast-path usage. */</div><div class='ctx'> #define LPFC_Q_RAMP_UP_INTERVAL 120     /* lun q_depth ramp up interval */</div><div class='ctx'> #define LPFC_VNAME_LEN		100	/* vport symbolic name length */</div><div class='del'>-</div><div class='add'>+#define LPFC_TGTQ_INTERVAL	40000	/* Min amount of time between tgt</div><div class='add'>+					   queue depth change in millisecs */</div><div class='add'>+#define LPFC_TGTQ_RAMPUP_PCENT	5	/* Target queue rampup in percentage */</div><div class='add'>+#define LPFC_MIN_TGT_QDEPTH	100</div><div class='add'>+#define LPFC_MAX_TGT_QDEPTH	0xFFFF</div><div class='add'>+</div><div class='add'>+#define  LPFC_MAX_BUCKET_COUNT 20	/* Maximum no. of buckets for stat data</div><div class='add'>+					   collection. */</div><div class='ctx'> /*</div><div class='ctx'>  * Following time intervals are used of adjusting SCSI device</div><div class='ctx'>  * queue depths when there are driver resource error or Firmware</div><div class='hunk'>@@ -49,6 +56,9 @@ struct lpfc_sli2_slim;</div><div class='ctx'> #define LPFC_HB_MBOX_INTERVAL   5	/* Heart beat interval in seconds. */</div><div class='ctx'> #define LPFC_HB_MBOX_TIMEOUT    30	/* Heart beat timeout  in seconds. */</div><div class='ctx'> </div><div class='add'>+/* Error Attention event polling interval */</div><div class='add'>+#define LPFC_ERATT_POLL_INTERVAL	5 /* EATT poll interval in seconds */</div><div class='add'>+</div><div class='ctx'> /* Define macros for 64 bit support */</div><div class='ctx'> #define putPaddrLow(addr)    ((uint32_t) (0xffffffff &amp; (u64)(addr)))</div><div class='ctx'> #define putPaddrHigh(addr)   ((uint32_t) (0xffffffff &amp; (((u64)(addr))&gt;&gt;32)))</div><div class='hunk'>@@ -60,6 +70,9 @@ struct lpfc_sli2_slim;</div><div class='ctx'> </div><div class='ctx'> #define MAX_HBAEVT	32</div><div class='ctx'> </div><div class='add'>+/* Number of MSI-X vectors the driver uses */</div><div class='add'>+#define LPFC_MSIX_VECTORS	2</div><div class='add'>+</div><div class='ctx'> /* lpfc wait event data ready flag */</div><div class='ctx'> #define LPFC_DATA_READY		(1&lt;&lt;0)</div><div class='ctx'> </div><div class='hunk'>@@ -357,6 +370,7 @@ struct lpfc_vport {</div><div class='ctx'> 	uint32_t cfg_log_verbose;</div><div class='ctx'> 	uint32_t cfg_max_luns;</div><div class='ctx'> 	uint32_t cfg_enable_da_id;</div><div class='add'>+	uint32_t cfg_max_scsicmpl_time;</div><div class='ctx'> </div><div class='ctx'> 	uint32_t dev_loss_tmo_changed;</div><div class='ctx'> </div><div class='hunk'>@@ -369,6 +383,8 @@ struct lpfc_vport {</div><div class='ctx'> 	struct lpfc_debugfs_trc *disc_trc;</div><div class='ctx'> 	atomic_t disc_trc_cnt;</div><div class='ctx'> #endif</div><div class='add'>+	uint8_t stat_data_enabled;</div><div class='add'>+	uint8_t stat_data_blocked;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct hbq_s {</div><div class='hunk'>@@ -407,10 +423,11 @@ struct lpfc_hba {</div><div class='ctx'> 	struct lpfc_sli sli;</div><div class='ctx'> 	uint32_t sli_rev;		/* SLI2 or SLI3 */</div><div class='ctx'> 	uint32_t sli3_options;		/* Mask of enabled SLI3 options */</div><div class='del'>-#define LPFC_SLI3_ENABLED	 0x01</div><div class='del'>-#define LPFC_SLI3_HBQ_ENABLED	 0x02</div><div class='del'>-#define LPFC_SLI3_NPIV_ENABLED	 0x04</div><div class='del'>-#define LPFC_SLI3_VPORT_TEARDOWN 0x08</div><div class='add'>+#define LPFC_SLI3_HBQ_ENABLED		0x01</div><div class='add'>+#define LPFC_SLI3_NPIV_ENABLED		0x02</div><div class='add'>+#define LPFC_SLI3_VPORT_TEARDOWN	0x04</div><div class='add'>+#define LPFC_SLI3_CRP_ENABLED		0x08</div><div class='add'>+#define LPFC_SLI3_INB_ENABLED		0x10</div><div class='ctx'> 	uint32_t iocb_cmd_size;</div><div class='ctx'> 	uint32_t iocb_rsp_size;</div><div class='ctx'> </div><div class='hunk'>@@ -422,10 +439,20 @@ struct lpfc_hba {</div><div class='ctx'> #define LS_NPIV_FAB_SUPPORTED 0x2	/* Fabric supports NPIV */</div><div class='ctx'> #define LS_IGNORE_ERATT       0x4	/* intr handler should ignore ERATT */</div><div class='ctx'> </div><div class='del'>-	struct lpfc_sli2_slim *slim2p;</div><div class='del'>-	struct lpfc_dmabuf hbqslimp;</div><div class='add'>+	uint32_t hba_flag;	/* hba generic flags */</div><div class='add'>+#define HBA_ERATT_HANDLED	0x1 /* This flag is set when eratt handled */</div><div class='add'>+</div><div class='add'>+	struct lpfc_dmabuf slim2p;</div><div class='ctx'> </div><div class='del'>-	dma_addr_t slim2p_mapping;</div><div class='add'>+	MAILBOX_t *mbox;</div><div class='add'>+	uint32_t *inb_ha_copy;</div><div class='add'>+	uint32_t *inb_counter;</div><div class='add'>+	uint32_t inb_last_counter;</div><div class='add'>+	uint32_t ha_copy;</div><div class='add'>+	struct _PCB *pcb;</div><div class='add'>+	struct _IOCB *IOCBs;</div><div class='add'>+</div><div class='add'>+	struct lpfc_dmabuf hbqslimp;</div><div class='ctx'> </div><div class='ctx'> 	uint16_t pci_cfg_value;</div><div class='ctx'> </div><div class='hunk'>@@ -492,7 +519,7 @@ struct lpfc_hba {</div><div class='ctx'> </div><div class='ctx'> 	wait_queue_head_t    work_waitq;</div><div class='ctx'> 	struct task_struct   *worker_thread;</div><div class='del'>-	long data_flags;</div><div class='add'>+	unsigned long data_flags;</div><div class='ctx'> </div><div class='ctx'> 	uint32_t hbq_in_use;		/* HBQs in use flag */</div><div class='ctx'> 	struct list_head hbqbuf_in_list;  /* in-fly hbq buffer list */</div><div class='hunk'>@@ -514,6 +541,7 @@ struct lpfc_hba {</div><div class='ctx'> 	void __iomem *HCregaddr;	/* virtual address for host ctl reg */</div><div class='ctx'> </div><div class='ctx'> 	struct lpfc_hgp __iomem *host_gp; /* Host side get/put pointers */</div><div class='add'>+	struct lpfc_pgp   *port_gp;</div><div class='ctx'> 	uint32_t __iomem  *hbq_put;     /* Address in SLIM to HBQ put ptrs */</div><div class='ctx'> 	uint32_t          *hbq_get;     /* Host mem address of HBQ get ptrs */</div><div class='ctx'> </div><div class='hunk'>@@ -536,6 +564,7 @@ struct lpfc_hba {</div><div class='ctx'> 	uint8_t soft_wwn_enable;</div><div class='ctx'> </div><div class='ctx'> 	struct timer_list fcp_poll_timer;</div><div class='add'>+	struct timer_list eratt_poll;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * stat  counters</div><div class='hunk'>@@ -565,7 +594,7 @@ struct lpfc_hba {</div><div class='ctx'> </div><div class='ctx'> 	struct fc_host_statistics link_stats;</div><div class='ctx'> 	enum intr_type_t intr_type;</div><div class='del'>-	struct msix_entry msix_entries[1];</div><div class='add'>+	struct msix_entry msix_entries[LPFC_MSIX_VECTORS];</div><div class='ctx'> </div><div class='ctx'> 	struct list_head port_list;</div><div class='ctx'> 	struct lpfc_vport *pport;	/* physical lpfc_vport pointer */</div><div class='hunk'>@@ -605,6 +634,7 @@ struct lpfc_hba {</div><div class='ctx'> 	unsigned long last_completion_time;</div><div class='ctx'> 	struct timer_list hb_tmofunc;</div><div class='ctx'> 	uint8_t hb_outstanding;</div><div class='add'>+	enum hba_temp_state over_temp_state;</div><div class='ctx'> 	/* ndlp reference management */</div><div class='ctx'> 	spinlock_t ndlp_lock;</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -613,7 +643,19 @@ struct lpfc_hba {</div><div class='ctx'> 	 */</div><div class='ctx'> #define QUE_BUFTAG_BIT  (1&lt;&lt;31)</div><div class='ctx'> 	uint32_t buffer_tag_count;</div><div class='del'>-	enum hba_temp_state over_temp_state;</div><div class='add'>+	int wait_4_mlo_maint_flg;</div><div class='add'>+	wait_queue_head_t wait_4_mlo_m_q;</div><div class='add'>+	/* data structure used for latency data collection */</div><div class='add'>+#define LPFC_NO_BUCKET	   0</div><div class='add'>+#define LPFC_LINEAR_BUCKET 1</div><div class='add'>+#define LPFC_POWER2_BUCKET 2</div><div class='add'>+	uint8_t  bucket_type;</div><div class='add'>+	uint32_t bucket_base;</div><div class='add'>+	uint32_t bucket_step;</div><div class='add'>+</div><div class='add'>+/* Maximum number of events that can be outstanding at any time*/</div><div class='add'>+#define LPFC_MAX_EVT_COUNT 512</div><div class='add'>+	atomic_t fast_event_count;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline struct Scsi_Host *</div><div class='hunk'>@@ -650,15 +692,25 @@ lpfc_worker_wake_up(struct lpfc_hba *phba)</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define FC_REG_DUMP_EVENT		0x10	/* Register for Dump events */</div><div class='del'>-#define FC_REG_TEMPERATURE_EVENT	0x20    /* Register for temperature</div><div class='del'>-						   event */</div><div class='add'>+static inline void</div><div class='add'>+lpfc_sli_read_hs(struct lpfc_hba *phba)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * There was a link/board error. Read the status register to retrieve</div><div class='add'>+	 * the error event and process it.</div><div class='add'>+	 */</div><div class='add'>+	phba-&gt;sli.slistat.err_attn_event++;</div><div class='add'>+</div><div class='add'>+	/* Save status info */</div><div class='add'>+	phba-&gt;work_hs = readl(phba-&gt;HSregaddr);</div><div class='add'>+	phba-&gt;work_status[0] = readl(phba-&gt;MBslimaddr + 0xa8);</div><div class='add'>+	phba-&gt;work_status[1] = readl(phba-&gt;MBslimaddr + 0xac);</div><div class='add'>+</div><div class='add'>+	/* Clear chip Host Attention error bit */</div><div class='add'>+	writel(HA_ERATT, phba-&gt;HAregaddr);</div><div class='add'>+	readl(phba-&gt;HAregaddr); /* flush */</div><div class='add'>+	phba-&gt;pport-&gt;stopped = 1;</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-struct temp_event {</div><div class='del'>-	uint32_t event_type;</div><div class='del'>-	uint32_t event_code;</div><div class='del'>-	uint32_t data;</div><div class='del'>-};</div><div class='del'>-#define LPFC_CRIT_TEMP		0x1</div><div class='del'>-#define LPFC_THRESHOLD_TEMP	0x2</div><div class='del'>-#define LPFC_NORMAL_TEMP	0x3</div><div class='head'>diff --git a/drivers/scsi/lpfc/lpfc_attr.c b/drivers/scsi/lpfc/lpfc_attr.c<br/>index 37bfa0bd1dae..aa3d6277581d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/lpfc/lpfc_attr.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/lpfc/lpfc_attr.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/lpfc/lpfc_attr.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/lpfc/lpfc_attr.c</a></div><div class='hunk'>@@ -32,6 +32,7 @@</div><div class='ctx'> </div><div class='ctx'> #include "lpfc_hw.h"</div><div class='ctx'> #include "lpfc_sli.h"</div><div class='add'>+#include "lpfc_nl.h"</div><div class='ctx'> #include "lpfc_disc.h"</div><div class='ctx'> #include "lpfc_scsi.h"</div><div class='ctx'> #include "lpfc.h"</div><div class='hunk'>@@ -49,6 +50,21 @@</div><div class='ctx'> #define LPFC_LINK_SPEED_BITMAP 0x00000117</div><div class='ctx'> #define LPFC_LINK_SPEED_STRING "0, 1, 2, 4, 8"</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_jedec_to_ascii: Hex to ascii convertor according to JEDEC rules.</div><div class='add'>+ * @incr: integer to convert.</div><div class='add'>+ * @hdw: ascii string holding converted integer plus a string terminator.</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ * JEDEC Joint Electron Device Engineering Council.</div><div class='add'>+ * Convert a 32 bit integer composed of 8 nibbles into an 8 byte ascii</div><div class='add'>+ * character string. The string is then terminated with a NULL in byte 9.</div><div class='add'>+ * Hex 0-9 becomes ascii '0' to '9'.</div><div class='add'>+ * Hex a-f becomes ascii '=' to 'B' capital B.</div><div class='add'>+ *</div><div class='add'>+ * Notes:</div><div class='add'>+ * Coded for 32 bit integers only.</div><div class='add'>+ **/</div><div class='ctx'> static void</div><div class='ctx'> lpfc_jedec_to_ascii(int incr, char hdw[])</div><div class='ctx'> {</div><div class='hunk'>@@ -65,6 +81,14 @@ lpfc_jedec_to_ascii(int incr, char hdw[])</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_drvr_version_show: Return the Emulex driver string with version number.</div><div class='add'>+ * @dev: class unused variable.</div><div class='add'>+ * @attr: device attribute, not used.</div><div class='add'>+ * @buf: on return contains the module description text.</div><div class='add'>+ *</div><div class='add'>+ * Returns: size of formatted string.</div><div class='add'>+ **/</div><div class='ctx'> static ssize_t</div><div class='ctx'> lpfc_drvr_version_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 		       char *buf)</div><div class='hunk'>@@ -72,6 +96,14 @@ lpfc_drvr_version_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return snprintf(buf, PAGE_SIZE, LPFC_MODULE_DESC "\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_info_show: Return some pci info about the host in ascii.</div><div class='add'>+ * @dev: class converted to a Scsi_host structure.</div><div class='add'>+ * @attr: device attribute, not used.</div><div class='add'>+ * @buf: on return contains the formatted text from lpfc_info().</div><div class='add'>+ *</div><div class='add'>+ * Returns: size of formatted string.</div><div class='add'>+ **/</div><div class='ctx'> static ssize_t</div><div class='ctx'> lpfc_info_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	       char *buf)</div><div class='hunk'>@@ -81,6 +113,14 @@ lpfc_info_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return snprintf(buf, PAGE_SIZE, "%s\n",lpfc_info(host));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_serialnum_show: Return the hba serial number in ascii.</div><div class='add'>+ * @dev: class converted to a Scsi_host structure.</div><div class='add'>+ * @attr: device attribute, not used.</div><div class='add'>+ * @buf: on return contains the formatted text serial number.</div><div class='add'>+ *</div><div class='add'>+ * Returns: size of formatted string.</div><div class='add'>+ **/</div><div class='ctx'> static ssize_t</div><div class='ctx'> lpfc_serialnum_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 		    char *buf)</div><div class='hunk'>@@ -92,6 +132,18 @@ lpfc_serialnum_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return snprintf(buf, PAGE_SIZE, "%s\n",phba-&gt;SerialNumber);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_temp_sensor_show: Return the temperature sensor level.</div><div class='add'>+ * @dev: class converted to a Scsi_host structure.</div><div class='add'>+ * @attr: device attribute, not used.</div><div class='add'>+ * @buf: on return contains the formatted support level.</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ * Returns a number indicating the temperature sensor level currently</div><div class='add'>+ * supported, zero or one in ascii.</div><div class='add'>+ *</div><div class='add'>+ * Returns: size of formatted string.</div><div class='add'>+ **/</div><div class='ctx'> static ssize_t</div><div class='ctx'> lpfc_temp_sensor_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 		      char *buf)</div><div class='hunk'>@@ -102,6 +154,14 @@ lpfc_temp_sensor_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return snprintf(buf, PAGE_SIZE, "%d\n",phba-&gt;temp_sensor_support);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_modeldesc_show: Return the model description of the hba.</div><div class='add'>+ * @dev: class converted to a Scsi_host structure.</div><div class='add'>+ * @attr: device attribute, not used.</div><div class='add'>+ * @buf: on return contains the scsi vpd model description.</div><div class='add'>+ *</div><div class='add'>+ * Returns: size of formatted string.</div><div class='add'>+ **/</div><div class='ctx'> static ssize_t</div><div class='ctx'> lpfc_modeldesc_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 		    char *buf)</div><div class='hunk'>@@ -113,6 +173,14 @@ lpfc_modeldesc_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return snprintf(buf, PAGE_SIZE, "%s\n",phba-&gt;ModelDesc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_modelname_show: Return the model name of the hba.</div><div class='add'>+ * @dev: class converted to a Scsi_host structure.</div><div class='add'>+ * @attr: device attribute, not used.</div><div class='add'>+ * @buf: on return contains the scsi vpd model name.</div><div class='add'>+ *</div><div class='add'>+ * Returns: size of formatted string.</div><div class='add'>+ **/</div><div class='ctx'> static ssize_t</div><div class='ctx'> lpfc_modelname_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 		    char *buf)</div><div class='hunk'>@@ -124,6 +192,14 @@ lpfc_modelname_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return snprintf(buf, PAGE_SIZE, "%s\n",phba-&gt;ModelName);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_programtype_show: Return the program type of the hba.</div><div class='add'>+ * @dev: class converted to a Scsi_host structure.</div><div class='add'>+ * @attr: device attribute, not used.</div><div class='add'>+ * @buf: on return contains the scsi vpd program type.</div><div class='add'>+ *</div><div class='add'>+ * Returns: size of formatted string.</div><div class='add'>+ **/</div><div class='ctx'> static ssize_t</div><div class='ctx'> lpfc_programtype_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 		      char *buf)</div><div class='hunk'>@@ -135,6 +211,33 @@ lpfc_programtype_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return snprintf(buf, PAGE_SIZE, "%s\n",phba-&gt;ProgramType);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_mlomgmt_show: Return the Menlo Maintenance sli flag.</div><div class='add'>+ * @dev: class converted to a Scsi_host structure.</div><div class='add'>+ * @attr: device attribute, not used.</div><div class='add'>+ * @buf: on return contains the Menlo Maintenance sli flag.</div><div class='add'>+ *</div><div class='add'>+ * Returns: size of formatted string.</div><div class='add'>+ **/</div><div class='add'>+static ssize_t</div><div class='add'>+lpfc_mlomgmt_show(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct Scsi_Host  *shost = class_to_shost(dev);</div><div class='add'>+	struct lpfc_vport *vport = (struct lpfc_vport *)shost-&gt;hostdata;</div><div class='add'>+	struct lpfc_hba   *phba = vport-&gt;phba;</div><div class='add'>+</div><div class='add'>+	return snprintf(buf, PAGE_SIZE, "%d\n",</div><div class='add'>+		(phba-&gt;sli.sli_flag &amp; LPFC_MENLO_MAINT));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * lpfc_vportnum_show: Return the port number in ascii of the hba.</div><div class='add'>+ * @dev: class converted to a Scsi_host structure.</div><div class='add'>+ * @attr: device attribute, not used.</div><div class='add'>+ * @buf: on return contains scsi vpd program type.</div><div class='add'>+ *</div><div class='add'>+ * Returns: size of formatted string.</div><div class='add'>+ **/</div><div class='ctx'> static ssize_t</div><div class='ctx'> lpfc_vportnum_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 		   char *buf)</div><div class='hunk'>@@ -146,6 +249,14 @@ lpfc_vportnum_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return snprintf(buf, PAGE_SIZE, "%s\n",phba-&gt;Port);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_fwrev_show: Return the firmware rev running in the hba.</div><div class='add'>+ * @dev: class converted to a Scsi_host structure.</div><div class='add'>+ * @attr: device attribute, not used.</div><div class='add'>+ * @buf: on return contains the scsi vpd program type.</div><div class='add'>+ *</div><div class='add'>+ * Returns: size of formatted string.</div><div class='add'>+ **/</div><div class='ctx'> static ssize_t</div><div class='ctx'> lpfc_fwrev_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 		char *buf)</div><div class='hunk'>@@ -159,6 +270,14 @@ lpfc_fwrev_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return snprintf(buf, PAGE_SIZE, "%s, sli-%d\n", fwrev, phba-&gt;sli_rev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_hdw_show: Return the jedec information about the hba.</div><div class='add'>+ * @dev: class converted to a Scsi_host structure.</div><div class='add'>+ * @attr: device attribute, not used.</div><div class='add'>+ * @buf: on return contains the scsi vpd program type.</div><div class='add'>+ *</div><div class='add'>+ * Returns: size of formatted string.</div><div class='add'>+ **/</div><div class='ctx'> static ssize_t</div><div class='ctx'> lpfc_hdw_show(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='hunk'>@@ -171,6 +290,15 @@ lpfc_hdw_show(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='ctx'> 	lpfc_jedec_to_ascii(vp-&gt;rev.biuRev, hdw);</div><div class='ctx'> 	return snprintf(buf, PAGE_SIZE, "%s\n", hdw);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * lpfc_option_rom_version_show: Return the adapter ROM FCode version.</div><div class='add'>+ * @dev: class converted to a Scsi_host structure.</div><div class='add'>+ * @attr: device attribute, not used.</div><div class='add'>+ * @buf: on return contains the ROM and FCode ascii strings.</div><div class='add'>+ *</div><div class='add'>+ * Returns: size of formatted string.</div><div class='add'>+ **/</div><div class='ctx'> static ssize_t</div><div class='ctx'> lpfc_option_rom_version_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 			     char *buf)</div><div class='hunk'>@@ -181,6 +309,18 @@ lpfc_option_rom_version_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> </div><div class='ctx'> 	return snprintf(buf, PAGE_SIZE, "%s\n", phba-&gt;OptionROMVersion);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * lpfc_state_show: Return the link state of the port.</div><div class='add'>+ * @dev: class converted to a Scsi_host structure.</div><div class='add'>+ * @attr: device attribute, not used.</div><div class='add'>+ * @buf: on return contains text describing the state of the link.</div><div class='add'>+ *</div><div class='add'>+ * Notes:</div><div class='add'>+ * The switch statement has no default so zero will be returned.</div><div class='add'>+ *</div><div class='add'>+ * Returns: size of formatted string.</div><div class='add'>+ **/</div><div class='ctx'> static ssize_t</div><div class='ctx'> lpfc_link_state_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 		     char *buf)</div><div class='hunk'>@@ -232,8 +372,10 @@ lpfc_link_state_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 					"Unknown\n");</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		if (phba-&gt;fc_topology == TOPOLOGY_LOOP) {</div><div class='add'>+		if (phba-&gt;sli.sli_flag &amp; LPFC_MENLO_MAINT)</div><div class='add'>+			len += snprintf(buf + len, PAGE_SIZE-len,</div><div class='add'>+					"   Menlo Maint Mode\n");</div><div class='add'>+		else if (phba-&gt;fc_topology == TOPOLOGY_LOOP) {</div><div class='ctx'> 			if (vport-&gt;fc_flag &amp; FC_PUBLIC_LOOP)</div><div class='ctx'> 				len += snprintf(buf + len, PAGE_SIZE-len,</div><div class='ctx'> 						"   Public Loop\n");</div><div class='hunk'>@@ -253,6 +395,18 @@ lpfc_link_state_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_num_discovered_ports_show: Return sum of mapped and unmapped vports.</div><div class='add'>+ * @dev: class device that is converted into a Scsi_host.</div><div class='add'>+ * @attr: device attribute, not used.</div><div class='add'>+ * @buf: on return contains the sum of fc mapped and unmapped.</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ * Returns the ascii text number of the sum of the fc mapped and unmapped</div><div class='add'>+ * vport counts.</div><div class='add'>+ *</div><div class='add'>+ * Returns: size of formatted string.</div><div class='add'>+ **/</div><div class='ctx'> static ssize_t</div><div class='ctx'> lpfc_num_discovered_ports_show(struct device *dev,</div><div class='ctx'> 			       struct device_attribute *attr, char *buf)</div><div class='hunk'>@@ -264,7 +418,20 @@ lpfc_num_discovered_ports_show(struct device *dev,</div><div class='ctx'> 			vport-&gt;fc_map_cnt + vport-&gt;fc_unmap_cnt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='add'>+/**</div><div class='add'>+ * lpfc_issue_lip: Misnomer, name carried over from long ago.</div><div class='add'>+ * @shost: Scsi_Host pointer.</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ * Bring the link down gracefully then re-init the link. The firmware will</div><div class='add'>+ * re-init the fiber channel interface as required. Does not issue a LIP.</div><div class='add'>+ *</div><div class='add'>+ * Returns:</div><div class='add'>+ * -EPERM port offline or management commands are being blocked</div><div class='add'>+ * -ENOMEM cannot allocate memory for the mailbox command</div><div class='add'>+ * -EIO error sending the mailbox command</div><div class='add'>+ * zero for success</div><div class='add'>+ **/</div><div class='ctx'> static int</div><div class='ctx'> lpfc_issue_lip(struct Scsi_Host *shost)</div><div class='ctx'> {</div><div class='hunk'>@@ -306,6 +473,21 @@ lpfc_issue_lip(struct Scsi_Host *shost)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_do_offline: Issues a mailbox command to bring the link down.</div><div class='add'>+ * @phba: lpfc_hba pointer.</div><div class='add'>+ * @type: LPFC_EVT_OFFLINE, LPFC_EVT_WARM_START, LPFC_EVT_KILL.</div><div class='add'>+ *</div><div class='add'>+ * Notes:</div><div class='add'>+ * Assumes any error from lpfc_do_offline() will be negative.</div><div class='add'>+ * Can wait up to 5 seconds for the port ring buffers count</div><div class='add'>+ * to reach zero, prints a warning if it is not zero and continues.</div><div class='add'>+ * lpfc_workq_post_event() returns a non-zero return coce if call fails.</div><div class='add'>+ *</div><div class='add'>+ * Returns:</div><div class='add'>+ * -EIO error posting the event</div><div class='add'>+ * zero for success</div><div class='add'>+ **/</div><div class='ctx'> static int</div><div class='ctx'> lpfc_do_offline(struct lpfc_hba *phba, uint32_t type)</div><div class='ctx'> {</div><div class='hunk'>@@ -353,6 +535,22 @@ lpfc_do_offline(struct lpfc_hba *phba, uint32_t type)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_selective_reset: Offline then onlines the port.</div><div class='add'>+ * @phba: lpfc_hba pointer.</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ * If the port is configured to allow a reset then the hba is brought</div><div class='add'>+ * offline then online.</div><div class='add'>+ *</div><div class='add'>+ * Notes:</div><div class='add'>+ * Assumes any error from lpfc_do_offline() will be negative.</div><div class='add'>+ *</div><div class='add'>+ * Returns:</div><div class='add'>+ * lpfc_do_offline() return code if not zero</div><div class='add'>+ * -EIO reset not configured or error posting the event</div><div class='add'>+ * zero for success</div><div class='add'>+ **/</div><div class='ctx'> static int</div><div class='ctx'> lpfc_selective_reset(struct lpfc_hba *phba)</div><div class='ctx'> {</div><div class='hunk'>@@ -378,6 +576,27 @@ lpfc_selective_reset(struct lpfc_hba *phba)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_issue_reset: Selectively resets an adapter.</div><div class='add'>+ * @dev: class device that is converted into a Scsi_host.</div><div class='add'>+ * @attr: device attribute, not used.</div><div class='add'>+ * @buf: containing the string "selective".</div><div class='add'>+ * @count: unused variable.</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ * If the buf contains the string "selective" then lpfc_selective_reset()</div><div class='add'>+ * is called to perform the reset.</div><div class='add'>+ *</div><div class='add'>+ * Notes:</div><div class='add'>+ * Assumes any error from lpfc_selective_reset() will be negative.</div><div class='add'>+ * If lpfc_selective_reset() returns zero then the length of the buffer</div><div class='add'>+ * is returned which indicates succcess</div><div class='add'>+ *</div><div class='add'>+ * Returns:</div><div class='add'>+ * -EINVAL if the buffer does not contain the string "selective"</div><div class='add'>+ * length of buf if lpfc-selective_reset() if the call succeeds</div><div class='add'>+ * return value of lpfc_selective_reset() if the call fails</div><div class='add'>+**/</div><div class='ctx'> static ssize_t</div><div class='ctx'> lpfc_issue_reset(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 		 const char *buf, size_t count)</div><div class='hunk'>@@ -397,6 +616,14 @@ lpfc_issue_reset(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 		return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_nport_evt_cnt_show: Return the number of nport events.</div><div class='add'>+ * @dev: class device that is converted into a Scsi_host.</div><div class='add'>+ * @attr: device attribute, not used.</div><div class='add'>+ * @buf: on return contains the ascii number of nport events.</div><div class='add'>+ *</div><div class='add'>+ * Returns: size of formatted string.</div><div class='add'>+ **/</div><div class='ctx'> static ssize_t</div><div class='ctx'> lpfc_nport_evt_cnt_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 			char *buf)</div><div class='hunk'>@@ -408,6 +635,14 @@ lpfc_nport_evt_cnt_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return snprintf(buf, PAGE_SIZE, "%d\n", phba-&gt;nport_event_cnt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_board_mode_show: Return the state of the board.</div><div class='add'>+ * @dev: class device that is converted into a Scsi_host.</div><div class='add'>+ * @attr: device attribute, not used.</div><div class='add'>+ * @buf: on return contains the state of the adapter.</div><div class='add'>+ *</div><div class='add'>+ * Returns: size of formatted string.</div><div class='add'>+ **/</div><div class='ctx'> static ssize_t</div><div class='ctx'> lpfc_board_mode_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 		     char *buf)</div><div class='hunk'>@@ -429,6 +664,19 @@ lpfc_board_mode_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return snprintf(buf, PAGE_SIZE, "%s\n", state);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_board_mode_store: Puts the hba in online, offline, warm or error state.</div><div class='add'>+ * @dev: class device that is converted into a Scsi_host.</div><div class='add'>+ * @attr: device attribute, not used.</div><div class='add'>+ * @buf: containing one of the strings "online", "offline", "warm" or "error".</div><div class='add'>+ * @count: unused variable.</div><div class='add'>+ *</div><div class='add'>+ * Returns:</div><div class='add'>+ * -EACCES if enable hba reset not enabled</div><div class='add'>+ * -EINVAL if the buffer does not contain a valid string (see above)</div><div class='add'>+ * -EIO if lpfc_workq_post_event() or lpfc_do_offline() fails</div><div class='add'>+ * buf length greater than zero indicates success</div><div class='add'>+ **/</div><div class='ctx'> static ssize_t</div><div class='ctx'> lpfc_board_mode_store(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 		      const char *buf, size_t count)</div><div class='hunk'>@@ -462,6 +710,24 @@ lpfc_board_mode_store(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_get_hba_info: Return various bits of informaton about the adapter.</div><div class='add'>+ * @phba: pointer to the adapter structure.</div><div class='add'>+ * @mxri max xri count.</div><div class='add'>+ * @axri available xri count.</div><div class='add'>+ * @mrpi max rpi count.</div><div class='add'>+ * @arpi available rpi count.</div><div class='add'>+ * @mvpi max vpi count.</div><div class='add'>+ * @avpi available vpi count.</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ * If an integer pointer for an count is not null then the value for the</div><div class='add'>+ * count is returned.</div><div class='add'>+ *</div><div class='add'>+ * Returns:</div><div class='add'>+ * zero on error</div><div class='add'>+ * one for success</div><div class='add'>+ **/</div><div class='ctx'> static int</div><div class='ctx'> lpfc_get_hba_info(struct lpfc_hba *phba,</div><div class='ctx'> 		  uint32_t *mxri, uint32_t *axri,</div><div class='hunk'>@@ -524,6 +790,20 @@ lpfc_get_hba_info(struct lpfc_hba *phba,</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_max_rpi_show: Return maximum rpi.</div><div class='add'>+ * @dev: class device that is converted into a Scsi_host.</div><div class='add'>+ * @attr: device attribute, not used.</div><div class='add'>+ * @buf: on return contains the maximum rpi count in decimal or "Unknown".</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ * Calls lpfc_get_hba_info() asking for just the mrpi count.</div><div class='add'>+ * If lpfc_get_hba_info() returns zero (failure) the buffer text is set</div><div class='add'>+ * to "Unknown" and the buffer length is returned, therefore the caller</div><div class='add'>+ * must check for "Unknown" in the buffer to detect a failure.</div><div class='add'>+ *</div><div class='add'>+ * Returns: size of formatted string.</div><div class='add'>+ **/</div><div class='ctx'> static ssize_t</div><div class='ctx'> lpfc_max_rpi_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 		  char *buf)</div><div class='hunk'>@@ -538,6 +818,20 @@ lpfc_max_rpi_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return snprintf(buf, PAGE_SIZE, "Unknown\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_used_rpi_show: Return maximum rpi minus available rpi.</div><div class='add'>+ * @dev: class device that is converted into a Scsi_host.</div><div class='add'>+ * @attr: device attribute, not used.</div><div class='add'>+ * @buf: containing the used rpi count in decimal or "Unknown".</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ * Calls lpfc_get_hba_info() asking for just the mrpi and arpi counts.</div><div class='add'>+ * If lpfc_get_hba_info() returns zero (failure) the buffer text is set</div><div class='add'>+ * to "Unknown" and the buffer length is returned, therefore the caller</div><div class='add'>+ * must check for "Unknown" in the buffer to detect a failure.</div><div class='add'>+ *</div><div class='add'>+ * Returns: size of formatted string.</div><div class='add'>+ **/</div><div class='ctx'> static ssize_t</div><div class='ctx'> lpfc_used_rpi_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 		   char *buf)</div><div class='hunk'>@@ -552,6 +846,20 @@ lpfc_used_rpi_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return snprintf(buf, PAGE_SIZE, "Unknown\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_max_xri_show: Return maximum xri.</div><div class='add'>+ * @dev: class device that is converted into a Scsi_host.</div><div class='add'>+ * @attr: device attribute, not used.</div><div class='add'>+ * @buf: on return contains the maximum xri count in decimal or "Unknown".</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ * Calls lpfc_get_hba_info() asking for just the mrpi count.</div><div class='add'>+ * If lpfc_get_hba_info() returns zero (failure) the buffer text is set</div><div class='add'>+ * to "Unknown" and the buffer length is returned, therefore the caller</div><div class='add'>+ * must check for "Unknown" in the buffer to detect a failure.</div><div class='add'>+ *</div><div class='add'>+ * Returns: size of formatted string.</div><div class='add'>+ **/</div><div class='ctx'> static ssize_t</div><div class='ctx'> lpfc_max_xri_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 		  char *buf)</div><div class='hunk'>@@ -566,6 +874,20 @@ lpfc_max_xri_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return snprintf(buf, PAGE_SIZE, "Unknown\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_used_xri_show: Return maximum xpi minus the available xpi.</div><div class='add'>+ * @dev: class device that is converted into a Scsi_host.</div><div class='add'>+ * @attr: device attribute, not used.</div><div class='add'>+ * @buf: on return contains the used xri count in decimal or "Unknown".</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ * Calls lpfc_get_hba_info() asking for just the mxri and axri counts.</div><div class='add'>+ * If lpfc_get_hba_info() returns zero (failure) the buffer text is set</div><div class='add'>+ * to "Unknown" and the buffer length is returned, therefore the caller</div><div class='add'>+ * must check for "Unknown" in the buffer to detect a failure.</div><div class='add'>+ *</div><div class='add'>+ * Returns: size of formatted string.</div><div class='add'>+ **/</div><div class='ctx'> static ssize_t</div><div class='ctx'> lpfc_used_xri_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 		   char *buf)</div><div class='hunk'>@@ -580,6 +902,20 @@ lpfc_used_xri_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return snprintf(buf, PAGE_SIZE, "Unknown\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_max_vpi_show: Return maximum vpi.</div><div class='add'>+ * @dev: class device that is converted into a Scsi_host.</div><div class='add'>+ * @attr: device attribute, not used.</div><div class='add'>+ * @buf: on return contains the maximum vpi count in decimal or "Unknown".</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ * Calls lpfc_get_hba_info() asking for just the mvpi count.</div><div class='add'>+ * If lpfc_get_hba_info() returns zero (failure) the buffer text is set</div><div class='add'>+ * to "Unknown" and the buffer length is returned, therefore the caller</div><div class='add'>+ * must check for "Unknown" in the buffer to detect a failure.</div><div class='add'>+ *</div><div class='add'>+ * Returns: size of formatted string.</div><div class='add'>+ **/</div><div class='ctx'> static ssize_t</div><div class='ctx'> lpfc_max_vpi_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 		  char *buf)</div><div class='hunk'>@@ -594,6 +930,20 @@ lpfc_max_vpi_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return snprintf(buf, PAGE_SIZE, "Unknown\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_used_vpi_show: Return maximum vpi minus the available vpi.</div><div class='add'>+ * @dev: class device that is converted into a Scsi_host.</div><div class='add'>+ * @attr: device attribute, not used.</div><div class='add'>+ * @buf: on return contains the used vpi count in decimal or "Unknown".</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ * Calls lpfc_get_hba_info() asking for just the mvpi and avpi counts.</div><div class='add'>+ * If lpfc_get_hba_info() returns zero (failure) the buffer text is set</div><div class='add'>+ * to "Unknown" and the buffer length is returned, therefore the caller</div><div class='add'>+ * must check for "Unknown" in the buffer to detect a failure.</div><div class='add'>+ *</div><div class='add'>+ * Returns: size of formatted string.</div><div class='add'>+ **/</div><div class='ctx'> static ssize_t</div><div class='ctx'> lpfc_used_vpi_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 		   char *buf)</div><div class='hunk'>@@ -608,6 +958,19 @@ lpfc_used_vpi_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return snprintf(buf, PAGE_SIZE, "Unknown\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_npiv_info_show: Return text about NPIV support for the adapter.</div><div class='add'>+ * @dev: class device that is converted into a Scsi_host.</div><div class='add'>+ * @attr: device attribute, not used.</div><div class='add'>+ * @buf: text that must be interpreted to determine if npiv is supported.</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ * Buffer will contain text indicating npiv is not suppoerted on the port,</div><div class='add'>+ * the port is an NPIV physical port, or it is an npiv virtual port with</div><div class='add'>+ * the id of the vport.</div><div class='add'>+ *</div><div class='add'>+ * Returns: size of formatted string.</div><div class='add'>+ **/</div><div class='ctx'> static ssize_t</div><div class='ctx'> lpfc_npiv_info_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 		    char *buf)</div><div class='hunk'>@@ -623,6 +986,17 @@ lpfc_npiv_info_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return snprintf(buf, PAGE_SIZE, "NPIV Virtual (VPI %d)\n", vport-&gt;vpi);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_poll_show: Return text about poll support for the adapter.</div><div class='add'>+ * @dev: class device that is converted into a Scsi_host.</div><div class='add'>+ * @attr: device attribute, not used.</div><div class='add'>+ * @buf: on return contains the cfg_poll in hex.</div><div class='add'>+ *</div><div class='add'>+ * Notes:</div><div class='add'>+ * cfg_poll should be a lpfc_polling_flags type.</div><div class='add'>+ *</div><div class='add'>+ * Returns: size of formatted string.</div><div class='add'>+ **/</div><div class='ctx'> static ssize_t</div><div class='ctx'> lpfc_poll_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	       char *buf)</div><div class='hunk'>@@ -634,6 +1008,20 @@ lpfc_poll_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return snprintf(buf, PAGE_SIZE, "%#x\n", phba-&gt;cfg_poll);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_poll_store: Set the value of cfg_poll for the adapter.</div><div class='add'>+ * @dev: class device that is converted into a Scsi_host.</div><div class='add'>+ * @attr: device attribute, not used.</div><div class='add'>+ * @buf: one or more lpfc_polling_flags values.</div><div class='add'>+ * @count: not used.</div><div class='add'>+ *</div><div class='add'>+ * Notes:</div><div class='add'>+ * buf contents converted to integer and checked for a valid value.</div><div class='add'>+ *</div><div class='add'>+ * Returns:</div><div class='add'>+ * -EINVAL if the buffer connot be converted or is out of range</div><div class='add'>+ * length of the buf on success</div><div class='add'>+ **/</div><div class='ctx'> static ssize_t</div><div class='ctx'> lpfc_poll_store(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 		const char *buf, size_t count)</div><div class='hunk'>@@ -692,6 +1080,20 @@ lpfc_poll_store(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return strlen(buf);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_param_show: Return a cfg attribute value in decimal.</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ * Macro that given an attr e.g. hba_queue_depth expands</div><div class='add'>+ * into a function with the name lpfc_hba_queue_depth_show.</div><div class='add'>+ *</div><div class='add'>+ * lpfc_##attr##_show: Return the decimal value of an adapters cfg_xxx field.</div><div class='add'>+ * @dev: class device that is converted into a Scsi_host.</div><div class='add'>+ * @attr: device attribute, not used.</div><div class='add'>+ * @buf: on return contains the attribute value in decimal.</div><div class='add'>+ *</div><div class='add'>+ * Returns: size of formatted string.</div><div class='add'>+ **/</div><div class='ctx'> #define lpfc_param_show(attr)	\</div><div class='ctx'> static ssize_t \</div><div class='ctx'> lpfc_##attr##_show(struct device *dev, struct device_attribute *attr, \</div><div class='hunk'>@@ -706,6 +1108,20 @@ lpfc_##attr##_show(struct device *dev, struct device_attribute *attr, \</div><div class='ctx'> 			phba-&gt;cfg_##attr);\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_param_hex_show: Return a cfg attribute value in hex.</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ * Macro that given an attr e.g. hba_queue_depth expands</div><div class='add'>+ * into a function with the name lpfc_hba_queue_depth_show</div><div class='add'>+ *</div><div class='add'>+ * lpfc_##attr##_show: Return the hex value of an adapters cfg_xxx field.</div><div class='add'>+ * @dev: class device that is converted into a Scsi_host.</div><div class='add'>+ * @attr: device attribute, not used.</div><div class='add'>+ * @buf: on return contains the attribute value in hexidecimal.</div><div class='add'>+ *</div><div class='add'>+ * Returns: size of formatted string.</div><div class='add'>+ **/</div><div class='ctx'> #define lpfc_param_hex_show(attr)	\</div><div class='ctx'> static ssize_t \</div><div class='ctx'> lpfc_##attr##_show(struct device *dev, struct device_attribute *attr, \</div><div class='hunk'>@@ -720,6 +1136,25 @@ lpfc_##attr##_show(struct device *dev, struct device_attribute *attr, \</div><div class='ctx'> 			phba-&gt;cfg_##attr);\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_param_init: Intializes a cfg attribute.</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ * Macro that given an attr e.g. hba_queue_depth expands</div><div class='add'>+ * into a function with the name lpfc_hba_queue_depth_init. The macro also</div><div class='add'>+ * takes a default argument, a minimum and maximum argument.</div><div class='add'>+ *</div><div class='add'>+ * lpfc_##attr##_init: Initializes an attribute.</div><div class='add'>+ * @phba: pointer the the adapter structure.</div><div class='add'>+ * @val: integer attribute value.</div><div class='add'>+ *</div><div class='add'>+ * Validates the min and max values then sets the adapter config field</div><div class='add'>+ * accordingly, or uses the default if out of range and prints an error message.</div><div class='add'>+ *</div><div class='add'>+ * Returns:</div><div class='add'>+ * zero on success</div><div class='add'>+ * -EINVAL if default used</div><div class='add'>+ **/</div><div class='ctx'> #define lpfc_param_init(attr, default, minval, maxval)	\</div><div class='ctx'> static int \</div><div class='ctx'> lpfc_##attr##_init(struct lpfc_hba *phba, int val) \</div><div class='hunk'>@@ -735,6 +1170,26 @@ lpfc_##attr##_init(struct lpfc_hba *phba, int val) \</div><div class='ctx'> 	return -EINVAL;\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_param_set: Set a cfg attribute value.</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ * Macro that given an attr e.g. hba_queue_depth expands</div><div class='add'>+ * into a function with the name lpfc_hba_queue_depth_set</div><div class='add'>+ *</div><div class='add'>+ * lpfc_##attr##_set: Sets an attribute value.</div><div class='add'>+ * @phba: pointer the the adapter structure.</div><div class='add'>+ * @val: integer attribute value.</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ * Validates the min and max values then sets the</div><div class='add'>+ * adapter config field if in the valid range. prints error message</div><div class='add'>+ * and does not set the parameter if invalid.</div><div class='add'>+ *</div><div class='add'>+ * Returns:</div><div class='add'>+ * zero on success</div><div class='add'>+ * -EINVAL if val is invalid</div><div class='add'>+ **/</div><div class='ctx'> #define lpfc_param_set(attr, default, minval, maxval)	\</div><div class='ctx'> static int \</div><div class='ctx'> lpfc_##attr##_set(struct lpfc_hba *phba, int val) \</div><div class='hunk'>@@ -749,6 +1204,27 @@ lpfc_##attr##_set(struct lpfc_hba *phba, int val) \</div><div class='ctx'> 	return -EINVAL;\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_param_store: Set a vport attribute value.</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ * Macro that given an attr e.g. hba_queue_depth expands</div><div class='add'>+ * into a function with the name lpfc_hba_queue_depth_store.</div><div class='add'>+ *</div><div class='add'>+ * lpfc_##attr##_store: Set an sttribute value.</div><div class='add'>+ * @dev: class device that is converted into a Scsi_host.</div><div class='add'>+ * @attr: device attribute, not used.</div><div class='add'>+ * @buf: contains the attribute value in ascii.</div><div class='add'>+ * @count: not used.</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ * Convert the ascii text number to an integer, then</div><div class='add'>+ * use the lpfc_##attr##_set function to set the value.</div><div class='add'>+ *</div><div class='add'>+ * Returns:</div><div class='add'>+ * -EINVAL if val is invalid or lpfc_##attr##_set() fails</div><div class='add'>+ * length of buffer upon success.</div><div class='add'>+ **/</div><div class='ctx'> #define lpfc_param_store(attr)	\</div><div class='ctx'> static ssize_t \</div><div class='ctx'> lpfc_##attr##_store(struct device *dev, struct device_attribute *attr, \</div><div class='hunk'>@@ -768,6 +1244,20 @@ lpfc_##attr##_store(struct device *dev, struct device_attribute *attr, \</div><div class='ctx'> 		return -EINVAL;\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_vport_param_show: Return decimal formatted cfg attribute value.</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ * Macro that given an attr e.g. hba_queue_depth expands</div><div class='add'>+ * into a function with the name lpfc_hba_queue_depth_show</div><div class='add'>+ *</div><div class='add'>+ * lpfc_##attr##_show: prints the attribute value in decimal.</div><div class='add'>+ * @dev: class device that is converted into a Scsi_host.</div><div class='add'>+ * @attr: device attribute, not used.</div><div class='add'>+ * @buf: on return contains the attribute value in decimal.</div><div class='add'>+ *</div><div class='add'>+ * Returns: length of formatted string.</div><div class='add'>+ **/</div><div class='ctx'> #define lpfc_vport_param_show(attr)	\</div><div class='ctx'> static ssize_t \</div><div class='ctx'> lpfc_##attr##_show(struct device *dev, struct device_attribute *attr, \</div><div class='hunk'>@@ -780,6 +1270,21 @@ lpfc_##attr##_show(struct device *dev, struct device_attribute *attr, \</div><div class='ctx'> 	return snprintf(buf, PAGE_SIZE, "%d\n", vport-&gt;cfg_##attr);\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_vport_param_hex_show: Return hex formatted attribute value.</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ * Macro that given an attr e.g.</div><div class='add'>+ * hba_queue_depth expands into a function with the name</div><div class='add'>+ * lpfc_hba_queue_depth_show</div><div class='add'>+ *</div><div class='add'>+ * lpfc_##attr##_show: prints the attribute value in hexidecimal.</div><div class='add'>+ * @dev: class device that is converted into a Scsi_host.</div><div class='add'>+ * @attr: device attribute, not used.</div><div class='add'>+ * @buf: on return contains the attribute value in hexidecimal.</div><div class='add'>+ *</div><div class='add'>+ * Returns: length of formatted string.</div><div class='add'>+ **/</div><div class='ctx'> #define lpfc_vport_param_hex_show(attr)	\</div><div class='ctx'> static ssize_t \</div><div class='ctx'> lpfc_##attr##_show(struct device *dev, struct device_attribute *attr, \</div><div class='hunk'>@@ -792,6 +1297,24 @@ lpfc_##attr##_show(struct device *dev, struct device_attribute *attr, \</div><div class='ctx'> 	return snprintf(buf, PAGE_SIZE, "%#x\n", vport-&gt;cfg_##attr);\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_vport_param_init: Initialize a vport cfg attribute.</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ * Macro that given an attr e.g. hba_queue_depth expands</div><div class='add'>+ * into a function with the name lpfc_hba_queue_depth_init. The macro also</div><div class='add'>+ * takes a default argument, a minimum and maximum argument.</div><div class='add'>+ *</div><div class='add'>+ * lpfc_##attr##_init: validates the min and max values then sets the</div><div class='add'>+ * adapter config field accordingly, or uses the default if out of range</div><div class='add'>+ * and prints an error message.</div><div class='add'>+ * @phba: pointer the the adapter structure.</div><div class='add'>+ * @val: integer attribute value.</div><div class='add'>+ *</div><div class='add'>+ * Returns:</div><div class='add'>+ * zero on success</div><div class='add'>+ * -EINVAL if default used</div><div class='add'>+ **/</div><div class='ctx'> #define lpfc_vport_param_init(attr, default, minval, maxval)	\</div><div class='ctx'> static int \</div><div class='ctx'> lpfc_##attr##_init(struct lpfc_vport *vport, int val) \</div><div class='hunk'>@@ -801,12 +1324,29 @@ lpfc_##attr##_init(struct lpfc_vport *vport, int val) \</div><div class='ctx'> 		return 0;\</div><div class='ctx'> 	}\</div><div class='ctx'> 	lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT, \</div><div class='del'>-			 "0449 lpfc_"#attr" attribute cannot be set to %d, "\</div><div class='add'>+			 "0423 lpfc_"#attr" attribute cannot be set to %d, "\</div><div class='ctx'> 			 "allowed range is ["#minval", "#maxval"]\n", val); \</div><div class='ctx'> 	vport-&gt;cfg_##attr = default;\</div><div class='ctx'> 	return -EINVAL;\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_vport_param_set: Set a vport cfg attribute.</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ * Macro that given an attr e.g. hba_queue_depth expands</div><div class='add'>+ * into a function with the name lpfc_hba_queue_depth_set</div><div class='add'>+ *</div><div class='add'>+ * lpfc_##attr##_set: validates the min and max values then sets the</div><div class='add'>+ * adapter config field if in the valid range. prints error message</div><div class='add'>+ * and does not set the parameter if invalid.</div><div class='add'>+ * @phba: pointer the the adapter structure.</div><div class='add'>+ * @val:	integer attribute value.</div><div class='add'>+ *</div><div class='add'>+ * Returns:</div><div class='add'>+ * zero on success</div><div class='add'>+ * -EINVAL if val is invalid</div><div class='add'>+ **/</div><div class='ctx'> #define lpfc_vport_param_set(attr, default, minval, maxval)	\</div><div class='ctx'> static int \</div><div class='ctx'> lpfc_##attr##_set(struct lpfc_vport *vport, int val) \</div><div class='hunk'>@@ -816,11 +1356,28 @@ lpfc_##attr##_set(struct lpfc_vport *vport, int val) \</div><div class='ctx'> 		return 0;\</div><div class='ctx'> 	}\</div><div class='ctx'> 	lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT, \</div><div class='del'>-			 "0450 lpfc_"#attr" attribute cannot be set to %d, "\</div><div class='add'>+			 "0424 lpfc_"#attr" attribute cannot be set to %d, "\</div><div class='ctx'> 			 "allowed range is ["#minval", "#maxval"]\n", val); \</div><div class='ctx'> 	return -EINVAL;\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_vport_param_store: Set a vport attribute.</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ * Macro that given an attr e.g. hba_queue_depth</div><div class='add'>+ * expands into a function with the name lpfc_hba_queue_depth_store</div><div class='add'>+ *</div><div class='add'>+ * lpfc_##attr##_store: convert the ascii text number to an integer, then</div><div class='add'>+ * use the lpfc_##attr##_set function to set the value.</div><div class='add'>+ * @cdev: class device that is converted into a Scsi_host.</div><div class='add'>+ * @buf:	contains the attribute value in decimal.</div><div class='add'>+ * @count: not used.</div><div class='add'>+ *</div><div class='add'>+ * Returns:</div><div class='add'>+ * -EINVAL if val is invalid or lpfc_##attr##_set() fails</div><div class='add'>+ * length of buffer upon success.</div><div class='add'>+ **/</div><div class='ctx'> #define lpfc_vport_param_store(attr)	\</div><div class='ctx'> static ssize_t \</div><div class='ctx'> lpfc_##attr##_store(struct device *dev, struct device_attribute *attr, \</div><div class='hunk'>@@ -941,6 +1498,7 @@ static DEVICE_ATTR(option_rom_version, S_IRUGO,</div><div class='ctx'> 		   lpfc_option_rom_version_show, NULL);</div><div class='ctx'> static DEVICE_ATTR(num_discovered_ports, S_IRUGO,</div><div class='ctx'> 		   lpfc_num_discovered_ports_show, NULL);</div><div class='add'>+static DEVICE_ATTR(menlo_mgmt_mode, S_IRUGO, lpfc_mlomgmt_show, NULL);</div><div class='ctx'> static DEVICE_ATTR(nport_evt_cnt, S_IRUGO, lpfc_nport_evt_cnt_show, NULL);</div><div class='ctx'> static DEVICE_ATTR(lpfc_drvr_version, S_IRUGO, lpfc_drvr_version_show, NULL);</div><div class='ctx'> static DEVICE_ATTR(board_mode, S_IRUGO | S_IWUSR,</div><div class='hunk'>@@ -958,6 +1516,17 @@ static DEVICE_ATTR(lpfc_temp_sensor, S_IRUGO, lpfc_temp_sensor_show, NULL);</div><div class='ctx'> </div><div class='ctx'> static char *lpfc_soft_wwn_key = "C99G71SL8032A";</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_soft_wwn_enable_store: Allows setting of the wwn if the key is valid.</div><div class='add'>+ * @dev: class device that is converted into a Scsi_host.</div><div class='add'>+ * @attr: device attribute, not used.</div><div class='add'>+ * @buf: containing the string lpfc_soft_wwn_key.</div><div class='add'>+ * @count: must be size of lpfc_soft_wwn_key.</div><div class='add'>+ *</div><div class='add'>+ * Returns:</div><div class='add'>+ * -EINVAL if the buffer does not contain lpfc_soft_wwn_key</div><div class='add'>+ * length of buf indicates success</div><div class='add'>+ **/</div><div class='ctx'> static ssize_t</div><div class='ctx'> lpfc_soft_wwn_enable_store(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 			   const char *buf, size_t count)</div><div class='hunk'>@@ -994,6 +1563,14 @@ lpfc_soft_wwn_enable_store(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> static DEVICE_ATTR(lpfc_soft_wwn_enable, S_IWUSR, NULL,</div><div class='ctx'> 		   lpfc_soft_wwn_enable_store);</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_soft_wwpn_show: Return the cfg soft ww port name of the adapter.</div><div class='add'>+ * @dev: class device that is converted into a Scsi_host.</div><div class='add'>+ * @attr: device attribute, not used.</div><div class='add'>+ * @buf: on return contains the wwpn in hexidecimal.</div><div class='add'>+ *</div><div class='add'>+ * Returns: size of formatted string.</div><div class='add'>+ **/</div><div class='ctx'> static ssize_t</div><div class='ctx'> lpfc_soft_wwpn_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 		    char *buf)</div><div class='hunk'>@@ -1006,7 +1583,19 @@ lpfc_soft_wwpn_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 			(unsigned long long)phba-&gt;cfg_soft_wwpn);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='add'>+/**</div><div class='add'>+ * lpfc_soft_wwpn_store: Set the ww port name of the adapter.</div><div class='add'>+ * @dev class device that is converted into a Scsi_host.</div><div class='add'>+ * @attr: device attribute, not used.</div><div class='add'>+ * @buf: contains the wwpn in hexidecimal.</div><div class='add'>+ * @count: number of wwpn bytes in buf</div><div class='add'>+ *</div><div class='add'>+ * Returns:</div><div class='add'>+ * -EACCES hba reset not enabled, adapter over temp</div><div class='add'>+ * -EINVAL soft wwn not enabled, count is invalid, invalid wwpn byte invalid</div><div class='add'>+ * -EIO error taking adapter offline or online</div><div class='add'>+ * value of count on success</div><div class='add'>+ **/</div><div class='ctx'> static ssize_t</div><div class='ctx'> lpfc_soft_wwpn_store(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 		     const char *buf, size_t count)</div><div class='hunk'>@@ -1080,6 +1669,14 @@ lpfc_soft_wwpn_store(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> static DEVICE_ATTR(lpfc_soft_wwpn, S_IRUGO | S_IWUSR,\</div><div class='ctx'> 		   lpfc_soft_wwpn_show, lpfc_soft_wwpn_store);</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_soft_wwnn_show: Return the cfg soft ww node name for the adapter.</div><div class='add'>+ * @dev: class device that is converted into a Scsi_host.</div><div class='add'>+ * @attr: device attribute, not used.</div><div class='add'>+ * @buf: on return contains the wwnn in hexidecimal.</div><div class='add'>+ *</div><div class='add'>+ * Returns: size of formatted string.</div><div class='add'>+ **/</div><div class='ctx'> static ssize_t</div><div class='ctx'> lpfc_soft_wwnn_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 		    char *buf)</div><div class='hunk'>@@ -1090,7 +1687,16 @@ lpfc_soft_wwnn_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 			(unsigned long long)phba-&gt;cfg_soft_wwnn);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='add'>+/**</div><div class='add'>+ * lpfc_soft_wwnn_store: sets the ww node name of the adapter.</div><div class='add'>+ * @cdev: class device that is converted into a Scsi_host.</div><div class='add'>+ * @buf: contains the ww node name in hexidecimal.</div><div class='add'>+ * @count: number of wwnn bytes in buf.</div><div class='add'>+ *</div><div class='add'>+ * Returns:</div><div class='add'>+ * -EINVAL soft wwn not enabled, count is invalid, invalid wwnn byte invalid</div><div class='add'>+ * value of count on success</div><div class='add'>+ **/</div><div class='ctx'> static ssize_t</div><div class='ctx'> lpfc_soft_wwnn_store(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 		     const char *buf, size_t count)</div><div class='hunk'>@@ -1178,6 +1784,15 @@ module_param(lpfc_nodev_tmo, int, 0);</div><div class='ctx'> MODULE_PARM_DESC(lpfc_nodev_tmo,</div><div class='ctx'> 		 "Seconds driver will hold I/O waiting "</div><div class='ctx'> 		 "for a device to come back");</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * lpfc_nodev_tmo_show: Return the hba dev loss timeout value.</div><div class='add'>+ * @dev: class converted to a Scsi_host structure.</div><div class='add'>+ * @attr: device attribute, not used.</div><div class='add'>+ * @buf: on return contains the dev loss timeout in decimal.</div><div class='add'>+ *</div><div class='add'>+ * Returns: size of formatted string.</div><div class='add'>+ **/</div><div class='ctx'> static ssize_t</div><div class='ctx'> lpfc_nodev_tmo_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 		    char *buf)</div><div class='hunk'>@@ -1189,6 +1804,21 @@ lpfc_nodev_tmo_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return snprintf(buf, PAGE_SIZE, "%d\n",	vport-&gt;cfg_devloss_tmo);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_nodev_tmo_init: Set the hba nodev timeout value.</div><div class='add'>+ * @vport: lpfc vport structure pointer.</div><div class='add'>+ * @val: contains the nodev timeout value.</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ * If the devloss tmo is already set then nodev tmo is set to devloss tmo,</div><div class='add'>+ * a kernel error message is printed and zero is returned.</div><div class='add'>+ * Else if val is in range then nodev tmo and devloss tmo are set to val.</div><div class='add'>+ * Otherwise nodev tmo is set to the default value.</div><div class='add'>+ *</div><div class='add'>+ * Returns:</div><div class='add'>+ * zero if already set or if val is in range</div><div class='add'>+ * -EINVAL val out of range</div><div class='add'>+ **/</div><div class='ctx'> static int</div><div class='ctx'> lpfc_nodev_tmo_init(struct lpfc_vport *vport, int val)</div><div class='ctx'> {</div><div class='hunk'>@@ -1196,7 +1826,7 @@ lpfc_nodev_tmo_init(struct lpfc_vport *vport, int val)</div><div class='ctx'> 		vport-&gt;cfg_nodev_tmo = vport-&gt;cfg_devloss_tmo;</div><div class='ctx'> 		if (val != LPFC_DEF_DEVLOSS_TMO)</div><div class='ctx'> 			lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,</div><div class='del'>-					 "0402 Ignoring nodev_tmo module "</div><div class='add'>+					 "0407 Ignoring nodev_tmo module "</div><div class='ctx'> 					 "parameter because devloss_tmo is "</div><div class='ctx'> 					 "set.\n");</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -1215,6 +1845,13 @@ lpfc_nodev_tmo_init(struct lpfc_vport *vport, int val)</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_update_rport_devloss_tmo: Update dev loss tmo value.</div><div class='add'>+ * @vport: lpfc vport structure pointer.</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ * Update all the ndlp's dev loss tmo with the vport devloss tmo value.</div><div class='add'>+ **/</div><div class='ctx'> static void</div><div class='ctx'> lpfc_update_rport_devloss_tmo(struct lpfc_vport *vport)</div><div class='ctx'> {</div><div class='hunk'>@@ -1229,6 +1866,21 @@ lpfc_update_rport_devloss_tmo(struct lpfc_vport *vport)</div><div class='ctx'> 	spin_unlock_irq(shost-&gt;host_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_nodev_tmo_set: Set the vport nodev tmo and devloss tmo values.</div><div class='add'>+ * @vport: lpfc vport structure pointer.</div><div class='add'>+ * @val: contains the tmo value.</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ * If the devloss tmo is already set or the vport dev loss tmo has changed</div><div class='add'>+ * then a kernel error message is printed and zero is returned.</div><div class='add'>+ * Else if val is in range then nodev tmo and devloss tmo are set to val.</div><div class='add'>+ * Otherwise nodev tmo is set to the default value.</div><div class='add'>+ *</div><div class='add'>+ * Returns:</div><div class='add'>+ * zero if already set or if val is in range</div><div class='add'>+ * -EINVAL val out of range</div><div class='add'>+ **/</div><div class='ctx'> static int</div><div class='ctx'> lpfc_nodev_tmo_set(struct lpfc_vport *vport, int val)</div><div class='ctx'> {</div><div class='hunk'>@@ -1269,6 +1921,21 @@ MODULE_PARM_DESC(lpfc_devloss_tmo,</div><div class='ctx'> lpfc_vport_param_init(devloss_tmo, LPFC_DEF_DEVLOSS_TMO,</div><div class='ctx'> 		      LPFC_MIN_DEVLOSS_TMO, LPFC_MAX_DEVLOSS_TMO)</div><div class='ctx'> lpfc_vport_param_show(devloss_tmo)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * lpfc_devloss_tmo_set: Sets vport nodev tmo, devloss tmo values, changed bit.</div><div class='add'>+ * @vport: lpfc vport structure pointer.</div><div class='add'>+ * @val: contains the tmo value.</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ * If val is in a valid range then set the vport nodev tmo,</div><div class='add'>+ * devloss tmo, also set the vport dev loss tmo changed flag.</div><div class='add'>+ * Else a kernel error message is printed.</div><div class='add'>+ *</div><div class='add'>+ * Returns:</div><div class='add'>+ * zero if val is in range</div><div class='add'>+ * -EINVAL val out of range</div><div class='add'>+ **/</div><div class='ctx'> static int</div><div class='ctx'> lpfc_devloss_tmo_set(struct lpfc_vport *vport, int val)</div><div class='ctx'> {</div><div class='hunk'>@@ -1366,12 +2033,27 @@ MODULE_PARM_DESC(lpfc_restrict_login,</div><div class='ctx'> 		 "Restrict virtual ports login to remote initiators.");</div><div class='ctx'> lpfc_vport_param_show(restrict_login);</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_restrict_login_init: Set the vport restrict login flag.</div><div class='add'>+ * @vport: lpfc vport structure pointer.</div><div class='add'>+ * @val: contains the restrict login value.</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ * If val is not in a valid range then log a kernel error message and set</div><div class='add'>+ * the vport restrict login to one.</div><div class='add'>+ * If the port type is physical clear the restrict login flag and return.</div><div class='add'>+ * Else set the restrict login flag to val.</div><div class='add'>+ *</div><div class='add'>+ * Returns:</div><div class='add'>+ * zero if val is in range</div><div class='add'>+ * -EINVAL val out of range</div><div class='add'>+ **/</div><div class='ctx'> static int</div><div class='ctx'> lpfc_restrict_login_init(struct lpfc_vport *vport, int val)</div><div class='ctx'> {</div><div class='ctx'> 	if (val &lt; 0 || val &gt; 1) {</div><div class='ctx'> 		lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,</div><div class='del'>-				 "0449 lpfc_restrict_login attribute cannot "</div><div class='add'>+				 "0422 lpfc_restrict_login attribute cannot "</div><div class='ctx'> 				 "be set to %d, allowed range is [0, 1]\n",</div><div class='ctx'> 				 val);</div><div class='ctx'> 		vport-&gt;cfg_restrict_login = 1;</div><div class='hunk'>@@ -1385,12 +2067,28 @@ lpfc_restrict_login_init(struct lpfc_vport *vport, int val)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_restrict_login_set: Set the vport restrict login flag.</div><div class='add'>+ * @vport: lpfc vport structure pointer.</div><div class='add'>+ * @val: contains the restrict login value.</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ * If val is not in a valid range then log a kernel error message and set</div><div class='add'>+ * the vport restrict login to one.</div><div class='add'>+ * If the port type is physical and the val is not zero log a kernel</div><div class='add'>+ * error message, clear the restrict login flag and return zero.</div><div class='add'>+ * Else set the restrict login flag to val.</div><div class='add'>+ *</div><div class='add'>+ * Returns:</div><div class='add'>+ * zero if val is in range</div><div class='add'>+ * -EINVAL val out of range</div><div class='add'>+ **/</div><div class='ctx'> static int</div><div class='ctx'> lpfc_restrict_login_set(struct lpfc_vport *vport, int val)</div><div class='ctx'> {</div><div class='ctx'> 	if (val &lt; 0 || val &gt; 1) {</div><div class='ctx'> 		lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,</div><div class='del'>-				 "0450 lpfc_restrict_login attribute cannot "</div><div class='add'>+				 "0425 lpfc_restrict_login attribute cannot "</div><div class='ctx'> 				 "be set to %d, allowed range is [0, 1]\n",</div><div class='ctx'> 				 val);</div><div class='ctx'> 		vport-&gt;cfg_restrict_login = 1;</div><div class='hunk'>@@ -1441,6 +2139,23 @@ LPFC_VPORT_ATTR_R(scan_down, 1, 0, 1,</div><div class='ctx'> # Set loop mode if you want to run as an NL_Port. Value range is [0,0x6].</div><div class='ctx'> # Default value is 0.</div><div class='ctx'> */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * lpfc_topology_set: Set the adapters topology field.</div><div class='add'>+ * @phba: lpfc_hba pointer.</div><div class='add'>+ * @val: topology value.</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ * If val is in a valid range then set the adapter's topology field and</div><div class='add'>+ * issue a lip; if the lip fails reset the topology to the old value.</div><div class='add'>+ *</div><div class='add'>+ * If the value is not in range log a kernel error message and return an error.</div><div class='add'>+ *</div><div class='add'>+ * Returns:</div><div class='add'>+ * zero if val is in range and lip okay</div><div class='add'>+ * non-zero return value from lpfc_issue_lip()</div><div class='add'>+ * -EINVAL val out of range</div><div class='add'>+ **/</div><div class='ctx'> static int</div><div class='ctx'> lpfc_topology_set(struct lpfc_hba *phba, int val)</div><div class='ctx'> {</div><div class='hunk'>@@ -1469,6 +2184,335 @@ lpfc_param_store(topology)</div><div class='ctx'> static DEVICE_ATTR(lpfc_topology, S_IRUGO | S_IWUSR,</div><div class='ctx'> 		lpfc_topology_show, lpfc_topology_store);</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * lpfc_stat_data_ctrl_store: write call back for lpfc_stat_data_ctrl</div><div class='add'>+ *  sysfs file.</div><div class='add'>+ * @dev: Pointer to class device.</div><div class='add'>+ * @buf: Data buffer.</div><div class='add'>+ * @count: Size of the data buffer.</div><div class='add'>+ *</div><div class='add'>+ * This function get called when an user write to the lpfc_stat_data_ctrl</div><div class='add'>+ * sysfs file. This function parse the command written to the sysfs file</div><div class='add'>+ * and take appropriate action. These commands are used for controlling</div><div class='add'>+ * driver statistical data collection.</div><div class='add'>+ * Following are the command this function handles.</div><div class='add'>+ *</div><div class='add'>+ *    setbucket &lt;bucket_type&gt; &lt;base&gt; &lt;step&gt;</div><div class='add'>+ *			       = Set the latency buckets.</div><div class='add'>+ *    destroybucket            = destroy all the buckets.</div><div class='add'>+ *    start                    = start data collection</div><div class='add'>+ *    stop                     = stop data collection</div><div class='add'>+ *    reset                    = reset the collected data</div><div class='add'>+ **/</div><div class='add'>+static ssize_t</div><div class='add'>+lpfc_stat_data_ctrl_store(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			  const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct Scsi_Host  *shost = class_to_shost(dev);</div><div class='add'>+	struct lpfc_vport *vport = (struct lpfc_vport *) shost-&gt;hostdata;</div><div class='add'>+	struct lpfc_hba   *phba = vport-&gt;phba;</div><div class='add'>+#define LPFC_MAX_DATA_CTRL_LEN 1024</div><div class='add'>+	static char bucket_data[LPFC_MAX_DATA_CTRL_LEN];</div><div class='add'>+	unsigned long i;</div><div class='add'>+	char *str_ptr, *token;</div><div class='add'>+	struct lpfc_vport **vports;</div><div class='add'>+	struct Scsi_Host *v_shost;</div><div class='add'>+	char *bucket_type_str, *base_str, *step_str;</div><div class='add'>+	unsigned long base, step, bucket_type;</div><div class='add'>+</div><div class='add'>+	if (!strncmp(buf, "setbucket", strlen("setbucket"))) {</div><div class='add'>+		if (strlen(buf) &gt; LPFC_MAX_DATA_CTRL_LEN)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		strcpy(bucket_data, buf);</div><div class='add'>+		str_ptr = &amp;bucket_data[0];</div><div class='add'>+		/* Ignore this token - this is command token */</div><div class='add'>+		token = strsep(&amp;str_ptr, "\t ");</div><div class='add'>+		if (!token)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		bucket_type_str = strsep(&amp;str_ptr, "\t ");</div><div class='add'>+		if (!bucket_type_str)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		if (!strncmp(bucket_type_str, "linear", strlen("linear")))</div><div class='add'>+			bucket_type = LPFC_LINEAR_BUCKET;</div><div class='add'>+		else if (!strncmp(bucket_type_str, "power2", strlen("power2")))</div><div class='add'>+			bucket_type = LPFC_POWER2_BUCKET;</div><div class='add'>+		else</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		base_str = strsep(&amp;str_ptr, "\t ");</div><div class='add'>+		if (!base_str)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		base = simple_strtoul(base_str, NULL, 0);</div><div class='add'>+</div><div class='add'>+		step_str = strsep(&amp;str_ptr, "\t ");</div><div class='add'>+		if (!step_str)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		step = simple_strtoul(step_str, NULL, 0);</div><div class='add'>+		if (!step)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		/* Block the data collection for every vport */</div><div class='add'>+		vports = lpfc_create_vport_work_array(phba);</div><div class='add'>+		if (vports == NULL)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt;= phba-&gt;max_vpi &amp;&amp; vports[i] != NULL; i++) {</div><div class='add'>+			v_shost = lpfc_shost_from_vport(vports[i]);</div><div class='add'>+			spin_lock_irq(v_shost-&gt;host_lock);</div><div class='add'>+			/* Block and reset data collection */</div><div class='add'>+			vports[i]-&gt;stat_data_blocked = 1;</div><div class='add'>+			if (vports[i]-&gt;stat_data_enabled)</div><div class='add'>+				lpfc_vport_reset_stat_data(vports[i]);</div><div class='add'>+			spin_unlock_irq(v_shost-&gt;host_lock);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Set the bucket attributes */</div><div class='add'>+		phba-&gt;bucket_type = bucket_type;</div><div class='add'>+		phba-&gt;bucket_base = base;</div><div class='add'>+		phba-&gt;bucket_step = step;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt;= phba-&gt;max_vpi &amp;&amp; vports[i] != NULL; i++) {</div><div class='add'>+			v_shost = lpfc_shost_from_vport(vports[i]);</div><div class='add'>+</div><div class='add'>+			/* Unblock data collection */</div><div class='add'>+			spin_lock_irq(v_shost-&gt;host_lock);</div><div class='add'>+			vports[i]-&gt;stat_data_blocked = 0;</div><div class='add'>+			spin_unlock_irq(v_shost-&gt;host_lock);</div><div class='add'>+		}</div><div class='add'>+		lpfc_destroy_vport_work_array(phba, vports);</div><div class='add'>+		return strlen(buf);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!strncmp(buf, "destroybucket", strlen("destroybucket"))) {</div><div class='add'>+		vports = lpfc_create_vport_work_array(phba);</div><div class='add'>+		if (vports == NULL)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt;= phba-&gt;max_vpi &amp;&amp; vports[i] != NULL; i++) {</div><div class='add'>+			v_shost = lpfc_shost_from_vport(vports[i]);</div><div class='add'>+			spin_lock_irq(shost-&gt;host_lock);</div><div class='add'>+			vports[i]-&gt;stat_data_blocked = 1;</div><div class='add'>+			lpfc_free_bucket(vport);</div><div class='add'>+			vport-&gt;stat_data_enabled = 0;</div><div class='add'>+			vports[i]-&gt;stat_data_blocked = 0;</div><div class='add'>+			spin_unlock_irq(shost-&gt;host_lock);</div><div class='add'>+		}</div><div class='add'>+		lpfc_destroy_vport_work_array(phba, vports);</div><div class='add'>+		phba-&gt;bucket_type = LPFC_NO_BUCKET;</div><div class='add'>+		phba-&gt;bucket_base = 0;</div><div class='add'>+		phba-&gt;bucket_step = 0;</div><div class='add'>+		return strlen(buf);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!strncmp(buf, "start", strlen("start"))) {</div><div class='add'>+		/* If no buckets configured return error */</div><div class='add'>+		if (phba-&gt;bucket_type == LPFC_NO_BUCKET)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		spin_lock_irq(shost-&gt;host_lock);</div><div class='add'>+		if (vport-&gt;stat_data_enabled) {</div><div class='add'>+			spin_unlock_irq(shost-&gt;host_lock);</div><div class='add'>+			return strlen(buf);</div><div class='add'>+		}</div><div class='add'>+		lpfc_alloc_bucket(vport);</div><div class='add'>+		vport-&gt;stat_data_enabled = 1;</div><div class='add'>+		spin_unlock_irq(shost-&gt;host_lock);</div><div class='add'>+		return strlen(buf);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!strncmp(buf, "stop", strlen("stop"))) {</div><div class='add'>+		spin_lock_irq(shost-&gt;host_lock);</div><div class='add'>+		if (vport-&gt;stat_data_enabled == 0) {</div><div class='add'>+			spin_unlock_irq(shost-&gt;host_lock);</div><div class='add'>+			return strlen(buf);</div><div class='add'>+		}</div><div class='add'>+		lpfc_free_bucket(vport);</div><div class='add'>+		vport-&gt;stat_data_enabled = 0;</div><div class='add'>+		spin_unlock_irq(shost-&gt;host_lock);</div><div class='add'>+		return strlen(buf);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!strncmp(buf, "reset", strlen("reset"))) {</div><div class='add'>+		if ((phba-&gt;bucket_type == LPFC_NO_BUCKET)</div><div class='add'>+			|| !vport-&gt;stat_data_enabled)</div><div class='add'>+			return strlen(buf);</div><div class='add'>+		spin_lock_irq(shost-&gt;host_lock);</div><div class='add'>+		vport-&gt;stat_data_blocked = 1;</div><div class='add'>+		lpfc_vport_reset_stat_data(vport);</div><div class='add'>+		vport-&gt;stat_data_blocked = 0;</div><div class='add'>+		spin_unlock_irq(shost-&gt;host_lock);</div><div class='add'>+		return strlen(buf);</div><div class='add'>+	}</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * lpfc_stat_data_ctrl_show: Read callback function for</div><div class='add'>+ *   lpfc_stat_data_ctrl sysfs file.</div><div class='add'>+ * @dev: Pointer to class device object.</div><div class='add'>+ * @buf: Data buffer.</div><div class='add'>+ *</div><div class='add'>+ * This function is the read call back function for</div><div class='add'>+ * lpfc_stat_data_ctrl sysfs file. This function report the</div><div class='add'>+ * current statistical data collection state.</div><div class='add'>+ **/</div><div class='add'>+static ssize_t</div><div class='add'>+lpfc_stat_data_ctrl_show(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			 char *buf)</div><div class='add'>+{</div><div class='add'>+	struct Scsi_Host  *shost = class_to_shost(dev);</div><div class='add'>+	struct lpfc_vport *vport = (struct lpfc_vport *) shost-&gt;hostdata;</div><div class='add'>+	struct lpfc_hba   *phba = vport-&gt;phba;</div><div class='add'>+	int index = 0;</div><div class='add'>+	int i;</div><div class='add'>+	char *bucket_type;</div><div class='add'>+	unsigned long bucket_value;</div><div class='add'>+</div><div class='add'>+	switch (phba-&gt;bucket_type) {</div><div class='add'>+	case LPFC_LINEAR_BUCKET:</div><div class='add'>+		bucket_type = "linear";</div><div class='add'>+		break;</div><div class='add'>+	case LPFC_POWER2_BUCKET:</div><div class='add'>+		bucket_type = "power2";</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		bucket_type = "No Bucket";</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sprintf(&amp;buf[index], "Statistical Data enabled :%d, "</div><div class='add'>+		"blocked :%d, Bucket type :%s, Bucket base :%d,"</div><div class='add'>+		" Bucket step :%d\nLatency Ranges :",</div><div class='add'>+		vport-&gt;stat_data_enabled, vport-&gt;stat_data_blocked,</div><div class='add'>+		bucket_type, phba-&gt;bucket_base, phba-&gt;bucket_step);</div><div class='add'>+	index = strlen(buf);</div><div class='add'>+	if (phba-&gt;bucket_type != LPFC_NO_BUCKET) {</div><div class='add'>+		for (i = 0; i &lt; LPFC_MAX_BUCKET_COUNT; i++) {</div><div class='add'>+			if (phba-&gt;bucket_type == LPFC_LINEAR_BUCKET)</div><div class='add'>+				bucket_value = phba-&gt;bucket_base +</div><div class='add'>+					phba-&gt;bucket_step * i;</div><div class='add'>+			else</div><div class='add'>+				bucket_value = phba-&gt;bucket_base +</div><div class='add'>+				(1 &lt;&lt; i) * phba-&gt;bucket_step;</div><div class='add'>+</div><div class='add'>+			if (index + 10 &gt; PAGE_SIZE)</div><div class='add'>+				break;</div><div class='add'>+			sprintf(&amp;buf[index], "%08ld ", bucket_value);</div><div class='add'>+			index = strlen(buf);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	sprintf(&amp;buf[index], "\n");</div><div class='add'>+	return strlen(buf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Sysfs attribute to control the statistical data collection.</div><div class='add'>+ */</div><div class='add'>+static DEVICE_ATTR(lpfc_stat_data_ctrl, S_IRUGO | S_IWUSR,</div><div class='add'>+		   lpfc_stat_data_ctrl_show, lpfc_stat_data_ctrl_store);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * lpfc_drvr_stat_data: sysfs attr to get driver statistical data.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Each Bucket takes 11 characters and 1 new line + 17 bytes WWN</div><div class='add'>+ * for each target.</div><div class='add'>+ */</div><div class='add'>+#define STAT_DATA_SIZE_PER_TARGET(NUM_BUCKETS) ((NUM_BUCKETS) * 11 + 18)</div><div class='add'>+#define MAX_STAT_DATA_SIZE_PER_TARGET \</div><div class='add'>+	STAT_DATA_SIZE_PER_TARGET(LPFC_MAX_BUCKET_COUNT)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * sysfs_drvr_stat_data_read: Read callback function for lpfc_drvr_stat_data</div><div class='add'>+ *  sysfs attribute.</div><div class='add'>+ * @kobj: Pointer to the kernel object</div><div class='add'>+ * @bin_attr: Attribute object</div><div class='add'>+ * @buff: Buffer pointer</div><div class='add'>+ * @off: File offset</div><div class='add'>+ * @count: Buffer size</div><div class='add'>+ *</div><div class='add'>+ * This function is the read call back function for lpfc_drvr_stat_data</div><div class='add'>+ * sysfs file. This function export the statistical data to user</div><div class='add'>+ * applications.</div><div class='add'>+ **/</div><div class='add'>+static ssize_t</div><div class='add'>+sysfs_drvr_stat_data_read(struct kobject *kobj, struct bin_attribute *bin_attr,</div><div class='add'>+		char *buf, loff_t off, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = container_of(kobj, struct device,</div><div class='add'>+		kobj);</div><div class='add'>+	struct Scsi_Host  *shost = class_to_shost(dev);</div><div class='add'>+	struct lpfc_vport *vport = (struct lpfc_vport *) shost-&gt;hostdata;</div><div class='add'>+	struct lpfc_hba   *phba = vport-&gt;phba;</div><div class='add'>+	int i = 0, index = 0;</div><div class='add'>+	unsigned long nport_index;</div><div class='add'>+	struct lpfc_nodelist *ndlp = NULL;</div><div class='add'>+	nport_index = (unsigned long)off /</div><div class='add'>+		MAX_STAT_DATA_SIZE_PER_TARGET;</div><div class='add'>+</div><div class='add'>+	if (!vport-&gt;stat_data_enabled || vport-&gt;stat_data_blocked</div><div class='add'>+		|| (phba-&gt;bucket_type == LPFC_NO_BUCKET))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(shost-&gt;host_lock);</div><div class='add'>+	list_for_each_entry(ndlp, &amp;vport-&gt;fc_nodes, nlp_listp) {</div><div class='add'>+		if (!NLP_CHK_NODE_ACT(ndlp) || !ndlp-&gt;lat_data)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (nport_index &gt; 0) {</div><div class='add'>+			nport_index--;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if ((index + MAX_STAT_DATA_SIZE_PER_TARGET)</div><div class='add'>+			&gt; count)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (!ndlp-&gt;lat_data)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* Print the WWN */</div><div class='add'>+		sprintf(&amp;buf[index], "%02x%02x%02x%02x%02x%02x%02x%02x:",</div><div class='add'>+			ndlp-&gt;nlp_portname.u.wwn[0],</div><div class='add'>+			ndlp-&gt;nlp_portname.u.wwn[1],</div><div class='add'>+			ndlp-&gt;nlp_portname.u.wwn[2],</div><div class='add'>+			ndlp-&gt;nlp_portname.u.wwn[3],</div><div class='add'>+			ndlp-&gt;nlp_portname.u.wwn[4],</div><div class='add'>+			ndlp-&gt;nlp_portname.u.wwn[5],</div><div class='add'>+			ndlp-&gt;nlp_portname.u.wwn[6],</div><div class='add'>+			ndlp-&gt;nlp_portname.u.wwn[7]);</div><div class='add'>+</div><div class='add'>+		index = strlen(buf);</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; LPFC_MAX_BUCKET_COUNT; i++) {</div><div class='add'>+			sprintf(&amp;buf[index], "%010u,",</div><div class='add'>+				ndlp-&gt;lat_data[i].cmd_count);</div><div class='add'>+			index = strlen(buf);</div><div class='add'>+		}</div><div class='add'>+		sprintf(&amp;buf[index], "\n");</div><div class='add'>+		index = strlen(buf);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irq(shost-&gt;host_lock);</div><div class='add'>+	return index;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct bin_attribute sysfs_drvr_stat_data_attr = {</div><div class='add'>+	.attr = {</div><div class='add'>+		.name = "lpfc_drvr_stat_data",</div><div class='add'>+		.mode = S_IRUSR,</div><div class='add'>+		.owner = THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+	.size = LPFC_MAX_TARGET * MAX_STAT_DATA_SIZE_PER_TARGET,</div><div class='add'>+	.read = sysfs_drvr_stat_data_read,</div><div class='add'>+	.write = NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'> # lpfc_link_speed: Link speed selection for initializing the Fibre Channel</div><div class='ctx'> # connection.</div><div class='hunk'>@@ -1479,6 +2523,24 @@ static DEVICE_ATTR(lpfc_topology, S_IRUGO | S_IWUSR,</div><div class='ctx'> #       8  = 8 Gigabaud</div><div class='ctx'> # Value range is [0,8]. Default value is 0.</div><div class='ctx'> */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * lpfc_link_speed_set: Set the adapters link speed.</div><div class='add'>+ * @phba: lpfc_hba pointer.</div><div class='add'>+ * @val: link speed value.</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ * If val is in a valid range then set the adapter's link speed field and</div><div class='add'>+ * issue a lip; if the lip fails reset the link speed to the old value.</div><div class='add'>+ *</div><div class='add'>+ * Notes:</div><div class='add'>+ * If the value is not in range log a kernel error message and return an error.</div><div class='add'>+ *</div><div class='add'>+ * Returns:</div><div class='add'>+ * zero if val is in range and lip okay.</div><div class='add'>+ * non-zero return value from lpfc_issue_lip()</div><div class='add'>+ * -EINVAL val out of range</div><div class='add'>+ **/</div><div class='ctx'> static int</div><div class='ctx'> lpfc_link_speed_set(struct lpfc_hba *phba, int val)</div><div class='ctx'> {</div><div class='hunk'>@@ -1513,6 +2575,23 @@ static int lpfc_link_speed = 0;</div><div class='ctx'> module_param(lpfc_link_speed, int, 0);</div><div class='ctx'> MODULE_PARM_DESC(lpfc_link_speed, "Select link speed");</div><div class='ctx'> lpfc_param_show(link_speed)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * lpfc_link_speed_init: Set the adapters link speed.</div><div class='add'>+ * @phba: lpfc_hba pointer.</div><div class='add'>+ * @val: link speed value.</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ * If val is in a valid range then set the adapter's link speed field.</div><div class='add'>+ *</div><div class='add'>+ * Notes:</div><div class='add'>+ * If the value is not in range log a kernel error message, clear the link</div><div class='add'>+ * speed and return an error.</div><div class='add'>+ *</div><div class='add'>+ * Returns:</div><div class='add'>+ * zero if val saved.</div><div class='add'>+ * -EINVAL val out of range</div><div class='add'>+ **/</div><div class='ctx'> static int</div><div class='ctx'> lpfc_link_speed_init(struct lpfc_hba *phba, int val)</div><div class='ctx'> {</div><div class='hunk'>@@ -1522,7 +2601,7 @@ lpfc_link_speed_init(struct lpfc_hba *phba, int val)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	lpfc_printf_log(phba, KERN_ERR, LOG_INIT,</div><div class='del'>-			"0454 lpfc_link_speed attribute cannot "</div><div class='add'>+			"0405 lpfc_link_speed attribute cannot "</div><div class='ctx'> 			"be set to %d, allowed values are "</div><div class='ctx'> 			"["LPFC_LINK_SPEED_STRING"]\n", val);</div><div class='ctx'> 	phba-&gt;cfg_link_speed = 0;</div><div class='hunk'>@@ -1548,6 +2627,48 @@ LPFC_VPORT_ATTR_RW(use_adisc, 0, 0, 1,</div><div class='ctx'> 		   "Use ADISC on rediscovery to authenticate FCP devices");</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+# lpfc_max_scsicmpl_time: Use scsi command completion time to control I/O queue</div><div class='add'>+# depth. Default value is 0. When the value of this parameter is zero the</div><div class='add'>+# SCSI command completion time is not used for controlling I/O queue depth. When</div><div class='add'>+# the parameter is set to a non-zero value, the I/O queue depth is controlled</div><div class='add'>+# to limit the I/O completion time to the parameter value.</div><div class='add'>+# The value is set in milliseconds.</div><div class='add'>+*/</div><div class='add'>+static int lpfc_max_scsicmpl_time;</div><div class='add'>+module_param(lpfc_max_scsicmpl_time, int, 0);</div><div class='add'>+MODULE_PARM_DESC(lpfc_max_scsicmpl_time,</div><div class='add'>+	"Use command completion time to control queue depth");</div><div class='add'>+lpfc_vport_param_show(max_scsicmpl_time);</div><div class='add'>+lpfc_vport_param_init(max_scsicmpl_time, 0, 0, 60000);</div><div class='add'>+static int</div><div class='add'>+lpfc_max_scsicmpl_time_set(struct lpfc_vport *vport, int val)</div><div class='add'>+{</div><div class='add'>+	struct Scsi_Host *shost = lpfc_shost_from_vport(vport);</div><div class='add'>+	struct lpfc_nodelist *ndlp, *next_ndlp;</div><div class='add'>+</div><div class='add'>+	if (val == vport-&gt;cfg_max_scsicmpl_time)</div><div class='add'>+		return 0;</div><div class='add'>+	if ((val &lt; 0) || (val &gt; 60000))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	vport-&gt;cfg_max_scsicmpl_time = val;</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(shost-&gt;host_lock);</div><div class='add'>+	list_for_each_entry_safe(ndlp, next_ndlp, &amp;vport-&gt;fc_nodes, nlp_listp) {</div><div class='add'>+		if (!NLP_CHK_NODE_ACT(ndlp))</div><div class='add'>+			continue;</div><div class='add'>+		if (ndlp-&gt;nlp_state == NLP_STE_UNUSED_NODE)</div><div class='add'>+			continue;</div><div class='add'>+		ndlp-&gt;cmd_qdepth = LPFC_MAX_TGT_QDEPTH;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irq(shost-&gt;host_lock);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+lpfc_vport_param_store(max_scsicmpl_time);</div><div class='add'>+static DEVICE_ATTR(lpfc_max_scsicmpl_time, S_IRUGO | S_IWUSR,</div><div class='add'>+		   lpfc_max_scsicmpl_time_show,</div><div class='add'>+		   lpfc_max_scsicmpl_time_store);</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'> # lpfc_ack0: Use ACK0, instead of ACK1 for class 2 acknowledgement. Value</div><div class='ctx'> # range is [0,1]. Default value is 0.</div><div class='ctx'> */</div><div class='hunk'>@@ -1623,12 +2744,12 @@ LPFC_ATTR_RW(poll_tmo, 10, 1, 255,</div><div class='ctx'> /*</div><div class='ctx'> # lpfc_use_msi: Use MSI (Message Signaled Interrupts) in systems that</div><div class='ctx'> #		support this feature</div><div class='del'>-#       0  = MSI disabled (default)</div><div class='add'>+#       0  = MSI disabled</div><div class='ctx'> #       1  = MSI enabled</div><div class='del'>-#	2  = MSI-X enabled</div><div class='del'>-# Value range is [0,2]. Default value is 0.</div><div class='add'>+#       2  = MSI-X enabled (default)</div><div class='add'>+# Value range is [0,2]. Default value is 2.</div><div class='ctx'> */</div><div class='del'>-LPFC_ATTR_R(use_msi, 0, 0, 2, "Use Message Signaled Interrupts (1) or "</div><div class='add'>+LPFC_ATTR_R(use_msi, 2, 0, 2, "Use Message Signaled Interrupts (1) or "</div><div class='ctx'> 	    "MSI-X (2), if possible");</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1668,6 +2789,7 @@ struct device_attribute *lpfc_hba_attrs[] = {</div><div class='ctx'> 	&amp;dev_attr_option_rom_version,</div><div class='ctx'> 	&amp;dev_attr_link_state,</div><div class='ctx'> 	&amp;dev_attr_num_discovered_ports,</div><div class='add'>+	&amp;dev_attr_menlo_mgmt_mode,</div><div class='ctx'> 	&amp;dev_attr_lpfc_drvr_version,</div><div class='ctx'> 	&amp;dev_attr_lpfc_temp_sensor,</div><div class='ctx'> 	&amp;dev_attr_lpfc_log_verbose,</div><div class='hunk'>@@ -1709,6 +2831,8 @@ struct device_attribute *lpfc_hba_attrs[] = {</div><div class='ctx'> 	&amp;dev_attr_lpfc_enable_hba_reset,</div><div class='ctx'> 	&amp;dev_attr_lpfc_enable_hba_heartbeat,</div><div class='ctx'> 	&amp;dev_attr_lpfc_sg_seg_cnt,</div><div class='add'>+	&amp;dev_attr_lpfc_max_scsicmpl_time,</div><div class='add'>+	&amp;dev_attr_lpfc_stat_data_ctrl,</div><div class='ctx'> 	NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1731,9 +2855,29 @@ struct device_attribute *lpfc_vport_attrs[] = {</div><div class='ctx'> 	&amp;dev_attr_nport_evt_cnt,</div><div class='ctx'> 	&amp;dev_attr_npiv_info,</div><div class='ctx'> 	&amp;dev_attr_lpfc_enable_da_id,</div><div class='add'>+	&amp;dev_attr_lpfc_max_scsicmpl_time,</div><div class='add'>+	&amp;dev_attr_lpfc_stat_data_ctrl,</div><div class='ctx'> 	NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * sysfs_ctlreg_write: Write method for writing to ctlreg.</div><div class='add'>+ * @kobj: kernel kobject that contains the kernel class device.</div><div class='add'>+ * @bin_attr: kernel attributes passed to us.</div><div class='add'>+ * @buf: contains the data to be written to the adapter IOREG space.</div><div class='add'>+ * @off: offset into buffer to beginning of data.</div><div class='add'>+ * @count: bytes to transfer.</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ * Accessed via /sys/class/scsi_host/hostxxx/ctlreg.</div><div class='add'>+ * Uses the adapter io control registers to send buf contents to the adapter.</div><div class='add'>+ *</div><div class='add'>+ * Returns:</div><div class='add'>+ * -ERANGE off and count combo out of range</div><div class='add'>+ * -EINVAL off, count or buff address invalid</div><div class='add'>+ * -EPERM adapter is offline</div><div class='add'>+ * value of count, buf contents written</div><div class='add'>+ **/</div><div class='ctx'> static ssize_t</div><div class='ctx'> sysfs_ctlreg_write(struct kobject *kobj, struct bin_attribute *bin_attr,</div><div class='ctx'> 		   char *buf, loff_t off, size_t count)</div><div class='hunk'>@@ -1766,6 +2910,23 @@ sysfs_ctlreg_write(struct kobject *kobj, struct bin_attribute *bin_attr,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * sysfs_ctlreg_read: Read method for reading from ctlreg.</div><div class='add'>+ * @kobj: kernel kobject that contains the kernel class device.</div><div class='add'>+ * @bin_attr: kernel attributes passed to us.</div><div class='add'>+ * @buf: if succesful contains the data from the adapter IOREG space.</div><div class='add'>+ * @off: offset into buffer to beginning of data.</div><div class='add'>+ * @count: bytes to transfer.</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ * Accessed via /sys/class/scsi_host/hostxxx/ctlreg.</div><div class='add'>+ * Uses the adapter io control registers to read data into buf.</div><div class='add'>+ *</div><div class='add'>+ * Returns:</div><div class='add'>+ * -ERANGE off and count combo out of range</div><div class='add'>+ * -EINVAL off, count or buff address invalid</div><div class='add'>+ * value of count, buf contents read</div><div class='add'>+ **/</div><div class='ctx'> static ssize_t</div><div class='ctx'> sysfs_ctlreg_read(struct kobject *kobj, struct bin_attribute *bin_attr,</div><div class='ctx'> 		  char *buf, loff_t off, size_t count)</div><div class='hunk'>@@ -1810,7 +2971,10 @@ static struct bin_attribute sysfs_ctlreg_attr = {</div><div class='ctx'> 	.write = sysfs_ctlreg_write,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='add'>+/**</div><div class='add'>+ * sysfs_mbox_idle: frees the sysfs mailbox.</div><div class='add'>+ * @phba: lpfc_hba pointer</div><div class='add'>+ **/</div><div class='ctx'> static void</div><div class='ctx'> sysfs_mbox_idle(struct lpfc_hba *phba)</div><div class='ctx'> {</div><div class='hunk'>@@ -1824,6 +2988,27 @@ sysfs_mbox_idle(struct lpfc_hba *phba)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * sysfs_mbox_write: Write method for writing information via mbox.</div><div class='add'>+ * @kobj: kernel kobject that contains the kernel class device.</div><div class='add'>+ * @bin_attr: kernel attributes passed to us.</div><div class='add'>+ * @buf: contains the data to be written to sysfs mbox.</div><div class='add'>+ * @off: offset into buffer to beginning of data.</div><div class='add'>+ * @count: bytes to transfer.</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ * Accessed via /sys/class/scsi_host/hostxxx/mbox.</div><div class='add'>+ * Uses the sysfs mbox to send buf contents to the adapter.</div><div class='add'>+ *</div><div class='add'>+ * Returns:</div><div class='add'>+ * -ERANGE off and count combo out of range</div><div class='add'>+ * -EINVAL off, count or buff address invalid</div><div class='add'>+ * zero if count is zero</div><div class='add'>+ * -EPERM adapter is offline</div><div class='add'>+ * -ENOMEM failed to allocate memory for the mail box</div><div class='add'>+ * -EAGAIN offset, state or mbox is NULL</div><div class='add'>+ * count number of bytes transferred</div><div class='add'>+ **/</div><div class='ctx'> static ssize_t</div><div class='ctx'> sysfs_mbox_write(struct kobject *kobj, struct bin_attribute *bin_attr,</div><div class='ctx'> 		 char *buf, loff_t off, size_t count)</div><div class='hunk'>@@ -1878,6 +3063,29 @@ sysfs_mbox_write(struct kobject *kobj, struct bin_attribute *bin_attr,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * sysfs_mbox_read: Read method for reading information via mbox.</div><div class='add'>+ * @kobj: kernel kobject that contains the kernel class device.</div><div class='add'>+ * @bin_attr: kernel attributes passed to us.</div><div class='add'>+ * @buf: contains the data to be read from sysfs mbox.</div><div class='add'>+ * @off: offset into buffer to beginning of data.</div><div class='add'>+ * @count: bytes to transfer.</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ * Accessed via /sys/class/scsi_host/hostxxx/mbox.</div><div class='add'>+ * Uses the sysfs mbox to receive data from to the adapter.</div><div class='add'>+ *</div><div class='add'>+ * Returns:</div><div class='add'>+ * -ERANGE off greater than mailbox command size</div><div class='add'>+ * -EINVAL off, count or buff address invalid</div><div class='add'>+ * zero if off and count are zero</div><div class='add'>+ * -EACCES adapter over temp</div><div class='add'>+ * -EPERM garbage can value to catch a multitude of errors</div><div class='add'>+ * -EAGAIN management IO not permitted, state or off error</div><div class='add'>+ * -ETIME mailbox timeout</div><div class='add'>+ * -ENODEV mailbox error</div><div class='add'>+ * count number of bytes transferred</div><div class='add'>+ **/</div><div class='ctx'> static ssize_t</div><div class='ctx'> sysfs_mbox_read(struct kobject *kobj, struct bin_attribute *bin_attr,</div><div class='ctx'> 		char *buf, loff_t off, size_t count)</div><div class='hunk'>@@ -1954,6 +3162,8 @@ sysfs_mbox_read(struct kobject *kobj, struct bin_attribute *bin_attr,</div><div class='ctx'> 		case MBX_DEL_LD_ENTRY:</div><div class='ctx'> 		case MBX_SET_VARIABLE:</div><div class='ctx'> 		case MBX_WRITE_WWN:</div><div class='add'>+		case MBX_PORT_CAPABILITIES:</div><div class='add'>+		case MBX_PORT_IOV_CONTROL:</div><div class='ctx'> 			break;</div><div class='ctx'> 		case MBX_READ_SPARM64:</div><div class='ctx'> 		case MBX_READ_LA:</div><div class='hunk'>@@ -1978,17 +3188,15 @@ sysfs_mbox_read(struct kobject *kobj, struct bin_attribute *bin_attr,</div><div class='ctx'> 		/* If HBA encountered an error attention, allow only DUMP</div><div class='ctx'> 		 * or RESTART mailbox commands until the HBA is restarted.</div><div class='ctx'> 		 */</div><div class='del'>-		if ((phba-&gt;pport-&gt;stopped) &amp;&amp;</div><div class='del'>-			(phba-&gt;sysfs_mbox.mbox-&gt;mb.mbxCommand !=</div><div class='del'>-				MBX_DUMP_MEMORY &amp;&amp;</div><div class='del'>-			 phba-&gt;sysfs_mbox.mbox-&gt;mb.mbxCommand !=</div><div class='del'>-				MBX_RESTART &amp;&amp;</div><div class='del'>-			 phba-&gt;sysfs_mbox.mbox-&gt;mb.mbxCommand !=</div><div class='del'>-				MBX_WRITE_VPARMS)) {</div><div class='del'>-			sysfs_mbox_idle(phba);</div><div class='del'>-			spin_unlock_irq(&amp;phba-&gt;hbalock);</div><div class='del'>-			return -EPERM;</div><div class='del'>-		}</div><div class='add'>+		if (phba-&gt;pport-&gt;stopped &amp;&amp;</div><div class='add'>+		    phba-&gt;sysfs_mbox.mbox-&gt;mb.mbxCommand != MBX_DUMP_MEMORY &amp;&amp;</div><div class='add'>+		    phba-&gt;sysfs_mbox.mbox-&gt;mb.mbxCommand != MBX_RESTART &amp;&amp;</div><div class='add'>+		    phba-&gt;sysfs_mbox.mbox-&gt;mb.mbxCommand != MBX_WRITE_VPARMS &amp;&amp;</div><div class='add'>+		    phba-&gt;sysfs_mbox.mbox-&gt;mb.mbxCommand != MBX_WRITE_WWN)</div><div class='add'>+			lpfc_printf_log(phba, KERN_WARNING, LOG_MBOX,</div><div class='add'>+					"1259 mbox: Issued mailbox cmd "</div><div class='add'>+					"0x%x while in stopped state.\n",</div><div class='add'>+					phba-&gt;sysfs_mbox.mbox-&gt;mb.mbxCommand);</div><div class='ctx'> </div><div class='ctx'> 		phba-&gt;sysfs_mbox.mbox-&gt;vport = vport;</div><div class='ctx'> </div><div class='hunk'>@@ -2059,6 +3267,14 @@ static struct bin_attribute sysfs_mbox_attr = {</div><div class='ctx'> 	.write = sysfs_mbox_write,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_alloc_sysfs_attr: Creates the ctlreg and mbox entries.</div><div class='add'>+ * @vport: address of lpfc vport structure.</div><div class='add'>+ *</div><div class='add'>+ * Return codes:</div><div class='add'>+ * zero on success</div><div class='add'>+ * error return code from sysfs_create_bin_file()</div><div class='add'>+ **/</div><div class='ctx'> int</div><div class='ctx'> lpfc_alloc_sysfs_attr(struct lpfc_vport *vport)</div><div class='ctx'> {</div><div class='hunk'>@@ -2075,18 +3291,30 @@ lpfc_alloc_sysfs_attr(struct lpfc_vport *vport)</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto out_remove_ctlreg_attr;</div><div class='ctx'> </div><div class='add'>+	error = sysfs_create_bin_file(&amp;shost-&gt;shost_dev.kobj,</div><div class='add'>+				      &amp;sysfs_drvr_stat_data_attr);</div><div class='add'>+	if (error)</div><div class='add'>+		goto out_remove_mbox_attr;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='add'>+out_remove_mbox_attr:</div><div class='add'>+	sysfs_remove_bin_file(&amp;shost-&gt;shost_dev.kobj, &amp;sysfs_mbox_attr);</div><div class='ctx'> out_remove_ctlreg_attr:</div><div class='ctx'> 	sysfs_remove_bin_file(&amp;shost-&gt;shost_dev.kobj, &amp;sysfs_ctlreg_attr);</div><div class='ctx'> out:</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_free_sysfs_attr: Removes the ctlreg and mbox entries.</div><div class='add'>+ * @vport: address of lpfc vport structure.</div><div class='add'>+ **/</div><div class='ctx'> void</div><div class='ctx'> lpfc_free_sysfs_attr(struct lpfc_vport *vport)</div><div class='ctx'> {</div><div class='ctx'> 	struct Scsi_Host *shost = lpfc_shost_from_vport(vport);</div><div class='del'>-</div><div class='add'>+	sysfs_remove_bin_file(&amp;shost-&gt;shost_dev.kobj,</div><div class='add'>+		&amp;sysfs_drvr_stat_data_attr);</div><div class='ctx'> 	sysfs_remove_bin_file(&amp;shost-&gt;shost_dev.kobj, &amp;sysfs_mbox_attr);</div><div class='ctx'> 	sysfs_remove_bin_file(&amp;shost-&gt;shost_dev.kobj, &amp;sysfs_ctlreg_attr);</div><div class='ctx'> }</div><div class='hunk'>@@ -2096,6 +3324,10 @@ lpfc_free_sysfs_attr(struct lpfc_vport *vport)</div><div class='ctx'>  * Dynamic FC Host Attributes Support</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_get_host_port_id: Copy the vport DID into the scsi host port id.</div><div class='add'>+ * @shost: kernel scsi host pointer.</div><div class='add'>+ **/</div><div class='ctx'> static void</div><div class='ctx'> lpfc_get_host_port_id(struct Scsi_Host *shost)</div><div class='ctx'> {</div><div class='hunk'>@@ -2105,6 +3337,10 @@ lpfc_get_host_port_id(struct Scsi_Host *shost)</div><div class='ctx'> 	fc_host_port_id(shost) = vport-&gt;fc_myDID;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_get_host_port_type: Set the value of the scsi host port type.</div><div class='add'>+ * @shost: kernel scsi host pointer.</div><div class='add'>+ **/</div><div class='ctx'> static void</div><div class='ctx'> lpfc_get_host_port_type(struct Scsi_Host *shost)</div><div class='ctx'> {</div><div class='hunk'>@@ -2133,6 +3369,10 @@ lpfc_get_host_port_type(struct Scsi_Host *shost)</div><div class='ctx'> 	spin_unlock_irq(shost-&gt;host_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_get_host_port_state: Set the value of the scsi host port state.</div><div class='add'>+ * @shost: kernel scsi host pointer.</div><div class='add'>+ **/</div><div class='ctx'> static void</div><div class='ctx'> lpfc_get_host_port_state(struct Scsi_Host *shost)</div><div class='ctx'> {</div><div class='hunk'>@@ -2167,6 +3407,10 @@ lpfc_get_host_port_state(struct Scsi_Host *shost)</div><div class='ctx'> 	spin_unlock_irq(shost-&gt;host_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_get_host_speed: Set the value of the scsi host speed.</div><div class='add'>+ * @shost: kernel scsi host pointer.</div><div class='add'>+ **/</div><div class='ctx'> static void</div><div class='ctx'> lpfc_get_host_speed(struct Scsi_Host *shost)</div><div class='ctx'> {</div><div class='hunk'>@@ -2199,6 +3443,10 @@ lpfc_get_host_speed(struct Scsi_Host *shost)</div><div class='ctx'> 	spin_unlock_irq(shost-&gt;host_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_get_host_fabric_name: Set the value of the scsi host fabric name.</div><div class='add'>+ * @shost: kernel scsi host pointer.</div><div class='add'>+ **/</div><div class='ctx'> static void</div><div class='ctx'> lpfc_get_host_fabric_name (struct Scsi_Host *shost)</div><div class='ctx'> {</div><div class='hunk'>@@ -2221,6 +3469,18 @@ lpfc_get_host_fabric_name (struct Scsi_Host *shost)</div><div class='ctx'> 	fc_host_fabric_name(shost) = node_name;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_get_stats: Return statistical information about the adapter.</div><div class='add'>+ * @shost: kernel scsi host pointer.</div><div class='add'>+ *</div><div class='add'>+ * Notes:</div><div class='add'>+ * NULL on error for link down, no mbox pool, sli2 active,</div><div class='add'>+ * management not allowed, memory allocation error, or mbox error.</div><div class='add'>+ *</div><div class='add'>+ * Returns:</div><div class='add'>+ * NULL for error</div><div class='add'>+ * address of the adapter host statistics</div><div class='add'>+ **/</div><div class='ctx'> static struct fc_host_statistics *</div><div class='ctx'> lpfc_get_stats(struct Scsi_Host *shost)</div><div class='ctx'> {</div><div class='hunk'>@@ -2334,6 +3594,10 @@ lpfc_get_stats(struct Scsi_Host *shost)</div><div class='ctx'> 	return hs;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_reset_stats: Copy the adapter link stats information.</div><div class='add'>+ * @shost: kernel scsi host pointer.</div><div class='add'>+ **/</div><div class='ctx'> static void</div><div class='ctx'> lpfc_reset_stats(struct Scsi_Host *shost)</div><div class='ctx'> {</div><div class='hunk'>@@ -2411,6 +3675,14 @@ lpfc_reset_stats(struct Scsi_Host *shost)</div><div class='ctx'>  * are no sysfs handlers for link_down_tmo.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_get_node_by_target: Return the nodelist for a target.</div><div class='add'>+ * @starget: kernel scsi target pointer.</div><div class='add'>+ *</div><div class='add'>+ * Returns:</div><div class='add'>+ * address of the node list if found</div><div class='add'>+ * NULL target not found</div><div class='add'>+ **/</div><div class='ctx'> static struct lpfc_nodelist *</div><div class='ctx'> lpfc_get_node_by_target(struct scsi_target *starget)</div><div class='ctx'> {</div><div class='hunk'>@@ -2432,6 +3704,10 @@ lpfc_get_node_by_target(struct scsi_target *starget)</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_get_starget_port_id: Set the target port id to the ndlp DID or -1.</div><div class='add'>+ * @starget: kernel scsi target pointer.</div><div class='add'>+ **/</div><div class='ctx'> static void</div><div class='ctx'> lpfc_get_starget_port_id(struct scsi_target *starget)</div><div class='ctx'> {</div><div class='hunk'>@@ -2440,6 +3716,12 @@ lpfc_get_starget_port_id(struct scsi_target *starget)</div><div class='ctx'> 	fc_starget_port_id(starget) = ndlp ? ndlp-&gt;nlp_DID : -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_get_starget_node_name: Set the target node name.</div><div class='add'>+ * @starget: kernel scsi target pointer.</div><div class='add'>+ *</div><div class='add'>+ * Description: Set the target node name to the ndlp node name wwn or zero.</div><div class='add'>+ **/</div><div class='ctx'> static void</div><div class='ctx'> lpfc_get_starget_node_name(struct scsi_target *starget)</div><div class='ctx'> {</div><div class='hunk'>@@ -2449,6 +3731,12 @@ lpfc_get_starget_node_name(struct scsi_target *starget)</div><div class='ctx'> 		ndlp ? wwn_to_u64(ndlp-&gt;nlp_nodename.u.wwn) : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_get_starget_port_name: Set the target port name.</div><div class='add'>+ * @starget: kernel scsi target pointer.</div><div class='add'>+ *</div><div class='add'>+ * Description:  set the target port name to the ndlp port name wwn or zero.</div><div class='add'>+ **/</div><div class='ctx'> static void</div><div class='ctx'> lpfc_get_starget_port_name(struct scsi_target *starget)</div><div class='ctx'> {</div><div class='hunk'>@@ -2458,6 +3746,15 @@ lpfc_get_starget_port_name(struct scsi_target *starget)</div><div class='ctx'> 		ndlp ? wwn_to_u64(ndlp-&gt;nlp_portname.u.wwn) : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_set_rport_loss_tmo: Set the rport dev loss tmo.</div><div class='add'>+ * @rport: fc rport address.</div><div class='add'>+ * @timeout: new value for dev loss tmo.</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ * If timeout is non zero set the dev_loss_tmo to timeout, else set</div><div class='add'>+ * dev_loss_tmo to one.</div><div class='add'>+ **/</div><div class='ctx'> static void</div><div class='ctx'> lpfc_set_rport_loss_tmo(struct fc_rport *rport, uint32_t timeout)</div><div class='ctx'> {</div><div class='hunk'>@@ -2467,7 +3764,18 @@ lpfc_set_rport_loss_tmo(struct fc_rport *rport, uint32_t timeout)</div><div class='ctx'> 		rport-&gt;dev_loss_tmo = 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='add'>+/**</div><div class='add'>+ * lpfc_rport_show_function: Return rport target information.</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ * Macro that uses field to generate a function with the name lpfc_show_rport_</div><div class='add'>+ *</div><div class='add'>+ * lpfc_show_rport_##field: returns the bytes formatted in buf</div><div class='add'>+ * @cdev: class converted to an fc_rport.</div><div class='add'>+ * @buf: on return contains the target_field or zero.</div><div class='add'>+ *</div><div class='add'>+ * Returns: size of formatted string.</div><div class='add'>+ **/</div><div class='ctx'> #define lpfc_rport_show_function(field, format_string, sz, cast)	\</div><div class='ctx'> static ssize_t								\</div><div class='ctx'> lpfc_show_rport_##field (struct device *dev,				\</div><div class='hunk'>@@ -2602,6 +3910,10 @@ struct fc_function_template lpfc_vport_transport_functions = {</div><div class='ctx'> 	.vport_disable = lpfc_vport_disable,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_get_cfgparam: Used during probe_one to init the adapter structure.</div><div class='add'>+ * @phba: lpfc_hba pointer.</div><div class='add'>+ **/</div><div class='ctx'> void</div><div class='ctx'> lpfc_get_cfgparam(struct lpfc_hba *phba)</div><div class='ctx'> {</div><div class='hunk'>@@ -2637,6 +3949,10 @@ lpfc_get_cfgparam(struct lpfc_hba *phba)</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_get_vport_cfgparam: Used during port create, init the vport structure.</div><div class='add'>+ * @vport: lpfc_vport pointer.</div><div class='add'>+ **/</div><div class='ctx'> void</div><div class='ctx'> lpfc_get_vport_cfgparam(struct lpfc_vport *vport)</div><div class='ctx'> {</div><div class='hunk'>@@ -2648,6 +3964,7 @@ lpfc_get_vport_cfgparam(struct lpfc_vport *vport)</div><div class='ctx'> 	lpfc_restrict_login_init(vport, lpfc_restrict_login);</div><div class='ctx'> 	lpfc_fcp_class_init(vport, lpfc_fcp_class);</div><div class='ctx'> 	lpfc_use_adisc_init(vport, lpfc_use_adisc);</div><div class='add'>+	lpfc_max_scsicmpl_time_init(vport, lpfc_max_scsicmpl_time);</div><div class='ctx'> 	lpfc_fdmi_on_init(vport, lpfc_fdmi_on);</div><div class='ctx'> 	lpfc_discovery_threads_init(vport, lpfc_discovery_threads);</div><div class='ctx'> 	lpfc_max_luns_init(vport, lpfc_max_luns);</div><div class='head'>diff --git a/drivers/scsi/lpfc/lpfc_crtn.h b/drivers/scsi/lpfc/lpfc_crtn.h<br/>index 1b8245213b83..044ef4057d28 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/lpfc/lpfc_crtn.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/lpfc/lpfc_crtn.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/lpfc/lpfc_crtn.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/lpfc/lpfc_crtn.h</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'>  * included with this package.                                     *</div><div class='ctx'>  *******************************************************************/</div><div class='ctx'> </div><div class='del'>-typedef int (*node_filter)(struct lpfc_nodelist *ndlp, void *param);</div><div class='add'>+typedef int (*node_filter)(struct lpfc_nodelist *, void *);</div><div class='ctx'> </div><div class='ctx'> struct fc_rport;</div><div class='ctx'> void lpfc_dump_mem(struct lpfc_hba *, LPFC_MBOXQ_t *, uint16_t);</div><div class='hunk'>@@ -26,11 +26,11 @@ void lpfc_read_nv(struct lpfc_hba *, LPFC_MBOXQ_t *);</div><div class='ctx'> void lpfc_config_async(struct lpfc_hba *, LPFC_MBOXQ_t *, uint32_t);</div><div class='ctx'> </div><div class='ctx'> void lpfc_heart_beat(struct lpfc_hba *, LPFC_MBOXQ_t *);</div><div class='del'>-int lpfc_read_la(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb,</div><div class='del'>-		 struct lpfc_dmabuf *mp);</div><div class='add'>+int lpfc_read_la(struct lpfc_hba *, LPFC_MBOXQ_t *, struct lpfc_dmabuf *);</div><div class='ctx'> void lpfc_clear_la(struct lpfc_hba *, LPFC_MBOXQ_t *);</div><div class='del'>-void lpfc_issue_clear_la(struct lpfc_hba *phba, struct lpfc_vport *vport);</div><div class='add'>+void lpfc_issue_clear_la(struct lpfc_hba *, struct lpfc_vport *);</div><div class='ctx'> void lpfc_config_link(struct lpfc_hba *, LPFC_MBOXQ_t *);</div><div class='add'>+int lpfc_config_msi(struct lpfc_hba *, LPFC_MBOXQ_t *);</div><div class='ctx'> int lpfc_read_sparam(struct lpfc_hba *, LPFC_MBOXQ_t *, int);</div><div class='ctx'> void lpfc_read_config(struct lpfc_hba *, LPFC_MBOXQ_t *);</div><div class='ctx'> void lpfc_read_lnk_stat(struct lpfc_hba *, LPFC_MBOXQ_t *);</div><div class='hunk'>@@ -43,7 +43,7 @@ void lpfc_unreg_vpi(struct lpfc_hba *, uint16_t, LPFC_MBOXQ_t *);</div><div class='ctx'> void lpfc_init_link(struct lpfc_hba *, LPFC_MBOXQ_t *, uint32_t, uint32_t);</div><div class='ctx'> </div><div class='ctx'> struct lpfc_vport *lpfc_find_vport_by_did(struct lpfc_hba *, uint32_t);</div><div class='del'>-void lpfc_cleanup_rpis(struct lpfc_vport *vport, int remove);</div><div class='add'>+void lpfc_cleanup_rpis(struct lpfc_vport *, int);</div><div class='ctx'> int lpfc_linkdown(struct lpfc_hba *);</div><div class='ctx'> void lpfc_port_link_failure(struct lpfc_vport *);</div><div class='ctx'> void lpfc_mbx_cmpl_read_la(struct lpfc_hba *, LPFC_MBOXQ_t *);</div><div class='hunk'>@@ -135,7 +135,7 @@ void lpfc_ct_unsol_event(struct lpfc_hba *, struct lpfc_sli_ring *,</div><div class='ctx'> int lpfc_ns_cmd(struct lpfc_vport *, int, uint8_t, uint32_t);</div><div class='ctx'> int lpfc_fdmi_cmd(struct lpfc_vport *, struct lpfc_nodelist *, int);</div><div class='ctx'> void lpfc_fdmi_tmo(unsigned long);</div><div class='del'>-void lpfc_fdmi_timeout_handler(struct lpfc_vport *vport);</div><div class='add'>+void lpfc_fdmi_timeout_handler(struct lpfc_vport *);</div><div class='ctx'> </div><div class='ctx'> int lpfc_config_port_prep(struct lpfc_hba *);</div><div class='ctx'> int lpfc_config_port_post(struct lpfc_hba *);</div><div class='hunk'>@@ -155,6 +155,8 @@ int lpfc_sli_queue_setup(struct lpfc_hba *);</div><div class='ctx'> void lpfc_handle_eratt(struct lpfc_hba *);</div><div class='ctx'> void lpfc_handle_latt(struct lpfc_hba *);</div><div class='ctx'> irqreturn_t lpfc_intr_handler(int, void *);</div><div class='add'>+irqreturn_t lpfc_sp_intr_handler(int, void *);</div><div class='add'>+irqreturn_t lpfc_fp_intr_handler(int, void *);</div><div class='ctx'> </div><div class='ctx'> void lpfc_read_rev(struct lpfc_hba *, LPFC_MBOXQ_t *);</div><div class='ctx'> void lpfc_config_ring(struct lpfc_hba *, int, LPFC_MBOXQ_t *);</div><div class='hunk'>@@ -175,11 +177,12 @@ void lpfc_mem_free(struct lpfc_hba *);</div><div class='ctx'> void lpfc_stop_vport_timers(struct lpfc_vport *);</div><div class='ctx'> </div><div class='ctx'> void lpfc_poll_timeout(unsigned long ptr);</div><div class='del'>-void lpfc_poll_start_timer(struct lpfc_hba * phba);</div><div class='del'>-void lpfc_sli_poll_fcp_ring(struct lpfc_hba * hba);</div><div class='add'>+void lpfc_poll_start_timer(struct lpfc_hba *);</div><div class='add'>+void lpfc_poll_eratt(unsigned long);</div><div class='add'>+void lpfc_sli_poll_fcp_ring(struct lpfc_hba *);</div><div class='ctx'> struct lpfc_iocbq * lpfc_sli_get_iocbq(struct lpfc_hba *);</div><div class='del'>-void lpfc_sli_release_iocbq(struct lpfc_hba * phba, struct lpfc_iocbq * iocb);</div><div class='del'>-uint16_t lpfc_sli_next_iotag(struct lpfc_hba * phba, struct lpfc_iocbq * iocb);</div><div class='add'>+void lpfc_sli_release_iocbq(struct lpfc_hba *, struct lpfc_iocbq *);</div><div class='add'>+uint16_t lpfc_sli_next_iotag(struct lpfc_hba *, struct lpfc_iocbq *);</div><div class='ctx'> </div><div class='ctx'> void lpfc_reset_barrier(struct lpfc_hba * phba);</div><div class='ctx'> int lpfc_sli_brdready(struct lpfc_hba *, uint32_t);</div><div class='hunk'>@@ -187,11 +190,13 @@ int lpfc_sli_brdkill(struct lpfc_hba *);</div><div class='ctx'> int lpfc_sli_brdreset(struct lpfc_hba *);</div><div class='ctx'> int lpfc_sli_brdrestart(struct lpfc_hba *);</div><div class='ctx'> int lpfc_sli_hba_setup(struct lpfc_hba *);</div><div class='add'>+int lpfc_sli_config_port(struct lpfc_hba *, int);</div><div class='ctx'> int lpfc_sli_host_down(struct lpfc_vport *);</div><div class='ctx'> int lpfc_sli_hba_down(struct lpfc_hba *);</div><div class='ctx'> int lpfc_sli_issue_mbox(struct lpfc_hba *, LPFC_MBOXQ_t *, uint32_t);</div><div class='ctx'> int lpfc_sli_handle_mb_event(struct lpfc_hba *);</div><div class='ctx'> int lpfc_sli_flush_mbox_queue(struct lpfc_hba *);</div><div class='add'>+int lpfc_sli_check_eratt(struct lpfc_hba *);</div><div class='ctx'> int lpfc_sli_handle_slow_ring_event(struct lpfc_hba *,</div><div class='ctx'> 				    struct lpfc_sli_ring *, uint32_t);</div><div class='ctx'> void lpfc_sli_def_mbox_cmpl(struct lpfc_hba *, LPFC_MBOXQ_t *);</div><div class='hunk'>@@ -199,6 +204,7 @@ int lpfc_sli_issue_iocb(struct lpfc_hba *, struct lpfc_sli_ring *,</div><div class='ctx'> 			struct lpfc_iocbq *, uint32_t);</div><div class='ctx'> void lpfc_sli_pcimem_bcopy(void *, void *, uint32_t);</div><div class='ctx'> void lpfc_sli_abort_iocb_ring(struct lpfc_hba *, struct lpfc_sli_ring *);</div><div class='add'>+void lpfc_sli_flush_fcp_rings(struct lpfc_hba *);</div><div class='ctx'> int lpfc_sli_ringpostbuf_put(struct lpfc_hba *, struct lpfc_sli_ring *,</div><div class='ctx'> 			     struct lpfc_dmabuf *);</div><div class='ctx'> struct lpfc_dmabuf *lpfc_sli_ringpostbuf_get(struct lpfc_hba *,</div><div class='hunk'>@@ -226,17 +232,13 @@ struct lpfc_nodelist *lpfc_findnode_did(struct lpfc_vport *, uint32_t);</div><div class='ctx'> struct lpfc_nodelist *lpfc_findnode_wwpn(struct lpfc_vport *,</div><div class='ctx'> 					 struct lpfc_name *);</div><div class='ctx'> </div><div class='del'>-int lpfc_sli_issue_mbox_wait(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmboxq,</div><div class='del'>-			     uint32_t timeout);</div><div class='add'>+int lpfc_sli_issue_mbox_wait(struct lpfc_hba *, LPFC_MBOXQ_t *, uint32_t);</div><div class='ctx'> </div><div class='del'>-int lpfc_sli_issue_iocb_wait(struct lpfc_hba * phba,</div><div class='del'>-			     struct lpfc_sli_ring * pring,</div><div class='del'>-			     struct lpfc_iocbq * piocb,</div><div class='del'>-			     struct lpfc_iocbq * prspiocbq,</div><div class='del'>-			     uint32_t timeout);</div><div class='del'>-void lpfc_sli_abort_fcp_cmpl(struct lpfc_hba * phba,</div><div class='del'>-			     struct lpfc_iocbq * cmdiocb,</div><div class='del'>-			     struct lpfc_iocbq * rspiocb);</div><div class='add'>+int lpfc_sli_issue_iocb_wait(struct lpfc_hba *, struct lpfc_sli_ring *,</div><div class='add'>+			     struct lpfc_iocbq *, struct lpfc_iocbq *,</div><div class='add'>+			     uint32_t);</div><div class='add'>+void lpfc_sli_abort_fcp_cmpl(struct lpfc_hba *, struct lpfc_iocbq *,</div><div class='add'>+			     struct lpfc_iocbq *);</div><div class='ctx'> </div><div class='ctx'> void lpfc_sli_free_hbq(struct lpfc_hba *, struct hbq_dmabuf *);</div><div class='ctx'> </div><div class='hunk'>@@ -269,7 +271,7 @@ void lpfc_dev_loss_tmo_callbk(struct fc_rport *rport);</div><div class='ctx'> </div><div class='ctx'> struct lpfc_vport *lpfc_create_port(struct lpfc_hba *, int, struct device *);</div><div class='ctx'> int  lpfc_vport_disable(struct fc_vport *fc_vport, bool disable);</div><div class='del'>-void lpfc_mbx_unreg_vpi(struct lpfc_vport *);</div><div class='add'>+int lpfc_mbx_unreg_vpi(struct lpfc_vport *);</div><div class='ctx'> void destroy_port(struct lpfc_vport *);</div><div class='ctx'> int lpfc_get_instance(void);</div><div class='ctx'> void lpfc_host_attrib_init(struct Scsi_Host *);</div><div class='hunk'>@@ -290,6 +292,13 @@ void lpfc_unblock_fabric_iocbs(struct lpfc_hba *);</div><div class='ctx'> void lpfc_adjust_queue_depth(struct lpfc_hba *);</div><div class='ctx'> void lpfc_ramp_down_queue_handler(struct lpfc_hba *);</div><div class='ctx'> void lpfc_ramp_up_queue_handler(struct lpfc_hba *);</div><div class='add'>+void lpfc_scsi_dev_block(struct lpfc_hba *);</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+lpfc_send_els_failure_event(struct lpfc_hba *, struct lpfc_iocbq *,</div><div class='add'>+				struct lpfc_iocbq *);</div><div class='add'>+struct lpfc_fast_path_event *lpfc_alloc_fast_evt(struct lpfc_hba *);</div><div class='add'>+void lpfc_free_fast_evt(struct lpfc_hba *, struct lpfc_fast_path_event *);</div><div class='ctx'> </div><div class='ctx'> #define ScsiResult(host_code, scsi_code) (((host_code) &lt;&lt; 16) | scsi_code)</div><div class='ctx'> #define HBA_EVENT_RSCN                   5</div><div class='head'>diff --git a/drivers/scsi/lpfc/lpfc_ct.c b/drivers/scsi/lpfc/lpfc_ct.c<br/>index 7fc74cf5823b..26dae8bae2d1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/lpfc/lpfc_ct.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/lpfc/lpfc_ct.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/lpfc/lpfc_ct.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/lpfc/lpfc_ct.c</a></div><div class='hunk'>@@ -34,6 +34,7 @@</div><div class='ctx'> </div><div class='ctx'> #include "lpfc_hw.h"</div><div class='ctx'> #include "lpfc_sli.h"</div><div class='add'>+#include "lpfc_nl.h"</div><div class='ctx'> #include "lpfc_disc.h"</div><div class='ctx'> #include "lpfc_scsi.h"</div><div class='ctx'> #include "lpfc.h"</div><div class='hunk'>@@ -134,25 +135,24 @@ lpfc_ct_unsol_event(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,</div><div class='ctx'> 		}</div><div class='ctx'> 		list_del(&amp;head);</div><div class='ctx'> 	} else {</div><div class='del'>-		struct lpfc_iocbq  *next;</div><div class='del'>-</div><div class='del'>-		list_for_each_entry_safe(iocbq, next, &amp;piocbq-&gt;list, list) {</div><div class='add'>+		INIT_LIST_HEAD(&amp;head);</div><div class='add'>+		list_add_tail(&amp;head, &amp;piocbq-&gt;list);</div><div class='add'>+		list_for_each_entry(iocbq, &amp;head, list) {</div><div class='ctx'> 			icmd = &amp;iocbq-&gt;iocb;</div><div class='ctx'> 			if (icmd-&gt;ulpBdeCount == 0)</div><div class='del'>-				lpfc_ct_unsol_buffer(phba, piocbq, NULL, 0);</div><div class='add'>+				lpfc_ct_unsol_buffer(phba, iocbq, NULL, 0);</div><div class='ctx'> 			for (i = 0; i &lt; icmd-&gt;ulpBdeCount; i++) {</div><div class='ctx'> 				paddr = getPaddr(icmd-&gt;un.cont64[i].addrHigh,</div><div class='ctx'> 						 icmd-&gt;un.cont64[i].addrLow);</div><div class='ctx'> 				mp = lpfc_sli_ringpostbuf_get(phba, pring,</div><div class='ctx'> 							      paddr);</div><div class='ctx'> 				size = icmd-&gt;un.cont64[i].tus.f.bdeSize;</div><div class='del'>-				lpfc_ct_unsol_buffer(phba, piocbq, mp, size);</div><div class='add'>+				lpfc_ct_unsol_buffer(phba, iocbq, mp, size);</div><div class='ctx'> 				lpfc_in_buf_free(phba, mp);</div><div class='ctx'> 			}</div><div class='del'>-			list_del(&amp;iocbq-&gt;list);</div><div class='del'>-			lpfc_sli_release_iocbq(phba, iocbq);</div><div class='ctx'> 			lpfc_post_buffer(phba, pring, i);</div><div class='ctx'> 		}</div><div class='add'>+		list_del(&amp;head);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -212,7 +212,7 @@ lpfc_alloc_ct_rsp(struct lpfc_hba *phba, int cmdcode, struct ulp_bde64 *bpl,</div><div class='ctx'> 		else</div><div class='ctx'> 			list_add_tail(&amp;mp-&gt;list, &amp;mlist-&gt;list);</div><div class='ctx'> </div><div class='del'>-		bpl-&gt;tus.f.bdeFlags = BUFF_USE_RCV;</div><div class='add'>+		bpl-&gt;tus.f.bdeFlags = BUFF_TYPE_BDE_64I;</div><div class='ctx'> 		/* build buffer ptr list for IOCB */</div><div class='ctx'> 		bpl-&gt;addrLow = le32_to_cpu(putPaddrLow(mp-&gt;phys) );</div><div class='ctx'> 		bpl-&gt;addrHigh = le32_to_cpu(putPaddrHigh(mp-&gt;phys) );</div><div class='hunk'>@@ -283,7 +283,7 @@ lpfc_gen_req(struct lpfc_vport *vport, struct lpfc_dmabuf *bmp,</div><div class='ctx'> 	icmd-&gt;un.genreq64.bdl.ulpIoTag32 = 0;</div><div class='ctx'> 	icmd-&gt;un.genreq64.bdl.addrHigh = putPaddrHigh(bmp-&gt;phys);</div><div class='ctx'> 	icmd-&gt;un.genreq64.bdl.addrLow = putPaddrLow(bmp-&gt;phys);</div><div class='del'>-	icmd-&gt;un.genreq64.bdl.bdeFlags = BUFF_TYPE_BDL;</div><div class='add'>+	icmd-&gt;un.genreq64.bdl.bdeFlags = BUFF_TYPE_BLP_64;</div><div class='ctx'> 	icmd-&gt;un.genreq64.bdl.bdeSize = (num_entry * sizeof (struct ulp_bde64));</div><div class='ctx'> </div><div class='ctx'> 	if (usr_flg)</div><div class='hunk'>@@ -861,7 +861,7 @@ lpfc_cmpl_ct(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,</div><div class='ctx'> </div><div class='ctx'> 		retry++;</div><div class='ctx'> 		lpfc_printf_vlog(vport, KERN_INFO, LOG_DISCOVERY,</div><div class='del'>-				 "0216 Retrying NS cmd %x\n", cmdcode);</div><div class='add'>+				 "0250 Retrying NS cmd %x\n", cmdcode);</div><div class='ctx'> 		rc = lpfc_ns_cmd(vport, cmdcode, retry, 0);</div><div class='ctx'> 		if (rc == 0)</div><div class='ctx'> 			goto out;</div><div class='head'>diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c<br/>index 094b47e94b29..771920bdde44 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/lpfc/lpfc_debugfs.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/lpfc/lpfc_debugfs.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/lpfc/lpfc_debugfs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/lpfc/lpfc_debugfs.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*******************************************************************</div><div class='ctx'>  * This file is part of the Emulex Linux Device Driver for         *</div><div class='ctx'>  * Fibre Channel Host Bus Adapters.                                *</div><div class='del'>- * Copyright (C) 2007 Emulex.  All rights reserved.                *</div><div class='add'>+ * Copyright (C) 2007-2008 Emulex.  All rights reserved.           *</div><div class='ctx'>  * EMULEX and SLI are trademarks of Emulex.                        *</div><div class='ctx'>  * www.emulex.com                                                  *</div><div class='ctx'>  *                                                                 *</div><div class='hunk'>@@ -35,6 +35,7 @@</div><div class='ctx'> </div><div class='ctx'> #include "lpfc_hw.h"</div><div class='ctx'> #include "lpfc_sli.h"</div><div class='add'>+#include "lpfc_nl.h"</div><div class='ctx'> #include "lpfc_disc.h"</div><div class='ctx'> #include "lpfc_scsi.h"</div><div class='ctx'> #include "lpfc.h"</div><div class='hunk'>@@ -46,13 +47,14 @@</div><div class='ctx'> #include "lpfc_debugfs.h"</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_LPFC_DEBUG_FS</div><div class='del'>-/* debugfs interface</div><div class='add'>+/**</div><div class='add'>+ * debugfs interface</div><div class='ctx'>  *</div><div class='ctx'>  * To access this interface the user should:</div><div class='ctx'>  * # mkdir /debug</div><div class='ctx'>  * # mount -t debugfs none /debug</div><div class='ctx'>  *</div><div class='del'>- * The lpfc debugfs directory hierachy is:</div><div class='add'>+ * The lpfc debugfs directory hierarchy is:</div><div class='ctx'>  * lpfc/lpfcX/vportY</div><div class='ctx'>  * where X is the lpfc hba unique_id</div><div class='ctx'>  * where Y is the vport VPI on that hba</div><div class='hunk'>@@ -61,14 +63,21 @@</div><div class='ctx'>  * discovery_trace</div><div class='ctx'>  * This is an ACSII readable file that contains a trace of the last</div><div class='ctx'>  * lpfc_debugfs_max_disc_trc events that happened on a specific vport.</div><div class='del'>- * See lpfc_debugfs.h for different categories of</div><div class='del'>- * discovery events. To enable the discovery trace, the following</div><div class='del'>- * module parameters must be set:</div><div class='add'>+ * See lpfc_debugfs.h for different categories of  discovery events.</div><div class='add'>+ * To enable the discovery trace, the following module parameters must be set:</div><div class='ctx'>  * lpfc_debugfs_enable=1         Turns on lpfc debugfs filesystem support</div><div class='ctx'>  * lpfc_debugfs_max_disc_trc=X   Where X is the event trace depth for</div><div class='ctx'>  *                               EACH vport. X MUST also be a power of 2.</div><div class='ctx'>  * lpfc_debugfs_mask_disc_trc=Y  Where Y is an event mask as defined in</div><div class='ctx'>  *                               lpfc_debugfs.h .</div><div class='add'>+ *</div><div class='add'>+ * slow_ring_trace</div><div class='add'>+ * This is an ACSII readable file that contains a trace of the last</div><div class='add'>+ * lpfc_debugfs_max_slow_ring_trc events that happened on a specific HBA.</div><div class='add'>+ * To enable the slow ring trace, the following module parameters must be set:</div><div class='add'>+ * lpfc_debugfs_enable=1         Turns on lpfc debugfs filesystem support</div><div class='add'>+ * lpfc_debugfs_max_slow_ring_trc=X   Where X is the event trace depth for</div><div class='add'>+ *                               the HBA. X MUST also be a power of 2.</div><div class='ctx'>  */</div><div class='ctx'> static int lpfc_debugfs_enable = 1;</div><div class='ctx'> module_param(lpfc_debugfs_enable, int, 0);</div><div class='hunk'>@@ -117,6 +126,25 @@ struct lpfc_debug {</div><div class='ctx'> static atomic_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);</div><div class='ctx'> static unsigned long lpfc_debugfs_start_time = 0L;</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_debugfs_disc_trc_data - Dump discovery logging to a buffer.</div><div class='add'>+ * @vport: The vport to gather the log info from.</div><div class='add'>+ * @buf: The buffer to dump log into.</div><div class='add'>+ * @size: The maximum amount of data to process.</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ * This routine gathers the lpfc discovery debugfs data from the @vport and</div><div class='add'>+ * dumps it to @buf up to @size number of bytes. It will start at the next entry</div><div class='add'>+ * in the log and process the log until the end of the buffer. Then it will</div><div class='add'>+ * gather from the beginning of the log and process until the current entry.</div><div class='add'>+ *</div><div class='add'>+ * Notes:</div><div class='add'>+ * Discovery logging will be disabled while while this routine dumps the log.</div><div class='add'>+ *</div><div class='add'>+ * Return Value:</div><div class='add'>+ * This routine returns the amount of bytes that were dumped into @buf and will</div><div class='add'>+ * not exceed @size.</div><div class='add'>+ **/</div><div class='ctx'> static int</div><div class='ctx'> lpfc_debugfs_disc_trc_data(struct lpfc_vport *vport, char *buf, int size)</div><div class='ctx'> {</div><div class='hunk'>@@ -125,7 +153,6 @@ lpfc_debugfs_disc_trc_data(struct lpfc_vport *vport, char *buf, int size)</div><div class='ctx'> 	struct lpfc_debugfs_trc *dtp;</div><div class='ctx'> 	char buffer[LPFC_DEBUG_TRC_ENTRY_SIZE];</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> 	enable = lpfc_debugfs_enable;</div><div class='ctx'> 	lpfc_debugfs_enable = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -159,6 +186,25 @@ lpfc_debugfs_disc_trc_data(struct lpfc_vport *vport, char *buf, int size)</div><div class='ctx'> 	return len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_debugfs_slow_ring_trc_data - Dump slow ring logging to a buffer.</div><div class='add'>+ * @phba: The HBA to gather the log info from.</div><div class='add'>+ * @buf: The buffer to dump log into.</div><div class='add'>+ * @size: The maximum amount of data to process.</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ * This routine gathers the lpfc slow ring debugfs data from the @phba and</div><div class='add'>+ * dumps it to @buf up to @size number of bytes. It will start at the next entry</div><div class='add'>+ * in the log and process the log until the end of the buffer. Then it will</div><div class='add'>+ * gather from the beginning of the log and process until the current entry.</div><div class='add'>+ *</div><div class='add'>+ * Notes:</div><div class='add'>+ * Slow ring logging will be disabled while while this routine dumps the log.</div><div class='add'>+ *</div><div class='add'>+ * Return Value:</div><div class='add'>+ * This routine returns the amount of bytes that were dumped into @buf and will</div><div class='add'>+ * not exceed @size.</div><div class='add'>+ **/</div><div class='ctx'> static int</div><div class='ctx'> lpfc_debugfs_slow_ring_trc_data(struct lpfc_hba *phba, char *buf, int size)</div><div class='ctx'> {</div><div class='hunk'>@@ -203,6 +249,25 @@ lpfc_debugfs_slow_ring_trc_data(struct lpfc_hba *phba, char *buf, int size)</div><div class='ctx'> </div><div class='ctx'> static int lpfc_debugfs_last_hbq = -1;</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_debugfs_hbqinfo_data - Dump host buffer queue info to a buffer.</div><div class='add'>+ * @phba: The HBA to gather host buffer info from.</div><div class='add'>+ * @buf: The buffer to dump log into.</div><div class='add'>+ * @size: The maximum amount of data to process.</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ * This routine dumps the host buffer queue info from the @phba to @buf up to</div><div class='add'>+ * @size number of bytes. A header that describes the current hbq state will be</div><div class='add'>+ * dumped to @buf first and then info on each hbq entry will be dumped to @buf</div><div class='add'>+ * until @size bytes have been dumped or all the hbq info has been dumped.</div><div class='add'>+ *</div><div class='add'>+ * Notes:</div><div class='add'>+ * This routine will rotate through each configured HBQ each time called.</div><div class='add'>+ *</div><div class='add'>+ * Return Value:</div><div class='add'>+ * This routine returns the amount of bytes that were dumped into @buf and will</div><div class='add'>+ * not exceed @size.</div><div class='add'>+ **/</div><div class='ctx'> static int</div><div class='ctx'> lpfc_debugfs_hbqinfo_data(struct lpfc_hba *phba, char *buf, int size)</div><div class='ctx'> {</div><div class='hunk'>@@ -303,6 +368,24 @@ skipit:</div><div class='ctx'> </div><div class='ctx'> static int lpfc_debugfs_last_hba_slim_off;</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_debugfs_dumpHBASlim_data - Dump HBA SLIM info to a buffer.</div><div class='add'>+ * @phba: The HBA to gather SLIM info from.</div><div class='add'>+ * @buf: The buffer to dump log into.</div><div class='add'>+ * @size: The maximum amount of data to process.</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ * This routine dumps the current contents of HBA SLIM for the HBA associated</div><div class='add'>+ * with @phba to @buf up to @size bytes of data. This is the raw HBA SLIM data.</div><div class='add'>+ *</div><div class='add'>+ * Notes:</div><div class='add'>+ * This routine will only dump up to 1024 bytes of data each time called and</div><div class='add'>+ * should be called multiple times to dump the entire HBA SLIM.</div><div class='add'>+ *</div><div class='add'>+ * Return Value:</div><div class='add'>+ * This routine returns the amount of bytes that were dumped into @buf and will</div><div class='add'>+ * not exceed @size.</div><div class='add'>+ **/</div><div class='ctx'> static int</div><div class='ctx'> lpfc_debugfs_dumpHBASlim_data(struct lpfc_hba *phba, char *buf, int size)</div><div class='ctx'> {</div><div class='hunk'>@@ -342,6 +425,21 @@ lpfc_debugfs_dumpHBASlim_data(struct lpfc_hba *phba, char *buf, int size)</div><div class='ctx'> 	return len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_debugfs_dumpHostSlim_data - Dump host SLIM info to a buffer.</div><div class='add'>+ * @phba: The HBA to gather Host SLIM info from.</div><div class='add'>+ * @buf: The buffer to dump log into.</div><div class='add'>+ * @size: The maximum amount of data to process.</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ * This routine dumps the current contents of host SLIM for the host associated</div><div class='add'>+ * with @phba to @buf up to @size bytes of data. The dump will contain the</div><div class='add'>+ * Mailbox, PCB, Rings, and Registers that are located in host memory.</div><div class='add'>+ *</div><div class='add'>+ * Return Value:</div><div class='add'>+ * This routine returns the amount of bytes that were dumped into @buf and will</div><div class='add'>+ * not exceed @size.</div><div class='add'>+ **/</div><div class='ctx'> static int</div><div class='ctx'> lpfc_debugfs_dumpHostSlim_data(struct lpfc_hba *phba, char *buf, int size)</div><div class='ctx'> {</div><div class='hunk'>@@ -357,7 +455,7 @@ lpfc_debugfs_dumpHostSlim_data(struct lpfc_hba *phba, char *buf, int size)</div><div class='ctx'> 	spin_lock_irq(&amp;phba-&gt;hbalock);</div><div class='ctx'> </div><div class='ctx'> 	len +=  snprintf(buf+len, size-len, "SLIM Mailbox\n");</div><div class='del'>-	ptr = (uint32_t *)phba-&gt;slim2p;</div><div class='add'>+	ptr = (uint32_t *)phba-&gt;slim2p.virt;</div><div class='ctx'> 	i = sizeof(MAILBOX_t);</div><div class='ctx'> 	while (i &gt; 0) {</div><div class='ctx'> 		len +=  snprintf(buf+len, size-len,</div><div class='hunk'>@@ -370,7 +468,7 @@ lpfc_debugfs_dumpHostSlim_data(struct lpfc_hba *phba, char *buf, int size)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	len +=  snprintf(buf+len, size-len, "SLIM PCB\n");</div><div class='del'>-	ptr = (uint32_t *)&amp;phba-&gt;slim2p-&gt;pcb;</div><div class='add'>+	ptr = (uint32_t *)phba-&gt;pcb;</div><div class='ctx'> 	i = sizeof(PCB_t);</div><div class='ctx'> 	while (i &gt; 0) {</div><div class='ctx'> 		len +=  snprintf(buf+len, size-len,</div><div class='hunk'>@@ -382,44 +480,16 @@ lpfc_debugfs_dumpHostSlim_data(struct lpfc_hba *phba, char *buf, int size)</div><div class='ctx'> 		off += (8 * sizeof(uint32_t));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pgpp = (struct lpfc_pgp *)&amp;phba-&gt;slim2p-&gt;mbx.us.s3_pgp.port;</div><div class='del'>-	pring = &amp;psli-&gt;ring[0];</div><div class='del'>-	len +=  snprintf(buf+len, size-len,</div><div class='del'>-		"Ring 0: CMD GetInx:%d (Max:%d Next:%d Local:%d flg:x%x)  "</div><div class='del'>-		"RSP PutInx:%d Max:%d\n",</div><div class='del'>-		pgpp-&gt;cmdGetInx, pring-&gt;numCiocb,</div><div class='del'>-		pring-&gt;next_cmdidx, pring-&gt;local_getidx, pring-&gt;flag,</div><div class='del'>-		pgpp-&gt;rspPutInx, pring-&gt;numRiocb);</div><div class='del'>-	pgpp++;</div><div class='del'>-</div><div class='del'>-	pring = &amp;psli-&gt;ring[1];</div><div class='del'>-	len +=  snprintf(buf+len, size-len,</div><div class='del'>-		"Ring 1: CMD GetInx:%d (Max:%d Next:%d Local:%d flg:x%x)  "</div><div class='del'>-		"RSP PutInx:%d Max:%d\n",</div><div class='del'>-		pgpp-&gt;cmdGetInx, pring-&gt;numCiocb,</div><div class='del'>-		pring-&gt;next_cmdidx, pring-&gt;local_getidx, pring-&gt;flag,</div><div class='del'>-		pgpp-&gt;rspPutInx, pring-&gt;numRiocb);</div><div class='del'>-	pgpp++;</div><div class='del'>-</div><div class='del'>-	pring = &amp;psli-&gt;ring[2];</div><div class='del'>-	len +=  snprintf(buf+len, size-len,</div><div class='del'>-		"Ring 2: CMD GetInx:%d (Max:%d Next:%d Local:%d flg:x%x)  "</div><div class='del'>-		"RSP PutInx:%d Max:%d\n",</div><div class='del'>-		pgpp-&gt;cmdGetInx, pring-&gt;numCiocb,</div><div class='del'>-		pring-&gt;next_cmdidx, pring-&gt;local_getidx, pring-&gt;flag,</div><div class='del'>-		pgpp-&gt;rspPutInx, pring-&gt;numRiocb);</div><div class='del'>-	pgpp++;</div><div class='del'>-</div><div class='del'>-	pring = &amp;psli-&gt;ring[3];</div><div class='del'>-	len +=  snprintf(buf+len, size-len,</div><div class='del'>-		"Ring 3: CMD GetInx:%d (Max:%d Next:%d Local:%d flg:x%x)  "</div><div class='del'>-		"RSP PutInx:%d Max:%d\n",</div><div class='del'>-		pgpp-&gt;cmdGetInx, pring-&gt;numCiocb,</div><div class='del'>-		pring-&gt;next_cmdidx, pring-&gt;local_getidx, pring-&gt;flag,</div><div class='del'>-		pgpp-&gt;rspPutInx, pring-&gt;numRiocb);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	ptr = (uint32_t *)&amp;phba-&gt;slim2p-&gt;mbx.us.s3_pgp.hbq_get;</div><div class='add'>+	for (i = 0; i &lt; 4; i++) {</div><div class='add'>+		pgpp = &amp;phba-&gt;port_gp[i];</div><div class='add'>+		pring = &amp;psli-&gt;ring[i];</div><div class='add'>+		len +=  snprintf(buf+len, size-len,</div><div class='add'>+				 "Ring %d: CMD GetInx:%d (Max:%d Next:%d "</div><div class='add'>+				 "Local:%d flg:x%x)  RSP PutInx:%d Max:%d\n",</div><div class='add'>+				 i, pgpp-&gt;cmdGetInx, pring-&gt;numCiocb,</div><div class='add'>+				 pring-&gt;next_cmdidx, pring-&gt;local_getidx,</div><div class='add'>+				 pring-&gt;flag, pgpp-&gt;rspPutInx, pring-&gt;numRiocb);</div><div class='add'>+	}</div><div class='ctx'> 	word0 = readl(phba-&gt;HAregaddr);</div><div class='ctx'> 	word1 = readl(phba-&gt;CAregaddr);</div><div class='ctx'> 	word2 = readl(phba-&gt;HSregaddr);</div><div class='hunk'>@@ -430,6 +500,21 @@ lpfc_debugfs_dumpHostSlim_data(struct lpfc_hba *phba, char *buf, int size)</div><div class='ctx'> 	return len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_debugfs_nodelist_data - Dump target node list to a buffer.</div><div class='add'>+ * @vport: The vport to gather target node info from.</div><div class='add'>+ * @buf: The buffer to dump log into.</div><div class='add'>+ * @size: The maximum amount of data to process.</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ * This routine dumps the current target node list associated with @vport to</div><div class='add'>+ * @buf up to @size bytes of data. Each node entry in the dump will contain a</div><div class='add'>+ * node state, DID, WWPN, WWNN, RPI, flags, type, and other useful fields.</div><div class='add'>+ *</div><div class='add'>+ * Return Value:</div><div class='add'>+ * This routine returns the amount of bytes that were dumped into @buf and will</div><div class='add'>+ * not exceed @size.</div><div class='add'>+ **/</div><div class='ctx'> static int</div><div class='ctx'> lpfc_debugfs_nodelist_data(struct lpfc_vport *vport, char *buf, int size)</div><div class='ctx'> {</div><div class='hunk'>@@ -513,7 +598,22 @@ lpfc_debugfs_nodelist_data(struct lpfc_vport *vport, char *buf, int size)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-</div><div class='add'>+/**</div><div class='add'>+ * lpfc_debugfs_disc_trc - Store discovery trace log.</div><div class='add'>+ * @vport: The vport to associate this trace string with for retrieval.</div><div class='add'>+ * @mask: Log entry classification.</div><div class='add'>+ * @fmt: Format string to be displayed when dumping the log.</div><div class='add'>+ * @data1: 1st data parameter to be applied to @fmt.</div><div class='add'>+ * @data2: 2nd data parameter to be applied to @fmt.</div><div class='add'>+ * @data3: 3rd data parameter to be applied to @fmt.</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ * This routine is used by the driver code to add a debugfs log entry to the</div><div class='add'>+ * discovery trace buffer associated with @vport. Only entries with a @mask that</div><div class='add'>+ * match the current debugfs discovery mask will be saved. Entries that do not</div><div class='add'>+ * match will be thrown away. @fmt, @data1, @data2, and @data3 are used like</div><div class='add'>+ * printf when displaying the log.</div><div class='add'>+ **/</div><div class='ctx'> inline void</div><div class='ctx'> lpfc_debugfs_disc_trc(struct lpfc_vport *vport, int mask, char *fmt,</div><div class='ctx'> 	uint32_t data1, uint32_t data2, uint32_t data3)</div><div class='hunk'>@@ -542,6 +642,19 @@ lpfc_debugfs_disc_trc(struct lpfc_vport *vport, int mask, char *fmt,</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_debugfs_slow_ring_trc - Store slow ring trace log.</div><div class='add'>+ * @phba: The phba to associate this trace string with for retrieval.</div><div class='add'>+ * @fmt: Format string to be displayed when dumping the log.</div><div class='add'>+ * @data1: 1st data parameter to be applied to @fmt.</div><div class='add'>+ * @data2: 2nd data parameter to be applied to @fmt.</div><div class='add'>+ * @data3: 3rd data parameter to be applied to @fmt.</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ * This routine is used by the driver code to add a debugfs log entry to the</div><div class='add'>+ * discovery trace buffer associated with @vport. @fmt, @data1, @data2, and</div><div class='add'>+ * @data3 are used like printf when displaying the log.</div><div class='add'>+ **/</div><div class='ctx'> inline void</div><div class='ctx'> lpfc_debugfs_slow_ring_trc(struct lpfc_hba *phba, char *fmt,</div><div class='ctx'> 	uint32_t data1, uint32_t data2, uint32_t data3)</div><div class='hunk'>@@ -568,6 +681,21 @@ lpfc_debugfs_slow_ring_trc(struct lpfc_hba *phba, char *fmt,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_LPFC_DEBUG_FS</div><div class='add'>+/**</div><div class='add'>+ * lpfc_debugfs_disc_trc_open - Open the discovery trace log.</div><div class='add'>+ * @inode: The inode pointer that contains a vport pointer.</div><div class='add'>+ * @file: The file pointer to attach the log output.</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ * This routine is the entry point for the debugfs open file operation. It gets</div><div class='add'>+ * the vport from the i_private field in @inode, allocates the necessary buffer</div><div class='add'>+ * for the log, fills the buffer from the in-memory log for this vport, and then</div><div class='add'>+ * returns a pointer to that log in the private_data field in @file.</div><div class='add'>+ *</div><div class='add'>+ * Returns:</div><div class='add'>+ * This function returns zero if successful. On error it will return an negative</div><div class='add'>+ * error value.</div><div class='add'>+ **/</div><div class='ctx'> static int</div><div class='ctx'> lpfc_debugfs_disc_trc_open(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='hunk'>@@ -585,7 +713,7 @@ lpfc_debugfs_disc_trc_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	if (!debug)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	/* Round to page boundry */</div><div class='add'>+	/* Round to page boundary */</div><div class='ctx'> 	size =  (lpfc_debugfs_max_disc_trc * LPFC_DEBUG_TRC_ENTRY_SIZE);</div><div class='ctx'> 	size = PAGE_ALIGN(size);</div><div class='ctx'> </div><div class='hunk'>@@ -603,6 +731,21 @@ out:</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_debugfs_slow_ring_trc_open - Open the Slow Ring trace log.</div><div class='add'>+ * @inode: The inode pointer that contains a vport pointer.</div><div class='add'>+ * @file: The file pointer to attach the log output.</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ * This routine is the entry point for the debugfs open file operation. It gets</div><div class='add'>+ * the vport from the i_private field in @inode, allocates the necessary buffer</div><div class='add'>+ * for the log, fills the buffer from the in-memory log for this vport, and then</div><div class='add'>+ * returns a pointer to that log in the private_data field in @file.</div><div class='add'>+ *</div><div class='add'>+ * Returns:</div><div class='add'>+ * This function returns zero if successful. On error it will return an negative</div><div class='add'>+ * error value.</div><div class='add'>+ **/</div><div class='ctx'> static int</div><div class='ctx'> lpfc_debugfs_slow_ring_trc_open(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='hunk'>@@ -620,7 +763,7 @@ lpfc_debugfs_slow_ring_trc_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	if (!debug)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	/* Round to page boundry */</div><div class='add'>+	/* Round to page boundary */</div><div class='ctx'> 	size =  (lpfc_debugfs_max_slow_ring_trc * LPFC_DEBUG_TRC_ENTRY_SIZE);</div><div class='ctx'> 	size = PAGE_ALIGN(size);</div><div class='ctx'> </div><div class='hunk'>@@ -638,6 +781,21 @@ out:</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_debugfs_hbqinfo_open - Open the hbqinfo debugfs buffer.</div><div class='add'>+ * @inode: The inode pointer that contains a vport pointer.</div><div class='add'>+ * @file: The file pointer to attach the log output.</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ * This routine is the entry point for the debugfs open file operation. It gets</div><div class='add'>+ * the vport from the i_private field in @inode, allocates the necessary buffer</div><div class='add'>+ * for the log, fills the buffer from the in-memory log for this vport, and then</div><div class='add'>+ * returns a pointer to that log in the private_data field in @file.</div><div class='add'>+ *</div><div class='add'>+ * Returns:</div><div class='add'>+ * This function returns zero if successful. On error it will return an negative</div><div class='add'>+ * error value.</div><div class='add'>+ **/</div><div class='ctx'> static int</div><div class='ctx'> lpfc_debugfs_hbqinfo_open(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='hunk'>@@ -649,7 +807,7 @@ lpfc_debugfs_hbqinfo_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	if (!debug)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	/* Round to page boundry */</div><div class='add'>+	/* Round to page boundary */</div><div class='ctx'> 	debug-&gt;buffer = kmalloc(LPFC_HBQINFO_SIZE, GFP_KERNEL);</div><div class='ctx'> 	if (!debug-&gt;buffer) {</div><div class='ctx'> 		kfree(debug);</div><div class='hunk'>@@ -665,6 +823,21 @@ out:</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_debugfs_dumpHBASlim_open - Open the Dump HBA SLIM debugfs buffer.</div><div class='add'>+ * @inode: The inode pointer that contains a vport pointer.</div><div class='add'>+ * @file: The file pointer to attach the log output.</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ * This routine is the entry point for the debugfs open file operation. It gets</div><div class='add'>+ * the vport from the i_private field in @inode, allocates the necessary buffer</div><div class='add'>+ * for the log, fills the buffer from the in-memory log for this vport, and then</div><div class='add'>+ * returns a pointer to that log in the private_data field in @file.</div><div class='add'>+ *</div><div class='add'>+ * Returns:</div><div class='add'>+ * This function returns zero if successful. On error it will return an negative</div><div class='add'>+ * error value.</div><div class='add'>+ **/</div><div class='ctx'> static int</div><div class='ctx'> lpfc_debugfs_dumpHBASlim_open(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='hunk'>@@ -676,7 +849,7 @@ lpfc_debugfs_dumpHBASlim_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	if (!debug)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	/* Round to page boundry */</div><div class='add'>+	/* Round to page boundary */</div><div class='ctx'> 	debug-&gt;buffer = kmalloc(LPFC_DUMPHBASLIM_SIZE, GFP_KERNEL);</div><div class='ctx'> 	if (!debug-&gt;buffer) {</div><div class='ctx'> 		kfree(debug);</div><div class='hunk'>@@ -692,6 +865,21 @@ out:</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_debugfs_dumpHostSlim_open - Open the Dump Host SLIM debugfs buffer.</div><div class='add'>+ * @inode: The inode pointer that contains a vport pointer.</div><div class='add'>+ * @file: The file pointer to attach the log output.</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ * This routine is the entry point for the debugfs open file operation. It gets</div><div class='add'>+ * the vport from the i_private field in @inode, allocates the necessary buffer</div><div class='add'>+ * for the log, fills the buffer from the in-memory log for this vport, and then</div><div class='add'>+ * returns a pointer to that log in the private_data field in @file.</div><div class='add'>+ *</div><div class='add'>+ * Returns:</div><div class='add'>+ * This function returns zero if successful. On error it will return an negative</div><div class='add'>+ * error value.</div><div class='add'>+ **/</div><div class='ctx'> static int</div><div class='ctx'> lpfc_debugfs_dumpHostSlim_open(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='hunk'>@@ -703,7 +891,7 @@ lpfc_debugfs_dumpHostSlim_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	if (!debug)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	/* Round to page boundry */</div><div class='add'>+	/* Round to page boundary */</div><div class='ctx'> 	debug-&gt;buffer = kmalloc(LPFC_DUMPHOSTSLIM_SIZE, GFP_KERNEL);</div><div class='ctx'> 	if (!debug-&gt;buffer) {</div><div class='ctx'> 		kfree(debug);</div><div class='hunk'>@@ -719,6 +907,21 @@ out:</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_debugfs_nodelist_open - Open the nodelist debugfs file.</div><div class='add'>+ * @inode: The inode pointer that contains a vport pointer.</div><div class='add'>+ * @file: The file pointer to attach the log output.</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ * This routine is the entry point for the debugfs open file operation. It gets</div><div class='add'>+ * the vport from the i_private field in @inode, allocates the necessary buffer</div><div class='add'>+ * for the log, fills the buffer from the in-memory log for this vport, and then</div><div class='add'>+ * returns a pointer to that log in the private_data field in @file.</div><div class='add'>+ *</div><div class='add'>+ * Returns:</div><div class='add'>+ * This function returns zero if successful. On error it will return an negative</div><div class='add'>+ * error value.</div><div class='add'>+ **/</div><div class='ctx'> static int</div><div class='ctx'> lpfc_debugfs_nodelist_open(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='hunk'>@@ -730,7 +933,7 @@ lpfc_debugfs_nodelist_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	if (!debug)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	/* Round to page boundry */</div><div class='add'>+	/* Round to page boundary */</div><div class='ctx'> 	debug-&gt;buffer = kmalloc(LPFC_NODELIST_SIZE, GFP_KERNEL);</div><div class='ctx'> 	if (!debug-&gt;buffer) {</div><div class='ctx'> 		kfree(debug);</div><div class='hunk'>@@ -746,6 +949,23 @@ out:</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_debugfs_lseek - Seek through a debugfs file.</div><div class='add'>+ * @file: The file pointer to seek through.</div><div class='add'>+ * @off: The offset to seek to or the amount to seek by.</div><div class='add'>+ * @whence: Indicates how to seek.</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ * This routine is the entry point for the debugfs lseek file operation. The</div><div class='add'>+ * @whence parameter indicates whether @off is the offset to directly seek to,</div><div class='add'>+ * or if it is a value to seek forward or reverse by. This function figures out</div><div class='add'>+ * what the new offset of the debugfs file will be and assigns that value to the</div><div class='add'>+ * f_pos field of @file.</div><div class='add'>+ *</div><div class='add'>+ * Returns:</div><div class='add'>+ * This function returns the new offset if successful and returns a negative</div><div class='add'>+ * error if unable to process the seek.</div><div class='add'>+ **/</div><div class='ctx'> static loff_t</div><div class='ctx'> lpfc_debugfs_lseek(struct file *file, loff_t off, int whence)</div><div class='ctx'> {</div><div class='hunk'>@@ -767,6 +987,22 @@ lpfc_debugfs_lseek(struct file *file, loff_t off, int whence)</div><div class='ctx'> 	return (pos &lt; 0 || pos &gt; debug-&gt;len) ? -EINVAL : (file-&gt;f_pos = pos);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_debugfs_read - Read a debugfs file.</div><div class='add'>+ * @file: The file pointer to read from.</div><div class='add'>+ * @buf: The buffer to copy the data to.</div><div class='add'>+ * @nbytes: The number of bytes to read.</div><div class='add'>+ * @ppos: The position in the file to start reading from.</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ * This routine reads data from from the buffer indicated in the private_data</div><div class='add'>+ * field of @file. It will start reading at @ppos and copy up to @nbytes of</div><div class='add'>+ * data to @buf.</div><div class='add'>+ *</div><div class='add'>+ * Returns:</div><div class='add'>+ * This function returns the amount of data that was read (this could be less</div><div class='add'>+ * than @nbytes if the end of the file was reached) or a negative error value.</div><div class='add'>+ **/</div><div class='ctx'> static ssize_t</div><div class='ctx'> lpfc_debugfs_read(struct file *file, char __user *buf,</div><div class='ctx'> 		  size_t nbytes, loff_t *ppos)</div><div class='hunk'>@@ -776,6 +1012,18 @@ lpfc_debugfs_read(struct file *file, char __user *buf,</div><div class='ctx'> 				       debug-&gt;len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_debugfs_release - Release the buffer used to store debugfs file data.</div><div class='add'>+ * @inode: The inode pointer that contains a vport pointer. (unused)</div><div class='add'>+ * @file: The file pointer that contains the buffer to release.</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ * This routine frees the buffer that was allocated when the debugfs file was</div><div class='add'>+ * opened.</div><div class='add'>+ *</div><div class='add'>+ * Returns:</div><div class='add'>+ * This function returns zero.</div><div class='add'>+ **/</div><div class='ctx'> static int</div><div class='ctx'> lpfc_debugfs_release(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='hunk'>@@ -845,6 +1093,16 @@ static struct dentry *lpfc_debugfs_root = NULL;</div><div class='ctx'> static atomic_t lpfc_debugfs_hba_count;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_debugfs_initialize - Initialize debugfs for a vport.</div><div class='add'>+ * @vport: The vport pointer to initialize.</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ * When Debugfs is configured this routine sets up the lpfc debugfs file system.</div><div class='add'>+ * If not already created, this routine will create the lpfc directory, and</div><div class='add'>+ * lpfcX directory (for this HBA), and vportX directory for this vport. It will</div><div class='add'>+ * also create each file used to access lpfc specific debugfs information.</div><div class='add'>+ **/</div><div class='ctx'> inline void</div><div class='ctx'> lpfc_debugfs_initialize(struct lpfc_vport *vport)</div><div class='ctx'> {</div><div class='hunk'>@@ -862,7 +1120,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)</div><div class='ctx'> 		atomic_set(&amp;lpfc_debugfs_hba_count, 0);</div><div class='ctx'> 		if (!lpfc_debugfs_root) {</div><div class='ctx'> 			lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,</div><div class='del'>-					 "0409 Cannot create debugfs root\n");</div><div class='add'>+					 "0408 Cannot create debugfs root\n");</div><div class='ctx'> 			goto debug_failed;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -876,7 +1134,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)</div><div class='ctx'> 			debugfs_create_dir(name, lpfc_debugfs_root);</div><div class='ctx'> 		if (!phba-&gt;hba_debugfs_root) {</div><div class='ctx'> 			lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,</div><div class='del'>-					 "0409 Cannot create debugfs hba\n");</div><div class='add'>+					 "0412 Cannot create debugfs hba\n");</div><div class='ctx'> 			goto debug_failed;</div><div class='ctx'> 		}</div><div class='ctx'> 		atomic_inc(&amp;lpfc_debugfs_hba_count);</div><div class='hunk'>@@ -890,7 +1148,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)</div><div class='ctx'> 				 phba, &amp;lpfc_debugfs_op_hbqinfo);</div><div class='ctx'> 		if (!phba-&gt;debug_hbqinfo) {</div><div class='ctx'> 			lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,</div><div class='del'>-				"0409 Cannot create debugfs hbqinfo\n");</div><div class='add'>+				"0411 Cannot create debugfs hbqinfo\n");</div><div class='ctx'> 			goto debug_failed;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -902,7 +1160,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)</div><div class='ctx'> 				 phba, &amp;lpfc_debugfs_op_dumpHBASlim);</div><div class='ctx'> 		if (!phba-&gt;debug_dumpHBASlim) {</div><div class='ctx'> 			lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,</div><div class='del'>-				"0409 Cannot create debugfs dumpHBASlim\n");</div><div class='add'>+				"0413 Cannot create debugfs dumpHBASlim\n");</div><div class='ctx'> 			goto debug_failed;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -914,7 +1172,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)</div><div class='ctx'> 				 phba, &amp;lpfc_debugfs_op_dumpHostSlim);</div><div class='ctx'> 		if (!phba-&gt;debug_dumpHostSlim) {</div><div class='ctx'> 			lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,</div><div class='del'>-				"0409 Cannot create debugfs dumpHostSlim\n");</div><div class='add'>+				"0414 Cannot create debugfs dumpHostSlim\n");</div><div class='ctx'> 			goto debug_failed;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -944,7 +1202,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)</div><div class='ctx'> 				 phba, &amp;lpfc_debugfs_op_slow_ring_trc);</div><div class='ctx'> 		if (!phba-&gt;debug_slow_ring_trc) {</div><div class='ctx'> 			lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,</div><div class='del'>-					 "0409 Cannot create debugfs "</div><div class='add'>+					 "0415 Cannot create debugfs "</div><div class='ctx'> 					 "slow_ring_trace\n");</div><div class='ctx'> 			goto debug_failed;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -955,7 +1213,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)</div><div class='ctx'> 				GFP_KERNEL);</div><div class='ctx'> 			if (!phba-&gt;slow_ring_trc) {</div><div class='ctx'> 				lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,</div><div class='del'>-						 "0409 Cannot create debugfs "</div><div class='add'>+						 "0416 Cannot create debugfs "</div><div class='ctx'> 						 "slow_ring buffer\n");</div><div class='ctx'> 				goto debug_failed;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -972,7 +1230,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)</div><div class='ctx'> 			debugfs_create_dir(name, phba-&gt;hba_debugfs_root);</div><div class='ctx'> 		if (!vport-&gt;vport_debugfs_root) {</div><div class='ctx'> 			lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,</div><div class='del'>-					 "0409 Cant create debugfs");</div><div class='add'>+					 "0417 Cant create debugfs");</div><div class='ctx'> 			goto debug_failed;</div><div class='ctx'> 		}</div><div class='ctx'> 		atomic_inc(&amp;phba-&gt;debugfs_vport_count);</div><div class='hunk'>@@ -1001,7 +1259,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)</div><div class='ctx'> </div><div class='ctx'> 	if (!vport-&gt;disc_trc) {</div><div class='ctx'> 		lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,</div><div class='del'>-				 "0409 Cannot create debugfs disc trace "</div><div class='add'>+				 "0418 Cannot create debugfs disc trace "</div><div class='ctx'> 				 "buffer\n");</div><div class='ctx'> 		goto debug_failed;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1014,7 +1272,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)</div><div class='ctx'> 				 vport, &amp;lpfc_debugfs_op_disc_trc);</div><div class='ctx'> 	if (!vport-&gt;debug_disc_trc) {</div><div class='ctx'> 		lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,</div><div class='del'>-				 "0409 Cannot create debugfs "</div><div class='add'>+				 "0419 Cannot create debugfs "</div><div class='ctx'> 				 "discovery_trace\n");</div><div class='ctx'> 		goto debug_failed;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1033,7 +1291,17 @@ debug_failed:</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='add'>+/**</div><div class='add'>+ * lpfc_debugfs_terminate -  Tear down debugfs infrastructure for this vport.</div><div class='add'>+ * @vport: The vport pointer to remove from debugfs.</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ * When Debugfs is configured this routine removes debugfs file system elements</div><div class='add'>+ * that are specific to this vport. It also checks to see if there are any</div><div class='add'>+ * users left for the debugfs directories associated with the HBA and driver. If</div><div class='add'>+ * this is the last user of the HBA directory or driver directory then it will</div><div class='add'>+ * remove those from the debugfs infrastructure as well.</div><div class='add'>+ **/</div><div class='ctx'> inline void</div><div class='ctx'> lpfc_debugfs_terminate(struct lpfc_vport *vport)</div><div class='ctx'> {</div><div class='hunk'>@@ -1096,5 +1364,3 @@ lpfc_debugfs_terminate(struct lpfc_vport *vport)</div><div class='ctx'> #endif</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/drivers/scsi/lpfc/lpfc_disc.h b/drivers/scsi/lpfc/lpfc_disc.h<br/>index 2db0b74b6fad..f29e548a90d1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/lpfc/lpfc_disc.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/lpfc/lpfc_disc.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/lpfc/lpfc_disc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/lpfc/lpfc_disc.h</a></div><div class='hunk'>@@ -37,6 +37,7 @@ enum lpfc_work_type {</div><div class='ctx'> 	LPFC_EVT_KILL,</div><div class='ctx'> 	LPFC_EVT_ELS_RETRY,</div><div class='ctx'> 	LPFC_EVT_DEV_LOSS,</div><div class='add'>+	LPFC_EVT_FASTPATH_MGMT_EVT,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* structure used to queue event to the discovery tasklet */</div><div class='hunk'>@@ -47,6 +48,24 @@ struct lpfc_work_evt {</div><div class='ctx'> 	enum lpfc_work_type   evt;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct lpfc_scsi_check_condition_event;</div><div class='add'>+struct lpfc_scsi_varqueuedepth_event;</div><div class='add'>+struct lpfc_scsi_event_header;</div><div class='add'>+struct lpfc_fabric_event_header;</div><div class='add'>+struct lpfc_fcprdchkerr_event;</div><div class='add'>+</div><div class='add'>+/* structure used for sending events from fast path */</div><div class='add'>+struct lpfc_fast_path_event {</div><div class='add'>+	struct lpfc_work_evt work_evt;</div><div class='add'>+	struct lpfc_vport     *vport;</div><div class='add'>+	union {</div><div class='add'>+		struct lpfc_scsi_check_condition_event check_cond_evt;</div><div class='add'>+		struct lpfc_scsi_varqueuedepth_event queue_depth_evt;</div><div class='add'>+		struct lpfc_scsi_event_header scsi_evt;</div><div class='add'>+		struct lpfc_fabric_event_header fabric_evt;</div><div class='add'>+		struct lpfc_fcprdchkerr_event read_check_error;</div><div class='add'>+	} un;</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> struct lpfc_nodelist {</div><div class='ctx'> 	struct list_head nlp_listp;</div><div class='hunk'>@@ -88,6 +107,10 @@ struct lpfc_nodelist {</div><div class='ctx'> 	unsigned long last_ramp_up_time;        /* jiffy of last ramp up */</div><div class='ctx'> 	unsigned long last_q_full_time;		/* jiffy of last queue full */</div><div class='ctx'> 	struct kref     kref;</div><div class='add'>+	atomic_t cmd_pending;</div><div class='add'>+	uint32_t cmd_qdepth;</div><div class='add'>+	unsigned long last_change_time;</div><div class='add'>+	struct lpfc_scsicmd_bkt *lat_data;	/* Latency data */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Defines for nlp_flag (uint32) */</div><div class='head'>diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c<br/>index f54e0f7eaee3..630bd28fb997 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/lpfc/lpfc_els.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/lpfc/lpfc_els.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/lpfc/lpfc_els.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/lpfc/lpfc_els.c</a></div><div class='hunk'>@@ -30,6 +30,7 @@</div><div class='ctx'> </div><div class='ctx'> #include "lpfc_hw.h"</div><div class='ctx'> #include "lpfc_sli.h"</div><div class='add'>+#include "lpfc_nl.h"</div><div class='ctx'> #include "lpfc_disc.h"</div><div class='ctx'> #include "lpfc_scsi.h"</div><div class='ctx'> #include "lpfc.h"</div><div class='hunk'>@@ -53,6 +54,28 @@ static void lpfc_register_new_vport(struct lpfc_hba *phba,</div><div class='ctx'> </div><div class='ctx'> static int lpfc_max_els_tries = 3;</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_els_chk_latt: Check host link attention event for a vport.</div><div class='add'>+ * @vport: pointer to a host virtual N_Port data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine checks whether there is an outstanding host link</div><div class='add'>+ * attention event during the discovery process with the @vport. It is done</div><div class='add'>+ * by reading the HBA's Host Attention (HA) register. If there is any host</div><div class='add'>+ * link attention events during this @vport's discovery process, the @vport</div><div class='add'>+ * shall be marked as FC_ABORT_DISCOVERY, a host link attention clear shall</div><div class='add'>+ * be issued if the link state is not already in host link cleared state,</div><div class='add'>+ * and a return code shall indicate whether the host link attention event</div><div class='add'>+ * had happened.</div><div class='add'>+ *</div><div class='add'>+ * Note that, if either the host link is in state LPFC_LINK_DOWN or @vport</div><div class='add'>+ * state in LPFC_VPORT_READY, the request for checking host link attention</div><div class='add'>+ * event will be ignored and a return code shall indicate no host link</div><div class='add'>+ * attention event had happened.</div><div class='add'>+ *</div><div class='add'>+ * Return codes</div><div class='add'>+ *   0 - no host link attention event happened</div><div class='add'>+ *   1 - host link attention event happened</div><div class='add'>+ **/</div><div class='ctx'> int</div><div class='ctx'> lpfc_els_chk_latt(struct lpfc_vport *vport)</div><div class='ctx'> {</div><div class='hunk'>@@ -92,6 +115,34 @@ lpfc_els_chk_latt(struct lpfc_vport *vport)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_prep_els_iocb: Allocate and prepare a lpfc iocb data structure.</div><div class='add'>+ * @vport: pointer to a host virtual N_Port data structure.</div><div class='add'>+ * @expectRsp: flag indicating whether response is expected.</div><div class='add'>+ * @cmdSize: size of the ELS command.</div><div class='add'>+ * @retry: number of retries to the command IOCB when it fails.</div><div class='add'>+ * @ndlp: pointer to a node-list data structure.</div><div class='add'>+ * @did: destination identifier.</div><div class='add'>+ * @elscmd: the ELS command code.</div><div class='add'>+ *</div><div class='add'>+ * This routine is used for allocating a lpfc-IOCB data structure from</div><div class='add'>+ * the driver lpfc-IOCB free-list and prepare the IOCB with the parameters</div><div class='add'>+ * passed into the routine for discovery state machine to issue an Extended</div><div class='add'>+ * Link Service (ELS) commands. It is a generic lpfc-IOCB allocation</div><div class='add'>+ * and preparation routine that is used by all the discovery state machine</div><div class='add'>+ * routines and the ELS command-specific fields will be later set up by</div><div class='add'>+ * the individual discovery machine routines after calling this routine</div><div class='add'>+ * allocating and preparing a generic IOCB data structure. It fills in the</div><div class='add'>+ * Buffer Descriptor Entries (BDEs), allocates buffers for both command</div><div class='add'>+ * payload and response payload (if expected). The reference count on the</div><div class='add'>+ * ndlp is incremented by 1 and the reference to the ndlp is put into</div><div class='add'>+ * context1 of the IOCB data structure for this IOCB to hold the ndlp</div><div class='add'>+ * reference for the command's callback function to access later.</div><div class='add'>+ *</div><div class='add'>+ * Return code</div><div class='add'>+ *   Pointer to the newly allocated/prepared els iocb data structure</div><div class='add'>+ *   NULL - when els iocb data structure allocation/preparation failed</div><div class='add'>+ **/</div><div class='ctx'> static struct lpfc_iocbq *</div><div class='ctx'> lpfc_prep_els_iocb(struct lpfc_vport *vport, uint8_t expectRsp,</div><div class='ctx'> 		   uint16_t cmdSize, uint8_t retry,</div><div class='hunk'>@@ -150,7 +201,7 @@ lpfc_prep_els_iocb(struct lpfc_vport *vport, uint8_t expectRsp,</div><div class='ctx'> </div><div class='ctx'> 	icmd-&gt;un.elsreq64.bdl.addrHigh = putPaddrHigh(pbuflist-&gt;phys);</div><div class='ctx'> 	icmd-&gt;un.elsreq64.bdl.addrLow = putPaddrLow(pbuflist-&gt;phys);</div><div class='del'>-	icmd-&gt;un.elsreq64.bdl.bdeFlags = BUFF_TYPE_BDL;</div><div class='add'>+	icmd-&gt;un.elsreq64.bdl.bdeFlags = BUFF_TYPE_BLP_64;</div><div class='ctx'> 	icmd-&gt;un.elsreq64.remoteID = did;	/* DID */</div><div class='ctx'> 	if (expectRsp) {</div><div class='ctx'> 		icmd-&gt;un.elsreq64.bdl.bdeSize = (2 * sizeof(struct ulp_bde64));</div><div class='hunk'>@@ -185,7 +236,7 @@ lpfc_prep_els_iocb(struct lpfc_vport *vport, uint8_t expectRsp,</div><div class='ctx'> 		bpl-&gt;addrLow = le32_to_cpu(putPaddrLow(prsp-&gt;phys));</div><div class='ctx'> 		bpl-&gt;addrHigh = le32_to_cpu(putPaddrHigh(prsp-&gt;phys));</div><div class='ctx'> 		bpl-&gt;tus.f.bdeSize = FCELSSIZE;</div><div class='del'>-		bpl-&gt;tus.f.bdeFlags = BUFF_USE_RCV;</div><div class='add'>+		bpl-&gt;tus.f.bdeFlags = BUFF_TYPE_BDE_64;</div><div class='ctx'> 		bpl-&gt;tus.w = le32_to_cpu(bpl-&gt;tus.w);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -233,6 +284,22 @@ els_iocb_free_pcmb_exit:</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_issue_fabric_reglogin: Issue fabric registration login for a vport.</div><div class='add'>+ * @vport: pointer to a host virtual N_Port data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine issues a fabric registration login for a @vport. An</div><div class='add'>+ * active ndlp node with Fabric_DID must already exist for this @vport.</div><div class='add'>+ * The routine invokes two mailbox commands to carry out fabric registration</div><div class='add'>+ * login through the HBA firmware: the first mailbox command requests the</div><div class='add'>+ * HBA to perform link configuration for the @vport; and the second mailbox</div><div class='add'>+ * command requests the HBA to perform the actual fabric registration login</div><div class='add'>+ * with the @vport.</div><div class='add'>+ *</div><div class='add'>+ * Return code</div><div class='add'>+ *   0 - successfully issued fabric registration login for @vport</div><div class='add'>+ *   -ENXIO -- failed to issue fabric registration login for @vport</div><div class='add'>+ **/</div><div class='ctx'> static int</div><div class='ctx'> lpfc_issue_fabric_reglogin(struct lpfc_vport *vport)</div><div class='ctx'> {</div><div class='hunk'>@@ -313,6 +380,26 @@ fail:</div><div class='ctx'> 	return -ENXIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_cmpl_els_flogi_fabric: Completion function for flogi to a fabric port.</div><div class='add'>+ * @vport: pointer to a host virtual N_Port data structure.</div><div class='add'>+ * @ndlp: pointer to a node-list data structure.</div><div class='add'>+ * @sp: pointer to service parameter data structure.</div><div class='add'>+ * @irsp: pointer to the IOCB within the lpfc response IOCB.</div><div class='add'>+ *</div><div class='add'>+ * This routine is invoked by the lpfc_cmpl_els_flogi() completion callback</div><div class='add'>+ * function to handle the completion of a Fabric Login (FLOGI) into a fabric</div><div class='add'>+ * port in a fabric topology. It properly sets up the parameters to the @ndlp</div><div class='add'>+ * from the IOCB response. It also check the newly assigned N_Port ID to the</div><div class='add'>+ * @vport against the previously assigned N_Port ID. If it is different from</div><div class='add'>+ * the previously assigned Destination ID (DID), the lpfc_unreg_rpi() routine</div><div class='add'>+ * is invoked on all the remaining nodes with the @vport to unregister the</div><div class='add'>+ * Remote Port Indicators (RPIs). Finally, the lpfc_issue_fabric_reglogin()</div><div class='add'>+ * is invoked to register login to the fabric.</div><div class='add'>+ *</div><div class='add'>+ * Return code</div><div class='add'>+ *   0 - Success (currently, always return 0)</div><div class='add'>+ **/</div><div class='ctx'> static int</div><div class='ctx'> lpfc_cmpl_els_flogi_fabric(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,</div><div class='ctx'> 			   struct serv_parm *sp, IOCB_t *irsp)</div><div class='hunk'>@@ -387,7 +474,7 @@ lpfc_cmpl_els_flogi_fabric(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,</div><div class='ctx'> 		 */</div><div class='ctx'> 		list_for_each_entry_safe(np, next_np,</div><div class='ctx'> 					&amp;vport-&gt;fc_nodes, nlp_listp) {</div><div class='del'>-			if (!NLP_CHK_NODE_ACT(ndlp))</div><div class='add'>+			if (!NLP_CHK_NODE_ACT(np))</div><div class='ctx'> 				continue;</div><div class='ctx'> 			if ((np-&gt;nlp_state != NLP_STE_NPR_NODE) ||</div><div class='ctx'> 				   !(np-&gt;nlp_flag &amp; NLP_NPR_ADISC))</div><div class='hunk'>@@ -416,9 +503,26 @@ lpfc_cmpl_els_flogi_fabric(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * We FLOGIed into an NPort, initiate pt2pt protocol</div><div class='del'>- */</div><div class='add'>+/**</div><div class='add'>+ * lpfc_cmpl_els_flogi_nport: Completion function for flogi to an N_Port.</div><div class='add'>+ * @vport: pointer to a host virtual N_Port data structure.</div><div class='add'>+ * @ndlp: pointer to a node-list data structure.</div><div class='add'>+ * @sp: pointer to service parameter data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine is invoked by the lpfc_cmpl_els_flogi() completion callback</div><div class='add'>+ * function to handle the completion of a Fabric Login (FLOGI) into an N_Port</div><div class='add'>+ * in a point-to-point topology. First, the @vport's N_Port Name is compared</div><div class='add'>+ * with the received N_Port Name: if the @vport's N_Port Name is greater than</div><div class='add'>+ * the received N_Port Name lexicographically, this node shall assign local</div><div class='add'>+ * N_Port ID (PT2PT_LocalID: 1) and remote N_Port ID (PT2PT_RemoteID: 2) and</div><div class='add'>+ * will send out Port Login (PLOGI) with the N_Port IDs assigned. Otherwise,</div><div class='add'>+ * this node shall just wait for the remote node to issue PLOGI and assign</div><div class='add'>+ * N_Port IDs.</div><div class='add'>+ *</div><div class='add'>+ * Return code</div><div class='add'>+ *   0 - Success</div><div class='add'>+ *   -ENXIO - Fail</div><div class='add'>+ **/</div><div class='ctx'> static int</div><div class='ctx'> lpfc_cmpl_els_flogi_nport(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,</div><div class='ctx'> 			  struct serv_parm *sp)</div><div class='hunk'>@@ -516,6 +620,29 @@ fail:</div><div class='ctx'> 	return -ENXIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_cmpl_els_flogi: Completion callback function for flogi.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ * @cmdiocb: pointer to lpfc command iocb data structure.</div><div class='add'>+ * @rspiocb: pointer to lpfc response iocb data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine is the top-level completion callback function for issuing</div><div class='add'>+ * a Fabric Login (FLOGI) command. If the response IOCB reported error,</div><div class='add'>+ * the lpfc_els_retry() routine shall be invoked to retry the FLOGI. If</div><div class='add'>+ * retry has been made (either immediately or delayed with lpfc_els_retry()</div><div class='add'>+ * returning 1), the command IOCB will be released and function returned.</div><div class='add'>+ * If the retry attempt has been given up (possibly reach the maximum</div><div class='add'>+ * number of retries), one additional decrement of ndlp reference shall be</div><div class='add'>+ * invoked before going out after releasing the command IOCB. This will</div><div class='add'>+ * actually release the remote node (Note, lpfc_els_free_iocb() will also</div><div class='add'>+ * invoke one decrement of ndlp reference count). If no error reported in</div><div class='add'>+ * the IOCB status, the command Port ID field is used to determine whether</div><div class='add'>+ * this is a point-to-point topology or a fabric topology: if the Port ID</div><div class='add'>+ * field is assigned, it is a fabric topology; otherwise, it is a</div><div class='add'>+ * point-to-point topology. The routine lpfc_cmpl_els_flogi_fabric() or</div><div class='add'>+ * lpfc_cmpl_els_flogi_nport() shall be invoked accordingly to handle the</div><div class='add'>+ * specific topology completion conditions.</div><div class='add'>+ **/</div><div class='ctx'> static void</div><div class='ctx'> lpfc_cmpl_els_flogi(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,</div><div class='ctx'> 		    struct lpfc_iocbq *rspiocb)</div><div class='hunk'>@@ -618,6 +745,28 @@ out:</div><div class='ctx'> 	lpfc_els_free_iocb(phba, cmdiocb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_issue_els_flogi: Issue an flogi iocb command for a vport.</div><div class='add'>+ * @vport: pointer to a host virtual N_Port data structure.</div><div class='add'>+ * @ndlp: pointer to a node-list data structure.</div><div class='add'>+ * @retry: number of retries to the command IOCB.</div><div class='add'>+ *</div><div class='add'>+ * This routine issues a Fabric Login (FLOGI) Request ELS command</div><div class='add'>+ * for a @vport. The initiator service parameters are put into the payload</div><div class='add'>+ * of the FLOGI Request IOCB and the top-level callback function pointer</div><div class='add'>+ * to lpfc_cmpl_els_flogi() routine is put to the IOCB completion callback</div><div class='add'>+ * function field. The lpfc_issue_fabric_iocb routine is invoked to send</div><div class='add'>+ * out FLOGI ELS command with one outstanding fabric IOCB at a time.</div><div class='add'>+ *</div><div class='add'>+ * Note that, in lpfc_prep_els_iocb() routine, the reference count of ndlp</div><div class='add'>+ * will be incremented by 1 for holding the ndlp and the reference to ndlp</div><div class='add'>+ * will be stored into the context1 field of the IOCB for the completion</div><div class='add'>+ * callback function to the FLOGI ELS command.</div><div class='add'>+ *</div><div class='add'>+ * Return code</div><div class='add'>+ *   0 - successfully issued flogi iocb for @vport</div><div class='add'>+ *   1 - failed to issue flogi iocb for @vport</div><div class='add'>+ **/</div><div class='ctx'> static int</div><div class='ctx'> lpfc_issue_els_flogi(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,</div><div class='ctx'> 		     uint8_t retry)</div><div class='hunk'>@@ -694,6 +843,20 @@ lpfc_issue_els_flogi(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_els_abort_flogi: Abort all outstanding flogi iocbs.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine aborts all the outstanding Fabric Login (FLOGI) IOCBs</div><div class='add'>+ * with a @phba. This routine walks all the outstanding IOCBs on the txcmplq</div><div class='add'>+ * list and issues an abort IOCB commond on each outstanding IOCB that</div><div class='add'>+ * contains a active Fabric_DID ndlp. Note that this function is to issue</div><div class='add'>+ * the abort IOCB command on all the outstanding IOCBs, thus when this</div><div class='add'>+ * function returns, it does not guarantee all the IOCBs are actually aborted.</div><div class='add'>+ *</div><div class='add'>+ * Return code</div><div class='add'>+ *   0 - Sucessfully issued abort iocb on all outstanding flogis (Always 0)</div><div class='add'>+ **/</div><div class='ctx'> int</div><div class='ctx'> lpfc_els_abort_flogi(struct lpfc_hba *phba)</div><div class='ctx'> {</div><div class='hunk'>@@ -729,6 +892,22 @@ lpfc_els_abort_flogi(struct lpfc_hba *phba)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_initial_flogi: Issue an initial fabric login for a vport.</div><div class='add'>+ * @vport: pointer to a host virtual N_Port data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine issues an initial Fabric Login (FLOGI) for the @vport</div><div class='add'>+ * specified. It first searches the ndlp with the Fabric_DID (0xfffffe) from</div><div class='add'>+ * the @vport's ndlp list. If no such ndlp found, it will create an ndlp and</div><div class='add'>+ * put it into the @vport's ndlp list. If an inactive ndlp found on the list,</div><div class='add'>+ * it will just be enabled and made active. The lpfc_issue_els_flogi() routine</div><div class='add'>+ * is then invoked with the @vport and the ndlp to perform the FLOGI for the</div><div class='add'>+ * @vport.</div><div class='add'>+ *</div><div class='add'>+ * Return code</div><div class='add'>+ *   0 - failed to issue initial flogi for @vport</div><div class='add'>+ *   1 - successfully issued initial flogi for @vport</div><div class='add'>+ **/</div><div class='ctx'> int</div><div class='ctx'> lpfc_initial_flogi(struct lpfc_vport *vport)</div><div class='ctx'> {</div><div class='hunk'>@@ -764,6 +943,22 @@ lpfc_initial_flogi(struct lpfc_vport *vport)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_initial_fdisc: Issue an initial fabric discovery for a vport.</div><div class='add'>+ * @vport: pointer to a host virtual N_Port data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine issues an initial Fabric Discover (FDISC) for the @vport</div><div class='add'>+ * specified. It first searches the ndlp with the Fabric_DID (0xfffffe) from</div><div class='add'>+ * the @vport's ndlp list. If no such ndlp found, it will create an ndlp and</div><div class='add'>+ * put it into the @vport's ndlp list. If an inactive ndlp found on the list,</div><div class='add'>+ * it will just be enabled and made active. The lpfc_issue_els_fdisc() routine</div><div class='add'>+ * is then invoked with the @vport and the ndlp to perform the FDISC for the</div><div class='add'>+ * @vport.</div><div class='add'>+ *</div><div class='add'>+ * Return code</div><div class='add'>+ *   0 - failed to issue initial fdisc for @vport</div><div class='add'>+ *   1 - successfully issued initial fdisc for @vport</div><div class='add'>+ **/</div><div class='ctx'> int</div><div class='ctx'> lpfc_initial_fdisc(struct lpfc_vport *vport)</div><div class='ctx'> {</div><div class='hunk'>@@ -797,6 +992,17 @@ lpfc_initial_fdisc(struct lpfc_vport *vport)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_more_plogi: Check and issue remaining plogis for a vport.</div><div class='add'>+ * @vport: pointer to a host virtual N_Port data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine checks whether there are more remaining Port Logins</div><div class='add'>+ * (PLOGI) to be issued for the @vport. If so, it will invoke the routine</div><div class='add'>+ * lpfc_els_disc_plogi() to go through the Node Port Recovery (NPR) nodes</div><div class='add'>+ * to issue ELS PLOGIs up to the configured discover threads with the</div><div class='add'>+ * @vport (@vport-&gt;cfg_discovery_threads). The function also decrement</div><div class='add'>+ * the @vport's num_disc_node by 1 if it is not already 0.</div><div class='add'>+ **/</div><div class='ctx'> void</div><div class='ctx'> lpfc_more_plogi(struct lpfc_vport *vport)</div><div class='ctx'> {</div><div class='hunk'>@@ -819,6 +1025,37 @@ lpfc_more_plogi(struct lpfc_vport *vport)</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_plogi_confirm_nport: Confirm pologi wwpn matches stored ndlp.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ * @prsp: pointer to response IOCB payload.</div><div class='add'>+ * @ndlp: pointer to a node-list data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine checks and indicates whether the WWPN of an N_Port, retrieved</div><div class='add'>+ * from a PLOGI, matches the WWPN that is stored in the @ndlp for that N_POrt.</div><div class='add'>+ * The following cases are considered N_Port confirmed:</div><div class='add'>+ * 1) The N_Port is a Fabric ndlp; 2) The @ndlp is on vport list and matches</div><div class='add'>+ * the WWPN of the N_Port logged into; 3) The @ndlp is not on vport list but</div><div class='add'>+ * it does not have WWPN assigned either. If the WWPN is confirmed, the</div><div class='add'>+ * pointer to the @ndlp will be returned. If the WWPN is not confirmed:</div><div class='add'>+ * 1) if there is a node on vport list other than the @ndlp with the same</div><div class='add'>+ * WWPN of the N_Port PLOGI logged into, the lpfc_unreg_rpi() will be invoked</div><div class='add'>+ * on that node to release the RPI associated with the node; 2) if there is</div><div class='add'>+ * no node found on vport list with the same WWPN of the N_Port PLOGI logged</div><div class='add'>+ * into, a new node shall be allocated (or activated). In either case, the</div><div class='add'>+ * parameters of the @ndlp shall be copied to the new_ndlp, the @ndlp shall</div><div class='add'>+ * be released and the new_ndlp shall be put on to the vport node list and</div><div class='add'>+ * its pointer returned as the confirmed node.</div><div class='add'>+ *</div><div class='add'>+ * Note that before the @ndlp got "released", the keepDID from not-matching</div><div class='add'>+ * or inactive "new_ndlp" on the vport node list is assigned to the nlp_DID</div><div class='add'>+ * of the @ndlp. This is because the release of @ndlp is actually to put it</div><div class='add'>+ * into an inactive state on the vport node list and the vport node list</div><div class='add'>+ * management algorithm does not allow two node with a same DID.</div><div class='add'>+ *</div><div class='add'>+ * Return code</div><div class='add'>+ *   pointer to the PLOGI N_Port @ndlp</div><div class='add'>+ **/</div><div class='ctx'> static struct lpfc_nodelist *</div><div class='ctx'> lpfc_plogi_confirm_nport(struct lpfc_hba *phba, uint32_t *prsp,</div><div class='ctx'> 			 struct lpfc_nodelist *ndlp)</div><div class='hunk'>@@ -922,6 +1159,17 @@ lpfc_plogi_confirm_nport(struct lpfc_hba *phba, uint32_t *prsp,</div><div class='ctx'> 	return new_ndlp;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_end_rscn: Check and handle more rscn for a vport.</div><div class='add'>+ * @vport: pointer to a host virtual N_Port data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine checks whether more Registration State Change</div><div class='add'>+ * Notifications (RSCNs) came in while the discovery state machine was in</div><div class='add'>+ * the FC_RSCN_MODE. If so, the lpfc_els_handle_rscn() routine will be</div><div class='add'>+ * invoked to handle the additional RSCNs for the @vport. Otherwise, the</div><div class='add'>+ * FC_RSCN_MODE bit will be cleared with the @vport to mark as the end of</div><div class='add'>+ * handling the RSCNs.</div><div class='add'>+ **/</div><div class='ctx'> void</div><div class='ctx'> lpfc_end_rscn(struct lpfc_vport *vport)</div><div class='ctx'> {</div><div class='hunk'>@@ -943,6 +1191,26 @@ lpfc_end_rscn(struct lpfc_vport *vport)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_cmpl_els_plogi: Completion callback function for plogi.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ * @cmdiocb: pointer to lpfc command iocb data structure.</div><div class='add'>+ * @rspiocb: pointer to lpfc response iocb data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine is the completion callback function for issuing the Port</div><div class='add'>+ * Login (PLOGI) command. For PLOGI completion, there must be an active</div><div class='add'>+ * ndlp on the vport node list that matches the remote node ID from the</div><div class='add'>+ * PLOGI reponse IOCB. If such ndlp does not exist, the PLOGI is simply</div><div class='add'>+ * ignored and command IOCB released. The PLOGI response IOCB status is</div><div class='add'>+ * checked for error conditons. If there is error status reported, PLOGI</div><div class='add'>+ * retry shall be attempted by invoking the lpfc_els_retry() routine.</div><div class='add'>+ * Otherwise, the lpfc_plogi_confirm_nport() routine shall be invoked on</div><div class='add'>+ * the ndlp and the NLP_EVT_CMPL_PLOGI state to the Discover State Machine</div><div class='add'>+ * (DSM) is set for this PLOGI completion. Finally, it checks whether</div><div class='add'>+ * there are additional N_Port nodes with the vport that need to perform</div><div class='add'>+ * PLOGI. If so, the lpfc_more_plogi() routine is invoked to issue addition</div><div class='add'>+ * PLOGIs.</div><div class='add'>+ **/</div><div class='ctx'> static void</div><div class='ctx'> lpfc_cmpl_els_plogi(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,</div><div class='ctx'> 		    struct lpfc_iocbq *rspiocb)</div><div class='hunk'>@@ -1048,6 +1316,27 @@ out:</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_issue_els_plogi: Issue an plogi iocb command for a vport.</div><div class='add'>+ * @vport: pointer to a host virtual N_Port data structure.</div><div class='add'>+ * @did: destination port identifier.</div><div class='add'>+ * @retry: number of retries to the command IOCB.</div><div class='add'>+ *</div><div class='add'>+ * This routine issues a Port Login (PLOGI) command to a remote N_Port</div><div class='add'>+ * (with the @did) for a @vport. Before issuing a PLOGI to a remote N_Port,</div><div class='add'>+ * the ndlp with the remote N_Port DID must exist on the @vport's ndlp list.</div><div class='add'>+ * This routine constructs the proper feilds of the PLOGI IOCB and invokes</div><div class='add'>+ * the lpfc_sli_issue_iocb() routine to send out PLOGI ELS command.</div><div class='add'>+ *</div><div class='add'>+ * Note that, in lpfc_prep_els_iocb() routine, the reference count of ndlp</div><div class='add'>+ * will be incremented by 1 for holding the ndlp and the reference to ndlp</div><div class='add'>+ * will be stored into the context1 field of the IOCB for the completion</div><div class='add'>+ * callback function to the PLOGI ELS command.</div><div class='add'>+ *</div><div class='add'>+ * Return code</div><div class='add'>+ *   0 - Successfully issued a plogi for @vport</div><div class='add'>+ *   1 - failed to issue a plogi for @vport</div><div class='add'>+ **/</div><div class='ctx'> int</div><div class='ctx'> lpfc_issue_els_plogi(struct lpfc_vport *vport, uint32_t did, uint8_t retry)</div><div class='ctx'> {</div><div class='hunk'>@@ -1106,6 +1395,19 @@ lpfc_issue_els_plogi(struct lpfc_vport *vport, uint32_t did, uint8_t retry)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_cmpl_els_prli: Completion callback function for prli.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ * @cmdiocb: pointer to lpfc command iocb data structure.</div><div class='add'>+ * @rspiocb: pointer to lpfc response iocb data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine is the completion callback function for a Process Login</div><div class='add'>+ * (PRLI) ELS command. The PRLI response IOCB status is checked for error</div><div class='add'>+ * status. If there is error status reported, PRLI retry shall be attempted</div><div class='add'>+ * by invoking the lpfc_els_retry() routine. Otherwise, the state</div><div class='add'>+ * NLP_EVT_CMPL_PRLI is sent to the Discover State Machine (DSM) for this</div><div class='add'>+ * ndlp to mark the PRLI completion.</div><div class='add'>+ **/</div><div class='ctx'> static void</div><div class='ctx'> lpfc_cmpl_els_prli(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,</div><div class='ctx'> 		   struct lpfc_iocbq *rspiocb)</div><div class='hunk'>@@ -1164,6 +1466,27 @@ out:</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_issue_els_prli: Issue a prli iocb command for a vport.</div><div class='add'>+ * @vport: pointer to a host virtual N_Port data structure.</div><div class='add'>+ * @ndlp: pointer to a node-list data structure.</div><div class='add'>+ * @retry: number of retries to the command IOCB.</div><div class='add'>+ *</div><div class='add'>+ * This routine issues a Process Login (PRLI) ELS command for the</div><div class='add'>+ * @vport. The PRLI service parameters are set up in the payload of the</div><div class='add'>+ * PRLI Request command and the pointer to lpfc_cmpl_els_prli() routine</div><div class='add'>+ * is put to the IOCB completion callback func field before invoking the</div><div class='add'>+ * routine lpfc_sli_issue_iocb() to send out PRLI command.</div><div class='add'>+ *</div><div class='add'>+ * Note that, in lpfc_prep_els_iocb() routine, the reference count of ndlp</div><div class='add'>+ * will be incremented by 1 for holding the ndlp and the reference to ndlp</div><div class='add'>+ * will be stored into the context1 field of the IOCB for the completion</div><div class='add'>+ * callback function to the PRLI ELS command.</div><div class='add'>+ *</div><div class='add'>+ * Return code</div><div class='add'>+ *   0 - successfully issued prli iocb command for @vport</div><div class='add'>+ *   1 - failed to issue prli iocb command for @vport</div><div class='add'>+ **/</div><div class='ctx'> int</div><div class='ctx'> lpfc_issue_els_prli(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,</div><div class='ctx'> 		    uint8_t retry)</div><div class='hunk'>@@ -1233,6 +1556,92 @@ lpfc_issue_els_prli(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_rscn_disc: Perform rscn discovery for a vport.</div><div class='add'>+ * @vport: pointer to a host virtual N_Port data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine performs Registration State Change Notification (RSCN)</div><div class='add'>+ * discovery for a @vport. If the @vport's node port recovery count is not</div><div class='add'>+ * zero, it will invoke the lpfc_els_disc_plogi() to perform PLOGI for all</div><div class='add'>+ * the nodes that need recovery. If none of the PLOGI were needed through</div><div class='add'>+ * the lpfc_els_disc_plogi() routine, the lpfc_end_rscn() routine shall be</div><div class='add'>+ * invoked to check and handle possible more RSCN came in during the period</div><div class='add'>+ * of processing the current ones.</div><div class='add'>+ **/</div><div class='add'>+static void</div><div class='add'>+lpfc_rscn_disc(struct lpfc_vport *vport)</div><div class='add'>+{</div><div class='add'>+	lpfc_can_disctmo(vport);</div><div class='add'>+</div><div class='add'>+	/* RSCN discovery */</div><div class='add'>+	/* go thru NPR nodes and issue ELS PLOGIs */</div><div class='add'>+	if (vport-&gt;fc_npr_cnt)</div><div class='add'>+		if (lpfc_els_disc_plogi(vport))</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+	lpfc_end_rscn(vport);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * lpfc_adisc_done: Complete the adisc phase of discovery.</div><div class='add'>+ * @vport: pointer to lpfc_vport hba data structure that finished all ADISCs.</div><div class='add'>+ *</div><div class='add'>+ * This function is called when the final ADISC is completed during discovery.</div><div class='add'>+ * This function handles clearing link attention or issuing reg_vpi depending</div><div class='add'>+ * on whether npiv is enabled. This function also kicks off the PLOGI phase of</div><div class='add'>+ * discovery.</div><div class='add'>+ * This function is called with no locks held.</div><div class='add'>+ **/</div><div class='add'>+static void</div><div class='add'>+lpfc_adisc_done(struct lpfc_vport *vport)</div><div class='add'>+{</div><div class='add'>+	struct Scsi_Host   *shost = lpfc_shost_from_vport(vport);</div><div class='add'>+	struct lpfc_hba   *phba = vport-&gt;phba;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * For NPIV, cmpl_reg_vpi will set port_state to READY,</div><div class='add'>+	 * and continue discovery.</div><div class='add'>+	 */</div><div class='add'>+	if ((phba-&gt;sli3_options &amp; LPFC_SLI3_NPIV_ENABLED) &amp;&amp;</div><div class='add'>+	    !(vport-&gt;fc_flag &amp; FC_RSCN_MODE)) {</div><div class='add'>+		lpfc_issue_reg_vpi(phba, vport);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	/*</div><div class='add'>+	* For SLI2, we need to set port_state to READY</div><div class='add'>+	* and continue discovery.</div><div class='add'>+	*/</div><div class='add'>+	if (vport-&gt;port_state &lt; LPFC_VPORT_READY) {</div><div class='add'>+		/* If we get here, there is nothing to ADISC */</div><div class='add'>+		if (vport-&gt;port_type == LPFC_PHYSICAL_PORT)</div><div class='add'>+			lpfc_issue_clear_la(phba, vport);</div><div class='add'>+		if (!(vport-&gt;fc_flag &amp; FC_ABORT_DISCOVERY)) {</div><div class='add'>+			vport-&gt;num_disc_nodes = 0;</div><div class='add'>+			/* go thru NPR list, issue ELS PLOGIs */</div><div class='add'>+			if (vport-&gt;fc_npr_cnt)</div><div class='add'>+				lpfc_els_disc_plogi(vport);</div><div class='add'>+			if (!vport-&gt;num_disc_nodes) {</div><div class='add'>+				spin_lock_irq(shost-&gt;host_lock);</div><div class='add'>+				vport-&gt;fc_flag &amp;= ~FC_NDISC_ACTIVE;</div><div class='add'>+				spin_unlock_irq(shost-&gt;host_lock);</div><div class='add'>+				lpfc_can_disctmo(vport);</div><div class='add'>+				lpfc_end_rscn(vport);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		vport-&gt;port_state = LPFC_VPORT_READY;</div><div class='add'>+	} else</div><div class='add'>+		lpfc_rscn_disc(vport);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * lpfc_more_adisc: Issue more adisc as needed.</div><div class='add'>+ * @vport: pointer to a host virtual N_Port data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine determines whether there are more ndlps on a @vport</div><div class='add'>+ * node list need to have Address Discover (ADISC) issued. If so, it will</div><div class='add'>+ * invoke the lpfc_els_disc_adisc() routine to issue ADISC on the @vport's</div><div class='add'>+ * remaining nodes which need to have ADISC sent.</div><div class='add'>+ **/</div><div class='ctx'> void</div><div class='ctx'> lpfc_more_adisc(struct lpfc_vport *vport)</div><div class='ctx'> {</div><div class='hunk'>@@ -1252,23 +1661,27 @@ lpfc_more_adisc(struct lpfc_vport *vport)</div><div class='ctx'> 		/* go thru NPR nodes and issue any remaining ELS ADISCs */</div><div class='ctx'> 		sentadisc = lpfc_els_disc_adisc(vport);</div><div class='ctx'> 	}</div><div class='add'>+	if (!vport-&gt;num_disc_nodes)</div><div class='add'>+		lpfc_adisc_done(vport);</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-lpfc_rscn_disc(struct lpfc_vport *vport)</div><div class='del'>-{</div><div class='del'>-	lpfc_can_disctmo(vport);</div><div class='del'>-</div><div class='del'>-	/* RSCN discovery */</div><div class='del'>-	/* go thru NPR nodes and issue ELS PLOGIs */</div><div class='del'>-	if (vport-&gt;fc_npr_cnt)</div><div class='del'>-		if (lpfc_els_disc_plogi(vport))</div><div class='del'>-			return;</div><div class='del'>-</div><div class='del'>-	lpfc_end_rscn(vport);</div><div class='del'>-}</div><div class='del'>-</div><div class='add'>+/**</div><div class='add'>+ * lpfc_cmpl_els_adisc: Completion callback function for adisc.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ * @cmdiocb: pointer to lpfc command iocb data structure.</div><div class='add'>+ * @rspiocb: pointer to lpfc response iocb data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine is the completion function for issuing the Address Discover</div><div class='add'>+ * (ADISC) command. It first checks to see whether link went down during</div><div class='add'>+ * the discovery process. If so, the node will be marked as node port</div><div class='add'>+ * recovery for issuing discover IOCB by the link attention handler and</div><div class='add'>+ * exit. Otherwise, the response status is checked. If error was reported</div><div class='add'>+ * in the response status, the ADISC command shall be retried by invoking</div><div class='add'>+ * the lpfc_els_retry() routine. Otherwise, if no error was reported in</div><div class='add'>+ * the response status, the state machine is invoked to set transition</div><div class='add'>+ * with respect to NLP_EVT_CMPL_ADISC event.</div><div class='add'>+ **/</div><div class='ctx'> static void</div><div class='ctx'> lpfc_cmpl_els_adisc(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,</div><div class='ctx'> 		    struct lpfc_iocbq *rspiocb)</div><div class='hunk'>@@ -1333,57 +1746,34 @@ lpfc_cmpl_els_adisc(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,</div><div class='ctx'> 		lpfc_disc_state_machine(vport, ndlp, cmdiocb,</div><div class='ctx'> 					NLP_EVT_CMPL_ADISC);</div><div class='ctx'> </div><div class='del'>-	if (disc &amp;&amp; vport-&gt;num_disc_nodes) {</div><div class='del'>-		/* Check to see if there are more ADISCs to be sent */</div><div class='add'>+	/* Check to see if there are more ADISCs to be sent */</div><div class='add'>+	if (disc &amp;&amp; vport-&gt;num_disc_nodes)</div><div class='ctx'> 		lpfc_more_adisc(vport);</div><div class='del'>-</div><div class='del'>-		/* Check to see if we are done with ADISC authentication */</div><div class='del'>-		if (vport-&gt;num_disc_nodes == 0) {</div><div class='del'>-			/* If we get here, there is nothing left to ADISC */</div><div class='del'>-			/*</div><div class='del'>-			 * For NPIV, cmpl_reg_vpi will set port_state to READY,</div><div class='del'>-			 * and continue discovery.</div><div class='del'>-			 */</div><div class='del'>-			if ((phba-&gt;sli3_options &amp; LPFC_SLI3_NPIV_ENABLED) &amp;&amp;</div><div class='del'>-			   !(vport-&gt;fc_flag &amp; FC_RSCN_MODE)) {</div><div class='del'>-				lpfc_issue_reg_vpi(phba, vport);</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='del'>-			/*</div><div class='del'>-			 * For SLI2, we need to set port_state to READY</div><div class='del'>-			 * and continue discovery.</div><div class='del'>-			 */</div><div class='del'>-			if (vport-&gt;port_state &lt; LPFC_VPORT_READY) {</div><div class='del'>-				/* If we get here, there is nothing to ADISC */</div><div class='del'>-				if (vport-&gt;port_type == LPFC_PHYSICAL_PORT)</div><div class='del'>-					lpfc_issue_clear_la(phba, vport);</div><div class='del'>-</div><div class='del'>-				if (!(vport-&gt;fc_flag &amp; FC_ABORT_DISCOVERY)) {</div><div class='del'>-					vport-&gt;num_disc_nodes = 0;</div><div class='del'>-					/* go thru NPR list, issue ELS PLOGIs */</div><div class='del'>-					if (vport-&gt;fc_npr_cnt)</div><div class='del'>-						lpfc_els_disc_plogi(vport);</div><div class='del'>-</div><div class='del'>-					if (!vport-&gt;num_disc_nodes) {</div><div class='del'>-						spin_lock_irq(shost-&gt;host_lock);</div><div class='del'>-						vport-&gt;fc_flag &amp;=</div><div class='del'>-							~FC_NDISC_ACTIVE;</div><div class='del'>-						spin_unlock_irq(</div><div class='del'>-							shost-&gt;host_lock);</div><div class='del'>-						lpfc_can_disctmo(vport);</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-				vport-&gt;port_state = LPFC_VPORT_READY;</div><div class='del'>-			} else {</div><div class='del'>-				lpfc_rscn_disc(vport);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='ctx'> out:</div><div class='ctx'> 	lpfc_els_free_iocb(phba, cmdiocb);</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_issue_els_adisc: Issue an address discover iocb to an node on a vport.</div><div class='add'>+ * @vport: pointer to a virtual N_Port data structure.</div><div class='add'>+ * @ndlp: pointer to a node-list data structure.</div><div class='add'>+ * @retry: number of retries to the command IOCB.</div><div class='add'>+ *</div><div class='add'>+ * This routine issues an Address Discover (ADISC) for an @ndlp on a</div><div class='add'>+ * @vport. It prepares the payload of the ADISC ELS command, updates the</div><div class='add'>+ * and states of the ndlp, and invokes the lpfc_sli_issue_iocb() routine</div><div class='add'>+ * to issue the ADISC ELS command.</div><div class='add'>+ *</div><div class='add'>+ * Note that, in lpfc_prep_els_iocb() routine, the reference count of ndlp</div><div class='add'>+ * will be incremented by 1 for holding the ndlp and the reference to ndlp</div><div class='add'>+ * will be stored into the context1 field of the IOCB for the completion</div><div class='add'>+ * callback function to the ADISC ELS command.</div><div class='add'>+ *</div><div class='add'>+ * Return code</div><div class='add'>+ *   0 - successfully issued adisc</div><div class='add'>+ *   1 - failed to issue adisc</div><div class='add'>+ **/</div><div class='ctx'> int</div><div class='ctx'> lpfc_issue_els_adisc(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,</div><div class='ctx'> 		     uint8_t retry)</div><div class='hunk'>@@ -1437,6 +1827,18 @@ lpfc_issue_els_adisc(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_cmpl_els_logo: Completion callback function for logo.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ * @cmdiocb: pointer to lpfc command iocb data structure.</div><div class='add'>+ * @rspiocb: pointer to lpfc response iocb data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine is the completion function for issuing the ELS Logout (LOGO)</div><div class='add'>+ * command. If no error status was reported from the LOGO response, the</div><div class='add'>+ * state machine of the associated ndlp shall be invoked for transition with</div><div class='add'>+ * respect to NLP_EVT_CMPL_LOGO event. Otherwise, if error status was reported,</div><div class='add'>+ * the lpfc_els_retry() routine will be invoked to retry the LOGO command.</div><div class='add'>+ **/</div><div class='ctx'> static void</div><div class='ctx'> lpfc_cmpl_els_logo(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,</div><div class='ctx'> 		   struct lpfc_iocbq *rspiocb)</div><div class='hunk'>@@ -1502,6 +1904,26 @@ out:</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_issue_els_logo: Issue a logo to an node on a vport.</div><div class='add'>+ * @vport: pointer to a virtual N_Port data structure.</div><div class='add'>+ * @ndlp: pointer to a node-list data structure.</div><div class='add'>+ * @retry: number of retries to the command IOCB.</div><div class='add'>+ *</div><div class='add'>+ * This routine constructs and issues an ELS Logout (LOGO) iocb command</div><div class='add'>+ * to a remote node, referred by an @ndlp on a @vport. It constructs the</div><div class='add'>+ * payload of the IOCB, properly sets up the @ndlp state, and invokes the</div><div class='add'>+ * lpfc_sli_issue_iocb() routine to send out the LOGO ELS command.</div><div class='add'>+ *</div><div class='add'>+ * Note that, in lpfc_prep_els_iocb() routine, the reference count of ndlp</div><div class='add'>+ * will be incremented by 1 for holding the ndlp and the reference to ndlp</div><div class='add'>+ * will be stored into the context1 field of the IOCB for the completion</div><div class='add'>+ * callback function to the LOGO ELS command.</div><div class='add'>+ *</div><div class='add'>+ * Return code</div><div class='add'>+ *   0 - successfully issued logo</div><div class='add'>+ *   1 - failed to issue logo</div><div class='add'>+ **/</div><div class='ctx'> int</div><div class='ctx'> lpfc_issue_els_logo(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,</div><div class='ctx'> 		    uint8_t retry)</div><div class='hunk'>@@ -1563,6 +1985,22 @@ lpfc_issue_els_logo(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_cmpl_els_cmd: Completion callback function for generic els command.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ * @cmdiocb: pointer to lpfc command iocb data structure.</div><div class='add'>+ * @rspiocb: pointer to lpfc response iocb data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine is a generic completion callback function for ELS commands.</div><div class='add'>+ * Specifically, it is the callback function which does not need to perform</div><div class='add'>+ * any command specific operations. It is currently used by the ELS command</div><div class='add'>+ * issuing routines for the ELS State Change  Request (SCR),</div><div class='add'>+ * lpfc_issue_els_scr(), and the ELS Fibre Channel Address Resolution</div><div class='add'>+ * Protocol Response (FARPR) routine, lpfc_issue_els_farpr(). Other than</div><div class='add'>+ * certain debug loggings, this callback function simply invokes the</div><div class='add'>+ * lpfc_els_chk_latt() routine to check whether link went down during the</div><div class='add'>+ * discovery process.</div><div class='add'>+ **/</div><div class='ctx'> static void</div><div class='ctx'> lpfc_cmpl_els_cmd(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,</div><div class='ctx'> 		  struct lpfc_iocbq *rspiocb)</div><div class='hunk'>@@ -1587,6 +2025,28 @@ lpfc_cmpl_els_cmd(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_issue_els_scr: Issue a scr to an node on a vport.</div><div class='add'>+ * @vport: pointer to a host virtual N_Port data structure.</div><div class='add'>+ * @nportid: N_Port identifier to the remote node.</div><div class='add'>+ * @retry: number of retries to the command IOCB.</div><div class='add'>+ *</div><div class='add'>+ * This routine issues a State Change Request (SCR) to a fabric node</div><div class='add'>+ * on a @vport. The remote node @nportid is passed into the function. It</div><div class='add'>+ * first search the @vport node list to find the matching ndlp. If no such</div><div class='add'>+ * ndlp is found, a new ndlp shall be created for this (SCR) purpose. An</div><div class='add'>+ * IOCB is allocated, payload prepared, and the lpfc_sli_issue_iocb()</div><div class='add'>+ * routine is invoked to send the SCR IOCB.</div><div class='add'>+ *</div><div class='add'>+ * Note that, in lpfc_prep_els_iocb() routine, the reference count of ndlp</div><div class='add'>+ * will be incremented by 1 for holding the ndlp and the reference to ndlp</div><div class='add'>+ * will be stored into the context1 field of the IOCB for the completion</div><div class='add'>+ * callback function to the SCR ELS command.</div><div class='add'>+ *</div><div class='add'>+ * Return code</div><div class='add'>+ *   0 - Successfully issued scr command</div><div class='add'>+ *   1 - Failed to issue scr command</div><div class='add'>+ **/</div><div class='ctx'> int</div><div class='ctx'> lpfc_issue_els_scr(struct lpfc_vport *vport, uint32_t nportid, uint8_t retry)</div><div class='ctx'> {</div><div class='hunk'>@@ -1659,6 +2119,28 @@ lpfc_issue_els_scr(struct lpfc_vport *vport, uint32_t nportid, uint8_t retry)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_issue_els_farpr: Issue a farp to an node on a vport.</div><div class='add'>+ * @vport: pointer to a host virtual N_Port data structure.</div><div class='add'>+ * @nportid: N_Port identifier to the remote node.</div><div class='add'>+ * @retry: number of retries to the command IOCB.</div><div class='add'>+ *</div><div class='add'>+ * This routine issues a Fibre Channel Address Resolution Response</div><div class='add'>+ * (FARPR) to a node on a vport. The remote node N_Port identifier (@nportid)</div><div class='add'>+ * is passed into the function. It first search the @vport node list to find</div><div class='add'>+ * the matching ndlp. If no such ndlp is found, a new ndlp shall be created</div><div class='add'>+ * for this (FARPR) purpose. An IOCB is allocated, payload prepared, and the</div><div class='add'>+ * lpfc_sli_issue_iocb() routine is invoked to send the FARPR ELS command.</div><div class='add'>+ *</div><div class='add'>+ * Note that, in lpfc_prep_els_iocb() routine, the reference count of ndlp</div><div class='add'>+ * will be incremented by 1 for holding the ndlp and the reference to ndlp</div><div class='add'>+ * will be stored into the context1 field of the IOCB for the completion</div><div class='add'>+ * callback function to the PARPR ELS command.</div><div class='add'>+ *</div><div class='add'>+ * Return code</div><div class='add'>+ *   0 - Successfully issued farpr command</div><div class='add'>+ *   1 - Failed to issue farpr command</div><div class='add'>+ **/</div><div class='ctx'> static int</div><div class='ctx'> lpfc_issue_els_farpr(struct lpfc_vport *vport, uint32_t nportid, uint8_t retry)</div><div class='ctx'> {</div><div class='hunk'>@@ -1748,6 +2230,18 @@ lpfc_issue_els_farpr(struct lpfc_vport *vport, uint32_t nportid, uint8_t retry)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_cancel_retry_delay_tmo: Cancel the timer with delayed iocb-cmd retry.</div><div class='add'>+ * @vport: pointer to a host virtual N_Port data structure.</div><div class='add'>+ * @nlp: pointer to a node-list data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine cancels the timer with a delayed IOCB-command retry for</div><div class='add'>+ * a @vport's @ndlp. It stops the timer for the delayed function retrial and</div><div class='add'>+ * removes the ELS retry event if it presents. In addition, if the</div><div class='add'>+ * NLP_NPR_2B_DISC bit is set in the @nlp's nlp_flag bitmap, ADISC IOCB</div><div class='add'>+ * commands are sent for the @vport's nodes that require issuing discovery</div><div class='add'>+ * ADISC.</div><div class='add'>+ **/</div><div class='ctx'> void</div><div class='ctx'> lpfc_cancel_retry_delay_tmo(struct lpfc_vport *vport, struct lpfc_nodelist *nlp)</div><div class='ctx'> {</div><div class='hunk'>@@ -1775,25 +2269,36 @@ lpfc_cancel_retry_delay_tmo(struct lpfc_vport *vport, struct lpfc_nodelist *nlp)</div><div class='ctx'> 			if (vport-&gt;port_state &lt; LPFC_VPORT_READY) {</div><div class='ctx'> 				/* Check if there are more ADISCs to be sent */</div><div class='ctx'> 				lpfc_more_adisc(vport);</div><div class='del'>-				if ((vport-&gt;num_disc_nodes == 0) &amp;&amp;</div><div class='del'>-				    (vport-&gt;fc_npr_cnt))</div><div class='del'>-					lpfc_els_disc_plogi(vport);</div><div class='ctx'> 			} else {</div><div class='ctx'> 				/* Check if there are more PLOGIs to be sent */</div><div class='ctx'> 				lpfc_more_plogi(vport);</div><div class='del'>-			}</div><div class='del'>-			if (vport-&gt;num_disc_nodes == 0) {</div><div class='del'>-				spin_lock_irq(shost-&gt;host_lock);</div><div class='del'>-				vport-&gt;fc_flag &amp;= ~FC_NDISC_ACTIVE;</div><div class='del'>-				spin_unlock_irq(shost-&gt;host_lock);</div><div class='del'>-				lpfc_can_disctmo(vport);</div><div class='del'>-				lpfc_end_rscn(vport);</div><div class='add'>+				if (vport-&gt;num_disc_nodes == 0) {</div><div class='add'>+					spin_lock_irq(shost-&gt;host_lock);</div><div class='add'>+					vport-&gt;fc_flag &amp;= ~FC_NDISC_ACTIVE;</div><div class='add'>+					spin_unlock_irq(shost-&gt;host_lock);</div><div class='add'>+					lpfc_can_disctmo(vport);</div><div class='add'>+					lpfc_end_rscn(vport);</div><div class='add'>+				}</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_els_retry_delay: Timer function with a ndlp delayed function timer.</div><div class='add'>+ * @ptr: holder for the pointer to the timer function associated data (ndlp).</div><div class='add'>+ *</div><div class='add'>+ * This routine is invoked by the ndlp delayed-function timer to check</div><div class='add'>+ * whether there is any pending ELS retry event(s) with the node. If not, it</div><div class='add'>+ * simply returns. Otherwise, if there is at least one ELS delayed event, it</div><div class='add'>+ * adds the delayed events to the HBA work list and invokes the</div><div class='add'>+ * lpfc_worker_wake_up() routine to wake up worker thread to process the</div><div class='add'>+ * event. Note that lpfc_nlp_get() is called before posting the event to</div><div class='add'>+ * the work list to hold reference count of ndlp so that it guarantees the</div><div class='add'>+ * reference to ndlp will still be available when the worker thread gets</div><div class='add'>+ * to the event associated with the ndlp.</div><div class='add'>+ **/</div><div class='ctx'> void</div><div class='ctx'> lpfc_els_retry_delay(unsigned long ptr)</div><div class='ctx'> {</div><div class='hunk'>@@ -1822,6 +2327,15 @@ lpfc_els_retry_delay(unsigned long ptr)</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_els_retry_delay_handler: Work thread handler for ndlp delayed function.</div><div class='add'>+ * @ndlp: pointer to a node-list data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine is the worker-thread handler for processing the @ndlp delayed</div><div class='add'>+ * event(s), posted by the lpfc_els_retry_delay() routine. It simply retrieves</div><div class='add'>+ * the last ELS command from the associated ndlp and invokes the proper ELS</div><div class='add'>+ * function according to the delayed ELS command to retry the command.</div><div class='add'>+ **/</div><div class='ctx'> void</div><div class='ctx'> lpfc_els_retry_delay_handler(struct lpfc_nodelist *ndlp)</div><div class='ctx'> {</div><div class='hunk'>@@ -1884,6 +2398,27 @@ lpfc_els_retry_delay_handler(struct lpfc_nodelist *ndlp)</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_els_retry: Make retry decision on an els command iocb.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ * @cmdiocb: pointer to lpfc command iocb data structure.</div><div class='add'>+ * @rspiocb: pointer to lpfc response iocb data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine makes a retry decision on an ELS command IOCB, which has</div><div class='add'>+ * failed. The following ELS IOCBs use this function for retrying the command</div><div class='add'>+ * when previously issued command responsed with error status: FLOGI, PLOGI,</div><div class='add'>+ * PRLI, ADISC, LOGO, and FDISC. Based on the ELS command type and the</div><div class='add'>+ * returned error status, it makes the decision whether a retry shall be</div><div class='add'>+ * issued for the command, and whether a retry shall be made immediately or</div><div class='add'>+ * delayed. In the former case, the corresponding ELS command issuing-function</div><div class='add'>+ * is called to retry the command. In the later case, the ELS command shall</div><div class='add'>+ * be posted to the ndlp delayed event and delayed function timer set to the</div><div class='add'>+ * ndlp for the delayed command issusing.</div><div class='add'>+ *</div><div class='add'>+ * Return code</div><div class='add'>+ *   0 - No retry of els command is made</div><div class='add'>+ *   1 - Immediate or delayed retry of els command is made</div><div class='add'>+ **/</div><div class='ctx'> static int</div><div class='ctx'> lpfc_els_retry(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,</div><div class='ctx'> 	       struct lpfc_iocbq *rspiocb)</div><div class='hunk'>@@ -2051,7 +2586,7 @@ lpfc_els_retry(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,</div><div class='ctx'> 			  (stat.un.b.lsRjtRsnCodeExp == LSEXP_INVALID_NPORT_ID))</div><div class='ctx'> 			  ) {</div><div class='ctx'> 				lpfc_printf_vlog(vport, KERN_ERR, LOG_ELS,</div><div class='del'>-						 "0123 FDISC Failed (x%x). "</div><div class='add'>+						 "0122 FDISC Failed (x%x). "</div><div class='ctx'> 						 "Fabric Detected Bad WWN\n",</div><div class='ctx'> 						 stat.un.lsRjtError);</div><div class='ctx'> 				lpfc_vport_set_state(vport,</div><div class='hunk'>@@ -2182,12 +2717,26 @@ lpfc_els_retry(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_els_free_data: Free lpfc dma buffer and data structure with an iocb.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ * @buf_ptr1: pointer to the lpfc DMA buffer data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine releases the lpfc DMA (Direct Memory Access) buffer(s)</div><div class='add'>+ * associated with a command IOCB back to the lpfc DMA buffer pool. It first</div><div class='add'>+ * checks to see whether there is a lpfc DMA buffer associated with the</div><div class='add'>+ * response of the command IOCB. If so, it will be released before releasing</div><div class='add'>+ * the lpfc DMA buffer associated with the IOCB itself.</div><div class='add'>+ *</div><div class='add'>+ * Return code</div><div class='add'>+ *   0 - Successfully released lpfc DMA buffer (currently, always return 0)</div><div class='add'>+ **/</div><div class='ctx'> static int</div><div class='ctx'> lpfc_els_free_data(struct lpfc_hba *phba, struct lpfc_dmabuf *buf_ptr1)</div><div class='ctx'> {</div><div class='ctx'> 	struct lpfc_dmabuf *buf_ptr;</div><div class='ctx'> </div><div class='del'>-	/* Free the response before processing the command.  */</div><div class='add'>+	/* Free the response before processing the command. */</div><div class='ctx'> 	if (!list_empty(&amp;buf_ptr1-&gt;list)) {</div><div class='ctx'> 		list_remove_head(&amp;buf_ptr1-&gt;list, buf_ptr,</div><div class='ctx'> 				 struct lpfc_dmabuf,</div><div class='hunk'>@@ -2200,6 +2749,18 @@ lpfc_els_free_data(struct lpfc_hba *phba, struct lpfc_dmabuf *buf_ptr1)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_els_free_bpl: Free lpfc dma buffer and data structure with bpl.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ * @buf_ptr: pointer to the lpfc dma buffer data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine releases the lpfc Direct Memory Access (DMA) buffer</div><div class='add'>+ * associated with a Buffer Pointer List (BPL) back to the lpfc DMA buffer</div><div class='add'>+ * pool.</div><div class='add'>+ *</div><div class='add'>+ * Return code</div><div class='add'>+ *   0 - Successfully released lpfc DMA buffer (currently, always return 0)</div><div class='add'>+ **/</div><div class='ctx'> static int</div><div class='ctx'> lpfc_els_free_bpl(struct lpfc_hba *phba, struct lpfc_dmabuf *buf_ptr)</div><div class='ctx'> {</div><div class='hunk'>@@ -2208,6 +2769,33 @@ lpfc_els_free_bpl(struct lpfc_hba *phba, struct lpfc_dmabuf *buf_ptr)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_els_free_iocb: Free a command iocb and its associated resources.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ * @elsiocb: pointer to lpfc els command iocb data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine frees a command IOCB and its associated resources. The</div><div class='add'>+ * command IOCB data structure contains the reference to various associated</div><div class='add'>+ * resources, these fields must be set to NULL if the associated reference</div><div class='add'>+ * not present:</div><div class='add'>+ *   context1 - reference to ndlp</div><div class='add'>+ *   context2 - reference to cmd</div><div class='add'>+ *   context2-&gt;next - reference to rsp</div><div class='add'>+ *   context3 - reference to bpl</div><div class='add'>+ *</div><div class='add'>+ * It first properly decrements the reference count held on ndlp for the</div><div class='add'>+ * IOCB completion callback function. If LPFC_DELAY_MEM_FREE flag is not</div><div class='add'>+ * set, it invokes the lpfc_els_free_data() routine to release the Direct</div><div class='add'>+ * Memory Access (DMA) buffers associated with the IOCB. Otherwise, it</div><div class='add'>+ * adds the DMA buffer the @phba data structure for the delayed release.</div><div class='add'>+ * If reference to the Buffer Pointer List (BPL) is present, the</div><div class='add'>+ * lpfc_els_free_bpl() routine is invoked to release the DMA memory</div><div class='add'>+ * associated with BPL. Finally, the lpfc_sli_release_iocbq() routine is</div><div class='add'>+ * invoked to release the IOCB data structure back to @phba IOCBQ list.</div><div class='add'>+ *</div><div class='add'>+ * Return code</div><div class='add'>+ *   0 - Success (currently, always return 0)</div><div class='add'>+ **/</div><div class='ctx'> int</div><div class='ctx'> lpfc_els_free_iocb(struct lpfc_hba *phba, struct lpfc_iocbq *elsiocb)</div><div class='ctx'> {</div><div class='hunk'>@@ -2274,6 +2862,23 @@ lpfc_els_free_iocb(struct lpfc_hba *phba, struct lpfc_iocbq *elsiocb)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_cmpl_els_logo_acc: Completion callback function to logo acc response.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ * @cmdiocb: pointer to lpfc command iocb data structure.</div><div class='add'>+ * @rspiocb: pointer to lpfc response iocb data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine is the completion callback function to the Logout (LOGO)</div><div class='add'>+ * Accept (ACC) Response ELS command. This routine is invoked to indicate</div><div class='add'>+ * the completion of the LOGO process. It invokes the lpfc_nlp_not_used() to</div><div class='add'>+ * release the ndlp if it has the last reference remaining (reference count</div><div class='add'>+ * is 1). If succeeded (meaning ndlp released), it sets the IOCB context1</div><div class='add'>+ * field to NULL to inform the following lpfc_els_free_iocb() routine no</div><div class='add'>+ * ndlp reference count needs to be decremented. Otherwise, the ndlp</div><div class='add'>+ * reference use-count shall be decremented by the lpfc_els_free_iocb()</div><div class='add'>+ * routine. Finally, the lpfc_els_free_iocb() is invoked to release the</div><div class='add'>+ * IOCB data structure.</div><div class='add'>+ **/</div><div class='ctx'> static void</div><div class='ctx'> lpfc_cmpl_els_logo_acc(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,</div><div class='ctx'> 		       struct lpfc_iocbq *rspiocb)</div><div class='hunk'>@@ -2311,6 +2916,19 @@ lpfc_cmpl_els_logo_acc(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_mbx_cmpl_dflt_rpi: Completion callbk func for unreg dflt rpi mbox cmd.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ * @pmb: pointer to the driver internal queue element for mailbox command.</div><div class='add'>+ *</div><div class='add'>+ * This routine is the completion callback function for unregister default</div><div class='add'>+ * RPI (Remote Port Index) mailbox command to the @phba. It simply releases</div><div class='add'>+ * the associated lpfc Direct Memory Access (DMA) buffer back to the pool and</div><div class='add'>+ * decrements the ndlp reference count held for this completion callback</div><div class='add'>+ * function. After that, it invokes the lpfc_nlp_not_used() to check</div><div class='add'>+ * whether there is only one reference left on the ndlp. If so, it will</div><div class='add'>+ * perform one more decrement and trigger the release of the ndlp.</div><div class='add'>+ **/</div><div class='ctx'> void</div><div class='ctx'> lpfc_mbx_cmpl_dflt_rpi(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)</div><div class='ctx'> {</div><div class='hunk'>@@ -2332,6 +2950,22 @@ lpfc_mbx_cmpl_dflt_rpi(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_cmpl_els_rsp: Completion callback function for els response iocb cmd.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ * @cmdiocb: pointer to lpfc command iocb data structure.</div><div class='add'>+ * @rspiocb: pointer to lpfc response iocb data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine is the completion callback function for ELS Response IOCB</div><div class='add'>+ * command. In normal case, this callback function just properly sets the</div><div class='add'>+ * nlp_flag bitmap in the ndlp data structure, if the mbox command reference</div><div class='add'>+ * field in the command IOCB is not NULL, the referred mailbox command will</div><div class='add'>+ * be send out, and then invokes the lpfc_els_free_iocb() routine to release</div><div class='add'>+ * the IOCB. Under error conditions, such as when a LS_RJT is returned or a</div><div class='add'>+ * link down event occurred during the discovery, the lpfc_nlp_not_used()</div><div class='add'>+ * routine shall be invoked trying to release the ndlp if no other threads</div><div class='add'>+ * are currently referring it.</div><div class='add'>+ **/</div><div class='ctx'> static void</div><div class='ctx'> lpfc_cmpl_els_rsp(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,</div><div class='ctx'> 		  struct lpfc_iocbq *rspiocb)</div><div class='hunk'>@@ -2487,6 +3121,31 @@ out:</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_els_rsp_acc: Prepare and issue an acc response iocb command.</div><div class='add'>+ * @vport: pointer to a host virtual N_Port data structure.</div><div class='add'>+ * @flag: the els command code to be accepted.</div><div class='add'>+ * @oldiocb: pointer to the original lpfc command iocb data structure.</div><div class='add'>+ * @ndlp: pointer to a node-list data structure.</div><div class='add'>+ * @mbox: pointer to the driver internal queue element for mailbox command.</div><div class='add'>+ *</div><div class='add'>+ * This routine prepares and issues an Accept (ACC) response IOCB</div><div class='add'>+ * command. It uses the @flag to properly set up the IOCB field for the</div><div class='add'>+ * specific ACC response command to be issued and invokes the</div><div class='add'>+ * lpfc_sli_issue_iocb() routine to send out ACC response IOCB. If a</div><div class='add'>+ * @mbox pointer is passed in, it will be put into the context_un.mbox</div><div class='add'>+ * field of the IOCB for the completion callback function to issue the</div><div class='add'>+ * mailbox command to the HBA later when callback is invoked.</div><div class='add'>+ *</div><div class='add'>+ * Note that, in lpfc_prep_els_iocb() routine, the reference count of ndlp</div><div class='add'>+ * will be incremented by 1 for holding the ndlp and the reference to ndlp</div><div class='add'>+ * will be stored into the context1 field of the IOCB for the completion</div><div class='add'>+ * callback function to the corresponding response ELS IOCB command.</div><div class='add'>+ *</div><div class='add'>+ * Return code</div><div class='add'>+ *   0 - Successfully issued acc response</div><div class='add'>+ *   1 - Failed to issue acc response</div><div class='add'>+ **/</div><div class='ctx'> int</div><div class='ctx'> lpfc_els_rsp_acc(struct lpfc_vport *vport, uint32_t flag,</div><div class='ctx'> 		 struct lpfc_iocbq *oldiocb, struct lpfc_nodelist *ndlp,</div><div class='hunk'>@@ -2601,6 +3260,28 @@ lpfc_els_rsp_acc(struct lpfc_vport *vport, uint32_t flag,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_els_rsp_reject: Propare and issue a rjt response iocb command.</div><div class='add'>+ * @vport: pointer to a virtual N_Port data structure.</div><div class='add'>+ * @rejectError:</div><div class='add'>+ * @oldiocb: pointer to the original lpfc command iocb data structure.</div><div class='add'>+ * @ndlp: pointer to a node-list data structure.</div><div class='add'>+ * @mbox: pointer to the driver internal queue element for mailbox command.</div><div class='add'>+ *</div><div class='add'>+ * This routine prepares and issue an Reject (RJT) response IOCB</div><div class='add'>+ * command. If a @mbox pointer is passed in, it will be put into the</div><div class='add'>+ * context_un.mbox field of the IOCB for the completion callback function</div><div class='add'>+ * to issue to the HBA later.</div><div class='add'>+ *</div><div class='add'>+ * Note that, in lpfc_prep_els_iocb() routine, the reference count of ndlp</div><div class='add'>+ * will be incremented by 1 for holding the ndlp and the reference to ndlp</div><div class='add'>+ * will be stored into the context1 field of the IOCB for the completion</div><div class='add'>+ * callback function to the reject response ELS IOCB command.</div><div class='add'>+ *</div><div class='add'>+ * Return code</div><div class='add'>+ *   0 - Successfully issued reject response</div><div class='add'>+ *   1 - Failed to issue reject response</div><div class='add'>+ **/</div><div class='ctx'> int</div><div class='ctx'> lpfc_els_rsp_reject(struct lpfc_vport *vport, uint32_t rejectError,</div><div class='ctx'> 		    struct lpfc_iocbq *oldiocb, struct lpfc_nodelist *ndlp,</div><div class='hunk'>@@ -2660,6 +3341,25 @@ lpfc_els_rsp_reject(struct lpfc_vport *vport, uint32_t rejectError,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_els_rsp_adisc_acc: Prepare and issue acc response to adisc iocb cmd.</div><div class='add'>+ * @vport: pointer to a virtual N_Port data structure.</div><div class='add'>+ * @oldiocb: pointer to the original lpfc command iocb data structure.</div><div class='add'>+ * @ndlp: pointer to a node-list data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine prepares and issues an Accept (ACC) response to Address</div><div class='add'>+ * Discover (ADISC) ELS command. It simply prepares the payload of the IOCB</div><div class='add'>+ * and invokes the lpfc_sli_issue_iocb() routine to send out the command.</div><div class='add'>+ *</div><div class='add'>+ * Note that, in lpfc_prep_els_iocb() routine, the reference count of ndlp</div><div class='add'>+ * will be incremented by 1 for holding the ndlp and the reference to ndlp</div><div class='add'>+ * will be stored into the context1 field of the IOCB for the completion</div><div class='add'>+ * callback function to the ADISC Accept response ELS IOCB command.</div><div class='add'>+ *</div><div class='add'>+ * Return code</div><div class='add'>+ *   0 - Successfully issued acc adisc response</div><div class='add'>+ *   1 - Failed to issue adisc acc response</div><div class='add'>+ **/</div><div class='ctx'> int</div><div class='ctx'> lpfc_els_rsp_adisc_acc(struct lpfc_vport *vport, struct lpfc_iocbq *oldiocb,</div><div class='ctx'> 		       struct lpfc_nodelist *ndlp)</div><div class='hunk'>@@ -2716,6 +3416,25 @@ lpfc_els_rsp_adisc_acc(struct lpfc_vport *vport, struct lpfc_iocbq *oldiocb,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_els_rsp_prli_acc: Prepare and issue acc response to prli iocb cmd.</div><div class='add'>+ * @vport: pointer to a virtual N_Port data structure.</div><div class='add'>+ * @oldiocb: pointer to the original lpfc command iocb data structure.</div><div class='add'>+ * @ndlp: pointer to a node-list data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine prepares and issues an Accept (ACC) response to Process</div><div class='add'>+ * Login (PRLI) ELS command. It simply prepares the payload of the IOCB</div><div class='add'>+ * and invokes the lpfc_sli_issue_iocb() routine to send out the command.</div><div class='add'>+ *</div><div class='add'>+ * Note that, in lpfc_prep_els_iocb() routine, the reference count of ndlp</div><div class='add'>+ * will be incremented by 1 for holding the ndlp and the reference to ndlp</div><div class='add'>+ * will be stored into the context1 field of the IOCB for the completion</div><div class='add'>+ * callback function to the PRLI Accept response ELS IOCB command.</div><div class='add'>+ *</div><div class='add'>+ * Return code</div><div class='add'>+ *   0 - Successfully issued acc prli response</div><div class='add'>+ *   1 - Failed to issue acc prli response</div><div class='add'>+ **/</div><div class='ctx'> int</div><div class='ctx'> lpfc_els_rsp_prli_acc(struct lpfc_vport *vport, struct lpfc_iocbq *oldiocb,</div><div class='ctx'> 		      struct lpfc_nodelist *ndlp)</div><div class='hunk'>@@ -2795,6 +3514,32 @@ lpfc_els_rsp_prli_acc(struct lpfc_vport *vport, struct lpfc_iocbq *oldiocb,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_els_rsp_rnid_acc: Issue rnid acc response iocb command.</div><div class='add'>+ * @vport: pointer to a virtual N_Port data structure.</div><div class='add'>+ * @format: rnid command format.</div><div class='add'>+ * @oldiocb: pointer to the original lpfc command iocb data structure.</div><div class='add'>+ * @ndlp: pointer to a node-list data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine issues a Request Node Identification Data (RNID) Accept</div><div class='add'>+ * (ACC) response. It constructs the RNID ACC response command according to</div><div class='add'>+ * the proper @format and then calls the lpfc_sli_issue_iocb() routine to</div><div class='add'>+ * issue the response. Note that this command does not need to hold the ndlp</div><div class='add'>+ * reference count for the callback. So, the ndlp reference count taken by</div><div class='add'>+ * the lpfc_prep_els_iocb() routine is put back and the context1 field of</div><div class='add'>+ * IOCB is set to NULL to indicate to the lpfc_els_free_iocb() routine that</div><div class='add'>+ * there is no ndlp reference available.</div><div class='add'>+ *</div><div class='add'>+ * Note that, in lpfc_prep_els_iocb() routine, the reference count of ndlp</div><div class='add'>+ * will be incremented by 1 for holding the ndlp and the reference to ndlp</div><div class='add'>+ * will be stored into the context1 field of the IOCB for the completion</div><div class='add'>+ * callback function. However, for the RNID Accept Response ELS command,</div><div class='add'>+ * this is undone later by this routine after the IOCB is allocated.</div><div class='add'>+ *</div><div class='add'>+ * Return code</div><div class='add'>+ *   0 - Successfully issued acc rnid response</div><div class='add'>+ *   1 - Failed to issue acc rnid response</div><div class='add'>+ **/</div><div class='ctx'> static int</div><div class='ctx'> lpfc_els_rsp_rnid_acc(struct lpfc_vport *vport, uint8_t format,</div><div class='ctx'> 		      struct lpfc_iocbq *oldiocb, struct lpfc_nodelist *ndlp)</div><div class='hunk'>@@ -2875,6 +3620,25 @@ lpfc_els_rsp_rnid_acc(struct lpfc_vport *vport, uint8_t format,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_els_disc_adisc: Issue remaining adisc iocbs to npr nodes of a vport.</div><div class='add'>+ * @vport: pointer to a host virtual N_Port data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine issues Address Discover (ADISC) ELS commands to those</div><div class='add'>+ * N_Ports which are in node port recovery state and ADISC has not been issued</div><div class='add'>+ * for the @vport. Each time an ELS ADISC IOCB is issued by invoking the</div><div class='add'>+ * lpfc_issue_els_adisc() routine, the per @vport number of discover count</div><div class='add'>+ * (num_disc_nodes) shall be incremented. If the num_disc_nodes reaches a</div><div class='add'>+ * pre-configured threshold (cfg_discovery_threads), the @vport fc_flag will</div><div class='add'>+ * be marked with FC_NLP_MORE bit and the process of issuing remaining ADISC</div><div class='add'>+ * IOCBs quit for later pick up. On the other hand, after walking through</div><div class='add'>+ * all the ndlps with the @vport and there is none ADISC IOCB issued, the</div><div class='add'>+ * @vport fc_flag shall be cleared with FC_NLP_MORE bit indicating there is</div><div class='add'>+ * no more ADISC need to be sent.</div><div class='add'>+ *</div><div class='add'>+ * Return code</div><div class='add'>+ *    The number of N_Ports with adisc issued.</div><div class='add'>+ **/</div><div class='ctx'> int</div><div class='ctx'> lpfc_els_disc_adisc(struct lpfc_vport *vport)</div><div class='ctx'> {</div><div class='hunk'>@@ -2914,6 +3678,25 @@ lpfc_els_disc_adisc(struct lpfc_vport *vport)</div><div class='ctx'> 	return sentadisc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_els_disc_plogi: Issue plogi for all npr nodes of a vport before adisc.</div><div class='add'>+ * @vport: pointer to a host virtual N_Port data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine issues Port Login (PLOGI) ELS commands to all the N_Ports</div><div class='add'>+ * which are in node port recovery state, with a @vport. Each time an ELS</div><div class='add'>+ * ADISC PLOGI IOCB is issued by invoking the lpfc_issue_els_plogi() routine,</div><div class='add'>+ * the per @vport number of discover count (num_disc_nodes) shall be</div><div class='add'>+ * incremented. If the num_disc_nodes reaches a pre-configured threshold</div><div class='add'>+ * (cfg_discovery_threads), the @vport fc_flag will be marked with FC_NLP_MORE</div><div class='add'>+ * bit set and quit the process of issuing remaining ADISC PLOGIN IOCBs for</div><div class='add'>+ * later pick up. On the other hand, after walking through all the ndlps with</div><div class='add'>+ * the @vport and there is none ADISC PLOGI IOCB issued, the @vport fc_flag</div><div class='add'>+ * shall be cleared with the FC_NLP_MORE bit indicating there is no more ADISC</div><div class='add'>+ * PLOGI need to be sent.</div><div class='add'>+ *</div><div class='add'>+ * Return code</div><div class='add'>+ *   The number of N_Ports with plogi issued.</div><div class='add'>+ **/</div><div class='ctx'> int</div><div class='ctx'> lpfc_els_disc_plogi(struct lpfc_vport *vport)</div><div class='ctx'> {</div><div class='hunk'>@@ -2954,6 +3737,15 @@ lpfc_els_disc_plogi(struct lpfc_vport *vport)</div><div class='ctx'> 	return sentplogi;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_els_flush_rscn: Clean up any rscn activities with a vport.</div><div class='add'>+ * @vport: pointer to a host virtual N_Port data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine cleans up any Registration State Change Notification</div><div class='add'>+ * (RSCN) activity with a @vport. Note that the fc_rscn_flush flag of the</div><div class='add'>+ * @vport together with the host_lock is used to prevent multiple thread</div><div class='add'>+ * trying to access the RSCN array on a same @vport at the same time.</div><div class='add'>+ **/</div><div class='ctx'> void</div><div class='ctx'> lpfc_els_flush_rscn(struct lpfc_vport *vport)</div><div class='ctx'> {</div><div class='hunk'>@@ -2984,6 +3776,18 @@ lpfc_els_flush_rscn(struct lpfc_vport *vport)</div><div class='ctx'> 	vport-&gt;fc_rscn_flush = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_rscn_payload_check: Check whether there is a pending rscn to a did.</div><div class='add'>+ * @vport: pointer to a host virtual N_Port data structure.</div><div class='add'>+ * @did: remote destination port identifier.</div><div class='add'>+ *</div><div class='add'>+ * This routine checks whether there is any pending Registration State</div><div class='add'>+ * Configuration Notification (RSCN) to a @did on @vport.</div><div class='add'>+ *</div><div class='add'>+ * Return code</div><div class='add'>+ *   None zero - The @did matched with a pending rscn</div><div class='add'>+ *   0 - not able to match @did with a pending rscn</div><div class='add'>+ **/</div><div class='ctx'> int</div><div class='ctx'> lpfc_rscn_payload_check(struct lpfc_vport *vport, uint32_t did)</div><div class='ctx'> {</div><div class='hunk'>@@ -3053,6 +3857,17 @@ return_did_out:</div><div class='ctx'> 	return did;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_rscn_recovery_check: Send recovery event to vport nodes matching rscn</div><div class='add'>+ * @vport: pointer to a host virtual N_Port data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine sends recovery (NLP_EVT_DEVICE_RECOVERY) event to the</div><div class='add'>+ * state machine for a @vport's nodes that are with pending RSCN (Registration</div><div class='add'>+ * State Change Notification).</div><div class='add'>+ *</div><div class='add'>+ * Return code</div><div class='add'>+ *   0 - Successful (currently alway return 0)</div><div class='add'>+ **/</div><div class='ctx'> static int</div><div class='ctx'> lpfc_rscn_recovery_check(struct lpfc_vport *vport)</div><div class='ctx'> {</div><div class='hunk'>@@ -3071,6 +3886,28 @@ lpfc_rscn_recovery_check(struct lpfc_vport *vport)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_els_rcv_rscn: Process an unsolicited rscn iocb.</div><div class='add'>+ * @vport: pointer to a host virtual N_Port data structure.</div><div class='add'>+ * @cmdiocb: pointer to lpfc command iocb data structure.</div><div class='add'>+ * @ndlp: pointer to a node-list data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine processes an unsolicited RSCN (Registration State Change</div><div class='add'>+ * Notification) IOCB. First, the payload of the unsolicited RSCN is walked</div><div class='add'>+ * to invoke fc_host_post_event() routine to the FC transport layer. If the</div><div class='add'>+ * discover state machine is about to begin discovery, it just accepts the</div><div class='add'>+ * RSCN and the discovery process will satisfy the RSCN. If this RSCN only</div><div class='add'>+ * contains N_Port IDs for other vports on this HBA, it just accepts the</div><div class='add'>+ * RSCN and ignore processing it. If the state machine is in the recovery</div><div class='add'>+ * state, the fc_rscn_id_list of this @vport is walked and the</div><div class='add'>+ * lpfc_rscn_recovery_check() routine is invoked to send recovery event for</div><div class='add'>+ * all nodes that match RSCN payload. Otherwise, the lpfc_els_handle_rscn()</div><div class='add'>+ * routine is invoked to handle the RSCN event.</div><div class='add'>+ *</div><div class='add'>+ * Return code</div><div class='add'>+ *   0 - Just sent the acc response</div><div class='add'>+ *   1 - Sent the acc response and waited for name server completion</div><div class='add'>+ **/</div><div class='ctx'> static int</div><div class='ctx'> lpfc_els_rcv_rscn(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,</div><div class='ctx'> 		  struct lpfc_nodelist *ndlp)</div><div class='hunk'>@@ -3130,7 +3967,7 @@ lpfc_els_rcv_rscn(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,</div><div class='ctx'> 		if (rscn_id == hba_id) {</div><div class='ctx'> 			/* ALL NPortIDs in RSCN are on HBA */</div><div class='ctx'> 			lpfc_printf_vlog(vport, KERN_INFO, LOG_DISCOVERY,</div><div class='del'>-					 "0214 Ignore RSCN "</div><div class='add'>+					 "0219 Ignore RSCN "</div><div class='ctx'> 					 "Data: x%x x%x x%x x%x\n",</div><div class='ctx'> 					 vport-&gt;fc_flag, payload_len,</div><div class='ctx'> 					 *lp, vport-&gt;fc_rscn_id_cnt);</div><div class='hunk'>@@ -3241,6 +4078,22 @@ lpfc_els_rcv_rscn(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,</div><div class='ctx'> 	return lpfc_els_handle_rscn(vport);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_els_handle_rscn: Handle rscn for a vport.</div><div class='add'>+ * @vport: pointer to a host virtual N_Port data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine handles the Registration State Configuration Notification</div><div class='add'>+ * (RSCN) for a @vport. If login to NameServer does not exist, a new ndlp shall</div><div class='add'>+ * be created and a Port Login (PLOGI) to the NameServer is issued. Otherwise,</div><div class='add'>+ * if the ndlp to NameServer exists, a Common Transport (CT) command to the</div><div class='add'>+ * NameServer shall be issued. If CT command to the NameServer fails to be</div><div class='add'>+ * issued, the lpfc_els_flush_rscn() routine shall be invoked to clean up any</div><div class='add'>+ * RSCN activities with the @vport.</div><div class='add'>+ *</div><div class='add'>+ * Return code</div><div class='add'>+ *   0 - Cleaned up rscn on the @vport</div><div class='add'>+ *   1 - Wait for plogi to name server before proceed</div><div class='add'>+ **/</div><div class='ctx'> int</div><div class='ctx'> lpfc_els_handle_rscn(struct lpfc_vport *vport)</div><div class='ctx'> {</div><div class='hunk'>@@ -3313,6 +4166,31 @@ lpfc_els_handle_rscn(struct lpfc_vport *vport)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_els_rcv_flogi: Process an unsolicited flogi iocb.</div><div class='add'>+ * @vport: pointer to a host virtual N_Port data structure.</div><div class='add'>+ * @cmdiocb: pointer to lpfc command iocb data structure.</div><div class='add'>+ * @ndlp: pointer to a node-list data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine processes Fabric Login (FLOGI) IOCB received as an ELS</div><div class='add'>+ * unsolicited event. An unsolicited FLOGI can be received in a point-to-</div><div class='add'>+ * point topology. As an unsolicited FLOGI should not be received in a loop</div><div class='add'>+ * mode, any unsolicited FLOGI received in loop mode shall be ignored. The</div><div class='add'>+ * lpfc_check_sparm() routine is invoked to check the parameters in the</div><div class='add'>+ * unsolicited FLOGI. If parameters validation failed, the routine</div><div class='add'>+ * lpfc_els_rsp_reject() shall be called with reject reason code set to</div><div class='add'>+ * LSEXP_SPARM_OPTIONS to reject the FLOGI. Otherwise, the Port WWN in the</div><div class='add'>+ * FLOGI shall be compared with the Port WWN of the @vport to determine who</div><div class='add'>+ * will initiate PLOGI. The higher lexicographical value party shall has</div><div class='add'>+ * higher priority (as the winning port) and will initiate PLOGI and</div><div class='add'>+ * communicate Port_IDs (Addresses) for both nodes in PLOGI. The result</div><div class='add'>+ * of this will be marked in the @vport fc_flag field with FC_PT2PT_PLOGI</div><div class='add'>+ * and then the lpfc_els_rsp_acc() routine is invoked to accept the FLOGI.</div><div class='add'>+ *</div><div class='add'>+ * Return code</div><div class='add'>+ *   0 - Successfully processed the unsolicited flogi</div><div class='add'>+ *   1 - Failed to process the unsolicited flogi</div><div class='add'>+ **/</div><div class='ctx'> static int</div><div class='ctx'> lpfc_els_rcv_flogi(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,</div><div class='ctx'> 		   struct lpfc_nodelist *ndlp)</div><div class='hunk'>@@ -3402,6 +4280,22 @@ lpfc_els_rcv_flogi(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_els_rcv_rnid: Process an unsolicited rnid iocb.</div><div class='add'>+ * @vport: pointer to a host virtual N_Port data structure.</div><div class='add'>+ * @cmdiocb: pointer to lpfc command iocb data structure.</div><div class='add'>+ * @ndlp: pointer to a node-list data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine processes Request Node Identification Data (RNID) IOCB</div><div class='add'>+ * received as an ELS unsolicited event. Only when the RNID specified format</div><div class='add'>+ * 0x0 or 0xDF (Topology Discovery Specific Node Identification Data)</div><div class='add'>+ * present, this routine will invoke the lpfc_els_rsp_rnid_acc() routine to</div><div class='add'>+ * Accept (ACC) the RNID ELS command. All the other RNID formats are</div><div class='add'>+ * rejected by invoking the lpfc_els_rsp_reject() routine.</div><div class='add'>+ *</div><div class='add'>+ * Return code</div><div class='add'>+ *   0 - Successfully processed rnid iocb (currently always return 0)</div><div class='add'>+ **/</div><div class='ctx'> static int</div><div class='ctx'> lpfc_els_rcv_rnid(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,</div><div class='ctx'> 		  struct lpfc_nodelist *ndlp)</div><div class='hunk'>@@ -3441,6 +4335,19 @@ lpfc_els_rcv_rnid(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_els_rcv_lirr: Process an unsolicited lirr iocb.</div><div class='add'>+ * @vport: pointer to a host virtual N_Port data structure.</div><div class='add'>+ * @cmdiocb: pointer to lpfc command iocb data structure.</div><div class='add'>+ * @ndlp: pointer to a node-list data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine processes a Link Incident Report Registration(LIRR) IOCB</div><div class='add'>+ * received as an ELS unsolicited event. Currently, this function just invokes</div><div class='add'>+ * the lpfc_els_rsp_reject() routine to reject the LIRR IOCB unconditionally.</div><div class='add'>+ *</div><div class='add'>+ * Return code</div><div class='add'>+ *   0 - Successfully processed lirr iocb (currently always return 0)</div><div class='add'>+ **/</div><div class='ctx'> static int</div><div class='ctx'> lpfc_els_rcv_lirr(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,</div><div class='ctx'> 		  struct lpfc_nodelist *ndlp)</div><div class='hunk'>@@ -3456,6 +4363,25 @@ lpfc_els_rcv_lirr(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_els_rsp_rps_acc: Completion callbk func for MBX_READ_LNK_STAT mbox cmd.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ * @pmb: pointer to the driver internal queue element for mailbox command.</div><div class='add'>+ *</div><div class='add'>+ * This routine is the completion callback function for the MBX_READ_LNK_STAT</div><div class='add'>+ * mailbox command. This callback function is to actually send the Accept</div><div class='add'>+ * (ACC) response to a Read Port Status (RPS) unsolicited IOCB event. It</div><div class='add'>+ * collects the link statistics from the completion of the MBX_READ_LNK_STAT</div><div class='add'>+ * mailbox command, constructs the RPS response with the link statistics</div><div class='add'>+ * collected, and then invokes the lpfc_sli_issue_iocb() routine to send ACC</div><div class='add'>+ * response to the RPS.</div><div class='add'>+ *</div><div class='add'>+ * Note that, in lpfc_prep_els_iocb() routine, the reference count of ndlp</div><div class='add'>+ * will be incremented by 1 for holding the ndlp and the reference to ndlp</div><div class='add'>+ * will be stored into the context1 field of the IOCB for the completion</div><div class='add'>+ * callback function to the RPS Accept Response ELS IOCB command.</div><div class='add'>+ *</div><div class='add'>+ **/</div><div class='ctx'> static void</div><div class='ctx'> lpfc_els_rsp_rps_acc(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)</div><div class='ctx'> {</div><div class='hunk'>@@ -3531,6 +4457,24 @@ lpfc_els_rsp_rps_acc(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_els_rcv_rps: Process an unsolicited rps iocb.</div><div class='add'>+ * @vport: pointer to a host virtual N_Port data structure.</div><div class='add'>+ * @cmdiocb: pointer to lpfc command iocb data structure.</div><div class='add'>+ * @ndlp: pointer to a node-list data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine processes Read Port Status (RPS) IOCB received as an</div><div class='add'>+ * ELS unsolicited event. It first checks the remote port state. If the</div><div class='add'>+ * remote port is not in NLP_STE_UNMAPPED_NODE state or NLP_STE_MAPPED_NODE</div><div class='add'>+ * state, it invokes the lpfc_els_rsp_reject() routine to send the reject</div><div class='add'>+ * response. Otherwise, it issue the MBX_READ_LNK_STAT mailbox command</div><div class='add'>+ * for reading the HBA link statistics. It is for the callback function,</div><div class='add'>+ * lpfc_els_rsp_rps_acc(), set to the MBX_READ_LNK_STAT mailbox command</div><div class='add'>+ * to actually sending out RPS Accept (ACC) response.</div><div class='add'>+ *</div><div class='add'>+ * Return codes</div><div class='add'>+ *   0 - Successfully processed rps iocb (currently always return 0)</div><div class='add'>+ **/</div><div class='ctx'> static int</div><div class='ctx'> lpfc_els_rcv_rps(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,</div><div class='ctx'> 		 struct lpfc_nodelist *ndlp)</div><div class='hunk'>@@ -3544,14 +4488,9 @@ lpfc_els_rcv_rps(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,</div><div class='ctx'> 	struct ls_rjt stat;</div><div class='ctx'> </div><div class='ctx'> 	if ((ndlp-&gt;nlp_state != NLP_STE_UNMAPPED_NODE) &amp;&amp;</div><div class='del'>-	    (ndlp-&gt;nlp_state != NLP_STE_MAPPED_NODE)) {</div><div class='del'>-		stat.un.b.lsRjtRsvd0 = 0;</div><div class='del'>-		stat.un.b.lsRjtRsnCode = LSRJT_UNABLE_TPC;</div><div class='del'>-		stat.un.b.lsRjtRsnCodeExp = LSEXP_CANT_GIVE_DATA;</div><div class='del'>-		stat.un.b.vendorUnique = 0;</div><div class='del'>-		lpfc_els_rsp_reject(vport, stat.un.lsRjtError, cmdiocb, ndlp,</div><div class='del'>-			NULL);</div><div class='del'>-	}</div><div class='add'>+	    (ndlp-&gt;nlp_state != NLP_STE_MAPPED_NODE))</div><div class='add'>+		/* reject the unsolicited RPS request and done with it */</div><div class='add'>+		goto reject_out;</div><div class='ctx'> </div><div class='ctx'> 	pcmd = (struct lpfc_dmabuf *) cmdiocb-&gt;context2;</div><div class='ctx'> 	lp = (uint32_t *) pcmd-&gt;virt;</div><div class='hunk'>@@ -3584,6 +4523,9 @@ lpfc_els_rcv_rps(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,</div><div class='ctx'> 			mempool_free(mbox, phba-&gt;mbox_mem_pool);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+reject_out:</div><div class='add'>+	/* issue rejection response */</div><div class='ctx'> 	stat.un.b.lsRjtRsvd0 = 0;</div><div class='ctx'> 	stat.un.b.lsRjtRsnCode = LSRJT_UNABLE_TPC;</div><div class='ctx'> 	stat.un.b.lsRjtRsnCodeExp = LSEXP_CANT_GIVE_DATA;</div><div class='hunk'>@@ -3592,6 +4534,25 @@ lpfc_els_rcv_rps(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_els_rsp_rpl_acc: Issue an accept rpl els command.</div><div class='add'>+ * @vport: pointer to a host virtual N_Port data structure.</div><div class='add'>+ * @cmdsize: size of the ELS command.</div><div class='add'>+ * @oldiocb: pointer to the original lpfc command iocb data structure.</div><div class='add'>+ * @ndlp: pointer to a node-list data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine issuees an Accept (ACC) Read Port List (RPL) ELS command.</div><div class='add'>+ * It is to be called by the lpfc_els_rcv_rpl() routine to accept the RPL.</div><div class='add'>+ *</div><div class='add'>+ * Note that, in lpfc_prep_els_iocb() routine, the reference count of ndlp</div><div class='add'>+ * will be incremented by 1 for holding the ndlp and the reference to ndlp</div><div class='add'>+ * will be stored into the context1 field of the IOCB for the completion</div><div class='add'>+ * callback function to the RPL Accept Response ELS command.</div><div class='add'>+ *</div><div class='add'>+ * Return code</div><div class='add'>+ *   0 - Successfully issued ACC RPL ELS command</div><div class='add'>+ *   1 - Failed to issue ACC RPL ELS command</div><div class='add'>+ **/</div><div class='ctx'> static int</div><div class='ctx'> lpfc_els_rsp_rpl_acc(struct lpfc_vport *vport, uint16_t cmdsize,</div><div class='ctx'> 		     struct lpfc_iocbq *oldiocb, struct lpfc_nodelist *ndlp)</div><div class='hunk'>@@ -3645,6 +4606,22 @@ lpfc_els_rsp_rpl_acc(struct lpfc_vport *vport, uint16_t cmdsize,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_els_rcv_rpl: Process an unsolicited rpl iocb.</div><div class='add'>+ * @vport: pointer to a host virtual N_Port data structure.</div><div class='add'>+ * @cmdiocb: pointer to lpfc command iocb data structure.</div><div class='add'>+ * @ndlp: pointer to a node-list data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine processes Read Port List (RPL) IOCB received as an ELS</div><div class='add'>+ * unsolicited event. It first checks the remote port state. If the remote</div><div class='add'>+ * port is not in NLP_STE_UNMAPPED_NODE and NLP_STE_MAPPED_NODE states, it</div><div class='add'>+ * invokes the lpfc_els_rsp_reject() routine to send reject response.</div><div class='add'>+ * Otherwise, this routine then invokes the lpfc_els_rsp_rpl_acc() routine</div><div class='add'>+ * to accept the RPL.</div><div class='add'>+ *</div><div class='add'>+ * Return code</div><div class='add'>+ *   0 - Successfully processed rpl iocb (currently always return 0)</div><div class='add'>+ **/</div><div class='ctx'> static int</div><div class='ctx'> lpfc_els_rcv_rpl(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,</div><div class='ctx'> 		 struct lpfc_nodelist *ndlp)</div><div class='hunk'>@@ -3658,12 +4635,15 @@ lpfc_els_rcv_rpl(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,</div><div class='ctx'> </div><div class='ctx'> 	if ((ndlp-&gt;nlp_state != NLP_STE_UNMAPPED_NODE) &amp;&amp;</div><div class='ctx'> 	    (ndlp-&gt;nlp_state != NLP_STE_MAPPED_NODE)) {</div><div class='add'>+		/* issue rejection response */</div><div class='ctx'> 		stat.un.b.lsRjtRsvd0 = 0;</div><div class='ctx'> 		stat.un.b.lsRjtRsnCode = LSRJT_UNABLE_TPC;</div><div class='ctx'> 		stat.un.b.lsRjtRsnCodeExp = LSEXP_CANT_GIVE_DATA;</div><div class='ctx'> 		stat.un.b.vendorUnique = 0;</div><div class='ctx'> 		lpfc_els_rsp_reject(vport, stat.un.lsRjtError, cmdiocb, ndlp,</div><div class='ctx'> 			NULL);</div><div class='add'>+		/* rejected the unsolicited RPL request and done with it */</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	pcmd = (struct lpfc_dmabuf *) cmdiocb-&gt;context2;</div><div class='hunk'>@@ -3685,6 +4665,30 @@ lpfc_els_rcv_rpl(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_els_rcv_farp: Process an unsolicited farp request els command.</div><div class='add'>+ * @vport: pointer to a virtual N_Port data structure.</div><div class='add'>+ * @cmdiocb: pointer to lpfc command iocb data structure.</div><div class='add'>+ * @ndlp: pointer to a node-list data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine processes Fibre Channel Address Resolution Protocol</div><div class='add'>+ * (FARP) Request IOCB received as an ELS unsolicited event. Currently,</div><div class='add'>+ * the lpfc driver only supports matching on WWPN or WWNN for FARP. As such,</div><div class='add'>+ * FARP_MATCH_PORT flag and FARP_MATCH_NODE flag are checked against the</div><div class='add'>+ * Match Flag in the FARP request IOCB: if FARP_MATCH_PORT flag is set, the</div><div class='add'>+ * remote PortName is compared against the FC PortName stored in the @vport</div><div class='add'>+ * data structure; if FARP_MATCH_NODE flag is set, the remote NodeName is</div><div class='add'>+ * compared against the FC NodeName stored in the @vport data structure.</div><div class='add'>+ * If any of these matches and the FARP_REQUEST_FARPR flag is set in the</div><div class='add'>+ * FARP request IOCB Response Flag, the lpfc_issue_els_farpr() routine is</div><div class='add'>+ * invoked to send out FARP Response to the remote node. Before sending the</div><div class='add'>+ * FARP Response, however, the FARP_REQUEST_PLOGI flag is check in the FARP</div><div class='add'>+ * request IOCB Response Flag and, if it is set, the lpfc_issue_els_plogi()</div><div class='add'>+ * routine is invoked to log into the remote port first.</div><div class='add'>+ *</div><div class='add'>+ * Return code</div><div class='add'>+ *   0 - Either the FARP Match Mode not supported or successfully processed</div><div class='add'>+ **/</div><div class='ctx'> static int</div><div class='ctx'> lpfc_els_rcv_farp(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,</div><div class='ctx'> 		  struct lpfc_nodelist *ndlp)</div><div class='hunk'>@@ -3744,6 +4748,20 @@ lpfc_els_rcv_farp(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_els_rcv_farpr: Process an unsolicited farp response iocb.</div><div class='add'>+ * @vport: pointer to a host virtual N_Port data structure.</div><div class='add'>+ * @cmdiocb: pointer to lpfc command iocb data structure.</div><div class='add'>+ * @ndlp: pointer to a node-list data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine processes Fibre Channel Address Resolution Protocol</div><div class='add'>+ * Response (FARPR) IOCB received as an ELS unsolicited event. It simply</div><div class='add'>+ * invokes the lpfc_els_rsp_acc() routine to the remote node to accept</div><div class='add'>+ * the FARP response request.</div><div class='add'>+ *</div><div class='add'>+ * Return code</div><div class='add'>+ *   0 - Successfully processed FARPR IOCB (currently always return 0)</div><div class='add'>+ **/</div><div class='ctx'> static int</div><div class='ctx'> lpfc_els_rcv_farpr(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,</div><div class='ctx'> 		   struct lpfc_nodelist  *ndlp)</div><div class='hunk'>@@ -3768,6 +4786,25 @@ lpfc_els_rcv_farpr(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_els_rcv_fan: Process an unsolicited fan iocb command.</div><div class='add'>+ * @vport: pointer to a host virtual N_Port data structure.</div><div class='add'>+ * @cmdiocb: pointer to lpfc command iocb data structure.</div><div class='add'>+ * @fan_ndlp: pointer to a node-list data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine processes a Fabric Address Notification (FAN) IOCB</div><div class='add'>+ * command received as an ELS unsolicited event. The FAN ELS command will</div><div class='add'>+ * only be processed on a physical port (i.e., the @vport represents the</div><div class='add'>+ * physical port). The fabric NodeName and PortName from the FAN IOCB are</div><div class='add'>+ * compared against those in the phba data structure. If any of those is</div><div class='add'>+ * different, the lpfc_initial_flogi() routine is invoked to initialize</div><div class='add'>+ * Fabric Login (FLOGI) to the fabric to start the discover over. Otherwise,</div><div class='add'>+ * if both of those are identical, the lpfc_issue_fabric_reglogin() routine</div><div class='add'>+ * is invoked to register login to the fabric.</div><div class='add'>+ *</div><div class='add'>+ * Return code</div><div class='add'>+ *   0 - Successfully processed fan iocb (currently always return 0).</div><div class='add'>+ **/</div><div class='ctx'> static int</div><div class='ctx'> lpfc_els_rcv_fan(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,</div><div class='ctx'> 		 struct lpfc_nodelist *fan_ndlp)</div><div class='hunk'>@@ -3797,6 +4834,16 @@ lpfc_els_rcv_fan(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_els_timeout: Handler funciton to the els timer.</div><div class='add'>+ * @ptr: holder for the timer function associated data.</div><div class='add'>+ *</div><div class='add'>+ * This routine is invoked by the ELS timer after timeout. It posts the ELS</div><div class='add'>+ * timer timeout event by setting the WORKER_ELS_TMO bit to the work port</div><div class='add'>+ * event bitmap and then invokes the lpfc_worker_wake_up() routine to wake</div><div class='add'>+ * up the worker thread. It is for the worker thread to invoke the routine</div><div class='add'>+ * lpfc_els_timeout_handler() to work on the posted event WORKER_ELS_TMO.</div><div class='add'>+ **/</div><div class='ctx'> void</div><div class='ctx'> lpfc_els_timeout(unsigned long ptr)</div><div class='ctx'> {</div><div class='hunk'>@@ -3816,6 +4863,15 @@ lpfc_els_timeout(unsigned long ptr)</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_els_timeout_handler: Process an els timeout event.</div><div class='add'>+ * @vport: pointer to a virtual N_Port data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine is the actual handler function that processes an ELS timeout</div><div class='add'>+ * event. It walks the ELS ring to get and abort all the IOCBs (except the</div><div class='add'>+ * ABORT/CLOSE/FARP/FARPR/FDISC), which are associated with the @vport by</div><div class='add'>+ * invoking the lpfc_sli_issue_abort_iotag() routine.</div><div class='add'>+ **/</div><div class='ctx'> void</div><div class='ctx'> lpfc_els_timeout_handler(struct lpfc_vport *vport)</div><div class='ctx'> {</div><div class='hunk'>@@ -3886,6 +4942,26 @@ lpfc_els_timeout_handler(struct lpfc_vport *vport)</div><div class='ctx'> 		mod_timer(&amp;vport-&gt;els_tmofunc, jiffies + HZ * timeout);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_els_flush_cmd: Clean up the outstanding els commands to a vport.</div><div class='add'>+ * @vport: pointer to a host virtual N_Port data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine is used to clean up all the outstanding ELS commands on a</div><div class='add'>+ * @vport. It first aborts the @vport by invoking lpfc_fabric_abort_vport()</div><div class='add'>+ * routine. After that, it walks the ELS transmit queue to remove all the</div><div class='add'>+ * IOCBs with the @vport other than the QUE_RING and ABORT/CLOSE IOCBs. For</div><div class='add'>+ * the IOCBs with a non-NULL completion callback function, the callback</div><div class='add'>+ * function will be invoked with the status set to IOSTAT_LOCAL_REJECT and</div><div class='add'>+ * un.ulpWord[4] set to IOERR_SLI_ABORTED. For IOCBs with a NULL completion</div><div class='add'>+ * callback function, the IOCB will simply be released. Finally, it walks</div><div class='add'>+ * the ELS transmit completion queue to issue an abort IOCB to any transmit</div><div class='add'>+ * completion queue IOCB that is associated with the @vport and is not</div><div class='add'>+ * an IOCB from libdfc (i.e., the management plane IOCBs that are not</div><div class='add'>+ * part of the discovery state machine) out to HBA by invoking the</div><div class='add'>+ * lpfc_sli_issue_abort_iotag() routine. Note that this function issues the</div><div class='add'>+ * abort IOCB to any transmit completion queueed IOCB, it does not guarantee</div><div class='add'>+ * the IOCBs are aborted when this function returns.</div><div class='add'>+ **/</div><div class='ctx'> void</div><div class='ctx'> lpfc_els_flush_cmd(struct lpfc_vport *vport)</div><div class='ctx'> {</div><div class='hunk'>@@ -3948,6 +5024,23 @@ lpfc_els_flush_cmd(struct lpfc_vport *vport)</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_els_flush_all_cmd: Clean up all the outstanding els commands to a HBA.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine is used to clean up all the outstanding ELS commands on a</div><div class='add'>+ * @phba. It first aborts the @phba by invoking the lpfc_fabric_abort_hba()</div><div class='add'>+ * routine. After that, it walks the ELS transmit queue to remove all the</div><div class='add'>+ * IOCBs to the @phba other than the QUE_RING and ABORT/CLOSE IOCBs. For</div><div class='add'>+ * the IOCBs with the completion callback function associated, the callback</div><div class='add'>+ * function will be invoked with the status set to IOSTAT_LOCAL_REJECT and</div><div class='add'>+ * un.ulpWord[4] set to IOERR_SLI_ABORTED. For IOCBs without the completion</div><div class='add'>+ * callback function associated, the IOCB will simply be released. Finally,</div><div class='add'>+ * it walks the ELS transmit completion queue to issue an abort IOCB to any</div><div class='add'>+ * transmit completion queue IOCB that is not an IOCB from libdfc (i.e., the</div><div class='add'>+ * management plane IOCBs that are not part of the discovery state machine)</div><div class='add'>+ * out to HBA by invoking the lpfc_sli_issue_abort_iotag() routine.</div><div class='add'>+ **/</div><div class='ctx'> void</div><div class='ctx'> lpfc_els_flush_all_cmd(struct lpfc_hba  *phba)</div><div class='ctx'> {</div><div class='hunk'>@@ -3992,6 +5085,130 @@ lpfc_els_flush_all_cmd(struct lpfc_hba  *phba)</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_send_els_failure_event: Posts an ELS command failure event.</div><div class='add'>+ * @phba: Pointer to hba context object.</div><div class='add'>+ * @cmdiocbp: Pointer to command iocb which reported error.</div><div class='add'>+ * @rspiocbp: Pointer to response iocb which reported error.</div><div class='add'>+ *</div><div class='add'>+ * This function sends an event when there is an ELS command</div><div class='add'>+ * failure.</div><div class='add'>+ **/</div><div class='add'>+void</div><div class='add'>+lpfc_send_els_failure_event(struct lpfc_hba *phba,</div><div class='add'>+			struct lpfc_iocbq *cmdiocbp,</div><div class='add'>+			struct lpfc_iocbq *rspiocbp)</div><div class='add'>+{</div><div class='add'>+	struct lpfc_vport *vport = cmdiocbp-&gt;vport;</div><div class='add'>+	struct Scsi_Host *shost = lpfc_shost_from_vport(vport);</div><div class='add'>+	struct lpfc_lsrjt_event lsrjt_event;</div><div class='add'>+	struct lpfc_fabric_event_header fabric_event;</div><div class='add'>+	struct ls_rjt stat;</div><div class='add'>+	struct lpfc_nodelist *ndlp;</div><div class='add'>+	uint32_t *pcmd;</div><div class='add'>+</div><div class='add'>+	ndlp = cmdiocbp-&gt;context1;</div><div class='add'>+	if (!ndlp || !NLP_CHK_NODE_ACT(ndlp))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (rspiocbp-&gt;iocb.ulpStatus == IOSTAT_LS_RJT) {</div><div class='add'>+		lsrjt_event.header.event_type = FC_REG_ELS_EVENT;</div><div class='add'>+		lsrjt_event.header.subcategory = LPFC_EVENT_LSRJT_RCV;</div><div class='add'>+		memcpy(lsrjt_event.header.wwpn, &amp;ndlp-&gt;nlp_portname,</div><div class='add'>+			sizeof(struct lpfc_name));</div><div class='add'>+		memcpy(lsrjt_event.header.wwnn, &amp;ndlp-&gt;nlp_nodename,</div><div class='add'>+			sizeof(struct lpfc_name));</div><div class='add'>+		pcmd = (uint32_t *) (((struct lpfc_dmabuf *)</div><div class='add'>+			cmdiocbp-&gt;context2)-&gt;virt);</div><div class='add'>+		lsrjt_event.command = *pcmd;</div><div class='add'>+		stat.un.lsRjtError = be32_to_cpu(rspiocbp-&gt;iocb.un.ulpWord[4]);</div><div class='add'>+		lsrjt_event.reason_code = stat.un.b.lsRjtRsnCode;</div><div class='add'>+		lsrjt_event.explanation = stat.un.b.lsRjtRsnCodeExp;</div><div class='add'>+		fc_host_post_vendor_event(shost,</div><div class='add'>+			fc_get_event_number(),</div><div class='add'>+			sizeof(lsrjt_event),</div><div class='add'>+			(char *)&amp;lsrjt_event,</div><div class='add'>+			SCSI_NL_VID_TYPE_PCI | PCI_VENDOR_ID_EMULEX);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	if ((rspiocbp-&gt;iocb.ulpStatus == IOSTAT_NPORT_BSY) ||</div><div class='add'>+		(rspiocbp-&gt;iocb.ulpStatus == IOSTAT_FABRIC_BSY)) {</div><div class='add'>+		fabric_event.event_type = FC_REG_FABRIC_EVENT;</div><div class='add'>+		if (rspiocbp-&gt;iocb.ulpStatus == IOSTAT_NPORT_BSY)</div><div class='add'>+			fabric_event.subcategory = LPFC_EVENT_PORT_BUSY;</div><div class='add'>+		else</div><div class='add'>+			fabric_event.subcategory = LPFC_EVENT_FABRIC_BUSY;</div><div class='add'>+		memcpy(fabric_event.wwpn, &amp;ndlp-&gt;nlp_portname,</div><div class='add'>+			sizeof(struct lpfc_name));</div><div class='add'>+		memcpy(fabric_event.wwnn, &amp;ndlp-&gt;nlp_nodename,</div><div class='add'>+			sizeof(struct lpfc_name));</div><div class='add'>+		fc_host_post_vendor_event(shost,</div><div class='add'>+			fc_get_event_number(),</div><div class='add'>+			sizeof(fabric_event),</div><div class='add'>+			(char *)&amp;fabric_event,</div><div class='add'>+			SCSI_NL_VID_TYPE_PCI | PCI_VENDOR_ID_EMULEX);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * lpfc_send_els_event: Posts unsolicited els event.</div><div class='add'>+ * @vport: Pointer to vport object.</div><div class='add'>+ * @ndlp: Pointer FC node object.</div><div class='add'>+ * @cmd: ELS command code.</div><div class='add'>+ *</div><div class='add'>+ * This function posts an event when there is an incoming</div><div class='add'>+ * unsolicited ELS command.</div><div class='add'>+ **/</div><div class='add'>+static void</div><div class='add'>+lpfc_send_els_event(struct lpfc_vport *vport,</div><div class='add'>+		    struct lpfc_nodelist *ndlp,</div><div class='add'>+		    uint32_t cmd)</div><div class='add'>+{</div><div class='add'>+	struct lpfc_els_event_header els_data;</div><div class='add'>+	struct Scsi_Host *shost = lpfc_shost_from_vport(vport);</div><div class='add'>+</div><div class='add'>+	els_data.event_type = FC_REG_ELS_EVENT;</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case ELS_CMD_PLOGI:</div><div class='add'>+		els_data.subcategory = LPFC_EVENT_PLOGI_RCV;</div><div class='add'>+		break;</div><div class='add'>+	case ELS_CMD_PRLO:</div><div class='add'>+		els_data.subcategory = LPFC_EVENT_PRLO_RCV;</div><div class='add'>+		break;</div><div class='add'>+	case ELS_CMD_ADISC:</div><div class='add'>+		els_data.subcategory = LPFC_EVENT_ADISC_RCV;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	memcpy(els_data.wwpn, &amp;ndlp-&gt;nlp_portname, sizeof(struct lpfc_name));</div><div class='add'>+	memcpy(els_data.wwnn, &amp;ndlp-&gt;nlp_nodename, sizeof(struct lpfc_name));</div><div class='add'>+	fc_host_post_vendor_event(shost,</div><div class='add'>+		fc_get_event_number(),</div><div class='add'>+		sizeof(els_data),</div><div class='add'>+		(char *)&amp;els_data,</div><div class='add'>+		SCSI_NL_VID_TYPE_PCI | PCI_VENDOR_ID_EMULEX);</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * lpfc_els_unsol_buffer: Process an unsolicited event data buffer.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ * @pring: pointer to a SLI ring.</div><div class='add'>+ * @vport: pointer to a host virtual N_Port data structure.</div><div class='add'>+ * @elsiocb: pointer to lpfc els command iocb data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine is used for processing the IOCB associated with a unsolicited</div><div class='add'>+ * event. It first determines whether there is an existing ndlp that matches</div><div class='add'>+ * the DID from the unsolicited IOCB. If not, it will create a new one with</div><div class='add'>+ * the DID from the unsolicited IOCB. The ELS command from the unsolicited</div><div class='add'>+ * IOCB is then used to invoke the proper routine and to set up proper state</div><div class='add'>+ * of the discovery state machine.</div><div class='add'>+ **/</div><div class='ctx'> static void</div><div class='ctx'> lpfc_els_unsol_buffer(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,</div><div class='ctx'> 		      struct lpfc_vport *vport, struct lpfc_iocbq *elsiocb)</div><div class='hunk'>@@ -4059,8 +5276,6 @@ lpfc_els_unsol_buffer(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	phba-&gt;fc_stat.elsRcvFrame++;</div><div class='del'>-	if (elsiocb-&gt;context1)</div><div class='del'>-		lpfc_nlp_put(elsiocb-&gt;context1);</div><div class='ctx'> </div><div class='ctx'> 	elsiocb-&gt;context1 = lpfc_nlp_get(ndlp);</div><div class='ctx'> 	elsiocb-&gt;vport = vport;</div><div class='hunk'>@@ -4081,6 +5296,7 @@ lpfc_els_unsol_buffer(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,</div><div class='ctx'> 		phba-&gt;fc_stat.elsRcvPLOGI++;</div><div class='ctx'> 		ndlp = lpfc_plogi_confirm_nport(phba, payload, ndlp);</div><div class='ctx'> </div><div class='add'>+		lpfc_send_els_event(vport, ndlp, cmd);</div><div class='ctx'> 		if (vport-&gt;port_state &lt; LPFC_DISC_AUTH) {</div><div class='ctx'> 			if (!(phba-&gt;pport-&gt;fc_flag &amp; FC_PT2PT) ||</div><div class='ctx'> 				(phba-&gt;pport-&gt;fc_flag &amp; FC_PT2PT_PLOGI)) {</div><div class='hunk'>@@ -4130,6 +5346,7 @@ lpfc_els_unsol_buffer(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,</div><div class='ctx'> 			did, vport-&gt;port_state, ndlp-&gt;nlp_flag);</div><div class='ctx'> </div><div class='ctx'> 		phba-&gt;fc_stat.elsRcvPRLO++;</div><div class='add'>+		lpfc_send_els_event(vport, ndlp, cmd);</div><div class='ctx'> 		if (vport-&gt;port_state &lt; LPFC_DISC_AUTH) {</div><div class='ctx'> 			rjt_err = LSRJT_UNABLE_TPC;</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -4147,6 +5364,7 @@ lpfc_els_unsol_buffer(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,</div><div class='ctx'> 			"RCV ADISC:       did:x%x/ste:x%x flg:x%x",</div><div class='ctx'> 			did, vport-&gt;port_state, ndlp-&gt;nlp_flag);</div><div class='ctx'> </div><div class='add'>+		lpfc_send_els_event(vport, ndlp, cmd);</div><div class='ctx'> 		phba-&gt;fc_stat.elsRcvADISC++;</div><div class='ctx'> 		if (vport-&gt;port_state &lt; LPFC_DISC_AUTH) {</div><div class='ctx'> 			rjt_err = LSRJT_UNABLE_TPC;</div><div class='hunk'>@@ -4270,6 +5488,8 @@ lpfc_els_unsol_buffer(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,</div><div class='ctx'> 			NULL);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	lpfc_nlp_put(elsiocb-&gt;context1);</div><div class='add'>+	elsiocb-&gt;context1 = NULL;</div><div class='ctx'> 	return;</div><div class='ctx'> </div><div class='ctx'> dropit:</div><div class='hunk'>@@ -4282,6 +5502,19 @@ dropit:</div><div class='ctx'> 	phba-&gt;fc_stat.elsRcvDrop++;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_find_vport_by_vpid: Find a vport on a HBA through vport identifier.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ * @vpi: host virtual N_Port identifier.</div><div class='add'>+ *</div><div class='add'>+ * This routine finds a vport on a HBA (referred by @phba) through a</div><div class='add'>+ * @vpi. The function walks the HBA's vport list and returns the address</div><div class='add'>+ * of the vport with the matching @vpi.</div><div class='add'>+ *</div><div class='add'>+ * Return code</div><div class='add'>+ *    NULL - No vport with the matching @vpi found</div><div class='add'>+ *    Otherwise - Address to the vport with the matching @vpi.</div><div class='add'>+ **/</div><div class='ctx'> static struct lpfc_vport *</div><div class='ctx'> lpfc_find_vport_by_vpid(struct lpfc_hba *phba, uint16_t vpi)</div><div class='ctx'> {</div><div class='hunk'>@@ -4299,6 +5532,18 @@ lpfc_find_vport_by_vpid(struct lpfc_hba *phba, uint16_t vpi)</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_els_unsol_event: Process an unsolicited event from an els sli ring.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ * @pring: pointer to a SLI ring.</div><div class='add'>+ * @elsiocb: pointer to lpfc els iocb data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine is used to process an unsolicited event received from a SLI</div><div class='add'>+ * (Service Level Interface) ring. The actual processing of the data buffer</div><div class='add'>+ * associated with the unsolicited event is done by invoking the routine</div><div class='add'>+ * lpfc_els_unsol_buffer() after properly set up the iocb buffer from the</div><div class='add'>+ * SLI ring on which the unsolicited event was received.</div><div class='add'>+ **/</div><div class='ctx'> void</div><div class='ctx'> lpfc_els_unsol_event(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,</div><div class='ctx'> 		     struct lpfc_iocbq *elsiocb)</div><div class='hunk'>@@ -4309,6 +5554,7 @@ lpfc_els_unsol_event(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,</div><div class='ctx'> 	struct lpfc_dmabuf *bdeBuf1 = elsiocb-&gt;context2;</div><div class='ctx'> 	struct lpfc_dmabuf *bdeBuf2 = elsiocb-&gt;context3;</div><div class='ctx'> </div><div class='add'>+	elsiocb-&gt;context1 = NULL;</div><div class='ctx'> 	elsiocb-&gt;context2 = NULL;</div><div class='ctx'> 	elsiocb-&gt;context3 = NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -4356,8 +5602,6 @@ lpfc_els_unsol_event(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,</div><div class='ctx'> 	 * The different unsolicited event handlers would tell us</div><div class='ctx'> 	 * if they are done with "mp" by setting context2 to NULL.</div><div class='ctx'> 	 */</div><div class='del'>-	lpfc_nlp_put(elsiocb-&gt;context1);</div><div class='del'>-	elsiocb-&gt;context1 = NULL;</div><div class='ctx'> 	if (elsiocb-&gt;context2) {</div><div class='ctx'> 		lpfc_in_buf_free(phba, (struct lpfc_dmabuf *)elsiocb-&gt;context2);</div><div class='ctx'> 		elsiocb-&gt;context2 = NULL;</div><div class='hunk'>@@ -4376,6 +5620,19 @@ lpfc_els_unsol_event(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_do_scr_ns_plogi: Issue a plogi to the name server for scr.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ * @vport: pointer to a virtual N_Port data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine issues a Port Login (PLOGI) to the Name Server with</div><div class='add'>+ * State Change Request (SCR) for a @vport. This routine will create an</div><div class='add'>+ * ndlp for the Name Server associated to the @vport if such node does</div><div class='add'>+ * not already exist. The PLOGI to Name Server is issued by invoking the</div><div class='add'>+ * lpfc_issue_els_plogi() routine. If Fabric-Device Management Interface</div><div class='add'>+ * (FDMI) is configured to the @vport, a FDMI node will be created and</div><div class='add'>+ * the PLOGI to FDMI is issued by invoking lpfc_issue_els_plogi() routine.</div><div class='add'>+ **/</div><div class='ctx'> void</div><div class='ctx'> lpfc_do_scr_ns_plogi(struct lpfc_hba *phba, struct lpfc_vport *vport)</div><div class='ctx'> {</div><div class='hunk'>@@ -4434,6 +5691,18 @@ lpfc_do_scr_ns_plogi(struct lpfc_hba *phba, struct lpfc_vport *vport)</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_cmpl_reg_new_vport: Completion callback function to register new vport.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ * @pmb: pointer to the driver internal queue element for mailbox command.</div><div class='add'>+ *</div><div class='add'>+ * This routine is the completion callback function to register new vport</div><div class='add'>+ * mailbox command. If the new vport mailbox command completes successfully,</div><div class='add'>+ * the fabric registration login shall be performed on physical port (the</div><div class='add'>+ * new vport created is actually a physical port, with VPI 0) or the port</div><div class='add'>+ * login to Name Server for State Change Request (SCR) will be performed</div><div class='add'>+ * on virtual port (real virtual port, with VPI greater than 0).</div><div class='add'>+ **/</div><div class='ctx'> static void</div><div class='ctx'> lpfc_cmpl_reg_new_vport(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)</div><div class='ctx'> {</div><div class='hunk'>@@ -4491,6 +5760,15 @@ lpfc_cmpl_reg_new_vport(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_register_new_vport: Register a new vport with a HBA.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ * @vport: pointer to a host virtual N_Port data structure.</div><div class='add'>+ * @ndlp: pointer to a node-list data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine registers the @vport as a new virtual port with a HBA.</div><div class='add'>+ * It is done through a registering vpi mailbox command.</div><div class='add'>+ **/</div><div class='ctx'> static void</div><div class='ctx'> lpfc_register_new_vport(struct lpfc_hba *phba, struct lpfc_vport *vport,</div><div class='ctx'> 			struct lpfc_nodelist *ndlp)</div><div class='hunk'>@@ -4531,6 +5809,26 @@ mbox_err_exit:</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_cmpl_els_fdisc: Completion function for fdisc iocb command.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ * @cmdiocb: pointer to lpfc command iocb data structure.</div><div class='add'>+ * @rspiocb: pointer to lpfc response iocb data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine is the completion callback function to a Fabric Discover</div><div class='add'>+ * (FDISC) ELS command. Since all the FDISC ELS commands are issued</div><div class='add'>+ * single threaded, each FDISC completion callback function will reset</div><div class='add'>+ * the discovery timer for all vports such that the timers will not get</div><div class='add'>+ * unnecessary timeout. The function checks the FDISC IOCB status. If error</div><div class='add'>+ * detected, the vport will be set to FC_VPORT_FAILED state. Otherwise,the</div><div class='add'>+ * vport will set to FC_VPORT_ACTIVE state. It then checks whether the DID</div><div class='add'>+ * assigned to the vport has been changed with the completion of the FDISC</div><div class='add'>+ * command. If so, both RPI (Remote Port Index) and VPI (Virtual Port Index)</div><div class='add'>+ * are unregistered from the HBA, and then the lpfc_register_new_vport()</div><div class='add'>+ * routine is invoked to register new vport with the HBA. Otherwise, the</div><div class='add'>+ * lpfc_do_scr_ns_plogi() routine is invoked to issue a PLOGI to the Name</div><div class='add'>+ * Server for State Change Request (SCR).</div><div class='add'>+ **/</div><div class='ctx'> static void</div><div class='ctx'> lpfc_cmpl_els_fdisc(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,</div><div class='ctx'> 		    struct lpfc_iocbq *rspiocb)</div><div class='hunk'>@@ -4565,58 +5863,80 @@ lpfc_cmpl_els_fdisc(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		/* FDISC failed */</div><div class='ctx'> 		lpfc_printf_vlog(vport, KERN_ERR, LOG_ELS,</div><div class='del'>-				 "0124 FDISC failed. (%d/%d)\n",</div><div class='add'>+				 "0126 FDISC failed. (%d/%d)\n",</div><div class='ctx'> 				 irsp-&gt;ulpStatus, irsp-&gt;un.ulpWord[4]);</div><div class='add'>+		goto fdisc_failed;</div><div class='add'>+	}</div><div class='ctx'> 		if (vport-&gt;fc_vport-&gt;vport_state == FC_VPORT_INITIALIZING)</div><div class='ctx'> 			lpfc_vport_set_state(vport, FC_VPORT_FAILED);</div><div class='ctx'> 		lpfc_nlp_put(ndlp);</div><div class='ctx'> 		/* giving up on FDISC. Cancel discovery timer */</div><div class='ctx'> 		lpfc_can_disctmo(vport);</div><div class='del'>-	} else {</div><div class='del'>-		spin_lock_irq(shost-&gt;host_lock);</div><div class='del'>-		vport-&gt;fc_flag |= FC_FABRIC;</div><div class='del'>-		if (vport-&gt;phba-&gt;fc_topology == TOPOLOGY_LOOP)</div><div class='del'>-			vport-&gt;fc_flag |=  FC_PUBLIC_LOOP;</div><div class='del'>-		spin_unlock_irq(shost-&gt;host_lock);</div><div class='add'>+	spin_lock_irq(shost-&gt;host_lock);</div><div class='add'>+	vport-&gt;fc_flag |= FC_FABRIC;</div><div class='add'>+	if (vport-&gt;phba-&gt;fc_topology == TOPOLOGY_LOOP)</div><div class='add'>+		vport-&gt;fc_flag |=  FC_PUBLIC_LOOP;</div><div class='add'>+	spin_unlock_irq(shost-&gt;host_lock);</div><div class='ctx'> </div><div class='del'>-		vport-&gt;fc_myDID = irsp-&gt;un.ulpWord[4] &amp; Mask_DID;</div><div class='del'>-		lpfc_vport_set_state(vport, FC_VPORT_ACTIVE);</div><div class='del'>-		if ((vport-&gt;fc_prevDID != vport-&gt;fc_myDID) &amp;&amp;</div><div class='del'>-			!(vport-&gt;fc_flag &amp; FC_VPORT_NEEDS_REG_VPI)) {</div><div class='del'>-			/* If our NportID changed, we need to ensure all</div><div class='del'>-			 * remaining NPORTs get unreg_login'ed so we can</div><div class='del'>-			 * issue unreg_vpi.</div><div class='del'>-			 */</div><div class='del'>-			list_for_each_entry_safe(np, next_np,</div><div class='del'>-				&amp;vport-&gt;fc_nodes, nlp_listp) {</div><div class='del'>-				if (!NLP_CHK_NODE_ACT(ndlp) ||</div><div class='del'>-				    (np-&gt;nlp_state != NLP_STE_NPR_NODE) ||</div><div class='del'>-				    !(np-&gt;nlp_flag &amp; NLP_NPR_ADISC))</div><div class='del'>-					continue;</div><div class='del'>-				spin_lock_irq(shost-&gt;host_lock);</div><div class='del'>-				np-&gt;nlp_flag &amp;= ~NLP_NPR_ADISC;</div><div class='del'>-				spin_unlock_irq(shost-&gt;host_lock);</div><div class='del'>-				lpfc_unreg_rpi(vport, np);</div><div class='del'>-			}</div><div class='del'>-			lpfc_mbx_unreg_vpi(vport);</div><div class='add'>+	vport-&gt;fc_myDID = irsp-&gt;un.ulpWord[4] &amp; Mask_DID;</div><div class='add'>+	lpfc_vport_set_state(vport, FC_VPORT_ACTIVE);</div><div class='add'>+	if ((vport-&gt;fc_prevDID != vport-&gt;fc_myDID) &amp;&amp;</div><div class='add'>+		!(vport-&gt;fc_flag &amp; FC_VPORT_NEEDS_REG_VPI)) {</div><div class='add'>+		/* If our NportID changed, we need to ensure all</div><div class='add'>+		 * remaining NPORTs get unreg_login'ed so we can</div><div class='add'>+		 * issue unreg_vpi.</div><div class='add'>+		 */</div><div class='add'>+		list_for_each_entry_safe(np, next_np,</div><div class='add'>+			&amp;vport-&gt;fc_nodes, nlp_listp) {</div><div class='add'>+			if (!NLP_CHK_NODE_ACT(ndlp) ||</div><div class='add'>+			    (np-&gt;nlp_state != NLP_STE_NPR_NODE) ||</div><div class='add'>+			    !(np-&gt;nlp_flag &amp; NLP_NPR_ADISC))</div><div class='add'>+				continue;</div><div class='ctx'> 			spin_lock_irq(shost-&gt;host_lock);</div><div class='del'>-			vport-&gt;fc_flag |= FC_VPORT_NEEDS_REG_VPI;</div><div class='add'>+			np-&gt;nlp_flag &amp;= ~NLP_NPR_ADISC;</div><div class='ctx'> 			spin_unlock_irq(shost-&gt;host_lock);</div><div class='add'>+			lpfc_unreg_rpi(vport, np);</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		if (vport-&gt;fc_flag &amp; FC_VPORT_NEEDS_REG_VPI)</div><div class='del'>-			lpfc_register_new_vport(phba, vport, ndlp);</div><div class='del'>-		else</div><div class='del'>-			lpfc_do_scr_ns_plogi(phba, vport);</div><div class='del'>-</div><div class='del'>-		/* Unconditionaly kick off releasing fabric node for vports */</div><div class='del'>-		lpfc_nlp_put(ndlp);</div><div class='add'>+		lpfc_mbx_unreg_vpi(vport);</div><div class='add'>+		spin_lock_irq(shost-&gt;host_lock);</div><div class='add'>+		vport-&gt;fc_flag |= FC_VPORT_NEEDS_REG_VPI;</div><div class='add'>+		spin_unlock_irq(shost-&gt;host_lock);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (vport-&gt;fc_flag &amp; FC_VPORT_NEEDS_REG_VPI)</div><div class='add'>+		lpfc_register_new_vport(phba, vport, ndlp);</div><div class='add'>+	else</div><div class='add'>+		lpfc_do_scr_ns_plogi(phba, vport);</div><div class='add'>+	goto out;</div><div class='add'>+fdisc_failed:</div><div class='add'>+	lpfc_vport_set_state(vport, FC_VPORT_FAILED);</div><div class='add'>+	/* Cancel discovery timer */</div><div class='add'>+	lpfc_can_disctmo(vport);</div><div class='add'>+	lpfc_nlp_put(ndlp);</div><div class='ctx'> out:</div><div class='ctx'> 	lpfc_els_free_iocb(phba, cmdiocb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_issue_els_fdisc: Issue a fdisc iocb command.</div><div class='add'>+ * @vport: pointer to a virtual N_Port data structure.</div><div class='add'>+ * @ndlp: pointer to a node-list data structure.</div><div class='add'>+ * @retry: number of retries to the command IOCB.</div><div class='add'>+ *</div><div class='add'>+ * This routine prepares and issues a Fabric Discover (FDISC) IOCB to</div><div class='add'>+ * a remote node (@ndlp) off a @vport. It uses the lpfc_issue_fabric_iocb()</div><div class='add'>+ * routine to issue the IOCB, which makes sure only one outstanding fabric</div><div class='add'>+ * IOCB will be sent off HBA at any given time.</div><div class='add'>+ *</div><div class='add'>+ * Note that, in lpfc_prep_els_iocb() routine, the reference count of ndlp</div><div class='add'>+ * will be incremented by 1 for holding the ndlp and the reference to ndlp</div><div class='add'>+ * will be stored into the context1 field of the IOCB for the completion</div><div class='add'>+ * callback function to the FDISC ELS command.</div><div class='add'>+ *</div><div class='add'>+ * Return code</div><div class='add'>+ *   0 - Successfully issued fdisc iocb command</div><div class='add'>+ *   1 - Failed to issue fdisc iocb command</div><div class='add'>+ **/</div><div class='ctx'> static int</div><div class='ctx'> lpfc_issue_els_fdisc(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,</div><div class='ctx'> 		     uint8_t retry)</div><div class='hunk'>@@ -4691,6 +6011,20 @@ lpfc_issue_els_fdisc(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_cmpl_els_npiv_logo: Completion function with vport logo.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ * @cmdiocb: pointer to lpfc command iocb data structure.</div><div class='add'>+ * @rspiocb: pointer to lpfc response iocb data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine is the completion callback function to the issuing of a LOGO</div><div class='add'>+ * ELS command off a vport. It frees the command IOCB and then decrement the</div><div class='add'>+ * reference count held on ndlp for this completion function, indicating that</div><div class='add'>+ * the reference to the ndlp is no long needed. Note that the</div><div class='add'>+ * lpfc_els_free_iocb() routine decrements the ndlp reference held for this</div><div class='add'>+ * callback function and an additional explicit ndlp reference decrementation</div><div class='add'>+ * will trigger the actual release of the ndlp.</div><div class='add'>+ **/</div><div class='ctx'> static void</div><div class='ctx'> lpfc_cmpl_els_npiv_logo(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,</div><div class='ctx'> 			struct lpfc_iocbq *rspiocb)</div><div class='hunk'>@@ -4712,6 +6046,22 @@ lpfc_cmpl_els_npiv_logo(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,</div><div class='ctx'> 	lpfc_nlp_put(ndlp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_issue_els_npiv_logo: Issue a logo off a vport.</div><div class='add'>+ * @vport: pointer to a virtual N_Port data structure.</div><div class='add'>+ * @ndlp: pointer to a node-list data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine issues a LOGO ELS command to an @ndlp off a @vport.</div><div class='add'>+ *</div><div class='add'>+ * Note that, in lpfc_prep_els_iocb() routine, the reference count of ndlp</div><div class='add'>+ * will be incremented by 1 for holding the ndlp and the reference to ndlp</div><div class='add'>+ * will be stored into the context1 field of the IOCB for the completion</div><div class='add'>+ * callback function to the LOGO ELS command.</div><div class='add'>+ *</div><div class='add'>+ * Return codes</div><div class='add'>+ *   0 - Successfully issued logo off the @vport</div><div class='add'>+ *   1 - Failed to issue logo off the @vport</div><div class='add'>+ **/</div><div class='ctx'> int</div><div class='ctx'> lpfc_issue_els_npiv_logo(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp)</div><div class='ctx'> {</div><div class='hunk'>@@ -4757,6 +6107,17 @@ lpfc_issue_els_npiv_logo(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_fabric_block_timeout: Handler function to the fabric block timer.</div><div class='add'>+ * @ptr: holder for the timer function associated data.</div><div class='add'>+ *</div><div class='add'>+ * This routine is invoked by the fabric iocb block timer after</div><div class='add'>+ * timeout. It posts the fabric iocb block timeout event by setting the</div><div class='add'>+ * WORKER_FABRIC_BLOCK_TMO bit to work port event bitmap and then invokes</div><div class='add'>+ * lpfc_worker_wake_up() routine to wake up the worker thread. It is for</div><div class='add'>+ * the worker thread to invoke the lpfc_unblock_fabric_iocbs() on the</div><div class='add'>+ * posted event WORKER_FABRIC_BLOCK_TMO.</div><div class='add'>+ **/</div><div class='ctx'> void</div><div class='ctx'> lpfc_fabric_block_timeout(unsigned long ptr)</div><div class='ctx'> {</div><div class='hunk'>@@ -4775,6 +6136,16 @@ lpfc_fabric_block_timeout(unsigned long ptr)</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_resume_fabric_iocbs: Issue a fabric iocb from driver internal list.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine issues one fabric iocb from the driver internal list to</div><div class='add'>+ * the HBA. It first checks whether it's ready to issue one fabric iocb to</div><div class='add'>+ * the HBA (whether there is no outstanding fabric iocb). If so, it shall</div><div class='add'>+ * remove one pending fabric iocb from the driver internal list and invokes</div><div class='add'>+ * lpfc_sli_issue_iocb() routine to send the fabric iocb to the HBA.</div><div class='add'>+ **/</div><div class='ctx'> static void</div><div class='ctx'> lpfc_resume_fabric_iocbs(struct lpfc_hba *phba)</div><div class='ctx'> {</div><div class='hunk'>@@ -4824,6 +6195,15 @@ repeat:</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_unblock_fabric_iocbs: Unblock issuing fabric iocb command.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine unblocks the  issuing fabric iocb command. The function</div><div class='add'>+ * will clear the fabric iocb block bit and then invoke the routine</div><div class='add'>+ * lpfc_resume_fabric_iocbs() to issue one of the pending fabric iocb</div><div class='add'>+ * from the driver internal fabric iocb list.</div><div class='add'>+ **/</div><div class='ctx'> void</div><div class='ctx'> lpfc_unblock_fabric_iocbs(struct lpfc_hba *phba)</div><div class='ctx'> {</div><div class='hunk'>@@ -4833,6 +6213,15 @@ lpfc_unblock_fabric_iocbs(struct lpfc_hba *phba)</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_block_fabric_iocbs: Block issuing fabric iocb command.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine blocks the issuing fabric iocb for a specified amount of</div><div class='add'>+ * time (currently 100 ms). This is done by set the fabric iocb block bit</div><div class='add'>+ * and set up a timeout timer for 100ms. When the block bit is set, no more</div><div class='add'>+ * fabric iocb will be issued out of the HBA.</div><div class='add'>+ **/</div><div class='ctx'> static void</div><div class='ctx'> lpfc_block_fabric_iocbs(struct lpfc_hba *phba)</div><div class='ctx'> {</div><div class='hunk'>@@ -4846,6 +6235,19 @@ lpfc_block_fabric_iocbs(struct lpfc_hba *phba)</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_cmpl_fabric_iocb: Completion callback function for fabric iocb.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ * @cmdiocb: pointer to lpfc command iocb data structure.</div><div class='add'>+ * @rspiocb: pointer to lpfc response iocb data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine is the callback function that is put to the fabric iocb's</div><div class='add'>+ * callback function pointer (iocb-&gt;iocb_cmpl). The original iocb's callback</div><div class='add'>+ * function pointer has been stored in iocb-&gt;fabric_iocb_cmpl. This callback</div><div class='add'>+ * function first restores and invokes the original iocb's callback function</div><div class='add'>+ * and then invokes the lpfc_resume_fabric_iocbs() routine to issue the next</div><div class='add'>+ * fabric bound iocb from the driver internal fabric iocb list onto the wire.</div><div class='add'>+ **/</div><div class='ctx'> static void</div><div class='ctx'> lpfc_cmpl_fabric_iocb(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,</div><div class='ctx'> 	struct lpfc_iocbq *rspiocb)</div><div class='hunk'>@@ -4892,6 +6294,30 @@ lpfc_cmpl_fabric_iocb(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_issue_fabric_iocb: Issue a fabric iocb command.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ * @iocb: pointer to lpfc command iocb data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine is used as the top-level API for issuing a fabric iocb command</div><div class='add'>+ * such as FLOGI and FDISC. To accommodate certain switch fabric, this driver</div><div class='add'>+ * function makes sure that only one fabric bound iocb will be outstanding at</div><div class='add'>+ * any given time. As such, this function will first check to see whether there</div><div class='add'>+ * is already an outstanding fabric iocb on the wire. If so, it will put the</div><div class='add'>+ * newly issued iocb onto the driver internal fabric iocb list, waiting to be</div><div class='add'>+ * issued later. Otherwise, it will issue the iocb on the wire and update the</div><div class='add'>+ * fabric iocb count it indicate that there is one fabric iocb on the wire.</div><div class='add'>+ *</div><div class='add'>+ * Note, this implementation has a potential sending out fabric IOCBs out of</div><div class='add'>+ * order. The problem is caused by the construction of the "ready" boolen does</div><div class='add'>+ * not include the condition that the internal fabric IOCB list is empty. As</div><div class='add'>+ * such, it is possible a fabric IOCB issued by this routine might be "jump"</div><div class='add'>+ * ahead of the fabric IOCBs in the internal list.</div><div class='add'>+ *</div><div class='add'>+ * Return code</div><div class='add'>+ *   IOCB_SUCCESS - either fabric iocb put on the list or issued successfully</div><div class='add'>+ *   IOCB_ERROR - failed to issue fabric iocb</div><div class='add'>+ **/</div><div class='ctx'> static int</div><div class='ctx'> lpfc_issue_fabric_iocb(struct lpfc_hba *phba, struct lpfc_iocbq *iocb)</div><div class='ctx'> {</div><div class='hunk'>@@ -4937,7 +6363,17 @@ lpfc_issue_fabric_iocb(struct lpfc_hba *phba, struct lpfc_iocbq *iocb)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='add'>+/**</div><div class='add'>+ * lpfc_fabric_abort_vport: Abort a vport's iocbs from driver fabric iocb list.</div><div class='add'>+ * @vport: pointer to a virtual N_Port data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine aborts all the IOCBs associated with a @vport from the</div><div class='add'>+ * driver internal fabric IOCB list. The list contains fabric IOCBs to be</div><div class='add'>+ * issued to the ELS IOCB ring. This abort function walks the fabric IOCB</div><div class='add'>+ * list, removes each IOCB associated with the @vport off the list, set the</div><div class='add'>+ * status feild to IOSTAT_LOCAL_REJECT, and invokes the callback function</div><div class='add'>+ * associated with the IOCB.</div><div class='add'>+ **/</div><div class='ctx'> static void lpfc_fabric_abort_vport(struct lpfc_vport *vport)</div><div class='ctx'> {</div><div class='ctx'> 	LIST_HEAD(completions);</div><div class='hunk'>@@ -4967,6 +6403,17 @@ static void lpfc_fabric_abort_vport(struct lpfc_vport *vport)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_fabric_abort_nport: Abort a ndlp's iocbs from driver fabric iocb list.</div><div class='add'>+ * @ndlp: pointer to a node-list data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine aborts all the IOCBs associated with an @ndlp from the</div><div class='add'>+ * driver internal fabric IOCB list. The list contains fabric IOCBs to be</div><div class='add'>+ * issued to the ELS IOCB ring. This abort function walks the fabric IOCB</div><div class='add'>+ * list, removes each IOCB associated with the @ndlp off the list, set the</div><div class='add'>+ * status feild to IOSTAT_LOCAL_REJECT, and invokes the callback function</div><div class='add'>+ * associated with the IOCB.</div><div class='add'>+ **/</div><div class='ctx'> void lpfc_fabric_abort_nport(struct lpfc_nodelist *ndlp)</div><div class='ctx'> {</div><div class='ctx'> 	LIST_HEAD(completions);</div><div class='hunk'>@@ -4996,6 +6443,17 @@ void lpfc_fabric_abort_nport(struct lpfc_nodelist *ndlp)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_fabric_abort_hba: Abort all iocbs on driver fabric iocb list.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine aborts all the IOCBs currently on the driver internal</div><div class='add'>+ * fabric IOCB list. The list contains fabric IOCBs to be issued to the ELS</div><div class='add'>+ * IOCB ring. This function takes the entire IOCB list off the fabric IOCB</div><div class='add'>+ * list, removes IOCBs off the list, set the status feild to</div><div class='add'>+ * IOSTAT_LOCAL_REJECT, and invokes the callback function associated with</div><div class='add'>+ * the IOCB.</div><div class='add'>+ **/</div><div class='ctx'> void lpfc_fabric_abort_hba(struct lpfc_hba *phba)</div><div class='ctx'> {</div><div class='ctx'> 	LIST_HEAD(completions);</div><div class='head'>diff --git a/drivers/scsi/lpfc/lpfc_hbadisc.c b/drivers/scsi/lpfc/lpfc_hbadisc.c<br/>index a98d11bf3576..a1a70d9ffc2a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/lpfc/lpfc_hbadisc.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/lpfc/lpfc_hbadisc.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/lpfc/lpfc_hbadisc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/lpfc/lpfc_hbadisc.c</a></div><div class='hunk'>@@ -30,6 +30,7 @@</div><div class='ctx'> #include &lt;scsi/scsi_transport_fc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "lpfc_hw.h"</div><div class='add'>+#include "lpfc_nl.h"</div><div class='ctx'> #include "lpfc_disc.h"</div><div class='ctx'> #include "lpfc_sli.h"</div><div class='ctx'> #include "lpfc_scsi.h"</div><div class='hunk'>@@ -88,14 +89,6 @@ lpfc_terminate_rport_io(struct fc_rport *rport)</div><div class='ctx'> 			&amp;phba-&gt;sli.ring[phba-&gt;sli.fcp_ring],</div><div class='ctx'> 			ndlp-&gt;nlp_sid, 0, LPFC_CTX_TGT);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * A device is normally blocked for rediscovery and unblocked when</div><div class='del'>-	 * devloss timeout happens.  In case a vport is removed or driver</div><div class='del'>-	 * unloaded before devloss timeout happens, we need to unblock here.</div><div class='del'>-	 */</div><div class='del'>-	scsi_target_unblock(&amp;rport-&gt;dev);</div><div class='del'>-	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -215,8 +208,16 @@ lpfc_dev_loss_tmo_handler(struct lpfc_nodelist *ndlp)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (ndlp-&gt;nlp_state == NLP_STE_MAPPED_NODE)</div><div class='add'>+	if (ndlp-&gt;nlp_state == NLP_STE_MAPPED_NODE) {</div><div class='add'>+		lpfc_printf_vlog(vport, KERN_INFO, LOG_DISCOVERY,</div><div class='add'>+				 "0284 Devloss timeout Ignored on "</div><div class='add'>+				 "WWPN %x:%x:%x:%x:%x:%x:%x:%x "</div><div class='add'>+				 "NPort x%x\n",</div><div class='add'>+				 *name, *(name+1), *(name+2), *(name+3),</div><div class='add'>+				 *(name+4), *(name+5), *(name+6), *(name+7),</div><div class='add'>+				 ndlp-&gt;nlp_DID);</div><div class='ctx'> 		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (ndlp-&gt;nlp_type &amp; NLP_FABRIC) {</div><div class='ctx'> 		/* We will clean up these Nodes in linkup */</div><div class='hunk'>@@ -237,8 +238,6 @@ lpfc_dev_loss_tmo_handler(struct lpfc_nodelist *ndlp)</div><div class='ctx'> 		lpfc_sli_abort_iocb(vport, &amp;phba-&gt;sli.ring[phba-&gt;sli.fcp_ring],</div><div class='ctx'> 				    ndlp-&gt;nlp_sid, 0, LPFC_CTX_TGT);</div><div class='ctx'> 	}</div><div class='del'>-	if (vport-&gt;load_flag &amp; FC_UNLOADING)</div><div class='del'>-		warn_on = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (warn_on) {</div><div class='ctx'> 		lpfc_printf_vlog(vport, KERN_ERR, LOG_DISCOVERY,</div><div class='hunk'>@@ -276,6 +275,124 @@ lpfc_dev_loss_tmo_handler(struct lpfc_nodelist *ndlp)</div><div class='ctx'> 		lpfc_disc_state_machine(vport, ndlp, NULL, NLP_EVT_DEVICE_RM);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_alloc_fast_evt: Allocates data structure for posting event.</div><div class='add'>+ * @phba: Pointer to hba context object.</div><div class='add'>+ *</div><div class='add'>+ * This function is called from the functions which need to post</div><div class='add'>+ * events from interrupt context. This function allocates data</div><div class='add'>+ * structure required for posting event. It also keeps track of</div><div class='add'>+ * number of events pending and prevent event storm when there are</div><div class='add'>+ * too many events.</div><div class='add'>+ **/</div><div class='add'>+struct lpfc_fast_path_event *</div><div class='add'>+lpfc_alloc_fast_evt(struct lpfc_hba *phba) {</div><div class='add'>+	struct lpfc_fast_path_event *ret;</div><div class='add'>+</div><div class='add'>+	/* If there are lot of fast event do not exhaust memory due to this */</div><div class='add'>+	if (atomic_read(&amp;phba-&gt;fast_event_count) &gt; LPFC_MAX_EVT_COUNT)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	ret = kzalloc(sizeof(struct lpfc_fast_path_event),</div><div class='add'>+			GFP_ATOMIC);</div><div class='add'>+	if (ret)</div><div class='add'>+		atomic_inc(&amp;phba-&gt;fast_event_count);</div><div class='add'>+	INIT_LIST_HEAD(&amp;ret-&gt;work_evt.evt_listp);</div><div class='add'>+	ret-&gt;work_evt.evt = LPFC_EVT_FASTPATH_MGMT_EVT;</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * lpfc_free_fast_evt: Frees event data structure.</div><div class='add'>+ * @phba: Pointer to hba context object.</div><div class='add'>+ * @evt:  Event object which need to be freed.</div><div class='add'>+ *</div><div class='add'>+ * This function frees the data structure required for posting</div><div class='add'>+ * events.</div><div class='add'>+ **/</div><div class='add'>+void</div><div class='add'>+lpfc_free_fast_evt(struct lpfc_hba *phba,</div><div class='add'>+		struct lpfc_fast_path_event *evt) {</div><div class='add'>+</div><div class='add'>+	atomic_dec(&amp;phba-&gt;fast_event_count);</div><div class='add'>+	kfree(evt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * lpfc_send_fastpath_evt: Posts events generated from fast path.</div><div class='add'>+ * @phba: Pointer to hba context object.</div><div class='add'>+ * @evtp: Event data structure.</div><div class='add'>+ *</div><div class='add'>+ * This function is called from worker thread, when the interrupt</div><div class='add'>+ * context need to post an event. This function posts the event</div><div class='add'>+ * to fc transport netlink interface.</div><div class='add'>+ **/</div><div class='add'>+static void</div><div class='add'>+lpfc_send_fastpath_evt(struct lpfc_hba *phba,</div><div class='add'>+		struct lpfc_work_evt *evtp)</div><div class='add'>+{</div><div class='add'>+	unsigned long evt_category, evt_sub_category;</div><div class='add'>+	struct lpfc_fast_path_event *fast_evt_data;</div><div class='add'>+	char *evt_data;</div><div class='add'>+	uint32_t evt_data_size;</div><div class='add'>+	struct Scsi_Host *shost;</div><div class='add'>+</div><div class='add'>+	fast_evt_data = container_of(evtp, struct lpfc_fast_path_event,</div><div class='add'>+		work_evt);</div><div class='add'>+</div><div class='add'>+	evt_category = (unsigned long) fast_evt_data-&gt;un.fabric_evt.event_type;</div><div class='add'>+	evt_sub_category = (unsigned long) fast_evt_data-&gt;un.</div><div class='add'>+			fabric_evt.subcategory;</div><div class='add'>+	shost = lpfc_shost_from_vport(fast_evt_data-&gt;vport);</div><div class='add'>+	if (evt_category == FC_REG_FABRIC_EVENT) {</div><div class='add'>+		if (evt_sub_category == LPFC_EVENT_FCPRDCHKERR) {</div><div class='add'>+			evt_data = (char *) &amp;fast_evt_data-&gt;un.read_check_error;</div><div class='add'>+			evt_data_size = sizeof(fast_evt_data-&gt;un.</div><div class='add'>+				read_check_error);</div><div class='add'>+		} else if ((evt_sub_category == LPFC_EVENT_FABRIC_BUSY) ||</div><div class='add'>+			(evt_sub_category == IOSTAT_NPORT_BSY)) {</div><div class='add'>+			evt_data = (char *) &amp;fast_evt_data-&gt;un.fabric_evt;</div><div class='add'>+			evt_data_size = sizeof(fast_evt_data-&gt;un.fabric_evt);</div><div class='add'>+		} else {</div><div class='add'>+			lpfc_free_fast_evt(phba, fast_evt_data);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	} else if (evt_category == FC_REG_SCSI_EVENT) {</div><div class='add'>+		switch (evt_sub_category) {</div><div class='add'>+		case LPFC_EVENT_QFULL:</div><div class='add'>+		case LPFC_EVENT_DEVBSY:</div><div class='add'>+			evt_data = (char *) &amp;fast_evt_data-&gt;un.scsi_evt;</div><div class='add'>+			evt_data_size = sizeof(fast_evt_data-&gt;un.scsi_evt);</div><div class='add'>+			break;</div><div class='add'>+		case LPFC_EVENT_CHECK_COND:</div><div class='add'>+			evt_data = (char *) &amp;fast_evt_data-&gt;un.check_cond_evt;</div><div class='add'>+			evt_data_size =  sizeof(fast_evt_data-&gt;un.</div><div class='add'>+				check_cond_evt);</div><div class='add'>+			break;</div><div class='add'>+		case LPFC_EVENT_VARQUEDEPTH:</div><div class='add'>+			evt_data = (char *) &amp;fast_evt_data-&gt;un.queue_depth_evt;</div><div class='add'>+			evt_data_size = sizeof(fast_evt_data-&gt;un.</div><div class='add'>+				queue_depth_evt);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			lpfc_free_fast_evt(phba, fast_evt_data);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		lpfc_free_fast_evt(phba, fast_evt_data);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fc_host_post_vendor_event(shost,</div><div class='add'>+		fc_get_event_number(),</div><div class='add'>+		evt_data_size,</div><div class='add'>+		evt_data,</div><div class='add'>+		SCSI_NL_VID_TYPE_PCI | PCI_VENDOR_ID_EMULEX);</div><div class='add'>+</div><div class='add'>+	lpfc_free_fast_evt(phba, fast_evt_data);</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void</div><div class='ctx'> lpfc_work_list_done(struct lpfc_hba *phba)</div><div class='ctx'> {</div><div class='hunk'>@@ -347,6 +464,10 @@ lpfc_work_list_done(struct lpfc_hba *phba)</div><div class='ctx'> 			lpfc_unblock_mgmt_io(phba);</div><div class='ctx'> 			complete((struct completion *)(evtp-&gt;evt_arg2));</div><div class='ctx'> 			break;</div><div class='add'>+		case LPFC_EVT_FASTPATH_MGMT_EVT:</div><div class='add'>+			lpfc_send_fastpath_evt(phba, evtp);</div><div class='add'>+			free_evt = 0;</div><div class='add'>+			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (free_evt)</div><div class='ctx'> 			kfree(evtp);</div><div class='hunk'>@@ -371,6 +492,7 @@ lpfc_work_done(struct lpfc_hba *phba)</div><div class='ctx'> 	spin_unlock_irq(&amp;phba-&gt;hbalock);</div><div class='ctx'> </div><div class='ctx'> 	if (ha_copy &amp; HA_ERATT)</div><div class='add'>+		/* Handle the error attention event */</div><div class='ctx'> 		lpfc_handle_eratt(phba);</div><div class='ctx'> </div><div class='ctx'> 	if (ha_copy &amp; HA_MBATT)</div><div class='hunk'>@@ -378,6 +500,7 @@ lpfc_work_done(struct lpfc_hba *phba)</div><div class='ctx'> </div><div class='ctx'> 	if (ha_copy &amp; HA_LATT)</div><div class='ctx'> 		lpfc_handle_latt(phba);</div><div class='add'>+</div><div class='ctx'> 	vports = lpfc_create_vport_work_array(phba);</div><div class='ctx'> 	if (vports != NULL)</div><div class='ctx'> 		for(i = 0; i &lt;= phba-&gt;max_vpi; i++) {</div><div class='hunk'>@@ -1013,14 +1136,10 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-lpfc_mbx_issue_link_down(struct lpfc_hba *phba)</div><div class='add'>+lpfc_enable_la(struct lpfc_hba *phba)</div><div class='ctx'> {</div><div class='ctx'> 	uint32_t control;</div><div class='ctx'> 	struct lpfc_sli *psli = &amp;phba-&gt;sli;</div><div class='del'>-</div><div class='del'>-	lpfc_linkdown(phba);</div><div class='del'>-</div><div class='del'>-	/* turn on Link Attention interrupts - no CLEAR_LA needed */</div><div class='ctx'> 	spin_lock_irq(&amp;phba-&gt;hbalock);</div><div class='ctx'> 	psli-&gt;sli_flag |= LPFC_PROCESS_LA;</div><div class='ctx'> 	control = readl(phba-&gt;HCregaddr);</div><div class='hunk'>@@ -1030,6 +1149,15 @@ lpfc_mbx_issue_link_down(struct lpfc_hba *phba)</div><div class='ctx'> 	spin_unlock_irq(&amp;phba-&gt;hbalock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void</div><div class='add'>+lpfc_mbx_issue_link_down(struct lpfc_hba *phba)</div><div class='add'>+{</div><div class='add'>+	lpfc_linkdown(phba);</div><div class='add'>+	lpfc_enable_la(phba);</div><div class='add'>+	/* turn on Link Attention interrupts - no CLEAR_LA needed */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * This routine handles processing a READ_LA mailbox</div><div class='ctx'>  * command upon completion. It is setup in the LPFC_MBOXQ</div><div class='hunk'>@@ -1077,8 +1205,12 @@ lpfc_mbx_cmpl_read_la(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	phba-&gt;fc_eventTag = la-&gt;eventTag;</div><div class='add'>+	if (la-&gt;mm)</div><div class='add'>+		phba-&gt;sli.sli_flag |= LPFC_MENLO_MAINT;</div><div class='add'>+	else</div><div class='add'>+		phba-&gt;sli.sli_flag &amp;= ~LPFC_MENLO_MAINT;</div><div class='ctx'> </div><div class='del'>-	if (la-&gt;attType == AT_LINK_UP) {</div><div class='add'>+	if (la-&gt;attType == AT_LINK_UP &amp;&amp; (!la-&gt;mm)) {</div><div class='ctx'> 		phba-&gt;fc_stat.LinkUp++;</div><div class='ctx'> 		if (phba-&gt;link_flag &amp; LS_LOOPBACK_MODE) {</div><div class='ctx'> 			lpfc_printf_log(phba, KERN_ERR, LOG_LINK_EVENT,</div><div class='hunk'>@@ -1090,13 +1222,15 @@ lpfc_mbx_cmpl_read_la(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)</div><div class='ctx'> 		} else {</div><div class='ctx'> 			lpfc_printf_log(phba, KERN_ERR, LOG_LINK_EVENT,</div><div class='ctx'> 					"1303 Link Up Event x%x received "</div><div class='del'>-					"Data: x%x x%x x%x x%x\n",</div><div class='add'>+					"Data: x%x x%x x%x x%x x%x x%x %d\n",</div><div class='ctx'> 					la-&gt;eventTag, phba-&gt;fc_eventTag,</div><div class='ctx'> 					la-&gt;granted_AL_PA, la-&gt;UlnkSpeed,</div><div class='del'>-					phba-&gt;alpa_map[0]);</div><div class='add'>+					phba-&gt;alpa_map[0],</div><div class='add'>+					la-&gt;mm, la-&gt;fa,</div><div class='add'>+					phba-&gt;wait_4_mlo_maint_flg);</div><div class='ctx'> 		}</div><div class='ctx'> 		lpfc_mbx_process_link_up(phba, la);</div><div class='del'>-	} else {</div><div class='add'>+	} else if (la-&gt;attType == AT_LINK_DOWN) {</div><div class='ctx'> 		phba-&gt;fc_stat.LinkDown++;</div><div class='ctx'> 		if (phba-&gt;link_flag &amp; LS_LOOPBACK_MODE) {</div><div class='ctx'> 			lpfc_printf_log(phba, KERN_ERR, LOG_LINK_EVENT,</div><div class='hunk'>@@ -1109,11 +1243,46 @@ lpfc_mbx_cmpl_read_la(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)</div><div class='ctx'> 		else {</div><div class='ctx'> 			lpfc_printf_log(phba, KERN_ERR, LOG_LINK_EVENT,</div><div class='ctx'> 				"1305 Link Down Event x%x received "</div><div class='add'>+				"Data: x%x x%x x%x x%x x%x\n",</div><div class='add'>+				la-&gt;eventTag, phba-&gt;fc_eventTag,</div><div class='add'>+				phba-&gt;pport-&gt;port_state, vport-&gt;fc_flag,</div><div class='add'>+				la-&gt;mm, la-&gt;fa);</div><div class='add'>+		}</div><div class='add'>+		lpfc_mbx_issue_link_down(phba);</div><div class='add'>+	}</div><div class='add'>+	if (la-&gt;mm &amp;&amp; la-&gt;attType == AT_LINK_UP) {</div><div class='add'>+		if (phba-&gt;link_state != LPFC_LINK_DOWN) {</div><div class='add'>+			phba-&gt;fc_stat.LinkDown++;</div><div class='add'>+			lpfc_printf_log(phba, KERN_ERR, LOG_LINK_EVENT,</div><div class='add'>+				"1312 Link Down Event x%x received "</div><div class='add'>+				"Data: x%x x%x x%x\n",</div><div class='add'>+				la-&gt;eventTag, phba-&gt;fc_eventTag,</div><div class='add'>+				phba-&gt;pport-&gt;port_state, vport-&gt;fc_flag);</div><div class='add'>+			lpfc_mbx_issue_link_down(phba);</div><div class='add'>+		} else</div><div class='add'>+			lpfc_enable_la(phba);</div><div class='add'>+</div><div class='add'>+		lpfc_printf_log(phba, KERN_ERR, LOG_LINK_EVENT,</div><div class='add'>+				"1310 Menlo Maint Mode Link up Event x%x rcvd "</div><div class='ctx'> 				"Data: x%x x%x x%x\n",</div><div class='ctx'> 				la-&gt;eventTag, phba-&gt;fc_eventTag,</div><div class='ctx'> 				phba-&gt;pport-&gt;port_state, vport-&gt;fc_flag);</div><div class='add'>+		/*</div><div class='add'>+		 * The cmnd that triggered this will be waiting for this</div><div class='add'>+		 * signal.</div><div class='add'>+		 */</div><div class='add'>+		/* WAKEUP for MENLO_SET_MODE or MENLO_RESET command. */</div><div class='add'>+		if (phba-&gt;wait_4_mlo_maint_flg) {</div><div class='add'>+			phba-&gt;wait_4_mlo_maint_flg = 0;</div><div class='add'>+			wake_up_interruptible(&amp;phba-&gt;wait_4_mlo_m_q);</div><div class='ctx'> 		}</div><div class='del'>-		lpfc_mbx_issue_link_down(phba);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (la-&gt;fa) {</div><div class='add'>+		if (la-&gt;mm)</div><div class='add'>+			lpfc_issue_clear_la(phba, vport);</div><div class='add'>+		lpfc_printf_log(phba, KERN_INFO, LOG_LINK_EVENT,</div><div class='add'>+				"1311 fa %d\n", la-&gt;fa);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> lpfc_mbx_cmpl_read_la_free_mbuf:</div><div class='hunk'>@@ -1177,7 +1346,7 @@ lpfc_mbx_cmpl_unreg_vpi(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)</div><div class='ctx'> 		scsi_host_put(shost);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void</div><div class='add'>+int</div><div class='ctx'> lpfc_mbx_unreg_vpi(struct lpfc_vport *vport)</div><div class='ctx'> {</div><div class='ctx'> 	struct lpfc_hba  *phba = vport-&gt;phba;</div><div class='hunk'>@@ -1186,7 +1355,7 @@ lpfc_mbx_unreg_vpi(struct lpfc_vport *vport)</div><div class='ctx'> </div><div class='ctx'> 	mbox = mempool_alloc(phba-&gt;mbox_mem_pool, GFP_KERNEL);</div><div class='ctx'> 	if (!mbox)</div><div class='del'>-		return;</div><div class='add'>+		return 1;</div><div class='ctx'> </div><div class='ctx'> 	lpfc_unreg_vpi(phba, vport-&gt;vpi, mbox);</div><div class='ctx'> 	mbox-&gt;vport = vport;</div><div class='hunk'>@@ -1197,7 +1366,9 @@ lpfc_mbx_unreg_vpi(struct lpfc_vport *vport)</div><div class='ctx'> 				 "1800 Could not issue unreg_vpi\n");</div><div class='ctx'> 		mempool_free(mbox, phba-&gt;mbox_mem_pool);</div><div class='ctx'> 		vport-&gt;unreg_vpi_cmpl = VPORT_ERROR;</div><div class='add'>+		return rc;</div><div class='ctx'> 	}</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -1553,6 +1724,22 @@ lpfc_nlp_state_cleanup(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,</div><div class='ctx'> 		 */</div><div class='ctx'> 		lpfc_register_remote_port(vport, ndlp);</div><div class='ctx'> 	}</div><div class='add'>+	if ((new_state ==  NLP_STE_MAPPED_NODE) &amp;&amp;</div><div class='add'>+		(vport-&gt;stat_data_enabled)) {</div><div class='add'>+		/*</div><div class='add'>+		 * A new target is discovered, if there is no buffer for</div><div class='add'>+		 * statistical data collection allocate buffer.</div><div class='add'>+		 */</div><div class='add'>+		ndlp-&gt;lat_data = kcalloc(LPFC_MAX_BUCKET_COUNT,</div><div class='add'>+					 sizeof(struct lpfc_scsicmd_bkt),</div><div class='add'>+					 GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+		if (!ndlp-&gt;lat_data)</div><div class='add'>+			lpfc_printf_vlog(vport, KERN_ERR, LOG_NODE,</div><div class='add'>+				"0286 lpfc_nlp_state_cleanup failed to "</div><div class='add'>+				"allocate statistical data buffer DID "</div><div class='add'>+				"0x%x\n", ndlp-&gt;nlp_DID);</div><div class='add'>+	}</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * if we added to Mapped list, but the remote port</div><div class='ctx'> 	 * registration failed or assigned a target id outside</div><div class='hunk'>@@ -2786,7 +2973,7 @@ restart_disc:</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='ctx'> 		lpfc_printf_vlog(vport, KERN_ERR, LOG_DISCOVERY,</div><div class='del'>-				 "0229 Unexpected discovery timeout, "</div><div class='add'>+				 "0273 Unexpected discovery timeout, "</div><div class='ctx'> 				 "vport State x%x\n", vport-&gt;port_state);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2940,6 +3127,8 @@ lpfc_nlp_init(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;ndlp-&gt;nlp_listp);</div><div class='ctx'> 	kref_init(&amp;ndlp-&gt;kref);</div><div class='ctx'> 	NLP_INT_NODE_ACT(ndlp);</div><div class='add'>+	atomic_set(&amp;ndlp-&gt;cmd_pending, 0);</div><div class='add'>+	ndlp-&gt;cmd_qdepth = LPFC_MAX_TGT_QDEPTH;</div><div class='ctx'> </div><div class='ctx'> 	lpfc_debugfs_disc_trc(vport, LPFC_DISC_TRC_NODE,</div><div class='ctx'> 		"node init:       did:x%x",</div><div class='hunk'>@@ -2979,8 +3168,10 @@ lpfc_nlp_release(struct kref *kref)</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;phba-&gt;ndlp_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	/* free ndlp memory for final ndlp release */</div><div class='del'>-	if (NLP_CHK_FREE_REQ(ndlp))</div><div class='add'>+	if (NLP_CHK_FREE_REQ(ndlp)) {</div><div class='add'>+		kfree(ndlp-&gt;lat_data);</div><div class='ctx'> 		mempool_free(ndlp, ndlp-&gt;vport-&gt;phba-&gt;nlp_mem_pool);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* This routine bumps the reference count for a ndlp structure to ensure</div><div class='head'>diff --git a/drivers/scsi/lpfc/lpfc_hw.h b/drivers/scsi/lpfc/lpfc_hw.h<br/>index 7773b949aa7c..5de5dabbbee6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/lpfc/lpfc_hw.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/lpfc/lpfc_hw.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/lpfc/lpfc_hw.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/lpfc/lpfc_hw.h</a></div><div class='hunk'>@@ -1107,6 +1107,8 @@ typedef struct {</div><div class='ctx'> /* Start FireFly Register definitions */</div><div class='ctx'> #define PCI_VENDOR_ID_EMULEX        0x10df</div><div class='ctx'> #define PCI_DEVICE_ID_FIREFLY       0x1ae5</div><div class='add'>+#define PCI_DEVICE_ID_PROTEUS_VF    0xe100</div><div class='add'>+#define PCI_DEVICE_ID_PROTEUS_PF    0xe180</div><div class='ctx'> #define PCI_DEVICE_ID_SAT_SMB       0xf011</div><div class='ctx'> #define PCI_DEVICE_ID_SAT_MID       0xf015</div><div class='ctx'> #define PCI_DEVICE_ID_RFLY          0xf095</div><div class='hunk'>@@ -1133,10 +1135,12 @@ typedef struct {</div><div class='ctx'> #define PCI_DEVICE_ID_LP11000S      0xfc10</div><div class='ctx'> #define PCI_DEVICE_ID_LPE11000S     0xfc20</div><div class='ctx'> #define PCI_DEVICE_ID_SAT_S         0xfc40</div><div class='add'>+#define PCI_DEVICE_ID_PROTEUS_S     0xfc50</div><div class='ctx'> #define PCI_DEVICE_ID_HELIOS        0xfd00</div><div class='ctx'> #define PCI_DEVICE_ID_HELIOS_SCSP   0xfd11</div><div class='ctx'> #define PCI_DEVICE_ID_HELIOS_DCSP   0xfd12</div><div class='ctx'> #define PCI_DEVICE_ID_ZEPHYR        0xfe00</div><div class='add'>+#define PCI_DEVICE_ID_HORNET        0xfe05</div><div class='ctx'> #define PCI_DEVICE_ID_ZEPHYR_SCSP   0xfe11</div><div class='ctx'> #define PCI_DEVICE_ID_ZEPHYR_DCSP   0xfe12</div><div class='ctx'> </div><div class='hunk'>@@ -1154,6 +1158,7 @@ typedef struct {</div><div class='ctx'> #define ZEPHYR_JEDEC_ID             0x0577</div><div class='ctx'> #define VIPER_JEDEC_ID              0x4838</div><div class='ctx'> #define SATURN_JEDEC_ID             0x1004</div><div class='add'>+#define HORNET_JDEC_ID              0x2057706D</div><div class='ctx'> </div><div class='ctx'> #define JEDEC_ID_MASK               0x0FFFF000</div><div class='ctx'> #define JEDEC_ID_SHIFT              12</div><div class='hunk'>@@ -1198,6 +1203,18 @@ typedef struct {		/* FireFly BIU registers */</div><div class='ctx'> #define HA_RXATT       0x00000008	/* Bit  3 */</div><div class='ctx'> #define HA_RXMASK      0x0000000f</div><div class='ctx'> </div><div class='add'>+#define HA_R0_CLR_MSK	(HA_R0RE_REQ | HA_R0CE_RSP | HA_R0ATT)</div><div class='add'>+#define HA_R1_CLR_MSK	(HA_R1RE_REQ | HA_R1CE_RSP | HA_R1ATT)</div><div class='add'>+#define HA_R2_CLR_MSK	(HA_R2RE_REQ | HA_R2CE_RSP | HA_R2ATT)</div><div class='add'>+#define HA_R3_CLR_MSK	(HA_R3RE_REQ | HA_R3CE_RSP | HA_R3ATT)</div><div class='add'>+</div><div class='add'>+#define HA_R0_POS	3</div><div class='add'>+#define HA_R1_POS	7</div><div class='add'>+#define HA_R2_POS	11</div><div class='add'>+#define HA_R3_POS	15</div><div class='add'>+#define HA_LE_POS	29</div><div class='add'>+#define HA_MB_POS	30</div><div class='add'>+#define HA_ER_POS	31</div><div class='ctx'> /* Chip Attention Register */</div><div class='ctx'> </div><div class='ctx'> #define CA_REG_OFFSET  4	/* Byte offset from register base address */</div><div class='hunk'>@@ -1235,7 +1252,7 @@ typedef struct {		/* FireFly BIU registers */</div><div class='ctx'> </div><div class='ctx'> /* Host Control Register */</div><div class='ctx'> </div><div class='del'>-#define HC_REG_OFFSET  12	/* Word offset from register base address */</div><div class='add'>+#define HC_REG_OFFSET  12	/* Byte offset from register base address */</div><div class='ctx'> </div><div class='ctx'> #define HC_MBINT_ENA   0x00000001	/* Bit  0 */</div><div class='ctx'> #define HC_R0INT_ENA   0x00000002	/* Bit  1 */</div><div class='hunk'>@@ -1248,6 +1265,19 @@ typedef struct {		/* FireFly BIU registers */</div><div class='ctx'> #define HC_LAINT_ENA   0x20000000	/* Bit 29 */</div><div class='ctx'> #define HC_ERINT_ENA   0x80000000	/* Bit 31 */</div><div class='ctx'> </div><div class='add'>+/* Message Signaled Interrupt eXtension (MSI-X) message identifiers */</div><div class='add'>+#define MSIX_DFLT_ID	0</div><div class='add'>+#define MSIX_RNG0_ID	0</div><div class='add'>+#define MSIX_RNG1_ID	1</div><div class='add'>+#define MSIX_RNG2_ID	2</div><div class='add'>+#define MSIX_RNG3_ID	3</div><div class='add'>+</div><div class='add'>+#define MSIX_LINK_ID	4</div><div class='add'>+#define MSIX_MBOX_ID	5</div><div class='add'>+</div><div class='add'>+#define MSIX_SPARE0_ID	6</div><div class='add'>+#define MSIX_SPARE1_ID	7</div><div class='add'>+</div><div class='ctx'> /* Mailbox Commands */</div><div class='ctx'> #define MBX_SHUTDOWN        0x00	/* terminate testing */</div><div class='ctx'> #define MBX_LOAD_SM         0x01</div><div class='hunk'>@@ -1285,10 +1315,14 @@ typedef struct {		/* FireFly BIU registers */</div><div class='ctx'> #define MBX_KILL_BOARD      0x24</div><div class='ctx'> #define MBX_CONFIG_FARP     0x25</div><div class='ctx'> #define MBX_BEACON          0x2A</div><div class='add'>+#define MBX_CONFIG_MSI      0x30</div><div class='ctx'> #define MBX_HEARTBEAT       0x31</div><div class='ctx'> #define MBX_WRITE_VPARMS    0x32</div><div class='ctx'> #define MBX_ASYNCEVT_ENABLE 0x33</div><div class='ctx'> </div><div class='add'>+#define MBX_PORT_CAPABILITIES 0x3B</div><div class='add'>+#define MBX_PORT_IOV_CONTROL 0x3C</div><div class='add'>+</div><div class='ctx'> #define MBX_CONFIG_HBQ	    0x7C</div><div class='ctx'> #define MBX_LOAD_AREA       0x81</div><div class='ctx'> #define MBX_RUN_BIU_DIAG64  0x84</div><div class='hunk'>@@ -1474,24 +1508,18 @@ struct ulp_bde64 {	/* SLI-2 */</div><div class='ctx'> 			uint32_t bdeFlags:8;	/* BDE Flags 0 IS A SUPPORTED</div><div class='ctx'> 						   VALUE !! */</div><div class='ctx'> #endif</div><div class='del'>-</div><div class='del'>-#define BUFF_USE_RSVD       0x01	/* bdeFlags */</div><div class='del'>-#define BUFF_USE_INTRPT     0x02	/* Not Implemented with LP6000 */</div><div class='del'>-#define BUFF_USE_CMND       0x04	/* Optional, 1=cmd/rsp 0=data buffer */</div><div class='del'>-#define BUFF_USE_RCV        0x08	/*  "" "", 1=rcv buffer, 0=xmit</div><div class='del'>-					    buffer */</div><div class='del'>-#define BUFF_TYPE_32BIT     0x10	/*  "" "", 1=32 bit addr 0=64 bit</div><div class='del'>-					    addr */</div><div class='del'>-#define BUFF_TYPE_SPECIAL   0x20	/* Not Implemented with LP6000  */</div><div class='del'>-#define BUFF_TYPE_BDL       0x40	/* Optional,  may be set in BDL */</div><div class='del'>-#define BUFF_TYPE_INVALID   0x80	/*  ""  "" */</div><div class='add'>+#define BUFF_TYPE_BDE_64    0x00	/* BDE (Host_resident) */</div><div class='add'>+#define BUFF_TYPE_BDE_IMMED 0x01	/* Immediate Data BDE */</div><div class='add'>+#define BUFF_TYPE_BDE_64P   0x02	/* BDE (Port-resident) */</div><div class='add'>+#define BUFF_TYPE_BDE_64I   0x08	/* Input BDE (Host-resident) */</div><div class='add'>+#define BUFF_TYPE_BDE_64IP  0x0A	/* Input BDE (Port-resident) */</div><div class='add'>+#define BUFF_TYPE_BLP_64    0x40	/* BLP (Host-resident) */</div><div class='add'>+#define BUFF_TYPE_BLP_64P   0x42	/* BLP (Port-resident) */</div><div class='ctx'> 		} f;</div><div class='ctx'> 	} tus;</div><div class='ctx'> 	uint32_t addrLow;</div><div class='ctx'> 	uint32_t addrHigh;</div><div class='ctx'> };</div><div class='del'>-#define BDE64_SIZE_WORD 0</div><div class='del'>-#define BPL64_SIZE_WORD 0x40</div><div class='ctx'> </div><div class='ctx'> typedef struct ULP_BDL {	/* SLI-2 */</div><div class='ctx'> #ifdef __BIG_ENDIAN_BITFIELD</div><div class='hunk'>@@ -2201,7 +2229,10 @@ typedef struct {</div><div class='ctx'> typedef struct {</div><div class='ctx'> 	uint32_t eventTag;	/* Event tag */</div><div class='ctx'> #ifdef __BIG_ENDIAN_BITFIELD</div><div class='del'>-	uint32_t rsvd1:22;</div><div class='add'>+	uint32_t rsvd1:19;</div><div class='add'>+	uint32_t fa:1;</div><div class='add'>+	uint32_t mm:1;		/* Menlo Maintenance mode enabled */</div><div class='add'>+	uint32_t rx:1;</div><div class='ctx'> 	uint32_t pb:1;</div><div class='ctx'> 	uint32_t il:1;</div><div class='ctx'> 	uint32_t attType:8;</div><div class='hunk'>@@ -2209,7 +2240,10 @@ typedef struct {</div><div class='ctx'> 	uint32_t attType:8;</div><div class='ctx'> 	uint32_t il:1;</div><div class='ctx'> 	uint32_t pb:1;</div><div class='del'>-	uint32_t rsvd1:22;</div><div class='add'>+	uint32_t rx:1;</div><div class='add'>+	uint32_t mm:1;</div><div class='add'>+	uint32_t fa:1;</div><div class='add'>+	uint32_t rsvd1:19;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #define AT_RESERVED    0x00	/* Reserved - attType */</div><div class='hunk'>@@ -2230,6 +2264,7 @@ typedef struct {</div><div class='ctx'> </div><div class='ctx'> #define TOPOLOGY_PT_PT 0x01	/* Topology is pt-pt / pt-fabric */</div><div class='ctx'> #define TOPOLOGY_LOOP  0x02	/* Topology is FC-AL */</div><div class='add'>+#define TOPOLOGY_LNK_MENLO_MAINTENANCE 0x05 /* maint mode zephtr to menlo */</div><div class='ctx'> </div><div class='ctx'> 	union {</div><div class='ctx'> 		struct ulp_bde lilpBde; /* This BDE points to a 128 byte buffer</div><div class='hunk'>@@ -2324,6 +2359,36 @@ typedef struct {</div><div class='ctx'> #define  DMP_RSP_OFFSET          0x14   /* word 5 contains first word of rsp */</div><div class='ctx'> #define  DMP_RSP_SIZE            0x6C   /* maximum of 27 words of rsp data */</div><div class='ctx'> </div><div class='add'>+/* Structure for MB Command UPDATE_CFG (0x1B) */</div><div class='add'>+</div><div class='add'>+struct update_cfg_var {</div><div class='add'>+#ifdef __BIG_ENDIAN_BITFIELD</div><div class='add'>+	uint32_t rsvd2:16;</div><div class='add'>+	uint32_t type:8;</div><div class='add'>+	uint32_t rsvd:1;</div><div class='add'>+	uint32_t ra:1;</div><div class='add'>+	uint32_t co:1;</div><div class='add'>+	uint32_t cv:1;</div><div class='add'>+	uint32_t req:4;</div><div class='add'>+	uint32_t entry_length:16;</div><div class='add'>+	uint32_t region_id:16;</div><div class='add'>+#else  /*  __LITTLE_ENDIAN_BITFIELD */</div><div class='add'>+	uint32_t req:4;</div><div class='add'>+	uint32_t cv:1;</div><div class='add'>+	uint32_t co:1;</div><div class='add'>+	uint32_t ra:1;</div><div class='add'>+	uint32_t rsvd:1;</div><div class='add'>+	uint32_t type:8;</div><div class='add'>+	uint32_t rsvd2:16;</div><div class='add'>+	uint32_t region_id:16;</div><div class='add'>+	uint32_t entry_length:16;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	uint32_t resp_info;</div><div class='add'>+	uint32_t byte_cnt;</div><div class='add'>+	uint32_t data_offset;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct hbq_mask {</div><div class='ctx'> #ifdef __BIG_ENDIAN_BITFIELD</div><div class='ctx'> 	uint8_t tmatch;</div><div class='hunk'>@@ -2560,6 +2625,40 @@ typedef struct {</div><div class='ctx'> </div><div class='ctx'> } CONFIG_PORT_VAR;</div><div class='ctx'> </div><div class='add'>+/* Structure for MB Command CONFIG_MSI (0x30) */</div><div class='add'>+struct config_msi_var {</div><div class='add'>+#ifdef __BIG_ENDIAN_BITFIELD</div><div class='add'>+	uint32_t dfltMsgNum:8;	/* Default message number            */</div><div class='add'>+	uint32_t rsvd1:11;	/* Reserved                          */</div><div class='add'>+	uint32_t NID:5;		/* Number of secondary attention IDs */</div><div class='add'>+	uint32_t rsvd2:5;	/* Reserved                          */</div><div class='add'>+	uint32_t dfltPresent:1;	/* Default message number present    */</div><div class='add'>+	uint32_t addFlag:1;	/* Add association flag              */</div><div class='add'>+	uint32_t reportFlag:1;	/* Report association flag           */</div><div class='add'>+#else	/*  __LITTLE_ENDIAN_BITFIELD */</div><div class='add'>+	uint32_t reportFlag:1;	/* Report association flag           */</div><div class='add'>+	uint32_t addFlag:1;	/* Add association flag              */</div><div class='add'>+	uint32_t dfltPresent:1;	/* Default message number present    */</div><div class='add'>+	uint32_t rsvd2:5;	/* Reserved                          */</div><div class='add'>+	uint32_t NID:5;		/* Number of secondary attention IDs */</div><div class='add'>+	uint32_t rsvd1:11;	/* Reserved                          */</div><div class='add'>+	uint32_t dfltMsgNum:8;	/* Default message number            */</div><div class='add'>+#endif</div><div class='add'>+	uint32_t attentionConditions[2];</div><div class='add'>+	uint8_t  attentionId[16];</div><div class='add'>+	uint8_t  messageNumberByHA[64];</div><div class='add'>+	uint8_t  messageNumberByID[16];</div><div class='add'>+	uint32_t autoClearHA[2];</div><div class='add'>+#ifdef __BIG_ENDIAN_BITFIELD</div><div class='add'>+	uint32_t rsvd3:16;</div><div class='add'>+	uint32_t autoClearID:16;</div><div class='add'>+#else	/*  __LITTLE_ENDIAN_BITFIELD */</div><div class='add'>+	uint32_t autoClearID:16;</div><div class='add'>+	uint32_t rsvd3:16;</div><div class='add'>+#endif</div><div class='add'>+	uint32_t rsvd4;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* SLI-2 Port Control Block */</div><div class='ctx'> </div><div class='ctx'> /* SLIM POINTER */</div><div class='hunk'>@@ -2678,10 +2777,12 @@ typedef union {</div><div class='ctx'> 					 * NEW_FEATURE</div><div class='ctx'> 					 */</div><div class='ctx'> 	struct config_hbq_var varCfgHbq;/* cmd = 0x7c (CONFIG_HBQ)  */</div><div class='add'>+	struct update_cfg_var varUpdateCfg; /* cmd = 0x1B (UPDATE_CFG)*/</div><div class='ctx'> 	CONFIG_PORT_VAR varCfgPort;	/* cmd = 0x88 (CONFIG_PORT)  */</div><div class='ctx'> 	REG_VPI_VAR varRegVpi;		/* cmd = 0x96 (REG_VPI) */</div><div class='ctx'> 	UNREG_VPI_VAR varUnregVpi;	/* cmd = 0x97 (UNREG_VPI) */</div><div class='ctx'> 	ASYNCEVT_ENABLE_VAR varCfgAsyncEvent; /*cmd = x33 (CONFIG_ASYNC) */</div><div class='add'>+	struct config_msi_var varCfgMSI;/* cmd = x30 (CONFIG_MSI)     */</div><div class='ctx'> } MAILVARIANTS;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -2715,11 +2816,19 @@ struct sli3_pgp {</div><div class='ctx'> 	uint32_t hbq_get[16];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-typedef union {</div><div class='del'>-	struct sli2_desc s2;</div><div class='del'>-	struct sli3_desc s3;</div><div class='del'>-	struct sli3_pgp  s3_pgp;</div><div class='del'>-} SLI_VAR;</div><div class='add'>+struct sli3_inb_pgp {</div><div class='add'>+	uint32_t ha_copy;</div><div class='add'>+	uint32_t counter;</div><div class='add'>+	struct lpfc_pgp port[MAX_RINGS];</div><div class='add'>+	uint32_t hbq_get[16];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union sli_var {</div><div class='add'>+	struct sli2_desc	s2;</div><div class='add'>+	struct sli3_desc	s3;</div><div class='add'>+	struct sli3_pgp		s3_pgp;</div><div class='add'>+	struct sli3_inb_pgp	s3_inb_pgp;</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> typedef struct {</div><div class='ctx'> #ifdef __BIG_ENDIAN_BITFIELD</div><div class='hunk'>@@ -2737,7 +2846,7 @@ typedef struct {</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	MAILVARIANTS un;</div><div class='del'>-	SLI_VAR us;</div><div class='add'>+	union sli_var us;</div><div class='ctx'> } MAILBOX_t;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -3105,6 +3214,27 @@ struct que_xri64cx_ext_fields {</div><div class='ctx'> 	struct lpfc_hbq_entry	buff[5];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define LPFC_EXT_DATA_BDE_COUNT 3</div><div class='add'>+struct fcp_irw_ext {</div><div class='add'>+	uint32_t	io_tag64_low;</div><div class='add'>+	uint32_t	io_tag64_high;</div><div class='add'>+#ifdef __BIG_ENDIAN_BITFIELD</div><div class='add'>+	uint8_t		reserved1;</div><div class='add'>+	uint8_t		reserved2;</div><div class='add'>+	uint8_t		reserved3;</div><div class='add'>+	uint8_t		ebde_count;</div><div class='add'>+#else  /* __LITTLE_ENDIAN */</div><div class='add'>+	uint8_t		ebde_count;</div><div class='add'>+	uint8_t		reserved3;</div><div class='add'>+	uint8_t		reserved2;</div><div class='add'>+	uint8_t		reserved1;</div><div class='add'>+#endif</div><div class='add'>+	uint32_t	reserved4;</div><div class='add'>+	struct ulp_bde64 rbde;		/* response bde */</div><div class='add'>+	struct ulp_bde64 dbde[LPFC_EXT_DATA_BDE_COUNT];	/* data BDE or BPL */</div><div class='add'>+	uint8_t icd[32];		/* immediate command data (32 bytes) */</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> typedef struct _IOCB {	/* IOCB structure */</div><div class='ctx'> 	union {</div><div class='ctx'> 		GENERIC_RSP grsp;	/* Generic response */</div><div class='hunk'>@@ -3190,7 +3320,7 @@ typedef struct _IOCB {	/* IOCB structure */</div><div class='ctx'> </div><div class='ctx'> 		/* words 8-31 used for que_xri_cx iocb */</div><div class='ctx'> 		struct que_xri64cx_ext_fields que_xri64cx_ext_words;</div><div class='del'>-</div><div class='add'>+		struct fcp_irw_ext fcp_ext;</div><div class='ctx'> 		uint32_t sli3Words[24]; /* 96 extra bytes for SLI-3 */</div><div class='ctx'> 	} unsli3;</div><div class='ctx'> </div><div class='hunk'>@@ -3292,3 +3422,10 @@ lpfc_error_lost_link(IOCB_t *iocbp)</div><div class='ctx'> 		 iocbp-&gt;un.ulpWord[4] == IOERR_LINK_DOWN ||</div><div class='ctx'> 		 iocbp-&gt;un.ulpWord[4] == IOERR_SLI_DOWN));</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+#define MENLO_TRANSPORT_TYPE 0xfe</div><div class='add'>+#define MENLO_CONTEXT 0</div><div class='add'>+#define MENLO_PU 3</div><div class='add'>+#define MENLO_TIMEOUT 30</div><div class='add'>+#define SETVAR_MLOMNT 0x103107</div><div class='add'>+#define SETVAR_MLORST 0x103007</div><div class='head'>diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c<br/>index d51a2a4b43eb..909be3301bba 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/lpfc/lpfc_init.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/lpfc/lpfc_init.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/lpfc/lpfc_init.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/lpfc/lpfc_init.c</a></div><div class='hunk'>@@ -36,6 +36,7 @@</div><div class='ctx'> </div><div class='ctx'> #include "lpfc_hw.h"</div><div class='ctx'> #include "lpfc_sli.h"</div><div class='add'>+#include "lpfc_nl.h"</div><div class='ctx'> #include "lpfc_disc.h"</div><div class='ctx'> #include "lpfc_scsi.h"</div><div class='ctx'> #include "lpfc.h"</div><div class='hunk'>@@ -52,17 +53,20 @@ static struct scsi_transport_template *lpfc_transport_template = NULL;</div><div class='ctx'> static struct scsi_transport_template *lpfc_vport_transport_template = NULL;</div><div class='ctx'> static DEFINE_IDR(lpfc_hba_index);</div><div class='ctx'> </div><div class='del'>-/************************************************************************/</div><div class='del'>-/*                                                                      */</div><div class='del'>-/*    lpfc_config_port_prep                                             */</div><div class='del'>-/*    This routine will do LPFC initialization prior to the             */</div><div class='del'>-/*    CONFIG_PORT mailbox command. This will be initialized             */</div><div class='del'>-/*    as a SLI layer callback routine.                                  */</div><div class='del'>-/*    This routine returns 0 on success or -ERESTART if it wants        */</div><div class='del'>-/*    the SLI layer to reset the HBA and try again. Any                 */</div><div class='del'>-/*    other return value indicates an error.                            */</div><div class='del'>-/*                                                                      */</div><div class='del'>-/************************************************************************/</div><div class='add'>+/**</div><div class='add'>+ * lpfc_config_port_prep: Perform lpfc initialization prior to config port.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine will do LPFC initialization prior to issuing the CONFIG_PORT</div><div class='add'>+ * mailbox command. It retrieves the revision information from the HBA and</div><div class='add'>+ * collects the Vital Product Data (VPD) about the HBA for preparing the</div><div class='add'>+ * configuration of the HBA.</div><div class='add'>+ *</div><div class='add'>+ * Return codes:</div><div class='add'>+ *   0 - success.</div><div class='add'>+ *   -ERESTART - requests the SLI layer to reset the HBA and try again.</div><div class='add'>+ *   Any other value - indicates an error.</div><div class='add'>+ **/</div><div class='ctx'> int</div><div class='ctx'> lpfc_config_port_prep(struct lpfc_hba *phba)</div><div class='ctx'> {</div><div class='hunk'>@@ -180,12 +184,9 @@ lpfc_config_port_prep(struct lpfc_hba *phba)</div><div class='ctx'> 						sizeof (phba-&gt;RandomData));</div><div class='ctx'> </div><div class='ctx'> 	/* Get adapter VPD information */</div><div class='del'>-	pmb-&gt;context2 = kmalloc(DMP_RSP_SIZE, GFP_KERNEL);</div><div class='del'>-	if (!pmb-&gt;context2)</div><div class='del'>-		goto out_free_mbox;</div><div class='ctx'> 	lpfc_vpd_data = kmalloc(DMP_VPD_SIZE, GFP_KERNEL);</div><div class='ctx'> 	if (!lpfc_vpd_data)</div><div class='del'>-		goto out_free_context2;</div><div class='add'>+		goto out_free_mbox;</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='ctx'> 		lpfc_dump_mem(phba, pmb, offset);</div><div class='hunk'>@@ -200,21 +201,29 @@ lpfc_config_port_prep(struct lpfc_hba *phba)</div><div class='ctx'> 		}</div><div class='ctx'> 		if (mb-&gt;un.varDmp.word_cnt &gt; DMP_VPD_SIZE - offset)</div><div class='ctx'> 			mb-&gt;un.varDmp.word_cnt = DMP_VPD_SIZE - offset;</div><div class='del'>-		lpfc_sli_pcimem_bcopy(pmb-&gt;context2, lpfc_vpd_data + offset,</div><div class='add'>+		lpfc_sli_pcimem_bcopy(((uint8_t *)mb) + DMP_RSP_OFFSET,</div><div class='add'>+				      lpfc_vpd_data + offset,</div><div class='ctx'> 				      mb-&gt;un.varDmp.word_cnt);</div><div class='ctx'> 		offset += mb-&gt;un.varDmp.word_cnt;</div><div class='ctx'> 	} while (mb-&gt;un.varDmp.word_cnt &amp;&amp; offset &lt; DMP_VPD_SIZE);</div><div class='ctx'> 	lpfc_parse_vpd(phba, lpfc_vpd_data, offset);</div><div class='ctx'> </div><div class='ctx'> 	kfree(lpfc_vpd_data);</div><div class='del'>-out_free_context2:</div><div class='del'>-	kfree(pmb-&gt;context2);</div><div class='ctx'> out_free_mbox:</div><div class='ctx'> 	mempool_free(pmb, phba-&gt;mbox_mem_pool);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Completion handler for config async event mailbox command. */</div><div class='add'>+/**</div><div class='add'>+ * lpfc_config_async_cmpl: Completion handler for config async event mbox cmd.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ * @pmboxq: pointer to the driver internal queue element for mailbox command.</div><div class='add'>+ *</div><div class='add'>+ * This is the completion handler for driver's configuring asynchronous event</div><div class='add'>+ * mailbox command to the device. If the mailbox command returns successfully,</div><div class='add'>+ * it will set internal async event support flag to 1; otherwise, it will</div><div class='add'>+ * set internal async event support flag to 0.</div><div class='add'>+ **/</div><div class='ctx'> static void</div><div class='ctx'> lpfc_config_async_cmpl(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmboxq)</div><div class='ctx'> {</div><div class='hunk'>@@ -226,16 +235,19 @@ lpfc_config_async_cmpl(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmboxq)</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/************************************************************************/</div><div class='del'>-/*                                                                      */</div><div class='del'>-/*    lpfc_config_port_post                                             */</div><div class='del'>-/*    This routine will do LPFC initialization after the                */</div><div class='del'>-/*    CONFIG_PORT mailbox command. This will be initialized             */</div><div class='del'>-/*    as a SLI layer callback routine.                                  */</div><div class='del'>-/*    This routine returns 0 on success. Any other return value         */</div><div class='del'>-/*    indicates an error.                                               */</div><div class='del'>-/*                                                                      */</div><div class='del'>-/************************************************************************/</div><div class='add'>+/**</div><div class='add'>+ * lpfc_config_port_post: Perform lpfc initialization after config port.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine will do LPFC initialization after the CONFIG_PORT mailbox</div><div class='add'>+ * command call. It performs all internal resource and state setups on the</div><div class='add'>+ * port: post IOCB buffers, enable appropriate host interrupt attentions,</div><div class='add'>+ * ELS ring timers, etc.</div><div class='add'>+ *</div><div class='add'>+ * Return codes</div><div class='add'>+ *   0 - success.</div><div class='add'>+ *   Any other value - error.</div><div class='add'>+ **/</div><div class='ctx'> int</div><div class='ctx'> lpfc_config_port_post(struct lpfc_hba *phba)</div><div class='ctx'> {</div><div class='hunk'>@@ -378,6 +390,29 @@ lpfc_config_port_post(struct lpfc_hba *phba)</div><div class='ctx'> 	if (phba-&gt;sli_rev != 3)</div><div class='ctx'> 		lpfc_post_rcv_buf(phba);</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Configure HBA MSI-X attention conditions to messages if MSI-X mode</div><div class='add'>+	 */</div><div class='add'>+	if (phba-&gt;intr_type == MSIX) {</div><div class='add'>+		rc = lpfc_config_msi(phba, pmb);</div><div class='add'>+		if (rc) {</div><div class='add'>+			mempool_free(pmb, phba-&gt;mbox_mem_pool);</div><div class='add'>+			return -EIO;</div><div class='add'>+		}</div><div class='add'>+		rc = lpfc_sli_issue_mbox(phba, pmb, MBX_POLL);</div><div class='add'>+		if (rc != MBX_SUCCESS) {</div><div class='add'>+			lpfc_printf_log(phba, KERN_ERR, LOG_MBOX,</div><div class='add'>+					"0352 Config MSI mailbox command "</div><div class='add'>+					"failed, mbxCmd x%x, mbxStatus x%x\n",</div><div class='add'>+					pmb-&gt;mb.mbxCommand, pmb-&gt;mb.mbxStatus);</div><div class='add'>+			mempool_free(pmb, phba-&gt;mbox_mem_pool);</div><div class='add'>+			return -EIO;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Initialize ERATT handling flag */</div><div class='add'>+	phba-&gt;hba_flag &amp;= ~HBA_ERATT_HANDLED;</div><div class='add'>+</div><div class='ctx'> 	/* Enable appropriate host interrupts */</div><div class='ctx'> 	spin_lock_irq(&amp;phba-&gt;hbalock);</div><div class='ctx'> 	status = readl(phba-&gt;HCregaddr);</div><div class='hunk'>@@ -393,26 +428,26 @@ lpfc_config_port_post(struct lpfc_hba *phba)</div><div class='ctx'> </div><div class='ctx'> 	if ((phba-&gt;cfg_poll &amp; ENABLE_FCP_RING_POLLING) &amp;&amp;</div><div class='ctx'> 	    (phba-&gt;cfg_poll &amp; DISABLE_FCP_RING_INT))</div><div class='del'>-		status &amp;= ~(HC_R0INT_ENA &lt;&lt; LPFC_FCP_RING);</div><div class='add'>+		status &amp;= ~(HC_R0INT_ENA);</div><div class='ctx'> </div><div class='ctx'> 	writel(status, phba-&gt;HCregaddr);</div><div class='ctx'> 	readl(phba-&gt;HCregaddr); /* flush */</div><div class='ctx'> 	spin_unlock_irq(&amp;phba-&gt;hbalock);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Setup the ring 0 (els)  timeout handler</div><div class='del'>-	 */</div><div class='del'>-	timeout = phba-&gt;fc_ratov &lt;&lt; 1;</div><div class='add'>+	/* Set up ring-0 (ELS) timer */</div><div class='add'>+	timeout = phba-&gt;fc_ratov * 2;</div><div class='ctx'> 	mod_timer(&amp;vport-&gt;els_tmofunc, jiffies + HZ * timeout);</div><div class='add'>+	/* Set up heart beat (HB) timer */</div><div class='ctx'> 	mod_timer(&amp;phba-&gt;hb_tmofunc, jiffies + HZ * LPFC_HB_MBOX_INTERVAL);</div><div class='ctx'> 	phba-&gt;hb_outstanding = 0;</div><div class='ctx'> 	phba-&gt;last_completion_time = jiffies;</div><div class='add'>+	/* Set up error attention (ERATT) polling timer */</div><div class='add'>+	mod_timer(&amp;phba-&gt;eratt_poll, jiffies + HZ * LPFC_ERATT_POLL_INTERVAL);</div><div class='ctx'> </div><div class='ctx'> 	lpfc_init_link(phba, pmb, phba-&gt;cfg_topology, phba-&gt;cfg_link_speed);</div><div class='ctx'> 	pmb-&gt;mbox_cmpl = lpfc_sli_def_mbox_cmpl;</div><div class='del'>-	pmb-&gt;vport = vport;</div><div class='del'>-	rc = lpfc_sli_issue_mbox(phba, pmb, MBX_NOWAIT);</div><div class='ctx'> 	lpfc_set_loopback_flag(phba);</div><div class='add'>+	rc = lpfc_sli_issue_mbox(phba, pmb, MBX_NOWAIT);</div><div class='ctx'> 	if (rc != MBX_SUCCESS) {</div><div class='ctx'> 		lpfc_printf_log(phba, KERN_ERR, LOG_INIT,</div><div class='ctx'> 				"0454 Adapter failed to init, mbxCmd x%x "</div><div class='hunk'>@@ -447,19 +482,20 @@ lpfc_config_port_post(struct lpfc_hba *phba)</div><div class='ctx'> 				rc);</div><div class='ctx'> 		mempool_free(pmb, phba-&gt;mbox_mem_pool);</div><div class='ctx'> 	}</div><div class='del'>-	return (0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/************************************************************************/</div><div class='del'>-/*                                                                      */</div><div class='del'>-/*    lpfc_hba_down_prep                                                */</div><div class='del'>-/*    This routine will do LPFC uninitialization before the             */</div><div class='del'>-/*    HBA is reset when bringing down the SLI Layer. This will be       */</div><div class='del'>-/*    initialized as a SLI layer callback routine.                      */</div><div class='del'>-/*    This routine returns 0 on success. Any other return value         */</div><div class='del'>-/*    indicates an error.                                               */</div><div class='del'>-/*                                                                      */</div><div class='del'>-/************************************************************************/</div><div class='add'>+/**</div><div class='add'>+ * lpfc_hba_down_prep: Perform lpfc uninitialization prior to HBA reset.</div><div class='add'>+ * @phba: pointer to lpfc HBA data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine will do LPFC uninitialization before the HBA is reset when</div><div class='add'>+ * bringing down the SLI Layer.</div><div class='add'>+ *</div><div class='add'>+ * Return codes</div><div class='add'>+ *   0 - success.</div><div class='add'>+ *   Any other value - error.</div><div class='add'>+ **/</div><div class='ctx'> int</div><div class='ctx'> lpfc_hba_down_prep(struct lpfc_hba *phba)</div><div class='ctx'> {</div><div class='hunk'>@@ -481,15 +517,17 @@ lpfc_hba_down_prep(struct lpfc_hba *phba)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/************************************************************************/</div><div class='del'>-/*                                                                      */</div><div class='del'>-/*    lpfc_hba_down_post                                                */</div><div class='del'>-/*    This routine will do uninitialization after the HBA is reset      */</div><div class='del'>-/*    when bringing down the SLI Layer.                                 */</div><div class='del'>-/*    This routine returns 0 on success. Any other return value         */</div><div class='del'>-/*    indicates an error.                                               */</div><div class='del'>-/*                                                                      */</div><div class='del'>-/************************************************************************/</div><div class='add'>+/**</div><div class='add'>+ * lpfc_hba_down_post: Perform lpfc uninitialization after HBA reset.</div><div class='add'>+ * @phba: pointer to lpfc HBA data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine will do uninitialization after the HBA is reset when bring</div><div class='add'>+ * down the SLI Layer.</div><div class='add'>+ *</div><div class='add'>+ * Return codes</div><div class='add'>+ *   0 - sucess.</div><div class='add'>+ *   Any other value - error.</div><div class='add'>+ **/</div><div class='ctx'> int</div><div class='ctx'> lpfc_hba_down_post(struct lpfc_hba *phba)</div><div class='ctx'> {</div><div class='hunk'>@@ -548,7 +586,18 @@ lpfc_hba_down_post(struct lpfc_hba *phba)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* HBA heart beat timeout handler */</div><div class='add'>+/**</div><div class='add'>+ * lpfc_hb_timeout: The HBA-timer timeout handler.</div><div class='add'>+ * @ptr: unsigned long holds the pointer to lpfc hba data structure.</div><div class='add'>+ *</div><div class='add'>+ * This is the HBA-timer timeout handler registered to the lpfc driver. When</div><div class='add'>+ * this timer fires, a HBA timeout event shall be posted to the lpfc driver</div><div class='add'>+ * work-port-events bitmap and the worker thread is notified. This timeout</div><div class='add'>+ * event will be used by the worker thread to invoke the actual timeout</div><div class='add'>+ * handler routine, lpfc_hb_timeout_handler. Any periodical operations will</div><div class='add'>+ * be performed in the timeout handler and the HBA timeout event bit shall</div><div class='add'>+ * be cleared by the worker thread after it has taken the event bitmap out.</div><div class='add'>+ **/</div><div class='ctx'> static void</div><div class='ctx'> lpfc_hb_timeout(unsigned long ptr)</div><div class='ctx'> {</div><div class='hunk'>@@ -557,17 +606,36 @@ lpfc_hb_timeout(unsigned long ptr)</div><div class='ctx'> 	unsigned long iflag;</div><div class='ctx'> </div><div class='ctx'> 	phba = (struct lpfc_hba *)ptr;</div><div class='add'>+</div><div class='add'>+	/* Check for heart beat timeout conditions */</div><div class='ctx'> 	spin_lock_irqsave(&amp;phba-&gt;pport-&gt;work_port_lock, iflag);</div><div class='ctx'> 	tmo_posted = phba-&gt;pport-&gt;work_port_events &amp; WORKER_HB_TMO;</div><div class='ctx'> 	if (!tmo_posted)</div><div class='ctx'> 		phba-&gt;pport-&gt;work_port_events |= WORKER_HB_TMO;</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;phba-&gt;pport-&gt;work_port_lock, iflag);</div><div class='ctx'> </div><div class='add'>+	/* Tell the worker thread there is work to do */</div><div class='ctx'> 	if (!tmo_posted)</div><div class='ctx'> 		lpfc_worker_wake_up(phba);</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_hb_mbox_cmpl: The lpfc heart-beat mailbox command callback function.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ * @pmboxq: pointer to the driver internal queue element for mailbox command.</div><div class='add'>+ *</div><div class='add'>+ * This is the callback function to the lpfc heart-beat mailbox command.</div><div class='add'>+ * If configured, the lpfc driver issues the heart-beat mailbox command to</div><div class='add'>+ * the HBA every LPFC_HB_MBOX_INTERVAL (current 5) seconds. At the time the</div><div class='add'>+ * heart-beat mailbox command is issued, the driver shall set up heart-beat</div><div class='add'>+ * timeout timer to LPFC_HB_MBOX_TIMEOUT (current 30) seconds and marks</div><div class='add'>+ * heart-beat outstanding state. Once the mailbox command comes back and</div><div class='add'>+ * no error conditions detected, the heart-beat mailbox command timer is</div><div class='add'>+ * reset to LPFC_HB_MBOX_INTERVAL seconds and the heart-beat outstanding</div><div class='add'>+ * state is cleared for the next heart-beat. If the timer expired with the</div><div class='add'>+ * heart-beat outstanding state set, the driver will put the HBA offline.</div><div class='add'>+ **/</div><div class='ctx'> static void</div><div class='ctx'> lpfc_hb_mbox_cmpl(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmboxq)</div><div class='ctx'> {</div><div class='hunk'>@@ -577,6 +645,7 @@ lpfc_hb_mbox_cmpl(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmboxq)</div><div class='ctx'> 	phba-&gt;hb_outstanding = 0;</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;phba-&gt;hbalock, drvr_flag);</div><div class='ctx'> </div><div class='add'>+	/* Check and reset heart-beat timer is necessary */</div><div class='ctx'> 	mempool_free(pmboxq, phba-&gt;mbox_mem_pool);</div><div class='ctx'> 	if (!(phba-&gt;pport-&gt;fc_flag &amp; FC_OFFLINE_MODE) &amp;&amp;</div><div class='ctx'> 		!(phba-&gt;link_state == LPFC_HBA_ERROR) &amp;&amp;</div><div class='hunk'>@@ -586,6 +655,22 @@ lpfc_hb_mbox_cmpl(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmboxq)</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_hb_timeout_handler: The HBA-timer timeout handler.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ *</div><div class='add'>+ * This is the actual HBA-timer timeout handler to be invoked by the worker</div><div class='add'>+ * thread whenever the HBA timer fired and HBA-timeout event posted. This</div><div class='add'>+ * handler performs any periodic operations needed for the device. If such</div><div class='add'>+ * periodic event has already been attended to either in the interrupt handler</div><div class='add'>+ * or by processing slow-ring or fast-ring events within the HBA-timer</div><div class='add'>+ * timeout window (LPFC_HB_MBOX_INTERVAL), this handler just simply resets</div><div class='add'>+ * the timer for the next timeout period. If lpfc heart-beat mailbox command</div><div class='add'>+ * is configured and there is no heart-beat mailbox command outstanding, a</div><div class='add'>+ * heart-beat mailbox is issued and timer set properly. Otherwise, if there</div><div class='add'>+ * has been a heart-beat mailbox command outstanding, the HBA shall be put</div><div class='add'>+ * to offline.</div><div class='add'>+ **/</div><div class='ctx'> void</div><div class='ctx'> lpfc_hb_timeout_handler(struct lpfc_hba *phba)</div><div class='ctx'> {</div><div class='hunk'>@@ -684,6 +769,13 @@ lpfc_hb_timeout_handler(struct lpfc_hba *phba)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_offline_eratt: Bring lpfc offline on hardware error attention.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine is called to bring the HBA offline when HBA hardware error</div><div class='add'>+ * other than Port Error 6 has been detected.</div><div class='add'>+ **/</div><div class='ctx'> static void</div><div class='ctx'> lpfc_offline_eratt(struct lpfc_hba *phba)</div><div class='ctx'> {</div><div class='hunk'>@@ -704,14 +796,16 @@ lpfc_offline_eratt(struct lpfc_hba *phba)</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/************************************************************************/</div><div class='del'>-/*                                                                      */</div><div class='del'>-/*    lpfc_handle_eratt                                                 */</div><div class='del'>-/*    This routine will handle processing a Host Attention              */</div><div class='del'>-/*    Error Status event. This will be initialized                      */</div><div class='del'>-/*    as a SLI layer callback routine.                                  */</div><div class='del'>-/*                                                                      */</div><div class='del'>-/************************************************************************/</div><div class='add'>+/**</div><div class='add'>+ * lpfc_handle_eratt: The HBA hardware error handler.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine is invoked to handle the following HBA hardware error</div><div class='add'>+ * conditions:</div><div class='add'>+ * 1 - HBA error attention interrupt</div><div class='add'>+ * 2 - DMA ring index out of range</div><div class='add'>+ * 3 - Mailbox command came back as unknown</div><div class='add'>+ **/</div><div class='ctx'> void</div><div class='ctx'> lpfc_handle_eratt(struct lpfc_hba *phba)</div><div class='ctx'> {</div><div class='hunk'>@@ -722,6 +816,7 @@ lpfc_handle_eratt(struct lpfc_hba *phba)</div><div class='ctx'> 	unsigned long temperature;</div><div class='ctx'> 	struct temp_event temp_event_data;</div><div class='ctx'> 	struct Scsi_Host  *shost;</div><div class='add'>+	struct lpfc_board_event_header board_event;</div><div class='ctx'> </div><div class='ctx'> 	/* If the pci channel is offline, ignore possible errors,</div><div class='ctx'> 	 * since we cannot communicate with the pci card anyway. */</div><div class='hunk'>@@ -731,6 +826,16 @@ lpfc_handle_eratt(struct lpfc_hba *phba)</div><div class='ctx'> 	if (!phba-&gt;cfg_enable_hba_reset)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	/* Send an internal error event to mgmt application */</div><div class='add'>+	board_event.event_type = FC_REG_BOARD_EVENT;</div><div class='add'>+	board_event.subcategory = LPFC_EVENT_PORTINTERR;</div><div class='add'>+	shost = lpfc_shost_from_vport(phba-&gt;pport);</div><div class='add'>+	fc_host_post_vendor_event(shost, fc_get_event_number(),</div><div class='add'>+				  sizeof(board_event),</div><div class='add'>+				  (char *) &amp;board_event,</div><div class='add'>+				  SCSI_NL_VID_TYPE_PCI</div><div class='add'>+				  | PCI_VENDOR_ID_EMULEX);</div><div class='add'>+</div><div class='ctx'> 	if (phba-&gt;work_hs &amp; HS_FFER6) {</div><div class='ctx'> 		/* Re-establishing Link */</div><div class='ctx'> 		lpfc_printf_log(phba, KERN_INFO, LOG_LINK_EVENT,</div><div class='hunk'>@@ -771,7 +876,7 @@ lpfc_handle_eratt(struct lpfc_hba *phba)</div><div class='ctx'> 		temp_event_data.data = (uint32_t)temperature;</div><div class='ctx'> </div><div class='ctx'> 		lpfc_printf_log(phba, KERN_ERR, LOG_INIT,</div><div class='del'>-				"0459 Adapter maximum temperature exceeded "</div><div class='add'>+				"0406 Adapter maximum temperature exceeded "</div><div class='ctx'> 				"(%ld), taking this port offline "</div><div class='ctx'> 				"Data: x%x x%x x%x\n",</div><div class='ctx'> 				temperature, phba-&gt;work_hs,</div><div class='hunk'>@@ -791,8 +896,8 @@ lpfc_handle_eratt(struct lpfc_hba *phba)</div><div class='ctx'> </div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* The if clause above forces this code path when the status</div><div class='del'>-		 * failure is a value other than FFER6.  Do not call the offline</div><div class='del'>-		 *  twice. This is the adapter hardware error path.</div><div class='add'>+		 * failure is a value other than FFER6. Do not call the offline</div><div class='add'>+		 * twice. This is the adapter hardware error path.</div><div class='ctx'> 		 */</div><div class='ctx'> 		lpfc_printf_log(phba, KERN_ERR, LOG_INIT,</div><div class='ctx'> 				"0457 Adapter Hardware Error "</div><div class='hunk'>@@ -808,16 +913,16 @@ lpfc_handle_eratt(struct lpfc_hba *phba)</div><div class='ctx'> </div><div class='ctx'> 		lpfc_offline_eratt(phba);</div><div class='ctx'> 	}</div><div class='add'>+	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/************************************************************************/</div><div class='del'>-/*                                                                      */</div><div class='del'>-/*    lpfc_handle_latt                                                  */</div><div class='del'>-/*    This routine will handle processing a Host Attention              */</div><div class='del'>-/*    Link Status event. This will be initialized                       */</div><div class='del'>-/*    as a SLI layer callback routine.                                  */</div><div class='del'>-/*                                                                      */</div><div class='del'>-/************************************************************************/</div><div class='add'>+/**</div><div class='add'>+ * lpfc_handle_latt: The HBA link event handler.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine is invoked from the worker thread to handle a HBA host</div><div class='add'>+ * attention link event.</div><div class='add'>+ **/</div><div class='ctx'> void</div><div class='ctx'> lpfc_handle_latt(struct lpfc_hba *phba)</div><div class='ctx'> {</div><div class='hunk'>@@ -898,12 +1003,20 @@ lpfc_handle_latt_err_exit:</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/************************************************************************/</div><div class='del'>-/*                                                                      */</div><div class='del'>-/*   lpfc_parse_vpd                                                     */</div><div class='del'>-/*   This routine will parse the VPD data                               */</div><div class='del'>-/*                                                                      */</div><div class='del'>-/************************************************************************/</div><div class='add'>+/**</div><div class='add'>+ * lpfc_parse_vpd: Parse VPD (Vital Product Data).</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ * @vpd: pointer to the vital product data.</div><div class='add'>+ * @len: length of the vital product data in bytes.</div><div class='add'>+ *</div><div class='add'>+ * This routine parses the Vital Product Data (VPD). The VPD is treated as</div><div class='add'>+ * an array of characters. In this routine, the ModelName, ProgramType, and</div><div class='add'>+ * ModelDesc, etc. fields of the phba data structure will be populated.</div><div class='add'>+ *</div><div class='add'>+ * Return codes</div><div class='add'>+ *   0 - pointer to the VPD passed in is NULL</div><div class='add'>+ *   1 - success</div><div class='add'>+ **/</div><div class='ctx'> static int</div><div class='ctx'> lpfc_parse_vpd(struct lpfc_hba *phba, uint8_t *vpd, int len)</div><div class='ctx'> {</div><div class='hunk'>@@ -1040,12 +1153,25 @@ lpfc_parse_vpd(struct lpfc_hba *phba, uint8_t *vpd, int len)</div><div class='ctx'> 	return(1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_get_hba_model_desc: Retrieve HBA device model name and description.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ * @mdp: pointer to the data structure to hold the derived model name.</div><div class='add'>+ * @descp: pointer to the data structure to hold the derived description.</div><div class='add'>+ *</div><div class='add'>+ * This routine retrieves HBA's description based on its registered PCI device</div><div class='add'>+ * ID. The @descp passed into this function points to an array of 256 chars. It</div><div class='add'>+ * shall be returned with the model name, maximum speed, and the host bus type.</div><div class='add'>+ * The @mdp passed into this function points to an array of 80 chars. When the</div><div class='add'>+ * function returns, the @mdp will be filled with the model name.</div><div class='add'>+ **/</div><div class='ctx'> static void</div><div class='ctx'> lpfc_get_hba_model_desc(struct lpfc_hba *phba, uint8_t *mdp, uint8_t *descp)</div><div class='ctx'> {</div><div class='ctx'> 	lpfc_vpd_t *vp;</div><div class='ctx'> 	uint16_t dev_id = phba-&gt;pcidev-&gt;device;</div><div class='ctx'> 	int max_speed;</div><div class='add'>+	int GE = 0;</div><div class='ctx'> 	struct {</div><div class='ctx'> 		char * name;</div><div class='ctx'> 		int    max_speed;</div><div class='hunk'>@@ -1177,6 +1303,19 @@ lpfc_get_hba_model_desc(struct lpfc_hba *phba, uint8_t *mdp, uint8_t *descp)</div><div class='ctx'> 	case PCI_DEVICE_ID_SAT_S:</div><div class='ctx'> 		m = (typeof(m)){"LPe12000-S", max_speed, "PCIe"};</div><div class='ctx'> 		break;</div><div class='add'>+	case PCI_DEVICE_ID_HORNET:</div><div class='add'>+		m = (typeof(m)){"LP21000", max_speed, "PCIe"};</div><div class='add'>+		GE = 1;</div><div class='add'>+		break;</div><div class='add'>+	case PCI_DEVICE_ID_PROTEUS_VF:</div><div class='add'>+		m = (typeof(m)) {"LPev12000", max_speed, "PCIe IOV"};</div><div class='add'>+		break;</div><div class='add'>+	case PCI_DEVICE_ID_PROTEUS_PF:</div><div class='add'>+		m = (typeof(m)) {"LPev12000", max_speed, "PCIe IOV"};</div><div class='add'>+		break;</div><div class='add'>+	case PCI_DEVICE_ID_PROTEUS_S:</div><div class='add'>+		m = (typeof(m)) {"LPemv12002-S", max_speed, "PCIe IOV"};</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		m = (typeof(m)){ NULL };</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1186,18 +1325,25 @@ lpfc_get_hba_model_desc(struct lpfc_hba *phba, uint8_t *mdp, uint8_t *descp)</div><div class='ctx'> 		snprintf(mdp, 79,"%s", m.name);</div><div class='ctx'> 	if (descp &amp;&amp; descp[0] == '\0')</div><div class='ctx'> 		snprintf(descp, 255,</div><div class='del'>-			 "Emulex %s %dGb %s Fibre Channel Adapter",</div><div class='del'>-			 m.name, m.max_speed, m.bus);</div><div class='add'>+			"Emulex %s %d%s %s %s",</div><div class='add'>+			m.name, m.max_speed,</div><div class='add'>+			(GE) ? "GE" : "Gb",</div><div class='add'>+			m.bus,</div><div class='add'>+			(GE) ? "FCoE Adapter" : "Fibre Channel Adapter");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**************************************************/</div><div class='del'>-/*   lpfc_post_buffer                             */</div><div class='del'>-/*                                                */</div><div class='del'>-/*   This routine will post count buffers to the  */</div><div class='del'>-/*   ring with the QUE_RING_BUF_CN command. This  */</div><div class='del'>-/*   allows 3 buffers / command to be posted.     */</div><div class='del'>-/*   Returns the number of buffers NOT posted.    */</div><div class='del'>-/**************************************************/</div><div class='add'>+/**</div><div class='add'>+ * lpfc_post_buffer: Post IOCB(s) with DMA buffer descriptor(s) to a IOCB ring.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ * @pring: pointer to a IOCB ring.</div><div class='add'>+ * @cnt: the number of IOCBs to be posted to the IOCB ring.</div><div class='add'>+ *</div><div class='add'>+ * This routine posts a given number of IOCBs with the associated DMA buffer</div><div class='add'>+ * descriptors specified by the cnt argument to the given IOCB ring.</div><div class='add'>+ *</div><div class='add'>+ * Return codes</div><div class='add'>+ *   The number of IOCBs NOT able to be posted to the IOCB ring.</div><div class='add'>+ **/</div><div class='ctx'> int</div><div class='ctx'> lpfc_post_buffer(struct lpfc_hba *phba, struct lpfc_sli_ring *pring, int cnt)</div><div class='ctx'> {</div><div class='hunk'>@@ -1287,12 +1433,17 @@ lpfc_post_buffer(struct lpfc_hba *phba, struct lpfc_sli_ring *pring, int cnt)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/************************************************************************/</div><div class='del'>-/*                                                                      */</div><div class='del'>-/*   lpfc_post_rcv_buf                                                  */</div><div class='del'>-/*   This routine post initial rcv buffers to the configured rings      */</div><div class='del'>-/*                                                                      */</div><div class='del'>-/************************************************************************/</div><div class='add'>+/**</div><div class='add'>+ * lpfc_post_rcv_buf: Post the initial receive IOCB buffers to ELS ring.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine posts initial receive IOCB buffers to the ELS ring. The</div><div class='add'>+ * current number of initial IOCB buffers specified by LPFC_BUF_RING0 is</div><div class='add'>+ * set to 64 IOCBs.</div><div class='add'>+ *</div><div class='add'>+ * Return codes</div><div class='add'>+ *   0 - success (currently always success)</div><div class='add'>+ **/</div><div class='ctx'> static int</div><div class='ctx'> lpfc_post_rcv_buf(struct lpfc_hba *phba)</div><div class='ctx'> {</div><div class='hunk'>@@ -1307,11 +1458,13 @@ lpfc_post_rcv_buf(struct lpfc_hba *phba)</div><div class='ctx'> </div><div class='ctx'> #define S(N,V) (((V)&lt;&lt;(N))|((V)&gt;&gt;(32-(N))))</div><div class='ctx'> </div><div class='del'>-/************************************************************************/</div><div class='del'>-/*                                                                      */</div><div class='del'>-/*   lpfc_sha_init                                                      */</div><div class='del'>-/*                                                                      */</div><div class='del'>-/************************************************************************/</div><div class='add'>+/**</div><div class='add'>+ * lpfc_sha_init: Set up initial array of hash table entries.</div><div class='add'>+ * @HashResultPointer: pointer to an array as hash table.</div><div class='add'>+ *</div><div class='add'>+ * This routine sets up the initial values to the array of hash table entries</div><div class='add'>+ * for the LC HBAs.</div><div class='add'>+ **/</div><div class='ctx'> static void</div><div class='ctx'> lpfc_sha_init(uint32_t * HashResultPointer)</div><div class='ctx'> {</div><div class='hunk'>@@ -1322,11 +1475,16 @@ lpfc_sha_init(uint32_t * HashResultPointer)</div><div class='ctx'> 	HashResultPointer[4] = 0xC3D2E1F0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/************************************************************************/</div><div class='del'>-/*                                                                      */</div><div class='del'>-/*   lpfc_sha_iterate                                                   */</div><div class='del'>-/*                                                                      */</div><div class='del'>-/************************************************************************/</div><div class='add'>+/**</div><div class='add'>+ * lpfc_sha_iterate: Iterate initial hash table with the working hash table.</div><div class='add'>+ * @HashResultPointer: pointer to an initial/result hash table.</div><div class='add'>+ * @HashWorkingPointer: pointer to an working hash table.</div><div class='add'>+ *</div><div class='add'>+ * This routine iterates an initial hash table pointed by @HashResultPointer</div><div class='add'>+ * with the values from the working hash table pointeed by @HashWorkingPointer.</div><div class='add'>+ * The results are putting back to the initial hash table, returned through</div><div class='add'>+ * the @HashResultPointer as the result hash table.</div><div class='add'>+ **/</div><div class='ctx'> static void</div><div class='ctx'> lpfc_sha_iterate(uint32_t * HashResultPointer, uint32_t * HashWorkingPointer)</div><div class='ctx'> {</div><div class='hunk'>@@ -1374,22 +1532,29 @@ lpfc_sha_iterate(uint32_t * HashResultPointer, uint32_t * HashWorkingPointer)</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/************************************************************************/</div><div class='del'>-/*                                                                      */</div><div class='del'>-/*   lpfc_challenge_key                                                 */</div><div class='del'>-/*                                                                      */</div><div class='del'>-/************************************************************************/</div><div class='add'>+/**</div><div class='add'>+ * lpfc_challenge_key: Create challenge key based on WWPN of the HBA.</div><div class='add'>+ * @RandomChallenge: pointer to the entry of host challenge random number array.</div><div class='add'>+ * @HashWorking: pointer to the entry of the working hash array.</div><div class='add'>+ *</div><div class='add'>+ * This routine calculates the working hash array referred by @HashWorking</div><div class='add'>+ * from the challenge random numbers associated with the host, referred by</div><div class='add'>+ * @RandomChallenge. The result is put into the entry of the working hash</div><div class='add'>+ * array and returned by reference through @HashWorking.</div><div class='add'>+ **/</div><div class='ctx'> static void</div><div class='ctx'> lpfc_challenge_key(uint32_t * RandomChallenge, uint32_t * HashWorking)</div><div class='ctx'> {</div><div class='ctx'> 	*HashWorking = (*RandomChallenge ^ *HashWorking);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/************************************************************************/</div><div class='del'>-/*                                                                      */</div><div class='del'>-/*   lpfc_hba_init                                                      */</div><div class='del'>-/*                                                                      */</div><div class='del'>-/************************************************************************/</div><div class='add'>+/**</div><div class='add'>+ * lpfc_hba_init: Perform special handling for LC HBA initialization.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ * @hbainit: pointer to an array of unsigned 32-bit integers.</div><div class='add'>+ *</div><div class='add'>+ * This routine performs the special handling for LC HBA initialization.</div><div class='add'>+ **/</div><div class='ctx'> void</div><div class='ctx'> lpfc_hba_init(struct lpfc_hba *phba, uint32_t *hbainit)</div><div class='ctx'> {</div><div class='hunk'>@@ -1412,6 +1577,15 @@ lpfc_hba_init(struct lpfc_hba *phba, uint32_t *hbainit)</div><div class='ctx'> 	kfree(HashWorking);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_cleanup: Performs vport cleanups before deleting a vport.</div><div class='add'>+ * @vport: pointer to a virtual N_Port data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine performs the necessary cleanups before deleting the @vport.</div><div class='add'>+ * It invokes the discovery state machine to perform necessary state</div><div class='add'>+ * transitions and to release the ndlps associated with the @vport. Note,</div><div class='add'>+ * the physical port is treated as @vport 0.</div><div class='add'>+ **/</div><div class='ctx'> void</div><div class='ctx'> lpfc_cleanup(struct lpfc_vport *vport)</div><div class='ctx'> {</div><div class='hunk'>@@ -1459,14 +1633,6 @@ lpfc_cleanup(struct lpfc_vport *vport)</div><div class='ctx'> 		lpfc_disc_state_machine(vport, ndlp, NULL,</div><div class='ctx'> 					     NLP_EVT_DEVICE_RM);</div><div class='ctx'> </div><div class='del'>-		/* nlp_type zero is not defined, nlp_flag zero also not defined,</div><div class='del'>-		 * nlp_state is unused, this happens when</div><div class='del'>-		 * an initiator has logged</div><div class='del'>-		 * into us so cleanup this ndlp.</div><div class='del'>-		 */</div><div class='del'>-		if ((ndlp-&gt;nlp_type == 0) &amp;&amp; (ndlp-&gt;nlp_flag == 0) &amp;&amp;</div><div class='del'>-			(ndlp-&gt;nlp_state == 0))</div><div class='del'>-			lpfc_nlp_put(ndlp);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* At this point, ALL ndlp's should be gone</div><div class='hunk'>@@ -1482,7 +1648,7 @@ lpfc_cleanup(struct lpfc_vport *vport)</div><div class='ctx'> 						&amp;vport-&gt;fc_nodes, nlp_listp) {</div><div class='ctx'> 				lpfc_printf_vlog(ndlp-&gt;vport, KERN_ERR,</div><div class='ctx'> 						LOG_NODE,</div><div class='del'>-						"0282: did:x%x ndlp:x%p "</div><div class='add'>+						"0282 did:x%x ndlp:x%p "</div><div class='ctx'> 						"usgmap:x%x refcnt:%d\n",</div><div class='ctx'> 						ndlp-&gt;nlp_DID, (void *)ndlp,</div><div class='ctx'> 						ndlp-&gt;nlp_usg_map,</div><div class='hunk'>@@ -1498,6 +1664,14 @@ lpfc_cleanup(struct lpfc_vport *vport)</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_stop_vport_timers: Stop all the timers associated with a vport.</div><div class='add'>+ * @vport: pointer to a virtual N_Port data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine stops all the timers associated with a @vport. This function</div><div class='add'>+ * is invoked before disabling or deleting a @vport. Note that the physical</div><div class='add'>+ * port is treated as @vport 0.</div><div class='add'>+ **/</div><div class='ctx'> void</div><div class='ctx'> lpfc_stop_vport_timers(struct lpfc_vport *vport)</div><div class='ctx'> {</div><div class='hunk'>@@ -1507,6 +1681,13 @@ lpfc_stop_vport_timers(struct lpfc_vport *vport)</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_stop_phba_timers: Stop all the timers associated with an HBA.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine stops all the timers associated with a HBA. This function is</div><div class='add'>+ * invoked before either putting a HBA offline or unloading the driver.</div><div class='add'>+ **/</div><div class='ctx'> static void</div><div class='ctx'> lpfc_stop_phba_timers(struct lpfc_hba *phba)</div><div class='ctx'> {</div><div class='hunk'>@@ -1516,9 +1697,20 @@ lpfc_stop_phba_timers(struct lpfc_hba *phba)</div><div class='ctx'> 	del_timer_sync(&amp;phba-&gt;fabric_block_timer);</div><div class='ctx'> 	phba-&gt;hb_outstanding = 0;</div><div class='ctx'> 	del_timer_sync(&amp;phba-&gt;hb_tmofunc);</div><div class='add'>+	del_timer_sync(&amp;phba-&gt;eratt_poll);</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_block_mgmt_io: Mark a HBA's management interface as blocked.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine marks a HBA's management interface as blocked. Once the HBA's</div><div class='add'>+ * management interface is marked as blocked, all the user space access to</div><div class='add'>+ * the HBA, whether they are from sysfs interface or libdfc interface will</div><div class='add'>+ * all be blocked. The HBA is set to block the management interface when the</div><div class='add'>+ * driver prepares the HBA interface for online or offline.</div><div class='add'>+ **/</div><div class='ctx'> static void</div><div class='ctx'> lpfc_block_mgmt_io(struct lpfc_hba * phba)</div><div class='ctx'> {</div><div class='hunk'>@@ -1529,6 +1721,18 @@ lpfc_block_mgmt_io(struct lpfc_hba * phba)</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;phba-&gt;hbalock, iflag);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_online: Initialize and bring a HBA online.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine initializes the HBA and brings a HBA online. During this</div><div class='add'>+ * process, the management interface is blocked to prevent user space access</div><div class='add'>+ * to the HBA interfering with the driver initialization.</div><div class='add'>+ *</div><div class='add'>+ * Return codes</div><div class='add'>+ *   0 - successful</div><div class='add'>+ *   1 - failed</div><div class='add'>+ **/</div><div class='ctx'> int</div><div class='ctx'> lpfc_online(struct lpfc_hba *phba)</div><div class='ctx'> {</div><div class='hunk'>@@ -1574,6 +1778,17 @@ lpfc_online(struct lpfc_hba *phba)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_unblock_mgmt_io: Mark a HBA's management interface to be not blocked.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine marks a HBA's management interface as not blocked. Once the</div><div class='add'>+ * HBA's management interface is marked as not blocked, all the user space</div><div class='add'>+ * access to the HBA, whether they are from sysfs interface or libdfc</div><div class='add'>+ * interface will be allowed. The HBA is set to block the management interface</div><div class='add'>+ * when the driver prepares the HBA interface for online or offline and then</div><div class='add'>+ * set to unblock the management interface afterwards.</div><div class='add'>+ **/</div><div class='ctx'> void</div><div class='ctx'> lpfc_unblock_mgmt_io(struct lpfc_hba * phba)</div><div class='ctx'> {</div><div class='hunk'>@@ -1584,6 +1799,14 @@ lpfc_unblock_mgmt_io(struct lpfc_hba * phba)</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;phba-&gt;hbalock, iflag);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_offline_prep: Prepare a HBA to be brought offline.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine is invoked to prepare a HBA to be brought offline. It performs</div><div class='add'>+ * unregistration login to all the nodes on all vports and flushes the mailbox</div><div class='add'>+ * queue to make it ready to be brought offline.</div><div class='add'>+ **/</div><div class='ctx'> void</div><div class='ctx'> lpfc_offline_prep(struct lpfc_hba * phba)</div><div class='ctx'> {</div><div class='hunk'>@@ -1633,6 +1856,14 @@ lpfc_offline_prep(struct lpfc_hba * phba)</div><div class='ctx'> 	lpfc_sli_flush_mbox_queue(phba);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_offline: Bring a HBA offline.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine actually brings a HBA offline. It stops all the timers</div><div class='add'>+ * associated with the HBA, brings down the SLI layer, and eventually</div><div class='add'>+ * marks the HBA as in offline state for the upper layer protocol.</div><div class='add'>+ **/</div><div class='ctx'> void</div><div class='ctx'> lpfc_offline(struct lpfc_hba *phba)</div><div class='ctx'> {</div><div class='hunk'>@@ -1670,12 +1901,17 @@ lpfc_offline(struct lpfc_hba *phba)</div><div class='ctx'> 	lpfc_destroy_vport_work_array(phba, vports);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/******************************************************************************</div><div class='del'>-* Function name: lpfc_scsi_free</div><div class='del'>-*</div><div class='del'>-* Description: Called from lpfc_pci_remove_one free internal driver resources</div><div class='del'>-*</div><div class='del'>-******************************************************************************/</div><div class='add'>+/**</div><div class='add'>+ * lpfc_scsi_free: Free all the SCSI buffers and IOCBs from driver lists.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine is to free all the SCSI buffers and IOCBs from the driver</div><div class='add'>+ * list back to kernel. It is called from lpfc_pci_remove_one to free</div><div class='add'>+ * the internal resources before the device is removed from the system.</div><div class='add'>+ *</div><div class='add'>+ * Return codes</div><div class='add'>+ *   0 - successful (for now, it always returns 0)</div><div class='add'>+ **/</div><div class='ctx'> static int</div><div class='ctx'> lpfc_scsi_free(struct lpfc_hba *phba)</div><div class='ctx'> {</div><div class='hunk'>@@ -1704,6 +1940,22 @@ lpfc_scsi_free(struct lpfc_hba *phba)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_create_port: Create an FC port.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ * @instance: a unique integer ID to this FC port.</div><div class='add'>+ * @dev: pointer to the device data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine creates a FC port for the upper layer protocol. The FC port</div><div class='add'>+ * can be created on top of either a physical port or a virtual port provided</div><div class='add'>+ * by the HBA. This routine also allocates a SCSI host data structure (shost)</div><div class='add'>+ * and associates the FC port created before adding the shost into the SCSI</div><div class='add'>+ * layer.</div><div class='add'>+ *</div><div class='add'>+ * Return codes</div><div class='add'>+ *   @vport - pointer to the virtual N_Port data structure.</div><div class='add'>+ *   NULL - port create failed.</div><div class='add'>+ **/</div><div class='ctx'> struct lpfc_vport *</div><div class='ctx'> lpfc_create_port(struct lpfc_hba *phba, int instance, struct device *dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -1777,6 +2029,13 @@ out:</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * destroy_port: Destroy an FC port.</div><div class='add'>+ * @vport: pointer to an lpfc virtual N_Port data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine destroys a FC port from the upper layer protocol. All the</div><div class='add'>+ * resources associated with the port are released.</div><div class='add'>+ **/</div><div class='ctx'> void</div><div class='ctx'> destroy_port(struct lpfc_vport *vport)</div><div class='ctx'> {</div><div class='hunk'>@@ -1797,6 +2056,16 @@ destroy_port(struct lpfc_vport *vport)</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_get_instance: Get a unique integer ID.</div><div class='add'>+ *</div><div class='add'>+ * This routine allocates a unique integer ID from lpfc_hba_index pool. It</div><div class='add'>+ * uses the kernel idr facility to perform the task.</div><div class='add'>+ *</div><div class='add'>+ * Return codes:</div><div class='add'>+ *   instance - a unique integer ID allocated as the new instance.</div><div class='add'>+ *   -1 - lpfc get instance failed.</div><div class='add'>+ **/</div><div class='ctx'> int</div><div class='ctx'> lpfc_get_instance(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -1810,11 +2079,21 @@ lpfc_get_instance(void)</div><div class='ctx'> 	return instance;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Note: there is no scan_start function as adapter initialization</div><div class='del'>- * will have asynchronously kicked off the link initialization.</div><div class='del'>- */</div><div class='del'>-</div><div class='add'>+/**</div><div class='add'>+ * lpfc_scan_finished: method for SCSI layer to detect whether scan is done.</div><div class='add'>+ * @shost: pointer to SCSI host data structure.</div><div class='add'>+ * @time: elapsed time of the scan in jiffies.</div><div class='add'>+ *</div><div class='add'>+ * This routine is called by the SCSI layer with a SCSI host to determine</div><div class='add'>+ * whether the scan host is finished.</div><div class='add'>+ *</div><div class='add'>+ * Note: there is no scan_start function as adapter initialization will have</div><div class='add'>+ * asynchronously kicked off the link initialization.</div><div class='add'>+ *</div><div class='add'>+ * Return codes</div><div class='add'>+ *   0 - SCSI host scan is not over yet.</div><div class='add'>+ *   1 - SCSI host scan is over.</div><div class='add'>+ **/</div><div class='ctx'> int lpfc_scan_finished(struct Scsi_Host *shost, unsigned long time)</div><div class='ctx'> {</div><div class='ctx'> 	struct lpfc_vport *vport = (struct lpfc_vport *) shost-&gt;hostdata;</div><div class='hunk'>@@ -1858,6 +2137,13 @@ finished:</div><div class='ctx'> 	return stat;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_host_attrib_init: Initialize SCSI host attributes on a FC port.</div><div class='add'>+ * @shost: pointer to SCSI host data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine initializes a given SCSI host attributes on a FC port. The</div><div class='add'>+ * SCSI host can be either on top of a physical port or a virtual port.</div><div class='add'>+ **/</div><div class='ctx'> void lpfc_host_attrib_init(struct Scsi_Host *shost)</div><div class='ctx'> {</div><div class='ctx'> 	struct lpfc_vport *vport = (struct lpfc_vport *) shost-&gt;hostdata;</div><div class='hunk'>@@ -1906,42 +2192,157 @@ void lpfc_host_attrib_init(struct Scsi_Host *shost)</div><div class='ctx'> 	spin_unlock_irq(shost-&gt;host_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_enable_msix: Enable MSI-X interrupt mode.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine is invoked to enable the MSI-X interrupt vectors. The kernel</div><div class='add'>+ * function pci_enable_msix() is called to enable the MSI-X vectors. Note that</div><div class='add'>+ * pci_enable_msix(), once invoked, enables either all or nothing, depending</div><div class='add'>+ * on the current availability of PCI vector resources. The device driver is</div><div class='add'>+ * responsible for calling the individual request_irq() to register each MSI-X</div><div class='add'>+ * vector with a interrupt handler, which is done in this function. Note that</div><div class='add'>+ * later when device is unloading, the driver should always call free_irq()</div><div class='add'>+ * on all MSI-X vectors it has done request_irq() on before calling</div><div class='add'>+ * pci_disable_msix(). Failure to do so results in a BUG_ON() and a device</div><div class='add'>+ * will be left with MSI-X enabled and leaks its vectors.</div><div class='add'>+ *</div><div class='add'>+ * Return codes</div><div class='add'>+ *   0 - sucessful</div><div class='add'>+ *   other values - error</div><div class='add'>+ **/</div><div class='ctx'> static int</div><div class='ctx'> lpfc_enable_msix(struct lpfc_hba *phba)</div><div class='ctx'> {</div><div class='del'>-	int error;</div><div class='add'>+	int rc, i;</div><div class='add'>+	LPFC_MBOXQ_t *pmb;</div><div class='ctx'> </div><div class='del'>-	phba-&gt;msix_entries[0].entry = 0;</div><div class='del'>-	phba-&gt;msix_entries[0].vector = 0;</div><div class='add'>+	/* Set up MSI-X multi-message vectors */</div><div class='add'>+	for (i = 0; i &lt; LPFC_MSIX_VECTORS; i++)</div><div class='add'>+		phba-&gt;msix_entries[i].entry = i;</div><div class='ctx'> </div><div class='del'>-	error = pci_enable_msix(phba-&gt;pcidev, phba-&gt;msix_entries,</div><div class='add'>+	/* Configure MSI-X capability structure */</div><div class='add'>+	rc = pci_enable_msix(phba-&gt;pcidev, phba-&gt;msix_entries,</div><div class='ctx'> 				ARRAY_SIZE(phba-&gt;msix_entries));</div><div class='del'>-	if (error) {</div><div class='add'>+	if (rc) {</div><div class='ctx'> 		lpfc_printf_log(phba, KERN_INFO, LOG_INIT,</div><div class='ctx'> 				"0420 Enable MSI-X failed (%d), continuing "</div><div class='del'>-				"with MSI\n", error);</div><div class='del'>-		pci_disable_msix(phba-&gt;pcidev);</div><div class='del'>-		return error;</div><div class='add'>+				"with MSI\n", rc);</div><div class='add'>+		goto msi_fail_out;</div><div class='add'>+	} else</div><div class='add'>+		for (i = 0; i &lt; LPFC_MSIX_VECTORS; i++)</div><div class='add'>+			lpfc_printf_log(phba, KERN_INFO, LOG_INIT,</div><div class='add'>+					"0477 MSI-X entry[%d]: vector=x%x "</div><div class='add'>+					"message=%d\n", i,</div><div class='add'>+					phba-&gt;msix_entries[i].vector,</div><div class='add'>+					phba-&gt;msix_entries[i].entry);</div><div class='add'>+	/*</div><div class='add'>+	 * Assign MSI-X vectors to interrupt handlers</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* vector-0 is associated to slow-path handler */</div><div class='add'>+	rc = request_irq(phba-&gt;msix_entries[0].vector, &amp;lpfc_sp_intr_handler,</div><div class='add'>+			 IRQF_SHARED, LPFC_SP_DRIVER_HANDLER_NAME, phba);</div><div class='add'>+	if (rc) {</div><div class='add'>+		lpfc_printf_log(phba, KERN_ERR, LOG_INIT,</div><div class='add'>+				"0421 MSI-X slow-path request_irq failed "</div><div class='add'>+				"(%d), continuing with MSI\n", rc);</div><div class='add'>+		goto msi_fail_out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	error =	request_irq(phba-&gt;msix_entries[0].vector, lpfc_intr_handler, 0,</div><div class='del'>-			    LPFC_DRIVER_NAME, phba);</div><div class='del'>-	if (error) {</div><div class='add'>+	/* vector-1 is associated to fast-path handler */</div><div class='add'>+	rc = request_irq(phba-&gt;msix_entries[1].vector, &amp;lpfc_fp_intr_handler,</div><div class='add'>+			 IRQF_SHARED, LPFC_FP_DRIVER_HANDLER_NAME, phba);</div><div class='add'>+</div><div class='add'>+	if (rc) {</div><div class='ctx'> 		lpfc_printf_log(phba, KERN_ERR, LOG_INIT,</div><div class='del'>-				"0421 MSI-X request_irq failed (%d), "</div><div class='del'>-				"continuing with MSI\n", error);</div><div class='del'>-		pci_disable_msix(phba-&gt;pcidev);</div><div class='add'>+				"0429 MSI-X fast-path request_irq failed "</div><div class='add'>+				"(%d), continuing with MSI\n", rc);</div><div class='add'>+		goto irq_fail_out;</div><div class='ctx'> 	}</div><div class='del'>-	return error;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Configure HBA MSI-X attention conditions to messages</div><div class='add'>+	 */</div><div class='add'>+	pmb = (LPFC_MBOXQ_t *) mempool_alloc(phba-&gt;mbox_mem_pool, GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (!pmb) {</div><div class='add'>+		rc = -ENOMEM;</div><div class='add'>+		lpfc_printf_log(phba, KERN_ERR, LOG_INIT,</div><div class='add'>+				"0474 Unable to allocate memory for issuing "</div><div class='add'>+				"MBOX_CONFIG_MSI command\n");</div><div class='add'>+		goto mem_fail_out;</div><div class='add'>+	}</div><div class='add'>+	rc = lpfc_config_msi(phba, pmb);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto mbx_fail_out;</div><div class='add'>+	rc = lpfc_sli_issue_mbox(phba, pmb, MBX_POLL);</div><div class='add'>+	if (rc != MBX_SUCCESS) {</div><div class='add'>+		lpfc_printf_log(phba, KERN_ERR, LOG_MBOX,</div><div class='add'>+				"0351 Config MSI mailbox command failed, "</div><div class='add'>+				"mbxCmd x%x, mbxStatus x%x\n",</div><div class='add'>+				pmb-&gt;mb.mbxCommand, pmb-&gt;mb.mbxStatus);</div><div class='add'>+		goto mbx_fail_out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Free memory allocated for mailbox command */</div><div class='add'>+	mempool_free(pmb, phba-&gt;mbox_mem_pool);</div><div class='add'>+	return rc;</div><div class='add'>+</div><div class='add'>+mbx_fail_out:</div><div class='add'>+	/* Free memory allocated for mailbox command */</div><div class='add'>+	mempool_free(pmb, phba-&gt;mbox_mem_pool);</div><div class='add'>+</div><div class='add'>+mem_fail_out:</div><div class='add'>+	/* free the irq already requested */</div><div class='add'>+	free_irq(phba-&gt;msix_entries[1].vector, phba);</div><div class='add'>+</div><div class='add'>+irq_fail_out:</div><div class='add'>+	/* free the irq already requested */</div><div class='add'>+	free_irq(phba-&gt;msix_entries[0].vector, phba);</div><div class='add'>+</div><div class='add'>+msi_fail_out:</div><div class='add'>+	/* Unconfigure MSI-X capability structure */</div><div class='add'>+	pci_disable_msix(phba-&gt;pcidev);</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_disable_msix: Disable MSI-X interrupt mode.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine is invoked to release the MSI-X vectors and then disable the</div><div class='add'>+ * MSI-X interrupt mode.</div><div class='add'>+ **/</div><div class='ctx'> static void</div><div class='ctx'> lpfc_disable_msix(struct lpfc_hba *phba)</div><div class='ctx'> {</div><div class='del'>-	free_irq(phba-&gt;msix_entries[0].vector, phba);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* Free up MSI-X multi-message vectors */</div><div class='add'>+	for (i = 0; i &lt; LPFC_MSIX_VECTORS; i++)</div><div class='add'>+		free_irq(phba-&gt;msix_entries[i].vector, phba);</div><div class='add'>+	/* Disable MSI-X */</div><div class='ctx'> 	pci_disable_msix(phba-&gt;pcidev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_pci_probe_one: lpfc PCI probe func to register device to PCI subsystem.</div><div class='add'>+ * @pdev: pointer to PCI device</div><div class='add'>+ * @pid: pointer to PCI device identifier</div><div class='add'>+ *</div><div class='add'>+ * This routine is to be registered to the kernel's PCI subsystem. When an</div><div class='add'>+ * Emulex HBA is presented in PCI bus, the kernel PCI subsystem looks at</div><div class='add'>+ * PCI device-specific information of the device and driver to see if the</div><div class='add'>+ * driver state that it can support this kind of device. If the match is</div><div class='add'>+ * successful, the driver core invokes this routine. If this routine</div><div class='add'>+ * determines it can claim the HBA, it does all the initialization that it</div><div class='add'>+ * needs to do to handle the HBA properly.</div><div class='add'>+ *</div><div class='add'>+ * Return code</div><div class='add'>+ *   0 - driver can claim the device</div><div class='add'>+ *   negative value - driver can not claim the device</div><div class='add'>+ **/</div><div class='ctx'> static int __devinit</div><div class='ctx'> lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid)</div><div class='ctx'> {</div><div class='hunk'>@@ -1956,6 +2357,7 @@ lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid)</div><div class='ctx'> 	int  i, hbq_count;</div><div class='ctx'> 	uint16_t iotag;</div><div class='ctx'> 	int bars = pci_select_bars(pdev, IORESOURCE_MEM);</div><div class='add'>+	struct lpfc_adapter_event_header adapter_event;</div><div class='ctx'> </div><div class='ctx'> 	if (pci_enable_device_mem(pdev))</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -1966,6 +2368,7 @@ lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid)</div><div class='ctx'> 	if (!phba)</div><div class='ctx'> 		goto out_release_regions;</div><div class='ctx'> </div><div class='add'>+	atomic_set(&amp;phba-&gt;fast_event_count, 0);</div><div class='ctx'> 	spin_lock_init(&amp;phba-&gt;hbalock);</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize ndlp management spinlock */</div><div class='hunk'>@@ -1978,6 +2381,7 @@ lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid)</div><div class='ctx'> 		goto out_free_phba;</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;phba-&gt;port_list);</div><div class='add'>+	init_waitqueue_head(&amp;phba-&gt;wait_4_mlo_m_q);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Get all the module params for configuring this host and then</div><div class='ctx'> 	 * establish the host.</div><div class='hunk'>@@ -2000,6 +2404,9 @@ lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid)</div><div class='ctx'> 	init_timer(&amp;phba-&gt;fabric_block_timer);</div><div class='ctx'> 	phba-&gt;fabric_block_timer.function = lpfc_fabric_block_timeout;</div><div class='ctx'> 	phba-&gt;fabric_block_timer.data = (unsigned long) phba;</div><div class='add'>+	init_timer(&amp;phba-&gt;eratt_poll);</div><div class='add'>+	phba-&gt;eratt_poll.function = lpfc_poll_eratt;</div><div class='add'>+	phba-&gt;eratt_poll.data = (unsigned long) phba;</div><div class='ctx'> </div><div class='ctx'> 	pci_set_master(pdev);</div><div class='ctx'> 	pci_try_set_mwi(pdev);</div><div class='hunk'>@@ -2019,7 +2426,7 @@ lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid)</div><div class='ctx'> 	bar2map_len        = pci_resource_len(phba-&gt;pcidev, 2);</div><div class='ctx'> </div><div class='ctx'> 	/* Map HBA SLIM to a kernel virtual address. */</div><div class='del'>-	phba-&gt;slim_memmap_p      = ioremap(phba-&gt;pci_bar0_map, bar0map_len);</div><div class='add'>+	phba-&gt;slim_memmap_p = ioremap(phba-&gt;pci_bar0_map, bar0map_len);</div><div class='ctx'> 	if (!phba-&gt;slim_memmap_p) {</div><div class='ctx'> 		error = -ENODEV;</div><div class='ctx'> 		dev_printk(KERN_ERR, &amp;pdev-&gt;dev,</div><div class='hunk'>@@ -2037,12 +2444,18 @@ lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate memory for SLI-2 structures */</div><div class='del'>-	phba-&gt;slim2p = dma_alloc_coherent(&amp;phba-&gt;pcidev-&gt;dev, SLI2_SLIM_SIZE,</div><div class='del'>-					  &amp;phba-&gt;slim2p_mapping, GFP_KERNEL);</div><div class='del'>-	if (!phba-&gt;slim2p)</div><div class='add'>+	phba-&gt;slim2p.virt = dma_alloc_coherent(&amp;phba-&gt;pcidev-&gt;dev,</div><div class='add'>+					       SLI2_SLIM_SIZE,</div><div class='add'>+					       &amp;phba-&gt;slim2p.phys,</div><div class='add'>+					       GFP_KERNEL);</div><div class='add'>+	if (!phba-&gt;slim2p.virt)</div><div class='ctx'> 		goto out_iounmap;</div><div class='ctx'> </div><div class='del'>-	memset(phba-&gt;slim2p, 0, SLI2_SLIM_SIZE);</div><div class='add'>+	memset(phba-&gt;slim2p.virt, 0, SLI2_SLIM_SIZE);</div><div class='add'>+	phba-&gt;mbox = phba-&gt;slim2p.virt + offsetof(struct lpfc_sli2_slim, mbx);</div><div class='add'>+	phba-&gt;pcb = (phba-&gt;slim2p.virt + offsetof(struct lpfc_sli2_slim, pcb));</div><div class='add'>+	phba-&gt;IOCBs = (phba-&gt;slim2p.virt +</div><div class='add'>+		       offsetof(struct lpfc_sli2_slim, IOCBs));</div><div class='ctx'> </div><div class='ctx'> 	phba-&gt;hbqslimp.virt = dma_alloc_coherent(&amp;phba-&gt;pcidev-&gt;dev,</div><div class='ctx'> 						 lpfc_sli_hbq_size(),</div><div class='hunk'>@@ -2111,7 +2524,7 @@ lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid)</div><div class='ctx'> 	phba-&gt;fc_arbtov = FF_DEF_ARBTOV;</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;phba-&gt;work_list);</div><div class='del'>-	phba-&gt;work_ha_mask = (HA_ERATT|HA_MBATT|HA_LATT);</div><div class='add'>+	phba-&gt;work_ha_mask = (HA_ERATT | HA_MBATT | HA_LATT);</div><div class='ctx'> 	phba-&gt;work_ha_mask |= (HA_RXMASK &lt;&lt; (LPFC_ELS_RING * 4));</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize the wait queue head for the kernel thread */</div><div class='hunk'>@@ -2146,21 +2559,42 @@ lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid)</div><div class='ctx'> 	pci_set_drvdata(pdev, shost);</div><div class='ctx'> 	phba-&gt;intr_type = NONE;</div><div class='ctx'> </div><div class='add'>+	phba-&gt;MBslimaddr = phba-&gt;slim_memmap_p;</div><div class='add'>+	phba-&gt;HAregaddr = phba-&gt;ctrl_regs_memmap_p + HA_REG_OFFSET;</div><div class='add'>+	phba-&gt;CAregaddr = phba-&gt;ctrl_regs_memmap_p + CA_REG_OFFSET;</div><div class='add'>+	phba-&gt;HSregaddr = phba-&gt;ctrl_regs_memmap_p + HS_REG_OFFSET;</div><div class='add'>+	phba-&gt;HCregaddr = phba-&gt;ctrl_regs_memmap_p + HC_REG_OFFSET;</div><div class='add'>+</div><div class='add'>+	/* Configure and enable interrupt */</div><div class='ctx'> 	if (phba-&gt;cfg_use_msi == 2) {</div><div class='del'>-		error = lpfc_enable_msix(phba);</div><div class='del'>-		if (!error)</div><div class='del'>-			phba-&gt;intr_type = MSIX;</div><div class='add'>+		/* Need to issue conf_port mbox cmd before conf_msi mbox cmd */</div><div class='add'>+		error = lpfc_sli_config_port(phba, 3);</div><div class='add'>+		if (error)</div><div class='add'>+			lpfc_printf_log(phba, KERN_INFO, LOG_INIT,</div><div class='add'>+				"0427 Firmware not capable of SLI 3 mode.\n");</div><div class='add'>+		else {</div><div class='add'>+			lpfc_printf_log(phba, KERN_INFO, LOG_INIT,</div><div class='add'>+				"0426 Firmware capable of SLI 3 mode.\n");</div><div class='add'>+			/* Now, try to enable MSI-X interrupt mode */</div><div class='add'>+			error = lpfc_enable_msix(phba);</div><div class='add'>+			if (!error) {</div><div class='add'>+				phba-&gt;intr_type = MSIX;</div><div class='add'>+				lpfc_printf_log(phba, KERN_INFO, LOG_INIT,</div><div class='add'>+						"0430 enable MSI-X mode.\n");</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Fallback to MSI if MSI-X initialization failed */</div><div class='ctx'> 	if (phba-&gt;cfg_use_msi &gt;= 1 &amp;&amp; phba-&gt;intr_type == NONE) {</div><div class='ctx'> 		retval = pci_enable_msi(phba-&gt;pcidev);</div><div class='del'>-		if (!retval)</div><div class='add'>+		if (!retval) {</div><div class='ctx'> 			phba-&gt;intr_type = MSI;</div><div class='del'>-		else</div><div class='ctx'> 			lpfc_printf_log(phba, KERN_INFO, LOG_INIT,</div><div class='del'>-					"0452 Enable MSI failed, continuing "</div><div class='del'>-					"with IRQ\n");</div><div class='add'>+					"0473 enable MSI mode.\n");</div><div class='add'>+		} else</div><div class='add'>+			lpfc_printf_log(phba, KERN_INFO, LOG_INIT,</div><div class='add'>+					"0452 enable IRQ mode.\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* MSI-X is the only case the doesn't need to call request_irq */</div><div class='hunk'>@@ -2176,18 +2610,16 @@ lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid)</div><div class='ctx'> 			phba-&gt;intr_type = INTx;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	phba-&gt;MBslimaddr = phba-&gt;slim_memmap_p;</div><div class='del'>-	phba-&gt;HAregaddr = phba-&gt;ctrl_regs_memmap_p + HA_REG_OFFSET;</div><div class='del'>-	phba-&gt;CAregaddr = phba-&gt;ctrl_regs_memmap_p + CA_REG_OFFSET;</div><div class='del'>-	phba-&gt;HSregaddr = phba-&gt;ctrl_regs_memmap_p + HS_REG_OFFSET;</div><div class='del'>-	phba-&gt;HCregaddr = phba-&gt;ctrl_regs_memmap_p + HC_REG_OFFSET;</div><div class='del'>-</div><div class='ctx'> 	if (lpfc_alloc_sysfs_attr(vport)) {</div><div class='add'>+		lpfc_printf_log(phba, KERN_ERR, LOG_INIT,</div><div class='add'>+				"1476 Failed to allocate sysfs attr\n");</div><div class='ctx'> 		error = -ENOMEM;</div><div class='ctx'> 		goto out_free_irq;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (lpfc_sli_hba_setup(phba)) {</div><div class='add'>+		lpfc_printf_log(phba, KERN_ERR, LOG_INIT,</div><div class='add'>+				"1477 Failed to set up hba\n");</div><div class='ctx'> 		error = -ENODEV;</div><div class='ctx'> 		goto out_remove_device;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2206,6 +2638,16 @@ lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid)</div><div class='ctx'> 		spin_unlock_irq(shost-&gt;host_lock);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	lpfc_printf_log(phba, KERN_INFO, LOG_INIT,</div><div class='add'>+			"0428 Perform SCSI scan\n");</div><div class='add'>+	/* Send board arrival event to upper layer */</div><div class='add'>+	adapter_event.event_type = FC_REG_ADAPTER_EVENT;</div><div class='add'>+	adapter_event.subcategory = LPFC_EVENT_ARRIVAL;</div><div class='add'>+	fc_host_post_vendor_event(shost, fc_get_event_number(),</div><div class='add'>+		sizeof(adapter_event),</div><div class='add'>+		(char *) &amp;adapter_event,</div><div class='add'>+		SCSI_NL_VID_TYPE_PCI | PCI_VENDOR_ID_EMULEX);</div><div class='add'>+</div><div class='ctx'> 	scsi_scan_host(shost);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -2238,11 +2680,11 @@ out_free_iocbq:</div><div class='ctx'> 	}</div><div class='ctx'> 	lpfc_mem_free(phba);</div><div class='ctx'> out_free_hbqslimp:</div><div class='del'>-	dma_free_coherent(&amp;pdev-&gt;dev, lpfc_sli_hbq_size(), phba-&gt;hbqslimp.virt,</div><div class='del'>-			  phba-&gt;hbqslimp.phys);</div><div class='add'>+	dma_free_coherent(&amp;pdev-&gt;dev, lpfc_sli_hbq_size(),</div><div class='add'>+			  phba-&gt;hbqslimp.virt, phba-&gt;hbqslimp.phys);</div><div class='ctx'> out_free_slim:</div><div class='del'>-	dma_free_coherent(&amp;pdev-&gt;dev, SLI2_SLIM_SIZE, phba-&gt;slim2p,</div><div class='del'>-							phba-&gt;slim2p_mapping);</div><div class='add'>+	dma_free_coherent(&amp;pdev-&gt;dev, SLI2_SLIM_SIZE,</div><div class='add'>+			  phba-&gt;slim2p.virt, phba-&gt;slim2p.phys);</div><div class='ctx'> out_iounmap:</div><div class='ctx'> 	iounmap(phba-&gt;ctrl_regs_memmap_p);</div><div class='ctx'> out_iounmap_slim:</div><div class='hunk'>@@ -2262,6 +2704,14 @@ out:</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_pci_remove_one: lpfc PCI func to unregister device from PCI subsystem.</div><div class='add'>+ * @pdev: pointer to PCI device</div><div class='add'>+ *</div><div class='add'>+ * This routine is to be registered to the kernel's PCI subsystem. When an</div><div class='add'>+ * Emulex HBA is removed from PCI bus. It perform all the necessary cleanup</div><div class='add'>+ * for the HBA device to be removed from the PCI subsystem properly.</div><div class='add'>+ **/</div><div class='ctx'> static void __devexit</div><div class='ctx'> lpfc_pci_remove_one(struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='hunk'>@@ -2316,12 +2766,12 @@ lpfc_pci_remove_one(struct pci_dev *pdev)</div><div class='ctx'> 	lpfc_scsi_free(phba);</div><div class='ctx'> 	lpfc_mem_free(phba);</div><div class='ctx'> </div><div class='del'>-	dma_free_coherent(&amp;pdev-&gt;dev, lpfc_sli_hbq_size(), phba-&gt;hbqslimp.virt,</div><div class='del'>-			  phba-&gt;hbqslimp.phys);</div><div class='add'>+	dma_free_coherent(&amp;pdev-&gt;dev, lpfc_sli_hbq_size(),</div><div class='add'>+			  phba-&gt;hbqslimp.virt, phba-&gt;hbqslimp.phys);</div><div class='ctx'> </div><div class='ctx'> 	/* Free resources associated with SLI2 interface */</div><div class='ctx'> 	dma_free_coherent(&amp;pdev-&gt;dev, SLI2_SLIM_SIZE,</div><div class='del'>-			  phba-&gt;slim2p, phba-&gt;slim2p_mapping);</div><div class='add'>+			  phba-&gt;slim2p.virt, phba-&gt;slim2p.phys);</div><div class='ctx'> </div><div class='ctx'> 	/* unmap adapter SLIM and Control Registers */</div><div class='ctx'> 	iounmap(phba-&gt;ctrl_regs_memmap_p);</div><div class='hunk'>@@ -2336,13 +2786,21 @@ lpfc_pci_remove_one(struct pci_dev *pdev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * lpfc_io_error_detected - called when PCI error is detected</div><div class='del'>- * @pdev: Pointer to PCI device</div><div class='del'>- * @state: The current pci conneection state</div><div class='add'>+ * lpfc_io_error_detected: Driver method for handling PCI I/O error detected.</div><div class='add'>+ * @pdev: pointer to PCI device.</div><div class='add'>+ * @state: the current PCI connection state.</div><div class='ctx'>  *</div><div class='del'>- * This function is called after a PCI bus error affecting</div><div class='del'>- * this device has been detected.</div><div class='del'>- */</div><div class='add'>+ * This routine is registered to the PCI subsystem for error handling. This</div><div class='add'>+ * function is called by the PCI subsystem after a PCI bus error affecting</div><div class='add'>+ * this device has been detected. When this function is invoked, it will</div><div class='add'>+ * need to stop all the I/Os and interrupt(s) to the device. Once that is</div><div class='add'>+ * done, it will return PCI_ERS_RESULT_NEED_RESET for the PCI subsystem to</div><div class='add'>+ * perform proper recovery as desired.</div><div class='add'>+ *</div><div class='add'>+ * Return codes</div><div class='add'>+ *   PCI_ERS_RESULT_NEED_RESET - need to reset before recovery</div><div class='add'>+ *   PCI_ERS_RESULT_DISCONNECT - device could not be recovered</div><div class='add'>+ **/</div><div class='ctx'> static pci_ers_result_t lpfc_io_error_detected(struct pci_dev *pdev,</div><div class='ctx'> 				pci_channel_state_t state)</div><div class='ctx'> {</div><div class='hunk'>@@ -2351,8 +2809,15 @@ static pci_ers_result_t lpfc_io_error_detected(struct pci_dev *pdev,</div><div class='ctx'> 	struct lpfc_sli *psli = &amp;phba-&gt;sli;</div><div class='ctx'> 	struct lpfc_sli_ring  *pring;</div><div class='ctx'> </div><div class='del'>-	if (state == pci_channel_io_perm_failure)</div><div class='add'>+	if (state == pci_channel_io_perm_failure) {</div><div class='add'>+		lpfc_printf_log(phba, KERN_ERR, LOG_INIT,</div><div class='add'>+				"0472 PCI channel I/O permanent failure\n");</div><div class='add'>+		/* Block all SCSI devices' I/Os on the host */</div><div class='add'>+		lpfc_scsi_dev_block(phba);</div><div class='add'>+		/* Clean up all driver's outstanding SCSI I/Os */</div><div class='add'>+		lpfc_sli_flush_fcp_rings(phba);</div><div class='ctx'> 		return PCI_ERS_RESULT_DISCONNECT;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	pci_disable_device(pdev);</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -2376,10 +2841,21 @@ static pci_ers_result_t lpfc_io_error_detected(struct pci_dev *pdev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * lpfc_io_slot_reset - called after the pci bus has been reset.</div><div class='del'>- * @pdev: Pointer to PCI device</div><div class='add'>+ * lpfc_io_slot_reset: Restart a PCI device from scratch.</div><div class='add'>+ * @pdev: pointer to PCI device.</div><div class='add'>+ *</div><div class='add'>+ * This routine is registered to the PCI subsystem for error handling. This is</div><div class='add'>+ * called after PCI bus has been reset to restart the PCI card from scratch,</div><div class='add'>+ * as if from a cold-boot. During the PCI subsystem error recovery, after the</div><div class='add'>+ * driver returns PCI_ERS_RESULT_NEED_RESET, the PCI subsystem will perform</div><div class='add'>+ * proper error recovery and then call this routine before calling the .resume</div><div class='add'>+ * method to recover the device. This function will initialize the HBA device,</div><div class='add'>+ * enable the interrupt, but it will just put the HBA to offline state without</div><div class='add'>+ * passing any I/O traffic.</div><div class='ctx'>  *</div><div class='del'>- * Restart the card from scratch, as if from a cold-boot.</div><div class='add'>+ * Return codes</div><div class='add'>+ *   PCI_ERS_RESULT_RECOVERED - the device has been recovered</div><div class='add'>+ *   PCI_ERS_RESULT_DISCONNECT - device could not be recovered</div><div class='ctx'>  */</div><div class='ctx'> static pci_ers_result_t lpfc_io_slot_reset(struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='hunk'>@@ -2404,20 +2880,34 @@ static pci_ers_result_t lpfc_io_slot_reset(struct pci_dev *pdev)</div><div class='ctx'> 	/* Enable configured interrupt method */</div><div class='ctx'> 	phba-&gt;intr_type = NONE;</div><div class='ctx'> 	if (phba-&gt;cfg_use_msi == 2) {</div><div class='del'>-		error = lpfc_enable_msix(phba);</div><div class='del'>-		if (!error)</div><div class='del'>-			phba-&gt;intr_type = MSIX;</div><div class='add'>+		/* Need to issue conf_port mbox cmd before conf_msi mbox cmd */</div><div class='add'>+		error = lpfc_sli_config_port(phba, 3);</div><div class='add'>+		if (error)</div><div class='add'>+			lpfc_printf_log(phba, KERN_INFO, LOG_INIT,</div><div class='add'>+				"0478 Firmware not capable of SLI 3 mode.\n");</div><div class='add'>+		else {</div><div class='add'>+			lpfc_printf_log(phba, KERN_INFO, LOG_INIT,</div><div class='add'>+				"0479 Firmware capable of SLI 3 mode.\n");</div><div class='add'>+			/* Now, try to enable MSI-X interrupt mode */</div><div class='add'>+			error = lpfc_enable_msix(phba);</div><div class='add'>+			if (!error) {</div><div class='add'>+				phba-&gt;intr_type = MSIX;</div><div class='add'>+				lpfc_printf_log(phba, KERN_INFO, LOG_INIT,</div><div class='add'>+						"0480 enable MSI-X mode.\n");</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Fallback to MSI if MSI-X initialization failed */</div><div class='ctx'> 	if (phba-&gt;cfg_use_msi &gt;= 1 &amp;&amp; phba-&gt;intr_type == NONE) {</div><div class='ctx'> 		retval = pci_enable_msi(phba-&gt;pcidev);</div><div class='del'>-		if (!retval)</div><div class='add'>+		if (!retval) {</div><div class='ctx'> 			phba-&gt;intr_type = MSI;</div><div class='del'>-		else</div><div class='ctx'> 			lpfc_printf_log(phba, KERN_INFO, LOG_INIT,</div><div class='del'>-					"0470 Enable MSI failed, continuing "</div><div class='del'>-					"with IRQ\n");</div><div class='add'>+					"0481 enable MSI mode.\n");</div><div class='add'>+		} else</div><div class='add'>+			lpfc_printf_log(phba, KERN_INFO, LOG_INIT,</div><div class='add'>+					"0470 enable IRQ mode.\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* MSI-X is the only case the doesn't need to call request_irq */</div><div class='hunk'>@@ -2440,11 +2930,13 @@ static pci_ers_result_t lpfc_io_slot_reset(struct pci_dev *pdev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * lpfc_io_resume - called when traffic can start flowing again.</div><div class='del'>- * @pdev: Pointer to PCI device</div><div class='add'>+ * lpfc_io_resume: Resume PCI I/O operation.</div><div class='add'>+ * @pdev: pointer to PCI device</div><div class='ctx'>  *</div><div class='del'>- * This callback is called when the error recovery driver tells us that</div><div class='del'>- * its OK to resume normal operation.</div><div class='add'>+ * This routine is registered to the PCI subsystem for error handling. It is</div><div class='add'>+ * called when kernel error recovery tells the lpfc driver that it is ok to</div><div class='add'>+ * resume normal PCI operation after PCI bus error recovery. After this call,</div><div class='add'>+ * traffic can start to flow from this device again.</div><div class='ctx'>  */</div><div class='ctx'> static void lpfc_io_resume(struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='hunk'>@@ -2491,6 +2983,8 @@ static struct pci_device_id lpfc_id_table[] = {</div><div class='ctx'> 		PCI_ANY_ID, PCI_ANY_ID, },</div><div class='ctx'> 	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_ZEPHYR,</div><div class='ctx'> 		PCI_ANY_ID, PCI_ANY_ID, },</div><div class='add'>+	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_HORNET,</div><div class='add'>+		PCI_ANY_ID, PCI_ANY_ID, },</div><div class='ctx'> 	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_ZEPHYR_SCSP,</div><div class='ctx'> 		PCI_ANY_ID, PCI_ANY_ID, },</div><div class='ctx'> 	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_ZEPHYR_DCSP,</div><div class='hunk'>@@ -2521,6 +3015,12 @@ static struct pci_device_id lpfc_id_table[] = {</div><div class='ctx'> 		PCI_ANY_ID, PCI_ANY_ID, },</div><div class='ctx'> 	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SAT_S,</div><div class='ctx'> 		PCI_ANY_ID, PCI_ANY_ID, },</div><div class='add'>+	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_PROTEUS_VF,</div><div class='add'>+		PCI_ANY_ID, PCI_ANY_ID, },</div><div class='add'>+	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_PROTEUS_PF,</div><div class='add'>+		PCI_ANY_ID, PCI_ANY_ID, },</div><div class='add'>+	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_PROTEUS_S,</div><div class='add'>+		PCI_ANY_ID, PCI_ANY_ID, },</div><div class='ctx'> 	{ 0 }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2540,6 +3040,18 @@ static struct pci_driver lpfc_driver = {</div><div class='ctx'> 	.err_handler    = &amp;lpfc_err_handler,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_init: lpfc module initialization routine.</div><div class='add'>+ *</div><div class='add'>+ * This routine is to be invoked when the lpfc module is loaded into the</div><div class='add'>+ * kernel. The special kernel macro module_init() is used to indicate the</div><div class='add'>+ * role of this routine to the kernel as lpfc module entry point.</div><div class='add'>+ *</div><div class='add'>+ * Return codes</div><div class='add'>+ *   0 - successful</div><div class='add'>+ *   -ENOMEM - FC attach transport failed</div><div class='add'>+ *   all others - failed</div><div class='add'>+ */</div><div class='ctx'> static int __init</div><div class='ctx'> lpfc_init(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -2567,12 +3079,20 @@ lpfc_init(void)</div><div class='ctx'> 	error = pci_register_driver(&amp;lpfc_driver);</div><div class='ctx'> 	if (error) {</div><div class='ctx'> 		fc_release_transport(lpfc_transport_template);</div><div class='del'>-		fc_release_transport(lpfc_vport_transport_template);</div><div class='add'>+		if (lpfc_enable_npiv)</div><div class='add'>+			fc_release_transport(lpfc_vport_transport_template);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_exit: lpfc module removal routine.</div><div class='add'>+ *</div><div class='add'>+ * This routine is invoked when the lpfc module is removed from the kernel.</div><div class='add'>+ * The special kernel macro module_exit() is used to indicate the role of</div><div class='add'>+ * this routine to the kernel as lpfc module exit point.</div><div class='add'>+ */</div><div class='ctx'> static void __exit</div><div class='ctx'> lpfc_exit(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/scsi/lpfc/lpfc_mbox.c b/drivers/scsi/lpfc/lpfc_mbox.c<br/>index 7a9be4c5b7cb..7465fe746fe9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/lpfc/lpfc_mbox.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/lpfc/lpfc_mbox.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/lpfc/lpfc_mbox.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/lpfc/lpfc_mbox.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*******************************************************************</div><div class='ctx'>  * This file is part of the Emulex Linux Device Driver for         *</div><div class='ctx'>  * Fibre Channel Host Bus Adapters.                                *</div><div class='del'>- * Copyright (C) 2004-2007 Emulex.  All rights reserved.           *</div><div class='add'>+ * Copyright (C) 2004-2008 Emulex.  All rights reserved.           *</div><div class='ctx'>  * EMULEX and SLI are trademarks of Emulex.                        *</div><div class='ctx'>  * www.emulex.com                                                  *</div><div class='ctx'>  * Portions Copyright (C) 2004-2005 Christoph Hellwig              *</div><div class='hunk'>@@ -30,6 +30,7 @@</div><div class='ctx'> </div><div class='ctx'> #include "lpfc_hw.h"</div><div class='ctx'> #include "lpfc_sli.h"</div><div class='add'>+#include "lpfc_nl.h"</div><div class='ctx'> #include "lpfc_disc.h"</div><div class='ctx'> #include "lpfc_scsi.h"</div><div class='ctx'> #include "lpfc.h"</div><div class='hunk'>@@ -37,10 +38,20 @@</div><div class='ctx'> #include "lpfc_crtn.h"</div><div class='ctx'> #include "lpfc_compat.h"</div><div class='ctx'> </div><div class='del'>-/**********************************************/</div><div class='del'>-</div><div class='del'>-/*                mailbox command             */</div><div class='del'>-/**********************************************/</div><div class='add'>+/**</div><div class='add'>+ * lpfc_dump_mem: Prepare a mailbox command for retrieving HBA's VPD memory.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ * @pmb: pointer to the driver internal queue element for mailbox command.</div><div class='add'>+ * @offset: offset for dumping VPD memory mailbox command.</div><div class='add'>+ *</div><div class='add'>+ * The dump mailbox command provides a method for the device driver to obtain</div><div class='add'>+ * various types of information from the HBA device.</div><div class='add'>+ *</div><div class='add'>+ * This routine prepares the mailbox command for dumping HBA Vital Product</div><div class='add'>+ * Data (VPD) memory. This mailbox command is to be used for retrieving a</div><div class='add'>+ * portion (DMP_RSP_SIZE bytes) of a HBA's VPD from the HBA at an address</div><div class='add'>+ * offset specified by the offset parameter.</div><div class='add'>+ **/</div><div class='ctx'> void</div><div class='ctx'> lpfc_dump_mem(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb, uint16_t offset)</div><div class='ctx'> {</div><div class='hunk'>@@ -65,10 +76,17 @@ lpfc_dump_mem(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb, uint16_t offset)</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**********************************************/</div><div class='del'>-/*  lpfc_read_nv  Issue a READ NVPARAM        */</div><div class='del'>-/*                mailbox command             */</div><div class='del'>-/**********************************************/</div><div class='add'>+/**</div><div class='add'>+ * lpfc_read_nv: Prepare a mailbox command for reading HBA's NVRAM param.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ * @pmb: pointer to the driver internal queue element for mailbox command.</div><div class='add'>+ *</div><div class='add'>+ * The read NVRAM mailbox command returns the HBA's non-volatile parameters</div><div class='add'>+ * that are used as defaults when the Fibre Channel link is brought on-line.</div><div class='add'>+ *</div><div class='add'>+ * This routine prepares the mailbox command for reading information stored</div><div class='add'>+ * in the HBA's NVRAM. Specifically, the HBA's WWNN and WWPN.</div><div class='add'>+ **/</div><div class='ctx'> void</div><div class='ctx'> lpfc_read_nv(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)</div><div class='ctx'> {</div><div class='hunk'>@@ -81,10 +99,19 @@ lpfc_read_nv(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**********************************************/</div><div class='del'>-/*  lpfc_config_async  Issue a                */</div><div class='del'>-/*  MBX_ASYNC_EVT_ENABLE mailbox command      */</div><div class='del'>-/**********************************************/</div><div class='add'>+/**</div><div class='add'>+ * lpfc_config_async: Prepare a mailbox command for enabling HBA async event.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ * @pmb: pointer to the driver internal queue element for mailbox command.</div><div class='add'>+ * @ring: ring number for the asynchronous event to be configured.</div><div class='add'>+ *</div><div class='add'>+ * The asynchronous event enable mailbox command is used to enable the</div><div class='add'>+ * asynchronous event posting via the ASYNC_STATUS_CN IOCB response and</div><div class='add'>+ * specifies the default ring to which events are posted.</div><div class='add'>+ *</div><div class='add'>+ * This routine prepares the mailbox command for enabling HBA asynchronous</div><div class='add'>+ * event support on a IOCB ring.</div><div class='add'>+ **/</div><div class='ctx'> void</div><div class='ctx'> lpfc_config_async(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb,</div><div class='ctx'> 		uint32_t ring)</div><div class='hunk'>@@ -99,10 +126,19 @@ lpfc_config_async(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb,</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**********************************************/</div><div class='del'>-/*  lpfc_heart_beat  Issue a HEART_BEAT       */</div><div class='del'>-/*                mailbox command             */</div><div class='del'>-/**********************************************/</div><div class='add'>+/**</div><div class='add'>+ * lpfc_heart_beat: Prepare a mailbox command for heart beat.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ * @pmb: pointer to the driver internal queue element for mailbox command.</div><div class='add'>+ *</div><div class='add'>+ * The heart beat mailbox command is used to detect an unresponsive HBA, which</div><div class='add'>+ * is defined as any device where no error attention is sent and both mailbox</div><div class='add'>+ * and rings are not processed.</div><div class='add'>+ *</div><div class='add'>+ * This routine prepares the mailbox command for issuing a heart beat in the</div><div class='add'>+ * form of mailbox command to the HBA. The timely completion of the heart</div><div class='add'>+ * beat mailbox command indicates the health of the HBA.</div><div class='add'>+ **/</div><div class='ctx'> void</div><div class='ctx'> lpfc_heart_beat(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)</div><div class='ctx'> {</div><div class='hunk'>@@ -115,10 +151,26 @@ lpfc_heart_beat(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**********************************************/</div><div class='del'>-/*  lpfc_read_la  Issue a READ LA             */</div><div class='del'>-/*                mailbox command             */</div><div class='del'>-/**********************************************/</div><div class='add'>+/**</div><div class='add'>+ * lpfc_read_la: Prepare a mailbox command for reading HBA link attention.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ * @pmb: pointer to the driver internal queue element for mailbox command.</div><div class='add'>+ * @mp: DMA buffer memory for reading the link attention information into.</div><div class='add'>+ *</div><div class='add'>+ * The read link attention mailbox command is issued to read the Link Event</div><div class='add'>+ * Attention information indicated by the HBA port when the Link Event bit</div><div class='add'>+ * of the Host Attention (HSTATT) register is set to 1. A Link Event</div><div class='add'>+ * Attention occurs based on an exception detected at the Fibre Channel link</div><div class='add'>+ * interface.</div><div class='add'>+ *</div><div class='add'>+ * This routine prepares the mailbox command for reading HBA link attention</div><div class='add'>+ * information. A DMA memory has been set aside and address passed to the</div><div class='add'>+ * HBA through @mp for the HBA to DMA link attention information into the</div><div class='add'>+ * memory as part of the execution of the mailbox command.</div><div class='add'>+ *</div><div class='add'>+ * Return codes</div><div class='add'>+ *    0 - Success (currently always return 0)</div><div class='add'>+ **/</div><div class='ctx'> int</div><div class='ctx'> lpfc_read_la(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb, struct lpfc_dmabuf *mp)</div><div class='ctx'> {</div><div class='hunk'>@@ -143,10 +195,21 @@ lpfc_read_la(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb, struct lpfc_dmabuf *mp)</div><div class='ctx'> 	return (0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**********************************************/</div><div class='del'>-/*  lpfc_clear_la  Issue a CLEAR LA           */</div><div class='del'>-/*                 mailbox command            */</div><div class='del'>-/**********************************************/</div><div class='add'>+/**</div><div class='add'>+ * lpfc_clear_la: Prepare a mailbox command for clearing HBA link attention.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ * @pmb: pointer to the driver internal queue element for mailbox command.</div><div class='add'>+ *</div><div class='add'>+ * The clear link attention mailbox command is issued to clear the link event</div><div class='add'>+ * attention condition indicated by the Link Event bit of the Host Attention</div><div class='add'>+ * (HSTATT) register. The link event attention condition is cleared only if</div><div class='add'>+ * the event tag specified matches that of the current link event counter.</div><div class='add'>+ * The current event tag is read using the read link attention event mailbox</div><div class='add'>+ * command.</div><div class='add'>+ *</div><div class='add'>+ * This routine prepares the mailbox command for clearing HBA link attention</div><div class='add'>+ * information.</div><div class='add'>+ **/</div><div class='ctx'> void</div><div class='ctx'> lpfc_clear_la(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)</div><div class='ctx'> {</div><div class='hunk'>@@ -161,10 +224,20 @@ lpfc_clear_la(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**************************************************/</div><div class='del'>-/*  lpfc_config_link  Issue a CONFIG LINK         */</div><div class='del'>-/*                    mailbox command             */</div><div class='del'>-/**************************************************/</div><div class='add'>+/**</div><div class='add'>+ * lpfc_config_link: Prepare a mailbox command for configuring link on a HBA.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ * @pmb: pointer to the driver internal queue element for mailbox command.</div><div class='add'>+ *</div><div class='add'>+ * The configure link mailbox command is used before the initialize link</div><div class='add'>+ * mailbox command to override default value and to configure link-oriented</div><div class='add'>+ * parameters such as DID address and various timers. Typically, this</div><div class='add'>+ * command would be used after an F_Port login to set the returned DID address</div><div class='add'>+ * and the fabric timeout values. This command is not valid before a configure</div><div class='add'>+ * port command has configured the HBA port.</div><div class='add'>+ *</div><div class='add'>+ * This routine prepares the mailbox command for configuring link on a HBA.</div><div class='add'>+ **/</div><div class='ctx'> void</div><div class='ctx'> lpfc_config_link(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)</div><div class='ctx'> {</div><div class='hunk'>@@ -199,10 +272,98 @@ lpfc_config_link(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**********************************************/</div><div class='del'>-/*  lpfc_init_link  Issue an INIT LINK        */</div><div class='del'>-/*                  mailbox command           */</div><div class='del'>-/**********************************************/</div><div class='add'>+/**</div><div class='add'>+ * lpfc_config_msi: Prepare a mailbox command for configuring msi-x.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ * @pmb: pointer to the driver internal queue element for mailbox command.</div><div class='add'>+ *</div><div class='add'>+ * The configure MSI-X mailbox command is used to configure the HBA's SLI-3</div><div class='add'>+ * MSI-X multi-message interrupt vector association to interrupt attention</div><div class='add'>+ * conditions.</div><div class='add'>+ *</div><div class='add'>+ * Return codes</div><div class='add'>+ *    0 - Success</div><div class='add'>+ *    -EINVAL - Failure</div><div class='add'>+ **/</div><div class='add'>+int</div><div class='add'>+lpfc_config_msi(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)</div><div class='add'>+{</div><div class='add'>+	MAILBOX_t *mb = &amp;pmb-&gt;mb;</div><div class='add'>+	uint32_t attentionConditions[2];</div><div class='add'>+</div><div class='add'>+	/* Sanity check */</div><div class='add'>+	if (phba-&gt;cfg_use_msi != 2) {</div><div class='add'>+		lpfc_printf_log(phba, KERN_ERR, LOG_INIT,</div><div class='add'>+				"0475 Not configured for supporting MSI-X "</div><div class='add'>+				"cfg_use_msi: 0x%x\n", phba-&gt;cfg_use_msi);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (phba-&gt;sli_rev &lt; 3) {</div><div class='add'>+		lpfc_printf_log(phba, KERN_ERR, LOG_INIT,</div><div class='add'>+				"0476 HBA not supporting SLI-3 or later "</div><div class='add'>+				"SLI Revision: 0x%x\n", phba-&gt;sli_rev);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Clear mailbox command fields */</div><div class='add'>+	memset(pmb, 0, sizeof(LPFC_MBOXQ_t));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * SLI-3, Message Signaled Interrupt Fearure.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* Multi-message attention configuration */</div><div class='add'>+	attentionConditions[0] = (HA_R0ATT | HA_R1ATT | HA_R2ATT | HA_ERATT |</div><div class='add'>+				  HA_LATT | HA_MBATT);</div><div class='add'>+	attentionConditions[1] = 0;</div><div class='add'>+</div><div class='add'>+	mb-&gt;un.varCfgMSI.attentionConditions[0] = attentionConditions[0];</div><div class='add'>+	mb-&gt;un.varCfgMSI.attentionConditions[1] = attentionConditions[1];</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Set up message number to HA bit association</div><div class='add'>+	 */</div><div class='add'>+#ifdef __BIG_ENDIAN_BITFIELD</div><div class='add'>+	/* RA0 (FCP Ring) */</div><div class='add'>+	mb-&gt;un.varCfgMSI.messageNumberByHA[HA_R0_POS] = 1;</div><div class='add'>+	/* RA1 (Other Protocol Extra Ring) */</div><div class='add'>+	mb-&gt;un.varCfgMSI.messageNumberByHA[HA_R1_POS] = 1;</div><div class='add'>+#else   /*  __LITTLE_ENDIAN_BITFIELD */</div><div class='add'>+	/* RA0 (FCP Ring) */</div><div class='add'>+	mb-&gt;un.varCfgMSI.messageNumberByHA[HA_R0_POS^3] = 1;</div><div class='add'>+	/* RA1 (Other Protocol Extra Ring) */</div><div class='add'>+	mb-&gt;un.varCfgMSI.messageNumberByHA[HA_R1_POS^3] = 1;</div><div class='add'>+#endif</div><div class='add'>+	/* Multi-message interrupt autoclear configuration*/</div><div class='add'>+	mb-&gt;un.varCfgMSI.autoClearHA[0] = attentionConditions[0];</div><div class='add'>+	mb-&gt;un.varCfgMSI.autoClearHA[1] = attentionConditions[1];</div><div class='add'>+</div><div class='add'>+	/* For now, HBA autoclear does not work reliably, disable it */</div><div class='add'>+	mb-&gt;un.varCfgMSI.autoClearHA[0] = 0;</div><div class='add'>+	mb-&gt;un.varCfgMSI.autoClearHA[1] = 0;</div><div class='add'>+</div><div class='add'>+	/* Set command and owner bit */</div><div class='add'>+	mb-&gt;mbxCommand = MBX_CONFIG_MSI;</div><div class='add'>+	mb-&gt;mbxOwner = OWN_HOST;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * lpfc_init_link: Prepare a mailbox command for initialize link on a HBA.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ * @pmb: pointer to the driver internal queue element for mailbox command.</div><div class='add'>+ * @topology: the link topology for the link to be initialized to.</div><div class='add'>+ * @linkspeed: the link speed for the link to be initialized to.</div><div class='add'>+ *</div><div class='add'>+ * The initialize link mailbox command is used to initialize the Fibre</div><div class='add'>+ * Channel link. This command must follow a configure port command that</div><div class='add'>+ * establishes the mode of operation.</div><div class='add'>+ *</div><div class='add'>+ * This routine prepares the mailbox command for initializing link on a HBA</div><div class='add'>+ * with the specified link topology and speed.</div><div class='add'>+ **/</div><div class='ctx'> void</div><div class='ctx'> lpfc_init_link(struct lpfc_hba * phba,</div><div class='ctx'> 	       LPFC_MBOXQ_t * pmb, uint32_t topology, uint32_t linkspeed)</div><div class='hunk'>@@ -269,10 +430,27 @@ lpfc_init_link(struct lpfc_hba * phba,</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**********************************************/</div><div class='del'>-/*  lpfc_read_sparam  Issue a READ SPARAM     */</div><div class='del'>-/*                    mailbox command         */</div><div class='del'>-/**********************************************/</div><div class='add'>+/**</div><div class='add'>+ * lpfc_read_sparam: Prepare a mailbox command for reading HBA parameters.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ * @pmb: pointer to the driver internal queue element for mailbox command.</div><div class='add'>+ * @vpi: virtual N_Port identifier.</div><div class='add'>+ *</div><div class='add'>+ * The read service parameter mailbox command is used to read the HBA port</div><div class='add'>+ * service parameters. The service parameters are read into the buffer</div><div class='add'>+ * specified directly by a BDE in the mailbox command. These service</div><div class='add'>+ * parameters may then be used to build the payload of an N_Port/F_POrt</div><div class='add'>+ * login request and reply (LOGI/ACC).</div><div class='add'>+ *</div><div class='add'>+ * This routine prepares the mailbox command for reading HBA port service</div><div class='add'>+ * parameters. The DMA memory is allocated in this function and the addresses</div><div class='add'>+ * are populated into the mailbox command for the HBA to DMA the service</div><div class='add'>+ * parameters into.</div><div class='add'>+ *</div><div class='add'>+ * Return codes</div><div class='add'>+ *    0 - Success</div><div class='add'>+ *    1 - DMA memory allocation failed</div><div class='add'>+ **/</div><div class='ctx'> int</div><div class='ctx'> lpfc_read_sparam(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb, int vpi)</div><div class='ctx'> {</div><div class='hunk'>@@ -312,10 +490,21 @@ lpfc_read_sparam(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb, int vpi)</div><div class='ctx'> 	return (0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/********************************************/</div><div class='del'>-/*  lpfc_unreg_did  Issue a UNREG_DID       */</div><div class='del'>-/*                  mailbox command         */</div><div class='del'>-/********************************************/</div><div class='add'>+/**</div><div class='add'>+ * lpfc_unreg_did: Prepare a mailbox command for unregistering DID.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ * @vpi: virtual N_Port identifier.</div><div class='add'>+ * @did: remote port identifier.</div><div class='add'>+ * @pmb: pointer to the driver internal queue element for mailbox command.</div><div class='add'>+ *</div><div class='add'>+ * The unregister DID mailbox command is used to unregister an N_Port/F_Port</div><div class='add'>+ * login for an unknown RPI by specifying the DID of a remote port. This</div><div class='add'>+ * command frees an RPI context in the HBA port. This has the effect of</div><div class='add'>+ * performing an implicit N_Port/F_Port logout.</div><div class='add'>+ *</div><div class='add'>+ * This routine prepares the mailbox command for unregistering a remote</div><div class='add'>+ * N_Port/F_Port (DID) login.</div><div class='add'>+ **/</div><div class='ctx'> void</div><div class='ctx'> lpfc_unreg_did(struct lpfc_hba * phba, uint16_t vpi, uint32_t did,</div><div class='ctx'> 	       LPFC_MBOXQ_t * pmb)</div><div class='hunk'>@@ -333,10 +522,19 @@ lpfc_unreg_did(struct lpfc_hba * phba, uint16_t vpi, uint32_t did,</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**********************************************/</div><div class='del'>-/*  lpfc_read_nv  Issue a READ CONFIG         */</div><div class='del'>-/*                mailbox command             */</div><div class='del'>-/**********************************************/</div><div class='add'>+/**</div><div class='add'>+ * lpfc_read_config: Prepare a mailbox command for reading HBA configuration.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ * @pmb: pointer to the driver internal queue element for mailbox command.</div><div class='add'>+ *</div><div class='add'>+ * The read configuration mailbox command is used to read the HBA port</div><div class='add'>+ * configuration parameters. This mailbox command provides a method for</div><div class='add'>+ * seeing any parameters that may have changed via various configuration</div><div class='add'>+ * mailbox commands.</div><div class='add'>+ *</div><div class='add'>+ * This routine prepares the mailbox command for reading out HBA configuration</div><div class='add'>+ * parameters.</div><div class='add'>+ **/</div><div class='ctx'> void</div><div class='ctx'> lpfc_read_config(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)</div><div class='ctx'> {</div><div class='hunk'>@@ -350,10 +548,18 @@ lpfc_read_config(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*************************************************/</div><div class='del'>-/*  lpfc_read_lnk_stat  Issue a READ LINK STATUS */</div><div class='del'>-/*                mailbox command                */</div><div class='del'>-/*************************************************/</div><div class='add'>+/**</div><div class='add'>+ * lpfc_read_lnk_stat: Prepare a mailbox command for reading HBA link stats.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ * @pmb: pointer to the driver internal queue element for mailbox command.</div><div class='add'>+ *</div><div class='add'>+ * The read link status mailbox command is used to read the link status from</div><div class='add'>+ * the HBA. Link status includes all link-related error counters. These</div><div class='add'>+ * counters are maintained by the HBA and originated in the link hardware</div><div class='add'>+ * unit. Note that all of these counters wrap.</div><div class='add'>+ *</div><div class='add'>+ * This routine prepares the mailbox command for reading out HBA link status.</div><div class='add'>+ **/</div><div class='ctx'> void</div><div class='ctx'> lpfc_read_lnk_stat(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)</div><div class='ctx'> {</div><div class='hunk'>@@ -367,10 +573,30 @@ lpfc_read_lnk_stat(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/********************************************/</div><div class='del'>-/*  lpfc_reg_login  Issue a REG_LOGIN       */</div><div class='del'>-/*                  mailbox command         */</div><div class='del'>-/********************************************/</div><div class='add'>+/**</div><div class='add'>+ * lpfc_reg_login: Prepare a mailbox command for registering remote login.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ * @vpi: virtual N_Port identifier.</div><div class='add'>+ * @did: remote port identifier.</div><div class='add'>+ * @param: pointer to memory holding the server parameters.</div><div class='add'>+ * @pmb: pointer to the driver internal queue element for mailbox command.</div><div class='add'>+ * @flag: action flag to be passed back for the complete function.</div><div class='add'>+ *</div><div class='add'>+ * The registration login mailbox command is used to register an N_Port or</div><div class='add'>+ * F_Port login. This registration allows the HBA to cache the remote N_Port</div><div class='add'>+ * service parameters internally and thereby make the appropriate FC-2</div><div class='add'>+ * decisions. The remote port service parameters are handed off by the driver</div><div class='add'>+ * to the HBA using a descriptor entry that directly identifies a buffer in</div><div class='add'>+ * host memory. In exchange, the HBA returns an RPI identifier.</div><div class='add'>+ *</div><div class='add'>+ * This routine prepares the mailbox command for registering remote port login.</div><div class='add'>+ * The function allocates DMA buffer for passing the service parameters to the</div><div class='add'>+ * HBA with the mailbox command.</div><div class='add'>+ *</div><div class='add'>+ * Return codes</div><div class='add'>+ *    0 - Success</div><div class='add'>+ *    1 - DMA memory allocation failed</div><div class='add'>+ **/</div><div class='ctx'> int</div><div class='ctx'> lpfc_reg_login(struct lpfc_hba *phba, uint16_t vpi, uint32_t did,</div><div class='ctx'> 	       uint8_t *param, LPFC_MBOXQ_t *pmb, uint32_t flag)</div><div class='hunk'>@@ -418,10 +644,20 @@ lpfc_reg_login(struct lpfc_hba *phba, uint16_t vpi, uint32_t did,</div><div class='ctx'> 	return (0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**********************************************/</div><div class='del'>-/*  lpfc_unreg_login  Issue a UNREG_LOGIN     */</div><div class='del'>-/*                    mailbox command         */</div><div class='del'>-/**********************************************/</div><div class='add'>+/**</div><div class='add'>+ * lpfc_unreg_login: Prepare a mailbox command for unregistering remote login.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ * @vpi: virtual N_Port identifier.</div><div class='add'>+ * @rpi: remote port identifier</div><div class='add'>+ * @pmb: pointer to the driver internal queue element for mailbox command.</div><div class='add'>+ *</div><div class='add'>+ * The unregistration login mailbox command is used to unregister an N_Port</div><div class='add'>+ * or F_Port login. This command frees an RPI context in the HBA. It has the</div><div class='add'>+ * effect of performing an implicit N_Port/F_Port logout.</div><div class='add'>+ *</div><div class='add'>+ * This routine prepares the mailbox command for unregistering remote port</div><div class='add'>+ * login.</div><div class='add'>+ **/</div><div class='ctx'> void</div><div class='ctx'> lpfc_unreg_login(struct lpfc_hba *phba, uint16_t vpi, uint32_t rpi,</div><div class='ctx'> 		 LPFC_MBOXQ_t * pmb)</div><div class='hunk'>@@ -440,10 +676,21 @@ lpfc_unreg_login(struct lpfc_hba *phba, uint16_t vpi, uint32_t rpi,</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**************************************************/</div><div class='del'>-/*  lpfc_reg_vpi   Issue a REG_VPI                */</div><div class='del'>-/*                    mailbox command             */</div><div class='del'>-/**************************************************/</div><div class='add'>+/**</div><div class='add'>+ * lpfc_reg_vpi: Prepare a mailbox command for registering vport identifier.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ * @vpi: virtual N_Port identifier.</div><div class='add'>+ * @sid: Fibre Channel S_ID (N_Port_ID assigned to a virtual N_Port).</div><div class='add'>+ * @pmb: pointer to the driver internal queue element for mailbox command.</div><div class='add'>+ *</div><div class='add'>+ * The registration vport identifier mailbox command is used to activate a</div><div class='add'>+ * virtual N_Port after it has acquired an N_Port_ID. The HBA validates the</div><div class='add'>+ * N_Port_ID against the information in the selected virtual N_Port context</div><div class='add'>+ * block and marks it active to allow normal processing of IOCB commands and</div><div class='add'>+ * received unsolicited exchanges.</div><div class='add'>+ *</div><div class='add'>+ * This routine prepares the mailbox command for registering a virtual N_Port.</div><div class='add'>+ **/</div><div class='ctx'> void</div><div class='ctx'> lpfc_reg_vpi(struct lpfc_hba *phba, uint16_t vpi, uint32_t sid,</div><div class='ctx'> 	     LPFC_MBOXQ_t *pmb)</div><div class='hunk'>@@ -461,10 +708,22 @@ lpfc_reg_vpi(struct lpfc_hba *phba, uint16_t vpi, uint32_t sid,</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**************************************************/</div><div class='del'>-/*  lpfc_unreg_vpi   Issue a UNREG_VNPI           */</div><div class='del'>-/*                    mailbox command             */</div><div class='del'>-/**************************************************/</div><div class='add'>+/**</div><div class='add'>+ * lpfc_unreg_vpi: Prepare a mailbox command for unregistering vport id.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ * @vpi: virtual N_Port identifier.</div><div class='add'>+ * @pmb: pointer to the driver internal queue element for mailbox command.</div><div class='add'>+ *</div><div class='add'>+ * The unregistration vport identifier mailbox command is used to inactivate</div><div class='add'>+ * a virtual N_Port. The driver must have logged out and unregistered all</div><div class='add'>+ * remote N_Ports to abort any activity on the virtual N_Port. The HBA will</div><div class='add'>+ * unregisters any default RPIs associated with the specified vpi, aborting</div><div class='add'>+ * any active exchanges. The HBA will post the mailbox response after making</div><div class='add'>+ * the virtual N_Port inactive.</div><div class='add'>+ *</div><div class='add'>+ * This routine prepares the mailbox command for unregistering a virtual</div><div class='add'>+ * N_Port.</div><div class='add'>+ **/</div><div class='ctx'> void</div><div class='ctx'> lpfc_unreg_vpi(struct lpfc_hba *phba, uint16_t vpi, LPFC_MBOXQ_t *pmb)</div><div class='ctx'> {</div><div class='hunk'>@@ -479,12 +738,19 @@ lpfc_unreg_vpi(struct lpfc_hba *phba, uint16_t vpi, LPFC_MBOXQ_t *pmb)</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_config_pcb_setup: Set up IOCB rings in the Port Control Block (PCB)</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine sets up and initializes the IOCB rings in the Port Control</div><div class='add'>+ * Block (PCB).</div><div class='add'>+ **/</div><div class='ctx'> static void</div><div class='ctx'> lpfc_config_pcb_setup(struct lpfc_hba * phba)</div><div class='ctx'> {</div><div class='ctx'> 	struct lpfc_sli *psli = &amp;phba-&gt;sli;</div><div class='ctx'> 	struct lpfc_sli_ring *pring;</div><div class='del'>-	PCB_t *pcbp = &amp;phba-&gt;slim2p-&gt;pcb;</div><div class='add'>+	PCB_t *pcbp = phba-&gt;pcb;</div><div class='ctx'> 	dma_addr_t pdma_addr;</div><div class='ctx'> 	uint32_t offset;</div><div class='ctx'> 	uint32_t iocbCnt = 0;</div><div class='hunk'>@@ -513,29 +779,43 @@ lpfc_config_pcb_setup(struct lpfc_hba * phba)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> 		/* Command ring setup for ring */</div><div class='del'>-		pring-&gt;cmdringaddr = (void *) &amp;phba-&gt;slim2p-&gt;IOCBs[iocbCnt];</div><div class='add'>+		pring-&gt;cmdringaddr = (void *)&amp;phba-&gt;IOCBs[iocbCnt];</div><div class='ctx'> 		pcbp-&gt;rdsc[i].cmdEntries = pring-&gt;numCiocb;</div><div class='ctx'> </div><div class='del'>-		offset = (uint8_t *) &amp;phba-&gt;slim2p-&gt;IOCBs[iocbCnt] -</div><div class='del'>-			 (uint8_t *) phba-&gt;slim2p;</div><div class='del'>-		pdma_addr = phba-&gt;slim2p_mapping + offset;</div><div class='add'>+		offset = (uint8_t *) &amp;phba-&gt;IOCBs[iocbCnt] -</div><div class='add'>+			 (uint8_t *) phba-&gt;slim2p.virt;</div><div class='add'>+		pdma_addr = phba-&gt;slim2p.phys + offset;</div><div class='ctx'> 		pcbp-&gt;rdsc[i].cmdAddrHigh = putPaddrHigh(pdma_addr);</div><div class='ctx'> 		pcbp-&gt;rdsc[i].cmdAddrLow = putPaddrLow(pdma_addr);</div><div class='ctx'> 		iocbCnt += pring-&gt;numCiocb;</div><div class='ctx'> </div><div class='ctx'> 		/* Response ring setup for ring */</div><div class='del'>-		pring-&gt;rspringaddr = (void *) &amp;phba-&gt;slim2p-&gt;IOCBs[iocbCnt];</div><div class='add'>+		pring-&gt;rspringaddr = (void *) &amp;phba-&gt;IOCBs[iocbCnt];</div><div class='ctx'> </div><div class='ctx'> 		pcbp-&gt;rdsc[i].rspEntries = pring-&gt;numRiocb;</div><div class='del'>-		offset = (uint8_t *)&amp;phba-&gt;slim2p-&gt;IOCBs[iocbCnt] -</div><div class='del'>-			 (uint8_t *)phba-&gt;slim2p;</div><div class='del'>-		pdma_addr = phba-&gt;slim2p_mapping + offset;</div><div class='add'>+		offset = (uint8_t *)&amp;phba-&gt;IOCBs[iocbCnt] -</div><div class='add'>+			 (uint8_t *)phba-&gt;slim2p.virt;</div><div class='add'>+		pdma_addr = phba-&gt;slim2p.phys + offset;</div><div class='ctx'> 		pcbp-&gt;rdsc[i].rspAddrHigh = putPaddrHigh(pdma_addr);</div><div class='ctx'> 		pcbp-&gt;rdsc[i].rspAddrLow = putPaddrLow(pdma_addr);</div><div class='ctx'> 		iocbCnt += pring-&gt;numRiocb;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_read_rev: Prepare a mailbox command for reading HBA revision.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ * @pmb: pointer to the driver internal queue element for mailbox command.</div><div class='add'>+ *</div><div class='add'>+ * The read revision mailbox command is used to read the revision levels of</div><div class='add'>+ * the HBA components. These components include hardware units, resident</div><div class='add'>+ * firmware, and available firmware. HBAs that supports SLI-3 mode of</div><div class='add'>+ * operation provide different response information depending on the version</div><div class='add'>+ * requested by the driver.</div><div class='add'>+ *</div><div class='add'>+ * This routine prepares the mailbox command for reading HBA revision</div><div class='add'>+ * information.</div><div class='add'>+ **/</div><div class='ctx'> void</div><div class='ctx'> lpfc_read_rev(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)</div><div class='ctx'> {</div><div class='hunk'>@@ -548,6 +828,16 @@ lpfc_read_rev(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_build_hbq_profile2: Set up the HBQ Selection Profile 2.</div><div class='add'>+ * @hbqmb: pointer to the HBQ configuration data structure in mailbox command.</div><div class='add'>+ * @hbq_desc: pointer to the HBQ selection profile descriptor.</div><div class='add'>+ *</div><div class='add'>+ * The Host Buffer Queue (HBQ) Selection Profile 2 specifies that the HBA</div><div class='add'>+ * tests the incoming frames' R_CTL/TYPE fields with works 10:15 and performs</div><div class='add'>+ * the Sequence Length Test using the fields in the Selection Profile 2</div><div class='add'>+ * extension in words 20:31.</div><div class='add'>+ **/</div><div class='ctx'> static void</div><div class='ctx'> lpfc_build_hbq_profile2(struct config_hbq_var *hbqmb,</div><div class='ctx'> 			struct lpfc_hbq_init  *hbq_desc)</div><div class='hunk'>@@ -557,6 +847,16 @@ lpfc_build_hbq_profile2(struct config_hbq_var *hbqmb,</div><div class='ctx'> 	hbqmb-&gt;profiles.profile2.seqlenoff  = hbq_desc-&gt;seqlenoff;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_build_hbq_profile3: Set up the HBQ Selection Profile 3.</div><div class='add'>+ * @hbqmb: pointer to the HBQ configuration data structure in mailbox command.</div><div class='add'>+ * @hbq_desc: pointer to the HBQ selection profile descriptor.</div><div class='add'>+ *</div><div class='add'>+ * The Host Buffer Queue (HBQ) Selection Profile 3 specifies that the HBA</div><div class='add'>+ * tests the incoming frame's R_CTL/TYPE fields with words 10:15 and performs</div><div class='add'>+ * the Sequence Length Test and Byte Field Test using the fields in the</div><div class='add'>+ * Selection Profile 3 extension in words 20:31.</div><div class='add'>+ **/</div><div class='ctx'> static void</div><div class='ctx'> lpfc_build_hbq_profile3(struct config_hbq_var *hbqmb,</div><div class='ctx'> 			struct lpfc_hbq_init  *hbq_desc)</div><div class='hunk'>@@ -569,6 +869,17 @@ lpfc_build_hbq_profile3(struct config_hbq_var *hbqmb,</div><div class='ctx'> 	       sizeof(hbqmb-&gt;profiles.profile3.cmdmatch));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_build_hbq_profile5: Set up the HBQ Selection Profile 5.</div><div class='add'>+ * @hbqmb: pointer to the HBQ configuration data structure in mailbox command.</div><div class='add'>+ * @hbq_desc: pointer to the HBQ selection profile descriptor.</div><div class='add'>+ *</div><div class='add'>+ * The Host Buffer Queue (HBQ) Selection Profile 5 specifies a header HBQ. The</div><div class='add'>+ * HBA tests the initial frame of an incoming sequence using the frame's</div><div class='add'>+ * R_CTL/TYPE fields with words 10:15 and performs the Sequence Length Test</div><div class='add'>+ * and Byte Field Test using the fields in the Selection Profile 5 extension</div><div class='add'>+ * words 20:31.</div><div class='add'>+ **/</div><div class='ctx'> static void</div><div class='ctx'> lpfc_build_hbq_profile5(struct config_hbq_var *hbqmb,</div><div class='ctx'> 			struct lpfc_hbq_init  *hbq_desc)</div><div class='hunk'>@@ -581,6 +892,20 @@ lpfc_build_hbq_profile5(struct config_hbq_var *hbqmb,</div><div class='ctx'> 	       sizeof(hbqmb-&gt;profiles.profile5.cmdmatch));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_config_hbq: Prepare a mailbox command for configuring an HBQ.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ * @id: HBQ identifier.</div><div class='add'>+ * @hbq_desc: pointer to the HBA descriptor data structure.</div><div class='add'>+ * @hbq_entry_index: index of the HBQ entry data structures.</div><div class='add'>+ * @pmb: pointer to the driver internal queue element for mailbox command.</div><div class='add'>+ *</div><div class='add'>+ * The configure HBQ (Host Buffer Queue) mailbox command is used to configure</div><div class='add'>+ * an HBQ. The configuration binds events that require buffers to a particular</div><div class='add'>+ * ring and HBQ based on a selection profile.</div><div class='add'>+ *</div><div class='add'>+ * This routine prepares the mailbox command for configuring an HBQ.</div><div class='add'>+ **/</div><div class='ctx'> void</div><div class='ctx'> lpfc_config_hbq(struct lpfc_hba *phba, uint32_t id,</div><div class='ctx'> 		 struct lpfc_hbq_init *hbq_desc,</div><div class='hunk'>@@ -641,8 +966,23 @@ lpfc_config_hbq(struct lpfc_hba *phba, uint32_t id,</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-</div><div class='add'>+/**</div><div class='add'>+ * lpfc_config_ring: Prepare a mailbox command for configuring an IOCB ring.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ * @ring:</div><div class='add'>+ * @pmb: pointer to the driver internal queue element for mailbox command.</div><div class='add'>+ *</div><div class='add'>+ * The configure ring mailbox command is used to configure an IOCB ring. This</div><div class='add'>+ * configuration binds from one to six of HBA RC_CTL/TYPE mask entries to the</div><div class='add'>+ * ring. This is used to map incoming sequences to a particular ring whose</div><div class='add'>+ * RC_CTL/TYPE mask entry matches that of the sequence. The driver should not</div><div class='add'>+ * attempt to configure a ring whose number is greater than the number</div><div class='add'>+ * specified in the Port Control Block (PCB). It is an error to issue the</div><div class='add'>+ * configure ring command more than once with the same ring number. The HBA</div><div class='add'>+ * returns an error if the driver attempts this.</div><div class='add'>+ *</div><div class='add'>+ * This routine prepares the mailbox command for configuring IOCB ring.</div><div class='add'>+ **/</div><div class='ctx'> void</div><div class='ctx'> lpfc_config_ring(struct lpfc_hba * phba, int ring, LPFC_MBOXQ_t * pmb)</div><div class='ctx'> {</div><div class='hunk'>@@ -684,6 +1024,20 @@ lpfc_config_ring(struct lpfc_hba * phba, int ring, LPFC_MBOXQ_t * pmb)</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_config_port: Prepare a mailbox command for configuring port.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ * @pmb: pointer to the driver internal queue element for mailbox command.</div><div class='add'>+ *</div><div class='add'>+ * The configure port mailbox command is used to identify the Port Control</div><div class='add'>+ * Block (PCB) in the driver memory. After this command is issued, the</div><div class='add'>+ * driver must not access the mailbox in the HBA without first resetting</div><div class='add'>+ * the HBA. The HBA may copy the PCB information to internal storage for</div><div class='add'>+ * subsequent use; the driver can not change the PCB information unless it</div><div class='add'>+ * resets the HBA.</div><div class='add'>+ *</div><div class='add'>+ * This routine prepares the mailbox command for configuring port.</div><div class='add'>+ **/</div><div class='ctx'> void</div><div class='ctx'> lpfc_config_port(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)</div><div class='ctx'> {</div><div class='hunk'>@@ -702,8 +1056,8 @@ lpfc_config_port(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)</div><div class='ctx'> </div><div class='ctx'> 	mb-&gt;un.varCfgPort.pcbLen = sizeof(PCB_t);</div><div class='ctx'> </div><div class='del'>-	offset = (uint8_t *)&amp;phba-&gt;slim2p-&gt;pcb - (uint8_t *)phba-&gt;slim2p;</div><div class='del'>-	pdma_addr = phba-&gt;slim2p_mapping + offset;</div><div class='add'>+	offset = (uint8_t *)phba-&gt;pcb - (uint8_t *)phba-&gt;slim2p.virt;</div><div class='add'>+	pdma_addr = phba-&gt;slim2p.phys + offset;</div><div class='ctx'> 	mb-&gt;un.varCfgPort.pcbLow = putPaddrLow(pdma_addr);</div><div class='ctx'> 	mb-&gt;un.varCfgPort.pcbHigh = putPaddrHigh(pdma_addr);</div><div class='ctx'> </div><div class='hunk'>@@ -711,12 +1065,13 @@ lpfc_config_port(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)</div><div class='ctx'> </div><div class='ctx'> 	if (phba-&gt;sli_rev == 3 &amp;&amp; phba-&gt;vpd.sli3Feat.cerbm) {</div><div class='ctx'> 		mb-&gt;un.varCfgPort.cerbm = 1; /* Request HBQs */</div><div class='add'>+		mb-&gt;un.varCfgPort.ccrp = 1; /* Command Ring Polling */</div><div class='add'>+		mb-&gt;un.varCfgPort.cinb = 1; /* Interrupt Notification Block */</div><div class='ctx'> 		mb-&gt;un.varCfgPort.max_hbq = lpfc_sli_hbq_count();</div><div class='ctx'> 		if (phba-&gt;max_vpi &amp;&amp; phba-&gt;cfg_enable_npiv &amp;&amp;</div><div class='ctx'> 		    phba-&gt;vpd.sli3Feat.cmv) {</div><div class='ctx'> 			mb-&gt;un.varCfgPort.max_vpi = phba-&gt;max_vpi;</div><div class='ctx'> 			mb-&gt;un.varCfgPort.cmv = 1;</div><div class='del'>-			phba-&gt;sli3_options |= LPFC_SLI3_NPIV_ENABLED;</div><div class='ctx'> 		} else</div><div class='ctx'> 			mb-&gt;un.varCfgPort.max_vpi = phba-&gt;max_vpi = 0;</div><div class='ctx'> 	} else</div><div class='hunk'>@@ -724,16 +1079,15 @@ lpfc_config_port(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)</div><div class='ctx'> 	mb-&gt;un.varCfgPort.sli_mode = phba-&gt;sli_rev;</div><div class='ctx'> </div><div class='ctx'> 	/* Now setup pcb */</div><div class='del'>-	phba-&gt;slim2p-&gt;pcb.type = TYPE_NATIVE_SLI2;</div><div class='del'>-	phba-&gt;slim2p-&gt;pcb.feature = FEATURE_INITIAL_SLI2;</div><div class='add'>+	phba-&gt;pcb-&gt;type = TYPE_NATIVE_SLI2;</div><div class='add'>+	phba-&gt;pcb-&gt;feature = FEATURE_INITIAL_SLI2;</div><div class='ctx'> </div><div class='ctx'> 	/* Setup Mailbox pointers */</div><div class='del'>-	phba-&gt;slim2p-&gt;pcb.mailBoxSize = offsetof(MAILBOX_t, us) +</div><div class='del'>-		sizeof(struct sli2_desc);</div><div class='del'>-	offset = (uint8_t *)&amp;phba-&gt;slim2p-&gt;mbx - (uint8_t *)phba-&gt;slim2p;</div><div class='del'>-	pdma_addr = phba-&gt;slim2p_mapping + offset;</div><div class='del'>-	phba-&gt;slim2p-&gt;pcb.mbAddrHigh = putPaddrHigh(pdma_addr);</div><div class='del'>-	phba-&gt;slim2p-&gt;pcb.mbAddrLow = putPaddrLow(pdma_addr);</div><div class='add'>+	phba-&gt;pcb-&gt;mailBoxSize = sizeof(MAILBOX_t);</div><div class='add'>+	offset = (uint8_t *)phba-&gt;mbox - (uint8_t *)phba-&gt;slim2p.virt;</div><div class='add'>+	pdma_addr = phba-&gt;slim2p.phys + offset;</div><div class='add'>+	phba-&gt;pcb-&gt;mbAddrHigh = putPaddrHigh(pdma_addr);</div><div class='add'>+	phba-&gt;pcb-&gt;mbAddrLow = putPaddrLow(pdma_addr);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Setup Host Group ring pointer.</div><div class='hunk'>@@ -794,13 +1148,13 @@ lpfc_config_port(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* mask off BAR0's flag bits 0 - 3 */</div><div class='del'>-	phba-&gt;slim2p-&gt;pcb.hgpAddrLow = (bar_low &amp; PCI_BASE_ADDRESS_MEM_MASK) +</div><div class='del'>-		(void __iomem *) phba-&gt;host_gp -</div><div class='add'>+	phba-&gt;pcb-&gt;hgpAddrLow = (bar_low &amp; PCI_BASE_ADDRESS_MEM_MASK) +</div><div class='add'>+		(void __iomem *)phba-&gt;host_gp -</div><div class='ctx'> 		(void __iomem *)phba-&gt;MBslimaddr;</div><div class='ctx'> 	if (bar_low &amp; PCI_BASE_ADDRESS_MEM_TYPE_64)</div><div class='del'>-		phba-&gt;slim2p-&gt;pcb.hgpAddrHigh = bar_high;</div><div class='add'>+		phba-&gt;pcb-&gt;hgpAddrHigh = bar_high;</div><div class='ctx'> 	else</div><div class='del'>-		phba-&gt;slim2p-&gt;pcb.hgpAddrHigh = 0;</div><div class='add'>+		phba-&gt;pcb-&gt;hgpAddrHigh = 0;</div><div class='ctx'> 	/* write HGP data to SLIM at the required longword offset */</div><div class='ctx'> 	memset(&amp;hgp, 0, sizeof(struct lpfc_hgp));</div><div class='ctx'> </div><div class='hunk'>@@ -810,17 +1164,19 @@ lpfc_config_port(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Setup Port Group ring pointer */</div><div class='del'>-	if (phba-&gt;sli_rev == 3)</div><div class='del'>-		pgp_offset = (uint8_t *)&amp;phba-&gt;slim2p-&gt;mbx.us.s3_pgp.port -</div><div class='del'>-			(uint8_t *)phba-&gt;slim2p;</div><div class='del'>-	else</div><div class='del'>-		pgp_offset = (uint8_t *)&amp;phba-&gt;slim2p-&gt;mbx.us.s2.port -</div><div class='del'>-			(uint8_t *)phba-&gt;slim2p;</div><div class='del'>-</div><div class='del'>-	pdma_addr = phba-&gt;slim2p_mapping + pgp_offset;</div><div class='del'>-	phba-&gt;slim2p-&gt;pcb.pgpAddrHigh = putPaddrHigh(pdma_addr);</div><div class='del'>-	phba-&gt;slim2p-&gt;pcb.pgpAddrLow = putPaddrLow(pdma_addr);</div><div class='del'>-	phba-&gt;hbq_get = &amp;phba-&gt;slim2p-&gt;mbx.us.s3_pgp.hbq_get[0];</div><div class='add'>+	if (phba-&gt;sli3_options &amp; LPFC_SLI3_INB_ENABLED) {</div><div class='add'>+		pgp_offset = offsetof(struct lpfc_sli2_slim,</div><div class='add'>+				      mbx.us.s3_inb_pgp.port);</div><div class='add'>+		phba-&gt;hbq_get = phba-&gt;mbox-&gt;us.s3_inb_pgp.hbq_get;</div><div class='add'>+	} else if (phba-&gt;sli_rev == 3) {</div><div class='add'>+		pgp_offset = offsetof(struct lpfc_sli2_slim,</div><div class='add'>+				      mbx.us.s3_pgp.port);</div><div class='add'>+		phba-&gt;hbq_get = phba-&gt;mbox-&gt;us.s3_pgp.hbq_get;</div><div class='add'>+	} else</div><div class='add'>+		pgp_offset = offsetof(struct lpfc_sli2_slim, mbx.us.s2.port);</div><div class='add'>+	pdma_addr = phba-&gt;slim2p.phys + pgp_offset;</div><div class='add'>+	phba-&gt;pcb-&gt;pgpAddrHigh = putPaddrHigh(pdma_addr);</div><div class='add'>+	phba-&gt;pcb-&gt;pgpAddrLow = putPaddrLow(pdma_addr);</div><div class='ctx'> </div><div class='ctx'> 	/* Use callback routine to setp rings in the pcb */</div><div class='ctx'> 	lpfc_config_pcb_setup(phba);</div><div class='hunk'>@@ -835,10 +1191,24 @@ lpfc_config_port(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Swap PCB if needed */</div><div class='del'>-	lpfc_sli_pcimem_bcopy(&amp;phba-&gt;slim2p-&gt;pcb, &amp;phba-&gt;slim2p-&gt;pcb,</div><div class='del'>-			      sizeof(PCB_t));</div><div class='add'>+	lpfc_sli_pcimem_bcopy(phba-&gt;pcb, phba-&gt;pcb, sizeof(PCB_t));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_kill_board: Prepare a mailbox command for killing board.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ * @pmb: pointer to the driver internal queue element for mailbox command.</div><div class='add'>+ *</div><div class='add'>+ * The kill board mailbox command is used to tell firmware to perform a</div><div class='add'>+ * graceful shutdown of a channel on a specified board to prepare for reset.</div><div class='add'>+ * When the kill board mailbox command is received, the ER3 bit is set to 1</div><div class='add'>+ * in the Host Status register and the ER Attention bit is set to 1 in the</div><div class='add'>+ * Host Attention register of the HBA function that received the kill board</div><div class='add'>+ * command.</div><div class='add'>+ *</div><div class='add'>+ * This routine prepares the mailbox command for killing the board in</div><div class='add'>+ * preparation for a graceful shutdown.</div><div class='add'>+ **/</div><div class='ctx'> void</div><div class='ctx'> lpfc_kill_board(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)</div><div class='ctx'> {</div><div class='hunk'>@@ -850,6 +1220,16 @@ lpfc_kill_board(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_mbox_put: Put a mailbox cmd into the tail of driver's mailbox queue.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ * @mbq: pointer to the driver internal queue element for mailbox command.</div><div class='add'>+ *</div><div class='add'>+ * Driver maintains a internal mailbox command queue implemented as a linked</div><div class='add'>+ * list. When a mailbox command is issued, it shall be put into the mailbox</div><div class='add'>+ * command queue such that they shall be processed orderly as HBA can process</div><div class='add'>+ * one mailbox command at a time.</div><div class='add'>+ **/</div><div class='ctx'> void</div><div class='ctx'> lpfc_mbox_put(struct lpfc_hba * phba, LPFC_MBOXQ_t * mbq)</div><div class='ctx'> {</div><div class='hunk'>@@ -864,6 +1244,20 @@ lpfc_mbox_put(struct lpfc_hba * phba, LPFC_MBOXQ_t * mbq)</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_mbox_get: Remove a mailbox cmd from the head of driver's mailbox queue.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ *</div><div class='add'>+ * Driver maintains a internal mailbox command queue implemented as a linked</div><div class='add'>+ * list. When a mailbox command is issued, it shall be put into the mailbox</div><div class='add'>+ * command queue such that they shall be processed orderly as HBA can process</div><div class='add'>+ * one mailbox command at a time. After HBA finished processing a mailbox</div><div class='add'>+ * command, the driver will remove a pending mailbox command from the head of</div><div class='add'>+ * the mailbox command queue and send to the HBA for processing.</div><div class='add'>+ *</div><div class='add'>+ * Return codes</div><div class='add'>+ *    pointer to the driver internal queue element for mailbox command.</div><div class='add'>+ **/</div><div class='ctx'> LPFC_MBOXQ_t *</div><div class='ctx'> lpfc_mbox_get(struct lpfc_hba * phba)</div><div class='ctx'> {</div><div class='hunk'>@@ -877,6 +1271,17 @@ lpfc_mbox_get(struct lpfc_hba * phba)</div><div class='ctx'> 	return mbq;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_mbox_cmpl_put: Put mailbox command into mailbox command complete list.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ * @mbq: pointer to the driver internal queue element for mailbox command.</div><div class='add'>+ *</div><div class='add'>+ * This routine put the completed mailbox command into the mailbox command</div><div class='add'>+ * complete list. This routine is called from driver interrupt handler</div><div class='add'>+ * context.The mailbox complete list is used by the driver worker thread</div><div class='add'>+ * to process mailbox complete callback functions outside the driver interrupt</div><div class='add'>+ * handler.</div><div class='add'>+ **/</div><div class='ctx'> void</div><div class='ctx'> lpfc_mbox_cmpl_put(struct lpfc_hba * phba, LPFC_MBOXQ_t * mbq)</div><div class='ctx'> {</div><div class='hunk'>@@ -887,6 +1292,17 @@ lpfc_mbox_cmpl_put(struct lpfc_hba * phba, LPFC_MBOXQ_t * mbq)</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_mbox_tmo_val: Retrieve mailbox command timeout value.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ * @cmd: mailbox command code.</div><div class='add'>+ *</div><div class='add'>+ * This routine retrieves the proper timeout value according to the mailbox</div><div class='add'>+ * command code.</div><div class='add'>+ *</div><div class='add'>+ * Return codes</div><div class='add'>+ *    Timeout value to be used for the given mailbox command</div><div class='add'>+ **/</div><div class='ctx'> int</div><div class='ctx'> lpfc_mbox_tmo_val(struct lpfc_hba *phba, int cmd)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/scsi/lpfc/lpfc_mem.c b/drivers/scsi/lpfc/lpfc_mem.c<br/>index 3c0cebc71800..a4bba2069248 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/lpfc/lpfc_mem.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/lpfc/lpfc_mem.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/lpfc/lpfc_mem.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/lpfc/lpfc_mem.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*******************************************************************</div><div class='ctx'>  * This file is part of the Emulex Linux Device Driver for         *</div><div class='ctx'>  * Fibre Channel Host Bus Adapters.                                *</div><div class='del'>- * Copyright (C) 2004-2006 Emulex.  All rights reserved.           *</div><div class='add'>+ * Copyright (C) 2004-2008 Emulex.  All rights reserved.           *</div><div class='ctx'>  * EMULEX and SLI are trademarks of Emulex.                        *</div><div class='ctx'>  * www.emulex.com                                                  *</div><div class='ctx'>  * Portions Copyright (C) 2004-2005 Christoph Hellwig              *</div><div class='hunk'>@@ -30,6 +30,7 @@</div><div class='ctx'> </div><div class='ctx'> #include "lpfc_hw.h"</div><div class='ctx'> #include "lpfc_sli.h"</div><div class='add'>+#include "lpfc_nl.h"</div><div class='ctx'> #include "lpfc_disc.h"</div><div class='ctx'> #include "lpfc_scsi.h"</div><div class='ctx'> #include "lpfc.h"</div><div class='hunk'>@@ -39,7 +40,21 @@</div><div class='ctx'> #define LPFC_MEM_POOL_SIZE      64      /* max elem in non-DMA safety pool */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-</div><div class='add'>+/**</div><div class='add'>+ * lpfc_mem_alloc: create and allocate all PCI and memory pools</div><div class='add'>+ * @phba: HBA to allocate pools for</div><div class='add'>+ *</div><div class='add'>+ * Description: Creates and allocates PCI pools lpfc_scsi_dma_buf_pool,</div><div class='add'>+ * lpfc_mbuf_pool, lpfc_hbq_pool.  Creates and allocates kmalloc-backed mempools</div><div class='add'>+ * for LPFC_MBOXQ_t and lpfc_nodelist.  Also allocates the VPI bitmask.</div><div class='add'>+ *</div><div class='add'>+ * Notes: Not interrupt-safe.  Must be called with no locks held.  If any</div><div class='add'>+ * allocation fails, frees all successfully allocated memory before returning.</div><div class='add'>+ *</div><div class='add'>+ * Returns:</div><div class='add'>+ *   0 on success</div><div class='add'>+ *   -ENOMEM on failure (if any memory allocations fail)</div><div class='add'>+ **/</div><div class='ctx'> int</div><div class='ctx'> lpfc_mem_alloc(struct lpfc_hba * phba)</div><div class='ctx'> {</div><div class='hunk'>@@ -120,6 +135,16 @@ lpfc_mem_alloc(struct lpfc_hba * phba)</div><div class='ctx'> 	return -ENOMEM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_mem_free: Frees all PCI and memory allocated by lpfc_mem_alloc</div><div class='add'>+ * @phba: HBA to free memory for</div><div class='add'>+ *</div><div class='add'>+ * Description: Frees PCI pools lpfc_scsi_dma_buf_pool, lpfc_mbuf_pool,</div><div class='add'>+ * lpfc_hbq_pool.  Frees kmalloc-backed mempools for LPFC_MBOXQ_t and</div><div class='add'>+ * lpfc_nodelist.  Also frees the VPI bitmask.</div><div class='add'>+ *</div><div class='add'>+ * Returns: None</div><div class='add'>+ **/</div><div class='ctx'> void</div><div class='ctx'> lpfc_mem_free(struct lpfc_hba * phba)</div><div class='ctx'> {</div><div class='hunk'>@@ -181,12 +206,29 @@ lpfc_mem_free(struct lpfc_hba * phba)</div><div class='ctx'> 	phba-&gt;lpfc_scsi_dma_buf_pool = NULL;</div><div class='ctx'> 	phba-&gt;lpfc_mbuf_pool = NULL;</div><div class='ctx'> </div><div class='del'>-				/* Free the iocb lookup array */</div><div class='add'>+	/* Free the iocb lookup array */</div><div class='ctx'> 	kfree(psli-&gt;iocbq_lookup);</div><div class='ctx'> 	psli-&gt;iocbq_lookup = NULL;</div><div class='del'>-</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_mbuf_alloc: Allocate an mbuf from the lpfc_mbuf_pool PCI pool</div><div class='add'>+ * @phba: HBA which owns the pool to allocate from</div><div class='add'>+ * @mem_flags: indicates if this is a priority (MEM_PRI) allocation</div><div class='add'>+ * @handle: used to return the DMA-mapped address of the mbuf</div><div class='add'>+ *</div><div class='add'>+ * Description: Allocates a DMA-mapped buffer from the lpfc_mbuf_pool PCI pool.</div><div class='add'>+ * Allocates from generic pci_pool_alloc function first and if that fails and</div><div class='add'>+ * mem_flags has MEM_PRI set (the only defined flag), returns an mbuf from the</div><div class='add'>+ * HBA's pool.</div><div class='add'>+ *</div><div class='add'>+ * Notes: Not interrupt-safe.  Must be called with no locks held.  Takes</div><div class='add'>+ * phba-&gt;hbalock.</div><div class='add'>+ *</div><div class='add'>+ * Returns:</div><div class='add'>+ *   pointer to the allocated mbuf on success</div><div class='add'>+ *   NULL on failure</div><div class='add'>+ **/</div><div class='ctx'> void *</div><div class='ctx'> lpfc_mbuf_alloc(struct lpfc_hba *phba, int mem_flags, dma_addr_t *handle)</div><div class='ctx'> {</div><div class='hunk'>@@ -206,6 +248,20 @@ lpfc_mbuf_alloc(struct lpfc_hba *phba, int mem_flags, dma_addr_t *handle)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * __lpfc_mem_free: Free an mbuf from the lpfc_mbuf_pool PCI pool (locked)</div><div class='add'>+ * @phba: HBA which owns the pool to return to</div><div class='add'>+ * @virt: mbuf to free</div><div class='add'>+ * @dma: the DMA-mapped address of the lpfc_mbuf_pool to be freed</div><div class='add'>+ *</div><div class='add'>+ * Description: Returns an mbuf lpfc_mbuf_pool to the lpfc_mbuf_safety_pool if</div><div class='add'>+ * it is below its max_count, frees the mbuf otherwise.</div><div class='add'>+ *</div><div class='add'>+ * Notes: Must be called with phba-&gt;hbalock held to synchronize access to</div><div class='add'>+ * lpfc_mbuf_safety_pool.</div><div class='add'>+ *</div><div class='add'>+ * Returns: None</div><div class='add'>+ **/</div><div class='ctx'> void</div><div class='ctx'> __lpfc_mbuf_free(struct lpfc_hba * phba, void *virt, dma_addr_t dma)</div><div class='ctx'> {</div><div class='hunk'>@@ -221,7 +277,21 @@ __lpfc_mbuf_free(struct lpfc_hba * phba, void *virt, dma_addr_t dma)</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_mem_free: Free an mbuf from the lpfc_mbuf_pool PCI pool (unlocked)</div><div class='add'>+ * @phba: HBA which owns the pool to return to</div><div class='add'>+ * @virt: mbuf to free</div><div class='add'>+ * @dma: the DMA-mapped address of the lpfc_mbuf_pool to be freed</div><div class='add'>+ *</div><div class='add'>+ * Description: Returns an mbuf lpfc_mbuf_pool to the lpfc_mbuf_safety_pool if</div><div class='add'>+ * it is below its max_count, frees the mbuf otherwise.</div><div class='add'>+ *</div><div class='add'>+ * Notes: Takes phba-&gt;hbalock.  Can be called with or without other locks held.</div><div class='add'>+ *</div><div class='add'>+ * Returns: None</div><div class='add'>+ **/</div><div class='ctx'> void</div><div class='add'>+</div><div class='ctx'> lpfc_mbuf_free(struct lpfc_hba * phba, void *virt, dma_addr_t dma)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long iflags;</div><div class='hunk'>@@ -232,6 +302,19 @@ lpfc_mbuf_free(struct lpfc_hba * phba, void *virt, dma_addr_t dma)</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_els_hbq_alloc: Allocate an HBQ buffer</div><div class='add'>+ * @phba: HBA to allocate HBQ buffer for</div><div class='add'>+ *</div><div class='add'>+ * Description: Allocates a DMA-mapped HBQ buffer from the lpfc_hbq_pool PCI</div><div class='add'>+ * pool along a non-DMA-mapped container for it.</div><div class='add'>+ *</div><div class='add'>+ * Notes: Not interrupt-safe.  Must be called with no locks held.</div><div class='add'>+ *</div><div class='add'>+ * Returns:</div><div class='add'>+ *   pointer to HBQ on success</div><div class='add'>+ *   NULL on failure</div><div class='add'>+ **/</div><div class='ctx'> struct hbq_dmabuf *</div><div class='ctx'> lpfc_els_hbq_alloc(struct lpfc_hba *phba)</div><div class='ctx'> {</div><div class='hunk'>@@ -251,6 +334,18 @@ lpfc_els_hbq_alloc(struct lpfc_hba *phba)</div><div class='ctx'> 	return hbqbp;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_mem_hbq_free: Frees an HBQ buffer allocated with lpfc_els_hbq_alloc</div><div class='add'>+ * @phba: HBA buffer was allocated for</div><div class='add'>+ * @hbqbp: HBQ container returned by lpfc_els_hbq_alloc</div><div class='add'>+ *</div><div class='add'>+ * Description: Frees both the container and the DMA-mapped buffer returned by</div><div class='add'>+ * lpfc_els_hbq_alloc.</div><div class='add'>+ *</div><div class='add'>+ * Notes: Can be called with or without locks held.</div><div class='add'>+ *</div><div class='add'>+ * Returns: None</div><div class='add'>+ **/</div><div class='ctx'> void</div><div class='ctx'> lpfc_els_hbq_free(struct lpfc_hba *phba, struct hbq_dmabuf *hbqbp)</div><div class='ctx'> {</div><div class='hunk'>@@ -259,7 +354,18 @@ lpfc_els_hbq_free(struct lpfc_hba *phba, struct hbq_dmabuf *hbqbp)</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* This is ONLY called for the LPFC_ELS_HBQ */</div><div class='add'>+/**</div><div class='add'>+ * lpfc_in_buf_free: Free a DMA buffer</div><div class='add'>+ * @phba: HBA buffer is associated with</div><div class='add'>+ * @mp: Buffer to free</div><div class='add'>+ *</div><div class='add'>+ * Description: Frees the given DMA buffer in the appropriate way given if the</div><div class='add'>+ * HBA is running in SLI3 mode with HBQs enabled.</div><div class='add'>+ *</div><div class='add'>+ * Notes: Takes phba-&gt;hbalock.  Can be called with or without other locks held.</div><div class='add'>+ *</div><div class='add'>+ * Returns: None</div><div class='add'>+ **/</div><div class='ctx'> void</div><div class='ctx'> lpfc_in_buf_free(struct lpfc_hba *phba, struct lpfc_dmabuf *mp)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/scsi/lpfc/lpfc_nl.h b/drivers/scsi/lpfc/lpfc_nl.h<br/>new file mode 100644<br/>index 000000000000..1accb5a9f4e6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/lpfc/lpfc_nl.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/lpfc/lpfc_nl.h</a></div><div class='hunk'>@@ -0,0 +1,163 @@</div><div class='add'>+/*******************************************************************</div><div class='add'>+ * This file is part of the Emulex Linux Device Driver for         *</div><div class='add'>+ * Fibre Channel Host Bus Adapters.                                *</div><div class='add'>+ * Copyright (C) 2008 Emulex.  All rights reserved.                *</div><div class='add'>+ * EMULEX and SLI are trademarks of Emulex.                        *</div><div class='add'>+ * www.emulex.com                                                  *</div><div class='add'>+ *                                                                 *</div><div class='add'>+ * This program is free software; you can redistribute it and/or   *</div><div class='add'>+ * modify it under the terms of version 2 of the GNU General       *</div><div class='add'>+ * Public License as published by the Free Software Foundation.    *</div><div class='add'>+ * This program is distributed in the hope that it will be useful. *</div><div class='add'>+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND          *</div><div class='add'>+ * WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY,  *</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT, ARE      *</div><div class='add'>+ * DISCLAIMED, EXCEPT TO THE EXTENT THAT SUCH DISCLAIMERS ARE HELD *</div><div class='add'>+ * TO BE LEGALLY INVALID.  See the GNU General Public License for  *</div><div class='add'>+ * more details, a copy of which can be found in the file COPYING  *</div><div class='add'>+ * included with this package.                                     *</div><div class='add'>+ *******************************************************************/</div><div class='add'>+</div><div class='add'>+/* Event definitions for RegisterForEvent */</div><div class='add'>+#define FC_REG_LINK_EVENT		0x0001	/* link up / down events */</div><div class='add'>+#define FC_REG_RSCN_EVENT		0x0002	/* RSCN events */</div><div class='add'>+#define FC_REG_CT_EVENT			0x0004	/* CT request events */</div><div class='add'>+#define FC_REG_DUMP_EVENT		0x0008	/* Dump events */</div><div class='add'>+#define FC_REG_TEMPERATURE_EVENT	0x0010	/* temperature events */</div><div class='add'>+#define FC_REG_ELS_EVENT		0x0020	/* lpfc els events */</div><div class='add'>+#define FC_REG_FABRIC_EVENT		0x0040	/* lpfc fabric events */</div><div class='add'>+#define FC_REG_SCSI_EVENT		0x0080	/* lpfc scsi events */</div><div class='add'>+#define FC_REG_BOARD_EVENT		0x0100	/* lpfc board events */</div><div class='add'>+#define FC_REG_ADAPTER_EVENT		0x0200	/* lpfc adapter events */</div><div class='add'>+#define FC_REG_EVENT_MASK		(FC_REG_LINK_EVENT | \</div><div class='add'>+						FC_REG_RSCN_EVENT | \</div><div class='add'>+						FC_REG_CT_EVENT | \</div><div class='add'>+						FC_REG_DUMP_EVENT | \</div><div class='add'>+						FC_REG_TEMPERATURE_EVENT | \</div><div class='add'>+						FC_REG_ELS_EVENT | \</div><div class='add'>+						FC_REG_FABRIC_EVENT | \</div><div class='add'>+						FC_REG_SCSI_EVENT | \</div><div class='add'>+						FC_REG_BOARD_EVENT | \</div><div class='add'>+						FC_REG_ADAPTER_EVENT)</div><div class='add'>+/* Temperature events */</div><div class='add'>+#define LPFC_CRIT_TEMP		0x1</div><div class='add'>+#define LPFC_THRESHOLD_TEMP	0x2</div><div class='add'>+#define LPFC_NORMAL_TEMP	0x3</div><div class='add'>+/*</div><div class='add'>+ * All net link event payloads will begin with and event type</div><div class='add'>+ * and subcategory. The event type must come first.</div><div class='add'>+ * The subcategory further defines the data that follows in the rest</div><div class='add'>+ * of the payload. Each category will have its own unique header plus</div><div class='add'>+ * any addtional data unique to the subcategory.</div><div class='add'>+ * The payload sent via the fc transport is one-way driver-&gt;application.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* els event header */</div><div class='add'>+struct lpfc_els_event_header {</div><div class='add'>+	uint32_t event_type;</div><div class='add'>+	uint32_t subcategory;</div><div class='add'>+	uint8_t wwpn[8];</div><div class='add'>+	uint8_t wwnn[8];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* subcategory codes for FC_REG_ELS_EVENT */</div><div class='add'>+#define LPFC_EVENT_PLOGI_RCV		0x01</div><div class='add'>+#define LPFC_EVENT_PRLO_RCV		0x02</div><div class='add'>+#define LPFC_EVENT_ADISC_RCV		0x04</div><div class='add'>+#define LPFC_EVENT_LSRJT_RCV		0x08</div><div class='add'>+</div><div class='add'>+/* special els lsrjt event */</div><div class='add'>+struct lpfc_lsrjt_event {</div><div class='add'>+	struct lpfc_els_event_header header;</div><div class='add'>+	uint32_t command;</div><div class='add'>+	uint32_t reason_code;</div><div class='add'>+	uint32_t explanation;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* fabric event header */</div><div class='add'>+struct lpfc_fabric_event_header {</div><div class='add'>+	uint32_t event_type;</div><div class='add'>+	uint32_t subcategory;</div><div class='add'>+	uint8_t wwpn[8];</div><div class='add'>+	uint8_t wwnn[8];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* subcategory codes for FC_REG_FABRIC_EVENT */</div><div class='add'>+#define LPFC_EVENT_FABRIC_BUSY		0x01</div><div class='add'>+#define LPFC_EVENT_PORT_BUSY		0x02</div><div class='add'>+#define LPFC_EVENT_FCPRDCHKERR		0x04</div><div class='add'>+</div><div class='add'>+/* special case fabric fcprdchkerr event */</div><div class='add'>+struct lpfc_fcprdchkerr_event {</div><div class='add'>+	struct lpfc_fabric_event_header header;</div><div class='add'>+	uint32_t lun;</div><div class='add'>+	uint32_t opcode;</div><div class='add'>+	uint32_t fcpiparam;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* scsi event header */</div><div class='add'>+struct lpfc_scsi_event_header {</div><div class='add'>+	uint32_t event_type;</div><div class='add'>+	uint32_t subcategory;</div><div class='add'>+	uint32_t lun;</div><div class='add'>+	uint8_t wwpn[8];</div><div class='add'>+	uint8_t wwnn[8];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* subcategory codes for FC_REG_SCSI_EVENT */</div><div class='add'>+#define LPFC_EVENT_QFULL	0x0001</div><div class='add'>+#define LPFC_EVENT_DEVBSY	0x0002</div><div class='add'>+#define LPFC_EVENT_CHECK_COND	0x0004</div><div class='add'>+#define LPFC_EVENT_LUNRESET	0x0008</div><div class='add'>+#define LPFC_EVENT_TGTRESET	0x0010</div><div class='add'>+#define LPFC_EVENT_BUSRESET	0x0020</div><div class='add'>+#define LPFC_EVENT_VARQUEDEPTH	0x0040</div><div class='add'>+</div><div class='add'>+/* special case scsi varqueuedepth event */</div><div class='add'>+struct lpfc_scsi_varqueuedepth_event {</div><div class='add'>+	struct lpfc_scsi_event_header scsi_event;</div><div class='add'>+	uint32_t oldval;</div><div class='add'>+	uint32_t newval;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* special case scsi check condition event */</div><div class='add'>+struct lpfc_scsi_check_condition_event {</div><div class='add'>+	struct lpfc_scsi_event_header scsi_event;</div><div class='add'>+	uint8_t sense_key;</div><div class='add'>+	uint8_t asc;</div><div class='add'>+	uint8_t ascq;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* event codes for FC_REG_BOARD_EVENT */</div><div class='add'>+#define LPFC_EVENT_PORTINTERR		0x01</div><div class='add'>+</div><div class='add'>+/* board event header */</div><div class='add'>+struct lpfc_board_event_header {</div><div class='add'>+	uint32_t event_type;</div><div class='add'>+	uint32_t subcategory;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* event codes for FC_REG_ADAPTER_EVENT */</div><div class='add'>+#define LPFC_EVENT_ARRIVAL	0x01</div><div class='add'>+</div><div class='add'>+/* adapter event header */</div><div class='add'>+struct lpfc_adapter_event_header {</div><div class='add'>+	uint32_t event_type;</div><div class='add'>+	uint32_t subcategory;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* event codes for temp_event */</div><div class='add'>+#define LPFC_CRIT_TEMP		0x1</div><div class='add'>+#define LPFC_THRESHOLD_TEMP	0x2</div><div class='add'>+#define LPFC_NORMAL_TEMP	0x3</div><div class='add'>+</div><div class='add'>+struct temp_event {</div><div class='add'>+	uint32_t event_type;</div><div class='add'>+	uint32_t event_code;</div><div class='add'>+	uint32_t data;</div><div class='add'>+};</div><div class='add'>+</div><div class='head'>diff --git a/drivers/scsi/lpfc/lpfc_nportdisc.c b/drivers/scsi/lpfc/lpfc_nportdisc.c<br/>index 6688a8689b56..0c25d97acb42 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/lpfc/lpfc_nportdisc.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/lpfc/lpfc_nportdisc.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/lpfc/lpfc_nportdisc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/lpfc/lpfc_nportdisc.c</a></div><div class='hunk'>@@ -30,6 +30,7 @@</div><div class='ctx'> </div><div class='ctx'> #include "lpfc_hw.h"</div><div class='ctx'> #include "lpfc_sli.h"</div><div class='add'>+#include "lpfc_nl.h"</div><div class='ctx'> #include "lpfc_disc.h"</div><div class='ctx'> #include "lpfc_scsi.h"</div><div class='ctx'> #include "lpfc.h"</div><div class='hunk'>@@ -1003,20 +1004,8 @@ lpfc_rcv_plogi_adisc_issue(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,</div><div class='ctx'> 			spin_lock_irq(shost-&gt;host_lock);</div><div class='ctx'> 			ndlp-&gt;nlp_flag &amp;= ~NLP_NPR_2B_DISC;</div><div class='ctx'> 			spin_unlock_irq(shost-&gt;host_lock);</div><div class='del'>-</div><div class='del'>-			if (vport-&gt;num_disc_nodes) {</div><div class='add'>+			if (vport-&gt;num_disc_nodes)</div><div class='ctx'> 				lpfc_more_adisc(vport);</div><div class='del'>-				if ((vport-&gt;num_disc_nodes == 0) &amp;&amp;</div><div class='del'>-				    (vport-&gt;fc_npr_cnt))</div><div class='del'>-					lpfc_els_disc_plogi(vport);</div><div class='del'>-				if (vport-&gt;num_disc_nodes == 0) {</div><div class='del'>-					spin_lock_irq(shost-&gt;host_lock);</div><div class='del'>-					vport-&gt;fc_flag &amp;= ~FC_NDISC_ACTIVE;</div><div class='del'>-					spin_unlock_irq(shost-&gt;host_lock);</div><div class='del'>-					lpfc_can_disctmo(vport);</div><div class='del'>-					lpfc_end_rscn(vport);</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='ctx'> 		}</div><div class='ctx'> 		return ndlp-&gt;nlp_state;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1865,8 +1854,13 @@ static uint32_t</div><div class='ctx'> lpfc_cmpl_logo_npr_node(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,</div><div class='ctx'> 			void *arg, uint32_t evt)</div><div class='ctx'> {</div><div class='add'>+	struct Scsi_Host *shost = lpfc_shost_from_vport(vport);</div><div class='add'>+	if (ndlp-&gt;nlp_DID == Fabric_DID) {</div><div class='add'>+		spin_lock_irq(shost-&gt;host_lock);</div><div class='add'>+		vport-&gt;fc_flag &amp;= ~(FC_FABRIC | FC_PUBLIC_LOOP);</div><div class='add'>+		spin_unlock_irq(shost-&gt;host_lock);</div><div class='add'>+	}</div><div class='ctx'> 	lpfc_unreg_rpi(vport, ndlp);</div><div class='del'>-	/* This routine does nothing, just return the current state */</div><div class='ctx'> 	return ndlp-&gt;nlp_state;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2155,7 +2149,7 @@ lpfc_disc_state_machine(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,</div><div class='ctx'> 		lpfc_nlp_put(ndlp);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		lpfc_printf_vlog(vport, KERN_INFO, LOG_DISCOVERY,</div><div class='del'>-			"0212 DSM out state %d on NPort free\n", rc);</div><div class='add'>+			"0213 DSM out state %d on NPort free\n", rc);</div><div class='ctx'> </div><div class='ctx'> 		lpfc_debugfs_disc_trc(vport, LPFC_DISC_TRC_DSM,</div><div class='ctx'> 			"DSM out:         ste:%d did:x%x flg:x%x",</div><div class='head'>diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c<br/>index 1bcebbd3dfac..bd1867411821 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/lpfc/lpfc_scsi.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/lpfc/lpfc_scsi.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/lpfc/lpfc_scsi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/lpfc/lpfc_scsi.c</a></div><div class='hunk'>@@ -32,6 +32,7 @@</div><div class='ctx'> #include "lpfc_version.h"</div><div class='ctx'> #include "lpfc_hw.h"</div><div class='ctx'> #include "lpfc_sli.h"</div><div class='add'>+#include "lpfc_nl.h"</div><div class='ctx'> #include "lpfc_disc.h"</div><div class='ctx'> #include "lpfc_scsi.h"</div><div class='ctx'> #include "lpfc.h"</div><div class='hunk'>@@ -42,6 +43,111 @@</div><div class='ctx'> #define LPFC_RESET_WAIT  2</div><div class='ctx'> #define LPFC_ABORT_WAIT  2</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_update_stats: Update statistical data for the command completion.</div><div class='add'>+ * @phba: Pointer to HBA object.</div><div class='add'>+ * @lpfc_cmd: lpfc scsi command object pointer.</div><div class='add'>+ *</div><div class='add'>+ * This function is called when there is a command completion and this</div><div class='add'>+ * function updates the statistical data for the command completion.</div><div class='add'>+ **/</div><div class='add'>+static void</div><div class='add'>+lpfc_update_stats(struct lpfc_hba *phba, struct  lpfc_scsi_buf *lpfc_cmd)</div><div class='add'>+{</div><div class='add'>+	struct lpfc_rport_data *rdata = lpfc_cmd-&gt;rdata;</div><div class='add'>+	struct lpfc_nodelist *pnode = rdata-&gt;pnode;</div><div class='add'>+	struct scsi_cmnd *cmd = lpfc_cmd-&gt;pCmd;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	struct Scsi_Host  *shost = cmd-&gt;device-&gt;host;</div><div class='add'>+	struct lpfc_vport *vport = (struct lpfc_vport *) shost-&gt;hostdata;</div><div class='add'>+	unsigned long latency;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (cmd-&gt;result)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(shost-&gt;host_lock, flags);</div><div class='add'>+	if (!vport-&gt;stat_data_enabled ||</div><div class='add'>+		vport-&gt;stat_data_blocked ||</div><div class='add'>+		!pnode-&gt;lat_data ||</div><div class='add'>+		(phba-&gt;bucket_type == LPFC_NO_BUCKET)) {</div><div class='add'>+		spin_unlock_irqrestore(shost-&gt;host_lock, flags);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	latency = jiffies_to_msecs(jiffies - lpfc_cmd-&gt;start_time);</div><div class='add'>+</div><div class='add'>+	if (phba-&gt;bucket_type == LPFC_LINEAR_BUCKET) {</div><div class='add'>+		i = (latency + phba-&gt;bucket_step - 1 - phba-&gt;bucket_base)/</div><div class='add'>+			phba-&gt;bucket_step;</div><div class='add'>+		if (i &gt;= LPFC_MAX_BUCKET_COUNT)</div><div class='add'>+			i = LPFC_MAX_BUCKET_COUNT;</div><div class='add'>+	} else {</div><div class='add'>+		for (i = 0; i &lt; LPFC_MAX_BUCKET_COUNT-1; i++)</div><div class='add'>+			if (latency &lt;= (phba-&gt;bucket_base +</div><div class='add'>+				((1&lt;&lt;i)*phba-&gt;bucket_step)))</div><div class='add'>+				break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pnode-&gt;lat_data[i].cmd_count++;</div><div class='add'>+	spin_unlock_irqrestore(shost-&gt;host_lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * lpfc_send_sdev_queuedepth_change_event: Posts a queuedepth change</div><div class='add'>+ *                   event.</div><div class='add'>+ * @phba: Pointer to HBA context object.</div><div class='add'>+ * @vport: Pointer to vport object.</div><div class='add'>+ * @ndlp: Pointer to FC node associated with the target.</div><div class='add'>+ * @lun: Lun number of the scsi device.</div><div class='add'>+ * @old_val: Old value of the queue depth.</div><div class='add'>+ * @new_val: New value of the queue depth.</div><div class='add'>+ *</div><div class='add'>+ * This function sends an event to the mgmt application indicating</div><div class='add'>+ * there is a change in the scsi device queue depth.</div><div class='add'>+ **/</div><div class='add'>+static void</div><div class='add'>+lpfc_send_sdev_queuedepth_change_event(struct lpfc_hba *phba,</div><div class='add'>+		struct lpfc_vport  *vport,</div><div class='add'>+		struct lpfc_nodelist *ndlp,</div><div class='add'>+		uint32_t lun,</div><div class='add'>+		uint32_t old_val,</div><div class='add'>+		uint32_t new_val)</div><div class='add'>+{</div><div class='add'>+	struct lpfc_fast_path_event *fast_path_evt;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	fast_path_evt = lpfc_alloc_fast_evt(phba);</div><div class='add'>+	if (!fast_path_evt)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	fast_path_evt-&gt;un.queue_depth_evt.scsi_event.event_type =</div><div class='add'>+		FC_REG_SCSI_EVENT;</div><div class='add'>+	fast_path_evt-&gt;un.queue_depth_evt.scsi_event.subcategory =</div><div class='add'>+		LPFC_EVENT_VARQUEDEPTH;</div><div class='add'>+</div><div class='add'>+	/* Report all luns with change in queue depth */</div><div class='add'>+	fast_path_evt-&gt;un.queue_depth_evt.scsi_event.lun = lun;</div><div class='add'>+	if (ndlp &amp;&amp; NLP_CHK_NODE_ACT(ndlp)) {</div><div class='add'>+		memcpy(&amp;fast_path_evt-&gt;un.queue_depth_evt.scsi_event.wwpn,</div><div class='add'>+			&amp;ndlp-&gt;nlp_portname, sizeof(struct lpfc_name));</div><div class='add'>+		memcpy(&amp;fast_path_evt-&gt;un.queue_depth_evt.scsi_event.wwnn,</div><div class='add'>+			&amp;ndlp-&gt;nlp_nodename, sizeof(struct lpfc_name));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fast_path_evt-&gt;un.queue_depth_evt.oldval = old_val;</div><div class='add'>+	fast_path_evt-&gt;un.queue_depth_evt.newval = new_val;</div><div class='add'>+	fast_path_evt-&gt;vport = vport;</div><div class='add'>+</div><div class='add'>+	fast_path_evt-&gt;work_evt.evt = LPFC_EVT_FASTPATH_MGMT_EVT;</div><div class='add'>+	spin_lock_irqsave(&amp;phba-&gt;hbalock, flags);</div><div class='add'>+	list_add_tail(&amp;fast_path_evt-&gt;work_evt.evt_listp, &amp;phba-&gt;work_list);</div><div class='add'>+	spin_unlock_irqrestore(&amp;phba-&gt;hbalock, flags);</div><div class='add'>+	lpfc_worker_wake_up(phba);</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * This function is called with no lock held when there is a resource</div><div class='ctx'>  * error in driver or in firmware.</div><div class='hunk'>@@ -117,9 +223,10 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)</div><div class='ctx'> 	struct lpfc_vport **vports;</div><div class='ctx'> 	struct Scsi_Host  *shost;</div><div class='ctx'> 	struct scsi_device *sdev;</div><div class='del'>-	unsigned long new_queue_depth;</div><div class='add'>+	unsigned long new_queue_depth, old_queue_depth;</div><div class='ctx'> 	unsigned long num_rsrc_err, num_cmd_success;</div><div class='ctx'> 	int i;</div><div class='add'>+	struct lpfc_rport_data *rdata;</div><div class='ctx'> </div><div class='ctx'> 	num_rsrc_err = atomic_read(&amp;phba-&gt;num_rsrc_err);</div><div class='ctx'> 	num_cmd_success = atomic_read(&amp;phba-&gt;num_cmd_success);</div><div class='hunk'>@@ -137,6 +244,7 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)</div><div class='ctx'> 				else</div><div class='ctx'> 					new_queue_depth = sdev-&gt;queue_depth -</div><div class='ctx'> 								new_queue_depth;</div><div class='add'>+				old_queue_depth = sdev-&gt;queue_depth;</div><div class='ctx'> 				if (sdev-&gt;ordered_tags)</div><div class='ctx'> 					scsi_adjust_queue_depth(sdev,</div><div class='ctx'> 							MSG_ORDERED_TAG,</div><div class='hunk'>@@ -145,6 +253,13 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)</div><div class='ctx'> 					scsi_adjust_queue_depth(sdev,</div><div class='ctx'> 							MSG_SIMPLE_TAG,</div><div class='ctx'> 							new_queue_depth);</div><div class='add'>+				rdata = sdev-&gt;hostdata;</div><div class='add'>+				if (rdata)</div><div class='add'>+					lpfc_send_sdev_queuedepth_change_event(</div><div class='add'>+						phba, vports[i],</div><div class='add'>+						rdata-&gt;pnode,</div><div class='add'>+						sdev-&gt;lun, old_queue_depth,</div><div class='add'>+						new_queue_depth);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	lpfc_destroy_vport_work_array(phba, vports);</div><div class='hunk'>@@ -159,6 +274,7 @@ lpfc_ramp_up_queue_handler(struct lpfc_hba *phba)</div><div class='ctx'> 	struct Scsi_Host  *shost;</div><div class='ctx'> 	struct scsi_device *sdev;</div><div class='ctx'> 	int i;</div><div class='add'>+	struct lpfc_rport_data *rdata;</div><div class='ctx'> </div><div class='ctx'> 	vports = lpfc_create_vport_work_array(phba);</div><div class='ctx'> 	if (vports != NULL)</div><div class='hunk'>@@ -176,6 +292,14 @@ lpfc_ramp_up_queue_handler(struct lpfc_hba *phba)</div><div class='ctx'> 					scsi_adjust_queue_depth(sdev,</div><div class='ctx'> 							MSG_SIMPLE_TAG,</div><div class='ctx'> 							sdev-&gt;queue_depth+1);</div><div class='add'>+				rdata = sdev-&gt;hostdata;</div><div class='add'>+				if (rdata)</div><div class='add'>+					lpfc_send_sdev_queuedepth_change_event(</div><div class='add'>+						phba, vports[i],</div><div class='add'>+						rdata-&gt;pnode,</div><div class='add'>+						sdev-&gt;lun,</div><div class='add'>+						sdev-&gt;queue_depth - 1,</div><div class='add'>+						sdev-&gt;queue_depth);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	lpfc_destroy_vport_work_array(phba, vports);</div><div class='hunk'>@@ -183,6 +307,35 @@ lpfc_ramp_up_queue_handler(struct lpfc_hba *phba)</div><div class='ctx'> 	atomic_set(&amp;phba-&gt;num_cmd_success, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_scsi_dev_block: set all scsi hosts to block state.</div><div class='add'>+ * @phba: Pointer to HBA context object.</div><div class='add'>+ *</div><div class='add'>+ * This function walks vport list and set each SCSI host to block state</div><div class='add'>+ * by invoking fc_remote_port_delete() routine. This function is invoked</div><div class='add'>+ * with EEH when device's PCI slot has been permanently disabled.</div><div class='add'>+ **/</div><div class='add'>+void</div><div class='add'>+lpfc_scsi_dev_block(struct lpfc_hba *phba)</div><div class='add'>+{</div><div class='add'>+	struct lpfc_vport **vports;</div><div class='add'>+	struct Scsi_Host  *shost;</div><div class='add'>+	struct scsi_device *sdev;</div><div class='add'>+	struct fc_rport *rport;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	vports = lpfc_create_vport_work_array(phba);</div><div class='add'>+	if (vports != NULL)</div><div class='add'>+		for (i = 0; i &lt;= phba-&gt;max_vpi &amp;&amp; vports[i] != NULL; i++) {</div><div class='add'>+			shost = lpfc_shost_from_vport(vports[i]);</div><div class='add'>+			shost_for_each_device(sdev, shost) {</div><div class='add'>+				rport = starget_to_rport(scsi_target(sdev));</div><div class='add'>+				fc_remote_port_delete(rport);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	lpfc_destroy_vport_work_array(phba, vports);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * This routine allocates a scsi buffer, which contains all the necessary</div><div class='ctx'>  * information needed to initiate a SCSI I/O.  The non-DMAable buffer region</div><div class='hunk'>@@ -198,7 +351,9 @@ lpfc_new_scsi_buf(struct lpfc_vport *vport)</div><div class='ctx'> 	struct lpfc_scsi_buf *psb;</div><div class='ctx'> 	struct ulp_bde64 *bpl;</div><div class='ctx'> 	IOCB_t *iocb;</div><div class='del'>-	dma_addr_t pdma_phys;</div><div class='add'>+	dma_addr_t pdma_phys_fcp_cmd;</div><div class='add'>+	dma_addr_t pdma_phys_fcp_rsp;</div><div class='add'>+	dma_addr_t pdma_phys_bpl;</div><div class='ctx'> 	uint16_t iotag;</div><div class='ctx'> </div><div class='ctx'> 	psb = kzalloc(sizeof(struct lpfc_scsi_buf), GFP_KERNEL);</div><div class='hunk'>@@ -238,40 +393,60 @@ lpfc_new_scsi_buf(struct lpfc_vport *vport)</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize local short-hand pointers. */</div><div class='ctx'> 	bpl = psb-&gt;fcp_bpl;</div><div class='del'>-	pdma_phys = psb-&gt;dma_handle;</div><div class='add'>+	pdma_phys_fcp_cmd = psb-&gt;dma_handle;</div><div class='add'>+	pdma_phys_fcp_rsp = psb-&gt;dma_handle + sizeof(struct fcp_cmnd);</div><div class='add'>+	pdma_phys_bpl = psb-&gt;dma_handle + sizeof(struct fcp_cmnd) +</div><div class='add'>+			sizeof(struct fcp_rsp);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The first two bdes are the FCP_CMD and FCP_RSP.  The balance are sg</div><div class='ctx'> 	 * list bdes.  Initialize the first two and leave the rest for</div><div class='ctx'> 	 * queuecommand.</div><div class='ctx'> 	 */</div><div class='del'>-	bpl-&gt;addrHigh = le32_to_cpu(putPaddrHigh(pdma_phys));</div><div class='del'>-	bpl-&gt;addrLow = le32_to_cpu(putPaddrLow(pdma_phys));</div><div class='del'>-	bpl-&gt;tus.f.bdeSize = sizeof (struct fcp_cmnd);</div><div class='del'>-	bpl-&gt;tus.f.bdeFlags = BUFF_USE_CMND;</div><div class='del'>-	bpl-&gt;tus.w = le32_to_cpu(bpl-&gt;tus.w);</div><div class='del'>-	bpl++;</div><div class='add'>+	bpl[0].addrHigh = le32_to_cpu(putPaddrHigh(pdma_phys_fcp_cmd));</div><div class='add'>+	bpl[0].addrLow = le32_to_cpu(putPaddrLow(pdma_phys_fcp_cmd));</div><div class='add'>+	bpl[0].tus.f.bdeSize = sizeof(struct fcp_cmnd);</div><div class='add'>+	bpl[0].tus.f.bdeFlags = BUFF_TYPE_BDE_64;</div><div class='add'>+	bpl[0].tus.w = le32_to_cpu(bpl-&gt;tus.w);</div><div class='ctx'> </div><div class='ctx'> 	/* Setup the physical region for the FCP RSP */</div><div class='del'>-	pdma_phys += sizeof (struct fcp_cmnd);</div><div class='del'>-	bpl-&gt;addrHigh = le32_to_cpu(putPaddrHigh(pdma_phys));</div><div class='del'>-	bpl-&gt;addrLow = le32_to_cpu(putPaddrLow(pdma_phys));</div><div class='del'>-	bpl-&gt;tus.f.bdeSize = sizeof (struct fcp_rsp);</div><div class='del'>-	bpl-&gt;tus.f.bdeFlags = (BUFF_USE_CMND | BUFF_USE_RCV);</div><div class='del'>-	bpl-&gt;tus.w = le32_to_cpu(bpl-&gt;tus.w);</div><div class='add'>+	bpl[1].addrHigh = le32_to_cpu(putPaddrHigh(pdma_phys_fcp_rsp));</div><div class='add'>+	bpl[1].addrLow = le32_to_cpu(putPaddrLow(pdma_phys_fcp_rsp));</div><div class='add'>+	bpl[1].tus.f.bdeSize = sizeof(struct fcp_rsp);</div><div class='add'>+	bpl[1].tus.f.bdeFlags = BUFF_TYPE_BDE_64;</div><div class='add'>+	bpl[1].tus.w = le32_to_cpu(bpl-&gt;tus.w);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Since the IOCB for the FCP I/O is built into this lpfc_scsi_buf,</div><div class='ctx'> 	 * initialize it with all known data now.</div><div class='ctx'> 	 */</div><div class='del'>-	pdma_phys += (sizeof (struct fcp_rsp));</div><div class='ctx'> 	iocb = &amp;psb-&gt;cur_iocbq.iocb;</div><div class='ctx'> 	iocb-&gt;un.fcpi64.bdl.ulpIoTag32 = 0;</div><div class='del'>-	iocb-&gt;un.fcpi64.bdl.addrHigh = putPaddrHigh(pdma_phys);</div><div class='del'>-	iocb-&gt;un.fcpi64.bdl.addrLow = putPaddrLow(pdma_phys);</div><div class='del'>-	iocb-&gt;un.fcpi64.bdl.bdeSize = (2 * sizeof (struct ulp_bde64));</div><div class='del'>-	iocb-&gt;un.fcpi64.bdl.bdeFlags = BUFF_TYPE_BDL;</div><div class='del'>-	iocb-&gt;ulpBdeCount = 1;</div><div class='add'>+	if (phba-&gt;sli_rev == 3) {</div><div class='add'>+		/* fill in immediate fcp command BDE */</div><div class='add'>+		iocb-&gt;un.fcpi64.bdl.bdeFlags = BUFF_TYPE_BDE_IMMED;</div><div class='add'>+		iocb-&gt;un.fcpi64.bdl.bdeSize = sizeof(struct fcp_cmnd);</div><div class='add'>+		iocb-&gt;un.fcpi64.bdl.addrLow = offsetof(IOCB_t,</div><div class='add'>+						       unsli3.fcp_ext.icd);</div><div class='add'>+		iocb-&gt;un.fcpi64.bdl.addrHigh = 0;</div><div class='add'>+		iocb-&gt;ulpBdeCount = 0;</div><div class='add'>+		iocb-&gt;ulpLe = 0;</div><div class='add'>+		/* fill in responce BDE */</div><div class='add'>+		iocb-&gt;unsli3.fcp_ext.rbde.tus.f.bdeFlags = BUFF_TYPE_BDE_64;</div><div class='add'>+		iocb-&gt;unsli3.fcp_ext.rbde.tus.f.bdeSize =</div><div class='add'>+						sizeof(struct fcp_rsp);</div><div class='add'>+		iocb-&gt;unsli3.fcp_ext.rbde.addrLow =</div><div class='add'>+						putPaddrLow(pdma_phys_fcp_rsp);</div><div class='add'>+		iocb-&gt;unsli3.fcp_ext.rbde.addrHigh =</div><div class='add'>+						putPaddrHigh(pdma_phys_fcp_rsp);</div><div class='add'>+	} else {</div><div class='add'>+		iocb-&gt;un.fcpi64.bdl.bdeFlags = BUFF_TYPE_BLP_64;</div><div class='add'>+		iocb-&gt;un.fcpi64.bdl.bdeSize = (2 * sizeof(struct ulp_bde64));</div><div class='add'>+		iocb-&gt;un.fcpi64.bdl.addrLow = putPaddrLow(pdma_phys_bpl);</div><div class='add'>+		iocb-&gt;un.fcpi64.bdl.addrHigh = putPaddrHigh(pdma_phys_bpl);</div><div class='add'>+		iocb-&gt;ulpBdeCount = 1;</div><div class='add'>+		iocb-&gt;ulpLe = 1;</div><div class='add'>+	}</div><div class='ctx'> 	iocb-&gt;ulpClass = CLASS3;</div><div class='ctx'> </div><div class='ctx'> 	return psb;</div><div class='hunk'>@@ -313,8 +488,9 @@ lpfc_scsi_prep_dma_buf(struct lpfc_hba *phba, struct lpfc_scsi_buf *lpfc_cmd)</div><div class='ctx'> 	struct fcp_cmnd *fcp_cmnd = lpfc_cmd-&gt;fcp_cmnd;</div><div class='ctx'> 	struct ulp_bde64 *bpl = lpfc_cmd-&gt;fcp_bpl;</div><div class='ctx'> 	IOCB_t *iocb_cmd = &amp;lpfc_cmd-&gt;cur_iocbq.iocb;</div><div class='add'>+	struct ulp_bde64 *data_bde = iocb_cmd-&gt;unsli3.fcp_ext.dbde;</div><div class='ctx'> 	dma_addr_t physaddr;</div><div class='del'>-	uint32_t i, num_bde = 0;</div><div class='add'>+	uint32_t num_bde = 0;</div><div class='ctx'> 	int nseg, datadir = scsi_cmnd-&gt;sc_data_direction;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -352,37 +528,159 @@ lpfc_scsi_prep_dma_buf(struct lpfc_hba *phba, struct lpfc_scsi_buf *lpfc_cmd)</div><div class='ctx'> 		 * during probe that limits the number of sg elements in any</div><div class='ctx'> 		 * single scsi command.  Just run through the seg_cnt and format</div><div class='ctx'> 		 * the bde's.</div><div class='add'>+		 * When using SLI-3 the driver will try to fit all the BDEs into</div><div class='add'>+		 * the IOCB. If it can't then the BDEs get added to a BPL as it</div><div class='add'>+		 * does for SLI-2 mode.</div><div class='ctx'> 		 */</div><div class='del'>-		scsi_for_each_sg(scsi_cmnd, sgel, nseg, i) {</div><div class='add'>+		scsi_for_each_sg(scsi_cmnd, sgel, nseg, num_bde) {</div><div class='ctx'> 			physaddr = sg_dma_address(sgel);</div><div class='del'>-			bpl-&gt;addrLow = le32_to_cpu(putPaddrLow(physaddr));</div><div class='del'>-			bpl-&gt;addrHigh = le32_to_cpu(putPaddrHigh(physaddr));</div><div class='del'>-			bpl-&gt;tus.f.bdeSize = sg_dma_len(sgel);</div><div class='del'>-			if (datadir == DMA_TO_DEVICE)</div><div class='del'>-				bpl-&gt;tus.f.bdeFlags = 0;</div><div class='del'>-			else</div><div class='del'>-				bpl-&gt;tus.f.bdeFlags = BUFF_USE_RCV;</div><div class='del'>-			bpl-&gt;tus.w = le32_to_cpu(bpl-&gt;tus.w);</div><div class='del'>-			bpl++;</div><div class='del'>-			num_bde++;</div><div class='add'>+			if (phba-&gt;sli_rev == 3 &amp;&amp;</div><div class='add'>+			    nseg &lt;= LPFC_EXT_DATA_BDE_COUNT) {</div><div class='add'>+				data_bde-&gt;tus.f.bdeFlags = BUFF_TYPE_BDE_64;</div><div class='add'>+				data_bde-&gt;tus.f.bdeSize = sg_dma_len(sgel);</div><div class='add'>+				data_bde-&gt;addrLow = putPaddrLow(physaddr);</div><div class='add'>+				data_bde-&gt;addrHigh = putPaddrHigh(physaddr);</div><div class='add'>+				data_bde++;</div><div class='add'>+			} else {</div><div class='add'>+				bpl-&gt;tus.f.bdeFlags = BUFF_TYPE_BDE_64;</div><div class='add'>+				bpl-&gt;tus.f.bdeSize = sg_dma_len(sgel);</div><div class='add'>+				bpl-&gt;tus.w = le32_to_cpu(bpl-&gt;tus.w);</div><div class='add'>+				bpl-&gt;addrLow =</div><div class='add'>+					le32_to_cpu(putPaddrLow(physaddr));</div><div class='add'>+				bpl-&gt;addrHigh =</div><div class='add'>+					le32_to_cpu(putPaddrHigh(physaddr));</div><div class='add'>+				bpl++;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Finish initializing those IOCB fields that are dependent on the</div><div class='del'>-	 * scsi_cmnd request_buffer.  Note that the bdeSize is explicitly</div><div class='del'>-	 * reinitialized since all iocb memory resources are used many times</div><div class='del'>-	 * for transmit, receive, and continuation bpl's.</div><div class='add'>+	 * scsi_cmnd request_buffer.  Note that for SLI-2 the bdeSize is</div><div class='add'>+	 * explicitly reinitialized and for SLI-3 the extended bde count is</div><div class='add'>+	 * explicitly reinitialized since all iocb memory resources are reused.</div><div class='ctx'> 	 */</div><div class='del'>-	iocb_cmd-&gt;un.fcpi64.bdl.bdeSize = (2 * sizeof (struct ulp_bde64));</div><div class='del'>-	iocb_cmd-&gt;un.fcpi64.bdl.bdeSize +=</div><div class='del'>-		(num_bde * sizeof (struct ulp_bde64));</div><div class='del'>-	iocb_cmd-&gt;ulpBdeCount = 1;</div><div class='del'>-	iocb_cmd-&gt;ulpLe = 1;</div><div class='add'>+	if (phba-&gt;sli_rev == 3) {</div><div class='add'>+		if (num_bde &gt; LPFC_EXT_DATA_BDE_COUNT) {</div><div class='add'>+			/*</div><div class='add'>+			 * The extended IOCB format can only fit 3 BDE or a BPL.</div><div class='add'>+			 * This I/O has more than 3 BDE so the 1st data bde will</div><div class='add'>+			 * be a BPL that is filled in here.</div><div class='add'>+			 */</div><div class='add'>+			physaddr = lpfc_cmd-&gt;dma_handle;</div><div class='add'>+			data_bde-&gt;tus.f.bdeFlags = BUFF_TYPE_BLP_64;</div><div class='add'>+			data_bde-&gt;tus.f.bdeSize = (num_bde *</div><div class='add'>+						   sizeof(struct ulp_bde64));</div><div class='add'>+			physaddr += (sizeof(struct fcp_cmnd) +</div><div class='add'>+				     sizeof(struct fcp_rsp) +</div><div class='add'>+				     (2 * sizeof(struct ulp_bde64)));</div><div class='add'>+			data_bde-&gt;addrHigh = putPaddrHigh(physaddr);</div><div class='add'>+			data_bde-&gt;addrLow = putPaddrLow(physaddr);</div><div class='add'>+			/* ebde count includes the responce bde and data bpl */</div><div class='add'>+			iocb_cmd-&gt;unsli3.fcp_ext.ebde_count = 2;</div><div class='add'>+		} else {</div><div class='add'>+			/* ebde count includes the responce bde and data bdes */</div><div class='add'>+			iocb_cmd-&gt;unsli3.fcp_ext.ebde_count = (num_bde + 1);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		iocb_cmd-&gt;un.fcpi64.bdl.bdeSize =</div><div class='add'>+			((num_bde + 2) * sizeof(struct ulp_bde64));</div><div class='add'>+	}</div><div class='ctx'> 	fcp_cmnd-&gt;fcpDl = cpu_to_be32(scsi_bufflen(scsi_cmnd));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_send_scsi_error_event: Posts an event when there is SCSI error.</div><div class='add'>+ * @phba: Pointer to hba context object.</div><div class='add'>+ * @vport: Pointer to vport object.</div><div class='add'>+ * @lpfc_cmd: Pointer to lpfc scsi command which reported the error.</div><div class='add'>+ * @rsp_iocb: Pointer to response iocb object which reported error.</div><div class='add'>+ *</div><div class='add'>+ * This function posts an event when there is a SCSI command reporting</div><div class='add'>+ * error from the scsi device.</div><div class='add'>+ **/</div><div class='add'>+static void</div><div class='add'>+lpfc_send_scsi_error_event(struct lpfc_hba *phba, struct lpfc_vport *vport,</div><div class='add'>+		struct lpfc_scsi_buf *lpfc_cmd, struct lpfc_iocbq *rsp_iocb) {</div><div class='add'>+	struct scsi_cmnd *cmnd = lpfc_cmd-&gt;pCmd;</div><div class='add'>+	struct fcp_rsp *fcprsp = lpfc_cmd-&gt;fcp_rsp;</div><div class='add'>+	uint32_t resp_info = fcprsp-&gt;rspStatus2;</div><div class='add'>+	uint32_t scsi_status = fcprsp-&gt;rspStatus3;</div><div class='add'>+	uint32_t fcpi_parm = rsp_iocb-&gt;iocb.un.fcpi.fcpi_parm;</div><div class='add'>+	struct lpfc_fast_path_event *fast_path_evt = NULL;</div><div class='add'>+	struct lpfc_nodelist *pnode = lpfc_cmd-&gt;rdata-&gt;pnode;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	/* If there is queuefull or busy condition send a scsi event */</div><div class='add'>+	if ((cmnd-&gt;result == SAM_STAT_TASK_SET_FULL) ||</div><div class='add'>+		(cmnd-&gt;result == SAM_STAT_BUSY)) {</div><div class='add'>+		fast_path_evt = lpfc_alloc_fast_evt(phba);</div><div class='add'>+		if (!fast_path_evt)</div><div class='add'>+			return;</div><div class='add'>+		fast_path_evt-&gt;un.scsi_evt.event_type =</div><div class='add'>+			FC_REG_SCSI_EVENT;</div><div class='add'>+		fast_path_evt-&gt;un.scsi_evt.subcategory =</div><div class='add'>+		(cmnd-&gt;result == SAM_STAT_TASK_SET_FULL) ?</div><div class='add'>+		LPFC_EVENT_QFULL : LPFC_EVENT_DEVBSY;</div><div class='add'>+		fast_path_evt-&gt;un.scsi_evt.lun = cmnd-&gt;device-&gt;lun;</div><div class='add'>+		memcpy(&amp;fast_path_evt-&gt;un.scsi_evt.wwpn,</div><div class='add'>+			&amp;pnode-&gt;nlp_portname, sizeof(struct lpfc_name));</div><div class='add'>+		memcpy(&amp;fast_path_evt-&gt;un.scsi_evt.wwnn,</div><div class='add'>+			&amp;pnode-&gt;nlp_nodename, sizeof(struct lpfc_name));</div><div class='add'>+	} else if ((resp_info &amp; SNS_LEN_VALID) &amp;&amp; fcprsp-&gt;rspSnsLen &amp;&amp;</div><div class='add'>+		((cmnd-&gt;cmnd[0] == READ_10) || (cmnd-&gt;cmnd[0] == WRITE_10))) {</div><div class='add'>+		fast_path_evt = lpfc_alloc_fast_evt(phba);</div><div class='add'>+		if (!fast_path_evt)</div><div class='add'>+			return;</div><div class='add'>+		fast_path_evt-&gt;un.check_cond_evt.scsi_event.event_type =</div><div class='add'>+			FC_REG_SCSI_EVENT;</div><div class='add'>+		fast_path_evt-&gt;un.check_cond_evt.scsi_event.subcategory =</div><div class='add'>+			LPFC_EVENT_CHECK_COND;</div><div class='add'>+		fast_path_evt-&gt;un.check_cond_evt.scsi_event.lun =</div><div class='add'>+			cmnd-&gt;device-&gt;lun;</div><div class='add'>+		memcpy(&amp;fast_path_evt-&gt;un.check_cond_evt.scsi_event.wwpn,</div><div class='add'>+			&amp;pnode-&gt;nlp_portname, sizeof(struct lpfc_name));</div><div class='add'>+		memcpy(&amp;fast_path_evt-&gt;un.check_cond_evt.scsi_event.wwnn,</div><div class='add'>+			&amp;pnode-&gt;nlp_nodename, sizeof(struct lpfc_name));</div><div class='add'>+		fast_path_evt-&gt;un.check_cond_evt.sense_key =</div><div class='add'>+			cmnd-&gt;sense_buffer[2] &amp; 0xf;</div><div class='add'>+		fast_path_evt-&gt;un.check_cond_evt.asc = cmnd-&gt;sense_buffer[12];</div><div class='add'>+		fast_path_evt-&gt;un.check_cond_evt.ascq = cmnd-&gt;sense_buffer[13];</div><div class='add'>+	} else if ((cmnd-&gt;sc_data_direction == DMA_FROM_DEVICE) &amp;&amp;</div><div class='add'>+		     fcpi_parm &amp;&amp;</div><div class='add'>+		     ((be32_to_cpu(fcprsp-&gt;rspResId) != fcpi_parm) ||</div><div class='add'>+			((scsi_status == SAM_STAT_GOOD) &amp;&amp;</div><div class='add'>+			!(resp_info &amp; (RESID_UNDER | RESID_OVER))))) {</div><div class='add'>+		/*</div><div class='add'>+		 * If status is good or resid does not match with fcp_param and</div><div class='add'>+		 * there is valid fcpi_parm, then there is a read_check error</div><div class='add'>+		 */</div><div class='add'>+		fast_path_evt = lpfc_alloc_fast_evt(phba);</div><div class='add'>+		if (!fast_path_evt)</div><div class='add'>+			return;</div><div class='add'>+		fast_path_evt-&gt;un.read_check_error.header.event_type =</div><div class='add'>+			FC_REG_FABRIC_EVENT;</div><div class='add'>+		fast_path_evt-&gt;un.read_check_error.header.subcategory =</div><div class='add'>+			LPFC_EVENT_FCPRDCHKERR;</div><div class='add'>+		memcpy(&amp;fast_path_evt-&gt;un.read_check_error.header.wwpn,</div><div class='add'>+			&amp;pnode-&gt;nlp_portname, sizeof(struct lpfc_name));</div><div class='add'>+		memcpy(&amp;fast_path_evt-&gt;un.read_check_error.header.wwnn,</div><div class='add'>+			&amp;pnode-&gt;nlp_nodename, sizeof(struct lpfc_name));</div><div class='add'>+		fast_path_evt-&gt;un.read_check_error.lun = cmnd-&gt;device-&gt;lun;</div><div class='add'>+		fast_path_evt-&gt;un.read_check_error.opcode = cmnd-&gt;cmnd[0];</div><div class='add'>+		fast_path_evt-&gt;un.read_check_error.fcpiparam =</div><div class='add'>+			fcpi_parm;</div><div class='add'>+	} else</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	fast_path_evt-&gt;vport = vport;</div><div class='add'>+	spin_lock_irqsave(&amp;phba-&gt;hbalock, flags);</div><div class='add'>+	list_add_tail(&amp;fast_path_evt-&gt;work_evt.evt_listp, &amp;phba-&gt;work_list);</div><div class='add'>+	spin_unlock_irqrestore(&amp;phba-&gt;hbalock, flags);</div><div class='add'>+	lpfc_worker_wake_up(phba);</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='ctx'> static void</div><div class='ctx'> lpfc_scsi_unprep_dma_buf(struct lpfc_hba * phba, struct lpfc_scsi_buf * psb)</div><div class='ctx'> {</div><div class='hunk'>@@ -411,6 +709,7 @@ lpfc_handle_fcp_err(struct lpfc_vport *vport, struct lpfc_scsi_buf *lpfc_cmd,</div><div class='ctx'> 	uint32_t rsplen = 0;</div><div class='ctx'> 	uint32_t logit = LOG_FCP | LOG_FCP_ERROR;</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 *  If this is a task management command, there is no</div><div class='ctx'> 	 *  scsi packet associated with this lpfc_cmd.  The driver</div><div class='hunk'>@@ -526,6 +825,7 @@ lpfc_handle_fcp_err(struct lpfc_vport *vport, struct lpfc_scsi_buf *lpfc_cmd,</div><div class='ctx'> </div><div class='ctx'>  out:</div><div class='ctx'> 	cmnd-&gt;result = ScsiResult(host_status, scsi_status);</div><div class='add'>+	lpfc_send_scsi_error_event(vport-&gt;phba, vport, lpfc_cmd, rsp_iocb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -542,9 +842,11 @@ lpfc_scsi_cmd_iocb_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *pIocbIn,</div><div class='ctx'> 	struct scsi_device *sdev, *tmp_sdev;</div><div class='ctx'> 	int depth = 0;</div><div class='ctx'> 	unsigned long flags;</div><div class='add'>+	struct lpfc_fast_path_event *fast_path_evt;</div><div class='ctx'> </div><div class='ctx'> 	lpfc_cmd-&gt;result = pIocbOut-&gt;iocb.un.ulpWord[4];</div><div class='ctx'> 	lpfc_cmd-&gt;status = pIocbOut-&gt;iocb.ulpStatus;</div><div class='add'>+	atomic_dec(&amp;pnode-&gt;cmd_pending);</div><div class='ctx'> </div><div class='ctx'> 	if (lpfc_cmd-&gt;status) {</div><div class='ctx'> 		if (lpfc_cmd-&gt;status == IOSTAT_LOCAL_REJECT &amp;&amp;</div><div class='hunk'>@@ -570,12 +872,36 @@ lpfc_scsi_cmd_iocb_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *pIocbIn,</div><div class='ctx'> 			break;</div><div class='ctx'> 		case IOSTAT_NPORT_BSY:</div><div class='ctx'> 		case IOSTAT_FABRIC_BSY:</div><div class='del'>-			cmd-&gt;result = ScsiResult(DID_BUS_BUSY, 0);</div><div class='add'>+			cmd-&gt;result = ScsiResult(DID_TRANSPORT_DISRUPTED, 0);</div><div class='add'>+			fast_path_evt = lpfc_alloc_fast_evt(phba);</div><div class='add'>+			if (!fast_path_evt)</div><div class='add'>+				break;</div><div class='add'>+			fast_path_evt-&gt;un.fabric_evt.event_type =</div><div class='add'>+				FC_REG_FABRIC_EVENT;</div><div class='add'>+			fast_path_evt-&gt;un.fabric_evt.subcategory =</div><div class='add'>+				(lpfc_cmd-&gt;status == IOSTAT_NPORT_BSY) ?</div><div class='add'>+				LPFC_EVENT_PORT_BUSY : LPFC_EVENT_FABRIC_BUSY;</div><div class='add'>+			if (pnode &amp;&amp; NLP_CHK_NODE_ACT(pnode)) {</div><div class='add'>+				memcpy(&amp;fast_path_evt-&gt;un.fabric_evt.wwpn,</div><div class='add'>+					&amp;pnode-&gt;nlp_portname,</div><div class='add'>+					sizeof(struct lpfc_name));</div><div class='add'>+				memcpy(&amp;fast_path_evt-&gt;un.fabric_evt.wwnn,</div><div class='add'>+					&amp;pnode-&gt;nlp_nodename,</div><div class='add'>+					sizeof(struct lpfc_name));</div><div class='add'>+			}</div><div class='add'>+			fast_path_evt-&gt;vport = vport;</div><div class='add'>+			fast_path_evt-&gt;work_evt.evt =</div><div class='add'>+				LPFC_EVT_FASTPATH_MGMT_EVT;</div><div class='add'>+			spin_lock_irqsave(&amp;phba-&gt;hbalock, flags);</div><div class='add'>+			list_add_tail(&amp;fast_path_evt-&gt;work_evt.evt_listp,</div><div class='add'>+				&amp;phba-&gt;work_list);</div><div class='add'>+			spin_unlock_irqrestore(&amp;phba-&gt;hbalock, flags);</div><div class='add'>+			lpfc_worker_wake_up(phba);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case IOSTAT_LOCAL_REJECT:</div><div class='del'>-			if (lpfc_cmd-&gt;result == RJT_UNAVAIL_PERM ||</div><div class='add'>+			if (lpfc_cmd-&gt;result == IOERR_INVALID_RPI ||</div><div class='ctx'> 			    lpfc_cmd-&gt;result == IOERR_NO_RESOURCES ||</div><div class='del'>-			    lpfc_cmd-&gt;result == RJT_LOGIN_REQUIRED) {</div><div class='add'>+			    lpfc_cmd-&gt;result == IOERR_ABORT_REQUESTED) {</div><div class='ctx'> 				cmd-&gt;result = ScsiResult(DID_REQUEUE, 0);</div><div class='ctx'> 				break;</div><div class='ctx'> 			} /* else: fall through */</div><div class='hunk'>@@ -586,7 +912,8 @@ lpfc_scsi_cmd_iocb_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *pIocbIn,</div><div class='ctx'> </div><div class='ctx'> 		if (!pnode || !NLP_CHK_NODE_ACT(pnode)</div><div class='ctx'> 		    || (pnode-&gt;nlp_state != NLP_STE_MAPPED_NODE))</div><div class='del'>-			cmd-&gt;result = ScsiResult(DID_BUS_BUSY, SAM_STAT_BUSY);</div><div class='add'>+			cmd-&gt;result = ScsiResult(DID_TRANSPORT_DISRUPTED,</div><div class='add'>+						 SAM_STAT_BUSY);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		cmd-&gt;result = ScsiResult(DID_OK, 0);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -602,8 +929,32 @@ lpfc_scsi_cmd_iocb_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *pIocbIn,</div><div class='ctx'> 				 scsi_get_resid(cmd));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	lpfc_update_stats(phba, lpfc_cmd);</div><div class='ctx'> 	result = cmd-&gt;result;</div><div class='ctx'> 	sdev = cmd-&gt;device;</div><div class='add'>+	if (vport-&gt;cfg_max_scsicmpl_time &amp;&amp;</div><div class='add'>+	   time_after(jiffies, lpfc_cmd-&gt;start_time +</div><div class='add'>+		msecs_to_jiffies(vport-&gt;cfg_max_scsicmpl_time))) {</div><div class='add'>+		spin_lock_irqsave(sdev-&gt;host-&gt;host_lock, flags);</div><div class='add'>+		if ((pnode-&gt;cmd_qdepth &gt; atomic_read(&amp;pnode-&gt;cmd_pending) &amp;&amp;</div><div class='add'>+		    (atomic_read(&amp;pnode-&gt;cmd_pending) &gt; LPFC_MIN_TGT_QDEPTH) &amp;&amp;</div><div class='add'>+		    ((cmd-&gt;cmnd[0] == READ_10) || (cmd-&gt;cmnd[0] == WRITE_10))))</div><div class='add'>+			pnode-&gt;cmd_qdepth = atomic_read(&amp;pnode-&gt;cmd_pending);</div><div class='add'>+</div><div class='add'>+		pnode-&gt;last_change_time = jiffies;</div><div class='add'>+		spin_unlock_irqrestore(sdev-&gt;host-&gt;host_lock, flags);</div><div class='add'>+	} else if ((pnode-&gt;cmd_qdepth &lt; LPFC_MAX_TGT_QDEPTH) &amp;&amp;</div><div class='add'>+		   time_after(jiffies, pnode-&gt;last_change_time +</div><div class='add'>+			msecs_to_jiffies(LPFC_TGTQ_INTERVAL))) {</div><div class='add'>+		spin_lock_irqsave(sdev-&gt;host-&gt;host_lock, flags);</div><div class='add'>+		pnode-&gt;cmd_qdepth += pnode-&gt;cmd_qdepth *</div><div class='add'>+			LPFC_TGTQ_RAMPUP_PCENT / 100;</div><div class='add'>+		if (pnode-&gt;cmd_qdepth &gt; LPFC_MAX_TGT_QDEPTH)</div><div class='add'>+			pnode-&gt;cmd_qdepth = LPFC_MAX_TGT_QDEPTH;</div><div class='add'>+		pnode-&gt;last_change_time = jiffies;</div><div class='add'>+		spin_unlock_irqrestore(sdev-&gt;host-&gt;host_lock, flags);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	lpfc_scsi_unprep_dma_buf(phba, lpfc_cmd);</div><div class='ctx'> 	cmd-&gt;scsi_done(cmd);</div><div class='ctx'> </div><div class='hunk'>@@ -647,6 +998,9 @@ lpfc_scsi_cmd_iocb_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *pIocbIn,</div><div class='ctx'> 				pnode-&gt;last_ramp_up_time = jiffies;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='add'>+		lpfc_send_sdev_queuedepth_change_event(phba, vport, pnode,</div><div class='add'>+			0xFFFFFFFF,</div><div class='add'>+			sdev-&gt;queue_depth - 1, sdev-&gt;queue_depth);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -676,6 +1030,9 @@ lpfc_scsi_cmd_iocb_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *pIocbIn,</div><div class='ctx'> 			lpfc_printf_vlog(vport, KERN_WARNING, LOG_FCP,</div><div class='ctx'> 					 "0711 detected queue full - lun queue "</div><div class='ctx'> 					 "depth adjusted to %d.\n", depth);</div><div class='add'>+			lpfc_send_sdev_queuedepth_change_event(phba, vport,</div><div class='add'>+				pnode, 0xFFFFFFFF,</div><div class='add'>+				depth+1, depth);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -692,6 +1049,24 @@ lpfc_scsi_cmd_iocb_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *pIocbIn,</div><div class='ctx'> 	lpfc_release_scsi_buf(phba, lpfc_cmd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_fcpcmd_to_iocb - copy the fcp_cmd data into the IOCB.</div><div class='add'>+ * @data: A pointer to the immediate command data portion of the IOCB.</div><div class='add'>+ * @fcp_cmnd: The FCP Command that is provided by the SCSI layer.</div><div class='add'>+ *</div><div class='add'>+ * The routine copies the entire FCP command from @fcp_cmnd to @data while</div><div class='add'>+ * byte swapping the data to big endian format for transmission on the wire.</div><div class='add'>+ **/</div><div class='add'>+static void</div><div class='add'>+lpfc_fcpcmd_to_iocb(uint8_t *data, struct fcp_cmnd *fcp_cmnd)</div><div class='add'>+{</div><div class='add'>+	int i, j;</div><div class='add'>+	for (i = 0, j = 0; i &lt; sizeof(struct fcp_cmnd);</div><div class='add'>+	     i += sizeof(uint32_t), j++) {</div><div class='add'>+		((uint32_t *)data)[j] = cpu_to_be32(((uint32_t *)fcp_cmnd)[j]);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void</div><div class='ctx'> lpfc_scsi_prep_cmnd(struct lpfc_vport *vport, struct lpfc_scsi_buf *lpfc_cmd,</div><div class='ctx'> 		    struct lpfc_nodelist *pnode)</div><div class='hunk'>@@ -758,7 +1133,8 @@ lpfc_scsi_prep_cmnd(struct lpfc_vport *vport, struct lpfc_scsi_buf *lpfc_cmd,</div><div class='ctx'> 		fcp_cmnd-&gt;fcpCntl3 = 0;</div><div class='ctx'> 		phba-&gt;fc4ControlRequests++;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='add'>+	if (phba-&gt;sli_rev == 3)</div><div class='add'>+		lpfc_fcpcmd_to_iocb(iocb_cmd-&gt;unsli3.fcp_ext.icd, fcp_cmnd);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Finish initializing those IOCB fields that are independent</div><div class='ctx'> 	 * of the scsi_cmnd request_buffer</div><div class='hunk'>@@ -798,11 +1174,13 @@ lpfc_scsi_prep_task_mgmt_cmd(struct lpfc_vport *vport,</div><div class='ctx'> 	piocb = &amp;piocbq-&gt;iocb;</div><div class='ctx'> </div><div class='ctx'> 	fcp_cmnd = lpfc_cmd-&gt;fcp_cmnd;</div><div class='del'>-	int_to_scsilun(lun, &amp;lpfc_cmd-&gt;fcp_cmnd-&gt;fcp_lun);</div><div class='add'>+	/* Clear out any old data in the FCP command area */</div><div class='add'>+	memset(fcp_cmnd, 0, sizeof(struct fcp_cmnd));</div><div class='add'>+	int_to_scsilun(lun, &amp;fcp_cmnd-&gt;fcp_lun);</div><div class='ctx'> 	fcp_cmnd-&gt;fcpCntl2 = task_mgmt_cmd;</div><div class='del'>-</div><div class='add'>+	if (vport-&gt;phba-&gt;sli_rev == 3)</div><div class='add'>+		lpfc_fcpcmd_to_iocb(piocb-&gt;unsli3.fcp_ext.icd, fcp_cmnd);</div><div class='ctx'> 	piocb-&gt;ulpCommand = CMD_FCP_ICMND64_CR;</div><div class='del'>-</div><div class='ctx'> 	piocb-&gt;ulpContext = ndlp-&gt;nlp_rpi;</div><div class='ctx'> 	if (ndlp-&gt;nlp_fcp_info &amp; NLP_FCP_2_DEVICE) {</div><div class='ctx'> 		piocb-&gt;ulpFCP2Rcvy = 1;</div><div class='hunk'>@@ -967,9 +1345,12 @@ lpfc_queuecommand(struct scsi_cmnd *cmnd, void (*done) (struct scsi_cmnd *))</div><div class='ctx'> 	 * transport is still transitioning.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!ndlp || !NLP_CHK_NODE_ACT(ndlp)) {</div><div class='del'>-		cmnd-&gt;result = ScsiResult(DID_BUS_BUSY, 0);</div><div class='add'>+		cmnd-&gt;result = ScsiResult(DID_TRANSPORT_DISRUPTED, 0);</div><div class='ctx'> 		goto out_fail_command;</div><div class='ctx'> 	}</div><div class='add'>+	if (atomic_read(&amp;ndlp-&gt;cmd_pending) &gt;= ndlp-&gt;cmd_qdepth)</div><div class='add'>+		goto out_host_busy;</div><div class='add'>+</div><div class='ctx'> 	lpfc_cmd = lpfc_get_scsi_buf(phba);</div><div class='ctx'> 	if (lpfc_cmd == NULL) {</div><div class='ctx'> 		lpfc_adjust_queue_depth(phba);</div><div class='hunk'>@@ -980,6 +1361,7 @@ lpfc_queuecommand(struct scsi_cmnd *cmnd, void (*done) (struct scsi_cmnd *))</div><div class='ctx'> 		goto out_host_busy;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	lpfc_cmd-&gt;start_time = jiffies;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Store the midlayer's command structure for the completion phase</div><div class='ctx'> 	 * and complete the command initialization.</div><div class='hunk'>@@ -987,6 +1369,7 @@ lpfc_queuecommand(struct scsi_cmnd *cmnd, void (*done) (struct scsi_cmnd *))</div><div class='ctx'> 	lpfc_cmd-&gt;pCmd  = cmnd;</div><div class='ctx'> 	lpfc_cmd-&gt;rdata = rdata;</div><div class='ctx'> 	lpfc_cmd-&gt;timeout = 0;</div><div class='add'>+	lpfc_cmd-&gt;start_time = jiffies;</div><div class='ctx'> 	cmnd-&gt;host_scribble = (unsigned char *)lpfc_cmd;</div><div class='ctx'> 	cmnd-&gt;scsi_done = done;</div><div class='ctx'> </div><div class='hunk'>@@ -996,6 +1379,7 @@ lpfc_queuecommand(struct scsi_cmnd *cmnd, void (*done) (struct scsi_cmnd *))</div><div class='ctx'> </div><div class='ctx'> 	lpfc_scsi_prep_cmnd(vport, lpfc_cmd, ndlp);</div><div class='ctx'> </div><div class='add'>+	atomic_inc(&amp;ndlp-&gt;cmd_pending);</div><div class='ctx'> 	err = lpfc_sli_issue_iocb(phba, &amp;phba-&gt;sli.ring[psli-&gt;fcp_ring],</div><div class='ctx'> 				  &amp;lpfc_cmd-&gt;cur_iocbq, SLI_IOCB_RET_IOCB);</div><div class='ctx'> 	if (err)</div><div class='hunk'>@@ -1010,6 +1394,7 @@ lpfc_queuecommand(struct scsi_cmnd *cmnd, void (*done) (struct scsi_cmnd *))</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'>  out_host_busy_free_buf:</div><div class='add'>+	atomic_dec(&amp;ndlp-&gt;cmd_pending);</div><div class='ctx'> 	lpfc_scsi_unprep_dma_buf(phba, lpfc_cmd);</div><div class='ctx'> 	lpfc_release_scsi_buf(phba, lpfc_cmd);</div><div class='ctx'>  out_host_busy:</div><div class='hunk'>@@ -1145,6 +1530,7 @@ lpfc_device_reset_handler(struct scsi_cmnd *cmnd)</div><div class='ctx'> 	int ret = SUCCESS;</div><div class='ctx'> 	int status;</div><div class='ctx'> 	int cnt;</div><div class='add'>+	struct lpfc_scsi_event_header scsi_event;</div><div class='ctx'> </div><div class='ctx'> 	lpfc_block_error_handler(cmnd);</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1163,6 +1549,19 @@ lpfc_device_reset_handler(struct scsi_cmnd *cmnd)</div><div class='ctx'> 			break;</div><div class='ctx'> 		pnode = rdata-&gt;pnode;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	scsi_event.event_type = FC_REG_SCSI_EVENT;</div><div class='add'>+	scsi_event.subcategory = LPFC_EVENT_TGTRESET;</div><div class='add'>+	scsi_event.lun = 0;</div><div class='add'>+	memcpy(scsi_event.wwpn, &amp;pnode-&gt;nlp_portname, sizeof(struct lpfc_name));</div><div class='add'>+	memcpy(scsi_event.wwnn, &amp;pnode-&gt;nlp_nodename, sizeof(struct lpfc_name));</div><div class='add'>+</div><div class='add'>+	fc_host_post_vendor_event(shost,</div><div class='add'>+		fc_get_event_number(),</div><div class='add'>+		sizeof(scsi_event),</div><div class='add'>+		(char *)&amp;scsi_event,</div><div class='add'>+		SCSI_NL_VID_TYPE_PCI | PCI_VENDOR_ID_EMULEX);</div><div class='add'>+</div><div class='ctx'> 	if (!rdata || pnode-&gt;nlp_state != NLP_STE_MAPPED_NODE) {</div><div class='ctx'> 		lpfc_printf_vlog(vport, KERN_ERR, LOG_FCP,</div><div class='ctx'> 				 "0721 LUN Reset rport "</div><div class='hunk'>@@ -1242,10 +1641,23 @@ lpfc_bus_reset_handler(struct scsi_cmnd *cmnd)</div><div class='ctx'> 	struct lpfc_hba   *phba = vport-&gt;phba;</div><div class='ctx'> 	struct lpfc_nodelist *ndlp = NULL;</div><div class='ctx'> 	int match;</div><div class='del'>-	int ret = SUCCESS, status, i;</div><div class='add'>+	int ret = SUCCESS, status = SUCCESS, i;</div><div class='ctx'> 	int cnt;</div><div class='ctx'> 	struct lpfc_scsi_buf * lpfc_cmd;</div><div class='ctx'> 	unsigned long later;</div><div class='add'>+	struct lpfc_scsi_event_header scsi_event;</div><div class='add'>+</div><div class='add'>+	scsi_event.event_type = FC_REG_SCSI_EVENT;</div><div class='add'>+	scsi_event.subcategory = LPFC_EVENT_BUSRESET;</div><div class='add'>+	scsi_event.lun = 0;</div><div class='add'>+	memcpy(scsi_event.wwpn, &amp;vport-&gt;fc_portname, sizeof(struct lpfc_name));</div><div class='add'>+	memcpy(scsi_event.wwnn, &amp;vport-&gt;fc_nodename, sizeof(struct lpfc_name));</div><div class='add'>+</div><div class='add'>+	fc_host_post_vendor_event(shost,</div><div class='add'>+		fc_get_event_number(),</div><div class='add'>+		sizeof(scsi_event),</div><div class='add'>+		(char *)&amp;scsi_event,</div><div class='add'>+		SCSI_NL_VID_TYPE_PCI | PCI_VENDOR_ID_EMULEX);</div><div class='ctx'> </div><div class='ctx'> 	lpfc_block_error_handler(cmnd);</div><div class='ctx'> 	/*</div><div class='head'>diff --git a/drivers/scsi/lpfc/lpfc_scsi.h b/drivers/scsi/lpfc/lpfc_scsi.h<br/>index daba92374985..437f182e2322 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/lpfc/lpfc_scsi.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/lpfc/lpfc_scsi.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/lpfc/lpfc_scsi.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/lpfc/lpfc_scsi.h</a></div><div class='hunk'>@@ -107,6 +107,10 @@ struct fcp_cmnd {</div><div class='ctx'> </div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct lpfc_scsicmd_bkt {</div><div class='add'>+	uint32_t cmd_count;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct lpfc_scsi_buf {</div><div class='ctx'> 	struct list_head list;</div><div class='ctx'> 	struct scsi_cmnd *pCmd;</div><div class='hunk'>@@ -139,6 +143,7 @@ struct lpfc_scsi_buf {</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct lpfc_iocbq cur_iocbq;</div><div class='ctx'> 	wait_queue_head_t *waitq;</div><div class='add'>+	unsigned long start_time;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define LPFC_SCSI_DMA_EXT_SIZE 264</div><div class='head'>diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c<br/>index 50fe07646738..8ab5babdeebc 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/lpfc/lpfc_sli.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/lpfc/lpfc_sli.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/lpfc/lpfc_sli.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/lpfc/lpfc_sli.c</a></div><div class='hunk'>@@ -32,6 +32,7 @@</div><div class='ctx'> </div><div class='ctx'> #include "lpfc_hw.h"</div><div class='ctx'> #include "lpfc_sli.h"</div><div class='add'>+#include "lpfc_nl.h"</div><div class='ctx'> #include "lpfc_disc.h"</div><div class='ctx'> #include "lpfc_scsi.h"</div><div class='ctx'> #include "lpfc.h"</div><div class='hunk'>@@ -66,10 +67,16 @@ typedef enum _lpfc_iocb_type {</div><div class='ctx'> 	LPFC_ABORT_IOCB</div><div class='ctx'> } lpfc_iocb_type;</div><div class='ctx'> </div><div class='del'>-		/* SLI-2/SLI-3 provide different sized iocbs.  Given a pointer</div><div class='del'>-		 * to the start of the ring, and the slot number of the</div><div class='del'>-		 * desired iocb entry, calc a pointer to that entry.</div><div class='del'>-		 */</div><div class='add'>+/**</div><div class='add'>+ * lpfc_cmd_iocb: Get next command iocb entry in the ring.</div><div class='add'>+ * @phba: Pointer to HBA context object.</div><div class='add'>+ * @pring: Pointer to driver SLI ring object.</div><div class='add'>+ *</div><div class='add'>+ * This function returns pointer to next command iocb entry</div><div class='add'>+ * in the command ring. The caller must hold hbalock to prevent</div><div class='add'>+ * other threads consume the next command iocb.</div><div class='add'>+ * SLI-2/SLI-3 provide different sized iocbs.</div><div class='add'>+ **/</div><div class='ctx'> static inline IOCB_t *</div><div class='ctx'> lpfc_cmd_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring)</div><div class='ctx'> {</div><div class='hunk'>@@ -77,6 +84,16 @@ lpfc_cmd_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring)</div><div class='ctx'> 			   pring-&gt;cmdidx * phba-&gt;iocb_cmd_size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_resp_iocb: Get next response iocb entry in the ring.</div><div class='add'>+ * @phba: Pointer to HBA context object.</div><div class='add'>+ * @pring: Pointer to driver SLI ring object.</div><div class='add'>+ *</div><div class='add'>+ * This function returns pointer to next response iocb entry</div><div class='add'>+ * in the response ring. The caller must hold hbalock to make sure</div><div class='add'>+ * that no other thread consume the next response iocb.</div><div class='add'>+ * SLI-2/SLI-3 provide different sized iocbs.</div><div class='add'>+ **/</div><div class='ctx'> static inline IOCB_t *</div><div class='ctx'> lpfc_resp_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring)</div><div class='ctx'> {</div><div class='hunk'>@@ -84,6 +101,15 @@ lpfc_resp_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring)</div><div class='ctx'> 			   pring-&gt;rspidx * phba-&gt;iocb_rsp_size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * __lpfc_sli_get_iocbq: Allocates an iocb object from iocb pool.</div><div class='add'>+ * @phba: Pointer to HBA context object.</div><div class='add'>+ *</div><div class='add'>+ * This function is called with hbalock held. This function</div><div class='add'>+ * allocates a new driver iocb object from the iocb pool. If the</div><div class='add'>+ * allocation is successful, it returns pointer to the newly</div><div class='add'>+ * allocated iocb object else it returns NULL.</div><div class='add'>+ **/</div><div class='ctx'> static struct lpfc_iocbq *</div><div class='ctx'> __lpfc_sli_get_iocbq(struct lpfc_hba *phba)</div><div class='ctx'> {</div><div class='hunk'>@@ -94,6 +120,15 @@ __lpfc_sli_get_iocbq(struct lpfc_hba *phba)</div><div class='ctx'> 	return iocbq;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_sli_get_iocbq: Allocates an iocb object from iocb pool.</div><div class='add'>+ * @phba: Pointer to HBA context object.</div><div class='add'>+ *</div><div class='add'>+ * This function is called with no lock held. This function</div><div class='add'>+ * allocates a new driver iocb object from the iocb pool. If the</div><div class='add'>+ * allocation is successful, it returns pointer to the newly</div><div class='add'>+ * allocated iocb object else it returns NULL.</div><div class='add'>+ **/</div><div class='ctx'> struct lpfc_iocbq *</div><div class='ctx'> lpfc_sli_get_iocbq(struct lpfc_hba *phba)</div><div class='ctx'> {</div><div class='hunk'>@@ -106,6 +141,16 @@ lpfc_sli_get_iocbq(struct lpfc_hba *phba)</div><div class='ctx'> 	return iocbq;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * __lpfc_sli_release_iocbq: Release iocb to the iocb pool.</div><div class='add'>+ * @phba: Pointer to HBA context object.</div><div class='add'>+ * @iocbq: Pointer to driver iocb object.</div><div class='add'>+ *</div><div class='add'>+ * This function is called with hbalock held to release driver</div><div class='add'>+ * iocb object to the iocb pool. The iotag in the iocb object</div><div class='add'>+ * does not change for each use of the iocb object. This function</div><div class='add'>+ * clears all other fields of the iocb object when it is freed.</div><div class='add'>+ **/</div><div class='ctx'> static void</div><div class='ctx'> __lpfc_sli_release_iocbq(struct lpfc_hba *phba, struct lpfc_iocbq *iocbq)</div><div class='ctx'> {</div><div class='hunk'>@@ -118,6 +163,14 @@ __lpfc_sli_release_iocbq(struct lpfc_hba *phba, struct lpfc_iocbq *iocbq)</div><div class='ctx'> 	list_add_tail(&amp;iocbq-&gt;list, &amp;phba-&gt;lpfc_iocb_list);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_sli_release_iocbq: Release iocb to the iocb pool.</div><div class='add'>+ * @phba: Pointer to HBA context object.</div><div class='add'>+ * @iocbq: Pointer to driver iocb object.</div><div class='add'>+ *</div><div class='add'>+ * This function is called with no lock held to release the iocb to</div><div class='add'>+ * iocb pool.</div><div class='add'>+ **/</div><div class='ctx'> void</div><div class='ctx'> lpfc_sli_release_iocbq(struct lpfc_hba *phba, struct lpfc_iocbq *iocbq)</div><div class='ctx'> {</div><div class='hunk'>@@ -131,10 +184,21 @@ lpfc_sli_release_iocbq(struct lpfc_hba *phba, struct lpfc_iocbq *iocbq)</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;phba-&gt;hbalock, iflags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Translate the iocb command to an iocb command type used to decide the final</div><div class='del'>- * disposition of each completed IOCB.</div><div class='del'>- */</div><div class='add'>+/**</div><div class='add'>+ * lpfc_sli_iocb_cmd_type: Get the iocb type.</div><div class='add'>+ * @iocb_cmnd : iocb command code.</div><div class='add'>+ *</div><div class='add'>+ * This function is called by ring event handler function to get the iocb type.</div><div class='add'>+ * This function translates the iocb command to an iocb command type used to</div><div class='add'>+ * decide the final disposition of each completed IOCB.</div><div class='add'>+ * The function returns</div><div class='add'>+ * LPFC_UNKNOWN_IOCB if it is an unsupported iocb</div><div class='add'>+ * LPFC_SOL_IOCB     if it is a solicited iocb completion</div><div class='add'>+ * LPFC_ABORT_IOCB   if it is an abort iocb</div><div class='add'>+ * LPFC_UNSOL_IOCB   if it is an unsolicited iocb</div><div class='add'>+ *</div><div class='add'>+ * The caller is not required to hold any lock.</div><div class='add'>+ **/</div><div class='ctx'> static lpfc_iocb_type</div><div class='ctx'> lpfc_sli_iocb_cmd_type(uint8_t iocb_cmnd)</div><div class='ctx'> {</div><div class='hunk'>@@ -230,6 +294,17 @@ lpfc_sli_iocb_cmd_type(uint8_t iocb_cmnd)</div><div class='ctx'> 	return type;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_sli_ring_map: Issue config_ring mbox for all rings.</div><div class='add'>+ * @phba: Pointer to HBA context object.</div><div class='add'>+ *</div><div class='add'>+ * This function is called from SLI initialization code</div><div class='add'>+ * to configure every ring of the HBA's SLI interface. The</div><div class='add'>+ * caller is not required to hold any lock. This function issues</div><div class='add'>+ * a config_ring mailbox command for each ring.</div><div class='add'>+ * This function returns zero if successful else returns a negative</div><div class='add'>+ * error code.</div><div class='add'>+ **/</div><div class='ctx'> static int</div><div class='ctx'> lpfc_sli_ring_map(struct lpfc_hba *phba)</div><div class='ctx'> {</div><div class='hunk'>@@ -262,6 +337,18 @@ lpfc_sli_ring_map(struct lpfc_hba *phba)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_sli_ringtxcmpl_put: Adds new iocb to the txcmplq.</div><div class='add'>+ * @phba: Pointer to HBA context object.</div><div class='add'>+ * @pring: Pointer to driver SLI ring object.</div><div class='add'>+ * @piocb: Pointer to the driver iocb object.</div><div class='add'>+ *</div><div class='add'>+ * This function is called with hbalock held. The function adds the</div><div class='add'>+ * new iocb to txcmplq of the given ring. This function always returns</div><div class='add'>+ * 0. If this function is called for ELS ring, this function checks if</div><div class='add'>+ * there is a vport associated with the ELS command. This function also</div><div class='add'>+ * starts els_tmofunc timer if this is an ELS command.</div><div class='add'>+ **/</div><div class='ctx'> static int</div><div class='ctx'> lpfc_sli_ringtxcmpl_put(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,</div><div class='ctx'> 			struct lpfc_iocbq *piocb)</div><div class='hunk'>@@ -282,6 +369,16 @@ lpfc_sli_ringtxcmpl_put(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_sli_ringtx_get: Get first element of the txq.</div><div class='add'>+ * @phba: Pointer to HBA context object.</div><div class='add'>+ * @pring: Pointer to driver SLI ring object.</div><div class='add'>+ *</div><div class='add'>+ * This function is called with hbalock held to get next</div><div class='add'>+ * iocb in txq of the given ring. If there is any iocb in</div><div class='add'>+ * the txq, the function returns first iocb in the list after</div><div class='add'>+ * removing the iocb from the list, else it returns NULL.</div><div class='add'>+ **/</div><div class='ctx'> static struct lpfc_iocbq *</div><div class='ctx'> lpfc_sli_ringtx_get(struct lpfc_hba *phba, struct lpfc_sli_ring *pring)</div><div class='ctx'> {</div><div class='hunk'>@@ -293,14 +390,25 @@ lpfc_sli_ringtx_get(struct lpfc_hba *phba, struct lpfc_sli_ring *pring)</div><div class='ctx'> 	return cmd_iocb;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_sli_next_iocb_slot: Get next iocb slot in the ring.</div><div class='add'>+ * @phba: Pointer to HBA context object.</div><div class='add'>+ * @pring: Pointer to driver SLI ring object.</div><div class='add'>+ *</div><div class='add'>+ * This function is called with hbalock held and the caller must post the</div><div class='add'>+ * iocb without releasing the lock. If the caller releases the lock,</div><div class='add'>+ * iocb slot returned by the function is not guaranteed to be available.</div><div class='add'>+ * The function returns pointer to the next available iocb slot if there</div><div class='add'>+ * is available slot in the ring, else it returns NULL.</div><div class='add'>+ * If the get index of the ring is ahead of the put index, the function</div><div class='add'>+ * will post an error attention event to the worker thread to take the</div><div class='add'>+ * HBA to offline state.</div><div class='add'>+ **/</div><div class='ctx'> static IOCB_t *</div><div class='ctx'> lpfc_sli_next_iocb_slot (struct lpfc_hba *phba, struct lpfc_sli_ring *pring)</div><div class='ctx'> {</div><div class='del'>-	struct lpfc_pgp *pgp = (phba-&gt;sli_rev == 3) ?</div><div class='del'>-		&amp;phba-&gt;slim2p-&gt;mbx.us.s3_pgp.port[pring-&gt;ringno] :</div><div class='del'>-		&amp;phba-&gt;slim2p-&gt;mbx.us.s2.port[pring-&gt;ringno];</div><div class='add'>+	struct lpfc_pgp *pgp = &amp;phba-&gt;port_gp[pring-&gt;ringno];</div><div class='ctx'> 	uint32_t  max_cmd_idx = pring-&gt;numCiocb;</div><div class='del'>-</div><div class='ctx'> 	if ((pring-&gt;next_cmdidx == pring-&gt;cmdidx) &amp;&amp;</div><div class='ctx'> 	   (++pring-&gt;next_cmdidx &gt;= max_cmd_idx))</div><div class='ctx'> 		pring-&gt;next_cmdidx = 0;</div><div class='hunk'>@@ -336,6 +444,18 @@ lpfc_sli_next_iocb_slot (struct lpfc_hba *phba, struct lpfc_sli_ring *pring)</div><div class='ctx'> 	return lpfc_cmd_iocb(phba, pring);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_sli_next_iotag: Get an iotag for the iocb.</div><div class='add'>+ * @phba: Pointer to HBA context object.</div><div class='add'>+ * @iocbq: Pointer to driver iocb object.</div><div class='add'>+ *</div><div class='add'>+ * This function gets an iotag for the iocb. If there is no unused iotag and</div><div class='add'>+ * the iocbq_lookup_len &lt; 0xffff, this function allocates a bigger iotag_lookup</div><div class='add'>+ * array and assigns a new iotag.</div><div class='add'>+ * The function returns the allocated iotag if successful, else returns zero.</div><div class='add'>+ * Zero is not a valid iotag.</div><div class='add'>+ * The caller is not required to hold any lock.</div><div class='add'>+ **/</div><div class='ctx'> uint16_t</div><div class='ctx'> lpfc_sli_next_iotag(struct lpfc_hba *phba, struct lpfc_iocbq *iocbq)</div><div class='ctx'> {</div><div class='hunk'>@@ -399,6 +519,20 @@ lpfc_sli_next_iotag(struct lpfc_hba *phba, struct lpfc_iocbq *iocbq)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_sli_submit_iocb: Submit an iocb to the firmware.</div><div class='add'>+ * @phba: Pointer to HBA context object.</div><div class='add'>+ * @pring: Pointer to driver SLI ring object.</div><div class='add'>+ * @iocb: Pointer to iocb slot in the ring.</div><div class='add'>+ * @nextiocb: Pointer to driver iocb object which need to be</div><div class='add'>+ *            posted to firmware.</div><div class='add'>+ *</div><div class='add'>+ * This function is called with hbalock held to post a new iocb to</div><div class='add'>+ * the firmware. This function copies the new iocb to ring iocb slot and</div><div class='add'>+ * updates the ring pointers. It adds the new iocb to txcmplq if there is</div><div class='add'>+ * a completion call back for this iocb else the function will free the</div><div class='add'>+ * iocb object.</div><div class='add'>+ **/</div><div class='ctx'> static void</div><div class='ctx'> lpfc_sli_submit_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,</div><div class='ctx'> 		IOCB_t *iocb, struct lpfc_iocbq *nextiocb)</div><div class='hunk'>@@ -441,6 +575,18 @@ lpfc_sli_submit_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,</div><div class='ctx'> 	writel(pring-&gt;cmdidx, &amp;phba-&gt;host_gp[pring-&gt;ringno].cmdPutInx);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_sli_update_full_ring: Update the chip attention register.</div><div class='add'>+ * @phba: Pointer to HBA context object.</div><div class='add'>+ * @pring: Pointer to driver SLI ring object.</div><div class='add'>+ *</div><div class='add'>+ * The caller is not required to hold any lock for calling this function.</div><div class='add'>+ * This function updates the chip attention bits for the ring to inform firmware</div><div class='add'>+ * that there are pending work to be done for this ring and requests an</div><div class='add'>+ * interrupt when there is space available in the ring. This function is</div><div class='add'>+ * called when the driver is unable to post more iocbs to the ring due</div><div class='add'>+ * to unavailability of space in the ring.</div><div class='add'>+ **/</div><div class='ctx'> static void</div><div class='ctx'> lpfc_sli_update_full_ring(struct lpfc_hba *phba, struct lpfc_sli_ring *pring)</div><div class='ctx'> {</div><div class='hunk'>@@ -460,6 +606,15 @@ lpfc_sli_update_full_ring(struct lpfc_hba *phba, struct lpfc_sli_ring *pring)</div><div class='ctx'> 	pring-&gt;stats.iocb_cmd_full++;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_sli_update_ring: Update chip attention register.</div><div class='add'>+ * @phba: Pointer to HBA context object.</div><div class='add'>+ * @pring: Pointer to driver SLI ring object.</div><div class='add'>+ *</div><div class='add'>+ * This function updates the chip attention register bit for the</div><div class='add'>+ * given ring to inform HBA that there is more work to be done</div><div class='add'>+ * in this ring. The caller is not required to hold any lock.</div><div class='add'>+ **/</div><div class='ctx'> static void</div><div class='ctx'> lpfc_sli_update_ring(struct lpfc_hba *phba, struct lpfc_sli_ring *pring)</div><div class='ctx'> {</div><div class='hunk'>@@ -468,11 +623,22 @@ lpfc_sli_update_ring(struct lpfc_hba *phba, struct lpfc_sli_ring *pring)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Tell the HBA that there is work to do in this ring.</div><div class='ctx'> 	 */</div><div class='del'>-	wmb();</div><div class='del'>-	writel(CA_R0ATT &lt;&lt; (ringno * 4), phba-&gt;CAregaddr);</div><div class='del'>-	readl(phba-&gt;CAregaddr); /* flush */</div><div class='add'>+	if (!(phba-&gt;sli3_options &amp; LPFC_SLI3_CRP_ENABLED)) {</div><div class='add'>+		wmb();</div><div class='add'>+		writel(CA_R0ATT &lt;&lt; (ringno * 4), phba-&gt;CAregaddr);</div><div class='add'>+		readl(phba-&gt;CAregaddr); /* flush */</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_sli_resume_iocb: Process iocbs in the txq.</div><div class='add'>+ * @phba: Pointer to HBA context object.</div><div class='add'>+ * @pring: Pointer to driver SLI ring object.</div><div class='add'>+ *</div><div class='add'>+ * This function is called with hbalock held to post pending iocbs</div><div class='add'>+ * in the txq to the firmware. This function is called when driver</div><div class='add'>+ * detects space available in the ring.</div><div class='add'>+ **/</div><div class='ctx'> static void</div><div class='ctx'> lpfc_sli_resume_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring)</div><div class='ctx'> {</div><div class='hunk'>@@ -504,6 +670,16 @@ lpfc_sli_resume_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring)</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_sli_next_hbq_slot: Get next hbq entry for the HBQ.</div><div class='add'>+ * @phba: Pointer to HBA context object.</div><div class='add'>+ * @hbqno: HBQ number.</div><div class='add'>+ *</div><div class='add'>+ * This function is called with hbalock held to get the next</div><div class='add'>+ * available slot for the given HBQ. If there is free slot</div><div class='add'>+ * available for the HBQ it will return pointer to the next available</div><div class='add'>+ * HBQ entry else it will return NULL.</div><div class='add'>+ **/</div><div class='ctx'> static struct lpfc_hbq_entry *</div><div class='ctx'> lpfc_sli_next_hbq_slot(struct lpfc_hba *phba, uint32_t hbqno)</div><div class='ctx'> {</div><div class='hunk'>@@ -539,6 +715,15 @@ lpfc_sli_next_hbq_slot(struct lpfc_hba *phba, uint32_t hbqno)</div><div class='ctx'> 			hbqp-&gt;hbqPutIdx;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_sli_hbqbuf_free_all: Free all the hbq buffers.</div><div class='add'>+ * @phba: Pointer to HBA context object.</div><div class='add'>+ *</div><div class='add'>+ * This function is called with no lock held to free all the</div><div class='add'>+ * hbq buffers while uninitializing the SLI interface. It also</div><div class='add'>+ * frees the HBQ buffers returned by the firmware but not yet</div><div class='add'>+ * processed by the upper layers.</div><div class='add'>+ **/</div><div class='ctx'> void</div><div class='ctx'> lpfc_sli_hbqbuf_free_all(struct lpfc_hba *phba)</div><div class='ctx'> {</div><div class='hunk'>@@ -584,6 +769,18 @@ lpfc_sli_hbqbuf_free_all(struct lpfc_hba *phba)</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;phba-&gt;hbalock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_sli_hbq_to_firmware: Post the hbq buffer to firmware.</div><div class='add'>+ * @phba: Pointer to HBA context object.</div><div class='add'>+ * @hbqno: HBQ number.</div><div class='add'>+ * @hbq_buf: Pointer to HBQ buffer.</div><div class='add'>+ *</div><div class='add'>+ * This function is called with the hbalock held to post a</div><div class='add'>+ * hbq buffer to the firmware. If the function finds an empty</div><div class='add'>+ * slot in the HBQ, it will post the buffer. The function will return</div><div class='add'>+ * pointer to the hbq entry if it successfully post the buffer</div><div class='add'>+ * else it will return NULL.</div><div class='add'>+ **/</div><div class='ctx'> static struct lpfc_hbq_entry *</div><div class='ctx'> lpfc_sli_hbq_to_firmware(struct lpfc_hba *phba, uint32_t hbqno,</div><div class='ctx'> 			 struct hbq_dmabuf *hbq_buf)</div><div class='hunk'>@@ -612,6 +809,7 @@ lpfc_sli_hbq_to_firmware(struct lpfc_hba *phba, uint32_t hbqno,</div><div class='ctx'> 	return hbqe;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* HBQ for ELS and CT traffic. */</div><div class='ctx'> static struct lpfc_hbq_init lpfc_els_hbq = {</div><div class='ctx'> 	.rn = 1,</div><div class='ctx'> 	.entry_count = 200,</div><div class='hunk'>@@ -623,6 +821,7 @@ static struct lpfc_hbq_init lpfc_els_hbq = {</div><div class='ctx'> 	.add_count = 5,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* HBQ for the extra ring if needed */</div><div class='ctx'> static struct lpfc_hbq_init lpfc_extra_hbq = {</div><div class='ctx'> 	.rn = 1,</div><div class='ctx'> 	.entry_count = 200,</div><div class='hunk'>@@ -634,51 +833,81 @@ static struct lpfc_hbq_init lpfc_extra_hbq = {</div><div class='ctx'> 	.add_count = 5,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* Array of HBQs */</div><div class='ctx'> struct lpfc_hbq_init *lpfc_hbq_defs[] = {</div><div class='ctx'> 	&amp;lpfc_els_hbq,</div><div class='ctx'> 	&amp;lpfc_extra_hbq,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_sli_hbqbuf_fill_hbqs: Post more hbq buffers to HBQ.</div><div class='add'>+ * @phba: Pointer to HBA context object.</div><div class='add'>+ * @hbqno: HBQ number.</div><div class='add'>+ * @count: Number of HBQ buffers to be posted.</div><div class='add'>+ *</div><div class='add'>+ * This function is called with no lock held to post more hbq buffers to the</div><div class='add'>+ * given HBQ. The function returns the number of HBQ buffers successfully</div><div class='add'>+ * posted.</div><div class='add'>+ **/</div><div class='ctx'> static int</div><div class='ctx'> lpfc_sli_hbqbuf_fill_hbqs(struct lpfc_hba *phba, uint32_t hbqno, uint32_t count)</div><div class='ctx'> {</div><div class='del'>-	uint32_t i, start, end;</div><div class='add'>+	uint32_t i, posted = 0;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	struct hbq_dmabuf *hbq_buffer;</div><div class='del'>-</div><div class='add'>+	LIST_HEAD(hbq_buf_list);</div><div class='ctx'> 	if (!phba-&gt;hbqs[hbqno].hbq_alloc_buffer)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	start = phba-&gt;hbqs[hbqno].buffer_count;</div><div class='del'>-	end = count + start;</div><div class='del'>-	if (end &gt; lpfc_hbq_defs[hbqno]-&gt;entry_count)</div><div class='del'>-		end = lpfc_hbq_defs[hbqno]-&gt;entry_count;</div><div class='del'>-</div><div class='add'>+	if ((phba-&gt;hbqs[hbqno].buffer_count + count) &gt;</div><div class='add'>+	    lpfc_hbq_defs[hbqno]-&gt;entry_count)</div><div class='add'>+		count = lpfc_hbq_defs[hbqno]-&gt;entry_count -</div><div class='add'>+					phba-&gt;hbqs[hbqno].buffer_count;</div><div class='add'>+	if (!count)</div><div class='add'>+		return 0;</div><div class='add'>+	/* Allocate HBQ entries */</div><div class='add'>+	for (i = 0; i &lt; count; i++) {</div><div class='add'>+		hbq_buffer = (phba-&gt;hbqs[hbqno].hbq_alloc_buffer)(phba);</div><div class='add'>+		if (!hbq_buffer)</div><div class='add'>+			break;</div><div class='add'>+		list_add_tail(&amp;hbq_buffer-&gt;dbuf.list, &amp;hbq_buf_list);</div><div class='add'>+	}</div><div class='ctx'> 	/* Check whether HBQ is still in use */</div><div class='ctx'> 	spin_lock_irqsave(&amp;phba-&gt;hbalock, flags);</div><div class='ctx'> 	if (!phba-&gt;hbq_in_use)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	/* Populate HBQ entries */</div><div class='del'>-	for (i = start; i &lt; end; i++) {</div><div class='del'>-		hbq_buffer = (phba-&gt;hbqs[hbqno].hbq_alloc_buffer)(phba);</div><div class='del'>-		if (!hbq_buffer)</div><div class='del'>-			goto err;</div><div class='del'>-		hbq_buffer-&gt;tag = (i | (hbqno &lt;&lt; 16));</div><div class='del'>-		if (lpfc_sli_hbq_to_firmware(phba, hbqno, hbq_buffer))</div><div class='add'>+		goto err;</div><div class='add'>+	while (!list_empty(&amp;hbq_buf_list)) {</div><div class='add'>+		list_remove_head(&amp;hbq_buf_list, hbq_buffer, struct hbq_dmabuf,</div><div class='add'>+				 dbuf.list);</div><div class='add'>+		hbq_buffer-&gt;tag = (phba-&gt;hbqs[hbqno].buffer_count |</div><div class='add'>+				      (hbqno &lt;&lt; 16));</div><div class='add'>+		if (lpfc_sli_hbq_to_firmware(phba, hbqno, hbq_buffer)) {</div><div class='ctx'> 			phba-&gt;hbqs[hbqno].buffer_count++;</div><div class='del'>-		else</div><div class='add'>+			posted++;</div><div class='add'>+		} else</div><div class='ctx'> 			(phba-&gt;hbqs[hbqno].hbq_free_buffer)(phba, hbq_buffer);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>- out:</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;phba-&gt;hbalock, flags);</div><div class='del'>-	return 0;</div><div class='del'>- err:</div><div class='add'>+	return posted;</div><div class='add'>+err:</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;phba-&gt;hbalock, flags);</div><div class='del'>-	return 1;</div><div class='add'>+	while (!list_empty(&amp;hbq_buf_list)) {</div><div class='add'>+		list_remove_head(&amp;hbq_buf_list, hbq_buffer, struct hbq_dmabuf,</div><div class='add'>+				 dbuf.list);</div><div class='add'>+		(phba-&gt;hbqs[hbqno].hbq_free_buffer)(phba, hbq_buffer);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_sli_hbqbuf_add_hbqs: Post more HBQ buffers to firmware.</div><div class='add'>+ * @phba: Pointer to HBA context object.</div><div class='add'>+ * @qno: HBQ number.</div><div class='add'>+ *</div><div class='add'>+ * This function posts more buffers to the HBQ. This function</div><div class='add'>+ * is called with no lock held. The function returns the number of HBQ entries</div><div class='add'>+ * successfully allocated.</div><div class='add'>+ **/</div><div class='ctx'> int</div><div class='ctx'> lpfc_sli_hbqbuf_add_hbqs(struct lpfc_hba *phba, uint32_t qno)</div><div class='ctx'> {</div><div class='hunk'>@@ -686,6 +915,15 @@ lpfc_sli_hbqbuf_add_hbqs(struct lpfc_hba *phba, uint32_t qno)</div><div class='ctx'> 					 lpfc_hbq_defs[qno]-&gt;add_count));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_sli_hbqbuf_init_hbqs: Post initial buffers to the HBQ.</div><div class='add'>+ * @phba: Pointer to HBA context object.</div><div class='add'>+ * @qno:  HBQ queue number.</div><div class='add'>+ *</div><div class='add'>+ * This function is called from SLI initialization code path with</div><div class='add'>+ * no lock held to post initial HBQ buffers to firmware. The</div><div class='add'>+ * function returns the number of HBQ entries successfully allocated.</div><div class='add'>+ **/</div><div class='ctx'> static int</div><div class='ctx'> lpfc_sli_hbqbuf_init_hbqs(struct lpfc_hba *phba, uint32_t qno)</div><div class='ctx'> {</div><div class='hunk'>@@ -693,6 +931,16 @@ lpfc_sli_hbqbuf_init_hbqs(struct lpfc_hba *phba, uint32_t qno)</div><div class='ctx'> 					 lpfc_hbq_defs[qno]-&gt;init_count));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_sli_hbqbuf_find: Find the hbq buffer associated with a tag.</div><div class='add'>+ * @phba: Pointer to HBA context object.</div><div class='add'>+ * @tag: Tag of the hbq buffer.</div><div class='add'>+ *</div><div class='add'>+ * This function is called with hbalock held. This function searches</div><div class='add'>+ * for the hbq buffer associated with the given tag in the hbq buffer</div><div class='add'>+ * list. If it finds the hbq buffer, it returns the hbq_buffer other wise</div><div class='add'>+ * it returns NULL.</div><div class='add'>+ **/</div><div class='ctx'> static struct hbq_dmabuf *</div><div class='ctx'> lpfc_sli_hbqbuf_find(struct lpfc_hba *phba, uint32_t tag)</div><div class='ctx'> {</div><div class='hunk'>@@ -716,6 +964,15 @@ lpfc_sli_hbqbuf_find(struct lpfc_hba *phba, uint32_t tag)</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_sli_free_hbq: Give back the hbq buffer to firmware.</div><div class='add'>+ * @phba: Pointer to HBA context object.</div><div class='add'>+ * @hbq_buffer: Pointer to HBQ buffer.</div><div class='add'>+ *</div><div class='add'>+ * This function is called with hbalock. This function gives back</div><div class='add'>+ * the hbq buffer to firmware. If the HBQ does not have space to</div><div class='add'>+ * post the buffer, it will free the buffer.</div><div class='add'>+ **/</div><div class='ctx'> void</div><div class='ctx'> lpfc_sli_free_hbq(struct lpfc_hba *phba, struct hbq_dmabuf *hbq_buffer)</div><div class='ctx'> {</div><div class='hunk'>@@ -729,6 +986,15 @@ lpfc_sli_free_hbq(struct lpfc_hba *phba, struct hbq_dmabuf *hbq_buffer)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_sli_chk_mbx_command: Check if the mailbox is a legitimate mailbox.</div><div class='add'>+ * @mbxCommand: mailbox command code.</div><div class='add'>+ *</div><div class='add'>+ * This function is called by the mailbox event handler function to verify</div><div class='add'>+ * that the completed mailbox command is a legitimate mailbox command. If the</div><div class='add'>+ * completed mailbox is not known to the function, it will return MBX_SHUTDOWN</div><div class='add'>+ * and the mailbox event handler will take the HBA offline.</div><div class='add'>+ **/</div><div class='ctx'> static int</div><div class='ctx'> lpfc_sli_chk_mbx_command(uint8_t mbxCommand)</div><div class='ctx'> {</div><div class='hunk'>@@ -785,6 +1051,8 @@ lpfc_sli_chk_mbx_command(uint8_t mbxCommand)</div><div class='ctx'> 	case MBX_REG_VPI:</div><div class='ctx'> 	case MBX_UNREG_VPI:</div><div class='ctx'> 	case MBX_HEARTBEAT:</div><div class='add'>+	case MBX_PORT_CAPABILITIES:</div><div class='add'>+	case MBX_PORT_IOV_CONTROL:</div><div class='ctx'> 		ret = mbxCommand;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -793,6 +1061,19 @@ lpfc_sli_chk_mbx_command(uint8_t mbxCommand)</div><div class='ctx'> 	}</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * lpfc_sli_wake_mbox_wait: Completion handler for mbox issued from</div><div class='add'>+ *          lpfc_sli_issue_mbox_wait.</div><div class='add'>+ * @phba: Pointer to HBA context object.</div><div class='add'>+ * @pmboxq: Pointer to mailbox command.</div><div class='add'>+ *</div><div class='add'>+ * This is completion handler function for mailbox commands issued from</div><div class='add'>+ * lpfc_sli_issue_mbox_wait function. This function is called by the</div><div class='add'>+ * mailbox event handler function with no lock held. This function</div><div class='add'>+ * will wake up thread waiting on the wait queue pointed by context1</div><div class='add'>+ * of the mailbox.</div><div class='add'>+ **/</div><div class='ctx'> static void</div><div class='ctx'> lpfc_sli_wake_mbox_wait(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmboxq)</div><div class='ctx'> {</div><div class='hunk'>@@ -812,6 +1093,17 @@ lpfc_sli_wake_mbox_wait(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmboxq)</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * lpfc_sli_def_mbox_cmpl: Default mailbox completion handler.</div><div class='add'>+ * @phba: Pointer to HBA context object.</div><div class='add'>+ * @pmb: Pointer to mailbox object.</div><div class='add'>+ *</div><div class='add'>+ * This function is the default mailbox completion handler. It</div><div class='add'>+ * frees the memory resources associated with the completed mailbox</div><div class='add'>+ * command. If the completed command is a REG_LOGIN mailbox command,</div><div class='add'>+ * this function will issue a UREG_LOGIN to re-claim the RPI.</div><div class='add'>+ **/</div><div class='ctx'> void</div><div class='ctx'> lpfc_sli_def_mbox_cmpl(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)</div><div class='ctx'> {</div><div class='hunk'>@@ -846,6 +1138,19 @@ lpfc_sli_def_mbox_cmpl(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_sli_handle_mb_event: Handle mailbox completions from firmware.</div><div class='add'>+ * @phba: Pointer to HBA context object.</div><div class='add'>+ *</div><div class='add'>+ * This function is called with no lock held. This function processes all</div><div class='add'>+ * the completed mailbox commands and gives it to upper layers. The interrupt</div><div class='add'>+ * service routine processes mailbox completion interrupt and adds completed</div><div class='add'>+ * mailbox commands to the mboxq_cmpl queue and signals the worker thread.</div><div class='add'>+ * Worker thread call lpfc_sli_handle_mb_event, which will return the</div><div class='add'>+ * completed mailbox commands in mboxq_cmpl queue to the upper layers. This</div><div class='add'>+ * function returns the mailbox commands to the upper layer by calling the</div><div class='add'>+ * completion handler function of each mailbox.</div><div class='add'>+ **/</div><div class='ctx'> int</div><div class='ctx'> lpfc_sli_handle_mb_event(struct lpfc_hba *phba)</div><div class='ctx'> {</div><div class='hunk'>@@ -953,6 +1258,18 @@ lpfc_sli_handle_mb_event(struct lpfc_hba *phba)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_sli_replace_hbqbuff: Replace the HBQ buffer with a new buffer.</div><div class='add'>+ * @phba: Pointer to HBA context object.</div><div class='add'>+ * @tag: Tag for the HBQ buffer.</div><div class='add'>+ *</div><div class='add'>+ * This function is called from unsolicited event handler code path to get the</div><div class='add'>+ * HBQ buffer associated with an unsolicited iocb. This function is called with</div><div class='add'>+ * no lock held. It returns the buffer associated with the given tag and posts</div><div class='add'>+ * another buffer to the firmware. Note that the new buffer must be allocated</div><div class='add'>+ * before taking the hbalock and that the hba lock must be held until it is</div><div class='add'>+ * finished with the hbq entry swap.</div><div class='add'>+ **/</div><div class='ctx'> static struct lpfc_dmabuf *</div><div class='ctx'> lpfc_sli_replace_hbqbuff(struct lpfc_hba *phba, uint32_t tag)</div><div class='ctx'> {</div><div class='hunk'>@@ -962,22 +1279,28 @@ lpfc_sli_replace_hbqbuff(struct lpfc_hba *phba, uint32_t tag)</div><div class='ctx'> 	dma_addr_t phys;	/* mapped address */</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='add'>+	hbqno = tag &gt;&gt; 16;</div><div class='add'>+	new_hbq_entry = (phba-&gt;hbqs[hbqno].hbq_alloc_buffer)(phba);</div><div class='ctx'> 	/* Check whether HBQ is still in use */</div><div class='ctx'> 	spin_lock_irqsave(&amp;phba-&gt;hbalock, flags);</div><div class='ctx'> 	if (!phba-&gt;hbq_in_use) {</div><div class='add'>+		if (new_hbq_entry)</div><div class='add'>+			(phba-&gt;hbqs[hbqno].hbq_free_buffer)(phba,</div><div class='add'>+							    new_hbq_entry);</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;phba-&gt;hbalock, flags);</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	hbq_entry = lpfc_sli_hbqbuf_find(phba, tag);</div><div class='ctx'> 	if (hbq_entry == NULL) {</div><div class='add'>+		if (new_hbq_entry)</div><div class='add'>+			(phba-&gt;hbqs[hbqno].hbq_free_buffer)(phba,</div><div class='add'>+							    new_hbq_entry);</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;phba-&gt;hbalock, flags);</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> 	list_del(&amp;hbq_entry-&gt;dbuf.list);</div><div class='ctx'> </div><div class='del'>-	hbqno = tag &gt;&gt; 16;</div><div class='del'>-	new_hbq_entry = (phba-&gt;hbqs[hbqno].hbq_alloc_buffer)(phba);</div><div class='ctx'> 	if (new_hbq_entry == NULL) {</div><div class='ctx'> 		list_add_tail(&amp;hbq_entry-&gt;dbuf.list, &amp;phba-&gt;hbqbuf_in_list);</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;phba-&gt;hbalock, flags);</div><div class='hunk'>@@ -997,6 +1320,18 @@ lpfc_sli_replace_hbqbuff(struct lpfc_hba *phba, uint32_t tag)</div><div class='ctx'> 	return &amp;new_hbq_entry-&gt;dbuf;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_sli_get_buff: Get the buffer associated with the buffer tag.</div><div class='add'>+ * @phba: Pointer to HBA context object.</div><div class='add'>+ * @pring: Pointer to driver SLI ring object.</div><div class='add'>+ * @tag: buffer tag.</div><div class='add'>+ *</div><div class='add'>+ * This function is called with no lock held. When QUE_BUFTAG_BIT bit</div><div class='add'>+ * is set in the tag the buffer is posted for a particular exchange,</div><div class='add'>+ * the function will return the buffer without replacing the buffer.</div><div class='add'>+ * If the buffer is for unsolicited ELS or CT traffic, this function</div><div class='add'>+ * returns the buffer and also posts another buffer to the firmware.</div><div class='add'>+ **/</div><div class='ctx'> static struct lpfc_dmabuf *</div><div class='ctx'> lpfc_sli_get_buff(struct lpfc_hba *phba,</div><div class='ctx'> 			struct lpfc_sli_ring *pring,</div><div class='hunk'>@@ -1008,6 +1343,21 @@ lpfc_sli_get_buff(struct lpfc_hba *phba,</div><div class='ctx'> 		return lpfc_sli_replace_hbqbuff(phba, tag);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * lpfc_sli_process_unsol_iocb: Unsolicited iocb handler.</div><div class='add'>+ * @phba: Pointer to HBA context object.</div><div class='add'>+ * @pring: Pointer to driver SLI ring object.</div><div class='add'>+ * @saveq: Pointer to the unsolicited iocb.</div><div class='add'>+ *</div><div class='add'>+ * This function is called with no lock held by the ring event handler</div><div class='add'>+ * when there is an unsolicited iocb posted to the response ring by the</div><div class='add'>+ * firmware. This function gets the buffer associated with the iocbs</div><div class='add'>+ * and calls the event handler for the ring. This function handles both</div><div class='add'>+ * qring buffers and hbq buffers.</div><div class='add'>+ * When the function returns 1 the caller can free the iocb object otherwise</div><div class='add'>+ * upper layer functions will free the iocb objects.</div><div class='add'>+ **/</div><div class='ctx'> static int</div><div class='ctx'> lpfc_sli_process_unsol_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,</div><div class='ctx'> 			    struct lpfc_iocbq *saveq)</div><div class='hunk'>@@ -1192,6 +1542,18 @@ lpfc_sli_process_unsol_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_sli_iocbq_lookup: Find command iocb for the given response iocb.</div><div class='add'>+ * @phba: Pointer to HBA context object.</div><div class='add'>+ * @pring: Pointer to driver SLI ring object.</div><div class='add'>+ * @prspiocb: Pointer to response iocb object.</div><div class='add'>+ *</div><div class='add'>+ * This function looks up the iocb_lookup table to get the command iocb</div><div class='add'>+ * corresponding to the given response iocb using the iotag of the</div><div class='add'>+ * response iocb. This function is called with the hbalock held.</div><div class='add'>+ * This function returns the command iocb object if it finds the command</div><div class='add'>+ * iocb else returns NULL.</div><div class='add'>+ **/</div><div class='ctx'> static struct lpfc_iocbq *</div><div class='ctx'> lpfc_sli_iocbq_lookup(struct lpfc_hba *phba,</div><div class='ctx'> 		      struct lpfc_sli_ring *pring,</div><div class='hunk'>@@ -1217,6 +1579,23 @@ lpfc_sli_iocbq_lookup(struct lpfc_hba *phba,</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_sli_process_sol_iocb: process solicited iocb completion.</div><div class='add'>+ * @phba: Pointer to HBA context object.</div><div class='add'>+ * @pring: Pointer to driver SLI ring object.</div><div class='add'>+ * @saveq: Pointer to the response iocb to be processed.</div><div class='add'>+ *</div><div class='add'>+ * This function is called by the ring event handler for non-fcp</div><div class='add'>+ * rings when there is a new response iocb in the response ring.</div><div class='add'>+ * The caller is not required to hold any locks. This function</div><div class='add'>+ * gets the command iocb associated with the response iocb and</div><div class='add'>+ * calls the completion handler for the command iocb. If there</div><div class='add'>+ * is no completion handler, the function will free the resources</div><div class='add'>+ * associated with command iocb. If the response iocb is for</div><div class='add'>+ * an already aborted command iocb, the status of the completion</div><div class='add'>+ * is changed to IOSTAT_LOCAL_REJECT/IOERR_SLI_ABORTED.</div><div class='add'>+ * This function always returns 1.</div><div class='add'>+ **/</div><div class='ctx'> static int</div><div class='ctx'> lpfc_sli_process_sol_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,</div><div class='ctx'> 			  struct lpfc_iocbq *saveq)</div><div class='hunk'>@@ -1233,6 +1612,17 @@ lpfc_sli_process_sol_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,</div><div class='ctx'> 	if (cmdiocbp) {</div><div class='ctx'> 		if (cmdiocbp-&gt;iocb_cmpl) {</div><div class='ctx'> 			/*</div><div class='add'>+			 * If an ELS command failed send an event to mgmt</div><div class='add'>+			 * application.</div><div class='add'>+			 */</div><div class='add'>+			if (saveq-&gt;iocb.ulpStatus &amp;&amp;</div><div class='add'>+			     (pring-&gt;ringno == LPFC_ELS_RING) &amp;&amp;</div><div class='add'>+			     (cmdiocbp-&gt;iocb.ulpCommand ==</div><div class='add'>+				CMD_ELS_REQUEST64_CR))</div><div class='add'>+				lpfc_send_els_failure_event(phba,</div><div class='add'>+					cmdiocbp, saveq);</div><div class='add'>+</div><div class='add'>+			/*</div><div class='ctx'> 			 * Post all ELS completions to the worker thread.</div><div class='ctx'> 			 * All other are passed to the completion callback.</div><div class='ctx'> 			 */</div><div class='hunk'>@@ -1282,12 +1672,20 @@ lpfc_sli_process_sol_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_sli_rsp_pointers_error: Response ring pointer error handler.</div><div class='add'>+ * @phba: Pointer to HBA context object.</div><div class='add'>+ * @pring: Pointer to driver SLI ring object.</div><div class='add'>+ *</div><div class='add'>+ * This function is called from the iocb ring event handlers when</div><div class='add'>+ * put pointer is ahead of the get pointer for a ring. This function signal</div><div class='add'>+ * an error attention condition to the worker thread and the worker</div><div class='add'>+ * thread will transition the HBA to offline state.</div><div class='add'>+ **/</div><div class='ctx'> static void</div><div class='ctx'> lpfc_sli_rsp_pointers_error(struct lpfc_hba *phba, struct lpfc_sli_ring *pring)</div><div class='ctx'> {</div><div class='del'>-	struct lpfc_pgp *pgp = (phba-&gt;sli_rev == 3) ?</div><div class='del'>-		&amp;phba-&gt;slim2p-&gt;mbx.us.s3_pgp.port[pring-&gt;ringno] :</div><div class='del'>-		&amp;phba-&gt;slim2p-&gt;mbx.us.s2.port[pring-&gt;ringno];</div><div class='add'>+	struct lpfc_pgp *pgp = &amp;phba-&gt;port_gp[pring-&gt;ringno];</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Ring &lt;ringno&gt; handler: portRspPut &lt;portRspPut&gt; is bigger then</div><div class='ctx'> 	 * rsp ring &lt;portRspMax&gt;</div><div class='hunk'>@@ -1312,6 +1710,51 @@ lpfc_sli_rsp_pointers_error(struct lpfc_hba *phba, struct lpfc_sli_ring *pring)</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_poll_eratt: Error attention polling timer timeout handler.</div><div class='add'>+ * @ptr: Pointer to address of HBA context object.</div><div class='add'>+ *</div><div class='add'>+ * This function is invoked by the Error Attention polling timer when the</div><div class='add'>+ * timer times out. It will check the SLI Error Attention register for</div><div class='add'>+ * possible attention events. If so, it will post an Error Attention event</div><div class='add'>+ * and wake up worker thread to process it. Otherwise, it will set up the</div><div class='add'>+ * Error Attention polling timer for the next poll.</div><div class='add'>+ **/</div><div class='add'>+void lpfc_poll_eratt(unsigned long ptr)</div><div class='add'>+{</div><div class='add'>+	struct lpfc_hba *phba;</div><div class='add'>+	uint32_t eratt = 0;</div><div class='add'>+</div><div class='add'>+	phba = (struct lpfc_hba *)ptr;</div><div class='add'>+</div><div class='add'>+	/* Check chip HA register for error event */</div><div class='add'>+	eratt = lpfc_sli_check_eratt(phba);</div><div class='add'>+</div><div class='add'>+	if (eratt)</div><div class='add'>+		/* Tell the worker thread there is work to do */</div><div class='add'>+		lpfc_worker_wake_up(phba);</div><div class='add'>+	else</div><div class='add'>+		/* Restart the timer for next eratt poll */</div><div class='add'>+		mod_timer(&amp;phba-&gt;eratt_poll, jiffies +</div><div class='add'>+					HZ * LPFC_ERATT_POLL_INTERVAL);</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * lpfc_sli_poll_fcp_ring: Handle FCP ring completion in polling mode.</div><div class='add'>+ * @phba: Pointer to HBA context object.</div><div class='add'>+ *</div><div class='add'>+ * This function is called from lpfc_queuecommand, lpfc_poll_timeout,</div><div class='add'>+ * lpfc_abort_handler and lpfc_slave_configure when FCP_RING_POLLING</div><div class='add'>+ * is enabled.</div><div class='add'>+ *</div><div class='add'>+ * The caller does not hold any lock.</div><div class='add'>+ * The function processes each response iocb in the response ring until it</div><div class='add'>+ * finds an iocb with LE bit set and chains all the iocbs upto the iocb with</div><div class='add'>+ * LE bit set. The function will call the completion handler of the command iocb</div><div class='add'>+ * if the response iocb indicates a completion for a command iocb or it is</div><div class='add'>+ * an abort completion.</div><div class='add'>+ **/</div><div class='ctx'> void lpfc_sli_poll_fcp_ring(struct lpfc_hba *phba)</div><div class='ctx'> {</div><div class='ctx'> 	struct lpfc_sli      *psli  = &amp;phba-&gt;sli;</div><div class='hunk'>@@ -1320,7 +1763,7 @@ void lpfc_sli_poll_fcp_ring(struct lpfc_hba *phba)</div><div class='ctx'> 	IOCB_t *entry = NULL;</div><div class='ctx'> 	struct lpfc_iocbq *cmdiocbq = NULL;</div><div class='ctx'> 	struct lpfc_iocbq rspiocbq;</div><div class='del'>-	struct lpfc_pgp *pgp;</div><div class='add'>+	struct lpfc_pgp *pgp = &amp;phba-&gt;port_gp[pring-&gt;ringno];</div><div class='ctx'> 	uint32_t status;</div><div class='ctx'> 	uint32_t portRspPut, portRspMax;</div><div class='ctx'> 	int type;</div><div class='hunk'>@@ -1330,11 +1773,6 @@ void lpfc_sli_poll_fcp_ring(struct lpfc_hba *phba)</div><div class='ctx'> </div><div class='ctx'> 	pring-&gt;stats.iocb_event++;</div><div class='ctx'> </div><div class='del'>-	pgp = (phba-&gt;sli_rev == 3) ?</div><div class='del'>-		&amp;phba-&gt;slim2p-&gt;mbx.us.s3_pgp.port[pring-&gt;ringno] :</div><div class='del'>-		&amp;phba-&gt;slim2p-&gt;mbx.us.s2.port[pring-&gt;ringno];</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The next available response entry should never exceed the maximum</div><div class='ctx'> 	 * entries.  If it does, treat it as an adapter hardware error.</div><div class='hunk'>@@ -1372,8 +1810,8 @@ void lpfc_sli_poll_fcp_ring(struct lpfc_hba *phba)</div><div class='ctx'> 					irsp-&gt;un.ulpWord[3],</div><div class='ctx'> 					irsp-&gt;un.ulpWord[4],</div><div class='ctx'> 					irsp-&gt;un.ulpWord[5],</div><div class='del'>-					*(((uint32_t *) irsp) + 6),</div><div class='del'>-					*(((uint32_t *) irsp) + 7));</div><div class='add'>+					*(uint32_t *)&amp;irsp-&gt;un1,</div><div class='add'>+					*((uint32_t *)&amp;irsp-&gt;un1 + 1));</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		switch (type) {</div><div class='hunk'>@@ -1465,17 +1903,28 @@ void lpfc_sli_poll_fcp_ring(struct lpfc_hba *phba)</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='add'>+/**</div><div class='add'>+ * lpfc_sli_handle_fast_ring_event: Handle ring events on FCP ring.</div><div class='add'>+ * @phba: Pointer to HBA context object.</div><div class='add'>+ * @pring: Pointer to driver SLI ring object.</div><div class='add'>+ * @mask: Host attention register mask for this ring.</div><div class='add'>+ *</div><div class='add'>+ * This function is called from the interrupt context when there is a ring</div><div class='add'>+ * event for the fcp ring. The caller does not hold any lock.</div><div class='add'>+ * The function processes each response iocb in the response ring until it</div><div class='add'>+ * finds an iocb with LE bit set and chains all the iocbs upto the iocb with</div><div class='add'>+ * LE bit set. The function will call the completion handler of the command iocb</div><div class='add'>+ * if the response iocb indicates a completion for a command iocb or it is</div><div class='add'>+ * an abort completion. The function will call lpfc_sli_process_unsol_iocb</div><div class='add'>+ * function if this is an unsolicited iocb.</div><div class='ctx'>  * This routine presumes LPFC_FCP_RING handling and doesn't bother</div><div class='del'>- * to check it explicitly.</div><div class='del'>- */</div><div class='add'>+ * to check it explicitly. This function always returns 1.</div><div class='add'>+ **/</div><div class='ctx'> static int</div><div class='ctx'> lpfc_sli_handle_fast_ring_event(struct lpfc_hba *phba,</div><div class='ctx'> 				struct lpfc_sli_ring *pring, uint32_t mask)</div><div class='ctx'> {</div><div class='del'>-	struct lpfc_pgp *pgp = (phba-&gt;sli_rev == 3) ?</div><div class='del'>-		&amp;phba-&gt;slim2p-&gt;mbx.us.s3_pgp.port[pring-&gt;ringno] :</div><div class='del'>-		&amp;phba-&gt;slim2p-&gt;mbx.us.s2.port[pring-&gt;ringno];</div><div class='add'>+	struct lpfc_pgp *pgp = &amp;phba-&gt;port_gp[pring-&gt;ringno];</div><div class='ctx'> 	IOCB_t *irsp = NULL;</div><div class='ctx'> 	IOCB_t *entry = NULL;</div><div class='ctx'> 	struct lpfc_iocbq *cmdiocbq = NULL;</div><div class='hunk'>@@ -1548,8 +1997,8 @@ lpfc_sli_handle_fast_ring_event(struct lpfc_hba *phba,</div><div class='ctx'> 					irsp-&gt;un.ulpWord[3],</div><div class='ctx'> 					irsp-&gt;un.ulpWord[4],</div><div class='ctx'> 					irsp-&gt;un.ulpWord[5],</div><div class='del'>-					*(((uint32_t *) irsp) + 6),</div><div class='del'>-					*(((uint32_t *) irsp) + 7));</div><div class='add'>+					*(uint32_t *)&amp;irsp-&gt;un1,</div><div class='add'>+					*((uint32_t *)&amp;irsp-&gt;un1 + 1));</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		switch (type) {</div><div class='hunk'>@@ -1646,13 +2095,28 @@ lpfc_sli_handle_fast_ring_event(struct lpfc_hba *phba,</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_sli_handle_slow_ring_event: Handle ring events for non-FCP rings.</div><div class='add'>+ * @phba: Pointer to HBA context object.</div><div class='add'>+ * @pring: Pointer to driver SLI ring object.</div><div class='add'>+ * @mask: Host attention register mask for this ring.</div><div class='add'>+ *</div><div class='add'>+ * This function is called from the worker thread when there is a ring</div><div class='add'>+ * event for non-fcp rings. The caller does not hold any lock .</div><div class='add'>+ * The function processes each response iocb in the response ring until it</div><div class='add'>+ * finds an iocb with LE bit set and chains all the iocbs upto the iocb with</div><div class='add'>+ * LE bit set. The function will call lpfc_sli_process_sol_iocb function if the</div><div class='add'>+ * response iocb indicates a completion of a command iocb. The function</div><div class='add'>+ * will call lpfc_sli_process_unsol_iocb function if this is an unsolicited</div><div class='add'>+ * iocb. The function frees the resources or calls the completion handler if</div><div class='add'>+ * this iocb is an abort completion. The function returns 0 when the allocated</div><div class='add'>+ * iocbs are not freed, otherwise returns 1.</div><div class='add'>+ **/</div><div class='ctx'> int</div><div class='ctx'> lpfc_sli_handle_slow_ring_event(struct lpfc_hba *phba,</div><div class='ctx'> 				struct lpfc_sli_ring *pring, uint32_t mask)</div><div class='ctx'> {</div><div class='del'>-	struct lpfc_pgp *pgp = (phba-&gt;sli_rev == 3) ?</div><div class='del'>-		&amp;phba-&gt;slim2p-&gt;mbx.us.s3_pgp.port[pring-&gt;ringno] :</div><div class='del'>-		&amp;phba-&gt;slim2p-&gt;mbx.us.s2.port[pring-&gt;ringno];</div><div class='add'>+	struct lpfc_pgp *pgp;</div><div class='ctx'> 	IOCB_t *entry;</div><div class='ctx'> 	IOCB_t *irsp = NULL;</div><div class='ctx'> 	struct lpfc_iocbq *rspiocbp = NULL;</div><div class='hunk'>@@ -1666,6 +2130,7 @@ lpfc_sli_handle_slow_ring_event(struct lpfc_hba *phba,</div><div class='ctx'> 	int rc = 1;</div><div class='ctx'> 	unsigned long iflag;</div><div class='ctx'> </div><div class='add'>+	pgp = &amp;phba-&gt;port_gp[pring-&gt;ringno];</div><div class='ctx'> 	spin_lock_irqsave(&amp;phba-&gt;hbalock, iflag);</div><div class='ctx'> 	pring-&gt;stats.iocb_event++;</div><div class='ctx'> </div><div class='hunk'>@@ -1904,6 +2369,16 @@ lpfc_sli_handle_slow_ring_event(struct lpfc_hba *phba,</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_sli_abort_iocb_ring: Abort all iocbs in the ring.</div><div class='add'>+ * @phba: Pointer to HBA context object.</div><div class='add'>+ * @pring: Pointer to driver SLI ring object.</div><div class='add'>+ *</div><div class='add'>+ * This function aborts all iocbs in the given ring and frees all the iocb</div><div class='add'>+ * objects in txq. This function issues an abort iocb for all the iocb commands</div><div class='add'>+ * in txcmplq. The iocbs in the txcmplq is not guaranteed to complete before</div><div class='add'>+ * the return of this function. The caller is not required to hold any locks.</div><div class='add'>+ **/</div><div class='ctx'> void</div><div class='ctx'> lpfc_sli_abort_iocb_ring(struct lpfc_hba *phba, struct lpfc_sli_ring *pring)</div><div class='ctx'> {</div><div class='hunk'>@@ -1943,6 +2418,83 @@ lpfc_sli_abort_iocb_ring(struct lpfc_hba *phba, struct lpfc_sli_ring *pring)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_sli_flush_fcp_rings: flush all iocbs in the fcp ring.</div><div class='add'>+ * @phba: Pointer to HBA context object.</div><div class='add'>+ *</div><div class='add'>+ * This function flushes all iocbs in the fcp ring and frees all the iocb</div><div class='add'>+ * objects in txq and txcmplq. This function will not issue abort iocbs</div><div class='add'>+ * for all the iocb commands in txcmplq, they will just be returned with</div><div class='add'>+ * IOERR_SLI_DOWN. This function is invoked with EEH when device's PCI</div><div class='add'>+ * slot has been permanently disabled.</div><div class='add'>+ **/</div><div class='add'>+void</div><div class='add'>+lpfc_sli_flush_fcp_rings(struct lpfc_hba *phba)</div><div class='add'>+{</div><div class='add'>+	LIST_HEAD(txq);</div><div class='add'>+	LIST_HEAD(txcmplq);</div><div class='add'>+	struct lpfc_iocbq *iocb;</div><div class='add'>+	IOCB_t *cmd = NULL;</div><div class='add'>+	struct lpfc_sli *psli = &amp;phba-&gt;sli;</div><div class='add'>+	struct lpfc_sli_ring  *pring;</div><div class='add'>+</div><div class='add'>+	/* Currently, only one fcp ring */</div><div class='add'>+	pring = &amp;psli-&gt;ring[psli-&gt;fcp_ring];</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(&amp;phba-&gt;hbalock);</div><div class='add'>+	/* Retrieve everything on txq */</div><div class='add'>+	list_splice_init(&amp;pring-&gt;txq, &amp;txq);</div><div class='add'>+	pring-&gt;txq_cnt = 0;</div><div class='add'>+</div><div class='add'>+	/* Retrieve everything on the txcmplq */</div><div class='add'>+	list_splice_init(&amp;pring-&gt;txcmplq, &amp;txcmplq);</div><div class='add'>+	pring-&gt;txcmplq_cnt = 0;</div><div class='add'>+	spin_unlock_irq(&amp;phba-&gt;hbalock);</div><div class='add'>+</div><div class='add'>+	/* Flush the txq */</div><div class='add'>+	while (!list_empty(&amp;txq)) {</div><div class='add'>+		iocb = list_get_first(&amp;txq, struct lpfc_iocbq, list);</div><div class='add'>+		cmd = &amp;iocb-&gt;iocb;</div><div class='add'>+		list_del_init(&amp;iocb-&gt;list);</div><div class='add'>+</div><div class='add'>+		if (!iocb-&gt;iocb_cmpl)</div><div class='add'>+			lpfc_sli_release_iocbq(phba, iocb);</div><div class='add'>+		else {</div><div class='add'>+			cmd-&gt;ulpStatus = IOSTAT_LOCAL_REJECT;</div><div class='add'>+			cmd-&gt;un.ulpWord[4] = IOERR_SLI_DOWN;</div><div class='add'>+			(iocb-&gt;iocb_cmpl) (phba, iocb, iocb);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Flush the txcmpq */</div><div class='add'>+	while (!list_empty(&amp;txcmplq)) {</div><div class='add'>+		iocb = list_get_first(&amp;txcmplq, struct lpfc_iocbq, list);</div><div class='add'>+		cmd = &amp;iocb-&gt;iocb;</div><div class='add'>+		list_del_init(&amp;iocb-&gt;list);</div><div class='add'>+</div><div class='add'>+		if (!iocb-&gt;iocb_cmpl)</div><div class='add'>+			lpfc_sli_release_iocbq(phba, iocb);</div><div class='add'>+		else {</div><div class='add'>+			cmd-&gt;ulpStatus = IOSTAT_LOCAL_REJECT;</div><div class='add'>+			cmd-&gt;un.ulpWord[4] = IOERR_SLI_DOWN;</div><div class='add'>+			(iocb-&gt;iocb_cmpl) (phba, iocb, iocb);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * lpfc_sli_brdready: Check for host status bits.</div><div class='add'>+ * @phba: Pointer to HBA context object.</div><div class='add'>+ * @mask: Bit mask to be checked.</div><div class='add'>+ *</div><div class='add'>+ * This function reads the host status register and compares</div><div class='add'>+ * with the provided bit mask to check if HBA completed</div><div class='add'>+ * the restart. This function will wait in a loop for the</div><div class='add'>+ * HBA to complete restart. If the HBA does not restart within</div><div class='add'>+ * 15 iterations, the function will reset the HBA again. The</div><div class='add'>+ * function returns 1 when HBA fail to restart otherwise returns</div><div class='add'>+ * zero.</div><div class='add'>+ **/</div><div class='ctx'> int</div><div class='ctx'> lpfc_sli_brdready(struct lpfc_hba *phba, uint32_t mask)</div><div class='ctx'> {</div><div class='hunk'>@@ -1990,6 +2542,13 @@ lpfc_sli_brdready(struct lpfc_hba *phba, uint32_t mask)</div><div class='ctx'> </div><div class='ctx'> #define BARRIER_TEST_PATTERN (0xdeadbeef)</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_reset_barrier: Make HBA ready for HBA reset.</div><div class='add'>+ * @phba: Pointer to HBA context object.</div><div class='add'>+ *</div><div class='add'>+ * This function is called before resetting an HBA. This</div><div class='add'>+ * function requests HBA to quiesce DMAs before a reset.</div><div class='add'>+ **/</div><div class='ctx'> void lpfc_reset_barrier(struct lpfc_hba *phba)</div><div class='ctx'> {</div><div class='ctx'> 	uint32_t __iomem *resp_buf;</div><div class='hunk'>@@ -2063,6 +2622,17 @@ restore_hc:</div><div class='ctx'> 	readl(phba-&gt;HCregaddr); /* flush */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_sli_brdkill: Issue a kill_board mailbox command.</div><div class='add'>+ * @phba: Pointer to HBA context object.</div><div class='add'>+ *</div><div class='add'>+ * This function issues a kill_board mailbox command and waits for</div><div class='add'>+ * the error attention interrupt. This function is called for stopping</div><div class='add'>+ * the firmware processing. The caller is not required to hold any</div><div class='add'>+ * locks. This function calls lpfc_hba_down_post function to free</div><div class='add'>+ * any pending commands after the kill. The function will return 1 when it</div><div class='add'>+ * fails to kill the board else will return 0.</div><div class='add'>+ **/</div><div class='ctx'> int</div><div class='ctx'> lpfc_sli_brdkill(struct lpfc_hba *phba)</div><div class='ctx'> {</div><div class='hunk'>@@ -2139,6 +2709,17 @@ lpfc_sli_brdkill(struct lpfc_hba *phba)</div><div class='ctx'> 	return ha_copy &amp; HA_ERATT ? 0 : 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_sli_brdreset: Reset the HBA.</div><div class='add'>+ * @phba: Pointer to HBA context object.</div><div class='add'>+ *</div><div class='add'>+ * This function resets the HBA by writing HC_INITFF to the control</div><div class='add'>+ * register. After the HBA resets, this function resets all the iocb ring</div><div class='add'>+ * indices. This function disables PCI layer parity checking during</div><div class='add'>+ * the reset.</div><div class='add'>+ * This function returns 0 always.</div><div class='add'>+ * The caller is not required to hold any locks.</div><div class='add'>+ **/</div><div class='ctx'> int</div><div class='ctx'> lpfc_sli_brdreset(struct lpfc_hba *phba)</div><div class='ctx'> {</div><div class='hunk'>@@ -2191,6 +2772,19 @@ lpfc_sli_brdreset(struct lpfc_hba *phba)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_sli_brdrestart: Restart the HBA.</div><div class='add'>+ * @phba: Pointer to HBA context object.</div><div class='add'>+ *</div><div class='add'>+ * This function is called in the SLI initialization code path to</div><div class='add'>+ * restart the HBA. The caller is not required to hold any lock.</div><div class='add'>+ * This function writes MBX_RESTART mailbox command to the SLIM and</div><div class='add'>+ * resets the HBA. At the end of the function, it calls lpfc_hba_down_post</div><div class='add'>+ * function to free any pending commands. The function enables</div><div class='add'>+ * POST only during the first initialization. The function returns zero.</div><div class='add'>+ * The function does not guarantee completion of MBX_RESTART mailbox</div><div class='add'>+ * command before the return of this function.</div><div class='add'>+ **/</div><div class='ctx'> int</div><div class='ctx'> lpfc_sli_brdrestart(struct lpfc_hba *phba)</div><div class='ctx'> {</div><div class='hunk'>@@ -2251,6 +2845,16 @@ lpfc_sli_brdrestart(struct lpfc_hba *phba)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_sli_chipset_init: Wait for the restart of the HBA after a restart.</div><div class='add'>+ * @phba: Pointer to HBA context object.</div><div class='add'>+ *</div><div class='add'>+ * This function is called after a HBA restart to wait for successful</div><div class='add'>+ * restart of the HBA. Successful restart of the HBA is indicated by</div><div class='add'>+ * HS_FFRDY and HS_MBRDY bits. If the HBA fails to restart even after 15</div><div class='add'>+ * iteration, the function will restart the HBA again. The function returns</div><div class='add'>+ * zero if HBA successfully restarted else returns negative error code.</div><div class='add'>+ **/</div><div class='ctx'> static int</div><div class='ctx'> lpfc_sli_chipset_init(struct lpfc_hba *phba)</div><div class='ctx'> {</div><div class='hunk'>@@ -2336,12 +2940,25 @@ lpfc_sli_chipset_init(struct lpfc_hba *phba)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_sli_hbq_count: Get the number of HBQs to be configured.</div><div class='add'>+ *</div><div class='add'>+ * This function calculates and returns the number of HBQs required to be</div><div class='add'>+ * configured.</div><div class='add'>+ **/</div><div class='ctx'> int</div><div class='ctx'> lpfc_sli_hbq_count(void)</div><div class='ctx'> {</div><div class='ctx'> 	return ARRAY_SIZE(lpfc_hbq_defs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_sli_hbq_entry_count: Calculate total number of hbq entries.</div><div class='add'>+ *</div><div class='add'>+ * This function adds the number of hbq entries in every HBQ to get</div><div class='add'>+ * the total number of hbq entries required for the HBA and returns</div><div class='add'>+ * the total count.</div><div class='add'>+ **/</div><div class='ctx'> static int</div><div class='ctx'> lpfc_sli_hbq_entry_count(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -2354,12 +2971,27 @@ lpfc_sli_hbq_entry_count(void)</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_sli_hbq_size: Calculate memory required for all hbq entries.</div><div class='add'>+ *</div><div class='add'>+ * This function calculates amount of memory required for all hbq entries</div><div class='add'>+ * to be configured and returns the total memory required.</div><div class='add'>+ **/</div><div class='ctx'> int</div><div class='ctx'> lpfc_sli_hbq_size(void)</div><div class='ctx'> {</div><div class='ctx'> 	return lpfc_sli_hbq_entry_count() * sizeof(struct lpfc_hbq_entry);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_sli_hbq_setup: configure and initialize HBQs.</div><div class='add'>+ * @phba: Pointer to HBA context object.</div><div class='add'>+ *</div><div class='add'>+ * This function is called during the SLI initialization to configure</div><div class='add'>+ * all the HBQs and post buffers to the HBQ. The caller is not</div><div class='add'>+ * required to hold any locks. This function will return zero if successful</div><div class='add'>+ * else it will return negative error code.</div><div class='add'>+ **/</div><div class='ctx'> static int</div><div class='ctx'> lpfc_sli_hbq_setup(struct lpfc_hba *phba)</div><div class='ctx'> {</div><div class='hunk'>@@ -2415,15 +3047,26 @@ lpfc_sli_hbq_setup(struct lpfc_hba *phba)</div><div class='ctx'> 	mempool_free(pmb, phba-&gt;mbox_mem_pool);</div><div class='ctx'> </div><div class='ctx'> 	/* Initially populate or replenish the HBQs */</div><div class='del'>-	for (hbqno = 0; hbqno &lt; hbq_count; ++hbqno) {</div><div class='del'>-		if (lpfc_sli_hbqbuf_init_hbqs(phba, hbqno))</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-	}</div><div class='add'>+	for (hbqno = 0; hbqno &lt; hbq_count; ++hbqno)</div><div class='add'>+		lpfc_sli_hbqbuf_init_hbqs(phba, hbqno);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-lpfc_do_config_port(struct lpfc_hba *phba, int sli_mode)</div><div class='add'>+/**</div><div class='add'>+ * lpfc_sli_config_port: Issue config port mailbox command.</div><div class='add'>+ * @phba: Pointer to HBA context object.</div><div class='add'>+ * @sli_mode: sli mode - 2/3</div><div class='add'>+ *</div><div class='add'>+ * This function is called by the sli intialization code path</div><div class='add'>+ * to issue config_port mailbox command. This function restarts the</div><div class='add'>+ * HBA firmware and issues a config_port mailbox command to configure</div><div class='add'>+ * the SLI interface in the sli mode specified by sli_mode</div><div class='add'>+ * variable. The caller is not required to hold any locks.</div><div class='add'>+ * The function returns 0 if successful, else returns negative error</div><div class='add'>+ * code.</div><div class='add'>+ **/</div><div class='add'>+int</div><div class='add'>+lpfc_sli_config_port(struct lpfc_hba *phba, int sli_mode)</div><div class='ctx'> {</div><div class='ctx'> 	LPFC_MBOXQ_t *pmb;</div><div class='ctx'> 	uint32_t resetcount = 0, rc = 0, done = 0;</div><div class='hunk'>@@ -2460,13 +3103,15 @@ lpfc_do_config_port(struct lpfc_hba *phba, int sli_mode)</div><div class='ctx'> 		if (rc == -ERESTART) {</div><div class='ctx'> 			phba-&gt;link_state = LPFC_LINK_UNKNOWN;</div><div class='ctx'> 			continue;</div><div class='del'>-		} else if (rc) {</div><div class='add'>+		} else if (rc)</div><div class='ctx'> 			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='ctx'> 		phba-&gt;link_state = LPFC_INIT_MBX_CMDS;</div><div class='ctx'> 		lpfc_config_port(phba, pmb);</div><div class='ctx'> 		rc = lpfc_sli_issue_mbox(phba, pmb, MBX_POLL);</div><div class='add'>+		phba-&gt;sli3_options &amp;= ~(LPFC_SLI3_NPIV_ENABLED |</div><div class='add'>+					LPFC_SLI3_HBQ_ENABLED |</div><div class='add'>+					LPFC_SLI3_CRP_ENABLED |</div><div class='add'>+					LPFC_SLI3_INB_ENABLED);</div><div class='ctx'> 		if (rc != MBX_SUCCESS) {</div><div class='ctx'> 			lpfc_printf_log(phba, KERN_ERR, LOG_INIT,</div><div class='ctx'> 				"0442 Adapter failed to init, mbxCmd x%x "</div><div class='hunk'>@@ -2476,30 +3121,64 @@ lpfc_do_config_port(struct lpfc_hba *phba, int sli_mode)</div><div class='ctx'> 			phba-&gt;sli.sli_flag &amp;= ~LPFC_SLI2_ACTIVE;</div><div class='ctx'> 			spin_unlock_irq(&amp;phba-&gt;hbalock);</div><div class='ctx'> 			rc = -ENXIO;</div><div class='del'>-		} else {</div><div class='add'>+		} else</div><div class='ctx'> 			done = 1;</div><div class='del'>-			phba-&gt;max_vpi = (phba-&gt;max_vpi &amp;&amp;</div><div class='del'>-					 pmb-&gt;mb.un.varCfgPort.gmv) != 0</div><div class='del'>-				? pmb-&gt;mb.un.varCfgPort.max_vpi</div><div class='del'>-				: 0;</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> 	if (!done) {</div><div class='ctx'> 		rc = -EINVAL;</div><div class='ctx'> 		goto do_prep_failed;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	if ((pmb-&gt;mb.un.varCfgPort.sli_mode == 3) &amp;&amp;</div><div class='del'>-		(!pmb-&gt;mb.un.varCfgPort.cMA)) {</div><div class='del'>-		rc = -ENXIO;</div><div class='add'>+	if (pmb-&gt;mb.un.varCfgPort.sli_mode == 3) {</div><div class='add'>+		if (!pmb-&gt;mb.un.varCfgPort.cMA) {</div><div class='add'>+			rc = -ENXIO;</div><div class='add'>+			goto do_prep_failed;</div><div class='add'>+		}</div><div class='add'>+		if (phba-&gt;max_vpi &amp;&amp; pmb-&gt;mb.un.varCfgPort.gmv) {</div><div class='add'>+			phba-&gt;sli3_options |= LPFC_SLI3_NPIV_ENABLED;</div><div class='add'>+			phba-&gt;max_vpi = pmb-&gt;mb.un.varCfgPort.max_vpi;</div><div class='add'>+		} else</div><div class='add'>+			phba-&gt;max_vpi = 0;</div><div class='add'>+		if (pmb-&gt;mb.un.varCfgPort.gerbm)</div><div class='add'>+			phba-&gt;sli3_options |= LPFC_SLI3_HBQ_ENABLED;</div><div class='add'>+		if (pmb-&gt;mb.un.varCfgPort.gcrp)</div><div class='add'>+			phba-&gt;sli3_options |= LPFC_SLI3_CRP_ENABLED;</div><div class='add'>+		if (pmb-&gt;mb.un.varCfgPort.ginb) {</div><div class='add'>+			phba-&gt;sli3_options |= LPFC_SLI3_INB_ENABLED;</div><div class='add'>+			phba-&gt;port_gp = phba-&gt;mbox-&gt;us.s3_inb_pgp.port;</div><div class='add'>+			phba-&gt;inb_ha_copy = &amp;phba-&gt;mbox-&gt;us.s3_inb_pgp.ha_copy;</div><div class='add'>+			phba-&gt;inb_counter = &amp;phba-&gt;mbox-&gt;us.s3_inb_pgp.counter;</div><div class='add'>+			phba-&gt;inb_last_counter =</div><div class='add'>+					phba-&gt;mbox-&gt;us.s3_inb_pgp.counter;</div><div class='add'>+		} else {</div><div class='add'>+			phba-&gt;port_gp = phba-&gt;mbox-&gt;us.s3_pgp.port;</div><div class='add'>+			phba-&gt;inb_ha_copy = NULL;</div><div class='add'>+			phba-&gt;inb_counter = NULL;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		phba-&gt;port_gp = phba-&gt;mbox-&gt;us.s2.port;</div><div class='add'>+		phba-&gt;inb_ha_copy = NULL;</div><div class='add'>+		phba-&gt;inb_counter = NULL;</div><div class='add'>+		phba-&gt;max_vpi = 0;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> do_prep_failed:</div><div class='ctx'> 	mempool_free(pmb, phba-&gt;mbox_mem_pool);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * lpfc_sli_hba_setup: SLI intialization function.</div><div class='add'>+ * @phba: Pointer to HBA context object.</div><div class='add'>+ *</div><div class='add'>+ * This function is the main SLI intialization function. This function</div><div class='add'>+ * is called by the HBA intialization code, HBA reset code and HBA</div><div class='add'>+ * error attention handler code. Caller is not required to hold any</div><div class='add'>+ * locks. This function issues config_port mailbox command to configure</div><div class='add'>+ * the SLI, setup iocb rings and HBQ rings. In the end the function</div><div class='add'>+ * calls the config_port_post function to issue init_link mailbox</div><div class='add'>+ * command and to start the discovery. The function will return zero</div><div class='add'>+ * if successful, else it will return negative error code.</div><div class='add'>+ **/</div><div class='ctx'> int</div><div class='ctx'> lpfc_sli_hba_setup(struct lpfc_hba *phba)</div><div class='ctx'> {</div><div class='hunk'>@@ -2528,22 +3207,20 @@ lpfc_sli_hba_setup(struct lpfc_hba *phba)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rc = lpfc_do_config_port(phba, mode);</div><div class='add'>+	rc = lpfc_sli_config_port(phba, mode);</div><div class='add'>+</div><div class='ctx'> 	if (rc &amp;&amp; lpfc_sli_mode == 3)</div><div class='ctx'> 		lpfc_printf_log(phba, KERN_ERR, LOG_INIT | LOG_VPORT,</div><div class='ctx'> 				"1820 Unable to select SLI-3.  "</div><div class='ctx'> 				"Not supported by adapter.\n");</div><div class='ctx'> 	if (rc &amp;&amp; mode != 2)</div><div class='del'>-		rc = lpfc_do_config_port(phba, 2);</div><div class='add'>+		rc = lpfc_sli_config_port(phba, 2);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto lpfc_sli_hba_setup_error;</div><div class='ctx'> </div><div class='ctx'> 	if (phba-&gt;sli_rev == 3) {</div><div class='ctx'> 		phba-&gt;iocb_cmd_size = SLI3_IOCB_CMD_SIZE;</div><div class='ctx'> 		phba-&gt;iocb_rsp_size = SLI3_IOCB_RSP_SIZE;</div><div class='del'>-		phba-&gt;sli3_options |= LPFC_SLI3_ENABLED;</div><div class='del'>-		phba-&gt;sli3_options |= LPFC_SLI3_HBQ_ENABLED;</div><div class='del'>-</div><div class='ctx'> 	} else {</div><div class='ctx'> 		phba-&gt;iocb_cmd_size = SLI2_IOCB_CMD_SIZE;</div><div class='ctx'> 		phba-&gt;iocb_rsp_size = SLI2_IOCB_RSP_SIZE;</div><div class='hunk'>@@ -2558,8 +3235,7 @@ lpfc_sli_hba_setup(struct lpfc_hba *phba)</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto lpfc_sli_hba_setup_error;</div><div class='ctx'> </div><div class='del'>-				/* Init HBQs */</div><div class='del'>-</div><div class='add'>+	/* Init HBQs */</div><div class='ctx'> 	if (phba-&gt;sli3_options &amp; LPFC_SLI3_HBQ_ENABLED) {</div><div class='ctx'> 		rc = lpfc_sli_hbq_setup(phba);</div><div class='ctx'> 		if (rc)</div><div class='hunk'>@@ -2581,19 +3257,19 @@ lpfc_sli_hba_setup_error:</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*! lpfc_mbox_timeout</div><div class='del'>- *</div><div class='del'>- * \pre</div><div class='del'>- * \post</div><div class='del'>- * \param hba Pointer to per struct lpfc_hba structure</div><div class='del'>- * \param l1  Pointer to the driver's mailbox queue.</div><div class='del'>- * \return</div><div class='del'>- *   void</div><div class='del'>- *</div><div class='del'>- * \b Description:</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * lpfc_mbox_timeout: Timeout call back function for mbox timer.</div><div class='add'>+ * @ptr: context object - pointer to hba structure.</div><div class='ctx'>  *</div><div class='del'>- * This routine handles mailbox timeout events at timer interrupt context.</div><div class='del'>- */</div><div class='add'>+ * This is the callback function for mailbox timer. The mailbox</div><div class='add'>+ * timer is armed when a new mailbox command is issued and the timer</div><div class='add'>+ * is deleted when the mailbox complete. The function is called by</div><div class='add'>+ * the kernel timer code when a mailbox does not complete within</div><div class='add'>+ * expected time. This function wakes up the worker thread to</div><div class='add'>+ * process the mailbox timeout and returns. All the processing is</div><div class='add'>+ * done by the worker thread function lpfc_mbox_timeout_handler.</div><div class='add'>+ **/</div><div class='ctx'> void</div><div class='ctx'> lpfc_mbox_timeout(unsigned long ptr)</div><div class='ctx'> {</div><div class='hunk'>@@ -2612,6 +3288,15 @@ lpfc_mbox_timeout(unsigned long ptr)</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * lpfc_mbox_timeout_handler: Worker thread function to handle mailbox timeout.</div><div class='add'>+ * @phba: Pointer to HBA context object.</div><div class='add'>+ *</div><div class='add'>+ * This function is called from worker thread when a mailbox command times out.</div><div class='add'>+ * The caller is not required to hold any locks. This function will reset the</div><div class='add'>+ * HBA and recover all the pending commands.</div><div class='add'>+ **/</div><div class='ctx'> void</div><div class='ctx'> lpfc_mbox_timeout_handler(struct lpfc_hba *phba)</div><div class='ctx'> {</div><div class='hunk'>@@ -2666,6 +3351,32 @@ lpfc_mbox_timeout_handler(struct lpfc_hba *phba)</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_sli_issue_mbox: Issue a mailbox command to firmware.</div><div class='add'>+ * @phba: Pointer to HBA context object.</div><div class='add'>+ * @pmbox: Pointer to mailbox object.</div><div class='add'>+ * @flag: Flag indicating how the mailbox need to be processed.</div><div class='add'>+ *</div><div class='add'>+ * This function is called by discovery code and HBA management code</div><div class='add'>+ * to submit a mailbox command to firmware. This function gets the</div><div class='add'>+ * hbalock to protect the data structures.</div><div class='add'>+ * The mailbox command can be submitted in polling mode, in which case</div><div class='add'>+ * this function will wait in a polling loop for the completion of the</div><div class='add'>+ * mailbox.</div><div class='add'>+ * If the mailbox is submitted in no_wait mode (not polling) the</div><div class='add'>+ * function will submit the command and returns immediately without waiting</div><div class='add'>+ * for the mailbox completion. The no_wait is supported only when HBA</div><div class='add'>+ * is in SLI2/SLI3 mode - interrupts are enabled.</div><div class='add'>+ * The SLI interface allows only one mailbox pending at a time. If the</div><div class='add'>+ * mailbox is issued in polling mode and there is already a mailbox</div><div class='add'>+ * pending, then the function will return an error. If the mailbox is issued</div><div class='add'>+ * in NO_WAIT mode and there is a mailbox pending already, the function</div><div class='add'>+ * will return MBX_BUSY after queuing the mailbox into mailbox queue.</div><div class='add'>+ * The sli layer owns the mailbox object until the completion of mailbox</div><div class='add'>+ * command if this function return MBX_BUSY or MBX_SUCCESS. For all other</div><div class='add'>+ * return codes the caller owns the mailbox command after the return of</div><div class='add'>+ * the function.</div><div class='add'>+ **/</div><div class='ctx'> int</div><div class='ctx'> lpfc_sli_issue_mbox(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmbox, uint32_t flag)</div><div class='ctx'> {</div><div class='hunk'>@@ -2676,7 +3387,7 @@ lpfc_sli_issue_mbox(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmbox, uint32_t flag)</div><div class='ctx'> 	int i;</div><div class='ctx'> 	unsigned long timeout;</div><div class='ctx'> 	unsigned long drvr_flag = 0;</div><div class='del'>-	volatile uint32_t word0, ldata;</div><div class='add'>+	uint32_t word0, ldata;</div><div class='ctx'> 	void __iomem *to_slim;</div><div class='ctx'> 	int processing_queue = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -2836,12 +3547,11 @@ lpfc_sli_issue_mbox(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmbox, uint32_t flag)</div><div class='ctx'> </div><div class='ctx'> 	if (psli-&gt;sli_flag &amp; LPFC_SLI2_ACTIVE) {</div><div class='ctx'> 		/* First copy command data to host SLIM area */</div><div class='del'>-		lpfc_sli_pcimem_bcopy(mb, &amp;phba-&gt;slim2p-&gt;mbx, MAILBOX_CMD_SIZE);</div><div class='add'>+		lpfc_sli_pcimem_bcopy(mb, phba-&gt;mbox, MAILBOX_CMD_SIZE);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (mb-&gt;mbxCommand == MBX_CONFIG_PORT) {</div><div class='ctx'> 			/* copy command data into host mbox for cmpl */</div><div class='del'>-			lpfc_sli_pcimem_bcopy(mb, &amp;phba-&gt;slim2p-&gt;mbx,</div><div class='del'>-					      MAILBOX_CMD_SIZE);</div><div class='add'>+			lpfc_sli_pcimem_bcopy(mb, phba-&gt;mbox, MAILBOX_CMD_SIZE);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* First copy mbox command data to HBA SLIM, skip past first</div><div class='hunk'>@@ -2851,7 +3561,7 @@ lpfc_sli_issue_mbox(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmbox, uint32_t flag)</div><div class='ctx'> 			    MAILBOX_CMD_SIZE - sizeof (uint32_t));</div><div class='ctx'> </div><div class='ctx'> 		/* Next copy over first word, with mbxOwner set */</div><div class='del'>-		ldata = *((volatile uint32_t *)mb);</div><div class='add'>+		ldata = *((uint32_t *)mb);</div><div class='ctx'> 		to_slim = phba-&gt;MBslimaddr;</div><div class='ctx'> 		writel(ldata, to_slim);</div><div class='ctx'> 		readl(to_slim); /* flush */</div><div class='hunk'>@@ -2883,7 +3593,7 @@ lpfc_sli_issue_mbox(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmbox, uint32_t flag)</div><div class='ctx'> </div><div class='ctx'> 		if (psli-&gt;sli_flag &amp; LPFC_SLI2_ACTIVE) {</div><div class='ctx'> 			/* First read mbox status word */</div><div class='del'>-			word0 = *((volatile uint32_t *)&amp;phba-&gt;slim2p-&gt;mbx);</div><div class='add'>+			word0 = *((uint32_t *)phba-&gt;mbox);</div><div class='ctx'> 			word0 = le32_to_cpu(word0);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* First read mbox status word */</div><div class='hunk'>@@ -2922,12 +3632,11 @@ lpfc_sli_issue_mbox(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmbox, uint32_t flag)</div><div class='ctx'> </div><div class='ctx'> 			if (psli-&gt;sli_flag &amp; LPFC_SLI2_ACTIVE) {</div><div class='ctx'> 				/* First copy command data */</div><div class='del'>-				word0 = *((volatile uint32_t *)</div><div class='del'>-						&amp;phba-&gt;slim2p-&gt;mbx);</div><div class='add'>+				word0 = *((uint32_t *)phba-&gt;mbox);</div><div class='ctx'> 				word0 = le32_to_cpu(word0);</div><div class='ctx'> 				if (mb-&gt;mbxCommand == MBX_CONFIG_PORT) {</div><div class='ctx'> 					MAILBOX_t *slimmb;</div><div class='del'>-					volatile uint32_t slimword0;</div><div class='add'>+					uint32_t slimword0;</div><div class='ctx'> 					/* Check real SLIM for any errors */</div><div class='ctx'> 					slimword0 = readl(phba-&gt;MBslimaddr);</div><div class='ctx'> 					slimmb = (MAILBOX_t *) &amp; slimword0;</div><div class='hunk'>@@ -2948,8 +3657,7 @@ lpfc_sli_issue_mbox(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmbox, uint32_t flag)</div><div class='ctx'> </div><div class='ctx'> 		if (psli-&gt;sli_flag &amp; LPFC_SLI2_ACTIVE) {</div><div class='ctx'> 			/* copy results back to user */</div><div class='del'>-			lpfc_sli_pcimem_bcopy(&amp;phba-&gt;slim2p-&gt;mbx, mb,</div><div class='del'>-					      MAILBOX_CMD_SIZE);</div><div class='add'>+			lpfc_sli_pcimem_bcopy(phba-&gt;mbox, mb, MAILBOX_CMD_SIZE);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* First copy command data */</div><div class='ctx'> 			lpfc_memcpy_from_slim(mb, phba-&gt;MBslimaddr,</div><div class='hunk'>@@ -2980,9 +3688,16 @@ out_not_finished:</div><div class='ctx'> 	return MBX_NOT_FINISHED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Caller needs to hold lock.</div><div class='del'>- */</div><div class='add'>+/**</div><div class='add'>+ * __lpfc_sli_ringtx_put: Add an iocb to the txq.</div><div class='add'>+ * @phba: Pointer to HBA context object.</div><div class='add'>+ * @pring: Pointer to driver SLI ring object.</div><div class='add'>+ * @piocb: Pointer to address of newly added command iocb.</div><div class='add'>+ *</div><div class='add'>+ * This function is called with hbalock held to add a command</div><div class='add'>+ * iocb to the txq when SLI layer cannot submit the command iocb</div><div class='add'>+ * to the ring.</div><div class='add'>+ **/</div><div class='ctx'> static void</div><div class='ctx'> __lpfc_sli_ringtx_put(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,</div><div class='ctx'> 		    struct lpfc_iocbq *piocb)</div><div class='hunk'>@@ -2992,6 +3707,23 @@ __lpfc_sli_ringtx_put(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,</div><div class='ctx'> 	pring-&gt;txq_cnt++;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_sli_next_iocb: Get the next iocb in the txq.</div><div class='add'>+ * @phba: Pointer to HBA context object.</div><div class='add'>+ * @pring: Pointer to driver SLI ring object.</div><div class='add'>+ * @piocb: Pointer to address of newly added command iocb.</div><div class='add'>+ *</div><div class='add'>+ * This function is called with hbalock held before a new</div><div class='add'>+ * iocb is submitted to the firmware. This function checks</div><div class='add'>+ * txq to flush the iocbs in txq to Firmware before</div><div class='add'>+ * submitting new iocbs to the Firmware.</div><div class='add'>+ * If there are iocbs in the txq which need to be submitted</div><div class='add'>+ * to firmware, lpfc_sli_next_iocb returns the first element</div><div class='add'>+ * of the txq after dequeuing it from txq.</div><div class='add'>+ * If there is no iocb in the txq then the function will return</div><div class='add'>+ * *piocb and *piocb is set to NULL. Caller needs to check</div><div class='add'>+ * *piocb to find if there are more commands in the txq.</div><div class='add'>+ **/</div><div class='ctx'> static struct lpfc_iocbq *</div><div class='ctx'> lpfc_sli_next_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,</div><div class='ctx'> 		   struct lpfc_iocbq **piocb)</div><div class='hunk'>@@ -3007,9 +3739,30 @@ lpfc_sli_next_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,</div><div class='ctx'> 	return nextiocb;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Lockless version of lpfc_sli_issue_iocb.</div><div class='del'>- */</div><div class='add'>+/**</div><div class='add'>+ * __lpfc_sli_issue_iocb: Lockless version of lpfc_sli_issue_iocb.</div><div class='add'>+ * @phba: Pointer to HBA context object.</div><div class='add'>+ * @pring: Pointer to driver SLI ring object.</div><div class='add'>+ * @piocb: Pointer to command iocb.</div><div class='add'>+ * @flag: Flag indicating if this command can be put into txq.</div><div class='add'>+ *</div><div class='add'>+ * __lpfc_sli_issue_iocb is used by other functions in the driver</div><div class='add'>+ * to issue an iocb command to the HBA. If the PCI slot is recovering</div><div class='add'>+ * from error state or if HBA is resetting or if LPFC_STOP_IOCB_EVENT</div><div class='add'>+ * flag is turned on, the function returns IOCB_ERROR.</div><div class='add'>+ * When the link is down, this function allows only iocbs for</div><div class='add'>+ * posting buffers.</div><div class='add'>+ * This function finds next available slot in the command ring and</div><div class='add'>+ * posts the command to the available slot and writes the port</div><div class='add'>+ * attention register to request HBA start processing new iocb.</div><div class='add'>+ * If there is no slot available in the ring and</div><div class='add'>+ * flag &amp; SLI_IOCB_RET_IOCB is set, the new iocb is added to the</div><div class='add'>+ * txq, otherwise the function returns IOCB_BUSY.</div><div class='add'>+ *</div><div class='add'>+ * This function is called with hbalock held.</div><div class='add'>+ * The function will return success after it successfully submit the</div><div class='add'>+ * iocb to firmware or after adding to the txq.</div><div class='add'>+ **/</div><div class='ctx'> static int</div><div class='ctx'> __lpfc_sli_issue_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,</div><div class='ctx'> 		    struct lpfc_iocbq *piocb, uint32_t flag)</div><div class='hunk'>@@ -3052,6 +3805,16 @@ __lpfc_sli_issue_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,</div><div class='ctx'> 		 * can be issued if the link is not up.</div><div class='ctx'> 		 */</div><div class='ctx'> 		switch (piocb-&gt;iocb.ulpCommand) {</div><div class='add'>+		case CMD_GEN_REQUEST64_CR:</div><div class='add'>+		case CMD_GEN_REQUEST64_CX:</div><div class='add'>+			if (!(phba-&gt;sli.sli_flag &amp; LPFC_MENLO_MAINT) ||</div><div class='add'>+				(piocb-&gt;iocb.un.genreq64.w5.hcsw.Rctl !=</div><div class='add'>+					FC_FCP_CMND) ||</div><div class='add'>+				(piocb-&gt;iocb.un.genreq64.w5.hcsw.Type !=</div><div class='add'>+					MENLO_TRANSPORT_TYPE))</div><div class='add'>+</div><div class='add'>+				goto iocb_busy;</div><div class='add'>+			break;</div><div class='ctx'> 		case CMD_QUE_RING_BUF_CN:</div><div class='ctx'> 		case CMD_QUE_RING_BUF64_CN:</div><div class='ctx'> 			/*</div><div class='hunk'>@@ -3106,6 +3869,19 @@ __lpfc_sli_issue_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_sli_issue_iocb: Wrapper function for __lpfc_sli_issue_iocb.</div><div class='add'>+ * @phba: Pointer to HBA context object.</div><div class='add'>+ * @pring: Pointer to driver SLI ring object.</div><div class='add'>+ * @piocb: Pointer to command iocb.</div><div class='add'>+ * @flag: Flag indicating if this command can be put into txq.</div><div class='add'>+ *</div><div class='add'>+ * lpfc_sli_issue_iocb is a wrapper around __lpfc_sli_issue_iocb</div><div class='add'>+ * function. This function gets the hbalock and calls</div><div class='add'>+ * __lpfc_sli_issue_iocb function and will return the error returned</div><div class='add'>+ * by __lpfc_sli_issue_iocb function. This wrapper is used by</div><div class='add'>+ * functions which do not hold hbalock.</div><div class='add'>+ **/</div><div class='ctx'> int</div><div class='ctx'> lpfc_sli_issue_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,</div><div class='ctx'> 		    struct lpfc_iocbq *piocb, uint32_t flag)</div><div class='hunk'>@@ -3120,6 +3896,17 @@ lpfc_sli_issue_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_extra_ring_setup: Extra ring setup function.</div><div class='add'>+ * @phba: Pointer to HBA context object.</div><div class='add'>+ *</div><div class='add'>+ * This function is called while driver attaches with the</div><div class='add'>+ * HBA to setup the extra ring. The extra ring is used</div><div class='add'>+ * only when driver needs to support target mode functionality</div><div class='add'>+ * or IP over FC functionalities.</div><div class='add'>+ *</div><div class='add'>+ * This function is called with no lock held.</div><div class='add'>+ **/</div><div class='ctx'> static int</div><div class='ctx'> lpfc_extra_ring_setup( struct lpfc_hba *phba)</div><div class='ctx'> {</div><div class='hunk'>@@ -3155,6 +3942,19 @@ lpfc_extra_ring_setup( struct lpfc_hba *phba)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_sli_async_event_handler: ASYNC iocb handler function.</div><div class='add'>+ * @phba: Pointer to HBA context object.</div><div class='add'>+ * @pring: Pointer to driver SLI ring object.</div><div class='add'>+ * @iocbq: Pointer to iocb object.</div><div class='add'>+ *</div><div class='add'>+ * This function is called by the slow ring event handler</div><div class='add'>+ * function when there is an ASYNC event iocb in the ring.</div><div class='add'>+ * This function is called with no lock held.</div><div class='add'>+ * Currently this function handles only temperature related</div><div class='add'>+ * ASYNC events. The function decodes the temperature sensor</div><div class='add'>+ * event message and posts events for the management applications.</div><div class='add'>+ **/</div><div class='ctx'> static void</div><div class='ctx'> lpfc_sli_async_event_handler(struct lpfc_hba * phba,</div><div class='ctx'> 	struct lpfc_sli_ring * pring, struct lpfc_iocbq * iocbq)</div><div class='hunk'>@@ -3210,6 +4010,17 @@ lpfc_sli_async_event_handler(struct lpfc_hba * phba,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_sli_setup: SLI ring setup function.</div><div class='add'>+ * @phba: Pointer to HBA context object.</div><div class='add'>+ *</div><div class='add'>+ * lpfc_sli_setup sets up rings of the SLI interface with</div><div class='add'>+ * number of iocbs per ring and iotags. This function is</div><div class='add'>+ * called while driver attach to the HBA and before the</div><div class='add'>+ * interrupts are enabled. So there is no need for locking.</div><div class='add'>+ *</div><div class='add'>+ * This function always returns 0.</div><div class='add'>+ **/</div><div class='ctx'> int</div><div class='ctx'> lpfc_sli_setup(struct lpfc_hba *phba)</div><div class='ctx'> {</div><div class='hunk'>@@ -3321,6 +4132,17 @@ lpfc_sli_setup(struct lpfc_hba *phba)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_sli_queue_setup: Queue initialization function.</div><div class='add'>+ * @phba: Pointer to HBA context object.</div><div class='add'>+ *</div><div class='add'>+ * lpfc_sli_queue_setup sets up mailbox queues and iocb queues for each</div><div class='add'>+ * ring. This function also initializes ring indices of each ring.</div><div class='add'>+ * This function is called during the initialization of the SLI</div><div class='add'>+ * interface of an HBA.</div><div class='add'>+ * This function is called with no lock held and always returns</div><div class='add'>+ * 1.</div><div class='add'>+ **/</div><div class='ctx'> int</div><div class='ctx'> lpfc_sli_queue_setup(struct lpfc_hba *phba)</div><div class='ctx'> {</div><div class='hunk'>@@ -3349,6 +4171,23 @@ lpfc_sli_queue_setup(struct lpfc_hba *phba)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_sli_host_down: Vport cleanup function.</div><div class='add'>+ * @vport: Pointer to virtual port object.</div><div class='add'>+ *</div><div class='add'>+ * lpfc_sli_host_down is called to clean up the resources</div><div class='add'>+ * associated with a vport before destroying virtual</div><div class='add'>+ * port data structures.</div><div class='add'>+ * This function does following operations:</div><div class='add'>+ * - Free discovery resources associated with this virtual</div><div class='add'>+ *   port.</div><div class='add'>+ * - Free iocbs associated with this virtual port in</div><div class='add'>+ *   the txq.</div><div class='add'>+ * - Send abort for all iocb commands associated with this</div><div class='add'>+ *   vport in txcmplq.</div><div class='add'>+ *</div><div class='add'>+ * This function is called with no lock held and always returns 1.</div><div class='add'>+ **/</div><div class='ctx'> int</div><div class='ctx'> lpfc_sli_host_down(struct lpfc_vport *vport)</div><div class='ctx'> {</div><div class='hunk'>@@ -3411,6 +4250,21 @@ lpfc_sli_host_down(struct lpfc_vport *vport)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_sli_hba_down: Resource cleanup function for the HBA.</div><div class='add'>+ * @phba: Pointer to HBA context object.</div><div class='add'>+ *</div><div class='add'>+ * This function cleans up all iocb, buffers, mailbox commands</div><div class='add'>+ * while shutting down the HBA. This function is called with no</div><div class='add'>+ * lock held and always returns 1.</div><div class='add'>+ * This function does the following to cleanup driver resources:</div><div class='add'>+ * - Free discovery resources for each virtual port</div><div class='add'>+ * - Cleanup any pending fabric iocbs</div><div class='add'>+ * - Iterate through the iocb txq and free each entry</div><div class='add'>+ *   in the list.</div><div class='add'>+ * - Free up any buffer posted to the HBA</div><div class='add'>+ * - Free mailbox commands in the mailbox queue.</div><div class='add'>+ **/</div><div class='ctx'> int</div><div class='ctx'> lpfc_sli_hba_down(struct lpfc_hba *phba)</div><div class='ctx'> {</div><div class='hunk'>@@ -3501,6 +4355,18 @@ lpfc_sli_hba_down(struct lpfc_hba *phba)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_sli_pcimem_bcopy: SLI memory copy function.</div><div class='add'>+ * @srcp: Source memory pointer.</div><div class='add'>+ * @destp: Destination memory pointer.</div><div class='add'>+ * @cnt: Number of words required to be copied.</div><div class='add'>+ *</div><div class='add'>+ * This function is used for copying data between driver memory</div><div class='add'>+ * and the SLI memory. This function also changes the endianness</div><div class='add'>+ * of each word if native endianness is different from SLI</div><div class='add'>+ * endianness. This function can be called with or without</div><div class='add'>+ * lock.</div><div class='add'>+ **/</div><div class='ctx'> void</div><div class='ctx'> lpfc_sli_pcimem_bcopy(void *srcp, void *destp, uint32_t cnt)</div><div class='ctx'> {</div><div class='hunk'>@@ -3518,6 +4384,17 @@ lpfc_sli_pcimem_bcopy(void *srcp, void *destp, uint32_t cnt)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * lpfc_sli_ringpostbuf_put: Function to add a buffer to postbufq.</div><div class='add'>+ * @phba: Pointer to HBA context object.</div><div class='add'>+ * @pring: Pointer to driver SLI ring object.</div><div class='add'>+ * @mp: Pointer to driver buffer object.</div><div class='add'>+ *</div><div class='add'>+ * This function is called with no lock held.</div><div class='add'>+ * It always return zero after adding the buffer to the postbufq</div><div class='add'>+ * buffer list.</div><div class='add'>+ **/</div><div class='ctx'> int</div><div class='ctx'> lpfc_sli_ringpostbuf_put(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,</div><div class='ctx'> 			 struct lpfc_dmabuf *mp)</div><div class='hunk'>@@ -3531,6 +4408,18 @@ lpfc_sli_ringpostbuf_put(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_sli_get_buffer_tag: Tag allocation function for a buffer posted</div><div class='add'>+ *          using CMD_QUE_XRI64_CX iocb.</div><div class='add'>+ * @phba: Pointer to HBA context object.</div><div class='add'>+ *</div><div class='add'>+ * When HBQ is enabled, buffers are searched based on tags. This function</div><div class='add'>+ * allocates a tag for buffer posted using CMD_QUE_XRI64_CX iocb. The</div><div class='add'>+ * tag is bit wise or-ed with QUE_BUFTAG_BIT to make sure that the tag</div><div class='add'>+ * does not conflict with tags of buffer posted for unsolicited events.</div><div class='add'>+ * The function returns the allocated tag. The function is called with</div><div class='add'>+ * no locks held.</div><div class='add'>+ **/</div><div class='ctx'> uint32_t</div><div class='ctx'> lpfc_sli_get_buffer_tag(struct lpfc_hba *phba)</div><div class='ctx'> {</div><div class='hunk'>@@ -3545,6 +4434,22 @@ lpfc_sli_get_buffer_tag(struct lpfc_hba *phba)</div><div class='ctx'> 	return phba-&gt;buffer_tag_count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_sli_ring_taggedbuf_get: Search HBQ buffer associated with</div><div class='add'>+ *              posted using CMD_QUE_XRI64_CX iocb.</div><div class='add'>+ * @phba: Pointer to HBA context object.</div><div class='add'>+ * @pring: Pointer to driver SLI ring object.</div><div class='add'>+ * @tag: Buffer tag.</div><div class='add'>+ *</div><div class='add'>+ * Buffers posted using CMD_QUE_XRI64_CX iocb are in pring-&gt;postbufq</div><div class='add'>+ * list. After HBA DMA data to these buffers, CMD_IOCB_RET_XRI64_CX</div><div class='add'>+ * iocb is posted to the response ring with the tag of the buffer.</div><div class='add'>+ * This function searches the pring-&gt;postbufq list using the tag</div><div class='add'>+ * to find buffer associated with CMD_IOCB_RET_XRI64_CX</div><div class='add'>+ * iocb. If the buffer is found then lpfc_dmabuf object of the</div><div class='add'>+ * buffer is returned to the caller else NULL is returned.</div><div class='add'>+ * This function is called with no lock held.</div><div class='add'>+ **/</div><div class='ctx'> struct lpfc_dmabuf *</div><div class='ctx'> lpfc_sli_ring_taggedbuf_get(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,</div><div class='ctx'> 			uint32_t tag)</div><div class='hunk'>@@ -3565,7 +4470,7 @@ lpfc_sli_ring_taggedbuf_get(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irq(&amp;phba-&gt;hbalock);</div><div class='ctx'> 	lpfc_printf_log(phba, KERN_ERR, LOG_INIT,</div><div class='del'>-			"0410 Cannot find virtual addr for buffer tag on "</div><div class='add'>+			"0402 Cannot find virtual addr for buffer tag on "</div><div class='ctx'> 			"ring %d Data x%lx x%p x%p x%x\n",</div><div class='ctx'> 			pring-&gt;ringno, (unsigned long) tag,</div><div class='ctx'> 			slp-&gt;next, slp-&gt;prev, pring-&gt;postbufq_cnt);</div><div class='hunk'>@@ -3573,6 +4478,23 @@ lpfc_sli_ring_taggedbuf_get(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_sli_ringpostbuf_get: SLI2 buffer search function for</div><div class='add'>+ *      unsolicited ct and els events.</div><div class='add'>+ * @phba: Pointer to HBA context object.</div><div class='add'>+ * @pring: Pointer to driver SLI ring object.</div><div class='add'>+ * @phys: DMA address of the buffer.</div><div class='add'>+ *</div><div class='add'>+ * This function searches the buffer list using the dma_address</div><div class='add'>+ * of unsolicited event to find the driver's lpfc_dmabuf object</div><div class='add'>+ * corresponding to the dma_address. The function returns the</div><div class='add'>+ * lpfc_dmabuf object if a buffer is found else it returns NULL.</div><div class='add'>+ * This function is called by the ct and els unsolicited event</div><div class='add'>+ * handlers to get the buffer associated with the unsolicited</div><div class='add'>+ * event.</div><div class='add'>+ *</div><div class='add'>+ * This function is called with no lock held.</div><div class='add'>+ **/</div><div class='ctx'> struct lpfc_dmabuf *</div><div class='ctx'> lpfc_sli_ringpostbuf_get(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,</div><div class='ctx'> 			 dma_addr_t phys)</div><div class='hunk'>@@ -3600,6 +4522,17 @@ lpfc_sli_ringpostbuf_get(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_sli_abort_els_cmpl: Completion handler for the els abort iocbs.</div><div class='add'>+ * @phba: Pointer to HBA context object.</div><div class='add'>+ * @cmdiocb: Pointer to driver command iocb object.</div><div class='add'>+ * @rspiocb: Pointer to driver response iocb object.</div><div class='add'>+ *</div><div class='add'>+ * This function is the completion handler for the abort iocbs for</div><div class='add'>+ * ELS commands. This function is called from the ELS ring event</div><div class='add'>+ * handler with no lock held. This function frees memory resources</div><div class='add'>+ * associated with the abort iocb.</div><div class='add'>+ **/</div><div class='ctx'> static void</div><div class='ctx'> lpfc_sli_abort_els_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,</div><div class='ctx'> 			struct lpfc_iocbq *rspiocb)</div><div class='hunk'>@@ -3665,6 +4598,17 @@ lpfc_sli_abort_els_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_ignore_els_cmpl: Completion handler for aborted ELS command.</div><div class='add'>+ * @phba: Pointer to HBA context object.</div><div class='add'>+ * @cmdiocb: Pointer to driver command iocb object.</div><div class='add'>+ * @rspiocb: Pointer to driver response iocb object.</div><div class='add'>+ *</div><div class='add'>+ * The function is called from SLI ring event handler with no</div><div class='add'>+ * lock held. This function is the completion handler for ELS commands</div><div class='add'>+ * which are aborted. The function frees memory resources used for</div><div class='add'>+ * the aborted ELS commands.</div><div class='add'>+ **/</div><div class='ctx'> static void</div><div class='ctx'> lpfc_ignore_els_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,</div><div class='ctx'> 		     struct lpfc_iocbq *rspiocb)</div><div class='hunk'>@@ -3673,7 +4617,7 @@ lpfc_ignore_els_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,</div><div class='ctx'> </div><div class='ctx'> 	/* ELS cmd tag &lt;ulpIoTag&gt; completes */</div><div class='ctx'> 	lpfc_printf_log(phba, KERN_INFO, LOG_ELS,</div><div class='del'>-			"0133 Ignoring ELS cmd tag x%x completion Data: "</div><div class='add'>+			"0139 Ignoring ELS cmd tag x%x completion Data: "</div><div class='ctx'> 			"x%x x%x x%x\n",</div><div class='ctx'> 			irsp-&gt;ulpIoTag, irsp-&gt;ulpStatus,</div><div class='ctx'> 			irsp-&gt;un.ulpWord[4], irsp-&gt;ulpTimeout);</div><div class='hunk'>@@ -3684,6 +4628,17 @@ lpfc_ignore_els_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_sli_issue_abort_iotag: Abort function for a command iocb.</div><div class='add'>+ * @phba: Pointer to HBA context object.</div><div class='add'>+ * @pring: Pointer to driver SLI ring object.</div><div class='add'>+ * @cmdiocb: Pointer to driver command iocb object.</div><div class='add'>+ *</div><div class='add'>+ * This function issues an abort iocb for the provided command</div><div class='add'>+ * iocb. This function is called with hbalock held.</div><div class='add'>+ * The function returns 0 when it fails due to memory allocation</div><div class='add'>+ * failure or when the command iocb is an abort request.</div><div class='add'>+ **/</div><div class='ctx'> int</div><div class='ctx'> lpfc_sli_issue_abort_iotag(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,</div><div class='ctx'> 			   struct lpfc_iocbq *cmdiocb)</div><div class='hunk'>@@ -3748,6 +4703,8 @@ lpfc_sli_issue_abort_iotag(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,</div><div class='ctx'> 			 iabt-&gt;un.acxri.abortIoTag, abtsiocbp-&gt;iotag);</div><div class='ctx'> 	retval = __lpfc_sli_issue_iocb(phba, pring, abtsiocbp, 0);</div><div class='ctx'> </div><div class='add'>+	if (retval)</div><div class='add'>+		__lpfc_sli_release_iocbq(phba, abtsiocbp);</div><div class='ctx'> abort_iotag_exit:</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Caller to this routine should check for IOCB_ERROR</div><div class='hunk'>@@ -3757,6 +4714,29 @@ abort_iotag_exit:</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_sli_validate_fcp_iocb: Filtering function, used to find commands</div><div class='add'>+ *                    associated with a vport/SCSI target/lun.</div><div class='add'>+ * @iocbq: Pointer to driver iocb object.</div><div class='add'>+ * @vport: Pointer to driver virtual port object.</div><div class='add'>+ * @tgt_id: SCSI ID of the target.</div><div class='add'>+ * @lun_id: LUN ID of the scsi device.</div><div class='add'>+ * @ctx_cmd: LPFC_CTX_LUN/LPFC_CTX_TGT/LPFC_CTX_HOST</div><div class='add'>+ *</div><div class='add'>+ * This function acts as iocb filter for functions which abort or count</div><div class='add'>+ * all FCP iocbs pending on a lun/SCSI target/SCSI host. It will return</div><div class='add'>+ * 0 if the filtering criteria is met for the given iocb and will return</div><div class='add'>+ * 1 if the filtering criteria is not met.</div><div class='add'>+ * If ctx_cmd == LPFC_CTX_LUN, the function returns 0 only if the</div><div class='add'>+ * given iocb is for the SCSI device specified by vport, tgt_id and</div><div class='add'>+ * lun_id parameter.</div><div class='add'>+ * If ctx_cmd == LPFC_CTX_TGT,  the function returns 0 only if the</div><div class='add'>+ * given iocb is for the SCSI target specified by vport and tgt_id</div><div class='add'>+ * parameters.</div><div class='add'>+ * If ctx_cmd == LPFC_CTX_HOST, the function returns 0 only if the</div><div class='add'>+ * given iocb is for the SCSI host associated with the given vport.</div><div class='add'>+ * This function is called with no locks held.</div><div class='add'>+ **/</div><div class='ctx'> static int</div><div class='ctx'> lpfc_sli_validate_fcp_iocb(struct lpfc_iocbq *iocbq, struct lpfc_vport *vport,</div><div class='ctx'> 			   uint16_t tgt_id, uint64_t lun_id,</div><div class='hunk'>@@ -3800,6 +4780,25 @@ lpfc_sli_validate_fcp_iocb(struct lpfc_iocbq *iocbq, struct lpfc_vport *vport,</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_sli_sum_iocb: Function to count the number of FCP iocbs pending.</div><div class='add'>+ * @vport: Pointer to virtual port.</div><div class='add'>+ * @tgt_id: SCSI ID of the target.</div><div class='add'>+ * @lun_id: LUN ID of the scsi device.</div><div class='add'>+ * @ctx_cmd: LPFC_CTX_LUN/LPFC_CTX_TGT/LPFC_CTX_HOST.</div><div class='add'>+ *</div><div class='add'>+ * This function returns number of FCP commands pending for the vport.</div><div class='add'>+ * When ctx_cmd == LPFC_CTX_LUN, the function returns number of FCP</div><div class='add'>+ * commands pending on the vport associated with SCSI device specified</div><div class='add'>+ * by tgt_id and lun_id parameters.</div><div class='add'>+ * When ctx_cmd == LPFC_CTX_TGT, the function returns number of FCP</div><div class='add'>+ * commands pending on the vport associated with SCSI target specified</div><div class='add'>+ * by tgt_id parameter.</div><div class='add'>+ * When ctx_cmd == LPFC_CTX_HOST, the function returns number of FCP</div><div class='add'>+ * commands pending on the vport.</div><div class='add'>+ * This function returns the number of iocbs which satisfy the filter.</div><div class='add'>+ * This function is called without any lock held.</div><div class='add'>+ **/</div><div class='ctx'> int</div><div class='ctx'> lpfc_sli_sum_iocb(struct lpfc_vport *vport, uint16_t tgt_id, uint64_t lun_id,</div><div class='ctx'> 		  lpfc_ctx_cmd ctx_cmd)</div><div class='hunk'>@@ -3819,6 +4818,17 @@ lpfc_sli_sum_iocb(struct lpfc_vport *vport, uint16_t tgt_id, uint64_t lun_id,</div><div class='ctx'> 	return sum;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_sli_abort_fcp_cmpl: Completion handler function for an aborted</div><div class='add'>+ *       FCP iocb.</div><div class='add'>+ * @phba: Pointer to HBA context object</div><div class='add'>+ * @cmdiocb: Pointer to command iocb object.</div><div class='add'>+ * @rspiocb: Pointer to response iocb object.</div><div class='add'>+ *</div><div class='add'>+ * This function is called when an aborted FCP iocb completes. This</div><div class='add'>+ * function is called by the ring event handler with no lock held.</div><div class='add'>+ * This function frees the iocb.</div><div class='add'>+ **/</div><div class='ctx'> void</div><div class='ctx'> lpfc_sli_abort_fcp_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,</div><div class='ctx'> 			struct lpfc_iocbq *rspiocb)</div><div class='hunk'>@@ -3827,6 +4837,28 @@ lpfc_sli_abort_fcp_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_sli_abort_iocb: This function issue abort for all SCSI commands</div><div class='add'>+ *          pending on a SCSI host(vport)/target/lun.</div><div class='add'>+ * @vport: Pointer to virtual port.</div><div class='add'>+ * @pring: Pointer to driver SLI ring object.</div><div class='add'>+ * @tgt_id: SCSI ID of the target.</div><div class='add'>+ * @lun_id: LUN ID of the scsi device.</div><div class='add'>+ * @abort_cmd: LPFC_CTX_LUN/LPFC_CTX_TGT/LPFC_CTX_HOST.</div><div class='add'>+ *</div><div class='add'>+ * This function sends an abort command for every SCSI command</div><div class='add'>+ * associated with the given virtual port pending on the ring</div><div class='add'>+ * filtered by lpfc_sli_validate_fcp_iocb function.</div><div class='add'>+ * When abort_cmd == LPFC_CTX_LUN, the function sends abort only to the</div><div class='add'>+ * FCP iocbs associated with lun specified by tgt_id and lun_id</div><div class='add'>+ * parameters</div><div class='add'>+ * When abort_cmd == LPFC_CTX_TGT, the function sends abort only to the</div><div class='add'>+ * FCP iocbs associated with SCSI target specified by tgt_id parameter.</div><div class='add'>+ * When abort_cmd == LPFC_CTX_HOST, the function sends abort to all</div><div class='add'>+ * FCP iocbs associated with virtual port.</div><div class='add'>+ * This function returns number of iocbs it failed to abort.</div><div class='add'>+ * This function is called with no locks held.</div><div class='add'>+ **/</div><div class='ctx'> int</div><div class='ctx'> lpfc_sli_abort_iocb(struct lpfc_vport *vport, struct lpfc_sli_ring *pring,</div><div class='ctx'> 		    uint16_t tgt_id, uint64_t lun_id, lpfc_ctx_cmd abort_cmd)</div><div class='hunk'>@@ -3878,6 +4910,24 @@ lpfc_sli_abort_iocb(struct lpfc_vport *vport, struct lpfc_sli_ring *pring,</div><div class='ctx'> 	return errcnt;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_sli_wake_iocb_wait: iocb completion handler for iocb issued using</div><div class='add'>+ *                          lpfc_sli_issue_iocb_wait.</div><div class='add'>+ * @phba: Pointer to HBA context object.</div><div class='add'>+ * @cmdiocbq: Pointer to command iocb.</div><div class='add'>+ * @rspiocbq: Pointer to response iocb.</div><div class='add'>+ *</div><div class='add'>+ * This function is the completion handler for iocbs issued using</div><div class='add'>+ * lpfc_sli_issue_iocb_wait function. This function is called by the</div><div class='add'>+ * ring event handler function without any lock held. This function</div><div class='add'>+ * can be called from both worker thread context and interrupt</div><div class='add'>+ * context. This function also can be called from other thread which</div><div class='add'>+ * cleans up the SLI layer objects.</div><div class='add'>+ * This function copy the contents of the response iocb to the</div><div class='add'>+ * response iocb memory object provided by the caller of</div><div class='add'>+ * lpfc_sli_issue_iocb_wait and then wakes up the thread which</div><div class='add'>+ * sleeps for the iocb completion.</div><div class='add'>+ **/</div><div class='ctx'> static void</div><div class='ctx'> lpfc_sli_wake_iocb_wait(struct lpfc_hba *phba,</div><div class='ctx'> 			struct lpfc_iocbq *cmdiocbq,</div><div class='hunk'>@@ -3899,13 +4949,36 @@ lpfc_sli_wake_iocb_wait(struct lpfc_hba *phba,</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Issue the caller's iocb and wait for its completion, but no longer than the</div><div class='del'>- * caller's timeout.  Note that iocb_flags is cleared before the</div><div class='del'>- * lpfc_sli_issue_call since the wake routine sets a unique value and by</div><div class='del'>- * definition this is a wait function.</div><div class='del'>- */</div><div class='del'>-</div><div class='add'>+/**</div><div class='add'>+ * lpfc_sli_issue_iocb_wait: Synchronous function to issue iocb commands.</div><div class='add'>+ * @phba: Pointer to HBA context object..</div><div class='add'>+ * @pring: Pointer to sli ring.</div><div class='add'>+ * @piocb: Pointer to command iocb.</div><div class='add'>+ * @prspiocbq: Pointer to response iocb.</div><div class='add'>+ * @timeout: Timeout in number of seconds.</div><div class='add'>+ *</div><div class='add'>+ * This function issues the iocb to firmware and waits for the</div><div class='add'>+ * iocb to complete. If the iocb command is not</div><div class='add'>+ * completed within timeout seconds, it returns IOCB_TIMEDOUT.</div><div class='add'>+ * Caller should not free the iocb resources if this function</div><div class='add'>+ * returns IOCB_TIMEDOUT.</div><div class='add'>+ * The function waits for the iocb completion using an</div><div class='add'>+ * non-interruptible wait.</div><div class='add'>+ * This function will sleep while waiting for iocb completion.</div><div class='add'>+ * So, this function should not be called from any context which</div><div class='add'>+ * does not allow sleeping. Due to the same reason, this function</div><div class='add'>+ * cannot be called with interrupt disabled.</div><div class='add'>+ * This function assumes that the iocb completions occur while</div><div class='add'>+ * this function sleep. So, this function cannot be called from</div><div class='add'>+ * the thread which process iocb completion for this ring.</div><div class='add'>+ * This function clears the iocb_flag of the iocb object before</div><div class='add'>+ * issuing the iocb and the iocb completion handler sets this</div><div class='add'>+ * flag and wakes this thread when the iocb completes.</div><div class='add'>+ * The contents of the response iocb will be copied to prspiocbq</div><div class='add'>+ * by the completion handler when the command completes.</div><div class='add'>+ * This function returns IOCB_SUCCESS when success.</div><div class='add'>+ * This function is called with no lock held.</div><div class='add'>+ **/</div><div class='ctx'> int</div><div class='ctx'> lpfc_sli_issue_iocb_wait(struct lpfc_hba *phba,</div><div class='ctx'> 			 struct lpfc_sli_ring *pring,</div><div class='hunk'>@@ -3963,7 +5036,7 @@ lpfc_sli_issue_iocb_wait(struct lpfc_hba *phba,</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		lpfc_printf_log(phba, KERN_INFO, LOG_SLI,</div><div class='del'>-				":0332 IOCB wait issue failed, Data x%x\n",</div><div class='add'>+				"0332 IOCB wait issue failed, Data x%x\n",</div><div class='ctx'> 				retval);</div><div class='ctx'> 		retval = IOCB_ERROR;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3983,6 +5056,32 @@ lpfc_sli_issue_iocb_wait(struct lpfc_hba *phba,</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_sli_issue_mbox_wait: Synchronous function to issue mailbox.</div><div class='add'>+ * @phba: Pointer to HBA context object.</div><div class='add'>+ * @pmboxq: Pointer to driver mailbox object.</div><div class='add'>+ * @timeout: Timeout in number of seconds.</div><div class='add'>+ *</div><div class='add'>+ * This function issues the mailbox to firmware and waits for the</div><div class='add'>+ * mailbox command to complete. If the mailbox command is not</div><div class='add'>+ * completed within timeout seconds, it returns MBX_TIMEOUT.</div><div class='add'>+ * The function waits for the mailbox completion using an</div><div class='add'>+ * interruptible wait. If the thread is woken up due to a</div><div class='add'>+ * signal, MBX_TIMEOUT error is returned to the caller. Caller</div><div class='add'>+ * should not free the mailbox resources, if this function returns</div><div class='add'>+ * MBX_TIMEOUT.</div><div class='add'>+ * This function will sleep while waiting for mailbox completion.</div><div class='add'>+ * So, this function should not be called from any context which</div><div class='add'>+ * does not allow sleeping. Due to the same reason, this function</div><div class='add'>+ * cannot be called with interrupt disabled.</div><div class='add'>+ * This function assumes that the mailbox completion occurs while</div><div class='add'>+ * this function sleep. So, this function cannot be called from</div><div class='add'>+ * the worker thread which processes mailbox completion.</div><div class='add'>+ * This function is called in the context of HBA management</div><div class='add'>+ * applications.</div><div class='add'>+ * This function returns MBX_SUCCESS when successful.</div><div class='add'>+ * This function is called with no lock held.</div><div class='add'>+ **/</div><div class='ctx'> int</div><div class='ctx'> lpfc_sli_issue_mbox_wait(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmboxq,</div><div class='ctx'> 			 uint32_t timeout)</div><div class='hunk'>@@ -4027,6 +5126,18 @@ lpfc_sli_issue_mbox_wait(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmboxq,</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_sli_flush_mbox_queue: mailbox queue cleanup function.</div><div class='add'>+ * @phba: Pointer to HBA context.</div><div class='add'>+ *</div><div class='add'>+ * This function is called to cleanup any pending mailbox</div><div class='add'>+ * objects in the driver queue before bringing the HBA offline.</div><div class='add'>+ * This function is called while resetting the HBA.</div><div class='add'>+ * The function is called without any lock held. The function</div><div class='add'>+ * takes hbalock to update SLI data structure.</div><div class='add'>+ * This function returns 1 when there is an active mailbox</div><div class='add'>+ * command pending else returns 0.</div><div class='add'>+ **/</div><div class='ctx'> int</div><div class='ctx'> lpfc_sli_flush_mbox_queue(struct lpfc_hba * phba)</div><div class='ctx'> {</div><div class='hunk'>@@ -4058,8 +5169,74 @@ lpfc_sli_flush_mbox_queue(struct lpfc_hba * phba)</div><div class='ctx'> 	return (phba-&gt;sli.sli_flag &amp; LPFC_SLI_MBOX_ACTIVE) ? 1 : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_sli_check_eratt: check error attention events</div><div class='add'>+ * @phba: Pointer to HBA context.</div><div class='add'>+ *</div><div class='add'>+ * This function is called form timer soft interrupt context to check HBA's</div><div class='add'>+ * error attention register bit for error attention events.</div><div class='add'>+ *</div><div class='add'>+ * This fucntion returns 1 when there is Error Attention in the Host Attention</div><div class='add'>+ * Register and returns 0 otherwise.</div><div class='add'>+ **/</div><div class='add'>+int</div><div class='add'>+lpfc_sli_check_eratt(struct lpfc_hba *phba)</div><div class='add'>+{</div><div class='add'>+	uint32_t ha_copy;</div><div class='add'>+</div><div class='add'>+	/* If somebody is waiting to handle an eratt, don't process it</div><div class='add'>+	 * here. The brdkill function will do this.</div><div class='add'>+	 */</div><div class='add'>+	if (phba-&gt;link_flag &amp; LS_IGNORE_ERATT)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Check if interrupt handler handles this ERATT */</div><div class='add'>+	spin_lock_irq(&amp;phba-&gt;hbalock);</div><div class='add'>+	if (phba-&gt;hba_flag &amp; HBA_ERATT_HANDLED) {</div><div class='add'>+		/* Interrupt handler has handled ERATT */</div><div class='add'>+		spin_unlock_irq(&amp;phba-&gt;hbalock);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Read chip Host Attention (HA) register */</div><div class='add'>+	ha_copy = readl(phba-&gt;HAregaddr);</div><div class='add'>+	if (ha_copy &amp; HA_ERATT) {</div><div class='add'>+		/* Read host status register to retrieve error event */</div><div class='add'>+		lpfc_sli_read_hs(phba);</div><div class='add'>+		/* Set the driver HA work bitmap */</div><div class='add'>+		phba-&gt;work_ha |= HA_ERATT;</div><div class='add'>+		/* Indicate polling handles this ERATT */</div><div class='add'>+		phba-&gt;hba_flag |= HBA_ERATT_HANDLED;</div><div class='add'>+		spin_unlock_irq(&amp;phba-&gt;hbalock);</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irq(&amp;phba-&gt;hbalock);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * lpfc_sp_intr_handler: The slow-path interrupt handler of lpfc driver.</div><div class='add'>+ * @irq: Interrupt number.</div><div class='add'>+ * @dev_id: The device context pointer.</div><div class='add'>+ *</div><div class='add'>+ * This function is directly called from the PCI layer as an interrupt</div><div class='add'>+ * service routine when the device is enabled with MSI-X multi-message</div><div class='add'>+ * interrupt mode and there are slow-path events in the HBA. However,</div><div class='add'>+ * when the device is enabled with either MSI or Pin-IRQ interrupt mode,</div><div class='add'>+ * this function is called as part of the device-level interrupt handler.</div><div class='add'>+ * When the PCI slot is in error recovery or the HBA is undergoing</div><div class='add'>+ * initialization, the interrupt handler will not process the interrupt.</div><div class='add'>+ * The link attention and ELS ring attention events are handled by the</div><div class='add'>+ * worker thread. The interrupt handler signals the worker thread and</div><div class='add'>+ * and returns for these events. This function is called without any</div><div class='add'>+ * lock held. It gets the hbalock to access and update SLI data</div><div class='add'>+ * structures.</div><div class='add'>+ *</div><div class='add'>+ * This function returns IRQ_HANDLED when interrupt is handled else it</div><div class='add'>+ * returns IRQ_NONE.</div><div class='add'>+ **/</div><div class='ctx'> irqreturn_t</div><div class='del'>-lpfc_intr_handler(int irq, void *dev_id)</div><div class='add'>+lpfc_sp_intr_handler(int irq, void *dev_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct lpfc_hba  *phba;</div><div class='ctx'> 	uint32_t ha_copy;</div><div class='hunk'>@@ -4078,48 +5255,52 @@ lpfc_intr_handler(int irq, void *dev_id)</div><div class='ctx'> 	 * Get the driver's phba structure from the dev_id and</div><div class='ctx'> 	 * assume the HBA is not interrupting.</div><div class='ctx'> 	 */</div><div class='del'>-	phba = (struct lpfc_hba *) dev_id;</div><div class='add'>+	phba = (struct lpfc_hba *)dev_id;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(!phba))</div><div class='ctx'> 		return IRQ_NONE;</div><div class='ctx'> </div><div class='del'>-	/* If the pci channel is offline, ignore all the interrupts. */</div><div class='del'>-	if (unlikely(pci_channel_offline(phba-&gt;pcidev)))</div><div class='del'>-		return IRQ_NONE;</div><div class='del'>-</div><div class='del'>-	phba-&gt;sli.slistat.sli_intr++;</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='del'>-	 * Call the HBA to see if it is interrupting.  If not, don't claim</div><div class='del'>-	 * the interrupt</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/* Ignore all interrupts during initialization. */</div><div class='del'>-	if (unlikely(phba-&gt;link_state &lt; LPFC_LINK_DOWN))</div><div class='del'>-		return IRQ_NONE;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Read host attention register to determine interrupt source</div><div class='del'>-	 * Clear Attention Sources, except Error Attention (to</div><div class='del'>-	 * preserve status) and Link Attention</div><div class='del'>-	 */</div><div class='del'>-	spin_lock(&amp;phba-&gt;hbalock);</div><div class='del'>-	ha_copy = readl(phba-&gt;HAregaddr);</div><div class='del'>-	/* If somebody is waiting to handle an eratt don't process it</div><div class='del'>-	 * here.  The brdkill function will do this.</div><div class='add'>+	 * Stuff needs to be attented to when this function is invoked as an</div><div class='add'>+	 * individual interrupt handler in MSI-X multi-message interrupt mode</div><div class='ctx'> 	 */</div><div class='del'>-	if (phba-&gt;link_flag &amp; LS_IGNORE_ERATT)</div><div class='del'>-		ha_copy &amp;= ~HA_ERATT;</div><div class='del'>-	writel((ha_copy &amp; ~(HA_LATT | HA_ERATT)), phba-&gt;HAregaddr);</div><div class='del'>-	readl(phba-&gt;HAregaddr); /* flush */</div><div class='del'>-	spin_unlock(&amp;phba-&gt;hbalock);</div><div class='del'>-</div><div class='del'>-	if (unlikely(!ha_copy))</div><div class='del'>-		return IRQ_NONE;</div><div class='add'>+	if (phba-&gt;intr_type == MSIX) {</div><div class='add'>+		/* If the pci channel is offline, ignore all the interrupts */</div><div class='add'>+		if (unlikely(pci_channel_offline(phba-&gt;pcidev)))</div><div class='add'>+			return IRQ_NONE;</div><div class='add'>+		/* Update device-level interrupt statistics */</div><div class='add'>+		phba-&gt;sli.slistat.sli_intr++;</div><div class='add'>+		/* Ignore all interrupts during initialization. */</div><div class='add'>+		if (unlikely(phba-&gt;link_state &lt; LPFC_LINK_DOWN))</div><div class='add'>+			return IRQ_NONE;</div><div class='add'>+		/* Need to read HA REG for slow-path events */</div><div class='add'>+		spin_lock(&amp;phba-&gt;hbalock);</div><div class='add'>+		ha_copy = readl(phba-&gt;HAregaddr);</div><div class='add'>+		/* If somebody is waiting to handle an eratt don't process it</div><div class='add'>+		 * here. The brdkill function will do this.</div><div class='add'>+		 */</div><div class='add'>+		if (phba-&gt;link_flag &amp; LS_IGNORE_ERATT)</div><div class='add'>+			ha_copy &amp;= ~HA_ERATT;</div><div class='add'>+		/* Check the need for handling ERATT in interrupt handler */</div><div class='add'>+		if (ha_copy &amp; HA_ERATT) {</div><div class='add'>+			if (phba-&gt;hba_flag &amp; HBA_ERATT_HANDLED)</div><div class='add'>+				/* ERATT polling has handled ERATT */</div><div class='add'>+				ha_copy &amp;= ~HA_ERATT;</div><div class='add'>+			else</div><div class='add'>+				/* Indicate interrupt handler handles ERATT */</div><div class='add'>+				phba-&gt;hba_flag |= HBA_ERATT_HANDLED;</div><div class='add'>+		}</div><div class='add'>+		/* Clear up only attention source related to slow-path */</div><div class='add'>+		writel((ha_copy &amp; (HA_MBATT | HA_R2_CLR_MSK)),</div><div class='add'>+			phba-&gt;HAregaddr);</div><div class='add'>+		readl(phba-&gt;HAregaddr); /* flush */</div><div class='add'>+		spin_unlock(&amp;phba-&gt;hbalock);</div><div class='add'>+	} else</div><div class='add'>+		ha_copy = phba-&gt;ha_copy;</div><div class='ctx'> </div><div class='ctx'> 	work_ha_copy = ha_copy &amp; phba-&gt;work_ha_mask;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(work_ha_copy)) {</div><div class='add'>+	if (work_ha_copy) {</div><div class='ctx'> 		if (work_ha_copy &amp; HA_LATT) {</div><div class='ctx'> 			if (phba-&gt;sli.sli_flag &amp; LPFC_PROCESS_LA) {</div><div class='ctx'> 				/*</div><div class='hunk'>@@ -4138,7 +5319,7 @@ lpfc_intr_handler(int irq, void *dev_id)</div><div class='ctx'> 				work_ha_copy &amp;= ~HA_LATT;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (work_ha_copy &amp; ~(HA_ERATT|HA_MBATT|HA_LATT)) {</div><div class='add'>+		if (work_ha_copy &amp; ~(HA_ERATT | HA_MBATT | HA_LATT)) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Turn off Slow Rings interrupts, LPFC_ELS_RING is</div><div class='ctx'> 			 * the only slow ring.</div><div class='hunk'>@@ -4179,31 +5360,13 @@ lpfc_intr_handler(int irq, void *dev_id)</div><div class='ctx'> 				spin_unlock(&amp;phba-&gt;hbalock);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		if (work_ha_copy &amp; HA_ERATT) {</div><div class='del'>-			/*</div><div class='del'>-			 * There was a link/board error.  Read the</div><div class='del'>-			 * status register to retrieve the error event</div><div class='del'>-			 * and process it.</div><div class='del'>-			 */</div><div class='del'>-			phba-&gt;sli.slistat.err_attn_event++;</div><div class='del'>-			/* Save status info */</div><div class='del'>-			phba-&gt;work_hs = readl(phba-&gt;HSregaddr);</div><div class='del'>-			phba-&gt;work_status[0] = readl(phba-&gt;MBslimaddr + 0xa8);</div><div class='del'>-			phba-&gt;work_status[1] = readl(phba-&gt;MBslimaddr + 0xac);</div><div class='del'>-</div><div class='del'>-			/* Clear Chip error bit */</div><div class='del'>-			writel(HA_ERATT, phba-&gt;HAregaddr);</div><div class='del'>-			readl(phba-&gt;HAregaddr); /* flush */</div><div class='del'>-			phba-&gt;pport-&gt;stopped = 1;</div><div class='del'>-		}</div><div class='del'>-</div><div class='ctx'> 		spin_lock(&amp;phba-&gt;hbalock);</div><div class='del'>-		if ((work_ha_copy &amp; HA_MBATT) &amp;&amp;</div><div class='del'>-		    (phba-&gt;sli.mbox_active)) {</div><div class='add'>+		if (work_ha_copy &amp; HA_ERATT)</div><div class='add'>+			lpfc_sli_read_hs(phba);</div><div class='add'>+		if ((work_ha_copy &amp; HA_MBATT) &amp;&amp; (phba-&gt;sli.mbox_active)) {</div><div class='ctx'> 			pmb = phba-&gt;sli.mbox_active;</div><div class='ctx'> 			pmbox = &amp;pmb-&gt;mb;</div><div class='del'>-			mbox = &amp;phba-&gt;slim2p-&gt;mbx;</div><div class='add'>+			mbox = phba-&gt;mbox;</div><div class='ctx'> 			vport = pmb-&gt;vport;</div><div class='ctx'> </div><div class='ctx'> 			/* First check out the status word */</div><div class='hunk'>@@ -4270,7 +5433,7 @@ lpfc_intr_handler(int irq, void *dev_id)</div><div class='ctx'> 							lpfc_printf_log(phba,</div><div class='ctx'> 							KERN_ERR,</div><div class='ctx'> 							LOG_MBOX | LOG_SLI,</div><div class='del'>-							"0306 rc should have"</div><div class='add'>+							"0350 rc should have"</div><div class='ctx'> 							"been MBX_BUSY");</div><div class='ctx'> 						goto send_current_mbox;</div><div class='ctx'> 					}</div><div class='hunk'>@@ -4283,6 +5446,7 @@ lpfc_intr_handler(int irq, void *dev_id)</div><div class='ctx'> 			}</div><div class='ctx'> 		} else</div><div class='ctx'> 			spin_unlock(&amp;phba-&gt;hbalock);</div><div class='add'>+</div><div class='ctx'> 		if ((work_ha_copy &amp; HA_MBATT) &amp;&amp;</div><div class='ctx'> 		    (phba-&gt;sli.mbox_active == NULL)) {</div><div class='ctx'> send_current_mbox:</div><div class='hunk'>@@ -4302,15 +5466,74 @@ send_current_mbox:</div><div class='ctx'> 		spin_unlock(&amp;phba-&gt;hbalock);</div><div class='ctx'> 		lpfc_worker_wake_up(phba);</div><div class='ctx'> 	}</div><div class='add'>+	return IRQ_HANDLED;</div><div class='ctx'> </div><div class='del'>-	ha_copy &amp;= ~(phba-&gt;work_ha_mask);</div><div class='add'>+} /* lpfc_sp_intr_handler */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * lpfc_fp_intr_handler: The fast-path interrupt handler of lpfc driver.</div><div class='add'>+ * @irq: Interrupt number.</div><div class='add'>+ * @dev_id: The device context pointer.</div><div class='add'>+ *</div><div class='add'>+ * This function is directly called from the PCI layer as an interrupt</div><div class='add'>+ * service routine when the device is enabled with MSI-X multi-message</div><div class='add'>+ * interrupt mode and there is a fast-path FCP IOCB ring event in the</div><div class='add'>+ * HBA. However, when the device is enabled with either MSI or Pin-IRQ</div><div class='add'>+ * interrupt mode, this function is called as part of the device-level</div><div class='add'>+ * interrupt handler. When the PCI slot is in error recovery or the HBA</div><div class='add'>+ * is undergoing initialization, the interrupt handler will not process</div><div class='add'>+ * the interrupt. The SCSI FCP fast-path ring event are handled in the</div><div class='add'>+ * intrrupt context. This function is called without any lock held. It</div><div class='add'>+ * gets the hbalock to access and update SLI data structures.</div><div class='add'>+ *</div><div class='add'>+ * This function returns IRQ_HANDLED when interrupt is handled else it</div><div class='add'>+ * returns IRQ_NONE.</div><div class='add'>+ **/</div><div class='add'>+irqreturn_t</div><div class='add'>+lpfc_fp_intr_handler(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	struct lpfc_hba  *phba;</div><div class='add'>+	uint32_t ha_copy;</div><div class='add'>+	unsigned long status;</div><div class='add'>+</div><div class='add'>+	/* Get the driver's phba structure from the dev_id and</div><div class='add'>+	 * assume the HBA is not interrupting.</div><div class='add'>+	 */</div><div class='add'>+	phba = (struct lpfc_hba *) dev_id;</div><div class='add'>+</div><div class='add'>+	if (unlikely(!phba))</div><div class='add'>+		return IRQ_NONE;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Stuff needs to be attented to when this function is invoked as an</div><div class='add'>+	 * individual interrupt handler in MSI-X multi-message interrupt mode</div><div class='add'>+	 */</div><div class='add'>+	if (phba-&gt;intr_type == MSIX) {</div><div class='add'>+		/* If pci channel is offline, ignore all the interrupts */</div><div class='add'>+		if (unlikely(pci_channel_offline(phba-&gt;pcidev)))</div><div class='add'>+			return IRQ_NONE;</div><div class='add'>+		/* Update device-level interrupt statistics */</div><div class='add'>+		phba-&gt;sli.slistat.sli_intr++;</div><div class='add'>+		/* Ignore all interrupts during initialization. */</div><div class='add'>+		if (unlikely(phba-&gt;link_state &lt; LPFC_LINK_DOWN))</div><div class='add'>+			return IRQ_NONE;</div><div class='add'>+		/* Need to read HA REG for FCP ring and other ring events */</div><div class='add'>+		ha_copy = readl(phba-&gt;HAregaddr);</div><div class='add'>+		/* Clear up only attention source related to fast-path */</div><div class='add'>+		spin_lock(&amp;phba-&gt;hbalock);</div><div class='add'>+		writel((ha_copy &amp; (HA_R0_CLR_MSK | HA_R1_CLR_MSK)),</div><div class='add'>+			phba-&gt;HAregaddr);</div><div class='add'>+		readl(phba-&gt;HAregaddr); /* flush */</div><div class='add'>+		spin_unlock(&amp;phba-&gt;hbalock);</div><div class='add'>+	} else</div><div class='add'>+		ha_copy = phba-&gt;ha_copy;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Process all events on FCP ring.  Take the optimized path for</div><div class='del'>-	 * FCP IO.  Any other IO is slow path and is handled by</div><div class='del'>-	 * the worker thread.</div><div class='add'>+	 * Process all events on FCP ring. Take the optimized path for FCP IO.</div><div class='ctx'> 	 */</div><div class='del'>-	status = (ha_copy &amp; (HA_RXMASK  &lt;&lt; (4*LPFC_FCP_RING)));</div><div class='add'>+	ha_copy &amp;= ~(phba-&gt;work_ha_mask);</div><div class='add'>+</div><div class='add'>+	status = (ha_copy &amp; (HA_RXMASK &lt;&lt; (4*LPFC_FCP_RING)));</div><div class='ctx'> 	status &gt;&gt;= (4*LPFC_FCP_RING);</div><div class='ctx'> 	if (status &amp; HA_RXMASK)</div><div class='ctx'> 		lpfc_sli_handle_fast_ring_event(phba,</div><div class='hunk'>@@ -4319,11 +5542,10 @@ send_current_mbox:</div><div class='ctx'> </div><div class='ctx'> 	if (phba-&gt;cfg_multi_ring_support == 2) {</div><div class='ctx'> 		/*</div><div class='del'>-		 * Process all events on extra ring.  Take the optimized path</div><div class='del'>-		 * for extra ring IO.  Any other IO is slow path and is handled</div><div class='del'>-		 * by the worker thread.</div><div class='add'>+		 * Process all events on extra ring. Take the optimized path</div><div class='add'>+		 * for extra ring IO.</div><div class='ctx'> 		 */</div><div class='del'>-		status = (ha_copy &amp; (HA_RXMASK  &lt;&lt; (4*LPFC_EXTRA_RING)));</div><div class='add'>+		status = (ha_copy &amp; (HA_RXMASK &lt;&lt; (4*LPFC_EXTRA_RING)));</div><div class='ctx'> 		status &gt;&gt;= (4*LPFC_EXTRA_RING);</div><div class='ctx'> 		if (status &amp; HA_RXMASK) {</div><div class='ctx'> 			lpfc_sli_handle_fast_ring_event(phba,</div><div class='hunk'>@@ -4332,5 +5554,106 @@ send_current_mbox:</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='add'>+}  /* lpfc_fp_intr_handler */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * lpfc_intr_handler: The device-level interrupt handler of lpfc driver.</div><div class='add'>+ * @irq: Interrupt number.</div><div class='add'>+ * @dev_id: The device context pointer.</div><div class='add'>+ *</div><div class='add'>+ * This function is the device-level interrupt handler called from the PCI</div><div class='add'>+ * layer when either MSI or Pin-IRQ interrupt mode is enabled and there is</div><div class='add'>+ * an event in the HBA which requires driver attention. This function</div><div class='add'>+ * invokes the slow-path interrupt attention handling function and fast-path</div><div class='add'>+ * interrupt attention handling function in turn to process the relevant</div><div class='add'>+ * HBA attention events. This function is called without any lock held. It</div><div class='add'>+ * gets the hbalock to access and update SLI data structures.</div><div class='add'>+ *</div><div class='add'>+ * This function returns IRQ_HANDLED when interrupt is handled, else it</div><div class='add'>+ * returns IRQ_NONE.</div><div class='add'>+ **/</div><div class='add'>+irqreturn_t</div><div class='add'>+lpfc_intr_handler(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	struct lpfc_hba  *phba;</div><div class='add'>+	irqreturn_t sp_irq_rc, fp_irq_rc;</div><div class='add'>+	unsigned long status1, status2;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Get the driver's phba structure from the dev_id and</div><div class='add'>+	 * assume the HBA is not interrupting.</div><div class='add'>+	 */</div><div class='add'>+	phba = (struct lpfc_hba *) dev_id;</div><div class='add'>+</div><div class='add'>+	if (unlikely(!phba))</div><div class='add'>+		return IRQ_NONE;</div><div class='add'>+</div><div class='add'>+	/* If the pci channel is offline, ignore all the interrupts. */</div><div class='add'>+	if (unlikely(pci_channel_offline(phba-&gt;pcidev)))</div><div class='add'>+		return IRQ_NONE;</div><div class='add'>+</div><div class='add'>+	/* Update device level interrupt statistics */</div><div class='add'>+	phba-&gt;sli.slistat.sli_intr++;</div><div class='add'>+</div><div class='add'>+	/* Ignore all interrupts during initialization. */</div><div class='add'>+	if (unlikely(phba-&gt;link_state &lt; LPFC_LINK_DOWN))</div><div class='add'>+		return IRQ_NONE;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;phba-&gt;hbalock);</div><div class='add'>+	phba-&gt;ha_copy = readl(phba-&gt;HAregaddr);</div><div class='add'>+	if (unlikely(!phba-&gt;ha_copy)) {</div><div class='add'>+		spin_unlock(&amp;phba-&gt;hbalock);</div><div class='add'>+		return IRQ_NONE;</div><div class='add'>+	} else if (phba-&gt;ha_copy &amp; HA_ERATT) {</div><div class='add'>+		if (phba-&gt;hba_flag &amp; HBA_ERATT_HANDLED)</div><div class='add'>+			/* ERATT polling has handled ERATT */</div><div class='add'>+			phba-&gt;ha_copy &amp;= ~HA_ERATT;</div><div class='add'>+		else</div><div class='add'>+			/* Indicate interrupt handler handles ERATT */</div><div class='add'>+			phba-&gt;hba_flag |= HBA_ERATT_HANDLED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Clear attention sources except link and error attentions */</div><div class='add'>+	writel((phba-&gt;ha_copy &amp; ~(HA_LATT | HA_ERATT)), phba-&gt;HAregaddr);</div><div class='add'>+	readl(phba-&gt;HAregaddr); /* flush */</div><div class='add'>+	spin_unlock(&amp;phba-&gt;hbalock);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Invokes slow-path host attention interrupt handling as appropriate.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* status of events with mailbox and link attention */</div><div class='add'>+	status1 = phba-&gt;ha_copy &amp; (HA_MBATT | HA_LATT | HA_ERATT);</div><div class='add'>+</div><div class='add'>+	/* status of events with ELS ring */</div><div class='add'>+	status2 = (phba-&gt;ha_copy &amp; (HA_RXMASK  &lt;&lt; (4*LPFC_ELS_RING)));</div><div class='add'>+	status2 &gt;&gt;= (4*LPFC_ELS_RING);</div><div class='add'>+</div><div class='add'>+	if (status1 || (status2 &amp; HA_RXMASK))</div><div class='add'>+		sp_irq_rc = lpfc_sp_intr_handler(irq, dev_id);</div><div class='add'>+	else</div><div class='add'>+		sp_irq_rc = IRQ_NONE;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Invoke fast-path host attention interrupt handling as appropriate.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* status of events with FCP ring */</div><div class='add'>+	status1 = (phba-&gt;ha_copy &amp; (HA_RXMASK &lt;&lt; (4*LPFC_FCP_RING)));</div><div class='add'>+	status1 &gt;&gt;= (4*LPFC_FCP_RING);</div><div class='add'>+</div><div class='add'>+	/* status of events with extra ring */</div><div class='add'>+	if (phba-&gt;cfg_multi_ring_support == 2) {</div><div class='add'>+		status2 = (phba-&gt;ha_copy &amp; (HA_RXMASK &lt;&lt; (4*LPFC_EXTRA_RING)));</div><div class='add'>+		status2 &gt;&gt;= (4*LPFC_EXTRA_RING);</div><div class='add'>+	} else</div><div class='add'>+		status2 = 0;</div><div class='add'>+</div><div class='add'>+	if ((status1 &amp; HA_RXMASK) || (status2 &amp; HA_RXMASK))</div><div class='add'>+		fp_irq_rc = lpfc_fp_intr_handler(irq, dev_id);</div><div class='add'>+	else</div><div class='add'>+		fp_irq_rc = IRQ_NONE;</div><div class='ctx'> </div><div class='del'>-} /* lpfc_intr_handler */</div><div class='add'>+	/* Return device-level interrupt handling status */</div><div class='add'>+	return (sp_irq_rc == IRQ_HANDLED) ? sp_irq_rc : fp_irq_rc;</div><div class='add'>+}  /* lpfc_intr_handler */</div><div class='head'>diff --git a/drivers/scsi/lpfc/lpfc_sli.h b/drivers/scsi/lpfc/lpfc_sli.h<br/>index 7249fd252cbb..883938652a6a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/lpfc/lpfc_sli.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/lpfc/lpfc_sli.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/lpfc/lpfc_sli.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/lpfc/lpfc_sli.h</a></div><div class='hunk'>@@ -233,6 +233,7 @@ struct lpfc_sli {</div><div class='ctx'> #define LPFC_SLI2_ACTIVE          0x200	/* SLI2 overlay in firmware is active */</div><div class='ctx'> #define LPFC_PROCESS_LA           0x400	/* Able to process link attention */</div><div class='ctx'> #define LPFC_BLOCK_MGMT_IO        0x800	/* Don't allow mgmt mbx or iocb cmds */</div><div class='add'>+#define LPFC_MENLO_MAINT          0x1000 /* need for menl fw download */</div><div class='ctx'> </div><div class='ctx'> 	struct lpfc_sli_ring ring[LPFC_MAX_RING];</div><div class='ctx'> 	int fcp_ring;		/* ring used for FCP initiator commands */</div><div class='head'>diff --git a/drivers/scsi/lpfc/lpfc_version.h b/drivers/scsi/lpfc/lpfc_version.h<br/>index ad24cacfbe10..cc43e9de22cc 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/lpfc/lpfc_version.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/lpfc/lpfc_version.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/lpfc/lpfc_version.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/lpfc/lpfc_version.h</a></div><div class='hunk'>@@ -18,9 +18,11 @@</div><div class='ctx'>  * included with this package.                                     *</div><div class='ctx'>  *******************************************************************/</div><div class='ctx'> </div><div class='del'>-#define LPFC_DRIVER_VERSION "8.2.7"</div><div class='add'>+#define LPFC_DRIVER_VERSION "8.2.8"</div><div class='ctx'> </div><div class='del'>-#define LPFC_DRIVER_NAME "lpfc"</div><div class='add'>+#define LPFC_DRIVER_NAME		"lpfc"</div><div class='add'>+#define LPFC_SP_DRIVER_HANDLER_NAME	"lpfc:sp"</div><div class='add'>+#define LPFC_FP_DRIVER_HANDLER_NAME	"lpfc:fp"</div><div class='ctx'> </div><div class='ctx'> #define LPFC_MODULE_DESC "Emulex LightPulse Fibre Channel SCSI driver " \</div><div class='ctx'> 		LPFC_DRIVER_VERSION</div><div class='head'>diff --git a/drivers/scsi/lpfc/lpfc_vport.c b/drivers/scsi/lpfc/lpfc_vport.c<br/>index 109f89d98830..a7de1cc02b40 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/lpfc/lpfc_vport.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/lpfc/lpfc_vport.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/lpfc/lpfc_vport.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/lpfc/lpfc_vport.c</a></div><div class='hunk'>@@ -34,6 +34,7 @@</div><div class='ctx'> #include &lt;scsi/scsi_transport_fc.h&gt;</div><div class='ctx'> #include "lpfc_hw.h"</div><div class='ctx'> #include "lpfc_sli.h"</div><div class='add'>+#include "lpfc_nl.h"</div><div class='ctx'> #include "lpfc_disc.h"</div><div class='ctx'> #include "lpfc_scsi.h"</div><div class='ctx'> #include "lpfc.h"</div><div class='hunk'>@@ -204,6 +205,77 @@ lpfc_unique_wwpn(struct lpfc_hba *phba, struct lpfc_vport *new_vport)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lpfc_discovery_wait: Wait for driver discovery to quiesce.</div><div class='add'>+ * @vport: The virtual port for which this call is being executed.</div><div class='add'>+ *</div><div class='add'>+ * This driver calls this routine specifically from lpfc_vport_delete</div><div class='add'>+ * to enforce a synchronous execution of vport</div><div class='add'>+ * delete relative to discovery activities.  The</div><div class='add'>+ * lpfc_vport_delete routine should not return until it</div><div class='add'>+ * can reasonably guarantee that discovery has quiesced.</div><div class='add'>+ * Post FDISC LOGO, the driver must wait until its SAN teardown is</div><div class='add'>+ * complete and all resources recovered before allowing</div><div class='add'>+ * cleanup.</div><div class='add'>+ *</div><div class='add'>+ * This routine does not require any locks held.</div><div class='add'>+ **/</div><div class='add'>+static void lpfc_discovery_wait(struct lpfc_vport *vport)</div><div class='add'>+{</div><div class='add'>+	struct lpfc_hba *phba = vport-&gt;phba;</div><div class='add'>+	uint32_t wait_flags = 0;</div><div class='add'>+	unsigned long wait_time_max;</div><div class='add'>+	unsigned long start_time;</div><div class='add'>+</div><div class='add'>+	wait_flags = FC_RSCN_MODE | FC_RSCN_DISCOVERY | FC_NLP_MORE |</div><div class='add'>+		     FC_RSCN_DEFERRED | FC_NDISC_ACTIVE | FC_DISC_TMO;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The time constraint on this loop is a balance between the</div><div class='add'>+	 * fabric RA_TOV value and dev_loss tmo.  The driver's</div><div class='add'>+	 * devloss_tmo is 10 giving this loop a 3x multiplier minimally.</div><div class='add'>+	 */</div><div class='add'>+	wait_time_max = msecs_to_jiffies(((phba-&gt;fc_ratov * 3) + 3) * 1000);</div><div class='add'>+	wait_time_max += jiffies;</div><div class='add'>+	start_time = jiffies;</div><div class='add'>+	while (time_before(jiffies, wait_time_max)) {</div><div class='add'>+		if ((vport-&gt;num_disc_nodes &gt; 0)    ||</div><div class='add'>+		    (vport-&gt;fc_flag &amp; wait_flags)  ||</div><div class='add'>+		    ((vport-&gt;port_state &gt; LPFC_VPORT_FAILED) &amp;&amp;</div><div class='add'>+		     (vport-&gt;port_state &lt; LPFC_VPORT_READY))) {</div><div class='add'>+			lpfc_printf_log(phba, KERN_INFO, LOG_VPORT,</div><div class='add'>+					"1833 Vport discovery quiesce Wait:"</div><div class='add'>+					" vpi x%x state x%x fc_flags x%x"</div><div class='add'>+					" num_nodes x%x, waiting 1000 msecs"</div><div class='add'>+					" total wait msecs x%x\n",</div><div class='add'>+					vport-&gt;vpi, vport-&gt;port_state,</div><div class='add'>+					vport-&gt;fc_flag, vport-&gt;num_disc_nodes,</div><div class='add'>+					jiffies_to_msecs(jiffies - start_time));</div><div class='add'>+			msleep(1000);</div><div class='add'>+		} else {</div><div class='add'>+			/* Base case.  Wait variants satisfied.  Break out */</div><div class='add'>+			lpfc_printf_log(phba, KERN_INFO, LOG_VPORT,</div><div class='add'>+					 "1834 Vport discovery quiesced:"</div><div class='add'>+					 " vpi x%x state x%x fc_flags x%x"</div><div class='add'>+					 " wait msecs x%x\n",</div><div class='add'>+					 vport-&gt;vpi, vport-&gt;port_state,</div><div class='add'>+					 vport-&gt;fc_flag,</div><div class='add'>+					 jiffies_to_msecs(jiffies</div><div class='add'>+						- start_time));</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (time_after(jiffies, wait_time_max))</div><div class='add'>+		lpfc_printf_log(phba, KERN_ERR, LOG_VPORT,</div><div class='add'>+				"1835 Vport discovery quiesce failed:"</div><div class='add'>+				" vpi x%x state x%x fc_flags x%x"</div><div class='add'>+				" wait msecs x%x\n",</div><div class='add'>+				vport-&gt;vpi, vport-&gt;port_state,</div><div class='add'>+				vport-&gt;fc_flag,</div><div class='add'>+				jiffies_to_msecs(jiffies - start_time));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int</div><div class='ctx'> lpfc_vport_create(struct fc_vport *fc_vport, bool disable)</div><div class='ctx'> {</div><div class='hunk'>@@ -506,8 +578,12 @@ lpfc_vport_delete(struct fc_vport *fc_vport)</div><div class='ctx'> 	 * initiated after we've disposed of all other resources associated</div><div class='ctx'> 	 * with the port.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!scsi_host_get(shost) || !scsi_host_get(shost))</div><div class='add'>+	if (!scsi_host_get(shost))</div><div class='add'>+		return VPORT_INVAL;</div><div class='add'>+	if (!scsi_host_get(shost)) {</div><div class='add'>+		scsi_host_put(shost);</div><div class='ctx'> 		return VPORT_INVAL;</div><div class='add'>+	}</div><div class='ctx'> 	spin_lock_irq(&amp;phba-&gt;hbalock);</div><div class='ctx'> 	vport-&gt;load_flag |= FC_UNLOADING;</div><div class='ctx'> 	spin_unlock_irq(&amp;phba-&gt;hbalock);</div><div class='hunk'>@@ -597,11 +673,16 @@ lpfc_vport_delete(struct fc_vport *fc_vport)</div><div class='ctx'> 		}</div><div class='ctx'> 		vport-&gt;unreg_vpi_cmpl = VPORT_INVAL;</div><div class='ctx'> 		timeout = msecs_to_jiffies(phba-&gt;fc_ratov * 2000);</div><div class='add'>+		if (ndlp-&gt;nlp_state == NLP_STE_UNUSED_NODE)</div><div class='add'>+			goto skip_logo;</div><div class='ctx'> 		if (!lpfc_issue_els_npiv_logo(vport, ndlp))</div><div class='ctx'> 			while (vport-&gt;unreg_vpi_cmpl == VPORT_INVAL &amp;&amp; timeout)</div><div class='ctx'> 				timeout = schedule_timeout(timeout);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (!(phba-&gt;pport-&gt;load_flag &amp; FC_UNLOADING))</div><div class='add'>+		lpfc_discovery_wait(vport);</div><div class='add'>+</div><div class='ctx'> skip_logo:</div><div class='ctx'> 	lpfc_cleanup(vport);</div><div class='ctx'> 	lpfc_sli_host_down(vport);</div><div class='hunk'>@@ -615,8 +696,10 @@ skip_logo:</div><div class='ctx'> 		 * Completion of unreg_vpi (lpfc_mbx_cmpl_unreg_vpi)</div><div class='ctx'> 		 * does the scsi_host_put() to release the vport.</div><div class='ctx'> 		 */</div><div class='del'>-		lpfc_mbx_unreg_vpi(vport);</div><div class='del'>-	}</div><div class='add'>+		if (lpfc_mbx_unreg_vpi(vport))</div><div class='add'>+			scsi_host_put(shost);</div><div class='add'>+	} else</div><div class='add'>+		scsi_host_put(shost);</div><div class='ctx'> </div><div class='ctx'> 	lpfc_free_vpi(phba, vport-&gt;vpi);</div><div class='ctx'> 	vport-&gt;work_port_events = 0;</div><div class='hunk'>@@ -663,3 +746,82 @@ lpfc_destroy_vport_work_array(struct lpfc_hba *phba, struct lpfc_vport **vports)</div><div class='ctx'> 		scsi_host_put(lpfc_shost_from_vport(vports[i]));</div><div class='ctx'> 	kfree(vports);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * lpfc_vport_reset_stat_data: Reset the statistical data for the vport.</div><div class='add'>+ * @vport: Pointer to vport object.</div><div class='add'>+ *</div><div class='add'>+ * This function resets the statistical data for the vport. This function</div><div class='add'>+ * is called with the host_lock held</div><div class='add'>+ **/</div><div class='add'>+void</div><div class='add'>+lpfc_vport_reset_stat_data(struct lpfc_vport *vport)</div><div class='add'>+{</div><div class='add'>+	struct lpfc_nodelist *ndlp = NULL, *next_ndlp = NULL;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(ndlp, next_ndlp, &amp;vport-&gt;fc_nodes, nlp_listp) {</div><div class='add'>+		if (!NLP_CHK_NODE_ACT(ndlp))</div><div class='add'>+			continue;</div><div class='add'>+		if (ndlp-&gt;lat_data)</div><div class='add'>+			memset(ndlp-&gt;lat_data, 0, LPFC_MAX_BUCKET_COUNT *</div><div class='add'>+				sizeof(struct lpfc_scsicmd_bkt));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * lpfc_alloc_bucket: Allocate data buffer required for collecting</div><div class='add'>+ *  statistical data.</div><div class='add'>+ * @vport: Pointer to vport object.</div><div class='add'>+ *</div><div class='add'>+ * This function allocates data buffer required for all the FC</div><div class='add'>+ * nodes of the vport to collect statistical data.</div><div class='add'>+ **/</div><div class='add'>+void</div><div class='add'>+lpfc_alloc_bucket(struct lpfc_vport *vport)</div><div class='add'>+{</div><div class='add'>+	struct lpfc_nodelist *ndlp = NULL, *next_ndlp = NULL;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(ndlp, next_ndlp, &amp;vport-&gt;fc_nodes, nlp_listp) {</div><div class='add'>+		if (!NLP_CHK_NODE_ACT(ndlp))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		kfree(ndlp-&gt;lat_data);</div><div class='add'>+		ndlp-&gt;lat_data = NULL;</div><div class='add'>+</div><div class='add'>+		if (ndlp-&gt;nlp_state == NLP_STE_MAPPED_NODE) {</div><div class='add'>+			ndlp-&gt;lat_data = kcalloc(LPFC_MAX_BUCKET_COUNT,</div><div class='add'>+					 sizeof(struct lpfc_scsicmd_bkt),</div><div class='add'>+					 GFP_ATOMIC);</div><div class='add'>+</div><div class='add'>+			if (!ndlp-&gt;lat_data)</div><div class='add'>+				lpfc_printf_vlog(vport, KERN_ERR, LOG_NODE,</div><div class='add'>+					"0287 lpfc_alloc_bucket failed to "</div><div class='add'>+					"allocate statistical data buffer DID "</div><div class='add'>+					"0x%x\n", ndlp-&gt;nlp_DID);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * lpfc_free_bucket: Free data buffer required for collecting</div><div class='add'>+ *  statistical data.</div><div class='add'>+ * @vport: Pointer to vport object.</div><div class='add'>+ *</div><div class='add'>+ * Th function frees statistical data buffer of all the FC</div><div class='add'>+ * nodes of the vport.</div><div class='add'>+ **/</div><div class='add'>+void</div><div class='add'>+lpfc_free_bucket(struct lpfc_vport *vport)</div><div class='add'>+{</div><div class='add'>+	struct lpfc_nodelist *ndlp = NULL, *next_ndlp = NULL;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(ndlp, next_ndlp, &amp;vport-&gt;fc_nodes, nlp_listp) {</div><div class='add'>+		if (!NLP_CHK_NODE_ACT(ndlp))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		kfree(ndlp-&gt;lat_data);</div><div class='add'>+		ndlp-&gt;lat_data = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/scsi/lpfc/lpfc_vport.h b/drivers/scsi/lpfc/lpfc_vport.h<br/>index 96c445333b69..90828340acea 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/lpfc/lpfc_vport.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/lpfc/lpfc_vport.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/lpfc/lpfc_vport.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/lpfc/lpfc_vport.h</a></div><div class='hunk'>@@ -112,4 +112,8 @@ struct vport_cmd_tag {</div><div class='ctx'> void lpfc_vport_set_state(struct lpfc_vport *vport,</div><div class='ctx'> 			  enum fc_vport_state new_state);</div><div class='ctx'> </div><div class='add'>+void lpfc_vport_reset_stat_data(struct lpfc_vport *);</div><div class='add'>+void lpfc_alloc_bucket(struct lpfc_vport *);</div><div class='add'>+void lpfc_free_bucket(struct lpfc_vport *);</div><div class='add'>+</div><div class='ctx'> #endif /* H_LPFC_VPORT */</div><div class='head'>diff --git a/drivers/scsi/megaraid/megaraid_sas.c b/drivers/scsi/megaraid/megaraid_sas.c<br/>index 97b763378e7d..afe1de998763 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/megaraid/megaraid_sas.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/megaraid/megaraid_sas.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/megaraid/megaraid_sas.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/megaraid/megaraid_sas.c</a></div><div class='hunk'>@@ -1167,7 +1167,7 @@ static int megasas_generic_reset(struct scsi_cmnd *scmd)</div><div class='ctx'>  * cmd has not been completed within the timeout period.</div><div class='ctx'>  */</div><div class='ctx'> static enum</div><div class='del'>-scsi_eh_timer_return megasas_reset_timer(struct scsi_cmnd *scmd)</div><div class='add'>+blk_eh_timer_return megasas_reset_timer(struct scsi_cmnd *scmd)</div><div class='ctx'> {</div><div class='ctx'> 	struct megasas_cmd *cmd = (struct megasas_cmd *)scmd-&gt;SCp.ptr;</div><div class='ctx'> 	struct megasas_instance *instance;</div><div class='hunk'>@@ -1175,7 +1175,7 @@ scsi_eh_timer_return megasas_reset_timer(struct scsi_cmnd *scmd)</div><div class='ctx'> </div><div class='ctx'> 	if (time_after(jiffies, scmd-&gt;jiffies_at_alloc +</div><div class='ctx'> 				(MEGASAS_DEFAULT_CMD_TIMEOUT * 2) * HZ)) {</div><div class='del'>-		return EH_NOT_HANDLED;</div><div class='add'>+		return BLK_EH_NOT_HANDLED;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	instance = cmd-&gt;instance;</div><div class='hunk'>@@ -1189,7 +1189,7 @@ scsi_eh_timer_return megasas_reset_timer(struct scsi_cmnd *scmd)</div><div class='ctx'> </div><div class='ctx'> 		spin_unlock_irqrestore(instance-&gt;host-&gt;host_lock, flags);</div><div class='ctx'> 	}</div><div class='del'>-	return EH_RESET_TIMER;</div><div class='add'>+	return BLK_EH_RESET_TIMER;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/drivers/scsi/ncr53c8xx.c b/drivers/scsi/ncr53c8xx.c<br/>index c57c94c0ffd2..3b7240e40819 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/ncr53c8xx.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/ncr53c8xx.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/ncr53c8xx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/ncr53c8xx.c</a></div><div class='hunk'>@@ -4170,8 +4170,8 @@ static int ncr_queue_command (struct ncb *np, struct scsi_cmnd *cmd)</div><div class='ctx'> 	**</div><div class='ctx'> 	**----------------------------------------------------</div><div class='ctx'> 	*/</div><div class='del'>-	if (np-&gt;settle_time &amp;&amp; cmd-&gt;timeout_per_command &gt;= HZ) {</div><div class='del'>-		u_long tlimit = jiffies + cmd-&gt;timeout_per_command - HZ;</div><div class='add'>+	if (np-&gt;settle_time &amp;&amp; cmd-&gt;request-&gt;timeout &gt;= HZ) {</div><div class='add'>+		u_long tlimit = jiffies + cmd-&gt;request-&gt;timeout - HZ;</div><div class='ctx'> 		if (time_after(np-&gt;settle_time, tlimit))</div><div class='ctx'> 			np-&gt;settle_time = tlimit;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/scsi/osst.c b/drivers/scsi/osst.c<br/>index 1c79f9794f4e..0ea78d9a37db 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/osst.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/osst.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/osst.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/osst.c</a></div><div class='hunk'>@@ -5708,7 +5708,8 @@ static int osst_sysfs_add(dev_t dev, struct device *device, struct osst_tape * S</div><div class='ctx'> 	struct device *osst_member;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	osst_member = device_create_drvdata(osst_sysfs_class, device, dev, STp, "%s", name);</div><div class='add'>+	osst_member = device_create(osst_sysfs_class, device, dev, STp,</div><div class='add'>+				    "%s", name);</div><div class='ctx'> 	if (IS_ERR(osst_member)) {</div><div class='ctx'> 		printk(KERN_WARNING "osst :W: Unable to add sysfs class member %s\n", name);</div><div class='ctx'> 		return PTR_ERR(osst_member);</div><div class='head'>diff --git a/drivers/scsi/pcmcia/aha152x_stub.c b/drivers/scsi/pcmcia/aha152x_stub.c<br/>index 2dd0dc9a9aed..165ff884f48e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/pcmcia/aha152x_stub.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/pcmcia/aha152x_stub.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/pcmcia/aha152x_stub.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/pcmcia/aha152x_stub.c</a></div><div class='hunk'>@@ -140,44 +140,41 @@ static void aha152x_detach(struct pcmcia_device *link)</div><div class='ctx'> #define CS_CHECK(fn, ret) \</div><div class='ctx'> do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)</div><div class='ctx'> </div><div class='add'>+static int aha152x_config_check(struct pcmcia_device *p_dev,</div><div class='add'>+				cistpl_cftable_entry_t *cfg,</div><div class='add'>+				cistpl_cftable_entry_t *dflt,</div><div class='add'>+				unsigned int vcc,</div><div class='add'>+				void *priv_data)</div><div class='add'>+{</div><div class='add'>+	/* For New Media T&amp;J, look for a SCSI window */</div><div class='add'>+	if (cfg-&gt;io.win[0].len &gt;= 0x20)</div><div class='add'>+		p_dev-&gt;io.BasePort1 = cfg-&gt;io.win[0].base;</div><div class='add'>+	else if ((cfg-&gt;io.nwin &gt; 1) &amp;&amp;</div><div class='add'>+		 (cfg-&gt;io.win[1].len &gt;= 0x20))</div><div class='add'>+		p_dev-&gt;io.BasePort1 = cfg-&gt;io.win[1].base;</div><div class='add'>+	if ((cfg-&gt;io.nwin &gt; 0) &amp;&amp;</div><div class='add'>+	    (p_dev-&gt;io.BasePort1 &lt; 0xffff)) {</div><div class='add'>+		if (!pcmcia_request_io(p_dev, &amp;p_dev-&gt;io))</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int aha152x_config_cs(struct pcmcia_device *link)</div><div class='ctx'> {</div><div class='ctx'>     scsi_info_t *info = link-&gt;priv;</div><div class='ctx'>     struct aha152x_setup s;</div><div class='del'>-    tuple_t tuple;</div><div class='del'>-    cisparse_t parse;</div><div class='del'>-    int i, last_ret, last_fn;</div><div class='del'>-    u_char tuple_data[64];</div><div class='add'>+    int last_ret, last_fn;</div><div class='ctx'>     struct Scsi_Host *host;</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     DEBUG(0, "aha152x_config(0x%p)\n", link);</div><div class='ctx'> </div><div class='del'>-    tuple.TupleData = tuple_data;</div><div class='del'>-    tuple.TupleDataMax = 64;</div><div class='del'>-    tuple.TupleOffset = 0;</div><div class='del'>-    tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;</div><div class='del'>-    tuple.Attributes = 0;</div><div class='del'>-    CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &amp;tuple));</div><div class='del'>-    while (1) {</div><div class='del'>-	if (pcmcia_get_tuple_data(link, &amp;tuple) != 0 ||</div><div class='del'>-		pcmcia_parse_tuple(link, &amp;tuple, &amp;parse) != 0)</div><div class='del'>-	    goto next_entry;</div><div class='del'>-	/* For New Media T&amp;J, look for a SCSI window */</div><div class='del'>-	if (parse.cftable_entry.io.win[0].len &gt;= 0x20)</div><div class='del'>-	    link-&gt;io.BasePort1 = parse.cftable_entry.io.win[0].base;</div><div class='del'>-	else if ((parse.cftable_entry.io.nwin &gt; 1) &amp;&amp;</div><div class='del'>-		 (parse.cftable_entry.io.win[1].len &gt;= 0x20))</div><div class='del'>-	    link-&gt;io.BasePort1 = parse.cftable_entry.io.win[1].base;</div><div class='del'>-	if ((parse.cftable_entry.io.nwin &gt; 0) &amp;&amp;</div><div class='del'>-	    (link-&gt;io.BasePort1 &lt; 0xffff)) {</div><div class='del'>-	    link-&gt;conf.ConfigIndex = parse.cftable_entry.index;</div><div class='del'>-	    i = pcmcia_request_io(link, &amp;link-&gt;io);</div><div class='del'>-	    if (i == CS_SUCCESS) break;</div><div class='del'>-	}</div><div class='del'>-    next_entry:</div><div class='del'>-	CS_CHECK(GetNextTuple, pcmcia_get_next_tuple(link, &amp;tuple));</div><div class='add'>+    last_ret = pcmcia_loop_config(link, aha152x_config_check, NULL);</div><div class='add'>+    if (last_ret) {</div><div class='add'>+	cs_error(link, RequestIO, last_ret);</div><div class='add'>+	goto failed;</div><div class='ctx'>     }</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &amp;link-&gt;irq));</div><div class='ctx'>     CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &amp;link-&gt;conf));</div><div class='ctx'>     </div><div class='hunk'>@@ -208,6 +205,7 @@ static int aha152x_config_cs(struct pcmcia_device *link)</div><div class='ctx'> </div><div class='ctx'> cs_failed:</div><div class='ctx'>     cs_error(link, last_fn, last_ret);</div><div class='add'>+failed:</div><div class='ctx'>     aha152x_release_cs(link);</div><div class='ctx'>     return -ENODEV;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/scsi/pcmcia/fdomain_stub.c b/drivers/scsi/pcmcia/fdomain_stub.c<br/>index d8b99351b053..06254f46a0dd 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/pcmcia/fdomain_stub.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/pcmcia/fdomain_stub.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/pcmcia/fdomain_stub.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/pcmcia/fdomain_stub.c</a></div><div class='hunk'>@@ -123,34 +123,30 @@ static void fdomain_detach(struct pcmcia_device *link)</div><div class='ctx'> #define CS_CHECK(fn, ret) \</div><div class='ctx'> do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)</div><div class='ctx'> </div><div class='add'>+static int fdomain_config_check(struct pcmcia_device *p_dev,</div><div class='add'>+				cistpl_cftable_entry_t *cfg,</div><div class='add'>+				cistpl_cftable_entry_t *dflt,</div><div class='add'>+				unsigned int vcc,</div><div class='add'>+				void *priv_data)</div><div class='add'>+{</div><div class='add'>+	p_dev-&gt;io.BasePort1 = cfg-&gt;io.win[0].base;</div><div class='add'>+	return pcmcia_request_io(p_dev, &amp;p_dev-&gt;io);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> static int fdomain_config(struct pcmcia_device *link)</div><div class='ctx'> {</div><div class='ctx'>     scsi_info_t *info = link-&gt;priv;</div><div class='del'>-    tuple_t tuple;</div><div class='del'>-    cisparse_t parse;</div><div class='del'>-    int i, last_ret, last_fn;</div><div class='del'>-    u_char tuple_data[64];</div><div class='add'>+    int last_ret, last_fn;</div><div class='ctx'>     char str[22];</div><div class='ctx'>     struct Scsi_Host *host;</div><div class='ctx'> </div><div class='ctx'>     DEBUG(0, "fdomain_config(0x%p)\n", link);</div><div class='ctx'> </div><div class='del'>-    tuple.TupleData = tuple_data;</div><div class='del'>-    tuple.TupleDataMax = 64;</div><div class='del'>-    tuple.TupleOffset = 0;</div><div class='del'>-</div><div class='del'>-    tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;</div><div class='del'>-    CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &amp;tuple));</div><div class='del'>-    while (1) {</div><div class='del'>-	if (pcmcia_get_tuple_data(link, &amp;tuple) != 0 ||</div><div class='del'>-		pcmcia_parse_tuple(link, &amp;tuple, &amp;parse) != 0)</div><div class='del'>-	    goto next_entry;</div><div class='del'>-	link-&gt;conf.ConfigIndex = parse.cftable_entry.index;</div><div class='del'>-	link-&gt;io.BasePort1 = parse.cftable_entry.io.win[0].base;</div><div class='del'>-	i = pcmcia_request_io(link, &amp;link-&gt;io);</div><div class='del'>-	if (i == CS_SUCCESS) break;</div><div class='del'>-    next_entry:</div><div class='del'>-	CS_CHECK(GetNextTuple, pcmcia_get_next_tuple(link, &amp;tuple));</div><div class='add'>+    last_ret = pcmcia_loop_config(link, fdomain_config_check, NULL);</div><div class='add'>+    if (last_ret) {</div><div class='add'>+	    cs_error(link, RequestIO, last_ret);</div><div class='add'>+	    goto failed;</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &amp;link-&gt;irq));</div><div class='hunk'>@@ -181,6 +177,7 @@ static int fdomain_config(struct pcmcia_device *link)</div><div class='ctx'> </div><div class='ctx'> cs_failed:</div><div class='ctx'>     cs_error(link, last_fn, last_ret);</div><div class='add'>+failed:</div><div class='ctx'>     fdomain_release(link);</div><div class='ctx'>     return -ENODEV;</div><div class='ctx'> } /* fdomain_config */</div><div class='head'>diff --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c<br/>index 24e6cb8396e3..11a61ea8d5d9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/pcmcia/nsp_cs.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/pcmcia/nsp_cs.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/pcmcia/nsp_cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/pcmcia/nsp_cs.c</a></div><div class='hunk'>@@ -1606,133 +1606,129 @@ static void nsp_cs_detach(struct pcmcia_device *link)</div><div class='ctx'>     is received, to configure the PCMCIA socket, and to make the</div><div class='ctx'>     ethernet device available to the system.</div><div class='ctx'> ======================================================================*/</div><div class='del'>-#define CS_CHECK(fn, ret) \</div><div class='del'>-do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)</div><div class='del'>-/*====================================================================*/</div><div class='del'>-static int nsp_cs_config(struct pcmcia_device *link)</div><div class='del'>-{</div><div class='del'>-	int		  ret;</div><div class='del'>-	scsi_info_t	 *info	 = link-&gt;priv;</div><div class='del'>-	tuple_t		  tuple;</div><div class='del'>-	cisparse_t	  parse;</div><div class='del'>-	int		  last_ret, last_fn;</div><div class='del'>-	unsigned char	  tuple_data[64];</div><div class='del'>-	config_info_t	  conf;</div><div class='del'>-	win_req_t         req;</div><div class='del'>-	memreq_t          map;</div><div class='del'>-	cistpl_cftable_entry_t dflt = { 0 };</div><div class='del'>-	struct Scsi_Host *host;</div><div class='del'>-	nsp_hw_data      *data = &amp;nsp_data_base;</div><div class='del'>-</div><div class='del'>-	nsp_dbg(NSP_DEBUG_INIT, "in");</div><div class='del'>-</div><div class='del'>-	tuple.Attributes      = 0;</div><div class='del'>-	tuple.TupleData	      = tuple_data;</div><div class='del'>-	tuple.TupleDataMax    = sizeof(tuple_data);</div><div class='del'>-	tuple.TupleOffset     = 0;</div><div class='del'>-</div><div class='del'>-	/* Look up the current Vcc */</div><div class='del'>-	CS_CHECK(GetConfigurationInfo, pcmcia_get_configuration_info(link, &amp;conf));</div><div class='ctx'> </div><div class='del'>-	tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;</div><div class='del'>-	CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &amp;tuple));</div><div class='del'>-	while (1) {</div><div class='del'>-		cistpl_cftable_entry_t *cfg = &amp;(parse.cftable_entry);</div><div class='add'>+struct nsp_cs_configdata {</div><div class='add'>+	nsp_hw_data		*data;</div><div class='add'>+	win_req_t		req;</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-		if (pcmcia_get_tuple_data(link, &amp;tuple) != 0 ||</div><div class='del'>-				pcmcia_parse_tuple(link, &amp;tuple, &amp;parse) != 0)</div><div class='del'>-			goto next_entry;</div><div class='add'>+static int nsp_cs_config_check(struct pcmcia_device *p_dev,</div><div class='add'>+			       cistpl_cftable_entry_t *cfg,</div><div class='add'>+			       cistpl_cftable_entry_t *dflt,</div><div class='add'>+			       unsigned int vcc,</div><div class='add'>+			       void *priv_data)</div><div class='add'>+{</div><div class='add'>+	struct nsp_cs_configdata *cfg_mem = priv_data;</div><div class='ctx'> </div><div class='del'>-		if (cfg-&gt;flags &amp; CISTPL_CFTABLE_DEFAULT) { dflt = *cfg; }</div><div class='del'>-		if (cfg-&gt;index == 0) { goto next_entry; }</div><div class='del'>-		link-&gt;conf.ConfigIndex = cfg-&gt;index;</div><div class='add'>+	if (cfg-&gt;index == 0)</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-		/* Does this card need audio output? */</div><div class='del'>-		if (cfg-&gt;flags &amp; CISTPL_CFTABLE_AUDIO) {</div><div class='del'>-			link-&gt;conf.Attributes |= CONF_ENABLE_SPKR;</div><div class='del'>-			link-&gt;conf.Status = CCSR_AUDIO_ENA;</div><div class='del'>-		}</div><div class='add'>+	/* Does this card need audio output? */</div><div class='add'>+	if (cfg-&gt;flags &amp; CISTPL_CFTABLE_AUDIO) {</div><div class='add'>+		p_dev-&gt;conf.Attributes |= CONF_ENABLE_SPKR;</div><div class='add'>+		p_dev-&gt;conf.Status = CCSR_AUDIO_ENA;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		/* Use power settings for Vcc and Vpp if present */</div><div class='del'>-		/*  Note that the CIS values need to be rescaled */</div><div class='del'>-		if (cfg-&gt;vcc.present &amp; (1&lt;&lt;CISTPL_POWER_VNOM)) {</div><div class='del'>-			if (conf.Vcc != cfg-&gt;vcc.param[CISTPL_POWER_VNOM]/10000) {</div><div class='del'>-				goto next_entry;</div><div class='del'>-			}</div><div class='del'>-		} else if (dflt.vcc.present &amp; (1&lt;&lt;CISTPL_POWER_VNOM)) {</div><div class='del'>-			if (conf.Vcc != dflt.vcc.param[CISTPL_POWER_VNOM]/10000) {</div><div class='del'>-				goto next_entry;</div><div class='del'>-			}</div><div class='add'>+	/* Use power settings for Vcc and Vpp if present */</div><div class='add'>+	/*  Note that the CIS values need to be rescaled */</div><div class='add'>+	if (cfg-&gt;vcc.present &amp; (1&lt;&lt;CISTPL_POWER_VNOM)) {</div><div class='add'>+		if (vcc != cfg-&gt;vcc.param[CISTPL_POWER_VNOM]/10000)</div><div class='add'>+			return -ENODEV;</div><div class='add'>+		else if (dflt-&gt;vcc.present &amp; (1&lt;&lt;CISTPL_POWER_VNOM)) {</div><div class='add'>+			if (vcc != dflt-&gt;vcc.param[CISTPL_POWER_VNOM]/10000)</div><div class='add'>+				return -ENODEV;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (cfg-&gt;vpp1.present &amp; (1 &lt;&lt; CISTPL_POWER_VNOM)) {</div><div class='del'>-			link-&gt;conf.Vpp =</div><div class='add'>+			p_dev-&gt;conf.Vpp =</div><div class='ctx'> 				cfg-&gt;vpp1.param[CISTPL_POWER_VNOM] / 10000;</div><div class='del'>-		} else if (dflt.vpp1.present &amp; (1 &lt;&lt; CISTPL_POWER_VNOM)) {</div><div class='del'>-			link-&gt;conf.Vpp =</div><div class='del'>-				dflt.vpp1.param[CISTPL_POWER_VNOM] / 10000;</div><div class='add'>+		} else if (dflt-&gt;vpp1.present &amp; (1 &lt;&lt; CISTPL_POWER_VNOM)) {</div><div class='add'>+			p_dev-&gt;conf.Vpp =</div><div class='add'>+				dflt-&gt;vpp1.param[CISTPL_POWER_VNOM] / 10000;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Do we need to allocate an interrupt? */</div><div class='del'>-		if (cfg-&gt;irq.IRQInfo1 || dflt.irq.IRQInfo1) {</div><div class='del'>-			link-&gt;conf.Attributes |= CONF_ENABLE_IRQ;</div><div class='del'>-		}</div><div class='add'>+		if (cfg-&gt;irq.IRQInfo1 || dflt-&gt;irq.IRQInfo1)</div><div class='add'>+			p_dev-&gt;conf.Attributes |= CONF_ENABLE_IRQ;</div><div class='ctx'> </div><div class='ctx'> 		/* IO window settings */</div><div class='del'>-		link-&gt;io.NumPorts1 = link-&gt;io.NumPorts2 = 0;</div><div class='del'>-		if ((cfg-&gt;io.nwin &gt; 0) || (dflt.io.nwin &gt; 0)) {</div><div class='del'>-			cistpl_io_t *io = (cfg-&gt;io.nwin) ? &amp;cfg-&gt;io : &amp;dflt.io;</div><div class='del'>-			link-&gt;io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;</div><div class='add'>+		p_dev-&gt;io.NumPorts1 = p_dev-&gt;io.NumPorts2 = 0;</div><div class='add'>+		if ((cfg-&gt;io.nwin &gt; 0) || (dflt-&gt;io.nwin &gt; 0)) {</div><div class='add'>+			cistpl_io_t *io = (cfg-&gt;io.nwin) ? &amp;cfg-&gt;io : &amp;dflt-&gt;io;</div><div class='add'>+			p_dev-&gt;io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;</div><div class='ctx'> 			if (!(io-&gt;flags &amp; CISTPL_IO_8BIT))</div><div class='del'>-				link-&gt;io.Attributes1 = IO_DATA_PATH_WIDTH_16;</div><div class='add'>+				p_dev-&gt;io.Attributes1 = IO_DATA_PATH_WIDTH_16;</div><div class='ctx'> 			if (!(io-&gt;flags &amp; CISTPL_IO_16BIT))</div><div class='del'>-				link-&gt;io.Attributes1 = IO_DATA_PATH_WIDTH_8;</div><div class='del'>-			link-&gt;io.IOAddrLines = io-&gt;flags &amp; CISTPL_IO_LINES_MASK;</div><div class='del'>-			link-&gt;io.BasePort1 = io-&gt;win[0].base;</div><div class='del'>-			link-&gt;io.NumPorts1 = io-&gt;win[0].len;</div><div class='add'>+				p_dev-&gt;io.Attributes1 = IO_DATA_PATH_WIDTH_8;</div><div class='add'>+			p_dev-&gt;io.IOAddrLines = io-&gt;flags &amp; CISTPL_IO_LINES_MASK;</div><div class='add'>+			p_dev-&gt;io.BasePort1 = io-&gt;win[0].base;</div><div class='add'>+			p_dev-&gt;io.NumPorts1 = io-&gt;win[0].len;</div><div class='ctx'> 			if (io-&gt;nwin &gt; 1) {</div><div class='del'>-				link-&gt;io.Attributes2 = link-&gt;io.Attributes1;</div><div class='del'>-				link-&gt;io.BasePort2 = io-&gt;win[1].base;</div><div class='del'>-				link-&gt;io.NumPorts2 = io-&gt;win[1].len;</div><div class='add'>+				p_dev-&gt;io.Attributes2 = p_dev-&gt;io.Attributes1;</div><div class='add'>+				p_dev-&gt;io.BasePort2 = io-&gt;win[1].base;</div><div class='add'>+				p_dev-&gt;io.NumPorts2 = io-&gt;win[1].len;</div><div class='ctx'> 			}</div><div class='ctx'> 			/* This reserves IO space but doesn't actually enable it */</div><div class='del'>-			if (pcmcia_request_io(link, &amp;link-&gt;io) != 0)</div><div class='add'>+			if (pcmcia_request_io(p_dev, &amp;p_dev-&gt;io) != 0)</div><div class='ctx'> 				goto next_entry;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if ((cfg-&gt;mem.nwin &gt; 0) || (dflt.mem.nwin &gt; 0)) {</div><div class='del'>-			cistpl_mem_t *mem =</div><div class='del'>-				(cfg-&gt;mem.nwin) ? &amp;cfg-&gt;mem : &amp;dflt.mem;</div><div class='del'>-			req.Attributes = WIN_DATA_WIDTH_16|WIN_MEMORY_TYPE_CM;</div><div class='del'>-			req.Attributes |= WIN_ENABLE;</div><div class='del'>-			req.Base = mem-&gt;win[0].host_addr;</div><div class='del'>-			req.Size = mem-&gt;win[0].len;</div><div class='del'>-			if (req.Size &lt; 0x1000) {</div><div class='del'>-				req.Size = 0x1000;</div><div class='del'>-			}</div><div class='del'>-			req.AccessSpeed = 0;</div><div class='del'>-			if (pcmcia_request_window(&amp;link, &amp;req, &amp;link-&gt;win) != 0)</div><div class='add'>+		if ((cfg-&gt;mem.nwin &gt; 0) || (dflt-&gt;mem.nwin &gt; 0)) {</div><div class='add'>+			memreq_t	map;</div><div class='add'>+			cistpl_mem_t	*mem =</div><div class='add'>+				(cfg-&gt;mem.nwin) ? &amp;cfg-&gt;mem : &amp;dflt-&gt;mem;</div><div class='add'>+			cfg_mem-&gt;req.Attributes = WIN_DATA_WIDTH_16|WIN_MEMORY_TYPE_CM;</div><div class='add'>+			cfg_mem-&gt;req.Attributes |= WIN_ENABLE;</div><div class='add'>+			cfg_mem-&gt;req.Base = mem-&gt;win[0].host_addr;</div><div class='add'>+			cfg_mem-&gt;req.Size = mem-&gt;win[0].len;</div><div class='add'>+			if (cfg_mem-&gt;req.Size &lt; 0x1000)</div><div class='add'>+				cfg_mem-&gt;req.Size = 0x1000;</div><div class='add'>+			cfg_mem-&gt;req.AccessSpeed = 0;</div><div class='add'>+			if (pcmcia_request_window(&amp;p_dev, &amp;cfg_mem-&gt;req, &amp;p_dev-&gt;win) != 0)</div><div class='ctx'> 				goto next_entry;</div><div class='ctx'> 			map.Page = 0; map.CardOffset = mem-&gt;win[0].card_addr;</div><div class='del'>-			if (pcmcia_map_mem_page(link-&gt;win, &amp;map) != 0)</div><div class='add'>+			if (pcmcia_map_mem_page(p_dev-&gt;win, &amp;map) != 0)</div><div class='ctx'> 				goto next_entry;</div><div class='ctx'> </div><div class='del'>-			data-&gt;MmioAddress = (unsigned long)ioremap_nocache(req.Base, req.Size);</div><div class='del'>-			data-&gt;MmioLength  = req.Size;</div><div class='add'>+			cfg_mem-&gt;data-&gt;MmioAddress = (unsigned long) ioremap_nocache(cfg_mem-&gt;req.Base, cfg_mem-&gt;req.Size);</div><div class='add'>+			cfg_mem-&gt;data-&gt;MmioLength  = cfg_mem-&gt;req.Size;</div><div class='ctx'> 		}</div><div class='ctx'> 		/* If we got this far, we're cool! */</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	next_entry:</div><div class='del'>-		nsp_dbg(NSP_DEBUG_INIT, "next");</div><div class='del'>-		pcmcia_disable_device(link);</div><div class='del'>-		CS_CHECK(GetNextTuple, pcmcia_get_next_tuple(link, &amp;tuple));</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+next_entry:</div><div class='add'>+	nsp_dbg(NSP_DEBUG_INIT, "next");</div><div class='add'>+	pcmcia_disable_device(p_dev);</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nsp_cs_config(struct pcmcia_device *link)</div><div class='add'>+{</div><div class='add'>+	int		  ret;</div><div class='add'>+	scsi_info_t	 *info	 = link-&gt;priv;</div><div class='add'>+	struct nsp_cs_configdata *cfg_mem;</div><div class='add'>+	struct Scsi_Host *host;</div><div class='add'>+	nsp_hw_data      *data = &amp;nsp_data_base;</div><div class='add'>+</div><div class='add'>+	nsp_dbg(NSP_DEBUG_INIT, "in");</div><div class='add'>+</div><div class='add'>+	cfg_mem = kzalloc(sizeof(cfg_mem), GFP_KERNEL);</div><div class='add'>+	if (!cfg_mem)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	cfg_mem-&gt;data = data;</div><div class='add'>+</div><div class='add'>+	ret = pcmcia_loop_config(link, nsp_cs_config_check, cfg_mem);</div><div class='add'>+		goto cs_failed;</div><div class='add'>+</div><div class='ctx'> 	if (link-&gt;conf.Attributes &amp; CONF_ENABLE_IRQ) {</div><div class='del'>-		CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &amp;link-&gt;irq));</div><div class='add'>+		if (pcmcia_request_irq(link, &amp;link-&gt;irq))</div><div class='add'>+			goto cs_failed;</div><div class='ctx'> 	}</div><div class='del'>-	CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &amp;link-&gt;conf));</div><div class='add'>+</div><div class='add'>+	ret = pcmcia_request_configuration(link, &amp;link-&gt;conf);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto cs_failed;</div><div class='ctx'> </div><div class='ctx'> 	if (free_ports) {</div><div class='ctx'> 		if (link-&gt;io.BasePort1) {</div><div class='hunk'>@@ -1790,20 +1786,20 @@ static int nsp_cs_config(struct pcmcia_device *link)</div><div class='ctx'> 		printk(" &amp; 0x%04x-0x%04x", link-&gt;io.BasePort2,</div><div class='ctx'> 		       link-&gt;io.BasePort2+link-&gt;io.NumPorts2-1);</div><div class='ctx'> 	if (link-&gt;win)</div><div class='del'>-		printk(", mem 0x%06lx-0x%06lx", req.Base,</div><div class='del'>-		       req.Base+req.Size-1);</div><div class='add'>+		printk(", mem 0x%06lx-0x%06lx", cfg_mem-&gt;req.Base,</div><div class='add'>+		       cfg_mem-&gt;req.Base+cfg_mem-&gt;req.Size-1);</div><div class='ctx'> 	printk("\n");</div><div class='ctx'> </div><div class='add'>+	kfree(cfg_mem);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'>  cs_failed:</div><div class='ctx'> 	nsp_dbg(NSP_DEBUG_INIT, "config fail");</div><div class='del'>-	cs_error(link, last_fn, last_ret);</div><div class='ctx'> 	nsp_cs_release(link);</div><div class='add'>+	kfree(cfg_mem);</div><div class='ctx'> </div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'> } /* nsp_cs_config */</div><div class='del'>-#undef CS_CHECK</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*======================================================================</div><div class='head'>diff --git a/drivers/scsi/pcmcia/qlogic_stub.c b/drivers/scsi/pcmcia/qlogic_stub.c<br/>index 67c5a58d17df..20c3e5e6d88a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/pcmcia/qlogic_stub.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/pcmcia/qlogic_stub.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/pcmcia/qlogic_stub.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/pcmcia/qlogic_stub.c</a></div><div class='hunk'>@@ -195,39 +195,33 @@ static void qlogic_detach(struct pcmcia_device *link)</div><div class='ctx'> #define CS_CHECK(fn, ret) \</div><div class='ctx'> do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)</div><div class='ctx'> </div><div class='add'>+static int qlogic_config_check(struct pcmcia_device *p_dev,</div><div class='add'>+			       cistpl_cftable_entry_t *cfg,</div><div class='add'>+			       cistpl_cftable_entry_t *dflt,</div><div class='add'>+			       unsigned int vcc,</div><div class='add'>+			       void *priv_data)</div><div class='add'>+{</div><div class='add'>+	p_dev-&gt;io.BasePort1 = cfg-&gt;io.win[0].base;</div><div class='add'>+	p_dev-&gt;io.NumPorts1 = cfg-&gt;io.win[0].len;</div><div class='add'>+</div><div class='add'>+	if (p_dev-&gt;io.BasePort1 == 0)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	return pcmcia_request_io(p_dev, &amp;p_dev-&gt;io);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int qlogic_config(struct pcmcia_device * link)</div><div class='ctx'> {</div><div class='ctx'> 	scsi_info_t *info = link-&gt;priv;</div><div class='del'>-	tuple_t tuple;</div><div class='del'>-	cisparse_t parse;</div><div class='del'>-	int i, last_ret, last_fn;</div><div class='del'>-	unsigned short tuple_data[32];</div><div class='add'>+	int last_ret, last_fn;</div><div class='ctx'> 	struct Scsi_Host *host;</div><div class='ctx'> </div><div class='ctx'> 	DEBUG(0, "qlogic_config(0x%p)\n", link);</div><div class='ctx'> </div><div class='del'>-	info-&gt;manf_id = link-&gt;manf_id;</div><div class='del'>-</div><div class='del'>-	tuple.TupleData = (cisdata_t *) tuple_data;</div><div class='del'>-	tuple.TupleDataMax = 64;</div><div class='del'>-	tuple.TupleOffset = 0;</div><div class='del'>-</div><div class='del'>-	tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;</div><div class='del'>-	CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &amp;tuple));</div><div class='del'>-	while (1) {</div><div class='del'>-		if (pcmcia_get_tuple_data(link, &amp;tuple) != 0 ||</div><div class='del'>-				pcmcia_parse_tuple(link, &amp;tuple, &amp;parse) != 0)</div><div class='del'>-			goto next_entry;</div><div class='del'>-		link-&gt;conf.ConfigIndex = parse.cftable_entry.index;</div><div class='del'>-		link-&gt;io.BasePort1 = parse.cftable_entry.io.win[0].base;</div><div class='del'>-		link-&gt;io.NumPorts1 = parse.cftable_entry.io.win[0].len;</div><div class='del'>-		if (link-&gt;io.BasePort1 != 0) {</div><div class='del'>-			i = pcmcia_request_io(link, &amp;link-&gt;io);</div><div class='del'>-			if (i == CS_SUCCESS)</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-	      next_entry:</div><div class='del'>-		CS_CHECK(GetNextTuple, pcmcia_get_next_tuple(link, &amp;tuple));</div><div class='add'>+	last_ret = pcmcia_loop_config(link, qlogic_config_check, NULL);</div><div class='add'>+	if (last_ret) {</div><div class='add'>+		cs_error(link, RequestIO, last_ret);</div><div class='add'>+		goto failed;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &amp;link-&gt;irq));</div><div class='hunk'>@@ -262,6 +256,7 @@ static int qlogic_config(struct pcmcia_device * link)</div><div class='ctx'> cs_failed:</div><div class='ctx'> 	cs_error(link, last_fn, last_ret);</div><div class='ctx'> 	pcmcia_disable_device(link);</div><div class='add'>+failed:</div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> }				/* qlogic_config */</div><div class='head'>diff --git a/drivers/scsi/pcmcia/sym53c500_cs.c b/drivers/scsi/pcmcia/sym53c500_cs.c<br/>index 0be232b58ffb..b330c11a1752 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/pcmcia/sym53c500_cs.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/pcmcia/sym53c500_cs.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/pcmcia/sym53c500_cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/pcmcia/sym53c500_cs.c</a></div><div class='hunk'>@@ -700,15 +700,27 @@ static struct scsi_host_template sym53c500_driver_template = {</div><div class='ctx'> #define CS_CHECK(fn, ret) \</div><div class='ctx'> do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)</div><div class='ctx'> </div><div class='add'>+static int SYM53C500_config_check(struct pcmcia_device *p_dev,</div><div class='add'>+				  cistpl_cftable_entry_t *cfg,</div><div class='add'>+				  cistpl_cftable_entry_t *dflt,</div><div class='add'>+				  unsigned int vcc,</div><div class='add'>+				  void *priv_data)</div><div class='add'>+{</div><div class='add'>+	p_dev-&gt;io.BasePort1 = cfg-&gt;io.win[0].base;</div><div class='add'>+	p_dev-&gt;io.NumPorts1 = cfg-&gt;io.win[0].len;</div><div class='add'>+</div><div class='add'>+	if (p_dev-&gt;io.BasePort1 == 0)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	return pcmcia_request_io(p_dev, &amp;p_dev-&gt;io);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int</div><div class='ctx'> SYM53C500_config(struct pcmcia_device *link)</div><div class='ctx'> {</div><div class='ctx'> 	struct scsi_info_t *info = link-&gt;priv;</div><div class='del'>-	tuple_t tuple;</div><div class='del'>-	cisparse_t parse;</div><div class='del'>-	int i, last_ret, last_fn;</div><div class='add'>+	int last_ret, last_fn;</div><div class='ctx'> 	int irq_level, port_base;</div><div class='del'>-	unsigned short tuple_data[32];</div><div class='ctx'> 	struct Scsi_Host *host;</div><div class='ctx'> 	struct scsi_host_template *tpnt = &amp;sym53c500_driver_template;</div><div class='ctx'> 	struct sym53c500_data *data;</div><div class='hunk'>@@ -717,27 +729,10 @@ SYM53C500_config(struct pcmcia_device *link)</div><div class='ctx'> </div><div class='ctx'> 	info-&gt;manf_id = link-&gt;manf_id;</div><div class='ctx'> </div><div class='del'>-	tuple.TupleData = (cisdata_t *)tuple_data;</div><div class='del'>-	tuple.TupleDataMax = 64;</div><div class='del'>-	tuple.TupleOffset = 0;</div><div class='del'>-</div><div class='del'>-	tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;</div><div class='del'>-	CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &amp;tuple));</div><div class='del'>-	while (1) {</div><div class='del'>-		if (pcmcia_get_tuple_data(link, &amp;tuple) != 0 ||</div><div class='del'>-		    pcmcia_parse_tuple(link, &amp;tuple, &amp;parse) != 0)</div><div class='del'>-			goto next_entry;</div><div class='del'>-		link-&gt;conf.ConfigIndex = parse.cftable_entry.index;</div><div class='del'>-		link-&gt;io.BasePort1 = parse.cftable_entry.io.win[0].base;</div><div class='del'>-		link-&gt;io.NumPorts1 = parse.cftable_entry.io.win[0].len;</div><div class='del'>-</div><div class='del'>-		if (link-&gt;io.BasePort1 != 0) {</div><div class='del'>-			i = pcmcia_request_io(link, &amp;link-&gt;io);</div><div class='del'>-			if (i == CS_SUCCESS)</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-next_entry:</div><div class='del'>-		CS_CHECK(GetNextTuple, pcmcia_get_next_tuple(link, &amp;tuple));</div><div class='add'>+	last_ret = pcmcia_loop_config(link, SYM53C500_config_check, NULL);</div><div class='add'>+	if (last_ret) {</div><div class='add'>+		cs_error(link, RequestIO, last_ret);</div><div class='add'>+		goto failed;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &amp;link-&gt;irq));</div><div class='hunk'>@@ -831,6 +826,7 @@ err_release:</div><div class='ctx'> </div><div class='ctx'> cs_failed:</div><div class='ctx'> 	cs_error(link, last_fn, last_ret);</div><div class='add'>+failed:</div><div class='ctx'> 	SYM53C500_release(link);</div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'> } /* SYM53C500_config */</div><div class='head'>diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c<br/>index 37f9ba0cd798..b6cd12b2e996 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/qla1280.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/qla1280.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/qla1280.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/qla1280.c</a></div><div class='hunk'>@@ -2845,7 +2845,7 @@ qla1280_64bit_start_scsi(struct scsi_qla_host *ha, struct srb * sp)</div><div class='ctx'> 	memset(((char *)pkt + 8), 0, (REQUEST_ENTRY_SIZE - 8));</div><div class='ctx'> </div><div class='ctx'> 	/* Set ISP command timeout. */</div><div class='del'>-	pkt-&gt;timeout = cpu_to_le16(cmd-&gt;timeout_per_command/HZ);</div><div class='add'>+	pkt-&gt;timeout = cpu_to_le16(cmd-&gt;request-&gt;timeout/HZ);</div><div class='ctx'> </div><div class='ctx'> 	/* Set device target ID and LUN */</div><div class='ctx'> 	pkt-&gt;lun = SCSI_LUN_32(cmd);</div><div class='hunk'>@@ -3114,7 +3114,7 @@ qla1280_32bit_start_scsi(struct scsi_qla_host *ha, struct srb * sp)</div><div class='ctx'> 	memset(((char *)pkt + 8), 0, (REQUEST_ENTRY_SIZE - 8));</div><div class='ctx'> </div><div class='ctx'> 	/* Set ISP command timeout. */</div><div class='del'>-	pkt-&gt;timeout = cpu_to_le16(cmd-&gt;timeout_per_command/HZ);</div><div class='add'>+	pkt-&gt;timeout = cpu_to_le16(cmd-&gt;request-&gt;timeout/HZ);</div><div class='ctx'> </div><div class='ctx'> 	/* Set device target ID and LUN */</div><div class='ctx'> 	pkt-&gt;lun = SCSI_LUN_32(cmd);</div><div class='head'>diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c<br/>index 45e7dcb4b34d..ed731968f15f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/qla2xxx/qla_attr.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/qla2xxx/qla_attr.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/qla2xxx/qla_attr.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/qla2xxx/qla_attr.c</a></div><div class='hunk'>@@ -292,10 +292,11 @@ qla2x00_sysfs_write_optrom_ctl(struct kobject *kobj,</div><div class='ctx'> 		valid = 0;</div><div class='ctx'> 		if (ha-&gt;optrom_size == OPTROM_SIZE_2300 &amp;&amp; start == 0)</div><div class='ctx'> 			valid = 1;</div><div class='del'>-		else if (start == (FA_BOOT_CODE_ADDR*4) ||</div><div class='del'>-		    start == (FA_RISC_CODE_ADDR*4))</div><div class='add'>+		else if (start == (ha-&gt;flt_region_boot * 4) ||</div><div class='add'>+		    start == (ha-&gt;flt_region_fw * 4))</div><div class='ctx'> 			valid = 1;</div><div class='del'>-		else if (IS_QLA25XX(ha) &amp;&amp; start == (FA_VPD_NVRAM_ADDR*4))</div><div class='add'>+		else if (IS_QLA25XX(ha) &amp;&amp;</div><div class='add'>+		    start == (ha-&gt;flt_region_vpd_nvram * 4))</div><div class='ctx'> 		    valid = 1;</div><div class='ctx'> 		if (!valid) {</div><div class='ctx'> 			qla_printk(KERN_WARNING, ha,</div><div class='hunk'>@@ -1005,7 +1006,6 @@ qla2x00_terminate_rport_io(struct fc_rport *rport)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	qla2x00_abort_fcport_cmds(fcport);</div><div class='del'>-	scsi_target_unblock(&amp;rport-&gt;dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -1065,6 +1065,8 @@ qla2x00_get_fc_host_stats(struct Scsi_Host *shost)</div><div class='ctx'> 		pfc_host_stat-&gt;dumped_frames = stats-&gt;dumped_frames;</div><div class='ctx'> 		pfc_host_stat-&gt;nos_count = stats-&gt;nos_rcvd;</div><div class='ctx'> 	}</div><div class='add'>+	pfc_host_stat-&gt;fcp_input_megabytes = ha-&gt;qla_stats.input_bytes &gt;&gt; 20;</div><div class='add'>+	pfc_host_stat-&gt;fcp_output_megabytes = ha-&gt;qla_stats.output_bytes &gt;&gt; 20;</div><div class='ctx'> </div><div class='ctx'> done_free:</div><div class='ctx'>         dma_pool_free(ha-&gt;s_dma_pool, stats, stats_dma);</div><div class='head'>diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h<br/>index 94a720eabfd8..83c819216771 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/qla2xxx/qla_def.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/qla2xxx/qla_def.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/qla2xxx/qla_def.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/qla2xxx/qla_def.h</a></div><div class='hunk'>@@ -25,7 +25,6 @@</div><div class='ctx'> #include &lt;linux/firmware.h&gt;</div><div class='ctx'> #include &lt;linux/aer.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='del'>-#include &lt;linux/semaphore.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;scsi/scsi.h&gt;</div><div class='ctx'> #include &lt;scsi/scsi_host.h&gt;</div><div class='hunk'>@@ -2157,6 +2156,8 @@ struct qla_chip_state_84xx {</div><div class='ctx'> </div><div class='ctx'> struct qla_statistics {</div><div class='ctx'> 	uint32_t total_isp_aborts;</div><div class='add'>+	uint64_t input_bytes;</div><div class='add'>+	uint64_t output_bytes;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -2238,6 +2239,7 @@ typedef struct scsi_qla_host {</div><div class='ctx'> #define FCPORT_UPDATE_NEEDED	27</div><div class='ctx'> #define VP_DPC_NEEDED		28	/* wake up for VP dpc handling */</div><div class='ctx'> #define UNLOADING		29</div><div class='add'>+#define NPIV_CONFIG_NEEDED	30</div><div class='ctx'> </div><div class='ctx'> 	uint32_t	device_flags;</div><div class='ctx'> #define DFLG_LOCAL_DEVICES		BIT_0</div><div class='hunk'>@@ -2507,7 +2509,6 @@ typedef struct scsi_qla_host {</div><div class='ctx'> 	uint64_t	fce_wr, fce_rd;</div><div class='ctx'> 	struct mutex	fce_mutex;</div><div class='ctx'> </div><div class='del'>-	uint32_t	hw_event_start;</div><div class='ctx'> 	uint32_t	hw_event_ptr;</div><div class='ctx'> 	uint32_t	hw_event_pause_errors;</div><div class='ctx'> </div><div class='hunk'>@@ -2553,6 +2554,14 @@ typedef struct scsi_qla_host {</div><div class='ctx'> 	uint32_t	fdt_unprotect_sec_cmd;</div><div class='ctx'> 	uint32_t	fdt_protect_sec_cmd;</div><div class='ctx'> </div><div class='add'>+	uint32_t	flt_region_flt;</div><div class='add'>+	uint32_t	flt_region_fdt;</div><div class='add'>+	uint32_t	flt_region_boot;</div><div class='add'>+	uint32_t	flt_region_fw;</div><div class='add'>+	uint32_t	flt_region_vpd_nvram;</div><div class='add'>+	uint32_t	flt_region_hw_event;</div><div class='add'>+	uint32_t	flt_region_npiv_conf;</div><div class='add'>+</div><div class='ctx'> 	/* Needed for BEACON */</div><div class='ctx'> 	uint16_t	beacon_blink_led;</div><div class='ctx'> 	uint8_t		beacon_color_state;</div><div class='head'>diff --git a/drivers/scsi/qla2xxx/qla_fw.h b/drivers/scsi/qla2xxx/qla_fw.h<br/>index cf194517400d..d1d14202575a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/qla2xxx/qla_fw.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/qla2xxx/qla_fw.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/qla2xxx/qla_fw.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/qla2xxx/qla_fw.h</a></div><div class='hunk'>@@ -789,14 +789,23 @@ struct device_reg_24xx {</div><div class='ctx'> #define FA_RISC_CODE_ADDR	0x20000</div><div class='ctx'> #define FA_RISC_CODE_SEGMENTS	2</div><div class='ctx'> </div><div class='add'>+#define FA_FLASH_DESCR_ADDR_24	0x11000</div><div class='add'>+#define FA_FLASH_LAYOUT_ADDR_24	0x11400</div><div class='add'>+#define FA_NPIV_CONF0_ADDR_24	0x16000</div><div class='add'>+#define FA_NPIV_CONF1_ADDR_24	0x17000</div><div class='add'>+</div><div class='ctx'> #define FA_FW_AREA_ADDR		0x40000</div><div class='ctx'> #define FA_VPD_NVRAM_ADDR	0x48000</div><div class='ctx'> #define FA_FEATURE_ADDR		0x4C000</div><div class='ctx'> #define FA_FLASH_DESCR_ADDR	0x50000</div><div class='add'>+#define FA_FLASH_LAYOUT_ADDR	0x50400</div><div class='ctx'> #define FA_HW_EVENT0_ADDR	0x54000</div><div class='del'>-#define FA_HW_EVENT1_ADDR	0x54200</div><div class='add'>+#define FA_HW_EVENT1_ADDR	0x54400</div><div class='ctx'> #define FA_HW_EVENT_SIZE	0x200</div><div class='ctx'> #define FA_HW_EVENT_ENTRY_SIZE	4</div><div class='add'>+#define FA_NPIV_CONF0_ADDR	0x5C000</div><div class='add'>+#define FA_NPIV_CONF1_ADDR	0x5D000</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Flash Error Log Event Codes.</div><div class='ctx'>  */</div><div class='hunk'>@@ -806,10 +815,6 @@ struct device_reg_24xx {</div><div class='ctx'> #define HW_EVENT_NVRAM_CHKSUM_ERR	0xF023</div><div class='ctx'> #define HW_EVENT_FLASH_FW_ERR	0xF024</div><div class='ctx'> </div><div class='del'>-#define FA_BOOT_LOG_ADDR	0x58000</div><div class='del'>-#define FA_FW_DUMP0_ADDR	0x60000</div><div class='del'>-#define FA_FW_DUMP1_ADDR	0x70000</div><div class='del'>-</div><div class='ctx'> 	uint32_t flash_data;		/* Flash/NVRAM BIOS data. */</div><div class='ctx'> </div><div class='ctx'> 	uint32_t ctrl_status;		/* Control/Status. */</div><div class='hunk'>@@ -1203,6 +1208,62 @@ struct qla_fdt_layout {</div><div class='ctx'> 	uint8_t unused2[65];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* Flash Layout Table ********************************************************/</div><div class='add'>+</div><div class='add'>+struct qla_flt_location {</div><div class='add'>+	uint8_t sig[4];</div><div class='add'>+	uint32_t start_lo;</div><div class='add'>+	uint32_t start_hi;</div><div class='add'>+	uint16_t unused;</div><div class='add'>+	uint16_t checksum;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct qla_flt_header {</div><div class='add'>+	uint16_t version;</div><div class='add'>+	uint16_t length;</div><div class='add'>+	uint16_t checksum;</div><div class='add'>+	uint16_t unused;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define FLT_REG_FW		0x01</div><div class='add'>+#define FLT_REG_BOOT_CODE	0x07</div><div class='add'>+#define FLT_REG_VPD_0		0x14</div><div class='add'>+#define FLT_REG_NVRAM_0		0x15</div><div class='add'>+#define FLT_REG_VPD_1		0x16</div><div class='add'>+#define FLT_REG_NVRAM_1		0x17</div><div class='add'>+#define FLT_REG_FDT		0x1a</div><div class='add'>+#define FLT_REG_FLT		0x1c</div><div class='add'>+#define FLT_REG_HW_EVENT_0	0x1d</div><div class='add'>+#define FLT_REG_HW_EVENT_1	0x1f</div><div class='add'>+#define FLT_REG_NPIV_CONF_0	0x29</div><div class='add'>+#define FLT_REG_NPIV_CONF_1	0x2a</div><div class='add'>+</div><div class='add'>+struct qla_flt_region {</div><div class='add'>+	uint32_t code;</div><div class='add'>+	uint32_t size;</div><div class='add'>+	uint32_t start;</div><div class='add'>+	uint32_t end;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Flash NPIV Configuration Table ********************************************/</div><div class='add'>+</div><div class='add'>+struct qla_npiv_header {</div><div class='add'>+	uint8_t sig[2];</div><div class='add'>+	uint16_t version;</div><div class='add'>+	uint16_t entries;</div><div class='add'>+	uint16_t unused[4];</div><div class='add'>+	uint16_t checksum;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct qla_npiv_entry {</div><div class='add'>+	uint16_t flags;</div><div class='add'>+	uint16_t vf_id;</div><div class='add'>+	uint16_t qos;</div><div class='add'>+	uint16_t unused1;</div><div class='add'>+	uint8_t port_name[WWN_SIZE];</div><div class='add'>+	uint8_t node_name[WWN_SIZE];</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* 84XX Support **************************************************************/</div><div class='ctx'> </div><div class='ctx'> #define MBA_ISP84XX_ALERT	0x800f  /* Alert Notification. */</div><div class='head'>diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h<br/>index 0b156735e9a6..753dbe6cce6e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/qla2xxx/qla_gbl.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/qla2xxx/qla_gbl.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/qla2xxx/qla_gbl.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/qla2xxx/qla_gbl.h</a></div><div class='hunk'>@@ -313,9 +313,11 @@ extern int qla24xx_get_flash_version(scsi_qla_host_t *, void *);</div><div class='ctx'> extern int qla2xxx_hw_event_log(scsi_qla_host_t *, uint16_t , uint16_t,</div><div class='ctx'>     uint16_t, uint16_t);</div><div class='ctx'> </div><div class='del'>-extern void qla2xxx_get_flash_info(scsi_qla_host_t *);</div><div class='add'>+extern int qla2xxx_get_flash_info(scsi_qla_host_t *);</div><div class='ctx'> extern int qla2xxx_get_vpd_field(scsi_qla_host_t *, char *, char *, size_t);</div><div class='ctx'> </div><div class='add'>+extern void qla2xxx_flash_npiv_conf(scsi_qla_host_t *);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Global Function Prototypes in qla_dbg.c source file.</div><div class='ctx'>  */</div><div class='head'>diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c<br/>index ee89ddd64aae..a470f2d3270d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/qla2xxx/qla_init.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/qla2xxx/qla_init.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/qla2xxx/qla_init.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/qla2xxx/qla_init.c</a></div><div class='hunk'>@@ -83,6 +83,13 @@ qla2x00_initialize_adapter(scsi_qla_host_t *ha)</div><div class='ctx'> </div><div class='ctx'> 	ha-&gt;isp_ops-&gt;reset_chip(ha);</div><div class='ctx'> </div><div class='add'>+	rval = qla2xxx_get_flash_info(ha);</div><div class='add'>+	if (rval) {</div><div class='add'>+		DEBUG2(printk("scsi(%ld): Unable to validate FLASH data.\n",</div><div class='add'>+		    ha-&gt;host_no));</div><div class='add'>+		return (rval);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ha-&gt;isp_ops-&gt;get_flash_version(ha, ha-&gt;request_ring);</div><div class='ctx'> </div><div class='ctx'> 	qla_printk(KERN_INFO, ha, "Configure NVRAM parameters...\n");</div><div class='hunk'>@@ -109,7 +116,6 @@ qla2x00_initialize_adapter(scsi_qla_host_t *ha)</div><div class='ctx'> 		rval = qla2x00_setup_chip(ha);</div><div class='ctx'> 		if (rval)</div><div class='ctx'> 			return (rval);</div><div class='del'>-		qla2xxx_get_flash_info(ha);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (IS_QLA84XX(ha)) {</div><div class='ctx'> 		ha-&gt;cs84xx = qla84xx_get_chip(ha);</div><div class='hunk'>@@ -2016,7 +2022,7 @@ qla2x00_configure_loop(scsi_qla_host_t *ha)</div><div class='ctx'> 		DEBUG3(printk("%s: exiting normally\n", __func__));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Restore state if a resync event occured during processing */</div><div class='add'>+	/* Restore state if a resync event occurred during processing */</div><div class='ctx'> 	if (test_bit(LOOP_RESYNC_NEEDED, &amp;ha-&gt;dpc_flags)) {</div><div class='ctx'> 		if (test_bit(LOCAL_LOOP_UPDATE, &amp;save_flags))</div><div class='ctx'> 			set_bit(LOCAL_LOOP_UPDATE, &amp;ha-&gt;dpc_flags);</div><div class='hunk'>@@ -2561,7 +2567,7 @@ qla2x00_find_all_fabric_devs(scsi_qla_host_t *ha, struct list_head *new_fcports)</div><div class='ctx'> 	rval = QLA_SUCCESS;</div><div class='ctx'> </div><div class='ctx'> 	/* Try GID_PT to get device list, else GAN. */</div><div class='del'>-	swl = kcalloc(MAX_FIBRE_DEVICES, sizeof(sw_info_t), GFP_ATOMIC);</div><div class='add'>+	swl = kcalloc(MAX_FIBRE_DEVICES, sizeof(sw_info_t), GFP_KERNEL);</div><div class='ctx'> 	if (!swl) {</div><div class='ctx'> 		/*EMPTY*/</div><div class='ctx'> 		DEBUG2(printk("scsi(%ld): GID_PT allocations failed, fallback "</div><div class='hunk'>@@ -3751,7 +3757,7 @@ qla24xx_load_risc_flash(scsi_qla_host_t *ha, uint32_t *srisc_addr)</div><div class='ctx'> 	rval = QLA_SUCCESS;</div><div class='ctx'> </div><div class='ctx'> 	segments = FA_RISC_CODE_SEGMENTS;</div><div class='del'>-	faddr = FA_RISC_CODE_ADDR;</div><div class='add'>+	faddr = ha-&gt;flt_region_fw;</div><div class='ctx'> 	dcode = (uint32_t *)ha-&gt;request_ring;</div><div class='ctx'> 	*srisc_addr = 0;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/qla2xxx/qla_inline.h b/drivers/scsi/qla2xxx/qla_inline.h<br/>index 92fafbdbbaab..e90afad120ee 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/qla2xxx/qla_inline.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/qla2xxx/qla_inline.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/qla2xxx/qla_inline.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/qla2xxx/qla_inline.h</a></div><div class='hunk'>@@ -52,7 +52,7 @@ to_qla_parent(scsi_qla_host_t *ha)</div><div class='ctx'>  * @ha: HA context</div><div class='ctx'>  * @ha_locked: is function called with the hardware lock</div><div class='ctx'>  *</div><div class='del'>- * Returns non-zero if a failure occured, else zero.</div><div class='add'>+ * Returns non-zero if a failure occurred, else zero.</div><div class='ctx'>  */</div><div class='ctx'> static inline int</div><div class='ctx'> qla2x00_issue_marker(scsi_qla_host_t *ha, int ha_locked)</div><div class='head'>diff --git a/drivers/scsi/qla2xxx/qla_iocb.c b/drivers/scsi/qla2xxx/qla_iocb.c<br/>index d57669aa4615..85bc0a48598b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/qla2xxx/qla_iocb.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/qla2xxx/qla_iocb.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/qla2xxx/qla_iocb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/qla2xxx/qla_iocb.c</a></div><div class='hunk'>@@ -21,17 +21,22 @@ static void qla2x00_isp_cmd(scsi_qla_host_t *ha);</div><div class='ctx'>  * Returns the proper CF_* direction based on CDB.</div><div class='ctx'>  */</div><div class='ctx'> static inline uint16_t</div><div class='del'>-qla2x00_get_cmd_direction(struct scsi_cmnd *cmd)</div><div class='add'>+qla2x00_get_cmd_direction(srb_t *sp)</div><div class='ctx'> {</div><div class='ctx'> 	uint16_t cflags;</div><div class='ctx'> </div><div class='ctx'> 	cflags = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Set transfer direction */</div><div class='del'>-	if (cmd-&gt;sc_data_direction == DMA_TO_DEVICE)</div><div class='add'>+	if (sp-&gt;cmd-&gt;sc_data_direction == DMA_TO_DEVICE) {</div><div class='ctx'> 		cflags = CF_WRITE;</div><div class='del'>-	else if (cmd-&gt;sc_data_direction == DMA_FROM_DEVICE)</div><div class='add'>+		sp-&gt;fcport-&gt;ha-&gt;qla_stats.output_bytes +=</div><div class='add'>+		    scsi_bufflen(sp-&gt;cmd);</div><div class='add'>+	} else if (sp-&gt;cmd-&gt;sc_data_direction == DMA_FROM_DEVICE) {</div><div class='ctx'> 		cflags = CF_READ;</div><div class='add'>+		sp-&gt;fcport-&gt;ha-&gt;qla_stats.input_bytes +=</div><div class='add'>+		    scsi_bufflen(sp-&gt;cmd);</div><div class='add'>+	}</div><div class='ctx'> 	return (cflags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -169,7 +174,7 @@ void qla2x00_build_scsi_iocbs_32(srb_t *sp, cmd_entry_t *cmd_pkt,</div><div class='ctx'> </div><div class='ctx'> 	ha = sp-&gt;ha;</div><div class='ctx'> </div><div class='del'>-	cmd_pkt-&gt;control_flags |= cpu_to_le16(qla2x00_get_cmd_direction(cmd));</div><div class='add'>+	cmd_pkt-&gt;control_flags |= cpu_to_le16(qla2x00_get_cmd_direction(sp));</div><div class='ctx'> </div><div class='ctx'> 	/* Three DSDs are available in the Command Type 2 IOCB */</div><div class='ctx'> 	avail_dsds = 3;</div><div class='hunk'>@@ -228,7 +233,7 @@ void qla2x00_build_scsi_iocbs_64(srb_t *sp, cmd_entry_t *cmd_pkt,</div><div class='ctx'> </div><div class='ctx'> 	ha = sp-&gt;ha;</div><div class='ctx'> </div><div class='del'>-	cmd_pkt-&gt;control_flags |= cpu_to_le16(qla2x00_get_cmd_direction(cmd));</div><div class='add'>+	cmd_pkt-&gt;control_flags |= cpu_to_le16(qla2x00_get_cmd_direction(sp));</div><div class='ctx'> </div><div class='ctx'> 	/* Two DSDs are available in the Command Type 3 IOCB */</div><div class='ctx'> 	avail_dsds = 2;</div><div class='hunk'>@@ -262,7 +267,7 @@ void qla2x00_build_scsi_iocbs_64(srb_t *sp, cmd_entry_t *cmd_pkt,</div><div class='ctx'>  * qla2x00_start_scsi() - Send a SCSI command to the ISP</div><div class='ctx'>  * @sp: command to send to the ISP</div><div class='ctx'>  *</div><div class='del'>- * Returns non-zero if a failure occured, else zero.</div><div class='add'>+ * Returns non-zero if a failure occurred, else zero.</div><div class='ctx'>  */</div><div class='ctx'> int</div><div class='ctx'> qla2x00_start_scsi(srb_t *sp)</div><div class='hunk'>@@ -407,7 +412,7 @@ queuing_error:</div><div class='ctx'>  *</div><div class='ctx'>  * Can be called from both normal and interrupt context.</div><div class='ctx'>  *</div><div class='del'>- * Returns non-zero if a failure occured, else zero.</div><div class='add'>+ * Returns non-zero if a failure occurred, else zero.</div><div class='ctx'>  */</div><div class='ctx'> int</div><div class='ctx'> __qla2x00_marker(scsi_qla_host_t *ha, uint16_t loop_id, uint16_t lun,</div><div class='hunk'>@@ -625,12 +630,17 @@ qla24xx_build_scsi_iocbs(srb_t *sp, struct cmd_type_7 *cmd_pkt,</div><div class='ctx'> 	ha = sp-&gt;ha;</div><div class='ctx'> </div><div class='ctx'> 	/* Set transfer direction */</div><div class='del'>-	if (cmd-&gt;sc_data_direction == DMA_TO_DEVICE)</div><div class='add'>+	if (cmd-&gt;sc_data_direction == DMA_TO_DEVICE) {</div><div class='ctx'> 		cmd_pkt-&gt;task_mgmt_flags =</div><div class='ctx'> 		    __constant_cpu_to_le16(TMF_WRITE_DATA);</div><div class='del'>-	else if (cmd-&gt;sc_data_direction == DMA_FROM_DEVICE)</div><div class='add'>+		sp-&gt;fcport-&gt;ha-&gt;qla_stats.output_bytes +=</div><div class='add'>+		    scsi_bufflen(sp-&gt;cmd);</div><div class='add'>+	} else if (cmd-&gt;sc_data_direction == DMA_FROM_DEVICE) {</div><div class='ctx'> 		cmd_pkt-&gt;task_mgmt_flags =</div><div class='ctx'> 		    __constant_cpu_to_le16(TMF_READ_DATA);</div><div class='add'>+		sp-&gt;fcport-&gt;ha-&gt;qla_stats.input_bytes +=</div><div class='add'>+		    scsi_bufflen(sp-&gt;cmd);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* One DSD is available in the Command Type 3 IOCB */</div><div class='ctx'> 	avail_dsds = 1;</div><div class='hunk'>@@ -666,7 +676,7 @@ qla24xx_build_scsi_iocbs(srb_t *sp, struct cmd_type_7 *cmd_pkt,</div><div class='ctx'>  * qla24xx_start_scsi() - Send a SCSI command to the ISP</div><div class='ctx'>  * @sp: command to send to the ISP</div><div class='ctx'>  *</div><div class='del'>- * Returns non-zero if a failure occured, else zero.</div><div class='add'>+ * Returns non-zero if a failure occurred, else zero.</div><div class='ctx'>  */</div><div class='ctx'> int</div><div class='ctx'> qla24xx_start_scsi(srb_t *sp)</div><div class='head'>diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c<br/>index bf41887cdd65..a76efd99d007 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/qla2xxx/qla_isr.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/qla2xxx/qla_isr.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/qla2xxx/qla_isr.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/qla2xxx/qla_isr.c</a></div><div class='hunk'>@@ -391,9 +391,9 @@ qla2x00_async_event(scsi_qla_host_t *ha, uint16_t *mb)</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case MBA_LIP_OCCURRED:		/* Loop Initialization Procedure */</div><div class='del'>-		DEBUG2(printk("scsi(%ld): LIP occured (%x).\n", ha-&gt;host_no,</div><div class='add'>+		DEBUG2(printk("scsi(%ld): LIP occurred (%x).\n", ha-&gt;host_no,</div><div class='ctx'> 		    mb[1]));</div><div class='del'>-		qla_printk(KERN_INFO, ha, "LIP occured (%x).\n", mb[1]);</div><div class='add'>+		qla_printk(KERN_INFO, ha, "LIP occurred (%x).\n", mb[1]);</div><div class='ctx'> </div><div class='ctx'> 		if (atomic_read(&amp;ha-&gt;loop_state) != LOOP_DOWN) {</div><div class='ctx'> 			atomic_set(&amp;ha-&gt;loop_state, LOOP_DOWN);</div><div class='hunk'>@@ -460,7 +460,7 @@ qla2x00_async_event(scsi_qla_host_t *ha, uint16_t *mb)</div><div class='ctx'> 		DEBUG2(printk("scsi(%ld): Asynchronous LIP RESET (%x).\n",</div><div class='ctx'> 		    ha-&gt;host_no, mb[1]));</div><div class='ctx'> 		qla_printk(KERN_INFO, ha,</div><div class='del'>-		    "LIP reset occured (%x).\n", mb[1]);</div><div class='add'>+		    "LIP reset occurred (%x).\n", mb[1]);</div><div class='ctx'> </div><div class='ctx'> 		if (atomic_read(&amp;ha-&gt;loop_state) != LOOP_DOWN) {</div><div class='ctx'> 			atomic_set(&amp;ha-&gt;loop_state, LOOP_DOWN);</div><div class='hunk'>@@ -543,7 +543,7 @@ qla2x00_async_event(scsi_qla_host_t *ha, uint16_t *mb)</div><div class='ctx'> </div><div class='ctx'> 	case MBA_PORT_UPDATE:		/* Port database update */</div><div class='ctx'> 		/*</div><div class='del'>-		 * If PORT UPDATE is global (recieved LIP_OCCURED/LIP_RESET</div><div class='add'>+		 * If PORT UPDATE is global (received LIP_OCCURRED/LIP_RESET</div><div class='ctx'> 		 * event etc. earlier indicating loop is down) then process</div><div class='ctx'> 		 * it.  Otherwise ignore it and Wait for RSCN to come in.</div><div class='ctx'> 		 */</div><div class='hunk'>@@ -589,7 +589,7 @@ qla2x00_async_event(scsi_qla_host_t *ha, uint16_t *mb)</div><div class='ctx'> 		    "scsi(%ld): RSCN database changed -- %04x %04x %04x.\n",</div><div class='ctx'> 		    ha-&gt;host_no, mb[1], mb[2], mb[3]));</div><div class='ctx'> </div><div class='del'>-		rscn_entry = (mb[1] &lt;&lt; 16) | mb[2];</div><div class='add'>+		rscn_entry = ((mb[1] &amp; 0xff) &lt;&lt; 16) | mb[2];</div><div class='ctx'> 		host_pid = (ha-&gt;d_id.b.domain &lt;&lt; 16) | (ha-&gt;d_id.b.area &lt;&lt; 8) |</div><div class='ctx'> 		    ha-&gt;d_id.b.al_pa;</div><div class='ctx'> 		if (rscn_entry == host_pid) {</div><div class='hunk'>@@ -600,6 +600,8 @@ qla2x00_async_event(scsi_qla_host_t *ha, uint16_t *mb)</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		/* Ignore reserved bits from RSCN-payload. */</div><div class='add'>+		rscn_entry = ((mb[1] &amp; 0x3ff) &lt;&lt; 16) | mb[2];</div><div class='ctx'> 		rscn_queue_index = ha-&gt;rscn_in_ptr + 1;</div><div class='ctx'> 		if (rscn_queue_index == MAX_RSCN_COUNT)</div><div class='ctx'> 			rscn_queue_index = 0;</div><div class='hunk'>@@ -1060,8 +1062,9 @@ qla2x00_status_entry(scsi_qla_host_t *ha, void *pkt)</div><div class='ctx'> 		resid = resid_len;</div><div class='ctx'> 		/* Use F/W calculated residual length. */</div><div class='ctx'> 		if (IS_FWI2_CAPABLE(ha)) {</div><div class='del'>-			if (scsi_status &amp; SS_RESIDUAL_UNDER &amp;&amp;</div><div class='del'>-			    resid != fw_resid_len) {</div><div class='add'>+			if (!(scsi_status &amp; SS_RESIDUAL_UNDER)) {</div><div class='add'>+				lscsi_status = 0;</div><div class='add'>+			} else if (resid != fw_resid_len) {</div><div class='ctx'> 				scsi_status &amp;= ~SS_RESIDUAL_UNDER;</div><div class='ctx'> 				lscsi_status = 0;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -1184,7 +1187,12 @@ qla2x00_status_entry(scsi_qla_host_t *ha, void *pkt)</div><div class='ctx'> 		    cp-&gt;serial_number, comp_status,</div><div class='ctx'> 		    atomic_read(&amp;fcport-&gt;state)));</div><div class='ctx'> </div><div class='del'>-		cp-&gt;result = DID_BUS_BUSY &lt;&lt; 16;</div><div class='add'>+		/*</div><div class='add'>+		 * We are going to have the fc class block the rport</div><div class='add'>+		 * while we try to recover so instruct the mid layer</div><div class='add'>+		 * to requeue until the class decides how to handle this.</div><div class='add'>+		 */</div><div class='add'>+		cp-&gt;result = DID_TRANSPORT_DISRUPTED &lt;&lt; 16;</div><div class='ctx'> 		if (atomic_read(&amp;fcport-&gt;state) == FCS_ONLINE)</div><div class='ctx'> 			qla2x00_mark_device_lost(fcport-&gt;ha, fcport, 1, 1);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1211,7 +1219,12 @@ qla2x00_status_entry(scsi_qla_host_t *ha, void *pkt)</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case CS_TIMEOUT:</div><div class='del'>-		cp-&gt;result = DID_BUS_BUSY &lt;&lt; 16;</div><div class='add'>+		/*</div><div class='add'>+		 * We are going to have the fc class block the rport</div><div class='add'>+		 * while we try to recover so instruct the mid layer</div><div class='add'>+		 * to requeue until the class decides how to handle this.</div><div class='add'>+		 */</div><div class='add'>+		cp-&gt;result = DID_TRANSPORT_DISRUPTED &lt;&lt; 16;</div><div class='ctx'> </div><div class='ctx'> 		if (IS_FWI2_CAPABLE(ha)) {</div><div class='ctx'> 			DEBUG2(printk(KERN_INFO</div><div class='head'>diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c<br/>index 813bc7784c0a..36bc6851e23d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/qla2xxx/qla_mbx.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/qla2xxx/qla_mbx.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/qla2xxx/qla_mbx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/qla2xxx/qla_mbx.c</a></div><div class='hunk'>@@ -233,7 +233,7 @@ qla2x00_mailbox_command(scsi_qla_host_t *pvha, mbx_cmd_t *mcp)</div><div class='ctx'> 			DEBUG2_3_11(printk("%s(%ld): timeout schedule "</div><div class='ctx'> 			    "isp_abort_needed.\n", __func__, ha-&gt;host_no));</div><div class='ctx'> 			qla_printk(KERN_WARNING, ha,</div><div class='del'>-			    "Mailbox command timeout occured. Scheduling ISP "</div><div class='add'>+			    "Mailbox command timeout occurred. Scheduling ISP "</div><div class='ctx'> 			    "abort.\n");</div><div class='ctx'> 			set_bit(ISP_ABORT_NEEDED, &amp;ha-&gt;dpc_flags);</div><div class='ctx'> 			qla2xxx_wake_dpc(ha);</div><div class='hunk'>@@ -244,7 +244,7 @@ qla2x00_mailbox_command(scsi_qla_host_t *pvha, mbx_cmd_t *mcp)</div><div class='ctx'> 			DEBUG2_3_11(printk("%s(%ld): timeout calling "</div><div class='ctx'> 			    "abort_isp\n", __func__, ha-&gt;host_no));</div><div class='ctx'> 			qla_printk(KERN_WARNING, ha,</div><div class='del'>-			    "Mailbox command timeout occured. Issuing ISP "</div><div class='add'>+			    "Mailbox command timeout occurred. Issuing ISP "</div><div class='ctx'> 			    "abort.\n");</div><div class='ctx'> </div><div class='ctx'> 			set_bit(ABORT_ISP_ACTIVE, &amp;ha-&gt;dpc_flags);</div><div class='hunk'>@@ -1995,7 +1995,7 @@ qla2x00_get_fcal_position_map(scsi_qla_host_t *ha, char *pos_map)</div><div class='ctx'> 	char *pmap;</div><div class='ctx'> 	dma_addr_t pmap_dma;</div><div class='ctx'> </div><div class='del'>-	pmap = dma_pool_alloc(ha-&gt;s_dma_pool, GFP_ATOMIC, &amp;pmap_dma);</div><div class='add'>+	pmap = dma_pool_alloc(ha-&gt;s_dma_pool, GFP_KERNEL, &amp;pmap_dma);</div><div class='ctx'> 	if (pmap  == NULL) {</div><div class='ctx'> 		DEBUG2_3_11(printk("%s(%ld): **** Mem Alloc Failed ****",</div><div class='ctx'> 		    __func__, ha-&gt;host_no));</div><div class='head'>diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c<br/>index 6d0f0e5f2827..2aed4721c0d0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/qla2xxx/qla_os.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/qla2xxx/qla_os.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/qla2xxx/qla_os.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/qla2xxx/qla_os.c</a></div><div class='hunk'>@@ -394,10 +394,8 @@ qla2x00_queuecommand(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *))</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Close window on fcport/rport state-transitioning. */</div><div class='del'>-	if (fcport-&gt;drport) {</div><div class='del'>-		cmd-&gt;result = DID_IMM_RETRY &lt;&lt; 16;</div><div class='del'>-		goto qc_fail_command;</div><div class='del'>-	}</div><div class='add'>+	if (fcport-&gt;drport)</div><div class='add'>+		goto qc_target_busy;</div><div class='ctx'> </div><div class='ctx'> 	if (atomic_read(&amp;fcport-&gt;state) != FCS_ONLINE) {</div><div class='ctx'> 		if (atomic_read(&amp;fcport-&gt;state) == FCS_DEVICE_DEAD ||</div><div class='hunk'>@@ -405,7 +403,7 @@ qla2x00_queuecommand(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *))</div><div class='ctx'> 			cmd-&gt;result = DID_NO_CONNECT &lt;&lt; 16;</div><div class='ctx'> 			goto qc_fail_command;</div><div class='ctx'> 		}</div><div class='del'>-		goto qc_host_busy;</div><div class='add'>+		goto qc_target_busy;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irq(ha-&gt;host-&gt;host_lock);</div><div class='hunk'>@@ -428,10 +426,11 @@ qc_host_busy_free_sp:</div><div class='ctx'> </div><div class='ctx'> qc_host_busy_lock:</div><div class='ctx'> 	spin_lock_irq(ha-&gt;host-&gt;host_lock);</div><div class='del'>-</div><div class='del'>-qc_host_busy:</div><div class='ctx'> 	return SCSI_MLQUEUE_HOST_BUSY;</div><div class='ctx'> </div><div class='add'>+qc_target_busy:</div><div class='add'>+	return SCSI_MLQUEUE_TARGET_BUSY;</div><div class='add'>+</div><div class='ctx'> qc_fail_command:</div><div class='ctx'> 	done(cmd);</div><div class='ctx'> </div><div class='hunk'>@@ -461,10 +460,8 @@ qla24xx_queuecommand(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *))</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Close window on fcport/rport state-transitioning. */</div><div class='del'>-	if (fcport-&gt;drport) {</div><div class='del'>-		cmd-&gt;result = DID_IMM_RETRY &lt;&lt; 16;</div><div class='del'>-		goto qc24_fail_command;</div><div class='del'>-	}</div><div class='add'>+	if (fcport-&gt;drport)</div><div class='add'>+		goto qc24_target_busy;</div><div class='ctx'> </div><div class='ctx'> 	if (atomic_read(&amp;fcport-&gt;state) != FCS_ONLINE) {</div><div class='ctx'> 		if (atomic_read(&amp;fcport-&gt;state) == FCS_DEVICE_DEAD ||</div><div class='hunk'>@@ -472,7 +469,7 @@ qla24xx_queuecommand(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *))</div><div class='ctx'> 			cmd-&gt;result = DID_NO_CONNECT &lt;&lt; 16;</div><div class='ctx'> 			goto qc24_fail_command;</div><div class='ctx'> 		}</div><div class='del'>-		goto qc24_host_busy;</div><div class='add'>+		goto qc24_target_busy;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irq(ha-&gt;host-&gt;host_lock);</div><div class='hunk'>@@ -495,10 +492,11 @@ qc24_host_busy_free_sp:</div><div class='ctx'> </div><div class='ctx'> qc24_host_busy_lock:</div><div class='ctx'> 	spin_lock_irq(ha-&gt;host-&gt;host_lock);</div><div class='del'>-</div><div class='del'>-qc24_host_busy:</div><div class='ctx'> 	return SCSI_MLQUEUE_HOST_BUSY;</div><div class='ctx'> </div><div class='add'>+qc24_target_busy:</div><div class='add'>+	return SCSI_MLQUEUE_TARGET_BUSY;</div><div class='add'>+</div><div class='ctx'> qc24_fail_command:</div><div class='ctx'> 	done(cmd);</div><div class='ctx'> </div><div class='hunk'>@@ -1517,6 +1515,7 @@ qla2xxx_scan_start(struct Scsi_Host *shost)</div><div class='ctx'> 	set_bit(LOOP_RESYNC_NEEDED, &amp;ha-&gt;dpc_flags);</div><div class='ctx'> 	set_bit(LOCAL_LOOP_UPDATE, &amp;ha-&gt;dpc_flags);</div><div class='ctx'> 	set_bit(RSCN_UPDATE, &amp;ha-&gt;dpc_flags);</div><div class='add'>+	set_bit(NPIV_CONFIG_NEEDED, &amp;ha-&gt;dpc_flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -1663,8 +1662,6 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='ctx'> 		ha-&gt;gid_list_info_size = 8;</div><div class='ctx'> 		ha-&gt;optrom_size = OPTROM_SIZE_25XX;</div><div class='ctx'> 		ha-&gt;isp_ops = &amp;qla25xx_isp_ops;</div><div class='del'>-		ha-&gt;hw_event_start = PCI_FUNC(pdev-&gt;devfn) ?</div><div class='del'>-		    FA_HW_EVENT1_ADDR: FA_HW_EVENT0_ADDR;</div><div class='ctx'> 	}</div><div class='ctx'> 	host-&gt;can_queue = ha-&gt;request_q_length + 128;</div><div class='ctx'> </div><div class='hunk'>@@ -2433,6 +2430,12 @@ qla2x00_do_dpc(void *data)</div><div class='ctx'> 			    ha-&gt;host_no));</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		if (test_bit(NPIV_CONFIG_NEEDED, &amp;ha-&gt;dpc_flags) &amp;&amp;</div><div class='add'>+		    atomic_read(&amp;ha-&gt;loop_state) == LOOP_READY) {</div><div class='add'>+			clear_bit(NPIV_CONFIG_NEEDED, &amp;ha-&gt;dpc_flags);</div><div class='add'>+			qla2xxx_flash_npiv_conf(ha);</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		if (!ha-&gt;interrupts_on)</div><div class='ctx'> 			ha-&gt;isp_ops-&gt;enable_intrs(ha);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/qla2xxx/qla_sup.c b/drivers/scsi/qla2xxx/qla_sup.c<br/>index 1bca74474935..90a13211717f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/qla2xxx/qla_sup.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/qla2xxx/qla_sup.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/qla2xxx/qla_sup.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/qla2xxx/qla_sup.c</a></div><div class='hunk'>@@ -543,23 +543,198 @@ qla24xx_get_flash_manufacturer(scsi_qla_host_t *ha, uint8_t *man_id,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void</div><div class='del'>-qla2xxx_get_flash_info(scsi_qla_host_t *ha)</div><div class='add'>+static int</div><div class='add'>+qla2xxx_find_flt_start(scsi_qla_host_t *ha, uint32_t *start)</div><div class='add'>+{</div><div class='add'>+	const char *loc, *locations[] = { "DEF", "PCI" };</div><div class='add'>+	uint32_t pcihdr, pcids;</div><div class='add'>+	uint32_t *dcode;</div><div class='add'>+	uint8_t *buf, *bcode, last_image;</div><div class='add'>+	uint16_t cnt, chksum, *wptr;</div><div class='add'>+	struct qla_flt_location *fltl;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * FLT-location structure resides after the last PCI region.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* Begin with sane defaults. */</div><div class='add'>+	loc = locations[0];</div><div class='add'>+	*start = IS_QLA24XX_TYPE(ha) ? FA_FLASH_LAYOUT_ADDR_24:</div><div class='add'>+	    FA_FLASH_LAYOUT_ADDR;</div><div class='add'>+</div><div class='add'>+	/* Begin with first PCI expansion ROM header. */</div><div class='add'>+	buf = (uint8_t *)ha-&gt;request_ring;</div><div class='add'>+	dcode = (uint32_t *)ha-&gt;request_ring;</div><div class='add'>+	pcihdr = 0;</div><div class='add'>+	last_image = 1;</div><div class='add'>+	do {</div><div class='add'>+		/* Verify PCI expansion ROM header. */</div><div class='add'>+		qla24xx_read_flash_data(ha, dcode, pcihdr &gt;&gt; 2, 0x20);</div><div class='add'>+		bcode = buf + (pcihdr % 4);</div><div class='add'>+		if (bcode[0x0] != 0x55 || bcode[0x1] != 0xaa)</div><div class='add'>+			goto end;</div><div class='add'>+</div><div class='add'>+		/* Locate PCI data structure. */</div><div class='add'>+		pcids = pcihdr + ((bcode[0x19] &lt;&lt; 8) | bcode[0x18]);</div><div class='add'>+		qla24xx_read_flash_data(ha, dcode, pcids &gt;&gt; 2, 0x20);</div><div class='add'>+		bcode = buf + (pcihdr % 4);</div><div class='add'>+</div><div class='add'>+		/* Validate signature of PCI data structure. */</div><div class='add'>+		if (bcode[0x0] != 'P' || bcode[0x1] != 'C' ||</div><div class='add'>+		    bcode[0x2] != 'I' || bcode[0x3] != 'R')</div><div class='add'>+			goto end;</div><div class='add'>+</div><div class='add'>+		last_image = bcode[0x15] &amp; BIT_7;</div><div class='add'>+</div><div class='add'>+		/* Locate next PCI expansion ROM. */</div><div class='add'>+		pcihdr += ((bcode[0x11] &lt;&lt; 8) | bcode[0x10]) * 512;</div><div class='add'>+	} while (!last_image);</div><div class='add'>+</div><div class='add'>+	/* Now verify FLT-location structure. */</div><div class='add'>+	fltl = (struct qla_flt_location *)ha-&gt;request_ring;</div><div class='add'>+	qla24xx_read_flash_data(ha, dcode, pcihdr &gt;&gt; 2,</div><div class='add'>+	    sizeof(struct qla_flt_location) &gt;&gt; 2);</div><div class='add'>+	if (fltl-&gt;sig[0] != 'Q' || fltl-&gt;sig[1] != 'F' ||</div><div class='add'>+	    fltl-&gt;sig[2] != 'L' || fltl-&gt;sig[3] != 'T')</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	wptr = (uint16_t *)ha-&gt;request_ring;</div><div class='add'>+	cnt = sizeof(struct qla_flt_location) &gt;&gt; 1;</div><div class='add'>+	for (chksum = 0; cnt; cnt--)</div><div class='add'>+		chksum += le16_to_cpu(*wptr++);</div><div class='add'>+	if (chksum) {</div><div class='add'>+		qla_printk(KERN_ERR, ha,</div><div class='add'>+		    "Inconsistent FLTL detected: checksum=0x%x.\n", chksum);</div><div class='add'>+		qla2x00_dump_buffer(buf, sizeof(struct qla_flt_location));</div><div class='add'>+		return QLA_FUNCTION_FAILED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Good data.  Use specified location. */</div><div class='add'>+	loc = locations[1];</div><div class='add'>+	*start = le16_to_cpu(fltl-&gt;start_hi) &lt;&lt; 16 |</div><div class='add'>+	    le16_to_cpu(fltl-&gt;start_lo);</div><div class='add'>+end:</div><div class='add'>+	DEBUG2(qla_printk(KERN_DEBUG, ha, "FLTL[%s] = 0x%x.\n", loc, *start));</div><div class='add'>+	return QLA_SUCCESS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+qla2xxx_get_flt_info(scsi_qla_host_t *ha, uint32_t flt_addr)</div><div class='add'>+{</div><div class='add'>+	const char *loc, *locations[] = { "DEF", "FLT" };</div><div class='add'>+	uint16_t *wptr;</div><div class='add'>+	uint16_t cnt, chksum;</div><div class='add'>+	uint32_t start;</div><div class='add'>+	struct qla_flt_header *flt;</div><div class='add'>+	struct qla_flt_region *region;</div><div class='add'>+</div><div class='add'>+	ha-&gt;flt_region_flt = flt_addr;</div><div class='add'>+	wptr = (uint16_t *)ha-&gt;request_ring;</div><div class='add'>+	flt = (struct qla_flt_header *)ha-&gt;request_ring;</div><div class='add'>+	region = (struct qla_flt_region *)&amp;flt[1];</div><div class='add'>+	ha-&gt;isp_ops-&gt;read_optrom(ha, (uint8_t *)ha-&gt;request_ring,</div><div class='add'>+	    flt_addr &lt;&lt; 2, OPTROM_BURST_SIZE);</div><div class='add'>+	if (*wptr == __constant_cpu_to_le16(0xffff))</div><div class='add'>+		goto no_flash_data;</div><div class='add'>+	if (flt-&gt;version != __constant_cpu_to_le16(1)) {</div><div class='add'>+		DEBUG2(qla_printk(KERN_INFO, ha, "Unsupported FLT detected: "</div><div class='add'>+		    "version=0x%x length=0x%x checksum=0x%x.\n",</div><div class='add'>+		    le16_to_cpu(flt-&gt;version), le16_to_cpu(flt-&gt;length),</div><div class='add'>+		    le16_to_cpu(flt-&gt;checksum)));</div><div class='add'>+		goto no_flash_data;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cnt = (sizeof(struct qla_flt_header) + le16_to_cpu(flt-&gt;length)) &gt;&gt; 1;</div><div class='add'>+	for (chksum = 0; cnt; cnt--)</div><div class='add'>+		chksum += le16_to_cpu(*wptr++);</div><div class='add'>+	if (chksum) {</div><div class='add'>+		DEBUG2(qla_printk(KERN_INFO, ha, "Inconsistent FLT detected: "</div><div class='add'>+		    "version=0x%x length=0x%x checksum=0x%x.\n",</div><div class='add'>+		    le16_to_cpu(flt-&gt;version), le16_to_cpu(flt-&gt;length),</div><div class='add'>+		    chksum));</div><div class='add'>+		goto no_flash_data;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	loc = locations[1];</div><div class='add'>+	cnt = le16_to_cpu(flt-&gt;length) / sizeof(struct qla_flt_region);</div><div class='add'>+	for ( ; cnt; cnt--, region++) {</div><div class='add'>+		/* Store addresses as DWORD offsets. */</div><div class='add'>+		start = le32_to_cpu(region-&gt;start) &gt;&gt; 2;</div><div class='add'>+</div><div class='add'>+		DEBUG3(qla_printk(KERN_DEBUG, ha, "FLT[%02x]: start=0x%x "</div><div class='add'>+		    "end=0x%x size=0x%x.\n", le32_to_cpu(region-&gt;code), start,</div><div class='add'>+		    le32_to_cpu(region-&gt;end) &gt;&gt; 2, le32_to_cpu(region-&gt;size)));</div><div class='add'>+</div><div class='add'>+		switch (le32_to_cpu(region-&gt;code)) {</div><div class='add'>+		case FLT_REG_FW:</div><div class='add'>+			ha-&gt;flt_region_fw = start;</div><div class='add'>+			break;</div><div class='add'>+		case FLT_REG_BOOT_CODE:</div><div class='add'>+			ha-&gt;flt_region_boot = start;</div><div class='add'>+			break;</div><div class='add'>+		case FLT_REG_VPD_0:</div><div class='add'>+			ha-&gt;flt_region_vpd_nvram = start;</div><div class='add'>+			break;</div><div class='add'>+		case FLT_REG_FDT:</div><div class='add'>+			ha-&gt;flt_region_fdt = start;</div><div class='add'>+			break;</div><div class='add'>+		case FLT_REG_HW_EVENT_0:</div><div class='add'>+			if (!PCI_FUNC(ha-&gt;pdev-&gt;devfn))</div><div class='add'>+				ha-&gt;flt_region_hw_event = start;</div><div class='add'>+			break;</div><div class='add'>+		case FLT_REG_HW_EVENT_1:</div><div class='add'>+			if (PCI_FUNC(ha-&gt;pdev-&gt;devfn))</div><div class='add'>+				ha-&gt;flt_region_hw_event = start;</div><div class='add'>+			break;</div><div class='add'>+		case FLT_REG_NPIV_CONF_0:</div><div class='add'>+			if (!PCI_FUNC(ha-&gt;pdev-&gt;devfn))</div><div class='add'>+				ha-&gt;flt_region_npiv_conf = start;</div><div class='add'>+			break;</div><div class='add'>+		case FLT_REG_NPIV_CONF_1:</div><div class='add'>+			if (PCI_FUNC(ha-&gt;pdev-&gt;devfn))</div><div class='add'>+				ha-&gt;flt_region_npiv_conf = start;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	goto done;</div><div class='add'>+</div><div class='add'>+no_flash_data:</div><div class='add'>+	/* Use hardcoded defaults. */</div><div class='add'>+	loc = locations[0];</div><div class='add'>+	ha-&gt;flt_region_fw = FA_RISC_CODE_ADDR;</div><div class='add'>+	ha-&gt;flt_region_boot = FA_BOOT_CODE_ADDR;</div><div class='add'>+	ha-&gt;flt_region_vpd_nvram = FA_VPD_NVRAM_ADDR;</div><div class='add'>+	ha-&gt;flt_region_fdt = IS_QLA24XX_TYPE(ha) ? FA_FLASH_DESCR_ADDR_24:</div><div class='add'>+	    FA_FLASH_DESCR_ADDR;</div><div class='add'>+	ha-&gt;flt_region_hw_event = !PCI_FUNC(ha-&gt;pdev-&gt;devfn) ?</div><div class='add'>+	    FA_HW_EVENT0_ADDR: FA_HW_EVENT1_ADDR;</div><div class='add'>+	ha-&gt;flt_region_npiv_conf = !PCI_FUNC(ha-&gt;pdev-&gt;devfn) ?</div><div class='add'>+	    (IS_QLA24XX_TYPE(ha) ? FA_NPIV_CONF0_ADDR_24: FA_NPIV_CONF0_ADDR):</div><div class='add'>+	    (IS_QLA24XX_TYPE(ha) ? FA_NPIV_CONF1_ADDR_24: FA_NPIV_CONF1_ADDR);</div><div class='add'>+done:</div><div class='add'>+	DEBUG2(qla_printk(KERN_DEBUG, ha, "FLT[%s]: boot=0x%x fw=0x%x "</div><div class='add'>+	    "vpd_nvram=0x%x fdt=0x%x flt=0x%x hwe=0x%x npiv=0x%x.\n", loc,</div><div class='add'>+	    ha-&gt;flt_region_boot, ha-&gt;flt_region_fw, ha-&gt;flt_region_vpd_nvram,</div><div class='add'>+	    ha-&gt;flt_region_fdt, ha-&gt;flt_region_flt, ha-&gt;flt_region_hw_event,</div><div class='add'>+	    ha-&gt;flt_region_npiv_conf));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+qla2xxx_get_fdt_info(scsi_qla_host_t *ha)</div><div class='ctx'> {</div><div class='ctx'> #define FLASH_BLK_SIZE_32K	0x8000</div><div class='ctx'> #define FLASH_BLK_SIZE_64K	0x10000</div><div class='add'>+	const char *loc, *locations[] = { "MID", "FDT" };</div><div class='ctx'> 	uint16_t cnt, chksum;</div><div class='ctx'> 	uint16_t *wptr;</div><div class='ctx'> 	struct qla_fdt_layout *fdt;</div><div class='ctx'> 	uint8_t	man_id, flash_id;</div><div class='del'>-</div><div class='del'>-	if (!IS_QLA24XX_TYPE(ha) &amp;&amp; !IS_QLA25XX(ha))</div><div class='del'>-		return;</div><div class='add'>+	uint16_t mid, fid;</div><div class='ctx'> </div><div class='ctx'> 	wptr = (uint16_t *)ha-&gt;request_ring;</div><div class='ctx'> 	fdt = (struct qla_fdt_layout *)ha-&gt;request_ring;</div><div class='ctx'> 	ha-&gt;isp_ops-&gt;read_optrom(ha, (uint8_t *)ha-&gt;request_ring,</div><div class='del'>-	    FA_FLASH_DESCR_ADDR &lt;&lt; 2, OPTROM_BURST_SIZE);</div><div class='add'>+	    ha-&gt;flt_region_fdt &lt;&lt; 2, OPTROM_BURST_SIZE);</div><div class='ctx'> 	if (*wptr == __constant_cpu_to_le16(0xffff))</div><div class='ctx'> 		goto no_flash_data;</div><div class='ctx'> 	if (fdt-&gt;sig[0] != 'Q' || fdt-&gt;sig[1] != 'L' || fdt-&gt;sig[2] != 'I' ||</div><div class='hunk'>@@ -577,7 +752,10 @@ qla2xxx_get_flash_info(scsi_qla_host_t *ha)</div><div class='ctx'> 		goto no_flash_data;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ha-&gt;fdt_odd_index = le16_to_cpu(fdt-&gt;man_id) == 0x1f;</div><div class='add'>+	loc = locations[1];</div><div class='add'>+	mid = le16_to_cpu(fdt-&gt;man_id);</div><div class='add'>+	fid = le16_to_cpu(fdt-&gt;id);</div><div class='add'>+	ha-&gt;fdt_odd_index = mid == 0x1f;</div><div class='ctx'> 	ha-&gt;fdt_wrt_disable = fdt-&gt;wrt_disable_bits;</div><div class='ctx'> 	ha-&gt;fdt_erase_cmd = flash_conf_to_access_addr(0x0300 | fdt-&gt;erase_cmd);</div><div class='ctx'> 	ha-&gt;fdt_block_size = le32_to_cpu(fdt-&gt;block_size);</div><div class='hunk'>@@ -588,16 +766,12 @@ qla2xxx_get_flash_info(scsi_qla_host_t *ha)</div><div class='ctx'> 		    flash_conf_to_access_addr(0x0300 | fdt-&gt;protect_sec_cmd):</div><div class='ctx'> 		    flash_conf_to_access_addr(0x0336);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	DEBUG2(qla_printk(KERN_DEBUG, ha, "Flash[FDT]: (0x%x/0x%x) erase=0x%x "</div><div class='del'>-	    "pro=%x upro=%x idx=%d wrtd=0x%x blk=0x%x.\n",</div><div class='del'>-	    le16_to_cpu(fdt-&gt;man_id), le16_to_cpu(fdt-&gt;id), ha-&gt;fdt_erase_cmd,</div><div class='del'>-	    ha-&gt;fdt_protect_sec_cmd, ha-&gt;fdt_unprotect_sec_cmd,</div><div class='del'>-	    ha-&gt;fdt_odd_index, ha-&gt;fdt_wrt_disable, ha-&gt;fdt_block_size));</div><div class='del'>-	return;</div><div class='del'>-</div><div class='add'>+	goto done;</div><div class='ctx'> no_flash_data:</div><div class='add'>+	loc = locations[0];</div><div class='ctx'> 	qla24xx_get_flash_manufacturer(ha, &amp;man_id, &amp;flash_id);</div><div class='add'>+	mid = man_id;</div><div class='add'>+	fid = flash_id;</div><div class='ctx'> 	ha-&gt;fdt_wrt_disable = 0x9c;</div><div class='ctx'> 	ha-&gt;fdt_erase_cmd = flash_conf_to_access_addr(0x03d8);</div><div class='ctx'> 	switch (man_id) {</div><div class='hunk'>@@ -625,14 +799,117 @@ no_flash_data:</div><div class='ctx'> 		ha-&gt;fdt_block_size = FLASH_BLK_SIZE_64K;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	DEBUG2(qla_printk(KERN_DEBUG, ha, "Flash[MID]: (0x%x/0x%x) erase=0x%x "</div><div class='del'>-	    "pro=%x upro=%x idx=%d wrtd=0x%x blk=0x%x.\n", man_id, flash_id,</div><div class='add'>+done:</div><div class='add'>+	DEBUG2(qla_printk(KERN_DEBUG, ha, "FDT[%s]: (0x%x/0x%x) erase=0x%x "</div><div class='add'>+	    "pro=%x upro=%x idx=%d wrtd=0x%x blk=0x%x.\n", loc, mid, fid,</div><div class='ctx'> 	    ha-&gt;fdt_erase_cmd, ha-&gt;fdt_protect_sec_cmd,</div><div class='ctx'> 	    ha-&gt;fdt_unprotect_sec_cmd, ha-&gt;fdt_odd_index, ha-&gt;fdt_wrt_disable,</div><div class='ctx'> 	    ha-&gt;fdt_block_size));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int</div><div class='add'>+qla2xxx_get_flash_info(scsi_qla_host_t *ha)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	uint32_t flt_addr;</div><div class='add'>+</div><div class='add'>+	if (!IS_QLA24XX_TYPE(ha) &amp;&amp; !IS_QLA25XX(ha))</div><div class='add'>+		return QLA_SUCCESS;</div><div class='add'>+</div><div class='add'>+	ret = qla2xxx_find_flt_start(ha, &amp;flt_addr);</div><div class='add'>+	if (ret != QLA_SUCCESS)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	qla2xxx_get_flt_info(ha, flt_addr);</div><div class='add'>+	qla2xxx_get_fdt_info(ha);</div><div class='add'>+</div><div class='add'>+	return QLA_SUCCESS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+qla2xxx_flash_npiv_conf(scsi_qla_host_t *ha)</div><div class='add'>+{</div><div class='add'>+#define NPIV_CONFIG_SIZE	(16*1024)</div><div class='add'>+	void *data;</div><div class='add'>+	uint16_t *wptr;</div><div class='add'>+	uint16_t cnt, chksum;</div><div class='add'>+	struct qla_npiv_header hdr;</div><div class='add'>+	struct qla_npiv_entry *entry;</div><div class='add'>+</div><div class='add'>+	if (!IS_QLA24XX_TYPE(ha) &amp;&amp; !IS_QLA25XX(ha))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ha-&gt;isp_ops-&gt;read_optrom(ha, (uint8_t *)&amp;hdr,</div><div class='add'>+	    ha-&gt;flt_region_npiv_conf &lt;&lt; 2, sizeof(struct qla_npiv_header));</div><div class='add'>+	if (hdr.version == __constant_cpu_to_le16(0xffff))</div><div class='add'>+		return;</div><div class='add'>+	if (hdr.version != __constant_cpu_to_le16(1)) {</div><div class='add'>+		DEBUG2(qla_printk(KERN_INFO, ha, "Unsupported NPIV-Config "</div><div class='add'>+		    "detected: version=0x%x entries=0x%x checksum=0x%x.\n",</div><div class='add'>+		    le16_to_cpu(hdr.version), le16_to_cpu(hdr.entries),</div><div class='add'>+		    le16_to_cpu(hdr.checksum)));</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	data = kmalloc(NPIV_CONFIG_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!data) {</div><div class='add'>+		DEBUG2(qla_printk(KERN_INFO, ha, "NPIV-Config: Unable to "</div><div class='add'>+		    "allocate memory.\n"));</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ha-&gt;isp_ops-&gt;read_optrom(ha, (uint8_t *)data,</div><div class='add'>+	    ha-&gt;flt_region_npiv_conf &lt;&lt; 2, NPIV_CONFIG_SIZE);</div><div class='add'>+</div><div class='add'>+	cnt = (sizeof(struct qla_npiv_header) + le16_to_cpu(hdr.entries) *</div><div class='add'>+	    sizeof(struct qla_npiv_entry)) &gt;&gt; 1;</div><div class='add'>+	for (wptr = data, chksum = 0; cnt; cnt--)</div><div class='add'>+		chksum += le16_to_cpu(*wptr++);</div><div class='add'>+	if (chksum) {</div><div class='add'>+		DEBUG2(qla_printk(KERN_INFO, ha, "Inconsistent NPIV-Config "</div><div class='add'>+		    "detected: version=0x%x entries=0x%x checksum=0x%x.\n",</div><div class='add'>+		    le16_to_cpu(hdr.version), le16_to_cpu(hdr.entries),</div><div class='add'>+		    chksum));</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	entry = data + sizeof(struct qla_npiv_header);</div><div class='add'>+	cnt = le16_to_cpu(hdr.entries);</div><div class='add'>+	for ( ; cnt; cnt--, entry++) {</div><div class='add'>+		uint16_t flags;</div><div class='add'>+		struct fc_vport_identifiers vid;</div><div class='add'>+		struct fc_vport *vport;</div><div class='add'>+</div><div class='add'>+		flags = le16_to_cpu(entry-&gt;flags);</div><div class='add'>+		if (flags == 0xffff)</div><div class='add'>+			continue;</div><div class='add'>+		if ((flags &amp; BIT_0) == 0)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		memset(&amp;vid, 0, sizeof(vid));</div><div class='add'>+		vid.roles = FC_PORT_ROLE_FCP_INITIATOR;</div><div class='add'>+		vid.vport_type = FC_PORTTYPE_NPIV;</div><div class='add'>+		vid.disable = false;</div><div class='add'>+		vid.port_name = wwn_to_u64(entry-&gt;port_name);</div><div class='add'>+		vid.node_name = wwn_to_u64(entry-&gt;node_name);</div><div class='add'>+</div><div class='add'>+		DEBUG2(qla_printk(KERN_DEBUG, ha, "NPIV[%02x]: wwpn=%llx "</div><div class='add'>+		    "wwnn=%llx vf_id=0x%x qos=0x%x.\n", cnt,</div><div class='add'>+		    (unsigned long long)vid.port_name,</div><div class='add'>+		    (unsigned long long)vid.node_name,</div><div class='add'>+		    le16_to_cpu(entry-&gt;vf_id), le16_to_cpu(entry-&gt;qos)));</div><div class='add'>+</div><div class='add'>+		vport = fc_vport_create(ha-&gt;host, 0, &amp;vid);</div><div class='add'>+		if (!vport)</div><div class='add'>+			qla_printk(KERN_INFO, ha, "NPIV-Config: Failed to "</div><div class='add'>+			    "create vport [%02x]: wwpn=%llx wwnn=%llx.\n", cnt,</div><div class='add'>+			    (unsigned long long)vid.port_name,</div><div class='add'>+			    (unsigned long long)vid.node_name);</div><div class='add'>+	}</div><div class='add'>+done:</div><div class='add'>+	kfree(data);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void</div><div class='ctx'> qla24xx_unprotect_flash(scsi_qla_host_t *ha)</div><div class='ctx'> {</div><div class='hunk'>@@ -920,7 +1197,8 @@ qla25xx_read_nvram_data(scsi_qla_host_t *ha, uint8_t *buf, uint32_t naddr,</div><div class='ctx'> 	dwptr = (uint32_t *)buf;</div><div class='ctx'> 	for (i = 0; i &lt; bytes &gt;&gt; 2; i++, naddr++)</div><div class='ctx'> 		dwptr[i] = cpu_to_le32(qla24xx_read_flash_dword(ha,</div><div class='del'>-		    flash_data_to_access_addr(FA_VPD_NVRAM_ADDR | naddr)));</div><div class='add'>+		    flash_data_to_access_addr(ha-&gt;flt_region_vpd_nvram |</div><div class='add'>+		    naddr)));</div><div class='ctx'> </div><div class='ctx'> 	return buf;</div><div class='ctx'> }</div><div class='hunk'>@@ -935,10 +1213,10 @@ qla25xx_write_nvram_data(scsi_qla_host_t *ha, uint8_t *buf, uint32_t naddr,</div><div class='ctx'> 	dbuf = vmalloc(RMW_BUFFER_SIZE);</div><div class='ctx'> 	if (!dbuf)</div><div class='ctx'> 		return QLA_MEMORY_ALLOC_FAILED;</div><div class='del'>-	ha-&gt;isp_ops-&gt;read_optrom(ha, dbuf, FA_VPD_NVRAM_ADDR &lt;&lt; 2,</div><div class='add'>+	ha-&gt;isp_ops-&gt;read_optrom(ha, dbuf, ha-&gt;flt_region_vpd_nvram &lt;&lt; 2,</div><div class='ctx'> 	    RMW_BUFFER_SIZE);</div><div class='ctx'> 	memcpy(dbuf + (naddr &lt;&lt; 2), buf, bytes);</div><div class='del'>-	ha-&gt;isp_ops-&gt;write_optrom(ha, dbuf, FA_VPD_NVRAM_ADDR &lt;&lt; 2,</div><div class='add'>+	ha-&gt;isp_ops-&gt;write_optrom(ha, dbuf, ha-&gt;flt_region_vpd_nvram &lt;&lt; 2,</div><div class='ctx'> 	    RMW_BUFFER_SIZE);</div><div class='ctx'> 	vfree(dbuf);</div><div class='ctx'> </div><div class='hunk'>@@ -2166,7 +2444,7 @@ qla2x00_get_flash_version(scsi_qla_host_t *ha, void *mbuf)</div><div class='ctx'> 		memset(dbyte, 0, 8);</div><div class='ctx'> 		dcode = (uint16_t *)dbyte;</div><div class='ctx'> </div><div class='del'>-		qla2x00_read_flash_data(ha, dbyte, FA_RISC_CODE_ADDR * 4 + 10,</div><div class='add'>+		qla2x00_read_flash_data(ha, dbyte, ha-&gt;flt_region_fw * 4 + 10,</div><div class='ctx'> 		    8);</div><div class='ctx'> 		DEBUG3(printk("%s(%ld): dumping fw ver from flash:\n",</div><div class='ctx'> 		    __func__, ha-&gt;host_no));</div><div class='hunk'>@@ -2177,7 +2455,7 @@ qla2x00_get_flash_version(scsi_qla_host_t *ha, void *mbuf)</div><div class='ctx'> 		    (dcode[0] == 0 &amp;&amp; dcode[1] == 0 &amp;&amp; dcode[2] == 0 &amp;&amp;</div><div class='ctx'> 		    dcode[3] == 0)) {</div><div class='ctx'> 			DEBUG2(printk("%s(): Unrecognized fw revision at "</div><div class='del'>-			    "%x.\n", __func__, FA_RISC_CODE_ADDR * 4));</div><div class='add'>+			    "%x.\n", __func__, ha-&gt;flt_region_fw * 4));</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* values are in big endian */</div><div class='ctx'> 			ha-&gt;fw_revision[0] = dbyte[0] &lt;&lt; 16 | dbyte[1];</div><div class='hunk'>@@ -2212,7 +2490,7 @@ qla24xx_get_flash_version(scsi_qla_host_t *ha, void *mbuf)</div><div class='ctx'> 	dcode = mbuf;</div><div class='ctx'> </div><div class='ctx'> 	/* Begin with first PCI expansion ROM header. */</div><div class='del'>-	pcihdr = 0;</div><div class='add'>+	pcihdr = ha-&gt;flt_region_boot;</div><div class='ctx'> 	last_image = 1;</div><div class='ctx'> 	do {</div><div class='ctx'> 		/* Verify PCI expansion ROM header. */</div><div class='hunk'>@@ -2282,7 +2560,7 @@ qla24xx_get_flash_version(scsi_qla_host_t *ha, void *mbuf)</div><div class='ctx'> 	memset(ha-&gt;fw_revision, 0, sizeof(ha-&gt;fw_revision));</div><div class='ctx'> 	dcode = mbuf;</div><div class='ctx'> </div><div class='del'>-	qla24xx_read_flash_data(ha, dcode, FA_RISC_CODE_ADDR + 4, 4);</div><div class='add'>+	qla24xx_read_flash_data(ha, dcode, ha-&gt;flt_region_fw + 4, 4);</div><div class='ctx'> 	for (i = 0; i &lt; 4; i++)</div><div class='ctx'> 		dcode[i] = be32_to_cpu(dcode[i]);</div><div class='ctx'> </div><div class='hunk'>@@ -2291,7 +2569,7 @@ qla24xx_get_flash_version(scsi_qla_host_t *ha, void *mbuf)</div><div class='ctx'> 	    (dcode[0] == 0 &amp;&amp; dcode[1] == 0 &amp;&amp; dcode[2] == 0 &amp;&amp;</div><div class='ctx'> 	    dcode[3] == 0)) {</div><div class='ctx'> 		DEBUG2(printk("%s(): Unrecognized fw version at %x.\n",</div><div class='del'>-		    __func__, FA_RISC_CODE_ADDR));</div><div class='add'>+		    __func__, ha-&gt;flt_region_fw));</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ha-&gt;fw_revision[0] = dcode[0];</div><div class='ctx'> 		ha-&gt;fw_revision[1] = dcode[1];</div><div class='hunk'>@@ -2355,7 +2633,7 @@ qla2xxx_hw_event_store(scsi_qla_host_t *ha, uint32_t *fdata)</div><div class='ctx'> 	/* Locate first empty entry. */</div><div class='ctx'> 	for (;;) {</div><div class='ctx'> 		if (ha-&gt;hw_event_ptr &gt;=</div><div class='del'>-		    ha-&gt;hw_event_start + FA_HW_EVENT_SIZE) {</div><div class='add'>+		    ha-&gt;flt_region_hw_event + FA_HW_EVENT_SIZE) {</div><div class='ctx'> 			DEBUG2(qla_printk(KERN_WARNING, ha,</div><div class='ctx'> 			    "HW event -- Log Full!\n"));</div><div class='ctx'> 			return QLA_MEMORY_ALLOC_FAILED;</div><div class='hunk'>@@ -2391,7 +2669,7 @@ qla2xxx_hw_event_log(scsi_qla_host_t *ha, uint16_t code, uint16_t d1,</div><div class='ctx'> 	int rval;</div><div class='ctx'> 	uint32_t marker[2], fdata[4];</div><div class='ctx'> </div><div class='del'>-	if (ha-&gt;hw_event_start == 0)</div><div class='add'>+	if (ha-&gt;flt_region_hw_event == 0)</div><div class='ctx'> 		return QLA_FUNCTION_FAILED;</div><div class='ctx'> </div><div class='ctx'> 	DEBUG2(qla_printk(KERN_WARNING, ha,</div><div class='hunk'>@@ -2406,7 +2684,7 @@ qla2xxx_hw_event_log(scsi_qla_host_t *ha, uint16_t code, uint16_t d1,</div><div class='ctx'> 		    QLA_DRIVER_PATCH_VER, QLA_DRIVER_BETA_VER);</div><div class='ctx'> </div><div class='ctx'> 		/* Locate marker. */</div><div class='del'>-		ha-&gt;hw_event_ptr = ha-&gt;hw_event_start;</div><div class='add'>+		ha-&gt;hw_event_ptr = ha-&gt;flt_region_hw_event;</div><div class='ctx'> 		for (;;) {</div><div class='ctx'> 			qla24xx_read_flash_data(ha, fdata, ha-&gt;hw_event_ptr,</div><div class='ctx'> 			    4);</div><div class='hunk'>@@ -2415,7 +2693,7 @@ qla2xxx_hw_event_log(scsi_qla_host_t *ha, uint16_t code, uint16_t d1,</div><div class='ctx'> 				break;</div><div class='ctx'> 			ha-&gt;hw_event_ptr += FA_HW_EVENT_ENTRY_SIZE;</div><div class='ctx'> 			if (ha-&gt;hw_event_ptr &gt;=</div><div class='del'>-			    ha-&gt;hw_event_start + FA_HW_EVENT_SIZE) {</div><div class='add'>+			    ha-&gt;flt_region_hw_event + FA_HW_EVENT_SIZE) {</div><div class='ctx'> 				DEBUG2(qla_printk(KERN_WARNING, ha,</div><div class='ctx'> 				    "HW event -- Log Full!\n"));</div><div class='ctx'> 				return QLA_MEMORY_ALLOC_FAILED;</div><div class='head'>diff --git a/drivers/scsi/qla2xxx/qla_version.h b/drivers/scsi/qla2xxx/qla_version.h<br/>index 4160e4caa7b9..be5e299df528 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/qla2xxx/qla_version.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/qla2xxx/qla_version.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/qla2xxx/qla_version.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/qla2xxx/qla_version.h</a></div><div class='hunk'>@@ -7,7 +7,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Driver version</div><div class='ctx'>  */</div><div class='del'>-#define QLA2XXX_VERSION      "8.02.01-k7"</div><div class='add'>+#define QLA2XXX_VERSION      "8.02.01-k8"</div><div class='ctx'> </div><div class='ctx'> #define QLA_DRIVER_MAJOR_VER	8</div><div class='ctx'> #define QLA_DRIVER_MINOR_VER	2</div><div class='head'>diff --git a/drivers/scsi/qla4xxx/ql4_isr.c b/drivers/scsi/qla4xxx/ql4_isr.c<br/>index a91a57c57bff..799120fcb9be 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/qla4xxx/ql4_isr.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/qla4xxx/ql4_isr.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/qla4xxx/ql4_isr.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/qla4xxx/ql4_isr.c</a></div><div class='hunk'>@@ -139,7 +139,7 @@ static void qla4xxx_status_entry(struct scsi_qla_host *ha,</div><div class='ctx'> 			      ha-&gt;host_no, cmd-&gt;device-&gt;channel,</div><div class='ctx'> 			      cmd-&gt;device-&gt;id, cmd-&gt;device-&gt;lun));</div><div class='ctx'> </div><div class='del'>-		cmd-&gt;result = DID_BUS_BUSY &lt;&lt; 16;</div><div class='add'>+		cmd-&gt;result = DID_TRANSPORT_DISRUPTED &lt;&lt; 16;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Mark device missing so that we won't continue to send</div><div class='hunk'>@@ -243,7 +243,7 @@ static void qla4xxx_status_entry(struct scsi_qla_host *ha,</div><div class='ctx'> 		if (atomic_read(&amp;ddb_entry-&gt;state) == DDB_STATE_ONLINE)</div><div class='ctx'> 			qla4xxx_mark_device_missing(ha, ddb_entry);</div><div class='ctx'> </div><div class='del'>-		cmd-&gt;result = DID_BUS_BUSY &lt;&lt; 16;</div><div class='add'>+		cmd-&gt;result = DID_TRANSPORT_DISRUPTED &lt;&lt; 16;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case SCS_QUEUE_FULL:</div><div class='head'>diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c<br/>index 88bebb13bc52..db7ea3bb4e83 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/qla4xxx/ql4_os.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/qla4xxx/ql4_os.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/qla4xxx/ql4_os.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/qla4xxx/ql4_os.c</a></div><div class='hunk'>@@ -353,7 +353,7 @@ void qla4xxx_mark_device_missing(struct scsi_qla_host *ha,</div><div class='ctx'> 		      ha-&gt;host_no, ddb_entry-&gt;bus, ddb_entry-&gt;target,</div><div class='ctx'> 		      ddb_entry-&gt;fw_ddb_index));</div><div class='ctx'> 	iscsi_block_session(ddb_entry-&gt;sess);</div><div class='del'>-	iscsi_conn_error(ddb_entry-&gt;conn, ISCSI_ERR_CONN_FAILED);</div><div class='add'>+	iscsi_conn_error_event(ddb_entry-&gt;conn, ISCSI_ERR_CONN_FAILED);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct srb* qla4xxx_get_new_srb(struct scsi_qla_host *ha,</div><div class='hunk'>@@ -439,7 +439,7 @@ static int qla4xxx_queuecommand(struct scsi_cmnd *cmd,</div><div class='ctx'> 			cmd-&gt;result = DID_NO_CONNECT &lt;&lt; 16;</div><div class='ctx'> 			goto qc_fail_command;</div><div class='ctx'> 		}</div><div class='del'>-		goto qc_host_busy;</div><div class='add'>+		return SCSI_MLQUEUE_TARGET_BUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (test_bit(DPC_RESET_HA_INTR, &amp;ha-&gt;dpc_flags))</div><div class='hunk'>@@ -1542,7 +1542,7 @@ static int qla4xxx_eh_device_reset(struct scsi_cmnd *cmd)</div><div class='ctx'> 	DEBUG2(printk(KERN_INFO</div><div class='ctx'> 		      "scsi%ld: DEVICE_RESET cmd=%p jiffies = 0x%lx, to=%x,"</div><div class='ctx'> 		      "dpc_flags=%lx, status=%x allowed=%d\n", ha-&gt;host_no,</div><div class='del'>-		      cmd, jiffies, cmd-&gt;timeout_per_command / HZ,</div><div class='add'>+		      cmd, jiffies, cmd-&gt;request-&gt;timeout / HZ,</div><div class='ctx'> 		      ha-&gt;dpc_flags, cmd-&gt;result, cmd-&gt;allowed));</div><div class='ctx'> </div><div class='ctx'> 	/* FIXME: wait for hba to go online */</div><div class='hunk'>@@ -1598,7 +1598,7 @@ static int qla4xxx_eh_target_reset(struct scsi_cmnd *cmd)</div><div class='ctx'> 	DEBUG2(printk(KERN_INFO</div><div class='ctx'> 		      "scsi%ld: TARGET_DEVICE_RESET cmd=%p jiffies = 0x%lx, "</div><div class='ctx'> 		      "to=%x,dpc_flags=%lx, status=%x allowed=%d\n",</div><div class='del'>-		      ha-&gt;host_no, cmd, jiffies, cmd-&gt;timeout_per_command / HZ,</div><div class='add'>+		      ha-&gt;host_no, cmd, jiffies, cmd-&gt;request-&gt;timeout / HZ,</div><div class='ctx'> 		      ha-&gt;dpc_flags, cmd-&gt;result, cmd-&gt;allowed));</div><div class='ctx'> </div><div class='ctx'> 	stat = qla4xxx_reset_target(ha, ddb_entry);</div><div class='head'>diff --git a/drivers/scsi/qlogicpti.c b/drivers/scsi/qlogicpti.c<br/>index 905350896725..69d6ad862b60 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/qlogicpti.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/qlogicpti.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/qlogicpti.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/qlogicpti.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /* qlogicpti.c: Performance Technologies QlogicISP sbus card driver.</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 1996, 2006 David S. Miller (davem@davemloft.net)</div><div class='add'>+ * Copyright (C) 1996, 2006, 2008 David S. Miller (davem@davemloft.net)</div><div class='ctx'>  *</div><div class='ctx'>  * A lot of this driver was directly stolen from Erik H. Moe's PCI</div><div class='ctx'>  * Qlogic ISP driver.  Mucho kudos to him for this code.</div><div class='hunk'>@@ -25,12 +25,14 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/jiffies.h&gt;</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/byteorder.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "qlogicpti.h"</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/sbus.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='hunk'>@@ -157,7 +159,7 @@ static inline void set_sbus_cfg1(struct qlogicpti *qpti)</div><div class='ctx'> 	 * is a nop and the chip ends up using the smallest burst</div><div class='ctx'> 	 * size. -DaveM</div><div class='ctx'> 	 */</div><div class='del'>-	if (sbus_can_burst64(qpti-&gt;sdev) &amp;&amp; (bursts &amp; DMA_BURST64)) {</div><div class='add'>+	if (sbus_can_burst64() &amp;&amp; (bursts &amp; DMA_BURST64)) {</div><div class='ctx'> 		val = (SBUS_CFG1_BENAB | SBUS_CFG1_B64);</div><div class='ctx'> 	} else</div><div class='ctx'> #endif</div><div class='hunk'>@@ -684,19 +686,19 @@ static void __devexit qpti_chain_del(struct qlogicpti *qpti)</div><div class='ctx'> </div><div class='ctx'> static int __devinit qpti_map_regs(struct qlogicpti *qpti)</div><div class='ctx'> {</div><div class='del'>-	struct sbus_dev *sdev = qpti-&gt;sdev;</div><div class='add'>+	struct of_device *op = qpti-&gt;op;</div><div class='ctx'> </div><div class='del'>-	qpti-&gt;qregs = sbus_ioremap(&amp;sdev-&gt;resource[0], 0,</div><div class='del'>-				   sdev-&gt;reg_addrs[0].reg_size,</div><div class='del'>-				   "PTI Qlogic/ISP");</div><div class='add'>+	qpti-&gt;qregs = of_ioremap(&amp;op-&gt;resource[0], 0,</div><div class='add'>+				 resource_size(&amp;op-&gt;resource[0]),</div><div class='add'>+				 "PTI Qlogic/ISP");</div><div class='ctx'> 	if (!qpti-&gt;qregs) {</div><div class='ctx'> 		printk("PTI: Qlogic/ISP registers are unmappable\n");</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (qpti-&gt;is_pti) {</div><div class='del'>-		qpti-&gt;sreg = sbus_ioremap(&amp;sdev-&gt;resource[0], (16 * 4096),</div><div class='del'>-					  sizeof(unsigned char),</div><div class='del'>-					  "PTI Qlogic/ISP statreg");</div><div class='add'>+		qpti-&gt;sreg = of_ioremap(&amp;op-&gt;resource[0], (16 * 4096),</div><div class='add'>+					sizeof(unsigned char),</div><div class='add'>+					"PTI Qlogic/ISP statreg");</div><div class='ctx'> 		if (!qpti-&gt;sreg) {</div><div class='ctx'> 			printk("PTI: Qlogic/ISP status register is unmappable\n");</div><div class='ctx'> 			return -1;</div><div class='hunk'>@@ -707,9 +709,9 @@ static int __devinit qpti_map_regs(struct qlogicpti *qpti)</div><div class='ctx'> </div><div class='ctx'> static int __devinit qpti_register_irq(struct qlogicpti *qpti)</div><div class='ctx'> {</div><div class='del'>-	struct sbus_dev *sdev = qpti-&gt;sdev;</div><div class='add'>+	struct of_device *op = qpti-&gt;op;</div><div class='ctx'> </div><div class='del'>-	qpti-&gt;qhost-&gt;irq = qpti-&gt;irq = sdev-&gt;irqs[0];</div><div class='add'>+	qpti-&gt;qhost-&gt;irq = qpti-&gt;irq = op-&gt;irqs[0];</div><div class='ctx'> </div><div class='ctx'> 	/* We used to try various overly-clever things to</div><div class='ctx'> 	 * reduce the interrupt processing overhead on</div><div class='hunk'>@@ -732,17 +734,19 @@ fail:</div><div class='ctx'> </div><div class='ctx'> static void __devinit qpti_get_scsi_id(struct qlogicpti *qpti)</div><div class='ctx'> {</div><div class='del'>-	qpti-&gt;scsi_id = prom_getintdefault(qpti-&gt;prom_node,</div><div class='del'>-					   "initiator-id",</div><div class='del'>-					   -1);</div><div class='add'>+	struct of_device *op = qpti-&gt;op;</div><div class='add'>+	struct device_node *dp;</div><div class='add'>+</div><div class='add'>+	dp = op-&gt;node;</div><div class='add'>+</div><div class='add'>+	qpti-&gt;scsi_id = of_getintprop_default(dp, "initiator-id", -1);</div><div class='ctx'> 	if (qpti-&gt;scsi_id == -1)</div><div class='del'>-		qpti-&gt;scsi_id = prom_getintdefault(qpti-&gt;prom_node,</div><div class='del'>-						   "scsi-initiator-id",</div><div class='del'>-						   -1);</div><div class='add'>+		qpti-&gt;scsi_id = of_getintprop_default(dp, "scsi-initiator-id",</div><div class='add'>+						      -1);</div><div class='ctx'> 	if (qpti-&gt;scsi_id == -1)</div><div class='ctx'> 		qpti-&gt;scsi_id =</div><div class='del'>-			prom_getintdefault(qpti-&gt;sdev-&gt;bus-&gt;prom_node,</div><div class='del'>-					   "scsi-initiator-id", 7);</div><div class='add'>+			of_getintprop_default(dp-&gt;parent,</div><div class='add'>+					      "scsi-initiator-id", 7);</div><div class='ctx'> 	qpti-&gt;qhost-&gt;this_id = qpti-&gt;scsi_id;</div><div class='ctx'> 	qpti-&gt;qhost-&gt;max_sectors = 64;</div><div class='ctx'> </div><div class='hunk'>@@ -751,12 +755,11 @@ static void __devinit qpti_get_scsi_id(struct qlogicpti *qpti)</div><div class='ctx'> </div><div class='ctx'> static void qpti_get_bursts(struct qlogicpti *qpti)</div><div class='ctx'> {</div><div class='del'>-	struct sbus_dev *sdev = qpti-&gt;sdev;</div><div class='add'>+	struct of_device *op = qpti-&gt;op;</div><div class='ctx'> 	u8 bursts, bmask;</div><div class='ctx'> </div><div class='del'>-	bursts = prom_getintdefault(qpti-&gt;prom_node, "burst-sizes", 0xff);</div><div class='del'>-	bmask = prom_getintdefault(sdev-&gt;bus-&gt;prom_node,</div><div class='del'>-				   "burst-sizes", 0xff);</div><div class='add'>+	bursts = of_getintprop_default(op-&gt;node, "burst-sizes", 0xff);</div><div class='add'>+	bmask = of_getintprop_default(op-&gt;node-&gt;parent, "burst-sizes", 0xff);</div><div class='ctx'> 	if (bmask != 0xff)</div><div class='ctx'> 		bursts &amp;= bmask;</div><div class='ctx'> 	if (bursts == 0xff ||</div><div class='hunk'>@@ -785,25 +788,25 @@ static void qpti_get_clock(struct qlogicpti *qpti)</div><div class='ctx'>  */</div><div class='ctx'> static int __devinit qpti_map_queues(struct qlogicpti *qpti)</div><div class='ctx'> {</div><div class='del'>-	struct sbus_dev *sdev = qpti-&gt;sdev;</div><div class='add'>+	struct of_device *op = qpti-&gt;op;</div><div class='ctx'> </div><div class='ctx'> #define QSIZE(entries)	(((entries) + 1) * QUEUE_ENTRY_LEN)</div><div class='del'>-	qpti-&gt;res_cpu = sbus_alloc_consistent(sdev,</div><div class='del'>-					      QSIZE(RES_QUEUE_LEN),</div><div class='del'>-					      &amp;qpti-&gt;res_dvma);</div><div class='add'>+	qpti-&gt;res_cpu = dma_alloc_coherent(&amp;op-&gt;dev,</div><div class='add'>+					   QSIZE(RES_QUEUE_LEN),</div><div class='add'>+					   &amp;qpti-&gt;res_dvma, GFP_ATOMIC);</div><div class='ctx'> 	if (qpti-&gt;res_cpu == NULL ||</div><div class='ctx'> 	    qpti-&gt;res_dvma == 0) {</div><div class='ctx'> 		printk("QPTI: Cannot map response queue.\n");</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	qpti-&gt;req_cpu = sbus_alloc_consistent(sdev,</div><div class='del'>-					      QSIZE(QLOGICPTI_REQ_QUEUE_LEN),</div><div class='del'>-					      &amp;qpti-&gt;req_dvma);</div><div class='add'>+	qpti-&gt;req_cpu = dma_alloc_coherent(&amp;op-&gt;dev,</div><div class='add'>+					   QSIZE(QLOGICPTI_REQ_QUEUE_LEN),</div><div class='add'>+					   &amp;qpti-&gt;req_dvma, GFP_ATOMIC);</div><div class='ctx'> 	if (qpti-&gt;req_cpu == NULL ||</div><div class='ctx'> 	    qpti-&gt;req_dvma == 0) {</div><div class='del'>-		sbus_free_consistent(sdev, QSIZE(RES_QUEUE_LEN),</div><div class='del'>-				     qpti-&gt;res_cpu, qpti-&gt;res_dvma);</div><div class='add'>+		dma_free_coherent(&amp;op-&gt;dev, QSIZE(RES_QUEUE_LEN),</div><div class='add'>+				  qpti-&gt;res_cpu, qpti-&gt;res_dvma);</div><div class='ctx'> 		printk("QPTI: Cannot map request queue.\n");</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -875,8 +878,9 @@ static inline int load_cmd(struct scsi_cmnd *Cmnd, struct Command_Entry *cmd,</div><div class='ctx'> 		int sg_count;</div><div class='ctx'> </div><div class='ctx'> 		sg = scsi_sglist(Cmnd);</div><div class='del'>-		sg_count = sbus_map_sg(qpti-&gt;sdev, sg, scsi_sg_count(Cmnd),</div><div class='del'>-		                                      Cmnd-&gt;sc_data_direction);</div><div class='add'>+		sg_count = dma_map_sg(&amp;qpti-&gt;op-&gt;dev, sg,</div><div class='add'>+				      scsi_sg_count(Cmnd),</div><div class='add'>+				      Cmnd-&gt;sc_data_direction);</div><div class='ctx'> </div><div class='ctx'> 		ds = cmd-&gt;dataseg;</div><div class='ctx'> 		cmd-&gt;segment_cnt = sg_count;</div><div class='hunk'>@@ -1152,9 +1156,9 @@ static struct scsi_cmnd *qlogicpti_intr_handler(struct qlogicpti *qpti)</div><div class='ctx'> 			Cmnd-&gt;result = DID_ERROR &lt;&lt; 16;</div><div class='ctx'> </div><div class='ctx'> 		if (scsi_bufflen(Cmnd))</div><div class='del'>-			sbus_unmap_sg(qpti-&gt;sdev,</div><div class='del'>-				      scsi_sglist(Cmnd), scsi_sg_count(Cmnd),</div><div class='del'>-				      Cmnd-&gt;sc_data_direction);</div><div class='add'>+			dma_unmap_sg(&amp;qpti-&gt;op-&gt;dev,</div><div class='add'>+				     scsi_sglist(Cmnd), scsi_sg_count(Cmnd),</div><div class='add'>+				     Cmnd-&gt;sc_data_direction);</div><div class='ctx'> </div><div class='ctx'> 		qpti-&gt;cmd_count[Cmnd-&gt;device-&gt;id]--;</div><div class='ctx'> 		sbus_writew(out_ptr, qpti-&gt;qregs + MBOX5);</div><div class='hunk'>@@ -1268,34 +1272,32 @@ static struct scsi_host_template qpti_template = {</div><div class='ctx'> 	.use_clustering		= ENABLE_CLUSTERING,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __devinit qpti_sbus_probe(struct of_device *dev, const struct of_device_id *match)</div><div class='add'>+static int __devinit qpti_sbus_probe(struct of_device *op, const struct of_device_id *match)</div><div class='ctx'> {</div><div class='del'>-	static int nqptis;</div><div class='del'>-	struct sbus_dev *sdev = to_sbus_device(&amp;dev-&gt;dev);</div><div class='del'>-	struct device_node *dp = dev-&gt;node;</div><div class='ctx'> 	struct scsi_host_template *tpnt = match-&gt;data;</div><div class='add'>+	struct device_node *dp = op-&gt;node;</div><div class='ctx'> 	struct Scsi_Host *host;</div><div class='ctx'> 	struct qlogicpti *qpti;</div><div class='add'>+	static int nqptis;</div><div class='ctx'> 	const char *fcode;</div><div class='ctx'> </div><div class='ctx'> 	/* Sometimes Antares cards come up not completely</div><div class='ctx'> 	 * setup, and we get a report of a zero IRQ.</div><div class='ctx'> 	 */</div><div class='del'>-	if (sdev-&gt;irqs[0] == 0)</div><div class='add'>+	if (op-&gt;irqs[0] == 0)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	host = scsi_host_alloc(tpnt, sizeof(struct qlogicpti));</div><div class='ctx'> 	if (!host)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	qpti = (struct qlogicpti *) host-&gt;hostdata;</div><div class='add'>+	qpti = shost_priv(host);</div><div class='ctx'> </div><div class='ctx'> 	host-&gt;max_id = MAX_TARGETS;</div><div class='ctx'> 	qpti-&gt;qhost = host;</div><div class='del'>-	qpti-&gt;sdev = sdev;</div><div class='add'>+	qpti-&gt;op = op;</div><div class='ctx'> 	qpti-&gt;qpti_id = nqptis;</div><div class='del'>-	qpti-&gt;prom_node = sdev-&gt;prom_node;</div><div class='del'>-	strcpy(qpti-&gt;prom_name, sdev-&gt;ofdev.node-&gt;name);</div><div class='add'>+	strcpy(qpti-&gt;prom_name, op-&gt;node-&gt;name);</div><div class='ctx'> 	qpti-&gt;is_pti = strcmp(qpti-&gt;prom_name, "QLGC,isp");</div><div class='ctx'> </div><div class='ctx'> 	if (qpti_map_regs(qpti) &lt; 0)</div><div class='hunk'>@@ -1341,12 +1343,12 @@ static int __devinit qpti_sbus_probe(struct of_device *dev, const struct of_devi</div><div class='ctx'> 		(qpti-&gt;ultra ? "Ultra" : "Fast"),</div><div class='ctx'> 		(qpti-&gt;differential ? "differential" : "single ended"));</div><div class='ctx'> </div><div class='del'>-	if (scsi_add_host(host, &amp;dev-&gt;dev)) {</div><div class='add'>+	if (scsi_add_host(host, &amp;op-&gt;dev)) {</div><div class='ctx'> 		printk("qlogicpti%d: Failed scsi_add_host\n", qpti-&gt;qpti_id);</div><div class='ctx'> 		goto fail_unmap_queues;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dev_set_drvdata(&amp;sdev-&gt;ofdev.dev, qpti);</div><div class='add'>+	dev_set_drvdata(&amp;op-&gt;dev, qpti);</div><div class='ctx'> </div><div class='ctx'> 	qpti_chain_add(qpti);</div><div class='ctx'> </div><div class='hunk'>@@ -1357,19 +1359,20 @@ static int __devinit qpti_sbus_probe(struct of_device *dev, const struct of_devi</div><div class='ctx'> </div><div class='ctx'> fail_unmap_queues:</div><div class='ctx'> #define QSIZE(entries)	(((entries) + 1) * QUEUE_ENTRY_LEN)</div><div class='del'>-	sbus_free_consistent(qpti-&gt;sdev,</div><div class='del'>-			     QSIZE(RES_QUEUE_LEN),</div><div class='del'>-			     qpti-&gt;res_cpu, qpti-&gt;res_dvma);</div><div class='del'>-	sbus_free_consistent(qpti-&gt;sdev,</div><div class='del'>-			     QSIZE(QLOGICPTI_REQ_QUEUE_LEN),</div><div class='del'>-			     qpti-&gt;req_cpu, qpti-&gt;req_dvma);</div><div class='add'>+	dma_free_coherent(&amp;op-&gt;dev,</div><div class='add'>+			  QSIZE(RES_QUEUE_LEN),</div><div class='add'>+			  qpti-&gt;res_cpu, qpti-&gt;res_dvma);</div><div class='add'>+	dma_free_coherent(&amp;op-&gt;dev,</div><div class='add'>+			  QSIZE(QLOGICPTI_REQ_QUEUE_LEN),</div><div class='add'>+			  qpti-&gt;req_cpu, qpti-&gt;req_dvma);</div><div class='ctx'> #undef QSIZE</div><div class='ctx'> </div><div class='ctx'> fail_unmap_regs:</div><div class='del'>-	sbus_iounmap(qpti-&gt;qregs,</div><div class='del'>-		     qpti-&gt;sdev-&gt;reg_addrs[0].reg_size);</div><div class='add'>+	of_iounmap(&amp;op-&gt;resource[0], qpti-&gt;qregs,</div><div class='add'>+		   resource_size(&amp;op-&gt;resource[0]));</div><div class='ctx'> 	if (qpti-&gt;is_pti)</div><div class='del'>-		sbus_iounmap(qpti-&gt;sreg, sizeof(unsigned char));</div><div class='add'>+		of_iounmap(&amp;op-&gt;resource[0], qpti-&gt;sreg,</div><div class='add'>+			   sizeof(unsigned char));</div><div class='ctx'> </div><div class='ctx'> fail_free_irq:</div><div class='ctx'> 	free_irq(qpti-&gt;irq, qpti);</div><div class='hunk'>@@ -1380,9 +1383,9 @@ fail_unlink:</div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devexit qpti_sbus_remove(struct of_device *dev)</div><div class='add'>+static int __devexit qpti_sbus_remove(struct of_device *op)</div><div class='ctx'> {</div><div class='del'>-	struct qlogicpti *qpti = dev_get_drvdata(&amp;dev-&gt;dev);</div><div class='add'>+	struct qlogicpti *qpti = dev_get_drvdata(&amp;op-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	qpti_chain_del(qpti);</div><div class='ctx'> </div><div class='hunk'>@@ -1395,24 +1398,25 @@ static int __devexit qpti_sbus_remove(struct of_device *dev)</div><div class='ctx'> 	free_irq(qpti-&gt;irq, qpti);</div><div class='ctx'> </div><div class='ctx'> #define QSIZE(entries)	(((entries) + 1) * QUEUE_ENTRY_LEN)</div><div class='del'>-	sbus_free_consistent(qpti-&gt;sdev,</div><div class='del'>-			     QSIZE(RES_QUEUE_LEN),</div><div class='del'>-			     qpti-&gt;res_cpu, qpti-&gt;res_dvma);</div><div class='del'>-	sbus_free_consistent(qpti-&gt;sdev,</div><div class='del'>-			     QSIZE(QLOGICPTI_REQ_QUEUE_LEN),</div><div class='del'>-			     qpti-&gt;req_cpu, qpti-&gt;req_dvma);</div><div class='add'>+	dma_free_coherent(&amp;op-&gt;dev,</div><div class='add'>+			  QSIZE(RES_QUEUE_LEN),</div><div class='add'>+			  qpti-&gt;res_cpu, qpti-&gt;res_dvma);</div><div class='add'>+	dma_free_coherent(&amp;op-&gt;dev,</div><div class='add'>+			  QSIZE(QLOGICPTI_REQ_QUEUE_LEN),</div><div class='add'>+			  qpti-&gt;req_cpu, qpti-&gt;req_dvma);</div><div class='ctx'> #undef QSIZE</div><div class='ctx'> </div><div class='del'>-	sbus_iounmap(qpti-&gt;qregs, qpti-&gt;sdev-&gt;reg_addrs[0].reg_size);</div><div class='add'>+	of_iounmap(&amp;op-&gt;resource[0], qpti-&gt;qregs,</div><div class='add'>+		   resource_size(&amp;op-&gt;resource[0]));</div><div class='ctx'> 	if (qpti-&gt;is_pti)</div><div class='del'>-		sbus_iounmap(qpti-&gt;sreg, sizeof(unsigned char));</div><div class='add'>+		of_iounmap(&amp;op-&gt;resource[0], qpti-&gt;sreg, sizeof(unsigned char));</div><div class='ctx'> </div><div class='ctx'> 	scsi_host_put(qpti-&gt;qhost);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct of_device_id qpti_match[] = {</div><div class='add'>+static const struct of_device_id qpti_match[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.name = "ptisp",</div><div class='ctx'> 		.data = &amp;qpti_template,</div><div class='hunk'>@@ -1442,7 +1446,7 @@ static struct of_platform_driver qpti_sbus_driver = {</div><div class='ctx'> </div><div class='ctx'> static int __init qpti_init(void)</div><div class='ctx'> {</div><div class='del'>-	return of_register_driver(&amp;qpti_sbus_driver, &amp;sbus_bus_type);</div><div class='add'>+	return of_register_driver(&amp;qpti_sbus_driver, &amp;of_bus_type);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit qpti_exit(void)</div><div class='hunk'>@@ -1453,7 +1457,7 @@ static void __exit qpti_exit(void)</div><div class='ctx'> MODULE_DESCRIPTION("QlogicISP SBUS driver");</div><div class='ctx'> MODULE_AUTHOR("David S. Miller (davem@davemloft.net)");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_VERSION("2.0");</div><div class='add'>+MODULE_VERSION("2.1");</div><div class='ctx'> </div><div class='ctx'> module_init(qpti_init);</div><div class='ctx'> module_exit(qpti_exit);</div><div class='head'>diff --git a/drivers/scsi/qlogicpti.h b/drivers/scsi/qlogicpti.h<br/>index ef6da2df584b..9c053bbaa877 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/qlogicpti.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/qlogicpti.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/qlogicpti.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/qlogicpti.h</a></div><div class='hunk'>@@ -342,7 +342,7 @@ struct qlogicpti {</div><div class='ctx'> 	u_int	                  req_in_ptr;		/* index of next request slot */</div><div class='ctx'> 	u_int	                  res_out_ptr;		/* index of next result slot  */</div><div class='ctx'> 	long	                  send_marker;		/* must we send a marker?     */</div><div class='del'>-	struct sbus_dev		 *sdev;</div><div class='add'>+	struct of_device	 *op;</div><div class='ctx'> 	unsigned long		  __pad;</div><div class='ctx'> </div><div class='ctx'> 	int                       cmd_count[MAX_TARGETS];</div><div class='head'>diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c<br/>index ee6be596503d..f8b79d401d58 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/scsi.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/scsi.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/scsi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/scsi.c</a></div><div class='hunk'>@@ -291,7 +291,6 @@ struct scsi_cmnd *scsi_get_command(struct scsi_device *dev, gfp_t gfp_mask)</div><div class='ctx'> 		unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 		cmd-&gt;device = dev;</div><div class='del'>-		init_timer(&amp;cmd-&gt;eh_timeout);</div><div class='ctx'> 		INIT_LIST_HEAD(&amp;cmd-&gt;list);</div><div class='ctx'> 		spin_lock_irqsave(&amp;dev-&gt;list_lock, flags);</div><div class='ctx'> 		list_add_tail(&amp;cmd-&gt;list, &amp;dev-&gt;cmd_list);</div><div class='hunk'>@@ -652,26 +651,33 @@ int scsi_dispatch_cmd(struct scsi_cmnd *cmd)</div><div class='ctx'> 	unsigned long timeout;</div><div class='ctx'> 	int rtn = 0;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * We will use a queued command if possible, otherwise we will</div><div class='add'>+	 * emulate the queuing and calling of completion function ourselves.</div><div class='add'>+	 */</div><div class='add'>+	atomic_inc(&amp;cmd-&gt;device-&gt;iorequest_cnt);</div><div class='add'>+</div><div class='ctx'> 	/* check if the device is still usable */</div><div class='ctx'> 	if (unlikely(cmd-&gt;device-&gt;sdev_state == SDEV_DEL)) {</div><div class='ctx'> 		/* in SDEV_DEL we error all commands. DID_NO_CONNECT</div><div class='ctx'> 		 * returns an immediate error upwards, and signals</div><div class='ctx'> 		 * that the device is no longer present */</div><div class='ctx'> 		cmd-&gt;result = DID_NO_CONNECT &lt;&lt; 16;</div><div class='del'>-		atomic_inc(&amp;cmd-&gt;device-&gt;iorequest_cnt);</div><div class='del'>-		__scsi_done(cmd);</div><div class='add'>+		scsi_done(cmd);</div><div class='ctx'> 		/* return 0 (because the command has been processed) */</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Check to see if the scsi lld put this device into state SDEV_BLOCK. */</div><div class='del'>-	if (unlikely(cmd-&gt;device-&gt;sdev_state == SDEV_BLOCK)) {</div><div class='add'>+	/* Check to see if the scsi lld made this device blocked. */</div><div class='add'>+	if (unlikely(scsi_device_blocked(cmd-&gt;device))) {</div><div class='ctx'> 		/* </div><div class='del'>-		 * in SDEV_BLOCK, the command is just put back on the device</div><div class='del'>-		 * queue.  The suspend state has already blocked the queue so</div><div class='del'>-		 * future requests should not occur until the device </div><div class='del'>-		 * transitions out of the suspend state.</div><div class='add'>+		 * in blocked state, the command is just put back on</div><div class='add'>+		 * the device queue.  The suspend state has already</div><div class='add'>+		 * blocked the queue so future requests should not</div><div class='add'>+		 * occur until the device transitions out of the</div><div class='add'>+		 * suspend state.</div><div class='ctx'> 		 */</div><div class='add'>+</div><div class='ctx'> 		scsi_queue_insert(cmd, SCSI_MLQUEUE_DEVICE_BUSY);</div><div class='ctx'> </div><div class='ctx'> 		SCSI_LOG_MLQUEUE(3, printk("queuecommand : device blocked \n"));</div><div class='hunk'>@@ -714,21 +720,9 @@ int scsi_dispatch_cmd(struct scsi_cmnd *cmd)</div><div class='ctx'> 		host-&gt;resetting = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* </div><div class='del'>-	 * AK: unlikely race here: for some reason the timer could</div><div class='del'>-	 * expire before the serial number is set up below.</div><div class='del'>-	 */</div><div class='del'>-	scsi_add_timer(cmd, cmd-&gt;timeout_per_command, scsi_times_out);</div><div class='del'>-</div><div class='ctx'> 	scsi_log_send(cmd);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * We will use a queued command if possible, otherwise we will</div><div class='del'>-	 * emulate the queuing and calling of completion function ourselves.</div><div class='del'>-	 */</div><div class='del'>-	atomic_inc(&amp;cmd-&gt;device-&gt;iorequest_cnt);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='ctx'> 	 * Before we queue this command, check if the command</div><div class='ctx'> 	 * length exceeds what the host adapter can handle.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -744,6 +738,12 @@ int scsi_dispatch_cmd(struct scsi_cmnd *cmd)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(host-&gt;host_lock, flags);</div><div class='add'>+	/*</div><div class='add'>+	 * AK: unlikely race here: for some reason the timer could</div><div class='add'>+	 * expire before the serial number is set up below.</div><div class='add'>+	 *</div><div class='add'>+	 * TODO: kill serial or move to blk layer</div><div class='add'>+	 */</div><div class='ctx'> 	scsi_cmd_get_serial(host, cmd); </div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(host-&gt;shost_state == SHOST_DEL)) {</div><div class='hunk'>@@ -754,12 +754,12 @@ int scsi_dispatch_cmd(struct scsi_cmnd *cmd)</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_irqrestore(host-&gt;host_lock, flags);</div><div class='ctx'> 	if (rtn) {</div><div class='del'>-		if (scsi_delete_timer(cmd)) {</div><div class='del'>-			atomic_inc(&amp;cmd-&gt;device-&gt;iodone_cnt);</div><div class='del'>-			scsi_queue_insert(cmd,</div><div class='del'>-					  (rtn == SCSI_MLQUEUE_DEVICE_BUSY) ?</div><div class='del'>-					  rtn : SCSI_MLQUEUE_HOST_BUSY);</div><div class='del'>-		}</div><div class='add'>+		if (rtn != SCSI_MLQUEUE_DEVICE_BUSY &amp;&amp;</div><div class='add'>+		    rtn != SCSI_MLQUEUE_TARGET_BUSY)</div><div class='add'>+			rtn = SCSI_MLQUEUE_HOST_BUSY;</div><div class='add'>+</div><div class='add'>+		scsi_queue_insert(cmd, rtn);</div><div class='add'>+</div><div class='ctx'> 		SCSI_LOG_MLQUEUE(3,</div><div class='ctx'> 		    printk("queuecommand : request rejected\n"));</div><div class='ctx'> 	}</div><div class='hunk'>@@ -770,24 +770,6 @@ int scsi_dispatch_cmd(struct scsi_cmnd *cmd)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * scsi_req_abort_cmd -- Request command recovery for the specified command</div><div class='del'>- * @cmd: pointer to the SCSI command of interest</div><div class='del'>- *</div><div class='del'>- * This function requests that SCSI Core start recovery for the</div><div class='del'>- * command by deleting the timer and adding the command to the eh</div><div class='del'>- * queue.  It can be called by either LLDDs or SCSI Core.  LLDDs who</div><div class='del'>- * implement their own error recovery MAY ignore the timeout event if</div><div class='del'>- * they generated scsi_req_abort_cmd.</div><div class='del'>- */</div><div class='del'>-void scsi_req_abort_cmd(struct scsi_cmnd *cmd)</div><div class='del'>-{</div><div class='del'>-	if (!scsi_delete_timer(cmd))</div><div class='del'>-		return;</div><div class='del'>-	scsi_times_out(cmd);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(scsi_req_abort_cmd);</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * scsi_done - Enqueue the finished SCSI command into the done queue.</div><div class='ctx'>  * @cmd: The SCSI Command for which a low-level device driver (LLDD) gives</div><div class='ctx'>  * ownership back to SCSI Core -- i.e. the LLDD has finished with it.</div><div class='hunk'>@@ -802,42 +784,7 @@ EXPORT_SYMBOL(scsi_req_abort_cmd);</div><div class='ctx'>  */</div><div class='ctx'> static void scsi_done(struct scsi_cmnd *cmd)</div><div class='ctx'> {</div><div class='del'>-	/*</div><div class='del'>-	 * We don't have to worry about this one timing out anymore.</div><div class='del'>-	 * If we are unable to remove the timer, then the command</div><div class='del'>-	 * has already timed out.  In which case, we have no choice but to</div><div class='del'>-	 * let the timeout function run, as we have no idea where in fact</div><div class='del'>-	 * that function could really be.  It might be on another processor,</div><div class='del'>-	 * etc, etc.</div><div class='del'>-	 */</div><div class='del'>-	if (!scsi_delete_timer(cmd))</div><div class='del'>-		return;</div><div class='del'>-	__scsi_done(cmd);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Private entry to scsi_done() to complete a command when the timer</div><div class='del'>- * isn't running --- used by scsi_times_out */</div><div class='del'>-void __scsi_done(struct scsi_cmnd *cmd)</div><div class='del'>-{</div><div class='del'>-	struct request *rq = cmd-&gt;request;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Set the serial numbers back to zero</div><div class='del'>-	 */</div><div class='del'>-	cmd-&gt;serial_number = 0;</div><div class='del'>-</div><div class='del'>-	atomic_inc(&amp;cmd-&gt;device-&gt;iodone_cnt);</div><div class='del'>-	if (cmd-&gt;result)</div><div class='del'>-		atomic_inc(&amp;cmd-&gt;device-&gt;ioerr_cnt);</div><div class='del'>-</div><div class='del'>-	BUG_ON(!rq);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * The uptodate/nbytes values don't matter, as we allow partial</div><div class='del'>-	 * completes and thus will check this in the softirq callback</div><div class='del'>-	 */</div><div class='del'>-	rq-&gt;completion_data = cmd;</div><div class='del'>-	blk_complete_request(rq);</div><div class='add'>+	blk_complete_request(cmd-&gt;request);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Move this to a header if it becomes more generally useful */</div><div class='hunk'>@@ -857,6 +804,7 @@ static struct scsi_driver *scsi_cmd_to_driver(struct scsi_cmnd *cmd)</div><div class='ctx'> void scsi_finish_command(struct scsi_cmnd *cmd)</div><div class='ctx'> {</div><div class='ctx'> 	struct scsi_device *sdev = cmd-&gt;device;</div><div class='add'>+	struct scsi_target *starget = scsi_target(sdev);</div><div class='ctx'> 	struct Scsi_Host *shost = sdev-&gt;host;</div><div class='ctx'> 	struct scsi_driver *drv;</div><div class='ctx'> 	unsigned int good_bytes;</div><div class='hunk'>@@ -872,6 +820,7 @@ void scsi_finish_command(struct scsi_cmnd *cmd)</div><div class='ctx'> 	 * XXX(hch): What about locking?</div><div class='ctx'>          */</div><div class='ctx'>         shost-&gt;host_blocked = 0;</div><div class='add'>+	starget-&gt;target_blocked = 0;</div><div class='ctx'>         sdev-&gt;device_blocked = 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='head'>diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c<br/>index 39ce3aba1dac..94ed262bdf0c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/scsi_error.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/scsi_error.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/scsi_error.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/scsi_error.c</a></div><div class='hunk'>@@ -112,69 +112,8 @@ int scsi_eh_scmd_add(struct scsi_cmnd *scmd, int eh_flag)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * scsi_add_timer - Start timeout timer for a single scsi command.</div><div class='del'>- * @scmd:	scsi command that is about to start running.</div><div class='del'>- * @timeout:	amount of time to allow this command to run.</div><div class='del'>- * @complete:	timeout function to call if timer isn't canceled.</div><div class='del'>- *</div><div class='del'>- * Notes:</div><div class='del'>- *    This should be turned into an inline function.  Each scsi command</div><div class='del'>- *    has its own timer, and as it is added to the queue, we set up the</div><div class='del'>- *    timer.  When the command completes, we cancel the timer.</div><div class='del'>- */</div><div class='del'>-void scsi_add_timer(struct scsi_cmnd *scmd, int timeout,</div><div class='del'>-		    void (*complete)(struct scsi_cmnd *))</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If the clock was already running for this command, then</div><div class='del'>-	 * first delete the timer.  The timer handling code gets rather</div><div class='del'>-	 * confused if we don't do this.</div><div class='del'>-	 */</div><div class='del'>-	if (scmd-&gt;eh_timeout.function)</div><div class='del'>-		del_timer(&amp;scmd-&gt;eh_timeout);</div><div class='del'>-</div><div class='del'>-	scmd-&gt;eh_timeout.data = (unsigned long)scmd;</div><div class='del'>-	scmd-&gt;eh_timeout.expires = jiffies + timeout;</div><div class='del'>-	scmd-&gt;eh_timeout.function = (void (*)(unsigned long)) complete;</div><div class='del'>-</div><div class='del'>-	SCSI_LOG_ERROR_RECOVERY(5, printk("%s: scmd: %p, time:"</div><div class='del'>-					  " %d, (%p)\n", __func__,</div><div class='del'>-					  scmd, timeout, complete));</div><div class='del'>-</div><div class='del'>-	add_timer(&amp;scmd-&gt;eh_timeout);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * scsi_delete_timer - Delete/cancel timer for a given function.</div><div class='del'>- * @scmd:	Cmd that we are canceling timer for</div><div class='del'>- *</div><div class='del'>- * Notes:</div><div class='del'>- *     This should be turned into an inline function.</div><div class='del'>- *</div><div class='del'>- * Return value:</div><div class='del'>- *     1 if we were able to detach the timer.  0 if we blew it, and the</div><div class='del'>- *     timer function has already started to run.</div><div class='del'>- */</div><div class='del'>-int scsi_delete_timer(struct scsi_cmnd *scmd)</div><div class='del'>-{</div><div class='del'>-	int rtn;</div><div class='del'>-</div><div class='del'>-	rtn = del_timer(&amp;scmd-&gt;eh_timeout);</div><div class='del'>-</div><div class='del'>-	SCSI_LOG_ERROR_RECOVERY(5, printk("%s: scmd: %p,"</div><div class='del'>-					 " rtn: %d\n", __func__,</div><div class='del'>-					 scmd, rtn));</div><div class='del'>-</div><div class='del'>-	scmd-&gt;eh_timeout.data = (unsigned long)NULL;</div><div class='del'>-	scmd-&gt;eh_timeout.function = NULL;</div><div class='del'>-</div><div class='del'>-	return rtn;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * scsi_times_out - Timeout function for normal scsi commands.</div><div class='del'>- * @scmd:	Cmd that is timing out.</div><div class='add'>+ * @req:	request that is timing out.</div><div class='ctx'>  *</div><div class='ctx'>  * Notes:</div><div class='ctx'>  *     We do not need to lock this.  There is the potential for a race</div><div class='hunk'>@@ -182,9 +121,11 @@ int scsi_delete_timer(struct scsi_cmnd *scmd)</div><div class='ctx'>  *     normal completion function determines that the timer has already</div><div class='ctx'>  *     fired, then it mustn't do anything.</div><div class='ctx'>  */</div><div class='del'>-void scsi_times_out(struct scsi_cmnd *scmd)</div><div class='add'>+enum blk_eh_timer_return scsi_times_out(struct request *req)</div><div class='ctx'> {</div><div class='del'>-	enum scsi_eh_timer_return (* eh_timed_out)(struct scsi_cmnd *);</div><div class='add'>+	struct scsi_cmnd *scmd = req-&gt;special;</div><div class='add'>+	enum blk_eh_timer_return (*eh_timed_out)(struct scsi_cmnd *);</div><div class='add'>+	enum blk_eh_timer_return rtn = BLK_EH_NOT_HANDLED;</div><div class='ctx'> </div><div class='ctx'> 	scsi_log_completion(scmd, TIMEOUT_ERROR);</div><div class='ctx'> </div><div class='hunk'>@@ -196,22 +137,20 @@ void scsi_times_out(struct scsi_cmnd *scmd)</div><div class='ctx'> 		eh_timed_out = NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (eh_timed_out)</div><div class='del'>-		switch (eh_timed_out(scmd)) {</div><div class='del'>-		case EH_HANDLED:</div><div class='del'>-			__scsi_done(scmd);</div><div class='del'>-			return;</div><div class='del'>-		case EH_RESET_TIMER:</div><div class='del'>-			scsi_add_timer(scmd, scmd-&gt;timeout_per_command,</div><div class='del'>-				       scsi_times_out);</div><div class='del'>-			return;</div><div class='del'>-		case EH_NOT_HANDLED:</div><div class='add'>+		rtn = eh_timed_out(scmd);</div><div class='add'>+		switch (rtn) {</div><div class='add'>+		case BLK_EH_NOT_HANDLED:</div><div class='ctx'> 			break;</div><div class='add'>+		default:</div><div class='add'>+			return rtn;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(!scsi_eh_scmd_add(scmd, SCSI_EH_CANCEL_CMD))) {</div><div class='ctx'> 		scmd-&gt;result |= DID_TIME_OUT &lt;&lt; 16;</div><div class='del'>-		__scsi_done(scmd);</div><div class='add'>+		return BLK_EH_HANDLED;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	return BLK_EH_NOT_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1126,10 +1065,10 @@ static int scsi_eh_target_reset(struct Scsi_Host *shost,</div><div class='ctx'> 				struct list_head *done_q)</div><div class='ctx'> {</div><div class='ctx'> 	struct scsi_cmnd *scmd, *tgtr_scmd, *next;</div><div class='del'>-	unsigned int id;</div><div class='add'>+	unsigned int id = 0;</div><div class='ctx'> 	int rtn;</div><div class='ctx'> </div><div class='del'>-	for (id = 0; id &lt;= shost-&gt;max_id; id++) {</div><div class='add'>+	do {</div><div class='ctx'> 		tgtr_scmd = NULL;</div><div class='ctx'> 		list_for_each_entry(scmd, work_q, eh_entry) {</div><div class='ctx'> 			if (id == scmd_id(scmd)) {</div><div class='hunk'>@@ -1137,8 +1076,18 @@ static int scsi_eh_target_reset(struct Scsi_Host *shost,</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='add'>+		if (!tgtr_scmd) {</div><div class='add'>+			/* not one exactly equal; find the next highest */</div><div class='add'>+			list_for_each_entry(scmd, work_q, eh_entry) {</div><div class='add'>+				if (scmd_id(scmd) &gt; id &amp;&amp;</div><div class='add'>+				    (!tgtr_scmd ||</div><div class='add'>+				     scmd_id(tgtr_scmd) &gt; scmd_id(scmd)))</div><div class='add'>+						tgtr_scmd = scmd;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> 		if (!tgtr_scmd)</div><div class='del'>-			continue;</div><div class='add'>+			/* no more commands, that's it */</div><div class='add'>+			break;</div><div class='ctx'> </div><div class='ctx'> 		SCSI_LOG_ERROR_RECOVERY(3, printk("%s: Sending target reset "</div><div class='ctx'> 						  "to target %d\n",</div><div class='hunk'>@@ -1157,7 +1106,8 @@ static int scsi_eh_target_reset(struct Scsi_Host *shost,</div><div class='ctx'> 							  " failed target: "</div><div class='ctx'> 							  "%d\n",</div><div class='ctx'> 							  current-&gt;comm, id));</div><div class='del'>-	}</div><div class='add'>+		id++;</div><div class='add'>+	} while(id != 0);</div><div class='ctx'> </div><div class='ctx'> 	return list_empty(work_q);</div><div class='ctx'> }</div><div class='hunk'>@@ -1280,6 +1230,40 @@ static void scsi_eh_offline_sdevs(struct list_head *work_q,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * scsi_noretry_cmd - determinte if command should be failed fast</div><div class='add'>+ * @scmd:	SCSI cmd to examine.</div><div class='add'>+ */</div><div class='add'>+int scsi_noretry_cmd(struct scsi_cmnd *scmd)</div><div class='add'>+{</div><div class='add'>+	switch (host_byte(scmd-&gt;result)) {</div><div class='add'>+	case DID_OK:</div><div class='add'>+		break;</div><div class='add'>+	case DID_BUS_BUSY:</div><div class='add'>+		return blk_failfast_transport(scmd-&gt;request);</div><div class='add'>+	case DID_PARITY:</div><div class='add'>+		return blk_failfast_dev(scmd-&gt;request);</div><div class='add'>+	case DID_ERROR:</div><div class='add'>+		if (msg_byte(scmd-&gt;result) == COMMAND_COMPLETE &amp;&amp;</div><div class='add'>+		    status_byte(scmd-&gt;result) == RESERVATION_CONFLICT)</div><div class='add'>+			return 0;</div><div class='add'>+		/* fall through */</div><div class='add'>+	case DID_SOFT_ERROR:</div><div class='add'>+		return blk_failfast_driver(scmd-&gt;request);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (status_byte(scmd-&gt;result)) {</div><div class='add'>+	case CHECK_CONDITION:</div><div class='add'>+		/*</div><div class='add'>+		 * assume caller has checked sense and determinted</div><div class='add'>+		 * the check condition was retryable.</div><div class='add'>+		 */</div><div class='add'>+		return blk_failfast_dev(scmd-&gt;request);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * scsi_decide_disposition - Disposition a cmd on return from LLD.</div><div class='ctx'>  * @scmd:	SCSI cmd to examine.</div><div class='ctx'>  *</div><div class='hunk'>@@ -1351,7 +1335,20 @@ int scsi_decide_disposition(struct scsi_cmnd *scmd)</div><div class='ctx'> </div><div class='ctx'> 	case DID_REQUEUE:</div><div class='ctx'> 		return ADD_TO_MLQUEUE;</div><div class='del'>-</div><div class='add'>+	case DID_TRANSPORT_DISRUPTED:</div><div class='add'>+		/*</div><div class='add'>+		 * LLD/transport was disrupted during processing of the IO.</div><div class='add'>+		 * The transport class is now blocked/blocking,</div><div class='add'>+		 * and the transport will decide what to do with the IO</div><div class='add'>+		 * based on its timers and recovery capablilities.</div><div class='add'>+		 */</div><div class='add'>+		return ADD_TO_MLQUEUE;</div><div class='add'>+	case DID_TRANSPORT_FAILFAST:</div><div class='add'>+		/*</div><div class='add'>+		 * The transport decided to failfast the IO (most likely</div><div class='add'>+		 * the fast io fail tmo fired), so send IO directly upwards.</div><div class='add'>+		 */</div><div class='add'>+		return SUCCESS;</div><div class='ctx'> 	case DID_ERROR:</div><div class='ctx'> 		if (msg_byte(scmd-&gt;result) == COMMAND_COMPLETE &amp;&amp;</div><div class='ctx'> 		    status_byte(scmd-&gt;result) == RESERVATION_CONFLICT)</div><div class='hunk'>@@ -1444,7 +1441,7 @@ int scsi_decide_disposition(struct scsi_cmnd *scmd)</div><div class='ctx'> 	 * even if the request is marked fast fail, we still requeue</div><div class='ctx'> 	 * for queue congestion conditions (QUEUE_FULL or BUSY) */</div><div class='ctx'> 	if ((++scmd-&gt;retries) &lt;= scmd-&gt;allowed</div><div class='del'>-	    &amp;&amp; !blk_noretry_request(scmd-&gt;request)) {</div><div class='add'>+	    &amp;&amp; !scsi_noretry_cmd(scmd)) {</div><div class='ctx'> 		return NEEDS_RETRY;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -1569,7 +1566,7 @@ void scsi_eh_flush_done_q(struct list_head *done_q)</div><div class='ctx'> 	list_for_each_entry_safe(scmd, next, done_q, eh_entry) {</div><div class='ctx'> 		list_del_init(&amp;scmd-&gt;eh_entry);</div><div class='ctx'> 		if (scsi_device_online(scmd-&gt;device) &amp;&amp;</div><div class='del'>-		    !blk_noretry_request(scmd-&gt;request) &amp;&amp;</div><div class='add'>+		    !scsi_noretry_cmd(scmd) &amp;&amp;</div><div class='ctx'> 		    (++scmd-&gt;retries &lt;= scmd-&gt;allowed)) {</div><div class='ctx'> 			SCSI_LOG_ERROR_RECOVERY(3, printk("%s: flush"</div><div class='ctx'> 							  " retry cmd: %p\n",</div><div class='hunk'>@@ -1793,7 +1790,6 @@ scsi_reset_provider(struct scsi_device *dev, int flag)</div><div class='ctx'> </div><div class='ctx'> 	blk_rq_init(NULL, &amp;req);</div><div class='ctx'> 	scmd-&gt;request = &amp;req;</div><div class='del'>-	memset(&amp;scmd-&gt;eh_timeout, 0, sizeof(scmd-&gt;eh_timeout));</div><div class='ctx'> </div><div class='ctx'> 	scmd-&gt;cmnd = req.cmd;</div><div class='ctx'> </div><div class='hunk'>@@ -1804,8 +1800,6 @@ scsi_reset_provider(struct scsi_device *dev, int flag)</div><div class='ctx'> </div><div class='ctx'> 	scmd-&gt;sc_data_direction		= DMA_BIDIRECTIONAL;</div><div class='ctx'> </div><div class='del'>-	init_timer(&amp;scmd-&gt;eh_timeout);</div><div class='del'>-</div><div class='ctx'> 	spin_lock_irqsave(shost-&gt;host_lock, flags);</div><div class='ctx'> 	shost-&gt;tmf_in_progress = 1;</div><div class='ctx'> 	spin_unlock_irqrestore(shost-&gt;host_lock, flags);</div><div class='head'>diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c<br/>index 62307bd794a9..e5a9526d2037 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/scsi_lib.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/scsi_lib.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/scsi_lib.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/scsi_lib.c</a></div><div class='hunk'>@@ -114,6 +114,7 @@ int scsi_queue_insert(struct scsi_cmnd *cmd, int reason)</div><div class='ctx'> {</div><div class='ctx'> 	struct Scsi_Host *host = cmd-&gt;device-&gt;host;</div><div class='ctx'> 	struct scsi_device *device = cmd-&gt;device;</div><div class='add'>+	struct scsi_target *starget = scsi_target(device);</div><div class='ctx'> 	struct request_queue *q = device-&gt;request_queue;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='hunk'>@@ -133,10 +134,17 @@ int scsi_queue_insert(struct scsi_cmnd *cmd, int reason)</div><div class='ctx'> 	 * if a command is requeued with no other commands outstanding</div><div class='ctx'> 	 * either for the device or for the host.</div><div class='ctx'> 	 */</div><div class='del'>-	if (reason == SCSI_MLQUEUE_HOST_BUSY)</div><div class='add'>+	switch (reason) {</div><div class='add'>+	case SCSI_MLQUEUE_HOST_BUSY:</div><div class='ctx'> 		host-&gt;host_blocked = host-&gt;max_host_blocked;</div><div class='del'>-	else if (reason == SCSI_MLQUEUE_DEVICE_BUSY)</div><div class='add'>+		break;</div><div class='add'>+	case SCSI_MLQUEUE_DEVICE_BUSY:</div><div class='ctx'> 		device-&gt;device_blocked = device-&gt;max_device_blocked;</div><div class='add'>+		break;</div><div class='add'>+	case SCSI_MLQUEUE_TARGET_BUSY:</div><div class='add'>+		starget-&gt;target_blocked = starget-&gt;max_target_blocked;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Decrement the counters, since these commands are no longer</div><div class='hunk'>@@ -460,10 +468,12 @@ static void scsi_init_cmd_errh(struct scsi_cmnd *cmd)</div><div class='ctx'> void scsi_device_unbusy(struct scsi_device *sdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct Scsi_Host *shost = sdev-&gt;host;</div><div class='add'>+	struct scsi_target *starget = scsi_target(sdev);</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(shost-&gt;host_lock, flags);</div><div class='ctx'> 	shost-&gt;host_busy--;</div><div class='add'>+	starget-&gt;target_busy--;</div><div class='ctx'> 	if (unlikely(scsi_host_in_recovery(shost) &amp;&amp;</div><div class='ctx'> 		     (shost-&gt;host_failed || shost-&gt;host_eh_scheduled)))</div><div class='ctx'> 		scsi_eh_wakeup(shost);</div><div class='hunk'>@@ -519,6 +529,13 @@ static void scsi_single_lun_run(struct scsi_device *current_sdev)</div><div class='ctx'> 	spin_unlock_irqrestore(shost-&gt;host_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int scsi_target_is_busy(struct scsi_target *starget)</div><div class='add'>+{</div><div class='add'>+	return ((starget-&gt;can_queue &gt; 0 &amp;&amp;</div><div class='add'>+		 starget-&gt;target_busy &gt;= starget-&gt;can_queue) ||</div><div class='add'>+		 starget-&gt;target_blocked);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Function:	scsi_run_queue()</div><div class='ctx'>  *</div><div class='hunk'>@@ -533,7 +550,7 @@ static void scsi_single_lun_run(struct scsi_device *current_sdev)</div><div class='ctx'>  */</div><div class='ctx'> static void scsi_run_queue(struct request_queue *q)</div><div class='ctx'> {</div><div class='del'>-	struct scsi_device *sdev = q-&gt;queuedata;</div><div class='add'>+	struct scsi_device *starved_head = NULL, *sdev = q-&gt;queuedata;</div><div class='ctx'> 	struct Scsi_Host *shost = sdev-&gt;host;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='hunk'>@@ -560,6 +577,21 @@ static void scsi_run_queue(struct request_queue *q)</div><div class='ctx'> 		 */</div><div class='ctx'> 		sdev = list_entry(shost-&gt;starved_list.next,</div><div class='ctx'> 					  struct scsi_device, starved_entry);</div><div class='add'>+		/*</div><div class='add'>+		 * The *queue_ready functions can add a device back onto the</div><div class='add'>+		 * starved list's tail, so we must check for a infinite loop.</div><div class='add'>+		 */</div><div class='add'>+		if (sdev == starved_head)</div><div class='add'>+			break;</div><div class='add'>+		if (!starved_head)</div><div class='add'>+			starved_head = sdev;</div><div class='add'>+</div><div class='add'>+		if (scsi_target_is_busy(scsi_target(sdev))) {</div><div class='add'>+			list_move_tail(&amp;sdev-&gt;starved_entry,</div><div class='add'>+				       &amp;shost-&gt;starved_list);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		list_del_init(&amp;sdev-&gt;starved_entry);</div><div class='ctx'> 		spin_unlock(shost-&gt;host_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -575,13 +607,6 @@ static void scsi_run_queue(struct request_queue *q)</div><div class='ctx'> 		spin_unlock(sdev-&gt;request_queue-&gt;queue_lock);</div><div class='ctx'> </div><div class='ctx'> 		spin_lock(shost-&gt;host_lock);</div><div class='del'>-		if (unlikely(!list_empty(&amp;sdev-&gt;starved_entry)))</div><div class='del'>-			/*</div><div class='del'>-			 * sdev lost a race, and was put back on the</div><div class='del'>-			 * starved list. This is unlikely but without this</div><div class='del'>-			 * in theory we could loop forever.</div><div class='del'>-			 */</div><div class='del'>-			break;</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_irqrestore(shost-&gt;host_lock, flags);</div><div class='ctx'> </div><div class='hunk'>@@ -681,7 +706,7 @@ static struct scsi_cmnd *scsi_end_request(struct scsi_cmnd *cmd, int error,</div><div class='ctx'> 			leftover = req-&gt;data_len;</div><div class='ctx'> </div><div class='ctx'> 		/* kill remainder if no retrys */</div><div class='del'>-		if (error &amp;&amp; blk_noretry_request(req))</div><div class='add'>+		if (error &amp;&amp; scsi_noretry_cmd(cmd))</div><div class='ctx'> 			blk_end_request(req, error, leftover);</div><div class='ctx'> 		else {</div><div class='ctx'> 			if (requeue) {</div><div class='hunk'>@@ -1181,7 +1206,6 @@ int scsi_setup_blk_pc_cmnd(struct scsi_device *sdev, struct request *req)</div><div class='ctx'> 	</div><div class='ctx'> 	cmd-&gt;transfersize = req-&gt;data_len;</div><div class='ctx'> 	cmd-&gt;allowed = req-&gt;retries;</div><div class='del'>-	cmd-&gt;timeout_per_command = req-&gt;timeout;</div><div class='ctx'> 	return BLKPREP_OK;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(scsi_setup_blk_pc_cmnd);</div><div class='hunk'>@@ -1251,6 +1275,7 @@ int scsi_prep_state_check(struct scsi_device *sdev, struct request *req)</div><div class='ctx'> 			break;</div><div class='ctx'> 		case SDEV_QUIESCE:</div><div class='ctx'> 		case SDEV_BLOCK:</div><div class='add'>+		case SDEV_CREATED_BLOCK:</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * If the devices is blocked we defer normal commands.</div><div class='ctx'> 			 */</div><div class='hunk'>@@ -1344,6 +1369,52 @@ static inline int scsi_dev_queue_ready(struct request_queue *q,</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * scsi_target_queue_ready: checks if there we can send commands to target</div><div class='add'>+ * @sdev: scsi device on starget to check.</div><div class='add'>+ *</div><div class='add'>+ * Called with the host lock held.</div><div class='add'>+ */</div><div class='add'>+static inline int scsi_target_queue_ready(struct Scsi_Host *shost,</div><div class='add'>+					   struct scsi_device *sdev)</div><div class='add'>+{</div><div class='add'>+	struct scsi_target *starget = scsi_target(sdev);</div><div class='add'>+</div><div class='add'>+	if (starget-&gt;single_lun) {</div><div class='add'>+		if (starget-&gt;starget_sdev_user &amp;&amp;</div><div class='add'>+		    starget-&gt;starget_sdev_user != sdev)</div><div class='add'>+			return 0;</div><div class='add'>+		starget-&gt;starget_sdev_user = sdev;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (starget-&gt;target_busy == 0 &amp;&amp; starget-&gt;target_blocked) {</div><div class='add'>+		/*</div><div class='add'>+		 * unblock after target_blocked iterates to zero</div><div class='add'>+		 */</div><div class='add'>+		if (--starget-&gt;target_blocked == 0) {</div><div class='add'>+			SCSI_LOG_MLQUEUE(3, starget_printk(KERN_INFO, starget,</div><div class='add'>+					 "unblocking target at zero depth\n"));</div><div class='add'>+		} else {</div><div class='add'>+			blk_plug_device(sdev-&gt;request_queue);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (scsi_target_is_busy(starget)) {</div><div class='add'>+		if (list_empty(&amp;sdev-&gt;starved_entry)) {</div><div class='add'>+			list_add_tail(&amp;sdev-&gt;starved_entry,</div><div class='add'>+				      &amp;shost-&gt;starved_list);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* We're OK to process the command, so we can't be starved */</div><div class='add'>+	if (!list_empty(&amp;sdev-&gt;starved_entry))</div><div class='add'>+		list_del_init(&amp;sdev-&gt;starved_entry);</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * scsi_host_queue_ready: if we can send requests to shost, return 1 else</div><div class='ctx'>  * return 0. We must end up running the queue again whenever 0 is</div><div class='hunk'>@@ -1390,6 +1461,7 @@ static void scsi_kill_request(struct request *req, struct request_queue *q)</div><div class='ctx'> {</div><div class='ctx'> 	struct scsi_cmnd *cmd = req-&gt;special;</div><div class='ctx'> 	struct scsi_device *sdev = cmd-&gt;device;</div><div class='add'>+	struct scsi_target *starget = scsi_target(sdev);</div><div class='ctx'> 	struct Scsi_Host *shost = sdev-&gt;host;</div><div class='ctx'> </div><div class='ctx'> 	blkdev_dequeue_request(req);</div><div class='hunk'>@@ -1413,20 +1485,30 @@ static void scsi_kill_request(struct request *req, struct request_queue *q)</div><div class='ctx'> 	spin_unlock(sdev-&gt;request_queue-&gt;queue_lock);</div><div class='ctx'> 	spin_lock(shost-&gt;host_lock);</div><div class='ctx'> 	shost-&gt;host_busy++;</div><div class='add'>+	starget-&gt;target_busy++;</div><div class='ctx'> 	spin_unlock(shost-&gt;host_lock);</div><div class='ctx'> 	spin_lock(sdev-&gt;request_queue-&gt;queue_lock);</div><div class='ctx'> </div><div class='del'>-	__scsi_done(cmd);</div><div class='add'>+	blk_complete_request(req);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void scsi_softirq_done(struct request *rq)</div><div class='ctx'> {</div><div class='del'>-	struct scsi_cmnd *cmd = rq-&gt;completion_data;</div><div class='del'>-	unsigned long wait_for = (cmd-&gt;allowed + 1) * cmd-&gt;timeout_per_command;</div><div class='add'>+	struct scsi_cmnd *cmd = rq-&gt;special;</div><div class='add'>+	unsigned long wait_for = (cmd-&gt;allowed + 1) * rq-&gt;timeout;</div><div class='ctx'> 	int disposition;</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;cmd-&gt;eh_entry);</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Set the serial numbers back to zero</div><div class='add'>+	 */</div><div class='add'>+	cmd-&gt;serial_number = 0;</div><div class='add'>+</div><div class='add'>+	atomic_inc(&amp;cmd-&gt;device-&gt;iodone_cnt);</div><div class='add'>+	if (cmd-&gt;result)</div><div class='add'>+		atomic_inc(&amp;cmd-&gt;device-&gt;ioerr_cnt);</div><div class='add'>+</div><div class='ctx'> 	disposition = scsi_decide_disposition(cmd);</div><div class='ctx'> 	if (disposition != SUCCESS &amp;&amp;</div><div class='ctx'> 	    time_before(cmd-&gt;jiffies_at_alloc + wait_for, jiffies)) {</div><div class='hunk'>@@ -1541,14 +1623,13 @@ static void scsi_request_fn(struct request_queue *q)</div><div class='ctx'> 			goto not_ready;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		if (!scsi_target_queue_ready(shost, sdev))</div><div class='add'>+			goto not_ready;</div><div class='add'>+</div><div class='ctx'> 		if (!scsi_host_queue_ready(q, shost, sdev))</div><div class='ctx'> 			goto not_ready;</div><div class='del'>-		if (scsi_target(sdev)-&gt;single_lun) {</div><div class='del'>-			if (scsi_target(sdev)-&gt;starget_sdev_user &amp;&amp;</div><div class='del'>-			    scsi_target(sdev)-&gt;starget_sdev_user != sdev)</div><div class='del'>-				goto not_ready;</div><div class='del'>-			scsi_target(sdev)-&gt;starget_sdev_user = sdev;</div><div class='del'>-		}</div><div class='add'>+</div><div class='add'>+		scsi_target(sdev)-&gt;target_busy++;</div><div class='ctx'> 		shost-&gt;host_busy++;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='hunk'>@@ -1675,6 +1756,7 @@ struct request_queue *scsi_alloc_queue(struct scsi_device *sdev)</div><div class='ctx'> </div><div class='ctx'> 	blk_queue_prep_rq(q, scsi_prep_fn);</div><div class='ctx'> 	blk_queue_softirq_done(q, scsi_softirq_done);</div><div class='add'>+	blk_queue_rq_timed_out(q, scsi_times_out);</div><div class='ctx'> 	return q;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2064,10 +2146,13 @@ scsi_device_set_state(struct scsi_device *sdev, enum scsi_device_state state)</div><div class='ctx'> </div><div class='ctx'> 	switch (state) {</div><div class='ctx'> 	case SDEV_CREATED:</div><div class='del'>-		/* There are no legal states that come back to</div><div class='del'>-		 * created.  This is the manually initialised start</div><div class='del'>-		 * state */</div><div class='del'>-		goto illegal;</div><div class='add'>+		switch (oldstate) {</div><div class='add'>+		case SDEV_CREATED_BLOCK:</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			goto illegal;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='ctx'> 			</div><div class='ctx'> 	case SDEV_RUNNING:</div><div class='ctx'> 		switch (oldstate) {</div><div class='hunk'>@@ -2105,8 +2190,17 @@ scsi_device_set_state(struct scsi_device *sdev, enum scsi_device_state state)</div><div class='ctx'> </div><div class='ctx'> 	case SDEV_BLOCK:</div><div class='ctx'> 		switch (oldstate) {</div><div class='del'>-		case SDEV_CREATED:</div><div class='ctx'> 		case SDEV_RUNNING:</div><div class='add'>+		case SDEV_CREATED_BLOCK:</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			goto illegal;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case SDEV_CREATED_BLOCK:</div><div class='add'>+		switch (oldstate) {</div><div class='add'>+		case SDEV_CREATED:</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			goto illegal;</div><div class='hunk'>@@ -2394,8 +2488,12 @@ scsi_internal_device_block(struct scsi_device *sdev)</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	err = scsi_device_set_state(sdev, SDEV_BLOCK);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='add'>+	if (err) {</div><div class='add'>+		err = scsi_device_set_state(sdev, SDEV_CREATED_BLOCK);</div><div class='add'>+</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* </div><div class='ctx'> 	 * The device has transitioned to SDEV_BLOCK.  Stop the</div><div class='hunk'>@@ -2438,8 +2536,12 @@ scsi_internal_device_unblock(struct scsi_device *sdev)</div><div class='ctx'> 	 * and goose the device queue if successful.  </div><div class='ctx'> 	 */</div><div class='ctx'> 	err = scsi_device_set_state(sdev, SDEV_RUNNING);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='add'>+	if (err) {</div><div class='add'>+		err = scsi_device_set_state(sdev, SDEV_CREATED);</div><div class='add'>+</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(q-&gt;queue_lock, flags);</div><div class='ctx'> 	blk_start_queue(q);</div><div class='head'>diff --git a/drivers/scsi/scsi_netlink.c b/drivers/scsi/scsi_netlink.c<br/>index ae7ed9a22662..b37e133de805 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/scsi_netlink.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/scsi_netlink.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/scsi_netlink.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/scsi_netlink.c</a></div><div class='hunk'>@@ -21,6 +21,7 @@</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='ctx'> #include &lt;linux/jiffies.h&gt;</div><div class='ctx'> #include &lt;linux/security.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;net/sock.h&gt;</div><div class='ctx'> #include &lt;net/netlink.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -30,6 +31,39 @@</div><div class='ctx'> struct sock *scsi_nl_sock = NULL;</div><div class='ctx'> EXPORT_SYMBOL_GPL(scsi_nl_sock);</div><div class='ctx'> </div><div class='add'>+static DEFINE_SPINLOCK(scsi_nl_lock);</div><div class='add'>+static struct list_head scsi_nl_drivers;</div><div class='add'>+</div><div class='add'>+static u32	scsi_nl_state;</div><div class='add'>+#define STATE_EHANDLER_BSY		0x00000001</div><div class='add'>+</div><div class='add'>+struct scsi_nl_transport {</div><div class='add'>+	int (*msg_handler)(struct sk_buff *);</div><div class='add'>+	void (*event_handler)(struct notifier_block *, unsigned long, void *);</div><div class='add'>+	unsigned int refcnt;</div><div class='add'>+	int flags;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* flags values (bit flags) */</div><div class='add'>+#define HANDLER_DELETING		0x1</div><div class='add'>+</div><div class='add'>+static struct scsi_nl_transport transports[SCSI_NL_MAX_TRANSPORTS] =</div><div class='add'>+	{ {NULL, }, };</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+struct scsi_nl_drvr {</div><div class='add'>+	struct list_head next;</div><div class='add'>+	int (*dmsg_handler)(struct Scsi_Host *shost, void *payload,</div><div class='add'>+				 u32 len, u32 pid);</div><div class='add'>+	void (*devt_handler)(struct notifier_block *nb,</div><div class='add'>+				 unsigned long event, void *notify_ptr);</div><div class='add'>+	struct scsi_host_template *hostt;</div><div class='add'>+	u64 vendor_id;</div><div class='add'>+	unsigned int refcnt;</div><div class='add'>+	int flags;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * scsi_nl_rcv_msg - Receive message handler.</div><div class='hunk'>@@ -45,8 +79,9 @@ scsi_nl_rcv_msg(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct nlmsghdr *nlh;</div><div class='ctx'> 	struct scsi_nl_hdr *hdr;</div><div class='del'>-	uint32_t rlen;</div><div class='del'>-	int err;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u32 rlen;</div><div class='add'>+	int err, tport;</div><div class='ctx'> </div><div class='ctx'> 	while (skb-&gt;len &gt;= NLMSG_SPACE(0)) {</div><div class='ctx'> 		err = 0;</div><div class='hunk'>@@ -65,7 +100,7 @@ scsi_nl_rcv_msg(struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 		if (nlh-&gt;nlmsg_type != SCSI_TRANSPORT_MSG) {</div><div class='ctx'> 			err = -EBADMSG;</div><div class='del'>-			return;</div><div class='add'>+			goto next_msg;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		hdr = NLMSG_DATA(nlh);</div><div class='hunk'>@@ -83,12 +118,27 @@ scsi_nl_rcv_msg(struct sk_buff *skb)</div><div class='ctx'> 		if (nlh-&gt;nlmsg_len &lt; (sizeof(*nlh) + hdr-&gt;msglen)) {</div><div class='ctx'> 			printk(KERN_WARNING "%s: discarding partial message\n",</div><div class='ctx'> 				 __func__);</div><div class='del'>-			return;</div><div class='add'>+			goto next_msg;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='del'>-		 * We currently don't support anyone sending us a message</div><div class='add'>+		 * Deliver message to the appropriate transport</div><div class='ctx'> 		 */</div><div class='add'>+		spin_lock_irqsave(&amp;scsi_nl_lock, flags);</div><div class='add'>+</div><div class='add'>+		tport = hdr-&gt;transport;</div><div class='add'>+		if ((tport &lt; SCSI_NL_MAX_TRANSPORTS) &amp;&amp;</div><div class='add'>+		    !(transports[tport].flags &amp; HANDLER_DELETING) &amp;&amp;</div><div class='add'>+		    (transports[tport].msg_handler)) {</div><div class='add'>+			transports[tport].refcnt++;</div><div class='add'>+			spin_unlock_irqrestore(&amp;scsi_nl_lock, flags);</div><div class='add'>+			err = transports[tport].msg_handler(skb);</div><div class='add'>+			spin_lock_irqsave(&amp;scsi_nl_lock, flags);</div><div class='add'>+			transports[tport].refcnt--;</div><div class='add'>+		} else</div><div class='add'>+			err = -ENOENT;</div><div class='add'>+</div><div class='add'>+		spin_unlock_irqrestore(&amp;scsi_nl_lock, flags);</div><div class='ctx'> </div><div class='ctx'> next_msg:</div><div class='ctx'> 		if ((err) || (nlh-&gt;nlmsg_flags &amp; NLM_F_ACK))</div><div class='hunk'>@@ -110,14 +160,42 @@ static int</div><div class='ctx'> scsi_nl_rcv_event(struct notifier_block *this, unsigned long event, void *ptr)</div><div class='ctx'> {</div><div class='ctx'> 	struct netlink_notify *n = ptr;</div><div class='add'>+	struct scsi_nl_drvr *driver;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int tport;</div><div class='ctx'> </div><div class='ctx'> 	if (n-&gt;protocol != NETLINK_SCSITRANSPORT)</div><div class='ctx'> 		return NOTIFY_DONE;</div><div class='ctx'> </div><div class='add'>+	spin_lock_irqsave(&amp;scsi_nl_lock, flags);</div><div class='add'>+	scsi_nl_state |= STATE_EHANDLER_BSY;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='del'>-	 * Currently, we are not tracking PID's, etc. There is nothing</div><div class='del'>-	 * to handle.</div><div class='add'>+	 * Pass event on to any transports that may be listening</div><div class='ctx'> 	 */</div><div class='add'>+	for (tport = 0; tport &lt; SCSI_NL_MAX_TRANSPORTS; tport++) {</div><div class='add'>+		if (!(transports[tport].flags &amp; HANDLER_DELETING) &amp;&amp;</div><div class='add'>+		    (transports[tport].event_handler)) {</div><div class='add'>+			spin_unlock_irqrestore(&amp;scsi_nl_lock, flags);</div><div class='add'>+			transports[tport].event_handler(this, event, ptr);</div><div class='add'>+			spin_lock_irqsave(&amp;scsi_nl_lock, flags);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Pass event on to any drivers that may be listening</div><div class='add'>+	 */</div><div class='add'>+	list_for_each_entry(driver, &amp;scsi_nl_drivers, next) {</div><div class='add'>+		if (!(driver-&gt;flags &amp; HANDLER_DELETING) &amp;&amp;</div><div class='add'>+		    (driver-&gt;devt_handler)) {</div><div class='add'>+			spin_unlock_irqrestore(&amp;scsi_nl_lock, flags);</div><div class='add'>+			driver-&gt;devt_handler(this, event, ptr);</div><div class='add'>+			spin_lock_irqsave(&amp;scsi_nl_lock, flags);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	scsi_nl_state &amp;= ~STATE_EHANDLER_BSY;</div><div class='add'>+	spin_unlock_irqrestore(&amp;scsi_nl_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	return NOTIFY_DONE;</div><div class='ctx'> }</div><div class='hunk'>@@ -128,7 +206,281 @@ static struct notifier_block scsi_netlink_notifier = {</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * scsi_netlink_init - Called by SCSI subsystem to intialize the SCSI transport netlink interface</div><div class='add'>+ * GENERIC SCSI transport receive and event handlers</div><div class='add'>+ **/</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * scsi_generic_msg_handler - receive message handler for GENERIC transport</div><div class='add'>+ * 			 messages</div><div class='add'>+ *</div><div class='add'>+ * @skb:		socket receive buffer</div><div class='add'>+ *</div><div class='add'>+ **/</div><div class='add'>+static int</div><div class='add'>+scsi_generic_msg_handler(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct nlmsghdr *nlh = nlmsg_hdr(skb);</div><div class='add'>+	struct scsi_nl_hdr *snlh = NLMSG_DATA(nlh);</div><div class='add'>+	struct scsi_nl_drvr *driver;</div><div class='add'>+	struct Scsi_Host *shost;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int err = 0, match, pid;</div><div class='add'>+</div><div class='add'>+	pid = NETLINK_CREDS(skb)-&gt;pid;</div><div class='add'>+</div><div class='add'>+	switch (snlh-&gt;msgtype) {</div><div class='add'>+	case SCSI_NL_SHOST_VENDOR:</div><div class='add'>+		{</div><div class='add'>+		struct scsi_nl_host_vendor_msg *msg = NLMSG_DATA(nlh);</div><div class='add'>+</div><div class='add'>+		/* Locate the driver that corresponds to the message */</div><div class='add'>+		spin_lock_irqsave(&amp;scsi_nl_lock, flags);</div><div class='add'>+		match = 0;</div><div class='add'>+		list_for_each_entry(driver, &amp;scsi_nl_drivers, next) {</div><div class='add'>+			if (driver-&gt;vendor_id == msg-&gt;vendor_id) {</div><div class='add'>+				match = 1;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if ((!match) || (!driver-&gt;dmsg_handler)) {</div><div class='add'>+			spin_unlock_irqrestore(&amp;scsi_nl_lock, flags);</div><div class='add'>+			err = -ESRCH;</div><div class='add'>+			goto rcv_exit;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (driver-&gt;flags &amp; HANDLER_DELETING) {</div><div class='add'>+			spin_unlock_irqrestore(&amp;scsi_nl_lock, flags);</div><div class='add'>+			err = -ESHUTDOWN;</div><div class='add'>+			goto rcv_exit;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		driver-&gt;refcnt++;</div><div class='add'>+		spin_unlock_irqrestore(&amp;scsi_nl_lock, flags);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+		/* if successful, scsi_host_lookup takes a shost reference */</div><div class='add'>+		shost = scsi_host_lookup(msg-&gt;host_no);</div><div class='add'>+		if (!shost) {</div><div class='add'>+			err = -ENODEV;</div><div class='add'>+			goto driver_exit;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* is this host owned by the vendor ? */</div><div class='add'>+		if (shost-&gt;hostt != driver-&gt;hostt) {</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			goto vendormsg_put;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* pass message on to the driver */</div><div class='add'>+		err = driver-&gt;dmsg_handler(shost, (void *)&amp;msg[1],</div><div class='add'>+					 msg-&gt;vmsg_datalen, pid);</div><div class='add'>+</div><div class='add'>+vendormsg_put:</div><div class='add'>+		/* release reference by scsi_host_lookup */</div><div class='add'>+		scsi_host_put(shost);</div><div class='add'>+</div><div class='add'>+driver_exit:</div><div class='add'>+		/* release our own reference on the registration object */</div><div class='add'>+		spin_lock_irqsave(&amp;scsi_nl_lock, flags);</div><div class='add'>+		driver-&gt;refcnt--;</div><div class='add'>+		spin_unlock_irqrestore(&amp;scsi_nl_lock, flags);</div><div class='add'>+		break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		err = -EBADR;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+rcv_exit:</div><div class='add'>+	if (err)</div><div class='add'>+		printk(KERN_WARNING "%s: Msgtype %d failed - err %d\n",</div><div class='add'>+			 __func__, snlh-&gt;msgtype, err);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * scsi_nl_add_transport -</div><div class='add'>+ *    Registers message and event handlers for a transport. Enables</div><div class='add'>+ *    receipt of netlink messages and events to a transport.</div><div class='add'>+ *</div><div class='add'>+ * @tport:		transport registering handlers</div><div class='add'>+ * @msg_handler:	receive message handler callback</div><div class='add'>+ * @event_handler:	receive event handler callback</div><div class='add'>+ **/</div><div class='add'>+int</div><div class='add'>+scsi_nl_add_transport(u8 tport,</div><div class='add'>+	int (*msg_handler)(struct sk_buff *),</div><div class='add'>+	void (*event_handler)(struct notifier_block *, unsigned long, void *))</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (tport &gt;= SCSI_NL_MAX_TRANSPORTS)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;scsi_nl_lock, flags);</div><div class='add'>+</div><div class='add'>+	if (scsi_nl_state &amp; STATE_EHANDLER_BSY) {</div><div class='add'>+		spin_unlock_irqrestore(&amp;scsi_nl_lock, flags);</div><div class='add'>+		msleep(1);</div><div class='add'>+		spin_lock_irqsave(&amp;scsi_nl_lock, flags);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (transports[tport].msg_handler || transports[tport].event_handler) {</div><div class='add'>+		err = -EALREADY;</div><div class='add'>+		goto register_out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	transports[tport].msg_handler = msg_handler;</div><div class='add'>+	transports[tport].event_handler = event_handler;</div><div class='add'>+	transports[tport].flags = 0;</div><div class='add'>+	transports[tport].refcnt = 0;</div><div class='add'>+</div><div class='add'>+register_out:</div><div class='add'>+	spin_unlock_irqrestore(&amp;scsi_nl_lock, flags);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(scsi_nl_add_transport);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * scsi_nl_remove_transport -</div><div class='add'>+ *    Disable transport receiption of messages and events</div><div class='add'>+ *</div><div class='add'>+ * @tport:		transport deregistering handlers</div><div class='add'>+ *</div><div class='add'>+ **/</div><div class='add'>+void</div><div class='add'>+scsi_nl_remove_transport(u8 tport)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;scsi_nl_lock, flags);</div><div class='add'>+	if (scsi_nl_state &amp; STATE_EHANDLER_BSY) {</div><div class='add'>+		spin_unlock_irqrestore(&amp;scsi_nl_lock, flags);</div><div class='add'>+		msleep(1);</div><div class='add'>+		spin_lock_irqsave(&amp;scsi_nl_lock, flags);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tport &lt; SCSI_NL_MAX_TRANSPORTS) {</div><div class='add'>+		transports[tport].flags |= HANDLER_DELETING;</div><div class='add'>+</div><div class='add'>+		while (transports[tport].refcnt != 0) {</div><div class='add'>+			spin_unlock_irqrestore(&amp;scsi_nl_lock, flags);</div><div class='add'>+			schedule_timeout_uninterruptible(HZ/4);</div><div class='add'>+			spin_lock_irqsave(&amp;scsi_nl_lock, flags);</div><div class='add'>+		}</div><div class='add'>+		transports[tport].msg_handler = NULL;</div><div class='add'>+		transports[tport].event_handler = NULL;</div><div class='add'>+		transports[tport].flags = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;scsi_nl_lock, flags);</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(scsi_nl_remove_transport);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * scsi_nl_add_driver -</div><div class='add'>+ *    A driver is registering its interfaces for SCSI netlink messages</div><div class='add'>+ *</div><div class='add'>+ * @vendor_id:          A unique identification value for the driver.</div><div class='add'>+ * @hostt:		address of the driver's host template. Used</div><div class='add'>+ *			to verify an shost is bound to the driver</div><div class='add'>+ * @nlmsg_handler:	receive message handler callback</div><div class='add'>+ * @nlevt_handler:	receive event handler callback</div><div class='add'>+ *</div><div class='add'>+ * Returns:</div><div class='add'>+ *   0 on Success</div><div class='add'>+ *   error result otherwise</div><div class='add'>+ **/</div><div class='add'>+int</div><div class='add'>+scsi_nl_add_driver(u64 vendor_id, struct scsi_host_template *hostt,</div><div class='add'>+	int (*nlmsg_handler)(struct Scsi_Host *shost, void *payload,</div><div class='add'>+				 u32 len, u32 pid),</div><div class='add'>+	void (*nlevt_handler)(struct notifier_block *nb,</div><div class='add'>+				 unsigned long event, void *notify_ptr))</div><div class='add'>+{</div><div class='add'>+	struct scsi_nl_drvr *driver;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	driver = kzalloc(sizeof(*driver), GFP_KERNEL);</div><div class='add'>+	if (unlikely(!driver)) {</div><div class='add'>+		printk(KERN_ERR "%s: allocation failure\n", __func__);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	driver-&gt;dmsg_handler = nlmsg_handler;</div><div class='add'>+	driver-&gt;devt_handler = nlevt_handler;</div><div class='add'>+	driver-&gt;hostt = hostt;</div><div class='add'>+	driver-&gt;vendor_id = vendor_id;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;scsi_nl_lock, flags);</div><div class='add'>+	if (scsi_nl_state &amp; STATE_EHANDLER_BSY) {</div><div class='add'>+		spin_unlock_irqrestore(&amp;scsi_nl_lock, flags);</div><div class='add'>+		msleep(1);</div><div class='add'>+		spin_lock_irqsave(&amp;scsi_nl_lock, flags);</div><div class='add'>+	}</div><div class='add'>+	list_add_tail(&amp;driver-&gt;next, &amp;scsi_nl_drivers);</div><div class='add'>+	spin_unlock_irqrestore(&amp;scsi_nl_lock, flags);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(scsi_nl_add_driver);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * scsi_nl_remove_driver -</div><div class='add'>+ *    An driver is unregistering with the SCSI netlink messages</div><div class='add'>+ *</div><div class='add'>+ * @vendor_id:          The unique identification value for the driver.</div><div class='add'>+ **/</div><div class='add'>+void</div><div class='add'>+scsi_nl_remove_driver(u64 vendor_id)</div><div class='add'>+{</div><div class='add'>+	struct scsi_nl_drvr *driver;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;scsi_nl_lock, flags);</div><div class='add'>+	if (scsi_nl_state &amp; STATE_EHANDLER_BSY) {</div><div class='add'>+		spin_unlock_irqrestore(&amp;scsi_nl_lock, flags);</div><div class='add'>+		msleep(1);</div><div class='add'>+		spin_lock_irqsave(&amp;scsi_nl_lock, flags);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(driver, &amp;scsi_nl_drivers, next) {</div><div class='add'>+		if (driver-&gt;vendor_id == vendor_id) {</div><div class='add'>+			driver-&gt;flags |= HANDLER_DELETING;</div><div class='add'>+			while (driver-&gt;refcnt != 0) {</div><div class='add'>+				spin_unlock_irqrestore(&amp;scsi_nl_lock, flags);</div><div class='add'>+				schedule_timeout_uninterruptible(HZ/4);</div><div class='add'>+				spin_lock_irqsave(&amp;scsi_nl_lock, flags);</div><div class='add'>+			}</div><div class='add'>+			list_del(&amp;driver-&gt;next);</div><div class='add'>+			kfree(driver);</div><div class='add'>+			spin_unlock_irqrestore(&amp;scsi_nl_lock, flags);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;scsi_nl_lock, flags);</div><div class='add'>+</div><div class='add'>+	printk(KERN_ERR "%s: removal of driver failed - vendor_id 0x%llx\n",</div><div class='add'>+	       __func__, (unsigned long long)vendor_id);</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(scsi_nl_remove_driver);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * scsi_netlink_init - Called by SCSI subsystem to intialize</div><div class='add'>+ * 	the SCSI transport netlink interface</div><div class='ctx'>  *</div><div class='ctx'>  **/</div><div class='ctx'> void</div><div class='hunk'>@@ -136,6 +488,8 @@ scsi_netlink_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='add'>+	INIT_LIST_HEAD(&amp;scsi_nl_drivers);</div><div class='add'>+</div><div class='ctx'> 	error = netlink_register_notifier(&amp;scsi_netlink_notifier);</div><div class='ctx'> 	if (error) {</div><div class='ctx'> 		printk(KERN_ERR "%s: register of event handler failed - %d\n",</div><div class='hunk'>@@ -150,8 +504,15 @@ scsi_netlink_init(void)</div><div class='ctx'> 		printk(KERN_ERR "%s: register of recieve handler failed\n",</div><div class='ctx'> 				__func__);</div><div class='ctx'> 		netlink_unregister_notifier(&amp;scsi_netlink_notifier);</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Register the entry points for the generic SCSI transport */</div><div class='add'>+	error = scsi_nl_add_transport(SCSI_NL_TRANSPORT,</div><div class='add'>+				scsi_generic_msg_handler, NULL);</div><div class='add'>+	if (error)</div><div class='add'>+		printk(KERN_ERR "%s: register of GENERIC transport handler"</div><div class='add'>+				"  failed - %d\n", __func__, error);</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -163,6 +524,8 @@ scsi_netlink_init(void)</div><div class='ctx'> void</div><div class='ctx'> scsi_netlink_exit(void)</div><div class='ctx'> {</div><div class='add'>+	scsi_nl_remove_transport(SCSI_NL_TRANSPORT);</div><div class='add'>+</div><div class='ctx'> 	if (scsi_nl_sock) {</div><div class='ctx'> 		netlink_kernel_release(scsi_nl_sock);</div><div class='ctx'> 		netlink_unregister_notifier(&amp;scsi_netlink_notifier);</div><div class='hunk'>@@ -172,3 +535,147 @@ scsi_netlink_exit(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Exported Interfaces</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * scsi_nl_send_transport_msg -</div><div class='add'>+ *    Generic function to send a single message from a SCSI transport to</div><div class='add'>+ *    a single process</div><div class='add'>+ *</div><div class='add'>+ * @pid:		receiving pid</div><div class='add'>+ * @hdr:		message payload</div><div class='add'>+ *</div><div class='add'>+ **/</div><div class='add'>+void</div><div class='add'>+scsi_nl_send_transport_msg(u32 pid, struct scsi_nl_hdr *hdr)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct nlmsghdr	*nlh;</div><div class='add'>+	const char *fn;</div><div class='add'>+	char *datab;</div><div class='add'>+	u32 len, skblen;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!scsi_nl_sock) {</div><div class='add'>+		err = -ENOENT;</div><div class='add'>+		fn = "netlink socket";</div><div class='add'>+		goto msg_fail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	len = NLMSG_SPACE(hdr-&gt;msglen);</div><div class='add'>+	skblen = NLMSG_SPACE(len);</div><div class='add'>+</div><div class='add'>+	skb = alloc_skb(skblen, GFP_KERNEL);</div><div class='add'>+	if (!skb) {</div><div class='add'>+		err = -ENOBUFS;</div><div class='add'>+		fn = "alloc_skb";</div><div class='add'>+		goto msg_fail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nlh = nlmsg_put(skb, pid, 0, SCSI_TRANSPORT_MSG, len - sizeof(*nlh), 0);</div><div class='add'>+	if (!nlh) {</div><div class='add'>+		err = -ENOBUFS;</div><div class='add'>+		fn = "nlmsg_put";</div><div class='add'>+		goto msg_fail_skb;</div><div class='add'>+	}</div><div class='add'>+	datab = NLMSG_DATA(nlh);</div><div class='add'>+	memcpy(datab, hdr, hdr-&gt;msglen);</div><div class='add'>+</div><div class='add'>+	err = nlmsg_unicast(scsi_nl_sock, skb, pid);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		fn = "nlmsg_unicast";</div><div class='add'>+		/* nlmsg_unicast already kfree_skb'd */</div><div class='add'>+		goto msg_fail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+msg_fail_skb:</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+msg_fail:</div><div class='add'>+	printk(KERN_WARNING</div><div class='add'>+		"%s: Dropped Message : pid %d Transport %d, msgtype x%x, "</div><div class='add'>+		"msglen %d: %s : err %d\n",</div><div class='add'>+		__func__, pid, hdr-&gt;transport, hdr-&gt;msgtype, hdr-&gt;msglen,</div><div class='add'>+		fn, err);</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(scsi_nl_send_transport_msg);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * scsi_nl_send_vendor_msg - called to send a shost vendor unique message</div><div class='add'>+ *                      to a specific process id.</div><div class='add'>+ *</div><div class='add'>+ * @pid:		process id of the receiver</div><div class='add'>+ * @host_no:		host # sending the message</div><div class='add'>+ * @vendor_id:		unique identifier for the driver's vendor</div><div class='add'>+ * @data_len:		amount, in bytes, of vendor unique payload data</div><div class='add'>+ * @data_buf:		pointer to vendor unique data buffer</div><div class='add'>+ *</div><div class='add'>+ * Returns:</div><div class='add'>+ *   0 on succesful return</div><div class='add'>+ *   otherwise, failing error code</div><div class='add'>+ *</div><div class='add'>+ * Notes:</div><div class='add'>+ *	This routine assumes no locks are held on entry.</div><div class='add'>+ */</div><div class='add'>+int</div><div class='add'>+scsi_nl_send_vendor_msg(u32 pid, unsigned short host_no, u64 vendor_id,</div><div class='add'>+			 char *data_buf, u32 data_len)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct nlmsghdr	*nlh;</div><div class='add'>+	struct scsi_nl_host_vendor_msg *msg;</div><div class='add'>+	u32 len, skblen;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!scsi_nl_sock) {</div><div class='add'>+		err = -ENOENT;</div><div class='add'>+		goto send_vendor_fail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	len = SCSI_NL_MSGALIGN(sizeof(*msg) + data_len);</div><div class='add'>+	skblen = NLMSG_SPACE(len);</div><div class='add'>+</div><div class='add'>+	skb = alloc_skb(skblen, GFP_KERNEL);</div><div class='add'>+	if (!skb) {</div><div class='add'>+		err = -ENOBUFS;</div><div class='add'>+		goto send_vendor_fail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nlh = nlmsg_put(skb, 0, 0, SCSI_TRANSPORT_MSG,</div><div class='add'>+				skblen - sizeof(*nlh), 0);</div><div class='add'>+	if (!nlh) {</div><div class='add'>+		err = -ENOBUFS;</div><div class='add'>+		goto send_vendor_fail_skb;</div><div class='add'>+	}</div><div class='add'>+	msg = NLMSG_DATA(nlh);</div><div class='add'>+</div><div class='add'>+	INIT_SCSI_NL_HDR(&amp;msg-&gt;snlh, SCSI_NL_TRANSPORT,</div><div class='add'>+				SCSI_NL_SHOST_VENDOR, len);</div><div class='add'>+	msg-&gt;vendor_id = vendor_id;</div><div class='add'>+	msg-&gt;host_no = host_no;</div><div class='add'>+	msg-&gt;vmsg_datalen = data_len;	/* bytes */</div><div class='add'>+	memcpy(&amp;msg[1], data_buf, data_len);</div><div class='add'>+</div><div class='add'>+	err = nlmsg_unicast(scsi_nl_sock, skb, pid);</div><div class='add'>+	if (err)</div><div class='add'>+		/* nlmsg_multicast already kfree_skb'd */</div><div class='add'>+		goto send_vendor_fail;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+send_vendor_fail_skb:</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+send_vendor_fail:</div><div class='add'>+	printk(KERN_WARNING</div><div class='add'>+		"%s: Dropped SCSI Msg : host %d vendor_unique - err %d\n",</div><div class='add'>+		__func__, host_no, err);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(scsi_nl_send_vendor_msg);</div><div class='add'>+</div><div class='add'>+</div><div class='head'>diff --git a/drivers/scsi/scsi_priv.h b/drivers/scsi/scsi_priv.h<br/>index 79f0f7511204..e1850904ff73 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/scsi_priv.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/scsi_priv.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/scsi_priv.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/scsi_priv.h</a></div><div class='hunk'>@@ -4,6 +4,7 @@</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct request_queue;</div><div class='add'>+struct request;</div><div class='ctx'> struct scsi_cmnd;</div><div class='ctx'> struct scsi_device;</div><div class='ctx'> struct scsi_host_template;</div><div class='hunk'>@@ -27,7 +28,6 @@ extern void scsi_exit_hosts(void);</div><div class='ctx'> extern int scsi_dispatch_cmd(struct scsi_cmnd *cmd);</div><div class='ctx'> extern int scsi_setup_command_freelist(struct Scsi_Host *shost);</div><div class='ctx'> extern void scsi_destroy_command_freelist(struct Scsi_Host *shost);</div><div class='del'>-extern void __scsi_done(struct scsi_cmnd *cmd);</div><div class='ctx'> #ifdef CONFIG_SCSI_LOGGING</div><div class='ctx'> void scsi_log_send(struct scsi_cmnd *cmd);</div><div class='ctx'> void scsi_log_completion(struct scsi_cmnd *cmd, int disposition);</div><div class='hunk'>@@ -49,10 +49,7 @@ extern int __init scsi_init_devinfo(void);</div><div class='ctx'> extern void scsi_exit_devinfo(void);</div><div class='ctx'> </div><div class='ctx'> /* scsi_error.c */</div><div class='del'>-extern void scsi_add_timer(struct scsi_cmnd *, int,</div><div class='del'>-		void (*)(struct scsi_cmnd *));</div><div class='del'>-extern int scsi_delete_timer(struct scsi_cmnd *);</div><div class='del'>-extern void scsi_times_out(struct scsi_cmnd *cmd);</div><div class='add'>+extern enum blk_eh_timer_return scsi_times_out(struct request *req);</div><div class='ctx'> extern int scsi_error_handler(void *host);</div><div class='ctx'> extern int scsi_decide_disposition(struct scsi_cmnd *cmd);</div><div class='ctx'> extern void scsi_eh_wakeup(struct Scsi_Host *shost);</div><div class='hunk'>@@ -62,6 +59,7 @@ void scsi_eh_ready_devs(struct Scsi_Host *shost,</div><div class='ctx'> 			struct list_head *done_q);</div><div class='ctx'> int scsi_eh_get_sense(struct list_head *work_q,</div><div class='ctx'> 		      struct list_head *done_q);</div><div class='add'>+int scsi_noretry_cmd(struct scsi_cmnd *scmd);</div><div class='ctx'> </div><div class='ctx'> /* scsi_lib.c */</div><div class='ctx'> extern int scsi_maybe_unblock_host(struct scsi_device *sdev);</div><div class='head'>diff --git a/drivers/scsi/scsi_proc.c b/drivers/scsi/scsi_proc.c<br/>index c6a904a45bf9..82f7b2dd08a2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/scsi_proc.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/scsi_proc.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/scsi_proc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/scsi_proc.c</a></div><div class='hunk'>@@ -259,8 +259,8 @@ static int scsi_add_single_device(uint host, uint channel, uint id, uint lun)</div><div class='ctx'> 	int error = -ENXIO;</div><div class='ctx'> </div><div class='ctx'> 	shost = scsi_host_lookup(host);</div><div class='del'>-	if (IS_ERR(shost))</div><div class='del'>-		return PTR_ERR(shost);</div><div class='add'>+	if (!shost)</div><div class='add'>+		return error;</div><div class='ctx'> </div><div class='ctx'> 	if (shost-&gt;transportt-&gt;user_scan)</div><div class='ctx'> 		error = shost-&gt;transportt-&gt;user_scan(shost, channel, id, lun);</div><div class='hunk'>@@ -287,8 +287,8 @@ static int scsi_remove_single_device(uint host, uint channel, uint id, uint lun)</div><div class='ctx'> 	int error = -ENXIO;</div><div class='ctx'> </div><div class='ctx'> 	shost = scsi_host_lookup(host);</div><div class='del'>-	if (IS_ERR(shost))</div><div class='del'>-		return PTR_ERR(shost);</div><div class='add'>+	if (!shost)</div><div class='add'>+		return error;</div><div class='ctx'> 	sdev = scsi_device_lookup(shost, channel, id, lun);</div><div class='ctx'> 	if (sdev) {</div><div class='ctx'> 		scsi_remove_device(sdev);</div><div class='head'>diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c<br/>index 34d0de6cd511..b14dc02c3ded 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/scsi_scan.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/scsi_scan.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/scsi_scan.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/scsi_scan.c</a></div><div class='hunk'>@@ -419,6 +419,7 @@ static struct scsi_target *scsi_alloc_target(struct device *parent,</div><div class='ctx'> 	dev-&gt;type = &amp;scsi_target_type;</div><div class='ctx'> 	starget-&gt;id = id;</div><div class='ctx'> 	starget-&gt;channel = channel;</div><div class='add'>+	starget-&gt;can_queue = 0;</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;starget-&gt;siblings);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;starget-&gt;devices);</div><div class='ctx'> 	starget-&gt;state = STARGET_CREATED;</div><div class='hunk'>@@ -730,6 +731,8 @@ static int scsi_probe_lun(struct scsi_device *sdev, unsigned char *inq_result,</div><div class='ctx'> static int scsi_add_lun(struct scsi_device *sdev, unsigned char *inq_result,</div><div class='ctx'> 		int *bflags, int async)</div><div class='ctx'> {</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * XXX do not save the inquiry, since it can change underneath us,</div><div class='ctx'> 	 * save just vendor/model/rev.</div><div class='hunk'>@@ -885,7 +888,17 @@ static int scsi_add_lun(struct scsi_device *sdev, unsigned char *inq_result,</div><div class='ctx'> </div><div class='ctx'> 	/* set the device running here so that slave configure</div><div class='ctx'> 	 * may do I/O */</div><div class='del'>-	scsi_device_set_state(sdev, SDEV_RUNNING);</div><div class='add'>+	ret = scsi_device_set_state(sdev, SDEV_RUNNING);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ret = scsi_device_set_state(sdev, SDEV_BLOCK);</div><div class='add'>+</div><div class='add'>+		if (ret) {</div><div class='add'>+			sdev_printk(KERN_ERR, sdev,</div><div class='add'>+				    "in wrong state %s to complete scan\n",</div><div class='add'>+				    scsi_device_state_name(sdev-&gt;sdev_state));</div><div class='add'>+			return SCSI_SCAN_NO_RESPONSE;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (*bflags &amp; BLIST_MS_192_BYTES_FOR_3F)</div><div class='ctx'> 		sdev-&gt;use_192_bytes_for_3f = 1;</div><div class='hunk'>@@ -899,7 +912,7 @@ static int scsi_add_lun(struct scsi_device *sdev, unsigned char *inq_result,</div><div class='ctx'> 	transport_configure_device(&amp;sdev-&gt;sdev_gendev);</div><div class='ctx'> </div><div class='ctx'> 	if (sdev-&gt;host-&gt;hostt-&gt;slave_configure) {</div><div class='del'>-		int ret = sdev-&gt;host-&gt;hostt-&gt;slave_configure(sdev);</div><div class='add'>+		ret = sdev-&gt;host-&gt;hostt-&gt;slave_configure(sdev);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * if LLDD reports slave not present, don't clutter</div><div class='hunk'>@@ -994,7 +1007,7 @@ static int scsi_probe_and_add_lun(struct scsi_target *starget,</div><div class='ctx'> 	 */</div><div class='ctx'> 	sdev = scsi_device_lookup_by_target(starget, lun);</div><div class='ctx'> 	if (sdev) {</div><div class='del'>-		if (rescan || sdev-&gt;sdev_state != SDEV_CREATED) {</div><div class='add'>+		if (rescan || !scsi_device_created(sdev)) {</div><div class='ctx'> 			SCSI_LOG_SCAN_BUS(3, printk(KERN_INFO</div><div class='ctx'> 				"scsi scan: device exists on %s\n",</div><div class='ctx'> 				sdev-&gt;sdev_gendev.bus_id));</div><div class='hunk'>@@ -1467,7 +1480,7 @@ static int scsi_report_lun_scan(struct scsi_target *starget, int bflags,</div><div class='ctx'> 	kfree(lun_data);</div><div class='ctx'>  out:</div><div class='ctx'> 	scsi_device_put(sdev);</div><div class='del'>-	if (sdev-&gt;sdev_state == SDEV_CREATED)</div><div class='add'>+	if (scsi_device_created(sdev))</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * the sdev we used didn't appear in the report luns scan</div><div class='ctx'> 		 */</div><div class='head'>diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c<br/>index ab3c71869be5..93c28f30bbd7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/scsi_sysfs.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/scsi_sysfs.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/scsi_sysfs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/scsi_sysfs.c</a></div><div class='hunk'>@@ -34,6 +34,7 @@ static const struct {</div><div class='ctx'> 	{ SDEV_QUIESCE, "quiesce" },</div><div class='ctx'> 	{ SDEV_OFFLINE,	"offline" },</div><div class='ctx'> 	{ SDEV_BLOCK,	"blocked" },</div><div class='add'>+	{ SDEV_CREATED_BLOCK, "created-blocked" },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> const char *scsi_device_state_name(enum scsi_device_state state)</div><div class='hunk'>@@ -560,12 +561,15 @@ sdev_rd_attr (vendor, "%.8s\n");</div><div class='ctx'> sdev_rd_attr (model, "%.16s\n");</div><div class='ctx'> sdev_rd_attr (rev, "%.4s\n");</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * TODO: can we make these symlinks to the block layer ones?</div><div class='add'>+ */</div><div class='ctx'> static ssize_t</div><div class='ctx'> sdev_show_timeout (struct device *dev, struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct scsi_device *sdev;</div><div class='ctx'> 	sdev = to_scsi_device(dev);</div><div class='del'>-	return snprintf (buf, 20, "%d\n", sdev-&gt;timeout / HZ);</div><div class='add'>+	return snprintf(buf, 20, "%d\n", sdev-&gt;request_queue-&gt;rq_timeout / HZ);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='hunk'>@@ -576,7 +580,7 @@ sdev_store_timeout (struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	int timeout;</div><div class='ctx'> 	sdev = to_scsi_device(dev);</div><div class='ctx'> 	sscanf (buf, "%d\n", &amp;timeout);</div><div class='del'>-	sdev-&gt;timeout = timeout * HZ;</div><div class='add'>+	blk_queue_rq_timeout(sdev-&gt;request_queue, timeout * HZ);</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> static DEVICE_ATTR(timeout, S_IRUGO | S_IWUSR, sdev_show_timeout, sdev_store_timeout);</div><div class='head'>diff --git a/drivers/scsi/scsi_tgt_lib.c b/drivers/scsi/scsi_tgt_lib.c<br/>index 257e097c39af..48ba413f7f6a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/scsi_tgt_lib.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/scsi_tgt_lib.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/scsi_tgt_lib.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/scsi_tgt_lib.c</a></div><div class='hunk'>@@ -362,7 +362,7 @@ static int scsi_map_user_pages(struct scsi_tgt_cmd *tcmd, struct scsi_cmnd *cmd,</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	dprintk("%lx %u\n", uaddr, len);</div><div class='del'>-	err = blk_rq_map_user(q, rq, (void *)uaddr, len);</div><div class='add'>+	err = blk_rq_map_user(q, rq, NULL, (void *)uaddr, len, GFP_KERNEL);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * TODO: need to fixup sg_tablesize, max_segment_size,</div><div class='hunk'>@@ -460,7 +460,7 @@ int scsi_tgt_kspace_exec(int host_no, u64 itn_id, int result, u64 tag,</div><div class='ctx'> </div><div class='ctx'> 	/* TODO: replace with a O(1) alg */</div><div class='ctx'> 	shost = scsi_host_lookup(host_no);</div><div class='del'>-	if (IS_ERR(shost)) {</div><div class='add'>+	if (!shost) {</div><div class='ctx'> 		printk(KERN_ERR "Could not find host no %d\n", host_no);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -550,7 +550,7 @@ int scsi_tgt_kspace_tsk_mgmt(int host_no, u64 itn_id, u64 mid, int result)</div><div class='ctx'> 	dprintk("%d %d %llx\n", host_no, result, (unsigned long long) mid);</div><div class='ctx'> </div><div class='ctx'> 	shost = scsi_host_lookup(host_no);</div><div class='del'>-	if (IS_ERR(shost)) {</div><div class='add'>+	if (!shost) {</div><div class='ctx'> 		printk(KERN_ERR "Could not find host no %d\n", host_no);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -603,7 +603,7 @@ int scsi_tgt_kspace_it_nexus_rsp(int host_no, u64 itn_id, int result)</div><div class='ctx'> 	dprintk("%d %d%llx\n", host_no, result, (unsigned long long)itn_id);</div><div class='ctx'> </div><div class='ctx'> 	shost = scsi_host_lookup(host_no);</div><div class='del'>-	if (IS_ERR(shost)) {</div><div class='add'>+	if (!shost) {</div><div class='ctx'> 		printk(KERN_ERR "Could not find host no %d\n", host_no);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c<br/>index 56823fd1fb84..1e71abf0607a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/scsi_transport_fc.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/scsi_transport_fc.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/scsi_transport_fc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/scsi_transport_fc.c</a></div><div class='hunk'>@@ -40,31 +40,7 @@</div><div class='ctx'> </div><div class='ctx'> static int fc_queue_work(struct Scsi_Host *, struct work_struct *);</div><div class='ctx'> static void fc_vport_sched_delete(struct work_struct *work);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This is a temporary carrier for creating a vport. It will eventually</div><div class='del'>- * be replaced  by a real message definition for sgio or netlink.</div><div class='del'>- *</div><div class='del'>- * fc_vport_identifiers: This set of data contains all elements</div><div class='del'>- * to uniquely identify and instantiate a FC virtual port.</div><div class='del'>- *</div><div class='del'>- * Notes:</div><div class='del'>- *   symbolic_name: The driver is to append the symbolic_name string data</div><div class='del'>- *      to the symbolic_node_name data that it generates by default.</div><div class='del'>- *      the resulting combination should then be registered with the switch.</div><div class='del'>- *      It is expected that things like Xen may stuff a VM title into</div><div class='del'>- *      this field.</div><div class='del'>- */</div><div class='del'>-struct fc_vport_identifiers {</div><div class='del'>-	u64 node_name;</div><div class='del'>-	u64 port_name;</div><div class='del'>-	u32 roles;</div><div class='del'>-	bool disable;</div><div class='del'>-	enum fc_port_type vport_type;	/* only FC_PORTTYPE_NPIV allowed */</div><div class='del'>-	char symbolic_name[FC_VPORT_SYMBOLIC_NAMELEN];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int fc_vport_create(struct Scsi_Host *shost, int channel,</div><div class='add'>+static int fc_vport_setup(struct Scsi_Host *shost, int channel,</div><div class='ctx'> 	struct device *pdev, struct fc_vport_identifiers  *ids,</div><div class='ctx'> 	struct fc_vport **vport);</div><div class='ctx'> </div><div class='hunk'>@@ -1760,7 +1736,7 @@ store_fc_host_vport_create(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	vid.disable = false;		/* always enabled */</div><div class='ctx'> </div><div class='ctx'> 	/* we only allow support on Channel 0 !!! */</div><div class='del'>-	stat = fc_vport_create(shost, 0, &amp;shost-&gt;shost_gendev, &amp;vid, &amp;vport);</div><div class='add'>+	stat = fc_vport_setup(shost, 0, &amp;shost-&gt;shost_gendev, &amp;vid, &amp;vport);</div><div class='ctx'> 	return stat ? stat : count;</div><div class='ctx'> }</div><div class='ctx'> static FC_DEVICE_ATTR(host, vport_create, S_IWUSR, NULL,</div><div class='hunk'>@@ -1950,15 +1926,15 @@ static int fc_vport_match(struct attribute_container *cont,</div><div class='ctx'>  * Notes:</div><div class='ctx'>  *	This routine assumes no locks are held on entry.</div><div class='ctx'>  */</div><div class='del'>-static enum scsi_eh_timer_return</div><div class='add'>+static enum blk_eh_timer_return</div><div class='ctx'> fc_timed_out(struct scsi_cmnd *scmd)</div><div class='ctx'> {</div><div class='ctx'> 	struct fc_rport *rport = starget_to_rport(scsi_target(scmd-&gt;device));</div><div class='ctx'> </div><div class='ctx'> 	if (rport-&gt;port_state == FC_PORTSTATE_BLOCKED)</div><div class='del'>-		return EH_RESET_TIMER;</div><div class='add'>+		return BLK_EH_RESET_TIMER;</div><div class='ctx'> </div><div class='del'>-	return EH_NOT_HANDLED;</div><div class='add'>+	return BLK_EH_NOT_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -2157,8 +2133,7 @@ fc_attach_transport(struct fc_function_template *ft)</div><div class='ctx'> 	SETUP_PRIVATE_RPORT_ATTRIBUTE_RD(roles);</div><div class='ctx'> 	SETUP_PRIVATE_RPORT_ATTRIBUTE_RD(port_state);</div><div class='ctx'> 	SETUP_PRIVATE_RPORT_ATTRIBUTE_RD(scsi_target_id);</div><div class='del'>-	if (ft-&gt;terminate_rport_io)</div><div class='del'>-		SETUP_PRIVATE_RPORT_ATTRIBUTE_RW(fast_io_fail_tmo);</div><div class='add'>+	SETUP_PRIVATE_RPORT_ATTRIBUTE_RW(fast_io_fail_tmo);</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(count &gt; FC_RPORT_NUM_ATTRS);</div><div class='ctx'> </div><div class='hunk'>@@ -2352,6 +2327,22 @@ fc_remove_host(struct Scsi_Host *shost)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(fc_remove_host);</div><div class='ctx'> </div><div class='add'>+static void fc_terminate_rport_io(struct fc_rport *rport)</div><div class='add'>+{</div><div class='add'>+	struct Scsi_Host *shost = rport_to_shost(rport);</div><div class='add'>+	struct fc_internal *i = to_fc_internal(shost-&gt;transportt);</div><div class='add'>+</div><div class='add'>+	/* Involve the LLDD if possible to terminate all io on the rport. */</div><div class='add'>+	if (i-&gt;f-&gt;terminate_rport_io)</div><div class='add'>+		i-&gt;f-&gt;terminate_rport_io(rport);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * must unblock to flush queued IO. The caller will have set</div><div class='add'>+	 * the port_state or flags, so that fc_remote_port_chkready will</div><div class='add'>+	 * fail IO.</div><div class='add'>+	 */</div><div class='add'>+	scsi_target_unblock(&amp;rport-&gt;dev);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * fc_starget_delete - called to delete the scsi decendents of an rport</div><div class='hunk'>@@ -2364,13 +2355,8 @@ fc_starget_delete(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	struct fc_rport *rport =</div><div class='ctx'> 		container_of(work, struct fc_rport, stgt_delete_work);</div><div class='del'>-	struct Scsi_Host *shost = rport_to_shost(rport);</div><div class='del'>-	struct fc_internal *i = to_fc_internal(shost-&gt;transportt);</div><div class='del'>-</div><div class='del'>-	/* Involve the LLDD if possible to terminate all io on the rport. */</div><div class='del'>-	if (i-&gt;f-&gt;terminate_rport_io)</div><div class='del'>-		i-&gt;f-&gt;terminate_rport_io(rport);</div><div class='ctx'> </div><div class='add'>+	fc_terminate_rport_io(rport);</div><div class='ctx'> 	scsi_remove_target(&amp;rport-&gt;dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2396,10 +2382,7 @@ fc_rport_final_delete(struct work_struct *work)</div><div class='ctx'> 	if (rport-&gt;flags &amp; FC_RPORT_SCAN_PENDING)</div><div class='ctx'> 		scsi_flush_work(shost);</div><div class='ctx'> </div><div class='del'>-	/* involve the LLDD to terminate all pending i/o */</div><div class='del'>-	if (i-&gt;f-&gt;terminate_rport_io)</div><div class='del'>-		i-&gt;f-&gt;terminate_rport_io(rport);</div><div class='del'>-</div><div class='add'>+	fc_terminate_rport_io(rport);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Cancel any outstanding timers. These should really exist</div><div class='ctx'> 	 * only when rmmod'ing the LLDD and we're asking for</div><div class='hunk'>@@ -2663,7 +2646,8 @@ fc_remote_port_add(struct Scsi_Host *shost, int channel,</div><div class='ctx'> </div><div class='ctx'> 				spin_lock_irqsave(shost-&gt;host_lock, flags);</div><div class='ctx'> </div><div class='del'>-				rport-&gt;flags &amp;= ~FC_RPORT_DEVLOSS_PENDING;</div><div class='add'>+				rport-&gt;flags &amp;= ~(FC_RPORT_FAST_FAIL_TIMEDOUT |</div><div class='add'>+						  FC_RPORT_DEVLOSS_PENDING);</div><div class='ctx'> </div><div class='ctx'> 				/* if target, initiate a scan */</div><div class='ctx'> 				if (rport-&gt;scsi_target_id != -1) {</div><div class='hunk'>@@ -2726,6 +2710,7 @@ fc_remote_port_add(struct Scsi_Host *shost, int channel,</div><div class='ctx'> 			rport-&gt;port_id = ids-&gt;port_id;</div><div class='ctx'> 			rport-&gt;roles = ids-&gt;roles;</div><div class='ctx'> 			rport-&gt;port_state = FC_PORTSTATE_ONLINE;</div><div class='add'>+			rport-&gt;flags &amp;= ~FC_RPORT_FAST_FAIL_TIMEDOUT;</div><div class='ctx'> </div><div class='ctx'> 			if (fci-&gt;f-&gt;dd_fcrport_size)</div><div class='ctx'> 				memset(rport-&gt;dd_data, 0,</div><div class='hunk'>@@ -2808,7 +2793,6 @@ void</div><div class='ctx'> fc_remote_port_delete(struct fc_rport  *rport)</div><div class='ctx'> {</div><div class='ctx'> 	struct Scsi_Host *shost = rport_to_shost(rport);</div><div class='del'>-	struct fc_internal *i = to_fc_internal(shost-&gt;transportt);</div><div class='ctx'> 	int timeout = rport-&gt;dev_loss_tmo;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='hunk'>@@ -2854,7 +2838,7 @@ fc_remote_port_delete(struct fc_rport  *rport)</div><div class='ctx'> </div><div class='ctx'> 	/* see if we need to kill io faster than waiting for device loss */</div><div class='ctx'> 	if ((rport-&gt;fast_io_fail_tmo != -1) &amp;&amp;</div><div class='del'>-	    (rport-&gt;fast_io_fail_tmo &lt; timeout) &amp;&amp; (i-&gt;f-&gt;terminate_rport_io))</div><div class='add'>+	    (rport-&gt;fast_io_fail_tmo &lt; timeout))</div><div class='ctx'> 		fc_queue_devloss_work(shost, &amp;rport-&gt;fail_io_work,</div><div class='ctx'> 					rport-&gt;fast_io_fail_tmo * HZ);</div><div class='ctx'> </div><div class='hunk'>@@ -2930,7 +2914,8 @@ fc_remote_port_rolechg(struct fc_rport  *rport, u32 roles)</div><div class='ctx'> 			fc_flush_devloss(shost);</div><div class='ctx'> </div><div class='ctx'> 		spin_lock_irqsave(shost-&gt;host_lock, flags);</div><div class='del'>-		rport-&gt;flags &amp;= ~FC_RPORT_DEVLOSS_PENDING;</div><div class='add'>+		rport-&gt;flags &amp;= ~(FC_RPORT_FAST_FAIL_TIMEDOUT |</div><div class='add'>+				  FC_RPORT_DEVLOSS_PENDING);</div><div class='ctx'> 		spin_unlock_irqrestore(shost-&gt;host_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 		/* ensure any stgt delete functions are done */</div><div class='hunk'>@@ -3025,6 +3010,7 @@ fc_timeout_deleted_rport(struct work_struct *work)</div><div class='ctx'> 	rport-&gt;supported_classes = FC_COS_UNSPECIFIED;</div><div class='ctx'> 	rport-&gt;roles = FC_PORT_ROLE_UNKNOWN;</div><div class='ctx'> 	rport-&gt;port_state = FC_PORTSTATE_NOTPRESENT;</div><div class='add'>+	rport-&gt;flags &amp;= ~FC_RPORT_FAST_FAIL_TIMEDOUT;</div><div class='ctx'> </div><div class='ctx'> 	/* remove the identifiers that aren't used in the consisting binding */</div><div class='ctx'> 	switch (fc_host-&gt;tgtid_bind_type) {</div><div class='hunk'>@@ -3067,13 +3053,12 @@ fc_timeout_fail_rport_io(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	struct fc_rport *rport =</div><div class='ctx'> 		container_of(work, struct fc_rport, fail_io_work.work);</div><div class='del'>-	struct Scsi_Host *shost = rport_to_shost(rport);</div><div class='del'>-	struct fc_internal *i = to_fc_internal(shost-&gt;transportt);</div><div class='ctx'> </div><div class='ctx'> 	if (rport-&gt;port_state != FC_PORTSTATE_BLOCKED)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	i-&gt;f-&gt;terminate_rport_io(rport);</div><div class='add'>+	rport-&gt;flags |= FC_RPORT_FAST_FAIL_TIMEDOUT;</div><div class='add'>+	fc_terminate_rport_io(rport);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -3103,7 +3088,7 @@ fc_scsi_scan_rport(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * fc_vport_create - allocates and creates a FC virtual port.</div><div class='add'>+ * fc_vport_setup - allocates and creates a FC virtual port.</div><div class='ctx'>  * @shost:	scsi host the virtual port is connected to.</div><div class='ctx'>  * @channel:	Channel on shost port connected to.</div><div class='ctx'>  * @pdev:	parent device for vport</div><div class='hunk'>@@ -3118,7 +3103,7 @@ fc_scsi_scan_rport(struct work_struct *work)</div><div class='ctx'>  *	This routine assumes no locks are held on entry.</div><div class='ctx'>  */</div><div class='ctx'> static int</div><div class='del'>-fc_vport_create(struct Scsi_Host *shost, int channel, struct device *pdev,</div><div class='add'>+fc_vport_setup(struct Scsi_Host *shost, int channel, struct device *pdev,</div><div class='ctx'> 	struct fc_vport_identifiers  *ids, struct fc_vport **ret_vport)</div><div class='ctx'> {</div><div class='ctx'> 	struct fc_host_attrs *fc_host = shost_to_fc_host(shost);</div><div class='hunk'>@@ -3231,6 +3216,28 @@ delete_vport:</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * fc_vport_create - Admin App or LLDD requests creation of a vport</div><div class='add'>+ * @shost:	scsi host the virtual port is connected to.</div><div class='add'>+ * @channel:	channel on shost port connected to.</div><div class='add'>+ * @ids:	The world wide names, FC4 port roles, etc for</div><div class='add'>+ *              the virtual port.</div><div class='add'>+ *</div><div class='add'>+ * Notes:</div><div class='add'>+ *	This routine assumes no locks are held on entry.</div><div class='add'>+ */</div><div class='add'>+struct fc_vport *</div><div class='add'>+fc_vport_create(struct Scsi_Host *shost, int channel,</div><div class='add'>+	struct fc_vport_identifiers *ids)</div><div class='add'>+{</div><div class='add'>+	int stat;</div><div class='add'>+	struct fc_vport *vport;</div><div class='add'>+</div><div class='add'>+	stat = fc_vport_setup(shost, channel, &amp;shost-&gt;shost_gendev,</div><div class='add'>+		 ids, &amp;vport);</div><div class='add'>+	return stat ? NULL : vport;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(fc_vport_create);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * fc_vport_terminate - Admin App or LLDD requests termination of a vport</div><div class='head'>diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c<br/>index 043c3921164f..4a803ebaf508 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/scsi_transport_iscsi.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/scsi_transport_iscsi.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/scsi_transport_iscsi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/scsi_transport_iscsi.c</a></div><div class='hunk'>@@ -138,7 +138,7 @@ static ssize_t</div><div class='ctx'> show_ep_handle(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct iscsi_endpoint *ep = iscsi_dev_to_endpoint(dev);</div><div class='del'>-	return sprintf(buf, "%u\n", ep-&gt;id);</div><div class='add'>+	return sprintf(buf, "%llu\n", (unsigned long long) ep-&gt;id);</div><div class='ctx'> }</div><div class='ctx'> static ISCSI_ATTR(ep, handle, S_IRUGO, show_ep_handle, NULL);</div><div class='ctx'> </div><div class='hunk'>@@ -156,7 +156,7 @@ static struct attribute_group iscsi_endpoint_group = {</div><div class='ctx'> static int iscsi_match_epid(struct device *dev, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct iscsi_endpoint *ep = iscsi_dev_to_endpoint(dev);</div><div class='del'>-	unsigned int *epid = (unsigned int *) data;</div><div class='add'>+	uint64_t *epid = (uint64_t *) data;</div><div class='ctx'> </div><div class='ctx'> 	return *epid == ep-&gt;id;</div><div class='ctx'> }</div><div class='hunk'>@@ -166,7 +166,7 @@ iscsi_create_endpoint(int dd_size)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev;</div><div class='ctx'> 	struct iscsi_endpoint *ep;</div><div class='del'>-	unsigned int id;</div><div class='add'>+	uint64_t id;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	for (id = 1; id &lt; ISCSI_MAX_EPID; id++) {</div><div class='hunk'>@@ -187,7 +187,8 @@ iscsi_create_endpoint(int dd_size)</div><div class='ctx'> </div><div class='ctx'> 	ep-&gt;id = id;</div><div class='ctx'> 	ep-&gt;dev.class = &amp;iscsi_endpoint_class;</div><div class='del'>-	snprintf(ep-&gt;dev.bus_id, BUS_ID_SIZE, "ep-%u", id);</div><div class='add'>+	snprintf(ep-&gt;dev.bus_id, BUS_ID_SIZE, "ep-%llu",</div><div class='add'>+		 (unsigned long long) id);</div><div class='ctx'> 	err = device_register(&amp;ep-&gt;dev);</div><div class='ctx'>         if (err)</div><div class='ctx'>                 goto free_ep;</div><div class='hunk'>@@ -374,10 +375,10 @@ int iscsi_session_chkready(struct iscsi_cls_session *session)</div><div class='ctx'> 		err = 0;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ISCSI_SESSION_FAILED:</div><div class='del'>-		err = DID_IMM_RETRY &lt;&lt; 16;</div><div class='add'>+		err = DID_TRANSPORT_DISRUPTED &lt;&lt; 16;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ISCSI_SESSION_FREE:</div><div class='del'>-		err = DID_NO_CONNECT &lt;&lt; 16;</div><div class='add'>+		err = DID_TRANSPORT_FAILFAST &lt;&lt; 16;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		err = DID_NO_CONNECT &lt;&lt; 16;</div><div class='hunk'>@@ -1010,7 +1011,7 @@ int iscsi_recv_pdu(struct iscsi_cls_conn *conn, struct iscsi_hdr *hdr,</div><div class='ctx'> </div><div class='ctx'> 	skb = alloc_skb(len, GFP_ATOMIC);</div><div class='ctx'> 	if (!skb) {</div><div class='del'>-		iscsi_conn_error(conn, ISCSI_ERR_CONN_FAILED);</div><div class='add'>+		iscsi_conn_error_event(conn, ISCSI_ERR_CONN_FAILED);</div><div class='ctx'> 		iscsi_cls_conn_printk(KERN_ERR, conn, "can not deliver "</div><div class='ctx'> 				      "control PDU: OOM\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -1031,7 +1032,7 @@ int iscsi_recv_pdu(struct iscsi_cls_conn *conn, struct iscsi_hdr *hdr,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(iscsi_recv_pdu);</div><div class='ctx'> </div><div class='del'>-void iscsi_conn_error(struct iscsi_cls_conn *conn, enum iscsi_err error)</div><div class='add'>+void iscsi_conn_error_event(struct iscsi_cls_conn *conn, enum iscsi_err error)</div><div class='ctx'> {</div><div class='ctx'> 	struct nlmsghdr	*nlh;</div><div class='ctx'> 	struct sk_buff	*skb;</div><div class='hunk'>@@ -1063,7 +1064,7 @@ void iscsi_conn_error(struct iscsi_cls_conn *conn, enum iscsi_err error)</div><div class='ctx'> 	iscsi_cls_conn_printk(KERN_INFO, conn, "detected conn error (%d)\n",</div><div class='ctx'> 			      error);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(iscsi_conn_error);</div><div class='add'>+EXPORT_SYMBOL_GPL(iscsi_conn_error_event);</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='ctx'> iscsi_if_send_reply(int pid, int seq, int type, int done, int multi,</div><div class='hunk'>@@ -1361,7 +1362,7 @@ iscsi_tgt_dscvr(struct iscsi_transport *transport,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	shost = scsi_host_lookup(ev-&gt;u.tgt_dscvr.host_no);</div><div class='del'>-	if (IS_ERR(shost)) {</div><div class='add'>+	if (!shost) {</div><div class='ctx'> 		printk(KERN_ERR "target discovery could not find host no %u\n",</div><div class='ctx'> 		       ev-&gt;u.tgt_dscvr.host_no);</div><div class='ctx'> 		return -ENODEV;</div><div class='hunk'>@@ -1387,7 +1388,7 @@ iscsi_set_host_param(struct iscsi_transport *transport,</div><div class='ctx'> 		return -ENOSYS;</div><div class='ctx'> </div><div class='ctx'> 	shost = scsi_host_lookup(ev-&gt;u.set_host_param.host_no);</div><div class='del'>-	if (IS_ERR(shost)) {</div><div class='add'>+	if (!shost) {</div><div class='ctx'> 		printk(KERN_ERR "set_host_param could not find host no %u\n",</div><div class='ctx'> 		       ev-&gt;u.set_host_param.host_no);</div><div class='ctx'> 		return -ENODEV;</div><div class='head'>diff --git a/drivers/scsi/scsi_transport_spi.c b/drivers/scsi/scsi_transport_spi.c<br/>index b29360ed0bdc..7c2d28924d2a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/scsi_transport_spi.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/scsi_transport_spi.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/scsi_transport_spi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/scsi_transport_spi.c</a></div><div class='hunk'>@@ -109,7 +109,9 @@ static int spi_execute(struct scsi_device *sdev, const void *cmd,</div><div class='ctx'> 	for(i = 0; i &lt; DV_RETRIES; i++) {</div><div class='ctx'> 		result = scsi_execute(sdev, cmd, dir, buffer, bufflen,</div><div class='ctx'> 				      sense, DV_TIMEOUT, /* retries */ 1,</div><div class='del'>-				      REQ_FAILFAST);</div><div class='add'>+				      REQ_FAILFAST_DEV |</div><div class='add'>+				      REQ_FAILFAST_TRANSPORT |</div><div class='add'>+				      REQ_FAILFAST_DRIVER);</div><div class='ctx'> 		if (result &amp; DRIVER_SENSE) {</div><div class='ctx'> 			struct scsi_sense_hdr sshdr_tmp;</div><div class='ctx'> 			if (!sshdr)</div><div class='head'>diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c<br/>index e5e7d7856454..7c4d2e68df1c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/sd.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/sd.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/sd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/sd.c</a></div><div class='hunk'>@@ -47,6 +47,7 @@</div><div class='ctx'> #include &lt;linux/blkpg.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/string_helpers.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;scsi/scsi.h&gt;</div><div class='hunk'>@@ -86,6 +87,12 @@ MODULE_ALIAS_SCSI_DEVICE(TYPE_DISK);</div><div class='ctx'> MODULE_ALIAS_SCSI_DEVICE(TYPE_MOD);</div><div class='ctx'> MODULE_ALIAS_SCSI_DEVICE(TYPE_RBC);</div><div class='ctx'> </div><div class='add'>+#if !defined(CONFIG_DEBUG_BLOCK_EXT_DEVT)</div><div class='add'>+#define SD_MINORS	16</div><div class='add'>+#else</div><div class='add'>+#define SD_MINORS	0</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static int  sd_revalidate_disk(struct gendisk *);</div><div class='ctx'> static int  sd_probe(struct device *);</div><div class='ctx'> static int  sd_remove(struct device *);</div><div class='hunk'>@@ -159,7 +166,7 @@ sd_store_cache_type(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 			sd_print_sense_hdr(sdkp, &amp;sshdr);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	sd_revalidate_disk(sdkp-&gt;disk);</div><div class='add'>+	revalidate_disk(sdkp-&gt;disk);</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -377,8 +384,7 @@ static int sd_prep_fn(struct request_queue *q, struct request *rq)</div><div class='ctx'> 	sector_t block = rq-&gt;sector;</div><div class='ctx'> 	sector_t threshold;</div><div class='ctx'> 	unsigned int this_count = rq-&gt;nr_sectors;</div><div class='del'>-	unsigned int timeout = sdp-&gt;timeout;</div><div class='del'>-	int ret;</div><div class='add'>+	int ret, host_dif;</div><div class='ctx'> </div><div class='ctx'> 	if (rq-&gt;cmd_type == REQ_TYPE_BLOCK_PC) {</div><div class='ctx'> 		ret = scsi_setup_blk_pc_cmnd(sdp, rq);</div><div class='hunk'>@@ -509,7 +515,8 @@ static int sd_prep_fn(struct request_queue *q, struct request *rq)</div><div class='ctx'> 					rq-&gt;nr_sectors));</div><div class='ctx'> </div><div class='ctx'> 	/* Set RDPROTECT/WRPROTECT if disk is formatted with DIF */</div><div class='del'>-	if (scsi_host_dif_capable(sdp-&gt;host, sdkp-&gt;protection_type))</div><div class='add'>+	host_dif = scsi_host_dif_capable(sdp-&gt;host, sdkp-&gt;protection_type);</div><div class='add'>+	if (host_dif)</div><div class='ctx'> 		SCpnt-&gt;cmnd[1] = 1 &lt;&lt; 5;</div><div class='ctx'> 	else</div><div class='ctx'> 		SCpnt-&gt;cmnd[1] = 0;</div><div class='hunk'>@@ -567,8 +574,9 @@ static int sd_prep_fn(struct request_queue *q, struct request *rq)</div><div class='ctx'> 	SCpnt-&gt;sdb.length = this_count * sdp-&gt;sector_size;</div><div class='ctx'> </div><div class='ctx'> 	/* If DIF or DIX is enabled, tell HBA how to handle request */</div><div class='del'>-	if (sdkp-&gt;protection_type || scsi_prot_sg_count(SCpnt))</div><div class='del'>-		sd_dif_op(SCpnt, sdkp-&gt;protection_type, scsi_prot_sg_count(SCpnt));</div><div class='add'>+	if (host_dif || scsi_prot_sg_count(SCpnt))</div><div class='add'>+		sd_dif_op(SCpnt, host_dif, scsi_prot_sg_count(SCpnt),</div><div class='add'>+			  sdkp-&gt;protection_type);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We shouldn't disconnect in the middle of a sector, so with a dumb</div><div class='hunk'>@@ -578,7 +586,6 @@ static int sd_prep_fn(struct request_queue *q, struct request *rq)</div><div class='ctx'> 	SCpnt-&gt;transfersize = sdp-&gt;sector_size;</div><div class='ctx'> 	SCpnt-&gt;underflow = this_count &lt;&lt; 9;</div><div class='ctx'> 	SCpnt-&gt;allowed = SD_MAX_RETRIES;</div><div class='del'>-	SCpnt-&gt;timeout_per_command = timeout;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * This indicates that the command is ready from our end to be</div><div class='hunk'>@@ -910,7 +917,7 @@ static void sd_rescan(struct device *dev)</div><div class='ctx'> 	struct scsi_disk *sdkp = scsi_disk_get_from_dev(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (sdkp) {</div><div class='del'>-		sd_revalidate_disk(sdkp-&gt;disk);</div><div class='add'>+		revalidate_disk(sdkp-&gt;disk);</div><div class='ctx'> 		scsi_disk_put(sdkp);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -1247,14 +1254,12 @@ void sd_read_protection_type(struct scsi_disk *sdkp, unsigned char *buffer)</div><div class='ctx'> 	else</div><div class='ctx'> 		type = ((buffer[12] &gt;&gt; 1) &amp; 7) + 1; /* P_TYPE 0 = Type 1 */</div><div class='ctx'> </div><div class='add'>+	sdkp-&gt;protection_type = type;</div><div class='add'>+</div><div class='ctx'> 	switch (type) {</div><div class='ctx'> 	case SD_DIF_TYPE0_PROTECTION:</div><div class='del'>-		sdkp-&gt;protection_type = 0;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='ctx'> 	case SD_DIF_TYPE1_PROTECTION:</div><div class='ctx'> 	case SD_DIF_TYPE3_PROTECTION:</div><div class='del'>-		sdkp-&gt;protection_type = type;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case SD_DIF_TYPE2_PROTECTION:</div><div class='hunk'>@@ -1272,7 +1277,6 @@ void sd_read_protection_type(struct scsi_disk *sdkp, unsigned char *buffer)</div><div class='ctx'> 	return;</div><div class='ctx'> </div><div class='ctx'> disable:</div><div class='del'>-	sdkp-&gt;protection_type = 0;</div><div class='ctx'> 	sdkp-&gt;capacity = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1429,27 +1433,21 @@ got_data:</div><div class='ctx'> 		 */</div><div class='ctx'> 		sector_size = 512;</div><div class='ctx'> 	}</div><div class='add'>+	blk_queue_hardsect_size(sdp-&gt;request_queue, sector_size);</div><div class='add'>+</div><div class='ctx'> 	{</div><div class='del'>-		/*</div><div class='del'>-		 * The msdos fs needs to know the hardware sector size</div><div class='del'>-		 * So I have created this table. See ll_rw_blk.c</div><div class='del'>-		 * Jacques Gelinas (Jacques@solucorp.qc.ca)</div><div class='del'>-		 */</div><div class='del'>-		int hard_sector = sector_size;</div><div class='del'>-		sector_t sz = (sdkp-&gt;capacity/2) * (hard_sector/256);</div><div class='del'>-		struct request_queue *queue = sdp-&gt;request_queue;</div><div class='del'>-		sector_t mb = sz;</div><div class='add'>+		char cap_str_2[10], cap_str_10[10];</div><div class='add'>+		u64 sz = sdkp-&gt;capacity &lt;&lt; ffz(~sector_size);</div><div class='ctx'> </div><div class='del'>-		blk_queue_hardsect_size(queue, hard_sector);</div><div class='del'>-		/* avoid 64-bit division on 32-bit platforms */</div><div class='del'>-		sector_div(sz, 625);</div><div class='del'>-		mb -= sz - 974;</div><div class='del'>-		sector_div(mb, 1950);</div><div class='add'>+		string_get_size(sz, STRING_UNITS_2, cap_str_2,</div><div class='add'>+				sizeof(cap_str_2));</div><div class='add'>+		string_get_size(sz, STRING_UNITS_10, cap_str_10,</div><div class='add'>+				sizeof(cap_str_10));</div><div class='ctx'> </div><div class='ctx'> 		sd_printk(KERN_NOTICE, sdkp,</div><div class='del'>-			  "%llu %d-byte hardware sectors (%llu MB)\n",</div><div class='add'>+			  "%llu %d-byte hardware sectors: (%s/%s)\n",</div><div class='ctx'> 			  (unsigned long long)sdkp-&gt;capacity,</div><div class='del'>-			  hard_sector, (unsigned long long)mb);</div><div class='add'>+			  sector_size, cap_str_10, cap_str_2);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Rescale capacity to 512-byte units */</div><div class='hunk'>@@ -1764,6 +1762,52 @@ static int sd_revalidate_disk(struct gendisk *disk)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ *	sd_format_disk_name - format disk name</div><div class='add'>+ *	@prefix: name prefix - ie. "sd" for SCSI disks</div><div class='add'>+ *	@index: index of the disk to format name for</div><div class='add'>+ *	@buf: output buffer</div><div class='add'>+ *	@buflen: length of the output buffer</div><div class='add'>+ *</div><div class='add'>+ *	SCSI disk names starts at sda.  The 26th device is sdz and the</div><div class='add'>+ *	27th is sdaa.  The last one for two lettered suffix is sdzz</div><div class='add'>+ *	which is followed by sdaaa.</div><div class='add'>+ *</div><div class='add'>+ *	This is basically 26 base counting with one extra 'nil' entry</div><div class='add'>+ *	at the beggining from the second digit on and can be</div><div class='add'>+ *	determined using similar method as 26 base conversion with the</div><div class='add'>+ *	index shifted -1 after each digit is computed.</div><div class='add'>+ *</div><div class='add'>+ *	CONTEXT:</div><div class='add'>+ *	Don't care.</div><div class='add'>+ *</div><div class='add'>+ *	RETURNS:</div><div class='add'>+ *	0 on success, -errno on failure.</div><div class='add'>+ */</div><div class='add'>+static int sd_format_disk_name(char *prefix, int index, char *buf, int buflen)</div><div class='add'>+{</div><div class='add'>+	const int base = 'z' - 'a' + 1;</div><div class='add'>+	char *begin = buf + strlen(prefix);</div><div class='add'>+	char *end = buf + buflen;</div><div class='add'>+	char *p;</div><div class='add'>+	int unit;</div><div class='add'>+</div><div class='add'>+	p = end - 1;</div><div class='add'>+	*p = '\0';</div><div class='add'>+	unit = base;</div><div class='add'>+	do {</div><div class='add'>+		if (p == begin)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		*--p = 'a' + (index % unit);</div><div class='add'>+		index = (index / unit) - 1;</div><div class='add'>+	} while (index &gt;= 0);</div><div class='add'>+</div><div class='add'>+	memmove(begin, p, end - p);</div><div class='add'>+	memcpy(buf, prefix, strlen(prefix));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  *	sd_probe - called during driver initialization and whenever a</div><div class='ctx'>  *	new scsi device is attached to the system. It is called once</div><div class='ctx'>  *	for each scsi device (not just disks) present.</div><div class='hunk'>@@ -1801,7 +1845,7 @@ static int sd_probe(struct device *dev)</div><div class='ctx'> 	if (!sdkp)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	gd = alloc_disk(16);</div><div class='add'>+	gd = alloc_disk(SD_MINORS);</div><div class='ctx'> 	if (!gd)</div><div class='ctx'> 		goto out_free;</div><div class='ctx'> </div><div class='hunk'>@@ -1815,8 +1859,8 @@ static int sd_probe(struct device *dev)</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto out_put;</div><div class='ctx'> </div><div class='del'>-	error = -EBUSY;</div><div class='del'>-	if (index &gt;= SD_MAX_DISKS)</div><div class='add'>+	error = sd_format_disk_name("sd", index, gd-&gt;disk_name, DISK_NAME_LEN);</div><div class='add'>+	if (error)</div><div class='ctx'> 		goto out_free_index;</div><div class='ctx'> </div><div class='ctx'> 	sdkp-&gt;device = sdp;</div><div class='hunk'>@@ -1826,11 +1870,12 @@ static int sd_probe(struct device *dev)</div><div class='ctx'> 	sdkp-&gt;openers = 0;</div><div class='ctx'> 	sdkp-&gt;previous_state = 1;</div><div class='ctx'> </div><div class='del'>-	if (!sdp-&gt;timeout) {</div><div class='add'>+	if (!sdp-&gt;request_queue-&gt;rq_timeout) {</div><div class='ctx'> 		if (sdp-&gt;type != TYPE_MOD)</div><div class='del'>-			sdp-&gt;timeout = SD_TIMEOUT;</div><div class='add'>+			blk_queue_rq_timeout(sdp-&gt;request_queue, SD_TIMEOUT);</div><div class='ctx'> 		else</div><div class='del'>-			sdp-&gt;timeout = SD_MOD_TIMEOUT;</div><div class='add'>+			blk_queue_rq_timeout(sdp-&gt;request_queue,</div><div class='add'>+					     SD_MOD_TIMEOUT);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	device_initialize(&amp;sdkp-&gt;dev);</div><div class='hunk'>@@ -1843,24 +1888,12 @@ static int sd_probe(struct device *dev)</div><div class='ctx'> </div><div class='ctx'> 	get_device(&amp;sdp-&gt;sdev_gendev);</div><div class='ctx'> </div><div class='del'>-	gd-&gt;major = sd_major((index &amp; 0xf0) &gt;&gt; 4);</div><div class='del'>-	gd-&gt;first_minor = ((index &amp; 0xf) &lt;&lt; 4) | (index &amp; 0xfff00);</div><div class='del'>-	gd-&gt;minors = 16;</div><div class='del'>-	gd-&gt;fops = &amp;sd_fops;</div><div class='del'>-</div><div class='del'>-	if (index &lt; 26) {</div><div class='del'>-		sprintf(gd-&gt;disk_name, "sd%c", 'a' + index % 26);</div><div class='del'>-	} else if (index &lt; (26 + 1) * 26) {</div><div class='del'>-		sprintf(gd-&gt;disk_name, "sd%c%c",</div><div class='del'>-			'a' + index / 26 - 1,'a' + index % 26);</div><div class='del'>-	} else {</div><div class='del'>-		const unsigned int m1 = (index / 26 - 1) / 26 - 1;</div><div class='del'>-		const unsigned int m2 = (index / 26 - 1) % 26;</div><div class='del'>-		const unsigned int m3 =  index % 26;</div><div class='del'>-		sprintf(gd-&gt;disk_name, "sd%c%c%c",</div><div class='del'>-			'a' + m1, 'a' + m2, 'a' + m3);</div><div class='add'>+	if (index &lt; SD_MAX_DISKS) {</div><div class='add'>+		gd-&gt;major = sd_major((index &amp; 0xf0) &gt;&gt; 4);</div><div class='add'>+		gd-&gt;first_minor = ((index &amp; 0xf) &lt;&lt; 4) | (index &amp; 0xfff00);</div><div class='add'>+		gd-&gt;minors = SD_MINORS;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='add'>+	gd-&gt;fops = &amp;sd_fops;</div><div class='ctx'> 	gd-&gt;private_data = &amp;sdkp-&gt;driver;</div><div class='ctx'> 	gd-&gt;queue = sdkp-&gt;device-&gt;request_queue;</div><div class='ctx'> </div><div class='hunk'>@@ -1869,7 +1902,7 @@ static int sd_probe(struct device *dev)</div><div class='ctx'> 	blk_queue_prep_rq(sdp-&gt;request_queue, sd_prep_fn);</div><div class='ctx'> </div><div class='ctx'> 	gd-&gt;driverfs_dev = &amp;sdp-&gt;sdev_gendev;</div><div class='del'>-	gd-&gt;flags = GENHD_FL_DRIVERFS;</div><div class='add'>+	gd-&gt;flags = GENHD_FL_EXT_DEVT | GENHD_FL_DRIVERFS;</div><div class='ctx'> 	if (sdp-&gt;removable)</div><div class='ctx'> 		gd-&gt;flags |= GENHD_FL_REMOVABLE;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/sd.h b/drivers/scsi/sd.h<br/>index 95b9f06534d5..75638e7d3f66 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/sd.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/sd.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/sd.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/sd.h</a></div><div class='hunk'>@@ -97,19 +97,28 @@ struct sd_dif_tuple {</div><div class='ctx'>        __be32 ref_tag;		/* Target LBA or indirect LBA */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_BLK_DEV_INTEGRITY)</div><div class='add'>+#ifdef CONFIG_BLK_DEV_INTEGRITY</div><div class='ctx'> </div><div class='del'>-extern void sd_dif_op(struct scsi_cmnd *, unsigned int, unsigned int);</div><div class='add'>+extern void sd_dif_op(struct scsi_cmnd *, unsigned int, unsigned int, unsigned int);</div><div class='ctx'> extern void sd_dif_config_host(struct scsi_disk *);</div><div class='ctx'> extern int sd_dif_prepare(struct request *rq, sector_t, unsigned int);</div><div class='ctx'> extern void sd_dif_complete(struct scsi_cmnd *, unsigned int);</div><div class='ctx'> </div><div class='ctx'> #else /* CONFIG_BLK_DEV_INTEGRITY */</div><div class='ctx'> </div><div class='del'>-#define sd_dif_op(a, b, c)			do { } while (0)</div><div class='del'>-#define sd_dif_config_host(a)			do { } while (0)</div><div class='del'>-#define sd_dif_prepare(a, b, c)			(0)</div><div class='del'>-#define sd_dif_complete(a, b)			(0)</div><div class='add'>+static inline void sd_dif_op(struct scsi_cmnd *cmd, unsigned int a, unsigned int b, unsigned int c)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+static inline void sd_dif_config_host(struct scsi_disk *disk)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+static inline int sd_dif_prepare(struct request *rq, sector_t s, unsigned int a)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+static inline void sd_dif_complete(struct scsi_cmnd *cmd, unsigned int a)</div><div class='add'>+{</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_BLK_DEV_INTEGRITY */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/sd_dif.c b/drivers/scsi/sd_dif.c<br/>index 4d17f3d35aac..3ebb1f289490 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/sd_dif.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/sd_dif.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/sd_dif.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/sd_dif.c</a></div><div class='hunk'>@@ -311,25 +311,26 @@ void sd_dif_config_host(struct scsi_disk *sdkp)</div><div class='ctx'> 	struct scsi_device *sdp = sdkp-&gt;device;</div><div class='ctx'> 	struct gendisk *disk = sdkp-&gt;disk;</div><div class='ctx'> 	u8 type = sdkp-&gt;protection_type;</div><div class='add'>+	int dif, dix;</div><div class='ctx'> </div><div class='del'>-	/* If this HBA doesn't support DIX, resort to normal I/O or DIF */</div><div class='del'>-	if (scsi_host_dix_capable(sdp-&gt;host, type) == 0) {</div><div class='add'>+	dif = scsi_host_dif_capable(sdp-&gt;host, type);</div><div class='add'>+	dix = scsi_host_dix_capable(sdp-&gt;host, type);</div><div class='ctx'> </div><div class='del'>-		if (type == SD_DIF_TYPE0_PROTECTION)</div><div class='del'>-			return;</div><div class='del'>-</div><div class='del'>-		if (scsi_host_dif_capable(sdp-&gt;host, type) == 0) {</div><div class='del'>-			sd_printk(KERN_INFO, sdkp, "Type %d protection " \</div><div class='del'>-				  "unsupported by HBA. Disabling DIF.\n", type);</div><div class='del'>-			sdkp-&gt;protection_type = 0;</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='add'>+	if (!dix &amp;&amp; scsi_host_dix_capable(sdp-&gt;host, 0)) {</div><div class='add'>+		dif = 0; dix = 1;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		sd_printk(KERN_INFO, sdkp, "Enabling DIF Type %d protection\n",</div><div class='del'>-			  type);</div><div class='add'>+	if (type) {</div><div class='add'>+		if (dif)</div><div class='add'>+			sd_printk(KERN_NOTICE, sdkp,</div><div class='add'>+				  "Enabling DIF Type %d protection\n", type);</div><div class='add'>+		else</div><div class='add'>+			sd_printk(KERN_NOTICE, sdkp,</div><div class='add'>+				  "Disabling DIF Type %d protection\n", type);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	if (!dix)</div><div class='ctx'> 		return;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	/* Enable DMA of protection information */</div><div class='ctx'> 	if (scsi_host_get_guard(sdkp-&gt;device-&gt;host) &amp; SHOST_DIX_GUARD_IP)</div><div class='hunk'>@@ -343,17 +344,17 @@ void sd_dif_config_host(struct scsi_disk *sdkp)</div><div class='ctx'> 		else</div><div class='ctx'> 			blk_integrity_register(disk, &amp;dif_type1_integrity_crc);</div><div class='ctx'> </div><div class='del'>-	sd_printk(KERN_INFO, sdkp,</div><div class='del'>-		  "Enabling %s integrity protection\n", disk-&gt;integrity-&gt;name);</div><div class='add'>+	sd_printk(KERN_NOTICE, sdkp,</div><div class='add'>+		  "Enabling DIX %s protection\n", disk-&gt;integrity-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	/* Signal to block layer that we support sector tagging */</div><div class='del'>-	if (type &amp;&amp; sdkp-&gt;ATO) {</div><div class='add'>+	if (dif &amp;&amp; type &amp;&amp; sdkp-&gt;ATO) {</div><div class='ctx'> 		if (type == SD_DIF_TYPE3_PROTECTION)</div><div class='ctx'> 			disk-&gt;integrity-&gt;tag_size = sizeof(u16) + sizeof(u32);</div><div class='ctx'> 		else</div><div class='ctx'> 			disk-&gt;integrity-&gt;tag_size = sizeof(u16);</div><div class='ctx'> </div><div class='del'>-		sd_printk(KERN_INFO, sdkp, "DIF application tag size %u\n",</div><div class='add'>+		sd_printk(KERN_NOTICE, sdkp, "DIF application tag size %u\n",</div><div class='ctx'> 			  disk-&gt;integrity-&gt;tag_size);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -361,7 +362,7 @@ void sd_dif_config_host(struct scsi_disk *sdkp)</div><div class='ctx'> /*</div><div class='ctx'>  * DIF DMA operation magic decoder ring.</div><div class='ctx'>  */</div><div class='del'>-void sd_dif_op(struct scsi_cmnd *scmd, unsigned int dif, unsigned int dix)</div><div class='add'>+void sd_dif_op(struct scsi_cmnd *scmd, unsigned int dif, unsigned int dix, unsigned int type)</div><div class='ctx'> {</div><div class='ctx'> 	int csum_convert, prot_op;</div><div class='ctx'> </div><div class='hunk'>@@ -406,7 +407,8 @@ void sd_dif_op(struct scsi_cmnd *scmd, unsigned int dif, unsigned int dix)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	scsi_set_prot_op(scmd, prot_op);</div><div class='del'>-	scsi_set_prot_type(scmd, dif);</div><div class='add'>+	if (dif)</div><div class='add'>+		scsi_set_prot_type(scmd, type);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c<br/>index 661f9f21650a..93bd59a1ed79 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/sg.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/sg.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/sg.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/sg.c</a></div><div class='hunk'>@@ -47,7 +47,6 @@ static int sg_version_num = 30534;	/* 2 digits for each component */</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/scatterlist.h&gt;</div><div class='ctx'> #include &lt;linux/blktrace_api.h&gt;</div><div class='ctx'> #include &lt;linux/smp_lock.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -69,7 +68,6 @@ static void sg_proc_cleanup(void);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #define SG_ALLOW_DIO_DEF 0</div><div class='del'>-#define SG_ALLOW_DIO_CODE /* compile out by commenting this define */</div><div class='ctx'> </div><div class='ctx'> #define SG_MAX_DEVS 32768</div><div class='ctx'> </div><div class='hunk'>@@ -118,8 +116,8 @@ typedef struct sg_scatter_hold { /* holding area for scsi scatter gather info */</div><div class='ctx'> 	unsigned short k_use_sg; /* Count of kernel scatter-gather pieces */</div><div class='ctx'> 	unsigned sglist_len; /* size of malloc'd scatter-gather list ++ */</div><div class='ctx'> 	unsigned bufflen;	/* Size of (aggregate) data buffer */</div><div class='del'>-	unsigned b_malloc_len;	/* actual len malloc'ed in buffer */</div><div class='del'>-	struct scatterlist *buffer;/* scatter list */</div><div class='add'>+	struct page **pages;</div><div class='add'>+	int page_order;</div><div class='ctx'> 	char dio_in_use;	/* 0-&gt;indirect IO (or mmap), 1-&gt;dio */</div><div class='ctx'> 	unsigned char cmd_opcode; /* first byte of command */</div><div class='ctx'> } Sg_scatter_hold;</div><div class='hunk'>@@ -137,6 +135,8 @@ typedef struct sg_request {	/* SG_MAX_QUEUE requests outstanding per file */</div><div class='ctx'> 	char orphan;		/* 1 -&gt; drop on sight, 0 -&gt; normal */</div><div class='ctx'> 	char sg_io_owned;	/* 1 -&gt; packet belongs to SG_IO */</div><div class='ctx'> 	volatile char done;	/* 0-&gt;before bh, 1-&gt;before read, 2-&gt;read */</div><div class='add'>+	struct request *rq;</div><div class='add'>+	struct bio *bio;</div><div class='ctx'> } Sg_request;</div><div class='ctx'> </div><div class='ctx'> typedef struct sg_fd {		/* holds the state of a file descriptor */</div><div class='hunk'>@@ -175,8 +175,8 @@ typedef struct sg_device { /* holds the state of each scsi generic device */</div><div class='ctx'> </div><div class='ctx'> static int sg_fasync(int fd, struct file *filp, int mode);</div><div class='ctx'> /* tasklet or soft irq callback */</div><div class='del'>-static void sg_cmd_done(void *data, char *sense, int result, int resid);</div><div class='del'>-static int sg_start_req(Sg_request * srp);</div><div class='add'>+static void sg_rq_end_io(struct request *rq, int uptodate);</div><div class='add'>+static int sg_start_req(Sg_request *srp, unsigned char *cmd);</div><div class='ctx'> static void sg_finish_rem_req(Sg_request * srp);</div><div class='ctx'> static int sg_build_indirect(Sg_scatter_hold * schp, Sg_fd * sfp, int buff_size);</div><div class='ctx'> static int sg_build_sgat(Sg_scatter_hold * schp, const Sg_fd * sfp,</div><div class='hunk'>@@ -188,17 +188,11 @@ static ssize_t sg_new_write(Sg_fd *sfp, struct file *file,</div><div class='ctx'> 			int read_only, Sg_request **o_srp);</div><div class='ctx'> static int sg_common_write(Sg_fd * sfp, Sg_request * srp,</div><div class='ctx'> 			   unsigned char *cmnd, int timeout, int blocking);</div><div class='del'>-static int sg_u_iovec(sg_io_hdr_t * hp, int sg_num, int ind,</div><div class='del'>-		      int wr_xf, int *countp, unsigned char __user **up);</div><div class='del'>-static int sg_write_xfer(Sg_request * srp);</div><div class='del'>-static int sg_read_xfer(Sg_request * srp);</div><div class='ctx'> static int sg_read_oxfer(Sg_request * srp, char __user *outp, int num_read_xfer);</div><div class='ctx'> static void sg_remove_scat(Sg_scatter_hold * schp);</div><div class='ctx'> static void sg_build_reserve(Sg_fd * sfp, int req_size);</div><div class='ctx'> static void sg_link_reserve(Sg_fd * sfp, Sg_request * srp, int size);</div><div class='ctx'> static void sg_unlink_reserve(Sg_fd * sfp, Sg_request * srp);</div><div class='del'>-static struct page *sg_page_malloc(int rqSz, int lowDma, int *retSzp);</div><div class='del'>-static void sg_page_free(struct page *page, int size);</div><div class='ctx'> static Sg_fd *sg_add_sfp(Sg_device * sdp, int dev);</div><div class='ctx'> static int sg_remove_sfp(Sg_device * sdp, Sg_fd * sfp);</div><div class='ctx'> static void __sg_remove_sfp(Sg_device * sdp, Sg_fd * sfp);</div><div class='hunk'>@@ -206,7 +200,6 @@ static Sg_request *sg_get_rq_mark(Sg_fd * sfp, int pack_id);</div><div class='ctx'> static Sg_request *sg_add_request(Sg_fd * sfp);</div><div class='ctx'> static int sg_remove_request(Sg_fd * sfp, Sg_request * srp);</div><div class='ctx'> static int sg_res_in_use(Sg_fd * sfp);</div><div class='del'>-static int sg_build_direct(Sg_request * srp, Sg_fd * sfp, int dxfer_len);</div><div class='ctx'> static Sg_device *sg_get_dev(int dev);</div><div class='ctx'> #ifdef CONFIG_SCSI_PROC_FS</div><div class='ctx'> static int sg_last_dev(void);</div><div class='hunk'>@@ -529,8 +522,7 @@ sg_new_read(Sg_fd * sfp, char __user *buf, size_t count, Sg_request * srp)</div><div class='ctx'> 		err = -EFAULT;</div><div class='ctx'> 		goto err_out;</div><div class='ctx'> 	}</div><div class='del'>-	err = sg_read_xfer(srp);</div><div class='del'>-      err_out:</div><div class='add'>+err_out:</div><div class='ctx'> 	sg_finish_rem_req(srp);</div><div class='ctx'> 	return (0 == err) ? count : err;</div><div class='ctx'> }</div><div class='hunk'>@@ -612,7 +604,10 @@ sg_write(struct file *filp, const char __user *buf, size_t count, loff_t * ppos)</div><div class='ctx'> 	else</div><div class='ctx'> 		hp-&gt;dxfer_direction = (mxsize &gt; 0) ? SG_DXFER_FROM_DEV : SG_DXFER_NONE;</div><div class='ctx'> 	hp-&gt;dxfer_len = mxsize;</div><div class='del'>-	hp-&gt;dxferp = (char __user *)buf + cmd_size;</div><div class='add'>+	if (hp-&gt;dxfer_direction == SG_DXFER_TO_DEV)</div><div class='add'>+		hp-&gt;dxferp = (char __user *)buf + cmd_size;</div><div class='add'>+	else</div><div class='add'>+		hp-&gt;dxferp = NULL;</div><div class='ctx'> 	hp-&gt;sbp = NULL;</div><div class='ctx'> 	hp-&gt;timeout = old_hdr.reply_len;	/* structure abuse ... */</div><div class='ctx'> 	hp-&gt;flags = input_size;	/* structure abuse ... */</div><div class='hunk'>@@ -732,16 +727,12 @@ sg_common_write(Sg_fd * sfp, Sg_request * srp,</div><div class='ctx'> 	SCSI_LOG_TIMEOUT(4, printk("sg_common_write:  scsi opcode=0x%02x, cmd_size=%d\n",</div><div class='ctx'> 			  (int) cmnd[0], (int) hp-&gt;cmd_len));</div><div class='ctx'> </div><div class='del'>-	if ((k = sg_start_req(srp))) {</div><div class='add'>+	k = sg_start_req(srp, cmnd);</div><div class='add'>+	if (k) {</div><div class='ctx'> 		SCSI_LOG_TIMEOUT(1, printk("sg_common_write: start_req err=%d\n", k));</div><div class='ctx'> 		sg_finish_rem_req(srp);</div><div class='ctx'> 		return k;	/* probably out of space --&gt; ENOMEM */</div><div class='ctx'> 	}</div><div class='del'>-	if ((k = sg_write_xfer(srp))) {</div><div class='del'>-		SCSI_LOG_TIMEOUT(1, printk("sg_common_write: write_xfer, bad address\n"));</div><div class='del'>-		sg_finish_rem_req(srp);</div><div class='del'>-		return k;</div><div class='del'>-	}</div><div class='ctx'> 	if (sdp-&gt;detached) {</div><div class='ctx'> 		sg_finish_rem_req(srp);</div><div class='ctx'> 		return -ENODEV;</div><div class='hunk'>@@ -763,20 +754,11 @@ sg_common_write(Sg_fd * sfp, Sg_request * srp,</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	hp-&gt;duration = jiffies_to_msecs(jiffies);</div><div class='del'>-/* Now send everything of to mid-level. The next time we hear about this</div><div class='del'>-   packet is when sg_cmd_done() is called (i.e. a callback). */</div><div class='del'>-	if (scsi_execute_async(sdp-&gt;device, cmnd, hp-&gt;cmd_len, data_dir, srp-&gt;data.buffer,</div><div class='del'>-				hp-&gt;dxfer_len, srp-&gt;data.k_use_sg, timeout,</div><div class='del'>-				SG_DEFAULT_RETRIES, srp, sg_cmd_done,</div><div class='del'>-				GFP_ATOMIC)) {</div><div class='del'>-		SCSI_LOG_TIMEOUT(1, printk("sg_common_write: scsi_execute_async failed\n"));</div><div class='del'>-		/*</div><div class='del'>-		 * most likely out of mem, but could also be a bad map</div><div class='del'>-		 */</div><div class='del'>-		sg_finish_rem_req(srp);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	} else</div><div class='del'>-		return 0;</div><div class='add'>+</div><div class='add'>+	srp-&gt;rq-&gt;timeout = timeout;</div><div class='add'>+	blk_execute_rq_nowait(sdp-&gt;device-&gt;request_queue, sdp-&gt;disk,</div><div class='add'>+			      srp-&gt;rq, 1, sg_rq_end_io);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -1192,8 +1174,7 @@ sg_vma_fault(struct vm_area_struct *vma, struct vm_fault *vmf)</div><div class='ctx'> 	Sg_fd *sfp;</div><div class='ctx'> 	unsigned long offset, len, sa;</div><div class='ctx'> 	Sg_scatter_hold *rsv_schp;</div><div class='del'>-	struct scatterlist *sg;</div><div class='del'>-	int k;</div><div class='add'>+	int k, length;</div><div class='ctx'> </div><div class='ctx'> 	if ((NULL == vma) || (!(sfp = (Sg_fd *) vma-&gt;vm_private_data)))</div><div class='ctx'> 		return VM_FAULT_SIGBUS;</div><div class='hunk'>@@ -1203,15 +1184,14 @@ sg_vma_fault(struct vm_area_struct *vma, struct vm_fault *vmf)</div><div class='ctx'> 		return VM_FAULT_SIGBUS;</div><div class='ctx'> 	SCSI_LOG_TIMEOUT(3, printk("sg_vma_fault: offset=%lu, scatg=%d\n",</div><div class='ctx'> 				   offset, rsv_schp-&gt;k_use_sg));</div><div class='del'>-	sg = rsv_schp-&gt;buffer;</div><div class='ctx'> 	sa = vma-&gt;vm_start;</div><div class='del'>-	for (k = 0; (k &lt; rsv_schp-&gt;k_use_sg) &amp;&amp; (sa &lt; vma-&gt;vm_end);</div><div class='del'>-	     ++k, sg = sg_next(sg)) {</div><div class='add'>+	length = 1 &lt;&lt; (PAGE_SHIFT + rsv_schp-&gt;page_order);</div><div class='add'>+	for (k = 0; k &lt; rsv_schp-&gt;k_use_sg &amp;&amp; sa &lt; vma-&gt;vm_end; k++) {</div><div class='ctx'> 		len = vma-&gt;vm_end - sa;</div><div class='del'>-		len = (len &lt; sg-&gt;length) ? len : sg-&gt;length;</div><div class='add'>+		len = (len &lt; length) ? len : length;</div><div class='ctx'> 		if (offset &lt; len) {</div><div class='del'>-			struct page *page;</div><div class='del'>-			page = virt_to_page(page_address(sg_page(sg)) + offset);</div><div class='add'>+			struct page *page = nth_page(rsv_schp-&gt;pages[k],</div><div class='add'>+						     offset &gt;&gt; PAGE_SHIFT);</div><div class='ctx'> 			get_page(page);	/* increment page count */</div><div class='ctx'> 			vmf-&gt;page = page;</div><div class='ctx'> 			return 0; /* success */</div><div class='hunk'>@@ -1233,8 +1213,7 @@ sg_mmap(struct file *filp, struct vm_area_struct *vma)</div><div class='ctx'> 	Sg_fd *sfp;</div><div class='ctx'> 	unsigned long req_sz, len, sa;</div><div class='ctx'> 	Sg_scatter_hold *rsv_schp;</div><div class='del'>-	int k;</div><div class='del'>-	struct scatterlist *sg;</div><div class='add'>+	int k, length;</div><div class='ctx'> </div><div class='ctx'> 	if ((!filp) || (!vma) || (!(sfp = (Sg_fd *) filp-&gt;private_data)))</div><div class='ctx'> 		return -ENXIO;</div><div class='hunk'>@@ -1248,11 +1227,10 @@ sg_mmap(struct file *filp, struct vm_area_struct *vma)</div><div class='ctx'> 		return -ENOMEM;	/* cannot map more than reserved buffer */</div><div class='ctx'> </div><div class='ctx'> 	sa = vma-&gt;vm_start;</div><div class='del'>-	sg = rsv_schp-&gt;buffer;</div><div class='del'>-	for (k = 0; (k &lt; rsv_schp-&gt;k_use_sg) &amp;&amp; (sa &lt; vma-&gt;vm_end);</div><div class='del'>-	     ++k, sg = sg_next(sg)) {</div><div class='add'>+	length = 1 &lt;&lt; (PAGE_SHIFT + rsv_schp-&gt;page_order);</div><div class='add'>+	for (k = 0; k &lt; rsv_schp-&gt;k_use_sg &amp;&amp; sa &lt; vma-&gt;vm_end; k++) {</div><div class='ctx'> 		len = vma-&gt;vm_end - sa;</div><div class='del'>-		len = (len &lt; sg-&gt;length) ? len : sg-&gt;length;</div><div class='add'>+		len = (len &lt; length) ? len : length;</div><div class='ctx'> 		sa += len;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1263,16 +1241,19 @@ sg_mmap(struct file *filp, struct vm_area_struct *vma)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* This function is a "bottom half" handler that is called by the</div><div class='del'>- * mid level when a command is completed (or has failed). */</div><div class='del'>-static void</div><div class='del'>-sg_cmd_done(void *data, char *sense, int result, int resid)</div><div class='add'>+/*</div><div class='add'>+ * This function is a "bottom half" handler that is called by the mid</div><div class='add'>+ * level when a command is completed (or has failed).</div><div class='add'>+ */</div><div class='add'>+static void sg_rq_end_io(struct request *rq, int uptodate)</div><div class='ctx'> {</div><div class='del'>-	Sg_request *srp = data;</div><div class='add'>+	struct sg_request *srp = rq-&gt;end_io_data;</div><div class='ctx'> 	Sg_device *sdp = NULL;</div><div class='ctx'> 	Sg_fd *sfp;</div><div class='ctx'> 	unsigned long iflags;</div><div class='ctx'> 	unsigned int ms;</div><div class='add'>+	char *sense;</div><div class='add'>+	int result, resid;</div><div class='ctx'> </div><div class='ctx'> 	if (NULL == srp) {</div><div class='ctx'> 		printk(KERN_ERR "sg_cmd_done: NULL request\n");</div><div class='hunk'>@@ -1286,6 +1267,9 @@ sg_cmd_done(void *data, char *sense, int result, int resid)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	sense = rq-&gt;sense;</div><div class='add'>+	result = rq-&gt;errors;</div><div class='add'>+	resid = rq-&gt;data_len;</div><div class='ctx'> </div><div class='ctx'> 	SCSI_LOG_TIMEOUT(4, printk("sg_cmd_done: %s, pack_id=%d, res=0x%x\n",</div><div class='ctx'> 		sdp-&gt;disk-&gt;disk_name, srp-&gt;header.pack_id, result));</div><div class='hunk'>@@ -1296,7 +1280,6 @@ sg_cmd_done(void *data, char *sense, int result, int resid)</div><div class='ctx'> 	if (0 != result) {</div><div class='ctx'> 		struct scsi_sense_hdr sshdr;</div><div class='ctx'> </div><div class='del'>-		memcpy(srp-&gt;sense_b, sense, sizeof (srp-&gt;sense_b));</div><div class='ctx'> 		srp-&gt;header.status = 0xff &amp; result;</div><div class='ctx'> 		srp-&gt;header.masked_status = status_byte(result);</div><div class='ctx'> 		srp-&gt;header.msg_status = msg_byte(result);</div><div class='hunk'>@@ -1467,12 +1450,10 @@ sg_add(struct device *cl_dev, struct class_interface *cl_intf)</div><div class='ctx'> 	if (sg_sysfs_valid) {</div><div class='ctx'> 		struct device *sg_class_member;</div><div class='ctx'> </div><div class='del'>-		sg_class_member = device_create_drvdata(sg_sysfs_class,</div><div class='del'>-							cl_dev-&gt;parent,</div><div class='del'>-							MKDEV(SCSI_GENERIC_MAJOR,</div><div class='del'>-							      sdp-&gt;index),</div><div class='del'>-							sdp,</div><div class='del'>-							"%s", disk-&gt;disk_name);</div><div class='add'>+		sg_class_member = device_create(sg_sysfs_class, cl_dev-&gt;parent,</div><div class='add'>+						MKDEV(SCSI_GENERIC_MAJOR,</div><div class='add'>+						      sdp-&gt;index),</div><div class='add'>+						sdp, "%s", disk-&gt;disk_name);</div><div class='ctx'> 		if (IS_ERR(sg_class_member)) {</div><div class='ctx'> 			printk(KERN_ERR "sg_add: "</div><div class='ctx'> 			       "device_create failed\n");</div><div class='hunk'>@@ -1634,37 +1615,79 @@ exit_sg(void)</div><div class='ctx'> 	idr_destroy(&amp;sg_index_idr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-sg_start_req(Sg_request * srp)</div><div class='add'>+static int sg_start_req(Sg_request *srp, unsigned char *cmd)</div><div class='ctx'> {</div><div class='ctx'> 	int res;</div><div class='add'>+	struct request *rq;</div><div class='ctx'> 	Sg_fd *sfp = srp-&gt;parentfp;</div><div class='ctx'> 	sg_io_hdr_t *hp = &amp;srp-&gt;header;</div><div class='ctx'> 	int dxfer_len = (int) hp-&gt;dxfer_len;</div><div class='ctx'> 	int dxfer_dir = hp-&gt;dxfer_direction;</div><div class='add'>+	unsigned int iov_count = hp-&gt;iovec_count;</div><div class='ctx'> 	Sg_scatter_hold *req_schp = &amp;srp-&gt;data;</div><div class='ctx'> 	Sg_scatter_hold *rsv_schp = &amp;sfp-&gt;reserve;</div><div class='add'>+	struct request_queue *q = sfp-&gt;parentdp-&gt;device-&gt;request_queue;</div><div class='add'>+	struct rq_map_data *md, map_data;</div><div class='add'>+	int rw = hp-&gt;dxfer_direction == SG_DXFER_TO_DEV ? WRITE : READ;</div><div class='add'>+</div><div class='add'>+	SCSI_LOG_TIMEOUT(4, printk(KERN_INFO "sg_start_req: dxfer_len=%d\n",</div><div class='add'>+				   dxfer_len));</div><div class='add'>+</div><div class='add'>+	rq = blk_get_request(q, rw, GFP_ATOMIC);</div><div class='add'>+	if (!rq)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	memcpy(rq-&gt;cmd, cmd, hp-&gt;cmd_len);</div><div class='add'>+</div><div class='add'>+	rq-&gt;cmd_len = hp-&gt;cmd_len;</div><div class='add'>+	rq-&gt;cmd_type = REQ_TYPE_BLOCK_PC;</div><div class='add'>+</div><div class='add'>+	srp-&gt;rq = rq;</div><div class='add'>+	rq-&gt;end_io_data = srp;</div><div class='add'>+	rq-&gt;sense = srp-&gt;sense_b;</div><div class='add'>+	rq-&gt;retries = SG_DEFAULT_RETRIES;</div><div class='ctx'> </div><div class='del'>-	SCSI_LOG_TIMEOUT(4, printk("sg_start_req: dxfer_len=%d\n", dxfer_len));</div><div class='ctx'> 	if ((dxfer_len &lt;= 0) || (dxfer_dir == SG_DXFER_NONE))</div><div class='ctx'> 		return 0;</div><div class='del'>-	if (sg_allow_dio &amp;&amp; (hp-&gt;flags &amp; SG_FLAG_DIRECT_IO) &amp;&amp;</div><div class='del'>-	    (dxfer_dir != SG_DXFER_UNKNOWN) &amp;&amp; (0 == hp-&gt;iovec_count) &amp;&amp;</div><div class='del'>-	    (!sfp-&gt;parentdp-&gt;device-&gt;host-&gt;unchecked_isa_dma)) {</div><div class='del'>-		res = sg_build_direct(srp, sfp, dxfer_len);</div><div class='del'>-		if (res &lt;= 0)	/* -ve -&gt; error, 0 -&gt; done, 1 -&gt; try indirect */</div><div class='del'>-			return res;</div><div class='del'>-	}</div><div class='del'>-	if ((!sg_res_in_use(sfp)) &amp;&amp; (dxfer_len &lt;= rsv_schp-&gt;bufflen))</div><div class='del'>-		sg_link_reserve(sfp, srp, dxfer_len);</div><div class='del'>-	else {</div><div class='del'>-		res = sg_build_indirect(req_schp, sfp, dxfer_len);</div><div class='del'>-		if (res) {</div><div class='del'>-			sg_remove_scat(req_schp);</div><div class='del'>-			return res;</div><div class='add'>+</div><div class='add'>+	if (sg_allow_dio &amp;&amp; hp-&gt;flags &amp; SG_FLAG_DIRECT_IO &amp;&amp;</div><div class='add'>+	    dxfer_dir != SG_DXFER_UNKNOWN &amp;&amp; !iov_count &amp;&amp;</div><div class='add'>+	    !sfp-&gt;parentdp-&gt;device-&gt;host-&gt;unchecked_isa_dma &amp;&amp;</div><div class='add'>+	    blk_rq_aligned(q, hp-&gt;dxferp, dxfer_len))</div><div class='add'>+		md = NULL;</div><div class='add'>+	else</div><div class='add'>+		md = &amp;map_data;</div><div class='add'>+</div><div class='add'>+	if (md) {</div><div class='add'>+		if (!sg_res_in_use(sfp) &amp;&amp; dxfer_len &lt;= rsv_schp-&gt;bufflen)</div><div class='add'>+			sg_link_reserve(sfp, srp, dxfer_len);</div><div class='add'>+		else {</div><div class='add'>+			res = sg_build_indirect(req_schp, sfp, dxfer_len);</div><div class='add'>+			if (res)</div><div class='add'>+				return res;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		md-&gt;pages = req_schp-&gt;pages;</div><div class='add'>+		md-&gt;page_order = req_schp-&gt;page_order;</div><div class='add'>+		md-&gt;nr_entries = req_schp-&gt;k_use_sg;</div><div class='ctx'> 	}</div><div class='del'>-	return 0;</div><div class='add'>+</div><div class='add'>+	if (iov_count)</div><div class='add'>+		res = blk_rq_map_user_iov(q, rq, md, hp-&gt;dxferp, iov_count,</div><div class='add'>+					  hp-&gt;dxfer_len, GFP_ATOMIC);</div><div class='add'>+	else</div><div class='add'>+		res = blk_rq_map_user(q, rq, md, hp-&gt;dxferp,</div><div class='add'>+				      hp-&gt;dxfer_len, GFP_ATOMIC);</div><div class='add'>+</div><div class='add'>+	if (!res) {</div><div class='add'>+		srp-&gt;bio = rq-&gt;bio;</div><div class='add'>+</div><div class='add'>+		if (!md) {</div><div class='add'>+			req_schp-&gt;dio_in_use = 1;</div><div class='add'>+			hp-&gt;info |= SG_INFO_DIRECT_IO;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -1678,186 +1701,37 @@ sg_finish_rem_req(Sg_request * srp)</div><div class='ctx'> 		sg_unlink_reserve(sfp, srp);</div><div class='ctx'> 	else</div><div class='ctx'> 		sg_remove_scat(req_schp);</div><div class='add'>+</div><div class='add'>+	if (srp-&gt;rq) {</div><div class='add'>+		if (srp-&gt;bio)</div><div class='add'>+			blk_rq_unmap_user(srp-&gt;bio);</div><div class='add'>+</div><div class='add'>+		blk_put_request(srp-&gt;rq);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	sg_remove_request(sfp, srp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='ctx'> sg_build_sgat(Sg_scatter_hold * schp, const Sg_fd * sfp, int tablesize)</div><div class='ctx'> {</div><div class='del'>-	int sg_bufflen = tablesize * sizeof(struct scatterlist);</div><div class='add'>+	int sg_bufflen = tablesize * sizeof(struct page *);</div><div class='ctx'> 	gfp_t gfp_flags = GFP_ATOMIC | __GFP_NOWARN;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * TODO: test without low_dma, we should not need it since</div><div class='del'>-	 * the block layer will bounce the buffer for us</div><div class='del'>-	 *</div><div class='del'>-	 * XXX(hch): we shouldn't need GFP_DMA for the actual S/G list.</div><div class='del'>-	 */</div><div class='del'>-	if (sfp-&gt;low_dma)</div><div class='del'>-		 gfp_flags |= GFP_DMA;</div><div class='del'>-	schp-&gt;buffer = kzalloc(sg_bufflen, gfp_flags);</div><div class='del'>-	if (!schp-&gt;buffer)</div><div class='add'>+	schp-&gt;pages = kzalloc(sg_bufflen, gfp_flags);</div><div class='add'>+	if (!schp-&gt;pages)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	sg_init_table(schp-&gt;buffer, tablesize);</div><div class='ctx'> 	schp-&gt;sglist_len = sg_bufflen;</div><div class='ctx'> 	return tablesize;	/* number of scat_gath elements allocated */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef SG_ALLOW_DIO_CODE</div><div class='del'>-/* vvvvvvvv  following code borrowed from st driver's direct IO vvvvvvvvv */</div><div class='del'>-	/* TODO: hopefully we can use the generic block layer code */</div><div class='del'>-</div><div class='del'>-/* Pin down user pages and put them into a scatter gather list. Returns &lt;= 0 if</div><div class='del'>-   - mapping of all pages not successful</div><div class='del'>-   (i.e., either completely successful or fails)</div><div class='del'>-*/</div><div class='del'>-static int </div><div class='del'>-st_map_user_pages(struct scatterlist *sgl, const unsigned int max_pages, </div><div class='del'>-	          unsigned long uaddr, size_t count, int rw)</div><div class='del'>-{</div><div class='del'>-	unsigned long end = (uaddr + count + PAGE_SIZE - 1) &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	unsigned long start = uaddr &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	const int nr_pages = end - start;</div><div class='del'>-	int res, i, j;</div><div class='del'>-	struct page **pages;</div><div class='del'>-</div><div class='del'>-	/* User attempted Overflow! */</div><div class='del'>-	if ((uaddr + count) &lt; uaddr)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	/* Too big */</div><div class='del'>-        if (nr_pages &gt; max_pages)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	/* Hmm? */</div><div class='del'>-	if (count == 0)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if ((pages = kmalloc(max_pages * sizeof(*pages), GFP_ATOMIC)) == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-        /* Try to fault in all of the necessary pages */</div><div class='del'>-	down_read(&amp;current-&gt;mm-&gt;mmap_sem);</div><div class='del'>-        /* rw==READ means read from drive, write into memory area */</div><div class='del'>-	res = get_user_pages(</div><div class='del'>-		current,</div><div class='del'>-		current-&gt;mm,</div><div class='del'>-		uaddr,</div><div class='del'>-		nr_pages,</div><div class='del'>-		rw == READ,</div><div class='del'>-		0, /* don't force */</div><div class='del'>-		pages,</div><div class='del'>-		NULL);</div><div class='del'>-	up_read(&amp;current-&gt;mm-&gt;mmap_sem);</div><div class='del'>-</div><div class='del'>-	/* Errors and no page mapped should return here */</div><div class='del'>-	if (res &lt; nr_pages)</div><div class='del'>-		goto out_unmap;</div><div class='del'>-</div><div class='del'>-        for (i=0; i &lt; nr_pages; i++) {</div><div class='del'>-                /* FIXME: flush superflous for rw==READ,</div><div class='del'>-                 * probably wrong function for rw==WRITE</div><div class='del'>-                 */</div><div class='del'>-		flush_dcache_page(pages[i]);</div><div class='del'>-		/* ?? Is locking needed? I don't think so */</div><div class='del'>-		/* if (!trylock_page(pages[i]))</div><div class='del'>-		   goto out_unlock; */</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-	sg_set_page(sgl, pages[0], 0, uaddr &amp; ~PAGE_MASK);</div><div class='del'>-	if (nr_pages &gt; 1) {</div><div class='del'>-		sgl[0].length = PAGE_SIZE - sgl[0].offset;</div><div class='del'>-		count -= sgl[0].length;</div><div class='del'>-		for (i=1; i &lt; nr_pages ; i++)</div><div class='del'>-			sg_set_page(&amp;sgl[i], pages[i], count &lt; PAGE_SIZE ? count : PAGE_SIZE, 0);</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		sgl[0].length = count;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	kfree(pages);</div><div class='del'>-	return nr_pages;</div><div class='del'>-</div><div class='del'>- out_unmap:</div><div class='del'>-	if (res &gt; 0) {</div><div class='del'>-		for (j=0; j &lt; res; j++)</div><div class='del'>-			page_cache_release(pages[j]);</div><div class='del'>-		res = 0;</div><div class='del'>-	}</div><div class='del'>-	kfree(pages);</div><div class='del'>-	return res;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* And unmap them... */</div><div class='del'>-static int </div><div class='del'>-st_unmap_user_pages(struct scatterlist *sgl, const unsigned int nr_pages,</div><div class='del'>-		    int dirtied)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i=0; i &lt; nr_pages; i++) {</div><div class='del'>-		struct page *page = sg_page(&amp;sgl[i]);</div><div class='del'>-</div><div class='del'>-		if (dirtied)</div><div class='del'>-			SetPageDirty(page);</div><div class='del'>-		/* unlock_page(page); */</div><div class='del'>-		/* FIXME: cache flush missing for rw==READ</div><div class='del'>-		 * FIXME: call the correct reference counting function</div><div class='del'>-		 */</div><div class='del'>-		page_cache_release(page);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* ^^^^^^^^  above code borrowed from st driver's direct IO ^^^^^^^^^ */</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Returns: -ve -&gt; error, 0 -&gt; done, 1 -&gt; try indirect */</div><div class='del'>-static int</div><div class='del'>-sg_build_direct(Sg_request * srp, Sg_fd * sfp, int dxfer_len)</div><div class='del'>-{</div><div class='del'>-#ifdef SG_ALLOW_DIO_CODE</div><div class='del'>-	sg_io_hdr_t *hp = &amp;srp-&gt;header;</div><div class='del'>-	Sg_scatter_hold *schp = &amp;srp-&gt;data;</div><div class='del'>-	int sg_tablesize = sfp-&gt;parentdp-&gt;sg_tablesize;</div><div class='del'>-	int mx_sc_elems, res;</div><div class='del'>-	struct scsi_device *sdev = sfp-&gt;parentdp-&gt;device;</div><div class='del'>-</div><div class='del'>-	if (((unsigned long)hp-&gt;dxferp &amp;</div><div class='del'>-			queue_dma_alignment(sdev-&gt;request_queue)) != 0)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	mx_sc_elems = sg_build_sgat(schp, sfp, sg_tablesize);</div><div class='del'>-        if (mx_sc_elems &lt;= 0) {</div><div class='del'>-                return 1;</div><div class='del'>-        }</div><div class='del'>-	res = st_map_user_pages(schp-&gt;buffer, mx_sc_elems,</div><div class='del'>-				(unsigned long)hp-&gt;dxferp, dxfer_len, </div><div class='del'>-				(SG_DXFER_TO_DEV == hp-&gt;dxfer_direction) ? 1 : 0);</div><div class='del'>-	if (res &lt;= 0) {</div><div class='del'>-		sg_remove_scat(schp);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-	schp-&gt;k_use_sg = res;</div><div class='del'>-	schp-&gt;dio_in_use = 1;</div><div class='del'>-	hp-&gt;info |= SG_INFO_DIRECT_IO;</div><div class='del'>-	return 0;</div><div class='del'>-#else</div><div class='del'>-	return 1;</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int</div><div class='ctx'> sg_build_indirect(Sg_scatter_hold * schp, Sg_fd * sfp, int buff_size)</div><div class='ctx'> {</div><div class='del'>-	struct scatterlist *sg;</div><div class='del'>-	int ret_sz = 0, k, rem_sz, num, mx_sc_elems;</div><div class='add'>+	int ret_sz = 0, i, k, rem_sz, num, mx_sc_elems;</div><div class='ctx'> 	int sg_tablesize = sfp-&gt;parentdp-&gt;sg_tablesize;</div><div class='del'>-	int blk_size = buff_size;</div><div class='del'>-	struct page *p = NULL;</div><div class='add'>+	int blk_size = buff_size, order;</div><div class='add'>+	gfp_t gfp_mask = GFP_ATOMIC | __GFP_COMP | __GFP_NOWARN;</div><div class='ctx'> </div><div class='ctx'> 	if (blk_size &lt; 0)</div><div class='ctx'> 		return -EFAULT;</div><div class='hunk'>@@ -1881,15 +1755,26 @@ sg_build_indirect(Sg_scatter_hold * schp, Sg_fd * sfp, int buff_size)</div><div class='ctx'> 		} else</div><div class='ctx'> 			scatter_elem_sz_prev = num;</div><div class='ctx'> 	}</div><div class='del'>-	for (k = 0, sg = schp-&gt;buffer, rem_sz = blk_size;</div><div class='del'>-	     (rem_sz &gt; 0) &amp;&amp; (k &lt; mx_sc_elems);</div><div class='del'>-	     ++k, rem_sz -= ret_sz, sg = sg_next(sg)) {</div><div class='del'>-		</div><div class='add'>+</div><div class='add'>+	if (sfp-&gt;low_dma)</div><div class='add'>+		gfp_mask |= GFP_DMA;</div><div class='add'>+</div><div class='add'>+	if (!capable(CAP_SYS_ADMIN) || !capable(CAP_SYS_RAWIO))</div><div class='add'>+		gfp_mask |= __GFP_ZERO;</div><div class='add'>+</div><div class='add'>+	order = get_order(num);</div><div class='add'>+retry:</div><div class='add'>+	ret_sz = 1 &lt;&lt; (PAGE_SHIFT + order);</div><div class='add'>+</div><div class='add'>+	for (k = 0, rem_sz = blk_size; rem_sz &gt; 0 &amp;&amp; k &lt; mx_sc_elems;</div><div class='add'>+	     k++, rem_sz -= ret_sz) {</div><div class='add'>+</div><div class='ctx'> 		num = (rem_sz &gt; scatter_elem_sz_prev) ?</div><div class='del'>-		      scatter_elem_sz_prev : rem_sz;</div><div class='del'>-		p = sg_page_malloc(num, sfp-&gt;low_dma, &amp;ret_sz);</div><div class='del'>-		if (!p)</div><div class='del'>-			return -ENOMEM;</div><div class='add'>+			scatter_elem_sz_prev : rem_sz;</div><div class='add'>+</div><div class='add'>+		schp-&gt;pages[k] = alloc_pages(gfp_mask, order);</div><div class='add'>+		if (!schp-&gt;pages[k])</div><div class='add'>+			goto out;</div><div class='ctx'> </div><div class='ctx'> 		if (num == scatter_elem_sz_prev) {</div><div class='ctx'> 			if (unlikely(ret_sz &gt; scatter_elem_sz_prev)) {</div><div class='hunk'>@@ -1897,12 +1782,12 @@ sg_build_indirect(Sg_scatter_hold * schp, Sg_fd * sfp, int buff_size)</div><div class='ctx'> 				scatter_elem_sz_prev = ret_sz;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		sg_set_page(sg, p, (ret_sz &gt; num) ? num : ret_sz, 0);</div><div class='ctx'> </div><div class='ctx'> 		SCSI_LOG_TIMEOUT(5, printk("sg_build_indirect: k=%d, num=%d, "</div><div class='ctx'> 				 "ret_sz=%d\n", k, num, ret_sz));</div><div class='ctx'> 	}		/* end of for loop */</div><div class='ctx'> </div><div class='add'>+	schp-&gt;page_order = order;</div><div class='ctx'> 	schp-&gt;k_use_sg = k;</div><div class='ctx'> 	SCSI_LOG_TIMEOUT(5, printk("sg_build_indirect: k_use_sg=%d, "</div><div class='ctx'> 			 "rem_sz=%d\n", k, rem_sz));</div><div class='hunk'>@@ -1910,223 +1795,42 @@ sg_build_indirect(Sg_scatter_hold * schp, Sg_fd * sfp, int buff_size)</div><div class='ctx'> 	schp-&gt;bufflen = blk_size;</div><div class='ctx'> 	if (rem_sz &gt; 0)	/* must have failed */</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-sg_write_xfer(Sg_request * srp)</div><div class='del'>-{</div><div class='del'>-	sg_io_hdr_t *hp = &amp;srp-&gt;header;</div><div class='del'>-	Sg_scatter_hold *schp = &amp;srp-&gt;data;</div><div class='del'>-	struct scatterlist *sg = schp-&gt;buffer;</div><div class='del'>-	int num_xfer = 0;</div><div class='del'>-	int j, k, onum, usglen, ksglen, res;</div><div class='del'>-	int iovec_count = (int) hp-&gt;iovec_count;</div><div class='del'>-	int dxfer_dir = hp-&gt;dxfer_direction;</div><div class='del'>-	unsigned char *p;</div><div class='del'>-	unsigned char __user *up;</div><div class='del'>-	int new_interface = ('\0' == hp-&gt;interface_id) ? 0 : 1;</div><div class='del'>-</div><div class='del'>-	if ((SG_DXFER_UNKNOWN == dxfer_dir) || (SG_DXFER_TO_DEV == dxfer_dir) ||</div><div class='del'>-	    (SG_DXFER_TO_FROM_DEV == dxfer_dir)) {</div><div class='del'>-		num_xfer = (int) (new_interface ? hp-&gt;dxfer_len : hp-&gt;flags);</div><div class='del'>-		if (schp-&gt;bufflen &lt; num_xfer)</div><div class='del'>-			num_xfer = schp-&gt;bufflen;</div><div class='del'>-	}</div><div class='del'>-	if ((num_xfer &lt;= 0) || (schp-&gt;dio_in_use) ||</div><div class='del'>-	    (new_interface</div><div class='del'>-	     &amp;&amp; ((SG_FLAG_NO_DXFER | SG_FLAG_MMAP_IO) &amp; hp-&gt;flags)))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	SCSI_LOG_TIMEOUT(4, printk("sg_write_xfer: num_xfer=%d, iovec_count=%d, k_use_sg=%d\n",</div><div class='del'>-			  num_xfer, iovec_count, schp-&gt;k_use_sg));</div><div class='del'>-	if (iovec_count) {</div><div class='del'>-		onum = iovec_count;</div><div class='del'>-		if (!access_ok(VERIFY_READ, hp-&gt;dxferp, SZ_SG_IOVEC * onum))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-	} else</div><div class='del'>-		onum = 1;</div><div class='del'>-</div><div class='del'>-	ksglen = sg-&gt;length;</div><div class='del'>-	p = page_address(sg_page(sg));</div><div class='del'>-	for (j = 0, k = 0; j &lt; onum; ++j) {</div><div class='del'>-		res = sg_u_iovec(hp, iovec_count, j, 1, &amp;usglen, &amp;up);</div><div class='del'>-		if (res)</div><div class='del'>-			return res;</div><div class='del'>-</div><div class='del'>-		for (; p; sg = sg_next(sg), ksglen = sg-&gt;length,</div><div class='del'>-		     p = page_address(sg_page(sg))) {</div><div class='del'>-			if (usglen &lt;= 0)</div><div class='del'>-				break;</div><div class='del'>-			if (ksglen &gt; usglen) {</div><div class='del'>-				if (usglen &gt;= num_xfer) {</div><div class='del'>-					if (__copy_from_user(p, up, num_xfer))</div><div class='del'>-						return -EFAULT;</div><div class='del'>-					return 0;</div><div class='del'>-				}</div><div class='del'>-				if (__copy_from_user(p, up, usglen))</div><div class='del'>-					return -EFAULT;</div><div class='del'>-				p += usglen;</div><div class='del'>-				ksglen -= usglen;</div><div class='del'>-				break;</div><div class='del'>-			} else {</div><div class='del'>-				if (ksglen &gt;= num_xfer) {</div><div class='del'>-					if (__copy_from_user(p, up, num_xfer))</div><div class='del'>-						return -EFAULT;</div><div class='del'>-					return 0;</div><div class='del'>-				}</div><div class='del'>-				if (__copy_from_user(p, up, ksglen))</div><div class='del'>-					return -EFAULT;</div><div class='del'>-				up += ksglen;</div><div class='del'>-				usglen -= ksglen;</div><div class='del'>-			}</div><div class='del'>-			++k;</div><div class='del'>-			if (k &gt;= schp-&gt;k_use_sg)</div><div class='del'>-				return 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='add'>+out:</div><div class='add'>+	for (i = 0; i &lt; k; i++)</div><div class='add'>+		__free_pages(schp-&gt;pages[k], order);</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-sg_u_iovec(sg_io_hdr_t * hp, int sg_num, int ind,</div><div class='del'>-	   int wr_xf, int *countp, unsigned char __user **up)</div><div class='del'>-{</div><div class='del'>-	int num_xfer = (int) hp-&gt;dxfer_len;</div><div class='del'>-	unsigned char __user *p = hp-&gt;dxferp;</div><div class='del'>-	int count;</div><div class='add'>+	if (--order &gt;= 0)</div><div class='add'>+		goto retry;</div><div class='ctx'> </div><div class='del'>-	if (0 == sg_num) {</div><div class='del'>-		if (wr_xf &amp;&amp; ('\0' == hp-&gt;interface_id))</div><div class='del'>-			count = (int) hp-&gt;flags;	/* holds "old" input_size */</div><div class='del'>-		else</div><div class='del'>-			count = num_xfer;</div><div class='del'>-	} else {</div><div class='del'>-		sg_iovec_t iovec;</div><div class='del'>-		if (__copy_from_user(&amp;iovec, p + ind*SZ_SG_IOVEC, SZ_SG_IOVEC))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		p = iovec.iov_base;</div><div class='del'>-		count = (int) iovec.iov_len;</div><div class='del'>-	}</div><div class='del'>-	if (!access_ok(wr_xf ? VERIFY_READ : VERIFY_WRITE, p, count))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	if (up)</div><div class='del'>-		*up = p;</div><div class='del'>-	if (countp)</div><div class='del'>-		*countp = count;</div><div class='del'>-	return 0;</div><div class='add'>+	return -ENOMEM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> sg_remove_scat(Sg_scatter_hold * schp)</div><div class='ctx'> {</div><div class='ctx'> 	SCSI_LOG_TIMEOUT(4, printk("sg_remove_scat: k_use_sg=%d\n", schp-&gt;k_use_sg));</div><div class='del'>-	if (schp-&gt;buffer &amp;&amp; (schp-&gt;sglist_len &gt; 0)) {</div><div class='del'>-		struct scatterlist *sg = schp-&gt;buffer;</div><div class='del'>-</div><div class='del'>-		if (schp-&gt;dio_in_use) {</div><div class='del'>-#ifdef SG_ALLOW_DIO_CODE</div><div class='del'>-			st_unmap_user_pages(sg, schp-&gt;k_use_sg, TRUE);</div><div class='del'>-#endif</div><div class='del'>-		} else {</div><div class='add'>+	if (schp-&gt;pages &amp;&amp; schp-&gt;sglist_len &gt; 0) {</div><div class='add'>+		if (!schp-&gt;dio_in_use) {</div><div class='ctx'> 			int k;</div><div class='ctx'> </div><div class='del'>-			for (k = 0; (k &lt; schp-&gt;k_use_sg) &amp;&amp; sg_page(sg);</div><div class='del'>-			     ++k, sg = sg_next(sg)) {</div><div class='add'>+			for (k = 0; k &lt; schp-&gt;k_use_sg &amp;&amp; schp-&gt;pages[k]; k++) {</div><div class='ctx'> 				SCSI_LOG_TIMEOUT(5, printk(</div><div class='del'>-				    "sg_remove_scat: k=%d, pg=0x%p, len=%d\n",</div><div class='del'>-				    k, sg_page(sg), sg-&gt;length));</div><div class='del'>-				sg_page_free(sg_page(sg), sg-&gt;length);</div><div class='add'>+				    "sg_remove_scat: k=%d, pg=0x%p\n",</div><div class='add'>+				    k, schp-&gt;pages[k]));</div><div class='add'>+				__free_pages(schp-&gt;pages[k], schp-&gt;page_order);</div><div class='ctx'> 			}</div><div class='del'>-		}</div><div class='del'>-		kfree(schp-&gt;buffer);</div><div class='del'>-	}</div><div class='del'>-	memset(schp, 0, sizeof (*schp));</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-sg_read_xfer(Sg_request * srp)</div><div class='del'>-{</div><div class='del'>-	sg_io_hdr_t *hp = &amp;srp-&gt;header;</div><div class='del'>-	Sg_scatter_hold *schp = &amp;srp-&gt;data;</div><div class='del'>-	struct scatterlist *sg = schp-&gt;buffer;</div><div class='del'>-	int num_xfer = 0;</div><div class='del'>-	int j, k, onum, usglen, ksglen, res;</div><div class='del'>-	int iovec_count = (int) hp-&gt;iovec_count;</div><div class='del'>-	int dxfer_dir = hp-&gt;dxfer_direction;</div><div class='del'>-	unsigned char *p;</div><div class='del'>-	unsigned char __user *up;</div><div class='del'>-	int new_interface = ('\0' == hp-&gt;interface_id) ? 0 : 1;</div><div class='del'>-</div><div class='del'>-	if ((SG_DXFER_UNKNOWN == dxfer_dir) || (SG_DXFER_FROM_DEV == dxfer_dir)</div><div class='del'>-	    || (SG_DXFER_TO_FROM_DEV == dxfer_dir)) {</div><div class='del'>-		num_xfer = hp-&gt;dxfer_len;</div><div class='del'>-		if (schp-&gt;bufflen &lt; num_xfer)</div><div class='del'>-			num_xfer = schp-&gt;bufflen;</div><div class='del'>-	}</div><div class='del'>-	if ((num_xfer &lt;= 0) || (schp-&gt;dio_in_use) ||</div><div class='del'>-	    (new_interface</div><div class='del'>-	     &amp;&amp; ((SG_FLAG_NO_DXFER | SG_FLAG_MMAP_IO) &amp; hp-&gt;flags)))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	SCSI_LOG_TIMEOUT(4, printk("sg_read_xfer: num_xfer=%d, iovec_count=%d, k_use_sg=%d\n",</div><div class='del'>-			  num_xfer, iovec_count, schp-&gt;k_use_sg));</div><div class='del'>-	if (iovec_count) {</div><div class='del'>-		onum = iovec_count;</div><div class='del'>-		if (!access_ok(VERIFY_READ, hp-&gt;dxferp, SZ_SG_IOVEC * onum))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-	} else</div><div class='del'>-		onum = 1;</div><div class='del'>-</div><div class='del'>-	p = page_address(sg_page(sg));</div><div class='del'>-	ksglen = sg-&gt;length;</div><div class='del'>-	for (j = 0, k = 0; j &lt; onum; ++j) {</div><div class='del'>-		res = sg_u_iovec(hp, iovec_count, j, 0, &amp;usglen, &amp;up);</div><div class='del'>-		if (res)</div><div class='del'>-			return res;</div><div class='del'>-</div><div class='del'>-		for (; p; sg = sg_next(sg), ksglen = sg-&gt;length,</div><div class='del'>-		     p = page_address(sg_page(sg))) {</div><div class='del'>-			if (usglen &lt;= 0)</div><div class='del'>-				break;</div><div class='del'>-			if (ksglen &gt; usglen) {</div><div class='del'>-				if (usglen &gt;= num_xfer) {</div><div class='del'>-					if (__copy_to_user(up, p, num_xfer))</div><div class='del'>-						return -EFAULT;</div><div class='del'>-					return 0;</div><div class='del'>-				}</div><div class='del'>-				if (__copy_to_user(up, p, usglen))</div><div class='del'>-					return -EFAULT;</div><div class='del'>-				p += usglen;</div><div class='del'>-				ksglen -= usglen;</div><div class='del'>-				break;</div><div class='del'>-			} else {</div><div class='del'>-				if (ksglen &gt;= num_xfer) {</div><div class='del'>-					if (__copy_to_user(up, p, num_xfer))</div><div class='del'>-						return -EFAULT;</div><div class='del'>-					return 0;</div><div class='del'>-				}</div><div class='del'>-				if (__copy_to_user(up, p, ksglen))</div><div class='del'>-					return -EFAULT;</div><div class='del'>-				up += ksglen;</div><div class='del'>-				usglen -= ksglen;</div><div class='del'>-			}</div><div class='del'>-			++k;</div><div class='del'>-			if (k &gt;= schp-&gt;k_use_sg)</div><div class='del'>-				return 0;</div><div class='add'>+			kfree(schp-&gt;pages);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	memset(schp, 0, sizeof (*schp));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='ctx'> sg_read_oxfer(Sg_request * srp, char __user *outp, int num_read_xfer)</div><div class='ctx'> {</div><div class='ctx'> 	Sg_scatter_hold *schp = &amp;srp-&gt;data;</div><div class='del'>-	struct scatterlist *sg = schp-&gt;buffer;</div><div class='ctx'> 	int k, num;</div><div class='ctx'> </div><div class='ctx'> 	SCSI_LOG_TIMEOUT(4, printk("sg_read_oxfer: num_read_xfer=%d\n",</div><div class='hunk'>@@ -2134,15 +1838,15 @@ sg_read_oxfer(Sg_request * srp, char __user *outp, int num_read_xfer)</div><div class='ctx'> 	if ((!outp) || (num_read_xfer &lt;= 0))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	for (k = 0; (k &lt; schp-&gt;k_use_sg) &amp;&amp; sg_page(sg); ++k, sg = sg_next(sg)) {</div><div class='del'>-		num = sg-&gt;length;</div><div class='add'>+	num = 1 &lt;&lt; (PAGE_SHIFT + schp-&gt;page_order);</div><div class='add'>+	for (k = 0; k &lt; schp-&gt;k_use_sg &amp;&amp; schp-&gt;pages[k]; k++) {</div><div class='ctx'> 		if (num &gt; num_read_xfer) {</div><div class='del'>-			if (__copy_to_user(outp, page_address(sg_page(sg)),</div><div class='add'>+			if (__copy_to_user(outp, page_address(schp-&gt;pages[k]),</div><div class='ctx'> 					   num_read_xfer))</div><div class='ctx'> 				return -EFAULT;</div><div class='ctx'> 			break;</div><div class='ctx'> 		} else {</div><div class='del'>-			if (__copy_to_user(outp, page_address(sg_page(sg)),</div><div class='add'>+			if (__copy_to_user(outp, page_address(schp-&gt;pages[k]),</div><div class='ctx'> 					   num))</div><div class='ctx'> 				return -EFAULT;</div><div class='ctx'> 			num_read_xfer -= num;</div><div class='hunk'>@@ -2177,24 +1881,21 @@ sg_link_reserve(Sg_fd * sfp, Sg_request * srp, int size)</div><div class='ctx'> {</div><div class='ctx'> 	Sg_scatter_hold *req_schp = &amp;srp-&gt;data;</div><div class='ctx'> 	Sg_scatter_hold *rsv_schp = &amp;sfp-&gt;reserve;</div><div class='del'>-	struct scatterlist *sg = rsv_schp-&gt;buffer;</div><div class='ctx'> 	int k, num, rem;</div><div class='ctx'> </div><div class='ctx'> 	srp-&gt;res_used = 1;</div><div class='ctx'> 	SCSI_LOG_TIMEOUT(4, printk("sg_link_reserve: size=%d\n", size));</div><div class='ctx'> 	rem = size;</div><div class='ctx'> </div><div class='del'>-	for (k = 0; k &lt; rsv_schp-&gt;k_use_sg; ++k, sg = sg_next(sg)) {</div><div class='del'>-		num = sg-&gt;length;</div><div class='add'>+	num = 1 &lt;&lt; (PAGE_SHIFT + rsv_schp-&gt;page_order);</div><div class='add'>+	for (k = 0; k &lt; rsv_schp-&gt;k_use_sg; k++) {</div><div class='ctx'> 		if (rem &lt;= num) {</div><div class='del'>-			sfp-&gt;save_scat_len = num;</div><div class='del'>-			sg-&gt;length = rem;</div><div class='ctx'> 			req_schp-&gt;k_use_sg = k + 1;</div><div class='ctx'> 			req_schp-&gt;sglist_len = rsv_schp-&gt;sglist_len;</div><div class='del'>-			req_schp-&gt;buffer = rsv_schp-&gt;buffer;</div><div class='add'>+			req_schp-&gt;pages = rsv_schp-&gt;pages;</div><div class='ctx'> </div><div class='ctx'> 			req_schp-&gt;bufflen = size;</div><div class='del'>-			req_schp-&gt;b_malloc_len = rsv_schp-&gt;b_malloc_len;</div><div class='add'>+			req_schp-&gt;page_order = rsv_schp-&gt;page_order;</div><div class='ctx'> 			break;</div><div class='ctx'> 		} else</div><div class='ctx'> 			rem -= num;</div><div class='hunk'>@@ -2208,22 +1909,13 @@ static void</div><div class='ctx'> sg_unlink_reserve(Sg_fd * sfp, Sg_request * srp)</div><div class='ctx'> {</div><div class='ctx'> 	Sg_scatter_hold *req_schp = &amp;srp-&gt;data;</div><div class='del'>-	Sg_scatter_hold *rsv_schp = &amp;sfp-&gt;reserve;</div><div class='ctx'> </div><div class='ctx'> 	SCSI_LOG_TIMEOUT(4, printk("sg_unlink_reserve: req-&gt;k_use_sg=%d\n",</div><div class='ctx'> 				   (int) req_schp-&gt;k_use_sg));</div><div class='del'>-	if ((rsv_schp-&gt;k_use_sg &gt; 0) &amp;&amp; (req_schp-&gt;k_use_sg &gt; 0)) {</div><div class='del'>-		struct scatterlist *sg = rsv_schp-&gt;buffer;</div><div class='del'>-</div><div class='del'>-		if (sfp-&gt;save_scat_len &gt; 0)</div><div class='del'>-			(sg + (req_schp-&gt;k_use_sg - 1))-&gt;length =</div><div class='del'>-			    (unsigned) sfp-&gt;save_scat_len;</div><div class='del'>-		else</div><div class='del'>-			SCSI_LOG_TIMEOUT(1, printk ("sg_unlink_reserve: BAD save_scat_len\n"));</div><div class='del'>-	}</div><div class='ctx'> 	req_schp-&gt;k_use_sg = 0;</div><div class='ctx'> 	req_schp-&gt;bufflen = 0;</div><div class='del'>-	req_schp-&gt;buffer = NULL;</div><div class='add'>+	req_schp-&gt;pages = NULL;</div><div class='add'>+	req_schp-&gt;page_order = 0;</div><div class='ctx'> 	req_schp-&gt;sglist_len = 0;</div><div class='ctx'> 	sfp-&gt;save_scat_len = 0;</div><div class='ctx'> 	srp-&gt;res_used = 0;</div><div class='hunk'>@@ -2481,53 +2173,6 @@ sg_res_in_use(Sg_fd * sfp)</div><div class='ctx'> 	return srp ? 1 : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* The size fetched (value output via retSzp) set when non-NULL return */</div><div class='del'>-static struct page *</div><div class='del'>-sg_page_malloc(int rqSz, int lowDma, int *retSzp)</div><div class='del'>-{</div><div class='del'>-	struct page *resp = NULL;</div><div class='del'>-	gfp_t page_mask;</div><div class='del'>-	int order, a_size;</div><div class='del'>-	int resSz;</div><div class='del'>-</div><div class='del'>-	if ((rqSz &lt;= 0) || (NULL == retSzp))</div><div class='del'>-		return resp;</div><div class='del'>-</div><div class='del'>-	if (lowDma)</div><div class='del'>-		page_mask = GFP_ATOMIC | GFP_DMA | __GFP_COMP | __GFP_NOWARN;</div><div class='del'>-	else</div><div class='del'>-		page_mask = GFP_ATOMIC | __GFP_COMP | __GFP_NOWARN;</div><div class='del'>-</div><div class='del'>-	for (order = 0, a_size = PAGE_SIZE; a_size &lt; rqSz;</div><div class='del'>-	     order++, a_size &lt;&lt;= 1) ;</div><div class='del'>-	resSz = a_size;		/* rounded up if necessary */</div><div class='del'>-	resp = alloc_pages(page_mask, order);</div><div class='del'>-	while ((!resp) &amp;&amp; order) {</div><div class='del'>-		--order;</div><div class='del'>-		a_size &gt;&gt;= 1;	/* divide by 2, until PAGE_SIZE */</div><div class='del'>-		resp =  alloc_pages(page_mask, order);	/* try half */</div><div class='del'>-		resSz = a_size;</div><div class='del'>-	}</div><div class='del'>-	if (resp) {</div><div class='del'>-		if (!capable(CAP_SYS_ADMIN) || !capable(CAP_SYS_RAWIO))</div><div class='del'>-			memset(page_address(resp), 0, resSz);</div><div class='del'>-		*retSzp = resSz;</div><div class='del'>-	}</div><div class='del'>-	return resp;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-sg_page_free(struct page *page, int size)</div><div class='del'>-{</div><div class='del'>-	int order, a_size;</div><div class='del'>-</div><div class='del'>-	if (!page)</div><div class='del'>-		return;</div><div class='del'>-	for (order = 0, a_size = PAGE_SIZE; a_size &lt; size;</div><div class='del'>-	     order++, a_size &lt;&lt;= 1) ;</div><div class='del'>-	__free_pages(page, order);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_SCSI_PROC_FS</div><div class='ctx'> static int</div><div class='ctx'> sg_idr_max_id(int id, void *p, void *data)</div><div class='head'>diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c<br/>index 27f5bfd1def3..0f17009c99d2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/sr.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/sr.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/sr.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/sr.c</a></div><div class='hunk'>@@ -331,7 +331,7 @@ static int sr_done(struct scsi_cmnd *SCpnt)</div><div class='ctx'> </div><div class='ctx'> static int sr_prep_fn(struct request_queue *q, struct request *rq)</div><div class='ctx'> {</div><div class='del'>-	int block=0, this_count, s_size, timeout = SR_TIMEOUT;</div><div class='add'>+	int block = 0, this_count, s_size;</div><div class='ctx'> 	struct scsi_cd *cd;</div><div class='ctx'> 	struct scsi_cmnd *SCpnt;</div><div class='ctx'> 	struct scsi_device *sdp = q-&gt;queuedata;</div><div class='hunk'>@@ -461,7 +461,6 @@ static int sr_prep_fn(struct request_queue *q, struct request *rq)</div><div class='ctx'> 	SCpnt-&gt;transfersize = cd-&gt;device-&gt;sector_size;</div><div class='ctx'> 	SCpnt-&gt;underflow = this_count &lt;&lt; 9;</div><div class='ctx'> 	SCpnt-&gt;allowed = MAX_RETRIES;</div><div class='del'>-	SCpnt-&gt;timeout_per_command = timeout;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * This indicates that the command is ready from our end to be</div><div class='hunk'>@@ -620,6 +619,8 @@ static int sr_probe(struct device *dev)</div><div class='ctx'> 	disk-&gt;fops = &amp;sr_bdops;</div><div class='ctx'> 	disk-&gt;flags = GENHD_FL_CD;</div><div class='ctx'> </div><div class='add'>+	blk_queue_rq_timeout(sdev-&gt;request_queue, SR_TIMEOUT);</div><div class='add'>+</div><div class='ctx'> 	cd-&gt;device = sdev;</div><div class='ctx'> 	cd-&gt;disk = disk;</div><div class='ctx'> 	cd-&gt;driver = &amp;sr_template;</div><div class='hunk'>@@ -878,7 +879,7 @@ static void sr_kref_release(struct kref *kref)</div><div class='ctx'> 	struct gendisk *disk = cd-&gt;disk;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;sr_index_lock);</div><div class='del'>-	clear_bit(disk-&gt;first_minor, sr_index_bits);</div><div class='add'>+	clear_bit(MINOR(disk_devt(disk)), sr_index_bits);</div><div class='ctx'> 	spin_unlock(&amp;sr_index_lock);</div><div class='ctx'> </div><div class='ctx'> 	unregister_cdrom(&amp;cd-&gt;cdi);</div><div class='head'>diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c<br/>index c2bb53e3d941..5c28d08f18f4 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/st.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/st.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/st.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/st.c</a></div><div class='hunk'>@@ -4428,13 +4428,10 @@ static int do_create_class_files(struct scsi_tape *STp, int dev_num, int mode)</div><div class='ctx'> 		snprintf(name, 10, "%s%s%s", rew ? "n" : "",</div><div class='ctx'> 			 STp-&gt;disk-&gt;disk_name, st_formats[i]);</div><div class='ctx'> 		st_class_member =</div><div class='del'>-			device_create_drvdata(st_sysfs_class,</div><div class='del'>-					      &amp;STp-&gt;device-&gt;sdev_gendev,</div><div class='del'>-					      MKDEV(SCSI_TAPE_MAJOR,</div><div class='del'>-						    TAPE_MINOR(dev_num,</div><div class='del'>-							      mode, rew)),</div><div class='del'>-					      &amp;STp-&gt;modes[mode],</div><div class='del'>-					      "%s", name);</div><div class='add'>+			device_create(st_sysfs_class, &amp;STp-&gt;device-&gt;sdev_gendev,</div><div class='add'>+				      MKDEV(SCSI_TAPE_MAJOR,</div><div class='add'>+					    TAPE_MINOR(dev_num, mode, rew)),</div><div class='add'>+				      &amp;STp-&gt;modes[mode], "%s", name);</div><div class='ctx'> 		if (IS_ERR(st_class_member)) {</div><div class='ctx'> 			printk(KERN_WARNING "st%d: device_create failed\n",</div><div class='ctx'> 			       dev_num);</div><div class='head'>diff --git a/drivers/scsi/sun_esp.c b/drivers/scsi/sun_esp.c<br/>index f9cf70151366..3d73aad4bc82 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/sun_esp.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/sun_esp.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/sun_esp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/sun_esp.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /* sun_esp.c: ESP front-end for Sparc SBUS systems.</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2007 David S. Miller (davem@davemloft.net)</div><div class='add'>+ * Copyright (C) 2007, 2008 David S. Miller (davem@davemloft.net)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -9,60 +9,70 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/sbus.h&gt;</div><div class='del'>-</div><div class='ctx'> #include &lt;scsi/scsi_host.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "esp_scsi.h"</div><div class='ctx'> </div><div class='ctx'> #define DRV_MODULE_NAME		"sun_esp"</div><div class='ctx'> #define PFX DRV_MODULE_NAME	": "</div><div class='del'>-#define DRV_VERSION		"1.000"</div><div class='del'>-#define DRV_MODULE_RELDATE	"April 19, 2007"</div><div class='add'>+#define DRV_VERSION		"1.100"</div><div class='add'>+#define DRV_MODULE_RELDATE	"August 27, 2008"</div><div class='ctx'> </div><div class='ctx'> #define dma_read32(REG) \</div><div class='ctx'> 	sbus_readl(esp-&gt;dma_regs + (REG))</div><div class='ctx'> #define dma_write32(VAL, REG) \</div><div class='ctx'> 	sbus_writel((VAL), esp-&gt;dma_regs + (REG))</div><div class='ctx'> </div><div class='del'>-static int __devinit esp_sbus_find_dma(struct esp *esp, struct sbus_dev *dma_sdev)</div><div class='del'>-{</div><div class='del'>-	struct sbus_dev *sdev = esp-&gt;dev;</div><div class='del'>-	struct sbus_dma *dma;</div><div class='add'>+/* DVMA chip revisions */</div><div class='add'>+enum dvma_rev {</div><div class='add'>+	dvmarev0,</div><div class='add'>+	dvmaesc1,</div><div class='add'>+	dvmarev1,</div><div class='add'>+	dvmarev2,</div><div class='add'>+	dvmarev3,</div><div class='add'>+	dvmarevplus,</div><div class='add'>+	dvmahme</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-	if (dma_sdev != NULL) {</div><div class='del'>-		for_each_dvma(dma) {</div><div class='del'>-			if (dma-&gt;sdev == dma_sdev)</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		for_each_dvma(dma) {</div><div class='del'>-			if (dma-&gt;sdev == NULL)</div><div class='del'>-				break;</div><div class='add'>+static int __devinit esp_sbus_setup_dma(struct esp *esp,</div><div class='add'>+					struct of_device *dma_of)</div><div class='add'>+{</div><div class='add'>+	esp-&gt;dma = dma_of;</div><div class='ctx'> </div><div class='del'>-			/* If bus + slot are the same and it has the</div><div class='del'>-			 * correct OBP name, it's ours.</div><div class='del'>-			 */</div><div class='del'>-			if (sdev-&gt;bus == dma-&gt;sdev-&gt;bus &amp;&amp;</div><div class='del'>-			    sdev-&gt;slot == dma-&gt;sdev-&gt;slot &amp;&amp;</div><div class='del'>-			    (!strcmp(dma-&gt;sdev-&gt;prom_name, "dma") ||</div><div class='del'>-			     !strcmp(dma-&gt;sdev-&gt;prom_name, "espdma")))</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	esp-&gt;dma_regs = of_ioremap(&amp;dma_of-&gt;resource[0], 0,</div><div class='add'>+				   resource_size(&amp;dma_of-&gt;resource[0]),</div><div class='add'>+				   "espdma");</div><div class='add'>+	if (!esp-&gt;dma_regs)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	if (dma == NULL) {</div><div class='del'>-		printk(KERN_ERR PFX "[%s] Cannot find dma.\n",</div><div class='del'>-		       sdev-&gt;ofdev.node-&gt;full_name);</div><div class='del'>-		return -ENODEV;</div><div class='add'>+	switch (dma_read32(DMA_CSR) &amp; DMA_DEVICE_ID) {</div><div class='add'>+	case DMA_VERS0:</div><div class='add'>+		esp-&gt;dmarev = dvmarev0;</div><div class='add'>+		break;</div><div class='add'>+	case DMA_ESCV1:</div><div class='add'>+		esp-&gt;dmarev = dvmaesc1;</div><div class='add'>+		break;</div><div class='add'>+	case DMA_VERS1:</div><div class='add'>+		esp-&gt;dmarev = dvmarev1;</div><div class='add'>+		break;</div><div class='add'>+	case DMA_VERS2:</div><div class='add'>+		esp-&gt;dmarev = dvmarev2;</div><div class='add'>+		break;</div><div class='add'>+	case DMA_VERHME:</div><div class='add'>+		esp-&gt;dmarev = dvmahme;</div><div class='add'>+		break;</div><div class='add'>+	case DMA_VERSPLUS:</div><div class='add'>+		esp-&gt;dmarev = dvmarevplus;</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='del'>-	esp-&gt;dma = dma;</div><div class='del'>-	esp-&gt;dma_regs = dma-&gt;regs;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -70,18 +80,18 @@ static int __devinit esp_sbus_find_dma(struct esp *esp, struct sbus_dev *dma_sde</div><div class='ctx'> </div><div class='ctx'> static int __devinit esp_sbus_map_regs(struct esp *esp, int hme)</div><div class='ctx'> {</div><div class='del'>-	struct sbus_dev *sdev = esp-&gt;dev;</div><div class='add'>+	struct of_device *op = esp-&gt;dev;</div><div class='ctx'> 	struct resource *res;</div><div class='ctx'> </div><div class='ctx'> 	/* On HME, two reg sets exist, first is DVMA,</div><div class='ctx'> 	 * second is ESP registers.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (hme)</div><div class='del'>-		res = &amp;sdev-&gt;resource[1];</div><div class='add'>+		res = &amp;op-&gt;resource[1];</div><div class='ctx'> 	else</div><div class='del'>-		res = &amp;sdev-&gt;resource[0];</div><div class='add'>+		res = &amp;op-&gt;resource[0];</div><div class='ctx'> </div><div class='del'>-	esp-&gt;regs = sbus_ioremap(res, 0, SBUS_ESP_REG_SIZE, "ESP");</div><div class='add'>+	esp-&gt;regs = of_ioremap(res, 0, SBUS_ESP_REG_SIZE, "ESP");</div><div class='ctx'> 	if (!esp-&gt;regs)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -90,10 +100,11 @@ static int __devinit esp_sbus_map_regs(struct esp *esp, int hme)</div><div class='ctx'> </div><div class='ctx'> static int __devinit esp_sbus_map_command_block(struct esp *esp)</div><div class='ctx'> {</div><div class='del'>-	struct sbus_dev *sdev = esp-&gt;dev;</div><div class='add'>+	struct of_device *op = esp-&gt;dev;</div><div class='ctx'> </div><div class='del'>-	esp-&gt;command_block = sbus_alloc_consistent(sdev, 16,</div><div class='del'>-						   &amp;esp-&gt;command_block_dma);</div><div class='add'>+	esp-&gt;command_block = dma_alloc_coherent(&amp;op-&gt;dev, 16,</div><div class='add'>+						&amp;esp-&gt;command_block_dma,</div><div class='add'>+						GFP_ATOMIC);</div><div class='ctx'> 	if (!esp-&gt;command_block)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -102,17 +113,18 @@ static int __devinit esp_sbus_map_command_block(struct esp *esp)</div><div class='ctx'> static int __devinit esp_sbus_register_irq(struct esp *esp)</div><div class='ctx'> {</div><div class='ctx'> 	struct Scsi_Host *host = esp-&gt;host;</div><div class='del'>-	struct sbus_dev *sdev = esp-&gt;dev;</div><div class='add'>+	struct of_device *op = esp-&gt;dev;</div><div class='ctx'> </div><div class='del'>-	host-&gt;irq = sdev-&gt;irqs[0];</div><div class='add'>+	host-&gt;irq = op-&gt;irqs[0];</div><div class='ctx'> 	return request_irq(host-&gt;irq, scsi_esp_intr, IRQF_SHARED, "ESP", esp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devinit esp_get_scsi_id(struct esp *esp)</div><div class='add'>+static void __devinit esp_get_scsi_id(struct esp *esp, struct of_device *espdma)</div><div class='ctx'> {</div><div class='del'>-	struct sbus_dev *sdev = esp-&gt;dev;</div><div class='del'>-	struct device_node *dp = sdev-&gt;ofdev.node;</div><div class='add'>+	struct of_device *op = esp-&gt;dev;</div><div class='add'>+	struct device_node *dp;</div><div class='ctx'> </div><div class='add'>+	dp = op-&gt;node;</div><div class='ctx'> 	esp-&gt;scsi_id = of_getintprop_default(dp, "initiator-id", 0xff);</div><div class='ctx'> 	if (esp-&gt;scsi_id != 0xff)</div><div class='ctx'> 		goto done;</div><div class='hunk'>@@ -121,13 +133,7 @@ static void __devinit esp_get_scsi_id(struct esp *esp)</div><div class='ctx'> 	if (esp-&gt;scsi_id != 0xff)</div><div class='ctx'> 		goto done;</div><div class='ctx'> </div><div class='del'>-	if (!sdev-&gt;bus) {</div><div class='del'>-		/* SUN4 */</div><div class='del'>-		esp-&gt;scsi_id = 7;</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	esp-&gt;scsi_id = of_getintprop_default(sdev-&gt;bus-&gt;ofdev.node,</div><div class='add'>+	esp-&gt;scsi_id = of_getintprop_default(espdma-&gt;node,</div><div class='ctx'> 					     "scsi-initiator-id", 7);</div><div class='ctx'> </div><div class='ctx'> done:</div><div class='hunk'>@@ -137,9 +143,10 @@ done:</div><div class='ctx'> </div><div class='ctx'> static void __devinit esp_get_differential(struct esp *esp)</div><div class='ctx'> {</div><div class='del'>-	struct sbus_dev *sdev = esp-&gt;dev;</div><div class='del'>-	struct device_node *dp = sdev-&gt;ofdev.node;</div><div class='add'>+	struct of_device *op = esp-&gt;dev;</div><div class='add'>+	struct device_node *dp;</div><div class='ctx'> </div><div class='add'>+	dp = op-&gt;node;</div><div class='ctx'> 	if (of_find_property(dp, "differential", NULL))</div><div class='ctx'> 		esp-&gt;flags |= ESP_FLAG_DIFFERENTIAL;</div><div class='ctx'> 	else</div><div class='hunk'>@@ -148,43 +155,36 @@ static void __devinit esp_get_differential(struct esp *esp)</div><div class='ctx'> </div><div class='ctx'> static void __devinit esp_get_clock_params(struct esp *esp)</div><div class='ctx'> {</div><div class='del'>-	struct sbus_dev *sdev = esp-&gt;dev;</div><div class='del'>-	struct device_node *dp = sdev-&gt;ofdev.node;</div><div class='del'>-	struct device_node *bus_dp;</div><div class='add'>+	struct of_device *op = esp-&gt;dev;</div><div class='add'>+	struct device_node *bus_dp, *dp;</div><div class='ctx'> 	int fmhz;</div><div class='ctx'> </div><div class='del'>-	bus_dp = NULL;</div><div class='del'>-	if (sdev != NULL &amp;&amp; sdev-&gt;bus != NULL)</div><div class='del'>-		bus_dp = sdev-&gt;bus-&gt;ofdev.node;</div><div class='add'>+	dp = op-&gt;node;</div><div class='add'>+	bus_dp = dp-&gt;parent;</div><div class='ctx'> </div><div class='ctx'> 	fmhz = of_getintprop_default(dp, "clock-frequency", 0);</div><div class='ctx'> 	if (fmhz == 0)</div><div class='del'>-		fmhz = (!bus_dp) ? 0 :</div><div class='del'>-			of_getintprop_default(bus_dp, "clock-frequency", 0);</div><div class='add'>+		fmhz = of_getintprop_default(bus_dp, "clock-frequency", 0);</div><div class='ctx'> </div><div class='ctx'> 	esp-&gt;cfreq = fmhz;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devinit esp_get_bursts(struct esp *esp, struct sbus_dev *dma)</div><div class='add'>+static void __devinit esp_get_bursts(struct esp *esp, struct of_device *dma_of)</div><div class='ctx'> {</div><div class='del'>-	struct sbus_dev *sdev = esp-&gt;dev;</div><div class='del'>-	struct device_node *dp = sdev-&gt;ofdev.node;</div><div class='del'>-	u8 bursts;</div><div class='add'>+	struct device_node *dma_dp = dma_of-&gt;node;</div><div class='add'>+	struct of_device *op = esp-&gt;dev;</div><div class='add'>+	struct device_node *dp;</div><div class='add'>+	u8 bursts, val;</div><div class='ctx'> </div><div class='add'>+	dp = op-&gt;node;</div><div class='ctx'> 	bursts = of_getintprop_default(dp, "burst-sizes", 0xff);</div><div class='del'>-	if (dma) {</div><div class='del'>-		struct device_node *dma_dp = dma-&gt;ofdev.node;</div><div class='del'>-		u8 val = of_getintprop_default(dma_dp, "burst-sizes", 0xff);</div><div class='del'>-		if (val != 0xff)</div><div class='del'>-			bursts &amp;= val;</div><div class='del'>-	}</div><div class='add'>+	val = of_getintprop_default(dma_dp, "burst-sizes", 0xff);</div><div class='add'>+	if (val != 0xff)</div><div class='add'>+		bursts &amp;= val;</div><div class='ctx'> </div><div class='del'>-	if (sdev-&gt;bus) {</div><div class='del'>-		u8 val = of_getintprop_default(sdev-&gt;bus-&gt;ofdev.node,</div><div class='del'>-					       "burst-sizes", 0xff);</div><div class='del'>-		if (val != 0xff)</div><div class='del'>-			bursts &amp;= val;</div><div class='del'>-	}</div><div class='add'>+	val = of_getintprop_default(dma_dp-&gt;parent, "burst-sizes", 0xff);</div><div class='add'>+	if (val != 0xff)</div><div class='add'>+		bursts &amp;= val;</div><div class='ctx'> </div><div class='ctx'> 	if (bursts == 0xff ||</div><div class='ctx'> 	    (bursts &amp; DMA_BURST16) == 0 ||</div><div class='hunk'>@@ -194,9 +194,9 @@ static void __devinit esp_get_bursts(struct esp *esp, struct sbus_dev *dma)</div><div class='ctx'> 	esp-&gt;bursts = bursts;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devinit esp_sbus_get_props(struct esp *esp, struct sbus_dev *espdma)</div><div class='add'>+static void __devinit esp_sbus_get_props(struct esp *esp, struct of_device *espdma)</div><div class='ctx'> {</div><div class='del'>-	esp_get_scsi_id(esp);</div><div class='add'>+	esp_get_scsi_id(esp, espdma);</div><div class='ctx'> 	esp_get_differential(esp);</div><div class='ctx'> 	esp_get_clock_params(esp);</div><div class='ctx'> 	esp_get_bursts(esp, espdma);</div><div class='hunk'>@@ -215,25 +215,33 @@ static u8 sbus_esp_read8(struct esp *esp, unsigned long reg)</div><div class='ctx'> static dma_addr_t sbus_esp_map_single(struct esp *esp, void *buf,</div><div class='ctx'> 				      size_t sz, int dir)</div><div class='ctx'> {</div><div class='del'>-	return sbus_map_single(esp-&gt;dev, buf, sz, dir);</div><div class='add'>+	struct of_device *op = esp-&gt;dev;</div><div class='add'>+</div><div class='add'>+	return dma_map_single(&amp;op-&gt;dev, buf, sz, dir);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int sbus_esp_map_sg(struct esp *esp, struct scatterlist *sg,</div><div class='ctx'> 				  int num_sg, int dir)</div><div class='ctx'> {</div><div class='del'>-	return sbus_map_sg(esp-&gt;dev, sg, num_sg, dir);</div><div class='add'>+	struct of_device *op = esp-&gt;dev;</div><div class='add'>+</div><div class='add'>+	return dma_map_sg(&amp;op-&gt;dev, sg, num_sg, dir);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sbus_esp_unmap_single(struct esp *esp, dma_addr_t addr,</div><div class='ctx'> 				  size_t sz, int dir)</div><div class='ctx'> {</div><div class='del'>-	sbus_unmap_single(esp-&gt;dev, addr, sz, dir);</div><div class='add'>+	struct of_device *op = esp-&gt;dev;</div><div class='add'>+</div><div class='add'>+	dma_unmap_single(&amp;op-&gt;dev, addr, sz, dir);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sbus_esp_unmap_sg(struct esp *esp, struct scatterlist *sg,</div><div class='ctx'> 			      int num_sg, int dir)</div><div class='ctx'> {</div><div class='del'>-	sbus_unmap_sg(esp-&gt;dev, sg, num_sg, dir);</div><div class='add'>+	struct of_device *op = esp-&gt;dev;</div><div class='add'>+</div><div class='add'>+	dma_unmap_sg(&amp;op-&gt;dev, sg, num_sg, dir);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int sbus_esp_irq_pending(struct esp *esp)</div><div class='hunk'>@@ -247,24 +255,26 @@ static void sbus_esp_reset_dma(struct esp *esp)</div><div class='ctx'> {</div><div class='ctx'> 	int can_do_burst16, can_do_burst32, can_do_burst64;</div><div class='ctx'> 	int can_do_sbus64, lim;</div><div class='add'>+	struct of_device *op;</div><div class='ctx'> 	u32 val;</div><div class='ctx'> </div><div class='ctx'> 	can_do_burst16 = (esp-&gt;bursts &amp; DMA_BURST16) != 0;</div><div class='ctx'> 	can_do_burst32 = (esp-&gt;bursts &amp; DMA_BURST32) != 0;</div><div class='ctx'> 	can_do_burst64 = 0;</div><div class='ctx'> 	can_do_sbus64 = 0;</div><div class='del'>-	if (sbus_can_dma_64bit(esp-&gt;dev))</div><div class='add'>+	op = esp-&gt;dev;</div><div class='add'>+	if (sbus_can_dma_64bit())</div><div class='ctx'> 		can_do_sbus64 = 1;</div><div class='del'>-	if (sbus_can_burst64(esp-&gt;sdev))</div><div class='add'>+	if (sbus_can_burst64())</div><div class='ctx'> 		can_do_burst64 = (esp-&gt;bursts &amp; DMA_BURST64) != 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Put the DVMA into a known state. */</div><div class='del'>-	if (esp-&gt;dma-&gt;revision != dvmahme) {</div><div class='add'>+	if (esp-&gt;dmarev != dvmahme) {</div><div class='ctx'> 		val = dma_read32(DMA_CSR);</div><div class='ctx'> 		dma_write32(val | DMA_RST_SCSI, DMA_CSR);</div><div class='ctx'> 		dma_write32(val &amp; ~DMA_RST_SCSI, DMA_CSR);</div><div class='ctx'> 	}</div><div class='del'>-	switch (esp-&gt;dma-&gt;revision) {</div><div class='add'>+	switch (esp-&gt;dmarev) {</div><div class='ctx'> 	case dvmahme:</div><div class='ctx'> 		dma_write32(DMA_RESET_FAS366, DMA_CSR);</div><div class='ctx'> 		dma_write32(DMA_RST_SCSI, DMA_CSR);</div><div class='hunk'>@@ -282,7 +292,7 @@ static void sbus_esp_reset_dma(struct esp *esp)</div><div class='ctx'> </div><div class='ctx'> 		if (can_do_sbus64) {</div><div class='ctx'> 			esp-&gt;prev_hme_dmacsr |= DMA_SCSI_SBUS64;</div><div class='del'>-			sbus_set_sbus64(esp-&gt;dev, esp-&gt;bursts);</div><div class='add'>+			sbus_set_sbus64(&amp;op-&gt;dev, esp-&gt;bursts);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		lim = 1000;</div><div class='hunk'>@@ -346,14 +356,14 @@ static void sbus_esp_dma_drain(struct esp *esp)</div><div class='ctx'> 	u32 csr;</div><div class='ctx'> 	int lim;</div><div class='ctx'> </div><div class='del'>-	if (esp-&gt;dma-&gt;revision == dvmahme)</div><div class='add'>+	if (esp-&gt;dmarev == dvmahme)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	csr = dma_read32(DMA_CSR);</div><div class='ctx'> 	if (!(csr &amp; DMA_FIFO_ISDRAIN))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (esp-&gt;dma-&gt;revision != dvmarev3 &amp;&amp; esp-&gt;dma-&gt;revision != dvmaesc1)</div><div class='add'>+	if (esp-&gt;dmarev != dvmarev3 &amp;&amp; esp-&gt;dmarev != dvmaesc1)</div><div class='ctx'> 		dma_write32(csr | DMA_FIFO_STDRAIN, DMA_CSR);</div><div class='ctx'> </div><div class='ctx'> 	lim = 1000;</div><div class='hunk'>@@ -369,7 +379,7 @@ static void sbus_esp_dma_drain(struct esp *esp)</div><div class='ctx'> </div><div class='ctx'> static void sbus_esp_dma_invalidate(struct esp *esp)</div><div class='ctx'> {</div><div class='del'>-	if (esp-&gt;dma-&gt;revision == dvmahme) {</div><div class='add'>+	if (esp-&gt;dmarev == dvmahme) {</div><div class='ctx'> 		dma_write32(DMA_RST_SCSI, DMA_CSR);</div><div class='ctx'> </div><div class='ctx'> 		esp-&gt;prev_hme_dmacsr = ((esp-&gt;prev_hme_dmacsr |</div><div class='hunk'>@@ -440,7 +450,7 @@ static void sbus_esp_send_dma_cmd(struct esp *esp, u32 addr, u32 esp_count,</div><div class='ctx'> 		else</div><div class='ctx'> 			csr &amp;= ~DMA_ST_WRITE;</div><div class='ctx'> 		dma_write32(csr, DMA_CSR);</div><div class='del'>-		if (esp-&gt;dma-&gt;revision == dvmaesc1) {</div><div class='add'>+		if (esp-&gt;dmarev == dvmaesc1) {</div><div class='ctx'> 			u32 end = PAGE_ALIGN(addr + dma_count + 16U);</div><div class='ctx'> 			dma_write32(end - addr, DMA_COUNT);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -476,10 +486,8 @@ static const struct esp_driver_ops sbus_esp_ops = {</div><div class='ctx'> 	.dma_error	=	sbus_esp_dma_error,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __devinit esp_sbus_probe_one(struct device *dev,</div><div class='del'>-					struct sbus_dev *esp_dev,</div><div class='del'>-					struct sbus_dev *espdma,</div><div class='del'>-					struct sbus_bus *sbus,</div><div class='add'>+static int __devinit esp_sbus_probe_one(struct of_device *op,</div><div class='add'>+					struct of_device *espdma,</div><div class='ctx'> 					int hme)</div><div class='ctx'> {</div><div class='ctx'> 	struct scsi_host_template *tpnt = &amp;scsi_esp_template;</div><div class='hunk'>@@ -497,13 +505,13 @@ static int __devinit esp_sbus_probe_one(struct device *dev,</div><div class='ctx'> 	esp = shost_priv(host);</div><div class='ctx'> </div><div class='ctx'> 	esp-&gt;host = host;</div><div class='del'>-	esp-&gt;dev = esp_dev;</div><div class='add'>+	esp-&gt;dev = op;</div><div class='ctx'> 	esp-&gt;ops = &amp;sbus_esp_ops;</div><div class='ctx'> </div><div class='ctx'> 	if (hme)</div><div class='ctx'> 		esp-&gt;flags |= ESP_FLAG_WIDE_CAPABLE;</div><div class='ctx'> </div><div class='del'>-	err = esp_sbus_find_dma(esp, espdma);</div><div class='add'>+	err = esp_sbus_setup_dma(esp, espdma);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto fail_unlink;</div><div class='ctx'> </div><div class='hunk'>@@ -525,15 +533,15 @@ static int __devinit esp_sbus_probe_one(struct device *dev,</div><div class='ctx'> 	 * come up with the reset bit set, so make sure that</div><div class='ctx'> 	 * is clear first.</div><div class='ctx'> 	 */</div><div class='del'>-	if (esp-&gt;dma-&gt;revision == dvmaesc1) {</div><div class='add'>+	if (esp-&gt;dmarev == dvmaesc1) {</div><div class='ctx'> 		u32 val = dma_read32(DMA_CSR);</div><div class='ctx'> </div><div class='ctx'> 		dma_write32(val &amp; ~DMA_RST_SCSI, DMA_CSR);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dev_set_drvdata(&amp;esp_dev-&gt;ofdev.dev, esp);</div><div class='add'>+	dev_set_drvdata(&amp;op-&gt;dev, esp);</div><div class='ctx'> </div><div class='del'>-	err = scsi_esp_register(esp, dev);</div><div class='add'>+	err = scsi_esp_register(esp, &amp;op-&gt;dev);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto fail_free_irq;</div><div class='ctx'> </div><div class='hunk'>@@ -542,41 +550,46 @@ static int __devinit esp_sbus_probe_one(struct device *dev,</div><div class='ctx'> fail_free_irq:</div><div class='ctx'> 	free_irq(host-&gt;irq, esp);</div><div class='ctx'> fail_unmap_command_block:</div><div class='del'>-	sbus_free_consistent(esp-&gt;dev, 16,</div><div class='del'>-			     esp-&gt;command_block,</div><div class='del'>-			     esp-&gt;command_block_dma);</div><div class='add'>+	dma_free_coherent(&amp;op-&gt;dev, 16,</div><div class='add'>+			  esp-&gt;command_block,</div><div class='add'>+			  esp-&gt;command_block_dma);</div><div class='ctx'> fail_unmap_regs:</div><div class='del'>-	sbus_iounmap(esp-&gt;regs, SBUS_ESP_REG_SIZE);</div><div class='add'>+	of_iounmap(&amp;op-&gt;resource[(hme ? 1 : 0)], esp-&gt;regs, SBUS_ESP_REG_SIZE);</div><div class='ctx'> fail_unlink:</div><div class='ctx'> 	scsi_host_put(host);</div><div class='ctx'> fail:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit esp_sbus_probe(struct of_device *dev, const struct of_device_id *match)</div><div class='add'>+static int __devinit esp_sbus_probe(struct of_device *op, const struct of_device_id *match)</div><div class='ctx'> {</div><div class='del'>-	struct sbus_dev *sdev = to_sbus_device(&amp;dev-&gt;dev);</div><div class='del'>-	struct device_node *dp = dev-&gt;node;</div><div class='del'>-	struct sbus_dev *dma_sdev = NULL;</div><div class='add'>+	struct device_node *dma_node = NULL;</div><div class='add'>+	struct device_node *dp = op-&gt;node;</div><div class='add'>+	struct of_device *dma_of = NULL;</div><div class='ctx'> 	int hme = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (dp-&gt;parent &amp;&amp;</div><div class='ctx'> 	    (!strcmp(dp-&gt;parent-&gt;name, "espdma") ||</div><div class='ctx'> 	     !strcmp(dp-&gt;parent-&gt;name, "dma")))</div><div class='del'>-		dma_sdev = sdev-&gt;parent;</div><div class='add'>+		dma_node = dp-&gt;parent;</div><div class='ctx'> 	else if (!strcmp(dp-&gt;name, "SUNW,fas")) {</div><div class='del'>-		dma_sdev = sdev;</div><div class='add'>+		dma_node = op-&gt;node;</div><div class='ctx'> 		hme = 1;</div><div class='ctx'> 	}</div><div class='add'>+	if (dma_node)</div><div class='add'>+		dma_of = of_find_device_by_node(dma_node);</div><div class='add'>+	if (!dma_of)</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	return esp_sbus_probe_one(&amp;dev-&gt;dev, sdev, dma_sdev,</div><div class='del'>-				  sdev-&gt;bus, hme);</div><div class='add'>+	return esp_sbus_probe_one(op, dma_of, hme);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devexit esp_sbus_remove(struct of_device *dev)</div><div class='add'>+static int __devexit esp_sbus_remove(struct of_device *op)</div><div class='ctx'> {</div><div class='del'>-	struct esp *esp = dev_get_drvdata(&amp;dev-&gt;dev);</div><div class='add'>+	struct esp *esp = dev_get_drvdata(&amp;op-&gt;dev);</div><div class='add'>+	struct of_device *dma_of = esp-&gt;dma;</div><div class='ctx'> 	unsigned int irq = esp-&gt;host-&gt;irq;</div><div class='add'>+	bool is_hme;</div><div class='ctx'> 	u32 val;</div><div class='ctx'> </div><div class='ctx'> 	scsi_esp_unregister(esp);</div><div class='hunk'>@@ -586,17 +599,25 @@ static int __devexit esp_sbus_remove(struct of_device *dev)</div><div class='ctx'> 	dma_write32(val &amp; ~DMA_INT_ENAB, DMA_CSR);</div><div class='ctx'> </div><div class='ctx'> 	free_irq(irq, esp);</div><div class='del'>-	sbus_free_consistent(esp-&gt;dev, 16,</div><div class='del'>-			     esp-&gt;command_block,</div><div class='del'>-			     esp-&gt;command_block_dma);</div><div class='del'>-	sbus_iounmap(esp-&gt;regs, SBUS_ESP_REG_SIZE);</div><div class='add'>+</div><div class='add'>+	is_hme = (esp-&gt;dmarev == dvmahme);</div><div class='add'>+</div><div class='add'>+	dma_free_coherent(&amp;op-&gt;dev, 16,</div><div class='add'>+			  esp-&gt;command_block,</div><div class='add'>+			  esp-&gt;command_block_dma);</div><div class='add'>+	of_iounmap(&amp;op-&gt;resource[(is_hme ? 1 : 0)], esp-&gt;regs,</div><div class='add'>+		   SBUS_ESP_REG_SIZE);</div><div class='add'>+	of_iounmap(&amp;dma_of-&gt;resource[0], esp-&gt;dma_regs,</div><div class='add'>+		   resource_size(&amp;dma_of-&gt;resource[0]));</div><div class='ctx'> </div><div class='ctx'> 	scsi_host_put(esp-&gt;host);</div><div class='ctx'> </div><div class='add'>+	dev_set_drvdata(&amp;op-&gt;dev, NULL);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct of_device_id esp_match[] = {</div><div class='add'>+static const struct of_device_id esp_match[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.name = "SUNW,esp",</div><div class='ctx'> 	},</div><div class='hunk'>@@ -619,7 +640,7 @@ static struct of_platform_driver esp_sbus_driver = {</div><div class='ctx'> </div><div class='ctx'> static int __init sunesp_init(void)</div><div class='ctx'> {</div><div class='del'>-	return of_register_driver(&amp;esp_sbus_driver, &amp;sbus_bus_type);</div><div class='add'>+	return of_register_driver(&amp;esp_sbus_driver, &amp;of_bus_type);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit sunesp_exit(void)</div><div class='head'>diff --git a/drivers/scsi/sym53c8xx_2/sym_glue.c b/drivers/scsi/sym53c8xx_2/sym_glue.c<br/>index d39107b7669b..f4e6cde1fd0d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/sym53c8xx_2/sym_glue.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/sym53c8xx_2/sym_glue.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/sym53c8xx_2/sym_glue.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/sym53c8xx_2/sym_glue.c</a></div><div class='hunk'>@@ -519,8 +519,8 @@ static int sym53c8xx_queue_command(struct scsi_cmnd *cmd,</div><div class='ctx'> 	 *  Shorten our settle_time if needed for </div><div class='ctx'> 	 *  this command not to time out.</div><div class='ctx'> 	 */</div><div class='del'>-	if (np-&gt;s.settle_time_valid &amp;&amp; cmd-&gt;timeout_per_command) {</div><div class='del'>-		unsigned long tlimit = jiffies + cmd-&gt;timeout_per_command;</div><div class='add'>+	if (np-&gt;s.settle_time_valid &amp;&amp; cmd-&gt;request-&gt;timeout) {</div><div class='add'>+		unsigned long tlimit = jiffies + cmd-&gt;request-&gt;timeout;</div><div class='ctx'> 		tlimit -= SYM_CONF_TIMER_INTERVAL*2;</div><div class='ctx'> 		if (time_after(np-&gt;s.settle_time, tlimit)) {</div><div class='ctx'> 			np-&gt;s.settle_time = tlimit;</div><div class='head'>diff --git a/drivers/scsi/tmscsim.c b/drivers/scsi/tmscsim.c<br/>index 1723d71cbf3f..69ac6e590f1d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/tmscsim.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/scsi/tmscsim.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/scsi/tmscsim.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/scsi/tmscsim.c</a></div><div class='hunk'>@@ -2573,8 +2573,8 @@ static struct pci_driver dc390_driver = {</div><div class='ctx'> static int __init dc390_module_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (!disable_clustering)</div><div class='del'>-		printk(KERN_INFO "DC390: clustering now enabled by default. If you get problems load\n"</div><div class='del'>-		       "\twith \"disable_clustering=1\" and report to maintainers\n");</div><div class='add'>+		printk(KERN_INFO "DC390: clustering now enabled by default. If you get problems load\n");</div><div class='add'>+		printk(KERN_INFO "       with \"disable_clustering=1\" and report to maintainers\n");</div><div class='ctx'> </div><div class='ctx'> 	if (tmscsim[0] == -1 || tmscsim[0] &gt; 15) {</div><div class='ctx'> 		tmscsim[0] = 7;</div><div class='head'>diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c<br/>index 9ccc563d8730..1528de23a650 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/serial/8250.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/serial/8250.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/serial/8250.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/serial/8250.c</a></div><div class='hunk'>@@ -44,6 +44,10 @@</div><div class='ctx'> </div><div class='ctx'> #include "8250.h"</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_SPARC</div><div class='add'>+#include "suncore.h"</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Configuration:</div><div class='ctx'>  *   share_irqs - whether we pass IRQF_SHARED to request_irq().  This option</div><div class='hunk'>@@ -53,6 +57,13 @@ static unsigned int share_irqs = SERIAL8250_SHARE_IRQS;</div><div class='ctx'> </div><div class='ctx'> static unsigned int nr_uarts = CONFIG_SERIAL_8250_RUNTIME_UARTS;</div><div class='ctx'> </div><div class='add'>+static struct uart_driver serial8250_reg;</div><div class='add'>+</div><div class='add'>+static int serial_index(struct uart_port *port)</div><div class='add'>+{</div><div class='add'>+	return (serial8250_reg.minor - 64) + port-&gt;line;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Debugging.</div><div class='ctx'>  */</div><div class='hunk'>@@ -536,7 +547,7 @@ static unsigned int serial_icr_read(struct uart_8250_port *up, int offset)</div><div class='ctx'> /*</div><div class='ctx'>  * FIFO support.</div><div class='ctx'>  */</div><div class='del'>-static inline void serial8250_clear_fifos(struct uart_8250_port *p)</div><div class='add'>+static void serial8250_clear_fifos(struct uart_8250_port *p)</div><div class='ctx'> {</div><div class='ctx'> 	if (p-&gt;capabilities &amp; UART_CAP_FIFO) {</div><div class='ctx'> 		serial_outp(p, UART_FCR, UART_FCR_ENABLE_FIFO);</div><div class='hunk'>@@ -551,7 +562,7 @@ static inline void serial8250_clear_fifos(struct uart_8250_port *p)</div><div class='ctx'>  * capability" bit enabled.  Note that on XR16C850s, we need to</div><div class='ctx'>  * reset LCR to write to IER.</div><div class='ctx'>  */</div><div class='del'>-static inline void serial8250_set_sleep(struct uart_8250_port *p, int sleep)</div><div class='add'>+static void serial8250_set_sleep(struct uart_8250_port *p, int sleep)</div><div class='ctx'> {</div><div class='ctx'> 	if (p-&gt;capabilities &amp; UART_CAP_SLEEP) {</div><div class='ctx'> 		if (p-&gt;capabilities &amp; UART_CAP_EFR) {</div><div class='hunk'>@@ -993,7 +1004,7 @@ static void autoconfig(struct uart_8250_port *up, unsigned int probeflags)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	DEBUG_AUTOCONF("ttyS%d: autoconf (0x%04x, 0x%p): ",</div><div class='del'>-			up-&gt;port.line, up-&gt;port.iobase, up-&gt;port.membase);</div><div class='add'>+		       serial_index(&amp;up-&gt;port), up-&gt;port.iobase, up-&gt;port.membase);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We really do need global IRQs disabled here - we're going to</div><div class='hunk'>@@ -1128,8 +1139,8 @@ static void autoconfig(struct uart_8250_port *up, unsigned int probeflags)</div><div class='ctx'> 	if (up-&gt;capabilities != uart_config[up-&gt;port.type].flags) {</div><div class='ctx'> 		printk(KERN_WARNING</div><div class='ctx'> 		       "ttyS%d: detected caps %08x should be %08x\n",</div><div class='del'>-			up-&gt;port.line, up-&gt;capabilities,</div><div class='del'>-			uart_config[up-&gt;port.type].flags);</div><div class='add'>+		       serial_index(&amp;up-&gt;port), up-&gt;capabilities,</div><div class='add'>+		       uart_config[up-&gt;port.type].flags);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	up-&gt;port.fifosize = uart_config[up-&gt;port.type].fifo_size;</div><div class='hunk'>@@ -1424,8 +1435,7 @@ static unsigned int check_modem_status(struct uart_8250_port *up)</div><div class='ctx'> /*</div><div class='ctx'>  * This handles the interrupt from one port.</div><div class='ctx'>  */</div><div class='del'>-static inline void</div><div class='del'>-serial8250_handle_port(struct uart_8250_port *up)</div><div class='add'>+static void serial8250_handle_port(struct uart_8250_port *up)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int status;</div><div class='ctx'> 	unsigned long flags;</div><div class='hunk'>@@ -1719,7 +1729,7 @@ static void serial8250_break_ctl(struct uart_port *port, int break_state)</div><div class='ctx'> /*</div><div class='ctx'>  *	Wait for transmitter &amp; holding register to empty</div><div class='ctx'>  */</div><div class='del'>-static inline void wait_for_xmitr(struct uart_8250_port *up, int bits)</div><div class='add'>+static void wait_for_xmitr(struct uart_8250_port *up, int bits)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int status, tmout = 10000;</div><div class='ctx'> </div><div class='hunk'>@@ -1854,7 +1864,8 @@ static int serial8250_startup(struct uart_port *port)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!(up-&gt;port.flags &amp; UPF_BUGGY_UART) &amp;&amp;</div><div class='ctx'> 	    (serial_inp(up, UART_LSR) == 0xff)) {</div><div class='del'>-		printk("ttyS%d: LSR safety check engaged!\n", up-&gt;port.line);</div><div class='add'>+		printk(KERN_INFO "ttyS%d: LSR safety check engaged!\n",</div><div class='add'>+		       serial_index(&amp;up-&gt;port));</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1909,7 +1920,8 @@ static int serial8250_startup(struct uart_port *port)</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (!(iir1 &amp; UART_IIR_NO_INT) &amp;&amp; (iir &amp; UART_IIR_NO_INT)) {</div><div class='ctx'> 			up-&gt;bugs |= UART_BUG_THRE;</div><div class='del'>-			pr_debug("ttyS%d - using backup timer\n", port-&gt;line);</div><div class='add'>+			pr_debug("ttyS%d - using backup timer\n",</div><div class='add'>+				 serial_index(port));</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1969,7 +1981,7 @@ static int serial8250_startup(struct uart_port *port)</div><div class='ctx'> 		if (!(up-&gt;bugs &amp; UART_BUG_TXEN)) {</div><div class='ctx'> 			up-&gt;bugs |= UART_BUG_TXEN;</div><div class='ctx'> 			pr_debug("ttyS%d - enabling bad tx status workarounds\n",</div><div class='del'>-				 port-&gt;line);</div><div class='add'>+				 serial_index(port));</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		up-&gt;bugs &amp;= ~UART_BUG_TXEN;</div><div class='hunk'>@@ -2211,9 +2223,9 @@ serial8250_set_termios(struct uart_port *port, struct ktermios *termios,</div><div class='ctx'> 		serial_outp(up, UART_EFR, efr);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_ARCH_OMAP15XX</div><div class='add'>+#ifdef CONFIG_ARCH_OMAP</div><div class='ctx'> 	/* Workaround to enable 115200 baud on OMAP1510 internal ports */</div><div class='del'>-	if (cpu_is_omap1510() &amp;&amp; is_omap_port((unsigned int)up-&gt;port.membase)) {</div><div class='add'>+	if (cpu_is_omap1510() &amp;&amp; is_omap_port(up)) {</div><div class='ctx'> 		if (baud == 115200) {</div><div class='ctx'> 			quot = 1;</div><div class='ctx'> 			serial_out(up, UART_OMAP_OSC_12M_SEL, 1);</div><div class='hunk'>@@ -2266,18 +2278,27 @@ serial8250_pm(struct uart_port *port, unsigned int state,</div><div class='ctx'> 		p-&gt;pm(port, state, oldstate);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static unsigned int serial8250_port_size(struct uart_8250_port *pt)</div><div class='add'>+{</div><div class='add'>+	if (pt-&gt;port.iotype == UPIO_AU)</div><div class='add'>+		return 0x100000;</div><div class='add'>+#ifdef CONFIG_ARCH_OMAP</div><div class='add'>+	if (is_omap_port(pt))</div><div class='add'>+		return 0x16 &lt;&lt; pt-&gt;port.regshift;</div><div class='add'>+#endif</div><div class='add'>+	return 8 &lt;&lt; pt-&gt;port.regshift;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Resource handling.</div><div class='ctx'>  */</div><div class='ctx'> static int serial8250_request_std_resource(struct uart_8250_port *up)</div><div class='ctx'> {</div><div class='del'>-	unsigned int size = 8 &lt;&lt; up-&gt;port.regshift;</div><div class='add'>+	unsigned int size = serial8250_port_size(up);</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	switch (up-&gt;port.iotype) {</div><div class='ctx'> 	case UPIO_AU:</div><div class='del'>-		size = 0x100000;</div><div class='del'>-		/* fall thru */</div><div class='ctx'> 	case UPIO_TSI:</div><div class='ctx'> 	case UPIO_MEM32:</div><div class='ctx'> 	case UPIO_MEM:</div><div class='hunk'>@@ -2311,12 +2332,10 @@ static int serial8250_request_std_resource(struct uart_8250_port *up)</div><div class='ctx'> </div><div class='ctx'> static void serial8250_release_std_resource(struct uart_8250_port *up)</div><div class='ctx'> {</div><div class='del'>-	unsigned int size = 8 &lt;&lt; up-&gt;port.regshift;</div><div class='add'>+	unsigned int size = serial8250_port_size(up);</div><div class='ctx'> </div><div class='ctx'> 	switch (up-&gt;port.iotype) {</div><div class='ctx'> 	case UPIO_AU:</div><div class='del'>-		size = 0x100000;</div><div class='del'>-		/* fall thru */</div><div class='ctx'> 	case UPIO_TSI:</div><div class='ctx'> 	case UPIO_MEM32:</div><div class='ctx'> 	case UPIO_MEM:</div><div class='hunk'>@@ -2630,7 +2649,6 @@ static int serial8250_console_early_setup(void)</div><div class='ctx'> 	return serial8250_find_port_for_earlycon();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct uart_driver serial8250_reg;</div><div class='ctx'> static struct console serial8250_console = {</div><div class='ctx'> 	.name		= "ttyS",</div><div class='ctx'> 	.write		= serial8250_console_write,</div><div class='hunk'>@@ -2677,7 +2695,6 @@ static struct uart_driver serial8250_reg = {</div><div class='ctx'> 	.dev_name		= "ttyS",</div><div class='ctx'> 	.major			= TTY_MAJOR,</div><div class='ctx'> 	.minor			= 64,</div><div class='del'>-	.nr			= UART_NR,</div><div class='ctx'> 	.cons			= SERIAL8250_CONSOLE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2962,7 +2979,12 @@ static int __init serial8250_init(void)</div><div class='ctx'> 	for (i = 0; i &lt; NR_IRQS; i++)</div><div class='ctx'> 		spin_lock_init(&amp;irq_lists[i].lock);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_SPARC</div><div class='add'>+	ret = sunserial_register_minors(&amp;serial8250_reg, UART_NR);</div><div class='add'>+#else</div><div class='add'>+	serial8250_reg.nr = UART_NR;</div><div class='ctx'> 	ret = uart_register_driver(&amp;serial8250_reg);</div><div class='add'>+#endif</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -2987,7 +3009,11 @@ static int __init serial8250_init(void)</div><div class='ctx'>  put_dev:</div><div class='ctx'> 	platform_device_put(serial8250_isa_devs);</div><div class='ctx'>  unreg_uart_drv:</div><div class='add'>+#ifdef CONFIG_SPARC</div><div class='add'>+	sunserial_unregister_minors(&amp;serial8250_reg, UART_NR);</div><div class='add'>+#else</div><div class='ctx'> 	uart_unregister_driver(&amp;serial8250_reg);</div><div class='add'>+#endif</div><div class='ctx'>  out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -3006,7 +3032,11 @@ static void __exit serial8250_exit(void)</div><div class='ctx'> 	platform_driver_unregister(&amp;serial8250_isa_driver);</div><div class='ctx'> 	platform_device_unregister(isa_dev);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_SPARC</div><div class='add'>+	sunserial_unregister_minors(&amp;serial8250_reg, UART_NR);</div><div class='add'>+#else</div><div class='ctx'> 	uart_unregister_driver(&amp;serial8250_reg);</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(serial8250_init);</div><div class='head'>diff --git a/drivers/serial/8250_pci.c b/drivers/serial/8250_pci.c<br/>index c2f23933155b..c014ffb110e9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/serial/8250_pci.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/serial/8250_pci.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/serial/8250_pci.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/serial/8250_pci.c</a></div><div class='hunk'>@@ -2041,9 +2041,9 @@ static int pciserial_resume_one(struct pci_dev *dev)</div><div class='ctx'> 		 * The device may have been disabled.  Re-enable it.</div><div class='ctx'> 		 */</div><div class='ctx'> 		err = pci_enable_device(dev);</div><div class='add'>+		/* FIXME: We cannot simply error out here */</div><div class='ctx'> 		if (err)</div><div class='del'>-			return err;</div><div class='del'>-</div><div class='add'>+			printk(KERN_ERR "pciserial: Unable to re-enable ports, trying to continue.\n");</div><div class='ctx'> 		pciserial_resume_ports(priv);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig<br/>index 77cb34270fc1..db783b77a881 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/serial/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/serial/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/serial/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/serial/Kconfig</a></div><div class='hunk'>@@ -9,7 +9,6 @@ menu "Serial drivers"</div><div class='ctx'> # The new 8250/16550 serial drivers</div><div class='ctx'> config SERIAL_8250</div><div class='ctx'> 	tristate "8250/16550 and compatible serial support"</div><div class='del'>-	depends on (BROKEN || !SPARC)</div><div class='ctx'> 	select SERIAL_CORE</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  This selects whether you want to include the driver for the standard</div><div class='hunk'>@@ -994,24 +993,12 @@ config SERIAL_68328_RTS_CTS</div><div class='ctx'> 	bool "Support RTS/CTS on 68328 serial port"</div><div class='ctx'> 	depends on SERIAL_68328</div><div class='ctx'> </div><div class='del'>-config SERIAL_COLDFIRE</div><div class='del'>-	bool "ColdFire serial support (DEPRECATED)"</div><div class='del'>-	depends on COLDFIRE</div><div class='del'>-	help</div><div class='del'>-	  This driver supports the built-in serial ports of the Motorola ColdFire</div><div class='del'>-	  family of CPUs.</div><div class='del'>-	  This driver is deprecated because it supports only the old interface</div><div class='del'>-	  for serial drivers and features like magic keys are not working.</div><div class='del'>-	  Please switch to the new style driver because this driver will be</div><div class='del'>-	  removed soon.</div><div class='del'>-</div><div class='ctx'> config SERIAL_MCF</div><div class='del'>-	bool "Coldfire serial support (new style driver)"</div><div class='add'>+	bool "Coldfire serial support"</div><div class='ctx'> 	depends on COLDFIRE</div><div class='ctx'> 	select SERIAL_CORE</div><div class='ctx'> 	help</div><div class='del'>-	  This new serial driver supports the Freescale Coldfire serial ports</div><div class='del'>-	  using the new serial driver subsystem.</div><div class='add'>+	  This serial driver supports the Freescale Coldfire serial ports.</div><div class='ctx'> </div><div class='ctx'> config SERIAL_MCF_BAUDRATE</div><div class='ctx'> 	int "Default baudrate for Coldfire serial ports"</div><div class='hunk'>@@ -1136,42 +1123,6 @@ config SERIAL_CPM_CONSOLE</div><div class='ctx'> 	  your boot loader (lilo or loadlin) about how to pass options to the</div><div class='ctx'> 	  kernel at boot time.)</div><div class='ctx'> </div><div class='del'>-config SERIAL_CPM_SCC1</div><div class='del'>-	bool "Support for SCC1 serial port"</div><div class='del'>-	depends on SERIAL_CPM=y</div><div class='del'>-	help</div><div class='del'>-	  Select this option to use SCC1 as a serial port</div><div class='del'>-</div><div class='del'>-config SERIAL_CPM_SCC2</div><div class='del'>-	bool "Support for SCC2 serial port"</div><div class='del'>-	depends on SERIAL_CPM=y</div><div class='del'>-	help</div><div class='del'>-	  Select this option to use SCC2 as a serial port</div><div class='del'>-</div><div class='del'>-config SERIAL_CPM_SCC3</div><div class='del'>-	bool "Support for SCC3 serial port"</div><div class='del'>-	depends on SERIAL_CPM=y</div><div class='del'>-	help</div><div class='del'>-	  Select this option to use SCC3 as a serial port</div><div class='del'>-</div><div class='del'>-config SERIAL_CPM_SCC4</div><div class='del'>-	bool "Support for SCC4 serial port"</div><div class='del'>-	depends on SERIAL_CPM=y</div><div class='del'>-	help</div><div class='del'>-	  Select this option to use SCC4 as a serial port</div><div class='del'>-</div><div class='del'>-config SERIAL_CPM_SMC1</div><div class='del'>-	bool "Support for SMC1 serial port"</div><div class='del'>-	depends on SERIAL_CPM=y</div><div class='del'>-	help</div><div class='del'>-	  Select this option to use SMC1 as a serial port</div><div class='del'>-</div><div class='del'>-config SERIAL_CPM_SMC2</div><div class='del'>-	bool "Support for SMC2 serial port"</div><div class='del'>-	depends on SERIAL_CPM=y</div><div class='del'>-	help</div><div class='del'>-	  Select this option to use SMC2 as a serial port</div><div class='del'>-</div><div class='ctx'> config SERIAL_SGI_L1_CONSOLE</div><div class='ctx'> 	bool "SGI Altix L1 serial console support"</div><div class='ctx'> 	depends on IA64_GENERIC || IA64_SGI_SN2</div><div class='head'>diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile<br/>index 7e7383e890d8..0c17c8ddb19d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/serial/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/serial/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/serial/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/serial/Makefile</a></div><div class='hunk'>@@ -4,6 +4,16 @@</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_SERIAL_CORE) += serial_core.o</div><div class='ctx'> obj-$(CONFIG_SERIAL_21285) += 21285.o</div><div class='add'>+</div><div class='add'>+# These Sparc drivers have to appear before others such as 8250</div><div class='add'>+# which share ttySx minor node space.  Otherwise console device</div><div class='add'>+# names change and other unplesantries.</div><div class='add'>+obj-$(CONFIG_SERIAL_SUNCORE) += suncore.o</div><div class='add'>+obj-$(CONFIG_SERIAL_SUNHV) += sunhv.o</div><div class='add'>+obj-$(CONFIG_SERIAL_SUNZILOG) += sunzilog.o</div><div class='add'>+obj-$(CONFIG_SERIAL_SUNSU) += sunsu.o</div><div class='add'>+obj-$(CONFIG_SERIAL_SUNSAB) += sunsab.o</div><div class='add'>+</div><div class='ctx'> obj-$(CONFIG_SERIAL_8250) += 8250.o</div><div class='ctx'> obj-$(CONFIG_SERIAL_8250_PNP) += 8250_pnp.o</div><div class='ctx'> obj-$(CONFIG_SERIAL_8250_GSC) += 8250_gsc.o</div><div class='hunk'>@@ -31,16 +41,10 @@ obj-$(CONFIG_SERIAL_S3C2400) += s3c2400.o</div><div class='ctx'> obj-$(CONFIG_SERIAL_S3C2410) += s3c2410.o</div><div class='ctx'> obj-$(CONFIG_SERIAL_S3C2412) += s3c2412.o</div><div class='ctx'> obj-$(CONFIG_SERIAL_S3C2440) += s3c2440.o</div><div class='del'>-obj-$(CONFIG_SERIAL_SUNCORE) += suncore.o</div><div class='del'>-obj-$(CONFIG_SERIAL_SUNHV) += sunhv.o</div><div class='del'>-obj-$(CONFIG_SERIAL_SUNZILOG) += sunzilog.o</div><div class='ctx'> obj-$(CONFIG_SERIAL_IP22_ZILOG) += ip22zilog.o</div><div class='del'>-obj-$(CONFIG_SERIAL_SUNSU) += sunsu.o</div><div class='del'>-obj-$(CONFIG_SERIAL_SUNSAB) += sunsab.o</div><div class='ctx'> obj-$(CONFIG_SERIAL_MUX) += mux.o</div><div class='ctx'> obj-$(CONFIG_SERIAL_68328) += 68328serial.o</div><div class='ctx'> obj-$(CONFIG_SERIAL_68360) += 68360serial.o</div><div class='del'>-obj-$(CONFIG_SERIAL_COLDFIRE) += mcfserial.o</div><div class='ctx'> obj-$(CONFIG_SERIAL_MCF) += mcf.o</div><div class='ctx'> obj-$(CONFIG_SERIAL_PMACZILOG) += pmac_zilog.o</div><div class='ctx'> obj-$(CONFIG_SERIAL_LH7A40X) += serial_lh7a40x.o</div><div class='head'>diff --git a/drivers/serial/bfin_5xx.c b/drivers/serial/bfin_5xx.c<br/>index 4a0d30bed9f1..569f0e2476c6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/serial/bfin_5xx.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/serial/bfin_5xx.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/serial/bfin_5xx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/serial/bfin_5xx.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Blackfin On-Chip Serial Driver</div><div class='ctx'>  *</div><div class='del'>- * Copyright 2006-2007 Analog Devices Inc.</div><div class='add'>+ * Copyright 2006-2008 Analog Devices Inc.</div><div class='ctx'>  *</div><div class='ctx'>  * Enter bugs at http://blackfin.uclinux.org/</div><div class='ctx'>  *</div><div class='hunk'>@@ -42,6 +42,9 @@</div><div class='ctx'> #define BFIN_SERIAL_MAJOR	204</div><div class='ctx'> #define BFIN_SERIAL_MINOR	64</div><div class='ctx'> </div><div class='add'>+static struct bfin_serial_port bfin_serial_ports[BFIN_UART_NR_PORTS];</div><div class='add'>+static int nr_active_ports = ARRAY_SIZE(bfin_serial_resource);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Setup for console. Argument comes from the menuconfig</div><div class='ctx'>  */</div><div class='hunk'>@@ -126,13 +129,13 @@ static int kgdb_entry_state;</div><div class='ctx'> void kgdb_put_debug_char(int chr)</div><div class='ctx'> {</div><div class='ctx'> 	struct bfin_serial_port *uart;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	if (CONFIG_KGDB_UART_PORT &lt; 0</div><div class='ctx'> 		|| CONFIG_KGDB_UART_PORT &gt;= BFIN_UART_NR_PORTS)</div><div class='ctx'> 		uart = &amp;bfin_serial_ports[0];</div><div class='ctx'> 	else</div><div class='ctx'> 		uart = &amp;bfin_serial_ports[CONFIG_KGDB_UART_PORT];</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	while (!(UART_GET_LSR(uart) &amp; THRE)) {</div><div class='ctx'> 		SSYNC();</div><div class='ctx'> 	}</div><div class='hunk'>@@ -152,7 +155,7 @@ int kgdb_get_debug_char(void)</div><div class='ctx'> 		uart = &amp;bfin_serial_ports[0];</div><div class='ctx'> 	else</div><div class='ctx'> 		uart = &amp;bfin_serial_ports[CONFIG_KGDB_UART_PORT];</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	while(!(UART_GET_LSR(uart) &amp; DR)) {</div><div class='ctx'> 		SSYNC();</div><div class='ctx'> 	}</div><div class='hunk'>@@ -298,7 +301,11 @@ static void bfin_serial_tx_chars(struct bfin_serial_port *uart)</div><div class='ctx'> 	bfin_serial_mctrl_check(uart);</div><div class='ctx'> </div><div class='ctx'> 	if (uart_circ_empty(xmit) || uart_tx_stopped(&amp;uart-&gt;port)) {</div><div class='del'>-		bfin_serial_stop_tx(&amp;uart-&gt;port);</div><div class='add'>+#ifdef CONFIG_BF54x</div><div class='add'>+		/* Clear TFI bit */</div><div class='add'>+		UART_PUT_LSR(uart, TFI);</div><div class='add'>+#endif</div><div class='add'>+		UART_CLEAR_IER(uart, ETBEI);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -317,9 +324,6 @@ static void bfin_serial_tx_chars(struct bfin_serial_port *uart)</div><div class='ctx'> </div><div class='ctx'> 	if (uart_circ_chars_pending(xmit) &lt; WAKEUP_CHARS)</div><div class='ctx'> 		uart_write_wakeup(&amp;uart-&gt;port);</div><div class='del'>-</div><div class='del'>-	if (uart_circ_empty(xmit))</div><div class='del'>-		bfin_serial_stop_tx(&amp;uart-&gt;port);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static irqreturn_t bfin_serial_rx_int(int irq, void *dev_id)</div><div class='hunk'>@@ -645,6 +649,42 @@ static int bfin_serial_startup(struct uart_port *port)</div><div class='ctx'> 		free_irq(uart-&gt;port.irq, uart);</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+# ifdef CONFIG_BF54x</div><div class='add'>+	{</div><div class='add'>+		unsigned uart_dma_ch_rx, uart_dma_ch_tx;</div><div class='add'>+</div><div class='add'>+		switch (uart-&gt;port.irq) {</div><div class='add'>+		case IRQ_UART3_RX:</div><div class='add'>+			uart_dma_ch_rx = CH_UART3_RX;</div><div class='add'>+			uart_dma_ch_tx = CH_UART3_TX;</div><div class='add'>+			break;</div><div class='add'>+		case IRQ_UART2_RX:</div><div class='add'>+			uart_dma_ch_rx = CH_UART2_RX;</div><div class='add'>+			uart_dma_ch_tx = CH_UART2_TX;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			uart_dma_ch_rx = uart_dma_ch_tx = 0;</div><div class='add'>+			break;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		if (uart_dma_ch_rx &amp;&amp;</div><div class='add'>+			request_dma(uart_dma_ch_rx, "BFIN_UART_RX") &lt; 0) {</div><div class='add'>+			printk(KERN_NOTICE"Fail to attach UART interrupt\n");</div><div class='add'>+			free_irq(uart-&gt;port.irq, uart);</div><div class='add'>+			free_irq(uart-&gt;port.irq + 1, uart);</div><div class='add'>+			return -EBUSY;</div><div class='add'>+		}</div><div class='add'>+		if (uart_dma_ch_tx &amp;&amp;</div><div class='add'>+			request_dma(uart_dma_ch_tx, "BFIN_UART_TX") &lt; 0) {</div><div class='add'>+			printk(KERN_NOTICE "Fail to attach UART interrupt\n");</div><div class='add'>+			free_dma(uart_dma_ch_rx);</div><div class='add'>+			free_irq(uart-&gt;port.irq, uart);</div><div class='add'>+			free_irq(uart-&gt;port.irq + 1, uart);</div><div class='add'>+			return -EBUSY;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+# endif</div><div class='ctx'> #endif</div><div class='ctx'> 	UART_SET_IER(uart, ERBFI);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -662,6 +702,20 @@ static void bfin_serial_shutdown(struct uart_port *port)</div><div class='ctx'> 	del_timer(&amp;(uart-&gt;rx_dma_timer));</div><div class='ctx'> 	dma_free_coherent(NULL, PAGE_SIZE, uart-&gt;rx_dma_buf.buf, 0);</div><div class='ctx'> #else</div><div class='add'>+#ifdef CONFIG_BF54x</div><div class='add'>+	switch (uart-&gt;port.irq) {</div><div class='add'>+	case IRQ_UART3_RX:</div><div class='add'>+		free_dma(CH_UART3_RX);</div><div class='add'>+		free_dma(CH_UART3_TX);</div><div class='add'>+		break;</div><div class='add'>+	case IRQ_UART2_RX:</div><div class='add'>+		free_dma(CH_UART2_RX);</div><div class='add'>+		free_dma(CH_UART2_TX);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	};</div><div class='add'>+#endif</div><div class='ctx'> #ifdef	CONFIG_KGDB_UART</div><div class='ctx'> 	if (uart-&gt;port.line != CONFIG_KGDB_UART_PORT)</div><div class='ctx'> #endif</div><div class='hunk'>@@ -757,6 +811,9 @@ bfin_serial_set_termios(struct uart_port *port, struct ktermios *termios,</div><div class='ctx'> 	val |= UCEN;</div><div class='ctx'> 	UART_PUT_GCTL(uart, val);</div><div class='ctx'> </div><div class='add'>+	/* Port speed changed, update the per-port timeout. */</div><div class='add'>+	uart_update_timeout(port, termios-&gt;c_cflag, baud);</div><div class='add'>+</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;uart-&gt;port.lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -859,8 +916,9 @@ static void __init bfin_serial_init_ports(void)</div><div class='ctx'> 		return;</div><div class='ctx'> 	first = 0;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; nr_ports; i++) {</div><div class='add'>+	for (i = 0; i &lt; nr_active_ports; i++) {</div><div class='ctx'> 		bfin_serial_ports[i].port.uartclk   = get_sclk();</div><div class='add'>+		bfin_serial_ports[i].port.fifosize  = BFIN_UART_TX_FIFO_SIZE;</div><div class='ctx'> 		bfin_serial_ports[i].port.ops       = &amp;bfin_serial_pops;</div><div class='ctx'> 		bfin_serial_ports[i].port.line      = i;</div><div class='ctx'> 		bfin_serial_ports[i].port.iotype    = UPIO_MEM;</div><div class='hunk'>@@ -961,7 +1019,7 @@ bfin_serial_console_setup(struct console *co, char *options)</div><div class='ctx'> 	 * if so, search for the first available port that does have</div><div class='ctx'> 	 * console support.</div><div class='ctx'> 	 */</div><div class='del'>-	if (co-&gt;index == -1 || co-&gt;index &gt;= nr_ports)</div><div class='add'>+	if (co-&gt;index == -1 || co-&gt;index &gt;= nr_active_ports)</div><div class='ctx'> 		co-&gt;index = 0;</div><div class='ctx'> 	uart = &amp;bfin_serial_ports[co-&gt;index];</div><div class='ctx'> </div><div class='hunk'>@@ -1056,7 +1114,7 @@ static __init void early_serial_write(struct console *con, const char *s,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct __init console bfin_early_serial_console = {</div><div class='add'>+static struct __initdata console bfin_early_serial_console = {</div><div class='ctx'> 	.name = "early_BFuart",</div><div class='ctx'> 	.write = early_serial_write,</div><div class='ctx'> 	.device = uart_console_device,</div><div class='hunk'>@@ -1072,7 +1130,7 @@ struct console __init *bfin_earlyserial_init(unsigned int port,</div><div class='ctx'> 	struct bfin_serial_port *uart;</div><div class='ctx'> 	struct ktermios t;</div><div class='ctx'> </div><div class='del'>-	if (port == -1 || port &gt;= nr_ports)</div><div class='add'>+	if (port == -1 || port &gt;= nr_active_ports)</div><div class='ctx'> 		port = 0;</div><div class='ctx'> 	bfin_serial_init_ports();</div><div class='ctx'> 	bfin_early_serial_console.index = port;</div><div class='hunk'>@@ -1100,20 +1158,26 @@ static struct uart_driver bfin_serial_reg = {</div><div class='ctx'> </div><div class='ctx'> static int bfin_serial_suspend(struct platform_device *dev, pm_message_t state)</div><div class='ctx'> {</div><div class='del'>-	struct bfin_serial_port *uart = platform_get_drvdata(dev);</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-	if (uart)</div><div class='del'>-		uart_suspend_port(&amp;bfin_serial_reg, &amp;uart-&gt;port);</div><div class='add'>+	for (i = 0; i &lt; nr_active_ports; i++) {</div><div class='add'>+		if (bfin_serial_ports[i].port.dev != &amp;dev-&gt;dev)</div><div class='add'>+			continue;</div><div class='add'>+		uart_suspend_port(&amp;bfin_serial_reg, &amp;bfin_serial_ports[i].port);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bfin_serial_resume(struct platform_device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct bfin_serial_port *uart = platform_get_drvdata(dev);</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-	if (uart)</div><div class='del'>-		uart_resume_port(&amp;bfin_serial_reg, &amp;uart-&gt;port);</div><div class='add'>+	for (i = 0; i &lt; nr_active_ports; i++) {</div><div class='add'>+		if (bfin_serial_ports[i].port.dev != &amp;dev-&gt;dev)</div><div class='add'>+			continue;</div><div class='add'>+		uart_resume_port(&amp;bfin_serial_reg, &amp;bfin_serial_ports[i].port);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1128,32 +1192,31 @@ static int bfin_serial_probe(struct platform_device *dev)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 	if (i &lt; dev-&gt;num_resources) {</div><div class='del'>-		for (i = 0; i &lt; nr_ports; i++, res++) {</div><div class='add'>+		for (i = 0; i &lt; nr_active_ports; i++, res++) {</div><div class='ctx'> 			if (bfin_serial_ports[i].port.mapbase != res-&gt;start)</div><div class='ctx'> 				continue;</div><div class='ctx'> 			bfin_serial_ports[i].port.dev = &amp;dev-&gt;dev;</div><div class='ctx'> 			uart_add_one_port(&amp;bfin_serial_reg, &amp;bfin_serial_ports[i].port);</div><div class='del'>-			platform_set_drvdata(dev, &amp;bfin_serial_ports[i]);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bfin_serial_remove(struct platform_device *pdev)</div><div class='add'>+static int bfin_serial_remove(struct platform_device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct bfin_serial_port *uart = platform_get_drvdata(pdev);</div><div class='del'>-</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='add'>+	for (i = 0; i &lt; nr_active_ports; i++) {</div><div class='add'>+		if (bfin_serial_ports[i].port.dev != &amp;dev-&gt;dev)</div><div class='add'>+			continue;</div><div class='add'>+		uart_remove_one_port(&amp;bfin_serial_reg, &amp;bfin_serial_ports[i].port);</div><div class='add'>+		bfin_serial_ports[i].port.dev = NULL;</div><div class='ctx'> #ifdef CONFIG_SERIAL_BFIN_CTSRTS</div><div class='del'>-	gpio_free(uart-&gt;cts_pin);</div><div class='del'>-	gpio_free(uart-&gt;rts_pin);</div><div class='add'>+		gpio_free(bfin_serial_ports[i].cts_pin);</div><div class='add'>+		gpio_free(bfin_serial_ports[i].rts_pin);</div><div class='ctx'> #endif</div><div class='del'>-</div><div class='del'>-	platform_set_drvdata(pdev, NULL);</div><div class='del'>-</div><div class='del'>-	if (uart)</div><div class='del'>-		uart_remove_one_port(&amp;bfin_serial_reg, &amp;uart-&gt;port);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/serial/cpm_uart/cpm_uart_core.c b/drivers/serial/cpm_uart/cpm_uart_core.c<br/>index 25efca5a7a1f..a6c4d744495e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/serial/cpm_uart/cpm_uart_core.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/serial/cpm_uart/cpm_uart_core.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/serial/cpm_uart/cpm_uart_core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/serial/cpm_uart/cpm_uart_core.c</a></div><div class='hunk'>@@ -1333,6 +1333,9 @@ static int __devinit cpm_uart_probe(struct of_device *ofdev,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='add'>+	/* initialize the device pointer for the port */</div><div class='add'>+	pinfo-&gt;port.dev = &amp;ofdev-&gt;dev;</div><div class='add'>+</div><div class='ctx'> 	return uart_add_one_port(&amp;cpm_reg, &amp;pinfo-&gt;port);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm1.c b/drivers/serial/cpm_uart/cpm_uart_cpm1.c<br/>index 0f0aff06c596..1b94c56ec239 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/serial/cpm_uart/cpm_uart_cpm1.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/serial/cpm_uart/cpm_uart_cpm1.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/serial/cpm_uart/cpm_uart_cpm1.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/serial/cpm_uart/cpm_uart_cpm1.c</a></div><div class='hunk'>@@ -100,7 +100,7 @@ int cpm_uart_allocbuf(struct uart_cpm_port *pinfo, unsigned int is_con)</div><div class='ctx'> 		mem_addr = (u8 *) cpm_dpram_addr(cpm_dpalloc(memsz, 8));</div><div class='ctx'> 		dma_addr = (u32)cpm_dpram_phys(mem_addr);</div><div class='ctx'> 	} else</div><div class='del'>-		mem_addr = dma_alloc_coherent(NULL, memsz, &amp;dma_addr,</div><div class='add'>+		mem_addr = dma_alloc_coherent(pinfo-&gt;port.dev, memsz, &amp;dma_addr,</div><div class='ctx'> 					      GFP_KERNEL);</div><div class='ctx'> </div><div class='ctx'> 	if (mem_addr == NULL) {</div><div class='hunk'>@@ -127,8 +127,8 @@ int cpm_uart_allocbuf(struct uart_cpm_port *pinfo, unsigned int is_con)</div><div class='ctx'> </div><div class='ctx'> void cpm_uart_freebuf(struct uart_cpm_port *pinfo)</div><div class='ctx'> {</div><div class='del'>-	dma_free_coherent(NULL, L1_CACHE_ALIGN(pinfo-&gt;rx_nrfifos *</div><div class='del'>-					       pinfo-&gt;rx_fifosize) +</div><div class='add'>+	dma_free_coherent(pinfo-&gt;port.dev, L1_CACHE_ALIGN(pinfo-&gt;rx_nrfifos *</div><div class='add'>+							  pinfo-&gt;rx_fifosize) +</div><div class='ctx'> 			  L1_CACHE_ALIGN(pinfo-&gt;tx_nrfifos *</div><div class='ctx'> 					 pinfo-&gt;tx_fifosize), pinfo-&gt;mem_addr,</div><div class='ctx'> 			  pinfo-&gt;dma_addr);</div><div class='head'>diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm2.c b/drivers/serial/cpm_uart/cpm_uart_cpm2.c<br/>index b8db4d3eed36..141c0a3333ad 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/serial/cpm_uart/cpm_uart_cpm2.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/serial/cpm_uart/cpm_uart_cpm2.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/serial/cpm_uart/cpm_uart_cpm2.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/serial/cpm_uart/cpm_uart_cpm2.c</a></div><div class='hunk'>@@ -136,7 +136,7 @@ int cpm_uart_allocbuf(struct uart_cpm_port *pinfo, unsigned int is_con)</div><div class='ctx'> 		dma_addr = virt_to_bus(mem_addr);</div><div class='ctx'> 	}</div><div class='ctx'> 	else</div><div class='del'>-		mem_addr = dma_alloc_coherent(NULL, memsz, &amp;dma_addr,</div><div class='add'>+		mem_addr = dma_alloc_coherent(pinfo-&gt;port.dev, memsz, &amp;dma_addr,</div><div class='ctx'> 					      GFP_KERNEL);</div><div class='ctx'> </div><div class='ctx'> 	if (mem_addr == NULL) {</div><div class='hunk'>@@ -163,8 +163,8 @@ int cpm_uart_allocbuf(struct uart_cpm_port *pinfo, unsigned int is_con)</div><div class='ctx'> </div><div class='ctx'> void cpm_uart_freebuf(struct uart_cpm_port *pinfo)</div><div class='ctx'> {</div><div class='del'>-	dma_free_coherent(NULL, L1_CACHE_ALIGN(pinfo-&gt;rx_nrfifos *</div><div class='del'>-					       pinfo-&gt;rx_fifosize) +</div><div class='add'>+	dma_free_coherent(pinfo-&gt;port.dev, L1_CACHE_ALIGN(pinfo-&gt;rx_nrfifos *</div><div class='add'>+							  pinfo-&gt;rx_fifosize) +</div><div class='ctx'> 			  L1_CACHE_ALIGN(pinfo-&gt;tx_nrfifos *</div><div class='ctx'> 					 pinfo-&gt;tx_fifosize), (void __force *)pinfo-&gt;mem_addr,</div><div class='ctx'> 			  pinfo-&gt;dma_addr);</div><div class='head'>diff --git a/drivers/serial/crisv10.c b/drivers/serial/crisv10.c<br/>index bf94a770bb44..211c21797ce0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/serial/crisv10.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/serial/crisv10.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/serial/crisv10.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/serial/crisv10.c</a></div><div class='hunk'>@@ -457,7 +457,6 @@ static struct e100_serial rs_table[] = {</div><div class='ctx'> #define NR_PORTS (sizeof(rs_table)/sizeof(struct e100_serial))</div><div class='ctx'> </div><div class='ctx'> static struct ktermios *serial_termios[NR_PORTS];</div><div class='del'>-static struct ktermios *serial_termios_locked[NR_PORTS];</div><div class='ctx'> #ifdef CONFIG_ETRAX_SERIAL_FAST_TIMER</div><div class='ctx'> static struct fast_timer fast_timers[NR_PORTS];</div><div class='ctx'> #endif</div><div class='hunk'>@@ -4419,6 +4418,7 @@ rs_init(void)</div><div class='ctx'> 			rs485_pa_bit)) {</div><div class='ctx'> 		printk(KERN_CRIT "ETRAX100LX serial: Could not allocate "</div><div class='ctx'> 			"RS485 pin\n");</div><div class='add'>+		put_tty_driver(driver);</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='hunk'>@@ -4427,6 +4427,7 @@ rs_init(void)</div><div class='ctx'> 			rs485_port_g_bit)) {</div><div class='ctx'> 		printk(KERN_CRIT "ETRAX100LX serial: Could not allocate "</div><div class='ctx'> 			"RS485 pin\n");</div><div class='add'>+		put_tty_driver(driver);</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='hunk'>@@ -4446,8 +4447,6 @@ rs_init(void)</div><div class='ctx'> 	driver-&gt;init_termios.c_ispeed = 115200;</div><div class='ctx'> 	driver-&gt;init_termios.c_ospeed = 115200;</div><div class='ctx'> 	driver-&gt;flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV;</div><div class='del'>-	driver-&gt;termios = serial_termios;</div><div class='del'>-	driver-&gt;termios_locked = serial_termios_locked;</div><div class='ctx'> </div><div class='ctx'> 	tty_set_operations(driver, &amp;rs_ops);</div><div class='ctx'>         serial_driver = driver;</div><div class='head'>diff --git a/drivers/serial/mcfserial.c b/drivers/serial/mcfserial.c<br/>deleted file mode 100644<br/>index fbe3835f6b77..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/serial/mcfserial.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/serial/mcfserial.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1965 +0,0 @@</div><div class='del'>-#warning This driver is deprecated. Check Kconfig for details.</div><div class='del'>-/*</div><div class='del'>- * mcfserial.c -- serial driver for ColdFire internal UARTS.</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1999-2003 Greg Ungerer &lt;gerg@snapgear.com&gt;</div><div class='del'>- * Copyright (c) 2000-2001 Lineo, Inc. &lt;www.lineo.com&gt; </div><div class='del'>- * Copyright (C) 2001-2002 SnapGear Inc. &lt;www.snapgear.com&gt; </div><div class='del'>- *</div><div class='del'>- * Based on code from 68332serial.c which was:</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)</div><div class='del'>- * Copyright (C) 1998 TSHG</div><div class='del'>- * Copyright (c) 1999 Rt-Control Inc. &lt;jeff@uclinux.org&gt;</div><div class='del'>- *</div><div class='del'>- * Changes:</div><div class='del'>- * 08/07/2003    Daniele Bellucci &lt;bellucda@tiscali.it&gt;</div><div class='del'>- *               some cleanups in mcfrs_write.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>- </div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/signal.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/timer.h&gt;</div><div class='del'>-#include &lt;linux/wait.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='del'>-#include &lt;linux/tty_flip.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/fcntl.h&gt;</div><div class='del'>-#include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/serial.h&gt;</div><div class='del'>-#include &lt;linux/serialP.h&gt;</div><div class='del'>-#include &lt;linux/console.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/bitops.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/system.h&gt;</div><div class='del'>-#include &lt;asm/delay.h&gt;</div><div class='del'>-#include &lt;asm/coldfire.h&gt;</div><div class='del'>-#include &lt;asm/mcfsim.h&gt;</div><div class='del'>-#include &lt;asm/mcfuart.h&gt;</div><div class='del'>-#include &lt;asm/nettel.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='del'>-#include "mcfserial.h"</div><div class='del'>-</div><div class='del'>-struct timer_list mcfrs_timer_struct;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	Default console baud rate,  we use this as the default</div><div class='del'>- *	for all ports so init can just open /dev/console and</div><div class='del'>- *	keep going.  Perhaps one day the cflag settings for the</div><div class='del'>- *	console can be used instead.</div><div class='del'>- */</div><div class='del'>-#if defined(CONFIG_HW_FEITH)</div><div class='del'>-#define	CONSOLE_BAUD_RATE	38400</div><div class='del'>-#define	DEFAULT_CBAUD		B38400</div><div class='del'>-#elif defined(CONFIG_MOD5272) || defined(CONFIG_M5208EVB) || \</div><div class='del'>-      defined(CONFIG_M5329EVB) || defined(CONFIG_GILBARCO)</div><div class='del'>-#define CONSOLE_BAUD_RATE 	115200</div><div class='del'>-#define DEFAULT_CBAUD		B115200</div><div class='del'>-#elif defined(CONFIG_ARNEWSH) || defined(CONFIG_FREESCALE) || \</div><div class='del'>-      defined(CONFIG_senTec) || defined(CONFIG_SNEHA) || defined(CONFIG_AVNET)</div><div class='del'>-#define	CONSOLE_BAUD_RATE	19200</div><div class='del'>-#define	DEFAULT_CBAUD		B19200</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifndef CONSOLE_BAUD_RATE</div><div class='del'>-#define	CONSOLE_BAUD_RATE	9600</div><div class='del'>-#define	DEFAULT_CBAUD		B9600</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-int mcfrs_console_inited = 0;</div><div class='del'>-int mcfrs_console_port = -1;</div><div class='del'>-int mcfrs_console_baud = CONSOLE_BAUD_RATE;</div><div class='del'>-int mcfrs_console_cbaud = DEFAULT_CBAUD;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	Driver data structures.</div><div class='del'>- */</div><div class='del'>-static struct tty_driver *mcfrs_serial_driver;</div><div class='del'>-</div><div class='del'>-/* number of characters left in xmit buffer before we ask for more */</div><div class='del'>-#define WAKEUP_CHARS 256</div><div class='del'>-</div><div class='del'>-/* Debugging...</div><div class='del'>- */</div><div class='del'>-#undef SERIAL_DEBUG_OPEN</div><div class='del'>-#undef SERIAL_DEBUG_FLOW</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_M523x) || defined(CONFIG_M527x) || defined(CONFIG_M528x) || \</div><div class='del'>-    defined(CONFIG_M520x) || defined(CONFIG_M532x)</div><div class='del'>-#define	IRQBASE	(MCFINT_VECBASE+MCFINT_UART0)</div><div class='del'>-#else</div><div class='del'>-#define	IRQBASE	73</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	Configuration table, UARTs to look for at startup.</div><div class='del'>- */</div><div class='del'>-static struct mcf_serial mcfrs_table[] = {</div><div class='del'>-	{  /* ttyS0 */</div><div class='del'>-		.magic = 0,</div><div class='del'>-		.addr = (volatile unsigned char *) (MCF_MBAR+MCFUART_BASE1),</div><div class='del'>-		.irq = IRQBASE,</div><div class='del'>-		.flags = ASYNC_BOOT_AUTOCONF,</div><div class='del'>-	},</div><div class='del'>-#ifdef MCFUART_BASE2</div><div class='del'>-	{  /* ttyS1 */</div><div class='del'>-		.magic = 0,</div><div class='del'>-		.addr = (volatile unsigned char *) (MCF_MBAR+MCFUART_BASE2),</div><div class='del'>-		.irq = IRQBASE+1,</div><div class='del'>-		.flags = ASYNC_BOOT_AUTOCONF,</div><div class='del'>-	},</div><div class='del'>-#endif</div><div class='del'>-#ifdef MCFUART_BASE3</div><div class='del'>-	{  /* ttyS2 */</div><div class='del'>-		.magic = 0,</div><div class='del'>-		.addr = (volatile unsigned char *) (MCF_MBAR+MCFUART_BASE3),</div><div class='del'>-		.irq = IRQBASE+2,</div><div class='del'>-		.flags = ASYNC_BOOT_AUTOCONF,</div><div class='del'>-	},</div><div class='del'>-#endif</div><div class='del'>-#ifdef MCFUART_BASE4</div><div class='del'>-	{  /* ttyS3 */</div><div class='del'>-		.magic = 0,</div><div class='del'>-		.addr = (volatile unsigned char *) (MCF_MBAR+MCFUART_BASE4),</div><div class='del'>-		.irq = IRQBASE+3,</div><div class='del'>-		.flags = ASYNC_BOOT_AUTOCONF,</div><div class='del'>-	},</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define	NR_PORTS	(sizeof(mcfrs_table) / sizeof(struct mcf_serial))</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This is used to figure out the divisor speeds and the timeouts.</div><div class='del'>- */</div><div class='del'>-static int mcfrs_baud_table[] = {</div><div class='del'>-	0, 50, 75, 110, 134, 150, 200, 300, 600, 1200, 1800, 2400, 4800,</div><div class='del'>-	9600, 19200, 38400, 57600, 115200, 230400, 460800, 0</div><div class='del'>-};</div><div class='del'>-#define MCFRS_BAUD_TABLE_SIZE \</div><div class='del'>-			(sizeof(mcfrs_baud_table)/sizeof(mcfrs_baud_table[0]))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_MAGIC_SYSRQ</div><div class='del'>-/*</div><div class='del'>- *	Magic system request keys. Used for debugging...</div><div class='del'>- */</div><div class='del'>-extern int	magic_sysrq_key(int ch);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	Forware declarations...</div><div class='del'>- */</div><div class='del'>-static void	mcfrs_change_speed(struct mcf_serial *info);</div><div class='del'>-static void	mcfrs_wait_until_sent(struct tty_struct *tty, int timeout);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static inline int serial_paranoia_check(struct mcf_serial *info,</div><div class='del'>-					char *name, const char *routine)</div><div class='del'>-{</div><div class='del'>-#ifdef SERIAL_PARANOIA_CHECK</div><div class='del'>-	static const char badmagic[] =</div><div class='del'>-		"MCFRS(warning): bad magic number for serial struct %s in %s\n";</div><div class='del'>-	static const char badinfo[] =</div><div class='del'>-		"MCFRS(warning): null mcf_serial for %s in %s\n";</div><div class='del'>-</div><div class='del'>-	if (!info) {</div><div class='del'>-		printk(badinfo, name, routine);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-	if (info-&gt;magic != SERIAL_MAGIC) {</div><div class='del'>-		printk(badmagic, name, routine);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	Sets or clears DTR and RTS on the requested line.</div><div class='del'>- */</div><div class='del'>-static void mcfrs_setsignals(struct mcf_serial *info, int dtr, int rts)</div><div class='del'>-{</div><div class='del'>-	volatile unsigned char	*uartp;</div><div class='del'>-	unsigned long		flags;</div><div class='del'>-	</div><div class='del'>-#if 0</div><div class='del'>-	printk("%s(%d): mcfrs_setsignals(info=%x,dtr=%d,rts=%d)\n",</div><div class='del'>-		__FILE__, __LINE__, info, dtr, rts);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	local_irq_save(flags);</div><div class='del'>-	if (dtr &gt;= 0) {</div><div class='del'>-#ifdef MCFPP_DTR0</div><div class='del'>-		if (info-&gt;line)</div><div class='del'>-			mcf_setppdata(MCFPP_DTR1, (dtr ? 0 : MCFPP_DTR1));</div><div class='del'>-		else</div><div class='del'>-			mcf_setppdata(MCFPP_DTR0, (dtr ? 0 : MCFPP_DTR0));</div><div class='del'>-#endif</div><div class='del'>-	}</div><div class='del'>-	if (rts &gt;= 0) {</div><div class='del'>-		uartp = info-&gt;addr;</div><div class='del'>-		if (rts) {</div><div class='del'>-			info-&gt;sigs |= TIOCM_RTS;</div><div class='del'>-			uartp[MCFUART_UOP1] = MCFUART_UOP_RTS;</div><div class='del'>-		} else {</div><div class='del'>-			info-&gt;sigs &amp;= ~TIOCM_RTS;</div><div class='del'>-			uartp[MCFUART_UOP0] = MCFUART_UOP_RTS;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	local_irq_restore(flags);</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	Gets values of serial signals.</div><div class='del'>- */</div><div class='del'>-static int mcfrs_getsignals(struct mcf_serial *info)</div><div class='del'>-{</div><div class='del'>-	volatile unsigned char	*uartp;</div><div class='del'>-	unsigned long		flags;</div><div class='del'>-	int			sigs;</div><div class='del'>-#if defined(CONFIG_NETtel) &amp;&amp; defined(CONFIG_M5307)</div><div class='del'>-	unsigned short		ppdata;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	printk("%s(%d): mcfrs_getsignals(info=%x)\n", __FILE__, __LINE__);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	local_irq_save(flags);</div><div class='del'>-	uartp = info-&gt;addr;</div><div class='del'>-	sigs = (uartp[MCFUART_UIPR] &amp; MCFUART_UIPR_CTS) ? 0 : TIOCM_CTS;</div><div class='del'>-	sigs |= (info-&gt;sigs &amp; TIOCM_RTS);</div><div class='del'>-</div><div class='del'>-#ifdef MCFPP_DCD0</div><div class='del'>-{</div><div class='del'>-	unsigned int ppdata;</div><div class='del'>-	ppdata = mcf_getppdata();</div><div class='del'>-	if (info-&gt;line == 0) {</div><div class='del'>-		sigs |= (ppdata &amp; MCFPP_DCD0) ? 0 : TIOCM_CD;</div><div class='del'>-		sigs |= (ppdata &amp; MCFPP_DTR0) ? 0 : TIOCM_DTR;</div><div class='del'>-	} else if (info-&gt;line == 1) {</div><div class='del'>-		sigs |= (ppdata &amp; MCFPP_DCD1) ? 0 : TIOCM_CD;</div><div class='del'>-		sigs |= (ppdata &amp; MCFPP_DTR1) ? 0 : TIOCM_DTR;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	local_irq_restore(flags);</div><div class='del'>-	return(sigs);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ------------------------------------------------------------</div><div class='del'>- * mcfrs_stop() and mcfrs_start()</div><div class='del'>- *</div><div class='del'>- * This routines are called before setting or resetting tty-&gt;stopped.</div><div class='del'>- * They enable or disable transmitter interrupts, as necessary.</div><div class='del'>- * ------------------------------------------------------------</div><div class='del'>- */</div><div class='del'>-static void mcfrs_stop(struct tty_struct *tty)</div><div class='del'>-{</div><div class='del'>-	volatile unsigned char	*uartp;</div><div class='del'>-	struct mcf_serial	*info = (struct mcf_serial *)tty-&gt;driver_data;</div><div class='del'>-	unsigned long		flags;</div><div class='del'>-</div><div class='del'>-	if (serial_paranoia_check(info, tty-&gt;name, "mcfrs_stop"))</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	local_irq_save(flags);</div><div class='del'>-	uartp = info-&gt;addr;</div><div class='del'>-	info-&gt;imr &amp;= ~MCFUART_UIR_TXREADY;</div><div class='del'>-	uartp[MCFUART_UIMR] = info-&gt;imr;</div><div class='del'>-	local_irq_restore(flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mcfrs_start(struct tty_struct *tty)</div><div class='del'>-{</div><div class='del'>-	volatile unsigned char	*uartp;</div><div class='del'>-	struct mcf_serial	*info = (struct mcf_serial *)tty-&gt;driver_data;</div><div class='del'>-	unsigned long		flags;</div><div class='del'>-	</div><div class='del'>-	if (serial_paranoia_check(info, tty-&gt;name, "mcfrs_start"))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	local_irq_save(flags);</div><div class='del'>-	if (info-&gt;xmit_cnt &amp;&amp; info-&gt;xmit_buf) {</div><div class='del'>-		uartp = info-&gt;addr;</div><div class='del'>-		info-&gt;imr |= MCFUART_UIR_TXREADY;</div><div class='del'>-		uartp[MCFUART_UIMR] = info-&gt;imr;</div><div class='del'>-	}</div><div class='del'>-	local_irq_restore(flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ----------------------------------------------------------------------</div><div class='del'>- *</div><div class='del'>- * Here starts the interrupt handling routines.  All of the following</div><div class='del'>- * subroutines are declared as inline and are folded into</div><div class='del'>- * mcfrs_interrupt().  They were separated out for readability's sake.</div><div class='del'>- *</div><div class='del'>- * Note: mcfrs_interrupt() is a "fast" interrupt, which means that it</div><div class='del'>- * runs with interrupts turned off.  People who may want to modify</div><div class='del'>- * mcfrs_interrupt() should try to keep the interrupt handler as fast as</div><div class='del'>- * possible.  After you are done making modifications, it is not a bad</div><div class='del'>- * idea to do:</div><div class='del'>- * </div><div class='del'>- * gcc -S -DKERNEL -Wall -Wstrict-prototypes -O6 -fomit-frame-pointer serial.c</div><div class='del'>- *</div><div class='del'>- * and look at the resulting assemble code in serial.s.</div><div class='del'>- *</div><div class='del'>- * 				- Ted Ts'o (tytso@mit.edu), 7-Mar-93</div><div class='del'>- * -----------------------------------------------------------------------</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static inline void receive_chars(struct mcf_serial *info)</div><div class='del'>-{</div><div class='del'>-	volatile unsigned char	*uartp;</div><div class='del'>-	struct tty_struct	*tty = info-&gt;port.tty;</div><div class='del'>-	unsigned char		status, ch, flag;</div><div class='del'>-</div><div class='del'>-	if (!tty)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	uartp = info-&gt;addr;</div><div class='del'>-</div><div class='del'>-	while ((status = uartp[MCFUART_USR]) &amp; MCFUART_USR_RXREADY) {</div><div class='del'>-		ch = uartp[MCFUART_URB];</div><div class='del'>-		info-&gt;stats.rx++;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_MAGIC_SYSRQ</div><div class='del'>-		if (mcfrs_console_inited &amp;&amp; (info-&gt;line == mcfrs_console_port)) {</div><div class='del'>-			if (magic_sysrq_key(ch))</div><div class='del'>-				continue;</div><div class='del'>-		}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-		flag = TTY_NORMAL;</div><div class='del'>-		if (status &amp; MCFUART_USR_RXERR) {</div><div class='del'>-			uartp[MCFUART_UCR] = MCFUART_UCR_CMDRESETERR;</div><div class='del'>-			if (status &amp; MCFUART_USR_RXBREAK) {</div><div class='del'>-				info-&gt;stats.rxbreak++;</div><div class='del'>-				flag = TTY_BREAK;</div><div class='del'>-			} else if (status &amp; MCFUART_USR_RXPARITY) {</div><div class='del'>-				info-&gt;stats.rxparity++;</div><div class='del'>-				flag = TTY_PARITY;</div><div class='del'>-			} else if (status &amp; MCFUART_USR_RXOVERRUN) {</div><div class='del'>-				info-&gt;stats.rxoverrun++;</div><div class='del'>-				flag = TTY_OVERRUN;</div><div class='del'>-			} else if (status &amp; MCFUART_USR_RXFRAMING) {</div><div class='del'>-				info-&gt;stats.rxframing++;</div><div class='del'>-				flag = TTY_FRAME;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		tty_insert_flip_char(tty, ch, flag);</div><div class='del'>-	}</div><div class='del'>-	tty_schedule_flip(tty);</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void transmit_chars(struct mcf_serial *info)</div><div class='del'>-{</div><div class='del'>-	volatile unsigned char	*uartp;</div><div class='del'>-</div><div class='del'>-	uartp = info-&gt;addr;</div><div class='del'>-</div><div class='del'>-	if (info-&gt;x_char) {</div><div class='del'>-		/* Send special char - probably flow control */</div><div class='del'>-		uartp[MCFUART_UTB] = info-&gt;x_char;</div><div class='del'>-		info-&gt;x_char = 0;</div><div class='del'>-		info-&gt;stats.tx++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((info-&gt;xmit_cnt &lt;= 0) || info-&gt;port.tty-&gt;stopped) {</div><div class='del'>-		info-&gt;imr &amp;= ~MCFUART_UIR_TXREADY;</div><div class='del'>-		uartp[MCFUART_UIMR] = info-&gt;imr;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	while (uartp[MCFUART_USR] &amp; MCFUART_USR_TXREADY) {</div><div class='del'>-		uartp[MCFUART_UTB] = info-&gt;xmit_buf[info-&gt;xmit_tail++];</div><div class='del'>-		info-&gt;xmit_tail = info-&gt;xmit_tail &amp; (SERIAL_XMIT_SIZE-1);</div><div class='del'>-		info-&gt;stats.tx++;</div><div class='del'>-		if (--info-&gt;xmit_cnt &lt;= 0)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (info-&gt;xmit_cnt &lt; WAKEUP_CHARS)</div><div class='del'>-		schedule_work(&amp;info-&gt;tqueue);</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This is the serial driver's generic interrupt routine</div><div class='del'>- */</div><div class='del'>-irqreturn_t mcfrs_interrupt(int irq, void *dev_id)</div><div class='del'>-{</div><div class='del'>-	struct mcf_serial	*info;</div><div class='del'>-	unsigned char		isr;</div><div class='del'>-</div><div class='del'>-	info = &amp;mcfrs_table[(irq - IRQBASE)];</div><div class='del'>-	isr = info-&gt;addr[MCFUART_UISR] &amp; info-&gt;imr;</div><div class='del'>-</div><div class='del'>-	if (isr &amp; MCFUART_UIR_RXREADY)</div><div class='del'>-		receive_chars(info);</div><div class='del'>-	if (isr &amp; MCFUART_UIR_TXREADY)</div><div class='del'>-		transmit_chars(info);</div><div class='del'>-	return IRQ_HANDLED;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * -------------------------------------------------------------------</div><div class='del'>- * Here ends the serial interrupt routines.</div><div class='del'>- * -------------------------------------------------------------------</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void mcfrs_offintr(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct mcf_serial *info = container_of(work, struct mcf_serial, tqueue);</div><div class='del'>-	struct tty_struct *tty = info-&gt;port.tty;</div><div class='del'>-	</div><div class='del'>-	if (tty)</div><div class='del'>-		tty_wakeup(tty);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	Change of state on a DCD line.</div><div class='del'>- */</div><div class='del'>-void mcfrs_modem_change(struct mcf_serial *info, int dcd)</div><div class='del'>-{</div><div class='del'>-	if (info-&gt;count == 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (info-&gt;flags &amp; ASYNC_CHECK_CD) {</div><div class='del'>-		if (dcd)</div><div class='del'>-			wake_up_interruptible(&amp;info-&gt;open_wait);</div><div class='del'>-		else </div><div class='del'>-			schedule_work(&amp;info-&gt;tqueue_hangup);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef MCFPP_DCD0</div><div class='del'>-</div><div class='del'>-unsigned short	mcfrs_ppstatus;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This subroutine is called when the RS_TIMER goes off. It is used</div><div class='del'>- * to monitor the state of the DCD lines - since they have no edge</div><div class='del'>- * sensors and interrupt generators.</div><div class='del'>- */</div><div class='del'>-static void mcfrs_timer(void)</div><div class='del'>-{</div><div class='del'>-	unsigned int	ppstatus, dcdval, i;</div><div class='del'>-</div><div class='del'>-	ppstatus = mcf_getppdata() &amp; (MCFPP_DCD0 | MCFPP_DCD1);</div><div class='del'>-</div><div class='del'>-	if (ppstatus != mcfrs_ppstatus) {</div><div class='del'>-		for (i = 0; (i &lt; 2); i++) {</div><div class='del'>-			dcdval = (i ? MCFPP_DCD1 : MCFPP_DCD0);</div><div class='del'>-			if ((ppstatus &amp; dcdval) != (mcfrs_ppstatus &amp; dcdval)) {</div><div class='del'>-				mcfrs_modem_change(&amp;mcfrs_table[i],</div><div class='del'>-					((ppstatus &amp; dcdval) ? 0 : 1));</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	mcfrs_ppstatus = ppstatus;</div><div class='del'>-</div><div class='del'>-	/* Re-arm timer */</div><div class='del'>-	mcfrs_timer_struct.expires = jiffies + HZ/25;</div><div class='del'>-	add_timer(&amp;mcfrs_timer_struct);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif	/* MCFPP_DCD0 */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This routine is called from the scheduler tqueue when the interrupt</div><div class='del'>- * routine has signalled that a hangup has occurred. The path of</div><div class='del'>- * hangup processing is:</div><div class='del'>- *</div><div class='del'>- * 	serial interrupt routine -&gt; (scheduler tqueue) -&gt;</div><div class='del'>- * 	do_serial_hangup() -&gt; tty-&gt;hangup() -&gt; mcfrs_hangup()</div><div class='del'>- * </div><div class='del'>- */</div><div class='del'>-static void do_serial_hangup(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct mcf_serial *info = container_of(work, struct mcf_serial, tqueue_hangup);</div><div class='del'>-	struct tty_struct *tty = info-&gt;port.tty;</div><div class='del'>-	</div><div class='del'>-	if (tty)</div><div class='del'>-		tty_hangup(tty);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int startup(struct mcf_serial * info)</div><div class='del'>-{</div><div class='del'>-	volatile unsigned char	*uartp;</div><div class='del'>-	unsigned long		flags;</div><div class='del'>-	</div><div class='del'>-	if (info-&gt;flags &amp; ASYNC_INITIALIZED)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (!info-&gt;xmit_buf) {</div><div class='del'>-		info-&gt;xmit_buf = (unsigned char *) __get_free_page(GFP_KERNEL);</div><div class='del'>-		if (!info-&gt;xmit_buf)</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	local_irq_save(flags);</div><div class='del'>-</div><div class='del'>-#ifdef SERIAL_DEBUG_OPEN</div><div class='del'>-	printk("starting up ttyS%d (irq %d)...\n", info-&gt;line, info-&gt;irq);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 *	Reset UART, get it into known state...</div><div class='del'>-	 */</div><div class='del'>-	uartp = info-&gt;addr;</div><div class='del'>-	uartp[MCFUART_UCR] = MCFUART_UCR_CMDRESETRX;  /* reset RX */</div><div class='del'>-	uartp[MCFUART_UCR] = MCFUART_UCR_CMDRESETTX;  /* reset TX */</div><div class='del'>-	mcfrs_setsignals(info, 1, 1);</div><div class='del'>-</div><div class='del'>-	if (info-&gt;port.tty)</div><div class='del'>-		clear_bit(TTY_IO_ERROR, &amp;info-&gt;port.tty-&gt;flags);</div><div class='del'>-	info-&gt;xmit_cnt = info-&gt;xmit_head = info-&gt;xmit_tail = 0;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * and set the speed of the serial port</div><div class='del'>-	 */</div><div class='del'>-	mcfrs_change_speed(info);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Lastly enable the UART transmitter and receiver, and</div><div class='del'>-	 * interrupt enables.</div><div class='del'>-	 */</div><div class='del'>-	info-&gt;imr = MCFUART_UIR_RXREADY;</div><div class='del'>-	uartp[MCFUART_UCR] = MCFUART_UCR_RXENABLE | MCFUART_UCR_TXENABLE;</div><div class='del'>-	uartp[MCFUART_UIMR] = info-&gt;imr;</div><div class='del'>-</div><div class='del'>-	info-&gt;flags |= ASYNC_INITIALIZED;</div><div class='del'>-	local_irq_restore(flags);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This routine will shutdown a serial port; interrupts are disabled, and</div><div class='del'>- * DTR is dropped if the hangup on close termio flag is on.</div><div class='del'>- */</div><div class='del'>-static void shutdown(struct mcf_serial * info)</div><div class='del'>-{</div><div class='del'>-	volatile unsigned char	*uartp;</div><div class='del'>-	unsigned long		flags;</div><div class='del'>-</div><div class='del'>-	if (!(info-&gt;flags &amp; ASYNC_INITIALIZED))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-#ifdef SERIAL_DEBUG_OPEN</div><div class='del'>-	printk("Shutting down serial port %d (irq %d)....\n", info-&gt;line,</div><div class='del'>-	       info-&gt;irq);</div><div class='del'>-#endif</div><div class='del'>-	</div><div class='del'>-	local_irq_save(flags);</div><div class='del'>-</div><div class='del'>-	uartp = info-&gt;addr;</div><div class='del'>-	uartp[MCFUART_UIMR] = 0;  /* mask all interrupts */</div><div class='del'>-	uartp[MCFUART_UCR] = MCFUART_UCR_CMDRESETRX;  /* reset RX */</div><div class='del'>-	uartp[MCFUART_UCR] = MCFUART_UCR_CMDRESETTX;  /* reset TX */</div><div class='del'>-</div><div class='del'>-	if (!info-&gt;port.tty || (info-&gt;port.tty-&gt;termios-&gt;c_cflag &amp; HUPCL))</div><div class='del'>-		mcfrs_setsignals(info, 0, 0);</div><div class='del'>-</div><div class='del'>-	if (info-&gt;xmit_buf) {</div><div class='del'>-		free_page((unsigned long) info-&gt;xmit_buf);</div><div class='del'>-		info-&gt;xmit_buf = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (info-&gt;port.tty)</div><div class='del'>-		set_bit(TTY_IO_ERROR, &amp;info-&gt;port.tty-&gt;flags);</div><div class='del'>-	</div><div class='del'>-	info-&gt;flags &amp;= ~ASYNC_INITIALIZED;</div><div class='del'>-	local_irq_restore(flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This routine is called to set the UART divisor registers to match</div><div class='del'>- * the specified baud rate for a serial port.</div><div class='del'>- */</div><div class='del'>-static void mcfrs_change_speed(struct mcf_serial *info)</div><div class='del'>-{</div><div class='del'>-	volatile unsigned char	*uartp;</div><div class='del'>-	unsigned int		baudclk, cflag;</div><div class='del'>-	unsigned long		flags;</div><div class='del'>-	unsigned char		mr1, mr2;</div><div class='del'>-	int			i;</div><div class='del'>-#ifdef	CONFIG_M5272</div><div class='del'>-	unsigned int		fraction;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (!info-&gt;port.tty || !info-&gt;port.tty-&gt;termios)</div><div class='del'>-		return;</div><div class='del'>-	cflag = info-&gt;port.tty-&gt;termios-&gt;c_cflag;</div><div class='del'>-	if (info-&gt;addr == 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	printk("%s(%d): mcfrs_change_speed()\n", __FILE__, __LINE__);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	i = cflag &amp; CBAUD;</div><div class='del'>-	if (i &amp; CBAUDEX) {</div><div class='del'>-		i &amp;= ~CBAUDEX;</div><div class='del'>-		if (i &lt; 1 || i &gt; 4)</div><div class='del'>-			info-&gt;port.tty-&gt;termios-&gt;c_cflag &amp;= ~CBAUDEX;</div><div class='del'>-		else</div><div class='del'>-			i += 15;</div><div class='del'>-	}</div><div class='del'>-	if (i == 0) {</div><div class='del'>-		mcfrs_setsignals(info, 0, -1);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* compute the baudrate clock */</div><div class='del'>-#ifdef	CONFIG_M5272</div><div class='del'>-	/*</div><div class='del'>-	 * For the MCF5272, also compute the baudrate fraction.</div><div class='del'>-	 */</div><div class='del'>-	baudclk = (MCF_BUSCLK / mcfrs_baud_table[i]) / 32;</div><div class='del'>-	fraction = MCF_BUSCLK - (baudclk * 32 * mcfrs_baud_table[i]);</div><div class='del'>-	fraction *= 16;</div><div class='del'>-	fraction /= (32 * mcfrs_baud_table[i]);</div><div class='del'>-#else</div><div class='del'>-	baudclk = ((MCF_BUSCLK / mcfrs_baud_table[i]) + 16) / 32;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	info-&gt;baud = mcfrs_baud_table[i];</div><div class='del'>-</div><div class='del'>-	mr1 = MCFUART_MR1_RXIRQRDY | MCFUART_MR1_RXERRCHAR;</div><div class='del'>-	mr2 = 0;</div><div class='del'>-</div><div class='del'>-	switch (cflag &amp; CSIZE) {</div><div class='del'>-	case CS5:	mr1 |= MCFUART_MR1_CS5; break;</div><div class='del'>-	case CS6:	mr1 |= MCFUART_MR1_CS6; break;</div><div class='del'>-	case CS7:	mr1 |= MCFUART_MR1_CS7; break;</div><div class='del'>-	case CS8:</div><div class='del'>-	default:	mr1 |= MCFUART_MR1_CS8; break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (cflag &amp; PARENB) {</div><div class='del'>-		if (cflag &amp; CMSPAR) {</div><div class='del'>-			if (cflag &amp; PARODD)</div><div class='del'>-				mr1 |= MCFUART_MR1_PARITYMARK;</div><div class='del'>-			else</div><div class='del'>-				mr1 |= MCFUART_MR1_PARITYSPACE;</div><div class='del'>-		} else {</div><div class='del'>-			if (cflag &amp; PARODD)</div><div class='del'>-				mr1 |= MCFUART_MR1_PARITYODD;</div><div class='del'>-			else</div><div class='del'>-				mr1 |= MCFUART_MR1_PARITYEVEN;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		mr1 |= MCFUART_MR1_PARITYNONE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (cflag &amp; CSTOPB)</div><div class='del'>-		mr2 |= MCFUART_MR2_STOP2;</div><div class='del'>-	else</div><div class='del'>-		mr2 |= MCFUART_MR2_STOP1;</div><div class='del'>-</div><div class='del'>-	if (cflag &amp; CRTSCTS) {</div><div class='del'>-		mr1 |= MCFUART_MR1_RXRTS;</div><div class='del'>-		mr2 |= MCFUART_MR2_TXCTS;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (cflag &amp; CLOCAL)</div><div class='del'>-		info-&gt;flags &amp;= ~ASYNC_CHECK_CD;</div><div class='del'>-	else</div><div class='del'>-		info-&gt;flags |= ASYNC_CHECK_CD;</div><div class='del'>-</div><div class='del'>-	uartp = info-&gt;addr;</div><div class='del'>-</div><div class='del'>-	local_irq_save(flags);</div><div class='del'>-#if 0</div><div class='del'>-	printk("%s(%d): mr1=%x mr2=%x baudclk=%x\n", __FILE__, __LINE__,</div><div class='del'>-		mr1, mr2, baudclk);</div><div class='del'>-#endif</div><div class='del'>-	/*</div><div class='del'>-	  Note: pg 12-16 of MCF5206e User's Manual states that a</div><div class='del'>-	  software reset should be performed prior to changing</div><div class='del'>-	  UMR1,2, UCSR, UACR, bit 7</div><div class='del'>-	*/</div><div class='del'>-	uartp[MCFUART_UCR] = MCFUART_UCR_CMDRESETRX;    /* reset RX */</div><div class='del'>-	uartp[MCFUART_UCR] = MCFUART_UCR_CMDRESETTX;    /* reset TX */</div><div class='del'>-	uartp[MCFUART_UCR] = MCFUART_UCR_CMDRESETMRPTR;	/* reset MR pointer */</div><div class='del'>-	uartp[MCFUART_UMR] = mr1;</div><div class='del'>-	uartp[MCFUART_UMR] = mr2;</div><div class='del'>-	uartp[MCFUART_UBG1] = (baudclk &amp; 0xff00) &gt;&gt; 8;	/* set msb byte */</div><div class='del'>-	uartp[MCFUART_UBG2] = (baudclk &amp; 0xff);		/* set lsb byte */</div><div class='del'>-#ifdef	CONFIG_M5272</div><div class='del'>-	uartp[MCFUART_UFPD] = (fraction &amp; 0xf);		/* set fraction */</div><div class='del'>-#endif</div><div class='del'>-	uartp[MCFUART_UCSR] = MCFUART_UCSR_RXCLKTIMER | MCFUART_UCSR_TXCLKTIMER;</div><div class='del'>-	uartp[MCFUART_UCR] = MCFUART_UCR_RXENABLE | MCFUART_UCR_TXENABLE;</div><div class='del'>-	mcfrs_setsignals(info, 1, -1);</div><div class='del'>-	local_irq_restore(flags);</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mcfrs_flush_chars(struct tty_struct *tty)</div><div class='del'>-{</div><div class='del'>-	volatile unsigned char	*uartp;</div><div class='del'>-	struct mcf_serial	*info = (struct mcf_serial *)tty-&gt;driver_data;</div><div class='del'>-	unsigned long		flags;</div><div class='del'>-</div><div class='del'>-	if (serial_paranoia_check(info, tty-&gt;name, "mcfrs_flush_chars"))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	uartp = (volatile unsigned char *) info-&gt;addr;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * re-enable receiver interrupt</div><div class='del'>-	 */</div><div class='del'>-	local_irq_save(flags);</div><div class='del'>-	if ((!(info-&gt;imr &amp; MCFUART_UIR_RXREADY)) &amp;&amp;</div><div class='del'>-	    (info-&gt;flags &amp; ASYNC_INITIALIZED) ) {</div><div class='del'>-		info-&gt;imr |= MCFUART_UIR_RXREADY;</div><div class='del'>-		uartp[MCFUART_UIMR] = info-&gt;imr;</div><div class='del'>-	}</div><div class='del'>-	local_irq_restore(flags);</div><div class='del'>-</div><div class='del'>-	if (info-&gt;xmit_cnt &lt;= 0 || tty-&gt;stopped || tty-&gt;hw_stopped ||</div><div class='del'>-	    !info-&gt;xmit_buf)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* Enable transmitter */</div><div class='del'>-	local_irq_save(flags);</div><div class='del'>-	info-&gt;imr |= MCFUART_UIR_TXREADY;</div><div class='del'>-	uartp[MCFUART_UIMR] = info-&gt;imr;</div><div class='del'>-	local_irq_restore(flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mcfrs_write(struct tty_struct * tty,</div><div class='del'>-		    const unsigned char *buf, int count)</div><div class='del'>-{</div><div class='del'>-	volatile unsigned char	*uartp;</div><div class='del'>-	struct mcf_serial	*info = (struct mcf_serial *)tty-&gt;driver_data;</div><div class='del'>-	unsigned long		flags;</div><div class='del'>-	int			c, total = 0;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	printk("%s(%d): mcfrs_write(tty=%x,buf=%x,count=%d)\n",</div><div class='del'>-		__FILE__, __LINE__, (int)tty, (int)buf, count);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (serial_paranoia_check(info, tty-&gt;name, "mcfrs_write"))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (!tty || !info-&gt;xmit_buf)</div><div class='del'>-		return 0;</div><div class='del'>-	</div><div class='del'>-	local_save_flags(flags);</div><div class='del'>-	while (1) {</div><div class='del'>-		local_irq_disable();		</div><div class='del'>-		c = min(count, (int) min(((int)SERIAL_XMIT_SIZE) - info-&gt;xmit_cnt - 1,</div><div class='del'>-			((int)SERIAL_XMIT_SIZE) - info-&gt;xmit_head));</div><div class='del'>-		local_irq_restore(flags);</div><div class='del'>-</div><div class='del'>-		if (c &lt;= 0)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		memcpy(info-&gt;xmit_buf + info-&gt;xmit_head, buf, c);</div><div class='del'>-</div><div class='del'>-		local_irq_disable();</div><div class='del'>-		info-&gt;xmit_head = (info-&gt;xmit_head + c) &amp; (SERIAL_XMIT_SIZE-1);</div><div class='del'>-		info-&gt;xmit_cnt += c;</div><div class='del'>-		local_irq_restore(flags);</div><div class='del'>-</div><div class='del'>-		buf += c;</div><div class='del'>-		count -= c;</div><div class='del'>-		total += c;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	local_irq_disable();</div><div class='del'>-	uartp = info-&gt;addr;</div><div class='del'>-	info-&gt;imr |= MCFUART_UIR_TXREADY;</div><div class='del'>-	uartp[MCFUART_UIMR] = info-&gt;imr;</div><div class='del'>-	local_irq_restore(flags);</div><div class='del'>-</div><div class='del'>-	return total;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mcfrs_write_room(struct tty_struct *tty)</div><div class='del'>-{</div><div class='del'>-	struct mcf_serial *info = (struct mcf_serial *)tty-&gt;driver_data;</div><div class='del'>-	int	ret;</div><div class='del'>-</div><div class='del'>-	if (serial_paranoia_check(info, tty-&gt;name, "mcfrs_write_room"))</div><div class='del'>-		return 0;</div><div class='del'>-	ret = SERIAL_XMIT_SIZE - info-&gt;xmit_cnt - 1;</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		ret = 0;</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mcfrs_chars_in_buffer(struct tty_struct *tty)</div><div class='del'>-{</div><div class='del'>-	struct mcf_serial *info = (struct mcf_serial *)tty-&gt;driver_data;</div><div class='del'>-</div><div class='del'>-	if (serial_paranoia_check(info, tty-&gt;name, "mcfrs_chars_in_buffer"))</div><div class='del'>-		return 0;</div><div class='del'>-	return info-&gt;xmit_cnt;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mcfrs_flush_buffer(struct tty_struct *tty)</div><div class='del'>-{</div><div class='del'>-	struct mcf_serial	*info = (struct mcf_serial *)tty-&gt;driver_data;</div><div class='del'>-	unsigned long		flags;</div><div class='del'>-</div><div class='del'>-	if (serial_paranoia_check(info, tty-&gt;name, "mcfrs_flush_buffer"))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	local_irq_save(flags);</div><div class='del'>-	info-&gt;xmit_cnt = info-&gt;xmit_head = info-&gt;xmit_tail = 0;</div><div class='del'>-	local_irq_restore(flags);</div><div class='del'>-</div><div class='del'>-	tty_wakeup(tty);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ------------------------------------------------------------</div><div class='del'>- * mcfrs_throttle()</div><div class='del'>- * </div><div class='del'>- * This routine is called by the upper-layer tty layer to signal that</div><div class='del'>- * incoming characters should be throttled.</div><div class='del'>- * ------------------------------------------------------------</div><div class='del'>- */</div><div class='del'>-static void mcfrs_throttle(struct tty_struct * tty)</div><div class='del'>-{</div><div class='del'>-	struct mcf_serial *info = (struct mcf_serial *)tty-&gt;driver_data;</div><div class='del'>-#ifdef SERIAL_DEBUG_THROTTLE</div><div class='del'>-	char	buf[64];</div><div class='del'>-	</div><div class='del'>-	printk("throttle %s: %d....\n", tty_name(tty, buf),</div><div class='del'>-	       tty-&gt;ldisc.chars_in_buffer(tty));</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (serial_paranoia_check(info, tty-&gt;name, "mcfrs_throttle"))</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	if (I_IXOFF(tty))</div><div class='del'>-		info-&gt;x_char = STOP_CHAR(tty);</div><div class='del'>-</div><div class='del'>-	/* Turn off RTS line (do this atomic) */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mcfrs_unthrottle(struct tty_struct * tty)</div><div class='del'>-{</div><div class='del'>-	struct mcf_serial *info = (struct mcf_serial *)tty-&gt;driver_data;</div><div class='del'>-#ifdef SERIAL_DEBUG_THROTTLE</div><div class='del'>-	char	buf[64];</div><div class='del'>-	</div><div class='del'>-	printk("unthrottle %s: %d....\n", tty_name(tty, buf),</div><div class='del'>-	       tty-&gt;ldisc.chars_in_buffer(tty));</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (serial_paranoia_check(info, tty-&gt;name, "mcfrs_unthrottle"))</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	if (I_IXOFF(tty)) {</div><div class='del'>-		if (info-&gt;x_char)</div><div class='del'>-			info-&gt;x_char = 0;</div><div class='del'>-		else</div><div class='del'>-			info-&gt;x_char = START_CHAR(tty);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Assert RTS line (do this atomic) */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ------------------------------------------------------------</div><div class='del'>- * mcfrs_ioctl() and friends</div><div class='del'>- * ------------------------------------------------------------</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int get_serial_info(struct mcf_serial * info,</div><div class='del'>-			   struct serial_struct * retinfo)</div><div class='del'>-{</div><div class='del'>-	struct serial_struct tmp;</div><div class='del'>-  </div><div class='del'>-	if (!retinfo)</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	memset(&amp;tmp, 0, sizeof(tmp));</div><div class='del'>-	tmp.type = info-&gt;type;</div><div class='del'>-	tmp.line = info-&gt;line;</div><div class='del'>-	tmp.port = (unsigned int) info-&gt;addr;</div><div class='del'>-	tmp.irq = info-&gt;irq;</div><div class='del'>-	tmp.flags = info-&gt;flags;</div><div class='del'>-	tmp.baud_base = info-&gt;baud_base;</div><div class='del'>-	tmp.close_delay = info-&gt;close_delay;</div><div class='del'>-	tmp.closing_wait = info-&gt;closing_wait;</div><div class='del'>-	tmp.custom_divisor = info-&gt;custom_divisor;</div><div class='del'>-	return copy_to_user(retinfo,&amp;tmp,sizeof(*retinfo)) ? -EFAULT : 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int set_serial_info(struct mcf_serial * info,</div><div class='del'>-			   struct serial_struct * new_info)</div><div class='del'>-{</div><div class='del'>-	struct serial_struct new_serial;</div><div class='del'>-	struct mcf_serial old_info;</div><div class='del'>-	int 	retval = 0;</div><div class='del'>-</div><div class='del'>-	if (!new_info)</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	if (copy_from_user(&amp;new_serial,new_info,sizeof(new_serial)))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	old_info = *info;</div><div class='del'>-</div><div class='del'>-	if (!capable(CAP_SYS_ADMIN)) {</div><div class='del'>-		if ((new_serial.baud_base != info-&gt;baud_base) ||</div><div class='del'>-		    (new_serial.type != info-&gt;type) ||</div><div class='del'>-		    (new_serial.close_delay != info-&gt;close_delay) ||</div><div class='del'>-		    ((new_serial.flags &amp; ~ASYNC_USR_MASK) !=</div><div class='del'>-		     (info-&gt;flags &amp; ~ASYNC_USR_MASK)))</div><div class='del'>-			return -EPERM;</div><div class='del'>-		info-&gt;flags = ((info-&gt;flags &amp; ~ASYNC_USR_MASK) |</div><div class='del'>-			       (new_serial.flags &amp; ASYNC_USR_MASK));</div><div class='del'>-		info-&gt;custom_divisor = new_serial.custom_divisor;</div><div class='del'>-		goto check_and_exit;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (info-&gt;count &gt; 1)</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * OK, past this point, all the error checking has been done.</div><div class='del'>-	 * At this point, we start making changes.....</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	info-&gt;baud_base = new_serial.baud_base;</div><div class='del'>-	info-&gt;flags = ((info-&gt;flags &amp; ~ASYNC_FLAGS) |</div><div class='del'>-			(new_serial.flags &amp; ASYNC_FLAGS));</div><div class='del'>-	info-&gt;type = new_serial.type;</div><div class='del'>-	info-&gt;close_delay = new_serial.close_delay;</div><div class='del'>-	info-&gt;closing_wait = new_serial.closing_wait;</div><div class='del'>-</div><div class='del'>-check_and_exit:</div><div class='del'>-	retval = startup(info);</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * get_lsr_info - get line status register info</div><div class='del'>- *</div><div class='del'>- * Purpose: Let user call ioctl() to get info when the UART physically</div><div class='del'>- * 	    is emptied.  On bus types like RS485, the transmitter must</div><div class='del'>- * 	    release the bus after transmitting. This must be done when</div><div class='del'>- * 	    the transmit shift register is empty, not be done when the</div><div class='del'>- * 	    transmit holding register is empty.  This functionality</div><div class='del'>- * 	    allows an RS485 driver to be written in user space. </div><div class='del'>- */</div><div class='del'>-static int get_lsr_info(struct mcf_serial * info, unsigned int *value)</div><div class='del'>-{</div><div class='del'>-	volatile unsigned char	*uartp;</div><div class='del'>-	unsigned long		flags;</div><div class='del'>-	unsigned char		status;</div><div class='del'>-</div><div class='del'>-	local_irq_save(flags);</div><div class='del'>-	uartp = info-&gt;addr;</div><div class='del'>-	status = (uartp[MCFUART_USR] &amp; MCFUART_USR_TXEMPTY) ? TIOCSER_TEMT : 0;</div><div class='del'>-	local_irq_restore(flags);</div><div class='del'>-</div><div class='del'>-	return put_user(status,value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This routine sends a break character out the serial port.</div><div class='del'>- */</div><div class='del'>-static void send_break(	struct mcf_serial * info, int duration)</div><div class='del'>-{</div><div class='del'>-	volatile unsigned char	*uartp;</div><div class='del'>-	unsigned long		flags;</div><div class='del'>-</div><div class='del'>-	if (!info-&gt;addr)</div><div class='del'>-		return;</div><div class='del'>-	set_current_state(TASK_INTERRUPTIBLE);</div><div class='del'>-	uartp = info-&gt;addr;</div><div class='del'>-</div><div class='del'>-	local_irq_save(flags);</div><div class='del'>-	uartp[MCFUART_UCR] = MCFUART_UCR_CMDBREAKSTART;</div><div class='del'>-	schedule_timeout(duration);</div><div class='del'>-	uartp[MCFUART_UCR] = MCFUART_UCR_CMDBREAKSTOP;</div><div class='del'>-	local_irq_restore(flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mcfrs_tiocmget(struct tty_struct *tty, struct file *file)</div><div class='del'>-{</div><div class='del'>-	struct mcf_serial * info = (struct mcf_serial *)tty-&gt;driver_data;</div><div class='del'>-</div><div class='del'>-	if (serial_paranoia_check(info, tty-&gt;name, "mcfrs_ioctl"))</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	if (tty-&gt;flags &amp; (1 &lt;&lt; TTY_IO_ERROR))</div><div class='del'>-		return -EIO;</div><div class='del'>-</div><div class='del'>-	return mcfrs_getsignals(info);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mcfrs_tiocmset(struct tty_struct *tty, struct file *file,</div><div class='del'>-			  unsigned int set, unsigned int clear)</div><div class='del'>-{</div><div class='del'>-	struct mcf_serial * info = (struct mcf_serial *)tty-&gt;driver_data;</div><div class='del'>-	int rts = -1, dtr = -1;</div><div class='del'>-</div><div class='del'>-	if (serial_paranoia_check(info, tty-&gt;name, "mcfrs_ioctl"))</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	if (tty-&gt;flags &amp; (1 &lt;&lt; TTY_IO_ERROR))</div><div class='del'>-		return -EIO;</div><div class='del'>-</div><div class='del'>-	if (set &amp; TIOCM_RTS)</div><div class='del'>-		rts = 1;</div><div class='del'>-	if (set &amp; TIOCM_DTR)</div><div class='del'>-		dtr = 1;</div><div class='del'>-	if (clear &amp; TIOCM_RTS)</div><div class='del'>-		rts = 0;</div><div class='del'>-	if (clear &amp; TIOCM_DTR)</div><div class='del'>-		dtr = 0;</div><div class='del'>-</div><div class='del'>-	mcfrs_setsignals(info, dtr, rts);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mcfrs_ioctl(struct tty_struct *tty, struct file * file,</div><div class='del'>-		    unsigned int cmd, unsigned long arg)</div><div class='del'>-{</div><div class='del'>-	struct mcf_serial * info = (struct mcf_serial *)tty-&gt;driver_data;</div><div class='del'>-	int retval, error;</div><div class='del'>-</div><div class='del'>-	if (serial_paranoia_check(info, tty-&gt;name, "mcfrs_ioctl"))</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	if ((cmd != TIOCGSERIAL) &amp;&amp; (cmd != TIOCSSERIAL) &amp;&amp;</div><div class='del'>-	    (cmd != TIOCSERCONFIG) &amp;&amp; (cmd != TIOCSERGWILD)  &amp;&amp;</div><div class='del'>-	    (cmd != TIOCSERSWILD) &amp;&amp; (cmd != TIOCSERGSTRUCT)) {</div><div class='del'>-		if (tty-&gt;flags &amp; (1 &lt;&lt; TTY_IO_ERROR))</div><div class='del'>-		    return -EIO;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	switch (cmd) {</div><div class='del'>-		case TCSBRK:	/* SVID version: non-zero arg --&gt; no break */</div><div class='del'>-			retval = tty_check_change(tty);</div><div class='del'>-			if (retval)</div><div class='del'>-				return retval;</div><div class='del'>-			tty_wait_until_sent(tty, 0);</div><div class='del'>-			if (!arg)</div><div class='del'>-				send_break(info, HZ/4);	/* 1/4 second */</div><div class='del'>-			return 0;</div><div class='del'>-		case TCSBRKP:	/* support for POSIX tcsendbreak() */</div><div class='del'>-			retval = tty_check_change(tty);</div><div class='del'>-			if (retval)</div><div class='del'>-				return retval;</div><div class='del'>-			tty_wait_until_sent(tty, 0);</div><div class='del'>-			send_break(info, arg ? arg*(HZ/10) : HZ/4);</div><div class='del'>-			return 0;</div><div class='del'>-		case TIOCGSERIAL:</div><div class='del'>-			if (access_ok(VERIFY_WRITE, (void *) arg,</div><div class='del'>-						sizeof(struct serial_struct)))</div><div class='del'>-				return get_serial_info(info,</div><div class='del'>-					       (struct serial_struct *) arg);</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		case TIOCSSERIAL:</div><div class='del'>-			return set_serial_info(info,</div><div class='del'>-					       (struct serial_struct *) arg);</div><div class='del'>-		case TIOCSERGETLSR: /* Get line status register */</div><div class='del'>-			if (access_ok(VERIFY_WRITE, (void *) arg,</div><div class='del'>-						sizeof(unsigned int)))</div><div class='del'>-				return get_lsr_info(info, (unsigned int *) arg);</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		case TIOCSERGSTRUCT:</div><div class='del'>-			error = copy_to_user((struct mcf_serial *) arg,</div><div class='del'>-				    info, sizeof(struct mcf_serial));</div><div class='del'>-			if (error)</div><div class='del'>-				return -EFAULT;</div><div class='del'>-			return 0;</div><div class='del'>-			</div><div class='del'>-#ifdef TIOCSET422</div><div class='del'>-		case TIOCSET422: {</div><div class='del'>-			unsigned int val;</div><div class='del'>-			get_user(val, (unsigned int *) arg);</div><div class='del'>-			mcf_setpa(MCFPP_PA11, (val ? 0 : MCFPP_PA11));</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		case TIOCGET422: {</div><div class='del'>-			unsigned int val;</div><div class='del'>-			val = (mcf_getpa() &amp; MCFPP_PA11) ? 0 : 1;</div><div class='del'>-			put_user(val, (unsigned int *) arg);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-		default:</div><div class='del'>-			return -ENOIOCTLCMD;</div><div class='del'>-		}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mcfrs_set_termios(struct tty_struct *tty, struct ktermios *old_termios)</div><div class='del'>-{</div><div class='del'>-	struct mcf_serial *info = (struct mcf_serial *)tty-&gt;driver_data;</div><div class='del'>-</div><div class='del'>-	if (tty-&gt;termios-&gt;c_cflag == old_termios-&gt;c_cflag)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	mcfrs_change_speed(info);</div><div class='del'>-</div><div class='del'>-	if ((old_termios-&gt;c_cflag &amp; CRTSCTS) &amp;&amp;</div><div class='del'>-	    !(tty-&gt;termios-&gt;c_cflag &amp; CRTSCTS)) {</div><div class='del'>-		tty-&gt;hw_stopped = 0;</div><div class='del'>-		mcfrs_setsignals(info, -1, 1);</div><div class='del'>-#if 0</div><div class='del'>-		mcfrs_start(tty);</div><div class='del'>-#endif</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ------------------------------------------------------------</div><div class='del'>- * mcfrs_close()</div><div class='del'>- * </div><div class='del'>- * This routine is called when the serial port gets closed.  First, we</div><div class='del'>- * wait for the last remaining data to be sent.  Then, we unlink its</div><div class='del'>- * S structure from the interrupt chain if necessary, and we free</div><div class='del'>- * that IRQ if nothing is left in the chain.</div><div class='del'>- * ------------------------------------------------------------</div><div class='del'>- */</div><div class='del'>-static void mcfrs_close(struct tty_struct *tty, struct file * filp)</div><div class='del'>-{</div><div class='del'>-	volatile unsigned char	*uartp;</div><div class='del'>-	struct mcf_serial	*info = (struct mcf_serial *)tty-&gt;driver_data;</div><div class='del'>-	unsigned long		flags;</div><div class='del'>-</div><div class='del'>-	if (!info || serial_paranoia_check(info, tty-&gt;name, "mcfrs_close"))</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	local_irq_save(flags);</div><div class='del'>-	</div><div class='del'>-	if (tty_hung_up_p(filp)) {</div><div class='del'>-		local_irq_restore(flags);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-#ifdef SERIAL_DEBUG_OPEN</div><div class='del'>-	printk("mcfrs_close ttyS%d, count = %d\n", info-&gt;line, info-&gt;count);</div><div class='del'>-#endif</div><div class='del'>-	if ((tty-&gt;count == 1) &amp;&amp; (info-&gt;count != 1)) {</div><div class='del'>-		/*</div><div class='del'>-		 * Uh, oh.  tty-&gt;count is 1, which means that the tty</div><div class='del'>-		 * structure will be freed.  Info-&gt;count should always</div><div class='del'>-		 * be one in these conditions.  If it's greater than</div><div class='del'>-		 * one, we've got real problems, since it means the</div><div class='del'>-		 * serial port won't be shutdown.</div><div class='del'>-		 */</div><div class='del'>-		printk("MCFRS: bad serial port count; tty-&gt;count is 1, "</div><div class='del'>-		       "info-&gt;count is %d\n", info-&gt;count);</div><div class='del'>-		info-&gt;count = 1;</div><div class='del'>-	}</div><div class='del'>-	if (--info-&gt;count &lt; 0) {</div><div class='del'>-		printk("MCFRS: bad serial port count for ttyS%d: %d\n",</div><div class='del'>-		       info-&gt;line, info-&gt;count);</div><div class='del'>-		info-&gt;count = 0;</div><div class='del'>-	}</div><div class='del'>-	if (info-&gt;count) {</div><div class='del'>-		local_irq_restore(flags);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	info-&gt;flags |= ASYNC_CLOSING;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Now we wait for the transmit buffer to clear; and we notify </div><div class='del'>-	 * the line discipline to only process XON/XOFF characters.</div><div class='del'>-	 */</div><div class='del'>-	tty-&gt;closing = 1;</div><div class='del'>-	if (info-&gt;closing_wait != ASYNC_CLOSING_WAIT_NONE)</div><div class='del'>-		tty_wait_until_sent(tty, info-&gt;closing_wait);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * At this point we stop accepting input.  To do this, we</div><div class='del'>-	 * disable the receive line status interrupts, and tell the</div><div class='del'>-	 * interrupt driver to stop checking the data ready bit in the</div><div class='del'>-	 * line status register.</div><div class='del'>-	 */</div><div class='del'>-	info-&gt;imr &amp;= ~MCFUART_UIR_RXREADY;</div><div class='del'>-	uartp = info-&gt;addr;</div><div class='del'>-	uartp[MCFUART_UIMR] = info-&gt;imr;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	/* FIXME: do we need to keep this enabled for console?? */</div><div class='del'>-	if (mcfrs_console_inited &amp;&amp; (mcfrs_console_port == info-&gt;line)) {</div><div class='del'>-		/* Do not disable the UART */ ;</div><div class='del'>-	} else</div><div class='del'>-#endif</div><div class='del'>-	shutdown(info);</div><div class='del'>-	mcfrs_flush_buffer(tty);</div><div class='del'>-	tty_ldisc_flush(tty);</div><div class='del'>-	</div><div class='del'>-	tty-&gt;closing = 0;</div><div class='del'>-	info-&gt;event = 0;</div><div class='del'>-	info-&gt;port.tty = NULL;</div><div class='del'>-#if 0	</div><div class='del'>-	if (tty-&gt;ldisc.num != ldiscs[N_TTY].num) {</div><div class='del'>-		if (tty-&gt;ldisc.close)</div><div class='del'>-			(tty-&gt;ldisc.close)(tty);</div><div class='del'>-		tty-&gt;ldisc = ldiscs[N_TTY];</div><div class='del'>-		tty-&gt;termios-&gt;c_line = N_TTY;</div><div class='del'>-		if (tty-&gt;ldisc.open)</div><div class='del'>-			(tty-&gt;ldisc.open)(tty);</div><div class='del'>-	}</div><div class='del'>-#endif	</div><div class='del'>-	if (info-&gt;blocked_open) {</div><div class='del'>-		if (info-&gt;close_delay) {</div><div class='del'>-			msleep_interruptible(jiffies_to_msecs(info-&gt;close_delay));</div><div class='del'>-		}</div><div class='del'>-		wake_up_interruptible(&amp;info-&gt;open_wait);</div><div class='del'>-	}</div><div class='del'>-	info-&gt;flags &amp;= ~(ASYNC_NORMAL_ACTIVE|ASYNC_CLOSING);</div><div class='del'>-	wake_up_interruptible(&amp;info-&gt;close_wait);</div><div class='del'>-	local_irq_restore(flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * mcfrs_wait_until_sent() --- wait until the transmitter is empty</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-mcfrs_wait_until_sent(struct tty_struct *tty, int timeout)</div><div class='del'>-{</div><div class='del'>-#ifdef	CONFIG_M5272</div><div class='del'>-#define	MCF5272_FIFO_SIZE	25		/* fifo size + shift reg */</div><div class='del'>-</div><div class='del'>-	struct mcf_serial * info = (struct mcf_serial *)tty-&gt;driver_data;</div><div class='del'>-	volatile unsigned char *uartp;</div><div class='del'>-	unsigned long orig_jiffies, fifo_time, char_time, fifo_cnt;</div><div class='del'>-</div><div class='del'>-	if (serial_paranoia_check(info, tty-&gt;name, "mcfrs_wait_until_sent"))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	orig_jiffies = jiffies;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Set the check interval to be 1/5 of the approximate time</div><div class='del'>-	 * to send the entire fifo, and make it at least 1.  The check</div><div class='del'>-	 * interval should also be less than the timeout.</div><div class='del'>-	 *</div><div class='del'>-	 * Note: we have to use pretty tight timings here to satisfy</div><div class='del'>-	 * the NIST-PCTS.</div><div class='del'>-	 */</div><div class='del'>-	lock_kernel();</div><div class='del'>-</div><div class='del'>-	fifo_time = (MCF5272_FIFO_SIZE * HZ * 10) / info-&gt;baud;</div><div class='del'>-	char_time = fifo_time / 5;</div><div class='del'>-	if (char_time == 0)</div><div class='del'>-		char_time = 1;</div><div class='del'>-	if (timeout &amp;&amp; timeout &lt; char_time)</div><div class='del'>-		char_time = timeout;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Clamp the timeout period at 2 * the time to empty the</div><div class='del'>-	 * fifo.  Just to be safe, set the minimum at .5 seconds.</div><div class='del'>-	 */</div><div class='del'>-	fifo_time *= 2;</div><div class='del'>-	if (fifo_time &lt; (HZ/2))</div><div class='del'>-		fifo_time = HZ/2;</div><div class='del'>-	if (!timeout || timeout &gt; fifo_time)</div><div class='del'>-		timeout = fifo_time;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Account for the number of bytes in the UART</div><div class='del'>-	 * transmitter FIFO plus any byte being shifted out.</div><div class='del'>-	 */</div><div class='del'>-	uartp = (volatile unsigned char *) info-&gt;addr;</div><div class='del'>-	for (;;) {</div><div class='del'>-		fifo_cnt = (uartp[MCFUART_UTF] &amp; MCFUART_UTF_TXB);</div><div class='del'>-		if ((uartp[MCFUART_USR] &amp; (MCFUART_USR_TXREADY|</div><div class='del'>-				MCFUART_USR_TXEMPTY)) ==</div><div class='del'>-			MCFUART_USR_TXREADY)</div><div class='del'>-			fifo_cnt++;</div><div class='del'>-		if (fifo_cnt == 0)</div><div class='del'>-			break;</div><div class='del'>-		msleep_interruptible(jiffies_to_msecs(char_time));</div><div class='del'>-		if (signal_pending(current))</div><div class='del'>-			break;</div><div class='del'>-		if (timeout &amp;&amp; time_after(jiffies, orig_jiffies + timeout))</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	unlock_kernel();</div><div class='del'>-#else</div><div class='del'>-	/*</div><div class='del'>-	 * For the other coldfire models, assume all data has been sent</div><div class='del'>-	 */</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * mcfrs_hangup() --- called by tty_hangup() when a hangup is signaled.</div><div class='del'>- */</div><div class='del'>-void mcfrs_hangup(struct tty_struct *tty)</div><div class='del'>-{</div><div class='del'>-	struct mcf_serial * info = (struct mcf_serial *)tty-&gt;driver_data;</div><div class='del'>-	</div><div class='del'>-	if (serial_paranoia_check(info, tty-&gt;name, "mcfrs_hangup"))</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	mcfrs_flush_buffer(tty);</div><div class='del'>-	shutdown(info);</div><div class='del'>-	info-&gt;event = 0;</div><div class='del'>-	info-&gt;count = 0;</div><div class='del'>-	info-&gt;flags &amp;= ~ASYNC_NORMAL_ACTIVE;</div><div class='del'>-	info-&gt;port.tty = NULL;</div><div class='del'>-	wake_up_interruptible(&amp;info-&gt;open_wait);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ------------------------------------------------------------</div><div class='del'>- * mcfrs_open() and friends</div><div class='del'>- * ------------------------------------------------------------</div><div class='del'>- */</div><div class='del'>-static int block_til_ready(struct tty_struct *tty, struct file * filp,</div><div class='del'>-			   struct mcf_serial *info)</div><div class='del'>-{</div><div class='del'>-	DECLARE_WAITQUEUE(wait, current);</div><div class='del'>-	int	retval;</div><div class='del'>-	int	do_clocal = 0;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If the device is in the middle of being closed, then block</div><div class='del'>-	 * until it's done, and then try again.</div><div class='del'>-	 */</div><div class='del'>-	if (info-&gt;flags &amp; ASYNC_CLOSING) {</div><div class='del'>-		interruptible_sleep_on(&amp;info-&gt;close_wait);</div><div class='del'>-#ifdef SERIAL_DO_RESTART</div><div class='del'>-		if (info-&gt;flags &amp; ASYNC_HUP_NOTIFY)</div><div class='del'>-			return -EAGAIN;</div><div class='del'>-		else</div><div class='del'>-			return -ERESTARTSYS;</div><div class='del'>-#else</div><div class='del'>-		return -EAGAIN;</div><div class='del'>-#endif</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/*</div><div class='del'>-	 * If non-blocking mode is set, or the port is not enabled,</div><div class='del'>-	 * then make the check up front and then exit.</div><div class='del'>-	 */</div><div class='del'>-	if ((filp-&gt;f_flags &amp; O_NONBLOCK) ||</div><div class='del'>-	    (tty-&gt;flags &amp; (1 &lt;&lt; TTY_IO_ERROR))) {</div><div class='del'>-		info-&gt;flags |= ASYNC_NORMAL_ACTIVE;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (tty-&gt;termios-&gt;c_cflag &amp; CLOCAL)</div><div class='del'>-		do_clocal = 1;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Block waiting for the carrier detect and the line to become</div><div class='del'>-	 * free (i.e., not in use by the callout).  While we are in</div><div class='del'>-	 * this loop, info-&gt;count is dropped by one, so that</div><div class='del'>-	 * mcfrs_close() knows when to free things.  We restore it upon</div><div class='del'>-	 * exit, either normal or abnormal.</div><div class='del'>-	 */</div><div class='del'>-	retval = 0;</div><div class='del'>-	add_wait_queue(&amp;info-&gt;open_wait, &amp;wait);</div><div class='del'>-#ifdef SERIAL_DEBUG_OPEN</div><div class='del'>-	printk("block_til_ready before block: ttyS%d, count = %d\n",</div><div class='del'>-	       info-&gt;line, info-&gt;count);</div><div class='del'>-#endif</div><div class='del'>-	info-&gt;count--;</div><div class='del'>-	info-&gt;blocked_open++;</div><div class='del'>-	while (1) {</div><div class='del'>-		local_irq_disable();</div><div class='del'>-		mcfrs_setsignals(info, 1, 1);</div><div class='del'>-		local_irq_enable();</div><div class='del'>-		current-&gt;state = TASK_INTERRUPTIBLE;</div><div class='del'>-		if (tty_hung_up_p(filp) ||</div><div class='del'>-		    !(info-&gt;flags &amp; ASYNC_INITIALIZED)) {</div><div class='del'>-#ifdef SERIAL_DO_RESTART</div><div class='del'>-			if (info-&gt;flags &amp; ASYNC_HUP_NOTIFY)</div><div class='del'>-				retval = -EAGAIN;</div><div class='del'>-			else</div><div class='del'>-				retval = -ERESTARTSYS;	</div><div class='del'>-#else</div><div class='del'>-			retval = -EAGAIN;</div><div class='del'>-#endif</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		if (!(info-&gt;flags &amp; ASYNC_CLOSING) &amp;&amp;</div><div class='del'>-		    (do_clocal || (mcfrs_getsignals(info) &amp; TIOCM_CD)))</div><div class='del'>-			break;</div><div class='del'>-		if (signal_pending(current)) {</div><div class='del'>-			retval = -ERESTARTSYS;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-#ifdef SERIAL_DEBUG_OPEN</div><div class='del'>-		printk("block_til_ready blocking: ttyS%d, count = %d\n",</div><div class='del'>-		       info-&gt;line, info-&gt;count);</div><div class='del'>-#endif</div><div class='del'>-		schedule();</div><div class='del'>-	}</div><div class='del'>-	current-&gt;state = TASK_RUNNING;</div><div class='del'>-	remove_wait_queue(&amp;info-&gt;open_wait, &amp;wait);</div><div class='del'>-	if (!tty_hung_up_p(filp))</div><div class='del'>-		info-&gt;count++;</div><div class='del'>-	info-&gt;blocked_open--;</div><div class='del'>-#ifdef SERIAL_DEBUG_OPEN</div><div class='del'>-	printk("block_til_ready after blocking: ttyS%d, count = %d\n",</div><div class='del'>-	       info-&gt;line, info-&gt;count);</div><div class='del'>-#endif</div><div class='del'>-	if (retval)</div><div class='del'>-		return retval;</div><div class='del'>-	info-&gt;flags |= ASYNC_NORMAL_ACTIVE;</div><div class='del'>-	return 0;</div><div class='del'>-}	</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This routine is called whenever a serial port is opened. It</div><div class='del'>- * enables interrupts for a serial port, linking in its structure into</div><div class='del'>- * the IRQ chain.   It also performs the serial-specific</div><div class='del'>- * initialization for the tty structure.</div><div class='del'>- */</div><div class='del'>-int mcfrs_open(struct tty_struct *tty, struct file * filp)</div><div class='del'>-{</div><div class='del'>-	struct mcf_serial	*info;</div><div class='del'>-	int 			retval, line;</div><div class='del'>-</div><div class='del'>-	line = tty-&gt;index;</div><div class='del'>-	if ((line &lt; 0) || (line &gt;= NR_PORTS))</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	info = mcfrs_table + line;</div><div class='del'>-	if (serial_paranoia_check(info, tty-&gt;name, "mcfrs_open"))</div><div class='del'>-		return -ENODEV;</div><div class='del'>-#ifdef SERIAL_DEBUG_OPEN</div><div class='del'>-	printk("mcfrs_open %s, count = %d\n", tty-&gt;name, info-&gt;count);</div><div class='del'>-#endif</div><div class='del'>-	info-&gt;count++;</div><div class='del'>-	tty-&gt;driver_data = info;</div><div class='del'>-	info-&gt;port.tty = tty;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Start up serial port</div><div class='del'>-	 */</div><div class='del'>-	retval = startup(info);</div><div class='del'>-	if (retval)</div><div class='del'>-		return retval;</div><div class='del'>-</div><div class='del'>-	retval = block_til_ready(tty, filp, info);</div><div class='del'>-	if (retval) {</div><div class='del'>-#ifdef SERIAL_DEBUG_OPEN</div><div class='del'>-		printk("mcfrs_open returning after block_til_ready with %d\n",</div><div class='del'>-		       retval);</div><div class='del'>-#endif</div><div class='del'>-		return retval;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#ifdef SERIAL_DEBUG_OPEN</div><div class='del'>-	printk("mcfrs_open %s successful...\n", tty-&gt;name);</div><div class='del'>-#endif</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	Based on the line number set up the internal interrupt stuff.</div><div class='del'>- */</div><div class='del'>-static void mcfrs_irqinit(struct mcf_serial *info)</div><div class='del'>-{</div><div class='del'>-#if defined(CONFIG_M5272)</div><div class='del'>-	volatile unsigned long	*icrp;</div><div class='del'>-	volatile unsigned long	*portp;</div><div class='del'>-	volatile unsigned char	*uartp;</div><div class='del'>-</div><div class='del'>-	uartp = info-&gt;addr;</div><div class='del'>-	icrp = (volatile unsigned long *) (MCF_MBAR + MCFSIM_ICR2);</div><div class='del'>-</div><div class='del'>-	switch (info-&gt;line) {</div><div class='del'>-	case 0:</div><div class='del'>-		*icrp = 0xe0000000;</div><div class='del'>-		break;</div><div class='del'>-	case 1:</div><div class='del'>-		*icrp = 0x0e000000;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		printk("MCFRS: don't know how to handle UART %d interrupt?\n",</div><div class='del'>-			info-&gt;line);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Enable the output lines for the serial ports */</div><div class='del'>-	portp = (volatile unsigned long *) (MCF_MBAR + MCFSIM_PBCNT);</div><div class='del'>-	*portp = (*portp &amp; ~0x000000ff) | 0x00000055;</div><div class='del'>-	portp = (volatile unsigned long *) (MCF_MBAR + MCFSIM_PDCNT);</div><div class='del'>-	*portp = (*portp &amp; ~0x000003fc) | 0x000002a8;</div><div class='del'>-#elif defined(CONFIG_M523x) || defined(CONFIG_M527x) || defined(CONFIG_M528x)</div><div class='del'>-	volatile unsigned char *icrp, *uartp;</div><div class='del'>-	volatile unsigned long *imrp;</div><div class='del'>-</div><div class='del'>-	uartp = info-&gt;addr;</div><div class='del'>-</div><div class='del'>-	icrp = (volatile unsigned char *) (MCF_MBAR + MCFICM_INTC0 +</div><div class='del'>-		MCFINTC_ICR0 + MCFINT_UART0 + info-&gt;line);</div><div class='del'>-	*icrp = 0x30 + info-&gt;line; /* level 6, line based priority */</div><div class='del'>-</div><div class='del'>-	imrp = (volatile unsigned long *) (MCF_MBAR + MCFICM_INTC0 +</div><div class='del'>-		MCFINTC_IMRL);</div><div class='del'>-	*imrp &amp;= ~((1 &lt;&lt; (info-&gt;irq - MCFINT_VECBASE)) | 1);</div><div class='del'>-#if defined(CONFIG_M527x)</div><div class='del'>-	{</div><div class='del'>-		/*</div><div class='del'>-		 * External Pin Mask Setting &amp; Enable External Pin for Interface</div><div class='del'>-		 * mrcbis@aliceposta.it</div><div class='del'>-        	 */</div><div class='del'>-		u16 *serpin_enable_mask;</div><div class='del'>-		serpin_enable_mask = (u16 *) (MCF_IPSBAR + MCF_GPIO_PAR_UART);</div><div class='del'>-		if (info-&gt;line == 0)</div><div class='del'>-			*serpin_enable_mask |= UART0_ENABLE_MASK;</div><div class='del'>-		else if (info-&gt;line == 1)</div><div class='del'>-			*serpin_enable_mask |= UART1_ENABLE_MASK;</div><div class='del'>-		else if (info-&gt;line == 2)</div><div class='del'>-			*serpin_enable_mask |= UART2_ENABLE_MASK;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-#if defined(CONFIG_M528x)</div><div class='del'>-	/* make sure PUAPAR is set for UART0 and UART1 */</div><div class='del'>-	if (info-&gt;line &lt; 2) {</div><div class='del'>-		volatile unsigned char *portp = (volatile unsigned char *) (MCF_MBAR + MCF5282_GPIO_PUAPAR);</div><div class='del'>-		*portp |= (0x03 &lt;&lt; (info-&gt;line * 2));</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-#elif defined(CONFIG_M520x)</div><div class='del'>-	volatile unsigned char *icrp, *uartp;</div><div class='del'>-	volatile unsigned long *imrp;</div><div class='del'>-</div><div class='del'>-	uartp = info-&gt;addr;</div><div class='del'>-</div><div class='del'>-	icrp = (volatile unsigned char *) (MCF_MBAR + MCFICM_INTC0 +</div><div class='del'>-		MCFINTC_ICR0 + MCFINT_UART0 + info-&gt;line);</div><div class='del'>-	*icrp = 0x03;</div><div class='del'>-</div><div class='del'>-	imrp = (volatile unsigned long *) (MCF_MBAR + MCFICM_INTC0 +</div><div class='del'>-		MCFINTC_IMRL);</div><div class='del'>-	*imrp &amp;= ~((1 &lt;&lt; (info-&gt;irq - MCFINT_VECBASE)) | 1);</div><div class='del'>-	if (info-&gt;line &lt; 2) {</div><div class='del'>-		unsigned short *uart_par;</div><div class='del'>-		uart_par = (unsigned short *)(MCF_IPSBAR + MCF_GPIO_PAR_UART);</div><div class='del'>-		if (info-&gt;line == 0)</div><div class='del'>-			*uart_par |=  MCF_GPIO_PAR_UART_PAR_UTXD0</div><div class='del'>-				  | MCF_GPIO_PAR_UART_PAR_URXD0;</div><div class='del'>-		else if (info-&gt;line == 1)</div><div class='del'>-			*uart_par |=  MCF_GPIO_PAR_UART_PAR_UTXD1</div><div class='del'>-				  | MCF_GPIO_PAR_UART_PAR_URXD1;</div><div class='del'>-		} else if (info-&gt;line == 2) {</div><div class='del'>-			unsigned char *feci2c_par;</div><div class='del'>-			feci2c_par = (unsigned char *)(MCF_IPSBAR +  MCF_GPIO_PAR_FECI2C);</div><div class='del'>-			*feci2c_par &amp;= ~0x0F;</div><div class='del'>-			*feci2c_par |=  MCF_GPIO_PAR_FECI2C_PAR_SCL_UTXD2</div><div class='del'>-				    | MCF_GPIO_PAR_FECI2C_PAR_SDA_URXD2;</div><div class='del'>-		}</div><div class='del'>-#elif defined(CONFIG_M532x)</div><div class='del'>-	volatile unsigned char *uartp;</div><div class='del'>-	uartp = info-&gt;addr;</div><div class='del'>-	switch (info-&gt;line) {</div><div class='del'>-	case 0:</div><div class='del'>-		MCF_INTC0_ICR26 = 0x3;</div><div class='del'>-		MCF_INTC0_CIMR = 26;</div><div class='del'>-		/* GPIO initialization */</div><div class='del'>-		MCF_GPIO_PAR_UART |= 0x000F;</div><div class='del'>-		break;</div><div class='del'>-	case 1:</div><div class='del'>-		MCF_INTC0_ICR27 = 0x3;</div><div class='del'>-		MCF_INTC0_CIMR = 27;</div><div class='del'>-		/* GPIO initialization */</div><div class='del'>-		MCF_GPIO_PAR_UART |= 0x0FF0;</div><div class='del'>-		break;</div><div class='del'>-	case 2:</div><div class='del'>-		MCF_INTC0_ICR28 = 0x3;</div><div class='del'>-		MCF_INTC0_CIMR = 28;</div><div class='del'>-		/* GPIOs also must be initalized, depends on board */</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-#else</div><div class='del'>-	volatile unsigned char	*icrp, *uartp;</div><div class='del'>-</div><div class='del'>-	switch (info-&gt;line) {</div><div class='del'>-	case 0:</div><div class='del'>-		icrp = (volatile unsigned char *) (MCF_MBAR + MCFSIM_UART1ICR);</div><div class='del'>-		*icrp = /*MCFSIM_ICR_AUTOVEC |*/ MCFSIM_ICR_LEVEL6 |</div><div class='del'>-			MCFSIM_ICR_PRI1;</div><div class='del'>-		mcf_setimr(mcf_getimr() &amp; ~MCFSIM_IMR_UART1);</div><div class='del'>-		break;</div><div class='del'>-	case 1:</div><div class='del'>-		icrp = (volatile unsigned char *) (MCF_MBAR + MCFSIM_UART2ICR);</div><div class='del'>-		*icrp = /*MCFSIM_ICR_AUTOVEC |*/ MCFSIM_ICR_LEVEL6 |</div><div class='del'>-			MCFSIM_ICR_PRI2;</div><div class='del'>-		mcf_setimr(mcf_getimr() &amp; ~MCFSIM_IMR_UART2);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		printk("MCFRS: don't know how to handle UART %d interrupt?\n",</div><div class='del'>-			info-&gt;line);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	uartp = info-&gt;addr;</div><div class='del'>-	uartp[MCFUART_UIVR] = info-&gt;irq;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* Clear mask, so no surprise interrupts. */</div><div class='del'>-	uartp[MCFUART_UIMR] = 0;</div><div class='del'>-</div><div class='del'>-	if (request_irq(info-&gt;irq, mcfrs_interrupt, IRQF_DISABLED,</div><div class='del'>-	    "ColdFire UART", NULL)) {</div><div class='del'>-		printk("MCFRS: Unable to attach ColdFire UART %d interrupt "</div><div class='del'>-			"vector=%d\n", info-&gt;line, info-&gt;irq);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-char *mcfrs_drivername = "ColdFire internal UART serial driver version 1.00\n";</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Serial stats reporting...</div><div class='del'>- */</div><div class='del'>-int mcfrs_readproc(char *page, char **start, off_t off, int count,</div><div class='del'>-		         int *eof, void *data)</div><div class='del'>-{</div><div class='del'>-	struct mcf_serial	*info;</div><div class='del'>-	char			str[20];</div><div class='del'>-	int			len, sigs, i;</div><div class='del'>-</div><div class='del'>-	len = sprintf(page, mcfrs_drivername);</div><div class='del'>-	for (i = 0; (i &lt; NR_PORTS); i++) {</div><div class='del'>-		info = &amp;mcfrs_table[i];</div><div class='del'>-		len += sprintf((page + len), "%d: port:%x irq=%d baud:%d ",</div><div class='del'>-			i, (unsigned int) info-&gt;addr, info-&gt;irq, info-&gt;baud);</div><div class='del'>-		if (info-&gt;stats.rx || info-&gt;stats.tx)</div><div class='del'>-			len += sprintf((page + len), "tx:%d rx:%d ",</div><div class='del'>-			info-&gt;stats.tx, info-&gt;stats.rx);</div><div class='del'>-		if (info-&gt;stats.rxframing)</div><div class='del'>-			len += sprintf((page + len), "fe:%d ",</div><div class='del'>-			info-&gt;stats.rxframing);</div><div class='del'>-		if (info-&gt;stats.rxparity)</div><div class='del'>-			len += sprintf((page + len), "pe:%d ",</div><div class='del'>-			info-&gt;stats.rxparity);</div><div class='del'>-		if (info-&gt;stats.rxbreak)</div><div class='del'>-			len += sprintf((page + len), "brk:%d ",</div><div class='del'>-			info-&gt;stats.rxbreak);</div><div class='del'>-		if (info-&gt;stats.rxoverrun)</div><div class='del'>-			len += sprintf((page + len), "oe:%d ",</div><div class='del'>-			info-&gt;stats.rxoverrun);</div><div class='del'>-</div><div class='del'>-		str[0] = str[1] = 0;</div><div class='del'>-		if ((sigs = mcfrs_getsignals(info))) {</div><div class='del'>-			if (sigs &amp; TIOCM_RTS)</div><div class='del'>-				strcat(str, "|RTS");</div><div class='del'>-			if (sigs &amp; TIOCM_CTS)</div><div class='del'>-				strcat(str, "|CTS");</div><div class='del'>-			if (sigs &amp; TIOCM_DTR)</div><div class='del'>-				strcat(str, "|DTR");</div><div class='del'>-			if (sigs &amp; TIOCM_CD)</div><div class='del'>-				strcat(str, "|CD");</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		len += sprintf((page + len), "%s\n", &amp;str[1]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return(len);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Finally, routines used to initialize the serial driver. */</div><div class='del'>-</div><div class='del'>-static void show_serial_version(void)</div><div class='del'>-{</div><div class='del'>-	printk(mcfrs_drivername);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct tty_operations mcfrs_ops = {</div><div class='del'>-	.open = mcfrs_open,</div><div class='del'>-	.close = mcfrs_close,</div><div class='del'>-	.write = mcfrs_write,</div><div class='del'>-	.flush_chars = mcfrs_flush_chars,</div><div class='del'>-	.write_room = mcfrs_write_room,</div><div class='del'>-	.chars_in_buffer = mcfrs_chars_in_buffer,</div><div class='del'>-	.flush_buffer = mcfrs_flush_buffer,</div><div class='del'>-	.ioctl = mcfrs_ioctl,</div><div class='del'>-	.throttle = mcfrs_throttle,</div><div class='del'>-	.unthrottle = mcfrs_unthrottle,</div><div class='del'>-	.set_termios = mcfrs_set_termios,</div><div class='del'>-	.stop = mcfrs_stop,</div><div class='del'>-	.start = mcfrs_start,</div><div class='del'>-	.hangup = mcfrs_hangup,</div><div class='del'>-	.read_proc = mcfrs_readproc,</div><div class='del'>-	.wait_until_sent = mcfrs_wait_until_sent,</div><div class='del'>- 	.tiocmget = mcfrs_tiocmget,</div><div class='del'>-	.tiocmset = mcfrs_tiocmset,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* mcfrs_init inits the driver */</div><div class='del'>-static int __init</div><div class='del'>-mcfrs_init(void)</div><div class='del'>-{</div><div class='del'>-	struct mcf_serial	*info;</div><div class='del'>-	unsigned long		flags;</div><div class='del'>-	int			i;</div><div class='del'>-</div><div class='del'>-	/* Setup base handler, and timer table. */</div><div class='del'>-#ifdef MCFPP_DCD0</div><div class='del'>-	init_timer(&amp;mcfrs_timer_struct);</div><div class='del'>-	mcfrs_timer_struct.function = mcfrs_timer;</div><div class='del'>-	mcfrs_timer_struct.data = 0;</div><div class='del'>-	mcfrs_timer_struct.expires = jiffies + HZ/25;</div><div class='del'>-	add_timer(&amp;mcfrs_timer_struct);</div><div class='del'>-	mcfrs_ppstatus = mcf_getppdata() &amp; (MCFPP_DCD0 | MCFPP_DCD1);</div><div class='del'>-#endif</div><div class='del'>-	mcfrs_serial_driver = alloc_tty_driver(NR_PORTS);</div><div class='del'>-	if (!mcfrs_serial_driver)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	show_serial_version();</div><div class='del'>-</div><div class='del'>-	/* Initialize the tty_driver structure */</div><div class='del'>-	mcfrs_serial_driver-&gt;owner = THIS_MODULE;</div><div class='del'>-	mcfrs_serial_driver-&gt;name = "ttyS";</div><div class='del'>-	mcfrs_serial_driver-&gt;driver_name = "mcfserial";</div><div class='del'>-	mcfrs_serial_driver-&gt;major = TTY_MAJOR;</div><div class='del'>-	mcfrs_serial_driver-&gt;minor_start = 64;</div><div class='del'>-	mcfrs_serial_driver-&gt;type = TTY_DRIVER_TYPE_SERIAL;</div><div class='del'>-	mcfrs_serial_driver-&gt;subtype = SERIAL_TYPE_NORMAL;</div><div class='del'>-	mcfrs_serial_driver-&gt;init_termios = tty_std_termios;</div><div class='del'>-</div><div class='del'>-	mcfrs_serial_driver-&gt;init_termios.c_cflag =</div><div class='del'>-		mcfrs_console_cbaud | CS8 | CREAD | HUPCL | CLOCAL;</div><div class='del'>-	mcfrs_serial_driver-&gt;flags = TTY_DRIVER_REAL_RAW;</div><div class='del'>-</div><div class='del'>-	tty_set_operations(mcfrs_serial_driver, &amp;mcfrs_ops);</div><div class='del'>-</div><div class='del'>-	if (tty_register_driver(mcfrs_serial_driver)) {</div><div class='del'>-		printk("MCFRS: Couldn't register serial driver\n");</div><div class='del'>-		put_tty_driver(mcfrs_serial_driver);</div><div class='del'>-		return(-EBUSY);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	local_irq_save(flags);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 *	Configure all the attached serial ports.</div><div class='del'>-	 */</div><div class='del'>-	for (i = 0, info = mcfrs_table; (i &lt; NR_PORTS); i++, info++) {</div><div class='del'>-		info-&gt;magic = SERIAL_MAGIC;</div><div class='del'>-		info-&gt;line = i;</div><div class='del'>-		info-&gt;port.tty = NULL;</div><div class='del'>-		info-&gt;custom_divisor = 16;</div><div class='del'>-		info-&gt;close_delay = 50;</div><div class='del'>-		info-&gt;closing_wait = 3000;</div><div class='del'>-		info-&gt;x_char = 0;</div><div class='del'>-		info-&gt;event = 0;</div><div class='del'>-		info-&gt;count = 0;</div><div class='del'>-		info-&gt;blocked_open = 0;</div><div class='del'>-		INIT_WORK(&amp;info-&gt;tqueue, mcfrs_offintr);</div><div class='del'>-		INIT_WORK(&amp;info-&gt;tqueue_hangup, do_serial_hangup);</div><div class='del'>-		init_waitqueue_head(&amp;info-&gt;open_wait);</div><div class='del'>-		init_waitqueue_head(&amp;info-&gt;close_wait);</div><div class='del'>-</div><div class='del'>-		info-&gt;imr = 0;</div><div class='del'>-		mcfrs_setsignals(info, 0, 0);</div><div class='del'>-		mcfrs_irqinit(info);</div><div class='del'>-</div><div class='del'>-		printk("ttyS%d at 0x%04x (irq = %d)", info-&gt;line,</div><div class='del'>-			(unsigned int) info-&gt;addr, info-&gt;irq);</div><div class='del'>-		printk(" is a builtin ColdFire UART\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	local_irq_restore(flags);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(mcfrs_init);</div><div class='del'>-</div><div class='del'>-/****************************************************************************/</div><div class='del'>-/*                          Serial Console                                  */</div><div class='del'>-/****************************************************************************/</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	Quick and dirty UART initialization, for console output.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-void mcfrs_init_console(void)</div><div class='del'>-{</div><div class='del'>-	volatile unsigned char	*uartp;</div><div class='del'>-	unsigned int		clk;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 *	Reset UART, get it into known state...</div><div class='del'>-	 */</div><div class='del'>-	uartp = (volatile unsigned char *) (MCF_MBAR +</div><div class='del'>-		(mcfrs_console_port ? MCFUART_BASE2 : MCFUART_BASE1));</div><div class='del'>-</div><div class='del'>-	uartp[MCFUART_UCR] = MCFUART_UCR_CMDRESETRX;  /* reset RX */</div><div class='del'>-	uartp[MCFUART_UCR] = MCFUART_UCR_CMDRESETTX;  /* reset TX */</div><div class='del'>-	uartp[MCFUART_UCR] = MCFUART_UCR_CMDRESETMRPTR;  /* reset MR pointer */</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Set port for defined baud , 8 data bits, 1 stop bit, no parity.</div><div class='del'>-	 */</div><div class='del'>-	uartp[MCFUART_UMR] = MCFUART_MR1_PARITYNONE | MCFUART_MR1_CS8;</div><div class='del'>-	uartp[MCFUART_UMR] = MCFUART_MR2_STOP1;</div><div class='del'>-</div><div class='del'>-#ifdef	CONFIG_M5272</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * For the MCF5272, also compute the baudrate fraction.</div><div class='del'>-	 */</div><div class='del'>-	int fraction = MCF_BUSCLK - (clk * 32 * mcfrs_console_baud);</div><div class='del'>-	fraction *= 16;</div><div class='del'>-	fraction /= (32 * mcfrs_console_baud);</div><div class='del'>-	uartp[MCFUART_UFPD] = (fraction &amp; 0xf);		/* set fraction */</div><div class='del'>-	clk = (MCF_BUSCLK / mcfrs_console_baud) / 32;</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-	clk = ((MCF_BUSCLK / mcfrs_console_baud) + 16) / 32; /* set baud */</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	uartp[MCFUART_UBG1] = (clk &amp; 0xff00) &gt;&gt; 8;  /* set msb baud */</div><div class='del'>-	uartp[MCFUART_UBG2] = (clk &amp; 0xff);  /* set lsb baud */</div><div class='del'>-	uartp[MCFUART_UCSR] = MCFUART_UCSR_RXCLKTIMER | MCFUART_UCSR_TXCLKTIMER;</div><div class='del'>-	uartp[MCFUART_UCR] = MCFUART_UCR_RXENABLE | MCFUART_UCR_TXENABLE;</div><div class='del'>-</div><div class='del'>-	mcfrs_console_inited++;</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	Setup for console. Argument comes from the boot command line.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-int mcfrs_console_setup(struct console *cp, char *arg)</div><div class='del'>-{</div><div class='del'>-	int		i, n = CONSOLE_BAUD_RATE;</div><div class='del'>-</div><div class='del'>-	if (!cp)</div><div class='del'>-		return(-1);</div><div class='del'>-</div><div class='del'>-	if (!strncmp(cp-&gt;name, "ttyS", 4))</div><div class='del'>-		mcfrs_console_port = cp-&gt;index;</div><div class='del'>-	else if (!strncmp(cp-&gt;name, "cua", 3))</div><div class='del'>-		mcfrs_console_port = cp-&gt;index;</div><div class='del'>-	else</div><div class='del'>-		return(-1);</div><div class='del'>-</div><div class='del'>-	if (arg)</div><div class='del'>-		n = simple_strtoul(arg,NULL,0);</div><div class='del'>-	for (i = 0; i &lt; MCFRS_BAUD_TABLE_SIZE; i++)</div><div class='del'>-		if (mcfrs_baud_table[i] == n)</div><div class='del'>-			break;</div><div class='del'>-	if (i &lt; MCFRS_BAUD_TABLE_SIZE) {</div><div class='del'>-		mcfrs_console_baud = n;</div><div class='del'>-		mcfrs_console_cbaud = 0;</div><div class='del'>-		if (i &gt; 15) {</div><div class='del'>-			mcfrs_console_cbaud |= CBAUDEX;</div><div class='del'>-			i -= 15;</div><div class='del'>-		}</div><div class='del'>-		mcfrs_console_cbaud |= i;</div><div class='del'>-	}</div><div class='del'>-	mcfrs_init_console(); /* make sure baud rate changes */</div><div class='del'>-	return(0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static struct tty_driver *mcfrs_console_device(struct console *c, int *index)</div><div class='del'>-{</div><div class='del'>-	*index = c-&gt;index;</div><div class='del'>-	return mcfrs_serial_driver;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	Output a single character, using UART polled mode.</div><div class='del'>- *	This is used for console output.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-int mcfrs_put_char(char ch)</div><div class='del'>-{</div><div class='del'>-	volatile unsigned char	*uartp;</div><div class='del'>-	unsigned long		flags;</div><div class='del'>-	int			i;</div><div class='del'>-</div><div class='del'>-	uartp = (volatile unsigned char *) (MCF_MBAR +</div><div class='del'>-		(mcfrs_console_port ? MCFUART_BASE2 : MCFUART_BASE1));</div><div class='del'>-</div><div class='del'>-	local_irq_save(flags);</div><div class='del'>-	for (i = 0; (i &lt; 0x10000); i++) {</div><div class='del'>-		if (uartp[MCFUART_USR] &amp; MCFUART_USR_TXREADY)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	if (i &lt; 0x10000) {</div><div class='del'>-		uartp[MCFUART_UTB] = ch;</div><div class='del'>-		for (i = 0; (i &lt; 0x10000); i++)</div><div class='del'>-			if (uartp[MCFUART_USR] &amp; MCFUART_USR_TXEMPTY)</div><div class='del'>-				break;</div><div class='del'>-	}</div><div class='del'>-	if (i &gt;= 0x10000)</div><div class='del'>-		mcfrs_init_console(); /* try and get it back */</div><div class='del'>-	local_irq_restore(flags);</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * rs_console_write is registered for printk output.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-void mcfrs_console_write(struct console *cp, const char *p, unsigned len)</div><div class='del'>-{</div><div class='del'>-	if (!mcfrs_console_inited)</div><div class='del'>-		mcfrs_init_console();</div><div class='del'>-	while (len-- &gt; 0) {</div><div class='del'>-		if (*p == '\n')</div><div class='del'>-			mcfrs_put_char('\r');</div><div class='del'>-		mcfrs_put_char(*p++);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * declare our consoles</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-struct console mcfrs_console = {</div><div class='del'>-	.name		= "ttyS",</div><div class='del'>-	.write		= mcfrs_console_write,</div><div class='del'>-	.device		= mcfrs_console_device,</div><div class='del'>-	.setup		= mcfrs_console_setup,</div><div class='del'>-	.flags		= CON_PRINTBUFFER,</div><div class='del'>-	.index		= -1,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init mcfrs_console_init(void)</div><div class='del'>-{</div><div class='del'>-	register_console(&amp;mcfrs_console);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-console_initcall(mcfrs_console_init);</div><div class='del'>-</div><div class='del'>-/****************************************************************************/</div><div class='head'>diff --git a/drivers/serial/mcfserial.h b/drivers/serial/mcfserial.h<br/>deleted file mode 100644<br/>index 56420e2cb110..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/serial/mcfserial.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/serial/mcfserial.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,74 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * mcfserial.c -- serial driver for ColdFire internal UARTS.</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 1999 Greg Ungerer &lt;gerg@snapgear.com&gt;</div><div class='del'>- * Copyright (c) 2000-2001 Lineo, Inc. &lt;www.lineo.com&gt;</div><div class='del'>- * Copyright (c) 2002 SnapGear Inc., &lt;www.snapgear.com&gt;</div><div class='del'>- *</div><div class='del'>- * Based on code from 68332serial.c which was:</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)</div><div class='del'>- * Copyright (C) 1998 TSHG</div><div class='del'>- * Copyright (c) 1999 Rt-Control Inc. &lt;jeff@uclinux.org&gt;</div><div class='del'>- */ </div><div class='del'>-#ifndef _MCF_SERIAL_H</div><div class='del'>-#define _MCF_SERIAL_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/serial.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef __KERNEL__</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	Define a local serial stats structure.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-struct mcf_stats {</div><div class='del'>-	unsigned int	rx;</div><div class='del'>-	unsigned int	tx;</div><div class='del'>-	unsigned int	rxbreak;</div><div class='del'>-	unsigned int	rxframing;</div><div class='del'>-	unsigned int	rxparity;</div><div class='del'>-	unsigned int	rxoverrun;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This is our internal structure for each serial port's state.</div><div class='del'>- * Each serial port has one of these structures associated with it.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-struct mcf_serial {</div><div class='del'>-	int			magic;</div><div class='del'>-	volatile unsigned char	*addr;		/* UART memory address */</div><div class='del'>-	int			irq;</div><div class='del'>-	int			flags; 		/* defined in tty.h */</div><div class='del'>-	int			type; 		/* UART type */</div><div class='del'>-	struct tty_struct 	*tty;</div><div class='del'>-	unsigned char		imr;		/* Software imr register */</div><div class='del'>-	unsigned int		baud;</div><div class='del'>-	int			sigs;</div><div class='del'>-	int			custom_divisor;</div><div class='del'>-	int			x_char;	/* xon/xoff character */</div><div class='del'>-	int			baud_base;</div><div class='del'>-	int			close_delay;</div><div class='del'>-	unsigned short		closing_wait;</div><div class='del'>-	unsigned short		closing_wait2;</div><div class='del'>-	unsigned long		event;</div><div class='del'>-	int			line;</div><div class='del'>-	int			count;	    /* # of fd on device */</div><div class='del'>-	int			blocked_open; /* # of blocked opens */</div><div class='del'>-	unsigned char 		*xmit_buf;</div><div class='del'>-	int			xmit_head;</div><div class='del'>-	int			xmit_tail;</div><div class='del'>-	int			xmit_cnt;</div><div class='del'>-	struct mcf_stats	stats;</div><div class='del'>-	struct work_struct	tqueue;</div><div class='del'>-	struct work_struct	tqueue_hangup;</div><div class='del'>-	wait_queue_head_t	open_wait;</div><div class='del'>-	wait_queue_head_t	close_wait;</div><div class='del'>-</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif /* __KERNEL__ */</div><div class='del'>-</div><div class='del'>-#endif /* _MCF_SERIAL_H */</div><div class='head'>diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c<br/>index 36126070d9af..6117d3db0b66 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/serial/mpc52xx_uart.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/serial/mpc52xx_uart.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/serial/mpc52xx_uart.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/serial/mpc52xx_uart.c</a></div><div class='hunk'>@@ -72,13 +72,8 @@</div><div class='ctx'> #include &lt;linux/console.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_PPC_MERGE)</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='ctx'> #include &lt;linux/of_platform.h&gt;</div><div class='del'>-#else</div><div class='del'>-#include &lt;linux/platform_device.h&gt;</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mpc52xx.h&gt;</div><div class='ctx'> #include &lt;asm/mpc512x.h&gt;</div><div class='hunk'>@@ -107,12 +102,11 @@ static struct uart_port mpc52xx_uart_ports[MPC52xx_PSC_MAXNUM];</div><div class='ctx'> 	 *        it's cleared, then a memset(...,0,...) should be added to</div><div class='ctx'> 	 *        the console_init</div><div class='ctx'> 	 */</div><div class='del'>-#if defined(CONFIG_PPC_MERGE)</div><div class='add'>+</div><div class='ctx'> /* lookup table for matching device nodes to index numbers */</div><div class='ctx'> static struct device_node *mpc52xx_uart_nodes[MPC52xx_PSC_MAXNUM];</div><div class='ctx'> </div><div class='ctx'> static void mpc52xx_uart_of_enumerate(void);</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #define PSC(port) ((struct mpc52xx_psc __iomem *)((port)-&gt;membase))</div><div class='hunk'>@@ -255,17 +249,12 @@ static void mpc52xx_psc_cw_restore_ints(struct uart_port *port)</div><div class='ctx'> /* Search for bus-frequency property in this node or a parent */</div><div class='ctx'> static unsigned long mpc52xx_getuartclk(void *p)</div><div class='ctx'> {</div><div class='del'>-#if defined(CONFIG_PPC_MERGE)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * 5200 UARTs have a / 32 prescaler</div><div class='ctx'> 	 * but the generic serial code assumes 16</div><div class='ctx'> 	 * so return ipb freq / 2</div><div class='ctx'> 	 */</div><div class='ctx'> 	return mpc52xx_find_ipb_freq(p) / 2;</div><div class='del'>-#else</div><div class='del'>-	pr_debug("unexpected call to mpc52xx_getuartclk with arch/ppc\n");</div><div class='del'>-	return NULL;</div><div class='del'>-#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct psc_ops mpc52xx_psc_ops = {</div><div class='hunk'>@@ -886,10 +875,6 @@ mpc52xx_console_get_options(struct uart_port *port,</div><div class='ctx'> </div><div class='ctx'> 	/* CT{U,L}R are write-only ! */</div><div class='ctx'> 	*baud = CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD;</div><div class='del'>-#if !defined(CONFIG_PPC_MERGE)</div><div class='del'>-	if (__res.bi_baudrate)</div><div class='del'>-		*baud = __res.bi_baudrate;</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> 	/* Parse them */</div><div class='ctx'> 	switch (mr1 &amp; MPC52xx_PSC_MODE_BITS_MASK) {</div><div class='hunk'>@@ -946,42 +931,6 @@ mpc52xx_console_write(struct console *co, const char *s, unsigned int count)</div><div class='ctx'> 	psc_ops-&gt;cw_restore_ints(port);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#if !defined(CONFIG_PPC_MERGE)</div><div class='del'>-static int __init</div><div class='del'>-mpc52xx_console_setup(struct console *co, char *options)</div><div class='del'>-{</div><div class='del'>-	struct uart_port *port = &amp;mpc52xx_uart_ports[co-&gt;index];</div><div class='del'>-</div><div class='del'>-	int baud = CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD;</div><div class='del'>-	int bits = 8;</div><div class='del'>-	int parity = 'n';</div><div class='del'>-	int flow = 'n';</div><div class='del'>-</div><div class='del'>-	if (co-&gt;index &lt; 0 || co-&gt;index &gt;= MPC52xx_PSC_MAXNUM)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	/* Basic port init. Needed since we use some uart_??? func before</div><div class='del'>-	 * real init for early access */</div><div class='del'>-	spin_lock_init(&amp;port-&gt;lock);</div><div class='del'>-	port-&gt;uartclk	= __res.bi_ipbfreq / 2; /* Look at CTLR doc */</div><div class='del'>-	port-&gt;ops	= &amp;mpc52xx_uart_ops;</div><div class='del'>-	port-&gt;mapbase	= MPC52xx_PA(MPC52xx_PSCx_OFFSET(co-&gt;index+1));</div><div class='del'>-</div><div class='del'>-	/* We ioremap ourself */</div><div class='del'>-	port-&gt;membase = ioremap(port-&gt;mapbase, MPC52xx_PSC_SIZE);</div><div class='del'>-	if (port-&gt;membase == NULL)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	/* Setup the port parameters accoding to options */</div><div class='del'>-	if (options)</div><div class='del'>-		uart_parse_options(options, &amp;baud, &amp;parity, &amp;bits, &amp;flow);</div><div class='del'>-	else</div><div class='del'>-		mpc52xx_console_get_options(port, &amp;baud, &amp;parity, &amp;bits, &amp;flow);</div><div class='del'>-</div><div class='del'>-	return uart_set_options(port, co, baud, parity, bits, flow);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#else</div><div class='ctx'> </div><div class='ctx'> static int __init</div><div class='ctx'> mpc52xx_console_setup(struct console *co, char *options)</div><div class='hunk'>@@ -1053,7 +1002,6 @@ mpc52xx_console_setup(struct console *co, char *options)</div><div class='ctx'> </div><div class='ctx'> 	return uart_set_options(port, co, baud, parity, bits, flow);</div><div class='ctx'> }</div><div class='del'>-#endif /* defined(CONFIG_PPC_MERGE) */</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static struct uart_driver mpc52xx_uart_driver;</div><div class='hunk'>@@ -1072,9 +1020,7 @@ static struct console mpc52xx_console = {</div><div class='ctx'> static int __init</div><div class='ctx'> mpc52xx_console_init(void)</div><div class='ctx'> {</div><div class='del'>-#if defined(CONFIG_PPC_MERGE)</div><div class='ctx'> 	mpc52xx_uart_of_enumerate();</div><div class='del'>-#endif</div><div class='ctx'> 	register_console(&amp;mpc52xx_console);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1100,115 +1046,6 @@ static struct uart_driver mpc52xx_uart_driver = {</div><div class='ctx'> 	.cons		= MPC52xx_PSC_CONSOLE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-#if !defined(CONFIG_PPC_MERGE)</div><div class='del'>-/* ======================================================================== */</div><div class='del'>-/* Platform Driver                                                          */</div><div class='del'>-/* ======================================================================== */</div><div class='del'>-</div><div class='del'>-static int __devinit</div><div class='del'>-mpc52xx_uart_probe(struct platform_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct resource *res = dev-&gt;resource;</div><div class='del'>-</div><div class='del'>-	struct uart_port *port = NULL;</div><div class='del'>-	int i, idx, ret;</div><div class='del'>-</div><div class='del'>-	/* Check validity &amp; presence */</div><div class='del'>-	idx = dev-&gt;id;</div><div class='del'>-	if (idx &lt; 0 || idx &gt;= MPC52xx_PSC_MAXNUM)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (!mpc52xx_match_psc_function(idx, "uart"))</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	/* Init the port structure */</div><div class='del'>-	port = &amp;mpc52xx_uart_ports[idx];</div><div class='del'>-</div><div class='del'>-	spin_lock_init(&amp;port-&gt;lock);</div><div class='del'>-	port-&gt;uartclk	= __res.bi_ipbfreq / 2; /* Look at CTLR doc */</div><div class='del'>-	port-&gt;fifosize	= 512;</div><div class='del'>-	port-&gt;iotype	= UPIO_MEM;</div><div class='del'>-	port-&gt;flags	= UPF_BOOT_AUTOCONF |</div><div class='del'>-			  (uart_console(port) ? 0 : UPF_IOREMAP);</div><div class='del'>-	port-&gt;line	= idx;</div><div class='del'>-	port-&gt;ops	= &amp;mpc52xx_uart_ops;</div><div class='del'>-	port-&gt;dev	= &amp;dev-&gt;dev;</div><div class='del'>-</div><div class='del'>-	/* Search for IRQ and mapbase */</div><div class='del'>-	for (i = 0 ; i &lt; dev-&gt;num_resources ; i++, res++) {</div><div class='del'>-		if (res-&gt;flags &amp; IORESOURCE_MEM)</div><div class='del'>-			port-&gt;mapbase = res-&gt;start;</div><div class='del'>-		else if (res-&gt;flags &amp; IORESOURCE_IRQ)</div><div class='del'>-			port-&gt;irq = res-&gt;start;</div><div class='del'>-	}</div><div class='del'>-	if (!port-&gt;irq || !port-&gt;mapbase)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	/* Add the port to the uart sub-system */</div><div class='del'>-	ret = uart_add_one_port(&amp;mpc52xx_uart_driver, port);</div><div class='del'>-	if (!ret)</div><div class='del'>-		platform_set_drvdata(dev, (void *)port);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-mpc52xx_uart_remove(struct platform_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct uart_port *port = (struct uart_port *) platform_get_drvdata(dev);</div><div class='del'>-</div><div class='del'>-	platform_set_drvdata(dev, NULL);</div><div class='del'>-</div><div class='del'>-	if (port)</div><div class='del'>-		uart_remove_one_port(&amp;mpc52xx_uart_driver, port);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-static int</div><div class='del'>-mpc52xx_uart_suspend(struct platform_device *dev, pm_message_t state)</div><div class='del'>-{</div><div class='del'>-	struct uart_port *port = (struct uart_port *) platform_get_drvdata(dev);</div><div class='del'>-</div><div class='del'>-	if (port)</div><div class='del'>-		uart_suspend_port(&amp;mpc52xx_uart_driver, port);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-mpc52xx_uart_resume(struct platform_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct uart_port *port = (struct uart_port *) platform_get_drvdata(dev);</div><div class='del'>-</div><div class='del'>-	if (port)</div><div class='del'>-		uart_resume_port(&amp;mpc52xx_uart_driver, port);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* work with hotplug and coldplug */</div><div class='del'>-MODULE_ALIAS("platform:mpc52xx-psc");</div><div class='del'>-</div><div class='del'>-static struct platform_driver mpc52xx_uart_platform_driver = {</div><div class='del'>-	.probe		= mpc52xx_uart_probe,</div><div class='del'>-	.remove		= mpc52xx_uart_remove,</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-	.suspend	= mpc52xx_uart_suspend,</div><div class='del'>-	.resume		= mpc52xx_uart_resume,</div><div class='del'>-#endif</div><div class='del'>-	.driver		= {</div><div class='del'>-		.owner	= THIS_MODULE,</div><div class='del'>-		.name	= "mpc52xx-psc",</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-#endif /* !defined(CONFIG_PPC_MERGE) */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_PPC_MERGE)</div><div class='ctx'> /* ======================================================================== */</div><div class='ctx'> /* OF Platform Driver                                                       */</div><div class='ctx'> /* ======================================================================== */</div><div class='hunk'>@@ -1402,7 +1239,6 @@ static struct of_platform_driver mpc52xx_uart_of_driver = {</div><div class='ctx'> 		.name	= "mpc52xx-psc-uart",</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='del'>-#endif /* defined(CONFIG_PPC_MERGE) */</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* ======================================================================== */</div><div class='hunk'>@@ -1423,7 +1259,6 @@ mpc52xx_uart_init(void)</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_PPC_MERGE)</div><div class='ctx'> 	mpc52xx_uart_of_enumerate();</div><div class='ctx'> </div><div class='ctx'> 	ret = of_register_platform_driver(&amp;mpc52xx_uart_of_driver);</div><div class='hunk'>@@ -1433,16 +1268,6 @@ mpc52xx_uart_init(void)</div><div class='ctx'> 		uart_unregister_driver(&amp;mpc52xx_uart_driver);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='del'>-#else</div><div class='del'>-	psc_ops = &amp;mpc52xx_psc_ops;</div><div class='del'>-	ret = platform_driver_register(&amp;mpc52xx_uart_platform_driver);</div><div class='del'>-	if (ret) {</div><div class='del'>-		printk(KERN_ERR "%s: platform_driver_register failed (%i)\n",</div><div class='del'>-		       __FILE__, ret);</div><div class='del'>-		uart_unregister_driver(&amp;mpc52xx_uart_driver);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1450,11 +1275,7 @@ mpc52xx_uart_init(void)</div><div class='ctx'> static void __exit</div><div class='ctx'> mpc52xx_uart_exit(void)</div><div class='ctx'> {</div><div class='del'>-#if defined(CONFIG_PPC_MERGE)</div><div class='ctx'> 	of_unregister_platform_driver(&amp;mpc52xx_uart_of_driver);</div><div class='del'>-#else</div><div class='del'>-	platform_driver_unregister(&amp;mpc52xx_uart_platform_driver);</div><div class='del'>-#endif</div><div class='ctx'> 	uart_unregister_driver(&amp;mpc52xx_uart_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/serial/pxa.c b/drivers/serial/pxa.c<br/>index f7a0d37c4221..abc00be55433 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/serial/pxa.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/serial/pxa.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/serial/pxa.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/serial/pxa.c</a></div><div class='hunk'>@@ -534,6 +534,11 @@ serial_pxa_set_termios(struct uart_port *port, struct ktermios *termios,</div><div class='ctx'> </div><div class='ctx'> 	serial_out(up, UART_IER, up-&gt;ier);</div><div class='ctx'> </div><div class='add'>+	if (termios-&gt;c_cflag &amp; CRTSCTS)</div><div class='add'>+		up-&gt;mcr |= UART_MCR_AFE;</div><div class='add'>+	else</div><div class='add'>+		up-&gt;mcr &amp;= ~UART_MCR_AFE;</div><div class='add'>+</div><div class='ctx'> 	serial_out(up, UART_LCR, cval | UART_LCR_DLAB);/* set DLAB */</div><div class='ctx'> 	serial_out(up, UART_DLL, quot &amp; 0xff);		/* LS of divisor */</div><div class='ctx'> 	serial_out(up, UART_DLM, quot &gt;&gt; 8);		/* MS of divisor */</div><div class='head'>diff --git a/drivers/serial/s3c2400.c b/drivers/serial/s3c2400.c<br/>index c8b4266ac35f..4873f2978bd2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/serial/s3c2400.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/serial/s3c2400.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/serial/s3c2400.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/serial/s3c2400.c</a></div><div class='hunk'>@@ -19,7 +19,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c/regs-serial.h&gt;</div><div class='add'>+#include &lt;plat/regs-serial.h&gt;</div><div class='ctx'> #include &lt;mach/regs-gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "samsung.h"</div><div class='head'>diff --git a/drivers/serial/s3c2410.c b/drivers/serial/s3c2410.c<br/>index 40a2531b5541..87c182ef71b8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/serial/s3c2410.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/serial/s3c2410.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/serial/s3c2410.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/serial/s3c2410.c</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c/regs-serial.h&gt;</div><div class='add'>+#include &lt;plat/regs-serial.h&gt;</div><div class='ctx'> #include &lt;mach/regs-gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "samsung.h"</div><div class='head'>diff --git a/drivers/serial/s3c2412.c b/drivers/serial/s3c2412.c<br/>index d0170319c729..fd017b375568 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/serial/s3c2412.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/serial/s3c2412.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/serial/s3c2412.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/serial/s3c2412.c</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c/regs-serial.h&gt;</div><div class='add'>+#include &lt;plat/regs-serial.h&gt;</div><div class='ctx'> #include &lt;mach/regs-gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "samsung.h"</div><div class='head'>diff --git a/drivers/serial/s3c2440.c b/drivers/serial/s3c2440.c<br/>index d4a2b17b2498..317d239ab740 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/serial/s3c2440.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/serial/s3c2440.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/serial/s3c2440.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/serial/s3c2440.c</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c/regs-serial.h&gt;</div><div class='add'>+#include &lt;plat/regs-serial.h&gt;</div><div class='ctx'> #include &lt;mach/regs-gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "samsung.h"</div><div class='head'>diff --git a/drivers/serial/samsung.c b/drivers/serial/samsung.c<br/>index 5a88b3f9fe9b..1e219d3d0352 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/serial/samsung.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/serial/samsung.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/serial/samsung.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/serial/samsung.c</a></div><div class='hunk'>@@ -47,7 +47,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/plat-s3c/regs-serial.h&gt;</div><div class='add'>+#include &lt;plat/regs-serial.h&gt;</div><div class='ctx'> #include &lt;mach/regs-gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "samsung.h"</div><div class='head'>diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c<br/>index f977c98cfa95..6bdf3362e3b1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/serial/serial_core.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/serial/serial_core.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/serial/serial_core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/serial/serial_core.c</a></div><div class='hunk'>@@ -2051,7 +2051,8 @@ int uart_suspend_port(struct uart_driver *drv, struct uart_port *port)</div><div class='ctx'> 					"transmitter\n",</div><div class='ctx'> 			       port-&gt;dev ? port-&gt;dev-&gt;bus_id : "",</div><div class='ctx'> 			       port-&gt;dev ? ": " : "",</div><div class='del'>-			       drv-&gt;dev_name, port-&gt;line);</div><div class='add'>+			       drv-&gt;dev_name,</div><div class='add'>+			       drv-&gt;tty_driver-&gt;name_base + port-&gt;line);</div><div class='ctx'> </div><div class='ctx'> 		ops-&gt;shutdown(port);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2154,12 +2155,11 @@ uart_report_port(struct uart_driver *drv, struct uart_port *port)</div><div class='ctx'> </div><div class='ctx'> 	switch (port-&gt;iotype) {</div><div class='ctx'> 	case UPIO_PORT:</div><div class='del'>-		snprintf(address, sizeof(address),</div><div class='del'>-			 "I/O 0x%x", port-&gt;iobase);</div><div class='add'>+		snprintf(address, sizeof(address), "I/O 0x%lx", port-&gt;iobase);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case UPIO_HUB6:</div><div class='ctx'> 		snprintf(address, sizeof(address),</div><div class='del'>-			 "I/O 0x%x offset 0x%x", port-&gt;iobase, port-&gt;hub6);</div><div class='add'>+			 "I/O 0x%lx offset 0x%x", port-&gt;iobase, port-&gt;hub6);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case UPIO_MEM:</div><div class='ctx'> 	case UPIO_MEM32:</div><div class='hunk'>@@ -2177,7 +2177,9 @@ uart_report_port(struct uart_driver *drv, struct uart_port *port)</div><div class='ctx'> 	printk(KERN_INFO "%s%s%s%d at %s (irq = %d) is a %s\n",</div><div class='ctx'> 	       port-&gt;dev ? port-&gt;dev-&gt;bus_id : "",</div><div class='ctx'> 	       port-&gt;dev ? ": " : "",</div><div class='del'>-	       drv-&gt;dev_name, port-&gt;line, address, port-&gt;irq, uart_type(port));</div><div class='add'>+	       drv-&gt;dev_name,</div><div class='add'>+	       drv-&gt;tty_driver-&gt;name_base + port-&gt;line,</div><div class='add'>+	       address, port-&gt;irq, uart_type(port));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='head'>diff --git a/drivers/serial/serial_cs.c b/drivers/serial/serial_cs.c<br/>index 164d2a42eb59..7546aa887fa7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/serial/serial_cs.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/serial/serial_cs.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/serial/serial_cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/serial/serial_cs.c</a></div><div class='hunk'>@@ -431,131 +431,103 @@ first_tuple(struct pcmcia_device *handle, tuple_t * tuple, cisparse_t * parse)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	i = pcmcia_get_first_tuple(handle, tuple);</div><div class='del'>-	if (i != CS_SUCCESS)</div><div class='del'>-		return CS_NO_MORE_ITEMS;</div><div class='del'>-	i = pcmcia_get_tuple_data(handle, tuple);</div><div class='del'>-	if (i != CS_SUCCESS)</div><div class='add'>+	if (i != 0)</div><div class='ctx'> 		return i;</div><div class='del'>-	return pcmcia_parse_tuple(handle, tuple, parse);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-next_tuple(struct pcmcia_device *handle, tuple_t * tuple, cisparse_t * parse)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	i = pcmcia_get_next_tuple(handle, tuple);</div><div class='del'>-	if (i != CS_SUCCESS)</div><div class='del'>-		return CS_NO_MORE_ITEMS;</div><div class='ctx'> 	i = pcmcia_get_tuple_data(handle, tuple);</div><div class='del'>-	if (i != CS_SUCCESS)</div><div class='add'>+	if (i != 0)</div><div class='ctx'> 		return i;</div><div class='del'>-	return pcmcia_parse_tuple(handle, tuple, parse);</div><div class='add'>+	return pcmcia_parse_tuple(tuple, parse);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*====================================================================*/</div><div class='ctx'> </div><div class='del'>-static int simple_config(struct pcmcia_device *link)</div><div class='add'>+static int simple_config_check(struct pcmcia_device *p_dev,</div><div class='add'>+			       cistpl_cftable_entry_t *cf,</div><div class='add'>+			       cistpl_cftable_entry_t *dflt,</div><div class='add'>+			       unsigned int vcc,</div><div class='add'>+			       void *priv_data)</div><div class='ctx'> {</div><div class='del'>-	static const unsigned int base[5] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8, 0x0 };</div><div class='ctx'> 	static const int size_table[2] = { 8, 16 };</div><div class='del'>-	struct serial_info *info = link-&gt;priv;</div><div class='del'>-	struct serial_cfg_mem *cfg_mem;</div><div class='del'>-	tuple_t *tuple;</div><div class='del'>-	u_char *buf;</div><div class='del'>-	cisparse_t *parse;</div><div class='del'>-	cistpl_cftable_entry_t *cf;</div><div class='del'>-	config_info_t config;</div><div class='del'>-	int i, j, try;</div><div class='del'>-	int s;</div><div class='add'>+	int *try = priv_data;</div><div class='add'>+</div><div class='add'>+	if (cf-&gt;vpp1.present &amp; (1 &lt;&lt; CISTPL_POWER_VNOM))</div><div class='add'>+		p_dev-&gt;conf.Vpp =</div><div class='add'>+			cf-&gt;vpp1.param[CISTPL_POWER_VNOM] / 10000;</div><div class='add'>+</div><div class='add'>+	if ((cf-&gt;io.nwin &gt; 0) &amp;&amp; (cf-&gt;io.win[0].len == size_table[(*try &gt;&gt; 1)])</div><div class='add'>+	    &amp;&amp; (cf-&gt;io.win[0].base != 0)) {</div><div class='add'>+		p_dev-&gt;io.BasePort1 = cf-&gt;io.win[0].base;</div><div class='add'>+		p_dev-&gt;io.IOAddrLines = ((*try &amp; 0x1) == 0) ?</div><div class='add'>+			16 : cf-&gt;io.flags &amp; CISTPL_IO_LINES_MASK;</div><div class='add'>+		if (!pcmcia_request_io(p_dev, &amp;p_dev-&gt;io))</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	cfg_mem = kmalloc(sizeof(struct serial_cfg_mem), GFP_KERNEL);</div><div class='del'>-	if (!cfg_mem)</div><div class='del'>-		return -1;</div><div class='add'>+static int simple_config_check_notpicky(struct pcmcia_device *p_dev,</div><div class='add'>+					cistpl_cftable_entry_t *cf,</div><div class='add'>+					cistpl_cftable_entry_t *dflt,</div><div class='add'>+					unsigned int vcc,</div><div class='add'>+					void *priv_data)</div><div class='add'>+{</div><div class='add'>+	static const unsigned int base[5] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8, 0x0 };</div><div class='add'>+	int j;</div><div class='add'>+</div><div class='add'>+	if ((cf-&gt;io.nwin &gt; 0) &amp;&amp; ((cf-&gt;io.flags &amp; CISTPL_IO_LINES_MASK) &lt;= 3)) {</div><div class='add'>+		for (j = 0; j &lt; 5; j++) {</div><div class='add'>+			p_dev-&gt;io.BasePort1 = base[j];</div><div class='add'>+			p_dev-&gt;io.IOAddrLines = base[j] ? 16 : 3;</div><div class='add'>+			if (!pcmcia_request_io(p_dev, &amp;p_dev-&gt;io))</div><div class='add'>+				return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	tuple = &amp;cfg_mem-&gt;tuple;</div><div class='del'>-	parse = &amp;cfg_mem-&gt;parse;</div><div class='del'>-	cf = &amp;parse-&gt;cftable_entry;</div><div class='del'>-	buf = cfg_mem-&gt;buf;</div><div class='add'>+static int simple_config(struct pcmcia_device *link)</div><div class='add'>+{</div><div class='add'>+	struct serial_info *info = link-&gt;priv;</div><div class='add'>+	int i = -ENODEV, try;</div><div class='ctx'> </div><div class='ctx'> 	/* If the card is already configured, look up the port and irq */</div><div class='del'>-	i = pcmcia_get_configuration_info(link, &amp;config);</div><div class='del'>-	if ((i == CS_SUCCESS) &amp;&amp; (config.Attributes &amp; CONF_VALID_CLIENT)) {</div><div class='add'>+	if (link-&gt;function_config) {</div><div class='ctx'> 		unsigned int port = 0;</div><div class='del'>-		if ((config.BasePort2 != 0) &amp;&amp; (config.NumPorts2 == 8)) {</div><div class='del'>-			port = config.BasePort2;</div><div class='add'>+		if ((link-&gt;io.BasePort2 != 0) &amp;&amp;</div><div class='add'>+		    (link-&gt;io.NumPorts2 == 8)) {</div><div class='add'>+			port = link-&gt;io.BasePort2;</div><div class='ctx'> 			info-&gt;slave = 1;</div><div class='ctx'> 		} else if ((info-&gt;manfid == MANFID_OSITECH) &amp;&amp;</div><div class='del'>-			   (config.NumPorts1 == 0x40)) {</div><div class='del'>-			port = config.BasePort1 + 0x28;</div><div class='add'>+			   (link-&gt;io.NumPorts1 == 0x40)) {</div><div class='add'>+			port = link-&gt;io.BasePort1 + 0x28;</div><div class='ctx'> 			info-&gt;slave = 1;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (info-&gt;slave) {</div><div class='del'>-			kfree(cfg_mem);</div><div class='del'>-			return setup_serial(link, info, port, config.AssignedIRQ);</div><div class='add'>+			return setup_serial(link, info, port,</div><div class='add'>+					    link-&gt;irq.AssignedIRQ);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* First pass: look for a config entry that looks normal. */</div><div class='del'>-	tuple-&gt;TupleData = (cisdata_t *) buf;</div><div class='del'>-	tuple-&gt;TupleOffset = 0;</div><div class='del'>-	tuple-&gt;TupleDataMax = 255;</div><div class='del'>-	tuple-&gt;Attributes = 0;</div><div class='del'>-	tuple-&gt;DesiredTuple = CISTPL_CFTABLE_ENTRY;</div><div class='del'>-	/* Two tries: without IO aliases, then with aliases */</div><div class='del'>-	for (s = 0; s &lt; 2; s++) {</div><div class='del'>-		for (try = 0; try &lt; 2; try++) {</div><div class='del'>-			i = first_tuple(link, tuple, parse);</div><div class='del'>-			while (i != CS_NO_MORE_ITEMS) {</div><div class='del'>-				if (i != CS_SUCCESS)</div><div class='del'>-					goto next_entry;</div><div class='del'>-				if (cf-&gt;vpp1.present &amp; (1 &lt;&lt; CISTPL_POWER_VNOM))</div><div class='del'>-					link-&gt;conf.Vpp =</div><div class='del'>-					    cf-&gt;vpp1.param[CISTPL_POWER_VNOM] / 10000;</div><div class='del'>-				if ((cf-&gt;io.nwin &gt; 0) &amp;&amp; (cf-&gt;io.win[0].len == size_table[s]) &amp;&amp;</div><div class='del'>-					    (cf-&gt;io.win[0].base != 0)) {</div><div class='del'>-					link-&gt;conf.ConfigIndex = cf-&gt;index;</div><div class='del'>-					link-&gt;io.BasePort1 = cf-&gt;io.win[0].base;</div><div class='del'>-					link-&gt;io.IOAddrLines = (try == 0) ?</div><div class='del'>-					    16 : cf-&gt;io.flags &amp; CISTPL_IO_LINES_MASK;</div><div class='del'>-					i = pcmcia_request_io(link, &amp;link-&gt;io);</div><div class='del'>-					if (i == CS_SUCCESS)</div><div class='del'>-						goto found_port;</div><div class='del'>-				}</div><div class='del'>-next_entry:</div><div class='del'>-				i = next_tuple(link, tuple, parse);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	/* First pass: look for a config entry that looks normal.</div><div class='add'>+	 * Two tries: without IO aliases, then with aliases */</div><div class='add'>+	for (try = 0; try &lt; 4; try++)</div><div class='add'>+		if (!pcmcia_loop_config(link, simple_config_check, &amp;try))</div><div class='add'>+			goto found_port;</div><div class='add'>+</div><div class='ctx'> 	/* Second pass: try to find an entry that isn't picky about</div><div class='ctx'> 	   its base address, then try to grab any standard serial port</div><div class='ctx'> 	   address, and finally try to get any free port. */</div><div class='del'>-	i = first_tuple(link, tuple, parse);</div><div class='del'>-	while (i != CS_NO_MORE_ITEMS) {</div><div class='del'>-		if ((i == CS_SUCCESS) &amp;&amp; (cf-&gt;io.nwin &gt; 0) &amp;&amp;</div><div class='del'>-		    ((cf-&gt;io.flags &amp; CISTPL_IO_LINES_MASK) &lt;= 3)) {</div><div class='del'>-			link-&gt;conf.ConfigIndex = cf-&gt;index;</div><div class='del'>-			for (j = 0; j &lt; 5; j++) {</div><div class='del'>-				link-&gt;io.BasePort1 = base[j];</div><div class='del'>-				link-&gt;io.IOAddrLines = base[j] ? 16 : 3;</div><div class='del'>-				i = pcmcia_request_io(link, &amp;link-&gt;io);</div><div class='del'>-				if (i == CS_SUCCESS)</div><div class='del'>-					goto found_port;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		i = next_tuple(link, tuple, parse);</div><div class='del'>-	}</div><div class='add'>+	if (!pcmcia_loop_config(link, simple_config_check_notpicky, NULL))</div><div class='add'>+		goto found_port;</div><div class='ctx'> </div><div class='del'>-      found_port:</div><div class='del'>-	if (i != CS_SUCCESS) {</div><div class='del'>-		printk(KERN_NOTICE</div><div class='del'>-		       "serial_cs: no usable port range found, giving up\n");</div><div class='del'>-		cs_error(link, RequestIO, i);</div><div class='del'>-		kfree(cfg_mem);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='add'>+	printk(KERN_NOTICE</div><div class='add'>+	       "serial_cs: no usable port range found, giving up\n");</div><div class='add'>+	cs_error(link, RequestIO, i);</div><div class='add'>+	return -1;</div><div class='ctx'> </div><div class='add'>+found_port:</div><div class='ctx'> 	i = pcmcia_request_irq(link, &amp;link-&gt;irq);</div><div class='del'>-	if (i != CS_SUCCESS) {</div><div class='add'>+	if (i != 0) {</div><div class='ctx'> 		cs_error(link, RequestIRQ, i);</div><div class='ctx'> 		link-&gt;irq.AssignedIRQ = 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -569,88 +541,76 @@ next_entry:</div><div class='ctx'> 		info-&gt;quirk-&gt;config(link);</div><div class='ctx'> </div><div class='ctx'> 	i = pcmcia_request_configuration(link, &amp;link-&gt;conf);</div><div class='del'>-	if (i != CS_SUCCESS) {</div><div class='add'>+	if (i != 0) {</div><div class='ctx'> 		cs_error(link, RequestConfiguration, i);</div><div class='del'>-		kfree(cfg_mem);</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='del'>-	kfree(cfg_mem);</div><div class='ctx'> 	return setup_serial(link, info, link-&gt;io.BasePort1, link-&gt;irq.AssignedIRQ);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int multi_config(struct pcmcia_device * link)</div><div class='add'>+static int multi_config_check(struct pcmcia_device *p_dev,</div><div class='add'>+			      cistpl_cftable_entry_t *cf,</div><div class='add'>+			      cistpl_cftable_entry_t *dflt,</div><div class='add'>+			      unsigned int vcc,</div><div class='add'>+			      void *priv_data)</div><div class='ctx'> {</div><div class='del'>-	struct serial_info *info = link-&gt;priv;</div><div class='del'>-	struct serial_cfg_mem *cfg_mem;</div><div class='del'>-	tuple_t *tuple;</div><div class='del'>-	u_char *buf;</div><div class='del'>-	cisparse_t *parse;</div><div class='del'>-	cistpl_cftable_entry_t *cf;</div><div class='del'>-	int i, rc, base2 = 0;</div><div class='add'>+	int *base2 = priv_data;</div><div class='add'>+</div><div class='add'>+	/* The quad port cards have bad CIS's, so just look for a</div><div class='add'>+	   window larger than 8 ports and assume it will be right */</div><div class='add'>+	if ((cf-&gt;io.nwin == 1) &amp;&amp; (cf-&gt;io.win[0].len &gt; 8)) {</div><div class='add'>+		p_dev-&gt;io.BasePort1 = cf-&gt;io.win[0].base;</div><div class='add'>+		p_dev-&gt;io.IOAddrLines = cf-&gt;io.flags &amp; CISTPL_IO_LINES_MASK;</div><div class='add'>+		if (!pcmcia_request_io(p_dev, &amp;p_dev-&gt;io)) {</div><div class='add'>+			*base2 = p_dev-&gt;io.BasePort1 + 8;</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	cfg_mem = kmalloc(sizeof(struct serial_cfg_mem), GFP_KERNEL);</div><div class='del'>-	if (!cfg_mem)</div><div class='del'>-		return -1;</div><div class='del'>-	tuple = &amp;cfg_mem-&gt;tuple;</div><div class='del'>-	parse = &amp;cfg_mem-&gt;parse;</div><div class='del'>-	cf = &amp;parse-&gt;cftable_entry;</div><div class='del'>-	buf = cfg_mem-&gt;buf;</div><div class='add'>+static int multi_config_check_notpicky(struct pcmcia_device *p_dev,</div><div class='add'>+				       cistpl_cftable_entry_t *cf,</div><div class='add'>+				       cistpl_cftable_entry_t *dflt,</div><div class='add'>+				       unsigned int vcc,</div><div class='add'>+				       void *priv_data)</div><div class='add'>+{</div><div class='add'>+	int *base2 = priv_data;</div><div class='add'>+</div><div class='add'>+	if (cf-&gt;io.nwin == 2) {</div><div class='add'>+		p_dev-&gt;io.BasePort1 = cf-&gt;io.win[0].base;</div><div class='add'>+		p_dev-&gt;io.BasePort2 = cf-&gt;io.win[1].base;</div><div class='add'>+		p_dev-&gt;io.IOAddrLines = cf-&gt;io.flags &amp; CISTPL_IO_LINES_MASK;</div><div class='add'>+		if (!pcmcia_request_io(p_dev, &amp;p_dev-&gt;io)) {</div><div class='add'>+			*base2 = p_dev-&gt;io.BasePort2;</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	tuple-&gt;TupleData = (cisdata_t *) buf;</div><div class='del'>-	tuple-&gt;TupleOffset = 0;</div><div class='del'>-	tuple-&gt;TupleDataMax = 255;</div><div class='del'>-	tuple-&gt;Attributes = 0;</div><div class='del'>-	tuple-&gt;DesiredTuple = CISTPL_CFTABLE_ENTRY;</div><div class='add'>+static int multi_config(struct pcmcia_device *link)</div><div class='add'>+{</div><div class='add'>+	struct serial_info *info = link-&gt;priv;</div><div class='add'>+	int i, base2 = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* First, look for a generic full-sized window */</div><div class='ctx'> 	link-&gt;io.NumPorts1 = info-&gt;multi * 8;</div><div class='del'>-	i = first_tuple(link, tuple, parse);</div><div class='del'>-	while (i != CS_NO_MORE_ITEMS) {</div><div class='del'>-		/* The quad port cards have bad CIS's, so just look for a</div><div class='del'>-		   window larger than 8 ports and assume it will be right */</div><div class='del'>-		if ((i == CS_SUCCESS) &amp;&amp; (cf-&gt;io.nwin == 1) &amp;&amp;</div><div class='del'>-		    (cf-&gt;io.win[0].len &gt; 8)) {</div><div class='del'>-			link-&gt;conf.ConfigIndex = cf-&gt;index;</div><div class='del'>-			link-&gt;io.BasePort1 = cf-&gt;io.win[0].base;</div><div class='del'>-			link-&gt;io.IOAddrLines =</div><div class='del'>-			    cf-&gt;io.flags &amp; CISTPL_IO_LINES_MASK;</div><div class='del'>-			i = pcmcia_request_io(link, &amp;link-&gt;io);</div><div class='del'>-			base2 = link-&gt;io.BasePort1 + 8;</div><div class='del'>-			if (i == CS_SUCCESS)</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-		i = next_tuple(link, tuple, parse);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If that didn't work, look for two windows */</div><div class='del'>-	if (i != CS_SUCCESS) {</div><div class='add'>+	if (pcmcia_loop_config(link, multi_config_check, &amp;base2)) {</div><div class='add'>+		/* If that didn't work, look for two windows */</div><div class='ctx'> 		link-&gt;io.NumPorts1 = link-&gt;io.NumPorts2 = 8;</div><div class='ctx'> 		info-&gt;multi = 2;</div><div class='del'>-		i = first_tuple(link, tuple, parse);</div><div class='del'>-		while (i != CS_NO_MORE_ITEMS) {</div><div class='del'>-			if ((i == CS_SUCCESS) &amp;&amp; (cf-&gt;io.nwin == 2)) {</div><div class='del'>-				link-&gt;conf.ConfigIndex = cf-&gt;index;</div><div class='del'>-				link-&gt;io.BasePort1 = cf-&gt;io.win[0].base;</div><div class='del'>-				link-&gt;io.BasePort2 = cf-&gt;io.win[1].base;</div><div class='del'>-				link-&gt;io.IOAddrLines =</div><div class='del'>-				    cf-&gt;io.flags &amp; CISTPL_IO_LINES_MASK;</div><div class='del'>-				i = pcmcia_request_io(link, &amp;link-&gt;io);</div><div class='del'>-				base2 = link-&gt;io.BasePort2;</div><div class='del'>-				if (i == CS_SUCCESS)</div><div class='del'>-					break;</div><div class='del'>-			}</div><div class='del'>-			i = next_tuple(link, tuple, parse);</div><div class='add'>+		if (pcmcia_loop_config(link, multi_config_check_notpicky,</div><div class='add'>+				       &amp;base2)) {</div><div class='add'>+			printk(KERN_NOTICE "serial_cs: no usable port range"</div><div class='add'>+			       "found, giving up\n");</div><div class='add'>+			return -ENODEV;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (i != CS_SUCCESS) {</div><div class='del'>-		cs_error(link, RequestIO, i);</div><div class='del'>-		rc = -1;</div><div class='del'>-		goto free_cfg_mem;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	i = pcmcia_request_irq(link, &amp;link-&gt;irq);</div><div class='del'>-	if (i != CS_SUCCESS) {</div><div class='add'>+	if (i != 0) {</div><div class='add'>+		/* FIXME: comment does not fit, error handling does not fit */</div><div class='ctx'> 		printk(KERN_NOTICE</div><div class='ctx'> 		       "serial_cs: no usable port range found, giving up\n");</div><div class='ctx'> 		cs_error(link, RequestIRQ, i);</div><div class='hunk'>@@ -664,10 +624,9 @@ static int multi_config(struct pcmcia_device * link)</div><div class='ctx'> 		info-&gt;quirk-&gt;config(link);</div><div class='ctx'> </div><div class='ctx'> 	i = pcmcia_request_configuration(link, &amp;link-&gt;conf);</div><div class='del'>-	if (i != CS_SUCCESS) {</div><div class='add'>+	if (i != 0) {</div><div class='ctx'> 		cs_error(link, RequestConfiguration, i);</div><div class='del'>-		rc = -1;</div><div class='del'>-		goto free_cfg_mem;</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* The Oxford Semiconductor OXCF950 cards are in fact single-port:</div><div class='hunk'>@@ -678,7 +637,8 @@ static int multi_config(struct pcmcia_device * link)</div><div class='ctx'> 				info-&gt;prodid == PRODID_POSSIO_GCC)) {</div><div class='ctx'> 		int err;</div><div class='ctx'> </div><div class='del'>-		if (cf-&gt;index == 1 || cf-&gt;index == 3) {</div><div class='add'>+		if (link-&gt;conf.ConfigIndex == 1 ||</div><div class='add'>+		    link-&gt;conf.ConfigIndex == 3) {</div><div class='ctx'> 			err = setup_serial(link, info, base2,</div><div class='ctx'> 					link-&gt;irq.AssignedIRQ);</div><div class='ctx'> 			base2 = link-&gt;io.BasePort1;</div><div class='hunk'>@@ -695,18 +655,14 @@ static int multi_config(struct pcmcia_device * link)</div><div class='ctx'> 		if (info-&gt;quirk &amp;&amp; info-&gt;quirk-&gt;wakeup)</div><div class='ctx'> 			info-&gt;quirk-&gt;wakeup(link);</div><div class='ctx'> </div><div class='del'>-		rc = 0;</div><div class='del'>-		goto free_cfg_mem;</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	setup_serial(link, info, link-&gt;io.BasePort1, link-&gt;irq.AssignedIRQ);</div><div class='ctx'> 	for (i = 0; i &lt; info-&gt;multi - 1; i++)</div><div class='ctx'> 		setup_serial(link, info, base2 + (8 * i),</div><div class='ctx'> 				link-&gt;irq.AssignedIRQ);</div><div class='del'>-	rc = 0;</div><div class='del'>-free_cfg_mem:</div><div class='del'>-	kfree(cfg_mem);</div><div class='del'>-	return rc;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*======================================================================</div><div class='hunk'>@@ -746,7 +702,7 @@ static int serial_config(struct pcmcia_device * link)</div><div class='ctx'> 	/* Is this a compliant multifunction card? */</div><div class='ctx'> 	tuple-&gt;DesiredTuple = CISTPL_LONGLINK_MFC;</div><div class='ctx'> 	tuple-&gt;Attributes = TUPLE_RETURN_COMMON | TUPLE_RETURN_LINK;</div><div class='del'>-	info-&gt;multi = (first_tuple(link, tuple, parse) == CS_SUCCESS);</div><div class='add'>+	info-&gt;multi = (first_tuple(link, tuple, parse) == 0);</div><div class='ctx'> </div><div class='ctx'> 	/* Is this a multiport card? */</div><div class='ctx'> 	tuple-&gt;DesiredTuple = CISTPL_MANFID;</div><div class='hunk'>@@ -770,7 +726,7 @@ static int serial_config(struct pcmcia_device * link)</div><div class='ctx'> 	    ((link-&gt;func_id == CISTPL_FUNCID_MULTI) ||</div><div class='ctx'> 	     (link-&gt;func_id == CISTPL_FUNCID_SERIAL))) {</div><div class='ctx'> 		tuple-&gt;DesiredTuple = CISTPL_CFTABLE_ENTRY;</div><div class='del'>-		if (first_tuple(link, tuple, parse) == CS_SUCCESS) {</div><div class='add'>+		if (first_tuple(link, tuple, parse) == 0) {</div><div class='ctx'> 			if ((cf-&gt;io.nwin == 1) &amp;&amp; (cf-&gt;io.win[0].len % 8 == 0))</div><div class='ctx'> 				info-&gt;multi = cf-&gt;io.win[0].len &gt;&gt; 3;</div><div class='ctx'> 			if ((cf-&gt;io.nwin == 2) &amp;&amp; (cf-&gt;io.win[0].len == 8) &amp;&amp;</div><div class='head'>diff --git a/drivers/serial/serial_ks8695.c b/drivers/serial/serial_ks8695.c<br/>index b9cbfc87f616..998e89dc5aaf 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/serial/serial_ks8695.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/serial/serial_ks8695.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/serial/serial_ks8695.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/serial/serial_ks8695.c</a></div><div class='hunk'>@@ -63,8 +63,44 @@</div><div class='ctx'> #define UART_DUMMY_LSR_RX	0x100</div><div class='ctx'> #define UART_PORT_SIZE		(KS8695_USR - KS8695_URRB + 4)</div><div class='ctx'> </div><div class='del'>-#define tx_enabled(port) ((port)-&gt;unused[0])</div><div class='del'>-#define rx_enabled(port) ((port)-&gt;unused[1])</div><div class='add'>+static inline int tx_enabled(struct uart_port *port)</div><div class='add'>+{</div><div class='add'>+	return port-&gt;unused[0] &amp; 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int rx_enabled(struct uart_port *port)</div><div class='add'>+{</div><div class='add'>+	return port-&gt;unused[0] &amp; 2;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int ms_enabled(struct uart_port *port)</div><div class='add'>+{</div><div class='add'>+	return port-&gt;unused[0] &amp; 4;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void ms_enable(struct uart_port *port, int enabled)</div><div class='add'>+{</div><div class='add'>+	if(enabled)</div><div class='add'>+		port-&gt;unused[0] |= 4;</div><div class='add'>+	else</div><div class='add'>+		port-&gt;unused[0] &amp;= ~4;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void rx_enable(struct uart_port *port, int enabled)</div><div class='add'>+{</div><div class='add'>+	if(enabled)</div><div class='add'>+		port-&gt;unused[0] |= 2;</div><div class='add'>+	else</div><div class='add'>+		port-&gt;unused[0] &amp;= ~2;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void tx_enable(struct uart_port *port, int enabled)</div><div class='add'>+{</div><div class='add'>+	if(enabled)</div><div class='add'>+		port-&gt;unused[0] |= 1;</div><div class='add'>+	else</div><div class='add'>+		port-&gt;unused[0] &amp;= ~1;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #ifdef SUPPORT_SYSRQ</div><div class='hunk'>@@ -75,7 +111,7 @@ static void ks8695uart_stop_tx(struct uart_port *port)</div><div class='ctx'> {</div><div class='ctx'> 	if (tx_enabled(port)) {</div><div class='ctx'> 		disable_irq(KS8695_IRQ_UART_TX);</div><div class='del'>-		tx_enabled(port) = 0;</div><div class='add'>+		tx_enable(port, 0);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -83,7 +119,7 @@ static void ks8695uart_start_tx(struct uart_port *port)</div><div class='ctx'> {</div><div class='ctx'> 	if (!tx_enabled(port)) {</div><div class='ctx'> 		enable_irq(KS8695_IRQ_UART_TX);</div><div class='del'>-		tx_enabled(port) = 1;</div><div class='add'>+		tx_enable(port, 1);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -91,18 +127,24 @@ static void ks8695uart_stop_rx(struct uart_port *port)</div><div class='ctx'> {</div><div class='ctx'> 	if (rx_enabled(port)) {</div><div class='ctx'> 		disable_irq(KS8695_IRQ_UART_RX);</div><div class='del'>-		rx_enabled(port) = 0;</div><div class='add'>+		rx_enable(port, 0);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ks8695uart_enable_ms(struct uart_port *port)</div><div class='ctx'> {</div><div class='del'>-	enable_irq(KS8695_IRQ_UART_MODEM_STATUS);</div><div class='add'>+	if (!ms_enabled(port)) {</div><div class='add'>+		enable_irq(KS8695_IRQ_UART_MODEM_STATUS);</div><div class='add'>+		ms_enable(port,1);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ks8695uart_disable_ms(struct uart_port *port)</div><div class='ctx'> {</div><div class='del'>-	disable_irq(KS8695_IRQ_UART_MODEM_STATUS);</div><div class='add'>+	if (ms_enabled(port)) {</div><div class='add'>+		disable_irq(KS8695_IRQ_UART_MODEM_STATUS);</div><div class='add'>+		ms_enable(port,0);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static irqreturn_t ks8695uart_rx_chars(int irq, void *dev_id)</div><div class='hunk'>@@ -285,8 +327,9 @@ static int ks8695uart_startup(struct uart_port *port)</div><div class='ctx'> 	int retval;</div><div class='ctx'> </div><div class='ctx'> 	set_irq_flags(KS8695_IRQ_UART_TX, IRQF_VALID | IRQF_NOAUTOEN);</div><div class='del'>-	tx_enabled(port) = 0;</div><div class='del'>-	rx_enabled(port) = 1;</div><div class='add'>+	tx_enable(port, 0);</div><div class='add'>+	rx_enable(port, 1);</div><div class='add'>+	ms_enable(port, 1);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Allocate the IRQ</div><div class='head'>diff --git a/drivers/serial/sunhv.c b/drivers/serial/sunhv.c<br/>index e41766d08035..a94a2ab4b571 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/serial/sunhv.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/serial/sunhv.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/serial/sunhv.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/serial/sunhv.c</a></div><div class='hunk'>@@ -616,7 +616,7 @@ static int __devexit hv_remove(struct of_device *dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct of_device_id hv_match[] = {</div><div class='add'>+static const struct of_device_id hv_match[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.name = "console",</div><div class='ctx'> 		.compatible = "qcn",</div><div class='head'>diff --git a/drivers/serial/sunsab.c b/drivers/serial/sunsab.c<br/>index 29b4458abf74..0355efe115d9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/serial/sunsab.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/serial/sunsab.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/serial/sunsab.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/serial/sunsab.c</a></div><div class='hunk'>@@ -1078,7 +1078,7 @@ static int __devexit sab_remove(struct of_device *op)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct of_device_id sab_match[] = {</div><div class='add'>+static const struct of_device_id sab_match[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.name = "se",</div><div class='ctx'> 	},</div><div class='head'>diff --git a/drivers/serial/sunsu.c b/drivers/serial/sunsu.c<br/>index a378464f9292..a4dc79b1d7ab 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/serial/sunsu.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/serial/sunsu.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/serial/sunsu.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/serial/sunsu.c</a></div><div class='hunk'>@@ -1506,7 +1506,7 @@ static int __devexit su_remove(struct of_device *op)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct of_device_id su_match[] = {</div><div class='add'>+static const struct of_device_id su_match[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.name = "su",</div><div class='ctx'> 	},</div><div class='head'>diff --git a/drivers/serial/sunzilog.c b/drivers/serial/sunzilog.c<br/>index 3cb4c8aee13f..45a299f35617 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/serial/sunzilog.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/serial/sunzilog.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/serial/sunzilog.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/serial/sunzilog.c</a></div><div class='hunk'>@@ -1480,7 +1480,7 @@ static int __devexit zs_remove(struct of_device *op)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct of_device_id zs_match[] = {</div><div class='add'>+static const struct of_device_id zs_match[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.name = "zs",</div><div class='ctx'> 	},</div><div class='head'>diff --git a/drivers/serial/ucc_uart.c b/drivers/serial/ucc_uart.c<br/>index 5c5d18dcb6ac..539c933b335f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/serial/ucc_uart.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/serial/ucc_uart.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/serial/ucc_uart.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/serial/ucc_uart.c</a></div><div class='hunk'>@@ -1009,7 +1009,7 @@ static int qe_uart_request_port(struct uart_port *port)</div><div class='ctx'> 	rx_size = L1_CACHE_ALIGN(qe_port-&gt;rx_nrfifos * qe_port-&gt;rx_fifosize);</div><div class='ctx'> 	tx_size = L1_CACHE_ALIGN(qe_port-&gt;tx_nrfifos * qe_port-&gt;tx_fifosize);</div><div class='ctx'> </div><div class='del'>-	bd_virt = dma_alloc_coherent(NULL, rx_size + tx_size, &amp;bd_dma_addr,</div><div class='add'>+	bd_virt = dma_alloc_coherent(port-&gt;dev, rx_size + tx_size, &amp;bd_dma_addr,</div><div class='ctx'> 		GFP_KERNEL);</div><div class='ctx'> 	if (!bd_virt) {</div><div class='ctx'> 		dev_err(port-&gt;dev, "could not allocate buffer descriptors\n");</div><div class='hunk'>@@ -1051,7 +1051,7 @@ static void qe_uart_release_port(struct uart_port *port)</div><div class='ctx'> 		container_of(port, struct uart_qe_port, port);</div><div class='ctx'> 	struct ucc_slow_private *uccs = qe_port-&gt;us_private;</div><div class='ctx'> </div><div class='del'>-	dma_free_coherent(NULL, qe_port-&gt;bd_size, qe_port-&gt;bd_virt,</div><div class='add'>+	dma_free_coherent(port-&gt;dev, qe_port-&gt;bd_size, qe_port-&gt;bd_virt,</div><div class='ctx'> 			  qe_port-&gt;bd_dma_addr);</div><div class='ctx'> </div><div class='ctx'> 	ucc_slow_free(uccs);</div><div class='head'>diff --git a/drivers/spi/mpc52xx_psc_spi.c b/drivers/spi/mpc52xx_psc_spi.c<br/>index 25eda71f4bf4..0debe11b67b4 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/spi/mpc52xx_psc_spi.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/spi/mpc52xx_psc_spi.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/spi/mpc52xx_psc_spi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/spi/mpc52xx_psc_spi.c</a></div><div class='hunk'>@@ -15,13 +15,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_PPC_MERGE)</div><div class='ctx'> #include &lt;linux/of_platform.h&gt;</div><div class='del'>-#else</div><div class='del'>-#include &lt;linux/platform_device.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='ctx'> #include &lt;linux/completion.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='hunk'>@@ -108,13 +102,13 @@ static void mpc52xx_psc_spi_activate_cs(struct spi_device *spi)</div><div class='ctx'> 	 * Because psc-&gt;ccr is defined as 16bit register instead of 32bit</div><div class='ctx'> 	 * just set the lower byte of BitClkDiv</div><div class='ctx'> 	 */</div><div class='del'>-	ccr = in_be16(&amp;psc-&gt;ccr);</div><div class='add'>+	ccr = in_be16((u16 __iomem *)&amp;psc-&gt;ccr);</div><div class='ctx'> 	ccr &amp;= 0xFF00;</div><div class='ctx'> 	if (cs-&gt;speed_hz)</div><div class='ctx'> 		ccr |= (MCLK / cs-&gt;speed_hz - 1) &amp; 0xFF;</div><div class='ctx'> 	else /* by default SPI Clk 1MHz */</div><div class='ctx'> 		ccr |= (MCLK / 1000000 - 1) &amp; 0xFF;</div><div class='del'>-	out_be16(&amp;psc-&gt;ccr, ccr);</div><div class='add'>+	out_be16((u16 __iomem *)&amp;psc-&gt;ccr, ccr);</div><div class='ctx'> 	mps-&gt;bits_per_word = cs-&gt;bits_per_word;</div><div class='ctx'> </div><div class='ctx'> 	if (mps-&gt;activate_cs)</div><div class='hunk'>@@ -347,7 +341,7 @@ static int mpc52xx_psc_spi_port_config(int psc_id, struct mpc52xx_psc_spi *mps)</div><div class='ctx'> 	/* Configure 8bit codec mode as a SPI master and use EOF flags */</div><div class='ctx'> 	/* SICR_SIM_CODEC8|SICR_GENCLK|SICR_SPI|SICR_MSTR|SICR_USEEOF */</div><div class='ctx'> 	out_be32(&amp;psc-&gt;sicr, 0x0180C800);</div><div class='del'>-	out_be16(&amp;psc-&gt;ccr, 0x070F); /* by default SPI Clk 1MHz */</div><div class='add'>+	out_be16((u16 __iomem *)&amp;psc-&gt;ccr, 0x070F); /* default SPI Clk 1MHz */</div><div class='ctx'> </div><div class='ctx'> 	/* Set 2ms DTL delay */</div><div class='ctx'> 	out_8(&amp;psc-&gt;ctur, 0x00);</div><div class='hunk'>@@ -471,53 +465,6 @@ static int __exit mpc52xx_psc_spi_do_remove(struct device *dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#if !defined(CONFIG_PPC_MERGE)</div><div class='del'>-static int __init mpc52xx_psc_spi_probe(struct platform_device *dev)</div><div class='del'>-{</div><div class='del'>-	switch(dev-&gt;id) {</div><div class='del'>-	case 1:</div><div class='del'>-	case 2:</div><div class='del'>-	case 3:</div><div class='del'>-	case 6:</div><div class='del'>-		return mpc52xx_psc_spi_do_probe(&amp;dev-&gt;dev,</div><div class='del'>-			MPC52xx_PA(MPC52xx_PSCx_OFFSET(dev-&gt;id)),</div><div class='del'>-			MPC52xx_PSC_SIZE, platform_get_irq(dev, 0), dev-&gt;id);</div><div class='del'>-	default:</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __exit mpc52xx_psc_spi_remove(struct platform_device *dev)</div><div class='del'>-{</div><div class='del'>-	return mpc52xx_psc_spi_do_remove(&amp;dev-&gt;dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* work with hotplug and coldplug */</div><div class='del'>-MODULE_ALIAS("platform:mpc52xx-psc-spi");</div><div class='del'>-</div><div class='del'>-static struct platform_driver mpc52xx_psc_spi_platform_driver = {</div><div class='del'>-	.remove = __exit_p(mpc52xx_psc_spi_remove),</div><div class='del'>-	.driver = {</div><div class='del'>-		.name = "mpc52xx-psc-spi",</div><div class='del'>-		.owner = THIS_MODULE,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init mpc52xx_psc_spi_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_probe(&amp;mpc52xx_psc_spi_platform_driver,</div><div class='del'>-			mpc52xx_psc_spi_probe);</div><div class='del'>-}</div><div class='del'>-module_init(mpc52xx_psc_spi_init);</div><div class='del'>-</div><div class='del'>-static void __exit mpc52xx_psc_spi_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;mpc52xx_psc_spi_platform_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(mpc52xx_psc_spi_exit);</div><div class='del'>-</div><div class='del'>-#else	/* defined(CONFIG_PPC_MERGE) */</div><div class='del'>-</div><div class='ctx'> static int __init mpc52xx_psc_spi_of_probe(struct of_device *op,</div><div class='ctx'> 	const struct of_device_id *match)</div><div class='ctx'> {</div><div class='hunk'>@@ -586,8 +533,6 @@ static void __exit mpc52xx_psc_spi_exit(void)</div><div class='ctx'> }</div><div class='ctx'> module_exit(mpc52xx_psc_spi_exit);</div><div class='ctx'> </div><div class='del'>-#endif	/* defined(CONFIG_PPC_MERGE) */</div><div class='del'>-</div><div class='ctx'> MODULE_AUTHOR("Dragos Carp");</div><div class='ctx'> MODULE_DESCRIPTION("MPC52xx PSC SPI Driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/spi/omap2_mcspi.c b/drivers/spi/omap2_mcspi.c<br/>index 9d2186fd74aa..454a2712e629 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/spi/omap2_mcspi.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/spi/omap2_mcspi.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/spi/omap2_mcspi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/spi/omap2_mcspi.c</a></div><div class='hunk'>@@ -119,12 +119,14 @@ struct omap2_mcspi {</div><div class='ctx'> 	struct clk		*fck;</div><div class='ctx'> 	/* Virtual base address of the controller */</div><div class='ctx'> 	void __iomem		*base;</div><div class='add'>+	unsigned long		phys;</div><div class='ctx'> 	/* SPI1 has 4 channels, while SPI2 has 2 */</div><div class='ctx'> 	struct omap2_mcspi_dma	*dma_channels;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct omap2_mcspi_cs {</div><div class='ctx'> 	void __iomem		*base;</div><div class='add'>+	unsigned long		phys;</div><div class='ctx'> 	int			word_len;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -233,7 +235,7 @@ omap2_mcspi_txrx_dma(struct spi_device *spi, struct spi_transfer *xfer)</div><div class='ctx'> 	c = count;</div><div class='ctx'> 	word_len = cs-&gt;word_len;</div><div class='ctx'> </div><div class='del'>-	base = (unsigned long) io_v2p(cs-&gt;base);</div><div class='add'>+	base = cs-&gt;phys;</div><div class='ctx'> 	tx_reg = base + OMAP2_MCSPI_TX0;</div><div class='ctx'> 	rx_reg = base + OMAP2_MCSPI_RX0;</div><div class='ctx'> 	rx = xfer-&gt;rx_buf;</div><div class='hunk'>@@ -633,6 +635,7 @@ static int omap2_mcspi_setup(struct spi_device *spi)</div><div class='ctx'> 		if (!cs)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		cs-&gt;base = mcspi-&gt;base + spi-&gt;chip_select * 0x14;</div><div class='add'>+		cs-&gt;phys = mcspi-&gt;phys + spi-&gt;chip_select * 0x14;</div><div class='ctx'> 		spi-&gt;controller_state = cs;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1005,7 +1008,13 @@ static int __init omap2_mcspi_probe(struct platform_device *pdev)</div><div class='ctx'> 		goto err1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mcspi-&gt;base = (void __iomem *) io_p2v(r-&gt;start);</div><div class='add'>+	mcspi-&gt;phys = r-&gt;start;</div><div class='add'>+	mcspi-&gt;base = ioremap(r-&gt;start, r-&gt;end - r-&gt;start + 1);</div><div class='add'>+	if (!mcspi-&gt;base) {</div><div class='add'>+		dev_dbg(&amp;pdev-&gt;dev, "can't ioremap MCSPI\n");</div><div class='add'>+		status = -ENOMEM;</div><div class='add'>+		goto err1aa;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	INIT_WORK(&amp;mcspi-&gt;work, omap2_mcspi_work);</div><div class='ctx'> </div><div class='hunk'>@@ -1055,6 +1064,8 @@ err3:</div><div class='ctx'> err2:</div><div class='ctx'> 	clk_put(mcspi-&gt;ick);</div><div class='ctx'> err1a:</div><div class='add'>+	iounmap(mcspi-&gt;base);</div><div class='add'>+err1aa:</div><div class='ctx'> 	release_mem_region(r-&gt;start, (r-&gt;end - r-&gt;start) + 1);</div><div class='ctx'> err1:</div><div class='ctx'> 	spi_master_put(master);</div><div class='hunk'>@@ -1067,6 +1078,7 @@ static int __exit omap2_mcspi_remove(struct platform_device *pdev)</div><div class='ctx'> 	struct omap2_mcspi	*mcspi;</div><div class='ctx'> 	struct omap2_mcspi_dma	*dma_channels;</div><div class='ctx'> 	struct resource		*r;</div><div class='add'>+	void __iomem *base;</div><div class='ctx'> </div><div class='ctx'> 	master = dev_get_drvdata(&amp;pdev-&gt;dev);</div><div class='ctx'> 	mcspi = spi_master_get_devdata(master);</div><div class='hunk'>@@ -1078,7 +1090,9 @@ static int __exit omap2_mcspi_remove(struct platform_device *pdev)</div><div class='ctx'> 	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='ctx'> 	release_mem_region(r-&gt;start, (r-&gt;end - r-&gt;start) + 1);</div><div class='ctx'> </div><div class='add'>+	base = mcspi-&gt;base;</div><div class='ctx'> 	spi_unregister_master(master);</div><div class='add'>+	iounmap(base);</div><div class='ctx'> 	kfree(dma_channels);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/spi/omap_uwire.c b/drivers/spi/omap_uwire.c<br/>index 5515eb97d7c5..bab6ff061e91 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/spi/omap_uwire.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/spi/omap_uwire.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/spi/omap_uwire.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/spi/omap_uwire.c</a></div><div class='hunk'>@@ -59,7 +59,6 @@</div><div class='ctx'>  * and irqs should show there too...</div><div class='ctx'>  */</div><div class='ctx'> #define UWIRE_BASE_PHYS		0xFFFB3000</div><div class='del'>-#define UWIRE_BASE		((void *__iomem)IO_ADDRESS(UWIRE_BASE_PHYS))</div><div class='ctx'> </div><div class='ctx'> /* uWire Registers: */</div><div class='ctx'> #define UWIRE_IO_SIZE 0x20</div><div class='hunk'>@@ -103,16 +102,21 @@ struct uwire_state {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* REVISIT compile time constant for idx_shift? */</div><div class='add'>+/*</div><div class='add'>+ * Or, put it in a structure which is used throughout the driver;</div><div class='add'>+ * that avoids having to issue two loads for each bit of static data.</div><div class='add'>+ */</div><div class='ctx'> static unsigned int uwire_idx_shift;</div><div class='add'>+static void __iomem *uwire_base;</div><div class='ctx'> </div><div class='ctx'> static inline void uwire_write_reg(int idx, u16 val)</div><div class='ctx'> {</div><div class='del'>-	__raw_writew(val, UWIRE_BASE + (idx &lt;&lt; uwire_idx_shift));</div><div class='add'>+	__raw_writew(val, uwire_base + (idx &lt;&lt; uwire_idx_shift));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline u16 uwire_read_reg(int idx)</div><div class='ctx'> {</div><div class='del'>-	return __raw_readw(UWIRE_BASE + (idx &lt;&lt; uwire_idx_shift));</div><div class='add'>+	return __raw_readw(uwire_base + (idx &lt;&lt; uwire_idx_shift));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void omap_uwire_configure_mode(u8 cs, unsigned long flags)</div><div class='hunk'>@@ -492,6 +496,14 @@ static int __init uwire_probe(struct platform_device *pdev)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	uwire = spi_master_get_devdata(master);</div><div class='add'>+</div><div class='add'>+	uwire_base = ioremap(UWIRE_BASE_PHYS, UWIRE_IO_SIZE);</div><div class='add'>+	if (!uwire_base) {</div><div class='add'>+		dev_dbg(&amp;pdev-&gt;dev, "can't ioremap UWIRE\n");</div><div class='add'>+		spi_master_put(master);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	dev_set_drvdata(&amp;pdev-&gt;dev, uwire);</div><div class='ctx'> </div><div class='ctx'> 	uwire-&gt;ck = clk_get(&amp;pdev-&gt;dev, "armxor_ck");</div><div class='hunk'>@@ -520,8 +532,10 @@ static int __init uwire_probe(struct platform_device *pdev)</div><div class='ctx'> 	uwire-&gt;bitbang.txrx_bufs = uwire_txrx;</div><div class='ctx'> </div><div class='ctx'> 	status = spi_bitbang_start(&amp;uwire-&gt;bitbang);</div><div class='del'>-	if (status &lt; 0)</div><div class='add'>+	if (status &lt; 0) {</div><div class='ctx'> 		uwire_off(uwire);</div><div class='add'>+		iounmap(uwire_base);</div><div class='add'>+	}</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -534,6 +548,7 @@ static int __exit uwire_remove(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	status = spi_bitbang_stop(&amp;uwire-&gt;bitbang);</div><div class='ctx'> 	uwire_off(uwire);</div><div class='add'>+	iounmap(uwire_base);</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/spi/orion_spi.c b/drivers/spi/orion_spi.c<br/>index b872bfaf4bd2..014becb7d530 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/spi/orion_spi.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/spi/orion_spi.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/spi/orion_spi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/spi/orion_spi.c</a></div><div class='hunk'>@@ -364,6 +364,11 @@ static int orion_spi_setup(struct spi_device *spi)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Fix ac timing if required.   */</div><div class='add'>+	if (orion_spi-&gt;spi_info-&gt;enable_clock_fix)</div><div class='add'>+		orion_spi_setbits(orion_spi, ORION_SPI_IF_CONFIG_REG,</div><div class='add'>+				  (1 &lt;&lt; 14));</div><div class='add'>+</div><div class='ctx'> 	if (spi-&gt;bits_per_word == 0)</div><div class='ctx'> 		spi-&gt;bits_per_word = 8;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/spi/pxa2xx_spi.c b/drivers/spi/pxa2xx_spi.c<br/>index d47d3636227f..dae87b1a4c6e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/spi/pxa2xx_spi.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/spi/pxa2xx_spi.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/spi/pxa2xx_spi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/spi/pxa2xx_spi.c</a></div><div class='hunk'>@@ -47,6 +47,10 @@ MODULE_ALIAS("platform:pxa2xx-spi");</div><div class='ctx'> </div><div class='ctx'> #define MAX_BUSES 3</div><div class='ctx'> </div><div class='add'>+#define RX_THRESH_DFLT 	8</div><div class='add'>+#define TX_THRESH_DFLT 	8</div><div class='add'>+#define TIMOUT_DFLT		1000</div><div class='add'>+</div><div class='ctx'> #define DMA_INT_MASK		(DCSR_ENDINTR | DCSR_STARTINTR | DCSR_BUSERR)</div><div class='ctx'> #define RESET_DMA_CHANNEL	(DCSR_NODESC | DMA_INT_MASK)</div><div class='ctx'> #define IS_DMA_ALIGNED(x)	((((u32)(x)) &amp; 0x07) == 0)</div><div class='hunk'>@@ -1171,6 +1175,8 @@ static int setup(struct spi_device *spi)</div><div class='ctx'> 	struct driver_data *drv_data = spi_master_get_devdata(spi-&gt;master);</div><div class='ctx'> 	struct ssp_device *ssp = drv_data-&gt;ssp;</div><div class='ctx'> 	unsigned int clk_div;</div><div class='add'>+	uint tx_thres = TX_THRESH_DFLT;</div><div class='add'>+	uint rx_thres = RX_THRESH_DFLT;</div><div class='ctx'> </div><div class='ctx'> 	if (!spi-&gt;bits_per_word)</div><div class='ctx'> 		spi-&gt;bits_per_word = 8;</div><div class='hunk'>@@ -1209,8 +1215,7 @@ static int setup(struct spi_device *spi)</div><div class='ctx'> </div><div class='ctx'> 		chip-&gt;cs_control = null_cs_control;</div><div class='ctx'> 		chip-&gt;enable_dma = 0;</div><div class='del'>-		chip-&gt;timeout = 1000;</div><div class='del'>-		chip-&gt;threshold = SSCR1_RxTresh(1) | SSCR1_TxTresh(1);</div><div class='add'>+		chip-&gt;timeout = TIMOUT_DFLT;</div><div class='ctx'> 		chip-&gt;dma_burst_size = drv_data-&gt;master_info-&gt;enable_dma ?</div><div class='ctx'> 					DCMD_BURST8 : 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1224,22 +1229,21 @@ static int setup(struct spi_device *spi)</div><div class='ctx'> 	if (chip_info) {</div><div class='ctx'> 		if (chip_info-&gt;cs_control)</div><div class='ctx'> 			chip-&gt;cs_control = chip_info-&gt;cs_control;</div><div class='del'>-</div><div class='del'>-		chip-&gt;timeout = chip_info-&gt;timeout;</div><div class='del'>-</div><div class='del'>-		chip-&gt;threshold = (SSCR1_RxTresh(chip_info-&gt;rx_threshold) &amp;</div><div class='del'>-								SSCR1_RFT) |</div><div class='del'>-				(SSCR1_TxTresh(chip_info-&gt;tx_threshold) &amp;</div><div class='del'>-								SSCR1_TFT);</div><div class='del'>-</div><div class='del'>-		chip-&gt;enable_dma = chip_info-&gt;dma_burst_size != 0</div><div class='del'>-					&amp;&amp; drv_data-&gt;master_info-&gt;enable_dma;</div><div class='add'>+		if (chip_info-&gt;timeout)</div><div class='add'>+			chip-&gt;timeout = chip_info-&gt;timeout;</div><div class='add'>+		if (chip_info-&gt;tx_threshold)</div><div class='add'>+			tx_thres = chip_info-&gt;tx_threshold;</div><div class='add'>+		if (chip_info-&gt;rx_threshold)</div><div class='add'>+			rx_thres = chip_info-&gt;rx_threshold;</div><div class='add'>+		chip-&gt;enable_dma = drv_data-&gt;master_info-&gt;enable_dma;</div><div class='ctx'> 		chip-&gt;dma_threshold = 0;</div><div class='del'>-</div><div class='ctx'> 		if (chip_info-&gt;enable_loopback)</div><div class='ctx'> 			chip-&gt;cr1 = SSCR1_LBM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	chip-&gt;threshold = (SSCR1_RxTresh(rx_thres) &amp; SSCR1_RFT) |</div><div class='add'>+			(SSCR1_TxTresh(tx_thres) &amp; SSCR1_TFT);</div><div class='add'>+</div><div class='ctx'> 	/* set dma burst and threshold outside of chip_info path so that if</div><div class='ctx'> 	 * chip_info goes away after setting chip-&gt;enable_dma, the</div><div class='ctx'> 	 * burst and threshold can still respond to changes in bits_per_word */</div><div class='hunk'>@@ -1268,17 +1272,19 @@ static int setup(struct spi_device *spi)</div><div class='ctx'> </div><div class='ctx'> 	/* NOTE:  PXA25x_SSP _could_ use external clocking ... */</div><div class='ctx'> 	if (drv_data-&gt;ssp_type != PXA25x_SSP)</div><div class='del'>-		dev_dbg(&amp;spi-&gt;dev, "%d bits/word, %ld Hz, mode %d\n",</div><div class='add'>+		dev_dbg(&amp;spi-&gt;dev, "%d bits/word, %ld Hz, mode %d, %s\n",</div><div class='ctx'> 				spi-&gt;bits_per_word,</div><div class='ctx'> 				clk_get_rate(ssp-&gt;clk)</div><div class='ctx'> 					/ (1 + ((chip-&gt;cr0 &amp; SSCR0_SCR) &gt;&gt; 8)),</div><div class='del'>-				spi-&gt;mode &amp; 0x3);</div><div class='add'>+				spi-&gt;mode &amp; 0x3,</div><div class='add'>+				chip-&gt;enable_dma ? "DMA" : "PIO");</div><div class='ctx'> 	else</div><div class='del'>-		dev_dbg(&amp;spi-&gt;dev, "%d bits/word, %ld Hz, mode %d\n",</div><div class='add'>+		dev_dbg(&amp;spi-&gt;dev, "%d bits/word, %ld Hz, mode %d, %s\n",</div><div class='ctx'> 				spi-&gt;bits_per_word,</div><div class='del'>-				clk_get_rate(ssp-&gt;clk)</div><div class='add'>+				clk_get_rate(ssp-&gt;clk) / 2</div><div class='ctx'> 					/ (1 + ((chip-&gt;cr0 &amp; SSCR0_SCR) &gt;&gt; 8)),</div><div class='del'>-				spi-&gt;mode &amp; 0x3);</div><div class='add'>+				spi-&gt;mode &amp; 0x3,</div><div class='add'>+				chip-&gt;enable_dma ? "DMA" : "PIO");</div><div class='ctx'> </div><div class='ctx'> 	if (spi-&gt;bits_per_word &lt;= 8) {</div><div class='ctx'> 		chip-&gt;n_bytes = 1;</div><div class='hunk'>@@ -1407,9 +1413,9 @@ static int __init pxa2xx_spi_probe(struct platform_device *pdev)</div><div class='ctx'> 	struct device *dev = &amp;pdev-&gt;dev;</div><div class='ctx'> 	struct pxa2xx_spi_master *platform_info;</div><div class='ctx'> 	struct spi_master *master;</div><div class='del'>-	struct driver_data *drv_data = NULL;</div><div class='add'>+	struct driver_data *drv_data;</div><div class='ctx'> 	struct ssp_device *ssp;</div><div class='del'>-	int status = 0;</div><div class='add'>+	int status;</div><div class='ctx'> </div><div class='ctx'> 	platform_info = dev-&gt;platform_data;</div><div class='ctx'> </div><div class='hunk'>@@ -1422,7 +1428,7 @@ static int __init pxa2xx_spi_probe(struct platform_device *pdev)</div><div class='ctx'> 	/* Allocate master with space for drv_data and null dma buffer */</div><div class='ctx'> 	master = spi_alloc_master(dev, sizeof(struct driver_data) + 16);</div><div class='ctx'> 	if (!master) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "can not alloc spi_master\n");</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "cannot alloc spi_master\n");</div><div class='ctx'> 		ssp_free(ssp);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1458,7 +1464,7 @@ static int __init pxa2xx_spi_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	status = request_irq(ssp-&gt;irq, ssp_int, 0, dev-&gt;bus_id, drv_data);</div><div class='ctx'> 	if (status &lt; 0) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "can not get IRQ\n");</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "cannot get IRQ %d\n", ssp-&gt;irq);</div><div class='ctx'> 		goto out_error_master_alloc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1498,7 +1504,9 @@ static int __init pxa2xx_spi_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	/* Load default SSP configuration */</div><div class='ctx'> 	write_SSCR0(0, drv_data-&gt;ioaddr);</div><div class='del'>-	write_SSCR1(SSCR1_RxTresh(4) | SSCR1_TxTresh(12), drv_data-&gt;ioaddr);</div><div class='add'>+	write_SSCR1(SSCR1_RxTresh(RX_THRESH_DFLT) |</div><div class='add'>+				SSCR1_TxTresh(TX_THRESH_DFLT),</div><div class='add'>+				drv_data-&gt;ioaddr);</div><div class='ctx'> 	write_SSCR0(SSCR0_SerClkDiv(2)</div><div class='ctx'> 			| SSCR0_Motorola</div><div class='ctx'> 			| SSCR0_DataSize(8),</div><div class='head'>diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c<br/>index 75e86865234c..3734dc9708e1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/spi/spi.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/spi/spi.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/spi/spi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/spi/spi.c</a></div><div class='hunk'>@@ -660,7 +660,7 @@ int spi_write_then_read(struct spi_device *spi,</div><div class='ctx'> </div><div class='ctx'> 	int			status;</div><div class='ctx'> 	struct spi_message	message;</div><div class='del'>-	struct spi_transfer	x[2];</div><div class='add'>+	struct spi_transfer	x;</div><div class='ctx'> 	u8			*local_buf;</div><div class='ctx'> </div><div class='ctx'> 	/* Use preallocated DMA-safe buffer.  We can't avoid copying here,</div><div class='hunk'>@@ -671,15 +671,9 @@ int spi_write_then_read(struct spi_device *spi,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	spi_message_init(&amp;message);</div><div class='del'>-	memset(x, 0, sizeof x);</div><div class='del'>-	if (n_tx) {</div><div class='del'>-		x[0].len = n_tx;</div><div class='del'>-		spi_message_add_tail(&amp;x[0], &amp;message);</div><div class='del'>-	}</div><div class='del'>-	if (n_rx) {</div><div class='del'>-		x[1].len = n_rx;</div><div class='del'>-		spi_message_add_tail(&amp;x[1], &amp;message);</div><div class='del'>-	}</div><div class='add'>+	memset(&amp;x, 0, sizeof x);</div><div class='add'>+	x.len = n_tx + n_rx;</div><div class='add'>+	spi_message_add_tail(&amp;x, &amp;message);</div><div class='ctx'> </div><div class='ctx'> 	/* ... unless someone else is using the pre-allocated buffer */</div><div class='ctx'> 	if (!mutex_trylock(&amp;lock)) {</div><div class='hunk'>@@ -690,15 +684,15 @@ int spi_write_then_read(struct spi_device *spi,</div><div class='ctx'> 		local_buf = buf;</div><div class='ctx'> </div><div class='ctx'> 	memcpy(local_buf, txbuf, n_tx);</div><div class='del'>-	x[0].tx_buf = local_buf;</div><div class='del'>-	x[1].rx_buf = local_buf + n_tx;</div><div class='add'>+	x.tx_buf = local_buf;</div><div class='add'>+	x.rx_buf = local_buf;</div><div class='ctx'> </div><div class='ctx'> 	/* do the i/o */</div><div class='ctx'> 	status = spi_sync(spi, &amp;message);</div><div class='ctx'> 	if (status == 0)</div><div class='del'>-		memcpy(rxbuf, x[1].rx_buf, n_rx);</div><div class='add'>+		memcpy(rxbuf, x.rx_buf + n_tx, n_rx);</div><div class='ctx'> </div><div class='del'>-	if (x[0].tx_buf == buf)</div><div class='add'>+	if (x.tx_buf == buf)</div><div class='ctx'> 		mutex_unlock(&amp;lock);</div><div class='ctx'> 	else</div><div class='ctx'> 		kfree(local_buf);</div><div class='hunk'>@@ -744,5 +738,5 @@ err0:</div><div class='ctx'>  * driver registration) _could_ be dynamically linked (modular) ... costs</div><div class='ctx'>  * include needing to have boardinfo data structures be much more public.</div><div class='ctx'>  */</div><div class='del'>-subsys_initcall(spi_init);</div><div class='add'>+postcore_initcall(spi_init);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/spi/spi_s3c24xx.c b/drivers/spi/spi_s3c24xx.c<br/>index 3eb414b84a9d..c252cbac00f1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/spi/spi_s3c24xx.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/spi/spi_s3c24xx.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/spi/spi_s3c24xx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/spi/spi_s3c24xx.c</a></div><div class='hunk'>@@ -247,6 +247,9 @@ static void s3c24xx_spi_initialsetup(struct s3c24xx_spi *hw)</div><div class='ctx'> 	writeb(0xff, hw-&gt;regs + S3C2410_SPPRE);</div><div class='ctx'> 	writeb(SPPIN_DEFAULT, hw-&gt;regs + S3C2410_SPPIN);</div><div class='ctx'> 	writeb(SPCON_DEFAULT, hw-&gt;regs + S3C2410_SPCON);</div><div class='add'>+</div><div class='add'>+	if (hw-&gt;pdata &amp;&amp; hw-&gt;pdata-&gt;gpio_setup)</div><div class='add'>+		hw-&gt;pdata-&gt;gpio_setup(hw-&gt;pdata, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init s3c24xx_spi_probe(struct platform_device *pdev)</div><div class='hunk'>@@ -412,6 +415,9 @@ static int s3c24xx_spi_suspend(struct platform_device *pdev, pm_message_t msg)</div><div class='ctx'> {</div><div class='ctx'> 	struct s3c24xx_spi *hw = platform_get_drvdata(pdev);</div><div class='ctx'> </div><div class='add'>+	if (hw-&gt;pdata &amp;&amp; hw-&gt;pdata-&gt;gpio_setup)</div><div class='add'>+		hw-&gt;pdata-&gt;gpio_setup(hw-&gt;pdata, 0);</div><div class='add'>+</div><div class='ctx'> 	clk_disable(hw-&gt;clk);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c<br/>index e5e0cfed5e3b..89a43755a453 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/spi/spidev.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/spi/spidev.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/spi/spidev.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/spi/spidev.c</a></div><div class='hunk'>@@ -583,10 +583,9 @@ static int spidev_probe(struct spi_device *spi)</div><div class='ctx'> 		struct device *dev;</div><div class='ctx'> </div><div class='ctx'> 		spidev-&gt;devt = MKDEV(SPIDEV_MAJOR, minor);</div><div class='del'>-		dev = device_create_drvdata(spidev_class, &amp;spi-&gt;dev,</div><div class='del'>-				spidev-&gt;devt, spidev,</div><div class='del'>-				"spidev%d.%d",</div><div class='del'>-				spi-&gt;master-&gt;bus_num, spi-&gt;chip_select);</div><div class='add'>+		dev = device_create(spidev_class, &amp;spi-&gt;dev, spidev-&gt;devt,</div><div class='add'>+				    spidev, "spidev%d.%d",</div><div class='add'>+				    spi-&gt;master-&gt;bus_num, spi-&gt;chip_select);</div><div class='ctx'> 		status = IS_ERR(dev) ? PTR_ERR(dev) : 0;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		dev_dbg(&amp;spi-&gt;dev, "no minor number available!\n");</div><div class='head'>diff --git a/drivers/ssb/pci.c b/drivers/ssb/pci.c<br/>index f883dcfffe06..d5cde051806b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ssb/pci.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ssb/pci.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ssb/pci.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ssb/pci.c</a></div><div class='hunk'>@@ -327,11 +327,9 @@ static void sprom_extract_r123(struct ssb_sprom *out, const u16 *in)</div><div class='ctx'> 	s8 gain;</div><div class='ctx'> 	u16 loc[3];</div><div class='ctx'> </div><div class='del'>-	if (out-&gt;revision == 3) {			/* rev 3 moved MAC */</div><div class='add'>+	if (out-&gt;revision == 3)			/* rev 3 moved MAC */</div><div class='ctx'> 		loc[0] = SSB_SPROM3_IL0MAC;</div><div class='del'>-		loc[1] = SSB_SPROM3_ET0MAC;</div><div class='del'>-		loc[2] = SSB_SPROM3_ET1MAC;</div><div class='del'>-	} else {</div><div class='add'>+	else {</div><div class='ctx'> 		loc[0] = SSB_SPROM1_IL0MAC;</div><div class='ctx'> 		loc[1] = SSB_SPROM1_ET0MAC;</div><div class='ctx'> 		loc[2] = SSB_SPROM1_ET1MAC;</div><div class='hunk'>@@ -340,13 +338,15 @@ static void sprom_extract_r123(struct ssb_sprom *out, const u16 *in)</div><div class='ctx'> 		v = in[SPOFF(loc[0]) + i];</div><div class='ctx'> 		*(((__be16 *)out-&gt;il0mac) + i) = cpu_to_be16(v);</div><div class='ctx'> 	}</div><div class='del'>-	for (i = 0; i &lt; 3; i++) {</div><div class='del'>-		v = in[SPOFF(loc[1]) + i];</div><div class='del'>-		*(((__be16 *)out-&gt;et0mac) + i) = cpu_to_be16(v);</div><div class='del'>-	}</div><div class='del'>-	for (i = 0; i &lt; 3; i++) {</div><div class='del'>-		v = in[SPOFF(loc[2]) + i];</div><div class='del'>-		*(((__be16 *)out-&gt;et1mac) + i) = cpu_to_be16(v);</div><div class='add'>+	if (out-&gt;revision &lt; 3) { 	/* only rev 1-2 have et0, et1 */</div><div class='add'>+		for (i = 0; i &lt; 3; i++) {</div><div class='add'>+			v = in[SPOFF(loc[1]) + i];</div><div class='add'>+			*(((__be16 *)out-&gt;et0mac) + i) = cpu_to_be16(v);</div><div class='add'>+		}</div><div class='add'>+		for (i = 0; i &lt; 3; i++) {</div><div class='add'>+			v = in[SPOFF(loc[2]) + i];</div><div class='add'>+			*(((__be16 *)out-&gt;et1mac) + i) = cpu_to_be16(v);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	SPEX(et0phyaddr, SSB_SPROM1_ETHPHY, SSB_SPROM1_ETHPHY_ET0A, 0);</div><div class='ctx'> 	SPEX(et1phyaddr, SSB_SPROM1_ETHPHY, SSB_SPROM1_ETHPHY_ET1A,</div><div class='hunk'>@@ -399,30 +399,33 @@ static void sprom_extract_r123(struct ssb_sprom *out, const u16 *in)</div><div class='ctx'> 	out-&gt;antenna_gain.ghz5.a3 = gain;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void sprom_extract_r4(struct ssb_sprom *out, const u16 *in)</div><div class='add'>+static void sprom_extract_r45(struct ssb_sprom *out, const u16 *in)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	u16 v;</div><div class='add'>+	u16 il0mac_offset;</div><div class='ctx'> </div><div class='del'>-	/* extract the equivalent of the r1 variables */</div><div class='add'>+	if (out-&gt;revision == 4)</div><div class='add'>+		il0mac_offset = SSB_SPROM4_IL0MAC;</div><div class='add'>+	else</div><div class='add'>+		il0mac_offset = SSB_SPROM5_IL0MAC;</div><div class='add'>+	/* extract the MAC address */</div><div class='ctx'> 	for (i = 0; i &lt; 3; i++) {</div><div class='del'>-		v = in[SPOFF(SSB_SPROM4_IL0MAC) + i];</div><div class='add'>+		v = in[SPOFF(il0mac_offset) + i];</div><div class='ctx'> 		*(((__be16 *)out-&gt;il0mac) + i) = cpu_to_be16(v);</div><div class='ctx'> 	}</div><div class='del'>-	for (i = 0; i &lt; 3; i++) {</div><div class='del'>-		v = in[SPOFF(SSB_SPROM4_ET0MAC) + i];</div><div class='del'>-		*(((__be16 *)out-&gt;et0mac) + i) = cpu_to_be16(v);</div><div class='del'>-	}</div><div class='del'>-	for (i = 0; i &lt; 3; i++) {</div><div class='del'>-		v = in[SPOFF(SSB_SPROM4_ET1MAC) + i];</div><div class='del'>-		*(((__be16 *)out-&gt;et1mac) + i) = cpu_to_be16(v);</div><div class='del'>-	}</div><div class='ctx'> 	SPEX(et0phyaddr, SSB_SPROM4_ETHPHY, SSB_SPROM4_ETHPHY_ET0A, 0);</div><div class='ctx'> 	SPEX(et1phyaddr, SSB_SPROM4_ETHPHY, SSB_SPROM4_ETHPHY_ET1A,</div><div class='ctx'> 	     SSB_SPROM4_ETHPHY_ET1A_SHIFT);</div><div class='del'>-	SPEX(country_code, SSB_SPROM4_CCODE, 0xFFFF, 0);</div><div class='del'>-	SPEX(boardflags_lo, SSB_SPROM4_BFLLO, 0xFFFF, 0);</div><div class='del'>-	SPEX(boardflags_hi, SSB_SPROM4_BFLHI, 0xFFFF, 0);</div><div class='add'>+	if (out-&gt;revision == 4) {</div><div class='add'>+		SPEX(country_code, SSB_SPROM4_CCODE, 0xFFFF, 0);</div><div class='add'>+		SPEX(boardflags_lo, SSB_SPROM4_BFLLO, 0xFFFF, 0);</div><div class='add'>+		SPEX(boardflags_hi, SSB_SPROM4_BFLHI, 0xFFFF, 0);</div><div class='add'>+	} else {</div><div class='add'>+		SPEX(country_code, SSB_SPROM5_CCODE, 0xFFFF, 0);</div><div class='add'>+		SPEX(boardflags_lo, SSB_SPROM5_BFLLO, 0xFFFF, 0);</div><div class='add'>+		SPEX(boardflags_hi, SSB_SPROM5_BFLHI, 0xFFFF, 0);</div><div class='add'>+	}</div><div class='ctx'> 	SPEX(ant_available_a, SSB_SPROM4_ANTAVAIL, SSB_SPROM4_ANTAVAIL_A,</div><div class='ctx'> 	     SSB_SPROM4_ANTAVAIL_A_SHIFT);</div><div class='ctx'> 	SPEX(ant_available_bg, SSB_SPROM4_ANTAVAIL, SSB_SPROM4_ANTAVAIL_BG,</div><div class='hunk'>@@ -433,12 +436,21 @@ static void sprom_extract_r4(struct ssb_sprom *out, const u16 *in)</div><div class='ctx'> 	SPEX(maxpwr_a, SSB_SPROM4_MAXP_A, SSB_SPROM4_MAXP_A_MASK, 0);</div><div class='ctx'> 	SPEX(itssi_a, SSB_SPROM4_MAXP_A, SSB_SPROM4_ITSSI_A,</div><div class='ctx'> 	     SSB_SPROM4_ITSSI_A_SHIFT);</div><div class='del'>-	SPEX(gpio0, SSB_SPROM4_GPIOA, SSB_SPROM4_GPIOA_P0, 0);</div><div class='del'>-	SPEX(gpio1, SSB_SPROM4_GPIOA, SSB_SPROM4_GPIOA_P1,</div><div class='del'>-	     SSB_SPROM4_GPIOA_P1_SHIFT);</div><div class='del'>-	SPEX(gpio2, SSB_SPROM4_GPIOB, SSB_SPROM4_GPIOB_P2, 0);</div><div class='del'>-	SPEX(gpio3, SSB_SPROM4_GPIOB, SSB_SPROM4_GPIOB_P3,</div><div class='del'>-	     SSB_SPROM4_GPIOB_P3_SHIFT);</div><div class='add'>+	if (out-&gt;revision == 4) {</div><div class='add'>+		SPEX(gpio0, SSB_SPROM4_GPIOA, SSB_SPROM4_GPIOA_P0, 0);</div><div class='add'>+		SPEX(gpio1, SSB_SPROM4_GPIOA, SSB_SPROM4_GPIOA_P1,</div><div class='add'>+		     SSB_SPROM4_GPIOA_P1_SHIFT);</div><div class='add'>+		SPEX(gpio2, SSB_SPROM4_GPIOB, SSB_SPROM4_GPIOB_P2, 0);</div><div class='add'>+		SPEX(gpio3, SSB_SPROM4_GPIOB, SSB_SPROM4_GPIOB_P3,</div><div class='add'>+		     SSB_SPROM4_GPIOB_P3_SHIFT);</div><div class='add'>+	} else {</div><div class='add'>+		SPEX(gpio0, SSB_SPROM5_GPIOA, SSB_SPROM5_GPIOA_P0, 0);</div><div class='add'>+		SPEX(gpio1, SSB_SPROM5_GPIOA, SSB_SPROM5_GPIOA_P1,</div><div class='add'>+		     SSB_SPROM5_GPIOA_P1_SHIFT);</div><div class='add'>+		SPEX(gpio2, SSB_SPROM5_GPIOB, SSB_SPROM5_GPIOB_P2, 0);</div><div class='add'>+		SPEX(gpio3, SSB_SPROM5_GPIOB, SSB_SPROM5_GPIOB_P3,</div><div class='add'>+		     SSB_SPROM5_GPIOB_P3_SHIFT);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Extract the antenna gain values. */</div><div class='ctx'> 	SPEX(antenna_gain.ghz24.a0, SSB_SPROM4_AGAIN01,</div><div class='hunk'>@@ -462,6 +474,8 @@ static int sprom_extract(struct ssb_bus *bus, struct ssb_sprom *out,</div><div class='ctx'> </div><div class='ctx'> 	out-&gt;revision = in[size - 1] &amp; 0x00FF;</div><div class='ctx'> 	ssb_dprintk(KERN_DEBUG PFX "SPROM revision %d detected.\n", out-&gt;revision);</div><div class='add'>+	memset(out-&gt;et0mac, 0xFF, 6);		/* preset et0 and et1 mac */</div><div class='add'>+	memset(out-&gt;et1mac, 0xFF, 6);</div><div class='ctx'> 	if ((bus-&gt;chip_id &amp; 0xFF00) == 0x4400) {</div><div class='ctx'> 		/* Workaround: The BCM44XX chip has a stupid revision</div><div class='ctx'> 		 * number stored in the SPROM.</div><div class='hunk'>@@ -471,16 +485,16 @@ static int sprom_extract(struct ssb_bus *bus, struct ssb_sprom *out,</div><div class='ctx'> 	} else if (bus-&gt;chip_id == 0x4321) {</div><div class='ctx'> 		/* the BCM4328 has a chipid == 0x4321 and a rev 4 SPROM */</div><div class='ctx'> 		out-&gt;revision = 4;</div><div class='del'>-		sprom_extract_r4(out, in);</div><div class='add'>+		sprom_extract_r45(out, in);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (out-&gt;revision == 0)</div><div class='ctx'> 			goto unsupported;</div><div class='ctx'> 		if (out-&gt;revision &gt;= 1 &amp;&amp; out-&gt;revision &lt;= 3) {</div><div class='ctx'> 			sprom_extract_r123(out, in);</div><div class='ctx'> 		}</div><div class='del'>-		if (out-&gt;revision == 4)</div><div class='del'>-			sprom_extract_r4(out, in);</div><div class='del'>-		if (out-&gt;revision &gt;= 5)</div><div class='add'>+		if (out-&gt;revision == 4 || out-&gt;revision == 5)</div><div class='add'>+			sprom_extract_r45(out, in);</div><div class='add'>+		if (out-&gt;revision &gt; 5)</div><div class='ctx'> 			goto unsupported;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/ssb/pcmcia.c b/drivers/ssb/pcmcia.c<br/>index 24c2a46c1476..fbfadbac67e8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ssb/pcmcia.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/ssb/pcmcia.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/ssb/pcmcia.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/ssb/pcmcia.c</a></div><div class='hunk'>@@ -80,7 +80,7 @@ static int ssb_pcmcia_cfg_write(struct ssb_bus *bus, u8 offset, u8 value)</div><div class='ctx'> 	reg.Action = CS_WRITE;</div><div class='ctx'> 	reg.Value = value;</div><div class='ctx'> 	res = pcmcia_access_configuration_register(bus-&gt;host_pcmcia, &amp;reg);</div><div class='del'>-	if (unlikely(res != CS_SUCCESS))</div><div class='add'>+	if (unlikely(res != 0))</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -96,7 +96,7 @@ static int ssb_pcmcia_cfg_read(struct ssb_bus *bus, u8 offset, u8 *value)</div><div class='ctx'> 	reg.Offset = offset;</div><div class='ctx'> 	reg.Action = CS_READ;</div><div class='ctx'> 	res = pcmcia_access_configuration_register(bus-&gt;host_pcmcia, &amp;reg);</div><div class='del'>-	if (unlikely(res != CS_SUCCESS))</div><div class='add'>+	if (unlikely(res != 0))</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	*value = reg.Value;</div><div class='ctx'> </div><div class='hunk'>@@ -638,17 +638,17 @@ int ssb_pcmcia_get_invariants(struct ssb_bus *bus,</div><div class='ctx'> 	tuple.TupleData = buf;</div><div class='ctx'> 	tuple.TupleDataMax = sizeof(buf);</div><div class='ctx'> 	res = pcmcia_get_first_tuple(bus-&gt;host_pcmcia, &amp;tuple);</div><div class='del'>-	GOTO_ERROR_ON(res != CS_SUCCESS, "MAC first tpl");</div><div class='add'>+	GOTO_ERROR_ON(res != 0, "MAC first tpl");</div><div class='ctx'> 	res = pcmcia_get_tuple_data(bus-&gt;host_pcmcia, &amp;tuple);</div><div class='del'>-	GOTO_ERROR_ON(res != CS_SUCCESS, "MAC first tpl data");</div><div class='add'>+	GOTO_ERROR_ON(res != 0, "MAC first tpl data");</div><div class='ctx'> 	while (1) {</div><div class='ctx'> 		GOTO_ERROR_ON(tuple.TupleDataLen &lt; 1, "MAC tpl &lt; 1");</div><div class='ctx'> 		if (tuple.TupleData[0] == CISTPL_FUNCE_LAN_NODE_ID)</div><div class='ctx'> 			break;</div><div class='ctx'> 		res = pcmcia_get_next_tuple(bus-&gt;host_pcmcia, &amp;tuple);</div><div class='del'>-		GOTO_ERROR_ON(res != CS_SUCCESS, "MAC next tpl");</div><div class='add'>+		GOTO_ERROR_ON(res != 0, "MAC next tpl");</div><div class='ctx'> 		res = pcmcia_get_tuple_data(bus-&gt;host_pcmcia, &amp;tuple);</div><div class='del'>-		GOTO_ERROR_ON(res != CS_SUCCESS, "MAC next tpl data");</div><div class='add'>+		GOTO_ERROR_ON(res != 0, "MAC next tpl data");</div><div class='ctx'> 	}</div><div class='ctx'> 	GOTO_ERROR_ON(tuple.TupleDataLen != ETH_ALEN + 2, "MAC tpl size");</div><div class='ctx'> 	memcpy(sprom-&gt;il0mac, &amp;tuple.TupleData[2], ETH_ALEN);</div><div class='hunk'>@@ -659,9 +659,9 @@ int ssb_pcmcia_get_invariants(struct ssb_bus *bus,</div><div class='ctx'> 	tuple.TupleData = buf;</div><div class='ctx'> 	tuple.TupleDataMax = sizeof(buf);</div><div class='ctx'> 	res = pcmcia_get_first_tuple(bus-&gt;host_pcmcia, &amp;tuple);</div><div class='del'>-	GOTO_ERROR_ON(res != CS_SUCCESS, "VEN first tpl");</div><div class='add'>+	GOTO_ERROR_ON(res != 0, "VEN first tpl");</div><div class='ctx'> 	res = pcmcia_get_tuple_data(bus-&gt;host_pcmcia, &amp;tuple);</div><div class='del'>-	GOTO_ERROR_ON(res != CS_SUCCESS, "VEN first tpl data");</div><div class='add'>+	GOTO_ERROR_ON(res != 0, "VEN first tpl data");</div><div class='ctx'> 	while (1) {</div><div class='ctx'> 		GOTO_ERROR_ON(tuple.TupleDataLen &lt; 1, "VEN tpl &lt; 1");</div><div class='ctx'> 		switch (tuple.TupleData[0]) {</div><div class='hunk'>@@ -733,11 +733,11 @@ int ssb_pcmcia_get_invariants(struct ssb_bus *bus,</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		res = pcmcia_get_next_tuple(bus-&gt;host_pcmcia, &amp;tuple);</div><div class='del'>-		if (res == CS_NO_MORE_ITEMS)</div><div class='add'>+		if (res == -ENOSPC)</div><div class='ctx'> 			break;</div><div class='del'>-		GOTO_ERROR_ON(res != CS_SUCCESS, "VEN next tpl");</div><div class='add'>+		GOTO_ERROR_ON(res != 0, "VEN next tpl");</div><div class='ctx'> 		res = pcmcia_get_tuple_data(bus-&gt;host_pcmcia, &amp;tuple);</div><div class='del'>-		GOTO_ERROR_ON(res != CS_SUCCESS, "VEN next tpl data");</div><div class='add'>+		GOTO_ERROR_ON(res != 0, "VEN next tpl data");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig<br/>new file mode 100644<br/>index 000000000000..2a79decd7dfc<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,46 @@</div><div class='add'>+menuconfig STAGING</div><div class='add'>+	bool "Staging drivers"</div><div class='add'>+	default n</div><div class='add'>+	---help---</div><div class='add'>+	  This option allows you to select a number of drivers that are</div><div class='add'>+	  not of the "normal" Linux kernel quality level.  These drivers</div><div class='add'>+	  are placed here in order to get a wider audience for use of</div><div class='add'>+	  them.  Please note that these drivers are under heavy</div><div class='add'>+	  development, may or may not work, and may contain userspace</div><div class='add'>+	  interfaces that most likely will be changed in the near</div><div class='add'>+	  future.</div><div class='add'>+</div><div class='add'>+	  Using any of these drivers will taint your kernel which might</div><div class='add'>+	  affect support options from both the community, and various</div><div class='add'>+	  commercial support orginizations.</div><div class='add'>+</div><div class='add'>+	  If you wish to work on these drivers, to help improve them, or</div><div class='add'>+	  to report problems you have with them, please see the</div><div class='add'>+	  driver_name.README file in the drivers/staging/ directory to</div><div class='add'>+	  see what needs to be worked on, and who to contact.</div><div class='add'>+</div><div class='add'>+	  If in doubt, say N here.</div><div class='add'>+</div><div class='add'>+if STAGING</div><div class='add'>+</div><div class='add'>+source "drivers/staging/et131x/Kconfig"</div><div class='add'>+</div><div class='add'>+source "drivers/staging/slicoss/Kconfig"</div><div class='add'>+</div><div class='add'>+source "drivers/staging/sxg/Kconfig"</div><div class='add'>+</div><div class='add'>+source "drivers/staging/me4000/Kconfig"</div><div class='add'>+</div><div class='add'>+source "drivers/staging/go7007/Kconfig"</div><div class='add'>+</div><div class='add'>+source "drivers/staging/usbip/Kconfig"</div><div class='add'>+</div><div class='add'>+source "drivers/staging/winbond/Kconfig"</div><div class='add'>+</div><div class='add'>+source "drivers/staging/wlan-ng/Kconfig"</div><div class='add'>+</div><div class='add'>+source "drivers/staging/echo/Kconfig"</div><div class='add'>+</div><div class='add'>+source "drivers/staging/at76_usb/Kconfig"</div><div class='add'>+</div><div class='add'>+endif # STAGING</div><div class='head'>diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile<br/>new file mode 100644<br/>index 000000000000..325bca4f71c0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/Makefile</a></div><div class='hunk'>@@ -0,0 +1,15 @@</div><div class='add'>+# Makefile for staging directory</div><div class='add'>+</div><div class='add'>+# fix for build system bug...</div><div class='add'>+obj-$(CONFIG_STAGING)		+= staging.o</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_ET131X)		+= et131x/</div><div class='add'>+obj-$(CONFIG_SLICOSS)		+= slicoss/</div><div class='add'>+obj-$(CONFIG_SXG)		+= sxg/</div><div class='add'>+obj-$(CONFIG_ME4000)		+= me4000/</div><div class='add'>+obj-$(CONFIG_VIDEO_GO7007)	+= go7007/</div><div class='add'>+obj-$(CONFIG_USB_IP_COMMON)	+= usbip/</div><div class='add'>+obj-$(CONFIG_W35UND)		+= winbond/</div><div class='add'>+obj-$(CONFIG_PRISM2_USB)	+= wlan-ng/</div><div class='add'>+obj-$(CONFIG_ECHO)		+= echo/</div><div class='add'>+obj-$(CONFIG_USB_ATMEL)		+= at76_usb/</div><div class='head'>diff --git a/drivers/staging/at76_usb/Kconfig b/drivers/staging/at76_usb/Kconfig<br/>new file mode 100644<br/>index 000000000000..8606f9621624<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/at76_usb/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/at76_usb/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,8 @@</div><div class='add'>+config USB_ATMEL</div><div class='add'>+	tristate "Atmel at76c503/at76c505/at76c505a USB cards"</div><div class='add'>+	depends on WLAN_80211 &amp;&amp; USB</div><div class='add'>+	default N</div><div class='add'>+	select FW_LOADER</div><div class='add'>+	---help---</div><div class='add'>+	  Enable support for USB Wireless devices using Atmel at76c503,</div><div class='add'>+	  at76c505 or at76c505a chips.</div><div class='head'>diff --git a/drivers/staging/at76_usb/Makefile b/drivers/staging/at76_usb/Makefile<br/>new file mode 100644<br/>index 000000000000..6a47e8872309<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/at76_usb/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/at76_usb/Makefile</a></div><div class='hunk'>@@ -0,0 +1 @@</div><div class='add'>+obj-$(CONFIG_USB_ATMEL)		+= at76_usb.o</div><div class='head'>diff --git a/drivers/staging/at76_usb/TODO b/drivers/staging/at76_usb/TODO<br/>new file mode 100644<br/>index 000000000000..6911ca71a41a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/at76_usb/TODO?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/at76_usb/TODO</a></div><div class='hunk'>@@ -0,0 +1,2 @@</div><div class='add'>+rewrite the driver to use the proper in-kernel wireless stack</div><div class='add'>+instead of using its own.</div><div class='head'>diff --git a/drivers/staging/at76_usb/at76_usb.c b/drivers/staging/at76_usb/at76_usb.c<br/>new file mode 100644<br/>index 000000000000..52df0c665183<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/at76_usb/at76_usb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/at76_usb/at76_usb.c</a></div><div class='hunk'>@@ -0,0 +1,5559 @@</div><div class='add'>+/*</div><div class='add'>+ * at76c503/at76c505 USB driver</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2002 - 2003 Oliver Kurth</div><div class='add'>+ * Copyright (c) 2004 Joerg Albert &lt;joerg.albert@gmx.de&gt;</div><div class='add'>+ * Copyright (c) 2004 Nick Jones</div><div class='add'>+ * Copyright (c) 2004 Balint Seeber &lt;n0_5p4m_p13453@hotmail.com&gt;</div><div class='add'>+ * Copyright (c) 2007 Guido Guenther &lt;agx@sigxcpu.org&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public License as</div><div class='add'>+ * published by the Free Software Foundation; either version 2 of</div><div class='add'>+ * the License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This file is part of the Berlios driver for WLAN USB devices based on the</div><div class='add'>+ * Atmel AT76C503A/505/505A.</div><div class='add'>+ *</div><div class='add'>+ * Some iw_handler code was taken from airo.c, (C) 1999 Benjamin Reed</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/usb.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/if_arp.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='add'>+#include &lt;linux/wireless.h&gt;</div><div class='add'>+#include &lt;net/iw_handler.h&gt;</div><div class='add'>+#include &lt;net/ieee80211_radiotap.h&gt;</div><div class='add'>+#include &lt;linux/firmware.h&gt;</div><div class='add'>+#include &lt;linux/leds.h&gt;</div><div class='add'>+#include &lt;net/ieee80211.h&gt;</div><div class='add'>+</div><div class='add'>+#include "at76_usb.h"</div><div class='add'>+</div><div class='add'>+/* Version information */</div><div class='add'>+#define DRIVER_NAME "at76_usb"</div><div class='add'>+#define DRIVER_VERSION	"0.17"</div><div class='add'>+#define DRIVER_DESC "Atmel at76x USB Wireless LAN Driver"</div><div class='add'>+</div><div class='add'>+/* at76_debug bits */</div><div class='add'>+#define DBG_PROGRESS		0x00000001	/* authentication/accociation */</div><div class='add'>+#define DBG_BSS_TABLE		0x00000002	/* show BSS table after scans */</div><div class='add'>+#define DBG_IOCTL		0x00000004	/* ioctl calls / settings */</div><div class='add'>+#define DBG_MAC_STATE		0x00000008	/* MAC state transitions */</div><div class='add'>+#define DBG_TX_DATA		0x00000010	/* tx header */</div><div class='add'>+#define DBG_TX_DATA_CONTENT	0x00000020	/* tx content */</div><div class='add'>+#define DBG_TX_MGMT		0x00000040	/* tx management */</div><div class='add'>+#define DBG_RX_DATA		0x00000080	/* rx data header */</div><div class='add'>+#define DBG_RX_DATA_CONTENT	0x00000100	/* rx data content */</div><div class='add'>+#define DBG_RX_MGMT		0x00000200	/* rx mgmt frame headers */</div><div class='add'>+#define DBG_RX_BEACON		0x00000400	/* rx beacon */</div><div class='add'>+#define DBG_RX_CTRL		0x00000800	/* rx control */</div><div class='add'>+#define DBG_RX_MGMT_CONTENT	0x00001000	/* rx mgmt content */</div><div class='add'>+#define DBG_RX_FRAGS		0x00002000	/* rx data fragment handling */</div><div class='add'>+#define DBG_DEVSTART		0x00004000	/* fw download, device start */</div><div class='add'>+#define DBG_URB			0x00008000	/* rx urb status, ... */</div><div class='add'>+#define DBG_RX_ATMEL_HDR	0x00010000	/* Atmel-specific Rx headers */</div><div class='add'>+#define DBG_PROC_ENTRY		0x00020000	/* procedure entries/exits */</div><div class='add'>+#define DBG_PM			0x00040000	/* power management settings */</div><div class='add'>+#define DBG_BSS_MATCH		0x00080000	/* BSS match failures */</div><div class='add'>+#define DBG_PARAMS		0x00100000	/* show configured parameters */</div><div class='add'>+#define DBG_WAIT_COMPLETE	0x00200000	/* command completion */</div><div class='add'>+#define DBG_RX_FRAGS_SKB	0x00400000	/* skb header of Rx fragments */</div><div class='add'>+#define DBG_BSS_TABLE_RM	0x00800000	/* purging bss table entries */</div><div class='add'>+#define DBG_MONITOR_MODE	0x01000000	/* monitor mode */</div><div class='add'>+#define DBG_MIB			0x02000000	/* dump all MIBs on startup */</div><div class='add'>+#define DBG_MGMT_TIMER		0x04000000	/* dump mgmt_timer ops */</div><div class='add'>+#define DBG_WE_EVENTS		0x08000000	/* dump wireless events */</div><div class='add'>+#define DBG_FW			0x10000000	/* firmware download */</div><div class='add'>+#define DBG_DFU			0x20000000	/* device firmware upgrade */</div><div class='add'>+</div><div class='add'>+#define DBG_DEFAULTS		0</div><div class='add'>+</div><div class='add'>+/* Use our own dbg macro */</div><div class='add'>+#define at76_dbg(bits, format, arg...) \</div><div class='add'>+	do { \</div><div class='add'>+		if (at76_debug &amp; (bits)) \</div><div class='add'>+		printk(KERN_DEBUG DRIVER_NAME ": " format "\n" , ## arg); \</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+static int at76_debug = DBG_DEFAULTS;</div><div class='add'>+</div><div class='add'>+/* Protect against concurrent firmware loading and parsing */</div><div class='add'>+static struct mutex fw_mutex;</div><div class='add'>+</div><div class='add'>+static struct fwentry firmwares[] = {</div><div class='add'>+	[0] = {""},</div><div class='add'>+	[BOARD_503_ISL3861] = {"atmel_at76c503-i3861.bin"},</div><div class='add'>+	[BOARD_503_ISL3863] = {"atmel_at76c503-i3863.bin"},</div><div class='add'>+	[BOARD_503] = {"atmel_at76c503-rfmd.bin"},</div><div class='add'>+	[BOARD_503_ACC] = {"atmel_at76c503-rfmd-acc.bin"},</div><div class='add'>+	[BOARD_505] = {"atmel_at76c505-rfmd.bin"},</div><div class='add'>+	[BOARD_505_2958] = {"atmel_at76c505-rfmd2958.bin"},</div><div class='add'>+	[BOARD_505A] = {"atmel_at76c505a-rfmd2958.bin"},</div><div class='add'>+	[BOARD_505AMX] = {"atmel_at76c505amx-rfmd.bin"},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define USB_DEVICE_DATA(__ops)	.driver_info = (kernel_ulong_t)(__ops)</div><div class='add'>+</div><div class='add'>+static struct usb_device_id dev_table[] = {</div><div class='add'>+	/*</div><div class='add'>+	 * at76c503-i3861</div><div class='add'>+	 */</div><div class='add'>+	/* Generic AT76C503/3861 device */</div><div class='add'>+	{USB_DEVICE(0x03eb, 0x7603), USB_DEVICE_DATA(BOARD_503_ISL3861)},</div><div class='add'>+	/* Linksys WUSB11 v2.1/v2.6 */</div><div class='add'>+	{USB_DEVICE(0x066b, 0x2211), USB_DEVICE_DATA(BOARD_503_ISL3861)},</div><div class='add'>+	/* Netgear MA101 rev. A */</div><div class='add'>+	{USB_DEVICE(0x0864, 0x4100), USB_DEVICE_DATA(BOARD_503_ISL3861)},</div><div class='add'>+	/* Tekram U300C / Allnet ALL0193 */</div><div class='add'>+	{USB_DEVICE(0x0b3b, 0x1612), USB_DEVICE_DATA(BOARD_503_ISL3861)},</div><div class='add'>+	/* HP HN210W J7801A */</div><div class='add'>+	{USB_DEVICE(0x03f0, 0x011c), USB_DEVICE_DATA(BOARD_503_ISL3861)},</div><div class='add'>+	/* Sitecom/Z-Com/Zyxel M4Y-750 */</div><div class='add'>+	{USB_DEVICE(0x0cde, 0x0001), USB_DEVICE_DATA(BOARD_503_ISL3861)},</div><div class='add'>+	/* Dynalink/Askey WLL013 (intersil) */</div><div class='add'>+	{USB_DEVICE(0x069a, 0x0320), USB_DEVICE_DATA(BOARD_503_ISL3861)},</div><div class='add'>+	/* EZ connect 11Mpbs Wireless USB Adapter SMC2662W v1 */</div><div class='add'>+	{USB_DEVICE(0x0d5c, 0xa001), USB_DEVICE_DATA(BOARD_503_ISL3861)},</div><div class='add'>+	/* BenQ AWL300 */</div><div class='add'>+	{USB_DEVICE(0x04a5, 0x9000), USB_DEVICE_DATA(BOARD_503_ISL3861)},</div><div class='add'>+	/* Addtron AWU-120, Compex WLU11 */</div><div class='add'>+	{USB_DEVICE(0x05dd, 0xff31), USB_DEVICE_DATA(BOARD_503_ISL3861)},</div><div class='add'>+	/* Intel AP310 AnyPoint II USB */</div><div class='add'>+	{USB_DEVICE(0x8086, 0x0200), USB_DEVICE_DATA(BOARD_503_ISL3861)},</div><div class='add'>+	/* Dynalink L11U */</div><div class='add'>+	{USB_DEVICE(0x0d8e, 0x7100), USB_DEVICE_DATA(BOARD_503_ISL3861)},</div><div class='add'>+	/* Arescom WL-210, FCC id 07J-GL2411USB */</div><div class='add'>+	{USB_DEVICE(0x0d8e, 0x7110), USB_DEVICE_DATA(BOARD_503_ISL3861)},</div><div class='add'>+	/* I-O DATA WN-B11/USB */</div><div class='add'>+	{USB_DEVICE(0x04bb, 0x0919), USB_DEVICE_DATA(BOARD_503_ISL3861)},</div><div class='add'>+	/* BT Voyager 1010 */</div><div class='add'>+	{USB_DEVICE(0x069a, 0x0821), USB_DEVICE_DATA(BOARD_503_ISL3861)},</div><div class='add'>+	/*</div><div class='add'>+	 * at76c503-i3863</div><div class='add'>+	 */</div><div class='add'>+	/* Generic AT76C503/3863 device */</div><div class='add'>+	{USB_DEVICE(0x03eb, 0x7604), USB_DEVICE_DATA(BOARD_503_ISL3863)},</div><div class='add'>+	/* Samsung SWL-2100U */</div><div class='add'>+	{USB_DEVICE(0x055d, 0xa000), USB_DEVICE_DATA(BOARD_503_ISL3863)},</div><div class='add'>+	/*</div><div class='add'>+	 * at76c503-rfmd</div><div class='add'>+	 */</div><div class='add'>+	/* Generic AT76C503/RFMD device */</div><div class='add'>+	{USB_DEVICE(0x03eb, 0x7605), USB_DEVICE_DATA(BOARD_503)},</div><div class='add'>+	/* Dynalink/Askey WLL013 (rfmd) */</div><div class='add'>+	{USB_DEVICE(0x069a, 0x0321), USB_DEVICE_DATA(BOARD_503)},</div><div class='add'>+	/* Linksys WUSB11 v2.6 */</div><div class='add'>+	{USB_DEVICE(0x077b, 0x2219), USB_DEVICE_DATA(BOARD_503)},</div><div class='add'>+	/* Network Everywhere NWU11B */</div><div class='add'>+	{USB_DEVICE(0x077b, 0x2227), USB_DEVICE_DATA(BOARD_503)},</div><div class='add'>+	/* Netgear MA101 rev. B */</div><div class='add'>+	{USB_DEVICE(0x0864, 0x4102), USB_DEVICE_DATA(BOARD_503)},</div><div class='add'>+	/* D-Link DWL-120 rev. E */</div><div class='add'>+	{USB_DEVICE(0x2001, 0x3200), USB_DEVICE_DATA(BOARD_503)},</div><div class='add'>+	/* Actiontec 802UAT1, HWU01150-01UK */</div><div class='add'>+	{USB_DEVICE(0x1668, 0x7605), USB_DEVICE_DATA(BOARD_503)},</div><div class='add'>+	/* AirVast W-Buddie WN210 */</div><div class='add'>+	{USB_DEVICE(0x03eb, 0x4102), USB_DEVICE_DATA(BOARD_503)},</div><div class='add'>+	/* Dick Smith Electronics XH1153 802.11b USB adapter */</div><div class='add'>+	{USB_DEVICE(0x1371, 0x5743), USB_DEVICE_DATA(BOARD_503)},</div><div class='add'>+	/* CNet CNUSB611 */</div><div class='add'>+	{USB_DEVICE(0x1371, 0x0001), USB_DEVICE_DATA(BOARD_503)},</div><div class='add'>+	/* FiberLine FL-WL200U */</div><div class='add'>+	{USB_DEVICE(0x1371, 0x0002), USB_DEVICE_DATA(BOARD_503)},</div><div class='add'>+	/* BenQ AWL400 USB stick */</div><div class='add'>+	{USB_DEVICE(0x04a5, 0x9001), USB_DEVICE_DATA(BOARD_503)},</div><div class='add'>+	/* 3Com 3CRSHEW696 */</div><div class='add'>+	{USB_DEVICE(0x0506, 0x0a01), USB_DEVICE_DATA(BOARD_503)},</div><div class='add'>+	/* Siemens Santis ADSL WLAN USB adapter WLL 013 */</div><div class='add'>+	{USB_DEVICE(0x0681, 0x001b), USB_DEVICE_DATA(BOARD_503)},</div><div class='add'>+	/* Belkin F5D6050, version 2 */</div><div class='add'>+	{USB_DEVICE(0x050d, 0x0050), USB_DEVICE_DATA(BOARD_503)},</div><div class='add'>+	/* iBlitzz, BWU613 (not *B or *SB) */</div><div class='add'>+	{USB_DEVICE(0x07b8, 0xb000), USB_DEVICE_DATA(BOARD_503)},</div><div class='add'>+	/* Gigabyte GN-WLBM101 */</div><div class='add'>+	{USB_DEVICE(0x1044, 0x8003), USB_DEVICE_DATA(BOARD_503)},</div><div class='add'>+	/* Planex GW-US11S */</div><div class='add'>+	{USB_DEVICE(0x2019, 0x3220), USB_DEVICE_DATA(BOARD_503)},</div><div class='add'>+	/* Internal WLAN adapter in h5[4,5]xx series iPAQs */</div><div class='add'>+	{USB_DEVICE(0x049f, 0x0032), USB_DEVICE_DATA(BOARD_503)},</div><div class='add'>+	/* Corega Wireless LAN USB-11 mini */</div><div class='add'>+	{USB_DEVICE(0x07aa, 0x0011), USB_DEVICE_DATA(BOARD_503)},</div><div class='add'>+	/* Corega Wireless LAN USB-11 mini2 */</div><div class='add'>+	{USB_DEVICE(0x07aa, 0x0018), USB_DEVICE_DATA(BOARD_503)},</div><div class='add'>+	/* Uniden PCW100 */</div><div class='add'>+	{USB_DEVICE(0x05dd, 0xff35), USB_DEVICE_DATA(BOARD_503)},</div><div class='add'>+	/*</div><div class='add'>+	 * at76c503-rfmd-acc</div><div class='add'>+	 */</div><div class='add'>+	/* SMC2664W */</div><div class='add'>+	{USB_DEVICE(0x083a, 0x3501), USB_DEVICE_DATA(BOARD_503_ACC)},</div><div class='add'>+	/* Belkin F5D6050, SMC2662W v2, SMC2662W-AR */</div><div class='add'>+	{USB_DEVICE(0x0d5c, 0xa002), USB_DEVICE_DATA(BOARD_503_ACC)},</div><div class='add'>+	/*</div><div class='add'>+	 * at76c505-rfmd</div><div class='add'>+	 */</div><div class='add'>+	/* Generic AT76C505/RFMD */</div><div class='add'>+	{USB_DEVICE(0x03eb, 0x7606), USB_DEVICE_DATA(BOARD_505)},</div><div class='add'>+	/*</div><div class='add'>+	 * at76c505-rfmd2958</div><div class='add'>+	 */</div><div class='add'>+	/* Generic AT76C505/RFMD, OvisLink WL-1130USB */</div><div class='add'>+	{USB_DEVICE(0x03eb, 0x7613), USB_DEVICE_DATA(BOARD_505_2958)},</div><div class='add'>+	/* Fiberline FL-WL240U */</div><div class='add'>+	{USB_DEVICE(0x1371, 0x0014), USB_DEVICE_DATA(BOARD_505_2958)},</div><div class='add'>+	/* CNet CNUSB-611G */</div><div class='add'>+	{USB_DEVICE(0x1371, 0x0013), USB_DEVICE_DATA(BOARD_505_2958)},</div><div class='add'>+	/* Linksys WUSB11 v2.8 */</div><div class='add'>+	{USB_DEVICE(0x1915, 0x2233), USB_DEVICE_DATA(BOARD_505_2958)},</div><div class='add'>+	/* Xterasys XN-2122B, IBlitzz BWU613B/BWU613SB */</div><div class='add'>+	{USB_DEVICE(0x12fd, 0x1001), USB_DEVICE_DATA(BOARD_505_2958)},</div><div class='add'>+	/* Corega WLAN USB Stick 11 */</div><div class='add'>+	{USB_DEVICE(0x07aa, 0x7613), USB_DEVICE_DATA(BOARD_505_2958)},</div><div class='add'>+	/* Microstar MSI Box MS6978 */</div><div class='add'>+	{USB_DEVICE(0x0db0, 0x1020), USB_DEVICE_DATA(BOARD_505_2958)},</div><div class='add'>+	/*</div><div class='add'>+	 * at76c505a-rfmd2958</div><div class='add'>+	 */</div><div class='add'>+	/* Generic AT76C505A device */</div><div class='add'>+	{USB_DEVICE(0x03eb, 0x7614), USB_DEVICE_DATA(BOARD_505A)},</div><div class='add'>+	/* Generic AT76C505AS device */</div><div class='add'>+	{USB_DEVICE(0x03eb, 0x7617), USB_DEVICE_DATA(BOARD_505A)},</div><div class='add'>+	/* Siemens Gigaset USB WLAN Adapter 11 */</div><div class='add'>+	{USB_DEVICE(0x1690, 0x0701), USB_DEVICE_DATA(BOARD_505A)},</div><div class='add'>+	/*</div><div class='add'>+	 * at76c505amx-rfmd</div><div class='add'>+	 */</div><div class='add'>+	/* Generic AT76C505AMX device */</div><div class='add'>+	{USB_DEVICE(0x03eb, 0x7615), USB_DEVICE_DATA(BOARD_505AMX)},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_DEVICE_TABLE(usb, dev_table);</div><div class='add'>+</div><div class='add'>+/* Supported rates of this hardware, bit 7 marks basic rates */</div><div class='add'>+static const u8 hw_rates[] = { 0x82, 0x84, 0x0b, 0x16 };</div><div class='add'>+</div><div class='add'>+/* Frequency of each channel in MHz */</div><div class='add'>+static const long channel_frequency[] = {</div><div class='add'>+	2412, 2417, 2422, 2427, 2432, 2437, 2442,</div><div class='add'>+	2447, 2452, 2457, 2462, 2467, 2472, 2484</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define NUM_CHANNELS ARRAY_SIZE(channel_frequency)</div><div class='add'>+</div><div class='add'>+static const char *const preambles[] = { "long", "short", "auto" };</div><div class='add'>+</div><div class='add'>+static const char *const mac_states[] = {</div><div class='add'>+	[MAC_INIT] = "INIT",</div><div class='add'>+	[MAC_SCANNING] = "SCANNING",</div><div class='add'>+	[MAC_AUTH] = "AUTH",</div><div class='add'>+	[MAC_ASSOC] = "ASSOC",</div><div class='add'>+	[MAC_JOINING] = "JOINING",</div><div class='add'>+	[MAC_CONNECTED] = "CONNECTED",</div><div class='add'>+	[MAC_OWN_IBSS] = "OWN_IBSS"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Firmware download */</div><div class='add'>+/* DFU states */</div><div class='add'>+#define STATE_IDLE			0x00</div><div class='add'>+#define STATE_DETACH			0x01</div><div class='add'>+#define STATE_DFU_IDLE			0x02</div><div class='add'>+#define STATE_DFU_DOWNLOAD_SYNC		0x03</div><div class='add'>+#define STATE_DFU_DOWNLOAD_BUSY		0x04</div><div class='add'>+#define STATE_DFU_DOWNLOAD_IDLE		0x05</div><div class='add'>+#define STATE_DFU_MANIFEST_SYNC		0x06</div><div class='add'>+#define STATE_DFU_MANIFEST		0x07</div><div class='add'>+#define STATE_DFU_MANIFEST_WAIT_RESET	0x08</div><div class='add'>+#define STATE_DFU_UPLOAD_IDLE		0x09</div><div class='add'>+#define STATE_DFU_ERROR			0x0a</div><div class='add'>+</div><div class='add'>+/* DFU commands */</div><div class='add'>+#define DFU_DETACH			0</div><div class='add'>+#define DFU_DNLOAD			1</div><div class='add'>+#define DFU_UPLOAD			2</div><div class='add'>+#define DFU_GETSTATUS			3</div><div class='add'>+#define DFU_CLRSTATUS			4</div><div class='add'>+#define DFU_GETSTATE			5</div><div class='add'>+#define DFU_ABORT			6</div><div class='add'>+</div><div class='add'>+#define FW_BLOCK_SIZE 1024</div><div class='add'>+</div><div class='add'>+struct dfu_status {</div><div class='add'>+	unsigned char status;</div><div class='add'>+	unsigned char poll_timeout[3];</div><div class='add'>+	unsigned char state;</div><div class='add'>+	unsigned char string;</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+static inline int at76_is_intersil(enum board_type board)</div><div class='add'>+{</div><div class='add'>+	return (board == BOARD_503_ISL3861 || board == BOARD_503_ISL3863);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int at76_is_503rfmd(enum board_type board)</div><div class='add'>+{</div><div class='add'>+	return (board == BOARD_503 || board == BOARD_503_ACC);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int at76_is_505a(enum board_type board)</div><div class='add'>+{</div><div class='add'>+	return (board == BOARD_505A || board == BOARD_505AMX);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Load a block of the first (internal) part of the firmware */</div><div class='add'>+static int at76_load_int_fw_block(struct usb_device *udev, int blockno,</div><div class='add'>+				  void *block, int size)</div><div class='add'>+{</div><div class='add'>+	return usb_control_msg(udev, usb_sndctrlpipe(udev, 0), DFU_DNLOAD,</div><div class='add'>+			       USB_TYPE_CLASS | USB_DIR_OUT |</div><div class='add'>+			       USB_RECIP_INTERFACE, blockno, 0, block, size,</div><div class='add'>+			       USB_CTRL_GET_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int at76_dfu_get_status(struct usb_device *udev,</div><div class='add'>+			       struct dfu_status *status)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), DFU_GETSTATUS,</div><div class='add'>+			      USB_TYPE_CLASS | USB_DIR_IN | USB_RECIP_INTERFACE,</div><div class='add'>+			      0, 0, status, sizeof(struct dfu_status),</div><div class='add'>+			      USB_CTRL_GET_TIMEOUT);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 at76_dfu_get_state(struct usb_device *udev, u8 *state)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), DFU_GETSTATE,</div><div class='add'>+			      USB_TYPE_CLASS | USB_DIR_IN | USB_RECIP_INTERFACE,</div><div class='add'>+			      0, 0, state, 1, USB_CTRL_GET_TIMEOUT);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Convert timeout from the DFU status to jiffies */</div><div class='add'>+static inline unsigned long at76_get_timeout(struct dfu_status *s)</div><div class='add'>+{</div><div class='add'>+	return msecs_to_jiffies((s-&gt;poll_timeout[2] &lt;&lt; 16)</div><div class='add'>+				| (s-&gt;poll_timeout[1] &lt;&lt; 8)</div><div class='add'>+				| (s-&gt;poll_timeout[0]));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Load internal firmware from the buffer.  If manifest_sync_timeout &gt; 0, use</div><div class='add'>+ * its value in jiffies in the MANIFEST_SYNC state.  */</div><div class='add'>+static int at76_usbdfu_download(struct usb_device *udev, u8 *buf, u32 size,</div><div class='add'>+				int manifest_sync_timeout)</div><div class='add'>+{</div><div class='add'>+	u8 *block;</div><div class='add'>+	struct dfu_status dfu_stat_buf;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	int need_dfu_state = 1;</div><div class='add'>+	int is_done = 0;</div><div class='add'>+	u8 dfu_state = 0;</div><div class='add'>+	u32 dfu_timeout = 0;</div><div class='add'>+	int bsize = 0;</div><div class='add'>+	int blockno = 0;</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_DFU, "%s( %p, %u, %d)", __func__, buf, size,</div><div class='add'>+		 manifest_sync_timeout);</div><div class='add'>+</div><div class='add'>+	if (!size) {</div><div class='add'>+		dev_printk(KERN_ERR, &amp;udev-&gt;dev, "FW buffer length invalid!\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	block = kmalloc(FW_BLOCK_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!block)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		if (need_dfu_state) {</div><div class='add'>+			ret = at76_dfu_get_state(udev, &amp;dfu_state);</div><div class='add'>+			if (ret &lt; 0) {</div><div class='add'>+				dev_printk(KERN_ERR, &amp;udev-&gt;dev,</div><div class='add'>+					   "cannot get DFU state: %d\n", ret);</div><div class='add'>+				goto exit;</div><div class='add'>+			}</div><div class='add'>+			need_dfu_state = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		switch (dfu_state) {</div><div class='add'>+		case STATE_DFU_DOWNLOAD_SYNC:</div><div class='add'>+			at76_dbg(DBG_DFU, "STATE_DFU_DOWNLOAD_SYNC");</div><div class='add'>+			ret = at76_dfu_get_status(udev, &amp;dfu_stat_buf);</div><div class='add'>+			if (ret &gt;= 0) {</div><div class='add'>+				dfu_state = dfu_stat_buf.state;</div><div class='add'>+				dfu_timeout = at76_get_timeout(&amp;dfu_stat_buf);</div><div class='add'>+				need_dfu_state = 0;</div><div class='add'>+			} else</div><div class='add'>+				dev_printk(KERN_ERR, &amp;udev-&gt;dev,</div><div class='add'>+					   "at76_dfu_get_status returned %d\n",</div><div class='add'>+					   ret);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case STATE_DFU_DOWNLOAD_BUSY:</div><div class='add'>+			at76_dbg(DBG_DFU, "STATE_DFU_DOWNLOAD_BUSY");</div><div class='add'>+			need_dfu_state = 1;</div><div class='add'>+</div><div class='add'>+			at76_dbg(DBG_DFU, "DFU: Resetting device");</div><div class='add'>+			schedule_timeout_interruptible(dfu_timeout);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case STATE_DFU_DOWNLOAD_IDLE:</div><div class='add'>+			at76_dbg(DBG_DFU, "DOWNLOAD...");</div><div class='add'>+			/* fall through */</div><div class='add'>+		case STATE_DFU_IDLE:</div><div class='add'>+			at76_dbg(DBG_DFU, "DFU IDLE");</div><div class='add'>+</div><div class='add'>+			bsize = min_t(int, size, FW_BLOCK_SIZE);</div><div class='add'>+			memcpy(block, buf, bsize);</div><div class='add'>+			at76_dbg(DBG_DFU, "int fw, size left = %5d, "</div><div class='add'>+				 "bsize = %4d, blockno = %2d", size, bsize,</div><div class='add'>+				 blockno);</div><div class='add'>+			ret =</div><div class='add'>+			    at76_load_int_fw_block(udev, blockno, block, bsize);</div><div class='add'>+			buf += bsize;</div><div class='add'>+			size -= bsize;</div><div class='add'>+			blockno++;</div><div class='add'>+</div><div class='add'>+			if (ret != bsize)</div><div class='add'>+				dev_printk(KERN_ERR, &amp;udev-&gt;dev,</div><div class='add'>+					   "at76_load_int_fw_block "</div><div class='add'>+					   "returned %d\n", ret);</div><div class='add'>+			need_dfu_state = 1;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case STATE_DFU_MANIFEST_SYNC:</div><div class='add'>+			at76_dbg(DBG_DFU, "STATE_DFU_MANIFEST_SYNC");</div><div class='add'>+</div><div class='add'>+			ret = at76_dfu_get_status(udev, &amp;dfu_stat_buf);</div><div class='add'>+			if (ret &lt; 0)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			dfu_state = dfu_stat_buf.state;</div><div class='add'>+			dfu_timeout = at76_get_timeout(&amp;dfu_stat_buf);</div><div class='add'>+			need_dfu_state = 0;</div><div class='add'>+</div><div class='add'>+			/* override the timeout from the status response,</div><div class='add'>+			   needed for AT76C505A */</div><div class='add'>+			if (manifest_sync_timeout &gt; 0)</div><div class='add'>+				dfu_timeout = manifest_sync_timeout;</div><div class='add'>+</div><div class='add'>+			at76_dbg(DBG_DFU, "DFU: Waiting for manifest phase");</div><div class='add'>+			schedule_timeout_interruptible(dfu_timeout);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case STATE_DFU_MANIFEST:</div><div class='add'>+			at76_dbg(DBG_DFU, "STATE_DFU_MANIFEST");</div><div class='add'>+			is_done = 1;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case STATE_DFU_MANIFEST_WAIT_RESET:</div><div class='add'>+			at76_dbg(DBG_DFU, "STATE_DFU_MANIFEST_WAIT_RESET");</div><div class='add'>+			is_done = 1;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case STATE_DFU_UPLOAD_IDLE:</div><div class='add'>+			at76_dbg(DBG_DFU, "STATE_DFU_UPLOAD_IDLE");</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case STATE_DFU_ERROR:</div><div class='add'>+			at76_dbg(DBG_DFU, "STATE_DFU_ERROR");</div><div class='add'>+			ret = -EPIPE;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		default:</div><div class='add'>+			at76_dbg(DBG_DFU, "DFU UNKNOWN STATE (%d)", dfu_state);</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	} while (!is_done &amp;&amp; (ret &gt;= 0));</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	kfree(block);</div><div class='add'>+	if (ret &gt;= 0)</div><div class='add'>+		ret = 0;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Report that the scan results are ready */</div><div class='add'>+static inline void at76_iwevent_scan_complete(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	union iwreq_data wrqu;</div><div class='add'>+	wrqu.data.length = 0;</div><div class='add'>+	wrqu.data.flags = 0;</div><div class='add'>+	wireless_send_event(netdev, SIOCGIWSCAN, &amp;wrqu, NULL);</div><div class='add'>+	at76_dbg(DBG_WE_EVENTS, "%s: SIOCGIWSCAN sent", netdev-&gt;name);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void at76_iwevent_bss_connect(struct net_device *netdev,</div><div class='add'>+					    u8 *bssid)</div><div class='add'>+{</div><div class='add'>+	union iwreq_data wrqu;</div><div class='add'>+	wrqu.data.length = 0;</div><div class='add'>+	wrqu.data.flags = 0;</div><div class='add'>+	memcpy(wrqu.ap_addr.sa_data, bssid, ETH_ALEN);</div><div class='add'>+	wrqu.ap_addr.sa_family = ARPHRD_ETHER;</div><div class='add'>+	wireless_send_event(netdev, SIOCGIWAP, &amp;wrqu, NULL);</div><div class='add'>+	at76_dbg(DBG_WE_EVENTS, "%s: %s: SIOCGIWAP sent", netdev-&gt;name,</div><div class='add'>+		 __func__);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void at76_iwevent_bss_disconnect(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	union iwreq_data wrqu;</div><div class='add'>+	wrqu.data.length = 0;</div><div class='add'>+	wrqu.data.flags = 0;</div><div class='add'>+	memset(wrqu.ap_addr.sa_data, 0, ETH_ALEN);</div><div class='add'>+	wrqu.ap_addr.sa_family = ARPHRD_ETHER;</div><div class='add'>+	wireless_send_event(netdev, SIOCGIWAP, &amp;wrqu, NULL);</div><div class='add'>+	at76_dbg(DBG_WE_EVENTS, "%s: %s: SIOCGIWAP sent", netdev-&gt;name,</div><div class='add'>+		 __func__);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define HEX2STR_BUFFERS 4</div><div class='add'>+#define HEX2STR_MAX_LEN 64</div><div class='add'>+#define BIN2HEX(x) ((x) &lt; 10 ? '0' + (x) : (x) + 'A' - 10)</div><div class='add'>+</div><div class='add'>+/* Convert binary data into hex string */</div><div class='add'>+static char *hex2str(void *buf, int len)</div><div class='add'>+{</div><div class='add'>+	static atomic_t a = ATOMIC_INIT(0);</div><div class='add'>+	static char bufs[HEX2STR_BUFFERS][3 * HEX2STR_MAX_LEN + 1];</div><div class='add'>+	char *ret = bufs[atomic_inc_return(&amp;a) &amp; (HEX2STR_BUFFERS - 1)];</div><div class='add'>+	char *obuf = ret;</div><div class='add'>+	u8 *ibuf = buf;</div><div class='add'>+</div><div class='add'>+	if (len &gt; HEX2STR_MAX_LEN)</div><div class='add'>+		len = HEX2STR_MAX_LEN;</div><div class='add'>+</div><div class='add'>+	if (len &lt;= 0) {</div><div class='add'>+		ret[0] = '\0';</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	while (len--) {</div><div class='add'>+		*obuf++ = BIN2HEX(*ibuf &gt;&gt; 4);</div><div class='add'>+		*obuf++ = BIN2HEX(*ibuf &amp; 0xf);</div><div class='add'>+		*obuf++ = '-';</div><div class='add'>+		ibuf++;</div><div class='add'>+	}</div><div class='add'>+	*(--obuf) = '\0';</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define MAC2STR_BUFFERS 4</div><div class='add'>+</div><div class='add'>+static inline char *mac2str(u8 *mac)</div><div class='add'>+{</div><div class='add'>+	static atomic_t a = ATOMIC_INIT(0);</div><div class='add'>+	static char bufs[MAC2STR_BUFFERS][6 * 3];</div><div class='add'>+	char *str;</div><div class='add'>+</div><div class='add'>+	str = bufs[atomic_inc_return(&amp;a) &amp; (MAC2STR_BUFFERS - 1)];</div><div class='add'>+	sprintf(str, "%02x:%02x:%02x:%02x:%02x:%02x",</div><div class='add'>+		mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);</div><div class='add'>+	return str;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* LED trigger */</div><div class='add'>+static int tx_activity;</div><div class='add'>+static void at76_ledtrig_tx_timerfunc(unsigned long data);</div><div class='add'>+static DEFINE_TIMER(ledtrig_tx_timer, at76_ledtrig_tx_timerfunc, 0, 0);</div><div class='add'>+DEFINE_LED_TRIGGER(ledtrig_tx);</div><div class='add'>+</div><div class='add'>+static void at76_ledtrig_tx_timerfunc(unsigned long data)</div><div class='add'>+{</div><div class='add'>+	static int tx_lastactivity;</div><div class='add'>+</div><div class='add'>+	if (tx_lastactivity != tx_activity) {</div><div class='add'>+		tx_lastactivity = tx_activity;</div><div class='add'>+		led_trigger_event(ledtrig_tx, LED_FULL);</div><div class='add'>+		mod_timer(&amp;ledtrig_tx_timer, jiffies + HZ / 4);</div><div class='add'>+	} else</div><div class='add'>+		led_trigger_event(ledtrig_tx, LED_OFF);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void at76_ledtrig_tx_activity(void)</div><div class='add'>+{</div><div class='add'>+	tx_activity++;</div><div class='add'>+	if (!timer_pending(&amp;ledtrig_tx_timer))</div><div class='add'>+		mod_timer(&amp;ledtrig_tx_timer, jiffies + HZ / 4);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Check if the given ssid is hidden */</div><div class='add'>+static inline int at76_is_hidden_ssid(u8 *ssid, int length)</div><div class='add'>+{</div><div class='add'>+	static const u8 zeros[32];</div><div class='add'>+</div><div class='add'>+	if (length == 0)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	if (length == 1 &amp;&amp; ssid[0] == ' ')</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	return (memcmp(ssid, zeros, length) == 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void at76_free_bss_list(struct at76_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct list_head *next, *ptr;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;priv-&gt;bss_list_spinlock, flags);</div><div class='add'>+</div><div class='add'>+	priv-&gt;curr_bss = NULL;</div><div class='add'>+</div><div class='add'>+	list_for_each_safe(ptr, next, &amp;priv-&gt;bss_list) {</div><div class='add'>+		list_del(ptr);</div><div class='add'>+		kfree(list_entry(ptr, struct bss_info, list));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;priv-&gt;bss_list_spinlock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int at76_remap(struct usb_device *udev)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	ret = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0x0a,</div><div class='add'>+			      USB_TYPE_VENDOR | USB_DIR_OUT |</div><div class='add'>+			      USB_RECIP_INTERFACE, 0, 0, NULL, 0,</div><div class='add'>+			      USB_CTRL_GET_TIMEOUT);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int at76_get_op_mode(struct usb_device *udev)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u8 op_mode;</div><div class='add'>+</div><div class='add'>+	ret = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), 0x33,</div><div class='add'>+			      USB_TYPE_VENDOR | USB_DIR_IN |</div><div class='add'>+			      USB_RECIP_INTERFACE, 0x01, 0, &amp;op_mode, 1,</div><div class='add'>+			      USB_CTRL_GET_TIMEOUT);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	else if (ret &lt; 1)</div><div class='add'>+		return -EIO;</div><div class='add'>+	else</div><div class='add'>+		return op_mode;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Load a block of the second ("external") part of the firmware */</div><div class='add'>+static inline int at76_load_ext_fw_block(struct usb_device *udev, int blockno,</div><div class='add'>+					 void *block, int size)</div><div class='add'>+{</div><div class='add'>+	return usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0x0e,</div><div class='add'>+			       USB_TYPE_VENDOR | USB_DIR_OUT | USB_RECIP_DEVICE,</div><div class='add'>+			       0x0802, blockno, block, size,</div><div class='add'>+			       USB_CTRL_GET_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int at76_get_hw_cfg(struct usb_device *udev,</div><div class='add'>+				  union at76_hwcfg *buf, int buf_size)</div><div class='add'>+{</div><div class='add'>+	return usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), 0x33,</div><div class='add'>+			       USB_TYPE_VENDOR | USB_DIR_IN |</div><div class='add'>+			       USB_RECIP_INTERFACE, 0x0a02, 0,</div><div class='add'>+			       buf, buf_size, USB_CTRL_GET_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Intersil boards use a different "value" for GetHWConfig requests */</div><div class='add'>+static inline int at76_get_hw_cfg_intersil(struct usb_device *udev,</div><div class='add'>+					   union at76_hwcfg *buf, int buf_size)</div><div class='add'>+{</div><div class='add'>+	return usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), 0x33,</div><div class='add'>+			       USB_TYPE_VENDOR | USB_DIR_IN |</div><div class='add'>+			       USB_RECIP_INTERFACE, 0x0902, 0,</div><div class='add'>+			       buf, buf_size, USB_CTRL_GET_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Get the hardware configuration for the adapter and put it to the appropriate</div><div class='add'>+ * fields of 'priv' (the GetHWConfig request and interpretation of the result</div><div class='add'>+ * depends on the board type) */</div><div class='add'>+static int at76_get_hw_config(struct at76_priv *priv)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	union at76_hwcfg *hwcfg = kmalloc(sizeof(*hwcfg), GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (!hwcfg)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (at76_is_intersil(priv-&gt;board_type)) {</div><div class='add'>+		ret = at76_get_hw_cfg_intersil(priv-&gt;udev, hwcfg,</div><div class='add'>+					       sizeof(hwcfg-&gt;i));</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto exit;</div><div class='add'>+		memcpy(priv-&gt;mac_addr, hwcfg-&gt;i.mac_addr, ETH_ALEN);</div><div class='add'>+		priv-&gt;regulatory_domain = hwcfg-&gt;i.regulatory_domain;</div><div class='add'>+	} else if (at76_is_503rfmd(priv-&gt;board_type)) {</div><div class='add'>+		ret = at76_get_hw_cfg(priv-&gt;udev, hwcfg, sizeof(hwcfg-&gt;r3));</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto exit;</div><div class='add'>+		memcpy(priv-&gt;mac_addr, hwcfg-&gt;r3.mac_addr, ETH_ALEN);</div><div class='add'>+		priv-&gt;regulatory_domain = hwcfg-&gt;r3.regulatory_domain;</div><div class='add'>+	} else {</div><div class='add'>+		ret = at76_get_hw_cfg(priv-&gt;udev, hwcfg, sizeof(hwcfg-&gt;r5));</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto exit;</div><div class='add'>+		memcpy(priv-&gt;mac_addr, hwcfg-&gt;r5.mac_addr, ETH_ALEN);</div><div class='add'>+		priv-&gt;regulatory_domain = hwcfg-&gt;r5.regulatory_domain;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	kfree(hwcfg);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		printk(KERN_ERR "%s: cannot get HW Config (error %d)\n",</div><div class='add'>+		       priv-&gt;netdev-&gt;name, ret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct reg_domain const *at76_get_reg_domain(u16 code)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	static struct reg_domain const fd_tab[] = {</div><div class='add'>+		{0x10, "FCC (USA)", 0x7ff},	/* ch 1-11 */</div><div class='add'>+		{0x20, "IC (Canada)", 0x7ff},	/* ch 1-11 */</div><div class='add'>+		{0x30, "ETSI (most of Europe)", 0x1fff},	/* ch 1-13 */</div><div class='add'>+		{0x31, "Spain", 0x600},	/* ch 10-11 */</div><div class='add'>+		{0x32, "France", 0x1e00},	/* ch 10-13 */</div><div class='add'>+		{0x40, "MKK (Japan)", 0x2000},	/* ch 14 */</div><div class='add'>+		{0x41, "MKK1 (Japan)", 0x3fff},	/* ch 1-14 */</div><div class='add'>+		{0x50, "Israel", 0x3fc},	/* ch 3-9 */</div><div class='add'>+		{0x00, "&lt;unknown&gt;", 0xffffffff}	/* ch 1-32 */</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/* Last entry is fallback for unknown domain code */</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(fd_tab) - 1; i++)</div><div class='add'>+		if (code == fd_tab[i].code)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+	return &amp;fd_tab[i];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int at76_get_mib(struct usb_device *udev, u16 mib, void *buf,</div><div class='add'>+			       int buf_size)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), 0x33,</div><div class='add'>+			      USB_TYPE_VENDOR | USB_DIR_IN |</div><div class='add'>+			      USB_RECIP_INTERFACE, mib &lt;&lt; 8, 0, buf, buf_size,</div><div class='add'>+			      USB_CTRL_GET_TIMEOUT);</div><div class='add'>+	if (ret &gt;= 0 &amp;&amp; ret != buf_size)</div><div class='add'>+		return -EIO;</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Return positive number for status, negative for an error */</div><div class='add'>+static inline int at76_get_cmd_status(struct usb_device *udev, u8 cmd)</div><div class='add'>+{</div><div class='add'>+	u8 stat_buf[40];</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), 0x22,</div><div class='add'>+			      USB_TYPE_VENDOR | USB_DIR_IN |</div><div class='add'>+			      USB_RECIP_INTERFACE, cmd, 0, stat_buf,</div><div class='add'>+			      sizeof(stat_buf), USB_CTRL_GET_TIMEOUT);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return stat_buf[5];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int at76_set_card_command(struct usb_device *udev, int cmd, void *buf,</div><div class='add'>+				 int buf_size)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct at76_command *cmd_buf = kmalloc(sizeof(struct at76_command) +</div><div class='add'>+					       buf_size, GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (!cmd_buf)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd_buf-&gt;cmd = cmd;</div><div class='add'>+	cmd_buf-&gt;reserved = 0;</div><div class='add'>+	cmd_buf-&gt;size = cpu_to_le16(buf_size);</div><div class='add'>+	memcpy(cmd_buf-&gt;data, buf, buf_size);</div><div class='add'>+</div><div class='add'>+	ret = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0x0e,</div><div class='add'>+			      USB_TYPE_VENDOR | USB_DIR_OUT | USB_RECIP_DEVICE,</div><div class='add'>+			      0, 0, cmd_buf,</div><div class='add'>+			      sizeof(struct at76_command) + buf_size,</div><div class='add'>+			      USB_CTRL_GET_TIMEOUT);</div><div class='add'>+	kfree(cmd_buf);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define MAKE_CMD_STATUS_CASE(c)	case (c): return #c</div><div class='add'>+static const char *at76_get_cmd_status_string(u8 cmd_status)</div><div class='add'>+{</div><div class='add'>+	switch (cmd_status) {</div><div class='add'>+		MAKE_CMD_STATUS_CASE(CMD_STATUS_IDLE);</div><div class='add'>+		MAKE_CMD_STATUS_CASE(CMD_STATUS_COMPLETE);</div><div class='add'>+		MAKE_CMD_STATUS_CASE(CMD_STATUS_UNKNOWN);</div><div class='add'>+		MAKE_CMD_STATUS_CASE(CMD_STATUS_INVALID_PARAMETER);</div><div class='add'>+		MAKE_CMD_STATUS_CASE(CMD_STATUS_FUNCTION_NOT_SUPPORTED);</div><div class='add'>+		MAKE_CMD_STATUS_CASE(CMD_STATUS_TIME_OUT);</div><div class='add'>+		MAKE_CMD_STATUS_CASE(CMD_STATUS_IN_PROGRESS);</div><div class='add'>+		MAKE_CMD_STATUS_CASE(CMD_STATUS_HOST_FAILURE);</div><div class='add'>+		MAKE_CMD_STATUS_CASE(CMD_STATUS_SCAN_FAILED);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return "UNKNOWN";</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Wait until the command is completed */</div><div class='add'>+static int at76_wait_completion(struct at76_priv *priv, int cmd)</div><div class='add'>+{</div><div class='add'>+	int status = 0;</div><div class='add'>+	unsigned long timeout = jiffies + CMD_COMPLETION_TIMEOUT;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		status = at76_get_cmd_status(priv-&gt;udev, cmd);</div><div class='add'>+		if (status &lt; 0) {</div><div class='add'>+			printk(KERN_ERR "%s: at76_get_cmd_status failed: %d\n",</div><div class='add'>+			       priv-&gt;netdev-&gt;name, status);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		at76_dbg(DBG_WAIT_COMPLETE,</div><div class='add'>+			 "%s: Waiting on cmd %d, status = %d (%s)",</div><div class='add'>+			 priv-&gt;netdev-&gt;name, cmd, status,</div><div class='add'>+			 at76_get_cmd_status_string(status));</div><div class='add'>+</div><div class='add'>+		if (status != CMD_STATUS_IN_PROGRESS</div><div class='add'>+		    &amp;&amp; status != CMD_STATUS_IDLE)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		schedule_timeout_interruptible(HZ / 10);	/* 100 ms */</div><div class='add'>+		if (time_after(jiffies, timeout)) {</div><div class='add'>+			printk(KERN_ERR</div><div class='add'>+			       "%s: completion timeout for command %d\n",</div><div class='add'>+			       priv-&gt;netdev-&gt;name, cmd);</div><div class='add'>+			status = -ETIMEDOUT;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	} while (1);</div><div class='add'>+</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int at76_set_mib(struct at76_priv *priv, struct set_mib_buffer *buf)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = at76_set_card_command(priv-&gt;udev, CMD_SET_MIB, buf,</div><div class='add'>+				    offsetof(struct set_mib_buffer,</div><div class='add'>+					     data) + buf-&gt;size);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = at76_wait_completion(priv, CMD_SET_MIB);</div><div class='add'>+	if (ret != CMD_STATUS_COMPLETE) {</div><div class='add'>+		printk(KERN_INFO</div><div class='add'>+		       "%s: set_mib: at76_wait_completion failed "</div><div class='add'>+		       "with %d\n", priv-&gt;netdev-&gt;name, ret);</div><div class='add'>+		ret = -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Return &lt; 0 on error, == 0 if no command sent, == 1 if cmd sent */</div><div class='add'>+static int at76_set_radio(struct at76_priv *priv, int enable)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	int cmd;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;radio_on == enable)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	cmd = enable ? CMD_RADIO_ON : CMD_RADIO_OFF;</div><div class='add'>+</div><div class='add'>+	ret = at76_set_card_command(priv-&gt;udev, cmd, NULL, 0);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		printk(KERN_ERR "%s: at76_set_card_command(%d) failed: %d\n",</div><div class='add'>+		       priv-&gt;netdev-&gt;name, cmd, ret);</div><div class='add'>+	else</div><div class='add'>+		ret = 1;</div><div class='add'>+</div><div class='add'>+	priv-&gt;radio_on = enable;</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Set current power save mode (AT76_PM_OFF/AT76_PM_ON/AT76_PM_SMART) */</div><div class='add'>+static int at76_set_pm_mode(struct at76_priv *priv)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	priv-&gt;mib_buf.type = MIB_MAC_MGMT;</div><div class='add'>+	priv-&gt;mib_buf.size = 1;</div><div class='add'>+	priv-&gt;mib_buf.index = offsetof(struct mib_mac_mgmt, power_mgmt_mode);</div><div class='add'>+	priv-&gt;mib_buf.data.byte = priv-&gt;pm_mode;</div><div class='add'>+</div><div class='add'>+	ret = at76_set_mib(priv, &amp;priv-&gt;mib_buf);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		printk(KERN_ERR "%s: set_mib (pm_mode) failed: %d\n",</div><div class='add'>+		       priv-&gt;netdev-&gt;name, ret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Set the association id for power save mode */</div><div class='add'>+static int at76_set_associd(struct at76_priv *priv, u16 id)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	priv-&gt;mib_buf.type = MIB_MAC_MGMT;</div><div class='add'>+	priv-&gt;mib_buf.size = 2;</div><div class='add'>+	priv-&gt;mib_buf.index = offsetof(struct mib_mac_mgmt, station_id);</div><div class='add'>+	priv-&gt;mib_buf.data.word = cpu_to_le16(id);</div><div class='add'>+</div><div class='add'>+	ret = at76_set_mib(priv, &amp;priv-&gt;mib_buf);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		printk(KERN_ERR "%s: set_mib (associd) failed: %d\n",</div><div class='add'>+		       priv-&gt;netdev-&gt;name, ret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Set the listen interval for power save mode */</div><div class='add'>+static int at76_set_listen_interval(struct at76_priv *priv, u16 interval)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	priv-&gt;mib_buf.type = MIB_MAC;</div><div class='add'>+	priv-&gt;mib_buf.size = 2;</div><div class='add'>+	priv-&gt;mib_buf.index = offsetof(struct mib_mac, listen_interval);</div><div class='add'>+	priv-&gt;mib_buf.data.word = cpu_to_le16(interval);</div><div class='add'>+</div><div class='add'>+	ret = at76_set_mib(priv, &amp;priv-&gt;mib_buf);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "%s: set_mib (listen_interval) failed: %d\n",</div><div class='add'>+		       priv-&gt;netdev-&gt;name, ret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int at76_set_preamble(struct at76_priv *priv, u8 type)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	priv-&gt;mib_buf.type = MIB_LOCAL;</div><div class='add'>+	priv-&gt;mib_buf.size = 1;</div><div class='add'>+	priv-&gt;mib_buf.index = offsetof(struct mib_local, preamble_type);</div><div class='add'>+	priv-&gt;mib_buf.data.byte = type;</div><div class='add'>+</div><div class='add'>+	ret = at76_set_mib(priv, &amp;priv-&gt;mib_buf);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		printk(KERN_ERR "%s: set_mib (preamble) failed: %d\n",</div><div class='add'>+		       priv-&gt;netdev-&gt;name, ret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int at76_set_frag(struct at76_priv *priv, u16 size)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	priv-&gt;mib_buf.type = MIB_MAC;</div><div class='add'>+	priv-&gt;mib_buf.size = 2;</div><div class='add'>+	priv-&gt;mib_buf.index = offsetof(struct mib_mac, frag_threshold);</div><div class='add'>+	priv-&gt;mib_buf.data.word = cpu_to_le16(size);</div><div class='add'>+</div><div class='add'>+	ret = at76_set_mib(priv, &amp;priv-&gt;mib_buf);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		printk(KERN_ERR "%s: set_mib (frag threshold) failed: %d\n",</div><div class='add'>+		       priv-&gt;netdev-&gt;name, ret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int at76_set_rts(struct at76_priv *priv, u16 size)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	priv-&gt;mib_buf.type = MIB_MAC;</div><div class='add'>+	priv-&gt;mib_buf.size = 2;</div><div class='add'>+	priv-&gt;mib_buf.index = offsetof(struct mib_mac, rts_threshold);</div><div class='add'>+	priv-&gt;mib_buf.data.word = cpu_to_le16(size);</div><div class='add'>+</div><div class='add'>+	ret = at76_set_mib(priv, &amp;priv-&gt;mib_buf);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		printk(KERN_ERR "%s: set_mib (rts) failed: %d\n",</div><div class='add'>+		       priv-&gt;netdev-&gt;name, ret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int at76_set_autorate_fallback(struct at76_priv *priv, int onoff)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	priv-&gt;mib_buf.type = MIB_LOCAL;</div><div class='add'>+	priv-&gt;mib_buf.size = 1;</div><div class='add'>+	priv-&gt;mib_buf.index = offsetof(struct mib_local, txautorate_fallback);</div><div class='add'>+	priv-&gt;mib_buf.data.byte = onoff;</div><div class='add'>+</div><div class='add'>+	ret = at76_set_mib(priv, &amp;priv-&gt;mib_buf);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		printk(KERN_ERR "%s: set_mib (autorate fallback) failed: %d\n",</div><div class='add'>+		       priv-&gt;netdev-&gt;name, ret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int at76_add_mac_address(struct at76_priv *priv, void *addr)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	priv-&gt;mib_buf.type = MIB_MAC_ADDR;</div><div class='add'>+	priv-&gt;mib_buf.size = ETH_ALEN;</div><div class='add'>+	priv-&gt;mib_buf.index = offsetof(struct mib_mac_addr, mac_addr);</div><div class='add'>+	memcpy(priv-&gt;mib_buf.data.addr, addr, ETH_ALEN);</div><div class='add'>+</div><div class='add'>+	ret = at76_set_mib(priv, &amp;priv-&gt;mib_buf);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		printk(KERN_ERR "%s: set_mib (MAC_ADDR, mac_addr) failed: %d\n",</div><div class='add'>+		       priv-&gt;netdev-&gt;name, ret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void at76_dump_mib_mac_addr(struct at76_priv *priv)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	int ret;</div><div class='add'>+	struct mib_mac_addr *m = kmalloc(sizeof(struct mib_mac_addr),</div><div class='add'>+					 GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (!m)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ret = at76_get_mib(priv-&gt;udev, MIB_MAC_ADDR, m,</div><div class='add'>+			   sizeof(struct mib_mac_addr));</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		printk(KERN_ERR "%s: at76_get_mib (MAC_ADDR) failed: %d\n",</div><div class='add'>+		       priv-&gt;netdev-&gt;name, ret);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_MIB, "%s: MIB MAC_ADDR: mac_addr %s res 0x%x 0x%x",</div><div class='add'>+		 priv-&gt;netdev-&gt;name,</div><div class='add'>+		 mac2str(m-&gt;mac_addr), m-&gt;res[0], m-&gt;res[1]);</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(m-&gt;group_addr); i++)</div><div class='add'>+		at76_dbg(DBG_MIB, "%s: MIB MAC_ADDR: group addr %d: %s, "</div><div class='add'>+			 "status %d", priv-&gt;netdev-&gt;name, i,</div><div class='add'>+			 mac2str(m-&gt;group_addr[i]), m-&gt;group_addr_status[i]);</div><div class='add'>+exit:</div><div class='add'>+	kfree(m);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void at76_dump_mib_mac_wep(struct at76_priv *priv)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	int ret;</div><div class='add'>+	int key_len;</div><div class='add'>+	struct mib_mac_wep *m = kmalloc(sizeof(struct mib_mac_wep), GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (!m)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ret = at76_get_mib(priv-&gt;udev, MIB_MAC_WEP, m,</div><div class='add'>+			   sizeof(struct mib_mac_wep));</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		printk(KERN_ERR "%s: at76_get_mib (MAC_WEP) failed: %d\n",</div><div class='add'>+		       priv-&gt;netdev-&gt;name, ret);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_MIB, "%s: MIB MAC_WEP: priv_invoked %u def_key_id %u "</div><div class='add'>+		 "key_len %u excl_unencr %u wep_icv_err %u wep_excluded %u "</div><div class='add'>+		 "encr_level %u key %d", priv-&gt;netdev-&gt;name,</div><div class='add'>+		 m-&gt;privacy_invoked, m-&gt;wep_default_key_id,</div><div class='add'>+		 m-&gt;wep_key_mapping_len, m-&gt;exclude_unencrypted,</div><div class='add'>+		 le32_to_cpu(m-&gt;wep_icv_error_count),</div><div class='add'>+		 le32_to_cpu(m-&gt;wep_excluded_count), m-&gt;encryption_level,</div><div class='add'>+		 m-&gt;wep_default_key_id);</div><div class='add'>+</div><div class='add'>+	key_len = (m-&gt;encryption_level == 1) ?</div><div class='add'>+	    WEP_SMALL_KEY_LEN : WEP_LARGE_KEY_LEN;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; WEP_KEYS; i++)</div><div class='add'>+		at76_dbg(DBG_MIB, "%s: MIB MAC_WEP: key %d: %s",</div><div class='add'>+			 priv-&gt;netdev-&gt;name, i,</div><div class='add'>+			 hex2str(m-&gt;wep_default_keyvalue[i], key_len));</div><div class='add'>+exit:</div><div class='add'>+	kfree(m);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void at76_dump_mib_mac_mgmt(struct at76_priv *priv)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct mib_mac_mgmt *m = kmalloc(sizeof(struct mib_mac_mgmt),</div><div class='add'>+					 GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (!m)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ret = at76_get_mib(priv-&gt;udev, MIB_MAC_MGMT, m,</div><div class='add'>+			   sizeof(struct mib_mac_mgmt));</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		printk(KERN_ERR "%s: at76_get_mib (MAC_MGMT) failed: %d\n",</div><div class='add'>+		       priv-&gt;netdev-&gt;name, ret);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_MIB, "%s: MIB MAC_MGMT: beacon_period %d CFP_max_duration "</div><div class='add'>+		 "%d medium_occupancy_limit %d station_id 0x%x ATIM_window %d "</div><div class='add'>+		 "CFP_mode %d privacy_opt_impl %d DTIM_period %d CFP_period %d "</div><div class='add'>+		 "current_bssid %s current_essid %s current_bss_type %d "</div><div class='add'>+		 "pm_mode %d ibss_change %d res %d "</div><div class='add'>+		 "multi_domain_capability_implemented %d "</div><div class='add'>+		 "international_roaming %d country_string %.3s",</div><div class='add'>+		 priv-&gt;netdev-&gt;name, le16_to_cpu(m-&gt;beacon_period),</div><div class='add'>+		 le16_to_cpu(m-&gt;CFP_max_duration),</div><div class='add'>+		 le16_to_cpu(m-&gt;medium_occupancy_limit),</div><div class='add'>+		 le16_to_cpu(m-&gt;station_id), le16_to_cpu(m-&gt;ATIM_window),</div><div class='add'>+		 m-&gt;CFP_mode, m-&gt;privacy_option_implemented, m-&gt;DTIM_period,</div><div class='add'>+		 m-&gt;CFP_period, mac2str(m-&gt;current_bssid),</div><div class='add'>+		 hex2str(m-&gt;current_essid, IW_ESSID_MAX_SIZE),</div><div class='add'>+		 m-&gt;current_bss_type, m-&gt;power_mgmt_mode, m-&gt;ibss_change,</div><div class='add'>+		 m-&gt;res, m-&gt;multi_domain_capability_implemented,</div><div class='add'>+		 m-&gt;multi_domain_capability_enabled, m-&gt;country_string);</div><div class='add'>+exit:</div><div class='add'>+	kfree(m);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void at76_dump_mib_mac(struct at76_priv *priv)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct mib_mac *m = kmalloc(sizeof(struct mib_mac), GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (!m)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ret = at76_get_mib(priv-&gt;udev, MIB_MAC, m, sizeof(struct mib_mac));</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		printk(KERN_ERR "%s: at76_get_mib (MAC) failed: %d\n",</div><div class='add'>+		       priv-&gt;netdev-&gt;name, ret);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_MIB, "%s: MIB MAC: max_tx_msdu_lifetime %d "</div><div class='add'>+		 "max_rx_lifetime %d frag_threshold %d rts_threshold %d "</div><div class='add'>+		 "cwmin %d cwmax %d short_retry_time %d long_retry_time %d "</div><div class='add'>+		 "scan_type %d scan_channel %d probe_delay %u "</div><div class='add'>+		 "min_channel_time %d max_channel_time %d listen_int %d "</div><div class='add'>+		 "desired_ssid %s desired_bssid %s desired_bsstype %d",</div><div class='add'>+		 priv-&gt;netdev-&gt;name, le32_to_cpu(m-&gt;max_tx_msdu_lifetime),</div><div class='add'>+		 le32_to_cpu(m-&gt;max_rx_lifetime),</div><div class='add'>+		 le16_to_cpu(m-&gt;frag_threshold), le16_to_cpu(m-&gt;rts_threshold),</div><div class='add'>+		 le16_to_cpu(m-&gt;cwmin), le16_to_cpu(m-&gt;cwmax),</div><div class='add'>+		 m-&gt;short_retry_time, m-&gt;long_retry_time, m-&gt;scan_type,</div><div class='add'>+		 m-&gt;scan_channel, le16_to_cpu(m-&gt;probe_delay),</div><div class='add'>+		 le16_to_cpu(m-&gt;min_channel_time),</div><div class='add'>+		 le16_to_cpu(m-&gt;max_channel_time),</div><div class='add'>+		 le16_to_cpu(m-&gt;listen_interval),</div><div class='add'>+		 hex2str(m-&gt;desired_ssid, IW_ESSID_MAX_SIZE),</div><div class='add'>+		 mac2str(m-&gt;desired_bssid), m-&gt;desired_bsstype);</div><div class='add'>+exit:</div><div class='add'>+	kfree(m);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void at76_dump_mib_phy(struct at76_priv *priv)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct mib_phy *m = kmalloc(sizeof(struct mib_phy), GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (!m)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ret = at76_get_mib(priv-&gt;udev, MIB_PHY, m, sizeof(struct mib_phy));</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		printk(KERN_ERR "%s: at76_get_mib (PHY) failed: %d\n",</div><div class='add'>+		       priv-&gt;netdev-&gt;name, ret);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_MIB, "%s: MIB PHY: ed_threshold %d slot_time %d "</div><div class='add'>+		 "sifs_time %d preamble_length %d plcp_header_length %d "</div><div class='add'>+		 "mpdu_max_length %d cca_mode_supported %d operation_rate_set "</div><div class='add'>+		 "0x%x 0x%x 0x%x 0x%x channel_id %d current_cca_mode %d "</div><div class='add'>+		 "phy_type %d current_reg_domain %d",</div><div class='add'>+		 priv-&gt;netdev-&gt;name, le32_to_cpu(m-&gt;ed_threshold),</div><div class='add'>+		 le16_to_cpu(m-&gt;slot_time), le16_to_cpu(m-&gt;sifs_time),</div><div class='add'>+		 le16_to_cpu(m-&gt;preamble_length),</div><div class='add'>+		 le16_to_cpu(m-&gt;plcp_header_length),</div><div class='add'>+		 le16_to_cpu(m-&gt;mpdu_max_length),</div><div class='add'>+		 le16_to_cpu(m-&gt;cca_mode_supported), m-&gt;operation_rate_set[0],</div><div class='add'>+		 m-&gt;operation_rate_set[1], m-&gt;operation_rate_set[2],</div><div class='add'>+		 m-&gt;operation_rate_set[3], m-&gt;channel_id, m-&gt;current_cca_mode,</div><div class='add'>+		 m-&gt;phy_type, m-&gt;current_reg_domain);</div><div class='add'>+exit:</div><div class='add'>+	kfree(m);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void at76_dump_mib_local(struct at76_priv *priv)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct mib_local *m = kmalloc(sizeof(struct mib_phy), GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (!m)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ret = at76_get_mib(priv-&gt;udev, MIB_LOCAL, m, sizeof(struct mib_local));</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		printk(KERN_ERR "%s: at76_get_mib (LOCAL) failed: %d\n",</div><div class='add'>+		       priv-&gt;netdev-&gt;name, ret);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_MIB, "%s: MIB LOCAL: beacon_enable %d "</div><div class='add'>+		 "txautorate_fallback %d ssid_size %d promiscuous_mode %d "</div><div class='add'>+		 "preamble_type %d", priv-&gt;netdev-&gt;name, m-&gt;beacon_enable,</div><div class='add'>+		 m-&gt;txautorate_fallback, m-&gt;ssid_size, m-&gt;promiscuous_mode,</div><div class='add'>+		 m-&gt;preamble_type);</div><div class='add'>+exit:</div><div class='add'>+	kfree(m);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void at76_dump_mib_mdomain(struct at76_priv *priv)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct mib_mdomain *m = kmalloc(sizeof(struct mib_mdomain), GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (!m)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ret = at76_get_mib(priv-&gt;udev, MIB_MDOMAIN, m,</div><div class='add'>+			   sizeof(struct mib_mdomain));</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		printk(KERN_ERR "%s: at76_get_mib (MDOMAIN) failed: %d\n",</div><div class='add'>+		       priv-&gt;netdev-&gt;name, ret);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_MIB, "%s: MIB MDOMAIN: channel_list %s",</div><div class='add'>+		 priv-&gt;netdev-&gt;name,</div><div class='add'>+		 hex2str(m-&gt;channel_list, sizeof(m-&gt;channel_list)));</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_MIB, "%s: MIB MDOMAIN: tx_powerlevel %s",</div><div class='add'>+		 priv-&gt;netdev-&gt;name,</div><div class='add'>+		 hex2str(m-&gt;tx_powerlevel, sizeof(m-&gt;tx_powerlevel)));</div><div class='add'>+exit:</div><div class='add'>+	kfree(m);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int at76_get_current_bssid(struct at76_priv *priv)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+	struct mib_mac_mgmt *mac_mgmt =</div><div class='add'>+	    kmalloc(sizeof(struct mib_mac_mgmt), GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (!mac_mgmt) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = at76_get_mib(priv-&gt;udev, MIB_MAC_MGMT, mac_mgmt,</div><div class='add'>+			   sizeof(struct mib_mac_mgmt));</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		printk(KERN_ERR "%s: at76_get_mib failed: %d\n",</div><div class='add'>+		       priv-&gt;netdev-&gt;name, ret);</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+	memcpy(priv-&gt;bssid, mac_mgmt-&gt;current_bssid, ETH_ALEN);</div><div class='add'>+	printk(KERN_INFO "%s: using BSSID %s\n", priv-&gt;netdev-&gt;name,</div><div class='add'>+	       mac2str(priv-&gt;bssid));</div><div class='add'>+error:</div><div class='add'>+	kfree(mac_mgmt);</div><div class='add'>+exit:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int at76_get_current_channel(struct at76_priv *priv)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+	struct mib_phy *phy = kmalloc(sizeof(struct mib_phy), GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (!phy) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+	ret = at76_get_mib(priv-&gt;udev, MIB_PHY, phy, sizeof(struct mib_phy));</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		printk(KERN_ERR "%s: at76_get_mib(MIB_PHY) failed: %d\n",</div><div class='add'>+		       priv-&gt;netdev-&gt;name, ret);</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+	priv-&gt;channel = phy-&gt;channel_id;</div><div class='add'>+error:</div><div class='add'>+	kfree(phy);</div><div class='add'>+exit:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * at76_start_scan - start a scan</div><div class='add'>+ *</div><div class='add'>+ * @use_essid - use the configured ESSID in non passive mode</div><div class='add'>+ */</div><div class='add'>+static int at76_start_scan(struct at76_priv *priv, int use_essid)</div><div class='add'>+{</div><div class='add'>+	struct at76_req_scan scan;</div><div class='add'>+</div><div class='add'>+	memset(&amp;scan, 0, sizeof(struct at76_req_scan));</div><div class='add'>+	memset(scan.bssid, 0xff, ETH_ALEN);</div><div class='add'>+</div><div class='add'>+	if (use_essid) {</div><div class='add'>+		memcpy(scan.essid, priv-&gt;essid, IW_ESSID_MAX_SIZE);</div><div class='add'>+		scan.essid_size = priv-&gt;essid_size;</div><div class='add'>+	} else</div><div class='add'>+		scan.essid_size = 0;</div><div class='add'>+</div><div class='add'>+	/* jal: why should we start at a certain channel? we do scan the whole</div><div class='add'>+	   range allowed by reg domain. */</div><div class='add'>+	scan.channel = priv-&gt;channel;</div><div class='add'>+</div><div class='add'>+	/* atmelwlandriver differs between scan type 0 and 1 (active/passive)</div><div class='add'>+	   For ad-hoc mode, it uses type 0 only. */</div><div class='add'>+	scan.scan_type = priv-&gt;scan_mode;</div><div class='add'>+</div><div class='add'>+	/* INFO: For probe_delay, not multiplying by 1024 as this will be</div><div class='add'>+	   slightly less than min_channel_time</div><div class='add'>+	   (per spec: probe delay &lt; min. channel time) */</div><div class='add'>+	scan.min_channel_time = cpu_to_le16(priv-&gt;scan_min_time);</div><div class='add'>+	scan.max_channel_time = cpu_to_le16(priv-&gt;scan_max_time);</div><div class='add'>+	scan.probe_delay = cpu_to_le16(priv-&gt;scan_min_time * 1000);</div><div class='add'>+	scan.international_scan = 0;</div><div class='add'>+</div><div class='add'>+	/* other values are set to 0 for type 0 */</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_PROGRESS, "%s: start_scan (use_essid = %d, intl = %d, "</div><div class='add'>+		 "channel = %d, probe_delay = %d, scan_min_time = %d, "</div><div class='add'>+		 "scan_max_time = %d)",</div><div class='add'>+		 priv-&gt;netdev-&gt;name, use_essid,</div><div class='add'>+		 scan.international_scan, scan.channel,</div><div class='add'>+		 le16_to_cpu(scan.probe_delay),</div><div class='add'>+		 le16_to_cpu(scan.min_channel_time),</div><div class='add'>+		 le16_to_cpu(scan.max_channel_time));</div><div class='add'>+</div><div class='add'>+	return at76_set_card_command(priv-&gt;udev, CMD_SCAN, &amp;scan, sizeof(scan));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Enable monitor mode */</div><div class='add'>+static int at76_start_monitor(struct at76_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct at76_req_scan scan;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	memset(&amp;scan, 0, sizeof(struct at76_req_scan));</div><div class='add'>+	memset(scan.bssid, 0xff, ETH_ALEN);</div><div class='add'>+</div><div class='add'>+	scan.channel = priv-&gt;channel;</div><div class='add'>+	scan.scan_type = SCAN_TYPE_PASSIVE;</div><div class='add'>+	scan.international_scan = 0;</div><div class='add'>+</div><div class='add'>+	ret = at76_set_card_command(priv-&gt;udev, CMD_SCAN, &amp;scan, sizeof(scan));</div><div class='add'>+	if (ret &gt;= 0)</div><div class='add'>+		ret = at76_get_cmd_status(priv-&gt;udev, CMD_SCAN);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int at76_start_ibss(struct at76_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct at76_req_ibss bss;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	WARN_ON(priv-&gt;mac_state != MAC_OWN_IBSS);</div><div class='add'>+	if (priv-&gt;mac_state != MAC_OWN_IBSS)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	memset(&amp;bss, 0, sizeof(struct at76_req_ibss));</div><div class='add'>+	memset(bss.bssid, 0xff, ETH_ALEN);</div><div class='add'>+	memcpy(bss.essid, priv-&gt;essid, IW_ESSID_MAX_SIZE);</div><div class='add'>+	bss.essid_size = priv-&gt;essid_size;</div><div class='add'>+	bss.bss_type = ADHOC_MODE;</div><div class='add'>+	bss.channel = priv-&gt;channel;</div><div class='add'>+</div><div class='add'>+	ret = at76_set_card_command(priv-&gt;udev, CMD_START_IBSS, &amp;bss,</div><div class='add'>+				    sizeof(struct at76_req_ibss));</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		printk(KERN_ERR "%s: start_ibss failed: %d\n",</div><div class='add'>+		       priv-&gt;netdev-&gt;name, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = at76_wait_completion(priv, CMD_START_IBSS);</div><div class='add'>+	if (ret != CMD_STATUS_COMPLETE) {</div><div class='add'>+		printk(KERN_ERR "%s: start_ibss failed to complete, %d\n",</div><div class='add'>+		       priv-&gt;netdev-&gt;name, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = at76_get_current_bssid(priv);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = at76_get_current_channel(priv);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* not sure what this is good for ??? */</div><div class='add'>+	priv-&gt;mib_buf.type = MIB_MAC_MGMT;</div><div class='add'>+	priv-&gt;mib_buf.size = 1;</div><div class='add'>+	priv-&gt;mib_buf.index = offsetof(struct mib_mac_mgmt, ibss_change);</div><div class='add'>+	priv-&gt;mib_buf.data.byte = 0;</div><div class='add'>+</div><div class='add'>+	ret = at76_set_mib(priv, &amp;priv-&gt;mib_buf);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		printk(KERN_ERR "%s: set_mib (ibss change ok) failed: %d\n",</div><div class='add'>+		       priv-&gt;netdev-&gt;name, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netif_carrier_on(priv-&gt;netdev);</div><div class='add'>+	netif_start_queue(priv-&gt;netdev);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Request card to join BSS in managed or ad-hoc mode */</div><div class='add'>+static int at76_join_bss(struct at76_priv *priv, struct bss_info *ptr)</div><div class='add'>+{</div><div class='add'>+	struct at76_req_join join;</div><div class='add'>+</div><div class='add'>+	BUG_ON(!ptr);</div><div class='add'>+</div><div class='add'>+	memset(&amp;join, 0, sizeof(struct at76_req_join));</div><div class='add'>+	memcpy(join.bssid, ptr-&gt;bssid, ETH_ALEN);</div><div class='add'>+	memcpy(join.essid, ptr-&gt;ssid, ptr-&gt;ssid_len);</div><div class='add'>+	join.essid_size = ptr-&gt;ssid_len;</div><div class='add'>+	join.bss_type = (priv-&gt;iw_mode == IW_MODE_ADHOC ? 1 : 2);</div><div class='add'>+	join.channel = ptr-&gt;channel;</div><div class='add'>+	join.timeout = cpu_to_le16(2000);</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_PROGRESS,</div><div class='add'>+		 "%s join addr %s ssid %s type %d ch %d timeout %d",</div><div class='add'>+		 priv-&gt;netdev-&gt;name, mac2str(join.bssid), join.essid,</div><div class='add'>+		 join.bss_type, join.channel, le16_to_cpu(join.timeout));</div><div class='add'>+	return at76_set_card_command(priv-&gt;udev, CMD_JOIN, &amp;join,</div><div class='add'>+				     sizeof(struct at76_req_join));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Calculate padding from txbuf-&gt;wlength (which excludes the USB TX header),</div><div class='add'>+   likely to compensate a flaw in the AT76C503A USB part ... */</div><div class='add'>+static inline int at76_calc_padding(int wlen)</div><div class='add'>+{</div><div class='add'>+	/* add the USB TX header */</div><div class='add'>+	wlen += AT76_TX_HDRLEN;</div><div class='add'>+</div><div class='add'>+	wlen = wlen % 64;</div><div class='add'>+</div><div class='add'>+	if (wlen &lt; 50)</div><div class='add'>+		return 50 - wlen;</div><div class='add'>+</div><div class='add'>+	if (wlen &gt;= 61)</div><div class='add'>+		return 64 + 50 - wlen;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* We are doing a lot of things here in an interrupt. Need</div><div class='add'>+   a bh handler (Watching TV with a TV card is probably</div><div class='add'>+   a good test: if you see flickers, we are doing too much.</div><div class='add'>+   Currently I do see flickers... even with our tasklet :-( )</div><div class='add'>+   Maybe because the bttv driver and usb-uhci use the same interrupt</div><div class='add'>+*/</div><div class='add'>+/* Or maybe because our BH handler is preempting bttv's BH handler.. BHs don't</div><div class='add'>+ * solve everything.. (alex) */</div><div class='add'>+static void at76_rx_callback(struct urb *urb)</div><div class='add'>+{</div><div class='add'>+	struct at76_priv *priv = urb-&gt;context;</div><div class='add'>+</div><div class='add'>+	priv-&gt;rx_tasklet.data = (unsigned long)urb;</div><div class='add'>+	tasklet_schedule(&amp;priv-&gt;rx_tasklet);</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void at76_tx_callback(struct urb *urb)</div><div class='add'>+{</div><div class='add'>+	struct at76_priv *priv = urb-&gt;context;</div><div class='add'>+	struct net_device_stats *stats = &amp;priv-&gt;stats;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	struct at76_tx_buffer *mgmt_buf;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	switch (urb-&gt;status) {</div><div class='add'>+	case 0:</div><div class='add'>+		stats-&gt;tx_packets++;</div><div class='add'>+		break;</div><div class='add'>+	case -ENOENT:</div><div class='add'>+	case -ECONNRESET:</div><div class='add'>+		/* urb has been unlinked */</div><div class='add'>+		return;</div><div class='add'>+	default:</div><div class='add'>+		at76_dbg(DBG_URB, "%s - nonzero tx status received: %d",</div><div class='add'>+			 __func__, urb-&gt;status);</div><div class='add'>+		stats-&gt;tx_errors++;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;priv-&gt;mgmt_spinlock, flags);</div><div class='add'>+	mgmt_buf = priv-&gt;next_mgmt_bulk;</div><div class='add'>+	priv-&gt;next_mgmt_bulk = NULL;</div><div class='add'>+	spin_unlock_irqrestore(&amp;priv-&gt;mgmt_spinlock, flags);</div><div class='add'>+</div><div class='add'>+	if (!mgmt_buf) {</div><div class='add'>+		netif_wake_queue(priv-&gt;netdev);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* we don't copy the padding bytes, but add them</div><div class='add'>+	   to the length */</div><div class='add'>+	memcpy(priv-&gt;bulk_out_buffer, mgmt_buf,</div><div class='add'>+	       le16_to_cpu(mgmt_buf-&gt;wlength) + AT76_TX_HDRLEN);</div><div class='add'>+	usb_fill_bulk_urb(priv-&gt;tx_urb, priv-&gt;udev, priv-&gt;tx_pipe,</div><div class='add'>+			  priv-&gt;bulk_out_buffer,</div><div class='add'>+			  le16_to_cpu(mgmt_buf-&gt;wlength) + mgmt_buf-&gt;padding +</div><div class='add'>+			  AT76_TX_HDRLEN, at76_tx_callback, priv);</div><div class='add'>+	ret = usb_submit_urb(priv-&gt;tx_urb, GFP_ATOMIC);</div><div class='add'>+	if (ret)</div><div class='add'>+		printk(KERN_ERR "%s: error in tx submit urb: %d\n",</div><div class='add'>+		       priv-&gt;netdev-&gt;name, ret);</div><div class='add'>+</div><div class='add'>+	kfree(mgmt_buf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Send a management frame on bulk-out.  txbuf-&gt;wlength must be set */</div><div class='add'>+static int at76_tx_mgmt(struct at76_priv *priv, struct at76_tx_buffer *txbuf)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int ret;</div><div class='add'>+	int urb_status;</div><div class='add'>+	void *oldbuf = NULL;</div><div class='add'>+</div><div class='add'>+	netif_carrier_off(priv-&gt;netdev);	/* stop netdev watchdog */</div><div class='add'>+	netif_stop_queue(priv-&gt;netdev);	/* stop tx data packets */</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;priv-&gt;mgmt_spinlock, flags);</div><div class='add'>+</div><div class='add'>+	urb_status = priv-&gt;tx_urb-&gt;status;</div><div class='add'>+	if (urb_status == -EINPROGRESS) {</div><div class='add'>+		/* cannot transmit now, put in the queue */</div><div class='add'>+		oldbuf = priv-&gt;next_mgmt_bulk;</div><div class='add'>+		priv-&gt;next_mgmt_bulk = txbuf;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;priv-&gt;mgmt_spinlock, flags);</div><div class='add'>+</div><div class='add'>+	if (oldbuf) {</div><div class='add'>+		/* a data/mgmt tx is already pending in the URB -</div><div class='add'>+		   if this is no error in some situations we must</div><div class='add'>+		   implement a queue or silently modify the old msg */</div><div class='add'>+		printk(KERN_ERR "%s: removed pending mgmt buffer %s\n",</div><div class='add'>+		       priv-&gt;netdev-&gt;name, hex2str(oldbuf, 64));</div><div class='add'>+		kfree(oldbuf);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	txbuf-&gt;tx_rate = TX_RATE_1MBIT;</div><div class='add'>+	txbuf-&gt;padding = at76_calc_padding(le16_to_cpu(txbuf-&gt;wlength));</div><div class='add'>+	memset(txbuf-&gt;reserved, 0, sizeof(txbuf-&gt;reserved));</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;next_mgmt_bulk)</div><div class='add'>+		printk(KERN_ERR "%s: URB status %d, but mgmt is pending\n",</div><div class='add'>+		       priv-&gt;netdev-&gt;name, urb_status);</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_TX_MGMT,</div><div class='add'>+		 "%s: tx mgmt: wlen %d tx_rate %d pad %d %s",</div><div class='add'>+		 priv-&gt;netdev-&gt;name, le16_to_cpu(txbuf-&gt;wlength),</div><div class='add'>+		 txbuf-&gt;tx_rate, txbuf-&gt;padding,</div><div class='add'>+		 hex2str(txbuf-&gt;packet, le16_to_cpu(txbuf-&gt;wlength)));</div><div class='add'>+</div><div class='add'>+	/* txbuf was not consumed above -&gt; send mgmt msg immediately */</div><div class='add'>+	memcpy(priv-&gt;bulk_out_buffer, txbuf,</div><div class='add'>+	       le16_to_cpu(txbuf-&gt;wlength) + AT76_TX_HDRLEN);</div><div class='add'>+	usb_fill_bulk_urb(priv-&gt;tx_urb, priv-&gt;udev, priv-&gt;tx_pipe,</div><div class='add'>+			  priv-&gt;bulk_out_buffer,</div><div class='add'>+			  le16_to_cpu(txbuf-&gt;wlength) + txbuf-&gt;padding +</div><div class='add'>+			  AT76_TX_HDRLEN, at76_tx_callback, priv);</div><div class='add'>+	ret = usb_submit_urb(priv-&gt;tx_urb, GFP_ATOMIC);</div><div class='add'>+	if (ret)</div><div class='add'>+		printk(KERN_ERR "%s: error in tx submit urb: %d\n",</div><div class='add'>+		       priv-&gt;netdev-&gt;name, ret);</div><div class='add'>+</div><div class='add'>+	kfree(txbuf);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Go to the next information element */</div><div class='add'>+static inline void next_ie(struct ieee80211_info_element **ie)</div><div class='add'>+{</div><div class='add'>+	*ie = (struct ieee80211_info_element *)(&amp;(*ie)-&gt;data[(*ie)-&gt;len]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Challenge is the challenge string (in TLV format)</div><div class='add'>+   we got with seq_nr 2 for shared secret authentication only and</div><div class='add'>+   send in seq_nr 3 WEP encrypted to prove we have the correct WEP key;</div><div class='add'>+   otherwise it is NULL */</div><div class='add'>+static int at76_auth_req(struct at76_priv *priv, struct bss_info *bss,</div><div class='add'>+			 int seq_nr, struct ieee80211_info_element *challenge)</div><div class='add'>+{</div><div class='add'>+	struct at76_tx_buffer *tx_buffer;</div><div class='add'>+	struct ieee80211_hdr_3addr *mgmt;</div><div class='add'>+	struct ieee80211_auth *req;</div><div class='add'>+	int buf_len = (seq_nr != 3 ? AUTH_FRAME_SIZE :</div><div class='add'>+		       AUTH_FRAME_SIZE + 1 + 1 + challenge-&gt;len);</div><div class='add'>+</div><div class='add'>+	BUG_ON(!bss);</div><div class='add'>+	BUG_ON(seq_nr == 3 &amp;&amp; !challenge);</div><div class='add'>+	tx_buffer = kmalloc(buf_len + MAX_PADDING_SIZE, GFP_ATOMIC);</div><div class='add'>+	if (!tx_buffer)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	req = (struct ieee80211_auth *)tx_buffer-&gt;packet;</div><div class='add'>+	mgmt = &amp;req-&gt;header;</div><div class='add'>+</div><div class='add'>+	/* make wireless header */</div><div class='add'>+	/* first auth msg is not encrypted, only the second (seq_nr == 3) */</div><div class='add'>+	mgmt-&gt;frame_ctl =</div><div class='add'>+	    cpu_to_le16(IEEE80211_FTYPE_MGMT | IEEE80211_STYPE_AUTH |</div><div class='add'>+			(seq_nr == 3 ? IEEE80211_FCTL_PROTECTED : 0));</div><div class='add'>+</div><div class='add'>+	mgmt-&gt;duration_id = cpu_to_le16(0x8000);</div><div class='add'>+	memcpy(mgmt-&gt;addr1, bss-&gt;bssid, ETH_ALEN);</div><div class='add'>+	memcpy(mgmt-&gt;addr2, priv-&gt;netdev-&gt;dev_addr, ETH_ALEN);</div><div class='add'>+	memcpy(mgmt-&gt;addr3, bss-&gt;bssid, ETH_ALEN);</div><div class='add'>+	mgmt-&gt;seq_ctl = cpu_to_le16(0);</div><div class='add'>+</div><div class='add'>+	req-&gt;algorithm = cpu_to_le16(priv-&gt;auth_mode);</div><div class='add'>+	req-&gt;transaction = cpu_to_le16(seq_nr);</div><div class='add'>+	req-&gt;status = cpu_to_le16(0);</div><div class='add'>+</div><div class='add'>+	if (seq_nr == 3)</div><div class='add'>+		memcpy(req-&gt;info_element, challenge, 1 + 1 + challenge-&gt;len);</div><div class='add'>+</div><div class='add'>+	/* init. at76_priv tx header */</div><div class='add'>+	tx_buffer-&gt;wlength = cpu_to_le16(buf_len - AT76_TX_HDRLEN);</div><div class='add'>+	at76_dbg(DBG_TX_MGMT, "%s: AuthReq bssid %s alg %d seq_nr %d",</div><div class='add'>+		 priv-&gt;netdev-&gt;name, mac2str(mgmt-&gt;addr3),</div><div class='add'>+		 le16_to_cpu(req-&gt;algorithm), le16_to_cpu(req-&gt;transaction));</div><div class='add'>+	if (seq_nr == 3)</div><div class='add'>+		at76_dbg(DBG_TX_MGMT, "%s: AuthReq challenge: %s ...",</div><div class='add'>+			 priv-&gt;netdev-&gt;name, hex2str(req-&gt;info_element, 18));</div><div class='add'>+</div><div class='add'>+	/* either send immediately (if no data tx is pending</div><div class='add'>+	   or put it in pending list */</div><div class='add'>+	return at76_tx_mgmt(priv, tx_buffer);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int at76_assoc_req(struct at76_priv *priv, struct bss_info *bss)</div><div class='add'>+{</div><div class='add'>+	struct at76_tx_buffer *tx_buffer;</div><div class='add'>+	struct ieee80211_hdr_3addr *mgmt;</div><div class='add'>+	struct ieee80211_assoc_request *req;</div><div class='add'>+	struct ieee80211_info_element *ie;</div><div class='add'>+	char *essid;</div><div class='add'>+	int essid_len;</div><div class='add'>+	u16 capa;</div><div class='add'>+</div><div class='add'>+	BUG_ON(!bss);</div><div class='add'>+</div><div class='add'>+	tx_buffer = kmalloc(ASSOCREQ_MAX_SIZE + MAX_PADDING_SIZE, GFP_ATOMIC);</div><div class='add'>+	if (!tx_buffer)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	req = (struct ieee80211_assoc_request *)tx_buffer-&gt;packet;</div><div class='add'>+	mgmt = &amp;req-&gt;header;</div><div class='add'>+	ie = req-&gt;info_element;</div><div class='add'>+</div><div class='add'>+	/* make wireless header */</div><div class='add'>+	mgmt-&gt;frame_ctl = cpu_to_le16(IEEE80211_FTYPE_MGMT |</div><div class='add'>+				      IEEE80211_STYPE_ASSOC_REQ);</div><div class='add'>+</div><div class='add'>+	mgmt-&gt;duration_id = cpu_to_le16(0x8000);</div><div class='add'>+	memcpy(mgmt-&gt;addr1, bss-&gt;bssid, ETH_ALEN);</div><div class='add'>+	memcpy(mgmt-&gt;addr2, priv-&gt;netdev-&gt;dev_addr, ETH_ALEN);</div><div class='add'>+	memcpy(mgmt-&gt;addr3, bss-&gt;bssid, ETH_ALEN);</div><div class='add'>+	mgmt-&gt;seq_ctl = cpu_to_le16(0);</div><div class='add'>+</div><div class='add'>+	/* we must set the Privacy bit in the capabilities to assure an</div><div class='add'>+	   Agere-based AP with optional WEP transmits encrypted frames</div><div class='add'>+	   to us.  AP only set the Privacy bit in their capabilities</div><div class='add'>+	   if WEP is mandatory in the BSS! */</div><div class='add'>+	capa = bss-&gt;capa;</div><div class='add'>+	if (priv-&gt;wep_enabled)</div><div class='add'>+		capa |= WLAN_CAPABILITY_PRIVACY;</div><div class='add'>+	if (priv-&gt;preamble_type != PREAMBLE_TYPE_LONG)</div><div class='add'>+		capa |= WLAN_CAPABILITY_SHORT_PREAMBLE;</div><div class='add'>+	req-&gt;capability = cpu_to_le16(capa);</div><div class='add'>+</div><div class='add'>+	req-&gt;listen_interval = cpu_to_le16(2 * bss-&gt;beacon_interval);</div><div class='add'>+</div><div class='add'>+	/* write TLV data elements */</div><div class='add'>+</div><div class='add'>+	ie-&gt;id = MFIE_TYPE_SSID;</div><div class='add'>+	ie-&gt;len = bss-&gt;ssid_len;</div><div class='add'>+	memcpy(ie-&gt;data, bss-&gt;ssid, bss-&gt;ssid_len);</div><div class='add'>+	next_ie(&amp;ie);</div><div class='add'>+</div><div class='add'>+	ie-&gt;id = MFIE_TYPE_RATES;</div><div class='add'>+	ie-&gt;len = sizeof(hw_rates);</div><div class='add'>+	memcpy(ie-&gt;data, hw_rates, sizeof(hw_rates));</div><div class='add'>+	next_ie(&amp;ie);		/* ie points behind the supp_rates field */</div><div class='add'>+</div><div class='add'>+	/* init. at76_priv tx header */</div><div class='add'>+	tx_buffer-&gt;wlength = cpu_to_le16((u8 *)ie - (u8 *)mgmt);</div><div class='add'>+</div><div class='add'>+	ie = req-&gt;info_element;</div><div class='add'>+	essid = ie-&gt;data;</div><div class='add'>+	essid_len = min_t(int, IW_ESSID_MAX_SIZE, ie-&gt;len);</div><div class='add'>+</div><div class='add'>+	next_ie(&amp;ie);		/* points to IE of rates now */</div><div class='add'>+	at76_dbg(DBG_TX_MGMT,</div><div class='add'>+		 "%s: AssocReq bssid %s capa 0x%04x ssid %.*s rates %s",</div><div class='add'>+		 priv-&gt;netdev-&gt;name, mac2str(mgmt-&gt;addr3),</div><div class='add'>+		 le16_to_cpu(req-&gt;capability), essid_len, essid,</div><div class='add'>+		 hex2str(ie-&gt;data, ie-&gt;len));</div><div class='add'>+</div><div class='add'>+	/* either send immediately (if no data tx is pending</div><div class='add'>+	   or put it in pending list */</div><div class='add'>+	return at76_tx_mgmt(priv, tx_buffer);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* We got to check the bss_list for old entries */</div><div class='add'>+static void at76_bss_list_timeout(unsigned long par)</div><div class='add'>+{</div><div class='add'>+	struct at76_priv *priv = (struct at76_priv *)par;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	struct list_head *lptr, *nptr;</div><div class='add'>+	struct bss_info *ptr;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;priv-&gt;bss_list_spinlock, flags);</div><div class='add'>+</div><div class='add'>+	list_for_each_safe(lptr, nptr, &amp;priv-&gt;bss_list) {</div><div class='add'>+</div><div class='add'>+		ptr = list_entry(lptr, struct bss_info, list);</div><div class='add'>+</div><div class='add'>+		if (ptr != priv-&gt;curr_bss</div><div class='add'>+		    &amp;&amp; time_after(jiffies, ptr-&gt;last_rx + BSS_LIST_TIMEOUT)) {</div><div class='add'>+			at76_dbg(DBG_BSS_TABLE_RM,</div><div class='add'>+				 "%s: bss_list: removing old BSS %s ch %d",</div><div class='add'>+				 priv-&gt;netdev-&gt;name, mac2str(ptr-&gt;bssid),</div><div class='add'>+				 ptr-&gt;channel);</div><div class='add'>+			list_del(&amp;ptr-&gt;list);</div><div class='add'>+			kfree(ptr);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;priv-&gt;bss_list_spinlock, flags);</div><div class='add'>+	/* restart the timer */</div><div class='add'>+	mod_timer(&amp;priv-&gt;bss_list_timer, jiffies + BSS_LIST_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void at76_set_mac_state(struct at76_priv *priv,</div><div class='add'>+				      enum mac_state mac_state)</div><div class='add'>+{</div><div class='add'>+	at76_dbg(DBG_MAC_STATE, "%s state: %s", priv-&gt;netdev-&gt;name,</div><div class='add'>+		 mac_states[mac_state]);</div><div class='add'>+	priv-&gt;mac_state = mac_state;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void at76_dump_bss_table(struct at76_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct bss_info *ptr;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	struct list_head *lptr;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;priv-&gt;bss_list_spinlock, flags);</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_BSS_TABLE, "%s BSS table (curr=%p):", priv-&gt;netdev-&gt;name,</div><div class='add'>+		 priv-&gt;curr_bss);</div><div class='add'>+</div><div class='add'>+	list_for_each(lptr, &amp;priv-&gt;bss_list) {</div><div class='add'>+		ptr = list_entry(lptr, struct bss_info, list);</div><div class='add'>+		at76_dbg(DBG_BSS_TABLE, "0x%p: bssid %s channel %d ssid %.*s "</div><div class='add'>+			 "(%s) capa 0x%04x rates %s rssi %d link %d noise %d",</div><div class='add'>+			 ptr, mac2str(ptr-&gt;bssid), ptr-&gt;channel, ptr-&gt;ssid_len,</div><div class='add'>+			 ptr-&gt;ssid, hex2str(ptr-&gt;ssid, ptr-&gt;ssid_len),</div><div class='add'>+			 ptr-&gt;capa, hex2str(ptr-&gt;rates, ptr-&gt;rates_len),</div><div class='add'>+			 ptr-&gt;rssi, ptr-&gt;link_qual, ptr-&gt;noise_level);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;priv-&gt;bss_list_spinlock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Called upon successful association to mark interface as connected */</div><div class='add'>+static void at76_work_assoc_done(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct at76_priv *priv = container_of(work, struct at76_priv,</div><div class='add'>+					      work_assoc_done);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;mtx);</div><div class='add'>+</div><div class='add'>+	WARN_ON(priv-&gt;mac_state != MAC_ASSOC);</div><div class='add'>+	WARN_ON(!priv-&gt;curr_bss);</div><div class='add'>+	if (priv-&gt;mac_state != MAC_ASSOC || !priv-&gt;curr_bss)</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;iw_mode == IW_MODE_INFRA) {</div><div class='add'>+		if (priv-&gt;pm_mode != AT76_PM_OFF) {</div><div class='add'>+			/* calculate the listen interval in units of</div><div class='add'>+			   beacon intervals of the curr_bss */</div><div class='add'>+			u32 pm_period_beacon = (priv-&gt;pm_period &gt;&gt; 10) /</div><div class='add'>+			    priv-&gt;curr_bss-&gt;beacon_interval;</div><div class='add'>+</div><div class='add'>+			pm_period_beacon = max(pm_period_beacon, 2u);</div><div class='add'>+			pm_period_beacon = min(pm_period_beacon, 0xffffu);</div><div class='add'>+</div><div class='add'>+			at76_dbg(DBG_PM,</div><div class='add'>+				 "%s: pm_mode %d assoc id 0x%x listen int %d",</div><div class='add'>+				 priv-&gt;netdev-&gt;name, priv-&gt;pm_mode,</div><div class='add'>+				 priv-&gt;assoc_id, pm_period_beacon);</div><div class='add'>+</div><div class='add'>+			at76_set_associd(priv, priv-&gt;assoc_id);</div><div class='add'>+			at76_set_listen_interval(priv, (u16)pm_period_beacon);</div><div class='add'>+		}</div><div class='add'>+		schedule_delayed_work(&amp;priv-&gt;dwork_beacon, BEACON_TIMEOUT);</div><div class='add'>+	}</div><div class='add'>+	at76_set_pm_mode(priv);</div><div class='add'>+</div><div class='add'>+	netif_carrier_on(priv-&gt;netdev);</div><div class='add'>+	netif_wake_queue(priv-&gt;netdev);</div><div class='add'>+	at76_set_mac_state(priv, MAC_CONNECTED);</div><div class='add'>+	at76_iwevent_bss_connect(priv-&gt;netdev, priv-&gt;curr_bss-&gt;bssid);</div><div class='add'>+	at76_dbg(DBG_PROGRESS, "%s: connected to BSSID %s",</div><div class='add'>+		 priv-&gt;netdev-&gt;name, mac2str(priv-&gt;curr_bss-&gt;bssid));</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;mtx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* We only store the new mac address in netdev struct,</div><div class='add'>+   it gets set when the netdev is opened. */</div><div class='add'>+static int at76_set_mac_address(struct net_device *netdev, void *addr)</div><div class='add'>+{</div><div class='add'>+	struct sockaddr *mac = addr;</div><div class='add'>+	memcpy(netdev-&gt;dev_addr, mac-&gt;sa_data, ETH_ALEN);</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct net_device_stats *at76_get_stats(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct at76_priv *priv = netdev_priv(netdev);</div><div class='add'>+	return &amp;priv-&gt;stats;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct iw_statistics *at76_get_wireless_stats(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct at76_priv *priv = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_IOCTL, "RETURN qual %d level %d noise %d updated %d",</div><div class='add'>+		 priv-&gt;wstats.qual.qual, priv-&gt;wstats.qual.level,</div><div class='add'>+		 priv-&gt;wstats.qual.noise, priv-&gt;wstats.qual.updated);</div><div class='add'>+</div><div class='add'>+	return &amp;priv-&gt;wstats;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void at76_set_multicast(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct at76_priv *priv = netdev_priv(netdev);</div><div class='add'>+	int promisc;</div><div class='add'>+</div><div class='add'>+	promisc = ((netdev-&gt;flags &amp; IFF_PROMISC) != 0);</div><div class='add'>+	if (promisc != priv-&gt;promisc) {</div><div class='add'>+		/* This gets called in interrupt, must reschedule */</div><div class='add'>+		priv-&gt;promisc = promisc;</div><div class='add'>+		schedule_work(&amp;priv-&gt;work_set_promisc);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Stop all network activity, flush all pending tasks */</div><div class='add'>+static void at76_quiesce(struct at76_priv *priv)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	netif_stop_queue(priv-&gt;netdev);</div><div class='add'>+	netif_carrier_off(priv-&gt;netdev);</div><div class='add'>+</div><div class='add'>+	at76_set_mac_state(priv, MAC_INIT);</div><div class='add'>+</div><div class='add'>+	cancel_delayed_work(&amp;priv-&gt;dwork_get_scan);</div><div class='add'>+	cancel_delayed_work(&amp;priv-&gt;dwork_beacon);</div><div class='add'>+	cancel_delayed_work(&amp;priv-&gt;dwork_auth);</div><div class='add'>+	cancel_delayed_work(&amp;priv-&gt;dwork_assoc);</div><div class='add'>+	cancel_delayed_work(&amp;priv-&gt;dwork_restart);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;priv-&gt;mgmt_spinlock, flags);</div><div class='add'>+	kfree(priv-&gt;next_mgmt_bulk);</div><div class='add'>+	priv-&gt;next_mgmt_bulk = NULL;</div><div class='add'>+	spin_unlock_irqrestore(&amp;priv-&gt;mgmt_spinlock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*******************************************************************************</div><div class='add'>+ * at76_priv implementations of iw_handler functions:</div><div class='add'>+ */</div><div class='add'>+static int at76_iw_handler_commit(struct net_device *netdev,</div><div class='add'>+				  struct iw_request_info *info,</div><div class='add'>+				  void *null, char *extra)</div><div class='add'>+{</div><div class='add'>+	struct at76_priv *priv = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_IOCTL, "%s %s: restarting the device", netdev-&gt;name,</div><div class='add'>+		 __func__);</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;mac_state != MAC_INIT)</div><div class='add'>+		at76_quiesce(priv);</div><div class='add'>+</div><div class='add'>+	/* Wait half second before the restart to process subsequent</div><div class='add'>+	 * requests from the same iwconfig in a single restart */</div><div class='add'>+	schedule_delayed_work(&amp;priv-&gt;dwork_restart, HZ / 2);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int at76_iw_handler_get_name(struct net_device *netdev,</div><div class='add'>+				    struct iw_request_info *info,</div><div class='add'>+				    char *name, char *extra)</div><div class='add'>+{</div><div class='add'>+	strcpy(name, "IEEE 802.11b");</div><div class='add'>+	at76_dbg(DBG_IOCTL, "%s: SIOCGIWNAME - name %s", netdev-&gt;name, name);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int at76_iw_handler_set_freq(struct net_device *netdev,</div><div class='add'>+				    struct iw_request_info *info,</div><div class='add'>+				    struct iw_freq *freq, char *extra)</div><div class='add'>+{</div><div class='add'>+	struct at76_priv *priv = netdev_priv(netdev);</div><div class='add'>+	int chan = -1;</div><div class='add'>+	int ret = -EIWCOMMIT;</div><div class='add'>+	at76_dbg(DBG_IOCTL, "%s: SIOCSIWFREQ - freq.m %d freq.e %d",</div><div class='add'>+		 netdev-&gt;name, freq-&gt;m, freq-&gt;e);</div><div class='add'>+</div><div class='add'>+	if ((freq-&gt;e == 0) &amp;&amp; (freq-&gt;m &lt;= 1000))</div><div class='add'>+		/* Setting by channel number */</div><div class='add'>+		chan = freq-&gt;m;</div><div class='add'>+	else {</div><div class='add'>+		/* Setting by frequency - search the table */</div><div class='add'>+		int mult = 1;</div><div class='add'>+		int i;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; (6 - freq-&gt;e); i++)</div><div class='add'>+			mult *= 10;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; NUM_CHANNELS; i++) {</div><div class='add'>+			if (freq-&gt;m == (channel_frequency[i] * mult))</div><div class='add'>+				chan = i + 1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (chan &lt; 1 || !priv-&gt;domain)</div><div class='add'>+		/* non-positive channels are invalid</div><div class='add'>+		 * we need a domain info to set the channel</div><div class='add'>+		 * either that or an invalid frequency was</div><div class='add'>+		 * provided by the user */</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+	else if (!(priv-&gt;domain-&gt;channel_map &amp; (1 &lt;&lt; (chan - 1)))) {</div><div class='add'>+		printk(KERN_INFO "%s: channel %d not allowed for domain %s\n",</div><div class='add'>+		       priv-&gt;netdev-&gt;name, chan, priv-&gt;domain-&gt;name);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ret == -EIWCOMMIT) {</div><div class='add'>+		priv-&gt;channel = chan;</div><div class='add'>+		at76_dbg(DBG_IOCTL, "%s: SIOCSIWFREQ - ch %d", netdev-&gt;name,</div><div class='add'>+			 chan);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int at76_iw_handler_get_freq(struct net_device *netdev,</div><div class='add'>+				    struct iw_request_info *info,</div><div class='add'>+				    struct iw_freq *freq, char *extra)</div><div class='add'>+{</div><div class='add'>+	struct at76_priv *priv = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	freq-&gt;m = priv-&gt;channel;</div><div class='add'>+	freq-&gt;e = 0;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;channel)</div><div class='add'>+		at76_dbg(DBG_IOCTL, "%s: SIOCGIWFREQ - freq %ld x 10e%d",</div><div class='add'>+			 netdev-&gt;name, channel_frequency[priv-&gt;channel - 1], 6);</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_IOCTL, "%s: SIOCGIWFREQ - ch %d", netdev-&gt;name,</div><div class='add'>+		 priv-&gt;channel);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int at76_iw_handler_set_mode(struct net_device *netdev,</div><div class='add'>+				    struct iw_request_info *info,</div><div class='add'>+				    __u32 *mode, char *extra)</div><div class='add'>+{</div><div class='add'>+	struct at76_priv *priv = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_IOCTL, "%s: SIOCSIWMODE - %d", netdev-&gt;name, *mode);</div><div class='add'>+</div><div class='add'>+	if ((*mode != IW_MODE_ADHOC) &amp;&amp; (*mode != IW_MODE_INFRA) &amp;&amp;</div><div class='add'>+	    (*mode != IW_MODE_MONITOR))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	priv-&gt;iw_mode = *mode;</div><div class='add'>+	if (priv-&gt;iw_mode != IW_MODE_INFRA)</div><div class='add'>+		priv-&gt;pm_mode = AT76_PM_OFF;</div><div class='add'>+</div><div class='add'>+	return -EIWCOMMIT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int at76_iw_handler_get_mode(struct net_device *netdev,</div><div class='add'>+				    struct iw_request_info *info,</div><div class='add'>+				    __u32 *mode, char *extra)</div><div class='add'>+{</div><div class='add'>+	struct at76_priv *priv = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	*mode = priv-&gt;iw_mode;</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_IOCTL, "%s: SIOCGIWMODE - %d", netdev-&gt;name, *mode);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int at76_iw_handler_get_range(struct net_device *netdev,</div><div class='add'>+				     struct iw_request_info *info,</div><div class='add'>+				     struct iw_point *data, char *extra)</div><div class='add'>+{</div><div class='add'>+	/* inspired by atmel.c */</div><div class='add'>+	struct at76_priv *priv = netdev_priv(netdev);</div><div class='add'>+	struct iw_range *range = (struct iw_range *)extra;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	data-&gt;length = sizeof(struct iw_range);</div><div class='add'>+	memset(range, 0, sizeof(struct iw_range));</div><div class='add'>+</div><div class='add'>+	/* TODO: range-&gt;throughput = xxxxxx; */</div><div class='add'>+</div><div class='add'>+	range-&gt;min_nwid = 0x0000;</div><div class='add'>+	range-&gt;max_nwid = 0x0000;</div><div class='add'>+</div><div class='add'>+	/* this driver doesn't maintain sensitivity information */</div><div class='add'>+	range-&gt;sensitivity = 0;</div><div class='add'>+</div><div class='add'>+	range-&gt;max_qual.qual = 100;</div><div class='add'>+	range-&gt;max_qual.level = 100;</div><div class='add'>+	range-&gt;max_qual.noise = 0;</div><div class='add'>+	range-&gt;max_qual.updated = IW_QUAL_NOISE_INVALID;</div><div class='add'>+</div><div class='add'>+	range-&gt;avg_qual.qual = 50;</div><div class='add'>+	range-&gt;avg_qual.level = 50;</div><div class='add'>+	range-&gt;avg_qual.noise = 0;</div><div class='add'>+	range-&gt;avg_qual.updated = IW_QUAL_NOISE_INVALID;</div><div class='add'>+</div><div class='add'>+	range-&gt;bitrate[0] = 1000000;</div><div class='add'>+	range-&gt;bitrate[1] = 2000000;</div><div class='add'>+	range-&gt;bitrate[2] = 5500000;</div><div class='add'>+	range-&gt;bitrate[3] = 11000000;</div><div class='add'>+	range-&gt;num_bitrates = 4;</div><div class='add'>+</div><div class='add'>+	range-&gt;min_rts = 0;</div><div class='add'>+	range-&gt;max_rts = MAX_RTS_THRESHOLD;</div><div class='add'>+</div><div class='add'>+	range-&gt;min_frag = MIN_FRAG_THRESHOLD;</div><div class='add'>+	range-&gt;max_frag = MAX_FRAG_THRESHOLD;</div><div class='add'>+</div><div class='add'>+	range-&gt;pmp_flags = IW_POWER_PERIOD;</div><div class='add'>+	range-&gt;pmt_flags = IW_POWER_ON;</div><div class='add'>+	range-&gt;pm_capa = IW_POWER_PERIOD | IW_POWER_ALL_R;</div><div class='add'>+</div><div class='add'>+	range-&gt;encoding_size[0] = WEP_SMALL_KEY_LEN;</div><div class='add'>+	range-&gt;encoding_size[1] = WEP_LARGE_KEY_LEN;</div><div class='add'>+	range-&gt;num_encoding_sizes = 2;</div><div class='add'>+	range-&gt;max_encoding_tokens = WEP_KEYS;</div><div class='add'>+</div><div class='add'>+	/* both WL-240U and Linksys WUSB11 v2.6 specify 15 dBm as output power</div><div class='add'>+	   - take this for all (ignore antenna gains) */</div><div class='add'>+	range-&gt;txpower[0] = 15;</div><div class='add'>+	range-&gt;num_txpower = 1;</div><div class='add'>+	range-&gt;txpower_capa = IW_TXPOW_DBM;</div><div class='add'>+</div><div class='add'>+	range-&gt;we_version_source = WIRELESS_EXT;</div><div class='add'>+	range-&gt;we_version_compiled = WIRELESS_EXT;</div><div class='add'>+</div><div class='add'>+	/* same as the values used in atmel.c */</div><div class='add'>+	range-&gt;retry_capa = IW_RETRY_LIMIT;</div><div class='add'>+	range-&gt;retry_flags = IW_RETRY_LIMIT;</div><div class='add'>+	range-&gt;r_time_flags = 0;</div><div class='add'>+	range-&gt;min_retry = 1;</div><div class='add'>+	range-&gt;max_retry = 255;</div><div class='add'>+</div><div class='add'>+	range-&gt;num_channels = NUM_CHANNELS;</div><div class='add'>+	range-&gt;num_frequency = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; NUM_CHANNELS; i++) {</div><div class='add'>+		/* test if channel map bit is raised */</div><div class='add'>+		if (priv-&gt;domain-&gt;channel_map &amp; (0x1 &lt;&lt; i)) {</div><div class='add'>+			range-&gt;num_frequency += 1;</div><div class='add'>+</div><div class='add'>+			range-&gt;freq[i].i = i + 1;</div><div class='add'>+			range-&gt;freq[i].m = channel_frequency[i] * 100000;</div><div class='add'>+			range-&gt;freq[i].e = 1;	/* freq * 10^1 */</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_IOCTL, "%s: SIOCGIWRANGE", netdev-&gt;name);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int at76_iw_handler_set_spy(struct net_device *netdev,</div><div class='add'>+				   struct iw_request_info *info,</div><div class='add'>+				   struct iw_point *data, char *extra)</div><div class='add'>+{</div><div class='add'>+	struct at76_priv *priv = netdev_priv(netdev);</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_IOCTL, "%s: SIOCSIWSPY - number of addresses %d",</div><div class='add'>+		 netdev-&gt;name, data-&gt;length);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;priv-&gt;spy_spinlock);</div><div class='add'>+	ret = iw_handler_set_spy(priv-&gt;netdev, info, (union iwreq_data *)data,</div><div class='add'>+				 extra);</div><div class='add'>+	spin_unlock_bh(&amp;priv-&gt;spy_spinlock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int at76_iw_handler_get_spy(struct net_device *netdev,</div><div class='add'>+				   struct iw_request_info *info,</div><div class='add'>+				   struct iw_point *data, char *extra)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	struct at76_priv *priv = netdev_priv(netdev);</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;priv-&gt;spy_spinlock);</div><div class='add'>+	ret = iw_handler_get_spy(priv-&gt;netdev, info,</div><div class='add'>+				 (union iwreq_data *)data, extra);</div><div class='add'>+	spin_unlock_bh(&amp;priv-&gt;spy_spinlock);</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_IOCTL, "%s: SIOCGIWSPY - number of addresses %d",</div><div class='add'>+		 netdev-&gt;name, data-&gt;length);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int at76_iw_handler_set_thrspy(struct net_device *netdev,</div><div class='add'>+				      struct iw_request_info *info,</div><div class='add'>+				      struct iw_point *data, char *extra)</div><div class='add'>+{</div><div class='add'>+	struct at76_priv *priv = netdev_priv(netdev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_IOCTL, "%s: SIOCSIWTHRSPY - number of addresses %d)",</div><div class='add'>+		 netdev-&gt;name, data-&gt;length);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;priv-&gt;spy_spinlock);</div><div class='add'>+	ret = iw_handler_set_thrspy(netdev, info, (union iwreq_data *)data,</div><div class='add'>+				    extra);</div><div class='add'>+	spin_unlock_bh(&amp;priv-&gt;spy_spinlock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int at76_iw_handler_get_thrspy(struct net_device *netdev,</div><div class='add'>+				      struct iw_request_info *info,</div><div class='add'>+				      struct iw_point *data, char *extra)</div><div class='add'>+{</div><div class='add'>+	struct at76_priv *priv = netdev_priv(netdev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;priv-&gt;spy_spinlock);</div><div class='add'>+	ret = iw_handler_get_thrspy(netdev, info, (union iwreq_data *)data,</div><div class='add'>+				    extra);</div><div class='add'>+	spin_unlock_bh(&amp;priv-&gt;spy_spinlock);</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_IOCTL, "%s: SIOCGIWTHRSPY - number of addresses %d)",</div><div class='add'>+		 netdev-&gt;name, data-&gt;length);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int at76_iw_handler_set_wap(struct net_device *netdev,</div><div class='add'>+				   struct iw_request_info *info,</div><div class='add'>+				   struct sockaddr *ap_addr, char *extra)</div><div class='add'>+{</div><div class='add'>+	struct at76_priv *priv = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_IOCTL, "%s: SIOCSIWAP - wap/bssid %s", netdev-&gt;name,</div><div class='add'>+		 mac2str(ap_addr-&gt;sa_data));</div><div class='add'>+</div><div class='add'>+	/* if the incoming address == ff:ff:ff:ff:ff:ff, the user has</div><div class='add'>+	   chosen any or auto AP preference */</div><div class='add'>+	if (is_broadcast_ether_addr(ap_addr-&gt;sa_data)</div><div class='add'>+	    || is_zero_ether_addr(ap_addr-&gt;sa_data))</div><div class='add'>+		priv-&gt;wanted_bssid_valid = 0;</div><div class='add'>+	else {</div><div class='add'>+		/* user wants to set a preferred AP address */</div><div class='add'>+		priv-&gt;wanted_bssid_valid = 1;</div><div class='add'>+		memcpy(priv-&gt;wanted_bssid, ap_addr-&gt;sa_data, ETH_ALEN);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EIWCOMMIT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int at76_iw_handler_get_wap(struct net_device *netdev,</div><div class='add'>+				   struct iw_request_info *info,</div><div class='add'>+				   struct sockaddr *ap_addr, char *extra)</div><div class='add'>+{</div><div class='add'>+	struct at76_priv *priv = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	ap_addr-&gt;sa_family = ARPHRD_ETHER;</div><div class='add'>+	memcpy(ap_addr-&gt;sa_data, priv-&gt;bssid, ETH_ALEN);</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_IOCTL, "%s: SIOCGIWAP - wap/bssid %s", netdev-&gt;name,</div><div class='add'>+		 mac2str(ap_addr-&gt;sa_data));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int at76_iw_handler_set_scan(struct net_device *netdev,</div><div class='add'>+				    struct iw_request_info *info,</div><div class='add'>+				    union iwreq_data *wrqu, char *extra)</div><div class='add'>+{</div><div class='add'>+	struct at76_priv *priv = netdev_priv(netdev);</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_IOCTL, "%s: SIOCSIWSCAN", netdev-&gt;name);</div><div class='add'>+</div><div class='add'>+	if (mutex_lock_interruptible(&amp;priv-&gt;mtx))</div><div class='add'>+		return -EINTR;</div><div class='add'>+</div><div class='add'>+	if (!netif_running(netdev)) {</div><div class='add'>+		ret = -ENETDOWN;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* jal: we don't allow "iwlist ethX scan" while we are</div><div class='add'>+	   in monitor mode */</div><div class='add'>+	if (priv-&gt;iw_mode == IW_MODE_MONITOR) {</div><div class='add'>+		ret = -EBUSY;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Discard old scan results */</div><div class='add'>+	if ((jiffies - priv-&gt;last_scan) &gt; (20 * HZ))</div><div class='add'>+		priv-&gt;scan_state = SCAN_IDLE;</div><div class='add'>+	priv-&gt;last_scan = jiffies;</div><div class='add'>+</div><div class='add'>+	/* Initiate a scan command */</div><div class='add'>+	if (priv-&gt;scan_state == SCAN_IN_PROGRESS) {</div><div class='add'>+		ret = -EBUSY;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;scan_state = SCAN_IN_PROGRESS;</div><div class='add'>+</div><div class='add'>+	at76_quiesce(priv);</div><div class='add'>+</div><div class='add'>+	/* Try to do passive or active scan if WE asks as. */</div><div class='add'>+	if (wrqu-&gt;data.length</div><div class='add'>+	    &amp;&amp; wrqu-&gt;data.length == sizeof(struct iw_scan_req)) {</div><div class='add'>+		struct iw_scan_req *req = (struct iw_scan_req *)extra;</div><div class='add'>+</div><div class='add'>+		if (req-&gt;scan_type == IW_SCAN_TYPE_PASSIVE)</div><div class='add'>+			priv-&gt;scan_mode = SCAN_TYPE_PASSIVE;</div><div class='add'>+		else if (req-&gt;scan_type == IW_SCAN_TYPE_ACTIVE)</div><div class='add'>+			priv-&gt;scan_mode = SCAN_TYPE_ACTIVE;</div><div class='add'>+</div><div class='add'>+		/* Sanity check values? */</div><div class='add'>+		if (req-&gt;min_channel_time &gt; 0)</div><div class='add'>+			priv-&gt;scan_min_time = req-&gt;min_channel_time;</div><div class='add'>+</div><div class='add'>+		if (req-&gt;max_channel_time &gt; 0)</div><div class='add'>+			priv-&gt;scan_max_time = req-&gt;max_channel_time;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* change to scanning state */</div><div class='add'>+	at76_set_mac_state(priv, MAC_SCANNING);</div><div class='add'>+	schedule_work(&amp;priv-&gt;work_start_scan);</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;mtx);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int at76_iw_handler_get_scan(struct net_device *netdev,</div><div class='add'>+				    struct iw_request_info *info,</div><div class='add'>+				    struct iw_point *data, char *extra)</div><div class='add'>+{</div><div class='add'>+	struct at76_priv *priv = netdev_priv(netdev);</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	struct list_head *lptr, *nptr;</div><div class='add'>+	struct bss_info *curr_bss;</div><div class='add'>+	struct iw_event *iwe = kmalloc(sizeof(struct iw_event), GFP_KERNEL);</div><div class='add'>+	char *curr_val, *curr_pos = extra;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_IOCTL, "%s: SIOCGIWSCAN", netdev-&gt;name);</div><div class='add'>+</div><div class='add'>+	if (!iwe)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;scan_state != SCAN_COMPLETED)</div><div class='add'>+		/* scan not yet finished */</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;priv-&gt;bss_list_spinlock, flags);</div><div class='add'>+</div><div class='add'>+	list_for_each_safe(lptr, nptr, &amp;priv-&gt;bss_list) {</div><div class='add'>+		curr_bss = list_entry(lptr, struct bss_info, list);</div><div class='add'>+</div><div class='add'>+		iwe-&gt;cmd = SIOCGIWAP;</div><div class='add'>+		iwe-&gt;u.ap_addr.sa_family = ARPHRD_ETHER;</div><div class='add'>+		memcpy(iwe-&gt;u.ap_addr.sa_data, curr_bss-&gt;bssid, 6);</div><div class='add'>+		curr_pos = iwe_stream_add_event(info, curr_pos,</div><div class='add'>+						extra + IW_SCAN_MAX_DATA, iwe,</div><div class='add'>+						IW_EV_ADDR_LEN);</div><div class='add'>+</div><div class='add'>+		iwe-&gt;u.data.length = curr_bss-&gt;ssid_len;</div><div class='add'>+		iwe-&gt;cmd = SIOCGIWESSID;</div><div class='add'>+		iwe-&gt;u.data.flags = 1;</div><div class='add'>+</div><div class='add'>+		curr_pos = iwe_stream_add_point(info, curr_pos,</div><div class='add'>+						extra + IW_SCAN_MAX_DATA, iwe,</div><div class='add'>+						curr_bss-&gt;ssid);</div><div class='add'>+</div><div class='add'>+		iwe-&gt;cmd = SIOCGIWMODE;</div><div class='add'>+		iwe-&gt;u.mode = (curr_bss-&gt;capa &amp; WLAN_CAPABILITY_IBSS) ?</div><div class='add'>+		    IW_MODE_ADHOC :</div><div class='add'>+		    (curr_bss-&gt;capa &amp; WLAN_CAPABILITY_ESS) ?</div><div class='add'>+		    IW_MODE_MASTER : IW_MODE_AUTO;</div><div class='add'>+		/* IW_MODE_AUTO = 0 which I thought is</div><div class='add'>+		 * the most logical value to return in this case */</div><div class='add'>+		curr_pos = iwe_stream_add_event(info, curr_pos,</div><div class='add'>+						extra + IW_SCAN_MAX_DATA, iwe,</div><div class='add'>+						IW_EV_UINT_LEN);</div><div class='add'>+</div><div class='add'>+		iwe-&gt;cmd = SIOCGIWFREQ;</div><div class='add'>+		iwe-&gt;u.freq.m = curr_bss-&gt;channel;</div><div class='add'>+		iwe-&gt;u.freq.e = 0;</div><div class='add'>+		curr_pos = iwe_stream_add_event(info, curr_pos,</div><div class='add'>+						extra + IW_SCAN_MAX_DATA, iwe,</div><div class='add'>+						IW_EV_FREQ_LEN);</div><div class='add'>+</div><div class='add'>+		iwe-&gt;cmd = SIOCGIWENCODE;</div><div class='add'>+		if (curr_bss-&gt;capa &amp; WLAN_CAPABILITY_PRIVACY)</div><div class='add'>+			iwe-&gt;u.data.flags = IW_ENCODE_ENABLED | IW_ENCODE_NOKEY;</div><div class='add'>+		else</div><div class='add'>+			iwe-&gt;u.data.flags = IW_ENCODE_DISABLED;</div><div class='add'>+</div><div class='add'>+		iwe-&gt;u.data.length = 0;</div><div class='add'>+		curr_pos = iwe_stream_add_point(info, curr_pos,</div><div class='add'>+						extra + IW_SCAN_MAX_DATA, iwe,</div><div class='add'>+						NULL);</div><div class='add'>+</div><div class='add'>+		/* Add quality statistics */</div><div class='add'>+		iwe-&gt;cmd = IWEVQUAL;</div><div class='add'>+		iwe-&gt;u.qual.noise = 0;</div><div class='add'>+		iwe-&gt;u.qual.updated =</div><div class='add'>+		    IW_QUAL_NOISE_INVALID | IW_QUAL_LEVEL_UPDATED;</div><div class='add'>+		iwe-&gt;u.qual.level = (curr_bss-&gt;rssi * 100 / 42);</div><div class='add'>+		if (iwe-&gt;u.qual.level &gt; 100)</div><div class='add'>+			iwe-&gt;u.qual.level = 100;</div><div class='add'>+		if (at76_is_intersil(priv-&gt;board_type))</div><div class='add'>+			iwe-&gt;u.qual.qual = curr_bss-&gt;link_qual;</div><div class='add'>+		else {</div><div class='add'>+			iwe-&gt;u.qual.qual = 0;</div><div class='add'>+			iwe-&gt;u.qual.updated |= IW_QUAL_QUAL_INVALID;</div><div class='add'>+		}</div><div class='add'>+		/* Add new value to event */</div><div class='add'>+		curr_pos = iwe_stream_add_event(info, curr_pos,</div><div class='add'>+						extra + IW_SCAN_MAX_DATA, iwe,</div><div class='add'>+						IW_EV_QUAL_LEN);</div><div class='add'>+</div><div class='add'>+		/* Rate: stuffing multiple values in a single event requires</div><div class='add'>+		 * a bit more of magic - Jean II */</div><div class='add'>+		curr_val = curr_pos + IW_EV_LCP_LEN;</div><div class='add'>+</div><div class='add'>+		iwe-&gt;cmd = SIOCGIWRATE;</div><div class='add'>+		/* Those two flags are ignored... */</div><div class='add'>+		iwe-&gt;u.bitrate.fixed = 0;</div><div class='add'>+		iwe-&gt;u.bitrate.disabled = 0;</div><div class='add'>+		/* Max 8 values */</div><div class='add'>+		for (i = 0; i &lt; curr_bss-&gt;rates_len; i++) {</div><div class='add'>+			/* Bit rate given in 500 kb/s units (+ 0x80) */</div><div class='add'>+			iwe-&gt;u.bitrate.value =</div><div class='add'>+			    ((curr_bss-&gt;rates[i] &amp; 0x7f) * 500000);</div><div class='add'>+			/* Add new value to event */</div><div class='add'>+			curr_val = iwe_stream_add_value(info, curr_pos,</div><div class='add'>+							curr_val,</div><div class='add'>+							extra +</div><div class='add'>+							IW_SCAN_MAX_DATA, iwe,</div><div class='add'>+							IW_EV_PARAM_LEN);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Check if we added any event */</div><div class='add'>+		if ((curr_val - curr_pos) &gt; IW_EV_LCP_LEN)</div><div class='add'>+			curr_pos = curr_val;</div><div class='add'>+</div><div class='add'>+		/* more information may be sent back using IWECUSTOM */</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;priv-&gt;bss_list_spinlock, flags);</div><div class='add'>+</div><div class='add'>+	data-&gt;length = (curr_pos - extra);</div><div class='add'>+	data-&gt;flags = 0;</div><div class='add'>+</div><div class='add'>+	kfree(iwe);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int at76_iw_handler_set_essid(struct net_device *netdev,</div><div class='add'>+				     struct iw_request_info *info,</div><div class='add'>+				     struct iw_point *data, char *extra)</div><div class='add'>+{</div><div class='add'>+	struct at76_priv *priv = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_IOCTL, "%s: SIOCSIWESSID - %s", netdev-&gt;name, extra);</div><div class='add'>+</div><div class='add'>+	if (data-&gt;flags) {</div><div class='add'>+		memcpy(priv-&gt;essid, extra, data-&gt;length);</div><div class='add'>+		priv-&gt;essid_size = data-&gt;length;</div><div class='add'>+	} else</div><div class='add'>+		priv-&gt;essid_size = 0;	/* Use any SSID */</div><div class='add'>+</div><div class='add'>+	return -EIWCOMMIT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int at76_iw_handler_get_essid(struct net_device *netdev,</div><div class='add'>+				     struct iw_request_info *info,</div><div class='add'>+				     struct iw_point *data, char *extra)</div><div class='add'>+{</div><div class='add'>+	struct at76_priv *priv = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;essid_size) {</div><div class='add'>+		/* not the ANY ssid in priv-&gt;essid */</div><div class='add'>+		data-&gt;flags = 1;</div><div class='add'>+		data-&gt;length = priv-&gt;essid_size;</div><div class='add'>+		memcpy(extra, priv-&gt;essid, data-&gt;length);</div><div class='add'>+	} else {</div><div class='add'>+		/* the ANY ssid was specified */</div><div class='add'>+		if (priv-&gt;mac_state == MAC_CONNECTED &amp;&amp; priv-&gt;curr_bss) {</div><div class='add'>+			/* report the SSID we have found */</div><div class='add'>+			data-&gt;flags = 1;</div><div class='add'>+			data-&gt;length = priv-&gt;curr_bss-&gt;ssid_len;</div><div class='add'>+			memcpy(extra, priv-&gt;curr_bss-&gt;ssid, data-&gt;length);</div><div class='add'>+		} else {</div><div class='add'>+			/* report ANY back */</div><div class='add'>+			data-&gt;flags = 0;</div><div class='add'>+			data-&gt;length = 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_IOCTL, "%s: SIOCGIWESSID - %.*s", netdev-&gt;name,</div><div class='add'>+		 data-&gt;length, extra);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int at76_iw_handler_set_rate(struct net_device *netdev,</div><div class='add'>+				    struct iw_request_info *info,</div><div class='add'>+				    struct iw_param *bitrate, char *extra)</div><div class='add'>+{</div><div class='add'>+	struct at76_priv *priv = netdev_priv(netdev);</div><div class='add'>+	int ret = -EIWCOMMIT;</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_IOCTL, "%s: SIOCSIWRATE - %d", netdev-&gt;name,</div><div class='add'>+		 bitrate-&gt;value);</div><div class='add'>+</div><div class='add'>+	switch (bitrate-&gt;value) {</div><div class='add'>+	case -1:</div><div class='add'>+		priv-&gt;txrate = TX_RATE_AUTO;</div><div class='add'>+		break;		/* auto rate */</div><div class='add'>+	case 1000000:</div><div class='add'>+		priv-&gt;txrate = TX_RATE_1MBIT;</div><div class='add'>+		break;</div><div class='add'>+	case 2000000:</div><div class='add'>+		priv-&gt;txrate = TX_RATE_2MBIT;</div><div class='add'>+		break;</div><div class='add'>+	case 5500000:</div><div class='add'>+		priv-&gt;txrate = TX_RATE_5_5MBIT;</div><div class='add'>+		break;</div><div class='add'>+	case 11000000:</div><div class='add'>+		priv-&gt;txrate = TX_RATE_11MBIT;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int at76_iw_handler_get_rate(struct net_device *netdev,</div><div class='add'>+				    struct iw_request_info *info,</div><div class='add'>+				    struct iw_param *bitrate, char *extra)</div><div class='add'>+{</div><div class='add'>+	struct at76_priv *priv = netdev_priv(netdev);</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	switch (priv-&gt;txrate) {</div><div class='add'>+		/* return max rate if RATE_AUTO */</div><div class='add'>+	case TX_RATE_AUTO:</div><div class='add'>+		bitrate-&gt;value = 11000000;</div><div class='add'>+		break;</div><div class='add'>+	case TX_RATE_1MBIT:</div><div class='add'>+		bitrate-&gt;value = 1000000;</div><div class='add'>+		break;</div><div class='add'>+	case TX_RATE_2MBIT:</div><div class='add'>+		bitrate-&gt;value = 2000000;</div><div class='add'>+		break;</div><div class='add'>+	case TX_RATE_5_5MBIT:</div><div class='add'>+		bitrate-&gt;value = 5500000;</div><div class='add'>+		break;</div><div class='add'>+	case TX_RATE_11MBIT:</div><div class='add'>+		bitrate-&gt;value = 11000000;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bitrate-&gt;fixed = (priv-&gt;txrate != TX_RATE_AUTO);</div><div class='add'>+	bitrate-&gt;disabled = 0;</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_IOCTL, "%s: SIOCGIWRATE - %d", netdev-&gt;name,</div><div class='add'>+		 bitrate-&gt;value);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int at76_iw_handler_set_rts(struct net_device *netdev,</div><div class='add'>+				   struct iw_request_info *info,</div><div class='add'>+				   struct iw_param *rts, char *extra)</div><div class='add'>+{</div><div class='add'>+	struct at76_priv *priv = netdev_priv(netdev);</div><div class='add'>+	int ret = -EIWCOMMIT;</div><div class='add'>+	int rthr = rts-&gt;value;</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_IOCTL, "%s: SIOCSIWRTS - value %d disabled %s",</div><div class='add'>+		 netdev-&gt;name, rts-&gt;value, (rts-&gt;disabled) ? "true" : "false");</div><div class='add'>+</div><div class='add'>+	if (rts-&gt;disabled)</div><div class='add'>+		rthr = MAX_RTS_THRESHOLD;</div><div class='add'>+</div><div class='add'>+	if ((rthr &lt; 0) || (rthr &gt; MAX_RTS_THRESHOLD))</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+	else</div><div class='add'>+		priv-&gt;rts_threshold = rthr;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int at76_iw_handler_get_rts(struct net_device *netdev,</div><div class='add'>+				   struct iw_request_info *info,</div><div class='add'>+				   struct iw_param *rts, char *extra)</div><div class='add'>+{</div><div class='add'>+	struct at76_priv *priv = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	rts-&gt;value = priv-&gt;rts_threshold;</div><div class='add'>+	rts-&gt;disabled = (rts-&gt;value &gt;= MAX_RTS_THRESHOLD);</div><div class='add'>+	rts-&gt;fixed = 1;</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_IOCTL, "%s: SIOCGIWRTS - value %d disabled %s",</div><div class='add'>+		 netdev-&gt;name, rts-&gt;value, (rts-&gt;disabled) ? "true" : "false");</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int at76_iw_handler_set_frag(struct net_device *netdev,</div><div class='add'>+				    struct iw_request_info *info,</div><div class='add'>+				    struct iw_param *frag, char *extra)</div><div class='add'>+{</div><div class='add'>+	struct at76_priv *priv = netdev_priv(netdev);</div><div class='add'>+	int ret = -EIWCOMMIT;</div><div class='add'>+	int fthr = frag-&gt;value;</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_IOCTL, "%s: SIOCSIWFRAG - value %d, disabled %s",</div><div class='add'>+		 netdev-&gt;name, frag-&gt;value,</div><div class='add'>+		 (frag-&gt;disabled) ? "true" : "false");</div><div class='add'>+</div><div class='add'>+	if (frag-&gt;disabled)</div><div class='add'>+		fthr = MAX_FRAG_THRESHOLD;</div><div class='add'>+</div><div class='add'>+	if ((fthr &lt; MIN_FRAG_THRESHOLD) || (fthr &gt; MAX_FRAG_THRESHOLD))</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+	else</div><div class='add'>+		priv-&gt;frag_threshold = fthr &amp; ~0x1;	/* get an even value */</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int at76_iw_handler_get_frag(struct net_device *netdev,</div><div class='add'>+				    struct iw_request_info *info,</div><div class='add'>+				    struct iw_param *frag, char *extra)</div><div class='add'>+{</div><div class='add'>+	struct at76_priv *priv = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	frag-&gt;value = priv-&gt;frag_threshold;</div><div class='add'>+	frag-&gt;disabled = (frag-&gt;value &gt;= MAX_FRAG_THRESHOLD);</div><div class='add'>+	frag-&gt;fixed = 1;</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_IOCTL, "%s: SIOCGIWFRAG - value %d, disabled %s",</div><div class='add'>+		 netdev-&gt;name, frag-&gt;value,</div><div class='add'>+		 (frag-&gt;disabled) ? "true" : "false");</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int at76_iw_handler_get_txpow(struct net_device *netdev,</div><div class='add'>+				     struct iw_request_info *info,</div><div class='add'>+				     struct iw_param *power, char *extra)</div><div class='add'>+{</div><div class='add'>+	power-&gt;value = 15;</div><div class='add'>+	power-&gt;fixed = 1;	/* No power control */</div><div class='add'>+	power-&gt;disabled = 0;</div><div class='add'>+	power-&gt;flags = IW_TXPOW_DBM;</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_IOCTL, "%s: SIOCGIWTXPOW - txpow %d dBm", netdev-&gt;name,</div><div class='add'>+		 power-&gt;value);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* jal: short retry is handled by the firmware (at least 0.90.x),</div><div class='add'>+   while long retry is not (?) */</div><div class='add'>+static int at76_iw_handler_set_retry(struct net_device *netdev,</div><div class='add'>+				     struct iw_request_info *info,</div><div class='add'>+				     struct iw_param *retry, char *extra)</div><div class='add'>+{</div><div class='add'>+	struct at76_priv *priv = netdev_priv(netdev);</div><div class='add'>+	int ret = -EIWCOMMIT;</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_IOCTL, "%s: SIOCSIWRETRY disabled %d flags 0x%x val %d",</div><div class='add'>+		 netdev-&gt;name, retry-&gt;disabled, retry-&gt;flags, retry-&gt;value);</div><div class='add'>+</div><div class='add'>+	if (!retry-&gt;disabled &amp;&amp; (retry-&gt;flags &amp; IW_RETRY_LIMIT)) {</div><div class='add'>+		if ((retry-&gt;flags &amp; IW_RETRY_MIN) ||</div><div class='add'>+		    !(retry-&gt;flags &amp; IW_RETRY_MAX))</div><div class='add'>+			priv-&gt;short_retry_limit = retry-&gt;value;</div><div class='add'>+		else</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+	} else</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Adapted (ripped) from atmel.c */</div><div class='add'>+static int at76_iw_handler_get_retry(struct net_device *netdev,</div><div class='add'>+				     struct iw_request_info *info,</div><div class='add'>+				     struct iw_param *retry, char *extra)</div><div class='add'>+{</div><div class='add'>+	struct at76_priv *priv = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_IOCTL, "%s: SIOCGIWRETRY", netdev-&gt;name);</div><div class='add'>+</div><div class='add'>+	retry-&gt;disabled = 0;	/* Can't be disabled */</div><div class='add'>+	retry-&gt;flags = IW_RETRY_LIMIT;</div><div class='add'>+	retry-&gt;value = priv-&gt;short_retry_limit;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int at76_iw_handler_set_encode(struct net_device *netdev,</div><div class='add'>+				      struct iw_request_info *info,</div><div class='add'>+				      struct iw_point *encoding, char *extra)</div><div class='add'>+{</div><div class='add'>+	struct at76_priv *priv = netdev_priv(netdev);</div><div class='add'>+	int index = (encoding-&gt;flags &amp; IW_ENCODE_INDEX) - 1;</div><div class='add'>+	int len = encoding-&gt;length;</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_IOCTL, "%s: SIOCSIWENCODE - enc.flags %08x "</div><div class='add'>+		 "pointer %p len %d", netdev-&gt;name, encoding-&gt;flags,</div><div class='add'>+		 encoding-&gt;pointer, encoding-&gt;length);</div><div class='add'>+	at76_dbg(DBG_IOCTL,</div><div class='add'>+		 "%s: SIOCSIWENCODE - old wepstate: enabled %s key_id %d "</div><div class='add'>+		 "auth_mode %s", netdev-&gt;name,</div><div class='add'>+		 (priv-&gt;wep_enabled) ? "true" : "false", priv-&gt;wep_key_id,</div><div class='add'>+		 (priv-&gt;auth_mode ==</div><div class='add'>+		  WLAN_AUTH_SHARED_KEY) ? "restricted" : "open");</div><div class='add'>+</div><div class='add'>+	/* take the old default key if index is invalid */</div><div class='add'>+	if ((index &lt; 0) || (index &gt;= WEP_KEYS))</div><div class='add'>+		index = priv-&gt;wep_key_id;</div><div class='add'>+</div><div class='add'>+	if (len &gt; 0) {</div><div class='add'>+		if (len &gt; WEP_LARGE_KEY_LEN)</div><div class='add'>+			len = WEP_LARGE_KEY_LEN;</div><div class='add'>+</div><div class='add'>+		memset(priv-&gt;wep_keys[index], 0, WEP_KEY_LEN);</div><div class='add'>+		memcpy(priv-&gt;wep_keys[index], extra, len);</div><div class='add'>+		priv-&gt;wep_keys_len[index] = (len &lt;= WEP_SMALL_KEY_LEN) ?</div><div class='add'>+		    WEP_SMALL_KEY_LEN : WEP_LARGE_KEY_LEN;</div><div class='add'>+		priv-&gt;wep_enabled = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;wep_key_id = index;</div><div class='add'>+	priv-&gt;wep_enabled = ((encoding-&gt;flags &amp; IW_ENCODE_DISABLED) == 0);</div><div class='add'>+</div><div class='add'>+	if (encoding-&gt;flags &amp; IW_ENCODE_RESTRICTED)</div><div class='add'>+		priv-&gt;auth_mode = WLAN_AUTH_SHARED_KEY;</div><div class='add'>+	if (encoding-&gt;flags &amp; IW_ENCODE_OPEN)</div><div class='add'>+		priv-&gt;auth_mode = WLAN_AUTH_OPEN;</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_IOCTL,</div><div class='add'>+		 "%s: SIOCSIWENCODE - new wepstate: enabled %s key_id %d "</div><div class='add'>+		 "key_len %d auth_mode %s", netdev-&gt;name,</div><div class='add'>+		 (priv-&gt;wep_enabled) ? "true" : "false", priv-&gt;wep_key_id + 1,</div><div class='add'>+		 priv-&gt;wep_keys_len[priv-&gt;wep_key_id],</div><div class='add'>+		 (priv-&gt;auth_mode ==</div><div class='add'>+		  WLAN_AUTH_SHARED_KEY) ? "restricted" : "open");</div><div class='add'>+</div><div class='add'>+	return -EIWCOMMIT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int at76_iw_handler_get_encode(struct net_device *netdev,</div><div class='add'>+				      struct iw_request_info *info,</div><div class='add'>+				      struct iw_point *encoding, char *extra)</div><div class='add'>+{</div><div class='add'>+	struct at76_priv *priv = netdev_priv(netdev);</div><div class='add'>+	int index = (encoding-&gt;flags &amp; IW_ENCODE_INDEX) - 1;</div><div class='add'>+</div><div class='add'>+	if ((index &lt; 0) || (index &gt;= WEP_KEYS))</div><div class='add'>+		index = priv-&gt;wep_key_id;</div><div class='add'>+</div><div class='add'>+	encoding-&gt;flags =</div><div class='add'>+	    (priv-&gt;auth_mode == WLAN_AUTH_SHARED_KEY) ?</div><div class='add'>+	    IW_ENCODE_RESTRICTED : IW_ENCODE_OPEN;</div><div class='add'>+</div><div class='add'>+	if (!priv-&gt;wep_enabled)</div><div class='add'>+		encoding-&gt;flags |= IW_ENCODE_DISABLED;</div><div class='add'>+</div><div class='add'>+	if (encoding-&gt;pointer) {</div><div class='add'>+		encoding-&gt;length = priv-&gt;wep_keys_len[index];</div><div class='add'>+</div><div class='add'>+		memcpy(extra, priv-&gt;wep_keys[index], priv-&gt;wep_keys_len[index]);</div><div class='add'>+</div><div class='add'>+		encoding-&gt;flags |= (index + 1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_IOCTL, "%s: SIOCGIWENCODE - enc.flags %08x "</div><div class='add'>+		 "pointer %p len %d", netdev-&gt;name, encoding-&gt;flags,</div><div class='add'>+		 encoding-&gt;pointer, encoding-&gt;length);</div><div class='add'>+	at76_dbg(DBG_IOCTL,</div><div class='add'>+		 "%s: SIOCGIWENCODE - wepstate: enabled %s key_id %d "</div><div class='add'>+		 "key_len %d auth_mode %s", netdev-&gt;name,</div><div class='add'>+		 (priv-&gt;wep_enabled) ? "true" : "false", priv-&gt;wep_key_id + 1,</div><div class='add'>+		 priv-&gt;wep_keys_len[priv-&gt;wep_key_id],</div><div class='add'>+		 (priv-&gt;auth_mode ==</div><div class='add'>+		  WLAN_AUTH_SHARED_KEY) ? "restricted" : "open");</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int at76_iw_handler_set_power(struct net_device *netdev,</div><div class='add'>+				     struct iw_request_info *info,</div><div class='add'>+				     struct iw_param *prq, char *extra)</div><div class='add'>+{</div><div class='add'>+	int err = -EIWCOMMIT;</div><div class='add'>+	struct at76_priv *priv = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_IOCTL,</div><div class='add'>+		 "%s: SIOCSIWPOWER - disabled %s flags 0x%x value 0x%x",</div><div class='add'>+		 netdev-&gt;name, (prq-&gt;disabled) ? "true" : "false", prq-&gt;flags,</div><div class='add'>+		 prq-&gt;value);</div><div class='add'>+</div><div class='add'>+	if (prq-&gt;disabled)</div><div class='add'>+		priv-&gt;pm_mode = AT76_PM_OFF;</div><div class='add'>+	else {</div><div class='add'>+		switch (prq-&gt;flags &amp; IW_POWER_MODE) {</div><div class='add'>+		case IW_POWER_ALL_R:</div><div class='add'>+		case IW_POWER_ON:</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+		if (prq-&gt;flags &amp; IW_POWER_PERIOD)</div><div class='add'>+			priv-&gt;pm_period = prq-&gt;value;</div><div class='add'>+</div><div class='add'>+		if (prq-&gt;flags &amp; IW_POWER_TIMEOUT) {</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+		priv-&gt;pm_mode = AT76_PM_ON;</div><div class='add'>+	}</div><div class='add'>+exit:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int at76_iw_handler_get_power(struct net_device *netdev,</div><div class='add'>+				     struct iw_request_info *info,</div><div class='add'>+				     struct iw_param *power, char *extra)</div><div class='add'>+{</div><div class='add'>+	struct at76_priv *priv = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	power-&gt;disabled = (priv-&gt;pm_mode == AT76_PM_OFF);</div><div class='add'>+	if (!power-&gt;disabled) {</div><div class='add'>+		power-&gt;flags = IW_POWER_PERIOD | IW_POWER_ALL_R;</div><div class='add'>+		power-&gt;value = priv-&gt;pm_period;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_IOCTL, "%s: SIOCGIWPOWER - %s flags 0x%x value 0x%x",</div><div class='add'>+		 netdev-&gt;name, power-&gt;disabled ? "disabled" : "enabled",</div><div class='add'>+		 power-&gt;flags, power-&gt;value);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*******************************************************************************</div><div class='add'>+ * Private IOCTLS</div><div class='add'>+ */</div><div class='add'>+static int at76_iw_set_short_preamble(struct net_device *netdev,</div><div class='add'>+				      struct iw_request_info *info, char *name,</div><div class='add'>+				      char *extra)</div><div class='add'>+{</div><div class='add'>+	struct at76_priv *priv = netdev_priv(netdev);</div><div class='add'>+	int val = *((int *)name);</div><div class='add'>+	int ret = -EIWCOMMIT;</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_IOCTL, "%s: AT76_SET_SHORT_PREAMBLE, %d",</div><div class='add'>+		 netdev-&gt;name, val);</div><div class='add'>+</div><div class='add'>+	if (val &lt; PREAMBLE_TYPE_LONG || val &gt; PREAMBLE_TYPE_AUTO)</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+	else</div><div class='add'>+		priv-&gt;preamble_type = val;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int at76_iw_get_short_preamble(struct net_device *netdev,</div><div class='add'>+				      struct iw_request_info *info,</div><div class='add'>+				      union iwreq_data *wrqu, char *extra)</div><div class='add'>+{</div><div class='add'>+	struct at76_priv *priv = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	snprintf(wrqu-&gt;name, sizeof(wrqu-&gt;name), "%s (%d)",</div><div class='add'>+		 preambles[priv-&gt;preamble_type], priv-&gt;preamble_type);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int at76_iw_set_debug(struct net_device *netdev,</div><div class='add'>+			     struct iw_request_info *info,</div><div class='add'>+			     struct iw_point *data, char *extra)</div><div class='add'>+{</div><div class='add'>+	char *ptr;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	if (data-&gt;length &gt; 0) {</div><div class='add'>+		val = simple_strtol(extra, &amp;ptr, 0);</div><div class='add'>+</div><div class='add'>+		if (ptr == extra)</div><div class='add'>+			val = DBG_DEFAULTS;</div><div class='add'>+</div><div class='add'>+		at76_dbg(DBG_IOCTL, "%s: AT76_SET_DEBUG input %d: %s -&gt; 0x%x",</div><div class='add'>+			 netdev-&gt;name, data-&gt;length, extra, val);</div><div class='add'>+	} else</div><div class='add'>+		val = DBG_DEFAULTS;</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_IOCTL, "%s: AT76_SET_DEBUG, old 0x%x, new 0x%x",</div><div class='add'>+		 netdev-&gt;name, at76_debug, val);</div><div class='add'>+</div><div class='add'>+	/* jal: some more output to pin down lockups */</div><div class='add'>+	at76_dbg(DBG_IOCTL, "%s: netif running %d queue_stopped %d "</div><div class='add'>+		 "carrier_ok %d", netdev-&gt;name, netif_running(netdev),</div><div class='add'>+		 netif_queue_stopped(netdev), netif_carrier_ok(netdev));</div><div class='add'>+</div><div class='add'>+	at76_debug = val;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int at76_iw_get_debug(struct net_device *netdev,</div><div class='add'>+			     struct iw_request_info *info,</div><div class='add'>+			     union iwreq_data *wrqu, char *extra)</div><div class='add'>+{</div><div class='add'>+	snprintf(wrqu-&gt;name, sizeof(wrqu-&gt;name), "0x%08x", at76_debug);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int at76_iw_set_powersave_mode(struct net_device *netdev,</div><div class='add'>+				      struct iw_request_info *info, char *name,</div><div class='add'>+				      char *extra)</div><div class='add'>+{</div><div class='add'>+	struct at76_priv *priv = netdev_priv(netdev);</div><div class='add'>+	int val = *((int *)name);</div><div class='add'>+	int ret = -EIWCOMMIT;</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_IOCTL, "%s: AT76_SET_POWERSAVE_MODE, %d (%s)",</div><div class='add'>+		 netdev-&gt;name, val,</div><div class='add'>+		 val == AT76_PM_OFF ? "active" : val == AT76_PM_ON ? "save" :</div><div class='add'>+		 val == AT76_PM_SMART ? "smart save" : "&lt;invalid&gt;");</div><div class='add'>+	if (val &lt; AT76_PM_OFF || val &gt; AT76_PM_SMART)</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+	else</div><div class='add'>+		priv-&gt;pm_mode = val;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int at76_iw_get_powersave_mode(struct net_device *netdev,</div><div class='add'>+				      struct iw_request_info *info,</div><div class='add'>+				      union iwreq_data *wrqu, char *extra)</div><div class='add'>+{</div><div class='add'>+	struct at76_priv *priv = netdev_priv(netdev);</div><div class='add'>+	int *param = (int *)extra;</div><div class='add'>+</div><div class='add'>+	param[0] = priv-&gt;pm_mode;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int at76_iw_set_scan_times(struct net_device *netdev,</div><div class='add'>+				  struct iw_request_info *info, char *name,</div><div class='add'>+				  char *extra)</div><div class='add'>+{</div><div class='add'>+	struct at76_priv *priv = netdev_priv(netdev);</div><div class='add'>+	int mint = *((int *)name);</div><div class='add'>+	int maxt = *((int *)name + 1);</div><div class='add'>+	int ret = -EIWCOMMIT;</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_IOCTL, "%s: AT76_SET_SCAN_TIMES - min %d max %d",</div><div class='add'>+		 netdev-&gt;name, mint, maxt);</div><div class='add'>+	if (mint &lt;= 0 || maxt &lt;= 0 || mint &gt; maxt)</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+	else {</div><div class='add'>+		priv-&gt;scan_min_time = mint;</div><div class='add'>+		priv-&gt;scan_max_time = maxt;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int at76_iw_get_scan_times(struct net_device *netdev,</div><div class='add'>+				  struct iw_request_info *info,</div><div class='add'>+				  union iwreq_data *wrqu, char *extra)</div><div class='add'>+{</div><div class='add'>+	struct at76_priv *priv = netdev_priv(netdev);</div><div class='add'>+	int *param = (int *)extra;</div><div class='add'>+</div><div class='add'>+	param[0] = priv-&gt;scan_min_time;</div><div class='add'>+	param[1] = priv-&gt;scan_max_time;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int at76_iw_set_scan_mode(struct net_device *netdev,</div><div class='add'>+				 struct iw_request_info *info, char *name,</div><div class='add'>+				 char *extra)</div><div class='add'>+{</div><div class='add'>+	struct at76_priv *priv = netdev_priv(netdev);</div><div class='add'>+	int val = *((int *)name);</div><div class='add'>+	int ret = -EIWCOMMIT;</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_IOCTL, "%s: AT76_SET_SCAN_MODE - mode %s",</div><div class='add'>+		 netdev-&gt;name, (val = SCAN_TYPE_ACTIVE) ? "active" :</div><div class='add'>+		 (val = SCAN_TYPE_PASSIVE) ? "passive" : "&lt;invalid&gt;");</div><div class='add'>+</div><div class='add'>+	if (val != SCAN_TYPE_ACTIVE &amp;&amp; val != SCAN_TYPE_PASSIVE)</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+	else</div><div class='add'>+		priv-&gt;scan_mode = val;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int at76_iw_get_scan_mode(struct net_device *netdev,</div><div class='add'>+				 struct iw_request_info *info,</div><div class='add'>+				 union iwreq_data *wrqu, char *extra)</div><div class='add'>+{</div><div class='add'>+	struct at76_priv *priv = netdev_priv(netdev);</div><div class='add'>+	int *param = (int *)extra;</div><div class='add'>+</div><div class='add'>+	param[0] = priv-&gt;scan_mode;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define AT76_SET_HANDLER(h, f) [h - SIOCIWFIRST] = (iw_handler) f</div><div class='add'>+</div><div class='add'>+/* Standard wireless handlers */</div><div class='add'>+static const iw_handler at76_handlers[] = {</div><div class='add'>+	AT76_SET_HANDLER(SIOCSIWCOMMIT, at76_iw_handler_commit),</div><div class='add'>+	AT76_SET_HANDLER(SIOCGIWNAME, at76_iw_handler_get_name),</div><div class='add'>+	AT76_SET_HANDLER(SIOCSIWFREQ, at76_iw_handler_set_freq),</div><div class='add'>+	AT76_SET_HANDLER(SIOCGIWFREQ, at76_iw_handler_get_freq),</div><div class='add'>+	AT76_SET_HANDLER(SIOCSIWMODE, at76_iw_handler_set_mode),</div><div class='add'>+	AT76_SET_HANDLER(SIOCGIWMODE, at76_iw_handler_get_mode),</div><div class='add'>+	AT76_SET_HANDLER(SIOCGIWRANGE, at76_iw_handler_get_range),</div><div class='add'>+	AT76_SET_HANDLER(SIOCSIWSPY, at76_iw_handler_set_spy),</div><div class='add'>+	AT76_SET_HANDLER(SIOCGIWSPY, at76_iw_handler_get_spy),</div><div class='add'>+	AT76_SET_HANDLER(SIOCSIWTHRSPY, at76_iw_handler_set_thrspy),</div><div class='add'>+	AT76_SET_HANDLER(SIOCGIWTHRSPY, at76_iw_handler_get_thrspy),</div><div class='add'>+	AT76_SET_HANDLER(SIOCSIWAP, at76_iw_handler_set_wap),</div><div class='add'>+	AT76_SET_HANDLER(SIOCGIWAP, at76_iw_handler_get_wap),</div><div class='add'>+	AT76_SET_HANDLER(SIOCSIWSCAN, at76_iw_handler_set_scan),</div><div class='add'>+	AT76_SET_HANDLER(SIOCGIWSCAN, at76_iw_handler_get_scan),</div><div class='add'>+	AT76_SET_HANDLER(SIOCSIWESSID, at76_iw_handler_set_essid),</div><div class='add'>+	AT76_SET_HANDLER(SIOCGIWESSID, at76_iw_handler_get_essid),</div><div class='add'>+	AT76_SET_HANDLER(SIOCSIWRATE, at76_iw_handler_set_rate),</div><div class='add'>+	AT76_SET_HANDLER(SIOCGIWRATE, at76_iw_handler_get_rate),</div><div class='add'>+	AT76_SET_HANDLER(SIOCSIWRTS, at76_iw_handler_set_rts),</div><div class='add'>+	AT76_SET_HANDLER(SIOCGIWRTS, at76_iw_handler_get_rts),</div><div class='add'>+	AT76_SET_HANDLER(SIOCSIWFRAG, at76_iw_handler_set_frag),</div><div class='add'>+	AT76_SET_HANDLER(SIOCGIWFRAG, at76_iw_handler_get_frag),</div><div class='add'>+	AT76_SET_HANDLER(SIOCGIWTXPOW, at76_iw_handler_get_txpow),</div><div class='add'>+	AT76_SET_HANDLER(SIOCSIWRETRY, at76_iw_handler_set_retry),</div><div class='add'>+	AT76_SET_HANDLER(SIOCGIWRETRY, at76_iw_handler_get_retry),</div><div class='add'>+	AT76_SET_HANDLER(SIOCSIWENCODE, at76_iw_handler_set_encode),</div><div class='add'>+	AT76_SET_HANDLER(SIOCGIWENCODE, at76_iw_handler_get_encode),</div><div class='add'>+	AT76_SET_HANDLER(SIOCSIWPOWER, at76_iw_handler_set_power),</div><div class='add'>+	AT76_SET_HANDLER(SIOCGIWPOWER, at76_iw_handler_get_power)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define AT76_SET_PRIV(h, f) [h - SIOCIWFIRSTPRIV] = (iw_handler) f</div><div class='add'>+</div><div class='add'>+/* Private wireless handlers */</div><div class='add'>+static const iw_handler at76_priv_handlers[] = {</div><div class='add'>+	AT76_SET_PRIV(AT76_SET_SHORT_PREAMBLE, at76_iw_set_short_preamble),</div><div class='add'>+	AT76_SET_PRIV(AT76_GET_SHORT_PREAMBLE, at76_iw_get_short_preamble),</div><div class='add'>+	AT76_SET_PRIV(AT76_SET_DEBUG, at76_iw_set_debug),</div><div class='add'>+	AT76_SET_PRIV(AT76_GET_DEBUG, at76_iw_get_debug),</div><div class='add'>+	AT76_SET_PRIV(AT76_SET_POWERSAVE_MODE, at76_iw_set_powersave_mode),</div><div class='add'>+	AT76_SET_PRIV(AT76_GET_POWERSAVE_MODE, at76_iw_get_powersave_mode),</div><div class='add'>+	AT76_SET_PRIV(AT76_SET_SCAN_TIMES, at76_iw_set_scan_times),</div><div class='add'>+	AT76_SET_PRIV(AT76_GET_SCAN_TIMES, at76_iw_get_scan_times),</div><div class='add'>+	AT76_SET_PRIV(AT76_SET_SCAN_MODE, at76_iw_set_scan_mode),</div><div class='add'>+	AT76_SET_PRIV(AT76_GET_SCAN_MODE, at76_iw_get_scan_mode),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Names and arguments of private wireless handlers */</div><div class='add'>+static const struct iw_priv_args at76_priv_args[] = {</div><div class='add'>+	/* 0 - long, 1 - short */</div><div class='add'>+	{AT76_SET_SHORT_PREAMBLE,</div><div class='add'>+	 IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "set_preamble"},</div><div class='add'>+</div><div class='add'>+	{AT76_GET_SHORT_PREAMBLE,</div><div class='add'>+	 0, IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | 10, "get_preamble"},</div><div class='add'>+</div><div class='add'>+	/* we must pass the new debug mask as a string, because iwpriv cannot</div><div class='add'>+	 * parse hex numbers starting with 0x :-(  */</div><div class='add'>+	{AT76_SET_DEBUG,</div><div class='add'>+	 IW_PRIV_TYPE_CHAR | 10, 0, "set_debug"},</div><div class='add'>+</div><div class='add'>+	{AT76_GET_DEBUG,</div><div class='add'>+	 0, IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | 10, "get_debug"},</div><div class='add'>+</div><div class='add'>+	/* 1 - active, 2 - power save, 3 - smart power save */</div><div class='add'>+	{AT76_SET_POWERSAVE_MODE,</div><div class='add'>+	 IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "set_powersave"},</div><div class='add'>+</div><div class='add'>+	{AT76_GET_POWERSAVE_MODE,</div><div class='add'>+	 0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "get_powersave"},</div><div class='add'>+</div><div class='add'>+	/* min_channel_time, max_channel_time */</div><div class='add'>+	{AT76_SET_SCAN_TIMES,</div><div class='add'>+	 IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 2, 0, "set_scan_times"},</div><div class='add'>+</div><div class='add'>+	{AT76_GET_SCAN_TIMES,</div><div class='add'>+	 0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 2, "get_scan_times"},</div><div class='add'>+</div><div class='add'>+	/* 0 - active, 1 - passive scan */</div><div class='add'>+	{AT76_SET_SCAN_MODE,</div><div class='add'>+	 IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "set_scan_mode"},</div><div class='add'>+</div><div class='add'>+	{AT76_GET_SCAN_MODE,</div><div class='add'>+	 0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "get_scan_mode"},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct iw_handler_def at76_handler_def = {</div><div class='add'>+	.num_standard = ARRAY_SIZE(at76_handlers),</div><div class='add'>+	.num_private = ARRAY_SIZE(at76_priv_handlers),</div><div class='add'>+	.num_private_args = ARRAY_SIZE(at76_priv_args),</div><div class='add'>+	.standard = at76_handlers,</div><div class='add'>+	.private = at76_priv_handlers,</div><div class='add'>+	.private_args = at76_priv_args,</div><div class='add'>+	.get_wireless_stats = at76_get_wireless_stats,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u8 snapsig[] = { 0xaa, 0xaa, 0x03 };</div><div class='add'>+</div><div class='add'>+/* RFC 1042 encapsulates Ethernet frames in 802.2 SNAP (0xaa, 0xaa, 0x03) with</div><div class='add'>+ * a SNAP OID of 0 (0x00, 0x00, 0x00) */</div><div class='add'>+static const u8 rfc1042sig[] = { 0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00 };</div><div class='add'>+</div><div class='add'>+static int at76_tx(struct sk_buff *skb, struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct at76_priv *priv = netdev_priv(netdev);</div><div class='add'>+	struct net_device_stats *stats = &amp;priv-&gt;stats;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	int wlen;</div><div class='add'>+	int submit_len;</div><div class='add'>+	struct at76_tx_buffer *tx_buffer = priv-&gt;bulk_out_buffer;</div><div class='add'>+	struct ieee80211_hdr_3addr *i802_11_hdr =</div><div class='add'>+	    (struct ieee80211_hdr_3addr *)tx_buffer-&gt;packet;</div><div class='add'>+	u8 *payload = i802_11_hdr-&gt;payload;</div><div class='add'>+	struct ethhdr *eh = (struct ethhdr *)skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	if (netif_queue_stopped(netdev)) {</div><div class='add'>+		printk(KERN_ERR "%s: %s called while netdev is stopped\n",</div><div class='add'>+		       netdev-&gt;name, __func__);</div><div class='add'>+		/* skip this packet */</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;tx_urb-&gt;status == -EINPROGRESS) {</div><div class='add'>+		printk(KERN_ERR "%s: %s called while tx urb is pending\n",</div><div class='add'>+		       netdev-&gt;name, __func__);</div><div class='add'>+		/* skip this packet */</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;len &lt; ETH_HLEN) {</div><div class='add'>+		printk(KERN_ERR "%s: %s: skb too short (%d)\n",</div><div class='add'>+		       netdev-&gt;name, __func__, skb-&gt;len);</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	at76_ledtrig_tx_activity();	/* tell ledtrigger we send a packet */</div><div class='add'>+</div><div class='add'>+	/* we can get rid of memcpy if we set netdev-&gt;hard_header_len to</div><div class='add'>+	   reserve enough space, but we would need to keep the skb around */</div><div class='add'>+</div><div class='add'>+	if (ntohs(eh-&gt;h_proto) &lt;= ETH_DATA_LEN) {</div><div class='add'>+		/* this is a 802.3 packet */</div><div class='add'>+		if (skb-&gt;len &gt;= ETH_HLEN + sizeof(rfc1042sig)</div><div class='add'>+		    &amp;&amp; skb-&gt;data[ETH_HLEN] == rfc1042sig[0]</div><div class='add'>+		    &amp;&amp; skb-&gt;data[ETH_HLEN + 1] == rfc1042sig[1]) {</div><div class='add'>+			/* higher layer delivered SNAP header - keep it */</div><div class='add'>+			memcpy(payload, skb-&gt;data + ETH_HLEN,</div><div class='add'>+			       skb-&gt;len - ETH_HLEN);</div><div class='add'>+			wlen = IEEE80211_3ADDR_LEN + skb-&gt;len - ETH_HLEN;</div><div class='add'>+		} else {</div><div class='add'>+			printk(KERN_ERR "%s: dropping non-SNAP 802.2 packet "</div><div class='add'>+			       "(DSAP 0x%02x SSAP 0x%02x cntrl 0x%02x)\n",</div><div class='add'>+			       priv-&gt;netdev-&gt;name, skb-&gt;data[ETH_HLEN],</div><div class='add'>+			       skb-&gt;data[ETH_HLEN + 1],</div><div class='add'>+			       skb-&gt;data[ETH_HLEN + 2]);</div><div class='add'>+			dev_kfree_skb(skb);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		/* add RFC 1042 header in front */</div><div class='add'>+		memcpy(payload, rfc1042sig, sizeof(rfc1042sig));</div><div class='add'>+		memcpy(payload + sizeof(rfc1042sig), &amp;eh-&gt;h_proto,</div><div class='add'>+		       skb-&gt;len - offsetof(struct ethhdr, h_proto));</div><div class='add'>+		wlen = IEEE80211_3ADDR_LEN + sizeof(rfc1042sig) + skb-&gt;len -</div><div class='add'>+		    offsetof(struct ethhdr, h_proto);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* make wireless header */</div><div class='add'>+	i802_11_hdr-&gt;frame_ctl =</div><div class='add'>+	    cpu_to_le16(IEEE80211_FTYPE_DATA |</div><div class='add'>+			(priv-&gt;wep_enabled ? IEEE80211_FCTL_PROTECTED : 0) |</div><div class='add'>+			(priv-&gt;iw_mode ==</div><div class='add'>+			 IW_MODE_INFRA ? IEEE80211_FCTL_TODS : 0));</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;iw_mode == IW_MODE_ADHOC) {</div><div class='add'>+		memcpy(i802_11_hdr-&gt;addr1, eh-&gt;h_dest, ETH_ALEN);</div><div class='add'>+		memcpy(i802_11_hdr-&gt;addr2, eh-&gt;h_source, ETH_ALEN);</div><div class='add'>+		memcpy(i802_11_hdr-&gt;addr3, priv-&gt;bssid, ETH_ALEN);</div><div class='add'>+	} else if (priv-&gt;iw_mode == IW_MODE_INFRA) {</div><div class='add'>+		memcpy(i802_11_hdr-&gt;addr1, priv-&gt;bssid, ETH_ALEN);</div><div class='add'>+		memcpy(i802_11_hdr-&gt;addr2, eh-&gt;h_source, ETH_ALEN);</div><div class='add'>+		memcpy(i802_11_hdr-&gt;addr3, eh-&gt;h_dest, ETH_ALEN);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	i802_11_hdr-&gt;duration_id = cpu_to_le16(0);</div><div class='add'>+	i802_11_hdr-&gt;seq_ctl = cpu_to_le16(0);</div><div class='add'>+</div><div class='add'>+	/* setup 'Atmel' header */</div><div class='add'>+	tx_buffer-&gt;wlength = cpu_to_le16(wlen);</div><div class='add'>+	tx_buffer-&gt;tx_rate = priv-&gt;txrate;</div><div class='add'>+	/* for broadcast destination addresses, the firmware 0.100.x</div><div class='add'>+	   seems to choose the highest rate set with CMD_STARTUP in</div><div class='add'>+	   basic_rate_set replacing this value */</div><div class='add'>+</div><div class='add'>+	memset(tx_buffer-&gt;reserved, 0, sizeof(tx_buffer-&gt;reserved));</div><div class='add'>+</div><div class='add'>+	tx_buffer-&gt;padding = at76_calc_padding(wlen);</div><div class='add'>+	submit_len = wlen + AT76_TX_HDRLEN + tx_buffer-&gt;padding;</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_TX_DATA_CONTENT, "%s skb-&gt;data %s", priv-&gt;netdev-&gt;name,</div><div class='add'>+		 hex2str(skb-&gt;data, 32));</div><div class='add'>+	at76_dbg(DBG_TX_DATA, "%s tx: wlen 0x%x pad 0x%x rate %d hdr %s",</div><div class='add'>+		 priv-&gt;netdev-&gt;name,</div><div class='add'>+		 le16_to_cpu(tx_buffer-&gt;wlength),</div><div class='add'>+		 tx_buffer-&gt;padding, tx_buffer-&gt;tx_rate,</div><div class='add'>+		 hex2str(i802_11_hdr, sizeof(*i802_11_hdr)));</div><div class='add'>+	at76_dbg(DBG_TX_DATA_CONTENT, "%s payload %s", priv-&gt;netdev-&gt;name,</div><div class='add'>+		 hex2str(payload, 48));</div><div class='add'>+</div><div class='add'>+	/* send stuff */</div><div class='add'>+	netif_stop_queue(netdev);</div><div class='add'>+	netdev-&gt;trans_start = jiffies;</div><div class='add'>+</div><div class='add'>+	usb_fill_bulk_urb(priv-&gt;tx_urb, priv-&gt;udev, priv-&gt;tx_pipe, tx_buffer,</div><div class='add'>+			  submit_len, at76_tx_callback, priv);</div><div class='add'>+	ret = usb_submit_urb(priv-&gt;tx_urb, GFP_ATOMIC);</div><div class='add'>+	if (ret) {</div><div class='add'>+		stats-&gt;tx_errors++;</div><div class='add'>+		printk(KERN_ERR "%s: error in tx submit urb: %d\n",</div><div class='add'>+		       netdev-&gt;name, ret);</div><div class='add'>+		if (ret == -EINVAL)</div><div class='add'>+			printk(KERN_ERR</div><div class='add'>+			       "%s: -EINVAL: tx urb %p hcpriv %p complete %p\n",</div><div class='add'>+			       priv-&gt;netdev-&gt;name, priv-&gt;tx_urb,</div><div class='add'>+			       priv-&gt;tx_urb-&gt;hcpriv, priv-&gt;tx_urb-&gt;complete);</div><div class='add'>+	} else {</div><div class='add'>+		stats-&gt;tx_bytes += skb-&gt;len;</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void at76_tx_timeout(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct at76_priv *priv = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	if (!priv)</div><div class='add'>+		return;</div><div class='add'>+	dev_warn(&amp;netdev-&gt;dev, "tx timeout.");</div><div class='add'>+</div><div class='add'>+	usb_unlink_urb(priv-&gt;tx_urb);</div><div class='add'>+	priv-&gt;stats.tx_errors++;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int at76_submit_rx_urb(struct at76_priv *priv)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	int size;</div><div class='add'>+	struct sk_buff *skb = priv-&gt;rx_skb;</div><div class='add'>+</div><div class='add'>+	if (!priv-&gt;rx_urb) {</div><div class='add'>+		printk(KERN_ERR "%s: %s: priv-&gt;rx_urb is NULL\n",</div><div class='add'>+		       priv-&gt;netdev-&gt;name, __func__);</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!skb) {</div><div class='add'>+		skb = dev_alloc_skb(sizeof(struct at76_rx_buffer));</div><div class='add'>+		if (!skb) {</div><div class='add'>+			printk(KERN_ERR "%s: cannot allocate rx skbuff\n",</div><div class='add'>+			       priv-&gt;netdev-&gt;name);</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+		priv-&gt;rx_skb = skb;</div><div class='add'>+	} else {</div><div class='add'>+		skb_push(skb, skb_headroom(skb));</div><div class='add'>+		skb_trim(skb, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	size = skb_tailroom(skb);</div><div class='add'>+	usb_fill_bulk_urb(priv-&gt;rx_urb, priv-&gt;udev, priv-&gt;rx_pipe,</div><div class='add'>+			  skb_put(skb, size), size, at76_rx_callback, priv);</div><div class='add'>+	ret = usb_submit_urb(priv-&gt;rx_urb, GFP_ATOMIC);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		if (ret == -ENODEV)</div><div class='add'>+			at76_dbg(DBG_DEVSTART,</div><div class='add'>+				 "usb_submit_urb returned -ENODEV");</div><div class='add'>+		else</div><div class='add'>+			printk(KERN_ERR "%s: rx, usb_submit_urb failed: %d\n",</div><div class='add'>+			       priv-&gt;netdev-&gt;name, ret);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	if (ret &lt; 0 &amp;&amp; ret != -ENODEV)</div><div class='add'>+		printk(KERN_ERR "%s: cannot submit rx urb - please unload the "</div><div class='add'>+		       "driver and/or power cycle the device\n",</div><div class='add'>+		       priv-&gt;netdev-&gt;name);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int at76_open(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct at76_priv *priv = netdev_priv(netdev);</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_PROC_ENTRY, "%s(): entry", __func__);</div><div class='add'>+</div><div class='add'>+	if (mutex_lock_interruptible(&amp;priv-&gt;mtx))</div><div class='add'>+		return -EINTR;</div><div class='add'>+</div><div class='add'>+	/* if netdev-&gt;dev_addr != priv-&gt;mac_addr we must</div><div class='add'>+	   set the mac address in the device ! */</div><div class='add'>+	if (compare_ether_addr(netdev-&gt;dev_addr, priv-&gt;mac_addr)) {</div><div class='add'>+		if (at76_add_mac_address(priv, netdev-&gt;dev_addr) &gt;= 0)</div><div class='add'>+			at76_dbg(DBG_PROGRESS, "%s: set new MAC addr %s",</div><div class='add'>+				 netdev-&gt;name, mac2str(netdev-&gt;dev_addr));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;scan_state = SCAN_IDLE;</div><div class='add'>+	priv-&gt;last_scan = jiffies;</div><div class='add'>+</div><div class='add'>+	ret = at76_submit_rx_urb(priv);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		printk(KERN_ERR "%s: open: submit_rx_urb failed: %d\n",</div><div class='add'>+		       netdev-&gt;name, ret);</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	schedule_delayed_work(&amp;priv-&gt;dwork_restart, 0);</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_PROC_ENTRY, "%s(): end", __func__);</div><div class='add'>+error:</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;mtx);</div><div class='add'>+	return ret &lt; 0 ? ret : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int at76_stop(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct at76_priv *priv = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_DEVSTART, "%s: ENTER", __func__);</div><div class='add'>+</div><div class='add'>+	if (mutex_lock_interruptible(&amp;priv-&gt;mtx))</div><div class='add'>+		return -EINTR;</div><div class='add'>+</div><div class='add'>+	at76_quiesce(priv);</div><div class='add'>+</div><div class='add'>+	if (!priv-&gt;device_unplugged) {</div><div class='add'>+		/* We are called by "ifconfig ethX down", not because the</div><div class='add'>+		 * device is not available anymore. */</div><div class='add'>+		at76_set_radio(priv, 0);</div><div class='add'>+</div><div class='add'>+		/* We unlink rx_urb because at76_open() re-submits it.</div><div class='add'>+		 * If unplugged, at76_delete_device() takes care of it. */</div><div class='add'>+		usb_kill_urb(priv-&gt;rx_urb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* free the bss_list */</div><div class='add'>+	at76_free_bss_list(priv);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;mtx);</div><div class='add'>+	at76_dbg(DBG_DEVSTART, "%s: EXIT", __func__);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void at76_ethtool_get_drvinfo(struct net_device *netdev,</div><div class='add'>+				     struct ethtool_drvinfo *info)</div><div class='add'>+{</div><div class='add'>+	struct at76_priv *priv = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	strncpy(info-&gt;driver, DRIVER_NAME, sizeof(info-&gt;driver));</div><div class='add'>+	strncpy(info-&gt;version, DRIVER_VERSION, sizeof(info-&gt;version));</div><div class='add'>+</div><div class='add'>+	usb_make_path(priv-&gt;udev, info-&gt;bus_info, sizeof(info-&gt;bus_info));</div><div class='add'>+</div><div class='add'>+	snprintf(info-&gt;fw_version, sizeof(info-&gt;fw_version), "%d.%d.%d-%d",</div><div class='add'>+		 priv-&gt;fw_version.major, priv-&gt;fw_version.minor,</div><div class='add'>+		 priv-&gt;fw_version.patch, priv-&gt;fw_version.build);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 at76_ethtool_get_link(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct at76_priv *priv = netdev_priv(netdev);</div><div class='add'>+	return priv-&gt;mac_state == MAC_CONNECTED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct ethtool_ops at76_ethtool_ops = {</div><div class='add'>+	.get_drvinfo = at76_ethtool_get_drvinfo,</div><div class='add'>+	.get_link = at76_ethtool_get_link,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Download external firmware */</div><div class='add'>+static int at76_load_external_fw(struct usb_device *udev, struct fwentry *fwe)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	int op_mode;</div><div class='add'>+	int blockno = 0;</div><div class='add'>+	int bsize;</div><div class='add'>+	u8 *block;</div><div class='add'>+	u8 *buf = fwe-&gt;extfw;</div><div class='add'>+	int size = fwe-&gt;extfw_size;</div><div class='add'>+</div><div class='add'>+	if (!buf || !size)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	op_mode = at76_get_op_mode(udev);</div><div class='add'>+	at76_dbg(DBG_DEVSTART, "opmode %d", op_mode);</div><div class='add'>+</div><div class='add'>+	if (op_mode != OPMODE_NORMAL_NIC_WITHOUT_FLASH) {</div><div class='add'>+		dev_printk(KERN_ERR, &amp;udev-&gt;dev, "unexpected opmode %d\n",</div><div class='add'>+			   op_mode);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	block = kmalloc(FW_BLOCK_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!block)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_DEVSTART, "downloading external firmware");</div><div class='add'>+</div><div class='add'>+	/* for fw &gt;= 0.100, the device needs an extra empty block */</div><div class='add'>+	do {</div><div class='add'>+		bsize = min_t(int, size, FW_BLOCK_SIZE);</div><div class='add'>+		memcpy(block, buf, bsize);</div><div class='add'>+		at76_dbg(DBG_DEVSTART,</div><div class='add'>+			 "ext fw, size left = %5d, bsize = %4d, blockno = %2d",</div><div class='add'>+			 size, bsize, blockno);</div><div class='add'>+		ret = at76_load_ext_fw_block(udev, blockno, block, bsize);</div><div class='add'>+		if (ret != bsize) {</div><div class='add'>+			dev_printk(KERN_ERR, &amp;udev-&gt;dev,</div><div class='add'>+				   "loading %dth firmware block failed: %d\n",</div><div class='add'>+				   blockno, ret);</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+		buf += bsize;</div><div class='add'>+		size -= bsize;</div><div class='add'>+		blockno++;</div><div class='add'>+	} while (bsize &gt; 0);</div><div class='add'>+</div><div class='add'>+	if (at76_is_505a(fwe-&gt;board_type)) {</div><div class='add'>+		at76_dbg(DBG_DEVSTART, "200 ms delay for 505a");</div><div class='add'>+		schedule_timeout_interruptible(HZ / 5 + 1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	kfree(block);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		dev_printk(KERN_ERR, &amp;udev-&gt;dev,</div><div class='add'>+			   "downloading external firmware failed: %d\n", ret);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Download internal firmware */</div><div class='add'>+static int at76_load_internal_fw(struct usb_device *udev, struct fwentry *fwe)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	int need_remap = !at76_is_505a(fwe-&gt;board_type);</div><div class='add'>+</div><div class='add'>+	ret = at76_usbdfu_download(udev, fwe-&gt;intfw, fwe-&gt;intfw_size,</div><div class='add'>+				   need_remap ? 0 : 2 * HZ);</div><div class='add'>+</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_printk(KERN_ERR, &amp;udev-&gt;dev,</div><div class='add'>+			   "downloading internal fw failed with %d\n", ret);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_DEVSTART, "sending REMAP");</div><div class='add'>+</div><div class='add'>+	/* no REMAP for 505A (see SF driver) */</div><div class='add'>+	if (need_remap) {</div><div class='add'>+		ret = at76_remap(udev);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			dev_printk(KERN_ERR, &amp;udev-&gt;dev,</div><div class='add'>+				   "sending REMAP failed with %d\n", ret);</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_DEVSTART, "sleeping for 2 seconds");</div><div class='add'>+	schedule_timeout_interruptible(2 * HZ + 1);</div><div class='add'>+	usb_reset_device(udev);</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int at76_match_essid(struct at76_priv *priv, struct bss_info *ptr)</div><div class='add'>+{</div><div class='add'>+	/* common criteria for both modi */</div><div class='add'>+</div><div class='add'>+	int ret = (priv-&gt;essid_size == 0 /* ANY ssid */  ||</div><div class='add'>+		   (priv-&gt;essid_size == ptr-&gt;ssid_len &amp;&amp;</div><div class='add'>+		    !memcmp(priv-&gt;essid, ptr-&gt;ssid, ptr-&gt;ssid_len)));</div><div class='add'>+	if (!ret)</div><div class='add'>+		at76_dbg(DBG_BSS_MATCH,</div><div class='add'>+			 "%s bss table entry %p: essid didn't match",</div><div class='add'>+			 priv-&gt;netdev-&gt;name, ptr);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int at76_match_mode(struct at76_priv *priv, struct bss_info *ptr)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;iw_mode == IW_MODE_ADHOC)</div><div class='add'>+		ret = ptr-&gt;capa &amp; WLAN_CAPABILITY_IBSS;</div><div class='add'>+	else</div><div class='add'>+		ret = ptr-&gt;capa &amp; WLAN_CAPABILITY_ESS;</div><div class='add'>+	if (!ret)</div><div class='add'>+		at76_dbg(DBG_BSS_MATCH,</div><div class='add'>+			 "%s bss table entry %p: mode didn't match",</div><div class='add'>+			 priv-&gt;netdev-&gt;name, ptr);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int at76_match_rates(struct at76_priv *priv, struct bss_info *ptr)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ptr-&gt;rates_len; i++) {</div><div class='add'>+		u8 rate = ptr-&gt;rates[i];</div><div class='add'>+</div><div class='add'>+		if (!(rate &amp; 0x80))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* this is a basic rate we have to support</div><div class='add'>+		   (see IEEE802.11, ch. 7.3.2.2) */</div><div class='add'>+		if (rate != (0x80 | hw_rates[0])</div><div class='add'>+		    &amp;&amp; rate != (0x80 | hw_rates[1])</div><div class='add'>+		    &amp;&amp; rate != (0x80 | hw_rates[2])</div><div class='add'>+		    &amp;&amp; rate != (0x80 | hw_rates[3])) {</div><div class='add'>+			at76_dbg(DBG_BSS_MATCH,</div><div class='add'>+				 "%s: bss table entry %p: basic rate %02x not "</div><div class='add'>+				 "supported", priv-&gt;netdev-&gt;name, ptr, rate);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* if we use short preamble, the bss must support it */</div><div class='add'>+	if (priv-&gt;preamble_type == PREAMBLE_TYPE_SHORT &amp;&amp;</div><div class='add'>+	    !(ptr-&gt;capa &amp; WLAN_CAPABILITY_SHORT_PREAMBLE)) {</div><div class='add'>+		at76_dbg(DBG_BSS_MATCH,</div><div class='add'>+			 "%s: %p does not support short preamble",</div><div class='add'>+			 priv-&gt;netdev-&gt;name, ptr);</div><div class='add'>+		return 0;</div><div class='add'>+	} else</div><div class='add'>+		return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int at76_match_wep(struct at76_priv *priv, struct bss_info *ptr)</div><div class='add'>+{</div><div class='add'>+	if (!priv-&gt;wep_enabled &amp;&amp; ptr-&gt;capa &amp; WLAN_CAPABILITY_PRIVACY) {</div><div class='add'>+		/* we have disabled WEP, but the BSS signals privacy */</div><div class='add'>+		at76_dbg(DBG_BSS_MATCH,</div><div class='add'>+			 "%s: bss table entry %p: requires encryption",</div><div class='add'>+			 priv-&gt;netdev-&gt;name, ptr);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	/* otherwise if the BSS does not signal privacy it may well</div><div class='add'>+	   accept encrypted packets from us ... */</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int at76_match_bssid(struct at76_priv *priv, struct bss_info *ptr)</div><div class='add'>+{</div><div class='add'>+	if (!priv-&gt;wanted_bssid_valid ||</div><div class='add'>+	    !compare_ether_addr(ptr-&gt;bssid, priv-&gt;wanted_bssid))</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_BSS_MATCH,</div><div class='add'>+		 "%s: requested bssid - %s does not match",</div><div class='add'>+		 priv-&gt;netdev-&gt;name, mac2str(priv-&gt;wanted_bssid));</div><div class='add'>+	at76_dbg(DBG_BSS_MATCH,</div><div class='add'>+		 "      AP bssid - %s of bss table entry %p",</div><div class='add'>+		 mac2str(ptr-&gt;bssid), ptr);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * at76_match_bss - try to find a matching bss in priv-&gt;bss</div><div class='add'>+ *</div><div class='add'>+ * last - last bss tried</div><div class='add'>+ *</div><div class='add'>+ * last == NULL signals a new round starting with priv-&gt;bss_list.next</div><div class='add'>+ * this function must be called inside an acquired priv-&gt;bss_list_spinlock</div><div class='add'>+ * otherwise the timeout on bss may remove the newly chosen entry</div><div class='add'>+ */</div><div class='add'>+static struct bss_info *at76_match_bss(struct at76_priv *priv,</div><div class='add'>+				       struct bss_info *last)</div><div class='add'>+{</div><div class='add'>+	struct bss_info *ptr = NULL;</div><div class='add'>+	struct list_head *curr;</div><div class='add'>+</div><div class='add'>+	curr = last ? last-&gt;list.next : priv-&gt;bss_list.next;</div><div class='add'>+	while (curr != &amp;priv-&gt;bss_list) {</div><div class='add'>+		ptr = list_entry(curr, struct bss_info, list);</div><div class='add'>+		if (at76_match_essid(priv, ptr) &amp;&amp; at76_match_mode(priv, ptr)</div><div class='add'>+		    &amp;&amp; at76_match_wep(priv, ptr) &amp;&amp; at76_match_rates(priv, ptr)</div><div class='add'>+		    &amp;&amp; at76_match_bssid(priv, ptr))</div><div class='add'>+			break;</div><div class='add'>+		curr = curr-&gt;next;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (curr == &amp;priv-&gt;bss_list)</div><div class='add'>+		ptr = NULL;</div><div class='add'>+	/* otherwise ptr points to the struct bss_info we have chosen */</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_BSS_TABLE, "%s %s: returned %p", priv-&gt;netdev-&gt;name,</div><div class='add'>+		 __func__, ptr);</div><div class='add'>+	return ptr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Start joining a matching BSS, or create own IBSS */</div><div class='add'>+static void at76_work_join(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct at76_priv *priv = container_of(work, struct at76_priv,</div><div class='add'>+					      work_join);</div><div class='add'>+	int ret;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;mtx);</div><div class='add'>+</div><div class='add'>+	WARN_ON(priv-&gt;mac_state != MAC_JOINING);</div><div class='add'>+	if (priv-&gt;mac_state != MAC_JOINING)</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	/* secure the access to priv-&gt;curr_bss ! */</div><div class='add'>+	spin_lock_irqsave(&amp;priv-&gt;bss_list_spinlock, flags);</div><div class='add'>+	priv-&gt;curr_bss = at76_match_bss(priv, priv-&gt;curr_bss);</div><div class='add'>+	spin_unlock_irqrestore(&amp;priv-&gt;bss_list_spinlock, flags);</div><div class='add'>+</div><div class='add'>+	if (!priv-&gt;curr_bss) {</div><div class='add'>+		/* here we haven't found a matching (i)bss ... */</div><div class='add'>+		if (priv-&gt;iw_mode == IW_MODE_ADHOC) {</div><div class='add'>+			at76_set_mac_state(priv, MAC_OWN_IBSS);</div><div class='add'>+			at76_start_ibss(priv);</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+		/* haven't found a matching BSS in infra mode - try again */</div><div class='add'>+		at76_set_mac_state(priv, MAC_SCANNING);</div><div class='add'>+		schedule_work(&amp;priv-&gt;work_start_scan);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = at76_join_bss(priv, priv-&gt;curr_bss);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		printk(KERN_ERR "%s: join_bss failed with %d\n",</div><div class='add'>+		       priv-&gt;netdev-&gt;name, ret);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = at76_wait_completion(priv, CMD_JOIN);</div><div class='add'>+	if (ret != CMD_STATUS_COMPLETE) {</div><div class='add'>+		if (ret != CMD_STATUS_TIME_OUT)</div><div class='add'>+			printk(KERN_ERR "%s: join_bss completed with %d\n",</div><div class='add'>+			       priv-&gt;netdev-&gt;name, ret);</div><div class='add'>+		else</div><div class='add'>+			printk(KERN_INFO "%s: join_bss ssid %s timed out\n",</div><div class='add'>+			       priv-&gt;netdev-&gt;name,</div><div class='add'>+			       mac2str(priv-&gt;curr_bss-&gt;bssid));</div><div class='add'>+</div><div class='add'>+		/* retry next BSS immediately */</div><div class='add'>+		schedule_work(&amp;priv-&gt;work_join);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* here we have joined the (I)BSS */</div><div class='add'>+	if (priv-&gt;iw_mode == IW_MODE_ADHOC) {</div><div class='add'>+		struct bss_info *bptr = priv-&gt;curr_bss;</div><div class='add'>+		at76_set_mac_state(priv, MAC_CONNECTED);</div><div class='add'>+		/* get ESSID, BSSID and channel for priv-&gt;curr_bss */</div><div class='add'>+		priv-&gt;essid_size = bptr-&gt;ssid_len;</div><div class='add'>+		memcpy(priv-&gt;essid, bptr-&gt;ssid, bptr-&gt;ssid_len);</div><div class='add'>+		memcpy(priv-&gt;bssid, bptr-&gt;bssid, ETH_ALEN);</div><div class='add'>+		priv-&gt;channel = bptr-&gt;channel;</div><div class='add'>+		at76_iwevent_bss_connect(priv-&gt;netdev, bptr-&gt;bssid);</div><div class='add'>+		netif_carrier_on(priv-&gt;netdev);</div><div class='add'>+		netif_start_queue(priv-&gt;netdev);</div><div class='add'>+		/* just to be sure */</div><div class='add'>+		cancel_delayed_work(&amp;priv-&gt;dwork_get_scan);</div><div class='add'>+		cancel_delayed_work(&amp;priv-&gt;dwork_auth);</div><div class='add'>+		cancel_delayed_work(&amp;priv-&gt;dwork_assoc);</div><div class='add'>+	} else {</div><div class='add'>+		/* send auth req */</div><div class='add'>+		priv-&gt;retries = AUTH_RETRIES;</div><div class='add'>+		at76_set_mac_state(priv, MAC_AUTH);</div><div class='add'>+		at76_auth_req(priv, priv-&gt;curr_bss, 1, NULL);</div><div class='add'>+		at76_dbg(DBG_MGMT_TIMER,</div><div class='add'>+			 "%s:%d: starting mgmt_timer + HZ", __func__, __LINE__);</div><div class='add'>+		schedule_delayed_work(&amp;priv-&gt;dwork_auth, AUTH_TIMEOUT);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;mtx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Reap scan results */</div><div class='add'>+static void at76_dwork_get_scan(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	int status;</div><div class='add'>+	int ret;</div><div class='add'>+	struct at76_priv *priv = container_of(work, struct at76_priv,</div><div class='add'>+					      dwork_get_scan.work);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;mtx);</div><div class='add'>+	WARN_ON(priv-&gt;mac_state != MAC_SCANNING);</div><div class='add'>+	if (priv-&gt;mac_state != MAC_SCANNING)</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	status = at76_get_cmd_status(priv-&gt;udev, CMD_SCAN);</div><div class='add'>+	if (status &lt; 0) {</div><div class='add'>+		printk(KERN_ERR "%s: %s: at76_get_cmd_status failed with %d\n",</div><div class='add'>+		       priv-&gt;netdev-&gt;name, __func__, status);</div><div class='add'>+		status = CMD_STATUS_IN_PROGRESS;</div><div class='add'>+		/* INFO: Hope it was a one off error - if not, scanning</div><div class='add'>+		   further down the line and stop this cycle */</div><div class='add'>+	}</div><div class='add'>+	at76_dbg(DBG_PROGRESS,</div><div class='add'>+		 "%s %s: got cmd_status %d (state %s, need_any %d)",</div><div class='add'>+		 priv-&gt;netdev-&gt;name, __func__, status,</div><div class='add'>+		 mac_states[priv-&gt;mac_state], priv-&gt;scan_need_any);</div><div class='add'>+</div><div class='add'>+	if (status != CMD_STATUS_COMPLETE) {</div><div class='add'>+		if ((status != CMD_STATUS_IN_PROGRESS) &amp;&amp;</div><div class='add'>+		    (status != CMD_STATUS_IDLE))</div><div class='add'>+			printk(KERN_ERR "%s: %s: Bad scan status: %s\n",</div><div class='add'>+			       priv-&gt;netdev-&gt;name, __func__,</div><div class='add'>+			       at76_get_cmd_status_string(status));</div><div class='add'>+</div><div class='add'>+		/* the first cmd status after scan start is always a IDLE -&gt;</div><div class='add'>+		   start the timer to poll again until COMPLETED */</div><div class='add'>+		at76_dbg(DBG_MGMT_TIMER,</div><div class='add'>+			 "%s:%d: starting mgmt_timer for %d ticks",</div><div class='add'>+			 __func__, __LINE__, SCAN_POLL_INTERVAL);</div><div class='add'>+		schedule_delayed_work(&amp;priv-&gt;dwork_get_scan,</div><div class='add'>+				      SCAN_POLL_INTERVAL);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (at76_debug &amp; DBG_BSS_TABLE)</div><div class='add'>+		at76_dump_bss_table(priv);</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;scan_need_any) {</div><div class='add'>+		ret = at76_start_scan(priv, 0);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			printk(KERN_ERR</div><div class='add'>+			       "%s: %s: start_scan (ANY) failed with %d\n",</div><div class='add'>+			       priv-&gt;netdev-&gt;name, __func__, ret);</div><div class='add'>+		at76_dbg(DBG_MGMT_TIMER,</div><div class='add'>+			 "%s:%d: starting mgmt_timer for %d ticks", __func__,</div><div class='add'>+			 __LINE__, SCAN_POLL_INTERVAL);</div><div class='add'>+		schedule_delayed_work(&amp;priv-&gt;dwork_get_scan,</div><div class='add'>+				      SCAN_POLL_INTERVAL);</div><div class='add'>+		priv-&gt;scan_need_any = 0;</div><div class='add'>+	} else {</div><div class='add'>+		priv-&gt;scan_state = SCAN_COMPLETED;</div><div class='add'>+		/* report the end of scan to user space */</div><div class='add'>+		at76_iwevent_scan_complete(priv-&gt;netdev);</div><div class='add'>+		at76_set_mac_state(priv, MAC_JOINING);</div><div class='add'>+		schedule_work(&amp;priv-&gt;work_join);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;mtx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Handle loss of beacons from the AP */</div><div class='add'>+static void at76_dwork_beacon(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct at76_priv *priv = container_of(work, struct at76_priv,</div><div class='add'>+					      dwork_beacon.work);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;mtx);</div><div class='add'>+	if (priv-&gt;mac_state != MAC_CONNECTED || priv-&gt;iw_mode != IW_MODE_INFRA)</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	/* We haven't received any beacons from out AP for BEACON_TIMEOUT */</div><div class='add'>+	printk(KERN_INFO "%s: lost beacon bssid %s\n",</div><div class='add'>+	       priv-&gt;netdev-&gt;name, mac2str(priv-&gt;curr_bss-&gt;bssid));</div><div class='add'>+</div><div class='add'>+	netif_carrier_off(priv-&gt;netdev);</div><div class='add'>+	netif_stop_queue(priv-&gt;netdev);</div><div class='add'>+	at76_iwevent_bss_disconnect(priv-&gt;netdev);</div><div class='add'>+	at76_set_mac_state(priv, MAC_SCANNING);</div><div class='add'>+	schedule_work(&amp;priv-&gt;work_start_scan);</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;mtx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Handle authentication response timeout */</div><div class='add'>+static void at76_dwork_auth(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct at76_priv *priv = container_of(work, struct at76_priv,</div><div class='add'>+					      dwork_auth.work);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;mtx);</div><div class='add'>+	WARN_ON(priv-&gt;mac_state != MAC_AUTH);</div><div class='add'>+	if (priv-&gt;mac_state != MAC_AUTH)</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_PROGRESS, "%s: authentication response timeout",</div><div class='add'>+		 priv-&gt;netdev-&gt;name);</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;retries-- &gt;= 0) {</div><div class='add'>+		at76_auth_req(priv, priv-&gt;curr_bss, 1, NULL);</div><div class='add'>+		at76_dbg(DBG_MGMT_TIMER, "%s:%d: starting mgmt_timer + HZ",</div><div class='add'>+			 __func__, __LINE__);</div><div class='add'>+		schedule_delayed_work(&amp;priv-&gt;dwork_auth, AUTH_TIMEOUT);</div><div class='add'>+	} else {</div><div class='add'>+		/* try to get next matching BSS */</div><div class='add'>+		at76_set_mac_state(priv, MAC_JOINING);</div><div class='add'>+		schedule_work(&amp;priv-&gt;work_join);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;mtx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Handle association response timeout */</div><div class='add'>+static void at76_dwork_assoc(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct at76_priv *priv = container_of(work, struct at76_priv,</div><div class='add'>+					      dwork_assoc.work);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;mtx);</div><div class='add'>+	WARN_ON(priv-&gt;mac_state != MAC_ASSOC);</div><div class='add'>+	if (priv-&gt;mac_state != MAC_ASSOC)</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_PROGRESS, "%s: association response timeout",</div><div class='add'>+		 priv-&gt;netdev-&gt;name);</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;retries-- &gt;= 0) {</div><div class='add'>+		at76_assoc_req(priv, priv-&gt;curr_bss);</div><div class='add'>+		at76_dbg(DBG_MGMT_TIMER, "%s:%d: starting mgmt_timer + HZ",</div><div class='add'>+			 __func__, __LINE__);</div><div class='add'>+		schedule_delayed_work(&amp;priv-&gt;dwork_assoc, ASSOC_TIMEOUT);</div><div class='add'>+	} else {</div><div class='add'>+		/* try to get next matching BSS */</div><div class='add'>+		at76_set_mac_state(priv, MAC_JOINING);</div><div class='add'>+		schedule_work(&amp;priv-&gt;work_join);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;mtx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Read new bssid in ad-hoc mode */</div><div class='add'>+static void at76_work_new_bss(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct at76_priv *priv = container_of(work, struct at76_priv,</div><div class='add'>+					      work_new_bss);</div><div class='add'>+	int ret;</div><div class='add'>+	struct mib_mac_mgmt mac_mgmt;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;mtx);</div><div class='add'>+</div><div class='add'>+	ret = at76_get_mib(priv-&gt;udev, MIB_MAC_MGMT, &amp;mac_mgmt,</div><div class='add'>+			   sizeof(struct mib_mac_mgmt));</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		printk(KERN_ERR "%s: at76_get_mib failed: %d\n",</div><div class='add'>+		       priv-&gt;netdev-&gt;name, ret);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_PROGRESS, "ibss_change = 0x%2x", mac_mgmt.ibss_change);</div><div class='add'>+	memcpy(priv-&gt;bssid, mac_mgmt.current_bssid, ETH_ALEN);</div><div class='add'>+	at76_dbg(DBG_PROGRESS, "using BSSID %s", mac2str(priv-&gt;bssid));</div><div class='add'>+</div><div class='add'>+	at76_iwevent_bss_connect(priv-&gt;netdev, priv-&gt;bssid);</div><div class='add'>+</div><div class='add'>+	priv-&gt;mib_buf.type = MIB_MAC_MGMT;</div><div class='add'>+	priv-&gt;mib_buf.size = 1;</div><div class='add'>+	priv-&gt;mib_buf.index = offsetof(struct mib_mac_mgmt, ibss_change);</div><div class='add'>+	priv-&gt;mib_buf.data.byte = 0;</div><div class='add'>+</div><div class='add'>+	ret = at76_set_mib(priv, &amp;priv-&gt;mib_buf);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		printk(KERN_ERR "%s: set_mib (ibss change ok) failed: %d\n",</div><div class='add'>+		       priv-&gt;netdev-&gt;name, ret);</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;mtx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int at76_startup_device(struct at76_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct at76_card_config *ccfg = &amp;priv-&gt;card_config;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_PARAMS,</div><div class='add'>+		 "%s param: ssid %.*s (%s) mode %s ch %d wep %s key %d "</div><div class='add'>+		 "keylen %d", priv-&gt;netdev-&gt;name, priv-&gt;essid_size, priv-&gt;essid,</div><div class='add'>+		 hex2str(priv-&gt;essid, IW_ESSID_MAX_SIZE),</div><div class='add'>+		 priv-&gt;iw_mode == IW_MODE_ADHOC ? "adhoc" : "infra",</div><div class='add'>+		 priv-&gt;channel, priv-&gt;wep_enabled ? "enabled" : "disabled",</div><div class='add'>+		 priv-&gt;wep_key_id, priv-&gt;wep_keys_len[priv-&gt;wep_key_id]);</div><div class='add'>+	at76_dbg(DBG_PARAMS,</div><div class='add'>+		 "%s param: preamble %s rts %d retry %d frag %d "</div><div class='add'>+		 "txrate %s auth_mode %d", priv-&gt;netdev-&gt;name,</div><div class='add'>+		 preambles[priv-&gt;preamble_type], priv-&gt;rts_threshold,</div><div class='add'>+		 priv-&gt;short_retry_limit, priv-&gt;frag_threshold,</div><div class='add'>+		 priv-&gt;txrate == TX_RATE_1MBIT ? "1MBit" : priv-&gt;txrate ==</div><div class='add'>+		 TX_RATE_2MBIT ? "2MBit" : priv-&gt;txrate ==</div><div class='add'>+		 TX_RATE_5_5MBIT ? "5.5MBit" : priv-&gt;txrate ==</div><div class='add'>+		 TX_RATE_11MBIT ? "11MBit" : priv-&gt;txrate ==</div><div class='add'>+		 TX_RATE_AUTO ? "auto" : "&lt;invalid&gt;", priv-&gt;auth_mode);</div><div class='add'>+	at76_dbg(DBG_PARAMS,</div><div class='add'>+		 "%s param: pm_mode %d pm_period %d auth_mode %s "</div><div class='add'>+		 "scan_times %d %d scan_mode %s",</div><div class='add'>+		 priv-&gt;netdev-&gt;name, priv-&gt;pm_mode, priv-&gt;pm_period,</div><div class='add'>+		 priv-&gt;auth_mode == WLAN_AUTH_OPEN ? "open" : "shared_secret",</div><div class='add'>+		 priv-&gt;scan_min_time, priv-&gt;scan_max_time,</div><div class='add'>+		 priv-&gt;scan_mode == SCAN_TYPE_ACTIVE ? "active" : "passive");</div><div class='add'>+</div><div class='add'>+	memset(ccfg, 0, sizeof(struct at76_card_config));</div><div class='add'>+	ccfg-&gt;promiscuous_mode = 0;</div><div class='add'>+	ccfg-&gt;short_retry_limit = priv-&gt;short_retry_limit;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;wep_enabled) {</div><div class='add'>+		if (priv-&gt;wep_keys_len[priv-&gt;wep_key_id] &gt; WEP_SMALL_KEY_LEN)</div><div class='add'>+			ccfg-&gt;encryption_type = 2;</div><div class='add'>+		else</div><div class='add'>+			ccfg-&gt;encryption_type = 1;</div><div class='add'>+</div><div class='add'>+		/* jal: always exclude unencrypted if WEP is active */</div><div class='add'>+		ccfg-&gt;exclude_unencrypted = 1;</div><div class='add'>+	} else {</div><div class='add'>+		ccfg-&gt;exclude_unencrypted = 0;</div><div class='add'>+		ccfg-&gt;encryption_type = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ccfg-&gt;rts_threshold = cpu_to_le16(priv-&gt;rts_threshold);</div><div class='add'>+	ccfg-&gt;fragmentation_threshold = cpu_to_le16(priv-&gt;frag_threshold);</div><div class='add'>+</div><div class='add'>+	memcpy(ccfg-&gt;basic_rate_set, hw_rates, 4);</div><div class='add'>+	/* jal: really needed, we do a set_mib for autorate later ??? */</div><div class='add'>+	ccfg-&gt;auto_rate_fallback = (priv-&gt;txrate == TX_RATE_AUTO ? 1 : 0);</div><div class='add'>+	ccfg-&gt;channel = priv-&gt;channel;</div><div class='add'>+	ccfg-&gt;privacy_invoked = priv-&gt;wep_enabled;</div><div class='add'>+	memcpy(ccfg-&gt;current_ssid, priv-&gt;essid, IW_ESSID_MAX_SIZE);</div><div class='add'>+	ccfg-&gt;ssid_len = priv-&gt;essid_size;</div><div class='add'>+</div><div class='add'>+	ccfg-&gt;wep_default_key_id = priv-&gt;wep_key_id;</div><div class='add'>+	memcpy(ccfg-&gt;wep_default_key_value, priv-&gt;wep_keys, 4 * WEP_KEY_LEN);</div><div class='add'>+</div><div class='add'>+	ccfg-&gt;short_preamble = priv-&gt;preamble_type;</div><div class='add'>+	ccfg-&gt;beacon_period = cpu_to_le16(priv-&gt;beacon_period);</div><div class='add'>+</div><div class='add'>+	ret = at76_set_card_command(priv-&gt;udev, CMD_STARTUP, &amp;priv-&gt;card_config,</div><div class='add'>+				    sizeof(struct at76_card_config));</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		printk(KERN_ERR "%s: at76_set_card_command failed: %d\n",</div><div class='add'>+		       priv-&gt;netdev-&gt;name, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	at76_wait_completion(priv, CMD_STARTUP);</div><div class='add'>+</div><div class='add'>+	/* remove BSSID from previous run */</div><div class='add'>+	memset(priv-&gt;bssid, 0, ETH_ALEN);</div><div class='add'>+</div><div class='add'>+	if (at76_set_radio(priv, 1) == 1)</div><div class='add'>+		at76_wait_completion(priv, CMD_RADIO_ON);</div><div class='add'>+</div><div class='add'>+	ret = at76_set_preamble(priv, priv-&gt;preamble_type);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = at76_set_frag(priv, priv-&gt;frag_threshold);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = at76_set_rts(priv, priv-&gt;rts_threshold);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = at76_set_autorate_fallback(priv,</div><div class='add'>+					 priv-&gt;txrate == TX_RATE_AUTO ? 1 : 0);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = at76_set_pm_mode(priv);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (at76_debug &amp; DBG_MIB) {</div><div class='add'>+		at76_dump_mib_mac(priv);</div><div class='add'>+		at76_dump_mib_mac_addr(priv);</div><div class='add'>+		at76_dump_mib_mac_mgmt(priv);</div><div class='add'>+		at76_dump_mib_mac_wep(priv);</div><div class='add'>+		at76_dump_mib_mdomain(priv);</div><div class='add'>+		at76_dump_mib_phy(priv);</div><div class='add'>+		at76_dump_mib_local(priv);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Restart the interface */</div><div class='add'>+static void at76_dwork_restart(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct at76_priv *priv = container_of(work, struct at76_priv,</div><div class='add'>+					      dwork_restart.work);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;mtx);</div><div class='add'>+</div><div class='add'>+	netif_carrier_off(priv-&gt;netdev);	/* stop netdev watchdog */</div><div class='add'>+	netif_stop_queue(priv-&gt;netdev);	/* stop tx data packets */</div><div class='add'>+</div><div class='add'>+	at76_startup_device(priv);</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;iw_mode != IW_MODE_MONITOR) {</div><div class='add'>+		priv-&gt;netdev-&gt;type = ARPHRD_ETHER;</div><div class='add'>+		at76_set_mac_state(priv, MAC_SCANNING);</div><div class='add'>+		schedule_work(&amp;priv-&gt;work_start_scan);</div><div class='add'>+	} else {</div><div class='add'>+		priv-&gt;netdev-&gt;type = ARPHRD_IEEE80211_RADIOTAP;</div><div class='add'>+		at76_start_monitor(priv);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;mtx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Initiate scanning */</div><div class='add'>+static void at76_work_start_scan(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct at76_priv *priv = container_of(work, struct at76_priv,</div><div class='add'>+					      work_start_scan);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;mtx);</div><div class='add'>+</div><div class='add'>+	WARN_ON(priv-&gt;mac_state != MAC_SCANNING);</div><div class='add'>+	if (priv-&gt;mac_state != MAC_SCANNING)</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	/* only clear the bss list when a scan is actively initiated,</div><div class='add'>+	 * otherwise simply rely on at76_bss_list_timeout */</div><div class='add'>+	if (priv-&gt;scan_state == SCAN_IN_PROGRESS) {</div><div class='add'>+		at76_free_bss_list(priv);</div><div class='add'>+		priv-&gt;scan_need_any = 1;</div><div class='add'>+	} else</div><div class='add'>+		priv-&gt;scan_need_any = 0;</div><div class='add'>+</div><div class='add'>+	ret = at76_start_scan(priv, 1);</div><div class='add'>+</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		printk(KERN_ERR "%s: %s: start_scan failed with %d\n",</div><div class='add'>+		       priv-&gt;netdev-&gt;name, __func__, ret);</div><div class='add'>+	else {</div><div class='add'>+		at76_dbg(DBG_MGMT_TIMER,</div><div class='add'>+			 "%s:%d: starting mgmt_timer for %d ticks",</div><div class='add'>+			 __func__, __LINE__, SCAN_POLL_INTERVAL);</div><div class='add'>+		schedule_delayed_work(&amp;priv-&gt;dwork_get_scan,</div><div class='add'>+				      SCAN_POLL_INTERVAL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;mtx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Enable or disable promiscuous mode */</div><div class='add'>+static void at76_work_set_promisc(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct at76_priv *priv = container_of(work, struct at76_priv,</div><div class='add'>+					      work_set_promisc);</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;mtx);</div><div class='add'>+</div><div class='add'>+	priv-&gt;mib_buf.type = MIB_LOCAL;</div><div class='add'>+	priv-&gt;mib_buf.size = 1;</div><div class='add'>+	priv-&gt;mib_buf.index = offsetof(struct mib_local, promiscuous_mode);</div><div class='add'>+	priv-&gt;mib_buf.data.byte = priv-&gt;promisc ? 1 : 0;</div><div class='add'>+</div><div class='add'>+	ret = at76_set_mib(priv, &amp;priv-&gt;mib_buf);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		printk(KERN_ERR "%s: set_mib (promiscuous_mode) failed: %d\n",</div><div class='add'>+		       priv-&gt;netdev-&gt;name, ret);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;mtx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Submit Rx urb back to the device */</div><div class='add'>+static void at76_work_submit_rx(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct at76_priv *priv = container_of(work, struct at76_priv,</div><div class='add'>+					      work_submit_rx);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;mtx);</div><div class='add'>+	at76_submit_rx_urb(priv);</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;mtx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* We got an association response */</div><div class='add'>+static void at76_rx_mgmt_assoc(struct at76_priv *priv,</div><div class='add'>+			       struct at76_rx_buffer *buf)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_assoc_response *resp =</div><div class='add'>+	    (struct ieee80211_assoc_response *)buf-&gt;packet;</div><div class='add'>+	u16 assoc_id = le16_to_cpu(resp-&gt;aid);</div><div class='add'>+	u16 status = le16_to_cpu(resp-&gt;status);</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_RX_MGMT, "%s: rx AssocResp bssid %s capa 0x%04x status "</div><div class='add'>+		 "0x%04x assoc_id 0x%04x rates %s", priv-&gt;netdev-&gt;name,</div><div class='add'>+		 mac2str(resp-&gt;header.addr3), le16_to_cpu(resp-&gt;capability),</div><div class='add'>+		 status, assoc_id, hex2str(resp-&gt;info_element-&gt;data,</div><div class='add'>+					   resp-&gt;info_element-&gt;len));</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;mac_state != MAC_ASSOC) {</div><div class='add'>+		printk(KERN_INFO "%s: AssocResp in state %s ignored\n",</div><div class='add'>+		       priv-&gt;netdev-&gt;name, mac_states[priv-&gt;mac_state]);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	BUG_ON(!priv-&gt;curr_bss);</div><div class='add'>+</div><div class='add'>+	cancel_delayed_work(&amp;priv-&gt;dwork_assoc);</div><div class='add'>+	if (status == WLAN_STATUS_SUCCESS) {</div><div class='add'>+		struct bss_info *ptr = priv-&gt;curr_bss;</div><div class='add'>+		priv-&gt;assoc_id = assoc_id &amp; 0x3fff;</div><div class='add'>+		/* update iwconfig params */</div><div class='add'>+		memcpy(priv-&gt;bssid, ptr-&gt;bssid, ETH_ALEN);</div><div class='add'>+		memcpy(priv-&gt;essid, ptr-&gt;ssid, ptr-&gt;ssid_len);</div><div class='add'>+		priv-&gt;essid_size = ptr-&gt;ssid_len;</div><div class='add'>+		priv-&gt;channel = ptr-&gt;channel;</div><div class='add'>+		schedule_work(&amp;priv-&gt;work_assoc_done);</div><div class='add'>+	} else {</div><div class='add'>+		at76_set_mac_state(priv, MAC_JOINING);</div><div class='add'>+		schedule_work(&amp;priv-&gt;work_join);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Process disassociation request from the AP */</div><div class='add'>+static void at76_rx_mgmt_disassoc(struct at76_priv *priv,</div><div class='add'>+				  struct at76_rx_buffer *buf)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_disassoc *resp =</div><div class='add'>+	    (struct ieee80211_disassoc *)buf-&gt;packet;</div><div class='add'>+	struct ieee80211_hdr_3addr *mgmt = &amp;resp-&gt;header;</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_RX_MGMT,</div><div class='add'>+		 "%s: rx DisAssoc bssid %s reason 0x%04x destination %s",</div><div class='add'>+		 priv-&gt;netdev-&gt;name, mac2str(mgmt-&gt;addr3),</div><div class='add'>+		 le16_to_cpu(resp-&gt;reason), mac2str(mgmt-&gt;addr1));</div><div class='add'>+</div><div class='add'>+	/* We are not connected, ignore */</div><div class='add'>+	if (priv-&gt;mac_state == MAC_SCANNING || priv-&gt;mac_state == MAC_INIT</div><div class='add'>+	    || !priv-&gt;curr_bss)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Not our BSSID, ignore */</div><div class='add'>+	if (compare_ether_addr(mgmt-&gt;addr3, priv-&gt;curr_bss-&gt;bssid))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Not for our STA and not broadcast, ignore */</div><div class='add'>+	if (compare_ether_addr(priv-&gt;netdev-&gt;dev_addr, mgmt-&gt;addr1)</div><div class='add'>+	    &amp;&amp; !is_broadcast_ether_addr(mgmt-&gt;addr1))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;mac_state != MAC_ASSOC &amp;&amp; priv-&gt;mac_state != MAC_CONNECTED</div><div class='add'>+	    &amp;&amp; priv-&gt;mac_state != MAC_JOINING) {</div><div class='add'>+		printk(KERN_INFO "%s: DisAssoc in state %s ignored\n",</div><div class='add'>+		       priv-&gt;netdev-&gt;name, mac_states[priv-&gt;mac_state]);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;mac_state == MAC_CONNECTED) {</div><div class='add'>+		netif_carrier_off(priv-&gt;netdev);</div><div class='add'>+		netif_stop_queue(priv-&gt;netdev);</div><div class='add'>+		at76_iwevent_bss_disconnect(priv-&gt;netdev);</div><div class='add'>+	}</div><div class='add'>+	cancel_delayed_work(&amp;priv-&gt;dwork_get_scan);</div><div class='add'>+	cancel_delayed_work(&amp;priv-&gt;dwork_beacon);</div><div class='add'>+	cancel_delayed_work(&amp;priv-&gt;dwork_auth);</div><div class='add'>+	cancel_delayed_work(&amp;priv-&gt;dwork_assoc);</div><div class='add'>+	at76_set_mac_state(priv, MAC_JOINING);</div><div class='add'>+	schedule_work(&amp;priv-&gt;work_join);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void at76_rx_mgmt_auth(struct at76_priv *priv,</div><div class='add'>+			      struct at76_rx_buffer *buf)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_auth *resp = (struct ieee80211_auth *)buf-&gt;packet;</div><div class='add'>+	struct ieee80211_hdr_3addr *mgmt = &amp;resp-&gt;header;</div><div class='add'>+	int seq_nr = le16_to_cpu(resp-&gt;transaction);</div><div class='add'>+	int alg = le16_to_cpu(resp-&gt;algorithm);</div><div class='add'>+	int status = le16_to_cpu(resp-&gt;status);</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_RX_MGMT,</div><div class='add'>+		 "%s: rx AuthFrame bssid %s alg %d seq_nr %d status %d "</div><div class='add'>+		 "destination %s", priv-&gt;netdev-&gt;name, mac2str(mgmt-&gt;addr3),</div><div class='add'>+		 alg, seq_nr, status, mac2str(mgmt-&gt;addr1));</div><div class='add'>+</div><div class='add'>+	if (alg == WLAN_AUTH_SHARED_KEY &amp;&amp; seq_nr == 2)</div><div class='add'>+		at76_dbg(DBG_RX_MGMT, "%s: AuthFrame challenge %s ...",</div><div class='add'>+			 priv-&gt;netdev-&gt;name, hex2str(resp-&gt;info_element, 18));</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;mac_state != MAC_AUTH) {</div><div class='add'>+		printk(KERN_INFO "%s: ignored AuthFrame in state %s\n",</div><div class='add'>+		       priv-&gt;netdev-&gt;name, mac_states[priv-&gt;mac_state]);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	if (priv-&gt;auth_mode != alg) {</div><div class='add'>+		printk(KERN_INFO "%s: ignored AuthFrame for alg %d\n",</div><div class='add'>+		       priv-&gt;netdev-&gt;name, alg);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	BUG_ON(!priv-&gt;curr_bss);</div><div class='add'>+</div><div class='add'>+	/* Not our BSSID or not for our STA, ignore */</div><div class='add'>+	if (compare_ether_addr(mgmt-&gt;addr3, priv-&gt;curr_bss-&gt;bssid)</div><div class='add'>+	    || compare_ether_addr(priv-&gt;netdev-&gt;dev_addr, mgmt-&gt;addr1))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	cancel_delayed_work(&amp;priv-&gt;dwork_auth);</div><div class='add'>+	if (status != WLAN_STATUS_SUCCESS) {</div><div class='add'>+		/* try to join next bss */</div><div class='add'>+		at76_set_mac_state(priv, MAC_JOINING);</div><div class='add'>+		schedule_work(&amp;priv-&gt;work_join);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;auth_mode == WLAN_AUTH_OPEN || seq_nr == 4) {</div><div class='add'>+		priv-&gt;retries = ASSOC_RETRIES;</div><div class='add'>+		at76_set_mac_state(priv, MAC_ASSOC);</div><div class='add'>+		at76_assoc_req(priv, priv-&gt;curr_bss);</div><div class='add'>+		at76_dbg(DBG_MGMT_TIMER,</div><div class='add'>+			 "%s:%d: starting mgmt_timer + HZ", __func__, __LINE__);</div><div class='add'>+		schedule_delayed_work(&amp;priv-&gt;dwork_assoc, ASSOC_TIMEOUT);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	WARN_ON(seq_nr != 2);</div><div class='add'>+	at76_auth_req(priv, priv-&gt;curr_bss, seq_nr + 1, resp-&gt;info_element);</div><div class='add'>+	at76_dbg(DBG_MGMT_TIMER, "%s:%d: starting mgmt_timer + HZ", __func__,</div><div class='add'>+		 __LINE__);</div><div class='add'>+	schedule_delayed_work(&amp;priv-&gt;dwork_auth, AUTH_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void at76_rx_mgmt_deauth(struct at76_priv *priv,</div><div class='add'>+				struct at76_rx_buffer *buf)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_disassoc *resp =</div><div class='add'>+	    (struct ieee80211_disassoc *)buf-&gt;packet;</div><div class='add'>+	struct ieee80211_hdr_3addr *mgmt = &amp;resp-&gt;header;</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_RX_MGMT | DBG_PROGRESS,</div><div class='add'>+		 "%s: rx DeAuth bssid %s reason 0x%04x destination %s",</div><div class='add'>+		 priv-&gt;netdev-&gt;name, mac2str(mgmt-&gt;addr3),</div><div class='add'>+		 le16_to_cpu(resp-&gt;reason), mac2str(mgmt-&gt;addr1));</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;mac_state != MAC_AUTH &amp;&amp; priv-&gt;mac_state != MAC_ASSOC</div><div class='add'>+	    &amp;&amp; priv-&gt;mac_state != MAC_CONNECTED) {</div><div class='add'>+		printk(KERN_INFO "%s: DeAuth in state %s ignored\n",</div><div class='add'>+		       priv-&gt;netdev-&gt;name, mac_states[priv-&gt;mac_state]);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	BUG_ON(!priv-&gt;curr_bss);</div><div class='add'>+</div><div class='add'>+	/* Not our BSSID, ignore */</div><div class='add'>+	if (compare_ether_addr(mgmt-&gt;addr3, priv-&gt;curr_bss-&gt;bssid))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Not for our STA and not broadcast, ignore */</div><div class='add'>+	if (compare_ether_addr(priv-&gt;netdev-&gt;dev_addr, mgmt-&gt;addr1)</div><div class='add'>+	    &amp;&amp; !is_broadcast_ether_addr(mgmt-&gt;addr1))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;mac_state == MAC_CONNECTED)</div><div class='add'>+		at76_iwevent_bss_disconnect(priv-&gt;netdev);</div><div class='add'>+</div><div class='add'>+	at76_set_mac_state(priv, MAC_JOINING);</div><div class='add'>+	schedule_work(&amp;priv-&gt;work_join);</div><div class='add'>+	cancel_delayed_work(&amp;priv-&gt;dwork_get_scan);</div><div class='add'>+	cancel_delayed_work(&amp;priv-&gt;dwork_beacon);</div><div class='add'>+	cancel_delayed_work(&amp;priv-&gt;dwork_auth);</div><div class='add'>+	cancel_delayed_work(&amp;priv-&gt;dwork_assoc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void at76_rx_mgmt_beacon(struct at76_priv *priv,</div><div class='add'>+				struct at76_rx_buffer *buf)</div><div class='add'>+{</div><div class='add'>+	int varpar_len;</div><div class='add'>+	/* beacon content */</div><div class='add'>+	struct ieee80211_beacon *bdata = (struct ieee80211_beacon *)buf-&gt;packet;</div><div class='add'>+	struct ieee80211_hdr_3addr *mgmt = &amp;bdata-&gt;header;</div><div class='add'>+</div><div class='add'>+	struct list_head *lptr;</div><div class='add'>+	struct bss_info *match;	/* entry matching addr3 with its bssid */</div><div class='add'>+	int new_entry = 0;</div><div class='add'>+	int len;</div><div class='add'>+	struct ieee80211_info_element *ie;</div><div class='add'>+	int have_ssid = 0;</div><div class='add'>+	int have_rates = 0;</div><div class='add'>+	int have_channel = 0;</div><div class='add'>+	int keep_going = 1;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;priv-&gt;bss_list_spinlock, flags);</div><div class='add'>+	if (priv-&gt;mac_state == MAC_CONNECTED) {</div><div class='add'>+		/* in state MAC_CONNECTED we use the mgmt_timer to control</div><div class='add'>+		   the beacon of the BSS */</div><div class='add'>+		BUG_ON(!priv-&gt;curr_bss);</div><div class='add'>+</div><div class='add'>+		if (!compare_ether_addr(priv-&gt;curr_bss-&gt;bssid, mgmt-&gt;addr3)) {</div><div class='add'>+			/* We got our AP's beacon, defer the timeout handler.</div><div class='add'>+			   Kill pending work first, as schedule_delayed_work()</div><div class='add'>+			   won't do it. */</div><div class='add'>+			cancel_delayed_work(&amp;priv-&gt;dwork_beacon);</div><div class='add'>+			schedule_delayed_work(&amp;priv-&gt;dwork_beacon,</div><div class='add'>+					      BEACON_TIMEOUT);</div><div class='add'>+			priv-&gt;curr_bss-&gt;rssi = buf-&gt;rssi;</div><div class='add'>+			priv-&gt;beacons_received++;</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* look if we have this BSS already in the list */</div><div class='add'>+	match = NULL;</div><div class='add'>+</div><div class='add'>+	if (!list_empty(&amp;priv-&gt;bss_list)) {</div><div class='add'>+		list_for_each(lptr, &amp;priv-&gt;bss_list) {</div><div class='add'>+			struct bss_info *bss_ptr =</div><div class='add'>+			    list_entry(lptr, struct bss_info, list);</div><div class='add'>+			if (!compare_ether_addr(bss_ptr-&gt;bssid, mgmt-&gt;addr3)) {</div><div class='add'>+				match = bss_ptr;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!match) {</div><div class='add'>+		/* BSS not in the list - append it */</div><div class='add'>+		match = kzalloc(sizeof(struct bss_info), GFP_ATOMIC);</div><div class='add'>+		if (!match) {</div><div class='add'>+			at76_dbg(DBG_BSS_TABLE,</div><div class='add'>+				 "%s: cannot kmalloc new bss info (%zd byte)",</div><div class='add'>+				 priv-&gt;netdev-&gt;name, sizeof(struct bss_info));</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+		new_entry = 1;</div><div class='add'>+		list_add_tail(&amp;match-&gt;list, &amp;priv-&gt;bss_list);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	match-&gt;capa = le16_to_cpu(bdata-&gt;capability);</div><div class='add'>+	match-&gt;beacon_interval = le16_to_cpu(bdata-&gt;beacon_interval);</div><div class='add'>+	match-&gt;rssi = buf-&gt;rssi;</div><div class='add'>+	match-&gt;link_qual = buf-&gt;link_quality;</div><div class='add'>+	match-&gt;noise_level = buf-&gt;noise_level;</div><div class='add'>+	memcpy(match-&gt;bssid, mgmt-&gt;addr3, ETH_ALEN);</div><div class='add'>+	at76_dbg(DBG_RX_BEACON, "%s: bssid %s", priv-&gt;netdev-&gt;name,</div><div class='add'>+		 mac2str(match-&gt;bssid));</div><div class='add'>+</div><div class='add'>+	ie = bdata-&gt;info_element;</div><div class='add'>+</div><div class='add'>+	/* length of var length beacon parameters */</div><div class='add'>+	varpar_len = min_t(int, le16_to_cpu(buf-&gt;wlength) -</div><div class='add'>+			   sizeof(struct ieee80211_beacon),</div><div class='add'>+			   BEACON_MAX_DATA_LENGTH);</div><div class='add'>+</div><div class='add'>+	/* This routine steps through the bdata-&gt;data array to get</div><div class='add'>+	 * some useful information about the access point.</div><div class='add'>+	 * Currently, this implementation supports receipt of: SSID,</div><div class='add'>+	 * supported transfer rates and channel, in any order, with some</div><div class='add'>+	 * tolerance for intermittent unknown codes (although this</div><div class='add'>+	 * functionality may not be necessary as the useful information will</div><div class='add'>+	 * usually arrive in consecutively, but there have been some</div><div class='add'>+	 * reports of some of the useful information fields arriving in a</div><div class='add'>+	 * different order).</div><div class='add'>+	 * It does not support any more IE types although MFIE_TYPE_TIM may</div><div class='add'>+	 * be supported (on my AP at least).</div><div class='add'>+	 * The bdata-&gt;data array is about 1500 bytes long but only ~36 of those</div><div class='add'>+	 * bytes are useful, hence the have_ssid etc optimizations. */</div><div class='add'>+</div><div class='add'>+	while (keep_going &amp;&amp;</div><div class='add'>+	       ((&amp;ie-&gt;data[ie-&gt;len] - (u8 *)bdata-&gt;info_element) &lt;=</div><div class='add'>+		varpar_len)) {</div><div class='add'>+</div><div class='add'>+		switch (ie-&gt;id) {</div><div class='add'>+</div><div class='add'>+		case MFIE_TYPE_SSID:</div><div class='add'>+			if (have_ssid)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			len = min_t(int, IW_ESSID_MAX_SIZE, ie-&gt;len);</div><div class='add'>+</div><div class='add'>+			/* we copy only if this is a new entry,</div><div class='add'>+			   or the incoming SSID is not a hidden SSID. This</div><div class='add'>+			   will protect us from overwriting a real SSID read</div><div class='add'>+			   in a ProbeResponse with a hidden one from a</div><div class='add'>+			   following beacon. */</div><div class='add'>+			if (!new_entry &amp;&amp; at76_is_hidden_ssid(ie-&gt;data, len)) {</div><div class='add'>+				have_ssid = 1;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			match-&gt;ssid_len = len;</div><div class='add'>+			memcpy(match-&gt;ssid, ie-&gt;data, len);</div><div class='add'>+			at76_dbg(DBG_RX_BEACON, "%s: SSID - %.*s",</div><div class='add'>+				 priv-&gt;netdev-&gt;name, len, match-&gt;ssid);</div><div class='add'>+			have_ssid = 1;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case MFIE_TYPE_RATES:</div><div class='add'>+			if (have_rates)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			match-&gt;rates_len =</div><div class='add'>+			    min_t(int, sizeof(match-&gt;rates), ie-&gt;len);</div><div class='add'>+			memcpy(match-&gt;rates, ie-&gt;data, match-&gt;rates_len);</div><div class='add'>+			have_rates = 1;</div><div class='add'>+			at76_dbg(DBG_RX_BEACON, "%s: SUPPORTED RATES %s",</div><div class='add'>+				 priv-&gt;netdev-&gt;name,</div><div class='add'>+				 hex2str(ie-&gt;data, ie-&gt;len));</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case MFIE_TYPE_DS_SET:</div><div class='add'>+			if (have_channel)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			match-&gt;channel = ie-&gt;data[0];</div><div class='add'>+			have_channel = 1;</div><div class='add'>+			at76_dbg(DBG_RX_BEACON, "%s: CHANNEL - %d",</div><div class='add'>+				 priv-&gt;netdev-&gt;name, match-&gt;channel);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case MFIE_TYPE_CF_SET:</div><div class='add'>+		case MFIE_TYPE_TIM:</div><div class='add'>+		case MFIE_TYPE_IBSS_SET:</div><div class='add'>+		default:</div><div class='add'>+			at76_dbg(DBG_RX_BEACON, "%s: beacon IE id %d len %d %s",</div><div class='add'>+				 priv-&gt;netdev-&gt;name, ie-&gt;id, ie-&gt;len,</div><div class='add'>+				 hex2str(ie-&gt;data, ie-&gt;len));</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* advance to the next informational element */</div><div class='add'>+		next_ie(&amp;ie);</div><div class='add'>+</div><div class='add'>+		/* Optimization: after all, the bdata-&gt;data array is</div><div class='add'>+		 * varpar_len bytes long, whereas we get all of the useful</div><div class='add'>+		 * information after only ~36 bytes, this saves us a lot of</div><div class='add'>+		 * time (and trouble as the remaining portion of the array</div><div class='add'>+		 * could be full of junk)</div><div class='add'>+		 * Comment this out if you want to see what other information</div><div class='add'>+		 * comes from the AP - although little of it may be useful */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_RX_BEACON, "%s: Finished processing beacon data",</div><div class='add'>+		 priv-&gt;netdev-&gt;name);</div><div class='add'>+</div><div class='add'>+	match-&gt;last_rx = jiffies;	/* record last rx of beacon */</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	spin_unlock_irqrestore(&amp;priv-&gt;bss_list_spinlock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Calculate the link level from a given rx_buffer */</div><div class='add'>+static void at76_calc_level(struct at76_priv *priv, struct at76_rx_buffer *buf,</div><div class='add'>+			    struct iw_quality *qual)</div><div class='add'>+{</div><div class='add'>+	/* just a guess for now, might be different for other chips */</div><div class='add'>+	int max_rssi = 42;</div><div class='add'>+</div><div class='add'>+	qual-&gt;level = (buf-&gt;rssi * 100 / max_rssi);</div><div class='add'>+	if (qual-&gt;level &gt; 100)</div><div class='add'>+		qual-&gt;level = 100;</div><div class='add'>+	qual-&gt;updated |= IW_QUAL_LEVEL_UPDATED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Calculate the link quality from a given rx_buffer */</div><div class='add'>+static void at76_calc_qual(struct at76_priv *priv, struct at76_rx_buffer *buf,</div><div class='add'>+			   struct iw_quality *qual)</div><div class='add'>+{</div><div class='add'>+	if (at76_is_intersil(priv-&gt;board_type))</div><div class='add'>+		qual-&gt;qual = buf-&gt;link_quality;</div><div class='add'>+	else {</div><div class='add'>+		unsigned long elapsed;</div><div class='add'>+</div><div class='add'>+		/* Update qual at most once a second */</div><div class='add'>+		elapsed = jiffies - priv-&gt;beacons_last_qual;</div><div class='add'>+		if (elapsed &lt; 1 * HZ)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		qual-&gt;qual = qual-&gt;level * priv-&gt;beacons_received *</div><div class='add'>+		    msecs_to_jiffies(priv-&gt;beacon_period) / elapsed;</div><div class='add'>+</div><div class='add'>+		priv-&gt;beacons_last_qual = jiffies;</div><div class='add'>+		priv-&gt;beacons_received = 0;</div><div class='add'>+	}</div><div class='add'>+	qual-&gt;qual = (qual-&gt;qual &gt; 100) ? 100 : qual-&gt;qual;</div><div class='add'>+	qual-&gt;updated |= IW_QUAL_QUAL_UPDATED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Calculate the noise quality from a given rx_buffer */</div><div class='add'>+static void at76_calc_noise(struct at76_priv *priv, struct at76_rx_buffer *buf,</div><div class='add'>+			    struct iw_quality *qual)</div><div class='add'>+{</div><div class='add'>+	qual-&gt;noise = 0;</div><div class='add'>+	qual-&gt;updated |= IW_QUAL_NOISE_INVALID;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void at76_update_wstats(struct at76_priv *priv,</div><div class='add'>+			       struct at76_rx_buffer *buf)</div><div class='add'>+{</div><div class='add'>+	struct iw_quality *qual = &amp;priv-&gt;wstats.qual;</div><div class='add'>+</div><div class='add'>+	if (buf-&gt;rssi &amp;&amp; priv-&gt;mac_state == MAC_CONNECTED) {</div><div class='add'>+		qual-&gt;updated = 0;</div><div class='add'>+		at76_calc_level(priv, buf, qual);</div><div class='add'>+		at76_calc_qual(priv, buf, qual);</div><div class='add'>+		at76_calc_noise(priv, buf, qual);</div><div class='add'>+	} else {</div><div class='add'>+		qual-&gt;qual = 0;</div><div class='add'>+		qual-&gt;level = 0;</div><div class='add'>+		qual-&gt;noise = 0;</div><div class='add'>+		qual-&gt;updated = IW_QUAL_ALL_INVALID;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void at76_rx_mgmt(struct at76_priv *priv, struct at76_rx_buffer *buf)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hdr_3addr *mgmt =</div><div class='add'>+	    (struct ieee80211_hdr_3addr *)buf-&gt;packet;</div><div class='add'>+	u16 framectl = le16_to_cpu(mgmt-&gt;frame_ctl);</div><div class='add'>+</div><div class='add'>+	/* update wstats */</div><div class='add'>+	if (priv-&gt;mac_state != MAC_INIT &amp;&amp; priv-&gt;mac_state != MAC_SCANNING) {</div><div class='add'>+		/* jal: this is a dirty hack needed by Tim in ad-hoc mode */</div><div class='add'>+		/* Data packets always seem to have a 0 link level, so we</div><div class='add'>+		   only read link quality info from management packets.</div><div class='add'>+		   Atmel driver actually averages the present, and previous</div><div class='add'>+		   values, we just present the raw value at the moment - TJS */</div><div class='add'>+		if (priv-&gt;iw_mode == IW_MODE_ADHOC</div><div class='add'>+		    || (priv-&gt;curr_bss</div><div class='add'>+			&amp;&amp; !compare_ether_addr(mgmt-&gt;addr3,</div><div class='add'>+					       priv-&gt;curr_bss-&gt;bssid)))</div><div class='add'>+			at76_update_wstats(priv, buf);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_RX_MGMT_CONTENT, "%s rx mgmt framectl 0x%x %s",</div><div class='add'>+		 priv-&gt;netdev-&gt;name, framectl,</div><div class='add'>+		 hex2str(mgmt, le16_to_cpu(buf-&gt;wlength)));</div><div class='add'>+</div><div class='add'>+	switch (framectl &amp; IEEE80211_FCTL_STYPE) {</div><div class='add'>+	case IEEE80211_STYPE_BEACON:</div><div class='add'>+	case IEEE80211_STYPE_PROBE_RESP:</div><div class='add'>+		at76_rx_mgmt_beacon(priv, buf);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case IEEE80211_STYPE_ASSOC_RESP:</div><div class='add'>+		at76_rx_mgmt_assoc(priv, buf);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case IEEE80211_STYPE_DISASSOC:</div><div class='add'>+		at76_rx_mgmt_disassoc(priv, buf);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case IEEE80211_STYPE_AUTH:</div><div class='add'>+		at76_rx_mgmt_auth(priv, buf);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case IEEE80211_STYPE_DEAUTH:</div><div class='add'>+		at76_rx_mgmt_deauth(priv, buf);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		printk(KERN_DEBUG "%s: ignoring frame with framectl 0x%04x\n",</div><div class='add'>+		       priv-&gt;netdev-&gt;name, framectl);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Convert the 802.11 header into an ethernet-style header, make skb</div><div class='add'>+ * ready for consumption by netif_rx() */</div><div class='add'>+static void at76_ieee80211_to_eth(struct sk_buff *skb, int iw_mode)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hdr_3addr *i802_11_hdr;</div><div class='add'>+	struct ethhdr *eth_hdr_p;</div><div class='add'>+	u8 *src_addr;</div><div class='add'>+	u8 *dest_addr;</div><div class='add'>+</div><div class='add'>+	i802_11_hdr = (struct ieee80211_hdr_3addr *)skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	/* That would be the ethernet header if the hardware converted</div><div class='add'>+	 * the frame for us.  Make sure the source and the destination</div><div class='add'>+	 * match the 802.11 header.  Which hardware does it? */</div><div class='add'>+	eth_hdr_p = (struct ethhdr *)skb_pull(skb, IEEE80211_3ADDR_LEN);</div><div class='add'>+</div><div class='add'>+	dest_addr = i802_11_hdr-&gt;addr1;</div><div class='add'>+	if (iw_mode == IW_MODE_ADHOC)</div><div class='add'>+		src_addr = i802_11_hdr-&gt;addr2;</div><div class='add'>+	else</div><div class='add'>+		src_addr = i802_11_hdr-&gt;addr3;</div><div class='add'>+</div><div class='add'>+	if (!compare_ether_addr(eth_hdr_p-&gt;h_source, src_addr) &amp;&amp;</div><div class='add'>+	    !compare_ether_addr(eth_hdr_p-&gt;h_dest, dest_addr))</div><div class='add'>+		/* Yes, we already have an ethernet header */</div><div class='add'>+		skb_reset_mac_header(skb);</div><div class='add'>+	else {</div><div class='add'>+		u16 len;</div><div class='add'>+</div><div class='add'>+		/* Need to build an ethernet header */</div><div class='add'>+		if (!memcmp(skb-&gt;data, snapsig, sizeof(snapsig))) {</div><div class='add'>+			/* SNAP frame - decapsulate, keep proto */</div><div class='add'>+			skb_push(skb, offsetof(struct ethhdr, h_proto) -</div><div class='add'>+				 sizeof(rfc1042sig));</div><div class='add'>+			len = 0;</div><div class='add'>+		} else {</div><div class='add'>+			/* 802.3 frame, proto is length */</div><div class='add'>+			len = skb-&gt;len;</div><div class='add'>+			skb_push(skb, ETH_HLEN);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		skb_reset_mac_header(skb);</div><div class='add'>+		eth_hdr_p = eth_hdr(skb);</div><div class='add'>+		/* This needs to be done in this order (eth_hdr_p-&gt;h_dest may</div><div class='add'>+		 * overlap src_addr) */</div><div class='add'>+		memcpy(eth_hdr_p-&gt;h_source, src_addr, ETH_ALEN);</div><div class='add'>+		memcpy(eth_hdr_p-&gt;h_dest, dest_addr, ETH_ALEN);</div><div class='add'>+		if (len)</div><div class='add'>+			eth_hdr_p-&gt;h_proto = htons(len);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb-&gt;protocol = eth_type_trans(skb, skb-&gt;dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Check for fragmented data in priv-&gt;rx_skb. If the packet was no fragment</div><div class='add'>+   or it was the last of a fragment set a skb containing the whole packet</div><div class='add'>+   is returned for further processing. Otherwise we get NULL and are</div><div class='add'>+   done and the packet is either stored inside the fragment buffer</div><div class='add'>+   or thrown away.  Every returned skb starts with the ieee802_11 header</div><div class='add'>+   and contains _no_ FCS at the end */</div><div class='add'>+static struct sk_buff *at76_check_for_rx_frags(struct at76_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb = priv-&gt;rx_skb;</div><div class='add'>+	struct at76_rx_buffer *buf = (struct at76_rx_buffer *)skb-&gt;data;</div><div class='add'>+	struct ieee80211_hdr_3addr *i802_11_hdr =</div><div class='add'>+	    (struct ieee80211_hdr_3addr *)buf-&gt;packet;</div><div class='add'>+	/* seq_ctrl, fragment_number, sequence number of new packet */</div><div class='add'>+	u16 sctl = le16_to_cpu(i802_11_hdr-&gt;seq_ctl);</div><div class='add'>+	u16 fragnr = sctl &amp; 0xf;</div><div class='add'>+	u16 seqnr = sctl &gt;&gt; 4;</div><div class='add'>+	u16 frame_ctl = le16_to_cpu(i802_11_hdr-&gt;frame_ctl);</div><div class='add'>+</div><div class='add'>+	/* Length including the IEEE802.11 header, but without the trailing</div><div class='add'>+	 * FCS and without the Atmel Rx header */</div><div class='add'>+	int length = le16_to_cpu(buf-&gt;wlength) - IEEE80211_FCS_LEN;</div><div class='add'>+</div><div class='add'>+	/* where does the data payload start in skb-&gt;data ? */</div><div class='add'>+	u8 *data = i802_11_hdr-&gt;payload;</div><div class='add'>+</div><div class='add'>+	/* length of payload, excl. the trailing FCS */</div><div class='add'>+	int data_len = length - IEEE80211_3ADDR_LEN;</div><div class='add'>+</div><div class='add'>+	int i;</div><div class='add'>+	struct rx_data_buf *bptr, *optr;</div><div class='add'>+	unsigned long oldest = ~0UL;</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_RX_FRAGS,</div><div class='add'>+		 "%s: rx data frame_ctl %04x addr2 %s seq/frag %d/%d "</div><div class='add'>+		 "length %d data %d: %s ...", priv-&gt;netdev-&gt;name, frame_ctl,</div><div class='add'>+		 mac2str(i802_11_hdr-&gt;addr2), seqnr, fragnr, length, data_len,</div><div class='add'>+		 hex2str(data, 32));</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_RX_FRAGS_SKB, "%s: incoming skb: head %p data %p "</div><div class='add'>+		 "tail %p end %p len %d", priv-&gt;netdev-&gt;name, skb-&gt;head,</div><div class='add'>+		 skb-&gt;data, skb_tail_pointer(skb), skb_end_pointer(skb),</div><div class='add'>+		 skb-&gt;len);</div><div class='add'>+</div><div class='add'>+	if (data_len &lt; 0) {</div><div class='add'>+		/* make sure data starts in the buffer */</div><div class='add'>+		printk(KERN_INFO "%s: data frame too short\n",</div><div class='add'>+		       priv-&gt;netdev-&gt;name);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	WARN_ON(length &lt;= AT76_RX_HDRLEN);</div><div class='add'>+	if (length &lt;= AT76_RX_HDRLEN)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	/* remove the at76_rx_buffer header - we don't need it anymore */</div><div class='add'>+	/* we need the IEEE802.11 header (for the addresses) if this packet</div><div class='add'>+	   is the first of a chain */</div><div class='add'>+	skb_pull(skb, AT76_RX_HDRLEN);</div><div class='add'>+</div><div class='add'>+	/* remove FCS at end */</div><div class='add'>+	skb_trim(skb, length);</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_RX_FRAGS_SKB, "%s: trimmed skb: head %p data %p tail %p "</div><div class='add'>+		 "end %p len %d data %p data_len %d", priv-&gt;netdev-&gt;name,</div><div class='add'>+		 skb-&gt;head, skb-&gt;data, skb_tail_pointer(skb),</div><div class='add'>+		 skb_end_pointer(skb), skb-&gt;len, data, data_len);</div><div class='add'>+</div><div class='add'>+	if (fragnr == 0 &amp;&amp; !(frame_ctl &amp; IEEE80211_FCTL_MOREFRAGS)) {</div><div class='add'>+		/* unfragmented packet received */</div><div class='add'>+		/* Use a new skb for the next receive */</div><div class='add'>+		priv-&gt;rx_skb = NULL;</div><div class='add'>+		at76_dbg(DBG_RX_FRAGS, "%s: unfragmented", priv-&gt;netdev-&gt;name);</div><div class='add'>+		return skb;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* look if we've got a chain for the sender address.</div><div class='add'>+	   afterwards optr points to first free or the oldest entry,</div><div class='add'>+	   or, if i &lt; NR_RX_DATA_BUF, bptr points to the entry for the</div><div class='add'>+	   sender address */</div><div class='add'>+	/* determining the oldest entry doesn't cope with jiffies wrapping</div><div class='add'>+	   but I don't care to delete a young entry at these rare moments ... */</div><div class='add'>+</div><div class='add'>+	bptr = priv-&gt;rx_data;</div><div class='add'>+	optr = NULL;</div><div class='add'>+	for (i = 0; i &lt; NR_RX_DATA_BUF; i++, bptr++) {</div><div class='add'>+		if (!bptr-&gt;skb) {</div><div class='add'>+			optr = bptr;</div><div class='add'>+			oldest = 0UL;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!compare_ether_addr(i802_11_hdr-&gt;addr2, bptr-&gt;sender))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (!optr) {</div><div class='add'>+			optr = bptr;</div><div class='add'>+			oldest = bptr-&gt;last_rx;</div><div class='add'>+		} else if (bptr-&gt;last_rx &lt; oldest)</div><div class='add'>+			optr = bptr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (i &lt; NR_RX_DATA_BUF) {</div><div class='add'>+</div><div class='add'>+		at76_dbg(DBG_RX_FRAGS, "%s: %d. cacheentry (seq/frag = %d/%d) "</div><div class='add'>+			 "matched sender addr",</div><div class='add'>+			 priv-&gt;netdev-&gt;name, i, bptr-&gt;seqnr, bptr-&gt;fragnr);</div><div class='add'>+</div><div class='add'>+		/* bptr points to an entry for the sender address */</div><div class='add'>+		if (bptr-&gt;seqnr == seqnr) {</div><div class='add'>+			int left;</div><div class='add'>+			/* the fragment has the current sequence number */</div><div class='add'>+			if (((bptr-&gt;fragnr + 1) &amp; 0xf) != fragnr) {</div><div class='add'>+				/* wrong fragment number -&gt; ignore it */</div><div class='add'>+				/* is &amp; 0xf necessary above ??? */</div><div class='add'>+				at76_dbg(DBG_RX_FRAGS,</div><div class='add'>+					 "%s: frag nr mismatch: %d + 1 != %d",</div><div class='add'>+					 priv-&gt;netdev-&gt;name, bptr-&gt;fragnr,</div><div class='add'>+					 fragnr);</div><div class='add'>+				return NULL;</div><div class='add'>+			}</div><div class='add'>+			bptr-&gt;last_rx = jiffies;</div><div class='add'>+			/* the next following fragment number -&gt;</div><div class='add'>+			   add the data at the end */</div><div class='add'>+</div><div class='add'>+			/* for test only ??? */</div><div class='add'>+			left = skb_tailroom(bptr-&gt;skb);</div><div class='add'>+			if (left &lt; data_len)</div><div class='add'>+				printk(KERN_INFO</div><div class='add'>+				       "%s: only %d byte free (need %d)\n",</div><div class='add'>+				       priv-&gt;netdev-&gt;name, left, data_len);</div><div class='add'>+			else</div><div class='add'>+				memcpy(skb_put(bptr-&gt;skb, data_len), data,</div><div class='add'>+				       data_len);</div><div class='add'>+</div><div class='add'>+			bptr-&gt;fragnr = fragnr;</div><div class='add'>+			if (frame_ctl &amp; IEEE80211_FCTL_MOREFRAGS)</div><div class='add'>+				return NULL;</div><div class='add'>+</div><div class='add'>+			/* this was the last fragment - send it */</div><div class='add'>+			skb = bptr-&gt;skb;</div><div class='add'>+			bptr-&gt;skb = NULL;	/* free the entry */</div><div class='add'>+			at76_dbg(DBG_RX_FRAGS, "%s: last frag of seq %d",</div><div class='add'>+				 priv-&gt;netdev-&gt;name, seqnr);</div><div class='add'>+			return skb;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* got another sequence number */</div><div class='add'>+		if (fragnr == 0) {</div><div class='add'>+			/* it's the start of a new chain - replace the</div><div class='add'>+			   old one by this */</div><div class='add'>+			/* bptr-&gt;sender has the correct value already */</div><div class='add'>+			at76_dbg(DBG_RX_FRAGS,</div><div class='add'>+				 "%s: start of new seq %d, removing old seq %d",</div><div class='add'>+				 priv-&gt;netdev-&gt;name, seqnr, bptr-&gt;seqnr);</div><div class='add'>+			bptr-&gt;seqnr = seqnr;</div><div class='add'>+			bptr-&gt;fragnr = 0;</div><div class='add'>+			bptr-&gt;last_rx = jiffies;</div><div class='add'>+			/* swap bptr-&gt;skb and priv-&gt;rx_skb */</div><div class='add'>+			skb = bptr-&gt;skb;</div><div class='add'>+			bptr-&gt;skb = priv-&gt;rx_skb;</div><div class='add'>+			priv-&gt;rx_skb = skb;</div><div class='add'>+		} else {</div><div class='add'>+			/* it from the middle of a new chain -&gt;</div><div class='add'>+			   delete the old entry and skip the new one */</div><div class='add'>+			at76_dbg(DBG_RX_FRAGS,</div><div class='add'>+				 "%s: middle of new seq %d (%d) "</div><div class='add'>+				 "removing old seq %d",</div><div class='add'>+				 priv-&gt;netdev-&gt;name, seqnr, fragnr,</div><div class='add'>+				 bptr-&gt;seqnr);</div><div class='add'>+			dev_kfree_skb(bptr-&gt;skb);</div><div class='add'>+			bptr-&gt;skb = NULL;</div><div class='add'>+		}</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* if we didn't find a chain for the sender address, optr</div><div class='add'>+	   points either to the first free or the oldest entry */</div><div class='add'>+</div><div class='add'>+	if (fragnr != 0) {</div><div class='add'>+		/* this is not the begin of a fragment chain ... */</div><div class='add'>+		at76_dbg(DBG_RX_FRAGS,</div><div class='add'>+			 "%s: no chain for non-first fragment (%d)",</div><div class='add'>+			 priv-&gt;netdev-&gt;name, fragnr);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	BUG_ON(!optr);</div><div class='add'>+	if (optr-&gt;skb) {</div><div class='add'>+		/* swap the skb's */</div><div class='add'>+		skb = optr-&gt;skb;</div><div class='add'>+		optr-&gt;skb = priv-&gt;rx_skb;</div><div class='add'>+		priv-&gt;rx_skb = skb;</div><div class='add'>+</div><div class='add'>+		at76_dbg(DBG_RX_FRAGS,</div><div class='add'>+			 "%s: free old contents: sender %s seq/frag %d/%d",</div><div class='add'>+			 priv-&gt;netdev-&gt;name, mac2str(optr-&gt;sender),</div><div class='add'>+			 optr-&gt;seqnr, optr-&gt;fragnr);</div><div class='add'>+</div><div class='add'>+	} else {</div><div class='add'>+		/* take the skb from priv-&gt;rx_skb */</div><div class='add'>+		optr-&gt;skb = priv-&gt;rx_skb;</div><div class='add'>+		/* let at76_submit_rx_urb() allocate a new skb */</div><div class='add'>+		priv-&gt;rx_skb = NULL;</div><div class='add'>+</div><div class='add'>+		at76_dbg(DBG_RX_FRAGS, "%s: use a free entry",</div><div class='add'>+			 priv-&gt;netdev-&gt;name);</div><div class='add'>+	}</div><div class='add'>+	memcpy(optr-&gt;sender, i802_11_hdr-&gt;addr2, ETH_ALEN);</div><div class='add'>+	optr-&gt;seqnr = seqnr;</div><div class='add'>+	optr-&gt;fragnr = 0;</div><div class='add'>+	optr-&gt;last_rx = jiffies;</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Rx interrupt: we expect the complete data buffer in priv-&gt;rx_skb */</div><div class='add'>+static void at76_rx_data(struct at76_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev = priv-&gt;netdev;</div><div class='add'>+	struct net_device_stats *stats = &amp;priv-&gt;stats;</div><div class='add'>+	struct sk_buff *skb = priv-&gt;rx_skb;</div><div class='add'>+	struct at76_rx_buffer *buf = (struct at76_rx_buffer *)skb-&gt;data;</div><div class='add'>+	struct ieee80211_hdr_3addr *i802_11_hdr;</div><div class='add'>+	int length = le16_to_cpu(buf-&gt;wlength);</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_RX_DATA, "%s received data packet: %s", netdev-&gt;name,</div><div class='add'>+		 hex2str(skb-&gt;data, AT76_RX_HDRLEN));</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_RX_DATA_CONTENT, "rx packet: %s",</div><div class='add'>+		 hex2str(skb-&gt;data + AT76_RX_HDRLEN, length));</div><div class='add'>+</div><div class='add'>+	skb = at76_check_for_rx_frags(priv);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Atmel header and the FCS are already removed */</div><div class='add'>+	i802_11_hdr = (struct ieee80211_hdr_3addr *)skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	skb-&gt;dev = netdev;</div><div class='add'>+	skb-&gt;ip_summed = CHECKSUM_NONE;	/* TODO: should check CRC */</div><div class='add'>+</div><div class='add'>+	if (is_broadcast_ether_addr(i802_11_hdr-&gt;addr1)) {</div><div class='add'>+		if (!compare_ether_addr(i802_11_hdr-&gt;addr1, netdev-&gt;broadcast))</div><div class='add'>+			skb-&gt;pkt_type = PACKET_BROADCAST;</div><div class='add'>+		else</div><div class='add'>+			skb-&gt;pkt_type = PACKET_MULTICAST;</div><div class='add'>+	} else if (compare_ether_addr(i802_11_hdr-&gt;addr1, netdev-&gt;dev_addr))</div><div class='add'>+		skb-&gt;pkt_type = PACKET_OTHERHOST;</div><div class='add'>+</div><div class='add'>+	at76_ieee80211_to_eth(skb, priv-&gt;iw_mode);</div><div class='add'>+</div><div class='add'>+	netdev-&gt;last_rx = jiffies;</div><div class='add'>+	netif_rx(skb);</div><div class='add'>+	stats-&gt;rx_packets++;</div><div class='add'>+	stats-&gt;rx_bytes += length;</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void at76_rx_monitor_mode(struct at76_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct at76_rx_radiotap *rt;</div><div class='add'>+	u8 *payload;</div><div class='add'>+	int skblen;</div><div class='add'>+	struct net_device *netdev = priv-&gt;netdev;</div><div class='add'>+	struct at76_rx_buffer *buf =</div><div class='add'>+	    (struct at76_rx_buffer *)priv-&gt;rx_skb-&gt;data;</div><div class='add'>+	/* length including the IEEE802.11 header and the trailing FCS,</div><div class='add'>+	   but not at76_rx_buffer */</div><div class='add'>+	int length = le16_to_cpu(buf-&gt;wlength);</div><div class='add'>+	struct sk_buff *skb = priv-&gt;rx_skb;</div><div class='add'>+	struct net_device_stats *stats = &amp;priv-&gt;stats;</div><div class='add'>+</div><div class='add'>+	if (length &lt; IEEE80211_FCS_LEN) {</div><div class='add'>+		/* buffer contains no data */</div><div class='add'>+		at76_dbg(DBG_MONITOR_MODE,</div><div class='add'>+			 "%s: MONITOR MODE: rx skb without data",</div><div class='add'>+			 priv-&gt;netdev-&gt;name);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skblen = sizeof(struct at76_rx_radiotap) + length;</div><div class='add'>+</div><div class='add'>+	skb = dev_alloc_skb(skblen);</div><div class='add'>+	if (!skb) {</div><div class='add'>+		printk(KERN_ERR "%s: MONITOR MODE: dev_alloc_skb for radiotap "</div><div class='add'>+		       "header returned NULL\n", priv-&gt;netdev-&gt;name);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb_put(skb, skblen);</div><div class='add'>+</div><div class='add'>+	rt = (struct at76_rx_radiotap *)skb-&gt;data;</div><div class='add'>+	payload = skb-&gt;data + sizeof(struct at76_rx_radiotap);</div><div class='add'>+</div><div class='add'>+	rt-&gt;rt_hdr.it_version = 0;</div><div class='add'>+	rt-&gt;rt_hdr.it_pad = 0;</div><div class='add'>+	rt-&gt;rt_hdr.it_len = cpu_to_le16(sizeof(struct at76_rx_radiotap));</div><div class='add'>+	rt-&gt;rt_hdr.it_present = cpu_to_le32(AT76_RX_RADIOTAP_PRESENT);</div><div class='add'>+</div><div class='add'>+	rt-&gt;rt_tsft = cpu_to_le64(le32_to_cpu(buf-&gt;rx_time));</div><div class='add'>+	rt-&gt;rt_rate = hw_rates[buf-&gt;rx_rate] &amp; (~0x80);</div><div class='add'>+	rt-&gt;rt_signal = buf-&gt;rssi;</div><div class='add'>+	rt-&gt;rt_noise = buf-&gt;noise_level;</div><div class='add'>+	rt-&gt;rt_flags = IEEE80211_RADIOTAP_F_FCS;</div><div class='add'>+	if (buf-&gt;fragmentation)</div><div class='add'>+		rt-&gt;rt_flags |= IEEE80211_RADIOTAP_F_FRAG;</div><div class='add'>+</div><div class='add'>+	memcpy(payload, buf-&gt;packet, length);</div><div class='add'>+	skb-&gt;dev = netdev;</div><div class='add'>+	skb-&gt;ip_summed = CHECKSUM_NONE;</div><div class='add'>+	skb_reset_mac_header(skb);</div><div class='add'>+	skb-&gt;pkt_type = PACKET_OTHERHOST;</div><div class='add'>+	skb-&gt;protocol = htons(ETH_P_802_2);</div><div class='add'>+</div><div class='add'>+	netdev-&gt;last_rx = jiffies;</div><div class='add'>+	netif_rx(skb);</div><div class='add'>+	stats-&gt;rx_packets++;</div><div class='add'>+	stats-&gt;rx_bytes += length;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Check if we spy on the sender address in buf and update stats */</div><div class='add'>+static void at76_iwspy_update(struct at76_priv *priv,</div><div class='add'>+			      struct at76_rx_buffer *buf)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hdr_3addr *hdr =</div><div class='add'>+	    (struct ieee80211_hdr_3addr *)buf-&gt;packet;</div><div class='add'>+	struct iw_quality qual;</div><div class='add'>+</div><div class='add'>+	/* We can only set the level here */</div><div class='add'>+	qual.updated = IW_QUAL_QUAL_INVALID | IW_QUAL_NOISE_INVALID;</div><div class='add'>+	qual.level = 0;</div><div class='add'>+	qual.noise = 0;</div><div class='add'>+	at76_calc_level(priv, buf, &amp;qual);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;priv-&gt;spy_spinlock);</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;spy_data.spy_number &gt; 0)</div><div class='add'>+		wireless_spy_update(priv-&gt;netdev, hdr-&gt;addr2, &amp;qual);</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;priv-&gt;spy_spinlock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void at76_rx_tasklet(unsigned long param)</div><div class='add'>+{</div><div class='add'>+	struct urb *urb = (struct urb *)param;</div><div class='add'>+	struct at76_priv *priv = urb-&gt;context;</div><div class='add'>+	struct net_device *netdev = priv-&gt;netdev;</div><div class='add'>+	struct at76_rx_buffer *buf;</div><div class='add'>+	struct ieee80211_hdr_3addr *i802_11_hdr;</div><div class='add'>+	u16 frame_ctl;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;device_unplugged) {</div><div class='add'>+		at76_dbg(DBG_DEVSTART, "device unplugged");</div><div class='add'>+		if (urb)</div><div class='add'>+			at76_dbg(DBG_DEVSTART, "urb status %d", urb-&gt;status);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!priv-&gt;rx_skb || !netdev || !priv-&gt;rx_skb-&gt;data)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	buf = (struct at76_rx_buffer *)priv-&gt;rx_skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	i802_11_hdr = (struct ieee80211_hdr_3addr *)buf-&gt;packet;</div><div class='add'>+</div><div class='add'>+	frame_ctl = le16_to_cpu(i802_11_hdr-&gt;frame_ctl);</div><div class='add'>+</div><div class='add'>+	if (urb-&gt;status != 0) {</div><div class='add'>+		if (urb-&gt;status != -ENOENT &amp;&amp; urb-&gt;status != -ECONNRESET)</div><div class='add'>+			at76_dbg(DBG_URB,</div><div class='add'>+				 "%s %s: - nonzero Rx bulk status received: %d",</div><div class='add'>+				 __func__, netdev-&gt;name, urb-&gt;status);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_RX_ATMEL_HDR,</div><div class='add'>+		 "%s: rx frame: rate %d rssi %d noise %d link %d %s",</div><div class='add'>+		 priv-&gt;netdev-&gt;name, buf-&gt;rx_rate, buf-&gt;rssi, buf-&gt;noise_level,</div><div class='add'>+		 buf-&gt;link_quality, hex2str(i802_11_hdr, 48));</div><div class='add'>+	if (priv-&gt;iw_mode == IW_MODE_MONITOR) {</div><div class='add'>+		at76_rx_monitor_mode(priv);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* there is a new bssid around, accept it: */</div><div class='add'>+	if (buf-&gt;newbss &amp;&amp; priv-&gt;iw_mode == IW_MODE_ADHOC) {</div><div class='add'>+		at76_dbg(DBG_PROGRESS, "%s: rx newbss", netdev-&gt;name);</div><div class='add'>+		schedule_work(&amp;priv-&gt;work_new_bss);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (frame_ctl &amp; IEEE80211_FCTL_FTYPE) {</div><div class='add'>+	case IEEE80211_FTYPE_DATA:</div><div class='add'>+		at76_rx_data(priv);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case IEEE80211_FTYPE_MGMT:</div><div class='add'>+		/* jal: TODO: find out if we can update iwspy also on</div><div class='add'>+		   other frames than management (might depend on the</div><div class='add'>+		   radio chip / firmware version !) */</div><div class='add'>+</div><div class='add'>+		at76_iwspy_update(priv, buf);</div><div class='add'>+</div><div class='add'>+		at76_rx_mgmt(priv, buf);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case IEEE80211_FTYPE_CTL:</div><div class='add'>+		at76_dbg(DBG_RX_CTRL, "%s: ignored ctrl frame: %04x",</div><div class='add'>+			 priv-&gt;netdev-&gt;name, frame_ctl);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		printk(KERN_DEBUG "%s: ignoring frame with framectl 0x%04x\n",</div><div class='add'>+		       priv-&gt;netdev-&gt;name, frame_ctl);</div><div class='add'>+	}</div><div class='add'>+exit:</div><div class='add'>+	at76_submit_rx_urb(priv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Load firmware into kernel memory and parse it */</div><div class='add'>+static struct fwentry *at76_load_firmware(struct usb_device *udev,</div><div class='add'>+					  enum board_type board_type)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	char *str;</div><div class='add'>+	struct at76_fw_header *fwh;</div><div class='add'>+	struct fwentry *fwe = &amp;firmwares[board_type];</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;fw_mutex);</div><div class='add'>+</div><div class='add'>+	if (fwe-&gt;loaded) {</div><div class='add'>+		at76_dbg(DBG_FW, "re-using previously loaded fw");</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_FW, "downloading firmware %s", fwe-&gt;fwname);</div><div class='add'>+	ret = request_firmware(&amp;fwe-&gt;fw, fwe-&gt;fwname, &amp;udev-&gt;dev);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_printk(KERN_ERR, &amp;udev-&gt;dev, "firmware %s not found!\n",</div><div class='add'>+			   fwe-&gt;fwname);</div><div class='add'>+		dev_printk(KERN_ERR, &amp;udev-&gt;dev,</div><div class='add'>+			   "you may need to download the firmware from "</div><div class='add'>+			   "http://developer.berlios.de/projects/at76c503a/");</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_FW, "got it.");</div><div class='add'>+	fwh = (struct at76_fw_header *)(fwe-&gt;fw-&gt;data);</div><div class='add'>+</div><div class='add'>+	if (fwe-&gt;fw-&gt;size &lt;= sizeof(*fwh)) {</div><div class='add'>+		dev_printk(KERN_ERR, &amp;udev-&gt;dev,</div><div class='add'>+			   "firmware is too short (0x%zx)\n", fwe-&gt;fw-&gt;size);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* CRC currently not checked */</div><div class='add'>+	fwe-&gt;board_type = le32_to_cpu(fwh-&gt;board_type);</div><div class='add'>+	if (fwe-&gt;board_type != board_type) {</div><div class='add'>+		dev_printk(KERN_ERR, &amp;udev-&gt;dev,</div><div class='add'>+			   "board type mismatch, requested %u, got %u\n",</div><div class='add'>+			   board_type, fwe-&gt;board_type);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fwe-&gt;fw_version.major = fwh-&gt;major;</div><div class='add'>+	fwe-&gt;fw_version.minor = fwh-&gt;minor;</div><div class='add'>+	fwe-&gt;fw_version.patch = fwh-&gt;patch;</div><div class='add'>+	fwe-&gt;fw_version.build = fwh-&gt;build;</div><div class='add'>+</div><div class='add'>+	str = (char *)fwh + le32_to_cpu(fwh-&gt;str_offset);</div><div class='add'>+	fwe-&gt;intfw = (u8 *)fwh + le32_to_cpu(fwh-&gt;int_fw_offset);</div><div class='add'>+	fwe-&gt;intfw_size = le32_to_cpu(fwh-&gt;int_fw_len);</div><div class='add'>+	fwe-&gt;extfw = (u8 *)fwh + le32_to_cpu(fwh-&gt;ext_fw_offset);</div><div class='add'>+	fwe-&gt;extfw_size = le32_to_cpu(fwh-&gt;ext_fw_len);</div><div class='add'>+</div><div class='add'>+	fwe-&gt;loaded = 1;</div><div class='add'>+</div><div class='add'>+	dev_printk(KERN_DEBUG, &amp;udev-&gt;dev,</div><div class='add'>+		   "using firmware %s (version %d.%d.%d-%d)\n",</div><div class='add'>+		   fwe-&gt;fwname, fwh-&gt;major, fwh-&gt;minor, fwh-&gt;patch, fwh-&gt;build);</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_DEVSTART, "board %u, int %d:%d, ext %d:%d", board_type,</div><div class='add'>+		 le32_to_cpu(fwh-&gt;int_fw_offset), le32_to_cpu(fwh-&gt;int_fw_len),</div><div class='add'>+		 le32_to_cpu(fwh-&gt;ext_fw_offset), le32_to_cpu(fwh-&gt;ext_fw_len));</div><div class='add'>+	at76_dbg(DBG_DEVSTART, "firmware id %s", str);</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	mutex_unlock(&amp;fw_mutex);</div><div class='add'>+</div><div class='add'>+	if (fwe-&gt;loaded)</div><div class='add'>+		return fwe;</div><div class='add'>+	else</div><div class='add'>+		return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Allocate network device and initialize private data */</div><div class='add'>+static struct at76_priv *at76_alloc_new_device(struct usb_device *udev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev;</div><div class='add'>+	struct at76_priv *priv;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* allocate memory for our device state and initialize it */</div><div class='add'>+	netdev = alloc_etherdev(sizeof(struct at76_priv));</div><div class='add'>+	if (!netdev) {</div><div class='add'>+		dev_printk(KERN_ERR, &amp;udev-&gt;dev, "out of memory\n");</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	priv-&gt;udev = udev;</div><div class='add'>+	priv-&gt;netdev = netdev;</div><div class='add'>+</div><div class='add'>+	mutex_init(&amp;priv-&gt;mtx);</div><div class='add'>+	INIT_WORK(&amp;priv-&gt;work_assoc_done, at76_work_assoc_done);</div><div class='add'>+	INIT_WORK(&amp;priv-&gt;work_join, at76_work_join);</div><div class='add'>+	INIT_WORK(&amp;priv-&gt;work_new_bss, at76_work_new_bss);</div><div class='add'>+	INIT_WORK(&amp;priv-&gt;work_start_scan, at76_work_start_scan);</div><div class='add'>+	INIT_WORK(&amp;priv-&gt;work_set_promisc, at76_work_set_promisc);</div><div class='add'>+	INIT_WORK(&amp;priv-&gt;work_submit_rx, at76_work_submit_rx);</div><div class='add'>+	INIT_DELAYED_WORK(&amp;priv-&gt;dwork_restart, at76_dwork_restart);</div><div class='add'>+	INIT_DELAYED_WORK(&amp;priv-&gt;dwork_get_scan, at76_dwork_get_scan);</div><div class='add'>+	INIT_DELAYED_WORK(&amp;priv-&gt;dwork_beacon, at76_dwork_beacon);</div><div class='add'>+	INIT_DELAYED_WORK(&amp;priv-&gt;dwork_auth, at76_dwork_auth);</div><div class='add'>+	INIT_DELAYED_WORK(&amp;priv-&gt;dwork_assoc, at76_dwork_assoc);</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;priv-&gt;mgmt_spinlock);</div><div class='add'>+	priv-&gt;next_mgmt_bulk = NULL;</div><div class='add'>+	priv-&gt;mac_state = MAC_INIT;</div><div class='add'>+</div><div class='add'>+	/* initialize empty BSS list */</div><div class='add'>+	priv-&gt;curr_bss = NULL;</div><div class='add'>+	INIT_LIST_HEAD(&amp;priv-&gt;bss_list);</div><div class='add'>+	spin_lock_init(&amp;priv-&gt;bss_list_spinlock);</div><div class='add'>+</div><div class='add'>+	init_timer(&amp;priv-&gt;bss_list_timer);</div><div class='add'>+	priv-&gt;bss_list_timer.data = (unsigned long)priv;</div><div class='add'>+	priv-&gt;bss_list_timer.function = at76_bss_list_timeout;</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;priv-&gt;spy_spinlock);</div><div class='add'>+</div><div class='add'>+	/* mark all rx data entries as unused */</div><div class='add'>+	for (i = 0; i &lt; NR_RX_DATA_BUF; i++)</div><div class='add'>+		priv-&gt;rx_data[i].skb = NULL;</div><div class='add'>+</div><div class='add'>+	priv-&gt;rx_tasklet.func = at76_rx_tasklet;</div><div class='add'>+	priv-&gt;rx_tasklet.data = 0;</div><div class='add'>+</div><div class='add'>+	priv-&gt;pm_mode = AT76_PM_OFF;</div><div class='add'>+	priv-&gt;pm_period = 0;</div><div class='add'>+</div><div class='add'>+	return priv;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int at76_alloc_urbs(struct at76_priv *priv,</div><div class='add'>+			   struct usb_interface *interface)</div><div class='add'>+{</div><div class='add'>+	struct usb_endpoint_descriptor *endpoint, *ep_in, *ep_out;</div><div class='add'>+	int i;</div><div class='add'>+	int buffer_size;</div><div class='add'>+	struct usb_host_interface *iface_desc;</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_PROC_ENTRY, "%s: ENTER", __func__);</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_URB, "%s: NumEndpoints %d ", __func__,</div><div class='add'>+		 interface-&gt;altsetting[0].desc.bNumEndpoints);</div><div class='add'>+</div><div class='add'>+	ep_in = NULL;</div><div class='add'>+	ep_out = NULL;</div><div class='add'>+	iface_desc = interface-&gt;cur_altsetting;</div><div class='add'>+	for (i = 0; i &lt; iface_desc-&gt;desc.bNumEndpoints; i++) {</div><div class='add'>+		endpoint = &amp;iface_desc-&gt;endpoint[i].desc;</div><div class='add'>+</div><div class='add'>+		at76_dbg(DBG_URB, "%s: %d. endpoint: addr 0x%x attr 0x%x",</div><div class='add'>+			 __func__, i, endpoint-&gt;bEndpointAddress,</div><div class='add'>+			 endpoint-&gt;bmAttributes);</div><div class='add'>+</div><div class='add'>+		if (!ep_in &amp;&amp; usb_endpoint_is_bulk_in(endpoint))</div><div class='add'>+			ep_in = endpoint;</div><div class='add'>+</div><div class='add'>+		if (!ep_out &amp;&amp; usb_endpoint_is_bulk_out(endpoint))</div><div class='add'>+			ep_out = endpoint;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!ep_in || !ep_out) {</div><div class='add'>+		dev_printk(KERN_ERR, &amp;interface-&gt;dev,</div><div class='add'>+			   "bulk endpoints missing\n");</div><div class='add'>+		return -ENXIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;rx_pipe = usb_rcvbulkpipe(priv-&gt;udev, ep_in-&gt;bEndpointAddress);</div><div class='add'>+	priv-&gt;tx_pipe = usb_sndbulkpipe(priv-&gt;udev, ep_out-&gt;bEndpointAddress);</div><div class='add'>+</div><div class='add'>+	priv-&gt;rx_urb = usb_alloc_urb(0, GFP_KERNEL);</div><div class='add'>+	priv-&gt;tx_urb = usb_alloc_urb(0, GFP_KERNEL);</div><div class='add'>+	if (!priv-&gt;rx_urb || !priv-&gt;tx_urb) {</div><div class='add'>+		dev_printk(KERN_ERR, &amp;interface-&gt;dev, "cannot allocate URB\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	buffer_size = sizeof(struct at76_tx_buffer) + MAX_PADDING_SIZE;</div><div class='add'>+	priv-&gt;bulk_out_buffer = kmalloc(buffer_size, GFP_KERNEL);</div><div class='add'>+	if (!priv-&gt;bulk_out_buffer) {</div><div class='add'>+		dev_printk(KERN_ERR, &amp;interface-&gt;dev,</div><div class='add'>+			   "cannot allocate output buffer\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_PROC_ENTRY, "%s: EXIT", __func__);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Register network device and initialize the hardware */</div><div class='add'>+static int at76_init_new_device(struct at76_priv *priv,</div><div class='add'>+				struct usb_interface *interface)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev = priv-&gt;netdev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* set up the endpoint information */</div><div class='add'>+	/* check out the endpoints */</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_DEVSTART, "USB interface: %d endpoints",</div><div class='add'>+		 interface-&gt;cur_altsetting-&gt;desc.bNumEndpoints);</div><div class='add'>+</div><div class='add'>+	ret = at76_alloc_urbs(priv, interface);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	/* MAC address */</div><div class='add'>+	ret = at76_get_hw_config(priv);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_printk(KERN_ERR, &amp;interface-&gt;dev,</div><div class='add'>+			   "cannot get MAC address\n");</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;domain = at76_get_reg_domain(priv-&gt;regulatory_domain);</div><div class='add'>+	/* init. netdev-&gt;dev_addr */</div><div class='add'>+	memcpy(netdev-&gt;dev_addr, priv-&gt;mac_addr, ETH_ALEN);</div><div class='add'>+</div><div class='add'>+	priv-&gt;channel = DEF_CHANNEL;</div><div class='add'>+	priv-&gt;iw_mode = IW_MODE_INFRA;</div><div class='add'>+	priv-&gt;rts_threshold = DEF_RTS_THRESHOLD;</div><div class='add'>+	priv-&gt;frag_threshold = DEF_FRAG_THRESHOLD;</div><div class='add'>+	priv-&gt;short_retry_limit = DEF_SHORT_RETRY_LIMIT;</div><div class='add'>+	priv-&gt;txrate = TX_RATE_AUTO;</div><div class='add'>+	priv-&gt;preamble_type = PREAMBLE_TYPE_LONG;</div><div class='add'>+	priv-&gt;beacon_period = 100;</div><div class='add'>+	priv-&gt;beacons_last_qual = jiffies;</div><div class='add'>+	priv-&gt;auth_mode = WLAN_AUTH_OPEN;</div><div class='add'>+	priv-&gt;scan_min_time = DEF_SCAN_MIN_TIME;</div><div class='add'>+	priv-&gt;scan_max_time = DEF_SCAN_MAX_TIME;</div><div class='add'>+	priv-&gt;scan_mode = SCAN_TYPE_ACTIVE;</div><div class='add'>+</div><div class='add'>+	netdev-&gt;flags &amp;= ~IFF_MULTICAST;	/* not yet or never */</div><div class='add'>+	netdev-&gt;open = at76_open;</div><div class='add'>+	netdev-&gt;stop = at76_stop;</div><div class='add'>+	netdev-&gt;get_stats = at76_get_stats;</div><div class='add'>+	netdev-&gt;ethtool_ops = &amp;at76_ethtool_ops;</div><div class='add'>+</div><div class='add'>+	/* Add pointers to enable iwspy support. */</div><div class='add'>+	priv-&gt;wireless_data.spy_data = &amp;priv-&gt;spy_data;</div><div class='add'>+	netdev-&gt;wireless_data = &amp;priv-&gt;wireless_data;</div><div class='add'>+</div><div class='add'>+	netdev-&gt;hard_start_xmit = at76_tx;</div><div class='add'>+	netdev-&gt;tx_timeout = at76_tx_timeout;</div><div class='add'>+	netdev-&gt;watchdog_timeo = 2 * HZ;</div><div class='add'>+	netdev-&gt;wireless_handlers = &amp;at76_handler_def;</div><div class='add'>+	netdev-&gt;set_multicast_list = at76_set_multicast;</div><div class='add'>+	netdev-&gt;set_mac_address = at76_set_mac_address;</div><div class='add'>+	dev_alloc_name(netdev, "wlan%d");</div><div class='add'>+</div><div class='add'>+	ret = register_netdev(priv-&gt;netdev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_printk(KERN_ERR, &amp;interface-&gt;dev,</div><div class='add'>+			   "cannot register netdevice (status %d)!\n", ret);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+	priv-&gt;netdev_registered = 1;</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "%s: USB %s, MAC %s, firmware %d.%d.%d-%d\n",</div><div class='add'>+	       netdev-&gt;name, interface-&gt;dev.bus_id, mac2str(priv-&gt;mac_addr),</div><div class='add'>+	       priv-&gt;fw_version.major, priv-&gt;fw_version.minor,</div><div class='add'>+	       priv-&gt;fw_version.patch, priv-&gt;fw_version.build);</div><div class='add'>+	printk(KERN_INFO "%s: regulatory domain 0x%02x: %s\n", netdev-&gt;name,</div><div class='add'>+	       priv-&gt;regulatory_domain, priv-&gt;domain-&gt;name);</div><div class='add'>+</div><div class='add'>+	/* we let this timer run the whole time this driver instance lives */</div><div class='add'>+	mod_timer(&amp;priv-&gt;bss_list_timer, jiffies + BSS_LIST_TIMEOUT);</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void at76_delete_device(struct at76_priv *priv)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_PROC_ENTRY, "%s: ENTER", __func__);</div><div class='add'>+</div><div class='add'>+	/* The device is gone, don't bother turning it off */</div><div class='add'>+	priv-&gt;device_unplugged = 1;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;netdev_registered)</div><div class='add'>+		unregister_netdev(priv-&gt;netdev);</div><div class='add'>+</div><div class='add'>+	/* assuming we used keventd, it must quiesce too */</div><div class='add'>+	flush_scheduled_work();</div><div class='add'>+</div><div class='add'>+	kfree(priv-&gt;bulk_out_buffer);</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;tx_urb) {</div><div class='add'>+		usb_kill_urb(priv-&gt;tx_urb);</div><div class='add'>+		usb_free_urb(priv-&gt;tx_urb);</div><div class='add'>+	}</div><div class='add'>+	if (priv-&gt;rx_urb) {</div><div class='add'>+		usb_kill_urb(priv-&gt;rx_urb);</div><div class='add'>+		usb_free_urb(priv-&gt;rx_urb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_PROC_ENTRY, "%s: unlinked urbs", __func__);</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;rx_skb)</div><div class='add'>+		kfree_skb(priv-&gt;rx_skb);</div><div class='add'>+</div><div class='add'>+	at76_free_bss_list(priv);</div><div class='add'>+	del_timer_sync(&amp;priv-&gt;bss_list_timer);</div><div class='add'>+	cancel_delayed_work(&amp;priv-&gt;dwork_get_scan);</div><div class='add'>+	cancel_delayed_work(&amp;priv-&gt;dwork_beacon);</div><div class='add'>+	cancel_delayed_work(&amp;priv-&gt;dwork_auth);</div><div class='add'>+	cancel_delayed_work(&amp;priv-&gt;dwork_assoc);</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;mac_state == MAC_CONNECTED)</div><div class='add'>+		at76_iwevent_bss_disconnect(priv-&gt;netdev);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; NR_RX_DATA_BUF; i++)</div><div class='add'>+		if (priv-&gt;rx_data[i].skb) {</div><div class='add'>+			dev_kfree_skb(priv-&gt;rx_data[i].skb);</div><div class='add'>+			priv-&gt;rx_data[i].skb = NULL;</div><div class='add'>+		}</div><div class='add'>+	usb_put_dev(priv-&gt;udev);</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_PROC_ENTRY, "%s: before freeing priv/netdev", __func__);</div><div class='add'>+	free_netdev(priv-&gt;netdev);	/* priv is in netdev */</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_PROC_ENTRY, "%s: EXIT", __func__);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int at76_probe(struct usb_interface *interface,</div><div class='add'>+		      const struct usb_device_id *id)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct at76_priv *priv;</div><div class='add'>+	struct fwentry *fwe;</div><div class='add'>+	struct usb_device *udev;</div><div class='add'>+	int op_mode;</div><div class='add'>+	int need_ext_fw = 0;</div><div class='add'>+	struct mib_fw_version fwv;</div><div class='add'>+	int board_type = (int)id-&gt;driver_info;</div><div class='add'>+</div><div class='add'>+	udev = usb_get_dev(interface_to_usbdev(interface));</div><div class='add'>+</div><div class='add'>+	/* Load firmware into kernel memory */</div><div class='add'>+	fwe = at76_load_firmware(udev, board_type);</div><div class='add'>+	if (!fwe) {</div><div class='add'>+		ret = -ENOENT;</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	op_mode = at76_get_op_mode(udev);</div><div class='add'>+</div><div class='add'>+	at76_dbg(DBG_DEVSTART, "opmode %d", op_mode);</div><div class='add'>+</div><div class='add'>+	/* we get OPMODE_NONE with 2.4.23, SMC2662W-AR ???</div><div class='add'>+	   we get 204 with 2.4.23, Fiberline FL-WL240u (505A+RFMD2958) ??? */</div><div class='add'>+</div><div class='add'>+	if (op_mode == OPMODE_HW_CONFIG_MODE) {</div><div class='add'>+		dev_printk(KERN_ERR, &amp;interface-&gt;dev,</div><div class='add'>+			   "cannot handle a device in HW_CONFIG_MODE\n");</div><div class='add'>+		ret = -EBUSY;</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (op_mode != OPMODE_NORMAL_NIC_WITH_FLASH</div><div class='add'>+	    &amp;&amp; op_mode != OPMODE_NORMAL_NIC_WITHOUT_FLASH) {</div><div class='add'>+		/* download internal firmware part */</div><div class='add'>+		dev_printk(KERN_DEBUG, &amp;interface-&gt;dev,</div><div class='add'>+			   "downloading internal firmware\n");</div><div class='add'>+		ret = at76_load_internal_fw(udev, fwe);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			dev_printk(KERN_ERR, &amp;interface-&gt;dev,</div><div class='add'>+				   "error %d downloading internal firmware\n",</div><div class='add'>+				   ret);</div><div class='add'>+			goto error;</div><div class='add'>+		}</div><div class='add'>+		usb_put_dev(udev);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Internal firmware already inside the device.  Get firmware</div><div class='add'>+	 * version to test if external firmware is loaded.</div><div class='add'>+	 * This works only for newer firmware, e.g. the Intersil 0.90.x</div><div class='add'>+	 * says "control timeout on ep0in" and subsequent</div><div class='add'>+	 * at76_get_op_mode() fail too :-( */</div><div class='add'>+</div><div class='add'>+	/* if version &gt;= 0.100.x.y or device with built-in flash we can</div><div class='add'>+	 * query the device for the fw version */</div><div class='add'>+	if ((fwe-&gt;fw_version.major &gt; 0 || fwe-&gt;fw_version.minor &gt;= 100)</div><div class='add'>+	    || (op_mode == OPMODE_NORMAL_NIC_WITH_FLASH)) {</div><div class='add'>+		ret = at76_get_mib(udev, MIB_FW_VERSION, &amp;fwv, sizeof(fwv));</div><div class='add'>+		if (ret &lt; 0 || (fwv.major | fwv.minor) == 0)</div><div class='add'>+			need_ext_fw = 1;</div><div class='add'>+	} else</div><div class='add'>+		/* No way to check firmware version, reload to be sure */</div><div class='add'>+		need_ext_fw = 1;</div><div class='add'>+</div><div class='add'>+	if (need_ext_fw) {</div><div class='add'>+		dev_printk(KERN_DEBUG, &amp;interface-&gt;dev,</div><div class='add'>+			   "downloading external firmware\n");</div><div class='add'>+</div><div class='add'>+		ret = at76_load_external_fw(udev, fwe);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto error;</div><div class='add'>+</div><div class='add'>+		/* Re-check firmware version */</div><div class='add'>+		ret = at76_get_mib(udev, MIB_FW_VERSION, &amp;fwv, sizeof(fwv));</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			dev_printk(KERN_ERR, &amp;interface-&gt;dev,</div><div class='add'>+				   "error %d getting firmware version\n", ret);</div><div class='add'>+			goto error;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv = at76_alloc_new_device(udev);</div><div class='add'>+	if (!priv) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	SET_NETDEV_DEV(priv-&gt;netdev, &amp;interface-&gt;dev);</div><div class='add'>+	usb_set_intfdata(interface, priv);</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;priv-&gt;fw_version, &amp;fwv, sizeof(struct mib_fw_version));</div><div class='add'>+	priv-&gt;board_type = board_type;</div><div class='add'>+</div><div class='add'>+	ret = at76_init_new_device(priv, interface);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		at76_delete_device(priv);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	usb_put_dev(udev);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void at76_disconnect(struct usb_interface *interface)</div><div class='add'>+{</div><div class='add'>+	struct at76_priv *priv;</div><div class='add'>+</div><div class='add'>+	priv = usb_get_intfdata(interface);</div><div class='add'>+	usb_set_intfdata(interface, NULL);</div><div class='add'>+</div><div class='add'>+	/* Disconnect after loading internal firmware */</div><div class='add'>+	if (!priv)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "%s: disconnecting\n", priv-&gt;netdev-&gt;name);</div><div class='add'>+	at76_delete_device(priv);</div><div class='add'>+	dev_printk(KERN_INFO, &amp;interface-&gt;dev, "disconnected\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Structure for registering this driver with the USB subsystem */</div><div class='add'>+static struct usb_driver at76_driver = {</div><div class='add'>+	.name = DRIVER_NAME,</div><div class='add'>+	.probe = at76_probe,</div><div class='add'>+	.disconnect = at76_disconnect,</div><div class='add'>+	.id_table = dev_table,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init at76_mod_init(void)</div><div class='add'>+{</div><div class='add'>+	int result;</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO DRIVER_DESC " " DRIVER_VERSION " loading\n");</div><div class='add'>+</div><div class='add'>+	mutex_init(&amp;fw_mutex);</div><div class='add'>+</div><div class='add'>+	/* register this driver with the USB subsystem */</div><div class='add'>+	result = usb_register(&amp;at76_driver);</div><div class='add'>+	if (result &lt; 0)</div><div class='add'>+		printk(KERN_ERR DRIVER_NAME</div><div class='add'>+		       ": usb_register failed (status %d)\n", result);</div><div class='add'>+</div><div class='add'>+	led_trigger_register_simple("at76_usb-tx", &amp;ledtrig_tx);</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit at76_mod_exit(void)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO DRIVER_DESC " " DRIVER_VERSION " unloading\n");</div><div class='add'>+	usb_deregister(&amp;at76_driver);</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(firmwares); i++) {</div><div class='add'>+		if (firmwares[i].fw)</div><div class='add'>+			release_firmware(firmwares[i].fw);</div><div class='add'>+	}</div><div class='add'>+	led_trigger_unregister_simple(ledtrig_tx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_param_named(debug, at76_debug, int, 0600);</div><div class='add'>+MODULE_PARM_DESC(debug, "Debugging level");</div><div class='add'>+</div><div class='add'>+module_init(at76_mod_init);</div><div class='add'>+module_exit(at76_mod_exit);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Oliver Kurth &lt;oku@masqmail.cx&gt;");</div><div class='add'>+MODULE_AUTHOR("Joerg Albert &lt;joerg.albert@gmx.de&gt;");</div><div class='add'>+MODULE_AUTHOR("Alex &lt;alex@foogod.com&gt;");</div><div class='add'>+MODULE_AUTHOR("Nick Jones");</div><div class='add'>+MODULE_AUTHOR("Balint Seeber &lt;n0_5p4m_p13453@hotmail.com&gt;");</div><div class='add'>+MODULE_AUTHOR("Pavel Roskin &lt;proski@gnu.org&gt;");</div><div class='add'>+MODULE_DESCRIPTION(DRIVER_DESC);</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/staging/at76_usb/at76_usb.h b/drivers/staging/at76_usb/at76_usb.h<br/>new file mode 100644<br/>index 000000000000..b20be9da1fa1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/at76_usb/at76_usb.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/at76_usb/at76_usb.h</a></div><div class='hunk'>@@ -0,0 +1,619 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2002,2003 Oliver Kurth</div><div class='add'>+ *	     (c) 2003,2004 Joerg Albert &lt;joerg.albert@gmx.de&gt;</div><div class='add'>+ *	     (c) 2007 Guido Guenther &lt;agx@sigxcpu.org&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public License as</div><div class='add'>+ * published by the Free Software Foundation; either version 2 of</div><div class='add'>+ * the License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This driver was based on information from the Sourceforge driver</div><div class='add'>+ * released and maintained by Atmel:</div><div class='add'>+ *</div><div class='add'>+ *  http://sourceforge.net/projects/atmelwlandriver/</div><div class='add'>+ *</div><div class='add'>+ * Although the code was completely re-written,</div><div class='add'>+ * it would have been impossible without Atmel's decision to</div><div class='add'>+ * release an Open Source driver (unfortunately the firmware was</div><div class='add'>+ * kept binary only). Thanks for that decision to Atmel!</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _AT76_USB_H</div><div class='add'>+#define _AT76_USB_H</div><div class='add'>+</div><div class='add'>+/* Board types */</div><div class='add'>+enum board_type {</div><div class='add'>+	BOARD_503_ISL3861 = 1,</div><div class='add'>+	BOARD_503_ISL3863 = 2,</div><div class='add'>+	BOARD_503 = 3,</div><div class='add'>+	BOARD_503_ACC = 4,</div><div class='add'>+	BOARD_505 = 5,</div><div class='add'>+	BOARD_505_2958 = 6,</div><div class='add'>+	BOARD_505A = 7,</div><div class='add'>+	BOARD_505AMX = 8</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* our private ioctl's */</div><div class='add'>+/* preamble length (0 - long, 1 - short, 2 - auto) */</div><div class='add'>+#define AT76_SET_SHORT_PREAMBLE		(SIOCIWFIRSTPRIV + 0)</div><div class='add'>+#define AT76_GET_SHORT_PREAMBLE		(SIOCIWFIRSTPRIV + 1)</div><div class='add'>+/* which debug channels are enabled */</div><div class='add'>+#define AT76_SET_DEBUG			(SIOCIWFIRSTPRIV + 2)</div><div class='add'>+#define AT76_GET_DEBUG			(SIOCIWFIRSTPRIV + 3)</div><div class='add'>+/* power save mode (incl. the Atmel proprietary smart save mode) */</div><div class='add'>+#define AT76_SET_POWERSAVE_MODE		(SIOCIWFIRSTPRIV + 4)</div><div class='add'>+#define AT76_GET_POWERSAVE_MODE		(SIOCIWFIRSTPRIV + 5)</div><div class='add'>+/* min and max channel times for scan */</div><div class='add'>+#define AT76_SET_SCAN_TIMES		(SIOCIWFIRSTPRIV + 6)</div><div class='add'>+#define AT76_GET_SCAN_TIMES		(SIOCIWFIRSTPRIV + 7)</div><div class='add'>+/* scan mode (0 - active, 1 - passive) */</div><div class='add'>+#define AT76_SET_SCAN_MODE		(SIOCIWFIRSTPRIV + 8)</div><div class='add'>+#define AT76_GET_SCAN_MODE		(SIOCIWFIRSTPRIV + 9)</div><div class='add'>+</div><div class='add'>+#define CMD_STATUS_IDLE				0x00</div><div class='add'>+#define CMD_STATUS_COMPLETE			0x01</div><div class='add'>+#define CMD_STATUS_UNKNOWN			0x02</div><div class='add'>+#define CMD_STATUS_INVALID_PARAMETER		0x03</div><div class='add'>+#define CMD_STATUS_FUNCTION_NOT_SUPPORTED	0x04</div><div class='add'>+#define CMD_STATUS_TIME_OUT			0x07</div><div class='add'>+#define CMD_STATUS_IN_PROGRESS			0x08</div><div class='add'>+#define CMD_STATUS_HOST_FAILURE			0xff</div><div class='add'>+#define CMD_STATUS_SCAN_FAILED			0xf0</div><div class='add'>+</div><div class='add'>+/* answers to get op mode */</div><div class='add'>+#define OPMODE_NONE				0x00</div><div class='add'>+#define OPMODE_NORMAL_NIC_WITH_FLASH		0x01</div><div class='add'>+#define OPMODE_HW_CONFIG_MODE			0x02</div><div class='add'>+#define OPMODE_DFU_MODE_WITH_FLASH		0x03</div><div class='add'>+#define OPMODE_NORMAL_NIC_WITHOUT_FLASH		0x04</div><div class='add'>+</div><div class='add'>+#define CMD_SET_MIB		0x01</div><div class='add'>+#define CMD_GET_MIB		0x02</div><div class='add'>+#define CMD_SCAN		0x03</div><div class='add'>+#define CMD_JOIN		0x04</div><div class='add'>+#define CMD_START_IBSS		0x05</div><div class='add'>+#define CMD_RADIO_ON		0x06</div><div class='add'>+#define CMD_RADIO_OFF		0x07</div><div class='add'>+#define CMD_STARTUP		0x0B</div><div class='add'>+</div><div class='add'>+#define MIB_LOCAL		0x01</div><div class='add'>+#define MIB_MAC_ADDR		0x02</div><div class='add'>+#define MIB_MAC			0x03</div><div class='add'>+#define MIB_MAC_MGMT		0x05</div><div class='add'>+#define MIB_MAC_WEP		0x06</div><div class='add'>+#define MIB_PHY			0x07</div><div class='add'>+#define MIB_FW_VERSION		0x08</div><div class='add'>+#define MIB_MDOMAIN		0x09</div><div class='add'>+</div><div class='add'>+#define ADHOC_MODE		1</div><div class='add'>+#define INFRASTRUCTURE_MODE	2</div><div class='add'>+</div><div class='add'>+/* values for struct mib_local, field preamble_type */</div><div class='add'>+#define PREAMBLE_TYPE_LONG	0</div><div class='add'>+#define PREAMBLE_TYPE_SHORT	1</div><div class='add'>+#define PREAMBLE_TYPE_AUTO	2</div><div class='add'>+</div><div class='add'>+/* values for tx_rate */</div><div class='add'>+#define TX_RATE_1MBIT		0</div><div class='add'>+#define TX_RATE_2MBIT		1</div><div class='add'>+#define TX_RATE_5_5MBIT 	2</div><div class='add'>+#define TX_RATE_11MBIT		3</div><div class='add'>+#define TX_RATE_AUTO		4</div><div class='add'>+</div><div class='add'>+/* power management modes */</div><div class='add'>+#define AT76_PM_OFF		1</div><div class='add'>+#define AT76_PM_ON		2</div><div class='add'>+#define AT76_PM_SMART		3</div><div class='add'>+</div><div class='add'>+struct hwcfg_r505 {</div><div class='add'>+	u8 cr39_values[14];</div><div class='add'>+	u8 reserved1[14];</div><div class='add'>+	u8 bb_cr[14];</div><div class='add'>+	u8 pidvid[4];</div><div class='add'>+	u8 mac_addr[ETH_ALEN];</div><div class='add'>+	u8 regulatory_domain;</div><div class='add'>+	u8 reserved2[14];</div><div class='add'>+	u8 cr15_values[14];</div><div class='add'>+	u8 reserved3[3];</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+struct hwcfg_rfmd {</div><div class='add'>+	u8 cr20_values[14];</div><div class='add'>+	u8 cr21_values[14];</div><div class='add'>+	u8 bb_cr[14];</div><div class='add'>+	u8 pidvid[4];</div><div class='add'>+	u8 mac_addr[ETH_ALEN];</div><div class='add'>+	u8 regulatory_domain;</div><div class='add'>+	u8 low_power_values[14];</div><div class='add'>+	u8 normal_power_values[14];</div><div class='add'>+	u8 reserved1[3];</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+struct hwcfg_intersil {</div><div class='add'>+	u8 mac_addr[ETH_ALEN];</div><div class='add'>+	u8 cr31_values[14];</div><div class='add'>+	u8 cr58_values[14];</div><div class='add'>+	u8 pidvid[4];</div><div class='add'>+	u8 regulatory_domain;</div><div class='add'>+	u8 reserved[1];</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+union at76_hwcfg {</div><div class='add'>+	struct hwcfg_intersil i;</div><div class='add'>+	struct hwcfg_rfmd r3;</div><div class='add'>+	struct hwcfg_r505 r5;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define WEP_SMALL_KEY_LEN	(40 / 8)</div><div class='add'>+#define WEP_LARGE_KEY_LEN	(104 / 8)</div><div class='add'>+</div><div class='add'>+struct at76_card_config {</div><div class='add'>+	u8 exclude_unencrypted;</div><div class='add'>+	u8 promiscuous_mode;</div><div class='add'>+	u8 short_retry_limit;</div><div class='add'>+	u8 encryption_type;</div><div class='add'>+	__le16 rts_threshold;</div><div class='add'>+	__le16 fragmentation_threshold;	/* 256..2346 */</div><div class='add'>+	u8 basic_rate_set[4];</div><div class='add'>+	u8 auto_rate_fallback;	/* 0,1 */</div><div class='add'>+	u8 channel;</div><div class='add'>+	u8 privacy_invoked;</div><div class='add'>+	u8 wep_default_key_id;	/* 0..3 */</div><div class='add'>+	u8 current_ssid[32];</div><div class='add'>+	u8 wep_default_key_value[4][WEP_KEY_LEN];</div><div class='add'>+	u8 ssid_len;</div><div class='add'>+	u8 short_preamble;</div><div class='add'>+	__le16 beacon_period;</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+struct at76_command {</div><div class='add'>+	u8 cmd;</div><div class='add'>+	u8 reserved;</div><div class='add'>+	__le16 size;</div><div class='add'>+	u8 data[0];</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+/* Length of Atmel-specific Rx header before 802.11 frame */</div><div class='add'>+#define AT76_RX_HDRLEN offsetof(struct at76_rx_buffer, packet)</div><div class='add'>+</div><div class='add'>+struct at76_rx_buffer {</div><div class='add'>+	__le16 wlength;</div><div class='add'>+	u8 rx_rate;</div><div class='add'>+	u8 newbss;</div><div class='add'>+	u8 fragmentation;</div><div class='add'>+	u8 rssi;</div><div class='add'>+	u8 link_quality;</div><div class='add'>+	u8 noise_level;</div><div class='add'>+	__le32 rx_time;</div><div class='add'>+	u8 packet[IEEE80211_FRAME_LEN + IEEE80211_FCS_LEN];</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+/* Length of Atmel-specific Tx header before 802.11 frame */</div><div class='add'>+#define AT76_TX_HDRLEN offsetof(struct at76_tx_buffer, packet)</div><div class='add'>+</div><div class='add'>+struct at76_tx_buffer {</div><div class='add'>+	__le16 wlength;</div><div class='add'>+	u8 tx_rate;</div><div class='add'>+	u8 padding;</div><div class='add'>+	u8 reserved[4];</div><div class='add'>+	u8 packet[IEEE80211_FRAME_LEN + IEEE80211_FCS_LEN];</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+/* defines for scan_type below */</div><div class='add'>+#define SCAN_TYPE_ACTIVE	0</div><div class='add'>+#define SCAN_TYPE_PASSIVE	1</div><div class='add'>+</div><div class='add'>+struct at76_req_scan {</div><div class='add'>+	u8 bssid[ETH_ALEN];</div><div class='add'>+	u8 essid[32];</div><div class='add'>+	u8 scan_type;</div><div class='add'>+	u8 channel;</div><div class='add'>+	__le16 probe_delay;</div><div class='add'>+	__le16 min_channel_time;</div><div class='add'>+	__le16 max_channel_time;</div><div class='add'>+	u8 essid_size;</div><div class='add'>+	u8 international_scan;</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+struct at76_req_ibss {</div><div class='add'>+	u8 bssid[ETH_ALEN];</div><div class='add'>+	u8 essid[32];</div><div class='add'>+	u8 bss_type;</div><div class='add'>+	u8 channel;</div><div class='add'>+	u8 essid_size;</div><div class='add'>+	u8 reserved[3];</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+struct at76_req_join {</div><div class='add'>+	u8 bssid[ETH_ALEN];</div><div class='add'>+	u8 essid[32];</div><div class='add'>+	u8 bss_type;</div><div class='add'>+	u8 channel;</div><div class='add'>+	__le16 timeout;</div><div class='add'>+	u8 essid_size;</div><div class='add'>+	u8 reserved;</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+struct set_mib_buffer {</div><div class='add'>+	u8 type;</div><div class='add'>+	u8 size;</div><div class='add'>+	u8 index;</div><div class='add'>+	u8 reserved;</div><div class='add'>+	union {</div><div class='add'>+		u8 byte;</div><div class='add'>+		__le16 word;</div><div class='add'>+		u8 addr[ETH_ALEN];</div><div class='add'>+	} data;</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+struct mib_local {</div><div class='add'>+	u16 reserved0;</div><div class='add'>+	u8 beacon_enable;</div><div class='add'>+	u8 txautorate_fallback;</div><div class='add'>+	u8 reserved1;</div><div class='add'>+	u8 ssid_size;</div><div class='add'>+	u8 promiscuous_mode;</div><div class='add'>+	u16 reserved2;</div><div class='add'>+	u8 preamble_type;</div><div class='add'>+	u16 reserved3;</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+struct mib_mac_addr {</div><div class='add'>+	u8 mac_addr[ETH_ALEN];</div><div class='add'>+	u8 res[2];		/* ??? */</div><div class='add'>+	u8 group_addr[4][ETH_ALEN];</div><div class='add'>+	u8 group_addr_status[4];</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+struct mib_mac {</div><div class='add'>+	__le32 max_tx_msdu_lifetime;</div><div class='add'>+	__le32 max_rx_lifetime;</div><div class='add'>+	__le16 frag_threshold;</div><div class='add'>+	__le16 rts_threshold;</div><div class='add'>+	__le16 cwmin;</div><div class='add'>+	__le16 cwmax;</div><div class='add'>+	u8 short_retry_time;</div><div class='add'>+	u8 long_retry_time;</div><div class='add'>+	u8 scan_type;		/* active or passive */</div><div class='add'>+	u8 scan_channel;</div><div class='add'>+	__le16 probe_delay;	/* delay before ProbeReq in active scan, RO */</div><div class='add'>+	__le16 min_channel_time;</div><div class='add'>+	__le16 max_channel_time;</div><div class='add'>+	__le16 listen_interval;</div><div class='add'>+	u8 desired_ssid[32];</div><div class='add'>+	u8 desired_bssid[ETH_ALEN];</div><div class='add'>+	u8 desired_bsstype;	/* ad-hoc or infrastructure */</div><div class='add'>+	u8 reserved2;</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+struct mib_mac_mgmt {</div><div class='add'>+	__le16 beacon_period;</div><div class='add'>+	__le16 CFP_max_duration;</div><div class='add'>+	__le16 medium_occupancy_limit;</div><div class='add'>+	__le16 station_id;	/* assoc id */</div><div class='add'>+	__le16 ATIM_window;</div><div class='add'>+	u8 CFP_mode;</div><div class='add'>+	u8 privacy_option_implemented;</div><div class='add'>+	u8 DTIM_period;</div><div class='add'>+	u8 CFP_period;</div><div class='add'>+	u8 current_bssid[ETH_ALEN];</div><div class='add'>+	u8 current_essid[32];</div><div class='add'>+	u8 current_bss_type;</div><div class='add'>+	u8 power_mgmt_mode;</div><div class='add'>+	/* rfmd and 505 */</div><div class='add'>+	u8 ibss_change;</div><div class='add'>+	u8 res;</div><div class='add'>+	u8 multi_domain_capability_implemented;</div><div class='add'>+	u8 multi_domain_capability_enabled;</div><div class='add'>+	u8 country_string[3];</div><div class='add'>+	u8 reserved[3];</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+struct mib_mac_wep {</div><div class='add'>+	u8 privacy_invoked;	/* 0 disable encr., 1 enable encr */</div><div class='add'>+	u8 wep_default_key_id;</div><div class='add'>+	u8 wep_key_mapping_len;</div><div class='add'>+	u8 exclude_unencrypted;</div><div class='add'>+	__le32 wep_icv_error_count;</div><div class='add'>+	__le32 wep_excluded_count;</div><div class='add'>+	u8 wep_default_keyvalue[WEP_KEYS][WEP_KEY_LEN];</div><div class='add'>+	u8 encryption_level;	/* 1 for 40bit, 2 for 104bit encryption */</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+struct mib_phy {</div><div class='add'>+	__le32 ed_threshold;</div><div class='add'>+</div><div class='add'>+	__le16 slot_time;</div><div class='add'>+	__le16 sifs_time;</div><div class='add'>+	__le16 preamble_length;</div><div class='add'>+	__le16 plcp_header_length;</div><div class='add'>+	__le16 mpdu_max_length;</div><div class='add'>+	__le16 cca_mode_supported;</div><div class='add'>+</div><div class='add'>+	u8 operation_rate_set[4];</div><div class='add'>+	u8 channel_id;</div><div class='add'>+	u8 current_cca_mode;</div><div class='add'>+	u8 phy_type;</div><div class='add'>+	u8 current_reg_domain;</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+struct mib_fw_version {</div><div class='add'>+	u8 major;</div><div class='add'>+	u8 minor;</div><div class='add'>+	u8 patch;</div><div class='add'>+	u8 build;</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+struct mib_mdomain {</div><div class='add'>+	u8 tx_powerlevel[14];</div><div class='add'>+	u8 channel_list[14];	/* 0 for invalid channels */</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+struct at76_fw_header {</div><div class='add'>+	__le32 crc;		/* CRC32 of the whole image */</div><div class='add'>+	__le32 board_type;	/* firmware compatibility code */</div><div class='add'>+	u8 build;		/* firmware build number */</div><div class='add'>+	u8 patch;		/* firmware patch level */</div><div class='add'>+	u8 minor;		/* firmware minor version */</div><div class='add'>+	u8 major;		/* firmware major version */</div><div class='add'>+	__le32 str_offset;	/* offset of the copyright string */</div><div class='add'>+	__le32 int_fw_offset;	/* internal firmware image offset */</div><div class='add'>+	__le32 int_fw_len;	/* internal firmware image length */</div><div class='add'>+	__le32 ext_fw_offset;	/* external firmware image offset */</div><div class='add'>+	__le32 ext_fw_len;	/* external firmware image length */</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+enum mac_state {</div><div class='add'>+	MAC_INIT,</div><div class='add'>+	MAC_SCANNING,</div><div class='add'>+	MAC_AUTH,</div><div class='add'>+	MAC_ASSOC,</div><div class='add'>+	MAC_JOINING,</div><div class='add'>+	MAC_CONNECTED,</div><div class='add'>+	MAC_OWN_IBSS</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* a description of a regulatory domain and the allowed channels */</div><div class='add'>+struct reg_domain {</div><div class='add'>+	u16 code;</div><div class='add'>+	char const *name;</div><div class='add'>+	u32 channel_map;	/* if bit N is set, channel (N+1) is allowed */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* how long do we keep a (I)BSS in the bss_list in jiffies</div><div class='add'>+   this should be long enough for the user to retrieve the table</div><div class='add'>+   (by iwlist ?) after the device started, because all entries from</div><div class='add'>+   other channels than the one the device locks on get removed, too */</div><div class='add'>+#define BSS_LIST_TIMEOUT	(120 * HZ)</div><div class='add'>+/* struct to store BSS info found during scan */</div><div class='add'>+#define BSS_LIST_MAX_RATE_LEN	32	/* 32 rates should be enough ... */</div><div class='add'>+</div><div class='add'>+struct bss_info {</div><div class='add'>+	struct list_head list;</div><div class='add'>+</div><div class='add'>+	u8 bssid[ETH_ALEN];	/* bssid */</div><div class='add'>+	u8 ssid[IW_ESSID_MAX_SIZE];	/* essid */</div><div class='add'>+	u8 ssid_len;		/* length of ssid above */</div><div class='add'>+	u8 channel;</div><div class='add'>+	u16 capa;		/* BSS capabilities */</div><div class='add'>+	u16 beacon_interval;	/* beacon interval, Kus (1024 microseconds) */</div><div class='add'>+	u8 rates[BSS_LIST_MAX_RATE_LEN];	/* supported rates in units of</div><div class='add'>+						   500 kbps, ORed with 0x80 for</div><div class='add'>+						   basic rates */</div><div class='add'>+	u8 rates_len;</div><div class='add'>+</div><div class='add'>+	/* quality of received beacon */</div><div class='add'>+	u8 rssi;</div><div class='add'>+	u8 link_qual;</div><div class='add'>+	u8 noise_level;</div><div class='add'>+</div><div class='add'>+	unsigned long last_rx;	/* time (jiffies) of last beacon received */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* a rx data buffer to collect rx fragments */</div><div class='add'>+struct rx_data_buf {</div><div class='add'>+	u8 sender[ETH_ALEN];	/* sender address */</div><div class='add'>+	u16 seqnr;		/* sequence number */</div><div class='add'>+	u16 fragnr;		/* last fragment received */</div><div class='add'>+	unsigned long last_rx;	/* jiffies of last rx */</div><div class='add'>+	struct sk_buff *skb;	/* == NULL if entry is free */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define NR_RX_DATA_BUF		8</div><div class='add'>+</div><div class='add'>+/* Data for one loaded firmware file */</div><div class='add'>+struct fwentry {</div><div class='add'>+	const char *const fwname;</div><div class='add'>+	const struct firmware *fw;</div><div class='add'>+	int extfw_size;</div><div class='add'>+	int intfw_size;</div><div class='add'>+	/* pointer to loaded firmware, no need to free */</div><div class='add'>+	u8 *extfw;		/* external firmware, extfw_size bytes long */</div><div class='add'>+	u8 *intfw;		/* internal firmware, intfw_size bytes long */</div><div class='add'>+	enum board_type board_type;	/* board type */</div><div class='add'>+	struct mib_fw_version fw_version;</div><div class='add'>+	int loaded;		/* Loaded and parsed successfully */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct at76_priv {</div><div class='add'>+	struct usb_device *udev;	/* USB device pointer */</div><div class='add'>+	struct net_device *netdev;	/* net device pointer */</div><div class='add'>+	struct net_device_stats stats;	/* net device stats */</div><div class='add'>+	struct iw_statistics wstats;	/* wireless stats */</div><div class='add'>+</div><div class='add'>+	struct sk_buff *rx_skb;	/* skbuff for receiving data */</div><div class='add'>+	void *bulk_out_buffer;	/* buffer for sending data */</div><div class='add'>+</div><div class='add'>+	struct urb *tx_urb;	/* URB for sending data */</div><div class='add'>+	struct urb *rx_urb;	/* URB for receiving data */</div><div class='add'>+</div><div class='add'>+	unsigned int tx_pipe;	/* bulk out pipe */</div><div class='add'>+	unsigned int rx_pipe;	/* bulk in pipe */</div><div class='add'>+</div><div class='add'>+	struct mutex mtx;	/* locks this structure */</div><div class='add'>+</div><div class='add'>+	/* work queues */</div><div class='add'>+	struct work_struct work_assoc_done;</div><div class='add'>+	struct work_struct work_join;</div><div class='add'>+	struct work_struct work_new_bss;</div><div class='add'>+	struct work_struct work_start_scan;</div><div class='add'>+	struct work_struct work_set_promisc;</div><div class='add'>+	struct work_struct work_submit_rx;</div><div class='add'>+	struct delayed_work dwork_restart;</div><div class='add'>+	struct delayed_work dwork_get_scan;</div><div class='add'>+	struct delayed_work dwork_beacon;</div><div class='add'>+	struct delayed_work dwork_auth;</div><div class='add'>+	struct delayed_work dwork_assoc;</div><div class='add'>+</div><div class='add'>+	struct tasklet_struct rx_tasklet;</div><div class='add'>+</div><div class='add'>+	/* the WEP stuff */</div><div class='add'>+	int wep_enabled;	/* 1 if WEP is enabled */</div><div class='add'>+	int wep_key_id;		/* key id to be used */</div><div class='add'>+	u8 wep_keys[WEP_KEYS][WEP_KEY_LEN];	/* the four WEP keys,</div><div class='add'>+						   5 or 13 bytes are used */</div><div class='add'>+	u8 wep_keys_len[WEP_KEYS];	/* the length of the above keys */</div><div class='add'>+</div><div class='add'>+	int channel;</div><div class='add'>+	int iw_mode;</div><div class='add'>+	u8 bssid[ETH_ALEN];</div><div class='add'>+	u8 essid[IW_ESSID_MAX_SIZE];</div><div class='add'>+	int essid_size;</div><div class='add'>+	int radio_on;</div><div class='add'>+	int promisc;</div><div class='add'>+</div><div class='add'>+	int preamble_type;	/* 0 - long, 1 - short, 2 - auto */</div><div class='add'>+	int auth_mode;		/* authentication type: 0 open, 1 shared key */</div><div class='add'>+	int txrate;		/* 0,1,2,3 = 1,2,5.5,11 Mbps, 4 is auto */</div><div class='add'>+	int frag_threshold;	/* threshold for fragmentation of tx packets */</div><div class='add'>+	int rts_threshold;	/* threshold for RTS mechanism */</div><div class='add'>+	int short_retry_limit;</div><div class='add'>+</div><div class='add'>+	int scan_min_time;	/* scan min channel time */</div><div class='add'>+	int scan_max_time;	/* scan max channel time */</div><div class='add'>+	int scan_mode;		/* SCAN_TYPE_ACTIVE, SCAN_TYPE_PASSIVE */</div><div class='add'>+	int scan_need_any;	/* if set, need to scan for any ESSID */</div><div class='add'>+</div><div class='add'>+	/* the list we got from scanning */</div><div class='add'>+	spinlock_t bss_list_spinlock;	/* protects bss_list operations */</div><div class='add'>+	struct list_head bss_list;	/* list of BSS we got beacons from */</div><div class='add'>+	struct timer_list bss_list_timer;	/* timer to purge old entries</div><div class='add'>+						   from bss_list */</div><div class='add'>+	struct bss_info *curr_bss;	/* current BSS */</div><div class='add'>+	u16 assoc_id;		/* current association ID, if associated */</div><div class='add'>+</div><div class='add'>+	u8 wanted_bssid[ETH_ALEN];</div><div class='add'>+	int wanted_bssid_valid;	/* != 0 if wanted_bssid is to be used */</div><div class='add'>+</div><div class='add'>+	/* some data for infrastructure mode only */</div><div class='add'>+	spinlock_t mgmt_spinlock;	/* this spinlock protects access to</div><div class='add'>+					   next_mgmt_bulk */</div><div class='add'>+</div><div class='add'>+	struct at76_tx_buffer *next_mgmt_bulk;	/* pending management msg to</div><div class='add'>+						   send via bulk out */</div><div class='add'>+	enum mac_state mac_state;</div><div class='add'>+	enum {</div><div class='add'>+		SCAN_IDLE,</div><div class='add'>+		SCAN_IN_PROGRESS,</div><div class='add'>+		SCAN_COMPLETED</div><div class='add'>+	} scan_state;</div><div class='add'>+	time_t last_scan;</div><div class='add'>+</div><div class='add'>+	int retries;		/* remaining retries in case of timeout when</div><div class='add'>+				 * sending AuthReq or AssocReq */</div><div class='add'>+	u8 pm_mode;		/* power management mode */</div><div class='add'>+	u32 pm_period;		/* power management period in microseconds */</div><div class='add'>+</div><div class='add'>+	struct reg_domain const *domain;	/* reg domain description */</div><div class='add'>+</div><div class='add'>+	/* iwspy support */</div><div class='add'>+	spinlock_t spy_spinlock;</div><div class='add'>+	struct iw_spy_data spy_data;</div><div class='add'>+</div><div class='add'>+	struct iw_public_data wireless_data;</div><div class='add'>+</div><div class='add'>+	/* These fields contain HW config provided by the device (not all of</div><div class='add'>+	 * these fields are used by all board types) */</div><div class='add'>+	u8 mac_addr[ETH_ALEN];</div><div class='add'>+	u8 regulatory_domain;</div><div class='add'>+</div><div class='add'>+	struct at76_card_config card_config;</div><div class='add'>+</div><div class='add'>+	/* store rx fragments until complete */</div><div class='add'>+	struct rx_data_buf rx_data[NR_RX_DATA_BUF];</div><div class='add'>+</div><div class='add'>+	enum board_type board_type;</div><div class='add'>+	struct mib_fw_version fw_version;</div><div class='add'>+</div><div class='add'>+	unsigned int device_unplugged:1;</div><div class='add'>+	unsigned int netdev_registered:1;</div><div class='add'>+	struct set_mib_buffer mib_buf;	/* global buffer for set_mib calls */</div><div class='add'>+</div><div class='add'>+	/* beacon counting */</div><div class='add'>+	int beacon_period;	/* period of mgmt beacons, Kus */</div><div class='add'>+	int beacons_received;</div><div class='add'>+	unsigned long beacons_last_qual;	/* time we restarted counting</div><div class='add'>+						   beacons */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct at76_rx_radiotap {</div><div class='add'>+	struct ieee80211_radiotap_header rt_hdr;</div><div class='add'>+	__le64 rt_tsft;</div><div class='add'>+	u8 rt_flags;</div><div class='add'>+	u8 rt_rate;</div><div class='add'>+	s8 rt_signal;</div><div class='add'>+	s8 rt_noise;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define AT76_RX_RADIOTAP_PRESENT		  \</div><div class='add'>+	((1 &lt;&lt; IEEE80211_RADIOTAP_TSFT)		| \</div><div class='add'>+	(1 &lt;&lt; IEEE80211_RADIOTAP_FLAGS)		| \</div><div class='add'>+	(1 &lt;&lt; IEEE80211_RADIOTAP_RATE)		| \</div><div class='add'>+	(1 &lt;&lt; IEEE80211_RADIOTAP_DB_ANTSIGNAL)	| \</div><div class='add'>+	(1 &lt;&lt; IEEE80211_RADIOTAP_DB_ANTNOISE))</div><div class='add'>+</div><div class='add'>+#define BEACON_MAX_DATA_LENGTH	1500</div><div class='add'>+</div><div class='add'>+/* the maximum size of an AssocReq packet */</div><div class='add'>+#define ASSOCREQ_MAX_SIZE \</div><div class='add'>+  (AT76_TX_HDRLEN + sizeof(struct ieee80211_assoc_request) + \</div><div class='add'>+   1 + 1 + IW_ESSID_MAX_SIZE + 1 + 1 + 4)</div><div class='add'>+</div><div class='add'>+/* for shared secret auth, add the challenge text size */</div><div class='add'>+#define AUTH_FRAME_SIZE (AT76_TX_HDRLEN + sizeof(struct ieee80211_auth))</div><div class='add'>+</div><div class='add'>+/* Maximal number of AuthReq retries */</div><div class='add'>+#define AUTH_RETRIES		3</div><div class='add'>+</div><div class='add'>+/* Maximal number of AssocReq retries */</div><div class='add'>+#define ASSOC_RETRIES		3</div><div class='add'>+</div><div class='add'>+/* Beacon timeout in managed mode when we are connected */</div><div class='add'>+#define BEACON_TIMEOUT		(10 * HZ)</div><div class='add'>+</div><div class='add'>+/* Timeout for authentication response */</div><div class='add'>+#define AUTH_TIMEOUT		(1 * HZ)</div><div class='add'>+</div><div class='add'>+/* Timeout for association response */</div><div class='add'>+#define ASSOC_TIMEOUT		(1 * HZ)</div><div class='add'>+</div><div class='add'>+/* Polling interval when scan is running */</div><div class='add'>+#define SCAN_POLL_INTERVAL	(HZ / 4)</div><div class='add'>+</div><div class='add'>+/* Command completion timeout */</div><div class='add'>+#define CMD_COMPLETION_TIMEOUT	(5 * HZ)</div><div class='add'>+</div><div class='add'>+#define DEF_RTS_THRESHOLD	1536</div><div class='add'>+#define DEF_FRAG_THRESHOLD	1536</div><div class='add'>+#define DEF_SHORT_RETRY_LIMIT	8</div><div class='add'>+#define DEF_CHANNEL		10</div><div class='add'>+#define DEF_SCAN_MIN_TIME	10</div><div class='add'>+#define DEF_SCAN_MAX_TIME	120</div><div class='add'>+</div><div class='add'>+#define MAX_RTS_THRESHOLD	(MAX_FRAG_THRESHOLD + 1)</div><div class='add'>+</div><div class='add'>+/* the max padding size for tx in bytes (see calc_padding) */</div><div class='add'>+#define MAX_PADDING_SIZE	53</div><div class='add'>+</div><div class='add'>+#endif				/* _AT76_USB_H */</div><div class='head'>diff --git a/drivers/staging/echo/Kconfig b/drivers/staging/echo/Kconfig<br/>new file mode 100644<br/>index 000000000000..f1d41ea9cd48<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/echo/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/echo/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,9 @@</div><div class='add'>+config ECHO</div><div class='add'>+	tristate "Line Echo Canceller support"</div><div class='add'>+	default n</div><div class='add'>+	---help---</div><div class='add'>+	  This driver provides line echo cancelling support for mISDN and</div><div class='add'>+	  Zaptel drivers.</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here. The module</div><div class='add'>+	  will be called echo.</div><div class='head'>diff --git a/drivers/staging/echo/Makefile b/drivers/staging/echo/Makefile<br/>new file mode 100644<br/>index 000000000000..7d4caac12a8d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/echo/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/echo/Makefile</a></div><div class='hunk'>@@ -0,0 +1 @@</div><div class='add'>+obj-$(CONFIG_ECHO) += echo.o</div><div class='head'>diff --git a/drivers/staging/echo/TODO b/drivers/staging/echo/TODO<br/>new file mode 100644<br/>index 000000000000..1ca09afd603e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/echo/TODO?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/echo/TODO</a></div><div class='hunk'>@@ -0,0 +1,10 @@</div><div class='add'>+TODO:</div><div class='add'>+	- checkpatch.pl cleanups</div><div class='add'>+	- Lindent</div><div class='add'>+	- typedef removals</div><div class='add'>+	- handle bit_operations.h (merge in or make part of common code?)</div><div class='add'>+	- remove proc interface, only use echo.h interface (proc interface is</div><div class='add'>+	  racy and not correct.)</div><div class='add'>+</div><div class='add'>+Please send patches to Greg Kroah-Hartman &lt;greg@kroah.com&gt; and Cc: Steve</div><div class='add'>+Underwood &lt;steveu@coppice.org&gt; and David Rowe &lt;david@rowetel.com&gt;</div><div class='head'>diff --git a/drivers/staging/echo/bit_operations.h b/drivers/staging/echo/bit_operations.h<br/>new file mode 100644<br/>index 000000000000..b32f4bf99397<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/echo/bit_operations.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/echo/bit_operations.h</a></div><div class='hunk'>@@ -0,0 +1,253 @@</div><div class='add'>+/*</div><div class='add'>+ * SpanDSP - a series of DSP components for telephony</div><div class='add'>+ *</div><div class='add'>+ * bit_operations.h - Various bit level operations, such as bit reversal</div><div class='add'>+ *</div><div class='add'>+ * Written by Steve Underwood &lt;steveu@coppice.org&gt;</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2006 Steve Underwood</div><div class='add'>+ *</div><div class='add'>+ * All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2, as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='add'>+ *</div><div class='add'>+ * $Id: bit_operations.h,v 1.11 2006/11/28 15:37:03 steveu Exp $</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*! \file */</div><div class='add'>+</div><div class='add'>+#if !defined(_BIT_OPERATIONS_H_)</div><div class='add'>+#define _BIT_OPERATIONS_H_</div><div class='add'>+</div><div class='add'>+#ifdef __cplusplus</div><div class='add'>+extern "C" {</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(__i386__)  ||  defined(__x86_64__)</div><div class='add'>+/*! \brief Find the bit position of the highest set bit in a word</div><div class='add'>+    \param bits The word to be searched</div><div class='add'>+    \return The bit number of the highest set bit, or -1 if the word is zero. */</div><div class='add'>+static __inline__ int top_bit(unsigned int bits)</div><div class='add'>+{</div><div class='add'>+    int res;</div><div class='add'>+</div><div class='add'>+    __asm__ (" xorl %[res],%[res];\n"</div><div class='add'>+             " decl %[res];\n"</div><div class='add'>+             " bsrl %[bits],%[res]\n"</div><div class='add'>+             : [res] "=&amp;r" (res)</div><div class='add'>+             : [bits] "rm" (bits));</div><div class='add'>+    return res;</div><div class='add'>+}</div><div class='add'>+/*- End of function --------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+/*! \brief Find the bit position of the lowest set bit in a word</div><div class='add'>+    \param bits The word to be searched</div><div class='add'>+    \return The bit number of the lowest set bit, or -1 if the word is zero. */</div><div class='add'>+static __inline__ int bottom_bit(unsigned int bits)</div><div class='add'>+{</div><div class='add'>+    int res;</div><div class='add'>+</div><div class='add'>+    __asm__ (" xorl %[res],%[res];\n"</div><div class='add'>+             " decl %[res];\n"</div><div class='add'>+             " bsfl %[bits],%[res]\n"</div><div class='add'>+             : [res] "=&amp;r" (res)</div><div class='add'>+             : [bits] "rm" (bits));</div><div class='add'>+    return res;</div><div class='add'>+}</div><div class='add'>+/*- End of function --------------------------------------------------------*/</div><div class='add'>+#else</div><div class='add'>+static __inline__ int top_bit(unsigned int bits)</div><div class='add'>+{</div><div class='add'>+    int i;</div><div class='add'>+</div><div class='add'>+    if (bits == 0)</div><div class='add'>+        return -1;</div><div class='add'>+    i = 0;</div><div class='add'>+    if (bits &amp; 0xFFFF0000)</div><div class='add'>+    {</div><div class='add'>+        bits &amp;= 0xFFFF0000;</div><div class='add'>+        i += 16;</div><div class='add'>+    }</div><div class='add'>+    if (bits &amp; 0xFF00FF00)</div><div class='add'>+    {</div><div class='add'>+        bits &amp;= 0xFF00FF00;</div><div class='add'>+        i += 8;</div><div class='add'>+    }</div><div class='add'>+    if (bits &amp; 0xF0F0F0F0)</div><div class='add'>+    {</div><div class='add'>+        bits &amp;= 0xF0F0F0F0;</div><div class='add'>+        i += 4;</div><div class='add'>+    }</div><div class='add'>+    if (bits &amp; 0xCCCCCCCC)</div><div class='add'>+    {</div><div class='add'>+        bits &amp;= 0xCCCCCCCC;</div><div class='add'>+        i += 2;</div><div class='add'>+    }</div><div class='add'>+    if (bits &amp; 0xAAAAAAAA)</div><div class='add'>+    {</div><div class='add'>+        bits &amp;= 0xAAAAAAAA;</div><div class='add'>+        i += 1;</div><div class='add'>+    }</div><div class='add'>+    return i;</div><div class='add'>+}</div><div class='add'>+/*- End of function --------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+static __inline__ int bottom_bit(unsigned int bits)</div><div class='add'>+{</div><div class='add'>+    int i;</div><div class='add'>+</div><div class='add'>+    if (bits == 0)</div><div class='add'>+        return -1;</div><div class='add'>+    i = 32;</div><div class='add'>+    if (bits &amp; 0x0000FFFF)</div><div class='add'>+    {</div><div class='add'>+        bits &amp;= 0x0000FFFF;</div><div class='add'>+        i -= 16;</div><div class='add'>+    }</div><div class='add'>+    if (bits &amp; 0x00FF00FF)</div><div class='add'>+    {</div><div class='add'>+        bits &amp;= 0x00FF00FF;</div><div class='add'>+        i -= 8;</div><div class='add'>+    }</div><div class='add'>+    if (bits &amp; 0x0F0F0F0F)</div><div class='add'>+    {</div><div class='add'>+        bits &amp;= 0x0F0F0F0F;</div><div class='add'>+        i -= 4;</div><div class='add'>+    }</div><div class='add'>+    if (bits &amp; 0x33333333)</div><div class='add'>+    {</div><div class='add'>+        bits &amp;= 0x33333333;</div><div class='add'>+        i -= 2;</div><div class='add'>+    }</div><div class='add'>+    if (bits &amp; 0x55555555)</div><div class='add'>+    {</div><div class='add'>+        bits &amp;= 0x55555555;</div><div class='add'>+        i -= 1;</div><div class='add'>+    }</div><div class='add'>+    return i;</div><div class='add'>+}</div><div class='add'>+/*- End of function --------------------------------------------------------*/</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*! \brief Bit reverse a byte.</div><div class='add'>+    \param data The byte to be reversed.</div><div class='add'>+    \return The bit reversed version of data. */</div><div class='add'>+static __inline__ uint8_t bit_reverse8(uint8_t x)</div><div class='add'>+{</div><div class='add'>+#if defined(__i386__)  ||  defined(__x86_64__)</div><div class='add'>+    /* If multiply is fast */</div><div class='add'>+    return ((x*0x0802U &amp; 0x22110U) | (x*0x8020U &amp; 0x88440U))*0x10101U &gt;&gt; 16;</div><div class='add'>+#else</div><div class='add'>+    /* If multiply is slow, but we have a barrel shifter */</div><div class='add'>+    x = (x &gt;&gt; 4) | (x &lt;&lt; 4);</div><div class='add'>+    x = ((x &amp; 0xCC) &gt;&gt; 2) | ((x &amp; 0x33) &lt;&lt; 2);</div><div class='add'>+    return ((x &amp; 0xAA) &gt;&gt; 1) | ((x &amp; 0x55) &lt;&lt; 1);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+/*- End of function --------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+/*! \brief Bit reverse a 16 bit word.</div><div class='add'>+    \param data The word to be reversed.</div><div class='add'>+    \return The bit reversed version of data. */</div><div class='add'>+uint16_t bit_reverse16(uint16_t data);</div><div class='add'>+</div><div class='add'>+/*! \brief Bit reverse a 32 bit word.</div><div class='add'>+    \param data The word to be reversed.</div><div class='add'>+    \return The bit reversed version of data. */</div><div class='add'>+uint32_t bit_reverse32(uint32_t data);</div><div class='add'>+</div><div class='add'>+/*! \brief Bit reverse each of the four bytes in a 32 bit word.</div><div class='add'>+    \param data The word to be reversed.</div><div class='add'>+    \return The bit reversed version of data. */</div><div class='add'>+uint32_t bit_reverse_4bytes(uint32_t data);</div><div class='add'>+</div><div class='add'>+/*! \brief Find the number of set bits in a 32 bit word.</div><div class='add'>+    \param x The word to be searched.</div><div class='add'>+    \return The number of set bits. */</div><div class='add'>+int one_bits32(uint32_t x);</div><div class='add'>+</div><div class='add'>+/*! \brief Create a mask as wide as the number in a 32 bit word.</div><div class='add'>+    \param x The word to be searched.</div><div class='add'>+    \return The mask. */</div><div class='add'>+uint32_t make_mask32(uint32_t x);</div><div class='add'>+</div><div class='add'>+/*! \brief Create a mask as wide as the number in a 16 bit word.</div><div class='add'>+    \param x The word to be searched.</div><div class='add'>+    \return The mask. */</div><div class='add'>+uint16_t make_mask16(uint16_t x);</div><div class='add'>+</div><div class='add'>+/*! \brief Find the least significant one in a word, and return a word</div><div class='add'>+           with just that bit set.</div><div class='add'>+    \param x The word to be searched.</div><div class='add'>+    \return The word with the single set bit. */</div><div class='add'>+static __inline__ uint32_t least_significant_one32(uint32_t x)</div><div class='add'>+{</div><div class='add'>+    return (x &amp; (-(int32_t) x));</div><div class='add'>+}</div><div class='add'>+/*- End of function --------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+/*! \brief Find the most significant one in a word, and return a word</div><div class='add'>+           with just that bit set.</div><div class='add'>+    \param x The word to be searched.</div><div class='add'>+    \return The word with the single set bit. */</div><div class='add'>+static __inline__ uint32_t most_significant_one32(uint32_t x)</div><div class='add'>+{</div><div class='add'>+#if defined(__i386__)  ||  defined(__x86_64__)</div><div class='add'>+    return 1 &lt;&lt; top_bit(x);</div><div class='add'>+#else</div><div class='add'>+    x = make_mask32(x);</div><div class='add'>+    return (x ^ (x &gt;&gt; 1));</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+/*- End of function --------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+/*! \brief Find the parity of a byte.</div><div class='add'>+    \param x The byte to be checked.</div><div class='add'>+    \return 1 for odd, or 0 for even. */</div><div class='add'>+static __inline__ int parity8(uint8_t x)</div><div class='add'>+{</div><div class='add'>+    x = (x ^ (x &gt;&gt; 4)) &amp; 0x0F;</div><div class='add'>+    return (0x6996 &gt;&gt; x) &amp; 1;</div><div class='add'>+}</div><div class='add'>+/*- End of function --------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+/*! \brief Find the parity of a 16 bit word.</div><div class='add'>+    \param x The word to be checked.</div><div class='add'>+    \return 1 for odd, or 0 for even. */</div><div class='add'>+static __inline__ int parity16(uint16_t x)</div><div class='add'>+{</div><div class='add'>+    x ^= (x &gt;&gt; 8);</div><div class='add'>+    x = (x ^ (x &gt;&gt; 4)) &amp; 0x0F;</div><div class='add'>+    return (0x6996 &gt;&gt; x) &amp; 1;</div><div class='add'>+}</div><div class='add'>+/*- End of function --------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+/*! \brief Find the parity of a 32 bit word.</div><div class='add'>+    \param x The word to be checked.</div><div class='add'>+    \return 1 for odd, or 0 for even. */</div><div class='add'>+static __inline__ int parity32(uint32_t x)</div><div class='add'>+{</div><div class='add'>+    x ^= (x &gt;&gt; 16);</div><div class='add'>+    x ^= (x &gt;&gt; 8);</div><div class='add'>+    x = (x ^ (x &gt;&gt; 4)) &amp; 0x0F;</div><div class='add'>+    return (0x6996 &gt;&gt; x) &amp; 1;</div><div class='add'>+}</div><div class='add'>+/*- End of function --------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+#ifdef __cplusplus</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+/*- End of file ------------------------------------------------------------*/</div><div class='head'>diff --git a/drivers/staging/echo/echo.c b/drivers/staging/echo/echo.c<br/>new file mode 100644<br/>index 000000000000..4a281b14fc58<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/echo/echo.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/echo/echo.c</a></div><div class='hunk'>@@ -0,0 +1,632 @@</div><div class='add'>+/*</div><div class='add'>+ * SpanDSP - a series of DSP components for telephony</div><div class='add'>+ *</div><div class='add'>+ * echo.c - A line echo canceller.  This code is being developed</div><div class='add'>+ *          against and partially complies with G168.</div><div class='add'>+ *</div><div class='add'>+ * Written by Steve Underwood &lt;steveu@coppice.org&gt;</div><div class='add'>+ *         and David Rowe &lt;david_at_rowetel_dot_com&gt;</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2001, 2003 Steve Underwood, 2007 David Rowe</div><div class='add'>+ *</div><div class='add'>+ * Based on a bit from here, a bit from there, eye of toad, ear of</div><div class='add'>+ * bat, 15 years of failed attempts by David and a few fried brain</div><div class='add'>+ * cells.</div><div class='add'>+ *</div><div class='add'>+ * All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2, as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='add'>+ *</div><div class='add'>+ * $Id: echo.c,v 1.20 2006/12/01 18:00:48 steveu Exp $</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*! \file */</div><div class='add'>+</div><div class='add'>+/* Implementation Notes</div><div class='add'>+   David Rowe</div><div class='add'>+   April 2007</div><div class='add'>+</div><div class='add'>+   This code started life as Steve's NLMS algorithm with a tap</div><div class='add'>+   rotation algorithm to handle divergence during double talk.  I</div><div class='add'>+   added a Geigel Double Talk Detector (DTD) [2] and performed some</div><div class='add'>+   G168 tests.  However I had trouble meeting the G168 requirements,</div><div class='add'>+   especially for double talk - there were always cases where my DTD</div><div class='add'>+   failed, for example where near end speech was under the 6dB</div><div class='add'>+   threshold required for declaring double talk.</div><div class='add'>+</div><div class='add'>+   So I tried a two path algorithm [1], which has so far given better</div><div class='add'>+   results.  The original tap rotation/Geigel algorithm is available</div><div class='add'>+   in SVN http://svn.rowetel.com/software/oslec/tags/before_16bit.</div><div class='add'>+   It's probably possible to make it work if some one wants to put some</div><div class='add'>+   serious work into it.</div><div class='add'>+</div><div class='add'>+   At present no special treatment is provided for tones, which</div><div class='add'>+   generally cause NLMS algorithms to diverge.  Initial runs of a</div><div class='add'>+   subset of the G168 tests for tones (e.g ./echo_test 6) show the</div><div class='add'>+   current algorithm is passing OK, which is kind of surprising.  The</div><div class='add'>+   full set of tests needs to be performed to confirm this result.</div><div class='add'>+</div><div class='add'>+   One other interesting change is that I have managed to get the NLMS</div><div class='add'>+   code to work with 16 bit coefficients, rather than the original 32</div><div class='add'>+   bit coefficents.  This reduces the MIPs and storage required.</div><div class='add'>+   I evaulated the 16 bit port using g168_tests.sh and listening tests</div><div class='add'>+   on 4 real-world samples.</div><div class='add'>+</div><div class='add'>+   I also attempted the implementation of a block based NLMS update</div><div class='add'>+   [2] but although this passes g168_tests.sh it didn't converge well</div><div class='add'>+   on the real-world samples.  I have no idea why, perhaps a scaling</div><div class='add'>+   problem.  The block based code is also available in SVN</div><div class='add'>+   http://svn.rowetel.com/software/oslec/tags/before_16bit.  If this</div><div class='add'>+   code can be debugged, it will lead to further reduction in MIPS, as</div><div class='add'>+   the block update code maps nicely onto DSP instruction sets (it's a</div><div class='add'>+   dot product) compared to the current sample-by-sample update.</div><div class='add'>+</div><div class='add'>+   Steve also has some nice notes on echo cancellers in echo.h</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+   References:</div><div class='add'>+</div><div class='add'>+   [1] Ochiai, Areseki, and Ogihara, "Echo Canceller with Two Echo</div><div class='add'>+       Path Models", IEEE Transactions on communications, COM-25,</div><div class='add'>+       No. 6, June</div><div class='add'>+       1977.</div><div class='add'>+       http://www.rowetel.com/images/echo/dual_path_paper.pdf</div><div class='add'>+</div><div class='add'>+   [2] The classic, very useful paper that tells you how to</div><div class='add'>+       actually build a real world echo canceller:</div><div class='add'>+         Messerschmitt, Hedberg, Cole, Haoui, Winship, "Digital Voice</div><div class='add'>+         Echo Canceller with a TMS320020,</div><div class='add'>+         http://www.rowetel.com/images/echo/spra129.pdf</div><div class='add'>+</div><div class='add'>+   [3] I have written a series of blog posts on this work, here is</div><div class='add'>+       Part 1: http://www.rowetel.com/blog/?p=18</div><div class='add'>+</div><div class='add'>+   [4] The source code http://svn.rowetel.com/software/oslec/</div><div class='add'>+</div><div class='add'>+   [5] A nice reference on LMS filters:</div><div class='add'>+         http://en.wikipedia.org/wiki/Least_mean_squares_filter</div><div class='add'>+</div><div class='add'>+   Credits:</div><div class='add'>+</div><div class='add'>+   Thanks to Steve Underwood, Jean-Marc Valin, and Ramakrishnan</div><div class='add'>+   Muthukrishnan for their suggestions and email discussions.  Thanks</div><div class='add'>+   also to those people who collected echo samples for me such as</div><div class='add'>+   Mark, Pawel, and Pavel.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;       /* We're doing kernel work */</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#define malloc(a) kmalloc((a), GFP_KERNEL)</div><div class='add'>+#define free(a) kfree(a)</div><div class='add'>+</div><div class='add'>+#include "bit_operations.h"</div><div class='add'>+#include "echo.h"</div><div class='add'>+</div><div class='add'>+#define MIN_TX_POWER_FOR_ADAPTION   64</div><div class='add'>+#define MIN_RX_POWER_FOR_ADAPTION   64</div><div class='add'>+#define DTD_HANGOVER               600     /* 600 samples, or 75ms     */</div><div class='add'>+#define DC_LOG2BETA                  3     /* log2() of DC filter Beta */</div><div class='add'>+</div><div class='add'>+/*-----------------------------------------------------------------------*\</div><div class='add'>+                               FUNCTIONS</div><div class='add'>+\*-----------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+/* adapting coeffs using the traditional stochastic descent (N)LMS algorithm */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#ifdef __BLACKFIN_ASM__</div><div class='add'>+static void __inline__ lms_adapt_bg(echo_can_state_t *ec, int clean, int shift)</div><div class='add'>+{</div><div class='add'>+    int i, j;</div><div class='add'>+    int offset1;</div><div class='add'>+    int offset2;</div><div class='add'>+    int factor;</div><div class='add'>+    int exp;</div><div class='add'>+    int16_t *phist;</div><div class='add'>+    int n;</div><div class='add'>+</div><div class='add'>+    if (shift &gt; 0)</div><div class='add'>+	factor = clean &lt;&lt; shift;</div><div class='add'>+    else</div><div class='add'>+	factor = clean &gt;&gt; -shift;</div><div class='add'>+</div><div class='add'>+    /* Update the FIR taps */</div><div class='add'>+</div><div class='add'>+    offset2 = ec-&gt;curr_pos;</div><div class='add'>+    offset1 = ec-&gt;taps - offset2;</div><div class='add'>+    phist = &amp;ec-&gt;fir_state_bg.history[offset2];</div><div class='add'>+</div><div class='add'>+    /* st: and en: help us locate the assembler in echo.s */</div><div class='add'>+</div><div class='add'>+    //asm("st:");</div><div class='add'>+    n = ec-&gt;taps;</div><div class='add'>+    for (i = 0, j = offset2;  i &lt; n;  i++, j++)</div><div class='add'>+    {</div><div class='add'>+       exp = *phist++ * factor;</div><div class='add'>+       ec-&gt;fir_taps16[1][i] += (int16_t) ((exp+(1&lt;&lt;14)) &gt;&gt; 15);</div><div class='add'>+    }</div><div class='add'>+    //asm("en:");</div><div class='add'>+</div><div class='add'>+    /* Note the asm for the inner loop above generated by Blackfin gcc</div><div class='add'>+       4.1.1 is pretty good (note even parallel instructions used):</div><div class='add'>+</div><div class='add'>+    	R0 = W [P0++] (X);</div><div class='add'>+	R0 *= R2;</div><div class='add'>+	R0 = R0 + R3 (NS) ||</div><div class='add'>+	R1 = W [P1] (X) ||</div><div class='add'>+	nop;</div><div class='add'>+	R0 &gt;&gt;&gt;= 15;</div><div class='add'>+	R0 = R0 + R1;</div><div class='add'>+	W [P1++] = R0;</div><div class='add'>+</div><div class='add'>+	A block based update algorithm would be much faster but the</div><div class='add'>+	above can't be improved on much.  Every instruction saved in</div><div class='add'>+	the loop above is 2 MIPs/ch!  The for loop above is where the</div><div class='add'>+	Blackfin spends most of it's time - about 17 MIPs/ch measured</div><div class='add'>+	with speedtest.c with 256 taps (32ms).  Write-back and</div><div class='add'>+	Write-through cache gave about the same performance.</div><div class='add'>+    */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+   IDEAS for further optimisation of lms_adapt_bg():</div><div class='add'>+</div><div class='add'>+   1/ The rounding is quite costly.  Could we keep as 32 bit coeffs</div><div class='add'>+   then make filter pluck the MS 16-bits of the coeffs when filtering?</div><div class='add'>+   However this would lower potential optimisation of filter, as I</div><div class='add'>+   think the dual-MAC architecture requires packed 16 bit coeffs.</div><div class='add'>+</div><div class='add'>+   2/ Block based update would be more efficient, as per comments above,</div><div class='add'>+   could use dual MAC architecture.</div><div class='add'>+</div><div class='add'>+   3/ Look for same sample Blackfin LMS code, see if we can get dual-MAC</div><div class='add'>+   packing.</div><div class='add'>+</div><div class='add'>+   4/ Execute the whole e/c in a block of say 20ms rather than sample</div><div class='add'>+   by sample.  Processing a few samples every ms is inefficient.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+static __inline__ void lms_adapt_bg(echo_can_state_t *ec, int clean, int shift)</div><div class='add'>+{</div><div class='add'>+    int i;</div><div class='add'>+</div><div class='add'>+    int offset1;</div><div class='add'>+    int offset2;</div><div class='add'>+    int factor;</div><div class='add'>+    int exp;</div><div class='add'>+</div><div class='add'>+    if (shift &gt; 0)</div><div class='add'>+	factor = clean &lt;&lt; shift;</div><div class='add'>+    else</div><div class='add'>+	factor = clean &gt;&gt; -shift;</div><div class='add'>+</div><div class='add'>+    /* Update the FIR taps */</div><div class='add'>+</div><div class='add'>+    offset2 = ec-&gt;curr_pos;</div><div class='add'>+    offset1 = ec-&gt;taps - offset2;</div><div class='add'>+</div><div class='add'>+    for (i = ec-&gt;taps - 1;  i &gt;= offset1;  i--)</div><div class='add'>+    {</div><div class='add'>+       exp = (ec-&gt;fir_state_bg.history[i - offset1]*factor);</div><div class='add'>+       ec-&gt;fir_taps16[1][i] += (int16_t) ((exp+(1&lt;&lt;14)) &gt;&gt; 15);</div><div class='add'>+    }</div><div class='add'>+    for (  ;  i &gt;= 0;  i--)</div><div class='add'>+    {</div><div class='add'>+       exp = (ec-&gt;fir_state_bg.history[i + offset2]*factor);</div><div class='add'>+       ec-&gt;fir_taps16[1][i] += (int16_t) ((exp+(1&lt;&lt;14)) &gt;&gt; 15);</div><div class='add'>+    }</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*- End of function --------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+echo_can_state_t *echo_can_create(int len, int adaption_mode)</div><div class='add'>+{</div><div class='add'>+    echo_can_state_t *ec;</div><div class='add'>+    int i;</div><div class='add'>+    int j;</div><div class='add'>+</div><div class='add'>+    ec = kmalloc(sizeof(*ec), GFP_KERNEL);</div><div class='add'>+    if (ec == NULL)</div><div class='add'>+        return  NULL;</div><div class='add'>+    memset(ec, 0, sizeof(*ec));</div><div class='add'>+</div><div class='add'>+    ec-&gt;taps = len;</div><div class='add'>+    ec-&gt;log2taps = top_bit(len);</div><div class='add'>+    ec-&gt;curr_pos = ec-&gt;taps - 1;</div><div class='add'>+</div><div class='add'>+    for (i = 0;  i &lt; 2;  i++)</div><div class='add'>+    {</div><div class='add'>+        if ((ec-&gt;fir_taps16[i] = (int16_t *) malloc((ec-&gt;taps)*sizeof(int16_t))) == NULL)</div><div class='add'>+        {</div><div class='add'>+            for (j = 0;  j &lt; i;  j++)</div><div class='add'>+                kfree(ec-&gt;fir_taps16[j]);</div><div class='add'>+            kfree(ec);</div><div class='add'>+            return  NULL;</div><div class='add'>+        }</div><div class='add'>+        memset(ec-&gt;fir_taps16[i], 0, (ec-&gt;taps)*sizeof(int16_t));</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    fir16_create(&amp;ec-&gt;fir_state,</div><div class='add'>+                 ec-&gt;fir_taps16[0],</div><div class='add'>+                 ec-&gt;taps);</div><div class='add'>+    fir16_create(&amp;ec-&gt;fir_state_bg,</div><div class='add'>+                 ec-&gt;fir_taps16[1],</div><div class='add'>+                 ec-&gt;taps);</div><div class='add'>+</div><div class='add'>+    for(i=0; i&lt;5; i++) {</div><div class='add'>+      ec-&gt;xvtx[i] = ec-&gt;yvtx[i] = ec-&gt;xvrx[i] = ec-&gt;yvrx[i] = 0;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    ec-&gt;cng_level = 1000;</div><div class='add'>+    echo_can_adaption_mode(ec, adaption_mode);</div><div class='add'>+</div><div class='add'>+    ec-&gt;snapshot = (int16_t*)malloc(ec-&gt;taps*sizeof(int16_t));</div><div class='add'>+    memset(ec-&gt;snapshot, 0, sizeof(int16_t)*ec-&gt;taps);</div><div class='add'>+</div><div class='add'>+    ec-&gt;cond_met = 0;</div><div class='add'>+    ec-&gt;Pstates = 0;</div><div class='add'>+    ec-&gt;Ltxacc = ec-&gt;Lrxacc = ec-&gt;Lcleanacc = ec-&gt;Lclean_bgacc = 0;</div><div class='add'>+    ec-&gt;Ltx = ec-&gt;Lrx = ec-&gt;Lclean = ec-&gt;Lclean_bg = 0;</div><div class='add'>+    ec-&gt;tx_1 = ec-&gt;tx_2 = ec-&gt;rx_1 = ec-&gt;rx_2 = 0;</div><div class='add'>+    ec-&gt;Lbgn = ec-&gt;Lbgn_acc = 0;</div><div class='add'>+    ec-&gt;Lbgn_upper = 200;</div><div class='add'>+    ec-&gt;Lbgn_upper_acc = ec-&gt;Lbgn_upper &lt;&lt; 13;</div><div class='add'>+</div><div class='add'>+    return  ec;</div><div class='add'>+}</div><div class='add'>+/*- End of function --------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+void echo_can_free(echo_can_state_t *ec)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	fir16_free(&amp;ec-&gt;fir_state);</div><div class='add'>+	fir16_free(&amp;ec-&gt;fir_state_bg);</div><div class='add'>+	for (i = 0;  i &lt; 2;  i++)</div><div class='add'>+		kfree(ec-&gt;fir_taps16[i]);</div><div class='add'>+	kfree(ec-&gt;snapshot);</div><div class='add'>+	kfree(ec);</div><div class='add'>+}</div><div class='add'>+/*- End of function --------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+void echo_can_adaption_mode(echo_can_state_t *ec, int adaption_mode)</div><div class='add'>+{</div><div class='add'>+    ec-&gt;adaption_mode = adaption_mode;</div><div class='add'>+}</div><div class='add'>+/*- End of function --------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+void echo_can_flush(echo_can_state_t *ec)</div><div class='add'>+{</div><div class='add'>+    int i;</div><div class='add'>+</div><div class='add'>+    ec-&gt;Ltxacc = ec-&gt;Lrxacc = ec-&gt;Lcleanacc = ec-&gt;Lclean_bgacc = 0;</div><div class='add'>+    ec-&gt;Ltx = ec-&gt;Lrx = ec-&gt;Lclean = ec-&gt;Lclean_bg = 0;</div><div class='add'>+    ec-&gt;tx_1 = ec-&gt;tx_2 = ec-&gt;rx_1 = ec-&gt;rx_2 = 0;</div><div class='add'>+</div><div class='add'>+    ec-&gt;Lbgn = ec-&gt;Lbgn_acc = 0;</div><div class='add'>+    ec-&gt;Lbgn_upper = 200;</div><div class='add'>+    ec-&gt;Lbgn_upper_acc = ec-&gt;Lbgn_upper &lt;&lt; 13;</div><div class='add'>+</div><div class='add'>+    ec-&gt;nonupdate_dwell = 0;</div><div class='add'>+</div><div class='add'>+    fir16_flush(&amp;ec-&gt;fir_state);</div><div class='add'>+    fir16_flush(&amp;ec-&gt;fir_state_bg);</div><div class='add'>+    ec-&gt;fir_state.curr_pos = ec-&gt;taps - 1;</div><div class='add'>+    ec-&gt;fir_state_bg.curr_pos = ec-&gt;taps - 1;</div><div class='add'>+    for (i = 0;  i &lt; 2;  i++)</div><div class='add'>+        memset(ec-&gt;fir_taps16[i], 0, ec-&gt;taps*sizeof(int16_t));</div><div class='add'>+</div><div class='add'>+    ec-&gt;curr_pos = ec-&gt;taps - 1;</div><div class='add'>+    ec-&gt;Pstates = 0;</div><div class='add'>+}</div><div class='add'>+/*- End of function --------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+void echo_can_snapshot(echo_can_state_t *ec) {</div><div class='add'>+    memcpy(ec-&gt;snapshot, ec-&gt;fir_taps16[0], ec-&gt;taps*sizeof(int16_t));</div><div class='add'>+}</div><div class='add'>+/*- End of function --------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+/* Dual Path Echo Canceller ------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+int16_t echo_can_update(echo_can_state_t *ec, int16_t tx, int16_t rx)</div><div class='add'>+{</div><div class='add'>+    int32_t echo_value;</div><div class='add'>+    int clean_bg;</div><div class='add'>+    int tmp, tmp1;</div><div class='add'>+</div><div class='add'>+    /* Input scaling was found be required to prevent problems when tx</div><div class='add'>+       starts clipping.  Another possible way to handle this would be the</div><div class='add'>+       filter coefficent scaling. */</div><div class='add'>+</div><div class='add'>+    ec-&gt;tx = tx; ec-&gt;rx = rx;</div><div class='add'>+    tx &gt;&gt;=1;</div><div class='add'>+    rx &gt;&gt;=1;</div><div class='add'>+</div><div class='add'>+    /*</div><div class='add'>+       Filter DC, 3dB point is 160Hz (I think), note 32 bit precision required</div><div class='add'>+       otherwise values do not track down to 0. Zero at DC, Pole at (1-Beta)</div><div class='add'>+       only real axis.  Some chip sets (like Si labs) don't need</div><div class='add'>+       this, but something like a $10 X100P card does.  Any DC really slows</div><div class='add'>+       down convergence.</div><div class='add'>+</div><div class='add'>+       Note: removes some low frequency from the signal, this reduces</div><div class='add'>+       the speech quality when listening to samples through headphones</div><div class='add'>+       but may not be obvious through a telephone handset.</div><div class='add'>+</div><div class='add'>+       Note that the 3dB frequency in radians is approx Beta, e.g. for</div><div class='add'>+       Beta = 2^(-3) = 0.125, 3dB freq is 0.125 rads = 159Hz.</div><div class='add'>+    */</div><div class='add'>+</div><div class='add'>+    if (ec-&gt;adaption_mode &amp; ECHO_CAN_USE_RX_HPF) {</div><div class='add'>+      tmp = rx &lt;&lt; 15;</div><div class='add'>+#if 1</div><div class='add'>+        /* Make sure the gain of the HPF is 1.0. This can still saturate a little under</div><div class='add'>+           impulse conditions, and it might roll to 32768 and need clipping on sustained peak</div><div class='add'>+           level signals. However, the scale of such clipping is small, and the error due to</div><div class='add'>+           any saturation should not markedly affect the downstream processing. */</div><div class='add'>+        tmp -= (tmp &gt;&gt; 4);</div><div class='add'>+#endif</div><div class='add'>+      ec-&gt;rx_1 += -(ec-&gt;rx_1&gt;&gt;DC_LOG2BETA) + tmp - ec-&gt;rx_2;</div><div class='add'>+</div><div class='add'>+      /* hard limit filter to prevent clipping.  Note that at this stage</div><div class='add'>+	 rx should be limited to +/- 16383 due to right shift above */</div><div class='add'>+      tmp1 = ec-&gt;rx_1 &gt;&gt; 15;</div><div class='add'>+      if (tmp1 &gt; 16383) tmp1 = 16383;</div><div class='add'>+      if (tmp1 &lt; -16383) tmp1 = -16383;</div><div class='add'>+      rx = tmp1;</div><div class='add'>+      ec-&gt;rx_2 = tmp;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    /* Block average of power in the filter states.  Used for</div><div class='add'>+       adaption power calculation. */</div><div class='add'>+</div><div class='add'>+    {</div><div class='add'>+	int new, old;</div><div class='add'>+</div><div class='add'>+	/* efficient "out with the old and in with the new" algorithm so</div><div class='add'>+	   we don't have to recalculate over the whole block of</div><div class='add'>+	   samples. */</div><div class='add'>+	new = (int)tx * (int)tx;</div><div class='add'>+	old = (int)ec-&gt;fir_state.history[ec-&gt;fir_state.curr_pos] *</div><div class='add'>+              (int)ec-&gt;fir_state.history[ec-&gt;fir_state.curr_pos];</div><div class='add'>+	ec-&gt;Pstates += ((new - old) + (1&lt;&lt;ec-&gt;log2taps)) &gt;&gt; ec-&gt;log2taps;</div><div class='add'>+	if (ec-&gt;Pstates &lt; 0) ec-&gt;Pstates = 0;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    /* Calculate short term average levels using simple single pole IIRs */</div><div class='add'>+</div><div class='add'>+    ec-&gt;Ltxacc += abs(tx) - ec-&gt;Ltx;</div><div class='add'>+    ec-&gt;Ltx = (ec-&gt;Ltxacc + (1&lt;&lt;4)) &gt;&gt; 5;</div><div class='add'>+    ec-&gt;Lrxacc += abs(rx) - ec-&gt;Lrx;</div><div class='add'>+    ec-&gt;Lrx = (ec-&gt;Lrxacc + (1&lt;&lt;4)) &gt;&gt; 5;</div><div class='add'>+</div><div class='add'>+    /* Foreground filter ---------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+    ec-&gt;fir_state.coeffs = ec-&gt;fir_taps16[0];</div><div class='add'>+    echo_value = fir16(&amp;ec-&gt;fir_state, tx);</div><div class='add'>+    ec-&gt;clean = rx - echo_value;</div><div class='add'>+    ec-&gt;Lcleanacc += abs(ec-&gt;clean) - ec-&gt;Lclean;</div><div class='add'>+    ec-&gt;Lclean = (ec-&gt;Lcleanacc + (1&lt;&lt;4)) &gt;&gt; 5;</div><div class='add'>+</div><div class='add'>+    /* Background filter ---------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+    echo_value = fir16(&amp;ec-&gt;fir_state_bg, tx);</div><div class='add'>+    clean_bg = rx - echo_value;</div><div class='add'>+    ec-&gt;Lclean_bgacc += abs(clean_bg) - ec-&gt;Lclean_bg;</div><div class='add'>+    ec-&gt;Lclean_bg = (ec-&gt;Lclean_bgacc + (1&lt;&lt;4)) &gt;&gt; 5;</div><div class='add'>+</div><div class='add'>+    /* Background Filter adaption -----------------------------------------*/</div><div class='add'>+</div><div class='add'>+    /* Almost always adap bg filter, just simple DT and energy</div><div class='add'>+       detection to minimise adaption in cases of strong double talk.</div><div class='add'>+       However this is not critical for the dual path algorithm.</div><div class='add'>+    */</div><div class='add'>+    ec-&gt;factor = 0;</div><div class='add'>+    ec-&gt;shift = 0;</div><div class='add'>+    if ((ec-&gt;nonupdate_dwell == 0)) {</div><div class='add'>+	int   P, logP, shift;</div><div class='add'>+</div><div class='add'>+	/* Determine:</div><div class='add'>+</div><div class='add'>+	   f = Beta * clean_bg_rx/P ------ (1)</div><div class='add'>+</div><div class='add'>+	   where P is the total power in the filter states.</div><div class='add'>+</div><div class='add'>+	   The Boffins have shown that if we obey (1) we converge</div><div class='add'>+	   quickly and avoid instability.</div><div class='add'>+</div><div class='add'>+	   The correct factor f must be in Q30, as this is the fixed</div><div class='add'>+	   point format required by the lms_adapt_bg() function,</div><div class='add'>+	   therefore the scaled version of (1) is:</div><div class='add'>+</div><div class='add'>+	   (2^30) * f  = (2^30) * Beta * clean_bg_rx/P</div><div class='add'>+	       factor  = (2^30) * Beta * clean_bg_rx/P         ----- (2)</div><div class='add'>+</div><div class='add'>+	   We have chosen Beta = 0.25 by experiment, so:</div><div class='add'>+</div><div class='add'>+	       factor  = (2^30) * (2^-2) * clean_bg_rx/P</div><div class='add'>+</div><div class='add'>+                                       (30 - 2 - log2(P))</div><div class='add'>+	       factor  = clean_bg_rx 2                         ----- (3)</div><div class='add'>+</div><div class='add'>+	   To avoid a divide we approximate log2(P) as top_bit(P),</div><div class='add'>+	   which returns the position of the highest non-zero bit in</div><div class='add'>+	   P.  This approximation introduces an error as large as a</div><div class='add'>+	   factor of 2, but the algorithm seems to handle it OK.</div><div class='add'>+</div><div class='add'>+	   Come to think of it a divide may not be a big deal on a</div><div class='add'>+	   modern DSP, so its probably worth checking out the cycles</div><div class='add'>+	   for a divide versus a top_bit() implementation.</div><div class='add'>+	*/</div><div class='add'>+</div><div class='add'>+	P = MIN_TX_POWER_FOR_ADAPTION + ec-&gt;Pstates;</div><div class='add'>+	logP = top_bit(P) + ec-&gt;log2taps;</div><div class='add'>+	shift = 30 - 2 - logP;</div><div class='add'>+	ec-&gt;shift = shift;</div><div class='add'>+</div><div class='add'>+	lms_adapt_bg(ec, clean_bg, shift);</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    /* very simple DTD to make sure we dont try and adapt with strong</div><div class='add'>+       near end speech */</div><div class='add'>+</div><div class='add'>+    ec-&gt;adapt = 0;</div><div class='add'>+    if ((ec-&gt;Lrx &gt; MIN_RX_POWER_FOR_ADAPTION) &amp;&amp; (ec-&gt;Lrx &gt; ec-&gt;Ltx))</div><div class='add'>+	ec-&gt;nonupdate_dwell = DTD_HANGOVER;</div><div class='add'>+    if (ec-&gt;nonupdate_dwell)</div><div class='add'>+	ec-&gt;nonupdate_dwell--;</div><div class='add'>+</div><div class='add'>+    /* Transfer logic ------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+    /* These conditions are from the dual path paper [1], I messed with</div><div class='add'>+       them a bit to improve performance. */</div><div class='add'>+</div><div class='add'>+    if ((ec-&gt;adaption_mode &amp; ECHO_CAN_USE_ADAPTION) &amp;&amp;</div><div class='add'>+	(ec-&gt;nonupdate_dwell == 0) &amp;&amp;</div><div class='add'>+	(8*ec-&gt;Lclean_bg &lt; 7*ec-&gt;Lclean) /* (ec-&gt;Lclean_bg &lt; 0.875*ec-&gt;Lclean) */ &amp;&amp;</div><div class='add'>+	(8*ec-&gt;Lclean_bg &lt; ec-&gt;Ltx)      /* (ec-&gt;Lclean_bg &lt; 0.125*ec-&gt;Ltx)    */ )</div><div class='add'>+    {</div><div class='add'>+	if (ec-&gt;cond_met == 6) {</div><div class='add'>+	    /* BG filter has had better results for 6 consecutive samples */</div><div class='add'>+	    ec-&gt;adapt = 1;</div><div class='add'>+	    memcpy(ec-&gt;fir_taps16[0], ec-&gt;fir_taps16[1], ec-&gt;taps*sizeof(int16_t));</div><div class='add'>+	}</div><div class='add'>+	else</div><div class='add'>+	    ec-&gt;cond_met++;</div><div class='add'>+    }</div><div class='add'>+    else</div><div class='add'>+	ec-&gt;cond_met = 0;</div><div class='add'>+</div><div class='add'>+    /* Non-Linear Processing ---------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+    ec-&gt;clean_nlp = ec-&gt;clean;</div><div class='add'>+    if (ec-&gt;adaption_mode &amp; ECHO_CAN_USE_NLP)</div><div class='add'>+    {</div><div class='add'>+        /* Non-linear processor - a fancy way to say "zap small signals, to avoid</div><div class='add'>+           residual echo due to (uLaw/ALaw) non-linearity in the channel.". */</div><div class='add'>+</div><div class='add'>+      if ((16*ec-&gt;Lclean &lt; ec-&gt;Ltx))</div><div class='add'>+      {</div><div class='add'>+	/* Our e/c has improved echo by at least 24 dB (each factor of 2 is 6dB,</div><div class='add'>+	   so 2*2*2*2=16 is the same as 6+6+6+6=24dB) */</div><div class='add'>+        if (ec-&gt;adaption_mode &amp; ECHO_CAN_USE_CNG)</div><div class='add'>+	{</div><div class='add'>+	    ec-&gt;cng_level = ec-&gt;Lbgn;</div><div class='add'>+</div><div class='add'>+	    /* Very elementary comfort noise generation.  Just random</div><div class='add'>+	       numbers rolled off very vaguely Hoth-like.  DR: This</div><div class='add'>+	       noise doesn't sound quite right to me - I suspect there</div><div class='add'>+	       are some overlfow issues in the filtering as it's too</div><div class='add'>+	       "crackly".  TODO: debug this, maybe just play noise at</div><div class='add'>+	       high level or look at spectrum.</div><div class='add'>+	    */</div><div class='add'>+</div><div class='add'>+	    ec-&gt;cng_rndnum = 1664525U*ec-&gt;cng_rndnum + 1013904223U;</div><div class='add'>+	    ec-&gt;cng_filter = ((ec-&gt;cng_rndnum &amp; 0xFFFF) - 32768 + 5*ec-&gt;cng_filter) &gt;&gt; 3;</div><div class='add'>+	    ec-&gt;clean_nlp = (ec-&gt;cng_filter*ec-&gt;cng_level*8) &gt;&gt; 14;</div><div class='add'>+</div><div class='add'>+        }</div><div class='add'>+        else if (ec-&gt;adaption_mode &amp; ECHO_CAN_USE_CLIP)</div><div class='add'>+	{</div><div class='add'>+	    /* This sounds much better than CNG */</div><div class='add'>+	    if (ec-&gt;clean_nlp &gt; ec-&gt;Lbgn)</div><div class='add'>+	      ec-&gt;clean_nlp = ec-&gt;Lbgn;</div><div class='add'>+	    if (ec-&gt;clean_nlp &lt; -ec-&gt;Lbgn)</div><div class='add'>+	      ec-&gt;clean_nlp = -ec-&gt;Lbgn;</div><div class='add'>+	}</div><div class='add'>+	else</div><div class='add'>+        {</div><div class='add'>+	  /* just mute the residual, doesn't sound very good, used mainly</div><div class='add'>+	     in G168 tests */</div><div class='add'>+          ec-&gt;clean_nlp = 0;</div><div class='add'>+        }</div><div class='add'>+      }</div><div class='add'>+      else {</div><div class='add'>+	  /* Background noise estimator.  I tried a few algorithms</div><div class='add'>+	     here without much luck.  This very simple one seems to</div><div class='add'>+	     work best, we just average the level using a slow (1 sec</div><div class='add'>+	     time const) filter if the current level is less than a</div><div class='add'>+	     (experimentally derived) constant.  This means we dont</div><div class='add'>+	     include high level signals like near end speech.  When</div><div class='add'>+	     combined with CNG or especially CLIP seems to work OK.</div><div class='add'>+	  */</div><div class='add'>+	  if (ec-&gt;Lclean &lt; 40) {</div><div class='add'>+	      ec-&gt;Lbgn_acc += abs(ec-&gt;clean) - ec-&gt;Lbgn;</div><div class='add'>+	      ec-&gt;Lbgn = (ec-&gt;Lbgn_acc + (1&lt;&lt;11)) &gt;&gt; 12;</div><div class='add'>+	  }</div><div class='add'>+       }</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    /* Roll around the taps buffer */</div><div class='add'>+    if (ec-&gt;curr_pos &lt;= 0)</div><div class='add'>+        ec-&gt;curr_pos = ec-&gt;taps;</div><div class='add'>+    ec-&gt;curr_pos--;</div><div class='add'>+</div><div class='add'>+    if (ec-&gt;adaption_mode &amp; ECHO_CAN_DISABLE)</div><div class='add'>+      ec-&gt;clean_nlp = rx;</div><div class='add'>+</div><div class='add'>+    /* Output scaled back up again to match input scaling */</div><div class='add'>+</div><div class='add'>+    return (int16_t) ec-&gt;clean_nlp &lt;&lt; 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*- End of function --------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+/* This function is seperated from the echo canceller is it is usually called</div><div class='add'>+   as part of the tx process.  See rx HP (DC blocking) filter above, it's</div><div class='add'>+   the same design.</div><div class='add'>+</div><div class='add'>+   Some soft phones send speech signals with a lot of low frequency</div><div class='add'>+   energy, e.g. down to 20Hz.  This can make the hybrid non-linear</div><div class='add'>+   which causes the echo canceller to fall over.  This filter can help</div><div class='add'>+   by removing any low frequency before it gets to the tx port of the</div><div class='add'>+   hybrid.</div><div class='add'>+</div><div class='add'>+   It can also help by removing and DC in the tx signal.  DC is bad</div><div class='add'>+   for LMS algorithms.</div><div class='add'>+</div><div class='add'>+   This is one of the classic DC removal filters, adjusted to provide sufficient</div><div class='add'>+   bass rolloff to meet the above requirement to protect hybrids from things that</div><div class='add'>+   upset them. The difference between successive samples produces a lousy HPF, and</div><div class='add'>+   then a suitably placed pole flattens things out. The final result is a nicely</div><div class='add'>+   rolled off bass end. The filtering is implemented with extended fractional</div><div class='add'>+   precision, which noise shapes things, giving very clean DC removal.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+int16_t echo_can_hpf_tx(echo_can_state_t *ec, int16_t tx) {</div><div class='add'>+    int tmp, tmp1;</div><div class='add'>+</div><div class='add'>+    if (ec-&gt;adaption_mode &amp; ECHO_CAN_USE_TX_HPF) {</div><div class='add'>+        tmp = tx &lt;&lt; 15;</div><div class='add'>+#if 1</div><div class='add'>+        /* Make sure the gain of the HPF is 1.0. The first can still saturate a little under</div><div class='add'>+           impulse conditions, and it might roll to 32768 and need clipping on sustained peak</div><div class='add'>+           level signals. However, the scale of such clipping is small, and the error due to</div><div class='add'>+           any saturation should not markedly affect the downstream processing. */</div><div class='add'>+        tmp -= (tmp &gt;&gt; 4);</div><div class='add'>+#endif</div><div class='add'>+        ec-&gt;tx_1 += -(ec-&gt;tx_1&gt;&gt;DC_LOG2BETA) + tmp - ec-&gt;tx_2;</div><div class='add'>+        tmp1 = ec-&gt;tx_1 &gt;&gt; 15;</div><div class='add'>+	if (tmp1 &gt; 32767) tmp1 = 32767;</div><div class='add'>+	if (tmp1 &lt; -32767) tmp1 = -32767;</div><div class='add'>+	tx = tmp1;</div><div class='add'>+        ec-&gt;tx_2 = tmp;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    return tx;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/staging/echo/echo.h b/drivers/staging/echo/echo.h<br/>new file mode 100644<br/>index 000000000000..7a91b4390f3b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/echo/echo.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/echo/echo.h</a></div><div class='hunk'>@@ -0,0 +1,220 @@</div><div class='add'>+/*</div><div class='add'>+ * SpanDSP - a series of DSP components for telephony</div><div class='add'>+ *</div><div class='add'>+ * echo.c - A line echo canceller.  This code is being developed</div><div class='add'>+ *          against and partially complies with G168.</div><div class='add'>+ *</div><div class='add'>+ * Written by Steve Underwood &lt;steveu@coppice.org&gt;</div><div class='add'>+ *         and David Rowe &lt;david_at_rowetel_dot_com&gt;</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2001 Steve Underwood and 2007 David Rowe</div><div class='add'>+ *</div><div class='add'>+ * All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2, as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='add'>+ *</div><div class='add'>+ * $Id: echo.h,v 1.9 2006/10/24 13:45:28 steveu Exp $</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __ECHO_H</div><div class='add'>+#define __ECHO_H</div><div class='add'>+</div><div class='add'>+/*! \page echo_can_page Line echo cancellation for voice</div><div class='add'>+</div><div class='add'>+\section echo_can_page_sec_1 What does it do?</div><div class='add'>+This module aims to provide G.168-2002 compliant echo cancellation, to remove</div><div class='add'>+electrical echoes (e.g. from 2-4 wire hybrids) from voice calls.</div><div class='add'>+</div><div class='add'>+\section echo_can_page_sec_2 How does it work?</div><div class='add'>+The heart of the echo cancellor is FIR filter. This is adapted to match the</div><div class='add'>+echo impulse response of the telephone line. It must be long enough to</div><div class='add'>+adequately cover the duration of that impulse response. The signal transmitted</div><div class='add'>+to the telephone line is passed through the FIR filter. Once the FIR is</div><div class='add'>+properly adapted, the resulting output is an estimate of the echo signal</div><div class='add'>+received from the line. This is subtracted from the received signal. The result</div><div class='add'>+is an estimate of the signal which originated at the far end of the line, free</div><div class='add'>+from echos of our own transmitted signal.</div><div class='add'>+</div><div class='add'>+The least mean squares (LMS) algorithm is attributed to Widrow and Hoff, and</div><div class='add'>+was introduced in 1960. It is the commonest form of filter adaption used in</div><div class='add'>+things like modem line equalisers and line echo cancellers. There it works very</div><div class='add'>+well.  However, it only works well for signals of constant amplitude. It works</div><div class='add'>+very poorly for things like speech echo cancellation, where the signal level</div><div class='add'>+varies widely.  This is quite easy to fix. If the signal level is normalised -</div><div class='add'>+similar to applying AGC - LMS can work as well for a signal of varying</div><div class='add'>+amplitude as it does for a modem signal. This normalised least mean squares</div><div class='add'>+(NLMS) algorithm is the commonest one used for speech echo cancellation. Many</div><div class='add'>+other algorithms exist - e.g. RLS (essentially the same as Kalman filtering),</div><div class='add'>+FAP, etc. Some perform significantly better than NLMS.  However, factors such</div><div class='add'>+as computational complexity and patents favour the use of NLMS.</div><div class='add'>+</div><div class='add'>+A simple refinement to NLMS can improve its performance with speech. NLMS tends</div><div class='add'>+to adapt best to the strongest parts of a signal. If the signal is white noise,</div><div class='add'>+the NLMS algorithm works very well. However, speech has more low frequency than</div><div class='add'>+high frequency content. Pre-whitening (i.e. filtering the signal to flatten its</div><div class='add'>+spectrum) the echo signal improves the adapt rate for speech, and ensures the</div><div class='add'>+final residual signal is not heavily biased towards high frequencies. A very</div><div class='add'>+low complexity filter is adequate for this, so pre-whitening adds little to the</div><div class='add'>+compute requirements of the echo canceller.</div><div class='add'>+</div><div class='add'>+An FIR filter adapted using pre-whitened NLMS performs well, provided certain</div><div class='add'>+conditions are met:</div><div class='add'>+</div><div class='add'>+    - The transmitted signal has poor self-correlation.</div><div class='add'>+    - There is no signal being generated within the environment being</div><div class='add'>+      cancelled.</div><div class='add'>+</div><div class='add'>+The difficulty is that neither of these can be guaranteed.</div><div class='add'>+</div><div class='add'>+If the adaption is performed while transmitting noise (or something fairly</div><div class='add'>+noise like, such as voice) the adaption works very well. If the adaption is</div><div class='add'>+performed while transmitting something highly correlative (typically narrow</div><div class='add'>+band energy such as signalling tones or DTMF), the adaption can go seriously</div><div class='add'>+wrong. The reason is there is only one solution for the adaption on a near</div><div class='add'>+random signal - the impulse response of the line. For a repetitive signal,</div><div class='add'>+there are any number of solutions which converge the adaption, and nothing</div><div class='add'>+guides the adaption to choose the generalised one. Allowing an untrained</div><div class='add'>+canceller to converge on this kind of narrowband energy probably a good thing,</div><div class='add'>+since at least it cancels the tones. Allowing a well converged canceller to</div><div class='add'>+continue converging on such energy is just a way to ruin its generalised</div><div class='add'>+adaption. A narrowband detector is needed, so adapation can be suspended at</div><div class='add'>+appropriate times.</div><div class='add'>+</div><div class='add'>+The adaption process is based on trying to eliminate the received signal. When</div><div class='add'>+there is any signal from within the environment being cancelled it may upset</div><div class='add'>+the adaption process. Similarly, if the signal we are transmitting is small,</div><div class='add'>+noise may dominate and disturb the adaption process. If we can ensure that the</div><div class='add'>+adaption is only performed when we are transmitting a significant signal level,</div><div class='add'>+and the environment is not, things will be OK. Clearly, it is easy to tell when</div><div class='add'>+we are sending a significant signal. Telling, if the environment is generating</div><div class='add'>+a significant signal, and doing it with sufficient speed that the adaption will</div><div class='add'>+not have diverged too much more we stop it, is a little harder.</div><div class='add'>+</div><div class='add'>+The key problem in detecting when the environment is sourcing significant</div><div class='add'>+energy is that we must do this very quickly. Given a reasonably long sample of</div><div class='add'>+the received signal, there are a number of strategies which may be used to</div><div class='add'>+assess whether that signal contains a strong far end component. However, by the</div><div class='add'>+time that assessment is complete the far end signal will have already caused</div><div class='add'>+major mis-convergence in the adaption process. An assessment algorithm is</div><div class='add'>+needed which produces a fairly accurate result from a very short burst of far</div><div class='add'>+end energy.</div><div class='add'>+</div><div class='add'>+\section echo_can_page_sec_3 How do I use it?</div><div class='add'>+The echo cancellor processes both the transmit and receive streams sample by</div><div class='add'>+sample. The processing function is not declared inline. Unfortunately,</div><div class='add'>+cancellation requires many operations per sample, so the call overhead is only</div><div class='add'>+a minor burden.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#include "fir.h"</div><div class='add'>+</div><div class='add'>+/* Mask bits for the adaption mode */</div><div class='add'>+#define ECHO_CAN_USE_ADAPTION	0x01</div><div class='add'>+#define ECHO_CAN_USE_NLP	0x02</div><div class='add'>+#define ECHO_CAN_USE_CNG	0x04</div><div class='add'>+#define ECHO_CAN_USE_CLIP	0x08</div><div class='add'>+#define ECHO_CAN_USE_TX_HPF	0x10</div><div class='add'>+#define ECHO_CAN_USE_RX_HPF	0x20</div><div class='add'>+#define ECHO_CAN_DISABLE	0x40</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    G.168 echo canceller descriptor. This defines the working state for a line</div><div class='add'>+    echo canceller.</div><div class='add'>+*/</div><div class='add'>+typedef struct</div><div class='add'>+{</div><div class='add'>+	int16_t tx,rx;</div><div class='add'>+	int16_t clean;</div><div class='add'>+	int16_t clean_nlp;</div><div class='add'>+</div><div class='add'>+	int nonupdate_dwell;</div><div class='add'>+	int curr_pos;</div><div class='add'>+	int taps;</div><div class='add'>+	int log2taps;</div><div class='add'>+	int adaption_mode;</div><div class='add'>+</div><div class='add'>+	int cond_met;</div><div class='add'>+	int32_t Pstates;</div><div class='add'>+	int16_t adapt;</div><div class='add'>+	int32_t factor;</div><div class='add'>+	int16_t shift;</div><div class='add'>+</div><div class='add'>+	/* Average levels and averaging filter states */</div><div class='add'>+	int Ltxacc, Lrxacc, Lcleanacc, Lclean_bgacc;</div><div class='add'>+	int Ltx, Lrx;</div><div class='add'>+	int Lclean;</div><div class='add'>+	int Lclean_bg;</div><div class='add'>+	int Lbgn, Lbgn_acc, Lbgn_upper, Lbgn_upper_acc;</div><div class='add'>+</div><div class='add'>+	/* foreground and background filter states */</div><div class='add'>+	fir16_state_t fir_state;</div><div class='add'>+	fir16_state_t fir_state_bg;</div><div class='add'>+	int16_t *fir_taps16[2];</div><div class='add'>+</div><div class='add'>+	/* DC blocking filter states */</div><div class='add'>+	int tx_1, tx_2, rx_1, rx_2;</div><div class='add'>+</div><div class='add'>+	/* optional High Pass Filter states */</div><div class='add'>+	int32_t xvtx[5], yvtx[5];</div><div class='add'>+	int32_t xvrx[5], yvrx[5];</div><div class='add'>+</div><div class='add'>+	/* Parameters for the optional Hoth noise generator */</div><div class='add'>+	int cng_level;</div><div class='add'>+	int cng_rndnum;</div><div class='add'>+	int cng_filter;</div><div class='add'>+</div><div class='add'>+	/* snapshot sample of coeffs used for development */</div><div class='add'>+	int16_t *snapshot;</div><div class='add'>+} echo_can_state_t;</div><div class='add'>+</div><div class='add'>+/*! Create a voice echo canceller context.</div><div class='add'>+    \param len The length of the canceller, in samples.</div><div class='add'>+    \return The new canceller context, or NULL if the canceller could not be created.</div><div class='add'>+*/</div><div class='add'>+echo_can_state_t *echo_can_create(int len, int adaption_mode);</div><div class='add'>+</div><div class='add'>+/*! Free a voice echo canceller context.</div><div class='add'>+    \param ec The echo canceller context.</div><div class='add'>+*/</div><div class='add'>+void echo_can_free(echo_can_state_t *ec);</div><div class='add'>+</div><div class='add'>+/*! Flush (reinitialise) a voice echo canceller context.</div><div class='add'>+    \param ec The echo canceller context.</div><div class='add'>+*/</div><div class='add'>+void echo_can_flush(echo_can_state_t *ec);</div><div class='add'>+</div><div class='add'>+/*! Set the adaption mode of a voice echo canceller context.</div><div class='add'>+    \param ec The echo canceller context.</div><div class='add'>+    \param adapt The mode.</div><div class='add'>+*/</div><div class='add'>+void echo_can_adaption_mode(echo_can_state_t *ec, int adaption_mode);</div><div class='add'>+</div><div class='add'>+void echo_can_snapshot(echo_can_state_t *ec);</div><div class='add'>+</div><div class='add'>+/*! Process a sample through a voice echo canceller.</div><div class='add'>+    \param ec The echo canceller context.</div><div class='add'>+    \param tx The transmitted audio sample.</div><div class='add'>+    \param rx The received audio sample.</div><div class='add'>+    \return The clean (echo cancelled) received sample.</div><div class='add'>+*/</div><div class='add'>+int16_t echo_can_update(echo_can_state_t *ec, int16_t tx, int16_t rx);</div><div class='add'>+</div><div class='add'>+/*! Process to high pass filter the tx signal.</div><div class='add'>+    \param ec The echo canceller context.</div><div class='add'>+    \param tx The transmitted auio sample.</div><div class='add'>+    \return The HP filtered transmit sample, send this to your D/A.</div><div class='add'>+*/</div><div class='add'>+int16_t echo_can_hpf_tx(echo_can_state_t *ec, int16_t tx);</div><div class='add'>+</div><div class='add'>+#endif	/* __ECHO_H */</div><div class='head'>diff --git a/drivers/staging/echo/fir.h b/drivers/staging/echo/fir.h<br/>new file mode 100644<br/>index 000000000000..e1bfc4994886<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/echo/fir.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/echo/fir.h</a></div><div class='hunk'>@@ -0,0 +1,369 @@</div><div class='add'>+/*</div><div class='add'>+ * SpanDSP - a series of DSP components for telephony</div><div class='add'>+ *</div><div class='add'>+ * fir.h - General telephony FIR routines</div><div class='add'>+ *</div><div class='add'>+ * Written by Steve Underwood &lt;steveu@coppice.org&gt;</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2002 Steve Underwood</div><div class='add'>+ *</div><div class='add'>+ * All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2, as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='add'>+ *</div><div class='add'>+ * $Id: fir.h,v 1.8 2006/10/24 13:45:28 steveu Exp $</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*! \page fir_page FIR filtering</div><div class='add'>+\section fir_page_sec_1 What does it do?</div><div class='add'>+???.</div><div class='add'>+</div><div class='add'>+\section fir_page_sec_2 How does it work?</div><div class='add'>+???.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#if !defined(_FIR_H_)</div><div class='add'>+#define _FIR_H_</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+   Blackfin NOTES &amp; IDEAS:</div><div class='add'>+</div><div class='add'>+   A simple dot product function is used to implement the filter.  This performs</div><div class='add'>+   just one MAC/cycle which is inefficient but was easy to implement as a first</div><div class='add'>+   pass.  The current Blackfin code also uses an unrolled form of the filter</div><div class='add'>+   history to avoid 0 length hardware loop issues.  This is wasteful of</div><div class='add'>+   memory.</div><div class='add'>+</div><div class='add'>+   Ideas for improvement:</div><div class='add'>+</div><div class='add'>+   1/ Rewrite filter for dual MAC inner loop.  The issue here is handling</div><div class='add'>+   history sample offsets that are 16 bit aligned - the dual MAC needs</div><div class='add'>+   32 bit aligmnent.  There are some good examples in libbfdsp.</div><div class='add'>+</div><div class='add'>+   2/ Use the hardware circular buffer facility tohalve memory usage.</div><div class='add'>+</div><div class='add'>+   3/ Consider using internal memory.</div><div class='add'>+</div><div class='add'>+   Using less memory might also improve speed as cache misses will be</div><div class='add'>+   reduced. A drop in MIPs and memory approaching 50% should be</div><div class='add'>+   possible.</div><div class='add'>+</div><div class='add'>+   The foreground and background filters currenlty use a total of</div><div class='add'>+   about 10 MIPs/ch as measured with speedtest.c on a 256 TAP echo</div><div class='add'>+   can.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#if defined(USE_MMX)  ||  defined(USE_SSE2)</div><div class='add'>+#include "mmx.h"</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    16 bit integer FIR descriptor. This defines the working state for a single</div><div class='add'>+    instance of an FIR filter using 16 bit integer coefficients.</div><div class='add'>+*/</div><div class='add'>+typedef struct</div><div class='add'>+{</div><div class='add'>+	int taps;</div><div class='add'>+	int curr_pos;</div><div class='add'>+	const int16_t *coeffs;</div><div class='add'>+	int16_t *history;</div><div class='add'>+} fir16_state_t;</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    32 bit integer FIR descriptor. This defines the working state for a single</div><div class='add'>+    instance of an FIR filter using 32 bit integer coefficients, and filtering</div><div class='add'>+    16 bit integer data.</div><div class='add'>+*/</div><div class='add'>+typedef struct</div><div class='add'>+{</div><div class='add'>+	int taps;</div><div class='add'>+	int curr_pos;</div><div class='add'>+	const int32_t *coeffs;</div><div class='add'>+	int16_t *history;</div><div class='add'>+} fir32_state_t;</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    Floating point FIR descriptor. This defines the working state for a single</div><div class='add'>+    instance of an FIR filter using floating point coefficients and data.</div><div class='add'>+*/</div><div class='add'>+typedef struct</div><div class='add'>+{</div><div class='add'>+	int taps;</div><div class='add'>+	int curr_pos;</div><div class='add'>+	const float *coeffs;</div><div class='add'>+	float *history;</div><div class='add'>+} fir_float_state_t;</div><div class='add'>+</div><div class='add'>+#ifdef __cplusplus</div><div class='add'>+extern "C" {</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static __inline__ const int16_t *fir16_create(fir16_state_t *fir,</div><div class='add'>+                                              const int16_t *coeffs,</div><div class='add'>+                                              int taps)</div><div class='add'>+{</div><div class='add'>+	fir-&gt;taps = taps;</div><div class='add'>+	fir-&gt;curr_pos = taps - 1;</div><div class='add'>+	fir-&gt;coeffs = coeffs;</div><div class='add'>+#if defined(USE_MMX)  ||  defined(USE_SSE2) || defined(__BLACKFIN_ASM__)</div><div class='add'>+	if ((fir-&gt;history = malloc(2*taps*sizeof(int16_t))))</div><div class='add'>+		memset(fir-&gt;history, 0, 2*taps*sizeof(int16_t));</div><div class='add'>+#else</div><div class='add'>+	if ((fir-&gt;history = (int16_t *) malloc(taps*sizeof(int16_t))))</div><div class='add'>+		memset(fir-&gt;history, 0, taps*sizeof(int16_t));</div><div class='add'>+#endif</div><div class='add'>+	return fir-&gt;history;</div><div class='add'>+}</div><div class='add'>+/*- End of function --------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+static __inline__ void fir16_flush(fir16_state_t *fir)</div><div class='add'>+{</div><div class='add'>+#if defined(USE_MMX)  ||  defined(USE_SSE2) || defined(__BLACKFIN_ASM__)</div><div class='add'>+    memset(fir-&gt;history, 0, 2*fir-&gt;taps*sizeof(int16_t));</div><div class='add'>+#else</div><div class='add'>+    memset(fir-&gt;history, 0, fir-&gt;taps*sizeof(int16_t));</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+/*- End of function --------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+static __inline__ void fir16_free(fir16_state_t *fir)</div><div class='add'>+{</div><div class='add'>+	free(fir-&gt;history);</div><div class='add'>+}</div><div class='add'>+/*- End of function --------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+#ifdef __BLACKFIN_ASM__</div><div class='add'>+static inline int32_t dot_asm(short *x, short *y, int len)</div><div class='add'>+{</div><div class='add'>+   int dot;</div><div class='add'>+</div><div class='add'>+   len--;</div><div class='add'>+</div><div class='add'>+   __asm__</div><div class='add'>+   (</div><div class='add'>+   "I0 = %1;\n\t"</div><div class='add'>+   "I1 = %2;\n\t"</div><div class='add'>+   "A0 = 0;\n\t"</div><div class='add'>+   "R0.L = W[I0++] || R1.L = W[I1++];\n\t"</div><div class='add'>+   "LOOP dot%= LC0 = %3;\n\t"</div><div class='add'>+   "LOOP_BEGIN dot%=;\n\t"</div><div class='add'>+      "A0 += R0.L * R1.L (IS) || R0.L = W[I0++] || R1.L = W[I1++];\n\t"</div><div class='add'>+   "LOOP_END dot%=;\n\t"</div><div class='add'>+   "A0 += R0.L*R1.L (IS);\n\t"</div><div class='add'>+   "R0 = A0;\n\t"</div><div class='add'>+   "%0 = R0;\n\t"</div><div class='add'>+   : "=&amp;d" (dot)</div><div class='add'>+   : "a" (x), "a" (y), "a" (len)</div><div class='add'>+   : "I0", "I1", "A1", "A0", "R0", "R1"</div><div class='add'>+   );</div><div class='add'>+</div><div class='add'>+   return dot;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+/*- End of function --------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+static __inline__ int16_t fir16(fir16_state_t *fir, int16_t sample)</div><div class='add'>+{</div><div class='add'>+    int32_t y;</div><div class='add'>+#if defined(USE_MMX)</div><div class='add'>+    int i;</div><div class='add'>+    mmx_t *mmx_coeffs;</div><div class='add'>+    mmx_t *mmx_hist;</div><div class='add'>+</div><div class='add'>+    fir-&gt;history[fir-&gt;curr_pos] = sample;</div><div class='add'>+    fir-&gt;history[fir-&gt;curr_pos + fir-&gt;taps] = sample;</div><div class='add'>+</div><div class='add'>+    mmx_coeffs = (mmx_t *) fir-&gt;coeffs;</div><div class='add'>+    mmx_hist = (mmx_t *) &amp;fir-&gt;history[fir-&gt;curr_pos];</div><div class='add'>+    i = fir-&gt;taps;</div><div class='add'>+    pxor_r2r(mm4, mm4);</div><div class='add'>+    /* 8 samples per iteration, so the filter must be a multiple of 8 long. */</div><div class='add'>+    while (i &gt; 0)</div><div class='add'>+    {</div><div class='add'>+        movq_m2r(mmx_coeffs[0], mm0);</div><div class='add'>+        movq_m2r(mmx_coeffs[1], mm2);</div><div class='add'>+        movq_m2r(mmx_hist[0], mm1);</div><div class='add'>+        movq_m2r(mmx_hist[1], mm3);</div><div class='add'>+        mmx_coeffs += 2;</div><div class='add'>+        mmx_hist += 2;</div><div class='add'>+        pmaddwd_r2r(mm1, mm0);</div><div class='add'>+        pmaddwd_r2r(mm3, mm2);</div><div class='add'>+        paddd_r2r(mm0, mm4);</div><div class='add'>+        paddd_r2r(mm2, mm4);</div><div class='add'>+        i -= 8;</div><div class='add'>+    }</div><div class='add'>+    movq_r2r(mm4, mm0);</div><div class='add'>+    psrlq_i2r(32, mm0);</div><div class='add'>+    paddd_r2r(mm0, mm4);</div><div class='add'>+    movd_r2m(mm4, y);</div><div class='add'>+    emms();</div><div class='add'>+#elif defined(USE_SSE2)</div><div class='add'>+    int i;</div><div class='add'>+    xmm_t *xmm_coeffs;</div><div class='add'>+    xmm_t *xmm_hist;</div><div class='add'>+</div><div class='add'>+    fir-&gt;history[fir-&gt;curr_pos] = sample;</div><div class='add'>+    fir-&gt;history[fir-&gt;curr_pos + fir-&gt;taps] = sample;</div><div class='add'>+</div><div class='add'>+    xmm_coeffs = (xmm_t *) fir-&gt;coeffs;</div><div class='add'>+    xmm_hist = (xmm_t *) &amp;fir-&gt;history[fir-&gt;curr_pos];</div><div class='add'>+    i = fir-&gt;taps;</div><div class='add'>+    pxor_r2r(xmm4, xmm4);</div><div class='add'>+    /* 16 samples per iteration, so the filter must be a multiple of 16 long. */</div><div class='add'>+    while (i &gt; 0)</div><div class='add'>+    {</div><div class='add'>+        movdqu_m2r(xmm_coeffs[0], xmm0);</div><div class='add'>+        movdqu_m2r(xmm_coeffs[1], xmm2);</div><div class='add'>+        movdqu_m2r(xmm_hist[0], xmm1);</div><div class='add'>+        movdqu_m2r(xmm_hist[1], xmm3);</div><div class='add'>+        xmm_coeffs += 2;</div><div class='add'>+        xmm_hist += 2;</div><div class='add'>+        pmaddwd_r2r(xmm1, xmm0);</div><div class='add'>+        pmaddwd_r2r(xmm3, xmm2);</div><div class='add'>+        paddd_r2r(xmm0, xmm4);</div><div class='add'>+        paddd_r2r(xmm2, xmm4);</div><div class='add'>+        i -= 16;</div><div class='add'>+    }</div><div class='add'>+    movdqa_r2r(xmm4, xmm0);</div><div class='add'>+    psrldq_i2r(8, xmm0);</div><div class='add'>+    paddd_r2r(xmm0, xmm4);</div><div class='add'>+    movdqa_r2r(xmm4, xmm0);</div><div class='add'>+    psrldq_i2r(4, xmm0);</div><div class='add'>+    paddd_r2r(xmm0, xmm4);</div><div class='add'>+    movd_r2m(xmm4, y);</div><div class='add'>+#elif defined(__BLACKFIN_ASM__)</div><div class='add'>+    fir-&gt;history[fir-&gt;curr_pos] = sample;</div><div class='add'>+    fir-&gt;history[fir-&gt;curr_pos + fir-&gt;taps] = sample;</div><div class='add'>+    y = dot_asm((int16_t*)fir-&gt;coeffs, &amp;fir-&gt;history[fir-&gt;curr_pos], fir-&gt;taps);</div><div class='add'>+#else</div><div class='add'>+    int i;</div><div class='add'>+    int offset1;</div><div class='add'>+    int offset2;</div><div class='add'>+</div><div class='add'>+    fir-&gt;history[fir-&gt;curr_pos] = sample;</div><div class='add'>+</div><div class='add'>+    offset2 = fir-&gt;curr_pos;</div><div class='add'>+    offset1 = fir-&gt;taps - offset2;</div><div class='add'>+    y = 0;</div><div class='add'>+    for (i = fir-&gt;taps - 1;  i &gt;= offset1;  i--)</div><div class='add'>+        y += fir-&gt;coeffs[i]*fir-&gt;history[i - offset1];</div><div class='add'>+    for (  ;  i &gt;= 0;  i--)</div><div class='add'>+        y += fir-&gt;coeffs[i]*fir-&gt;history[i + offset2];</div><div class='add'>+#endif</div><div class='add'>+    if (fir-&gt;curr_pos &lt;= 0)</div><div class='add'>+    	fir-&gt;curr_pos = fir-&gt;taps;</div><div class='add'>+    fir-&gt;curr_pos--;</div><div class='add'>+    return (int16_t) (y &gt;&gt; 15);</div><div class='add'>+}</div><div class='add'>+/*- End of function --------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+static __inline__ const int16_t *fir32_create(fir32_state_t *fir,</div><div class='add'>+                                              const int32_t *coeffs,</div><div class='add'>+                                              int taps)</div><div class='add'>+{</div><div class='add'>+    fir-&gt;taps = taps;</div><div class='add'>+    fir-&gt;curr_pos = taps - 1;</div><div class='add'>+    fir-&gt;coeffs = coeffs;</div><div class='add'>+    fir-&gt;history = (int16_t *) malloc(taps*sizeof(int16_t));</div><div class='add'>+    if (fir-&gt;history)</div><div class='add'>+    	memset(fir-&gt;history, '\0', taps*sizeof(int16_t));</div><div class='add'>+    return fir-&gt;history;</div><div class='add'>+}</div><div class='add'>+/*- End of function --------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+static __inline__ void fir32_flush(fir32_state_t *fir)</div><div class='add'>+{</div><div class='add'>+    memset(fir-&gt;history, 0, fir-&gt;taps*sizeof(int16_t));</div><div class='add'>+}</div><div class='add'>+/*- End of function --------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+static __inline__ void fir32_free(fir32_state_t *fir)</div><div class='add'>+{</div><div class='add'>+    free(fir-&gt;history);</div><div class='add'>+}</div><div class='add'>+/*- End of function --------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+static __inline__ int16_t fir32(fir32_state_t *fir, int16_t sample)</div><div class='add'>+{</div><div class='add'>+    int i;</div><div class='add'>+    int32_t y;</div><div class='add'>+    int offset1;</div><div class='add'>+    int offset2;</div><div class='add'>+</div><div class='add'>+    fir-&gt;history[fir-&gt;curr_pos] = sample;</div><div class='add'>+    offset2 = fir-&gt;curr_pos;</div><div class='add'>+    offset1 = fir-&gt;taps - offset2;</div><div class='add'>+    y = 0;</div><div class='add'>+    for (i = fir-&gt;taps - 1;  i &gt;= offset1;  i--)</div><div class='add'>+        y += fir-&gt;coeffs[i]*fir-&gt;history[i - offset1];</div><div class='add'>+    for (  ;  i &gt;= 0;  i--)</div><div class='add'>+        y += fir-&gt;coeffs[i]*fir-&gt;history[i + offset2];</div><div class='add'>+    if (fir-&gt;curr_pos &lt;= 0)</div><div class='add'>+    	fir-&gt;curr_pos = fir-&gt;taps;</div><div class='add'>+    fir-&gt;curr_pos--;</div><div class='add'>+    return (int16_t) (y &gt;&gt; 15);</div><div class='add'>+}</div><div class='add'>+/*- End of function --------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+#ifndef __KERNEL__</div><div class='add'>+static __inline__ const float *fir_float_create(fir_float_state_t *fir,</div><div class='add'>+                                                const float *coeffs,</div><div class='add'>+    	    	    	                        int taps)</div><div class='add'>+{</div><div class='add'>+    fir-&gt;taps = taps;</div><div class='add'>+    fir-&gt;curr_pos = taps - 1;</div><div class='add'>+    fir-&gt;coeffs = coeffs;</div><div class='add'>+    fir-&gt;history = (float *) malloc(taps*sizeof(float));</div><div class='add'>+    if (fir-&gt;history)</div><div class='add'>+        memset(fir-&gt;history, '\0', taps*sizeof(float));</div><div class='add'>+    return fir-&gt;history;</div><div class='add'>+}</div><div class='add'>+/*- End of function --------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+static __inline__ void fir_float_free(fir_float_state_t *fir)</div><div class='add'>+{</div><div class='add'>+    free(fir-&gt;history);</div><div class='add'>+}</div><div class='add'>+/*- End of function --------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+static __inline__ int16_t fir_float(fir_float_state_t *fir, int16_t sample)</div><div class='add'>+{</div><div class='add'>+    int i;</div><div class='add'>+    float y;</div><div class='add'>+    int offset1;</div><div class='add'>+    int offset2;</div><div class='add'>+</div><div class='add'>+    fir-&gt;history[fir-&gt;curr_pos] = sample;</div><div class='add'>+</div><div class='add'>+    offset2 = fir-&gt;curr_pos;</div><div class='add'>+    offset1 = fir-&gt;taps - offset2;</div><div class='add'>+    y = 0;</div><div class='add'>+    for (i = fir-&gt;taps - 1;  i &gt;= offset1;  i--)</div><div class='add'>+        y += fir-&gt;coeffs[i]*fir-&gt;history[i - offset1];</div><div class='add'>+    for (  ;  i &gt;= 0;  i--)</div><div class='add'>+        y += fir-&gt;coeffs[i]*fir-&gt;history[i + offset2];</div><div class='add'>+    if (fir-&gt;curr_pos &lt;= 0)</div><div class='add'>+    	fir-&gt;curr_pos = fir-&gt;taps;</div><div class='add'>+    fir-&gt;curr_pos--;</div><div class='add'>+    return  (int16_t) y;</div><div class='add'>+}</div><div class='add'>+/*- End of function --------------------------------------------------------*/</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef __cplusplus</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+/*- End of file ------------------------------------------------------------*/</div><div class='head'>diff --git a/drivers/staging/echo/mmx.h b/drivers/staging/echo/mmx.h<br/>new file mode 100644<br/>index 000000000000..b5a3964865b6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/echo/mmx.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/echo/mmx.h</a></div><div class='hunk'>@@ -0,0 +1,288 @@</div><div class='add'>+/*</div><div class='add'>+ * mmx.h</div><div class='add'>+ * Copyright (C) 1997-2001 H. Dietz and R. Fisher</div><div class='add'>+ *</div><div class='add'>+ * This file is part of FFmpeg.</div><div class='add'>+ *</div><div class='add'>+ * FFmpeg is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU Lesser General Public</div><div class='add'>+ * License as published by the Free Software Foundation; either</div><div class='add'>+ * version 2.1 of the License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * FFmpeg is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='add'>+ * Lesser General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU Lesser General Public</div><div class='add'>+ * License along with FFmpeg; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA</div><div class='add'>+ */</div><div class='add'>+#ifndef AVCODEC_I386MMX_H</div><div class='add'>+#define AVCODEC_I386MMX_H</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The type of an value that fits in an MMX register (note that long</div><div class='add'>+ * long constant values MUST be suffixed by LL and unsigned long long</div><div class='add'>+ * values by ULL, lest they be truncated by the compiler)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+typedef        union {</div><div class='add'>+        long long               q;      /* Quadword (64-bit) value */</div><div class='add'>+        unsigned long long      uq;     /* Unsigned Quadword */</div><div class='add'>+        int                     d[2];   /* 2 Doubleword (32-bit) values */</div><div class='add'>+        unsigned int            ud[2];  /* 2 Unsigned Doubleword */</div><div class='add'>+        short                   w[4];   /* 4 Word (16-bit) values */</div><div class='add'>+        unsigned short          uw[4];  /* 4 Unsigned Word */</div><div class='add'>+        char                    b[8];   /* 8 Byte (8-bit) values */</div><div class='add'>+        unsigned char           ub[8];  /* 8 Unsigned Byte */</div><div class='add'>+        float                   s[2];   /* Single-precision (32-bit) value */</div><div class='add'>+} mmx_t;        /* On an 8-byte (64-bit) boundary */</div><div class='add'>+</div><div class='add'>+/* SSE registers */</div><div class='add'>+typedef union {</div><div class='add'>+	char b[16];</div><div class='add'>+} xmm_t;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define         mmx_i2r(op,imm,reg) \</div><div class='add'>+        __asm__ __volatile__ (#op " %0, %%" #reg \</div><div class='add'>+                              : /* nothing */ \</div><div class='add'>+                              : "i" (imm) )</div><div class='add'>+</div><div class='add'>+#define         mmx_m2r(op,mem,reg) \</div><div class='add'>+        __asm__ __volatile__ (#op " %0, %%" #reg \</div><div class='add'>+                              : /* nothing */ \</div><div class='add'>+                              : "m" (mem))</div><div class='add'>+</div><div class='add'>+#define         mmx_r2m(op,reg,mem) \</div><div class='add'>+        __asm__ __volatile__ (#op " %%" #reg ", %0" \</div><div class='add'>+                              : "=m" (mem) \</div><div class='add'>+                              : /* nothing */ )</div><div class='add'>+</div><div class='add'>+#define         mmx_r2r(op,regs,regd) \</div><div class='add'>+        __asm__ __volatile__ (#op " %" #regs ", %" #regd)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define         emms() __asm__ __volatile__ ("emms")</div><div class='add'>+</div><div class='add'>+#define         movd_m2r(var,reg)           mmx_m2r (movd, var, reg)</div><div class='add'>+#define         movd_r2m(reg,var)           mmx_r2m (movd, reg, var)</div><div class='add'>+#define         movd_r2r(regs,regd)         mmx_r2r (movd, regs, regd)</div><div class='add'>+</div><div class='add'>+#define         movq_m2r(var,reg)           mmx_m2r (movq, var, reg)</div><div class='add'>+#define         movq_r2m(reg,var)           mmx_r2m (movq, reg, var)</div><div class='add'>+#define         movq_r2r(regs,regd)         mmx_r2r (movq, regs, regd)</div><div class='add'>+</div><div class='add'>+#define         packssdw_m2r(var,reg)       mmx_m2r (packssdw, var, reg)</div><div class='add'>+#define         packssdw_r2r(regs,regd)     mmx_r2r (packssdw, regs, regd)</div><div class='add'>+#define         packsswb_m2r(var,reg)       mmx_m2r (packsswb, var, reg)</div><div class='add'>+#define         packsswb_r2r(regs,regd)     mmx_r2r (packsswb, regs, regd)</div><div class='add'>+</div><div class='add'>+#define         packuswb_m2r(var,reg)       mmx_m2r (packuswb, var, reg)</div><div class='add'>+#define         packuswb_r2r(regs,regd)     mmx_r2r (packuswb, regs, regd)</div><div class='add'>+</div><div class='add'>+#define         paddb_m2r(var,reg)          mmx_m2r (paddb, var, reg)</div><div class='add'>+#define         paddb_r2r(regs,regd)        mmx_r2r (paddb, regs, regd)</div><div class='add'>+#define         paddd_m2r(var,reg)          mmx_m2r (paddd, var, reg)</div><div class='add'>+#define         paddd_r2r(regs,regd)        mmx_r2r (paddd, regs, regd)</div><div class='add'>+#define         paddw_m2r(var,reg)          mmx_m2r (paddw, var, reg)</div><div class='add'>+#define         paddw_r2r(regs,regd)        mmx_r2r (paddw, regs, regd)</div><div class='add'>+</div><div class='add'>+#define         paddsb_m2r(var,reg)         mmx_m2r (paddsb, var, reg)</div><div class='add'>+#define         paddsb_r2r(regs,regd)       mmx_r2r (paddsb, regs, regd)</div><div class='add'>+#define         paddsw_m2r(var,reg)         mmx_m2r (paddsw, var, reg)</div><div class='add'>+#define         paddsw_r2r(regs,regd)       mmx_r2r (paddsw, regs, regd)</div><div class='add'>+</div><div class='add'>+#define         paddusb_m2r(var,reg)        mmx_m2r (paddusb, var, reg)</div><div class='add'>+#define         paddusb_r2r(regs,regd)      mmx_r2r (paddusb, regs, regd)</div><div class='add'>+#define         paddusw_m2r(var,reg)        mmx_m2r (paddusw, var, reg)</div><div class='add'>+#define         paddusw_r2r(regs,regd)      mmx_r2r (paddusw, regs, regd)</div><div class='add'>+</div><div class='add'>+#define         pand_m2r(var,reg)           mmx_m2r (pand, var, reg)</div><div class='add'>+#define         pand_r2r(regs,regd)         mmx_r2r (pand, regs, regd)</div><div class='add'>+</div><div class='add'>+#define         pandn_m2r(var,reg)          mmx_m2r (pandn, var, reg)</div><div class='add'>+#define         pandn_r2r(regs,regd)        mmx_r2r (pandn, regs, regd)</div><div class='add'>+</div><div class='add'>+#define         pcmpeqb_m2r(var,reg)        mmx_m2r (pcmpeqb, var, reg)</div><div class='add'>+#define         pcmpeqb_r2r(regs,regd)      mmx_r2r (pcmpeqb, regs, regd)</div><div class='add'>+#define         pcmpeqd_m2r(var,reg)        mmx_m2r (pcmpeqd, var, reg)</div><div class='add'>+#define         pcmpeqd_r2r(regs,regd)      mmx_r2r (pcmpeqd, regs, regd)</div><div class='add'>+#define         pcmpeqw_m2r(var,reg)        mmx_m2r (pcmpeqw, var, reg)</div><div class='add'>+#define         pcmpeqw_r2r(regs,regd)      mmx_r2r (pcmpeqw, regs, regd)</div><div class='add'>+</div><div class='add'>+#define         pcmpgtb_m2r(var,reg)        mmx_m2r (pcmpgtb, var, reg)</div><div class='add'>+#define         pcmpgtb_r2r(regs,regd)      mmx_r2r (pcmpgtb, regs, regd)</div><div class='add'>+#define         pcmpgtd_m2r(var,reg)        mmx_m2r (pcmpgtd, var, reg)</div><div class='add'>+#define         pcmpgtd_r2r(regs,regd)      mmx_r2r (pcmpgtd, regs, regd)</div><div class='add'>+#define         pcmpgtw_m2r(var,reg)        mmx_m2r (pcmpgtw, var, reg)</div><div class='add'>+#define         pcmpgtw_r2r(regs,regd)      mmx_r2r (pcmpgtw, regs, regd)</div><div class='add'>+</div><div class='add'>+#define         pmaddwd_m2r(var,reg)        mmx_m2r (pmaddwd, var, reg)</div><div class='add'>+#define         pmaddwd_r2r(regs,regd)      mmx_r2r (pmaddwd, regs, regd)</div><div class='add'>+</div><div class='add'>+#define         pmulhw_m2r(var,reg)         mmx_m2r (pmulhw, var, reg)</div><div class='add'>+#define         pmulhw_r2r(regs,regd)       mmx_r2r (pmulhw, regs, regd)</div><div class='add'>+</div><div class='add'>+#define         pmullw_m2r(var,reg)         mmx_m2r (pmullw, var, reg)</div><div class='add'>+#define         pmullw_r2r(regs,regd)       mmx_r2r (pmullw, regs, regd)</div><div class='add'>+</div><div class='add'>+#define         por_m2r(var,reg)            mmx_m2r (por, var, reg)</div><div class='add'>+#define         por_r2r(regs,regd)          mmx_r2r (por, regs, regd)</div><div class='add'>+</div><div class='add'>+#define         pslld_i2r(imm,reg)          mmx_i2r (pslld, imm, reg)</div><div class='add'>+#define         pslld_m2r(var,reg)          mmx_m2r (pslld, var, reg)</div><div class='add'>+#define         pslld_r2r(regs,regd)        mmx_r2r (pslld, regs, regd)</div><div class='add'>+#define         psllq_i2r(imm,reg)          mmx_i2r (psllq, imm, reg)</div><div class='add'>+#define         psllq_m2r(var,reg)          mmx_m2r (psllq, var, reg)</div><div class='add'>+#define         psllq_r2r(regs,regd)        mmx_r2r (psllq, regs, regd)</div><div class='add'>+#define         psllw_i2r(imm,reg)          mmx_i2r (psllw, imm, reg)</div><div class='add'>+#define         psllw_m2r(var,reg)          mmx_m2r (psllw, var, reg)</div><div class='add'>+#define         psllw_r2r(regs,regd)        mmx_r2r (psllw, regs, regd)</div><div class='add'>+</div><div class='add'>+#define         psrad_i2r(imm,reg)          mmx_i2r (psrad, imm, reg)</div><div class='add'>+#define         psrad_m2r(var,reg)          mmx_m2r (psrad, var, reg)</div><div class='add'>+#define         psrad_r2r(regs,regd)        mmx_r2r (psrad, regs, regd)</div><div class='add'>+#define         psraw_i2r(imm,reg)          mmx_i2r (psraw, imm, reg)</div><div class='add'>+#define         psraw_m2r(var,reg)          mmx_m2r (psraw, var, reg)</div><div class='add'>+#define         psraw_r2r(regs,regd)        mmx_r2r (psraw, regs, regd)</div><div class='add'>+</div><div class='add'>+#define         psrld_i2r(imm,reg)          mmx_i2r (psrld, imm, reg)</div><div class='add'>+#define         psrld_m2r(var,reg)          mmx_m2r (psrld, var, reg)</div><div class='add'>+#define         psrld_r2r(regs,regd)        mmx_r2r (psrld, regs, regd)</div><div class='add'>+#define         psrlq_i2r(imm,reg)          mmx_i2r (psrlq, imm, reg)</div><div class='add'>+#define         psrlq_m2r(var,reg)          mmx_m2r (psrlq, var, reg)</div><div class='add'>+#define         psrlq_r2r(regs,regd)        mmx_r2r (psrlq, regs, regd)</div><div class='add'>+#define         psrlw_i2r(imm,reg)          mmx_i2r (psrlw, imm, reg)</div><div class='add'>+#define         psrlw_m2r(var,reg)          mmx_m2r (psrlw, var, reg)</div><div class='add'>+#define         psrlw_r2r(regs,regd)        mmx_r2r (psrlw, regs, regd)</div><div class='add'>+</div><div class='add'>+#define         psubb_m2r(var,reg)          mmx_m2r (psubb, var, reg)</div><div class='add'>+#define         psubb_r2r(regs,regd)        mmx_r2r (psubb, regs, regd)</div><div class='add'>+#define         psubd_m2r(var,reg)          mmx_m2r (psubd, var, reg)</div><div class='add'>+#define         psubd_r2r(regs,regd)        mmx_r2r (psubd, regs, regd)</div><div class='add'>+#define         psubw_m2r(var,reg)          mmx_m2r (psubw, var, reg)</div><div class='add'>+#define         psubw_r2r(regs,regd)        mmx_r2r (psubw, regs, regd)</div><div class='add'>+</div><div class='add'>+#define         psubsb_m2r(var,reg)         mmx_m2r (psubsb, var, reg)</div><div class='add'>+#define         psubsb_r2r(regs,regd)       mmx_r2r (psubsb, regs, regd)</div><div class='add'>+#define         psubsw_m2r(var,reg)         mmx_m2r (psubsw, var, reg)</div><div class='add'>+#define         psubsw_r2r(regs,regd)       mmx_r2r (psubsw, regs, regd)</div><div class='add'>+</div><div class='add'>+#define         psubusb_m2r(var,reg)        mmx_m2r (psubusb, var, reg)</div><div class='add'>+#define         psubusb_r2r(regs,regd)      mmx_r2r (psubusb, regs, regd)</div><div class='add'>+#define         psubusw_m2r(var,reg)        mmx_m2r (psubusw, var, reg)</div><div class='add'>+#define         psubusw_r2r(regs,regd)      mmx_r2r (psubusw, regs, regd)</div><div class='add'>+</div><div class='add'>+#define         punpckhbw_m2r(var,reg)      mmx_m2r (punpckhbw, var, reg)</div><div class='add'>+#define         punpckhbw_r2r(regs,regd)    mmx_r2r (punpckhbw, regs, regd)</div><div class='add'>+#define         punpckhdq_m2r(var,reg)      mmx_m2r (punpckhdq, var, reg)</div><div class='add'>+#define         punpckhdq_r2r(regs,regd)    mmx_r2r (punpckhdq, regs, regd)</div><div class='add'>+#define         punpckhwd_m2r(var,reg)      mmx_m2r (punpckhwd, var, reg)</div><div class='add'>+#define         punpckhwd_r2r(regs,regd)    mmx_r2r (punpckhwd, regs, regd)</div><div class='add'>+</div><div class='add'>+#define         punpcklbw_m2r(var,reg)      mmx_m2r (punpcklbw, var, reg)</div><div class='add'>+#define         punpcklbw_r2r(regs,regd)    mmx_r2r (punpcklbw, regs, regd)</div><div class='add'>+#define         punpckldq_m2r(var,reg)      mmx_m2r (punpckldq, var, reg)</div><div class='add'>+#define         punpckldq_r2r(regs,regd)    mmx_r2r (punpckldq, regs, regd)</div><div class='add'>+#define         punpcklwd_m2r(var,reg)      mmx_m2r (punpcklwd, var, reg)</div><div class='add'>+#define         punpcklwd_r2r(regs,regd)    mmx_r2r (punpcklwd, regs, regd)</div><div class='add'>+</div><div class='add'>+#define         pxor_m2r(var,reg)           mmx_m2r (pxor, var, reg)</div><div class='add'>+#define         pxor_r2r(regs,regd)         mmx_r2r (pxor, regs, regd)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* 3DNOW extensions */</div><div class='add'>+</div><div class='add'>+#define         pavgusb_m2r(var,reg)        mmx_m2r (pavgusb, var, reg)</div><div class='add'>+#define         pavgusb_r2r(regs,regd)      mmx_r2r (pavgusb, regs, regd)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* AMD MMX extensions - also available in intel SSE */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define         mmx_m2ri(op,mem,reg,imm) \</div><div class='add'>+        __asm__ __volatile__ (#op " %1, %0, %%" #reg \</div><div class='add'>+                              : /* nothing */ \</div><div class='add'>+                              : "m" (mem), "i" (imm))</div><div class='add'>+#define         mmx_r2ri(op,regs,regd,imm) \</div><div class='add'>+        __asm__ __volatile__ (#op " %0, %%" #regs ", %%" #regd \</div><div class='add'>+                              : /* nothing */ \</div><div class='add'>+                              : "i" (imm) )</div><div class='add'>+</div><div class='add'>+#define         mmx_fetch(mem,hint) \</div><div class='add'>+        __asm__ __volatile__ ("prefetch" #hint " %0" \</div><div class='add'>+                              : /* nothing */ \</div><div class='add'>+                              : "m" (mem))</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define         maskmovq(regs,maskreg)      mmx_r2ri (maskmovq, regs, maskreg)</div><div class='add'>+</div><div class='add'>+#define         movntq_r2m(mmreg,var)       mmx_r2m (movntq, mmreg, var)</div><div class='add'>+</div><div class='add'>+#define         pavgb_m2r(var,reg)          mmx_m2r (pavgb, var, reg)</div><div class='add'>+#define         pavgb_r2r(regs,regd)        mmx_r2r (pavgb, regs, regd)</div><div class='add'>+#define         pavgw_m2r(var,reg)          mmx_m2r (pavgw, var, reg)</div><div class='add'>+#define         pavgw_r2r(regs,regd)        mmx_r2r (pavgw, regs, regd)</div><div class='add'>+</div><div class='add'>+#define         pextrw_r2r(mmreg,reg,imm)   mmx_r2ri (pextrw, mmreg, reg, imm)</div><div class='add'>+</div><div class='add'>+#define         pinsrw_r2r(reg,mmreg,imm)   mmx_r2ri (pinsrw, reg, mmreg, imm)</div><div class='add'>+</div><div class='add'>+#define         pmaxsw_m2r(var,reg)         mmx_m2r (pmaxsw, var, reg)</div><div class='add'>+#define         pmaxsw_r2r(regs,regd)       mmx_r2r (pmaxsw, regs, regd)</div><div class='add'>+</div><div class='add'>+#define         pmaxub_m2r(var,reg)         mmx_m2r (pmaxub, var, reg)</div><div class='add'>+#define         pmaxub_r2r(regs,regd)       mmx_r2r (pmaxub, regs, regd)</div><div class='add'>+</div><div class='add'>+#define         pminsw_m2r(var,reg)         mmx_m2r (pminsw, var, reg)</div><div class='add'>+#define         pminsw_r2r(regs,regd)       mmx_r2r (pminsw, regs, regd)</div><div class='add'>+</div><div class='add'>+#define         pminub_m2r(var,reg)         mmx_m2r (pminub, var, reg)</div><div class='add'>+#define         pminub_r2r(regs,regd)       mmx_r2r (pminub, regs, regd)</div><div class='add'>+</div><div class='add'>+#define         pmovmskb(mmreg,reg) \</div><div class='add'>+        __asm__ __volatile__ ("movmskps %" #mmreg ", %" #reg)</div><div class='add'>+</div><div class='add'>+#define         pmulhuw_m2r(var,reg)        mmx_m2r (pmulhuw, var, reg)</div><div class='add'>+#define         pmulhuw_r2r(regs,regd)      mmx_r2r (pmulhuw, regs, regd)</div><div class='add'>+</div><div class='add'>+#define         prefetcht0(mem)             mmx_fetch (mem, t0)</div><div class='add'>+#define         prefetcht1(mem)             mmx_fetch (mem, t1)</div><div class='add'>+#define         prefetcht2(mem)             mmx_fetch (mem, t2)</div><div class='add'>+#define         prefetchnta(mem)            mmx_fetch (mem, nta)</div><div class='add'>+</div><div class='add'>+#define         psadbw_m2r(var,reg)         mmx_m2r (psadbw, var, reg)</div><div class='add'>+#define         psadbw_r2r(regs,regd)       mmx_r2r (psadbw, regs, regd)</div><div class='add'>+</div><div class='add'>+#define         pshufw_m2r(var,reg,imm)     mmx_m2ri(pshufw, var, reg, imm)</div><div class='add'>+#define         pshufw_r2r(regs,regd,imm)   mmx_r2ri(pshufw, regs, regd, imm)</div><div class='add'>+</div><div class='add'>+#define         sfence() __asm__ __volatile__ ("sfence\n\t")</div><div class='add'>+</div><div class='add'>+/* SSE2 */</div><div class='add'>+#define         pshufhw_m2r(var,reg,imm)    mmx_m2ri(pshufhw, var, reg, imm)</div><div class='add'>+#define         pshufhw_r2r(regs,regd,imm)  mmx_r2ri(pshufhw, regs, regd, imm)</div><div class='add'>+#define         pshuflw_m2r(var,reg,imm)    mmx_m2ri(pshuflw, var, reg, imm)</div><div class='add'>+#define         pshuflw_r2r(regs,regd,imm)  mmx_r2ri(pshuflw, regs, regd, imm)</div><div class='add'>+</div><div class='add'>+#define         pshufd_r2r(regs,regd,imm)   mmx_r2ri(pshufd, regs, regd, imm)</div><div class='add'>+</div><div class='add'>+#define         movdqa_m2r(var,reg)         mmx_m2r (movdqa, var, reg)</div><div class='add'>+#define         movdqa_r2m(reg,var)         mmx_r2m (movdqa, reg, var)</div><div class='add'>+#define         movdqa_r2r(regs,regd)       mmx_r2r (movdqa, regs, regd)</div><div class='add'>+#define         movdqu_m2r(var,reg)         mmx_m2r (movdqu, var, reg)</div><div class='add'>+#define         movdqu_r2m(reg,var)         mmx_r2m (movdqu, reg, var)</div><div class='add'>+#define         movdqu_r2r(regs,regd)       mmx_r2r (movdqu, regs, regd)</div><div class='add'>+</div><div class='add'>+#define         pmullw_r2m(reg,var)         mmx_r2m (pmullw, reg, var)</div><div class='add'>+</div><div class='add'>+#define         pslldq_i2r(imm,reg)         mmx_i2r (pslldq, imm, reg)</div><div class='add'>+#define         psrldq_i2r(imm,reg)         mmx_i2r (psrldq, imm, reg)</div><div class='add'>+</div><div class='add'>+#define         punpcklqdq_r2r(regs,regd)   mmx_r2r (punpcklqdq, regs, regd)</div><div class='add'>+#define         punpckhqdq_r2r(regs,regd)   mmx_r2r (punpckhqdq, regs, regd)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#endif /* AVCODEC_I386MMX_H */</div><div class='head'>diff --git a/drivers/staging/et131x/Kconfig b/drivers/staging/et131x/Kconfig<br/>new file mode 100644<br/>index 000000000000..e11cf340856a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/et131x/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/et131x/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,18 @@</div><div class='add'>+config ET131X</div><div class='add'>+	tristate "Agere ET-1310 Gigabit Ethernet support"</div><div class='add'>+	depends on NETDEV_1000 &amp;&amp; PCI</div><div class='add'>+	default n</div><div class='add'>+	---help---</div><div class='add'>+	  This driver supports Agere ET-1310 ethernet adapters.</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here. The module</div><div class='add'>+	  will be called et131x.</div><div class='add'>+</div><div class='add'>+config ET131X_DEBUG</div><div class='add'>+	bool "Enable et131x debugging"</div><div class='add'>+	depends on ET131X</div><div class='add'>+	default n</div><div class='add'>+	---help---</div><div class='add'>+	  Say Y for detailed debug information.</div><div class='add'>+</div><div class='add'>+	  If in doubt, say N.</div><div class='head'>diff --git a/drivers/staging/et131x/Makefile b/drivers/staging/et131x/Makefile<br/>new file mode 100644<br/>index 000000000000..3ad571d8a684<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/et131x/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/et131x/Makefile</a></div><div class='hunk'>@@ -0,0 +1,18 @@</div><div class='add'>+#</div><div class='add'>+# Makefile for the Agere ET-131x ethernet driver</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_ET131X) += et131x.o</div><div class='add'>+</div><div class='add'>+et131x-objs :=	et1310_eeprom.o \</div><div class='add'>+		et1310_jagcore.o \</div><div class='add'>+		et1310_mac.o \</div><div class='add'>+		et1310_phy.o \</div><div class='add'>+		et1310_pm.o \</div><div class='add'>+		et1310_rx.o \</div><div class='add'>+		et1310_tx.o \</div><div class='add'>+		et131x_config.o \</div><div class='add'>+		et131x_debug.o \</div><div class='add'>+		et131x_initpci.o \</div><div class='add'>+		et131x_isr.o \</div><div class='add'>+		et131x_netdev.o</div><div class='head'>diff --git a/drivers/staging/et131x/README b/drivers/staging/et131x/README<br/>new file mode 100644<br/>index 000000000000..28752a502312<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/et131x/README?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/et131x/README</a></div><div class='hunk'>@@ -0,0 +1,25 @@</div><div class='add'>+This is a driver for the ET1310 network device.</div><div class='add'>+</div><div class='add'>+Based on the driver found at https://sourceforge.net/projects/et131x/</div><div class='add'>+</div><div class='add'>+Cleaned up immensely by Olaf Hartman &lt;o.hartmann@telovital.com&gt; and Christoph</div><div class='add'>+Hellwig &lt;hch@infradead.org&gt;</div><div class='add'>+</div><div class='add'>+Note, the powermanagement options were removed from the vendor provided</div><div class='add'>+driver as they did not build properly at the time.</div><div class='add'>+</div><div class='add'>+TODO:</div><div class='add'>+	- kernel coding style cleanups</div><div class='add'>+	- forward port for latest network driver changes</div><div class='add'>+	- kill useless typecasts (e.g. in et1310_phy.c)</div><div class='add'>+	- alloc_etherdev is initializing memory with zero?!?</div><div class='add'>+	- add_timer call in et131x_netdev.c is correct?</div><div class='add'>+	- Add power saving functionality (suspend, sleep, resume)</div><div class='add'>+	- Implement a few more kernel Parameter (set mac )</div><div class='add'>+</div><div class='add'>+Please send patches to:</div><div class='add'>+	Greg Kroah-Hartman &lt;gregkh@suse.de&gt;</div><div class='add'>+</div><div class='add'>+And Cc: Olaf Hartmann &lt;o.hartmann@telovital.com&gt; as he has this device and can</div><div class='add'>+test any changes.</div><div class='add'>+</div><div class='head'>diff --git a/drivers/staging/et131x/et1310_address_map.h b/drivers/staging/et131x/et1310_address_map.h<br/>new file mode 100644<br/>index 000000000000..3c85999d64db<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/et131x/et1310_address_map.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/et131x/et1310_address_map.h</a></div><div class='hunk'>@@ -0,0 +1,2399 @@</div><div class='add'>+/*</div><div class='add'>+ * Agere Systems Inc.</div><div class='add'>+ * 10/100/1000 Base-T Ethernet Driver for the ET1301 and ET131x series MACs</div><div class='add'>+ *</div><div class='add'>+ * Copyright © 2005 Agere Systems Inc.</div><div class='add'>+ * All rights reserved.</div><div class='add'>+ *   http://www.agere.com</div><div class='add'>+ *</div><div class='add'>+ *------------------------------------------------------------------------------</div><div class='add'>+ *</div><div class='add'>+ * et1310_address_map.h - Contains the register mapping for the ET1310</div><div class='add'>+ *</div><div class='add'>+ *------------------------------------------------------------------------------</div><div class='add'>+ *</div><div class='add'>+ * SOFTWARE LICENSE</div><div class='add'>+ *</div><div class='add'>+ * This software is provided subject to the following terms and conditions,</div><div class='add'>+ * which you should read carefully before using the software.  Using this</div><div class='add'>+ * software indicates your acceptance of these terms and conditions.  If you do</div><div class='add'>+ * not agree with these terms and conditions, do not use the software.</div><div class='add'>+ *</div><div class='add'>+ * Copyright © 2005 Agere Systems Inc.</div><div class='add'>+ * All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source or binary forms, with or without</div><div class='add'>+ * modifications, are permitted provided that the following conditions are met:</div><div class='add'>+ *</div><div class='add'>+ * . Redistributions of source code must retain the above copyright notice, this</div><div class='add'>+ *    list of conditions and the following Disclaimer as comments in the code as</div><div class='add'>+ *    well as in the documentation and/or other materials provided with the</div><div class='add'>+ *    distribution.</div><div class='add'>+ *</div><div class='add'>+ * . Redistributions in binary form must reproduce the above copyright notice,</div><div class='add'>+ *    this list of conditions and the following Disclaimer in the documentation</div><div class='add'>+ *    and/or other materials provided with the distribution.</div><div class='add'>+ *</div><div class='add'>+ * . Neither the name of Agere Systems Inc. nor the names of the contributors</div><div class='add'>+ *    may be used to endorse or promote products derived from this software</div><div class='add'>+ *    without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ * Disclaimer</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES,</div><div class='add'>+ * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  ANY</div><div class='add'>+ * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN</div><div class='add'>+ * RISK. IN NO EVENT SHALL AGERE SYSTEMS INC. OR CONTRIBUTORS BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, INCLUDING, BUT NOT LIMITED TO, CONTRACT, STRICT</div><div class='add'>+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT</div><div class='add'>+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH</div><div class='add'>+ * DAMAGE.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _ET1310_ADDRESS_MAP_H_</div><div class='add'>+#define _ET1310_ADDRESS_MAP_H_</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* START OF GLOBAL REGISTER ADDRESS MAP */</div><div class='add'>+</div><div class='add'>+typedef union _Q_ADDR_t {</div><div class='add'>+	u32 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u32 unused:22;	// bits 10-31</div><div class='add'>+		u32 addr:10;	// bits 0-9</div><div class='add'>+#else</div><div class='add'>+		u32 addr:10;	// bits 0-9</div><div class='add'>+		u32 unused:22;	// bits 10-31</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} Q_ADDR_t, *PQ_ADDR_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for tx queue start address reg in global address map</div><div class='add'>+ * located at address 0x0000</div><div class='add'>+ * Defined earlier (Q_ADDR_t)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for tx queue end address reg in global address map</div><div class='add'>+ * located at address 0x0004</div><div class='add'>+ * Defined earlier (Q_ADDR_t)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for rx queue start address reg in global address map</div><div class='add'>+ * located at address 0x0008</div><div class='add'>+ * Defined earlier (Q_ADDR_t)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for rx queue end address reg in global address map</div><div class='add'>+ * located at address 0x000C</div><div class='add'>+ * Defined earlier (Q_ADDR_t)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for power management control status reg in global address map</div><div class='add'>+ * located at address 0x0010</div><div class='add'>+ */</div><div class='add'>+typedef union _PM_CSR_t {</div><div class='add'>+	u32 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u32 unused:22;		// bits 10-31</div><div class='add'>+		u32 pm_jagcore_rx_rdy:1;	// bit 9</div><div class='add'>+		u32 pm_jagcore_tx_rdy:1;	// bit 8</div><div class='add'>+		u32 pm_phy_lped_en:1;	// bit 7</div><div class='add'>+		u32 pm_phy_sw_coma:1;	// bit 6</div><div class='add'>+		u32 pm_rxclk_gate:1;	// bit 5</div><div class='add'>+		u32 pm_txclk_gate:1;	// bit 4</div><div class='add'>+		u32 pm_sysclk_gate:1;	// bit 3</div><div class='add'>+		u32 pm_jagcore_rx_en:1;	// bit 2</div><div class='add'>+		u32 pm_jagcore_tx_en:1;	// bit 1</div><div class='add'>+		u32 pm_gigephy_en:1;	// bit 0</div><div class='add'>+#else</div><div class='add'>+		u32 pm_gigephy_en:1;	// bit 0</div><div class='add'>+		u32 pm_jagcore_tx_en:1;	// bit 1</div><div class='add'>+		u32 pm_jagcore_rx_en:1;	// bit 2</div><div class='add'>+		u32 pm_sysclk_gate:1;	// bit 3</div><div class='add'>+		u32 pm_txclk_gate:1;	// bit 4</div><div class='add'>+		u32 pm_rxclk_gate:1;	// bit 5</div><div class='add'>+		u32 pm_phy_sw_coma:1;	// bit 6</div><div class='add'>+		u32 pm_phy_lped_en:1;	// bit 7</div><div class='add'>+		u32 pm_jagcore_tx_rdy:1;	// bit 8</div><div class='add'>+		u32 pm_jagcore_rx_rdy:1;	// bit 9</div><div class='add'>+		u32 unused:22;		// bits 10-31</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} PM_CSR_t, *PPM_CSR_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for interrupt status reg in global address map</div><div class='add'>+ * located at address 0x0018</div><div class='add'>+ */</div><div class='add'>+typedef union _INTERRUPT_t {</div><div class='add'>+	u32 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u32 unused5:11;			// bits 21-31</div><div class='add'>+		u32 slv_timeout:1;			// bit 20</div><div class='add'>+		u32 mac_stat_interrupt:1;		// bit 19</div><div class='add'>+		u32 rxmac_interrupt:1;		// bit 18</div><div class='add'>+		u32 txmac_interrupt:1;		// bit 17</div><div class='add'>+		u32 phy_interrupt:1;		// bit 16</div><div class='add'>+		u32 wake_on_lan:1;			// bit 15</div><div class='add'>+		u32 watchdog_interrupt:1;		// bit 14</div><div class='add'>+		u32 unused4:4;			// bits 10-13</div><div class='add'>+		u32 rxdma_err:1;			// bit 9</div><div class='add'>+		u32 rxdma_pkt_stat_ring_low:1;	// bit 8</div><div class='add'>+		u32 rxdma_fb_ring1_low:1;		// bit 7</div><div class='add'>+		u32 rxdma_fb_ring0_low:1;		// bit 6</div><div class='add'>+		u32 rxdma_xfr_done:1;		// bit 5</div><div class='add'>+		u32 txdma_err:1;			// bit 4</div><div class='add'>+		u32 txdma_isr:1;			// bit 3</div><div class='add'>+		u32 unused3:1;			// bit 2</div><div class='add'>+		u32 unused2:1;			// bit 1</div><div class='add'>+		u32 unused1:1;			// bit 0</div><div class='add'>+#else</div><div class='add'>+		u32 unused1:1;			// bit 0</div><div class='add'>+		u32 unused2:1;			// bit 1</div><div class='add'>+		u32 unused3:1;			// bit 2</div><div class='add'>+		u32 txdma_isr:1;			// bit 3</div><div class='add'>+		u32 txdma_err:1;			// bit 4</div><div class='add'>+		u32 rxdma_xfr_done:1;		// bit 5</div><div class='add'>+		u32 rxdma_fb_ring0_low:1;		// bit 6</div><div class='add'>+		u32 rxdma_fb_ring1_low:1;		// bit 7</div><div class='add'>+		u32 rxdma_pkt_stat_ring_low:1;	// bit 8</div><div class='add'>+		u32 rxdma_err:1;			// bit 9</div><div class='add'>+		u32 unused4:4;			// bits 10-13</div><div class='add'>+		u32 watchdog_interrupt:1;		// bit 14</div><div class='add'>+		u32 wake_on_lan:1;			// bit 15</div><div class='add'>+		u32 phy_interrupt:1;		// bit 16</div><div class='add'>+		u32 txmac_interrupt:1;		// bit 17</div><div class='add'>+		u32 rxmac_interrupt:1;		// bit 18</div><div class='add'>+		u32 mac_stat_interrupt:1;		// bit 19</div><div class='add'>+		u32 slv_timeout:1;			// bit 20</div><div class='add'>+		u32 unused5:11;			// bits 21-31</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} INTERRUPT_t, *PINTERRUPT_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for interrupt mask reg in global address map</div><div class='add'>+ * located at address 0x001C</div><div class='add'>+ * Defined earlier (INTERRUPT_t), but 'watchdog_interrupt' is not used.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for interrupt alias clear mask reg in global address map</div><div class='add'>+ * located at address 0x0020</div><div class='add'>+ * Defined earlier (INTERRUPT_t)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for interrupt status alias reg in global address map</div><div class='add'>+ * located at address 0x0024</div><div class='add'>+ * Defined earlier (INTERRUPT_t)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for software reset reg in global address map</div><div class='add'>+ * located at address 0x0028</div><div class='add'>+ */</div><div class='add'>+typedef union _SW_RESET_t {</div><div class='add'>+	u32 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u32 selfclr_disable:1;	// bit 31</div><div class='add'>+		u32 unused:24;		// bits 7-30</div><div class='add'>+		u32 mmc_sw_reset:1;	// bit 6</div><div class='add'>+		u32 mac_stat_sw_reset:1;	// bit 5</div><div class='add'>+		u32 mac_sw_reset:1;	// bit 4</div><div class='add'>+		u32 rxmac_sw_reset:1;	// bit 3</div><div class='add'>+		u32 txmac_sw_reset:1;	// bit 2</div><div class='add'>+		u32 rxdma_sw_reset:1;	// bit 1</div><div class='add'>+		u32 txdma_sw_reset:1;	// bit 0</div><div class='add'>+#else</div><div class='add'>+		u32 txdma_sw_reset:1;	// bit 0</div><div class='add'>+		u32 rxdma_sw_reset:1;	// bit 1</div><div class='add'>+		u32 txmac_sw_reset:1;	// bit 2</div><div class='add'>+		u32 rxmac_sw_reset:1;	// bit 3</div><div class='add'>+		u32 mac_sw_reset:1;	// bit 4</div><div class='add'>+		u32 mac_stat_sw_reset:1;	// bit 5</div><div class='add'>+		u32 mmc_sw_reset:1;	// bit 6</div><div class='add'>+		u32 unused:24;		// bits 7-30</div><div class='add'>+		u32 selfclr_disable:1;	// bit 31</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} SW_RESET_t, *PSW_RESET_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for SLV Timer reg in global address map</div><div class='add'>+ * located at address 0x002C</div><div class='add'>+ */</div><div class='add'>+typedef union _SLV_TIMER_t {</div><div class='add'>+	u32 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u32 unused:8;	// bits 24-31</div><div class='add'>+		u32 timer_ini:24;	// bits 0-23</div><div class='add'>+#else</div><div class='add'>+		u32 timer_ini:24;	// bits 0-23</div><div class='add'>+		u32 unused:8;	// bits 24-31</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} SLV_TIMER_t, *PSLV_TIMER_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for MSI Configuration reg in global address map</div><div class='add'>+ * located at address 0x0030</div><div class='add'>+ */</div><div class='add'>+typedef union _MSI_CONFIG_t {</div><div class='add'>+	u32 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u32 unused1:13;	// bits 19-31</div><div class='add'>+		u32 msi_tc:3;	// bits 16-18</div><div class='add'>+		u32 unused2:11;	// bits 5-15</div><div class='add'>+		u32 msi_vector:5;	// bits 0-4</div><div class='add'>+#else</div><div class='add'>+		u32 msi_vector:5;	// bits 0-4</div><div class='add'>+		u32 unused2:11;	// bits 5-15</div><div class='add'>+		u32 msi_tc:3;	// bits 16-18</div><div class='add'>+		u32 unused1:13;	// bits 19-31</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} MSI_CONFIG_t, *PMSI_CONFIG_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for Loopback reg in global address map</div><div class='add'>+ * located at address 0x0034</div><div class='add'>+ */</div><div class='add'>+typedef union _LOOPBACK_t {</div><div class='add'>+	u32 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u32 unused:30;		// bits 2-31</div><div class='add'>+		u32 dma_loopback:1;	// bit 1</div><div class='add'>+		u32 mac_loopback:1;	// bit 0</div><div class='add'>+#else</div><div class='add'>+		u32 mac_loopback:1;	// bit 0</div><div class='add'>+		u32 dma_loopback:1;	// bit 1</div><div class='add'>+		u32 unused:30;		// bits 2-31</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} LOOPBACK_t, *PLOOPBACK_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * GLOBAL Module of JAGCore Address Mapping</div><div class='add'>+ * Located at address 0x0000</div><div class='add'>+ */</div><div class='add'>+typedef struct _GLOBAL_t {			// Location:</div><div class='add'>+	Q_ADDR_t txq_start_addr;		//  0x0000</div><div class='add'>+	Q_ADDR_t txq_end_addr;			//  0x0004</div><div class='add'>+	Q_ADDR_t rxq_start_addr;		//  0x0008</div><div class='add'>+	Q_ADDR_t rxq_end_addr;			//  0x000C</div><div class='add'>+	PM_CSR_t pm_csr;			//  0x0010</div><div class='add'>+	u32 unused;				//  0x0014</div><div class='add'>+	INTERRUPT_t int_status;			//  0x0018</div><div class='add'>+	INTERRUPT_t int_mask;			//  0x001C</div><div class='add'>+	INTERRUPT_t int_alias_clr_en;		//  0x0020</div><div class='add'>+	INTERRUPT_t int_status_alias;		//  0x0024</div><div class='add'>+	SW_RESET_t sw_reset;			//  0x0028</div><div class='add'>+	SLV_TIMER_t slv_timer;			//  0x002C</div><div class='add'>+	MSI_CONFIG_t msi_config;		//  0x0030</div><div class='add'>+	LOOPBACK_t loopback;			//  0x0034</div><div class='add'>+	u32 watchdog_timer;			//  0x0038</div><div class='add'>+} GLOBAL_t, *PGLOBAL_t;</div><div class='add'>+</div><div class='add'>+/* END OF GLOBAL REGISTER ADDRESS MAP */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* START OF TXDMA REGISTER ADDRESS MAP */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for txdma control status reg in txdma address map</div><div class='add'>+ * located at address 0x1000</div><div class='add'>+ */</div><div class='add'>+typedef union _TXDMA_CSR_t {</div><div class='add'>+	u32 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u32 unused2:19;		// bits 13-31</div><div class='add'>+		u32 traffic_class:4;	// bits 9-12</div><div class='add'>+		u32 sngl_epkt_mode:1;	// bit 8</div><div class='add'>+		u32 cache_thrshld:4;	// bits 4-7</div><div class='add'>+		u32 unused1:2;		// bits 2-3</div><div class='add'>+		u32 drop_TLP_disable:1;	// bit 1</div><div class='add'>+		u32 halt:1;		// bit 0</div><div class='add'>+#else</div><div class='add'>+		u32 halt:1;		// bit 0</div><div class='add'>+		u32 drop_TLP_disable:1;	// bit 1</div><div class='add'>+		u32 unused1:2;		// bits 2-3</div><div class='add'>+		u32 cache_thrshld:4;	// bits 4-7</div><div class='add'>+		u32 sngl_epkt_mode:1;	// bit 8</div><div class='add'>+		u32 traffic_class:4;	// bits 9-12</div><div class='add'>+		u32 unused2:19;		// bits 13-31</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} TXDMA_CSR_t, *PTXDMA_CSR_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for txdma packet ring base address hi reg in txdma address map</div><div class='add'>+ * located at address 0x1004</div><div class='add'>+ * Defined earlier (u32)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for txdma packet ring base address low reg in txdma address map</div><div class='add'>+ * located at address 0x1008</div><div class='add'>+ * Defined earlier (u32)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for txdma packet ring number of descriptor reg in txdma address</div><div class='add'>+ * map.  Located at address 0x100C</div><div class='add'>+ */</div><div class='add'>+typedef union _TXDMA_PR_NUM_DES_t {</div><div class='add'>+	u32 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u32 unused:22;	// bits 10-31</div><div class='add'>+		u32 pr_ndes:10;	// bits 0-9</div><div class='add'>+#else</div><div class='add'>+		u32 pr_ndes:10;	// bits 0-9</div><div class='add'>+		u32 unused:22;	// bits 10-31</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} TXDMA_PR_NUM_DES_t, *PTXDMA_PR_NUM_DES_t;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+typedef union _DMA10W_t {</div><div class='add'>+	u32 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u32 unused:21;	// bits 11-31</div><div class='add'>+		u32 wrap:1;	// bit 10</div><div class='add'>+		u32 val:10;	// bits 0-9</div><div class='add'>+#else</div><div class='add'>+		u32 val:10;	// bits 0-9</div><div class='add'>+		u32 wrap:1;	// bit 10</div><div class='add'>+		u32 unused:21;	// bits 11-31</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} DMA10W_t, *PDMA10W_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for txdma tx queue write address reg in txdma address map</div><div class='add'>+ * located at address 0x1010</div><div class='add'>+ * Defined earlier (DMA10W_t)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for txdma tx queue write address external reg in txdma address map</div><div class='add'>+ * located at address 0x1014</div><div class='add'>+ * Defined earlier (DMA10W_t)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for txdma tx queue read address reg in txdma address map</div><div class='add'>+ * located at address 0x1018</div><div class='add'>+ * Defined earlier (DMA10W_t)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for txdma status writeback address hi reg in txdma address map</div><div class='add'>+ * located at address 0x101C</div><div class='add'>+ * Defined earlier (u32)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for txdma status writeback address lo reg in txdma address map</div><div class='add'>+ * located at address 0x1020</div><div class='add'>+ * Defined earlier (u32)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for txdma service request reg in txdma address map</div><div class='add'>+ * located at address 0x1024</div><div class='add'>+ * Defined earlier (DMA10W_t)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for txdma service complete reg in txdma address map</div><div class='add'>+ * located at address 0x1028</div><div class='add'>+ * Defined earlier (DMA10W_t)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+typedef union _DMA4W_t {</div><div class='add'>+	u32 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u32 unused:27;	// bits 5-31</div><div class='add'>+		u32 wrap:1;	// bit 4</div><div class='add'>+		u32 val:4;		// bit 0-3</div><div class='add'>+#else</div><div class='add'>+		u32 val:4;		// bits 0-3</div><div class='add'>+		u32 wrap:1;	// bit 4</div><div class='add'>+		u32 unused:27;	// bits 5-31</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} DMA4W_t, *PDMA4W_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for txdma tx descriptor cache read index reg in txdma address map</div><div class='add'>+ * located at address 0x102C</div><div class='add'>+ * Defined earlier (DMA4W_t)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for txdma tx descriptor cache write index reg in txdma address map</div><div class='add'>+ * located at address 0x1030</div><div class='add'>+ * Defined earlier (DMA4W_t)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for txdma error reg in txdma address map</div><div class='add'>+ * located at address 0x1034</div><div class='add'>+ */</div><div class='add'>+typedef union _TXDMA_ERROR_t {</div><div class='add'>+	u32 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u32 unused3:22;		// bits 10-31</div><div class='add'>+		u32 WrbkRewind:1;	// bit 9</div><div class='add'>+		u32 WrbkResend:1;	// bit 8</div><div class='add'>+		u32 unused2:2;		// bits 6-7</div><div class='add'>+		u32 DescrRewind:1;	// bit 5</div><div class='add'>+		u32 DescrResend:1;	// bit 4</div><div class='add'>+		u32 unused1:2;		// bits 2-3</div><div class='add'>+		u32 PyldRewind:1;	// bit 1</div><div class='add'>+		u32 PyldResend:1;	// bit 0</div><div class='add'>+#else</div><div class='add'>+		u32 PyldResend:1;	// bit 0</div><div class='add'>+		u32 PyldRewind:1;	// bit 1</div><div class='add'>+		u32 unused1:2;		// bits 2-3</div><div class='add'>+		u32 DescrResend:1;	// bit 4</div><div class='add'>+		u32 DescrRewind:1;	// bit 5</div><div class='add'>+		u32 unused2:2;		// bits 6-7</div><div class='add'>+		u32 WrbkResend:1;	// bit 8</div><div class='add'>+		u32 WrbkRewind:1;	// bit 9</div><div class='add'>+		u32 unused3:22;		// bits 10-31</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} TXDMA_ERROR_t, *PTXDMA_ERROR_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Tx DMA Module of JAGCore Address Mapping</div><div class='add'>+ * Located at address 0x1000</div><div class='add'>+ */</div><div class='add'>+typedef struct _TXDMA_t {		// Location:</div><div class='add'>+	TXDMA_CSR_t csr;		//  0x1000</div><div class='add'>+	u32 pr_base_hi;			//  0x1004</div><div class='add'>+	u32 pr_base_lo;			//  0x1008</div><div class='add'>+	TXDMA_PR_NUM_DES_t pr_num_des;	//  0x100C</div><div class='add'>+	DMA10W_t txq_wr_addr;		//  0x1010</div><div class='add'>+	DMA10W_t txq_wr_addr_ext;	//  0x1014</div><div class='add'>+	DMA10W_t txq_rd_addr;		//  0x1018</div><div class='add'>+	u32 dma_wb_base_hi;		//  0x101C</div><div class='add'>+	u32 dma_wb_base_lo;		//  0x1020</div><div class='add'>+	DMA10W_t service_request;	//  0x1024</div><div class='add'>+	DMA10W_t service_complete;	//  0x1028</div><div class='add'>+	DMA4W_t cache_rd_index;		//  0x102C</div><div class='add'>+	DMA4W_t cache_wr_index;		//  0x1030</div><div class='add'>+	TXDMA_ERROR_t TxDmaError;	//  0x1034</div><div class='add'>+	u32 DescAbortCount;		//  0x1038</div><div class='add'>+	u32 PayloadAbortCnt;		//  0x103c</div><div class='add'>+	u32 WriteBackAbortCnt;		//  0x1040</div><div class='add'>+	u32 DescTimeoutCnt;		//  0x1044</div><div class='add'>+	u32 PayloadTimeoutCnt;		//  0x1048</div><div class='add'>+	u32 WriteBackTimeoutCnt;	//  0x104c</div><div class='add'>+	u32 DescErrorCount;		//  0x1050</div><div class='add'>+	u32 PayloadErrorCnt;		//  0x1054</div><div class='add'>+	u32 WriteBackErrorCnt;		//  0x1058</div><div class='add'>+	u32 DroppedTLPCount;		//  0x105c</div><div class='add'>+	DMA10W_t NewServiceComplete;	//  0x1060</div><div class='add'>+	u32 EthernetPacketCount;	//  0x1064</div><div class='add'>+} TXDMA_t, *PTXDMA_t;</div><div class='add'>+</div><div class='add'>+/* END OF TXDMA REGISTER ADDRESS MAP */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* START OF RXDMA REGISTER ADDRESS MAP */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for control status reg in rxdma address map</div><div class='add'>+ * Located at address 0x2000</div><div class='add'>+ */</div><div class='add'>+typedef union _RXDMA_CSR_t {</div><div class='add'>+	u32 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u32 unused2:14;		// bits 18-31</div><div class='add'>+		u32 halt_status:1;	// bit 17</div><div class='add'>+		u32 pkt_done_flush:1;	// bit 16</div><div class='add'>+		u32 pkt_drop_disable:1;	// bit 15</div><div class='add'>+		u32 unused1:1;		// bit 14</div><div class='add'>+		u32 fbr1_enable:1;	// bit 13</div><div class='add'>+		u32 fbr1_size:2;	// bits 11-12</div><div class='add'>+		u32 fbr0_enable:1;	// bit 10</div><div class='add'>+		u32 fbr0_size:2;	// bits 8-9</div><div class='add'>+		u32 dma_big_endian:1;	// bit 7</div><div class='add'>+		u32 pkt_big_endian:1;	// bit 6</div><div class='add'>+		u32 psr_big_endian:1;	// bit 5</div><div class='add'>+		u32 fbr_big_endian:1;	// bit 4</div><div class='add'>+		u32 tc:3;		// bits 1-3</div><div class='add'>+		u32 halt:1;		// bit 0</div><div class='add'>+#else</div><div class='add'>+		u32 halt:1;		// bit 0</div><div class='add'>+		u32 tc:3;		// bits 1-3</div><div class='add'>+		u32 fbr_big_endian:1;	// bit 4</div><div class='add'>+		u32 psr_big_endian:1;	// bit 5</div><div class='add'>+		u32 pkt_big_endian:1;	// bit 6</div><div class='add'>+		u32 dma_big_endian:1;	// bit 7</div><div class='add'>+		u32 fbr0_size:2;	// bits 8-9</div><div class='add'>+		u32 fbr0_enable:1;	// bit 10</div><div class='add'>+		u32 fbr1_size:2;	// bits 11-12</div><div class='add'>+		u32 fbr1_enable:1;	// bit 13</div><div class='add'>+		u32 unused1:1;		// bit 14</div><div class='add'>+		u32 pkt_drop_disable:1;	// bit 15</div><div class='add'>+		u32 pkt_done_flush:1;	// bit 16</div><div class='add'>+		u32 halt_status:1;	// bit 17</div><div class='add'>+		u32 unused2:14;		// bits 18-31</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} RXDMA_CSR_t, *PRXDMA_CSR_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for dma writeback lo reg in rxdma address map</div><div class='add'>+ * located at address 0x2004</div><div class='add'>+ * Defined earlier (u32)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for dma writeback hi reg in rxdma address map</div><div class='add'>+ * located at address 0x2008</div><div class='add'>+ * Defined earlier (u32)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for number of packets done reg in rxdma address map</div><div class='add'>+ * located at address 0x200C</div><div class='add'>+ */</div><div class='add'>+typedef union _RXDMA_NUM_PKT_DONE_t {</div><div class='add'>+	u32 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u32 unused:24;	// bits 8-31</div><div class='add'>+		u32 num_done:8;	// bits 0-7</div><div class='add'>+#else</div><div class='add'>+		u32 num_done:8;	// bits 0-7</div><div class='add'>+		u32 unused:24;	// bits 8-31</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} RXDMA_NUM_PKT_DONE_t, *PRXDMA_NUM_PKT_DONE_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for max packet time reg in rxdma address map</div><div class='add'>+ * located at address 0x2010</div><div class='add'>+ */</div><div class='add'>+typedef union _RXDMA_MAX_PKT_TIME_t {</div><div class='add'>+	u32 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u32 unused:14;		// bits 18-31</div><div class='add'>+		u32 time_done:18;	// bits 0-17</div><div class='add'>+#else</div><div class='add'>+		u32 time_done:18;	// bits 0-17</div><div class='add'>+		u32 unused:14;		// bits 18-31</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} RXDMA_MAX_PKT_TIME_t, *PRXDMA_MAX_PKT_TIME_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for rx queue read address reg in rxdma address map</div><div class='add'>+ * located at address 0x2014</div><div class='add'>+ * Defined earlier (DMA10W_t)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for rx queue read address external reg in rxdma address map</div><div class='add'>+ * located at address 0x2018</div><div class='add'>+ * Defined earlier (DMA10W_t)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for rx queue write address reg in rxdma address map</div><div class='add'>+ * located at address 0x201C</div><div class='add'>+ * Defined earlier (DMA10W_t)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for packet status ring base address lo reg in rxdma address map</div><div class='add'>+ * located at address 0x2020</div><div class='add'>+ * Defined earlier (u32)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for packet status ring base address hi reg in rxdma address map</div><div class='add'>+ * located at address 0x2024</div><div class='add'>+ * Defined earlier (u32)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for packet status ring number of descriptors reg in rxdma address</div><div class='add'>+ * map.  Located at address 0x2028</div><div class='add'>+ */</div><div class='add'>+typedef union _RXDMA_PSR_NUM_DES_t {</div><div class='add'>+	u32 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u32 unused:20;		// bits 12-31</div><div class='add'>+		u32 psr_ndes:12;	// bit 0-11</div><div class='add'>+#else</div><div class='add'>+		u32 psr_ndes:12;	// bit 0-11</div><div class='add'>+		u32 unused:20;		// bits 12-31</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} RXDMA_PSR_NUM_DES_t, *PRXDMA_PSR_NUM_DES_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for packet status ring available offset reg in rxdma address map</div><div class='add'>+ * located at address 0x202C</div><div class='add'>+ */</div><div class='add'>+typedef union _RXDMA_PSR_AVAIL_OFFSET_t {</div><div class='add'>+	u32 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u32 unused:19;		// bits 13-31</div><div class='add'>+		u32 psr_avail_wrap:1;	// bit 12</div><div class='add'>+		u32 psr_avail:12;	// bit 0-11</div><div class='add'>+#else</div><div class='add'>+		u32 psr_avail:12;	// bit 0-11</div><div class='add'>+		u32 psr_avail_wrap:1;	// bit 12</div><div class='add'>+		u32 unused:19;		// bits 13-31</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} RXDMA_PSR_AVAIL_OFFSET_t, *PRXDMA_PSR_AVAIL_OFFSET_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for packet status ring full offset reg in rxdma address map</div><div class='add'>+ * located at address 0x2030</div><div class='add'>+ */</div><div class='add'>+typedef union _RXDMA_PSR_FULL_OFFSET_t {</div><div class='add'>+	u32 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u32 unused:19;		// bits 13-31</div><div class='add'>+		u32 psr_full_wrap:1;	// bit 12</div><div class='add'>+		u32 psr_full:12;	// bit 0-11</div><div class='add'>+#else</div><div class='add'>+		u32 psr_full:12;	// bit 0-11</div><div class='add'>+		u32 psr_full_wrap:1;	// bit 12</div><div class='add'>+		u32 unused:19;		// bits 13-31</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} RXDMA_PSR_FULL_OFFSET_t, *PRXDMA_PSR_FULL_OFFSET_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for packet status ring access index reg in rxdma address map</div><div class='add'>+ * located at address 0x2034</div><div class='add'>+ */</div><div class='add'>+typedef union _RXDMA_PSR_ACCESS_INDEX_t {</div><div class='add'>+	u32 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u32 unused:27;	// bits 5-31</div><div class='add'>+		u32 psr_ai:5;	// bits 0-4</div><div class='add'>+#else</div><div class='add'>+		u32 psr_ai:5;	// bits 0-4</div><div class='add'>+		u32 unused:27;	// bits 5-31</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} RXDMA_PSR_ACCESS_INDEX_t, *PRXDMA_PSR_ACCESS_INDEX_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for packet status ring minimum descriptors reg in rxdma address</div><div class='add'>+ * map.  Located at address 0x2038</div><div class='add'>+ */</div><div class='add'>+typedef union _RXDMA_PSR_MIN_DES_t {</div><div class='add'>+	u32 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u32 unused:20;	// bits 12-31</div><div class='add'>+		u32 psr_min:12;	// bits 0-11</div><div class='add'>+#else</div><div class='add'>+		u32 psr_min:12;	// bits 0-11</div><div class='add'>+		u32 unused:20;	// bits 12-31</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} RXDMA_PSR_MIN_DES_t, *PRXDMA_PSR_MIN_DES_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for free buffer ring base lo address reg in rxdma address map</div><div class='add'>+ * located at address 0x203C</div><div class='add'>+ * Defined earlier (u32)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for free buffer ring base hi address reg in rxdma address map</div><div class='add'>+ * located at address 0x2040</div><div class='add'>+ * Defined earlier (u32)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for free buffer ring number of descriptors reg in rxdma address</div><div class='add'>+ * map.  Located at address 0x2044</div><div class='add'>+ */</div><div class='add'>+typedef union _RXDMA_FBR_NUM_DES_t {</div><div class='add'>+	u32 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u32 unused:22;		// bits 10-31</div><div class='add'>+		u32 fbr_ndesc:10;	// bits 0-9</div><div class='add'>+#else</div><div class='add'>+		u32 fbr_ndesc:10;	// bits 0-9</div><div class='add'>+		u32 unused:22;		// bits 10-31</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} RXDMA_FBR_NUM_DES_t, *PRXDMA_FBR_NUM_DES_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for free buffer ring 0 available offset reg in rxdma address map</div><div class='add'>+ * located at address 0x2048</div><div class='add'>+ * Defined earlier (DMA10W_t)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for free buffer ring 0 full offset reg in rxdma address map</div><div class='add'>+ * located at address 0x204C</div><div class='add'>+ * Defined earlier (DMA10W_t)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for free buffer cache 0 full offset reg in rxdma address map</div><div class='add'>+ * located at address 0x2050</div><div class='add'>+ */</div><div class='add'>+typedef union _RXDMA_FBC_RD_INDEX_t {</div><div class='add'>+	u32 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u32 unused:27;	// bits 5-31</div><div class='add'>+		u32 fbc_rdi:5;	// bit 0-4</div><div class='add'>+#else</div><div class='add'>+		u32 fbc_rdi:5;	// bit 0-4</div><div class='add'>+		u32 unused:27;	// bits 5-31</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} RXDMA_FBC_RD_INDEX_t, *PRXDMA_FBC_RD_INDEX_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for free buffer ring 0 minimum descriptor reg in rxdma address map</div><div class='add'>+ * located at address 0x2054</div><div class='add'>+ */</div><div class='add'>+typedef union _RXDMA_FBR_MIN_DES_t {</div><div class='add'>+	u32 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u32 unused:22;	// bits 10-31</div><div class='add'>+		u32 fbr_min:10;	// bits 0-9</div><div class='add'>+#else</div><div class='add'>+		u32 fbr_min:10;	// bits 0-9</div><div class='add'>+		u32 unused:22;	// bits 10-31</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} RXDMA_FBR_MIN_DES_t, *PRXDMA_FBR_MIN_DES_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for free buffer ring 1 base address lo reg in rxdma address map</div><div class='add'>+ * located at address 0x2058 - 0x205C</div><div class='add'>+ * Defined earlier (RXDMA_FBR_BASE_LO_t and RXDMA_FBR_BASE_HI_t)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for free buffer ring 1 number of descriptors reg in rxdma address</div><div class='add'>+ * map.  Located at address 0x2060</div><div class='add'>+ * Defined earlier (RXDMA_FBR_NUM_DES_t)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for free buffer ring 1 available offset reg in rxdma address map</div><div class='add'>+ * located at address 0x2064</div><div class='add'>+ * Defined Earlier (RXDMA_FBR_AVAIL_OFFSET_t)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for free buffer ring 1 full offset reg in rxdma address map</div><div class='add'>+ * located at address 0x2068</div><div class='add'>+ * Defined Earlier (RXDMA_FBR_FULL_OFFSET_t)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for free buffer cache 1 read index reg in rxdma address map</div><div class='add'>+ * located at address 0x206C</div><div class='add'>+ * Defined Earlier (RXDMA_FBC_RD_INDEX_t)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for free buffer ring 1 minimum descriptor reg in rxdma address map</div><div class='add'>+ * located at address 0x2070</div><div class='add'>+ * Defined Earlier (RXDMA_FBR_MIN_DES_t)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Rx DMA Module of JAGCore Address Mapping</div><div class='add'>+ * Located at address 0x2000</div><div class='add'>+ */</div><div class='add'>+typedef struct _RXDMA_t {				// Location:</div><div class='add'>+	RXDMA_CSR_t csr;				//  0x2000</div><div class='add'>+	u32 dma_wb_base_lo;				//  0x2004</div><div class='add'>+	u32 dma_wb_base_hi;				//  0x2008</div><div class='add'>+	RXDMA_NUM_PKT_DONE_t num_pkt_done;		//  0x200C</div><div class='add'>+	RXDMA_MAX_PKT_TIME_t max_pkt_time;		//  0x2010</div><div class='add'>+	DMA10W_t rxq_rd_addr;				//  0x2014</div><div class='add'>+	DMA10W_t rxq_rd_addr_ext;			//  0x2018</div><div class='add'>+	DMA10W_t rxq_wr_addr;				//  0x201C</div><div class='add'>+	u32 psr_base_lo;				//  0x2020</div><div class='add'>+	u32 psr_base_hi;				//  0x2024</div><div class='add'>+	RXDMA_PSR_NUM_DES_t psr_num_des;		//  0x2028</div><div class='add'>+	RXDMA_PSR_AVAIL_OFFSET_t psr_avail_offset;	//  0x202C</div><div class='add'>+	RXDMA_PSR_FULL_OFFSET_t psr_full_offset;	//  0x2030</div><div class='add'>+	RXDMA_PSR_ACCESS_INDEX_t psr_access_index;	//  0x2034</div><div class='add'>+	RXDMA_PSR_MIN_DES_t psr_min_des;		//  0x2038</div><div class='add'>+	u32 fbr0_base_lo;				//  0x203C</div><div class='add'>+	u32 fbr0_base_hi;				//  0x2040</div><div class='add'>+	RXDMA_FBR_NUM_DES_t fbr0_num_des;		//  0x2044</div><div class='add'>+	DMA10W_t fbr0_avail_offset;			//  0x2048</div><div class='add'>+	DMA10W_t fbr0_full_offset;			//  0x204C</div><div class='add'>+	RXDMA_FBC_RD_INDEX_t fbr0_rd_index;		//  0x2050</div><div class='add'>+	RXDMA_FBR_MIN_DES_t fbr0_min_des;		//  0x2054</div><div class='add'>+	u32 fbr1_base_lo;				//  0x2058</div><div class='add'>+	u32 fbr1_base_hi;				//  0x205C</div><div class='add'>+	RXDMA_FBR_NUM_DES_t fbr1_num_des;		//  0x2060</div><div class='add'>+	DMA10W_t fbr1_avail_offset;			//  0x2064</div><div class='add'>+	DMA10W_t fbr1_full_offset;			//  0x2068</div><div class='add'>+	RXDMA_FBC_RD_INDEX_t fbr1_rd_index;		//  0x206C</div><div class='add'>+	RXDMA_FBR_MIN_DES_t fbr1_min_des;		//  0x2070</div><div class='add'>+} RXDMA_t, *PRXDMA_t;</div><div class='add'>+</div><div class='add'>+/* END OF RXDMA REGISTER ADDRESS MAP */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* START OF TXMAC REGISTER ADDRESS MAP */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for control reg in txmac address map</div><div class='add'>+ * located at address 0x3000</div><div class='add'>+ */</div><div class='add'>+typedef union _TXMAC_CTL_t {</div><div class='add'>+	u32 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u32 unused:24;		// bits 8-31</div><div class='add'>+		u32 cklseg_diable:1;	// bit 7</div><div class='add'>+		u32 ckbcnt_disable:1;	// bit 6</div><div class='add'>+		u32 cksegnum:1;		// bit 5</div><div class='add'>+		u32 async_disable:1;	// bit 4</div><div class='add'>+		u32 fc_disable:1;	// bit 3</div><div class='add'>+		u32 mcif_disable:1;	// bit 2</div><div class='add'>+		u32 mif_disable:1;	// bit 1</div><div class='add'>+		u32 txmac_en:1;		// bit 0</div><div class='add'>+#else</div><div class='add'>+		u32 txmac_en:1;		// bit 0</div><div class='add'>+		u32 mif_disable:1;	// bit 1 mac interface</div><div class='add'>+		u32 mcif_disable:1;	// bit 2 mem. contr. interface</div><div class='add'>+		u32 fc_disable:1;	// bit 3</div><div class='add'>+		u32 async_disable:1;	// bit 4</div><div class='add'>+		u32 cksegnum:1;		// bit 5</div><div class='add'>+		u32 ckbcnt_disable:1;	// bit 6</div><div class='add'>+		u32 cklseg_diable:1;	// bit 7</div><div class='add'>+		u32 unused:24;		// bits 8-31</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} TXMAC_CTL_t, *PTXMAC_CTL_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for shadow pointer reg in txmac address map</div><div class='add'>+ * located at address 0x3004</div><div class='add'>+ */</div><div class='add'>+typedef union _TXMAC_SHADOW_PTR_t {</div><div class='add'>+	u32 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u32 reserved2:5;	// bits 27-31</div><div class='add'>+		u32 txq_rd_ptr:11;	// bits 16-26</div><div class='add'>+		u32 reserved:5;		// bits 11-15</div><div class='add'>+		u32 txq_wr_ptr:11;	// bits 0-10</div><div class='add'>+#else</div><div class='add'>+		u32 txq_wr_ptr:11;	// bits 0-10</div><div class='add'>+		u32 reserved:5;		// bits 11-15</div><div class='add'>+		u32 txq_rd_ptr:11;	// bits 16-26</div><div class='add'>+		u32 reserved2:5;	// bits 27-31</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} TXMAC_SHADOW_PTR_t, *PTXMAC_SHADOW_PTR_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for error count reg in txmac address map</div><div class='add'>+ * located at address 0x3008</div><div class='add'>+ */</div><div class='add'>+typedef union _TXMAC_ERR_CNT_t {</div><div class='add'>+	u32 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u32 unused:20;		// bits 12-31</div><div class='add'>+		u32 reserved:4;		// bits 8-11</div><div class='add'>+		u32 txq_underrun:4;	// bits 4-7</div><div class='add'>+		u32 fifo_underrun:4;	// bits 0-3</div><div class='add'>+#else</div><div class='add'>+		u32 fifo_underrun:4;	// bits 0-3</div><div class='add'>+		u32 txq_underrun:4;	// bits 4-7</div><div class='add'>+		u32 reserved:4;		// bits 8-11</div><div class='add'>+		u32 unused:20;		// bits 12-31</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} TXMAC_ERR_CNT_t, *PTXMAC_ERR_CNT_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for max fill reg in txmac address map</div><div class='add'>+ * located at address 0x300C</div><div class='add'>+ */</div><div class='add'>+typedef union _TXMAC_MAX_FILL_t {</div><div class='add'>+	u32 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u32 unused:20;		// bits 12-31</div><div class='add'>+		u32 max_fill:12;	// bits 0-11</div><div class='add'>+#else</div><div class='add'>+		u32 max_fill:12;	// bits 0-11</div><div class='add'>+		u32 unused:20;		// bits 12-31</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} TXMAC_MAX_FILL_t, *PTXMAC_MAX_FILL_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for cf parameter reg in txmac address map</div><div class='add'>+ * located at address 0x3010</div><div class='add'>+ */</div><div class='add'>+typedef union _TXMAC_CF_PARAM_t {</div><div class='add'>+	u32 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u32 cfep:16;	// bits 16-31</div><div class='add'>+		u32 cfpt:16;	// bits 0-15</div><div class='add'>+#else</div><div class='add'>+		u32 cfpt:16;	// bits 0-15</div><div class='add'>+		u32 cfep:16;	// bits 16-31</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} TXMAC_CF_PARAM_t, *PTXMAC_CF_PARAM_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for tx test reg in txmac address map</div><div class='add'>+ * located at address 0x3014</div><div class='add'>+ */</div><div class='add'>+typedef union _TXMAC_TXTEST_t {</div><div class='add'>+	u32 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u32 unused2:15;		// bits 17-31</div><div class='add'>+		u32 reserved1:1;	// bit 16</div><div class='add'>+		u32 txtest_en:1;	// bit 15</div><div class='add'>+		u32 unused1:4;		// bits 11-14</div><div class='add'>+		u32 txqtest_ptr:11;	// bits 0-11</div><div class='add'>+#else</div><div class='add'>+		u32 txqtest_ptr:11;	// bits 0-10</div><div class='add'>+		u32 unused1:4;		// bits 11-14</div><div class='add'>+		u32 txtest_en:1;	// bit 15</div><div class='add'>+		u32 reserved1:1;	// bit 16</div><div class='add'>+		u32 unused2:15;		// bits 17-31</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} TXMAC_TXTEST_t, *PTXMAC_TXTEST_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for error reg in txmac address map</div><div class='add'>+ * located at address 0x3018</div><div class='add'>+ */</div><div class='add'>+typedef union _TXMAC_ERR_t {</div><div class='add'>+	u32 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u32 unused2:23;		// bits 9-31</div><div class='add'>+		u32 fifo_underrun:1;	// bit 8</div><div class='add'>+		u32 unused1:2;		// bits 6-7</div><div class='add'>+		u32 ctrl2_err:1;	// bit 5</div><div class='add'>+		u32 txq_underrun:1;	// bit 4</div><div class='add'>+		u32 bcnt_err:1;		// bit 3</div><div class='add'>+		u32 lseg_err:1;		// bit 2</div><div class='add'>+		u32 segnum_err:1;	// bit 1</div><div class='add'>+		u32 seg0_err:1;		// bit 0</div><div class='add'>+#else</div><div class='add'>+		u32 seg0_err:1;		// bit 0</div><div class='add'>+		u32 segnum_err:1;	// bit 1</div><div class='add'>+		u32 lseg_err:1;		// bit 2</div><div class='add'>+		u32 bcnt_err:1;		// bit 3</div><div class='add'>+		u32 txq_underrun:1;	// bit 4</div><div class='add'>+		u32 ctrl2_err:1;	// bit 5</div><div class='add'>+		u32 unused1:2;		// bits 6-7</div><div class='add'>+		u32 fifo_underrun:1;	// bit 8</div><div class='add'>+		u32 unused2:23;		// bits 9-31</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} TXMAC_ERR_t, *PTXMAC_ERR_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for error interrupt reg in txmac address map</div><div class='add'>+ * located at address 0x301C</div><div class='add'>+ */</div><div class='add'>+typedef union _TXMAC_ERR_INT_t {</div><div class='add'>+	u32 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u32 unused2:23;		// bits 9-31</div><div class='add'>+		u32 fifo_underrun:1;	// bit 8</div><div class='add'>+		u32 unused1:2;		// bits 6-7</div><div class='add'>+		u32 ctrl2_err:1;	// bit 5</div><div class='add'>+		u32 txq_underrun:1;	// bit 4</div><div class='add'>+		u32 bcnt_err:1;		// bit 3</div><div class='add'>+		u32 lseg_err:1;		// bit 2</div><div class='add'>+		u32 segnum_err:1;	// bit 1</div><div class='add'>+		u32 seg0_err:1;		// bit 0</div><div class='add'>+#else</div><div class='add'>+		u32 seg0_err:1;		// bit 0</div><div class='add'>+		u32 segnum_err:1;	// bit 1</div><div class='add'>+		u32 lseg_err:1;		// bit 2</div><div class='add'>+		u32 bcnt_err:1;		// bit 3</div><div class='add'>+		u32 txq_underrun:1;	// bit 4</div><div class='add'>+		u32 ctrl2_err:1;	// bit 5</div><div class='add'>+		u32 unused1:2;		// bits 6-7</div><div class='add'>+		u32 fifo_underrun:1;	// bit 8</div><div class='add'>+		u32 unused2:23;		// bits 9-31</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} TXMAC_ERR_INT_t, *PTXMAC_ERR_INT_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for error interrupt reg in txmac address map</div><div class='add'>+ * located at address 0x3020</div><div class='add'>+ */</div><div class='add'>+typedef union _TXMAC_CP_CTRL_t {</div><div class='add'>+	u32 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u32 unused:30;		// bits 2-31</div><div class='add'>+		u32 bp_req:1;		// bit 1</div><div class='add'>+		u32 bp_xonxoff:1;	// bit 0</div><div class='add'>+#else</div><div class='add'>+		u32 bp_xonxoff:1;	// bit 0</div><div class='add'>+		u32 bp_req:1;		// bit 1</div><div class='add'>+		u32 unused:30;		// bits 2-31</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} TXMAC_BP_CTRL_t, *PTXMAC_BP_CTRL_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Tx MAC Module of JAGCore Address Mapping</div><div class='add'>+ */</div><div class='add'>+typedef struct _TXMAC_t {		// Location:</div><div class='add'>+	TXMAC_CTL_t ctl;		//  0x3000</div><div class='add'>+	TXMAC_SHADOW_PTR_t shadow_ptr;	//  0x3004</div><div class='add'>+	TXMAC_ERR_CNT_t err_cnt;	//  0x3008</div><div class='add'>+	TXMAC_MAX_FILL_t max_fill;	//  0x300C</div><div class='add'>+	TXMAC_CF_PARAM_t cf_param;	//  0x3010</div><div class='add'>+	TXMAC_TXTEST_t tx_test;		//  0x3014</div><div class='add'>+	TXMAC_ERR_t err;		//  0x3018</div><div class='add'>+	TXMAC_ERR_INT_t err_int;	//  0x301C</div><div class='add'>+	TXMAC_BP_CTRL_t bp_ctrl;	//  0x3020</div><div class='add'>+} TXMAC_t, *PTXMAC_t;</div><div class='add'>+</div><div class='add'>+/* END OF TXMAC REGISTER ADDRESS MAP */</div><div class='add'>+</div><div class='add'>+/* START OF RXMAC REGISTER ADDRESS MAP */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for rxmac control reg in rxmac address map</div><div class='add'>+ * located at address 0x4000</div><div class='add'>+ */</div><div class='add'>+typedef union _RXMAC_CTRL_t {</div><div class='add'>+	u32 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u32 reserved:25;		// bits 7-31</div><div class='add'>+		u32 rxmac_int_disable:1;	// bit 6</div><div class='add'>+		u32 async_disable:1;		// bit 5</div><div class='add'>+		u32 mif_disable:1;		// bit 4</div><div class='add'>+		u32 wol_disable:1;		// bit 3</div><div class='add'>+		u32 pkt_filter_disable:1;	// bit 2</div><div class='add'>+		u32 mcif_disable:1;		// bit 1</div><div class='add'>+		u32 rxmac_en:1;			// bit 0</div><div class='add'>+#else</div><div class='add'>+		u32 rxmac_en:1;			// bit 0</div><div class='add'>+		u32 mcif_disable:1;		// bit 1</div><div class='add'>+		u32 pkt_filter_disable:1;	// bit 2</div><div class='add'>+		u32 wol_disable:1;		// bit 3</div><div class='add'>+		u32 mif_disable:1;		// bit 4</div><div class='add'>+		u32 async_disable:1;		// bit 5</div><div class='add'>+		u32 rxmac_int_disable:1;	// bit 6</div><div class='add'>+		u32 reserved:25;		// bits 7-31</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} RXMAC_CTRL_t, *PRXMAC_CTRL_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for Wake On Lan Control and CRC 0 reg in rxmac address map</div><div class='add'>+ * located at address 0x4004</div><div class='add'>+ */</div><div class='add'>+typedef union _RXMAC_WOL_CTL_CRC0_t {</div><div class='add'>+	u32 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u32 crc0:16;		// bits 16-31</div><div class='add'>+		u32 reserve:4;		// bits 12-15</div><div class='add'>+		u32 ignore_pp:1;	// bit 11</div><div class='add'>+		u32 ignore_mp:1;	// bit 10</div><div class='add'>+		u32 clr_intr:1;		// bit 9</div><div class='add'>+		u32 ignore_link_chg:1;	// bit 8</div><div class='add'>+		u32 ignore_uni:1;	// bit 7</div><div class='add'>+		u32 ignore_multi:1;	// bit 6</div><div class='add'>+		u32 ignore_broad:1;	// bit 5</div><div class='add'>+		u32 valid_crc4:1;	// bit 4</div><div class='add'>+		u32 valid_crc3:1;	// bit 3</div><div class='add'>+		u32 valid_crc2:1;	// bit 2</div><div class='add'>+		u32 valid_crc1:1;	// bit 1</div><div class='add'>+		u32 valid_crc0:1;	// bit 0</div><div class='add'>+#else</div><div class='add'>+		u32 valid_crc0:1;	// bit 0</div><div class='add'>+		u32 valid_crc1:1;	// bit 1</div><div class='add'>+		u32 valid_crc2:1;	// bit 2</div><div class='add'>+		u32 valid_crc3:1;	// bit 3</div><div class='add'>+		u32 valid_crc4:1;	// bit 4</div><div class='add'>+		u32 ignore_broad:1;	// bit 5</div><div class='add'>+		u32 ignore_multi:1;	// bit 6</div><div class='add'>+		u32 ignore_uni:1;	// bit 7</div><div class='add'>+		u32 ignore_link_chg:1;	// bit 8</div><div class='add'>+		u32 clr_intr:1;		// bit 9</div><div class='add'>+		u32 ignore_mp:1;	// bit 10</div><div class='add'>+		u32 ignore_pp:1;	// bit 11</div><div class='add'>+		u32 reserve:4;		// bits 12-15</div><div class='add'>+		u32 crc0:16;		// bits 16-31</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} RXMAC_WOL_CTL_CRC0_t, *PRXMAC_WOL_CTL_CRC0_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for CRC 1 and CRC 2 reg in rxmac address map</div><div class='add'>+ * located at address 0x4008</div><div class='add'>+ */</div><div class='add'>+typedef union _RXMAC_WOL_CRC12_t {</div><div class='add'>+	u32 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u32 crc2:16;	// bits 16-31</div><div class='add'>+		u32 crc1:16;	// bits 0-15</div><div class='add'>+#else</div><div class='add'>+		u32 crc1:16;	// bits 0-15</div><div class='add'>+		u32 crc2:16;	// bits 16-31</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} RXMAC_WOL_CRC12_t, *PRXMAC_WOL_CRC12_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for CRC 3 and CRC 4 reg in rxmac address map</div><div class='add'>+ * located at address 0x400C</div><div class='add'>+ */</div><div class='add'>+typedef union _RXMAC_WOL_CRC34_t {</div><div class='add'>+	u32 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u32 crc4:16;	// bits 16-31</div><div class='add'>+		u32 crc3:16;	// bits 0-15</div><div class='add'>+#else</div><div class='add'>+		u32 crc3:16;	// bits 0-15</div><div class='add'>+		u32 crc4:16;	// bits 16-31</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} RXMAC_WOL_CRC34_t, *PRXMAC_WOL_CRC34_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for Wake On Lan Source Address Lo reg in rxmac address map</div><div class='add'>+ * located at address 0x4010</div><div class='add'>+ */</div><div class='add'>+typedef union _RXMAC_WOL_SA_LO_t {</div><div class='add'>+	u32 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u32 sa3:8;	// bits 24-31</div><div class='add'>+		u32 sa4:8;	// bits 16-23</div><div class='add'>+		u32 sa5:8;	// bits 8-15</div><div class='add'>+		u32 sa6:8;	// bits 0-7</div><div class='add'>+#else</div><div class='add'>+		u32 sa6:8;	// bits 0-7</div><div class='add'>+		u32 sa5:8;	// bits 8-15</div><div class='add'>+		u32 sa4:8;	// bits 16-23</div><div class='add'>+		u32 sa3:8;	// bits 24-31</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} RXMAC_WOL_SA_LO_t, *PRXMAC_WOL_SA_LO_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for Wake On Lan Source Address Hi reg in rxmac address map</div><div class='add'>+ * located at address 0x4014</div><div class='add'>+ */</div><div class='add'>+typedef union _RXMAC_WOL_SA_HI_t {</div><div class='add'>+	u32 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u32 reserved:16;	// bits 16-31</div><div class='add'>+		u32 sa1:8;		// bits 8-15</div><div class='add'>+		u32 sa2:8;		// bits 0-7</div><div class='add'>+#else</div><div class='add'>+		u32 sa2:8;		// bits 0-7</div><div class='add'>+		u32 sa1:8;		// bits 8-15</div><div class='add'>+		u32 reserved:16;	// bits 16-31</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} RXMAC_WOL_SA_HI_t, *PRXMAC_WOL_SA_HI_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for Wake On Lan mask reg in rxmac address map</div><div class='add'>+ * located at address 0x4018 - 0x4064</div><div class='add'>+ * Defined earlier (u32)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for Unicast Paket Filter Address 1 reg in rxmac address map</div><div class='add'>+ * located at address 0x4068</div><div class='add'>+ */</div><div class='add'>+typedef union _RXMAC_UNI_PF_ADDR1_t {</div><div class='add'>+	u32 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u32 addr1_3:8;	// bits 24-31</div><div class='add'>+		u32 addr1_4:8;	// bits 16-23</div><div class='add'>+		u32 addr1_5:8;	// bits 8-15</div><div class='add'>+		u32 addr1_6:8;	// bits 0-7</div><div class='add'>+#else</div><div class='add'>+		u32 addr1_6:8;	// bits 0-7</div><div class='add'>+		u32 addr1_5:8;	// bits 8-15</div><div class='add'>+		u32 addr1_4:8;	// bits 16-23</div><div class='add'>+		u32 addr1_3:8;	// bits 24-31</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} RXMAC_UNI_PF_ADDR1_t, *PRXMAC_UNI_PF_ADDR1_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for Unicast Paket Filter Address 2 reg in rxmac address map</div><div class='add'>+ * located at address 0x406C</div><div class='add'>+ */</div><div class='add'>+typedef union _RXMAC_UNI_PF_ADDR2_t {</div><div class='add'>+	u32 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u32 addr2_3:8;	// bits 24-31</div><div class='add'>+		u32 addr2_4:8;	// bits 16-23</div><div class='add'>+		u32 addr2_5:8;	// bits 8-15</div><div class='add'>+		u32 addr2_6:8;	// bits 0-7</div><div class='add'>+#else</div><div class='add'>+		u32 addr2_6:8;	// bits 0-7</div><div class='add'>+		u32 addr2_5:8;	// bits 8-15</div><div class='add'>+		u32 addr2_4:8;	// bits 16-23</div><div class='add'>+		u32 addr2_3:8;	// bits 24-31</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} RXMAC_UNI_PF_ADDR2_t, *PRXMAC_UNI_PF_ADDR2_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for Unicast Paket Filter Address 1 &amp; 2 reg in rxmac address map</div><div class='add'>+ * located at address 0x4070</div><div class='add'>+ */</div><div class='add'>+typedef union _RXMAC_UNI_PF_ADDR3_t {</div><div class='add'>+	u32 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u32 addr2_1:8;	// bits 24-31</div><div class='add'>+		u32 addr2_2:8;	// bits 16-23</div><div class='add'>+		u32 addr1_1:8;	// bits 8-15</div><div class='add'>+		u32 addr1_2:8;	// bits 0-7</div><div class='add'>+#else</div><div class='add'>+		u32 addr1_2:8;	// bits 0-7</div><div class='add'>+		u32 addr1_1:8;	// bits 8-15</div><div class='add'>+		u32 addr2_2:8;	// bits 16-23</div><div class='add'>+		u32 addr2_1:8;	// bits 24-31</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} RXMAC_UNI_PF_ADDR3_t, *PRXMAC_UNI_PF_ADDR3_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for Multicast Hash reg in rxmac address map</div><div class='add'>+ * located at address 0x4074 - 0x4080</div><div class='add'>+ * Defined earlier (u32)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for Packet Filter Control reg in rxmac address map</div><div class='add'>+ * located at address 0x4084</div><div class='add'>+ */</div><div class='add'>+typedef union _RXMAC_PF_CTRL_t {</div><div class='add'>+	u32 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u32 unused2:9;		// bits 23-31</div><div class='add'>+		u32 min_pkt_size:7;	// bits 16-22</div><div class='add'>+		u32 unused1:12;		// bits 4-15</div><div class='add'>+		u32 filter_frag_en:1;	// bit 3</div><div class='add'>+		u32 filter_uni_en:1;	// bit 2</div><div class='add'>+		u32 filter_multi_en:1;	// bit 1</div><div class='add'>+		u32 filter_broad_en:1;	// bit 0</div><div class='add'>+#else</div><div class='add'>+		u32 filter_broad_en:1;	// bit 0</div><div class='add'>+		u32 filter_multi_en:1;	// bit 1</div><div class='add'>+		u32 filter_uni_en:1;	// bit 2</div><div class='add'>+		u32 filter_frag_en:1;	// bit 3</div><div class='add'>+		u32 unused1:12;		// bits 4-15</div><div class='add'>+		u32 min_pkt_size:7;	// bits 16-22</div><div class='add'>+		u32 unused2:9;		// bits 23-31</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} RXMAC_PF_CTRL_t, *PRXMAC_PF_CTRL_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for Memory Controller Interface Control Max Segment reg in rxmac</div><div class='add'>+ * address map.  Located at address 0x4088</div><div class='add'>+ */</div><div class='add'>+typedef union _RXMAC_MCIF_CTRL_MAX_SEG_t {</div><div class='add'>+	u32 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u32 reserved:22;	// bits 10-31</div><div class='add'>+		u32 max_size:8;	// bits 2-9</div><div class='add'>+		u32 fc_en:1;	// bit 1</div><div class='add'>+		u32 seg_en:1;	// bit 0</div><div class='add'>+#else</div><div class='add'>+		u32 seg_en:1;	// bit 0</div><div class='add'>+		u32 fc_en:1;	// bit 1</div><div class='add'>+		u32 max_size:8;	// bits 2-9</div><div class='add'>+		u32 reserved:22;	// bits 10-31</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} RXMAC_MCIF_CTRL_MAX_SEG_t, *PRXMAC_MCIF_CTRL_MAX_SEG_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for Memory Controller Interface Water Mark reg in rxmac address</div><div class='add'>+ * map.  Located at address 0x408C</div><div class='add'>+ */</div><div class='add'>+typedef union _RXMAC_MCIF_WATER_MARK_t {</div><div class='add'>+	u32 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u32 reserved2:6;	// bits 26-31</div><div class='add'>+		u32 mark_hi:10;	// bits 16-25</div><div class='add'>+		u32 reserved1:6;	// bits 10-15</div><div class='add'>+		u32 mark_lo:10;	// bits 0-9</div><div class='add'>+#else</div><div class='add'>+		u32 mark_lo:10;	// bits 0-9</div><div class='add'>+		u32 reserved1:6;	// bits 10-15</div><div class='add'>+		u32 mark_hi:10;	// bits 16-25</div><div class='add'>+		u32 reserved2:6;	// bits 26-31</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} RXMAC_MCIF_WATER_MARK_t, *PRXMAC_MCIF_WATER_MARK_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for Rx Queue Dialog reg in rxmac address map.</div><div class='add'>+ * located at address 0x4090</div><div class='add'>+ */</div><div class='add'>+typedef union _RXMAC_RXQ_DIAG_t {</div><div class='add'>+	u32 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u32 reserved2:6;	// bits 26-31</div><div class='add'>+		u32 rd_ptr:10;	// bits 16-25</div><div class='add'>+		u32 reserved1:6;	// bits 10-15</div><div class='add'>+		u32 wr_ptr:10;	// bits 0-9</div><div class='add'>+#else</div><div class='add'>+		u32 wr_ptr:10;	// bits 0-9</div><div class='add'>+		u32 reserved1:6;	// bits 10-15</div><div class='add'>+		u32 rd_ptr:10;	// bits 16-25</div><div class='add'>+		u32 reserved2:6;	// bits 26-31</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} RXMAC_RXQ_DIAG_t, *PRXMAC_RXQ_DIAG_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for space availiable reg in rxmac address map.</div><div class='add'>+ * located at address 0x4094</div><div class='add'>+ */</div><div class='add'>+typedef union _RXMAC_SPACE_AVAIL_t {</div><div class='add'>+	u32 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u32 reserved2:15;		// bits 17-31</div><div class='add'>+		u32 space_avail_en:1;	// bit 16</div><div class='add'>+		u32 reserved1:6;		// bits 10-15</div><div class='add'>+		u32 space_avail:10;	// bits 0-9</div><div class='add'>+#else</div><div class='add'>+		u32 space_avail:10;	// bits 0-9</div><div class='add'>+		u32 reserved1:6;		// bits 10-15</div><div class='add'>+		u32 space_avail_en:1;	// bit 16</div><div class='add'>+		u32 reserved2:15;		// bits 17-31</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} RXMAC_SPACE_AVAIL_t, *PRXMAC_SPACE_AVAIL_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for management interface reg in rxmac address map.</div><div class='add'>+ * located at address 0x4098</div><div class='add'>+ */</div><div class='add'>+typedef union _RXMAC_MIF_CTL_t {</div><div class='add'>+	u32 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u32 reserve:14;		// bits 18-31</div><div class='add'>+		u32 drop_pkt_en:1;		// bit 17</div><div class='add'>+		u32 drop_pkt_mask:17;	// bits 0-16</div><div class='add'>+#else</div><div class='add'>+		u32 drop_pkt_mask:17;	// bits 0-16</div><div class='add'>+		u32 drop_pkt_en:1;		// bit 17</div><div class='add'>+		u32 reserve:14;		// bits 18-31</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} RXMAC_MIF_CTL_t, *PRXMAC_MIF_CTL_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for Error reg in rxmac address map.</div><div class='add'>+ * located at address 0x409C</div><div class='add'>+ */</div><div class='add'>+typedef union _RXMAC_ERROR_REG_t {</div><div class='add'>+	u32 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u32 reserve:28;	// bits 4-31</div><div class='add'>+		u32 mif:1;		// bit 3</div><div class='add'>+		u32 async:1;	// bit 2</div><div class='add'>+		u32 pkt_filter:1;	// bit 1</div><div class='add'>+		u32 mcif:1;	// bit 0</div><div class='add'>+#else</div><div class='add'>+		u32 mcif:1;	// bit 0</div><div class='add'>+		u32 pkt_filter:1;	// bit 1</div><div class='add'>+		u32 async:1;	// bit 2</div><div class='add'>+		u32 mif:1;		// bit 3</div><div class='add'>+		u32 reserve:28;	// bits 4-31</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} RXMAC_ERROR_REG_t, *PRXMAC_ERROR_REG_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Rx MAC Module of JAGCore Address Mapping</div><div class='add'>+ */</div><div class='add'>+typedef struct _RXMAC_t {				// Location:</div><div class='add'>+	RXMAC_CTRL_t ctrl;				//  0x4000</div><div class='add'>+	RXMAC_WOL_CTL_CRC0_t crc0;			//  0x4004</div><div class='add'>+	RXMAC_WOL_CRC12_t crc12;			//  0x4008</div><div class='add'>+	RXMAC_WOL_CRC34_t crc34;			//  0x400C</div><div class='add'>+	RXMAC_WOL_SA_LO_t sa_lo;			//  0x4010</div><div class='add'>+	RXMAC_WOL_SA_HI_t sa_hi;			//  0x4014</div><div class='add'>+	u32 mask0_word0;				//  0x4018</div><div class='add'>+	u32 mask0_word1;				//  0x401C</div><div class='add'>+	u32 mask0_word2;				//  0x4020</div><div class='add'>+	u32 mask0_word3;				//  0x4024</div><div class='add'>+	u32 mask1_word0;				//  0x4028</div><div class='add'>+	u32 mask1_word1;				//  0x402C</div><div class='add'>+	u32 mask1_word2;				//  0x4030</div><div class='add'>+	u32 mask1_word3;				//  0x4034</div><div class='add'>+	u32 mask2_word0;				//  0x4038</div><div class='add'>+	u32 mask2_word1;				//  0x403C</div><div class='add'>+	u32 mask2_word2;				//  0x4040</div><div class='add'>+	u32 mask2_word3;				//  0x4044</div><div class='add'>+	u32 mask3_word0;				//  0x4048</div><div class='add'>+	u32 mask3_word1;				//  0x404C</div><div class='add'>+	u32 mask3_word2;				//  0x4050</div><div class='add'>+	u32 mask3_word3;				//  0x4054</div><div class='add'>+	u32 mask4_word0;				//  0x4058</div><div class='add'>+	u32 mask4_word1;				//  0x405C</div><div class='add'>+	u32 mask4_word2;				//  0x4060</div><div class='add'>+	u32 mask4_word3;				//  0x4064</div><div class='add'>+	RXMAC_UNI_PF_ADDR1_t uni_pf_addr1;		//  0x4068</div><div class='add'>+	RXMAC_UNI_PF_ADDR2_t uni_pf_addr2;		//  0x406C</div><div class='add'>+	RXMAC_UNI_PF_ADDR3_t uni_pf_addr3;		//  0x4070</div><div class='add'>+	u32 multi_hash1;				//  0x4074</div><div class='add'>+	u32 multi_hash2;				//  0x4078</div><div class='add'>+	u32 multi_hash3;				//  0x407C</div><div class='add'>+	u32 multi_hash4;				//  0x4080</div><div class='add'>+	RXMAC_PF_CTRL_t pf_ctrl;			//  0x4084</div><div class='add'>+	RXMAC_MCIF_CTRL_MAX_SEG_t mcif_ctrl_max_seg;	//  0x4088</div><div class='add'>+	RXMAC_MCIF_WATER_MARK_t mcif_water_mark;	//  0x408C</div><div class='add'>+	RXMAC_RXQ_DIAG_t rxq_diag;			//  0x4090</div><div class='add'>+	RXMAC_SPACE_AVAIL_t space_avail;		//  0x4094</div><div class='add'>+</div><div class='add'>+	RXMAC_MIF_CTL_t mif_ctrl;			//  0x4098</div><div class='add'>+	RXMAC_ERROR_REG_t err_reg;			//  0x409C</div><div class='add'>+} RXMAC_t, *PRXMAC_t;</div><div class='add'>+</div><div class='add'>+/* END OF TXMAC REGISTER ADDRESS MAP */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* START OF MAC REGISTER ADDRESS MAP */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for configuration #1 reg in mac address map.</div><div class='add'>+ * located at address 0x5000</div><div class='add'>+ */</div><div class='add'>+typedef union _MAC_CFG1_t {</div><div class='add'>+	u32 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u32 soft_reset:1;		// bit 31</div><div class='add'>+		u32 sim_reset:1;		// bit 30</div><div class='add'>+		u32 reserved3:10;		// bits 20-29</div><div class='add'>+		u32 reset_rx_mc:1;		// bit 19</div><div class='add'>+		u32 reset_tx_mc:1;		// bit 18</div><div class='add'>+		u32 reset_rx_fun:1;	// bit 17</div><div class='add'>+		u32 reset_tx_fun:1;	// bit 16</div><div class='add'>+		u32 reserved2:7;		// bits 9-15</div><div class='add'>+		u32 loop_back:1;		// bit 8</div><div class='add'>+		u32 reserved1:2;		// bits 6-7</div><div class='add'>+		u32 rx_flow:1;		// bit 5</div><div class='add'>+		u32 tx_flow:1;		// bit 4</div><div class='add'>+		u32 syncd_rx_en:1;		// bit 3</div><div class='add'>+		u32 rx_enable:1;		// bit 2</div><div class='add'>+		u32 syncd_tx_en:1;		// bit 1</div><div class='add'>+		u32 tx_enable:1;		// bit 0</div><div class='add'>+#else</div><div class='add'>+		u32 tx_enable:1;		// bit 0</div><div class='add'>+		u32 syncd_tx_en:1;		// bit 1</div><div class='add'>+		u32 rx_enable:1;		// bit 2</div><div class='add'>+		u32 syncd_rx_en:1;		// bit 3</div><div class='add'>+		u32 tx_flow:1;		// bit 4</div><div class='add'>+		u32 rx_flow:1;		// bit 5</div><div class='add'>+		u32 reserved1:2;		// bits 6-7</div><div class='add'>+		u32 loop_back:1;		// bit 8</div><div class='add'>+		u32 reserved2:7;		// bits 9-15</div><div class='add'>+		u32 reset_tx_fun:1;	// bit 16</div><div class='add'>+		u32 reset_rx_fun:1;	// bit 17</div><div class='add'>+		u32 reset_tx_mc:1;		// bit 18</div><div class='add'>+		u32 reset_rx_mc:1;		// bit 19</div><div class='add'>+		u32 reserved3:10;		// bits 20-29</div><div class='add'>+		u32 sim_reset:1;		// bit 30</div><div class='add'>+		u32 soft_reset:1;		// bit 31</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} MAC_CFG1_t, *PMAC_CFG1_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for configuration #2 reg in mac address map.</div><div class='add'>+ * located at address 0x5004</div><div class='add'>+ */</div><div class='add'>+typedef union _MAC_CFG2_t {</div><div class='add'>+	u32 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u32 reserved3:16;		// bits 16-31</div><div class='add'>+		u32 preamble_len:4;	// bits 12-15</div><div class='add'>+		u32 reserved2:2;		// bits 10-11</div><div class='add'>+		u32 if_mode:2;		// bits 8-9</div><div class='add'>+		u32 reserved1:2;		// bits 6-7</div><div class='add'>+		u32 huge_frame:1;		// bit 5</div><div class='add'>+		u32 len_check:1;		// bit 4</div><div class='add'>+		u32 undefined:1;		// bit 3</div><div class='add'>+		u32 pad_crc:1;		// bit 2</div><div class='add'>+		u32 crc_enable:1;		// bit 1</div><div class='add'>+		u32 full_duplex:1;		// bit 0</div><div class='add'>+#else</div><div class='add'>+		u32 full_duplex:1;		// bit 0</div><div class='add'>+		u32 crc_enable:1;		// bit 1</div><div class='add'>+		u32 pad_crc:1;		// bit 2</div><div class='add'>+		u32 undefined:1;		// bit 3</div><div class='add'>+		u32 len_check:1;		// bit 4</div><div class='add'>+		u32 huge_frame:1;		// bit 5</div><div class='add'>+		u32 reserved1:2;		// bits 6-7</div><div class='add'>+		u32 if_mode:2;		// bits 8-9</div><div class='add'>+		u32 reserved2:2;		// bits 10-11</div><div class='add'>+		u32 preamble_len:4;	// bits 12-15</div><div class='add'>+		u32 reserved3:16;		// bits 16-31</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} MAC_CFG2_t, *PMAC_CFG2_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for Interpacket gap reg in mac address map.</div><div class='add'>+ * located at address 0x5008</div><div class='add'>+ */</div><div class='add'>+typedef union _MAC_IPG_t {</div><div class='add'>+	u32 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u32 reserved:1;		// bit 31</div><div class='add'>+		u32 non_B2B_ipg_1:7;	// bits 24-30</div><div class='add'>+		u32 undefined2:1;		// bit 23</div><div class='add'>+		u32 non_B2B_ipg_2:7;	// bits 16-22</div><div class='add'>+		u32 min_ifg_enforce:8;	// bits 8-15</div><div class='add'>+		u32 undefined1:1;		// bit 7</div><div class='add'>+		u32 B2B_ipg:7;		// bits 0-6</div><div class='add'>+#else</div><div class='add'>+		u32 B2B_ipg:7;		// bits 0-6</div><div class='add'>+		u32 undefined1:1;		// bit 7</div><div class='add'>+		u32 min_ifg_enforce:8;	// bits 8-15</div><div class='add'>+		u32 non_B2B_ipg_2:7;	// bits 16-22</div><div class='add'>+		u32 undefined2:1;		// bit 23</div><div class='add'>+		u32 non_B2B_ipg_1:7;	// bits 24-30</div><div class='add'>+		u32 reserved:1;		// bit 31</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} MAC_IPG_t, *PMAC_IPG_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for half duplex reg in mac address map.</div><div class='add'>+ * located at address 0x500C</div><div class='add'>+ */</div><div class='add'>+typedef union _MAC_HFDP_t {</div><div class='add'>+	u32 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u32 reserved2:8;		// bits 24-31</div><div class='add'>+		u32 alt_beb_trunc:4;	// bits 23-20</div><div class='add'>+		u32 alt_beb_enable:1;	// bit 19</div><div class='add'>+		u32 bp_no_backoff:1;	// bit 18</div><div class='add'>+		u32 no_backoff:1;		// bit 17</div><div class='add'>+		u32 excess_defer:1;	// bit 16</div><div class='add'>+		u32 rexmit_max:4;		// bits 12-15</div><div class='add'>+		u32 reserved1:2;		// bits 10-11</div><div class='add'>+		u32 coll_window:10;	// bits 0-9</div><div class='add'>+#else</div><div class='add'>+		u32 coll_window:10;	// bits 0-9</div><div class='add'>+		u32 reserved1:2;		// bits 10-11</div><div class='add'>+		u32 rexmit_max:4;		// bits 12-15</div><div class='add'>+		u32 excess_defer:1;	// bit 16</div><div class='add'>+		u32 no_backoff:1;		// bit 17</div><div class='add'>+		u32 bp_no_backoff:1;	// bit 18</div><div class='add'>+		u32 alt_beb_enable:1;	// bit 19</div><div class='add'>+		u32 alt_beb_trunc:4;	// bits 23-20</div><div class='add'>+		u32 reserved2:8;		// bits 24-31</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} MAC_HFDP_t, *PMAC_HFDP_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for Maximum Frame Length reg in mac address map.</div><div class='add'>+ * located at address 0x5010</div><div class='add'>+ */</div><div class='add'>+typedef union _MAC_MAX_FM_LEN_t {</div><div class='add'>+	u32 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u32 reserved:16;	// bits 16-31</div><div class='add'>+		u32 max_len:16;	// bits 0-15</div><div class='add'>+#else</div><div class='add'>+		u32 max_len:16;	// bits 0-15</div><div class='add'>+		u32 reserved:16;	// bits 16-31</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} MAC_MAX_FM_LEN_t, *PMAC_MAX_FM_LEN_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for Reserve 1 reg in mac address map.</div><div class='add'>+ * located at address 0x5014 - 0x5018</div><div class='add'>+ * Defined earlier (u32)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for Test reg in mac address map.</div><div class='add'>+ * located at address 0x501C</div><div class='add'>+ */</div><div class='add'>+typedef union _MAC_TEST_t {</div><div class='add'>+	u32 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u32 unused:29;	// bits 3-31</div><div class='add'>+		u32 mac_test:3;	// bits 0-2</div><div class='add'>+#else</div><div class='add'>+		u32 mac_test:3;	// bits 0-2</div><div class='add'>+		u32 unused:29;	// bits 3-31</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} MAC_TEST_t, *PMAC_TEST_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for MII Management Configuration reg in mac address map.</div><div class='add'>+ * located at address 0x5020</div><div class='add'>+ */</div><div class='add'>+typedef union _MII_MGMT_CFG_t {</div><div class='add'>+	u32 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u32 reset_mii_mgmt:1;	// bit 31</div><div class='add'>+		u32 reserved:25;		// bits 6-30</div><div class='add'>+		u32 scan_auto_incremt:1;	// bit 5</div><div class='add'>+		u32 preamble_suppress:1;	// bit 4</div><div class='add'>+		u32 undefined:1;		// bit 3</div><div class='add'>+		u32 mgmt_clk_reset:3;	// bits 0-2</div><div class='add'>+#else</div><div class='add'>+		u32 mgmt_clk_reset:3;	// bits 0-2</div><div class='add'>+		u32 undefined:1;		// bit 3</div><div class='add'>+		u32 preamble_suppress:1;	// bit 4</div><div class='add'>+		u32 scan_auto_incremt:1;	// bit 5</div><div class='add'>+		u32 reserved:25;		// bits 6-30</div><div class='add'>+		u32 reset_mii_mgmt:1;	// bit 31</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} MII_MGMT_CFG_t, *PMII_MGMT_CFG_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for MII Management Command reg in mac address map.</div><div class='add'>+ * located at address 0x5024</div><div class='add'>+ */</div><div class='add'>+typedef union _MII_MGMT_CMD_t {</div><div class='add'>+	u32 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u32 reserved:30;	// bits 2-31</div><div class='add'>+		u32 scan_cycle:1;	// bit 1</div><div class='add'>+		u32 read_cycle:1;	// bit 0</div><div class='add'>+#else</div><div class='add'>+		u32 read_cycle:1;	// bit 0</div><div class='add'>+		u32 scan_cycle:1;	// bit 1</div><div class='add'>+		u32 reserved:30;	// bits 2-31</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} MII_MGMT_CMD_t, *PMII_MGMT_CMD_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for MII Management Address reg in mac address map.</div><div class='add'>+ * located at address 0x5028</div><div class='add'>+ */</div><div class='add'>+typedef union _MII_MGMT_ADDR_t {</div><div class='add'>+	u32 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u32 reserved2:19;	// bit 13-31</div><div class='add'>+		u32 phy_addr:5;	// bits 8-12</div><div class='add'>+		u32 reserved1:3;	// bits 5-7</div><div class='add'>+		u32 reg_addr:5;	// bits 0-4</div><div class='add'>+#else</div><div class='add'>+		u32 reg_addr:5;	// bits 0-4</div><div class='add'>+		u32 reserved1:3;	// bits 5-7</div><div class='add'>+		u32 phy_addr:5;	// bits 8-12</div><div class='add'>+		u32 reserved2:19;	// bit 13-31</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} MII_MGMT_ADDR_t, *PMII_MGMT_ADDR_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for MII Management Control reg in mac address map.</div><div class='add'>+ * located at address 0x502C</div><div class='add'>+ */</div><div class='add'>+typedef union _MII_MGMT_CTRL_t {</div><div class='add'>+	u32 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u32 reserved:16;	// bits 16-31</div><div class='add'>+		u32 phy_ctrl:16;	// bits 0-15</div><div class='add'>+#else</div><div class='add'>+		u32 phy_ctrl:16;	// bits 0-15</div><div class='add'>+		u32 reserved:16;	// bits 16-31</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} MII_MGMT_CTRL_t, *PMII_MGMT_CTRL_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for MII Management Status reg in mac address map.</div><div class='add'>+ * located at address 0x5030</div><div class='add'>+ */</div><div class='add'>+typedef union _MII_MGMT_STAT_t {</div><div class='add'>+	u32 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u32 reserved:16;	// bits 16-31</div><div class='add'>+		u32 phy_stat:16;	// bits 0-15</div><div class='add'>+#else</div><div class='add'>+		u32 phy_stat:16;	// bits 0-15</div><div class='add'>+		u32 reserved:16;	// bits 16-31</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} MII_MGMT_STAT_t, *PMII_MGMT_STAT_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for MII Management Indicators reg in mac address map.</div><div class='add'>+ * located at address 0x5034</div><div class='add'>+ */</div><div class='add'>+typedef union _MII_MGMT_INDICATOR_t {</div><div class='add'>+	u32 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u32 reserved:29;	// bits 3-31</div><div class='add'>+		u32 not_valid:1;	// bit 2</div><div class='add'>+		u32 scanning:1;	// bit 1</div><div class='add'>+		u32 busy:1;	// bit 0</div><div class='add'>+#else</div><div class='add'>+		u32 busy:1;	// bit 0</div><div class='add'>+		u32 scanning:1;	// bit 1</div><div class='add'>+		u32 not_valid:1;	// bit 2</div><div class='add'>+		u32 reserved:29;	// bits 3-31</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} MII_MGMT_INDICATOR_t, *PMII_MGMT_INDICATOR_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for Interface Control reg in mac address map.</div><div class='add'>+ * located at address 0x5038</div><div class='add'>+ */</div><div class='add'>+typedef union _MAC_IF_CTRL_t {</div><div class='add'>+	u32 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u32 reset_if_module:1;	// bit 31</div><div class='add'>+		u32 reserved4:3;		// bit 28-30</div><div class='add'>+		u32 tbi_mode:1;		// bit 27</div><div class='add'>+		u32 ghd_mode:1;		// bit 26</div><div class='add'>+		u32 lhd_mode:1;		// bit 25</div><div class='add'>+		u32 phy_mode:1;		// bit 24</div><div class='add'>+		u32 reset_per_mii:1;	// bit 23</div><div class='add'>+		u32 reserved3:6;		// bits 17-22</div><div class='add'>+		u32 speed:1;		// bit 16</div><div class='add'>+		u32 reset_pe100x:1;	// bit 15</div><div class='add'>+		u32 reserved2:4;		// bits 11-14</div><div class='add'>+		u32 force_quiet:1;		// bit 10</div><div class='add'>+		u32 no_cipher:1;		// bit 9</div><div class='add'>+		u32 disable_link_fail:1;	// bit 8</div><div class='add'>+		u32 reset_gpsi:1;		// bit 7</div><div class='add'>+		u32 reserved1:6;		// bits 1-6</div><div class='add'>+		u32 enab_jab_protect:1;	// bit 0</div><div class='add'>+#else</div><div class='add'>+		u32 enab_jab_protect:1;	// bit 0</div><div class='add'>+		u32 reserved1:6;		// bits 1-6</div><div class='add'>+		u32 reset_gpsi:1;		// bit 7</div><div class='add'>+		u32 disable_link_fail:1;	// bit 8</div><div class='add'>+		u32 no_cipher:1;		// bit 9</div><div class='add'>+		u32 force_quiet:1;		// bit 10</div><div class='add'>+		u32 reserved2:4;		// bits 11-14</div><div class='add'>+		u32 reset_pe100x:1;	// bit 15</div><div class='add'>+		u32 speed:1;		// bit 16</div><div class='add'>+		u32 reserved3:6;		// bits 17-22</div><div class='add'>+		u32 reset_per_mii:1;	// bit 23</div><div class='add'>+		u32 phy_mode:1;		// bit 24</div><div class='add'>+		u32 lhd_mode:1;		// bit 25</div><div class='add'>+		u32 ghd_mode:1;		// bit 26</div><div class='add'>+		u32 tbi_mode:1;		// bit 27</div><div class='add'>+		u32 reserved4:3;		// bit 28-30</div><div class='add'>+		u32 reset_if_module:1;	// bit 31</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} MAC_IF_CTRL_t, *PMAC_IF_CTRL_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for Interface Status reg in mac address map.</div><div class='add'>+ * located at address 0x503C</div><div class='add'>+ */</div><div class='add'>+typedef union _MAC_IF_STAT_t {</div><div class='add'>+	u32 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u32 reserved:22;		// bits 10-31</div><div class='add'>+		u32 excess_defer:1;	// bit 9</div><div class='add'>+		u32 clash:1;		// bit 8</div><div class='add'>+		u32 phy_jabber:1;		// bit 7</div><div class='add'>+		u32 phy_link_ok:1;		// bit 6</div><div class='add'>+		u32 phy_full_duplex:1;	// bit 5</div><div class='add'>+		u32 phy_speed:1;		// bit 4</div><div class='add'>+		u32 pe100x_link_fail:1;	// bit 3</div><div class='add'>+		u32 pe10t_loss_carrie:1;	// bit 2</div><div class='add'>+		u32 pe10t_sqe_error:1;	// bit 1</div><div class='add'>+		u32 pe10t_jabber:1;	// bit 0</div><div class='add'>+#else</div><div class='add'>+		u32 pe10t_jabber:1;	// bit 0</div><div class='add'>+		u32 pe10t_sqe_error:1;	// bit 1</div><div class='add'>+		u32 pe10t_loss_carrie:1;	// bit 2</div><div class='add'>+		u32 pe100x_link_fail:1;	// bit 3</div><div class='add'>+		u32 phy_speed:1;		// bit 4</div><div class='add'>+		u32 phy_full_duplex:1;	// bit 5</div><div class='add'>+		u32 phy_link_ok:1;		// bit 6</div><div class='add'>+		u32 phy_jabber:1;		// bit 7</div><div class='add'>+		u32 clash:1;		// bit 8</div><div class='add'>+		u32 excess_defer:1;	// bit 9</div><div class='add'>+		u32 reserved:22;		// bits 10-31</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} MAC_IF_STAT_t, *PMAC_IF_STAT_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for Mac Station Address, Part 1 reg in mac address map.</div><div class='add'>+ * located at address 0x5040</div><div class='add'>+ */</div><div class='add'>+typedef union _MAC_STATION_ADDR1_t {</div><div class='add'>+	u32 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u32 Octet6:8;	// bits 24-31</div><div class='add'>+		u32 Octet5:8;	// bits 16-23</div><div class='add'>+		u32 Octet4:8;	// bits 8-15</div><div class='add'>+		u32 Octet3:8;	// bits 0-7</div><div class='add'>+#else</div><div class='add'>+		u32 Octet3:8;	// bits 0-7</div><div class='add'>+		u32 Octet4:8;	// bits 8-15</div><div class='add'>+		u32 Octet5:8;	// bits 16-23</div><div class='add'>+		u32 Octet6:8;	// bits 24-31</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} MAC_STATION_ADDR1_t, *PMAC_STATION_ADDR1_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for Mac Station Address, Part 2 reg in mac address map.</div><div class='add'>+ * located at address 0x5044</div><div class='add'>+ */</div><div class='add'>+typedef union _MAC_STATION_ADDR2_t {</div><div class='add'>+	u32 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u32 Octet2:8;	// bits 24-31</div><div class='add'>+		u32 Octet1:8;	// bits 16-23</div><div class='add'>+		u32 reserved:16;	// bits 0-15</div><div class='add'>+#else</div><div class='add'>+		u32 reserved:16;	// bit 0-15</div><div class='add'>+		u32 Octet1:8;	// bits 16-23</div><div class='add'>+		u32 Octet2:8;	// bits 24-31</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} MAC_STATION_ADDR2_t, *PMAC_STATION_ADDR2_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * MAC Module of JAGCore Address Mapping</div><div class='add'>+ */</div><div class='add'>+typedef struct _MAC_t {					// Location:</div><div class='add'>+	MAC_CFG1_t cfg1;				//  0x5000</div><div class='add'>+	MAC_CFG2_t cfg2;				//  0x5004</div><div class='add'>+	MAC_IPG_t ipg;					//  0x5008</div><div class='add'>+	MAC_HFDP_t hfdp;				//  0x500C</div><div class='add'>+	MAC_MAX_FM_LEN_t max_fm_len;			//  0x5010</div><div class='add'>+	u32 rsv1;					//  0x5014</div><div class='add'>+	u32 rsv2;					//  0x5018</div><div class='add'>+	MAC_TEST_t mac_test;				//  0x501C</div><div class='add'>+	MII_MGMT_CFG_t mii_mgmt_cfg;			//  0x5020</div><div class='add'>+	MII_MGMT_CMD_t mii_mgmt_cmd;			//  0x5024</div><div class='add'>+	MII_MGMT_ADDR_t mii_mgmt_addr;			//  0x5028</div><div class='add'>+	MII_MGMT_CTRL_t mii_mgmt_ctrl;			//  0x502C</div><div class='add'>+	MII_MGMT_STAT_t mii_mgmt_stat;			//  0x5030</div><div class='add'>+	MII_MGMT_INDICATOR_t mii_mgmt_indicator;	//  0x5034</div><div class='add'>+	MAC_IF_CTRL_t if_ctrl;				//  0x5038</div><div class='add'>+	MAC_IF_STAT_t if_stat;				//  0x503C</div><div class='add'>+	MAC_STATION_ADDR1_t station_addr_1;		//  0x5040</div><div class='add'>+	MAC_STATION_ADDR2_t station_addr_2;		//  0x5044</div><div class='add'>+} MAC_t, *PMAC_t;</div><div class='add'>+</div><div class='add'>+/* END OF MAC REGISTER ADDRESS MAP */</div><div class='add'>+</div><div class='add'>+/* START OF MAC STAT REGISTER ADDRESS MAP */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for Carry Register One and it's Mask Register reg located in mac</div><div class='add'>+ * stat address map address 0x6130 and 0x6138.</div><div class='add'>+ */</div><div class='add'>+typedef union _MAC_STAT_REG_1_t {</div><div class='add'>+	u32 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u32 tr64:1;	// bit 31</div><div class='add'>+		u32 tr127:1;	// bit 30</div><div class='add'>+		u32 tr255:1;	// bit 29</div><div class='add'>+		u32 tr511:1;	// bit 28</div><div class='add'>+		u32 tr1k:1;	// bit 27</div><div class='add'>+		u32 trmax:1;	// bit 26</div><div class='add'>+		u32 trmgv:1;	// bit 25</div><div class='add'>+		u32 unused:8;	// bits 17-24</div><div class='add'>+		u32 rbyt:1;	// bit 16</div><div class='add'>+		u32 rpkt:1;	// bit 15</div><div class='add'>+		u32 rfcs:1;	// bit 14</div><div class='add'>+		u32 rmca:1;	// bit 13</div><div class='add'>+		u32 rbca:1;	// bit 12</div><div class='add'>+		u32 rxcf:1;	// bit 11</div><div class='add'>+		u32 rxpf:1;	// bit 10</div><div class='add'>+		u32 rxuo:1;	// bit 9</div><div class='add'>+		u32 raln:1;	// bit 8</div><div class='add'>+		u32 rflr:1;	// bit 7</div><div class='add'>+		u32 rcde:1;	// bit 6</div><div class='add'>+		u32 rcse:1;	// bit 5</div><div class='add'>+		u32 rund:1;	// bit 4</div><div class='add'>+		u32 rovr:1;	// bit 3</div><div class='add'>+		u32 rfrg:1;	// bit 2</div><div class='add'>+		u32 rjbr:1;	// bit 1</div><div class='add'>+		u32 rdrp:1;	// bit 0</div><div class='add'>+#else</div><div class='add'>+		u32 rdrp:1;	// bit 0</div><div class='add'>+		u32 rjbr:1;	// bit 1</div><div class='add'>+		u32 rfrg:1;	// bit 2</div><div class='add'>+		u32 rovr:1;	// bit 3</div><div class='add'>+		u32 rund:1;	// bit 4</div><div class='add'>+		u32 rcse:1;	// bit 5</div><div class='add'>+		u32 rcde:1;	// bit 6</div><div class='add'>+		u32 rflr:1;	// bit 7</div><div class='add'>+		u32 raln:1;	// bit 8</div><div class='add'>+		u32 rxuo:1;	// bit 9</div><div class='add'>+		u32 rxpf:1;	// bit 10</div><div class='add'>+		u32 rxcf:1;	// bit 11</div><div class='add'>+		u32 rbca:1;	// bit 12</div><div class='add'>+		u32 rmca:1;	// bit 13</div><div class='add'>+		u32 rfcs:1;	// bit 14</div><div class='add'>+		u32 rpkt:1;	// bit 15</div><div class='add'>+		u32 rbyt:1;	// bit 16</div><div class='add'>+		u32 unused:8;	// bits 17-24</div><div class='add'>+		u32 trmgv:1;	// bit 25</div><div class='add'>+		u32 trmax:1;	// bit 26</div><div class='add'>+		u32 tr1k:1;	// bit 27</div><div class='add'>+		u32 tr511:1;	// bit 28</div><div class='add'>+		u32 tr255:1;	// bit 29</div><div class='add'>+		u32 tr127:1;	// bit 30</div><div class='add'>+		u32 tr64:1;	// bit 31</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} MAC_STAT_REG_1_t, *PMAC_STAT_REG_1_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for Carry Register Two Mask Register reg in mac stat address map.</div><div class='add'>+ * located at address 0x613C</div><div class='add'>+ */</div><div class='add'>+typedef union _MAC_STAT_REG_2_t {</div><div class='add'>+	u32 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u32 unused:12;	// bit 20-31</div><div class='add'>+		u32 tjbr:1;	// bit 19</div><div class='add'>+		u32 tfcs:1;	// bit 18</div><div class='add'>+		u32 txcf:1;	// bit 17</div><div class='add'>+		u32 tovr:1;	// bit 16</div><div class='add'>+		u32 tund:1;	// bit 15</div><div class='add'>+		u32 tfrg:1;	// bit 14</div><div class='add'>+		u32 tbyt:1;	// bit 13</div><div class='add'>+		u32 tpkt:1;	// bit 12</div><div class='add'>+		u32 tmca:1;	// bit 11</div><div class='add'>+		u32 tbca:1;	// bit 10</div><div class='add'>+		u32 txpf:1;	// bit 9</div><div class='add'>+		u32 tdfr:1;	// bit 8</div><div class='add'>+		u32 tedf:1;	// bit 7</div><div class='add'>+		u32 tscl:1;	// bit 6</div><div class='add'>+		u32 tmcl:1;	// bit 5</div><div class='add'>+		u32 tlcl:1;	// bit 4</div><div class='add'>+		u32 txcl:1;	// bit 3</div><div class='add'>+		u32 tncl:1;	// bit 2</div><div class='add'>+		u32 tpfh:1;	// bit 1</div><div class='add'>+		u32 tdrp:1;	// bit 0</div><div class='add'>+#else</div><div class='add'>+		u32 tdrp:1;	// bit 0</div><div class='add'>+		u32 tpfh:1;	// bit 1</div><div class='add'>+		u32 tncl:1;	// bit 2</div><div class='add'>+		u32 txcl:1;	// bit 3</div><div class='add'>+		u32 tlcl:1;	// bit 4</div><div class='add'>+		u32 tmcl:1;	// bit 5</div><div class='add'>+		u32 tscl:1;	// bit 6</div><div class='add'>+		u32 tedf:1;	// bit 7</div><div class='add'>+		u32 tdfr:1;	// bit 8</div><div class='add'>+		u32 txpf:1;	// bit 9</div><div class='add'>+		u32 tbca:1;	// bit 10</div><div class='add'>+		u32 tmca:1;	// bit 11</div><div class='add'>+		u32 tpkt:1;	// bit 12</div><div class='add'>+		u32 tbyt:1;	// bit 13</div><div class='add'>+		u32 tfrg:1;	// bit 14</div><div class='add'>+		u32 tund:1;	// bit 15</div><div class='add'>+		u32 tovr:1;	// bit 16</div><div class='add'>+		u32 txcf:1;	// bit 17</div><div class='add'>+		u32 tfcs:1;	// bit 18</div><div class='add'>+		u32 tjbr:1;	// bit 19</div><div class='add'>+		u32 unused:12;	// bit 20-31</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} MAC_STAT_REG_2_t, *PMAC_STAT_REG_2_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * MAC STATS Module of JAGCore Address Mapping</div><div class='add'>+ */</div><div class='add'>+typedef struct _MAC_STAT_t {		// Location:</div><div class='add'>+	u32 pad[32];		//  0x6000 - 607C</div><div class='add'>+</div><div class='add'>+	// Tx/Rx 0-64 Byte Frame Counter</div><div class='add'>+	u32 TR64;			//  0x6080</div><div class='add'>+</div><div class='add'>+	// Tx/Rx 65-127 Byte Frame Counter</div><div class='add'>+	u32 TR127;			//  0x6084</div><div class='add'>+</div><div class='add'>+	// Tx/Rx 128-255 Byte Frame Counter</div><div class='add'>+	u32 TR255;			//  0x6088</div><div class='add'>+</div><div class='add'>+	// Tx/Rx 256-511 Byte Frame Counter</div><div class='add'>+	u32 TR511;			//  0x608C</div><div class='add'>+</div><div class='add'>+	// Tx/Rx 512-1023 Byte Frame Counter</div><div class='add'>+	u32 TR1K;			//  0x6090</div><div class='add'>+</div><div class='add'>+	// Tx/Rx 1024-1518 Byte Frame Counter</div><div class='add'>+	u32 TRMax;			//  0x6094</div><div class='add'>+</div><div class='add'>+	// Tx/Rx 1519-1522 Byte Good VLAN Frame Count</div><div class='add'>+	u32 TRMgv;			//  0x6098</div><div class='add'>+</div><div class='add'>+	// Rx Byte Counter</div><div class='add'>+	u32 RByt;			//  0x609C</div><div class='add'>+</div><div class='add'>+	// Rx Packet Counter</div><div class='add'>+	u32 RPkt;			//  0x60A0</div><div class='add'>+</div><div class='add'>+	// Rx FCS Error Counter</div><div class='add'>+	u32 RFcs;			//  0x60A4</div><div class='add'>+</div><div class='add'>+	// Rx Multicast Packet Counter</div><div class='add'>+	u32 RMca;			//  0x60A8</div><div class='add'>+</div><div class='add'>+	// Rx Broadcast Packet Counter</div><div class='add'>+	u32 RBca;			//  0x60AC</div><div class='add'>+</div><div class='add'>+	// Rx Control Frame Packet Counter</div><div class='add'>+	u32 RxCf;			//  0x60B0</div><div class='add'>+</div><div class='add'>+	// Rx Pause Frame Packet Counter</div><div class='add'>+	u32 RxPf;			//  0x60B4</div><div class='add'>+</div><div class='add'>+	// Rx Unknown OP Code Counter</div><div class='add'>+	u32 RxUo;			//  0x60B8</div><div class='add'>+</div><div class='add'>+	// Rx Alignment Error Counter</div><div class='add'>+	u32 RAln;			//  0x60BC</div><div class='add'>+</div><div class='add'>+	// Rx Frame Length Error Counter</div><div class='add'>+	u32 RFlr;			//  0x60C0</div><div class='add'>+</div><div class='add'>+	// Rx Code Error Counter</div><div class='add'>+	u32 RCde;			//  0x60C4</div><div class='add'>+</div><div class='add'>+	// Rx Carrier Sense Error Counter</div><div class='add'>+	u32 RCse;			//  0x60C8</div><div class='add'>+</div><div class='add'>+	// Rx Undersize Packet Counter</div><div class='add'>+	u32 RUnd;			//  0x60CC</div><div class='add'>+</div><div class='add'>+	// Rx Oversize Packet Counter</div><div class='add'>+	u32 ROvr;			//  0x60D0</div><div class='add'>+</div><div class='add'>+	// Rx Fragment Counter</div><div class='add'>+	u32 RFrg;			//  0x60D4</div><div class='add'>+</div><div class='add'>+	// Rx Jabber Counter</div><div class='add'>+	u32 RJbr;			//  0x60D8</div><div class='add'>+</div><div class='add'>+	// Rx Drop</div><div class='add'>+	u32 RDrp;			//  0x60DC</div><div class='add'>+</div><div class='add'>+	// Tx Byte Counter</div><div class='add'>+	u32 TByt;			//  0x60E0</div><div class='add'>+</div><div class='add'>+	// Tx Packet Counter</div><div class='add'>+	u32 TPkt;			//  0x60E4</div><div class='add'>+</div><div class='add'>+	// Tx Multicast Packet Counter</div><div class='add'>+	u32 TMca;			//  0x60E8</div><div class='add'>+</div><div class='add'>+	// Tx Broadcast Packet Counter</div><div class='add'>+	u32 TBca;			//  0x60EC</div><div class='add'>+</div><div class='add'>+	// Tx Pause Control Frame Counter</div><div class='add'>+	u32 TxPf;			//  0x60F0</div><div class='add'>+</div><div class='add'>+	// Tx Deferral Packet Counter</div><div class='add'>+	u32 TDfr;			//  0x60F4</div><div class='add'>+</div><div class='add'>+	// Tx Excessive Deferral Packet Counter</div><div class='add'>+	u32 TEdf;			//  0x60F8</div><div class='add'>+</div><div class='add'>+	// Tx Single Collision Packet Counter</div><div class='add'>+	u32 TScl;			//  0x60FC</div><div class='add'>+</div><div class='add'>+	// Tx Multiple Collision Packet Counter</div><div class='add'>+	u32 TMcl;			//  0x6100</div><div class='add'>+</div><div class='add'>+	// Tx Late Collision Packet Counter</div><div class='add'>+	u32 TLcl;			//  0x6104</div><div class='add'>+</div><div class='add'>+	// Tx Excessive Collision Packet Counter</div><div class='add'>+	u32 TXcl;			//  0x6108</div><div class='add'>+</div><div class='add'>+	// Tx Total Collision Packet Counter</div><div class='add'>+	u32 TNcl;			//  0x610C</div><div class='add'>+</div><div class='add'>+	// Tx Pause Frame Honored Counter</div><div class='add'>+	u32 TPfh;			//  0x6110</div><div class='add'>+</div><div class='add'>+	// Tx Drop Frame Counter</div><div class='add'>+	u32 TDrp;			//  0x6114</div><div class='add'>+</div><div class='add'>+	// Tx Jabber Frame Counter</div><div class='add'>+	u32 TJbr;			//  0x6118</div><div class='add'>+</div><div class='add'>+	// Tx FCS Error Counter</div><div class='add'>+	u32 TFcs;			//  0x611C</div><div class='add'>+</div><div class='add'>+	// Tx Control Frame Counter</div><div class='add'>+	u32 TxCf;			//  0x6120</div><div class='add'>+</div><div class='add'>+	// Tx Oversize Frame Counter</div><div class='add'>+	u32 TOvr;			//  0x6124</div><div class='add'>+</div><div class='add'>+	// Tx Undersize Frame Counter</div><div class='add'>+	u32 TUnd;			//  0x6128</div><div class='add'>+</div><div class='add'>+	// Tx Fragments Frame Counter</div><div class='add'>+	u32 TFrg;			//  0x612C</div><div class='add'>+</div><div class='add'>+	// Carry Register One Register</div><div class='add'>+	MAC_STAT_REG_1_t Carry1;	//  0x6130</div><div class='add'>+</div><div class='add'>+	// Carry Register Two Register</div><div class='add'>+	MAC_STAT_REG_2_t Carry2;	//  0x6134</div><div class='add'>+</div><div class='add'>+	// Carry Register One Mask Register</div><div class='add'>+	MAC_STAT_REG_1_t Carry1M;	//  0x6138</div><div class='add'>+</div><div class='add'>+	// Carry Register Two Mask Register</div><div class='add'>+	MAC_STAT_REG_2_t Carry2M;	//  0x613C</div><div class='add'>+} MAC_STAT_t, *PMAC_STAT_t;</div><div class='add'>+</div><div class='add'>+/* END OF MAC STAT REGISTER ADDRESS MAP */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* START OF MMC REGISTER ADDRESS MAP */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for Main Memory Controller Control reg in mmc address map.</div><div class='add'>+ * located at address 0x7000</div><div class='add'>+ */</div><div class='add'>+typedef union _MMC_CTRL_t {</div><div class='add'>+	u32 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u32 reserved:25;		// bits 7-31</div><div class='add'>+		u32 force_ce:1;		// bit 6</div><div class='add'>+		u32 rxdma_disable:1;	// bit 5</div><div class='add'>+		u32 txdma_disable:1;	// bit 4</div><div class='add'>+		u32 txmac_disable:1;	// bit 3</div><div class='add'>+		u32 rxmac_disable:1;	// bit 2</div><div class='add'>+		u32 arb_disable:1;		// bit 1</div><div class='add'>+		u32 mmc_enable:1;		// bit 0</div><div class='add'>+#else</div><div class='add'>+		u32 mmc_enable:1;		// bit 0</div><div class='add'>+		u32 arb_disable:1;		// bit 1</div><div class='add'>+		u32 rxmac_disable:1;	// bit 2</div><div class='add'>+		u32 txmac_disable:1;	// bit 3</div><div class='add'>+		u32 txdma_disable:1;	// bit 4</div><div class='add'>+		u32 rxdma_disable:1;	// bit 5</div><div class='add'>+		u32 force_ce:1;		// bit 6</div><div class='add'>+		u32 reserved:25;		// bits 7-31</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} MMC_CTRL_t, *PMMC_CTRL_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for Main Memory Controller Host Memory Access Address reg in mmc</div><div class='add'>+ * address map.  Located at address 0x7004</div><div class='add'>+ */</div><div class='add'>+typedef union _MMC_SRAM_ACCESS_t {</div><div class='add'>+	u32 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u32 byte_enable:16;	// bits 16-31</div><div class='add'>+		u32 reserved2:2;		// bits 14-15</div><div class='add'>+		u32 req_addr:10;		// bits 4-13</div><div class='add'>+		u32 reserved1:1;		// bit 3</div><div class='add'>+		u32 is_ctrl_word:1;	// bit 2</div><div class='add'>+		u32 wr_access:1;		// bit 1</div><div class='add'>+		u32 req_access:1;		// bit 0</div><div class='add'>+#else</div><div class='add'>+		u32 req_access:1;		// bit 0</div><div class='add'>+		u32 wr_access:1;		// bit 1</div><div class='add'>+		u32 is_ctrl_word:1;	// bit 2</div><div class='add'>+		u32 reserved1:1;		// bit 3</div><div class='add'>+		u32 req_addr:10;		// bits 4-13</div><div class='add'>+		u32 reserved2:2;		// bits 14-15</div><div class='add'>+		u32 byte_enable:16;	// bits 16-31</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} MMC_SRAM_ACCESS_t, *PMMC_SRAM_ACCESS_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * structure for Main Memory Controller Host Memory Access Data reg in mmc</div><div class='add'>+ * address map.  Located at address 0x7008 - 0x7014</div><div class='add'>+ * Defined earlier (u32)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Memory Control Module of JAGCore Address Mapping</div><div class='add'>+ */</div><div class='add'>+typedef struct _MMC_t {			// Location:</div><div class='add'>+	MMC_CTRL_t mmc_ctrl;		//  0x7000</div><div class='add'>+	MMC_SRAM_ACCESS_t sram_access;	//  0x7004</div><div class='add'>+	u32 sram_word1;		//  0x7008</div><div class='add'>+	u32 sram_word2;		//  0x700C</div><div class='add'>+	u32 sram_word3;		//  0x7010</div><div class='add'>+	u32 sram_word4;		//  0x7014</div><div class='add'>+} MMC_t, *PMMC_t;</div><div class='add'>+</div><div class='add'>+/* END OF MMC REGISTER ADDRESS MAP */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* START OF EXP ROM REGISTER ADDRESS MAP */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Expansion ROM Module of JAGCore Address Mapping</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* Take this out until it is not empty */</div><div class='add'>+#if 0</div><div class='add'>+typedef struct _EXP_ROM_t {</div><div class='add'>+</div><div class='add'>+} EXP_ROM_t, *PEXP_ROM_t;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* END OF EXP ROM REGISTER ADDRESS MAP */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * JAGCore Address Mapping</div><div class='add'>+ */</div><div class='add'>+typedef struct _ADDRESS_MAP_t {</div><div class='add'>+	GLOBAL_t global;</div><div class='add'>+	// unused section of global address map</div><div class='add'>+	u8 unused_global[4096 - sizeof(GLOBAL_t)];</div><div class='add'>+	TXDMA_t txdma;</div><div class='add'>+	// unused section of txdma address map</div><div class='add'>+	u8 unused_txdma[4096 - sizeof(TXDMA_t)];</div><div class='add'>+	RXDMA_t rxdma;</div><div class='add'>+	// unused section of rxdma address map</div><div class='add'>+	u8 unused_rxdma[4096 - sizeof(RXDMA_t)];</div><div class='add'>+	TXMAC_t txmac;</div><div class='add'>+	// unused section of txmac address map</div><div class='add'>+	u8 unused_txmac[4096 - sizeof(TXMAC_t)];</div><div class='add'>+	RXMAC_t rxmac;</div><div class='add'>+	// unused section of rxmac address map</div><div class='add'>+	u8 unused_rxmac[4096 - sizeof(RXMAC_t)];</div><div class='add'>+	MAC_t mac;</div><div class='add'>+	// unused section of mac address map</div><div class='add'>+	u8 unused_mac[4096 - sizeof(MAC_t)];</div><div class='add'>+	MAC_STAT_t macStat;</div><div class='add'>+	// unused section of mac stat address map</div><div class='add'>+	u8 unused_mac_stat[4096 - sizeof(MAC_STAT_t)];</div><div class='add'>+	MMC_t mmc;</div><div class='add'>+	// unused section of mmc address map</div><div class='add'>+	u8 unused_mmc[4096 - sizeof(MMC_t)];</div><div class='add'>+	// unused section of address map</div><div class='add'>+	u8 unused_[1015808];</div><div class='add'>+</div><div class='add'>+/* Take this out until it is not empty */</div><div class='add'>+#if 0</div><div class='add'>+	EXP_ROM_t exp_rom;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	u8 unused_exp_rom[4096];	// MGS-size TBD</div><div class='add'>+	u8 unused__[524288];	// unused section of address map</div><div class='add'>+} ADDRESS_MAP_t, *PADDRESS_MAP_t;</div><div class='add'>+</div><div class='add'>+#endif /* _ET1310_ADDRESS_MAP_H_ */</div><div class='head'>diff --git a/drivers/staging/et131x/et1310_eeprom.c b/drivers/staging/et131x/et1310_eeprom.c<br/>new file mode 100644<br/>index 000000000000..c2b194e6a54c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/et131x/et1310_eeprom.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/et131x/et1310_eeprom.c</a></div><div class='hunk'>@@ -0,0 +1,480 @@</div><div class='add'>+/*</div><div class='add'>+ * Agere Systems Inc.</div><div class='add'>+ * 10/100/1000 Base-T Ethernet Driver for the ET1301 and ET131x series MACs</div><div class='add'>+ *</div><div class='add'>+ * Copyright © 2005 Agere Systems Inc.</div><div class='add'>+ * All rights reserved.</div><div class='add'>+ *   http://www.agere.com</div><div class='add'>+ *</div><div class='add'>+ *------------------------------------------------------------------------------</div><div class='add'>+ *</div><div class='add'>+ * et1310_eeprom.c - Code used to access the device's EEPROM</div><div class='add'>+ *</div><div class='add'>+ *------------------------------------------------------------------------------</div><div class='add'>+ *</div><div class='add'>+ * SOFTWARE LICENSE</div><div class='add'>+ *</div><div class='add'>+ * This software is provided subject to the following terms and conditions,</div><div class='add'>+ * which you should read carefully before using the software.  Using this</div><div class='add'>+ * software indicates your acceptance of these terms and conditions.  If you do</div><div class='add'>+ * not agree with these terms and conditions, do not use the software.</div><div class='add'>+ *</div><div class='add'>+ * Copyright © 2005 Agere Systems Inc.</div><div class='add'>+ * All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source or binary forms, with or without</div><div class='add'>+ * modifications, are permitted provided that the following conditions are met:</div><div class='add'>+ *</div><div class='add'>+ * . Redistributions of source code must retain the above copyright notice, this</div><div class='add'>+ *    list of conditions and the following Disclaimer as comments in the code as</div><div class='add'>+ *    well as in the documentation and/or other materials provided with the</div><div class='add'>+ *    distribution.</div><div class='add'>+ *</div><div class='add'>+ * . Redistributions in binary form must reproduce the above copyright notice,</div><div class='add'>+ *    this list of conditions and the following Disclaimer in the documentation</div><div class='add'>+ *    and/or other materials provided with the distribution.</div><div class='add'>+ *</div><div class='add'>+ * . Neither the name of Agere Systems Inc. nor the names of the contributors</div><div class='add'>+ *    may be used to endorse or promote products derived from this software</div><div class='add'>+ *    without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ * Disclaimer</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES,</div><div class='add'>+ * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  ANY</div><div class='add'>+ * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN</div><div class='add'>+ * RISK. IN NO EVENT SHALL AGERE SYSTEMS INC. OR CONTRIBUTORS BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, INCLUDING, BUT NOT LIMITED TO, CONTRACT, STRICT</div><div class='add'>+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT</div><div class='add'>+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH</div><div class='add'>+ * DAMAGE.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "et131x_version.h"</div><div class='add'>+#include "et131x_debug.h"</div><div class='add'>+#include "et131x_defs.h"</div><div class='add'>+</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/ptrace.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/ctype.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/timer.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/in.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/system.h&gt;</div><div class='add'>+#include &lt;asm/bitops.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/if_arp.h&gt;</div><div class='add'>+#include &lt;linux/ioport.h&gt;</div><div class='add'>+</div><div class='add'>+#include "et1310_phy.h"</div><div class='add'>+#include "et1310_pm.h"</div><div class='add'>+#include "et1310_jagcore.h"</div><div class='add'>+#include "et1310_eeprom.h"</div><div class='add'>+</div><div class='add'>+#include "et131x_adapter.h"</div><div class='add'>+#include "et131x_initpci.h"</div><div class='add'>+#include "et131x_isr.h"</div><div class='add'>+</div><div class='add'>+#include "et1310_tx.h"</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * EEPROM Defines</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* LBCIF Register Groups (addressed via 32-bit offsets) */</div><div class='add'>+#define LBCIF_DWORD0_GROUP_OFFSET       0xAC</div><div class='add'>+#define LBCIF_DWORD1_GROUP_OFFSET       0xB0</div><div class='add'>+</div><div class='add'>+/* LBCIF Registers (addressed via 8-bit offsets) */</div><div class='add'>+#define LBCIF_ADDRESS_REGISTER_OFFSET   0xAC</div><div class='add'>+#define LBCIF_DATA_REGISTER_OFFSET      0xB0</div><div class='add'>+#define LBCIF_CONTROL_REGISTER_OFFSET   0xB1</div><div class='add'>+#define LBCIF_STATUS_REGISTER_OFFSET    0xB2</div><div class='add'>+</div><div class='add'>+/* LBCIF Control Register Bits */</div><div class='add'>+#define LBCIF_CONTROL_SEQUENTIAL_READ   0x01</div><div class='add'>+#define LBCIF_CONTROL_PAGE_WRITE        0x02</div><div class='add'>+#define LBCIF_CONTROL_UNUSED1           0x04</div><div class='add'>+#define LBCIF_CONTROL_EEPROM_RELOAD     0x08</div><div class='add'>+#define LBCIF_CONTROL_UNUSED2           0x10</div><div class='add'>+#define LBCIF_CONTROL_TWO_BYTE_ADDR     0x20</div><div class='add'>+#define LBCIF_CONTROL_I2C_WRITE         0x40</div><div class='add'>+#define LBCIF_CONTROL_LBCIF_ENABLE      0x80</div><div class='add'>+</div><div class='add'>+/* LBCIF Status Register Bits */</div><div class='add'>+#define LBCIF_STATUS_PHY_QUEUE_AVAIL    0x01</div><div class='add'>+#define LBCIF_STATUS_I2C_IDLE           0x02</div><div class='add'>+#define LBCIF_STATUS_ACK_ERROR          0x04</div><div class='add'>+#define LBCIF_STATUS_GENERAL_ERROR      0x08</div><div class='add'>+#define LBCIF_STATUS_UNUSED             0x30</div><div class='add'>+#define LBCIF_STATUS_CHECKSUM_ERROR     0x40</div><div class='add'>+#define LBCIF_STATUS_EEPROM_PRESENT     0x80</div><div class='add'>+</div><div class='add'>+/* Miscellaneous Constraints */</div><div class='add'>+#define MAX_NUM_REGISTER_POLLS          1000</div><div class='add'>+#define MAX_NUM_WRITE_RETRIES           2</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Define macros that allow individual register values to be extracted from a</div><div class='add'>+ * DWORD1 register grouping</div><div class='add'>+ */</div><div class='add'>+#define EXTRACT_DATA_REGISTER(x)    (uint8_t)(x &amp; 0xFF)</div><div class='add'>+#define EXTRACT_STATUS_REGISTER(x)  (uint8_t)((x &gt;&gt; 16) &amp; 0xFF)</div><div class='add'>+#define EXTRACT_CONTROL_REG(x)      (uint8_t)((x &gt;&gt; 8) &amp; 0xFF)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * EepromWriteByte - Write a byte to the ET1310's EEPROM</div><div class='add'>+ * @pAdapter: pointer to our private adapter structure</div><div class='add'>+ * @unAddress: the address to write</div><div class='add'>+ * @bData: the value to write</div><div class='add'>+ * @unEepronId: the ID of the EEPROM</div><div class='add'>+ * @unAddressingMode: how the EEPROM is to be accessed</div><div class='add'>+ *</div><div class='add'>+ * Returns SUCCESS or FAILURE</div><div class='add'>+ */</div><div class='add'>+int32_t EepromWriteByte(struct et131x_adapter *pAdapter, uint32_t unAddress,</div><div class='add'>+			uint8_t bData, uint32_t unEepromId,</div><div class='add'>+			uint32_t unAddressingMode)</div><div class='add'>+{</div><div class='add'>+        struct pci_dev *pdev = pAdapter-&gt;pdev;</div><div class='add'>+	int32_t nIndex;</div><div class='add'>+	int32_t nRetries;</div><div class='add'>+	int32_t nError = false;</div><div class='add'>+	int32_t nI2CWriteActive = 0;</div><div class='add'>+	int32_t nWriteSuccessful = 0;</div><div class='add'>+	uint8_t bControl;</div><div class='add'>+	uint8_t bStatus = 0;</div><div class='add'>+	uint32_t unDword1 = 0;</div><div class='add'>+	uint32_t unData = 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The following excerpt is from "Serial EEPROM HW Design</div><div class='add'>+	 * Specification" Version 0.92 (9/20/2004):</div><div class='add'>+	 *</div><div class='add'>+	 * Single Byte Writes</div><div class='add'>+	 *</div><div class='add'>+	 * For an EEPROM, an I2C single byte write is defined as a START</div><div class='add'>+	 * condition followed by the device address, EEPROM address, one byte</div><div class='add'>+	 * of data and a STOP condition.  The STOP condition will trigger the</div><div class='add'>+	 * EEPROM's internally timed write cycle to the nonvolatile memory.</div><div class='add'>+	 * All inputs are disabled during this write cycle and the EEPROM will</div><div class='add'>+	 * not respond to any access until the internal write is complete.</div><div class='add'>+	 * The steps to execute a single byte write are as follows:</div><div class='add'>+	 *</div><div class='add'>+	 * 1. Check LBCIF Status Register for bits 6 &amp; 3:2 all equal to 0 and</div><div class='add'>+	 *    bits 7,1:0 both equal to 1, at least once after reset.</div><div class='add'>+	 *    Subsequent operations need only to check that bits 1:0 are</div><div class='add'>+	 *    equal to 1 prior to starting a single byte write.</div><div class='add'>+	 *</div><div class='add'>+	 * 2. Write to the LBCIF Control Register:  bit 7=1, bit 6=1, bit 3=0,</div><div class='add'>+	 *    and bits 1:0 both =0.  Bit 5 should be set according to the</div><div class='add'>+	 *    type of EEPROM being accessed (1=two byte addressing, 0=one</div><div class='add'>+	 *    byte addressing).</div><div class='add'>+	 *</div><div class='add'>+	 * 3. Write the address to the LBCIF Address Register.</div><div class='add'>+	 *</div><div class='add'>+	 * 4. Write the data to the LBCIF Data Register (the I2C write will</div><div class='add'>+	 *    begin).</div><div class='add'>+	 *</div><div class='add'>+	 * 5. Monitor bit 1:0 of the LBCIF Status Register.  When bits 1:0 are</div><div class='add'>+	 *    both equal to 1, the I2C write has completed and the internal</div><div class='add'>+	 *    write cycle of the EEPROM is about to start. (bits 1:0 = 01 is</div><div class='add'>+	 *    a legal state while waiting from both equal to 1, but bits</div><div class='add'>+	 *    1:0 = 10 is invalid and implies that something is broken).</div><div class='add'>+	 *</div><div class='add'>+	 * 6. Check bit 3 of the LBCIF Status Register.  If  equal to 1, an</div><div class='add'>+	 *    error has occurred.</div><div class='add'>+	 *</div><div class='add'>+	 * 7. Check bit 2 of the LBCIF Status Register.  If equal to 1 an ACK</div><div class='add'>+	 *    error has occurred on the address phase of the write.  This</div><div class='add'>+	 *    could be due to an actual hardware failure or the EEPROM may</div><div class='add'>+	 *    still be in its internal write cycle from a previous write.</div><div class='add'>+	 *    This write operation was ignored and must be repeated later.</div><div class='add'>+	 *</div><div class='add'>+	 * 8. Set bit 6 of the LBCIF Control Register = 0. If another write is</div><div class='add'>+	 *    required, go to step 1.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* Step 1: */</div><div class='add'>+	for (nIndex = 0; nIndex &lt; MAX_NUM_REGISTER_POLLS; nIndex++) {</div><div class='add'>+		/* Read registers grouped in DWORD1 */</div><div class='add'>+		if (pci_read_config_dword(pdev, LBCIF_DWORD1_GROUP_OFFSET,</div><div class='add'>+					  &amp;unDword1)) {</div><div class='add'>+			nError = 1;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		bStatus = EXTRACT_STATUS_REGISTER(unDword1);</div><div class='add'>+</div><div class='add'>+		if (bStatus &amp; LBCIF_STATUS_PHY_QUEUE_AVAIL &amp;&amp;</div><div class='add'>+		    bStatus &amp; LBCIF_STATUS_I2C_IDLE) {</div><div class='add'>+		    	/* bits 1:0 are equal to 1 */</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (nError || (nIndex &gt;= MAX_NUM_REGISTER_POLLS)) {</div><div class='add'>+		return FAILURE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Step 2: */</div><div class='add'>+	bControl = 0;</div><div class='add'>+	bControl |= LBCIF_CONTROL_LBCIF_ENABLE | LBCIF_CONTROL_I2C_WRITE;</div><div class='add'>+</div><div class='add'>+	if (unAddressingMode == DUAL_BYTE) {</div><div class='add'>+		bControl |= LBCIF_CONTROL_TWO_BYTE_ADDR;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pci_write_config_byte(pdev, LBCIF_CONTROL_REGISTER_OFFSET,</div><div class='add'>+				  bControl)) {</div><div class='add'>+		return FAILURE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nI2CWriteActive = 1;</div><div class='add'>+</div><div class='add'>+	/* Prepare EEPROM address for Step 3 */</div><div class='add'>+	unAddress |= (unAddressingMode == DUAL_BYTE) ?</div><div class='add'>+	    (unEepromId &lt;&lt; 16) : (unEepromId &lt;&lt; 8);</div><div class='add'>+</div><div class='add'>+	for (nRetries = 0; nRetries &lt; MAX_NUM_WRITE_RETRIES; nRetries++) {</div><div class='add'>+		/* Step 3:*/</div><div class='add'>+		if (pci_write_config_dword(pdev, LBCIF_ADDRESS_REGISTER_OFFSET,</div><div class='add'>+					   unAddress)) {</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Step 4: */</div><div class='add'>+		if (pci_write_config_byte(pdev, LBCIF_DATA_REGISTER_OFFSET,</div><div class='add'>+					  bData)) {</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Step 5: */</div><div class='add'>+		for (nIndex = 0; nIndex &lt; MAX_NUM_REGISTER_POLLS; nIndex++) {</div><div class='add'>+			/* Read registers grouped in DWORD1 */</div><div class='add'>+			if (pci_read_config_dword(pdev,</div><div class='add'>+						  LBCIF_DWORD1_GROUP_OFFSET,</div><div class='add'>+						  &amp;unDword1)) {</div><div class='add'>+				nError = 1;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			bStatus = EXTRACT_STATUS_REGISTER(unDword1);</div><div class='add'>+</div><div class='add'>+			if (bStatus &amp; LBCIF_STATUS_PHY_QUEUE_AVAIL &amp;&amp;</div><div class='add'>+			    bStatus &amp; LBCIF_STATUS_I2C_IDLE) {</div><div class='add'>+			    	/* I2C write complete */</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (nError || (nIndex &gt;= MAX_NUM_REGISTER_POLLS)) {</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Step 6: Don't break here if we are revision 1, this is</div><div class='add'>+		 *	   so we do a blind write for load bug.</div><div class='add'>+	         */</div><div class='add'>+		if (bStatus &amp; LBCIF_STATUS_GENERAL_ERROR</div><div class='add'>+		    &amp;&amp; pAdapter-&gt;RevisionID == 0) {</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Step 7 */</div><div class='add'>+		if (bStatus &amp; LBCIF_STATUS_ACK_ERROR) {</div><div class='add'>+			/*</div><div class='add'>+			 * This could be due to an actual hardware failure</div><div class='add'>+			 * or the EEPROM may still be in its internal write</div><div class='add'>+			 * cycle from a previous write. This write operation</div><div class='add'>+			 * was ignored and must be repeated later.</div><div class='add'>+			 */</div><div class='add'>+			udelay(10);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		nWriteSuccessful = 1;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Step 8: */</div><div class='add'>+	udelay(10);</div><div class='add'>+	nIndex = 0;</div><div class='add'>+	while (nI2CWriteActive) {</div><div class='add'>+		bControl &amp;= ~LBCIF_CONTROL_I2C_WRITE;</div><div class='add'>+</div><div class='add'>+		if (pci_write_config_byte(pdev, LBCIF_CONTROL_REGISTER_OFFSET,</div><div class='add'>+					  bControl)) {</div><div class='add'>+			nWriteSuccessful = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Do read until internal ACK_ERROR goes away meaning write</div><div class='add'>+		 * completed</div><div class='add'>+		 */</div><div class='add'>+		do {</div><div class='add'>+			pci_write_config_dword(pdev,</div><div class='add'>+					       LBCIF_ADDRESS_REGISTER_OFFSET,</div><div class='add'>+					       unAddress);</div><div class='add'>+			do {</div><div class='add'>+				pci_read_config_dword(pdev,</div><div class='add'>+					LBCIF_DATA_REGISTER_OFFSET, &amp;unData);</div><div class='add'>+			} while ((unData &amp; 0x00010000) == 0);</div><div class='add'>+		} while (unData &amp; 0x00040000);</div><div class='add'>+</div><div class='add'>+		bControl = EXTRACT_CONTROL_REG(unData);</div><div class='add'>+</div><div class='add'>+		if (bControl != 0xC0 || nIndex == 10000) {</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		nIndex++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return nWriteSuccessful ? SUCCESS : FAILURE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * EepromReadByte - Read a byte from the ET1310's EEPROM</div><div class='add'>+ * @pAdapter: pointer to our private adapter structure</div><div class='add'>+ * @unAddress: the address from which to read</div><div class='add'>+ * @pbData: a pointer to a byte in which to store the value of the read</div><div class='add'>+ * @unEepronId: the ID of the EEPROM</div><div class='add'>+ * @unAddressingMode: how the EEPROM is to be accessed</div><div class='add'>+ *</div><div class='add'>+ * Returns SUCCESS or FAILURE</div><div class='add'>+ */</div><div class='add'>+int32_t EepromReadByte(struct et131x_adapter *pAdapter, uint32_t unAddress,</div><div class='add'>+		       uint8_t *pbData, uint32_t unEepromId,</div><div class='add'>+		       uint32_t unAddressingMode)</div><div class='add'>+{</div><div class='add'>+        struct pci_dev *pdev = pAdapter-&gt;pdev;</div><div class='add'>+	int32_t nIndex;</div><div class='add'>+	int32_t nError = 0;</div><div class='add'>+	uint8_t bControl;</div><div class='add'>+	uint8_t bStatus = 0;</div><div class='add'>+	uint32_t unDword1 = 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The following excerpt is from "Serial EEPROM HW Design</div><div class='add'>+	 * Specification" Version 0.92 (9/20/2004):</div><div class='add'>+	 *</div><div class='add'>+	 * Single Byte Reads</div><div class='add'>+	 *</div><div class='add'>+	 * A single byte read is similar to the single byte write, with the</div><div class='add'>+	 * exception of the data flow:</div><div class='add'>+	 *</div><div class='add'>+	 * 1. Check LBCIF Status Register for bits 6 &amp; 3:2 all equal to 0 and</div><div class='add'>+	 *    bits 7,1:0 both equal to 1, at least once after reset.</div><div class='add'>+	 *    Subsequent operations need only to check that bits 1:0 are equal</div><div class='add'>+	 *    to 1 prior to starting a single byte read.</div><div class='add'>+	 *</div><div class='add'>+	 * 2. Write to the LBCIF Control Register:  bit 7=1, bit 6=0, bit 3=0,</div><div class='add'>+	 *    and bits 1:0 both =0.  Bit 5 should be set according to the type</div><div class='add'>+	 *    of EEPROM being accessed (1=two byte addressing, 0=one byte</div><div class='add'>+	 *    addressing).</div><div class='add'>+	 *</div><div class='add'>+	 * 3. Write the address to the LBCIF Address Register (I2C read will</div><div class='add'>+	 *    begin).</div><div class='add'>+	 *</div><div class='add'>+	 * 4. Monitor bit 0 of the LBCIF Status Register.  When =1, I2C read</div><div class='add'>+	 *    is complete. (if bit 1 =1 and bit 0 stays =0, a hardware failure</div><div class='add'>+	 *    has occurred).</div><div class='add'>+	 *</div><div class='add'>+	 * 5. Check bit 2 of the LBCIF Status Register.  If =1, then an error</div><div class='add'>+	 *    has occurred.  The data that has been returned from the PHY may</div><div class='add'>+	 *    be invalid.</div><div class='add'>+	 *</div><div class='add'>+	 * 6. Regardless of error status, read data byte from LBCIF Data</div><div class='add'>+	 *    Register.  If another byte is required, go to step 1.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* Step 1: */</div><div class='add'>+	for (nIndex = 0; nIndex &lt; MAX_NUM_REGISTER_POLLS; nIndex++) {</div><div class='add'>+		/* Read registers grouped in DWORD1 */</div><div class='add'>+		if (pci_read_config_dword(pdev, LBCIF_DWORD1_GROUP_OFFSET,</div><div class='add'>+					  &amp;unDword1)) {</div><div class='add'>+			nError = 1;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		bStatus = EXTRACT_STATUS_REGISTER(unDword1);</div><div class='add'>+</div><div class='add'>+		if (bStatus &amp; LBCIF_STATUS_PHY_QUEUE_AVAIL &amp;&amp;</div><div class='add'>+		    bStatus &amp; LBCIF_STATUS_I2C_IDLE) {</div><div class='add'>+			/* bits 1:0 are equal to 1 */</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (nError || (nIndex &gt;= MAX_NUM_REGISTER_POLLS)) {</div><div class='add'>+		return FAILURE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Step 2: */</div><div class='add'>+	bControl = 0;</div><div class='add'>+	bControl |= LBCIF_CONTROL_LBCIF_ENABLE;</div><div class='add'>+</div><div class='add'>+	if (unAddressingMode == DUAL_BYTE) {</div><div class='add'>+		bControl |= LBCIF_CONTROL_TWO_BYTE_ADDR;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pci_write_config_byte(pdev, LBCIF_CONTROL_REGISTER_OFFSET,</div><div class='add'>+				  bControl)) {</div><div class='add'>+		return FAILURE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Step 3: */</div><div class='add'>+	unAddress |= (unAddressingMode == DUAL_BYTE) ?</div><div class='add'>+	    (unEepromId &lt;&lt; 16) : (unEepromId &lt;&lt; 8);</div><div class='add'>+</div><div class='add'>+	if (pci_write_config_dword(pdev, LBCIF_ADDRESS_REGISTER_OFFSET,</div><div class='add'>+				   unAddress)) {</div><div class='add'>+		return FAILURE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Step 4: */</div><div class='add'>+	for (nIndex = 0; nIndex &lt; MAX_NUM_REGISTER_POLLS; nIndex++) {</div><div class='add'>+		/* Read registers grouped in DWORD1 */</div><div class='add'>+		if (pci_read_config_dword(pdev, LBCIF_DWORD1_GROUP_OFFSET,</div><div class='add'>+					  &amp;unDword1)) {</div><div class='add'>+			nError = 1;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		bStatus = EXTRACT_STATUS_REGISTER(unDword1);</div><div class='add'>+</div><div class='add'>+		if (bStatus &amp; LBCIF_STATUS_PHY_QUEUE_AVAIL</div><div class='add'>+		    &amp;&amp; bStatus &amp; LBCIF_STATUS_I2C_IDLE) {</div><div class='add'>+			/* I2C read complete */</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (nError || (nIndex &gt;= MAX_NUM_REGISTER_POLLS)) {</div><div class='add'>+		return FAILURE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Step 6: */</div><div class='add'>+	*pbData = EXTRACT_DATA_REGISTER(unDword1);</div><div class='add'>+</div><div class='add'>+	return (bStatus &amp; LBCIF_STATUS_ACK_ERROR) ? FAILURE : SUCCESS;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/staging/et131x/et1310_eeprom.h b/drivers/staging/et131x/et1310_eeprom.h<br/>new file mode 100644<br/>index 000000000000..9b6f8ad77b49<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/et131x/et1310_eeprom.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/et131x/et1310_eeprom.h</a></div><div class='hunk'>@@ -0,0 +1,89 @@</div><div class='add'>+/*</div><div class='add'>+ * Agere Systems Inc.</div><div class='add'>+ * 10/100/1000 Base-T Ethernet Driver for the ET1301 and ET131x series MACs</div><div class='add'>+ *</div><div class='add'>+ * Copyright © 2005 Agere Systems Inc.</div><div class='add'>+ * All rights reserved.</div><div class='add'>+ *   http://www.agere.com</div><div class='add'>+ *</div><div class='add'>+ *------------------------------------------------------------------------------</div><div class='add'>+ *</div><div class='add'>+ * et1310_eeprom.h - Defines, structs, enums, prototypes, etc. used for EEPROM</div><div class='add'>+ *                   access routines</div><div class='add'>+ *</div><div class='add'>+ *------------------------------------------------------------------------------</div><div class='add'>+ *</div><div class='add'>+ * SOFTWARE LICENSE</div><div class='add'>+ *</div><div class='add'>+ * This software is provided subject to the following terms and conditions,</div><div class='add'>+ * which you should read carefully before using the software.  Using this</div><div class='add'>+ * software indicates your acceptance of these terms and conditions.  If you do</div><div class='add'>+ * not agree with these terms and conditions, do not use the software.</div><div class='add'>+ *</div><div class='add'>+ * Copyright © 2005 Agere Systems Inc.</div><div class='add'>+ * All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source or binary forms, with or without</div><div class='add'>+ * modifications, are permitted provided that the following conditions are met:</div><div class='add'>+ *</div><div class='add'>+ * . Redistributions of source code must retain the above copyright notice, this</div><div class='add'>+ *    list of conditions and the following Disclaimer as comments in the code as</div><div class='add'>+ *    well as in the documentation and/or other materials provided with the</div><div class='add'>+ *    distribution.</div><div class='add'>+ *</div><div class='add'>+ * . Redistributions in binary form must reproduce the above copyright notice,</div><div class='add'>+ *    this list of conditions and the following Disclaimer in the documentation</div><div class='add'>+ *    and/or other materials provided with the distribution.</div><div class='add'>+ *</div><div class='add'>+ * . Neither the name of Agere Systems Inc. nor the names of the contributors</div><div class='add'>+ *    may be used to endorse or promote products derived from this software</div><div class='add'>+ *    without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ * Disclaimer</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES,</div><div class='add'>+ * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  ANY</div><div class='add'>+ * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN</div><div class='add'>+ * RISK. IN NO EVENT SHALL AGERE SYSTEMS INC. OR CONTRIBUTORS BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, INCLUDING, BUT NOT LIMITED TO, CONTRACT, STRICT</div><div class='add'>+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT</div><div class='add'>+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH</div><div class='add'>+ * DAMAGE.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __ET1310_EEPROM_H__</div><div class='add'>+#define __ET1310_EEPROM_H__</div><div class='add'>+</div><div class='add'>+#include "et1310_address_map.h"</div><div class='add'>+</div><div class='add'>+#ifndef SUCCESS</div><div class='add'>+#define SUCCESS		0</div><div class='add'>+#define FAILURE		1</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef READ</div><div class='add'>+#define READ		0</div><div class='add'>+#define WRITE		1</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef SINGLE_BYTE</div><div class='add'>+#define SINGLE_BYTE	0</div><div class='add'>+#define DUAL_BYTE	1</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* Forward declaration of the private adapter structure */</div><div class='add'>+struct et131x_adapter;</div><div class='add'>+</div><div class='add'>+int32_t EepromWriteByte(struct et131x_adapter *adapter, u32 unAddress,</div><div class='add'>+			u8 bData, u32 unEepromId,</div><div class='add'>+			u32 unAddressingMode);</div><div class='add'>+int32_t EepromReadByte(struct et131x_adapter *adapter, u32 unAddress,</div><div class='add'>+		       u8 *pbData, u32 unEepromId,</div><div class='add'>+		       u32 unAddressingMode);</div><div class='add'>+</div><div class='add'>+#endif /* _ET1310_EEPROM_H_ */</div><div class='head'>diff --git a/drivers/staging/et131x/et1310_jagcore.c b/drivers/staging/et131x/et1310_jagcore.c<br/>new file mode 100644<br/>index 000000000000..993b30ea71e2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/et131x/et1310_jagcore.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/et131x/et1310_jagcore.c</a></div><div class='hunk'>@@ -0,0 +1,220 @@</div><div class='add'>+/*</div><div class='add'>+ * Agere Systems Inc.</div><div class='add'>+ * 10/100/1000 Base-T Ethernet Driver for the ET1301 and ET131x series MACs</div><div class='add'>+ *</div><div class='add'>+ * Copyright © 2005 Agere Systems Inc.</div><div class='add'>+ * All rights reserved.</div><div class='add'>+ *   http://www.agere.com</div><div class='add'>+ *</div><div class='add'>+ *------------------------------------------------------------------------------</div><div class='add'>+ *</div><div class='add'>+ * et1310_jagcore.c - All code pertaining to the ET1301/ET131x's JAGcore</div><div class='add'>+ *</div><div class='add'>+ *------------------------------------------------------------------------------</div><div class='add'>+ *</div><div class='add'>+ * SOFTWARE LICENSE</div><div class='add'>+ *</div><div class='add'>+ * This software is provided subject to the following terms and conditions,</div><div class='add'>+ * which you should read carefully before using the software.  Using this</div><div class='add'>+ * software indicates your acceptance of these terms and conditions.  If you do</div><div class='add'>+ * not agree with these terms and conditions, do not use the software.</div><div class='add'>+ *</div><div class='add'>+ * Copyright © 2005 Agere Systems Inc.</div><div class='add'>+ * All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source or binary forms, with or without</div><div class='add'>+ * modifications, are permitted provided that the following conditions are met:</div><div class='add'>+ *</div><div class='add'>+ * . Redistributions of source code must retain the above copyright notice, this</div><div class='add'>+ *    list of conditions and the following Disclaimer as comments in the code as</div><div class='add'>+ *    well as in the documentation and/or other materials provided with the</div><div class='add'>+ *    distribution.</div><div class='add'>+ *</div><div class='add'>+ * . Redistributions in binary form must reproduce the above copyright notice,</div><div class='add'>+ *    this list of conditions and the following Disclaimer in the documentation</div><div class='add'>+ *    and/or other materials provided with the distribution.</div><div class='add'>+ *</div><div class='add'>+ * . Neither the name of Agere Systems Inc. nor the names of the contributors</div><div class='add'>+ *    may be used to endorse or promote products derived from this software</div><div class='add'>+ *    without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ * Disclaimer</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES,</div><div class='add'>+ * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  ANY</div><div class='add'>+ * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN</div><div class='add'>+ * RISK. IN NO EVENT SHALL AGERE SYSTEMS INC. OR CONTRIBUTORS BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, INCLUDING, BUT NOT LIMITED TO, CONTRACT, STRICT</div><div class='add'>+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT</div><div class='add'>+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH</div><div class='add'>+ * DAMAGE.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "et131x_version.h"</div><div class='add'>+#include "et131x_debug.h"</div><div class='add'>+#include "et131x_defs.h"</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/ptrace.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/ctype.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/timer.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/in.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/system.h&gt;</div><div class='add'>+#include &lt;asm/bitops.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/if_arp.h&gt;</div><div class='add'>+#include &lt;linux/ioport.h&gt;</div><div class='add'>+</div><div class='add'>+#include "et1310_phy.h"</div><div class='add'>+#include "et1310_pm.h"</div><div class='add'>+#include "et1310_jagcore.h"</div><div class='add'>+</div><div class='add'>+#include "et131x_adapter.h"</div><div class='add'>+#include "et131x_initpci.h"</div><div class='add'>+</div><div class='add'>+/* Data for debugging facilities */</div><div class='add'>+#ifdef CONFIG_ET131X_DEBUG</div><div class='add'>+extern dbg_info_t *et131x_dbginfo;</div><div class='add'>+#endif /* CONFIG_ET131X_DEBUG */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ConfigGlobalRegs - Used to configure the global registers on the JAGCore</div><div class='add'>+ * @pAdpater: pointer to our adapter structure</div><div class='add'>+ */</div><div class='add'>+void ConfigGlobalRegs(struct et131x_adapter *pAdapter)</div><div class='add'>+{</div><div class='add'>+	struct _GLOBAL_t __iomem *pGbl = &amp;pAdapter-&gt;CSRAddress-&gt;global;</div><div class='add'>+</div><div class='add'>+	DBG_ENTER(et131x_dbginfo);</div><div class='add'>+</div><div class='add'>+	if (pAdapter-&gt;RegistryPhyLoopbk == false) {</div><div class='add'>+		if (pAdapter-&gt;RegistryJumboPacket &lt; 2048) {</div><div class='add'>+			/* Tx / RxDMA and Tx/Rx MAC interfaces have a 1k word</div><div class='add'>+			 * block of RAM that the driver can split between Tx</div><div class='add'>+			 * and Rx as it desires.  Our default is to split it</div><div class='add'>+			 * 50/50:</div><div class='add'>+			 */</div><div class='add'>+			writel(0, &amp;pGbl-&gt;rxq_start_addr.value);</div><div class='add'>+			writel(pAdapter-&gt;RegistryRxMemEnd,</div><div class='add'>+			       &amp;pGbl-&gt;rxq_end_addr.value);</div><div class='add'>+			writel(pAdapter-&gt;RegistryRxMemEnd + 1,</div><div class='add'>+			       &amp;pGbl-&gt;txq_start_addr.value);</div><div class='add'>+			writel(INTERNAL_MEM_SIZE - 1,</div><div class='add'>+			       &amp;pGbl-&gt;txq_end_addr.value);</div><div class='add'>+		} else if (pAdapter-&gt;RegistryJumboPacket &lt; 8192) {</div><div class='add'>+			/* For jumbo packets &gt; 2k but &lt; 8k, split 50-50. */</div><div class='add'>+			writel(0, &amp;pGbl-&gt;rxq_start_addr.value);</div><div class='add'>+			writel(INTERNAL_MEM_RX_OFFSET,</div><div class='add'>+			       &amp;pGbl-&gt;rxq_end_addr.value);</div><div class='add'>+			writel(INTERNAL_MEM_RX_OFFSET + 1,</div><div class='add'>+			       &amp;pGbl-&gt;txq_start_addr.value);</div><div class='add'>+			writel(INTERNAL_MEM_SIZE - 1,</div><div class='add'>+			       &amp;pGbl-&gt;txq_end_addr.value);</div><div class='add'>+		} else {</div><div class='add'>+			/* 9216 is the only packet size greater than 8k that</div><div class='add'>+			 * is available. The Tx buffer has to be big enough</div><div class='add'>+			 * for one whole packet on the Tx side. We'll make</div><div class='add'>+			 * the Tx 9408, and give the rest to Rx</div><div class='add'>+			 */</div><div class='add'>+			writel(0x0000, &amp;pGbl-&gt;rxq_start_addr.value);</div><div class='add'>+			writel(0x01b3, &amp;pGbl-&gt;rxq_end_addr.value);</div><div class='add'>+			writel(0x01b4, &amp;pGbl-&gt;txq_start_addr.value);</div><div class='add'>+			writel(INTERNAL_MEM_SIZE - 1,</div><div class='add'>+			       &amp;pGbl-&gt;txq_end_addr.value);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Initialize the loopback register. Disable all loopbacks. */</div><div class='add'>+		writel(0, &amp;pGbl-&gt;loopback.value);</div><div class='add'>+	} else {</div><div class='add'>+		/* For PHY Line loopback, the memory is configured as if Tx</div><div class='add'>+		 * and Rx both have all the memory.  This is because the</div><div class='add'>+		 * RxMAC will write data into the space, and the TxMAC will</div><div class='add'>+		 * read it out.</div><div class='add'>+		 */</div><div class='add'>+		writel(0, &amp;pGbl-&gt;rxq_start_addr.value);</div><div class='add'>+		writel(INTERNAL_MEM_SIZE - 1, &amp;pGbl-&gt;rxq_end_addr.value);</div><div class='add'>+		writel(0, &amp;pGbl-&gt;txq_start_addr.value);</div><div class='add'>+		writel(INTERNAL_MEM_SIZE - 1, &amp;pGbl-&gt;txq_end_addr.value);</div><div class='add'>+</div><div class='add'>+		/* Initialize the loopback register (MAC loopback). */</div><div class='add'>+		writel(1, &amp;pGbl-&gt;loopback.value);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* MSI Register */</div><div class='add'>+	writel(0, &amp;pGbl-&gt;msi_config.value);</div><div class='add'>+</div><div class='add'>+	/* By default, disable the watchdog timer.  It will be enabled when</div><div class='add'>+	 * a packet is queued.</div><div class='add'>+	 */</div><div class='add'>+	writel(0, &amp;pGbl-&gt;watchdog_timer);</div><div class='add'>+</div><div class='add'>+	DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ConfigMMCRegs - Used to configure the main memory registers in the JAGCore</div><div class='add'>+ * @pAdapter: pointer to our adapter structure</div><div class='add'>+ */</div><div class='add'>+void ConfigMMCRegs(struct et131x_adapter *pAdapter)</div><div class='add'>+{</div><div class='add'>+	MMC_CTRL_t mmc_ctrl = { 0 };</div><div class='add'>+</div><div class='add'>+	DBG_ENTER(et131x_dbginfo);</div><div class='add'>+</div><div class='add'>+	/* All we need to do is initialize the Memory Control Register */</div><div class='add'>+	mmc_ctrl.bits.force_ce = 0x0;</div><div class='add'>+	mmc_ctrl.bits.rxdma_disable = 0x0;</div><div class='add'>+	mmc_ctrl.bits.txdma_disable = 0x0;</div><div class='add'>+	mmc_ctrl.bits.txmac_disable = 0x0;</div><div class='add'>+	mmc_ctrl.bits.rxmac_disable = 0x0;</div><div class='add'>+	mmc_ctrl.bits.arb_disable = 0x0;</div><div class='add'>+	mmc_ctrl.bits.mmc_enable = 0x1;</div><div class='add'>+</div><div class='add'>+	writel(mmc_ctrl.value, &amp;pAdapter-&gt;CSRAddress-&gt;mmc.mmc_ctrl.value);</div><div class='add'>+</div><div class='add'>+	DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void et131x_enable_interrupts(struct et131x_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	uint32_t MaskValue;</div><div class='add'>+</div><div class='add'>+	/* Enable all global interrupts */</div><div class='add'>+	if ((adapter-&gt;FlowControl == TxOnly) || (adapter-&gt;FlowControl == Both)) {</div><div class='add'>+		MaskValue = INT_MASK_ENABLE;</div><div class='add'>+	} else {</div><div class='add'>+		MaskValue = INT_MASK_ENABLE_NO_FLOW;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (adapter-&gt;DriverNoPhyAccess) {</div><div class='add'>+		MaskValue |= 0x10000;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	adapter-&gt;CachedMaskValue.value = MaskValue;</div><div class='add'>+	writel(MaskValue, &amp;adapter-&gt;CSRAddress-&gt;global.int_mask.value);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void et131x_disable_interrupts(struct et131x_adapter * adapter)</div><div class='add'>+{</div><div class='add'>+	/* Disable all global interrupts */</div><div class='add'>+	adapter-&gt;CachedMaskValue.value = INT_MASK_DISABLE;</div><div class='add'>+	writel(INT_MASK_DISABLE, &amp;adapter-&gt;CSRAddress-&gt;global.int_mask.value);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/staging/et131x/et1310_jagcore.h b/drivers/staging/et131x/et1310_jagcore.h<br/>new file mode 100644<br/>index 000000000000..9fc829336df1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/et131x/et1310_jagcore.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/et131x/et1310_jagcore.h</a></div><div class='hunk'>@@ -0,0 +1,112 @@</div><div class='add'>+/*</div><div class='add'>+ * Agere Systems Inc.</div><div class='add'>+ * 10/100/1000 Base-T Ethernet Driver for the ET1301 and ET131x series MACs</div><div class='add'>+ *</div><div class='add'>+ * Copyright © 2005 Agere Systems Inc.</div><div class='add'>+ * All rights reserved.</div><div class='add'>+ *   http://www.agere.com</div><div class='add'>+ *</div><div class='add'>+ *------------------------------------------------------------------------------</div><div class='add'>+ *</div><div class='add'>+ * et1310_jagcore.h - Defines, structs, enums, prototypes, etc. pertaining to</div><div class='add'>+ *                    the JAGCore</div><div class='add'>+ *</div><div class='add'>+ *------------------------------------------------------------------------------</div><div class='add'>+ *</div><div class='add'>+ * SOFTWARE LICENSE</div><div class='add'>+ *</div><div class='add'>+ * This software is provided subject to the following terms and conditions,</div><div class='add'>+ * which you should read carefully before using the software.  Using this</div><div class='add'>+ * software indicates your acceptance of these terms and conditions.  If you do</div><div class='add'>+ * not agree with these terms and conditions, do not use the software.</div><div class='add'>+ *</div><div class='add'>+ * Copyright © 2005 Agere Systems Inc.</div><div class='add'>+ * All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source or binary forms, with or without</div><div class='add'>+ * modifications, are permitted provided that the following conditions are met:</div><div class='add'>+ *</div><div class='add'>+ * . Redistributions of source code must retain the above copyright notice, this</div><div class='add'>+ *    list of conditions and the following Disclaimer as comments in the code as</div><div class='add'>+ *    well as in the documentation and/or other materials provided with the</div><div class='add'>+ *    distribution.</div><div class='add'>+ *</div><div class='add'>+ * . Redistributions in binary form must reproduce the above copyright notice,</div><div class='add'>+ *    this list of conditions and the following Disclaimer in the documentation</div><div class='add'>+ *    and/or other materials provided with the distribution.</div><div class='add'>+ *</div><div class='add'>+ * . Neither the name of Agere Systems Inc. nor the names of the contributors</div><div class='add'>+ *    may be used to endorse or promote products derived from this software</div><div class='add'>+ *    without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ * Disclaimer</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES,</div><div class='add'>+ * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  ANY</div><div class='add'>+ * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN</div><div class='add'>+ * RISK. IN NO EVENT SHALL AGERE SYSTEMS INC. OR CONTRIBUTORS BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, INCLUDING, BUT NOT LIMITED TO, CONTRACT, STRICT</div><div class='add'>+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT</div><div class='add'>+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH</div><div class='add'>+ * DAMAGE.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __ET1310_JAGCORE_H__</div><div class='add'>+#define __ET1310_JAGCORE_H__</div><div class='add'>+</div><div class='add'>+#include "et1310_address_map.h"</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define INTERNAL_MEM_SIZE       0x400	//1024 of internal memory</div><div class='add'>+#define INTERNAL_MEM_RX_OFFSET  0x1FF	//50%   Tx, 50%   Rx</div><div class='add'>+</div><div class='add'>+#define REGS_MAX_ARRAY          4096</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * For interrupts, normal running is:</div><div class='add'>+ *       rxdma_xfr_done, phy_interrupt, mac_stat_interrupt,</div><div class='add'>+ *       watchdog_interrupt &amp; txdma_xfer_done</div><div class='add'>+ *</div><div class='add'>+ * In both cases, when flow control is enabled for either Tx or bi-direction,</div><div class='add'>+ * we additional enable rx_fbr0_low and rx_fbr1_low, so we know when the</div><div class='add'>+ * buffer rings are running low.</div><div class='add'>+ */</div><div class='add'>+#define INT_MASK_DISABLE            0xffffffff</div><div class='add'>+</div><div class='add'>+// NOTE: Masking out MAC_STAT Interrupt for now...</div><div class='add'>+//#define INT_MASK_ENABLE             0xfff6bf17</div><div class='add'>+//#define INT_MASK_ENABLE_NO_FLOW     0xfff6bfd7</div><div class='add'>+#define INT_MASK_ENABLE             0xfffebf17</div><div class='add'>+#define INT_MASK_ENABLE_NO_FLOW     0xfffebfd7</div><div class='add'>+</div><div class='add'>+/* DATA STRUCTURES FOR DIRECT REGISTER ACCESS */</div><div class='add'>+</div><div class='add'>+typedef struct {</div><div class='add'>+	u8 bReadWrite;</div><div class='add'>+	u32 nRegCount;</div><div class='add'>+	u32 nData[REGS_MAX_ARRAY];</div><div class='add'>+	u32 nOffsets[REGS_MAX_ARRAY];</div><div class='add'>+} JAGCORE_ACCESS_REGS, *PJAGCORE_ACCESS_REGS;</div><div class='add'>+</div><div class='add'>+typedef struct {</div><div class='add'>+	u8 bReadWrite;</div><div class='add'>+	u32 nDataWidth;</div><div class='add'>+	u32 nRegCount;</div><div class='add'>+	u32 nOffsets[REGS_MAX_ARRAY];</div><div class='add'>+	u32 nData[REGS_MAX_ARRAY];</div><div class='add'>+} PCI_CFG_SPACE_REGS, *PPCI_CFG_SPACE_REGS;</div><div class='add'>+</div><div class='add'>+/* Forward declaration of the private adapter structure */</div><div class='add'>+struct et131x_adapter;</div><div class='add'>+</div><div class='add'>+void ConfigGlobalRegs(struct et131x_adapter *pAdapter);</div><div class='add'>+void ConfigMMCRegs(struct et131x_adapter *pAdapter);</div><div class='add'>+void et131x_enable_interrupts(struct et131x_adapter *adapter);</div><div class='add'>+void et131x_disable_interrupts(struct et131x_adapter *adapter);</div><div class='add'>+</div><div class='add'>+#endif /* __ET1310_JAGCORE_H__ */</div><div class='head'>diff --git a/drivers/staging/et131x/et1310_mac.c b/drivers/staging/et131x/et1310_mac.c<br/>new file mode 100644<br/>index 000000000000..1924968ab24f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/et131x/et1310_mac.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/et131x/et1310_mac.c</a></div><div class='hunk'>@@ -0,0 +1,792 @@</div><div class='add'>+/*</div><div class='add'>+ * Agere Systems Inc.</div><div class='add'>+ * 10/100/1000 Base-T Ethernet Driver for the ET1301 and ET131x series MACs</div><div class='add'>+ *</div><div class='add'>+ * Copyright © 2005 Agere Systems Inc.</div><div class='add'>+ * All rights reserved.</div><div class='add'>+ *   http://www.agere.com</div><div class='add'>+ *</div><div class='add'>+ *------------------------------------------------------------------------------</div><div class='add'>+ *</div><div class='add'>+ * et1310_mac.c - All code and routines pertaining to the MAC</div><div class='add'>+ *</div><div class='add'>+ *------------------------------------------------------------------------------</div><div class='add'>+ *</div><div class='add'>+ * SOFTWARE LICENSE</div><div class='add'>+ *</div><div class='add'>+ * This software is provided subject to the following terms and conditions,</div><div class='add'>+ * which you should read carefully before using the software.  Using this</div><div class='add'>+ * software indicates your acceptance of these terms and conditions.  If you do</div><div class='add'>+ * not agree with these terms and conditions, do not use the software.</div><div class='add'>+ *</div><div class='add'>+ * Copyright © 2005 Agere Systems Inc.</div><div class='add'>+ * All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source or binary forms, with or without</div><div class='add'>+ * modifications, are permitted provided that the following conditions are met:</div><div class='add'>+ *</div><div class='add'>+ * . Redistributions of source code must retain the above copyright notice, this</div><div class='add'>+ *    list of conditions and the following Disclaimer as comments in the code as</div><div class='add'>+ *    well as in the documentation and/or other materials provided with the</div><div class='add'>+ *    distribution.</div><div class='add'>+ *</div><div class='add'>+ * . Redistributions in binary form must reproduce the above copyright notice,</div><div class='add'>+ *    this list of conditions and the following Disclaimer in the documentation</div><div class='add'>+ *    and/or other materials provided with the distribution.</div><div class='add'>+ *</div><div class='add'>+ * . Neither the name of Agere Systems Inc. nor the names of the contributors</div><div class='add'>+ *    may be used to endorse or promote products derived from this software</div><div class='add'>+ *    without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ * Disclaimer</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES,</div><div class='add'>+ * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  ANY</div><div class='add'>+ * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN</div><div class='add'>+ * RISK. IN NO EVENT SHALL AGERE SYSTEMS INC. OR CONTRIBUTORS BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, INCLUDING, BUT NOT LIMITED TO, CONTRACT, STRICT</div><div class='add'>+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT</div><div class='add'>+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH</div><div class='add'>+ * DAMAGE.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "et131x_version.h"</div><div class='add'>+#include "et131x_debug.h"</div><div class='add'>+#include "et131x_defs.h"</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/ptrace.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/ctype.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/timer.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/in.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/system.h&gt;</div><div class='add'>+#include &lt;asm/bitops.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/if_arp.h&gt;</div><div class='add'>+#include &lt;linux/ioport.h&gt;</div><div class='add'>+#include &lt;linux/crc32.h&gt;</div><div class='add'>+</div><div class='add'>+#include "et1310_phy.h"</div><div class='add'>+#include "et1310_pm.h"</div><div class='add'>+#include "et1310_jagcore.h"</div><div class='add'>+#include "et1310_mac.h"</div><div class='add'>+</div><div class='add'>+#include "et131x_adapter.h"</div><div class='add'>+#include "et131x_initpci.h"</div><div class='add'>+</div><div class='add'>+/* Data for debugging facilities */</div><div class='add'>+#ifdef CONFIG_ET131X_DEBUG</div><div class='add'>+extern dbg_info_t *et131x_dbginfo;</div><div class='add'>+#endif /* CONFIG_ET131X_DEBUG */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ConfigMacRegs1 - Initialize the first part of MAC regs</div><div class='add'>+ * @pAdpater: pointer to our adapter structure</div><div class='add'>+ */</div><div class='add'>+void ConfigMACRegs1(struct et131x_adapter *pAdapter)</div><div class='add'>+{</div><div class='add'>+	struct _MAC_t __iomem *pMac = &amp;pAdapter-&gt;CSRAddress-&gt;mac;</div><div class='add'>+	MAC_STATION_ADDR1_t station1;</div><div class='add'>+	MAC_STATION_ADDR2_t station2;</div><div class='add'>+	MAC_IPG_t ipg;</div><div class='add'>+	MAC_HFDP_t hfdp;</div><div class='add'>+	MII_MGMT_CFG_t mii_mgmt_cfg;</div><div class='add'>+</div><div class='add'>+	DBG_ENTER(et131x_dbginfo);</div><div class='add'>+</div><div class='add'>+	/* First we need to reset everything.  Write to MAC configuration</div><div class='add'>+	 * register 1 to perform reset.</div><div class='add'>+	 */</div><div class='add'>+	writel(0xC00F0000, &amp;pMac-&gt;cfg1.value);</div><div class='add'>+</div><div class='add'>+	/* Next lets configure the MAC Inter-packet gap register */</div><div class='add'>+	ipg.bits.non_B2B_ipg_1 = 0x38;		// 58d</div><div class='add'>+	ipg.bits.non_B2B_ipg_2 = 0x58;		// 88d</div><div class='add'>+	ipg.bits.min_ifg_enforce = 0x50;	// 80d</div><div class='add'>+	ipg.bits.B2B_ipg = 0x60;		// 96d</div><div class='add'>+	writel(ipg.value, &amp;pMac-&gt;ipg.value);</div><div class='add'>+</div><div class='add'>+	/* Next lets configure the MAC Half Duplex register */</div><div class='add'>+	hfdp.bits.alt_beb_trunc = 0xA;</div><div class='add'>+	hfdp.bits.alt_beb_enable = 0x0;</div><div class='add'>+	hfdp.bits.bp_no_backoff = 0x0;</div><div class='add'>+	hfdp.bits.no_backoff = 0x0;</div><div class='add'>+	hfdp.bits.excess_defer = 0x1;</div><div class='add'>+	hfdp.bits.rexmit_max = 0xF;</div><div class='add'>+	hfdp.bits.coll_window = 0x37;		// 55d</div><div class='add'>+	writel(hfdp.value, &amp;pMac-&gt;hfdp.value);</div><div class='add'>+</div><div class='add'>+	/* Next lets configure the MAC Interface Control register */</div><div class='add'>+	writel(0, &amp;pMac-&gt;if_ctrl.value);</div><div class='add'>+</div><div class='add'>+	/* Let's move on to setting up the mii managment configuration */</div><div class='add'>+	mii_mgmt_cfg.bits.reset_mii_mgmt = 0;</div><div class='add'>+	mii_mgmt_cfg.bits.scan_auto_incremt = 0;</div><div class='add'>+	mii_mgmt_cfg.bits.preamble_suppress = 0;</div><div class='add'>+	mii_mgmt_cfg.bits.mgmt_clk_reset = 0x7;</div><div class='add'>+	writel(mii_mgmt_cfg.value, &amp;pMac-&gt;mii_mgmt_cfg.value);</div><div class='add'>+</div><div class='add'>+	/* Next lets configure the MAC Station Address register.  These</div><div class='add'>+	 * values are read from the EEPROM during initialization and stored</div><div class='add'>+	 * in the adapter structure.  We write what is stored in the adapter</div><div class='add'>+	 * structure to the MAC Station Address registers high and low.  This</div><div class='add'>+	 * station address is used for generating and checking pause control</div><div class='add'>+	 * packets.</div><div class='add'>+	 */</div><div class='add'>+	station2.bits.Octet1 = pAdapter-&gt;CurrentAddress[0];</div><div class='add'>+	station2.bits.Octet2 = pAdapter-&gt;CurrentAddress[1];</div><div class='add'>+	station1.bits.Octet3 = pAdapter-&gt;CurrentAddress[2];</div><div class='add'>+	station1.bits.Octet4 = pAdapter-&gt;CurrentAddress[3];</div><div class='add'>+	station1.bits.Octet5 = pAdapter-&gt;CurrentAddress[4];</div><div class='add'>+	station1.bits.Octet6 = pAdapter-&gt;CurrentAddress[5];</div><div class='add'>+	writel(station1.value, &amp;pMac-&gt;station_addr_1.value);</div><div class='add'>+	writel(station2.value, &amp;pMac-&gt;station_addr_2.value);</div><div class='add'>+</div><div class='add'>+	/* Max ethernet packet in bytes that will passed by the mac without</div><div class='add'>+	 * being truncated.  Allow the MAC to pass 4 more than our max packet</div><div class='add'>+	 * size.  This is 4 for the Ethernet CRC.</div><div class='add'>+	 *</div><div class='add'>+	 * Packets larger than (RegistryJumboPacket) that do not contain a</div><div class='add'>+	 * VLAN ID will be dropped by the Rx function.</div><div class='add'>+	 */</div><div class='add'>+	writel(pAdapter-&gt;RegistryJumboPacket + 4, &amp;pMac-&gt;max_fm_len.value);</div><div class='add'>+</div><div class='add'>+	/* clear out MAC config reset */</div><div class='add'>+	writel(0, &amp;pMac-&gt;cfg1.value);</div><div class='add'>+</div><div class='add'>+	DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ConfigMacRegs2 - Initialize the second part of MAC regs</div><div class='add'>+ * @pAdpater: pointer to our adapter structure</div><div class='add'>+ */</div><div class='add'>+void ConfigMACRegs2(struct et131x_adapter *pAdapter)</div><div class='add'>+{</div><div class='add'>+	int32_t delay = 0;</div><div class='add'>+	struct _MAC_t __iomem *pMac = &amp;pAdapter-&gt;CSRAddress-&gt;mac;</div><div class='add'>+	MAC_CFG1_t cfg1;</div><div class='add'>+	MAC_CFG2_t cfg2;</div><div class='add'>+	MAC_IF_CTRL_t ifctrl;</div><div class='add'>+	TXMAC_CTL_t ctl;</div><div class='add'>+</div><div class='add'>+	DBG_ENTER(et131x_dbginfo);</div><div class='add'>+</div><div class='add'>+	ctl.value = readl(&amp;pAdapter-&gt;CSRAddress-&gt;txmac.ctl.value);</div><div class='add'>+	cfg1.value = readl(&amp;pMac-&gt;cfg1.value);</div><div class='add'>+	cfg2.value = readl(&amp;pMac-&gt;cfg2.value);</div><div class='add'>+	ifctrl.value = readl(&amp;pMac-&gt;if_ctrl.value);</div><div class='add'>+</div><div class='add'>+	if (pAdapter-&gt;uiLinkSpeed == TRUEPHY_SPEED_1000MBPS) {</div><div class='add'>+		cfg2.bits.if_mode = 0x2;</div><div class='add'>+		ifctrl.bits.phy_mode = 0x0;</div><div class='add'>+	} else {</div><div class='add'>+		cfg2.bits.if_mode = 0x1;</div><div class='add'>+		ifctrl.bits.phy_mode = 0x1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* We need to enable Rx/Tx */</div><div class='add'>+	cfg1.bits.rx_enable = 0x1;</div><div class='add'>+	cfg1.bits.tx_enable = 0x1;</div><div class='add'>+</div><div class='add'>+	/* Set up flow control */</div><div class='add'>+	cfg1.bits.tx_flow = 0x1;</div><div class='add'>+</div><div class='add'>+	if ((pAdapter-&gt;FlowControl == RxOnly) ||</div><div class='add'>+	    (pAdapter-&gt;FlowControl == Both)) {</div><div class='add'>+		cfg1.bits.rx_flow = 0x1;</div><div class='add'>+	} else {</div><div class='add'>+		cfg1.bits.rx_flow = 0x0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Initialize loop back to off */</div><div class='add'>+	cfg1.bits.loop_back = 0;</div><div class='add'>+</div><div class='add'>+	writel(cfg1.value, &amp;pMac-&gt;cfg1.value);</div><div class='add'>+</div><div class='add'>+	/* Now we need to initialize the MAC Configuration 2 register */</div><div class='add'>+	cfg2.bits.preamble_len = 0x7;</div><div class='add'>+	cfg2.bits.huge_frame = 0x0;</div><div class='add'>+	/* LENGTH FIELD CHECKING bit4: Set this bit to cause the MAC to check</div><div class='add'>+	 * the frame's length field to ensure it matches the actual data</div><div class='add'>+	 * field length. Clear this bit if no length field checking is</div><div class='add'>+	 * desired. Its default is 0.</div><div class='add'>+	 */</div><div class='add'>+	cfg2.bits.len_check = 0x1;</div><div class='add'>+</div><div class='add'>+	if (pAdapter-&gt;RegistryPhyLoopbk == false) {</div><div class='add'>+		cfg2.bits.pad_crc = 0x1;</div><div class='add'>+		cfg2.bits.crc_enable = 0x1;</div><div class='add'>+	} else {</div><div class='add'>+		cfg2.bits.pad_crc = 0;</div><div class='add'>+		cfg2.bits.crc_enable = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* 1 - full duplex, 0 - half-duplex */</div><div class='add'>+	cfg2.bits.full_duplex = pAdapter-&gt;uiDuplexMode;</div><div class='add'>+	ifctrl.bits.ghd_mode = !pAdapter-&gt;uiDuplexMode;</div><div class='add'>+</div><div class='add'>+	writel(ifctrl.value, &amp;pMac-&gt;if_ctrl.value);</div><div class='add'>+	writel(cfg2.value, &amp;pMac-&gt;cfg2.value);</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		udelay(10);</div><div class='add'>+		delay++;</div><div class='add'>+		cfg1.value = readl(&amp;pMac-&gt;cfg1.value);</div><div class='add'>+	} while ((!cfg1.bits.syncd_rx_en ||</div><div class='add'>+		  !cfg1.bits.syncd_tx_en) &amp;&amp;</div><div class='add'>+		 delay &lt; 100);</div><div class='add'>+</div><div class='add'>+	if (delay == 100) {</div><div class='add'>+		DBG_ERROR(et131x_dbginfo,</div><div class='add'>+			  "Syncd bits did not respond correctly cfg1 word 0x%08x\n",</div><div class='add'>+			  cfg1.value);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBG_TRACE(et131x_dbginfo,</div><div class='add'>+		  "Speed %d, Dup %d, CFG1 0x%08x, CFG2 0x%08x, if_ctrl 0x%08x\n",</div><div class='add'>+		  pAdapter-&gt;uiLinkSpeed, pAdapter-&gt;uiDuplexMode,</div><div class='add'>+		  readl(&amp;pMac-&gt;cfg1.value), readl(&amp;pMac-&gt;cfg2.value),</div><div class='add'>+		  readl(&amp;pMac-&gt;if_ctrl.value));</div><div class='add'>+</div><div class='add'>+	/* Enable TXMAC */</div><div class='add'>+	ctl.bits.txmac_en = 0x1;</div><div class='add'>+	ctl.bits.fc_disable = 0x1;</div><div class='add'>+	writel(ctl.value, &amp;pAdapter-&gt;CSRAddress-&gt;txmac.ctl.value);</div><div class='add'>+</div><div class='add'>+	/* Ready to start the RXDMA/TXDMA engine */</div><div class='add'>+	if (!MP_TEST_FLAG(pAdapter, fMP_ADAPTER_LOWER_POWER)) {</div><div class='add'>+		et131x_rx_dma_enable(pAdapter);</div><div class='add'>+		et131x_tx_dma_enable(pAdapter);</div><div class='add'>+	} else {</div><div class='add'>+		DBG_WARNING(et131x_dbginfo,</div><div class='add'>+			    "Didn't enable Rx/Tx due to low-power mode\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ConfigRxMacRegs(struct et131x_adapter *pAdapter)</div><div class='add'>+{</div><div class='add'>+	struct _RXMAC_t __iomem *pRxMac = &amp;pAdapter-&gt;CSRAddress-&gt;rxmac;</div><div class='add'>+	RXMAC_WOL_SA_LO_t sa_lo;</div><div class='add'>+	RXMAC_WOL_SA_HI_t sa_hi;</div><div class='add'>+	RXMAC_PF_CTRL_t pf_ctrl = { 0 };</div><div class='add'>+</div><div class='add'>+	DBG_ENTER(et131x_dbginfo);</div><div class='add'>+</div><div class='add'>+	/* Disable the MAC while it is being configured (also disable WOL) */</div><div class='add'>+	writel(0x8, &amp;pRxMac-&gt;ctrl.value);</div><div class='add'>+</div><div class='add'>+	/* Initialize WOL to disabled. */</div><div class='add'>+	writel(0, &amp;pRxMac-&gt;crc0.value);</div><div class='add'>+	writel(0, &amp;pRxMac-&gt;crc12.value);</div><div class='add'>+	writel(0, &amp;pRxMac-&gt;crc34.value);</div><div class='add'>+</div><div class='add'>+	/* We need to set the WOL mask0 - mask4 next.  We initialize it to</div><div class='add'>+	 * its default Values of 0x00000000 because there are not WOL masks</div><div class='add'>+	 * as of this time.</div><div class='add'>+	 */</div><div class='add'>+	writel(0, &amp;pRxMac-&gt;mask0_word0);</div><div class='add'>+	writel(0, &amp;pRxMac-&gt;mask0_word1);</div><div class='add'>+	writel(0, &amp;pRxMac-&gt;mask0_word2);</div><div class='add'>+	writel(0, &amp;pRxMac-&gt;mask0_word3);</div><div class='add'>+</div><div class='add'>+	writel(0, &amp;pRxMac-&gt;mask1_word0);</div><div class='add'>+	writel(0, &amp;pRxMac-&gt;mask1_word1);</div><div class='add'>+	writel(0, &amp;pRxMac-&gt;mask1_word2);</div><div class='add'>+	writel(0, &amp;pRxMac-&gt;mask1_word3);</div><div class='add'>+</div><div class='add'>+	writel(0, &amp;pRxMac-&gt;mask2_word0);</div><div class='add'>+	writel(0, &amp;pRxMac-&gt;mask2_word1);</div><div class='add'>+	writel(0, &amp;pRxMac-&gt;mask2_word2);</div><div class='add'>+	writel(0, &amp;pRxMac-&gt;mask2_word3);</div><div class='add'>+</div><div class='add'>+	writel(0, &amp;pRxMac-&gt;mask3_word0);</div><div class='add'>+	writel(0, &amp;pRxMac-&gt;mask3_word1);</div><div class='add'>+	writel(0, &amp;pRxMac-&gt;mask3_word2);</div><div class='add'>+	writel(0, &amp;pRxMac-&gt;mask3_word3);</div><div class='add'>+</div><div class='add'>+	writel(0, &amp;pRxMac-&gt;mask4_word0);</div><div class='add'>+	writel(0, &amp;pRxMac-&gt;mask4_word1);</div><div class='add'>+	writel(0, &amp;pRxMac-&gt;mask4_word2);</div><div class='add'>+	writel(0, &amp;pRxMac-&gt;mask4_word3);</div><div class='add'>+</div><div class='add'>+	/* Lets setup the WOL Source Address */</div><div class='add'>+	sa_lo.bits.sa3 = pAdapter-&gt;CurrentAddress[2];</div><div class='add'>+	sa_lo.bits.sa4 = pAdapter-&gt;CurrentAddress[3];</div><div class='add'>+	sa_lo.bits.sa5 = pAdapter-&gt;CurrentAddress[4];</div><div class='add'>+	sa_lo.bits.sa6 = pAdapter-&gt;CurrentAddress[5];</div><div class='add'>+	writel(sa_lo.value, &amp;pRxMac-&gt;sa_lo.value);</div><div class='add'>+</div><div class='add'>+	sa_hi.bits.sa1 = pAdapter-&gt;CurrentAddress[0];</div><div class='add'>+	sa_hi.bits.sa2 = pAdapter-&gt;CurrentAddress[1];</div><div class='add'>+	writel(sa_hi.value, &amp;pRxMac-&gt;sa_hi.value);</div><div class='add'>+</div><div class='add'>+	/* Disable all Packet Filtering */</div><div class='add'>+	writel(0, &amp;pRxMac-&gt;pf_ctrl.value);</div><div class='add'>+</div><div class='add'>+	/* Let's initialize the Unicast Packet filtering address */</div><div class='add'>+	if (pAdapter-&gt;PacketFilter &amp; ET131X_PACKET_TYPE_DIRECTED) {</div><div class='add'>+		SetupDeviceForUnicast(pAdapter);</div><div class='add'>+		pf_ctrl.bits.filter_uni_en = 1;</div><div class='add'>+	} else {</div><div class='add'>+		writel(0, &amp;pRxMac-&gt;uni_pf_addr1.value);</div><div class='add'>+		writel(0, &amp;pRxMac-&gt;uni_pf_addr2.value);</div><div class='add'>+		writel(0, &amp;pRxMac-&gt;uni_pf_addr3.value);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Let's initialize the Multicast hash */</div><div class='add'>+	if (pAdapter-&gt;PacketFilter &amp; ET131X_PACKET_TYPE_ALL_MULTICAST) {</div><div class='add'>+		pf_ctrl.bits.filter_multi_en = 0;</div><div class='add'>+	} else {</div><div class='add'>+		pf_ctrl.bits.filter_multi_en = 1;</div><div class='add'>+		SetupDeviceForMulticast(pAdapter);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Runt packet filtering.  Didn't work in version A silicon. */</div><div class='add'>+	pf_ctrl.bits.min_pkt_size = NIC_MIN_PACKET_SIZE + 4;</div><div class='add'>+	pf_ctrl.bits.filter_frag_en = 1;</div><div class='add'>+</div><div class='add'>+	if (pAdapter-&gt;RegistryJumboPacket &gt; 8192) {</div><div class='add'>+		RXMAC_MCIF_CTRL_MAX_SEG_t mcif_ctrl_max_seg;</div><div class='add'>+</div><div class='add'>+		/* In order to transmit jumbo packets greater than 8k, the</div><div class='add'>+		 * FIFO between RxMAC and RxDMA needs to be reduced in size</div><div class='add'>+		 * to (16k - Jumbo packet size).  In order to implement this,</div><div class='add'>+		 * we must use "cut through" mode in the RxMAC, which chops</div><div class='add'>+		 * packets down into segments which are (max_size * 16).  In</div><div class='add'>+		 * this case we selected 256 bytes, since this is the size of</div><div class='add'>+		 * the PCI-Express TLP's that the 1310 uses.</div><div class='add'>+		 */</div><div class='add'>+		mcif_ctrl_max_seg.bits.seg_en = 0x1;</div><div class='add'>+		mcif_ctrl_max_seg.bits.fc_en = 0x0;</div><div class='add'>+		mcif_ctrl_max_seg.bits.max_size = 0x10;</div><div class='add'>+</div><div class='add'>+		writel(mcif_ctrl_max_seg.value,</div><div class='add'>+		       &amp;pRxMac-&gt;mcif_ctrl_max_seg.value);</div><div class='add'>+	} else {</div><div class='add'>+		writel(0, &amp;pRxMac-&gt;mcif_ctrl_max_seg.value);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Initialize the MCIF water marks */</div><div class='add'>+	writel(0, &amp;pRxMac-&gt;mcif_water_mark.value);</div><div class='add'>+</div><div class='add'>+	/*  Initialize the MIF control */</div><div class='add'>+	writel(0, &amp;pRxMac-&gt;mif_ctrl.value);</div><div class='add'>+</div><div class='add'>+	/* Initialize the Space Available Register */</div><div class='add'>+	writel(0, &amp;pRxMac-&gt;space_avail.value);</div><div class='add'>+</div><div class='add'>+	/* Initialize the the mif_ctrl register</div><div class='add'>+	 * bit 3:  Receive code error. One or more nibbles were signaled as</div><div class='add'>+	 *	   errors  during the reception of the packet.  Clear this</div><div class='add'>+	 *	   bit in Gigabit, set it in 100Mbit.  This was derived</div><div class='add'>+	 *	   experimentally at UNH.</div><div class='add'>+	 * bit 4:  Receive CRC error. The packet's CRC did not match the</div><div class='add'>+	 *	   internally generated CRC.</div><div class='add'>+	 * bit 5:  Receive length check error. Indicates that frame length</div><div class='add'>+	 *	   field value in the packet does not match the actual data</div><div class='add'>+	 *	   byte length and is not a type field.</div><div class='add'>+	 * bit 16: Receive frame truncated.</div><div class='add'>+	 * bit 17: Drop packet enable</div><div class='add'>+	 */</div><div class='add'>+	if (pAdapter-&gt;uiLinkSpeed == TRUEPHY_SPEED_100MBPS) {</div><div class='add'>+		writel(0x30038, &amp;pRxMac-&gt;mif_ctrl.value);</div><div class='add'>+	} else {</div><div class='add'>+		writel(0x30030, &amp;pRxMac-&gt;mif_ctrl.value);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Finally we initialize RxMac to be enabled &amp; WOL disabled.  Packet</div><div class='add'>+	 * filter is always enabled since it is where the runt packets are</div><div class='add'>+	 * supposed to be dropped.  For version A silicon, runt packet</div><div class='add'>+	 * dropping doesn't work, so it is disabled in the pf_ctrl register,</div><div class='add'>+	 * but we still leave the packet filter on.</div><div class='add'>+	 */</div><div class='add'>+	writel(pf_ctrl.value, &amp;pRxMac-&gt;pf_ctrl.value);</div><div class='add'>+	writel(0x9, &amp;pRxMac-&gt;ctrl.value);</div><div class='add'>+</div><div class='add'>+	DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ConfigTxMacRegs(struct et131x_adapter *pAdapter)</div><div class='add'>+{</div><div class='add'>+	struct _TXMAC_t __iomem *pTxMac = &amp;pAdapter-&gt;CSRAddress-&gt;txmac;</div><div class='add'>+	TXMAC_CF_PARAM_t Local;</div><div class='add'>+</div><div class='add'>+	DBG_ENTER(et131x_dbginfo);</div><div class='add'>+</div><div class='add'>+	/* We need to update the Control Frame Parameters</div><div class='add'>+	 * cfpt - control frame pause timer set to 64 (0x40)</div><div class='add'>+	 * cfep - control frame extended pause timer set to 0x0</div><div class='add'>+	 */</div><div class='add'>+	if (pAdapter-&gt;FlowControl == None) {</div><div class='add'>+		writel(0, &amp;pTxMac-&gt;cf_param.value);</div><div class='add'>+	} else {</div><div class='add'>+		Local.bits.cfpt = 0x40;</div><div class='add'>+		Local.bits.cfep = 0x0;</div><div class='add'>+		writel(Local.value, &amp;pTxMac-&gt;cf_param.value);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ConfigMacStatRegs(struct et131x_adapter *pAdapter)</div><div class='add'>+{</div><div class='add'>+	struct _MAC_STAT_t __iomem *pDevMacStat =</div><div class='add'>+		&amp;pAdapter-&gt;CSRAddress-&gt;macStat;</div><div class='add'>+</div><div class='add'>+	DBG_ENTER(et131x_dbginfo);</div><div class='add'>+</div><div class='add'>+	/* Next we need to initialize all the MAC_STAT registers to zero on</div><div class='add'>+	 * the device.</div><div class='add'>+	 */</div><div class='add'>+	writel(0, &amp;pDevMacStat-&gt;RFcs);</div><div class='add'>+	writel(0, &amp;pDevMacStat-&gt;RAln);</div><div class='add'>+	writel(0, &amp;pDevMacStat-&gt;RFlr);</div><div class='add'>+	writel(0, &amp;pDevMacStat-&gt;RDrp);</div><div class='add'>+	writel(0, &amp;pDevMacStat-&gt;RCde);</div><div class='add'>+	writel(0, &amp;pDevMacStat-&gt;ROvr);</div><div class='add'>+	writel(0, &amp;pDevMacStat-&gt;RFrg);</div><div class='add'>+</div><div class='add'>+	writel(0, &amp;pDevMacStat-&gt;TScl);</div><div class='add'>+	writel(0, &amp;pDevMacStat-&gt;TDfr);</div><div class='add'>+	writel(0, &amp;pDevMacStat-&gt;TMcl);</div><div class='add'>+	writel(0, &amp;pDevMacStat-&gt;TLcl);</div><div class='add'>+	writel(0, &amp;pDevMacStat-&gt;TNcl);</div><div class='add'>+	writel(0, &amp;pDevMacStat-&gt;TOvr);</div><div class='add'>+	writel(0, &amp;pDevMacStat-&gt;TUnd);</div><div class='add'>+</div><div class='add'>+	/* Unmask any counters that we want to track the overflow of.</div><div class='add'>+	 * Initially this will be all counters.  It may become clear later</div><div class='add'>+	 * that we do not need to track all counters.</div><div class='add'>+	 */</div><div class='add'>+	{</div><div class='add'>+		MAC_STAT_REG_1_t Carry1M = { 0xffffffff };</div><div class='add'>+</div><div class='add'>+		Carry1M.bits.rdrp = 0;</div><div class='add'>+		Carry1M.bits.rjbr = 1;</div><div class='add'>+		Carry1M.bits.rfrg = 0;</div><div class='add'>+		Carry1M.bits.rovr = 0;</div><div class='add'>+		Carry1M.bits.rund = 1;</div><div class='add'>+		Carry1M.bits.rcse = 1;</div><div class='add'>+		Carry1M.bits.rcde = 0;</div><div class='add'>+		Carry1M.bits.rflr = 0;</div><div class='add'>+		Carry1M.bits.raln = 0;</div><div class='add'>+		Carry1M.bits.rxuo = 1;</div><div class='add'>+		Carry1M.bits.rxpf = 1;</div><div class='add'>+		Carry1M.bits.rxcf = 1;</div><div class='add'>+		Carry1M.bits.rbca = 1;</div><div class='add'>+		Carry1M.bits.rmca = 1;</div><div class='add'>+		Carry1M.bits.rfcs = 0;</div><div class='add'>+		Carry1M.bits.rpkt = 1;</div><div class='add'>+		Carry1M.bits.rbyt = 1;</div><div class='add'>+		Carry1M.bits.trmgv = 1;</div><div class='add'>+		Carry1M.bits.trmax = 1;</div><div class='add'>+		Carry1M.bits.tr1k = 1;</div><div class='add'>+		Carry1M.bits.tr511 = 1;</div><div class='add'>+		Carry1M.bits.tr255 = 1;</div><div class='add'>+		Carry1M.bits.tr127 = 1;</div><div class='add'>+		Carry1M.bits.tr64 = 1;</div><div class='add'>+</div><div class='add'>+		writel(Carry1M.value, &amp;pDevMacStat-&gt;Carry1M.value);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	{</div><div class='add'>+		MAC_STAT_REG_2_t Carry2M = { 0xffffffff };</div><div class='add'>+</div><div class='add'>+		Carry2M.bits.tdrp = 1;</div><div class='add'>+		Carry2M.bits.tpfh = 1;</div><div class='add'>+		Carry2M.bits.tncl = 0;</div><div class='add'>+		Carry2M.bits.txcl = 1;</div><div class='add'>+		Carry2M.bits.tlcl = 0;</div><div class='add'>+		Carry2M.bits.tmcl = 0;</div><div class='add'>+		Carry2M.bits.tscl = 0;</div><div class='add'>+		Carry2M.bits.tedf = 1;</div><div class='add'>+		Carry2M.bits.tdfr = 0;</div><div class='add'>+		Carry2M.bits.txpf = 1;</div><div class='add'>+		Carry2M.bits.tbca = 1;</div><div class='add'>+		Carry2M.bits.tmca = 1;</div><div class='add'>+		Carry2M.bits.tpkt = 1;</div><div class='add'>+		Carry2M.bits.tbyt = 1;</div><div class='add'>+		Carry2M.bits.tfrg = 1;</div><div class='add'>+		Carry2M.bits.tund = 0;</div><div class='add'>+		Carry2M.bits.tovr = 0;</div><div class='add'>+		Carry2M.bits.txcf = 1;</div><div class='add'>+		Carry2M.bits.tfcs = 1;</div><div class='add'>+		Carry2M.bits.tjbr = 1;</div><div class='add'>+</div><div class='add'>+		writel(Carry2M.value, &amp;pDevMacStat-&gt;Carry2M.value);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ConfigFlowControl(struct et131x_adapter * pAdapter)</div><div class='add'>+{</div><div class='add'>+	if (pAdapter-&gt;uiDuplexMode == 0) {</div><div class='add'>+		pAdapter-&gt;FlowControl = None;</div><div class='add'>+	} else {</div><div class='add'>+		char RemotePause, RemoteAsyncPause;</div><div class='add'>+</div><div class='add'>+		ET1310_PhyAccessMiBit(pAdapter,</div><div class='add'>+				      TRUEPHY_BIT_READ, 5, 10, &amp;RemotePause);</div><div class='add'>+		ET1310_PhyAccessMiBit(pAdapter,</div><div class='add'>+				      TRUEPHY_BIT_READ, 5, 11,</div><div class='add'>+				      &amp;RemoteAsyncPause);</div><div class='add'>+</div><div class='add'>+		if ((RemotePause == TRUEPHY_BIT_SET) &amp;&amp;</div><div class='add'>+		    (RemoteAsyncPause == TRUEPHY_BIT_SET)) {</div><div class='add'>+			pAdapter-&gt;FlowControl = pAdapter-&gt;RegistryFlowControl;</div><div class='add'>+		} else if ((RemotePause == TRUEPHY_BIT_SET) &amp;&amp;</div><div class='add'>+			   (RemoteAsyncPause == TRUEPHY_BIT_CLEAR)) {</div><div class='add'>+			if (pAdapter-&gt;RegistryFlowControl == Both) {</div><div class='add'>+				pAdapter-&gt;FlowControl = Both;</div><div class='add'>+			} else {</div><div class='add'>+				pAdapter-&gt;FlowControl = None;</div><div class='add'>+			}</div><div class='add'>+		} else if ((RemotePause == TRUEPHY_BIT_CLEAR) &amp;&amp;</div><div class='add'>+			   (RemoteAsyncPause == TRUEPHY_BIT_CLEAR)) {</div><div class='add'>+			pAdapter-&gt;FlowControl = None;</div><div class='add'>+		} else {/* if (RemotePause == TRUEPHY_CLEAR_BIT &amp;&amp;</div><div class='add'>+			       RemoteAsyncPause == TRUEPHY_SET_BIT) */</div><div class='add'>+			if (pAdapter-&gt;RegistryFlowControl == Both) {</div><div class='add'>+				pAdapter-&gt;FlowControl = RxOnly;</div><div class='add'>+			} else {</div><div class='add'>+				pAdapter-&gt;FlowControl = None;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * UpdateMacStatHostCounters - Update the local copy of the statistics</div><div class='add'>+ * @pAdapter: pointer to the adapter structure</div><div class='add'>+ */</div><div class='add'>+void UpdateMacStatHostCounters(struct et131x_adapter *pAdapter)</div><div class='add'>+{</div><div class='add'>+	struct _ce_stats_t *stats = &amp;pAdapter-&gt;Stats;</div><div class='add'>+	struct _MAC_STAT_t __iomem *pDevMacStat =</div><div class='add'>+		&amp;pAdapter-&gt;CSRAddress-&gt;macStat;</div><div class='add'>+</div><div class='add'>+	stats-&gt;collisions += readl(&amp;pDevMacStat-&gt;TNcl);</div><div class='add'>+	stats-&gt;first_collision += readl(&amp;pDevMacStat-&gt;TScl);</div><div class='add'>+	stats-&gt;tx_deferred += readl(&amp;pDevMacStat-&gt;TDfr);</div><div class='add'>+	stats-&gt;excessive_collisions += readl(&amp;pDevMacStat-&gt;TMcl);</div><div class='add'>+	stats-&gt;late_collisions += readl(&amp;pDevMacStat-&gt;TLcl);</div><div class='add'>+	stats-&gt;tx_uflo += readl(&amp;pDevMacStat-&gt;TUnd);</div><div class='add'>+	stats-&gt;max_pkt_error += readl(&amp;pDevMacStat-&gt;TOvr);</div><div class='add'>+</div><div class='add'>+	stats-&gt;alignment_err += readl(&amp;pDevMacStat-&gt;RAln);</div><div class='add'>+	stats-&gt;crc_err += readl(&amp;pDevMacStat-&gt;RCde);</div><div class='add'>+	stats-&gt;norcvbuf += readl(&amp;pDevMacStat-&gt;RDrp);</div><div class='add'>+	stats-&gt;rx_ov_flow += readl(&amp;pDevMacStat-&gt;ROvr);</div><div class='add'>+	stats-&gt;code_violations += readl(&amp;pDevMacStat-&gt;RFcs);</div><div class='add'>+	stats-&gt;length_err += readl(&amp;pDevMacStat-&gt;RFlr);</div><div class='add'>+</div><div class='add'>+	stats-&gt;other_errors += readl(&amp;pDevMacStat-&gt;RFrg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * HandleMacStatInterrupt</div><div class='add'>+ * @pAdapter: pointer to the adapter structure</div><div class='add'>+ *</div><div class='add'>+ * One of the MACSTAT counters has wrapped.  Update the local copy of</div><div class='add'>+ * the statistics held in the adapter structure, checking the "wrap"</div><div class='add'>+ * bit for each counter.</div><div class='add'>+ */</div><div class='add'>+void HandleMacStatInterrupt(struct et131x_adapter *pAdapter)</div><div class='add'>+{</div><div class='add'>+	MAC_STAT_REG_1_t Carry1;</div><div class='add'>+	MAC_STAT_REG_2_t Carry2;</div><div class='add'>+</div><div class='add'>+	DBG_ENTER(et131x_dbginfo);</div><div class='add'>+</div><div class='add'>+	/* Read the interrupt bits from the register(s).  These are Clear On</div><div class='add'>+	 * Write.</div><div class='add'>+	 */</div><div class='add'>+	Carry1.value = readl(&amp;pAdapter-&gt;CSRAddress-&gt;macStat.Carry1.value);</div><div class='add'>+	Carry2.value = readl(&amp;pAdapter-&gt;CSRAddress-&gt;macStat.Carry2.value);</div><div class='add'>+</div><div class='add'>+	writel(Carry1.value, &amp;pAdapter-&gt;CSRAddress-&gt;macStat.Carry1.value);</div><div class='add'>+	writel(Carry2.value, &amp;pAdapter-&gt;CSRAddress-&gt;macStat.Carry2.value);</div><div class='add'>+</div><div class='add'>+	/* We need to do update the host copy of all the MAC_STAT counters.</div><div class='add'>+	 * For each counter, check it's overflow bit.  If the overflow bit is</div><div class='add'>+	 * set, then increment the host version of the count by one complete</div><div class='add'>+	 * revolution of the counter.  This routine is called when the counter</div><div class='add'>+	 * block indicates that one of the counters has wrapped.</div><div class='add'>+	 */</div><div class='add'>+	if (Carry1.bits.rfcs) {</div><div class='add'>+		pAdapter-&gt;Stats.code_violations += COUNTER_WRAP_16_BIT;</div><div class='add'>+	}</div><div class='add'>+	if (Carry1.bits.raln) {</div><div class='add'>+		pAdapter-&gt;Stats.alignment_err += COUNTER_WRAP_12_BIT;</div><div class='add'>+	}</div><div class='add'>+	if (Carry1.bits.rflr) {</div><div class='add'>+		pAdapter-&gt;Stats.length_err += COUNTER_WRAP_16_BIT;</div><div class='add'>+	}</div><div class='add'>+	if (Carry1.bits.rfrg) {</div><div class='add'>+		pAdapter-&gt;Stats.other_errors += COUNTER_WRAP_16_BIT;</div><div class='add'>+	}</div><div class='add'>+	if (Carry1.bits.rcde) {</div><div class='add'>+		pAdapter-&gt;Stats.crc_err += COUNTER_WRAP_16_BIT;</div><div class='add'>+	}</div><div class='add'>+	if (Carry1.bits.rovr) {</div><div class='add'>+		pAdapter-&gt;Stats.rx_ov_flow += COUNTER_WRAP_16_BIT;</div><div class='add'>+	}</div><div class='add'>+	if (Carry1.bits.rdrp) {</div><div class='add'>+		pAdapter-&gt;Stats.norcvbuf += COUNTER_WRAP_16_BIT;</div><div class='add'>+	}</div><div class='add'>+	if (Carry2.bits.tovr) {</div><div class='add'>+		pAdapter-&gt;Stats.max_pkt_error += COUNTER_WRAP_12_BIT;</div><div class='add'>+	}</div><div class='add'>+	if (Carry2.bits.tund) {</div><div class='add'>+		pAdapter-&gt;Stats.tx_uflo += COUNTER_WRAP_12_BIT;</div><div class='add'>+	}</div><div class='add'>+	if (Carry2.bits.tscl) {</div><div class='add'>+		pAdapter-&gt;Stats.first_collision += COUNTER_WRAP_12_BIT;</div><div class='add'>+	}</div><div class='add'>+	if (Carry2.bits.tdfr) {</div><div class='add'>+		pAdapter-&gt;Stats.tx_deferred += COUNTER_WRAP_12_BIT;</div><div class='add'>+	}</div><div class='add'>+	if (Carry2.bits.tmcl) {</div><div class='add'>+		pAdapter-&gt;Stats.excessive_collisions += COUNTER_WRAP_12_BIT;</div><div class='add'>+	}</div><div class='add'>+	if (Carry2.bits.tlcl) {</div><div class='add'>+		pAdapter-&gt;Stats.late_collisions += COUNTER_WRAP_12_BIT;</div><div class='add'>+	}</div><div class='add'>+	if (Carry2.bits.tncl) {</div><div class='add'>+		pAdapter-&gt;Stats.collisions += COUNTER_WRAP_12_BIT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void SetupDeviceForMulticast(struct et131x_adapter *pAdapter)</div><div class='add'>+{</div><div class='add'>+	struct _RXMAC_t __iomem *rxmac = &amp;pAdapter-&gt;CSRAddress-&gt;rxmac;</div><div class='add'>+	uint32_t nIndex;</div><div class='add'>+	uint32_t result;</div><div class='add'>+	uint32_t hash1 = 0;</div><div class='add'>+	uint32_t hash2 = 0;</div><div class='add'>+	uint32_t hash3 = 0;</div><div class='add'>+	uint32_t hash4 = 0;</div><div class='add'>+	PM_CSR_t pm_csr;</div><div class='add'>+</div><div class='add'>+	DBG_ENTER(et131x_dbginfo);</div><div class='add'>+</div><div class='add'>+	/* If ET131X_PACKET_TYPE_MULTICAST is specified, then we provision</div><div class='add'>+	 * the multi-cast LIST.  If it is NOT specified, (and "ALL" is not</div><div class='add'>+	 * specified) then we should pass NO multi-cast addresses to the</div><div class='add'>+	 * driver.</div><div class='add'>+	 */</div><div class='add'>+	if (pAdapter-&gt;PacketFilter &amp; ET131X_PACKET_TYPE_MULTICAST) {</div><div class='add'>+		DBG_VERBOSE(et131x_dbginfo,</div><div class='add'>+			    "MULTICAST flag is set, MCCount: %d\n",</div><div class='add'>+			    pAdapter-&gt;MCAddressCount);</div><div class='add'>+</div><div class='add'>+		/* Loop through our multicast array and set up the device */</div><div class='add'>+		for (nIndex = 0; nIndex &lt; pAdapter-&gt;MCAddressCount; nIndex++) {</div><div class='add'>+			DBG_VERBOSE(et131x_dbginfo,</div><div class='add'>+				    "MCList[%d]: %02x:%02x:%02x:%02x:%02x:%02x\n",</div><div class='add'>+				    nIndex,</div><div class='add'>+				    pAdapter-&gt;MCList[nIndex][0],</div><div class='add'>+				    pAdapter-&gt;MCList[nIndex][1],</div><div class='add'>+				    pAdapter-&gt;MCList[nIndex][2],</div><div class='add'>+				    pAdapter-&gt;MCList[nIndex][3],</div><div class='add'>+				    pAdapter-&gt;MCList[nIndex][4],</div><div class='add'>+				    pAdapter-&gt;MCList[nIndex][5]);</div><div class='add'>+</div><div class='add'>+			result = ether_crc(6, pAdapter-&gt;MCList[nIndex]);</div><div class='add'>+</div><div class='add'>+			result = (result &amp; 0x3F800000) &gt;&gt; 23;</div><div class='add'>+</div><div class='add'>+			if (result &lt; 32) {</div><div class='add'>+				hash1 |= (1 &lt;&lt; result);</div><div class='add'>+			} else if ((31 &lt; result) &amp;&amp; (result &lt; 64)) {</div><div class='add'>+				result -= 32;</div><div class='add'>+				hash2 |= (1 &lt;&lt; result);</div><div class='add'>+			} else if ((63 &lt; result) &amp;&amp; (result &lt; 96)) {</div><div class='add'>+				result -= 64;</div><div class='add'>+				hash3 |= (1 &lt;&lt; result);</div><div class='add'>+			} else {</div><div class='add'>+				result -= 96;</div><div class='add'>+				hash4 |= (1 &lt;&lt; result);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Write out the new hash to the device */</div><div class='add'>+	pm_csr.value = readl(&amp;pAdapter-&gt;CSRAddress-&gt;global.pm_csr.value);</div><div class='add'>+	if (pm_csr.bits.pm_phy_sw_coma == 0) {</div><div class='add'>+		writel(hash1, &amp;rxmac-&gt;multi_hash1);</div><div class='add'>+		writel(hash2, &amp;rxmac-&gt;multi_hash2);</div><div class='add'>+		writel(hash3, &amp;rxmac-&gt;multi_hash3);</div><div class='add'>+		writel(hash4, &amp;rxmac-&gt;multi_hash4);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void SetupDeviceForUnicast(struct et131x_adapter *pAdapter)</div><div class='add'>+{</div><div class='add'>+	struct _RXMAC_t __iomem *rxmac = &amp;pAdapter-&gt;CSRAddress-&gt;rxmac;</div><div class='add'>+	RXMAC_UNI_PF_ADDR1_t uni_pf1;</div><div class='add'>+	RXMAC_UNI_PF_ADDR2_t uni_pf2;</div><div class='add'>+	RXMAC_UNI_PF_ADDR3_t uni_pf3;</div><div class='add'>+	PM_CSR_t pm_csr;</div><div class='add'>+</div><div class='add'>+	DBG_ENTER(et131x_dbginfo);</div><div class='add'>+</div><div class='add'>+	/* Set up unicast packet filter reg 3 to be the first two octets of</div><div class='add'>+	 * the MAC address for both address</div><div class='add'>+	 *</div><div class='add'>+	 * Set up unicast packet filter reg 2 to be the octets 2 - 5 of the</div><div class='add'>+	 * MAC address for second address</div><div class='add'>+	 *</div><div class='add'>+	 * Set up unicast packet filter reg 3 to be the octets 2 - 5 of the</div><div class='add'>+	 * MAC address for first address</div><div class='add'>+	 */</div><div class='add'>+	uni_pf3.bits.addr1_1 = pAdapter-&gt;CurrentAddress[0];</div><div class='add'>+	uni_pf3.bits.addr1_2 = pAdapter-&gt;CurrentAddress[1];</div><div class='add'>+	uni_pf3.bits.addr2_1 = pAdapter-&gt;CurrentAddress[0];</div><div class='add'>+	uni_pf3.bits.addr2_2 = pAdapter-&gt;CurrentAddress[1];</div><div class='add'>+</div><div class='add'>+	uni_pf2.bits.addr2_3 = pAdapter-&gt;CurrentAddress[2];</div><div class='add'>+	uni_pf2.bits.addr2_4 = pAdapter-&gt;CurrentAddress[3];</div><div class='add'>+	uni_pf2.bits.addr2_5 = pAdapter-&gt;CurrentAddress[4];</div><div class='add'>+	uni_pf2.bits.addr2_6 = pAdapter-&gt;CurrentAddress[5];</div><div class='add'>+</div><div class='add'>+	uni_pf1.bits.addr1_3 = pAdapter-&gt;CurrentAddress[2];</div><div class='add'>+	uni_pf1.bits.addr1_4 = pAdapter-&gt;CurrentAddress[3];</div><div class='add'>+	uni_pf1.bits.addr1_5 = pAdapter-&gt;CurrentAddress[4];</div><div class='add'>+	uni_pf1.bits.addr1_6 = pAdapter-&gt;CurrentAddress[5];</div><div class='add'>+</div><div class='add'>+	pm_csr.value = readl(&amp;pAdapter-&gt;CSRAddress-&gt;global.pm_csr.value);</div><div class='add'>+	if (pm_csr.bits.pm_phy_sw_coma == 0) {</div><div class='add'>+		writel(uni_pf1.value, &amp;rxmac-&gt;uni_pf_addr1.value);</div><div class='add'>+		writel(uni_pf2.value, &amp;rxmac-&gt;uni_pf_addr2.value);</div><div class='add'>+		writel(uni_pf3.value, &amp;rxmac-&gt;uni_pf_addr3.value);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/staging/et131x/et1310_mac.h b/drivers/staging/et131x/et1310_mac.h<br/>new file mode 100644<br/>index 000000000000..bd26cd351780<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/et131x/et1310_mac.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/et131x/et1310_mac.h</a></div><div class='hunk'>@@ -0,0 +1,93 @@</div><div class='add'>+/*</div><div class='add'>+ * Agere Systems Inc.</div><div class='add'>+ * 10/100/1000 Base-T Ethernet Driver for the ET1301 and ET131x series MACs</div><div class='add'>+ *</div><div class='add'>+ * Copyright © 2005 Agere Systems Inc.</div><div class='add'>+ * All rights reserved.</div><div class='add'>+ *   http://www.agere.com</div><div class='add'>+ *</div><div class='add'>+ *------------------------------------------------------------------------------</div><div class='add'>+ *</div><div class='add'>+ * et1310_mac.h -  Defines, structs, enums, prototypes, etc. pertaining to the</div><div class='add'>+ *                 MAC.</div><div class='add'>+ *</div><div class='add'>+ *------------------------------------------------------------------------------</div><div class='add'>+ *</div><div class='add'>+ * SOFTWARE LICENSE</div><div class='add'>+ *</div><div class='add'>+ * This software is provided subject to the following terms and conditions,</div><div class='add'>+ * which you should read carefully before using the software.  Using this</div><div class='add'>+ * software indicates your acceptance of these terms and conditions.  If you do</div><div class='add'>+ * not agree with these terms and conditions, do not use the software.</div><div class='add'>+ *</div><div class='add'>+ * Copyright © 2005 Agere Systems Inc.</div><div class='add'>+ * All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source or binary forms, with or without</div><div class='add'>+ * modifications, are permitted provided that the following conditions are met:</div><div class='add'>+ *</div><div class='add'>+ * . Redistributions of source code must retain the above copyright notice, this</div><div class='add'>+ *    list of conditions and the following Disclaimer as comments in the code as</div><div class='add'>+ *    well as in the documentation and/or other materials provided with the</div><div class='add'>+ *    distribution.</div><div class='add'>+ *</div><div class='add'>+ * . Redistributions in binary form must reproduce the above copyright notice,</div><div class='add'>+ *    this list of conditions and the following Disclaimer in the documentation</div><div class='add'>+ *    and/or other materials provided with the distribution.</div><div class='add'>+ *</div><div class='add'>+ * . Neither the name of Agere Systems Inc. nor the names of the contributors</div><div class='add'>+ *    may be used to endorse or promote products derived from this software</div><div class='add'>+ *    without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ * Disclaimer</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES,</div><div class='add'>+ * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  ANY</div><div class='add'>+ * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN</div><div class='add'>+ * RISK. IN NO EVENT SHALL AGERE SYSTEMS INC. OR CONTRIBUTORS BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, INCLUDING, BUT NOT LIMITED TO, CONTRACT, STRICT</div><div class='add'>+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT</div><div class='add'>+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH</div><div class='add'>+ * DAMAGE.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _ET1310_MAC_H_</div><div class='add'>+#define _ET1310_MAC_H_</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#include "et1310_address_map.h"</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define COUNTER_WRAP_28_BIT 0x10000000</div><div class='add'>+#define COUNTER_WRAP_22_BIT 0x400000</div><div class='add'>+#define COUNTER_WRAP_16_BIT 0x10000</div><div class='add'>+#define COUNTER_WRAP_12_BIT 0x1000</div><div class='add'>+</div><div class='add'>+#define COUNTER_MASK_28_BIT (COUNTER_WRAP_28_BIT - 1)</div><div class='add'>+#define COUNTER_MASK_22_BIT (COUNTER_WRAP_22_BIT - 1)</div><div class='add'>+#define COUNTER_MASK_16_BIT (COUNTER_WRAP_16_BIT - 1)</div><div class='add'>+#define COUNTER_MASK_12_BIT (COUNTER_WRAP_12_BIT - 1)</div><div class='add'>+</div><div class='add'>+#define UPDATE_COUNTER(HostCnt,DevCnt) \</div><div class='add'>+    HostCnt = HostCnt + DevCnt;</div><div class='add'>+</div><div class='add'>+/* Forward declaration of the private adapter structure */</div><div class='add'>+struct et131x_adapter;</div><div class='add'>+</div><div class='add'>+void ConfigMACRegs1(struct et131x_adapter *adapter);</div><div class='add'>+void ConfigMACRegs2(struct et131x_adapter *adapter);</div><div class='add'>+void ConfigRxMacRegs(struct et131x_adapter *adapter);</div><div class='add'>+void ConfigTxMacRegs(struct et131x_adapter *adapter);</div><div class='add'>+void ConfigMacStatRegs(struct et131x_adapter *adapter);</div><div class='add'>+void ConfigFlowControl(struct et131x_adapter *adapter);</div><div class='add'>+void UpdateMacStatHostCounters(struct et131x_adapter *adapter);</div><div class='add'>+void HandleMacStatInterrupt(struct et131x_adapter *adapter);</div><div class='add'>+void SetupDeviceForMulticast(struct et131x_adapter *adapter);</div><div class='add'>+void SetupDeviceForUnicast(struct et131x_adapter *adapter);</div><div class='add'>+</div><div class='add'>+#endif /* _ET1310_MAC_H_ */</div><div class='head'>diff --git a/drivers/staging/et131x/et1310_phy.c b/drivers/staging/et131x/et1310_phy.c<br/>new file mode 100644<br/>index 000000000000..6c4fa54419ea<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/et131x/et1310_phy.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/et131x/et1310_phy.c</a></div><div class='hunk'>@@ -0,0 +1,1281 @@</div><div class='add'>+/*</div><div class='add'>+ * Agere Systems Inc.</div><div class='add'>+ * 10/100/1000 Base-T Ethernet Driver for the ET1301 and ET131x series MACs</div><div class='add'>+ *</div><div class='add'>+ * Copyright © 2005 Agere Systems Inc.</div><div class='add'>+ * All rights reserved.</div><div class='add'>+ *   http://www.agere.com</div><div class='add'>+ *</div><div class='add'>+ *------------------------------------------------------------------------------</div><div class='add'>+ *</div><div class='add'>+ * et1310_phy.c - Routines for configuring and accessing the PHY</div><div class='add'>+ *</div><div class='add'>+ *------------------------------------------------------------------------------</div><div class='add'>+ *</div><div class='add'>+ * SOFTWARE LICENSE</div><div class='add'>+ *</div><div class='add'>+ * This software is provided subject to the following terms and conditions,</div><div class='add'>+ * which you should read carefully before using the software.  Using this</div><div class='add'>+ * software indicates your acceptance of these terms and conditions.  If you do</div><div class='add'>+ * not agree with these terms and conditions, do not use the software.</div><div class='add'>+ *</div><div class='add'>+ * Copyright © 2005 Agere Systems Inc.</div><div class='add'>+ * All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source or binary forms, with or without</div><div class='add'>+ * modifications, are permitted provided that the following conditions are met:</div><div class='add'>+ *</div><div class='add'>+ * . Redistributions of source code must retain the above copyright notice, this</div><div class='add'>+ *    list of conditions and the following Disclaimer as comments in the code as</div><div class='add'>+ *    well as in the documentation and/or other materials provided with the</div><div class='add'>+ *    distribution.</div><div class='add'>+ *</div><div class='add'>+ * . Redistributions in binary form must reproduce the above copyright notice,</div><div class='add'>+ *    this list of conditions and the following Disclaimer in the documentation</div><div class='add'>+ *    and/or other materials provided with the distribution.</div><div class='add'>+ *</div><div class='add'>+ * . Neither the name of Agere Systems Inc. nor the names of the contributors</div><div class='add'>+ *    may be used to endorse or promote products derived from this software</div><div class='add'>+ *    without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ * Disclaimer</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES,</div><div class='add'>+ * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  ANY</div><div class='add'>+ * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN</div><div class='add'>+ * RISK. IN NO EVENT SHALL AGERE SYSTEMS INC. OR CONTRIBUTORS BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, INCLUDING, BUT NOT LIMITED TO, CONTRACT, STRICT</div><div class='add'>+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT</div><div class='add'>+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH</div><div class='add'>+ * DAMAGE.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "et131x_version.h"</div><div class='add'>+#include "et131x_debug.h"</div><div class='add'>+#include "et131x_defs.h"</div><div class='add'>+</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/ptrace.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/ctype.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/timer.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/in.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/system.h&gt;</div><div class='add'>+#include &lt;asm/bitops.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/if_arp.h&gt;</div><div class='add'>+#include &lt;linux/ioport.h&gt;</div><div class='add'>+#include &lt;linux/random.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+</div><div class='add'>+#include "et1310_phy.h"</div><div class='add'>+#include "et1310_pm.h"</div><div class='add'>+#include "et1310_jagcore.h"</div><div class='add'>+</div><div class='add'>+#include "et131x_adapter.h"</div><div class='add'>+#include "et131x_netdev.h"</div><div class='add'>+#include "et131x_initpci.h"</div><div class='add'>+</div><div class='add'>+#include "et1310_address_map.h"</div><div class='add'>+#include "et1310_jagcore.h"</div><div class='add'>+#include "et1310_tx.h"</div><div class='add'>+#include "et1310_rx.h"</div><div class='add'>+#include "et1310_mac.h"</div><div class='add'>+</div><div class='add'>+/* Data for debugging facilities */</div><div class='add'>+#ifdef CONFIG_ET131X_DEBUG</div><div class='add'>+extern dbg_info_t *et131x_dbginfo;</div><div class='add'>+#endif /* CONFIG_ET131X_DEBUG */</div><div class='add'>+</div><div class='add'>+/* Prototypes for functions with local scope */</div><div class='add'>+static int et131x_xcvr_init(struct et131x_adapter *adapter);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * PhyMiRead - Read from the PHY through the MII Interface on the MAC</div><div class='add'>+ * @adapter: pointer to our private adapter structure</div><div class='add'>+ * @xcvrAddr: the address of the transciever</div><div class='add'>+ * @xcvrReg: the register to read</div><div class='add'>+ * @value: pointer to a 16-bit value in which the value will be stored</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 on success, errno on failure (as defined in errno.h)</div><div class='add'>+ */</div><div class='add'>+int PhyMiRead(struct et131x_adapter *adapter, uint8_t xcvrAddr,</div><div class='add'>+	      uint8_t xcvrReg, uint16_t *value)</div><div class='add'>+{</div><div class='add'>+	struct _MAC_t __iomem *mac = &amp;adapter-&gt;CSRAddress-&gt;mac;</div><div class='add'>+	int status = 0;</div><div class='add'>+	uint32_t delay;</div><div class='add'>+	MII_MGMT_ADDR_t miiAddr;</div><div class='add'>+	MII_MGMT_CMD_t miiCmd;</div><div class='add'>+	MII_MGMT_INDICATOR_t miiIndicator;</div><div class='add'>+</div><div class='add'>+	/* Save a local copy of the registers we are dealing with so we can</div><div class='add'>+	 * set them back</div><div class='add'>+	 */</div><div class='add'>+	miiAddr.value = readl(&amp;mac-&gt;mii_mgmt_addr.value);</div><div class='add'>+	miiCmd.value = readl(&amp;mac-&gt;mii_mgmt_cmd.value);</div><div class='add'>+</div><div class='add'>+	/* Stop the current operation */</div><div class='add'>+	writel(0, &amp;mac-&gt;mii_mgmt_cmd.value);</div><div class='add'>+</div><div class='add'>+	/* Set up the register we need to read from on the correct PHY */</div><div class='add'>+	{</div><div class='add'>+		MII_MGMT_ADDR_t mii_mgmt_addr = { 0 };</div><div class='add'>+</div><div class='add'>+		mii_mgmt_addr.bits.phy_addr = xcvrAddr;</div><div class='add'>+		mii_mgmt_addr.bits.reg_addr = xcvrReg;</div><div class='add'>+		writel(mii_mgmt_addr.value, &amp;mac-&gt;mii_mgmt_addr.value);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Kick the read cycle off */</div><div class='add'>+	delay = 0;</div><div class='add'>+</div><div class='add'>+	writel(0x1, &amp;mac-&gt;mii_mgmt_cmd.value);</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		udelay(50);</div><div class='add'>+		delay++;</div><div class='add'>+		miiIndicator.value = readl(&amp;mac-&gt;mii_mgmt_indicator.value);</div><div class='add'>+	} while ((miiIndicator.bits.not_valid || miiIndicator.bits.busy) &amp;&amp;</div><div class='add'>+		 delay &lt; 50);</div><div class='add'>+</div><div class='add'>+	/* If we hit the max delay, we could not read the register */</div><div class='add'>+	if (delay &gt;= 50) {</div><div class='add'>+		DBG_WARNING(et131x_dbginfo,</div><div class='add'>+			    "xcvrReg 0x%08x could not be read\n", xcvrReg);</div><div class='add'>+		DBG_WARNING(et131x_dbginfo, "status is  0x%08x\n",</div><div class='add'>+			    miiIndicator.value);</div><div class='add'>+</div><div class='add'>+		status = -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If we hit here we were able to read the register and we need to</div><div class='add'>+	 * return the value to the caller</div><div class='add'>+	 */</div><div class='add'>+	/* TODO: make this stuff a simple readw()?! */</div><div class='add'>+	{</div><div class='add'>+		MII_MGMT_STAT_t mii_mgmt_stat;</div><div class='add'>+</div><div class='add'>+		mii_mgmt_stat.value = readl(&amp;mac-&gt;mii_mgmt_stat.value);</div><div class='add'>+		*value = (uint16_t) mii_mgmt_stat.bits.phy_stat;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Stop the read operation */</div><div class='add'>+	writel(0, &amp;mac-&gt;mii_mgmt_cmd.value);</div><div class='add'>+</div><div class='add'>+	DBG_VERBOSE(et131x_dbginfo, "  xcvr_addr = 0x%02x, "</div><div class='add'>+		    "xcvr_reg  = 0x%02x, "</div><div class='add'>+		    "value     = 0x%04x.\n", xcvrAddr, xcvrReg, *value);</div><div class='add'>+</div><div class='add'>+	/* set the registers we touched back to the state at which we entered</div><div class='add'>+	 * this function</div><div class='add'>+	 */</div><div class='add'>+	writel(miiAddr.value, &amp;mac-&gt;mii_mgmt_addr.value);</div><div class='add'>+	writel(miiCmd.value, &amp;mac-&gt;mii_mgmt_cmd.value);</div><div class='add'>+</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * MiWrite - Write to a PHY register through the MII interface of the MAC</div><div class='add'>+ * @adapter: pointer to our private adapter structure</div><div class='add'>+ * @xcvrReg: the register to read</div><div class='add'>+ * @value: 16-bit value to write</div><div class='add'>+ *</div><div class='add'>+ * Return 0 on success, errno on failure (as defined in errno.h)</div><div class='add'>+ */</div><div class='add'>+int MiWrite(struct et131x_adapter *adapter, uint8_t xcvrReg, uint16_t value)</div><div class='add'>+{</div><div class='add'>+	struct _MAC_t __iomem *mac = &amp;adapter-&gt;CSRAddress-&gt;mac;</div><div class='add'>+	int status = 0;</div><div class='add'>+	uint8_t xcvrAddr = adapter-&gt;Stats.xcvr_addr;</div><div class='add'>+	uint32_t delay;</div><div class='add'>+	MII_MGMT_ADDR_t miiAddr;</div><div class='add'>+	MII_MGMT_CMD_t miiCmd;</div><div class='add'>+	MII_MGMT_INDICATOR_t miiIndicator;</div><div class='add'>+</div><div class='add'>+	/* Save a local copy of the registers we are dealing with so we can</div><div class='add'>+	 * set them back</div><div class='add'>+	 */</div><div class='add'>+	miiAddr.value = readl(&amp;mac-&gt;mii_mgmt_addr.value);</div><div class='add'>+	miiCmd.value = readl(&amp;mac-&gt;mii_mgmt_cmd.value);</div><div class='add'>+</div><div class='add'>+	/* Stop the current operation */</div><div class='add'>+	writel(0, &amp;mac-&gt;mii_mgmt_cmd.value);</div><div class='add'>+</div><div class='add'>+	/* Set up the register we need to write to on the correct PHY */</div><div class='add'>+	{</div><div class='add'>+		MII_MGMT_ADDR_t mii_mgmt_addr;</div><div class='add'>+</div><div class='add'>+		mii_mgmt_addr.bits.phy_addr = xcvrAddr;</div><div class='add'>+		mii_mgmt_addr.bits.reg_addr = xcvrReg;</div><div class='add'>+		writel(mii_mgmt_addr.value, &amp;mac-&gt;mii_mgmt_addr.value);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Add the value to write to the registers to the mac */</div><div class='add'>+	writel(value, &amp;mac-&gt;mii_mgmt_ctrl.value);</div><div class='add'>+	delay = 0;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		udelay(50);</div><div class='add'>+		delay++;</div><div class='add'>+		miiIndicator.value = readl(&amp;mac-&gt;mii_mgmt_indicator.value);</div><div class='add'>+	} while (miiIndicator.bits.busy &amp;&amp; delay &lt; 100);</div><div class='add'>+</div><div class='add'>+	/* If we hit the max delay, we could not write the register */</div><div class='add'>+	if (delay == 100) {</div><div class='add'>+		uint16_t TempValue;</div><div class='add'>+</div><div class='add'>+		DBG_WARNING(et131x_dbginfo,</div><div class='add'>+			    "xcvrReg 0x%08x could not be written", xcvrReg);</div><div class='add'>+		DBG_WARNING(et131x_dbginfo, "status is  0x%08x\n",</div><div class='add'>+			    miiIndicator.value);</div><div class='add'>+		DBG_WARNING(et131x_dbginfo, "command is  0x%08x\n",</div><div class='add'>+			    readl(&amp;mac-&gt;mii_mgmt_cmd.value));</div><div class='add'>+</div><div class='add'>+		MiRead(adapter, xcvrReg, &amp;TempValue);</div><div class='add'>+</div><div class='add'>+		status = -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Stop the write operation */</div><div class='add'>+	writel(0, &amp;mac-&gt;mii_mgmt_cmd.value);</div><div class='add'>+</div><div class='add'>+	/* set the registers we touched back to the state at which we entered</div><div class='add'>+         * this function</div><div class='add'>+         */</div><div class='add'>+	writel(miiAddr.value, &amp;mac-&gt;mii_mgmt_addr.value);</div><div class='add'>+	writel(miiCmd.value, &amp;mac-&gt;mii_mgmt_cmd.value);</div><div class='add'>+</div><div class='add'>+	DBG_VERBOSE(et131x_dbginfo, " xcvr_addr = 0x%02x, "</div><div class='add'>+		    "xcvr_reg  = 0x%02x, "</div><div class='add'>+		    "value     = 0x%04x.\n", xcvrAddr, xcvrReg, value);</div><div class='add'>+</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * et131x_xcvr_find - Find the PHY ID</div><div class='add'>+ * @adapter: pointer to our private adapter structure</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 on success, errno on failure (as defined in errno.h)</div><div class='add'>+ */</div><div class='add'>+int et131x_xcvr_find(struct et131x_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	int status = -ENODEV;</div><div class='add'>+	uint8_t xcvr_addr;</div><div class='add'>+	MI_IDR1_t idr1;</div><div class='add'>+	MI_IDR2_t idr2;</div><div class='add'>+	uint32_t xcvr_id;</div><div class='add'>+</div><div class='add'>+	DBG_ENTER(et131x_dbginfo);</div><div class='add'>+</div><div class='add'>+	/* We need to get xcvr id and address we just get the first one */</div><div class='add'>+	for (xcvr_addr = 0; xcvr_addr &lt; 32; xcvr_addr++) {</div><div class='add'>+		/* Read the ID from the PHY */</div><div class='add'>+		PhyMiRead(adapter, xcvr_addr,</div><div class='add'>+			  (uint8_t) offsetof(MI_REGS_t, idr1),</div><div class='add'>+			  &amp;idr1.value);</div><div class='add'>+		PhyMiRead(adapter, xcvr_addr,</div><div class='add'>+			  (uint8_t) offsetof(MI_REGS_t, idr2),</div><div class='add'>+			  &amp;idr2.value);</div><div class='add'>+</div><div class='add'>+		xcvr_id = (uint32_t) ((idr1.value &lt;&lt; 16) | idr2.value);</div><div class='add'>+</div><div class='add'>+		if ((idr1.value != 0) &amp;&amp; (idr1.value != 0xffff)) {</div><div class='add'>+			DBG_TRACE(et131x_dbginfo,</div><div class='add'>+				  "Xcvr addr: 0x%02x\tXcvr_id: 0x%08x\n",</div><div class='add'>+				  xcvr_addr, xcvr_id);</div><div class='add'>+</div><div class='add'>+			adapter-&gt;Stats.xcvr_id = xcvr_id;</div><div class='add'>+			adapter-&gt;Stats.xcvr_addr = xcvr_addr;</div><div class='add'>+</div><div class='add'>+			status = 0;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * et131x_setphy_normal - Set PHY for normal operation.</div><div class='add'>+ * @adapter: pointer to our private adapter structure</div><div class='add'>+ *</div><div class='add'>+ * Used by Power Management to force the PHY into 10 Base T half-duplex mode,</div><div class='add'>+ * when going to D3 in WOL mode. Also used during initialization to set the</div><div class='add'>+ * PHY for normal operation.</div><div class='add'>+ */</div><div class='add'>+int et131x_setphy_normal(struct et131x_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	DBG_ENTER(et131x_dbginfo);</div><div class='add'>+</div><div class='add'>+	/* Make sure the PHY is powered up */</div><div class='add'>+	ET1310_PhyPowerDown(adapter, 0);</div><div class='add'>+	status = et131x_xcvr_init(adapter);</div><div class='add'>+</div><div class='add'>+	DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * et131x_xcvr_init - Init the phy if we are setting it into force mode</div><div class='add'>+ * @adapter: pointer to our private adapter structure</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 on success, errno on failure (as defined in errno.h)</div><div class='add'>+ */</div><div class='add'>+static int et131x_xcvr_init(struct et131x_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	int status = 0;</div><div class='add'>+	MI_IMR_t imr;</div><div class='add'>+	MI_ISR_t isr;</div><div class='add'>+	MI_LCR2_t lcr2;</div><div class='add'>+</div><div class='add'>+	DBG_ENTER(et131x_dbginfo);</div><div class='add'>+</div><div class='add'>+	/* Zero out the adapter structure variable representing BMSR */</div><div class='add'>+	adapter-&gt;Bmsr.value = 0;</div><div class='add'>+</div><div class='add'>+	MiRead(adapter, (uint8_t) offsetof(MI_REGS_t, isr), &amp;isr.value);</div><div class='add'>+</div><div class='add'>+	MiRead(adapter, (uint8_t) offsetof(MI_REGS_t, imr), &amp;imr.value);</div><div class='add'>+</div><div class='add'>+	/* Set the link status interrupt only.  Bad behavior when link status</div><div class='add'>+	 * and auto neg are set, we run into a nested interrupt problem</div><div class='add'>+	 */</div><div class='add'>+	imr.bits.int_en = 0x1;</div><div class='add'>+	imr.bits.link_status = 0x1;</div><div class='add'>+	imr.bits.autoneg_status = 0x1;</div><div class='add'>+</div><div class='add'>+	MiWrite(adapter, (uint8_t) offsetof(MI_REGS_t, imr), imr.value);</div><div class='add'>+</div><div class='add'>+	/* Set the LED behavior such that LED 1 indicates speed (off =</div><div class='add'>+	 * 10Mbits, blink = 100Mbits, on = 1000Mbits) and LED 2 indicates</div><div class='add'>+	 * link and activity (on for link, blink off for activity).</div><div class='add'>+	 *</div><div class='add'>+	 * NOTE: Some customizations have been added here for specific</div><div class='add'>+	 * vendors; The LED behavior is now determined by vendor data in the</div><div class='add'>+	 * EEPROM. However, the above description is the default.</div><div class='add'>+	 */</div><div class='add'>+	if ((adapter-&gt;eepromData[1] &amp; 0x4) == 0) {</div><div class='add'>+		MiRead(adapter, (uint8_t) offsetof(MI_REGS_t, lcr2),</div><div class='add'>+		       &amp;lcr2.value);</div><div class='add'>+		if ((adapter-&gt;eepromData[1] &amp; 0x8) == 0)</div><div class='add'>+			lcr2.bits.led_tx_rx = 0x3;</div><div class='add'>+		else</div><div class='add'>+			lcr2.bits.led_tx_rx = 0x4;</div><div class='add'>+		lcr2.bits.led_link = 0xa;</div><div class='add'>+		MiWrite(adapter, (uint8_t) offsetof(MI_REGS_t, lcr2),</div><div class='add'>+			lcr2.value);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Determine if we need to go into a force mode and set it */</div><div class='add'>+	if (adapter-&gt;AiForceSpeed == 0 &amp;&amp; adapter-&gt;AiForceDpx == 0) {</div><div class='add'>+		if ((adapter-&gt;RegistryFlowControl == TxOnly) ||</div><div class='add'>+		    (adapter-&gt;RegistryFlowControl == Both)) {</div><div class='add'>+			ET1310_PhyAccessMiBit(adapter,</div><div class='add'>+					      TRUEPHY_BIT_SET, 4, 11, NULL);</div><div class='add'>+		} else {</div><div class='add'>+			ET1310_PhyAccessMiBit(adapter,</div><div class='add'>+					      TRUEPHY_BIT_CLEAR, 4, 11, NULL);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (adapter-&gt;RegistryFlowControl == Both) {</div><div class='add'>+			ET1310_PhyAccessMiBit(adapter,</div><div class='add'>+					      TRUEPHY_BIT_SET, 4, 10, NULL);</div><div class='add'>+		} else {</div><div class='add'>+			ET1310_PhyAccessMiBit(adapter,</div><div class='add'>+					      TRUEPHY_BIT_CLEAR, 4, 10, NULL);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Set the phy to autonegotiation */</div><div class='add'>+		ET1310_PhyAutoNeg(adapter, true);</div><div class='add'>+</div><div class='add'>+		/* NOTE - Do we need this? */</div><div class='add'>+		ET1310_PhyAccessMiBit(adapter, TRUEPHY_BIT_SET, 0, 9, NULL);</div><div class='add'>+</div><div class='add'>+		DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+		return status;</div><div class='add'>+	} else {</div><div class='add'>+		ET1310_PhyAutoNeg(adapter, false);</div><div class='add'>+</div><div class='add'>+		/* Set to the correct force mode. */</div><div class='add'>+		if (adapter-&gt;AiForceDpx != 1) {</div><div class='add'>+			if ((adapter-&gt;RegistryFlowControl == TxOnly) ||</div><div class='add'>+			    (adapter-&gt;RegistryFlowControl == Both)) {</div><div class='add'>+				ET1310_PhyAccessMiBit(adapter,</div><div class='add'>+						      TRUEPHY_BIT_SET, 4, 11,</div><div class='add'>+						      NULL);</div><div class='add'>+			} else {</div><div class='add'>+				ET1310_PhyAccessMiBit(adapter,</div><div class='add'>+						      TRUEPHY_BIT_CLEAR, 4, 11,</div><div class='add'>+						      NULL);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (adapter-&gt;RegistryFlowControl == Both) {</div><div class='add'>+				ET1310_PhyAccessMiBit(adapter,</div><div class='add'>+						      TRUEPHY_BIT_SET, 4, 10,</div><div class='add'>+						      NULL);</div><div class='add'>+			} else {</div><div class='add'>+				ET1310_PhyAccessMiBit(adapter,</div><div class='add'>+						      TRUEPHY_BIT_CLEAR, 4, 10,</div><div class='add'>+						      NULL);</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			ET1310_PhyAccessMiBit(adapter,</div><div class='add'>+					      TRUEPHY_BIT_CLEAR, 4, 10, NULL);</div><div class='add'>+			ET1310_PhyAccessMiBit(adapter,</div><div class='add'>+					      TRUEPHY_BIT_CLEAR, 4, 11, NULL);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		switch (adapter-&gt;AiForceSpeed) {</div><div class='add'>+		case 10:</div><div class='add'>+			if (adapter-&gt;AiForceDpx == 1) {</div><div class='add'>+				TPAL_SetPhy10HalfDuplex(adapter);</div><div class='add'>+			} else if (adapter-&gt;AiForceDpx == 2) {</div><div class='add'>+				TPAL_SetPhy10FullDuplex(adapter);</div><div class='add'>+			} else {</div><div class='add'>+				TPAL_SetPhy10Force(adapter);</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		case 100:</div><div class='add'>+			if (adapter-&gt;AiForceDpx == 1) {</div><div class='add'>+				TPAL_SetPhy100HalfDuplex(adapter);</div><div class='add'>+			} else if (adapter-&gt;AiForceDpx == 2) {</div><div class='add'>+				TPAL_SetPhy100FullDuplex(adapter);</div><div class='add'>+			} else {</div><div class='add'>+				TPAL_SetPhy100Force(adapter);</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		case 1000:</div><div class='add'>+			TPAL_SetPhy1000FullDuplex(adapter);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+		return status;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void et131x_Mii_check(struct et131x_adapter *pAdapter,</div><div class='add'>+		      MI_BMSR_t bmsr, MI_BMSR_t bmsr_ints)</div><div class='add'>+{</div><div class='add'>+	uint8_t ucLinkStatus;</div><div class='add'>+	uint32_t uiAutoNegStatus;</div><div class='add'>+	uint32_t uiSpeed;</div><div class='add'>+	uint32_t uiDuplex;</div><div class='add'>+	uint32_t uiMdiMdix;</div><div class='add'>+	uint32_t uiMasterSlave;</div><div class='add'>+	uint32_t uiPolarity;</div><div class='add'>+	unsigned long lockflags;</div><div class='add'>+</div><div class='add'>+	DBG_ENTER(et131x_dbginfo);</div><div class='add'>+</div><div class='add'>+	if (bmsr_ints.bits.link_status) {</div><div class='add'>+		if (bmsr.bits.link_status) {</div><div class='add'>+			pAdapter-&gt;PoMgmt.TransPhyComaModeOnBoot = 20;</div><div class='add'>+</div><div class='add'>+			/* Update our state variables and indicate the</div><div class='add'>+			 * connected state</div><div class='add'>+			 */</div><div class='add'>+			spin_lock_irqsave(&amp;pAdapter-&gt;Lock, lockflags);</div><div class='add'>+</div><div class='add'>+			pAdapter-&gt;MediaState = NETIF_STATUS_MEDIA_CONNECT;</div><div class='add'>+			MP_CLEAR_FLAG(pAdapter, fMP_ADAPTER_LINK_DETECTION);</div><div class='add'>+</div><div class='add'>+			spin_unlock_irqrestore(&amp;pAdapter-&gt;Lock, lockflags);</div><div class='add'>+</div><div class='add'>+			/* Don't indicate state if we're in loopback mode */</div><div class='add'>+			if (pAdapter-&gt;RegistryPhyLoopbk == false) {</div><div class='add'>+				netif_carrier_on(pAdapter-&gt;netdev);</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			DBG_WARNING(et131x_dbginfo,</div><div class='add'>+				    "Link down cable problem\n");</div><div class='add'>+</div><div class='add'>+			if (pAdapter-&gt;uiLinkSpeed == TRUEPHY_SPEED_10MBPS) {</div><div class='add'>+				// NOTE - Is there a way to query this without TruePHY?</div><div class='add'>+				// &amp;&amp; TRU_QueryCoreType(pAdapter-&gt;hTruePhy, 0) == EMI_TRUEPHY_A13O) {</div><div class='add'>+				uint16_t Register18;</div><div class='add'>+</div><div class='add'>+				MiRead(pAdapter, 0x12, &amp;Register18);</div><div class='add'>+				MiWrite(pAdapter, 0x12, Register18 | 0x4);</div><div class='add'>+				MiWrite(pAdapter, 0x10, Register18 | 0x8402);</div><div class='add'>+				MiWrite(pAdapter, 0x11, Register18 | 511);</div><div class='add'>+				MiWrite(pAdapter, 0x12, Register18);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* For the first N seconds of life, we are in "link</div><div class='add'>+			 * detection" When we are in this state, we should</div><div class='add'>+			 * only report "connected". When the LinkDetection</div><div class='add'>+			 * Timer expires, we can report disconnected (handled</div><div class='add'>+			 * in the LinkDetectionDPC).</div><div class='add'>+			 */</div><div class='add'>+			if ((MP_IS_FLAG_CLEAR</div><div class='add'>+			     (pAdapter, fMP_ADAPTER_LINK_DETECTION))</div><div class='add'>+			    || (pAdapter-&gt;MediaState ==</div><div class='add'>+				NETIF_STATUS_MEDIA_DISCONNECT)) {</div><div class='add'>+				spin_lock_irqsave(&amp;pAdapter-&gt;Lock, lockflags);</div><div class='add'>+				pAdapter-&gt;MediaState =</div><div class='add'>+				    NETIF_STATUS_MEDIA_DISCONNECT;</div><div class='add'>+				spin_unlock_irqrestore(&amp;pAdapter-&gt;Lock,</div><div class='add'>+						       lockflags);</div><div class='add'>+</div><div class='add'>+				/* Only indicate state if we're in loopback</div><div class='add'>+				 * mode</div><div class='add'>+				 */</div><div class='add'>+				if (pAdapter-&gt;RegistryPhyLoopbk == false) {</div><div class='add'>+					netif_carrier_off(pAdapter-&gt;netdev);</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			pAdapter-&gt;uiLinkSpeed = 0;</div><div class='add'>+			pAdapter-&gt;uiDuplexMode = 0;</div><div class='add'>+</div><div class='add'>+			/* Free the packets being actively sent &amp; stopped */</div><div class='add'>+			et131x_free_busy_send_packets(pAdapter);</div><div class='add'>+</div><div class='add'>+			/* Re-initialize the send structures */</div><div class='add'>+			et131x_init_send(pAdapter);</div><div class='add'>+</div><div class='add'>+			/* Reset the RFD list and re-start RU */</div><div class='add'>+			et131x_reset_recv(pAdapter);</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * Bring the device back to the state it was during</div><div class='add'>+			 * init prior to autonegotiation being complete. This</div><div class='add'>+			 * way, when we get the auto-neg complete interrupt,</div><div class='add'>+			 * we can complete init by calling ConfigMacREGS2.</div><div class='add'>+			 */</div><div class='add'>+			et131x_soft_reset(pAdapter);</div><div class='add'>+</div><div class='add'>+			/* Setup ET1310 as per the documentation */</div><div class='add'>+			et131x_adapter_setup(pAdapter);</div><div class='add'>+</div><div class='add'>+			/* Setup the PHY into coma mode until the cable is</div><div class='add'>+			 * plugged back in</div><div class='add'>+			 */</div><div class='add'>+			if (pAdapter-&gt;RegistryPhyComa == 1) {</div><div class='add'>+				EnablePhyComa(pAdapter);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (bmsr_ints.bits.auto_neg_complete ||</div><div class='add'>+	    ((pAdapter-&gt;AiForceDpx == 3) &amp;&amp; (bmsr_ints.bits.link_status))) {</div><div class='add'>+		if (bmsr.bits.auto_neg_complete || (pAdapter-&gt;AiForceDpx == 3)) {</div><div class='add'>+			ET1310_PhyLinkStatus(pAdapter,</div><div class='add'>+					     &amp;ucLinkStatus, &amp;uiAutoNegStatus,</div><div class='add'>+					     &amp;uiSpeed, &amp;uiDuplex, &amp;uiMdiMdix,</div><div class='add'>+					     &amp;uiMasterSlave, &amp;uiPolarity);</div><div class='add'>+</div><div class='add'>+			pAdapter-&gt;uiLinkSpeed = uiSpeed;</div><div class='add'>+			pAdapter-&gt;uiDuplexMode = uiDuplex;</div><div class='add'>+</div><div class='add'>+			DBG_TRACE(et131x_dbginfo,</div><div class='add'>+				  "pAdapter-&gt;uiLinkSpeed 0x%04x, pAdapter-&gt;uiDuplex 0x%08x\n",</div><div class='add'>+				  pAdapter-&gt;uiLinkSpeed,</div><div class='add'>+				  pAdapter-&gt;uiDuplexMode);</div><div class='add'>+</div><div class='add'>+			pAdapter-&gt;PoMgmt.TransPhyComaModeOnBoot = 20;</div><div class='add'>+</div><div class='add'>+			if (pAdapter-&gt;uiLinkSpeed == TRUEPHY_SPEED_10MBPS) {</div><div class='add'>+				// NOTE - Is there a way to query this without TruePHY?</div><div class='add'>+				// &amp;&amp; TRU_QueryCoreType(pAdapter-&gt;hTruePhy, 0) == EMI_TRUEPHY_A13O) {</div><div class='add'>+				uint16_t Register18;</div><div class='add'>+</div><div class='add'>+				MiRead(pAdapter, 0x12, &amp;Register18);</div><div class='add'>+				MiWrite(pAdapter, 0x12, Register18 | 0x4);</div><div class='add'>+				MiWrite(pAdapter, 0x10, Register18 | 0x8402);</div><div class='add'>+				MiWrite(pAdapter, 0x11, Register18 | 511);</div><div class='add'>+				MiWrite(pAdapter, 0x12, Register18);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			ConfigFlowControl(pAdapter);</div><div class='add'>+</div><div class='add'>+			if ((pAdapter-&gt;uiLinkSpeed == TRUEPHY_SPEED_1000MBPS) &amp;&amp;</div><div class='add'>+			    (pAdapter-&gt;RegistryJumboPacket &gt; 2048))</div><div class='add'>+			{</div><div class='add'>+				ET1310_PhyAndOrReg(pAdapter, 0x16, 0xcfff,</div><div class='add'>+						   0x2000);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			SetRxDmaTimer(pAdapter);</div><div class='add'>+			ConfigMACRegs2(pAdapter);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * TPAL_SetPhy10HalfDuplex - Force the phy into 10 Base T Half Duplex mode.</div><div class='add'>+ * @pAdapter: pointer to the adapter structure</div><div class='add'>+ *</div><div class='add'>+ * Also sets the MAC so it is syncd up properly</div><div class='add'>+ */</div><div class='add'>+void TPAL_SetPhy10HalfDuplex(struct et131x_adapter *pAdapter)</div><div class='add'>+{</div><div class='add'>+	DBG_ENTER(et131x_dbginfo);</div><div class='add'>+</div><div class='add'>+	/* Power down PHY */</div><div class='add'>+	ET1310_PhyPowerDown(pAdapter, 1);</div><div class='add'>+</div><div class='add'>+	/* First we need to turn off all other advertisement */</div><div class='add'>+	ET1310_PhyAdvertise1000BaseT(pAdapter, TRUEPHY_ADV_DUPLEX_NONE);</div><div class='add'>+</div><div class='add'>+	ET1310_PhyAdvertise100BaseT(pAdapter, TRUEPHY_ADV_DUPLEX_NONE);</div><div class='add'>+</div><div class='add'>+	/* Set our advertise values accordingly */</div><div class='add'>+	ET1310_PhyAdvertise10BaseT(pAdapter, TRUEPHY_ADV_DUPLEX_HALF);</div><div class='add'>+</div><div class='add'>+	/* Power up PHY */</div><div class='add'>+	ET1310_PhyPowerDown(pAdapter, 0);</div><div class='add'>+</div><div class='add'>+	DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * TPAL_SetPhy10FullDuplex - Force the phy into 10 Base T Full Duplex mode.</div><div class='add'>+ * @pAdapter: pointer to the adapter structure</div><div class='add'>+ *</div><div class='add'>+ * Also sets the MAC so it is syncd up properly</div><div class='add'>+ */</div><div class='add'>+void TPAL_SetPhy10FullDuplex(struct et131x_adapter *pAdapter)</div><div class='add'>+{</div><div class='add'>+	DBG_ENTER(et131x_dbginfo);</div><div class='add'>+</div><div class='add'>+	/* Power down PHY */</div><div class='add'>+	ET1310_PhyPowerDown(pAdapter, 1);</div><div class='add'>+</div><div class='add'>+	/* First we need to turn off all other advertisement */</div><div class='add'>+	ET1310_PhyAdvertise1000BaseT(pAdapter, TRUEPHY_ADV_DUPLEX_NONE);</div><div class='add'>+</div><div class='add'>+	ET1310_PhyAdvertise100BaseT(pAdapter, TRUEPHY_ADV_DUPLEX_NONE);</div><div class='add'>+</div><div class='add'>+	/* Set our advertise values accordingly */</div><div class='add'>+	ET1310_PhyAdvertise10BaseT(pAdapter, TRUEPHY_ADV_DUPLEX_FULL);</div><div class='add'>+</div><div class='add'>+	/* Power up PHY */</div><div class='add'>+	ET1310_PhyPowerDown(pAdapter, 0);</div><div class='add'>+</div><div class='add'>+	DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * TPAL_SetPhy10Force - Force Base-T FD mode WITHOUT using autonegotiation</div><div class='add'>+ * @pAdapter: pointer to the adapter structure</div><div class='add'>+ */</div><div class='add'>+void TPAL_SetPhy10Force(struct et131x_adapter *pAdapter)</div><div class='add'>+{</div><div class='add'>+	DBG_ENTER(et131x_dbginfo);</div><div class='add'>+</div><div class='add'>+	/* Power down PHY */</div><div class='add'>+	ET1310_PhyPowerDown(pAdapter, 1);</div><div class='add'>+</div><div class='add'>+	/* Disable autoneg */</div><div class='add'>+	ET1310_PhyAutoNeg(pAdapter, false);</div><div class='add'>+</div><div class='add'>+	/* Disable all advertisement */</div><div class='add'>+	ET1310_PhyAdvertise1000BaseT(pAdapter, TRUEPHY_ADV_DUPLEX_NONE);</div><div class='add'>+	ET1310_PhyAdvertise10BaseT(pAdapter, TRUEPHY_ADV_DUPLEX_NONE);</div><div class='add'>+	ET1310_PhyAdvertise100BaseT(pAdapter, TRUEPHY_ADV_DUPLEX_NONE);</div><div class='add'>+</div><div class='add'>+	/* Force 10 Mbps */</div><div class='add'>+	ET1310_PhySpeedSelect(pAdapter, TRUEPHY_SPEED_10MBPS);</div><div class='add'>+</div><div class='add'>+	/* Force Full duplex */</div><div class='add'>+	ET1310_PhyDuplexMode(pAdapter, TRUEPHY_DUPLEX_FULL);</div><div class='add'>+</div><div class='add'>+	/* Power up PHY */</div><div class='add'>+	ET1310_PhyPowerDown(pAdapter, 0);</div><div class='add'>+</div><div class='add'>+	DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * TPAL_SetPhy100HalfDuplex - Force 100 Base T Half Duplex mode.</div><div class='add'>+ * @pAdapter: pointer to the adapter structure</div><div class='add'>+ *</div><div class='add'>+ * Also sets the MAC so it is syncd up properly.</div><div class='add'>+ */</div><div class='add'>+void TPAL_SetPhy100HalfDuplex(struct et131x_adapter *pAdapter)</div><div class='add'>+{</div><div class='add'>+	DBG_ENTER(et131x_dbginfo);</div><div class='add'>+</div><div class='add'>+	/* Power down PHY */</div><div class='add'>+	ET1310_PhyPowerDown(pAdapter, 1);</div><div class='add'>+</div><div class='add'>+	/* first we need to turn off all other advertisement */</div><div class='add'>+	ET1310_PhyAdvertise1000BaseT(pAdapter, TRUEPHY_ADV_DUPLEX_NONE);</div><div class='add'>+</div><div class='add'>+	ET1310_PhyAdvertise10BaseT(pAdapter, TRUEPHY_ADV_DUPLEX_NONE);</div><div class='add'>+</div><div class='add'>+	/* Set our advertise values accordingly */</div><div class='add'>+	ET1310_PhyAdvertise100BaseT(pAdapter, TRUEPHY_ADV_DUPLEX_HALF);</div><div class='add'>+</div><div class='add'>+	/* Set speed */</div><div class='add'>+	ET1310_PhySpeedSelect(pAdapter, TRUEPHY_SPEED_100MBPS);</div><div class='add'>+</div><div class='add'>+	/* Power up PHY */</div><div class='add'>+	ET1310_PhyPowerDown(pAdapter, 0);</div><div class='add'>+</div><div class='add'>+	DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * TPAL_SetPhy100FullDuplex - Force 100 Base T Full Duplex mode.</div><div class='add'>+ * @pAdapter: pointer to the adapter structure</div><div class='add'>+ *</div><div class='add'>+ * Also sets the MAC so it is syncd up properly</div><div class='add'>+ */</div><div class='add'>+void TPAL_SetPhy100FullDuplex(struct et131x_adapter *pAdapter)</div><div class='add'>+{</div><div class='add'>+	DBG_ENTER(et131x_dbginfo);</div><div class='add'>+</div><div class='add'>+	/* Power down PHY */</div><div class='add'>+	ET1310_PhyPowerDown(pAdapter, 1);</div><div class='add'>+</div><div class='add'>+	/* First we need to turn off all other advertisement */</div><div class='add'>+	ET1310_PhyAdvertise1000BaseT(pAdapter, TRUEPHY_ADV_DUPLEX_NONE);</div><div class='add'>+</div><div class='add'>+	ET1310_PhyAdvertise10BaseT(pAdapter, TRUEPHY_ADV_DUPLEX_NONE);</div><div class='add'>+</div><div class='add'>+	/* Set our advertise values accordingly */</div><div class='add'>+	ET1310_PhyAdvertise100BaseT(pAdapter, TRUEPHY_ADV_DUPLEX_FULL);</div><div class='add'>+</div><div class='add'>+	/* Power up PHY */</div><div class='add'>+	ET1310_PhyPowerDown(pAdapter, 0);</div><div class='add'>+</div><div class='add'>+	DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * TPAL_SetPhy100Force - Force 100 BaseT FD mode WITHOUT using autonegotiation</div><div class='add'>+ * @pAdapter: pointer to the adapter structure</div><div class='add'>+ */</div><div class='add'>+void TPAL_SetPhy100Force(struct et131x_adapter *pAdapter)</div><div class='add'>+{</div><div class='add'>+	DBG_ENTER(et131x_dbginfo);</div><div class='add'>+</div><div class='add'>+	/* Power down PHY */</div><div class='add'>+	ET1310_PhyPowerDown(pAdapter, 1);</div><div class='add'>+</div><div class='add'>+	/* Disable autoneg */</div><div class='add'>+	ET1310_PhyAutoNeg(pAdapter, false);</div><div class='add'>+</div><div class='add'>+	/* Disable all advertisement */</div><div class='add'>+	ET1310_PhyAdvertise1000BaseT(pAdapter, TRUEPHY_ADV_DUPLEX_NONE);</div><div class='add'>+	ET1310_PhyAdvertise10BaseT(pAdapter, TRUEPHY_ADV_DUPLEX_NONE);</div><div class='add'>+	ET1310_PhyAdvertise100BaseT(pAdapter, TRUEPHY_ADV_DUPLEX_NONE);</div><div class='add'>+</div><div class='add'>+	/* Force 100 Mbps */</div><div class='add'>+	ET1310_PhySpeedSelect(pAdapter, TRUEPHY_SPEED_100MBPS);</div><div class='add'>+</div><div class='add'>+	/* Force Full duplex */</div><div class='add'>+	ET1310_PhyDuplexMode(pAdapter, TRUEPHY_DUPLEX_FULL);</div><div class='add'>+</div><div class='add'>+	/* Power up PHY */</div><div class='add'>+	ET1310_PhyPowerDown(pAdapter, 0);</div><div class='add'>+</div><div class='add'>+	DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * TPAL_SetPhy1000FullDuplex - Force 1000 Base T Full Duplex mode</div><div class='add'>+ * @pAdapter: pointer to the adapter structure</div><div class='add'>+ *</div><div class='add'>+ * Also sets the MAC so it is syncd up properly.</div><div class='add'>+ */</div><div class='add'>+void TPAL_SetPhy1000FullDuplex(struct et131x_adapter *pAdapter)</div><div class='add'>+{</div><div class='add'>+	DBG_ENTER(et131x_dbginfo);</div><div class='add'>+</div><div class='add'>+	/* Power down PHY */</div><div class='add'>+	ET1310_PhyPowerDown(pAdapter, 1);</div><div class='add'>+</div><div class='add'>+	/* first we need to turn off all other advertisement */</div><div class='add'>+	ET1310_PhyAdvertise100BaseT(pAdapter, TRUEPHY_ADV_DUPLEX_NONE);</div><div class='add'>+</div><div class='add'>+	ET1310_PhyAdvertise10BaseT(pAdapter, TRUEPHY_ADV_DUPLEX_NONE);</div><div class='add'>+</div><div class='add'>+	/* set our advertise values accordingly */</div><div class='add'>+	ET1310_PhyAdvertise1000BaseT(pAdapter, TRUEPHY_ADV_DUPLEX_FULL);</div><div class='add'>+</div><div class='add'>+	/* power up PHY */</div><div class='add'>+	ET1310_PhyPowerDown(pAdapter, 0);</div><div class='add'>+</div><div class='add'>+	DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * TPAL_SetPhyAutoNeg - Set phy to autonegotiation mode.</div><div class='add'>+ * @pAdapter: pointer to the adapter structure</div><div class='add'>+ */</div><div class='add'>+void TPAL_SetPhyAutoNeg(struct et131x_adapter *pAdapter)</div><div class='add'>+{</div><div class='add'>+	DBG_ENTER(et131x_dbginfo);</div><div class='add'>+</div><div class='add'>+	/* Power down PHY */</div><div class='add'>+	ET1310_PhyPowerDown(pAdapter, 1);</div><div class='add'>+</div><div class='add'>+	/* Turn on advertisement of all capabilities */</div><div class='add'>+	ET1310_PhyAdvertise10BaseT(pAdapter, TRUEPHY_ADV_DUPLEX_BOTH);</div><div class='add'>+</div><div class='add'>+	ET1310_PhyAdvertise100BaseT(pAdapter, TRUEPHY_ADV_DUPLEX_BOTH);</div><div class='add'>+</div><div class='add'>+	if (pAdapter-&gt;DeviceID != ET131X_PCI_DEVICE_ID_FAST) {</div><div class='add'>+		ET1310_PhyAdvertise1000BaseT(pAdapter, TRUEPHY_ADV_DUPLEX_FULL);</div><div class='add'>+	} else {</div><div class='add'>+		ET1310_PhyAdvertise1000BaseT(pAdapter, TRUEPHY_ADV_DUPLEX_NONE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Make sure auto-neg is ON (it is disabled in FORCE modes) */</div><div class='add'>+	ET1310_PhyAutoNeg(pAdapter, true);</div><div class='add'>+</div><div class='add'>+	/* Power up PHY */</div><div class='add'>+	ET1310_PhyPowerDown(pAdapter, 0);</div><div class='add'>+</div><div class='add'>+	DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The routines which follow provide low-level access to the PHY, and are used</div><div class='add'>+ * primarily by the routines above (although there are a few places elsewhere</div><div class='add'>+ * in the driver where this level of access is required).</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static const uint16_t ConfigPhy[25][2] = {</div><div class='add'>+	/* Reg      Value      Register */</div><div class='add'>+	/* Addr                         */</div><div class='add'>+	{0x880B, 0x0926},	/* AfeIfCreg4B1000Msbs */</div><div class='add'>+	{0x880C, 0x0926},	/* AfeIfCreg4B100Msbs */</div><div class='add'>+	{0x880D, 0x0926},	/* AfeIfCreg4B10Msbs */</div><div class='add'>+</div><div class='add'>+	{0x880E, 0xB4D3},	/* AfeIfCreg4B1000Lsbs */</div><div class='add'>+	{0x880F, 0xB4D3},	/* AfeIfCreg4B100Lsbs */</div><div class='add'>+	{0x8810, 0xB4D3},	/* AfeIfCreg4B10Lsbs */</div><div class='add'>+</div><div class='add'>+	{0x8805, 0xB03E},	/* AfeIfCreg3B1000Msbs */</div><div class='add'>+	{0x8806, 0xB03E},	/* AfeIfCreg3B100Msbs */</div><div class='add'>+	{0x8807, 0xFF00},	/* AfeIfCreg3B10Msbs */</div><div class='add'>+</div><div class='add'>+	{0x8808, 0xE090},	/* AfeIfCreg3B1000Lsbs */</div><div class='add'>+	{0x8809, 0xE110},	/* AfeIfCreg3B100Lsbs */</div><div class='add'>+	{0x880A, 0x0000},	/* AfeIfCreg3B10Lsbs */</div><div class='add'>+</div><div class='add'>+	{0x300D, 1},		/* DisableNorm */</div><div class='add'>+</div><div class='add'>+	{0x280C, 0x0180},	/* LinkHoldEnd */</div><div class='add'>+</div><div class='add'>+	{0x1C21, 0x0002},	/* AlphaM */</div><div class='add'>+</div><div class='add'>+	{0x3821, 6},		/* FfeLkgTx0 */</div><div class='add'>+	{0x381D, 1},		/* FfeLkg1g4 */</div><div class='add'>+	{0x381E, 1},		/* FfeLkg1g5 */</div><div class='add'>+	{0x381F, 1},		/* FfeLkg1g6 */</div><div class='add'>+	{0x3820, 1},		/* FfeLkg1g7 */</div><div class='add'>+</div><div class='add'>+	{0x8402, 0x01F0},	/* Btinact */</div><div class='add'>+	{0x800E, 20},		/* LftrainTime */</div><div class='add'>+	{0x800F, 24},		/* DvguardTime */</div><div class='add'>+	{0x8010, 46},		/* IdlguardTime */</div><div class='add'>+</div><div class='add'>+	{0, 0}</div><div class='add'>+</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* condensed version of the phy initialization routine */</div><div class='add'>+void ET1310_PhyInit(struct et131x_adapter *pAdapter)</div><div class='add'>+{</div><div class='add'>+	uint16_t usData, usIndex;</div><div class='add'>+</div><div class='add'>+	if (pAdapter == NULL) {</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	// get the identity (again ?)</div><div class='add'>+	MiRead(pAdapter, PHY_ID_1, &amp;usData);</div><div class='add'>+	MiRead(pAdapter, PHY_ID_2, &amp;usData);</div><div class='add'>+</div><div class='add'>+	// what does this do/achieve ?</div><div class='add'>+	MiRead(pAdapter, PHY_MPHY_CONTROL_REG, &amp;usData);	// should read 0002</div><div class='add'>+	MiWrite(pAdapter, PHY_MPHY_CONTROL_REG,	0x0006);</div><div class='add'>+</div><div class='add'>+	// read modem register 0402, should I do something with the return data ?</div><div class='add'>+	MiWrite(pAdapter, PHY_INDEX_REG, 0x0402);</div><div class='add'>+	MiRead(pAdapter, PHY_DATA_REG, &amp;usData);</div><div class='add'>+</div><div class='add'>+	// what does this do/achieve ?</div><div class='add'>+	MiWrite(pAdapter, PHY_MPHY_CONTROL_REG, 0x0002);</div><div class='add'>+</div><div class='add'>+	// get the identity (again ?)</div><div class='add'>+	MiRead(pAdapter, PHY_ID_1, &amp;usData);</div><div class='add'>+	MiRead(pAdapter, PHY_ID_2, &amp;usData);</div><div class='add'>+</div><div class='add'>+	// what does this achieve ?</div><div class='add'>+	MiRead(pAdapter, PHY_MPHY_CONTROL_REG, &amp;usData);	// should read 0002</div><div class='add'>+	MiWrite(pAdapter, PHY_MPHY_CONTROL_REG, 0x0006);</div><div class='add'>+</div><div class='add'>+	// read modem register 0402, should I do something with the return data?</div><div class='add'>+	MiWrite(pAdapter, PHY_INDEX_REG, 0x0402);</div><div class='add'>+	MiRead(pAdapter, PHY_DATA_REG, &amp;usData);</div><div class='add'>+</div><div class='add'>+	MiWrite(pAdapter, PHY_MPHY_CONTROL_REG, 0x0002);</div><div class='add'>+</div><div class='add'>+	// what does this achieve (should return 0x1040)</div><div class='add'>+	MiRead(pAdapter, PHY_CONTROL, &amp;usData);</div><div class='add'>+	MiRead(pAdapter, PHY_MPHY_CONTROL_REG, &amp;usData);	// should read 0002</div><div class='add'>+	MiWrite(pAdapter, PHY_CONTROL, 0x1840);</div><div class='add'>+</div><div class='add'>+	MiWrite(pAdapter, PHY_MPHY_CONTROL_REG, 0x0007);</div><div class='add'>+</div><div class='add'>+	// here the writing of the array starts....</div><div class='add'>+	usIndex = 0;</div><div class='add'>+	while (ConfigPhy[usIndex][0] != 0x0000) {</div><div class='add'>+		// write value</div><div class='add'>+		MiWrite(pAdapter, PHY_INDEX_REG, ConfigPhy[usIndex][0]);</div><div class='add'>+		MiWrite(pAdapter, PHY_DATA_REG, ConfigPhy[usIndex][1]);</div><div class='add'>+</div><div class='add'>+		// read it back</div><div class='add'>+		MiWrite(pAdapter, PHY_INDEX_REG, ConfigPhy[usIndex][0]);</div><div class='add'>+		MiRead(pAdapter, PHY_DATA_REG, &amp;usData);</div><div class='add'>+</div><div class='add'>+		// do a check on the value read back ?</div><div class='add'>+		usIndex++;</div><div class='add'>+	}</div><div class='add'>+	// here the writing of the array ends...</div><div class='add'>+</div><div class='add'>+	MiRead(pAdapter, PHY_CONTROL, &amp;usData);	// 0x1840</div><div class='add'>+	MiRead(pAdapter, PHY_MPHY_CONTROL_REG, &amp;usData);	// should read 0007</div><div class='add'>+	MiWrite(pAdapter, PHY_CONTROL, 0x1040);</div><div class='add'>+	MiWrite(pAdapter, PHY_MPHY_CONTROL_REG, 0x0002);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ET1310_PhyReset(struct et131x_adapter *pAdapter)</div><div class='add'>+{</div><div class='add'>+	MiWrite(pAdapter, PHY_CONTROL, 0x8000);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ET1310_PhyPowerDown(struct et131x_adapter *pAdapter, bool down)</div><div class='add'>+{</div><div class='add'>+	uint16_t usData;</div><div class='add'>+</div><div class='add'>+	MiRead(pAdapter, PHY_CONTROL, &amp;usData);</div><div class='add'>+</div><div class='add'>+	if (down == false) {</div><div class='add'>+		// Power UP</div><div class='add'>+		usData &amp;= ~0x0800;</div><div class='add'>+		MiWrite(pAdapter, PHY_CONTROL, usData);</div><div class='add'>+	} else {</div><div class='add'>+		// Power DOWN</div><div class='add'>+		usData |= 0x0800;</div><div class='add'>+		MiWrite(pAdapter, PHY_CONTROL, usData);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ET1310_PhyAutoNeg(struct et131x_adapter *pAdapter, bool enable)</div><div class='add'>+{</div><div class='add'>+	uint16_t usData;</div><div class='add'>+</div><div class='add'>+	MiRead(pAdapter, PHY_CONTROL, &amp;usData);</div><div class='add'>+</div><div class='add'>+	if (enable == true) {</div><div class='add'>+		// Autonegotiation ON</div><div class='add'>+		usData |= 0x1000;</div><div class='add'>+		MiWrite(pAdapter, PHY_CONTROL, usData);</div><div class='add'>+	} else {</div><div class='add'>+		// Autonegotiation OFF</div><div class='add'>+		usData &amp;= ~0x1000;</div><div class='add'>+		MiWrite(pAdapter, PHY_CONTROL, usData);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ET1310_PhyDuplexMode(struct et131x_adapter *pAdapter, uint16_t duplex)</div><div class='add'>+{</div><div class='add'>+	uint16_t usData;</div><div class='add'>+</div><div class='add'>+	MiRead(pAdapter, PHY_CONTROL, &amp;usData);</div><div class='add'>+</div><div class='add'>+	if (duplex == TRUEPHY_DUPLEX_FULL) {</div><div class='add'>+		// Set Full Duplex</div><div class='add'>+		usData |= 0x100;</div><div class='add'>+		MiWrite(pAdapter, PHY_CONTROL, usData);</div><div class='add'>+	} else {</div><div class='add'>+		// Set Half Duplex</div><div class='add'>+		usData &amp;= ~0x100;</div><div class='add'>+		MiWrite(pAdapter, PHY_CONTROL, usData);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ET1310_PhySpeedSelect(struct et131x_adapter *pAdapter, uint16_t speed)</div><div class='add'>+{</div><div class='add'>+	uint16_t usData;</div><div class='add'>+</div><div class='add'>+	// Read the PHY control register</div><div class='add'>+	MiRead(pAdapter, PHY_CONTROL, &amp;usData);</div><div class='add'>+</div><div class='add'>+	// Clear all Speed settings (Bits 6, 13)</div><div class='add'>+	usData &amp;= ~0x2040;</div><div class='add'>+</div><div class='add'>+	// Reset the speed bits based on user selection</div><div class='add'>+	switch (speed) {</div><div class='add'>+	case TRUEPHY_SPEED_10MBPS:</div><div class='add'>+		// Bits already cleared above, do nothing</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case TRUEPHY_SPEED_100MBPS:</div><div class='add'>+		// 100M == Set bit 13</div><div class='add'>+		usData |= 0x2000;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case TRUEPHY_SPEED_1000MBPS:</div><div class='add'>+	default:</div><div class='add'>+		usData |= 0x0040;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	// Write back the new speed</div><div class='add'>+	MiWrite(pAdapter, PHY_CONTROL, usData);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ET1310_PhyAdvertise1000BaseT(struct et131x_adapter *pAdapter,</div><div class='add'>+				  uint16_t duplex)</div><div class='add'>+{</div><div class='add'>+	uint16_t usData;</div><div class='add'>+</div><div class='add'>+	// Read the PHY 1000 Base-T Control Register</div><div class='add'>+	MiRead(pAdapter, PHY_1000_CONTROL, &amp;usData);</div><div class='add'>+</div><div class='add'>+	// Clear Bits 8,9</div><div class='add'>+	usData &amp;= ~0x0300;</div><div class='add'>+</div><div class='add'>+	switch (duplex) {</div><div class='add'>+	case TRUEPHY_ADV_DUPLEX_NONE:</div><div class='add'>+		// Duplex already cleared, do nothing</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case TRUEPHY_ADV_DUPLEX_FULL:</div><div class='add'>+		// Set Bit 9</div><div class='add'>+		usData |= 0x0200;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case TRUEPHY_ADV_DUPLEX_HALF:</div><div class='add'>+		// Set Bit 8</div><div class='add'>+		usData |= 0x0100;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case TRUEPHY_ADV_DUPLEX_BOTH:</div><div class='add'>+	default:</div><div class='add'>+		usData |= 0x0300;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	// Write back advertisement</div><div class='add'>+	MiWrite(pAdapter, PHY_1000_CONTROL, usData);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ET1310_PhyAdvertise100BaseT(struct et131x_adapter *pAdapter,</div><div class='add'>+				 uint16_t duplex)</div><div class='add'>+{</div><div class='add'>+	uint16_t usData;</div><div class='add'>+</div><div class='add'>+	// Read the Autonegotiation Register (10/100)</div><div class='add'>+	MiRead(pAdapter, PHY_AUTO_ADVERTISEMENT, &amp;usData);</div><div class='add'>+</div><div class='add'>+	// Clear bits 7,8</div><div class='add'>+	usData &amp;= ~0x0180;</div><div class='add'>+</div><div class='add'>+	switch (duplex) {</div><div class='add'>+	case TRUEPHY_ADV_DUPLEX_NONE:</div><div class='add'>+		// Duplex already cleared, do nothing</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case TRUEPHY_ADV_DUPLEX_FULL:</div><div class='add'>+		// Set Bit 8</div><div class='add'>+		usData |= 0x0100;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case TRUEPHY_ADV_DUPLEX_HALF:</div><div class='add'>+		// Set Bit 7</div><div class='add'>+		usData |= 0x0080;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case TRUEPHY_ADV_DUPLEX_BOTH:</div><div class='add'>+	default:</div><div class='add'>+		// Set Bits 7,8</div><div class='add'>+		usData |= 0x0180;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	// Write back advertisement</div><div class='add'>+	MiWrite(pAdapter, PHY_AUTO_ADVERTISEMENT, usData);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ET1310_PhyAdvertise10BaseT(struct et131x_adapter *pAdapter,</div><div class='add'>+				uint16_t duplex)</div><div class='add'>+{</div><div class='add'>+	uint16_t usData;</div><div class='add'>+</div><div class='add'>+	// Read the Autonegotiation Register (10/100)</div><div class='add'>+	MiRead(pAdapter, PHY_AUTO_ADVERTISEMENT, &amp;usData);</div><div class='add'>+</div><div class='add'>+	// Clear bits 5,6</div><div class='add'>+	usData &amp;= ~0x0060;</div><div class='add'>+</div><div class='add'>+	switch (duplex) {</div><div class='add'>+	case TRUEPHY_ADV_DUPLEX_NONE:</div><div class='add'>+		// Duplex already cleared, do nothing</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case TRUEPHY_ADV_DUPLEX_FULL:</div><div class='add'>+		// Set Bit 6</div><div class='add'>+		usData |= 0x0040;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case TRUEPHY_ADV_DUPLEX_HALF:</div><div class='add'>+		// Set Bit 5</div><div class='add'>+		usData |= 0x0020;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case TRUEPHY_ADV_DUPLEX_BOTH:</div><div class='add'>+	default:</div><div class='add'>+		// Set Bits 5,6</div><div class='add'>+		usData |= 0x0060;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	// Write back advertisement</div><div class='add'>+	MiWrite(pAdapter, PHY_AUTO_ADVERTISEMENT, usData);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ET1310_PhyLinkStatus(struct et131x_adapter *pAdapter,</div><div class='add'>+			  uint8_t *ucLinkStatus,</div><div class='add'>+			  uint32_t *uiAutoNeg,</div><div class='add'>+			  uint32_t *uiLinkSpeed,</div><div class='add'>+			  uint32_t *uiDuplexMode,</div><div class='add'>+			  uint32_t *uiMdiMdix,</div><div class='add'>+			  uint32_t *uiMasterSlave, uint32_t *uiPolarity)</div><div class='add'>+{</div><div class='add'>+	uint16_t usMiStatus = 0;</div><div class='add'>+	uint16_t us1000BaseT = 0;</div><div class='add'>+	uint16_t usVmiPhyStatus = 0;</div><div class='add'>+	uint16_t usControl = 0;</div><div class='add'>+</div><div class='add'>+	MiRead(pAdapter, PHY_STATUS, &amp;usMiStatus);</div><div class='add'>+	MiRead(pAdapter, PHY_1000_STATUS, &amp;us1000BaseT);</div><div class='add'>+	MiRead(pAdapter, PHY_PHY_STATUS, &amp;usVmiPhyStatus);</div><div class='add'>+	MiRead(pAdapter, PHY_CONTROL, &amp;usControl);</div><div class='add'>+</div><div class='add'>+	if (ucLinkStatus) {</div><div class='add'>+		*ucLinkStatus =</div><div class='add'>+		    (unsigned char)((usVmiPhyStatus &amp; 0x0040) ? 1 : 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (uiAutoNeg) {</div><div class='add'>+		*uiAutoNeg =</div><div class='add'>+		    (usControl &amp; 0x1000) ? ((usVmiPhyStatus &amp; 0x0020) ?</div><div class='add'>+					    TRUEPHY_ANEG_COMPLETE :</div><div class='add'>+					    TRUEPHY_ANEG_NOT_COMPLETE) :</div><div class='add'>+		    TRUEPHY_ANEG_DISABLED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (uiLinkSpeed) {</div><div class='add'>+		*uiLinkSpeed = (usVmiPhyStatus &amp; 0x0300) &gt;&gt; 8;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (uiDuplexMode) {</div><div class='add'>+		*uiDuplexMode = (usVmiPhyStatus &amp; 0x0080) &gt;&gt; 7;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (uiMdiMdix) {</div><div class='add'>+		/* NOTE: Need to complete this */</div><div class='add'>+		*uiMdiMdix = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (uiMasterSlave) {</div><div class='add'>+		*uiMasterSlave =</div><div class='add'>+		    (us1000BaseT &amp; 0x4000) ? TRUEPHY_CFG_MASTER :</div><div class='add'>+		    TRUEPHY_CFG_SLAVE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (uiPolarity) {</div><div class='add'>+		*uiPolarity =</div><div class='add'>+		    (usVmiPhyStatus &amp; 0x0400) ? TRUEPHY_POLARITY_INVERTED :</div><div class='add'>+		    TRUEPHY_POLARITY_NORMAL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ET1310_PhyAndOrReg(struct et131x_adapter *pAdapter,</div><div class='add'>+			uint16_t regnum, uint16_t andMask, uint16_t orMask)</div><div class='add'>+{</div><div class='add'>+	uint16_t reg;</div><div class='add'>+</div><div class='add'>+	// Read the requested register</div><div class='add'>+	MiRead(pAdapter, regnum, &amp;reg);</div><div class='add'>+</div><div class='add'>+	// Apply the AND mask</div><div class='add'>+	reg &amp;= andMask;</div><div class='add'>+</div><div class='add'>+	// Apply the OR mask</div><div class='add'>+	reg |= orMask;</div><div class='add'>+</div><div class='add'>+	// Write the value back to the register</div><div class='add'>+	MiWrite(pAdapter, regnum, reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ET1310_PhyAccessMiBit(struct et131x_adapter *pAdapter, uint16_t action,</div><div class='add'>+			   uint16_t regnum, uint16_t bitnum, uint8_t *value)</div><div class='add'>+{</div><div class='add'>+	uint16_t reg;</div><div class='add'>+	uint16_t mask = 0;</div><div class='add'>+</div><div class='add'>+	// Create a mask to isolate the requested bit</div><div class='add'>+	mask = 0x0001 &lt;&lt; bitnum;</div><div class='add'>+</div><div class='add'>+	// Read the requested register</div><div class='add'>+	MiRead(pAdapter, regnum, &amp;reg);</div><div class='add'>+</div><div class='add'>+	switch (action) {</div><div class='add'>+	case TRUEPHY_BIT_READ:</div><div class='add'>+		if (value != NULL) {</div><div class='add'>+			*value = (reg &amp; mask) &gt;&gt; bitnum;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case TRUEPHY_BIT_SET:</div><div class='add'>+		reg |= mask;</div><div class='add'>+		MiWrite(pAdapter, regnum, reg);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case TRUEPHY_BIT_CLEAR:</div><div class='add'>+		reg &amp;= ~mask;</div><div class='add'>+		MiWrite(pAdapter, regnum, reg);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/staging/et131x/et1310_phy.h b/drivers/staging/et131x/et1310_phy.h<br/>new file mode 100644<br/>index 000000000000..d624cbbadbd7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/et131x/et1310_phy.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/et131x/et1310_phy.h</a></div><div class='hunk'>@@ -0,0 +1,910 @@</div><div class='add'>+/*</div><div class='add'>+ * Agere Systems Inc.</div><div class='add'>+ * 10/100/1000 Base-T Ethernet Driver for the ET1301 and ET131x series MACs</div><div class='add'>+ *</div><div class='add'>+ * Copyright © 2005 Agere Systems Inc.</div><div class='add'>+ * All rights reserved.</div><div class='add'>+ *   http://www.agere.com</div><div class='add'>+ *</div><div class='add'>+ *------------------------------------------------------------------------------</div><div class='add'>+ *</div><div class='add'>+ * et1310_phy.h - Defines, structs, enums, prototypes, etc. pertaining to the</div><div class='add'>+ *                PHY.</div><div class='add'>+ *</div><div class='add'>+ *------------------------------------------------------------------------------</div><div class='add'>+ *</div><div class='add'>+ * SOFTWARE LICENSE</div><div class='add'>+ *</div><div class='add'>+ * This software is provided subject to the following terms and conditions,</div><div class='add'>+ * which you should read carefully before using the software.  Using this</div><div class='add'>+ * software indicates your acceptance of these terms and conditions.  If you do</div><div class='add'>+ * not agree with these terms and conditions, do not use the software.</div><div class='add'>+ *</div><div class='add'>+ * Copyright © 2005 Agere Systems Inc.</div><div class='add'>+ * All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source or binary forms, with or without</div><div class='add'>+ * modifications, are permitted provided that the following conditions are met:</div><div class='add'>+ *</div><div class='add'>+ * . Redistributions of source code must retain the above copyright notice, this</div><div class='add'>+ *    list of conditions and the following Disclaimer as comments in the code as</div><div class='add'>+ *    well as in the documentation and/or other materials provided with the</div><div class='add'>+ *    distribution.</div><div class='add'>+ *</div><div class='add'>+ * . Redistributions in binary form must reproduce the above copyright notice,</div><div class='add'>+ *    this list of conditions and the following Disclaimer in the documentation</div><div class='add'>+ *    and/or other materials provided with the distribution.</div><div class='add'>+ *</div><div class='add'>+ * . Neither the name of Agere Systems Inc. nor the names of the contributors</div><div class='add'>+ *    may be used to endorse or promote products derived from this software</div><div class='add'>+ *    without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ * Disclaimer</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES,</div><div class='add'>+ * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  ANY</div><div class='add'>+ * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN</div><div class='add'>+ * RISK. IN NO EVENT SHALL AGERE SYSTEMS INC. OR CONTRIBUTORS BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, INCLUDING, BUT NOT LIMITED TO, CONTRACT, STRICT</div><div class='add'>+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT</div><div class='add'>+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH</div><div class='add'>+ * DAMAGE.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _ET1310_PHY_H_</div><div class='add'>+#define _ET1310_PHY_H_</div><div class='add'>+</div><div class='add'>+#include "et1310_address_map.h"</div><div class='add'>+</div><div class='add'>+#define TRUEPHY_SUCCESS 0</div><div class='add'>+#define TRUEPHY_FAILURE 1</div><div class='add'>+typedef void *TRUEPHY_HANDLE;</div><div class='add'>+typedef void *TRUEPHY_PLATFORM_HANDLE;</div><div class='add'>+typedef void *TRUEPHY_OSAL_HANDLE;</div><div class='add'>+</div><div class='add'>+/* MI Register Addresses */</div><div class='add'>+#define MI_CONTROL_REG                      0</div><div class='add'>+#define MI_STATUS_REG                       1</div><div class='add'>+#define MI_PHY_IDENTIFIER_1_REG             2</div><div class='add'>+#define MI_PHY_IDENTIFIER_2_REG             3</div><div class='add'>+#define MI_AUTONEG_ADVERTISEMENT_REG        4</div><div class='add'>+#define MI_AUTONEG_LINK_PARTNER_ABILITY_REG 5</div><div class='add'>+#define MI_AUTONEG_EXPANSION_REG            6</div><div class='add'>+#define MI_AUTONEG_NEXT_PAGE_TRANSMIT_REG   7</div><div class='add'>+#define MI_LINK_PARTNER_NEXT_PAGE_REG       8</div><div class='add'>+#define MI_1000BASET_CONTROL_REG            9</div><div class='add'>+#define MI_1000BASET_STATUS_REG             10</div><div class='add'>+#define MI_RESERVED11_REG                   11</div><div class='add'>+#define MI_RESERVED12_REG                   12</div><div class='add'>+#define MI_RESERVED13_REG                   13</div><div class='add'>+#define MI_RESERVED14_REG                   14</div><div class='add'>+#define MI_EXTENDED_STATUS_REG              15</div><div class='add'>+</div><div class='add'>+/* VMI Register Addresses */</div><div class='add'>+#define VMI_RESERVED16_REG                  16</div><div class='add'>+#define VMI_RESERVED17_REG                  17</div><div class='add'>+#define VMI_RESERVED18_REG                  18</div><div class='add'>+#define VMI_LOOPBACK_CONTROL_REG            19</div><div class='add'>+#define VMI_RESERVED20_REG                  20</div><div class='add'>+#define VMI_MI_CONTROL_REG                  21</div><div class='add'>+#define VMI_PHY_CONFIGURATION_REG           22</div><div class='add'>+#define VMI_PHY_CONTROL_REG                 23</div><div class='add'>+#define VMI_INTERRUPT_MASK_REG              24</div><div class='add'>+#define VMI_INTERRUPT_STATUS_REG            25</div><div class='add'>+#define VMI_PHY_STATUS_REG                  26</div><div class='add'>+#define VMI_LED_CONTROL_1_REG               27</div><div class='add'>+#define VMI_LED_CONTROL_2_REG               28</div><div class='add'>+#define VMI_RESERVED29_REG                  29</div><div class='add'>+#define VMI_RESERVED30_REG                  30</div><div class='add'>+#define VMI_RESERVED31_REG                  31</div><div class='add'>+</div><div class='add'>+/* PHY Register Mapping(MI) Management Interface Regs */</div><div class='add'>+typedef struct _MI_REGS_t {</div><div class='add'>+	u8 bmcr;		// Basic mode control reg(Reg 0x00)</div><div class='add'>+	u8 bmsr;		// Basic mode status reg(Reg 0x01)</div><div class='add'>+	u8 idr1;		// Phy identifier reg 1(Reg 0x02)</div><div class='add'>+	u8 idr2;		// Phy identifier reg 2(Reg 0x03)</div><div class='add'>+	u8 anar;		// Auto-Negotiation advertisement(Reg 0x04)</div><div class='add'>+	u8 anlpar;		// Auto-Negotiation link Partner Ability(Reg 0x05)</div><div class='add'>+	u8 aner;		// Auto-Negotiation expansion reg(Reg 0x06)</div><div class='add'>+	u8 annptr;		// Auto-Negotiation next page transmit reg(Reg 0x07)</div><div class='add'>+	u8 lpnpr;		// link partner next page reg(Reg 0x08)</div><div class='add'>+	u8 gcr;		// Gigabit basic mode control reg(Reg 0x09)</div><div class='add'>+	u8 gsr;		// Gigabit basic mode status reg(Reg 0x0A)</div><div class='add'>+	u8 mi_res1[4];	// Future use by MI working group(Reg 0x0B - 0x0E)</div><div class='add'>+	u8 esr;		// Extended status reg(Reg 0x0F)</div><div class='add'>+	u8 mi_res2[3];	// Future use by MI working group(Reg 0x10 - 0x12)</div><div class='add'>+	u8 loop_ctl;	// Loopback Control Reg(Reg 0x13)</div><div class='add'>+	u8 mi_res3;	// Future use by MI working group(Reg 0x14)</div><div class='add'>+	u8 mcr;		// MI Control Reg(Reg 0x15)</div><div class='add'>+	u8 pcr;		// Configuration Reg(Reg 0x16)</div><div class='add'>+	u8 phy_ctl;	// PHY Control Reg(Reg 0x17)</div><div class='add'>+	u8 imr;		// Interrupt Mask Reg(Reg 0x18)</div><div class='add'>+	u8 isr;		// Interrupt Status Reg(Reg 0x19)</div><div class='add'>+	u8 psr;		// PHY Status Reg(Reg 0x1A)</div><div class='add'>+	u8 lcr1;		// LED Control 1 Reg(Reg 0x1B)</div><div class='add'>+	u8 lcr2;		// LED Control 2 Reg(Reg 0x1C)</div><div class='add'>+	u8 mi_res4[3];	// Future use by MI working group(Reg 0x1D - 0x1F)</div><div class='add'>+} MI_REGS_t, *PMI_REGS_t;</div><div class='add'>+</div><div class='add'>+/* MI Register 0: Basic mode control register */</div><div class='add'>+typedef union _MI_BMCR_t {</div><div class='add'>+	u16 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u16 reset:1;		// bit 15</div><div class='add'>+		u16 loopback:1;		// bit 14</div><div class='add'>+		u16 speed_sel:1;		// bit 13</div><div class='add'>+		u16 enable_autoneg:1;	// bit 12</div><div class='add'>+		u16 power_down:1;		// bit 11</div><div class='add'>+		u16 isolate:1;		// bit 10</div><div class='add'>+		u16 restart_autoneg:1;	// bit 9</div><div class='add'>+		u16 duplex_mode:1;		// bit 8</div><div class='add'>+		u16 col_test:1;		// bit 7</div><div class='add'>+		u16 speed_1000_sel:1;	// bit 6</div><div class='add'>+		u16 res1:6;		// bits 0-5</div><div class='add'>+#else</div><div class='add'>+		u16 res1:6;		// bits 0-5</div><div class='add'>+		u16 speed_1000_sel:1;	// bit 6</div><div class='add'>+		u16 col_test:1;		// bit 7</div><div class='add'>+		u16 duplex_mode:1;		// bit 8</div><div class='add'>+		u16 restart_autoneg:1;	// bit 9</div><div class='add'>+		u16 isolate:1;		// bit 10</div><div class='add'>+		u16 power_down:1;		// bit 11</div><div class='add'>+		u16 enable_autoneg:1;	// bit 12</div><div class='add'>+		u16 speed_sel:1;		// bit 13</div><div class='add'>+		u16 loopback:1;		// bit 14</div><div class='add'>+		u16 reset:1;		// bit 15</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} MI_BMCR_t, *PMI_BMCR_t;</div><div class='add'>+</div><div class='add'>+/* MI Register 1:  Basic mode status register */</div><div class='add'>+typedef union _MI_BMSR_t {</div><div class='add'>+	u16 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u16 link_100T4:1;		// bit 15</div><div class='add'>+		u16 link_100fdx:1;		// bit 14</div><div class='add'>+		u16 link_100hdx:1;		// bit 13</div><div class='add'>+		u16 link_10fdx:1;		// bit 12</div><div class='add'>+		u16 link_10hdx:1;		// bit 11</div><div class='add'>+		u16 link_100T2fdx:1;	// bit 10</div><div class='add'>+		u16 link_100T2hdx:1;	// bit 9</div><div class='add'>+		u16 extend_status:1;	// bit 8</div><div class='add'>+		u16 res1:1;		// bit 7</div><div class='add'>+		u16 preamble_supress:1;	// bit 6</div><div class='add'>+		u16 auto_neg_complete:1;	// bit 5</div><div class='add'>+		u16 remote_fault:1;	// bit 4</div><div class='add'>+		u16 auto_neg_able:1;	// bit 3</div><div class='add'>+		u16 link_status:1;		// bit 2</div><div class='add'>+		u16 jabber_detect:1;	// bit 1</div><div class='add'>+		u16 ext_cap:1;		// bit 0</div><div class='add'>+#else</div><div class='add'>+		u16 ext_cap:1;		// bit 0</div><div class='add'>+		u16 jabber_detect:1;	// bit 1</div><div class='add'>+		u16 link_status:1;		// bit 2</div><div class='add'>+		u16 auto_neg_able:1;	// bit 3</div><div class='add'>+		u16 remote_fault:1;	// bit 4</div><div class='add'>+		u16 auto_neg_complete:1;	// bit 5</div><div class='add'>+		u16 preamble_supress:1;	// bit 6</div><div class='add'>+		u16 res1:1;		// bit 7</div><div class='add'>+		u16 extend_status:1;	// bit 8</div><div class='add'>+		u16 link_100T2hdx:1;	// bit 9</div><div class='add'>+		u16 link_100T2fdx:1;	// bit 10</div><div class='add'>+		u16 link_10hdx:1;		// bit 11</div><div class='add'>+		u16 link_10fdx:1;		// bit 12</div><div class='add'>+		u16 link_100hdx:1;		// bit 13</div><div class='add'>+		u16 link_100fdx:1;		// bit 14</div><div class='add'>+		u16 link_100T4:1;		// bit 15</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} MI_BMSR_t, *PMI_BMSR_t;</div><div class='add'>+</div><div class='add'>+/* MI Register 2: Physical Identifier 1 */</div><div class='add'>+typedef union _MI_IDR1_t {</div><div class='add'>+	u16 value;</div><div class='add'>+	struct {</div><div class='add'>+		u16 ieee_address:16;	// 0x0282 default(bits 0-15)</div><div class='add'>+	} bits;</div><div class='add'>+} MI_IDR1_t, *PMI_IDR1_t;</div><div class='add'>+</div><div class='add'>+/* MI Register 3: Physical Identifier 2 */</div><div class='add'>+typedef union _MI_IDR2_t {</div><div class='add'>+	u16 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u16 ieee_address:6;	// 111100 default(bits 10-15)</div><div class='add'>+		u16 model_no:6;		// 000001 default(bits 4-9)</div><div class='add'>+		u16 rev_no:4;		// 0010   default(bits 0-3)</div><div class='add'>+#else</div><div class='add'>+		u16 rev_no:4;		// 0010   default(bits 0-3)</div><div class='add'>+		u16 model_no:6;		// 000001 default(bits 4-9)</div><div class='add'>+		u16 ieee_address:6;	// 111100 default(bits 10-15)</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} MI_IDR2_t, *PMI_IDR2_t;</div><div class='add'>+</div><div class='add'>+/* MI Register 4: Auto-negotiation advertisement register */</div><div class='add'>+typedef union _MI_ANAR_t {</div><div class='add'>+	u16 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u16 np_indication:1;	// bit 15</div><div class='add'>+		u16 res2:1;		// bit 14</div><div class='add'>+		u16 remote_fault:1;	// bit 13</div><div class='add'>+		u16 res1:1;		// bit 12</div><div class='add'>+		u16 cap_asmpause:1;	// bit 11</div><div class='add'>+		u16 cap_pause:1;		// bit 10</div><div class='add'>+		u16 cap_100T4:1;		// bit 9</div><div class='add'>+		u16 cap_100fdx:1;		// bit 8</div><div class='add'>+		u16 cap_100hdx:1;		// bit 7</div><div class='add'>+		u16 cap_10fdx:1;		// bit 6</div><div class='add'>+		u16 cap_10hdx:1;		// bit 5</div><div class='add'>+		u16 selector:5;		// bits 0-4</div><div class='add'>+#else</div><div class='add'>+		u16 selector:5;		// bits 0-4</div><div class='add'>+		u16 cap_10hdx:1;		// bit 5</div><div class='add'>+		u16 cap_10fdx:1;		// bit 6</div><div class='add'>+		u16 cap_100hdx:1;		// bit 7</div><div class='add'>+		u16 cap_100fdx:1;		// bit 8</div><div class='add'>+		u16 cap_100T4:1;		// bit 9</div><div class='add'>+		u16 cap_pause:1;		// bit 10</div><div class='add'>+		u16 cap_asmpause:1;	// bit 11</div><div class='add'>+		u16 res1:1;		// bit 12</div><div class='add'>+		u16 remote_fault:1;	// bit 13</div><div class='add'>+		u16 res2:1;		// bit 14</div><div class='add'>+		u16 np_indication:1;	// bit 15</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} MI_ANAR_t, *PMI_ANAR_t;</div><div class='add'>+</div><div class='add'>+/* MI Register 5: Auto-negotiation link partner advertisement register */</div><div class='add'>+typedef struct _MI_ANLPAR_t {</div><div class='add'>+	u16 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u16 np_indication:1;	// bit 15</div><div class='add'>+		u16 acknowledge:1;		// bit 14</div><div class='add'>+		u16 remote_fault:1;	// bit 13</div><div class='add'>+		u16 res1:1;		// bit 12</div><div class='add'>+		u16 cap_asmpause:1;	// bit 11</div><div class='add'>+		u16 cap_pause:1;		// bit 10</div><div class='add'>+		u16 cap_100T4:1;		// bit 9</div><div class='add'>+		u16 cap_100fdx:1;		// bit 8</div><div class='add'>+		u16 cap_100hdx:1;		// bit 7</div><div class='add'>+		u16 cap_10fdx:1;		// bit 6</div><div class='add'>+		u16 cap_10hdx:1;		// bit 5</div><div class='add'>+		u16 selector:5;		// bits 0-4</div><div class='add'>+#else</div><div class='add'>+		u16 selector:5;		// bits 0-4</div><div class='add'>+		u16 cap_10hdx:1;		// bit 5</div><div class='add'>+		u16 cap_10fdx:1;		// bit 6</div><div class='add'>+		u16 cap_100hdx:1;		// bit 7</div><div class='add'>+		u16 cap_100fdx:1;		// bit 8</div><div class='add'>+		u16 cap_100T4:1;		// bit 9</div><div class='add'>+		u16 cap_pause:1;		// bit 10</div><div class='add'>+		u16 cap_asmpause:1;	// bit 11</div><div class='add'>+		u16 res1:1;		// bit 12</div><div class='add'>+		u16 remote_fault:1;	// bit 13</div><div class='add'>+		u16 acknowledge:1;		// bit 14</div><div class='add'>+		u16 np_indication:1;	// bit 15</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} MI_ANLPAR_t, *PMI_ANLPAR_t;</div><div class='add'>+</div><div class='add'>+/* MI Register 6: Auto-negotiation expansion register */</div><div class='add'>+typedef union _MI_ANER_t {</div><div class='add'>+	u16 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u16 res:11;	// bits 5-15</div><div class='add'>+		u16 pdf:1;		// bit 4</div><div class='add'>+		u16 lp_np_able:1;	// bit 3</div><div class='add'>+		u16 np_able:1;	// bit 2</div><div class='add'>+		u16 page_rx:1;	// bit 1</div><div class='add'>+		u16 lp_an_able:1;	// bit 0</div><div class='add'>+#else</div><div class='add'>+		u16 lp_an_able:1;	// bit 0</div><div class='add'>+		u16 page_rx:1;	// bit 1</div><div class='add'>+		u16 np_able:1;	// bit 2</div><div class='add'>+		u16 lp_np_able:1;	// bit 3</div><div class='add'>+		u16 pdf:1;		// bit 4</div><div class='add'>+		u16 res:11;	// bits 5-15</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} MI_ANER_t, *PMI_ANER_t;</div><div class='add'>+</div><div class='add'>+/* MI Register 7: Auto-negotiation next page transmit reg(0x07) */</div><div class='add'>+typedef union _MI_ANNPTR_t {</div><div class='add'>+	u16 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u16 np:1;		// bit 15</div><div class='add'>+		u16 res1:1;	// bit 14</div><div class='add'>+		u16 msg_page:1;	// bit 13</div><div class='add'>+		u16 ack2:1;	// bit 12</div><div class='add'>+		u16 toggle:1;	// bit 11</div><div class='add'>+		u16 msg:11;	// bits 0-10</div><div class='add'>+#else</div><div class='add'>+		u16 msg:11;	// bits 0-10</div><div class='add'>+		u16 toggle:1;	// bit 11</div><div class='add'>+		u16 ack2:1;	// bit 12</div><div class='add'>+		u16 msg_page:1;	// bit 13</div><div class='add'>+		u16 res1:1;	// bit 14</div><div class='add'>+		u16 np:1;		// bit 15</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} MI_ANNPTR_t, *PMI_ANNPTR_t;</div><div class='add'>+</div><div class='add'>+/* MI Register 8: Link Partner Next Page Reg(0x08) */</div><div class='add'>+typedef union _MI_LPNPR_t {</div><div class='add'>+	u16 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u16 np:1;		// bit 15</div><div class='add'>+		u16 ack:1;		// bit 14</div><div class='add'>+		u16 msg_page:1;	// bit 13</div><div class='add'>+		u16 ack2:1;	// bit 12</div><div class='add'>+		u16 toggle:1;	// bit 11</div><div class='add'>+		u16 msg:11;	// bits 0-10</div><div class='add'>+#else</div><div class='add'>+		u16 msg:11;	// bits 0-10</div><div class='add'>+		u16 toggle:1;	// bit 11</div><div class='add'>+		u16 ack2:1;	// bit 12</div><div class='add'>+		u16 msg_page:1;	// bit 13</div><div class='add'>+		u16 ack:1;		// bit 14</div><div class='add'>+		u16 np:1;		// bit 15</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} MI_LPNPR_t, *PMI_LPNPR_t;</div><div class='add'>+</div><div class='add'>+/* MI Register 9: 1000BaseT Control Reg(0x09) */</div><div class='add'>+typedef union _MI_GCR_t {</div><div class='add'>+	u16 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u16 test_mode:3;		// bits 13-15</div><div class='add'>+		u16 ms_config_en:1;	// bit 12</div><div class='add'>+		u16 ms_value:1;		// bit 11</div><div class='add'>+		u16 port_type:1;		// bit 10</div><div class='add'>+		u16 link_1000fdx:1;	// bit 9</div><div class='add'>+		u16 link_1000hdx:1;	// bit 8</div><div class='add'>+		u16 res:8;			// bit 0-7</div><div class='add'>+#else</div><div class='add'>+		u16 res:8;			// bit 0-7</div><div class='add'>+		u16 link_1000hdx:1;	// bit 8</div><div class='add'>+		u16 link_1000fdx:1;	// bit 9</div><div class='add'>+		u16 port_type:1;		// bit 10</div><div class='add'>+		u16 ms_value:1;		// bit 11</div><div class='add'>+		u16 ms_config_en:1;	// bit 12</div><div class='add'>+		u16 test_mode:3;		// bits 13-15</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} MI_GCR_t, *PMI_GCR_t;</div><div class='add'>+</div><div class='add'>+/* MI Register 10: 1000BaseT Status Reg(0x0A) */</div><div class='add'>+typedef union _MI_GSR_t {</div><div class='add'>+	u16 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u16 ms_config_fault:1;	// bit 15</div><div class='add'>+		u16 ms_resolve:1;		// bit 14</div><div class='add'>+		u16 local_rx_status:1;	// bit 13</div><div class='add'>+		u16 remote_rx_status:1;	// bit 12</div><div class='add'>+		u16 link_1000fdx:1;	// bit 11</div><div class='add'>+		u16 link_1000hdx:1;	// bit 10</div><div class='add'>+		u16 res:2;			// bits 8-9</div><div class='add'>+		u16 idle_err_cnt:8;	// bits 0-7</div><div class='add'>+#else</div><div class='add'>+		u16 idle_err_cnt:8;	// bits 0-7</div><div class='add'>+		u16 res:2;			// bits 8-9</div><div class='add'>+		u16 link_1000hdx:1;	// bit 10</div><div class='add'>+		u16 link_1000fdx:1;	// bit 11</div><div class='add'>+		u16 remote_rx_status:1;	// bit 12</div><div class='add'>+		u16 local_rx_status:1;	// bit 13</div><div class='add'>+		u16 ms_resolve:1;		// bit 14</div><div class='add'>+		u16 ms_config_fault:1;	// bit 15</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} MI_GSR_t, *PMI_GSR_t;</div><div class='add'>+</div><div class='add'>+/* MI Register 11 - 14: Reserved Regs(0x0B - 0x0E) */</div><div class='add'>+typedef union _MI_RES_t {</div><div class='add'>+	u16 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u16 res15:1;	// bit 15</div><div class='add'>+		u16 res14:1;	// bit 14</div><div class='add'>+		u16 res13:1;	// bit 13</div><div class='add'>+		u16 res12:1;	// bit 12</div><div class='add'>+		u16 res11:1;	// bit 11</div><div class='add'>+		u16 res10:1;	// bit 10</div><div class='add'>+		u16 res9:1;	// bit 9</div><div class='add'>+		u16 res8:1;	// bit 8</div><div class='add'>+		u16 res7:1;	// bit 7</div><div class='add'>+		u16 res6:1;	// bit 6</div><div class='add'>+		u16 res5:1;	// bit 5</div><div class='add'>+		u16 res4:1;	// bit 4</div><div class='add'>+		u16 res3:1;	// bit 3</div><div class='add'>+		u16 res2:1;	// bit 2</div><div class='add'>+		u16 res1:1;	// bit 1</div><div class='add'>+		u16 res0:1;	// bit 0</div><div class='add'>+#else</div><div class='add'>+		u16 res0:1;	// bit 0</div><div class='add'>+		u16 res1:1;	// bit 1</div><div class='add'>+		u16 res2:1;	// bit 2</div><div class='add'>+		u16 res3:1;	// bit 3</div><div class='add'>+		u16 res4:1;	// bit 4</div><div class='add'>+		u16 res5:1;	// bit 5</div><div class='add'>+		u16 res6:1;	// bit 6</div><div class='add'>+		u16 res7:1;	// bit 7</div><div class='add'>+		u16 res8:1;	// bit 8</div><div class='add'>+		u16 res9:1;	// bit 9</div><div class='add'>+		u16 res10:1;	// bit 10</div><div class='add'>+		u16 res11:1;	// bit 11</div><div class='add'>+		u16 res12:1;	// bit 12</div><div class='add'>+		u16 res13:1;	// bit 13</div><div class='add'>+		u16 res14:1;	// bit 14</div><div class='add'>+		u16 res15:1;	// bit 15</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} MI_RES_t, *PMI_RES_t;</div><div class='add'>+</div><div class='add'>+/* MI Register 15: Extended status Reg(0x0F) */</div><div class='add'>+typedef union _MI_ESR_t {</div><div class='add'>+	u16 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u16 link_1000Xfdx:1;	// bit 15</div><div class='add'>+		u16 link_1000Xhdx:1;	// bit 14</div><div class='add'>+		u16 link_1000fdx:1;	// bit 13</div><div class='add'>+		u16 link_1000hdx:1;	// bit 12</div><div class='add'>+		u16 res:12;		// bit 0-11</div><div class='add'>+#else</div><div class='add'>+		u16 res:12;		// bit 0-11</div><div class='add'>+		u16 link_1000hdx:1;	// bit 12</div><div class='add'>+		u16 link_1000fdx:1;	// bit 13</div><div class='add'>+		u16 link_1000Xhdx:1;	// bit 14</div><div class='add'>+		u16 link_1000Xfdx:1;	// bit 15</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} MI_ESR_t, *PMI_ESR_t;</div><div class='add'>+</div><div class='add'>+/* MI Register 16 - 18: Reserved Reg(0x10-0x12) */</div><div class='add'>+</div><div class='add'>+/* MI Register 19: Loopback Control Reg(0x13) */</div><div class='add'>+typedef union _MI_LCR_t {</div><div class='add'>+	u16 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u16 mii_en:1;		// bit 15</div><div class='add'>+		u16 pcs_en:1;		// bit 14</div><div class='add'>+		u16 pmd_en:1;		// bit 13</div><div class='add'>+		u16 all_digital_en:1;	// bit 12</div><div class='add'>+		u16 replica_en:1;		// bit 11</div><div class='add'>+		u16 line_driver_en:1;	// bit 10</div><div class='add'>+		u16 res:10;		// bit 0-9</div><div class='add'>+#else</div><div class='add'>+		u16 res:10;		// bit 0-9</div><div class='add'>+		u16 line_driver_en:1;	// bit 10</div><div class='add'>+		u16 replica_en:1;		// bit 11</div><div class='add'>+		u16 all_digital_en:1;	// bit 12</div><div class='add'>+		u16 pmd_en:1;		// bit 13</div><div class='add'>+		u16 pcs_en:1;		// bit 14</div><div class='add'>+		u16 mii_en:1;		// bit 15</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} MI_LCR_t, *PMI_LCR_t;</div><div class='add'>+</div><div class='add'>+/* MI Register 20: Reserved Reg(0x14) */</div><div class='add'>+</div><div class='add'>+/* MI Register 21: Management Interface Control Reg(0x15) */</div><div class='add'>+typedef union _MI_MICR_t {</div><div class='add'>+	u16 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u16 res1:5;		// bits 11-15</div><div class='add'>+		u16 mi_error_count:7;	// bits 4-10</div><div class='add'>+		u16 res2:1;		// bit 3</div><div class='add'>+		u16 ignore_10g_fr:1;	// bit 2</div><div class='add'>+		u16 res3:1;		// bit 1</div><div class='add'>+		u16 preamble_supress_en:1;	// bit 0</div><div class='add'>+#else</div><div class='add'>+		u16 preamble_supress_en:1;	// bit 0</div><div class='add'>+		u16 res3:1;		// bit 1</div><div class='add'>+		u16 ignore_10g_fr:1;	// bit 2</div><div class='add'>+		u16 res2:1;		// bit 3</div><div class='add'>+		u16 mi_error_count:7;	// bits 4-10</div><div class='add'>+		u16 res1:5;		// bits 11-15</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} MI_MICR_t, *PMI_MICR_t;</div><div class='add'>+</div><div class='add'>+/* MI Register 22: PHY Configuration Reg(0x16) */</div><div class='add'>+typedef union _MI_PHY_CONFIG_t {</div><div class='add'>+	u16 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u16 crs_tx_en:1;		// bit 15</div><div class='add'>+		u16 res1:1;		// bit 14</div><div class='add'>+		u16 tx_fifo_depth:2;	// bits 12-13</div><div class='add'>+		u16 speed_downshift:2;	// bits 10-11</div><div class='add'>+		u16 pbi_detect:1;		// bit 9</div><div class='add'>+		u16 tbi_rate:1;		// bit 8</div><div class='add'>+		u16 alternate_np:1;	// bit 7</div><div class='add'>+		u16 group_mdio_en:1;	// bit 6</div><div class='add'>+		u16 tx_clock_en:1;		// bit 5</div><div class='add'>+		u16 sys_clock_en:1;	// bit 4</div><div class='add'>+		u16 res2:1;		// bit 3</div><div class='add'>+		u16 mac_if_mode:3;		// bits 0-2</div><div class='add'>+#else</div><div class='add'>+		u16 mac_if_mode:3;		// bits 0-2</div><div class='add'>+		u16 res2:1;		// bit 3</div><div class='add'>+		u16 sys_clock_en:1;	// bit 4</div><div class='add'>+		u16 tx_clock_en:1;		// bit 5</div><div class='add'>+		u16 group_mdio_en:1;	// bit 6</div><div class='add'>+		u16 alternate_np:1;	// bit 7</div><div class='add'>+		u16 tbi_rate:1;		// bit 8</div><div class='add'>+		u16 pbi_detect:1;		// bit 9</div><div class='add'>+		u16 speed_downshift:2;	// bits 10-11</div><div class='add'>+		u16 tx_fifo_depth:2;	// bits 12-13</div><div class='add'>+		u16 res1:1;		// bit 14</div><div class='add'>+		u16 crs_tx_en:1;		// bit 15</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} MI_PHY_CONFIG_t, *PMI_PHY_CONFIG_t;</div><div class='add'>+</div><div class='add'>+/* MI Register 23: PHY CONTROL Reg(0x17) */</div><div class='add'>+typedef union _MI_PHY_CONTROL_t {</div><div class='add'>+	u16 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u16 res1:1;		// bit 15</div><div class='add'>+		u16 tdr_en:1;		// bit 14</div><div class='add'>+		u16 res2:1;		// bit 13</div><div class='add'>+		u16 downshift_attempts:2;	// bits 11-12</div><div class='add'>+		u16 res3:5;		// bit 6-10</div><div class='add'>+		u16 jabber_10baseT:1;	// bit 5</div><div class='add'>+		u16 sqe_10baseT:1;		// bit 4</div><div class='add'>+		u16 tp_loopback_10baseT:1;	// bit 3</div><div class='add'>+		u16 preamble_gen_en:1;	// bit 2</div><div class='add'>+		u16 res4:1;		// bit 1</div><div class='add'>+		u16 force_int:1;		// bit 0</div><div class='add'>+#else</div><div class='add'>+		u16 force_int:1;		// bit 0</div><div class='add'>+		u16 res4:1;		// bit 1</div><div class='add'>+		u16 preamble_gen_en:1;	// bit 2</div><div class='add'>+		u16 tp_loopback_10baseT:1;	// bit 3</div><div class='add'>+		u16 sqe_10baseT:1;		// bit 4</div><div class='add'>+		u16 jabber_10baseT:1;	// bit 5</div><div class='add'>+		u16 res3:5;		// bit 6-10</div><div class='add'>+		u16 downshift_attempts:2;	// bits 11-12</div><div class='add'>+		u16 res2:1;		// bit 13</div><div class='add'>+		u16 tdr_en:1;		// bit 14</div><div class='add'>+		u16 res1:1;		// bit 15</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} MI_PHY_CONTROL_t, *PMI_PHY_CONTROL_t;</div><div class='add'>+</div><div class='add'>+/* MI Register 24: Interrupt Mask Reg(0x18) */</div><div class='add'>+typedef union _MI_IMR_t {</div><div class='add'>+	u16 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u16 res1:6;		// bits 10-15</div><div class='add'>+		u16 mdio_sync_lost:1;	// bit 9</div><div class='add'>+		u16 autoneg_status:1;	// bit 8</div><div class='add'>+		u16 hi_bit_err:1;		// bit 7</div><div class='add'>+		u16 np_rx:1;		// bit 6</div><div class='add'>+		u16 err_counter_full:1;	// bit 5</div><div class='add'>+		u16 fifo_over_underflow:1;	// bit 4</div><div class='add'>+		u16 rx_status:1;		// bit 3</div><div class='add'>+		u16 link_status:1;		// bit 2</div><div class='add'>+		u16 automatic_speed:1;	// bit 1</div><div class='add'>+		u16 int_en:1;		// bit 0</div><div class='add'>+#else</div><div class='add'>+		u16 int_en:1;		// bit 0</div><div class='add'>+		u16 automatic_speed:1;	// bit 1</div><div class='add'>+		u16 link_status:1;		// bit 2</div><div class='add'>+		u16 rx_status:1;		// bit 3</div><div class='add'>+		u16 fifo_over_underflow:1;	// bit 4</div><div class='add'>+		u16 err_counter_full:1;	// bit 5</div><div class='add'>+		u16 np_rx:1;		// bit 6</div><div class='add'>+		u16 hi_bit_err:1;		// bit 7</div><div class='add'>+		u16 autoneg_status:1;	// bit 8</div><div class='add'>+		u16 mdio_sync_lost:1;	// bit 9</div><div class='add'>+		u16 res1:6;		// bits 10-15</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} MI_IMR_t, *PMI_IMR_t;</div><div class='add'>+</div><div class='add'>+/* MI Register 25: Interrupt Status Reg(0x19) */</div><div class='add'>+typedef union _MI_ISR_t {</div><div class='add'>+	u16 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u16 res1:6;		// bits 10-15</div><div class='add'>+		u16 mdio_sync_lost:1;	// bit 9</div><div class='add'>+		u16 autoneg_status:1;	// bit 8</div><div class='add'>+		u16 hi_bit_err:1;		// bit 7</div><div class='add'>+		u16 np_rx:1;		// bit 6</div><div class='add'>+		u16 err_counter_full:1;	// bit 5</div><div class='add'>+		u16 fifo_over_underflow:1;	// bit 4</div><div class='add'>+		u16 rx_status:1;		// bit 3</div><div class='add'>+		u16 link_status:1;		// bit 2</div><div class='add'>+		u16 automatic_speed:1;	// bit 1</div><div class='add'>+		u16 int_en:1;		// bit 0</div><div class='add'>+#else</div><div class='add'>+		u16 int_en:1;		// bit 0</div><div class='add'>+		u16 automatic_speed:1;	// bit 1</div><div class='add'>+		u16 link_status:1;		// bit 2</div><div class='add'>+		u16 rx_status:1;		// bit 3</div><div class='add'>+		u16 fifo_over_underflow:1;	// bit 4</div><div class='add'>+		u16 err_counter_full:1;	// bit 5</div><div class='add'>+		u16 np_rx:1;		// bit 6</div><div class='add'>+		u16 hi_bit_err:1;		// bit 7</div><div class='add'>+		u16 autoneg_status:1;	// bit 8</div><div class='add'>+		u16 mdio_sync_lost:1;	// bit 9</div><div class='add'>+		u16 res1:6;		// bits 10-15</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} MI_ISR_t, *PMI_ISR_t;</div><div class='add'>+</div><div class='add'>+/* MI Register 26: PHY Status Reg(0x1A) */</div><div class='add'>+typedef union _MI_PSR_t {</div><div class='add'>+	u16 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u16 res1:1;		// bit 15</div><div class='add'>+		u16 autoneg_fault:2;	// bit 13-14</div><div class='add'>+		u16 autoneg_status:1;	// bit 12</div><div class='add'>+		u16 mdi_x_status:1;	// bit 11</div><div class='add'>+		u16 polarity_status:1;	// bit 10</div><div class='add'>+		u16 speed_status:2;	// bits 8-9</div><div class='add'>+		u16 duplex_status:1;	// bit 7</div><div class='add'>+		u16 link_status:1;		// bit 6</div><div class='add'>+		u16 tx_status:1;		// bit 5</div><div class='add'>+		u16 rx_status:1;		// bit 4</div><div class='add'>+		u16 collision_status:1;	// bit 3</div><div class='add'>+		u16 autoneg_en:1;		// bit 2</div><div class='add'>+		u16 pause_en:1;		// bit 1</div><div class='add'>+		u16 asymmetric_dir:1;	// bit 0</div><div class='add'>+#else</div><div class='add'>+		u16 asymmetric_dir:1;	// bit 0</div><div class='add'>+		u16 pause_en:1;		// bit 1</div><div class='add'>+		u16 autoneg_en:1;		// bit 2</div><div class='add'>+		u16 collision_status:1;	// bit 3</div><div class='add'>+		u16 rx_status:1;		// bit 4</div><div class='add'>+		u16 tx_status:1;		// bit 5</div><div class='add'>+		u16 link_status:1;		// bit 6</div><div class='add'>+		u16 duplex_status:1;	// bit 7</div><div class='add'>+		u16 speed_status:2;	// bits 8-9</div><div class='add'>+		u16 polarity_status:1;	// bit 10</div><div class='add'>+		u16 mdi_x_status:1;	// bit 11</div><div class='add'>+		u16 autoneg_status:1;	// bit 12</div><div class='add'>+		u16 autoneg_fault:2;	// bit 13-14</div><div class='add'>+		u16 res1:1;		// bit 15</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} MI_PSR_t, *PMI_PSR_t;</div><div class='add'>+</div><div class='add'>+/* MI Register 27: LED Control Reg 1(0x1B) */</div><div class='add'>+typedef union _MI_LCR1_t {</div><div class='add'>+	u16 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u16 res1:2;		// bits 14-15</div><div class='add'>+		u16 led_dup_indicate:2;	// bits 12-13</div><div class='add'>+		u16 led_10baseT:2;		// bits 10-11</div><div class='add'>+		u16 led_collision:2;	// bits 8-9</div><div class='add'>+		u16 res2:2;		// bits 6-7</div><div class='add'>+		u16 res3:2;		// bits 4-5</div><div class='add'>+		u16 pulse_dur:2;		// bits 2-3</div><div class='add'>+		u16 pulse_stretch1:1;	// bit 1</div><div class='add'>+		u16 pulse_stretch0:1;	// bit 0</div><div class='add'>+#else</div><div class='add'>+		u16 pulse_stretch0:1;	// bit 0</div><div class='add'>+		u16 pulse_stretch1:1;	// bit 1</div><div class='add'>+		u16 pulse_dur:2;		// bits 2-3</div><div class='add'>+		u16 res3:2;		// bits 4-5</div><div class='add'>+		u16 res2:2;		// bits 6-7</div><div class='add'>+		u16 led_collision:2;	// bits 8-9</div><div class='add'>+		u16 led_10baseT:2;		// bits 10-11</div><div class='add'>+		u16 led_dup_indicate:2;	// bits 12-13</div><div class='add'>+		u16 res1:2;		// bits 14-15</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} MI_LCR1_t, *PMI_LCR1_t;</div><div class='add'>+</div><div class='add'>+/* MI Register 28: LED Control Reg 2(0x1C) */</div><div class='add'>+typedef union _MI_LCR2_t {</div><div class='add'>+	u16 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u16 led_link:4;		// bits 12-15</div><div class='add'>+		u16 led_tx_rx:4;		// bits 8-11</div><div class='add'>+		u16 led_100BaseTX:4;	// bits 4-7</div><div class='add'>+		u16 led_1000BaseT:4;	// bits 0-3</div><div class='add'>+#else</div><div class='add'>+		u16 led_1000BaseT:4;	// bits 0-3</div><div class='add'>+		u16 led_100BaseTX:4;	// bits 4-7</div><div class='add'>+		u16 led_tx_rx:4;		// bits 8-11</div><div class='add'>+		u16 led_link:4;		// bits 12-15</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} MI_LCR2_t, *PMI_LCR2_t;</div><div class='add'>+</div><div class='add'>+/* MI Register 29 - 31: Reserved Reg(0x1D - 0x1E) */</div><div class='add'>+</div><div class='add'>+/* TruePHY headers */</div><div class='add'>+typedef struct _TRUEPHY_ACCESS_MI_REGS_ {</div><div class='add'>+	TRUEPHY_HANDLE hTruePhy;</div><div class='add'>+	int32_t nPhyId;</div><div class='add'>+	u8 bReadWrite;</div><div class='add'>+	u8 *pbyRegs;</div><div class='add'>+	u8 *pwData;</div><div class='add'>+	int32_t nRegCount;</div><div class='add'>+} TRUEPHY_ACCESS_MI_REGS, *PTRUEPHY_ACCESS_MI_REGS;</div><div class='add'>+</div><div class='add'>+/* TruePHY headers */</div><div class='add'>+typedef struct _TAG_TPAL_ACCESS_MI_REGS_ {</div><div class='add'>+	u32 nPhyId;</div><div class='add'>+	u8 bReadWrite;</div><div class='add'>+	u32 nRegCount;</div><div class='add'>+	u16 Data[4096];</div><div class='add'>+	u8 Regs[4096];</div><div class='add'>+} TPAL_ACCESS_MI_REGS, *PTPAL_ACCESS_MI_REGS;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+typedef TRUEPHY_HANDLE TPAL_HANDLE;</div><div class='add'>+</div><div class='add'>+/* Forward declaration of the private adapter structure */</div><div class='add'>+struct et131x_adapter;</div><div class='add'>+</div><div class='add'>+/* OS Specific Functions*/</div><div class='add'>+void TPAL_SetPhy10HalfDuplex(struct et131x_adapter *adapter);</div><div class='add'>+void TPAL_SetPhy10FullDuplex(struct et131x_adapter *adapter);</div><div class='add'>+void TPAL_SetPhy10Force(struct et131x_adapter *pAdapter);</div><div class='add'>+void TPAL_SetPhy100HalfDuplex(struct et131x_adapter *adapter);</div><div class='add'>+void TPAL_SetPhy100FullDuplex(struct et131x_adapter *adapter);</div><div class='add'>+void TPAL_SetPhy100Force(struct et131x_adapter *pAdapter);</div><div class='add'>+void TPAL_SetPhy1000FullDuplex(struct et131x_adapter *adapter);</div><div class='add'>+void TPAL_SetPhyAutoNeg(struct et131x_adapter *adapter);</div><div class='add'>+</div><div class='add'>+/* Prototypes for ET1310_phy.c */</div><div class='add'>+int et131x_xcvr_find(struct et131x_adapter *adapter);</div><div class='add'>+int et131x_setphy_normal(struct et131x_adapter *adapter);</div><div class='add'>+int32_t PhyMiRead(struct et131x_adapter *adapter,</div><div class='add'>+	       u8 xcvrAddr, u8 xcvrReg, u16 *value);</div><div class='add'>+</div><div class='add'>+/* static inline function does not work because et131x_adapter is not always</div><div class='add'>+ * defined</div><div class='add'>+ */</div><div class='add'>+#define MiRead(adapter, xcvrReg, value) \</div><div class='add'>+	PhyMiRead((adapter), (adapter)-&gt;Stats.xcvr_addr, (xcvrReg), (value))</div><div class='add'>+</div><div class='add'>+int32_t MiWrite(struct et131x_adapter *adapter,</div><div class='add'>+		u8 xcvReg, u16 value);</div><div class='add'>+void et131x_Mii_check(struct et131x_adapter *pAdapter,</div><div class='add'>+		      MI_BMSR_t bmsr, MI_BMSR_t bmsr_ints);</div><div class='add'>+</div><div class='add'>+/* This last is not strictly required (the driver could call the TPAL</div><div class='add'>+ * version instead), but this sets the adapter up correctly, and calls the</div><div class='add'>+ * access routine indirectly.  This protects the driver from changes in TPAL.</div><div class='add'>+ */</div><div class='add'>+void SetPhy_10BaseTHalfDuplex(struct et131x_adapter *adapter);</div><div class='add'>+</div><div class='add'>+/* Defines for PHY access routines */</div><div class='add'>+</div><div class='add'>+// Define bit operation flags</div><div class='add'>+#define TRUEPHY_BIT_CLEAR               0</div><div class='add'>+#define TRUEPHY_BIT_SET                 1</div><div class='add'>+#define TRUEPHY_BIT_READ                2</div><div class='add'>+</div><div class='add'>+// Define read/write operation flags</div><div class='add'>+#ifndef TRUEPHY_READ</div><div class='add'>+#define TRUEPHY_READ                    0</div><div class='add'>+#define TRUEPHY_WRITE                   1</div><div class='add'>+#define TRUEPHY_MASK                    2</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+// Define speeds</div><div class='add'>+#define TRUEPHY_SPEED_10MBPS            0</div><div class='add'>+#define TRUEPHY_SPEED_100MBPS           1</div><div class='add'>+#define TRUEPHY_SPEED_1000MBPS          2</div><div class='add'>+</div><div class='add'>+// Define duplex modes</div><div class='add'>+#define TRUEPHY_DUPLEX_HALF             0</div><div class='add'>+#define TRUEPHY_DUPLEX_FULL             1</div><div class='add'>+</div><div class='add'>+// Define master/slave configuration values</div><div class='add'>+#define TRUEPHY_CFG_SLAVE               0</div><div class='add'>+#define TRUEPHY_CFG_MASTER              1</div><div class='add'>+</div><div class='add'>+// Define MDI/MDI-X settings</div><div class='add'>+#define TRUEPHY_MDI                     0</div><div class='add'>+#define TRUEPHY_MDIX                    1</div><div class='add'>+#define TRUEPHY_AUTO_MDI_MDIX           2</div><div class='add'>+</div><div class='add'>+// Define 10Base-T link polarities</div><div class='add'>+#define TRUEPHY_POLARITY_NORMAL         0</div><div class='add'>+#define TRUEPHY_POLARITY_INVERTED       1</div><div class='add'>+</div><div class='add'>+// Define auto-negotiation results</div><div class='add'>+#define TRUEPHY_ANEG_NOT_COMPLETE       0</div><div class='add'>+#define TRUEPHY_ANEG_COMPLETE           1</div><div class='add'>+#define TRUEPHY_ANEG_DISABLED           2</div><div class='add'>+</div><div class='add'>+/* Define duplex advertisment flags */</div><div class='add'>+#define TRUEPHY_ADV_DUPLEX_NONE         0x00</div><div class='add'>+#define TRUEPHY_ADV_DUPLEX_FULL         0x01</div><div class='add'>+#define TRUEPHY_ADV_DUPLEX_HALF         0x02</div><div class='add'>+#define TRUEPHY_ADV_DUPLEX_BOTH     \</div><div class='add'>+    (TRUEPHY_ADV_DUPLEX_FULL | TRUEPHY_ADV_DUPLEX_HALF)</div><div class='add'>+</div><div class='add'>+#define PHY_CONTROL                0x00	//#define TRU_MI_CONTROL_REGISTER                 0</div><div class='add'>+#define PHY_STATUS                 0x01	//#define TRU_MI_STATUS_REGISTER                  1</div><div class='add'>+#define PHY_ID_1                   0x02	//#define TRU_MI_PHY_IDENTIFIER_1_REGISTER        2</div><div class='add'>+#define PHY_ID_2                   0x03	//#define TRU_MI_PHY_IDENTIFIER_2_REGISTER        3</div><div class='add'>+#define PHY_AUTO_ADVERTISEMENT     0x04	//#define TRU_MI_ADVERTISEMENT_REGISTER           4</div><div class='add'>+#define PHY_AUTO_LINK_PARTNER      0x05	//#define TRU_MI_LINK_PARTNER_ABILITY_REGISTER    5</div><div class='add'>+#define PHY_AUTO_EXPANSION         0x06	//#define TRU_MI_EXPANSION_REGISTER               6</div><div class='add'>+#define PHY_AUTO_NEXT_PAGE_TX      0x07	//#define TRU_MI_NEXT_PAGE_TRANSMIT_REGISTER      7</div><div class='add'>+#define PHY_LINK_PARTNER_NEXT_PAGE 0x08	//#define TRU_MI_LINK_PARTNER_NEXT_PAGE_REGISTER  8</div><div class='add'>+#define PHY_1000_CONTROL           0x09	//#define TRU_MI_1000BASET_CONTROL_REGISTER       9</div><div class='add'>+#define PHY_1000_STATUS            0x0A	//#define TRU_MI_1000BASET_STATUS_REGISTER        10</div><div class='add'>+</div><div class='add'>+#define PHY_EXTENDED_STATUS        0x0F	//#define TRU_MI_EXTENDED_STATUS_REGISTER         15</div><div class='add'>+</div><div class='add'>+// some defines for modem registers that seem to be 'reserved'</div><div class='add'>+#define PHY_INDEX_REG              0x10</div><div class='add'>+#define PHY_DATA_REG               0x11</div><div class='add'>+</div><div class='add'>+#define PHY_MPHY_CONTROL_REG       0x12	//#define TRU_VMI_MPHY_CONTROL_REGISTER           18</div><div class='add'>+</div><div class='add'>+#define PHY_LOOPBACK_CONTROL       0x13	//#define TRU_VMI_LOOPBACK_CONTROL_1_REGISTER     19</div><div class='add'>+					//#define TRU_VMI_LOOPBACK_CONTROL_2_REGISTER     20</div><div class='add'>+#define PHY_REGISTER_MGMT_CONTROL  0x15	//#define TRU_VMI_MI_SEQ_CONTROL_REGISTER         21</div><div class='add'>+#define PHY_CONFIG                 0x16	//#define TRU_VMI_CONFIGURATION_REGISTER          22</div><div class='add'>+#define PHY_PHY_CONTROL            0x17	//#define TRU_VMI_PHY_CONTROL_REGISTER            23</div><div class='add'>+#define PHY_INTERRUPT_MASK         0x18	//#define TRU_VMI_INTERRUPT_MASK_REGISTER         24</div><div class='add'>+#define PHY_INTERRUPT_STATUS       0x19	//#define TRU_VMI_INTERRUPT_STATUS_REGISTER       25</div><div class='add'>+#define PHY_PHY_STATUS             0x1A	//#define TRU_VMI_PHY_STATUS_REGISTER             26</div><div class='add'>+#define PHY_LED_1                  0x1B	//#define TRU_VMI_LED_CONTROL_1_REGISTER          27</div><div class='add'>+#define PHY_LED_2                  0x1C	//#define TRU_VMI_LED_CONTROL_2_REGISTER          28</div><div class='add'>+					//#define TRU_VMI_LINK_CONTROL_REGISTER           29</div><div class='add'>+					//#define TRU_VMI_TIMING_CONTROL_REGISTER</div><div class='add'>+</div><div class='add'>+/* Prototypes for PHY access routines */</div><div class='add'>+void ET1310_PhyInit(struct et131x_adapter *adapter);</div><div class='add'>+void ET1310_PhyReset(struct et131x_adapter *adapter);</div><div class='add'>+void ET1310_PhyPowerDown(struct et131x_adapter *adapter, bool down);</div><div class='add'>+void ET1310_PhyAutoNeg(struct et131x_adapter *adapter, bool enable);</div><div class='add'>+void ET1310_PhyDuplexMode(struct et131x_adapter *adapter, u16 duplex);</div><div class='add'>+void ET1310_PhySpeedSelect(struct et131x_adapter *adapter, u16 speed);</div><div class='add'>+void ET1310_PhyAdvertise1000BaseT(struct et131x_adapter *adapter,</div><div class='add'>+				  u16 duplex);</div><div class='add'>+void ET1310_PhyAdvertise100BaseT(struct et131x_adapter *adapter,</div><div class='add'>+				 u16 duplex);</div><div class='add'>+void ET1310_PhyAdvertise10BaseT(struct et131x_adapter *adapter,</div><div class='add'>+				u16 duplex);</div><div class='add'>+void ET1310_PhyLinkStatus(struct et131x_adapter *adapter,</div><div class='add'>+			  u8 *ucLinkStatus,</div><div class='add'>+			  u32 *uiAutoNeg,</div><div class='add'>+			  u32 *uiLinkSpeed,</div><div class='add'>+			  u32 *uiDuplexMode,</div><div class='add'>+			  u32 *uiMdiMdix,</div><div class='add'>+			  u32 *uiMasterSlave, u32 *uiPolarity);</div><div class='add'>+void ET1310_PhyAndOrReg(struct et131x_adapter *adapter,</div><div class='add'>+			u16 regnum, u16 andMask, u16 orMask);</div><div class='add'>+void ET1310_PhyAccessMiBit(struct et131x_adapter *adapter,</div><div class='add'>+			   u16 action,</div><div class='add'>+			   u16 regnum, u16 bitnum, u8 *value);</div><div class='add'>+</div><div class='add'>+#endif /* _ET1310_PHY_H_ */</div><div class='head'>diff --git a/drivers/staging/et131x/et1310_pm.c b/drivers/staging/et131x/et1310_pm.c<br/>new file mode 100644<br/>index 000000000000..9539bc628cae<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/et131x/et1310_pm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/et131x/et1310_pm.c</a></div><div class='hunk'>@@ -0,0 +1,207 @@</div><div class='add'>+/*</div><div class='add'>+ * Agere Systems Inc.</div><div class='add'>+ * 10/100/1000 Base-T Ethernet Driver for the ET1301 and ET131x series MACs</div><div class='add'>+ *</div><div class='add'>+ * Copyright © 2005 Agere Systems Inc.</div><div class='add'>+ * All rights reserved.</div><div class='add'>+ *   http://www.agere.com</div><div class='add'>+ *</div><div class='add'>+ *------------------------------------------------------------------------------</div><div class='add'>+ *</div><div class='add'>+ * et1310_pm.c - All power management related code (not completely implemented)</div><div class='add'>+ *</div><div class='add'>+ *------------------------------------------------------------------------------</div><div class='add'>+ *</div><div class='add'>+ * SOFTWARE LICENSE</div><div class='add'>+ *</div><div class='add'>+ * This software is provided subject to the following terms and conditions,</div><div class='add'>+ * which you should read carefully before using the software.  Using this</div><div class='add'>+ * software indicates your acceptance of these terms and conditions.  If you do</div><div class='add'>+ * not agree with these terms and conditions, do not use the software.</div><div class='add'>+ *</div><div class='add'>+ * Copyright © 2005 Agere Systems Inc.</div><div class='add'>+ * All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source or binary forms, with or without</div><div class='add'>+ * modifications, are permitted provided that the following conditions are met:</div><div class='add'>+ *</div><div class='add'>+ * . Redistributions of source code must retain the above copyright notice, this</div><div class='add'>+ *    list of conditions and the following Disclaimer as comments in the code as</div><div class='add'>+ *    well as in the documentation and/or other materials provided with the</div><div class='add'>+ *    distribution.</div><div class='add'>+ *</div><div class='add'>+ * . Redistributions in binary form must reproduce the above copyright notice,</div><div class='add'>+ *    this list of conditions and the following Disclaimer in the documentation</div><div class='add'>+ *    and/or other materials provided with the distribution.</div><div class='add'>+ *</div><div class='add'>+ * . Neither the name of Agere Systems Inc. nor the names of the contributors</div><div class='add'>+ *    may be used to endorse or promote products derived from this software</div><div class='add'>+ *    without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ * Disclaimer</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES,</div><div class='add'>+ * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  ANY</div><div class='add'>+ * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN</div><div class='add'>+ * RISK. IN NO EVENT SHALL AGERE SYSTEMS INC. OR CONTRIBUTORS BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, INCLUDING, BUT NOT LIMITED TO, CONTRACT, STRICT</div><div class='add'>+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT</div><div class='add'>+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH</div><div class='add'>+ * DAMAGE.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "et131x_version.h"</div><div class='add'>+#include "et131x_debug.h"</div><div class='add'>+#include "et131x_defs.h"</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/ptrace.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/ctype.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/timer.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/in.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/system.h&gt;</div><div class='add'>+#include &lt;asm/bitops.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/if_arp.h&gt;</div><div class='add'>+#include &lt;linux/ioport.h&gt;</div><div class='add'>+</div><div class='add'>+#include "et1310_phy.h"</div><div class='add'>+#include "et1310_pm.h"</div><div class='add'>+#include "et1310_jagcore.h"</div><div class='add'>+#include "et1310_mac.h"</div><div class='add'>+#include "et1310_rx.h"</div><div class='add'>+</div><div class='add'>+#include "et131x_adapter.h"</div><div class='add'>+#include "et131x_initpci.h"</div><div class='add'>+</div><div class='add'>+/* Data for debugging facilities */</div><div class='add'>+#ifdef CONFIG_ET131X_DEBUG</div><div class='add'>+extern dbg_info_t *et131x_dbginfo;</div><div class='add'>+#endif /* CONFIG_ET131X_DEBUG */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * EnablePhyComa - called when network cable is unplugged</div><div class='add'>+ * @pAdapter: pointer to our adapter structure</div><div class='add'>+ *</div><div class='add'>+ * driver receive an phy status change interrupt while in D0 and check that</div><div class='add'>+ * phy_status is down.</div><div class='add'>+ *</div><div class='add'>+ *          -- gate off JAGCore;</div><div class='add'>+ *          -- set gigE PHY in Coma mode</div><div class='add'>+ *          -- wake on phy_interrupt; Perform software reset JAGCore,</div><div class='add'>+ *             re-initialize jagcore and gigE PHY</div><div class='add'>+ *</div><div class='add'>+ *      Add D0-ASPM-PhyLinkDown Support:</div><div class='add'>+ *          -- while in D0, when there is a phy_interrupt indicating phy link</div><div class='add'>+ *             down status, call the MPSetPhyComa routine to enter this active</div><div class='add'>+ *             state power saving mode</div><div class='add'>+ *          -- while in D0-ASPM-PhyLinkDown mode, when there is a phy_interrupt</div><div class='add'>+ *       indicating linkup status, call the MPDisablePhyComa routine to</div><div class='add'>+ *             restore JAGCore and gigE PHY</div><div class='add'>+ */</div><div class='add'>+void EnablePhyComa(struct et131x_adapter *pAdapter)</div><div class='add'>+{</div><div class='add'>+	unsigned long lockflags;</div><div class='add'>+	PM_CSR_t GlobalPmCSR;</div><div class='add'>+	int32_t LoopCounter = 10;</div><div class='add'>+</div><div class='add'>+	DBG_ENTER(et131x_dbginfo);</div><div class='add'>+</div><div class='add'>+	GlobalPmCSR.value = readl(&amp;pAdapter-&gt;CSRAddress-&gt;global.pm_csr.value);</div><div class='add'>+</div><div class='add'>+	/* Save the GbE PHY speed and duplex modes. Need to restore this</div><div class='add'>+	 * when cable is plugged back in</div><div class='add'>+	 */</div><div class='add'>+	pAdapter-&gt;PoMgmt.PowerDownSpeed = pAdapter-&gt;AiForceSpeed;</div><div class='add'>+	pAdapter-&gt;PoMgmt.PowerDownDuplex = pAdapter-&gt;AiForceDpx;</div><div class='add'>+</div><div class='add'>+	/* Stop sending packets. */</div><div class='add'>+	spin_lock_irqsave(&amp;pAdapter-&gt;SendHWLock, lockflags);</div><div class='add'>+	MP_SET_FLAG(pAdapter, fMP_ADAPTER_LOWER_POWER);</div><div class='add'>+	spin_unlock_irqrestore(&amp;pAdapter-&gt;SendHWLock, lockflags);</div><div class='add'>+</div><div class='add'>+	/* Wait for outstanding Receive packets */</div><div class='add'>+	while ((MP_GET_RCV_REF(pAdapter) != 0) &amp;&amp; (LoopCounter-- &gt; 0)) {</div><div class='add'>+		mdelay(2);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Gate off JAGCore 3 clock domains */</div><div class='add'>+	GlobalPmCSR.bits.pm_sysclk_gate = 0;</div><div class='add'>+	GlobalPmCSR.bits.pm_txclk_gate = 0;</div><div class='add'>+	GlobalPmCSR.bits.pm_rxclk_gate = 0;</div><div class='add'>+	writel(GlobalPmCSR.value, &amp;pAdapter-&gt;CSRAddress-&gt;global.pm_csr.value);</div><div class='add'>+</div><div class='add'>+	/* Program gigE PHY in to Coma mode */</div><div class='add'>+	GlobalPmCSR.bits.pm_phy_sw_coma = 1;</div><div class='add'>+	writel(GlobalPmCSR.value, &amp;pAdapter-&gt;CSRAddress-&gt;global.pm_csr.value);</div><div class='add'>+</div><div class='add'>+	DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * DisablePhyComa - Disable the Phy Coma Mode</div><div class='add'>+ * @pAdapter: pointer to our adapter structure</div><div class='add'>+ */</div><div class='add'>+void DisablePhyComa(struct et131x_adapter *pAdapter)</div><div class='add'>+{</div><div class='add'>+	PM_CSR_t GlobalPmCSR;</div><div class='add'>+</div><div class='add'>+	DBG_ENTER(et131x_dbginfo);</div><div class='add'>+</div><div class='add'>+	GlobalPmCSR.value = readl(&amp;pAdapter-&gt;CSRAddress-&gt;global.pm_csr.value);</div><div class='add'>+</div><div class='add'>+	/* Disable phy_sw_coma register and re-enable JAGCore clocks */</div><div class='add'>+	GlobalPmCSR.bits.pm_sysclk_gate = 1;</div><div class='add'>+	GlobalPmCSR.bits.pm_txclk_gate = 1;</div><div class='add'>+	GlobalPmCSR.bits.pm_rxclk_gate = 1;</div><div class='add'>+	GlobalPmCSR.bits.pm_phy_sw_coma = 0;</div><div class='add'>+	writel(GlobalPmCSR.value, &amp;pAdapter-&gt;CSRAddress-&gt;global.pm_csr.value);</div><div class='add'>+</div><div class='add'>+	/* Restore the GbE PHY speed and duplex modes;</div><div class='add'>+	 * Reset JAGCore; re-configure and initialize JAGCore and gigE PHY</div><div class='add'>+	 */</div><div class='add'>+	pAdapter-&gt;AiForceSpeed = pAdapter-&gt;PoMgmt.PowerDownSpeed;</div><div class='add'>+	pAdapter-&gt;AiForceDpx = pAdapter-&gt;PoMgmt.PowerDownDuplex;</div><div class='add'>+</div><div class='add'>+	/* Re-initialize the send structures */</div><div class='add'>+	et131x_init_send(pAdapter);</div><div class='add'>+</div><div class='add'>+	/* Reset the RFD list and re-start RU  */</div><div class='add'>+	et131x_reset_recv(pAdapter);</div><div class='add'>+</div><div class='add'>+	/* Bring the device back to the state it was during init prior to</div><div class='add'>+         * autonegotiation being complete.  This way, when we get the auto-neg</div><div class='add'>+         * complete interrupt, we can complete init by calling ConfigMacREGS2.</div><div class='add'>+         */</div><div class='add'>+	et131x_soft_reset(pAdapter);</div><div class='add'>+</div><div class='add'>+	/* setup et1310 as per the documentation ?? */</div><div class='add'>+	et131x_adapter_setup(pAdapter);</div><div class='add'>+</div><div class='add'>+	/* Allow Tx to restart */</div><div class='add'>+	MP_CLEAR_FLAG(pAdapter, fMP_ADAPTER_LOWER_POWER);</div><div class='add'>+</div><div class='add'>+	/* Need to re-enable Rx. */</div><div class='add'>+	et131x_rx_dma_enable(pAdapter);</div><div class='add'>+</div><div class='add'>+	DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+}</div><div class='add'>+</div><div class='head'>diff --git a/drivers/staging/et131x/et1310_pm.h b/drivers/staging/et131x/et1310_pm.h<br/>new file mode 100644<br/>index 000000000000..6802338e29d9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/et131x/et1310_pm.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/et131x/et1310_pm.h</a></div><div class='hunk'>@@ -0,0 +1,125 @@</div><div class='add'>+/*</div><div class='add'>+ * Agere Systems Inc.</div><div class='add'>+ * 10/100/1000 Base-T Ethernet Driver for the ET1301 and ET131x series MACs</div><div class='add'>+ *</div><div class='add'>+ * Copyright © 2005 Agere Systems Inc.</div><div class='add'>+ * All rights reserved.</div><div class='add'>+ *   http://www.agere.com</div><div class='add'>+ *</div><div class='add'>+ *------------------------------------------------------------------------------</div><div class='add'>+ *</div><div class='add'>+ * et1310_pm.h - Defines, structs, enums, prototypes, etc. pertaining to power</div><div class='add'>+ *               management.</div><div class='add'>+ *</div><div class='add'>+ *------------------------------------------------------------------------------</div><div class='add'>+ *</div><div class='add'>+ * SOFTWARE LICENSE</div><div class='add'>+ *</div><div class='add'>+ * This software is provided subject to the following terms and conditions,</div><div class='add'>+ * which you should read carefully before using the software.  Using this</div><div class='add'>+ * software indicates your acceptance of these terms and conditions.  If you do</div><div class='add'>+ * not agree with these terms and conditions, do not use the software.</div><div class='add'>+ *</div><div class='add'>+ * Copyright © 2005 Agere Systems Inc.</div><div class='add'>+ * All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source or binary forms, with or without</div><div class='add'>+ * modifications, are permitted provided that the following conditions are met:</div><div class='add'>+ *</div><div class='add'>+ * . Redistributions of source code must retain the above copyright notice, this</div><div class='add'>+ *    list of conditions and the following Disclaimer as comments in the code as</div><div class='add'>+ *    well as in the documentation and/or other materials provided with the</div><div class='add'>+ *    distribution.</div><div class='add'>+ *</div><div class='add'>+ * . Redistributions in binary form must reproduce the above copyright notice,</div><div class='add'>+ *    this list of conditions and the following Disclaimer in the documentation</div><div class='add'>+ *    and/or other materials provided with the distribution.</div><div class='add'>+ *</div><div class='add'>+ * . Neither the name of Agere Systems Inc. nor the names of the contributors</div><div class='add'>+ *    may be used to endorse or promote products derived from this software</div><div class='add'>+ *    without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ * Disclaimer</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES,</div><div class='add'>+ * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  ANY</div><div class='add'>+ * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN</div><div class='add'>+ * RISK. IN NO EVENT SHALL AGERE SYSTEMS INC. OR CONTRIBUTORS BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, INCLUDING, BUT NOT LIMITED TO, CONTRACT, STRICT</div><div class='add'>+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT</div><div class='add'>+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH</div><div class='add'>+ * DAMAGE.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _ET1310_PM_H_</div><div class='add'>+#define _ET1310_PM_H_</div><div class='add'>+</div><div class='add'>+#include "et1310_address_map.h"</div><div class='add'>+</div><div class='add'>+#define MAX_WOL_PACKET_SIZE    0x80</div><div class='add'>+#define MAX_WOL_MASK_SIZE      ( MAX_WOL_PACKET_SIZE / 8 )</div><div class='add'>+#define NUM_WOL_PATTERNS       0x5</div><div class='add'>+#define CRC16_POLY             0x1021</div><div class='add'>+</div><div class='add'>+/* Definition of NDIS_DEVICE_POWER_STATE */</div><div class='add'>+typedef enum {</div><div class='add'>+	NdisDeviceStateUnspecified = 0,</div><div class='add'>+	NdisDeviceStateD0,</div><div class='add'>+	NdisDeviceStateD1,</div><div class='add'>+	NdisDeviceStateD2,</div><div class='add'>+	NdisDeviceStateD3</div><div class='add'>+} NDIS_DEVICE_POWER_STATE;</div><div class='add'>+</div><div class='add'>+typedef struct _MP_POWER_MGMT {</div><div class='add'>+	/* variable putting the phy into coma mode when boot up with no cable</div><div class='add'>+	 * plugged in after 5 seconds</div><div class='add'>+	 */</div><div class='add'>+	u8 TransPhyComaModeOnBoot;</div><div class='add'>+</div><div class='add'>+	/* Array holding the five CRC values that the device is currently</div><div class='add'>+	 * using for WOL.  This will be queried when a pattern is to be</div><div class='add'>+	 * removed.</div><div class='add'>+	 */</div><div class='add'>+	u32 localWolAndCrc0;</div><div class='add'>+	u16 WOLPatternList[NUM_WOL_PATTERNS];</div><div class='add'>+	u8 WOLMaskList[NUM_WOL_PATTERNS][MAX_WOL_MASK_SIZE];</div><div class='add'>+	u32 WOLMaskSize[NUM_WOL_PATTERNS];</div><div class='add'>+</div><div class='add'>+	/* IP address */</div><div class='add'>+	union {</div><div class='add'>+		u32 u32;</div><div class='add'>+		u8 u8[4];</div><div class='add'>+	} IPAddress;</div><div class='add'>+</div><div class='add'>+	/* Current Power state of the adapter. */</div><div class='add'>+	NDIS_DEVICE_POWER_STATE PowerState;</div><div class='add'>+	bool WOLState;</div><div class='add'>+	bool WOLEnabled;</div><div class='add'>+	bool Failed10Half;</div><div class='add'>+	bool bFailedStateTransition;</div><div class='add'>+</div><div class='add'>+	/* Next two used to save power information at power down. This</div><div class='add'>+	 * information will be used during power up to set up parts of Power</div><div class='add'>+	 * Management in JAGCore</div><div class='add'>+	 */</div><div class='add'>+	u32 tx_en;</div><div class='add'>+	u32 rx_en;</div><div class='add'>+	u16 PowerDownSpeed;</div><div class='add'>+	u8 PowerDownDuplex;</div><div class='add'>+} MP_POWER_MGMT, *PMP_POWER_MGMT;</div><div class='add'>+</div><div class='add'>+/* Forward declaration of the private adapter structure</div><div class='add'>+ * ( IS THERE A WAY TO DO THIS WITH A TYPEDEF??? )</div><div class='add'>+ */</div><div class='add'>+struct et131x_adapter;</div><div class='add'>+</div><div class='add'>+u16 CalculateCCITCRC16(u8 *Pattern, u8 *Mask, u32 MaskSize);</div><div class='add'>+void EnablePhyComa(struct et131x_adapter *adapter);</div><div class='add'>+void DisablePhyComa(struct et131x_adapter *adapter);</div><div class='add'>+</div><div class='add'>+#endif /* _ET1310_PM_H_ */</div><div class='head'>diff --git a/drivers/staging/et131x/et1310_rx.c b/drivers/staging/et131x/et1310_rx.c<br/>new file mode 100644<br/>index 000000000000..ec98da5da5bc<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/et131x/et1310_rx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/et131x/et1310_rx.c</a></div><div class='hunk'>@@ -0,0 +1,1391 @@</div><div class='add'>+/*</div><div class='add'>+ * Agere Systems Inc.</div><div class='add'>+ * 10/100/1000 Base-T Ethernet Driver for the ET1301 and ET131x series MACs</div><div class='add'>+ *</div><div class='add'>+ * Copyright © 2005 Agere Systems Inc.</div><div class='add'>+ * All rights reserved.</div><div class='add'>+ *   http://www.agere.com</div><div class='add'>+ *</div><div class='add'>+ *------------------------------------------------------------------------------</div><div class='add'>+ *</div><div class='add'>+ * et1310_rx.c - Routines used to perform data reception</div><div class='add'>+ *</div><div class='add'>+ *------------------------------------------------------------------------------</div><div class='add'>+ *</div><div class='add'>+ * SOFTWARE LICENSE</div><div class='add'>+ *</div><div class='add'>+ * This software is provided subject to the following terms and conditions,</div><div class='add'>+ * which you should read carefully before using the software.  Using this</div><div class='add'>+ * software indicates your acceptance of these terms and conditions.  If you do</div><div class='add'>+ * not agree with these terms and conditions, do not use the software.</div><div class='add'>+ *</div><div class='add'>+ * Copyright © 2005 Agere Systems Inc.</div><div class='add'>+ * All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source or binary forms, with or without</div><div class='add'>+ * modifications, are permitted provided that the following conditions are met:</div><div class='add'>+ *</div><div class='add'>+ * . Redistributions of source code must retain the above copyright notice, this</div><div class='add'>+ *    list of conditions and the following Disclaimer as comments in the code as</div><div class='add'>+ *    well as in the documentation and/or other materials provided with the</div><div class='add'>+ *    distribution.</div><div class='add'>+ *</div><div class='add'>+ * . Redistributions in binary form must reproduce the above copyright notice,</div><div class='add'>+ *    this list of conditions and the following Disclaimer in the documentation</div><div class='add'>+ *    and/or other materials provided with the distribution.</div><div class='add'>+ *</div><div class='add'>+ * . Neither the name of Agere Systems Inc. nor the names of the contributors</div><div class='add'>+ *    may be used to endorse or promote products derived from this software</div><div class='add'>+ *    without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ * Disclaimer</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES,</div><div class='add'>+ * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  ANY</div><div class='add'>+ * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN</div><div class='add'>+ * RISK. IN NO EVENT SHALL AGERE SYSTEMS INC. OR CONTRIBUTORS BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, INCLUDING, BUT NOT LIMITED TO, CONTRACT, STRICT</div><div class='add'>+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT</div><div class='add'>+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH</div><div class='add'>+ * DAMAGE.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "et131x_version.h"</div><div class='add'>+#include "et131x_debug.h"</div><div class='add'>+#include "et131x_defs.h"</div><div class='add'>+</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/ptrace.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/ctype.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/timer.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/in.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/system.h&gt;</div><div class='add'>+#include &lt;asm/bitops.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/if_arp.h&gt;</div><div class='add'>+#include &lt;linux/ioport.h&gt;</div><div class='add'>+</div><div class='add'>+#include "et1310_phy.h"</div><div class='add'>+#include "et1310_pm.h"</div><div class='add'>+#include "et1310_jagcore.h"</div><div class='add'>+</div><div class='add'>+#include "et131x_adapter.h"</div><div class='add'>+#include "et131x_initpci.h"</div><div class='add'>+</div><div class='add'>+#include "et1310_rx.h"</div><div class='add'>+</div><div class='add'>+/* Data for debugging facilities */</div><div class='add'>+#ifdef CONFIG_ET131X_DEBUG</div><div class='add'>+extern dbg_info_t *et131x_dbginfo;</div><div class='add'>+#endif /* CONFIG_ET131X_DEBUG */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+void nic_return_rfd(struct et131x_adapter *pAdapter, PMP_RFD pMpRfd);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * et131x_rx_dma_memory_alloc</div><div class='add'>+ * @adapter: pointer to our private adapter structure</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 on success and errno on failure (as defined in errno.h)</div><div class='add'>+ *</div><div class='add'>+ * Allocates Free buffer ring 1 for sure, free buffer ring 0 if required,</div><div class='add'>+ * and the Packet Status Ring.</div><div class='add'>+ */</div><div class='add'>+int et131x_rx_dma_memory_alloc(struct et131x_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	uint32_t OuterLoop, InnerLoop;</div><div class='add'>+	uint32_t bufsize;</div><div class='add'>+	uint32_t pktStatRingSize, FBRChunkSize;</div><div class='add'>+	RX_RING_t *rx_ring;</div><div class='add'>+</div><div class='add'>+	DBG_ENTER(et131x_dbginfo);</div><div class='add'>+</div><div class='add'>+	/* Setup some convenience pointers */</div><div class='add'>+	rx_ring = (RX_RING_t *) &amp; adapter-&gt;RxRing;</div><div class='add'>+</div><div class='add'>+	/* Alloc memory for the lookup table */</div><div class='add'>+#ifdef USE_FBR0</div><div class='add'>+	rx_ring-&gt;Fbr[0] = kmalloc(sizeof(FBRLOOKUPTABLE), GFP_KERNEL);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	rx_ring-&gt;Fbr[1] = kmalloc(sizeof(FBRLOOKUPTABLE), GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	/* The first thing we will do is configure the sizes of the buffer</div><div class='add'>+	 * rings. These will change based on jumbo packet support.  Larger</div><div class='add'>+	 * jumbo packets increases the size of each entry in FBR0, and the</div><div class='add'>+	 * number of entries in FBR0, while at the same time decreasing the</div><div class='add'>+	 * number of entries in FBR1.</div><div class='add'>+	 *</div><div class='add'>+	 * FBR1 holds "large" frames, FBR0 holds "small" frames.  If FBR1</div><div class='add'>+	 * entries are huge in order to accomodate a "jumbo" frame, then it</div><div class='add'>+	 * will have less entries.  Conversely, FBR1 will now be relied upon</div><div class='add'>+	 * to carry more "normal" frames, thus it's entry size also increases</div><div class='add'>+	 * and the number of entries goes up too (since it now carries</div><div class='add'>+	 * "small" + "regular" packets.</div><div class='add'>+	 *</div><div class='add'>+	 * In this scheme, we try to maintain 512 entries between the two</div><div class='add'>+	 * rings. Also, FBR1 remains a constant size - when it's size doubles</div><div class='add'>+	 * the number of entries halves.  FBR0 increases in size, however.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	if (adapter-&gt;RegistryJumboPacket &lt; 2048) {</div><div class='add'>+#ifdef USE_FBR0</div><div class='add'>+		rx_ring-&gt;Fbr0BufferSize = 256;</div><div class='add'>+		rx_ring-&gt;Fbr0NumEntries = 512;</div><div class='add'>+#endif</div><div class='add'>+		rx_ring-&gt;Fbr1BufferSize = 2048;</div><div class='add'>+		rx_ring-&gt;Fbr1NumEntries = 512;</div><div class='add'>+	} else if (adapter-&gt;RegistryJumboPacket &lt; 4096) {</div><div class='add'>+#ifdef USE_FBR0</div><div class='add'>+		rx_ring-&gt;Fbr0BufferSize = 512;</div><div class='add'>+		rx_ring-&gt;Fbr0NumEntries = 1024;</div><div class='add'>+#endif</div><div class='add'>+		rx_ring-&gt;Fbr1BufferSize = 4096;</div><div class='add'>+		rx_ring-&gt;Fbr1NumEntries = 512;</div><div class='add'>+	} else {</div><div class='add'>+#ifdef USE_FBR0</div><div class='add'>+		rx_ring-&gt;Fbr0BufferSize = 1024;</div><div class='add'>+		rx_ring-&gt;Fbr0NumEntries = 768;</div><div class='add'>+#endif</div><div class='add'>+		rx_ring-&gt;Fbr1BufferSize = 16384;</div><div class='add'>+		rx_ring-&gt;Fbr1NumEntries = 128;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#ifdef USE_FBR0</div><div class='add'>+	adapter-&gt;RxRing.PsrNumEntries = adapter-&gt;RxRing.Fbr0NumEntries +</div><div class='add'>+	    adapter-&gt;RxRing.Fbr1NumEntries;</div><div class='add'>+#else</div><div class='add'>+	adapter-&gt;RxRing.PsrNumEntries = adapter-&gt;RxRing.Fbr1NumEntries;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* Allocate an area of memory for Free Buffer Ring 1 */</div><div class='add'>+	bufsize = (sizeof(FBR_DESC_t) * rx_ring-&gt;Fbr1NumEntries) + 0xfff;</div><div class='add'>+	rx_ring-&gt;pFbr1RingVa = pci_alloc_consistent(adapter-&gt;pdev,</div><div class='add'>+						    bufsize,</div><div class='add'>+						    &amp;rx_ring-&gt;pFbr1RingPa);</div><div class='add'>+	if (!rx_ring-&gt;pFbr1RingVa) {</div><div class='add'>+		DBG_ERROR(et131x_dbginfo,</div><div class='add'>+			  "Cannot alloc memory for Free Buffer Ring 1\n");</div><div class='add'>+		DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Save physical address</div><div class='add'>+	 *</div><div class='add'>+	 * NOTE: pci_alloc_consistent(), used above to alloc DMA regions,</div><div class='add'>+	 * ALWAYS returns SAC (32-bit) addresses. If DAC (64-bit) addresses</div><div class='add'>+	 * are ever returned, make sure the high part is retrieved here</div><div class='add'>+	 * before storing the adjusted address.</div><div class='add'>+	 */</div><div class='add'>+	rx_ring-&gt;Fbr1Realpa = rx_ring-&gt;pFbr1RingPa;</div><div class='add'>+</div><div class='add'>+	/* Align Free Buffer Ring 1 on a 4K boundary */</div><div class='add'>+	et131x_align_allocated_memory(adapter,</div><div class='add'>+				      &amp;rx_ring-&gt;Fbr1Realpa,</div><div class='add'>+				      &amp;rx_ring-&gt;Fbr1offset, 0x0FFF);</div><div class='add'>+</div><div class='add'>+	rx_ring-&gt;pFbr1RingVa = (void *)((uint8_t *) rx_ring-&gt;pFbr1RingVa +</div><div class='add'>+					rx_ring-&gt;Fbr1offset);</div><div class='add'>+</div><div class='add'>+#ifdef USE_FBR0</div><div class='add'>+	/* Allocate an area of memory for Free Buffer Ring 0 */</div><div class='add'>+	bufsize = (sizeof(FBR_DESC_t) * rx_ring-&gt;Fbr0NumEntries) + 0xfff;</div><div class='add'>+	rx_ring-&gt;pFbr0RingVa = pci_alloc_consistent(adapter-&gt;pdev,</div><div class='add'>+						    bufsize,</div><div class='add'>+						    &amp;rx_ring-&gt;pFbr0RingPa);</div><div class='add'>+	if (!rx_ring-&gt;pFbr0RingVa) {</div><div class='add'>+		DBG_ERROR(et131x_dbginfo,</div><div class='add'>+			  "Cannot alloc memory for Free Buffer Ring 0\n");</div><div class='add'>+		DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Save physical address</div><div class='add'>+	 *</div><div class='add'>+	 * NOTE: pci_alloc_consistent(), used above to alloc DMA regions,</div><div class='add'>+	 * ALWAYS returns SAC (32-bit) addresses. If DAC (64-bit) addresses</div><div class='add'>+	 * are ever returned, make sure the high part is retrieved here before</div><div class='add'>+	 * storing the adjusted address.</div><div class='add'>+	 */</div><div class='add'>+	rx_ring-&gt;Fbr0Realpa = rx_ring-&gt;pFbr0RingPa;</div><div class='add'>+</div><div class='add'>+	/* Align Free Buffer Ring 0 on a 4K boundary */</div><div class='add'>+	et131x_align_allocated_memory(adapter,</div><div class='add'>+				      &amp;rx_ring-&gt;Fbr0Realpa,</div><div class='add'>+				      &amp;rx_ring-&gt;Fbr0offset, 0x0FFF);</div><div class='add'>+</div><div class='add'>+	rx_ring-&gt;pFbr0RingVa = (void *)((uint8_t *) rx_ring-&gt;pFbr0RingVa +</div><div class='add'>+					rx_ring-&gt;Fbr0offset);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	for (OuterLoop = 0; OuterLoop &lt; (rx_ring-&gt;Fbr1NumEntries / FBR_CHUNKS);</div><div class='add'>+	     OuterLoop++) {</div><div class='add'>+		uint64_t Fbr1Offset;</div><div class='add'>+		uint64_t Fbr1TempPa;</div><div class='add'>+		uint32_t Fbr1Align;</div><div class='add'>+</div><div class='add'>+		/* This code allocates an area of memory big enough for N</div><div class='add'>+		 * free buffers + (buffer_size - 1) so that the buffers can</div><div class='add'>+		 * be aligned on 4k boundaries.  If each buffer were aligned</div><div class='add'>+		 * to a buffer_size boundary, the effect would be to double</div><div class='add'>+		 * the size of FBR0.  By allocating N buffers at once, we</div><div class='add'>+		 * reduce this overhead.</div><div class='add'>+		 */</div><div class='add'>+		if (rx_ring-&gt;Fbr1BufferSize &gt; 4096) {</div><div class='add'>+			Fbr1Align = 4096;</div><div class='add'>+		} else {</div><div class='add'>+			Fbr1Align = rx_ring-&gt;Fbr1BufferSize;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		FBRChunkSize =</div><div class='add'>+		    (FBR_CHUNKS * rx_ring-&gt;Fbr1BufferSize) + Fbr1Align - 1;</div><div class='add'>+		rx_ring-&gt;Fbr1MemVa[OuterLoop] =</div><div class='add'>+		    pci_alloc_consistent(adapter-&gt;pdev, FBRChunkSize,</div><div class='add'>+					 &amp;rx_ring-&gt;Fbr1MemPa[OuterLoop]);</div><div class='add'>+</div><div class='add'>+		if (!rx_ring-&gt;Fbr1MemVa[OuterLoop]) {</div><div class='add'>+			DBG_ERROR(et131x_dbginfo, "Could not alloc memory\n");</div><div class='add'>+			DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* See NOTE in "Save Physical Address" comment above */</div><div class='add'>+		Fbr1TempPa = rx_ring-&gt;Fbr1MemPa[OuterLoop];</div><div class='add'>+</div><div class='add'>+		et131x_align_allocated_memory(adapter,</div><div class='add'>+					      &amp;Fbr1TempPa,</div><div class='add'>+					      &amp;Fbr1Offset, (Fbr1Align - 1));</div><div class='add'>+</div><div class='add'>+		for (InnerLoop = 0; InnerLoop &lt; FBR_CHUNKS; InnerLoop++) {</div><div class='add'>+			uint32_t index = (OuterLoop * FBR_CHUNKS) + InnerLoop;</div><div class='add'>+</div><div class='add'>+			/* Save the Virtual address of this index for quick</div><div class='add'>+			 * access later</div><div class='add'>+			 */</div><div class='add'>+			rx_ring-&gt;Fbr[1]-&gt;Va[index] =</div><div class='add'>+			    (uint8_t *) rx_ring-&gt;Fbr1MemVa[OuterLoop] +</div><div class='add'>+			    (InnerLoop * rx_ring-&gt;Fbr1BufferSize) + Fbr1Offset;</div><div class='add'>+</div><div class='add'>+			/* now store the physical address in the descriptor</div><div class='add'>+			 * so the device can access it</div><div class='add'>+			 */</div><div class='add'>+			rx_ring-&gt;Fbr[1]-&gt;PAHigh[index] =</div><div class='add'>+			    (uint32_t) (Fbr1TempPa &gt;&gt; 32);</div><div class='add'>+			rx_ring-&gt;Fbr[1]-&gt;PALow[index] = (uint32_t) Fbr1TempPa;</div><div class='add'>+</div><div class='add'>+			Fbr1TempPa += rx_ring-&gt;Fbr1BufferSize;</div><div class='add'>+</div><div class='add'>+			rx_ring-&gt;Fbr[1]-&gt;Buffer1[index] =</div><div class='add'>+			    rx_ring-&gt;Fbr[1]-&gt;Va[index];</div><div class='add'>+			rx_ring-&gt;Fbr[1]-&gt;Buffer2[index] =</div><div class='add'>+			    rx_ring-&gt;Fbr[1]-&gt;Va[index] - 4;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#ifdef USE_FBR0</div><div class='add'>+	/* Same for FBR0 (if in use) */</div><div class='add'>+	for (OuterLoop = 0; OuterLoop &lt; (rx_ring-&gt;Fbr0NumEntries / FBR_CHUNKS);</div><div class='add'>+	     OuterLoop++) {</div><div class='add'>+		uint64_t Fbr0Offset;</div><div class='add'>+		uint64_t Fbr0TempPa;</div><div class='add'>+</div><div class='add'>+		FBRChunkSize = ((FBR_CHUNKS + 1) * rx_ring-&gt;Fbr0BufferSize) - 1;</div><div class='add'>+		rx_ring-&gt;Fbr0MemVa[OuterLoop] =</div><div class='add'>+		    pci_alloc_consistent(adapter-&gt;pdev, FBRChunkSize,</div><div class='add'>+					 &amp;rx_ring-&gt;Fbr0MemPa[OuterLoop]);</div><div class='add'>+</div><div class='add'>+		if (!rx_ring-&gt;Fbr0MemVa[OuterLoop]) {</div><div class='add'>+			DBG_ERROR(et131x_dbginfo, "Could not alloc memory\n");</div><div class='add'>+			DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* See NOTE in "Save Physical Address" comment above */</div><div class='add'>+		Fbr0TempPa = rx_ring-&gt;Fbr0MemPa[OuterLoop];</div><div class='add'>+</div><div class='add'>+		et131x_align_allocated_memory(adapter,</div><div class='add'>+					      &amp;Fbr0TempPa,</div><div class='add'>+					      &amp;Fbr0Offset,</div><div class='add'>+					      rx_ring-&gt;Fbr0BufferSize - 1);</div><div class='add'>+</div><div class='add'>+		for (InnerLoop = 0; InnerLoop &lt; FBR_CHUNKS; InnerLoop++) {</div><div class='add'>+			uint32_t index = (OuterLoop * FBR_CHUNKS) + InnerLoop;</div><div class='add'>+</div><div class='add'>+			rx_ring-&gt;Fbr[0]-&gt;Va[index] =</div><div class='add'>+			    (uint8_t *) rx_ring-&gt;Fbr0MemVa[OuterLoop] +</div><div class='add'>+			    (InnerLoop * rx_ring-&gt;Fbr0BufferSize) + Fbr0Offset;</div><div class='add'>+</div><div class='add'>+			rx_ring-&gt;Fbr[0]-&gt;PAHigh[index] =</div><div class='add'>+			    (uint32_t) (Fbr0TempPa &gt;&gt; 32);</div><div class='add'>+			rx_ring-&gt;Fbr[0]-&gt;PALow[index] = (uint32_t) Fbr0TempPa;</div><div class='add'>+</div><div class='add'>+			Fbr0TempPa += rx_ring-&gt;Fbr0BufferSize;</div><div class='add'>+</div><div class='add'>+			rx_ring-&gt;Fbr[0]-&gt;Buffer1[index] =</div><div class='add'>+			    rx_ring-&gt;Fbr[0]-&gt;Va[index];</div><div class='add'>+			rx_ring-&gt;Fbr[0]-&gt;Buffer2[index] =</div><div class='add'>+			    rx_ring-&gt;Fbr[0]-&gt;Va[index] - 4;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* Allocate an area of memory for FIFO of Packet Status ring entries */</div><div class='add'>+	pktStatRingSize =</div><div class='add'>+	    sizeof(PKT_STAT_DESC_t) * adapter-&gt;RxRing.PsrNumEntries;</div><div class='add'>+</div><div class='add'>+	rx_ring-&gt;pPSRingVa = pci_alloc_consistent(adapter-&gt;pdev,</div><div class='add'>+						  pktStatRingSize + 0x0fff,</div><div class='add'>+						  &amp;rx_ring-&gt;pPSRingPa);</div><div class='add'>+</div><div class='add'>+	if (!rx_ring-&gt;pPSRingVa) {</div><div class='add'>+		DBG_ERROR(et131x_dbginfo,</div><div class='add'>+			  "Cannot alloc memory for Packet Status Ring\n");</div><div class='add'>+		DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Save physical address</div><div class='add'>+	 *</div><div class='add'>+	 * NOTE : pci_alloc_consistent(), used above to alloc DMA regions,</div><div class='add'>+	 * ALWAYS returns SAC (32-bit) addresses. If DAC (64-bit) addresses</div><div class='add'>+	 * are ever returned, make sure the high part is retrieved here before</div><div class='add'>+	 * storing the adjusted address.</div><div class='add'>+	 */</div><div class='add'>+	rx_ring-&gt;pPSRingRealPa = rx_ring-&gt;pPSRingPa;</div><div class='add'>+</div><div class='add'>+	/* Align Packet Status Ring on a 4K boundary */</div><div class='add'>+	et131x_align_allocated_memory(adapter,</div><div class='add'>+				      &amp;rx_ring-&gt;pPSRingRealPa,</div><div class='add'>+				      &amp;rx_ring-&gt;pPSRingOffset, 0x0FFF);</div><div class='add'>+</div><div class='add'>+	rx_ring-&gt;pPSRingVa = (void *)((uint8_t *) rx_ring-&gt;pPSRingVa +</div><div class='add'>+				      rx_ring-&gt;pPSRingOffset);</div><div class='add'>+</div><div class='add'>+	/* Allocate an area of memory for writeback of status information */</div><div class='add'>+	rx_ring-&gt;pRxStatusVa = pci_alloc_consistent(adapter-&gt;pdev,</div><div class='add'>+						    sizeof(RX_STATUS_BLOCK_t) +</div><div class='add'>+						    0x7, &amp;rx_ring-&gt;pRxStatusPa);</div><div class='add'>+	if (!rx_ring-&gt;pRxStatusVa) {</div><div class='add'>+		DBG_ERROR(et131x_dbginfo,</div><div class='add'>+			  "Cannot alloc memory for Status Block\n");</div><div class='add'>+		DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Save physical address */</div><div class='add'>+	rx_ring-&gt;RxStatusRealPA = rx_ring-&gt;pRxStatusPa;</div><div class='add'>+</div><div class='add'>+	/* Align write back on an 8 byte boundary */</div><div class='add'>+	et131x_align_allocated_memory(adapter,</div><div class='add'>+				      &amp;rx_ring-&gt;RxStatusRealPA,</div><div class='add'>+				      &amp;rx_ring-&gt;RxStatusOffset, 0x07);</div><div class='add'>+</div><div class='add'>+	rx_ring-&gt;pRxStatusVa = (void *)((uint8_t *) rx_ring-&gt;pRxStatusVa +</div><div class='add'>+					rx_ring-&gt;RxStatusOffset);</div><div class='add'>+	rx_ring-&gt;NumRfd = NIC_DEFAULT_NUM_RFD;</div><div class='add'>+</div><div class='add'>+	/* Recv</div><div class='add'>+	 * pci_pool_create initializes a lookaside list. After successful</div><div class='add'>+	 * creation, nonpaged fixed-size blocks can be allocated from and</div><div class='add'>+	 * freed to the lookaside list.</div><div class='add'>+	 * RFDs will be allocated from this pool.</div><div class='add'>+	 */</div><div class='add'>+	rx_ring-&gt;RecvLookaside = kmem_cache_create(adapter-&gt;netdev-&gt;name,</div><div class='add'>+						   sizeof(MP_RFD),</div><div class='add'>+						   0,</div><div class='add'>+						   SLAB_CACHE_DMA |</div><div class='add'>+						   SLAB_HWCACHE_ALIGN,</div><div class='add'>+						   NULL);</div><div class='add'>+</div><div class='add'>+	MP_SET_FLAG(adapter, fMP_ADAPTER_RECV_LOOKASIDE);</div><div class='add'>+</div><div class='add'>+	/* The RFDs are going to be put on lists later on, so initialize the</div><div class='add'>+	 * lists now.</div><div class='add'>+	 */</div><div class='add'>+	INIT_LIST_HEAD(&amp;rx_ring-&gt;RecvList);</div><div class='add'>+	INIT_LIST_HEAD(&amp;rx_ring-&gt;RecvPendingList);</div><div class='add'>+</div><div class='add'>+	DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * et131x_rx_dma_memory_free - Free all memory allocated within this module.</div><div class='add'>+ * @adapter: pointer to our private adapter structure</div><div class='add'>+ */</div><div class='add'>+void et131x_rx_dma_memory_free(struct et131x_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	uint32_t index;</div><div class='add'>+	uint32_t bufsize;</div><div class='add'>+	uint32_t pktStatRingSize;</div><div class='add'>+	PMP_RFD pMpRfd;</div><div class='add'>+	RX_RING_t *rx_ring;</div><div class='add'>+</div><div class='add'>+	DBG_ENTER(et131x_dbginfo);</div><div class='add'>+</div><div class='add'>+	/* Setup some convenience pointers */</div><div class='add'>+	rx_ring = (RX_RING_t *) &amp; adapter-&gt;RxRing;</div><div class='add'>+</div><div class='add'>+	/* Free RFDs and associated packet descriptors */</div><div class='add'>+	DBG_ASSERT(rx_ring-&gt;nReadyRecv == rx_ring-&gt;NumRfd);</div><div class='add'>+</div><div class='add'>+	while (!list_empty(&amp;rx_ring-&gt;RecvList)) {</div><div class='add'>+		pMpRfd = (MP_RFD *) list_entry(rx_ring-&gt;RecvList.next,</div><div class='add'>+					       MP_RFD, list_node);</div><div class='add'>+</div><div class='add'>+		list_del(&amp;pMpRfd-&gt;list_node);</div><div class='add'>+		et131x_rfd_resources_free(adapter, pMpRfd);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	while (!list_empty(&amp;rx_ring-&gt;RecvPendingList)) {</div><div class='add'>+		pMpRfd = (MP_RFD *) list_entry(rx_ring-&gt;RecvPendingList.next,</div><div class='add'>+					       MP_RFD, list_node);</div><div class='add'>+		list_del(&amp;pMpRfd-&gt;list_node);</div><div class='add'>+		et131x_rfd_resources_free(adapter, pMpRfd);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Free Free Buffer Ring 1 */</div><div class='add'>+	if (rx_ring-&gt;pFbr1RingVa) {</div><div class='add'>+		/* First the packet memory */</div><div class='add'>+		for (index = 0; index &lt;</div><div class='add'>+		     (rx_ring-&gt;Fbr1NumEntries / FBR_CHUNKS); index++) {</div><div class='add'>+			if (rx_ring-&gt;Fbr1MemVa[index]) {</div><div class='add'>+				uint32_t Fbr1Align;</div><div class='add'>+</div><div class='add'>+				if (rx_ring-&gt;Fbr1BufferSize &gt; 4096) {</div><div class='add'>+					Fbr1Align = 4096;</div><div class='add'>+				} else {</div><div class='add'>+					Fbr1Align = rx_ring-&gt;Fbr1BufferSize;</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+				bufsize =</div><div class='add'>+				    (rx_ring-&gt;Fbr1BufferSize * FBR_CHUNKS) +</div><div class='add'>+				    Fbr1Align - 1;</div><div class='add'>+</div><div class='add'>+				pci_free_consistent(adapter-&gt;pdev,</div><div class='add'>+						    bufsize,</div><div class='add'>+						    rx_ring-&gt;Fbr1MemVa[index],</div><div class='add'>+						    rx_ring-&gt;Fbr1MemPa[index]);</div><div class='add'>+</div><div class='add'>+				rx_ring-&gt;Fbr1MemVa[index] = NULL;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Now the FIFO itself */</div><div class='add'>+		rx_ring-&gt;pFbr1RingVa = (void *)((uint8_t *) rx_ring-&gt;pFbr1RingVa -</div><div class='add'>+						rx_ring-&gt;Fbr1offset);</div><div class='add'>+</div><div class='add'>+		bufsize =</div><div class='add'>+		    (sizeof(FBR_DESC_t) * rx_ring-&gt;Fbr1NumEntries) + 0xfff;</div><div class='add'>+</div><div class='add'>+		pci_free_consistent(adapter-&gt;pdev,</div><div class='add'>+				    bufsize,</div><div class='add'>+				    rx_ring-&gt;pFbr1RingVa, rx_ring-&gt;pFbr1RingPa);</div><div class='add'>+</div><div class='add'>+		rx_ring-&gt;pFbr1RingVa = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#ifdef USE_FBR0</div><div class='add'>+	/* Now the same for Free Buffer Ring 0 */</div><div class='add'>+	if (rx_ring-&gt;pFbr0RingVa) {</div><div class='add'>+		/* First the packet memory */</div><div class='add'>+		for (index = 0; index &lt;</div><div class='add'>+		     (rx_ring-&gt;Fbr0NumEntries / FBR_CHUNKS); index++) {</div><div class='add'>+			if (rx_ring-&gt;Fbr0MemVa[index]) {</div><div class='add'>+				bufsize =</div><div class='add'>+				    (rx_ring-&gt;Fbr0BufferSize *</div><div class='add'>+				     (FBR_CHUNKS + 1)) - 1;</div><div class='add'>+</div><div class='add'>+				pci_free_consistent(adapter-&gt;pdev,</div><div class='add'>+						    bufsize,</div><div class='add'>+						    rx_ring-&gt;Fbr0MemVa[index],</div><div class='add'>+						    rx_ring-&gt;Fbr0MemPa[index]);</div><div class='add'>+</div><div class='add'>+				rx_ring-&gt;Fbr0MemVa[index] = NULL;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Now the FIFO itself */</div><div class='add'>+		rx_ring-&gt;pFbr0RingVa = (void *)((uint8_t *) rx_ring-&gt;pFbr0RingVa -</div><div class='add'>+						rx_ring-&gt;Fbr0offset);</div><div class='add'>+</div><div class='add'>+		bufsize =</div><div class='add'>+		    (sizeof(FBR_DESC_t) * rx_ring-&gt;Fbr0NumEntries) + 0xfff;</div><div class='add'>+</div><div class='add'>+		pci_free_consistent(adapter-&gt;pdev,</div><div class='add'>+				    bufsize,</div><div class='add'>+				    rx_ring-&gt;pFbr0RingVa, rx_ring-&gt;pFbr0RingPa);</div><div class='add'>+</div><div class='add'>+		rx_ring-&gt;pFbr0RingVa = NULL;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* Free Packet Status Ring */</div><div class='add'>+	if (rx_ring-&gt;pPSRingVa) {</div><div class='add'>+		rx_ring-&gt;pPSRingVa = (void *)((uint8_t *) rx_ring-&gt;pPSRingVa -</div><div class='add'>+					      rx_ring-&gt;pPSRingOffset);</div><div class='add'>+</div><div class='add'>+		pktStatRingSize =</div><div class='add'>+		    sizeof(PKT_STAT_DESC_t) * adapter-&gt;RxRing.PsrNumEntries;</div><div class='add'>+</div><div class='add'>+		pci_free_consistent(adapter-&gt;pdev,</div><div class='add'>+				    pktStatRingSize + 0x0fff,</div><div class='add'>+				    rx_ring-&gt;pPSRingVa, rx_ring-&gt;pPSRingPa);</div><div class='add'>+</div><div class='add'>+		rx_ring-&gt;pPSRingVa = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Free area of memory for the writeback of status information */</div><div class='add'>+	if (rx_ring-&gt;pRxStatusVa) {</div><div class='add'>+		rx_ring-&gt;pRxStatusVa = (void *)((uint8_t *) rx_ring-&gt;pRxStatusVa -</div><div class='add'>+						rx_ring-&gt;RxStatusOffset);</div><div class='add'>+</div><div class='add'>+		pci_free_consistent(adapter-&gt;pdev,</div><div class='add'>+				    sizeof(RX_STATUS_BLOCK_t) + 0x7,</div><div class='add'>+				    rx_ring-&gt;pRxStatusVa, rx_ring-&gt;pRxStatusPa);</div><div class='add'>+</div><div class='add'>+		rx_ring-&gt;pRxStatusVa = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Free receive buffer pool */</div><div class='add'>+</div><div class='add'>+	/* Free receive packet pool */</div><div class='add'>+</div><div class='add'>+	/* Destroy the lookaside (RFD) pool */</div><div class='add'>+	if (MP_TEST_FLAG(adapter, fMP_ADAPTER_RECV_LOOKASIDE)) {</div><div class='add'>+		kmem_cache_destroy(rx_ring-&gt;RecvLookaside);</div><div class='add'>+		MP_CLEAR_FLAG(adapter, fMP_ADAPTER_RECV_LOOKASIDE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Free the FBR Lookup Table */</div><div class='add'>+#ifdef USE_FBR0</div><div class='add'>+	kfree(rx_ring-&gt;Fbr[0]);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	kfree(rx_ring-&gt;Fbr[1]);</div><div class='add'>+</div><div class='add'>+	/* Reset Counters */</div><div class='add'>+	rx_ring-&gt;nReadyRecv = 0;</div><div class='add'>+</div><div class='add'>+	DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * et131x_init_recv - Initialize receive data structures.</div><div class='add'>+ * @adapter: pointer to our private adapter structure</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 on success and errno on failure (as defined in errno.h)</div><div class='add'>+ */</div><div class='add'>+int et131x_init_recv(struct et131x_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	int status = -ENOMEM;</div><div class='add'>+	PMP_RFD pMpRfd = NULL;</div><div class='add'>+	uint32_t RfdCount;</div><div class='add'>+	uint32_t TotalNumRfd = 0;</div><div class='add'>+	RX_RING_t *rx_ring = NULL;</div><div class='add'>+</div><div class='add'>+	DBG_ENTER(et131x_dbginfo);</div><div class='add'>+</div><div class='add'>+	/* Setup some convenience pointers */</div><div class='add'>+	rx_ring = (RX_RING_t *) &amp; adapter-&gt;RxRing;</div><div class='add'>+</div><div class='add'>+	/* Setup each RFD */</div><div class='add'>+	for (RfdCount = 0; RfdCount &lt; rx_ring-&gt;NumRfd; RfdCount++) {</div><div class='add'>+		pMpRfd = (MP_RFD *) kmem_cache_alloc(rx_ring-&gt;RecvLookaside,</div><div class='add'>+						     GFP_ATOMIC | GFP_DMA);</div><div class='add'>+</div><div class='add'>+		if (!pMpRfd) {</div><div class='add'>+			DBG_ERROR(et131x_dbginfo,</div><div class='add'>+				  "Couldn't alloc RFD out of kmem_cache\n");</div><div class='add'>+			status = -ENOMEM;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		status = et131x_rfd_resources_alloc(adapter, pMpRfd);</div><div class='add'>+		if (status != 0) {</div><div class='add'>+			DBG_ERROR(et131x_dbginfo,</div><div class='add'>+				  "Couldn't alloc packet for RFD\n");</div><div class='add'>+			kmem_cache_free(rx_ring-&gt;RecvLookaside, pMpRfd);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Add this RFD to the RecvList */</div><div class='add'>+		list_add_tail(&amp;pMpRfd-&gt;list_node, &amp;rx_ring-&gt;RecvList);</div><div class='add'>+</div><div class='add'>+		/* Increment both the available RFD's, and the total RFD's. */</div><div class='add'>+		rx_ring-&gt;nReadyRecv++;</div><div class='add'>+		TotalNumRfd++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (TotalNumRfd &gt; NIC_MIN_NUM_RFD) {</div><div class='add'>+		status = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rx_ring-&gt;NumRfd = TotalNumRfd;</div><div class='add'>+</div><div class='add'>+	if (status != 0) {</div><div class='add'>+		kmem_cache_free(rx_ring-&gt;RecvLookaside, pMpRfd);</div><div class='add'>+		DBG_ERROR(et131x_dbginfo,</div><div class='add'>+			  "Allocation problems in et131x_init_recv\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * et131x_rfd_resources_alloc</div><div class='add'>+ * @adapter: pointer to our private adapter structure</div><div class='add'>+ * @pMpRfd: pointer to a RFD</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 on success and errno on failure (as defined in errno.h)</div><div class='add'>+ */</div><div class='add'>+int et131x_rfd_resources_alloc(struct et131x_adapter *adapter, MP_RFD *pMpRfd)</div><div class='add'>+{</div><div class='add'>+	pMpRfd-&gt;Packet = NULL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * et131x_rfd_resources_free - Free the packet allocated for the given RFD</div><div class='add'>+ * @adapter: pointer to our private adapter structure</div><div class='add'>+ * @pMpRfd: pointer to a RFD</div><div class='add'>+ */</div><div class='add'>+void et131x_rfd_resources_free(struct et131x_adapter *adapter, MP_RFD *pMpRfd)</div><div class='add'>+{</div><div class='add'>+	pMpRfd-&gt;Packet = NULL;</div><div class='add'>+	kmem_cache_free(adapter-&gt;RxRing.RecvLookaside, pMpRfd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ConfigRxDmaRegs - Start of Rx_DMA init sequence</div><div class='add'>+ * @pAdapter: pointer to our adapter structure</div><div class='add'>+ */</div><div class='add'>+void ConfigRxDmaRegs(struct et131x_adapter *pAdapter)</div><div class='add'>+{</div><div class='add'>+	struct _RXDMA_t __iomem *pRxDma = &amp;pAdapter-&gt;CSRAddress-&gt;rxdma;</div><div class='add'>+	struct _rx_ring_t *pRxLocal = &amp;pAdapter-&gt;RxRing;</div><div class='add'>+	PFBR_DESC_t pFbrEntry;</div><div class='add'>+	uint32_t iEntry;</div><div class='add'>+	RXDMA_PSR_NUM_DES_t psr_num_des;</div><div class='add'>+	unsigned long lockflags;</div><div class='add'>+</div><div class='add'>+	DBG_ENTER(et131x_dbginfo);</div><div class='add'>+</div><div class='add'>+	/* Halt RXDMA to perform the reconfigure.  */</div><div class='add'>+	et131x_rx_dma_disable(pAdapter);</div><div class='add'>+</div><div class='add'>+	/* Load the completion writeback physical address</div><div class='add'>+	 *</div><div class='add'>+	 * NOTE : pci_alloc_consistent(), used above to alloc DMA regions,</div><div class='add'>+	 * ALWAYS returns SAC (32-bit) addresses. If DAC (64-bit) addresses</div><div class='add'>+	 * are ever returned, make sure the high part is retrieved here</div><div class='add'>+	 * before storing the adjusted address.</div><div class='add'>+	 */</div><div class='add'>+	writel((uint32_t) (pRxLocal-&gt;RxStatusRealPA &gt;&gt; 32),</div><div class='add'>+	       &amp;pRxDma-&gt;dma_wb_base_hi);</div><div class='add'>+	writel((uint32_t) pRxLocal-&gt;RxStatusRealPA, &amp;pRxDma-&gt;dma_wb_base_lo);</div><div class='add'>+</div><div class='add'>+	memset(pRxLocal-&gt;pRxStatusVa, 0, sizeof(RX_STATUS_BLOCK_t));</div><div class='add'>+</div><div class='add'>+	/* Set the address and parameters of the packet status ring into the</div><div class='add'>+	 * 1310's registers</div><div class='add'>+	 */</div><div class='add'>+	writel((uint32_t) (pRxLocal-&gt;pPSRingRealPa &gt;&gt; 32),</div><div class='add'>+	       &amp;pRxDma-&gt;psr_base_hi);</div><div class='add'>+	writel((uint32_t) pRxLocal-&gt;pPSRingRealPa, &amp;pRxDma-&gt;psr_base_lo);</div><div class='add'>+	writel(pRxLocal-&gt;PsrNumEntries - 1, &amp;pRxDma-&gt;psr_num_des.value);</div><div class='add'>+	writel(0, &amp;pRxDma-&gt;psr_full_offset.value);</div><div class='add'>+</div><div class='add'>+	psr_num_des.value = readl(&amp;pRxDma-&gt;psr_num_des.value);</div><div class='add'>+	writel((psr_num_des.bits.psr_ndes * LO_MARK_PERCENT_FOR_PSR) / 100,</div><div class='add'>+	       &amp;pRxDma-&gt;psr_min_des.value);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;pAdapter-&gt;RcvLock, lockflags);</div><div class='add'>+</div><div class='add'>+	/* These local variables track the PSR in the adapter structure */</div><div class='add'>+	pRxLocal-&gt;local_psr_full.bits.psr_full = 0;</div><div class='add'>+	pRxLocal-&gt;local_psr_full.bits.psr_full_wrap = 0;</div><div class='add'>+</div><div class='add'>+	/* Now's the best time to initialize FBR1 contents */</div><div class='add'>+	pFbrEntry = (PFBR_DESC_t) pRxLocal-&gt;pFbr1RingVa;</div><div class='add'>+	for (iEntry = 0; iEntry &lt; pRxLocal-&gt;Fbr1NumEntries; iEntry++) {</div><div class='add'>+		pFbrEntry-&gt;addr_hi = pRxLocal-&gt;Fbr[1]-&gt;PAHigh[iEntry];</div><div class='add'>+		pFbrEntry-&gt;addr_lo = pRxLocal-&gt;Fbr[1]-&gt;PALow[iEntry];</div><div class='add'>+		pFbrEntry-&gt;word2.bits.bi = iEntry;</div><div class='add'>+		pFbrEntry++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Set the address and parameters of Free buffer ring 1 (and 0 if</div><div class='add'>+	 * required) into the 1310's registers</div><div class='add'>+	 */</div><div class='add'>+	writel((uint32_t) (pRxLocal-&gt;Fbr1Realpa &gt;&gt; 32), &amp;pRxDma-&gt;fbr1_base_hi);</div><div class='add'>+	writel((uint32_t) pRxLocal-&gt;Fbr1Realpa, &amp;pRxDma-&gt;fbr1_base_lo);</div><div class='add'>+	writel(pRxLocal-&gt;Fbr1NumEntries - 1, &amp;pRxDma-&gt;fbr1_num_des.value);</div><div class='add'>+</div><div class='add'>+	{</div><div class='add'>+		DMA10W_t fbr1_full = { 0 };</div><div class='add'>+</div><div class='add'>+		fbr1_full.bits.val = 0;</div><div class='add'>+		fbr1_full.bits.wrap = 1;</div><div class='add'>+		writel(fbr1_full.value, &amp;pRxDma-&gt;fbr1_full_offset.value);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* This variable tracks the free buffer ring 1 full position, so it</div><div class='add'>+	 * has to match the above.</div><div class='add'>+	 */</div><div class='add'>+	pRxLocal-&gt;local_Fbr1_full.bits.val = 0;</div><div class='add'>+	pRxLocal-&gt;local_Fbr1_full.bits.wrap = 1;</div><div class='add'>+	writel(((pRxLocal-&gt;Fbr1NumEntries * LO_MARK_PERCENT_FOR_RX) / 100) - 1,</div><div class='add'>+	       &amp;pRxDma-&gt;fbr1_min_des.value);</div><div class='add'>+</div><div class='add'>+#ifdef USE_FBR0</div><div class='add'>+	/* Now's the best time to initialize FBR0 contents */</div><div class='add'>+	pFbrEntry = (PFBR_DESC_t) pRxLocal-&gt;pFbr0RingVa;</div><div class='add'>+	for (iEntry = 0; iEntry &lt; pRxLocal-&gt;Fbr0NumEntries; iEntry++) {</div><div class='add'>+		pFbrEntry-&gt;addr_hi = pRxLocal-&gt;Fbr[0]-&gt;PAHigh[iEntry];</div><div class='add'>+		pFbrEntry-&gt;addr_lo = pRxLocal-&gt;Fbr[0]-&gt;PALow[iEntry];</div><div class='add'>+		pFbrEntry-&gt;word2.bits.bi = iEntry;</div><div class='add'>+		pFbrEntry++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	writel((uint32_t) (pRxLocal-&gt;Fbr0Realpa &gt;&gt; 32), &amp;pRxDma-&gt;fbr0_base_hi);</div><div class='add'>+	writel((uint32_t) pRxLocal-&gt;Fbr0Realpa, &amp;pRxDma-&gt;fbr0_base_lo);</div><div class='add'>+	writel(pRxLocal-&gt;Fbr0NumEntries - 1, &amp;pRxDma-&gt;fbr0_num_des.value);</div><div class='add'>+</div><div class='add'>+	{</div><div class='add'>+		DMA10W_t fbr0_full = { 0 };</div><div class='add'>+</div><div class='add'>+		fbr0_full.bits.val = 0;</div><div class='add'>+		fbr0_full.bits.wrap = 1;</div><div class='add'>+		writel(fbr0_full.value, &amp;pRxDma-&gt;fbr0_full_offset.value);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* This variable tracks the free buffer ring 0 full position, so it</div><div class='add'>+	 * has to match the above.</div><div class='add'>+	 */</div><div class='add'>+	pRxLocal-&gt;local_Fbr0_full.bits.val = 0;</div><div class='add'>+	pRxLocal-&gt;local_Fbr0_full.bits.wrap = 1;</div><div class='add'>+	writel(((pRxLocal-&gt;Fbr0NumEntries * LO_MARK_PERCENT_FOR_RX) / 100) - 1,</div><div class='add'>+	       &amp;pRxDma-&gt;fbr0_min_des.value);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* Program the number of packets we will receive before generating an</div><div class='add'>+	 * interrupt.</div><div class='add'>+	 * For version B silicon, this value gets updated once autoneg is</div><div class='add'>+	 *complete.</div><div class='add'>+	 */</div><div class='add'>+	writel(pAdapter-&gt;RegistryRxNumBuffers, &amp;pRxDma-&gt;num_pkt_done.value);</div><div class='add'>+</div><div class='add'>+	/* The "time_done" is not working correctly to coalesce interrupts</div><div class='add'>+	 * after a given time period, but rather is giving us an interrupt</div><div class='add'>+	 * regardless of whether we have received packets.</div><div class='add'>+	 * This value gets updated once autoneg is complete.</div><div class='add'>+	 */</div><div class='add'>+	writel(pAdapter-&gt;RegistryRxTimeInterval, &amp;pRxDma-&gt;max_pkt_time.value);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;pAdapter-&gt;RcvLock, lockflags);</div><div class='add'>+</div><div class='add'>+	DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * SetRxDmaTimer - Set the heartbeat timer according to line rate.</div><div class='add'>+ * @pAdapter: pointer to our adapter structure</div><div class='add'>+ */</div><div class='add'>+void SetRxDmaTimer(struct et131x_adapter *pAdapter)</div><div class='add'>+{</div><div class='add'>+	/* For version B silicon, we do not use the RxDMA timer for 10 and 100</div><div class='add'>+	 * Mbits/s line rates. We do not enable and RxDMA interrupt coalescing.</div><div class='add'>+	 */</div><div class='add'>+	if ((pAdapter-&gt;uiLinkSpeed == TRUEPHY_SPEED_100MBPS) ||</div><div class='add'>+	    (pAdapter-&gt;uiLinkSpeed == TRUEPHY_SPEED_10MBPS)) {</div><div class='add'>+		writel(0, &amp;pAdapter-&gt;CSRAddress-&gt;rxdma.max_pkt_time.value);</div><div class='add'>+		writel(1, &amp;pAdapter-&gt;CSRAddress-&gt;rxdma.num_pkt_done.value);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * et131x_rx_dma_disable - Stop of Rx_DMA on the ET1310</div><div class='add'>+ * @pAdapter: pointer to our adapter structure</div><div class='add'>+ */</div><div class='add'>+void et131x_rx_dma_disable(struct et131x_adapter *pAdapter)</div><div class='add'>+{</div><div class='add'>+	RXDMA_CSR_t csr;</div><div class='add'>+</div><div class='add'>+	DBG_ENTER(et131x_dbginfo);</div><div class='add'>+</div><div class='add'>+	/* Setup the receive dma configuration register */</div><div class='add'>+	writel(0x00002001, &amp;pAdapter-&gt;CSRAddress-&gt;rxdma.csr.value);</div><div class='add'>+	csr.value = readl(&amp;pAdapter-&gt;CSRAddress-&gt;rxdma.csr.value);</div><div class='add'>+	if (csr.bits.halt_status != 1) {</div><div class='add'>+		udelay(5);</div><div class='add'>+		csr.value = readl(&amp;pAdapter-&gt;CSRAddress-&gt;rxdma.csr.value);</div><div class='add'>+		if (csr.bits.halt_status != 1) {</div><div class='add'>+			DBG_ERROR(et131x_dbginfo,</div><div class='add'>+				  "RX Dma failed to enter halt state. CSR 0x%08x\n",</div><div class='add'>+				  csr.value);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * et131x_rx_dma_enable - re-start of Rx_DMA on the ET1310.</div><div class='add'>+ * @pAdapter: pointer to our adapter structure</div><div class='add'>+ */</div><div class='add'>+void et131x_rx_dma_enable(struct et131x_adapter *pAdapter)</div><div class='add'>+{</div><div class='add'>+	DBG_RX_ENTER(et131x_dbginfo);</div><div class='add'>+</div><div class='add'>+	if (pAdapter-&gt;RegistryPhyLoopbk) {</div><div class='add'>+	/* RxDMA is disabled for loopback operation. */</div><div class='add'>+		writel(0x1, &amp;pAdapter-&gt;CSRAddress-&gt;rxdma.csr.value);</div><div class='add'>+	} else {</div><div class='add'>+	/* Setup the receive dma configuration register for normal operation */</div><div class='add'>+		RXDMA_CSR_t csr = { 0 };</div><div class='add'>+</div><div class='add'>+		csr.bits.fbr1_enable = 1;</div><div class='add'>+		if (pAdapter-&gt;RxRing.Fbr1BufferSize == 4096) {</div><div class='add'>+			csr.bits.fbr1_size = 1;</div><div class='add'>+		} else if (pAdapter-&gt;RxRing.Fbr1BufferSize == 8192) {</div><div class='add'>+			csr.bits.fbr1_size = 2;</div><div class='add'>+		} else if (pAdapter-&gt;RxRing.Fbr1BufferSize == 16384) {</div><div class='add'>+			csr.bits.fbr1_size = 3;</div><div class='add'>+		}</div><div class='add'>+#ifdef USE_FBR0</div><div class='add'>+		csr.bits.fbr0_enable = 1;</div><div class='add'>+		if (pAdapter-&gt;RxRing.Fbr0BufferSize == 256) {</div><div class='add'>+			csr.bits.fbr0_size = 1;</div><div class='add'>+		} else if (pAdapter-&gt;RxRing.Fbr0BufferSize == 512) {</div><div class='add'>+			csr.bits.fbr0_size = 2;</div><div class='add'>+		} else if (pAdapter-&gt;RxRing.Fbr0BufferSize == 1024) {</div><div class='add'>+			csr.bits.fbr0_size = 3;</div><div class='add'>+		}</div><div class='add'>+#endif</div><div class='add'>+		writel(csr.value, &amp;pAdapter-&gt;CSRAddress-&gt;rxdma.csr.value);</div><div class='add'>+</div><div class='add'>+		csr.value = readl(&amp;pAdapter-&gt;CSRAddress-&gt;rxdma.csr.value);</div><div class='add'>+		if (csr.bits.halt_status != 0) {</div><div class='add'>+			udelay(5);</div><div class='add'>+			csr.value = readl(&amp;pAdapter-&gt;CSRAddress-&gt;rxdma.csr.value);</div><div class='add'>+			if (csr.bits.halt_status != 0) {</div><div class='add'>+				DBG_ERROR(et131x_dbginfo,</div><div class='add'>+					  "RX Dma failed to exit halt state.  CSR 0x%08x\n",</div><div class='add'>+					  csr.value);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBG_RX_LEAVE(et131x_dbginfo);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * nic_rx_pkts - Checks the hardware for available packets</div><div class='add'>+ * @pAdapter: pointer to our adapter</div><div class='add'>+ *</div><div class='add'>+ * Returns pMpRfd, a pointer to our MPRFD.</div><div class='add'>+ *</div><div class='add'>+ * Checks the hardware for available packets, using completion ring</div><div class='add'>+ * If packets are available, it gets an RFD from the RecvList, attaches</div><div class='add'>+ * the packet to it, puts the RFD in the RecvPendList, and also returns</div><div class='add'>+ * the pointer to the RFD.</div><div class='add'>+ */</div><div class='add'>+PMP_RFD nic_rx_pkts(struct et131x_adapter *pAdapter)</div><div class='add'>+{</div><div class='add'>+	struct _rx_ring_t *pRxLocal = &amp;pAdapter-&gt;RxRing;</div><div class='add'>+	PRX_STATUS_BLOCK_t pRxStatusBlock;</div><div class='add'>+	PPKT_STAT_DESC_t pPSREntry;</div><div class='add'>+	PMP_RFD pMpRfd;</div><div class='add'>+	uint32_t nIndex;</div><div class='add'>+	uint8_t *pBufVa;</div><div class='add'>+	unsigned long lockflags;</div><div class='add'>+	struct list_head *element;</div><div class='add'>+	uint8_t ringIndex;</div><div class='add'>+	uint16_t bufferIndex;</div><div class='add'>+	uint32_t localLen;</div><div class='add'>+	PKT_STAT_DESC_WORD0_t Word0;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	DBG_RX_ENTER(et131x_dbginfo);</div><div class='add'>+</div><div class='add'>+	/* RX Status block is written by the DMA engine prior to every</div><div class='add'>+	 * interrupt. It contains the next to be used entry in the Packet</div><div class='add'>+	 * Status Ring, and also the two Free Buffer rings.</div><div class='add'>+	 */</div><div class='add'>+	pRxStatusBlock = (PRX_STATUS_BLOCK_t) pRxLocal-&gt;pRxStatusVa;</div><div class='add'>+</div><div class='add'>+	if (pRxStatusBlock-&gt;Word1.bits.PSRoffset ==</div><div class='add'>+			pRxLocal-&gt;local_psr_full.bits.psr_full &amp;&amp;</div><div class='add'>+	    pRxStatusBlock-&gt;Word1.bits.PSRwrap ==</div><div class='add'>+	    		pRxLocal-&gt;local_psr_full.bits.psr_full_wrap) {</div><div class='add'>+		/* Looks like this ring is not updated yet */</div><div class='add'>+		DBG_RX(et131x_dbginfo, "(0)\n");</div><div class='add'>+		DBG_RX_LEAVE(et131x_dbginfo);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* The packet status ring indicates that data is available. */</div><div class='add'>+	pPSREntry = (PPKT_STAT_DESC_t) (pRxLocal-&gt;pPSRingVa) +</div><div class='add'>+			pRxLocal-&gt;local_psr_full.bits.psr_full;</div><div class='add'>+</div><div class='add'>+	/* Grab any information that is required once the PSR is</div><div class='add'>+	 * advanced, since we can no longer rely on the memory being</div><div class='add'>+	 * accurate</div><div class='add'>+	 */</div><div class='add'>+	localLen = pPSREntry-&gt;word1.bits.length;</div><div class='add'>+	ringIndex = (uint8_t) pPSREntry-&gt;word1.bits.ri;</div><div class='add'>+	bufferIndex = (uint16_t) pPSREntry-&gt;word1.bits.bi;</div><div class='add'>+	Word0 = pPSREntry-&gt;word0;</div><div class='add'>+</div><div class='add'>+	DBG_RX(et131x_dbginfo, "RX PACKET STATUS\n");</div><div class='add'>+	DBG_RX(et131x_dbginfo, "\tlength      : %d\n", localLen);</div><div class='add'>+	DBG_RX(et131x_dbginfo, "\tringIndex   : %d\n", ringIndex);</div><div class='add'>+	DBG_RX(et131x_dbginfo, "\tbufferIndex : %d\n", bufferIndex);</div><div class='add'>+	DBG_RX(et131x_dbginfo, "\tword0       : 0x%08x\n", Word0.value);</div><div class='add'>+</div><div class='add'>+#if 0</div><div class='add'>+	/* Check the Status Word that the MAC has appended to the PSR</div><div class='add'>+	 * entry in case the MAC has detected errors.</div><div class='add'>+	 */</div><div class='add'>+	if (Word0.value &amp; ALCATEL_BAD_STATUS) {</div><div class='add'>+		DBG_ERROR(et131x_dbginfo,</div><div class='add'>+			  "NICRxPkts &gt;&gt; Alcatel Status Word error."</div><div class='add'>+			  "Value 0x%08x\n", pPSREntry-&gt;word0.value);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* Indicate that we have used this PSR entry. */</div><div class='add'>+	if (++pRxLocal-&gt;local_psr_full.bits.psr_full &gt;</div><div class='add'>+	    pRxLocal-&gt;PsrNumEntries - 1) {</div><div class='add'>+		pRxLocal-&gt;local_psr_full.bits.psr_full = 0;</div><div class='add'>+		pRxLocal-&gt;local_psr_full.bits.psr_full_wrap ^= 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	writel(pRxLocal-&gt;local_psr_full.value,</div><div class='add'>+	       &amp;pAdapter-&gt;CSRAddress-&gt;rxdma.psr_full_offset.value);</div><div class='add'>+</div><div class='add'>+#ifndef USE_FBR0</div><div class='add'>+	if (ringIndex != 1) {</div><div class='add'>+		DBG_ERROR(et131x_dbginfo,</div><div class='add'>+			  "NICRxPkts PSR Entry %d indicates "</div><div class='add'>+			  "Buffer Ring 0 in use\n",</div><div class='add'>+			  pRxLocal-&gt;local_psr_full.bits.psr_full);</div><div class='add'>+		DBG_RX_LEAVE(et131x_dbginfo);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef USE_FBR0</div><div class='add'>+	if (ringIndex &gt; 1 ||</div><div class='add'>+	    (ringIndex == 0 &amp;&amp;</div><div class='add'>+	     bufferIndex &gt; pRxLocal-&gt;Fbr0NumEntries - 1) ||</div><div class='add'>+	    (ringIndex == 1 &amp;&amp;</div><div class='add'>+	     bufferIndex &gt; pRxLocal-&gt;Fbr1NumEntries - 1))</div><div class='add'>+#else</div><div class='add'>+	if (ringIndex != 1 ||</div><div class='add'>+	    bufferIndex &gt; pRxLocal-&gt;Fbr1NumEntries - 1)</div><div class='add'>+#endif</div><div class='add'>+	{</div><div class='add'>+		/* Illegal buffer or ring index cannot be used by S/W*/</div><div class='add'>+		DBG_ERROR(et131x_dbginfo,</div><div class='add'>+			  "NICRxPkts PSR Entry %d indicates "</div><div class='add'>+			  "length of %d and/or bad bi(%d)\n",</div><div class='add'>+			  pRxLocal-&gt;local_psr_full.bits.psr_full,</div><div class='add'>+			  localLen, bufferIndex);</div><div class='add'>+		DBG_RX_LEAVE(et131x_dbginfo);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Get and fill the RFD. */</div><div class='add'>+	spin_lock_irqsave(&amp;pAdapter-&gt;RcvLock, lockflags);</div><div class='add'>+</div><div class='add'>+	pMpRfd = NULL;</div><div class='add'>+	element = pRxLocal-&gt;RecvList.next;</div><div class='add'>+	pMpRfd = (PMP_RFD) list_entry(element, MP_RFD, list_node);</div><div class='add'>+</div><div class='add'>+	if (pMpRfd == NULL) {</div><div class='add'>+		DBG_RX(et131x_dbginfo,</div><div class='add'>+		       "NULL RFD returned from RecvList via list_entry()\n");</div><div class='add'>+		DBG_RX_LEAVE(et131x_dbginfo);</div><div class='add'>+		spin_unlock_irqrestore(&amp;pAdapter-&gt;RcvLock, lockflags);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_del(&amp;pMpRfd-&gt;list_node);</div><div class='add'>+	pRxLocal-&gt;nReadyRecv--;</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;pAdapter-&gt;RcvLock, lockflags);</div><div class='add'>+</div><div class='add'>+	pMpRfd-&gt;iBufferIndex = bufferIndex;</div><div class='add'>+	pMpRfd-&gt;iRingIndex = ringIndex;</div><div class='add'>+</div><div class='add'>+	/* In V1 silicon, there is a bug which screws up filtering of</div><div class='add'>+	 * runt packets.  Therefore runt packet filtering is disabled</div><div class='add'>+	 * in the MAC and the packets are dropped here.  They are</div><div class='add'>+	 * also counted here.</div><div class='add'>+	 */</div><div class='add'>+	if (localLen &lt; (NIC_MIN_PACKET_SIZE + 4)) {</div><div class='add'>+		pAdapter-&gt;Stats.other_errors++;</div><div class='add'>+		localLen = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (localLen) {</div><div class='add'>+		if (pAdapter-&gt;ReplicaPhyLoopbk == 1) {</div><div class='add'>+			pBufVa = pRxLocal-&gt;Fbr[ringIndex]-&gt;Va[bufferIndex];</div><div class='add'>+</div><div class='add'>+			if (memcmp(&amp;pBufVa[6], &amp;pAdapter-&gt;CurrentAddress[0],</div><div class='add'>+				   ETH_ALEN) == 0) {</div><div class='add'>+				if (memcmp(&amp;pBufVa[42], "Replica packet",</div><div class='add'>+					   ETH_HLEN)) {</div><div class='add'>+					pAdapter-&gt;ReplicaPhyLoopbkPF = 1;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+			DBG_WARNING(et131x_dbginfo,</div><div class='add'>+				    "pBufVa:\t%02x:%02x:%02x:%02x:%02x:%02x\n",</div><div class='add'>+				    pBufVa[6], pBufVa[7], pBufVa[8],</div><div class='add'>+				    pBufVa[9], pBufVa[10], pBufVa[11]);</div><div class='add'>+</div><div class='add'>+			DBG_WARNING(et131x_dbginfo,</div><div class='add'>+				    "CurrentAddr:\t%02x:%02x:%02x:%02x:%02x:%02x\n",</div><div class='add'>+				    pAdapter-&gt;CurrentAddress[0],</div><div class='add'>+				    pAdapter-&gt;CurrentAddress[1],</div><div class='add'>+				    pAdapter-&gt;CurrentAddress[2],</div><div class='add'>+				    pAdapter-&gt;CurrentAddress[3],</div><div class='add'>+				    pAdapter-&gt;CurrentAddress[4],</div><div class='add'>+				    pAdapter-&gt;CurrentAddress[5]);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Determine if this is a multicast packet coming in */</div><div class='add'>+		if ((Word0.value &amp; ALCATEL_MULTICAST_PKT) &amp;&amp;</div><div class='add'>+		    !(Word0.value &amp; ALCATEL_BROADCAST_PKT)) {</div><div class='add'>+			/* Promiscuous mode and Multicast mode are</div><div class='add'>+			 * not mutually exclusive as was first</div><div class='add'>+			 * thought.  I guess Promiscuous is just</div><div class='add'>+			 * considered a super-set of the other</div><div class='add'>+			 * filters. Generally filter is 0x2b when in</div><div class='add'>+			 * promiscuous mode.</div><div class='add'>+			 */</div><div class='add'>+			if ((pAdapter-&gt;PacketFilter &amp; ET131X_PACKET_TYPE_MULTICAST)</div><div class='add'>+			    &amp;&amp; !(pAdapter-&gt;PacketFilter &amp; ET131X_PACKET_TYPE_PROMISCUOUS)</div><div class='add'>+			    &amp;&amp; !(pAdapter-&gt;PacketFilter &amp; ET131X_PACKET_TYPE_ALL_MULTICAST)) {</div><div class='add'>+				pBufVa = pRxLocal-&gt;Fbr[ringIndex]-&gt;</div><div class='add'>+						Va[bufferIndex];</div><div class='add'>+</div><div class='add'>+				/* Loop through our list to see if the</div><div class='add'>+				 * destination address of this packet</div><div class='add'>+				 * matches one in our list.</div><div class='add'>+				 */</div><div class='add'>+				for (nIndex = 0;</div><div class='add'>+				     nIndex &lt; pAdapter-&gt;MCAddressCount;</div><div class='add'>+				     nIndex++) {</div><div class='add'>+					if (pBufVa[0] ==</div><div class='add'>+					    pAdapter-&gt;MCList[nIndex][0]</div><div class='add'>+					    &amp;&amp; pBufVa[1] ==</div><div class='add'>+					    pAdapter-&gt;MCList[nIndex][1]</div><div class='add'>+					    &amp;&amp; pBufVa[2] ==</div><div class='add'>+					    pAdapter-&gt;MCList[nIndex][2]</div><div class='add'>+					    &amp;&amp; pBufVa[3] ==</div><div class='add'>+					    pAdapter-&gt;MCList[nIndex][3]</div><div class='add'>+					    &amp;&amp; pBufVa[4] ==</div><div class='add'>+					    pAdapter-&gt;MCList[nIndex][4]</div><div class='add'>+					    &amp;&amp; pBufVa[5] ==</div><div class='add'>+					    pAdapter-&gt;MCList[nIndex][5]) {</div><div class='add'>+						break;</div><div class='add'>+					}</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+				/* If our index is equal to the number</div><div class='add'>+				 * of Multicast address we have, then</div><div class='add'>+				 * this means we did not find this</div><div class='add'>+				 * packet's matching address in our</div><div class='add'>+				 * list.  Set the PacketSize to zero,</div><div class='add'>+				 * so we free our RFD when we return</div><div class='add'>+				 * from this function.</div><div class='add'>+				 */</div><div class='add'>+				if (nIndex == pAdapter-&gt;MCAddressCount) {</div><div class='add'>+					localLen = 0;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (localLen &gt; 0) {</div><div class='add'>+				pAdapter-&gt;Stats.multircv++;</div><div class='add'>+			}</div><div class='add'>+		} else if (Word0.value &amp; ALCATEL_BROADCAST_PKT) {</div><div class='add'>+			pAdapter-&gt;Stats.brdcstrcv++;</div><div class='add'>+		} else {</div><div class='add'>+			/* Not sure what this counter measures in</div><div class='add'>+			 * promiscuous mode. Perhaps we should check</div><div class='add'>+			 * the MAC address to see if it is directed</div><div class='add'>+			 * to us in promiscuous mode.</div><div class='add'>+			 */</div><div class='add'>+			pAdapter-&gt;Stats.unircv++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (localLen &gt; 0) {</div><div class='add'>+		struct sk_buff *skb = NULL;</div><div class='add'>+</div><div class='add'>+		//pMpRfd-&gt;PacketSize = localLen - 4;</div><div class='add'>+		pMpRfd-&gt;PacketSize = localLen;</div><div class='add'>+</div><div class='add'>+		skb = dev_alloc_skb(pMpRfd-&gt;PacketSize + 2);</div><div class='add'>+		if (!skb) {</div><div class='add'>+			DBG_ERROR(et131x_dbginfo,</div><div class='add'>+				  "Couldn't alloc an SKB for Rx\n");</div><div class='add'>+			DBG_RX_LEAVE(et131x_dbginfo);</div><div class='add'>+			return NULL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		pAdapter-&gt;net_stats.rx_bytes += pMpRfd-&gt;PacketSize;</div><div class='add'>+</div><div class='add'>+		memcpy(skb_put(skb, pMpRfd-&gt;PacketSize),</div><div class='add'>+		       pRxLocal-&gt;Fbr[ringIndex]-&gt;Va[bufferIndex],</div><div class='add'>+		       pMpRfd-&gt;PacketSize);</div><div class='add'>+</div><div class='add'>+		skb-&gt;dev = pAdapter-&gt;netdev;</div><div class='add'>+		skb-&gt;protocol = eth_type_trans(skb, pAdapter-&gt;netdev);</div><div class='add'>+		skb-&gt;ip_summed = CHECKSUM_NONE;</div><div class='add'>+</div><div class='add'>+		netif_rx(skb);</div><div class='add'>+	} else {</div><div class='add'>+		pMpRfd-&gt;PacketSize = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nic_return_rfd(pAdapter, pMpRfd);</div><div class='add'>+</div><div class='add'>+	DBG_RX(et131x_dbginfo, "(1)\n");</div><div class='add'>+	DBG_RX_LEAVE(et131x_dbginfo);</div><div class='add'>+	return pMpRfd;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * et131x_reset_recv - Reset the receive list</div><div class='add'>+ * @pAdapter: pointer to our adapter</div><div class='add'>+ *</div><div class='add'>+ * Assumption, Rcv spinlock has been acquired.</div><div class='add'>+ */</div><div class='add'>+void et131x_reset_recv(struct et131x_adapter *pAdapter)</div><div class='add'>+{</div><div class='add'>+	PMP_RFD pMpRfd;</div><div class='add'>+	struct list_head *element;</div><div class='add'>+</div><div class='add'>+	DBG_ENTER(et131x_dbginfo);</div><div class='add'>+</div><div class='add'>+	DBG_ASSERT(!list_empty(&amp;pAdapter-&gt;RxRing.RecvList));</div><div class='add'>+</div><div class='add'>+	/* Take all the RFD's from the pending list, and stick them on the</div><div class='add'>+	 * RecvList.</div><div class='add'>+	 */</div><div class='add'>+	while (!list_empty(&amp;pAdapter-&gt;RxRing.RecvPendingList)) {</div><div class='add'>+		element = pAdapter-&gt;RxRing.RecvPendingList.next;</div><div class='add'>+</div><div class='add'>+		pMpRfd = (PMP_RFD) list_entry(element, MP_RFD, list_node);</div><div class='add'>+</div><div class='add'>+		list_del(&amp;pMpRfd-&gt;list_node);</div><div class='add'>+		list_add_tail(&amp;pMpRfd-&gt;list_node, &amp;pAdapter-&gt;RxRing.RecvList);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * et131x_handle_recv_interrupt - Interrupt handler for receive processing</div><div class='add'>+ * @pAdapter: pointer to our adapter</div><div class='add'>+ *</div><div class='add'>+ * Assumption, Rcv spinlock has been acquired.</div><div class='add'>+ */</div><div class='add'>+void et131x_handle_recv_interrupt(struct et131x_adapter *pAdapter)</div><div class='add'>+{</div><div class='add'>+	PMP_RFD pMpRfd = NULL;</div><div class='add'>+	struct sk_buff *PacketArray[NUM_PACKETS_HANDLED];</div><div class='add'>+	PMP_RFD RFDFreeArray[NUM_PACKETS_HANDLED];</div><div class='add'>+	uint32_t PacketArrayCount = 0;</div><div class='add'>+	uint32_t PacketsToHandle;</div><div class='add'>+	uint32_t PacketFreeCount = 0;</div><div class='add'>+	bool TempUnfinishedRec = false;</div><div class='add'>+</div><div class='add'>+	DBG_RX_ENTER(et131x_dbginfo);</div><div class='add'>+</div><div class='add'>+	PacketsToHandle = NUM_PACKETS_HANDLED;</div><div class='add'>+</div><div class='add'>+	/* Process up to available RFD's */</div><div class='add'>+	while (PacketArrayCount &lt; PacketsToHandle) {</div><div class='add'>+		if (list_empty(&amp;pAdapter-&gt;RxRing.RecvList)) {</div><div class='add'>+			DBG_ASSERT(pAdapter-&gt;RxRing.nReadyRecv == 0);</div><div class='add'>+			DBG_ERROR(et131x_dbginfo, "NO RFD's !!!!!!!!!!!!!\n");</div><div class='add'>+			TempUnfinishedRec = true;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		pMpRfd = nic_rx_pkts(pAdapter);</div><div class='add'>+</div><div class='add'>+		if (pMpRfd == NULL) {</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Do not receive any packets until a filter has been set.</div><div class='add'>+		 * Do not receive any packets until we are at D0.</div><div class='add'>+		 * Do not receive any packets until we have link.</div><div class='add'>+		 * If length is zero, return the RFD in order to advance the</div><div class='add'>+		 * Free buffer ring.</div><div class='add'>+		 */</div><div class='add'>+		if ((!pAdapter-&gt;PacketFilter) ||</div><div class='add'>+		    (pAdapter-&gt;PoMgmt.PowerState != NdisDeviceStateD0) ||</div><div class='add'>+		    (!MP_LINK_DETECTED(pAdapter)) ||</div><div class='add'>+		    (pMpRfd-&gt;PacketSize == 0)) {</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Increment the number of packets we received */</div><div class='add'>+		pAdapter-&gt;Stats.ipackets++;</div><div class='add'>+</div><div class='add'>+		/* Set the status on the packet, either resources or success */</div><div class='add'>+		if (pAdapter-&gt;RxRing.nReadyRecv &gt;= RFD_LOW_WATER_MARK) {</div><div class='add'>+			/* Put this RFD on the pending list</div><div class='add'>+			 *</div><div class='add'>+			 * NOTE: nic_rx_pkts() above is already returning the</div><div class='add'>+			 * RFD to the RecvList, so don't additionally do that</div><div class='add'>+			 * here.</div><div class='add'>+			 * Besides, we don't really need (at this point) the</div><div class='add'>+			 * pending list anyway.</div><div class='add'>+			 */</div><div class='add'>+			//spin_lock_irqsave( &amp;pAdapter-&gt;RcvPendLock, lockflags );</div><div class='add'>+			//list_add_tail( &amp;pMpRfd-&gt;list_node, &amp;pAdapter-&gt;RxRing.RecvPendingList );</div><div class='add'>+			//spin_unlock_irqrestore( &amp;pAdapter-&gt;RcvPendLock, lockflags );</div><div class='add'>+</div><div class='add'>+			/* Update the number of outstanding Recvs */</div><div class='add'>+			//MP_INC_RCV_REF( pAdapter );</div><div class='add'>+		} else {</div><div class='add'>+			RFDFreeArray[PacketFreeCount] = pMpRfd;</div><div class='add'>+			PacketFreeCount++;</div><div class='add'>+</div><div class='add'>+			DBG_WARNING(et131x_dbginfo,</div><div class='add'>+				    "RFD's are running out !!!!!!!!!!!!!\n");</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		PacketArray[PacketArrayCount] = pMpRfd-&gt;Packet;</div><div class='add'>+		PacketArrayCount++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((PacketArrayCount == NUM_PACKETS_HANDLED) || TempUnfinishedRec) {</div><div class='add'>+		pAdapter-&gt;RxRing.UnfinishedReceives = true;</div><div class='add'>+		writel(pAdapter-&gt;RegistryTxTimeInterval * NANO_IN_A_MICRO,</div><div class='add'>+		       &amp;pAdapter-&gt;CSRAddress-&gt;global.watchdog_timer);</div><div class='add'>+	} else {</div><div class='add'>+		/* Watchdog timer will disable itself if appropriate. */</div><div class='add'>+		pAdapter-&gt;RxRing.UnfinishedReceives = false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBG_RX_LEAVE(et131x_dbginfo);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * NICReturnRFD - Recycle a RFD and put it back onto the receive list</div><div class='add'>+ * @pAdapter: pointer to our adapter</div><div class='add'>+ * @pMpRfd: pointer to the RFD</div><div class='add'>+ */</div><div class='add'>+void nic_return_rfd(struct et131x_adapter *pAdapter, PMP_RFD pMpRfd)</div><div class='add'>+{</div><div class='add'>+	struct _rx_ring_t *pRxLocal = &amp;pAdapter-&gt;RxRing;</div><div class='add'>+	struct _RXDMA_t __iomem *pRxDma = &amp;pAdapter-&gt;CSRAddress-&gt;rxdma;</div><div class='add'>+	uint16_t bi = pMpRfd-&gt;iBufferIndex;</div><div class='add'>+	uint8_t ri = pMpRfd-&gt;iRingIndex;</div><div class='add'>+	unsigned long lockflags;</div><div class='add'>+</div><div class='add'>+	DBG_RX_ENTER(et131x_dbginfo);</div><div class='add'>+</div><div class='add'>+	/* We don't use any of the OOB data besides status. Otherwise, we</div><div class='add'>+	 * need to clean up OOB data</div><div class='add'>+	 */</div><div class='add'>+	if (</div><div class='add'>+#ifdef USE_FBR0</div><div class='add'>+	    (ri == 0 &amp;&amp; bi &lt; pRxLocal-&gt;Fbr0NumEntries) ||</div><div class='add'>+#endif</div><div class='add'>+	    (ri == 1 &amp;&amp; bi &lt; pRxLocal-&gt;Fbr1NumEntries)) {</div><div class='add'>+		spin_lock_irqsave(&amp;pAdapter-&gt;FbrLock, lockflags);</div><div class='add'>+</div><div class='add'>+		if (ri == 1) {</div><div class='add'>+			PFBR_DESC_t pNextDesc =</div><div class='add'>+			    (PFBR_DESC_t) (pRxLocal-&gt;pFbr1RingVa) +</div><div class='add'>+			    pRxLocal-&gt;local_Fbr1_full.bits.val;</div><div class='add'>+</div><div class='add'>+			/* Handle the Free Buffer Ring advancement here. Write</div><div class='add'>+			 * the PA / Buffer Index for the returned buffer into</div><div class='add'>+			 * the oldest (next to be freed)FBR entry</div><div class='add'>+			 */</div><div class='add'>+			pNextDesc-&gt;addr_hi = pRxLocal-&gt;Fbr[1]-&gt;PAHigh[bi];</div><div class='add'>+			pNextDesc-&gt;addr_lo = pRxLocal-&gt;Fbr[1]-&gt;PALow[bi];</div><div class='add'>+			pNextDesc-&gt;word2.value = bi;</div><div class='add'>+</div><div class='add'>+			if (++pRxLocal-&gt;local_Fbr1_full.bits.val &gt;</div><div class='add'>+			    (pRxLocal-&gt;Fbr1NumEntries - 1)) {</div><div class='add'>+				pRxLocal-&gt;local_Fbr1_full.bits.val = 0;</div><div class='add'>+				pRxLocal-&gt;local_Fbr1_full.bits.wrap ^= 1;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			writel(pRxLocal-&gt;local_Fbr1_full.value,</div><div class='add'>+			       &amp;pRxDma-&gt;fbr1_full_offset.value);</div><div class='add'>+		}</div><div class='add'>+#ifdef USE_FBR0</div><div class='add'>+		else {</div><div class='add'>+			PFBR_DESC_t pNextDesc =</div><div class='add'>+			    (PFBR_DESC_t) pRxLocal-&gt;pFbr0RingVa +</div><div class='add'>+			    pRxLocal-&gt;local_Fbr0_full.bits.val;</div><div class='add'>+</div><div class='add'>+			/* Handle the Free Buffer Ring advancement here. Write</div><div class='add'>+			 * the PA / Buffer Index for the returned buffer into</div><div class='add'>+			 * the oldest (next to be freed) FBR entry</div><div class='add'>+			 */</div><div class='add'>+			pNextDesc-&gt;addr_hi = pRxLocal-&gt;Fbr[0]-&gt;PAHigh[bi];</div><div class='add'>+			pNextDesc-&gt;addr_lo = pRxLocal-&gt;Fbr[0]-&gt;PALow[bi];</div><div class='add'>+			pNextDesc-&gt;word2.value = bi;</div><div class='add'>+</div><div class='add'>+			if (++pRxLocal-&gt;local_Fbr0_full.bits.val &gt;</div><div class='add'>+			    (pRxLocal-&gt;Fbr0NumEntries - 1)) {</div><div class='add'>+				pRxLocal-&gt;local_Fbr0_full.bits.val = 0;</div><div class='add'>+				pRxLocal-&gt;local_Fbr0_full.bits.wrap ^= 1;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			writel(pRxLocal-&gt;local_Fbr0_full.value,</div><div class='add'>+			       &amp;pRxDma-&gt;fbr0_full_offset.value);</div><div class='add'>+		}</div><div class='add'>+#endif</div><div class='add'>+		spin_unlock_irqrestore(&amp;pAdapter-&gt;FbrLock, lockflags);</div><div class='add'>+	} else {</div><div class='add'>+		DBG_ERROR(et131x_dbginfo,</div><div class='add'>+			  "NICReturnRFD illegal Buffer Index returned\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* The processing on this RFD is done, so put it back on the tail of</div><div class='add'>+	 * our list</div><div class='add'>+	 */</div><div class='add'>+	spin_lock_irqsave(&amp;pAdapter-&gt;RcvLock, lockflags);</div><div class='add'>+	list_add_tail(&amp;pMpRfd-&gt;list_node, &amp;pRxLocal-&gt;RecvList);</div><div class='add'>+	pRxLocal-&gt;nReadyRecv++;</div><div class='add'>+	spin_unlock_irqrestore(&amp;pAdapter-&gt;RcvLock, lockflags);</div><div class='add'>+</div><div class='add'>+	DBG_ASSERT(pRxLocal-&gt;nReadyRecv &lt;= pRxLocal-&gt;NumRfd);</div><div class='add'>+	DBG_RX_LEAVE(et131x_dbginfo);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/staging/et131x/et1310_rx.h b/drivers/staging/et131x/et1310_rx.h<br/>new file mode 100644<br/>index 000000000000..ea66dbcd8dfc<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/et131x/et1310_rx.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/et131x/et1310_rx.h</a></div><div class='hunk'>@@ -0,0 +1,373 @@</div><div class='add'>+/*</div><div class='add'>+ * Agere Systems Inc.</div><div class='add'>+ * 10/100/1000 Base-T Ethernet Driver for the ET1301 and ET131x series MACs</div><div class='add'>+ *</div><div class='add'>+ * Copyright © 2005 Agere Systems Inc.</div><div class='add'>+ * All rights reserved.</div><div class='add'>+ *   http://www.agere.com</div><div class='add'>+ *</div><div class='add'>+ *------------------------------------------------------------------------------</div><div class='add'>+ *</div><div class='add'>+ * et1310_rx.h - Defines, structs, enums, prototypes, etc. pertaining to data</div><div class='add'>+ *               reception.</div><div class='add'>+ *</div><div class='add'>+ *------------------------------------------------------------------------------</div><div class='add'>+ *</div><div class='add'>+ * SOFTWARE LICENSE</div><div class='add'>+ *</div><div class='add'>+ * This software is provided subject to the following terms and conditions,</div><div class='add'>+ * which you should read carefully before using the software.  Using this</div><div class='add'>+ * software indicates your acceptance of these terms and conditions.  If you do</div><div class='add'>+ * not agree with these terms and conditions, do not use the software.</div><div class='add'>+ *</div><div class='add'>+ * Copyright © 2005 Agere Systems Inc.</div><div class='add'>+ * All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source or binary forms, with or without</div><div class='add'>+ * modifications, are permitted provided that the following conditions are met:</div><div class='add'>+ *</div><div class='add'>+ * . Redistributions of source code must retain the above copyright notice, this</div><div class='add'>+ *    list of conditions and the following Disclaimer as comments in the code as</div><div class='add'>+ *    well as in the documentation and/or other materials provided with the</div><div class='add'>+ *    distribution.</div><div class='add'>+ *</div><div class='add'>+ * . Redistributions in binary form must reproduce the above copyright notice,</div><div class='add'>+ *    this list of conditions and the following Disclaimer in the documentation</div><div class='add'>+ *    and/or other materials provided with the distribution.</div><div class='add'>+ *</div><div class='add'>+ * . Neither the name of Agere Systems Inc. nor the names of the contributors</div><div class='add'>+ *    may be used to endorse or promote products derived from this software</div><div class='add'>+ *    without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ * Disclaimer</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES,</div><div class='add'>+ * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  ANY</div><div class='add'>+ * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN</div><div class='add'>+ * RISK. IN NO EVENT SHALL AGERE SYSTEMS INC. OR CONTRIBUTORS BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, INCLUDING, BUT NOT LIMITED TO, CONTRACT, STRICT</div><div class='add'>+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT</div><div class='add'>+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH</div><div class='add'>+ * DAMAGE.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __ET1310_RX_H__</div><div class='add'>+#define __ET1310_RX_H__</div><div class='add'>+</div><div class='add'>+#include "et1310_address_map.h"</div><div class='add'>+</div><div class='add'>+#define USE_FBR0 true</div><div class='add'>+</div><div class='add'>+#ifdef USE_FBR0</div><div class='add'>+//#define FBR0_BUFFER_SIZE 256</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+//#define FBR1_BUFFER_SIZE 2048</div><div class='add'>+</div><div class='add'>+#define FBR_CHUNKS 32</div><div class='add'>+</div><div class='add'>+#define MAX_DESC_PER_RING_RX         1024</div><div class='add'>+</div><div class='add'>+/* number of RFDs - default and min */</div><div class='add'>+#ifdef USE_FBR0</div><div class='add'>+#define RFD_LOW_WATER_MARK	40</div><div class='add'>+#define NIC_MIN_NUM_RFD		64</div><div class='add'>+#define NIC_DEFAULT_NUM_RFD	1024</div><div class='add'>+#else</div><div class='add'>+#define RFD_LOW_WATER_MARK	20</div><div class='add'>+#define NIC_MIN_NUM_RFD		64</div><div class='add'>+#define NIC_DEFAULT_NUM_RFD	256</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define NUM_PACKETS_HANDLED	256</div><div class='add'>+</div><div class='add'>+#define ALCATEL_BAD_STATUS	0xe47f0000</div><div class='add'>+#define ALCATEL_MULTICAST_PKT	0x01000000</div><div class='add'>+#define ALCATEL_BROADCAST_PKT	0x02000000</div><div class='add'>+</div><div class='add'>+/* typedefs for Free Buffer Descriptors */</div><div class='add'>+typedef union _FBR_WORD2_t {</div><div class='add'>+	u32 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u32 reserved:22;	// bits 10-31</div><div class='add'>+		u32 bi:10;		// bits 0-9(Buffer Index)</div><div class='add'>+#else</div><div class='add'>+		u32 bi:10;		// bits 0-9(Buffer Index)</div><div class='add'>+		u32 reserved:22;	// bit 10-31</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} FBR_WORD2_t, *PFBR_WORD2_t;</div><div class='add'>+</div><div class='add'>+typedef struct _FBR_DESC_t {</div><div class='add'>+	u32 addr_lo;</div><div class='add'>+	u32 addr_hi;</div><div class='add'>+	FBR_WORD2_t word2;</div><div class='add'>+} FBR_DESC_t, *PFBR_DESC_t;</div><div class='add'>+</div><div class='add'>+/* Typedefs for Packet Status Ring Descriptors */</div><div class='add'>+typedef union _PKT_STAT_DESC_WORD0_t {</div><div class='add'>+	u32 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		// top 16 bits are from the Alcatel Status Word as enumerated in</div><div class='add'>+		// PE-MCXMAC Data Sheet IPD DS54 0210-1 (also IPD-DS80 0205-2)</div><div class='add'>+#if 0</div><div class='add'>+		u32 asw_trunc:1;		// bit 31(Rx frame truncated)</div><div class='add'>+#endif</div><div class='add'>+		u32 asw_long_evt:1;	// bit 31(Rx long event)</div><div class='add'>+		u32 asw_VLAN_tag:1;	// bit 30(VLAN tag detected)</div><div class='add'>+		u32 asw_unsupported_op:1;	// bit 29(unsupported OP code)</div><div class='add'>+		u32 asw_pause_frame:1;	// bit 28(is a pause frame)</div><div class='add'>+		u32 asw_control_frame:1;	// bit 27(is a control frame)</div><div class='add'>+		u32 asw_dribble_nibble:1;	// bit 26(spurious bits after EOP)</div><div class='add'>+		u32 asw_broadcast:1;	// bit 25(has a broadcast address)</div><div class='add'>+		u32 asw_multicast:1;	// bit 24(has a multicast address)</div><div class='add'>+		u32 asw_OK:1;		// bit 23(valid CRC + no code error)</div><div class='add'>+		u32 asw_too_long:1;	// bit 22(frame length &gt; 1518 bytes)</div><div class='add'>+		u32 asw_len_chk_err:1;	// bit 21(frame length field incorrect)</div><div class='add'>+		u32 asw_CRC_err:1;		// bit 20(CRC error)</div><div class='add'>+		u32 asw_code_err:1;	// bit 19(one or more nibbles signalled as errors)</div><div class='add'>+		u32 asw_false_carrier_event:1;	// bit 18(bad carrier since last good packet)</div><div class='add'>+		u32 asw_RX_DV_event:1;	// bit 17(short receive event detected)</div><div class='add'>+		u32 asw_prev_pkt_dropped:1;// bit 16(e.g. IFG too small on previous)</div><div class='add'>+		u32 unused:5;		// bits 11-15</div><div class='add'>+		u32 vp:1;			// bit 10(VLAN Packet)</div><div class='add'>+		u32 jp:1;			// bit 9(Jumbo Packet)</div><div class='add'>+		u32 ft:1;			// bit 8(Frame Truncated)</div><div class='add'>+		u32 drop:1;		// bit 7(Drop packet)</div><div class='add'>+		u32 rxmac_error:1;		// bit 6(RXMAC Error Indicator)</div><div class='add'>+		u32 wol:1;			// bit 5(WOL Event)</div><div class='add'>+		u32 tcpp:1;		// bit 4(TCP checksum pass)</div><div class='add'>+		u32 tcpa:1;		// bit 3(TCP checksum assist)</div><div class='add'>+		u32 ipp:1;			// bit 2(IP checksum pass)</div><div class='add'>+		u32 ipa:1;			// bit 1(IP checksum assist)</div><div class='add'>+		u32 hp:1;			// bit 0(hash pass)</div><div class='add'>+#else</div><div class='add'>+		u32 hp:1;			// bit 0(hash pass)</div><div class='add'>+		u32 ipa:1;			// bit 1(IP checksum assist)</div><div class='add'>+		u32 ipp:1;			// bit 2(IP checksum pass)</div><div class='add'>+		u32 tcpa:1;		// bit 3(TCP checksum assist)</div><div class='add'>+		u32 tcpp:1;		// bit 4(TCP checksum pass)</div><div class='add'>+		u32 wol:1;			// bit 5(WOL Event)</div><div class='add'>+		u32 rxmac_error:1;		// bit 6(RXMAC Error Indicator)</div><div class='add'>+		u32 drop:1;		// bit 7(Drop packet)</div><div class='add'>+		u32 ft:1;			// bit 8(Frame Truncated)</div><div class='add'>+		u32 jp:1;			// bit 9(Jumbo Packet)</div><div class='add'>+		u32 vp:1;			// bit 10(VLAN Packet)</div><div class='add'>+		u32 unused:5;		// bits 11-15</div><div class='add'>+		u32 asw_prev_pkt_dropped:1;// bit 16(e.g. IFG too small on previous)</div><div class='add'>+		u32 asw_RX_DV_event:1;	// bit 17(short receive event detected)</div><div class='add'>+		u32 asw_false_carrier_event:1;	// bit 18(bad carrier since last good packet)</div><div class='add'>+		u32 asw_code_err:1;	// bit 19(one or more nibbles signalled as errors)</div><div class='add'>+		u32 asw_CRC_err:1;		// bit 20(CRC error)</div><div class='add'>+		u32 asw_len_chk_err:1;	// bit 21(frame length field incorrect)</div><div class='add'>+		u32 asw_too_long:1;	// bit 22(frame length &gt; 1518 bytes)</div><div class='add'>+		u32 asw_OK:1;		// bit 23(valid CRC + no code error)</div><div class='add'>+		u32 asw_multicast:1;	// bit 24(has a multicast address)</div><div class='add'>+		u32 asw_broadcast:1;	// bit 25(has a broadcast address)</div><div class='add'>+		u32 asw_dribble_nibble:1;	// bit 26(spurious bits after EOP)</div><div class='add'>+		u32 asw_control_frame:1;	// bit 27(is a control frame)</div><div class='add'>+		u32 asw_pause_frame:1;	// bit 28(is a pause frame)</div><div class='add'>+		u32 asw_unsupported_op:1;	// bit 29(unsupported OP code)</div><div class='add'>+		u32 asw_VLAN_tag:1;	// bit 30(VLAN tag detected)</div><div class='add'>+		u32 asw_long_evt:1;	// bit 31(Rx long event)</div><div class='add'>+#if 0</div><div class='add'>+		u32 asw_trunc:1;		// bit 31(Rx frame truncated)</div><div class='add'>+#endif</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} PKT_STAT_DESC_WORD0_t, *PPKT_STAT_WORD0_t;</div><div class='add'>+</div><div class='add'>+typedef union _PKT_STAT_DESC_WORD1_t {</div><div class='add'>+	u32 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u32 unused:4;	// bits 28-31</div><div class='add'>+		u32 ri:2;		// bits 26-27(Ring Index)</div><div class='add'>+		u32 bi:10;		// bits 16-25(Buffer Index)</div><div class='add'>+		u32 length:16;	// bit 0-15(length in bytes)</div><div class='add'>+#else</div><div class='add'>+		u32 length:16;	// bit 0-15(length in bytes)</div><div class='add'>+		u32 bi:10;		// bits 16-25(Buffer Index)</div><div class='add'>+		u32 ri:2;		// bits 26-27(Ring Index)</div><div class='add'>+		u32 unused:4;	// bits 28-31</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} PKT_STAT_DESC_WORD1_t, *PPKT_STAT_WORD1_t;</div><div class='add'>+</div><div class='add'>+typedef struct _PKT_STAT_DESC_t {</div><div class='add'>+	PKT_STAT_DESC_WORD0_t word0;</div><div class='add'>+	PKT_STAT_DESC_WORD1_t word1;</div><div class='add'>+} PKT_STAT_DESC_t, *PPKT_STAT_DESC_t;</div><div class='add'>+</div><div class='add'>+/* Typedefs for the RX DMA status word */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * RXSTAT_WORD0_t structure holds part of the status bits of the Rx DMA engine</div><div class='add'>+ * that get copied out to memory by the ET-1310.  Word 0 is a 32 bit word</div><div class='add'>+ * whichcontains Free Buffer ring 0 and 1 available offset.</div><div class='add'>+ */</div><div class='add'>+typedef union _rxstat_word0_t {</div><div class='add'>+	u32 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u32 FBR1unused:5;	// bits 27-31</div><div class='add'>+		u32 FBR1wrap:1;	// bit 26</div><div class='add'>+		u32 FBR1offset:10;	// bits 16-25</div><div class='add'>+		u32 FBR0unused:5;	// bits 11-15</div><div class='add'>+		u32 FBR0wrap:1;	// bit 10</div><div class='add'>+		u32 FBR0offset:10;	// bits 0-9</div><div class='add'>+#else</div><div class='add'>+		u32 FBR0offset:10;	// bits 0-9</div><div class='add'>+		u32 FBR0wrap:1;	// bit 10</div><div class='add'>+		u32 FBR0unused:5;	// bits 11-15</div><div class='add'>+		u32 FBR1offset:10;	// bits 16-25</div><div class='add'>+		u32 FBR1wrap:1;	// bit 26</div><div class='add'>+		u32 FBR1unused:5;	// bits 27-31</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} RXSTAT_WORD0_t, *PRXSTAT_WORD0_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * RXSTAT_WORD1_t structure holds part of the status bits of the Rx DMA engine</div><div class='add'>+ * that get copied out to memory by the ET-1310.  Word 3 is a 32 bit word</div><div class='add'>+ * which contains the Packet Status Ring available offset.</div><div class='add'>+ */</div><div class='add'>+typedef union _rxstat_word1_t {</div><div class='add'>+	u32 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u32 PSRunused:3;	// bits 29-31</div><div class='add'>+		u32 PSRwrap:1;	// bit 28</div><div class='add'>+		u32 PSRoffset:12;	// bits 16-27</div><div class='add'>+		u32 reserved:16;	// bits 0-15</div><div class='add'>+#else</div><div class='add'>+		u32 reserved:16;	// bits 0-15</div><div class='add'>+		u32 PSRoffset:12;	// bits 16-27</div><div class='add'>+		u32 PSRwrap:1;	// bit 28</div><div class='add'>+		u32 PSRunused:3;	// bits 29-31</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} RXSTAT_WORD1_t, *PRXSTAT_WORD1_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * RX_STATUS_BLOCK_t is sructure representing the status of the Rx DMA engine</div><div class='add'>+ * it sits in free memory, and is pointed to by 0x101c / 0x1020</div><div class='add'>+ */</div><div class='add'>+typedef struct _rx_status_block_t {</div><div class='add'>+	RXSTAT_WORD0_t Word0;</div><div class='add'>+	RXSTAT_WORD1_t Word1;</div><div class='add'>+} RX_STATUS_BLOCK_t, *PRX_STATUS_BLOCK_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Structure for look-up table holding free buffer ring pointers</div><div class='add'>+ */</div><div class='add'>+typedef struct _FbrLookupTable {</div><div class='add'>+	void *Va[MAX_DESC_PER_RING_RX];</div><div class='add'>+	void *Buffer1[MAX_DESC_PER_RING_RX];</div><div class='add'>+	void *Buffer2[MAX_DESC_PER_RING_RX];</div><div class='add'>+	u32 PAHigh[MAX_DESC_PER_RING_RX];</div><div class='add'>+	u32 PALow[MAX_DESC_PER_RING_RX];</div><div class='add'>+} FBRLOOKUPTABLE, *PFBRLOOKUPTABLE;</div><div class='add'>+</div><div class='add'>+typedef enum {</div><div class='add'>+	ONE_PACKET_INTERRUPT,</div><div class='add'>+	FOUR_PACKET_INTERRUPT</div><div class='add'>+} eRX_INTERRUPT_STATE_t, *PeRX_INTERRUPT_STATE_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Structure to hold the skb's in a list</div><div class='add'>+ */</div><div class='add'>+typedef struct rx_skb_list_elem {</div><div class='add'>+	struct list_head skb_list_elem;</div><div class='add'>+	dma_addr_t dma_addr;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+} RX_SKB_LIST_ELEM, *PRX_SKB_LIST_ELEM;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * RX_RING_t is sructure representing the adaptor's local reference(s) to the</div><div class='add'>+ * rings</div><div class='add'>+ */</div><div class='add'>+typedef struct _rx_ring_t {</div><div class='add'>+#ifdef USE_FBR0</div><div class='add'>+	void *pFbr0RingVa;</div><div class='add'>+	dma_addr_t pFbr0RingPa;</div><div class='add'>+	void *Fbr0MemVa[MAX_DESC_PER_RING_RX / FBR_CHUNKS];</div><div class='add'>+	dma_addr_t Fbr0MemPa[MAX_DESC_PER_RING_RX / FBR_CHUNKS];</div><div class='add'>+	uint64_t Fbr0Realpa;</div><div class='add'>+	uint64_t Fbr0offset;</div><div class='add'>+	DMA10W_t local_Fbr0_full;</div><div class='add'>+	u32 Fbr0NumEntries;</div><div class='add'>+	u32 Fbr0BufferSize;</div><div class='add'>+#endif</div><div class='add'>+	void *pFbr1RingVa;</div><div class='add'>+	dma_addr_t pFbr1RingPa;</div><div class='add'>+	void *Fbr1MemVa[MAX_DESC_PER_RING_RX / FBR_CHUNKS];</div><div class='add'>+	dma_addr_t Fbr1MemPa[MAX_DESC_PER_RING_RX / FBR_CHUNKS];</div><div class='add'>+	uint64_t Fbr1Realpa;</div><div class='add'>+	uint64_t Fbr1offset;</div><div class='add'>+	FBRLOOKUPTABLE *Fbr[2];</div><div class='add'>+	DMA10W_t local_Fbr1_full;</div><div class='add'>+	u32 Fbr1NumEntries;</div><div class='add'>+	u32 Fbr1BufferSize;</div><div class='add'>+</div><div class='add'>+	void *pPSRingVa;</div><div class='add'>+	dma_addr_t pPSRingPa;</div><div class='add'>+	uint64_t pPSRingRealPa;</div><div class='add'>+	uint64_t pPSRingOffset;</div><div class='add'>+	RXDMA_PSR_FULL_OFFSET_t local_psr_full;</div><div class='add'>+	u32 PsrNumEntries;</div><div class='add'>+</div><div class='add'>+	void *pRxStatusVa;</div><div class='add'>+	dma_addr_t pRxStatusPa;</div><div class='add'>+	uint64_t RxStatusRealPA;</div><div class='add'>+	uint64_t RxStatusOffset;</div><div class='add'>+</div><div class='add'>+	struct list_head RecvBufferPool;</div><div class='add'>+</div><div class='add'>+	/* RECV */</div><div class='add'>+	struct list_head RecvList;</div><div class='add'>+	struct list_head RecvPendingList;</div><div class='add'>+	u32 nReadyRecv;</div><div class='add'>+</div><div class='add'>+	u32 NumRfd;</div><div class='add'>+</div><div class='add'>+	bool UnfinishedReceives;</div><div class='add'>+</div><div class='add'>+	struct list_head RecvPacketPool;</div><div class='add'>+</div><div class='add'>+	/* lookaside lists */</div><div class='add'>+	struct kmem_cache *RecvLookaside;</div><div class='add'>+} RX_RING_t, *PRX_RING_t;</div><div class='add'>+</div><div class='add'>+/* Forward reference of RFD */</div><div class='add'>+struct _MP_RFD;</div><div class='add'>+</div><div class='add'>+/* Forward declaration of the private adapter structure */</div><div class='add'>+struct et131x_adapter;</div><div class='add'>+</div><div class='add'>+/* PROTOTYPES for Initialization */</div><div class='add'>+int et131x_rx_dma_memory_alloc(struct et131x_adapter *adapter);</div><div class='add'>+void et131x_rx_dma_memory_free(struct et131x_adapter *adapter);</div><div class='add'>+int et131x_rfd_resources_alloc(struct et131x_adapter *adapter,</div><div class='add'>+			       struct _MP_RFD *pMpRfd);</div><div class='add'>+void et131x_rfd_resources_free(struct et131x_adapter *adapter,</div><div class='add'>+			       struct _MP_RFD *pMpRfd);</div><div class='add'>+int et131x_init_recv(struct et131x_adapter *adapter);</div><div class='add'>+</div><div class='add'>+void ConfigRxDmaRegs(struct et131x_adapter *adapter);</div><div class='add'>+void SetRxDmaTimer(struct et131x_adapter *adapter);</div><div class='add'>+void et131x_rx_dma_disable(struct et131x_adapter *adapter);</div><div class='add'>+void et131x_rx_dma_enable(struct et131x_adapter *adapter);</div><div class='add'>+</div><div class='add'>+void et131x_reset_recv(struct et131x_adapter *adapter);</div><div class='add'>+</div><div class='add'>+void et131x_handle_recv_interrupt(struct et131x_adapter *adapter);</div><div class='add'>+</div><div class='add'>+#endif /* __ET1310_RX_H__ */</div><div class='head'>diff --git a/drivers/staging/et131x/et1310_tx.c b/drivers/staging/et131x/et1310_tx.c<br/>new file mode 100644<br/>index 000000000000..a95c2608a0c0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/et131x/et1310_tx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/et131x/et1310_tx.c</a></div><div class='hunk'>@@ -0,0 +1,1525 @@</div><div class='add'>+/*</div><div class='add'>+ * Agere Systems Inc.</div><div class='add'>+ * 10/100/1000 Base-T Ethernet Driver for the ET1301 and ET131x series MACs</div><div class='add'>+ *</div><div class='add'>+ * Copyright © 2005 Agere Systems Inc.</div><div class='add'>+ * All rights reserved.</div><div class='add'>+ *   http://www.agere.com</div><div class='add'>+ *</div><div class='add'>+ *------------------------------------------------------------------------------</div><div class='add'>+ *</div><div class='add'>+ * et1310_tx.c - Routines used to perform data transmission.</div><div class='add'>+ *</div><div class='add'>+ *------------------------------------------------------------------------------</div><div class='add'>+ *</div><div class='add'>+ * SOFTWARE LICENSE</div><div class='add'>+ *</div><div class='add'>+ * This software is provided subject to the following terms and conditions,</div><div class='add'>+ * which you should read carefully before using the software.  Using this</div><div class='add'>+ * software indicates your acceptance of these terms and conditions.  If you do</div><div class='add'>+ * not agree with these terms and conditions, do not use the software.</div><div class='add'>+ *</div><div class='add'>+ * Copyright © 2005 Agere Systems Inc.</div><div class='add'>+ * All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source or binary forms, with or without</div><div class='add'>+ * modifications, are permitted provided that the following conditions are met:</div><div class='add'>+ *</div><div class='add'>+ * . Redistributions of source code must retain the above copyright notice, this</div><div class='add'>+ *    list of conditions and the following Disclaimer as comments in the code as</div><div class='add'>+ *    well as in the documentation and/or other materials provided with the</div><div class='add'>+ *    distribution.</div><div class='add'>+ *</div><div class='add'>+ * . Redistributions in binary form must reproduce the above copyright notice,</div><div class='add'>+ *    this list of conditions and the following Disclaimer in the documentation</div><div class='add'>+ *    and/or other materials provided with the distribution.</div><div class='add'>+ *</div><div class='add'>+ * . Neither the name of Agere Systems Inc. nor the names of the contributors</div><div class='add'>+ *    may be used to endorse or promote products derived from this software</div><div class='add'>+ *    without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ * Disclaimer</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES,</div><div class='add'>+ * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  ANY</div><div class='add'>+ * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN</div><div class='add'>+ * RISK. IN NO EVENT SHALL AGERE SYSTEMS INC. OR CONTRIBUTORS BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, INCLUDING, BUT NOT LIMITED TO, CONTRACT, STRICT</div><div class='add'>+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT</div><div class='add'>+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH</div><div class='add'>+ * DAMAGE.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "et131x_version.h"</div><div class='add'>+#include "et131x_debug.h"</div><div class='add'>+#include "et131x_defs.h"</div><div class='add'>+</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/ptrace.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/ctype.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/timer.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/in.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/system.h&gt;</div><div class='add'>+#include &lt;asm/bitops.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/if_arp.h&gt;</div><div class='add'>+#include &lt;linux/ioport.h&gt;</div><div class='add'>+</div><div class='add'>+#include "et1310_phy.h"</div><div class='add'>+#include "et1310_pm.h"</div><div class='add'>+#include "et1310_jagcore.h"</div><div class='add'>+</div><div class='add'>+#include "et131x_adapter.h"</div><div class='add'>+#include "et131x_initpci.h"</div><div class='add'>+#include "et131x_isr.h"</div><div class='add'>+</div><div class='add'>+#include "et1310_tx.h"</div><div class='add'>+</div><div class='add'>+/* Data for debugging facilities */</div><div class='add'>+#ifdef CONFIG_ET131X_DEBUG</div><div class='add'>+extern dbg_info_t *et131x_dbginfo;</div><div class='add'>+#endif /* CONFIG_ET131X_DEBUG */</div><div class='add'>+</div><div class='add'>+static void et131x_update_tcb_list(struct et131x_adapter *pAdapter);</div><div class='add'>+static void et131x_check_send_wait_list(struct et131x_adapter *pAdapter);</div><div class='add'>+static inline void et131x_free_send_packet(struct et131x_adapter *pAdapter,</div><div class='add'>+					   PMP_TCB pMpTcb);</div><div class='add'>+static int et131x_send_packet(struct sk_buff *skb,</div><div class='add'>+			      struct et131x_adapter *pAdapter);</div><div class='add'>+static int nic_send_packet(struct et131x_adapter *pAdapter, PMP_TCB pMpTcb);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * et131x_tx_dma_memory_alloc</div><div class='add'>+ * @adapter: pointer to our private adapter structure</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 on success and errno on failure (as defined in errno.h).</div><div class='add'>+ *</div><div class='add'>+ * Allocates memory that will be visible both to the device and to the CPU.</div><div class='add'>+ * The OS will pass us packets, pointers to which we will insert in the Tx</div><div class='add'>+ * Descriptor queue. The device will read this queue to find the packets in</div><div class='add'>+ * memory. The device will update the "status" in memory each time it xmits a</div><div class='add'>+ * packet.</div><div class='add'>+ */</div><div class='add'>+int et131x_tx_dma_memory_alloc(struct et131x_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	int desc_size = 0;</div><div class='add'>+	TX_RING_t *tx_ring = &amp;adapter-&gt;TxRing;</div><div class='add'>+</div><div class='add'>+	DBG_ENTER(et131x_dbginfo);</div><div class='add'>+</div><div class='add'>+	/* Allocate memory for the TCB's (Transmit Control Block) */</div><div class='add'>+	adapter-&gt;TxRing.MpTcbMem = (MP_TCB *) kcalloc(NUM_TCB, sizeof(MP_TCB),</div><div class='add'>+						      GFP_ATOMIC | GFP_DMA);</div><div class='add'>+	if (!adapter-&gt;TxRing.MpTcbMem) {</div><div class='add'>+		DBG_ERROR(et131x_dbginfo, "Cannot alloc memory for TCBs\n");</div><div class='add'>+		DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Allocate enough memory for the Tx descriptor ring, and allocate</div><div class='add'>+	 * some extra so that the ring can be aligned on a 4k boundary.</div><div class='add'>+	 */</div><div class='add'>+	desc_size = (sizeof(TX_DESC_ENTRY_t) * NUM_DESC_PER_RING_TX) + 4096 - 1;</div><div class='add'>+	tx_ring-&gt;pTxDescRingVa =</div><div class='add'>+	    (PTX_DESC_ENTRY_t) pci_alloc_consistent(adapter-&gt;pdev, desc_size,</div><div class='add'>+						    &amp;tx_ring-&gt;pTxDescRingPa);</div><div class='add'>+	if (!adapter-&gt;TxRing.pTxDescRingVa) {</div><div class='add'>+		DBG_ERROR(et131x_dbginfo, "Cannot alloc memory for Tx Ring\n");</div><div class='add'>+		DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Save physical address</div><div class='add'>+	 *</div><div class='add'>+	 * NOTE: pci_alloc_consistent(), used above to alloc DMA regions,</div><div class='add'>+	 * ALWAYS returns SAC (32-bit) addresses. If DAC (64-bit) addresses</div><div class='add'>+	 * are ever returned, make sure the high part is retrieved here before</div><div class='add'>+	 * storing the adjusted address.</div><div class='add'>+	 */</div><div class='add'>+	tx_ring-&gt;pTxDescRingAdjustedPa = tx_ring-&gt;pTxDescRingPa;</div><div class='add'>+</div><div class='add'>+	/* Align Tx Descriptor Ring on a 4k (0x1000) byte boundary */</div><div class='add'>+	et131x_align_allocated_memory(adapter,</div><div class='add'>+				      &amp;tx_ring-&gt;pTxDescRingAdjustedPa,</div><div class='add'>+				      &amp;tx_ring-&gt;TxDescOffset, 0x0FFF);</div><div class='add'>+</div><div class='add'>+	tx_ring-&gt;pTxDescRingVa += tx_ring-&gt;TxDescOffset;</div><div class='add'>+</div><div class='add'>+	/* Allocate memory for the Tx status block */</div><div class='add'>+	tx_ring-&gt;pTxStatusVa = pci_alloc_consistent(adapter-&gt;pdev,</div><div class='add'>+						    sizeof(TX_STATUS_BLOCK_t),</div><div class='add'>+						    &amp;tx_ring-&gt;pTxStatusPa);</div><div class='add'>+	if (!adapter-&gt;TxRing.pTxStatusPa) {</div><div class='add'>+		DBG_ERROR(et131x_dbginfo,</div><div class='add'>+			  "Cannot alloc memory for Tx status block\n");</div><div class='add'>+		DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Allocate memory for a dummy buffer */</div><div class='add'>+	tx_ring-&gt;pTxDummyBlkVa = pci_alloc_consistent(adapter-&gt;pdev,</div><div class='add'>+						      NIC_MIN_PACKET_SIZE,</div><div class='add'>+						      &amp;tx_ring-&gt;pTxDummyBlkPa);</div><div class='add'>+	if (!adapter-&gt;TxRing.pTxDummyBlkPa) {</div><div class='add'>+		DBG_ERROR(et131x_dbginfo,</div><div class='add'>+			  "Cannot alloc memory for Tx dummy buffer\n");</div><div class='add'>+		DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * et131x_tx_dma_memory_free - Free all memory allocated within this module</div><div class='add'>+ * @adapter: pointer to our private adapter structure</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 on success and errno on failure (as defined in errno.h).</div><div class='add'>+ */</div><div class='add'>+void et131x_tx_dma_memory_free(struct et131x_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	int desc_size = 0;</div><div class='add'>+</div><div class='add'>+	DBG_ENTER(et131x_dbginfo);</div><div class='add'>+</div><div class='add'>+	if (adapter-&gt;TxRing.pTxDescRingVa) {</div><div class='add'>+		/* Free memory relating to Tx rings here */</div><div class='add'>+		adapter-&gt;TxRing.pTxDescRingVa -= adapter-&gt;TxRing.TxDescOffset;</div><div class='add'>+</div><div class='add'>+		desc_size =</div><div class='add'>+		    (sizeof(TX_DESC_ENTRY_t) * NUM_DESC_PER_RING_TX) + 4096 - 1;</div><div class='add'>+</div><div class='add'>+		pci_free_consistent(adapter-&gt;pdev,</div><div class='add'>+				    desc_size,</div><div class='add'>+				    adapter-&gt;TxRing.pTxDescRingVa,</div><div class='add'>+				    adapter-&gt;TxRing.pTxDescRingPa);</div><div class='add'>+</div><div class='add'>+		adapter-&gt;TxRing.pTxDescRingVa = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Free memory for the Tx status block */</div><div class='add'>+	if (adapter-&gt;TxRing.pTxStatusVa) {</div><div class='add'>+		pci_free_consistent(adapter-&gt;pdev,</div><div class='add'>+				    sizeof(TX_STATUS_BLOCK_t),</div><div class='add'>+				    adapter-&gt;TxRing.pTxStatusVa,</div><div class='add'>+				    adapter-&gt;TxRing.pTxStatusPa);</div><div class='add'>+</div><div class='add'>+		adapter-&gt;TxRing.pTxStatusVa = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Free memory for the dummy buffer */</div><div class='add'>+	if (adapter-&gt;TxRing.pTxDummyBlkVa) {</div><div class='add'>+		pci_free_consistent(adapter-&gt;pdev,</div><div class='add'>+				    NIC_MIN_PACKET_SIZE,</div><div class='add'>+				    adapter-&gt;TxRing.pTxDummyBlkVa,</div><div class='add'>+				    adapter-&gt;TxRing.pTxDummyBlkPa);</div><div class='add'>+</div><div class='add'>+		adapter-&gt;TxRing.pTxDummyBlkVa = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Free the memory for MP_TCB structures */</div><div class='add'>+	if (adapter-&gt;TxRing.MpTcbMem) {</div><div class='add'>+		kfree(adapter-&gt;TxRing.MpTcbMem);</div><div class='add'>+		adapter-&gt;TxRing.MpTcbMem = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ConfigTxDmaRegs - Set up the tx dma section of the JAGCore.</div><div class='add'>+ * @adapter: pointer to our private adapter structure</div><div class='add'>+ */</div><div class='add'>+void ConfigTxDmaRegs(struct et131x_adapter *pAdapter)</div><div class='add'>+{</div><div class='add'>+	struct _TXDMA_t __iomem *pTxDma = &amp;pAdapter-&gt;CSRAddress-&gt;txdma;</div><div class='add'>+</div><div class='add'>+	DBG_ENTER(et131x_dbginfo);</div><div class='add'>+</div><div class='add'>+	/* Load the hardware with the start of the transmit descriptor ring. */</div><div class='add'>+	writel((uint32_t) (pAdapter-&gt;TxRing.pTxDescRingAdjustedPa &gt;&gt; 32),</div><div class='add'>+	       &amp;pTxDma-&gt;pr_base_hi);</div><div class='add'>+	writel((uint32_t) pAdapter-&gt;TxRing.pTxDescRingAdjustedPa,</div><div class='add'>+	       &amp;pTxDma-&gt;pr_base_lo);</div><div class='add'>+</div><div class='add'>+	/* Initialise the transmit DMA engine */</div><div class='add'>+	writel(NUM_DESC_PER_RING_TX - 1, &amp;pTxDma-&gt;pr_num_des.value);</div><div class='add'>+</div><div class='add'>+	/* Load the completion writeback physical address</div><div class='add'>+	 *</div><div class='add'>+	 * NOTE: pci_alloc_consistent(), used above to alloc DMA regions,</div><div class='add'>+	 * ALWAYS returns SAC (32-bit) addresses. If DAC (64-bit) addresses</div><div class='add'>+	 * are ever returned, make sure the high part is retrieved here before</div><div class='add'>+	 * storing the adjusted address.</div><div class='add'>+	 */</div><div class='add'>+	writel(0, &amp;pTxDma-&gt;dma_wb_base_hi);</div><div class='add'>+	writel(pAdapter-&gt;TxRing.pTxStatusPa, &amp;pTxDma-&gt;dma_wb_base_lo);</div><div class='add'>+</div><div class='add'>+	memset(pAdapter-&gt;TxRing.pTxStatusVa, 0, sizeof(TX_STATUS_BLOCK_t));</div><div class='add'>+</div><div class='add'>+	writel(0, &amp;pTxDma-&gt;service_request.value);</div><div class='add'>+	pAdapter-&gt;TxRing.txDmaReadyToSend.value = 0;</div><div class='add'>+</div><div class='add'>+	DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * et131x_tx_dma_disable - Stop of Tx_DMA on the ET1310</div><div class='add'>+ * @pAdapter: pointer to our adapter structure</div><div class='add'>+ */</div><div class='add'>+void et131x_tx_dma_disable(struct et131x_adapter *pAdapter)</div><div class='add'>+{</div><div class='add'>+	DBG_ENTER(et131x_dbginfo);</div><div class='add'>+</div><div class='add'>+	/* Setup the tramsmit dma configuration register */</div><div class='add'>+	writel(0x101, &amp;pAdapter-&gt;CSRAddress-&gt;txdma.csr.value);</div><div class='add'>+</div><div class='add'>+	DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * et131x_tx_dma_enable - re-start of Tx_DMA on the ET1310.</div><div class='add'>+ * @pAdapter: pointer to our adapter structure</div><div class='add'>+ *</div><div class='add'>+ * Mainly used after a return to the D0 (full-power) state from a lower state.</div><div class='add'>+ */</div><div class='add'>+void et131x_tx_dma_enable(struct et131x_adapter *pAdapter)</div><div class='add'>+{</div><div class='add'>+	DBG_ENTER(et131x_dbginfo);</div><div class='add'>+</div><div class='add'>+	if (pAdapter-&gt;RegistryPhyLoopbk) {</div><div class='add'>+	/* TxDMA is disabled for loopback operation. */</div><div class='add'>+		writel(0x101, &amp;pAdapter-&gt;CSRAddress-&gt;txdma.csr.value);</div><div class='add'>+	} else {</div><div class='add'>+		TXDMA_CSR_t csr = { 0 };</div><div class='add'>+</div><div class='add'>+		/* Setup the transmit dma configuration register for normal</div><div class='add'>+		 * operation</div><div class='add'>+		 */</div><div class='add'>+		csr.bits.sngl_epkt_mode = 1;</div><div class='add'>+		csr.bits.halt = 0;</div><div class='add'>+		csr.bits.cache_thrshld = pAdapter-&gt;RegistryDMACache;</div><div class='add'>+		writel(csr.value, &amp;pAdapter-&gt;CSRAddress-&gt;txdma.csr.value);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * et131x_init_send - Initialize send data structures</div><div class='add'>+ * @adapter: pointer to our private adapter structure</div><div class='add'>+ */</div><div class='add'>+void et131x_init_send(struct et131x_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	PMP_TCB pMpTcb;</div><div class='add'>+	uint32_t TcbCount;</div><div class='add'>+	TX_RING_t *tx_ring;</div><div class='add'>+</div><div class='add'>+	DBG_ENTER(et131x_dbginfo);</div><div class='add'>+</div><div class='add'>+	/* Setup some convenience pointers */</div><div class='add'>+	tx_ring = &amp;adapter-&gt;TxRing;</div><div class='add'>+	pMpTcb = adapter-&gt;TxRing.MpTcbMem;</div><div class='add'>+</div><div class='add'>+	tx_ring-&gt;TCBReadyQueueHead = pMpTcb;</div><div class='add'>+</div><div class='add'>+	/* Go through and set up each TCB */</div><div class='add'>+	for (TcbCount = 0; TcbCount &lt; NUM_TCB; TcbCount++) {</div><div class='add'>+		memset(pMpTcb, 0, sizeof(MP_TCB));</div><div class='add'>+</div><div class='add'>+		/* Set the link pointer in HW TCB to the next TCB in the</div><div class='add'>+		 * chain.  If this is the last TCB in the chain, also set the</div><div class='add'>+		 * tail pointer.</div><div class='add'>+		 */</div><div class='add'>+		if (TcbCount &lt; NUM_TCB - 1) {</div><div class='add'>+			pMpTcb-&gt;Next = pMpTcb + 1;</div><div class='add'>+		} else {</div><div class='add'>+			tx_ring-&gt;TCBReadyQueueTail = pMpTcb;</div><div class='add'>+			pMpTcb-&gt;Next = (PMP_TCB) NULL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		pMpTcb++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Curr send queue should now be empty */</div><div class='add'>+	tx_ring-&gt;CurrSendHead = (PMP_TCB) NULL;</div><div class='add'>+	tx_ring-&gt;CurrSendTail = (PMP_TCB) NULL;</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;adapter-&gt;TxRing.SendWaitQueue);</div><div class='add'>+</div><div class='add'>+	DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * et131x_send_packets - This function is called by the OS to send packets</div><div class='add'>+ * @skb: the packet(s) to send</div><div class='add'>+ * @netdev:device on which to TX the above packet(s)</div><div class='add'>+ *</div><div class='add'>+ * Return 0 in almost all cases; non-zero value in extreme hard failure only</div><div class='add'>+ */</div><div class='add'>+int et131x_send_packets(struct sk_buff *skb, struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	int status = 0;</div><div class='add'>+	struct et131x_adapter *pAdapter = NULL;</div><div class='add'>+</div><div class='add'>+	DBG_TX_ENTER(et131x_dbginfo);</div><div class='add'>+</div><div class='add'>+	pAdapter = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	/* Send these packets</div><div class='add'>+	 *</div><div class='add'>+	 * NOTE: The Linux Tx entry point is only given one packet at a time</div><div class='add'>+	 * to Tx, so the PacketCount and it's array used makes no sense here</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* Queue is not empty or TCB is not available */</div><div class='add'>+	if (!list_empty(&amp;pAdapter-&gt;TxRing.SendWaitQueue) ||</div><div class='add'>+	    MP_TCB_RESOURCES_NOT_AVAILABLE(pAdapter)) {</div><div class='add'>+		/* NOTE: If there's an error on send, no need to queue the</div><div class='add'>+		 * packet under Linux; if we just send an error up to the</div><div class='add'>+		 * netif layer, it will resend the skb to us.</div><div class='add'>+		 */</div><div class='add'>+		DBG_VERBOSE(et131x_dbginfo, "TCB Resources Not Available\n");</div><div class='add'>+		status = -ENOMEM;</div><div class='add'>+	} else {</div><div class='add'>+		/* We need to see if the link is up; if it's not, make the</div><div class='add'>+		 * netif layer think we're good and drop the packet</div><div class='add'>+		 */</div><div class='add'>+		//if( MP_SHOULD_FAIL_SEND( pAdapter ) || pAdapter-&gt;DriverNoPhyAccess )</div><div class='add'>+		if (MP_SHOULD_FAIL_SEND(pAdapter) || pAdapter-&gt;DriverNoPhyAccess</div><div class='add'>+		    || !netif_carrier_ok(netdev)) {</div><div class='add'>+			DBG_VERBOSE(et131x_dbginfo,</div><div class='add'>+				    "Can't Tx, Link is DOWN; drop the packet\n");</div><div class='add'>+</div><div class='add'>+			dev_kfree_skb_any(skb);</div><div class='add'>+			skb = NULL;</div><div class='add'>+</div><div class='add'>+			pAdapter-&gt;net_stats.tx_dropped++;</div><div class='add'>+		} else {</div><div class='add'>+			status = et131x_send_packet(skb, pAdapter);</div><div class='add'>+</div><div class='add'>+			if (status == -ENOMEM) {</div><div class='add'>+</div><div class='add'>+				/* NOTE: If there's an error on send, no need</div><div class='add'>+				 * to queue the packet under Linux; if we just</div><div class='add'>+				 * send an error up to the netif layer, it</div><div class='add'>+				 * will resend the skb to us.</div><div class='add'>+				 */</div><div class='add'>+				DBG_WARNING(et131x_dbginfo,</div><div class='add'>+					    "Resources problem, Queue tx packet\n");</div><div class='add'>+			} else if (status != 0) {</div><div class='add'>+				/* On any other error, make netif think we're</div><div class='add'>+				 * OK and drop the packet</div><div class='add'>+				 */</div><div class='add'>+				DBG_WARNING(et131x_dbginfo,</div><div class='add'>+					    "General error, drop packet\n");</div><div class='add'>+</div><div class='add'>+				dev_kfree_skb_any(skb);</div><div class='add'>+				skb = NULL;</div><div class='add'>+</div><div class='add'>+				pAdapter-&gt;net_stats.tx_dropped++;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBG_TX_LEAVE(et131x_dbginfo);</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * et131x_send_packet - Do the work to send a packet</div><div class='add'>+ * @skb: the packet(s) to send</div><div class='add'>+ * @pAdapter: a pointer to the device's private adapter structure</div><div class='add'>+ *</div><div class='add'>+ * Return 0 in almost all cases; non-zero value in extreme hard failure only.</div><div class='add'>+ *</div><div class='add'>+ * Assumption: Send spinlock has been acquired</div><div class='add'>+ */</div><div class='add'>+static int et131x_send_packet(struct sk_buff *skb,</div><div class='add'>+			      struct et131x_adapter *pAdapter)</div><div class='add'>+{</div><div class='add'>+	int status = 0;</div><div class='add'>+	PMP_TCB pMpTcb = NULL;</div><div class='add'>+	uint16_t *pShBufVa;</div><div class='add'>+	unsigned long lockflags;</div><div class='add'>+</div><div class='add'>+	DBG_TX_ENTER(et131x_dbginfo);</div><div class='add'>+</div><div class='add'>+	/* Is our buffer scattered, or continuous? */</div><div class='add'>+	if (skb_shinfo(skb)-&gt;nr_frags == 0) {</div><div class='add'>+		DBG_TX(et131x_dbginfo, "Scattered buffer: NO\n");</div><div class='add'>+	} else {</div><div class='add'>+		DBG_TX(et131x_dbginfo, "Scattered buffer: YES, Num Frags: %d\n",</div><div class='add'>+		       skb_shinfo(skb)-&gt;nr_frags);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* All packets must have at least a MAC address and a protocol type */</div><div class='add'>+	if (skb-&gt;len &lt; ETH_HLEN) {</div><div class='add'>+		DBG_ERROR(et131x_dbginfo,</div><div class='add'>+			  "Packet size &lt; ETH_HLEN (14 bytes)\n");</div><div class='add'>+		DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Get a TCB for this packet */</div><div class='add'>+	spin_lock_irqsave(&amp;pAdapter-&gt;TCBReadyQLock, lockflags);</div><div class='add'>+</div><div class='add'>+	pMpTcb = pAdapter-&gt;TxRing.TCBReadyQueueHead;</div><div class='add'>+</div><div class='add'>+	if (pMpTcb == NULL) {</div><div class='add'>+		spin_unlock_irqrestore(&amp;pAdapter-&gt;TCBReadyQLock, lockflags);</div><div class='add'>+</div><div class='add'>+		DBG_WARNING(et131x_dbginfo, "Can't obtain a TCB\n");</div><div class='add'>+		DBG_TX_LEAVE(et131x_dbginfo);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pAdapter-&gt;TxRing.TCBReadyQueueHead = pMpTcb-&gt;Next;</div><div class='add'>+</div><div class='add'>+	if (pAdapter-&gt;TxRing.TCBReadyQueueHead == NULL) {</div><div class='add'>+		pAdapter-&gt;TxRing.TCBReadyQueueTail = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;pAdapter-&gt;TCBReadyQLock, lockflags);</div><div class='add'>+</div><div class='add'>+	pMpTcb-&gt;PacketLength = skb-&gt;len;</div><div class='add'>+	pMpTcb-&gt;Packet = skb;</div><div class='add'>+</div><div class='add'>+	if ((skb-&gt;data != NULL) &amp;&amp; ((skb-&gt;len - skb-&gt;data_len) &gt;= 6)) {</div><div class='add'>+		pShBufVa = (uint16_t *) skb-&gt;data;</div><div class='add'>+</div><div class='add'>+		if ((pShBufVa[0] == 0xffff) &amp;&amp;</div><div class='add'>+		    (pShBufVa[1] == 0xffff) &amp;&amp; (pShBufVa[2] == 0xffff)) {</div><div class='add'>+			MP_SET_FLAG(pMpTcb, fMP_DEST_BROAD);</div><div class='add'>+		} else if ((pShBufVa[0] &amp; 0x3) == 0x0001) {</div><div class='add'>+			MP_SET_FLAG(pMpTcb, fMP_DEST_MULTI);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pMpTcb-&gt;Next = NULL;</div><div class='add'>+</div><div class='add'>+	/* Call the NIC specific send handler. */</div><div class='add'>+	if (status == 0) {</div><div class='add'>+		status = nic_send_packet(pAdapter, pMpTcb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (status != 0) {</div><div class='add'>+		spin_lock_irqsave(&amp;pAdapter-&gt;TCBReadyQLock, lockflags);</div><div class='add'>+</div><div class='add'>+		if (pAdapter-&gt;TxRing.TCBReadyQueueTail) {</div><div class='add'>+			pAdapter-&gt;TxRing.TCBReadyQueueTail-&gt;Next = pMpTcb;</div><div class='add'>+		} else {</div><div class='add'>+			/* Apparently ready Q is empty. */</div><div class='add'>+			pAdapter-&gt;TxRing.TCBReadyQueueHead = pMpTcb;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		pAdapter-&gt;TxRing.TCBReadyQueueTail = pMpTcb;</div><div class='add'>+</div><div class='add'>+		spin_unlock_irqrestore(&amp;pAdapter-&gt;TCBReadyQLock, lockflags);</div><div class='add'>+</div><div class='add'>+		DBG_TX_LEAVE(et131x_dbginfo);</div><div class='add'>+		return status;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBG_ASSERT(pAdapter-&gt;TxRing.nBusySend &lt;= NUM_TCB);</div><div class='add'>+</div><div class='add'>+	DBG_TX_LEAVE(et131x_dbginfo);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * nic_send_packet - NIC specific send handler for version B silicon.</div><div class='add'>+ * @pAdapter: pointer to our adapter</div><div class='add'>+ * @pMpTcb: pointer to MP_TCB</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 or errno.</div><div class='add'>+ */</div><div class='add'>+static int nic_send_packet(struct et131x_adapter *pAdapter, PMP_TCB pMpTcb)</div><div class='add'>+{</div><div class='add'>+	uint32_t loopIndex;</div><div class='add'>+	TX_DESC_ENTRY_t CurDesc[24];</div><div class='add'>+	uint32_t FragmentNumber = 0;</div><div class='add'>+	uint32_t iThisCopy, iRemainder;</div><div class='add'>+	struct sk_buff *pPacket = pMpTcb-&gt;Packet;</div><div class='add'>+	uint32_t FragListCount = skb_shinfo(pPacket)-&gt;nr_frags + 1;</div><div class='add'>+	struct skb_frag_struct *pFragList = &amp;skb_shinfo(pPacket)-&gt;frags[0];</div><div class='add'>+	unsigned long lockflags1, lockflags2;</div><div class='add'>+</div><div class='add'>+	DBG_TX_ENTER(et131x_dbginfo);</div><div class='add'>+</div><div class='add'>+	/* Part of the optimizations of this send routine restrict us to</div><div class='add'>+	 * sending 24 fragments at a pass.  In practice we should never see</div><div class='add'>+	 * more than 5 fragments.</div><div class='add'>+	 *</div><div class='add'>+	 * NOTE: The older version of this function (below) can handle any</div><div class='add'>+	 * number of fragments. If needed, we can call this function,</div><div class='add'>+	 * although it is less efficient.</div><div class='add'>+	 */</div><div class='add'>+	if (FragListCount &gt; 23) {</div><div class='add'>+		DBG_TX_LEAVE(et131x_dbginfo);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(CurDesc, 0, sizeof(TX_DESC_ENTRY_t) * (FragListCount + 1));</div><div class='add'>+</div><div class='add'>+	for (loopIndex = 0; loopIndex &lt; FragListCount; loopIndex++) {</div><div class='add'>+		/* If there is something in this element, lets get a</div><div class='add'>+		 * descriptor from the ring and get the necessary data</div><div class='add'>+		 */</div><div class='add'>+		if (loopIndex == 0) {</div><div class='add'>+			/* If the fragments are smaller than a standard MTU,</div><div class='add'>+			 * then map them to a single descriptor in the Tx</div><div class='add'>+			 * Desc ring. However, if they're larger, as is</div><div class='add'>+			 * possible with support for jumbo packets, then</div><div class='add'>+			 * split them each across 2 descriptors.</div><div class='add'>+			 *</div><div class='add'>+			 * This will work until we determine why the hardware</div><div class='add'>+			 * doesn't seem to like large fragments.</div><div class='add'>+			 */</div><div class='add'>+			if ((pPacket-&gt;len - pPacket-&gt;data_len) &lt;= 1514) {</div><div class='add'>+				DBG_TX(et131x_dbginfo,</div><div class='add'>+				       "Got packet of length %d, "</div><div class='add'>+				       "filling desc entry %d, "</div><div class='add'>+				       "TCB: 0x%p\n",</div><div class='add'>+				       (pPacket-&gt;len - pPacket-&gt;data_len),</div><div class='add'>+				       pAdapter-&gt;TxRing.txDmaReadyToSend.bits.</div><div class='add'>+				       val, pMpTcb);</div><div class='add'>+</div><div class='add'>+				CurDesc[FragmentNumber].DataBufferPtrHigh = 0;</div><div class='add'>+</div><div class='add'>+				CurDesc[FragmentNumber].word2.bits.</div><div class='add'>+				    length_in_bytes =</div><div class='add'>+				    pPacket-&gt;len - pPacket-&gt;data_len;</div><div class='add'>+</div><div class='add'>+				/* NOTE: Here, the dma_addr_t returned from</div><div class='add'>+				 * pci_map_single() is implicitly cast as a</div><div class='add'>+				 * uint32_t. Although dma_addr_t can be</div><div class='add'>+				 * 64-bit, the address returned by</div><div class='add'>+				 * pci_map_single() is always 32-bit</div><div class='add'>+				 * addressable (as defined by the pci/dma</div><div class='add'>+				 * subsystem)</div><div class='add'>+				 */</div><div class='add'>+				CurDesc[FragmentNumber++].DataBufferPtrLow =</div><div class='add'>+				    pci_map_single(pAdapter-&gt;pdev,</div><div class='add'>+						   pPacket-&gt;data,</div><div class='add'>+						   pPacket-&gt;len -</div><div class='add'>+						   pPacket-&gt;data_len,</div><div class='add'>+						   PCI_DMA_TODEVICE);</div><div class='add'>+			} else {</div><div class='add'>+				DBG_TX(et131x_dbginfo,</div><div class='add'>+				       "Got packet of length %d, "</div><div class='add'>+				       "filling desc entry %d, "</div><div class='add'>+				       "TCB: 0x%p\n",</div><div class='add'>+				       (pPacket-&gt;len - pPacket-&gt;data_len),</div><div class='add'>+				       pAdapter-&gt;TxRing.txDmaReadyToSend.bits.</div><div class='add'>+				       val, pMpTcb);</div><div class='add'>+</div><div class='add'>+				CurDesc[FragmentNumber].DataBufferPtrHigh = 0;</div><div class='add'>+</div><div class='add'>+				CurDesc[FragmentNumber].word2.bits.</div><div class='add'>+				    length_in_bytes =</div><div class='add'>+				    ((pPacket-&gt;len - pPacket-&gt;data_len) / 2);</div><div class='add'>+</div><div class='add'>+				/* NOTE: Here, the dma_addr_t returned from</div><div class='add'>+				 * pci_map_single() is implicitly cast as a</div><div class='add'>+				 * uint32_t. Although dma_addr_t can be</div><div class='add'>+				 * 64-bit, the address returned by</div><div class='add'>+				 * pci_map_single() is always 32-bit</div><div class='add'>+				 * addressable (as defined by the pci/dma</div><div class='add'>+				 * subsystem)</div><div class='add'>+				 */</div><div class='add'>+				CurDesc[FragmentNumber++].DataBufferPtrLow =</div><div class='add'>+				    pci_map_single(pAdapter-&gt;pdev,</div><div class='add'>+						   pPacket-&gt;data,</div><div class='add'>+						   ((pPacket-&gt;len -</div><div class='add'>+						     pPacket-&gt;data_len) / 2),</div><div class='add'>+						   PCI_DMA_TODEVICE);</div><div class='add'>+				CurDesc[FragmentNumber].DataBufferPtrHigh = 0;</div><div class='add'>+</div><div class='add'>+				CurDesc[FragmentNumber].word2.bits.</div><div class='add'>+				    length_in_bytes =</div><div class='add'>+				    ((pPacket-&gt;len - pPacket-&gt;data_len) / 2);</div><div class='add'>+</div><div class='add'>+				/* NOTE: Here, the dma_addr_t returned from</div><div class='add'>+				 * pci_map_single() is implicitly cast as a</div><div class='add'>+				 * uint32_t. Although dma_addr_t can be</div><div class='add'>+				 * 64-bit, the address returned by</div><div class='add'>+				 * pci_map_single() is always 32-bit</div><div class='add'>+				 * addressable (as defined by the pci/dma</div><div class='add'>+				 * subsystem)</div><div class='add'>+				 */</div><div class='add'>+				CurDesc[FragmentNumber++].DataBufferPtrLow =</div><div class='add'>+				    pci_map_single(pAdapter-&gt;pdev,</div><div class='add'>+						   pPacket-&gt;data +</div><div class='add'>+						   ((pPacket-&gt;len -</div><div class='add'>+						     pPacket-&gt;data_len) / 2),</div><div class='add'>+						   ((pPacket-&gt;len -</div><div class='add'>+						     pPacket-&gt;data_len) / 2),</div><div class='add'>+						   PCI_DMA_TODEVICE);</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			DBG_TX(et131x_dbginfo,</div><div class='add'>+			       "Got packet of length %d,"</div><div class='add'>+			       "filling desc entry %d\n"</div><div class='add'>+			       "TCB: 0x%p\n",</div><div class='add'>+			       pFragList[loopIndex].size,</div><div class='add'>+			       pAdapter-&gt;TxRing.txDmaReadyToSend.bits.val,</div><div class='add'>+			       pMpTcb);</div><div class='add'>+</div><div class='add'>+			CurDesc[FragmentNumber].DataBufferPtrHigh = 0;</div><div class='add'>+</div><div class='add'>+			CurDesc[FragmentNumber].word2.bits.length_in_bytes =</div><div class='add'>+			    pFragList[loopIndex - 1].size;</div><div class='add'>+</div><div class='add'>+			/* NOTE: Here, the dma_addr_t returned from</div><div class='add'>+			 * pci_map_page() is implicitly cast as a uint32_t.</div><div class='add'>+			 * Although dma_addr_t can be 64-bit, the address</div><div class='add'>+			 * returned by pci_map_page() is always 32-bit</div><div class='add'>+			 * addressable (as defined by the pci/dma subsystem)</div><div class='add'>+			 */</div><div class='add'>+			CurDesc[FragmentNumber++].DataBufferPtrLow =</div><div class='add'>+			    pci_map_page(pAdapter-&gt;pdev,</div><div class='add'>+					 pFragList[loopIndex - 1].page,</div><div class='add'>+					 pFragList[loopIndex - 1].page_offset,</div><div class='add'>+					 pFragList[loopIndex - 1].size,</div><div class='add'>+					 PCI_DMA_TODEVICE);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (FragmentNumber == 0) {</div><div class='add'>+		DBG_WARNING(et131x_dbginfo, "No. frags is 0\n");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pAdapter-&gt;uiLinkSpeed == TRUEPHY_SPEED_1000MBPS) {</div><div class='add'>+		if (++pAdapter-&gt;TxRing.TxPacketsSinceLastinterrupt ==</div><div class='add'>+		    pAdapter-&gt;RegistryTxNumBuffers) {</div><div class='add'>+			CurDesc[FragmentNumber - 1].word3.value = 0x5;</div><div class='add'>+			pAdapter-&gt;TxRing.TxPacketsSinceLastinterrupt = 0;</div><div class='add'>+		} else {</div><div class='add'>+			CurDesc[FragmentNumber - 1].word3.value = 0x1;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		CurDesc[FragmentNumber - 1].word3.value = 0x5;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	CurDesc[0].word3.bits.f = 1;</div><div class='add'>+</div><div class='add'>+	pMpTcb-&gt;WrIndexStart = pAdapter-&gt;TxRing.txDmaReadyToSend;</div><div class='add'>+	pMpTcb-&gt;PacketStaleCount = 0;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;pAdapter-&gt;SendHWLock, lockflags1);</div><div class='add'>+</div><div class='add'>+	iThisCopy =</div><div class='add'>+	    NUM_DESC_PER_RING_TX - pAdapter-&gt;TxRing.txDmaReadyToSend.bits.val;</div><div class='add'>+</div><div class='add'>+	if (iThisCopy &gt;= FragmentNumber) {</div><div class='add'>+		iRemainder = 0;</div><div class='add'>+		iThisCopy = FragmentNumber;</div><div class='add'>+	} else {</div><div class='add'>+		iRemainder = FragmentNumber - iThisCopy;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(pAdapter-&gt;TxRing.pTxDescRingVa +</div><div class='add'>+	       pAdapter-&gt;TxRing.txDmaReadyToSend.bits.val, CurDesc,</div><div class='add'>+	       sizeof(TX_DESC_ENTRY_t) * iThisCopy);</div><div class='add'>+</div><div class='add'>+	pAdapter-&gt;TxRing.txDmaReadyToSend.bits.val += iThisCopy;</div><div class='add'>+</div><div class='add'>+	if ((pAdapter-&gt;TxRing.txDmaReadyToSend.bits.val == 0) ||</div><div class='add'>+	    (pAdapter-&gt;TxRing.txDmaReadyToSend.bits.val ==</div><div class='add'>+	     NUM_DESC_PER_RING_TX)) {</div><div class='add'>+		if (pAdapter-&gt;TxRing.txDmaReadyToSend.bits.wrap) {</div><div class='add'>+			pAdapter-&gt;TxRing.txDmaReadyToSend.value = 0;</div><div class='add'>+		} else {</div><div class='add'>+			pAdapter-&gt;TxRing.txDmaReadyToSend.value = 0x400;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (iRemainder) {</div><div class='add'>+		memcpy(pAdapter-&gt;TxRing.pTxDescRingVa,</div><div class='add'>+		       CurDesc + iThisCopy,</div><div class='add'>+		       sizeof(TX_DESC_ENTRY_t) * iRemainder);</div><div class='add'>+</div><div class='add'>+		pAdapter-&gt;TxRing.txDmaReadyToSend.bits.val += iRemainder;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pAdapter-&gt;TxRing.txDmaReadyToSend.bits.val == 0) {</div><div class='add'>+		if (pAdapter-&gt;TxRing.txDmaReadyToSend.value) {</div><div class='add'>+			pMpTcb-&gt;WrIndex.value = NUM_DESC_PER_RING_TX - 1;</div><div class='add'>+		} else {</div><div class='add'>+			pMpTcb-&gt;WrIndex.value =</div><div class='add'>+			    0x400 | (NUM_DESC_PER_RING_TX - 1);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		pMpTcb-&gt;WrIndex.value =</div><div class='add'>+		    pAdapter-&gt;TxRing.txDmaReadyToSend.value - 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;pAdapter-&gt;TCBSendQLock, lockflags2);</div><div class='add'>+</div><div class='add'>+	if (pAdapter-&gt;TxRing.CurrSendTail) {</div><div class='add'>+		pAdapter-&gt;TxRing.CurrSendTail-&gt;Next = pMpTcb;</div><div class='add'>+	} else {</div><div class='add'>+		pAdapter-&gt;TxRing.CurrSendHead = pMpTcb;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pAdapter-&gt;TxRing.CurrSendTail = pMpTcb;</div><div class='add'>+</div><div class='add'>+	DBG_ASSERT(pMpTcb-&gt;Next == NULL);</div><div class='add'>+</div><div class='add'>+	pAdapter-&gt;TxRing.nBusySend++;</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;pAdapter-&gt;TCBSendQLock, lockflags2);</div><div class='add'>+</div><div class='add'>+	/* Write the new write pointer back to the device. */</div><div class='add'>+	writel(pAdapter-&gt;TxRing.txDmaReadyToSend.value,</div><div class='add'>+	       &amp;pAdapter-&gt;CSRAddress-&gt;txdma.service_request.value);</div><div class='add'>+</div><div class='add'>+	/* For Gig only, we use Tx Interrupt coalescing.  Enable the software</div><div class='add'>+	 * timer to wake us up if this packet isn't followed by N more.</div><div class='add'>+	 */</div><div class='add'>+	if (pAdapter-&gt;uiLinkSpeed == TRUEPHY_SPEED_1000MBPS) {</div><div class='add'>+		writel(pAdapter-&gt;RegistryTxTimeInterval * NANO_IN_A_MICRO,</div><div class='add'>+		       &amp;pAdapter-&gt;CSRAddress-&gt;global.watchdog_timer);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;pAdapter-&gt;SendHWLock, lockflags1);</div><div class='add'>+</div><div class='add'>+	DBG_TX_LEAVE(et131x_dbginfo);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * NOTE: For now, keep this older version of NICSendPacket around for</div><div class='add'>+ * reference, even though it's not used</div><div class='add'>+ */</div><div class='add'>+#if 0</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * NICSendPacket - NIC specific send handler.</div><div class='add'>+ * @pAdapter: pointer to our adapter</div><div class='add'>+ * @pMpTcb: pointer to MP_TCB</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 on succes, errno on failure.</div><div class='add'>+ *</div><div class='add'>+ * This version of the send routine is designed for version A silicon.</div><div class='add'>+ * Assumption - Send spinlock has been acquired.</div><div class='add'>+ */</div><div class='add'>+static int nic_send_packet(struct et131x_adapter *pAdapter, PMP_TCB pMpTcb)</div><div class='add'>+{</div><div class='add'>+	uint32_t loopIndex, fragIndex, loopEnd;</div><div class='add'>+	uint32_t iSplitFirstElement = 0;</div><div class='add'>+	uint32_t SegmentSize = 0;</div><div class='add'>+	TX_DESC_ENTRY_t CurDesc;</div><div class='add'>+	TX_DESC_ENTRY_t *CurDescPostCopy = NULL;</div><div class='add'>+	uint32_t SlotsAvailable;</div><div class='add'>+	DMA10W_t ServiceComplete;</div><div class='add'>+	unsigned int lockflags1, lockflags2;</div><div class='add'>+	struct sk_buff *pPacket = pMpTcb-&gt;Packet;</div><div class='add'>+	uint32_t FragListCount = skb_shinfo(pPacket)-&gt;nr_frags + 1;</div><div class='add'>+	struct skb_frag_struct *pFragList = &amp;skb_shinfo(pPacket)-&gt;frags[0];</div><div class='add'>+</div><div class='add'>+	DBG_TX_ENTER(et131x_dbginfo);</div><div class='add'>+</div><div class='add'>+	ServiceComplete.value =</div><div class='add'>+		readl(&amp;pAdapter-&gt;CSRAddress-&gt;txdma.NewServiceComplete.value);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Attempt to fix TWO hardware bugs:</div><div class='add'>+	 * 1)  NEVER write an odd number of descriptors.</div><div class='add'>+	 * 2)  If packet length is less than NIC_MIN_PACKET_SIZE, then pad the</div><div class='add'>+	 *     packet to NIC_MIN_PACKET_SIZE bytes by adding a new last</div><div class='add'>+	 *     descriptor IN HALF DUPLEX MODE ONLY</div><div class='add'>+	 * NOTE that (2) interacts with (1).  If the packet is less than</div><div class='add'>+	 * NIC_MIN_PACKET_SIZE bytes then we will append a descriptor.</div><div class='add'>+	 * Therefore if it is even now, it will eventually end up odd, and</div><div class='add'>+	 * so will need adjusting.</div><div class='add'>+	 *</div><div class='add'>+	 * VLAN tags get involved since VLAN tags add another one or two</div><div class='add'>+	 * segments.</div><div class='add'>+	 */</div><div class='add'>+	DBG_TX(et131x_dbginfo,</div><div class='add'>+	       "pMpTcb-&gt;PacketLength: %d\n", pMpTcb-&gt;PacketLength);</div><div class='add'>+</div><div class='add'>+	if ((pAdapter-&gt;uiDuplexMode == 0)</div><div class='add'>+	    &amp;&amp; (pMpTcb-&gt;PacketLength &lt; NIC_MIN_PACKET_SIZE)) {</div><div class='add'>+		DBG_TX(et131x_dbginfo,</div><div class='add'>+		       "HALF DUPLEX mode AND len &lt; MIN_PKT_SIZE\n");</div><div class='add'>+		if ((FragListCount &amp; 0x1) == 0) {</div><div class='add'>+			DBG_TX(et131x_dbginfo,</div><div class='add'>+			       "Even number of descs, split 1st elem\n");</div><div class='add'>+			iSplitFirstElement = 1;</div><div class='add'>+			//SegmentSize = pFragList[0].size / 2;</div><div class='add'>+			SegmentSize = (pPacket-&gt;len - pPacket-&gt;data_len) / 2;</div><div class='add'>+		}</div><div class='add'>+	} else if (FragListCount &amp; 0x1) {</div><div class='add'>+		DBG_TX(et131x_dbginfo, "Odd number of descs, split 1st elem\n");</div><div class='add'>+</div><div class='add'>+		iSplitFirstElement = 1;</div><div class='add'>+		//SegmentSize = pFragList[0].size / 2;</div><div class='add'>+		SegmentSize = (pPacket-&gt;len - pPacket-&gt;data_len) / 2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;pAdapter-&gt;SendHWLock, lockflags1);</div><div class='add'>+</div><div class='add'>+	if (pAdapter-&gt;TxRing.txDmaReadyToSend.bits.serv_req_wrap ==</div><div class='add'>+	    ServiceComplete.bits.serv_cpl_wrap) {</div><div class='add'>+		/* The ring hasn't wrapped.  Slots available should be</div><div class='add'>+		 * (RING_SIZE) -  the difference between the two pointers.</div><div class='add'>+		 */</div><div class='add'>+		SlotsAvailable = NUM_DESC_PER_RING_TX -</div><div class='add'>+		    (pAdapter-&gt;TxRing.txDmaReadyToSend.bits.serv_req -</div><div class='add'>+		     ServiceComplete.bits.serv_cpl);</div><div class='add'>+	} else {</div><div class='add'>+		/* The ring has wrapped.  Slots available should be the</div><div class='add'>+		 * difference between the two pointers.</div><div class='add'>+		 */</div><div class='add'>+		SlotsAvailable = ServiceComplete.bits.serv_cpl -</div><div class='add'>+		    pAdapter-&gt;TxRing.txDmaReadyToSend.bits.serv_req;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((FragListCount + iSplitFirstElement) &gt; SlotsAvailable) {</div><div class='add'>+		DBG_WARNING(et131x_dbginfo,</div><div class='add'>+			    "Not Enough Space in Tx Desc Ring\n");</div><div class='add'>+		spin_unlock_irqrestore(&amp;pAdapter-&gt;SendHWLock, lockflags1);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	loopEnd = (FragListCount) + iSplitFirstElement;</div><div class='add'>+	fragIndex = 0;</div><div class='add'>+</div><div class='add'>+	DBG_TX(et131x_dbginfo,</div><div class='add'>+	       "TCB           : 0x%p\n"</div><div class='add'>+	       "Packet (SKB)  : 0x%p\t Packet-&gt;len: %d\t Packet-&gt;data_len: %d\n"</div><div class='add'>+	       "FragListCount : %d\t iSplitFirstElement: %d\t loopEnd:%d\n",</div><div class='add'>+	       pMpTcb,</div><div class='add'>+	       pPacket, pPacket-&gt;len, pPacket-&gt;data_len,</div><div class='add'>+	       FragListCount, iSplitFirstElement, loopEnd);</div><div class='add'>+</div><div class='add'>+	for (loopIndex = 0; loopIndex &lt; loopEnd; loopIndex++) {</div><div class='add'>+		if (loopIndex &gt; iSplitFirstElement) {</div><div class='add'>+			fragIndex++;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		DBG_TX(et131x_dbginfo,</div><div class='add'>+		       "In loop, loopIndex: %d\t fragIndex: %d\n", loopIndex,</div><div class='add'>+		       fragIndex);</div><div class='add'>+</div><div class='add'>+		/* If there is something in this element, let's get a</div><div class='add'>+		 * descriptor from the ring and get the necessary data</div><div class='add'>+		 */</div><div class='add'>+		DBG_TX(et131x_dbginfo,</div><div class='add'>+		       "Packet Length %d,"</div><div class='add'>+		       "filling desc entry %d\n",</div><div class='add'>+		       pPacket-&gt;len,</div><div class='add'>+		       pAdapter-&gt;TxRing.txDmaReadyToSend.bits.serv_req);</div><div class='add'>+</div><div class='add'>+		// NOTE - Should we do a paranoia check here to make sure the fragment</div><div class='add'>+		// actually has a length? It's HIGHLY unlikely the fragment would</div><div class='add'>+		// contain no data...</div><div class='add'>+		if (1) {</div><div class='add'>+			// NOTE - Currently always getting 32-bit addrs, and dma_addr_t is</div><div class='add'>+			//        only 32-bit, so leave "high" ptr value out for now</div><div class='add'>+			CurDesc.DataBufferPtrHigh = 0;</div><div class='add'>+</div><div class='add'>+			CurDesc.word2.value = 0;</div><div class='add'>+			CurDesc.word3.value = 0;</div><div class='add'>+</div><div class='add'>+			if (fragIndex == 0) {</div><div class='add'>+				if (iSplitFirstElement) {</div><div class='add'>+					DBG_TX(et131x_dbginfo,</div><div class='add'>+					       "Split first element: YES\n");</div><div class='add'>+</div><div class='add'>+					if (loopIndex == 0) {</div><div class='add'>+						DBG_TX(et131x_dbginfo,</div><div class='add'>+						       "Got fragment of length %d, fragIndex: %d\n",</div><div class='add'>+						       pPacket-&gt;len -</div><div class='add'>+						       pPacket-&gt;data_len,</div><div class='add'>+						       fragIndex);</div><div class='add'>+						DBG_TX(et131x_dbginfo,</div><div class='add'>+						       "SegmentSize: %d\n",</div><div class='add'>+						       SegmentSize);</div><div class='add'>+</div><div class='add'>+						CurDesc.word2.bits.</div><div class='add'>+						    length_in_bytes =</div><div class='add'>+						    SegmentSize;</div><div class='add'>+						CurDesc.DataBufferPtrLow =</div><div class='add'>+						    pci_map_single(pAdapter-&gt;</div><div class='add'>+								   pdev,</div><div class='add'>+								   pPacket-&gt;</div><div class='add'>+								   data,</div><div class='add'>+								   SegmentSize,</div><div class='add'>+								   PCI_DMA_TODEVICE);</div><div class='add'>+						DBG_TX(et131x_dbginfo,</div><div class='add'>+						       "pci_map_single() returns: 0x%08x\n",</div><div class='add'>+						       CurDesc.</div><div class='add'>+						       DataBufferPtrLow);</div><div class='add'>+					} else {</div><div class='add'>+						DBG_TX(et131x_dbginfo,</div><div class='add'>+						       "Got fragment of length %d, fragIndex: %d\n",</div><div class='add'>+						       pPacket-&gt;len -</div><div class='add'>+						       pPacket-&gt;data_len,</div><div class='add'>+						       fragIndex);</div><div class='add'>+						DBG_TX(et131x_dbginfo,</div><div class='add'>+						       "Leftover Size: %d\n",</div><div class='add'>+						       (pPacket-&gt;len -</div><div class='add'>+							pPacket-&gt;data_len -</div><div class='add'>+							SegmentSize));</div><div class='add'>+</div><div class='add'>+						CurDesc.word2.bits.</div><div class='add'>+						    length_in_bytes =</div><div class='add'>+						    ((pPacket-&gt;len -</div><div class='add'>+						      pPacket-&gt;data_len) -</div><div class='add'>+						     SegmentSize);</div><div class='add'>+						CurDesc.DataBufferPtrLow =</div><div class='add'>+						    pci_map_single(pAdapter-&gt;</div><div class='add'>+								   pdev,</div><div class='add'>+								   (pPacket-&gt;</div><div class='add'>+								    data +</div><div class='add'>+								    SegmentSize),</div><div class='add'>+								   (pPacket-&gt;</div><div class='add'>+								    len -</div><div class='add'>+								    pPacket-&gt;</div><div class='add'>+								    data_len -</div><div class='add'>+								    SegmentSize),</div><div class='add'>+								   PCI_DMA_TODEVICE);</div><div class='add'>+						DBG_TX(et131x_dbginfo,</div><div class='add'>+						       "pci_map_single() returns: 0x%08x\n",</div><div class='add'>+						       CurDesc.</div><div class='add'>+						       DataBufferPtrLow);</div><div class='add'>+					}</div><div class='add'>+				} else {</div><div class='add'>+					DBG_TX(et131x_dbginfo,</div><div class='add'>+					       "Split first element: NO\n");</div><div class='add'>+</div><div class='add'>+					CurDesc.word2.bits.length_in_bytes =</div><div class='add'>+					    pPacket-&gt;len - pPacket-&gt;data_len;</div><div class='add'>+</div><div class='add'>+					CurDesc.DataBufferPtrLow =</div><div class='add'>+					    pci_map_single(pAdapter-&gt;pdev,</div><div class='add'>+							   pPacket-&gt;data,</div><div class='add'>+							   (pPacket-&gt;len -</div><div class='add'>+							    pPacket-&gt;data_len),</div><div class='add'>+							   PCI_DMA_TODEVICE);</div><div class='add'>+					DBG_TX(et131x_dbginfo,</div><div class='add'>+					       "pci_map_single() returns: 0x%08x\n",</div><div class='add'>+					       CurDesc.DataBufferPtrLow);</div><div class='add'>+				}</div><div class='add'>+			} else {</div><div class='add'>+</div><div class='add'>+				CurDesc.word2.bits.length_in_bytes =</div><div class='add'>+				    pFragList[fragIndex - 1].size;</div><div class='add'>+				CurDesc.DataBufferPtrLow =</div><div class='add'>+				    pci_map_page(pAdapter-&gt;pdev,</div><div class='add'>+						 pFragList[fragIndex - 1].page,</div><div class='add'>+						 pFragList[fragIndex -</div><div class='add'>+							   1].page_offset,</div><div class='add'>+						 pFragList[fragIndex - 1].size,</div><div class='add'>+						 PCI_DMA_TODEVICE);</div><div class='add'>+				DBG_TX(et131x_dbginfo,</div><div class='add'>+				       "pci_map_page() returns: 0x%08x\n",</div><div class='add'>+				       CurDesc.DataBufferPtrLow);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (loopIndex == 0) {</div><div class='add'>+				/* This is the first descriptor of the packet</div><div class='add'>+				 *</div><div class='add'>+				 * Set the "f" bit to indicate this is the</div><div class='add'>+				 * first descriptor in the packet.</div><div class='add'>+				 */</div><div class='add'>+				DBG_TX(et131x_dbginfo,</div><div class='add'>+				       "This is our FIRST descriptor\n");</div><div class='add'>+				CurDesc.word3.bits.f = 1;</div><div class='add'>+</div><div class='add'>+				pMpTcb-&gt;WrIndexStart =</div><div class='add'>+				    pAdapter-&gt;TxRing.txDmaReadyToSend;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if ((loopIndex == (loopEnd - 1)) &amp;&amp;</div><div class='add'>+			    (pAdapter-&gt;uiDuplexMode ||</div><div class='add'>+			     (pMpTcb-&gt;PacketLength &gt;= NIC_MIN_PACKET_SIZE))) {</div><div class='add'>+				/* This is the Last descriptor of the packet */</div><div class='add'>+				DBG_TX(et131x_dbginfo,</div><div class='add'>+				       "THIS is our LAST descriptor\n");</div><div class='add'>+</div><div class='add'>+				if (pAdapter-&gt;uiLinkSpeed ==</div><div class='add'>+				    TRUEPHY_SPEED_1000MBPS) {</div><div class='add'>+					if (++pAdapter-&gt;TxRing.</div><div class='add'>+					    TxPacketsSinceLastinterrupt &gt;=</div><div class='add'>+					    pAdapter-&gt;RegistryTxNumBuffers) {</div><div class='add'>+						CurDesc.word3.value = 0x5;</div><div class='add'>+						pAdapter-&gt;TxRing.</div><div class='add'>+						    TxPacketsSinceLastinterrupt</div><div class='add'>+						    = 0;</div><div class='add'>+					} else {</div><div class='add'>+						CurDesc.word3.value = 0x1;</div><div class='add'>+					}</div><div class='add'>+				} else {</div><div class='add'>+					CurDesc.word3.value = 0x5;</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+				/* Following index will be used during freeing</div><div class='add'>+				 * of packet</div><div class='add'>+				 */</div><div class='add'>+				pMpTcb-&gt;WrIndex =</div><div class='add'>+				    pAdapter-&gt;TxRing.txDmaReadyToSend;</div><div class='add'>+				pMpTcb-&gt;PacketStaleCount = 0;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* Copy the descriptor (filled above) into the</div><div class='add'>+			 * descriptor ring at the next free entry.  Advance</div><div class='add'>+			 * the "next free entry" variable</div><div class='add'>+			 */</div><div class='add'>+			memcpy(pAdapter-&gt;TxRing.pTxDescRingVa +</div><div class='add'>+			       pAdapter-&gt;TxRing.txDmaReadyToSend.bits.serv_req,</div><div class='add'>+			       &amp;CurDesc, sizeof(TX_DESC_ENTRY_t));</div><div class='add'>+</div><div class='add'>+			CurDescPostCopy =</div><div class='add'>+			    pAdapter-&gt;TxRing.pTxDescRingVa +</div><div class='add'>+			    pAdapter-&gt;TxRing.txDmaReadyToSend.bits.serv_req;</div><div class='add'>+</div><div class='add'>+			DBG_TX(et131x_dbginfo,</div><div class='add'>+			       "CURRENT DESCRIPTOR\n"</div><div class='add'>+			       "\tAddress           : 0x%p\n"</div><div class='add'>+			       "\tDataBufferPtrHigh : 0x%08x\n"</div><div class='add'>+			       "\tDataBufferPtrLow  : 0x%08x\n"</div><div class='add'>+			       "\tword2             : 0x%08x\n"</div><div class='add'>+			       "\tword3             : 0x%08x\n",</div><div class='add'>+			       CurDescPostCopy,</div><div class='add'>+			       CurDescPostCopy-&gt;DataBufferPtrHigh,</div><div class='add'>+			       CurDescPostCopy-&gt;DataBufferPtrLow,</div><div class='add'>+			       CurDescPostCopy-&gt;word2.value,</div><div class='add'>+			       CurDescPostCopy-&gt;word3.value);</div><div class='add'>+</div><div class='add'>+			if (++pAdapter-&gt;TxRing.txDmaReadyToSend.bits.serv_req &gt;=</div><div class='add'>+			    NUM_DESC_PER_RING_TX) {</div><div class='add'>+				if (pAdapter-&gt;TxRing.txDmaReadyToSend.bits.</div><div class='add'>+				    serv_req_wrap) {</div><div class='add'>+					pAdapter-&gt;TxRing.txDmaReadyToSend.</div><div class='add'>+					    value = 0;</div><div class='add'>+				} else {</div><div class='add'>+					pAdapter-&gt;TxRing.txDmaReadyToSend.</div><div class='add'>+					    value = 0x400;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pAdapter-&gt;uiDuplexMode == 0 &amp;&amp;</div><div class='add'>+	    pMpTcb-&gt;PacketLength &lt; NIC_MIN_PACKET_SIZE) {</div><div class='add'>+		// NOTE - Same 32/64-bit issue as above...</div><div class='add'>+		CurDesc.DataBufferPtrHigh = 0x0;</div><div class='add'>+		CurDesc.DataBufferPtrLow = pAdapter-&gt;TxRing.pTxDummyBlkPa;</div><div class='add'>+		CurDesc.word2.value = 0;</div><div class='add'>+</div><div class='add'>+		if (pAdapter-&gt;uiLinkSpeed == TRUEPHY_SPEED_1000MBPS) {</div><div class='add'>+			if (++pAdapter-&gt;TxRing.TxPacketsSinceLastinterrupt &gt;=</div><div class='add'>+			    pAdapter-&gt;RegistryTxNumBuffers) {</div><div class='add'>+				CurDesc.word3.value = 0x5;</div><div class='add'>+				pAdapter-&gt;TxRing.TxPacketsSinceLastinterrupt =</div><div class='add'>+				    0;</div><div class='add'>+			} else {</div><div class='add'>+				CurDesc.word3.value = 0x1;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			CurDesc.word3.value = 0x5;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		CurDesc.word2.bits.length_in_bytes =</div><div class='add'>+		    NIC_MIN_PACKET_SIZE - pMpTcb-&gt;PacketLength;</div><div class='add'>+</div><div class='add'>+		pMpTcb-&gt;WrIndex = pAdapter-&gt;TxRing.txDmaReadyToSend;</div><div class='add'>+</div><div class='add'>+		memcpy(pAdapter-&gt;TxRing.pTxDescRingVa +</div><div class='add'>+		       pAdapter-&gt;TxRing.txDmaReadyToSend.bits.serv_req,</div><div class='add'>+		       &amp;CurDesc, sizeof(TX_DESC_ENTRY_t));</div><div class='add'>+</div><div class='add'>+		CurDescPostCopy =</div><div class='add'>+		    pAdapter-&gt;TxRing.pTxDescRingVa +</div><div class='add'>+		    pAdapter-&gt;TxRing.txDmaReadyToSend.bits.serv_req;</div><div class='add'>+</div><div class='add'>+		DBG_TX(et131x_dbginfo,</div><div class='add'>+		       "CURRENT DESCRIPTOR\n"</div><div class='add'>+		       "\tAddress           : 0x%p\n"</div><div class='add'>+		       "\tDataBufferPtrHigh : 0x%08x\n"</div><div class='add'>+		       "\tDataBufferPtrLow  : 0x%08x\n"</div><div class='add'>+		       "\tword2             : 0x%08x\n"</div><div class='add'>+		       "\tword3             : 0x%08x\n",</div><div class='add'>+		       CurDescPostCopy,</div><div class='add'>+		       CurDescPostCopy-&gt;DataBufferPtrHigh,</div><div class='add'>+		       CurDescPostCopy-&gt;DataBufferPtrLow,</div><div class='add'>+		       CurDescPostCopy-&gt;word2.value,</div><div class='add'>+		       CurDescPostCopy-&gt;word3.value);</div><div class='add'>+</div><div class='add'>+		if (++pAdapter-&gt;TxRing.txDmaReadyToSend.bits.serv_req &gt;=</div><div class='add'>+		    NUM_DESC_PER_RING_TX) {</div><div class='add'>+			if (pAdapter-&gt;TxRing.txDmaReadyToSend.bits.</div><div class='add'>+			    serv_req_wrap) {</div><div class='add'>+				pAdapter-&gt;TxRing.txDmaReadyToSend.value = 0;</div><div class='add'>+			} else {</div><div class='add'>+				pAdapter-&gt;TxRing.txDmaReadyToSend.value = 0x400;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		DBG_TX(et131x_dbginfo, "Padding descriptor %d by %d bytes\n",</div><div class='add'>+		       //pAdapter-&gt;TxRing.txDmaReadyToSend.value,</div><div class='add'>+		       pAdapter-&gt;TxRing.txDmaReadyToSend.bits.serv_req,</div><div class='add'>+		       NIC_MIN_PACKET_SIZE - pMpTcb-&gt;PacketLength);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;pAdapter-&gt;TCBSendQLock, lockflags2);</div><div class='add'>+</div><div class='add'>+	if (pAdapter-&gt;TxRing.CurrSendTail) {</div><div class='add'>+		pAdapter-&gt;TxRing.CurrSendTail-&gt;Next = pMpTcb;</div><div class='add'>+	} else {</div><div class='add'>+		pAdapter-&gt;TxRing.CurrSendHead = pMpTcb;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pAdapter-&gt;TxRing.CurrSendTail = pMpTcb;</div><div class='add'>+</div><div class='add'>+	DBG_ASSERT(pMpTcb-&gt;Next == NULL);</div><div class='add'>+</div><div class='add'>+	pAdapter-&gt;TxRing.nBusySend++;</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;pAdapter-&gt;TCBSendQLock, lockflags2);</div><div class='add'>+</div><div class='add'>+	/* Write the new write pointer back to the device. */</div><div class='add'>+	writel(pAdapter-&gt;TxRing.txDmaReadyToSend.value,</div><div class='add'>+	       &amp;pAdapter-&gt;CSRAddress-&gt;txdma.service_request.value);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ET131X_DEBUG</div><div class='add'>+	DumpDeviceBlock(DBG_TX_ON, pAdapter, 1);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* For Gig only, we use Tx Interrupt coalescing.  Enable the software</div><div class='add'>+	 * timer to wake us up if this packet isn't followed by N more.</div><div class='add'>+	 */</div><div class='add'>+	if (pAdapter-&gt;uiLinkSpeed == TRUEPHY_SPEED_1000MBPS) {</div><div class='add'>+		writel(pAdapter-&gt;RegistryTxTimeInterval * NANO_IN_A_MICRO,</div><div class='add'>+		       &amp;pAdapter-&gt;CSRAddress-&gt;global.watchdog_timer);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;pAdapter-&gt;SendHWLock, lockflags1);</div><div class='add'>+</div><div class='add'>+	DBG_TX_LEAVE(et131x_dbginfo);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * et131x_free_send_packet - Recycle a MP_TCB, complete the packet if necessary</div><div class='add'>+ * @pAdapter: pointer to our adapter</div><div class='add'>+ * @pMpTcb: pointer to MP_TCB</div><div class='add'>+ *</div><div class='add'>+ * Assumption - Send spinlock has been acquired</div><div class='add'>+ */</div><div class='add'>+__inline void et131x_free_send_packet(struct et131x_adapter *pAdapter, PMP_TCB pMpTcb)</div><div class='add'>+{</div><div class='add'>+	unsigned long lockflags;</div><div class='add'>+	TX_DESC_ENTRY_t *desc = NULL;</div><div class='add'>+	struct net_device_stats *stats = &amp;pAdapter-&gt;net_stats;</div><div class='add'>+</div><div class='add'>+	if (MP_TEST_FLAG(pMpTcb, fMP_DEST_BROAD)) {</div><div class='add'>+		atomic_inc(&amp;pAdapter-&gt;Stats.brdcstxmt);</div><div class='add'>+	} else if (MP_TEST_FLAG(pMpTcb, fMP_DEST_MULTI)) {</div><div class='add'>+		atomic_inc(&amp;pAdapter-&gt;Stats.multixmt);</div><div class='add'>+	} else {</div><div class='add'>+		atomic_inc(&amp;pAdapter-&gt;Stats.unixmt);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pMpTcb-&gt;Packet) {</div><div class='add'>+		stats-&gt;tx_bytes += pMpTcb-&gt;Packet-&gt;len;</div><div class='add'>+</div><div class='add'>+		/* Iterate through the TX descriptors on the ring</div><div class='add'>+		 * corresponding to this packet and umap the fragments</div><div class='add'>+		 * they point to</div><div class='add'>+		 */</div><div class='add'>+		DBG_TX(et131x_dbginfo,</div><div class='add'>+		       "Unmap descriptors Here\n"</div><div class='add'>+		       "TCB                  : 0x%p\n"</div><div class='add'>+		       "TCB Next             : 0x%p\n"</div><div class='add'>+		       "TCB PacketLength     : %d\n"</div><div class='add'>+		       "TCB WrIndex.value    : 0x%08x\n"</div><div class='add'>+		       "TCB WrIndex.bits.val : %d\n"</div><div class='add'>+		       "TCB WrIndex.value    : 0x%08x\n"</div><div class='add'>+		       "TCB WrIndex.bits.val : %d\n",</div><div class='add'>+		       pMpTcb,</div><div class='add'>+		       pMpTcb-&gt;Next,</div><div class='add'>+		       pMpTcb-&gt;PacketLength,</div><div class='add'>+		       pMpTcb-&gt;WrIndexStart.value,</div><div class='add'>+		       pMpTcb-&gt;WrIndexStart.bits.val,</div><div class='add'>+		       pMpTcb-&gt;WrIndex.value,</div><div class='add'>+		       pMpTcb-&gt;WrIndex.bits.val);</div><div class='add'>+</div><div class='add'>+		do {</div><div class='add'>+			desc =</div><div class='add'>+			    (TX_DESC_ENTRY_t *) (pAdapter-&gt;TxRing.</div><div class='add'>+						 pTxDescRingVa +</div><div class='add'>+						 pMpTcb-&gt;WrIndexStart.bits.val);</div><div class='add'>+</div><div class='add'>+			DBG_TX(et131x_dbginfo,</div><div class='add'>+			       "CURRENT DESCRIPTOR\n"</div><div class='add'>+			       "\tAddress           : 0x%p\n"</div><div class='add'>+			       "\tDataBufferPtrHigh : 0x%08x\n"</div><div class='add'>+			       "\tDataBufferPtrLow  : 0x%08x\n"</div><div class='add'>+			       "\tword2             : 0x%08x\n"</div><div class='add'>+			       "\tword3             : 0x%08x\n",</div><div class='add'>+			       desc,</div><div class='add'>+			       desc-&gt;DataBufferPtrHigh,</div><div class='add'>+			       desc-&gt;DataBufferPtrLow,</div><div class='add'>+			       desc-&gt;word2.value,</div><div class='add'>+			       desc-&gt;word3.value);</div><div class='add'>+</div><div class='add'>+			pci_unmap_single(pAdapter-&gt;pdev,</div><div class='add'>+					 desc-&gt;DataBufferPtrLow,</div><div class='add'>+					 desc-&gt;word2.value, PCI_DMA_TODEVICE);</div><div class='add'>+</div><div class='add'>+			if (++pMpTcb-&gt;WrIndexStart.bits.val &gt;=</div><div class='add'>+			    NUM_DESC_PER_RING_TX) {</div><div class='add'>+				if (pMpTcb-&gt;WrIndexStart.bits.wrap) {</div><div class='add'>+					pMpTcb-&gt;WrIndexStart.value = 0;</div><div class='add'>+				} else {</div><div class='add'>+					pMpTcb-&gt;WrIndexStart.value = 0x400;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		while (desc != (pAdapter-&gt;TxRing.pTxDescRingVa +</div><div class='add'>+				pMpTcb-&gt;WrIndex.bits.val));</div><div class='add'>+</div><div class='add'>+		DBG_TX(et131x_dbginfo,</div><div class='add'>+		       "Free Packet (SKB)   : 0x%p\n", pMpTcb-&gt;Packet);</div><div class='add'>+</div><div class='add'>+		dev_kfree_skb_any(pMpTcb-&gt;Packet);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(pMpTcb, 0, sizeof(MP_TCB));</div><div class='add'>+</div><div class='add'>+	/* Add the TCB to the Ready Q */</div><div class='add'>+	spin_lock_irqsave(&amp;pAdapter-&gt;TCBReadyQLock, lockflags);</div><div class='add'>+</div><div class='add'>+	pAdapter-&gt;Stats.opackets++;</div><div class='add'>+</div><div class='add'>+	if (pAdapter-&gt;TxRing.TCBReadyQueueTail) {</div><div class='add'>+		pAdapter-&gt;TxRing.TCBReadyQueueTail-&gt;Next = pMpTcb;</div><div class='add'>+	} else {</div><div class='add'>+		/* Apparently ready Q is empty. */</div><div class='add'>+		pAdapter-&gt;TxRing.TCBReadyQueueHead = pMpTcb;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pAdapter-&gt;TxRing.TCBReadyQueueTail = pMpTcb;</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;pAdapter-&gt;TCBReadyQLock, lockflags);</div><div class='add'>+</div><div class='add'>+	DBG_ASSERT(pAdapter-&gt;TxRing.nBusySend &gt;= 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * et131x_free_busy_send_packets - Free and complete the stopped active sends</div><div class='add'>+ * @pAdapter: pointer to our adapter</div><div class='add'>+ *</div><div class='add'>+ * Assumption - Send spinlock has been acquired</div><div class='add'>+ */</div><div class='add'>+void et131x_free_busy_send_packets(struct et131x_adapter *pAdapter)</div><div class='add'>+{</div><div class='add'>+	PMP_TCB pMpTcb;</div><div class='add'>+	struct list_head *pEntry;</div><div class='add'>+	struct sk_buff *pPacket = NULL;</div><div class='add'>+	unsigned long lockflags;</div><div class='add'>+	uint32_t FreeCounter = 0;</div><div class='add'>+</div><div class='add'>+	DBG_ENTER(et131x_dbginfo);</div><div class='add'>+</div><div class='add'>+	while (!list_empty(&amp;pAdapter-&gt;TxRing.SendWaitQueue)) {</div><div class='add'>+		spin_lock_irqsave(&amp;pAdapter-&gt;SendWaitLock, lockflags);</div><div class='add'>+</div><div class='add'>+		pAdapter-&gt;TxRing.nWaitSend--;</div><div class='add'>+		spin_unlock_irqrestore(&amp;pAdapter-&gt;SendWaitLock, lockflags);</div><div class='add'>+</div><div class='add'>+		pEntry = pAdapter-&gt;TxRing.SendWaitQueue.next;</div><div class='add'>+</div><div class='add'>+		pPacket = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pAdapter-&gt;TxRing.nWaitSend = 0;</div><div class='add'>+</div><div class='add'>+	/* Any packets being sent? Check the first TCB on the send list */</div><div class='add'>+	spin_lock_irqsave(&amp;pAdapter-&gt;TCBSendQLock, lockflags);</div><div class='add'>+</div><div class='add'>+	pMpTcb = pAdapter-&gt;TxRing.CurrSendHead;</div><div class='add'>+</div><div class='add'>+	while ((pMpTcb != NULL) &amp;&amp; (FreeCounter &lt; NUM_TCB)) {</div><div class='add'>+		PMP_TCB pNext = pMpTcb-&gt;Next;</div><div class='add'>+</div><div class='add'>+		pAdapter-&gt;TxRing.CurrSendHead = pNext;</div><div class='add'>+</div><div class='add'>+		if (pNext == NULL) {</div><div class='add'>+			pAdapter-&gt;TxRing.CurrSendTail = NULL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		pAdapter-&gt;TxRing.nBusySend--;</div><div class='add'>+</div><div class='add'>+		spin_unlock_irqrestore(&amp;pAdapter-&gt;TCBSendQLock, lockflags);</div><div class='add'>+</div><div class='add'>+		DBG_VERBOSE(et131x_dbginfo, "pMpTcb = 0x%p\n", pMpTcb);</div><div class='add'>+</div><div class='add'>+		FreeCounter++;</div><div class='add'>+		MP_FREE_SEND_PACKET_FUN(pAdapter, pMpTcb);</div><div class='add'>+</div><div class='add'>+		spin_lock_irqsave(&amp;pAdapter-&gt;TCBSendQLock, lockflags);</div><div class='add'>+</div><div class='add'>+		pMpTcb = pAdapter-&gt;TxRing.CurrSendHead;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (FreeCounter == NUM_TCB) {</div><div class='add'>+		DBG_ERROR(et131x_dbginfo,</div><div class='add'>+			  "MpFreeBusySendPackets exitted loop for a bad reason\n");</div><div class='add'>+		BUG();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;pAdapter-&gt;TCBSendQLock, lockflags);</div><div class='add'>+</div><div class='add'>+	pAdapter-&gt;TxRing.nBusySend = 0;</div><div class='add'>+</div><div class='add'>+	DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * et131x_handle_send_interrupt - Interrupt handler for sending processing</div><div class='add'>+ * @pAdapter: pointer to our adapter</div><div class='add'>+ *</div><div class='add'>+ * Re-claim the send resources, complete sends and get more to send from</div><div class='add'>+ * the send wait queue.</div><div class='add'>+ *</div><div class='add'>+ * Assumption - Send spinlock has been acquired</div><div class='add'>+ */</div><div class='add'>+void et131x_handle_send_interrupt(struct et131x_adapter *pAdapter)</div><div class='add'>+{</div><div class='add'>+	DBG_TX_ENTER(et131x_dbginfo);</div><div class='add'>+</div><div class='add'>+	/* Mark as completed any packets which have been sent by the device. */</div><div class='add'>+	et131x_update_tcb_list(pAdapter);</div><div class='add'>+</div><div class='add'>+	/* If we queued any transmits because we didn't have any TCBs earlier,</div><div class='add'>+	 * dequeue and send those packets now, as long as we have free TCBs.</div><div class='add'>+	 */</div><div class='add'>+	et131x_check_send_wait_list(pAdapter);</div><div class='add'>+</div><div class='add'>+	DBG_TX_LEAVE(et131x_dbginfo);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * et131x_update_tcb_list - Helper routine for Send Interrupt handler</div><div class='add'>+ * @pAdapter: pointer to our adapter</div><div class='add'>+ *</div><div class='add'>+ * Re-claims the send resources and completes sends.  Can also be called as</div><div class='add'>+ * part of the NIC send routine when the "ServiceComplete" indication has</div><div class='add'>+ * wrapped.</div><div class='add'>+ */</div><div class='add'>+static void et131x_update_tcb_list(struct et131x_adapter *pAdapter)</div><div class='add'>+{</div><div class='add'>+	unsigned long lockflags;</div><div class='add'>+	DMA10W_t ServiceComplete;</div><div class='add'>+	PMP_TCB pMpTcb;</div><div class='add'>+</div><div class='add'>+	ServiceComplete.value =</div><div class='add'>+	    readl(&amp;pAdapter-&gt;CSRAddress-&gt;txdma.NewServiceComplete.value);</div><div class='add'>+</div><div class='add'>+	/* Has the ring wrapped?  Process any descriptors that do not have</div><div class='add'>+	 * the same "wrap" indicator as the current completion indicator</div><div class='add'>+	 */</div><div class='add'>+	spin_lock_irqsave(&amp;pAdapter-&gt;TCBSendQLock, lockflags);</div><div class='add'>+</div><div class='add'>+	pMpTcb = pAdapter-&gt;TxRing.CurrSendHead;</div><div class='add'>+	while (pMpTcb &amp;&amp;</div><div class='add'>+	       ServiceComplete.bits.wrap != pMpTcb-&gt;WrIndex.bits.wrap  &amp;&amp;</div><div class='add'>+	       ServiceComplete.bits.val &lt; pMpTcb-&gt;WrIndex.bits.val) {</div><div class='add'>+		pAdapter-&gt;TxRing.nBusySend--;</div><div class='add'>+		pAdapter-&gt;TxRing.CurrSendHead = pMpTcb-&gt;Next;</div><div class='add'>+		if (pMpTcb-&gt;Next == NULL) {</div><div class='add'>+			pAdapter-&gt;TxRing.CurrSendTail = NULL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		spin_unlock_irqrestore(&amp;pAdapter-&gt;TCBSendQLock, lockflags);</div><div class='add'>+		MP_FREE_SEND_PACKET_FUN(pAdapter, pMpTcb);</div><div class='add'>+		spin_lock_irqsave(&amp;pAdapter-&gt;TCBSendQLock, lockflags);</div><div class='add'>+</div><div class='add'>+		/* Goto the next packet */</div><div class='add'>+		pMpTcb = pAdapter-&gt;TxRing.CurrSendHead;</div><div class='add'>+	}</div><div class='add'>+	while (pMpTcb &amp;&amp;</div><div class='add'>+	       ServiceComplete.bits.wrap == pMpTcb-&gt;WrIndex.bits.wrap &amp;&amp;</div><div class='add'>+	       ServiceComplete.bits.val &gt; pMpTcb-&gt;WrIndex.bits.val) {</div><div class='add'>+		pAdapter-&gt;TxRing.nBusySend--;</div><div class='add'>+		pAdapter-&gt;TxRing.CurrSendHead = pMpTcb-&gt;Next;</div><div class='add'>+		if (pMpTcb-&gt;Next == NULL) {</div><div class='add'>+			pAdapter-&gt;TxRing.CurrSendTail = NULL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		spin_unlock_irqrestore(&amp;pAdapter-&gt;TCBSendQLock, lockflags);</div><div class='add'>+		MP_FREE_SEND_PACKET_FUN(pAdapter, pMpTcb);</div><div class='add'>+		spin_lock_irqsave(&amp;pAdapter-&gt;TCBSendQLock, lockflags);</div><div class='add'>+</div><div class='add'>+		/* Goto the next packet */</div><div class='add'>+		pMpTcb = pAdapter-&gt;TxRing.CurrSendHead;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Wake up the queue when we hit a low-water mark */</div><div class='add'>+	if (pAdapter-&gt;TxRing.nBusySend &lt;= (NUM_TCB / 3)) {</div><div class='add'>+		netif_wake_queue(pAdapter-&gt;netdev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;pAdapter-&gt;TCBSendQLock, lockflags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * et131x_check_send_wait_list - Helper routine for the interrupt handler</div><div class='add'>+ * @pAdapter: pointer to our adapter</div><div class='add'>+ *</div><div class='add'>+ * Takes packets from the send wait queue and posts them to the device (if</div><div class='add'>+ * room available).</div><div class='add'>+ */</div><div class='add'>+static void et131x_check_send_wait_list(struct et131x_adapter *pAdapter)</div><div class='add'>+{</div><div class='add'>+	unsigned long lockflags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;pAdapter-&gt;SendWaitLock, lockflags);</div><div class='add'>+</div><div class='add'>+	while (!list_empty(&amp;pAdapter-&gt;TxRing.SendWaitQueue) &amp;&amp;</div><div class='add'>+	       MP_TCB_RESOURCES_AVAILABLE(pAdapter)) {</div><div class='add'>+		struct list_head *pEntry;</div><div class='add'>+</div><div class='add'>+		DBG_VERBOSE(et131x_dbginfo, "Tx packets on the wait queue\n");</div><div class='add'>+</div><div class='add'>+		pEntry = pAdapter-&gt;TxRing.SendWaitQueue.next;</div><div class='add'>+</div><div class='add'>+		pAdapter-&gt;TxRing.nWaitSend--;</div><div class='add'>+</div><div class='add'>+		DBG_WARNING(et131x_dbginfo,</div><div class='add'>+			    "MpHandleSendInterrupt - sent a queued pkt. Waiting %d\n",</div><div class='add'>+			    pAdapter-&gt;TxRing.nWaitSend);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;pAdapter-&gt;SendWaitLock, lockflags);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/staging/et131x/et1310_tx.h b/drivers/staging/et131x/et1310_tx.h<br/>new file mode 100644<br/>index 000000000000..2819c7843d21<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/et131x/et1310_tx.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/et131x/et1310_tx.h</a></div><div class='hunk'>@@ -0,0 +1,242 @@</div><div class='add'>+/*</div><div class='add'>+ * Agere Systems Inc.</div><div class='add'>+ * 10/100/1000 Base-T Ethernet Driver for the ET1301 and ET131x series MACs</div><div class='add'>+ *</div><div class='add'>+ * Copyright © 2005 Agere Systems Inc.</div><div class='add'>+ * All rights reserved.</div><div class='add'>+ *   http://www.agere.com</div><div class='add'>+ *</div><div class='add'>+ *------------------------------------------------------------------------------</div><div class='add'>+ *</div><div class='add'>+ * et1310_tx.h - Defines, structs, enums, prototypes, etc. pertaining to data</div><div class='add'>+ *               transmission.</div><div class='add'>+ *</div><div class='add'>+ *------------------------------------------------------------------------------</div><div class='add'>+ *</div><div class='add'>+ * SOFTWARE LICENSE</div><div class='add'>+ *</div><div class='add'>+ * This software is provided subject to the following terms and conditions,</div><div class='add'>+ * which you should read carefully before using the software.  Using this</div><div class='add'>+ * software indicates your acceptance of these terms and conditions.  If you do</div><div class='add'>+ * not agree with these terms and conditions, do not use the software.</div><div class='add'>+ *</div><div class='add'>+ * Copyright © 2005 Agere Systems Inc.</div><div class='add'>+ * All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source or binary forms, with or without</div><div class='add'>+ * modifications, are permitted provided that the following conditions are met:</div><div class='add'>+ *</div><div class='add'>+ * . Redistributions of source code must retain the above copyright notice, this</div><div class='add'>+ *    list of conditions and the following Disclaimer as comments in the code as</div><div class='add'>+ *    well as in the documentation and/or other materials provided with the</div><div class='add'>+ *    distribution.</div><div class='add'>+ *</div><div class='add'>+ * . Redistributions in binary form must reproduce the above copyright notice,</div><div class='add'>+ *    this list of conditions and the following Disclaimer in the documentation</div><div class='add'>+ *    and/or other materials provided with the distribution.</div><div class='add'>+ *</div><div class='add'>+ * . Neither the name of Agere Systems Inc. nor the names of the contributors</div><div class='add'>+ *    may be used to endorse or promote products derived from this software</div><div class='add'>+ *    without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ * Disclaimer</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES,</div><div class='add'>+ * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  ANY</div><div class='add'>+ * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN</div><div class='add'>+ * RISK. IN NO EVENT SHALL AGERE SYSTEMS INC. OR CONTRIBUTORS BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, INCLUDING, BUT NOT LIMITED TO, CONTRACT, STRICT</div><div class='add'>+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT</div><div class='add'>+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH</div><div class='add'>+ * DAMAGE.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __ET1310_TX_H__</div><div class='add'>+#define __ET1310_TX_H__</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Typedefs for Tx Descriptor Ring */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * TXDESC_WORD2_t structure holds part of the control bits in the Tx Descriptor</div><div class='add'>+ * ring for the ET-1310</div><div class='add'>+ */</div><div class='add'>+typedef union _txdesc_word2_t {</div><div class='add'>+	u32 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u32 vlan_prio:3;		// bits 29-31(VLAN priority)</div><div class='add'>+		u32 vlan_cfi:1;		// bit 28(cfi)</div><div class='add'>+		u32 vlan_tag:12;		// bits 16-27(VLAN tag)</div><div class='add'>+		u32 length_in_bytes:16;	// bits  0-15(packet length)</div><div class='add'>+#else</div><div class='add'>+		u32 length_in_bytes:16;	// bits  0-15(packet length)</div><div class='add'>+		u32 vlan_tag:12;		// bits 16-27(VLAN tag)</div><div class='add'>+		u32 vlan_cfi:1;		// bit 28(cfi)</div><div class='add'>+		u32 vlan_prio:3;		// bits 29-31(VLAN priority)</div><div class='add'>+#endif	/* _BIT_FIELDS_HTOL */</div><div class='add'>+	} bits;</div><div class='add'>+} TXDESC_WORD2_t, *PTXDESC_WORD2_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * TXDESC_WORD3_t structure holds part of the control bits in the Tx Descriptor</div><div class='add'>+ * ring for the ET-1310</div><div class='add'>+ */</div><div class='add'>+typedef union _txdesc_word3_t {</div><div class='add'>+	u32 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u32 unused:17;	// bits 15-31</div><div class='add'>+		u32 udpa:1;	// bit 14(UDP checksum assist)</div><div class='add'>+		u32 tcpa:1;	// bit 13(TCP checksum assist)</div><div class='add'>+		u32 ipa:1;		// bit 12(IP checksum assist)</div><div class='add'>+		u32 vlan:1;	// bit 11(append VLAN tag)</div><div class='add'>+		u32 hp:1;		// bit 10(Packet is a Huge packet)</div><div class='add'>+		u32 pp:1;		// bit  9(pad packet)</div><div class='add'>+		u32 mac:1;		// bit  8(MAC override)</div><div class='add'>+		u32 crc:1;		// bit  7(append CRC)</div><div class='add'>+		u32 e:1;		// bit  6(Tx frame has error)</div><div class='add'>+		u32 pf:1;		// bit  5(send pause frame)</div><div class='add'>+		u32 bp:1;		// bit  4(Issue half-duplex backpressure (XON/XOFF)</div><div class='add'>+		u32 cw:1;		// bit  3(Control word - no packet data)</div><div class='add'>+		u32 ir:1;		// bit  2(interrupt the processor when this pkt sent)</div><div class='add'>+		u32 f:1;		// bit  1(first packet in the sequence)</div><div class='add'>+		u32 l:1;		// bit  0(last packet in the sequence)</div><div class='add'>+#else</div><div class='add'>+		u32 l:1;		// bit  0(last packet in the sequence)</div><div class='add'>+		u32 f:1;		// bit  1(first packet in the sequence)</div><div class='add'>+		u32 ir:1;		// bit  2(interrupt the processor when this pkt sent)</div><div class='add'>+		u32 cw:1;		// bit  3(Control word - no packet data)</div><div class='add'>+		u32 bp:1;		// bit  4(Issue half-duplex backpressure (XON/XOFF)</div><div class='add'>+		u32 pf:1;		// bit  5(send pause frame)</div><div class='add'>+		u32 e:1;		// bit  6(Tx frame has error)</div><div class='add'>+		u32 crc:1;		// bit  7(append CRC)</div><div class='add'>+		u32 mac:1;		// bit  8(MAC override)</div><div class='add'>+		u32 pp:1;		// bit  9(pad packet)</div><div class='add'>+		u32 hp:1;		// bit 10(Packet is a Huge packet)</div><div class='add'>+		u32 vlan:1;	// bit 11(append VLAN tag)</div><div class='add'>+		u32 ipa:1;		// bit 12(IP checksum assist)</div><div class='add'>+		u32 tcpa:1;	// bit 13(TCP checksum assist)</div><div class='add'>+		u32 udpa:1;	// bit 14(UDP checksum assist)</div><div class='add'>+		u32 unused:17;	// bits 15-31</div><div class='add'>+#endif	/* _BIT_FIELDS_HTOL */</div><div class='add'>+	} bits;</div><div class='add'>+} TXDESC_WORD3_t, *PTXDESC_WORD3_t;</div><div class='add'>+</div><div class='add'>+/* TX_DESC_ENTRY_t is sructure representing each descriptor on the ring */</div><div class='add'>+typedef struct _tx_desc_entry_t {</div><div class='add'>+	u32 DataBufferPtrHigh;</div><div class='add'>+	u32 DataBufferPtrLow;</div><div class='add'>+	TXDESC_WORD2_t word2;	// control words how to xmit the</div><div class='add'>+	TXDESC_WORD3_t word3;	// data (detailed above)</div><div class='add'>+} TX_DESC_ENTRY_t, *PTX_DESC_ENTRY_t;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Typedefs for Tx DMA engine status writeback */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * TX_STATUS_BLOCK_t is sructure representing the status of the Tx DMA engine</div><div class='add'>+ * it sits in free memory, and is pointed to by 0x101c / 0x1020</div><div class='add'>+ */</div><div class='add'>+typedef union _tx_status_block_t {</div><div class='add'>+	u32 value;</div><div class='add'>+	struct {</div><div class='add'>+#ifdef _BIT_FIELDS_HTOL</div><div class='add'>+		u32 unused:21;		// bits 11-31</div><div class='add'>+		u32 serv_cpl_wrap:1;	// bit 10</div><div class='add'>+		u32 serv_cpl:10;		// bits 0-9</div><div class='add'>+#else</div><div class='add'>+		u32 serv_cpl:10;		// bits 0-9</div><div class='add'>+		u32 serv_cpl_wrap:1;	// bit 10</div><div class='add'>+		u32 unused:21;		// bits 11-31</div><div class='add'>+#endif</div><div class='add'>+	} bits;</div><div class='add'>+} TX_STATUS_BLOCK_t, *PTX_STATUS_BLOCK_t;</div><div class='add'>+</div><div class='add'>+/* TCB (Transmit Control Block) */</div><div class='add'>+typedef struct _MP_TCB {</div><div class='add'>+	struct _MP_TCB *Next;</div><div class='add'>+	u32 Flags;</div><div class='add'>+	u32 Count;</div><div class='add'>+	u32 PacketStaleCount;</div><div class='add'>+	struct sk_buff *Packet;</div><div class='add'>+	u32 PacketLength;</div><div class='add'>+	DMA10W_t WrIndex;</div><div class='add'>+	DMA10W_t WrIndexStart;</div><div class='add'>+} MP_TCB, *PMP_TCB;</div><div class='add'>+</div><div class='add'>+/* Structure to hold the skb's in a list */</div><div class='add'>+typedef struct tx_skb_list_elem {</div><div class='add'>+	struct list_head skb_list_elem;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+} TX_SKB_LIST_ELEM, *PTX_SKB_LIST_ELEM;</div><div class='add'>+</div><div class='add'>+/* TX_RING_t is sructure representing our local reference(s) to the ring */</div><div class='add'>+typedef struct _tx_ring_t {</div><div class='add'>+	/* TCB (Transmit Control Block) memory and lists */</div><div class='add'>+	PMP_TCB MpTcbMem;</div><div class='add'>+</div><div class='add'>+	/* List of TCBs that are ready to be used */</div><div class='add'>+	PMP_TCB TCBReadyQueueHead;</div><div class='add'>+	PMP_TCB TCBReadyQueueTail;</div><div class='add'>+</div><div class='add'>+	/* list of TCBs that are currently being sent.  NOTE that access to all</div><div class='add'>+	 * three of these (including nBusySend) are controlled via the</div><div class='add'>+	 * TCBSendQLock.  This lock should be secured prior to incementing /</div><div class='add'>+	 * decrementing nBusySend, or any queue manipulation on CurrSendHead /</div><div class='add'>+	 * Tail</div><div class='add'>+	 */</div><div class='add'>+	PMP_TCB CurrSendHead;</div><div class='add'>+	PMP_TCB CurrSendTail;</div><div class='add'>+	int32_t nBusySend;</div><div class='add'>+</div><div class='add'>+	/* List of packets (not TCBs) that were queued for lack of resources */</div><div class='add'>+	struct list_head SendWaitQueue;</div><div class='add'>+	int32_t nWaitSend;</div><div class='add'>+</div><div class='add'>+	/* The actual descriptor ring */</div><div class='add'>+	PTX_DESC_ENTRY_t pTxDescRingVa;</div><div class='add'>+	dma_addr_t pTxDescRingPa;</div><div class='add'>+	uint64_t pTxDescRingAdjustedPa;</div><div class='add'>+	uint64_t TxDescOffset;</div><div class='add'>+</div><div class='add'>+	/* ReadyToSend indicates where we last wrote to in the descriptor ring. */</div><div class='add'>+	DMA10W_t txDmaReadyToSend;</div><div class='add'>+</div><div class='add'>+	/* The location of the write-back status block */</div><div class='add'>+	PTX_STATUS_BLOCK_t pTxStatusVa;</div><div class='add'>+	dma_addr_t pTxStatusPa;</div><div class='add'>+</div><div class='add'>+	/* A Block of zeroes used to pad packets that are less than 60 bytes */</div><div class='add'>+	void *pTxDummyBlkVa;</div><div class='add'>+	dma_addr_t pTxDummyBlkPa;</div><div class='add'>+</div><div class='add'>+	TXMAC_ERR_t TxMacErr;</div><div class='add'>+</div><div class='add'>+	/* Variables to track the Tx interrupt coalescing features */</div><div class='add'>+	int32_t TxPacketsSinceLastinterrupt;</div><div class='add'>+} TX_RING_t, *PTX_RING_t;</div><div class='add'>+</div><div class='add'>+/* Forward declaration of the frag-list for the following prototypes */</div><div class='add'>+typedef struct _MP_FRAG_LIST MP_FRAG_LIST, *PMP_FRAG_LIST;</div><div class='add'>+</div><div class='add'>+/* Forward declaration of the private adapter structure */</div><div class='add'>+struct et131x_adapter;</div><div class='add'>+</div><div class='add'>+/* PROTOTYPES for et1310_tx.c */</div><div class='add'>+int et131x_tx_dma_memory_alloc(struct et131x_adapter *adapter);</div><div class='add'>+void et131x_tx_dma_memory_free(struct et131x_adapter *adapter);</div><div class='add'>+void ConfigTxDmaRegs(struct et131x_adapter *pAdapter);</div><div class='add'>+void et131x_init_send(struct et131x_adapter *adapter);</div><div class='add'>+void et131x_tx_dma_disable(struct et131x_adapter *pAdapter);</div><div class='add'>+void et131x_tx_dma_enable(struct et131x_adapter *pAdapter);</div><div class='add'>+void et131x_handle_send_interrupt(struct et131x_adapter *pAdapter);</div><div class='add'>+void et131x_free_busy_send_packets(struct et131x_adapter *pAdapter);</div><div class='add'>+int et131x_send_packets(struct sk_buff *skb, struct net_device *netdev);</div><div class='add'>+</div><div class='add'>+#endif /* __ET1310_TX_H__ */</div><div class='head'>diff --git a/drivers/staging/et131x/et131x_adapter.h b/drivers/staging/et131x/et131x_adapter.h<br/>new file mode 100644<br/>index 000000000000..36e61a47ae27<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/et131x/et131x_adapter.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/et131x/et131x_adapter.h</a></div><div class='hunk'>@@ -0,0 +1,347 @@</div><div class='add'>+/*</div><div class='add'>+ * Agere Systems Inc.</div><div class='add'>+ * 10/100/1000 Base-T Ethernet Driver for the ET1301 and ET131x series MACs</div><div class='add'>+ *</div><div class='add'>+ * Copyright © 2005 Agere Systems Inc.</div><div class='add'>+ * All rights reserved.</div><div class='add'>+ *   http://www.agere.com</div><div class='add'>+ *</div><div class='add'>+ *------------------------------------------------------------------------------</div><div class='add'>+ *</div><div class='add'>+ * et131x_adapter.h - Header which includes the private adapter structure, along</div><div class='add'>+ *                    with related support structures, macros, definitions, etc.</div><div class='add'>+ *</div><div class='add'>+ *------------------------------------------------------------------------------</div><div class='add'>+ *</div><div class='add'>+ * SOFTWARE LICENSE</div><div class='add'>+ *</div><div class='add'>+ * This software is provided subject to the following terms and conditions,</div><div class='add'>+ * which you should read carefully before using the software.  Using this</div><div class='add'>+ * software indicates your acceptance of these terms and conditions.  If you do</div><div class='add'>+ * not agree with these terms and conditions, do not use the software.</div><div class='add'>+ *</div><div class='add'>+ * Copyright © 2005 Agere Systems Inc.</div><div class='add'>+ * All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source or binary forms, with or without</div><div class='add'>+ * modifications, are permitted provided that the following conditions are met:</div><div class='add'>+ *</div><div class='add'>+ * . Redistributions of source code must retain the above copyright notice, this</div><div class='add'>+ *    list of conditions and the following Disclaimer as comments in the code as</div><div class='add'>+ *    well as in the documentation and/or other materials provided with the</div><div class='add'>+ *    distribution.</div><div class='add'>+ *</div><div class='add'>+ * . Redistributions in binary form must reproduce the above copyright notice,</div><div class='add'>+ *    this list of conditions and the following Disclaimer in the documentation</div><div class='add'>+ *    and/or other materials provided with the distribution.</div><div class='add'>+ *</div><div class='add'>+ * . Neither the name of Agere Systems Inc. nor the names of the contributors</div><div class='add'>+ *    may be used to endorse or promote products derived from this software</div><div class='add'>+ *    without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ * Disclaimer</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES,</div><div class='add'>+ * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  ANY</div><div class='add'>+ * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN</div><div class='add'>+ * RISK. IN NO EVENT SHALL AGERE SYSTEMS INC. OR CONTRIBUTORS BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, INCLUDING, BUT NOT LIMITED TO, CONTRACT, STRICT</div><div class='add'>+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT</div><div class='add'>+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH</div><div class='add'>+ * DAMAGE.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __ET131X_ADAPTER_H__</div><div class='add'>+#define __ET131X_ADAPTER_H__</div><div class='add'>+</div><div class='add'>+#include "et1310_address_map.h"</div><div class='add'>+#include "et1310_tx.h"</div><div class='add'>+#include "et1310_rx.h"</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Do not change these values: if changed, then change also in respective</div><div class='add'>+ * TXdma and Rxdma engines</div><div class='add'>+ */</div><div class='add'>+#define NUM_DESC_PER_RING_TX         512	// TX Do not change these values</div><div class='add'>+#define NUM_TCB                      64</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * These values are all superseded by registry entries to facilitate tuning.</div><div class='add'>+ * Once the desired performance has been achieved, the optimal registry values</div><div class='add'>+ * should be re-populated to these #defines:</div><div class='add'>+ */</div><div class='add'>+#define NUM_TRAFFIC_CLASSES          1</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * There are three ways of counting errors - if there are more than X errors</div><div class='add'>+ * in Y packets (represented by the "SAMPLE" macros), if there are more than</div><div class='add'>+ * N errors in a S mSec time period (the "PERIOD" macros), or if there are</div><div class='add'>+ * consecutive packets with errors (CONSEC_ERRORED_THRESH).  This last covers</div><div class='add'>+ * for "Bursty" errors, and the errored packets may well not be contiguous,</div><div class='add'>+ * but several errors where the packet counter has changed by less than a</div><div class='add'>+ * small amount will cause this count to increment.</div><div class='add'>+ */</div><div class='add'>+#define TX_PACKETS_IN_SAMPLE        10000</div><div class='add'>+#define TX_MAX_ERRORS_IN_SAMPLE     50</div><div class='add'>+</div><div class='add'>+#define TX_ERROR_PERIOD             1000</div><div class='add'>+#define TX_MAX_ERRORS_IN_PERIOD     10</div><div class='add'>+</div><div class='add'>+#define LINK_DETECTION_TIMER        5000</div><div class='add'>+</div><div class='add'>+#define TX_CONSEC_RANGE             5</div><div class='add'>+#define TX_CONSEC_ERRORED_THRESH    10</div><div class='add'>+</div><div class='add'>+#define LO_MARK_PERCENT_FOR_PSR     15</div><div class='add'>+#define LO_MARK_PERCENT_FOR_RX      15</div><div class='add'>+</div><div class='add'>+/* Macros for flag and ref count operations        */</div><div class='add'>+#define MP_SET_FLAG(_M, _F)         ((_M)-&gt;Flags |= (_F))</div><div class='add'>+#define MP_CLEAR_FLAG(_M, _F)       ((_M)-&gt;Flags &amp;= ~(_F))</div><div class='add'>+#define MP_CLEAR_FLAGS(_M)          ((_M)-&gt;Flags = 0)</div><div class='add'>+#define MP_TEST_FLAG(_M, _F)        (((_M)-&gt;Flags &amp; (_F)) != 0)</div><div class='add'>+#define MP_TEST_FLAGS(_M, _F)       (((_M)-&gt;Flags &amp; (_F)) == (_F))</div><div class='add'>+#define MP_IS_FLAG_CLEAR(_M, _F)    (((_M)-&gt;Flags &amp; (_F)) == 0)</div><div class='add'>+</div><div class='add'>+#define MP_INC_RCV_REF(_A)          atomic_inc(&amp;(_A)-&gt;RcvRefCount)</div><div class='add'>+#define MP_DEC_RCV_REF(_A)          atomic_dec(&amp;(_A)-&gt;RcvRefCount)</div><div class='add'>+#define MP_GET_RCV_REF(_A)          atomic_read(&amp;(_A)-&gt;RcvRefCount)</div><div class='add'>+</div><div class='add'>+/* Macros specific to the private adapter structure */</div><div class='add'>+#define MP_TCB_RESOURCES_AVAILABLE(_M) ((_M)-&gt;TxRing.nBusySend &lt; NUM_TCB)</div><div class='add'>+#define MP_TCB_RESOURCES_NOT_AVAILABLE(_M) ((_M)-&gt;TxRing.nBusySend &gt;= NUM_TCB)</div><div class='add'>+</div><div class='add'>+#define MP_SHOULD_FAIL_SEND(_M)   ((_M)-&gt;Flags &amp; fMP_ADAPTER_FAIL_SEND_MASK)</div><div class='add'>+#define MP_IS_NOT_READY(_M)       ((_M)-&gt;Flags &amp; fMP_ADAPTER_NOT_READY_MASK)</div><div class='add'>+#define MP_IS_READY(_M)           !((_M)-&gt;Flags &amp; fMP_ADAPTER_NOT_READY_MASK)</div><div class='add'>+</div><div class='add'>+#define MP_HAS_CABLE(_M)           !((_M)-&gt;Flags &amp; fMP_ADAPTER_NO_CABLE)</div><div class='add'>+#define MP_LINK_DETECTED(_M)       !((_M)-&gt;Flags &amp; fMP_ADAPTER_LINK_DETECTION)</div><div class='add'>+</div><div class='add'>+/* Counters for error rate monitoring */</div><div class='add'>+typedef struct _MP_ERR_COUNTERS {</div><div class='add'>+	u32 PktCountTxPackets;</div><div class='add'>+	u32 PktCountTxErrors;</div><div class='add'>+	u32 TimerBasedTxErrors;</div><div class='add'>+	u32 PktCountLastError;</div><div class='add'>+	u32 ErredConsecPackets;</div><div class='add'>+} MP_ERR_COUNTERS, *PMP_ERR_COUNTERS;</div><div class='add'>+</div><div class='add'>+/* RFD (Receive Frame Descriptor) */</div><div class='add'>+typedef struct _MP_RFD {</div><div class='add'>+	struct list_head list_node;</div><div class='add'>+	struct sk_buff *Packet;</div><div class='add'>+	u32 PacketSize;	// total size of receive frame</div><div class='add'>+	u16 iBufferIndex;</div><div class='add'>+	u8 iRingIndex;</div><div class='add'>+} MP_RFD, *PMP_RFD;</div><div class='add'>+</div><div class='add'>+/* Enum for Flow Control */</div><div class='add'>+typedef enum _eflow_control_t {</div><div class='add'>+	Both = 0,</div><div class='add'>+	TxOnly = 1,</div><div class='add'>+	RxOnly = 2,</div><div class='add'>+	None = 3</div><div class='add'>+} eFLOW_CONTROL_t, *PeFLOW_CONTROL_t;</div><div class='add'>+</div><div class='add'>+/* Struct to define some device statistics */</div><div class='add'>+typedef struct _ce_stats_t {</div><div class='add'>+	/* Link Input/Output stats */</div><div class='add'>+	uint64_t ipackets;	// # of in packets</div><div class='add'>+	uint64_t opackets;	// # of out packets</div><div class='add'>+</div><div class='add'>+	/* MIB II variables</div><div class='add'>+	 *</div><div class='add'>+	 * NOTE: atomic_t types are only guaranteed to store 24-bits; if we</div><div class='add'>+	 * MUST have 32, then we'll need another way to perform atomic</div><div class='add'>+	 * operations</div><div class='add'>+	 */</div><div class='add'>+	u32 unircv;	// # multicast packets received</div><div class='add'>+	atomic_t unixmt;	// # multicast packets for Tx</div><div class='add'>+	u32 multircv;	// # multicast packets received</div><div class='add'>+	atomic_t multixmt;	// # multicast packets for Tx</div><div class='add'>+	u32 brdcstrcv;	// # broadcast packets received</div><div class='add'>+	atomic_t brdcstxmt;	// # broadcast packets for Tx</div><div class='add'>+	u32 norcvbuf;	// # Rx packets discarded</div><div class='add'>+	u32 noxmtbuf;	// # Tx packets discarded</div><div class='add'>+</div><div class='add'>+	/* Transciever state informations. */</div><div class='add'>+	u8 xcvr_addr;</div><div class='add'>+	u32 xcvr_id;</div><div class='add'>+</div><div class='add'>+	/* Tx Statistics. */</div><div class='add'>+	u32 tx_uflo;		// Tx Underruns</div><div class='add'>+</div><div class='add'>+	u32 collisions;</div><div class='add'>+	u32 excessive_collisions;</div><div class='add'>+	u32 first_collision;</div><div class='add'>+	u32 late_collisions;</div><div class='add'>+	u32 max_pkt_error;</div><div class='add'>+	u32 tx_deferred;</div><div class='add'>+</div><div class='add'>+	/* Rx Statistics. */</div><div class='add'>+	u32 rx_ov_flow;	// Rx Over Flow</div><div class='add'>+</div><div class='add'>+	u32 length_err;</div><div class='add'>+	u32 alignment_err;</div><div class='add'>+	u32 crc_err;</div><div class='add'>+	u32 code_violations;</div><div class='add'>+	u32 other_errors;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ET131X_DEBUG</div><div class='add'>+	u32 UnhandledInterruptsPerSec;</div><div class='add'>+	u32 RxDmaInterruptsPerSec;</div><div class='add'>+	u32 TxDmaInterruptsPerSec;</div><div class='add'>+	u32 WatchDogInterruptsPerSec;</div><div class='add'>+#endif	/* CONFIG_ET131X_DEBUG */</div><div class='add'>+</div><div class='add'>+	u32 SynchrounousIterations;</div><div class='add'>+	INTERRUPT_t InterruptStatus;</div><div class='add'>+} CE_STATS_t, *PCE_STATS_t;</div><div class='add'>+</div><div class='add'>+/* The private adapter structure */</div><div class='add'>+struct et131x_adapter {</div><div class='add'>+	struct net_device *netdev;</div><div class='add'>+	struct pci_dev *pdev;</div><div class='add'>+</div><div class='add'>+	struct work_struct task;</div><div class='add'>+</div><div class='add'>+	/* Flags that indicate current state of the adapter */</div><div class='add'>+	u32 Flags;</div><div class='add'>+	u32 HwErrCount;</div><div class='add'>+</div><div class='add'>+	/* Configuration  */</div><div class='add'>+	u8 PermanentAddress[ETH_ALEN];</div><div class='add'>+	u8 CurrentAddress[ETH_ALEN];</div><div class='add'>+	bool bOverrideAddress;</div><div class='add'>+	bool bEepromPresent;</div><div class='add'>+	u8 eepromData[2];</div><div class='add'>+</div><div class='add'>+	/* Spinlocks */</div><div class='add'>+	spinlock_t Lock;</div><div class='add'>+</div><div class='add'>+	spinlock_t TCBSendQLock;</div><div class='add'>+	spinlock_t TCBReadyQLock;</div><div class='add'>+	spinlock_t SendHWLock;</div><div class='add'>+	spinlock_t SendWaitLock;</div><div class='add'>+</div><div class='add'>+	spinlock_t RcvLock;</div><div class='add'>+	spinlock_t RcvPendLock;</div><div class='add'>+	spinlock_t FbrLock;</div><div class='add'>+</div><div class='add'>+	spinlock_t PHYLock;</div><div class='add'>+</div><div class='add'>+	/* Packet Filter and look ahead size */</div><div class='add'>+	u32 PacketFilter;</div><div class='add'>+	u32 ulLookAhead;</div><div class='add'>+	u32 uiLinkSpeed;</div><div class='add'>+	u32 uiDuplexMode;</div><div class='add'>+	u32 uiAutoNegStatus;</div><div class='add'>+	u8 ucLinkStatus;</div><div class='add'>+</div><div class='add'>+	/* multicast list */</div><div class='add'>+	u32 MCAddressCount;</div><div class='add'>+	u8 MCList[NIC_MAX_MCAST_LIST][ETH_ALEN];</div><div class='add'>+</div><div class='add'>+	/* MAC test */</div><div class='add'>+	TXMAC_TXTEST_t TxMacTest;</div><div class='add'>+</div><div class='add'>+	/* Pointer to the device's PCI register space */</div><div class='add'>+	ADDRESS_MAP_t __iomem *CSRAddress;</div><div class='add'>+</div><div class='add'>+	/* PCI config space info, for debug purposes only. */</div><div class='add'>+	u8 RevisionID;</div><div class='add'>+	u16 VendorID;</div><div class='add'>+	u16 DeviceID;</div><div class='add'>+	u16 SubVendorID;</div><div class='add'>+	u16 SubSystemID;</div><div class='add'>+	u32 CacheFillSize;</div><div class='add'>+	u16 PciXDevCtl;</div><div class='add'>+	u8 pci_lat_timer;</div><div class='add'>+	u8 pci_hdr_type;</div><div class='add'>+	u8 pci_bist;</div><div class='add'>+	u32 pci_cfg_state[64 / sizeof(u32)];</div><div class='add'>+</div><div class='add'>+	/* Registry parameters */</div><div class='add'>+	u8 SpeedDuplex;		// speed/duplex</div><div class='add'>+	eFLOW_CONTROL_t RegistryFlowControl;	// for 802.3x flow control</div><div class='add'>+	u8 RegistryWOLMatch;	// Enable WOL pattern-matching</div><div class='add'>+	u8 RegistryWOLLink;	// Link state change is independant</div><div class='add'>+	u8 RegistryPhyComa;	// Phy Coma mode enable/disable</div><div class='add'>+</div><div class='add'>+	u32 RegistryRxMemEnd;	// Size of internal rx memory</div><div class='add'>+	u8 RegistryMACStat;	// If set, read MACSTAT, else don't</div><div class='add'>+	u32 RegistryVlanTag;	// 802.1q Vlan TAG</div><div class='add'>+	u32 RegistryJumboPacket;	// Max supported ethernet packet size</div><div class='add'>+</div><div class='add'>+	u32 RegistryTxNumBuffers;</div><div class='add'>+	u32 RegistryTxTimeInterval;</div><div class='add'>+</div><div class='add'>+	u32 RegistryRxNumBuffers;</div><div class='add'>+	u32 RegistryRxTimeInterval;</div><div class='add'>+</div><div class='add'>+	/* Validation helpers */</div><div class='add'>+	u8 RegistryPMWOL;</div><div class='add'>+	u8 RegistryNMIDisable;</div><div class='add'>+	u32 RegistryDMACache;</div><div class='add'>+	u32 RegistrySCGain;</div><div class='add'>+	u8 RegistryPhyLoopbk;	// Enable Phy loopback</div><div class='add'>+</div><div class='add'>+	/* Derived from the registry: */</div><div class='add'>+	u8 AiForceDpx;		// duplex setting</div><div class='add'>+	u16 AiForceSpeed;		// 'Speed', user over-ride of line speed</div><div class='add'>+	eFLOW_CONTROL_t FlowControl;	// flow control validated by the far-end</div><div class='add'>+	enum {</div><div class='add'>+		NETIF_STATUS_INVALID = 0,</div><div class='add'>+		NETIF_STATUS_MEDIA_CONNECT,</div><div class='add'>+		NETIF_STATUS_MEDIA_DISCONNECT,</div><div class='add'>+		NETIF_STATUS_MAX</div><div class='add'>+	} MediaState;</div><div class='add'>+	u8 DriverNoPhyAccess;</div><div class='add'>+</div><div class='add'>+	/* Minimize init-time */</div><div class='add'>+	bool bQueryPending;</div><div class='add'>+	bool bSetPending;</div><div class='add'>+	bool bResetPending;</div><div class='add'>+	struct timer_list ErrorTimer;</div><div class='add'>+	bool bLinkTimerActive;</div><div class='add'>+	MP_POWER_MGMT PoMgmt;</div><div class='add'>+	INTERRUPT_t CachedMaskValue;</div><div class='add'>+</div><div class='add'>+	atomic_t RcvRefCount;	// Num packets not yet returned</div><div class='add'>+</div><div class='add'>+	/* Xcvr status at last poll */</div><div class='add'>+	MI_BMSR_t Bmsr;</div><div class='add'>+</div><div class='add'>+	/* Tx Memory Variables */</div><div class='add'>+	TX_RING_t TxRing;</div><div class='add'>+</div><div class='add'>+	/* Rx Memory Variables */</div><div class='add'>+	RX_RING_t RxRing;</div><div class='add'>+</div><div class='add'>+	/* ET1310 register Access */</div><div class='add'>+	JAGCORE_ACCESS_REGS JagCoreRegs;</div><div class='add'>+	PCI_CFG_SPACE_REGS PciCfgRegs;</div><div class='add'>+</div><div class='add'>+	/* Loopback specifics */</div><div class='add'>+	u8 ReplicaPhyLoopbk;	// Replica Enable</div><div class='add'>+	u8 ReplicaPhyLoopbkPF;	// Replica Enable Pass/Fail</div><div class='add'>+</div><div class='add'>+	/* Stats */</div><div class='add'>+	CE_STATS_t Stats;</div><div class='add'>+</div><div class='add'>+	struct net_device_stats net_stats;</div><div class='add'>+	struct net_device_stats net_stats_prev;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define MPSendPacketsHandler  MPSendPackets</div><div class='add'>+#define MP_FREE_SEND_PACKET_FUN(Adapter, pMpTcb) \</div><div class='add'>+	et131x_free_send_packet(Adapter, pMpTcb)</div><div class='add'>+#define MpSendPacketFun(Adapter, Packet) MpSendPacket(Adapter, Packet)</div><div class='add'>+</div><div class='add'>+#endif /* __ET131X_ADAPTER_H__ */</div><div class='head'>diff --git a/drivers/staging/et131x/et131x_config.c b/drivers/staging/et131x/et131x_config.c<br/>new file mode 100644<br/>index 000000000000..0adbaa6ca078<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/et131x/et131x_config.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/et131x/et131x_config.c</a></div><div class='hunk'>@@ -0,0 +1,325 @@</div><div class='add'>+/*</div><div class='add'>+ * Agere Systems Inc.</div><div class='add'>+ * 10/100/1000 Base-T Ethernet Driver for the ET1301 and ET131x series MACs</div><div class='add'>+ *</div><div class='add'>+ * Copyright © 2005 Agere Systems Inc.</div><div class='add'>+ * All rights reserved.</div><div class='add'>+ *   http://www.agere.com</div><div class='add'>+ *</div><div class='add'>+ *------------------------------------------------------------------------------</div><div class='add'>+ *</div><div class='add'>+ * et131x_config.c - Handles parsing of configuration data during</div><div class='add'>+ *                   initialization.</div><div class='add'>+ *</div><div class='add'>+ *------------------------------------------------------------------------------</div><div class='add'>+ *</div><div class='add'>+ * SOFTWARE LICENSE</div><div class='add'>+ *</div><div class='add'>+ * This software is provided subject to the following terms and conditions,</div><div class='add'>+ * which you should read carefully before using the software.  Using this</div><div class='add'>+ * software indicates your acceptance of these terms and conditions.  If you do</div><div class='add'>+ * not agree with these terms and conditions, do not use the software.</div><div class='add'>+ *</div><div class='add'>+ * Copyright © 2005 Agere Systems Inc.</div><div class='add'>+ * All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source or binary forms, with or without</div><div class='add'>+ * modifications, are permitted provided that the following conditions are met:</div><div class='add'>+ *</div><div class='add'>+ * . Redistributions of source code must retain the above copyright notice, this</div><div class='add'>+ *    list of conditions and the following Disclaimer as comments in the code as</div><div class='add'>+ *    well as in the documentation and/or other materials provided with the</div><div class='add'>+ *    distribution.</div><div class='add'>+ *</div><div class='add'>+ * . Redistributions in binary form must reproduce the above copyright notice,</div><div class='add'>+ *    this list of conditions and the following Disclaimer in the documentation</div><div class='add'>+ *    and/or other materials provided with the distribution.</div><div class='add'>+ *</div><div class='add'>+ * . Neither the name of Agere Systems Inc. nor the names of the contributors</div><div class='add'>+ *    may be used to endorse or promote products derived from this software</div><div class='add'>+ *    without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ * Disclaimer</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES,</div><div class='add'>+ * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  ANY</div><div class='add'>+ * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN</div><div class='add'>+ * RISK. IN NO EVENT SHALL AGERE SYSTEMS INC. OR CONTRIBUTORS BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, INCLUDING, BUT NOT LIMITED TO, CONTRACT, STRICT</div><div class='add'>+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT</div><div class='add'>+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH</div><div class='add'>+ * DAMAGE.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "et131x_version.h"</div><div class='add'>+#include "et131x_debug.h"</div><div class='add'>+#include "et131x_defs.h"</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/ptrace.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/ctype.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/timer.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/in.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/system.h&gt;</div><div class='add'>+#include &lt;asm/bitops.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/if_arp.h&gt;</div><div class='add'>+#include &lt;linux/ioport.h&gt;</div><div class='add'>+</div><div class='add'>+#include "et1310_phy.h"</div><div class='add'>+#include "et1310_pm.h"</div><div class='add'>+#include "et1310_jagcore.h"</div><div class='add'>+</div><div class='add'>+#include "et131x_adapter.h"</div><div class='add'>+#include "et131x_initpci.h"</div><div class='add'>+#include "et131x_config.h"</div><div class='add'>+</div><div class='add'>+#include "et1310_tx.h"</div><div class='add'>+</div><div class='add'>+/* Data for debugging facilities */</div><div class='add'>+#ifdef CONFIG_ET131X_DEBUG</div><div class='add'>+extern dbg_info_t *et131x_dbginfo;</div><div class='add'>+#endif /* CONFIG_ET131X_DEBUG */</div><div class='add'>+</div><div class='add'>+/* Defines for Parameter Default/Min/Max vaules */</div><div class='add'>+#define PARM_SPEED_DUPLEX_DEF   0</div><div class='add'>+#define PARM_SPEED_DUPLEX_MIN   0</div><div class='add'>+#define PARM_SPEED_DUPLEX_MAX   5</div><div class='add'>+</div><div class='add'>+#define PARM_VLAN_TAG_DEF       0</div><div class='add'>+#define PARM_VLAN_TAG_MIN       0</div><div class='add'>+#define PARM_VLAN_TAG_MAX       4095</div><div class='add'>+</div><div class='add'>+#define PARM_FLOW_CTL_DEF       0</div><div class='add'>+#define PARM_FLOW_CTL_MIN       0</div><div class='add'>+#define PARM_FLOW_CTL_MAX       3</div><div class='add'>+</div><div class='add'>+#define PARM_WOL_LINK_DEF       3</div><div class='add'>+#define PARM_WOL_LINK_MIN       0</div><div class='add'>+#define PARM_WOL_LINK_MAX       3</div><div class='add'>+</div><div class='add'>+#define PARM_WOL_MATCH_DEF      7</div><div class='add'>+#define PARM_WOL_MATCH_MIN      0</div><div class='add'>+#define PARM_WOL_MATCH_MAX      7</div><div class='add'>+</div><div class='add'>+#define PARM_JUMBO_PKT_DEF      1514</div><div class='add'>+#define PARM_JUMBO_PKT_MIN      1514</div><div class='add'>+#define PARM_JUMBO_PKT_MAX      9216</div><div class='add'>+</div><div class='add'>+#define PARM_PHY_COMA_DEF       0</div><div class='add'>+#define PARM_PHY_COMA_MIN       0</div><div class='add'>+#define PARM_PHY_COMA_MAX       1</div><div class='add'>+</div><div class='add'>+#define PARM_RX_NUM_BUFS_DEF    4</div><div class='add'>+#define PARM_RX_NUM_BUFS_MIN    1</div><div class='add'>+#define PARM_RX_NUM_BUFS_MAX    64</div><div class='add'>+</div><div class='add'>+#define PARM_RX_TIME_INT_DEF    10</div><div class='add'>+#define PARM_RX_TIME_INT_MIN    2</div><div class='add'>+#define PARM_RX_TIME_INT_MAX    320</div><div class='add'>+</div><div class='add'>+#define PARM_TX_NUM_BUFS_DEF    4</div><div class='add'>+#define PARM_TX_NUM_BUFS_MIN    1</div><div class='add'>+#define PARM_TX_NUM_BUFS_MAX    40</div><div class='add'>+</div><div class='add'>+#define PARM_TX_TIME_INT_DEF    40</div><div class='add'>+#define PARM_TX_TIME_INT_MIN    1</div><div class='add'>+#define PARM_TX_TIME_INT_MAX    140</div><div class='add'>+</div><div class='add'>+#define PARM_RX_MEM_END_DEF     0x2bc</div><div class='add'>+#define PARM_RX_MEM_END_MIN     0</div><div class='add'>+#define PARM_RX_MEM_END_MAX     0x3ff</div><div class='add'>+</div><div class='add'>+#define PARM_MAC_STAT_DEF       1</div><div class='add'>+#define PARM_MAC_STAT_MIN       0</div><div class='add'>+#define PARM_MAC_STAT_MAX       1</div><div class='add'>+</div><div class='add'>+#define PARM_SC_GAIN_DEF        7</div><div class='add'>+#define PARM_SC_GAIN_MIN        0</div><div class='add'>+#define PARM_SC_GAIN_MAX        7</div><div class='add'>+</div><div class='add'>+#define PARM_PM_WOL_DEF         0</div><div class='add'>+#define PARM_PM_WOL_MIN         0</div><div class='add'>+#define PARM_PM_WOL_MAX         1</div><div class='add'>+</div><div class='add'>+#define PARM_NMI_DISABLE_DEF    0</div><div class='add'>+#define PARM_NMI_DISABLE_MIN    0</div><div class='add'>+#define PARM_NMI_DISABLE_MAX    2</div><div class='add'>+</div><div class='add'>+#define PARM_DMA_CACHE_DEF      0</div><div class='add'>+#define PARM_DMA_CACHE_MIN      0</div><div class='add'>+#define PARM_DMA_CACHE_MAX      15</div><div class='add'>+</div><div class='add'>+#define PARM_PHY_LOOPBK_DEF     0</div><div class='add'>+#define PARM_PHY_LOOPBK_MIN     0</div><div class='add'>+#define PARM_PHY_LOOPBK_MAX     1</div><div class='add'>+</div><div class='add'>+#define PARM_MAC_ADDRESS_DEF    { 0x00, 0x05, 0x3d, 0x00, 0x02, 0x00 }</div><div class='add'>+</div><div class='add'>+/* Module parameter for disabling NMI</div><div class='add'>+ * et131x_speed_set :</div><div class='add'>+ * Set Link speed and dublex manually (0-5)  [0]</div><div class='add'>+ *  1 : 10Mb   Half-Duplex</div><div class='add'>+ *  2 : 10Mb   Full-Duplex</div><div class='add'>+ *  3 : 100Mb  Half-Duplex</div><div class='add'>+ *  4 : 100Mb  Full-Duplex</div><div class='add'>+ *  5 : 1000Mb Full-Duplex</div><div class='add'>+ *  0 : Auto Speed Auto Dublex // default</div><div class='add'>+ */</div><div class='add'>+static u32 et131x_nmi_disable = PARM_NMI_DISABLE_DEF;</div><div class='add'>+module_param(et131x_nmi_disable, uint, 0);</div><div class='add'>+MODULE_PARM_DESC(et131x_nmi_disable, "Disable NMI (0-2) [0]");</div><div class='add'>+</div><div class='add'>+/* Module parameter for manual speed setting</div><div class='add'>+ * et131x_nmi_disable :</div><div class='add'>+ * Disable NMI (0-2) [0]</div><div class='add'>+ *  0 :</div><div class='add'>+ *  1 :</div><div class='add'>+ *  2 :</div><div class='add'>+ */</div><div class='add'>+static u32 et131x_speed_set = PARM_SPEED_DUPLEX_DEF;</div><div class='add'>+module_param(et131x_speed_set, uint, 0);</div><div class='add'>+MODULE_PARM_DESC(et131x_speed_set,</div><div class='add'>+		 "Set Link speed and dublex manually (0-5)  [0] \n  1 : 10Mb   Half-Duplex \n  2 : 10Mb   Full-Duplex \n  3 : 100Mb  Half-Duplex \n  4 : 100Mb  Full-Duplex \n  5 : 1000Mb Full-Duplex \n 0 : Auto Speed Auto Dublex");</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * et131x_config_parse</div><div class='add'>+ * @pAdapter: pointer to the private adapter struct</div><div class='add'>+ *</div><div class='add'>+ * Parses a configuration from some location (module parameters, for example)</div><div class='add'>+ * into the private adapter struct</div><div class='add'>+ */</div><div class='add'>+void et131x_config_parse(struct et131x_adapter *pAdapter)</div><div class='add'>+{</div><div class='add'>+	uint8_t macAddrDef[] = PARM_MAC_ADDRESS_DEF;</div><div class='add'>+</div><div class='add'>+	DBG_ENTER(et131x_dbginfo);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The NDIS driver uses the registry to store persistent per-device</div><div class='add'>+	 * configuration, and reads this configuration into the appropriate</div><div class='add'>+	 * elements of the private adapter structure on initialization.</div><div class='add'>+	 * Because Linux has no analog to the registry, use this function to</div><div class='add'>+	 * initialize the private adapter structure with a default</div><div class='add'>+	 * configuration.</div><div class='add'>+	 *</div><div class='add'>+	 * One other possibility is to use a series of module parameters which</div><div class='add'>+	 * can be passed in by the caller when the module is initialized.</div><div class='add'>+	 * However, this implementation does not allow for seperate</div><div class='add'>+	 * configurations in the event multiple devices are present, and hence</div><div class='add'>+	 * will not suffice.</div><div class='add'>+	 *</div><div class='add'>+	 * If another method is derived which addresses this problem, this is</div><div class='add'>+	 * where it should be implemented.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	 /* Set the private adapter struct with default values for the</div><div class='add'>+	  * corresponding parameters</div><div class='add'>+	  */</div><div class='add'>+	if (et131x_speed_set != PARM_SPEED_DUPLEX_DEF) {</div><div class='add'>+		DBG_VERBOSE(et131x_dbginfo, "Speed set manually to : %d \n",</div><div class='add'>+			    et131x_speed_set);</div><div class='add'>+		pAdapter-&gt;SpeedDuplex = et131x_speed_set;</div><div class='add'>+	} else {</div><div class='add'>+		pAdapter-&gt;SpeedDuplex = PARM_SPEED_DUPLEX_DEF;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	//  pAdapter-&gt;SpeedDuplex            = PARM_SPEED_DUPLEX_DEF;</div><div class='add'>+</div><div class='add'>+	pAdapter-&gt;RegistryVlanTag = PARM_VLAN_TAG_DEF;</div><div class='add'>+	pAdapter-&gt;RegistryFlowControl = PARM_FLOW_CTL_DEF;</div><div class='add'>+	pAdapter-&gt;RegistryWOLLink = PARM_WOL_LINK_DEF;</div><div class='add'>+	pAdapter-&gt;RegistryWOLMatch = PARM_WOL_MATCH_DEF;</div><div class='add'>+	pAdapter-&gt;RegistryJumboPacket = PARM_JUMBO_PKT_DEF;</div><div class='add'>+	pAdapter-&gt;RegistryPhyComa = PARM_PHY_COMA_DEF;</div><div class='add'>+	pAdapter-&gt;RegistryRxNumBuffers = PARM_RX_NUM_BUFS_DEF;</div><div class='add'>+	pAdapter-&gt;RegistryRxTimeInterval = PARM_RX_TIME_INT_DEF;</div><div class='add'>+	pAdapter-&gt;RegistryTxNumBuffers = PARM_TX_NUM_BUFS_DEF;</div><div class='add'>+	pAdapter-&gt;RegistryTxTimeInterval = PARM_TX_TIME_INT_DEF;</div><div class='add'>+	pAdapter-&gt;RegistryRxMemEnd = PARM_RX_MEM_END_DEF;</div><div class='add'>+	pAdapter-&gt;RegistryMACStat = PARM_MAC_STAT_DEF;</div><div class='add'>+	pAdapter-&gt;RegistrySCGain = PARM_SC_GAIN_DEF;</div><div class='add'>+	pAdapter-&gt;RegistryPMWOL = PARM_PM_WOL_DEF;</div><div class='add'>+</div><div class='add'>+	if (et131x_nmi_disable != PARM_NMI_DISABLE_DEF) {</div><div class='add'>+		pAdapter-&gt;RegistryNMIDisable = et131x_nmi_disable;</div><div class='add'>+	} else {</div><div class='add'>+		pAdapter-&gt;RegistryNMIDisable = PARM_NMI_DISABLE_DEF;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pAdapter-&gt;RegistryDMACache = PARM_DMA_CACHE_DEF;</div><div class='add'>+	pAdapter-&gt;RegistryPhyLoopbk = PARM_PHY_LOOPBK_DEF;</div><div class='add'>+</div><div class='add'>+	/* Set the MAC address to a default */</div><div class='add'>+	memcpy(pAdapter-&gt;CurrentAddress, macAddrDef, ETH_ALEN);</div><div class='add'>+	pAdapter-&gt;bOverrideAddress = false;</div><div class='add'>+</div><div class='add'>+	DBG_TRACE(et131x_dbginfo,</div><div class='add'>+		  "Default MAC Address  : %02x:%02x:%02x:%02x:%02x:%02x\n",</div><div class='add'>+		  pAdapter-&gt;CurrentAddress[0], pAdapter-&gt;CurrentAddress[1],</div><div class='add'>+		  pAdapter-&gt;CurrentAddress[2], pAdapter-&gt;CurrentAddress[3],</div><div class='add'>+		  pAdapter-&gt;CurrentAddress[4], pAdapter-&gt;CurrentAddress[5]);</div><div class='add'>+</div><div class='add'>+	/* Decode SpeedDuplex</div><div class='add'>+	 *</div><div class='add'>+	 * Set up as if we are auto negotiating always and then change if we</div><div class='add'>+	 * go into force mode</div><div class='add'>+	 */</div><div class='add'>+	pAdapter-&gt;AiForceSpeed = 0;	// Auto speed</div><div class='add'>+	pAdapter-&gt;AiForceDpx = 0;	// Auto FDX</div><div class='add'>+</div><div class='add'>+	/* If we are the 10/100 device, and gigabit is somehow requested then</div><div class='add'>+	 * knock it down to 100 full.</div><div class='add'>+	 */</div><div class='add'>+	if ((pAdapter-&gt;DeviceID == ET131X_PCI_DEVICE_ID_FAST) &amp;&amp;</div><div class='add'>+	    (pAdapter-&gt;SpeedDuplex == 5)) {</div><div class='add'>+		pAdapter-&gt;SpeedDuplex = 4;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (pAdapter-&gt;SpeedDuplex) {</div><div class='add'>+	case 1:		// 10Mb   Half-Duplex</div><div class='add'>+		pAdapter-&gt;AiForceSpeed = 10;</div><div class='add'>+		pAdapter-&gt;AiForceDpx = 1;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 2:		// 10Mb   Full-Duplex</div><div class='add'>+		pAdapter-&gt;AiForceSpeed = 10;</div><div class='add'>+		pAdapter-&gt;AiForceDpx = 2;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 3:		// 100Mb  Half-Duplex</div><div class='add'>+		pAdapter-&gt;AiForceSpeed = 100;</div><div class='add'>+		pAdapter-&gt;AiForceDpx = 1;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 4:		// 100Mb  Full-Duplex</div><div class='add'>+		pAdapter-&gt;AiForceSpeed = 100;</div><div class='add'>+		pAdapter-&gt;AiForceDpx = 2;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 5:		// 1000Mb Full-Duplex</div><div class='add'>+		pAdapter-&gt;AiForceSpeed = 1000;</div><div class='add'>+		pAdapter-&gt;AiForceDpx = 2;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/staging/et131x/et131x_config.h b/drivers/staging/et131x/et131x_config.h<br/>new file mode 100644<br/>index 000000000000..642c0f6dd6f3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/et131x/et131x_config.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/et131x/et131x_config.h</a></div><div class='hunk'>@@ -0,0 +1,67 @@</div><div class='add'>+/*</div><div class='add'>+ * Agere Systems Inc.</div><div class='add'>+ * 10/100/1000 Base-T Ethernet Driver for the ET1301 and ET131x series MACs</div><div class='add'>+ *</div><div class='add'>+ * Copyright © 2005 Agere Systems Inc.</div><div class='add'>+ * All rights reserved.</div><div class='add'>+ *   http://www.agere.com</div><div class='add'>+ *</div><div class='add'>+ *------------------------------------------------------------------------------</div><div class='add'>+ *</div><div class='add'>+ * et131x_config.h - Defines, structs, enums, prototypes, etc. to support</div><div class='add'>+ *                   et131x_config.c</div><div class='add'>+ *</div><div class='add'>+ *------------------------------------------------------------------------------</div><div class='add'>+ *</div><div class='add'>+ * SOFTWARE LICENSE</div><div class='add'>+ *</div><div class='add'>+ * This software is provided subject to the following terms and conditions,</div><div class='add'>+ * which you should read carefully before using the software.  Using this</div><div class='add'>+ * software indicates your acceptance of these terms and conditions.  If you do</div><div class='add'>+ * not agree with these terms and conditions, do not use the software.</div><div class='add'>+ *</div><div class='add'>+ * Copyright © 2005 Agere Systems Inc.</div><div class='add'>+ * All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source or binary forms, with or without</div><div class='add'>+ * modifications, are permitted provided that the following conditions are met:</div><div class='add'>+ *</div><div class='add'>+ * . Redistributions of source code must retain the above copyright notice, this</div><div class='add'>+ *    list of conditions and the following Disclaimer as comments in the code as</div><div class='add'>+ *    well as in the documentation and/or other materials provided with the</div><div class='add'>+ *    distribution.</div><div class='add'>+ *</div><div class='add'>+ * . Redistributions in binary form must reproduce the above copyright notice,</div><div class='add'>+ *    this list of conditions and the following Disclaimer in the documentation</div><div class='add'>+ *    and/or other materials provided with the distribution.</div><div class='add'>+ *</div><div class='add'>+ * . Neither the name of Agere Systems Inc. nor the names of the contributors</div><div class='add'>+ *    may be used to endorse or promote products derived from this software</div><div class='add'>+ *    without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ * Disclaimer</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES,</div><div class='add'>+ * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  ANY</div><div class='add'>+ * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN</div><div class='add'>+ * RISK. IN NO EVENT SHALL AGERE SYSTEMS INC. OR CONTRIBUTORS BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, INCLUDING, BUT NOT LIMITED TO, CONTRACT, STRICT</div><div class='add'>+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT</div><div class='add'>+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH</div><div class='add'>+ * DAMAGE.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __ET131X_CONFIG_H__</div><div class='add'>+#define __ET131X_CONFIG_H__</div><div class='add'>+</div><div class='add'>+/* Forward declaration of the private adapter structure */</div><div class='add'>+struct et131x_adapter;</div><div class='add'>+</div><div class='add'>+void et131x_config_parse(struct et131x_adapter *adapter);</div><div class='add'>+</div><div class='add'>+#endif /* __ET131X_CONFIG_H__ */</div><div class='head'>diff --git a/drivers/staging/et131x/et131x_debug.c b/drivers/staging/et131x/et131x_debug.c<br/>new file mode 100644<br/>index 000000000000..9ee5bce92c27<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/et131x/et131x_debug.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/et131x/et131x_debug.c</a></div><div class='hunk'>@@ -0,0 +1,218 @@</div><div class='add'>+/*</div><div class='add'>+ * Agere Systems Inc.</div><div class='add'>+ * 10/100/1000 Base-T Ethernet Driver for the ET1301 and ET131x series MACs</div><div class='add'>+ *</div><div class='add'>+ * Copyright © 2005 Agere Systems Inc.</div><div class='add'>+ * All rights reserved.</div><div class='add'>+ *   http://www.agere.com</div><div class='add'>+ *</div><div class='add'>+ *------------------------------------------------------------------------------</div><div class='add'>+ *</div><div class='add'>+ * et131x_debug.c - Routines used for debugging.</div><div class='add'>+ *</div><div class='add'>+ *------------------------------------------------------------------------------</div><div class='add'>+ *</div><div class='add'>+ * SOFTWARE LICENSE</div><div class='add'>+ *</div><div class='add'>+ * This software is provided subject to the following terms and conditions,</div><div class='add'>+ * which you should read carefully before using the software.  Using this</div><div class='add'>+ * software indicates your acceptance of these terms and conditions.  If you do</div><div class='add'>+ * not agree with these terms and conditions, do not use the software.</div><div class='add'>+ *</div><div class='add'>+ * Copyright © 2005 Agere Systems Inc.</div><div class='add'>+ * All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source or binary forms, with or without</div><div class='add'>+ * modifications, are permitted provided that the following conditions are met:</div><div class='add'>+ *</div><div class='add'>+ * . Redistributions of source code must retain the above copyright notice, this</div><div class='add'>+ *    list of conditions and the following Disclaimer as comments in the code as</div><div class='add'>+ *    well as in the documentation and/or other materials provided with the</div><div class='add'>+ *    distribution.</div><div class='add'>+ *</div><div class='add'>+ * . Redistributions in binary form must reproduce the above copyright notice,</div><div class='add'>+ *    this list of conditions and the following Disclaimer in the documentation</div><div class='add'>+ *    and/or other materials provided with the distribution.</div><div class='add'>+ *</div><div class='add'>+ * . Neither the name of Agere Systems Inc. nor the names of the contributors</div><div class='add'>+ *    may be used to endorse or promote products derived from this software</div><div class='add'>+ *    without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ * Disclaimer</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES,</div><div class='add'>+ * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  ANY</div><div class='add'>+ * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN</div><div class='add'>+ * RISK. IN NO EVENT SHALL AGERE SYSTEMS INC. OR CONTRIBUTORS BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, INCLUDING, BUT NOT LIMITED TO, CONTRACT, STRICT</div><div class='add'>+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT</div><div class='add'>+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH</div><div class='add'>+ * DAMAGE.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ET131X_DEBUG</div><div class='add'>+</div><div class='add'>+#include "et131x_version.h"</div><div class='add'>+#include "et131x_debug.h"</div><div class='add'>+#include "et131x_defs.h"</div><div class='add'>+</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/ptrace.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/ctype.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/timer.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/in.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/system.h&gt;</div><div class='add'>+#include &lt;asm/bitops.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/if_arp.h&gt;</div><div class='add'>+#include &lt;linux/ioport.h&gt;</div><div class='add'>+#include &lt;linux/random.h&gt;</div><div class='add'>+</div><div class='add'>+#include "et1310_phy.h"</div><div class='add'>+#include "et1310_pm.h"</div><div class='add'>+#include "et1310_jagcore.h"</div><div class='add'>+</div><div class='add'>+#include "et131x_adapter.h"</div><div class='add'>+#include "et131x_netdev.h"</div><div class='add'>+#include "et131x_config.h"</div><div class='add'>+#include "et131x_isr.h"</div><div class='add'>+</div><div class='add'>+#include "et1310_address_map.h"</div><div class='add'>+#include "et1310_jagcore.h"</div><div class='add'>+#include "et1310_tx.h"</div><div class='add'>+#include "et1310_rx.h"</div><div class='add'>+#include "et1310_mac.h"</div><div class='add'>+</div><div class='add'>+/* Data for debugging facilities */</div><div class='add'>+extern dbg_info_t *et131x_dbginfo;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * DumpTxQueueContents - Dump out the tx queue and the shadow pointers</div><div class='add'>+ * @pAdapter: pointer to our adapter structure</div><div class='add'>+ */</div><div class='add'>+void DumpTxQueueContents(int dbgLvl, struct et131x_adapter *pAdapter)</div><div class='add'>+{</div><div class='add'>+	MMC_t __iomem *mmc = &amp;pAdapter-&gt;CSRAddress-&gt;mmc;</div><div class='add'>+	uint32_t TxQueueAddr;</div><div class='add'>+</div><div class='add'>+	if (DBG_FLAGS(et131x_dbginfo) &amp; dbgLvl) {</div><div class='add'>+		for (TxQueueAddr = 0x200; TxQueueAddr &lt; 0x3ff; TxQueueAddr++) {</div><div class='add'>+			MMC_SRAM_ACCESS_t sram_access;</div><div class='add'>+</div><div class='add'>+			sram_access.value = readl(&amp;mmc-&gt;sram_access.value);</div><div class='add'>+			sram_access.bits.req_addr = TxQueueAddr;</div><div class='add'>+			sram_access.bits.req_access = 1;</div><div class='add'>+			writel(sram_access.value, &amp;mmc-&gt;sram_access.value);</div><div class='add'>+</div><div class='add'>+			DBG_PRINT("Addr 0x%x, Access 0x%08x\t"</div><div class='add'>+				  "Value 1 0x%08x, Value 2 0x%08x, "</div><div class='add'>+				  "Value 3 0x%08x, Value 4 0x%08x, \n",</div><div class='add'>+				  TxQueueAddr,</div><div class='add'>+				  readl(&amp;mmc-&gt;sram_access.value),</div><div class='add'>+				  readl(&amp;mmc-&gt;sram_word1),</div><div class='add'>+				  readl(&amp;mmc-&gt;sram_word2),</div><div class='add'>+				  readl(&amp;mmc-&gt;sram_word3),</div><div class='add'>+				  readl(&amp;mmc-&gt;sram_word4));</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		DBG_PRINT("Shadow Pointers 0x%08x\n",</div><div class='add'>+			  readl(&amp;pAdapter-&gt;CSRAddress-&gt;txmac.shadow_ptr.value));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * DumpDeviceBlock</div><div class='add'>+ * @pAdapter: pointer to our adapter</div><div class='add'>+ *</div><div class='add'>+ * Dumps the first 64 regs of each block of the et-1310 (each block is</div><div class='add'>+ * mapped to a new page, each page is 4096 bytes).</div><div class='add'>+ */</div><div class='add'>+#define NUM_BLOCKS 8</div><div class='add'>+void DumpDeviceBlock(int dbgLvl, struct et131x_adapter *pAdapter,</div><div class='add'>+		     uint32_t Block)</div><div class='add'>+{</div><div class='add'>+	uint32_t Address1, Address2;</div><div class='add'>+	uint32_t __iomem *BigDevicePointer =</div><div class='add'>+		(uint32_t __iomem *) pAdapter-&gt;CSRAddress;</div><div class='add'>+	const char *BlockNames[NUM_BLOCKS] = {</div><div class='add'>+		"Global", "Tx DMA", "Rx DMA", "Tx MAC",</div><div class='add'>+		"Rx MAC", "MAC", "MAC Stat", "MMC"</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/* Output the debug counters to the debug terminal */</div><div class='add'>+	if (DBG_FLAGS(et131x_dbginfo) &amp; dbgLvl) {</div><div class='add'>+		DBG_PRINT("%s block\n", BlockNames[Block]);</div><div class='add'>+		BigDevicePointer += Block * 1024;</div><div class='add'>+		for (Address1 = 0; Address1 &lt; 8; Address1++) {</div><div class='add'>+			for (Address2 = 0; Address2 &lt; 8; Address2++) {</div><div class='add'>+				if (Block == 0 &amp;&amp;</div><div class='add'>+				    (Address1 * 8 + Address2) == 6) {</div><div class='add'>+					DBG_PRINT("  ISR    , ");</div><div class='add'>+				} else {</div><div class='add'>+					DBG_PRINT("0x%08x, ",</div><div class='add'>+						  readl(BigDevicePointer++));</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+			DBG_PRINT("\n");</div><div class='add'>+		}</div><div class='add'>+		DBG_PRINT("\n");</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * DumpDeviceReg</div><div class='add'>+ * @pAdapter: pointer to our adapter</div><div class='add'>+ *</div><div class='add'>+ * Dumps the first 64 regs of each block of the et-1310 (each block is</div><div class='add'>+ * mapped to a new page, each page is 4096 bytes).</div><div class='add'>+ */</div><div class='add'>+void DumpDeviceReg(int dbgLvl, struct et131x_adapter *pAdapter)</div><div class='add'>+{</div><div class='add'>+	uint32_t Address1, Address2;</div><div class='add'>+	uint32_t Block;</div><div class='add'>+	uint32_t __iomem *BigDevicePointer =</div><div class='add'>+		(uint32_t __iomem *) pAdapter-&gt;CSRAddress;</div><div class='add'>+	uint32_t __iomem *Pointer;</div><div class='add'>+	const char *BlockNames[NUM_BLOCKS] = {</div><div class='add'>+		"Global", "Tx DMA", "Rx DMA", "Tx MAC",</div><div class='add'>+		"Rx MAC", "MAC", "MAC Stat", "MMC"</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/* Output the debug counters to the debug terminal */</div><div class='add'>+	if (DBG_FLAGS(et131x_dbginfo) &amp; dbgLvl) {</div><div class='add'>+		for (Block = 0; Block &lt; NUM_BLOCKS; Block++) {</div><div class='add'>+			DBG_PRINT("%s block\n", BlockNames[Block]);</div><div class='add'>+			Pointer = BigDevicePointer + (Block * 1024);</div><div class='add'>+</div><div class='add'>+			for (Address1 = 0; Address1 &lt; 8; Address1++) {</div><div class='add'>+				for (Address2 = 0; Address2 &lt; 8; Address2++) {</div><div class='add'>+					DBG_PRINT("0x%08x, ",</div><div class='add'>+						  readl(Pointer++));</div><div class='add'>+				}</div><div class='add'>+				DBG_PRINT("\n");</div><div class='add'>+			}</div><div class='add'>+			DBG_PRINT("\n");</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif // CONFIG_ET131X_DEBUG</div><div class='head'>diff --git a/drivers/staging/et131x/et131x_debug.h b/drivers/staging/et131x/et131x_debug.h<br/>new file mode 100644<br/>index 000000000000..dab608031d0b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/et131x/et131x_debug.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/et131x/et131x_debug.h</a></div><div class='hunk'>@@ -0,0 +1,201 @@</div><div class='add'>+/*</div><div class='add'>+ * Agere Systems Inc.</div><div class='add'>+ * 10/100/1000 Base-T Ethernet Driver for the ET1301 and ET131x series MACs</div><div class='add'>+ *</div><div class='add'>+ * Copyright © 2005 Agere Systems Inc.</div><div class='add'>+ * All rights reserved.</div><div class='add'>+ *   http://www.agere.com</div><div class='add'>+ *</div><div class='add'>+ *------------------------------------------------------------------------------</div><div class='add'>+ *</div><div class='add'>+ * et131x_debug.h - Defines, structs, enums, prototypes, etc. used for</div><div class='add'>+ *                  outputting debug messages to the system logging facility</div><div class='add'>+ *                  (ksyslogd)</div><div class='add'>+ *</div><div class='add'>+ *------------------------------------------------------------------------------</div><div class='add'>+ *</div><div class='add'>+ * SOFTWARE LICENSE</div><div class='add'>+ *</div><div class='add'>+ * This software is provided subject to the following terms and conditions,</div><div class='add'>+ * which you should read carefully before using the software.  Using this</div><div class='add'>+ * software indicates your acceptance of these terms and conditions.  If you do</div><div class='add'>+ * not agree with these terms and conditions, do not use the software.</div><div class='add'>+ *</div><div class='add'>+ * Copyright © 2005 Agere Systems Inc.</div><div class='add'>+ * All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source or binary forms, with or without</div><div class='add'>+ * modifications, are permitted provided that the following conditions are met:</div><div class='add'>+ *</div><div class='add'>+ * . Redistributions of source code must retain the above copyright notice, this</div><div class='add'>+ *    list of conditions and the following Disclaimer as comments in the code as</div><div class='add'>+ *    well as in the documentation and/or other materials provided with the</div><div class='add'>+ *    distribution.</div><div class='add'>+ *</div><div class='add'>+ * . Redistributions in binary form must reproduce the above copyright notice,</div><div class='add'>+ *    this list of conditions and the following Disclaimer in the documentation</div><div class='add'>+ *    and/or other materials provided with the distribution.</div><div class='add'>+ *</div><div class='add'>+ * . Neither the name of Agere Systems Inc. nor the names of the contributors</div><div class='add'>+ *    may be used to endorse or promote products derived from this software</div><div class='add'>+ *    without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ * Disclaimer</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES,</div><div class='add'>+ * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  ANY</div><div class='add'>+ * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN</div><div class='add'>+ * RISK. IN NO EVENT SHALL AGERE SYSTEMS INC. OR CONTRIBUTORS BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, INCLUDING, BUT NOT LIMITED TO, CONTRACT, STRICT</div><div class='add'>+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT</div><div class='add'>+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH</div><div class='add'>+ * DAMAGE.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __ET131X_DBG_H__</div><div class='add'>+#define __ET131X_DBG_H__</div><div class='add'>+</div><div class='add'>+/* Define Masks for debugging types/levels */</div><div class='add'>+#define DBG_ERROR_ON        0x00000001L</div><div class='add'>+#define DBG_WARNING_ON      0x00000002L</div><div class='add'>+#define DBG_NOTICE_ON       0x00000004L</div><div class='add'>+#define DBG_TRACE_ON        0x00000008L</div><div class='add'>+#define DBG_VERBOSE_ON      0x00000010L</div><div class='add'>+#define DBG_PARAM_ON        0x00000020L</div><div class='add'>+#define DBG_BREAK_ON        0x00000040L</div><div class='add'>+#define DBG_RX_ON           0x00000100L</div><div class='add'>+#define DBG_TX_ON           0x00000200L</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ET131X_DEBUG</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Set the level of debugging if not done with a preprocessor define. See</div><div class='add'>+ * et131x_main.c, function et131x_init_module() for how the debug level</div><div class='add'>+ * translates into the types of messages displayed.</div><div class='add'>+ */</div><div class='add'>+#ifndef DBG_LVL</div><div class='add'>+#define DBG_LVL	3</div><div class='add'>+#endif /* DBG_LVL */</div><div class='add'>+</div><div class='add'>+#define DBG_DEFAULTS		(DBG_ERROR_ON | DBG_WARNING_ON | DBG_BREAK_ON )</div><div class='add'>+</div><div class='add'>+#define DBG_FLAGS(A)		(A)-&gt;dbgFlags</div><div class='add'>+#define DBG_NAME(A)		(A)-&gt;dbgName</div><div class='add'>+#define DBG_LEVEL(A)		(A)-&gt;dbgLevel</div><div class='add'>+</div><div class='add'>+#ifndef DBG_PRINT</div><div class='add'>+#define DBG_PRINT(S...)		printk(KERN_DEBUG S)</div><div class='add'>+#endif /* DBG_PRINT */</div><div class='add'>+</div><div class='add'>+#ifndef DBG_PRINTC</div><div class='add'>+#define DBG_PRINTC(S...)	printk(S)</div><div class='add'>+#endif /* DBG_PRINTC */</div><div class='add'>+</div><div class='add'>+#ifndef DBG_TRAP</div><div class='add'>+#define DBG_TRAP		{}	/* BUG() */</div><div class='add'>+#endif /* DBG_TRAP */</div><div class='add'>+</div><div class='add'>+#define _ENTER_STR	"&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;"</div><div class='add'>+#define _LEAVE_STR	"&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;"</div><div class='add'>+</div><div class='add'>+#define _DBG_ENTER(A)	printk(KERN_DEBUG "%s:%.*s:%s\n", DBG_NAME(A),	\</div><div class='add'>+				++DBG_LEVEL(A), _ENTER_STR, __func__)</div><div class='add'>+#define _DBG_LEAVE(A)	printk(KERN_DEBUG "%s:%.*s:%s\n", DBG_NAME(A),	\</div><div class='add'>+				DBG_LEVEL(A)--, _LEAVE_STR, __func__)</div><div class='add'>+</div><div class='add'>+#define DBG_ENTER(A)        {if (DBG_FLAGS(A) &amp; DBG_TRACE_ON) \</div><div class='add'>+                                _DBG_ENTER(A);}</div><div class='add'>+</div><div class='add'>+#define DBG_LEAVE(A)        {if (DBG_FLAGS(A) &amp; DBG_TRACE_ON) \</div><div class='add'>+                                _DBG_LEAVE(A);}</div><div class='add'>+</div><div class='add'>+#define DBG_PARAM(A,N,F,S...)   {if (DBG_FLAGS(A) &amp; DBG_PARAM_ON) \</div><div class='add'>+                                    DBG_PRINT("  %s -- "F"\n",N,S);}</div><div class='add'>+</div><div class='add'>+#define DBG_ERROR(A,S...)	\</div><div class='add'>+	if (DBG_FLAGS(A) &amp; DBG_ERROR_ON) {				\</div><div class='add'>+		DBG_PRINT("%s:ERROR:%s ",DBG_NAME(A), __func__);	\</div><div class='add'>+		DBG_PRINTC(S);						\</div><div class='add'>+		DBG_TRAP;						\</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#define DBG_WARNING(A,S...) {if (DBG_FLAGS(A) &amp; DBG_WARNING_ON) \</div><div class='add'>+                                {DBG_PRINT("%s:WARNING:%s ",DBG_NAME(A),__func__);DBG_PRINTC(S);}}</div><div class='add'>+</div><div class='add'>+#define DBG_NOTICE(A,S...)  {if (DBG_FLAGS(A) &amp; DBG_NOTICE_ON) \</div><div class='add'>+                                {DBG_PRINT("%s:NOTICE:%s ",DBG_NAME(A),__func__);DBG_PRINTC(S);}}</div><div class='add'>+</div><div class='add'>+#define DBG_TRACE(A,S...)   {if (DBG_FLAGS(A) &amp; DBG_TRACE_ON) \</div><div class='add'>+                                {DBG_PRINT("%s:TRACE:%s ",DBG_NAME(A), __func__);DBG_PRINTC(S);}}</div><div class='add'>+</div><div class='add'>+#define DBG_VERBOSE(A,S...) {if (DBG_FLAGS(A) &amp; DBG_VERBOSE_ON) \</div><div class='add'>+                                {DBG_PRINT("%s:VERBOSE:%s ",DBG_NAME(A), __func__);DBG_PRINTC(S);}}</div><div class='add'>+</div><div class='add'>+#define DBG_RX(A,S...)      {if (DBG_FLAGS(A) &amp; DBG_RX_ON) \</div><div class='add'>+                                {DBG_PRINT(S);}}</div><div class='add'>+</div><div class='add'>+#define DBG_RX_ENTER(A)     {if (DBG_FLAGS(A) &amp; DBG_RX_ON) \</div><div class='add'>+                                _DBG_ENTER(A);}</div><div class='add'>+</div><div class='add'>+#define DBG_RX_LEAVE(A)     {if (DBG_FLAGS(A) &amp; DBG_RX_ON) \</div><div class='add'>+                                _DBG_LEAVE(A);}</div><div class='add'>+</div><div class='add'>+#define DBG_TX(A,S...)      {if (DBG_FLAGS(A) &amp; DBG_TX_ON) \</div><div class='add'>+                                {DBG_PRINT(S);}}</div><div class='add'>+</div><div class='add'>+#define DBG_TX_ENTER(A)     {if (DBG_FLAGS(A) &amp; DBG_TX_ON) \</div><div class='add'>+                                _DBG_ENTER(A);}</div><div class='add'>+</div><div class='add'>+#define DBG_TX_LEAVE(A)     {if (DBG_FLAGS(A) &amp; DBG_TX_ON) \</div><div class='add'>+                                _DBG_LEAVE(A);}</div><div class='add'>+</div><div class='add'>+#define DBG_ASSERT(C)       {if (!(C)) \</div><div class='add'>+                                {DBG_PRINT("ASSERT(%s) -- %s#%d (%s)\n", \</div><div class='add'>+                                    #C,__FILE__,__LINE__,__func__); \</div><div class='add'>+                                DBG_TRAP;}}</div><div class='add'>+#define STATIC</div><div class='add'>+</div><div class='add'>+typedef struct {</div><div class='add'>+	char *dbgName;</div><div class='add'>+	int dbgLevel;</div><div class='add'>+	unsigned long dbgFlags;</div><div class='add'>+} dbg_info_t;</div><div class='add'>+</div><div class='add'>+#else /* CONFIG_ET131X_DEBUG */</div><div class='add'>+</div><div class='add'>+#define DBG_DEFN</div><div class='add'>+#define DBG_TRAP</div><div class='add'>+#define DBG_PRINT(S...)</div><div class='add'>+#define DBG_ENTER(A)</div><div class='add'>+#define DBG_LEAVE(A)</div><div class='add'>+#define DBG_PARAM(A,N,F,S...)</div><div class='add'>+#define DBG_ERROR(A,S...)</div><div class='add'>+#define DBG_WARNING(A,S...)</div><div class='add'>+#define DBG_NOTICE(A,S...)</div><div class='add'>+#define DBG_TRACE(A,S...)</div><div class='add'>+#define DBG_VERBOSE(A,S...)</div><div class='add'>+#define DBG_RX(A,S...)</div><div class='add'>+#define DBG_RX_ENTER(A)</div><div class='add'>+#define DBG_RX_LEAVE(A)</div><div class='add'>+#define DBG_TX(A,S...)</div><div class='add'>+#define DBG_TX_ENTER(A)</div><div class='add'>+#define DBG_TX_LEAVE(A)</div><div class='add'>+#define DBG_ASSERT(C)</div><div class='add'>+#define STATIC static</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_ET131X_DEBUG */</div><div class='add'>+</div><div class='add'>+/* Forward declaration of the private adapter structure */</div><div class='add'>+struct et131x_adapter;</div><div class='add'>+</div><div class='add'>+void DumpTxQueueContents(int dbgLvl, struct et131x_adapter *adapter);</div><div class='add'>+void DumpDeviceBlock(int dbgLvl, struct et131x_adapter *adapter,</div><div class='add'>+		     unsigned int Block);</div><div class='add'>+void DumpDeviceReg(int dbgLvl, struct et131x_adapter *adapter);</div><div class='add'>+</div><div class='add'>+#endif /* __ET131X_DBG_H__ */</div><div class='head'>diff --git a/drivers/staging/et131x/et131x_defs.h b/drivers/staging/et131x/et131x_defs.h<br/>new file mode 100644<br/>index 000000000000..886cb78698ef<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/et131x/et131x_defs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/et131x/et131x_defs.h</a></div><div class='hunk'>@@ -0,0 +1,128 @@</div><div class='add'>+/*</div><div class='add'>+ * Agere Systems Inc.</div><div class='add'>+ * 10/100/1000 Base-T Ethernet Driver for the ET1301 and ET131x series MACs</div><div class='add'>+ *</div><div class='add'>+ * Copyright © 2005 Agere Systems Inc.</div><div class='add'>+ * All rights reserved.</div><div class='add'>+ *   http://www.agere.com</div><div class='add'>+ *</div><div class='add'>+ *------------------------------------------------------------------------------</div><div class='add'>+ *</div><div class='add'>+ * et131x_defs.h - Defines, structs, enums, prototypes, etc. to assist with OS</div><div class='add'>+ *                 compatibility</div><div class='add'>+ *</div><div class='add'>+ *------------------------------------------------------------------------------</div><div class='add'>+ *</div><div class='add'>+ * SOFTWARE LICENSE</div><div class='add'>+ *</div><div class='add'>+ * This software is provided subject to the following terms and conditions,</div><div class='add'>+ * which you should read carefully before using the software.  Using this</div><div class='add'>+ * software indicates your acceptance of these terms and conditions.  If you do</div><div class='add'>+ * not agree with these terms and conditions, do not use the software.</div><div class='add'>+ *</div><div class='add'>+ * Copyright © 2005 Agere Systems Inc.</div><div class='add'>+ * All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source or binary forms, with or without</div><div class='add'>+ * modifications, are permitted provided that the following conditions are met:</div><div class='add'>+ *</div><div class='add'>+ * . Redistributions of source code must retain the above copyright notice, this</div><div class='add'>+ *    list of conditions and the following Disclaimer as comments in the code as</div><div class='add'>+ *    well as in the documentation and/or other materials provided with the</div><div class='add'>+ *    distribution.</div><div class='add'>+ *</div><div class='add'>+ * . Redistributions in binary form must reproduce the above copyright notice,</div><div class='add'>+ *    this list of conditions and the following Disclaimer in the documentation</div><div class='add'>+ *    and/or other materials provided with the distribution.</div><div class='add'>+ *</div><div class='add'>+ * . Neither the name of Agere Systems Inc. nor the names of the contributors</div><div class='add'>+ *    may be used to endorse or promote products derived from this software</div><div class='add'>+ *    without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ * Disclaimer</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES,</div><div class='add'>+ * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  ANY</div><div class='add'>+ * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN</div><div class='add'>+ * RISK. IN NO EVENT SHALL AGERE SYSTEMS INC. OR CONTRIBUTORS BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, INCLUDING, BUT NOT LIMITED TO, CONTRACT, STRICT</div><div class='add'>+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT</div><div class='add'>+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH</div><div class='add'>+ * DAMAGE.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __ET131X_DEFS_H__</div><div class='add'>+#define __ET131X_DEFS_H__</div><div class='add'>+</div><div class='add'>+/* Packet and header sizes */</div><div class='add'>+#define NIC_MIN_PACKET_SIZE	60</div><div class='add'>+#define NIC_HEADER_SIZE		ETH_HLEN	/* 14 */</div><div class='add'>+</div><div class='add'>+/* Multicast list size */</div><div class='add'>+#define NIC_MAX_MCAST_LIST	128</div><div class='add'>+</div><div class='add'>+/* Supported Filters */</div><div class='add'>+#define ET131X_PACKET_TYPE_DIRECTED		0x0001</div><div class='add'>+#define ET131X_PACKET_TYPE_MULTICAST		0x0002</div><div class='add'>+#define ET131X_PACKET_TYPE_BROADCAST		0x0004</div><div class='add'>+#define ET131X_PACKET_TYPE_PROMISCUOUS		0x0008</div><div class='add'>+#define ET131X_PACKET_TYPE_ALL_MULTICAST	0x0010</div><div class='add'>+</div><div class='add'>+/* Tx Timeout */</div><div class='add'>+#define ET131X_TX_TIMEOUT	(1 * HZ)</div><div class='add'>+#define NIC_SEND_HANG_THRESHOLD	0</div><div class='add'>+</div><div class='add'>+/* MP_TCB flags */</div><div class='add'>+#define fMP_DEST_MULTI			0x00000001</div><div class='add'>+#define fMP_DEST_BROAD			0x00000002</div><div class='add'>+</div><div class='add'>+/* MP_ADAPTER flags */</div><div class='add'>+#define fMP_ADAPTER_RECV_LOOKASIDE	0x00000004</div><div class='add'>+#define fMP_ADAPTER_INTERRUPT_IN_USE	0x00000008</div><div class='add'>+#define fMP_ADAPTER_SECONDARY		0x00000010</div><div class='add'>+</div><div class='add'>+/* MP_SHARED flags */</div><div class='add'>+#define fMP_ADAPTER_SHUTDOWN		0x00100000</div><div class='add'>+#define fMP_ADAPTER_LOWER_POWER		0x00200000</div><div class='add'>+</div><div class='add'>+#define fMP_ADAPTER_NON_RECOVER_ERROR	0x00800000</div><div class='add'>+#define fMP_ADAPTER_RESET_IN_PROGRESS	0x01000000</div><div class='add'>+#define fMP_ADAPTER_NO_CABLE		0x02000000</div><div class='add'>+#define fMP_ADAPTER_HARDWARE_ERROR	0x04000000</div><div class='add'>+#define fMP_ADAPTER_REMOVE_IN_PROGRESS	0x08000000</div><div class='add'>+#define fMP_ADAPTER_HALT_IN_PROGRESS	0x10000000</div><div class='add'>+#define fMP_ADAPTER_LINK_DETECTION	0x20000000</div><div class='add'>+</div><div class='add'>+#define fMP_ADAPTER_FAIL_SEND_MASK	0x3ff00000</div><div class='add'>+#define fMP_ADAPTER_NOT_READY_MASK	0x3ff00000</div><div class='add'>+</div><div class='add'>+/* Some offsets in PCI config space that are actually used. */</div><div class='add'>+#define ET1310_PCI_PM_CAPABILITY	0x40</div><div class='add'>+#define ET1310_PCI_PM_CSR		0x44</div><div class='add'>+#define ET1310_PCI_MAX_PYLD		0x4C</div><div class='add'>+#define ET1310_PCI_DEV_CTRL		0x50</div><div class='add'>+#define ET1310_PCI_DEV_STAT		0x52</div><div class='add'>+#define ET1310_NMI_DISABLE		0x61</div><div class='add'>+#define ET1310_PCI_MAC_ADDRESS		0xA4</div><div class='add'>+#define ET1310_PCI_EEPROM_STATUS	0xB2</div><div class='add'>+#define ET1310_PCI_PHY_INDEX_REG	0xB4</div><div class='add'>+#define ET1310_PCI_ACK_NACK		0xC0</div><div class='add'>+#define ET1310_PCI_REPLAY		0xC2</div><div class='add'>+#define ET1310_PCI_L0L1LATENCY		0xCF</div><div class='add'>+#define ET1310_PCI_SEL_PHY_CTRL		0xE4</div><div class='add'>+#define ET1310_PCI_ADVANCED_ERR		0x100</div><div class='add'>+</div><div class='add'>+/* PCI Vendor/Product IDs */</div><div class='add'>+#define ET131X_PCI_VENDOR_ID		0x11C1	// Agere Systems</div><div class='add'>+#define ET131X_PCI_DEVICE_ID_GIG	0xED00	// ET1310 1000 Base-T</div><div class='add'>+#define ET131X_PCI_DEVICE_ID_FAST	0xED01	// ET1310 100  Base-T</div><div class='add'>+</div><div class='add'>+/* Define order of magnitude converter */</div><div class='add'>+#define NANO_IN_A_MICRO	1000</div><div class='add'>+</div><div class='add'>+#endif /* __ET131X_DEFS_H__ */</div><div class='head'>diff --git a/drivers/staging/et131x/et131x_initpci.c b/drivers/staging/et131x/et131x_initpci.c<br/>new file mode 100644<br/>index 000000000000..4c6f171f5b7c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/et131x/et131x_initpci.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/et131x/et131x_initpci.c</a></div><div class='hunk'>@@ -0,0 +1,1046 @@</div><div class='add'>+/*</div><div class='add'>+ * Agere Systems Inc.</div><div class='add'>+ * 10/100/1000 Base-T Ethernet Driver for the ET1301 and ET131x series MACs</div><div class='add'>+ *</div><div class='add'>+ * Copyright © 2005 Agere Systems Inc.</div><div class='add'>+ * All rights reserved.</div><div class='add'>+ *   http://www.agere.com</div><div class='add'>+ *</div><div class='add'>+ *------------------------------------------------------------------------------</div><div class='add'>+ *</div><div class='add'>+ * et131x_initpci.c - Routines and data used to register the driver with the</div><div class='add'>+ *                    PCI (and PCI Express) subsystem, as well as basic driver</div><div class='add'>+ *                    init and startup.</div><div class='add'>+ *</div><div class='add'>+ *------------------------------------------------------------------------------</div><div class='add'>+ *</div><div class='add'>+ * SOFTWARE LICENSE</div><div class='add'>+ *</div><div class='add'>+ * This software is provided subject to the following terms and conditions,</div><div class='add'>+ * which you should read carefully before using the software.  Using this</div><div class='add'>+ * software indicates your acceptance of these terms and conditions.  If you do</div><div class='add'>+ * not agree with these terms and conditions, do not use the software.</div><div class='add'>+ *</div><div class='add'>+ * Copyright © 2005 Agere Systems Inc.</div><div class='add'>+ * All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source or binary forms, with or without</div><div class='add'>+ * modifications, are permitted provided that the following conditions are met:</div><div class='add'>+ *</div><div class='add'>+ * . Redistributions of source code must retain the above copyright notice, this</div><div class='add'>+ *    list of conditions and the following Disclaimer as comments in the code as</div><div class='add'>+ *    well as in the documentation and/or other materials provided with the</div><div class='add'>+ *    distribution.</div><div class='add'>+ *</div><div class='add'>+ * . Redistributions in binary form must reproduce the above copyright notice,</div><div class='add'>+ *    this list of conditions and the following Disclaimer in the documentation</div><div class='add'>+ *    and/or other materials provided with the distribution.</div><div class='add'>+ *</div><div class='add'>+ * . Neither the name of Agere Systems Inc. nor the names of the contributors</div><div class='add'>+ *    may be used to endorse or promote products derived from this software</div><div class='add'>+ *    without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ * Disclaimer</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES,</div><div class='add'>+ * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  ANY</div><div class='add'>+ * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN</div><div class='add'>+ * RISK. IN NO EVENT SHALL AGERE SYSTEMS INC. OR CONTRIBUTORS BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, INCLUDING, BUT NOT LIMITED TO, CONTRACT, STRICT</div><div class='add'>+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT</div><div class='add'>+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH</div><div class='add'>+ * DAMAGE.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "et131x_version.h"</div><div class='add'>+#include "et131x_debug.h"</div><div class='add'>+#include "et131x_defs.h"</div><div class='add'>+</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/ptrace.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/ctype.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/timer.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/in.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/system.h&gt;</div><div class='add'>+#include &lt;asm/bitops.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/if_arp.h&gt;</div><div class='add'>+#include &lt;linux/ioport.h&gt;</div><div class='add'>+#include &lt;linux/random.h&gt;</div><div class='add'>+</div><div class='add'>+#include "et1310_phy.h"</div><div class='add'>+#include "et1310_pm.h"</div><div class='add'>+#include "et1310_jagcore.h"</div><div class='add'>+</div><div class='add'>+#include "et131x_adapter.h"</div><div class='add'>+#include "et131x_netdev.h"</div><div class='add'>+#include "et131x_config.h"</div><div class='add'>+#include "et131x_isr.h"</div><div class='add'>+</div><div class='add'>+#include "et1310_address_map.h"</div><div class='add'>+#include "et1310_jagcore.h"</div><div class='add'>+#include "et1310_tx.h"</div><div class='add'>+#include "et1310_rx.h"</div><div class='add'>+#include "et1310_mac.h"</div><div class='add'>+#include "et1310_eeprom.h"</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+int __devinit et131x_pci_setup(struct pci_dev *pdev,</div><div class='add'>+			       const struct pci_device_id *ent);</div><div class='add'>+void __devexit et131x_pci_remove(struct pci_dev *pdev);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Modinfo parameters (filled out using defines from et131x_version.h) */</div><div class='add'>+MODULE_AUTHOR(DRIVER_AUTHOR);</div><div class='add'>+MODULE_DESCRIPTION(DRIVER_INFO);</div><div class='add'>+MODULE_LICENSE(DRIVER_LICENSE);</div><div class='add'>+</div><div class='add'>+/* Module Parameters and related data for debugging facilities */</div><div class='add'>+#ifdef CONFIG_ET131X_DEBUG</div><div class='add'>+static u32 et131x_debug_level = DBG_LVL;</div><div class='add'>+static u32 et131x_debug_flags = DBG_DEFAULTS;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+et131x_debug_level :</div><div class='add'>+ Level of debugging desired (0-7)</div><div class='add'>+   7 : DBG_RX_ON | DBG_TX_ON</div><div class='add'>+   6 : DBG_PARAM_ON</div><div class='add'>+   5 : DBG_VERBOSE_ON</div><div class='add'>+   4 : DBG_TRACE_ON</div><div class='add'>+   3 : DBG_NOTICE_ON</div><div class='add'>+   2 : no debug info</div><div class='add'>+   1 : no debug info</div><div class='add'>+   0 : no debug info</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+module_param(et131x_debug_level, uint, 0);</div><div class='add'>+module_param(et131x_debug_flags, uint, 0);</div><div class='add'>+</div><div class='add'>+MODULE_PARM_DESC(et131x_debug_level, "Level of debugging desired (0-7)");</div><div class='add'>+</div><div class='add'>+static dbg_info_t et131x_info = { DRIVER_NAME_EXT, 0, 0 };</div><div class='add'>+dbg_info_t *et131x_dbginfo = &amp;et131x_info;</div><div class='add'>+#endif /* CONFIG_ET131X_DEBUG */</div><div class='add'>+</div><div class='add'>+static struct pci_device_id et131x_pci_table[] __devinitdata = {</div><div class='add'>+	{ET131X_PCI_VENDOR_ID, ET131X_PCI_DEVICE_ID_GIG, PCI_ANY_ID,</div><div class='add'>+	 PCI_ANY_ID, 0, 0, 0UL},</div><div class='add'>+	{ET131X_PCI_VENDOR_ID, ET131X_PCI_DEVICE_ID_FAST, PCI_ANY_ID,</div><div class='add'>+	 PCI_ANY_ID, 0, 0, 0UL},</div><div class='add'>+	{0,}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_DEVICE_TABLE(pci, et131x_pci_table);</div><div class='add'>+</div><div class='add'>+static struct pci_driver et131x_driver = {</div><div class='add'>+      .name	= DRIVER_NAME,</div><div class='add'>+      .id_table	= et131x_pci_table,</div><div class='add'>+      .probe	= et131x_pci_setup,</div><div class='add'>+      .remove	= __devexit_p(et131x_pci_remove),</div><div class='add'>+      .suspend	= NULL,		//et131x_pci_suspend,</div><div class='add'>+      .resume	= NULL,		//et131x_pci_resume,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * et131x_init_module - The "main" entry point called on driver initialization</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 on success, errno on failure (as defined in errno.h)</div><div class='add'>+ */</div><div class='add'>+int et131x_init_module(void)</div><div class='add'>+{</div><div class='add'>+	int result;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ET131X_DEBUG</div><div class='add'>+	/* Set the level of debug messages displayed using the module</div><div class='add'>+	 * parameter</div><div class='add'>+	 */</div><div class='add'>+	et131x_dbginfo-&gt;dbgFlags = et131x_debug_flags;</div><div class='add'>+</div><div class='add'>+	switch (et131x_debug_level) {</div><div class='add'>+	case 7:</div><div class='add'>+		et131x_dbginfo-&gt;dbgFlags |= (DBG_RX_ON | DBG_TX_ON);</div><div class='add'>+</div><div class='add'>+	case 6:</div><div class='add'>+		et131x_dbginfo-&gt;dbgFlags |= DBG_PARAM_ON;</div><div class='add'>+</div><div class='add'>+	case 5:</div><div class='add'>+		et131x_dbginfo-&gt;dbgFlags |= DBG_VERBOSE_ON;</div><div class='add'>+</div><div class='add'>+	case 4:</div><div class='add'>+		et131x_dbginfo-&gt;dbgFlags |= DBG_TRACE_ON;</div><div class='add'>+</div><div class='add'>+	case 3:</div><div class='add'>+		et131x_dbginfo-&gt;dbgFlags |= DBG_NOTICE_ON;</div><div class='add'>+</div><div class='add'>+	case 2:</div><div class='add'>+	case 1:</div><div class='add'>+	case 0:</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+#endif /* CONFIG_ET131X_DEBUG */</div><div class='add'>+</div><div class='add'>+	DBG_ENTER(et131x_dbginfo);</div><div class='add'>+	DBG_PRINT("%s\n", DRIVER_INFO);</div><div class='add'>+</div><div class='add'>+	result = pci_register_driver(&amp;et131x_driver);</div><div class='add'>+</div><div class='add'>+	DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * et131x_cleanup_module - The entry point called on driver cleanup</div><div class='add'>+ */</div><div class='add'>+void et131x_cleanup_module(void)</div><div class='add'>+{</div><div class='add'>+	DBG_ENTER(et131x_dbginfo);</div><div class='add'>+</div><div class='add'>+	pci_unregister_driver(&amp;et131x_driver);</div><div class='add'>+</div><div class='add'>+	DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * These macros map the driver-specific init_module() and cleanup_module()</div><div class='add'>+ * routines so they can be called by the kernel.</div><div class='add'>+ */</div><div class='add'>+module_init(et131x_init_module);</div><div class='add'>+module_exit(et131x_cleanup_module);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * et131x_find_adapter - Find the adapter and get all the assigned resources</div><div class='add'>+ * @adapter: pointer to our private adapter structure</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 on success, errno on failure (as defined in errno.h)</div><div class='add'>+ */</div><div class='add'>+int et131x_find_adapter(struct et131x_adapter *adapter, struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	int result;</div><div class='add'>+	uint8_t eepromStat;</div><div class='add'>+	uint8_t maxPayload = 0;</div><div class='add'>+	uint8_t read_size_reg;</div><div class='add'>+</div><div class='add'>+	DBG_ENTER(et131x_dbginfo);</div><div class='add'>+</div><div class='add'>+	/* Allow disabling of Non-Maskable Interrupts in I/O space, to</div><div class='add'>+	 * support validation.</div><div class='add'>+	 */</div><div class='add'>+	if (adapter-&gt;RegistryNMIDisable) {</div><div class='add'>+		uint8_t RegisterVal;</div><div class='add'>+</div><div class='add'>+		RegisterVal = inb(ET1310_NMI_DISABLE);</div><div class='add'>+		RegisterVal &amp;= 0xf3;</div><div class='add'>+</div><div class='add'>+		if (adapter-&gt;RegistryNMIDisable == 2) {</div><div class='add'>+			RegisterVal |= 0xc;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		outb(ET1310_NMI_DISABLE, RegisterVal);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* We first need to check the EEPROM Status code located at offset</div><div class='add'>+	 * 0xB2 of config space</div><div class='add'>+	 */</div><div class='add'>+	result = pci_read_config_byte(pdev, ET1310_PCI_EEPROM_STATUS,</div><div class='add'>+				      &amp;eepromStat);</div><div class='add'>+</div><div class='add'>+	/* THIS IS A WORKAROUND:</div><div class='add'>+ 	 * I need to call this function twice to get my card in a</div><div class='add'>+	 * LG M1 Express Dual running. I tried also a msleep before this</div><div class='add'>+	 * function, because I thougth there could be some time condidions</div><div class='add'>+	 * but it didn't work. Call the whole function twice also work.</div><div class='add'>+	 */</div><div class='add'>+	result = pci_read_config_byte(pdev, ET1310_PCI_EEPROM_STATUS,</div><div class='add'>+				      &amp;eepromStat);</div><div class='add'>+	if (result != PCIBIOS_SUCCESSFUL) {</div><div class='add'>+		DBG_ERROR(et131x_dbginfo, "Could not read PCI config space for "</div><div class='add'>+			  "EEPROM Status\n");</div><div class='add'>+		DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Determine if the error(s) we care about are present.  If they are</div><div class='add'>+	 * present, we need to fail.</div><div class='add'>+	 */</div><div class='add'>+	if (eepromStat &amp; 0x4C) {</div><div class='add'>+		result = pci_read_config_byte(pdev, PCI_REVISION_ID,</div><div class='add'>+					      &amp;adapter-&gt;RevisionID);</div><div class='add'>+		if (result != PCIBIOS_SUCCESSFUL) {</div><div class='add'>+			DBG_ERROR(et131x_dbginfo,</div><div class='add'>+				  "Could not read PCI config space for "</div><div class='add'>+				  "Revision ID\n");</div><div class='add'>+			DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+			return -EIO;</div><div class='add'>+		} else if (adapter-&gt;RevisionID == 0x01) {</div><div class='add'>+			int32_t nLoop;</div><div class='add'>+			uint8_t ucTemp[4] = { 0xFE, 0x13, 0x10, 0xFF };</div><div class='add'>+</div><div class='add'>+			/* Re-write the first 4 bytes if we have an eeprom</div><div class='add'>+			 * present and the revision id is 1, this fixes the</div><div class='add'>+			 * corruption seen with 1310 B Silicon</div><div class='add'>+			 */</div><div class='add'>+			for (nLoop = 0; nLoop &lt; 3; nLoop++) {</div><div class='add'>+				EepromWriteByte(adapter, nLoop, ucTemp[nLoop],</div><div class='add'>+						0, SINGLE_BYTE);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		DBG_ERROR(et131x_dbginfo,</div><div class='add'>+			  "Fatal EEPROM Status Error - 0x%04x\n", eepromStat);</div><div class='add'>+</div><div class='add'>+		/* This error could mean that there was an error reading the</div><div class='add'>+		 * eeprom or that the eeprom doesn't exist.  We will treat</div><div class='add'>+		 * each case the same and not try to gather additional</div><div class='add'>+		 * information that normally would come from the eeprom, like</div><div class='add'>+		 * MAC Address</div><div class='add'>+		 */</div><div class='add'>+		adapter-&gt;bEepromPresent = false;</div><div class='add'>+</div><div class='add'>+		DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+		return -EIO;</div><div class='add'>+	} else {</div><div class='add'>+		DBG_TRACE(et131x_dbginfo, "EEPROM Status Code - 0x%04x\n",</div><div class='add'>+			  eepromStat);</div><div class='add'>+		adapter-&gt;bEepromPresent = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Read the EEPROM for information regarding LED behavior. Refer to</div><div class='add'>+	 * ET1310_phy.c, et131x_xcvr_init(), for its use.</div><div class='add'>+	 */</div><div class='add'>+	EepromReadByte(adapter, 0x70, &amp;adapter-&gt;eepromData[0], 0, SINGLE_BYTE);</div><div class='add'>+	EepromReadByte(adapter, 0x71, &amp;adapter-&gt;eepromData[1], 0, SINGLE_BYTE);</div><div class='add'>+</div><div class='add'>+	if (adapter-&gt;eepromData[0] != 0xcd) {</div><div class='add'>+		adapter-&gt;eepromData[1] = 0x00;	// Disable all optional features</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Let's set up the PORT LOGIC Register.  First we need to know what</div><div class='add'>+	 * the max_payload_size is</div><div class='add'>+	 */</div><div class='add'>+	result = pci_read_config_byte(pdev, ET1310_PCI_MAX_PYLD, &amp;maxPayload);</div><div class='add'>+	if (result != PCIBIOS_SUCCESSFUL) {</div><div class='add'>+		DBG_ERROR(et131x_dbginfo, "Could not read PCI config space for "</div><div class='add'>+			  "Max Payload Size\n");</div><div class='add'>+		DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Program the Ack/Nak latency and replay timers */</div><div class='add'>+	maxPayload &amp;= 0x07;	// Only the lower 3 bits are valid</div><div class='add'>+</div><div class='add'>+	if (maxPayload &lt; 2) {</div><div class='add'>+		const uint16_t AckNak[2] = { 0x76, 0xD0 };</div><div class='add'>+		const uint16_t Replay[2] = { 0x1E0, 0x2ED };</div><div class='add'>+</div><div class='add'>+		result = pci_write_config_word(pdev, ET1310_PCI_ACK_NACK,</div><div class='add'>+					       AckNak[maxPayload]);</div><div class='add'>+		if (result != PCIBIOS_SUCCESSFUL) {</div><div class='add'>+			DBG_ERROR(et131x_dbginfo,</div><div class='add'>+				  "Could not write PCI config space "</div><div class='add'>+				  "for ACK/NAK\n");</div><div class='add'>+			DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+			return -EIO;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		result = pci_write_config_word(pdev, ET1310_PCI_REPLAY,</div><div class='add'>+					       Replay[maxPayload]);</div><div class='add'>+		if (result != PCIBIOS_SUCCESSFUL) {</div><div class='add'>+			DBG_ERROR(et131x_dbginfo,</div><div class='add'>+				  "Could not write PCI config space "</div><div class='add'>+				  "for Replay Timer\n");</div><div class='add'>+			DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+			return -EIO;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* l0s and l1 latency timers.  We are using default values.</div><div class='add'>+	 * Representing 001 for L0s and 010 for L1</div><div class='add'>+	 */</div><div class='add'>+	result = pci_write_config_byte(pdev, ET1310_PCI_L0L1LATENCY, 0x11);</div><div class='add'>+	if (result != PCIBIOS_SUCCESSFUL) {</div><div class='add'>+		DBG_ERROR(et131x_dbginfo,</div><div class='add'>+			  "Could not write PCI config space for "</div><div class='add'>+			  "Latency Timers\n");</div><div class='add'>+		DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Change the max read size to 2k */</div><div class='add'>+	result = pci_read_config_byte(pdev, 0x51, &amp;read_size_reg);</div><div class='add'>+	if (result != PCIBIOS_SUCCESSFUL) {</div><div class='add'>+		DBG_ERROR(et131x_dbginfo,</div><div class='add'>+			  "Could not read PCI config space for Max read size\n");</div><div class='add'>+		DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	read_size_reg &amp;= 0x8f;</div><div class='add'>+	read_size_reg |= 0x40;</div><div class='add'>+</div><div class='add'>+	result = pci_write_config_byte(pdev, 0x51, read_size_reg);</div><div class='add'>+	if (result != PCIBIOS_SUCCESSFUL) {</div><div class='add'>+		DBG_ERROR(et131x_dbginfo,</div><div class='add'>+			  "Could not write PCI config space for Max read size\n");</div><div class='add'>+		DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* PCI Express Configuration registers 0x48-0x5B (Device Control) */</div><div class='add'>+	result = pci_read_config_word(pdev, ET1310_PCI_DEV_CTRL,</div><div class='add'>+				      &amp;adapter-&gt;PciXDevCtl);</div><div class='add'>+	if (result != PCIBIOS_SUCCESSFUL) {</div><div class='add'>+		DBG_ERROR(et131x_dbginfo,</div><div class='add'>+			  "Could not read PCI config space for PCI Express Dev Ctl\n");</div><div class='add'>+		DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Get MAC address from config space if an eeprom exists, otherwise</div><div class='add'>+	 * the MAC address there will not be valid</div><div class='add'>+	 */</div><div class='add'>+	if (adapter-&gt;bEepromPresent) {</div><div class='add'>+		int i;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; ETH_ALEN; i++) {</div><div class='add'>+			result = pci_read_config_byte(</div><div class='add'>+					pdev, ET1310_PCI_MAC_ADDRESS + i,</div><div class='add'>+					adapter-&gt;PermanentAddress + i);</div><div class='add'>+			if (result != PCIBIOS_SUCCESSFUL) {</div><div class='add'>+				DBG_ERROR(et131x_dbginfo,</div><div class='add'>+					  "Could not read PCI config space for MAC address\n");</div><div class='add'>+				DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+				return -EIO;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * et131x_error_timer_handler</div><div class='add'>+ * @data: timer-specific variable; here a pointer to our adapter structure</div><div class='add'>+ *</div><div class='add'>+ * The routine called when the error timer expires, to track the number of</div><div class='add'>+ * recurring errors.</div><div class='add'>+ */</div><div class='add'>+void et131x_error_timer_handler(unsigned long data)</div><div class='add'>+{</div><div class='add'>+	struct et131x_adapter *pAdapter = (struct et131x_adapter *) data;</div><div class='add'>+	PM_CSR_t pm_csr;</div><div class='add'>+</div><div class='add'>+	pm_csr.value = readl(&amp;pAdapter-&gt;CSRAddress-&gt;global.pm_csr.value);</div><div class='add'>+</div><div class='add'>+	if (pm_csr.bits.pm_phy_sw_coma == 0) {</div><div class='add'>+		if (pAdapter-&gt;RegistryMACStat) {</div><div class='add'>+			UpdateMacStatHostCounters(pAdapter);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		DBG_VERBOSE(et131x_dbginfo,</div><div class='add'>+			    "No interrupts, in PHY coma, pm_csr = 0x%x\n",</div><div class='add'>+			    pm_csr.value);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!pAdapter-&gt;Bmsr.bits.link_status &amp;&amp;</div><div class='add'>+	    pAdapter-&gt;RegistryPhyComa &amp;&amp;</div><div class='add'>+	    pAdapter-&gt;PoMgmt.TransPhyComaModeOnBoot &lt; 11) {</div><div class='add'>+		pAdapter-&gt;PoMgmt.TransPhyComaModeOnBoot++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pAdapter-&gt;PoMgmt.TransPhyComaModeOnBoot == 10) {</div><div class='add'>+		if (!pAdapter-&gt;Bmsr.bits.link_status</div><div class='add'>+		    &amp;&amp; pAdapter-&gt;RegistryPhyComa) {</div><div class='add'>+			if (pm_csr.bits.pm_phy_sw_coma == 0) {</div><div class='add'>+				// NOTE - This was originally a 'sync with interrupt'. How</div><div class='add'>+				//        to do that under Linux?</div><div class='add'>+				et131x_enable_interrupts(pAdapter);</div><div class='add'>+				EnablePhyComa(pAdapter);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* This is a periodic timer, so reschedule */</div><div class='add'>+	mod_timer(&amp;pAdapter-&gt;ErrorTimer, jiffies +</div><div class='add'>+		  TX_ERROR_PERIOD * HZ / 1000);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * et131x_link_detection_handler</div><div class='add'>+ *</div><div class='add'>+ * Timer function for link up at driver load time</div><div class='add'>+ */</div><div class='add'>+void et131x_link_detection_handler(unsigned long data)</div><div class='add'>+{</div><div class='add'>+	struct et131x_adapter *pAdapter = (struct et131x_adapter *) data;</div><div class='add'>+	unsigned long lockflags;</div><div class='add'>+</div><div class='add'>+	/* Let everyone know that we have run */</div><div class='add'>+	pAdapter-&gt;bLinkTimerActive = false;</div><div class='add'>+</div><div class='add'>+	if (pAdapter-&gt;MediaState == 0) {</div><div class='add'>+		spin_lock_irqsave(&amp;pAdapter-&gt;Lock, lockflags);</div><div class='add'>+</div><div class='add'>+		pAdapter-&gt;MediaState = NETIF_STATUS_MEDIA_DISCONNECT;</div><div class='add'>+		MP_CLEAR_FLAG(pAdapter, fMP_ADAPTER_LINK_DETECTION);</div><div class='add'>+</div><div class='add'>+		spin_unlock_irqrestore(&amp;pAdapter-&gt;Lock, lockflags);</div><div class='add'>+</div><div class='add'>+		netif_carrier_off(pAdapter-&gt;netdev);</div><div class='add'>+</div><div class='add'>+		pAdapter-&gt;bSetPending = false;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * et131x_adapter_setup - Set the adapter up as per cassini+ documentation</div><div class='add'>+ * @adapter: pointer to our private adapter structure</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 on success, errno on failure (as defined in errno.h)</div><div class='add'>+ */</div><div class='add'>+int et131x_adapter_setup(struct et131x_adapter *pAdapter)</div><div class='add'>+{</div><div class='add'>+	int status = 0;</div><div class='add'>+</div><div class='add'>+	DBG_ENTER(et131x_dbginfo);</div><div class='add'>+</div><div class='add'>+	/* Configure the JAGCore */</div><div class='add'>+	ConfigGlobalRegs(pAdapter);</div><div class='add'>+</div><div class='add'>+	ConfigMACRegs1(pAdapter);</div><div class='add'>+	ConfigMMCRegs(pAdapter);</div><div class='add'>+</div><div class='add'>+	ConfigRxMacRegs(pAdapter);</div><div class='add'>+	ConfigTxMacRegs(pAdapter);</div><div class='add'>+</div><div class='add'>+	ConfigRxDmaRegs(pAdapter);</div><div class='add'>+	ConfigTxDmaRegs(pAdapter);</div><div class='add'>+</div><div class='add'>+	ConfigMacStatRegs(pAdapter);</div><div class='add'>+</div><div class='add'>+	/* Move the following code to Timer function?? */</div><div class='add'>+	status = et131x_xcvr_find(pAdapter);</div><div class='add'>+</div><div class='add'>+	if (status != 0) {</div><div class='add'>+		DBG_WARNING(et131x_dbginfo, "Could not find the xcvr\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Prepare the TRUEPHY library. */</div><div class='add'>+	ET1310_PhyInit(pAdapter);</div><div class='add'>+</div><div class='add'>+	/* Reset the phy now so changes take place */</div><div class='add'>+	ET1310_PhyReset(pAdapter);</div><div class='add'>+</div><div class='add'>+	/* Power down PHY */</div><div class='add'>+	ET1310_PhyPowerDown(pAdapter, 1);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We need to turn off 1000 base half dulplex, the mac does not</div><div class='add'>+	 * support it. For the 10/100 part, turn off all gig advertisement</div><div class='add'>+	 */</div><div class='add'>+	if (pAdapter-&gt;DeviceID != ET131X_PCI_DEVICE_ID_FAST) {</div><div class='add'>+		ET1310_PhyAdvertise1000BaseT(pAdapter, TRUEPHY_ADV_DUPLEX_FULL);</div><div class='add'>+	} else {</div><div class='add'>+		ET1310_PhyAdvertise1000BaseT(pAdapter, TRUEPHY_ADV_DUPLEX_NONE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Power up PHY */</div><div class='add'>+	ET1310_PhyPowerDown(pAdapter, 0);</div><div class='add'>+</div><div class='add'>+	et131x_setphy_normal(pAdapter);</div><div class='add'>+</div><div class='add'>+	DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * et131x_setup_hardware_properties - set up the MAC Address on the ET1310</div><div class='add'>+ * @adapter: pointer to our private adapter structure</div><div class='add'>+ */</div><div class='add'>+void et131x_setup_hardware_properties(struct et131x_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	DBG_ENTER(et131x_dbginfo);</div><div class='add'>+</div><div class='add'>+	/* If have our default mac from registry and no mac address from</div><div class='add'>+	 * EEPROM then we need to generate the last octet and set it on the</div><div class='add'>+	 * device</div><div class='add'>+	 */</div><div class='add'>+	if (!adapter-&gt;bOverrideAddress) {</div><div class='add'>+		if (adapter-&gt;PermanentAddress[0] == 0x00 &amp;&amp;</div><div class='add'>+		    adapter-&gt;PermanentAddress[1] == 0x00 &amp;&amp;</div><div class='add'>+		    adapter-&gt;PermanentAddress[2] == 0x00 &amp;&amp;</div><div class='add'>+		    adapter-&gt;PermanentAddress[3] == 0x00 &amp;&amp;</div><div class='add'>+		    adapter-&gt;PermanentAddress[4] == 0x00 &amp;&amp;</div><div class='add'>+		    adapter-&gt;PermanentAddress[5] == 0x00) {</div><div class='add'>+			/*</div><div class='add'>+			 * We need to randomly generate the last octet so we</div><div class='add'>+			 * decrease our chances of setting the mac address to</div><div class='add'>+			 * same as another one of our cards in the system</div><div class='add'>+			 */</div><div class='add'>+			get_random_bytes(&amp;adapter-&gt;CurrentAddress[5], 1);</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * We have the default value in the register we are</div><div class='add'>+			 * working with so we need to copy the current</div><div class='add'>+			 * address into the permanent address</div><div class='add'>+			 */</div><div class='add'>+			memcpy(adapter-&gt;PermanentAddress,</div><div class='add'>+			       adapter-&gt;CurrentAddress, ETH_ALEN);</div><div class='add'>+		} else {</div><div class='add'>+			/* We do not have an override address, so set the</div><div class='add'>+			 * current address to the permanent address and add</div><div class='add'>+			 * it to the device</div><div class='add'>+			 */</div><div class='add'>+			memcpy(adapter-&gt;CurrentAddress,</div><div class='add'>+			       adapter-&gt;PermanentAddress, ETH_ALEN);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * et131x_soft_reset - Issue a soft reset to the hardware, complete for ET1310</div><div class='add'>+ * @adapter: pointer to our private adapter structure</div><div class='add'>+ */</div><div class='add'>+void et131x_soft_reset(struct et131x_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	DBG_ENTER(et131x_dbginfo);</div><div class='add'>+</div><div class='add'>+	/* Disable MAC Core */</div><div class='add'>+	writel(0xc00f0000, &amp;adapter-&gt;CSRAddress-&gt;mac.cfg1.value);</div><div class='add'>+</div><div class='add'>+	/* Set everything to a reset value */</div><div class='add'>+	writel(0x7F, &amp;adapter-&gt;CSRAddress-&gt;global.sw_reset.value);</div><div class='add'>+	writel(0x000f0000, &amp;adapter-&gt;CSRAddress-&gt;mac.cfg1.value);</div><div class='add'>+	writel(0x00000000, &amp;adapter-&gt;CSRAddress-&gt;mac.cfg1.value);</div><div class='add'>+</div><div class='add'>+	DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * et131x_align_allocated_memory - Align allocated memory on a given boundary</div><div class='add'>+ * @adapter: pointer to our adapter structure</div><div class='add'>+ * @phys_addr: pointer to Physical address</div><div class='add'>+ * @offset: pointer to the offset variable</div><div class='add'>+ * @mask: correct mask</div><div class='add'>+ */</div><div class='add'>+void et131x_align_allocated_memory(struct et131x_adapter *adapter,</div><div class='add'>+				   uint64_t *phys_addr,</div><div class='add'>+				   uint64_t *offset, uint64_t mask)</div><div class='add'>+{</div><div class='add'>+	uint64_t new_addr;</div><div class='add'>+</div><div class='add'>+	DBG_ENTER(et131x_dbginfo);</div><div class='add'>+</div><div class='add'>+	*offset = 0;</div><div class='add'>+</div><div class='add'>+	new_addr = *phys_addr &amp; ~mask;</div><div class='add'>+</div><div class='add'>+	if (new_addr != *phys_addr) {</div><div class='add'>+		/* Move to next aligned block */</div><div class='add'>+		new_addr += mask + 1;</div><div class='add'>+		/* Return offset for adjusting virt addr */</div><div class='add'>+		*offset = new_addr - *phys_addr;</div><div class='add'>+		/* Return new physical address */</div><div class='add'>+		*phys_addr = new_addr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * et131x_adapter_memory_alloc</div><div class='add'>+ * @adapter: pointer to our private adapter structure</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 on success, errno on failure (as defined in errno.h).</div><div class='add'>+ *</div><div class='add'>+ * Allocate all the memory blocks for send, receive and others.</div><div class='add'>+ */</div><div class='add'>+int et131x_adapter_memory_alloc(struct et131x_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	int status = 0;</div><div class='add'>+</div><div class='add'>+	DBG_ENTER(et131x_dbginfo);</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		/* Allocate memory for the Tx Ring */</div><div class='add'>+		status = et131x_tx_dma_memory_alloc(adapter);</div><div class='add'>+		if (status != 0) {</div><div class='add'>+			DBG_ERROR(et131x_dbginfo,</div><div class='add'>+				  "et131x_tx_dma_memory_alloc FAILED\n");</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Receive buffer memory allocation */</div><div class='add'>+		status = et131x_rx_dma_memory_alloc(adapter);</div><div class='add'>+		if (status != 0) {</div><div class='add'>+			DBG_ERROR(et131x_dbginfo,</div><div class='add'>+				  "et131x_rx_dma_memory_alloc FAILED\n");</div><div class='add'>+			et131x_tx_dma_memory_free(adapter);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Init receive data structures */</div><div class='add'>+		status = et131x_init_recv(adapter);</div><div class='add'>+		if (status != 0) {</div><div class='add'>+			DBG_ERROR(et131x_dbginfo, "et131x_init_recv FAILED\n");</div><div class='add'>+			et131x_tx_dma_memory_free(adapter);</div><div class='add'>+			et131x_rx_dma_memory_free(adapter);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	} while (0);</div><div class='add'>+</div><div class='add'>+	DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * et131x_adapter_memory_free - Free all memory allocated for use by Tx &amp; Rx</div><div class='add'>+ * @adapter: pointer to our private adapter structure</div><div class='add'>+ */</div><div class='add'>+void et131x_adapter_memory_free(struct et131x_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	DBG_ENTER(et131x_dbginfo);</div><div class='add'>+</div><div class='add'>+	/* Free DMA memory */</div><div class='add'>+	et131x_tx_dma_memory_free(adapter);</div><div class='add'>+	et131x_rx_dma_memory_free(adapter);</div><div class='add'>+</div><div class='add'>+	DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * et131x_pci_remove</div><div class='add'>+ * @pdev: a pointer to the device's pci_dev structure</div><div class='add'>+ *</div><div class='add'>+ * Registered in the pci_driver structure, this function is called when the</div><div class='add'>+ * PCI subsystem detects that a PCI device which matches the information</div><div class='add'>+ * contained in the pci_device_id table has been removed.</div><div class='add'>+ */</div><div class='add'>+void __devexit et131x_pci_remove(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev;</div><div class='add'>+	struct et131x_adapter *adapter;</div><div class='add'>+</div><div class='add'>+	DBG_ENTER(et131x_dbginfo);</div><div class='add'>+</div><div class='add'>+	/* Retrieve the net_device pointer from the pci_dev struct, as well</div><div class='add'>+	 * as the private adapter struct</div><div class='add'>+	 */</div><div class='add'>+	netdev = (struct net_device *) pci_get_drvdata(pdev);</div><div class='add'>+	adapter = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	/* Perform device cleanup */</div><div class='add'>+	unregister_netdev(netdev);</div><div class='add'>+	et131x_adapter_memory_free(adapter);</div><div class='add'>+	iounmap(adapter-&gt;CSRAddress);</div><div class='add'>+	free_netdev(netdev);</div><div class='add'>+	pci_release_regions(pdev);</div><div class='add'>+	pci_disable_device(pdev);</div><div class='add'>+</div><div class='add'>+	DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * et131x_pci_setup - Perform device initialization</div><div class='add'>+ * @pdev: a pointer to the device's pci_dev structure</div><div class='add'>+ * @ent: this device's entry in the pci_device_id table</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 on success, errno on failure (as defined in errno.h)</div><div class='add'>+ *</div><div class='add'>+ * Registered in the pci_driver structure, this function is called when the</div><div class='add'>+ * PCI subsystem finds a new PCI device which matches the information</div><div class='add'>+ * contained in the pci_device_id table. This routine is the equivalent to</div><div class='add'>+ * a device insertion routine.</div><div class='add'>+ */</div><div class='add'>+int __devinit et131x_pci_setup(struct pci_dev *pdev,</div><div class='add'>+			       const struct pci_device_id *ent)</div><div class='add'>+{</div><div class='add'>+	int result = 0;</div><div class='add'>+	int pm_cap;</div><div class='add'>+	bool pci_using_dac;</div><div class='add'>+	struct net_device *netdev = NULL;</div><div class='add'>+	struct et131x_adapter *adapter = NULL;</div><div class='add'>+</div><div class='add'>+	DBG_ENTER(et131x_dbginfo);</div><div class='add'>+</div><div class='add'>+	/* Enable the device via the PCI subsystem */</div><div class='add'>+	result = pci_enable_device(pdev);</div><div class='add'>+	if (result != 0) {</div><div class='add'>+		DBG_ERROR(et131x_dbginfo, "pci_enable_device() failed\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Perform some basic PCI checks */</div><div class='add'>+	if (!(pci_resource_flags(pdev, 0) &amp; IORESOURCE_MEM)) {</div><div class='add'>+		DBG_ERROR(et131x_dbginfo,</div><div class='add'>+			  "Can't find PCI device's base address\n");</div><div class='add'>+		result = -ENODEV;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	result = pci_request_regions(pdev, DRIVER_NAME);</div><div class='add'>+	if (result != 0) {</div><div class='add'>+		DBG_ERROR(et131x_dbginfo, "Can't get PCI resources\n");</div><div class='add'>+		goto err_disable;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Enable PCI bus mastering */</div><div class='add'>+	DBG_TRACE(et131x_dbginfo, "Setting PCI Bus Mastering...\n");</div><div class='add'>+	pci_set_master(pdev);</div><div class='add'>+</div><div class='add'>+	/* Query PCI for Power Mgmt Capabilities</div><div class='add'>+	 *</div><div class='add'>+	 * NOTE: Now reading PowerMgmt in another location; is this still</div><div class='add'>+	 * needed?</div><div class='add'>+	 */</div><div class='add'>+	pm_cap = pci_find_capability(pdev, PCI_CAP_ID_PM);</div><div class='add'>+	if (pm_cap == 0) {</div><div class='add'>+		DBG_ERROR(et131x_dbginfo,</div><div class='add'>+			  "Cannot find Power Management capabilities\n");</div><div class='add'>+		result = -EIO;</div><div class='add'>+		goto err_release_res;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check the DMA addressing support of this device */</div><div class='add'>+	if (!pci_set_dma_mask(pdev, 0xffffffffffffffffULL)) {</div><div class='add'>+		DBG_TRACE(et131x_dbginfo, "64-bit DMA addressing supported\n");</div><div class='add'>+		pci_using_dac = true;</div><div class='add'>+</div><div class='add'>+		result =</div><div class='add'>+		    pci_set_consistent_dma_mask(pdev, 0xffffffffffffffffULL);</div><div class='add'>+		if (result != 0) {</div><div class='add'>+			DBG_ERROR(et131x_dbginfo,</div><div class='add'>+				  "Unable to obtain 64 bit DMA for consistent allocations\n");</div><div class='add'>+			goto err_release_res;</div><div class='add'>+		}</div><div class='add'>+	} else if (!pci_set_dma_mask(pdev, 0xffffffffULL)) {</div><div class='add'>+		DBG_TRACE(et131x_dbginfo,</div><div class='add'>+			  "64-bit DMA addressing NOT supported\n");</div><div class='add'>+		DBG_TRACE(et131x_dbginfo,</div><div class='add'>+			  "32-bit DMA addressing will be used\n");</div><div class='add'>+		pci_using_dac = false;</div><div class='add'>+	} else {</div><div class='add'>+		DBG_ERROR(et131x_dbginfo, "No usable DMA addressing method\n");</div><div class='add'>+		result = -EIO;</div><div class='add'>+		goto err_release_res;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Allocate netdev and private adapter structs */</div><div class='add'>+	DBG_TRACE(et131x_dbginfo,</div><div class='add'>+		  "Allocate netdev and private adapter structs...\n");</div><div class='add'>+	netdev = et131x_device_alloc();</div><div class='add'>+	if (netdev == NULL) {</div><div class='add'>+		DBG_ERROR(et131x_dbginfo, "Couldn't alloc netdev struct\n");</div><div class='add'>+		result = -ENOMEM;</div><div class='add'>+		goto err_release_res;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Setup the fundamental net_device and private adapter structure elements  */</div><div class='add'>+	DBG_TRACE(et131x_dbginfo, "Setting fundamental net_device info...\n");</div><div class='add'>+	SET_NETDEV_DEV(netdev, &amp;pdev-&gt;dev);</div><div class='add'>+	if (pci_using_dac) {</div><div class='add'>+		//netdev-&gt;features |= NETIF_F_HIGHDMA;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * NOTE - Turn this on when we're ready to deal with SG-DMA</div><div class='add'>+	 *</div><div class='add'>+	 * NOTE: According to "Linux Device Drivers", 3rd ed, Rubini et al,</div><div class='add'>+	 * if checksumming is not performed in HW, then the kernel will not</div><div class='add'>+	 * use SG.</div><div class='add'>+	 * From pp 510-511:</div><div class='add'>+	 *</div><div class='add'>+	 * "Note that the kernel does not perform scatter/gather I/O to your</div><div class='add'>+	 * device if it does not also provide some form of checksumming as</div><div class='add'>+	 * well. The reason is that, if the kernel has to make a pass over a</div><div class='add'>+	 * fragmented ("nonlinear") packet to calculate the checksum, it</div><div class='add'>+	 * might as well copy the data and coalesce the packet at the same</div><div class='add'>+	 * time."</div><div class='add'>+	 *</div><div class='add'>+	 * This has been verified by setting the flags below and still not</div><div class='add'>+	 * receiving a scattered buffer from the network stack, so leave it</div><div class='add'>+	 * off until checksums are calculated in HW.</div><div class='add'>+	 */</div><div class='add'>+	//netdev-&gt;features |= NETIF_F_SG;</div><div class='add'>+	//netdev-&gt;features |= NETIF_F_NO_CSUM;</div><div class='add'>+	//netdev-&gt;features |= NETIF_F_LLTX;</div><div class='add'>+</div><div class='add'>+	/* Allocate private adapter struct and copy in relevant information */</div><div class='add'>+	adapter = netdev_priv(netdev);</div><div class='add'>+	adapter-&gt;pdev = pdev;</div><div class='add'>+	adapter-&gt;netdev = netdev;</div><div class='add'>+	adapter-&gt;VendorID = pdev-&gt;vendor;</div><div class='add'>+	adapter-&gt;DeviceID = pdev-&gt;device;</div><div class='add'>+</div><div class='add'>+	/* Do the same for the netdev struct */</div><div class='add'>+	netdev-&gt;irq = pdev-&gt;irq;</div><div class='add'>+	netdev-&gt;base_addr = pdev-&gt;resource[0].start;</div><div class='add'>+</div><div class='add'>+	/* Initialize spinlocks here */</div><div class='add'>+	DBG_TRACE(et131x_dbginfo, "Initialize spinlocks...\n");</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;adapter-&gt;Lock);</div><div class='add'>+	spin_lock_init(&amp;adapter-&gt;TCBSendQLock);</div><div class='add'>+	spin_lock_init(&amp;adapter-&gt;TCBReadyQLock);</div><div class='add'>+	spin_lock_init(&amp;adapter-&gt;SendHWLock);</div><div class='add'>+	spin_lock_init(&amp;adapter-&gt;SendWaitLock);</div><div class='add'>+	spin_lock_init(&amp;adapter-&gt;RcvLock);</div><div class='add'>+	spin_lock_init(&amp;adapter-&gt;RcvPendLock);</div><div class='add'>+	spin_lock_init(&amp;adapter-&gt;FbrLock);</div><div class='add'>+	spin_lock_init(&amp;adapter-&gt;PHYLock);</div><div class='add'>+</div><div class='add'>+	/* Parse configuration parameters into the private adapter struct */</div><div class='add'>+	et131x_config_parse(adapter);</div><div class='add'>+</div><div class='add'>+	/* Find the physical adapter</div><div class='add'>+	 *</div><div class='add'>+	 * NOTE: This is the equivalent of the MpFindAdapter() routine; can we</div><div class='add'>+	 *       lump it's init with the device specific init below into a</div><div class='add'>+	 *       single init function?</div><div class='add'>+	 */</div><div class='add'>+	//while (et131x_find_adapter(adapter, pdev) != 0);</div><div class='add'>+	et131x_find_adapter(adapter, pdev);</div><div class='add'>+</div><div class='add'>+	/* Map the bus-relative registers to system virtual memory */</div><div class='add'>+	DBG_TRACE(et131x_dbginfo,</div><div class='add'>+		  "Mapping bus-relative registers to virtual memory...\n");</div><div class='add'>+</div><div class='add'>+	adapter-&gt;CSRAddress = ioremap_nocache(pci_resource_start(pdev, 0),</div><div class='add'>+					      pci_resource_len(pdev, 0));</div><div class='add'>+	if (adapter-&gt;CSRAddress == NULL) {</div><div class='add'>+		DBG_ERROR(et131x_dbginfo, "Cannot map device registers\n");</div><div class='add'>+		result = -ENOMEM;</div><div class='add'>+		goto err_free_dev;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Perform device-specific initialization here (See code below) */</div><div class='add'>+</div><div class='add'>+	/* If Phy COMA mode was enabled when we went down, disable it here. */</div><div class='add'>+	{</div><div class='add'>+		PM_CSR_t GlobalPmCSR = { 0 };</div><div class='add'>+</div><div class='add'>+		GlobalPmCSR.bits.pm_sysclk_gate = 1;</div><div class='add'>+		GlobalPmCSR.bits.pm_txclk_gate = 1;</div><div class='add'>+		GlobalPmCSR.bits.pm_rxclk_gate = 1;</div><div class='add'>+		writel(GlobalPmCSR.value,</div><div class='add'>+		       &amp;adapter-&gt;CSRAddress-&gt;global.pm_csr.value);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Issue a global reset to the et1310 */</div><div class='add'>+	DBG_TRACE(et131x_dbginfo, "Issuing soft reset...\n");</div><div class='add'>+	et131x_soft_reset(adapter);</div><div class='add'>+</div><div class='add'>+	/* Disable all interrupts (paranoid) */</div><div class='add'>+	DBG_TRACE(et131x_dbginfo, "Disable device interrupts...\n");</div><div class='add'>+	et131x_disable_interrupts(adapter);</div><div class='add'>+</div><div class='add'>+	/* Allocate DMA memory */</div><div class='add'>+	result = et131x_adapter_memory_alloc(adapter);</div><div class='add'>+	if (result != 0) {</div><div class='add'>+		DBG_ERROR(et131x_dbginfo,</div><div class='add'>+			  "Could not alloc adapater memory (DMA)\n");</div><div class='add'>+		goto err_iounmap;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Init send data structures */</div><div class='add'>+	DBG_TRACE(et131x_dbginfo, "Init send data structures...\n");</div><div class='add'>+	et131x_init_send(adapter);</div><div class='add'>+</div><div class='add'>+	adapter-&gt;PoMgmt.PowerState = NdisDeviceStateD0;</div><div class='add'>+</div><div class='add'>+	/* Register the interrupt</div><div class='add'>+	 *</div><div class='add'>+	 * NOTE - This is being done in the open routine, where most other</div><div class='add'>+	 *         Linux drivers setup IRQ handlers. Make sure device</div><div class='add'>+	 *         interrupts are not turned on before the IRQ is registered!!</div><div class='add'>+	 *</div><div class='add'>+	 *         What we will do here is setup the task structure for the</div><div class='add'>+	 *         ISR's deferred handler</div><div class='add'>+	 */</div><div class='add'>+	INIT_WORK(&amp;adapter-&gt;task, et131x_isr_handler);</div><div class='add'>+</div><div class='add'>+	/* Determine MAC Address, and copy into the net_device struct */</div><div class='add'>+	DBG_TRACE(et131x_dbginfo, "Retrieve MAC address...\n");</div><div class='add'>+	et131x_setup_hardware_properties(adapter);</div><div class='add'>+</div><div class='add'>+	memcpy(netdev-&gt;dev_addr, adapter-&gt;CurrentAddress, ETH_ALEN);</div><div class='add'>+</div><div class='add'>+	/* Setup et1310 as per the documentation */</div><div class='add'>+	DBG_TRACE(et131x_dbginfo, "Setup the adapter...\n");</div><div class='add'>+	et131x_adapter_setup(adapter);</div><div class='add'>+</div><div class='add'>+	/* Create a timer to count errors received by the NIC */</div><div class='add'>+	init_timer(&amp;adapter-&gt;ErrorTimer);</div><div class='add'>+</div><div class='add'>+	adapter-&gt;ErrorTimer.expires = jiffies + TX_ERROR_PERIOD * HZ / 1000;</div><div class='add'>+	adapter-&gt;ErrorTimer.function = et131x_error_timer_handler;</div><div class='add'>+	adapter-&gt;ErrorTimer.data = (unsigned long)adapter;</div><div class='add'>+</div><div class='add'>+	/* Initialize link state */</div><div class='add'>+	et131x_link_detection_handler((unsigned long)adapter);</div><div class='add'>+</div><div class='add'>+	/* Intialize variable for counting how long we do not have link status */</div><div class='add'>+	adapter-&gt;PoMgmt.TransPhyComaModeOnBoot = 0;</div><div class='add'>+</div><div class='add'>+	/* We can enable interrupts now</div><div class='add'>+	 *</div><div class='add'>+	 *  NOTE - Because registration of interrupt handler is done in the</div><div class='add'>+	 *         device's open(), defer enabling device interrupts to that</div><div class='add'>+	 *         point</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* Register the net_device struct with the Linux network layer */</div><div class='add'>+	DBG_TRACE(et131x_dbginfo, "Registering net_device...\n");</div><div class='add'>+	if ((result = register_netdev(netdev)) != 0) {</div><div class='add'>+		DBG_ERROR(et131x_dbginfo, "register_netdev() failed\n");</div><div class='add'>+		goto err_mem_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Register the net_device struct with the PCI subsystem. Save a copy</div><div class='add'>+	 * of the PCI config space for this device now that the device has</div><div class='add'>+	 * been initialized, just in case it needs to be quickly restored.</div><div class='add'>+	 */</div><div class='add'>+	pci_set_drvdata(pdev, netdev);</div><div class='add'>+</div><div class='add'>+	pci_save_state(adapter-&gt;pdev);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+	return result;</div><div class='add'>+</div><div class='add'>+err_mem_free:</div><div class='add'>+	et131x_adapter_memory_free(adapter);</div><div class='add'>+err_iounmap:</div><div class='add'>+	iounmap(adapter-&gt;CSRAddress);</div><div class='add'>+err_free_dev:</div><div class='add'>+	free_netdev(netdev);</div><div class='add'>+err_release_res:</div><div class='add'>+	pci_release_regions(pdev);</div><div class='add'>+err_disable:</div><div class='add'>+	pci_disable_device(pdev);</div><div class='add'>+	goto out;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/staging/et131x/et131x_initpci.h b/drivers/staging/et131x/et131x_initpci.h<br/>new file mode 100644<br/>index 000000000000..bbacb6277595<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/et131x/et131x_initpci.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/et131x/et131x_initpci.h</a></div><div class='hunk'>@@ -0,0 +1,73 @@</div><div class='add'>+/*</div><div class='add'>+ * Agere Systems Inc.</div><div class='add'>+ * 10/100/1000 Base-T Ethernet Driver for the ET1301 and ET131x series MACs</div><div class='add'>+ *</div><div class='add'>+ * Copyright © 2005 Agere Systems Inc.</div><div class='add'>+ * All rights reserved.</div><div class='add'>+ *   http://www.agere.com</div><div class='add'>+ *</div><div class='add'>+ *------------------------------------------------------------------------------</div><div class='add'>+ *</div><div class='add'>+ * et131x_initpci.h - Header which includes common data and function prototypes</div><div class='add'>+ *                    related to the driver's PCI (and PCI Express) information.</div><div class='add'>+ *</div><div class='add'>+ *------------------------------------------------------------------------------</div><div class='add'>+ *</div><div class='add'>+ * SOFTWARE LICENSE</div><div class='add'>+ *</div><div class='add'>+ * This software is provided subject to the following terms and conditions,</div><div class='add'>+ * which you should read carefully before using the software.  Using this</div><div class='add'>+ * software indicates your acceptance of these terms and conditions.  If you do</div><div class='add'>+ * not agree with these terms and conditions, do not use the software.</div><div class='add'>+ *</div><div class='add'>+ * Copyright © 2005 Agere Systems Inc.</div><div class='add'>+ * All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source or binary forms, with or without</div><div class='add'>+ * modifications, are permitted provided that the following conditions are met:</div><div class='add'>+ *</div><div class='add'>+ * . Redistributions of source code must retain the above copyright notice, this</div><div class='add'>+ *    list of conditions and the following Disclaimer as comments in the code as</div><div class='add'>+ *    well as in the documentation and/or other materials provided with the</div><div class='add'>+ *    distribution.</div><div class='add'>+ *</div><div class='add'>+ * . Redistributions in binary form must reproduce the above copyright notice,</div><div class='add'>+ *    this list of conditions and the following Disclaimer in the documentation</div><div class='add'>+ *    and/or other materials provided with the distribution.</div><div class='add'>+ *</div><div class='add'>+ * . Neither the name of Agere Systems Inc. nor the names of the contributors</div><div class='add'>+ *    may be used to endorse or promote products derived from this software</div><div class='add'>+ *    without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ * Disclaimer</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES,</div><div class='add'>+ * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  ANY</div><div class='add'>+ * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN</div><div class='add'>+ * RISK. IN NO EVENT SHALL AGERE SYSTEMS INC. OR CONTRIBUTORS BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, INCLUDING, BUT NOT LIMITED TO, CONTRACT, STRICT</div><div class='add'>+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT</div><div class='add'>+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH</div><div class='add'>+ * DAMAGE.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __ET131X_INITPCI_H__</div><div class='add'>+#define __ET131X_INITPCI_H__</div><div class='add'>+</div><div class='add'>+/* Function Prototypes */</div><div class='add'>+void et131x_align_allocated_memory(struct et131x_adapter *adapter,</div><div class='add'>+				   u64 *phys_addr,</div><div class='add'>+				   u64 *offset, u64 mask);</div><div class='add'>+</div><div class='add'>+int et131x_adapter_setup(struct et131x_adapter *adapter);</div><div class='add'>+int et131x_adapter_memory_alloc(struct et131x_adapter *adapter);</div><div class='add'>+void et131x_adapter_memory_free(struct et131x_adapter *adapter);</div><div class='add'>+void et131x_setup_hardware_properties(struct et131x_adapter *adapter);</div><div class='add'>+void et131x_soft_reset(struct et131x_adapter *adapter);</div><div class='add'>+</div><div class='add'>+#endif /* __ET131X_INITPCI_H__ */</div><div class='head'>diff --git a/drivers/staging/et131x/et131x_isr.c b/drivers/staging/et131x/et131x_isr.c<br/>new file mode 100644<br/>index 000000000000..00afad174a62<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/et131x/et131x_isr.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/et131x/et131x_isr.c</a></div><div class='hunk'>@@ -0,0 +1,488 @@</div><div class='add'>+/*</div><div class='add'>+ * Agere Systems Inc.</div><div class='add'>+ * 10/100/1000 Base-T Ethernet Driver for the ET1301 and ET131x series MACs</div><div class='add'>+ *</div><div class='add'>+ * Copyright © 2005 Agere Systems Inc.</div><div class='add'>+ * All rights reserved.</div><div class='add'>+ *   http://www.agere.com</div><div class='add'>+ *</div><div class='add'>+ *------------------------------------------------------------------------------</div><div class='add'>+ *</div><div class='add'>+ * et131x_isr.c - File which contains the ISR, ISR handler, and related routines</div><div class='add'>+ *                for processing interrupts from the device.</div><div class='add'>+ *</div><div class='add'>+ *------------------------------------------------------------------------------</div><div class='add'>+ *</div><div class='add'>+ * SOFTWARE LICENSE</div><div class='add'>+ *</div><div class='add'>+ * This software is provided subject to the following terms and conditions,</div><div class='add'>+ * which you should read carefully before using the software.  Using this</div><div class='add'>+ * software indicates your acceptance of these terms and conditions.  If you do</div><div class='add'>+ * not agree with these terms and conditions, do not use the software.</div><div class='add'>+ *</div><div class='add'>+ * Copyright © 2005 Agere Systems Inc.</div><div class='add'>+ * All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source or binary forms, with or without</div><div class='add'>+ * modifications, are permitted provided that the following conditions are met:</div><div class='add'>+ *</div><div class='add'>+ * . Redistributions of source code must retain the above copyright notice, this</div><div class='add'>+ *    list of conditions and the following Disclaimer as comments in the code as</div><div class='add'>+ *    well as in the documentation and/or other materials provided with the</div><div class='add'>+ *    distribution.</div><div class='add'>+ *</div><div class='add'>+ * . Redistributions in binary form must reproduce the above copyright notice,</div><div class='add'>+ *    this list of conditions and the following Disclaimer in the documentation</div><div class='add'>+ *    and/or other materials provided with the distribution.</div><div class='add'>+ *</div><div class='add'>+ * . Neither the name of Agere Systems Inc. nor the names of the contributors</div><div class='add'>+ *    may be used to endorse or promote products derived from this software</div><div class='add'>+ *    without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ * Disclaimer</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES,</div><div class='add'>+ * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  ANY</div><div class='add'>+ * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN</div><div class='add'>+ * RISK. IN NO EVENT SHALL AGERE SYSTEMS INC. OR CONTRIBUTORS BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, INCLUDING, BUT NOT LIMITED TO, CONTRACT, STRICT</div><div class='add'>+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT</div><div class='add'>+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH</div><div class='add'>+ * DAMAGE.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "et131x_version.h"</div><div class='add'>+#include "et131x_debug.h"</div><div class='add'>+#include "et131x_defs.h"</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/ptrace.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/ctype.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/timer.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/in.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/system.h&gt;</div><div class='add'>+#include &lt;asm/bitops.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/if_arp.h&gt;</div><div class='add'>+#include &lt;linux/ioport.h&gt;</div><div class='add'>+</div><div class='add'>+#include "et1310_phy.h"</div><div class='add'>+#include "et1310_pm.h"</div><div class='add'>+#include "et1310_jagcore.h"</div><div class='add'>+#include "et1310_mac.h"</div><div class='add'>+</div><div class='add'>+#include "et131x_adapter.h"</div><div class='add'>+</div><div class='add'>+/* Data for debugging facilities */</div><div class='add'>+#ifdef CONFIG_ET131X_DEBUG</div><div class='add'>+extern dbg_info_t *et131x_dbginfo;</div><div class='add'>+#endif /* CONFIG_ET131X_DEBUG */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * et131x_isr - The Interrupt Service Routine for the driver.</div><div class='add'>+ * @irq: the IRQ on which the interrupt was received.</div><div class='add'>+ * @dev_id: device-specific info (here a pointer to a net_device struct)</div><div class='add'>+ *</div><div class='add'>+ * Returns a value indicating if the interrupt was handled.</div><div class='add'>+ */</div><div class='add'>+irqreturn_t et131x_isr(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	bool handled = true;</div><div class='add'>+	struct net_device *netdev = (struct net_device *)dev_id;</div><div class='add'>+	struct et131x_adapter *adapter = NULL;</div><div class='add'>+	INTERRUPT_t status;</div><div class='add'>+</div><div class='add'>+	if (netdev == NULL || !netif_device_present(netdev)) {</div><div class='add'>+		DBG_WARNING(et131x_dbginfo,</div><div class='add'>+			    "No net_device struct or device not present\n");</div><div class='add'>+		handled = false;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	adapter = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	/* If the adapter is in low power state, then it should not</div><div class='add'>+	 * recognize any interrupt</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* Disable Device Interrupts */</div><div class='add'>+	et131x_disable_interrupts(adapter);</div><div class='add'>+</div><div class='add'>+	/* Get a copy of the value in the interrupt status register</div><div class='add'>+	 * so we can process the interrupting section</div><div class='add'>+	 */</div><div class='add'>+	status.value = readl(&amp;adapter-&gt;CSRAddress-&gt;global.int_status.value);</div><div class='add'>+</div><div class='add'>+	if (adapter-&gt;FlowControl == TxOnly ||</div><div class='add'>+	    adapter-&gt;FlowControl == Both) {</div><div class='add'>+		status.value &amp;= ~INT_MASK_ENABLE;</div><div class='add'>+	} else {</div><div class='add'>+		status.value &amp;= ~INT_MASK_ENABLE_NO_FLOW;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Make sure this is our interrupt */</div><div class='add'>+	if (!status.value) {</div><div class='add'>+#ifdef CONFIG_ET131X_DEBUG</div><div class='add'>+		adapter-&gt;Stats.UnhandledInterruptsPerSec++;</div><div class='add'>+#endif</div><div class='add'>+		handled = false;</div><div class='add'>+		DBG_VERBOSE(et131x_dbginfo, "NOT OUR INTERRUPT\n");</div><div class='add'>+		et131x_enable_interrupts(adapter);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* This is our interrupt, so process accordingly */</div><div class='add'>+#ifdef CONFIG_ET131X_DEBUG</div><div class='add'>+	if (status.bits.rxdma_xfr_done) {</div><div class='add'>+		adapter-&gt;Stats.RxDmaInterruptsPerSec++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (status.bits.txdma_isr) {</div><div class='add'>+		adapter-&gt;Stats.TxDmaInterruptsPerSec++;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	if (status.bits.watchdog_interrupt) {</div><div class='add'>+		PMP_TCB pMpTcb = adapter-&gt;TxRing.CurrSendHead;</div><div class='add'>+</div><div class='add'>+		if (pMpTcb) {</div><div class='add'>+			if (++pMpTcb-&gt;PacketStaleCount &gt; 1) {</div><div class='add'>+				status.bits.txdma_isr = 1;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (adapter-&gt;RxRing.UnfinishedReceives) {</div><div class='add'>+			status.bits.rxdma_xfr_done = 1;</div><div class='add'>+		} else if (pMpTcb == NULL) {</div><div class='add'>+			writel(0, &amp;adapter-&gt;CSRAddress-&gt;global.watchdog_timer);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		status.bits.watchdog_interrupt = 0;</div><div class='add'>+#ifdef CONFIG_ET131X_DEBUG</div><div class='add'>+		adapter-&gt;Stats.WatchDogInterruptsPerSec++;</div><div class='add'>+#endif</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (status.value == 0) {</div><div class='add'>+		/* This interrupt has in some way been "handled" by</div><div class='add'>+		 * the ISR. Either it was a spurious Rx interrupt, or</div><div class='add'>+		 * it was a Tx interrupt that has been filtered by</div><div class='add'>+		 * the ISR.</div><div class='add'>+		 */</div><div class='add'>+		et131x_enable_interrupts(adapter);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* We need to save the interrupt status value for use in our</div><div class='add'>+	 * DPC. We will clear the software copy of that in that</div><div class='add'>+	 * routine.</div><div class='add'>+	 */</div><div class='add'>+	adapter-&gt;Stats.InterruptStatus = status;</div><div class='add'>+</div><div class='add'>+	/* Schedule the ISR handler as a bottom-half task in the</div><div class='add'>+	 * kernel's tq_immediate queue, and mark the queue for</div><div class='add'>+	 * execution</div><div class='add'>+	 */</div><div class='add'>+	schedule_work(&amp;adapter-&gt;task);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return IRQ_RETVAL(handled);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * et131x_isr_handler - The ISR handler</div><div class='add'>+ * @p_adapter, a pointer to the device's private adapter structure</div><div class='add'>+ *</div><div class='add'>+ * scheduled to run in a deferred context by the ISR. This is where the ISR's</div><div class='add'>+ * work actually gets done.</div><div class='add'>+ */</div><div class='add'>+void et131x_isr_handler(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct et131x_adapter *pAdapter =</div><div class='add'>+		container_of(work, struct et131x_adapter, task);</div><div class='add'>+	INTERRUPT_t GlobStatus = pAdapter-&gt;Stats.InterruptStatus;</div><div class='add'>+	ADDRESS_MAP_t __iomem *iomem = pAdapter-&gt;CSRAddress;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * These first two are by far the most common.  Once handled, we clear</div><div class='add'>+	 * their two bits in the status word.  If the word is now zero, we</div><div class='add'>+	 * exit.</div><div class='add'>+	 */</div><div class='add'>+	/* Handle all the completed Transmit interrupts */</div><div class='add'>+	if (GlobStatus.bits.txdma_isr) {</div><div class='add'>+		DBG_TX(et131x_dbginfo, "TXDMA_ISR interrupt\n");</div><div class='add'>+		et131x_handle_send_interrupt(pAdapter);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Handle all the completed Receives interrupts */</div><div class='add'>+	if (GlobStatus.bits.rxdma_xfr_done) {</div><div class='add'>+		DBG_RX(et131x_dbginfo, "RXDMA_XFR_DONE interrupt\n");</div><div class='add'>+		et131x_handle_recv_interrupt(pAdapter);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	GlobStatus.value &amp;= 0xffffffd7;</div><div class='add'>+</div><div class='add'>+	if (GlobStatus.value) {</div><div class='add'>+		/* Handle the TXDMA Error interrupt */</div><div class='add'>+		if (GlobStatus.bits.txdma_err) {</div><div class='add'>+			TXDMA_ERROR_t TxDmaErr;</div><div class='add'>+</div><div class='add'>+			/* Following read also clears the register (COR) */</div><div class='add'>+			TxDmaErr.value = readl(&amp;iomem-&gt;txdma.TxDmaError.value);</div><div class='add'>+</div><div class='add'>+			DBG_WARNING(et131x_dbginfo,</div><div class='add'>+				    "TXDMA_ERR interrupt, error = %d\n",</div><div class='add'>+				    TxDmaErr.value);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Handle Free Buffer Ring 0 and 1 Low interrupt */</div><div class='add'>+		if (GlobStatus.bits.rxdma_fb_ring0_low ||</div><div class='add'>+		    GlobStatus.bits.rxdma_fb_ring1_low) {</div><div class='add'>+			/*</div><div class='add'>+			 * This indicates the number of unused buffers in</div><div class='add'>+			 * RXDMA free buffer ring 0 is &lt;= the limit you</div><div class='add'>+			 * programmed. Free buffer resources need to be</div><div class='add'>+			 * returned.  Free buffers are consumed as packets</div><div class='add'>+			 * are passed from the network to the host. The host</div><div class='add'>+			 * becomes aware of the packets from the contents of</div><div class='add'>+			 * the packet status ring. This ring is queried when</div><div class='add'>+			 * the packet done interrupt occurs. Packets are then</div><div class='add'>+			 * passed to the OS. When the OS is done with the</div><div class='add'>+			 * packets the resources can be returned to the</div><div class='add'>+			 * ET1310 for re-use. This interrupt is one method of</div><div class='add'>+			 * returning resources.</div><div class='add'>+			 */</div><div class='add'>+			DBG_WARNING(et131x_dbginfo,</div><div class='add'>+				    "RXDMA_FB_RING0_LOW or "</div><div class='add'>+				    "RXDMA_FB_RING1_LOW interrupt\n");</div><div class='add'>+</div><div class='add'>+			/* If the user has flow control on, then we will</div><div class='add'>+			 * send a pause packet, otherwise just exit</div><div class='add'>+			 */</div><div class='add'>+			if (pAdapter-&gt;FlowControl == TxOnly ||</div><div class='add'>+			    pAdapter-&gt;FlowControl == Both) {</div><div class='add'>+				PM_CSR_t pm_csr;</div><div class='add'>+</div><div class='add'>+				/* Tell the device to send a pause packet via</div><div class='add'>+				 * the back pressure register</div><div class='add'>+				 */</div><div class='add'>+				pm_csr.value = readl(&amp;iomem-&gt;global.pm_csr.value);</div><div class='add'>+				if (pm_csr.bits.pm_phy_sw_coma == 0) {</div><div class='add'>+					TXMAC_BP_CTRL_t bp_ctrl = { 0 };</div><div class='add'>+</div><div class='add'>+					bp_ctrl.bits.bp_req = 1;</div><div class='add'>+					bp_ctrl.bits.bp_xonxoff = 1;</div><div class='add'>+					writel(bp_ctrl.value,</div><div class='add'>+					       &amp;iomem-&gt;txmac.bp_ctrl.value);</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Handle Packet Status Ring Low Interrupt */</div><div class='add'>+		if (GlobStatus.bits.rxdma_pkt_stat_ring_low) {</div><div class='add'>+			DBG_WARNING(et131x_dbginfo,</div><div class='add'>+				    "RXDMA_PKT_STAT_RING_LOW interrupt\n");</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * Same idea as with the two Free Buffer Rings.</div><div class='add'>+			 * Packets going from the network to the host each</div><div class='add'>+			 * consume a free buffer resource and a packet status</div><div class='add'>+			 * resource.  These resoures are passed to the OS.</div><div class='add'>+			 * When the OS is done with the resources, they need</div><div class='add'>+			 * to be returned to the ET1310. This is one method</div><div class='add'>+			 * of returning the resources.</div><div class='add'>+			 */</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Handle RXDMA Error Interrupt */</div><div class='add'>+		if (GlobStatus.bits.rxdma_err) {</div><div class='add'>+			/*</div><div class='add'>+			 * The rxdma_error interrupt is sent when a time-out</div><div class='add'>+			 * on a request issued by the JAGCore has occurred or</div><div class='add'>+			 * a completion is returned with an un-successful</div><div class='add'>+			 * status.  In both cases the request is considered</div><div class='add'>+			 * complete. The JAGCore will automatically re-try the</div><div class='add'>+			 * request in question. Normally information on events</div><div class='add'>+			 * like these are sent to the host using the "Advanced</div><div class='add'>+			 * Error Reporting" capability. This interrupt is</div><div class='add'>+			 * another way of getting similar information. The</div><div class='add'>+			 * only thing required is to clear the interrupt by</div><div class='add'>+			 * reading the ISR in the global resources. The</div><div class='add'>+			 * JAGCore will do a re-try on the request.  Normally</div><div class='add'>+			 * you should never see this interrupt. If you start</div><div class='add'>+			 * to see this interrupt occurring frequently then</div><div class='add'>+			 * something bad has occurred. A reset might be the</div><div class='add'>+			 * thing to do.</div><div class='add'>+			 */</div><div class='add'>+			// TRAP();</div><div class='add'>+</div><div class='add'>+			pAdapter-&gt;TxMacTest.value =</div><div class='add'>+				readl(&amp;iomem-&gt;txmac.tx_test.value);</div><div class='add'>+			DBG_WARNING(et131x_dbginfo,</div><div class='add'>+				    "RxDMA_ERR interrupt, error %x\n",</div><div class='add'>+				    pAdapter-&gt;TxMacTest.value);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Handle the Wake on LAN Event */</div><div class='add'>+		if (GlobStatus.bits.wake_on_lan) {</div><div class='add'>+			/*</div><div class='add'>+			 * This is a secondary interrupt for wake on LAN.</div><div class='add'>+			 * The driver should never see this, if it does,</div><div class='add'>+			 * something serious is wrong. We will TRAP the</div><div class='add'>+			 * message when we are in DBG mode, otherwise we</div><div class='add'>+			 * will ignore it.</div><div class='add'>+			 */</div><div class='add'>+			DBG_ERROR(et131x_dbginfo, "WAKE_ON_LAN interrupt\n");</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Handle the PHY interrupt */</div><div class='add'>+		if (GlobStatus.bits.phy_interrupt) {</div><div class='add'>+			PM_CSR_t pm_csr;</div><div class='add'>+			MI_BMSR_t BmsrInts, BmsrData;</div><div class='add'>+			MI_ISR_t myIsr;</div><div class='add'>+</div><div class='add'>+			DBG_VERBOSE(et131x_dbginfo, "PHY interrupt\n");</div><div class='add'>+</div><div class='add'>+			/* If we are in coma mode when we get this interrupt,</div><div class='add'>+			 * we need to disable it.</div><div class='add'>+			 */</div><div class='add'>+			pm_csr.value = readl(&amp;iomem-&gt;global.pm_csr.value);</div><div class='add'>+			if (pm_csr.bits.pm_phy_sw_coma == 1) {</div><div class='add'>+				/*</div><div class='add'>+				 * Check to see if we are in coma mode and if</div><div class='add'>+				 * so, disable it because we will not be able</div><div class='add'>+				 * to read PHY values until we are out.</div><div class='add'>+				 */</div><div class='add'>+				DBG_VERBOSE(et131x_dbginfo,</div><div class='add'>+					    "Device is in COMA mode, "</div><div class='add'>+					    "need to wake up\n");</div><div class='add'>+				DisablePhyComa(pAdapter);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* Read the PHY ISR to clear the reason for the</div><div class='add'>+			 * interrupt.</div><div class='add'>+			 */</div><div class='add'>+			MiRead(pAdapter, (uint8_t) offsetof(MI_REGS_t, isr),</div><div class='add'>+			       &amp;myIsr.value);</div><div class='add'>+</div><div class='add'>+			if (!pAdapter-&gt;ReplicaPhyLoopbk) {</div><div class='add'>+				MiRead(pAdapter,</div><div class='add'>+				       (uint8_t) offsetof(MI_REGS_t, bmsr),</div><div class='add'>+				       &amp;BmsrData.value);</div><div class='add'>+</div><div class='add'>+				BmsrInts.value =</div><div class='add'>+				    pAdapter-&gt;Bmsr.value ^ BmsrData.value;</div><div class='add'>+				pAdapter-&gt;Bmsr.value = BmsrData.value;</div><div class='add'>+</div><div class='add'>+				DBG_VERBOSE(et131x_dbginfo,</div><div class='add'>+					    "Bmsr.value = 0x%04x,"</div><div class='add'>+					    "Bmsr_ints.value = 0x%04x\n",</div><div class='add'>+					    BmsrData.value, BmsrInts.value);</div><div class='add'>+</div><div class='add'>+				/* Do all the cable in / cable out stuff */</div><div class='add'>+				et131x_Mii_check(pAdapter, BmsrData, BmsrInts);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Let's move on to the TxMac */</div><div class='add'>+		if (GlobStatus.bits.txmac_interrupt) {</div><div class='add'>+			pAdapter-&gt;TxRing.TxMacErr.value =</div><div class='add'>+				readl(&amp;iomem-&gt;txmac.err.value);</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * When any of the errors occur and TXMAC generates</div><div class='add'>+			 * an interrupt to report these errors, it usually</div><div class='add'>+			 * means that TXMAC has detected an error in the data</div><div class='add'>+			 * stream retrieved from the on-chip Tx Q. All of</div><div class='add'>+			 * these errors are catastrophic and TXMAC won't be</div><div class='add'>+			 * able to recover data when these errors occur.  In</div><div class='add'>+			 * a nutshell, the whole Tx path will have to be reset</div><div class='add'>+			 * and re-configured afterwards.</div><div class='add'>+			 */</div><div class='add'>+			DBG_WARNING(et131x_dbginfo,</div><div class='add'>+				    "TXMAC interrupt, error 0x%08x\n",</div><div class='add'>+				    pAdapter-&gt;TxRing.TxMacErr.value);</div><div class='add'>+</div><div class='add'>+			/* If we are debugging, we want to see this error,</div><div class='add'>+			 * otherwise we just want the device to be reset and</div><div class='add'>+			 * continue</div><div class='add'>+			 */</div><div class='add'>+			//DBG_TRAP();</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Handle RXMAC Interrupt */</div><div class='add'>+		if (GlobStatus.bits.rxmac_interrupt) {</div><div class='add'>+			/*</div><div class='add'>+			 * These interrupts are catastrophic to the device,</div><div class='add'>+			 * what we need to do is disable the interrupts and</div><div class='add'>+			 * set the flag to cause us to reset so we can solve</div><div class='add'>+			 * this issue.</div><div class='add'>+			 */</div><div class='add'>+			// MP_SET_FLAG( pAdapter, fMP_ADAPTER_HARDWARE_ERROR );</div><div class='add'>+</div><div class='add'>+			DBG_WARNING(et131x_dbginfo,</div><div class='add'>+				    "RXMAC interrupt, error 0x%08x.  Requesting reset\n",</div><div class='add'>+				    readl(&amp;iomem-&gt;rxmac.err_reg.value));</div><div class='add'>+</div><div class='add'>+			DBG_WARNING(et131x_dbginfo,</div><div class='add'>+				    "Enable 0x%08x, Diag 0x%08x\n",</div><div class='add'>+				    readl(&amp;iomem-&gt;rxmac.ctrl.value),</div><div class='add'>+				    readl(&amp;iomem-&gt;rxmac.rxq_diag.value));</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * If we are debugging, we want to see this error,</div><div class='add'>+			 * otherwise we just want the device to be reset and</div><div class='add'>+			 * continue</div><div class='add'>+			 */</div><div class='add'>+			// TRAP();</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Handle MAC_STAT Interrupt */</div><div class='add'>+		if (GlobStatus.bits.mac_stat_interrupt) {</div><div class='add'>+			/*</div><div class='add'>+			 * This means at least one of the un-masked counters</div><div class='add'>+			 * in the MAC_STAT block has rolled over.  Use this</div><div class='add'>+			 * to maintain the top, software managed bits of the</div><div class='add'>+			 * counter(s).</div><div class='add'>+			 */</div><div class='add'>+			DBG_VERBOSE(et131x_dbginfo, "MAC_STAT interrupt\n");</div><div class='add'>+			HandleMacStatInterrupt(pAdapter);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Handle SLV Timeout Interrupt */</div><div class='add'>+		if (GlobStatus.bits.slv_timeout) {</div><div class='add'>+			/*</div><div class='add'>+			 * This means a timeout has occured on a read or</div><div class='add'>+			 * write request to one of the JAGCore registers. The</div><div class='add'>+			 * Global Resources block has terminated the request</div><div class='add'>+			 * and on a read request, returned a "fake" value.</div><div class='add'>+			 * The most likely reasons are: Bad Address or the</div><div class='add'>+			 * addressed module is in a power-down state and</div><div class='add'>+			 * can't respond.</div><div class='add'>+			 */</div><div class='add'>+			DBG_VERBOSE(et131x_dbginfo, "SLV_TIMEOUT interrupt\n");</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pAdapter-&gt;PoMgmt.PowerState == NdisDeviceStateD0) {</div><div class='add'>+		et131x_enable_interrupts(pAdapter);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/staging/et131x/et131x_isr.h b/drivers/staging/et131x/et131x_isr.h<br/>new file mode 100644<br/>index 000000000000..76a51d56551e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/et131x/et131x_isr.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/et131x/et131x_isr.h</a></div><div class='hunk'>@@ -0,0 +1,65 @@</div><div class='add'>+/*</div><div class='add'>+ * Agere Systems Inc.</div><div class='add'>+ * 10/100/1000 Base-T Ethernet Driver for the ET1301 and ET131x series MACs</div><div class='add'>+ *</div><div class='add'>+ * Copyright © 2005 Agere Systems Inc.</div><div class='add'>+ * All rights reserved.</div><div class='add'>+ *   http://www.agere.com</div><div class='add'>+ *</div><div class='add'>+ *------------------------------------------------------------------------------</div><div class='add'>+ *</div><div class='add'>+ * et131x_isr.h - Defines, structs, enums, prototypes, etc. pertaining to the</div><div class='add'>+ *                ISR processing code.</div><div class='add'>+ *</div><div class='add'>+ *------------------------------------------------------------------------------</div><div class='add'>+ *</div><div class='add'>+ * SOFTWARE LICENSE</div><div class='add'>+ *</div><div class='add'>+ * This software is provided subject to the following terms and conditions,</div><div class='add'>+ * which you should read carefully before using the software.  Using this</div><div class='add'>+ * software indicates your acceptance of these terms and conditions.  If you do</div><div class='add'>+ * not agree with these terms and conditions, do not use the software.</div><div class='add'>+ *</div><div class='add'>+ * Copyright © 2005 Agere Systems Inc.</div><div class='add'>+ * All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source or binary forms, with or without</div><div class='add'>+ * modifications, are permitted provided that the following conditions are met:</div><div class='add'>+ *</div><div class='add'>+ * . Redistributions of source code must retain the above copyright notice, this</div><div class='add'>+ *    list of conditions and the following Disclaimer as comments in the code as</div><div class='add'>+ *    well as in the documentation and/or other materials provided with the</div><div class='add'>+ *    distribution.</div><div class='add'>+ *</div><div class='add'>+ * . Redistributions in binary form must reproduce the above copyright notice,</div><div class='add'>+ *    this list of conditions and the following Disclaimer in the documentation</div><div class='add'>+ *    and/or other materials provided with the distribution.</div><div class='add'>+ *</div><div class='add'>+ * . Neither the name of Agere Systems Inc. nor the names of the contributors</div><div class='add'>+ *    may be used to endorse or promote products derived from this software</div><div class='add'>+ *    without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ * Disclaimer</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES,</div><div class='add'>+ * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  ANY</div><div class='add'>+ * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN</div><div class='add'>+ * RISK. IN NO EVENT SHALL AGERE SYSTEMS INC. OR CONTRIBUTORS BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, INCLUDING, BUT NOT LIMITED TO, CONTRACT, STRICT</div><div class='add'>+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT</div><div class='add'>+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH</div><div class='add'>+ * DAMAGE.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __ET131X_ISR_H__</div><div class='add'>+#define __ET131X_ISR_H__</div><div class='add'>+</div><div class='add'>+irqreturn_t et131x_isr(int irq, void *dev_id);</div><div class='add'>+void et131x_isr_handler(struct work_struct *work);</div><div class='add'>+</div><div class='add'>+#endif /* __ET131X_ISR_H__ */</div><div class='head'>diff --git a/drivers/staging/et131x/et131x_netdev.c b/drivers/staging/et131x/et131x_netdev.c<br/>new file mode 100644<br/>index 000000000000..de65972ff362<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/et131x/et131x_netdev.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/et131x/et131x_netdev.c</a></div><div class='hunk'>@@ -0,0 +1,856 @@</div><div class='add'>+/*</div><div class='add'>+ * Agere Systems Inc.</div><div class='add'>+ * 10/100/1000 Base-T Ethernet Driver for the ET1301 and ET131x series MACs</div><div class='add'>+ *</div><div class='add'>+ * Copyright © 2005 Agere Systems Inc.</div><div class='add'>+ * All rights reserved.</div><div class='add'>+ *   http://www.agere.com</div><div class='add'>+ *</div><div class='add'>+ *------------------------------------------------------------------------------</div><div class='add'>+ *</div><div class='add'>+ * et131x_netdev.c - Routines and data required by all Linux network devices.</div><div class='add'>+ *</div><div class='add'>+ *------------------------------------------------------------------------------</div><div class='add'>+ *</div><div class='add'>+ * SOFTWARE LICENSE</div><div class='add'>+ *</div><div class='add'>+ * This software is provided subject to the following terms and conditions,</div><div class='add'>+ * which you should read carefully before using the software.  Using this</div><div class='add'>+ * software indicates your acceptance of these terms and conditions.  If you do</div><div class='add'>+ * not agree with these terms and conditions, do not use the software.</div><div class='add'>+ *</div><div class='add'>+ * Copyright © 2005 Agere Systems Inc.</div><div class='add'>+ * All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source or binary forms, with or without</div><div class='add'>+ * modifications, are permitted provided that the following conditions are met:</div><div class='add'>+ *</div><div class='add'>+ * . Redistributions of source code must retain the above copyright notice, this</div><div class='add'>+ *    list of conditions and the following Disclaimer as comments in the code as</div><div class='add'>+ *    well as in the documentation and/or other materials provided with the</div><div class='add'>+ *    distribution.</div><div class='add'>+ *</div><div class='add'>+ * . Redistributions in binary form must reproduce the above copyright notice,</div><div class='add'>+ *    this list of conditions and the following Disclaimer in the documentation</div><div class='add'>+ *    and/or other materials provided with the distribution.</div><div class='add'>+ *</div><div class='add'>+ * . Neither the name of Agere Systems Inc. nor the names of the contributors</div><div class='add'>+ *    may be used to endorse or promote products derived from this software</div><div class='add'>+ *    without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ * Disclaimer</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES,</div><div class='add'>+ * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  ANY</div><div class='add'>+ * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN</div><div class='add'>+ * RISK. IN NO EVENT SHALL AGERE SYSTEMS INC. OR CONTRIBUTORS BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, INCLUDING, BUT NOT LIMITED TO, CONTRACT, STRICT</div><div class='add'>+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT</div><div class='add'>+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH</div><div class='add'>+ * DAMAGE.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "et131x_version.h"</div><div class='add'>+#include "et131x_debug.h"</div><div class='add'>+#include "et131x_defs.h"</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/ptrace.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/ctype.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/timer.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/in.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/system.h&gt;</div><div class='add'>+#include &lt;asm/bitops.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/mii.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/if_arp.h&gt;</div><div class='add'>+#include &lt;linux/ioport.h&gt;</div><div class='add'>+</div><div class='add'>+#include "et1310_phy.h"</div><div class='add'>+#include "et1310_pm.h"</div><div class='add'>+#include "et1310_jagcore.h"</div><div class='add'>+#include "et1310_mac.h"</div><div class='add'>+#include "et1310_tx.h"</div><div class='add'>+</div><div class='add'>+#include "et131x_adapter.h"</div><div class='add'>+#include "et131x_isr.h"</div><div class='add'>+#include "et131x_initpci.h"</div><div class='add'>+</div><div class='add'>+/* Data for debugging facilities */</div><div class='add'>+#ifdef CONFIG_ET131X_DEBUG</div><div class='add'>+extern dbg_info_t *et131x_dbginfo;</div><div class='add'>+#endif /* CONFIG_ET131X_DEBUG */</div><div class='add'>+</div><div class='add'>+struct net_device_stats *et131x_stats(struct net_device *netdev);</div><div class='add'>+int et131x_open(struct net_device *netdev);</div><div class='add'>+int et131x_close(struct net_device *netdev);</div><div class='add'>+int et131x_ioctl(struct net_device *netdev, struct ifreq *reqbuf, int cmd);</div><div class='add'>+void et131x_multicast(struct net_device *netdev);</div><div class='add'>+int et131x_tx(struct sk_buff *skb, struct net_device *netdev);</div><div class='add'>+void et131x_tx_timeout(struct net_device *netdev);</div><div class='add'>+int et131x_change_mtu(struct net_device *netdev, int new_mtu);</div><div class='add'>+int et131x_set_mac_addr(struct net_device *netdev, void *new_mac);</div><div class='add'>+void et131x_vlan_rx_register(struct net_device *netdev, struct vlan_group *grp);</div><div class='add'>+void et131x_vlan_rx_add_vid(struct net_device *netdev, uint16_t vid);</div><div class='add'>+void et131x_vlan_rx_kill_vid(struct net_device *netdev, uint16_t vid);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * et131x_device_alloc</div><div class='add'>+ *</div><div class='add'>+ * Returns pointer to the allocated and initialized net_device struct for</div><div class='add'>+ * this device.</div><div class='add'>+ *</div><div class='add'>+ * Create instances of net_device and wl_private for the new adapter and</div><div class='add'>+ * register the device's entry points in the net_device structure.</div><div class='add'>+ */</div><div class='add'>+struct net_device *et131x_device_alloc(void)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev;</div><div class='add'>+</div><div class='add'>+	DBG_ENTER(et131x_dbginfo);</div><div class='add'>+</div><div class='add'>+	/* Alloc net_device and adapter structs */</div><div class='add'>+	netdev = alloc_etherdev(sizeof(struct et131x_adapter));</div><div class='add'>+</div><div class='add'>+	if (netdev == NULL) {</div><div class='add'>+		DBG_ERROR(et131x_dbginfo,</div><div class='add'>+			  "Alloc of net_device struct failed\n");</div><div class='add'>+		DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Setup the function registration table (and other data) for a</div><div class='add'>+	 * net_device</div><div class='add'>+	 */</div><div class='add'>+	//netdev-&gt;init               = &amp;et131x_init;</div><div class='add'>+	//netdev-&gt;set_config = &amp;et131x_config;</div><div class='add'>+	netdev-&gt;get_stats = &amp;et131x_stats;</div><div class='add'>+	netdev-&gt;open = &amp;et131x_open;</div><div class='add'>+	netdev-&gt;stop = &amp;et131x_close;</div><div class='add'>+	netdev-&gt;do_ioctl = &amp;et131x_ioctl;</div><div class='add'>+	netdev-&gt;set_multicast_list = &amp;et131x_multicast;</div><div class='add'>+	netdev-&gt;hard_start_xmit = &amp;et131x_tx;</div><div class='add'>+	netdev-&gt;tx_timeout = &amp;et131x_tx_timeout;</div><div class='add'>+	netdev-&gt;watchdog_timeo = ET131X_TX_TIMEOUT;</div><div class='add'>+	netdev-&gt;change_mtu = &amp;et131x_change_mtu;</div><div class='add'>+	netdev-&gt;set_mac_address = &amp;et131x_set_mac_addr;</div><div class='add'>+</div><div class='add'>+	//netdev-&gt;ethtool_ops        = &amp;et131x_ethtool_ops;</div><div class='add'>+</div><div class='add'>+	// Poll?</div><div class='add'>+	//netdev-&gt;poll               = &amp;et131x_poll;</div><div class='add'>+	//netdev-&gt;poll_controller    = &amp;et131x_poll_controller;</div><div class='add'>+</div><div class='add'>+	DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+	return netdev;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * et131x_stats - Return the current device statistics.</div><div class='add'>+ * @netdev: device whose stats are being queried</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 on success, errno on failure (as defined in errno.h)</div><div class='add'>+ */</div><div class='add'>+struct net_device_stats *et131x_stats(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct et131x_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+	struct net_device_stats *stats = &amp;adapter-&gt;net_stats;</div><div class='add'>+	CE_STATS_t *devstat = &amp;adapter-&gt;Stats;</div><div class='add'>+</div><div class='add'>+	DBG_ENTER(et131x_dbginfo);</div><div class='add'>+</div><div class='add'>+	stats-&gt;rx_packets = devstat-&gt;ipackets;</div><div class='add'>+	stats-&gt;tx_packets = devstat-&gt;opackets;</div><div class='add'>+	stats-&gt;rx_errors = devstat-&gt;length_err + devstat-&gt;alignment_err +</div><div class='add'>+	    devstat-&gt;crc_err + devstat-&gt;code_violations + devstat-&gt;other_errors;</div><div class='add'>+	stats-&gt;tx_errors = devstat-&gt;max_pkt_error;</div><div class='add'>+	stats-&gt;multicast = devstat-&gt;multircv;</div><div class='add'>+	stats-&gt;collisions = devstat-&gt;collisions;</div><div class='add'>+</div><div class='add'>+	stats-&gt;rx_length_errors = devstat-&gt;length_err;</div><div class='add'>+	stats-&gt;rx_over_errors = devstat-&gt;rx_ov_flow;</div><div class='add'>+	stats-&gt;rx_crc_errors = devstat-&gt;crc_err;</div><div class='add'>+</div><div class='add'>+	// NOTE: These stats don't have corresponding values in CE_STATS, so we're</div><div class='add'>+	//       going to have to update these directly from within the TX/RX code</div><div class='add'>+	//stats-&gt;rx_bytes            = 20; //devstat-&gt;;</div><div class='add'>+	//stats-&gt;tx_bytes            = 20; //devstat-&gt;;</div><div class='add'>+	//stats-&gt;rx_dropped          = devstat-&gt;;</div><div class='add'>+	//stats-&gt;tx_dropped          = devstat-&gt;;</div><div class='add'>+</div><div class='add'>+	// NOTE: Not used, can't find analogous statistics</div><div class='add'>+	//stats-&gt;rx_frame_errors     = devstat-&gt;;</div><div class='add'>+	//stats-&gt;rx_fifo_errors      = devstat-&gt;;</div><div class='add'>+	//stats-&gt;rx_missed_errors    = devstat-&gt;;</div><div class='add'>+</div><div class='add'>+	//stats-&gt;tx_aborted_errors   = devstat-&gt;;</div><div class='add'>+	//stats-&gt;tx_carrier_errors   = devstat-&gt;;</div><div class='add'>+	//stats-&gt;tx_fifo_errors      = devstat-&gt;;</div><div class='add'>+	//stats-&gt;tx_heartbeat_errors = devstat-&gt;;</div><div class='add'>+	//stats-&gt;tx_window_errors    = devstat-&gt;;</div><div class='add'>+</div><div class='add'>+	DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+	return stats;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * et131x_open - Open the device for use.</div><div class='add'>+ * @netdev: device to be opened</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 on success, errno on failure (as defined in errno.h)</div><div class='add'>+ */</div><div class='add'>+int et131x_open(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	int result = 0;</div><div class='add'>+	struct et131x_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	DBG_ENTER(et131x_dbginfo);</div><div class='add'>+</div><div class='add'>+	/* Start the timer to track NIC errors */</div><div class='add'>+	add_timer(&amp;adapter-&gt;ErrorTimer);</div><div class='add'>+</div><div class='add'>+	/* Register our ISR */</div><div class='add'>+	DBG_TRACE(et131x_dbginfo, "Registering ISR...\n");</div><div class='add'>+</div><div class='add'>+	result =</div><div class='add'>+	    request_irq(netdev-&gt;irq, et131x_isr, IRQF_SHARED, netdev-&gt;name,</div><div class='add'>+			netdev);</div><div class='add'>+	if (result) {</div><div class='add'>+		DBG_ERROR(et131x_dbginfo, "Could not register ISR\n");</div><div class='add'>+		DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+		return result;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Enable the Tx and Rx DMA engines (if not already enabled) */</div><div class='add'>+	et131x_rx_dma_enable(adapter);</div><div class='add'>+	et131x_tx_dma_enable(adapter);</div><div class='add'>+</div><div class='add'>+	/* Enable device interrupts */</div><div class='add'>+	et131x_enable_interrupts(adapter);</div><div class='add'>+</div><div class='add'>+	MP_SET_FLAG(adapter, fMP_ADAPTER_INTERRUPT_IN_USE);</div><div class='add'>+</div><div class='add'>+	/* We're ready to move some data, so start the queue */</div><div class='add'>+	netif_start_queue(netdev);</div><div class='add'>+</div><div class='add'>+	DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * et131x_close - Close the device</div><div class='add'>+ * @netdev: device to be closed</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 on success, errno on failure (as defined in errno.h)</div><div class='add'>+ */</div><div class='add'>+int et131x_close(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct et131x_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	DBG_ENTER(et131x_dbginfo);</div><div class='add'>+</div><div class='add'>+	/* First thing is to stop the queue */</div><div class='add'>+	netif_stop_queue(netdev);</div><div class='add'>+</div><div class='add'>+	/* Stop the Tx and Rx DMA engines */</div><div class='add'>+	et131x_rx_dma_disable(adapter);</div><div class='add'>+	et131x_tx_dma_disable(adapter);</div><div class='add'>+</div><div class='add'>+	/* Disable device interrupts */</div><div class='add'>+	et131x_disable_interrupts(adapter);</div><div class='add'>+</div><div class='add'>+	/* Deregistering ISR */</div><div class='add'>+	MP_CLEAR_FLAG(adapter, fMP_ADAPTER_INTERRUPT_IN_USE);</div><div class='add'>+</div><div class='add'>+	DBG_TRACE(et131x_dbginfo, "Deregistering ISR...\n");</div><div class='add'>+	free_irq(netdev-&gt;irq, netdev);</div><div class='add'>+</div><div class='add'>+	/* Stop the error timer */</div><div class='add'>+	del_timer_sync(&amp;adapter-&gt;ErrorTimer);</div><div class='add'>+</div><div class='add'>+	DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * et131x_ioctl_mii - The function which handles MII IOCTLs</div><div class='add'>+ * @netdev: device on which the query is being made</div><div class='add'>+ * @reqbuf: the request-specific data buffer</div><div class='add'>+ * @cmd: the command request code</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 on success, errno on failure (as defined in errno.h)</div><div class='add'>+ */</div><div class='add'>+int et131x_ioctl_mii(struct net_device *netdev, struct ifreq *reqbuf, int cmd)</div><div class='add'>+{</div><div class='add'>+	int status = 0;</div><div class='add'>+	struct et131x_adapter *pAdapter = netdev_priv(netdev);</div><div class='add'>+	struct mii_ioctl_data *data = if_mii(reqbuf);</div><div class='add'>+</div><div class='add'>+	DBG_ENTER(et131x_dbginfo);</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case SIOCGMIIPHY:</div><div class='add'>+		DBG_VERBOSE(et131x_dbginfo, "SIOCGMIIPHY\n");</div><div class='add'>+		data-&gt;phy_id = pAdapter-&gt;Stats.xcvr_addr;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case SIOCGMIIREG:</div><div class='add'>+		DBG_VERBOSE(et131x_dbginfo, "SIOCGMIIREG\n");</div><div class='add'>+		if (!capable(CAP_NET_ADMIN)) {</div><div class='add'>+			status = -EPERM;</div><div class='add'>+		} else {</div><div class='add'>+			status = MiRead(pAdapter,</div><div class='add'>+					data-&gt;reg_num, &amp;data-&gt;val_out);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case SIOCSMIIREG:</div><div class='add'>+		DBG_VERBOSE(et131x_dbginfo, "SIOCSMIIREG\n");</div><div class='add'>+		if (!capable(CAP_NET_ADMIN)) {</div><div class='add'>+			status = -EPERM;</div><div class='add'>+		} else {</div><div class='add'>+			status = MiWrite(pAdapter, data-&gt;reg_num,</div><div class='add'>+					 data-&gt;val_in);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		status = -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * et131x_ioctl - The I/O Control handler for the driver</div><div class='add'>+ * @netdev: device on which the control request is being made</div><div class='add'>+ * @reqbuf: a pointer to the IOCTL request buffer</div><div class='add'>+ * @cmd: the IOCTL command code</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 on success, errno on failure (as defined in errno.h)</div><div class='add'>+ */</div><div class='add'>+int et131x_ioctl(struct net_device *netdev, struct ifreq *reqbuf, int cmd)</div><div class='add'>+{</div><div class='add'>+	int status = 0;</div><div class='add'>+</div><div class='add'>+	DBG_ENTER(et131x_dbginfo);</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case SIOCGMIIPHY:</div><div class='add'>+	case SIOCGMIIREG:</div><div class='add'>+	case SIOCSMIIREG:</div><div class='add'>+		status = et131x_ioctl_mii(netdev, reqbuf, cmd);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		DBG_WARNING(et131x_dbginfo, "Unhandled IOCTL Code: 0x%04x\n",</div><div class='add'>+			    cmd);</div><div class='add'>+		status = -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * et131x_set_packet_filter - Configures the Rx Packet filtering on the device</div><div class='add'>+ * @adapter: pointer to our private adapter structure</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 on success, errno on failure</div><div class='add'>+ */</div><div class='add'>+int et131x_set_packet_filter(struct et131x_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	int status = 0;</div><div class='add'>+	uint32_t filter = adapter-&gt;PacketFilter;</div><div class='add'>+	RXMAC_CTRL_t ctrl;</div><div class='add'>+	RXMAC_PF_CTRL_t pf_ctrl;</div><div class='add'>+</div><div class='add'>+	DBG_ENTER(et131x_dbginfo);</div><div class='add'>+</div><div class='add'>+	ctrl.value = readl(&amp;adapter-&gt;CSRAddress-&gt;rxmac.ctrl.value);</div><div class='add'>+	pf_ctrl.value = readl(&amp;adapter-&gt;CSRAddress-&gt;rxmac.pf_ctrl.value);</div><div class='add'>+</div><div class='add'>+	/* Default to disabled packet filtering.  Enable it in the individual</div><div class='add'>+	 * case statements that require the device to filter something</div><div class='add'>+	 */</div><div class='add'>+	ctrl.bits.pkt_filter_disable = 1;</div><div class='add'>+</div><div class='add'>+	/* Set us to be in promiscuous mode so we receive everything, this</div><div class='add'>+	 * is also true when we get a packet filter of 0</div><div class='add'>+	 */</div><div class='add'>+	if ((filter &amp; ET131X_PACKET_TYPE_PROMISCUOUS) || filter == 0) {</div><div class='add'>+		pf_ctrl.bits.filter_broad_en = 0;</div><div class='add'>+		pf_ctrl.bits.filter_multi_en = 0;</div><div class='add'>+		pf_ctrl.bits.filter_uni_en = 0;</div><div class='add'>+	} else {</div><div class='add'>+		/*</div><div class='add'>+		 * Set us up with Multicast packet filtering.  Three cases are</div><div class='add'>+		 * possible - (1) we have a multi-cast list, (2) we receive ALL</div><div class='add'>+		 * multicast entries or (3) we receive none.</div><div class='add'>+		 */</div><div class='add'>+		if (filter &amp; ET131X_PACKET_TYPE_ALL_MULTICAST) {</div><div class='add'>+			DBG_VERBOSE(et131x_dbginfo,</div><div class='add'>+				    "Multicast filtering OFF (Rx ALL MULTICAST)\n");</div><div class='add'>+			pf_ctrl.bits.filter_multi_en = 0;</div><div class='add'>+		} else {</div><div class='add'>+			DBG_VERBOSE(et131x_dbginfo, "Multicast filtering ON\n");</div><div class='add'>+			SetupDeviceForMulticast(adapter);</div><div class='add'>+			pf_ctrl.bits.filter_multi_en = 1;</div><div class='add'>+			ctrl.bits.pkt_filter_disable = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Set us up with Unicast packet filtering */</div><div class='add'>+		if (filter &amp; ET131X_PACKET_TYPE_DIRECTED) {</div><div class='add'>+			DBG_VERBOSE(et131x_dbginfo, "Unicast Filtering ON\n");</div><div class='add'>+			SetupDeviceForUnicast(adapter);</div><div class='add'>+			pf_ctrl.bits.filter_uni_en = 1;</div><div class='add'>+			ctrl.bits.pkt_filter_disable = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Set us up with Broadcast packet filtering */</div><div class='add'>+		if (filter &amp; ET131X_PACKET_TYPE_BROADCAST) {</div><div class='add'>+			DBG_VERBOSE(et131x_dbginfo, "Broadcast Filtering ON\n");</div><div class='add'>+			pf_ctrl.bits.filter_broad_en = 1;</div><div class='add'>+			ctrl.bits.pkt_filter_disable = 0;</div><div class='add'>+		} else {</div><div class='add'>+			DBG_VERBOSE(et131x_dbginfo,</div><div class='add'>+				    "Broadcast Filtering OFF\n");</div><div class='add'>+			pf_ctrl.bits.filter_broad_en = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Setup the receive mac configuration registers - Packet</div><div class='add'>+		 * Filter control + the enable / disable for packet filter</div><div class='add'>+		 * in the control reg.</div><div class='add'>+		 */</div><div class='add'>+		writel(pf_ctrl.value,</div><div class='add'>+		       &amp;adapter-&gt;CSRAddress-&gt;rxmac.pf_ctrl.value);</div><div class='add'>+		writel(ctrl.value, &amp;adapter-&gt;CSRAddress-&gt;rxmac.ctrl.value);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * et131x_multicast - The handler to configure multicasting on the interface</div><div class='add'>+ * @netdev: a pointer to a net_device struct representing the device</div><div class='add'>+ */</div><div class='add'>+void et131x_multicast(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct et131x_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+	uint32_t PacketFilter = 0;</div><div class='add'>+	uint32_t count;</div><div class='add'>+	unsigned long lockflags;</div><div class='add'>+	struct dev_mc_list *mclist = netdev-&gt;mc_list;</div><div class='add'>+</div><div class='add'>+	DBG_ENTER(et131x_dbginfo);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;adapter-&gt;Lock, lockflags);</div><div class='add'>+</div><div class='add'>+	/* Before we modify the platform-independent filter flags, store them</div><div class='add'>+	 * locally. This allows us to determine if anything's changed and if</div><div class='add'>+	 * we even need to bother the hardware</div><div class='add'>+	 */</div><div class='add'>+	PacketFilter = adapter-&gt;PacketFilter;</div><div class='add'>+</div><div class='add'>+	/* Clear the 'multicast' flag locally; becuase we only have a single</div><div class='add'>+	 * flag to check multicast, and multiple multicast addresses can be</div><div class='add'>+	 * set, this is the easiest way to determine if more than one</div><div class='add'>+	 * multicast address is being set.</div><div class='add'>+	 */</div><div class='add'>+	PacketFilter &amp;= ~ET131X_PACKET_TYPE_MULTICAST;</div><div class='add'>+</div><div class='add'>+	/* Check the net_device flags and set the device independent flags</div><div class='add'>+	 * accordingly</div><div class='add'>+	 */</div><div class='add'>+	DBG_VERBOSE(et131x_dbginfo,</div><div class='add'>+		    "MULTICAST ADDR COUNT: %d\n", netdev-&gt;mc_count);</div><div class='add'>+</div><div class='add'>+	if (netdev-&gt;flags &amp; IFF_PROMISC) {</div><div class='add'>+		DBG_VERBOSE(et131x_dbginfo, "Request: PROMISCUOUS MODE ON\n");</div><div class='add'>+		adapter-&gt;PacketFilter |= ET131X_PACKET_TYPE_PROMISCUOUS;</div><div class='add'>+	} else {</div><div class='add'>+		DBG_VERBOSE(et131x_dbginfo, "Request: PROMISCUOUS MODE OFF\n");</div><div class='add'>+		adapter-&gt;PacketFilter &amp;= ~ET131X_PACKET_TYPE_PROMISCUOUS;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (netdev-&gt;flags &amp; IFF_ALLMULTI) {</div><div class='add'>+		DBG_VERBOSE(et131x_dbginfo, "Request: ACCEPT ALL MULTICAST\n");</div><div class='add'>+		adapter-&gt;PacketFilter |= ET131X_PACKET_TYPE_ALL_MULTICAST;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (netdev-&gt;mc_count &gt; NIC_MAX_MCAST_LIST) {</div><div class='add'>+		DBG_WARNING(et131x_dbginfo,</div><div class='add'>+			    "ACCEPT ALL MULTICAST for now, as there's more Multicast "</div><div class='add'>+			    "addresses than the HW supports\n");</div><div class='add'>+</div><div class='add'>+		adapter-&gt;PacketFilter |= ET131X_PACKET_TYPE_ALL_MULTICAST;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (netdev-&gt;mc_count &lt; 1) {</div><div class='add'>+		DBG_VERBOSE(et131x_dbginfo, "Request: REJECT ALL MULTICAST\n");</div><div class='add'>+		adapter-&gt;PacketFilter &amp;= ~ET131X_PACKET_TYPE_ALL_MULTICAST;</div><div class='add'>+		adapter-&gt;PacketFilter &amp;= ~ET131X_PACKET_TYPE_MULTICAST;</div><div class='add'>+	} else {</div><div class='add'>+		DBG_VERBOSE(et131x_dbginfo,</div><div class='add'>+			    "Request: SET MULTICAST FILTER(S)\n");</div><div class='add'>+		adapter-&gt;PacketFilter |= ET131X_PACKET_TYPE_MULTICAST;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Set values in the private adapter struct */</div><div class='add'>+	adapter-&gt;MCAddressCount = netdev-&gt;mc_count;</div><div class='add'>+</div><div class='add'>+	if (netdev-&gt;mc_count) {</div><div class='add'>+		if (mclist-&gt;dmi_addrlen != ETH_ALEN) {</div><div class='add'>+			DBG_WARNING(et131x_dbginfo,</div><div class='add'>+				    "Multicast addrs are not ETH_ALEN in size\n");</div><div class='add'>+		} else {</div><div class='add'>+			count = netdev-&gt;mc_count - 1;</div><div class='add'>+			memcpy(adapter-&gt;MCList[count], mclist-&gt;dmi_addr,</div><div class='add'>+			       ETH_ALEN);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Are the new flags different from the previous ones? If not, then no</div><div class='add'>+	 * action is required</div><div class='add'>+	 *</div><div class='add'>+	 * NOTE - This block will always update the MCList with the hardware,</div><div class='add'>+	 *        even if the addresses aren't the same.</div><div class='add'>+	 */</div><div class='add'>+	if (PacketFilter != adapter-&gt;PacketFilter) {</div><div class='add'>+		/* Call the device's filter function */</div><div class='add'>+		DBG_VERBOSE(et131x_dbginfo, "UPDATE REQUIRED, FLAGS changed\n");</div><div class='add'>+</div><div class='add'>+		et131x_set_packet_filter(adapter);</div><div class='add'>+	} else {</div><div class='add'>+		DBG_VERBOSE(et131x_dbginfo,</div><div class='add'>+			    "NO UPDATE REQUIRED, FLAGS didn't change\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;adapter-&gt;Lock, lockflags);</div><div class='add'>+</div><div class='add'>+	DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * et131x_tx - The handler to tx a packet on the device</div><div class='add'>+ * @skb: data to be Tx'd</div><div class='add'>+ * @netdev: device on which data is to be Tx'd</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 on success, errno on failure (as defined in errno.h)</div><div class='add'>+ */</div><div class='add'>+int et131x_tx(struct sk_buff *skb, struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	int status = 0;</div><div class='add'>+</div><div class='add'>+	DBG_TX_ENTER(et131x_dbginfo);</div><div class='add'>+</div><div class='add'>+	/* Save the timestamp for the TX timeout watchdog */</div><div class='add'>+	netdev-&gt;trans_start = jiffies;</div><div class='add'>+</div><div class='add'>+	/* Call the device-specific data Tx routine */</div><div class='add'>+	status = et131x_send_packets(skb, netdev);</div><div class='add'>+</div><div class='add'>+	/* Check status and manage the netif queue if necessary */</div><div class='add'>+	if (status != 0) {</div><div class='add'>+		if (status == -ENOMEM) {</div><div class='add'>+			DBG_VERBOSE(et131x_dbginfo,</div><div class='add'>+				    "OUT OF TCBs; STOP NETIF QUEUE\n");</div><div class='add'>+</div><div class='add'>+			/* Put the queue to sleep until resources are</div><div class='add'>+			 * available</div><div class='add'>+			 */</div><div class='add'>+			netif_stop_queue(netdev);</div><div class='add'>+			status = 1;</div><div class='add'>+		} else {</div><div class='add'>+			DBG_WARNING(et131x_dbginfo,</div><div class='add'>+				    "Misc error; drop packet\n");</div><div class='add'>+			status = 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBG_TX_LEAVE(et131x_dbginfo);</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * et131x_tx_timeout - Timeout handler</div><div class='add'>+ * @netdev: a pointer to a net_device struct representing the device</div><div class='add'>+ *</div><div class='add'>+ * The handler called when a Tx request times out. The timeout period is</div><div class='add'>+ * specified by the 'tx_timeo" element in the net_device structure (see</div><div class='add'>+ * et131x_alloc_device() to see how this value is set).</div><div class='add'>+ */</div><div class='add'>+void et131x_tx_timeout(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct et131x_adapter *pAdapter = netdev_priv(netdev);</div><div class='add'>+	PMP_TCB pMpTcb;</div><div class='add'>+	unsigned long lockflags;</div><div class='add'>+</div><div class='add'>+	DBG_WARNING(et131x_dbginfo, "TX TIMEOUT\n");</div><div class='add'>+</div><div class='add'>+	/* Just skip this part if the adapter is doing link detection */</div><div class='add'>+	if (MP_TEST_FLAG(pAdapter, fMP_ADAPTER_LINK_DETECTION)) {</div><div class='add'>+		DBG_ERROR(et131x_dbginfo, "Still doing link detection\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Any nonrecoverable hardware error?</div><div class='add'>+	 * Checks adapter-&gt;flags for any failure in phy reading</div><div class='add'>+	 */</div><div class='add'>+	if (MP_TEST_FLAG(pAdapter, fMP_ADAPTER_NON_RECOVER_ERROR)) {</div><div class='add'>+		DBG_WARNING(et131x_dbginfo, "Non recoverable error - remove\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Hardware failure? */</div><div class='add'>+	if (MP_TEST_FLAG(pAdapter, fMP_ADAPTER_HARDWARE_ERROR)) {</div><div class='add'>+		DBG_WARNING(et131x_dbginfo, "hardware error - reset\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Is send stuck? */</div><div class='add'>+	spin_lock_irqsave(&amp;pAdapter-&gt;TCBSendQLock, lockflags);</div><div class='add'>+</div><div class='add'>+	pMpTcb = pAdapter-&gt;TxRing.CurrSendHead;</div><div class='add'>+</div><div class='add'>+	if (pMpTcb != NULL) {</div><div class='add'>+		pMpTcb-&gt;Count++;</div><div class='add'>+</div><div class='add'>+		if (pMpTcb-&gt;Count &gt; NIC_SEND_HANG_THRESHOLD) {</div><div class='add'>+#ifdef CONFIG_ET131X_DEBUG</div><div class='add'>+			TX_STATUS_BLOCK_t txDmaComplete =</div><div class='add'>+			    *(pAdapter-&gt;TxRing.pTxStatusVa);</div><div class='add'>+			PTX_DESC_ENTRY_t pDesc =</div><div class='add'>+			    pAdapter-&gt;TxRing.pTxDescRingVa +</div><div class='add'>+			    pMpTcb-&gt;WrIndex.bits.val;</div><div class='add'>+#endif</div><div class='add'>+			TX_DESC_ENTRY_t StuckDescriptors[10];</div><div class='add'>+</div><div class='add'>+			if (pMpTcb-&gt;WrIndex.bits.val &gt; 7) {</div><div class='add'>+				memcpy(StuckDescriptors,</div><div class='add'>+				       pAdapter-&gt;TxRing.pTxDescRingVa +</div><div class='add'>+				       pMpTcb-&gt;WrIndex.bits.val - 6,</div><div class='add'>+				       sizeof(TX_DESC_ENTRY_t) * 10);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			spin_unlock_irqrestore(&amp;pAdapter-&gt;TCBSendQLock,</div><div class='add'>+					       lockflags);</div><div class='add'>+</div><div class='add'>+			DBG_WARNING(et131x_dbginfo,</div><div class='add'>+				    "Send stuck - reset.  pMpTcb-&gt;WrIndex %x, Flags 0x%08x\n",</div><div class='add'>+				    pMpTcb-&gt;WrIndex.bits.val,</div><div class='add'>+				    pMpTcb-&gt;Flags);</div><div class='add'>+</div><div class='add'>+			DBG_WARNING(et131x_dbginfo,</div><div class='add'>+				    "pDesc 0x%08x, 0x%08x, 0x%08x, 0x%08x\n",</div><div class='add'>+				    pDesc-&gt;DataBufferPtrHigh,</div><div class='add'>+				    pDesc-&gt;DataBufferPtrLow, pDesc-&gt;word2.value,</div><div class='add'>+				    pDesc-&gt;word3.value);</div><div class='add'>+</div><div class='add'>+			DBG_WARNING(et131x_dbginfo,</div><div class='add'>+				    "WbStatus 0x%08x\n", txDmaComplete.value);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ET131X_DEBUG</div><div class='add'>+			DumpDeviceBlock(DBG_WARNING_ON, pAdapter, 0);</div><div class='add'>+			DumpDeviceBlock(DBG_WARNING_ON, pAdapter, 1);</div><div class='add'>+			DumpDeviceBlock(DBG_WARNING_ON, pAdapter, 3);</div><div class='add'>+			DumpDeviceBlock(DBG_WARNING_ON, pAdapter, 5);</div><div class='add'>+#endif</div><div class='add'>+			et131x_close(netdev);</div><div class='add'>+			et131x_open(netdev);</div><div class='add'>+</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;pAdapter-&gt;TCBSendQLock, lockflags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * et131x_change_mtu - The handler called to change the MTU for the device</div><div class='add'>+ * @netdev: device whose MTU is to be changed</div><div class='add'>+ * @new_mtu: the desired MTU</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 on success, errno on failure (as defined in errno.h)</div><div class='add'>+ */</div><div class='add'>+int et131x_change_mtu(struct net_device *netdev, int new_mtu)</div><div class='add'>+{</div><div class='add'>+	int result = 0;</div><div class='add'>+	struct et131x_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	DBG_ENTER(et131x_dbginfo);</div><div class='add'>+</div><div class='add'>+	/* Make sure the requested MTU is valid */</div><div class='add'>+	if (new_mtu == 0 || new_mtu &gt; 9216) {</div><div class='add'>+		DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Stop the netif queue */</div><div class='add'>+	netif_stop_queue(netdev);</div><div class='add'>+</div><div class='add'>+	/* Stop the Tx and Rx DMA engines */</div><div class='add'>+	et131x_rx_dma_disable(adapter);</div><div class='add'>+	et131x_tx_dma_disable(adapter);</div><div class='add'>+</div><div class='add'>+	/* Disable device interrupts */</div><div class='add'>+	et131x_disable_interrupts(adapter);</div><div class='add'>+	et131x_handle_send_interrupt(adapter);</div><div class='add'>+	et131x_handle_recv_interrupt(adapter);</div><div class='add'>+</div><div class='add'>+	/* Set the new MTU */</div><div class='add'>+	netdev-&gt;mtu = new_mtu;</div><div class='add'>+</div><div class='add'>+	/* Free Rx DMA memory */</div><div class='add'>+	et131x_adapter_memory_free(adapter);</div><div class='add'>+</div><div class='add'>+	/* Set the config parameter for Jumbo Packet support */</div><div class='add'>+	adapter-&gt;RegistryJumboPacket = new_mtu + 14;</div><div class='add'>+	et131x_soft_reset(adapter);</div><div class='add'>+</div><div class='add'>+	/* Alloc and init Rx DMA memory */</div><div class='add'>+	result = et131x_adapter_memory_alloc(adapter);</div><div class='add'>+	if (result != 0) {</div><div class='add'>+		DBG_WARNING(et131x_dbginfo,</div><div class='add'>+			    "Change MTU failed; couldn't re-alloc DMA memory\n");</div><div class='add'>+		return result;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	et131x_init_send(adapter);</div><div class='add'>+</div><div class='add'>+	et131x_setup_hardware_properties(adapter);</div><div class='add'>+	memcpy(netdev-&gt;dev_addr, adapter-&gt;CurrentAddress, ETH_ALEN);</div><div class='add'>+</div><div class='add'>+	/* Init the device with the new settings */</div><div class='add'>+	et131x_adapter_setup(adapter);</div><div class='add'>+</div><div class='add'>+	/* Enable interrupts */</div><div class='add'>+	if (MP_TEST_FLAG(adapter, fMP_ADAPTER_INTERRUPT_IN_USE)) {</div><div class='add'>+		et131x_enable_interrupts(adapter);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Restart the Tx and Rx DMA engines */</div><div class='add'>+	et131x_rx_dma_enable(adapter);</div><div class='add'>+	et131x_tx_dma_enable(adapter);</div><div class='add'>+</div><div class='add'>+	/* Restart the netif queue */</div><div class='add'>+	netif_wake_queue(netdev);</div><div class='add'>+</div><div class='add'>+	DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * et131x_set_mac_addr - handler to change the MAC address for the device</div><div class='add'>+ * @netdev: device whose MAC is to be changed</div><div class='add'>+ * @new_mac: the desired MAC address</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 on success, errno on failure (as defined in errno.h)</div><div class='add'>+ *</div><div class='add'>+ * IMPLEMENTED BY : blux http://berndlux.de 22.01.2007 21:14</div><div class='add'>+ */</div><div class='add'>+int et131x_set_mac_addr(struct net_device *netdev, void *new_mac)</div><div class='add'>+{</div><div class='add'>+	int result = 0;</div><div class='add'>+	struct et131x_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+	struct sockaddr *address = new_mac;</div><div class='add'>+</div><div class='add'>+	DBG_ENTER(et131x_dbginfo);</div><div class='add'>+	// begin blux</div><div class='add'>+	// DBG_VERBOSE( et131x_dbginfo, "Function not implemented!!\n" );</div><div class='add'>+</div><div class='add'>+	if (adapter == NULL) {</div><div class='add'>+		DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Make sure the requested MAC is valid */</div><div class='add'>+	if (!is_valid_ether_addr(address-&gt;sa_data)) {</div><div class='add'>+		DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Stop the netif queue */</div><div class='add'>+	netif_stop_queue(netdev);</div><div class='add'>+</div><div class='add'>+	/* Stop the Tx and Rx DMA engines */</div><div class='add'>+	et131x_rx_dma_disable(adapter);</div><div class='add'>+	et131x_tx_dma_disable(adapter);</div><div class='add'>+</div><div class='add'>+	/* Disable device interrupts */</div><div class='add'>+	et131x_disable_interrupts(adapter);</div><div class='add'>+	et131x_handle_send_interrupt(adapter);</div><div class='add'>+	et131x_handle_recv_interrupt(adapter);</div><div class='add'>+</div><div class='add'>+	/* Set the new MAC */</div><div class='add'>+	// netdev-&gt;set_mac_address  = &amp;new_mac;</div><div class='add'>+	// netdev-&gt;mtu = new_mtu;</div><div class='add'>+</div><div class='add'>+	memcpy(netdev-&gt;dev_addr, address-&gt;sa_data, netdev-&gt;addr_len);</div><div class='add'>+</div><div class='add'>+	printk("%s: Setting MAC address to %02x:%02x:%02x:%02x:%02x:%02x\n",</div><div class='add'>+	       netdev-&gt;name, netdev-&gt;dev_addr[0], netdev-&gt;dev_addr[1],</div><div class='add'>+	       netdev-&gt;dev_addr[2], netdev-&gt;dev_addr[3], netdev-&gt;dev_addr[4],</div><div class='add'>+	       netdev-&gt;dev_addr[5]);</div><div class='add'>+</div><div class='add'>+	/* Free Rx DMA memory */</div><div class='add'>+	et131x_adapter_memory_free(adapter);</div><div class='add'>+</div><div class='add'>+	/* Set the config parameter for Jumbo Packet support */</div><div class='add'>+	// adapter-&gt;RegistryJumboPacket = new_mtu + 14;</div><div class='add'>+	// blux: not needet here, w'll change the MAC</div><div class='add'>+</div><div class='add'>+	et131x_soft_reset(adapter);</div><div class='add'>+</div><div class='add'>+	/* Alloc and init Rx DMA memory */</div><div class='add'>+	result = et131x_adapter_memory_alloc(adapter);</div><div class='add'>+	if (result != 0) {</div><div class='add'>+		DBG_WARNING(et131x_dbginfo,</div><div class='add'>+			    "Change MAC failed; couldn't re-alloc DMA memory\n");</div><div class='add'>+		return result;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	et131x_init_send(adapter);</div><div class='add'>+</div><div class='add'>+	et131x_setup_hardware_properties(adapter);</div><div class='add'>+	// memcpy( netdev-&gt;dev_addr, adapter-&gt;CurrentAddress, ETH_ALEN );</div><div class='add'>+	// blux: no, do not override our nice address</div><div class='add'>+</div><div class='add'>+	/* Init the device with the new settings */</div><div class='add'>+	et131x_adapter_setup(adapter);</div><div class='add'>+</div><div class='add'>+	/* Enable interrupts */</div><div class='add'>+	if (MP_TEST_FLAG(adapter, fMP_ADAPTER_INTERRUPT_IN_USE)) {</div><div class='add'>+		et131x_enable_interrupts(adapter);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Restart the Tx and Rx DMA engines */</div><div class='add'>+	et131x_rx_dma_enable(adapter);</div><div class='add'>+	et131x_tx_dma_enable(adapter);</div><div class='add'>+</div><div class='add'>+	/* Restart the netif queue */</div><div class='add'>+	netif_wake_queue(netdev);</div><div class='add'>+</div><div class='add'>+	DBG_LEAVE(et131x_dbginfo);</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/staging/et131x/et131x_netdev.h b/drivers/staging/et131x/et131x_netdev.h<br/>new file mode 100644<br/>index 000000000000..b8acd14ff830<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/et131x/et131x_netdev.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/et131x/et131x_netdev.h</a></div><div class='hunk'>@@ -0,0 +1,64 @@</div><div class='add'>+/*</div><div class='add'>+ * Agere Systems Inc.</div><div class='add'>+ * 10/100/1000 Base-T Ethernet Driver for the ET1301 and ET131x series MACs</div><div class='add'>+ *</div><div class='add'>+ * Copyright © 2005 Agere Systems Inc.</div><div class='add'>+ * All rights reserved.</div><div class='add'>+ *   http://www.agere.com</div><div class='add'>+ *</div><div class='add'>+ *------------------------------------------------------------------------------</div><div class='add'>+ *</div><div class='add'>+ * et131x_netdev.h - Defines, structs, enums, prototypes, etc. related to the</div><div class='add'>+ *                   driver's net_device support.</div><div class='add'>+ *</div><div class='add'>+ *------------------------------------------------------------------------------</div><div class='add'>+ *</div><div class='add'>+ * SOFTWARE LICENSE</div><div class='add'>+ *</div><div class='add'>+ * This software is provided subject to the following terms and conditions,</div><div class='add'>+ * which you should read carefully before using the software.  Using this</div><div class='add'>+ * software indicates your acceptance of these terms and conditions.  If you do</div><div class='add'>+ * not agree with these terms and conditions, do not use the software.</div><div class='add'>+ *</div><div class='add'>+ * Copyright © 2005 Agere Systems Inc.</div><div class='add'>+ * All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source or binary forms, with or without</div><div class='add'>+ * modifications, are permitted provided that the following conditions are met:</div><div class='add'>+ *</div><div class='add'>+ * . Redistributions of source code must retain the above copyright notice, this</div><div class='add'>+ *    list of conditions and the following Disclaimer as comments in the code as</div><div class='add'>+ *    well as in the documentation and/or other materials provided with the</div><div class='add'>+ *    distribution.</div><div class='add'>+ *</div><div class='add'>+ * . Redistributions in binary form must reproduce the above copyright notice,</div><div class='add'>+ *    this list of conditions and the following Disclaimer in the documentation</div><div class='add'>+ *    and/or other materials provided with the distribution.</div><div class='add'>+ *</div><div class='add'>+ * . Neither the name of Agere Systems Inc. nor the names of the contributors</div><div class='add'>+ *    may be used to endorse or promote products derived from this software</div><div class='add'>+ *    without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ * Disclaimer</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES,</div><div class='add'>+ * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  ANY</div><div class='add'>+ * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN</div><div class='add'>+ * RISK. IN NO EVENT SHALL AGERE SYSTEMS INC. OR CONTRIBUTORS BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, INCLUDING, BUT NOT LIMITED TO, CONTRACT, STRICT</div><div class='add'>+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT</div><div class='add'>+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH</div><div class='add'>+ * DAMAGE.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __ET131X_NETDEV_H__</div><div class='add'>+#define __ET131X_NETDEV_H__</div><div class='add'>+</div><div class='add'>+struct net_device *et131x_device_alloc(void);</div><div class='add'>+</div><div class='add'>+#endif /* __ET131X_NETDEV_H__ */</div><div class='head'>diff --git a/drivers/staging/et131x/et131x_version.h b/drivers/staging/et131x/et131x_version.h<br/>new file mode 100644<br/>index 000000000000..2ea645e1066e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/et131x/et131x_version.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/et131x/et131x_version.h</a></div><div class='hunk'>@@ -0,0 +1,81 @@</div><div class='add'>+/*</div><div class='add'>+ * Agere Systems Inc.</div><div class='add'>+ * 10/100/1000 Base-T Ethernet Driver for the ET1301 and ET131x series MACs</div><div class='add'>+ *</div><div class='add'>+ * Copyright © 2005 Agere Systems Inc.</div><div class='add'>+ * All rights reserved.</div><div class='add'>+ *   http://www.agere.com</div><div class='add'>+ *</div><div class='add'>+ *------------------------------------------------------------------------------</div><div class='add'>+ *</div><div class='add'>+ * et131x_version.h - This file provides system and device version information.</div><div class='add'>+ *</div><div class='add'>+ *------------------------------------------------------------------------------</div><div class='add'>+ *</div><div class='add'>+ * SOFTWARE LICENSE</div><div class='add'>+ *</div><div class='add'>+ * This software is provided subject to the following terms and conditions,</div><div class='add'>+ * which you should read carefully before using the software.  Using this</div><div class='add'>+ * software indicates your acceptance of these terms and conditions.  If you do</div><div class='add'>+ * not agree with these terms and conditions, do not use the software.</div><div class='add'>+ *</div><div class='add'>+ * Copyright © 2005 Agere Systems Inc.</div><div class='add'>+ * All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source or binary forms, with or without</div><div class='add'>+ * modifications, are permitted provided that the following conditions are met:</div><div class='add'>+ *</div><div class='add'>+ * . Redistributions of source code must retain the above copyright notice, this</div><div class='add'>+ *    list of conditions and the following Disclaimer as comments in the code as</div><div class='add'>+ *    well as in the documentation and/or other materials provided with the</div><div class='add'>+ *    distribution.</div><div class='add'>+ *</div><div class='add'>+ * . Redistributions in binary form must reproduce the above copyright notice,</div><div class='add'>+ *    this list of conditions and the following Disclaimer in the documentation</div><div class='add'>+ *    and/or other materials provided with the distribution.</div><div class='add'>+ *</div><div class='add'>+ * . Neither the name of Agere Systems Inc. nor the names of the contributors</div><div class='add'>+ *    may be used to endorse or promote products derived from this software</div><div class='add'>+ *    without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ * Disclaimer</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES,</div><div class='add'>+ * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  ANY</div><div class='add'>+ * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN</div><div class='add'>+ * RISK. IN NO EVENT SHALL AGERE SYSTEMS INC. OR CONTRIBUTORS BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, INCLUDING, BUT NOT LIMITED TO, CONTRACT, STRICT</div><div class='add'>+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT</div><div class='add'>+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH</div><div class='add'>+ * DAMAGE.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __ET131X_VERSION_H__</div><div class='add'>+#define __ET131X_VERSION_H__</div><div class='add'>+</div><div class='add'>+#define DRIVER_AUTHOR		"Victor Soriano (vjsoriano@agere.com)"</div><div class='add'>+#define DRIVER_LICENSE		"Dual BSD/GPL"</div><div class='add'>+#define DRIVER_DEVICE_STRING	"ET1310"</div><div class='add'>+#define DRIVER_NAME		"et131x"</div><div class='add'>+#define DRIVER_MAJOR_VERSION	1</div><div class='add'>+#define DRIVER_MINOR_VERSION	2</div><div class='add'>+#define DRIVER_PATCH_VERSION	3</div><div class='add'>+#define DRIVER_VERSION_STRING	"1.2.3"</div><div class='add'>+#define DRIVER_VENDOR		"Agere Systems, http://www.agere.com"</div><div class='add'>+#define DRIVER_DESC		"10/100/1000 Base-T Ethernet Driver"</div><div class='add'>+</div><div class='add'>+#define STRUCT_MODULE		"net"	/* blux: missed by the kernel */</div><div class='add'>+</div><div class='add'>+#define DRIVER_INFO		DRIVER_DESC " for the "\</div><div class='add'>+				DRIVER_DEVICE_STRING ", v" \</div><div class='add'>+				DRIVER_VERSION_STRING " by " \</div><div class='add'>+				DRIVER_VENDOR</div><div class='add'>+</div><div class='add'>+#define DRIVER_NAME_EXT		"et131x.ko"</div><div class='add'>+</div><div class='add'>+#endif /* __ET131X_VERSION_H__ */</div><div class='head'>diff --git a/drivers/staging/go7007/Kconfig b/drivers/staging/go7007/Kconfig<br/>new file mode 100644<br/>index 000000000000..57a121c338c4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/go7007/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/go7007/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,25 @@</div><div class='add'>+config VIDEO_GO7007</div><div class='add'>+	tristate "Go 7007 support"</div><div class='add'>+	depends on VIDEO_DEV &amp;&amp; PCI &amp;&amp; I2C &amp;&amp; INPUT</div><div class='add'>+	select VIDEOBUF_DMA_SG</div><div class='add'>+	select VIDEO_IR</div><div class='add'>+	select VIDEO_TUNER</div><div class='add'>+	select VIDEO_TVEEPROM</div><div class='add'>+	select CRC32</div><div class='add'>+	default N</div><div class='add'>+	---help---</div><div class='add'>+	  This is a video4linux driver for some wierd device...</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here: the</div><div class='add'>+	  module will be called go7007</div><div class='add'>+</div><div class='add'>+config VIDEO_GO7007_USB</div><div class='add'>+	tristate "Go 7007 USB support"</div><div class='add'>+	depends on VIDEO_GO7007 &amp;&amp; USB</div><div class='add'>+	default N</div><div class='add'>+	---help---</div><div class='add'>+	  This is a video4linux driver for some wierd device...</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here: the</div><div class='add'>+	  module will be called go7007-usb</div><div class='add'>+</div><div class='head'>diff --git a/drivers/staging/go7007/Makefile b/drivers/staging/go7007/Makefile<br/>new file mode 100644<br/>index 000000000000..9b9310cae1ce<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/go7007/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/go7007/Makefile</a></div><div class='hunk'>@@ -0,0 +1,18 @@</div><div class='add'>+#obj-m += go7007.o go7007-usb.o snd-go7007.o wis-saa7115.o wis-tw9903.o \</div><div class='add'>+		wis-uda1342.o wis-sony-tuner.o wis-saa7113.o wis-ov7640.o \</div><div class='add'>+		wis-tw2804.o</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_VIDEO_GO7007) += go7007.o</div><div class='add'>+obj-$(CONFIG_VIDEO_GO7007_USB) += go7007-usb.o</div><div class='add'>+</div><div class='add'>+go7007-objs += go7007-v4l2.o go7007-driver.o go7007-i2c.o go7007-fw.o snd-go7007.o</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#ifneq ($(SAA7134_BUILD),)</div><div class='add'>+#obj-m += saa7134-go7007.o</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+EXTRA_CFLAGS += -Idrivers/staging/saa7134</div><div class='add'>+EXTRA_CFLAGS += -Idrivers/media/dvb/frontends</div><div class='add'>+EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core</div><div class='head'>diff --git a/drivers/staging/go7007/README b/drivers/staging/go7007/README<br/>new file mode 100644<br/>index 000000000000..48f447637817<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/go7007/README?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/go7007/README</a></div><div class='hunk'>@@ -0,0 +1,11 @@</div><div class='add'>+Todo:</div><div class='add'>+	- checkpatch.pl cleanups</div><div class='add'>+	- sparse cleanups</div><div class='add'>+	- lots of little modules, should be merged together</div><div class='add'>+	  and added to the build.</div><div class='add'>+	- testing?</div><div class='add'>+	- handle churn in v4l layer.</div><div class='add'>+</div><div class='add'>+Please send patchs to Greg Kroah-Hartman &lt;greg@kroah.com&gt; and Cc: Ross</div><div class='add'>+Cohen &lt;rcohen@snurgle.org&gt; as well.</div><div class='add'>+</div><div class='head'>diff --git a/drivers/staging/go7007/go7007-driver.c b/drivers/staging/go7007/go7007-driver.c<br/>new file mode 100644<br/>index 000000000000..81ae4b0fa890<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/go7007/go7007-driver.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/go7007/go7007-driver.c</a></div><div class='hunk'>@@ -0,0 +1,688 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2005-2006 Micronas USA Inc.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License (Version 2) as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software Foundation,</div><div class='add'>+ * Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/version.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/unistd.h&gt;</div><div class='add'>+#include &lt;linux/time.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/vmalloc.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/firmware.h&gt;</div><div class='add'>+#include &lt;linux/semaphore.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='add'>+#include &lt;asm/system.h&gt;</div><div class='add'>+#include &lt;linux/videodev2.h&gt;</div><div class='add'>+#include &lt;media/tuner.h&gt;</div><div class='add'>+#include &lt;media/v4l2-common.h&gt;</div><div class='add'>+</div><div class='add'>+#include "go7007-priv.h"</div><div class='add'>+#include "wis-i2c.h"</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Wait for an interrupt to be delivered from the GO7007SB and return</div><div class='add'>+ * the associated value and data.</div><div class='add'>+ *</div><div class='add'>+ * Must be called with the hw_lock held.</div><div class='add'>+ */</div><div class='add'>+int go7007_read_interrupt(struct go7007 *go, u16 *value, u16 *data)</div><div class='add'>+{</div><div class='add'>+	go-&gt;interrupt_available = 0;</div><div class='add'>+	go-&gt;hpi_ops-&gt;read_interrupt(go);</div><div class='add'>+	if (wait_event_timeout(go-&gt;interrupt_waitq,</div><div class='add'>+				go-&gt;interrupt_available, 5*HZ) &lt; 0) {</div><div class='add'>+		printk(KERN_ERR "go7007: timeout waiting for read interrupt\n");</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+	if (!go-&gt;interrupt_available)</div><div class='add'>+		return -1;</div><div class='add'>+	go-&gt;interrupt_available = 0;</div><div class='add'>+	*value = go-&gt;interrupt_value &amp; 0xfffe;</div><div class='add'>+	*data = go-&gt;interrupt_data;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(go7007_read_interrupt);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Read a register/address on the GO7007SB.</div><div class='add'>+ *</div><div class='add'>+ * Must be called with the hw_lock held.</div><div class='add'>+ */</div><div class='add'>+int go7007_read_addr(struct go7007 *go, u16 addr, u16 *data)</div><div class='add'>+{</div><div class='add'>+	int count = 100;</div><div class='add'>+	u16 value;</div><div class='add'>+</div><div class='add'>+	if (go7007_write_interrupt(go, 0x0010, addr) &lt; 0)</div><div class='add'>+		return -EIO;</div><div class='add'>+	while (count-- &gt; 0) {</div><div class='add'>+		if (go7007_read_interrupt(go, &amp;value, data) == 0 &amp;&amp;</div><div class='add'>+				value == 0xa000)</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='add'>+	return -EIO;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(go7007_read_addr);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Send the boot firmware to the encoder, which just wakes it up and lets</div><div class='add'>+ * us talk to the GPIO pins and on-board I2C adapter.</div><div class='add'>+ *</div><div class='add'>+ * Must be called with the hw_lock held.</div><div class='add'>+ */</div><div class='add'>+static int go7007_load_encoder(struct go7007 *go)</div><div class='add'>+{</div><div class='add'>+	const struct firmware *fw_entry;</div><div class='add'>+	char fw_name[] = "go7007fw.bin";</div><div class='add'>+	void *bounce;</div><div class='add'>+	int fw_len, rv = 0;</div><div class='add'>+	u16 intr_val, intr_data;</div><div class='add'>+</div><div class='add'>+	if (request_firmware(&amp;fw_entry, fw_name, go-&gt;dev)) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+			"go7007: unable to load firmware from file \"%s\"\n",</div><div class='add'>+			fw_name);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+	if (fw_entry-&gt;size &lt; 16 || memcmp(fw_entry-&gt;data, "WISGO7007FW", 11)) {</div><div class='add'>+		printk(KERN_ERR "go7007: file \"%s\" does not appear to be "</div><div class='add'>+				"go7007 firmware\n", fw_name);</div><div class='add'>+		release_firmware(fw_entry);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+	fw_len = fw_entry-&gt;size - 16;</div><div class='add'>+	bounce = kmalloc(fw_len, GFP_KERNEL);</div><div class='add'>+	if (bounce == NULL) {</div><div class='add'>+		printk(KERN_ERR "go7007: unable to allocate %d bytes for "</div><div class='add'>+				"firmware transfer\n", fw_len);</div><div class='add'>+		release_firmware(fw_entry);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+	memcpy(bounce, fw_entry-&gt;data + 16, fw_len);</div><div class='add'>+	release_firmware(fw_entry);</div><div class='add'>+	if (go7007_interface_reset(go) &lt; 0 ||</div><div class='add'>+			go7007_send_firmware(go, bounce, fw_len) &lt; 0 ||</div><div class='add'>+			go7007_read_interrupt(go, &amp;intr_val, &amp;intr_data) &lt; 0 ||</div><div class='add'>+			(intr_val &amp; ~0x1) != 0x5a5a) {</div><div class='add'>+		printk(KERN_ERR "go7007: error transferring firmware\n");</div><div class='add'>+		rv = -1;</div><div class='add'>+	}</div><div class='add'>+	kfree(bounce);</div><div class='add'>+	return rv;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Boot the encoder and register the I2C adapter if requested.  Do the</div><div class='add'>+ * minimum initialization necessary, since the board-specific code may</div><div class='add'>+ * still need to probe the board ID.</div><div class='add'>+ *</div><div class='add'>+ * Must NOT be called with the hw_lock held.</div><div class='add'>+ */</div><div class='add'>+int go7007_boot_encoder(struct go7007 *go, int init_i2c)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	down(&amp;go-&gt;hw_lock);</div><div class='add'>+	ret = go7007_load_encoder(go);</div><div class='add'>+	up(&amp;go-&gt;hw_lock);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return -1;</div><div class='add'>+	if (!init_i2c)</div><div class='add'>+		return 0;</div><div class='add'>+	if (go7007_i2c_init(go) &lt; 0)</div><div class='add'>+		return -1;</div><div class='add'>+	go-&gt;i2c_adapter_online = 1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(go7007_boot_encoder);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Configure any hardware-related registers in the GO7007, such as GPIO</div><div class='add'>+ * pins and bus parameters, which are board-specific.  This assumes</div><div class='add'>+ * the boot firmware has already been downloaded.</div><div class='add'>+ *</div><div class='add'>+ * Must be called with the hw_lock held.</div><div class='add'>+ */</div><div class='add'>+static int go7007_init_encoder(struct go7007 *go)</div><div class='add'>+{</div><div class='add'>+	if (go-&gt;board_info-&gt;audio_flags &amp; GO7007_AUDIO_I2S_MASTER) {</div><div class='add'>+		go7007_write_addr(go, 0x1000, 0x0811);</div><div class='add'>+		go7007_write_addr(go, 0x1000, 0x0c11);</div><div class='add'>+	}</div><div class='add'>+	if (go-&gt;board_id == GO7007_BOARDID_MATRIX_REV) {</div><div class='add'>+		/* Set GPIO pin 0 to be an output (audio clock control) */</div><div class='add'>+		go7007_write_addr(go, 0x3c82, 0x0001);</div><div class='add'>+		go7007_write_addr(go, 0x3c80, 0x00fe);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Send the boot firmware to the GO7007 and configure the registers.  This</div><div class='add'>+ * is the only way to stop the encoder once it has started streaming video.</div><div class='add'>+ *</div><div class='add'>+ * Must be called with the hw_lock held.</div><div class='add'>+ */</div><div class='add'>+int go7007_reset_encoder(struct go7007 *go)</div><div class='add'>+{</div><div class='add'>+	if (go7007_load_encoder(go) &lt; 0)</div><div class='add'>+		return -1;</div><div class='add'>+	return go7007_init_encoder(go);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Attempt to instantiate an I2C client by ID, probably loading a module.</div><div class='add'>+ */</div><div class='add'>+static int init_i2c_module(struct i2c_adapter *adapter, int id, int addr)</div><div class='add'>+{</div><div class='add'>+	char *modname;</div><div class='add'>+</div><div class='add'>+	switch (id) {</div><div class='add'>+	case I2C_DRIVERID_WIS_SAA7115:</div><div class='add'>+		modname = "wis-saa7115";</div><div class='add'>+		break;</div><div class='add'>+	case I2C_DRIVERID_WIS_SAA7113:</div><div class='add'>+		modname = "wis-saa7113";</div><div class='add'>+		break;</div><div class='add'>+	case I2C_DRIVERID_WIS_UDA1342:</div><div class='add'>+		modname = "wis-uda1342";</div><div class='add'>+		break;</div><div class='add'>+	case I2C_DRIVERID_WIS_SONY_TUNER:</div><div class='add'>+		modname = "wis-sony-tuner";</div><div class='add'>+		break;</div><div class='add'>+	case I2C_DRIVERID_WIS_TW9903:</div><div class='add'>+		modname = "wis-tw9903";</div><div class='add'>+		break;</div><div class='add'>+	case I2C_DRIVERID_WIS_TW2804:</div><div class='add'>+		modname = "wis-tw2804";</div><div class='add'>+		break;</div><div class='add'>+	case I2C_DRIVERID_WIS_OV7640:</div><div class='add'>+		modname = "wis-ov7640";</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		modname = NULL;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	if (modname != NULL)</div><div class='add'>+		request_module(modname);</div><div class='add'>+	if (wis_i2c_probe_device(adapter, id, addr) == 1)</div><div class='add'>+		return 0;</div><div class='add'>+	if (modname != NULL)</div><div class='add'>+		printk(KERN_INFO</div><div class='add'>+			"go7007: probing for module %s failed", modname);</div><div class='add'>+	else</div><div class='add'>+		printk(KERN_INFO</div><div class='add'>+			"go7007: sensor %u seems to be unsupported!\n", id);</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Finalize the GO7007 hardware setup, register the on-board I2C adapter</div><div class='add'>+ * (if used on this board), load the I2C client driver for the sensor</div><div class='add'>+ * (SAA7115 or whatever) and other devices, and register the ALSA and V4L2</div><div class='add'>+ * interfaces.</div><div class='add'>+ *</div><div class='add'>+ * Must NOT be called with the hw_lock held.</div><div class='add'>+ */</div><div class='add'>+int go7007_register_encoder(struct go7007 *go)</div><div class='add'>+{</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "go7007: registering new %s\n", go-&gt;name);</div><div class='add'>+</div><div class='add'>+	down(&amp;go-&gt;hw_lock);</div><div class='add'>+	ret = go7007_init_encoder(go);</div><div class='add'>+	up(&amp;go-&gt;hw_lock);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	if (!go-&gt;i2c_adapter_online &amp;&amp;</div><div class='add'>+			go-&gt;board_info-&gt;flags &amp; GO7007_BOARD_USE_ONBOARD_I2C) {</div><div class='add'>+		if (go7007_i2c_init(go) &lt; 0)</div><div class='add'>+			return -1;</div><div class='add'>+		go-&gt;i2c_adapter_online = 1;</div><div class='add'>+	}</div><div class='add'>+	if (go-&gt;i2c_adapter_online) {</div><div class='add'>+		for (i = 0; i &lt; go-&gt;board_info-&gt;num_i2c_devs; ++i)</div><div class='add'>+			init_i2c_module(&amp;go-&gt;i2c_adapter,</div><div class='add'>+					go-&gt;board_info-&gt;i2c_devs[i].id,</div><div class='add'>+					go-&gt;board_info-&gt;i2c_devs[i].addr);</div><div class='add'>+#ifdef TUNER_SET_TYPE_ADDR</div><div class='add'>+		if (go-&gt;tuner_type &gt;= 0) {</div><div class='add'>+			struct tuner_setup tun_setup = {</div><div class='add'>+				.mode_mask	= T_ANALOG_TV,</div><div class='add'>+				.addr		= ADDR_UNSET,</div><div class='add'>+				.type		= go-&gt;tuner_type</div><div class='add'>+			};</div><div class='add'>+			i2c_clients_command(&amp;go-&gt;i2c_adapter,</div><div class='add'>+				TUNER_SET_TYPE_ADDR, &amp;tun_setup);</div><div class='add'>+		}</div><div class='add'>+#else</div><div class='add'>+		if (go-&gt;tuner_type &gt;= 0)</div><div class='add'>+			i2c_clients_command(&amp;go-&gt;i2c_adapter,</div><div class='add'>+				TUNER_SET_TYPE, &amp;go-&gt;tuner_type);</div><div class='add'>+#endif</div><div class='add'>+		if (go-&gt;board_id == GO7007_BOARDID_ADLINK_MPG24)</div><div class='add'>+			i2c_clients_command(&amp;go-&gt;i2c_adapter,</div><div class='add'>+				DECODER_SET_CHANNEL, &amp;go-&gt;channel_number);</div><div class='add'>+	}</div><div class='add'>+	if (go-&gt;board_info-&gt;flags &amp; GO7007_BOARD_HAS_AUDIO) {</div><div class='add'>+		go-&gt;audio_enabled = 1;</div><div class='add'>+		go7007_snd_init(go);</div><div class='add'>+	}</div><div class='add'>+	return go7007_v4l2_init(go);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(go7007_register_encoder);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Send the encode firmware to the encoder, which will cause it</div><div class='add'>+ * to immediately start delivering the video and audio streams.</div><div class='add'>+ *</div><div class='add'>+ * Must be called with the hw_lock held.</div><div class='add'>+ */</div><div class='add'>+int go7007_start_encoder(struct go7007 *go)</div><div class='add'>+{</div><div class='add'>+	u8 *fw;</div><div class='add'>+	int fw_len, rv = 0, i;</div><div class='add'>+	u16 intr_val, intr_data;</div><div class='add'>+</div><div class='add'>+	go-&gt;modet_enable = 0;</div><div class='add'>+	if (!go-&gt;dvd_mode)</div><div class='add'>+		for (i = 0; i &lt; 4; ++i) {</div><div class='add'>+			if (go-&gt;modet[i].enable) {</div><div class='add'>+				go-&gt;modet_enable = 1;</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+			go-&gt;modet[i].pixel_threshold = 32767;</div><div class='add'>+			go-&gt;modet[i].motion_threshold = 32767;</div><div class='add'>+			go-&gt;modet[i].mb_threshold = 32767;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	if (go7007_construct_fw_image(go, &amp;fw, &amp;fw_len) &lt; 0)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	if (go7007_send_firmware(go, fw, fw_len) &lt; 0 ||</div><div class='add'>+			go7007_read_interrupt(go, &amp;intr_val, &amp;intr_data) &lt; 0) {</div><div class='add'>+		printk(KERN_ERR "go7007: error transferring firmware\n");</div><div class='add'>+		rv = -1;</div><div class='add'>+		goto start_error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	go-&gt;state = STATE_DATA;</div><div class='add'>+	go-&gt;parse_length = 0;</div><div class='add'>+	go-&gt;seen_frame = 0;</div><div class='add'>+	if (go7007_stream_start(go) &lt; 0) {</div><div class='add'>+		printk(KERN_ERR "go7007: error starting stream transfer\n");</div><div class='add'>+		rv = -1;</div><div class='add'>+		goto start_error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+start_error:</div><div class='add'>+	kfree(fw);</div><div class='add'>+	return rv;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Store a byte in the current video buffer, if there is one.</div><div class='add'>+ */</div><div class='add'>+static inline void store_byte(struct go7007_buffer *gobuf, u8 byte)</div><div class='add'>+{</div><div class='add'>+	if (gobuf != NULL &amp;&amp; gobuf-&gt;bytesused &lt; GO7007_BUF_SIZE) {</div><div class='add'>+		unsigned int pgidx = gobuf-&gt;offset &gt;&gt; PAGE_SHIFT;</div><div class='add'>+		unsigned int pgoff = gobuf-&gt;offset &amp; ~PAGE_MASK;</div><div class='add'>+</div><div class='add'>+		*((u8 *)page_address(gobuf-&gt;pages[pgidx]) + pgoff) = byte;</div><div class='add'>+		++gobuf-&gt;offset;</div><div class='add'>+		++gobuf-&gt;bytesused;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Deliver the last video buffer and get a new one to start writing to.</div><div class='add'>+ */</div><div class='add'>+static void frame_boundary(struct go7007 *go)</div><div class='add'>+{</div><div class='add'>+	struct go7007_buffer *gobuf;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (go-&gt;active_buf) {</div><div class='add'>+		if (go-&gt;active_buf-&gt;modet_active) {</div><div class='add'>+			if (go-&gt;active_buf-&gt;bytesused + 216 &lt; GO7007_BUF_SIZE) {</div><div class='add'>+				for (i = 0; i &lt; 216; ++i)</div><div class='add'>+					store_byte(go-&gt;active_buf,</div><div class='add'>+							go-&gt;active_map[i]);</div><div class='add'>+				go-&gt;active_buf-&gt;bytesused -= 216;</div><div class='add'>+			} else</div><div class='add'>+				go-&gt;active_buf-&gt;modet_active = 0;</div><div class='add'>+		}</div><div class='add'>+		go-&gt;active_buf-&gt;state = BUF_STATE_DONE;</div><div class='add'>+		wake_up_interruptible(&amp;go-&gt;frame_waitq);</div><div class='add'>+		go-&gt;active_buf = NULL;</div><div class='add'>+	}</div><div class='add'>+	list_for_each_entry(gobuf, &amp;go-&gt;stream, stream)</div><div class='add'>+		if (gobuf-&gt;state == BUF_STATE_QUEUED) {</div><div class='add'>+			gobuf-&gt;seq = go-&gt;next_seq;</div><div class='add'>+			do_gettimeofday(&amp;gobuf-&gt;timestamp);</div><div class='add'>+			go-&gt;active_buf = gobuf;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	++go-&gt;next_seq;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void write_bitmap_word(struct go7007 *go)</div><div class='add'>+{</div><div class='add'>+	int x, y, i, stride = ((go-&gt;width &gt;&gt; 4) + 7) &gt;&gt; 3;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 16; ++i) {</div><div class='add'>+		y = (((go-&gt;parse_length - 1) &lt;&lt; 3) + i) / (go-&gt;width &gt;&gt; 4);</div><div class='add'>+		x = (((go-&gt;parse_length - 1) &lt;&lt; 3) + i) % (go-&gt;width &gt;&gt; 4);</div><div class='add'>+		go-&gt;active_map[stride * y + (x &gt;&gt; 3)] |=</div><div class='add'>+					(go-&gt;modet_word &amp; 1) &lt;&lt; (x &amp; 0x7);</div><div class='add'>+		go-&gt;modet_word &gt;&gt;= 1;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Parse a chunk of the video stream into frames.  The frames are not</div><div class='add'>+ * delimited by the hardware, so we have to parse the frame boundaries</div><div class='add'>+ * based on the type of video stream we're receiving.</div><div class='add'>+ */</div><div class='add'>+void go7007_parse_video_stream(struct go7007 *go, u8 *buf, int length)</div><div class='add'>+{</div><div class='add'>+	int i, seq_start_code = -1, frame_start_code = -1;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;go-&gt;spinlock);</div><div class='add'>+</div><div class='add'>+	switch (go-&gt;format) {</div><div class='add'>+	case GO7007_FORMAT_MPEG4:</div><div class='add'>+		seq_start_code = 0xB0;</div><div class='add'>+		frame_start_code = 0xB6;</div><div class='add'>+		break;</div><div class='add'>+	case GO7007_FORMAT_MPEG1:</div><div class='add'>+	case GO7007_FORMAT_MPEG2:</div><div class='add'>+		seq_start_code = 0xB3;</div><div class='add'>+		frame_start_code = 0x00;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; length; ++i) {</div><div class='add'>+		if (go-&gt;active_buf != NULL &amp;&amp;</div><div class='add'>+			    go-&gt;active_buf-&gt;bytesused &gt;= GO7007_BUF_SIZE - 3) {</div><div class='add'>+			printk(KERN_DEBUG "go7007: dropping oversized frame\n");</div><div class='add'>+			go-&gt;active_buf-&gt;offset -= go-&gt;active_buf-&gt;bytesused;</div><div class='add'>+			go-&gt;active_buf-&gt;bytesused = 0;</div><div class='add'>+			go-&gt;active_buf-&gt;modet_active = 0;</div><div class='add'>+			go-&gt;active_buf = NULL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		switch (go-&gt;state) {</div><div class='add'>+		case STATE_DATA:</div><div class='add'>+			switch (buf[i]) {</div><div class='add'>+			case 0x00:</div><div class='add'>+				go-&gt;state = STATE_00;</div><div class='add'>+				break;</div><div class='add'>+			case 0xFF:</div><div class='add'>+				go-&gt;state = STATE_FF;</div><div class='add'>+				break;</div><div class='add'>+			default:</div><div class='add'>+				store_byte(go-&gt;active_buf, buf[i]);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		case STATE_00:</div><div class='add'>+			switch (buf[i]) {</div><div class='add'>+			case 0x00:</div><div class='add'>+				go-&gt;state = STATE_00_00;</div><div class='add'>+				break;</div><div class='add'>+			case 0xFF:</div><div class='add'>+				store_byte(go-&gt;active_buf, 0x00);</div><div class='add'>+				go-&gt;state = STATE_FF;</div><div class='add'>+				break;</div><div class='add'>+			default:</div><div class='add'>+				store_byte(go-&gt;active_buf, 0x00);</div><div class='add'>+				store_byte(go-&gt;active_buf, buf[i]);</div><div class='add'>+				go-&gt;state = STATE_DATA;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		case STATE_00_00:</div><div class='add'>+			switch (buf[i]) {</div><div class='add'>+			case 0x00:</div><div class='add'>+				store_byte(go-&gt;active_buf, 0x00);</div><div class='add'>+				/* go-&gt;state remains STATE_00_00 */</div><div class='add'>+				break;</div><div class='add'>+			case 0x01:</div><div class='add'>+				go-&gt;state = STATE_00_00_01;</div><div class='add'>+				break;</div><div class='add'>+			case 0xFF:</div><div class='add'>+				store_byte(go-&gt;active_buf, 0x00);</div><div class='add'>+				store_byte(go-&gt;active_buf, 0x00);</div><div class='add'>+				go-&gt;state = STATE_FF;</div><div class='add'>+				break;</div><div class='add'>+			default:</div><div class='add'>+				store_byte(go-&gt;active_buf, 0x00);</div><div class='add'>+				store_byte(go-&gt;active_buf, 0x00);</div><div class='add'>+				store_byte(go-&gt;active_buf, buf[i]);</div><div class='add'>+				go-&gt;state = STATE_DATA;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		case STATE_00_00_01:</div><div class='add'>+			/* If this is the start of a new MPEG frame,</div><div class='add'>+			 * get a new buffer */</div><div class='add'>+			if ((go-&gt;format == GO7007_FORMAT_MPEG1 ||</div><div class='add'>+					go-&gt;format == GO7007_FORMAT_MPEG2 ||</div><div class='add'>+					go-&gt;format == GO7007_FORMAT_MPEG4) &amp;&amp;</div><div class='add'>+					(buf[i] == seq_start_code ||</div><div class='add'>+						buf[i] == 0xB8 || /* GOP code */</div><div class='add'>+						buf[i] == frame_start_code)) {</div><div class='add'>+				if (go-&gt;active_buf == NULL || go-&gt;seen_frame)</div><div class='add'>+					frame_boundary(go);</div><div class='add'>+				if (buf[i] == frame_start_code) {</div><div class='add'>+					if (go-&gt;active_buf != NULL)</div><div class='add'>+						go-&gt;active_buf-&gt;frame_offset =</div><div class='add'>+							go-&gt;active_buf-&gt;offset;</div><div class='add'>+					go-&gt;seen_frame = 1;</div><div class='add'>+				} else {</div><div class='add'>+					go-&gt;seen_frame = 0;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+			/* Handle any special chunk types, or just write the</div><div class='add'>+			 * start code to the (potentially new) buffer */</div><div class='add'>+			switch (buf[i]) {</div><div class='add'>+			case 0xF5: /* timestamp */</div><div class='add'>+				go-&gt;parse_length = 12;</div><div class='add'>+				go-&gt;state = STATE_UNPARSED;</div><div class='add'>+				break;</div><div class='add'>+			case 0xF6: /* vbi */</div><div class='add'>+				go-&gt;state = STATE_VBI_LEN_A;</div><div class='add'>+				break;</div><div class='add'>+			case 0xF8: /* MD map */</div><div class='add'>+				go-&gt;parse_length = 0;</div><div class='add'>+				memset(go-&gt;active_map, 0,</div><div class='add'>+						sizeof(go-&gt;active_map));</div><div class='add'>+				go-&gt;state = STATE_MODET_MAP;</div><div class='add'>+				break;</div><div class='add'>+			case 0xFF: /* Potential JPEG start code */</div><div class='add'>+				store_byte(go-&gt;active_buf, 0x00);</div><div class='add'>+				store_byte(go-&gt;active_buf, 0x00);</div><div class='add'>+				store_byte(go-&gt;active_buf, 0x01);</div><div class='add'>+				go-&gt;state = STATE_FF;</div><div class='add'>+				break;</div><div class='add'>+			default:</div><div class='add'>+				store_byte(go-&gt;active_buf, 0x00);</div><div class='add'>+				store_byte(go-&gt;active_buf, 0x00);</div><div class='add'>+				store_byte(go-&gt;active_buf, 0x01);</div><div class='add'>+				store_byte(go-&gt;active_buf, buf[i]);</div><div class='add'>+				go-&gt;state = STATE_DATA;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		case STATE_FF:</div><div class='add'>+			switch (buf[i]) {</div><div class='add'>+			case 0x00:</div><div class='add'>+				store_byte(go-&gt;active_buf, 0xFF);</div><div class='add'>+				go-&gt;state = STATE_00;</div><div class='add'>+				break;</div><div class='add'>+			case 0xFF:</div><div class='add'>+				store_byte(go-&gt;active_buf, 0xFF);</div><div class='add'>+				/* go-&gt;state remains STATE_FF */</div><div class='add'>+				break;</div><div class='add'>+			case 0xD8:</div><div class='add'>+				if (go-&gt;format == GO7007_FORMAT_MJPEG)</div><div class='add'>+					frame_boundary(go);</div><div class='add'>+				/* fall through */</div><div class='add'>+			default:</div><div class='add'>+				store_byte(go-&gt;active_buf, 0xFF);</div><div class='add'>+				store_byte(go-&gt;active_buf, buf[i]);</div><div class='add'>+				go-&gt;state = STATE_DATA;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		case STATE_VBI_LEN_A:</div><div class='add'>+			go-&gt;parse_length = buf[i] &lt;&lt; 8;</div><div class='add'>+			go-&gt;state = STATE_VBI_LEN_B;</div><div class='add'>+			break;</div><div class='add'>+		case STATE_VBI_LEN_B:</div><div class='add'>+			go-&gt;parse_length |= buf[i];</div><div class='add'>+			if (go-&gt;parse_length &gt; 0)</div><div class='add'>+				go-&gt;state = STATE_UNPARSED;</div><div class='add'>+			else</div><div class='add'>+				go-&gt;state = STATE_DATA;</div><div class='add'>+			break;</div><div class='add'>+		case STATE_MODET_MAP:</div><div class='add'>+			if (go-&gt;parse_length &lt; 204) {</div><div class='add'>+				if (go-&gt;parse_length &amp; 1) {</div><div class='add'>+					go-&gt;modet_word |= buf[i];</div><div class='add'>+					write_bitmap_word(go);</div><div class='add'>+				} else</div><div class='add'>+					go-&gt;modet_word = buf[i] &lt;&lt; 8;</div><div class='add'>+			} else if (go-&gt;parse_length == 207 &amp;&amp; go-&gt;active_buf) {</div><div class='add'>+				go-&gt;active_buf-&gt;modet_active = buf[i];</div><div class='add'>+			}</div><div class='add'>+			if (++go-&gt;parse_length == 208)</div><div class='add'>+				go-&gt;state = STATE_DATA;</div><div class='add'>+			break;</div><div class='add'>+		case STATE_UNPARSED:</div><div class='add'>+			if (--go-&gt;parse_length == 0)</div><div class='add'>+				go-&gt;state = STATE_DATA;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;go-&gt;spinlock);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(go7007_parse_video_stream);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Allocate a new go7007 struct.  Used by the hardware-specific probe.</div><div class='add'>+ */</div><div class='add'>+struct go7007 *go7007_alloc(struct go7007_board_info *board, struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct go7007 *go;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	go = kmalloc(sizeof(struct go7007), GFP_KERNEL);</div><div class='add'>+	if (go == NULL)</div><div class='add'>+		return NULL;</div><div class='add'>+	go-&gt;dev = dev;</div><div class='add'>+	go-&gt;board_info = board;</div><div class='add'>+	go-&gt;board_id = 0;</div><div class='add'>+	go-&gt;tuner_type = -1;</div><div class='add'>+	go-&gt;channel_number = 0;</div><div class='add'>+	go-&gt;name[0] = 0;</div><div class='add'>+	init_MUTEX(&amp;go-&gt;hw_lock);</div><div class='add'>+	init_waitqueue_head(&amp;go-&gt;frame_waitq);</div><div class='add'>+	spin_lock_init(&amp;go-&gt;spinlock);</div><div class='add'>+	go-&gt;video_dev = NULL;</div><div class='add'>+	go-&gt;ref_count = 0;</div><div class='add'>+	go-&gt;status = STATUS_INIT;</div><div class='add'>+	memset(&amp;go-&gt;i2c_adapter, 0, sizeof(go-&gt;i2c_adapter));</div><div class='add'>+	go-&gt;i2c_adapter_online = 0;</div><div class='add'>+	go-&gt;interrupt_available = 0;</div><div class='add'>+	init_waitqueue_head(&amp;go-&gt;interrupt_waitq);</div><div class='add'>+	go-&gt;in_use = 0;</div><div class='add'>+	go-&gt;input = 0;</div><div class='add'>+	if (board-&gt;sensor_flags &amp; GO7007_SENSOR_TV) {</div><div class='add'>+		go-&gt;standard = GO7007_STD_NTSC;</div><div class='add'>+		go-&gt;width = 720;</div><div class='add'>+		go-&gt;height = 480;</div><div class='add'>+		go-&gt;sensor_framerate = 30000;</div><div class='add'>+	} else {</div><div class='add'>+		go-&gt;standard = GO7007_STD_OTHER;</div><div class='add'>+		go-&gt;width = board-&gt;sensor_width;</div><div class='add'>+		go-&gt;height = board-&gt;sensor_height;</div><div class='add'>+		go-&gt;sensor_framerate = board-&gt;sensor_framerate;</div><div class='add'>+	}</div><div class='add'>+	go-&gt;encoder_v_offset = board-&gt;sensor_v_offset;</div><div class='add'>+	go-&gt;encoder_h_offset = board-&gt;sensor_h_offset;</div><div class='add'>+	go-&gt;encoder_h_halve = 0;</div><div class='add'>+	go-&gt;encoder_v_halve = 0;</div><div class='add'>+	go-&gt;encoder_subsample = 0;</div><div class='add'>+	go-&gt;streaming = 0;</div><div class='add'>+	go-&gt;format = GO7007_FORMAT_MJPEG;</div><div class='add'>+	go-&gt;bitrate = 1500000;</div><div class='add'>+	go-&gt;fps_scale = 1;</div><div class='add'>+	go-&gt;pali = 0;</div><div class='add'>+	go-&gt;aspect_ratio = GO7007_RATIO_1_1;</div><div class='add'>+	go-&gt;gop_size = 0;</div><div class='add'>+	go-&gt;ipb = 0;</div><div class='add'>+	go-&gt;closed_gop = 0;</div><div class='add'>+	go-&gt;repeat_seqhead = 0;</div><div class='add'>+	go-&gt;seq_header_enable = 0;</div><div class='add'>+	go-&gt;gop_header_enable = 0;</div><div class='add'>+	go-&gt;dvd_mode = 0;</div><div class='add'>+	go-&gt;interlace_coding = 0;</div><div class='add'>+	for (i = 0; i &lt; 4; ++i)</div><div class='add'>+		go-&gt;modet[i].enable = 0;;</div><div class='add'>+	for (i = 0; i &lt; 1624; ++i)</div><div class='add'>+		go-&gt;modet_map[i] = 0;</div><div class='add'>+	go-&gt;audio_deliver = NULL;</div><div class='add'>+	go-&gt;audio_enabled = 0;</div><div class='add'>+	INIT_LIST_HEAD(&amp;go-&gt;stream);</div><div class='add'>+</div><div class='add'>+	return go;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(go7007_alloc);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Detach and unregister the encoder.  The go7007 struct won't be freed</div><div class='add'>+ * until v4l2 finishes releasing its resources and all associated fds are</div><div class='add'>+ * closed by applications.</div><div class='add'>+ */</div><div class='add'>+void go7007_remove(struct go7007 *go)</div><div class='add'>+{</div><div class='add'>+	if (go-&gt;i2c_adapter_online) {</div><div class='add'>+		if (i2c_del_adapter(&amp;go-&gt;i2c_adapter) == 0)</div><div class='add'>+			go-&gt;i2c_adapter_online = 0;</div><div class='add'>+		else</div><div class='add'>+			printk(KERN_ERR</div><div class='add'>+				"go7007: error removing I2C adapter!\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (go-&gt;audio_enabled)</div><div class='add'>+		go7007_snd_remove(go);</div><div class='add'>+	go7007_v4l2_remove(go);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(go7007_remove);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/staging/go7007/go7007-fw.c b/drivers/staging/go7007/go7007-fw.c<br/>new file mode 100644<br/>index 000000000000..c2aea1020b0d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/go7007/go7007-fw.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/go7007/go7007-fw.c</a></div><div class='hunk'>@@ -0,0 +1,1639 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2005-2006 Micronas USA Inc.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License (Version 2) as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software Foundation,</div><div class='add'>+ * Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This file contains code to generate a firmware image for the GO7007SB</div><div class='add'>+ * encoder.  Much of the firmware is read verbatim from a file, but some of</div><div class='add'>+ * it concerning bitrate control and other things that can be configured at</div><div class='add'>+ * run-time are generated dynamically.  Note that the format headers</div><div class='add'>+ * generated here do not affect the functioning of the encoder; they are</div><div class='add'>+ * merely parroted back to the host at the start of each frame.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/version.h&gt;</div><div class='add'>+#include &lt;linux/time.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/firmware.h&gt;</div><div class='add'>+#include &lt;asm/byteorder.h&gt;</div><div class='add'>+</div><div class='add'>+#include "go7007-priv.h"</div><div class='add'>+</div><div class='add'>+/* Constants used in the source firmware image to describe code segments */</div><div class='add'>+</div><div class='add'>+#define	FLAG_MODE_MJPEG		(1)</div><div class='add'>+#define	FLAG_MODE_MPEG1		(1&lt;&lt;1)</div><div class='add'>+#define	FLAG_MODE_MPEG2		(1&lt;&lt;2)</div><div class='add'>+#define	FLAG_MODE_MPEG4		(1&lt;&lt;3)</div><div class='add'>+#define	FLAG_MODE_H263		(1&lt;&lt;4)</div><div class='add'>+#define FLAG_MODE_ALL		(FLAG_MODE_MJPEG | FLAG_MODE_MPEG1 | \</div><div class='add'>+					FLAG_MODE_MPEG2 | FLAG_MODE_MPEG4 | \</div><div class='add'>+					FLAG_MODE_H263)</div><div class='add'>+#define FLAG_SPECIAL		(1&lt;&lt;8)</div><div class='add'>+</div><div class='add'>+#define SPECIAL_FRM_HEAD	0</div><div class='add'>+#define SPECIAL_BRC_CTRL	1</div><div class='add'>+#define SPECIAL_CONFIG		2</div><div class='add'>+#define SPECIAL_SEQHEAD		3</div><div class='add'>+#define SPECIAL_AV_SYNC		4</div><div class='add'>+#define SPECIAL_FINAL		5</div><div class='add'>+#define SPECIAL_AUDIO		6</div><div class='add'>+#define SPECIAL_MODET		7</div><div class='add'>+</div><div class='add'>+/* Little data class for creating MPEG headers bit-by-bit */</div><div class='add'>+</div><div class='add'>+struct code_gen {</div><div class='add'>+	unsigned char *p; /* destination */</div><div class='add'>+	u32 a; /* collects bits at the top of the variable */</div><div class='add'>+	int b; /* bit position of most recently-written bit */</div><div class='add'>+	int len; /* written out so far */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define CODE_GEN(name, dest) struct code_gen name = { dest, 0, 32, 0 }</div><div class='add'>+</div><div class='add'>+#define CODE_ADD(name, val, length) do { \</div><div class='add'>+	name.b -= (length); \</div><div class='add'>+	name.a |= (val) &lt;&lt; name.b; \</div><div class='add'>+	while (name.b &lt;= 24) { \</div><div class='add'>+		*name.p = name.a &gt;&gt; 24; \</div><div class='add'>+		++name.p; \</div><div class='add'>+		name.a &lt;&lt;= 8; \</div><div class='add'>+		name.b += 8; \</div><div class='add'>+		name.len += 8; \</div><div class='add'>+	} \</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define CODE_LENGTH(name) (name.len + (32 - name.b))</div><div class='add'>+</div><div class='add'>+/* Tables for creating the bitrate control data */</div><div class='add'>+</div><div class='add'>+static const s16 converge_speed_ip[101] = {</div><div class='add'>+	1, 1, 1, 1, 1, 1, 1, 1, 1, 1,</div><div class='add'>+	1, 1, 1, 1, 1, 1, 1, 1, 1, 1,</div><div class='add'>+	1, 1, 1, 1, 1, 1, 1, 1, 1, 1,</div><div class='add'>+	1, 1, 1, 1, 1, 1, 1, 1, 1, 2,</div><div class='add'>+	2, 2, 2, 2, 2, 2, 2, 2, 2, 3,</div><div class='add'>+	3, 3, 3, 3, 3, 4, 4, 4, 4, 4,</div><div class='add'>+	5, 5, 5, 6, 6, 6, 7, 7, 8, 8,</div><div class='add'>+	9, 10, 10, 11, 12, 13, 14, 15, 16, 17,</div><div class='add'>+	19, 20, 22, 23, 25, 27, 30, 32, 35, 38,</div><div class='add'>+	41, 45, 49, 53, 58, 63, 69, 76, 83, 91,</div><div class='add'>+	100</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const s16 converge_speed_ipb[101] = {</div><div class='add'>+	3, 3, 3, 3, 3, 3, 3, 3, 3, 3,</div><div class='add'>+	3, 3, 3, 3, 3, 3, 3, 3, 3, 3,</div><div class='add'>+	3, 3, 3, 3, 3, 4, 4, 4, 4, 4,</div><div class='add'>+	4, 4, 4, 4, 5, 5, 5, 5, 5, 6,</div><div class='add'>+	6, 6, 6, 7, 7, 7, 7, 8, 8, 9,</div><div class='add'>+	9, 9, 10, 10, 11, 12, 12, 13, 14, 14,</div><div class='add'>+	15, 16, 17, 18, 19, 20, 22, 23, 25, 26,</div><div class='add'>+	28, 30, 32, 34, 37, 40, 42, 46, 49, 53,</div><div class='add'>+	57, 61, 66, 71, 77, 83, 90, 97, 106, 115,</div><div class='add'>+	125, 135, 147, 161, 175, 191, 209, 228, 249, 273,</div><div class='add'>+	300</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const s16 LAMBDA_table[4][101] = {</div><div class='add'>+	{	16, 16, 16, 16, 17, 17, 17, 18, 18, 18,</div><div class='add'>+		19, 19, 19, 20, 20, 20, 21, 21, 22, 22,</div><div class='add'>+		22, 23, 23, 24, 24, 25, 25, 25, 26, 26,</div><div class='add'>+		27, 27, 28, 28, 29, 29, 30, 31, 31, 32,</div><div class='add'>+		32, 33, 33, 34, 35, 35, 36, 37, 37, 38,</div><div class='add'>+		39, 39, 40, 41, 42, 42, 43, 44, 45, 46,</div><div class='add'>+		46, 47, 48, 49, 50, 51, 52, 53, 54, 55,</div><div class='add'>+		56, 57, 58, 59, 60, 61, 62, 63, 64, 65,</div><div class='add'>+		67, 68, 69, 70, 72, 73, 74, 76, 77, 78,</div><div class='add'>+		80, 81, 83, 84, 86, 87, 89, 90, 92, 94,</div><div class='add'>+		96</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		20, 20, 20, 21, 21, 21, 22, 22, 23, 23,</div><div class='add'>+		23, 24, 24, 25, 25, 26, 26, 27, 27, 28,</div><div class='add'>+		28, 29, 29, 30, 30, 31, 31, 32, 33, 33,</div><div class='add'>+		34, 34, 35, 36, 36, 37, 38, 38, 39, 40,</div><div class='add'>+		40, 41, 42, 43, 43, 44, 45, 46, 47, 48,</div><div class='add'>+		48, 49, 50, 51, 52, 53, 54, 55, 56, 57,</div><div class='add'>+		58, 59, 60, 61, 62, 64, 65, 66, 67, 68,</div><div class='add'>+		70, 71, 72, 73, 75, 76, 78, 79, 80, 82,</div><div class='add'>+		83, 85, 86, 88, 90, 91, 93, 95, 96, 98,</div><div class='add'>+		100, 102, 103, 105, 107, 109, 111, 113, 115, 117,</div><div class='add'>+		120</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		24, 24, 24, 25, 25, 26, 26, 27, 27, 28,</div><div class='add'>+		28, 29, 29, 30, 30, 31, 31, 32, 33, 33,</div><div class='add'>+		34, 34, 35, 36, 36, 37, 38, 38, 39, 40,</div><div class='add'>+		41, 41, 42, 43, 44, 44, 45, 46, 47, 48,</div><div class='add'>+		49, 50, 50, 51, 52, 53, 54, 55, 56, 57,</div><div class='add'>+		58, 59, 60, 62, 63, 64, 65, 66, 67, 69,</div><div class='add'>+		70, 71, 72, 74, 75, 76, 78, 79, 81, 82,</div><div class='add'>+		84, 85, 87, 88, 90, 92, 93, 95, 97, 98,</div><div class='add'>+		100, 102, 104, 106, 108, 110, 112, 114, 116, 118,</div><div class='add'>+		120, 122, 124, 127, 129, 131, 134, 136, 138, 141,</div><div class='add'>+		144</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		32, 32, 33, 33, 34, 34, 35, 36, 36, 37,</div><div class='add'>+		38, 38, 39, 40, 41, 41, 42, 43, 44, 44,</div><div class='add'>+		45, 46, 47, 48, 49, 50, 50, 51, 52, 53,</div><div class='add'>+		54, 55, 56, 57, 58, 59, 60, 62, 63, 64,</div><div class='add'>+		65, 66, 67, 69, 70, 71, 72, 74, 75, 76,</div><div class='add'>+		78, 79, 81, 82, 84, 85, 87, 88, 90, 92,</div><div class='add'>+		93, 95, 97, 98, 100, 102, 104, 106, 108, 110,</div><div class='add'>+		112, 114, 116, 118, 120, 122, 124, 127, 129, 131,</div><div class='add'>+		134, 136, 139, 141, 144, 146, 149, 152, 154, 157,</div><div class='add'>+		160, 163, 166, 169, 172, 175, 178, 181, 185, 188,</div><div class='add'>+		192</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* MPEG blank frame generation tables */</div><div class='add'>+</div><div class='add'>+enum mpeg_frame_type {</div><div class='add'>+	PFRAME,</div><div class='add'>+	BFRAME_PRE,</div><div class='add'>+	BFRAME_POST,</div><div class='add'>+	BFRAME_BIDIR,</div><div class='add'>+	BFRAME_EMPTY</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u32 addrinctab[33][2] = {</div><div class='add'>+	{ 0x01, 1 },	{ 0x03, 3 },	{ 0x02, 3 },	{ 0x03, 4 },</div><div class='add'>+	{ 0x02, 4 },	{ 0x03, 5 },	{ 0x02, 5 },	{ 0x07, 7 },</div><div class='add'>+	{ 0x06, 7 },	{ 0x0b, 8 },	{ 0x0a, 8 },	{ 0x09, 8 },</div><div class='add'>+	{ 0x08, 8 },	{ 0x07, 8 },	{ 0x06, 8 },	{ 0x17, 10 },</div><div class='add'>+	{ 0x16, 10 },	{ 0x15, 10 },	{ 0x14, 10 },	{ 0x13, 10 },</div><div class='add'>+	{ 0x12, 10 },	{ 0x23, 11 },	{ 0x22, 11 },	{ 0x21, 11 },</div><div class='add'>+	{ 0x20, 11 },	{ 0x1f, 11 },	{ 0x1e, 11 },	{ 0x1d, 11 },</div><div class='add'>+	{ 0x1c, 11 },	{ 0x1b, 11 },	{ 0x1a, 11 },	{ 0x19, 11 },</div><div class='add'>+	{ 0x18, 11 }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Standard JPEG tables */</div><div class='add'>+</div><div class='add'>+static const u8 default_intra_quant_table[] = {</div><div class='add'>+	 8, 16, 19, 22, 26, 27, 29, 34,</div><div class='add'>+	16, 16, 22, 24, 27, 29, 34, 37,</div><div class='add'>+	19, 22, 26, 27, 29, 34, 34, 38,</div><div class='add'>+	22, 22, 26, 27, 29, 34, 37, 40,</div><div class='add'>+	22, 26, 27, 29, 32, 35, 40, 48,</div><div class='add'>+	26, 27, 29, 32, 35, 40, 48, 58,</div><div class='add'>+	26, 27, 29, 34, 38, 46, 56, 69,</div><div class='add'>+	27, 29, 35, 38, 46, 56, 69, 83</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u8 bits_dc_luminance[] = {</div><div class='add'>+	0, 0, 1, 5, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u8 val_dc_luminance[] = {</div><div class='add'>+	0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u8 bits_dc_chrominance[] = {</div><div class='add'>+	0, 0, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u8 val_dc_chrominance[] = {</div><div class='add'>+	0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u8 bits_ac_luminance[] = {</div><div class='add'>+	0, 0, 2, 1, 3, 3, 2, 4, 3, 5, 5, 4, 4, 0, 0, 1, 0x7d</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u8 val_ac_luminance[] = {</div><div class='add'>+	0x01, 0x02, 0x03, 0x00, 0x04, 0x11, 0x05, 0x12,</div><div class='add'>+	0x21, 0x31, 0x41, 0x06, 0x13, 0x51, 0x61, 0x07,</div><div class='add'>+	0x22, 0x71, 0x14, 0x32, 0x81, 0x91, 0xa1, 0x08,</div><div class='add'>+	0x23, 0x42, 0xb1, 0xc1, 0x15, 0x52, 0xd1, 0xf0,</div><div class='add'>+	0x24, 0x33, 0x62, 0x72, 0x82, 0x09, 0x0a, 0x16,</div><div class='add'>+	0x17, 0x18, 0x19, 0x1a, 0x25, 0x26, 0x27, 0x28,</div><div class='add'>+	0x29, 0x2a, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39,</div><div class='add'>+	0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49,</div><div class='add'>+	0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59,</div><div class='add'>+	0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69,</div><div class='add'>+	0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79,</div><div class='add'>+	0x7a, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89,</div><div class='add'>+	0x8a, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98,</div><div class='add'>+	0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7,</div><div class='add'>+	0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6,</div><div class='add'>+	0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3, 0xc4, 0xc5,</div><div class='add'>+	0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2, 0xd3, 0xd4,</div><div class='add'>+	0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xe1, 0xe2,</div><div class='add'>+	0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea,</div><div class='add'>+	0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8,</div><div class='add'>+	0xf9, 0xfa</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u8 bits_ac_chrominance[] = {</div><div class='add'>+	0, 0, 2, 1, 2, 4, 4, 3, 4, 7, 5, 4, 4, 0, 1, 2, 0x77</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u8 val_ac_chrominance[] = {</div><div class='add'>+	0x00, 0x01, 0x02, 0x03, 0x11, 0x04, 0x05, 0x21,</div><div class='add'>+	0x31, 0x06, 0x12, 0x41, 0x51, 0x07, 0x61, 0x71,</div><div class='add'>+	0x13, 0x22, 0x32, 0x81, 0x08, 0x14, 0x42, 0x91,</div><div class='add'>+	0xa1, 0xb1, 0xc1, 0x09, 0x23, 0x33, 0x52, 0xf0,</div><div class='add'>+	0x15, 0x62, 0x72, 0xd1, 0x0a, 0x16, 0x24, 0x34,</div><div class='add'>+	0xe1, 0x25, 0xf1, 0x17, 0x18, 0x19, 0x1a, 0x26,</div><div class='add'>+	0x27, 0x28, 0x29, 0x2a, 0x35, 0x36, 0x37, 0x38,</div><div class='add'>+	0x39, 0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48,</div><div class='add'>+	0x49, 0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58,</div><div class='add'>+	0x59, 0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68,</div><div class='add'>+	0x69, 0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78,</div><div class='add'>+	0x79, 0x7a, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,</div><div class='add'>+	0x88, 0x89, 0x8a, 0x92, 0x93, 0x94, 0x95, 0x96,</div><div class='add'>+	0x97, 0x98, 0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5,</div><div class='add'>+	0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4,</div><div class='add'>+	0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3,</div><div class='add'>+	0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2,</div><div class='add'>+	0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda,</div><div class='add'>+	0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9,</div><div class='add'>+	0xea, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8,</div><div class='add'>+	0xf9, 0xfa</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Zig-zag mapping for quant table</div><div class='add'>+ *</div><div class='add'>+ * OK, let's do this mapping on the actual table above so it doesn't have</div><div class='add'>+ * to be done on the fly.</div><div class='add'>+ */</div><div class='add'>+static const int zz[64] = {</div><div class='add'>+	0,   1,  8, 16,  9,  2,  3, 10, 17, 24, 32, 25, 18, 11,  4,  5,</div><div class='add'>+	12, 19, 26, 33, 40, 48, 41, 34, 27, 20, 13,  6,  7, 14, 21, 28,</div><div class='add'>+	35, 42, 49, 56, 57, 50, 43, 36, 29, 22, 15, 23, 30, 37, 44, 51,</div><div class='add'>+	58, 59, 52, 45, 38, 31, 39, 46, 53, 60, 61, 54, 47, 55, 62, 63</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int copy_packages(u16 *dest, u16 *src, int pkg_cnt, int space)</div><div class='add'>+{</div><div class='add'>+	int i, cnt = pkg_cnt * 32;</div><div class='add'>+</div><div class='add'>+	if (space &lt; cnt)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; cnt; ++i)</div><div class='add'>+		dest[i] = __cpu_to_le16(src[i]);</div><div class='add'>+</div><div class='add'>+	return cnt;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mjpeg_frame_header(struct go7007 *go, unsigned char *buf, int q)</div><div class='add'>+{</div><div class='add'>+	int i, p = 0;</div><div class='add'>+</div><div class='add'>+	buf[p++] = 0xff;</div><div class='add'>+	buf[p++] = 0xd8;</div><div class='add'>+	buf[p++] = 0xff;</div><div class='add'>+	buf[p++] = 0xdb;</div><div class='add'>+	buf[p++] = 0;</div><div class='add'>+	buf[p++] = 2 + 65;</div><div class='add'>+	buf[p++] = 0;</div><div class='add'>+	buf[p++] = default_intra_quant_table[0];</div><div class='add'>+	for (i = 1; i &lt; 64; ++i)</div><div class='add'>+		/* buf[p++] = (default_intra_quant_table[i] * q) &gt;&gt; 3; */</div><div class='add'>+		buf[p++] = (default_intra_quant_table[zz[i]] * q) &gt;&gt; 3;</div><div class='add'>+	buf[p++] = 0xff;</div><div class='add'>+	buf[p++] = 0xc0;</div><div class='add'>+	buf[p++] = 0;</div><div class='add'>+	buf[p++] = 17;</div><div class='add'>+	buf[p++] = 8;</div><div class='add'>+	buf[p++] = go-&gt;height &gt;&gt; 8;</div><div class='add'>+	buf[p++] = go-&gt;height &amp; 0xff;</div><div class='add'>+	buf[p++] = go-&gt;width &gt;&gt; 8;</div><div class='add'>+	buf[p++] = go-&gt;width &amp; 0xff;</div><div class='add'>+	buf[p++] = 3;</div><div class='add'>+	buf[p++] = 1;</div><div class='add'>+	buf[p++] = 0x22;</div><div class='add'>+	buf[p++] = 0;</div><div class='add'>+	buf[p++] = 2;</div><div class='add'>+	buf[p++] = 0x11;</div><div class='add'>+	buf[p++] = 0;</div><div class='add'>+	buf[p++] = 3;</div><div class='add'>+	buf[p++] = 0x11;</div><div class='add'>+	buf[p++] = 0;</div><div class='add'>+	buf[p++] = 0xff;</div><div class='add'>+	buf[p++] = 0xc4;</div><div class='add'>+	buf[p++] = 418 &gt;&gt; 8;</div><div class='add'>+	buf[p++] = 418 &amp; 0xff;</div><div class='add'>+	buf[p++] = 0x00;</div><div class='add'>+	memcpy(buf + p, bits_dc_luminance + 1, 16);</div><div class='add'>+	p += 16;</div><div class='add'>+	memcpy(buf + p, val_dc_luminance, sizeof(val_dc_luminance));</div><div class='add'>+	p += sizeof(val_dc_luminance);</div><div class='add'>+	buf[p++] = 0x01;</div><div class='add'>+	memcpy(buf + p, bits_dc_chrominance + 1, 16);</div><div class='add'>+	p += 16;</div><div class='add'>+	memcpy(buf + p, val_dc_chrominance, sizeof(val_dc_chrominance));</div><div class='add'>+	p += sizeof(val_dc_chrominance);</div><div class='add'>+	buf[p++] = 0x10;</div><div class='add'>+	memcpy(buf + p, bits_ac_luminance + 1, 16);</div><div class='add'>+	p += 16;</div><div class='add'>+	memcpy(buf + p, val_ac_luminance, sizeof(val_ac_luminance));</div><div class='add'>+	p += sizeof(val_ac_luminance);</div><div class='add'>+	buf[p++] = 0x11;</div><div class='add'>+	memcpy(buf + p, bits_ac_chrominance + 1, 16);</div><div class='add'>+	p += 16;</div><div class='add'>+	memcpy(buf + p, val_ac_chrominance, sizeof(val_ac_chrominance));</div><div class='add'>+	p += sizeof(val_ac_chrominance);</div><div class='add'>+	buf[p++] = 0xff;</div><div class='add'>+	buf[p++] = 0xda;</div><div class='add'>+	buf[p++] = 0;</div><div class='add'>+	buf[p++] = 12;</div><div class='add'>+	buf[p++] = 3;</div><div class='add'>+	buf[p++] = 1;</div><div class='add'>+	buf[p++] = 0x00;</div><div class='add'>+	buf[p++] = 2;</div><div class='add'>+	buf[p++] = 0x11;</div><div class='add'>+	buf[p++] = 3;</div><div class='add'>+	buf[p++] = 0x11;</div><div class='add'>+	buf[p++] = 0;</div><div class='add'>+	buf[p++] = 63;</div><div class='add'>+	buf[p++] = 0;</div><div class='add'>+	return p;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gen_mjpeghdr_to_package(struct go7007 *go, u16 *code, int space)</div><div class='add'>+{</div><div class='add'>+	u8 *buf;</div><div class='add'>+	u16 mem = 0x3e00;</div><div class='add'>+	unsigned int addr = 0x19;</div><div class='add'>+	int size = 0, i, off = 0, chunk;</div><div class='add'>+</div><div class='add'>+	buf = kmalloc(4096, GFP_KERNEL);</div><div class='add'>+	if (buf == NULL) {</div><div class='add'>+		printk(KERN_ERR "go7007: unable to allocate 4096 bytes for "</div><div class='add'>+				"firmware construction\n");</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+	memset(buf, 0, 4096);</div><div class='add'>+</div><div class='add'>+	for (i = 1; i &lt; 32; ++i) {</div><div class='add'>+		mjpeg_frame_header(go, buf + size, i);</div><div class='add'>+		size += 80;</div><div class='add'>+	}</div><div class='add'>+	chunk = mjpeg_frame_header(go, buf + size, 1);</div><div class='add'>+	memmove(buf + size, buf + size + 80, chunk - 80);</div><div class='add'>+	size += chunk - 80;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; size; i += chunk * 2) {</div><div class='add'>+		if (space - off &lt; 32) {</div><div class='add'>+			off = -1;</div><div class='add'>+			goto done;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		code[off + 1] = __cpu_to_le16(0x8000 | mem);</div><div class='add'>+</div><div class='add'>+		chunk = 28;</div><div class='add'>+		if (mem + chunk &gt; 0x4000)</div><div class='add'>+			chunk = 0x4000 - mem;</div><div class='add'>+		if (i + 2 * chunk &gt; size)</div><div class='add'>+			chunk = (size - i) / 2;</div><div class='add'>+</div><div class='add'>+		if (chunk &lt; 28) {</div><div class='add'>+			code[off] = __cpu_to_le16(0x4000 | chunk);</div><div class='add'>+			code[off + 31] = __cpu_to_le16(addr++);</div><div class='add'>+			mem = 0x3e00;</div><div class='add'>+		} else {</div><div class='add'>+			code[off] = __cpu_to_le16(0x1000 | 28);</div><div class='add'>+			code[off + 31] = 0;</div><div class='add'>+			mem += 28;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		memcpy(&amp;code[off + 2], buf + i, chunk * 2);</div><div class='add'>+		off += 32;</div><div class='add'>+	}</div><div class='add'>+done:</div><div class='add'>+	kfree(buf);</div><div class='add'>+	return off;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mpeg1_frame_header(struct go7007 *go, unsigned char *buf,</div><div class='add'>+		int modulo, int pict_struct, enum mpeg_frame_type frame)</div><div class='add'>+{</div><div class='add'>+	int i, j, mb_code, mb_len;</div><div class='add'>+	int rows = go-&gt;interlace_coding ? go-&gt;height / 32 : go-&gt;height / 16;</div><div class='add'>+	CODE_GEN(c, buf + 6);</div><div class='add'>+</div><div class='add'>+	switch (frame) {</div><div class='add'>+	case PFRAME:</div><div class='add'>+		mb_code = 0x1;</div><div class='add'>+		mb_len = 3;</div><div class='add'>+		break;</div><div class='add'>+	case BFRAME_PRE:</div><div class='add'>+		mb_code = 0x2;</div><div class='add'>+		mb_len = 4;</div><div class='add'>+		break;</div><div class='add'>+	case BFRAME_POST:</div><div class='add'>+		mb_code = 0x2;</div><div class='add'>+		mb_len = 3;</div><div class='add'>+		break;</div><div class='add'>+	case BFRAME_BIDIR:</div><div class='add'>+		mb_code = 0x2;</div><div class='add'>+		mb_len = 2;</div><div class='add'>+		break;</div><div class='add'>+	default: /* keep the compiler happy */</div><div class='add'>+		mb_code = mb_len = 0;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	CODE_ADD(c, frame == PFRAME ? 0x2 : 0x3, 13);</div><div class='add'>+	CODE_ADD(c, 0xffff, 16);</div><div class='add'>+	CODE_ADD(c, go-&gt;format == GO7007_FORMAT_MPEG2 ? 0x7 : 0x4, 4);</div><div class='add'>+	if (frame != PFRAME)</div><div class='add'>+		CODE_ADD(c, go-&gt;format == GO7007_FORMAT_MPEG2 ? 0x7 : 0x4, 4);</div><div class='add'>+	else</div><div class='add'>+		CODE_ADD(c, 0, 4); /* Is this supposed to be here?? */</div><div class='add'>+	CODE_ADD(c, 0, 3); /* What is this?? */</div><div class='add'>+	/* Byte-align with zeros */</div><div class='add'>+	j = 8 - (CODE_LENGTH(c) % 8);</div><div class='add'>+	if (j != 8)</div><div class='add'>+		CODE_ADD(c, 0, j);</div><div class='add'>+</div><div class='add'>+	if (go-&gt;format == GO7007_FORMAT_MPEG2) {</div><div class='add'>+		CODE_ADD(c, 0x1, 24);</div><div class='add'>+		CODE_ADD(c, 0xb5, 8);</div><div class='add'>+		CODE_ADD(c, 0x844, 12);</div><div class='add'>+		CODE_ADD(c, frame == PFRAME ? 0xff : 0x44, 8);</div><div class='add'>+		if (go-&gt;interlace_coding) {</div><div class='add'>+			CODE_ADD(c, pict_struct, 4);</div><div class='add'>+			if (go-&gt;dvd_mode)</div><div class='add'>+				CODE_ADD(c, 0x000, 11);</div><div class='add'>+			else</div><div class='add'>+				CODE_ADD(c, 0x200, 11);</div><div class='add'>+		} else {</div><div class='add'>+			CODE_ADD(c, 0x3, 4);</div><div class='add'>+			CODE_ADD(c, 0x20c, 11);</div><div class='add'>+		}</div><div class='add'>+		/* Byte-align with zeros */</div><div class='add'>+		j = 8 - (CODE_LENGTH(c) % 8);</div><div class='add'>+		if (j != 8)</div><div class='add'>+			CODE_ADD(c, 0, j);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; rows; ++i) {</div><div class='add'>+		CODE_ADD(c, 1, 24);</div><div class='add'>+		CODE_ADD(c, i + 1, 8);</div><div class='add'>+		CODE_ADD(c, 0x2, 6);</div><div class='add'>+		CODE_ADD(c, 0x1, 1);</div><div class='add'>+		CODE_ADD(c, mb_code, mb_len);</div><div class='add'>+		if (go-&gt;interlace_coding) {</div><div class='add'>+			CODE_ADD(c, 0x1, 2);</div><div class='add'>+			CODE_ADD(c, pict_struct == 1 ? 0x0 : 0x1, 1);</div><div class='add'>+		}</div><div class='add'>+		if (frame == BFRAME_BIDIR) {</div><div class='add'>+			CODE_ADD(c, 0x3, 2);</div><div class='add'>+			if (go-&gt;interlace_coding)</div><div class='add'>+				CODE_ADD(c, pict_struct == 1 ? 0x0 : 0x1, 1);</div><div class='add'>+		}</div><div class='add'>+		CODE_ADD(c, 0x3, 2);</div><div class='add'>+		for (j = (go-&gt;width &gt;&gt; 4) - 2; j &gt;= 33; j -= 33)</div><div class='add'>+			CODE_ADD(c, 0x8, 11);</div><div class='add'>+		CODE_ADD(c, addrinctab[j][0], addrinctab[j][1]);</div><div class='add'>+		CODE_ADD(c, mb_code, mb_len);</div><div class='add'>+		if (go-&gt;interlace_coding) {</div><div class='add'>+			CODE_ADD(c, 0x1, 2);</div><div class='add'>+			CODE_ADD(c, pict_struct == 1 ? 0x0 : 0x1, 1);</div><div class='add'>+		}</div><div class='add'>+		if (frame == BFRAME_BIDIR) {</div><div class='add'>+			CODE_ADD(c, 0x3, 2);</div><div class='add'>+			if (go-&gt;interlace_coding)</div><div class='add'>+				CODE_ADD(c, pict_struct == 1 ? 0x0 : 0x1, 1);</div><div class='add'>+		}</div><div class='add'>+		CODE_ADD(c, 0x3, 2);</div><div class='add'>+</div><div class='add'>+		/* Byte-align with zeros */</div><div class='add'>+		j = 8 - (CODE_LENGTH(c) % 8);</div><div class='add'>+		if (j != 8)</div><div class='add'>+			CODE_ADD(c, 0, j);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	i = CODE_LENGTH(c) + 4 * 8;</div><div class='add'>+	buf[2] = 0x00;</div><div class='add'>+	buf[3] = 0x00;</div><div class='add'>+	buf[4] = 0x01;</div><div class='add'>+	buf[5] = 0x00;</div><div class='add'>+	return i;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mpeg1_sequence_header(struct go7007 *go, unsigned char *buf, int ext)</div><div class='add'>+{</div><div class='add'>+	int i, aspect_ratio, picture_rate;</div><div class='add'>+	CODE_GEN(c, buf + 6);</div><div class='add'>+</div><div class='add'>+	if (go-&gt;format == GO7007_FORMAT_MPEG1) {</div><div class='add'>+		switch (go-&gt;aspect_ratio) {</div><div class='add'>+		case GO7007_RATIO_4_3:</div><div class='add'>+			aspect_ratio = go-&gt;standard == GO7007_STD_NTSC ? 3 : 2;</div><div class='add'>+			break;</div><div class='add'>+		case GO7007_RATIO_16_9:</div><div class='add'>+			aspect_ratio = go-&gt;standard == GO7007_STD_NTSC ? 5 : 4;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			aspect_ratio = 1;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		switch (go-&gt;aspect_ratio) {</div><div class='add'>+		case GO7007_RATIO_4_3:</div><div class='add'>+			aspect_ratio = 2;</div><div class='add'>+			break;</div><div class='add'>+		case GO7007_RATIO_16_9:</div><div class='add'>+			aspect_ratio = 3;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			aspect_ratio = 1;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	switch (go-&gt;sensor_framerate) {</div><div class='add'>+	case 24000:</div><div class='add'>+		picture_rate = 1;</div><div class='add'>+		break;</div><div class='add'>+	case 24024:</div><div class='add'>+		picture_rate = 2;</div><div class='add'>+		break;</div><div class='add'>+	case 25025:</div><div class='add'>+		picture_rate = go-&gt;interlace_coding ? 6 : 3;</div><div class='add'>+		break;</div><div class='add'>+	case 30000:</div><div class='add'>+		picture_rate = go-&gt;interlace_coding ? 7 : 4;</div><div class='add'>+		break;</div><div class='add'>+	case 30030:</div><div class='add'>+		picture_rate = go-&gt;interlace_coding ? 8 : 5;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		picture_rate = 5; /* 30 fps seems like a reasonable default */</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	CODE_ADD(c, go-&gt;width, 12);</div><div class='add'>+	CODE_ADD(c, go-&gt;height, 12);</div><div class='add'>+	CODE_ADD(c, aspect_ratio, 4);</div><div class='add'>+	CODE_ADD(c, picture_rate, 4);</div><div class='add'>+	CODE_ADD(c, go-&gt;format == GO7007_FORMAT_MPEG2 ? 20000 : 0x3ffff, 18);</div><div class='add'>+	CODE_ADD(c, 1, 1);</div><div class='add'>+	CODE_ADD(c, go-&gt;format == GO7007_FORMAT_MPEG2 ? 112 : 20, 10);</div><div class='add'>+	CODE_ADD(c, 0, 3);</div><div class='add'>+</div><div class='add'>+	/* Byte-align with zeros */</div><div class='add'>+	i = 8 - (CODE_LENGTH(c) % 8);</div><div class='add'>+	if (i != 8)</div><div class='add'>+		CODE_ADD(c, 0, i);</div><div class='add'>+</div><div class='add'>+	if (go-&gt;format == GO7007_FORMAT_MPEG2) {</div><div class='add'>+		CODE_ADD(c, 0x1, 24);</div><div class='add'>+		CODE_ADD(c, 0xb5, 8);</div><div class='add'>+		CODE_ADD(c, 0x148, 12);</div><div class='add'>+		if (go-&gt;interlace_coding)</div><div class='add'>+			CODE_ADD(c, 0x20001, 20);</div><div class='add'>+		else</div><div class='add'>+			CODE_ADD(c, 0xa0001, 20);</div><div class='add'>+		CODE_ADD(c, 0, 16);</div><div class='add'>+</div><div class='add'>+		/* Byte-align with zeros */</div><div class='add'>+		i = 8 - (CODE_LENGTH(c) % 8);</div><div class='add'>+		if (i != 8)</div><div class='add'>+			CODE_ADD(c, 0, i);</div><div class='add'>+</div><div class='add'>+		if (ext) {</div><div class='add'>+			CODE_ADD(c, 0x1, 24);</div><div class='add'>+			CODE_ADD(c, 0xb52, 12);</div><div class='add'>+			CODE_ADD(c, go-&gt;standard == GO7007_STD_NTSC ? 2 : 1, 3);</div><div class='add'>+			CODE_ADD(c, 0x105, 9);</div><div class='add'>+			CODE_ADD(c, 0x505, 16);</div><div class='add'>+			CODE_ADD(c, go-&gt;width, 14);</div><div class='add'>+			CODE_ADD(c, 1, 1);</div><div class='add'>+			CODE_ADD(c, go-&gt;height, 14);</div><div class='add'>+</div><div class='add'>+			/* Byte-align with zeros */</div><div class='add'>+			i = 8 - (CODE_LENGTH(c) % 8);</div><div class='add'>+			if (i != 8)</div><div class='add'>+				CODE_ADD(c, 0, i);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	i = CODE_LENGTH(c) + 4 * 8;</div><div class='add'>+	buf[0] = i &amp; 0xff;</div><div class='add'>+	buf[1] = i &gt;&gt; 8;</div><div class='add'>+	buf[2] = 0x00;</div><div class='add'>+	buf[3] = 0x00;</div><div class='add'>+	buf[4] = 0x01;</div><div class='add'>+	buf[5] = 0xb3;</div><div class='add'>+	return i;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gen_mpeg1hdr_to_package(struct go7007 *go,</div><div class='add'>+					u16 *code, int space, int *framelen)</div><div class='add'>+{</div><div class='add'>+	u8 *buf;</div><div class='add'>+	u16 mem = 0x3e00;</div><div class='add'>+	unsigned int addr = 0x19;</div><div class='add'>+	int i, off = 0, chunk;</div><div class='add'>+</div><div class='add'>+	buf = kmalloc(5120, GFP_KERNEL);</div><div class='add'>+	if (buf == NULL) {</div><div class='add'>+		printk(KERN_ERR "go7007: unable to allocate 5120 bytes for "</div><div class='add'>+				"firmware construction\n");</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+	memset(buf, 0, 5120);</div><div class='add'>+	framelen[0] = mpeg1_frame_header(go, buf, 0, 1, PFRAME);</div><div class='add'>+	if (go-&gt;interlace_coding)</div><div class='add'>+		framelen[0] += mpeg1_frame_header(go, buf + framelen[0] / 8,</div><div class='add'>+							0, 2, PFRAME);</div><div class='add'>+	buf[0] = framelen[0] &amp; 0xff;</div><div class='add'>+	buf[1] = framelen[0] &gt;&gt; 8;</div><div class='add'>+	i = 368;</div><div class='add'>+	framelen[1] = mpeg1_frame_header(go, buf + i, 0, 1, BFRAME_PRE);</div><div class='add'>+	if (go-&gt;interlace_coding)</div><div class='add'>+		framelen[1] += mpeg1_frame_header(go, buf + i + framelen[1] / 8,</div><div class='add'>+							0, 2, BFRAME_PRE);</div><div class='add'>+	buf[i] = framelen[1] &amp; 0xff;</div><div class='add'>+	buf[i + 1] = framelen[1] &gt;&gt; 8;</div><div class='add'>+	i += 1632;</div><div class='add'>+	framelen[2] = mpeg1_frame_header(go, buf + i, 0, 1, BFRAME_POST);</div><div class='add'>+	if (go-&gt;interlace_coding)</div><div class='add'>+		framelen[2] += mpeg1_frame_header(go, buf + i + framelen[2] / 8,</div><div class='add'>+							0, 2, BFRAME_POST);</div><div class='add'>+	buf[i] = framelen[2] &amp; 0xff;</div><div class='add'>+	buf[i + 1] = framelen[2] &gt;&gt; 8;</div><div class='add'>+	i += 1432;</div><div class='add'>+	framelen[3] = mpeg1_frame_header(go, buf + i, 0, 1, BFRAME_BIDIR);</div><div class='add'>+	if (go-&gt;interlace_coding)</div><div class='add'>+		framelen[3] += mpeg1_frame_header(go, buf + i + framelen[3] / 8,</div><div class='add'>+							0, 2, BFRAME_BIDIR);</div><div class='add'>+	buf[i] = framelen[3] &amp; 0xff;</div><div class='add'>+	buf[i + 1] = framelen[3] &gt;&gt; 8;</div><div class='add'>+	i += 1632 + 16;</div><div class='add'>+	mpeg1_sequence_header(go, buf + i, 0);</div><div class='add'>+	i += 40;</div><div class='add'>+	for (i = 0; i &lt; 5120; i += chunk * 2) {</div><div class='add'>+		if (space - off &lt; 32) {</div><div class='add'>+			off = -1;</div><div class='add'>+			goto done;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		code[off + 1] = __cpu_to_le16(0x8000 | mem);</div><div class='add'>+</div><div class='add'>+		chunk = 28;</div><div class='add'>+		if (mem + chunk &gt; 0x4000)</div><div class='add'>+			chunk = 0x4000 - mem;</div><div class='add'>+		if (i + 2 * chunk &gt; 5120)</div><div class='add'>+			chunk = (5120 - i) / 2;</div><div class='add'>+</div><div class='add'>+		if (chunk &lt; 28) {</div><div class='add'>+			code[off] = __cpu_to_le16(0x4000 | chunk);</div><div class='add'>+			code[off + 31] = __cpu_to_le16(addr);</div><div class='add'>+			if (mem + chunk == 0x4000) {</div><div class='add'>+				mem = 0x3e00;</div><div class='add'>+				++addr;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			code[off] = __cpu_to_le16(0x1000 | 28);</div><div class='add'>+			code[off + 31] = 0;</div><div class='add'>+			mem += 28;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		memcpy(&amp;code[off + 2], buf + i, chunk * 2);</div><div class='add'>+		off += 32;</div><div class='add'>+	}</div><div class='add'>+done:</div><div class='add'>+	kfree(buf);</div><div class='add'>+	return off;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vti_bitlen(struct go7007 *go)</div><div class='add'>+{</div><div class='add'>+	unsigned int i, max_time_incr = go-&gt;sensor_framerate / go-&gt;fps_scale;</div><div class='add'>+</div><div class='add'>+	for (i = 31; (max_time_incr &amp; ((1 &lt;&lt; i) - 1)) == max_time_incr; --i);</div><div class='add'>+	return i + 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mpeg4_frame_header(struct go7007 *go, unsigned char *buf,</div><div class='add'>+		int modulo, enum mpeg_frame_type frame)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	CODE_GEN(c, buf + 6);</div><div class='add'>+	int mb_count = (go-&gt;width &gt;&gt; 4) * (go-&gt;height &gt;&gt; 4);</div><div class='add'>+</div><div class='add'>+	CODE_ADD(c, frame == PFRAME ? 0x1 : 0x2, 2);</div><div class='add'>+	if (modulo)</div><div class='add'>+		CODE_ADD(c, 0x1, 1);</div><div class='add'>+	CODE_ADD(c, 0x1, 2);</div><div class='add'>+	CODE_ADD(c, 0, vti_bitlen(go));</div><div class='add'>+	CODE_ADD(c, 0x3, 2);</div><div class='add'>+	if (frame == PFRAME)</div><div class='add'>+		CODE_ADD(c, 0, 1);</div><div class='add'>+	CODE_ADD(c, 0xc, 11);</div><div class='add'>+	if (frame != PFRAME)</div><div class='add'>+		CODE_ADD(c, 0x4, 3);</div><div class='add'>+	if (frame != BFRAME_EMPTY) {</div><div class='add'>+		for (i = 0; i &lt; mb_count; ++i) {</div><div class='add'>+			switch (frame) {</div><div class='add'>+			case PFRAME:</div><div class='add'>+				CODE_ADD(c, 0x1, 1);</div><div class='add'>+				break;</div><div class='add'>+			case BFRAME_PRE:</div><div class='add'>+				CODE_ADD(c, 0x47, 8);</div><div class='add'>+				break;</div><div class='add'>+			case BFRAME_POST:</div><div class='add'>+				CODE_ADD(c, 0x27, 7);</div><div class='add'>+				break;</div><div class='add'>+			case BFRAME_BIDIR:</div><div class='add'>+				CODE_ADD(c, 0x5f, 8);</div><div class='add'>+				break;</div><div class='add'>+			case BFRAME_EMPTY: /* keep compiler quiet */</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Byte-align with a zero followed by ones */</div><div class='add'>+	i = 8 - (CODE_LENGTH(c) % 8);</div><div class='add'>+	CODE_ADD(c, 0, 1);</div><div class='add'>+	CODE_ADD(c, (1 &lt;&lt; (i - 1)) - 1, i - 1);</div><div class='add'>+</div><div class='add'>+	i = CODE_LENGTH(c) + 4 * 8;</div><div class='add'>+	buf[0] = i &amp; 0xff;</div><div class='add'>+	buf[1] = i &gt;&gt; 8;</div><div class='add'>+	buf[2] = 0x00;</div><div class='add'>+	buf[3] = 0x00;</div><div class='add'>+	buf[4] = 0x01;</div><div class='add'>+	buf[5] = 0xb6;</div><div class='add'>+	return i;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mpeg4_sequence_header(struct go7007 *go, unsigned char *buf, int ext)</div><div class='add'>+{</div><div class='add'>+	const unsigned char head[] = { 0x00, 0x00, 0x01, 0xb0, go-&gt;pali,</div><div class='add'>+		0x00, 0x00, 0x01, 0xb5, 0x09,</div><div class='add'>+		0x00, 0x00, 0x01, 0x00,</div><div class='add'>+		0x00, 0x00, 0x01, 0x20, };</div><div class='add'>+	int i, aspect_ratio;</div><div class='add'>+	int fps = go-&gt;sensor_framerate / go-&gt;fps_scale;</div><div class='add'>+	CODE_GEN(c, buf + 2 + sizeof(head));</div><div class='add'>+</div><div class='add'>+	switch (go-&gt;aspect_ratio) {</div><div class='add'>+	case GO7007_RATIO_4_3:</div><div class='add'>+		aspect_ratio = go-&gt;standard == GO7007_STD_NTSC ? 3 : 2;</div><div class='add'>+		break;</div><div class='add'>+	case GO7007_RATIO_16_9:</div><div class='add'>+		aspect_ratio = go-&gt;standard == GO7007_STD_NTSC ? 5 : 4;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		aspect_ratio = 1;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(buf + 2, head, sizeof(head));</div><div class='add'>+	CODE_ADD(c, 0x191, 17);</div><div class='add'>+	CODE_ADD(c, aspect_ratio, 4);</div><div class='add'>+	CODE_ADD(c, 0x1, 4);</div><div class='add'>+	CODE_ADD(c, fps, 16);</div><div class='add'>+	CODE_ADD(c, 0x3, 2);</div><div class='add'>+	CODE_ADD(c, 1001, vti_bitlen(go));</div><div class='add'>+	CODE_ADD(c, 1, 1);</div><div class='add'>+	CODE_ADD(c, go-&gt;width, 13);</div><div class='add'>+	CODE_ADD(c, 1, 1);</div><div class='add'>+	CODE_ADD(c, go-&gt;height, 13);</div><div class='add'>+	CODE_ADD(c, 0x2830, 14);</div><div class='add'>+</div><div class='add'>+	/* Byte-align */</div><div class='add'>+	i = 8 - (CODE_LENGTH(c) % 8);</div><div class='add'>+	CODE_ADD(c, 0, 1);</div><div class='add'>+	CODE_ADD(c, (1 &lt;&lt; (i - 1)) - 1, i - 1);</div><div class='add'>+</div><div class='add'>+	i = CODE_LENGTH(c) + sizeof(head) * 8;</div><div class='add'>+	buf[0] = i &amp; 0xff;</div><div class='add'>+	buf[1] = i &gt;&gt; 8;</div><div class='add'>+	return i;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gen_mpeg4hdr_to_package(struct go7007 *go,</div><div class='add'>+					u16 *code, int space, int *framelen)</div><div class='add'>+{</div><div class='add'>+	u8 *buf;</div><div class='add'>+	u16 mem = 0x3e00;</div><div class='add'>+	unsigned int addr = 0x19;</div><div class='add'>+	int i, off = 0, chunk;</div><div class='add'>+</div><div class='add'>+	buf = kmalloc(5120, GFP_KERNEL);</div><div class='add'>+	if (buf == NULL) {</div><div class='add'>+		printk(KERN_ERR "go7007: unable to allocate 5120 bytes for "</div><div class='add'>+				"firmware construction\n");</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+	memset(buf, 0, 5120);</div><div class='add'>+	framelen[0] = mpeg4_frame_header(go, buf, 0, PFRAME);</div><div class='add'>+	i = 368;</div><div class='add'>+	framelen[1] = mpeg4_frame_header(go, buf + i, 0, BFRAME_PRE);</div><div class='add'>+	i += 1632;</div><div class='add'>+	framelen[2] = mpeg4_frame_header(go, buf + i, 0, BFRAME_POST);</div><div class='add'>+	i += 1432;</div><div class='add'>+	framelen[3] = mpeg4_frame_header(go, buf + i, 0, BFRAME_BIDIR);</div><div class='add'>+	i += 1632;</div><div class='add'>+	mpeg4_frame_header(go, buf + i, 0, BFRAME_EMPTY);</div><div class='add'>+	i += 16;</div><div class='add'>+	mpeg4_sequence_header(go, buf + i, 0);</div><div class='add'>+	i += 40;</div><div class='add'>+	for (i = 0; i &lt; 5120; i += chunk * 2) {</div><div class='add'>+		if (space - off &lt; 32) {</div><div class='add'>+			off = -1;</div><div class='add'>+			goto done;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		code[off + 1] = __cpu_to_le16(0x8000 | mem);</div><div class='add'>+</div><div class='add'>+		chunk = 28;</div><div class='add'>+		if (mem + chunk &gt; 0x4000)</div><div class='add'>+			chunk = 0x4000 - mem;</div><div class='add'>+		if (i + 2 * chunk &gt; 5120)</div><div class='add'>+			chunk = (5120 - i) / 2;</div><div class='add'>+</div><div class='add'>+		if (chunk &lt; 28) {</div><div class='add'>+			code[off] = __cpu_to_le16(0x4000 | chunk);</div><div class='add'>+			code[off + 31] = __cpu_to_le16(addr);</div><div class='add'>+			if (mem + chunk == 0x4000) {</div><div class='add'>+				mem = 0x3e00;</div><div class='add'>+				++addr;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			code[off] = __cpu_to_le16(0x1000 | 28);</div><div class='add'>+			code[off + 31] = 0;</div><div class='add'>+			mem += 28;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		memcpy(&amp;code[off + 2], buf + i, chunk * 2);</div><div class='add'>+		off += 32;</div><div class='add'>+	}</div><div class='add'>+	mem = 0x3e00;</div><div class='add'>+	addr = go-&gt;ipb ? 0x14f9 : 0x0af9;</div><div class='add'>+	memset(buf, 0, 5120);</div><div class='add'>+	framelen[4] = mpeg4_frame_header(go, buf, 1, PFRAME);</div><div class='add'>+	i = 368;</div><div class='add'>+	framelen[5] = mpeg4_frame_header(go, buf + i, 1, BFRAME_PRE);</div><div class='add'>+	i += 1632;</div><div class='add'>+	framelen[6] = mpeg4_frame_header(go, buf + i, 1, BFRAME_POST);</div><div class='add'>+	i += 1432;</div><div class='add'>+	framelen[7] = mpeg4_frame_header(go, buf + i, 1, BFRAME_BIDIR);</div><div class='add'>+	i += 1632;</div><div class='add'>+	mpeg4_frame_header(go, buf + i, 1, BFRAME_EMPTY);</div><div class='add'>+	i += 16;</div><div class='add'>+	for (i = 0; i &lt; 5120; i += chunk * 2) {</div><div class='add'>+		if (space - off &lt; 32) {</div><div class='add'>+			off = -1;</div><div class='add'>+			goto done;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		code[off + 1] = __cpu_to_le16(0x8000 | mem);</div><div class='add'>+</div><div class='add'>+		chunk = 28;</div><div class='add'>+		if (mem + chunk &gt; 0x4000)</div><div class='add'>+			chunk = 0x4000 - mem;</div><div class='add'>+		if (i + 2 * chunk &gt; 5120)</div><div class='add'>+			chunk = (5120 - i) / 2;</div><div class='add'>+</div><div class='add'>+		if (chunk &lt; 28) {</div><div class='add'>+			code[off] = __cpu_to_le16(0x4000 | chunk);</div><div class='add'>+			code[off + 31] = __cpu_to_le16(addr);</div><div class='add'>+			if (mem + chunk == 0x4000) {</div><div class='add'>+				mem = 0x3e00;</div><div class='add'>+				++addr;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			code[off] = __cpu_to_le16(0x1000 | 28);</div><div class='add'>+			code[off + 31] = 0;</div><div class='add'>+			mem += 28;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		memcpy(&amp;code[off + 2], buf + i, chunk * 2);</div><div class='add'>+		off += 32;</div><div class='add'>+	}</div><div class='add'>+done:</div><div class='add'>+	kfree(buf);</div><div class='add'>+	return off;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int brctrl_to_package(struct go7007 *go,</div><div class='add'>+					u16 *code, int space, int *framelen)</div><div class='add'>+{</div><div class='add'>+	int converge_speed = 0;</div><div class='add'>+	int lambda = (go-&gt;format == GO7007_FORMAT_MJPEG || go-&gt;dvd_mode) ?</div><div class='add'>+				100 : 0;</div><div class='add'>+	int peak_rate = 6 * go-&gt;bitrate / 5;</div><div class='add'>+	int vbv_buffer = go-&gt;format == GO7007_FORMAT_MJPEG ?</div><div class='add'>+				go-&gt;bitrate :</div><div class='add'>+				(go-&gt;dvd_mode ? 900000 : peak_rate);</div><div class='add'>+	int fps = go-&gt;sensor_framerate / go-&gt;fps_scale;</div><div class='add'>+	int q = 0;</div><div class='add'>+	/* Bizarre math below depends on rounding errors in division */</div><div class='add'>+	u32 sgop_expt_addr = go-&gt;bitrate / 32 * (go-&gt;ipb ? 3 : 1) * 1001 / fps;</div><div class='add'>+	u32 sgop_peak_addr = peak_rate / 32 * 1001 / fps;</div><div class='add'>+	u32 total_expt_addr = go-&gt;bitrate / 32 * 1000 / fps * (fps / 1000);</div><div class='add'>+	u32 vbv_alert_addr = vbv_buffer * 3 / (4 * 32);</div><div class='add'>+	u32 cplx[] = {</div><div class='add'>+		q &gt; 0 ? sgop_expt_addr * q :</div><div class='add'>+			2 * go-&gt;width * go-&gt;height * (go-&gt;ipb ? 6 : 4) / 32,</div><div class='add'>+		q &gt; 0 ? sgop_expt_addr * q :</div><div class='add'>+			2 * go-&gt;width * go-&gt;height * (go-&gt;ipb ? 6 : 4) / 32,</div><div class='add'>+		q &gt; 0 ? sgop_expt_addr * q :</div><div class='add'>+			2 * go-&gt;width * go-&gt;height * (go-&gt;ipb ? 6 : 4) / 32,</div><div class='add'>+		q &gt; 0 ? sgop_expt_addr * q :</div><div class='add'>+			2 * go-&gt;width * go-&gt;height * (go-&gt;ipb ? 6 : 4) / 32,</div><div class='add'>+	};</div><div class='add'>+	u32 calc_q = q &gt; 0 ? q : cplx[0] / sgop_expt_addr;</div><div class='add'>+	u16 pack[] = {</div><div class='add'>+		0x200e,		0x0000,</div><div class='add'>+		0xBF20,		go-&gt;ipb ? converge_speed_ipb[converge_speed]</div><div class='add'>+					: converge_speed_ip[converge_speed],</div><div class='add'>+		0xBF21,		go-&gt;ipb ? 2 : 0,</div><div class='add'>+		0xBF22,		go-&gt;ipb ? LAMBDA_table[0][lambda / 2 + 50]</div><div class='add'>+					: 32767,</div><div class='add'>+		0xBF23,		go-&gt;ipb ? LAMBDA_table[1][lambda] : 32767,</div><div class='add'>+		0xBF24,		32767,</div><div class='add'>+		0xBF25,		lambda &gt; 99 ? 32767 : LAMBDA_table[3][lambda],</div><div class='add'>+		0xBF26,		sgop_expt_addr &amp; 0x0000FFFF,</div><div class='add'>+		0xBF27,		sgop_expt_addr &gt;&gt; 16,</div><div class='add'>+		0xBF28,		sgop_peak_addr &amp; 0x0000FFFF,</div><div class='add'>+		0xBF29,		sgop_peak_addr &gt;&gt; 16,</div><div class='add'>+		0xBF2A,		vbv_alert_addr &amp; 0x0000FFFF,</div><div class='add'>+		0xBF2B,		vbv_alert_addr &gt;&gt; 16,</div><div class='add'>+		0xBF2C,		0,</div><div class='add'>+		0xBF2D,		0,</div><div class='add'>+		0,		0,</div><div class='add'>+</div><div class='add'>+		0x200e,		0x0000,</div><div class='add'>+		0xBF2E,		vbv_alert_addr &amp; 0x0000FFFF,</div><div class='add'>+		0xBF2F,		vbv_alert_addr &gt;&gt; 16,</div><div class='add'>+		0xBF30,		cplx[0] &amp; 0x0000FFFF,</div><div class='add'>+		0xBF31,		cplx[0] &gt;&gt; 16,</div><div class='add'>+		0xBF32,		cplx[1] &amp; 0x0000FFFF,</div><div class='add'>+		0xBF33,		cplx[1] &gt;&gt; 16,</div><div class='add'>+		0xBF34,		cplx[2] &amp; 0x0000FFFF,</div><div class='add'>+		0xBF35,		cplx[2] &gt;&gt; 16,</div><div class='add'>+		0xBF36,		cplx[3] &amp; 0x0000FFFF,</div><div class='add'>+		0xBF37,		cplx[3] &gt;&gt; 16,</div><div class='add'>+		0xBF38,		0,</div><div class='add'>+		0xBF39,		0,</div><div class='add'>+		0xBF3A,		total_expt_addr &amp; 0x0000FFFF,</div><div class='add'>+		0xBF3B,		total_expt_addr &gt;&gt; 16,</div><div class='add'>+		0,		0,</div><div class='add'>+</div><div class='add'>+		0x200e,		0x0000,</div><div class='add'>+		0xBF3C,		total_expt_addr &amp; 0x0000FFFF,</div><div class='add'>+		0xBF3D,		total_expt_addr &gt;&gt; 16,</div><div class='add'>+		0xBF3E,		0,</div><div class='add'>+		0xBF3F,		0,</div><div class='add'>+		0xBF48,		0,</div><div class='add'>+		0xBF49,		0,</div><div class='add'>+		0xBF4A,		calc_q &lt; 4 ? 4 : (calc_q &gt; 124 ? 124 : calc_q),</div><div class='add'>+		0xBF4B,		4,</div><div class='add'>+		0xBF4C,		0,</div><div class='add'>+		0xBF4D,		0,</div><div class='add'>+		0xBF4E,		0,</div><div class='add'>+		0xBF4F,		0,</div><div class='add'>+		0xBF50,		0,</div><div class='add'>+		0xBF51,		0,</div><div class='add'>+		0,		0,</div><div class='add'>+</div><div class='add'>+		0x200e,		0x0000,</div><div class='add'>+		0xBF40,		sgop_expt_addr &amp; 0x0000FFFF,</div><div class='add'>+		0xBF41,		sgop_expt_addr &gt;&gt; 16,</div><div class='add'>+		0xBF42,		0,</div><div class='add'>+		0xBF43,		0,</div><div class='add'>+		0xBF44,		0,</div><div class='add'>+		0xBF45,		0,</div><div class='add'>+		0xBF46,		(go-&gt;width &gt;&gt; 4) * (go-&gt;height &gt;&gt; 4),</div><div class='add'>+		0xBF47,		0,</div><div class='add'>+		0xBF64,		0,</div><div class='add'>+		0xBF65,		0,</div><div class='add'>+		0xBF18,		framelen[4],</div><div class='add'>+		0xBF19,		framelen[5],</div><div class='add'>+		0xBF1A,		framelen[6],</div><div class='add'>+		0xBF1B,		framelen[7],</div><div class='add'>+		0,		0,</div><div class='add'>+</div><div class='add'>+#if 0 /* Remove once we don't care about matching */</div><div class='add'>+		0x200e,		0x0000,</div><div class='add'>+		0xBF56,		4,</div><div class='add'>+		0xBF57,		0,</div><div class='add'>+		0xBF58,		5,</div><div class='add'>+		0xBF59,		0,</div><div class='add'>+		0xBF5A,		6,</div><div class='add'>+		0xBF5B,		0,</div><div class='add'>+		0xBF5C,		8,</div><div class='add'>+		0xBF5D,		0,</div><div class='add'>+		0xBF5E,		1,</div><div class='add'>+		0xBF5F,		0,</div><div class='add'>+		0xBF60,		1,</div><div class='add'>+		0xBF61,		0,</div><div class='add'>+		0xBF62,		0,</div><div class='add'>+		0xBF63,		0,</div><div class='add'>+		0,		0,</div><div class='add'>+#else</div><div class='add'>+		0x2008,		0x0000,</div><div class='add'>+		0xBF56,		4,</div><div class='add'>+		0xBF57,		0,</div><div class='add'>+		0xBF58,		5,</div><div class='add'>+		0xBF59,		0,</div><div class='add'>+		0xBF5A,		6,</div><div class='add'>+		0xBF5B,		0,</div><div class='add'>+		0xBF5C,		8,</div><div class='add'>+		0xBF5D,		0,</div><div class='add'>+		0,		0,</div><div class='add'>+		0,		0,</div><div class='add'>+		0,		0,</div><div class='add'>+		0,		0,</div><div class='add'>+		0,		0,</div><div class='add'>+		0,		0,</div><div class='add'>+		0,		0,</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+		0x200e,		0x0000,</div><div class='add'>+		0xBF10,		0,</div><div class='add'>+		0xBF11,		0,</div><div class='add'>+		0xBF12,		0,</div><div class='add'>+		0xBF13,		0,</div><div class='add'>+		0xBF14,		0,</div><div class='add'>+		0xBF15,		0,</div><div class='add'>+		0xBF16,		0,</div><div class='add'>+		0xBF17,		0,</div><div class='add'>+		0xBF7E,		0,</div><div class='add'>+		0xBF7F,		1,</div><div class='add'>+		0xBF52,		framelen[0],</div><div class='add'>+		0xBF53,		framelen[1],</div><div class='add'>+		0xBF54,		framelen[2],</div><div class='add'>+		0xBF55,		framelen[3],</div><div class='add'>+		0,		0,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return copy_packages(code, pack, 6, space);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int config_package(struct go7007 *go, u16 *code, int space)</div><div class='add'>+{</div><div class='add'>+	int fps = go-&gt;sensor_framerate / go-&gt;fps_scale / 1000;</div><div class='add'>+	int rows = go-&gt;interlace_coding ? go-&gt;height / 32 : go-&gt;height / 16;</div><div class='add'>+	int brc_window_size = fps;</div><div class='add'>+	int q_min = 2, q_max = 31;</div><div class='add'>+	int THACCoeffSet0 = 0;</div><div class='add'>+	u16 pack[] = {</div><div class='add'>+		0x200e,		0x0000,</div><div class='add'>+		0xc002,		0x14b4,</div><div class='add'>+		0xc003,		0x28b4,</div><div class='add'>+		0xc004,		0x3c5a,</div><div class='add'>+		0xdc05,		0x2a77,</div><div class='add'>+		0xc6c3,		go-&gt;format == GO7007_FORMAT_MPEG4 ? 0 :</div><div class='add'>+				(go-&gt;format == GO7007_FORMAT_H263 ? 0 : 1),</div><div class='add'>+		0xc680,		go-&gt;format == GO7007_FORMAT_MPEG4 ? 0xf1 :</div><div class='add'>+				(go-&gt;format == GO7007_FORMAT_H263 ? 0x61 :</div><div class='add'>+									0xd3),</div><div class='add'>+		0xc780,		0x0140,</div><div class='add'>+		0xe009,		0x0001,</div><div class='add'>+		0xc60f,		0x0008,</div><div class='add'>+		0xd4ff,		0x0002,</div><div class='add'>+		0xe403,		2340,</div><div class='add'>+		0xe406,		75,</div><div class='add'>+		0xd411,		0x0001,</div><div class='add'>+		0xd410,		0xa1d6,</div><div class='add'>+		0x0001,		0x2801,</div><div class='add'>+</div><div class='add'>+		0x200d,		0x0000,</div><div class='add'>+		0xe402,		0x018b,</div><div class='add'>+		0xe401,		0x8b01,</div><div class='add'>+		0xd472,		(go-&gt;board_info-&gt;sensor_flags &amp;</div><div class='add'>+							GO7007_SENSOR_TV) &amp;&amp;</div><div class='add'>+						(!go-&gt;interlace_coding) ?</div><div class='add'>+					0x01b0 : 0x0170,</div><div class='add'>+		0xd475,		(go-&gt;board_info-&gt;sensor_flags &amp;</div><div class='add'>+							GO7007_SENSOR_TV) &amp;&amp;</div><div class='add'>+						(!go-&gt;interlace_coding) ?</div><div class='add'>+					0x0008 : 0x0009,</div><div class='add'>+		0xc404,		go-&gt;interlace_coding ? 0x44 :</div><div class='add'>+				(go-&gt;format == GO7007_FORMAT_MPEG4 ? 0x11 :</div><div class='add'>+				(go-&gt;format == GO7007_FORMAT_MPEG1 ? 0x02 :</div><div class='add'>+				(go-&gt;format == GO7007_FORMAT_MPEG2 ? 0x04 :</div><div class='add'>+				(go-&gt;format == GO7007_FORMAT_H263  ? 0x08 :</div><div class='add'>+								     0x20)))),</div><div class='add'>+		0xbf0a,		(go-&gt;format == GO7007_FORMAT_MPEG4 ? 8 :</div><div class='add'>+				(go-&gt;format == GO7007_FORMAT_MPEG1 ? 1 :</div><div class='add'>+				(go-&gt;format == GO7007_FORMAT_MPEG2 ? 2 :</div><div class='add'>+				(go-&gt;format == GO7007_FORMAT_H263 ? 4 : 16)))) |</div><div class='add'>+				((go-&gt;repeat_seqhead ? 1 : 0) &lt;&lt; 6) |</div><div class='add'>+				((go-&gt;dvd_mode ? 1 : 0) &lt;&lt; 9) |</div><div class='add'>+				((go-&gt;gop_header_enable ? 1 : 0) &lt;&lt; 10),</div><div class='add'>+		0xbf0b,		0,</div><div class='add'>+		0xdd5a,		go-&gt;ipb ? 0x14 : 0x0a,</div><div class='add'>+		0xbf0c,		0,</div><div class='add'>+		0xbf0d,		0,</div><div class='add'>+		0xc683,		THACCoeffSet0,</div><div class='add'>+		0xc40a,		(go-&gt;width &lt;&lt; 4) | rows,</div><div class='add'>+		0xe01a,		go-&gt;board_info-&gt;hpi_buffer_cap,</div><div class='add'>+		0,		0,</div><div class='add'>+		0,		0,</div><div class='add'>+</div><div class='add'>+		0x2008,		0,</div><div class='add'>+		0xe402,		0x88,</div><div class='add'>+		0xe401,		0x8f01,</div><div class='add'>+		0xbf6a,		0,</div><div class='add'>+		0xbf6b,		0,</div><div class='add'>+		0xbf6c,		0,</div><div class='add'>+		0xbf6d,		0,</div><div class='add'>+		0xbf6e,		0,</div><div class='add'>+		0xbf6f,		0,</div><div class='add'>+		0,		0,</div><div class='add'>+		0,		0,</div><div class='add'>+		0,		0,</div><div class='add'>+		0,		0,</div><div class='add'>+		0,		0,</div><div class='add'>+		0,		0,</div><div class='add'>+		0,		0,</div><div class='add'>+</div><div class='add'>+		0x200e,		0,</div><div class='add'>+		0xbf66,		brc_window_size,</div><div class='add'>+		0xbf67,		0,</div><div class='add'>+		0xbf68,		q_min,</div><div class='add'>+		0xbf69,		q_max,</div><div class='add'>+		0xbfe0,		0,</div><div class='add'>+		0xbfe1,		0,</div><div class='add'>+		0xbfe2,		0,</div><div class='add'>+		0xbfe3,		go-&gt;ipb ? 3 : 1,</div><div class='add'>+		0xc031,		go-&gt;board_info-&gt;sensor_flags &amp;</div><div class='add'>+					GO7007_SENSOR_VBI ? 1 : 0,</div><div class='add'>+		0xc01c,		0x1f,</div><div class='add'>+		0xdd8c,		0x15,</div><div class='add'>+		0xdd94,		0x15,</div><div class='add'>+		0xdd88,		go-&gt;ipb ? 0x1401 : 0x0a01,</div><div class='add'>+		0xdd90,		go-&gt;ipb ? 0x1401 : 0x0a01,</div><div class='add'>+		0,		0,</div><div class='add'>+</div><div class='add'>+		0x200e,		0,</div><div class='add'>+		0xbfe4,		0,</div><div class='add'>+		0xbfe5,		0,</div><div class='add'>+		0xbfe6,		0,</div><div class='add'>+		0xbfe7,		fps &lt;&lt; 8,</div><div class='add'>+		0xbfe8,		0x3a00,</div><div class='add'>+		0xbfe9,		0,</div><div class='add'>+		0xbfea,		0,</div><div class='add'>+		0xbfeb,		0,</div><div class='add'>+		0xbfec,		(go-&gt;interlace_coding ? 1 &lt;&lt; 15 : 0) |</div><div class='add'>+					(go-&gt;modet_enable ? 0xa : 0) |</div><div class='add'>+					(go-&gt;board_info-&gt;sensor_flags &amp;</div><div class='add'>+						GO7007_SENSOR_VBI ? 1 : 0),</div><div class='add'>+		0xbfed,		0,</div><div class='add'>+		0xbfee,		0,</div><div class='add'>+		0xbfef,		0,</div><div class='add'>+		0xbff0,		go-&gt;board_info-&gt;sensor_flags &amp;</div><div class='add'>+					GO7007_SENSOR_TV ? 0xf060 : 0xb060,</div><div class='add'>+		0xbff1,		0,</div><div class='add'>+		0,		0,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return copy_packages(code, pack, 5, space);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int seqhead_to_package(struct go7007 *go, u16 *code, int space,</div><div class='add'>+	int (*sequence_header_func)(struct go7007 *go,</div><div class='add'>+		unsigned char *buf, int ext))</div><div class='add'>+{</div><div class='add'>+	int vop_time_increment_bitlength = vti_bitlen(go);</div><div class='add'>+	int fps = go-&gt;sensor_framerate / go-&gt;fps_scale *</div><div class='add'>+					(go-&gt;interlace_coding ? 2 : 1);</div><div class='add'>+	unsigned char buf[40] = { };</div><div class='add'>+	int len = sequence_header_func(go, buf, 1);</div><div class='add'>+	u16 pack[] = {</div><div class='add'>+		0x2006,		0,</div><div class='add'>+		0xbf08,		fps,</div><div class='add'>+		0xbf09,		0,</div><div class='add'>+		0xbff2,		vop_time_increment_bitlength,</div><div class='add'>+		0xbff3,		(1 &lt;&lt; vop_time_increment_bitlength) - 1,</div><div class='add'>+		0xbfe6,		0,</div><div class='add'>+		0xbfe7,		(fps / 1000) &lt;&lt; 8,</div><div class='add'>+		0,		0,</div><div class='add'>+		0,		0,</div><div class='add'>+		0,		0,</div><div class='add'>+		0,		0,</div><div class='add'>+		0,		0,</div><div class='add'>+		0,		0,</div><div class='add'>+		0,		0,</div><div class='add'>+		0,		0,</div><div class='add'>+		0,		0,</div><div class='add'>+</div><div class='add'>+		0x2007,		0,</div><div class='add'>+		0xc800,		buf[2] &lt;&lt; 8 | buf[3],</div><div class='add'>+		0xc801,		buf[4] &lt;&lt; 8 | buf[5],</div><div class='add'>+		0xc802,		buf[6] &lt;&lt; 8 | buf[7],</div><div class='add'>+		0xc803,		buf[8] &lt;&lt; 8 | buf[9],</div><div class='add'>+		0xc406,		64,</div><div class='add'>+		0xc407,		len - 64,</div><div class='add'>+		0xc61b,		1,</div><div class='add'>+		0,		0,</div><div class='add'>+		0,		0,</div><div class='add'>+		0,		0,</div><div class='add'>+		0,		0,</div><div class='add'>+		0,		0,</div><div class='add'>+		0,		0,</div><div class='add'>+		0,		0,</div><div class='add'>+		0,		0,</div><div class='add'>+</div><div class='add'>+		0x200e,		0,</div><div class='add'>+		0xc808,		buf[10] &lt;&lt; 8 | buf[11],</div><div class='add'>+		0xc809,		buf[12] &lt;&lt; 8 | buf[13],</div><div class='add'>+		0xc80a,		buf[14] &lt;&lt; 8 | buf[15],</div><div class='add'>+		0xc80b,		buf[16] &lt;&lt; 8 | buf[17],</div><div class='add'>+		0xc80c,		buf[18] &lt;&lt; 8 | buf[19],</div><div class='add'>+		0xc80d,		buf[20] &lt;&lt; 8 | buf[21],</div><div class='add'>+		0xc80e,		buf[22] &lt;&lt; 8 | buf[23],</div><div class='add'>+		0xc80f,		buf[24] &lt;&lt; 8 | buf[25],</div><div class='add'>+		0xc810,		buf[26] &lt;&lt; 8 | buf[27],</div><div class='add'>+		0xc811,		buf[28] &lt;&lt; 8 | buf[29],</div><div class='add'>+		0xc812,		buf[30] &lt;&lt; 8 | buf[31],</div><div class='add'>+		0xc813,		buf[32] &lt;&lt; 8 | buf[33],</div><div class='add'>+		0xc814,		buf[34] &lt;&lt; 8 | buf[35],</div><div class='add'>+		0xc815,		buf[36] &lt;&lt; 8 | buf[37],</div><div class='add'>+		0,		0,</div><div class='add'>+		0,		0,</div><div class='add'>+		0,		0,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return copy_packages(code, pack, 3, space);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int relative_prime(int big, int little)</div><div class='add'>+{</div><div class='add'>+	int remainder;</div><div class='add'>+</div><div class='add'>+	while (little != 0) {</div><div class='add'>+		remainder = big % little;</div><div class='add'>+		big = little;</div><div class='add'>+		little = remainder;</div><div class='add'>+	}</div><div class='add'>+	return big;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int avsync_to_package(struct go7007 *go, u16 *code, int space)</div><div class='add'>+{</div><div class='add'>+	int arate = go-&gt;board_info-&gt;audio_rate * 1001 * go-&gt;fps_scale;</div><div class='add'>+	int ratio = arate / go-&gt;sensor_framerate;</div><div class='add'>+	int adjratio = ratio * 215 / 100;</div><div class='add'>+	int rprime = relative_prime(go-&gt;sensor_framerate,</div><div class='add'>+					arate % go-&gt;sensor_framerate);</div><div class='add'>+	int f1 = (arate % go-&gt;sensor_framerate) / rprime;</div><div class='add'>+	int f2 = (go-&gt;sensor_framerate - arate % go-&gt;sensor_framerate) / rprime;</div><div class='add'>+	u16 pack[] = {</div><div class='add'>+		0x200e,		0,</div><div class='add'>+		0xbf98,		(u16)((-adjratio) &amp; 0xffff),</div><div class='add'>+		0xbf99,		(u16)((-adjratio) &gt;&gt; 16),</div><div class='add'>+		0xbf92,		0,</div><div class='add'>+		0xbf93,		0,</div><div class='add'>+		0xbff4,		f1 &gt; f2 ? f1 : f2,</div><div class='add'>+		0xbff5,		f1 &lt; f2 ? f1 : f2,</div><div class='add'>+		0xbff6,		f1 &lt; f2 ? ratio : ratio + 1,</div><div class='add'>+		0xbff7,		f1 &gt; f2 ? ratio : ratio + 1,</div><div class='add'>+		0xbff8,		0,</div><div class='add'>+		0xbff9,		0,</div><div class='add'>+		0xbffa,		adjratio &amp; 0xffff,</div><div class='add'>+		0xbffb,		adjratio &gt;&gt; 16,</div><div class='add'>+		0xbf94,		0,</div><div class='add'>+		0xbf95,		0,</div><div class='add'>+		0,		0,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return copy_packages(code, pack, 1, space);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int final_package(struct go7007 *go, u16 *code, int space)</div><div class='add'>+{</div><div class='add'>+	int rows = go-&gt;interlace_coding ? go-&gt;height / 32 : go-&gt;height / 16;</div><div class='add'>+	u16 pack[] = {</div><div class='add'>+		0x8000,</div><div class='add'>+		0,</div><div class='add'>+		0,</div><div class='add'>+		0,</div><div class='add'>+		0,</div><div class='add'>+		0,</div><div class='add'>+		0,</div><div class='add'>+		2,</div><div class='add'>+		((go-&gt;board_info-&gt;sensor_flags &amp; GO7007_SENSOR_TV) &amp;&amp;</div><div class='add'>+						(!go-&gt;interlace_coding) ?</div><div class='add'>+					(1 &lt;&lt; 14) | (1 &lt;&lt; 9) : 0) |</div><div class='add'>+			((go-&gt;encoder_subsample ? 1 : 0) &lt;&lt; 8) |</div><div class='add'>+			(go-&gt;board_info-&gt;sensor_flags &amp;</div><div class='add'>+				GO7007_SENSOR_CONFIG_MASK),</div><div class='add'>+		((go-&gt;encoder_v_halve ? 1 : 0) &lt;&lt; 14) |</div><div class='add'>+			(go-&gt;encoder_v_halve ? rows &lt;&lt; 9 : rows &lt;&lt; 8) |</div><div class='add'>+			(go-&gt;encoder_h_halve ? 1 &lt;&lt; 6 : 0) |</div><div class='add'>+			(go-&gt;encoder_h_halve ? go-&gt;width &gt;&gt; 3 : go-&gt;width &gt;&gt; 4),</div><div class='add'>+		(1 &lt;&lt; 15) | (go-&gt;encoder_v_offset &lt;&lt; 6) |</div><div class='add'>+			(1 &lt;&lt; 7) | (go-&gt;encoder_h_offset &gt;&gt; 2),</div><div class='add'>+		(1 &lt;&lt; 6),</div><div class='add'>+		0,</div><div class='add'>+		0,</div><div class='add'>+		((go-&gt;fps_scale - 1) &lt;&lt; 8) |</div><div class='add'>+			(go-&gt;board_info-&gt;sensor_flags &amp; GO7007_SENSOR_TV ?</div><div class='add'>+						(1 &lt;&lt; 7) : 0) |</div><div class='add'>+			0x41,</div><div class='add'>+		go-&gt;ipb ? 0xd4c : 0x36b,</div><div class='add'>+		(rows &lt;&lt; 8) | (go-&gt;width &gt;&gt; 4),</div><div class='add'>+		go-&gt;format == GO7007_FORMAT_MPEG4 ? 0x0404 : 0,</div><div class='add'>+		(1 &lt;&lt; 15) | ((go-&gt;interlace_coding ? 1 : 0) &lt;&lt; 13) |</div><div class='add'>+			((go-&gt;closed_gop ? 1 : 0) &lt;&lt; 12) |</div><div class='add'>+			((go-&gt;format == GO7007_FORMAT_MPEG4 ? 1 : 0) &lt;&lt; 11) |</div><div class='add'>+		/*	(1 &lt;&lt; 9) |   */</div><div class='add'>+			((go-&gt;ipb ? 3 : 0) &lt;&lt; 7) |</div><div class='add'>+			((go-&gt;modet_enable ? 1 : 0) &lt;&lt; 2) |</div><div class='add'>+			((go-&gt;dvd_mode ? 1 : 0) &lt;&lt; 1) | 1,</div><div class='add'>+		(go-&gt;format == GO7007_FORMAT_MPEG1 ? 0x89a0 :</div><div class='add'>+			(go-&gt;format == GO7007_FORMAT_MPEG2 ? 0x89a0 :</div><div class='add'>+			(go-&gt;format == GO7007_FORMAT_MJPEG ? 0x89a0 :</div><div class='add'>+			(go-&gt;format == GO7007_FORMAT_MPEG4 ? 0x8920 :</div><div class='add'>+			(go-&gt;format == GO7007_FORMAT_H263 ? 0x8920 : 0))))),</div><div class='add'>+		go-&gt;ipb ? 0x1f15 : 0x1f0b,</div><div class='add'>+		go-&gt;ipb ? 0x0015 : 0x000b,</div><div class='add'>+		go-&gt;ipb ? 0xa800 : 0x5800,</div><div class='add'>+		0xffff,</div><div class='add'>+		0x0020 + 0x034b * 0,</div><div class='add'>+		0x0020 + 0x034b * 1,</div><div class='add'>+		0x0020 + 0x034b * 2,</div><div class='add'>+		0x0020 + 0x034b * 3,</div><div class='add'>+		0x0020 + 0x034b * 4,</div><div class='add'>+		0x0020 + 0x034b * 5,</div><div class='add'>+		go-&gt;ipb ? (go-&gt;gop_size / 3) : go-&gt;gop_size,</div><div class='add'>+		(go-&gt;height &gt;&gt; 4) * (go-&gt;width &gt;&gt; 4) * 110 / 100,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return copy_packages(code, pack, 1, space);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int audio_to_package(struct go7007 *go, u16 *code, int space)</div><div class='add'>+{</div><div class='add'>+	int clock_config = ((go-&gt;board_info-&gt;audio_flags &amp;</div><div class='add'>+				GO7007_AUDIO_I2S_MASTER ? 1 : 0) &lt;&lt; 11) |</div><div class='add'>+			((go-&gt;board_info-&gt;audio_flags &amp;</div><div class='add'>+				GO7007_AUDIO_OKI_MODE ? 1 : 0) &lt;&lt; 8) |</div><div class='add'>+			(((go-&gt;board_info-&gt;audio_bclk_div / 4) - 1) &lt;&lt; 4) |</div><div class='add'>+			(go-&gt;board_info-&gt;audio_main_div - 1);</div><div class='add'>+	u16 pack[] = {</div><div class='add'>+		0x200d,		0,</div><div class='add'>+		0x9002,		0,</div><div class='add'>+		0x9002,		0,</div><div class='add'>+		0x9031,		0,</div><div class='add'>+		0x9032,		0,</div><div class='add'>+		0x9033,		0,</div><div class='add'>+		0x9034,		0,</div><div class='add'>+		0x9035,		0,</div><div class='add'>+		0x9036,		0,</div><div class='add'>+		0x9037,		0,</div><div class='add'>+		0x9040,		0,</div><div class='add'>+		0x9000,		clock_config,</div><div class='add'>+		0x9001,		(go-&gt;board_info-&gt;audio_flags &amp; 0xffff) |</div><div class='add'>+					(1 &lt;&lt; 9),</div><div class='add'>+		0x9000,		((go-&gt;board_info-&gt;audio_flags &amp;</div><div class='add'>+						GO7007_AUDIO_I2S_MASTER ?</div><div class='add'>+						1 : 0) &lt;&lt; 10) |</div><div class='add'>+					clock_config,</div><div class='add'>+		0,		0,</div><div class='add'>+		0,		0,</div><div class='add'>+		0x2005,		0,</div><div class='add'>+		0x9041,		0,</div><div class='add'>+		0x9042,		256,</div><div class='add'>+		0x9043,		0,</div><div class='add'>+		0x9044,		16,</div><div class='add'>+		0x9045,		16,</div><div class='add'>+		0,		0,</div><div class='add'>+		0,		0,</div><div class='add'>+		0,		0,</div><div class='add'>+		0,		0,</div><div class='add'>+		0,		0,</div><div class='add'>+		0,		0,</div><div class='add'>+		0,		0,</div><div class='add'>+		0,		0,</div><div class='add'>+		0,		0,</div><div class='add'>+		0,		0,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return copy_packages(code, pack, 2, space);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int modet_to_package(struct go7007 *go, u16 *code, int space)</div><div class='add'>+{</div><div class='add'>+	int ret, mb, i, addr, cnt = 0;</div><div class='add'>+	u16 pack[32];</div><div class='add'>+	u16 thresholds[] = {</div><div class='add'>+		0x200e,		0,</div><div class='add'>+		0xbf82,		go-&gt;modet[0].pixel_threshold,</div><div class='add'>+		0xbf83,		go-&gt;modet[1].pixel_threshold,</div><div class='add'>+		0xbf84,		go-&gt;modet[2].pixel_threshold,</div><div class='add'>+		0xbf85,		go-&gt;modet[3].pixel_threshold,</div><div class='add'>+		0xbf86,		go-&gt;modet[0].motion_threshold,</div><div class='add'>+		0xbf87,		go-&gt;modet[1].motion_threshold,</div><div class='add'>+		0xbf88,		go-&gt;modet[2].motion_threshold,</div><div class='add'>+		0xbf89,		go-&gt;modet[3].motion_threshold,</div><div class='add'>+		0xbf8a,		go-&gt;modet[0].mb_threshold,</div><div class='add'>+		0xbf8b,		go-&gt;modet[1].mb_threshold,</div><div class='add'>+		0xbf8c,		go-&gt;modet[2].mb_threshold,</div><div class='add'>+		0xbf8d,		go-&gt;modet[3].mb_threshold,</div><div class='add'>+		0xbf8e,		0,</div><div class='add'>+		0xbf8f,		0,</div><div class='add'>+		0,		0,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ret = copy_packages(code, thresholds, 1, space);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return -1;</div><div class='add'>+	cnt += ret;</div><div class='add'>+</div><div class='add'>+	addr = 0xbac0;</div><div class='add'>+	memset(pack, 0, 64);</div><div class='add'>+	i = 0;</div><div class='add'>+	for (mb = 0; mb &lt; 1624; ++mb) {</div><div class='add'>+		pack[i * 2 + 3] &lt;&lt;= 2;</div><div class='add'>+		pack[i * 2 + 3] |= go-&gt;modet_map[mb];</div><div class='add'>+		if (mb % 8 != 7)</div><div class='add'>+			continue;</div><div class='add'>+		pack[i * 2 + 2] = addr++;</div><div class='add'>+		++i;</div><div class='add'>+		if (i == 10 || mb == 1623) {</div><div class='add'>+			pack[0] = 0x2000 | i;</div><div class='add'>+			ret = copy_packages(code + cnt, pack, 1, space - cnt);</div><div class='add'>+			if (ret &lt; 0)</div><div class='add'>+				return -1;</div><div class='add'>+			cnt += ret;</div><div class='add'>+			i = 0;</div><div class='add'>+			memset(pack, 0, 64);</div><div class='add'>+		}</div><div class='add'>+		pack[i * 2 + 3] = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(pack, 0, 64);</div><div class='add'>+	i = 0;</div><div class='add'>+	for (addr = 0xbb90; addr &lt; 0xbbfa; ++addr) {</div><div class='add'>+		pack[i * 2 + 2] = addr;</div><div class='add'>+		pack[i * 2 + 3] = 0;</div><div class='add'>+		++i;</div><div class='add'>+		if (i == 10 || addr == 0xbbf9) {</div><div class='add'>+			pack[0] = 0x2000 | i;</div><div class='add'>+			ret = copy_packages(code + cnt, pack, 1, space - cnt);</div><div class='add'>+			if (ret &lt; 0)</div><div class='add'>+				return -1;</div><div class='add'>+			cnt += ret;</div><div class='add'>+			i = 0;</div><div class='add'>+			memset(pack, 0, 64);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return cnt;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int do_special(struct go7007 *go, u16 type, u16 *code, int space,</div><div class='add'>+			int *framelen)</div><div class='add'>+{</div><div class='add'>+	switch (type) {</div><div class='add'>+	case SPECIAL_FRM_HEAD:</div><div class='add'>+		switch (go-&gt;format) {</div><div class='add'>+		case GO7007_FORMAT_MJPEG:</div><div class='add'>+			return gen_mjpeghdr_to_package(go, code, space);</div><div class='add'>+		case GO7007_FORMAT_MPEG1:</div><div class='add'>+		case GO7007_FORMAT_MPEG2:</div><div class='add'>+			return gen_mpeg1hdr_to_package(go, code, space,</div><div class='add'>+								framelen);</div><div class='add'>+		case GO7007_FORMAT_MPEG4:</div><div class='add'>+			return gen_mpeg4hdr_to_package(go, code, space,</div><div class='add'>+								framelen);</div><div class='add'>+		}</div><div class='add'>+	case SPECIAL_BRC_CTRL:</div><div class='add'>+		return brctrl_to_package(go, code, space, framelen);</div><div class='add'>+	case SPECIAL_CONFIG:</div><div class='add'>+		return config_package(go, code, space);</div><div class='add'>+	case SPECIAL_SEQHEAD:</div><div class='add'>+		switch (go-&gt;format) {</div><div class='add'>+		case GO7007_FORMAT_MPEG1:</div><div class='add'>+		case GO7007_FORMAT_MPEG2:</div><div class='add'>+			return seqhead_to_package(go, code, space,</div><div class='add'>+					mpeg1_sequence_header);</div><div class='add'>+		case GO7007_FORMAT_MPEG4:</div><div class='add'>+			return seqhead_to_package(go, code, space,</div><div class='add'>+					mpeg4_sequence_header);</div><div class='add'>+		default:</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+	case SPECIAL_AV_SYNC:</div><div class='add'>+		return avsync_to_package(go, code, space);</div><div class='add'>+	case SPECIAL_FINAL:</div><div class='add'>+		return final_package(go, code, space);</div><div class='add'>+	case SPECIAL_AUDIO:</div><div class='add'>+		return audio_to_package(go, code, space);</div><div class='add'>+	case SPECIAL_MODET:</div><div class='add'>+		return modet_to_package(go, code, space);</div><div class='add'>+	}</div><div class='add'>+	printk(KERN_ERR</div><div class='add'>+		"go7007: firmware file contains unsupported feature %04x\n",</div><div class='add'>+		type);</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int go7007_construct_fw_image(struct go7007 *go, u8 **fw, int *fwlen)</div><div class='add'>+{</div><div class='add'>+	const struct firmware *fw_entry;</div><div class='add'>+	u16 *code, *src;</div><div class='add'>+	int framelen[8] = { }; /* holds the lengths of empty frame templates */</div><div class='add'>+	int codespace = 64 * 1024, i = 0, srclen, chunk_len, chunk_flags;</div><div class='add'>+	int mode_flag;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	switch (go-&gt;format) {</div><div class='add'>+	case GO7007_FORMAT_MJPEG:</div><div class='add'>+		mode_flag = FLAG_MODE_MJPEG;</div><div class='add'>+		break;</div><div class='add'>+	case GO7007_FORMAT_MPEG1:</div><div class='add'>+		mode_flag = FLAG_MODE_MPEG1;</div><div class='add'>+		break;</div><div class='add'>+	case GO7007_FORMAT_MPEG2:</div><div class='add'>+		mode_flag = FLAG_MODE_MPEG2;</div><div class='add'>+		break;</div><div class='add'>+	case GO7007_FORMAT_MPEG4:</div><div class='add'>+		mode_flag = FLAG_MODE_MPEG4;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+	if (request_firmware(&amp;fw_entry, go-&gt;board_info-&gt;firmware, go-&gt;dev)) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+			"go7007: unable to load firmware from file \"%s\"\n",</div><div class='add'>+			go-&gt;board_info-&gt;firmware);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+	code = kmalloc(codespace * 2, GFP_KERNEL);</div><div class='add'>+	if (code == NULL) {</div><div class='add'>+		printk(KERN_ERR "go7007: unable to allocate %d bytes for "</div><div class='add'>+				"firmware construction\n", codespace * 2);</div><div class='add'>+		goto fw_failed;</div><div class='add'>+	}</div><div class='add'>+	memset(code, 0, codespace * 2);</div><div class='add'>+	src = (u16 *)fw_entry-&gt;data;</div><div class='add'>+	srclen = fw_entry-&gt;size / 2;</div><div class='add'>+	while (srclen &gt;= 2) {</div><div class='add'>+		chunk_flags = __le16_to_cpu(src[0]);</div><div class='add'>+		chunk_len = __le16_to_cpu(src[1]);</div><div class='add'>+		if (chunk_len + 2 &gt; srclen) {</div><div class='add'>+			printk(KERN_ERR "go7007: firmware file \"%s\" "</div><div class='add'>+					"appears to be corrupted\n",</div><div class='add'>+					go-&gt;board_info-&gt;firmware);</div><div class='add'>+			goto fw_failed;</div><div class='add'>+		}</div><div class='add'>+		if (chunk_flags &amp; mode_flag) {</div><div class='add'>+			if (chunk_flags &amp; FLAG_SPECIAL) {</div><div class='add'>+				ret = do_special(go, __le16_to_cpu(src[2]),</div><div class='add'>+					&amp;code[i], codespace - i, framelen);</div><div class='add'>+				if (ret &lt; 0) {</div><div class='add'>+					printk(KERN_ERR "go7007: insufficient "</div><div class='add'>+							"memory for firmware "</div><div class='add'>+							"construction\n");</div><div class='add'>+					goto fw_failed;</div><div class='add'>+				}</div><div class='add'>+				i += ret;</div><div class='add'>+			} else {</div><div class='add'>+				if (codespace - i &lt; chunk_len) {</div><div class='add'>+					printk(KERN_ERR "go7007: insufficient "</div><div class='add'>+							"memory for firmware "</div><div class='add'>+							"construction\n");</div><div class='add'>+					goto fw_failed;</div><div class='add'>+				}</div><div class='add'>+				memcpy(&amp;code[i], &amp;src[2], chunk_len * 2);</div><div class='add'>+				i += chunk_len;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		srclen -= chunk_len + 2;</div><div class='add'>+		src += chunk_len + 2;</div><div class='add'>+	}</div><div class='add'>+	release_firmware(fw_entry);</div><div class='add'>+	*fw = (u8 *)code;</div><div class='add'>+	*fwlen = i * 2;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+fw_failed:</div><div class='add'>+	kfree(code);</div><div class='add'>+	release_firmware(fw_entry);</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/staging/go7007/go7007-i2c.c b/drivers/staging/go7007/go7007-i2c.c<br/>new file mode 100644<br/>index 000000000000..10baae3dade6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/go7007/go7007-i2c.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/go7007/go7007-i2c.c</a></div><div class='hunk'>@@ -0,0 +1,309 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2005-2006 Micronas USA Inc.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License (Version 2) as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software Foundation,</div><div class='add'>+ * Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/version.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/unistd.h&gt;</div><div class='add'>+#include &lt;linux/time.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/semaphore.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='add'>+#include &lt;asm/system.h&gt;</div><div class='add'>+</div><div class='add'>+#include "go7007-priv.h"</div><div class='add'>+#include "wis-i2c.h"</div><div class='add'>+</div><div class='add'>+/************** Registration interface for I2C client drivers **************/</div><div class='add'>+</div><div class='add'>+/* Since there's no way to auto-probe the I2C devices connected to the I2C</div><div class='add'>+ * bus on the go7007, we have this silly little registration system that</div><div class='add'>+ * client drivers can use to register their I2C driver ID and their</div><div class='add'>+ * detect_client function (the one that's normally passed to i2c_probe).</div><div class='add'>+ *</div><div class='add'>+ * When a new go7007 device is connected, we can look up in a board info</div><div class='add'>+ * table by the USB or PCI vendor/product/revision ID to determine</div><div class='add'>+ * which I2C client module to load.  The client driver module will register</div><div class='add'>+ * itself here, and then we can call the registered detect_client function</div><div class='add'>+ * to force-load a new client at the address listed in the board info table.</div><div class='add'>+ *</div><div class='add'>+ * Really the I2C subsystem should have a way to force-load I2C client</div><div class='add'>+ * drivers when we have a priori knowledge of what's on the bus, especially</div><div class='add'>+ * since the existing I2C auto-probe mechanism is so hokey, but we'll use</div><div class='add'>+ * our own mechanism for the time being. */</div><div class='add'>+</div><div class='add'>+struct wis_i2c_client_driver {</div><div class='add'>+	unsigned int id;</div><div class='add'>+	found_proc found_proc;</div><div class='add'>+	struct list_head list;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static LIST_HEAD(i2c_client_drivers);</div><div class='add'>+static DECLARE_MUTEX(i2c_client_driver_list_lock);</div><div class='add'>+</div><div class='add'>+/* Client drivers register here by their I2C driver ID */</div><div class='add'>+int wis_i2c_add_driver(unsigned int id, found_proc found_proc)</div><div class='add'>+{</div><div class='add'>+	struct wis_i2c_client_driver *driver;</div><div class='add'>+</div><div class='add'>+	driver = kmalloc(sizeof(struct wis_i2c_client_driver), GFP_KERNEL);</div><div class='add'>+	if (driver == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	driver-&gt;id = id;</div><div class='add'>+	driver-&gt;found_proc = found_proc;</div><div class='add'>+</div><div class='add'>+	down(&amp;i2c_client_driver_list_lock);</div><div class='add'>+	list_add_tail(&amp;driver-&gt;list, &amp;i2c_client_drivers);</div><div class='add'>+	up(&amp;i2c_client_driver_list_lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(wis_i2c_add_driver);</div><div class='add'>+</div><div class='add'>+void wis_i2c_del_driver(found_proc found_proc)</div><div class='add'>+{</div><div class='add'>+	struct wis_i2c_client_driver *driver, *next;</div><div class='add'>+</div><div class='add'>+	down(&amp;i2c_client_driver_list_lock);</div><div class='add'>+	list_for_each_entry_safe(driver, next, &amp;i2c_client_drivers, list)</div><div class='add'>+		if (driver-&gt;found_proc == found_proc) {</div><div class='add'>+			list_del(&amp;driver-&gt;list);</div><div class='add'>+			kfree(driver);</div><div class='add'>+		}</div><div class='add'>+	up(&amp;i2c_client_driver_list_lock);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(wis_i2c_del_driver);</div><div class='add'>+</div><div class='add'>+/* The main go7007 driver calls this to instantiate a client by driver</div><div class='add'>+ * ID and bus address, which are both stored in the board info table */</div><div class='add'>+int wis_i2c_probe_device(struct i2c_adapter *adapter,</div><div class='add'>+				unsigned int id, int addr)</div><div class='add'>+{</div><div class='add'>+	struct wis_i2c_client_driver *driver;</div><div class='add'>+	int found = 0;</div><div class='add'>+</div><div class='add'>+	if (addr &lt; 0 || addr &gt; 0x7f)</div><div class='add'>+		return -1;</div><div class='add'>+	down(&amp;i2c_client_driver_list_lock);</div><div class='add'>+	list_for_each_entry(driver, &amp;i2c_client_drivers, list)</div><div class='add'>+		if (driver-&gt;id == id) {</div><div class='add'>+			if (driver-&gt;found_proc(adapter, addr, 0) == 0)</div><div class='add'>+				found = 1;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	up(&amp;i2c_client_driver_list_lock);</div><div class='add'>+	return found;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/********************* Driver for on-board I2C adapter *********************/</div><div class='add'>+</div><div class='add'>+/* #define GO7007_I2C_DEBUG */</div><div class='add'>+</div><div class='add'>+#define SPI_I2C_ADDR_BASE		0x1400</div><div class='add'>+#define STATUS_REG_ADDR			(SPI_I2C_ADDR_BASE + 0x2)</div><div class='add'>+#define I2C_CTRL_REG_ADDR		(SPI_I2C_ADDR_BASE + 0x6)</div><div class='add'>+#define I2C_DEV_UP_ADDR_REG_ADDR	(SPI_I2C_ADDR_BASE + 0x7)</div><div class='add'>+#define I2C_LO_ADDR_REG_ADDR		(SPI_I2C_ADDR_BASE + 0x8)</div><div class='add'>+#define I2C_DATA_REG_ADDR		(SPI_I2C_ADDR_BASE + 0x9)</div><div class='add'>+#define I2C_CLKFREQ_REG_ADDR		(SPI_I2C_ADDR_BASE + 0xa)</div><div class='add'>+</div><div class='add'>+#define I2C_STATE_MASK			0x0007</div><div class='add'>+#define I2C_READ_READY_MASK		0x0008</div><div class='add'>+</div><div class='add'>+/* There is only one I2C port on the TW2804 that feeds all four GO7007 VIPs</div><div class='add'>+ * on the Adlink PCI-MPG24, so access is shared between all of them. */</div><div class='add'>+static DECLARE_MUTEX(adlink_mpg24_i2c_lock);</div><div class='add'>+</div><div class='add'>+static int go7007_i2c_xfer(struct go7007 *go, u16 addr, int read,</div><div class='add'>+		u16 command, int flags, u8 *data)</div><div class='add'>+{</div><div class='add'>+	int i, ret = -1;</div><div class='add'>+	u16 val;</div><div class='add'>+</div><div class='add'>+	if (go-&gt;status == STATUS_SHUTDOWN)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+#ifdef GO7007_I2C_DEBUG</div><div class='add'>+	if (read)</div><div class='add'>+		printk(KERN_DEBUG "go7007-i2c: reading 0x%02x on 0x%02x\n",</div><div class='add'>+			command, addr);</div><div class='add'>+	else</div><div class='add'>+		printk(KERN_DEBUG</div><div class='add'>+			"go7007-i2c: writing 0x%02x to 0x%02x on 0x%02x\n",</div><div class='add'>+			*data, command, addr);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	down(&amp;go-&gt;hw_lock);</div><div class='add'>+</div><div class='add'>+	if (go-&gt;board_id == GO7007_BOARDID_ADLINK_MPG24) {</div><div class='add'>+		/* Bridge the I2C port on this GO7007 to the shared bus */</div><div class='add'>+		down(&amp;adlink_mpg24_i2c_lock);</div><div class='add'>+		go7007_write_addr(go, 0x3c82, 0x0020);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Wait for I2C adapter to be ready */</div><div class='add'>+	for (i = 0; i &lt; 10; ++i) {</div><div class='add'>+		if (go7007_read_addr(go, STATUS_REG_ADDR, &amp;val) &lt; 0)</div><div class='add'>+			goto i2c_done;</div><div class='add'>+		if (!(val &amp; I2C_STATE_MASK))</div><div class='add'>+			break;</div><div class='add'>+		msleep(100);</div><div class='add'>+	}</div><div class='add'>+	if (i == 10) {</div><div class='add'>+		printk(KERN_ERR "go7007-i2c: I2C adapter is hung\n");</div><div class='add'>+		goto i2c_done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Set target register (command) */</div><div class='add'>+	go7007_write_addr(go, I2C_CTRL_REG_ADDR, flags);</div><div class='add'>+	go7007_write_addr(go, I2C_LO_ADDR_REG_ADDR, command);</div><div class='add'>+</div><div class='add'>+	/* If we're writing, send the data and target address and we're done */</div><div class='add'>+	if (!read) {</div><div class='add'>+		go7007_write_addr(go, I2C_DATA_REG_ADDR, *data);</div><div class='add'>+		go7007_write_addr(go, I2C_DEV_UP_ADDR_REG_ADDR,</div><div class='add'>+					(addr &lt;&lt; 9) | (command &gt;&gt; 8));</div><div class='add'>+		ret = 0;</div><div class='add'>+		goto i2c_done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Otherwise, we're reading.  First clear i2c_rx_data_rdy. */</div><div class='add'>+	if (go7007_read_addr(go, I2C_DATA_REG_ADDR, &amp;val) &lt; 0)</div><div class='add'>+		goto i2c_done;</div><div class='add'>+</div><div class='add'>+	/* Send the target address plus read flag */</div><div class='add'>+	go7007_write_addr(go, I2C_DEV_UP_ADDR_REG_ADDR,</div><div class='add'>+			(addr &lt;&lt; 9) | 0x0100 | (command &gt;&gt; 8));</div><div class='add'>+</div><div class='add'>+	/* Wait for i2c_rx_data_rdy */</div><div class='add'>+	for (i = 0; i &lt; 10; ++i) {</div><div class='add'>+		if (go7007_read_addr(go, STATUS_REG_ADDR, &amp;val) &lt; 0)</div><div class='add'>+			goto i2c_done;</div><div class='add'>+		if (val &amp; I2C_READ_READY_MASK)</div><div class='add'>+			break;</div><div class='add'>+		msleep(100);</div><div class='add'>+	}</div><div class='add'>+	if (i == 10) {</div><div class='add'>+		printk(KERN_ERR "go7007-i2c: I2C adapter is hung\n");</div><div class='add'>+		goto i2c_done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Retrieve the read byte */</div><div class='add'>+	if (go7007_read_addr(go, I2C_DATA_REG_ADDR, &amp;val) &lt; 0)</div><div class='add'>+		goto i2c_done;</div><div class='add'>+	*data = val;</div><div class='add'>+	ret = 0;</div><div class='add'>+</div><div class='add'>+i2c_done:</div><div class='add'>+	if (go-&gt;board_id == GO7007_BOARDID_ADLINK_MPG24) {</div><div class='add'>+		/* Isolate the I2C port on this GO7007 from the shared bus */</div><div class='add'>+		go7007_write_addr(go, 0x3c82, 0x0000);</div><div class='add'>+		up(&amp;adlink_mpg24_i2c_lock);</div><div class='add'>+	}</div><div class='add'>+	up(&amp;go-&gt;hw_lock);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int go7007_smbus_xfer(struct i2c_adapter *adapter, u16 addr,</div><div class='add'>+		unsigned short flags, char read_write,</div><div class='add'>+		u8 command, int size, union i2c_smbus_data *data)</div><div class='add'>+{</div><div class='add'>+	struct go7007 *go = i2c_get_adapdata(adapter);</div><div class='add'>+</div><div class='add'>+	if (size != I2C_SMBUS_BYTE_DATA)</div><div class='add'>+		return -1;</div><div class='add'>+	return go7007_i2c_xfer(go, addr, read_write == I2C_SMBUS_READ, command,</div><div class='add'>+			flags &amp; I2C_CLIENT_SCCB ? 0x10 : 0x00, &amp;data-&gt;byte);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* VERY LIMITED I2C master xfer function -- only needed because the</div><div class='add'>+ * SMBus functions only support 8-bit commands and the SAA7135 uses</div><div class='add'>+ * 16-bit commands.  The I2C interface on the GO7007, as limited as</div><div class='add'>+ * it is, does support this mode. */</div><div class='add'>+</div><div class='add'>+static int go7007_i2c_master_xfer(struct i2c_adapter *adapter,</div><div class='add'>+					struct i2c_msg msgs[], int num)</div><div class='add'>+{</div><div class='add'>+	struct go7007 *go = i2c_get_adapdata(adapter);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num; ++i) {</div><div class='add'>+		/* We can only do two things here -- write three bytes, or</div><div class='add'>+		 * write two bytes and read one byte. */</div><div class='add'>+		if (msgs[i].len == 2) {</div><div class='add'>+			if (i + 1 == num || msgs[i].addr != msgs[i + 1].addr ||</div><div class='add'>+					(msgs[i].flags &amp; I2C_M_RD) ||</div><div class='add'>+					!(msgs[i + 1].flags &amp; I2C_M_RD) ||</div><div class='add'>+					msgs[i + 1].len != 1)</div><div class='add'>+				return -1;</div><div class='add'>+			if (go7007_i2c_xfer(go, msgs[i].addr, 1,</div><div class='add'>+					(msgs[i].buf[0] &lt;&lt; 8) | msgs[i].buf[1],</div><div class='add'>+					0x01, &amp;msgs[i + 1].buf[0]) &lt; 0)</div><div class='add'>+				return -1;</div><div class='add'>+			++i;</div><div class='add'>+		} else if (msgs[i].len == 3) {</div><div class='add'>+			if (msgs[i].flags &amp; I2C_M_RD)</div><div class='add'>+				return -1;</div><div class='add'>+			if (msgs[i].len != 3)</div><div class='add'>+				return -1;</div><div class='add'>+			if (go7007_i2c_xfer(go, msgs[i].addr, 0,</div><div class='add'>+					(msgs[i].buf[0] &lt;&lt; 8) | msgs[i].buf[1],</div><div class='add'>+					0x01, &amp;msgs[i].buf[2]) &lt; 0)</div><div class='add'>+				return -1;</div><div class='add'>+		} else</div><div class='add'>+			return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 go7007_functionality(struct i2c_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	return I2C_FUNC_SMBUS_BYTE_DATA;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct i2c_algorithm go7007_algo = {</div><div class='add'>+	.smbus_xfer	= go7007_smbus_xfer,</div><div class='add'>+	.master_xfer	= go7007_i2c_master_xfer,</div><div class='add'>+	.functionality	= go7007_functionality,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct i2c_adapter go7007_adap_templ = {</div><div class='add'>+	.owner			= THIS_MODULE,</div><div class='add'>+	.class			= I2C_CLASS_TV_ANALOG,</div><div class='add'>+	.name			= "WIS GO7007SB",</div><div class='add'>+	.id			= I2C_ALGO_GO7007,</div><div class='add'>+	.algo			= &amp;go7007_algo,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int go7007_i2c_init(struct go7007 *go)</div><div class='add'>+{</div><div class='add'>+	memcpy(&amp;go-&gt;i2c_adapter, &amp;go7007_adap_templ,</div><div class='add'>+			sizeof(go7007_adap_templ));</div><div class='add'>+	go-&gt;i2c_adapter.dev.parent = go-&gt;dev;</div><div class='add'>+	i2c_set_adapdata(&amp;go-&gt;i2c_adapter, go);</div><div class='add'>+	if (i2c_add_adapter(&amp;go-&gt;i2c_adapter) &lt; 0) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+			"go7007-i2c: error: i2c_add_adapter failed\n");</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/staging/go7007/go7007-priv.h b/drivers/staging/go7007/go7007-priv.h<br/>new file mode 100644<br/>index 000000000000..005542d16a56<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/go7007/go7007-priv.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/go7007/go7007-priv.h</a></div><div class='hunk'>@@ -0,0 +1,279 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2005-2006 Micronas USA Inc.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License (Version 2) as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software Foundation,</div><div class='add'>+ * Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This is the private include file for the go7007 driver.  It should not</div><div class='add'>+ * be included by anybody but the driver itself, and especially not by</div><div class='add'>+ * user-space applications.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+struct go7007;</div><div class='add'>+</div><div class='add'>+/* IDs to activate board-specific support code */</div><div class='add'>+#define GO7007_BOARDID_MATRIX_II	0</div><div class='add'>+#define GO7007_BOARDID_MATRIX_RELOAD	1</div><div class='add'>+#define GO7007_BOARDID_STAR_TREK	2</div><div class='add'>+#define GO7007_BOARDID_PCI_VOYAGER	3</div><div class='add'>+#define GO7007_BOARDID_XMEN		4</div><div class='add'>+#define GO7007_BOARDID_XMEN_II		5</div><div class='add'>+#define GO7007_BOARDID_XMEN_III		6</div><div class='add'>+#define GO7007_BOARDID_MATRIX_REV	7</div><div class='add'>+#define GO7007_BOARDID_PX_M402U		16</div><div class='add'>+#define GO7007_BOARDID_PX_TV402U_ANY	17 /* need to check tuner model */</div><div class='add'>+#define GO7007_BOARDID_PX_TV402U_NA	18 /* detected NTSC tuner */</div><div class='add'>+#define GO7007_BOARDID_PX_TV402U_EU	19 /* detected PAL tuner */</div><div class='add'>+#define GO7007_BOARDID_PX_TV402U_JP	20 /* detected NTSC-J tuner */</div><div class='add'>+#define GO7007_BOARDID_LIFEVIEW_LR192	21 /* TV Walker Ultra */</div><div class='add'>+#define GO7007_BOARDID_ENDURA		22</div><div class='add'>+#define GO7007_BOARDID_ADLINK_MPG24	23</div><div class='add'>+</div><div class='add'>+/* Various characteristics of each board */</div><div class='add'>+#define GO7007_BOARD_HAS_AUDIO		(1&lt;&lt;0)</div><div class='add'>+#define GO7007_BOARD_USE_ONBOARD_I2C	(1&lt;&lt;1)</div><div class='add'>+#define GO7007_BOARD_HAS_TUNER		(1&lt;&lt;2)</div><div class='add'>+</div><div class='add'>+/* Characteristics of sensor devices */</div><div class='add'>+#define GO7007_SENSOR_VALID_POLAR	(1&lt;&lt;0)</div><div class='add'>+#define GO7007_SENSOR_HREF_POLAR	(1&lt;&lt;1)</div><div class='add'>+#define GO7007_SENSOR_VREF_POLAR	(1&lt;&lt;2)</div><div class='add'>+#define GO7007_SENSOR_FIELD_ID_POLAR	(1&lt;&lt;3)</div><div class='add'>+#define GO7007_SENSOR_BIT_WIDTH		(1&lt;&lt;4)</div><div class='add'>+#define GO7007_SENSOR_VALID_ENABLE	(1&lt;&lt;5)</div><div class='add'>+#define GO7007_SENSOR_656		(1&lt;&lt;6)</div><div class='add'>+#define GO7007_SENSOR_CONFIG_MASK	0x7f</div><div class='add'>+#define GO7007_SENSOR_TV		(1&lt;&lt;7)</div><div class='add'>+#define GO7007_SENSOR_VBI		(1&lt;&lt;8)</div><div class='add'>+#define GO7007_SENSOR_SCALING		(1&lt;&lt;9)</div><div class='add'>+</div><div class='add'>+/* Characteristics of audio sensor devices */</div><div class='add'>+#define GO7007_AUDIO_I2S_MODE_1		(1)</div><div class='add'>+#define GO7007_AUDIO_I2S_MODE_2		(2)</div><div class='add'>+#define GO7007_AUDIO_I2S_MODE_3		(3)</div><div class='add'>+#define GO7007_AUDIO_BCLK_POLAR		(1&lt;&lt;2)</div><div class='add'>+#define GO7007_AUDIO_WORD_14		(14&lt;&lt;4)</div><div class='add'>+#define GO7007_AUDIO_WORD_16		(16&lt;&lt;4)</div><div class='add'>+#define GO7007_AUDIO_ONE_CHANNEL	(1&lt;&lt;11)</div><div class='add'>+#define GO7007_AUDIO_I2S_MASTER		(1&lt;&lt;16)</div><div class='add'>+#define GO7007_AUDIO_OKI_MODE		(1&lt;&lt;17)</div><div class='add'>+</div><div class='add'>+struct go7007_board_info {</div><div class='add'>+	char *firmware;</div><div class='add'>+	unsigned int flags;</div><div class='add'>+	int hpi_buffer_cap;</div><div class='add'>+	unsigned int sensor_flags;</div><div class='add'>+	int sensor_width;</div><div class='add'>+	int sensor_height;</div><div class='add'>+	int sensor_framerate;</div><div class='add'>+	int sensor_h_offset;</div><div class='add'>+	int sensor_v_offset;</div><div class='add'>+	unsigned int audio_flags;</div><div class='add'>+	int audio_rate;</div><div class='add'>+	int audio_bclk_div;</div><div class='add'>+	int audio_main_div;</div><div class='add'>+	int num_i2c_devs;</div><div class='add'>+	struct {</div><div class='add'>+		int id;</div><div class='add'>+		int addr;</div><div class='add'>+	} i2c_devs[4];</div><div class='add'>+	int num_inputs;</div><div class='add'>+	struct {</div><div class='add'>+		int video_input;</div><div class='add'>+		int audio_input;</div><div class='add'>+		char *name;</div><div class='add'>+	} inputs[4];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct go7007_hpi_ops {</div><div class='add'>+	int (*interface_reset)(struct go7007 *go);</div><div class='add'>+	int (*write_interrupt)(struct go7007 *go, int addr, int data);</div><div class='add'>+	int (*read_interrupt)(struct go7007 *go);</div><div class='add'>+	int (*stream_start)(struct go7007 *go);</div><div class='add'>+	int (*stream_stop)(struct go7007 *go);</div><div class='add'>+	int (*send_firmware)(struct go7007 *go, u8 *data, int len);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* The video buffer size must be a multiple of PAGE_SIZE */</div><div class='add'>+#define	GO7007_BUF_PAGES	(128 * 1024 / PAGE_SIZE)</div><div class='add'>+#define	GO7007_BUF_SIZE		(GO7007_BUF_PAGES &lt;&lt; PAGE_SHIFT)</div><div class='add'>+</div><div class='add'>+struct go7007_buffer {</div><div class='add'>+	struct go7007 *go; /* Reverse reference for VMA ops */</div><div class='add'>+	int index; /* Reverse reference for DQBUF */</div><div class='add'>+	enum { BUF_STATE_IDLE, BUF_STATE_QUEUED, BUF_STATE_DONE } state;</div><div class='add'>+	u32 seq;</div><div class='add'>+	struct timeval timestamp;</div><div class='add'>+	struct list_head stream;</div><div class='add'>+	struct page *pages[GO7007_BUF_PAGES + 1]; /* extra for straddling */</div><div class='add'>+	unsigned long user_addr;</div><div class='add'>+	unsigned int page_count;</div><div class='add'>+	unsigned int offset;</div><div class='add'>+	unsigned int bytesused;</div><div class='add'>+	unsigned int frame_offset;</div><div class='add'>+	u32 modet_active;</div><div class='add'>+	int mapped;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct go7007_file {</div><div class='add'>+	struct go7007 *go;</div><div class='add'>+	struct semaphore lock;</div><div class='add'>+	int buf_count;</div><div class='add'>+	struct go7007_buffer *bufs;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define	GO7007_FORMAT_MJPEG	0</div><div class='add'>+#define GO7007_FORMAT_MPEG4	1</div><div class='add'>+#define GO7007_FORMAT_MPEG1	2</div><div class='add'>+#define GO7007_FORMAT_MPEG2	3</div><div class='add'>+#define GO7007_FORMAT_H263	4</div><div class='add'>+</div><div class='add'>+#define GO7007_RATIO_1_1	0</div><div class='add'>+#define GO7007_RATIO_4_3	1</div><div class='add'>+#define GO7007_RATIO_16_9	2</div><div class='add'>+</div><div class='add'>+enum go7007_parser_state {</div><div class='add'>+	STATE_DATA,</div><div class='add'>+	STATE_00,</div><div class='add'>+	STATE_00_00,</div><div class='add'>+	STATE_00_00_01,</div><div class='add'>+	STATE_FF,</div><div class='add'>+	STATE_VBI_LEN_A,</div><div class='add'>+	STATE_VBI_LEN_B,</div><div class='add'>+	STATE_MODET_MAP,</div><div class='add'>+	STATE_UNPARSED,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct go7007 {</div><div class='add'>+	struct device *dev;</div><div class='add'>+	struct go7007_board_info *board_info;</div><div class='add'>+	unsigned int board_id;</div><div class='add'>+	int tuner_type;</div><div class='add'>+	int channel_number; /* for multi-channel boards like Adlink PCI-MPG24 */</div><div class='add'>+	char name[64];</div><div class='add'>+	struct video_device *video_dev;</div><div class='add'>+	int ref_count;</div><div class='add'>+	enum { STATUS_INIT, STATUS_ONLINE, STATUS_SHUTDOWN } status;</div><div class='add'>+	spinlock_t spinlock;</div><div class='add'>+	struct semaphore hw_lock;</div><div class='add'>+	int streaming;</div><div class='add'>+	int in_use;</div><div class='add'>+	int audio_enabled;</div><div class='add'>+</div><div class='add'>+	/* Video input */</div><div class='add'>+	int input;</div><div class='add'>+	enum { GO7007_STD_NTSC, GO7007_STD_PAL, GO7007_STD_OTHER } standard;</div><div class='add'>+	int sensor_framerate;</div><div class='add'>+	int width;</div><div class='add'>+	int height;</div><div class='add'>+	int encoder_h_offset;</div><div class='add'>+	int encoder_v_offset;</div><div class='add'>+	unsigned int encoder_h_halve:1;</div><div class='add'>+	unsigned int encoder_v_halve:1;</div><div class='add'>+	unsigned int encoder_subsample:1;</div><div class='add'>+</div><div class='add'>+	/* Encoder config */</div><div class='add'>+	int format;</div><div class='add'>+	int bitrate;</div><div class='add'>+	int fps_scale;</div><div class='add'>+	int pali;</div><div class='add'>+	int aspect_ratio;</div><div class='add'>+	int gop_size;</div><div class='add'>+	unsigned int ipb:1;</div><div class='add'>+	unsigned int closed_gop:1;</div><div class='add'>+	unsigned int repeat_seqhead:1;</div><div class='add'>+	unsigned int seq_header_enable:1;</div><div class='add'>+	unsigned int gop_header_enable:1;</div><div class='add'>+	unsigned int dvd_mode:1;</div><div class='add'>+	unsigned int interlace_coding:1;</div><div class='add'>+</div><div class='add'>+	/* Motion detection */</div><div class='add'>+	unsigned int modet_enable:1;</div><div class='add'>+	struct {</div><div class='add'>+		unsigned int enable:1;</div><div class='add'>+		int pixel_threshold;</div><div class='add'>+		int motion_threshold;</div><div class='add'>+		int mb_threshold;</div><div class='add'>+	} modet[4];</div><div class='add'>+	unsigned char modet_map[1624];</div><div class='add'>+	unsigned char active_map[216];</div><div class='add'>+</div><div class='add'>+	/* Video streaming */</div><div class='add'>+	struct go7007_buffer *active_buf;</div><div class='add'>+	enum go7007_parser_state state;</div><div class='add'>+	int parse_length;</div><div class='add'>+	u16 modet_word;</div><div class='add'>+	int seen_frame;</div><div class='add'>+	u32 next_seq;</div><div class='add'>+	struct list_head stream;</div><div class='add'>+	wait_queue_head_t frame_waitq;</div><div class='add'>+</div><div class='add'>+	/* Audio streaming */</div><div class='add'>+	void (*audio_deliver)(struct go7007 *go, u8 *buf, int length);</div><div class='add'>+	void *snd_context;</div><div class='add'>+</div><div class='add'>+	/* I2C */</div><div class='add'>+	int i2c_adapter_online;</div><div class='add'>+	struct i2c_adapter i2c_adapter;</div><div class='add'>+</div><div class='add'>+	/* HPI driver */</div><div class='add'>+	struct go7007_hpi_ops *hpi_ops;</div><div class='add'>+	void *hpi_context;</div><div class='add'>+	int interrupt_available;</div><div class='add'>+	wait_queue_head_t interrupt_waitq;</div><div class='add'>+	unsigned short interrupt_value;</div><div class='add'>+	unsigned short interrupt_data;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* All of these must be called with the hpi_lock semaphore held! */</div><div class='add'>+#define go7007_interface_reset(go) \</div><div class='add'>+			((go)-&gt;hpi_ops-&gt;interface_reset(go))</div><div class='add'>+#define	go7007_write_interrupt(go, x, y) \</div><div class='add'>+			((go)-&gt;hpi_ops-&gt;write_interrupt)((go), (x), (y))</div><div class='add'>+#define go7007_stream_start(go) \</div><div class='add'>+			((go)-&gt;hpi_ops-&gt;stream_start(go))</div><div class='add'>+#define go7007_stream_stop(go) \</div><div class='add'>+			((go)-&gt;hpi_ops-&gt;stream_stop(go))</div><div class='add'>+#define	go7007_send_firmware(go, x, y) \</div><div class='add'>+			((go)-&gt;hpi_ops-&gt;send_firmware)((go), (x), (y))</div><div class='add'>+#define go7007_write_addr(go, x, y) \</div><div class='add'>+			((go)-&gt;hpi_ops-&gt;write_interrupt)((go), (x)|0x8000, (y))</div><div class='add'>+</div><div class='add'>+/* go7007-driver.c */</div><div class='add'>+int go7007_read_addr(struct go7007 *go, u16 addr, u16 *data);</div><div class='add'>+int go7007_read_interrupt(struct go7007 *go, u16 *value, u16 *data);</div><div class='add'>+int go7007_boot_encoder(struct go7007 *go, int init_i2c);</div><div class='add'>+int go7007_reset_encoder(struct go7007 *go);</div><div class='add'>+int go7007_register_encoder(struct go7007 *go);</div><div class='add'>+int go7007_start_encoder(struct go7007 *go);</div><div class='add'>+void go7007_parse_video_stream(struct go7007 *go, u8 *buf, int length);</div><div class='add'>+struct go7007 *go7007_alloc(struct go7007_board_info *board,</div><div class='add'>+					struct device *dev);</div><div class='add'>+void go7007_remove(struct go7007 *go);</div><div class='add'>+</div><div class='add'>+/* go7007-fw.c */</div><div class='add'>+int go7007_construct_fw_image(struct go7007 *go, u8 **fw, int *fwlen);</div><div class='add'>+</div><div class='add'>+/* go7007-i2c.c */</div><div class='add'>+int go7007_i2c_init(struct go7007 *go);</div><div class='add'>+int go7007_i2c_remove(struct go7007 *go);</div><div class='add'>+</div><div class='add'>+/* go7007-v4l2.c */</div><div class='add'>+int go7007_v4l2_init(struct go7007 *go);</div><div class='add'>+void go7007_v4l2_remove(struct go7007 *go);</div><div class='add'>+</div><div class='add'>+/* snd-go7007.c */</div><div class='add'>+int go7007_snd_init(struct go7007 *go);</div><div class='add'>+int go7007_snd_remove(struct go7007 *go);</div><div class='head'>diff --git a/drivers/staging/go7007/go7007-usb.c b/drivers/staging/go7007/go7007-usb.c<br/>new file mode 100644<br/>index 000000000000..d4ed6d2b715f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/go7007/go7007-usb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/go7007/go7007-usb.c</a></div><div class='hunk'>@@ -0,0 +1,1229 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2005-2006 Micronas USA Inc.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License (Version 2) as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software Foundation,</div><div class='add'>+ * Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/version.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/wait.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/time.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/usb.h&gt;</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;asm/byteorder.h&gt;</div><div class='add'>+#include &lt;media/tvaudio.h&gt;</div><div class='add'>+</div><div class='add'>+#include "go7007-priv.h"</div><div class='add'>+#include "wis-i2c.h"</div><div class='add'>+</div><div class='add'>+static unsigned int assume_endura;</div><div class='add'>+module_param(assume_endura, int, 0644);</div><div class='add'>+MODULE_PARM_DESC(assume_endura, "when probing fails, hardware is a Pelco Endura");</div><div class='add'>+</div><div class='add'>+/* #define GO7007_USB_DEBUG */</div><div class='add'>+/* #define GO7007_I2C_DEBUG */ /* for debugging the EZ-USB I2C adapter */</div><div class='add'>+</div><div class='add'>+#define	HPI_STATUS_ADDR	0xFFF4</div><div class='add'>+#define	INT_PARAM_ADDR	0xFFF6</div><div class='add'>+#define	INT_INDEX_ADDR	0xFFF8</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Pipes on EZ-USB interface:</div><div class='add'>+ * 	0 snd - Control</div><div class='add'>+ * 	0 rcv - Control</div><div class='add'>+ * 	2 snd - Download firmware (control)</div><div class='add'>+ * 	4 rcv - Read Interrupt (interrupt)</div><div class='add'>+ * 	6 rcv - Read Video (bulk)</div><div class='add'>+ * 	8 rcv - Read Audio (bulk)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define GO7007_USB_EZUSB		(1&lt;&lt;0)</div><div class='add'>+#define GO7007_USB_EZUSB_I2C		(1&lt;&lt;1)</div><div class='add'>+</div><div class='add'>+struct go7007_usb_board {</div><div class='add'>+	unsigned int flags;</div><div class='add'>+	struct go7007_board_info main_info;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct go7007_usb {</div><div class='add'>+	struct go7007_usb_board *board;</div><div class='add'>+	struct semaphore i2c_lock;</div><div class='add'>+	struct usb_device *usbdev;</div><div class='add'>+	struct urb *video_urbs[8];</div><div class='add'>+	struct urb *audio_urbs[8];</div><div class='add'>+	struct urb *intr_urb;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*********************** Product specification data ***********************/</div><div class='add'>+</div><div class='add'>+static struct go7007_usb_board board_matrix_ii = {</div><div class='add'>+	.flags		= GO7007_USB_EZUSB,</div><div class='add'>+	.main_info	= {</div><div class='add'>+		.firmware	 = "go7007tv.bin",</div><div class='add'>+		.flags		 = GO7007_BOARD_HAS_AUDIO |</div><div class='add'>+					GO7007_BOARD_USE_ONBOARD_I2C,</div><div class='add'>+		.audio_flags	 = GO7007_AUDIO_I2S_MODE_1 |</div><div class='add'>+					GO7007_AUDIO_WORD_16,</div><div class='add'>+		.audio_rate	 = 48000,</div><div class='add'>+		.audio_bclk_div	 = 8,</div><div class='add'>+		.audio_main_div	 = 2,</div><div class='add'>+		.hpi_buffer_cap  = 7,</div><div class='add'>+		.sensor_flags	 = GO7007_SENSOR_656 |</div><div class='add'>+					GO7007_SENSOR_VALID_ENABLE |</div><div class='add'>+					GO7007_SENSOR_TV |</div><div class='add'>+					GO7007_SENSOR_VBI |</div><div class='add'>+					GO7007_SENSOR_SCALING,</div><div class='add'>+		.num_i2c_devs	 = 1,</div><div class='add'>+		.i2c_devs	 = {</div><div class='add'>+			{</div><div class='add'>+				.id	= I2C_DRIVERID_WIS_SAA7115,</div><div class='add'>+				.addr	= 0x20,</div><div class='add'>+			},</div><div class='add'>+		},</div><div class='add'>+		.num_inputs	 = 2,</div><div class='add'>+		.inputs 	 = {</div><div class='add'>+			{</div><div class='add'>+				.video_input	= 0,</div><div class='add'>+				.name		= "Composite",</div><div class='add'>+			},</div><div class='add'>+			{</div><div class='add'>+				.video_input	= 9,</div><div class='add'>+				.name		= "S-Video",</div><div class='add'>+			},</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct go7007_usb_board board_matrix_reload = {</div><div class='add'>+	.flags		= GO7007_USB_EZUSB,</div><div class='add'>+	.main_info	= {</div><div class='add'>+		.firmware	 = "go7007tv.bin",</div><div class='add'>+		.flags		 = GO7007_BOARD_HAS_AUDIO |</div><div class='add'>+					GO7007_BOARD_USE_ONBOARD_I2C,</div><div class='add'>+		.audio_flags	 = GO7007_AUDIO_I2S_MODE_1 |</div><div class='add'>+					GO7007_AUDIO_I2S_MASTER |</div><div class='add'>+					GO7007_AUDIO_WORD_16,</div><div class='add'>+		.audio_rate	 = 48000,</div><div class='add'>+		.audio_bclk_div	 = 8,</div><div class='add'>+		.audio_main_div	 = 2,</div><div class='add'>+		.hpi_buffer_cap  = 7,</div><div class='add'>+		.sensor_flags	 = GO7007_SENSOR_656 |</div><div class='add'>+					GO7007_SENSOR_TV,</div><div class='add'>+		.num_i2c_devs	 = 1,</div><div class='add'>+		.i2c_devs	 = {</div><div class='add'>+			{</div><div class='add'>+				.id	= I2C_DRIVERID_WIS_SAA7113,</div><div class='add'>+				.addr	= 0x25,</div><div class='add'>+			},</div><div class='add'>+		},</div><div class='add'>+		.num_inputs	 = 2,</div><div class='add'>+		.inputs 	 = {</div><div class='add'>+			{</div><div class='add'>+				.video_input	= 0,</div><div class='add'>+				.name		= "Composite",</div><div class='add'>+			},</div><div class='add'>+			{</div><div class='add'>+				.video_input	= 9,</div><div class='add'>+				.name		= "S-Video",</div><div class='add'>+			},</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct go7007_usb_board board_star_trek = {</div><div class='add'>+	.flags		= GO7007_USB_EZUSB | GO7007_USB_EZUSB_I2C,</div><div class='add'>+	.main_info	= {</div><div class='add'>+		.firmware	 = "go7007tv.bin",</div><div class='add'>+		.flags		 = GO7007_BOARD_HAS_AUDIO, /* |</div><div class='add'>+					GO7007_BOARD_HAS_TUNER, */</div><div class='add'>+		.sensor_flags	 = GO7007_SENSOR_656 |</div><div class='add'>+					GO7007_SENSOR_VALID_ENABLE |</div><div class='add'>+					GO7007_SENSOR_TV |</div><div class='add'>+					GO7007_SENSOR_VBI |</div><div class='add'>+					GO7007_SENSOR_SCALING,</div><div class='add'>+		.audio_flags	 = GO7007_AUDIO_I2S_MODE_1 |</div><div class='add'>+					GO7007_AUDIO_WORD_16,</div><div class='add'>+		.audio_bclk_div	 = 8,</div><div class='add'>+		.audio_main_div	 = 2,</div><div class='add'>+		.hpi_buffer_cap  = 7,</div><div class='add'>+		.num_i2c_devs	 = 1,</div><div class='add'>+		.i2c_devs	 = {</div><div class='add'>+			{</div><div class='add'>+				.id	= I2C_DRIVERID_WIS_SAA7115,</div><div class='add'>+				.addr	= 0x20,</div><div class='add'>+			},</div><div class='add'>+		},</div><div class='add'>+		.num_inputs	 = 2,</div><div class='add'>+		.inputs 	 = {</div><div class='add'>+			{</div><div class='add'>+				.video_input	= 1,</div><div class='add'>+			/*	.audio_input	= AUDIO_EXTERN, */</div><div class='add'>+				.name		= "Composite",</div><div class='add'>+			},</div><div class='add'>+			{</div><div class='add'>+				.video_input	= 8,</div><div class='add'>+			/*	.audio_input	= AUDIO_EXTERN, */</div><div class='add'>+				.name		= "S-Video",</div><div class='add'>+			},</div><div class='add'>+		/*	{</div><div class='add'>+		 *		.video_input	= 3,</div><div class='add'>+		 *		.audio_input	= AUDIO_TUNER,</div><div class='add'>+		 *		.name		= "Tuner",</div><div class='add'>+		 *	},</div><div class='add'>+		 */</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct go7007_usb_board board_px_tv402u = {</div><div class='add'>+	.flags		= GO7007_USB_EZUSB | GO7007_USB_EZUSB_I2C,</div><div class='add'>+	.main_info	= {</div><div class='add'>+		.firmware	 = "go7007tv.bin",</div><div class='add'>+		.flags		 = GO7007_BOARD_HAS_AUDIO |</div><div class='add'>+					GO7007_BOARD_HAS_TUNER,</div><div class='add'>+		.sensor_flags	 = GO7007_SENSOR_656 |</div><div class='add'>+					GO7007_SENSOR_VALID_ENABLE |</div><div class='add'>+					GO7007_SENSOR_TV |</div><div class='add'>+					GO7007_SENSOR_VBI |</div><div class='add'>+					GO7007_SENSOR_SCALING,</div><div class='add'>+		.audio_flags	 = GO7007_AUDIO_I2S_MODE_1 |</div><div class='add'>+					GO7007_AUDIO_WORD_16,</div><div class='add'>+		.audio_bclk_div	 = 8,</div><div class='add'>+		.audio_main_div	 = 2,</div><div class='add'>+		.hpi_buffer_cap  = 7,</div><div class='add'>+		.num_i2c_devs	 = 3,</div><div class='add'>+		.i2c_devs	 = {</div><div class='add'>+			{</div><div class='add'>+				.id	= I2C_DRIVERID_WIS_SAA7115,</div><div class='add'>+				.addr	= 0x20,</div><div class='add'>+			},</div><div class='add'>+			{</div><div class='add'>+				.id	= I2C_DRIVERID_WIS_UDA1342,</div><div class='add'>+				.addr	= 0x1a,</div><div class='add'>+			},</div><div class='add'>+			{</div><div class='add'>+				.id	= I2C_DRIVERID_WIS_SONY_TUNER,</div><div class='add'>+				.addr	= 0x60,</div><div class='add'>+			},</div><div class='add'>+		},</div><div class='add'>+		.num_inputs	 = 3,</div><div class='add'>+		.inputs 	 = {</div><div class='add'>+			{</div><div class='add'>+				.video_input	= 1,</div><div class='add'>+		.audio_input	 = TVAUDIO_INPUT_EXTERN,</div><div class='add'>+				.name		= "Composite",</div><div class='add'>+			},</div><div class='add'>+			{</div><div class='add'>+				.video_input	= 8,</div><div class='add'>+				.audio_input	= TVAUDIO_INPUT_EXTERN,</div><div class='add'>+				.name		= "S-Video",</div><div class='add'>+			},</div><div class='add'>+			{</div><div class='add'>+				.video_input	= 3,</div><div class='add'>+				.audio_input	= TVAUDIO_INPUT_TUNER,</div><div class='add'>+				.name		= "Tuner",</div><div class='add'>+			},</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct go7007_usb_board board_xmen = {</div><div class='add'>+	.flags		= 0,</div><div class='add'>+	.main_info	= {</div><div class='add'>+		.firmware	  = "go7007tv.bin",</div><div class='add'>+		.flags		  = GO7007_BOARD_USE_ONBOARD_I2C,</div><div class='add'>+		.hpi_buffer_cap   = 0,</div><div class='add'>+		.sensor_flags	  = GO7007_SENSOR_VREF_POLAR,</div><div class='add'>+		.sensor_width	  = 320,</div><div class='add'>+		.sensor_height	  = 240,</div><div class='add'>+		.sensor_framerate = 30030,</div><div class='add'>+		.audio_flags	  = GO7007_AUDIO_ONE_CHANNEL |</div><div class='add'>+					GO7007_AUDIO_I2S_MODE_3 |</div><div class='add'>+					GO7007_AUDIO_WORD_14 |</div><div class='add'>+					GO7007_AUDIO_I2S_MASTER |</div><div class='add'>+					GO7007_AUDIO_BCLK_POLAR |</div><div class='add'>+					GO7007_AUDIO_OKI_MODE,</div><div class='add'>+		.audio_rate	  = 8000,</div><div class='add'>+		.audio_bclk_div	  = 48,</div><div class='add'>+		.audio_main_div	  = 1,</div><div class='add'>+		.num_i2c_devs	  = 1,</div><div class='add'>+		.i2c_devs	  = {</div><div class='add'>+			{</div><div class='add'>+				.id	= I2C_DRIVERID_WIS_OV7640,</div><div class='add'>+				.addr	= 0x21,</div><div class='add'>+			},</div><div class='add'>+		},</div><div class='add'>+		.num_inputs	  = 1,</div><div class='add'>+		.inputs 	  = {</div><div class='add'>+			{</div><div class='add'>+				.name		= "Camera",</div><div class='add'>+			},</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct go7007_usb_board board_matrix_revolution = {</div><div class='add'>+	.flags		= GO7007_USB_EZUSB,</div><div class='add'>+	.main_info	= {</div><div class='add'>+		.firmware	 = "go7007tv.bin",</div><div class='add'>+		.flags		 = GO7007_BOARD_HAS_AUDIO |</div><div class='add'>+					GO7007_BOARD_USE_ONBOARD_I2C,</div><div class='add'>+		.audio_flags	 = GO7007_AUDIO_I2S_MODE_1 |</div><div class='add'>+					GO7007_AUDIO_I2S_MASTER |</div><div class='add'>+					GO7007_AUDIO_WORD_16,</div><div class='add'>+		.audio_rate	 = 48000,</div><div class='add'>+		.audio_bclk_div	 = 8,</div><div class='add'>+		.audio_main_div	 = 2,</div><div class='add'>+		.hpi_buffer_cap  = 7,</div><div class='add'>+		.sensor_flags	 = GO7007_SENSOR_656 |</div><div class='add'>+					GO7007_SENSOR_TV |</div><div class='add'>+					GO7007_SENSOR_VBI,</div><div class='add'>+		.num_i2c_devs	 = 1,</div><div class='add'>+		.i2c_devs	 = {</div><div class='add'>+			{</div><div class='add'>+				.id	= I2C_DRIVERID_WIS_TW9903,</div><div class='add'>+				.addr	= 0x44,</div><div class='add'>+			},</div><div class='add'>+		},</div><div class='add'>+		.num_inputs	 = 2,</div><div class='add'>+		.inputs 	 = {</div><div class='add'>+			{</div><div class='add'>+				.video_input	= 2,</div><div class='add'>+				.name		= "Composite",</div><div class='add'>+			},</div><div class='add'>+			{</div><div class='add'>+				.video_input	= 8,</div><div class='add'>+				.name		= "S-Video",</div><div class='add'>+			},</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct go7007_usb_board board_lifeview_lr192 = {</div><div class='add'>+	.flags		= GO7007_USB_EZUSB,</div><div class='add'>+	.main_info	= {</div><div class='add'>+		.firmware	 = "go7007tv.bin",</div><div class='add'>+		.flags		 = GO7007_BOARD_HAS_AUDIO |</div><div class='add'>+					GO7007_BOARD_USE_ONBOARD_I2C,</div><div class='add'>+		.audio_flags	 = GO7007_AUDIO_I2S_MODE_1 |</div><div class='add'>+					GO7007_AUDIO_WORD_16,</div><div class='add'>+		.audio_rate	 = 48000,</div><div class='add'>+		.audio_bclk_div	 = 8,</div><div class='add'>+		.audio_main_div	 = 2,</div><div class='add'>+		.hpi_buffer_cap  = 7,</div><div class='add'>+		.sensor_flags	 = GO7007_SENSOR_656 |</div><div class='add'>+					GO7007_SENSOR_VALID_ENABLE |</div><div class='add'>+					GO7007_SENSOR_TV |</div><div class='add'>+					GO7007_SENSOR_VBI |</div><div class='add'>+					GO7007_SENSOR_SCALING,</div><div class='add'>+		.num_i2c_devs	 = 0,</div><div class='add'>+		.num_inputs	 = 1,</div><div class='add'>+		.inputs 	 = {</div><div class='add'>+			{</div><div class='add'>+				.video_input	= 0,</div><div class='add'>+				.name		= "Composite",</div><div class='add'>+			},</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct go7007_usb_board board_endura = {</div><div class='add'>+	.flags		= 0,</div><div class='add'>+	.main_info	= {</div><div class='add'>+		.firmware	 = "go7007tv.bin",</div><div class='add'>+		.flags		 = 0,</div><div class='add'>+		.audio_flags	 = GO7007_AUDIO_I2S_MODE_1 |</div><div class='add'>+					GO7007_AUDIO_I2S_MASTER |</div><div class='add'>+					GO7007_AUDIO_WORD_16,</div><div class='add'>+		.audio_rate	 = 8000,</div><div class='add'>+		.audio_bclk_div	 = 48,</div><div class='add'>+		.audio_main_div	 = 8,</div><div class='add'>+		.hpi_buffer_cap  = 0,</div><div class='add'>+		.sensor_flags	 = GO7007_SENSOR_656 |</div><div class='add'>+					GO7007_SENSOR_TV,</div><div class='add'>+		.sensor_h_offset = 8,</div><div class='add'>+		.num_i2c_devs	 = 0,</div><div class='add'>+		.num_inputs	 = 1,</div><div class='add'>+		.inputs 	 = {</div><div class='add'>+			{</div><div class='add'>+				.name		= "Camera",</div><div class='add'>+			},</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct go7007_usb_board board_adlink_mpg24 = {</div><div class='add'>+	.flags		= 0,</div><div class='add'>+	.main_info	= {</div><div class='add'>+		.firmware	 = "go7007tv.bin",</div><div class='add'>+		.flags		 = GO7007_BOARD_USE_ONBOARD_I2C,</div><div class='add'>+		.audio_flags	 = GO7007_AUDIO_I2S_MODE_1 |</div><div class='add'>+					GO7007_AUDIO_I2S_MASTER |</div><div class='add'>+					GO7007_AUDIO_WORD_16,</div><div class='add'>+		.audio_rate	 = 48000,</div><div class='add'>+		.audio_bclk_div	 = 8,</div><div class='add'>+		.audio_main_div	 = 2,</div><div class='add'>+		.hpi_buffer_cap  = 0,</div><div class='add'>+		.sensor_flags	 = GO7007_SENSOR_656 |</div><div class='add'>+					GO7007_SENSOR_TV |</div><div class='add'>+					GO7007_SENSOR_VBI,</div><div class='add'>+		.num_i2c_devs	 = 1,</div><div class='add'>+		.i2c_devs	 = {</div><div class='add'>+			{</div><div class='add'>+				.id	= I2C_DRIVERID_WIS_TW2804,</div><div class='add'>+				.addr	= 0x00, /* yes, really */</div><div class='add'>+			},</div><div class='add'>+		},</div><div class='add'>+		.num_inputs	 = 1,</div><div class='add'>+		.inputs 	 = {</div><div class='add'>+			{</div><div class='add'>+				.name		= "Composite",</div><div class='add'>+			},</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct usb_device_id go7007_usb_id_table[] = {</div><div class='add'>+	{</div><div class='add'>+		.match_flags	= USB_DEVICE_ID_MATCH_DEVICE_AND_VERSION |</div><div class='add'>+					USB_DEVICE_ID_MATCH_INT_INFO,</div><div class='add'>+		.idVendor	= 0x0eb1,  /* Vendor ID of WIS Technologies */</div><div class='add'>+		.idProduct	= 0x7007,  /* Product ID of GO7007SB chip */</div><div class='add'>+		.bcdDevice_lo	= 0x200,   /* Revision number of XMen */</div><div class='add'>+		.bcdDevice_hi	= 0x200,</div><div class='add'>+		.bInterfaceClass	= 255,</div><div class='add'>+		.bInterfaceSubClass	= 0,</div><div class='add'>+		.bInterfaceProtocol	= 255,</div><div class='add'>+		.driver_info	= (kernel_ulong_t)GO7007_BOARDID_XMEN,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.match_flags	= USB_DEVICE_ID_MATCH_DEVICE_AND_VERSION,</div><div class='add'>+		.idVendor	= 0x0eb1,  /* Vendor ID of WIS Technologies */</div><div class='add'>+		.idProduct	= 0x7007,  /* Product ID of GO7007SB chip */</div><div class='add'>+		.bcdDevice_lo	= 0x202,   /* Revision number of Matrix II */</div><div class='add'>+		.bcdDevice_hi	= 0x202,</div><div class='add'>+		.driver_info	= (kernel_ulong_t)GO7007_BOARDID_MATRIX_II,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.match_flags	= USB_DEVICE_ID_MATCH_DEVICE_AND_VERSION,</div><div class='add'>+		.idVendor	= 0x0eb1,  /* Vendor ID of WIS Technologies */</div><div class='add'>+		.idProduct	= 0x7007,  /* Product ID of GO7007SB chip */</div><div class='add'>+		.bcdDevice_lo	= 0x204,   /* Revision number of Matrix */</div><div class='add'>+		.bcdDevice_hi	= 0x204,   /*     Reloaded */</div><div class='add'>+		.driver_info	= (kernel_ulong_t)GO7007_BOARDID_MATRIX_RELOAD,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.match_flags	= USB_DEVICE_ID_MATCH_DEVICE_AND_VERSION |</div><div class='add'>+					USB_DEVICE_ID_MATCH_INT_INFO,</div><div class='add'>+		.idVendor	= 0x0eb1,  /* Vendor ID of WIS Technologies */</div><div class='add'>+		.idProduct	= 0x7007,  /* Product ID of GO7007SB chip */</div><div class='add'>+		.bcdDevice_lo	= 0x205,   /* Revision number of XMen-II */</div><div class='add'>+		.bcdDevice_hi	= 0x205,</div><div class='add'>+		.bInterfaceClass	= 255,</div><div class='add'>+		.bInterfaceSubClass	= 0,</div><div class='add'>+		.bInterfaceProtocol	= 255,</div><div class='add'>+		.driver_info	= (kernel_ulong_t)GO7007_BOARDID_XMEN_II,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.match_flags	= USB_DEVICE_ID_MATCH_DEVICE_AND_VERSION,</div><div class='add'>+		.idVendor	= 0x0eb1,  /* Vendor ID of WIS Technologies */</div><div class='add'>+		.idProduct	= 0x7007,  /* Product ID of GO7007SB chip */</div><div class='add'>+		.bcdDevice_lo	= 0x208,   /* Revision number of Star Trek */</div><div class='add'>+		.bcdDevice_hi	= 0x208,</div><div class='add'>+		.driver_info	= (kernel_ulong_t)GO7007_BOARDID_STAR_TREK,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.match_flags	= USB_DEVICE_ID_MATCH_DEVICE_AND_VERSION |</div><div class='add'>+					USB_DEVICE_ID_MATCH_INT_INFO,</div><div class='add'>+		.idVendor	= 0x0eb1,  /* Vendor ID of WIS Technologies */</div><div class='add'>+		.idProduct	= 0x7007,  /* Product ID of GO7007SB chip */</div><div class='add'>+		.bcdDevice_lo	= 0x209,   /* Revision number of XMen-III */</div><div class='add'>+		.bcdDevice_hi	= 0x209,</div><div class='add'>+		.bInterfaceClass	= 255,</div><div class='add'>+		.bInterfaceSubClass	= 0,</div><div class='add'>+		.bInterfaceProtocol	= 255,</div><div class='add'>+		.driver_info	= (kernel_ulong_t)GO7007_BOARDID_XMEN_III,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.match_flags	= USB_DEVICE_ID_MATCH_DEVICE_AND_VERSION,</div><div class='add'>+		.idVendor	= 0x0eb1,  /* Vendor ID of WIS Technologies */</div><div class='add'>+		.idProduct	= 0x7007,  /* Product ID of GO7007SB chip */</div><div class='add'>+		.bcdDevice_lo	= 0x210,   /* Revision number of Matrix */</div><div class='add'>+		.bcdDevice_hi	= 0x210,   /*     Revolution */</div><div class='add'>+		.driver_info	= (kernel_ulong_t)GO7007_BOARDID_MATRIX_REV,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.match_flags	= USB_DEVICE_ID_MATCH_DEVICE_AND_VERSION,</div><div class='add'>+		.idVendor	= 0x093b,  /* Vendor ID of Plextor */</div><div class='add'>+		.idProduct	= 0xa102,  /* Product ID of M402U */</div><div class='add'>+		.bcdDevice_lo	= 0x1,	   /* revision number of Blueberry */</div><div class='add'>+		.bcdDevice_hi	= 0x1,</div><div class='add'>+		.driver_info	= (kernel_ulong_t)GO7007_BOARDID_PX_M402U,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.match_flags	= USB_DEVICE_ID_MATCH_DEVICE_AND_VERSION,</div><div class='add'>+		.idVendor	= 0x093b,  /* Vendor ID of Plextor */</div><div class='add'>+		.idProduct	= 0xa104,  /* Product ID of TV402U */</div><div class='add'>+		.bcdDevice_lo	= 0x1,</div><div class='add'>+		.bcdDevice_hi	= 0x1,</div><div class='add'>+		.driver_info	= (kernel_ulong_t)GO7007_BOARDID_PX_TV402U_ANY,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.match_flags	= USB_DEVICE_ID_MATCH_DEVICE_AND_VERSION,</div><div class='add'>+		.idVendor	= 0x10fd,  /* Vendor ID of Anubis Electronics */</div><div class='add'>+		.idProduct	= 0xde00,  /* Product ID of Lifeview LR192 */</div><div class='add'>+		.bcdDevice_lo	= 0x1,</div><div class='add'>+		.bcdDevice_hi	= 0x1,</div><div class='add'>+		.driver_info	= (kernel_ulong_t)GO7007_BOARDID_LIFEVIEW_LR192,</div><div class='add'>+	},</div><div class='add'>+	{ }					/* Terminating entry */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_DEVICE_TABLE(usb, go7007_usb_id_table);</div><div class='add'>+</div><div class='add'>+/********************* Driver for EZ-USB HPI interface *********************/</div><div class='add'>+</div><div class='add'>+static int go7007_usb_vendor_request(struct go7007 *go, int request,</div><div class='add'>+		int value, int index, void *transfer_buffer, int length, int in)</div><div class='add'>+{</div><div class='add'>+	struct go7007_usb *usb = go-&gt;hpi_context;</div><div class='add'>+	int timeout = 5000;</div><div class='add'>+</div><div class='add'>+	if (in) {</div><div class='add'>+		return usb_control_msg(usb-&gt;usbdev,</div><div class='add'>+				usb_rcvctrlpipe(usb-&gt;usbdev, 0), request,</div><div class='add'>+				USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_IN,</div><div class='add'>+				value, index, transfer_buffer, length, timeout);</div><div class='add'>+	} else {</div><div class='add'>+		return usb_control_msg(usb-&gt;usbdev,</div><div class='add'>+				usb_sndctrlpipe(usb-&gt;usbdev, 0), request,</div><div class='add'>+				USB_TYPE_VENDOR | USB_RECIP_DEVICE,</div><div class='add'>+				value, index, transfer_buffer, length, timeout);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int go7007_usb_interface_reset(struct go7007 *go)</div><div class='add'>+{</div><div class='add'>+	struct go7007_usb *usb = go-&gt;hpi_context;</div><div class='add'>+	u16 intr_val, intr_data;</div><div class='add'>+</div><div class='add'>+	/* Reset encoder */</div><div class='add'>+	if (go7007_write_interrupt(go, 0x0001, 0x0001) &lt; 0)</div><div class='add'>+		return -1;</div><div class='add'>+	msleep(100);</div><div class='add'>+</div><div class='add'>+	if (usb-&gt;board-&gt;flags &amp; GO7007_USB_EZUSB) {</div><div class='add'>+		/* Reset buffer in EZ-USB */</div><div class='add'>+#ifdef GO7007_USB_DEBUG</div><div class='add'>+		printk(KERN_DEBUG "go7007-usb: resetting EZ-USB buffers\n");</div><div class='add'>+#endif</div><div class='add'>+		if (go7007_usb_vendor_request(go, 0x10, 0, 0, NULL, 0, 0) &lt; 0 ||</div><div class='add'>+		    go7007_usb_vendor_request(go, 0x10, 0, 0, NULL, 0, 0) &lt; 0)</div><div class='add'>+			return -1;</div><div class='add'>+</div><div class='add'>+		/* Reset encoder again */</div><div class='add'>+		if (go7007_write_interrupt(go, 0x0001, 0x0001) &lt; 0)</div><div class='add'>+			return -1;</div><div class='add'>+		msleep(100);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Wait for an interrupt to indicate successful hardware reset */</div><div class='add'>+	if (go7007_read_interrupt(go, &amp;intr_val, &amp;intr_data) &lt; 0 ||</div><div class='add'>+			(intr_val &amp; ~0x1) != 0x55aa) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+			"go7007-usb: unable to reset the USB interface\n");</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int go7007_usb_ezusb_write_interrupt(struct go7007 *go,</div><div class='add'>+						int addr, int data)</div><div class='add'>+{</div><div class='add'>+	struct go7007_usb *usb = go-&gt;hpi_context;</div><div class='add'>+	int i, r;</div><div class='add'>+	u16 status_reg;</div><div class='add'>+	int timeout = 500;</div><div class='add'>+</div><div class='add'>+#ifdef GO7007_USB_DEBUG</div><div class='add'>+	printk(KERN_DEBUG</div><div class='add'>+		"go7007-usb: WriteInterrupt: %04x %04x\n", addr, data);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 100; ++i) {</div><div class='add'>+		r = usb_control_msg(usb-&gt;usbdev,</div><div class='add'>+				usb_rcvctrlpipe(usb-&gt;usbdev, 0), 0x14,</div><div class='add'>+				USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_IN,</div><div class='add'>+				0, HPI_STATUS_ADDR, &amp;status_reg,</div><div class='add'>+				sizeof(status_reg), timeout);</div><div class='add'>+		if (r &lt; 0)</div><div class='add'>+			goto write_int_error;</div><div class='add'>+		__le16_to_cpus(&amp;status_reg);</div><div class='add'>+		if (!(status_reg &amp; 0x0010))</div><div class='add'>+			break;</div><div class='add'>+		msleep(10);</div><div class='add'>+	}</div><div class='add'>+	if (i == 100) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+			"go7007-usb: device is hung, status reg = 0x%04x\n",</div><div class='add'>+			status_reg);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+	r = usb_control_msg(usb-&gt;usbdev, usb_sndctrlpipe(usb-&gt;usbdev, 0), 0x12,</div><div class='add'>+			USB_TYPE_VENDOR | USB_RECIP_DEVICE, data,</div><div class='add'>+			INT_PARAM_ADDR, NULL, 0, timeout);</div><div class='add'>+	if (r &lt; 0)</div><div class='add'>+		goto write_int_error;</div><div class='add'>+	r = usb_control_msg(usb-&gt;usbdev, usb_sndctrlpipe(usb-&gt;usbdev, 0),</div><div class='add'>+			0x12, USB_TYPE_VENDOR | USB_RECIP_DEVICE, addr,</div><div class='add'>+			INT_INDEX_ADDR, NULL, 0, timeout);</div><div class='add'>+	if (r &lt; 0)</div><div class='add'>+		goto write_int_error;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+write_int_error:</div><div class='add'>+	printk(KERN_ERR "go7007-usb: error in WriteInterrupt: %d\n", r);</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int go7007_usb_onboard_write_interrupt(struct go7007 *go,</div><div class='add'>+						int addr, int data)</div><div class='add'>+{</div><div class='add'>+	struct go7007_usb *usb = go-&gt;hpi_context;</div><div class='add'>+	u8 *tbuf;</div><div class='add'>+	int r;</div><div class='add'>+	int timeout = 500;</div><div class='add'>+</div><div class='add'>+#ifdef GO7007_USB_DEBUG</div><div class='add'>+	printk(KERN_DEBUG</div><div class='add'>+		"go7007-usb: WriteInterrupt: %04x %04x\n", addr, data);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	tbuf = kmalloc(8, GFP_KERNEL);</div><div class='add'>+	if (tbuf == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	memset(tbuf, 0, 8);</div><div class='add'>+	tbuf[0] = data &amp; 0xff;</div><div class='add'>+	tbuf[1] = data &gt;&gt; 8;</div><div class='add'>+	tbuf[2] = addr &amp; 0xff;</div><div class='add'>+	tbuf[3] = addr &gt;&gt; 8;</div><div class='add'>+	r = usb_control_msg(usb-&gt;usbdev, usb_sndctrlpipe(usb-&gt;usbdev, 2), 0x00,</div><div class='add'>+			USB_TYPE_VENDOR | USB_RECIP_ENDPOINT, 0x55aa,</div><div class='add'>+			0xf0f0, tbuf, 8, timeout);</div><div class='add'>+	kfree(tbuf);</div><div class='add'>+	if (r &lt; 0) {</div><div class='add'>+		printk(KERN_ERR "go7007-usb: error in WriteInterrupt: %d\n", r);</div><div class='add'>+		return r;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void go7007_usb_readinterrupt_complete(struct urb *urb)</div><div class='add'>+{</div><div class='add'>+	struct go7007 *go = (struct go7007 *)urb-&gt;context;</div><div class='add'>+	u16 *regs = (u16 *)urb-&gt;transfer_buffer;</div><div class='add'>+</div><div class='add'>+	if (urb-&gt;status != 0) {</div><div class='add'>+		if (urb-&gt;status != -ESHUTDOWN &amp;&amp;</div><div class='add'>+				go-&gt;status != STATUS_SHUTDOWN) {</div><div class='add'>+			printk(KERN_ERR</div><div class='add'>+				"go7007-usb: error in read interrupt: %d\n",</div><div class='add'>+				urb-&gt;status);</div><div class='add'>+		} else {</div><div class='add'>+			wake_up(&amp;go-&gt;interrupt_waitq);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	} else if (urb-&gt;actual_length != urb-&gt;transfer_buffer_length) {</div><div class='add'>+		printk(KERN_ERR "go7007-usb: short read in interrupt pipe!\n");</div><div class='add'>+	} else {</div><div class='add'>+		go-&gt;interrupt_available = 1;</div><div class='add'>+		go-&gt;interrupt_data = __le16_to_cpu(regs[0]);</div><div class='add'>+		go-&gt;interrupt_value = __le16_to_cpu(regs[1]);</div><div class='add'>+#ifdef GO7007_USB_DEBUG</div><div class='add'>+		printk(KERN_DEBUG "go7007-usb: ReadInterrupt: %04x %04x\n",</div><div class='add'>+				go-&gt;interrupt_value, go-&gt;interrupt_data);</div><div class='add'>+#endif</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	wake_up(&amp;go-&gt;interrupt_waitq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int go7007_usb_read_interrupt(struct go7007 *go)</div><div class='add'>+{</div><div class='add'>+	struct go7007_usb *usb = go-&gt;hpi_context;</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	r = usb_submit_urb(usb-&gt;intr_urb, GFP_KERNEL);</div><div class='add'>+	if (r &lt; 0) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+			"go7007-usb: unable to submit interrupt urb: %d\n", r);</div><div class='add'>+		return r;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void go7007_usb_read_video_pipe_complete(struct urb *urb)</div><div class='add'>+{</div><div class='add'>+	struct go7007 *go = (struct go7007 *)urb-&gt;context;</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	if (!go-&gt;streaming) {</div><div class='add'>+		wake_up_interruptible(&amp;go-&gt;frame_waitq);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	if (urb-&gt;status != 0) {</div><div class='add'>+		printk(KERN_ERR "go7007-usb: error in video pipe: %d\n",</div><div class='add'>+				urb-&gt;status);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	if (urb-&gt;actual_length != urb-&gt;transfer_buffer_length) {</div><div class='add'>+		printk(KERN_ERR "go7007-usb: short read in video pipe!\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	go7007_parse_video_stream(go, urb-&gt;transfer_buffer, urb-&gt;actual_length);</div><div class='add'>+	r = usb_submit_urb(urb, GFP_ATOMIC);</div><div class='add'>+	if (r &lt; 0)</div><div class='add'>+		printk(KERN_ERR "go7007-usb: error in video pipe: %d\n", r);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void go7007_usb_read_audio_pipe_complete(struct urb *urb)</div><div class='add'>+{</div><div class='add'>+	struct go7007 *go = (struct go7007 *)urb-&gt;context;</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	if (!go-&gt;streaming)</div><div class='add'>+		return;</div><div class='add'>+	if (urb-&gt;status != 0) {</div><div class='add'>+		printk(KERN_ERR "go7007-usb: error in audio pipe: %d\n",</div><div class='add'>+				urb-&gt;status);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	if (urb-&gt;actual_length != urb-&gt;transfer_buffer_length) {</div><div class='add'>+		printk(KERN_ERR "go7007-usb: short read in audio pipe!\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	if (go-&gt;audio_deliver != NULL)</div><div class='add'>+		go-&gt;audio_deliver(go, urb-&gt;transfer_buffer, urb-&gt;actual_length);</div><div class='add'>+	r = usb_submit_urb(urb, GFP_ATOMIC);</div><div class='add'>+	if (r &lt; 0)</div><div class='add'>+		printk(KERN_ERR "go7007-usb: error in audio pipe: %d\n", r);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int go7007_usb_stream_start(struct go7007 *go)</div><div class='add'>+{</div><div class='add'>+	struct go7007_usb *usb = go-&gt;hpi_context;</div><div class='add'>+	int i, r;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 8; ++i) {</div><div class='add'>+		r = usb_submit_urb(usb-&gt;video_urbs[i], GFP_KERNEL);</div><div class='add'>+		if (r &lt; 0) {</div><div class='add'>+			printk(KERN_ERR "go7007-usb: error submitting video "</div><div class='add'>+					"urb %d: %d\n", i, r);</div><div class='add'>+			goto video_submit_failed;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (!go-&gt;audio_enabled)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 8; ++i) {</div><div class='add'>+		r = usb_submit_urb(usb-&gt;audio_urbs[i], GFP_KERNEL);</div><div class='add'>+		if (r &lt; 0) {</div><div class='add'>+			printk(KERN_ERR "go7007-usb: error submitting audio "</div><div class='add'>+					"urb %d: %d\n", i, r);</div><div class='add'>+			goto audio_submit_failed;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+audio_submit_failed:</div><div class='add'>+	for (i = 0; i &lt; 8; ++i)</div><div class='add'>+		usb_kill_urb(usb-&gt;audio_urbs[i]);</div><div class='add'>+video_submit_failed:</div><div class='add'>+	for (i = 0; i &lt; 8; ++i)</div><div class='add'>+		usb_kill_urb(usb-&gt;video_urbs[i]);</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int go7007_usb_stream_stop(struct go7007 *go)</div><div class='add'>+{</div><div class='add'>+	struct go7007_usb *usb = go-&gt;hpi_context;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (go-&gt;status == STATUS_SHUTDOWN)</div><div class='add'>+		return 0;</div><div class='add'>+	for (i = 0; i &lt; 8; ++i)</div><div class='add'>+		usb_kill_urb(usb-&gt;video_urbs[i]);</div><div class='add'>+	if (go-&gt;audio_enabled)</div><div class='add'>+		for (i = 0; i &lt; 8; ++i)</div><div class='add'>+			usb_kill_urb(usb-&gt;audio_urbs[i]);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int go7007_usb_send_firmware(struct go7007 *go, u8 *data, int len)</div><div class='add'>+{</div><div class='add'>+	struct go7007_usb *usb = go-&gt;hpi_context;</div><div class='add'>+	int transferred, pipe;</div><div class='add'>+	int timeout = 500;</div><div class='add'>+</div><div class='add'>+#ifdef GO7007_USB_DEBUG</div><div class='add'>+	printk(KERN_DEBUG "go7007-usb: DownloadBuffer sending %d bytes\n", len);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	if (usb-&gt;board-&gt;flags &amp; GO7007_USB_EZUSB)</div><div class='add'>+		pipe = usb_sndbulkpipe(usb-&gt;usbdev, 2);</div><div class='add'>+	else</div><div class='add'>+		pipe = usb_sndbulkpipe(usb-&gt;usbdev, 3);</div><div class='add'>+</div><div class='add'>+	return usb_bulk_msg(usb-&gt;usbdev, pipe, data, len,</div><div class='add'>+					&amp;transferred, timeout);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct go7007_hpi_ops go7007_usb_ezusb_hpi_ops = {</div><div class='add'>+	.interface_reset	= go7007_usb_interface_reset,</div><div class='add'>+	.write_interrupt	= go7007_usb_ezusb_write_interrupt,</div><div class='add'>+	.read_interrupt		= go7007_usb_read_interrupt,</div><div class='add'>+	.stream_start		= go7007_usb_stream_start,</div><div class='add'>+	.stream_stop		= go7007_usb_stream_stop,</div><div class='add'>+	.send_firmware		= go7007_usb_send_firmware,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct go7007_hpi_ops go7007_usb_onboard_hpi_ops = {</div><div class='add'>+	.interface_reset	= go7007_usb_interface_reset,</div><div class='add'>+	.write_interrupt	= go7007_usb_onboard_write_interrupt,</div><div class='add'>+	.read_interrupt		= go7007_usb_read_interrupt,</div><div class='add'>+	.stream_start		= go7007_usb_stream_start,</div><div class='add'>+	.stream_stop		= go7007_usb_stream_stop,</div><div class='add'>+	.send_firmware		= go7007_usb_send_firmware,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/********************* Driver for EZ-USB I2C adapter *********************/</div><div class='add'>+</div><div class='add'>+static int go7007_usb_i2c_master_xfer(struct i2c_adapter *adapter,</div><div class='add'>+					struct i2c_msg msgs[], int num)</div><div class='add'>+{</div><div class='add'>+	struct go7007 *go = i2c_get_adapdata(adapter);</div><div class='add'>+	struct go7007_usb *usb = go-&gt;hpi_context;</div><div class='add'>+	u8 buf[16];</div><div class='add'>+	int buf_len, i;</div><div class='add'>+	int ret = -1;</div><div class='add'>+</div><div class='add'>+	if (go-&gt;status == STATUS_SHUTDOWN)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	down(&amp;usb-&gt;i2c_lock);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num; ++i) {</div><div class='add'>+		/* The hardware command is "write some bytes then read some</div><div class='add'>+		 * bytes", so we try to coalesce a write followed by a read</div><div class='add'>+		 * into a single USB transaction */</div><div class='add'>+		if (i + 1 &lt; num &amp;&amp; msgs[i].addr == msgs[i + 1].addr &amp;&amp;</div><div class='add'>+				!(msgs[i].flags &amp; I2C_M_RD) &amp;&amp;</div><div class='add'>+				(msgs[i + 1].flags &amp; I2C_M_RD)) {</div><div class='add'>+#ifdef GO7007_I2C_DEBUG</div><div class='add'>+			printk(KERN_DEBUG "go7007-usb: i2c write/read %d/%d "</div><div class='add'>+					"bytes on %02x\n", msgs[i].len,</div><div class='add'>+					msgs[i + 1].len, msgs[i].addr);</div><div class='add'>+#endif</div><div class='add'>+			buf[0] = 0x01;</div><div class='add'>+			buf[1] = msgs[i].len + 1;</div><div class='add'>+			buf[2] = msgs[i].addr &lt;&lt; 1;</div><div class='add'>+			memcpy(&amp;buf[3], msgs[i].buf, msgs[i].len);</div><div class='add'>+			buf_len = msgs[i].len + 3;</div><div class='add'>+			buf[buf_len++] = msgs[++i].len;</div><div class='add'>+		} else if (msgs[i].flags &amp; I2C_M_RD) {</div><div class='add'>+#ifdef GO7007_I2C_DEBUG</div><div class='add'>+			printk(KERN_DEBUG "go7007-usb: i2c read %d "</div><div class='add'>+					"bytes on %02x\n", msgs[i].len,</div><div class='add'>+					msgs[i].addr);</div><div class='add'>+#endif</div><div class='add'>+			buf[0] = 0x01;</div><div class='add'>+			buf[1] = 1;</div><div class='add'>+			buf[2] = msgs[i].addr &lt;&lt; 1;</div><div class='add'>+			buf[3] = msgs[i].len;</div><div class='add'>+			buf_len = 4;</div><div class='add'>+		} else {</div><div class='add'>+#ifdef GO7007_I2C_DEBUG</div><div class='add'>+			printk(KERN_DEBUG "go7007-usb: i2c write %d "</div><div class='add'>+					"bytes on %02x\n", msgs[i].len,</div><div class='add'>+					msgs[i].addr);</div><div class='add'>+#endif</div><div class='add'>+			buf[0] = 0x00;</div><div class='add'>+			buf[1] = msgs[i].len + 1;</div><div class='add'>+			buf[2] = msgs[i].addr &lt;&lt; 1;</div><div class='add'>+			memcpy(&amp;buf[3], msgs[i].buf, msgs[i].len);</div><div class='add'>+			buf_len = msgs[i].len + 3;</div><div class='add'>+			buf[buf_len++] = 0;</div><div class='add'>+		}</div><div class='add'>+		if (go7007_usb_vendor_request(go, 0x24, 0, 0,</div><div class='add'>+						buf, buf_len, 0) &lt; 0)</div><div class='add'>+			goto i2c_done;</div><div class='add'>+		if (msgs[i].flags &amp; I2C_M_RD) {</div><div class='add'>+			memset(buf, 0, sizeof(buf));</div><div class='add'>+			if (go7007_usb_vendor_request(go, 0x25, 0, 0, buf,</div><div class='add'>+						msgs[i].len + 1, 1) &lt; 0)</div><div class='add'>+				goto i2c_done;</div><div class='add'>+			memcpy(msgs[i].buf, buf + 1, msgs[i].len);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	ret = 0;</div><div class='add'>+</div><div class='add'>+i2c_done:</div><div class='add'>+	up(&amp;usb-&gt;i2c_lock);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 go7007_usb_functionality(struct i2c_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	/* No errors are reported by the hardware, so we don't bother</div><div class='add'>+	 * supporting quick writes to avoid confusing probing */</div><div class='add'>+	return (I2C_FUNC_SMBUS_EMUL) &amp; ~I2C_FUNC_SMBUS_QUICK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct i2c_algorithm go7007_usb_algo = {</div><div class='add'>+	.master_xfer	= go7007_usb_i2c_master_xfer,</div><div class='add'>+	.functionality	= go7007_usb_functionality,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct i2c_adapter go7007_usb_adap_templ = {</div><div class='add'>+	.owner			= THIS_MODULE,</div><div class='add'>+	.class			= I2C_CLASS_TV_ANALOG,</div><div class='add'>+	.name			= "WIS GO7007SB EZ-USB",</div><div class='add'>+	.id			= I2C_ALGO_GO7007_USB,</div><div class='add'>+	.algo			= &amp;go7007_usb_algo,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/********************* USB add/remove functions *********************/</div><div class='add'>+</div><div class='add'>+static int go7007_usb_probe(struct usb_interface *intf,</div><div class='add'>+		const struct usb_device_id *id)</div><div class='add'>+{</div><div class='add'>+	struct go7007 *go;</div><div class='add'>+	struct go7007_usb *usb;</div><div class='add'>+	struct go7007_usb_board *board;</div><div class='add'>+	struct usb_device *usbdev = interface_to_usbdev(intf);</div><div class='add'>+	char *name;</div><div class='add'>+	int video_pipe, i, v_urb_len;</div><div class='add'>+</div><div class='add'>+	printk(KERN_DEBUG "go7007-usb: probing new GO7007 USB board\n");</div><div class='add'>+</div><div class='add'>+	switch (id-&gt;driver_info) {</div><div class='add'>+	case GO7007_BOARDID_MATRIX_II:</div><div class='add'>+		name = "WIS Matrix II or compatible";</div><div class='add'>+		board = &amp;board_matrix_ii;</div><div class='add'>+		break;</div><div class='add'>+	case GO7007_BOARDID_MATRIX_RELOAD:</div><div class='add'>+		name = "WIS Matrix Reloaded or compatible";</div><div class='add'>+		board = &amp;board_matrix_reload;</div><div class='add'>+		break;</div><div class='add'>+	case GO7007_BOARDID_MATRIX_REV:</div><div class='add'>+		name = "WIS Matrix Revolution or compatible";</div><div class='add'>+		board = &amp;board_matrix_revolution;</div><div class='add'>+		break;</div><div class='add'>+	case GO7007_BOARDID_STAR_TREK:</div><div class='add'>+		name = "WIS Star Trek or compatible";</div><div class='add'>+		board = &amp;board_star_trek;</div><div class='add'>+		break;</div><div class='add'>+	case GO7007_BOARDID_XMEN:</div><div class='add'>+		name = "WIS XMen or compatible";</div><div class='add'>+		board = &amp;board_xmen;</div><div class='add'>+		break;</div><div class='add'>+	case GO7007_BOARDID_XMEN_II:</div><div class='add'>+		name = "WIS XMen II or compatible";</div><div class='add'>+		board = &amp;board_xmen;</div><div class='add'>+		break;</div><div class='add'>+	case GO7007_BOARDID_XMEN_III:</div><div class='add'>+		name = "WIS XMen III or compatible";</div><div class='add'>+		board = &amp;board_xmen;</div><div class='add'>+		break;</div><div class='add'>+	case GO7007_BOARDID_PX_M402U:</div><div class='add'>+		name = "Plextor PX-M402U";</div><div class='add'>+		board = &amp;board_matrix_ii;</div><div class='add'>+		break;</div><div class='add'>+	case GO7007_BOARDID_PX_TV402U_ANY:</div><div class='add'>+		name = "Plextor PX-TV402U (unknown tuner)";</div><div class='add'>+		board = &amp;board_px_tv402u;</div><div class='add'>+		break;</div><div class='add'>+	case GO7007_BOARDID_LIFEVIEW_LR192:</div><div class='add'>+		printk(KERN_ERR "go7007-usb: The Lifeview TV Walker Ultra "</div><div class='add'>+				"is not supported.  Sorry!\n");</div><div class='add'>+		return 0;</div><div class='add'>+		name = "Lifeview TV Walker Ultra";</div><div class='add'>+		board = &amp;board_lifeview_lr192;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		printk(KERN_ERR "go7007-usb: unknown board ID %d!\n",</div><div class='add'>+				(unsigned int)id-&gt;driver_info);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	usb = kmalloc(sizeof(struct go7007_usb), GFP_KERNEL);</div><div class='add'>+	if (usb == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	memset(usb, 0, sizeof(struct go7007_usb));</div><div class='add'>+</div><div class='add'>+	/* Allocate the URB and buffer for receiving incoming interrupts */</div><div class='add'>+	usb-&gt;intr_urb = usb_alloc_urb(0, GFP_KERNEL);</div><div class='add'>+	if (usb-&gt;intr_urb == NULL)</div><div class='add'>+		goto allocfail;</div><div class='add'>+	usb-&gt;intr_urb-&gt;transfer_buffer = kmalloc(2*sizeof(u16), GFP_KERNEL);</div><div class='add'>+	if (usb-&gt;intr_urb-&gt;transfer_buffer == NULL)</div><div class='add'>+		goto allocfail;</div><div class='add'>+</div><div class='add'>+	go = go7007_alloc(&amp;board-&gt;main_info, &amp;intf-&gt;dev);</div><div class='add'>+	if (go == NULL)</div><div class='add'>+		goto allocfail;</div><div class='add'>+	usb-&gt;board = board;</div><div class='add'>+	usb-&gt;usbdev = usbdev;</div><div class='add'>+	go-&gt;board_id = id-&gt;driver_info;</div><div class='add'>+	strncpy(go-&gt;name, name, sizeof(go-&gt;name));</div><div class='add'>+	if (board-&gt;flags &amp; GO7007_USB_EZUSB)</div><div class='add'>+		go-&gt;hpi_ops = &amp;go7007_usb_ezusb_hpi_ops;</div><div class='add'>+	else</div><div class='add'>+		go-&gt;hpi_ops = &amp;go7007_usb_onboard_hpi_ops;</div><div class='add'>+	go-&gt;hpi_context = usb;</div><div class='add'>+	usb_fill_int_urb(usb-&gt;intr_urb, usb-&gt;usbdev,</div><div class='add'>+			usb_rcvintpipe(usb-&gt;usbdev, 4),</div><div class='add'>+			usb-&gt;intr_urb-&gt;transfer_buffer, 2*sizeof(u16),</div><div class='add'>+			go7007_usb_readinterrupt_complete, go, 8);</div><div class='add'>+	usb_set_intfdata(intf, go);</div><div class='add'>+</div><div class='add'>+	/* Boot the GO7007 */</div><div class='add'>+	if (go7007_boot_encoder(go, go-&gt;board_info-&gt;flags &amp;</div><div class='add'>+					GO7007_BOARD_USE_ONBOARD_I2C) &lt; 0)</div><div class='add'>+		goto initfail;</div><div class='add'>+</div><div class='add'>+	/* Register the EZ-USB I2C adapter, if we're using it */</div><div class='add'>+	if (board-&gt;flags &amp; GO7007_USB_EZUSB_I2C) {</div><div class='add'>+		memcpy(&amp;go-&gt;i2c_adapter, &amp;go7007_usb_adap_templ,</div><div class='add'>+				sizeof(go7007_usb_adap_templ));</div><div class='add'>+		init_MUTEX(&amp;usb-&gt;i2c_lock);</div><div class='add'>+		go-&gt;i2c_adapter.dev.parent = go-&gt;dev;</div><div class='add'>+		i2c_set_adapdata(&amp;go-&gt;i2c_adapter, go);</div><div class='add'>+		if (i2c_add_adapter(&amp;go-&gt;i2c_adapter) &lt; 0) {</div><div class='add'>+			printk(KERN_ERR</div><div class='add'>+				"go7007-usb: error: i2c_add_adapter failed\n");</div><div class='add'>+			goto initfail;</div><div class='add'>+		}</div><div class='add'>+		go-&gt;i2c_adapter_online = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Pelco and Adlink reused the XMen and XMen-III vendor and product</div><div class='add'>+	 * IDs for their own incompatible designs.  We can detect XMen boards</div><div class='add'>+	 * by probing the sensor, but there is no way to probe the sensors on</div><div class='add'>+	 * the Pelco and Adlink designs so we default to the Adlink.  If it</div><div class='add'>+	 * is actually a Pelco, the user must set the assume_endura module</div><div class='add'>+	 * parameter. */</div><div class='add'>+	if ((go-&gt;board_id == GO7007_BOARDID_XMEN ||</div><div class='add'>+				go-&gt;board_id == GO7007_BOARDID_XMEN_III) &amp;&amp;</div><div class='add'>+			go-&gt;i2c_adapter_online) {</div><div class='add'>+		union i2c_smbus_data data;</div><div class='add'>+</div><div class='add'>+		/* Check to see if register 0x0A is 0x76 */</div><div class='add'>+		i2c_smbus_xfer(&amp;go-&gt;i2c_adapter, 0x21, I2C_CLIENT_SCCB,</div><div class='add'>+			I2C_SMBUS_READ, 0x0A, I2C_SMBUS_BYTE_DATA, &amp;data);</div><div class='add'>+		if (data.byte != 0x76) {</div><div class='add'>+			if (assume_endura) {</div><div class='add'>+				go-&gt;board_id = GO7007_BOARDID_ENDURA;</div><div class='add'>+				usb-&gt;board = board = &amp;board_endura;</div><div class='add'>+				go-&gt;board_info = &amp;board-&gt;main_info;</div><div class='add'>+				strncpy(go-&gt;name, "Pelco Endura",</div><div class='add'>+						sizeof(go-&gt;name));</div><div class='add'>+			} else {</div><div class='add'>+				u16 channel;</div><div class='add'>+</div><div class='add'>+				/* set GPIO5 to be an output, currently low */</div><div class='add'>+				go7007_write_addr(go, 0x3c82, 0x0000);</div><div class='add'>+				go7007_write_addr(go, 0x3c80, 0x00df);</div><div class='add'>+				/* read channel number from GPIO[1:0] */</div><div class='add'>+				go7007_read_addr(go, 0x3c81, &amp;channel);</div><div class='add'>+				channel &amp;= 0x3;</div><div class='add'>+				go-&gt;board_id = GO7007_BOARDID_ADLINK_MPG24;</div><div class='add'>+				usb-&gt;board = board = &amp;board_adlink_mpg24;</div><div class='add'>+				go-&gt;board_info = &amp;board-&gt;main_info;</div><div class='add'>+				go-&gt;channel_number = channel;</div><div class='add'>+				snprintf(go-&gt;name, sizeof(go-&gt;name),</div><div class='add'>+					"Adlink PCI-MPG24, channel #%d",</div><div class='add'>+					channel);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Probe the tuner model on the TV402U */</div><div class='add'>+	if (go-&gt;board_id == GO7007_BOARDID_PX_TV402U_ANY) {</div><div class='add'>+		u8 data[3];</div><div class='add'>+</div><div class='add'>+		/* Board strapping indicates tuner model */</div><div class='add'>+		if (go7007_usb_vendor_request(go, 0x41, 0, 0, data, 3, 1) &lt; 0) {</div><div class='add'>+			printk(KERN_ERR "go7007-usb: GPIO read failed!\n");</div><div class='add'>+			goto initfail;</div><div class='add'>+		}</div><div class='add'>+		switch (data[0] &gt;&gt; 6) {</div><div class='add'>+		case 1:</div><div class='add'>+			go-&gt;board_id = GO7007_BOARDID_PX_TV402U_EU;</div><div class='add'>+			go-&gt;tuner_type = TUNER_SONY_BTF_PG472Z;</div><div class='add'>+			strncpy(go-&gt;name, "Plextor PX-TV402U-EU",</div><div class='add'>+					sizeof(go-&gt;name));</div><div class='add'>+			break;</div><div class='add'>+		case 2:</div><div class='add'>+			go-&gt;board_id = GO7007_BOARDID_PX_TV402U_JP;</div><div class='add'>+			go-&gt;tuner_type = TUNER_SONY_BTF_PK467Z;</div><div class='add'>+			strncpy(go-&gt;name, "Plextor PX-TV402U-JP",</div><div class='add'>+					sizeof(go-&gt;name));</div><div class='add'>+			break;</div><div class='add'>+		case 3:</div><div class='add'>+			go-&gt;board_id = GO7007_BOARDID_PX_TV402U_NA;</div><div class='add'>+			go-&gt;tuner_type = TUNER_SONY_BTF_PB463Z;</div><div class='add'>+			strncpy(go-&gt;name, "Plextor PX-TV402U-NA",</div><div class='add'>+					sizeof(go-&gt;name));</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			printk(KERN_DEBUG "go7007-usb: unable to detect "</div><div class='add'>+						"tuner type!\n");</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		/* Configure tuner mode selection inputs connected</div><div class='add'>+		 * to the EZ-USB GPIO output pins */</div><div class='add'>+		if (go7007_usb_vendor_request(go, 0x40, 0x7f02, 0,</div><div class='add'>+					NULL, 0, 0) &lt; 0) {</div><div class='add'>+			printk(KERN_ERR</div><div class='add'>+				"go7007-usb: GPIO write failed!\n");</div><div class='add'>+			goto initfail;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Print a nasty message if the user attempts to use a USB2.0 device in</div><div class='add'>+	 * a USB1.1 port.  There will be silent corruption of the stream. */</div><div class='add'>+	if ((board-&gt;flags &amp; GO7007_USB_EZUSB) &amp;&amp;</div><div class='add'>+			usbdev-&gt;speed != USB_SPEED_HIGH)</div><div class='add'>+		printk(KERN_ERR "go7007-usb: *** WARNING ***  This device "</div><div class='add'>+				"must be connected to a USB 2.0 port!  "</div><div class='add'>+				"Attempting to capture video through a USB 1.1 "</div><div class='add'>+				"port will result in stream corruption, even "</div><div class='add'>+				"at low bitrates!\n");</div><div class='add'>+</div><div class='add'>+	/* Do any final GO7007 initialization, then register the</div><div class='add'>+	 * V4L2 and ALSA interfaces */</div><div class='add'>+	if (go7007_register_encoder(go) &lt; 0)</div><div class='add'>+		goto initfail;</div><div class='add'>+</div><div class='add'>+	/* Allocate the URBs and buffers for receiving the video stream */</div><div class='add'>+	if (board-&gt;flags &amp; GO7007_USB_EZUSB) {</div><div class='add'>+		v_urb_len = 1024;</div><div class='add'>+		video_pipe = usb_rcvbulkpipe(usb-&gt;usbdev, 6);</div><div class='add'>+	} else {</div><div class='add'>+		v_urb_len = 512;</div><div class='add'>+		video_pipe = usb_rcvbulkpipe(usb-&gt;usbdev, 1);</div><div class='add'>+	}</div><div class='add'>+	for (i = 0; i &lt; 8; ++i) {</div><div class='add'>+		usb-&gt;video_urbs[i] = usb_alloc_urb(0, GFP_KERNEL);</div><div class='add'>+		if (usb-&gt;video_urbs[i] == NULL)</div><div class='add'>+			goto initfail;</div><div class='add'>+		usb-&gt;video_urbs[i]-&gt;transfer_buffer =</div><div class='add'>+						kmalloc(v_urb_len, GFP_KERNEL);</div><div class='add'>+		if (usb-&gt;video_urbs[i]-&gt;transfer_buffer == NULL)</div><div class='add'>+			goto initfail;</div><div class='add'>+		usb_fill_bulk_urb(usb-&gt;video_urbs[i], usb-&gt;usbdev, video_pipe,</div><div class='add'>+				usb-&gt;video_urbs[i]-&gt;transfer_buffer, v_urb_len,</div><div class='add'>+				go7007_usb_read_video_pipe_complete, go);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Allocate the URBs and buffers for receiving the audio stream */</div><div class='add'>+	if ((board-&gt;flags &amp; GO7007_USB_EZUSB) &amp;&amp; go-&gt;audio_enabled)</div><div class='add'>+		for (i = 0; i &lt; 8; ++i) {</div><div class='add'>+			usb-&gt;audio_urbs[i] = usb_alloc_urb(0, GFP_KERNEL);</div><div class='add'>+			if (usb-&gt;audio_urbs[i] == NULL)</div><div class='add'>+				goto initfail;</div><div class='add'>+			usb-&gt;audio_urbs[i]-&gt;transfer_buffer = kmalloc(4096,</div><div class='add'>+								GFP_KERNEL);</div><div class='add'>+			if (usb-&gt;audio_urbs[i]-&gt;transfer_buffer == NULL)</div><div class='add'>+				goto initfail;</div><div class='add'>+			usb_fill_bulk_urb(usb-&gt;audio_urbs[i], usb-&gt;usbdev,</div><div class='add'>+				usb_rcvbulkpipe(usb-&gt;usbdev, 8),</div><div class='add'>+				usb-&gt;audio_urbs[i]-&gt;transfer_buffer, 4096,</div><div class='add'>+				go7007_usb_read_audio_pipe_complete, go);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	go-&gt;status = STATUS_ONLINE;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+initfail:</div><div class='add'>+	go-&gt;status = STATUS_SHUTDOWN;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+allocfail:</div><div class='add'>+	if (usb-&gt;intr_urb) {</div><div class='add'>+		kfree(usb-&gt;intr_urb-&gt;transfer_buffer);</div><div class='add'>+		usb_free_urb(usb-&gt;intr_urb);</div><div class='add'>+	}</div><div class='add'>+	kfree(usb);</div><div class='add'>+	return -ENOMEM;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void go7007_usb_disconnect(struct usb_interface *intf)</div><div class='add'>+{</div><div class='add'>+	struct go7007 *go = usb_get_intfdata(intf);</div><div class='add'>+	struct go7007_usb *usb = go-&gt;hpi_context;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	go-&gt;status = STATUS_SHUTDOWN;</div><div class='add'>+	usb_kill_urb(usb-&gt;intr_urb);</div><div class='add'>+</div><div class='add'>+	/* Free USB-related structs */</div><div class='add'>+	for (i = 0; i &lt; 8; ++i) {</div><div class='add'>+		if (usb-&gt;video_urbs[i] != NULL) {</div><div class='add'>+			if (usb-&gt;video_urbs[i]-&gt;transfer_buffer != NULL)</div><div class='add'>+				kfree(usb-&gt;video_urbs[i]-&gt;transfer_buffer);</div><div class='add'>+			usb_free_urb(usb-&gt;video_urbs[i]);</div><div class='add'>+		}</div><div class='add'>+		if (usb-&gt;audio_urbs[i] != NULL) {</div><div class='add'>+			if (usb-&gt;audio_urbs[i]-&gt;transfer_buffer != NULL)</div><div class='add'>+				kfree(usb-&gt;audio_urbs[i]-&gt;transfer_buffer);</div><div class='add'>+			usb_free_urb(usb-&gt;audio_urbs[i]);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	kfree(usb-&gt;intr_urb-&gt;transfer_buffer);</div><div class='add'>+	usb_free_urb(usb-&gt;intr_urb);</div><div class='add'>+</div><div class='add'>+	kfree(go-&gt;hpi_context);</div><div class='add'>+</div><div class='add'>+	go7007_remove(go);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct usb_driver go7007_usb_driver = {</div><div class='add'>+	.name		= "go7007",</div><div class='add'>+	.probe		= go7007_usb_probe,</div><div class='add'>+	.disconnect	= go7007_usb_disconnect,</div><div class='add'>+	.id_table	= go7007_usb_id_table,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init go7007_usb_init(void)</div><div class='add'>+{</div><div class='add'>+	return usb_register(&amp;go7007_usb_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit go7007_usb_cleanup(void)</div><div class='add'>+{</div><div class='add'>+	usb_deregister(&amp;go7007_usb_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(go7007_usb_init);</div><div class='add'>+module_exit(go7007_usb_cleanup);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/staging/go7007/go7007-v4l2.c b/drivers/staging/go7007/go7007-v4l2.c<br/>new file mode 100644<br/>index 000000000000..94e1141a1fcd<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/go7007/go7007-v4l2.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/go7007/go7007-v4l2.c</a></div><div class='hunk'>@@ -0,0 +1,1499 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2005-2006 Micronas USA Inc.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License (Version 2) as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software Foundation,</div><div class='add'>+ * Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/version.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/unistd.h&gt;</div><div class='add'>+#include &lt;linux/time.h&gt;</div><div class='add'>+#include &lt;linux/vmalloc.h&gt;</div><div class='add'>+#include &lt;linux/pagemap.h&gt;</div><div class='add'>+#include &lt;linux/videodev2.h&gt;</div><div class='add'>+#include &lt;media/v4l2-common.h&gt;</div><div class='add'>+#include &lt;media/v4l2-ioctl.h&gt;</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/semaphore.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='add'>+#include &lt;asm/system.h&gt;</div><div class='add'>+</div><div class='add'>+#include "go7007.h"</div><div class='add'>+#include "go7007-priv.h"</div><div class='add'>+#include "wis-i2c.h"</div><div class='add'>+</div><div class='add'>+static void deactivate_buffer(struct go7007_buffer *gobuf)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (gobuf-&gt;state != BUF_STATE_IDLE) {</div><div class='add'>+		list_del(&amp;gobuf-&gt;stream);</div><div class='add'>+		gobuf-&gt;state = BUF_STATE_IDLE;</div><div class='add'>+	}</div><div class='add'>+	if (gobuf-&gt;page_count &gt; 0) {</div><div class='add'>+		for (i = 0; i &lt; gobuf-&gt;page_count; ++i)</div><div class='add'>+			page_cache_release(gobuf-&gt;pages[i]);</div><div class='add'>+		gobuf-&gt;page_count = 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void abort_queued(struct go7007 *go)</div><div class='add'>+{</div><div class='add'>+	struct go7007_buffer *gobuf, *next;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(gobuf, next, &amp;go-&gt;stream, stream) {</div><div class='add'>+		deactivate_buffer(gobuf);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int go7007_streamoff(struct go7007 *go)</div><div class='add'>+{</div><div class='add'>+	int retval = -EINVAL;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	down(&amp;go-&gt;hw_lock);</div><div class='add'>+	if (go-&gt;streaming) {</div><div class='add'>+		go-&gt;streaming = 0;</div><div class='add'>+		go7007_stream_stop(go);</div><div class='add'>+		spin_lock_irqsave(&amp;go-&gt;spinlock, flags);</div><div class='add'>+		abort_queued(go);</div><div class='add'>+		spin_unlock_irqrestore(&amp;go-&gt;spinlock, flags);</div><div class='add'>+		go7007_reset_encoder(go);</div><div class='add'>+		retval = 0;</div><div class='add'>+	}</div><div class='add'>+	up(&amp;go-&gt;hw_lock);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int go7007_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct go7007 *go = video_get_drvdata(video_devdata(file));</div><div class='add'>+	struct go7007_file *gofh;</div><div class='add'>+</div><div class='add'>+	if (go-&gt;status != STATUS_ONLINE)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	gofh = kmalloc(sizeof(struct go7007_file), GFP_KERNEL);</div><div class='add'>+	if (gofh == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	++go-&gt;ref_count;</div><div class='add'>+	gofh-&gt;go = go;</div><div class='add'>+	init_MUTEX(&amp;gofh-&gt;lock);</div><div class='add'>+	gofh-&gt;buf_count = 0;</div><div class='add'>+	file-&gt;private_data = gofh;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int go7007_release(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct go7007_file *gofh = file-&gt;private_data;</div><div class='add'>+	struct go7007 *go = gofh-&gt;go;</div><div class='add'>+</div><div class='add'>+	if (gofh-&gt;buf_count &gt; 0) {</div><div class='add'>+		go7007_streamoff(go);</div><div class='add'>+		go-&gt;in_use = 0;</div><div class='add'>+		kfree(gofh-&gt;bufs);</div><div class='add'>+		gofh-&gt;buf_count = 0;</div><div class='add'>+	}</div><div class='add'>+	kfree(gofh);</div><div class='add'>+	if (--go-&gt;ref_count == 0)</div><div class='add'>+		kfree(go);</div><div class='add'>+	file-&gt;private_data = NULL;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 get_frame_type_flag(struct go7007_buffer *gobuf, int format)</div><div class='add'>+{</div><div class='add'>+	u8 *f = page_address(gobuf-&gt;pages[0]);</div><div class='add'>+</div><div class='add'>+	switch (format) {</div><div class='add'>+	case GO7007_FORMAT_MJPEG:</div><div class='add'>+		return V4L2_BUF_FLAG_KEYFRAME;</div><div class='add'>+	case GO7007_FORMAT_MPEG4:</div><div class='add'>+		switch ((f[gobuf-&gt;frame_offset + 4] &gt;&gt; 6) &amp; 0x3) {</div><div class='add'>+		case 0:</div><div class='add'>+			return V4L2_BUF_FLAG_KEYFRAME;</div><div class='add'>+		case 1:</div><div class='add'>+			return V4L2_BUF_FLAG_PFRAME;</div><div class='add'>+		case 2:</div><div class='add'>+			return V4L2_BUF_FLAG_BFRAME;</div><div class='add'>+		default:</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+	case GO7007_FORMAT_MPEG1:</div><div class='add'>+	case GO7007_FORMAT_MPEG2:</div><div class='add'>+		switch ((f[gobuf-&gt;frame_offset + 5] &gt;&gt; 3) &amp; 0x7) {</div><div class='add'>+		case 1:</div><div class='add'>+			return V4L2_BUF_FLAG_KEYFRAME;</div><div class='add'>+		case 2:</div><div class='add'>+			return V4L2_BUF_FLAG_PFRAME;</div><div class='add'>+		case 3:</div><div class='add'>+			return V4L2_BUF_FLAG_BFRAME;</div><div class='add'>+		default:</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int set_capture_size(struct go7007 *go, struct v4l2_format *fmt, int try)</div><div class='add'>+{</div><div class='add'>+	int sensor_height = 0, sensor_width = 0;</div><div class='add'>+	int width, height, i;</div><div class='add'>+</div><div class='add'>+	if (fmt != NULL &amp;&amp; fmt-&gt;fmt.pix.pixelformat != V4L2_PIX_FMT_MJPEG &amp;&amp;</div><div class='add'>+			fmt-&gt;fmt.pix.pixelformat != V4L2_PIX_FMT_MPEG &amp;&amp;</div><div class='add'>+			fmt-&gt;fmt.pix.pixelformat != V4L2_PIX_FMT_MPEG4)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	switch (go-&gt;standard) {</div><div class='add'>+	case GO7007_STD_NTSC:</div><div class='add'>+		sensor_width = 720;</div><div class='add'>+		sensor_height = 480;</div><div class='add'>+		break;</div><div class='add'>+	case GO7007_STD_PAL:</div><div class='add'>+		sensor_width = 720;</div><div class='add'>+		sensor_height = 576;</div><div class='add'>+		break;</div><div class='add'>+	case GO7007_STD_OTHER:</div><div class='add'>+		sensor_width = go-&gt;board_info-&gt;sensor_width;</div><div class='add'>+		sensor_height = go-&gt;board_info-&gt;sensor_height;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (fmt == NULL) {</div><div class='add'>+		width = sensor_width;</div><div class='add'>+		height = sensor_height;</div><div class='add'>+	} else if (go-&gt;board_info-&gt;sensor_flags &amp; GO7007_SENSOR_SCALING) {</div><div class='add'>+		if (fmt-&gt;fmt.pix.width &gt; sensor_width)</div><div class='add'>+			width = sensor_width;</div><div class='add'>+		else if (fmt-&gt;fmt.pix.width &lt; 144)</div><div class='add'>+			width = 144;</div><div class='add'>+		else</div><div class='add'>+			width = fmt-&gt;fmt.pix.width &amp; ~0x0f;</div><div class='add'>+</div><div class='add'>+		if (fmt-&gt;fmt.pix.height &gt; sensor_height)</div><div class='add'>+			height = sensor_height;</div><div class='add'>+		else if (fmt-&gt;fmt.pix.height &lt; 96)</div><div class='add'>+			height = 96;</div><div class='add'>+		else</div><div class='add'>+			height = fmt-&gt;fmt.pix.height &amp; ~0x0f;</div><div class='add'>+	} else {</div><div class='add'>+		int requested_size = fmt-&gt;fmt.pix.width * fmt-&gt;fmt.pix.height;</div><div class='add'>+		int sensor_size = sensor_width * sensor_height;</div><div class='add'>+</div><div class='add'>+		if (64 * requested_size &lt; 9 * sensor_size) {</div><div class='add'>+			width = sensor_width / 4;</div><div class='add'>+			height = sensor_height / 4;</div><div class='add'>+		} else if (64 * requested_size &lt; 36 * sensor_size) {</div><div class='add'>+			width = sensor_width / 2;</div><div class='add'>+			height = sensor_height / 2;</div><div class='add'>+		} else {</div><div class='add'>+			width = sensor_width;</div><div class='add'>+			height = sensor_height;</div><div class='add'>+		}</div><div class='add'>+		width &amp;= ~0xf;</div><div class='add'>+		height &amp;= ~0xf;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (fmt != NULL) {</div><div class='add'>+		u32 pixelformat = fmt-&gt;fmt.pix.pixelformat;</div><div class='add'>+</div><div class='add'>+		memset(fmt, 0, sizeof(*fmt));</div><div class='add'>+		fmt-&gt;type = V4L2_BUF_TYPE_VIDEO_CAPTURE;</div><div class='add'>+		fmt-&gt;fmt.pix.width = width;</div><div class='add'>+		fmt-&gt;fmt.pix.height = height;</div><div class='add'>+		fmt-&gt;fmt.pix.pixelformat = pixelformat;</div><div class='add'>+		fmt-&gt;fmt.pix.field = V4L2_FIELD_NONE;</div><div class='add'>+		fmt-&gt;fmt.pix.bytesperline = 0;</div><div class='add'>+		fmt-&gt;fmt.pix.sizeimage = GO7007_BUF_SIZE;</div><div class='add'>+		fmt-&gt;fmt.pix.colorspace = V4L2_COLORSPACE_SMPTE170M; /* ?? */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (try)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	go-&gt;width = width;</div><div class='add'>+	go-&gt;height = height;</div><div class='add'>+	go-&gt;encoder_h_offset = go-&gt;board_info-&gt;sensor_h_offset;</div><div class='add'>+	go-&gt;encoder_v_offset = go-&gt;board_info-&gt;sensor_v_offset;</div><div class='add'>+	for (i = 0; i &lt; 4; ++i)</div><div class='add'>+		go-&gt;modet[i].enable = 0;</div><div class='add'>+	for (i = 0; i &lt; 1624; ++i)</div><div class='add'>+		go-&gt;modet_map[i] = 0;</div><div class='add'>+</div><div class='add'>+	if (go-&gt;board_info-&gt;sensor_flags &amp; GO7007_SENSOR_SCALING) {</div><div class='add'>+		struct video_decoder_resolution res;</div><div class='add'>+</div><div class='add'>+		res.width = width;</div><div class='add'>+		if (height &gt; sensor_height / 2) {</div><div class='add'>+			res.height = height / 2;</div><div class='add'>+			go-&gt;encoder_v_halve = 0;</div><div class='add'>+		} else {</div><div class='add'>+			res.height = height;</div><div class='add'>+			go-&gt;encoder_v_halve = 1;</div><div class='add'>+		}</div><div class='add'>+		if (go-&gt;i2c_adapter_online)</div><div class='add'>+			i2c_clients_command(&amp;go-&gt;i2c_adapter,</div><div class='add'>+					DECODER_SET_RESOLUTION, &amp;res);</div><div class='add'>+	} else {</div><div class='add'>+		if (width &lt;= sensor_width / 4) {</div><div class='add'>+			go-&gt;encoder_h_halve = 1;</div><div class='add'>+			go-&gt;encoder_v_halve = 1;</div><div class='add'>+			go-&gt;encoder_subsample = 1;</div><div class='add'>+		} else if (width &lt;= sensor_width / 2) {</div><div class='add'>+			go-&gt;encoder_h_halve = 1;</div><div class='add'>+			go-&gt;encoder_v_halve = 1;</div><div class='add'>+			go-&gt;encoder_subsample = 0;</div><div class='add'>+		} else {</div><div class='add'>+			go-&gt;encoder_h_halve = 0;</div><div class='add'>+			go-&gt;encoder_v_halve = 0;</div><div class='add'>+			go-&gt;encoder_subsample = 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (fmt == NULL)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	switch (fmt-&gt;fmt.pix.pixelformat) {</div><div class='add'>+	case V4L2_PIX_FMT_MPEG:</div><div class='add'>+		if (go-&gt;format == GO7007_FORMAT_MPEG1 ||</div><div class='add'>+				go-&gt;format == GO7007_FORMAT_MPEG2 ||</div><div class='add'>+				go-&gt;format == GO7007_FORMAT_MPEG4)</div><div class='add'>+			break;</div><div class='add'>+		go-&gt;format = GO7007_FORMAT_MPEG1;</div><div class='add'>+		go-&gt;pali = 0;</div><div class='add'>+		go-&gt;aspect_ratio = GO7007_RATIO_1_1;</div><div class='add'>+		go-&gt;gop_size = go-&gt;sensor_framerate / 1000;</div><div class='add'>+		go-&gt;ipb = 0;</div><div class='add'>+		go-&gt;closed_gop = 1;</div><div class='add'>+		go-&gt;repeat_seqhead = 1;</div><div class='add'>+		go-&gt;seq_header_enable = 1;</div><div class='add'>+		go-&gt;gop_header_enable = 1;</div><div class='add'>+		go-&gt;dvd_mode = 0;</div><div class='add'>+		break;</div><div class='add'>+	/* Backwards compatibility only! */</div><div class='add'>+	case V4L2_PIX_FMT_MPEG4:</div><div class='add'>+		if (go-&gt;format == GO7007_FORMAT_MPEG4)</div><div class='add'>+			break;</div><div class='add'>+		go-&gt;format = GO7007_FORMAT_MPEG4;</div><div class='add'>+		go-&gt;pali = 0xf5;</div><div class='add'>+		go-&gt;aspect_ratio = GO7007_RATIO_1_1;</div><div class='add'>+		go-&gt;gop_size = go-&gt;sensor_framerate / 1000;</div><div class='add'>+		go-&gt;ipb = 0;</div><div class='add'>+		go-&gt;closed_gop = 1;</div><div class='add'>+		go-&gt;repeat_seqhead = 1;</div><div class='add'>+		go-&gt;seq_header_enable = 1;</div><div class='add'>+		go-&gt;gop_header_enable = 1;</div><div class='add'>+		go-&gt;dvd_mode = 0;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_PIX_FMT_MJPEG:</div><div class='add'>+		go-&gt;format = GO7007_FORMAT_MJPEG;</div><div class='add'>+		go-&gt;pali = 0;</div><div class='add'>+		go-&gt;aspect_ratio = GO7007_RATIO_1_1;</div><div class='add'>+		go-&gt;gop_size = 0;</div><div class='add'>+		go-&gt;ipb = 0;</div><div class='add'>+		go-&gt;closed_gop = 0;</div><div class='add'>+		go-&gt;repeat_seqhead = 0;</div><div class='add'>+		go-&gt;seq_header_enable = 0;</div><div class='add'>+		go-&gt;gop_header_enable = 0;</div><div class='add'>+		go-&gt;dvd_mode = 0;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int clip_to_modet_map(struct go7007 *go, int region,</div><div class='add'>+		struct v4l2_clip *clip_list)</div><div class='add'>+{</div><div class='add'>+	struct v4l2_clip clip, *clip_ptr;</div><div class='add'>+	int x, y, mbnum;</div><div class='add'>+</div><div class='add'>+	/* Check if coordinates are OK and if any macroblocks are already</div><div class='add'>+	 * used by other regions (besides 0) */</div><div class='add'>+	clip_ptr = clip_list;</div><div class='add'>+	while (clip_ptr) {</div><div class='add'>+		if (copy_from_user(&amp;clip, clip_ptr, sizeof(clip)))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		if (clip.c.left &lt; 0 || (clip.c.left &amp; 0xF) ||</div><div class='add'>+				clip.c.width &lt;= 0 || (clip.c.width &amp; 0xF))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (clip.c.left + clip.c.width &gt; go-&gt;width)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (clip.c.top &lt; 0 || (clip.c.top &amp; 0xF) ||</div><div class='add'>+				clip.c.height &lt;= 0 || (clip.c.height &amp; 0xF))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (clip.c.top + clip.c.height &gt; go-&gt;height)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		for (y = 0; y &lt; clip.c.height; y += 16)</div><div class='add'>+			for (x = 0; x &lt; clip.c.width; x += 16) {</div><div class='add'>+				mbnum = (go-&gt;width &gt;&gt; 4) *</div><div class='add'>+						((clip.c.top + y) &gt;&gt; 4) +</div><div class='add'>+					((clip.c.left + x) &gt;&gt; 4);</div><div class='add'>+				if (go-&gt;modet_map[mbnum] != 0 &amp;&amp;</div><div class='add'>+						go-&gt;modet_map[mbnum] != region)</div><div class='add'>+					return -EBUSY;</div><div class='add'>+			}</div><div class='add'>+		clip_ptr = clip.next;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Clear old region macroblocks */</div><div class='add'>+	for (mbnum = 0; mbnum &lt; 1624; ++mbnum)</div><div class='add'>+		if (go-&gt;modet_map[mbnum] == region)</div><div class='add'>+			go-&gt;modet_map[mbnum] = 0;</div><div class='add'>+</div><div class='add'>+	/* Claim macroblocks in this list */</div><div class='add'>+	clip_ptr = clip_list;</div><div class='add'>+	while (clip_ptr) {</div><div class='add'>+		if (copy_from_user(&amp;clip, clip_ptr, sizeof(clip)))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		for (y = 0; y &lt; clip.c.height; y += 16)</div><div class='add'>+			for (x = 0; x &lt; clip.c.width; x += 16) {</div><div class='add'>+				mbnum = (go-&gt;width &gt;&gt; 4) *</div><div class='add'>+						((clip.c.top + y) &gt;&gt; 4) +</div><div class='add'>+					((clip.c.left + x) &gt;&gt; 4);</div><div class='add'>+				go-&gt;modet_map[mbnum] = region;</div><div class='add'>+			}</div><div class='add'>+		clip_ptr = clip.next;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int go7007_do_ioctl(struct inode *inode, struct file *file,</div><div class='add'>+		unsigned int cmd, void *arg)</div><div class='add'>+{</div><div class='add'>+	struct go7007_file *gofh = file-&gt;private_data;</div><div class='add'>+	struct go7007 *go = gofh-&gt;go;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int retval = 0;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case VIDIOC_QUERYCAP:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_capability *cap = arg;</div><div class='add'>+</div><div class='add'>+		memset(cap, 0, sizeof(*cap));</div><div class='add'>+		strcpy(cap-&gt;driver, "go7007");</div><div class='add'>+		strncpy(cap-&gt;card, go-&gt;name, sizeof(cap-&gt;card));</div><div class='add'>+		cap-&gt;version = KERNEL_VERSION(0, 9, 8);</div><div class='add'>+		cap-&gt;capabilities = V4L2_CAP_VIDEO_CAPTURE |</div><div class='add'>+				V4L2_CAP_STREAMING; /* | V4L2_CAP_AUDIO; */</div><div class='add'>+		if (go-&gt;board_info-&gt;flags &amp; GO7007_BOARD_HAS_TUNER)</div><div class='add'>+			cap-&gt;capabilities |= V4L2_CAP_TUNER;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_ENUM_FMT:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_fmtdesc *fmt = arg;</div><div class='add'>+		unsigned int index;</div><div class='add'>+		char *desc;</div><div class='add'>+		u32 pixelformat;</div><div class='add'>+</div><div class='add'>+		if (fmt-&gt;type != V4L2_BUF_TYPE_VIDEO_CAPTURE)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		switch (fmt-&gt;index) {</div><div class='add'>+		case 0:</div><div class='add'>+			pixelformat = V4L2_PIX_FMT_MJPEG;</div><div class='add'>+			desc = "Motion-JPEG";</div><div class='add'>+			break;</div><div class='add'>+		case 1:</div><div class='add'>+			pixelformat = V4L2_PIX_FMT_MPEG;</div><div class='add'>+			desc = "MPEG1/MPEG2/MPEG4";</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		index = fmt-&gt;index;</div><div class='add'>+		memset(fmt, 0, sizeof(*fmt));</div><div class='add'>+		fmt-&gt;index = index;</div><div class='add'>+		fmt-&gt;type = V4L2_BUF_TYPE_VIDEO_CAPTURE;</div><div class='add'>+		fmt-&gt;flags = V4L2_FMT_FLAG_COMPRESSED;</div><div class='add'>+		strncpy(fmt-&gt;description, desc, sizeof(fmt-&gt;description));</div><div class='add'>+		fmt-&gt;pixelformat = pixelformat;</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_TRY_FMT:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_format *fmt = arg;</div><div class='add'>+</div><div class='add'>+		if (fmt-&gt;type != V4L2_BUF_TYPE_VIDEO_CAPTURE)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		return set_capture_size(go, fmt, 1);</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_G_FMT:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_format *fmt = arg;</div><div class='add'>+</div><div class='add'>+		if (fmt-&gt;type != V4L2_BUF_TYPE_VIDEO_CAPTURE)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		memset(fmt, 0, sizeof(*fmt));</div><div class='add'>+		fmt-&gt;type = V4L2_BUF_TYPE_VIDEO_CAPTURE;</div><div class='add'>+		fmt-&gt;fmt.pix.width = go-&gt;width;</div><div class='add'>+		fmt-&gt;fmt.pix.height = go-&gt;height;</div><div class='add'>+		fmt-&gt;fmt.pix.pixelformat = go-&gt;format == GO7007_FORMAT_MJPEG ?</div><div class='add'>+			V4L2_PIX_FMT_MJPEG : V4L2_PIX_FMT_MPEG;</div><div class='add'>+		fmt-&gt;fmt.pix.field = V4L2_FIELD_NONE;</div><div class='add'>+		fmt-&gt;fmt.pix.bytesperline = 0;</div><div class='add'>+		fmt-&gt;fmt.pix.sizeimage = GO7007_BUF_SIZE;</div><div class='add'>+		fmt-&gt;fmt.pix.colorspace = V4L2_COLORSPACE_SMPTE170M; /* ?? */</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_S_FMT:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_format *fmt = arg;</div><div class='add'>+</div><div class='add'>+		if (fmt-&gt;type != V4L2_BUF_TYPE_VIDEO_CAPTURE)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (go-&gt;streaming)</div><div class='add'>+			return -EBUSY;</div><div class='add'>+		return set_capture_size(go, fmt, 0);</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_G_FBUF:</div><div class='add'>+	case VIDIOC_S_FBUF:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	case VIDIOC_REQBUFS:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_requestbuffers *req = arg;</div><div class='add'>+		unsigned int count, i;</div><div class='add'>+</div><div class='add'>+		if (go-&gt;streaming)</div><div class='add'>+			return -EBUSY;</div><div class='add'>+		if (req-&gt;type != V4L2_BUF_TYPE_VIDEO_CAPTURE ||</div><div class='add'>+				req-&gt;memory != V4L2_MEMORY_MMAP)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		down(&amp;gofh-&gt;lock);</div><div class='add'>+		retval = -EBUSY;</div><div class='add'>+		for (i = 0; i &lt; gofh-&gt;buf_count; ++i)</div><div class='add'>+			if (gofh-&gt;bufs[i].mapped &gt; 0)</div><div class='add'>+				goto unlock_and_return;</div><div class='add'>+		down(&amp;go-&gt;hw_lock);</div><div class='add'>+		if (go-&gt;in_use &gt; 0 &amp;&amp; gofh-&gt;buf_count == 0) {</div><div class='add'>+			up(&amp;go-&gt;hw_lock);</div><div class='add'>+			goto unlock_and_return;</div><div class='add'>+		}</div><div class='add'>+		if (gofh-&gt;buf_count &gt; 0)</div><div class='add'>+			kfree(gofh-&gt;bufs);</div><div class='add'>+		retval = -ENOMEM;</div><div class='add'>+		count = req-&gt;count;</div><div class='add'>+		if (count &gt; 0) {</div><div class='add'>+			if (count &lt; 2)</div><div class='add'>+				count = 2;</div><div class='add'>+			if (count &gt; 32)</div><div class='add'>+				count = 32;</div><div class='add'>+			gofh-&gt;bufs = kmalloc(count *</div><div class='add'>+						sizeof(struct go7007_buffer),</div><div class='add'>+					GFP_KERNEL);</div><div class='add'>+			if (gofh-&gt;bufs == NULL) {</div><div class='add'>+				up(&amp;go-&gt;hw_lock);</div><div class='add'>+				goto unlock_and_return;</div><div class='add'>+			}</div><div class='add'>+			memset(gofh-&gt;bufs, 0,</div><div class='add'>+					count * sizeof(struct go7007_buffer));</div><div class='add'>+			for (i = 0; i &lt; count; ++i) {</div><div class='add'>+				gofh-&gt;bufs[i].go = go;</div><div class='add'>+				gofh-&gt;bufs[i].index = i;</div><div class='add'>+				gofh-&gt;bufs[i].state = BUF_STATE_IDLE;</div><div class='add'>+				gofh-&gt;bufs[i].mapped = 0;</div><div class='add'>+			}</div><div class='add'>+			go-&gt;in_use = 1;</div><div class='add'>+		} else {</div><div class='add'>+			go-&gt;in_use = 0;</div><div class='add'>+		}</div><div class='add'>+		gofh-&gt;buf_count = count;</div><div class='add'>+		up(&amp;go-&gt;hw_lock);</div><div class='add'>+		up(&amp;gofh-&gt;lock);</div><div class='add'>+		memset(req, 0, sizeof(*req));</div><div class='add'>+		req-&gt;count = count;</div><div class='add'>+		req-&gt;type = V4L2_BUF_TYPE_VIDEO_CAPTURE;</div><div class='add'>+		req-&gt;memory = V4L2_MEMORY_MMAP;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_QUERYBUF:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_buffer *buf = arg;</div><div class='add'>+		unsigned int index;</div><div class='add'>+</div><div class='add'>+		retval = -EINVAL;</div><div class='add'>+		if (buf-&gt;type != V4L2_BUF_TYPE_VIDEO_CAPTURE)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		index = buf-&gt;index;</div><div class='add'>+		down(&amp;gofh-&gt;lock);</div><div class='add'>+		if (index &gt;= gofh-&gt;buf_count)</div><div class='add'>+			goto unlock_and_return;</div><div class='add'>+		memset(buf, 0, sizeof(*buf));</div><div class='add'>+		buf-&gt;index = index;</div><div class='add'>+		buf-&gt;type = V4L2_BUF_TYPE_VIDEO_CAPTURE;</div><div class='add'>+		switch (gofh-&gt;bufs[index].state) {</div><div class='add'>+		case BUF_STATE_QUEUED:</div><div class='add'>+			buf-&gt;flags = V4L2_BUF_FLAG_QUEUED;</div><div class='add'>+			break;</div><div class='add'>+		case BUF_STATE_DONE:</div><div class='add'>+			buf-&gt;flags = V4L2_BUF_FLAG_DONE;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			buf-&gt;flags = 0;</div><div class='add'>+		}</div><div class='add'>+		if (gofh-&gt;bufs[index].mapped)</div><div class='add'>+			buf-&gt;flags |= V4L2_BUF_FLAG_MAPPED;</div><div class='add'>+		buf-&gt;memory = V4L2_MEMORY_MMAP;</div><div class='add'>+		buf-&gt;m.offset = index * GO7007_BUF_SIZE;</div><div class='add'>+		buf-&gt;length = GO7007_BUF_SIZE;</div><div class='add'>+		up(&amp;gofh-&gt;lock);</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_QBUF:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_buffer *buf = arg;</div><div class='add'>+		struct go7007_buffer *gobuf;</div><div class='add'>+		int ret;</div><div class='add'>+</div><div class='add'>+		retval = -EINVAL;</div><div class='add'>+		if (buf-&gt;type != V4L2_BUF_TYPE_VIDEO_CAPTURE ||</div><div class='add'>+				buf-&gt;memory != V4L2_MEMORY_MMAP)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		down(&amp;gofh-&gt;lock);</div><div class='add'>+		if (buf-&gt;index &lt; 0 || buf-&gt;index &gt;= gofh-&gt;buf_count)</div><div class='add'>+			goto unlock_and_return;</div><div class='add'>+		gobuf = &amp;gofh-&gt;bufs[buf-&gt;index];</div><div class='add'>+		if (gobuf-&gt;mapped == 0)</div><div class='add'>+			goto unlock_and_return;</div><div class='add'>+		retval = -EBUSY;</div><div class='add'>+		if (gobuf-&gt;state != BUF_STATE_IDLE)</div><div class='add'>+			goto unlock_and_return;</div><div class='add'>+		/* offset will be 0 until we really support USERPTR streaming */</div><div class='add'>+		gobuf-&gt;offset = gobuf-&gt;user_addr &amp; ~PAGE_MASK;</div><div class='add'>+		gobuf-&gt;bytesused = 0;</div><div class='add'>+		gobuf-&gt;frame_offset = 0;</div><div class='add'>+		gobuf-&gt;modet_active = 0;</div><div class='add'>+		if (gobuf-&gt;offset &gt; 0)</div><div class='add'>+			gobuf-&gt;page_count = GO7007_BUF_PAGES + 1;</div><div class='add'>+		else</div><div class='add'>+			gobuf-&gt;page_count = GO7007_BUF_PAGES;</div><div class='add'>+		retval = -ENOMEM;</div><div class='add'>+		down_read(&amp;current-&gt;mm-&gt;mmap_sem);</div><div class='add'>+		ret = get_user_pages(current, current-&gt;mm,</div><div class='add'>+				gobuf-&gt;user_addr &amp; PAGE_MASK, gobuf-&gt;page_count,</div><div class='add'>+				1, 1, gobuf-&gt;pages, NULL);</div><div class='add'>+		up_read(&amp;current-&gt;mm-&gt;mmap_sem);</div><div class='add'>+		if (ret != gobuf-&gt;page_count) {</div><div class='add'>+			int i;</div><div class='add'>+			for (i = 0; i &lt; ret; ++i)</div><div class='add'>+				page_cache_release(gobuf-&gt;pages[i]);</div><div class='add'>+			gobuf-&gt;page_count = 0;</div><div class='add'>+			goto unlock_and_return;</div><div class='add'>+		}</div><div class='add'>+		gobuf-&gt;state = BUF_STATE_QUEUED;</div><div class='add'>+		spin_lock_irqsave(&amp;go-&gt;spinlock, flags);</div><div class='add'>+		list_add_tail(&amp;gobuf-&gt;stream, &amp;go-&gt;stream);</div><div class='add'>+		spin_unlock_irqrestore(&amp;go-&gt;spinlock, flags);</div><div class='add'>+		up(&amp;gofh-&gt;lock);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_DQBUF:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_buffer *buf = arg;</div><div class='add'>+		struct go7007_buffer *gobuf;</div><div class='add'>+		u32 frame_type_flag;</div><div class='add'>+		DEFINE_WAIT(wait);</div><div class='add'>+</div><div class='add'>+		if (buf-&gt;type != V4L2_BUF_TYPE_VIDEO_CAPTURE)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (buf-&gt;memory != V4L2_MEMORY_MMAP)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		down(&amp;gofh-&gt;lock);</div><div class='add'>+		retval = -EINVAL;</div><div class='add'>+		if (list_empty(&amp;go-&gt;stream))</div><div class='add'>+			goto unlock_and_return;</div><div class='add'>+		gobuf = list_entry(go-&gt;stream.next,</div><div class='add'>+				struct go7007_buffer, stream);</div><div class='add'>+		retval = -EAGAIN;</div><div class='add'>+		if (gobuf-&gt;state != BUF_STATE_DONE &amp;&amp;</div><div class='add'>+				!(file-&gt;f_flags &amp; O_NONBLOCK)) {</div><div class='add'>+			for (;;) {</div><div class='add'>+				prepare_to_wait(&amp;go-&gt;frame_waitq, &amp;wait,</div><div class='add'>+						TASK_INTERRUPTIBLE);</div><div class='add'>+				if (gobuf-&gt;state == BUF_STATE_DONE)</div><div class='add'>+					break;</div><div class='add'>+				if (signal_pending(current)) {</div><div class='add'>+					retval = -ERESTARTSYS;</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+				schedule();</div><div class='add'>+			}</div><div class='add'>+			finish_wait(&amp;go-&gt;frame_waitq, &amp;wait);</div><div class='add'>+		}</div><div class='add'>+		if (gobuf-&gt;state != BUF_STATE_DONE)</div><div class='add'>+			goto unlock_and_return;</div><div class='add'>+		spin_lock_irqsave(&amp;go-&gt;spinlock, flags);</div><div class='add'>+		deactivate_buffer(gobuf);</div><div class='add'>+		spin_unlock_irqrestore(&amp;go-&gt;spinlock, flags);</div><div class='add'>+		frame_type_flag = get_frame_type_flag(gobuf, go-&gt;format);</div><div class='add'>+		gobuf-&gt;state = BUF_STATE_IDLE;</div><div class='add'>+		memset(buf, 0, sizeof(*buf));</div><div class='add'>+		buf-&gt;index = gobuf-&gt;index;</div><div class='add'>+		buf-&gt;type = V4L2_BUF_TYPE_VIDEO_CAPTURE;</div><div class='add'>+		buf-&gt;bytesused = gobuf-&gt;bytesused;</div><div class='add'>+		buf-&gt;flags = V4L2_BUF_FLAG_MAPPED | frame_type_flag;</div><div class='add'>+		buf-&gt;field = V4L2_FIELD_NONE;</div><div class='add'>+		buf-&gt;timestamp = gobuf-&gt;timestamp;</div><div class='add'>+		buf-&gt;sequence = gobuf-&gt;seq;</div><div class='add'>+		buf-&gt;memory = V4L2_MEMORY_MMAP;</div><div class='add'>+		buf-&gt;m.offset = gobuf-&gt;index * GO7007_BUF_SIZE;</div><div class='add'>+		buf-&gt;length = GO7007_BUF_SIZE;</div><div class='add'>+		buf-&gt;reserved = gobuf-&gt;modet_active;</div><div class='add'>+		up(&amp;gofh-&gt;lock);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_STREAMON:</div><div class='add'>+	{</div><div class='add'>+		unsigned int *type = arg;</div><div class='add'>+</div><div class='add'>+		if (*type != V4L2_BUF_TYPE_VIDEO_CAPTURE)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		down(&amp;gofh-&gt;lock);</div><div class='add'>+		down(&amp;go-&gt;hw_lock);</div><div class='add'>+		if (!go-&gt;streaming) {</div><div class='add'>+			go-&gt;streaming = 1;</div><div class='add'>+			go-&gt;next_seq = 0;</div><div class='add'>+			go-&gt;active_buf = NULL;</div><div class='add'>+			if (go7007_start_encoder(go) &lt; 0)</div><div class='add'>+				retval = -EIO;</div><div class='add'>+			else</div><div class='add'>+				retval = 0;</div><div class='add'>+		}</div><div class='add'>+		up(&amp;go-&gt;hw_lock);</div><div class='add'>+		up(&amp;gofh-&gt;lock);</div><div class='add'>+		return retval;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_STREAMOFF:</div><div class='add'>+	{</div><div class='add'>+		unsigned int *type = arg;</div><div class='add'>+</div><div class='add'>+		if (*type != V4L2_BUF_TYPE_VIDEO_CAPTURE)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		down(&amp;gofh-&gt;lock);</div><div class='add'>+		go7007_streamoff(go);</div><div class='add'>+		up(&amp;gofh-&gt;lock);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_QUERYCTRL:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_queryctrl *ctrl = arg;</div><div class='add'>+		u32 id;</div><div class='add'>+</div><div class='add'>+		if (!go-&gt;i2c_adapter_online)</div><div class='add'>+			return -EIO;</div><div class='add'>+		id = ctrl-&gt;id;</div><div class='add'>+		memset(ctrl, 0, sizeof(*ctrl));</div><div class='add'>+		ctrl-&gt;id = id;</div><div class='add'>+		i2c_clients_command(&amp;go-&gt;i2c_adapter, VIDIOC_QUERYCTRL, arg);</div><div class='add'>+		return ctrl-&gt;name[0] == 0 ? -EINVAL : 0;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_G_CTRL:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_control *ctrl = arg;</div><div class='add'>+		struct v4l2_queryctrl query;</div><div class='add'>+</div><div class='add'>+		if (!go-&gt;i2c_adapter_online)</div><div class='add'>+			return -EIO;</div><div class='add'>+		memset(&amp;query, 0, sizeof(query));</div><div class='add'>+		query.id = ctrl-&gt;id;</div><div class='add'>+		i2c_clients_command(&amp;go-&gt;i2c_adapter, VIDIOC_QUERYCTRL, &amp;query);</div><div class='add'>+		if (query.name[0] == 0)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		i2c_clients_command(&amp;go-&gt;i2c_adapter, VIDIOC_G_CTRL, arg);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_S_CTRL:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_control *ctrl = arg;</div><div class='add'>+		struct v4l2_queryctrl query;</div><div class='add'>+</div><div class='add'>+		if (!go-&gt;i2c_adapter_online)</div><div class='add'>+			return -EIO;</div><div class='add'>+		memset(&amp;query, 0, sizeof(query));</div><div class='add'>+		query.id = ctrl-&gt;id;</div><div class='add'>+		i2c_clients_command(&amp;go-&gt;i2c_adapter, VIDIOC_QUERYCTRL, &amp;query);</div><div class='add'>+		if (query.name[0] == 0)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		i2c_clients_command(&amp;go-&gt;i2c_adapter, VIDIOC_S_CTRL, arg);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_G_PARM:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_streamparm *parm = arg;</div><div class='add'>+		struct v4l2_fract timeperframe = {</div><div class='add'>+			.numerator = 1001 *  go-&gt;fps_scale,</div><div class='add'>+			.denominator = go-&gt;sensor_framerate,</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		if (parm-&gt;type != V4L2_BUF_TYPE_VIDEO_CAPTURE)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		memset(parm, 0, sizeof(*parm));</div><div class='add'>+		parm-&gt;type = V4L2_BUF_TYPE_VIDEO_CAPTURE;</div><div class='add'>+		parm-&gt;parm.capture.capability |= V4L2_CAP_TIMEPERFRAME;</div><div class='add'>+		parm-&gt;parm.capture.timeperframe = timeperframe;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_S_PARM:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_streamparm *parm = arg;</div><div class='add'>+		unsigned int n, d;</div><div class='add'>+</div><div class='add'>+		if (parm-&gt;type != V4L2_BUF_TYPE_VIDEO_CAPTURE)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (parm-&gt;parm.capture.capturemode != 0)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		n = go-&gt;sensor_framerate *</div><div class='add'>+			parm-&gt;parm.capture.timeperframe.numerator;</div><div class='add'>+		d = 1001 * parm-&gt;parm.capture.timeperframe.denominator;</div><div class='add'>+		if (n != 0 &amp;&amp; d != 0 &amp;&amp; n &gt; d)</div><div class='add'>+			go-&gt;fps_scale = (n + d/2) / d;</div><div class='add'>+		else</div><div class='add'>+			go-&gt;fps_scale = 1;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_ENUMSTD:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_standard *std = arg;</div><div class='add'>+</div><div class='add'>+		if ((go-&gt;board_info-&gt;flags &amp; GO7007_BOARD_HAS_TUNER) &amp;&amp;</div><div class='add'>+				go-&gt;input == go-&gt;board_info-&gt;num_inputs - 1) {</div><div class='add'>+			if (!go-&gt;i2c_adapter_online)</div><div class='add'>+				return -EIO;</div><div class='add'>+			i2c_clients_command(&amp;go-&gt;i2c_adapter,</div><div class='add'>+						VIDIOC_ENUMSTD, arg);</div><div class='add'>+			if (!std-&gt;id) /* hack to indicate EINVAL from tuner */</div><div class='add'>+				return -EINVAL;</div><div class='add'>+		} else if (go-&gt;board_info-&gt;sensor_flags &amp; GO7007_SENSOR_TV) {</div><div class='add'>+			switch (std-&gt;index) {</div><div class='add'>+			case 0:</div><div class='add'>+				v4l2_video_std_construct(std,</div><div class='add'>+						V4L2_STD_NTSC, "NTSC");</div><div class='add'>+				break;</div><div class='add'>+			case 1:</div><div class='add'>+				v4l2_video_std_construct(std,</div><div class='add'>+						V4L2_STD_PAL | V4L2_STD_SECAM,</div><div class='add'>+						"PAL/SECAM");</div><div class='add'>+				break;</div><div class='add'>+			default:</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			if (std-&gt;index != 0)</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			memset(std, 0, sizeof(*std));</div><div class='add'>+			snprintf(std-&gt;name, sizeof(std-&gt;name), "%dx%d, %dfps",</div><div class='add'>+				go-&gt;board_info-&gt;sensor_width,</div><div class='add'>+				go-&gt;board_info-&gt;sensor_height,</div><div class='add'>+				go-&gt;board_info-&gt;sensor_framerate / 1000);</div><div class='add'>+			std-&gt;frameperiod.numerator = 1001;</div><div class='add'>+			std-&gt;frameperiod.denominator =</div><div class='add'>+					go-&gt;board_info-&gt;sensor_framerate;</div><div class='add'>+		}</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_G_STD:</div><div class='add'>+	{</div><div class='add'>+		v4l2_std_id *std = arg;</div><div class='add'>+</div><div class='add'>+		if ((go-&gt;board_info-&gt;flags &amp; GO7007_BOARD_HAS_TUNER) &amp;&amp;</div><div class='add'>+				go-&gt;input == go-&gt;board_info-&gt;num_inputs - 1) {</div><div class='add'>+			if (!go-&gt;i2c_adapter_online)</div><div class='add'>+				return -EIO;</div><div class='add'>+			i2c_clients_command(&amp;go-&gt;i2c_adapter,</div><div class='add'>+						VIDIOC_G_STD, arg);</div><div class='add'>+		} else if (go-&gt;board_info-&gt;sensor_flags &amp; GO7007_SENSOR_TV) {</div><div class='add'>+			if (go-&gt;standard == GO7007_STD_NTSC)</div><div class='add'>+				*std = V4L2_STD_NTSC;</div><div class='add'>+			else</div><div class='add'>+				*std = V4L2_STD_PAL | V4L2_STD_SECAM;</div><div class='add'>+		} else</div><div class='add'>+			*std = 0;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_S_STD:</div><div class='add'>+	{</div><div class='add'>+		v4l2_std_id *std = arg;</div><div class='add'>+</div><div class='add'>+		if (go-&gt;streaming)</div><div class='add'>+			return -EBUSY;</div><div class='add'>+		if (!(go-&gt;board_info-&gt;sensor_flags &amp; GO7007_SENSOR_TV) &amp;&amp;</div><div class='add'>+				*std != 0)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (*std == 0)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if ((go-&gt;board_info-&gt;flags &amp; GO7007_BOARD_HAS_TUNER) &amp;&amp;</div><div class='add'>+				go-&gt;input == go-&gt;board_info-&gt;num_inputs - 1) {</div><div class='add'>+			if (!go-&gt;i2c_adapter_online)</div><div class='add'>+				return -EIO;</div><div class='add'>+			i2c_clients_command(&amp;go-&gt;i2c_adapter,</div><div class='add'>+						VIDIOC_S_STD, arg);</div><div class='add'>+			if (!*std) /* hack to indicate EINVAL from tuner */</div><div class='add'>+				return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		if (*std &amp; V4L2_STD_NTSC) {</div><div class='add'>+			go-&gt;standard = GO7007_STD_NTSC;</div><div class='add'>+			go-&gt;sensor_framerate = 30000;</div><div class='add'>+		} else if (*std &amp; V4L2_STD_PAL) {</div><div class='add'>+			go-&gt;standard = GO7007_STD_PAL;</div><div class='add'>+			go-&gt;sensor_framerate = 25025;</div><div class='add'>+		} else if (*std &amp; V4L2_STD_SECAM) {</div><div class='add'>+			go-&gt;standard = GO7007_STD_PAL;</div><div class='add'>+			go-&gt;sensor_framerate = 25025;</div><div class='add'>+		} else</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (go-&gt;i2c_adapter_online)</div><div class='add'>+			i2c_clients_command(&amp;go-&gt;i2c_adapter,</div><div class='add'>+					    VIDIOC_S_STD, std);</div><div class='add'>+		set_capture_size(go, NULL, 0);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_QUERYSTD:</div><div class='add'>+	{</div><div class='add'>+		v4l2_std_id *std = arg;</div><div class='add'>+</div><div class='add'>+		if ((go-&gt;board_info-&gt;flags &amp; GO7007_BOARD_HAS_TUNER) &amp;&amp;</div><div class='add'>+				go-&gt;input == go-&gt;board_info-&gt;num_inputs - 1) {</div><div class='add'>+			if (!go-&gt;i2c_adapter_online)</div><div class='add'>+				return -EIO;</div><div class='add'>+			i2c_clients_command(&amp;go-&gt;i2c_adapter,</div><div class='add'>+						VIDIOC_QUERYSTD, arg);</div><div class='add'>+		} else if (go-&gt;board_info-&gt;sensor_flags &amp; GO7007_SENSOR_TV)</div><div class='add'>+			*std = V4L2_STD_NTSC | V4L2_STD_PAL | V4L2_STD_SECAM;</div><div class='add'>+		else</div><div class='add'>+			*std = 0;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_ENUMINPUT:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_input *inp = arg;</div><div class='add'>+		int index;</div><div class='add'>+</div><div class='add'>+		if (inp-&gt;index &gt;= go-&gt;board_info-&gt;num_inputs)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		index = inp-&gt;index;</div><div class='add'>+		memset(inp, 0, sizeof(*inp));</div><div class='add'>+		inp-&gt;index = index;</div><div class='add'>+		strncpy(inp-&gt;name, go-&gt;board_info-&gt;inputs[index].name,</div><div class='add'>+				sizeof(inp-&gt;name));</div><div class='add'>+		/* If this board has a tuner, it will be the last input */</div><div class='add'>+		if ((go-&gt;board_info-&gt;flags &amp; GO7007_BOARD_HAS_TUNER) &amp;&amp;</div><div class='add'>+				index == go-&gt;board_info-&gt;num_inputs - 1)</div><div class='add'>+			inp-&gt;type = V4L2_INPUT_TYPE_TUNER;</div><div class='add'>+		else</div><div class='add'>+			inp-&gt;type = V4L2_INPUT_TYPE_CAMERA;</div><div class='add'>+		inp-&gt;audioset = 0;</div><div class='add'>+		inp-&gt;tuner = 0;</div><div class='add'>+		if (go-&gt;board_info-&gt;sensor_flags &amp; GO7007_SENSOR_TV)</div><div class='add'>+			inp-&gt;std = V4L2_STD_NTSC | V4L2_STD_PAL |</div><div class='add'>+							V4L2_STD_SECAM;</div><div class='add'>+		else</div><div class='add'>+			inp-&gt;std = 0;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_G_INPUT:</div><div class='add'>+	{</div><div class='add'>+		int *input = arg;</div><div class='add'>+</div><div class='add'>+		*input = go-&gt;input;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_S_INPUT:</div><div class='add'>+	{</div><div class='add'>+		int *input = arg;</div><div class='add'>+</div><div class='add'>+		if (*input &gt;= go-&gt;board_info-&gt;num_inputs)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (go-&gt;streaming)</div><div class='add'>+			return -EBUSY;</div><div class='add'>+		go-&gt;input = *input;</div><div class='add'>+		if (go-&gt;i2c_adapter_online) {</div><div class='add'>+			i2c_clients_command(&amp;go-&gt;i2c_adapter, VIDIOC_S_INPUT,</div><div class='add'>+				&amp;go-&gt;board_info-&gt;inputs[*input].video_input);</div><div class='add'>+			i2c_clients_command(&amp;go-&gt;i2c_adapter, VIDIOC_S_AUDIO,</div><div class='add'>+				&amp;go-&gt;board_info-&gt;inputs[*input].audio_input);</div><div class='add'>+		}</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_G_TUNER:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_tuner *t = arg;</div><div class='add'>+</div><div class='add'>+		if (!(go-&gt;board_info-&gt;flags &amp; GO7007_BOARD_HAS_TUNER))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (t-&gt;index != 0)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (!go-&gt;i2c_adapter_online)</div><div class='add'>+			return -EIO;</div><div class='add'>+		i2c_clients_command(&amp;go-&gt;i2c_adapter, VIDIOC_G_TUNER, arg);</div><div class='add'>+		t-&gt;index = 0;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_S_TUNER:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_tuner *t = arg;</div><div class='add'>+</div><div class='add'>+		if (!(go-&gt;board_info-&gt;flags &amp; GO7007_BOARD_HAS_TUNER))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (t-&gt;index != 0)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (!go-&gt;i2c_adapter_online)</div><div class='add'>+			return -EIO;</div><div class='add'>+		switch (go-&gt;board_id) {</div><div class='add'>+		case GO7007_BOARDID_PX_TV402U_NA:</div><div class='add'>+		case GO7007_BOARDID_PX_TV402U_JP:</div><div class='add'>+			/* No selectable options currently */</div><div class='add'>+			if (t-&gt;audmode != V4L2_TUNER_MODE_STEREO)</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		i2c_clients_command(&amp;go-&gt;i2c_adapter, VIDIOC_S_TUNER, arg);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_G_FREQUENCY:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_frequency *f = arg;</div><div class='add'>+</div><div class='add'>+		if (!(go-&gt;board_info-&gt;flags &amp; GO7007_BOARD_HAS_TUNER))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (!go-&gt;i2c_adapter_online)</div><div class='add'>+			return -EIO;</div><div class='add'>+		memset(f, 0, sizeof(*f));</div><div class='add'>+		f-&gt;type = V4L2_TUNER_ANALOG_TV;</div><div class='add'>+		i2c_clients_command(&amp;go-&gt;i2c_adapter, VIDIOC_G_FREQUENCY, arg);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_S_FREQUENCY:</div><div class='add'>+	{</div><div class='add'>+		if (!(go-&gt;board_info-&gt;flags &amp; GO7007_BOARD_HAS_TUNER))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (!go-&gt;i2c_adapter_online)</div><div class='add'>+			return -EIO;</div><div class='add'>+		i2c_clients_command(&amp;go-&gt;i2c_adapter, VIDIOC_S_FREQUENCY, arg);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_CROPCAP:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_cropcap *cropcap = arg;</div><div class='add'>+</div><div class='add'>+		if (cropcap-&gt;type != V4L2_BUF_TYPE_VIDEO_CAPTURE)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		memset(cropcap, 0, sizeof(*cropcap));</div><div class='add'>+		cropcap-&gt;type = V4L2_BUF_TYPE_VIDEO_CAPTURE;</div><div class='add'>+		/* These specify the raw input of the sensor */</div><div class='add'>+		switch (go-&gt;standard) {</div><div class='add'>+		case GO7007_STD_NTSC:</div><div class='add'>+			cropcap-&gt;bounds.top = 0;</div><div class='add'>+			cropcap-&gt;bounds.left = 0;</div><div class='add'>+			cropcap-&gt;bounds.width = 720;</div><div class='add'>+			cropcap-&gt;bounds.height = 480;</div><div class='add'>+			cropcap-&gt;defrect.top = 0;</div><div class='add'>+			cropcap-&gt;defrect.left = 0;</div><div class='add'>+			cropcap-&gt;defrect.width = 720;</div><div class='add'>+			cropcap-&gt;defrect.height = 480;</div><div class='add'>+			break;</div><div class='add'>+		case GO7007_STD_PAL:</div><div class='add'>+			cropcap-&gt;bounds.top = 0;</div><div class='add'>+			cropcap-&gt;bounds.left = 0;</div><div class='add'>+			cropcap-&gt;bounds.width = 720;</div><div class='add'>+			cropcap-&gt;bounds.height = 576;</div><div class='add'>+			cropcap-&gt;defrect.top = 0;</div><div class='add'>+			cropcap-&gt;defrect.left = 0;</div><div class='add'>+			cropcap-&gt;defrect.width = 720;</div><div class='add'>+			cropcap-&gt;defrect.height = 576;</div><div class='add'>+			break;</div><div class='add'>+		case GO7007_STD_OTHER:</div><div class='add'>+			cropcap-&gt;bounds.top = 0;</div><div class='add'>+			cropcap-&gt;bounds.left = 0;</div><div class='add'>+			cropcap-&gt;bounds.width = go-&gt;board_info-&gt;sensor_width;</div><div class='add'>+			cropcap-&gt;bounds.height = go-&gt;board_info-&gt;sensor_height;</div><div class='add'>+			cropcap-&gt;defrect.top = 0;</div><div class='add'>+			cropcap-&gt;defrect.left = 0;</div><div class='add'>+			cropcap-&gt;defrect.width = go-&gt;board_info-&gt;sensor_width;</div><div class='add'>+			cropcap-&gt;defrect.height = go-&gt;board_info-&gt;sensor_height;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_G_CROP:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_crop *crop = arg;</div><div class='add'>+</div><div class='add'>+		if (crop-&gt;type != V4L2_BUF_TYPE_VIDEO_CAPTURE)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		memset(crop, 0, sizeof(*crop));</div><div class='add'>+		crop-&gt;type = V4L2_BUF_TYPE_VIDEO_CAPTURE;</div><div class='add'>+		/* These specify the raw input of the sensor */</div><div class='add'>+		switch (go-&gt;standard) {</div><div class='add'>+		case GO7007_STD_NTSC:</div><div class='add'>+			crop-&gt;c.top = 0;</div><div class='add'>+			crop-&gt;c.left = 0;</div><div class='add'>+			crop-&gt;c.width = 720;</div><div class='add'>+			crop-&gt;c.height = 480;</div><div class='add'>+			break;</div><div class='add'>+		case GO7007_STD_PAL:</div><div class='add'>+			crop-&gt;c.top = 0;</div><div class='add'>+			crop-&gt;c.left = 0;</div><div class='add'>+			crop-&gt;c.width = 720;</div><div class='add'>+			crop-&gt;c.height = 576;</div><div class='add'>+			break;</div><div class='add'>+		case GO7007_STD_OTHER:</div><div class='add'>+			crop-&gt;c.top = 0;</div><div class='add'>+			crop-&gt;c.left = 0;</div><div class='add'>+			crop-&gt;c.width = go-&gt;board_info-&gt;sensor_width;</div><div class='add'>+			crop-&gt;c.height = go-&gt;board_info-&gt;sensor_height;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_S_CROP:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_crop *crop = arg;</div><div class='add'>+</div><div class='add'>+		if (crop-&gt;type != V4L2_BUF_TYPE_VIDEO_CAPTURE)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_G_JPEGCOMP:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_jpegcompression *params = arg;</div><div class='add'>+</div><div class='add'>+		memset(params, 0, sizeof(*params));</div><div class='add'>+		params-&gt;quality = 50; /* ?? */</div><div class='add'>+		params-&gt;jpeg_markers = V4L2_JPEG_MARKER_DHT |</div><div class='add'>+					V4L2_JPEG_MARKER_DQT;</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_S_JPEGCOMP:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_jpegcompression *params = arg;</div><div class='add'>+</div><div class='add'>+		if (params-&gt;quality != 50 ||</div><div class='add'>+				params-&gt;jpeg_markers != (V4L2_JPEG_MARKER_DHT |</div><div class='add'>+							V4L2_JPEG_MARKER_DQT))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	/* Temporary ioctls for controlling compression characteristics */</div><div class='add'>+	case GO7007IOC_S_BITRATE:</div><div class='add'>+	{</div><div class='add'>+		int *bitrate = arg;</div><div class='add'>+</div><div class='add'>+		if (go-&gt;streaming)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		/* Upper bound is kind of arbitrary here */</div><div class='add'>+		if (*bitrate &lt; 64000 || *bitrate &gt; 10000000)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		go-&gt;bitrate = *bitrate;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	case GO7007IOC_G_BITRATE:</div><div class='add'>+	{</div><div class='add'>+		int *bitrate = arg;</div><div class='add'>+</div><div class='add'>+		*bitrate = go-&gt;bitrate;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	case GO7007IOC_S_COMP_PARAMS:</div><div class='add'>+	{</div><div class='add'>+		struct go7007_comp_params *comp = arg;</div><div class='add'>+</div><div class='add'>+		if (go-&gt;format == GO7007_FORMAT_MJPEG)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (comp-&gt;gop_size &gt; 0)</div><div class='add'>+			go-&gt;gop_size = comp-&gt;gop_size;</div><div class='add'>+		else</div><div class='add'>+			go-&gt;gop_size = go-&gt;sensor_framerate / 1000;</div><div class='add'>+		if (go-&gt;gop_size != 15)</div><div class='add'>+			go-&gt;dvd_mode = 0;</div><div class='add'>+		/*go-&gt;ipb = comp-&gt;max_b_frames &gt; 0;*/ /* completely untested */</div><div class='add'>+		if (go-&gt;board_info-&gt;sensor_flags &amp; GO7007_SENSOR_TV) {</div><div class='add'>+			switch (comp-&gt;aspect_ratio) {</div><div class='add'>+			case GO7007_ASPECT_RATIO_4_3_NTSC:</div><div class='add'>+			case GO7007_ASPECT_RATIO_4_3_PAL:</div><div class='add'>+				go-&gt;aspect_ratio = GO7007_RATIO_4_3;</div><div class='add'>+				break;</div><div class='add'>+			case GO7007_ASPECT_RATIO_16_9_NTSC:</div><div class='add'>+			case GO7007_ASPECT_RATIO_16_9_PAL:</div><div class='add'>+				go-&gt;aspect_ratio = GO7007_RATIO_16_9;</div><div class='add'>+				break;</div><div class='add'>+			default:</div><div class='add'>+				go-&gt;aspect_ratio = GO7007_RATIO_1_1;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if (comp-&gt;flags &amp; GO7007_COMP_OMIT_SEQ_HEADER) {</div><div class='add'>+			go-&gt;dvd_mode = 0;</div><div class='add'>+			go-&gt;seq_header_enable = 0;</div><div class='add'>+		} else {</div><div class='add'>+			go-&gt;seq_header_enable = 1;</div><div class='add'>+		}</div><div class='add'>+		/* fall-through */</div><div class='add'>+	}</div><div class='add'>+	case GO7007IOC_G_COMP_PARAMS:</div><div class='add'>+	{</div><div class='add'>+		struct go7007_comp_params *comp = arg;</div><div class='add'>+</div><div class='add'>+		if (go-&gt;format == GO7007_FORMAT_MJPEG)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		memset(comp, 0, sizeof(*comp));</div><div class='add'>+		comp-&gt;gop_size = go-&gt;gop_size;</div><div class='add'>+		comp-&gt;max_b_frames = go-&gt;ipb ? 2 : 0;</div><div class='add'>+		switch (go-&gt;aspect_ratio) {</div><div class='add'>+		case GO7007_RATIO_4_3:</div><div class='add'>+			if (go-&gt;standard == GO7007_STD_NTSC)</div><div class='add'>+				comp-&gt;aspect_ratio =</div><div class='add'>+					GO7007_ASPECT_RATIO_4_3_NTSC;</div><div class='add'>+			else</div><div class='add'>+				comp-&gt;aspect_ratio =</div><div class='add'>+					GO7007_ASPECT_RATIO_4_3_PAL;</div><div class='add'>+			break;</div><div class='add'>+		case GO7007_RATIO_16_9:</div><div class='add'>+			if (go-&gt;standard == GO7007_STD_NTSC)</div><div class='add'>+				comp-&gt;aspect_ratio =</div><div class='add'>+					GO7007_ASPECT_RATIO_16_9_NTSC;</div><div class='add'>+			else</div><div class='add'>+				comp-&gt;aspect_ratio =</div><div class='add'>+					GO7007_ASPECT_RATIO_16_9_PAL;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			comp-&gt;aspect_ratio = GO7007_ASPECT_RATIO_1_1;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		if (go-&gt;closed_gop)</div><div class='add'>+			comp-&gt;flags |= GO7007_COMP_CLOSED_GOP;</div><div class='add'>+		if (!go-&gt;seq_header_enable)</div><div class='add'>+			comp-&gt;flags |= GO7007_COMP_OMIT_SEQ_HEADER;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	case GO7007IOC_S_MPEG_PARAMS:</div><div class='add'>+	{</div><div class='add'>+		struct go7007_mpeg_params *mpeg = arg;</div><div class='add'>+</div><div class='add'>+		if (go-&gt;format != GO7007_FORMAT_MPEG1 &amp;&amp;</div><div class='add'>+				go-&gt;format != GO7007_FORMAT_MPEG2 &amp;&amp;</div><div class='add'>+				go-&gt;format != GO7007_FORMAT_MPEG4)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		if (mpeg-&gt;flags &amp; GO7007_MPEG_FORCE_DVD_MODE) {</div><div class='add'>+			go-&gt;format = GO7007_FORMAT_MPEG2;</div><div class='add'>+			go-&gt;bitrate = 9800000;</div><div class='add'>+			go-&gt;gop_size = 15;</div><div class='add'>+			go-&gt;pali = 0x48;</div><div class='add'>+			go-&gt;closed_gop = 1;</div><div class='add'>+			go-&gt;repeat_seqhead = 0;</div><div class='add'>+			go-&gt;seq_header_enable = 1;</div><div class='add'>+			go-&gt;gop_header_enable = 1;</div><div class='add'>+			go-&gt;dvd_mode = 1;</div><div class='add'>+		} else {</div><div class='add'>+			switch (mpeg-&gt;mpeg_video_standard) {</div><div class='add'>+			case GO7007_MPEG_VIDEO_MPEG1:</div><div class='add'>+				go-&gt;format = GO7007_FORMAT_MPEG1;</div><div class='add'>+				go-&gt;pali = 0;</div><div class='add'>+				break;</div><div class='add'>+			case GO7007_MPEG_VIDEO_MPEG2:</div><div class='add'>+				go-&gt;format = GO7007_FORMAT_MPEG2;</div><div class='add'>+				if (mpeg-&gt;pali &gt;&gt; 24 == 2)</div><div class='add'>+					go-&gt;pali = mpeg-&gt;pali &amp; 0xff;</div><div class='add'>+				else</div><div class='add'>+					go-&gt;pali = 0x48;</div><div class='add'>+				break;</div><div class='add'>+			case GO7007_MPEG_VIDEO_MPEG4:</div><div class='add'>+				go-&gt;format = GO7007_FORMAT_MPEG4;</div><div class='add'>+				if (mpeg-&gt;pali &gt;&gt; 24 == 4)</div><div class='add'>+					go-&gt;pali = mpeg-&gt;pali &amp; 0xff;</div><div class='add'>+				else</div><div class='add'>+					go-&gt;pali = 0xf5;</div><div class='add'>+				break;</div><div class='add'>+			default:</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			}</div><div class='add'>+			go-&gt;gop_header_enable =</div><div class='add'>+				mpeg-&gt;flags &amp; GO7007_MPEG_OMIT_GOP_HEADER</div><div class='add'>+				? 0 : 1;</div><div class='add'>+			if (mpeg-&gt;flags &amp; GO7007_MPEG_REPEAT_SEQHEADER)</div><div class='add'>+				go-&gt;repeat_seqhead = 1;</div><div class='add'>+			else</div><div class='add'>+				go-&gt;repeat_seqhead = 0;</div><div class='add'>+			go-&gt;dvd_mode = 0;</div><div class='add'>+		}</div><div class='add'>+		/* fall-through */</div><div class='add'>+	}</div><div class='add'>+	case GO7007IOC_G_MPEG_PARAMS:</div><div class='add'>+	{</div><div class='add'>+		struct go7007_mpeg_params *mpeg = arg;</div><div class='add'>+</div><div class='add'>+		memset(mpeg, 0, sizeof(*mpeg));</div><div class='add'>+		switch (go-&gt;format) {</div><div class='add'>+		case GO7007_FORMAT_MPEG1:</div><div class='add'>+			mpeg-&gt;mpeg_video_standard = GO7007_MPEG_VIDEO_MPEG1;</div><div class='add'>+			mpeg-&gt;pali = 0;</div><div class='add'>+			break;</div><div class='add'>+		case GO7007_FORMAT_MPEG2:</div><div class='add'>+			mpeg-&gt;mpeg_video_standard = GO7007_MPEG_VIDEO_MPEG2;</div><div class='add'>+			mpeg-&gt;pali = GO7007_MPEG_PROFILE(2, go-&gt;pali);</div><div class='add'>+			break;</div><div class='add'>+		case GO7007_FORMAT_MPEG4:</div><div class='add'>+			mpeg-&gt;mpeg_video_standard = GO7007_MPEG_VIDEO_MPEG4;</div><div class='add'>+			mpeg-&gt;pali = GO7007_MPEG_PROFILE(4, go-&gt;pali);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		if (!go-&gt;gop_header_enable)</div><div class='add'>+			mpeg-&gt;flags |= GO7007_MPEG_OMIT_GOP_HEADER;</div><div class='add'>+		if (go-&gt;repeat_seqhead)</div><div class='add'>+			mpeg-&gt;flags |= GO7007_MPEG_REPEAT_SEQHEADER;</div><div class='add'>+		if (go-&gt;dvd_mode)</div><div class='add'>+			mpeg-&gt;flags |= GO7007_MPEG_FORCE_DVD_MODE;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	case GO7007IOC_S_MD_PARAMS:</div><div class='add'>+	{</div><div class='add'>+		struct go7007_md_params *mdp = arg;</div><div class='add'>+</div><div class='add'>+		if (mdp-&gt;region &gt; 3)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (mdp-&gt;trigger &gt; 0) {</div><div class='add'>+			go-&gt;modet[mdp-&gt;region].pixel_threshold =</div><div class='add'>+					mdp-&gt;pixel_threshold &gt;&gt; 1;</div><div class='add'>+			go-&gt;modet[mdp-&gt;region].motion_threshold =</div><div class='add'>+					mdp-&gt;motion_threshold &gt;&gt; 1;</div><div class='add'>+			go-&gt;modet[mdp-&gt;region].mb_threshold =</div><div class='add'>+					mdp-&gt;trigger &gt;&gt; 1;</div><div class='add'>+			go-&gt;modet[mdp-&gt;region].enable = 1;</div><div class='add'>+		} else</div><div class='add'>+			go-&gt;modet[mdp-&gt;region].enable = 0;</div><div class='add'>+		/* fall-through */</div><div class='add'>+	}</div><div class='add'>+	case GO7007IOC_G_MD_PARAMS:</div><div class='add'>+	{</div><div class='add'>+		struct go7007_md_params *mdp = arg;</div><div class='add'>+		int region = mdp-&gt;region;</div><div class='add'>+</div><div class='add'>+		if (mdp-&gt;region &gt; 3)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		memset(mdp, 0, sizeof(struct go7007_md_params));</div><div class='add'>+		mdp-&gt;region = region;</div><div class='add'>+		if (!go-&gt;modet[region].enable)</div><div class='add'>+			return 0;</div><div class='add'>+		mdp-&gt;pixel_threshold =</div><div class='add'>+			(go-&gt;modet[region].pixel_threshold &lt;&lt; 1) + 1;</div><div class='add'>+		mdp-&gt;motion_threshold =</div><div class='add'>+			(go-&gt;modet[region].motion_threshold &lt;&lt; 1) + 1;</div><div class='add'>+		mdp-&gt;trigger =</div><div class='add'>+			(go-&gt;modet[region].mb_threshold &lt;&lt; 1) + 1;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	case GO7007IOC_S_MD_REGION:</div><div class='add'>+	{</div><div class='add'>+		struct go7007_md_region *region = arg;</div><div class='add'>+</div><div class='add'>+		if (region-&gt;region &lt; 1 || region-&gt;region &gt; 3)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		return clip_to_modet_map(go, region-&gt;region, region-&gt;clips);</div><div class='add'>+	}</div><div class='add'>+	default:</div><div class='add'>+		printk(KERN_DEBUG "go7007: unsupported ioctl %d\n", cmd);</div><div class='add'>+		return -ENOIOCTLCMD;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+unlock_and_return:</div><div class='add'>+	up(&amp;gofh-&gt;lock);</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int go7007_ioctl(struct inode *inode, struct file *file,</div><div class='add'>+		unsigned int cmd, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	struct go7007_file *gofh = file-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	if (gofh-&gt;go-&gt;status != STATUS_ONLINE)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	return video_usercopy(inode, file, cmd, arg, go7007_do_ioctl);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t go7007_read(struct file *file, char __user *data,</div><div class='add'>+		size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void go7007_vm_open(struct vm_area_struct *vma)</div><div class='add'>+{</div><div class='add'>+	struct go7007_buffer *gobuf = vma-&gt;vm_private_data;</div><div class='add'>+</div><div class='add'>+	++gobuf-&gt;mapped;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void go7007_vm_close(struct vm_area_struct *vma)</div><div class='add'>+{</div><div class='add'>+	struct go7007_buffer *gobuf = vma-&gt;vm_private_data;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	if (--gobuf-&gt;mapped == 0) {</div><div class='add'>+		spin_lock_irqsave(&amp;gobuf-&gt;go-&gt;spinlock, flags);</div><div class='add'>+		deactivate_buffer(gobuf);</div><div class='add'>+		spin_unlock_irqrestore(&amp;gobuf-&gt;go-&gt;spinlock, flags);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Copied from videobuf-dma-sg.c */</div><div class='add'>+static int go7007_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)</div><div class='add'>+{</div><div class='add'>+	struct page *page;</div><div class='add'>+</div><div class='add'>+	page = alloc_page(GFP_USER | __GFP_DMA32);</div><div class='add'>+	if (!page)</div><div class='add'>+		return VM_FAULT_OOM;</div><div class='add'>+	clear_user_page(page_address(page), (unsigned long)vmf-&gt;virtual_address,</div><div class='add'>+			page);</div><div class='add'>+	vmf-&gt;page = page;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct vm_operations_struct go7007_vm_ops = {</div><div class='add'>+	.open	= go7007_vm_open,</div><div class='add'>+	.close	= go7007_vm_close,</div><div class='add'>+	.fault	= go7007_vm_fault,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int go7007_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='add'>+{</div><div class='add'>+	struct go7007_file *gofh = file-&gt;private_data;</div><div class='add'>+	unsigned int index;</div><div class='add'>+</div><div class='add'>+	if (gofh-&gt;go-&gt;status != STATUS_ONLINE)</div><div class='add'>+		return -EIO;</div><div class='add'>+	if (!(vma-&gt;vm_flags &amp; VM_SHARED))</div><div class='add'>+		return -EINVAL; /* only support VM_SHARED mapping */</div><div class='add'>+	if (vma-&gt;vm_end - vma-&gt;vm_start != GO7007_BUF_SIZE)</div><div class='add'>+		return -EINVAL; /* must map exactly one full buffer */</div><div class='add'>+	down(&amp;gofh-&gt;lock);</div><div class='add'>+	index = vma-&gt;vm_pgoff / GO7007_BUF_PAGES;</div><div class='add'>+	if (index &gt;= gofh-&gt;buf_count) {</div><div class='add'>+		up(&amp;gofh-&gt;lock);</div><div class='add'>+		return -EINVAL; /* trying to map beyond requested buffers */</div><div class='add'>+	}</div><div class='add'>+	if (index * GO7007_BUF_PAGES != vma-&gt;vm_pgoff) {</div><div class='add'>+		up(&amp;gofh-&gt;lock);</div><div class='add'>+		return -EINVAL; /* offset is not aligned on buffer boundary */</div><div class='add'>+	}</div><div class='add'>+	if (gofh-&gt;bufs[index].mapped &gt; 0) {</div><div class='add'>+		up(&amp;gofh-&gt;lock);</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+	gofh-&gt;bufs[index].mapped = 1;</div><div class='add'>+	gofh-&gt;bufs[index].user_addr = vma-&gt;vm_start;</div><div class='add'>+	vma-&gt;vm_ops = &amp;go7007_vm_ops;</div><div class='add'>+	vma-&gt;vm_flags |= VM_DONTEXPAND;</div><div class='add'>+	vma-&gt;vm_flags &amp;= ~VM_IO;</div><div class='add'>+	vma-&gt;vm_private_data = &amp;gofh-&gt;bufs[index];</div><div class='add'>+	up(&amp;gofh-&gt;lock);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int go7007_poll(struct file *file, poll_table *wait)</div><div class='add'>+{</div><div class='add'>+	struct go7007_file *gofh = file-&gt;private_data;</div><div class='add'>+	struct go7007_buffer *gobuf;</div><div class='add'>+</div><div class='add'>+	if (list_empty(&amp;gofh-&gt;go-&gt;stream))</div><div class='add'>+		return POLLERR;</div><div class='add'>+	gobuf = list_entry(gofh-&gt;go-&gt;stream.next, struct go7007_buffer, stream);</div><div class='add'>+	poll_wait(file, &amp;gofh-&gt;go-&gt;frame_waitq, wait);</div><div class='add'>+	if (gobuf-&gt;state == BUF_STATE_DONE)</div><div class='add'>+		return POLLIN | POLLRDNORM;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void go7007_vfl_release(struct video_device *vfd)</div><div class='add'>+{</div><div class='add'>+	struct go7007 *go = video_get_drvdata(vfd);</div><div class='add'>+</div><div class='add'>+	video_device_release(vfd);</div><div class='add'>+	if (--go-&gt;ref_count == 0)</div><div class='add'>+		kfree(go);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct file_operations go7007_fops = {</div><div class='add'>+	.owner		= THIS_MODULE,</div><div class='add'>+	.open		= go7007_open,</div><div class='add'>+	.release	= go7007_release,</div><div class='add'>+	.ioctl		= go7007_ioctl,</div><div class='add'>+	.llseek		= no_llseek,</div><div class='add'>+	.read		= go7007_read,</div><div class='add'>+	.mmap		= go7007_mmap,</div><div class='add'>+	.poll		= go7007_poll,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct video_device go7007_template = {</div><div class='add'>+	.name		= "go7007",</div><div class='add'>+	.vfl_type	= VID_TYPE_CAPTURE,</div><div class='add'>+	.fops		= &amp;go7007_fops,</div><div class='add'>+	.minor		= -1,</div><div class='add'>+	.release	= go7007_vfl_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int go7007_v4l2_init(struct go7007 *go)</div><div class='add'>+{</div><div class='add'>+	int rv;</div><div class='add'>+</div><div class='add'>+	go-&gt;video_dev = video_device_alloc();</div><div class='add'>+	if (go-&gt;video_dev == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	memcpy(go-&gt;video_dev, &amp;go7007_template, sizeof(go7007_template));</div><div class='add'>+	go-&gt;video_dev-&gt;parent = go-&gt;dev;</div><div class='add'>+	rv = video_register_device(go-&gt;video_dev, VFL_TYPE_GRABBER, -1);</div><div class='add'>+	if (rv &lt; 0) {</div><div class='add'>+		video_device_release(go-&gt;video_dev);</div><div class='add'>+		go-&gt;video_dev = NULL;</div><div class='add'>+		return rv;</div><div class='add'>+	}</div><div class='add'>+	video_set_drvdata(go-&gt;video_dev, go);</div><div class='add'>+	++go-&gt;ref_count;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void go7007_v4l2_remove(struct go7007 *go)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	down(&amp;go-&gt;hw_lock);</div><div class='add'>+	if (go-&gt;streaming) {</div><div class='add'>+		go-&gt;streaming = 0;</div><div class='add'>+		go7007_stream_stop(go);</div><div class='add'>+		spin_lock_irqsave(&amp;go-&gt;spinlock, flags);</div><div class='add'>+		abort_queued(go);</div><div class='add'>+		spin_unlock_irqrestore(&amp;go-&gt;spinlock, flags);</div><div class='add'>+	}</div><div class='add'>+	up(&amp;go-&gt;hw_lock);</div><div class='add'>+	if (go-&gt;video_dev)</div><div class='add'>+		video_unregister_device(go-&gt;video_dev);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/staging/go7007/go7007.h b/drivers/staging/go7007/go7007.h<br/>new file mode 100644<br/>index 000000000000..7399c915a934<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/go7007/go7007.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/go7007/go7007.h</a></div><div class='hunk'>@@ -0,0 +1,114 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2005-2006 Micronas USA Inc.</div><div class='add'>+ *</div><div class='add'>+ * Permission is hereby granted, free of charge, to any person obtaining a</div><div class='add'>+ * copy of this software and the associated README documentation file (the</div><div class='add'>+ * "Software"), to deal in the Software without restriction, including</div><div class='add'>+ * without limitation the rights to use, copy, modify, merge, publish,</div><div class='add'>+ * distribute, sublicense, and/or sell copies of the Software, and to</div><div class='add'>+ * permit persons to whom the Software is furnished to do so.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS</div><div class='add'>+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.</div><div class='add'>+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY</div><div class='add'>+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,</div><div class='add'>+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE</div><div class='add'>+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* DEPRECATED -- use V4L2_PIX_FMT_MPEG and then call GO7007IOC_S_MPEG_PARAMS</div><div class='add'>+ * to select between MPEG1, MPEG2, and MPEG4 */</div><div class='add'>+#define V4L2_PIX_FMT_MPEG4     v4l2_fourcc('M', 'P', 'G', '4') /* MPEG4 */</div><div class='add'>+</div><div class='add'>+/* These will be replaced with a better interface</div><div class='add'>+ * soon, so don't get too attached to them */</div><div class='add'>+#define	GO7007IOC_S_BITRATE	_IOW('V', BASE_VIDIOC_PRIVATE + 0, int)</div><div class='add'>+#define	GO7007IOC_G_BITRATE	_IOR('V', BASE_VIDIOC_PRIVATE + 1, int)</div><div class='add'>+</div><div class='add'>+enum go7007_aspect_ratio {</div><div class='add'>+	GO7007_ASPECT_RATIO_1_1 = 0,</div><div class='add'>+	GO7007_ASPECT_RATIO_4_3_NTSC = 1,</div><div class='add'>+	GO7007_ASPECT_RATIO_4_3_PAL = 2,</div><div class='add'>+	GO7007_ASPECT_RATIO_16_9_NTSC = 3,</div><div class='add'>+	GO7007_ASPECT_RATIO_16_9_PAL = 4,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Used to set generic compression parameters */</div><div class='add'>+struct go7007_comp_params {</div><div class='add'>+	__u32 gop_size;</div><div class='add'>+	__u32 max_b_frames;</div><div class='add'>+	enum go7007_aspect_ratio aspect_ratio;</div><div class='add'>+	__u32 flags;</div><div class='add'>+	__u32 reserved[8];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define GO7007_COMP_CLOSED_GOP		0x00000001</div><div class='add'>+#define GO7007_COMP_OMIT_SEQ_HEADER	0x00000002</div><div class='add'>+</div><div class='add'>+enum go7007_mpeg_video_standard {</div><div class='add'>+	GO7007_MPEG_VIDEO_MPEG1 = 0,</div><div class='add'>+	GO7007_MPEG_VIDEO_MPEG2 = 1,</div><div class='add'>+	GO7007_MPEG_VIDEO_MPEG4 = 2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Used to set parameters for V4L2_PIX_FMT_MPEG format */</div><div class='add'>+struct go7007_mpeg_params {</div><div class='add'>+	enum go7007_mpeg_video_standard mpeg_video_standard;</div><div class='add'>+	__u32 flags;</div><div class='add'>+	__u32 pali;</div><div class='add'>+	__u32 reserved[8];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define GO7007_MPEG_FORCE_DVD_MODE	0x00000001</div><div class='add'>+#define GO7007_MPEG_OMIT_GOP_HEADER	0x00000002</div><div class='add'>+#define GO7007_MPEG_REPEAT_SEQHEADER	0x00000004</div><div class='add'>+</div><div class='add'>+#define GO7007_MPEG_PROFILE(format, pali)	(((format)&lt;&lt;24)|(pali))</div><div class='add'>+</div><div class='add'>+#define GO7007_MPEG2_PROFILE_MAIN_MAIN		GO7007_MPEG_PROFILE(2, 0x48)</div><div class='add'>+</div><div class='add'>+#define GO7007_MPEG4_PROFILE_S_L0		GO7007_MPEG_PROFILE(4, 0x08)</div><div class='add'>+#define GO7007_MPEG4_PROFILE_S_L1		GO7007_MPEG_PROFILE(4, 0x01)</div><div class='add'>+#define GO7007_MPEG4_PROFILE_S_L2		GO7007_MPEG_PROFILE(4, 0x02)</div><div class='add'>+#define GO7007_MPEG4_PROFILE_S_L3		GO7007_MPEG_PROFILE(4, 0x03)</div><div class='add'>+#define GO7007_MPEG4_PROFILE_ARTS_L1		GO7007_MPEG_PROFILE(4, 0x91)</div><div class='add'>+#define GO7007_MPEG4_PROFILE_ARTS_L2		GO7007_MPEG_PROFILE(4, 0x92)</div><div class='add'>+#define GO7007_MPEG4_PROFILE_ARTS_L3		GO7007_MPEG_PROFILE(4, 0x93)</div><div class='add'>+#define GO7007_MPEG4_PROFILE_ARTS_L4		GO7007_MPEG_PROFILE(4, 0x94)</div><div class='add'>+#define GO7007_MPEG4_PROFILE_AS_L0		GO7007_MPEG_PROFILE(4, 0xf0)</div><div class='add'>+#define GO7007_MPEG4_PROFILE_AS_L1		GO7007_MPEG_PROFILE(4, 0xf1)</div><div class='add'>+#define GO7007_MPEG4_PROFILE_AS_L2		GO7007_MPEG_PROFILE(4, 0xf2)</div><div class='add'>+#define GO7007_MPEG4_PROFILE_AS_L3		GO7007_MPEG_PROFILE(4, 0xf3)</div><div class='add'>+#define GO7007_MPEG4_PROFILE_AS_L4		GO7007_MPEG_PROFILE(4, 0xf4)</div><div class='add'>+#define GO7007_MPEG4_PROFILE_AS_L5		GO7007_MPEG_PROFILE(4, 0xf5)</div><div class='add'>+</div><div class='add'>+struct go7007_md_params {</div><div class='add'>+	__u16 region;</div><div class='add'>+	__u16 trigger;</div><div class='add'>+	__u16 pixel_threshold;</div><div class='add'>+	__u16 motion_threshold;</div><div class='add'>+	__u32 reserved[8];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct go7007_md_region {</div><div class='add'>+	__u16 region;</div><div class='add'>+	__u16 flags;</div><div class='add'>+	struct v4l2_clip *clips;</div><div class='add'>+	__u32 reserved[8];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define	GO7007IOC_S_MPEG_PARAMS	_IOWR('V', BASE_VIDIOC_PRIVATE + 2, \</div><div class='add'>+					struct go7007_mpeg_params)</div><div class='add'>+#define	GO7007IOC_G_MPEG_PARAMS	_IOR('V', BASE_VIDIOC_PRIVATE + 3, \</div><div class='add'>+					struct go7007_mpeg_params)</div><div class='add'>+#define	GO7007IOC_S_COMP_PARAMS	_IOWR('V', BASE_VIDIOC_PRIVATE + 4, \</div><div class='add'>+					struct go7007_comp_params)</div><div class='add'>+#define	GO7007IOC_G_COMP_PARAMS	_IOR('V', BASE_VIDIOC_PRIVATE + 5, \</div><div class='add'>+					struct go7007_comp_params)</div><div class='add'>+#define	GO7007IOC_S_MD_PARAMS	_IOWR('V', BASE_VIDIOC_PRIVATE + 6, \</div><div class='add'>+					struct go7007_md_params)</div><div class='add'>+#define	GO7007IOC_G_MD_PARAMS	_IOR('V', BASE_VIDIOC_PRIVATE + 7, \</div><div class='add'>+					struct go7007_md_params)</div><div class='add'>+#define	GO7007IOC_S_MD_REGION	_IOW('V', BASE_VIDIOC_PRIVATE + 8, \</div><div class='add'>+					struct go7007_md_region)</div><div class='head'>diff --git a/drivers/staging/go7007/saa7134-go7007.c b/drivers/staging/go7007/saa7134-go7007.c<br/>new file mode 100644<br/>index 000000000000..c4a6d8ef9078<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/go7007/saa7134-go7007.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/go7007/saa7134-go7007.c</a></div><div class='hunk'>@@ -0,0 +1,484 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2005-2006 Micronas USA Inc.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License (Version 2) as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software Foundation,</div><div class='add'>+ * Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/wait.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/time.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/usb.h&gt;</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;asm/byteorder.h&gt;</div><div class='add'>+#include &lt;media/audiochip.h&gt;</div><div class='add'>+</div><div class='add'>+#include "saa7134-reg.h"</div><div class='add'>+#include "saa7134.h"</div><div class='add'>+#include "go7007-priv.h"</div><div class='add'>+</div><div class='add'>+#define GO7007_HPI_DEBUG</div><div class='add'>+</div><div class='add'>+enum hpi_address {</div><div class='add'>+	HPI_ADDR_VIDEO_BUFFER = 0xe4,</div><div class='add'>+	HPI_ADDR_INIT_BUFFER = 0xea,</div><div class='add'>+	HPI_ADDR_INTR_RET_VALUE = 0xee,</div><div class='add'>+	HPI_ADDR_INTR_RET_DATA = 0xec,</div><div class='add'>+	HPI_ADDR_INTR_STATUS = 0xf4,</div><div class='add'>+	HPI_ADDR_INTR_WR_PARAM = 0xf6,</div><div class='add'>+	HPI_ADDR_INTR_WR_INDEX = 0xf8,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum gpio_command {</div><div class='add'>+	GPIO_COMMAND_RESET = 0x00, /* 000b */</div><div class='add'>+	GPIO_COMMAND_REQ1  = 0x04, /* 001b */</div><div class='add'>+	GPIO_COMMAND_WRITE = 0x20, /* 010b */</div><div class='add'>+	GPIO_COMMAND_REQ2  = 0x24, /* 011b */</div><div class='add'>+	GPIO_COMMAND_READ  = 0x80, /* 100b */</div><div class='add'>+	GPIO_COMMAND_VIDEO = 0x84, /* 101b */</div><div class='add'>+	GPIO_COMMAND_IDLE  = 0xA0, /* 110b */</div><div class='add'>+	GPIO_COMMAND_ADDR  = 0xA4, /* 111b */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct saa7134_go7007 {</div><div class='add'>+	struct saa7134_dev *dev;</div><div class='add'>+	u8 *top;</div><div class='add'>+	u8 *bottom;</div><div class='add'>+	dma_addr_t top_dma;</div><div class='add'>+	dma_addr_t bottom_dma;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct go7007_board_info board_voyager = {</div><div class='add'>+	.firmware	 = "go7007tv.bin",</div><div class='add'>+	.flags		 = 0,</div><div class='add'>+	.sensor_flags	 = GO7007_SENSOR_656 |</div><div class='add'>+				GO7007_SENSOR_VALID_ENABLE |</div><div class='add'>+				GO7007_SENSOR_TV |</div><div class='add'>+				GO7007_SENSOR_VBI,</div><div class='add'>+	.audio_flags	= GO7007_AUDIO_I2S_MODE_1 |</div><div class='add'>+				GO7007_AUDIO_WORD_16,</div><div class='add'>+	.audio_rate	 = 48000,</div><div class='add'>+	.audio_bclk_div	 = 8,</div><div class='add'>+	.audio_main_div	 = 2,</div><div class='add'>+	.hpi_buffer_cap  = 7,</div><div class='add'>+	.num_inputs	 = 1,</div><div class='add'>+	.inputs 	 = {</div><div class='add'>+		{</div><div class='add'>+			.name		= "SAA7134",</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/********************* Driver for GPIO HPI interface *********************/</div><div class='add'>+</div><div class='add'>+static int gpio_write(struct saa7134_dev *dev, u8 addr, u16 data)</div><div class='add'>+{</div><div class='add'>+	saa_writeb(SAA7134_GPIO_GPMODE0, 0xff);</div><div class='add'>+</div><div class='add'>+	/* Write HPI address */</div><div class='add'>+	saa_writeb(SAA7134_GPIO_GPSTATUS0, addr);</div><div class='add'>+	saa_writeb(SAA7134_GPIO_GPSTATUS2, GPIO_COMMAND_ADDR);</div><div class='add'>+	saa_writeb(SAA7134_GPIO_GPSTATUS2, GPIO_COMMAND_IDLE);</div><div class='add'>+</div><div class='add'>+	/* Write low byte */</div><div class='add'>+	saa_writeb(SAA7134_GPIO_GPSTATUS0, data &amp; 0xff);</div><div class='add'>+	saa_writeb(SAA7134_GPIO_GPSTATUS2, GPIO_COMMAND_WRITE);</div><div class='add'>+	saa_writeb(SAA7134_GPIO_GPSTATUS2, GPIO_COMMAND_IDLE);</div><div class='add'>+</div><div class='add'>+	/* Write high byte */</div><div class='add'>+	saa_writeb(SAA7134_GPIO_GPSTATUS0, data &gt;&gt; 8);</div><div class='add'>+	saa_writeb(SAA7134_GPIO_GPSTATUS2, GPIO_COMMAND_WRITE);</div><div class='add'>+	saa_writeb(SAA7134_GPIO_GPSTATUS2, GPIO_COMMAND_IDLE);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gpio_read(struct saa7134_dev *dev, u8 addr, u16 *data)</div><div class='add'>+{</div><div class='add'>+	saa_writeb(SAA7134_GPIO_GPMODE0, 0xff);</div><div class='add'>+</div><div class='add'>+	/* Write HPI address */</div><div class='add'>+	saa_writeb(SAA7134_GPIO_GPSTATUS0, addr);</div><div class='add'>+	saa_writeb(SAA7134_GPIO_GPSTATUS2, GPIO_COMMAND_ADDR);</div><div class='add'>+	saa_writeb(SAA7134_GPIO_GPSTATUS2, GPIO_COMMAND_IDLE);</div><div class='add'>+</div><div class='add'>+	saa_writeb(SAA7134_GPIO_GPMODE0, 0x00);</div><div class='add'>+</div><div class='add'>+	/* Read low byte */</div><div class='add'>+	saa_writeb(SAA7134_GPIO_GPSTATUS2, GPIO_COMMAND_READ);</div><div class='add'>+	saa_clearb(SAA7134_GPIO_GPMODE3, SAA7134_GPIO_GPRESCAN);</div><div class='add'>+	saa_setb(SAA7134_GPIO_GPMODE3, SAA7134_GPIO_GPRESCAN);</div><div class='add'>+	*data = saa_readb(SAA7134_GPIO_GPSTATUS0);</div><div class='add'>+	saa_writeb(SAA7134_GPIO_GPSTATUS2, GPIO_COMMAND_IDLE);</div><div class='add'>+</div><div class='add'>+	/* Read high byte */</div><div class='add'>+	saa_writeb(SAA7134_GPIO_GPSTATUS2, GPIO_COMMAND_READ);</div><div class='add'>+	saa_clearb(SAA7134_GPIO_GPMODE3, SAA7134_GPIO_GPRESCAN);</div><div class='add'>+	saa_setb(SAA7134_GPIO_GPMODE3, SAA7134_GPIO_GPRESCAN);</div><div class='add'>+	*data |= saa_readb(SAA7134_GPIO_GPSTATUS0) &lt;&lt; 8;</div><div class='add'>+	saa_writeb(SAA7134_GPIO_GPSTATUS2, GPIO_COMMAND_IDLE);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int saa7134_go7007_interface_reset(struct go7007 *go)</div><div class='add'>+{</div><div class='add'>+	struct saa7134_go7007 *saa = go-&gt;hpi_context;</div><div class='add'>+	struct saa7134_dev *dev = saa-&gt;dev;</div><div class='add'>+	u32 status;</div><div class='add'>+	u16 intr_val, intr_data;</div><div class='add'>+	int count = 20;</div><div class='add'>+</div><div class='add'>+	saa_clearb(SAA7134_TS_PARALLEL, 0x80); /* Disable TS interface */</div><div class='add'>+	saa_writeb(SAA7134_GPIO_GPMODE2, 0xa4);</div><div class='add'>+	saa_writeb(SAA7134_GPIO_GPMODE0, 0xff);</div><div class='add'>+</div><div class='add'>+	saa_writeb(SAA7134_GPIO_GPSTATUS2, GPIO_COMMAND_REQ1);</div><div class='add'>+	saa_writeb(SAA7134_GPIO_GPSTATUS2, GPIO_COMMAND_RESET);</div><div class='add'>+	msleep(1);</div><div class='add'>+	saa_writeb(SAA7134_GPIO_GPSTATUS2, GPIO_COMMAND_REQ1);</div><div class='add'>+	saa_writeb(SAA7134_GPIO_GPSTATUS2, GPIO_COMMAND_REQ2);</div><div class='add'>+	msleep(10);</div><div class='add'>+</div><div class='add'>+	saa_clearb(SAA7134_GPIO_GPMODE3, SAA7134_GPIO_GPRESCAN);</div><div class='add'>+	saa_setb(SAA7134_GPIO_GPMODE3, SAA7134_GPIO_GPRESCAN);</div><div class='add'>+</div><div class='add'>+	status = saa_readb(SAA7134_GPIO_GPSTATUS2);</div><div class='add'>+	/*printk(KERN_DEBUG "status is %s\n", status &amp; 0x40 ? "OK" : "not OK"); */</div><div class='add'>+</div><div class='add'>+	/* enter command mode...(?) */</div><div class='add'>+	saa_writeb(SAA7134_GPIO_GPSTATUS2, GPIO_COMMAND_REQ1);</div><div class='add'>+	saa_writeb(SAA7134_GPIO_GPSTATUS2, GPIO_COMMAND_REQ2);</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		saa_clearb(SAA7134_GPIO_GPMODE3, SAA7134_GPIO_GPRESCAN);</div><div class='add'>+		saa_setb(SAA7134_GPIO_GPMODE3, SAA7134_GPIO_GPRESCAN);</div><div class='add'>+		status = saa_readb(SAA7134_GPIO_GPSTATUS2);</div><div class='add'>+		/*printk(KERN_INFO "gpio is %08x\n", saa_readl(SAA7134_GPIO_GPSTATUS0 &gt;&gt; 2)); */</div><div class='add'>+	} while (--count &gt; 0);</div><div class='add'>+</div><div class='add'>+	/* Wait for an interrupt to indicate successful hardware reset */</div><div class='add'>+	if (go7007_read_interrupt(go, &amp;intr_val, &amp;intr_data) &lt; 0 ||</div><div class='add'>+			(intr_val &amp; ~0x1) != 0x55aa) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+			"saa7134-go7007: unable to reset the GO7007\n");</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int saa7134_go7007_write_interrupt(struct go7007 *go, int addr, int data)</div><div class='add'>+{</div><div class='add'>+	struct saa7134_go7007 *saa = go-&gt;hpi_context;</div><div class='add'>+	struct saa7134_dev *dev = saa-&gt;dev;</div><div class='add'>+	int i;</div><div class='add'>+	u16 status_reg;</div><div class='add'>+</div><div class='add'>+#ifdef GO7007_HPI_DEBUG</div><div class='add'>+	printk(KERN_DEBUG</div><div class='add'>+		"saa7134-go7007: WriteInterrupt: %04x %04x\n", addr, data);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 100; ++i) {</div><div class='add'>+		gpio_read(dev, HPI_ADDR_INTR_STATUS, &amp;status_reg);</div><div class='add'>+		if (!(status_reg &amp; 0x0010))</div><div class='add'>+			break;</div><div class='add'>+		msleep(10);</div><div class='add'>+	}</div><div class='add'>+	if (i == 100) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+			"saa7134-go7007: device is hung, status reg = 0x%04x\n",</div><div class='add'>+			status_reg);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+	gpio_write(dev, HPI_ADDR_INTR_WR_PARAM, data);</div><div class='add'>+	gpio_write(dev, HPI_ADDR_INTR_WR_INDEX, addr);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int saa7134_go7007_read_interrupt(struct go7007 *go)</div><div class='add'>+{</div><div class='add'>+	struct saa7134_go7007 *saa = go-&gt;hpi_context;</div><div class='add'>+	struct saa7134_dev *dev = saa-&gt;dev;</div><div class='add'>+</div><div class='add'>+	/* XXX we need to wait if there is no interrupt available */</div><div class='add'>+	go-&gt;interrupt_available = 1;</div><div class='add'>+	gpio_read(dev, HPI_ADDR_INTR_RET_VALUE, &amp;go-&gt;interrupt_value);</div><div class='add'>+	gpio_read(dev, HPI_ADDR_INTR_RET_DATA, &amp;go-&gt;interrupt_data);</div><div class='add'>+#ifdef GO7007_HPI_DEBUG</div><div class='add'>+	printk(KERN_DEBUG "saa7134-go7007: ReadInterrupt: %04x %04x\n",</div><div class='add'>+			go-&gt;interrupt_value, go-&gt;interrupt_data);</div><div class='add'>+#endif</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void saa7134_go7007_irq_ts_done(struct saa7134_dev *dev,</div><div class='add'>+						unsigned long status)</div><div class='add'>+{</div><div class='add'>+	struct go7007 *go = video_get_drvdata(dev-&gt;empress_dev);</div><div class='add'>+	struct saa7134_go7007 *saa = go-&gt;hpi_context;</div><div class='add'>+</div><div class='add'>+	if (!go-&gt;streaming)</div><div class='add'>+		return;</div><div class='add'>+	if (0 != (status &amp; 0x000f0000))</div><div class='add'>+		printk(KERN_DEBUG "saa7134-go7007: irq: lost %ld\n",</div><div class='add'>+				(status &gt;&gt; 16) &amp; 0x0f);</div><div class='add'>+	if (status &amp; 0x100000) {</div><div class='add'>+		dma_sync_single(&amp;dev-&gt;pci-&gt;dev,</div><div class='add'>+				saa-&gt;bottom_dma, PAGE_SIZE, DMA_FROM_DEVICE);</div><div class='add'>+		go7007_parse_video_stream(go, saa-&gt;bottom, PAGE_SIZE);</div><div class='add'>+		saa_writel(SAA7134_RS_BA2(5), cpu_to_le32(saa-&gt;bottom_dma));</div><div class='add'>+	} else {</div><div class='add'>+		dma_sync_single(&amp;dev-&gt;pci-&gt;dev,</div><div class='add'>+				saa-&gt;top_dma, PAGE_SIZE, DMA_FROM_DEVICE);</div><div class='add'>+		go7007_parse_video_stream(go, saa-&gt;top, PAGE_SIZE);</div><div class='add'>+		saa_writel(SAA7134_RS_BA1(5), cpu_to_le32(saa-&gt;top_dma));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int saa7134_go7007_stream_start(struct go7007 *go)</div><div class='add'>+{</div><div class='add'>+	struct saa7134_go7007 *saa = go-&gt;hpi_context;</div><div class='add'>+	struct saa7134_dev *dev = saa-&gt;dev;</div><div class='add'>+</div><div class='add'>+	saa-&gt;top_dma = dma_map_page(&amp;dev-&gt;pci-&gt;dev, virt_to_page(saa-&gt;top),</div><div class='add'>+			0, PAGE_SIZE, DMA_FROM_DEVICE);</div><div class='add'>+	if (!saa-&gt;top_dma)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	saa-&gt;bottom_dma = dma_map_page(&amp;dev-&gt;pci-&gt;dev,</div><div class='add'>+			virt_to_page(saa-&gt;bottom),</div><div class='add'>+			0, PAGE_SIZE, DMA_FROM_DEVICE);</div><div class='add'>+	if (!saa-&gt;bottom_dma) {</div><div class='add'>+		dma_unmap_page(&amp;dev-&gt;pci-&gt;dev, saa-&gt;top_dma, PAGE_SIZE,</div><div class='add'>+				DMA_FROM_DEVICE);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	saa_writel(SAA7134_VIDEO_PORT_CTRL0 &gt;&gt; 2, 0xA300B000);</div><div class='add'>+	saa_writel(SAA7134_VIDEO_PORT_CTRL4 &gt;&gt; 2, 0x40000200);</div><div class='add'>+</div><div class='add'>+	/* Set HPI interface for video */</div><div class='add'>+	saa_writeb(SAA7134_GPIO_GPMODE0, 0xff);</div><div class='add'>+	saa_writeb(SAA7134_GPIO_GPSTATUS0, HPI_ADDR_VIDEO_BUFFER);</div><div class='add'>+	saa_writeb(SAA7134_GPIO_GPSTATUS2, GPIO_COMMAND_ADDR);</div><div class='add'>+	saa_writeb(SAA7134_GPIO_GPMODE0, 0x00);</div><div class='add'>+</div><div class='add'>+	/* Enable TS interface */</div><div class='add'>+	saa_writeb(SAA7134_TS_PARALLEL, 0xe6);</div><div class='add'>+</div><div class='add'>+	/* Reset TS interface */</div><div class='add'>+	saa_setb(SAA7134_TS_SERIAL1, 0x01);</div><div class='add'>+	saa_clearb(SAA7134_TS_SERIAL1, 0x01);</div><div class='add'>+</div><div class='add'>+	/* Set up transfer block size */</div><div class='add'>+	saa_writeb(SAA7134_TS_PARALLEL_SERIAL, 128 - 1);</div><div class='add'>+	saa_writeb(SAA7134_TS_DMA0, (PAGE_SIZE &gt;&gt; 7) - 1);</div><div class='add'>+	saa_writeb(SAA7134_TS_DMA1, 0);</div><div class='add'>+	saa_writeb(SAA7134_TS_DMA2, 0);</div><div class='add'>+</div><div class='add'>+	/* Enable video streaming mode */</div><div class='add'>+	saa_writeb(SAA7134_GPIO_GPSTATUS2, GPIO_COMMAND_VIDEO);</div><div class='add'>+</div><div class='add'>+	saa_writel(SAA7134_RS_BA1(5), cpu_to_le32(saa-&gt;top_dma));</div><div class='add'>+	saa_writel(SAA7134_RS_BA2(5), cpu_to_le32(saa-&gt;bottom_dma));</div><div class='add'>+	saa_writel(SAA7134_RS_PITCH(5), 128);</div><div class='add'>+	saa_writel(SAA7134_RS_CONTROL(5), SAA7134_RS_CONTROL_BURST_MAX);</div><div class='add'>+</div><div class='add'>+	/* Enable TS FIFO */</div><div class='add'>+	saa_setl(SAA7134_MAIN_CTRL, SAA7134_MAIN_CTRL_TE5);</div><div class='add'>+</div><div class='add'>+	/* Enable DMA IRQ */</div><div class='add'>+	saa_setl(SAA7134_IRQ1,</div><div class='add'>+			SAA7134_IRQ1_INTE_RA2_1 | SAA7134_IRQ1_INTE_RA2_0);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int saa7134_go7007_stream_stop(struct go7007 *go)</div><div class='add'>+{</div><div class='add'>+	struct saa7134_go7007 *saa = go-&gt;hpi_context;</div><div class='add'>+	struct saa7134_dev *dev = saa-&gt;dev;</div><div class='add'>+</div><div class='add'>+	/* Shut down TS FIFO */</div><div class='add'>+	saa_clearl(SAA7134_MAIN_CTRL, SAA7134_MAIN_CTRL_TE5);</div><div class='add'>+</div><div class='add'>+	/* Disable DMA IRQ */</div><div class='add'>+	saa_clearl(SAA7134_IRQ1,</div><div class='add'>+			SAA7134_IRQ1_INTE_RA2_1 | SAA7134_IRQ1_INTE_RA2_0);</div><div class='add'>+</div><div class='add'>+	/* Disable TS interface */</div><div class='add'>+	saa_clearb(SAA7134_TS_PARALLEL, 0x80);</div><div class='add'>+</div><div class='add'>+	dma_unmap_page(&amp;dev-&gt;pci-&gt;dev, saa-&gt;top_dma, PAGE_SIZE,</div><div class='add'>+			DMA_FROM_DEVICE);</div><div class='add'>+	dma_unmap_page(&amp;dev-&gt;pci-&gt;dev, saa-&gt;bottom_dma, PAGE_SIZE,</div><div class='add'>+			DMA_FROM_DEVICE);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int saa7134_go7007_send_firmware(struct go7007 *go, u8 *data, int len)</div><div class='add'>+{</div><div class='add'>+	struct saa7134_go7007 *saa = go-&gt;hpi_context;</div><div class='add'>+	struct saa7134_dev *dev = saa-&gt;dev;</div><div class='add'>+	u16 status_reg;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+#ifdef GO7007_HPI_DEBUG</div><div class='add'>+	printk(KERN_DEBUG "saa7134-go7007: DownloadBuffer "</div><div class='add'>+			"sending %d bytes\n", len);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	while (len &gt; 0) {</div><div class='add'>+		i = len &gt; 64 ? 64 : len;</div><div class='add'>+		saa_writeb(SAA7134_GPIO_GPMODE0, 0xff);</div><div class='add'>+		saa_writeb(SAA7134_GPIO_GPSTATUS0, HPI_ADDR_INIT_BUFFER);</div><div class='add'>+		saa_writeb(SAA7134_GPIO_GPSTATUS2, GPIO_COMMAND_ADDR);</div><div class='add'>+		saa_writeb(SAA7134_GPIO_GPSTATUS2, GPIO_COMMAND_IDLE);</div><div class='add'>+		while (i-- &gt; 0) {</div><div class='add'>+			saa_writeb(SAA7134_GPIO_GPSTATUS0, *data);</div><div class='add'>+			saa_writeb(SAA7134_GPIO_GPSTATUS2, GPIO_COMMAND_WRITE);</div><div class='add'>+			saa_writeb(SAA7134_GPIO_GPSTATUS2, GPIO_COMMAND_IDLE);</div><div class='add'>+			++data;</div><div class='add'>+			--len;</div><div class='add'>+		}</div><div class='add'>+		for (i = 0; i &lt; 100; ++i) {</div><div class='add'>+			gpio_read(dev, HPI_ADDR_INTR_STATUS, &amp;status_reg);</div><div class='add'>+			if (!(status_reg &amp; 0x0002))</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+		if (i == 100) {</div><div class='add'>+			printk(KERN_ERR "saa7134-go7007: device is hung, "</div><div class='add'>+					"status reg = 0x%04x\n", status_reg);</div><div class='add'>+			return -1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct go7007_hpi_ops saa7134_go7007_hpi_ops = {</div><div class='add'>+	.interface_reset	= saa7134_go7007_interface_reset,</div><div class='add'>+	.write_interrupt	= saa7134_go7007_write_interrupt,</div><div class='add'>+	.read_interrupt		= saa7134_go7007_read_interrupt,</div><div class='add'>+	.stream_start		= saa7134_go7007_stream_start,</div><div class='add'>+	.stream_stop		= saa7134_go7007_stream_stop,</div><div class='add'>+	.send_firmware		= saa7134_go7007_send_firmware,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/********************* Add/remove functions *********************/</div><div class='add'>+</div><div class='add'>+static int saa7134_go7007_init(struct saa7134_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct go7007 *go;</div><div class='add'>+	struct saa7134_go7007 *saa;</div><div class='add'>+</div><div class='add'>+	printk(KERN_DEBUG "saa7134-go7007: probing new SAA713X board\n");</div><div class='add'>+</div><div class='add'>+	saa = kmalloc(sizeof(struct saa7134_go7007), GFP_KERNEL);</div><div class='add'>+	if (saa == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	memset(saa, 0, sizeof(struct saa7134_go7007));</div><div class='add'>+</div><div class='add'>+	/* Allocate a couple pages for receiving the compressed stream */</div><div class='add'>+	saa-&gt;top = (u8 *)get_zeroed_page(GFP_KERNEL);</div><div class='add'>+	if (!saa-&gt;top)</div><div class='add'>+		goto allocfail;</div><div class='add'>+	saa-&gt;bottom = (u8 *)get_zeroed_page(GFP_KERNEL);</div><div class='add'>+	if (!saa-&gt;bottom)</div><div class='add'>+		goto allocfail;</div><div class='add'>+</div><div class='add'>+	go = go7007_alloc(&amp;board_voyager, &amp;dev-&gt;pci-&gt;dev);</div><div class='add'>+	if (go == NULL)</div><div class='add'>+		goto allocfail;</div><div class='add'>+	go-&gt;board_id = GO7007_BOARDID_PCI_VOYAGER;</div><div class='add'>+	strncpy(go-&gt;name, saa7134_boards[dev-&gt;board].name, sizeof(go-&gt;name));</div><div class='add'>+	go-&gt;hpi_ops = &amp;saa7134_go7007_hpi_ops;</div><div class='add'>+	go-&gt;hpi_context = saa;</div><div class='add'>+	saa-&gt;dev = dev;</div><div class='add'>+</div><div class='add'>+	/* Boot the GO7007 */</div><div class='add'>+	if (go7007_boot_encoder(go, go-&gt;board_info-&gt;flags &amp;</div><div class='add'>+					GO7007_BOARD_USE_ONBOARD_I2C) &lt; 0)</div><div class='add'>+		goto initfail;</div><div class='add'>+</div><div class='add'>+	/* Do any final GO7007 initialization, then register the</div><div class='add'>+	 * V4L2 and ALSA interfaces */</div><div class='add'>+	if (go7007_register_encoder(go) &lt; 0)</div><div class='add'>+		goto initfail;</div><div class='add'>+	dev-&gt;empress_dev = go-&gt;video_dev;</div><div class='add'>+	video_set_drvdata(dev-&gt;empress_dev, go);</div><div class='add'>+</div><div class='add'>+	go-&gt;status = STATUS_ONLINE;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+initfail:</div><div class='add'>+	go-&gt;status = STATUS_SHUTDOWN;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+allocfail:</div><div class='add'>+	if (saa-&gt;top)</div><div class='add'>+		free_page((unsigned long)saa-&gt;top);</div><div class='add'>+	if (saa-&gt;bottom)</div><div class='add'>+		free_page((unsigned long)saa-&gt;bottom);</div><div class='add'>+	kfree(saa);</div><div class='add'>+	return -ENOMEM;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int saa7134_go7007_fini(struct saa7134_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct go7007 *go;</div><div class='add'>+	struct saa7134_go7007 *saa;</div><div class='add'>+</div><div class='add'>+	if (NULL == dev-&gt;empress_dev)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	go = video_get_drvdata(dev-&gt;empress_dev);</div><div class='add'>+	saa = go-&gt;hpi_context;</div><div class='add'>+	go-&gt;status = STATUS_SHUTDOWN;</div><div class='add'>+	free_page((unsigned long)saa-&gt;top);</div><div class='add'>+	free_page((unsigned long)saa-&gt;bottom);</div><div class='add'>+	kfree(saa);</div><div class='add'>+	go7007_remove(go);</div><div class='add'>+	dev-&gt;empress_dev = NULL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct saa7134_mpeg_ops saa7134_go7007_ops = {</div><div class='add'>+	.type          = SAA7134_MPEG_GO7007,</div><div class='add'>+	.init          = saa7134_go7007_init,</div><div class='add'>+	.fini          = saa7134_go7007_fini,</div><div class='add'>+	.irq_ts_done   = saa7134_go7007_irq_ts_done,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init saa7134_go7007_mod_init(void)</div><div class='add'>+{</div><div class='add'>+	return saa7134_ts_register(&amp;saa7134_go7007_ops);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit saa7134_go7007_mod_cleanup(void)</div><div class='add'>+{</div><div class='add'>+	saa7134_ts_unregister(&amp;saa7134_go7007_ops);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(saa7134_go7007_mod_init);</div><div class='add'>+module_exit(saa7134_go7007_mod_cleanup);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/staging/go7007/snd-go7007.c b/drivers/staging/go7007/snd-go7007.c<br/>new file mode 100644<br/>index 000000000000..382740c405ff<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/go7007/snd-go7007.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/go7007/snd-go7007.c</a></div><div class='hunk'>@@ -0,0 +1,305 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2005-2006 Micronas USA Inc.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License (Version 2) as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software Foundation,</div><div class='add'>+ * Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/version.h&gt;</div><div class='add'>+#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/vmalloc.h&gt;</div><div class='add'>+#include &lt;linux/time.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/semaphore.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='add'>+#include &lt;asm/system.h&gt;</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='add'>+#include &lt;sound/pcm.h&gt;</div><div class='add'>+#include &lt;sound/initval.h&gt;</div><div class='add'>+</div><div class='add'>+#include "go7007-priv.h"</div><div class='add'>+</div><div class='add'>+static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;</div><div class='add'>+static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;</div><div class='add'>+static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;</div><div class='add'>+</div><div class='add'>+module_param_array(index, int, NULL, 0444);</div><div class='add'>+module_param_array(id, charp, NULL, 0444);</div><div class='add'>+module_param_array(enable, bool, NULL, 0444);</div><div class='add'>+MODULE_PARM_DESC(index, "Index value for the go7007 audio driver");</div><div class='add'>+MODULE_PARM_DESC(id, "ID string for the go7007 audio driver");</div><div class='add'>+MODULE_PARM_DESC(enable, "Enable for the go7007 audio driver");</div><div class='add'>+</div><div class='add'>+struct go7007_snd {</div><div class='add'>+	struct snd_card *card;</div><div class='add'>+	struct snd_pcm *pcm;</div><div class='add'>+	struct snd_pcm_substream *substream;</div><div class='add'>+	spinlock_t lock;</div><div class='add'>+	int w_idx;</div><div class='add'>+	int hw_ptr;</div><div class='add'>+	int avail;</div><div class='add'>+	int capturing;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct snd_pcm_hardware go7007_snd_capture_hw = {</div><div class='add'>+	.info			= (SNDRV_PCM_INFO_MMAP |</div><div class='add'>+					SNDRV_PCM_INFO_INTERLEAVED |</div><div class='add'>+					SNDRV_PCM_INFO_BLOCK_TRANSFER |</div><div class='add'>+					SNDRV_PCM_INFO_MMAP_VALID),</div><div class='add'>+	.formats		= SNDRV_PCM_FMTBIT_S16_LE,</div><div class='add'>+	.rates			= SNDRV_PCM_RATE_48000,</div><div class='add'>+	.rate_min		= 48000,</div><div class='add'>+	.rate_max		= 48000,</div><div class='add'>+	.channels_min		= 2,</div><div class='add'>+	.channels_max		= 2,</div><div class='add'>+	.buffer_bytes_max	= (128*1024),</div><div class='add'>+	.period_bytes_min	= 4096,</div><div class='add'>+	.period_bytes_max	= (128*1024),</div><div class='add'>+	.periods_min		= 1,</div><div class='add'>+	.periods_max		= 32,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void parse_audio_stream_data(struct go7007 *go, u8 *buf, int length)</div><div class='add'>+{</div><div class='add'>+	struct go7007_snd *gosnd = go-&gt;snd_context;</div><div class='add'>+	struct snd_pcm_runtime *runtime = gosnd-&gt;substream-&gt;runtime;</div><div class='add'>+	int frames = bytes_to_frames(runtime, length);</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;gosnd-&gt;lock);</div><div class='add'>+	gosnd-&gt;hw_ptr += frames;</div><div class='add'>+	if (gosnd-&gt;hw_ptr &gt;= runtime-&gt;buffer_size)</div><div class='add'>+		gosnd-&gt;hw_ptr -= runtime-&gt;buffer_size;</div><div class='add'>+	gosnd-&gt;avail += frames;</div><div class='add'>+	spin_unlock(&amp;gosnd-&gt;lock);</div><div class='add'>+	if (gosnd-&gt;w_idx + length &gt; runtime-&gt;dma_bytes) {</div><div class='add'>+		int cpy = runtime-&gt;dma_bytes - gosnd-&gt;w_idx;</div><div class='add'>+</div><div class='add'>+		memcpy(runtime-&gt;dma_area + gosnd-&gt;w_idx, buf, cpy);</div><div class='add'>+		length -= cpy;</div><div class='add'>+		buf += cpy;</div><div class='add'>+		gosnd-&gt;w_idx = 0;</div><div class='add'>+	}</div><div class='add'>+	memcpy(runtime-&gt;dma_area + gosnd-&gt;w_idx, buf, length);</div><div class='add'>+	gosnd-&gt;w_idx += length;</div><div class='add'>+	spin_lock(&amp;gosnd-&gt;lock);</div><div class='add'>+	if (gosnd-&gt;avail &lt; runtime-&gt;period_size) {</div><div class='add'>+		spin_unlock(&amp;gosnd-&gt;lock);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	gosnd-&gt;avail -= runtime-&gt;period_size;</div><div class='add'>+	spin_unlock(&amp;gosnd-&gt;lock);</div><div class='add'>+	if (gosnd-&gt;capturing)</div><div class='add'>+		snd_pcm_period_elapsed(gosnd-&gt;substream);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int go7007_snd_hw_params(struct snd_pcm_substream *substream,</div><div class='add'>+				struct snd_pcm_hw_params *hw_params)</div><div class='add'>+{</div><div class='add'>+	struct go7007 *go = snd_pcm_substream_chip(substream);</div><div class='add'>+	unsigned int bytes;</div><div class='add'>+</div><div class='add'>+	bytes = params_buffer_bytes(hw_params);</div><div class='add'>+	if (substream-&gt;runtime-&gt;dma_bytes &gt; 0)</div><div class='add'>+		vfree(substream-&gt;runtime-&gt;dma_area);</div><div class='add'>+	substream-&gt;runtime-&gt;dma_bytes = 0;</div><div class='add'>+	substream-&gt;runtime-&gt;dma_area = vmalloc(bytes);</div><div class='add'>+	if (substream-&gt;runtime-&gt;dma_area == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	substream-&gt;runtime-&gt;dma_bytes = bytes;</div><div class='add'>+	go-&gt;audio_deliver = parse_audio_stream_data;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int go7007_snd_hw_free(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct go7007 *go = snd_pcm_substream_chip(substream);</div><div class='add'>+</div><div class='add'>+	go-&gt;audio_deliver = NULL;</div><div class='add'>+	if (substream-&gt;runtime-&gt;dma_bytes &gt; 0)</div><div class='add'>+		vfree(substream-&gt;runtime-&gt;dma_area);</div><div class='add'>+	substream-&gt;runtime-&gt;dma_bytes = 0;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int go7007_snd_capture_open(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct go7007 *go = snd_pcm_substream_chip(substream);</div><div class='add'>+	struct go7007_snd *gosnd = go-&gt;snd_context;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;gosnd-&gt;lock, flags);</div><div class='add'>+	if (gosnd-&gt;substream == NULL) {</div><div class='add'>+		gosnd-&gt;substream = substream;</div><div class='add'>+		substream-&gt;runtime-&gt;hw = go7007_snd_capture_hw;</div><div class='add'>+		r = 0;</div><div class='add'>+	} else</div><div class='add'>+		r = -EBUSY;</div><div class='add'>+	spin_unlock_irqrestore(&amp;gosnd-&gt;lock, flags);</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int go7007_snd_capture_close(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct go7007 *go = snd_pcm_substream_chip(substream);</div><div class='add'>+	struct go7007_snd *gosnd = go-&gt;snd_context;</div><div class='add'>+</div><div class='add'>+	gosnd-&gt;substream = NULL;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int go7007_snd_pcm_prepare(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int go7007_snd_pcm_trigger(struct snd_pcm_substream *substream, int cmd)</div><div class='add'>+{</div><div class='add'>+	struct go7007 *go = snd_pcm_substream_chip(substream);</div><div class='add'>+	struct go7007_snd *gosnd = go-&gt;snd_context;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case SNDRV_PCM_TRIGGER_START:</div><div class='add'>+		/* Just set a flag to indicate we should signal ALSA when</div><div class='add'>+		 * sound comes in */</div><div class='add'>+		gosnd-&gt;capturing = 1;</div><div class='add'>+		return 0;</div><div class='add'>+	case SNDRV_PCM_TRIGGER_STOP:</div><div class='add'>+		gosnd-&gt;hw_ptr = gosnd-&gt;w_idx = gosnd-&gt;avail = 0;</div><div class='add'>+		gosnd-&gt;capturing = 0;</div><div class='add'>+		return 0;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static snd_pcm_uframes_t go7007_snd_pcm_pointer(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct go7007 *go = snd_pcm_substream_chip(substream);</div><div class='add'>+	struct go7007_snd *gosnd = go-&gt;snd_context;</div><div class='add'>+</div><div class='add'>+	return gosnd-&gt;hw_ptr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct page *go7007_snd_pcm_page(struct snd_pcm_substream *substream,</div><div class='add'>+					unsigned long offset)</div><div class='add'>+{</div><div class='add'>+	return vmalloc_to_page(substream-&gt;runtime-&gt;dma_area + offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct snd_pcm_ops go7007_snd_capture_ops = {</div><div class='add'>+	.open		= go7007_snd_capture_open,</div><div class='add'>+	.close		= go7007_snd_capture_close,</div><div class='add'>+	.ioctl		= snd_pcm_lib_ioctl,</div><div class='add'>+	.hw_params	= go7007_snd_hw_params,</div><div class='add'>+	.hw_free	= go7007_snd_hw_free,</div><div class='add'>+	.prepare	= go7007_snd_pcm_prepare,</div><div class='add'>+	.trigger	= go7007_snd_pcm_trigger,</div><div class='add'>+	.pointer	= go7007_snd_pcm_pointer,</div><div class='add'>+	.page		= go7007_snd_pcm_page,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int go7007_snd_free(struct snd_device *device)</div><div class='add'>+{</div><div class='add'>+	struct go7007 *go = device-&gt;device_data;</div><div class='add'>+</div><div class='add'>+	kfree(go-&gt;snd_context);</div><div class='add'>+	go-&gt;snd_context = NULL;</div><div class='add'>+	if (--go-&gt;ref_count == 0)</div><div class='add'>+		kfree(go);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct snd_device_ops go7007_snd_device_ops = {</div><div class='add'>+	.dev_free	= go7007_snd_free,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int go7007_snd_init(struct go7007 *go)</div><div class='add'>+{</div><div class='add'>+	static int dev;</div><div class='add'>+	struct go7007_snd *gosnd;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (dev &gt;= SNDRV_CARDS)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	if (!enable[dev]) {</div><div class='add'>+		dev++;</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+	gosnd = kmalloc(sizeof(struct go7007_snd), GFP_KERNEL);</div><div class='add'>+	if (gosnd == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	spin_lock_init(&amp;gosnd-&gt;lock);</div><div class='add'>+	gosnd-&gt;hw_ptr = gosnd-&gt;w_idx = gosnd-&gt;avail = 0;</div><div class='add'>+	gosnd-&gt;capturing = 0;</div><div class='add'>+	gosnd-&gt;card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);</div><div class='add'>+	if (gosnd-&gt;card == NULL) {</div><div class='add'>+		kfree(gosnd);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	ret = snd_device_new(gosnd-&gt;card, SNDRV_DEV_LOWLEVEL, go,</div><div class='add'>+			&amp;go7007_snd_device_ops);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		kfree(gosnd);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+	snd_card_set_dev(gosnd-&gt;card, go-&gt;dev);</div><div class='add'>+	ret = snd_pcm_new(gosnd-&gt;card, "go7007", 0, 0, 1, &amp;gosnd-&gt;pcm);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		snd_card_free(gosnd-&gt;card);</div><div class='add'>+		kfree(gosnd);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+	strncpy(gosnd-&gt;card-&gt;driver, "go7007", sizeof(gosnd-&gt;card-&gt;driver));</div><div class='add'>+	strncpy(gosnd-&gt;card-&gt;shortname, go-&gt;name, sizeof(gosnd-&gt;card-&gt;driver));</div><div class='add'>+	strncpy(gosnd-&gt;card-&gt;longname, gosnd-&gt;card-&gt;shortname,</div><div class='add'>+			sizeof(gosnd-&gt;card-&gt;longname));</div><div class='add'>+</div><div class='add'>+	gosnd-&gt;pcm-&gt;private_data = go;</div><div class='add'>+	snd_pcm_set_ops(gosnd-&gt;pcm, SNDRV_PCM_STREAM_CAPTURE,</div><div class='add'>+			&amp;go7007_snd_capture_ops);</div><div class='add'>+</div><div class='add'>+	ret = snd_card_register(gosnd-&gt;card);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		snd_card_free(gosnd-&gt;card);</div><div class='add'>+		kfree(gosnd);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	gosnd-&gt;substream = NULL;</div><div class='add'>+	go-&gt;snd_context = gosnd;</div><div class='add'>+	++dev;</div><div class='add'>+	++go-&gt;ref_count;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(go7007_snd_init);</div><div class='add'>+</div><div class='add'>+int go7007_snd_remove(struct go7007 *go)</div><div class='add'>+{</div><div class='add'>+	struct go7007_snd *gosnd = go-&gt;snd_context;</div><div class='add'>+</div><div class='add'>+	snd_card_disconnect(gosnd-&gt;card);</div><div class='add'>+	snd_card_free_when_closed(gosnd-&gt;card);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(go7007_snd_remove);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/staging/go7007/wis-i2c.h b/drivers/staging/go7007/wis-i2c.h<br/>new file mode 100644<br/>index 000000000000..993f658ad731<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/go7007/wis-i2c.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/go7007/wis-i2c.h</a></div><div class='hunk'>@@ -0,0 +1,55 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2005-2006 Micronas USA Inc.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License (Version 2) as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software Foundation,</div><div class='add'>+ * Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* Temporary I2C IDs -- these need to be replaced with real registered IDs */</div><div class='add'>+#define	I2C_DRIVERID_WIS_SAA7115	0xf0f0</div><div class='add'>+#define	I2C_DRIVERID_WIS_UDA1342	0xf0f1</div><div class='add'>+#define	I2C_DRIVERID_WIS_SONY_TUNER	0xf0f2</div><div class='add'>+#define	I2C_DRIVERID_WIS_TW9903		0xf0f3</div><div class='add'>+#define	I2C_DRIVERID_WIS_SAA7113	0xf0f4</div><div class='add'>+#define	I2C_DRIVERID_WIS_OV7640		0xf0f5</div><div class='add'>+#define	I2C_DRIVERID_WIS_TW2804		0xf0f6</div><div class='add'>+#define	I2C_ALGO_GO7007			0xf00000</div><div class='add'>+#define	I2C_ALGO_GO7007_USB		0xf10000</div><div class='add'>+</div><div class='add'>+/* Flag to indicate that the client needs to be accessed with SCCB semantics */</div><div class='add'>+/* We re-use the I2C_M_TEN value so the flag passes through the masks in the</div><div class='add'>+ * core I2C code.  Major kludge, but the I2C layer ain't exactly flexible. */</div><div class='add'>+#define	I2C_CLIENT_SCCB			0x10</div><div class='add'>+</div><div class='add'>+typedef int (*found_proc) (struct i2c_adapter *, int, int);</div><div class='add'>+int wis_i2c_add_driver(unsigned int id, found_proc found_proc);</div><div class='add'>+void wis_i2c_del_driver(found_proc found_proc);</div><div class='add'>+</div><div class='add'>+int wis_i2c_probe_device(struct i2c_adapter *adapter,</div><div class='add'>+				unsigned int id, int addr);</div><div class='add'>+</div><div class='add'>+/* Definitions for new video decoder commands */</div><div class='add'>+</div><div class='add'>+struct video_decoder_resolution {</div><div class='add'>+	unsigned int width;</div><div class='add'>+	unsigned int height;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define	DECODER_SET_RESOLUTION	_IOW('d', 200, struct video_decoder_resolution)</div><div class='add'>+#define	DECODER_SET_CHANNEL	_IOW('d', 201, int)</div><div class='add'>+</div><div class='add'>+/* Sony tuner types */</div><div class='add'>+</div><div class='add'>+#define TUNER_SONY_BTF_PG472Z		200</div><div class='add'>+#define TUNER_SONY_BTF_PK467Z		201</div><div class='add'>+#define TUNER_SONY_BTF_PB463Z		202</div><div class='head'>diff --git a/drivers/staging/go7007/wis-ov7640.c b/drivers/staging/go7007/wis-ov7640.c<br/>new file mode 100644<br/>index 000000000000..f5f11e927af3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/go7007/wis-ov7640.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/go7007/wis-ov7640.c</a></div><div class='hunk'>@@ -0,0 +1,130 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2005-2006 Micronas USA Inc.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License (Version 2) as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software Foundation,</div><div class='add'>+ * Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/version.h&gt;</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/videodev2.h&gt;</div><div class='add'>+</div><div class='add'>+#include "wis-i2c.h"</div><div class='add'>+</div><div class='add'>+struct wis_ov7640 {</div><div class='add'>+	int brightness;</div><div class='add'>+	int contrast;</div><div class='add'>+	int saturation;</div><div class='add'>+	int hue;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u8 initial_registers[] =</div><div class='add'>+{</div><div class='add'>+	0x12, 0x80,</div><div class='add'>+	0x12, 0x54,</div><div class='add'>+	0x14, 0x24,</div><div class='add'>+	0x15, 0x01,</div><div class='add'>+	0x28, 0x20,</div><div class='add'>+	0x75, 0x82,</div><div class='add'>+	0xFF, 0xFF, /* Terminator (reg 0xFF is unused) */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int write_regs(struct i2c_client *client, u8 *regs)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; regs[i] != 0xFF; i += 2)</div><div class='add'>+		if (i2c_smbus_write_byte_data(client, regs[i], regs[i + 1]) &lt; 0)</div><div class='add'>+			return -1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct i2c_driver wis_ov7640_driver;</div><div class='add'>+</div><div class='add'>+static struct i2c_client wis_ov7640_client_templ = {</div><div class='add'>+	.name		= "OV7640 (WIS)",</div><div class='add'>+	.driver		= &amp;wis_ov7640_driver,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int wis_ov7640_detect(struct i2c_adapter *adapter, int addr, int kind)</div><div class='add'>+{</div><div class='add'>+	struct i2c_client *client;</div><div class='add'>+</div><div class='add'>+	if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL);</div><div class='add'>+	if (client == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	memcpy(client, &amp;wis_ov7640_client_templ,</div><div class='add'>+			sizeof(wis_ov7640_client_templ));</div><div class='add'>+	client-&gt;adapter = adapter;</div><div class='add'>+	client-&gt;addr = addr;</div><div class='add'>+	client-&gt;flags = I2C_CLIENT_SCCB;</div><div class='add'>+</div><div class='add'>+	printk(KERN_DEBUG</div><div class='add'>+		"wis-ov7640: initializing OV7640 at address %d on %s\n",</div><div class='add'>+		addr, adapter-&gt;name);</div><div class='add'>+</div><div class='add'>+	if (write_regs(client, initial_registers) &lt; 0) {</div><div class='add'>+		printk(KERN_ERR "wis-ov7640: error initializing OV7640\n");</div><div class='add'>+		kfree(client);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	i2c_attach_client(client);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wis_ov7640_detach(struct i2c_client *client)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	r = i2c_detach_client(client);</div><div class='add'>+	if (r &lt; 0)</div><div class='add'>+		return r;</div><div class='add'>+</div><div class='add'>+	kfree(client);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct i2c_driver wis_ov7640_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name	= "WIS OV7640 I2C driver",</div><div class='add'>+	},</div><div class='add'>+	.id		= I2C_DRIVERID_WIS_OV7640,</div><div class='add'>+	.detach_client	= wis_ov7640_detach,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init wis_ov7640_init(void)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	r = i2c_add_driver(&amp;wis_ov7640_driver);</div><div class='add'>+	if (r &lt; 0)</div><div class='add'>+		return r;</div><div class='add'>+	return wis_i2c_add_driver(wis_ov7640_driver.id, wis_ov7640_detect);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit wis_ov7640_cleanup(void)</div><div class='add'>+{</div><div class='add'>+	wis_i2c_del_driver(wis_ov7640_detect);</div><div class='add'>+	i2c_del_driver(&amp;wis_ov7640_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(wis_ov7640_init);</div><div class='add'>+module_exit(wis_ov7640_cleanup);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/staging/go7007/wis-saa7113.c b/drivers/staging/go7007/wis-saa7113.c<br/>new file mode 100644<br/>index 000000000000..c1aff1b923a0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/go7007/wis-saa7113.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/go7007/wis-saa7113.c</a></div><div class='hunk'>@@ -0,0 +1,358 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2005-2006 Micronas USA Inc.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License (Version 2) as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software Foundation,</div><div class='add'>+ * Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/version.h&gt;</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/videodev2.h&gt;</div><div class='add'>+#include &lt;linux/ioctl.h&gt;</div><div class='add'>+</div><div class='add'>+#include "wis-i2c.h"</div><div class='add'>+</div><div class='add'>+struct wis_saa7113 {</div><div class='add'>+	int norm;</div><div class='add'>+	int brightness;</div><div class='add'>+	int contrast;</div><div class='add'>+	int saturation;</div><div class='add'>+	int hue;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u8 initial_registers[] =</div><div class='add'>+{</div><div class='add'>+	0x01, 0x08,</div><div class='add'>+	0x02, 0xc0,</div><div class='add'>+	0x03, 0x33,</div><div class='add'>+	0x04, 0x00,</div><div class='add'>+	0x05, 0x00,</div><div class='add'>+	0x06, 0xe9,</div><div class='add'>+	0x07, 0x0d,</div><div class='add'>+	0x08, 0xd8,</div><div class='add'>+	0x09, 0x40,</div><div class='add'>+	0x0a, 0x80,</div><div class='add'>+	0x0b, 0x47,</div><div class='add'>+	0x0c, 0x40,</div><div class='add'>+	0x0d, 0x00,</div><div class='add'>+	0x0e, 0x01,</div><div class='add'>+	0x0f, 0x2a,</div><div class='add'>+	0x10, 0x40,</div><div class='add'>+	0x11, 0x0c,</div><div class='add'>+	0x12, 0xfe,</div><div class='add'>+	0x13, 0x00,</div><div class='add'>+	0x14, 0x00,</div><div class='add'>+	0x15, 0x04,</div><div class='add'>+	0x16, 0x00,</div><div class='add'>+	0x17, 0x00,</div><div class='add'>+	0x18, 0x00,</div><div class='add'>+	0x19, 0x00,</div><div class='add'>+	0x1a, 0x00,</div><div class='add'>+	0x1b, 0x00,</div><div class='add'>+	0x1c, 0x00,</div><div class='add'>+	0x1d, 0x00,</div><div class='add'>+	0x1e, 0x00,</div><div class='add'>+	0x1f, 0xc8,</div><div class='add'>+	0x40, 0x00,</div><div class='add'>+	0x41, 0xff,</div><div class='add'>+	0x42, 0xff,</div><div class='add'>+	0x43, 0xff,</div><div class='add'>+	0x44, 0xff,</div><div class='add'>+	0x45, 0xff,</div><div class='add'>+	0x46, 0xff,</div><div class='add'>+	0x47, 0xff,</div><div class='add'>+	0x48, 0xff,</div><div class='add'>+	0x49, 0xff,</div><div class='add'>+	0x4a, 0xff,</div><div class='add'>+	0x4b, 0xff,</div><div class='add'>+	0x4c, 0xff,</div><div class='add'>+	0x4d, 0xff,</div><div class='add'>+	0x4e, 0xff,</div><div class='add'>+	0x4f, 0xff,</div><div class='add'>+	0x50, 0xff,</div><div class='add'>+	0x51, 0xff,</div><div class='add'>+	0x52, 0xff,</div><div class='add'>+	0x53, 0xff,</div><div class='add'>+	0x54, 0xff,</div><div class='add'>+	0x55, 0xff,</div><div class='add'>+	0x56, 0xff,</div><div class='add'>+	0x57, 0xff,</div><div class='add'>+	0x58, 0x00,</div><div class='add'>+	0x59, 0x54,</div><div class='add'>+	0x5a, 0x07,</div><div class='add'>+	0x5b, 0x83,</div><div class='add'>+	0x5c, 0x00,</div><div class='add'>+	0x5d, 0x00,</div><div class='add'>+	0x5e, 0x00,</div><div class='add'>+	0x5f, 0x00,</div><div class='add'>+	0x60, 0x00,</div><div class='add'>+	0x61, 0x00,</div><div class='add'>+	0x00, 0x00, /* Terminator (reg 0x00 is read-only) */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int write_reg(struct i2c_client *client, u8 reg, u8 value)</div><div class='add'>+{</div><div class='add'>+	return i2c_smbus_write_byte_data(client, reg, value);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int write_regs(struct i2c_client *client, u8 *regs)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; regs[i] != 0x00; i += 2)</div><div class='add'>+		if (i2c_smbus_write_byte_data(client, regs[i], regs[i + 1]) &lt; 0)</div><div class='add'>+			return -1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wis_saa7113_command(struct i2c_client *client,</div><div class='add'>+				unsigned int cmd, void *arg)</div><div class='add'>+{</div><div class='add'>+	struct wis_saa7113 *dec = i2c_get_clientdata(client);</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case VIDIOC_S_INPUT:</div><div class='add'>+	{</div><div class='add'>+		int *input = arg;</div><div class='add'>+</div><div class='add'>+		i2c_smbus_write_byte_data(client, 0x02, 0xC0 | *input);</div><div class='add'>+		i2c_smbus_write_byte_data(client, 0x09,</div><div class='add'>+				*input &lt; 6 ? 0x40 : 0x80);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_S_STD:</div><div class='add'>+	{</div><div class='add'>+		v4l2_std_id *input = arg;</div><div class='add'>+		dec-&gt;norm = *input;</div><div class='add'>+		if (dec-&gt;norm &amp; V4L2_STD_NTSC) {</div><div class='add'>+			write_reg(client, 0x0e, 0x01);</div><div class='add'>+			write_reg(client, 0x10, 0x40);</div><div class='add'>+		} else if (dec-&gt;norm &amp; V4L2_STD_PAL) {</div><div class='add'>+			write_reg(client, 0x0e, 0x01);</div><div class='add'>+			write_reg(client, 0x10, 0x48);</div><div class='add'>+		} else if (dec-&gt;norm * V4L2_STD_SECAM) {</div><div class='add'>+			write_reg(client, 0x0e, 0x50);</div><div class='add'>+			write_reg(client, 0x10, 0x48);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_QUERYCTRL:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_queryctrl *ctrl = arg;</div><div class='add'>+</div><div class='add'>+		switch (ctrl-&gt;id) {</div><div class='add'>+		case V4L2_CID_BRIGHTNESS:</div><div class='add'>+			ctrl-&gt;type = V4L2_CTRL_TYPE_INTEGER;</div><div class='add'>+			strncpy(ctrl-&gt;name, "Brightness", sizeof(ctrl-&gt;name));</div><div class='add'>+			ctrl-&gt;minimum = 0;</div><div class='add'>+			ctrl-&gt;maximum = 255;</div><div class='add'>+			ctrl-&gt;step = 1;</div><div class='add'>+			ctrl-&gt;default_value = 128;</div><div class='add'>+			ctrl-&gt;flags = 0;</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_CID_CONTRAST:</div><div class='add'>+			ctrl-&gt;type = V4L2_CTRL_TYPE_INTEGER;</div><div class='add'>+			strncpy(ctrl-&gt;name, "Contrast", sizeof(ctrl-&gt;name));</div><div class='add'>+			ctrl-&gt;minimum = 0;</div><div class='add'>+			ctrl-&gt;maximum = 127;</div><div class='add'>+			ctrl-&gt;step = 1;</div><div class='add'>+			ctrl-&gt;default_value = 71;</div><div class='add'>+			ctrl-&gt;flags = 0;</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_CID_SATURATION:</div><div class='add'>+			ctrl-&gt;type = V4L2_CTRL_TYPE_INTEGER;</div><div class='add'>+			strncpy(ctrl-&gt;name, "Saturation", sizeof(ctrl-&gt;name));</div><div class='add'>+			ctrl-&gt;minimum = 0;</div><div class='add'>+			ctrl-&gt;maximum = 127;</div><div class='add'>+			ctrl-&gt;step = 1;</div><div class='add'>+			ctrl-&gt;default_value = 64;</div><div class='add'>+			ctrl-&gt;flags = 0;</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_CID_HUE:</div><div class='add'>+			ctrl-&gt;type = V4L2_CTRL_TYPE_INTEGER;</div><div class='add'>+			strncpy(ctrl-&gt;name, "Hue", sizeof(ctrl-&gt;name));</div><div class='add'>+			ctrl-&gt;minimum = -128;</div><div class='add'>+			ctrl-&gt;maximum = 127;</div><div class='add'>+			ctrl-&gt;step = 1;</div><div class='add'>+			ctrl-&gt;default_value = 0;</div><div class='add'>+			ctrl-&gt;flags = 0;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_S_CTRL:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_control *ctrl = arg;</div><div class='add'>+</div><div class='add'>+		switch (ctrl-&gt;id) {</div><div class='add'>+		case V4L2_CID_BRIGHTNESS:</div><div class='add'>+			if (ctrl-&gt;value &gt; 255)</div><div class='add'>+				dec-&gt;brightness = 255;</div><div class='add'>+			else if (ctrl-&gt;value &lt; 0)</div><div class='add'>+				dec-&gt;brightness = 0;</div><div class='add'>+			else</div><div class='add'>+				dec-&gt;brightness = ctrl-&gt;value;</div><div class='add'>+			write_reg(client, 0x0a, dec-&gt;brightness);</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_CID_CONTRAST:</div><div class='add'>+			if (ctrl-&gt;value &gt; 127)</div><div class='add'>+				dec-&gt;contrast = 127;</div><div class='add'>+			else if (ctrl-&gt;value &lt; 0)</div><div class='add'>+				dec-&gt;contrast = 0;</div><div class='add'>+			else</div><div class='add'>+				dec-&gt;contrast = ctrl-&gt;value;</div><div class='add'>+			write_reg(client, 0x0b, dec-&gt;contrast);</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_CID_SATURATION:</div><div class='add'>+			if (ctrl-&gt;value &gt; 127)</div><div class='add'>+				dec-&gt;saturation = 127;</div><div class='add'>+			else if (ctrl-&gt;value &lt; 0)</div><div class='add'>+				dec-&gt;saturation = 0;</div><div class='add'>+			else</div><div class='add'>+				dec-&gt;saturation = ctrl-&gt;value;</div><div class='add'>+			write_reg(client, 0x0c, dec-&gt;saturation);</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_CID_HUE:</div><div class='add'>+			if (ctrl-&gt;value &gt; 127)</div><div class='add'>+				dec-&gt;hue = 127;</div><div class='add'>+			else if (ctrl-&gt;value &lt; -128)</div><div class='add'>+				dec-&gt;hue = -128;</div><div class='add'>+			else</div><div class='add'>+				dec-&gt;hue = ctrl-&gt;value;</div><div class='add'>+			write_reg(client, 0x0d, dec-&gt;hue);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_G_CTRL:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_control *ctrl = arg;</div><div class='add'>+</div><div class='add'>+		switch (ctrl-&gt;id) {</div><div class='add'>+		case V4L2_CID_BRIGHTNESS:</div><div class='add'>+			ctrl-&gt;value = dec-&gt;brightness;</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_CID_CONTRAST:</div><div class='add'>+			ctrl-&gt;value = dec-&gt;contrast;</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_CID_SATURATION:</div><div class='add'>+			ctrl-&gt;value = dec-&gt;saturation;</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_CID_HUE:</div><div class='add'>+			ctrl-&gt;value = dec-&gt;hue;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct i2c_driver wis_saa7113_driver;</div><div class='add'>+</div><div class='add'>+static struct i2c_client wis_saa7113_client_templ = {</div><div class='add'>+	.name		= "SAA7113 (WIS)",</div><div class='add'>+	.driver		= &amp;wis_saa7113_driver,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int wis_saa7113_detect(struct i2c_adapter *adapter, int addr, int kind)</div><div class='add'>+{</div><div class='add'>+	struct i2c_client *client;</div><div class='add'>+	struct wis_saa7113 *dec;</div><div class='add'>+</div><div class='add'>+	if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL);</div><div class='add'>+	if (client == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	memcpy(client, &amp;wis_saa7113_client_templ,</div><div class='add'>+			sizeof(wis_saa7113_client_templ));</div><div class='add'>+	client-&gt;adapter = adapter;</div><div class='add'>+	client-&gt;addr = addr;</div><div class='add'>+</div><div class='add'>+	dec = kmalloc(sizeof(struct wis_saa7113), GFP_KERNEL);</div><div class='add'>+	if (dec == NULL) {</div><div class='add'>+		kfree(client);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	dec-&gt;norm = V4L2_STD_NTSC;</div><div class='add'>+	dec-&gt;brightness = 128;</div><div class='add'>+	dec-&gt;contrast = 71;</div><div class='add'>+	dec-&gt;saturation = 64;</div><div class='add'>+	dec-&gt;hue = 0;</div><div class='add'>+	i2c_set_clientdata(client, dec);</div><div class='add'>+</div><div class='add'>+	printk(KERN_DEBUG</div><div class='add'>+		"wis-saa7113: initializing SAA7113 at address %d on %s\n",</div><div class='add'>+		addr, adapter-&gt;name);</div><div class='add'>+</div><div class='add'>+	if (write_regs(client, initial_registers) &lt; 0) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+			"wis-saa7113: error initializing SAA7113\n");</div><div class='add'>+		kfree(client);</div><div class='add'>+		kfree(dec);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	i2c_attach_client(client);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wis_saa7113_detach(struct i2c_client *client)</div><div class='add'>+{</div><div class='add'>+	struct wis_saa7113 *dec = i2c_get_clientdata(client);</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	r = i2c_detach_client(client);</div><div class='add'>+	if (r &lt; 0)</div><div class='add'>+		return r;</div><div class='add'>+</div><div class='add'>+	kfree(client);</div><div class='add'>+	kfree(dec);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct i2c_driver wis_saa7113_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name	= "WIS SAA7113 I2C driver",</div><div class='add'>+	},</div><div class='add'>+	.id		= I2C_DRIVERID_WIS_SAA7113,</div><div class='add'>+	.detach_client	= wis_saa7113_detach,</div><div class='add'>+	.command	= wis_saa7113_command,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init wis_saa7113_init(void)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	r = i2c_add_driver(&amp;wis_saa7113_driver);</div><div class='add'>+	if (r &lt; 0)</div><div class='add'>+		return r;</div><div class='add'>+	return wis_i2c_add_driver(wis_saa7113_driver.id, wis_saa7113_detect);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit wis_saa7113_cleanup(void)</div><div class='add'>+{</div><div class='add'>+	wis_i2c_del_driver(wis_saa7113_detect);</div><div class='add'>+	i2c_del_driver(&amp;wis_saa7113_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(wis_saa7113_init);</div><div class='add'>+module_exit(wis_saa7113_cleanup);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/staging/go7007/wis-saa7115.c b/drivers/staging/go7007/wis-saa7115.c<br/>new file mode 100644<br/>index 000000000000..5c94c883b312<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/go7007/wis-saa7115.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/go7007/wis-saa7115.c</a></div><div class='hunk'>@@ -0,0 +1,491 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2005-2006 Micronas USA Inc.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License (Version 2) as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software Foundation,</div><div class='add'>+ * Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/version.h&gt;</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/videodev2.h&gt;</div><div class='add'>+#include &lt;linux/ioctl.h&gt;</div><div class='add'>+</div><div class='add'>+#include "wis-i2c.h"</div><div class='add'>+</div><div class='add'>+struct wis_saa7115 {</div><div class='add'>+	int norm;</div><div class='add'>+	int brightness;</div><div class='add'>+	int contrast;</div><div class='add'>+	int saturation;</div><div class='add'>+	int hue;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u8 initial_registers[] =</div><div class='add'>+{</div><div class='add'>+	0x01, 0x08,</div><div class='add'>+	0x02, 0xc0,</div><div class='add'>+	0x03, 0x20,</div><div class='add'>+	0x04, 0x80,</div><div class='add'>+	0x05, 0x80,</div><div class='add'>+	0x06, 0xeb,</div><div class='add'>+	0x07, 0xe0,</div><div class='add'>+	0x08, 0xf0,	/* always toggle FID */</div><div class='add'>+	0x09, 0x40,</div><div class='add'>+	0x0a, 0x80,</div><div class='add'>+	0x0b, 0x40,</div><div class='add'>+	0x0c, 0x40,</div><div class='add'>+	0x0d, 0x00,</div><div class='add'>+	0x0e, 0x03,</div><div class='add'>+	0x0f, 0x2a,</div><div class='add'>+	0x10, 0x0e,</div><div class='add'>+	0x11, 0x00,</div><div class='add'>+	0x12, 0x8d,</div><div class='add'>+	0x13, 0x00,</div><div class='add'>+	0x14, 0x00,</div><div class='add'>+	0x15, 0x11,</div><div class='add'>+	0x16, 0x01,</div><div class='add'>+	0x17, 0xda,</div><div class='add'>+	0x18, 0x40,</div><div class='add'>+	0x19, 0x80,</div><div class='add'>+	0x1a, 0x00,</div><div class='add'>+	0x1b, 0x42,</div><div class='add'>+	0x1c, 0xa9,</div><div class='add'>+	0x30, 0x66,</div><div class='add'>+	0x31, 0x90,</div><div class='add'>+	0x32, 0x01,</div><div class='add'>+	0x34, 0x00,</div><div class='add'>+	0x35, 0x00,</div><div class='add'>+	0x36, 0x20,</div><div class='add'>+	0x38, 0x03,</div><div class='add'>+	0x39, 0x20,</div><div class='add'>+	0x3a, 0x88,</div><div class='add'>+	0x40, 0x00,</div><div class='add'>+	0x41, 0xff,</div><div class='add'>+	0x42, 0xff,</div><div class='add'>+	0x43, 0xff,</div><div class='add'>+	0x44, 0xff,</div><div class='add'>+	0x45, 0xff,</div><div class='add'>+	0x46, 0xff,</div><div class='add'>+	0x47, 0xff,</div><div class='add'>+	0x48, 0xff,</div><div class='add'>+	0x49, 0xff,</div><div class='add'>+	0x4a, 0xff,</div><div class='add'>+	0x4b, 0xff,</div><div class='add'>+	0x4c, 0xff,</div><div class='add'>+	0x4d, 0xff,</div><div class='add'>+	0x4e, 0xff,</div><div class='add'>+	0x4f, 0xff,</div><div class='add'>+	0x50, 0xff,</div><div class='add'>+	0x51, 0xff,</div><div class='add'>+	0x52, 0xff,</div><div class='add'>+	0x53, 0xff,</div><div class='add'>+	0x54, 0xf4 /*0xff*/,</div><div class='add'>+	0x55, 0xff,</div><div class='add'>+	0x56, 0xff,</div><div class='add'>+	0x57, 0xff,</div><div class='add'>+	0x58, 0x40,</div><div class='add'>+	0x59, 0x47,</div><div class='add'>+	0x5a, 0x06 /*0x03*/,</div><div class='add'>+	0x5b, 0x83,</div><div class='add'>+	0x5d, 0x06,</div><div class='add'>+	0x5e, 0x00,</div><div class='add'>+	0x80, 0x30, /* window defined scaler operation, task A and B enabled */</div><div class='add'>+	0x81, 0x03, /* use scaler datapath generated V */</div><div class='add'>+	0x83, 0x00,</div><div class='add'>+	0x84, 0x00,</div><div class='add'>+	0x85, 0x00,</div><div class='add'>+	0x86, 0x45,</div><div class='add'>+	0x87, 0x31,</div><div class='add'>+	0x88, 0xc0,</div><div class='add'>+	0x90, 0x02, /* task A process top field */</div><div class='add'>+	0x91, 0x08,</div><div class='add'>+	0x92, 0x09,</div><div class='add'>+	0x93, 0x80,</div><div class='add'>+	0x94, 0x06,</div><div class='add'>+	0x95, 0x00,</div><div class='add'>+	0x96, 0xc0,</div><div class='add'>+	0x97, 0x02,</div><div class='add'>+	0x98, 0x12,</div><div class='add'>+	0x99, 0x00,</div><div class='add'>+	0x9a, 0xf2,</div><div class='add'>+	0x9b, 0x00,</div><div class='add'>+	0x9c, 0xd0,</div><div class='add'>+	0x9d, 0x02,</div><div class='add'>+	0x9e, 0xf2,</div><div class='add'>+	0x9f, 0x00,</div><div class='add'>+	0xa0, 0x01,</div><div class='add'>+	0xa1, 0x01,</div><div class='add'>+	0xa2, 0x01,</div><div class='add'>+	0xa4, 0x80,</div><div class='add'>+	0xa5, 0x40,</div><div class='add'>+	0xa6, 0x40,</div><div class='add'>+	0xa8, 0x00,</div><div class='add'>+	0xa9, 0x04,</div><div class='add'>+	0xaa, 0x00,</div><div class='add'>+	0xac, 0x00,</div><div class='add'>+	0xad, 0x02,</div><div class='add'>+	0xae, 0x00,</div><div class='add'>+	0xb0, 0x00,</div><div class='add'>+	0xb1, 0x04,</div><div class='add'>+	0xb2, 0x00,</div><div class='add'>+	0xb3, 0x04,</div><div class='add'>+	0xb4, 0x00,</div><div class='add'>+	0xb8, 0x00,</div><div class='add'>+	0xbc, 0x00,</div><div class='add'>+	0xc0, 0x03,	/* task B process bottom field */</div><div class='add'>+	0xc1, 0x08,</div><div class='add'>+	0xc2, 0x09,</div><div class='add'>+	0xc3, 0x80,</div><div class='add'>+	0xc4, 0x06,</div><div class='add'>+	0xc5, 0x00,</div><div class='add'>+	0xc6, 0xc0,</div><div class='add'>+	0xc7, 0x02,</div><div class='add'>+	0xc8, 0x12,</div><div class='add'>+	0xc9, 0x00,</div><div class='add'>+	0xca, 0xf2,</div><div class='add'>+	0xcb, 0x00,</div><div class='add'>+	0xcc, 0xd0,</div><div class='add'>+	0xcd, 0x02,</div><div class='add'>+	0xce, 0xf2,</div><div class='add'>+	0xcf, 0x00,</div><div class='add'>+	0xd0, 0x01,</div><div class='add'>+	0xd1, 0x01,</div><div class='add'>+	0xd2, 0x01,</div><div class='add'>+	0xd4, 0x80,</div><div class='add'>+	0xd5, 0x40,</div><div class='add'>+	0xd6, 0x40,</div><div class='add'>+	0xd8, 0x00,</div><div class='add'>+	0xd9, 0x04,</div><div class='add'>+	0xda, 0x00,</div><div class='add'>+	0xdc, 0x00,</div><div class='add'>+	0xdd, 0x02,</div><div class='add'>+	0xde, 0x00,</div><div class='add'>+	0xe0, 0x00,</div><div class='add'>+	0xe1, 0x04,</div><div class='add'>+	0xe2, 0x00,</div><div class='add'>+	0xe3, 0x04,</div><div class='add'>+	0xe4, 0x00,</div><div class='add'>+	0xe8, 0x00,</div><div class='add'>+	0x88, 0xf0, /* End of original static list */</div><div class='add'>+	0x00, 0x00, /* Terminator (reg 0x00 is read-only) */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int write_reg(struct i2c_client *client, u8 reg, u8 value)</div><div class='add'>+{</div><div class='add'>+	return i2c_smbus_write_byte_data(client, reg, value);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int write_regs(struct i2c_client *client, u8 *regs)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; regs[i] != 0x00; i += 2)</div><div class='add'>+		if (i2c_smbus_write_byte_data(client, regs[i], regs[i + 1]) &lt; 0)</div><div class='add'>+			return -1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wis_saa7115_command(struct i2c_client *client,</div><div class='add'>+				unsigned int cmd, void *arg)</div><div class='add'>+{</div><div class='add'>+	struct wis_saa7115 *dec = i2c_get_clientdata(client);</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case VIDIOC_S_INPUT:</div><div class='add'>+	{</div><div class='add'>+		int *input = arg;</div><div class='add'>+</div><div class='add'>+		i2c_smbus_write_byte_data(client, 0x02, 0xC0 | *input);</div><div class='add'>+		i2c_smbus_write_byte_data(client, 0x09,</div><div class='add'>+				*input &lt; 6 ? 0x40 : 0xC0);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case DECODER_SET_RESOLUTION:</div><div class='add'>+	{</div><div class='add'>+		struct video_decoder_resolution *res = arg;</div><div class='add'>+		/* Course-grained scaler */</div><div class='add'>+		int h_integer_scaler = res-&gt;width &lt; 704 ? 704 / res-&gt;width : 1;</div><div class='add'>+		/* Fine-grained scaler to take care of remainder */</div><div class='add'>+		int h_scaling_increment = (704 / h_integer_scaler) *</div><div class='add'>+					1024 / res-&gt;width;</div><div class='add'>+		/* Fine-grained scaler only */</div><div class='add'>+		int v_scaling_increment = (dec-&gt;norm &amp; V4L2_STD_NTSC ?</div><div class='add'>+				240 : 288) * 1024 / res-&gt;height;</div><div class='add'>+		u8 regs[] = {</div><div class='add'>+			0x88,	0xc0,</div><div class='add'>+			0x9c,	res-&gt;width &amp; 0xff,</div><div class='add'>+			0x9d,	res-&gt;width &gt;&gt; 8,</div><div class='add'>+			0x9e,	res-&gt;height &amp; 0xff,</div><div class='add'>+			0x9f,	res-&gt;height &gt;&gt; 8,</div><div class='add'>+			0xa0,	h_integer_scaler,</div><div class='add'>+			0xa1,	1,</div><div class='add'>+			0xa2,	1,</div><div class='add'>+			0xa8,	h_scaling_increment &amp; 0xff,</div><div class='add'>+			0xa9,	h_scaling_increment &gt;&gt; 8,</div><div class='add'>+			0xac,	(h_scaling_increment / 2) &amp; 0xff,</div><div class='add'>+			0xad,	(h_scaling_increment / 2) &gt;&gt; 8,</div><div class='add'>+			0xb0,	v_scaling_increment &amp; 0xff,</div><div class='add'>+			0xb1,	v_scaling_increment &gt;&gt; 8,</div><div class='add'>+			0xb2,	v_scaling_increment &amp; 0xff,</div><div class='add'>+			0xb3,	v_scaling_increment &gt;&gt; 8,</div><div class='add'>+			0xcc,	res-&gt;width &amp; 0xff,</div><div class='add'>+			0xcd,	res-&gt;width &gt;&gt; 8,</div><div class='add'>+			0xce,	res-&gt;height &amp; 0xff,</div><div class='add'>+			0xcf,	res-&gt;height &gt;&gt; 8,</div><div class='add'>+			0xd0,	h_integer_scaler,</div><div class='add'>+			0xd1,	1,</div><div class='add'>+			0xd2,	1,</div><div class='add'>+			0xd8,	h_scaling_increment &amp; 0xff,</div><div class='add'>+			0xd9,	h_scaling_increment &gt;&gt; 8,</div><div class='add'>+			0xdc,	(h_scaling_increment / 2) &amp; 0xff,</div><div class='add'>+			0xdd,	(h_scaling_increment / 2) &gt;&gt; 8,</div><div class='add'>+			0xe0,	v_scaling_increment &amp; 0xff,</div><div class='add'>+			0xe1,	v_scaling_increment &gt;&gt; 8,</div><div class='add'>+			0xe2,	v_scaling_increment &amp; 0xff,</div><div class='add'>+			0xe3,	v_scaling_increment &gt;&gt; 8,</div><div class='add'>+			0x88,	0xf0,</div><div class='add'>+			0,	0,</div><div class='add'>+		};</div><div class='add'>+		write_regs(client, regs);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_S_STD:</div><div class='add'>+	{</div><div class='add'>+		v4l2_std_id *input = arg;</div><div class='add'>+		u8 regs[] = {</div><div class='add'>+			0x88,	0xc0,</div><div class='add'>+			0x98,	*input &amp; V4L2_STD_NTSC ? 0x12 : 0x16,</div><div class='add'>+			0x9a,	*input &amp; V4L2_STD_NTSC ? 0xf2 : 0x20,</div><div class='add'>+			0x9b,	*input &amp; V4L2_STD_NTSC ? 0x00 : 0x01,</div><div class='add'>+			0xc8,	*input &amp; V4L2_STD_NTSC ? 0x12 : 0x16,</div><div class='add'>+			0xca,	*input &amp; V4L2_STD_NTSC ? 0xf2 : 0x20,</div><div class='add'>+			0xcb,	*input &amp; V4L2_STD_NTSC ? 0x00 : 0x01,</div><div class='add'>+			0x88,	0xf0,</div><div class='add'>+			0x30,	*input &amp; V4L2_STD_NTSC ? 0x66 : 0x00,</div><div class='add'>+			0x31,	*input &amp; V4L2_STD_NTSC ? 0x90 : 0xe0,</div><div class='add'>+			0,	0,</div><div class='add'>+		};</div><div class='add'>+		write_regs(client, regs);</div><div class='add'>+		dec-&gt;norm = *input;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_QUERYCTRL:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_queryctrl *ctrl = arg;</div><div class='add'>+</div><div class='add'>+		switch (ctrl-&gt;id) {</div><div class='add'>+		case V4L2_CID_BRIGHTNESS:</div><div class='add'>+			ctrl-&gt;type = V4L2_CTRL_TYPE_INTEGER;</div><div class='add'>+			strncpy(ctrl-&gt;name, "Brightness", sizeof(ctrl-&gt;name));</div><div class='add'>+			ctrl-&gt;minimum = 0;</div><div class='add'>+			ctrl-&gt;maximum = 255;</div><div class='add'>+			ctrl-&gt;step = 1;</div><div class='add'>+			ctrl-&gt;default_value = 128;</div><div class='add'>+			ctrl-&gt;flags = 0;</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_CID_CONTRAST:</div><div class='add'>+			ctrl-&gt;type = V4L2_CTRL_TYPE_INTEGER;</div><div class='add'>+			strncpy(ctrl-&gt;name, "Contrast", sizeof(ctrl-&gt;name));</div><div class='add'>+			ctrl-&gt;minimum = 0;</div><div class='add'>+			ctrl-&gt;maximum = 127;</div><div class='add'>+			ctrl-&gt;step = 1;</div><div class='add'>+			ctrl-&gt;default_value = 64;</div><div class='add'>+			ctrl-&gt;flags = 0;</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_CID_SATURATION:</div><div class='add'>+			ctrl-&gt;type = V4L2_CTRL_TYPE_INTEGER;</div><div class='add'>+			strncpy(ctrl-&gt;name, "Saturation", sizeof(ctrl-&gt;name));</div><div class='add'>+			ctrl-&gt;minimum = 0;</div><div class='add'>+			ctrl-&gt;maximum = 127;</div><div class='add'>+			ctrl-&gt;step = 1;</div><div class='add'>+			ctrl-&gt;default_value = 64;</div><div class='add'>+			ctrl-&gt;flags = 0;</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_CID_HUE:</div><div class='add'>+			ctrl-&gt;type = V4L2_CTRL_TYPE_INTEGER;</div><div class='add'>+			strncpy(ctrl-&gt;name, "Hue", sizeof(ctrl-&gt;name));</div><div class='add'>+			ctrl-&gt;minimum = -128;</div><div class='add'>+			ctrl-&gt;maximum = 127;</div><div class='add'>+			ctrl-&gt;step = 1;</div><div class='add'>+			ctrl-&gt;default_value = 0;</div><div class='add'>+			ctrl-&gt;flags = 0;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_S_CTRL:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_control *ctrl = arg;</div><div class='add'>+</div><div class='add'>+		switch (ctrl-&gt;id) {</div><div class='add'>+		case V4L2_CID_BRIGHTNESS:</div><div class='add'>+			if (ctrl-&gt;value &gt; 255)</div><div class='add'>+				dec-&gt;brightness = 255;</div><div class='add'>+			else if (ctrl-&gt;value &lt; 0)</div><div class='add'>+				dec-&gt;brightness = 0;</div><div class='add'>+			else</div><div class='add'>+				dec-&gt;brightness = ctrl-&gt;value;</div><div class='add'>+			write_reg(client, 0x0a, dec-&gt;brightness);</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_CID_CONTRAST:</div><div class='add'>+			if (ctrl-&gt;value &gt; 127)</div><div class='add'>+				dec-&gt;contrast = 127;</div><div class='add'>+			else if (ctrl-&gt;value &lt; 0)</div><div class='add'>+				dec-&gt;contrast = 0;</div><div class='add'>+			else</div><div class='add'>+				dec-&gt;contrast = ctrl-&gt;value;</div><div class='add'>+			write_reg(client, 0x0b, dec-&gt;contrast);</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_CID_SATURATION:</div><div class='add'>+			if (ctrl-&gt;value &gt; 127)</div><div class='add'>+				dec-&gt;saturation = 127;</div><div class='add'>+			else if (ctrl-&gt;value &lt; 0)</div><div class='add'>+				dec-&gt;saturation = 0;</div><div class='add'>+			else</div><div class='add'>+				dec-&gt;saturation = ctrl-&gt;value;</div><div class='add'>+			write_reg(client, 0x0c, dec-&gt;saturation);</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_CID_HUE:</div><div class='add'>+			if (ctrl-&gt;value &gt; 127)</div><div class='add'>+				dec-&gt;hue = 127;</div><div class='add'>+			else if (ctrl-&gt;value &lt; -128)</div><div class='add'>+				dec-&gt;hue = -128;</div><div class='add'>+			else</div><div class='add'>+				dec-&gt;hue = ctrl-&gt;value;</div><div class='add'>+			write_reg(client, 0x0d, dec-&gt;hue);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_G_CTRL:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_control *ctrl = arg;</div><div class='add'>+</div><div class='add'>+		switch (ctrl-&gt;id) {</div><div class='add'>+		case V4L2_CID_BRIGHTNESS:</div><div class='add'>+			ctrl-&gt;value = dec-&gt;brightness;</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_CID_CONTRAST:</div><div class='add'>+			ctrl-&gt;value = dec-&gt;contrast;</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_CID_SATURATION:</div><div class='add'>+			ctrl-&gt;value = dec-&gt;saturation;</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_CID_HUE:</div><div class='add'>+			ctrl-&gt;value = dec-&gt;hue;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct i2c_driver wis_saa7115_driver;</div><div class='add'>+</div><div class='add'>+static struct i2c_client wis_saa7115_client_templ = {</div><div class='add'>+	.name		= "SAA7115 (WIS)",</div><div class='add'>+	.driver		= &amp;wis_saa7115_driver,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int wis_saa7115_detect(struct i2c_adapter *adapter, int addr, int kind)</div><div class='add'>+{</div><div class='add'>+	struct i2c_client *client;</div><div class='add'>+	struct wis_saa7115 *dec;</div><div class='add'>+</div><div class='add'>+	if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL);</div><div class='add'>+	if (client == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	memcpy(client, &amp;wis_saa7115_client_templ,</div><div class='add'>+			sizeof(wis_saa7115_client_templ));</div><div class='add'>+	client-&gt;adapter = adapter;</div><div class='add'>+	client-&gt;addr = addr;</div><div class='add'>+</div><div class='add'>+	dec = kmalloc(sizeof(struct wis_saa7115), GFP_KERNEL);</div><div class='add'>+	if (dec == NULL) {</div><div class='add'>+		kfree(client);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	dec-&gt;norm = V4L2_STD_NTSC;</div><div class='add'>+	dec-&gt;brightness = 128;</div><div class='add'>+	dec-&gt;contrast = 64;</div><div class='add'>+	dec-&gt;saturation = 64;</div><div class='add'>+	dec-&gt;hue = 0;</div><div class='add'>+	i2c_set_clientdata(client, dec);</div><div class='add'>+</div><div class='add'>+	printk(KERN_DEBUG</div><div class='add'>+		"wis-saa7115: initializing SAA7115 at address %d on %s\n",</div><div class='add'>+		addr, adapter-&gt;name);</div><div class='add'>+</div><div class='add'>+	if (write_regs(client, initial_registers) &lt; 0) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+			"wis-saa7115: error initializing SAA7115\n");</div><div class='add'>+		kfree(client);</div><div class='add'>+		kfree(dec);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	i2c_attach_client(client);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wis_saa7115_detach(struct i2c_client *client)</div><div class='add'>+{</div><div class='add'>+	struct wis_saa7115 *dec = i2c_get_clientdata(client);</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	r = i2c_detach_client(client);</div><div class='add'>+	if (r &lt; 0)</div><div class='add'>+		return r;</div><div class='add'>+</div><div class='add'>+	kfree(client);</div><div class='add'>+	kfree(dec);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct i2c_driver wis_saa7115_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name	= "WIS SAA7115 I2C driver",</div><div class='add'>+	},</div><div class='add'>+	.id		= I2C_DRIVERID_WIS_SAA7115,</div><div class='add'>+	.detach_client	= wis_saa7115_detach,</div><div class='add'>+	.command	= wis_saa7115_command,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init wis_saa7115_init(void)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	r = i2c_add_driver(&amp;wis_saa7115_driver);</div><div class='add'>+	if (r &lt; 0)</div><div class='add'>+		return r;</div><div class='add'>+	return wis_i2c_add_driver(wis_saa7115_driver.id, wis_saa7115_detect);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit wis_saa7115_cleanup(void)</div><div class='add'>+{</div><div class='add'>+	wis_i2c_del_driver(wis_saa7115_detect);</div><div class='add'>+	i2c_del_driver(&amp;wis_saa7115_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(wis_saa7115_init);</div><div class='add'>+module_exit(wis_saa7115_cleanup);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/staging/go7007/wis-sony-tuner.c b/drivers/staging/go7007/wis-sony-tuner.c<br/>new file mode 100644<br/>index 000000000000..5997fb479459<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/go7007/wis-sony-tuner.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/go7007/wis-sony-tuner.c</a></div><div class='hunk'>@@ -0,0 +1,742 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2005-2006 Micronas USA Inc.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License (Version 2) as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software Foundation,</div><div class='add'>+ * Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/version.h&gt;</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/videodev2.h&gt;</div><div class='add'>+#include &lt;media/tuner.h&gt;</div><div class='add'>+#include &lt;media/v4l2-common.h&gt;</div><div class='add'>+#include &lt;media/v4l2-ioctl.h&gt;</div><div class='add'>+</div><div class='add'>+#include "wis-i2c.h"</div><div class='add'>+</div><div class='add'>+/* #define MPX_DEBUG */</div><div class='add'>+</div><div class='add'>+/* AS(IF/MPX) pin:      LOW      HIGH/OPEN</div><div class='add'>+ * IF/MPX address:   0x42/0x40   0x43/0x44</div><div class='add'>+ */</div><div class='add'>+#define IF_I2C_ADDR	0x43</div><div class='add'>+#define MPX_I2C_ADDR	0x44</div><div class='add'>+</div><div class='add'>+static v4l2_std_id force_band;</div><div class='add'>+static char force_band_str[] = "-";</div><div class='add'>+module_param_string(force_band, force_band_str, sizeof(force_band_str), 0644);</div><div class='add'>+static int force_mpx_mode = -1;</div><div class='add'>+module_param(force_mpx_mode, int, 0644);</div><div class='add'>+</div><div class='add'>+/* Store tuner info in the same format as tuner.c, so maybe we can put the</div><div class='add'>+ * Sony tuner support in there. */</div><div class='add'>+struct sony_tunertype {</div><div class='add'>+	char *name;</div><div class='add'>+	unsigned char Vendor; /* unused here */</div><div class='add'>+	unsigned char Type; /* unused here */</div><div class='add'>+</div><div class='add'>+	unsigned short thresh1; /*  band switch VHF_LO &lt;=&gt; VHF_HI */</div><div class='add'>+	unsigned short thresh2; /*  band switch VHF_HI &lt;=&gt; UHF */</div><div class='add'>+	unsigned char VHF_L;</div><div class='add'>+	unsigned char VHF_H;</div><div class='add'>+	unsigned char UHF;</div><div class='add'>+	unsigned char config;</div><div class='add'>+	unsigned short IFPCoff;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* This array is indexed by (tuner_type - 200) */</div><div class='add'>+static struct sony_tunertype sony_tuners[] = {</div><div class='add'>+	{ "Sony PAL+SECAM (BTF-PG472Z)", 0, 0,</div><div class='add'>+	  16*144.25, 16*427.25, 0x01, 0x02, 0x04, 0xc6, 623},</div><div class='add'>+	{ "Sony NTSC_JP (BTF-PK467Z)", 0, 0,</div><div class='add'>+	  16*220.25, 16*467.25, 0x01, 0x02, 0x04, 0xc6, 940},</div><div class='add'>+	{ "Sony NTSC (BTF-PB463Z)", 0, 0,</div><div class='add'>+	  16*130.25, 16*364.25, 0x01, 0x02, 0x04, 0xc6, 732},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct wis_sony_tuner {</div><div class='add'>+	int type;</div><div class='add'>+	v4l2_std_id std;</div><div class='add'>+	unsigned int freq;</div><div class='add'>+	int mpxmode;</div><div class='add'>+	u32 audmode;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Basically the same as default_set_tv_freq() in tuner.c */</div><div class='add'>+static int set_freq(struct i2c_client *client, int freq)</div><div class='add'>+{</div><div class='add'>+	struct wis_sony_tuner *t = i2c_get_clientdata(client);</div><div class='add'>+	char *band_name;</div><div class='add'>+	int n;</div><div class='add'>+	int band_select;</div><div class='add'>+	struct sony_tunertype *tun;</div><div class='add'>+	u8 buffer[4];</div><div class='add'>+</div><div class='add'>+	tun = &amp;sony_tuners[t-&gt;type - 200];</div><div class='add'>+	if (freq &lt; tun-&gt;thresh1) {</div><div class='add'>+		band_name = "VHF_L";</div><div class='add'>+		band_select = tun-&gt;VHF_L;</div><div class='add'>+	} else if (freq &lt; tun-&gt;thresh2) {</div><div class='add'>+		band_name = "VHF_H";</div><div class='add'>+		band_select = tun-&gt;VHF_H;</div><div class='add'>+	} else {</div><div class='add'>+		band_name = "UHF";</div><div class='add'>+		band_select = tun-&gt;UHF;</div><div class='add'>+	}</div><div class='add'>+	printk(KERN_DEBUG "wis-sony-tuner: tuning to frequency %d.%04d (%s)\n",</div><div class='add'>+			freq / 16, (freq % 16) * 625, band_name);</div><div class='add'>+	n = freq + tun-&gt;IFPCoff;</div><div class='add'>+</div><div class='add'>+	buffer[0] = n &gt;&gt; 8;</div><div class='add'>+	buffer[1] = n &amp; 0xff;</div><div class='add'>+	buffer[2] = tun-&gt;config;</div><div class='add'>+	buffer[3] = band_select;</div><div class='add'>+	i2c_master_send(client, buffer, 4);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mpx_write(struct i2c_client *client, int dev, int addr, int val)</div><div class='add'>+{</div><div class='add'>+	u8 buffer[5];</div><div class='add'>+	struct i2c_msg msg;</div><div class='add'>+</div><div class='add'>+	buffer[0] = dev;</div><div class='add'>+	buffer[1] = addr &gt;&gt; 8;</div><div class='add'>+	buffer[2] = addr &amp; 0xff;</div><div class='add'>+	buffer[3] = val &gt;&gt; 8;</div><div class='add'>+	buffer[4] = val &amp; 0xff;</div><div class='add'>+	msg.addr = MPX_I2C_ADDR;</div><div class='add'>+	msg.flags = 0;</div><div class='add'>+	msg.len = 5;</div><div class='add'>+	msg.buf = buffer;</div><div class='add'>+	i2c_transfer(client-&gt;adapter, &amp;msg, 1);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * MPX register values for the BTF-PG472Z:</div><div class='add'>+ *</div><div class='add'>+ *                                 FM_     NICAM_  SCART_</div><div class='add'>+ *          MODUS  SOURCE    ACB   PRESCAL PRESCAL PRESCAL SYSTEM  VOLUME</div><div class='add'>+ *         10/0030 12/0008 12/0013 12/000E 12/0010 12/0000 10/0020 12/0000</div><div class='add'>+ *         ---------------------------------------------------------------</div><div class='add'>+ * Auto     1003    0020    0100    2603    5000    XXXX    0001    7500</div><div class='add'>+ *</div><div class='add'>+ * B/G</div><div class='add'>+ *  Mono    1003    0020    0100    2603    5000    XXXX    0003    7500</div><div class='add'>+ *  A2      1003    0020    0100    2601    5000    XXXX    0003    7500</div><div class='add'>+ *  NICAM   1003    0120    0100    2603    5000    XXXX    0008    7500</div><div class='add'>+ *</div><div class='add'>+ * I</div><div class='add'>+ *  Mono    1003    0020    0100    2603    7900    XXXX    000A    7500</div><div class='add'>+ *  NICAM   1003    0120    0100    2603    7900    XXXX    000A    7500</div><div class='add'>+ *</div><div class='add'>+ * D/K</div><div class='add'>+ *  Mono    1003    0020    0100    2603    5000    XXXX    0004    7500</div><div class='add'>+ *  A2-1    1003    0020    0100    2601    5000    XXXX    0004    7500</div><div class='add'>+ *  A2-2    1003    0020    0100    2601    5000    XXXX    0005    7500</div><div class='add'>+ *  A2-3    1003    0020    0100    2601    5000    XXXX    0007    7500</div><div class='add'>+ *  NICAM   1003    0120    0100    2603    5000    XXXX    000B    7500</div><div class='add'>+ *</div><div class='add'>+ * L/L'</div><div class='add'>+ *  Mono    0003    0200    0100    7C03    5000    2200    0009    7500</div><div class='add'>+ *  NICAM   0003    0120    0100    7C03    5000    XXXX    0009    7500</div><div class='add'>+ *</div><div class='add'>+ * M</div><div class='add'>+ *  Mono    1003    0200    0100    2B03    5000    2B00    0002    7500</div><div class='add'>+ *</div><div class='add'>+ * For Asia, replace the 0x26XX in FM_PRESCALE with 0x14XX.</div><div class='add'>+ *</div><div class='add'>+ * Bilingual selection in A2/NICAM:</div><div class='add'>+ *</div><div class='add'>+ *         High byte of SOURCE     Left chan   Right chan</div><div class='add'>+ *                 0x01              MAIN         SUB</div><div class='add'>+ *                 0x03              MAIN         MAIN</div><div class='add'>+ *                 0x04              SUB          SUB</div><div class='add'>+ *</div><div class='add'>+ * Force mono in NICAM by setting the high byte of SOURCE to 0x02 (L/L') or</div><div class='add'>+ * 0x00 (all other bands).  Force mono in A2 with FMONO_A2:</div><div class='add'>+ *</div><div class='add'>+ *                      FMONO_A2</div><div class='add'>+ *                      10/0022</div><div class='add'>+ *                      --------</div><div class='add'>+ *     Forced mono ON     07F0</div><div class='add'>+ *     Forced mono OFF    0190</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static struct {</div><div class='add'>+	enum { AUD_MONO, AUD_A2, AUD_NICAM, AUD_NICAM_L } audio_mode;</div><div class='add'>+	u16 modus;</div><div class='add'>+	u16 source;</div><div class='add'>+	u16 acb;</div><div class='add'>+	u16 fm_prescale;</div><div class='add'>+	u16 nicam_prescale;</div><div class='add'>+	u16 scart_prescale;</div><div class='add'>+	u16 system;</div><div class='add'>+	u16 volume;</div><div class='add'>+} mpx_audio_modes[] = {</div><div class='add'>+	/* Auto */	{ AUD_MONO,	0x1003, 0x0020, 0x0100, 0x2603,</div><div class='add'>+					0x5000, 0x0000, 0x0001, 0x7500 },</div><div class='add'>+	/* B/G Mono */	{ AUD_MONO,	0x1003, 0x0020, 0x0100, 0x2603,</div><div class='add'>+					0x5000, 0x0000, 0x0003, 0x7500 },</div><div class='add'>+	/* B/G A2 */	{ AUD_A2,	0x1003, 0x0020, 0x0100, 0x2601,</div><div class='add'>+					0x5000, 0x0000, 0x0003, 0x7500 },</div><div class='add'>+	/* B/G NICAM */ { AUD_NICAM,	0x1003, 0x0120, 0x0100, 0x2603,</div><div class='add'>+					0x5000, 0x0000, 0x0008, 0x7500 },</div><div class='add'>+	/* I Mono */	{ AUD_MONO,	0x1003, 0x0020, 0x0100, 0x2603,</div><div class='add'>+					0x7900, 0x0000, 0x000A, 0x7500 },</div><div class='add'>+	/* I NICAM */	{ AUD_NICAM,	0x1003, 0x0120, 0x0100, 0x2603,</div><div class='add'>+					0x7900, 0x0000, 0x000A, 0x7500 },</div><div class='add'>+	/* D/K Mono */	{ AUD_MONO,	0x1003, 0x0020, 0x0100, 0x2603,</div><div class='add'>+					0x5000, 0x0000, 0x0004, 0x7500 },</div><div class='add'>+	/* D/K A2-1 */	{ AUD_A2,	0x1003, 0x0020, 0x0100, 0x2601,</div><div class='add'>+					0x5000, 0x0000, 0x0004, 0x7500 },</div><div class='add'>+	/* D/K A2-2 */	{ AUD_A2,	0x1003, 0x0020, 0x0100, 0x2601,</div><div class='add'>+					0x5000, 0x0000, 0x0005, 0x7500 },</div><div class='add'>+	/* D/K A2-3 */	{ AUD_A2,	0x1003, 0x0020, 0x0100, 0x2601,</div><div class='add'>+					0x5000, 0x0000, 0x0007, 0x7500 },</div><div class='add'>+	/* D/K NICAM */	{ AUD_NICAM,	0x1003, 0x0120, 0x0100, 0x2603,</div><div class='add'>+					0x5000, 0x0000, 0x000B, 0x7500 },</div><div class='add'>+	/* L/L' Mono */	{ AUD_MONO,	0x0003, 0x0200, 0x0100, 0x7C03,</div><div class='add'>+					0x5000, 0x2200, 0x0009, 0x7500 },</div><div class='add'>+	/* L/L' NICAM */{ AUD_NICAM_L,	0x0003, 0x0120, 0x0100, 0x7C03,</div><div class='add'>+					0x5000, 0x0000, 0x0009, 0x7500 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define MPX_NUM_MODES	ARRAY_SIZE(mpx_audio_modes)</div><div class='add'>+</div><div class='add'>+static int mpx_setup(struct i2c_client *client)</div><div class='add'>+{</div><div class='add'>+	struct wis_sony_tuner *t = i2c_get_clientdata(client);</div><div class='add'>+	u16 source = 0;</div><div class='add'>+	u8 buffer[3];</div><div class='add'>+	struct i2c_msg msg;</div><div class='add'>+</div><div class='add'>+	/* reset MPX */</div><div class='add'>+	buffer[0] = 0x00;</div><div class='add'>+	buffer[1] = 0x80;</div><div class='add'>+	buffer[2] = 0x00;</div><div class='add'>+	msg.addr = MPX_I2C_ADDR;</div><div class='add'>+	msg.flags = 0;</div><div class='add'>+	msg.len = 3;</div><div class='add'>+	msg.buf = buffer;</div><div class='add'>+	i2c_transfer(client-&gt;adapter, &amp;msg, 1);</div><div class='add'>+	buffer[1] = 0x00;</div><div class='add'>+	i2c_transfer(client-&gt;adapter, &amp;msg, 1);</div><div class='add'>+</div><div class='add'>+	if (mpx_audio_modes[t-&gt;mpxmode].audio_mode != AUD_MONO) {</div><div class='add'>+		switch (t-&gt;audmode) {</div><div class='add'>+		case V4L2_TUNER_MODE_MONO:</div><div class='add'>+			switch (mpx_audio_modes[t-&gt;mpxmode].audio_mode) {</div><div class='add'>+			case AUD_A2:</div><div class='add'>+				source = mpx_audio_modes[t-&gt;mpxmode].source;</div><div class='add'>+				break;</div><div class='add'>+			case AUD_NICAM:</div><div class='add'>+				source = 0x0000;</div><div class='add'>+				break;</div><div class='add'>+			case AUD_NICAM_L:</div><div class='add'>+				source = 0x0200;</div><div class='add'>+				break;</div><div class='add'>+			default:</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_TUNER_MODE_STEREO:</div><div class='add'>+			source = mpx_audio_modes[t-&gt;mpxmode].source;</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_TUNER_MODE_LANG1:</div><div class='add'>+			source = 0x0300;</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_TUNER_MODE_LANG2:</div><div class='add'>+			source = 0x0400;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		source |= mpx_audio_modes[t-&gt;mpxmode].source &amp; 0x00ff;</div><div class='add'>+	} else</div><div class='add'>+		source = mpx_audio_modes[t-&gt;mpxmode].source;</div><div class='add'>+</div><div class='add'>+	mpx_write(client, 0x10, 0x0030, mpx_audio_modes[t-&gt;mpxmode].modus);</div><div class='add'>+	mpx_write(client, 0x12, 0x0008, source);</div><div class='add'>+	mpx_write(client, 0x12, 0x0013, mpx_audio_modes[t-&gt;mpxmode].acb);</div><div class='add'>+	mpx_write(client, 0x12, 0x000e,</div><div class='add'>+			mpx_audio_modes[t-&gt;mpxmode].fm_prescale);</div><div class='add'>+	mpx_write(client, 0x12, 0x0010,</div><div class='add'>+			mpx_audio_modes[t-&gt;mpxmode].nicam_prescale);</div><div class='add'>+	mpx_write(client, 0x12, 0x000d,</div><div class='add'>+			mpx_audio_modes[t-&gt;mpxmode].scart_prescale);</div><div class='add'>+	mpx_write(client, 0x10, 0x0020, mpx_audio_modes[t-&gt;mpxmode].system);</div><div class='add'>+	mpx_write(client, 0x12, 0x0000, mpx_audio_modes[t-&gt;mpxmode].volume);</div><div class='add'>+	if (mpx_audio_modes[t-&gt;mpxmode].audio_mode == AUD_A2)</div><div class='add'>+		mpx_write(client, 0x10, 0x0022,</div><div class='add'>+			t-&gt;audmode == V4L2_TUNER_MODE_MONO ?  0x07f0 : 0x0190);</div><div class='add'>+</div><div class='add'>+#ifdef MPX_DEBUG</div><div class='add'>+	{</div><div class='add'>+		u8 buf1[3], buf2[2];</div><div class='add'>+		struct i2c_msg msgs[2];</div><div class='add'>+</div><div class='add'>+		printk(KERN_DEBUG "wis-sony-tuner: MPX registers: %04x %04x "</div><div class='add'>+				"%04x %04x %04x %04x %04x %04x\n",</div><div class='add'>+				mpx_audio_modes[t-&gt;mpxmode].modus,</div><div class='add'>+				source,</div><div class='add'>+				mpx_audio_modes[t-&gt;mpxmode].acb,</div><div class='add'>+				mpx_audio_modes[t-&gt;mpxmode].fm_prescale,</div><div class='add'>+				mpx_audio_modes[t-&gt;mpxmode].nicam_prescale,</div><div class='add'>+				mpx_audio_modes[t-&gt;mpxmode].scart_prescale,</div><div class='add'>+				mpx_audio_modes[t-&gt;mpxmode].system,</div><div class='add'>+				mpx_audio_modes[t-&gt;mpxmode].volume);</div><div class='add'>+		buf1[0] = 0x11;</div><div class='add'>+		buf1[1] = 0x00;</div><div class='add'>+		buf1[2] = 0x7e;</div><div class='add'>+		msgs[0].addr = MPX_I2C_ADDR;</div><div class='add'>+		msgs[0].flags = 0;</div><div class='add'>+		msgs[0].len = 3;</div><div class='add'>+		msgs[0].buf = buf1;</div><div class='add'>+		msgs[1].addr = MPX_I2C_ADDR;</div><div class='add'>+		msgs[1].flags = I2C_M_RD;</div><div class='add'>+		msgs[1].len = 2;</div><div class='add'>+		msgs[1].buf = buf2;</div><div class='add'>+		i2c_transfer(client-&gt;adapter, msgs, 2);</div><div class='add'>+		printk(KERN_DEBUG "wis-sony-tuner: MPX system: %02x%02x\n",</div><div class='add'>+				buf2[0], buf2[1]);</div><div class='add'>+		buf1[0] = 0x11;</div><div class='add'>+		buf1[1] = 0x02;</div><div class='add'>+		buf1[2] = 0x00;</div><div class='add'>+		i2c_transfer(client-&gt;adapter, msgs, 2);</div><div class='add'>+		printk(KERN_DEBUG "wis-sony-tuner: MPX status: %02x%02x\n",</div><div class='add'>+				buf2[0], buf2[1]);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * IF configuration values for the BTF-PG472Z:</div><div class='add'>+ *</div><div class='add'>+ *	B/G: 0x94 0x70 0x49</div><div class='add'>+ *	I:   0x14 0x70 0x4a</div><div class='add'>+ *	D/K: 0x14 0x70 0x4b</div><div class='add'>+ *	L:   0x04 0x70 0x4b</div><div class='add'>+ *	L':  0x44 0x70 0x53</div><div class='add'>+ *	M:   0x50 0x30 0x4c</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static int set_if(struct i2c_client *client)</div><div class='add'>+{</div><div class='add'>+	struct wis_sony_tuner *t = i2c_get_clientdata(client);</div><div class='add'>+	u8 buffer[4];</div><div class='add'>+	struct i2c_msg msg;</div><div class='add'>+	int default_mpx_mode = 0;</div><div class='add'>+</div><div class='add'>+	/* configure IF */</div><div class='add'>+	buffer[0] = 0;</div><div class='add'>+	if (t-&gt;std &amp; V4L2_STD_PAL_BG) {</div><div class='add'>+		buffer[1] = 0x94;</div><div class='add'>+		buffer[2] = 0x70;</div><div class='add'>+		buffer[3] = 0x49;</div><div class='add'>+		default_mpx_mode = 1;</div><div class='add'>+	} else if (t-&gt;std &amp; V4L2_STD_PAL_I) {</div><div class='add'>+		buffer[1] = 0x14;</div><div class='add'>+		buffer[2] = 0x70;</div><div class='add'>+		buffer[3] = 0x4a;</div><div class='add'>+		default_mpx_mode = 4;</div><div class='add'>+	} else if (t-&gt;std &amp; V4L2_STD_PAL_DK) {</div><div class='add'>+		buffer[1] = 0x14;</div><div class='add'>+		buffer[2] = 0x70;</div><div class='add'>+		buffer[3] = 0x4b;</div><div class='add'>+		default_mpx_mode = 6;</div><div class='add'>+	} else if (t-&gt;std &amp; V4L2_STD_SECAM_L) {</div><div class='add'>+		buffer[1] = 0x04;</div><div class='add'>+		buffer[2] = 0x70;</div><div class='add'>+		buffer[3] = 0x4b;</div><div class='add'>+		default_mpx_mode = 11;</div><div class='add'>+	}</div><div class='add'>+	msg.addr = IF_I2C_ADDR;</div><div class='add'>+	msg.flags = 0;</div><div class='add'>+	msg.len = 4;</div><div class='add'>+	msg.buf = buffer;</div><div class='add'>+	i2c_transfer(client-&gt;adapter, &amp;msg, 1);</div><div class='add'>+</div><div class='add'>+	/* Select MPX mode if not forced by the user */</div><div class='add'>+	if (force_mpx_mode &gt;= 0 || force_mpx_mode &lt; MPX_NUM_MODES)</div><div class='add'>+		t-&gt;mpxmode = force_mpx_mode;</div><div class='add'>+	else</div><div class='add'>+		t-&gt;mpxmode = default_mpx_mode;</div><div class='add'>+	printk(KERN_DEBUG "wis-sony-tuner: setting MPX to mode %d\n",</div><div class='add'>+			t-&gt;mpxmode);</div><div class='add'>+	mpx_setup(client);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)</div><div class='add'>+{</div><div class='add'>+	struct wis_sony_tuner *t = i2c_get_clientdata(client);</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+#ifdef TUNER_SET_TYPE_ADDR</div><div class='add'>+	case TUNER_SET_TYPE_ADDR:</div><div class='add'>+	{</div><div class='add'>+		struct tuner_setup *tun_setup = arg;</div><div class='add'>+		int *type = &amp;tun_setup-&gt;type;</div><div class='add'>+#else</div><div class='add'>+	case TUNER_SET_TYPE:</div><div class='add'>+	{</div><div class='add'>+		int *type = arg;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+		if (t-&gt;type &gt;= 0) {</div><div class='add'>+			if (t-&gt;type != *type)</div><div class='add'>+				printk(KERN_ERR "wis-sony-tuner: type already "</div><div class='add'>+					"set to %d, ignoring request for %d\n",</div><div class='add'>+					t-&gt;type, *type);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		t-&gt;type = *type;</div><div class='add'>+		switch (t-&gt;type) {</div><div class='add'>+		case TUNER_SONY_BTF_PG472Z:</div><div class='add'>+			switch (force_band_str[0]) {</div><div class='add'>+			case 'b':</div><div class='add'>+			case 'B':</div><div class='add'>+			case 'g':</div><div class='add'>+			case 'G':</div><div class='add'>+				printk(KERN_INFO "wis-sony-tuner: forcing "</div><div class='add'>+						"tuner to PAL-B/G bands\n");</div><div class='add'>+				force_band = V4L2_STD_PAL_BG;</div><div class='add'>+				break;</div><div class='add'>+			case 'i':</div><div class='add'>+			case 'I':</div><div class='add'>+				printk(KERN_INFO "wis-sony-tuner: forcing "</div><div class='add'>+						"tuner to PAL-I band\n");</div><div class='add'>+				force_band = V4L2_STD_PAL_I;</div><div class='add'>+				break;</div><div class='add'>+			case 'd':</div><div class='add'>+			case 'D':</div><div class='add'>+			case 'k':</div><div class='add'>+			case 'K':</div><div class='add'>+				printk(KERN_INFO "wis-sony-tuner: forcing "</div><div class='add'>+						"tuner to PAL-D/K bands\n");</div><div class='add'>+				force_band = V4L2_STD_PAL_I;</div><div class='add'>+				break;</div><div class='add'>+			case 'l':</div><div class='add'>+			case 'L':</div><div class='add'>+				printk(KERN_INFO "wis-sony-tuner: forcing "</div><div class='add'>+						"tuner to SECAM-L band\n");</div><div class='add'>+				force_band = V4L2_STD_SECAM_L;</div><div class='add'>+				break;</div><div class='add'>+			default:</div><div class='add'>+				force_band = 0;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			if (force_band)</div><div class='add'>+				t-&gt;std = force_band;</div><div class='add'>+			else</div><div class='add'>+				t-&gt;std = V4L2_STD_PAL_BG;</div><div class='add'>+			set_if(client);</div><div class='add'>+			break;</div><div class='add'>+		case TUNER_SONY_BTF_PK467Z:</div><div class='add'>+			t-&gt;std = V4L2_STD_NTSC_M_JP;</div><div class='add'>+			break;</div><div class='add'>+		case TUNER_SONY_BTF_PB463Z:</div><div class='add'>+			t-&gt;std = V4L2_STD_NTSC_M;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			printk(KERN_ERR "wis-sony-tuner: tuner type %d is not "</div><div class='add'>+					"supported by this module\n", *type);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		if (type &gt;= 0)</div><div class='add'>+			printk(KERN_INFO</div><div class='add'>+				"wis-sony-tuner: type set to %d (%s)\n",</div><div class='add'>+				t-&gt;type, sony_tuners[t-&gt;type - 200].name);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_G_FREQUENCY:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_frequency *f = arg;</div><div class='add'>+</div><div class='add'>+		f-&gt;frequency = t-&gt;freq;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_S_FREQUENCY:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_frequency *f = arg;</div><div class='add'>+</div><div class='add'>+		t-&gt;freq = f-&gt;frequency;</div><div class='add'>+		set_freq(client, t-&gt;freq);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_ENUMSTD:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_standard *std = arg;</div><div class='add'>+</div><div class='add'>+		switch (t-&gt;type) {</div><div class='add'>+		case TUNER_SONY_BTF_PG472Z:</div><div class='add'>+			switch (std-&gt;index) {</div><div class='add'>+			case 0:</div><div class='add'>+				v4l2_video_std_construct(std,</div><div class='add'>+						V4L2_STD_PAL_BG, "PAL-B/G");</div><div class='add'>+				break;</div><div class='add'>+			case 1:</div><div class='add'>+				v4l2_video_std_construct(std,</div><div class='add'>+						V4L2_STD_PAL_I, "PAL-I");</div><div class='add'>+				break;</div><div class='add'>+			case 2:</div><div class='add'>+				v4l2_video_std_construct(std,</div><div class='add'>+						V4L2_STD_PAL_DK, "PAL-D/K");</div><div class='add'>+				break;</div><div class='add'>+			case 3:</div><div class='add'>+				v4l2_video_std_construct(std,</div><div class='add'>+						V4L2_STD_SECAM_L, "SECAM-L");</div><div class='add'>+				break;</div><div class='add'>+			default:</div><div class='add'>+				std-&gt;id = 0; /* hack to indicate EINVAL */</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		case TUNER_SONY_BTF_PK467Z:</div><div class='add'>+			if (std-&gt;index != 0) {</div><div class='add'>+				std-&gt;id = 0; /* hack to indicate EINVAL */</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			v4l2_video_std_construct(std,</div><div class='add'>+					V4L2_STD_NTSC_M_JP, "NTSC-J");</div><div class='add'>+			break;</div><div class='add'>+		case TUNER_SONY_BTF_PB463Z:</div><div class='add'>+			if (std-&gt;index != 0) {</div><div class='add'>+				std-&gt;id = 0; /* hack to indicate EINVAL */</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			v4l2_video_std_construct(std, V4L2_STD_NTSC_M, "NTSC");</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_G_STD:</div><div class='add'>+	{</div><div class='add'>+		v4l2_std_id *std = arg;</div><div class='add'>+</div><div class='add'>+		*std = t-&gt;std;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_S_STD:</div><div class='add'>+	{</div><div class='add'>+		v4l2_std_id *std = arg;</div><div class='add'>+		v4l2_std_id old = t-&gt;std;</div><div class='add'>+</div><div class='add'>+		switch (t-&gt;type) {</div><div class='add'>+		case TUNER_SONY_BTF_PG472Z:</div><div class='add'>+			if (force_band &amp;&amp; (*std &amp; force_band) != *std &amp;&amp;</div><div class='add'>+					*std != V4L2_STD_PAL &amp;&amp;</div><div class='add'>+					*std != V4L2_STD_SECAM) {</div><div class='add'>+				printk(KERN_DEBUG "wis-sony-tuner: ignoring "</div><div class='add'>+						"requested TV standard in "</div><div class='add'>+						"favor of force_band value\n");</div><div class='add'>+				t-&gt;std = force_band;</div><div class='add'>+			} else if (*std &amp; V4L2_STD_PAL_BG) { /* default */</div><div class='add'>+				t-&gt;std = V4L2_STD_PAL_BG;</div><div class='add'>+			} else if (*std &amp; V4L2_STD_PAL_I) {</div><div class='add'>+				t-&gt;std = V4L2_STD_PAL_I;</div><div class='add'>+			} else if (*std &amp; V4L2_STD_PAL_DK) {</div><div class='add'>+				t-&gt;std = V4L2_STD_PAL_DK;</div><div class='add'>+			} else if (*std &amp; V4L2_STD_SECAM_L) {</div><div class='add'>+				t-&gt;std = V4L2_STD_SECAM_L;</div><div class='add'>+			} else {</div><div class='add'>+				printk(KERN_ERR "wis-sony-tuner: TV standard "</div><div class='add'>+						"not supported\n");</div><div class='add'>+				*std = 0; /* hack to indicate EINVAL */</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			if (old != t-&gt;std)</div><div class='add'>+				set_if(client);</div><div class='add'>+			break;</div><div class='add'>+		case TUNER_SONY_BTF_PK467Z:</div><div class='add'>+			if (!(*std &amp; V4L2_STD_NTSC_M_JP)) {</div><div class='add'>+				printk(KERN_ERR "wis-sony-tuner: TV standard "</div><div class='add'>+						"not supported\n");</div><div class='add'>+				*std = 0; /* hack to indicate EINVAL */</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		case TUNER_SONY_BTF_PB463Z:</div><div class='add'>+			if (!(*std &amp; V4L2_STD_NTSC_M)) {</div><div class='add'>+				printk(KERN_ERR "wis-sony-tuner: TV standard "</div><div class='add'>+						"not supported\n");</div><div class='add'>+				*std = 0; /* hack to indicate EINVAL */</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_QUERYSTD:</div><div class='add'>+	{</div><div class='add'>+		v4l2_std_id *std = arg;</div><div class='add'>+</div><div class='add'>+		switch (t-&gt;type) {</div><div class='add'>+		case TUNER_SONY_BTF_PG472Z:</div><div class='add'>+			if (force_band)</div><div class='add'>+				*std = force_band;</div><div class='add'>+			else</div><div class='add'>+				*std = V4L2_STD_PAL_BG | V4L2_STD_PAL_I |</div><div class='add'>+					V4L2_STD_PAL_DK | V4L2_STD_SECAM_L;</div><div class='add'>+			break;</div><div class='add'>+		case TUNER_SONY_BTF_PK467Z:</div><div class='add'>+			*std = V4L2_STD_NTSC_M_JP;</div><div class='add'>+			break;</div><div class='add'>+		case TUNER_SONY_BTF_PB463Z:</div><div class='add'>+			*std = V4L2_STD_NTSC_M;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_G_TUNER:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_tuner *tun = arg;</div><div class='add'>+</div><div class='add'>+		memset(t, 0, sizeof(*tun));</div><div class='add'>+		strcpy(tun-&gt;name, "Television");</div><div class='add'>+		tun-&gt;type = V4L2_TUNER_ANALOG_TV;</div><div class='add'>+		tun-&gt;rangelow = 0UL; /* does anything use these? */</div><div class='add'>+		tun-&gt;rangehigh = 0xffffffffUL;</div><div class='add'>+		switch (t-&gt;type) {</div><div class='add'>+		case TUNER_SONY_BTF_PG472Z:</div><div class='add'>+			tun-&gt;capability = V4L2_TUNER_CAP_NORM |</div><div class='add'>+				V4L2_TUNER_CAP_STEREO | V4L2_TUNER_CAP_LANG1 |</div><div class='add'>+				V4L2_TUNER_CAP_LANG2;</div><div class='add'>+			tun-&gt;rxsubchans = V4L2_TUNER_SUB_MONO |</div><div class='add'>+				V4L2_TUNER_SUB_STEREO | V4L2_TUNER_SUB_LANG1 |</div><div class='add'>+				V4L2_TUNER_SUB_LANG2;</div><div class='add'>+			break;</div><div class='add'>+		case TUNER_SONY_BTF_PK467Z:</div><div class='add'>+		case TUNER_SONY_BTF_PB463Z:</div><div class='add'>+			tun-&gt;capability = V4L2_TUNER_CAP_STEREO;</div><div class='add'>+			tun-&gt;rxsubchans = V4L2_TUNER_SUB_MONO |</div><div class='add'>+						V4L2_TUNER_SUB_STEREO;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		tun-&gt;audmode = t-&gt;audmode;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_S_TUNER:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_tuner *tun = arg;</div><div class='add'>+</div><div class='add'>+		switch (t-&gt;type) {</div><div class='add'>+		case TUNER_SONY_BTF_PG472Z:</div><div class='add'>+			if (tun-&gt;audmode != t-&gt;audmode) {</div><div class='add'>+				t-&gt;audmode = tun-&gt;audmode;</div><div class='add'>+				mpx_setup(client);</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		case TUNER_SONY_BTF_PK467Z:</div><div class='add'>+		case TUNER_SONY_BTF_PB463Z:</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct i2c_driver wis_sony_tuner_driver;</div><div class='add'>+</div><div class='add'>+static struct i2c_client wis_sony_tuner_client_templ = {</div><div class='add'>+	.name		= "Sony TV Tuner (WIS)",</div><div class='add'>+	.driver		= &amp;wis_sony_tuner_driver,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int wis_sony_tuner_detect(struct i2c_adapter *adapter,</div><div class='add'>+					int addr, int kind)</div><div class='add'>+{</div><div class='add'>+	struct i2c_client *client;</div><div class='add'>+	struct wis_sony_tuner *t;</div><div class='add'>+</div><div class='add'>+	if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_I2C_BLOCK))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL);</div><div class='add'>+	if (client == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	memcpy(client, &amp;wis_sony_tuner_client_templ,</div><div class='add'>+			sizeof(wis_sony_tuner_client_templ));</div><div class='add'>+	client-&gt;adapter = adapter;</div><div class='add'>+	client-&gt;addr = addr;</div><div class='add'>+</div><div class='add'>+	t = kmalloc(sizeof(struct wis_sony_tuner), GFP_KERNEL);</div><div class='add'>+	if (t == NULL) {</div><div class='add'>+		kfree(client);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	t-&gt;type = -1;</div><div class='add'>+	t-&gt;freq = 0;</div><div class='add'>+	t-&gt;mpxmode = 0;</div><div class='add'>+	t-&gt;audmode = V4L2_TUNER_MODE_STEREO;</div><div class='add'>+	i2c_set_clientdata(client, t);</div><div class='add'>+</div><div class='add'>+	printk(KERN_DEBUG</div><div class='add'>+		"wis-sony-tuner: initializing tuner at address %d on %s\n",</div><div class='add'>+		addr, adapter-&gt;name);</div><div class='add'>+</div><div class='add'>+	i2c_attach_client(client);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wis_sony_tuner_detach(struct i2c_client *client)</div><div class='add'>+{</div><div class='add'>+	struct wis_sony_tuner *t = i2c_get_clientdata(client);</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	r = i2c_detach_client(client);</div><div class='add'>+	if (r &lt; 0)</div><div class='add'>+		return r;</div><div class='add'>+</div><div class='add'>+	kfree(t);</div><div class='add'>+	kfree(client);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct i2c_driver wis_sony_tuner_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name	= "WIS Sony TV Tuner I2C driver",</div><div class='add'>+	},</div><div class='add'>+	.id		= I2C_DRIVERID_WIS_SONY_TUNER,</div><div class='add'>+	.detach_client	= wis_sony_tuner_detach,</div><div class='add'>+	.command	= tuner_command,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init wis_sony_tuner_init(void)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	r = i2c_add_driver(&amp;wis_sony_tuner_driver);</div><div class='add'>+	if (r &lt; 0)</div><div class='add'>+		return r;</div><div class='add'>+	return wis_i2c_add_driver(wis_sony_tuner_driver.id,</div><div class='add'>+					wis_sony_tuner_detect);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit wis_sony_tuner_cleanup(void)</div><div class='add'>+{</div><div class='add'>+	wis_i2c_del_driver(wis_sony_tuner_detect);</div><div class='add'>+	i2c_del_driver(&amp;wis_sony_tuner_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(wis_sony_tuner_init);</div><div class='add'>+module_exit(wis_sony_tuner_cleanup);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/staging/go7007/wis-tw2804.c b/drivers/staging/go7007/wis-tw2804.c<br/>new file mode 100644<br/>index 000000000000..27fe4d0d4ed6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/go7007/wis-tw2804.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/go7007/wis-tw2804.c</a></div><div class='hunk'>@@ -0,0 +1,380 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2005-2006 Micronas USA Inc.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License (Version 2) as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software Foundation,</div><div class='add'>+ * Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/version.h&gt;</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/videodev2.h&gt;</div><div class='add'>+#include &lt;linux/ioctl.h&gt;</div><div class='add'>+</div><div class='add'>+#include "wis-i2c.h"</div><div class='add'>+</div><div class='add'>+struct wis_tw2804 {</div><div class='add'>+	int channel;</div><div class='add'>+	int norm;</div><div class='add'>+	int brightness;</div><div class='add'>+	int contrast;</div><div class='add'>+	int saturation;</div><div class='add'>+	int hue;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u8 global_registers[] =</div><div class='add'>+{</div><div class='add'>+	0x39, 0x00,</div><div class='add'>+	0x3a, 0xff,</div><div class='add'>+	0x3b, 0x84,</div><div class='add'>+	0x3c, 0x80,</div><div class='add'>+	0x3d, 0x80,</div><div class='add'>+	0x3e, 0x82,</div><div class='add'>+	0x3f, 0x82,</div><div class='add'>+	0xff, 0xff, /* Terminator (reg 0xff does not exist) */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u8 channel_registers[] =</div><div class='add'>+{</div><div class='add'>+	0x01, 0xc4,</div><div class='add'>+	0x02, 0xa5,</div><div class='add'>+	0x03, 0x20,</div><div class='add'>+	0x04, 0xd0,</div><div class='add'>+	0x05, 0x20,</div><div class='add'>+	0x06, 0xd0,</div><div class='add'>+	0x07, 0x88,</div><div class='add'>+	0x08, 0x20,</div><div class='add'>+	0x09, 0x07,</div><div class='add'>+	0x0a, 0xf0,</div><div class='add'>+	0x0b, 0x07,</div><div class='add'>+	0x0c, 0xf0,</div><div class='add'>+	0x0d, 0x40,</div><div class='add'>+	0x0e, 0xd2,</div><div class='add'>+	0x0f, 0x80,</div><div class='add'>+	0x10, 0x80,</div><div class='add'>+	0x11, 0x80,</div><div class='add'>+	0x12, 0x80,</div><div class='add'>+	0x13, 0x1f,</div><div class='add'>+	0x14, 0x00,</div><div class='add'>+	0x15, 0x00,</div><div class='add'>+	0x16, 0x00,</div><div class='add'>+	0x17, 0x00,</div><div class='add'>+	0x18, 0xff,</div><div class='add'>+	0x19, 0xff,</div><div class='add'>+	0x1a, 0xff,</div><div class='add'>+	0x1b, 0xff,</div><div class='add'>+	0x1c, 0xff,</div><div class='add'>+	0x1d, 0xff,</div><div class='add'>+	0x1e, 0xff,</div><div class='add'>+	0x1f, 0xff,</div><div class='add'>+	0x20, 0x07,</div><div class='add'>+	0x21, 0x07,</div><div class='add'>+	0x22, 0x00,</div><div class='add'>+	0x23, 0x91,</div><div class='add'>+	0x24, 0x51,</div><div class='add'>+	0x25, 0x03,</div><div class='add'>+	0x26, 0x00,</div><div class='add'>+	0x27, 0x00,</div><div class='add'>+	0x28, 0x00,</div><div class='add'>+	0x29, 0x00,</div><div class='add'>+	0x2a, 0x00,</div><div class='add'>+	0x2b, 0x00,</div><div class='add'>+	0x2c, 0x00,</div><div class='add'>+	0x2d, 0x00,</div><div class='add'>+	0x2e, 0x00,</div><div class='add'>+	0x2f, 0x00,</div><div class='add'>+	0x30, 0x00,</div><div class='add'>+	0x31, 0x00,</div><div class='add'>+	0x32, 0x00,</div><div class='add'>+	0x33, 0x00,</div><div class='add'>+	0x34, 0x00,</div><div class='add'>+	0x35, 0x00,</div><div class='add'>+	0x36, 0x00,</div><div class='add'>+	0x37, 0x00,</div><div class='add'>+	0xff, 0xff, /* Terminator (reg 0xff does not exist) */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int write_reg(struct i2c_client *client, u8 reg, u8 value, int channel)</div><div class='add'>+{</div><div class='add'>+	return i2c_smbus_write_byte_data(client, reg | (channel &lt;&lt; 6), value);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int write_regs(struct i2c_client *client, u8 *regs, int channel)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; regs[i] != 0xff; i += 2)</div><div class='add'>+		if (i2c_smbus_write_byte_data(client,</div><div class='add'>+				regs[i] | (channel &lt;&lt; 6), regs[i + 1]) &lt; 0)</div><div class='add'>+			return -1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wis_tw2804_command(struct i2c_client *client,</div><div class='add'>+				unsigned int cmd, void *arg)</div><div class='add'>+{</div><div class='add'>+	struct wis_tw2804 *dec = i2c_get_clientdata(client);</div><div class='add'>+</div><div class='add'>+	if (cmd == DECODER_SET_CHANNEL) {</div><div class='add'>+		int *input = arg;</div><div class='add'>+</div><div class='add'>+		if (*input &lt; 0 || *input &gt; 3) {</div><div class='add'>+			printk(KERN_ERR "wis-tw2804: channel %d is not "</div><div class='add'>+					"between 0 and 3!\n", *input);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+		dec-&gt;channel = *input;</div><div class='add'>+		printk(KERN_DEBUG "wis-tw2804: initializing TW2804 "</div><div class='add'>+				"channel %d\n", dec-&gt;channel);</div><div class='add'>+		if (dec-&gt;channel == 0 &amp;&amp;</div><div class='add'>+				write_regs(client, global_registers, 0) &lt; 0) {</div><div class='add'>+			printk(KERN_ERR "wis-tw2804: error initializing "</div><div class='add'>+					"TW2804 global registers\n");</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+		if (write_regs(client, channel_registers, dec-&gt;channel) &lt; 0) {</div><div class='add'>+			printk(KERN_ERR "wis-tw2804: error initializing "</div><div class='add'>+					"TW2804 channel %d\n", dec-&gt;channel);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dec-&gt;channel &lt; 0) {</div><div class='add'>+		printk(KERN_DEBUG "wis-tw2804: ignoring command %08x until "</div><div class='add'>+				"channel number is set\n", cmd);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case VIDIOC_S_STD:</div><div class='add'>+	{</div><div class='add'>+		v4l2_std_id *input = arg;</div><div class='add'>+		u8 regs[] = {</div><div class='add'>+			0x01, *input &amp; V4L2_STD_NTSC ? 0xc4 : 0x84,</div><div class='add'>+			0x09, *input &amp; V4L2_STD_NTSC ? 0x07 : 0x04,</div><div class='add'>+			0x0a, *input &amp; V4L2_STD_NTSC ? 0xf0 : 0x20,</div><div class='add'>+			0x0b, *input &amp; V4L2_STD_NTSC ? 0x07 : 0x04,</div><div class='add'>+			0x0c, *input &amp; V4L2_STD_NTSC ? 0xf0 : 0x20,</div><div class='add'>+			0x0d, *input &amp; V4L2_STD_NTSC ? 0x40 : 0x4a,</div><div class='add'>+			0x16, *input &amp; V4L2_STD_NTSC ? 0x00 : 0x40,</div><div class='add'>+			0x17, *input &amp; V4L2_STD_NTSC ? 0x00 : 0x40,</div><div class='add'>+			0x20, *input &amp; V4L2_STD_NTSC ? 0x07 : 0x0f,</div><div class='add'>+			0x21, *input &amp; V4L2_STD_NTSC ? 0x07 : 0x0f,</div><div class='add'>+			0xff,	0xff,</div><div class='add'>+		};</div><div class='add'>+		write_regs(client, regs, dec-&gt;channel);</div><div class='add'>+		dec-&gt;norm = *input;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_QUERYCTRL:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_queryctrl *ctrl = arg;</div><div class='add'>+</div><div class='add'>+		switch (ctrl-&gt;id) {</div><div class='add'>+		case V4L2_CID_BRIGHTNESS:</div><div class='add'>+			ctrl-&gt;type = V4L2_CTRL_TYPE_INTEGER;</div><div class='add'>+			strncpy(ctrl-&gt;name, "Brightness", sizeof(ctrl-&gt;name));</div><div class='add'>+			ctrl-&gt;minimum = 0;</div><div class='add'>+			ctrl-&gt;maximum = 255;</div><div class='add'>+			ctrl-&gt;step = 1;</div><div class='add'>+			ctrl-&gt;default_value = 128;</div><div class='add'>+			ctrl-&gt;flags = 0;</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_CID_CONTRAST:</div><div class='add'>+			ctrl-&gt;type = V4L2_CTRL_TYPE_INTEGER;</div><div class='add'>+			strncpy(ctrl-&gt;name, "Contrast", sizeof(ctrl-&gt;name));</div><div class='add'>+			ctrl-&gt;minimum = 0;</div><div class='add'>+			ctrl-&gt;maximum = 255;</div><div class='add'>+			ctrl-&gt;step = 1;</div><div class='add'>+			ctrl-&gt;default_value = 128;</div><div class='add'>+			ctrl-&gt;flags = 0;</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_CID_SATURATION:</div><div class='add'>+			ctrl-&gt;type = V4L2_CTRL_TYPE_INTEGER;</div><div class='add'>+			strncpy(ctrl-&gt;name, "Saturation", sizeof(ctrl-&gt;name));</div><div class='add'>+			ctrl-&gt;minimum = 0;</div><div class='add'>+			ctrl-&gt;maximum = 255;</div><div class='add'>+			ctrl-&gt;step = 1;</div><div class='add'>+			ctrl-&gt;default_value = 128;</div><div class='add'>+			ctrl-&gt;flags = 0;</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_CID_HUE:</div><div class='add'>+			ctrl-&gt;type = V4L2_CTRL_TYPE_INTEGER;</div><div class='add'>+			strncpy(ctrl-&gt;name, "Hue", sizeof(ctrl-&gt;name));</div><div class='add'>+			ctrl-&gt;minimum = 0;</div><div class='add'>+			ctrl-&gt;maximum = 255;</div><div class='add'>+			ctrl-&gt;step = 1;</div><div class='add'>+			ctrl-&gt;default_value = 128;</div><div class='add'>+			ctrl-&gt;flags = 0;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_S_CTRL:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_control *ctrl = arg;</div><div class='add'>+</div><div class='add'>+		switch (ctrl-&gt;id) {</div><div class='add'>+		case V4L2_CID_BRIGHTNESS:</div><div class='add'>+			if (ctrl-&gt;value &gt; 255)</div><div class='add'>+				dec-&gt;brightness = 255;</div><div class='add'>+			else if (ctrl-&gt;value &lt; 0)</div><div class='add'>+				dec-&gt;brightness = 0;</div><div class='add'>+			else</div><div class='add'>+				dec-&gt;brightness = ctrl-&gt;value;</div><div class='add'>+			write_reg(client, 0x12, dec-&gt;brightness, dec-&gt;channel);</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_CID_CONTRAST:</div><div class='add'>+			if (ctrl-&gt;value &gt; 255)</div><div class='add'>+				dec-&gt;contrast = 255;</div><div class='add'>+			else if (ctrl-&gt;value &lt; 0)</div><div class='add'>+				dec-&gt;contrast = 0;</div><div class='add'>+			else</div><div class='add'>+				dec-&gt;contrast = ctrl-&gt;value;</div><div class='add'>+			write_reg(client, 0x11, dec-&gt;contrast, dec-&gt;channel);</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_CID_SATURATION:</div><div class='add'>+			if (ctrl-&gt;value &gt; 255)</div><div class='add'>+				dec-&gt;saturation = 255;</div><div class='add'>+			else if (ctrl-&gt;value &lt; 0)</div><div class='add'>+				dec-&gt;saturation = 0;</div><div class='add'>+			else</div><div class='add'>+				dec-&gt;saturation = ctrl-&gt;value;</div><div class='add'>+			write_reg(client, 0x10, dec-&gt;saturation, dec-&gt;channel);</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_CID_HUE:</div><div class='add'>+			if (ctrl-&gt;value &gt; 255)</div><div class='add'>+				dec-&gt;hue = 255;</div><div class='add'>+			else if (ctrl-&gt;value &lt; 0)</div><div class='add'>+				dec-&gt;hue = 0;</div><div class='add'>+			else</div><div class='add'>+				dec-&gt;hue = ctrl-&gt;value;</div><div class='add'>+			write_reg(client, 0x0f, dec-&gt;hue, dec-&gt;channel);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_G_CTRL:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_control *ctrl = arg;</div><div class='add'>+</div><div class='add'>+		switch (ctrl-&gt;id) {</div><div class='add'>+		case V4L2_CID_BRIGHTNESS:</div><div class='add'>+			ctrl-&gt;value = dec-&gt;brightness;</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_CID_CONTRAST:</div><div class='add'>+			ctrl-&gt;value = dec-&gt;contrast;</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_CID_SATURATION:</div><div class='add'>+			ctrl-&gt;value = dec-&gt;saturation;</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_CID_HUE:</div><div class='add'>+			ctrl-&gt;value = dec-&gt;hue;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct i2c_driver wis_tw2804_driver;</div><div class='add'>+</div><div class='add'>+static struct i2c_client wis_tw2804_client_templ = {</div><div class='add'>+	.name		= "TW2804 (WIS)",</div><div class='add'>+	.driver		= &amp;wis_tw2804_driver,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int wis_tw2804_detect(struct i2c_adapter *adapter, int addr, int kind)</div><div class='add'>+{</div><div class='add'>+	struct i2c_client *client;</div><div class='add'>+	struct wis_tw2804 *dec;</div><div class='add'>+</div><div class='add'>+	if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL);</div><div class='add'>+	if (client == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	memcpy(client, &amp;wis_tw2804_client_templ,</div><div class='add'>+			sizeof(wis_tw2804_client_templ));</div><div class='add'>+	client-&gt;adapter = adapter;</div><div class='add'>+	client-&gt;addr = addr;</div><div class='add'>+</div><div class='add'>+	dec = kmalloc(sizeof(struct wis_tw2804), GFP_KERNEL);</div><div class='add'>+	if (dec == NULL) {</div><div class='add'>+		kfree(client);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	dec-&gt;channel = -1;</div><div class='add'>+	dec-&gt;norm = V4L2_STD_NTSC;</div><div class='add'>+	dec-&gt;brightness = 128;</div><div class='add'>+	dec-&gt;contrast = 128;</div><div class='add'>+	dec-&gt;saturation = 128;</div><div class='add'>+	dec-&gt;hue = 128;</div><div class='add'>+	i2c_set_clientdata(client, dec);</div><div class='add'>+</div><div class='add'>+	printk(KERN_DEBUG "wis-tw2804: creating TW2804 at address %d on %s\n",</div><div class='add'>+		addr, adapter-&gt;name);</div><div class='add'>+</div><div class='add'>+	i2c_attach_client(client);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wis_tw2804_detach(struct i2c_client *client)</div><div class='add'>+{</div><div class='add'>+	struct wis_tw2804 *dec = i2c_get_clientdata(client);</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	r = i2c_detach_client(client);</div><div class='add'>+	if (r &lt; 0)</div><div class='add'>+		return r;</div><div class='add'>+</div><div class='add'>+	kfree(client);</div><div class='add'>+	kfree(dec);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct i2c_driver wis_tw2804_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name	= "WIS TW2804 I2C driver",</div><div class='add'>+	},</div><div class='add'>+	.id		= I2C_DRIVERID_WIS_TW2804,</div><div class='add'>+	.detach_client	= wis_tw2804_detach,</div><div class='add'>+	.command	= wis_tw2804_command,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init wis_tw2804_init(void)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	r = i2c_add_driver(&amp;wis_tw2804_driver);</div><div class='add'>+	if (r &lt; 0)</div><div class='add'>+		return r;</div><div class='add'>+	return wis_i2c_add_driver(wis_tw2804_driver.id, wis_tw2804_detect);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit wis_tw2804_cleanup(void)</div><div class='add'>+{</div><div class='add'>+	wis_i2c_del_driver(wis_tw2804_detect);</div><div class='add'>+	i2c_del_driver(&amp;wis_tw2804_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(wis_tw2804_init);</div><div class='add'>+module_exit(wis_tw2804_cleanup);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/staging/go7007/wis-tw9903.c b/drivers/staging/go7007/wis-tw9903.c<br/>new file mode 100644<br/>index 000000000000..d8e41968022e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/go7007/wis-tw9903.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/go7007/wis-tw9903.c</a></div><div class='hunk'>@@ -0,0 +1,362 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2005-2006 Micronas USA Inc.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License (Version 2) as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software Foundation,</div><div class='add'>+ * Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/version.h&gt;</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/videodev2.h&gt;</div><div class='add'>+#include &lt;linux/ioctl.h&gt;</div><div class='add'>+</div><div class='add'>+#include "wis-i2c.h"</div><div class='add'>+</div><div class='add'>+struct wis_tw9903 {</div><div class='add'>+	int norm;</div><div class='add'>+	int brightness;</div><div class='add'>+	int contrast;</div><div class='add'>+	int hue;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u8 initial_registers[] =</div><div class='add'>+{</div><div class='add'>+	0x02, 0x44, /* input 1, composite */</div><div class='add'>+	0x03, 0x92, /* correct digital format */</div><div class='add'>+	0x04, 0x00,</div><div class='add'>+	0x05, 0x80, /* or 0x00 for PAL */</div><div class='add'>+	0x06, 0x40, /* second internal current reference */</div><div class='add'>+	0x07, 0x02, /* window */</div><div class='add'>+	0x08, 0x14, /* window */</div><div class='add'>+	0x09, 0xf0, /* window */</div><div class='add'>+	0x0a, 0x81, /* window */</div><div class='add'>+	0x0b, 0xd0, /* window */</div><div class='add'>+	0x0c, 0x8c,</div><div class='add'>+	0x0d, 0x00, /* scaling */</div><div class='add'>+	0x0e, 0x11, /* scaling */</div><div class='add'>+	0x0f, 0x00, /* scaling */</div><div class='add'>+	0x10, 0x00, /* brightness */</div><div class='add'>+	0x11, 0x60, /* contrast */</div><div class='add'>+	0x12, 0x01, /* sharpness */</div><div class='add'>+	0x13, 0x7f, /* U gain */</div><div class='add'>+	0x14, 0x5a, /* V gain */</div><div class='add'>+	0x15, 0x00, /* hue */</div><div class='add'>+	0x16, 0xc3, /* sharpness */</div><div class='add'>+	0x18, 0x00,</div><div class='add'>+	0x19, 0x58, /* vbi */</div><div class='add'>+	0x1a, 0x80,</div><div class='add'>+	0x1c, 0x0f, /* video norm */</div><div class='add'>+	0x1d, 0x7f, /* video norm */</div><div class='add'>+	0x20, 0xa0, /* clamping gain (working 0x50) */</div><div class='add'>+	0x21, 0x22,</div><div class='add'>+	0x22, 0xf0,</div><div class='add'>+	0x23, 0xfe,</div><div class='add'>+	0x24, 0x3c,</div><div class='add'>+	0x25, 0x38,</div><div class='add'>+	0x26, 0x44,</div><div class='add'>+	0x27, 0x20,</div><div class='add'>+	0x28, 0x00,</div><div class='add'>+	0x29, 0x15,</div><div class='add'>+	0x2a, 0xa0,</div><div class='add'>+	0x2b, 0x44,</div><div class='add'>+	0x2c, 0x37,</div><div class='add'>+	0x2d, 0x00,</div><div class='add'>+	0x2e, 0xa5, /* burst PLL control (working: a9) */</div><div class='add'>+	0x2f, 0xe0, /* 0xea is blue test frame -- 0xe0 for normal */</div><div class='add'>+	0x31, 0x00,</div><div class='add'>+	0x33, 0x22,</div><div class='add'>+	0x34, 0x11,</div><div class='add'>+	0x35, 0x35,</div><div class='add'>+	0x3b, 0x05,</div><div class='add'>+	0x06, 0xc0, /* reset device */</div><div class='add'>+	0x00, 0x00, /* Terminator (reg 0x00 is read-only) */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int write_reg(struct i2c_client *client, u8 reg, u8 value)</div><div class='add'>+{</div><div class='add'>+	return i2c_smbus_write_byte_data(client, reg, value);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int write_regs(struct i2c_client *client, u8 *regs)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; regs[i] != 0x00; i += 2)</div><div class='add'>+		if (i2c_smbus_write_byte_data(client, regs[i], regs[i + 1]) &lt; 0)</div><div class='add'>+			return -1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wis_tw9903_command(struct i2c_client *client,</div><div class='add'>+				unsigned int cmd, void *arg)</div><div class='add'>+{</div><div class='add'>+	struct wis_tw9903 *dec = i2c_get_clientdata(client);</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case VIDIOC_S_INPUT:</div><div class='add'>+	{</div><div class='add'>+		int *input = arg;</div><div class='add'>+</div><div class='add'>+		i2c_smbus_write_byte_data(client, 0x02, 0x40 | (*input &lt;&lt; 1));</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+#if 0   /* The scaler on this thing seems to be horribly broken */</div><div class='add'>+	case DECODER_SET_RESOLUTION:</div><div class='add'>+	{</div><div class='add'>+		struct video_decoder_resolution *res = arg;</div><div class='add'>+		/*int hscale = 256 * 720 / res-&gt;width;*/</div><div class='add'>+		int hscale = 256 * 720 / (res-&gt;width - (res-&gt;width &gt; 704 ? 0 : 8));</div><div class='add'>+		int vscale = 256 * (dec-&gt;norm &amp; V4L2_STD_NTSC ?  240 : 288)</div><div class='add'>+				/ res-&gt;height;</div><div class='add'>+		u8 regs[] = {</div><div class='add'>+			0x0d, vscale &amp; 0xff,</div><div class='add'>+			0x0f, hscale &amp; 0xff,</div><div class='add'>+			0x0e, ((vscale &amp; 0xf00) &gt;&gt; 4) | ((hscale &amp; 0xf00) &gt;&gt; 8),</div><div class='add'>+			0x06, 0xc0, /* reset device */</div><div class='add'>+			0,	0,</div><div class='add'>+		};</div><div class='add'>+		printk(KERN_DEBUG "vscale is %04x, hscale is %04x\n",</div><div class='add'>+				vscale, hscale);</div><div class='add'>+		/*write_regs(client, regs);*/</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	case VIDIOC_S_STD:</div><div class='add'>+	{</div><div class='add'>+		v4l2_std_id *input = arg;</div><div class='add'>+		u8 regs[] = {</div><div class='add'>+			0x05, *input &amp; V4L2_STD_NTSC ? 0x80 : 0x00,</div><div class='add'>+			0x07, *input &amp; V4L2_STD_NTSC ? 0x02 : 0x12,</div><div class='add'>+			0x08, *input &amp; V4L2_STD_NTSC ? 0x14 : 0x18,</div><div class='add'>+			0x09, *input &amp; V4L2_STD_NTSC ? 0xf0 : 0x20,</div><div class='add'>+			0,	0,</div><div class='add'>+		};</div><div class='add'>+		write_regs(client, regs);</div><div class='add'>+		dec-&gt;norm = *input;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_QUERYCTRL:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_queryctrl *ctrl = arg;</div><div class='add'>+</div><div class='add'>+		switch (ctrl-&gt;id) {</div><div class='add'>+		case V4L2_CID_BRIGHTNESS:</div><div class='add'>+			ctrl-&gt;type = V4L2_CTRL_TYPE_INTEGER;</div><div class='add'>+			strncpy(ctrl-&gt;name, "Brightness", sizeof(ctrl-&gt;name));</div><div class='add'>+			ctrl-&gt;minimum = -128;</div><div class='add'>+			ctrl-&gt;maximum = 127;</div><div class='add'>+			ctrl-&gt;step = 1;</div><div class='add'>+			ctrl-&gt;default_value = 0x00;</div><div class='add'>+			ctrl-&gt;flags = 0;</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_CID_CONTRAST:</div><div class='add'>+			ctrl-&gt;type = V4L2_CTRL_TYPE_INTEGER;</div><div class='add'>+			strncpy(ctrl-&gt;name, "Contrast", sizeof(ctrl-&gt;name));</div><div class='add'>+			ctrl-&gt;minimum = 0;</div><div class='add'>+			ctrl-&gt;maximum = 255;</div><div class='add'>+			ctrl-&gt;step = 1;</div><div class='add'>+			ctrl-&gt;default_value = 0x60;</div><div class='add'>+			ctrl-&gt;flags = 0;</div><div class='add'>+			break;</div><div class='add'>+#if 0</div><div class='add'>+		/* I don't understand how the Chroma Gain registers work... */</div><div class='add'>+		case V4L2_CID_SATURATION:</div><div class='add'>+			ctrl-&gt;type = V4L2_CTRL_TYPE_INTEGER;</div><div class='add'>+			strncpy(ctrl-&gt;name, "Saturation", sizeof(ctrl-&gt;name));</div><div class='add'>+			ctrl-&gt;minimum = 0;</div><div class='add'>+			ctrl-&gt;maximum = 127;</div><div class='add'>+			ctrl-&gt;step = 1;</div><div class='add'>+			ctrl-&gt;default_value = 64;</div><div class='add'>+			ctrl-&gt;flags = 0;</div><div class='add'>+			break;</div><div class='add'>+#endif</div><div class='add'>+		case V4L2_CID_HUE:</div><div class='add'>+			ctrl-&gt;type = V4L2_CTRL_TYPE_INTEGER;</div><div class='add'>+			strncpy(ctrl-&gt;name, "Hue", sizeof(ctrl-&gt;name));</div><div class='add'>+			ctrl-&gt;minimum = -128;</div><div class='add'>+			ctrl-&gt;maximum = 127;</div><div class='add'>+			ctrl-&gt;step = 1;</div><div class='add'>+			ctrl-&gt;default_value = 0;</div><div class='add'>+			ctrl-&gt;flags = 0;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_S_CTRL:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_control *ctrl = arg;</div><div class='add'>+</div><div class='add'>+		switch (ctrl-&gt;id) {</div><div class='add'>+		case V4L2_CID_BRIGHTNESS:</div><div class='add'>+			if (ctrl-&gt;value &gt; 127)</div><div class='add'>+				dec-&gt;brightness = 127;</div><div class='add'>+			else if (ctrl-&gt;value &lt; -128)</div><div class='add'>+				dec-&gt;brightness = -128;</div><div class='add'>+			else</div><div class='add'>+				dec-&gt;brightness = ctrl-&gt;value;</div><div class='add'>+			write_reg(client, 0x10, dec-&gt;brightness);</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_CID_CONTRAST:</div><div class='add'>+			if (ctrl-&gt;value &gt; 255)</div><div class='add'>+				dec-&gt;contrast = 255;</div><div class='add'>+			else if (ctrl-&gt;value &lt; 0)</div><div class='add'>+				dec-&gt;contrast = 0;</div><div class='add'>+			else</div><div class='add'>+				dec-&gt;contrast = ctrl-&gt;value;</div><div class='add'>+			write_reg(client, 0x11, dec-&gt;contrast);</div><div class='add'>+			break;</div><div class='add'>+#if 0</div><div class='add'>+		case V4L2_CID_SATURATION:</div><div class='add'>+			if (ctrl-&gt;value &gt; 127)</div><div class='add'>+				dec-&gt;saturation = 127;</div><div class='add'>+			else if (ctrl-&gt;value &lt; 0)</div><div class='add'>+				dec-&gt;saturation = 0;</div><div class='add'>+			else</div><div class='add'>+				dec-&gt;saturation = ctrl-&gt;value;</div><div class='add'>+			/*write_reg(client, 0x0c, dec-&gt;saturation);*/</div><div class='add'>+			break;</div><div class='add'>+#endif</div><div class='add'>+		case V4L2_CID_HUE:</div><div class='add'>+			if (ctrl-&gt;value &gt; 127)</div><div class='add'>+				dec-&gt;hue = 127;</div><div class='add'>+			else if (ctrl-&gt;value &lt; -128)</div><div class='add'>+				dec-&gt;hue = -128;</div><div class='add'>+			else</div><div class='add'>+				dec-&gt;hue = ctrl-&gt;value;</div><div class='add'>+			write_reg(client, 0x15, dec-&gt;hue);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_G_CTRL:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_control *ctrl = arg;</div><div class='add'>+</div><div class='add'>+		switch (ctrl-&gt;id) {</div><div class='add'>+		case V4L2_CID_BRIGHTNESS:</div><div class='add'>+			ctrl-&gt;value = dec-&gt;brightness;</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_CID_CONTRAST:</div><div class='add'>+			ctrl-&gt;value = dec-&gt;contrast;</div><div class='add'>+			break;</div><div class='add'>+#if 0</div><div class='add'>+		case V4L2_CID_SATURATION:</div><div class='add'>+			ctrl-&gt;value = dec-&gt;saturation;</div><div class='add'>+			break;</div><div class='add'>+#endif</div><div class='add'>+		case V4L2_CID_HUE:</div><div class='add'>+			ctrl-&gt;value = dec-&gt;hue;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct i2c_driver wis_tw9903_driver;</div><div class='add'>+</div><div class='add'>+static struct i2c_client wis_tw9903_client_templ = {</div><div class='add'>+	.name		= "TW9903 (WIS)",</div><div class='add'>+	.driver		= &amp;wis_tw9903_driver,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int wis_tw9903_detect(struct i2c_adapter *adapter, int addr, int kind)</div><div class='add'>+{</div><div class='add'>+	struct i2c_client *client;</div><div class='add'>+	struct wis_tw9903 *dec;</div><div class='add'>+</div><div class='add'>+	if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL);</div><div class='add'>+	if (client == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	memcpy(client, &amp;wis_tw9903_client_templ,</div><div class='add'>+			sizeof(wis_tw9903_client_templ));</div><div class='add'>+	client-&gt;adapter = adapter;</div><div class='add'>+	client-&gt;addr = addr;</div><div class='add'>+</div><div class='add'>+	dec = kmalloc(sizeof(struct wis_tw9903), GFP_KERNEL);</div><div class='add'>+	if (dec == NULL) {</div><div class='add'>+		kfree(client);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	dec-&gt;norm = V4L2_STD_NTSC;</div><div class='add'>+	dec-&gt;brightness = 0;</div><div class='add'>+	dec-&gt;contrast = 0x60;</div><div class='add'>+	dec-&gt;hue = 0;</div><div class='add'>+	i2c_set_clientdata(client, dec);</div><div class='add'>+</div><div class='add'>+	printk(KERN_DEBUG</div><div class='add'>+		"wis-tw9903: initializing TW9903 at address %d on %s\n",</div><div class='add'>+		addr, adapter-&gt;name);</div><div class='add'>+</div><div class='add'>+	if (write_regs(client, initial_registers) &lt; 0) {</div><div class='add'>+		printk(KERN_ERR "wis-tw9903: error initializing TW9903\n");</div><div class='add'>+		kfree(client);</div><div class='add'>+		kfree(dec);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	i2c_attach_client(client);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wis_tw9903_detach(struct i2c_client *client)</div><div class='add'>+{</div><div class='add'>+	struct wis_tw9903 *dec = i2c_get_clientdata(client);</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	r = i2c_detach_client(client);</div><div class='add'>+	if (r &lt; 0)</div><div class='add'>+		return r;</div><div class='add'>+</div><div class='add'>+	kfree(client);</div><div class='add'>+	kfree(dec);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct i2c_driver wis_tw9903_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name	= "WIS TW9903 I2C driver",</div><div class='add'>+	},</div><div class='add'>+	.id		= I2C_DRIVERID_WIS_TW9903,</div><div class='add'>+	.detach_client	= wis_tw9903_detach,</div><div class='add'>+	.command	= wis_tw9903_command,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init wis_tw9903_init(void)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	r = i2c_add_driver(&amp;wis_tw9903_driver);</div><div class='add'>+	if (r &lt; 0)</div><div class='add'>+		return r;</div><div class='add'>+	return wis_i2c_add_driver(wis_tw9903_driver.id, wis_tw9903_detect);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit wis_tw9903_cleanup(void)</div><div class='add'>+{</div><div class='add'>+	wis_i2c_del_driver(wis_tw9903_detect);</div><div class='add'>+	i2c_del_driver(&amp;wis_tw9903_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(wis_tw9903_init);</div><div class='add'>+module_exit(wis_tw9903_cleanup);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/staging/go7007/wis-uda1342.c b/drivers/staging/go7007/wis-uda1342.c<br/>new file mode 100644<br/>index 000000000000..a0894e3cb8c7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/go7007/wis-uda1342.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/go7007/wis-uda1342.c</a></div><div class='hunk'>@@ -0,0 +1,136 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2005-2006 Micronas USA Inc.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License (Version 2) as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software Foundation,</div><div class='add'>+ * Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/version.h&gt;</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/videodev2.h&gt;</div><div class='add'>+#include &lt;media/tvaudio.h&gt;</div><div class='add'>+#include &lt;media/v4l2-common.h&gt;</div><div class='add'>+</div><div class='add'>+#include "wis-i2c.h"</div><div class='add'>+</div><div class='add'>+static int write_reg(struct i2c_client *client, int reg, int value)</div><div class='add'>+{</div><div class='add'>+	/* UDA1342 wants MSB first, but SMBus sends LSB first */</div><div class='add'>+	i2c_smbus_write_word_data(client, reg, swab16(value));</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wis_uda1342_command(struct i2c_client *client,</div><div class='add'>+				unsigned int cmd, void *arg)</div><div class='add'>+{</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case VIDIOC_S_AUDIO:</div><div class='add'>+	{</div><div class='add'>+		int *inp = arg;</div><div class='add'>+</div><div class='add'>+		switch (*inp) {</div><div class='add'>+		case TVAUDIO_INPUT_TUNER:</div><div class='add'>+			write_reg(client, 0x00, 0x1441); /* select input 2 */</div><div class='add'>+			break;</div><div class='add'>+		case TVAUDIO_INPUT_EXTERN:</div><div class='add'>+			write_reg(client, 0x00, 0x1241); /* select input 1 */</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			printk(KERN_ERR "wis-uda1342: input %d not supported\n",</div><div class='add'>+					*inp);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct i2c_driver wis_uda1342_driver;</div><div class='add'>+</div><div class='add'>+static struct i2c_client wis_uda1342_client_templ = {</div><div class='add'>+	.name		= "UDA1342 (WIS)",</div><div class='add'>+	.driver		= &amp;wis_uda1342_driver,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int wis_uda1342_detect(struct i2c_adapter *adapter, int addr, int kind)</div><div class='add'>+{</div><div class='add'>+	struct i2c_client *client;</div><div class='add'>+</div><div class='add'>+	if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_WORD_DATA))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL);</div><div class='add'>+	if (client == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	memcpy(client, &amp;wis_uda1342_client_templ,</div><div class='add'>+			sizeof(wis_uda1342_client_templ));</div><div class='add'>+	client-&gt;adapter = adapter;</div><div class='add'>+	client-&gt;addr = addr;</div><div class='add'>+</div><div class='add'>+	printk(KERN_DEBUG</div><div class='add'>+		"wis-uda1342: initializing UDA1342 at address %d on %s\n",</div><div class='add'>+		addr, adapter-&gt;name);</div><div class='add'>+</div><div class='add'>+	write_reg(client, 0x00, 0x8000); /* reset registers */</div><div class='add'>+	write_reg(client, 0x00, 0x1241); /* select input 1 */</div><div class='add'>+</div><div class='add'>+	i2c_attach_client(client);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wis_uda1342_detach(struct i2c_client *client)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	r = i2c_detach_client(client);</div><div class='add'>+	if (r &lt; 0)</div><div class='add'>+		return r;</div><div class='add'>+</div><div class='add'>+	kfree(client);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct i2c_driver wis_uda1342_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name	= "WIS UDA1342 I2C driver",</div><div class='add'>+	},</div><div class='add'>+	.id		= I2C_DRIVERID_WIS_UDA1342,</div><div class='add'>+	.detach_client	= wis_uda1342_detach,</div><div class='add'>+	.command	= wis_uda1342_command,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init wis_uda1342_init(void)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	r = i2c_add_driver(&amp;wis_uda1342_driver);</div><div class='add'>+	if (r &lt; 0)</div><div class='add'>+		return r;</div><div class='add'>+	return wis_i2c_add_driver(wis_uda1342_driver.id, wis_uda1342_detect);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit wis_uda1342_cleanup(void)</div><div class='add'>+{</div><div class='add'>+	wis_i2c_del_driver(wis_uda1342_detect);</div><div class='add'>+	i2c_del_driver(&amp;wis_uda1342_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(wis_uda1342_init);</div><div class='add'>+module_exit(wis_uda1342_cleanup);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/staging/me4000/Kconfig b/drivers/staging/me4000/Kconfig<br/>new file mode 100644<br/>index 000000000000..5e6c9de1f11a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/me4000/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/me4000/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,10 @@</div><div class='add'>+config ME4000</div><div class='add'>+	tristate "Meilhaus ME-4000 support"</div><div class='add'>+	default n</div><div class='add'>+	depends on PCI</div><div class='add'>+	help</div><div class='add'>+	  This driver supports the Meilhaus ME-4000 family of boards</div><div class='add'>+	  that do data collection and multipurpose I/O.</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here: the module</div><div class='add'>+	  will be called me4000.</div><div class='head'>diff --git a/drivers/staging/me4000/Makefile b/drivers/staging/me4000/Makefile<br/>new file mode 100644<br/>index 000000000000..74487cd7becf<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/me4000/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/me4000/Makefile</a></div><div class='hunk'>@@ -0,0 +1 @@</div><div class='add'>+obj-$(CONFIG_ME4000)		+= me4000.o</div><div class='head'>diff --git a/drivers/staging/me4000/README b/drivers/staging/me4000/README<br/>new file mode 100644<br/>index 000000000000..bbb838632204<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/me4000/README?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/me4000/README</a></div><div class='hunk'>@@ -0,0 +1,13 @@</div><div class='add'>+</div><div class='add'>+TODO:</div><div class='add'>+	- checkpatch.pl cleanups</div><div class='add'>+	- sparse cleanups</div><div class='add'>+	- possible /proc interaction cleanups</div><div class='add'>+	- more info needed for Kconfig entry</div><div class='add'>+	- real device id?</div><div class='add'>+	- module parameter cleanup</div><div class='add'>+</div><div class='add'>+Please send patches to Greg Kroah-Hartman &lt;gregkh@suse.de&gt;</div><div class='add'>+and Cc: Wolfgang Beiter &lt;w.beiter@aon.at&gt; and</div><div class='add'>+Guenter Gebhardt &lt;g.gebhardt@meilhaus.de&gt;</div><div class='add'>+</div><div class='head'>diff --git a/drivers/staging/me4000/me4000.c b/drivers/staging/me4000/me4000.c<br/>new file mode 100644<br/>index 000000000000..862dd7ffb5c0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/me4000/me4000.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/me4000/me4000.c</a></div><div class='hunk'>@@ -0,0 +1,6133 @@</div><div class='add'>+/* Device driver for Meilhaus ME-4000 board family.</div><div class='add'>+ * ================================================</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2003 Meilhaus Electronic GmbH (support@meilhaus.de)</div><div class='add'>+ *</div><div class='add'>+ *  This file is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ *  (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='add'>+ *</div><div class='add'>+ *  Author:	Guenter Gebhardt	&lt;g.gebhardt@meilhaus.de&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/system.h&gt;</div><div class='add'>+#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/unistd.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/proc_fs.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/poll.h&gt;</div><div class='add'>+#include &lt;linux/vmalloc.h&gt;</div><div class='add'>+#include &lt;asm/pgtable.h&gt;</div><div class='add'>+#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+</div><div class='add'>+/* Include-File for the Meilhaus ME-4000 I/O board */</div><div class='add'>+#include "me4000.h"</div><div class='add'>+#include "me4000_firmware.h"</div><div class='add'>+#include "me4610_firmware.h"</div><div class='add'>+</div><div class='add'>+/* Administrative stuff for modinfo */</div><div class='add'>+MODULE_AUTHOR("Guenter Gebhardt &lt;g.gebhardt@meilhaus.de&gt;");</div><div class='add'>+MODULE_DESCRIPTION</div><div class='add'>+    ("Device Driver Module for Meilhaus ME-4000 boards version 1.0.5");</div><div class='add'>+MODULE_SUPPORTED_DEVICE("Meilhaus ME-4000 Multi I/O boards");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='add'>+/* Board specific data are kept in a global list */</div><div class='add'>+LIST_HEAD(me4000_board_info_list);</div><div class='add'>+</div><div class='add'>+/* Major Device Numbers. 0 means to get it automatically from the System */</div><div class='add'>+static int me4000_ao_major_driver_no = 0;</div><div class='add'>+static int me4000_ai_major_driver_no = 0;</div><div class='add'>+static int me4000_dio_major_driver_no = 0;</div><div class='add'>+static int me4000_cnt_major_driver_no = 0;</div><div class='add'>+static int me4000_ext_int_major_driver_no = 0;</div><div class='add'>+</div><div class='add'>+/* Let the user specify a custom major driver number */</div><div class='add'>+module_param(me4000_ao_major_driver_no, int, 0);</div><div class='add'>+MODULE_PARM_DESC(me4000_ao_major_driver_no,</div><div class='add'>+		 "Major driver number for analog output (default 0)");</div><div class='add'>+</div><div class='add'>+module_param(me4000_ai_major_driver_no, int, 0);</div><div class='add'>+MODULE_PARM_DESC(me4000_ai_major_driver_no,</div><div class='add'>+		 "Major driver number for analog input (default 0)");</div><div class='add'>+</div><div class='add'>+module_param(me4000_dio_major_driver_no, int, 0);</div><div class='add'>+MODULE_PARM_DESC(me4000_dio_major_driver_no,</div><div class='add'>+		 "Major driver number digital I/O (default 0)");</div><div class='add'>+</div><div class='add'>+module_param(me4000_cnt_major_driver_no, int, 0);</div><div class='add'>+MODULE_PARM_DESC(me4000_cnt_major_driver_no,</div><div class='add'>+		 "Major driver number for counter (default 0)");</div><div class='add'>+</div><div class='add'>+module_param(me4000_ext_int_major_driver_no, int, 0);</div><div class='add'>+MODULE_PARM_DESC(me4000_ext_int_major_driver_no,</div><div class='add'>+		 "Major driver number for external interrupt (default 0)");</div><div class='add'>+</div><div class='add'>+/*-----------------------------------------------------------------------------</div><div class='add'>+  Module stuff</div><div class='add'>+  ---------------------------------------------------------------------------*/</div><div class='add'>+int init_module(void);</div><div class='add'>+void cleanup_module(void);</div><div class='add'>+</div><div class='add'>+/*-----------------------------------------------------------------------------</div><div class='add'>+  Board detection and initialization</div><div class='add'>+  ---------------------------------------------------------------------------*/</div><div class='add'>+static int me4000_probe(struct pci_dev *dev, const struct pci_device_id *id);</div><div class='add'>+static int me4000_xilinx_download(me4000_info_t *);</div><div class='add'>+static int me4000_reset_board(me4000_info_t *);</div><div class='add'>+</div><div class='add'>+static void clear_board_info_list(void);</div><div class='add'>+static int get_registers(struct pci_dev *dev, me4000_info_t * info);</div><div class='add'>+static int init_board_info(struct pci_dev *dev, me4000_info_t * board_info);</div><div class='add'>+static int alloc_ao_contexts(me4000_info_t * info);</div><div class='add'>+static void release_ao_contexts(me4000_info_t * board_info);</div><div class='add'>+static int alloc_ai_context(me4000_info_t * info);</div><div class='add'>+static int alloc_dio_context(me4000_info_t * info);</div><div class='add'>+static int alloc_cnt_context(me4000_info_t * info);</div><div class='add'>+static int alloc_ext_int_context(me4000_info_t * info);</div><div class='add'>+</div><div class='add'>+/*-----------------------------------------------------------------------------</div><div class='add'>+  Stuff used by all device parts</div><div class='add'>+  ---------------------------------------------------------------------------*/</div><div class='add'>+static int me4000_open(struct inode *, struct file *);</div><div class='add'>+static int me4000_release(struct inode *, struct file *);</div><div class='add'>+</div><div class='add'>+static int me4000_get_user_info(me4000_user_info_t *,</div><div class='add'>+				me4000_info_t * board_info);</div><div class='add'>+static int me4000_read_procmem(char *, char **, off_t, int, int *, void *);</div><div class='add'>+</div><div class='add'>+/*-----------------------------------------------------------------------------</div><div class='add'>+  Analog output stuff</div><div class='add'>+  ---------------------------------------------------------------------------*/</div><div class='add'>+static ssize_t me4000_ao_write_sing(struct file *, const char *, size_t,</div><div class='add'>+				    loff_t *);</div><div class='add'>+static ssize_t me4000_ao_write_wrap(struct file *, const char *, size_t,</div><div class='add'>+				    loff_t *);</div><div class='add'>+static ssize_t me4000_ao_write_cont(struct file *, const char *, size_t,</div><div class='add'>+				    loff_t *);</div><div class='add'>+</div><div class='add'>+static int me4000_ao_ioctl_sing(struct inode *, struct file *, unsigned int,</div><div class='add'>+				unsigned long);</div><div class='add'>+static int me4000_ao_ioctl_wrap(struct inode *, struct file *, unsigned int,</div><div class='add'>+				unsigned long);</div><div class='add'>+static int me4000_ao_ioctl_cont(struct inode *, struct file *, unsigned int,</div><div class='add'>+				unsigned long);</div><div class='add'>+</div><div class='add'>+static unsigned int me4000_ao_poll_cont(struct file *, poll_table *);</div><div class='add'>+static int me4000_ao_fsync_cont(struct file *, struct dentry *, int);</div><div class='add'>+</div><div class='add'>+static int me4000_ao_start(unsigned long *, me4000_ao_context_t *);</div><div class='add'>+static int me4000_ao_stop(me4000_ao_context_t *);</div><div class='add'>+static int me4000_ao_immediate_stop(me4000_ao_context_t *);</div><div class='add'>+static int me4000_ao_timer_set_divisor(u32 *, me4000_ao_context_t *);</div><div class='add'>+static int me4000_ao_preload(me4000_ao_context_t *);</div><div class='add'>+static int me4000_ao_preload_update(me4000_ao_context_t *);</div><div class='add'>+static int me4000_ao_ex_trig_set_edge(int *, me4000_ao_context_t *);</div><div class='add'>+static int me4000_ao_ex_trig_enable(me4000_ao_context_t *);</div><div class='add'>+static int me4000_ao_ex_trig_disable(me4000_ao_context_t *);</div><div class='add'>+static int me4000_ao_prepare(me4000_ao_context_t * ao_info);</div><div class='add'>+static int me4000_ao_reset(me4000_ao_context_t * ao_info);</div><div class='add'>+static int me4000_ao_enable_do(me4000_ao_context_t *);</div><div class='add'>+static int me4000_ao_disable_do(me4000_ao_context_t *);</div><div class='add'>+static int me4000_ao_fsm_state(int *, me4000_ao_context_t *);</div><div class='add'>+</div><div class='add'>+static int me4000_ao_simultaneous_ex_trig(me4000_ao_context_t * ao_context);</div><div class='add'>+static int me4000_ao_simultaneous_sw(me4000_ao_context_t * ao_context);</div><div class='add'>+static int me4000_ao_simultaneous_disable(me4000_ao_context_t * ao_context);</div><div class='add'>+static int me4000_ao_simultaneous_update(me4000_ao_channel_list_t * channels,</div><div class='add'>+					 me4000_ao_context_t * ao_context);</div><div class='add'>+</div><div class='add'>+static int me4000_ao_synchronous_ex_trig(me4000_ao_context_t * ao_context);</div><div class='add'>+static int me4000_ao_synchronous_sw(me4000_ao_context_t * ao_context);</div><div class='add'>+static int me4000_ao_synchronous_disable(me4000_ao_context_t * ao_context);</div><div class='add'>+</div><div class='add'>+static int me4000_ao_ex_trig_timeout(unsigned long *arg,</div><div class='add'>+				     me4000_ao_context_t * ao_context);</div><div class='add'>+static int me4000_ao_get_free_buffer(unsigned long *arg,</div><div class='add'>+				     me4000_ao_context_t * ao_context);</div><div class='add'>+</div><div class='add'>+/*-----------------------------------------------------------------------------</div><div class='add'>+  Analog input stuff</div><div class='add'>+  ---------------------------------------------------------------------------*/</div><div class='add'>+static int me4000_ai_single(me4000_ai_single_t *, me4000_ai_context_t *);</div><div class='add'>+static int me4000_ai_ioctl_sing(struct inode *, struct file *, unsigned int,</div><div class='add'>+				unsigned long);</div><div class='add'>+</div><div class='add'>+static ssize_t me4000_ai_read(struct file *, char *, size_t, loff_t *);</div><div class='add'>+static int me4000_ai_ioctl_sw(struct inode *, struct file *, unsigned int,</div><div class='add'>+			      unsigned long);</div><div class='add'>+static unsigned int me4000_ai_poll(struct file *, poll_table *);</div><div class='add'>+static int me4000_ai_fasync(int fd, struct file *file_p, int mode);</div><div class='add'>+</div><div class='add'>+static int me4000_ai_ioctl_ext(struct inode *, struct file *, unsigned int,</div><div class='add'>+			       unsigned long);</div><div class='add'>+</div><div class='add'>+static int me4000_ai_prepare(me4000_ai_context_t * ai_context);</div><div class='add'>+static int me4000_ai_reset(me4000_ai_context_t * ai_context);</div><div class='add'>+static int me4000_ai_config(me4000_ai_config_t *, me4000_ai_context_t *);</div><div class='add'>+static int me4000_ai_start(me4000_ai_context_t *);</div><div class='add'>+static int me4000_ai_start_ex(unsigned long *, me4000_ai_context_t *);</div><div class='add'>+static int me4000_ai_stop(me4000_ai_context_t *);</div><div class='add'>+static int me4000_ai_immediate_stop(me4000_ai_context_t *);</div><div class='add'>+static int me4000_ai_ex_trig_enable(me4000_ai_context_t *);</div><div class='add'>+static int me4000_ai_ex_trig_disable(me4000_ai_context_t *);</div><div class='add'>+static int me4000_ai_ex_trig_setup(me4000_ai_trigger_t *,</div><div class='add'>+				   me4000_ai_context_t *);</div><div class='add'>+static int me4000_ai_sc_setup(me4000_ai_sc_t * arg,</div><div class='add'>+			      me4000_ai_context_t * ai_context);</div><div class='add'>+static int me4000_ai_offset_enable(me4000_ai_context_t * ai_context);</div><div class='add'>+static int me4000_ai_offset_disable(me4000_ai_context_t * ai_context);</div><div class='add'>+static int me4000_ai_fullscale_enable(me4000_ai_context_t * ai_context);</div><div class='add'>+static int me4000_ai_fullscale_disable(me4000_ai_context_t * ai_context);</div><div class='add'>+static int me4000_ai_fsm_state(int *arg, me4000_ai_context_t * ai_context);</div><div class='add'>+static int me4000_ai_get_count_buffer(unsigned long *arg,</div><div class='add'>+				      me4000_ai_context_t * ai_context);</div><div class='add'>+</div><div class='add'>+/*-----------------------------------------------------------------------------</div><div class='add'>+  EEPROM stuff</div><div class='add'>+  ---------------------------------------------------------------------------*/</div><div class='add'>+static int me4000_eeprom_read(me4000_eeprom_t * arg,</div><div class='add'>+			      me4000_ai_context_t * ai_context);</div><div class='add'>+static int me4000_eeprom_write(me4000_eeprom_t * arg,</div><div class='add'>+			       me4000_ai_context_t * ai_context);</div><div class='add'>+static unsigned short eeprom_read_cmd(me4000_ai_context_t * ai_context,</div><div class='add'>+				      unsigned long cmd, int length);</div><div class='add'>+static int eeprom_write_cmd(me4000_ai_context_t * ai_context, unsigned long cmd,</div><div class='add'>+			    int length);</div><div class='add'>+</div><div class='add'>+/*-----------------------------------------------------------------------------</div><div class='add'>+  Digital I/O stuff</div><div class='add'>+  ---------------------------------------------------------------------------*/</div><div class='add'>+static int me4000_dio_ioctl(struct inode *, struct file *, unsigned int,</div><div class='add'>+			    unsigned long);</div><div class='add'>+static int me4000_dio_config(me4000_dio_config_t *, me4000_dio_context_t *);</div><div class='add'>+static int me4000_dio_get_byte(me4000_dio_byte_t *, me4000_dio_context_t *);</div><div class='add'>+static int me4000_dio_set_byte(me4000_dio_byte_t *, me4000_dio_context_t *);</div><div class='add'>+static int me4000_dio_reset(me4000_dio_context_t *);</div><div class='add'>+</div><div class='add'>+/*-----------------------------------------------------------------------------</div><div class='add'>+  Counter stuff</div><div class='add'>+  ---------------------------------------------------------------------------*/</div><div class='add'>+static int me4000_cnt_ioctl(struct inode *, struct file *, unsigned int,</div><div class='add'>+			    unsigned long);</div><div class='add'>+static int me4000_cnt_config(me4000_cnt_config_t *, me4000_cnt_context_t *);</div><div class='add'>+static int me4000_cnt_read(me4000_cnt_t *, me4000_cnt_context_t *);</div><div class='add'>+static int me4000_cnt_write(me4000_cnt_t *, me4000_cnt_context_t *);</div><div class='add'>+static int me4000_cnt_reset(me4000_cnt_context_t *);</div><div class='add'>+</div><div class='add'>+/*-----------------------------------------------------------------------------</div><div class='add'>+  External interrupt routines</div><div class='add'>+  ---------------------------------------------------------------------------*/</div><div class='add'>+static int me4000_ext_int_ioctl(struct inode *, struct file *, unsigned int,</div><div class='add'>+				unsigned long);</div><div class='add'>+static int me4000_ext_int_enable(me4000_ext_int_context_t *);</div><div class='add'>+static int me4000_ext_int_disable(me4000_ext_int_context_t *);</div><div class='add'>+static int me4000_ext_int_count(unsigned long *arg,</div><div class='add'>+				me4000_ext_int_context_t * ext_int_context);</div><div class='add'>+static int me4000_ext_int_fasync(int fd, struct file *file_ptr, int mode);</div><div class='add'>+</div><div class='add'>+/*-----------------------------------------------------------------------------</div><div class='add'>+  The interrupt service routines</div><div class='add'>+  ---------------------------------------------------------------------------*/</div><div class='add'>+static irqreturn_t me4000_ao_isr(int, void *);</div><div class='add'>+static irqreturn_t me4000_ai_isr(int, void *);</div><div class='add'>+static irqreturn_t me4000_ext_int_isr(int, void *);</div><div class='add'>+</div><div class='add'>+/*-----------------------------------------------------------------------------</div><div class='add'>+  Inline functions</div><div class='add'>+  ---------------------------------------------------------------------------*/</div><div class='add'>+static int inline me4000_buf_count(me4000_circ_buf_t, int);</div><div class='add'>+static int inline me4000_buf_space(me4000_circ_buf_t, int);</div><div class='add'>+static int inline me4000_space_to_end(me4000_circ_buf_t, int);</div><div class='add'>+static int inline me4000_values_to_end(me4000_circ_buf_t, int);</div><div class='add'>+</div><div class='add'>+static void inline me4000_outb(unsigned char value, unsigned long port);</div><div class='add'>+static void inline me4000_outl(unsigned long value, unsigned long port);</div><div class='add'>+static unsigned long inline me4000_inl(unsigned long port);</div><div class='add'>+static unsigned char inline me4000_inb(unsigned long port);</div><div class='add'>+</div><div class='add'>+static int me4000_buf_count(me4000_circ_buf_t buf, int size)</div><div class='add'>+{</div><div class='add'>+	return ((buf.head - buf.tail) &amp; (size - 1));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int me4000_buf_space(me4000_circ_buf_t buf, int size)</div><div class='add'>+{</div><div class='add'>+	return ((buf.tail - (buf.head + 1)) &amp; (size - 1));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int me4000_values_to_end(me4000_circ_buf_t buf, int size)</div><div class='add'>+{</div><div class='add'>+	int end;</div><div class='add'>+	int n;</div><div class='add'>+	end = size - buf.tail;</div><div class='add'>+	n = (buf.head + end) &amp; (size - 1);</div><div class='add'>+	return (n &lt; end) ? n : end;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int me4000_space_to_end(me4000_circ_buf_t buf, int size)</div><div class='add'>+{</div><div class='add'>+	int end;</div><div class='add'>+	int n;</div><div class='add'>+</div><div class='add'>+	end = size - 1 - buf.head;</div><div class='add'>+	n = (end + buf.tail) &amp; (size - 1);</div><div class='add'>+	return (n &lt;= end) ? n : (end + 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void me4000_outb(unsigned char value, unsigned long port)</div><div class='add'>+{</div><div class='add'>+	PORT_PDEBUG("--&gt; 0x%02X port 0x%04lX\n", value, port);</div><div class='add'>+	outb(value, port);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void me4000_outl(unsigned long value, unsigned long port)</div><div class='add'>+{</div><div class='add'>+	PORT_PDEBUG("--&gt; 0x%08lX port 0x%04lX\n", value, port);</div><div class='add'>+	outl(value, port);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned long me4000_inl(unsigned long port)</div><div class='add'>+{</div><div class='add'>+	unsigned long value;</div><div class='add'>+	value = inl(port);</div><div class='add'>+	PORT_PDEBUG("&lt;-- 0x%08lX port 0x%04lX\n", value, port);</div><div class='add'>+	return value;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned char me4000_inb(unsigned long port)</div><div class='add'>+{</div><div class='add'>+	unsigned char value;</div><div class='add'>+	value = inb(port);</div><div class='add'>+	PORT_PDEBUG("&lt;-- 0x%08X port 0x%04lX\n", value, port);</div><div class='add'>+	return value;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct pci_driver me4000_driver = {</div><div class='add'>+	.name = ME4000_NAME,</div><div class='add'>+	.id_table = me4000_pci_table,</div><div class='add'>+	.probe = me4000_probe</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct file_operations me4000_ao_fops_sing = {</div><div class='add'>+      owner:THIS_MODULE,</div><div class='add'>+      write:me4000_ao_write_sing,</div><div class='add'>+      ioctl:me4000_ao_ioctl_sing,</div><div class='add'>+      open:me4000_open,</div><div class='add'>+      release:me4000_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct file_operations me4000_ao_fops_wrap = {</div><div class='add'>+      owner:THIS_MODULE,</div><div class='add'>+      write:me4000_ao_write_wrap,</div><div class='add'>+      ioctl:me4000_ao_ioctl_wrap,</div><div class='add'>+      open:me4000_open,</div><div class='add'>+      release:me4000_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct file_operations me4000_ao_fops_cont = {</div><div class='add'>+      owner:THIS_MODULE,</div><div class='add'>+      write:me4000_ao_write_cont,</div><div class='add'>+      poll:me4000_ao_poll_cont,</div><div class='add'>+      ioctl:me4000_ao_ioctl_cont,</div><div class='add'>+      open:me4000_open,</div><div class='add'>+      release:me4000_release,</div><div class='add'>+      fsync:me4000_ao_fsync_cont,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct file_operations me4000_ai_fops_sing = {</div><div class='add'>+      owner:THIS_MODULE,</div><div class='add'>+      ioctl:me4000_ai_ioctl_sing,</div><div class='add'>+      open:me4000_open,</div><div class='add'>+      release:me4000_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct file_operations me4000_ai_fops_cont_sw = {</div><div class='add'>+      owner:THIS_MODULE,</div><div class='add'>+      read:me4000_ai_read,</div><div class='add'>+      poll:me4000_ai_poll,</div><div class='add'>+      ioctl:me4000_ai_ioctl_sw,</div><div class='add'>+      open:me4000_open,</div><div class='add'>+      release:me4000_release,</div><div class='add'>+      fasync:me4000_ai_fasync,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct file_operations me4000_ai_fops_cont_et = {</div><div class='add'>+      owner:THIS_MODULE,</div><div class='add'>+      read:me4000_ai_read,</div><div class='add'>+      poll:me4000_ai_poll,</div><div class='add'>+      ioctl:me4000_ai_ioctl_ext,</div><div class='add'>+      open:me4000_open,</div><div class='add'>+      release:me4000_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct file_operations me4000_ai_fops_cont_et_value = {</div><div class='add'>+      owner:THIS_MODULE,</div><div class='add'>+      read:me4000_ai_read,</div><div class='add'>+      poll:me4000_ai_poll,</div><div class='add'>+      ioctl:me4000_ai_ioctl_ext,</div><div class='add'>+      open:me4000_open,</div><div class='add'>+      release:me4000_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct file_operations me4000_ai_fops_cont_et_chanlist = {</div><div class='add'>+      owner:THIS_MODULE,</div><div class='add'>+      read:me4000_ai_read,</div><div class='add'>+      poll:me4000_ai_poll,</div><div class='add'>+      ioctl:me4000_ai_ioctl_ext,</div><div class='add'>+      open:me4000_open,</div><div class='add'>+      release:me4000_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct file_operations me4000_dio_fops = {</div><div class='add'>+      owner:THIS_MODULE,</div><div class='add'>+      ioctl:me4000_dio_ioctl,</div><div class='add'>+      open:me4000_open,</div><div class='add'>+      release:me4000_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct file_operations me4000_cnt_fops = {</div><div class='add'>+      owner:THIS_MODULE,</div><div class='add'>+      ioctl:me4000_cnt_ioctl,</div><div class='add'>+      open:me4000_open,</div><div class='add'>+      release:me4000_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct file_operations me4000_ext_int_fops = {</div><div class='add'>+      owner:THIS_MODULE,</div><div class='add'>+      ioctl:me4000_ext_int_ioctl,</div><div class='add'>+      open:me4000_open,</div><div class='add'>+      release:me4000_release,</div><div class='add'>+      fasync:me4000_ext_int_fasync,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct file_operations *me4000_ao_fops_array[] = {</div><div class='add'>+	&amp;me4000_ao_fops_sing,	// single operations</div><div class='add'>+	&amp;me4000_ao_fops_wrap,	// wraparound operations</div><div class='add'>+	&amp;me4000_ao_fops_cont,	// continous operations</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct file_operations *me4000_ai_fops_array[] = {</div><div class='add'>+	&amp;me4000_ai_fops_sing,	// single operations</div><div class='add'>+	&amp;me4000_ai_fops_cont_sw,	// continuous operations with software start</div><div class='add'>+	&amp;me4000_ai_fops_cont_et,	// continous operations with external trigger</div><div class='add'>+	&amp;me4000_ai_fops_cont_et_value,	// sample values by external trigger</div><div class='add'>+	&amp;me4000_ai_fops_cont_et_chanlist,	// work through one channel list by external trigger</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int __init me4000_init_module(void)</div><div class='add'>+{</div><div class='add'>+	int result = 0;</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("init_module() is executed\n");</div><div class='add'>+</div><div class='add'>+	/* Register driver capabilities */</div><div class='add'>+	result = pci_register_driver(&amp;me4000_driver);</div><div class='add'>+	PDEBUG("init_module():%d devices detected\n", result);</div><div class='add'>+	if (result &lt; 0) {</div><div class='add'>+		printk(KERN_ERR "ME4000:init_module():Can't register driver\n");</div><div class='add'>+		goto INIT_ERROR_1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Allocate major number for analog output */</div><div class='add'>+	result =</div><div class='add'>+	    register_chrdev(me4000_ao_major_driver_no, ME4000_AO_NAME,</div><div class='add'>+			    &amp;me4000_ao_fops_sing);</div><div class='add'>+	if (result &lt; 0) {</div><div class='add'>+		printk(KERN_ERR "ME4000:init_module():Can't get AO major no\n");</div><div class='add'>+		goto INIT_ERROR_2;</div><div class='add'>+	} else {</div><div class='add'>+		me4000_ao_major_driver_no = result;</div><div class='add'>+	}</div><div class='add'>+	PDEBUG("init_module():Major driver number for AO = %ld\n",</div><div class='add'>+	       me4000_ao_major_driver_no);</div><div class='add'>+</div><div class='add'>+	/* Allocate major number for analog input  */</div><div class='add'>+	result =</div><div class='add'>+	    register_chrdev(me4000_ai_major_driver_no, ME4000_AI_NAME,</div><div class='add'>+			    &amp;me4000_ai_fops_sing);</div><div class='add'>+	if (result &lt; 0) {</div><div class='add'>+		printk(KERN_ERR "ME4000:init_module():Can't get AI major no\n");</div><div class='add'>+		goto INIT_ERROR_3;</div><div class='add'>+	} else {</div><div class='add'>+		me4000_ai_major_driver_no = result;</div><div class='add'>+	}</div><div class='add'>+	PDEBUG("init_module():Major driver number for AI = %ld\n",</div><div class='add'>+	       me4000_ai_major_driver_no);</div><div class='add'>+</div><div class='add'>+	/* Allocate major number for digital I/O */</div><div class='add'>+	result =</div><div class='add'>+	    register_chrdev(me4000_dio_major_driver_no, ME4000_DIO_NAME,</div><div class='add'>+			    &amp;me4000_dio_fops);</div><div class='add'>+	if (result &lt; 0) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "ME4000:init_module():Can't get DIO major no\n");</div><div class='add'>+		goto INIT_ERROR_4;</div><div class='add'>+	} else {</div><div class='add'>+		me4000_dio_major_driver_no = result;</div><div class='add'>+	}</div><div class='add'>+	PDEBUG("init_module():Major driver number for DIO = %ld\n",</div><div class='add'>+	       me4000_dio_major_driver_no);</div><div class='add'>+</div><div class='add'>+	/* Allocate major number for counter */</div><div class='add'>+	result =</div><div class='add'>+	    register_chrdev(me4000_cnt_major_driver_no, ME4000_CNT_NAME,</div><div class='add'>+			    &amp;me4000_cnt_fops);</div><div class='add'>+	if (result &lt; 0) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "ME4000:init_module():Can't get CNT major no\n");</div><div class='add'>+		goto INIT_ERROR_5;</div><div class='add'>+	} else {</div><div class='add'>+		me4000_cnt_major_driver_no = result;</div><div class='add'>+	}</div><div class='add'>+	PDEBUG("init_module():Major driver number for CNT = %ld\n",</div><div class='add'>+	       me4000_cnt_major_driver_no);</div><div class='add'>+</div><div class='add'>+	/* Allocate major number for external interrupt */</div><div class='add'>+	result =</div><div class='add'>+	    register_chrdev(me4000_ext_int_major_driver_no, ME4000_EXT_INT_NAME,</div><div class='add'>+			    &amp;me4000_ext_int_fops);</div><div class='add'>+	if (result &lt; 0) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "ME4000:init_module():Can't get major no for external interrupt\n");</div><div class='add'>+		goto INIT_ERROR_6;</div><div class='add'>+	} else {</div><div class='add'>+		me4000_ext_int_major_driver_no = result;</div><div class='add'>+	}</div><div class='add'>+	PDEBUG</div><div class='add'>+	    ("init_module():Major driver number for external interrupt = %ld\n",</div><div class='add'>+	     me4000_ext_int_major_driver_no);</div><div class='add'>+</div><div class='add'>+	/* Create the /proc/me4000 entry */</div><div class='add'>+	if (!create_proc_read_entry</div><div class='add'>+	    ("me4000", 0, NULL, me4000_read_procmem, NULL)) {</div><div class='add'>+		result = -ENODEV;</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "ME4000:init_module():Can't create proc entry\n");</div><div class='add'>+		goto INIT_ERROR_7;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+      INIT_ERROR_7:</div><div class='add'>+	unregister_chrdev(me4000_ext_int_major_driver_no, ME4000_EXT_INT_NAME);</div><div class='add'>+</div><div class='add'>+      INIT_ERROR_6:</div><div class='add'>+	unregister_chrdev(me4000_cnt_major_driver_no, ME4000_CNT_NAME);</div><div class='add'>+</div><div class='add'>+      INIT_ERROR_5:</div><div class='add'>+	unregister_chrdev(me4000_dio_major_driver_no, ME4000_DIO_NAME);</div><div class='add'>+</div><div class='add'>+      INIT_ERROR_4:</div><div class='add'>+	unregister_chrdev(me4000_ai_major_driver_no, ME4000_AI_NAME);</div><div class='add'>+</div><div class='add'>+      INIT_ERROR_3:</div><div class='add'>+	unregister_chrdev(me4000_ao_major_driver_no, ME4000_AO_NAME);</div><div class='add'>+</div><div class='add'>+      INIT_ERROR_2:</div><div class='add'>+	pci_unregister_driver(&amp;me4000_driver);</div><div class='add'>+	clear_board_info_list();</div><div class='add'>+</div><div class='add'>+      INIT_ERROR_1:</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(me4000_init_module);</div><div class='add'>+</div><div class='add'>+static void clear_board_info_list(void)</div><div class='add'>+{</div><div class='add'>+	struct list_head *board_p;</div><div class='add'>+	struct list_head *dac_p;</div><div class='add'>+	me4000_info_t *board_info;</div><div class='add'>+	me4000_ao_context_t *ao_context;</div><div class='add'>+</div><div class='add'>+	/* Clear context lists */</div><div class='add'>+	for (board_p = me4000_board_info_list.next;</div><div class='add'>+	     board_p != &amp;me4000_board_info_list; board_p = board_p-&gt;next) {</div><div class='add'>+		board_info = list_entry(board_p, me4000_info_t, list);</div><div class='add'>+		/* Clear analog output context list */</div><div class='add'>+		while (!list_empty(&amp;board_info-&gt;ao_context_list)) {</div><div class='add'>+			dac_p = board_info-&gt;ao_context_list.next;</div><div class='add'>+			ao_context =</div><div class='add'>+			    list_entry(dac_p, me4000_ao_context_t, list);</div><div class='add'>+			me4000_ao_reset(ao_context);</div><div class='add'>+			free_irq(ao_context-&gt;irq, ao_context);</div><div class='add'>+			if (ao_context-&gt;circ_buf.buf)</div><div class='add'>+				kfree(ao_context-&gt;circ_buf.buf);</div><div class='add'>+			list_del(dac_p);</div><div class='add'>+			kfree(ao_context);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Clear analog input context */</div><div class='add'>+		if (board_info-&gt;ai_context-&gt;circ_buf.buf)</div><div class='add'>+			kfree(board_info-&gt;ai_context-&gt;circ_buf.buf);</div><div class='add'>+		kfree(board_info-&gt;ai_context);</div><div class='add'>+</div><div class='add'>+		/* Clear digital I/O context */</div><div class='add'>+		kfree(board_info-&gt;dio_context);</div><div class='add'>+</div><div class='add'>+		/* Clear counter context */</div><div class='add'>+		kfree(board_info-&gt;cnt_context);</div><div class='add'>+</div><div class='add'>+		/* Clear external interrupt context */</div><div class='add'>+		kfree(board_info-&gt;ext_int_context);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Clear the board info list */</div><div class='add'>+	while (!list_empty(&amp;me4000_board_info_list)) {</div><div class='add'>+		board_p = me4000_board_info_list.next;</div><div class='add'>+		board_info = list_entry(board_p, me4000_info_t, list);</div><div class='add'>+		pci_release_regions(board_info-&gt;pci_dev_p);</div><div class='add'>+		list_del(board_p);</div><div class='add'>+		kfree(board_info);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int get_registers(struct pci_dev *dev, me4000_info_t * board_info)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	/*--------------------------- plx regbase ---------------------------------*/</div><div class='add'>+</div><div class='add'>+	board_info-&gt;plx_regbase = pci_resource_start(dev, 1);</div><div class='add'>+	if (board_info-&gt;plx_regbase == 0) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "ME4000:get_registers():PCI base address 1 is not available\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+	board_info-&gt;plx_regbase_size = pci_resource_len(dev, 1);</div><div class='add'>+</div><div class='add'>+	PDEBUG</div><div class='add'>+	    ("get_registers():PLX configuration registers at address 0x%4lX [0x%4lX]\n",</div><div class='add'>+	     board_info-&gt;plx_regbase, board_info-&gt;plx_regbase_size);</div><div class='add'>+</div><div class='add'>+	/*--------------------------- me4000 regbase ------------------------------*/</div><div class='add'>+</div><div class='add'>+	board_info-&gt;me4000_regbase = pci_resource_start(dev, 2);</div><div class='add'>+	if (board_info-&gt;me4000_regbase == 0) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "ME4000:get_registers():PCI base address 2 is not available\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+	board_info-&gt;me4000_regbase_size = pci_resource_len(dev, 2);</div><div class='add'>+</div><div class='add'>+	PDEBUG("get_registers():ME4000 registers at address 0x%4lX [0x%4lX]\n",</div><div class='add'>+	       board_info-&gt;me4000_regbase, board_info-&gt;me4000_regbase_size);</div><div class='add'>+</div><div class='add'>+	/*--------------------------- timer regbase ------------------------------*/</div><div class='add'>+</div><div class='add'>+	board_info-&gt;timer_regbase = pci_resource_start(dev, 3);</div><div class='add'>+	if (board_info-&gt;timer_regbase == 0) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "ME4000:get_registers():PCI base address 3 is not available\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+	board_info-&gt;timer_regbase_size = pci_resource_len(dev, 3);</div><div class='add'>+</div><div class='add'>+	PDEBUG("get_registers():Timer registers at address 0x%4lX [0x%4lX]\n",</div><div class='add'>+	       board_info-&gt;timer_regbase, board_info-&gt;timer_regbase_size);</div><div class='add'>+</div><div class='add'>+	/*--------------------------- program regbase ------------------------------*/</div><div class='add'>+</div><div class='add'>+	board_info-&gt;program_regbase = pci_resource_start(dev, 5);</div><div class='add'>+	if (board_info-&gt;program_regbase == 0) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "get_registers():ME4000:PCI base address 5 is not available\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+	board_info-&gt;program_regbase_size = pci_resource_len(dev, 5);</div><div class='add'>+</div><div class='add'>+	PDEBUG("get_registers():Program registers at address 0x%4lX [0x%4lX]\n",</div><div class='add'>+	       board_info-&gt;program_regbase, board_info-&gt;program_regbase_size);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int init_board_info(struct pci_dev *pci_dev_p,</div><div class='add'>+			   me4000_info_t * board_info)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	int result;</div><div class='add'>+	struct list_head *board_p;</div><div class='add'>+	board_info-&gt;pci_dev_p = pci_dev_p;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ME4000_BOARD_VERSIONS; i++) {</div><div class='add'>+		if (me4000_boards[i].device_id == pci_dev_p-&gt;device) {</div><div class='add'>+			board_info-&gt;board_p = &amp;me4000_boards[i];</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (i == ME4000_BOARD_VERSIONS) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "ME4000:init_board_info():Device ID not valid\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Get the index of the board in the global list */</div><div class='add'>+	for (board_p = me4000_board_info_list.next, i = 0;</div><div class='add'>+	     board_p != &amp;me4000_board_info_list; board_p = board_p-&gt;next, i++) {</div><div class='add'>+		if (board_p == &amp;board_info-&gt;list) {</div><div class='add'>+			board_info-&gt;board_count = i;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (board_p == &amp;me4000_board_info_list) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "ME4000:init_board_info():Cannot get index of baord\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Init list head for analog output contexts */</div><div class='add'>+	INIT_LIST_HEAD(&amp;board_info-&gt;ao_context_list);</div><div class='add'>+</div><div class='add'>+	/* Init spin locks */</div><div class='add'>+	spin_lock_init(&amp;board_info-&gt;preload_lock);</div><div class='add'>+	spin_lock_init(&amp;board_info-&gt;ai_ctrl_lock);</div><div class='add'>+</div><div class='add'>+	/* Get the serial number */</div><div class='add'>+	result = pci_read_config_dword(pci_dev_p, 0x2C, &amp;board_info-&gt;serial_no);</div><div class='add'>+	if (result != PCIBIOS_SUCCESSFUL) {</div><div class='add'>+		printk(KERN_WARNING</div><div class='add'>+		       "ME4000:init_board_info: Can't get serial_no\n");</div><div class='add'>+		return result;</div><div class='add'>+	}</div><div class='add'>+	PDEBUG("init_board_info():serial_no = 0x%x\n", board_info-&gt;serial_no);</div><div class='add'>+</div><div class='add'>+	/* Get the hardware revision */</div><div class='add'>+	result =</div><div class='add'>+	    pci_read_config_byte(pci_dev_p, 0x08, &amp;board_info-&gt;hw_revision);</div><div class='add'>+	if (result != PCIBIOS_SUCCESSFUL) {</div><div class='add'>+		printk(KERN_WARNING</div><div class='add'>+		       "ME4000:init_board_info():Can't get hw_revision\n");</div><div class='add'>+		return result;</div><div class='add'>+	}</div><div class='add'>+	PDEBUG("init_board_info():hw_revision = 0x%x\n",</div><div class='add'>+	       board_info-&gt;hw_revision);</div><div class='add'>+</div><div class='add'>+	/* Get the vendor id */</div><div class='add'>+	board_info-&gt;vendor_id = pci_dev_p-&gt;vendor;</div><div class='add'>+	PDEBUG("init_board_info():vendor_id = 0x%x\n", board_info-&gt;vendor_id);</div><div class='add'>+</div><div class='add'>+	/* Get the device id */</div><div class='add'>+	board_info-&gt;device_id = pci_dev_p-&gt;device;</div><div class='add'>+	PDEBUG("init_board_info():device_id = 0x%x\n", board_info-&gt;device_id);</div><div class='add'>+</div><div class='add'>+	/* Get the pci device number */</div><div class='add'>+	board_info-&gt;pci_dev_no = PCI_FUNC(pci_dev_p-&gt;devfn);</div><div class='add'>+	PDEBUG("init_board_info():pci_func_no = 0x%x\n",</div><div class='add'>+	       board_info-&gt;pci_func_no);</div><div class='add'>+</div><div class='add'>+	/* Get the pci slot number */</div><div class='add'>+	board_info-&gt;pci_dev_no = PCI_SLOT(pci_dev_p-&gt;devfn);</div><div class='add'>+	PDEBUG("init_board_info():pci_dev_no = 0x%x\n", board_info-&gt;pci_dev_no);</div><div class='add'>+</div><div class='add'>+	/* Get the pci bus number */</div><div class='add'>+	board_info-&gt;pci_bus_no = pci_dev_p-&gt;bus-&gt;number;</div><div class='add'>+	PDEBUG("init_board_info():pci_bus_no = 0x%x\n", board_info-&gt;pci_bus_no);</div><div class='add'>+</div><div class='add'>+	/* Get the irq assigned to the board */</div><div class='add'>+	board_info-&gt;irq = pci_dev_p-&gt;irq;</div><div class='add'>+	PDEBUG("init_board_info():irq = %d\n", board_info-&gt;irq);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int alloc_ao_contexts(me4000_info_t * info)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	int err;</div><div class='add'>+	me4000_ao_context_t *ao_context;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; info-&gt;board_p-&gt;ao.count; i++) {</div><div class='add'>+		ao_context = kmalloc(sizeof(me4000_ao_context_t), GFP_KERNEL);</div><div class='add'>+		if (!ao_context) {</div><div class='add'>+			printk(KERN_ERR</div><div class='add'>+			       "alloc_ao_contexts():Can't get memory for ao context\n");</div><div class='add'>+			release_ao_contexts(info);</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+		memset(ao_context, 0, sizeof(me4000_ao_context_t));</div><div class='add'>+</div><div class='add'>+		spin_lock_init(&amp;ao_context-&gt;use_lock);</div><div class='add'>+		spin_lock_init(&amp;ao_context-&gt;int_lock);</div><div class='add'>+		ao_context-&gt;irq = info-&gt;irq;</div><div class='add'>+		init_waitqueue_head(&amp;ao_context-&gt;wait_queue);</div><div class='add'>+		ao_context-&gt;board_info = info;</div><div class='add'>+</div><div class='add'>+		if (info-&gt;board_p-&gt;ao.fifo_count) {</div><div class='add'>+			/* Allocate circular buffer */</div><div class='add'>+			ao_context-&gt;circ_buf.buf =</div><div class='add'>+			    kmalloc(ME4000_AO_BUFFER_SIZE, GFP_KERNEL);</div><div class='add'>+			if (!ao_context-&gt;circ_buf.buf) {</div><div class='add'>+				printk(KERN_ERR</div><div class='add'>+				       "alloc_ao_contexts():Can't get circular buffer\n");</div><div class='add'>+				release_ao_contexts(info);</div><div class='add'>+				return -ENOMEM;</div><div class='add'>+			}</div><div class='add'>+			memset(ao_context-&gt;circ_buf.buf, 0,</div><div class='add'>+			       ME4000_AO_BUFFER_SIZE);</div><div class='add'>+</div><div class='add'>+			/* Clear the circular buffer */</div><div class='add'>+			ao_context-&gt;circ_buf.head = 0;</div><div class='add'>+			ao_context-&gt;circ_buf.tail = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		switch (i) {</div><div class='add'>+		case 0:</div><div class='add'>+			ao_context-&gt;ctrl_reg =</div><div class='add'>+			    info-&gt;me4000_regbase + ME4000_AO_00_CTRL_REG;</div><div class='add'>+			ao_context-&gt;status_reg =</div><div class='add'>+			    info-&gt;me4000_regbase + ME4000_AO_00_STATUS_REG;</div><div class='add'>+			ao_context-&gt;fifo_reg =</div><div class='add'>+			    info-&gt;me4000_regbase + ME4000_AO_00_FIFO_REG;</div><div class='add'>+			ao_context-&gt;single_reg =</div><div class='add'>+			    info-&gt;me4000_regbase + ME4000_AO_00_SINGLE_REG;</div><div class='add'>+			ao_context-&gt;timer_reg =</div><div class='add'>+			    info-&gt;me4000_regbase + ME4000_AO_00_TIMER_REG;</div><div class='add'>+			ao_context-&gt;irq_status_reg =</div><div class='add'>+			    info-&gt;me4000_regbase + ME4000_IRQ_STATUS_REG;</div><div class='add'>+			ao_context-&gt;preload_reg =</div><div class='add'>+			    info-&gt;me4000_regbase + ME4000_AO_LOADSETREG_XX;</div><div class='add'>+			break;</div><div class='add'>+		case 1:</div><div class='add'>+			ao_context-&gt;ctrl_reg =</div><div class='add'>+			    info-&gt;me4000_regbase + ME4000_AO_01_CTRL_REG;</div><div class='add'>+			ao_context-&gt;status_reg =</div><div class='add'>+			    info-&gt;me4000_regbase + ME4000_AO_01_STATUS_REG;</div><div class='add'>+			ao_context-&gt;fifo_reg =</div><div class='add'>+			    info-&gt;me4000_regbase + ME4000_AO_01_FIFO_REG;</div><div class='add'>+			ao_context-&gt;single_reg =</div><div class='add'>+			    info-&gt;me4000_regbase + ME4000_AO_01_SINGLE_REG;</div><div class='add'>+			ao_context-&gt;timer_reg =</div><div class='add'>+			    info-&gt;me4000_regbase + ME4000_AO_01_TIMER_REG;</div><div class='add'>+			ao_context-&gt;irq_status_reg =</div><div class='add'>+			    info-&gt;me4000_regbase + ME4000_IRQ_STATUS_REG;</div><div class='add'>+			ao_context-&gt;preload_reg =</div><div class='add'>+			    info-&gt;me4000_regbase + ME4000_AO_LOADSETREG_XX;</div><div class='add'>+			break;</div><div class='add'>+		case 2:</div><div class='add'>+			ao_context-&gt;ctrl_reg =</div><div class='add'>+			    info-&gt;me4000_regbase + ME4000_AO_02_CTRL_REG;</div><div class='add'>+			ao_context-&gt;status_reg =</div><div class='add'>+			    info-&gt;me4000_regbase + ME4000_AO_02_STATUS_REG;</div><div class='add'>+			ao_context-&gt;fifo_reg =</div><div class='add'>+			    info-&gt;me4000_regbase + ME4000_AO_02_FIFO_REG;</div><div class='add'>+			ao_context-&gt;single_reg =</div><div class='add'>+			    info-&gt;me4000_regbase + ME4000_AO_02_SINGLE_REG;</div><div class='add'>+			ao_context-&gt;timer_reg =</div><div class='add'>+			    info-&gt;me4000_regbase + ME4000_AO_02_TIMER_REG;</div><div class='add'>+			ao_context-&gt;irq_status_reg =</div><div class='add'>+			    info-&gt;me4000_regbase + ME4000_IRQ_STATUS_REG;</div><div class='add'>+			ao_context-&gt;preload_reg =</div><div class='add'>+			    info-&gt;me4000_regbase + ME4000_AO_LOADSETREG_XX;</div><div class='add'>+			break;</div><div class='add'>+		case 3:</div><div class='add'>+			ao_context-&gt;ctrl_reg =</div><div class='add'>+			    info-&gt;me4000_regbase + ME4000_AO_03_CTRL_REG;</div><div class='add'>+			ao_context-&gt;status_reg =</div><div class='add'>+			    info-&gt;me4000_regbase + ME4000_AO_03_STATUS_REG;</div><div class='add'>+			ao_context-&gt;fifo_reg =</div><div class='add'>+			    info-&gt;me4000_regbase + ME4000_AO_03_FIFO_REG;</div><div class='add'>+			ao_context-&gt;single_reg =</div><div class='add'>+			    info-&gt;me4000_regbase + ME4000_AO_03_SINGLE_REG;</div><div class='add'>+			ao_context-&gt;timer_reg =</div><div class='add'>+			    info-&gt;me4000_regbase + ME4000_AO_03_TIMER_REG;</div><div class='add'>+			ao_context-&gt;irq_status_reg =</div><div class='add'>+			    info-&gt;me4000_regbase + ME4000_IRQ_STATUS_REG;</div><div class='add'>+			ao_context-&gt;preload_reg =</div><div class='add'>+			    info-&gt;me4000_regbase + ME4000_AO_LOADSETREG_XX;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (info-&gt;board_p-&gt;ao.fifo_count) {</div><div class='add'>+			/* Request the interrupt line */</div><div class='add'>+			err =</div><div class='add'>+			    request_irq(ao_context-&gt;irq, me4000_ao_isr,</div><div class='add'>+					IRQF_DISABLED | IRQF_SHARED,</div><div class='add'>+					ME4000_NAME, ao_context);</div><div class='add'>+			if (err) {</div><div class='add'>+				printk(KERN_ERR</div><div class='add'>+				       "alloc_ao_contexts():Can't get interrupt line");</div><div class='add'>+				if (ao_context-&gt;circ_buf.buf)</div><div class='add'>+					kfree(ao_context-&gt;circ_buf.buf);</div><div class='add'>+				kfree(ao_context);</div><div class='add'>+				release_ao_contexts(info);</div><div class='add'>+				return -ENODEV;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		list_add_tail(&amp;ao_context-&gt;list, &amp;info-&gt;ao_context_list);</div><div class='add'>+		ao_context-&gt;index = i;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void release_ao_contexts(me4000_info_t * board_info)</div><div class='add'>+{</div><div class='add'>+	struct list_head *dac_p;</div><div class='add'>+	me4000_ao_context_t *ao_context;</div><div class='add'>+</div><div class='add'>+	/* Clear analog output context list */</div><div class='add'>+	while (!list_empty(&amp;board_info-&gt;ao_context_list)) {</div><div class='add'>+		dac_p = board_info-&gt;ao_context_list.next;</div><div class='add'>+		ao_context = list_entry(dac_p, me4000_ao_context_t, list);</div><div class='add'>+		free_irq(ao_context-&gt;irq, ao_context);</div><div class='add'>+		if (ao_context-&gt;circ_buf.buf)</div><div class='add'>+			kfree(ao_context-&gt;circ_buf.buf);</div><div class='add'>+		list_del(dac_p);</div><div class='add'>+		kfree(ao_context);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int alloc_ai_context(me4000_info_t * info)</div><div class='add'>+{</div><div class='add'>+	me4000_ai_context_t *ai_context;</div><div class='add'>+</div><div class='add'>+	if (info-&gt;board_p-&gt;ai.count) {</div><div class='add'>+		ai_context = kmalloc(sizeof(me4000_ai_context_t), GFP_KERNEL);</div><div class='add'>+		if (!ai_context) {</div><div class='add'>+			printk(KERN_ERR</div><div class='add'>+			       "ME4000:alloc_ai_context():Can't get memory for ai context\n");</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+		memset(ai_context, 0, sizeof(me4000_ai_context_t));</div><div class='add'>+</div><div class='add'>+		info-&gt;ai_context = ai_context;</div><div class='add'>+</div><div class='add'>+		spin_lock_init(&amp;ai_context-&gt;use_lock);</div><div class='add'>+		spin_lock_init(&amp;ai_context-&gt;int_lock);</div><div class='add'>+		ai_context-&gt;number = 0;</div><div class='add'>+		ai_context-&gt;irq = info-&gt;irq;</div><div class='add'>+		init_waitqueue_head(&amp;ai_context-&gt;wait_queue);</div><div class='add'>+		ai_context-&gt;board_info = info;</div><div class='add'>+</div><div class='add'>+		ai_context-&gt;ctrl_reg =</div><div class='add'>+		    info-&gt;me4000_regbase + ME4000_AI_CTRL_REG;</div><div class='add'>+		ai_context-&gt;status_reg =</div><div class='add'>+		    info-&gt;me4000_regbase + ME4000_AI_STATUS_REG;</div><div class='add'>+		ai_context-&gt;channel_list_reg =</div><div class='add'>+		    info-&gt;me4000_regbase + ME4000_AI_CHANNEL_LIST_REG;</div><div class='add'>+		ai_context-&gt;data_reg =</div><div class='add'>+		    info-&gt;me4000_regbase + ME4000_AI_DATA_REG;</div><div class='add'>+		ai_context-&gt;chan_timer_reg =</div><div class='add'>+		    info-&gt;me4000_regbase + ME4000_AI_CHAN_TIMER_REG;</div><div class='add'>+		ai_context-&gt;chan_pre_timer_reg =</div><div class='add'>+		    info-&gt;me4000_regbase + ME4000_AI_CHAN_PRE_TIMER_REG;</div><div class='add'>+		ai_context-&gt;scan_timer_low_reg =</div><div class='add'>+		    info-&gt;me4000_regbase + ME4000_AI_SCAN_TIMER_LOW_REG;</div><div class='add'>+		ai_context-&gt;scan_timer_high_reg =</div><div class='add'>+		    info-&gt;me4000_regbase + ME4000_AI_SCAN_TIMER_HIGH_REG;</div><div class='add'>+		ai_context-&gt;scan_pre_timer_low_reg =</div><div class='add'>+		    info-&gt;me4000_regbase + ME4000_AI_SCAN_PRE_TIMER_LOW_REG;</div><div class='add'>+		ai_context-&gt;scan_pre_timer_high_reg =</div><div class='add'>+		    info-&gt;me4000_regbase + ME4000_AI_SCAN_PRE_TIMER_HIGH_REG;</div><div class='add'>+		ai_context-&gt;start_reg =</div><div class='add'>+		    info-&gt;me4000_regbase + ME4000_AI_START_REG;</div><div class='add'>+		ai_context-&gt;irq_status_reg =</div><div class='add'>+		    info-&gt;me4000_regbase + ME4000_IRQ_STATUS_REG;</div><div class='add'>+		ai_context-&gt;sample_counter_reg =</div><div class='add'>+		    info-&gt;me4000_regbase + ME4000_AI_SAMPLE_COUNTER_REG;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int alloc_dio_context(me4000_info_t * info)</div><div class='add'>+{</div><div class='add'>+	me4000_dio_context_t *dio_context;</div><div class='add'>+</div><div class='add'>+	if (info-&gt;board_p-&gt;dio.count) {</div><div class='add'>+		dio_context = kmalloc(sizeof(me4000_dio_context_t), GFP_KERNEL);</div><div class='add'>+		if (!dio_context) {</div><div class='add'>+			printk(KERN_ERR</div><div class='add'>+			       "ME4000:alloc_dio_context():Can't get memory for dio context\n");</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+		memset(dio_context, 0, sizeof(me4000_dio_context_t));</div><div class='add'>+</div><div class='add'>+		info-&gt;dio_context = dio_context;</div><div class='add'>+</div><div class='add'>+		spin_lock_init(&amp;dio_context-&gt;use_lock);</div><div class='add'>+		dio_context-&gt;board_info = info;</div><div class='add'>+</div><div class='add'>+		dio_context-&gt;dio_count = info-&gt;board_p-&gt;dio.count;</div><div class='add'>+</div><div class='add'>+		dio_context-&gt;dir_reg =</div><div class='add'>+		    info-&gt;me4000_regbase + ME4000_DIO_DIR_REG;</div><div class='add'>+		dio_context-&gt;ctrl_reg =</div><div class='add'>+		    info-&gt;me4000_regbase + ME4000_DIO_CTRL_REG;</div><div class='add'>+		dio_context-&gt;port_0_reg =</div><div class='add'>+		    info-&gt;me4000_regbase + ME4000_DIO_PORT_0_REG;</div><div class='add'>+		dio_context-&gt;port_1_reg =</div><div class='add'>+		    info-&gt;me4000_regbase + ME4000_DIO_PORT_1_REG;</div><div class='add'>+		dio_context-&gt;port_2_reg =</div><div class='add'>+		    info-&gt;me4000_regbase + ME4000_DIO_PORT_2_REG;</div><div class='add'>+		dio_context-&gt;port_3_reg =</div><div class='add'>+		    info-&gt;me4000_regbase + ME4000_DIO_PORT_3_REG;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int alloc_cnt_context(me4000_info_t * info)</div><div class='add'>+{</div><div class='add'>+	me4000_cnt_context_t *cnt_context;</div><div class='add'>+</div><div class='add'>+	if (info-&gt;board_p-&gt;cnt.count) {</div><div class='add'>+		cnt_context = kmalloc(sizeof(me4000_cnt_context_t), GFP_KERNEL);</div><div class='add'>+		if (!cnt_context) {</div><div class='add'>+			printk(KERN_ERR</div><div class='add'>+			       "ME4000:alloc_cnt_context():Can't get memory for cnt context\n");</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+		memset(cnt_context, 0, sizeof(me4000_cnt_context_t));</div><div class='add'>+</div><div class='add'>+		info-&gt;cnt_context = cnt_context;</div><div class='add'>+</div><div class='add'>+		spin_lock_init(&amp;cnt_context-&gt;use_lock);</div><div class='add'>+		cnt_context-&gt;board_info = info;</div><div class='add'>+</div><div class='add'>+		cnt_context-&gt;ctrl_reg =</div><div class='add'>+		    info-&gt;timer_regbase + ME4000_CNT_CTRL_REG;</div><div class='add'>+		cnt_context-&gt;counter_0_reg =</div><div class='add'>+		    info-&gt;timer_regbase + ME4000_CNT_COUNTER_0_REG;</div><div class='add'>+		cnt_context-&gt;counter_1_reg =</div><div class='add'>+		    info-&gt;timer_regbase + ME4000_CNT_COUNTER_1_REG;</div><div class='add'>+		cnt_context-&gt;counter_2_reg =</div><div class='add'>+		    info-&gt;timer_regbase + ME4000_CNT_COUNTER_2_REG;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int alloc_ext_int_context(me4000_info_t * info)</div><div class='add'>+{</div><div class='add'>+	me4000_ext_int_context_t *ext_int_context;</div><div class='add'>+</div><div class='add'>+	if (info-&gt;board_p-&gt;cnt.count) {</div><div class='add'>+		ext_int_context =</div><div class='add'>+		    kmalloc(sizeof(me4000_ext_int_context_t), GFP_KERNEL);</div><div class='add'>+		if (!ext_int_context) {</div><div class='add'>+			printk(KERN_ERR</div><div class='add'>+			       "ME4000:alloc_ext_int_context():Can't get memory for cnt context\n");</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+		memset(ext_int_context, 0, sizeof(me4000_ext_int_context_t));</div><div class='add'>+</div><div class='add'>+		info-&gt;ext_int_context = ext_int_context;</div><div class='add'>+</div><div class='add'>+		spin_lock_init(&amp;ext_int_context-&gt;use_lock);</div><div class='add'>+		ext_int_context-&gt;board_info = info;</div><div class='add'>+</div><div class='add'>+		ext_int_context-&gt;fasync_ptr = NULL;</div><div class='add'>+		ext_int_context-&gt;irq = info-&gt;irq;</div><div class='add'>+</div><div class='add'>+		ext_int_context-&gt;ctrl_reg =</div><div class='add'>+		    info-&gt;me4000_regbase + ME4000_AI_CTRL_REG;</div><div class='add'>+		ext_int_context-&gt;irq_status_reg =</div><div class='add'>+		    info-&gt;me4000_regbase + ME4000_IRQ_STATUS_REG;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int me4000_probe(struct pci_dev *dev, const struct pci_device_id *id)</div><div class='add'>+{</div><div class='add'>+	int result = 0;</div><div class='add'>+	me4000_info_t *board_info;</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("me4000_probe() is executed\n");</div><div class='add'>+</div><div class='add'>+	/* Allocate structure for board context */</div><div class='add'>+	board_info = kmalloc(sizeof(me4000_info_t), GFP_KERNEL);</div><div class='add'>+	if (!board_info) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "ME4000:Can't get memory for board info structure\n");</div><div class='add'>+		result = -ENOMEM;</div><div class='add'>+		goto PROBE_ERROR_1;</div><div class='add'>+	}</div><div class='add'>+	memset(board_info, 0, sizeof(me4000_info_t));</div><div class='add'>+</div><div class='add'>+	/* Add to global linked list */</div><div class='add'>+	list_add_tail(&amp;board_info-&gt;list, &amp;me4000_board_info_list);</div><div class='add'>+</div><div class='add'>+	/* Get the PCI base registers */</div><div class='add'>+	result = get_registers(dev, board_info);</div><div class='add'>+	if (result) {</div><div class='add'>+		printk(KERN_ERR "me4000_probe():Cannot get registers\n");</div><div class='add'>+		goto PROBE_ERROR_2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Enable the device */</div><div class='add'>+	result = pci_enable_device(dev);</div><div class='add'>+	if (result &lt; 0) {</div><div class='add'>+		printk(KERN_ERR "me4000_probe():Cannot enable PCI device\n");</div><div class='add'>+		goto PROBE_ERROR_2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Request the PCI register regions */</div><div class='add'>+	result = pci_request_regions(dev, ME4000_NAME);</div><div class='add'>+	if (result &lt; 0) {</div><div class='add'>+		printk(KERN_ERR "me4000_probe():Cannot request I/O regions\n");</div><div class='add'>+		goto PROBE_ERROR_2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Initialize board info */</div><div class='add'>+	result = init_board_info(dev, board_info);</div><div class='add'>+	if (result) {</div><div class='add'>+		printk(KERN_ERR "me4000_probe():Cannot init baord info\n");</div><div class='add'>+		goto PROBE_ERROR_3;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Download the xilinx firmware */</div><div class='add'>+	result = me4000_xilinx_download(board_info);</div><div class='add'>+	if (result) {</div><div class='add'>+		printk(KERN_ERR "me4000_probe:Can't download firmware\n");</div><div class='add'>+		goto PROBE_ERROR_3;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Make a hardware reset */</div><div class='add'>+	result = me4000_reset_board(board_info);</div><div class='add'>+	if (result) {</div><div class='add'>+		printk(KERN_ERR "me4000_probe:Can't reset board\n");</div><div class='add'>+		goto PROBE_ERROR_3;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Allocate analog output context structures */</div><div class='add'>+	result = alloc_ao_contexts(board_info);</div><div class='add'>+	if (result) {</div><div class='add'>+		printk(KERN_ERR "me4000_probe():Cannot allocate ao contexts\n");</div><div class='add'>+		goto PROBE_ERROR_3;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Allocate analog input context */</div><div class='add'>+	result = alloc_ai_context(board_info);</div><div class='add'>+	if (result) {</div><div class='add'>+		printk(KERN_ERR "me4000_probe():Cannot allocate ai context\n");</div><div class='add'>+		goto PROBE_ERROR_4;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Allocate digital I/O context */</div><div class='add'>+	result = alloc_dio_context(board_info);</div><div class='add'>+	if (result) {</div><div class='add'>+		printk(KERN_ERR "me4000_probe():Cannot allocate dio context\n");</div><div class='add'>+		goto PROBE_ERROR_5;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Allocate counter context */</div><div class='add'>+	result = alloc_cnt_context(board_info);</div><div class='add'>+	if (result) {</div><div class='add'>+		printk(KERN_ERR "me4000_probe():Cannot allocate cnt context\n");</div><div class='add'>+		goto PROBE_ERROR_6;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Allocate external interrupt context */</div><div class='add'>+	result = alloc_ext_int_context(board_info);</div><div class='add'>+	if (result) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "me4000_probe():Cannot allocate ext_int context\n");</div><div class='add'>+		goto PROBE_ERROR_7;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+      PROBE_ERROR_7:</div><div class='add'>+	kfree(board_info-&gt;cnt_context);</div><div class='add'>+</div><div class='add'>+      PROBE_ERROR_6:</div><div class='add'>+	kfree(board_info-&gt;dio_context);</div><div class='add'>+</div><div class='add'>+      PROBE_ERROR_5:</div><div class='add'>+	kfree(board_info-&gt;ai_context);</div><div class='add'>+</div><div class='add'>+      PROBE_ERROR_4:</div><div class='add'>+	release_ao_contexts(board_info);</div><div class='add'>+</div><div class='add'>+      PROBE_ERROR_3:</div><div class='add'>+	pci_release_regions(dev);</div><div class='add'>+</div><div class='add'>+      PROBE_ERROR_2:</div><div class='add'>+	list_del(&amp;board_info-&gt;list);</div><div class='add'>+	kfree(board_info);</div><div class='add'>+</div><div class='add'>+      PROBE_ERROR_1:</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int me4000_xilinx_download(me4000_info_t * info)</div><div class='add'>+{</div><div class='add'>+	int size = 0;</div><div class='add'>+	u32 value = 0;</div><div class='add'>+	int idx = 0;</div><div class='add'>+	unsigned char *firm;</div><div class='add'>+	wait_queue_head_t queue;</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("me4000_xilinx_download() is executed\n");</div><div class='add'>+</div><div class='add'>+	init_waitqueue_head(&amp;queue);</div><div class='add'>+</div><div class='add'>+	firm = (info-&gt;device_id == 0x4610) ? xilinx_firm_4610 : xilinx_firm;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Set PLX local interrupt 2 polarity to high.</div><div class='add'>+	 * Interrupt is thrown by init pin of xilinx.</div><div class='add'>+	 */</div><div class='add'>+	outl(0x10, info-&gt;plx_regbase + PLX_INTCSR);</div><div class='add'>+</div><div class='add'>+	/* Set /CS and /WRITE of the Xilinx */</div><div class='add'>+	value = inl(info-&gt;plx_regbase + PLX_ICR);</div><div class='add'>+	value |= 0x100;</div><div class='add'>+	outl(value, info-&gt;plx_regbase + PLX_ICR);</div><div class='add'>+</div><div class='add'>+	/* Init Xilinx with CS1 */</div><div class='add'>+	inb(info-&gt;program_regbase + 0xC8);</div><div class='add'>+</div><div class='add'>+	/* Wait until /INIT pin is set */</div><div class='add'>+	udelay(20);</div><div class='add'>+	if (!inl(info-&gt;plx_regbase + PLX_INTCSR) &amp; 0x20) {</div><div class='add'>+		printk(KERN_ERR "me4000_xilinx_download():Can't init Xilinx\n");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Reset /CS and /WRITE of the Xilinx */</div><div class='add'>+	value = inl(info-&gt;plx_regbase + PLX_ICR);</div><div class='add'>+	value &amp;= ~0x100;</div><div class='add'>+	outl(value, info-&gt;plx_regbase + PLX_ICR);</div><div class='add'>+</div><div class='add'>+	/* Download Xilinx firmware */</div><div class='add'>+	size = (firm[0] &lt;&lt; 24) + (firm[1] &lt;&lt; 16) + (firm[2] &lt;&lt; 8) + firm[3];</div><div class='add'>+	udelay(10);</div><div class='add'>+</div><div class='add'>+	for (idx = 0; idx &lt; size; idx++) {</div><div class='add'>+		outb(firm[16 + idx], info-&gt;program_regbase);</div><div class='add'>+</div><div class='add'>+		udelay(10);</div><div class='add'>+</div><div class='add'>+		/* Check if BUSY flag is low */</div><div class='add'>+		if (inl(info-&gt;plx_regbase + PLX_ICR) &amp; 0x20) {</div><div class='add'>+			printk(KERN_ERR</div><div class='add'>+			       "me4000_xilinx_download():Xilinx is still busy (idx = %d)\n",</div><div class='add'>+			       idx);</div><div class='add'>+			return -EIO;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	PDEBUG("me4000_xilinx_download():%d bytes written\n", idx);</div><div class='add'>+</div><div class='add'>+	/* If done flag is high download was successful */</div><div class='add'>+	if (inl(info-&gt;plx_regbase + PLX_ICR) &amp; 0x4) {</div><div class='add'>+		PDEBUG("me4000_xilinx_download():Done flag is set\n");</div><div class='add'>+		PDEBUG("me4000_xilinx_download():Download was successful\n");</div><div class='add'>+	} else {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "ME4000:me4000_xilinx_download():DONE flag is not set\n");</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "ME4000:me4000_xilinx_download():Download not succesful\n");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Set /CS and /WRITE */</div><div class='add'>+	value = inl(info-&gt;plx_regbase + PLX_ICR);</div><div class='add'>+	value |= 0x100;</div><div class='add'>+	outl(value, info-&gt;plx_regbase + PLX_ICR);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int me4000_reset_board(me4000_info_t * info)</div><div class='add'>+{</div><div class='add'>+	unsigned long icr;</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("me4000_reset_board() is executed\n");</div><div class='add'>+</div><div class='add'>+	/* Make a hardware reset */</div><div class='add'>+	icr = me4000_inl(info-&gt;plx_regbase + PLX_ICR);</div><div class='add'>+	icr |= 0x40000000;</div><div class='add'>+	me4000_outl(icr, info-&gt;plx_regbase + PLX_ICR);</div><div class='add'>+	icr &amp;= ~0x40000000;</div><div class='add'>+	me4000_outl(icr, info-&gt;plx_regbase + PLX_ICR);</div><div class='add'>+</div><div class='add'>+	/* Set both stop bits in the analog input control register */</div><div class='add'>+	me4000_outl(ME4000_AI_CTRL_BIT_IMMEDIATE_STOP | ME4000_AI_CTRL_BIT_STOP,</div><div class='add'>+		    info-&gt;me4000_regbase + ME4000_AI_CTRL_REG);</div><div class='add'>+</div><div class='add'>+	/* Set both stop bits in the analog output control register */</div><div class='add'>+	me4000_outl(ME4000_AO_CTRL_BIT_IMMEDIATE_STOP | ME4000_AO_CTRL_BIT_STOP,</div><div class='add'>+		    info-&gt;me4000_regbase + ME4000_AO_00_CTRL_REG);</div><div class='add'>+	me4000_outl(ME4000_AO_CTRL_BIT_IMMEDIATE_STOP | ME4000_AO_CTRL_BIT_STOP,</div><div class='add'>+		    info-&gt;me4000_regbase + ME4000_AO_01_CTRL_REG);</div><div class='add'>+	me4000_outl(ME4000_AO_CTRL_BIT_IMMEDIATE_STOP | ME4000_AO_CTRL_BIT_STOP,</div><div class='add'>+		    info-&gt;me4000_regbase + ME4000_AO_02_CTRL_REG);</div><div class='add'>+	me4000_outl(ME4000_AO_CTRL_BIT_IMMEDIATE_STOP | ME4000_AO_CTRL_BIT_STOP,</div><div class='add'>+		    info-&gt;me4000_regbase + ME4000_AO_03_CTRL_REG);</div><div class='add'>+</div><div class='add'>+	/* 0x8000 to the DACs means an output voltage of 0V */</div><div class='add'>+	me4000_outl(0x8000, info-&gt;me4000_regbase + ME4000_AO_00_SINGLE_REG);</div><div class='add'>+	me4000_outl(0x8000, info-&gt;me4000_regbase + ME4000_AO_01_SINGLE_REG);</div><div class='add'>+	me4000_outl(0x8000, info-&gt;me4000_regbase + ME4000_AO_02_SINGLE_REG);</div><div class='add'>+	me4000_outl(0x8000, info-&gt;me4000_regbase + ME4000_AO_03_SINGLE_REG);</div><div class='add'>+</div><div class='add'>+	/* Enable interrupts on the PLX */</div><div class='add'>+	me4000_outl(0x43, info-&gt;plx_regbase + PLX_INTCSR);</div><div class='add'>+</div><div class='add'>+	/* Set the adustment register for AO demux */</div><div class='add'>+	me4000_outl(ME4000_AO_DEMUX_ADJUST_VALUE,</div><div class='add'>+		    info-&gt;me4000_regbase + ME4000_AO_DEMUX_ADJUST_REG);</div><div class='add'>+</div><div class='add'>+	/* Set digital I/O direction for port 0 to output on isolated versions */</div><div class='add'>+	if (!(me4000_inl(info-&gt;me4000_regbase + ME4000_DIO_DIR_REG) &amp; 0x1)) {</div><div class='add'>+		me4000_outl(0x1, info-&gt;me4000_regbase + ME4000_DIO_CTRL_REG);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int me4000_open(struct inode *inode_p, struct file *file_p)</div><div class='add'>+{</div><div class='add'>+	int board, dev, mode;</div><div class='add'>+	int err = 0;</div><div class='add'>+	int i;</div><div class='add'>+	struct list_head *ptr;</div><div class='add'>+	me4000_info_t *board_info = NULL;</div><div class='add'>+	me4000_ao_context_t *ao_context = NULL;</div><div class='add'>+	me4000_ai_context_t *ai_context = NULL;</div><div class='add'>+	me4000_dio_context_t *dio_context = NULL;</div><div class='add'>+	me4000_cnt_context_t *cnt_context = NULL;</div><div class='add'>+	me4000_ext_int_context_t *ext_int_context = NULL;</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("me4000_open() is executed\n");</div><div class='add'>+</div><div class='add'>+	/* Analog output */</div><div class='add'>+	if (MAJOR(inode_p-&gt;i_rdev) == me4000_ao_major_driver_no) {</div><div class='add'>+		board = AO_BOARD(inode_p-&gt;i_rdev);</div><div class='add'>+		dev = AO_PORT(inode_p-&gt;i_rdev);</div><div class='add'>+		mode = AO_MODE(inode_p-&gt;i_rdev);</div><div class='add'>+</div><div class='add'>+		PDEBUG("me4000_open():board = %d ao = %d mode = %d\n", board,</div><div class='add'>+		       dev, mode);</div><div class='add'>+</div><div class='add'>+		/* Search for the board context */</div><div class='add'>+		for (ptr = me4000_board_info_list.next, i = 0;</div><div class='add'>+		     ptr != &amp;me4000_board_info_list; ptr = ptr-&gt;next, i++) {</div><div class='add'>+			board_info = list_entry(ptr, me4000_info_t, list);</div><div class='add'>+			if (i == board)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (ptr == &amp;me4000_board_info_list) {</div><div class='add'>+			printk(KERN_ERR</div><div class='add'>+			       "ME4000:me4000_open():Board %d not in device list\n",</div><div class='add'>+			       board);</div><div class='add'>+			return -ENODEV;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Search for the dac context */</div><div class='add'>+		for (ptr = board_info-&gt;ao_context_list.next, i = 0;</div><div class='add'>+		     ptr != &amp;board_info-&gt;ao_context_list;</div><div class='add'>+		     ptr = ptr-&gt;next, i++) {</div><div class='add'>+			ao_context = list_entry(ptr, me4000_ao_context_t, list);</div><div class='add'>+			if (i == dev)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (ptr == &amp;board_info-&gt;ao_context_list) {</div><div class='add'>+			printk(KERN_ERR</div><div class='add'>+			       "ME4000:me4000_open():Device %d not in device list\n",</div><div class='add'>+			       dev);</div><div class='add'>+			return -ENODEV;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Check if mode is valid */</div><div class='add'>+		if (mode &gt; 2) {</div><div class='add'>+			printk(KERN_ERR</div><div class='add'>+			       "ME4000:me4000_open():Mode is not valid\n");</div><div class='add'>+			return -ENODEV;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Check if mode is valid for this AO */</div><div class='add'>+		if ((mode != ME4000_AO_CONV_MODE_SINGLE)</div><div class='add'>+		    &amp;&amp; (dev &gt;= board_info-&gt;board_p-&gt;ao.fifo_count)) {</div><div class='add'>+			printk(KERN_ERR</div><div class='add'>+			       "ME4000:me4000_open():AO %d only in single mode available\n",</div><div class='add'>+			       dev);</div><div class='add'>+			return -ENODEV;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Check if already opened */</div><div class='add'>+		spin_lock(&amp;ao_context-&gt;use_lock);</div><div class='add'>+		if (ao_context-&gt;dac_in_use) {</div><div class='add'>+			printk(KERN_ERR</div><div class='add'>+			       "ME4000:me4000_open():AO %d already in use\n",</div><div class='add'>+			       dev);</div><div class='add'>+			spin_unlock(&amp;ao_context-&gt;use_lock);</div><div class='add'>+			return -EBUSY;</div><div class='add'>+		}</div><div class='add'>+		ao_context-&gt;dac_in_use = 1;</div><div class='add'>+		spin_unlock(&amp;ao_context-&gt;use_lock);</div><div class='add'>+</div><div class='add'>+		ao_context-&gt;mode = mode;</div><div class='add'>+</div><div class='add'>+		/* Hold the context in private data */</div><div class='add'>+		file_p-&gt;private_data = ao_context;</div><div class='add'>+</div><div class='add'>+		/* Set file operations pointer */</div><div class='add'>+		file_p-&gt;f_op = me4000_ao_fops_array[mode];</div><div class='add'>+</div><div class='add'>+		err = me4000_ao_prepare(ao_context);</div><div class='add'>+		if (err) {</div><div class='add'>+			ao_context-&gt;dac_in_use = 0;</div><div class='add'>+			return 1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	/* Analog input */</div><div class='add'>+	else if (MAJOR(inode_p-&gt;i_rdev) == me4000_ai_major_driver_no) {</div><div class='add'>+		board = AI_BOARD(inode_p-&gt;i_rdev);</div><div class='add'>+		mode = AI_MODE(inode_p-&gt;i_rdev);</div><div class='add'>+</div><div class='add'>+		PDEBUG("me4000_open():ai board = %d mode = %d\n", board, mode);</div><div class='add'>+</div><div class='add'>+		/* Search for the board context */</div><div class='add'>+		for (ptr = me4000_board_info_list.next, i = 0;</div><div class='add'>+		     ptr != &amp;me4000_board_info_list; ptr = ptr-&gt;next, i++) {</div><div class='add'>+			board_info = list_entry(ptr, me4000_info_t, list);</div><div class='add'>+			if (i == board)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (ptr == &amp;me4000_board_info_list) {</div><div class='add'>+			printk(KERN_ERR</div><div class='add'>+			       "ME4000:me4000_open():Board %d not in device list\n",</div><div class='add'>+			       board);</div><div class='add'>+			return -ENODEV;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ai_context = board_info-&gt;ai_context;</div><div class='add'>+</div><div class='add'>+		/* Check if mode is valid */</div><div class='add'>+		if (mode &gt; 5) {</div><div class='add'>+			printk(KERN_ERR</div><div class='add'>+			       "ME4000:me4000_open():Mode is not valid\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Check if already opened */</div><div class='add'>+		spin_lock(&amp;ai_context-&gt;use_lock);</div><div class='add'>+		if (ai_context-&gt;in_use) {</div><div class='add'>+			printk(KERN_ERR</div><div class='add'>+			       "ME4000:me4000_open():AI already in use\n");</div><div class='add'>+			spin_unlock(&amp;ai_context-&gt;use_lock);</div><div class='add'>+			return -EBUSY;</div><div class='add'>+		}</div><div class='add'>+		ai_context-&gt;in_use = 1;</div><div class='add'>+		spin_unlock(&amp;ai_context-&gt;use_lock);</div><div class='add'>+</div><div class='add'>+		ai_context-&gt;mode = mode;</div><div class='add'>+</div><div class='add'>+		/* Hold the context in private data */</div><div class='add'>+		file_p-&gt;private_data = ai_context;</div><div class='add'>+</div><div class='add'>+		/* Set file operations pointer */</div><div class='add'>+		file_p-&gt;f_op = me4000_ai_fops_array[mode];</div><div class='add'>+</div><div class='add'>+		/* Prepare analog input */</div><div class='add'>+		me4000_ai_prepare(ai_context);</div><div class='add'>+	}</div><div class='add'>+	/* Digital I/O */</div><div class='add'>+	else if (MAJOR(inode_p-&gt;i_rdev) == me4000_dio_major_driver_no) {</div><div class='add'>+		board = DIO_BOARD(inode_p-&gt;i_rdev);</div><div class='add'>+		dev = 0;</div><div class='add'>+		mode = 0;</div><div class='add'>+</div><div class='add'>+		PDEBUG("me4000_open():board = %d\n", board);</div><div class='add'>+</div><div class='add'>+		/* Search for the board context */</div><div class='add'>+		for (ptr = me4000_board_info_list.next;</div><div class='add'>+		     ptr != &amp;me4000_board_info_list; ptr = ptr-&gt;next) {</div><div class='add'>+			board_info = list_entry(ptr, me4000_info_t, list);</div><div class='add'>+			if (board_info-&gt;board_count == board)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (ptr == &amp;me4000_board_info_list) {</div><div class='add'>+			printk(KERN_ERR</div><div class='add'>+			       "ME4000:me4000_open():Board %d not in device list\n",</div><div class='add'>+			       board);</div><div class='add'>+			return -ENODEV;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Search for the dio context */</div><div class='add'>+		dio_context = board_info-&gt;dio_context;</div><div class='add'>+</div><div class='add'>+		/* Check if already opened */</div><div class='add'>+		spin_lock(&amp;dio_context-&gt;use_lock);</div><div class='add'>+		if (dio_context-&gt;in_use) {</div><div class='add'>+			printk(KERN_ERR</div><div class='add'>+			       "ME4000:me4000_open():DIO already in use\n");</div><div class='add'>+			spin_unlock(&amp;dio_context-&gt;use_lock);</div><div class='add'>+			return -EBUSY;</div><div class='add'>+		}</div><div class='add'>+		dio_context-&gt;in_use = 1;</div><div class='add'>+		spin_unlock(&amp;dio_context-&gt;use_lock);</div><div class='add'>+</div><div class='add'>+		/* Hold the context in private data */</div><div class='add'>+		file_p-&gt;private_data = dio_context;</div><div class='add'>+</div><div class='add'>+		/* Set file operations pointer to single functions */</div><div class='add'>+		file_p-&gt;f_op = &amp;me4000_dio_fops;</div><div class='add'>+</div><div class='add'>+		//me4000_dio_reset(dio_context);</div><div class='add'>+	}</div><div class='add'>+	/* Counters */</div><div class='add'>+	else if (MAJOR(inode_p-&gt;i_rdev) == me4000_cnt_major_driver_no) {</div><div class='add'>+		board = CNT_BOARD(inode_p-&gt;i_rdev);</div><div class='add'>+		dev = 0;</div><div class='add'>+		mode = 0;</div><div class='add'>+</div><div class='add'>+		PDEBUG("me4000_open():board = %d\n", board);</div><div class='add'>+</div><div class='add'>+		/* Search for the board context */</div><div class='add'>+		for (ptr = me4000_board_info_list.next;</div><div class='add'>+		     ptr != &amp;me4000_board_info_list; ptr = ptr-&gt;next) {</div><div class='add'>+			board_info = list_entry(ptr, me4000_info_t, list);</div><div class='add'>+			if (board_info-&gt;board_count == board)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (ptr == &amp;me4000_board_info_list) {</div><div class='add'>+			printk(KERN_ERR</div><div class='add'>+			       "ME4000:me4000_open():Board %d not in device list\n",</div><div class='add'>+			       board);</div><div class='add'>+			return -ENODEV;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Get the cnt context */</div><div class='add'>+		cnt_context = board_info-&gt;cnt_context;</div><div class='add'>+</div><div class='add'>+		/* Check if already opened */</div><div class='add'>+		spin_lock(&amp;cnt_context-&gt;use_lock);</div><div class='add'>+		if (cnt_context-&gt;in_use) {</div><div class='add'>+			printk(KERN_ERR</div><div class='add'>+			       "ME4000:me4000_open():CNT already in use\n");</div><div class='add'>+			spin_unlock(&amp;cnt_context-&gt;use_lock);</div><div class='add'>+			return -EBUSY;</div><div class='add'>+		}</div><div class='add'>+		cnt_context-&gt;in_use = 1;</div><div class='add'>+		spin_unlock(&amp;cnt_context-&gt;use_lock);</div><div class='add'>+</div><div class='add'>+		/* Hold the context in private data */</div><div class='add'>+		file_p-&gt;private_data = cnt_context;</div><div class='add'>+</div><div class='add'>+		/* Set file operations pointer to single functions */</div><div class='add'>+		file_p-&gt;f_op = &amp;me4000_cnt_fops;</div><div class='add'>+	}</div><div class='add'>+	/* External Interrupt */</div><div class='add'>+	else if (MAJOR(inode_p-&gt;i_rdev) == me4000_ext_int_major_driver_no) {</div><div class='add'>+		board = EXT_INT_BOARD(inode_p-&gt;i_rdev);</div><div class='add'>+		dev = 0;</div><div class='add'>+		mode = 0;</div><div class='add'>+</div><div class='add'>+		PDEBUG("me4000_open():board = %d\n", board);</div><div class='add'>+</div><div class='add'>+		/* Search for the board context */</div><div class='add'>+		for (ptr = me4000_board_info_list.next;</div><div class='add'>+		     ptr != &amp;me4000_board_info_list; ptr = ptr-&gt;next) {</div><div class='add'>+			board_info = list_entry(ptr, me4000_info_t, list);</div><div class='add'>+			if (board_info-&gt;board_count == board)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (ptr == &amp;me4000_board_info_list) {</div><div class='add'>+			printk(KERN_ERR</div><div class='add'>+			       "ME4000:me4000_open():Board %d not in device list\n",</div><div class='add'>+			       board);</div><div class='add'>+			return -ENODEV;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Get the external interrupt context */</div><div class='add'>+		ext_int_context = board_info-&gt;ext_int_context;</div><div class='add'>+</div><div class='add'>+		/* Check if already opened */</div><div class='add'>+		spin_lock(&amp;cnt_context-&gt;use_lock);</div><div class='add'>+		if (ext_int_context-&gt;in_use) {</div><div class='add'>+			printk(KERN_ERR</div><div class='add'>+			       "ME4000:me4000_open():External interrupt already in use\n");</div><div class='add'>+			spin_unlock(&amp;ext_int_context-&gt;use_lock);</div><div class='add'>+			return -EBUSY;</div><div class='add'>+		}</div><div class='add'>+		ext_int_context-&gt;in_use = 1;</div><div class='add'>+		spin_unlock(&amp;ext_int_context-&gt;use_lock);</div><div class='add'>+</div><div class='add'>+		/* Hold the context in private data */</div><div class='add'>+		file_p-&gt;private_data = ext_int_context;</div><div class='add'>+</div><div class='add'>+		/* Set file operations pointer to single functions */</div><div class='add'>+		file_p-&gt;f_op = &amp;me4000_ext_int_fops;</div><div class='add'>+</div><div class='add'>+		/* Request the interrupt line */</div><div class='add'>+		err =</div><div class='add'>+		    request_irq(ext_int_context-&gt;irq, me4000_ext_int_isr,</div><div class='add'>+				IRQF_DISABLED | IRQF_SHARED, ME4000_NAME,</div><div class='add'>+				ext_int_context);</div><div class='add'>+		if (err) {</div><div class='add'>+			printk(KERN_ERR</div><div class='add'>+			       "ME4000:me4000_open():Can't get interrupt line");</div><div class='add'>+			ext_int_context-&gt;in_use = 0;</div><div class='add'>+			return -ENODEV;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Reset the counter */</div><div class='add'>+		me4000_ext_int_disable(ext_int_context);</div><div class='add'>+	} else {</div><div class='add'>+		printk(KERN_ERR "ME4000:me4000_open():Major number unknown\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int me4000_release(struct inode *inode_p, struct file *file_p)</div><div class='add'>+{</div><div class='add'>+	me4000_ao_context_t *ao_context;</div><div class='add'>+	me4000_ai_context_t *ai_context;</div><div class='add'>+	me4000_dio_context_t *dio_context;</div><div class='add'>+	me4000_cnt_context_t *cnt_context;</div><div class='add'>+	me4000_ext_int_context_t *ext_int_context;</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("me4000_release() is executed\n");</div><div class='add'>+</div><div class='add'>+	if (MAJOR(inode_p-&gt;i_rdev) == me4000_ao_major_driver_no) {</div><div class='add'>+		ao_context = file_p-&gt;private_data;</div><div class='add'>+</div><div class='add'>+		/* Mark DAC as unused */</div><div class='add'>+		ao_context-&gt;dac_in_use = 0;</div><div class='add'>+	} else if (MAJOR(inode_p-&gt;i_rdev) == me4000_ai_major_driver_no) {</div><div class='add'>+		ai_context = file_p-&gt;private_data;</div><div class='add'>+</div><div class='add'>+		/* Reset the analog input */</div><div class='add'>+		me4000_ai_reset(ai_context);</div><div class='add'>+</div><div class='add'>+		/* Free the interrupt and the circular buffer */</div><div class='add'>+		if (ai_context-&gt;mode) {</div><div class='add'>+			free_irq(ai_context-&gt;irq, ai_context);</div><div class='add'>+			kfree(ai_context-&gt;circ_buf.buf);</div><div class='add'>+			ai_context-&gt;circ_buf.buf = NULL;</div><div class='add'>+			ai_context-&gt;circ_buf.head = 0;</div><div class='add'>+			ai_context-&gt;circ_buf.tail = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Mark AI as unused */</div><div class='add'>+		ai_context-&gt;in_use = 0;</div><div class='add'>+	} else if (MAJOR(inode_p-&gt;i_rdev) == me4000_dio_major_driver_no) {</div><div class='add'>+		dio_context = file_p-&gt;private_data;</div><div class='add'>+</div><div class='add'>+		/* Mark digital I/O as unused */</div><div class='add'>+		dio_context-&gt;in_use = 0;</div><div class='add'>+	} else if (MAJOR(inode_p-&gt;i_rdev) == me4000_cnt_major_driver_no) {</div><div class='add'>+		cnt_context = file_p-&gt;private_data;</div><div class='add'>+</div><div class='add'>+		/* Mark counters as unused */</div><div class='add'>+		cnt_context-&gt;in_use = 0;</div><div class='add'>+	} else if (MAJOR(inode_p-&gt;i_rdev) == me4000_ext_int_major_driver_no) {</div><div class='add'>+		ext_int_context = file_p-&gt;private_data;</div><div class='add'>+</div><div class='add'>+		/* Disable the externel interrupt */</div><div class='add'>+		me4000_ext_int_disable(ext_int_context);</div><div class='add'>+</div><div class='add'>+		free_irq(ext_int_context-&gt;irq, ext_int_context);</div><div class='add'>+</div><div class='add'>+		/* Delete the fasync structure and free memory */</div><div class='add'>+		me4000_ext_int_fasync(0, file_p, 0);</div><div class='add'>+</div><div class='add'>+		/* Mark as unused */</div><div class='add'>+		ext_int_context-&gt;in_use = 0;</div><div class='add'>+	} else {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "ME4000:me4000_release():Major number unknown\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*------------------------------- Analog output stuff --------------------------------------*/</div><div class='add'>+</div><div class='add'>+static int me4000_ao_prepare(me4000_ao_context_t * ao_context)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("me4000_ao_prepare() is executed\n");</div><div class='add'>+</div><div class='add'>+	if (ao_context-&gt;mode == ME4000_AO_CONV_MODE_CONTINUOUS) {</div><div class='add'>+		/* Only do anything if not already in the correct mode */</div><div class='add'>+		unsigned long mode = me4000_inl(ao_context-&gt;ctrl_reg);</div><div class='add'>+		if ((mode &amp; ME4000_AO_CONV_MODE_CONTINUOUS)</div><div class='add'>+		    &amp;&amp; (mode &amp; ME4000_AO_CTRL_BIT_ENABLE_FIFO)) {</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Stop any conversion */</div><div class='add'>+		me4000_ao_immediate_stop(ao_context);</div><div class='add'>+</div><div class='add'>+		/* Set the control register to default state  */</div><div class='add'>+		spin_lock_irqsave(&amp;ao_context-&gt;int_lock, flags);</div><div class='add'>+		me4000_outl(ME4000_AO_CONV_MODE_CONTINUOUS |</div><div class='add'>+			    ME4000_AO_CTRL_BIT_ENABLE_FIFO |</div><div class='add'>+			    ME4000_AO_CTRL_BIT_STOP |</div><div class='add'>+			    ME4000_AO_CTRL_BIT_IMMEDIATE_STOP,</div><div class='add'>+			    ao_context-&gt;ctrl_reg);</div><div class='add'>+		spin_unlock_irqrestore(&amp;ao_context-&gt;int_lock, flags);</div><div class='add'>+</div><div class='add'>+		/* Set to fastest sample rate */</div><div class='add'>+		me4000_outl(65, ao_context-&gt;timer_reg);</div><div class='add'>+	} else if (ao_context-&gt;mode == ME4000_AO_CONV_MODE_WRAPAROUND) {</div><div class='add'>+		/* Only do anything if not already in the correct mode */</div><div class='add'>+		unsigned long mode = me4000_inl(ao_context-&gt;ctrl_reg);</div><div class='add'>+		if ((mode &amp; ME4000_AO_CONV_MODE_WRAPAROUND)</div><div class='add'>+		    &amp;&amp; (mode &amp; ME4000_AO_CTRL_BIT_ENABLE_FIFO)) {</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Stop any conversion */</div><div class='add'>+		me4000_ao_immediate_stop(ao_context);</div><div class='add'>+</div><div class='add'>+		/* Set the control register to default state  */</div><div class='add'>+		spin_lock_irqsave(&amp;ao_context-&gt;int_lock, flags);</div><div class='add'>+		me4000_outl(ME4000_AO_CONV_MODE_WRAPAROUND |</div><div class='add'>+			    ME4000_AO_CTRL_BIT_ENABLE_FIFO |</div><div class='add'>+			    ME4000_AO_CTRL_BIT_STOP |</div><div class='add'>+			    ME4000_AO_CTRL_BIT_IMMEDIATE_STOP,</div><div class='add'>+			    ao_context-&gt;ctrl_reg);</div><div class='add'>+		spin_unlock_irqrestore(&amp;ao_context-&gt;int_lock, flags);</div><div class='add'>+</div><div class='add'>+		/* Set to fastest sample rate */</div><div class='add'>+		me4000_outl(65, ao_context-&gt;timer_reg);</div><div class='add'>+	} else if (ao_context-&gt;mode == ME4000_AO_CONV_MODE_SINGLE) {</div><div class='add'>+		/* Only do anything if not already in the correct mode */</div><div class='add'>+		unsigned long mode = me4000_inl(ao_context-&gt;ctrl_reg);</div><div class='add'>+		if (!</div><div class='add'>+		    (mode &amp;</div><div class='add'>+		     (ME4000_AO_CONV_MODE_WRAPAROUND |</div><div class='add'>+		      ME4000_AO_CONV_MODE_CONTINUOUS))) {</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Stop any conversion */</div><div class='add'>+		me4000_ao_immediate_stop(ao_context);</div><div class='add'>+</div><div class='add'>+		/* Clear the control register */</div><div class='add'>+		spin_lock_irqsave(&amp;ao_context-&gt;int_lock, flags);</div><div class='add'>+		me4000_outl(0x0, ao_context-&gt;ctrl_reg);</div><div class='add'>+		spin_unlock_irqrestore(&amp;ao_context-&gt;int_lock, flags);</div><div class='add'>+</div><div class='add'>+		/* Set voltage to 0V */</div><div class='add'>+		me4000_outl(0x8000, ao_context-&gt;single_reg);</div><div class='add'>+	} else {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "ME4000:me4000_ao_prepare():Invalid mode specified\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int me4000_ao_reset(me4000_ao_context_t * ao_context)</div><div class='add'>+{</div><div class='add'>+	u32 tmp;</div><div class='add'>+	wait_queue_head_t queue;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("me4000_ao_reset() is executed\n");</div><div class='add'>+</div><div class='add'>+	init_waitqueue_head(&amp;queue);</div><div class='add'>+</div><div class='add'>+	if (ao_context-&gt;mode == ME4000_AO_CONV_MODE_WRAPAROUND) {</div><div class='add'>+		/*</div><div class='add'>+		 * First stop conversion of the DAC before reconfigure.</div><div class='add'>+		 * This is essantial, cause of the state machine.</div><div class='add'>+		 * If not stopped before configuring mode, it could</div><div class='add'>+		 * walk in a undefined state.</div><div class='add'>+		 */</div><div class='add'>+		tmp = me4000_inl(ao_context-&gt;ctrl_reg);</div><div class='add'>+		tmp |= ME4000_AO_CTRL_BIT_IMMEDIATE_STOP;</div><div class='add'>+		me4000_outl(tmp, ao_context-&gt;ctrl_reg);</div><div class='add'>+</div><div class='add'>+		while (inl(ao_context-&gt;status_reg) &amp; ME4000_AO_STATUS_BIT_FSM) {</div><div class='add'>+			sleep_on_timeout(&amp;queue, 1);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Set to transparent mode */</div><div class='add'>+		me4000_ao_simultaneous_disable(ao_context);</div><div class='add'>+</div><div class='add'>+		/* Set to single mode in order to set default voltage */</div><div class='add'>+		me4000_outl(0x0, ao_context-&gt;ctrl_reg);</div><div class='add'>+</div><div class='add'>+		/* Set voltage to 0V */</div><div class='add'>+		me4000_outl(0x8000, ao_context-&gt;single_reg);</div><div class='add'>+</div><div class='add'>+		/* Set to fastest sample rate */</div><div class='add'>+		me4000_outl(65, ao_context-&gt;timer_reg);</div><div class='add'>+</div><div class='add'>+		/* Set the original mode and enable FIFO */</div><div class='add'>+		me4000_outl(ME4000_AO_CONV_MODE_WRAPAROUND |</div><div class='add'>+			    ME4000_AO_CTRL_BIT_ENABLE_FIFO |</div><div class='add'>+			    ME4000_AO_CTRL_BIT_STOP |</div><div class='add'>+			    ME4000_AO_CTRL_BIT_IMMEDIATE_STOP,</div><div class='add'>+			    ao_context-&gt;ctrl_reg);</div><div class='add'>+	} else if (ao_context-&gt;mode == ME4000_AO_CONV_MODE_CONTINUOUS) {</div><div class='add'>+		/*</div><div class='add'>+		 * First stop conversion of the DAC before reconfigure.</div><div class='add'>+		 * This is essantial, cause of the state machine.</div><div class='add'>+		 * If not stopped before configuring mode, it could</div><div class='add'>+		 * walk in a undefined state.</div><div class='add'>+		 */</div><div class='add'>+		spin_lock_irqsave(&amp;ao_context-&gt;int_lock, flags);</div><div class='add'>+		tmp = me4000_inl(ao_context-&gt;ctrl_reg);</div><div class='add'>+		tmp |= ME4000_AO_CTRL_BIT_STOP;</div><div class='add'>+		me4000_outl(tmp, ao_context-&gt;ctrl_reg);</div><div class='add'>+		spin_unlock_irqrestore(&amp;ao_context-&gt;int_lock, flags);</div><div class='add'>+</div><div class='add'>+		while (inl(ao_context-&gt;status_reg) &amp; ME4000_AO_STATUS_BIT_FSM) {</div><div class='add'>+			sleep_on_timeout(&amp;queue, 1);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Clear the circular buffer */</div><div class='add'>+		ao_context-&gt;circ_buf.head = 0;</div><div class='add'>+		ao_context-&gt;circ_buf.tail = 0;</div><div class='add'>+</div><div class='add'>+		/* Set to transparent mode */</div><div class='add'>+		me4000_ao_simultaneous_disable(ao_context);</div><div class='add'>+</div><div class='add'>+		/* Set to single mode in order to set default voltage */</div><div class='add'>+		spin_lock_irqsave(&amp;ao_context-&gt;int_lock, flags);</div><div class='add'>+		tmp = me4000_inl(ao_context-&gt;ctrl_reg);</div><div class='add'>+		me4000_outl(0x0, ao_context-&gt;ctrl_reg);</div><div class='add'>+</div><div class='add'>+		/* Set voltage to 0V */</div><div class='add'>+		me4000_outl(0x8000, ao_context-&gt;single_reg);</div><div class='add'>+</div><div class='add'>+		/* Set to fastest sample rate */</div><div class='add'>+		me4000_outl(65, ao_context-&gt;timer_reg);</div><div class='add'>+</div><div class='add'>+		/* Set the original mode and enable FIFO */</div><div class='add'>+		me4000_outl(ME4000_AO_CONV_MODE_CONTINUOUS |</div><div class='add'>+			    ME4000_AO_CTRL_BIT_ENABLE_FIFO |</div><div class='add'>+			    ME4000_AO_CTRL_BIT_STOP |</div><div class='add'>+			    ME4000_AO_CTRL_BIT_IMMEDIATE_STOP,</div><div class='add'>+			    ao_context-&gt;ctrl_reg);</div><div class='add'>+		spin_unlock_irqrestore(&amp;ao_context-&gt;int_lock, flags);</div><div class='add'>+	} else {</div><div class='add'>+		/* Set to transparent mode */</div><div class='add'>+		me4000_ao_simultaneous_disable(ao_context);</div><div class='add'>+</div><div class='add'>+		/* Set voltage to 0V */</div><div class='add'>+		me4000_outl(0x8000, ao_context-&gt;single_reg);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t me4000_ao_write_sing(struct file *filep, const char *buff,</div><div class='add'>+				    size_t cnt, loff_t * offp)</div><div class='add'>+{</div><div class='add'>+	me4000_ao_context_t *ao_context = filep-&gt;private_data;</div><div class='add'>+	u32 value;</div><div class='add'>+	const u16 *buffer = (const u16 *)buff;</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("me4000_ao_write_sing() is executed\n");</div><div class='add'>+</div><div class='add'>+	if (cnt != 2) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "me4000_ao_write_sing():Write count is not 2\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (get_user(value, buffer)) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "me4000_ao_write_sing():Cannot copy data from user\n");</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	me4000_outl(value, ao_context-&gt;single_reg);</div><div class='add'>+</div><div class='add'>+	return 2;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t me4000_ao_write_wrap(struct file *filep, const char *buff,</div><div class='add'>+				    size_t cnt, loff_t * offp)</div><div class='add'>+{</div><div class='add'>+	me4000_ao_context_t *ao_context = filep-&gt;private_data;</div><div class='add'>+	size_t i;</div><div class='add'>+	u32 value;</div><div class='add'>+	u32 tmp;</div><div class='add'>+	const u16 *buffer = (const u16 *)buff;</div><div class='add'>+	size_t count = cnt / 2;</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("me4000_ao_write_wrap() is executed\n");</div><div class='add'>+</div><div class='add'>+	/* Check if a conversion is already running */</div><div class='add'>+	if (inl(ao_context-&gt;status_reg) &amp; ME4000_AO_STATUS_BIT_FSM) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "ME4000:me4000_ao_write_wrap():There is already a conversion running\n");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (count &gt; ME4000_AO_FIFO_COUNT) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "me4000_ao_write_wrap():Can't load more than %d values\n",</div><div class='add'>+		       ME4000_AO_FIFO_COUNT);</div><div class='add'>+		return -ENOSPC;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Reset the FIFO */</div><div class='add'>+	tmp = inl(ao_context-&gt;ctrl_reg);</div><div class='add'>+	tmp &amp;= ~ME4000_AO_CTRL_BIT_ENABLE_FIFO;</div><div class='add'>+	outl(tmp, ao_context-&gt;ctrl_reg);</div><div class='add'>+	tmp |= ME4000_AO_CTRL_BIT_ENABLE_FIFO;</div><div class='add'>+	outl(tmp, ao_context-&gt;ctrl_reg);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; count; i++) {</div><div class='add'>+		if (get_user(value, buffer + i)) {</div><div class='add'>+			printk(KERN_ERR</div><div class='add'>+			       "me4000_ao_write_single():Cannot copy data from user\n");</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		}</div><div class='add'>+		if (((ao_context-&gt;fifo_reg &amp; 0xFF) == ME4000_AO_01_FIFO_REG)</div><div class='add'>+		    || ((ao_context-&gt;fifo_reg &amp; 0xFF) == ME4000_AO_03_FIFO_REG))</div><div class='add'>+			value = value &lt;&lt; 16;</div><div class='add'>+		outl(value, ao_context-&gt;fifo_reg);</div><div class='add'>+	}</div><div class='add'>+	CALL_PDEBUG("me4000_ao_write_wrap() is leaved with %d\n", i * 2);</div><div class='add'>+</div><div class='add'>+	return i * 2;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t me4000_ao_write_cont(struct file *filep, const char *buff,</div><div class='add'>+				    size_t cnt, loff_t * offp)</div><div class='add'>+{</div><div class='add'>+	me4000_ao_context_t *ao_context = filep-&gt;private_data;</div><div class='add'>+	const u16 *buffer = (const u16 *)buff;</div><div class='add'>+	size_t count = cnt / 2;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u32 tmp;</div><div class='add'>+	int c = 0;</div><div class='add'>+	int k = 0;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	u16 svalue;</div><div class='add'>+	u32 lvalue;</div><div class='add'>+	int i;</div><div class='add'>+	wait_queue_head_t queue;</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("me4000_ao_write_cont() is executed\n");</div><div class='add'>+</div><div class='add'>+	init_waitqueue_head(&amp;queue);</div><div class='add'>+</div><div class='add'>+	/* Check count */</div><div class='add'>+	if (count &lt;= 0) {</div><div class='add'>+		PDEBUG("me4000_ao_write_cont():Count is 0\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (filep-&gt;f_flags &amp; O_APPEND) {</div><div class='add'>+		PDEBUG("me4000_ao_write_cont():Append data to data stream\n");</div><div class='add'>+		while (count &gt; 0) {</div><div class='add'>+			if (filep-&gt;f_flags &amp; O_NONBLOCK) {</div><div class='add'>+				if (ao_context-&gt;pipe_flag) {</div><div class='add'>+					printk(KERN_ERR</div><div class='add'>+					       "ME4000:me4000_ao_write_cont():Broken pipe in nonblocking write\n");</div><div class='add'>+					return -EPIPE;</div><div class='add'>+				}</div><div class='add'>+				c = me4000_space_to_end(ao_context-&gt;circ_buf,</div><div class='add'>+							ME4000_AO_BUFFER_COUNT);</div><div class='add'>+				if (!c) {</div><div class='add'>+					PDEBUG</div><div class='add'>+					    ("me4000_ao_write_cont():Returning from nonblocking write\n");</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+			} else {</div><div class='add'>+				wait_event_interruptible(ao_context-&gt;wait_queue,</div><div class='add'>+							 (c =</div><div class='add'>+							  me4000_space_to_end</div><div class='add'>+							  (ao_context-&gt;circ_buf,</div><div class='add'>+							   ME4000_AO_BUFFER_COUNT)));</div><div class='add'>+				if (ao_context-&gt;pipe_flag) {</div><div class='add'>+					printk(KERN_ERR</div><div class='add'>+					       "me4000_ao_write_cont():Broken pipe in blocking write\n");</div><div class='add'>+					return -EPIPE;</div><div class='add'>+				}</div><div class='add'>+				if (signal_pending(current)) {</div><div class='add'>+					printk(KERN_ERR</div><div class='add'>+					       "me4000_ao_write_cont():Wait for free buffer interrupted from signal\n");</div><div class='add'>+					return -EINTR;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			PDEBUG("me4000_ao_write_cont():Space to end = %d\n", c);</div><div class='add'>+</div><div class='add'>+			/* Only able to write size of free buffer or size of count */</div><div class='add'>+			if (count &lt; c)</div><div class='add'>+				c = count;</div><div class='add'>+</div><div class='add'>+			k = 2 * c;</div><div class='add'>+			k -= copy_from_user(ao_context-&gt;circ_buf.buf +</div><div class='add'>+					    ao_context-&gt;circ_buf.head, buffer,</div><div class='add'>+					    k);</div><div class='add'>+			c = k / 2;</div><div class='add'>+			PDEBUG</div><div class='add'>+			    ("me4000_ao_write_cont():Copy %d values from user space\n",</div><div class='add'>+			     c);</div><div class='add'>+</div><div class='add'>+			if (!c)</div><div class='add'>+				return -EFAULT;</div><div class='add'>+</div><div class='add'>+			ao_context-&gt;circ_buf.head =</div><div class='add'>+			    (ao_context-&gt;circ_buf.head +</div><div class='add'>+			     c) &amp; (ME4000_AO_BUFFER_COUNT - 1);</div><div class='add'>+			buffer += c;</div><div class='add'>+			count -= c;</div><div class='add'>+			ret += c;</div><div class='add'>+</div><div class='add'>+			/* Values are now available so enable interrupts */</div><div class='add'>+			spin_lock_irqsave(&amp;ao_context-&gt;int_lock, flags);</div><div class='add'>+			if (me4000_buf_count</div><div class='add'>+			    (ao_context-&gt;circ_buf, ME4000_AO_BUFFER_COUNT)) {</div><div class='add'>+				tmp = me4000_inl(ao_context-&gt;ctrl_reg);</div><div class='add'>+				tmp |= ME4000_AO_CTRL_BIT_ENABLE_IRQ;</div><div class='add'>+				me4000_outl(tmp, ao_context-&gt;ctrl_reg);</div><div class='add'>+			}</div><div class='add'>+			spin_unlock_irqrestore(&amp;ao_context-&gt;int_lock, flags);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Wait until the state machine is stopped if O_SYNC is set */</div><div class='add'>+		if (filep-&gt;f_flags &amp; O_SYNC) {</div><div class='add'>+			while (inl(ao_context-&gt;status_reg) &amp;</div><div class='add'>+			       ME4000_AO_STATUS_BIT_FSM) {</div><div class='add'>+				interruptible_sleep_on_timeout(&amp;queue, 1);</div><div class='add'>+				if (ao_context-&gt;pipe_flag) {</div><div class='add'>+					PDEBUG</div><div class='add'>+					    ("me4000_ao_write_cont():Broken pipe detected after sync\n");</div><div class='add'>+					return -EPIPE;</div><div class='add'>+				}</div><div class='add'>+				if (signal_pending(current)) {</div><div class='add'>+					printk(KERN_ERR</div><div class='add'>+					       "me4000_ao_write_cont():Wait on state machine after sync interrupted\n");</div><div class='add'>+					return -EINTR;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		PDEBUG("me4000_ao_write_cont():Preload DAC FIFO\n");</div><div class='add'>+		if ((me4000_inl(ao_context-&gt;status_reg) &amp;</div><div class='add'>+		     ME4000_AO_STATUS_BIT_FSM)) {</div><div class='add'>+			printk(KERN_ERR</div><div class='add'>+			       "me4000_ao_write_cont():Can't Preload DAC FIFO while conversion is running\n");</div><div class='add'>+			return -EBUSY;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Clear the FIFO */</div><div class='add'>+		spin_lock_irqsave(&amp;ao_context-&gt;int_lock, flags);</div><div class='add'>+		tmp = me4000_inl(ao_context-&gt;ctrl_reg);</div><div class='add'>+		tmp &amp;=</div><div class='add'>+		    ~(ME4000_AO_CTRL_BIT_ENABLE_FIFO |</div><div class='add'>+		      ME4000_AO_CTRL_BIT_ENABLE_IRQ);</div><div class='add'>+		me4000_outl(tmp, ao_context-&gt;ctrl_reg);</div><div class='add'>+		tmp |= ME4000_AO_CTRL_BIT_ENABLE_FIFO;</div><div class='add'>+		me4000_outl(tmp, ao_context-&gt;ctrl_reg);</div><div class='add'>+		spin_unlock_irqrestore(&amp;ao_context-&gt;int_lock, flags);</div><div class='add'>+</div><div class='add'>+		/* Clear the circular buffer */</div><div class='add'>+		ao_context-&gt;circ_buf.head = 0;</div><div class='add'>+		ao_context-&gt;circ_buf.tail = 0;</div><div class='add'>+</div><div class='add'>+		/* Reset the broken pipe flag */</div><div class='add'>+		ao_context-&gt;pipe_flag = 0;</div><div class='add'>+</div><div class='add'>+		/* Only able to write size of fifo or count */</div><div class='add'>+		c = ME4000_AO_FIFO_COUNT;</div><div class='add'>+		if (count &lt; c)</div><div class='add'>+			c = count;</div><div class='add'>+</div><div class='add'>+		PDEBUG</div><div class='add'>+		    ("me4000_ao_write_cont():Write %d values to DAC on 0x%lX\n",</div><div class='add'>+		     c, ao_context-&gt;fifo_reg);</div><div class='add'>+</div><div class='add'>+		/* Write values to the fifo */</div><div class='add'>+		for (i = 0; i &lt; c; i++) {</div><div class='add'>+			if (get_user(svalue, buffer))</div><div class='add'>+				return -EFAULT;</div><div class='add'>+</div><div class='add'>+			if (((ao_context-&gt;fifo_reg &amp; 0xFF) ==</div><div class='add'>+			     ME4000_AO_01_FIFO_REG)</div><div class='add'>+			    || ((ao_context-&gt;fifo_reg &amp; 0xFF) ==</div><div class='add'>+				ME4000_AO_03_FIFO_REG)) {</div><div class='add'>+				lvalue = ((u32) svalue) &lt;&lt; 16;</div><div class='add'>+			} else</div><div class='add'>+				lvalue = (u32) svalue;</div><div class='add'>+</div><div class='add'>+			outl(lvalue, ao_context-&gt;fifo_reg);</div><div class='add'>+			buffer++;</div><div class='add'>+		}</div><div class='add'>+		count -= c;</div><div class='add'>+		ret += c;</div><div class='add'>+</div><div class='add'>+		while (1) {</div><div class='add'>+			/* Get free buffer */</div><div class='add'>+			c = me4000_space_to_end(ao_context-&gt;circ_buf,</div><div class='add'>+						ME4000_AO_BUFFER_COUNT);</div><div class='add'>+</div><div class='add'>+			if (c == 0)</div><div class='add'>+				return (2 * ret);</div><div class='add'>+</div><div class='add'>+			/* Only able to write size of free buffer or size of count */</div><div class='add'>+			if (count &lt; c)</div><div class='add'>+				c = count;</div><div class='add'>+</div><div class='add'>+			/* If count = 0 return to user */</div><div class='add'>+			if (c &lt;= 0) {</div><div class='add'>+				PDEBUG</div><div class='add'>+				    ("me4000_ao_write_cont():Count reached 0\n");</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			k = 2 * c;</div><div class='add'>+			k -= copy_from_user(ao_context-&gt;circ_buf.buf +</div><div class='add'>+					    ao_context-&gt;circ_buf.head, buffer,</div><div class='add'>+					    k);</div><div class='add'>+			c = k / 2;</div><div class='add'>+			PDEBUG</div><div class='add'>+			    ("me4000_ao_write_cont():Wrote %d values to buffer\n",</div><div class='add'>+			     c);</div><div class='add'>+</div><div class='add'>+			if (!c)</div><div class='add'>+				return -EFAULT;</div><div class='add'>+</div><div class='add'>+			ao_context-&gt;circ_buf.head =</div><div class='add'>+			    (ao_context-&gt;circ_buf.head +</div><div class='add'>+			     c) &amp; (ME4000_AO_BUFFER_COUNT - 1);</div><div class='add'>+			buffer += c;</div><div class='add'>+			count -= c;</div><div class='add'>+			ret += c;</div><div class='add'>+</div><div class='add'>+			/* If values in the buffer are available so enable interrupts */</div><div class='add'>+			spin_lock_irqsave(&amp;ao_context-&gt;int_lock, flags);</div><div class='add'>+			if (me4000_buf_count</div><div class='add'>+			    (ao_context-&gt;circ_buf, ME4000_AO_BUFFER_COUNT)) {</div><div class='add'>+				PDEBUG</div><div class='add'>+				    ("me4000_ao_write_cont():Enable Interrupts\n");</div><div class='add'>+				tmp = me4000_inl(ao_context-&gt;ctrl_reg);</div><div class='add'>+				tmp |= ME4000_AO_CTRL_BIT_ENABLE_IRQ;</div><div class='add'>+				me4000_outl(tmp, ao_context-&gt;ctrl_reg);</div><div class='add'>+			}</div><div class='add'>+			spin_unlock_irqrestore(&amp;ao_context-&gt;int_lock, flags);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (filep-&gt;f_flags &amp; O_NONBLOCK) {</div><div class='add'>+		return (ret == 0) ? -EAGAIN : 2 * ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 2 * ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int me4000_ao_poll_cont(struct file *file_p, poll_table * wait)</div><div class='add'>+{</div><div class='add'>+	me4000_ao_context_t *ao_context;</div><div class='add'>+	unsigned long mask = 0;</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("me4000_ao_poll_cont() is executed\n");</div><div class='add'>+</div><div class='add'>+	ao_context = file_p-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	poll_wait(file_p, &amp;ao_context-&gt;wait_queue, wait);</div><div class='add'>+</div><div class='add'>+	/* Get free buffer */</div><div class='add'>+	if (me4000_space_to_end(ao_context-&gt;circ_buf, ME4000_AO_BUFFER_COUNT))</div><div class='add'>+		mask |= POLLOUT | POLLWRNORM;</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("me4000_ao_poll_cont():Return mask %lX\n", mask);</div><div class='add'>+</div><div class='add'>+	return mask;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int me4000_ao_fsync_cont(struct file *file_p, struct dentry *dentry_p,</div><div class='add'>+				int datasync)</div><div class='add'>+{</div><div class='add'>+	me4000_ao_context_t *ao_context;</div><div class='add'>+	wait_queue_head_t queue;</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("me4000_ao_fsync_cont() is executed\n");</div><div class='add'>+</div><div class='add'>+	ao_context = file_p-&gt;private_data;</div><div class='add'>+	init_waitqueue_head(&amp;queue);</div><div class='add'>+</div><div class='add'>+	while (inl(ao_context-&gt;status_reg) &amp; ME4000_AO_STATUS_BIT_FSM) {</div><div class='add'>+		interruptible_sleep_on_timeout(&amp;queue, 1);</div><div class='add'>+		if (ao_context-&gt;pipe_flag) {</div><div class='add'>+			printk(KERN_ERR</div><div class='add'>+			       "me4000_ao_fsync_cont():Broken pipe detected\n");</div><div class='add'>+			return -EPIPE;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (signal_pending(current)) {</div><div class='add'>+			printk(KERN_ERR</div><div class='add'>+			       "me4000_ao_fsync_cont():Wait on state machine interrupted\n");</div><div class='add'>+			return -EINTR;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int me4000_ao_ioctl_sing(struct inode *inode_p, struct file *file_p,</div><div class='add'>+				unsigned int service, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	me4000_ao_context_t *ao_context;</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("me4000_ao_ioctl_sing() is executed\n");</div><div class='add'>+</div><div class='add'>+	ao_context = file_p-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	if (_IOC_TYPE(service) != ME4000_MAGIC) {</div><div class='add'>+		return -ENOTTY;</div><div class='add'>+		PDEBUG("me4000_ao_ioctl_sing():Wrong magic number\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (service) {</div><div class='add'>+	case ME4000_AO_EX_TRIG_SETUP:</div><div class='add'>+		return me4000_ao_ex_trig_set_edge((int *)arg, ao_context);</div><div class='add'>+	case ME4000_AO_EX_TRIG_ENABLE:</div><div class='add'>+		return me4000_ao_ex_trig_enable(ao_context);</div><div class='add'>+	case ME4000_AO_EX_TRIG_DISABLE:</div><div class='add'>+		return me4000_ao_ex_trig_disable(ao_context);</div><div class='add'>+	case ME4000_AO_PRELOAD:</div><div class='add'>+		return me4000_ao_preload(ao_context);</div><div class='add'>+	case ME4000_AO_PRELOAD_UPDATE:</div><div class='add'>+		return me4000_ao_preload_update(ao_context);</div><div class='add'>+	case ME4000_GET_USER_INFO:</div><div class='add'>+		return me4000_get_user_info((me4000_user_info_t *) arg,</div><div class='add'>+					    ao_context-&gt;board_info);</div><div class='add'>+	case ME4000_AO_SIMULTANEOUS_EX_TRIG:</div><div class='add'>+		return me4000_ao_simultaneous_ex_trig(ao_context);</div><div class='add'>+	case ME4000_AO_SIMULTANEOUS_SW:</div><div class='add'>+		return me4000_ao_simultaneous_sw(ao_context);</div><div class='add'>+	case ME4000_AO_SIMULTANEOUS_DISABLE:</div><div class='add'>+		return me4000_ao_simultaneous_disable(ao_context);</div><div class='add'>+	case ME4000_AO_SIMULTANEOUS_UPDATE:</div><div class='add'>+		return</div><div class='add'>+		    me4000_ao_simultaneous_update((me4000_ao_channel_list_t *)</div><div class='add'>+						  arg, ao_context);</div><div class='add'>+	case ME4000_AO_EX_TRIG_TIMEOUT:</div><div class='add'>+		return me4000_ao_ex_trig_timeout((unsigned long *)arg,</div><div class='add'>+						 ao_context);</div><div class='add'>+	case ME4000_AO_DISABLE_DO:</div><div class='add'>+		return me4000_ao_disable_do(ao_context);</div><div class='add'>+	default:</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "me4000_ao_ioctl_sing():Service number invalid\n");</div><div class='add'>+		return -ENOTTY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int me4000_ao_ioctl_wrap(struct inode *inode_p, struct file *file_p,</div><div class='add'>+				unsigned int service, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	me4000_ao_context_t *ao_context;</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("me4000_ao_ioctl_wrap() is executed\n");</div><div class='add'>+</div><div class='add'>+	ao_context = file_p-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	if (_IOC_TYPE(service) != ME4000_MAGIC) {</div><div class='add'>+		return -ENOTTY;</div><div class='add'>+		PDEBUG("me4000_ao_ioctl_wrap():Wrong magic number\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (service) {</div><div class='add'>+	case ME4000_AO_START:</div><div class='add'>+		return me4000_ao_start((unsigned long *)arg, ao_context);</div><div class='add'>+	case ME4000_AO_STOP:</div><div class='add'>+		return me4000_ao_stop(ao_context);</div><div class='add'>+	case ME4000_AO_IMMEDIATE_STOP:</div><div class='add'>+		return me4000_ao_immediate_stop(ao_context);</div><div class='add'>+	case ME4000_AO_RESET:</div><div class='add'>+		return me4000_ao_reset(ao_context);</div><div class='add'>+	case ME4000_AO_TIMER_SET_DIVISOR:</div><div class='add'>+		return me4000_ao_timer_set_divisor((u32 *) arg, ao_context);</div><div class='add'>+	case ME4000_AO_EX_TRIG_SETUP:</div><div class='add'>+		return me4000_ao_ex_trig_set_edge((int *)arg, ao_context);</div><div class='add'>+	case ME4000_AO_EX_TRIG_ENABLE:</div><div class='add'>+		return me4000_ao_ex_trig_enable(ao_context);</div><div class='add'>+	case ME4000_AO_EX_TRIG_DISABLE:</div><div class='add'>+		return me4000_ao_ex_trig_disable(ao_context);</div><div class='add'>+	case ME4000_GET_USER_INFO:</div><div class='add'>+		return me4000_get_user_info((me4000_user_info_t *) arg,</div><div class='add'>+					    ao_context-&gt;board_info);</div><div class='add'>+	case ME4000_AO_FSM_STATE:</div><div class='add'>+		return me4000_ao_fsm_state((int *)arg, ao_context);</div><div class='add'>+	case ME4000_AO_ENABLE_DO:</div><div class='add'>+		return me4000_ao_enable_do(ao_context);</div><div class='add'>+	case ME4000_AO_DISABLE_DO:</div><div class='add'>+		return me4000_ao_disable_do(ao_context);</div><div class='add'>+	case ME4000_AO_SYNCHRONOUS_EX_TRIG:</div><div class='add'>+		return me4000_ao_synchronous_ex_trig(ao_context);</div><div class='add'>+	case ME4000_AO_SYNCHRONOUS_SW:</div><div class='add'>+		return me4000_ao_synchronous_sw(ao_context);</div><div class='add'>+	case ME4000_AO_SYNCHRONOUS_DISABLE:</div><div class='add'>+		return me4000_ao_synchronous_disable(ao_context);</div><div class='add'>+	default:</div><div class='add'>+		return -ENOTTY;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int me4000_ao_ioctl_cont(struct inode *inode_p, struct file *file_p,</div><div class='add'>+				unsigned int service, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	me4000_ao_context_t *ao_context;</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("me4000_ao_ioctl_cont() is executed\n");</div><div class='add'>+</div><div class='add'>+	ao_context = file_p-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	if (_IOC_TYPE(service) != ME4000_MAGIC) {</div><div class='add'>+		return -ENOTTY;</div><div class='add'>+		PDEBUG("me4000_ao_ioctl_cont():Wrong magic number\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (service) {</div><div class='add'>+	case ME4000_AO_START:</div><div class='add'>+		return me4000_ao_start((unsigned long *)arg, ao_context);</div><div class='add'>+	case ME4000_AO_STOP:</div><div class='add'>+		return me4000_ao_stop(ao_context);</div><div class='add'>+	case ME4000_AO_IMMEDIATE_STOP:</div><div class='add'>+		return me4000_ao_immediate_stop(ao_context);</div><div class='add'>+	case ME4000_AO_RESET:</div><div class='add'>+		return me4000_ao_reset(ao_context);</div><div class='add'>+	case ME4000_AO_TIMER_SET_DIVISOR:</div><div class='add'>+		return me4000_ao_timer_set_divisor((u32 *) arg, ao_context);</div><div class='add'>+	case ME4000_AO_EX_TRIG_SETUP:</div><div class='add'>+		return me4000_ao_ex_trig_set_edge((int *)arg, ao_context);</div><div class='add'>+	case ME4000_AO_EX_TRIG_ENABLE:</div><div class='add'>+		return me4000_ao_ex_trig_enable(ao_context);</div><div class='add'>+	case ME4000_AO_EX_TRIG_DISABLE:</div><div class='add'>+		return me4000_ao_ex_trig_disable(ao_context);</div><div class='add'>+	case ME4000_AO_ENABLE_DO:</div><div class='add'>+		return me4000_ao_enable_do(ao_context);</div><div class='add'>+	case ME4000_AO_DISABLE_DO:</div><div class='add'>+		return me4000_ao_disable_do(ao_context);</div><div class='add'>+	case ME4000_AO_FSM_STATE:</div><div class='add'>+		return me4000_ao_fsm_state((int *)arg, ao_context);</div><div class='add'>+	case ME4000_GET_USER_INFO:</div><div class='add'>+		return me4000_get_user_info((me4000_user_info_t *) arg,</div><div class='add'>+					    ao_context-&gt;board_info);</div><div class='add'>+	case ME4000_AO_SYNCHRONOUS_EX_TRIG:</div><div class='add'>+		return me4000_ao_synchronous_ex_trig(ao_context);</div><div class='add'>+	case ME4000_AO_SYNCHRONOUS_SW:</div><div class='add'>+		return me4000_ao_synchronous_sw(ao_context);</div><div class='add'>+	case ME4000_AO_SYNCHRONOUS_DISABLE:</div><div class='add'>+		return me4000_ao_synchronous_disable(ao_context);</div><div class='add'>+	case ME4000_AO_GET_FREE_BUFFER:</div><div class='add'>+		return me4000_ao_get_free_buffer((unsigned long *)arg,</div><div class='add'>+						 ao_context);</div><div class='add'>+	default:</div><div class='add'>+		return -ENOTTY;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int me4000_ao_start(unsigned long *arg, me4000_ao_context_t * ao_context)</div><div class='add'>+{</div><div class='add'>+	u32 tmp;</div><div class='add'>+	wait_queue_head_t queue;</div><div class='add'>+	unsigned long ref;</div><div class='add'>+	unsigned long timeout;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("me4000_ao_start() is executed\n");</div><div class='add'>+</div><div class='add'>+	if (get_user(timeout, arg)) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "me4000_ao_start():Cannot copy data from user\n");</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	init_waitqueue_head(&amp;queue);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;ao_context-&gt;int_lock, flags);</div><div class='add'>+	tmp = inl(ao_context-&gt;ctrl_reg);</div><div class='add'>+	tmp &amp;= ~(ME4000_AO_CTRL_BIT_STOP | ME4000_AO_CTRL_BIT_IMMEDIATE_STOP);</div><div class='add'>+	me4000_outl(tmp, ao_context-&gt;ctrl_reg);</div><div class='add'>+	spin_unlock_irqrestore(&amp;ao_context-&gt;int_lock, flags);</div><div class='add'>+</div><div class='add'>+	if ((tmp &amp; ME4000_AO_CTRL_BIT_ENABLE_EX_TRIG)) {</div><div class='add'>+		if (timeout) {</div><div class='add'>+			ref = jiffies;</div><div class='add'>+			while (!</div><div class='add'>+			       (inl(ao_context-&gt;status_reg) &amp;</div><div class='add'>+				ME4000_AO_STATUS_BIT_FSM)) {</div><div class='add'>+				interruptible_sleep_on_timeout(&amp;queue, 1);</div><div class='add'>+				if (signal_pending(current)) {</div><div class='add'>+					printk(KERN_ERR</div><div class='add'>+					       "ME4000:me4000_ao_start():Wait on start of state machine interrupted\n");</div><div class='add'>+					return -EINTR;</div><div class='add'>+				}</div><div class='add'>+				if (((jiffies - ref) &gt; (timeout * HZ / USER_HZ))) {	// 2.6 has diffrent definitions for HZ in user and kernel space</div><div class='add'>+					printk(KERN_ERR</div><div class='add'>+					       "ME4000:me4000_ao_start():Timeout reached\n");</div><div class='add'>+					return -EIO;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		me4000_outl(0x8000, ao_context-&gt;single_reg);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int me4000_ao_stop(me4000_ao_context_t * ao_context)</div><div class='add'>+{</div><div class='add'>+	u32 tmp;</div><div class='add'>+	wait_queue_head_t queue;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	init_waitqueue_head(&amp;queue);</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("me4000_ao_stop() is executed\n");</div><div class='add'>+</div><div class='add'>+	/* Set the stop bit */</div><div class='add'>+	spin_lock_irqsave(&amp;ao_context-&gt;int_lock, flags);</div><div class='add'>+	tmp = inl(ao_context-&gt;ctrl_reg);</div><div class='add'>+	tmp |= ME4000_AO_CTRL_BIT_STOP;</div><div class='add'>+	me4000_outl(tmp, ao_context-&gt;ctrl_reg);</div><div class='add'>+	spin_unlock_irqrestore(&amp;ao_context-&gt;int_lock, flags);</div><div class='add'>+</div><div class='add'>+	while (inl(ao_context-&gt;status_reg) &amp; ME4000_AO_STATUS_BIT_FSM) {</div><div class='add'>+		interruptible_sleep_on_timeout(&amp;queue, 1);</div><div class='add'>+		if (signal_pending(current)) {</div><div class='add'>+			printk(KERN_ERR</div><div class='add'>+			       "me4000_ao_stop():Wait on state machine after stop interrupted\n");</div><div class='add'>+			return -EINTR;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Clear the stop bit */</div><div class='add'>+	//tmp &amp;= ~ME4000_AO_CTRL_BIT_STOP;</div><div class='add'>+	//me4000_outl(tmp, ao_context-&gt;ctrl_reg);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int me4000_ao_immediate_stop(me4000_ao_context_t * ao_context)</div><div class='add'>+{</div><div class='add'>+	u32 tmp;</div><div class='add'>+	wait_queue_head_t queue;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	init_waitqueue_head(&amp;queue);</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("me4000_ao_immediate_stop() is executed\n");</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;ao_context-&gt;int_lock, flags);</div><div class='add'>+	tmp = inl(ao_context-&gt;ctrl_reg);</div><div class='add'>+	tmp |= ME4000_AO_CTRL_BIT_STOP | ME4000_AO_CTRL_BIT_IMMEDIATE_STOP;</div><div class='add'>+	me4000_outl(tmp, ao_context-&gt;ctrl_reg);</div><div class='add'>+	spin_unlock_irqrestore(&amp;ao_context-&gt;int_lock, flags);</div><div class='add'>+</div><div class='add'>+	while (inl(ao_context-&gt;status_reg) &amp; ME4000_AO_STATUS_BIT_FSM) {</div><div class='add'>+		interruptible_sleep_on_timeout(&amp;queue, 1);</div><div class='add'>+		if (signal_pending(current)) {</div><div class='add'>+			printk(KERN_ERR</div><div class='add'>+			       "me4000_ao_immediate_stop():Wait on state machine after stop interrupted\n");</div><div class='add'>+			return -EINTR;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Clear the stop bits */</div><div class='add'>+	//tmp &amp;= ~(ME4000_AO_CTRL_BIT_STOP | ME4000_AO_CTRL_BIT_IMMEDIATE_STOP);</div><div class='add'>+	//me4000_outl(tmp, ao_context-&gt;ctrl_reg);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int me4000_ao_timer_set_divisor(u32 * arg,</div><div class='add'>+				       me4000_ao_context_t * ao_context)</div><div class='add'>+{</div><div class='add'>+	u32 divisor;</div><div class='add'>+	u32 tmp;</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("me4000_ao_timer set_divisor() is executed\n");</div><div class='add'>+</div><div class='add'>+	if (get_user(divisor, arg))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	/* Check if the state machine is stopped */</div><div class='add'>+	tmp = me4000_inl(ao_context-&gt;status_reg);</div><div class='add'>+	if (tmp &amp; ME4000_AO_STATUS_BIT_FSM) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "me4000_ao_timer_set_divisor():Can't set timer while DAC is running\n");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	PDEBUG("me4000_ao_timer set_divisor():Divisor from user = %d\n",</div><div class='add'>+	       divisor);</div><div class='add'>+</div><div class='add'>+	/* Check if the divisor is right. ME4000_AO_MIN_TICKS is the lowest */</div><div class='add'>+	if (divisor &lt; ME4000_AO_MIN_TICKS) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "ME4000:me4000_ao_timer set_divisor():Divisor to low\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Fix bug in Firmware */</div><div class='add'>+	divisor -= 2;</div><div class='add'>+</div><div class='add'>+	PDEBUG("me4000_ao_timer set_divisor():Divisor to HW = %d\n", divisor);</div><div class='add'>+</div><div class='add'>+	/* Write the divisor */</div><div class='add'>+	me4000_outl(divisor, ao_context-&gt;timer_reg);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int me4000_ao_ex_trig_set_edge(int *arg,</div><div class='add'>+				      me4000_ao_context_t * ao_context)</div><div class='add'>+{</div><div class='add'>+	int mode;</div><div class='add'>+	u32 tmp;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("me4000_ao_ex_trig_set_edge() is executed\n");</div><div class='add'>+</div><div class='add'>+	if (get_user(mode, arg))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	/* Check if the state machine is stopped */</div><div class='add'>+	tmp = me4000_inl(ao_context-&gt;status_reg);</div><div class='add'>+	if (tmp &amp; ME4000_AO_STATUS_BIT_FSM) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "me4000_ao_ex_trig_set_edge():Can't set trigger while DAC is running\n");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (mode == ME4000_AO_TRIGGER_EXT_EDGE_RISING) {</div><div class='add'>+		spin_lock_irqsave(&amp;ao_context-&gt;int_lock, flags);</div><div class='add'>+		tmp = me4000_inl(ao_context-&gt;ctrl_reg);</div><div class='add'>+		tmp &amp;=</div><div class='add'>+		    ~(ME4000_AO_CTRL_BIT_EX_TRIG_EDGE |</div><div class='add'>+		      ME4000_AO_CTRL_BIT_EX_TRIG_BOTH);</div><div class='add'>+		me4000_outl(tmp, ao_context-&gt;ctrl_reg);</div><div class='add'>+		spin_unlock_irqrestore(&amp;ao_context-&gt;int_lock, flags);</div><div class='add'>+	} else if (mode == ME4000_AO_TRIGGER_EXT_EDGE_FALLING) {</div><div class='add'>+		spin_lock_irqsave(&amp;ao_context-&gt;int_lock, flags);</div><div class='add'>+		tmp = me4000_inl(ao_context-&gt;ctrl_reg);</div><div class='add'>+		tmp &amp;= ~ME4000_AO_CTRL_BIT_EX_TRIG_BOTH;</div><div class='add'>+		tmp |= ME4000_AO_CTRL_BIT_EX_TRIG_EDGE;</div><div class='add'>+		me4000_outl(tmp, ao_context-&gt;ctrl_reg);</div><div class='add'>+		spin_unlock_irqrestore(&amp;ao_context-&gt;int_lock, flags);</div><div class='add'>+	} else if (mode == ME4000_AO_TRIGGER_EXT_EDGE_BOTH) {</div><div class='add'>+		spin_lock_irqsave(&amp;ao_context-&gt;int_lock, flags);</div><div class='add'>+		tmp = me4000_inl(ao_context-&gt;ctrl_reg);</div><div class='add'>+		tmp |=</div><div class='add'>+		    ME4000_AO_CTRL_BIT_EX_TRIG_EDGE |</div><div class='add'>+		    ME4000_AO_CTRL_BIT_EX_TRIG_BOTH;</div><div class='add'>+		me4000_outl(tmp, ao_context-&gt;ctrl_reg);</div><div class='add'>+		spin_unlock_irqrestore(&amp;ao_context-&gt;int_lock, flags);</div><div class='add'>+	} else {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "me4000_ao_ex_trig_set_edge():Invalid trigger mode\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int me4000_ao_ex_trig_enable(me4000_ao_context_t * ao_context)</div><div class='add'>+{</div><div class='add'>+	u32 tmp;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("me4000_ao_ex_trig_enable() is executed\n");</div><div class='add'>+</div><div class='add'>+	/* Check if the state machine is stopped */</div><div class='add'>+	tmp = me4000_inl(ao_context-&gt;status_reg);</div><div class='add'>+	if (tmp &amp; ME4000_AO_STATUS_BIT_FSM) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "me4000_ao_ex_trig_enable():Can't enable trigger while DAC is running\n");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;ao_context-&gt;int_lock, flags);</div><div class='add'>+	tmp = me4000_inl(ao_context-&gt;ctrl_reg);</div><div class='add'>+	tmp |= ME4000_AO_CTRL_BIT_ENABLE_EX_TRIG;</div><div class='add'>+	me4000_outl(tmp, ao_context-&gt;ctrl_reg);</div><div class='add'>+	spin_unlock_irqrestore(&amp;ao_context-&gt;int_lock, flags);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int me4000_ao_ex_trig_disable(me4000_ao_context_t * ao_context)</div><div class='add'>+{</div><div class='add'>+	u32 tmp;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("me4000_ao_ex_trig_disable() is executed\n");</div><div class='add'>+</div><div class='add'>+	/* Check if the state machine is stopped */</div><div class='add'>+	tmp = me4000_inl(ao_context-&gt;status_reg);</div><div class='add'>+	if (tmp &amp; ME4000_AO_STATUS_BIT_FSM) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "me4000_ao_ex_trig_disable():Can't disable trigger while DAC is running\n");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;ao_context-&gt;int_lock, flags);</div><div class='add'>+	tmp = me4000_inl(ao_context-&gt;ctrl_reg);</div><div class='add'>+	tmp &amp;= ~ME4000_AO_CTRL_BIT_ENABLE_EX_TRIG;</div><div class='add'>+	me4000_outl(tmp, ao_context-&gt;ctrl_reg);</div><div class='add'>+	spin_unlock_irqrestore(&amp;ao_context-&gt;int_lock, flags);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int me4000_ao_simultaneous_disable(me4000_ao_context_t * ao_context)</div><div class='add'>+{</div><div class='add'>+	u32 tmp;</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("me4000_ao_simultaneous_disable() is executed\n");</div><div class='add'>+</div><div class='add'>+	/* Check if the state machine is stopped */</div><div class='add'>+	/* Be careful here because this function is called from</div><div class='add'>+	   me4000_ao_synchronous disable */</div><div class='add'>+	tmp = me4000_inl(ao_context-&gt;status_reg);</div><div class='add'>+	if (tmp &amp; ME4000_AO_STATUS_BIT_FSM) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "me4000_ao_simultaneous_disable():Can't disable while DAC is running\n");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;ao_context-&gt;board_info-&gt;preload_lock);</div><div class='add'>+	tmp = me4000_inl(ao_context-&gt;preload_reg);</div><div class='add'>+	tmp &amp;= ~(0x1 &lt;&lt; ao_context-&gt;index);	// Disable preload bit</div><div class='add'>+	tmp &amp;= ~(0x1 &lt;&lt; (ao_context-&gt;index + 16));	// Disable hw simultaneous bit</div><div class='add'>+	me4000_outl(tmp, ao_context-&gt;preload_reg);</div><div class='add'>+	spin_unlock(&amp;ao_context-&gt;board_info-&gt;preload_lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int me4000_ao_simultaneous_ex_trig(me4000_ao_context_t * ao_context)</div><div class='add'>+{</div><div class='add'>+	u32 tmp;</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("me4000_ao_simultaneous_ex_trig() is executed\n");</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;ao_context-&gt;board_info-&gt;preload_lock);</div><div class='add'>+	tmp = me4000_inl(ao_context-&gt;preload_reg);</div><div class='add'>+	tmp |= (0x1 &lt;&lt; ao_context-&gt;index);	// Enable preload bit</div><div class='add'>+	tmp |= (0x1 &lt;&lt; (ao_context-&gt;index + 16));	// Enable hw simultaneous bit</div><div class='add'>+	me4000_outl(tmp, ao_context-&gt;preload_reg);</div><div class='add'>+	spin_unlock(&amp;ao_context-&gt;board_info-&gt;preload_lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int me4000_ao_simultaneous_sw(me4000_ao_context_t * ao_context)</div><div class='add'>+{</div><div class='add'>+	u32 tmp;</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("me4000_ao_simultaneous_sw() is executed\n");</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;ao_context-&gt;board_info-&gt;preload_lock);</div><div class='add'>+	tmp = me4000_inl(ao_context-&gt;preload_reg);</div><div class='add'>+	tmp |= (0x1 &lt;&lt; ao_context-&gt;index);	// Enable preload bit</div><div class='add'>+	tmp &amp;= ~(0x1 &lt;&lt; (ao_context-&gt;index + 16));	// Disable hw simultaneous bit</div><div class='add'>+	me4000_outl(tmp, ao_context-&gt;preload_reg);</div><div class='add'>+	spin_unlock(&amp;ao_context-&gt;board_info-&gt;preload_lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int me4000_ao_preload(me4000_ao_context_t * ao_context)</div><div class='add'>+{</div><div class='add'>+	CALL_PDEBUG("me4000_ao_preload() is executed\n");</div><div class='add'>+	return me4000_ao_simultaneous_sw(ao_context);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int me4000_ao_preload_update(me4000_ao_context_t * ao_context)</div><div class='add'>+{</div><div class='add'>+	u32 tmp;</div><div class='add'>+	u32 ctrl;</div><div class='add'>+	struct list_head *entry;</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("me4000_ao_preload_update() is executed\n");</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;ao_context-&gt;board_info-&gt;preload_lock);</div><div class='add'>+	tmp = me4000_inl(ao_context-&gt;preload_reg);</div><div class='add'>+	list_for_each(entry, &amp;ao_context-&gt;board_info-&gt;ao_context_list) {</div><div class='add'>+		/* The channels we update must be in the following state :</div><div class='add'>+		   - Mode A</div><div class='add'>+		   - Hardware trigger is disabled</div><div class='add'>+		   - Corresponding simultaneous bit is reset</div><div class='add'>+		 */</div><div class='add'>+		ctrl = me4000_inl(ao_context-&gt;ctrl_reg);</div><div class='add'>+		if (!</div><div class='add'>+		    (ctrl &amp;</div><div class='add'>+		     (ME4000_AO_CTRL_BIT_MODE_0 | ME4000_AO_CTRL_BIT_MODE_1 |</div><div class='add'>+		      ME4000_AO_CTRL_BIT_ENABLE_EX_TRIG))) {</div><div class='add'>+			if (!</div><div class='add'>+			    (tmp &amp;</div><div class='add'>+			     (0x1 &lt;&lt;</div><div class='add'>+			      (((me4000_ao_context_t *) entry)-&gt;index + 16)))) {</div><div class='add'>+				tmp &amp;=</div><div class='add'>+				    ~(0x1 &lt;&lt;</div><div class='add'>+				      (((me4000_ao_context_t *) entry)-&gt;index));</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	me4000_outl(tmp, ao_context-&gt;preload_reg);</div><div class='add'>+	spin_unlock(&amp;ao_context-&gt;board_info-&gt;preload_lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int me4000_ao_simultaneous_update(me4000_ao_channel_list_t * arg,</div><div class='add'>+					 me4000_ao_context_t * ao_context)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	int i;</div><div class='add'>+	u32 tmp;</div><div class='add'>+	me4000_ao_channel_list_t channels;</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("me4000_ao_simultaneous_update() is executed\n");</div><div class='add'>+</div><div class='add'>+	/* Copy data from user */</div><div class='add'>+	err = copy_from_user(&amp;channels, arg, sizeof(me4000_ao_channel_list_t));</div><div class='add'>+	if (err) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "ME4000:me4000_ao_simultaneous_update():Can't copy command\n");</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	channels.list =</div><div class='add'>+	    kmalloc(sizeof(unsigned long) * channels.count, GFP_KERNEL);</div><div class='add'>+	if (!channels.list) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "ME4000:me4000_ao_simultaneous_update():Can't get buffer\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	memset(channels.list, 0, sizeof(unsigned long) * channels.count);</div><div class='add'>+</div><div class='add'>+	/* Copy channel list from user */</div><div class='add'>+	err =</div><div class='add'>+	    copy_from_user(channels.list, arg-&gt;list,</div><div class='add'>+			   sizeof(unsigned long) * channels.count);</div><div class='add'>+	if (err) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "ME4000:me4000_ao_simultaneous_update():Can't copy list\n");</div><div class='add'>+		kfree(channels.list);</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;ao_context-&gt;board_info-&gt;preload_lock);</div><div class='add'>+	tmp = me4000_inl(ao_context-&gt;preload_reg);</div><div class='add'>+	for (i = 0; i &lt; channels.count; i++) {</div><div class='add'>+		if (channels.list[i] &gt;</div><div class='add'>+		    ao_context-&gt;board_info-&gt;board_p-&gt;ao.count) {</div><div class='add'>+			spin_unlock(&amp;ao_context-&gt;board_info-&gt;preload_lock);</div><div class='add'>+			kfree(channels.list);</div><div class='add'>+			printk(KERN_ERR</div><div class='add'>+			       "ME4000:me4000_ao_simultaneous_update():Invalid board number specified\n");</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		}</div><div class='add'>+		tmp &amp;= ~(0x1 &lt;&lt; channels.list[i]);	// Clear the preload bit</div><div class='add'>+		tmp &amp;= ~(0x1 &lt;&lt; (channels.list[i] + 16));	// Clear the hw simultaneous bit</div><div class='add'>+	}</div><div class='add'>+	me4000_outl(tmp, ao_context-&gt;preload_reg);</div><div class='add'>+	spin_unlock(&amp;ao_context-&gt;board_info-&gt;preload_lock);</div><div class='add'>+	kfree(channels.list);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int me4000_ao_synchronous_ex_trig(me4000_ao_context_t * ao_context)</div><div class='add'>+{</div><div class='add'>+	u32 tmp;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("me4000_ao_synchronous_ex_trig() is executed\n");</div><div class='add'>+</div><div class='add'>+	/* Check if the state machine is stopped */</div><div class='add'>+	tmp = me4000_inl(ao_context-&gt;status_reg);</div><div class='add'>+	if (tmp &amp; ME4000_AO_STATUS_BIT_FSM) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "me4000_ao_synchronous_ex_trig(): DAC is running\n");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;ao_context-&gt;board_info-&gt;preload_lock);</div><div class='add'>+	tmp = me4000_inl(ao_context-&gt;preload_reg);</div><div class='add'>+	tmp &amp;= ~(0x1 &lt;&lt; ao_context-&gt;index);	// Disable synchronous sw bit</div><div class='add'>+	tmp |= 0x1 &lt;&lt; (ao_context-&gt;index + 16);	// Enable synchronous hw bit</div><div class='add'>+	me4000_outl(tmp, ao_context-&gt;preload_reg);</div><div class='add'>+	spin_unlock(&amp;ao_context-&gt;board_info-&gt;preload_lock);</div><div class='add'>+</div><div class='add'>+	/* Make runnable */</div><div class='add'>+	spin_lock_irqsave(&amp;ao_context-&gt;int_lock, flags);</div><div class='add'>+	tmp = me4000_inl(ao_context-&gt;ctrl_reg);</div><div class='add'>+	if (tmp &amp; (ME4000_AO_CTRL_BIT_MODE_0 | ME4000_AO_CTRL_BIT_MODE_1)) {</div><div class='add'>+		tmp &amp;=</div><div class='add'>+		    ~(ME4000_AO_CTRL_BIT_STOP |</div><div class='add'>+		      ME4000_AO_CTRL_BIT_IMMEDIATE_STOP);</div><div class='add'>+		me4000_outl(tmp, ao_context-&gt;ctrl_reg);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;ao_context-&gt;int_lock, flags);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int me4000_ao_synchronous_sw(me4000_ao_context_t * ao_context)</div><div class='add'>+{</div><div class='add'>+	u32 tmp;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("me4000_ao_synchronous_sw() is executed\n");</div><div class='add'>+</div><div class='add'>+	/* Check if the state machine is stopped */</div><div class='add'>+	tmp = me4000_inl(ao_context-&gt;status_reg);</div><div class='add'>+	if (tmp &amp; ME4000_AO_STATUS_BIT_FSM) {</div><div class='add'>+		printk(KERN_ERR "me4000_ao_synchronous_sw(): DAC is running\n");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;ao_context-&gt;board_info-&gt;preload_lock);</div><div class='add'>+	tmp = me4000_inl(ao_context-&gt;preload_reg);</div><div class='add'>+	tmp |= 0x1 &lt;&lt; ao_context-&gt;index;	// Enable synchronous sw bit</div><div class='add'>+	tmp &amp;= ~(0x1 &lt;&lt; (ao_context-&gt;index + 16));	// Disable synchronous hw bit</div><div class='add'>+	me4000_outl(tmp, ao_context-&gt;preload_reg);</div><div class='add'>+	spin_unlock(&amp;ao_context-&gt;board_info-&gt;preload_lock);</div><div class='add'>+</div><div class='add'>+	/* Make runnable */</div><div class='add'>+	spin_lock_irqsave(&amp;ao_context-&gt;int_lock, flags);</div><div class='add'>+	tmp = me4000_inl(ao_context-&gt;ctrl_reg);</div><div class='add'>+	if (tmp &amp; (ME4000_AO_CTRL_BIT_MODE_0 | ME4000_AO_CTRL_BIT_MODE_1)) {</div><div class='add'>+		tmp &amp;=</div><div class='add'>+		    ~(ME4000_AO_CTRL_BIT_STOP |</div><div class='add'>+		      ME4000_AO_CTRL_BIT_IMMEDIATE_STOP);</div><div class='add'>+		me4000_outl(tmp, ao_context-&gt;ctrl_reg);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;ao_context-&gt;int_lock, flags);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int me4000_ao_synchronous_disable(me4000_ao_context_t * ao_context)</div><div class='add'>+{</div><div class='add'>+	return me4000_ao_simultaneous_disable(ao_context);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int me4000_ao_get_free_buffer(unsigned long *arg,</div><div class='add'>+				     me4000_ao_context_t * ao_context)</div><div class='add'>+{</div><div class='add'>+	unsigned long c;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	c = me4000_buf_space(ao_context-&gt;circ_buf, ME4000_AO_BUFFER_COUNT);</div><div class='add'>+</div><div class='add'>+	err = copy_to_user(arg, &amp;c, sizeof(unsigned long));</div><div class='add'>+	if (err) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "ME4000:me4000_ao_get_free_buffer():Can't copy to user space\n");</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int me4000_ao_ex_trig_timeout(unsigned long *arg,</div><div class='add'>+				     me4000_ao_context_t * ao_context)</div><div class='add'>+{</div><div class='add'>+	u32 tmp;</div><div class='add'>+	wait_queue_head_t queue;</div><div class='add'>+	unsigned long ref;</div><div class='add'>+	unsigned long timeout;</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("me4000_ao_ex_trig_timeout() is executed\n");</div><div class='add'>+</div><div class='add'>+	if (get_user(timeout, arg)) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "me4000_ao_ex_trig_timeout():Cannot copy data from user\n");</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	init_waitqueue_head(&amp;queue);</div><div class='add'>+</div><div class='add'>+	tmp = inl(ao_context-&gt;ctrl_reg);</div><div class='add'>+</div><div class='add'>+	if ((tmp &amp; ME4000_AO_CTRL_BIT_ENABLE_EX_TRIG)) {</div><div class='add'>+		if (timeout) {</div><div class='add'>+			ref = jiffies;</div><div class='add'>+			while ((inl(ao_context-&gt;status_reg) &amp;</div><div class='add'>+				ME4000_AO_STATUS_BIT_FSM)) {</div><div class='add'>+				interruptible_sleep_on_timeout(&amp;queue, 1);</div><div class='add'>+				if (signal_pending(current)) {</div><div class='add'>+					printk(KERN_ERR</div><div class='add'>+					       "ME4000:me4000_ao_ex_trig_timeout():Wait on start of state machine interrupted\n");</div><div class='add'>+					return -EINTR;</div><div class='add'>+				}</div><div class='add'>+				if (((jiffies - ref) &gt; (timeout * HZ / USER_HZ))) {	// 2.6 has diffrent definitions for HZ in user and kernel space</div><div class='add'>+					printk(KERN_ERR</div><div class='add'>+					       "ME4000:me4000_ao_ex_trig_timeout():Timeout reached\n");</div><div class='add'>+					return -EIO;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			while ((inl(ao_context-&gt;status_reg) &amp;</div><div class='add'>+				ME4000_AO_STATUS_BIT_FSM)) {</div><div class='add'>+				interruptible_sleep_on_timeout(&amp;queue, 1);</div><div class='add'>+				if (signal_pending(current)) {</div><div class='add'>+					printk(KERN_ERR</div><div class='add'>+					       "ME4000:me4000_ao_ex_trig_timeout():Wait on start of state machine interrupted\n");</div><div class='add'>+					return -EINTR;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "ME4000:me4000_ao_ex_trig_timeout():External Trigger is not enabled\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int me4000_ao_enable_do(me4000_ao_context_t * ao_context)</div><div class='add'>+{</div><div class='add'>+	u32 tmp;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("me4000_ao_enable_do() is executed\n");</div><div class='add'>+</div><div class='add'>+	/* Only available for analog output 3 */</div><div class='add'>+	if (ao_context-&gt;index != 3) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "me4000_ao_enable_do():Only available for analog output 3\n");</div><div class='add'>+		return -ENOTTY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check if the state machine is stopped */</div><div class='add'>+	tmp = me4000_inl(ao_context-&gt;status_reg);</div><div class='add'>+	if (tmp &amp; ME4000_AO_STATUS_BIT_FSM) {</div><div class='add'>+		printk(KERN_ERR "me4000_ao_enable_do(): DAC is running\n");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Set the stop bit */</div><div class='add'>+	spin_lock_irqsave(&amp;ao_context-&gt;int_lock, flags);</div><div class='add'>+	tmp = inl(ao_context-&gt;ctrl_reg);</div><div class='add'>+	tmp |= ME4000_AO_CTRL_BIT_ENABLE_DO;</div><div class='add'>+	me4000_outl(tmp, ao_context-&gt;ctrl_reg);</div><div class='add'>+	spin_unlock_irqrestore(&amp;ao_context-&gt;int_lock, flags);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int me4000_ao_disable_do(me4000_ao_context_t * ao_context)</div><div class='add'>+{</div><div class='add'>+	u32 tmp;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("me4000_ao_disable_do() is executed\n");</div><div class='add'>+</div><div class='add'>+	/* Only available for analog output 3 */</div><div class='add'>+	if (ao_context-&gt;index != 3) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "me4000_ao_disable():Only available for analog output 3\n");</div><div class='add'>+		return -ENOTTY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check if the state machine is stopped */</div><div class='add'>+	tmp = me4000_inl(ao_context-&gt;status_reg);</div><div class='add'>+	if (tmp &amp; ME4000_AO_STATUS_BIT_FSM) {</div><div class='add'>+		printk(KERN_ERR "me4000_ao_disable_do(): DAC is running\n");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;ao_context-&gt;int_lock, flags);</div><div class='add'>+	tmp = inl(ao_context-&gt;ctrl_reg);</div><div class='add'>+	tmp &amp;= ~(ME4000_AO_CTRL_BIT_ENABLE_DO);</div><div class='add'>+	me4000_outl(tmp, ao_context-&gt;ctrl_reg);</div><div class='add'>+	spin_unlock_irqrestore(&amp;ao_context-&gt;int_lock, flags);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int me4000_ao_fsm_state(int *arg, me4000_ao_context_t * ao_context)</div><div class='add'>+{</div><div class='add'>+	unsigned long tmp;</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("me4000_ao_fsm_state() is executed\n");</div><div class='add'>+</div><div class='add'>+	tmp =</div><div class='add'>+	    (me4000_inl(ao_context-&gt;status_reg) &amp; ME4000_AO_STATUS_BIT_FSM) ? 1</div><div class='add'>+	    : 0;</div><div class='add'>+</div><div class='add'>+	if (ao_context-&gt;pipe_flag) {</div><div class='add'>+		printk(KERN_ERR "me4000_ao_fsm_state():Broken pipe detected\n");</div><div class='add'>+		return -EPIPE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (put_user(tmp, arg)) {</div><div class='add'>+		printk(KERN_ERR "me4000_ao_fsm_state():Cannot copy to user\n");</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*------------------------------- Analog input stuff --------------------------------------*/</div><div class='add'>+</div><div class='add'>+static int me4000_ai_prepare(me4000_ai_context_t * ai_context)</div><div class='add'>+{</div><div class='add'>+	wait_queue_head_t queue;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("me4000_ai_prepare() is executed\n");</div><div class='add'>+</div><div class='add'>+	init_waitqueue_head(&amp;queue);</div><div class='add'>+</div><div class='add'>+	/* Set the new mode and stop bits */</div><div class='add'>+	me4000_outl(ai_context-&gt;</div><div class='add'>+		    mode | ME4000_AI_CTRL_BIT_STOP |</div><div class='add'>+		    ME4000_AI_CTRL_BIT_IMMEDIATE_STOP, ai_context-&gt;ctrl_reg);</div><div class='add'>+</div><div class='add'>+	/* Set the timer registers */</div><div class='add'>+	ai_context-&gt;chan_timer = 66;</div><div class='add'>+	ai_context-&gt;chan_pre_timer = 66;</div><div class='add'>+	ai_context-&gt;scan_timer_low = 0;</div><div class='add'>+	ai_context-&gt;scan_timer_high = 0;</div><div class='add'>+</div><div class='add'>+	me4000_outl(65, ai_context-&gt;chan_timer_reg);</div><div class='add'>+	me4000_outl(65, ai_context-&gt;chan_pre_timer_reg);</div><div class='add'>+	me4000_outl(0, ai_context-&gt;scan_timer_low_reg);</div><div class='add'>+	me4000_outl(0, ai_context-&gt;scan_timer_high_reg);</div><div class='add'>+	me4000_outl(0, ai_context-&gt;scan_pre_timer_low_reg);</div><div class='add'>+	me4000_outl(0, ai_context-&gt;scan_pre_timer_high_reg);</div><div class='add'>+</div><div class='add'>+	ai_context-&gt;channel_list_count = 0;</div><div class='add'>+</div><div class='add'>+	if (ai_context-&gt;mode) {</div><div class='add'>+		/* Request the interrupt line */</div><div class='add'>+		err =</div><div class='add'>+		    request_irq(ai_context-&gt;irq, me4000_ai_isr,</div><div class='add'>+				IRQF_DISABLED | IRQF_SHARED, ME4000_NAME,</div><div class='add'>+				ai_context);</div><div class='add'>+		if (err) {</div><div class='add'>+			printk(KERN_ERR</div><div class='add'>+			       "ME4000:me4000_ai_prepare():Can't get interrupt line");</div><div class='add'>+			return -ENODEV;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Allocate circular buffer */</div><div class='add'>+		ai_context-&gt;circ_buf.buf =</div><div class='add'>+		    kmalloc(ME4000_AI_BUFFER_SIZE, GFP_KERNEL);</div><div class='add'>+		if (!ai_context-&gt;circ_buf.buf) {</div><div class='add'>+			printk(KERN_ERR</div><div class='add'>+			       "ME4000:me4000_ai_prepare():Can't get circular buffer\n");</div><div class='add'>+			free_irq(ai_context-&gt;irq, ai_context);</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+		memset(ai_context-&gt;circ_buf.buf, 0, ME4000_AI_BUFFER_SIZE);</div><div class='add'>+</div><div class='add'>+		/* Clear the circular buffer */</div><div class='add'>+		ai_context-&gt;circ_buf.head = 0;</div><div class='add'>+		ai_context-&gt;circ_buf.tail = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int me4000_ai_reset(me4000_ai_context_t * ai_context)</div><div class='add'>+{</div><div class='add'>+	wait_queue_head_t queue;</div><div class='add'>+	u32 tmp;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("me4000_ai_reset() is executed\n");</div><div class='add'>+</div><div class='add'>+	init_waitqueue_head(&amp;queue);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * First stop conversion of the state machine before reconfigure.</div><div class='add'>+	 * If not stopped before configuring mode, it could</div><div class='add'>+	 * walk in a undefined state.</div><div class='add'>+	 */</div><div class='add'>+	spin_lock_irqsave(&amp;ai_context-&gt;int_lock, flags);</div><div class='add'>+	tmp = me4000_inl(ai_context-&gt;ctrl_reg);</div><div class='add'>+	tmp |= ME4000_AI_CTRL_BIT_IMMEDIATE_STOP;</div><div class='add'>+	me4000_outl(tmp, ai_context-&gt;ctrl_reg);</div><div class='add'>+	spin_unlock_irqrestore(&amp;ai_context-&gt;int_lock, flags);</div><div class='add'>+</div><div class='add'>+	while (inl(ai_context-&gt;status_reg) &amp; ME4000_AI_STATUS_BIT_FSM) {</div><div class='add'>+		interruptible_sleep_on_timeout(&amp;queue, 1);</div><div class='add'>+		if (signal_pending(current)) {</div><div class='add'>+			printk(KERN_ERR</div><div class='add'>+			       "me4000_ai_reset():Wait on state machine after stop interrupted\n");</div><div class='add'>+			return -EINTR;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Clear the control register and set the stop bits */</div><div class='add'>+	spin_lock_irqsave(&amp;ai_context-&gt;int_lock, flags);</div><div class='add'>+	tmp = me4000_inl(ai_context-&gt;ctrl_reg);</div><div class='add'>+	me4000_outl(ME4000_AI_CTRL_BIT_IMMEDIATE_STOP | ME4000_AI_CTRL_BIT_STOP,</div><div class='add'>+		    ai_context-&gt;ctrl_reg);</div><div class='add'>+	spin_unlock_irqrestore(&amp;ai_context-&gt;int_lock, flags);</div><div class='add'>+</div><div class='add'>+	/* Reset timer registers */</div><div class='add'>+	ai_context-&gt;chan_timer = 66;</div><div class='add'>+	ai_context-&gt;chan_pre_timer = 66;</div><div class='add'>+	ai_context-&gt;scan_timer_low = 0;</div><div class='add'>+	ai_context-&gt;scan_timer_high = 0;</div><div class='add'>+	ai_context-&gt;sample_counter = 0;</div><div class='add'>+	ai_context-&gt;sample_counter_reload = 0;</div><div class='add'>+</div><div class='add'>+	me4000_outl(65, ai_context-&gt;chan_timer_reg);</div><div class='add'>+	me4000_outl(65, ai_context-&gt;chan_pre_timer_reg);</div><div class='add'>+	me4000_outl(0, ai_context-&gt;scan_timer_low_reg);</div><div class='add'>+	me4000_outl(0, ai_context-&gt;scan_timer_high_reg);</div><div class='add'>+	me4000_outl(0, ai_context-&gt;scan_pre_timer_low_reg);</div><div class='add'>+	me4000_outl(0, ai_context-&gt;scan_pre_timer_high_reg);</div><div class='add'>+	me4000_outl(0, ai_context-&gt;sample_counter_reg);</div><div class='add'>+</div><div class='add'>+	ai_context-&gt;channel_list_count = 0;</div><div class='add'>+</div><div class='add'>+	/* Clear the circular buffer */</div><div class='add'>+	ai_context-&gt;circ_buf.head = 0;</div><div class='add'>+	ai_context-&gt;circ_buf.tail = 0;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int me4000_ai_ioctl_sing(struct inode *inode_p, struct file *file_p,</div><div class='add'>+				unsigned int service, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	me4000_ai_context_t *ai_context;</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("me4000_ai_ioctl_sing() is executed\n");</div><div class='add'>+</div><div class='add'>+	ai_context = file_p-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	if (_IOC_TYPE(service) != ME4000_MAGIC) {</div><div class='add'>+		printk(KERN_ERR "me4000_ai_ioctl_sing():Wrong magic number\n");</div><div class='add'>+		return -ENOTTY;</div><div class='add'>+	}</div><div class='add'>+	if (_IOC_NR(service) &gt; ME4000_IOCTL_MAXNR) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "me4000_ai_ioctl_sing():Service number to high\n");</div><div class='add'>+		return -ENOTTY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (service) {</div><div class='add'>+	case ME4000_AI_SINGLE:</div><div class='add'>+		return me4000_ai_single((me4000_ai_single_t *) arg, ai_context);</div><div class='add'>+	case ME4000_AI_EX_TRIG_ENABLE:</div><div class='add'>+		return me4000_ai_ex_trig_enable(ai_context);</div><div class='add'>+	case ME4000_AI_EX_TRIG_DISABLE:</div><div class='add'>+		return me4000_ai_ex_trig_disable(ai_context);</div><div class='add'>+	case ME4000_AI_EX_TRIG_SETUP:</div><div class='add'>+		return me4000_ai_ex_trig_setup((me4000_ai_trigger_t *) arg,</div><div class='add'>+					       ai_context);</div><div class='add'>+	case ME4000_GET_USER_INFO:</div><div class='add'>+		return me4000_get_user_info((me4000_user_info_t *) arg,</div><div class='add'>+					    ai_context-&gt;board_info);</div><div class='add'>+	case ME4000_AI_OFFSET_ENABLE:</div><div class='add'>+		return me4000_ai_offset_enable(ai_context);</div><div class='add'>+	case ME4000_AI_OFFSET_DISABLE:</div><div class='add'>+		return me4000_ai_offset_disable(ai_context);</div><div class='add'>+	case ME4000_AI_FULLSCALE_ENABLE:</div><div class='add'>+		return me4000_ai_fullscale_enable(ai_context);</div><div class='add'>+	case ME4000_AI_FULLSCALE_DISABLE:</div><div class='add'>+		return me4000_ai_fullscale_disable(ai_context);</div><div class='add'>+	case ME4000_AI_EEPROM_READ:</div><div class='add'>+		return me4000_eeprom_read((me4000_eeprom_t *) arg, ai_context);</div><div class='add'>+	case ME4000_AI_EEPROM_WRITE:</div><div class='add'>+		return me4000_eeprom_write((me4000_eeprom_t *) arg, ai_context);</div><div class='add'>+	default:</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "me4000_ai_ioctl_sing():Invalid service number\n");</div><div class='add'>+		return -ENOTTY;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int me4000_ai_single(me4000_ai_single_t * arg,</div><div class='add'>+			    me4000_ai_context_t * ai_context)</div><div class='add'>+{</div><div class='add'>+	me4000_ai_single_t cmd;</div><div class='add'>+	int err;</div><div class='add'>+	u32 tmp;</div><div class='add'>+	wait_queue_head_t queue;</div><div class='add'>+	unsigned long jiffy;</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("me4000_ai_single() is executed\n");</div><div class='add'>+</div><div class='add'>+	init_waitqueue_head(&amp;queue);</div><div class='add'>+</div><div class='add'>+	/* Copy data from user */</div><div class='add'>+	err = copy_from_user(&amp;cmd, arg, sizeof(me4000_ai_single_t));</div><div class='add'>+	if (err) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "ME4000:me4000_ai_single():Can't copy from user space\n");</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check range parameter */</div><div class='add'>+	switch (cmd.range) {</div><div class='add'>+	case ME4000_AI_LIST_RANGE_BIPOLAR_10:</div><div class='add'>+	case ME4000_AI_LIST_RANGE_BIPOLAR_2_5:</div><div class='add'>+	case ME4000_AI_LIST_RANGE_UNIPOLAR_10:</div><div class='add'>+	case ME4000_AI_LIST_RANGE_UNIPOLAR_2_5:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "ME4000:me4000_ai_single():Invalid range specified\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check mode and channel number */</div><div class='add'>+	switch (cmd.mode) {</div><div class='add'>+	case ME4000_AI_LIST_INPUT_SINGLE_ENDED:</div><div class='add'>+		if (cmd.channel &gt;= ai_context-&gt;board_info-&gt;board_p-&gt;ai.count) {</div><div class='add'>+			printk(KERN_ERR</div><div class='add'>+			       "ME4000:me4000_ai_single():Analog input is not available\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case ME4000_AI_LIST_INPUT_DIFFERENTIAL:</div><div class='add'>+		if (cmd.channel &gt;=</div><div class='add'>+		    ai_context-&gt;board_info-&gt;board_p-&gt;ai.diff_count) {</div><div class='add'>+			printk(KERN_ERR</div><div class='add'>+			       "ME4000:me4000_ai_single():Analog input is not available in differential mode\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "ME4000:me4000_ai_single():Invalid mode specified\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Clear channel list, data fifo and both stop bits */</div><div class='add'>+	tmp = me4000_inl(ai_context-&gt;ctrl_reg);</div><div class='add'>+	tmp &amp;=</div><div class='add'>+	    ~(ME4000_AI_CTRL_BIT_CHANNEL_FIFO | ME4000_AI_CTRL_BIT_DATA_FIFO |</div><div class='add'>+	      ME4000_AI_CTRL_BIT_STOP | ME4000_AI_CTRL_BIT_IMMEDIATE_STOP);</div><div class='add'>+	me4000_outl(tmp, ai_context-&gt;ctrl_reg);</div><div class='add'>+</div><div class='add'>+	/* Enable channel list and data fifo */</div><div class='add'>+	tmp |= ME4000_AI_CTRL_BIT_CHANNEL_FIFO | ME4000_AI_CTRL_BIT_DATA_FIFO;</div><div class='add'>+	me4000_outl(tmp, ai_context-&gt;ctrl_reg);</div><div class='add'>+</div><div class='add'>+	/* Generate channel list entry */</div><div class='add'>+	me4000_outl(cmd.channel | cmd.range | cmd.</div><div class='add'>+		    mode | ME4000_AI_LIST_LAST_ENTRY,</div><div class='add'>+		    ai_context-&gt;channel_list_reg);</div><div class='add'>+</div><div class='add'>+	/* Set the timer to maximum */</div><div class='add'>+	me4000_outl(66, ai_context-&gt;chan_timer_reg);</div><div class='add'>+	me4000_outl(66, ai_context-&gt;chan_pre_timer_reg);</div><div class='add'>+</div><div class='add'>+	if (tmp &amp; ME4000_AI_CTRL_BIT_EX_TRIG) {</div><div class='add'>+		jiffy = jiffies;</div><div class='add'>+		while (!</div><div class='add'>+		       (me4000_inl(ai_context-&gt;status_reg) &amp;</div><div class='add'>+			ME4000_AI_STATUS_BIT_EF_DATA)) {</div><div class='add'>+			interruptible_sleep_on_timeout(&amp;queue, 1);</div><div class='add'>+			if (signal_pending(current)) {</div><div class='add'>+				printk(KERN_ERR</div><div class='add'>+				       "ME4000:me4000_ai_single():Wait on start of state machine interrupted\n");</div><div class='add'>+				return -EINTR;</div><div class='add'>+			}</div><div class='add'>+			if (((jiffies - jiffy) &gt; (cmd.timeout * HZ / USER_HZ)) &amp;&amp; cmd.timeout) {	// 2.6 has diffrent definitions for HZ in user and kernel space</div><div class='add'>+				printk(KERN_ERR</div><div class='add'>+				       "ME4000:me4000_ai_single():Timeout reached\n");</div><div class='add'>+				return -EIO;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		/* Start conversion */</div><div class='add'>+		me4000_inl(ai_context-&gt;start_reg);</div><div class='add'>+</div><div class='add'>+		/* Wait until ready */</div><div class='add'>+		udelay(10);</div><div class='add'>+		if (!</div><div class='add'>+		    (me4000_inl(ai_context-&gt;status_reg) &amp;</div><div class='add'>+		     ME4000_AI_STATUS_BIT_EF_DATA)) {</div><div class='add'>+			printk(KERN_ERR</div><div class='add'>+			       "ME4000:me4000_ai_single():Value not available after wait\n");</div><div class='add'>+			return -EIO;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Read value from data fifo */</div><div class='add'>+	cmd.value = me4000_inl(ai_context-&gt;data_reg) &amp; 0xFFFF;</div><div class='add'>+</div><div class='add'>+	/* Copy result back to user */</div><div class='add'>+	err = copy_to_user(arg, &amp;cmd, sizeof(me4000_ai_single_t));</div><div class='add'>+	if (err) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "ME4000:me4000_ai_single():Can't copy to user space\n");</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int me4000_ai_ioctl_sw(struct inode *inode_p, struct file *file_p,</div><div class='add'>+			      unsigned int service, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	me4000_ai_context_t *ai_context;</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("me4000_ai_ioctl_sw() is executed\n");</div><div class='add'>+</div><div class='add'>+	ai_context = file_p-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	if (_IOC_TYPE(service) != ME4000_MAGIC) {</div><div class='add'>+		printk(KERN_ERR "me4000_ai_ioctl_sw():Wrong magic number\n");</div><div class='add'>+		return -ENOTTY;</div><div class='add'>+	}</div><div class='add'>+	if (_IOC_NR(service) &gt; ME4000_IOCTL_MAXNR) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "me4000_ai_ioctl_sw():Service number to high\n");</div><div class='add'>+		return -ENOTTY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (service) {</div><div class='add'>+	case ME4000_AI_SC_SETUP:</div><div class='add'>+		return me4000_ai_sc_setup((me4000_ai_sc_t *) arg, ai_context);</div><div class='add'>+	case ME4000_AI_CONFIG:</div><div class='add'>+		return me4000_ai_config((me4000_ai_config_t *) arg, ai_context);</div><div class='add'>+	case ME4000_AI_START:</div><div class='add'>+		return me4000_ai_start(ai_context);</div><div class='add'>+	case ME4000_AI_STOP:</div><div class='add'>+		return me4000_ai_stop(ai_context);</div><div class='add'>+	case ME4000_AI_IMMEDIATE_STOP:</div><div class='add'>+		return me4000_ai_immediate_stop(ai_context);</div><div class='add'>+	case ME4000_AI_FSM_STATE:</div><div class='add'>+		return me4000_ai_fsm_state((int *)arg, ai_context);</div><div class='add'>+	case ME4000_GET_USER_INFO:</div><div class='add'>+		return me4000_get_user_info((me4000_user_info_t *) arg,</div><div class='add'>+					    ai_context-&gt;board_info);</div><div class='add'>+	case ME4000_AI_EEPROM_READ:</div><div class='add'>+		return me4000_eeprom_read((me4000_eeprom_t *) arg, ai_context);</div><div class='add'>+	case ME4000_AI_EEPROM_WRITE:</div><div class='add'>+		return me4000_eeprom_write((me4000_eeprom_t *) arg, ai_context);</div><div class='add'>+	case ME4000_AI_GET_COUNT_BUFFER:</div><div class='add'>+		return me4000_ai_get_count_buffer((unsigned long *)arg,</div><div class='add'>+						  ai_context);</div><div class='add'>+	default:</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "ME4000:me4000_ai_ioctl_sw():Invalid service number %d\n",</div><div class='add'>+		       service);</div><div class='add'>+		return -ENOTTY;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int me4000_ai_ioctl_ext(struct inode *inode_p, struct file *file_p,</div><div class='add'>+			       unsigned int service, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	me4000_ai_context_t *ai_context;</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("me4000_ai_ioctl_ext() is executed\n");</div><div class='add'>+</div><div class='add'>+	ai_context = file_p-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	if (_IOC_TYPE(service) != ME4000_MAGIC) {</div><div class='add'>+		printk(KERN_ERR "me4000_ai_ioctl_ext():Wrong magic number\n");</div><div class='add'>+		return -ENOTTY;</div><div class='add'>+	}</div><div class='add'>+	if (_IOC_NR(service) &gt; ME4000_IOCTL_MAXNR) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "me4000_ai_ioctl_ext():Service number to high\n");</div><div class='add'>+		return -ENOTTY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (service) {</div><div class='add'>+	case ME4000_AI_SC_SETUP:</div><div class='add'>+		return me4000_ai_sc_setup((me4000_ai_sc_t *) arg, ai_context);</div><div class='add'>+	case ME4000_AI_CONFIG:</div><div class='add'>+		return me4000_ai_config((me4000_ai_config_t *) arg, ai_context);</div><div class='add'>+	case ME4000_AI_START:</div><div class='add'>+		return me4000_ai_start_ex((unsigned long *)arg, ai_context);</div><div class='add'>+	case ME4000_AI_STOP:</div><div class='add'>+		return me4000_ai_stop(ai_context);</div><div class='add'>+	case ME4000_AI_IMMEDIATE_STOP:</div><div class='add'>+		return me4000_ai_immediate_stop(ai_context);</div><div class='add'>+	case ME4000_AI_EX_TRIG_ENABLE:</div><div class='add'>+		return me4000_ai_ex_trig_enable(ai_context);</div><div class='add'>+	case ME4000_AI_EX_TRIG_DISABLE:</div><div class='add'>+		return me4000_ai_ex_trig_disable(ai_context);</div><div class='add'>+	case ME4000_AI_EX_TRIG_SETUP:</div><div class='add'>+		return me4000_ai_ex_trig_setup((me4000_ai_trigger_t *) arg,</div><div class='add'>+					       ai_context);</div><div class='add'>+	case ME4000_AI_FSM_STATE:</div><div class='add'>+		return me4000_ai_fsm_state((int *)arg, ai_context);</div><div class='add'>+	case ME4000_GET_USER_INFO:</div><div class='add'>+		return me4000_get_user_info((me4000_user_info_t *) arg,</div><div class='add'>+					    ai_context-&gt;board_info);</div><div class='add'>+	case ME4000_AI_GET_COUNT_BUFFER:</div><div class='add'>+		return me4000_ai_get_count_buffer((unsigned long *)arg,</div><div class='add'>+						  ai_context);</div><div class='add'>+	default:</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "ME4000:me4000_ai_ioctl_ext():Invalid service number %d\n",</div><div class='add'>+		       service);</div><div class='add'>+		return -ENOTTY;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int me4000_ai_fasync(int fd, struct file *file_p, int mode)</div><div class='add'>+{</div><div class='add'>+	me4000_ai_context_t *ai_context;</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("me4000_ao_fasync_cont() is executed\n");</div><div class='add'>+</div><div class='add'>+	ai_context = file_p-&gt;private_data;</div><div class='add'>+	return fasync_helper(fd, file_p, mode, &amp;ai_context-&gt;fasync_p);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int me4000_ai_config(me4000_ai_config_t * arg,</div><div class='add'>+			    me4000_ai_context_t * ai_context)</div><div class='add'>+{</div><div class='add'>+	me4000_ai_config_t cmd;</div><div class='add'>+	u32 *list = NULL;</div><div class='add'>+	u32 mode;</div><div class='add'>+	int i;</div><div class='add'>+	int err;</div><div class='add'>+	wait_queue_head_t queue;</div><div class='add'>+	u64 scan;</div><div class='add'>+	u32 tmp;</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("me4000_ai_config() is executed\n");</div><div class='add'>+</div><div class='add'>+	init_waitqueue_head(&amp;queue);</div><div class='add'>+</div><div class='add'>+	/* Check if conversion is stopped */</div><div class='add'>+	if (inl(ai_context-&gt;ctrl_reg) &amp; ME4000_AI_STATUS_BIT_FSM) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "ME4000:me4000_ai_config():Conversion is not stopped\n");</div><div class='add'>+		err = -EBUSY;</div><div class='add'>+		goto AI_CONFIG_ERR;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Copy data from user */</div><div class='add'>+	err = copy_from_user(&amp;cmd, arg, sizeof(me4000_ai_config_t));</div><div class='add'>+	if (err) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "ME4000:me4000_ai_config():Can't copy from user space\n");</div><div class='add'>+		err = -EFAULT;</div><div class='add'>+		goto AI_CONFIG_ERR;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	PDEBUG</div><div class='add'>+	    ("me4000_ai_config():chan = %ld, pre_chan = %ld, scan_low = %ld, scan_high = %ld, count = %ld\n",</div><div class='add'>+	     cmd.timer.chan, cmd.timer.pre_chan, cmd.timer.scan_low,</div><div class='add'>+	     cmd.timer.scan_high, cmd.channel_list.count);</div><div class='add'>+</div><div class='add'>+	/* Check whether sample and hold is available for this board */</div><div class='add'>+	if (cmd.sh) {</div><div class='add'>+		if (!ai_context-&gt;board_info-&gt;board_p-&gt;ai.sh_count) {</div><div class='add'>+			printk(KERN_ERR</div><div class='add'>+			       "ME4000:me4000_ai_config():Sample and Hold is not available for this board\n");</div><div class='add'>+			err = -ENODEV;</div><div class='add'>+			goto AI_CONFIG_ERR;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check the channel list size */</div><div class='add'>+	if (cmd.channel_list.count &gt; ME4000_AI_CHANNEL_LIST_COUNT) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "me4000_ai_config():Channel list is to large\n");</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto AI_CONFIG_ERR;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Copy channel list from user */</div><div class='add'>+	list = kmalloc(sizeof(u32) * cmd.channel_list.count, GFP_KERNEL);</div><div class='add'>+	if (!list) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "ME4000:me4000_ai_config():Can't get memory for channel list\n");</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto AI_CONFIG_ERR;</div><div class='add'>+	}</div><div class='add'>+	err =</div><div class='add'>+	    copy_from_user(list, cmd.channel_list.list,</div><div class='add'>+			   sizeof(u32) * cmd.channel_list.count);</div><div class='add'>+	if (err) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "ME4000:me4000_ai_config():Can't copy from user space\n");</div><div class='add'>+		err = -EFAULT;</div><div class='add'>+		goto AI_CONFIG_ERR;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check if last entry bit is set */</div><div class='add'>+	if (!(list[cmd.channel_list.count - 1] &amp; ME4000_AI_LIST_LAST_ENTRY)) {</div><div class='add'>+		printk(KERN_WARNING</div><div class='add'>+		       "me4000_ai_config():Last entry bit is not set\n");</div><div class='add'>+		list[cmd.channel_list.count - 1] |= ME4000_AI_LIST_LAST_ENTRY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check whether mode is equal for all entries */</div><div class='add'>+	mode = list[0] &amp; 0x20;</div><div class='add'>+	for (i = 0; i &lt; cmd.channel_list.count; i++) {</div><div class='add'>+		if ((list[i] &amp; 0x20) != mode) {</div><div class='add'>+			printk(KERN_ERR</div><div class='add'>+			       "ME4000:me4000_ai_config():Mode is not equal for all entries\n");</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			goto AI_CONFIG_ERR;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check whether channels are available for this mode */</div><div class='add'>+	if (mode == ME4000_AI_LIST_INPUT_SINGLE_ENDED) {</div><div class='add'>+		for (i = 0; i &lt; cmd.channel_list.count; i++) {</div><div class='add'>+			if ((list[i] &amp; 0x1F) &gt;=</div><div class='add'>+			    ai_context-&gt;board_info-&gt;board_p-&gt;ai.count) {</div><div class='add'>+				printk(KERN_ERR</div><div class='add'>+				       "ME4000:me4000_ai_config():Channel is not available for single ended\n");</div><div class='add'>+				err = -EINVAL;</div><div class='add'>+				goto AI_CONFIG_ERR;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	} else if (mode == ME4000_AI_LIST_INPUT_DIFFERENTIAL) {</div><div class='add'>+		for (i = 0; i &lt; cmd.channel_list.count; i++) {</div><div class='add'>+			if ((list[i] &amp; 0x1F) &gt;=</div><div class='add'>+			    ai_context-&gt;board_info-&gt;board_p-&gt;ai.diff_count) {</div><div class='add'>+				printk(KERN_ERR</div><div class='add'>+				       "ME4000:me4000_ai_config():Channel is not available for differential\n");</div><div class='add'>+				err = -EINVAL;</div><div class='add'>+				goto AI_CONFIG_ERR;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check if bipolar is set for all entries when in differential mode */</div><div class='add'>+	if (mode == ME4000_AI_LIST_INPUT_DIFFERENTIAL) {</div><div class='add'>+		for (i = 0; i &lt; cmd.channel_list.count; i++) {</div><div class='add'>+			if ((list[i] &amp; 0xC0) != ME4000_AI_LIST_RANGE_BIPOLAR_10</div><div class='add'>+			    &amp;&amp; (list[i] &amp; 0xC0) !=</div><div class='add'>+			    ME4000_AI_LIST_RANGE_BIPOLAR_2_5) {</div><div class='add'>+				printk(KERN_ERR</div><div class='add'>+				       "ME4000:me4000_ai_config():Bipolar is not selected in differential mode\n");</div><div class='add'>+				err = -EINVAL;</div><div class='add'>+				goto AI_CONFIG_ERR;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ai_context-&gt;mode != ME4000_AI_ACQ_MODE_EXT_SINGLE_VALUE) {</div><div class='add'>+		/* Check for minimum channel divisor */</div><div class='add'>+		if (cmd.timer.chan &lt; ME4000_AI_MIN_TICKS) {</div><div class='add'>+			printk(KERN_ERR</div><div class='add'>+			       "ME4000:me4000_ai_config():Channel timer divisor is to low\n");</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			goto AI_CONFIG_ERR;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Check if minimum channel divisor is adjusted when sample and hold is activated */</div><div class='add'>+		if ((cmd.sh) &amp;&amp; (cmd.timer.chan != ME4000_AI_MIN_TICKS)) {</div><div class='add'>+			printk(KERN_ERR</div><div class='add'>+			       "ME4000:me4000_ai_config():Channel timer divisor must be at minimum when sample and hold is activated\n");</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			goto AI_CONFIG_ERR;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Check for minimum channel pre divisor */</div><div class='add'>+		if (cmd.timer.pre_chan &lt; ME4000_AI_MIN_TICKS) {</div><div class='add'>+			printk(KERN_ERR</div><div class='add'>+			       "ME4000:me4000_ai_config():Channel pre timer divisor is to low\n");</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			goto AI_CONFIG_ERR;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Write the channel timers */</div><div class='add'>+		me4000_outl(cmd.timer.chan - 1, ai_context-&gt;chan_timer_reg);</div><div class='add'>+		me4000_outl(cmd.timer.pre_chan - 1,</div><div class='add'>+			    ai_context-&gt;chan_pre_timer_reg);</div><div class='add'>+</div><div class='add'>+		/* Save the timer values in the board context */</div><div class='add'>+		ai_context-&gt;chan_timer = cmd.timer.chan;</div><div class='add'>+		ai_context-&gt;chan_pre_timer = cmd.timer.pre_chan;</div><div class='add'>+</div><div class='add'>+		if (ai_context-&gt;mode != ME4000_AI_ACQ_MODE_EXT_SINGLE_CHANLIST) {</div><div class='add'>+			/* Check for scan timer divisor */</div><div class='add'>+			scan =</div><div class='add'>+			    (u64) cmd.timer.scan_low | ((u64) cmd.timer.</div><div class='add'>+							scan_high &lt;&lt; 32);</div><div class='add'>+			if (scan != 0) {</div><div class='add'>+				if (scan &lt;</div><div class='add'>+				    cmd.channel_list.count * cmd.timer.chan +</div><div class='add'>+				    1) {</div><div class='add'>+					printk(KERN_ERR</div><div class='add'>+					       "ME4000:me4000_ai_config():Scan timer divisor is to low\n");</div><div class='add'>+					err = -EINVAL;</div><div class='add'>+					goto AI_CONFIG_ERR;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* Write the scan timers */</div><div class='add'>+			if (scan != 0) {</div><div class='add'>+				scan--;</div><div class='add'>+				tmp = (u32) (scan &amp; 0xFFFFFFFF);</div><div class='add'>+				me4000_outl(tmp,</div><div class='add'>+					    ai_context-&gt;scan_timer_low_reg);</div><div class='add'>+				tmp = (u32) ((scan &gt;&gt; 32) &amp; 0xFFFFFFFF);</div><div class='add'>+				me4000_outl(tmp,</div><div class='add'>+					    ai_context-&gt;scan_timer_high_reg);</div><div class='add'>+</div><div class='add'>+				scan =</div><div class='add'>+				    scan - (cmd.timer.chan - 1) +</div><div class='add'>+				    (cmd.timer.pre_chan - 1);</div><div class='add'>+				tmp = (u32) (scan &amp; 0xFFFFFFFF);</div><div class='add'>+				me4000_outl(tmp,</div><div class='add'>+					    ai_context-&gt;scan_pre_timer_low_reg);</div><div class='add'>+				tmp = (u32) ((scan &gt;&gt; 32) &amp; 0xFFFFFFFF);</div><div class='add'>+				me4000_outl(tmp,</div><div class='add'>+					    ai_context-&gt;</div><div class='add'>+					    scan_pre_timer_high_reg);</div><div class='add'>+			} else {</div><div class='add'>+				me4000_outl(0x0,</div><div class='add'>+					    ai_context-&gt;scan_timer_low_reg);</div><div class='add'>+				me4000_outl(0x0,</div><div class='add'>+					    ai_context-&gt;scan_timer_high_reg);</div><div class='add'>+</div><div class='add'>+				me4000_outl(0x0,</div><div class='add'>+					    ai_context-&gt;scan_pre_timer_low_reg);</div><div class='add'>+				me4000_outl(0x0,</div><div class='add'>+					    ai_context-&gt;</div><div class='add'>+					    scan_pre_timer_high_reg);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			ai_context-&gt;scan_timer_low = cmd.timer.scan_low;</div><div class='add'>+			ai_context-&gt;scan_timer_high = cmd.timer.scan_high;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Clear the channel list */</div><div class='add'>+	tmp = me4000_inl(ai_context-&gt;ctrl_reg);</div><div class='add'>+	tmp &amp;= ~ME4000_AI_CTRL_BIT_CHANNEL_FIFO;</div><div class='add'>+	me4000_outl(tmp, ai_context-&gt;ctrl_reg);</div><div class='add'>+	tmp |= ME4000_AI_CTRL_BIT_CHANNEL_FIFO;</div><div class='add'>+	me4000_outl(tmp, ai_context-&gt;ctrl_reg);</div><div class='add'>+</div><div class='add'>+	/* Write the channel list */</div><div class='add'>+	for (i = 0; i &lt; cmd.channel_list.count; i++) {</div><div class='add'>+		me4000_outl(list[i], ai_context-&gt;channel_list_reg);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Setup sample and hold */</div><div class='add'>+	if (cmd.sh) {</div><div class='add'>+		tmp |= ME4000_AI_CTRL_BIT_SAMPLE_HOLD;</div><div class='add'>+		me4000_outl(tmp, ai_context-&gt;ctrl_reg);</div><div class='add'>+	} else {</div><div class='add'>+		tmp &amp;= ~ME4000_AI_CTRL_BIT_SAMPLE_HOLD;</div><div class='add'>+		me4000_outl(tmp, ai_context-&gt;ctrl_reg);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Save the channel list size in the board context */</div><div class='add'>+	ai_context-&gt;channel_list_count = cmd.channel_list.count;</div><div class='add'>+</div><div class='add'>+	kfree(list);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+      AI_CONFIG_ERR:</div><div class='add'>+</div><div class='add'>+	/* Reset the timers */</div><div class='add'>+	ai_context-&gt;chan_timer = 66;</div><div class='add'>+	ai_context-&gt;chan_pre_timer = 66;</div><div class='add'>+	ai_context-&gt;scan_timer_low = 0;</div><div class='add'>+	ai_context-&gt;scan_timer_high = 0;</div><div class='add'>+</div><div class='add'>+	me4000_outl(65, ai_context-&gt;chan_timer_reg);</div><div class='add'>+	me4000_outl(65, ai_context-&gt;chan_pre_timer_reg);</div><div class='add'>+	me4000_outl(0, ai_context-&gt;scan_timer_high_reg);</div><div class='add'>+	me4000_outl(0, ai_context-&gt;scan_timer_low_reg);</div><div class='add'>+	me4000_outl(0, ai_context-&gt;scan_pre_timer_high_reg);</div><div class='add'>+	me4000_outl(0, ai_context-&gt;scan_pre_timer_low_reg);</div><div class='add'>+</div><div class='add'>+	ai_context-&gt;channel_list_count = 0;</div><div class='add'>+</div><div class='add'>+	tmp = me4000_inl(ai_context-&gt;ctrl_reg);</div><div class='add'>+	tmp &amp;=</div><div class='add'>+	    ~(ME4000_AI_CTRL_BIT_CHANNEL_FIFO | ME4000_AI_CTRL_BIT_SAMPLE_HOLD);</div><div class='add'>+</div><div class='add'>+	if (list)</div><div class='add'>+		kfree(list);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ai_common_start(me4000_ai_context_t * ai_context)</div><div class='add'>+{</div><div class='add'>+	u32 tmp;</div><div class='add'>+	CALL_PDEBUG("ai_common_start() is executed\n");</div><div class='add'>+</div><div class='add'>+	tmp = me4000_inl(ai_context-&gt;ctrl_reg);</div><div class='add'>+</div><div class='add'>+	/* Check if conversion is stopped */</div><div class='add'>+	if (tmp &amp; ME4000_AI_STATUS_BIT_FSM) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "ME4000:ai_common_start():Conversion is not stopped\n");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Clear data fifo, disable all interrupts, clear sample counter reload */</div><div class='add'>+	tmp &amp;= ~(ME4000_AI_CTRL_BIT_DATA_FIFO | ME4000_AI_CTRL_BIT_LE_IRQ |</div><div class='add'>+		 ME4000_AI_CTRL_BIT_HF_IRQ | ME4000_AI_CTRL_BIT_SC_IRQ |</div><div class='add'>+		 ME4000_AI_CTRL_BIT_SC_RELOAD);</div><div class='add'>+</div><div class='add'>+	me4000_outl(tmp, ai_context-&gt;ctrl_reg);</div><div class='add'>+</div><div class='add'>+	/* Clear circular buffer */</div><div class='add'>+	ai_context-&gt;circ_buf.head = 0;</div><div class='add'>+	ai_context-&gt;circ_buf.tail = 0;</div><div class='add'>+</div><div class='add'>+	/* Enable data fifo */</div><div class='add'>+	tmp |= ME4000_AI_CTRL_BIT_DATA_FIFO;</div><div class='add'>+</div><div class='add'>+	/* Determine interrupt setup */</div><div class='add'>+	if (ai_context-&gt;sample_counter &amp;&amp; !ai_context-&gt;sample_counter_reload) {</div><div class='add'>+		/* Enable Half Full Interrupt and Sample Counter Interrupt */</div><div class='add'>+		tmp |= ME4000_AI_CTRL_BIT_SC_IRQ | ME4000_AI_CTRL_BIT_HF_IRQ;</div><div class='add'>+	} else if (ai_context-&gt;sample_counter</div><div class='add'>+		   &amp;&amp; ai_context-&gt;sample_counter_reload) {</div><div class='add'>+		if (ai_context-&gt;sample_counter &lt;= ME4000_AI_FIFO_COUNT / 2) {</div><div class='add'>+			/* Enable only Sample Counter Interrupt */</div><div class='add'>+			tmp |=</div><div class='add'>+			    ME4000_AI_CTRL_BIT_SC_IRQ |</div><div class='add'>+			    ME4000_AI_CTRL_BIT_SC_RELOAD;</div><div class='add'>+		} else {</div><div class='add'>+			/* Enable Half Full Interrupt and Sample Counter Interrupt */</div><div class='add'>+			tmp |=</div><div class='add'>+			    ME4000_AI_CTRL_BIT_SC_IRQ |</div><div class='add'>+			    ME4000_AI_CTRL_BIT_HF_IRQ |</div><div class='add'>+			    ME4000_AI_CTRL_BIT_SC_RELOAD;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		/* Enable only Half Full Interrupt */</div><div class='add'>+		tmp |= ME4000_AI_CTRL_BIT_HF_IRQ;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Clear the stop bits */</div><div class='add'>+	tmp &amp;= ~(ME4000_AI_CTRL_BIT_STOP | ME4000_AI_CTRL_BIT_IMMEDIATE_STOP);</div><div class='add'>+</div><div class='add'>+	/* Write setup to hardware */</div><div class='add'>+	me4000_outl(tmp, ai_context-&gt;ctrl_reg);</div><div class='add'>+</div><div class='add'>+	/* Write sample counter */</div><div class='add'>+	me4000_outl(ai_context-&gt;sample_counter, ai_context-&gt;sample_counter_reg);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int me4000_ai_start(me4000_ai_context_t * ai_context)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	CALL_PDEBUG("me4000_ai_start() is executed\n");</div><div class='add'>+</div><div class='add'>+	/* Prepare Hardware */</div><div class='add'>+	err = ai_common_start(ai_context);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* Start conversion by dummy read */</div><div class='add'>+	me4000_inl(ai_context-&gt;start_reg);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int me4000_ai_start_ex(unsigned long *arg,</div><div class='add'>+			      me4000_ai_context_t * ai_context)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	wait_queue_head_t queue;</div><div class='add'>+	unsigned long ref;</div><div class='add'>+	unsigned long timeout;</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("me4000_ai_start_ex() is executed\n");</div><div class='add'>+</div><div class='add'>+	if (get_user(timeout, arg)) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "me4000_ai_start_ex():Cannot copy data from user\n");</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	init_waitqueue_head(&amp;queue);</div><div class='add'>+</div><div class='add'>+	/* Prepare Hardware */</div><div class='add'>+	err = ai_common_start(ai_context);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (timeout) {</div><div class='add'>+		ref = jiffies;</div><div class='add'>+		while (!</div><div class='add'>+		       (inl(ai_context-&gt;status_reg) &amp; ME4000_AI_STATUS_BIT_FSM))</div><div class='add'>+		{</div><div class='add'>+			interruptible_sleep_on_timeout(&amp;queue, 1);</div><div class='add'>+			if (signal_pending(current)) {</div><div class='add'>+				printk(KERN_ERR</div><div class='add'>+				       "ME4000:me4000_ai_start_ex():Wait on start of state machine interrupted\n");</div><div class='add'>+				return -EINTR;</div><div class='add'>+			}</div><div class='add'>+			if (((jiffies - ref) &gt; (timeout * HZ / USER_HZ))) {	// 2.6 has diffrent definitions for HZ in user and kernel space</div><div class='add'>+				printk(KERN_ERR</div><div class='add'>+				       "ME4000:me4000_ai_start_ex():Timeout reached\n");</div><div class='add'>+				return -EIO;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		while (!</div><div class='add'>+		       (inl(ai_context-&gt;status_reg) &amp; ME4000_AI_STATUS_BIT_FSM))</div><div class='add'>+		{</div><div class='add'>+			interruptible_sleep_on_timeout(&amp;queue, 1);</div><div class='add'>+			if (signal_pending(current)) {</div><div class='add'>+				printk(KERN_ERR</div><div class='add'>+				       "ME4000:me4000_ai_start_ex():Wait on start of state machine interrupted\n");</div><div class='add'>+				return -EINTR;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int me4000_ai_stop(me4000_ai_context_t * ai_context)</div><div class='add'>+{</div><div class='add'>+	wait_queue_head_t queue;</div><div class='add'>+	u32 tmp;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("me4000_ai_stop() is executed\n");</div><div class='add'>+</div><div class='add'>+	init_waitqueue_head(&amp;queue);</div><div class='add'>+</div><div class='add'>+	/* Disable irqs and clear data fifo */</div><div class='add'>+	spin_lock_irqsave(&amp;ai_context-&gt;int_lock, flags);</div><div class='add'>+	tmp = me4000_inl(ai_context-&gt;ctrl_reg);</div><div class='add'>+	tmp &amp;=</div><div class='add'>+	    ~(ME4000_AI_CTRL_BIT_HF_IRQ | ME4000_AI_CTRL_BIT_SC_IRQ |</div><div class='add'>+	      ME4000_AI_CTRL_BIT_DATA_FIFO);</div><div class='add'>+	/* Stop conversion of the state machine */</div><div class='add'>+	tmp |= ME4000_AI_CTRL_BIT_STOP;</div><div class='add'>+	me4000_outl(tmp, ai_context-&gt;ctrl_reg);</div><div class='add'>+	spin_unlock_irqrestore(&amp;ai_context-&gt;int_lock, flags);</div><div class='add'>+</div><div class='add'>+	/* Clear circular buffer */</div><div class='add'>+	ai_context-&gt;circ_buf.head = 0;</div><div class='add'>+	ai_context-&gt;circ_buf.tail = 0;</div><div class='add'>+</div><div class='add'>+	while (inl(ai_context-&gt;status_reg) &amp; ME4000_AI_STATUS_BIT_FSM) {</div><div class='add'>+		interruptible_sleep_on_timeout(&amp;queue, 1);</div><div class='add'>+		if (signal_pending(current)) {</div><div class='add'>+			printk(KERN_ERR</div><div class='add'>+			       "ME4000:me4000_ai_stop():Wait on state machine after stop interrupted\n");</div><div class='add'>+			return -EINTR;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int me4000_ai_immediate_stop(me4000_ai_context_t * ai_context)</div><div class='add'>+{</div><div class='add'>+	wait_queue_head_t queue;</div><div class='add'>+	u32 tmp;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("me4000_ai_stop() is executed\n");</div><div class='add'>+</div><div class='add'>+	init_waitqueue_head(&amp;queue);</div><div class='add'>+</div><div class='add'>+	/* Disable irqs and clear data fifo */</div><div class='add'>+	spin_lock_irqsave(&amp;ai_context-&gt;int_lock, flags);</div><div class='add'>+	tmp = me4000_inl(ai_context-&gt;ctrl_reg);</div><div class='add'>+	tmp &amp;=</div><div class='add'>+	    ~(ME4000_AI_CTRL_BIT_HF_IRQ | ME4000_AI_CTRL_BIT_SC_IRQ |</div><div class='add'>+	      ME4000_AI_CTRL_BIT_DATA_FIFO);</div><div class='add'>+	/* Stop conversion of the state machine */</div><div class='add'>+	tmp |= ME4000_AI_CTRL_BIT_IMMEDIATE_STOP;</div><div class='add'>+	me4000_outl(tmp, ai_context-&gt;ctrl_reg);</div><div class='add'>+	spin_unlock_irqrestore(&amp;ai_context-&gt;int_lock, flags);</div><div class='add'>+</div><div class='add'>+	/* Clear circular buffer */</div><div class='add'>+	ai_context-&gt;circ_buf.head = 0;</div><div class='add'>+	ai_context-&gt;circ_buf.tail = 0;</div><div class='add'>+</div><div class='add'>+	while (inl(ai_context-&gt;status_reg) &amp; ME4000_AI_STATUS_BIT_FSM) {</div><div class='add'>+		interruptible_sleep_on_timeout(&amp;queue, 1);</div><div class='add'>+		if (signal_pending(current)) {</div><div class='add'>+			printk(KERN_ERR</div><div class='add'>+			       "ME4000:me4000_ai_stop():Wait on state machine after stop interrupted\n");</div><div class='add'>+			return -EINTR;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int me4000_ai_ex_trig_enable(me4000_ai_context_t * ai_context)</div><div class='add'>+{</div><div class='add'>+	u32 tmp;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("me4000_ai_ex_trig_enable() is executed\n");</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;ai_context-&gt;int_lock, flags);</div><div class='add'>+	tmp = me4000_inl(ai_context-&gt;ctrl_reg);</div><div class='add'>+	tmp |= ME4000_AI_CTRL_BIT_EX_TRIG;</div><div class='add'>+	me4000_outl(tmp, ai_context-&gt;ctrl_reg);</div><div class='add'>+	spin_unlock_irqrestore(&amp;ai_context-&gt;int_lock, flags);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int me4000_ai_ex_trig_disable(me4000_ai_context_t * ai_context)</div><div class='add'>+{</div><div class='add'>+	u32 tmp;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("me4000_ai_ex_trig_disable() is executed\n");</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;ai_context-&gt;int_lock, flags);</div><div class='add'>+	tmp = me4000_inl(ai_context-&gt;ctrl_reg);</div><div class='add'>+	tmp &amp;= ~ME4000_AI_CTRL_BIT_EX_TRIG;</div><div class='add'>+	me4000_outl(tmp, ai_context-&gt;ctrl_reg);</div><div class='add'>+	spin_unlock_irqrestore(&amp;ai_context-&gt;int_lock, flags);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int me4000_ai_ex_trig_setup(me4000_ai_trigger_t * arg,</div><div class='add'>+				   me4000_ai_context_t * ai_context)</div><div class='add'>+{</div><div class='add'>+	me4000_ai_trigger_t cmd;</div><div class='add'>+	int err;</div><div class='add'>+	u32 tmp;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("me4000_ai_ex_trig_setup() is executed\n");</div><div class='add'>+</div><div class='add'>+	/* Copy data from user */</div><div class='add'>+	err = copy_from_user(&amp;cmd, arg, sizeof(me4000_ai_trigger_t));</div><div class='add'>+	if (err) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "ME4000:me4000_ai_ex_trig_setup():Can't copy from user space\n");</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;ai_context-&gt;int_lock, flags);</div><div class='add'>+	tmp = me4000_inl(ai_context-&gt;ctrl_reg);</div><div class='add'>+</div><div class='add'>+	if (cmd.mode == ME4000_AI_TRIGGER_EXT_DIGITAL) {</div><div class='add'>+		tmp &amp;= ~ME4000_AI_CTRL_BIT_EX_TRIG_ANALOG;</div><div class='add'>+	} else if (cmd.mode == ME4000_AI_TRIGGER_EXT_ANALOG) {</div><div class='add'>+		if (!ai_context-&gt;board_info-&gt;board_p-&gt;ai.ex_trig_analog) {</div><div class='add'>+			printk(KERN_ERR</div><div class='add'>+			       "ME4000:me4000_ai_ex_trig_setup():No analog trigger available\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		tmp |= ME4000_AI_CTRL_BIT_EX_TRIG_ANALOG;</div><div class='add'>+	} else {</div><div class='add'>+		spin_unlock_irqrestore(&amp;ai_context-&gt;int_lock, flags);</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "ME4000:me4000_ai_ex_trig_setup():Invalid trigger mode specified\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cmd.edge == ME4000_AI_TRIGGER_EXT_EDGE_RISING) {</div><div class='add'>+		tmp &amp;=</div><div class='add'>+		    ~(ME4000_AI_CTRL_BIT_EX_TRIG_BOTH |</div><div class='add'>+		      ME4000_AI_CTRL_BIT_EX_TRIG_FALLING);</div><div class='add'>+	} else if (cmd.edge == ME4000_AI_TRIGGER_EXT_EDGE_FALLING) {</div><div class='add'>+		tmp |= ME4000_AI_CTRL_BIT_EX_TRIG_FALLING;</div><div class='add'>+		tmp &amp;= ~ME4000_AI_CTRL_BIT_EX_TRIG_BOTH;</div><div class='add'>+	} else if (cmd.edge == ME4000_AI_TRIGGER_EXT_EDGE_BOTH) {</div><div class='add'>+		tmp |=</div><div class='add'>+		    ME4000_AI_CTRL_BIT_EX_TRIG_BOTH |</div><div class='add'>+		    ME4000_AI_CTRL_BIT_EX_TRIG_FALLING;</div><div class='add'>+	} else {</div><div class='add'>+		spin_unlock_irqrestore(&amp;ai_context-&gt;int_lock, flags);</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "ME4000:me4000_ai_ex_trig_setup():Invalid trigger edge specified\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	me4000_outl(tmp, ai_context-&gt;ctrl_reg);</div><div class='add'>+	spin_unlock_irqrestore(&amp;ai_context-&gt;int_lock, flags);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int me4000_ai_sc_setup(me4000_ai_sc_t * arg,</div><div class='add'>+			      me4000_ai_context_t * ai_context)</div><div class='add'>+{</div><div class='add'>+	me4000_ai_sc_t cmd;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("me4000_ai_sc_setup() is executed\n");</div><div class='add'>+</div><div class='add'>+	/* Copy data from user */</div><div class='add'>+	err = copy_from_user(&amp;cmd, arg, sizeof(me4000_ai_sc_t));</div><div class='add'>+	if (err) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "ME4000:me4000_ai_sc_setup():Can't copy from user space\n");</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ai_context-&gt;sample_counter = cmd.value;</div><div class='add'>+	ai_context-&gt;sample_counter_reload = cmd.reload;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t me4000_ai_read(struct file *filep, char *buff, size_t cnt,</div><div class='add'>+			      loff_t * offp)</div><div class='add'>+{</div><div class='add'>+	me4000_ai_context_t *ai_context = filep-&gt;private_data;</div><div class='add'>+	s16 *buffer = (s16 *) buff;</div><div class='add'>+	size_t count = cnt / 2;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int tmp;</div><div class='add'>+	int c = 0;</div><div class='add'>+	int k = 0;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	wait_queue_t wait;</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("me4000_ai_read() is executed\n");</div><div class='add'>+</div><div class='add'>+	init_waitqueue_entry(&amp;wait, current);</div><div class='add'>+</div><div class='add'>+	/* Check count */</div><div class='add'>+	if (count &lt;= 0) {</div><div class='add'>+		PDEBUG("me4000_ai_read():Count is 0\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	while (count &gt; 0) {</div><div class='add'>+		if (filep-&gt;f_flags &amp; O_NONBLOCK) {</div><div class='add'>+			c = me4000_values_to_end(ai_context-&gt;circ_buf,</div><div class='add'>+						 ME4000_AI_BUFFER_COUNT);</div><div class='add'>+			if (!c) {</div><div class='add'>+				PDEBUG</div><div class='add'>+				    ("me4000_ai_read():Returning from nonblocking read\n");</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			/* Check if conversion is still running */</div><div class='add'>+			if (!</div><div class='add'>+			    (me4000_inl(ai_context-&gt;status_reg) &amp;</div><div class='add'>+			     ME4000_AI_STATUS_BIT_FSM)) {</div><div class='add'>+				printk(KERN_ERR</div><div class='add'>+				       "ME4000:me4000_ai_read():Conversion interrupted\n");</div><div class='add'>+				return -EPIPE;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			wait_event_interruptible(ai_context-&gt;wait_queue,</div><div class='add'>+						 (me4000_values_to_end</div><div class='add'>+						  (ai_context-&gt;circ_buf,</div><div class='add'>+						   ME4000_AI_BUFFER_COUNT)));</div><div class='add'>+			if (signal_pending(current)) {</div><div class='add'>+				printk(KERN_ERR</div><div class='add'>+				       "ME4000:me4000_ai_read():Wait on values interrupted from signal\n");</div><div class='add'>+				return -EINTR;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Only read count values or as much as available */</div><div class='add'>+		c = me4000_values_to_end(ai_context-&gt;circ_buf,</div><div class='add'>+					 ME4000_AI_BUFFER_COUNT);</div><div class='add'>+		PDEBUG("me4000_ai_read():%d values to end\n", c);</div><div class='add'>+		if (count &lt; c)</div><div class='add'>+			c = count;</div><div class='add'>+</div><div class='add'>+		PDEBUG("me4000_ai_read():Copy %d values to user space\n", c);</div><div class='add'>+		k = 2 * c;</div><div class='add'>+		k -= copy_to_user(buffer,</div><div class='add'>+				  ai_context-&gt;circ_buf.buf +</div><div class='add'>+				  ai_context-&gt;circ_buf.tail, k);</div><div class='add'>+		c = k / 2;</div><div class='add'>+		if (!c) {</div><div class='add'>+			printk(KERN_ERR</div><div class='add'>+			       "ME4000:me4000_ai_read():Cannot copy new values to user\n");</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ai_context-&gt;circ_buf.tail =</div><div class='add'>+		    (ai_context-&gt;circ_buf.tail + c) &amp; (ME4000_AI_BUFFER_COUNT -</div><div class='add'>+						       1);</div><div class='add'>+		buffer += c;</div><div class='add'>+		count -= c;</div><div class='add'>+		ret += c;</div><div class='add'>+</div><div class='add'>+		spin_lock_irqsave(&amp;ai_context-&gt;int_lock, flags);</div><div class='add'>+		if (me4000_buf_space</div><div class='add'>+		    (ai_context-&gt;circ_buf, ME4000_AI_BUFFER_COUNT)) {</div><div class='add'>+			tmp = me4000_inl(ai_context-&gt;ctrl_reg);</div><div class='add'>+</div><div class='add'>+			/* Determine interrupt setup */</div><div class='add'>+			if (ai_context-&gt;sample_counter</div><div class='add'>+			    &amp;&amp; !ai_context-&gt;sample_counter_reload) {</div><div class='add'>+				/* Enable Half Full Interrupt and Sample Counter Interrupt */</div><div class='add'>+				tmp |=</div><div class='add'>+				    ME4000_AI_CTRL_BIT_SC_IRQ |</div><div class='add'>+				    ME4000_AI_CTRL_BIT_HF_IRQ;</div><div class='add'>+			} else if (ai_context-&gt;sample_counter</div><div class='add'>+				   &amp;&amp; ai_context-&gt;sample_counter_reload) {</div><div class='add'>+				if (ai_context-&gt;sample_counter &lt;</div><div class='add'>+				    ME4000_AI_FIFO_COUNT / 2) {</div><div class='add'>+					/* Enable only Sample Counter Interrupt */</div><div class='add'>+					tmp |= ME4000_AI_CTRL_BIT_SC_IRQ;</div><div class='add'>+				} else {</div><div class='add'>+					/* Enable Half Full Interrupt and Sample Counter Interrupt */</div><div class='add'>+					tmp |=</div><div class='add'>+					    ME4000_AI_CTRL_BIT_SC_IRQ |</div><div class='add'>+					    ME4000_AI_CTRL_BIT_HF_IRQ;</div><div class='add'>+				}</div><div class='add'>+			} else {</div><div class='add'>+				/* Enable only Half Full Interrupt */</div><div class='add'>+				tmp |= ME4000_AI_CTRL_BIT_HF_IRQ;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			me4000_outl(tmp, ai_context-&gt;ctrl_reg);</div><div class='add'>+		}</div><div class='add'>+		spin_unlock_irqrestore(&amp;ai_context-&gt;int_lock, flags);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check if conversion is still running */</div><div class='add'>+	if (!(me4000_inl(ai_context-&gt;status_reg) &amp; ME4000_AI_STATUS_BIT_FSM)) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "ME4000:me4000_ai_read():Conversion not running after complete read\n");</div><div class='add'>+		return -EPIPE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (filep-&gt;f_flags &amp; O_NONBLOCK) {</div><div class='add'>+		return (k == 0) ? -EAGAIN : 2 * ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("me4000_ai_read() is leaved\n");</div><div class='add'>+	return ret * 2;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int me4000_ai_poll(struct file *file_p, poll_table * wait)</div><div class='add'>+{</div><div class='add'>+	me4000_ai_context_t *ai_context;</div><div class='add'>+	unsigned long mask = 0;</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("me4000_ai_poll() is executed\n");</div><div class='add'>+</div><div class='add'>+	ai_context = file_p-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	/* Register wait queue */</div><div class='add'>+	poll_wait(file_p, &amp;ai_context-&gt;wait_queue, wait);</div><div class='add'>+</div><div class='add'>+	/* Get available values */</div><div class='add'>+	if (me4000_values_to_end(ai_context-&gt;circ_buf, ME4000_AI_BUFFER_COUNT))</div><div class='add'>+		mask |= POLLIN | POLLRDNORM;</div><div class='add'>+</div><div class='add'>+	PDEBUG("me4000_ai_poll():Return mask %lX\n", mask);</div><div class='add'>+</div><div class='add'>+	return mask;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int me4000_ai_offset_enable(me4000_ai_context_t * ai_context)</div><div class='add'>+{</div><div class='add'>+	unsigned long tmp;</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("me4000_ai_offset_enable() is executed\n");</div><div class='add'>+</div><div class='add'>+	tmp = me4000_inl(ai_context-&gt;ctrl_reg);</div><div class='add'>+	tmp |= ME4000_AI_CTRL_BIT_OFFSET;</div><div class='add'>+	me4000_outl(tmp, ai_context-&gt;ctrl_reg);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int me4000_ai_offset_disable(me4000_ai_context_t * ai_context)</div><div class='add'>+{</div><div class='add'>+	unsigned long tmp;</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("me4000_ai_offset_disable() is executed\n");</div><div class='add'>+</div><div class='add'>+	tmp = me4000_inl(ai_context-&gt;ctrl_reg);</div><div class='add'>+	tmp &amp;= ~ME4000_AI_CTRL_BIT_OFFSET;</div><div class='add'>+	me4000_outl(tmp, ai_context-&gt;ctrl_reg);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int me4000_ai_fullscale_enable(me4000_ai_context_t * ai_context)</div><div class='add'>+{</div><div class='add'>+	unsigned long tmp;</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("me4000_ai_fullscale_enable() is executed\n");</div><div class='add'>+</div><div class='add'>+	tmp = me4000_inl(ai_context-&gt;ctrl_reg);</div><div class='add'>+	tmp |= ME4000_AI_CTRL_BIT_FULLSCALE;</div><div class='add'>+	me4000_outl(tmp, ai_context-&gt;ctrl_reg);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int me4000_ai_fullscale_disable(me4000_ai_context_t * ai_context)</div><div class='add'>+{</div><div class='add'>+	unsigned long tmp;</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("me4000_ai_fullscale_disable() is executed\n");</div><div class='add'>+</div><div class='add'>+	tmp = me4000_inl(ai_context-&gt;ctrl_reg);</div><div class='add'>+	tmp &amp;= ~ME4000_AI_CTRL_BIT_FULLSCALE;</div><div class='add'>+	me4000_outl(tmp, ai_context-&gt;ctrl_reg);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int me4000_ai_fsm_state(int *arg, me4000_ai_context_t * ai_context)</div><div class='add'>+{</div><div class='add'>+	unsigned long tmp;</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("me4000_ai_fsm_state() is executed\n");</div><div class='add'>+</div><div class='add'>+	tmp =</div><div class='add'>+	    (me4000_inl(ai_context-&gt;status_reg) &amp; ME4000_AI_STATUS_BIT_FSM) ? 1</div><div class='add'>+	    : 0;</div><div class='add'>+</div><div class='add'>+	if (put_user(tmp, arg)) {</div><div class='add'>+		printk(KERN_ERR "me4000_ai_fsm_state():Cannot copy to user\n");</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int me4000_ai_get_count_buffer(unsigned long *arg,</div><div class='add'>+				      me4000_ai_context_t * ai_context)</div><div class='add'>+{</div><div class='add'>+	unsigned long c;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	c = me4000_buf_count(ai_context-&gt;circ_buf, ME4000_AI_BUFFER_COUNT);</div><div class='add'>+</div><div class='add'>+	err = copy_to_user(arg, &amp;c, sizeof(unsigned long));</div><div class='add'>+	if (err) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "ME4000:me4000_ai_get_count_buffer():Can't copy to user space\n");</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*---------------------------------- EEPROM stuff ---------------------------*/</div><div class='add'>+</div><div class='add'>+static int eeprom_write_cmd(me4000_ai_context_t * ai_context, unsigned long cmd,</div><div class='add'>+			    int length)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	unsigned long value;</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("eeprom_write_cmd() is executed\n");</div><div class='add'>+</div><div class='add'>+	PDEBUG("eeprom_write_cmd():Write command 0x%08lX with length = %d\n",</div><div class='add'>+	       cmd, length);</div><div class='add'>+</div><div class='add'>+	/* Get the ICR register and clear the related bits */</div><div class='add'>+	value = me4000_inl(ai_context-&gt;board_info-&gt;plx_regbase + PLX_ICR);</div><div class='add'>+	value &amp;= ~(PLX_ICR_MASK_EEPROM);</div><div class='add'>+	me4000_outl(value, ai_context-&gt;board_info-&gt;plx_regbase + PLX_ICR);</div><div class='add'>+</div><div class='add'>+	/* Raise the chip select */</div><div class='add'>+	value |= PLX_ICR_BIT_EEPROM_CHIP_SELECT;</div><div class='add'>+	me4000_outl(value, ai_context-&gt;board_info-&gt;plx_regbase + PLX_ICR);</div><div class='add'>+	udelay(EEPROM_DELAY);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; length; i++) {</div><div class='add'>+		if (cmd &amp; ((0x1 &lt;&lt; (length - 1)) &gt;&gt; i)) {</div><div class='add'>+			value |= PLX_ICR_BIT_EEPROM_WRITE;</div><div class='add'>+		} else {</div><div class='add'>+			value &amp;= ~PLX_ICR_BIT_EEPROM_WRITE;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Write to EEPROM */</div><div class='add'>+		me4000_outl(value,</div><div class='add'>+			    ai_context-&gt;board_info-&gt;plx_regbase + PLX_ICR);</div><div class='add'>+		udelay(EEPROM_DELAY);</div><div class='add'>+</div><div class='add'>+		/* Raising edge of the clock */</div><div class='add'>+		value |= PLX_ICR_BIT_EEPROM_CLOCK_SET;</div><div class='add'>+		me4000_outl(value,</div><div class='add'>+			    ai_context-&gt;board_info-&gt;plx_regbase + PLX_ICR);</div><div class='add'>+		udelay(EEPROM_DELAY);</div><div class='add'>+</div><div class='add'>+		/* Falling edge of the clock */</div><div class='add'>+		value &amp;= ~PLX_ICR_BIT_EEPROM_CLOCK_SET;</div><div class='add'>+		me4000_outl(value,</div><div class='add'>+			    ai_context-&gt;board_info-&gt;plx_regbase + PLX_ICR);</div><div class='add'>+		udelay(EEPROM_DELAY);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Clear the chip select */</div><div class='add'>+	value &amp;= ~PLX_ICR_BIT_EEPROM_CHIP_SELECT;</div><div class='add'>+	me4000_outl(value, ai_context-&gt;board_info-&gt;plx_regbase + PLX_ICR);</div><div class='add'>+	udelay(EEPROM_DELAY);</div><div class='add'>+</div><div class='add'>+	/* Wait until hardware is ready for sure */</div><div class='add'>+	mdelay(10);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned short eeprom_read_cmd(me4000_ai_context_t * ai_context,</div><div class='add'>+				      unsigned long cmd, int length)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	unsigned long value;</div><div class='add'>+	unsigned short id = 0;</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("eeprom_read_cmd() is executed\n");</div><div class='add'>+</div><div class='add'>+	PDEBUG("eeprom_read_cmd():Read command 0x%08lX with length = %d\n", cmd,</div><div class='add'>+	       length);</div><div class='add'>+</div><div class='add'>+	/* Get the ICR register and clear the related bits */</div><div class='add'>+	value = me4000_inl(ai_context-&gt;board_info-&gt;plx_regbase + PLX_ICR);</div><div class='add'>+	value &amp;= ~(PLX_ICR_MASK_EEPROM);</div><div class='add'>+</div><div class='add'>+	me4000_outl(value, ai_context-&gt;board_info-&gt;plx_regbase + PLX_ICR);</div><div class='add'>+</div><div class='add'>+	/* Raise the chip select */</div><div class='add'>+	value |= PLX_ICR_BIT_EEPROM_CHIP_SELECT;</div><div class='add'>+	me4000_outl(value, ai_context-&gt;board_info-&gt;plx_regbase + PLX_ICR);</div><div class='add'>+	udelay(EEPROM_DELAY);</div><div class='add'>+</div><div class='add'>+	/* Write the read command to the eeprom */</div><div class='add'>+	for (i = 0; i &lt; length; i++) {</div><div class='add'>+		if (cmd &amp; ((0x1 &lt;&lt; (length - 1)) &gt;&gt; i)) {</div><div class='add'>+			value |= PLX_ICR_BIT_EEPROM_WRITE;</div><div class='add'>+		} else {</div><div class='add'>+			value &amp;= ~PLX_ICR_BIT_EEPROM_WRITE;</div><div class='add'>+		}</div><div class='add'>+		me4000_outl(value,</div><div class='add'>+			    ai_context-&gt;board_info-&gt;plx_regbase + PLX_ICR);</div><div class='add'>+		udelay(EEPROM_DELAY);</div><div class='add'>+</div><div class='add'>+		/* Raising edge of the clock */</div><div class='add'>+		value |= PLX_ICR_BIT_EEPROM_CLOCK_SET;</div><div class='add'>+		me4000_outl(value,</div><div class='add'>+			    ai_context-&gt;board_info-&gt;plx_regbase + PLX_ICR);</div><div class='add'>+		udelay(EEPROM_DELAY);</div><div class='add'>+</div><div class='add'>+		/* Falling edge of the clock */</div><div class='add'>+		value &amp;= ~PLX_ICR_BIT_EEPROM_CLOCK_SET;</div><div class='add'>+		me4000_outl(value,</div><div class='add'>+			    ai_context-&gt;board_info-&gt;plx_regbase + PLX_ICR);</div><div class='add'>+		udelay(EEPROM_DELAY);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Read the value from the eeprom */</div><div class='add'>+	for (i = 0; i &lt; 16; i++) {</div><div class='add'>+		/* Raising edge of the clock */</div><div class='add'>+		value |= PLX_ICR_BIT_EEPROM_CLOCK_SET;</div><div class='add'>+		me4000_outl(value,</div><div class='add'>+			    ai_context-&gt;board_info-&gt;plx_regbase + PLX_ICR);</div><div class='add'>+		udelay(EEPROM_DELAY);</div><div class='add'>+</div><div class='add'>+		if (me4000_inl(ai_context-&gt;board_info-&gt;plx_regbase + PLX_ICR) &amp;</div><div class='add'>+		    PLX_ICR_BIT_EEPROM_READ) {</div><div class='add'>+			id |= (0x8000 &gt;&gt; i);</div><div class='add'>+			PDEBUG("eeprom_read_cmd():OR with 0x%04X\n",</div><div class='add'>+			       (0x8000 &gt;&gt; i));</div><div class='add'>+		} else {</div><div class='add'>+			PDEBUG("eeprom_read_cmd():Dont't OR\n");</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Falling edge of the clock */</div><div class='add'>+		value &amp;= ~PLX_ICR_BIT_EEPROM_CLOCK_SET;</div><div class='add'>+		me4000_outl(value,</div><div class='add'>+			    ai_context-&gt;board_info-&gt;plx_regbase + PLX_ICR);</div><div class='add'>+		udelay(EEPROM_DELAY);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Clear the chip select */</div><div class='add'>+	value &amp;= ~PLX_ICR_BIT_EEPROM_CHIP_SELECT;</div><div class='add'>+	me4000_outl(value, ai_context-&gt;board_info-&gt;plx_regbase + PLX_ICR);</div><div class='add'>+	udelay(EEPROM_DELAY);</div><div class='add'>+</div><div class='add'>+	return id;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int me4000_eeprom_write(me4000_eeprom_t * arg,</div><div class='add'>+			       me4000_ai_context_t * ai_context)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	me4000_eeprom_t setup;</div><div class='add'>+	unsigned long cmd;</div><div class='add'>+	unsigned long date_high;</div><div class='add'>+	unsigned long date_low;</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("me4000_eeprom_write() is executed\n");</div><div class='add'>+</div><div class='add'>+	err = copy_from_user(&amp;setup, arg, sizeof(setup));</div><div class='add'>+	if (err) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "ME4000:me4000_eeprom_write():Cannot copy from user\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Enable writing */</div><div class='add'>+	eeprom_write_cmd(ai_context, ME4000_EEPROM_CMD_WRITE_ENABLE,</div><div class='add'>+			 ME4000_EEPROM_CMD_LENGTH_WRITE_ENABLE);</div><div class='add'>+</div><div class='add'>+	/* Command for date */</div><div class='add'>+	date_high = (setup.date &amp; 0xFFFF0000) &gt;&gt; 16;</div><div class='add'>+	date_low = (setup.date &amp; 0x0000FFFF);</div><div class='add'>+</div><div class='add'>+	cmd =</div><div class='add'>+	    ME4000_EEPROM_CMD_WRITE | (ME4000_EEPROM_ADR_DATE_HIGH &lt;&lt;</div><div class='add'>+				       ME4000_EEPROM_DATA_LENGTH) | (0xFFFF &amp;</div><div class='add'>+								     (unsigned</div><div class='add'>+								      long)</div><div class='add'>+								     date_high);</div><div class='add'>+	err = eeprom_write_cmd(ai_context, cmd, ME4000_EEPROM_CMD_LENGTH_WRITE);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	cmd =</div><div class='add'>+	    ME4000_EEPROM_CMD_WRITE | (ME4000_EEPROM_ADR_DATE_LOW &lt;&lt;</div><div class='add'>+				       ME4000_EEPROM_DATA_LENGTH) | (0xFFFF &amp;</div><div class='add'>+								     (unsigned</div><div class='add'>+								      long)</div><div class='add'>+								     date_low);</div><div class='add'>+	err = eeprom_write_cmd(ai_context, cmd, ME4000_EEPROM_CMD_LENGTH_WRITE);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* Command for unipolar 10V offset */</div><div class='add'>+	cmd =</div><div class='add'>+	    ME4000_EEPROM_CMD_WRITE | (ME4000_EEPROM_ADR_GAIN_1_UNI_OFFSET &lt;&lt;</div><div class='add'>+				       ME4000_EEPROM_DATA_LENGTH) | (0xFFFF &amp;</div><div class='add'>+								     (unsigned</div><div class='add'>+								      long)</div><div class='add'>+								     setup.</div><div class='add'>+								     uni_10_offset);</div><div class='add'>+	err = eeprom_write_cmd(ai_context, cmd, ME4000_EEPROM_CMD_LENGTH_WRITE);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* Command for unipolar 10V fullscale */</div><div class='add'>+	cmd =</div><div class='add'>+	    ME4000_EEPROM_CMD_WRITE | (ME4000_EEPROM_ADR_GAIN_1_UNI_FULLSCALE &lt;&lt;</div><div class='add'>+				       ME4000_EEPROM_DATA_LENGTH) | (0xFFFF &amp;</div><div class='add'>+								     (unsigned</div><div class='add'>+								      long)</div><div class='add'>+								     setup.</div><div class='add'>+								     uni_10_fullscale);</div><div class='add'>+	err = eeprom_write_cmd(ai_context, cmd, ME4000_EEPROM_CMD_LENGTH_WRITE);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* Command for unipolar 2,5V offset */</div><div class='add'>+	cmd =</div><div class='add'>+	    ME4000_EEPROM_CMD_WRITE | (ME4000_EEPROM_ADR_GAIN_4_UNI_OFFSET &lt;&lt;</div><div class='add'>+				       ME4000_EEPROM_DATA_LENGTH) | (0xFFFF &amp;</div><div class='add'>+								     (unsigned</div><div class='add'>+								      long)</div><div class='add'>+								     setup.</div><div class='add'>+								     uni_2_5_offset);</div><div class='add'>+	err = eeprom_write_cmd(ai_context, cmd, ME4000_EEPROM_CMD_LENGTH_WRITE);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* Command for unipolar 2,5V fullscale */</div><div class='add'>+	cmd =</div><div class='add'>+	    ME4000_EEPROM_CMD_WRITE | (ME4000_EEPROM_ADR_GAIN_4_UNI_FULLSCALE &lt;&lt;</div><div class='add'>+				       ME4000_EEPROM_DATA_LENGTH) | (0xFFFF &amp;</div><div class='add'>+								     (unsigned</div><div class='add'>+								      long)</div><div class='add'>+								     setup.</div><div class='add'>+								     uni_2_5_fullscale);</div><div class='add'>+	err = eeprom_write_cmd(ai_context, cmd, ME4000_EEPROM_CMD_LENGTH_WRITE);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* Command for bipolar 10V offset */</div><div class='add'>+	cmd =</div><div class='add'>+	    ME4000_EEPROM_CMD_WRITE | (ME4000_EEPROM_ADR_GAIN_1_BI_OFFSET &lt;&lt;</div><div class='add'>+				       ME4000_EEPROM_DATA_LENGTH) | (0xFFFF &amp;</div><div class='add'>+								     (unsigned</div><div class='add'>+								      long)</div><div class='add'>+								     setup.</div><div class='add'>+								     bi_10_offset);</div><div class='add'>+	err = eeprom_write_cmd(ai_context, cmd, ME4000_EEPROM_CMD_LENGTH_WRITE);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* Command for bipolar 10V fullscale */</div><div class='add'>+	cmd =</div><div class='add'>+	    ME4000_EEPROM_CMD_WRITE | (ME4000_EEPROM_ADR_GAIN_1_BI_FULLSCALE &lt;&lt;</div><div class='add'>+				       ME4000_EEPROM_DATA_LENGTH) | (0xFFFF &amp;</div><div class='add'>+								     (unsigned</div><div class='add'>+								      long)</div><div class='add'>+								     setup.</div><div class='add'>+								     bi_10_fullscale);</div><div class='add'>+	err = eeprom_write_cmd(ai_context, cmd, ME4000_EEPROM_CMD_LENGTH_WRITE);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* Command for bipolar 2,5V offset */</div><div class='add'>+	cmd =</div><div class='add'>+	    ME4000_EEPROM_CMD_WRITE | (ME4000_EEPROM_ADR_GAIN_4_BI_OFFSET &lt;&lt;</div><div class='add'>+				       ME4000_EEPROM_DATA_LENGTH) | (0xFFFF &amp;</div><div class='add'>+								     (unsigned</div><div class='add'>+								      long)</div><div class='add'>+								     setup.</div><div class='add'>+								     bi_2_5_offset);</div><div class='add'>+	err = eeprom_write_cmd(ai_context, cmd, ME4000_EEPROM_CMD_LENGTH_WRITE);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* Command for bipolar 2,5V fullscale */</div><div class='add'>+	cmd =</div><div class='add'>+	    ME4000_EEPROM_CMD_WRITE | (ME4000_EEPROM_ADR_GAIN_4_BI_FULLSCALE &lt;&lt;</div><div class='add'>+				       ME4000_EEPROM_DATA_LENGTH) | (0xFFFF &amp;</div><div class='add'>+								     (unsigned</div><div class='add'>+								      long)</div><div class='add'>+								     setup.</div><div class='add'>+								     bi_2_5_fullscale);</div><div class='add'>+	err = eeprom_write_cmd(ai_context, cmd, ME4000_EEPROM_CMD_LENGTH_WRITE);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* Command for differential 10V offset */</div><div class='add'>+	cmd =</div><div class='add'>+	    ME4000_EEPROM_CMD_WRITE | (ME4000_EEPROM_ADR_GAIN_1_DIFF_OFFSET &lt;&lt;</div><div class='add'>+				       ME4000_EEPROM_DATA_LENGTH) | (0xFFFF &amp;</div><div class='add'>+								     (unsigned</div><div class='add'>+								      long)</div><div class='add'>+								     setup.</div><div class='add'>+								     diff_10_offset);</div><div class='add'>+	err = eeprom_write_cmd(ai_context, cmd, ME4000_EEPROM_CMD_LENGTH_WRITE);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* Command for differential 10V fullscale */</div><div class='add'>+	cmd =</div><div class='add'>+	    ME4000_EEPROM_CMD_WRITE | (ME4000_EEPROM_ADR_GAIN_1_DIFF_FULLSCALE</div><div class='add'>+				       &lt;&lt; ME4000_EEPROM_DATA_LENGTH) | (0xFFFF &amp;</div><div class='add'>+									(unsigned</div><div class='add'>+									 long)</div><div class='add'>+									setup.</div><div class='add'>+									diff_10_fullscale);</div><div class='add'>+	err = eeprom_write_cmd(ai_context, cmd, ME4000_EEPROM_CMD_LENGTH_WRITE);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* Command for differential 2,5V offset */</div><div class='add'>+	cmd =</div><div class='add'>+	    ME4000_EEPROM_CMD_WRITE | (ME4000_EEPROM_ADR_GAIN_4_DIFF_OFFSET &lt;&lt;</div><div class='add'>+				       ME4000_EEPROM_DATA_LENGTH) | (0xFFFF &amp;</div><div class='add'>+								     (unsigned</div><div class='add'>+								      long)</div><div class='add'>+								     setup.</div><div class='add'>+								     diff_2_5_offset);</div><div class='add'>+	err = eeprom_write_cmd(ai_context, cmd, ME4000_EEPROM_CMD_LENGTH_WRITE);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* Command for differential 2,5V fullscale */</div><div class='add'>+	cmd =</div><div class='add'>+	    ME4000_EEPROM_CMD_WRITE | (ME4000_EEPROM_ADR_GAIN_4_DIFF_FULLSCALE</div><div class='add'>+				       &lt;&lt; ME4000_EEPROM_DATA_LENGTH) | (0xFFFF &amp;</div><div class='add'>+									(unsigned</div><div class='add'>+									 long)</div><div class='add'>+									setup.</div><div class='add'>+									diff_2_5_fullscale);</div><div class='add'>+	err = eeprom_write_cmd(ai_context, cmd, ME4000_EEPROM_CMD_LENGTH_WRITE);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* Disable writing */</div><div class='add'>+	eeprom_write_cmd(ai_context, ME4000_EEPROM_CMD_WRITE_DISABLE,</div><div class='add'>+			 ME4000_EEPROM_CMD_LENGTH_WRITE_DISABLE);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int me4000_eeprom_read(me4000_eeprom_t * arg,</div><div class='add'>+			      me4000_ai_context_t * ai_context)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	unsigned long cmd;</div><div class='add'>+	me4000_eeprom_t setup;</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("me4000_eeprom_read() is executed\n");</div><div class='add'>+</div><div class='add'>+	/* Command for date */</div><div class='add'>+	cmd = ME4000_EEPROM_CMD_READ | ME4000_EEPROM_ADR_DATE_HIGH;</div><div class='add'>+	setup.date =</div><div class='add'>+	    eeprom_read_cmd(ai_context, cmd, ME4000_EEPROM_CMD_LENGTH_READ);</div><div class='add'>+	setup.date &lt;&lt;= 16;</div><div class='add'>+	cmd = ME4000_EEPROM_CMD_READ | ME4000_EEPROM_ADR_DATE_LOW;</div><div class='add'>+	setup.date |=</div><div class='add'>+	    eeprom_read_cmd(ai_context, cmd, ME4000_EEPROM_CMD_LENGTH_READ);</div><div class='add'>+</div><div class='add'>+	/* Command for unipolar 10V offset */</div><div class='add'>+	cmd = ME4000_EEPROM_CMD_READ | ME4000_EEPROM_ADR_GAIN_1_UNI_OFFSET;</div><div class='add'>+	setup.uni_10_offset =</div><div class='add'>+	    eeprom_read_cmd(ai_context, cmd, ME4000_EEPROM_CMD_LENGTH_READ);</div><div class='add'>+</div><div class='add'>+	/* Command for unipolar 10V fullscale */</div><div class='add'>+	cmd = ME4000_EEPROM_CMD_READ | ME4000_EEPROM_ADR_GAIN_1_UNI_FULLSCALE;</div><div class='add'>+	setup.uni_10_fullscale =</div><div class='add'>+	    eeprom_read_cmd(ai_context, cmd, ME4000_EEPROM_CMD_LENGTH_READ);</div><div class='add'>+</div><div class='add'>+	/* Command for unipolar 2,5V offset */</div><div class='add'>+	cmd = ME4000_EEPROM_CMD_READ | ME4000_EEPROM_ADR_GAIN_4_UNI_OFFSET;</div><div class='add'>+	setup.uni_2_5_offset =</div><div class='add'>+	    eeprom_read_cmd(ai_context, cmd, ME4000_EEPROM_CMD_LENGTH_READ);</div><div class='add'>+</div><div class='add'>+	/* Command for unipolar 2,5V fullscale */</div><div class='add'>+	cmd = ME4000_EEPROM_CMD_READ | ME4000_EEPROM_ADR_GAIN_4_UNI_FULLSCALE;</div><div class='add'>+	setup.uni_2_5_fullscale =</div><div class='add'>+	    eeprom_read_cmd(ai_context, cmd, ME4000_EEPROM_CMD_LENGTH_READ);</div><div class='add'>+</div><div class='add'>+	/* Command for bipolar 10V offset */</div><div class='add'>+	cmd = ME4000_EEPROM_CMD_READ | ME4000_EEPROM_ADR_GAIN_1_BI_OFFSET;</div><div class='add'>+	setup.bi_10_offset =</div><div class='add'>+	    eeprom_read_cmd(ai_context, cmd, ME4000_EEPROM_CMD_LENGTH_READ);</div><div class='add'>+</div><div class='add'>+	/* Command for bipolar 10V fullscale */</div><div class='add'>+	cmd = ME4000_EEPROM_CMD_READ | ME4000_EEPROM_ADR_GAIN_1_BI_FULLSCALE;</div><div class='add'>+	setup.bi_10_fullscale =</div><div class='add'>+	    eeprom_read_cmd(ai_context, cmd, ME4000_EEPROM_CMD_LENGTH_READ);</div><div class='add'>+</div><div class='add'>+	/* Command for bipolar 2,5V offset */</div><div class='add'>+	cmd = ME4000_EEPROM_CMD_READ | ME4000_EEPROM_ADR_GAIN_4_BI_OFFSET;</div><div class='add'>+	setup.bi_2_5_offset =</div><div class='add'>+	    eeprom_read_cmd(ai_context, cmd, ME4000_EEPROM_CMD_LENGTH_READ);</div><div class='add'>+</div><div class='add'>+	/* Command for bipolar 2,5V fullscale */</div><div class='add'>+	cmd = ME4000_EEPROM_CMD_READ | ME4000_EEPROM_ADR_GAIN_4_BI_FULLSCALE;</div><div class='add'>+	setup.bi_2_5_fullscale =</div><div class='add'>+	    eeprom_read_cmd(ai_context, cmd, ME4000_EEPROM_CMD_LENGTH_READ);</div><div class='add'>+</div><div class='add'>+	/* Command for differntial 10V offset */</div><div class='add'>+	cmd = ME4000_EEPROM_CMD_READ | ME4000_EEPROM_ADR_GAIN_1_DIFF_OFFSET;</div><div class='add'>+	setup.diff_10_offset =</div><div class='add'>+	    eeprom_read_cmd(ai_context, cmd, ME4000_EEPROM_CMD_LENGTH_READ);</div><div class='add'>+</div><div class='add'>+	/* Command for differential 10V fullscale */</div><div class='add'>+	cmd = ME4000_EEPROM_CMD_READ | ME4000_EEPROM_ADR_GAIN_1_DIFF_FULLSCALE;</div><div class='add'>+	setup.diff_10_fullscale =</div><div class='add'>+	    eeprom_read_cmd(ai_context, cmd, ME4000_EEPROM_CMD_LENGTH_READ);</div><div class='add'>+</div><div class='add'>+	/* Command for differntial 2,5V offset */</div><div class='add'>+	cmd = ME4000_EEPROM_CMD_READ | ME4000_EEPROM_ADR_GAIN_4_DIFF_OFFSET;</div><div class='add'>+	setup.diff_2_5_offset =</div><div class='add'>+	    eeprom_read_cmd(ai_context, cmd, ME4000_EEPROM_CMD_LENGTH_READ);</div><div class='add'>+</div><div class='add'>+	/* Command for differential 2,5V fullscale */</div><div class='add'>+	cmd = ME4000_EEPROM_CMD_READ | ME4000_EEPROM_ADR_GAIN_4_DIFF_FULLSCALE;</div><div class='add'>+	setup.diff_2_5_fullscale =</div><div class='add'>+	    eeprom_read_cmd(ai_context, cmd, ME4000_EEPROM_CMD_LENGTH_READ);</div><div class='add'>+</div><div class='add'>+	err = copy_to_user(arg, &amp;setup, sizeof(setup));</div><div class='add'>+	if (err) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "ME4000:me4000_eeprom_read():Cannot copy to user\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*------------------------------------ DIO stuff ----------------------------------------------*/</div><div class='add'>+</div><div class='add'>+static int me4000_dio_ioctl(struct inode *inode_p, struct file *file_p,</div><div class='add'>+			    unsigned int service, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	me4000_dio_context_t *dio_context;</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("me4000_dio_ioctl() is executed\n");</div><div class='add'>+</div><div class='add'>+	dio_context = file_p-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	if (_IOC_TYPE(service) != ME4000_MAGIC) {</div><div class='add'>+		printk(KERN_ERR "me4000_dio_ioctl():Wrong magic number\n");</div><div class='add'>+		return -ENOTTY;</div><div class='add'>+	}</div><div class='add'>+	if (_IOC_NR(service) &gt; ME4000_IOCTL_MAXNR) {</div><div class='add'>+		printk(KERN_ERR "me4000_dio_ioctl():Service number to high\n");</div><div class='add'>+		return -ENOTTY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (service) {</div><div class='add'>+	case ME4000_DIO_CONFIG:</div><div class='add'>+		return me4000_dio_config((me4000_dio_config_t *) arg,</div><div class='add'>+					 dio_context);</div><div class='add'>+	case ME4000_DIO_SET_BYTE:</div><div class='add'>+		return me4000_dio_set_byte((me4000_dio_byte_t *) arg,</div><div class='add'>+					   dio_context);</div><div class='add'>+	case ME4000_DIO_GET_BYTE:</div><div class='add'>+		return me4000_dio_get_byte((me4000_dio_byte_t *) arg,</div><div class='add'>+					   dio_context);</div><div class='add'>+	case ME4000_DIO_RESET:</div><div class='add'>+		return me4000_dio_reset(dio_context);</div><div class='add'>+	default:</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "ME4000:me4000_dio_ioctl():Invalid service number %d\n",</div><div class='add'>+		       service);</div><div class='add'>+		return -ENOTTY;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int me4000_dio_config(me4000_dio_config_t * arg,</div><div class='add'>+			     me4000_dio_context_t * dio_context)</div><div class='add'>+{</div><div class='add'>+	me4000_dio_config_t cmd;</div><div class='add'>+	u32 tmp;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("me4000_dio_config() is executed\n");</div><div class='add'>+</div><div class='add'>+	/* Copy data from user */</div><div class='add'>+	err = copy_from_user(&amp;cmd, arg, sizeof(me4000_dio_config_t));</div><div class='add'>+	if (err) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "ME4000:me4000_dio_config():Can't copy from user space\n");</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check port parameter */</div><div class='add'>+	if (cmd.port &gt;= dio_context-&gt;dio_count) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "ME4000:me4000_dio_config():Port %d is not available\n",</div><div class='add'>+		       cmd.port);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	PDEBUG("me4000_dio_config(): port %d, mode %d, function %d\n", cmd.port,</div><div class='add'>+	       cmd.mode, cmd.function);</div><div class='add'>+</div><div class='add'>+	if (cmd.port == ME4000_DIO_PORT_A) {</div><div class='add'>+		if (cmd.mode == ME4000_DIO_PORT_INPUT) {</div><div class='add'>+			/* Check if opto isolated version */</div><div class='add'>+			if (!(me4000_inl(dio_context-&gt;dir_reg) &amp; 0x1)) {</div><div class='add'>+				printk(KERN_ERR</div><div class='add'>+				       "ME4000:me4000_dio_config():Cannot set to input on opto isolated versions\n");</div><div class='add'>+				return -EIO;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			tmp = me4000_inl(dio_context-&gt;ctrl_reg);</div><div class='add'>+			tmp &amp;=</div><div class='add'>+			    ~(ME4000_DIO_CTRL_BIT_MODE_0 |</div><div class='add'>+			      ME4000_DIO_CTRL_BIT_MODE_1);</div><div class='add'>+			me4000_outl(tmp, dio_context-&gt;ctrl_reg);</div><div class='add'>+		} else if (cmd.mode == ME4000_DIO_PORT_OUTPUT) {</div><div class='add'>+			tmp = me4000_inl(dio_context-&gt;ctrl_reg);</div><div class='add'>+			tmp &amp;=</div><div class='add'>+			    ~(ME4000_DIO_CTRL_BIT_MODE_0 |</div><div class='add'>+			      ME4000_DIO_CTRL_BIT_MODE_1);</div><div class='add'>+			tmp |= ME4000_DIO_CTRL_BIT_MODE_0;</div><div class='add'>+			me4000_outl(tmp, dio_context-&gt;ctrl_reg);</div><div class='add'>+		} else if (cmd.mode == ME4000_DIO_FIFO_LOW) {</div><div class='add'>+			tmp = me4000_inl(dio_context-&gt;ctrl_reg);</div><div class='add'>+			tmp &amp;=</div><div class='add'>+			    ~(ME4000_DIO_CTRL_BIT_MODE_0 |</div><div class='add'>+			      ME4000_DIO_CTRL_BIT_MODE_1 |</div><div class='add'>+			      ME4000_DIO_CTRL_BIT_FIFO_HIGH_0);</div><div class='add'>+			tmp |=</div><div class='add'>+			    ME4000_DIO_CTRL_BIT_MODE_0 |</div><div class='add'>+			    ME4000_DIO_CTRL_BIT_MODE_1;</div><div class='add'>+			me4000_outl(tmp, dio_context-&gt;ctrl_reg);</div><div class='add'>+		} else if (cmd.mode == ME4000_DIO_FIFO_HIGH) {</div><div class='add'>+			tmp = me4000_inl(dio_context-&gt;ctrl_reg);</div><div class='add'>+			tmp |=</div><div class='add'>+			    ME4000_DIO_CTRL_BIT_MODE_0 |</div><div class='add'>+			    ME4000_DIO_CTRL_BIT_MODE_1 |</div><div class='add'>+			    ME4000_DIO_CTRL_BIT_FIFO_HIGH_0;</div><div class='add'>+			me4000_outl(tmp, dio_context-&gt;ctrl_reg);</div><div class='add'>+		} else {</div><div class='add'>+			printk(KERN_ERR</div><div class='add'>+			       "ME4000:me4000_dio_config():Mode %d is not available\n",</div><div class='add'>+			       cmd.mode);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	} else if (cmd.port == ME4000_DIO_PORT_B) {</div><div class='add'>+		if (cmd.mode == ME4000_DIO_PORT_INPUT) {</div><div class='add'>+			/* Only do anything when TTL version is installed */</div><div class='add'>+			if ((me4000_inl(dio_context-&gt;dir_reg) &amp; 0x1)) {</div><div class='add'>+				tmp = me4000_inl(dio_context-&gt;ctrl_reg);</div><div class='add'>+				tmp &amp;=</div><div class='add'>+				    ~(ME4000_DIO_CTRL_BIT_MODE_2 |</div><div class='add'>+				      ME4000_DIO_CTRL_BIT_MODE_3);</div><div class='add'>+				me4000_outl(tmp, dio_context-&gt;ctrl_reg);</div><div class='add'>+			}</div><div class='add'>+		} else if (cmd.mode == ME4000_DIO_PORT_OUTPUT) {</div><div class='add'>+			/* Check if opto isolated version */</div><div class='add'>+			if (!(me4000_inl(dio_context-&gt;dir_reg) &amp; 0x1)) {</div><div class='add'>+				printk(KERN_ERR</div><div class='add'>+				       "ME4000:me4000_dio_config():Cannot set to output on opto isolated versions\n");</div><div class='add'>+				return -EIO;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			tmp = me4000_inl(dio_context-&gt;ctrl_reg);</div><div class='add'>+			tmp &amp;=</div><div class='add'>+			    ~(ME4000_DIO_CTRL_BIT_MODE_2 |</div><div class='add'>+			      ME4000_DIO_CTRL_BIT_MODE_3);</div><div class='add'>+			tmp |= ME4000_DIO_CTRL_BIT_MODE_2;</div><div class='add'>+			me4000_outl(tmp, dio_context-&gt;ctrl_reg);</div><div class='add'>+		} else if (cmd.mode == ME4000_DIO_FIFO_LOW) {</div><div class='add'>+			/* Check if opto isolated version */</div><div class='add'>+			if (!(me4000_inl(dio_context-&gt;dir_reg) &amp; 0x1)) {</div><div class='add'>+				printk(KERN_ERR</div><div class='add'>+				       "ME4000:me4000_dio_config():Cannot set to FIFO low output on opto isolated versions\n");</div><div class='add'>+				return -EIO;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			tmp = me4000_inl(dio_context-&gt;ctrl_reg);</div><div class='add'>+			tmp &amp;=</div><div class='add'>+			    ~(ME4000_DIO_CTRL_BIT_MODE_2 |</div><div class='add'>+			      ME4000_DIO_CTRL_BIT_MODE_3 |</div><div class='add'>+			      ME4000_DIO_CTRL_BIT_FIFO_HIGH_1);</div><div class='add'>+			tmp |=</div><div class='add'>+			    ME4000_DIO_CTRL_BIT_MODE_2 |</div><div class='add'>+			    ME4000_DIO_CTRL_BIT_MODE_3;</div><div class='add'>+			me4000_outl(tmp, dio_context-&gt;ctrl_reg);</div><div class='add'>+		} else if (cmd.mode == ME4000_DIO_FIFO_HIGH) {</div><div class='add'>+			/* Check if opto isolated version */</div><div class='add'>+			if (!(me4000_inl(dio_context-&gt;dir_reg) &amp; 0x1)) {</div><div class='add'>+				printk(KERN_ERR</div><div class='add'>+				       "ME4000:me4000_dio_config():Cannot set to FIFO high output on opto isolated versions\n");</div><div class='add'>+				return -EIO;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			tmp = me4000_inl(dio_context-&gt;ctrl_reg);</div><div class='add'>+			tmp |=</div><div class='add'>+			    ME4000_DIO_CTRL_BIT_MODE_2 |</div><div class='add'>+			    ME4000_DIO_CTRL_BIT_MODE_3 |</div><div class='add'>+			    ME4000_DIO_CTRL_BIT_FIFO_HIGH_1;</div><div class='add'>+			me4000_outl(tmp, dio_context-&gt;ctrl_reg);</div><div class='add'>+		} else {</div><div class='add'>+			printk(KERN_ERR</div><div class='add'>+			       "ME4000:me4000_dio_config():Mode %d is not available\n",</div><div class='add'>+			       cmd.mode);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	} else if (cmd.port == ME4000_DIO_PORT_C) {</div><div class='add'>+		if (cmd.mode == ME4000_DIO_PORT_INPUT) {</div><div class='add'>+			tmp = me4000_inl(dio_context-&gt;ctrl_reg);</div><div class='add'>+			tmp &amp;=</div><div class='add'>+			    ~(ME4000_DIO_CTRL_BIT_MODE_4 |</div><div class='add'>+			      ME4000_DIO_CTRL_BIT_MODE_5);</div><div class='add'>+			me4000_outl(tmp, dio_context-&gt;ctrl_reg);</div><div class='add'>+		} else if (cmd.mode == ME4000_DIO_PORT_OUTPUT) {</div><div class='add'>+			tmp = me4000_inl(dio_context-&gt;ctrl_reg);</div><div class='add'>+			tmp &amp;=</div><div class='add'>+			    ~(ME4000_DIO_CTRL_BIT_MODE_4 |</div><div class='add'>+			      ME4000_DIO_CTRL_BIT_MODE_5);</div><div class='add'>+			tmp |= ME4000_DIO_CTRL_BIT_MODE_4;</div><div class='add'>+			me4000_outl(tmp, dio_context-&gt;ctrl_reg);</div><div class='add'>+		} else if (cmd.mode == ME4000_DIO_FIFO_LOW) {</div><div class='add'>+			tmp = me4000_inl(dio_context-&gt;ctrl_reg);</div><div class='add'>+			tmp &amp;=</div><div class='add'>+			    ~(ME4000_DIO_CTRL_BIT_MODE_4 |</div><div class='add'>+			      ME4000_DIO_CTRL_BIT_MODE_5 |</div><div class='add'>+			      ME4000_DIO_CTRL_BIT_FIFO_HIGH_2);</div><div class='add'>+			tmp |=</div><div class='add'>+			    ME4000_DIO_CTRL_BIT_MODE_4 |</div><div class='add'>+			    ME4000_DIO_CTRL_BIT_MODE_5;</div><div class='add'>+			me4000_outl(tmp, dio_context-&gt;ctrl_reg);</div><div class='add'>+		} else if (cmd.mode == ME4000_DIO_FIFO_HIGH) {</div><div class='add'>+			tmp = me4000_inl(dio_context-&gt;ctrl_reg);</div><div class='add'>+			tmp |=</div><div class='add'>+			    ME4000_DIO_CTRL_BIT_MODE_4 |</div><div class='add'>+			    ME4000_DIO_CTRL_BIT_MODE_5 |</div><div class='add'>+			    ME4000_DIO_CTRL_BIT_FIFO_HIGH_2;</div><div class='add'>+			me4000_outl(tmp, dio_context-&gt;ctrl_reg);</div><div class='add'>+		} else {</div><div class='add'>+			printk(KERN_ERR</div><div class='add'>+			       "ME4000:me4000_dio_config():Mode %d is not available\n",</div><div class='add'>+			       cmd.mode);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	} else if (cmd.port == ME4000_DIO_PORT_D) {</div><div class='add'>+		if (cmd.mode == ME4000_DIO_PORT_INPUT) {</div><div class='add'>+			tmp = me4000_inl(dio_context-&gt;ctrl_reg);</div><div class='add'>+			tmp &amp;=</div><div class='add'>+			    ~(ME4000_DIO_CTRL_BIT_MODE_6 |</div><div class='add'>+			      ME4000_DIO_CTRL_BIT_MODE_7);</div><div class='add'>+			me4000_outl(tmp, dio_context-&gt;ctrl_reg);</div><div class='add'>+		} else if (cmd.mode == ME4000_DIO_PORT_OUTPUT) {</div><div class='add'>+			tmp = me4000_inl(dio_context-&gt;ctrl_reg);</div><div class='add'>+			tmp &amp;=</div><div class='add'>+			    ~(ME4000_DIO_CTRL_BIT_MODE_6 |</div><div class='add'>+			      ME4000_DIO_CTRL_BIT_MODE_7);</div><div class='add'>+			tmp |= ME4000_DIO_CTRL_BIT_MODE_6;</div><div class='add'>+			me4000_outl(tmp, dio_context-&gt;ctrl_reg);</div><div class='add'>+		} else if (cmd.mode == ME4000_DIO_FIFO_LOW) {</div><div class='add'>+			tmp = me4000_inl(dio_context-&gt;ctrl_reg);</div><div class='add'>+			tmp &amp;=</div><div class='add'>+			    ~(ME4000_DIO_CTRL_BIT_MODE_6 |</div><div class='add'>+			      ME4000_DIO_CTRL_BIT_MODE_7 |</div><div class='add'>+			      ME4000_DIO_CTRL_BIT_FIFO_HIGH_3);</div><div class='add'>+			tmp |=</div><div class='add'>+			    ME4000_DIO_CTRL_BIT_MODE_6 |</div><div class='add'>+			    ME4000_DIO_CTRL_BIT_MODE_7;</div><div class='add'>+			me4000_outl(tmp, dio_context-&gt;ctrl_reg);</div><div class='add'>+		} else if (cmd.mode == ME4000_DIO_FIFO_HIGH) {</div><div class='add'>+			tmp = me4000_inl(dio_context-&gt;ctrl_reg);</div><div class='add'>+			tmp |=</div><div class='add'>+			    ME4000_DIO_CTRL_BIT_MODE_6 |</div><div class='add'>+			    ME4000_DIO_CTRL_BIT_MODE_7 |</div><div class='add'>+			    ME4000_DIO_CTRL_BIT_FIFO_HIGH_3;</div><div class='add'>+			me4000_outl(tmp, dio_context-&gt;ctrl_reg);</div><div class='add'>+		} else {</div><div class='add'>+			printk(KERN_ERR</div><div class='add'>+			       "ME4000:me4000_dio_config():Mode %d is not available\n",</div><div class='add'>+			       cmd.mode);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "ME4000:me4000_dio_config():Port %d is not available\n",</div><div class='add'>+		       cmd.port);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	PDEBUG("me4000_dio_config(): port %d, mode %d, function %d\n", cmd.port,</div><div class='add'>+	       cmd.mode, cmd.function);</div><div class='add'>+</div><div class='add'>+	if ((cmd.mode == ME4000_DIO_FIFO_HIGH)</div><div class='add'>+	    || (cmd.mode == ME4000_DIO_FIFO_LOW)) {</div><div class='add'>+		tmp = me4000_inl(dio_context-&gt;ctrl_reg);</div><div class='add'>+		tmp &amp;=</div><div class='add'>+		    ~(ME4000_DIO_CTRL_BIT_FUNCTION_0 |</div><div class='add'>+		      ME4000_DIO_CTRL_BIT_FUNCTION_1);</div><div class='add'>+		if (cmd.function == ME4000_DIO_FUNCTION_PATTERN) {</div><div class='add'>+			me4000_outl(tmp, dio_context-&gt;ctrl_reg);</div><div class='add'>+		} else if (cmd.function == ME4000_DIO_FUNCTION_DEMUX) {</div><div class='add'>+			tmp |= ME4000_DIO_CTRL_BIT_FUNCTION_0;</div><div class='add'>+			me4000_outl(tmp, dio_context-&gt;ctrl_reg);</div><div class='add'>+		} else if (cmd.function == ME4000_DIO_FUNCTION_MUX) {</div><div class='add'>+			tmp |= ME4000_DIO_CTRL_BIT_FUNCTION_1;</div><div class='add'>+			me4000_outl(tmp, dio_context-&gt;ctrl_reg);</div><div class='add'>+		} else {</div><div class='add'>+			printk(KERN_ERR</div><div class='add'>+			       "ME4000:me4000_dio_config():Invalid port function specified\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int me4000_dio_set_byte(me4000_dio_byte_t * arg,</div><div class='add'>+			       me4000_dio_context_t * dio_context)</div><div class='add'>+{</div><div class='add'>+	me4000_dio_byte_t cmd;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("me4000_dio_set_byte() is executed\n");</div><div class='add'>+</div><div class='add'>+	/* Copy data from user */</div><div class='add'>+	err = copy_from_user(&amp;cmd, arg, sizeof(me4000_dio_byte_t));</div><div class='add'>+	if (err) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "ME4000:me4000_dio_set_byte():Can't copy from user space\n");</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check port parameter */</div><div class='add'>+	if (cmd.port &gt;= dio_context-&gt;dio_count) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "ME4000:me4000_dio_set_byte():Port %d is not available\n",</div><div class='add'>+		       cmd.port);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cmd.port == ME4000_DIO_PORT_A) {</div><div class='add'>+		if ((me4000_inl(dio_context-&gt;ctrl_reg) &amp; 0x3) != 0x1) {</div><div class='add'>+			printk(KERN_ERR</div><div class='add'>+			       "ME4000:me4000_dio_set_byte():Port %d is not in output mode\n",</div><div class='add'>+			       cmd.port);</div><div class='add'>+			return -EIO;</div><div class='add'>+		}</div><div class='add'>+		me4000_outl(cmd.byte, dio_context-&gt;port_0_reg);</div><div class='add'>+	} else if (cmd.port == ME4000_DIO_PORT_B) {</div><div class='add'>+		if ((me4000_inl(dio_context-&gt;ctrl_reg) &amp; 0xC) != 0x4) {</div><div class='add'>+			printk(KERN_ERR</div><div class='add'>+			       "ME4000:me4000_dio_set_byte():Port %d is not in output mode\n",</div><div class='add'>+			       cmd.port);</div><div class='add'>+			return -EIO;</div><div class='add'>+		}</div><div class='add'>+		me4000_outl(cmd.byte, dio_context-&gt;port_1_reg);</div><div class='add'>+	} else if (cmd.port == ME4000_DIO_PORT_C) {</div><div class='add'>+		if ((me4000_inl(dio_context-&gt;ctrl_reg) &amp; 0x30) != 0x10) {</div><div class='add'>+			printk(KERN_ERR</div><div class='add'>+			       "ME4000:me4000_dio_set_byte():Port %d is not in output mode\n",</div><div class='add'>+			       cmd.port);</div><div class='add'>+			return -EIO;</div><div class='add'>+		}</div><div class='add'>+		me4000_outl(cmd.byte, dio_context-&gt;port_2_reg);</div><div class='add'>+	} else if (cmd.port == ME4000_DIO_PORT_D) {</div><div class='add'>+		if ((me4000_inl(dio_context-&gt;ctrl_reg) &amp; 0xC0) != 0x40) {</div><div class='add'>+			printk(KERN_ERR</div><div class='add'>+			       "ME4000:me4000_dio_set_byte():Port %d is not in output mode\n",</div><div class='add'>+			       cmd.port);</div><div class='add'>+			return -EIO;</div><div class='add'>+		}</div><div class='add'>+		me4000_outl(cmd.byte, dio_context-&gt;port_3_reg);</div><div class='add'>+	} else {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "ME4000:me4000_dio_set_byte():Port %d is not available\n",</div><div class='add'>+		       cmd.port);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int me4000_dio_get_byte(me4000_dio_byte_t * arg,</div><div class='add'>+			       me4000_dio_context_t * dio_context)</div><div class='add'>+{</div><div class='add'>+	me4000_dio_byte_t cmd;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("me4000_dio_get_byte() is executed\n");</div><div class='add'>+</div><div class='add'>+	/* Copy data from user */</div><div class='add'>+	err = copy_from_user(&amp;cmd, arg, sizeof(me4000_dio_byte_t));</div><div class='add'>+	if (err) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "ME4000:me4000_dio_get_byte():Can't copy from user space\n");</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check port parameter */</div><div class='add'>+	if (cmd.port &gt;= dio_context-&gt;dio_count) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "ME4000:me4000_dio_get_byte():Port %d is not available\n",</div><div class='add'>+		       cmd.port);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cmd.port == ME4000_DIO_PORT_A) {</div><div class='add'>+		cmd.byte = me4000_inl(dio_context-&gt;port_0_reg) &amp; 0xFF;</div><div class='add'>+	} else if (cmd.port == ME4000_DIO_PORT_B) {</div><div class='add'>+		cmd.byte = me4000_inl(dio_context-&gt;port_1_reg) &amp; 0xFF;</div><div class='add'>+	} else if (cmd.port == ME4000_DIO_PORT_C) {</div><div class='add'>+		cmd.byte = me4000_inl(dio_context-&gt;port_2_reg) &amp; 0xFF;</div><div class='add'>+	} else if (cmd.port == ME4000_DIO_PORT_D) {</div><div class='add'>+		cmd.byte = me4000_inl(dio_context-&gt;port_3_reg) &amp; 0xFF;</div><div class='add'>+	} else {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "ME4000:me4000_dio_get_byte():Port %d is not available\n",</div><div class='add'>+		       cmd.port);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Copy result back to user */</div><div class='add'>+	err = copy_to_user(arg, &amp;cmd, sizeof(me4000_dio_byte_t));</div><div class='add'>+	if (err) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "ME4000:me4000_dio_get_byte():Can't copy to user space\n");</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int me4000_dio_reset(me4000_dio_context_t * dio_context)</div><div class='add'>+{</div><div class='add'>+	CALL_PDEBUG("me4000_dio_reset() is executed\n");</div><div class='add'>+</div><div class='add'>+	/* Clear the control register */</div><div class='add'>+	me4000_outl(0, dio_context-&gt;ctrl_reg);</div><div class='add'>+</div><div class='add'>+	/* Check for opto isolated version */</div><div class='add'>+	if (!(me4000_inl(dio_context-&gt;dir_reg) &amp; 0x1)) {</div><div class='add'>+		me4000_outl(0x1, dio_context-&gt;ctrl_reg);</div><div class='add'>+		me4000_outl(0x0, dio_context-&gt;port_0_reg);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*------------------------------------ COUNTER STUFF ------------------------------------*/</div><div class='add'>+</div><div class='add'>+static int me4000_cnt_ioctl(struct inode *inode_p, struct file *file_p,</div><div class='add'>+			    unsigned int service, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	me4000_cnt_context_t *cnt_context;</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("me4000_cnt_ioctl() is executed\n");</div><div class='add'>+</div><div class='add'>+	cnt_context = file_p-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	if (_IOC_TYPE(service) != ME4000_MAGIC) {</div><div class='add'>+		printk(KERN_ERR "me4000_dio_ioctl():Wrong magic number\n");</div><div class='add'>+		return -ENOTTY;</div><div class='add'>+	}</div><div class='add'>+	if (_IOC_NR(service) &gt; ME4000_IOCTL_MAXNR) {</div><div class='add'>+		printk(KERN_ERR "me4000_dio_ioctl():Service number to high\n");</div><div class='add'>+		return -ENOTTY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (service) {</div><div class='add'>+	case ME4000_CNT_READ:</div><div class='add'>+		return me4000_cnt_read((me4000_cnt_t *) arg, cnt_context);</div><div class='add'>+	case ME4000_CNT_WRITE:</div><div class='add'>+		return me4000_cnt_write((me4000_cnt_t *) arg, cnt_context);</div><div class='add'>+	case ME4000_CNT_CONFIG:</div><div class='add'>+		return me4000_cnt_config((me4000_cnt_config_t *) arg,</div><div class='add'>+					 cnt_context);</div><div class='add'>+	case ME4000_CNT_RESET:</div><div class='add'>+		return me4000_cnt_reset(cnt_context);</div><div class='add'>+	default:</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "ME4000:me4000_dio_ioctl():Invalid service number %d\n",</div><div class='add'>+		       service);</div><div class='add'>+		return -ENOTTY;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int me4000_cnt_config(me4000_cnt_config_t * arg,</div><div class='add'>+			     me4000_cnt_context_t * cnt_context)</div><div class='add'>+{</div><div class='add'>+	me4000_cnt_config_t cmd;</div><div class='add'>+	u8 counter;</div><div class='add'>+	u8 mode;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("me4000_cnt_config() is executed\n");</div><div class='add'>+</div><div class='add'>+	/* Copy data from user */</div><div class='add'>+	err = copy_from_user(&amp;cmd, arg, sizeof(me4000_cnt_config_t));</div><div class='add'>+	if (err) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "ME4000:me4000_cnt_config():Can't copy from user space\n");</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check counter parameter */</div><div class='add'>+	switch (cmd.counter) {</div><div class='add'>+	case ME4000_CNT_COUNTER_0:</div><div class='add'>+		counter = ME4000_CNT_CTRL_BIT_COUNTER_0;</div><div class='add'>+		break;</div><div class='add'>+	case ME4000_CNT_COUNTER_1:</div><div class='add'>+		counter = ME4000_CNT_CTRL_BIT_COUNTER_1;</div><div class='add'>+		break;</div><div class='add'>+	case ME4000_CNT_COUNTER_2:</div><div class='add'>+		counter = ME4000_CNT_CTRL_BIT_COUNTER_2;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "ME4000:me4000_cnt_config():Counter %d is not available\n",</div><div class='add'>+		       cmd.counter);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check mode parameter */</div><div class='add'>+	switch (cmd.mode) {</div><div class='add'>+	case ME4000_CNT_MODE_0:</div><div class='add'>+		mode = ME4000_CNT_CTRL_BIT_MODE_0;</div><div class='add'>+		break;</div><div class='add'>+	case ME4000_CNT_MODE_1:</div><div class='add'>+		mode = ME4000_CNT_CTRL_BIT_MODE_1;</div><div class='add'>+		break;</div><div class='add'>+	case ME4000_CNT_MODE_2:</div><div class='add'>+		mode = ME4000_CNT_CTRL_BIT_MODE_2;</div><div class='add'>+		break;</div><div class='add'>+	case ME4000_CNT_MODE_3:</div><div class='add'>+		mode = ME4000_CNT_CTRL_BIT_MODE_3;</div><div class='add'>+		break;</div><div class='add'>+	case ME4000_CNT_MODE_4:</div><div class='add'>+		mode = ME4000_CNT_CTRL_BIT_MODE_4;</div><div class='add'>+		break;</div><div class='add'>+	case ME4000_CNT_MODE_5:</div><div class='add'>+		mode = ME4000_CNT_CTRL_BIT_MODE_5;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "ME4000:me4000_cnt_config():Mode %d is not available\n",</div><div class='add'>+		       cmd.mode);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Write the control word */</div><div class='add'>+	me4000_outb((counter | mode | 0x30), cnt_context-&gt;ctrl_reg);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int me4000_cnt_read(me4000_cnt_t * arg,</div><div class='add'>+			   me4000_cnt_context_t * cnt_context)</div><div class='add'>+{</div><div class='add'>+	me4000_cnt_t cmd;</div><div class='add'>+	u8 tmp;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("me4000_cnt_read() is executed\n");</div><div class='add'>+</div><div class='add'>+	/* Copy data from user */</div><div class='add'>+	err = copy_from_user(&amp;cmd, arg, sizeof(me4000_cnt_t));</div><div class='add'>+	if (err) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "ME4000:me4000_cnt_read():Can't copy from user space\n");</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Read counter */</div><div class='add'>+	switch (cmd.counter) {</div><div class='add'>+	case ME4000_CNT_COUNTER_0:</div><div class='add'>+		tmp = me4000_inb(cnt_context-&gt;counter_0_reg);</div><div class='add'>+		cmd.value = tmp;</div><div class='add'>+		tmp = me4000_inb(cnt_context-&gt;counter_0_reg);</div><div class='add'>+		cmd.value |= ((u16) tmp) &lt;&lt; 8;</div><div class='add'>+		break;</div><div class='add'>+	case ME4000_CNT_COUNTER_1:</div><div class='add'>+		tmp = me4000_inb(cnt_context-&gt;counter_1_reg);</div><div class='add'>+		cmd.value = tmp;</div><div class='add'>+		tmp = me4000_inb(cnt_context-&gt;counter_1_reg);</div><div class='add'>+		cmd.value |= ((u16) tmp) &lt;&lt; 8;</div><div class='add'>+		break;</div><div class='add'>+	case ME4000_CNT_COUNTER_2:</div><div class='add'>+		tmp = me4000_inb(cnt_context-&gt;counter_2_reg);</div><div class='add'>+		cmd.value = tmp;</div><div class='add'>+		tmp = me4000_inb(cnt_context-&gt;counter_2_reg);</div><div class='add'>+		cmd.value |= ((u16) tmp) &lt;&lt; 8;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "ME4000:me4000_cnt_read():Counter %d is not available\n",</div><div class='add'>+		       cmd.counter);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Copy result back to user */</div><div class='add'>+	err = copy_to_user(arg, &amp;cmd, sizeof(me4000_cnt_t));</div><div class='add'>+	if (err) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "ME4000:me4000_cnt_read():Can't copy to user space\n");</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int me4000_cnt_write(me4000_cnt_t * arg,</div><div class='add'>+			    me4000_cnt_context_t * cnt_context)</div><div class='add'>+{</div><div class='add'>+	me4000_cnt_t cmd;</div><div class='add'>+	u8 tmp;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("me4000_cnt_write() is executed\n");</div><div class='add'>+</div><div class='add'>+	/* Copy data from user */</div><div class='add'>+	err = copy_from_user(&amp;cmd, arg, sizeof(me4000_cnt_t));</div><div class='add'>+	if (err) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "ME4000:me4000_cnt_write():Can't copy from user space\n");</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Write counter */</div><div class='add'>+	switch (cmd.counter) {</div><div class='add'>+	case ME4000_CNT_COUNTER_0:</div><div class='add'>+		tmp = cmd.value &amp; 0xFF;</div><div class='add'>+		me4000_outb(tmp, cnt_context-&gt;counter_0_reg);</div><div class='add'>+		tmp = (cmd.value &gt;&gt; 8) &amp; 0xFF;</div><div class='add'>+		me4000_outb(tmp, cnt_context-&gt;counter_0_reg);</div><div class='add'>+		break;</div><div class='add'>+	case ME4000_CNT_COUNTER_1:</div><div class='add'>+		tmp = cmd.value &amp; 0xFF;</div><div class='add'>+		me4000_outb(tmp, cnt_context-&gt;counter_1_reg);</div><div class='add'>+		tmp = (cmd.value &gt;&gt; 8) &amp; 0xFF;</div><div class='add'>+		me4000_outb(tmp, cnt_context-&gt;counter_1_reg);</div><div class='add'>+		break;</div><div class='add'>+	case ME4000_CNT_COUNTER_2:</div><div class='add'>+		tmp = cmd.value &amp; 0xFF;</div><div class='add'>+		me4000_outb(tmp, cnt_context-&gt;counter_2_reg);</div><div class='add'>+		tmp = (cmd.value &gt;&gt; 8) &amp; 0xFF;</div><div class='add'>+		me4000_outb(tmp, cnt_context-&gt;counter_2_reg);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "ME4000:me4000_cnt_write():Counter %d is not available\n",</div><div class='add'>+		       cmd.counter);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int me4000_cnt_reset(me4000_cnt_context_t * cnt_context)</div><div class='add'>+{</div><div class='add'>+	CALL_PDEBUG("me4000_cnt_reset() is executed\n");</div><div class='add'>+</div><div class='add'>+	/* Set the mode and value for counter 0 */</div><div class='add'>+	me4000_outb(0x30, cnt_context-&gt;ctrl_reg);</div><div class='add'>+	me4000_outb(0x00, cnt_context-&gt;counter_0_reg);</div><div class='add'>+	me4000_outb(0x00, cnt_context-&gt;counter_0_reg);</div><div class='add'>+</div><div class='add'>+	/* Set the mode and value for counter 1 */</div><div class='add'>+	me4000_outb(0x70, cnt_context-&gt;ctrl_reg);</div><div class='add'>+	me4000_outb(0x00, cnt_context-&gt;counter_1_reg);</div><div class='add'>+	me4000_outb(0x00, cnt_context-&gt;counter_1_reg);</div><div class='add'>+</div><div class='add'>+	/* Set the mode and value for counter 2 */</div><div class='add'>+	me4000_outb(0xB0, cnt_context-&gt;ctrl_reg);</div><div class='add'>+	me4000_outb(0x00, cnt_context-&gt;counter_2_reg);</div><div class='add'>+	me4000_outb(0x00, cnt_context-&gt;counter_2_reg);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*------------------------------------ External Interrupt stuff ------------------------------------*/</div><div class='add'>+</div><div class='add'>+static int me4000_ext_int_ioctl(struct inode *inode_p, struct file *file_p,</div><div class='add'>+				unsigned int service, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	me4000_ext_int_context_t *ext_int_context;</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("me4000_ext_int_ioctl() is executed\n");</div><div class='add'>+</div><div class='add'>+	ext_int_context = file_p-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	if (_IOC_TYPE(service) != ME4000_MAGIC) {</div><div class='add'>+		printk(KERN_ERR "me4000_ext_int_ioctl():Wrong magic number\n");</div><div class='add'>+		return -ENOTTY;</div><div class='add'>+	}</div><div class='add'>+	if (_IOC_NR(service) &gt; ME4000_IOCTL_MAXNR) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "me4000_ext_int_ioctl():Service number to high\n");</div><div class='add'>+		return -ENOTTY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (service) {</div><div class='add'>+	case ME4000_EXT_INT_ENABLE:</div><div class='add'>+		return me4000_ext_int_enable(ext_int_context);</div><div class='add'>+	case ME4000_EXT_INT_DISABLE:</div><div class='add'>+		return me4000_ext_int_disable(ext_int_context);</div><div class='add'>+	case ME4000_EXT_INT_COUNT:</div><div class='add'>+		return me4000_ext_int_count((unsigned long *)arg,</div><div class='add'>+					    ext_int_context);</div><div class='add'>+	default:</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "ME4000:me4000_ext_int_ioctl():Invalid service number %d\n",</div><div class='add'>+		       service);</div><div class='add'>+		return -ENOTTY;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int me4000_ext_int_enable(me4000_ext_int_context_t * ext_int_context)</div><div class='add'>+{</div><div class='add'>+	unsigned long tmp;</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("me4000_ext_int_enable() is executed\n");</div><div class='add'>+</div><div class='add'>+	tmp = me4000_inl(ext_int_context-&gt;ctrl_reg);</div><div class='add'>+	tmp |= ME4000_AI_CTRL_BIT_EX_IRQ;</div><div class='add'>+	me4000_outl(tmp, ext_int_context-&gt;ctrl_reg);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int me4000_ext_int_disable(me4000_ext_int_context_t * ext_int_context)</div><div class='add'>+{</div><div class='add'>+	unsigned long tmp;</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("me4000_ext_int_disable() is executed\n");</div><div class='add'>+</div><div class='add'>+	tmp = me4000_inl(ext_int_context-&gt;ctrl_reg);</div><div class='add'>+	tmp &amp;= ~ME4000_AI_CTRL_BIT_EX_IRQ;</div><div class='add'>+	me4000_outl(tmp, ext_int_context-&gt;ctrl_reg);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int me4000_ext_int_count(unsigned long *arg,</div><div class='add'>+				me4000_ext_int_context_t * ext_int_context)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("me4000_ext_int_count() is executed\n");</div><div class='add'>+</div><div class='add'>+	put_user(ext_int_context-&gt;int_count, arg);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*------------------------------------ General stuff ------------------------------------*/</div><div class='add'>+</div><div class='add'>+static int me4000_get_user_info(me4000_user_info_t * arg,</div><div class='add'>+				me4000_info_t * board_info)</div><div class='add'>+{</div><div class='add'>+	me4000_user_info_t user_info;</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("me4000_get_user_info() is executed\n");</div><div class='add'>+</div><div class='add'>+	user_info.board_count = board_info-&gt;board_count;</div><div class='add'>+	user_info.plx_regbase = board_info-&gt;plx_regbase;</div><div class='add'>+	user_info.plx_regbase_size = board_info-&gt;plx_regbase_size;</div><div class='add'>+	user_info.me4000_regbase = board_info-&gt;me4000_regbase;</div><div class='add'>+	user_info.me4000_regbase_size = board_info-&gt;me4000_regbase_size;</div><div class='add'>+	user_info.serial_no = board_info-&gt;serial_no;</div><div class='add'>+	user_info.hw_revision = board_info-&gt;hw_revision;</div><div class='add'>+	user_info.vendor_id = board_info-&gt;vendor_id;</div><div class='add'>+	user_info.device_id = board_info-&gt;device_id;</div><div class='add'>+	user_info.pci_bus_no = board_info-&gt;pci_bus_no;</div><div class='add'>+	user_info.pci_dev_no = board_info-&gt;pci_dev_no;</div><div class='add'>+	user_info.pci_func_no = board_info-&gt;pci_func_no;</div><div class='add'>+	user_info.irq = board_info-&gt;irq;</div><div class='add'>+	user_info.irq_count = board_info-&gt;irq_count;</div><div class='add'>+	user_info.driver_version = ME4000_DRIVER_VERSION;</div><div class='add'>+	user_info.ao_count = board_info-&gt;board_p-&gt;ao.count;</div><div class='add'>+	user_info.ao_fifo_count = board_info-&gt;board_p-&gt;ao.fifo_count;</div><div class='add'>+</div><div class='add'>+	user_info.ai_count = board_info-&gt;board_p-&gt;ai.count;</div><div class='add'>+	user_info.ai_sh_count = board_info-&gt;board_p-&gt;ai.sh_count;</div><div class='add'>+	user_info.ai_ex_trig_analog = board_info-&gt;board_p-&gt;ai.ex_trig_analog;</div><div class='add'>+</div><div class='add'>+	user_info.dio_count = board_info-&gt;board_p-&gt;dio.count;</div><div class='add'>+</div><div class='add'>+	user_info.cnt_count = board_info-&gt;board_p-&gt;cnt.count;</div><div class='add'>+</div><div class='add'>+	if (copy_to_user(arg, &amp;user_info, sizeof(me4000_user_info_t)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*------------------------------------ ISR STUFF ------------------------------------*/</div><div class='add'>+</div><div class='add'>+static int me4000_ext_int_fasync(int fd, struct file *file_ptr, int mode)</div><div class='add'>+{</div><div class='add'>+	int result = 0;</div><div class='add'>+	me4000_ext_int_context_t *ext_int_context;</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("me4000_ext_int_fasync() is executed\n");</div><div class='add'>+</div><div class='add'>+	ext_int_context = file_ptr-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	result =</div><div class='add'>+	    fasync_helper(fd, file_ptr, mode, &amp;ext_int_context-&gt;fasync_ptr);</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("me4000_ext_int_fasync() is leaved\n");</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t me4000_ao_isr(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	u32 tmp;</div><div class='add'>+	u32 value;</div><div class='add'>+	me4000_ao_context_t *ao_context;</div><div class='add'>+	int i;</div><div class='add'>+	int c = 0;</div><div class='add'>+	int c1 = 0;</div><div class='add'>+	//unsigned long before;</div><div class='add'>+	//unsigned long after;</div><div class='add'>+</div><div class='add'>+	ISR_PDEBUG("me4000_ao_isr() is executed\n");</div><div class='add'>+</div><div class='add'>+	ao_context = dev_id;</div><div class='add'>+</div><div class='add'>+	/* Check if irq number is right */</div><div class='add'>+	if (irq != ao_context-&gt;irq) {</div><div class='add'>+		ISR_PDEBUG("me4000_ao_isr():incorrect interrupt num: %d\n",</div><div class='add'>+			   irq);</div><div class='add'>+		return IRQ_NONE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check if this DAC rised an interrupt */</div><div class='add'>+	if (!</div><div class='add'>+	    ((0x1 &lt;&lt; (ao_context-&gt;index + 3)) &amp;</div><div class='add'>+	     me4000_inl(ao_context-&gt;irq_status_reg))) {</div><div class='add'>+		ISR_PDEBUG("me4000_ao_isr():Not this DAC\n");</div><div class='add'>+		return IRQ_NONE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Read status register to find out what happened */</div><div class='add'>+	tmp = me4000_inl(ao_context-&gt;status_reg);</div><div class='add'>+</div><div class='add'>+	if (!(tmp &amp; ME4000_AO_STATUS_BIT_EF) &amp;&amp; (tmp &amp; ME4000_AO_STATUS_BIT_HF)</div><div class='add'>+	    &amp;&amp; (tmp &amp; ME4000_AO_STATUS_BIT_HF)) {</div><div class='add'>+		c = ME4000_AO_FIFO_COUNT;</div><div class='add'>+		ISR_PDEBUG("me4000_ao_isr():Fifo empty\n");</div><div class='add'>+	} else if ((tmp &amp; ME4000_AO_STATUS_BIT_EF)</div><div class='add'>+		   &amp;&amp; (tmp &amp; ME4000_AO_STATUS_BIT_HF)</div><div class='add'>+		   &amp;&amp; (tmp &amp; ME4000_AO_STATUS_BIT_HF)) {</div><div class='add'>+		c = ME4000_AO_FIFO_COUNT / 2;</div><div class='add'>+		ISR_PDEBUG("me4000_ao_isr():Fifo under half full\n");</div><div class='add'>+	} else {</div><div class='add'>+		c = 0;</div><div class='add'>+		ISR_PDEBUG("me4000_ao_isr():Fifo full\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ISR_PDEBUG("me4000_ao_isr():Try to write 0x%04X values\n", c);</div><div class='add'>+</div><div class='add'>+	while (1) {</div><div class='add'>+		c1 = me4000_values_to_end(ao_context-&gt;circ_buf,</div><div class='add'>+					  ME4000_AO_BUFFER_COUNT);</div><div class='add'>+		ISR_PDEBUG("me4000_ao_isr():Values to end = %d\n", c1);</div><div class='add'>+		if (c1 &gt; c)</div><div class='add'>+			c1 = c;</div><div class='add'>+</div><div class='add'>+		if (c1 &lt;= 0) {</div><div class='add'>+			ISR_PDEBUG</div><div class='add'>+			    ("me4000_ao_isr():Work done or buffer empty\n");</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		//rdtscl(before);</div><div class='add'>+		if (((ao_context-&gt;fifo_reg &amp; 0xFF) == ME4000_AO_01_FIFO_REG) ||</div><div class='add'>+		    ((ao_context-&gt;fifo_reg &amp; 0xFF) == ME4000_AO_03_FIFO_REG)) {</div><div class='add'>+			for (i = 0; i &lt; c1; i++) {</div><div class='add'>+				value =</div><div class='add'>+				    ((u32)</div><div class='add'>+				     (*</div><div class='add'>+				      (ao_context-&gt;circ_buf.buf +</div><div class='add'>+				       ao_context-&gt;circ_buf.tail + i))) &lt;&lt; 16;</div><div class='add'>+				outl(value, ao_context-&gt;fifo_reg);</div><div class='add'>+			}</div><div class='add'>+		} else</div><div class='add'>+			outsw(ao_context-&gt;fifo_reg,</div><div class='add'>+			      ao_context-&gt;circ_buf.buf +</div><div class='add'>+			      ao_context-&gt;circ_buf.tail, c1);</div><div class='add'>+</div><div class='add'>+		//rdtscl(after);</div><div class='add'>+		//printk(KERN_ERR"ME4000:me4000_ao_isr():Time lapse = %lu\n", after - before);</div><div class='add'>+</div><div class='add'>+		ao_context-&gt;circ_buf.tail =</div><div class='add'>+		    (ao_context-&gt;circ_buf.tail + c1) &amp; (ME4000_AO_BUFFER_COUNT -</div><div class='add'>+							1);</div><div class='add'>+		ISR_PDEBUG("me4000_ao_isr():%d values wrote to port 0x%04X\n",</div><div class='add'>+			   c1, ao_context-&gt;fifo_reg);</div><div class='add'>+		c -= c1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If there are no values left in the buffer, disable interrupts */</div><div class='add'>+	spin_lock(&amp;ao_context-&gt;int_lock);</div><div class='add'>+	if (!me4000_buf_count(ao_context-&gt;circ_buf, ME4000_AO_BUFFER_COUNT)) {</div><div class='add'>+		ISR_PDEBUG</div><div class='add'>+		    ("me4000_ao_isr():Disable Interrupt because no values left in buffer\n");</div><div class='add'>+		tmp = me4000_inl(ao_context-&gt;ctrl_reg);</div><div class='add'>+		tmp &amp;= ~ME4000_AO_CTRL_BIT_ENABLE_IRQ;</div><div class='add'>+		me4000_outl(tmp, ao_context-&gt;ctrl_reg);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;ao_context-&gt;int_lock);</div><div class='add'>+</div><div class='add'>+	/* Reset the interrupt */</div><div class='add'>+	spin_lock(&amp;ao_context-&gt;int_lock);</div><div class='add'>+	tmp = me4000_inl(ao_context-&gt;ctrl_reg);</div><div class='add'>+	tmp |= ME4000_AO_CTRL_BIT_RESET_IRQ;</div><div class='add'>+	me4000_outl(tmp, ao_context-&gt;ctrl_reg);</div><div class='add'>+	tmp &amp;= ~ME4000_AO_CTRL_BIT_RESET_IRQ;</div><div class='add'>+	me4000_outl(tmp, ao_context-&gt;ctrl_reg);</div><div class='add'>+</div><div class='add'>+	/* If state machine is stopped, flow was interrupted */</div><div class='add'>+	if (!(me4000_inl(ao_context-&gt;status_reg) &amp; ME4000_AO_STATUS_BIT_FSM)) {</div><div class='add'>+		printk(KERN_ERR "ME4000:me4000_ao_isr():Broken pipe\n");</div><div class='add'>+		ao_context-&gt;pipe_flag = 1;	// Set flag in order to inform write routine</div><div class='add'>+		tmp &amp;= ~ME4000_AO_CTRL_BIT_ENABLE_IRQ;	// Disable interrupt</div><div class='add'>+	}</div><div class='add'>+	me4000_outl(tmp, ao_context-&gt;ctrl_reg);</div><div class='add'>+	spin_unlock(&amp;ao_context-&gt;int_lock);</div><div class='add'>+</div><div class='add'>+	/* Wake up waiting process */</div><div class='add'>+	wake_up_interruptible(&amp;(ao_context-&gt;wait_queue));</div><div class='add'>+</div><div class='add'>+	/* Count the interrupt */</div><div class='add'>+	ao_context-&gt;board_info-&gt;irq_count++;</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t me4000_ai_isr(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	u32 tmp;</div><div class='add'>+	me4000_ai_context_t *ai_context;</div><div class='add'>+	int i;</div><div class='add'>+	int c = 0;</div><div class='add'>+	int c1 = 0;</div><div class='add'>+#ifdef ME4000_ISR_DEBUG</div><div class='add'>+	unsigned long before;</div><div class='add'>+	unsigned long after;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	ISR_PDEBUG("me4000_ai_isr() is executed\n");</div><div class='add'>+</div><div class='add'>+#ifdef ME4000_ISR_DEBUG</div><div class='add'>+	rdtscl(before);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	ai_context = dev_id;</div><div class='add'>+</div><div class='add'>+	/* Check if irq number is right */</div><div class='add'>+	if (irq != ai_context-&gt;irq) {</div><div class='add'>+		ISR_PDEBUG("me4000_ai_isr():incorrect interrupt num: %d\n",</div><div class='add'>+			   irq);</div><div class='add'>+		return IRQ_NONE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (me4000_inl(ai_context-&gt;irq_status_reg) &amp;</div><div class='add'>+	    ME4000_IRQ_STATUS_BIT_AI_HF) {</div><div class='add'>+		ISR_PDEBUG</div><div class='add'>+		    ("me4000_ai_isr():Fifo half full interrupt occured\n");</div><div class='add'>+</div><div class='add'>+		/* Read status register to find out what happened */</div><div class='add'>+		tmp = me4000_inl(ai_context-&gt;ctrl_reg);</div><div class='add'>+</div><div class='add'>+		if (!(tmp &amp; ME4000_AI_STATUS_BIT_FF_DATA) &amp;&amp;</div><div class='add'>+		    !(tmp &amp; ME4000_AI_STATUS_BIT_HF_DATA)</div><div class='add'>+		    &amp;&amp; (tmp &amp; ME4000_AI_STATUS_BIT_EF_DATA)) {</div><div class='add'>+			ISR_PDEBUG("me4000_ai_isr():Fifo full\n");</div><div class='add'>+			c = ME4000_AI_FIFO_COUNT;</div><div class='add'>+</div><div class='add'>+			/* FIFO overflow, so stop conversion and disable all interrupts */</div><div class='add'>+			spin_lock(&amp;ai_context-&gt;int_lock);</div><div class='add'>+			tmp = me4000_inl(ai_context-&gt;ctrl_reg);</div><div class='add'>+			tmp |= ME4000_AI_CTRL_BIT_IMMEDIATE_STOP;</div><div class='add'>+			tmp &amp;=</div><div class='add'>+			    ~(ME4000_AI_CTRL_BIT_HF_IRQ |</div><div class='add'>+			      ME4000_AI_CTRL_BIT_SC_IRQ);</div><div class='add'>+			outl(tmp, ai_context-&gt;ctrl_reg);</div><div class='add'>+			spin_unlock(&amp;ai_context-&gt;int_lock);</div><div class='add'>+		} else if ((tmp &amp; ME4000_AI_STATUS_BIT_FF_DATA) &amp;&amp;</div><div class='add'>+			   !(tmp &amp; ME4000_AI_STATUS_BIT_HF_DATA)</div><div class='add'>+			   &amp;&amp; (tmp &amp; ME4000_AI_STATUS_BIT_EF_DATA)) {</div><div class='add'>+			ISR_PDEBUG("me4000_ai_isr():Fifo half full\n");</div><div class='add'>+			c = ME4000_AI_FIFO_COUNT / 2;</div><div class='add'>+		} else {</div><div class='add'>+			c = 0;</div><div class='add'>+			ISR_PDEBUG</div><div class='add'>+			    ("me4000_ai_isr():Can't determine state of fifo\n");</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ISR_PDEBUG("me4000_ai_isr():Try to read %d values\n", c);</div><div class='add'>+</div><div class='add'>+		while (1) {</div><div class='add'>+			c1 = me4000_space_to_end(ai_context-&gt;circ_buf,</div><div class='add'>+						 ME4000_AI_BUFFER_COUNT);</div><div class='add'>+			ISR_PDEBUG("me4000_ai_isr():Space to end = %d\n", c1);</div><div class='add'>+			if (c1 &gt; c)</div><div class='add'>+				c1 = c;</div><div class='add'>+</div><div class='add'>+			if (c1 &lt;= 0) {</div><div class='add'>+				ISR_PDEBUG</div><div class='add'>+				    ("me4000_ai_isr():Work done or buffer full\n");</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			insw(ai_context-&gt;data_reg,</div><div class='add'>+			     ai_context-&gt;circ_buf.buf +</div><div class='add'>+			     ai_context-&gt;circ_buf.head, c1);</div><div class='add'>+			ai_context-&gt;circ_buf.head =</div><div class='add'>+			    (ai_context-&gt;circ_buf.head +</div><div class='add'>+			     c1) &amp; (ME4000_AI_BUFFER_COUNT - 1);</div><div class='add'>+			c -= c1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Work is done, so reset the interrupt */</div><div class='add'>+		ISR_PDEBUG</div><div class='add'>+		    ("me4000_ai_isr():reset interrupt fifo half full interrupt\n");</div><div class='add'>+		spin_lock(&amp;ai_context-&gt;int_lock);</div><div class='add'>+		tmp = me4000_inl(ai_context-&gt;ctrl_reg);</div><div class='add'>+		tmp |= ME4000_AI_CTRL_BIT_HF_IRQ_RESET;</div><div class='add'>+		me4000_outl(tmp, ai_context-&gt;ctrl_reg);</div><div class='add'>+		tmp &amp;= ~ME4000_AI_CTRL_BIT_HF_IRQ_RESET;</div><div class='add'>+		me4000_outl(tmp, ai_context-&gt;ctrl_reg);</div><div class='add'>+		spin_unlock(&amp;ai_context-&gt;int_lock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (me4000_inl(ai_context-&gt;irq_status_reg) &amp; ME4000_IRQ_STATUS_BIT_SC) {</div><div class='add'>+		ISR_PDEBUG</div><div class='add'>+		    ("me4000_ai_isr():Sample counter interrupt occured\n");</div><div class='add'>+</div><div class='add'>+		if (!ai_context-&gt;sample_counter_reload) {</div><div class='add'>+			ISR_PDEBUG</div><div class='add'>+			    ("me4000_ai_isr():Single data block available\n");</div><div class='add'>+</div><div class='add'>+			/* Poll data until fifo empty */</div><div class='add'>+			for (i = 0;</div><div class='add'>+			     (i &lt; ME4000_AI_FIFO_COUNT / 2)</div><div class='add'>+			     &amp;&amp; (inl(ai_context-&gt;ctrl_reg) &amp;</div><div class='add'>+				 ME4000_AI_STATUS_BIT_EF_DATA); i++) {</div><div class='add'>+				if (me4000_space_to_end</div><div class='add'>+				    (ai_context-&gt;circ_buf,</div><div class='add'>+				     ME4000_AI_BUFFER_COUNT)) {</div><div class='add'>+					*(ai_context-&gt;circ_buf.buf +</div><div class='add'>+					  ai_context-&gt;circ_buf.head) =</div><div class='add'>+		 inw(ai_context-&gt;data_reg);</div><div class='add'>+					ai_context-&gt;circ_buf.head =</div><div class='add'>+					    (ai_context-&gt;circ_buf.head +</div><div class='add'>+					     1) &amp; (ME4000_AI_BUFFER_COUNT - 1);</div><div class='add'>+				} else</div><div class='add'>+					break;</div><div class='add'>+			}</div><div class='add'>+			ISR_PDEBUG("me4000_ai_isr():%d values read\n", i);</div><div class='add'>+		} else {</div><div class='add'>+			if (ai_context-&gt;sample_counter &lt;=</div><div class='add'>+			    ME4000_AI_FIFO_COUNT / 2) {</div><div class='add'>+				ISR_PDEBUG</div><div class='add'>+				    ("me4000_ai_isr():Interrupt from adjustable half full threshold\n");</div><div class='add'>+</div><div class='add'>+				/* Read status register to find out what happened */</div><div class='add'>+				tmp = me4000_inl(ai_context-&gt;ctrl_reg);</div><div class='add'>+</div><div class='add'>+				if (!(tmp &amp; ME4000_AI_STATUS_BIT_FF_DATA) &amp;&amp;</div><div class='add'>+				    !(tmp &amp; ME4000_AI_STATUS_BIT_HF_DATA)</div><div class='add'>+				    &amp;&amp; (tmp &amp; ME4000_AI_STATUS_BIT_EF_DATA)) {</div><div class='add'>+					ISR_PDEBUG</div><div class='add'>+					    ("me4000_ai_isr():Fifo full\n");</div><div class='add'>+					c = ME4000_AI_FIFO_COUNT;</div><div class='add'>+</div><div class='add'>+					/* FIFO overflow, so stop conversion */</div><div class='add'>+					spin_lock(&amp;ai_context-&gt;int_lock);</div><div class='add'>+					tmp = me4000_inl(ai_context-&gt;ctrl_reg);</div><div class='add'>+					tmp |=</div><div class='add'>+					    ME4000_AI_CTRL_BIT_IMMEDIATE_STOP;</div><div class='add'>+					outl(tmp, ai_context-&gt;ctrl_reg);</div><div class='add'>+					spin_unlock(&amp;ai_context-&gt;int_lock);</div><div class='add'>+				} else if ((tmp &amp; ME4000_AI_STATUS_BIT_FF_DATA)</div><div class='add'>+					   &amp;&amp; !(tmp &amp;</div><div class='add'>+						ME4000_AI_STATUS_BIT_HF_DATA)</div><div class='add'>+					   &amp;&amp; (tmp &amp;</div><div class='add'>+					       ME4000_AI_STATUS_BIT_EF_DATA)) {</div><div class='add'>+					ISR_PDEBUG</div><div class='add'>+					    ("me4000_ai_isr():Fifo half full\n");</div><div class='add'>+					c = ME4000_AI_FIFO_COUNT / 2;</div><div class='add'>+				} else {</div><div class='add'>+					c = ai_context-&gt;sample_counter;</div><div class='add'>+					ISR_PDEBUG</div><div class='add'>+					    ("me4000_ai_isr():Sample count values\n");</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+				ISR_PDEBUG</div><div class='add'>+				    ("me4000_ai_isr():Try to read %d values\n",</div><div class='add'>+				     c);</div><div class='add'>+</div><div class='add'>+				while (1) {</div><div class='add'>+					c1 = me4000_space_to_end(ai_context-&gt;</div><div class='add'>+								 circ_buf,</div><div class='add'>+								 ME4000_AI_BUFFER_COUNT);</div><div class='add'>+					ISR_PDEBUG</div><div class='add'>+					    ("me4000_ai_isr():Space to end = %d\n",</div><div class='add'>+					     c1);</div><div class='add'>+					if (c1 &gt; c)</div><div class='add'>+						c1 = c;</div><div class='add'>+</div><div class='add'>+					if (c1 &lt;= 0) {</div><div class='add'>+						ISR_PDEBUG</div><div class='add'>+						    ("me4000_ai_isr():Work done or buffer full\n");</div><div class='add'>+						break;</div><div class='add'>+					}</div><div class='add'>+</div><div class='add'>+					insw(ai_context-&gt;data_reg,</div><div class='add'>+					     ai_context-&gt;circ_buf.buf +</div><div class='add'>+					     ai_context-&gt;circ_buf.head, c1);</div><div class='add'>+					ai_context-&gt;circ_buf.head =</div><div class='add'>+					    (ai_context-&gt;circ_buf.head +</div><div class='add'>+					     c1) &amp; (ME4000_AI_BUFFER_COUNT - 1);</div><div class='add'>+					c -= c1;</div><div class='add'>+				}</div><div class='add'>+			} else {</div><div class='add'>+				ISR_PDEBUG</div><div class='add'>+				    ("me4000_ai_isr():Multiple data block available\n");</div><div class='add'>+</div><div class='add'>+				/* Read status register to find out what happened */</div><div class='add'>+				tmp = me4000_inl(ai_context-&gt;ctrl_reg);</div><div class='add'>+</div><div class='add'>+				if (!(tmp &amp; ME4000_AI_STATUS_BIT_FF_DATA) &amp;&amp;</div><div class='add'>+				    !(tmp &amp; ME4000_AI_STATUS_BIT_HF_DATA)</div><div class='add'>+				    &amp;&amp; (tmp &amp; ME4000_AI_STATUS_BIT_EF_DATA)) {</div><div class='add'>+					ISR_PDEBUG</div><div class='add'>+					    ("me4000_ai_isr():Fifo full\n");</div><div class='add'>+					c = ME4000_AI_FIFO_COUNT;</div><div class='add'>+</div><div class='add'>+					/* FIFO overflow, so stop conversion */</div><div class='add'>+					spin_lock(&amp;ai_context-&gt;int_lock);</div><div class='add'>+					tmp = me4000_inl(ai_context-&gt;ctrl_reg);</div><div class='add'>+					tmp |=</div><div class='add'>+					    ME4000_AI_CTRL_BIT_IMMEDIATE_STOP;</div><div class='add'>+					outl(tmp, ai_context-&gt;ctrl_reg);</div><div class='add'>+					spin_unlock(&amp;ai_context-&gt;int_lock);</div><div class='add'>+</div><div class='add'>+					while (1) {</div><div class='add'>+						c1 = me4000_space_to_end</div><div class='add'>+						    (ai_context-&gt;circ_buf,</div><div class='add'>+						     ME4000_AI_BUFFER_COUNT);</div><div class='add'>+						ISR_PDEBUG</div><div class='add'>+						    ("me4000_ai_isr():Space to end = %d\n",</div><div class='add'>+						     c1);</div><div class='add'>+						if (c1 &gt; c)</div><div class='add'>+							c1 = c;</div><div class='add'>+</div><div class='add'>+						if (c1 &lt;= 0) {</div><div class='add'>+							ISR_PDEBUG</div><div class='add'>+							    ("me4000_ai_isr():Work done or buffer full\n");</div><div class='add'>+							break;</div><div class='add'>+						}</div><div class='add'>+</div><div class='add'>+						insw(ai_context-&gt;data_reg,</div><div class='add'>+						     ai_context-&gt;circ_buf.buf +</div><div class='add'>+						     ai_context-&gt;circ_buf.head,</div><div class='add'>+						     c1);</div><div class='add'>+						ai_context-&gt;circ_buf.head =</div><div class='add'>+						    (ai_context-&gt;circ_buf.head +</div><div class='add'>+						     c1) &amp;</div><div class='add'>+						    (ME4000_AI_BUFFER_COUNT -</div><div class='add'>+						     1);</div><div class='add'>+						c -= c1;</div><div class='add'>+					}</div><div class='add'>+				} else if ((tmp &amp; ME4000_AI_STATUS_BIT_FF_DATA)</div><div class='add'>+					   &amp;&amp; !(tmp &amp;</div><div class='add'>+						ME4000_AI_STATUS_BIT_HF_DATA)</div><div class='add'>+					   &amp;&amp; (tmp &amp;</div><div class='add'>+					       ME4000_AI_STATUS_BIT_EF_DATA)) {</div><div class='add'>+					ISR_PDEBUG</div><div class='add'>+					    ("me4000_ai_isr():Fifo half full\n");</div><div class='add'>+					c = ME4000_AI_FIFO_COUNT / 2;</div><div class='add'>+</div><div class='add'>+					while (1) {</div><div class='add'>+						c1 = me4000_space_to_end</div><div class='add'>+						    (ai_context-&gt;circ_buf,</div><div class='add'>+						     ME4000_AI_BUFFER_COUNT);</div><div class='add'>+						ISR_PDEBUG</div><div class='add'>+						    ("me4000_ai_isr():Space to end = %d\n",</div><div class='add'>+						     c1);</div><div class='add'>+						if (c1 &gt; c)</div><div class='add'>+							c1 = c;</div><div class='add'>+</div><div class='add'>+						if (c1 &lt;= 0) {</div><div class='add'>+							ISR_PDEBUG</div><div class='add'>+							    ("me4000_ai_isr():Work done or buffer full\n");</div><div class='add'>+							break;</div><div class='add'>+						}</div><div class='add'>+</div><div class='add'>+						insw(ai_context-&gt;data_reg,</div><div class='add'>+						     ai_context-&gt;circ_buf.buf +</div><div class='add'>+						     ai_context-&gt;circ_buf.head,</div><div class='add'>+						     c1);</div><div class='add'>+						ai_context-&gt;circ_buf.head =</div><div class='add'>+						    (ai_context-&gt;circ_buf.head +</div><div class='add'>+						     c1) &amp;</div><div class='add'>+						    (ME4000_AI_BUFFER_COUNT -</div><div class='add'>+						     1);</div><div class='add'>+						c -= c1;</div><div class='add'>+					}</div><div class='add'>+				} else {</div><div class='add'>+					/* Poll data until fifo empty */</div><div class='add'>+					for (i = 0;</div><div class='add'>+					     (i &lt; ME4000_AI_FIFO_COUNT / 2)</div><div class='add'>+					     &amp;&amp; (inl(ai_context-&gt;ctrl_reg) &amp;</div><div class='add'>+						 ME4000_AI_STATUS_BIT_EF_DATA);</div><div class='add'>+					     i++) {</div><div class='add'>+						if (me4000_space_to_end</div><div class='add'>+						    (ai_context-&gt;circ_buf,</div><div class='add'>+						     ME4000_AI_BUFFER_COUNT)) {</div><div class='add'>+							*(ai_context-&gt;circ_buf.</div><div class='add'>+							  buf +</div><div class='add'>+							  ai_context-&gt;circ_buf.</div><div class='add'>+							  head) =</div><div class='add'>+				       inw(ai_context-&gt;data_reg);</div><div class='add'>+							ai_context-&gt;circ_buf.</div><div class='add'>+							    head =</div><div class='add'>+							    (ai_context-&gt;</div><div class='add'>+							     circ_buf.head +</div><div class='add'>+							     1) &amp;</div><div class='add'>+							    (ME4000_AI_BUFFER_COUNT</div><div class='add'>+							     - 1);</div><div class='add'>+						} else</div><div class='add'>+							break;</div><div class='add'>+					}</div><div class='add'>+					ISR_PDEBUG</div><div class='add'>+					    ("me4000_ai_isr():%d values read\n",</div><div class='add'>+					     i);</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Work is done, so reset the interrupt */</div><div class='add'>+		ISR_PDEBUG</div><div class='add'>+		    ("me4000_ai_isr():reset interrupt from sample counter\n");</div><div class='add'>+		spin_lock(&amp;ai_context-&gt;int_lock);</div><div class='add'>+		tmp = me4000_inl(ai_context-&gt;ctrl_reg);</div><div class='add'>+		tmp |= ME4000_AI_CTRL_BIT_SC_IRQ_RESET;</div><div class='add'>+		me4000_outl(tmp, ai_context-&gt;ctrl_reg);</div><div class='add'>+		tmp &amp;= ~ME4000_AI_CTRL_BIT_SC_IRQ_RESET;</div><div class='add'>+		me4000_outl(tmp, ai_context-&gt;ctrl_reg);</div><div class='add'>+		spin_unlock(&amp;ai_context-&gt;int_lock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Values are now available, so wake up waiting process */</div><div class='add'>+	if (me4000_buf_count(ai_context-&gt;circ_buf, ME4000_AI_BUFFER_COUNT)) {</div><div class='add'>+		ISR_PDEBUG("me4000_ai_isr():Wake up waiting process\n");</div><div class='add'>+		wake_up_interruptible(&amp;(ai_context-&gt;wait_queue));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If there is no space left in the buffer, disable interrupts */</div><div class='add'>+	spin_lock(&amp;ai_context-&gt;int_lock);</div><div class='add'>+	if (!me4000_buf_space(ai_context-&gt;circ_buf, ME4000_AI_BUFFER_COUNT)) {</div><div class='add'>+		ISR_PDEBUG</div><div class='add'>+		    ("me4000_ai_isr():Disable Interrupt because no space left in buffer\n");</div><div class='add'>+		tmp = me4000_inl(ai_context-&gt;ctrl_reg);</div><div class='add'>+		tmp &amp;=</div><div class='add'>+		    ~(ME4000_AI_CTRL_BIT_SC_IRQ | ME4000_AI_CTRL_BIT_HF_IRQ |</div><div class='add'>+		      ME4000_AI_CTRL_BIT_LE_IRQ);</div><div class='add'>+		me4000_outl(tmp, ai_context-&gt;ctrl_reg);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;ai_context-&gt;int_lock);</div><div class='add'>+</div><div class='add'>+#ifdef ME4000_ISR_DEBUG</div><div class='add'>+	rdtscl(after);</div><div class='add'>+	printk(KERN_ERR "ME4000:me4000_ai_isr():Time lapse = %lu\n",</div><div class='add'>+	       after - before);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t me4000_ext_int_isr(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	me4000_ext_int_context_t *ext_int_context;</div><div class='add'>+	unsigned long tmp;</div><div class='add'>+</div><div class='add'>+	ISR_PDEBUG("me4000_ext_int_isr() is executed\n");</div><div class='add'>+</div><div class='add'>+	ext_int_context = dev_id;</div><div class='add'>+</div><div class='add'>+	/* Check if irq number is right */</div><div class='add'>+	if (irq != ext_int_context-&gt;irq) {</div><div class='add'>+		ISR_PDEBUG("me4000_ext_int_isr():incorrect interrupt num: %d\n",</div><div class='add'>+			   irq);</div><div class='add'>+		return IRQ_NONE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (me4000_inl(ext_int_context-&gt;irq_status_reg) &amp;</div><div class='add'>+	    ME4000_IRQ_STATUS_BIT_EX) {</div><div class='add'>+		ISR_PDEBUG("me4000_ext_int_isr():External interrupt occured\n");</div><div class='add'>+		tmp = me4000_inl(ext_int_context-&gt;ctrl_reg);</div><div class='add'>+		tmp |= ME4000_AI_CTRL_BIT_EX_IRQ_RESET;</div><div class='add'>+		me4000_outl(tmp, ext_int_context-&gt;ctrl_reg);</div><div class='add'>+		tmp &amp;= ~ME4000_AI_CTRL_BIT_EX_IRQ_RESET;</div><div class='add'>+		me4000_outl(tmp, ext_int_context-&gt;ctrl_reg);</div><div class='add'>+</div><div class='add'>+		ext_int_context-&gt;int_count++;</div><div class='add'>+</div><div class='add'>+		if (ext_int_context-&gt;fasync_ptr) {</div><div class='add'>+			ISR_PDEBUG</div><div class='add'>+			    ("me2600_ext_int_isr():Send signal to process\n");</div><div class='add'>+			kill_fasync(&amp;ext_int_context-&gt;fasync_ptr, SIGIO,</div><div class='add'>+				    POLL_IN);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __exit me4000_module_exit(void)</div><div class='add'>+{</div><div class='add'>+	struct list_head *board_p;</div><div class='add'>+	me4000_info_t *board_info;</div><div class='add'>+</div><div class='add'>+	CALL_PDEBUG("cleanup_module() is executed\n");</div><div class='add'>+</div><div class='add'>+	unregister_chrdev(me4000_ext_int_major_driver_no, ME4000_EXT_INT_NAME);</div><div class='add'>+</div><div class='add'>+	unregister_chrdev(me4000_cnt_major_driver_no, ME4000_CNT_NAME);</div><div class='add'>+</div><div class='add'>+	unregister_chrdev(me4000_dio_major_driver_no, ME4000_DIO_NAME);</div><div class='add'>+</div><div class='add'>+	unregister_chrdev(me4000_ai_major_driver_no, ME4000_AI_NAME);</div><div class='add'>+</div><div class='add'>+	unregister_chrdev(me4000_ao_major_driver_no, ME4000_AO_NAME);</div><div class='add'>+</div><div class='add'>+	remove_proc_entry("me4000", NULL);</div><div class='add'>+</div><div class='add'>+	pci_unregister_driver(&amp;me4000_driver);</div><div class='add'>+</div><div class='add'>+	/* Reset the boards */</div><div class='add'>+	for (board_p = me4000_board_info_list.next;</div><div class='add'>+	     board_p != &amp;me4000_board_info_list; board_p = board_p-&gt;next) {</div><div class='add'>+		board_info = list_entry(board_p, me4000_info_t, list);</div><div class='add'>+		me4000_reset_board(board_info);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	clear_board_info_list();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_exit(me4000_module_exit);</div><div class='add'>+</div><div class='add'>+static int me4000_read_procmem(char *buf, char **start, off_t offset, int count,</div><div class='add'>+			       int *eof, void *data)</div><div class='add'>+{</div><div class='add'>+	int len = 0;</div><div class='add'>+	int limit = count - 1000;</div><div class='add'>+	me4000_info_t *board_info;</div><div class='add'>+	struct list_head *ptr;</div><div class='add'>+</div><div class='add'>+	len += sprintf(buf + len, "\nME4000 DRIVER VERSION %X.%X.%X\n\n",</div><div class='add'>+		       (ME4000_DRIVER_VERSION &amp; 0xFF0000) &gt;&gt; 16,</div><div class='add'>+		       (ME4000_DRIVER_VERSION &amp; 0xFF00) &gt;&gt; 8,</div><div class='add'>+		       (ME4000_DRIVER_VERSION &amp; 0xFF));</div><div class='add'>+</div><div class='add'>+	/* Search for the board context */</div><div class='add'>+	for (ptr = me4000_board_info_list.next;</div><div class='add'>+	     (ptr != &amp;me4000_board_info_list) &amp;&amp; (len &lt; limit);</div><div class='add'>+	     ptr = ptr-&gt;next) {</div><div class='add'>+		board_info = list_entry(ptr, me4000_info_t, list);</div><div class='add'>+</div><div class='add'>+		len +=</div><div class='add'>+		    sprintf(buf + len, "Board number %d:\n",</div><div class='add'>+			    board_info-&gt;board_count);</div><div class='add'>+		len += sprintf(buf + len, "---------------\n");</div><div class='add'>+		len +=</div><div class='add'>+		    sprintf(buf + len, "PLX base register = 0x%lX\n",</div><div class='add'>+			    board_info-&gt;plx_regbase);</div><div class='add'>+		len +=</div><div class='add'>+		    sprintf(buf + len, "PLX base register size = 0x%lX\n",</div><div class='add'>+			    board_info-&gt;plx_regbase_size);</div><div class='add'>+		len +=</div><div class='add'>+		    sprintf(buf + len, "ME4000 base register = 0x%lX\n",</div><div class='add'>+			    board_info-&gt;me4000_regbase);</div><div class='add'>+		len +=</div><div class='add'>+		    sprintf(buf + len, "ME4000 base register size = 0x%lX\n",</div><div class='add'>+			    board_info-&gt;me4000_regbase_size);</div><div class='add'>+		len +=</div><div class='add'>+		    sprintf(buf + len, "Serial number = 0x%X\n",</div><div class='add'>+			    board_info-&gt;serial_no);</div><div class='add'>+		len +=</div><div class='add'>+		    sprintf(buf + len, "Hardware revision = 0x%X\n",</div><div class='add'>+			    board_info-&gt;hw_revision);</div><div class='add'>+		len +=</div><div class='add'>+		    sprintf(buf + len, "Vendor id = 0x%X\n",</div><div class='add'>+			    board_info-&gt;vendor_id);</div><div class='add'>+		len +=</div><div class='add'>+		    sprintf(buf + len, "Device id = 0x%X\n",</div><div class='add'>+			    board_info-&gt;device_id);</div><div class='add'>+		len +=</div><div class='add'>+		    sprintf(buf + len, "PCI bus number = %d\n",</div><div class='add'>+			    board_info-&gt;pci_bus_no);</div><div class='add'>+		len +=</div><div class='add'>+		    sprintf(buf + len, "PCI device number = %d\n",</div><div class='add'>+			    board_info-&gt;pci_dev_no);</div><div class='add'>+		len +=</div><div class='add'>+		    sprintf(buf + len, "PCI function number = %d\n",</div><div class='add'>+			    board_info-&gt;pci_func_no);</div><div class='add'>+		len += sprintf(buf + len, "IRQ = %u\n", board_info-&gt;irq);</div><div class='add'>+		len +=</div><div class='add'>+		    sprintf(buf + len,</div><div class='add'>+			    "Count of interrupts since module was loaded = %d\n",</div><div class='add'>+			    board_info-&gt;irq_count);</div><div class='add'>+</div><div class='add'>+		len +=</div><div class='add'>+		    sprintf(buf + len, "Count of analog outputs = %d\n",</div><div class='add'>+			    board_info-&gt;board_p-&gt;ao.count);</div><div class='add'>+		len +=</div><div class='add'>+		    sprintf(buf + len, "Count of analog output fifos = %d\n",</div><div class='add'>+			    board_info-&gt;board_p-&gt;ao.fifo_count);</div><div class='add'>+</div><div class='add'>+		len +=</div><div class='add'>+		    sprintf(buf + len, "Count of analog inputs = %d\n",</div><div class='add'>+			    board_info-&gt;board_p-&gt;ai.count);</div><div class='add'>+		len +=</div><div class='add'>+		    sprintf(buf + len,</div><div class='add'>+			    "Count of sample and hold devices for analog input = %d\n",</div><div class='add'>+			    board_info-&gt;board_p-&gt;ai.sh_count);</div><div class='add'>+		len +=</div><div class='add'>+		    sprintf(buf + len,</div><div class='add'>+			    "Analog external trigger available for analog input = %d\n",</div><div class='add'>+			    board_info-&gt;board_p-&gt;ai.ex_trig_analog);</div><div class='add'>+</div><div class='add'>+		len +=</div><div class='add'>+		    sprintf(buf + len, "Count of digital ports = %d\n",</div><div class='add'>+			    board_info-&gt;board_p-&gt;dio.count);</div><div class='add'>+</div><div class='add'>+		len +=</div><div class='add'>+		    sprintf(buf + len, "Count of counter devices = %d\n",</div><div class='add'>+			    board_info-&gt;board_p-&gt;cnt.count);</div><div class='add'>+		len +=</div><div class='add'>+		    sprintf(buf + len, "AI control register = 0x%08X\n",</div><div class='add'>+			    inl(board_info-&gt;me4000_regbase +</div><div class='add'>+				ME4000_AI_CTRL_REG));</div><div class='add'>+</div><div class='add'>+		len += sprintf(buf + len, "AO 0 control register = 0x%08X\n",</div><div class='add'>+			       inl(board_info-&gt;me4000_regbase +</div><div class='add'>+				   ME4000_AO_00_CTRL_REG));</div><div class='add'>+		len +=</div><div class='add'>+		    sprintf(buf + len, "AO 0 status register = 0x%08X\n",</div><div class='add'>+			    inl(board_info-&gt;me4000_regbase +</div><div class='add'>+				ME4000_AO_00_STATUS_REG));</div><div class='add'>+		len +=</div><div class='add'>+		    sprintf(buf + len, "AO 1 control register = 0x%08X\n",</div><div class='add'>+			    inl(board_info-&gt;me4000_regbase +</div><div class='add'>+				ME4000_AO_01_CTRL_REG));</div><div class='add'>+		len +=</div><div class='add'>+		    sprintf(buf + len, "AO 1 status register = 0x%08X\n",</div><div class='add'>+			    inl(board_info-&gt;me4000_regbase +</div><div class='add'>+				ME4000_AO_01_STATUS_REG));</div><div class='add'>+		len +=</div><div class='add'>+		    sprintf(buf + len, "AO 2 control register = 0x%08X\n",</div><div class='add'>+			    inl(board_info-&gt;me4000_regbase +</div><div class='add'>+				ME4000_AO_02_CTRL_REG));</div><div class='add'>+		len +=</div><div class='add'>+		    sprintf(buf + len, "AO 2 status register = 0x%08X\n",</div><div class='add'>+			    inl(board_info-&gt;me4000_regbase +</div><div class='add'>+				ME4000_AO_02_STATUS_REG));</div><div class='add'>+		len +=</div><div class='add'>+		    sprintf(buf + len, "AO 3 control register = 0x%08X\n",</div><div class='add'>+			    inl(board_info-&gt;me4000_regbase +</div><div class='add'>+				ME4000_AO_03_CTRL_REG));</div><div class='add'>+		len +=</div><div class='add'>+		    sprintf(buf + len, "AO 3 status register = 0x%08X\n",</div><div class='add'>+			    inl(board_info-&gt;me4000_regbase +</div><div class='add'>+				ME4000_AO_03_STATUS_REG));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*eof = 1;</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/staging/me4000/me4000.h b/drivers/staging/me4000/me4000.h<br/>new file mode 100644<br/>index 000000000000..c35e4b9793a0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/me4000/me4000.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/me4000/me4000.h</a></div><div class='hunk'>@@ -0,0 +1,954 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2003 Meilhaus Electronic GmbH (support@meilhaus.de)</div><div class='add'>+ *</div><div class='add'>+ * Source File : me4000.h</div><div class='add'>+ * Author      : GG (Guenter Gebhardt)  &lt;g.gebhardt@meilhaus.de&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _ME4000_H_</div><div class='add'>+#define _ME4000_H_</div><div class='add'>+</div><div class='add'>+#ifdef __KERNEL__</div><div class='add'>+</div><div class='add'>+/*=============================================================================</div><div class='add'>+  The version of the driver release</div><div class='add'>+  ===========================================================================*/</div><div class='add'>+</div><div class='add'>+#define ME4000_DRIVER_VERSION  0x10009	// Version 1.00.09</div><div class='add'>+</div><div class='add'>+/*=============================================================================</div><div class='add'>+  Debug section</div><div class='add'>+  ===========================================================================*/</div><div class='add'>+</div><div class='add'>+#undef ME4000_CALL_DEBUG	// Debug function entry and exit</div><div class='add'>+#undef ME4000_ISR_DEBUG		// Debug the interrupt service routine</div><div class='add'>+#undef ME4000_PORT_DEBUG	// Debug port access</div><div class='add'>+#undef ME4000_DEBUG		// General purpose debug masseges</div><div class='add'>+</div><div class='add'>+#ifdef ME4000_CALL_DEBUG</div><div class='add'>+#undef CALL_PDEBUG</div><div class='add'>+#define CALL_PDEBUG(fmt, args...) printk(KERN_DEBUG"ME4000:" fmt, ##args)</div><div class='add'>+#else</div><div class='add'>+# define CALL_PDEBUG(fmt, args...)	// no debugging, do nothing</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef ME4000_ISR_DEBUG</div><div class='add'>+#undef ISR_PDEBUG</div><div class='add'>+#define ISR_PDEBUG(fmt, args...) printk(KERN_DEBUG"ME4000:" fmt, ##args)</div><div class='add'>+#else</div><div class='add'>+#define ISR_PDEBUG(fmt, args...)	// no debugging, do nothing</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef ME4000_PORT_DEBUG</div><div class='add'>+#undef PORT_PDEBUG</div><div class='add'>+#define PORT_PDEBUG(fmt, args...) printk(KERN_DEBUG"ME4000:" fmt, ##args)</div><div class='add'>+#else</div><div class='add'>+#define PORT_PDEBUG(fmt, args...)	// no debugging, do nothing</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef ME4000_DEBUG</div><div class='add'>+#undef PDEBUG</div><div class='add'>+#define PDEBUG(fmt, args...) printk(KERN_DEBUG"ME4000:" fmt, ##args)</div><div class='add'>+#else</div><div class='add'>+#define PDEBUG(fmt, args...)	// no debugging, do nothing</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*=============================================================================</div><div class='add'>+  PCI vendor and device IDs</div><div class='add'>+  ===========================================================================*/</div><div class='add'>+</div><div class='add'>+#define PCI_VENDOR_ID_MEILHAUS 0x1402</div><div class='add'>+</div><div class='add'>+#define PCI_DEVICE_ID_MEILHAUS_ME4650	0x4650	// Low Cost version</div><div class='add'>+</div><div class='add'>+#define PCI_DEVICE_ID_MEILHAUS_ME4660	0x4660	// Standard version</div><div class='add'>+#define PCI_DEVICE_ID_MEILHAUS_ME4660I	0x4661	// Isolated version</div><div class='add'>+#define PCI_DEVICE_ID_MEILHAUS_ME4660S	0x4662	// Standard version with Sample and Hold</div><div class='add'>+#define PCI_DEVICE_ID_MEILHAUS_ME4660IS	0x4663	// Isolated version with Sample and Hold</div><div class='add'>+</div><div class='add'>+#define PCI_DEVICE_ID_MEILHAUS_ME4670	0x4670	// Standard version</div><div class='add'>+#define PCI_DEVICE_ID_MEILHAUS_ME4670I	0x4671	// Isolated version</div><div class='add'>+#define PCI_DEVICE_ID_MEILHAUS_ME4670S	0x4672	// Standard version with Sample and Hold</div><div class='add'>+#define PCI_DEVICE_ID_MEILHAUS_ME4670IS	0x4673	// Isolated version with Sample and Hold</div><div class='add'>+</div><div class='add'>+#define PCI_DEVICE_ID_MEILHAUS_ME4680	0x4680	// Standard version</div><div class='add'>+#define PCI_DEVICE_ID_MEILHAUS_ME4680I	0x4681	// Isolated version</div><div class='add'>+#define PCI_DEVICE_ID_MEILHAUS_ME4680S	0x4682	// Standard version with Sample and Hold</div><div class='add'>+#define PCI_DEVICE_ID_MEILHAUS_ME4680IS	0x4683	// Isolated version with Sample and Hold</div><div class='add'>+</div><div class='add'>+/*=============================================================================</div><div class='add'>+  Device names, for entries in /proc/..</div><div class='add'>+  ===========================================================================*/</div><div class='add'>+</div><div class='add'>+#define ME4000_NAME		"me4000"</div><div class='add'>+#define ME4000_AO_NAME		"me4000_ao"</div><div class='add'>+#define ME4000_AI_NAME		"me4000_ai"</div><div class='add'>+#define ME4000_DIO_NAME		"me4000_dio"</div><div class='add'>+#define ME4000_CNT_NAME		"me4000_cnt"</div><div class='add'>+#define ME4000_EXT_INT_NAME	"me4000_ext_int"</div><div class='add'>+</div><div class='add'>+/*=============================================================================</div><div class='add'>+  ME-4000 base register offsets</div><div class='add'>+  ===========================================================================*/</div><div class='add'>+</div><div class='add'>+#define ME4000_AO_00_CTRL_REG			0x00	// R/W</div><div class='add'>+#define ME4000_AO_00_STATUS_REG			0x04	// R/_</div><div class='add'>+#define ME4000_AO_00_FIFO_REG			0x08	// _/W</div><div class='add'>+#define ME4000_AO_00_SINGLE_REG			0x0C	// R/W</div><div class='add'>+#define ME4000_AO_00_TIMER_REG			0x10	// _/W</div><div class='add'>+</div><div class='add'>+#define ME4000_AO_01_CTRL_REG			0x18	// R/W</div><div class='add'>+#define ME4000_AO_01_STATUS_REG			0x1C	// R/_</div><div class='add'>+#define ME4000_AO_01_FIFO_REG			0x20	// _/W</div><div class='add'>+#define ME4000_AO_01_SINGLE_REG			0x24	// R/W</div><div class='add'>+#define ME4000_AO_01_TIMER_REG			0x28	// _/W</div><div class='add'>+</div><div class='add'>+#define ME4000_AO_02_CTRL_REG			0x30	// R/W</div><div class='add'>+#define ME4000_AO_02_STATUS_REG			0x34	// R/_</div><div class='add'>+#define ME4000_AO_02_FIFO_REG			0x38	// _/W</div><div class='add'>+#define ME4000_AO_02_SINGLE_REG			0x3C	// R/W</div><div class='add'>+#define ME4000_AO_02_TIMER_REG			0x40	// _/W</div><div class='add'>+</div><div class='add'>+#define ME4000_AO_03_CTRL_REG			0x48	// R/W</div><div class='add'>+#define ME4000_AO_03_STATUS_REG			0x4C	// R/_</div><div class='add'>+#define ME4000_AO_03_FIFO_REG			0x50	// _/W</div><div class='add'>+#define ME4000_AO_03_SINGLE_REG			0x54	// R/W</div><div class='add'>+#define ME4000_AO_03_TIMER_REG			0x58	// _/W</div><div class='add'>+</div><div class='add'>+#define ME4000_AI_CTRL_REG			0x74	// _/W</div><div class='add'>+#define ME4000_AI_STATUS_REG			0x74	// R/_</div><div class='add'>+#define ME4000_AI_CHANNEL_LIST_REG		0x78	// _/W</div><div class='add'>+#define ME4000_AI_DATA_REG			0x7C	// R/_</div><div class='add'>+#define ME4000_AI_CHAN_TIMER_REG		0x80	// _/W</div><div class='add'>+#define ME4000_AI_CHAN_PRE_TIMER_REG		0x84	// _/W</div><div class='add'>+#define ME4000_AI_SCAN_TIMER_LOW_REG		0x88	// _/W</div><div class='add'>+#define ME4000_AI_SCAN_TIMER_HIGH_REG		0x8C	// _/W</div><div class='add'>+#define ME4000_AI_SCAN_PRE_TIMER_LOW_REG	0x90	// _/W</div><div class='add'>+#define ME4000_AI_SCAN_PRE_TIMER_HIGH_REG	0x94	// _/W</div><div class='add'>+#define ME4000_AI_START_REG			0x98	// R/_</div><div class='add'>+</div><div class='add'>+#define ME4000_IRQ_STATUS_REG			0x9C	// R/_</div><div class='add'>+</div><div class='add'>+#define ME4000_DIO_PORT_0_REG			0xA0	// R/W</div><div class='add'>+#define ME4000_DIO_PORT_1_REG			0xA4	// R/W</div><div class='add'>+#define ME4000_DIO_PORT_2_REG			0xA8	// R/W</div><div class='add'>+#define ME4000_DIO_PORT_3_REG			0xAC	// R/W</div><div class='add'>+#define ME4000_DIO_DIR_REG			0xB0	// R/W</div><div class='add'>+</div><div class='add'>+#define ME4000_AO_LOADSETREG_XX			0xB4	// R/W</div><div class='add'>+</div><div class='add'>+#define ME4000_DIO_CTRL_REG			0xB8	// R/W</div><div class='add'>+</div><div class='add'>+#define ME4000_AO_DEMUX_ADJUST_REG		0xBC	// -/W</div><div class='add'>+</div><div class='add'>+#define ME4000_AI_SAMPLE_COUNTER_REG		0xC0	// _/W</div><div class='add'>+</div><div class='add'>+/*=============================================================================</div><div class='add'>+  Value to adjust Demux</div><div class='add'>+  ===========================================================================*/</div><div class='add'>+</div><div class='add'>+#define ME4000_AO_DEMUX_ADJUST_VALUE            0x4C</div><div class='add'>+</div><div class='add'>+/*=============================================================================</div><div class='add'>+  Counter base register offsets</div><div class='add'>+  ===========================================================================*/</div><div class='add'>+</div><div class='add'>+#define ME4000_CNT_COUNTER_0_REG		0x00</div><div class='add'>+#define ME4000_CNT_COUNTER_1_REG		0x01</div><div class='add'>+#define ME4000_CNT_COUNTER_2_REG		0x02</div><div class='add'>+#define ME4000_CNT_CTRL_REG			0x03</div><div class='add'>+</div><div class='add'>+/*=============================================================================</div><div class='add'>+  PLX base register offsets</div><div class='add'>+  ===========================================================================*/</div><div class='add'>+</div><div class='add'>+#define PLX_INTCSR	0x4C	// Interrupt control and status register</div><div class='add'>+#define PLX_ICR		0x50	// Initialization control register</div><div class='add'>+</div><div class='add'>+/*=============================================================================</div><div class='add'>+  Bits for the PLX_ICSR register</div><div class='add'>+  ===========================================================================*/</div><div class='add'>+</div><div class='add'>+#define PLX_INTCSR_LOCAL_INT1_EN             0x01	// If set, local interrupt 1 is enabled (r/w)</div><div class='add'>+#define PLX_INTCSR_LOCAL_INT1_POL            0x02	// If set, local interrupt 1 polarity is active high (r/w)</div><div class='add'>+#define PLX_INTCSR_LOCAL_INT1_STATE          0x04	// If set, local interrupt 1 is active (r/_)</div><div class='add'>+#define PLX_INTCSR_LOCAL_INT2_EN             0x08	// If set, local interrupt 2 is enabled (r/w)</div><div class='add'>+#define PLX_INTCSR_LOCAL_INT2_POL            0x10	// If set, local interrupt 2 polarity is active high (r/w)</div><div class='add'>+#define PLX_INTCSR_LOCAL_INT2_STATE          0x20	// If set, local interrupt 2 is active  (r/_)</div><div class='add'>+#define PLX_INTCSR_PCI_INT_EN                0x40	// If set, PCI interrupt is enabled (r/w)</div><div class='add'>+#define PLX_INTCSR_SOFT_INT                  0x80	// If set, a software interrupt is generated (r/w)</div><div class='add'>+</div><div class='add'>+/*=============================================================================</div><div class='add'>+  Bits for the PLX_ICR register</div><div class='add'>+  ===========================================================================*/</div><div class='add'>+</div><div class='add'>+#define PLX_ICR_BIT_EEPROM_CLOCK_SET		0x01000000</div><div class='add'>+#define PLX_ICR_BIT_EEPROM_CHIP_SELECT		0x02000000</div><div class='add'>+#define PLX_ICR_BIT_EEPROM_WRITE		0x04000000</div><div class='add'>+#define PLX_ICR_BIT_EEPROM_READ			0x08000000</div><div class='add'>+#define PLX_ICR_BIT_EEPROM_VALID		0x10000000</div><div class='add'>+</div><div class='add'>+#define PLX_ICR_MASK_EEPROM			0x1F000000</div><div class='add'>+</div><div class='add'>+#define EEPROM_DELAY				1</div><div class='add'>+</div><div class='add'>+/*=============================================================================</div><div class='add'>+  Bits for the ME4000_AO_CTRL_REG register</div><div class='add'>+  ===========================================================================*/</div><div class='add'>+</div><div class='add'>+#define ME4000_AO_CTRL_BIT_MODE_0		0x001</div><div class='add'>+#define ME4000_AO_CTRL_BIT_MODE_1		0x002</div><div class='add'>+#define ME4000_AO_CTRL_MASK_MODE		0x003</div><div class='add'>+#define ME4000_AO_CTRL_BIT_STOP			0x004</div><div class='add'>+#define ME4000_AO_CTRL_BIT_ENABLE_FIFO		0x008</div><div class='add'>+#define ME4000_AO_CTRL_BIT_ENABLE_EX_TRIG	0x010</div><div class='add'>+#define ME4000_AO_CTRL_BIT_EX_TRIG_EDGE		0x020</div><div class='add'>+#define ME4000_AO_CTRL_BIT_IMMEDIATE_STOP	0x080</div><div class='add'>+#define ME4000_AO_CTRL_BIT_ENABLE_DO		0x100</div><div class='add'>+#define ME4000_AO_CTRL_BIT_ENABLE_IRQ		0x200</div><div class='add'>+#define ME4000_AO_CTRL_BIT_RESET_IRQ		0x400</div><div class='add'>+#define ME4000_AO_CTRL_BIT_EX_TRIG_BOTH		0x800</div><div class='add'>+</div><div class='add'>+/*=============================================================================</div><div class='add'>+  Bits for the ME4000_AO_STATUS_REG register</div><div class='add'>+  ===========================================================================*/</div><div class='add'>+</div><div class='add'>+#define ME4000_AO_STATUS_BIT_FSM		0x01</div><div class='add'>+#define ME4000_AO_STATUS_BIT_FF			0x02</div><div class='add'>+#define ME4000_AO_STATUS_BIT_HF			0x04</div><div class='add'>+#define ME4000_AO_STATUS_BIT_EF			0x08</div><div class='add'>+</div><div class='add'>+/*=============================================================================</div><div class='add'>+  Bits for the ME4000_AI_CTRL_REG register</div><div class='add'>+  ===========================================================================*/</div><div class='add'>+</div><div class='add'>+#define ME4000_AI_CTRL_BIT_MODE_0		0x00000001</div><div class='add'>+#define ME4000_AI_CTRL_BIT_MODE_1		0x00000002</div><div class='add'>+#define ME4000_AI_CTRL_BIT_MODE_2		0x00000004</div><div class='add'>+#define ME4000_AI_CTRL_BIT_SAMPLE_HOLD		0x00000008</div><div class='add'>+#define ME4000_AI_CTRL_BIT_IMMEDIATE_STOP	0x00000010</div><div class='add'>+#define ME4000_AI_CTRL_BIT_STOP			0x00000020</div><div class='add'>+#define ME4000_AI_CTRL_BIT_CHANNEL_FIFO		0x00000040</div><div class='add'>+#define ME4000_AI_CTRL_BIT_DATA_FIFO		0x00000080</div><div class='add'>+#define ME4000_AI_CTRL_BIT_FULLSCALE		0x00000100</div><div class='add'>+#define ME4000_AI_CTRL_BIT_OFFSET		0x00000200</div><div class='add'>+#define ME4000_AI_CTRL_BIT_EX_TRIG_ANALOG	0x00000400</div><div class='add'>+#define ME4000_AI_CTRL_BIT_EX_TRIG		0x00000800</div><div class='add'>+#define ME4000_AI_CTRL_BIT_EX_TRIG_FALLING	0x00001000</div><div class='add'>+#define ME4000_AI_CTRL_BIT_EX_IRQ		0x00002000</div><div class='add'>+#define ME4000_AI_CTRL_BIT_EX_IRQ_RESET		0x00004000</div><div class='add'>+#define ME4000_AI_CTRL_BIT_LE_IRQ		0x00008000</div><div class='add'>+#define ME4000_AI_CTRL_BIT_LE_IRQ_RESET		0x00010000</div><div class='add'>+#define ME4000_AI_CTRL_BIT_HF_IRQ		0x00020000</div><div class='add'>+#define ME4000_AI_CTRL_BIT_HF_IRQ_RESET		0x00040000</div><div class='add'>+#define ME4000_AI_CTRL_BIT_SC_IRQ		0x00080000</div><div class='add'>+#define ME4000_AI_CTRL_BIT_SC_IRQ_RESET		0x00100000</div><div class='add'>+#define ME4000_AI_CTRL_BIT_SC_RELOAD		0x00200000</div><div class='add'>+#define ME4000_AI_CTRL_BIT_EX_TRIG_BOTH		0x80000000</div><div class='add'>+</div><div class='add'>+/*=============================================================================</div><div class='add'>+  Bits for the ME4000_AI_STATUS_REG register</div><div class='add'>+  ===========================================================================*/</div><div class='add'>+</div><div class='add'>+#define ME4000_AI_STATUS_BIT_EF_CHANNEL		0x00400000</div><div class='add'>+#define ME4000_AI_STATUS_BIT_HF_CHANNEL		0x00800000</div><div class='add'>+#define ME4000_AI_STATUS_BIT_FF_CHANNEL		0x01000000</div><div class='add'>+#define ME4000_AI_STATUS_BIT_EF_DATA		0x02000000</div><div class='add'>+#define ME4000_AI_STATUS_BIT_HF_DATA		0x04000000</div><div class='add'>+#define ME4000_AI_STATUS_BIT_FF_DATA		0x08000000</div><div class='add'>+#define ME4000_AI_STATUS_BIT_LE			0x10000000</div><div class='add'>+#define ME4000_AI_STATUS_BIT_FSM		0x20000000</div><div class='add'>+</div><div class='add'>+/*=============================================================================</div><div class='add'>+  Bits for the ME4000_IRQ_STATUS_REG register</div><div class='add'>+  ===========================================================================*/</div><div class='add'>+</div><div class='add'>+#define ME4000_IRQ_STATUS_BIT_EX		0x01</div><div class='add'>+#define ME4000_IRQ_STATUS_BIT_LE		0x02</div><div class='add'>+#define ME4000_IRQ_STATUS_BIT_AI_HF		0x04</div><div class='add'>+#define ME4000_IRQ_STATUS_BIT_AO_0_HF		0x08</div><div class='add'>+#define ME4000_IRQ_STATUS_BIT_AO_1_HF		0x10</div><div class='add'>+#define ME4000_IRQ_STATUS_BIT_AO_2_HF		0x20</div><div class='add'>+#define ME4000_IRQ_STATUS_BIT_AO_3_HF		0x40</div><div class='add'>+#define ME4000_IRQ_STATUS_BIT_SC		0x80</div><div class='add'>+</div><div class='add'>+/*=============================================================================</div><div class='add'>+  Bits for the ME4000_DIO_CTRL_REG register</div><div class='add'>+  ===========================================================================*/</div><div class='add'>+</div><div class='add'>+#define ME4000_DIO_CTRL_BIT_MODE_0		0X0001</div><div class='add'>+#define ME4000_DIO_CTRL_BIT_MODE_1		0X0002</div><div class='add'>+#define ME4000_DIO_CTRL_BIT_MODE_2		0X0004</div><div class='add'>+#define ME4000_DIO_CTRL_BIT_MODE_3		0X0008</div><div class='add'>+#define ME4000_DIO_CTRL_BIT_MODE_4		0X0010</div><div class='add'>+#define ME4000_DIO_CTRL_BIT_MODE_5		0X0020</div><div class='add'>+#define ME4000_DIO_CTRL_BIT_MODE_6		0X0040</div><div class='add'>+#define ME4000_DIO_CTRL_BIT_MODE_7		0X0080</div><div class='add'>+</div><div class='add'>+#define ME4000_DIO_CTRL_BIT_FUNCTION_0		0X0100</div><div class='add'>+#define ME4000_DIO_CTRL_BIT_FUNCTION_1		0X0200</div><div class='add'>+</div><div class='add'>+#define ME4000_DIO_CTRL_BIT_FIFO_HIGH_0		0X0400</div><div class='add'>+#define ME4000_DIO_CTRL_BIT_FIFO_HIGH_1		0X0800</div><div class='add'>+#define ME4000_DIO_CTRL_BIT_FIFO_HIGH_2		0X1000</div><div class='add'>+#define ME4000_DIO_CTRL_BIT_FIFO_HIGH_3		0X2000</div><div class='add'>+</div><div class='add'>+/*=============================================================================</div><div class='add'>+  Bits for the ME4000_CNT_CTRL_REG register</div><div class='add'>+  ===========================================================================*/</div><div class='add'>+</div><div class='add'>+#define ME4000_CNT_CTRL_BIT_COUNTER_0  0x00</div><div class='add'>+#define ME4000_CNT_CTRL_BIT_COUNTER_1  0x40</div><div class='add'>+#define ME4000_CNT_CTRL_BIT_COUNTER_2  0x80</div><div class='add'>+</div><div class='add'>+#define ME4000_CNT_CTRL_BIT_MODE_0     0x00	// Change state if zero crossing</div><div class='add'>+#define ME4000_CNT_CTRL_BIT_MODE_1     0x02	// Retriggerable One-Shot</div><div class='add'>+#define ME4000_CNT_CTRL_BIT_MODE_2     0x04	// Asymmetrical divider</div><div class='add'>+#define ME4000_CNT_CTRL_BIT_MODE_3     0x06	// Symmetrical divider</div><div class='add'>+#define ME4000_CNT_CTRL_BIT_MODE_4     0x08	// Counter start by software trigger</div><div class='add'>+#define ME4000_CNT_CTRL_BIT_MODE_5     0x0A	// Counter start by hardware trigger</div><div class='add'>+</div><div class='add'>+/*=============================================================================</div><div class='add'>+  Extract information from minor device number</div><div class='add'>+  ===========================================================================*/</div><div class='add'>+</div><div class='add'>+#define AO_BOARD(dev) ((MINOR(dev) &gt;&gt; 6) &amp; 0x3)</div><div class='add'>+#define AO_PORT(dev)  ((MINOR(dev) &gt;&gt; 2) &amp; 0xF)</div><div class='add'>+#define AO_MODE(dev)  (MINOR(dev) &amp; 0x3)</div><div class='add'>+</div><div class='add'>+#define AI_BOARD(dev) ((MINOR(dev) &gt;&gt; 3) &amp; 0x1F)</div><div class='add'>+#define AI_MODE(dev)  (MINOR(dev) &amp; 0x7)</div><div class='add'>+</div><div class='add'>+#define DIO_BOARD(dev) (MINOR(dev))</div><div class='add'>+</div><div class='add'>+#define CNT_BOARD(dev) (MINOR(dev))</div><div class='add'>+</div><div class='add'>+#define EXT_INT_BOARD(dev) (MINOR(dev))</div><div class='add'>+</div><div class='add'>+/*=============================================================================</div><div class='add'>+  Circular buffer used for analog input/output reads/writes.</div><div class='add'>+  ===========================================================================*/</div><div class='add'>+</div><div class='add'>+typedef struct me4000_circ_buf {</div><div class='add'>+	s16 *buf;</div><div class='add'>+	int volatile head;</div><div class='add'>+	int volatile tail;</div><div class='add'>+} me4000_circ_buf_t;</div><div class='add'>+</div><div class='add'>+/*=============================================================================</div><div class='add'>+  Information about the hardware capabilities</div><div class='add'>+  ===========================================================================*/</div><div class='add'>+</div><div class='add'>+typedef struct me4000_ao_info {</div><div class='add'>+	int count;</div><div class='add'>+	int fifo_count;</div><div class='add'>+} me4000_ao_info_t;</div><div class='add'>+</div><div class='add'>+typedef struct me4000_ai_info {</div><div class='add'>+	int count;</div><div class='add'>+	int sh_count;</div><div class='add'>+	int diff_count;</div><div class='add'>+	int ex_trig_analog;</div><div class='add'>+} me4000_ai_info_t;</div><div class='add'>+</div><div class='add'>+typedef struct me4000_dio_info {</div><div class='add'>+	int count;</div><div class='add'>+} me4000_dio_info_t;</div><div class='add'>+</div><div class='add'>+typedef struct me4000_cnt_info {</div><div class='add'>+	int count;</div><div class='add'>+} me4000_cnt_info_t;</div><div class='add'>+</div><div class='add'>+typedef struct me4000_board {</div><div class='add'>+	u16 vendor_id;</div><div class='add'>+	u16 device_id;</div><div class='add'>+	me4000_ao_info_t ao;</div><div class='add'>+	me4000_ai_info_t ai;</div><div class='add'>+	me4000_dio_info_t dio;</div><div class='add'>+	me4000_cnt_info_t cnt;</div><div class='add'>+} me4000_board_t;</div><div class='add'>+</div><div class='add'>+static me4000_board_t me4000_boards[] = {</div><div class='add'>+	{PCI_VENDOR_ID_MEILHAUS, 0x4610, {0, 0}, {16, 0, 0, 0}, {4}, {3}},</div><div class='add'>+</div><div class='add'>+	{PCI_VENDOR_ID_MEILHAUS, 0x4650, {0, 0}, {16, 0, 0, 0}, {4}, {0}},</div><div class='add'>+</div><div class='add'>+	{PCI_VENDOR_ID_MEILHAUS, 0x4660, {2, 0}, {16, 0, 0, 0}, {4}, {3}},</div><div class='add'>+	{PCI_VENDOR_ID_MEILHAUS, 0x4661, {2, 0}, {16, 0, 0, 0}, {4}, {3}},</div><div class='add'>+	{PCI_VENDOR_ID_MEILHAUS, 0x4662, {2, 0}, {16, 8, 0, 0}, {4}, {3}},</div><div class='add'>+	{PCI_VENDOR_ID_MEILHAUS, 0x4663, {2, 0}, {16, 8, 0, 0}, {4}, {3}},</div><div class='add'>+</div><div class='add'>+	{PCI_VENDOR_ID_MEILHAUS, 0x4670, {4, 0}, {32, 0, 16, 1}, {4}, {3}},</div><div class='add'>+	{PCI_VENDOR_ID_MEILHAUS, 0x4671, {4, 0}, {32, 0, 16, 1}, {4}, {3}},</div><div class='add'>+	{PCI_VENDOR_ID_MEILHAUS, 0x4672, {4, 0}, {32, 8, 16, 1}, {4}, {3}},</div><div class='add'>+	{PCI_VENDOR_ID_MEILHAUS, 0x4673, {4, 0}, {32, 8, 16, 1}, {4}, {3}},</div><div class='add'>+</div><div class='add'>+	{PCI_VENDOR_ID_MEILHAUS, 0x4680, {4, 4}, {32, 0, 16, 1}, {4}, {3}},</div><div class='add'>+	{PCI_VENDOR_ID_MEILHAUS, 0x4681, {4, 4}, {32, 0, 16, 1}, {4}, {3}},</div><div class='add'>+	{PCI_VENDOR_ID_MEILHAUS, 0x4682, {4, 4}, {32, 8, 16, 1}, {4}, {3}},</div><div class='add'>+	{PCI_VENDOR_ID_MEILHAUS, 0x4683, {4, 4}, {32, 8, 16, 1}, {4}, {3}},</div><div class='add'>+</div><div class='add'>+	{0},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define ME4000_BOARD_VERSIONS (sizeof(me4000_boards) / sizeof(me4000_board_t) - 1)</div><div class='add'>+</div><div class='add'>+/*=============================================================================</div><div class='add'>+  PCI device table.</div><div class='add'>+  This is used by modprobe to translate PCI IDs to drivers.</div><div class='add'>+  ===========================================================================*/</div><div class='add'>+</div><div class='add'>+static struct pci_device_id me4000_pci_table[] __devinitdata = {</div><div class='add'>+	{PCI_VENDOR_ID_MEILHAUS, 0x4610, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='add'>+</div><div class='add'>+	{PCI_VENDOR_ID_MEILHAUS, 0x4650, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='add'>+</div><div class='add'>+	{PCI_VENDOR_ID_MEILHAUS, 0x4660, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='add'>+	{PCI_VENDOR_ID_MEILHAUS, 0x4661, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='add'>+	{PCI_VENDOR_ID_MEILHAUS, 0x4662, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='add'>+	{PCI_VENDOR_ID_MEILHAUS, 0x4663, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='add'>+</div><div class='add'>+	{PCI_VENDOR_ID_MEILHAUS, 0x4670, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='add'>+	{PCI_VENDOR_ID_MEILHAUS, 0x4671, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='add'>+	{PCI_VENDOR_ID_MEILHAUS, 0x4672, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='add'>+	{PCI_VENDOR_ID_MEILHAUS, 0x4673, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='add'>+</div><div class='add'>+	{PCI_VENDOR_ID_MEILHAUS, 0x4680, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='add'>+	{PCI_VENDOR_ID_MEILHAUS, 0x4681, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='add'>+	{PCI_VENDOR_ID_MEILHAUS, 0x4682, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='add'>+	{PCI_VENDOR_ID_MEILHAUS, 0x4683, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='add'>+</div><div class='add'>+	{0}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_DEVICE_TABLE(pci, me4000_pci_table);</div><div class='add'>+</div><div class='add'>+/*=============================================================================</div><div class='add'>+  Global board and subdevice information structures</div><div class='add'>+  ===========================================================================*/</div><div class='add'>+</div><div class='add'>+typedef struct me4000_info {</div><div class='add'>+	struct list_head list;	// List of all detected boards</div><div class='add'>+	int board_count;	// Index of the board after detection</div><div class='add'>+</div><div class='add'>+	unsigned long plx_regbase;	// PLX configuration space base address</div><div class='add'>+	unsigned long me4000_regbase;	// Base address of the ME4000</div><div class='add'>+	unsigned long timer_regbase;	// Base address of the timer circuit</div><div class='add'>+	unsigned long program_regbase;	// Base address to set the program pin for the xilinx</div><div class='add'>+</div><div class='add'>+	unsigned long plx_regbase_size;	// PLX register set space</div><div class='add'>+	unsigned long me4000_regbase_size;	// ME4000 register set space</div><div class='add'>+	unsigned long timer_regbase_size;	// Timer circuit register set space</div><div class='add'>+	unsigned long program_regbase_size;	// Size of program base address of the ME4000</div><div class='add'>+</div><div class='add'>+	unsigned int serial_no;	// Serial number of the board</div><div class='add'>+	unsigned char hw_revision;	// Hardware revision of the board</div><div class='add'>+	unsigned short vendor_id;	// Meilhaus vendor id (0x1402)</div><div class='add'>+	unsigned short device_id;	// Device ID</div><div class='add'>+</div><div class='add'>+	int pci_bus_no;		// PCI bus number</div><div class='add'>+	int pci_dev_no;		// PCI device number</div><div class='add'>+	int pci_func_no;	// PCI function number</div><div class='add'>+	struct pci_dev *pci_dev_p;	// General PCI information</div><div class='add'>+</div><div class='add'>+	me4000_board_t *board_p;	// Holds the board capabilities</div><div class='add'>+</div><div class='add'>+	unsigned int irq;	// IRQ assigned from the PCI BIOS</div><div class='add'>+	unsigned int irq_count;	// Count of external interrupts</div><div class='add'>+</div><div class='add'>+	spinlock_t preload_lock;	// Guards the analog output preload register</div><div class='add'>+	spinlock_t ai_ctrl_lock;	// Guards the analog input control register</div><div class='add'>+</div><div class='add'>+	struct list_head ao_context_list;	// List with analog output specific context</div><div class='add'>+	struct me4000_ai_context *ai_context;	// Analog input  specific context</div><div class='add'>+	struct me4000_dio_context *dio_context;	// Digital I/O specific context</div><div class='add'>+	struct me4000_cnt_context *cnt_context;	// Counter specific context</div><div class='add'>+	struct me4000_ext_int_context *ext_int_context;	// External interrupt specific context</div><div class='add'>+} me4000_info_t;</div><div class='add'>+</div><div class='add'>+typedef struct me4000_ao_context {</div><div class='add'>+	struct list_head list;	// linked list of me4000_ao_context_t</div><div class='add'>+	int index;		// Index in the list</div><div class='add'>+	int mode;		// Indicates mode (0 = single, 1 = wraparound, 2 = continous)</div><div class='add'>+	int dac_in_use;		// Indicates if already opend</div><div class='add'>+	spinlock_t use_lock;	// Guards in_use</div><div class='add'>+	spinlock_t int_lock;	// Used when locking out interrupts</div><div class='add'>+	me4000_circ_buf_t circ_buf;	// Circular buffer</div><div class='add'>+	wait_queue_head_t wait_queue;	// Wait queue to sleep while blocking write</div><div class='add'>+	me4000_info_t *board_info;</div><div class='add'>+	unsigned int irq;	// The irq associated with this ADC</div><div class='add'>+	int volatile pipe_flag;	// Indicates broken pipe set from me4000_ao_isr()</div><div class='add'>+	unsigned long ctrl_reg;</div><div class='add'>+	unsigned long status_reg;</div><div class='add'>+	unsigned long fifo_reg;</div><div class='add'>+	unsigned long single_reg;</div><div class='add'>+	unsigned long timer_reg;</div><div class='add'>+	unsigned long irq_status_reg;</div><div class='add'>+	unsigned long preload_reg;</div><div class='add'>+	struct fasync_struct *fasync_p;	// Queue for asynchronous notification</div><div class='add'>+} me4000_ao_context_t;</div><div class='add'>+</div><div class='add'>+typedef struct me4000_ai_context {</div><div class='add'>+	struct list_head list;	// linked list of me4000_ai_info_t</div><div class='add'>+	int mode;		// Indicates mode</div><div class='add'>+	int in_use;		// Indicates if already opend</div><div class='add'>+	spinlock_t use_lock;	// Guards in_use</div><div class='add'>+	spinlock_t int_lock;	// Used when locking out interrupts</div><div class='add'>+	int number;		// Number of the DAC</div><div class='add'>+	unsigned int irq;	// The irq associated with this ADC</div><div class='add'>+	me4000_circ_buf_t circ_buf;	// Circular buffer</div><div class='add'>+	wait_queue_head_t wait_queue;	// Wait queue to sleep while blocking read</div><div class='add'>+	me4000_info_t *board_info;</div><div class='add'>+</div><div class='add'>+	struct fasync_struct *fasync_p;	// Queue for asynchronous notification</div><div class='add'>+</div><div class='add'>+	unsigned long ctrl_reg;</div><div class='add'>+	unsigned long status_reg;</div><div class='add'>+	unsigned long channel_list_reg;</div><div class='add'>+	unsigned long data_reg;</div><div class='add'>+	unsigned long chan_timer_reg;</div><div class='add'>+	unsigned long chan_pre_timer_reg;</div><div class='add'>+	unsigned long scan_timer_low_reg;</div><div class='add'>+	unsigned long scan_timer_high_reg;</div><div class='add'>+	unsigned long scan_pre_timer_low_reg;</div><div class='add'>+	unsigned long scan_pre_timer_high_reg;</div><div class='add'>+	unsigned long start_reg;</div><div class='add'>+	unsigned long irq_status_reg;</div><div class='add'>+	unsigned long sample_counter_reg;</div><div class='add'>+</div><div class='add'>+	unsigned long chan_timer;</div><div class='add'>+	unsigned long chan_pre_timer;</div><div class='add'>+	unsigned long scan_timer_low;</div><div class='add'>+	unsigned long scan_timer_high;</div><div class='add'>+	unsigned long channel_list_count;</div><div class='add'>+	unsigned long sample_counter;</div><div class='add'>+	int sample_counter_reload;</div><div class='add'>+} me4000_ai_context_t;</div><div class='add'>+</div><div class='add'>+typedef struct me4000_dio_context {</div><div class='add'>+	struct list_head list;	// linked list of me4000_dio_context_t</div><div class='add'>+	int in_use;		// Indicates if already opend</div><div class='add'>+	spinlock_t use_lock;	// Guards in_use</div><div class='add'>+	int number;</div><div class='add'>+	int dio_count;</div><div class='add'>+	me4000_info_t *board_info;</div><div class='add'>+	unsigned long dir_reg;</div><div class='add'>+	unsigned long ctrl_reg;</div><div class='add'>+	unsigned long port_0_reg;</div><div class='add'>+	unsigned long port_1_reg;</div><div class='add'>+	unsigned long port_2_reg;</div><div class='add'>+	unsigned long port_3_reg;</div><div class='add'>+} me4000_dio_context_t;</div><div class='add'>+</div><div class='add'>+typedef struct me4000_cnt_context {</div><div class='add'>+	struct list_head list;	// linked list of me4000_dio_context_t</div><div class='add'>+	int in_use;		// Indicates if already opend</div><div class='add'>+	spinlock_t use_lock;	// Guards in_use</div><div class='add'>+	int number;</div><div class='add'>+	int cnt_count;</div><div class='add'>+	me4000_info_t *board_info;</div><div class='add'>+	unsigned long ctrl_reg;</div><div class='add'>+	unsigned long counter_0_reg;</div><div class='add'>+	unsigned long counter_1_reg;</div><div class='add'>+	unsigned long counter_2_reg;</div><div class='add'>+} me4000_cnt_context_t;</div><div class='add'>+</div><div class='add'>+typedef struct me4000_ext_int_context {</div><div class='add'>+	struct list_head list;	// linked list of me4000_dio_context_t</div><div class='add'>+	int in_use;		// Indicates if already opend</div><div class='add'>+	spinlock_t use_lock;	// Guards in_use</div><div class='add'>+	int number;</div><div class='add'>+	me4000_info_t *board_info;</div><div class='add'>+	unsigned int irq;</div><div class='add'>+	unsigned long int_count;</div><div class='add'>+	struct fasync_struct *fasync_ptr;</div><div class='add'>+	unsigned long ctrl_reg;</div><div class='add'>+	unsigned long irq_status_reg;</div><div class='add'>+} me4000_ext_int_context_t;</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*=============================================================================</div><div class='add'>+  Application include section starts here</div><div class='add'>+  ===========================================================================*/</div><div class='add'>+</div><div class='add'>+/*-----------------------------------------------------------------------------</div><div class='add'>+  Defines for analog input</div><div class='add'>+  ----------------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+/* General stuff */</div><div class='add'>+#define ME4000_AI_FIFO_COUNT		2048</div><div class='add'>+</div><div class='add'>+#define ME4000_AI_MIN_TICKS		66</div><div class='add'>+#define ME4000_AI_MAX_SCAN_TICKS	0xFFFFFFFFFFLL</div><div class='add'>+</div><div class='add'>+#define ME4000_AI_BUFFER_SIZE 		(32 * 1024)	// Size in bytes</div><div class='add'>+</div><div class='add'>+#define ME4000_AI_BUFFER_COUNT		((ME4000_AI_BUFFER_SIZE) / 2)	// Size in values</div><div class='add'>+</div><div class='add'>+/* Channel list defines and masks */</div><div class='add'>+#define ME4000_AI_CHANNEL_LIST_COUNT		1024</div><div class='add'>+</div><div class='add'>+#define ME4000_AI_LIST_INPUT_SINGLE_ENDED	0x000</div><div class='add'>+#define ME4000_AI_LIST_INPUT_DIFFERENTIAL	0x020</div><div class='add'>+</div><div class='add'>+#define ME4000_AI_LIST_RANGE_BIPOLAR_10		0x000</div><div class='add'>+#define ME4000_AI_LIST_RANGE_BIPOLAR_2_5	0x040</div><div class='add'>+#define ME4000_AI_LIST_RANGE_UNIPOLAR_10	0x080</div><div class='add'>+#define ME4000_AI_LIST_RANGE_UNIPOLAR_2_5	0x0C0</div><div class='add'>+</div><div class='add'>+#define ME4000_AI_LIST_LAST_ENTRY		0x100</div><div class='add'>+</div><div class='add'>+/* External trigger defines */</div><div class='add'>+#define ME4000_AI_TRIGGER_SOFTWARE		0x0	// Use only with API</div><div class='add'>+#define ME4000_AI_TRIGGER_EXT_DIGITAL		0x1</div><div class='add'>+#define ME4000_AI_TRIGGER_EXT_ANALOG		0x2</div><div class='add'>+</div><div class='add'>+#define ME4000_AI_TRIGGER_EXT_EDGE_RISING	0x0</div><div class='add'>+#define ME4000_AI_TRIGGER_EXT_EDGE_FALLING	0x1</div><div class='add'>+#define ME4000_AI_TRIGGER_EXT_EDGE_BOTH		0x2</div><div class='add'>+</div><div class='add'>+/* Sample and Hold */</div><div class='add'>+#define ME4000_AI_SIMULTANEOUS_DISABLE		0x0</div><div class='add'>+#define ME4000_AI_SIMULTANEOUS_ENABLE		0x1</div><div class='add'>+</div><div class='add'>+/* Defines for the Sample Counter */</div><div class='add'>+#define ME4000_AI_SC_RELOAD			0x0</div><div class='add'>+#define ME4000_AI_SC_ONCE			0x1</div><div class='add'>+</div><div class='add'>+/* Modes for analog input */</div><div class='add'>+#define ME4000_AI_ACQ_MODE_SINGLE		0x00	// Catch one single value</div><div class='add'>+#define ME4000_AI_ACQ_MODE_SOFTWARE		0x01	// Continous sampling with software start</div><div class='add'>+#define ME4000_AI_ACQ_MODE_EXT			0x02	// Continous sampling with external trigger start</div><div class='add'>+#define ME4000_AI_ACQ_MODE_EXT_SINGLE_VALUE	0x03	// Sample one value by external trigger</div><div class='add'>+#define ME4000_AI_ACQ_MODE_EXT_SINGLE_CHANLIST	0x04	// Sample one channel list by external trigger</div><div class='add'>+</div><div class='add'>+/* Staus of AI FSM */</div><div class='add'>+#define ME4000_AI_STATUS_IDLE			0x0</div><div class='add'>+#define ME4000_AI_STATUS_BUSY			0x1</div><div class='add'>+</div><div class='add'>+/* Voltages for calibration */</div><div class='add'>+#define ME4000_AI_GAIN_1_UNI_OFFSET		10.0E-3</div><div class='add'>+#define ME4000_AI_GAIN_1_UNI_FULLSCALE		9950.0E-3</div><div class='add'>+#define ME4000_AI_GAIN_1_BI_OFFSET		0.0</div><div class='add'>+#define ME4000_AI_GAIN_1_BI_FULLSCALE		9950.0E-3</div><div class='add'>+#define ME4000_AI_GAIN_4_UNI_OFFSET		10.0E-3</div><div class='add'>+#define ME4000_AI_GAIN_4_UNI_FULLSCALE		2450.0E-3</div><div class='add'>+#define ME4000_AI_GAIN_4_BI_OFFSET		0.0</div><div class='add'>+#define ME4000_AI_GAIN_4_BI_FULLSCALE		2450.0E-3</div><div class='add'>+</div><div class='add'>+/* Ideal digits for calibration */</div><div class='add'>+#define ME4000_AI_GAIN_1_UNI_OFFSET_DIGITS	(-32702)</div><div class='add'>+#define ME4000_AI_GAIN_1_UNI_FULLSCALE_DIGITS	32440</div><div class='add'>+#define ME4000_AI_GAIN_1_BI_OFFSET_DIGITS	0</div><div class='add'>+#define ME4000_AI_GAIN_1_BI_FULLSCALE_DIGITS	32604</div><div class='add'>+#define ME4000_AI_GAIN_4_UNI_OFFSET_DIGITS	(-32505)</div><div class='add'>+#define ME4000_AI_GAIN_4_UNI_FULLSCALE_DIGITS	31457</div><div class='add'>+#define ME4000_AI_GAIN_4_BI_OFFSET_DIGITS	0</div><div class='add'>+#define ME4000_AI_GAIN_4_BI_FULLSCALE_DIGITS	32113</div><div class='add'>+</div><div class='add'>+/*-----------------------------------------------------------------------------</div><div class='add'>+  Defines for analog output</div><div class='add'>+  ----------------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+/* General stuff */</div><div class='add'>+#define ME4000_AO_FIFO_COUNT			(4 * 1024)</div><div class='add'>+</div><div class='add'>+#define ME4000_AO_MIN_TICKS			66</div><div class='add'>+</div><div class='add'>+#define ME4000_AO_BUFFER_SIZE 			(32 * 1024)	// Size in bytes</div><div class='add'>+</div><div class='add'>+#define ME4000_AO_BUFFER_COUNT 			((ME4000_AO_BUFFER_SIZE) / 2)	// Size in values</div><div class='add'>+</div><div class='add'>+/* Conversion modes for analog output */</div><div class='add'>+#define ME4000_AO_CONV_MODE_SINGLE		0x0</div><div class='add'>+#define ME4000_AO_CONV_MODE_WRAPAROUND		0x1</div><div class='add'>+#define ME4000_AO_CONV_MODE_CONTINUOUS		0x2</div><div class='add'>+</div><div class='add'>+/* Trigger setup */</div><div class='add'>+#define ME4000_AO_TRIGGER_EXT_EDGE_RISING	0x0</div><div class='add'>+#define ME4000_AO_TRIGGER_EXT_EDGE_FALLING	0x1</div><div class='add'>+#define ME4000_AO_TRIGGER_EXT_EDGE_BOTH		0x2</div><div class='add'>+</div><div class='add'>+/* Status of AO FSM */</div><div class='add'>+#define ME4000_AO_STATUS_IDLE			0x0</div><div class='add'>+#define ME4000_AO_STATUS_BUSY			0x1</div><div class='add'>+</div><div class='add'>+/*-----------------------------------------------------------------------------</div><div class='add'>+  Defines for eeprom</div><div class='add'>+  ----------------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+#define ME4000_EEPROM_CMD_READ			0x180</div><div class='add'>+#define ME4000_EEPROM_CMD_WRITE_ENABLE		0x130</div><div class='add'>+#define ME4000_EEPROM_CMD_WRITE_DISABLE		0x100</div><div class='add'>+#define ME4000_EEPROM_CMD_WRITE			0x1400000</div><div class='add'>+</div><div class='add'>+#define ME4000_EEPROM_CMD_LENGTH_READ		9</div><div class='add'>+#define ME4000_EEPROM_CMD_LENGTH_WRITE_ENABLE	9</div><div class='add'>+#define ME4000_EEPROM_CMD_LENGTH_WRITE_DISABLE	9</div><div class='add'>+#define ME4000_EEPROM_CMD_LENGTH_WRITE		25</div><div class='add'>+</div><div class='add'>+#define ME4000_EEPROM_ADR_DATE_HIGH		0x32</div><div class='add'>+#define ME4000_EEPROM_ADR_DATE_LOW		0x33</div><div class='add'>+</div><div class='add'>+#define ME4000_EEPROM_ADR_GAIN_1_UNI_OFFSET	0x34</div><div class='add'>+#define ME4000_EEPROM_ADR_GAIN_1_UNI_FULLSCALE	0x35</div><div class='add'>+#define ME4000_EEPROM_ADR_GAIN_1_BI_OFFSET	0x36</div><div class='add'>+#define ME4000_EEPROM_ADR_GAIN_1_BI_FULLSCALE	0x37</div><div class='add'>+#define ME4000_EEPROM_ADR_GAIN_1_DIFF_OFFSET	0x38</div><div class='add'>+#define ME4000_EEPROM_ADR_GAIN_1_DIFF_FULLSCALE	0x39</div><div class='add'>+</div><div class='add'>+#define ME4000_EEPROM_ADR_GAIN_4_UNI_OFFSET	0x3A</div><div class='add'>+#define ME4000_EEPROM_ADR_GAIN_4_UNI_FULLSCALE	0x3B</div><div class='add'>+#define ME4000_EEPROM_ADR_GAIN_4_BI_OFFSET	0x3C</div><div class='add'>+#define ME4000_EEPROM_ADR_GAIN_4_BI_FULLSCALE	0x3D</div><div class='add'>+#define ME4000_EEPROM_ADR_GAIN_4_DIFF_OFFSET	0x3E</div><div class='add'>+#define ME4000_EEPROM_ADR_GAIN_4_DIFF_FULLSCALE	0x3F</div><div class='add'>+</div><div class='add'>+#define ME4000_EEPROM_ADR_LENGTH		6</div><div class='add'>+#define ME4000_EEPROM_DATA_LENGTH		16</div><div class='add'>+</div><div class='add'>+/*-----------------------------------------------------------------------------</div><div class='add'>+  Defines for digital I/O</div><div class='add'>+  ----------------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+#define ME4000_DIO_PORT_A		0x0</div><div class='add'>+#define ME4000_DIO_PORT_B		0x1</div><div class='add'>+#define ME4000_DIO_PORT_C		0x2</div><div class='add'>+#define ME4000_DIO_PORT_D		0x3</div><div class='add'>+</div><div class='add'>+#define ME4000_DIO_PORT_INPUT		0x0</div><div class='add'>+#define ME4000_DIO_PORT_OUTPUT		0x1</div><div class='add'>+#define ME4000_DIO_FIFO_LOW		0x2</div><div class='add'>+#define ME4000_DIO_FIFO_HIGH		0x3</div><div class='add'>+</div><div class='add'>+#define ME4000_DIO_FUNCTION_PATTERN	0x0</div><div class='add'>+#define ME4000_DIO_FUNCTION_DEMUX	0x1</div><div class='add'>+#define ME4000_DIO_FUNCTION_MUX		0x2</div><div class='add'>+</div><div class='add'>+/*-----------------------------------------------------------------------------</div><div class='add'>+  Defines for counters</div><div class='add'>+  ----------------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+#define ME4000_CNT_COUNTER_0  0</div><div class='add'>+#define ME4000_CNT_COUNTER_1  1</div><div class='add'>+#define ME4000_CNT_COUNTER_2  2</div><div class='add'>+</div><div class='add'>+#define ME4000_CNT_MODE_0     0	// Change state if zero crossing</div><div class='add'>+#define ME4000_CNT_MODE_1     1	// Retriggerable One-Shot</div><div class='add'>+#define ME4000_CNT_MODE_2     2	// Asymmetrical divider</div><div class='add'>+#define ME4000_CNT_MODE_3     3	// Symmetrical divider</div><div class='add'>+#define ME4000_CNT_MODE_4     4	// Counter start by software trigger</div><div class='add'>+#define ME4000_CNT_MODE_5     5	// Counter start by hardware trigger</div><div class='add'>+</div><div class='add'>+/*-----------------------------------------------------------------------------</div><div class='add'>+  General type definitions</div><div class='add'>+  ----------------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+typedef struct me4000_user_info {</div><div class='add'>+	int board_count;	// Index of the board after detection</div><div class='add'>+	unsigned long plx_regbase;	// PLX configuration space base address</div><div class='add'>+	unsigned long me4000_regbase;	// Base address of the ME4000</div><div class='add'>+	unsigned long plx_regbase_size;	// PLX register set space</div><div class='add'>+	unsigned long me4000_regbase_size;	// ME4000 register set space</div><div class='add'>+	unsigned long serial_no;	// Serial number of the board</div><div class='add'>+	unsigned char hw_revision;	// Hardware revision of the board</div><div class='add'>+	unsigned short vendor_id;	// Meilhaus vendor id (0x1402)</div><div class='add'>+	unsigned short device_id;	// Device ID</div><div class='add'>+	int pci_bus_no;		// PCI bus number</div><div class='add'>+	int pci_dev_no;		// PCI device number</div><div class='add'>+	int pci_func_no;	// PCI function number</div><div class='add'>+	char irq;		// IRQ assigned from the PCI BIOS</div><div class='add'>+	int irq_count;		// Count of external interrupts</div><div class='add'>+</div><div class='add'>+	int driver_version;	// Version of the driver release</div><div class='add'>+</div><div class='add'>+	int ao_count;		// Count of analog output channels</div><div class='add'>+	int ao_fifo_count;	// Count fo analog output fifos</div><div class='add'>+</div><div class='add'>+	int ai_count;		// Count of analog input channels</div><div class='add'>+	int ai_sh_count;	// Count of sample and hold devices</div><div class='add'>+	int ai_ex_trig_analog;	// Flag to indicate if analogous external trigger is available</div><div class='add'>+</div><div class='add'>+	int dio_count;		// Count of digital I/O ports</div><div class='add'>+</div><div class='add'>+	int cnt_count;		// Count of counters</div><div class='add'>+} me4000_user_info_t;</div><div class='add'>+</div><div class='add'>+/*-----------------------------------------------------------------------------</div><div class='add'>+  Type definitions for analog output</div><div class='add'>+  ----------------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+typedef struct me4000_ao_channel_list {</div><div class='add'>+	unsigned long count;</div><div class='add'>+	unsigned long *list;</div><div class='add'>+} me4000_ao_channel_list_t;</div><div class='add'>+</div><div class='add'>+/*-----------------------------------------------------------------------------</div><div class='add'>+  Type definitions for analog input</div><div class='add'>+  ----------------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+typedef struct me4000_ai_channel_list {</div><div class='add'>+	unsigned long count;</div><div class='add'>+	unsigned long *list;</div><div class='add'>+} me4000_ai_channel_list_t;</div><div class='add'>+</div><div class='add'>+typedef struct me4000_ai_timer {</div><div class='add'>+	unsigned long pre_chan;</div><div class='add'>+	unsigned long chan;</div><div class='add'>+	unsigned long scan_low;</div><div class='add'>+	unsigned long scan_high;</div><div class='add'>+} me4000_ai_timer_t;</div><div class='add'>+</div><div class='add'>+typedef struct me4000_ai_config {</div><div class='add'>+	me4000_ai_timer_t timer;</div><div class='add'>+	me4000_ai_channel_list_t channel_list;</div><div class='add'>+	int sh;</div><div class='add'>+} me4000_ai_config_t;</div><div class='add'>+</div><div class='add'>+typedef struct me4000_ai_single {</div><div class='add'>+	int channel;</div><div class='add'>+	int range;</div><div class='add'>+	int mode;</div><div class='add'>+	short value;</div><div class='add'>+	unsigned long timeout;</div><div class='add'>+} me4000_ai_single_t;</div><div class='add'>+</div><div class='add'>+typedef struct me4000_ai_trigger {</div><div class='add'>+	int mode;</div><div class='add'>+	int edge;</div><div class='add'>+} me4000_ai_trigger_t;</div><div class='add'>+</div><div class='add'>+typedef struct me4000_ai_sc {</div><div class='add'>+	unsigned long value;</div><div class='add'>+	int reload;</div><div class='add'>+} me4000_ai_sc_t;</div><div class='add'>+</div><div class='add'>+/*-----------------------------------------------------------------------------</div><div class='add'>+  Type definitions for eeprom</div><div class='add'>+  ----------------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+typedef struct me4000_eeprom {</div><div class='add'>+	unsigned long date;</div><div class='add'>+	short uni_10_offset;</div><div class='add'>+	short uni_10_fullscale;</div><div class='add'>+	short uni_2_5_offset;</div><div class='add'>+	short uni_2_5_fullscale;</div><div class='add'>+	short bi_10_offset;</div><div class='add'>+	short bi_10_fullscale;</div><div class='add'>+	short bi_2_5_offset;</div><div class='add'>+	short bi_2_5_fullscale;</div><div class='add'>+	short diff_10_offset;</div><div class='add'>+	short diff_10_fullscale;</div><div class='add'>+	short diff_2_5_offset;</div><div class='add'>+	short diff_2_5_fullscale;</div><div class='add'>+} me4000_eeprom_t;</div><div class='add'>+</div><div class='add'>+/*-----------------------------------------------------------------------------</div><div class='add'>+  Type definitions for digital I/O</div><div class='add'>+  ----------------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+typedef struct me4000_dio_config {</div><div class='add'>+	int port;</div><div class='add'>+	int mode;</div><div class='add'>+	int function;</div><div class='add'>+} me4000_dio_config_t;</div><div class='add'>+</div><div class='add'>+typedef struct me4000_dio_byte {</div><div class='add'>+	int port;</div><div class='add'>+	unsigned char byte;</div><div class='add'>+} me4000_dio_byte_t;</div><div class='add'>+</div><div class='add'>+/*-----------------------------------------------------------------------------</div><div class='add'>+  Type definitions for counters</div><div class='add'>+  ----------------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+typedef struct me4000_cnt {</div><div class='add'>+	int counter;</div><div class='add'>+	unsigned short value;</div><div class='add'>+} me4000_cnt_t;</div><div class='add'>+</div><div class='add'>+typedef struct me4000_cnt_config {</div><div class='add'>+	int counter;</div><div class='add'>+	int mode;</div><div class='add'>+} me4000_cnt_config_t;</div><div class='add'>+</div><div class='add'>+/*-----------------------------------------------------------------------------</div><div class='add'>+  Type definitions for external interrupt</div><div class='add'>+  ----------------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+typedef struct {</div><div class='add'>+	int int1_count;</div><div class='add'>+	int int2_count;</div><div class='add'>+} me4000_int_type;</div><div class='add'>+</div><div class='add'>+/*-----------------------------------------------------------------------------</div><div class='add'>+  The ioctls of the board</div><div class='add'>+  ----------------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+#define ME4000_IOCTL_MAXNR 50</div><div class='add'>+#define ME4000_MAGIC 'y'</div><div class='add'>+#define ME4000_GET_USER_INFO          _IOR (ME4000_MAGIC, 0, me4000_user_info_t)</div><div class='add'>+</div><div class='add'>+#define ME4000_AO_START               _IOW (ME4000_MAGIC, 1, unsigned long)</div><div class='add'>+#define ME4000_AO_STOP                _IO  (ME4000_MAGIC, 2)</div><div class='add'>+#define ME4000_AO_IMMEDIATE_STOP      _IO  (ME4000_MAGIC, 3)</div><div class='add'>+#define ME4000_AO_RESET               _IO  (ME4000_MAGIC, 4)</div><div class='add'>+#define ME4000_AO_PRELOAD             _IO  (ME4000_MAGIC, 5)</div><div class='add'>+#define ME4000_AO_PRELOAD_UPDATE      _IO  (ME4000_MAGIC, 6)</div><div class='add'>+#define ME4000_AO_EX_TRIG_ENABLE      _IO  (ME4000_MAGIC, 7)</div><div class='add'>+#define ME4000_AO_EX_TRIG_DISABLE     _IO  (ME4000_MAGIC, 8)</div><div class='add'>+#define ME4000_AO_EX_TRIG_SETUP       _IOW (ME4000_MAGIC, 9, int)</div><div class='add'>+#define ME4000_AO_TIMER_SET_DIVISOR   _IOW (ME4000_MAGIC, 10, unsigned long)</div><div class='add'>+#define ME4000_AO_ENABLE_DO           _IO  (ME4000_MAGIC, 11)</div><div class='add'>+#define ME4000_AO_DISABLE_DO          _IO  (ME4000_MAGIC, 12)</div><div class='add'>+#define ME4000_AO_FSM_STATE           _IOR (ME4000_MAGIC, 13, int)</div><div class='add'>+</div><div class='add'>+#define ME4000_AI_SINGLE              _IOR (ME4000_MAGIC, 14, me4000_ai_single_t)</div><div class='add'>+#define ME4000_AI_START               _IOW (ME4000_MAGIC, 15, unsigned long)</div><div class='add'>+#define ME4000_AI_STOP                _IO  (ME4000_MAGIC, 16)</div><div class='add'>+#define ME4000_AI_IMMEDIATE_STOP      _IO  (ME4000_MAGIC, 17)</div><div class='add'>+#define ME4000_AI_EX_TRIG_ENABLE      _IO  (ME4000_MAGIC, 18)</div><div class='add'>+#define ME4000_AI_EX_TRIG_DISABLE     _IO  (ME4000_MAGIC, 19)</div><div class='add'>+#define ME4000_AI_EX_TRIG_SETUP       _IOW (ME4000_MAGIC, 20, me4000_ai_trigger_t)</div><div class='add'>+#define ME4000_AI_CONFIG              _IOW (ME4000_MAGIC, 21, me4000_ai_config_t)</div><div class='add'>+#define ME4000_AI_SC_SETUP            _IOW (ME4000_MAGIC, 22, me4000_ai_sc_t)</div><div class='add'>+#define ME4000_AI_FSM_STATE           _IOR (ME4000_MAGIC, 23, int)</div><div class='add'>+</div><div class='add'>+#define ME4000_DIO_CONFIG             _IOW (ME4000_MAGIC, 24, me4000_dio_config_t)</div><div class='add'>+#define ME4000_DIO_GET_BYTE           _IOR (ME4000_MAGIC, 25, me4000_dio_byte_t)</div><div class='add'>+#define ME4000_DIO_SET_BYTE           _IOW (ME4000_MAGIC, 26, me4000_dio_byte_t)</div><div class='add'>+#define ME4000_DIO_RESET              _IO  (ME4000_MAGIC, 27)</div><div class='add'>+</div><div class='add'>+#define ME4000_CNT_READ               _IOR (ME4000_MAGIC, 28, me4000_cnt_t)</div><div class='add'>+#define ME4000_CNT_WRITE              _IOW (ME4000_MAGIC, 29, me4000_cnt_t)</div><div class='add'>+#define ME4000_CNT_CONFIG             _IOW (ME4000_MAGIC, 30, me4000_cnt_config_t)</div><div class='add'>+#define ME4000_CNT_RESET              _IO  (ME4000_MAGIC, 31)</div><div class='add'>+</div><div class='add'>+#define ME4000_EXT_INT_DISABLE        _IO  (ME4000_MAGIC, 32)</div><div class='add'>+#define ME4000_EXT_INT_ENABLE         _IO  (ME4000_MAGIC, 33)</div><div class='add'>+#define ME4000_EXT_INT_COUNT          _IOR (ME4000_MAGIC, 34, int)</div><div class='add'>+</div><div class='add'>+#define ME4000_AI_OFFSET_ENABLE       _IO  (ME4000_MAGIC, 35)</div><div class='add'>+#define ME4000_AI_OFFSET_DISABLE      _IO  (ME4000_MAGIC, 36)</div><div class='add'>+#define ME4000_AI_FULLSCALE_ENABLE    _IO  (ME4000_MAGIC, 37)</div><div class='add'>+#define ME4000_AI_FULLSCALE_DISABLE   _IO  (ME4000_MAGIC, 38)</div><div class='add'>+</div><div class='add'>+#define ME4000_AI_EEPROM_READ         _IOR (ME4000_MAGIC, 39, me4000_eeprom_t)</div><div class='add'>+#define ME4000_AI_EEPROM_WRITE        _IOW (ME4000_MAGIC, 40, me4000_eeprom_t)</div><div class='add'>+</div><div class='add'>+#define ME4000_AO_SIMULTANEOUS_EX_TRIG _IO  (ME4000_MAGIC, 41)</div><div class='add'>+#define ME4000_AO_SIMULTANEOUS_SW      _IO  (ME4000_MAGIC, 42)</div><div class='add'>+#define ME4000_AO_SIMULTANEOUS_DISABLE _IO  (ME4000_MAGIC, 43)</div><div class='add'>+#define ME4000_AO_SIMULTANEOUS_UPDATE  _IOW (ME4000_MAGIC, 44, me4000_ao_channel_list_t)</div><div class='add'>+</div><div class='add'>+#define ME4000_AO_SYNCHRONOUS_EX_TRIG  _IO  (ME4000_MAGIC, 45)</div><div class='add'>+#define ME4000_AO_SYNCHRONOUS_SW       _IO  (ME4000_MAGIC, 46)</div><div class='add'>+#define ME4000_AO_SYNCHRONOUS_DISABLE  _IO  (ME4000_MAGIC, 47)</div><div class='add'>+</div><div class='add'>+#define ME4000_AO_EX_TRIG_TIMEOUT      _IOW (ME4000_MAGIC, 48, unsigned long)</div><div class='add'>+#define ME4000_AO_GET_FREE_BUFFER      _IOR (ME4000_MAGIC, 49, unsigned long)</div><div class='add'>+</div><div class='add'>+#define ME4000_AI_GET_COUNT_BUFFER     _IOR (ME4000_MAGIC, 50, unsigned long)</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/staging/me4000/me4000_firmware.h b/drivers/staging/me4000/me4000_firmware.h<br/>new file mode 100644<br/>index 000000000000..87c23f6757b4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/me4000/me4000_firmware.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/me4000/me4000_firmware.h</a></div><div class='hunk'>@@ -0,0 +1,10033 @@</div><div class='add'>+/*</div><div class='add'>+   This file is copyright by Meilhaus Electronic GmbH 2003.</div><div class='add'>+   You are not allowed to distribute, sell, modify, reverse engineer or use this</div><div class='add'>+   code (or parts of it) for any other purpose or under any other conditions</div><div class='add'>+   than stated below.</div><div class='add'>+</div><div class='add'>+   1) You are allowed to distribute verbatim copies of this file together</div><div class='add'>+   with device drivers for the Meilhaus ME-4000, board family.</div><div class='add'>+</div><div class='add'>+   2) Derived work (device drivers using this file) can be published under</div><div class='add'>+   the terms of the GNU General Public License as published by</div><div class='add'>+   the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+   (at your option) any later version. Any other license terms have</div><div class='add'>+   to be agreed by Meilhaus GmbH in written.</div><div class='add'>+</div><div class='add'>+   2) This file is distributed WITHOUT ANY WARRANTY;</div><div class='add'>+   without even the implied warranty of MERCHANTABILITY</div><div class='add'>+   or FITNESS FOR A PARTICULAR PURPOSE. Meilhaus is under</div><div class='add'>+   no means liable for products using this file or parts of it.</div><div class='add'>+</div><div class='add'>+   3) The copyright of this file has to be mentioned in derived work.</div><div class='add'>+</div><div class='add'>+   4) If this license terms are not valid due to any other law</div><div class='add'>+   or restrictions imposed on you, you are not allowed to use</div><div class='add'>+   this file in any way at all.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* Version 18 of standard firmware */</div><div class='add'>+static unsigned char xilinx_firm[] = {</div><div class='add'>+0x00, 0x01, 0xfb, 0xdc, 0x01, 0x01, 0x04, 0x00, 0x00, 0x09, 0x04, 0x02, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x55, 0x99, 0xAA, 0x66, 0x0C, 0x00,</div><div class='add'>+0x01, 0x80, 0x00, 0x00, 0x00, 0xE0, 0x0C, 0x80, 0x06, 0x80, 0x00, 0x00, 0x00,</div><div class='add'>+0xF0, 0x0C, 0x80, 0x04, 0x80, 0x00, 0x01, 0xFC, 0xB4, 0x0C, 0x00, 0x03, 0x80,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x01, 0x80, 0x00, 0x00, 0x00, 0x90, 0x0C,</div><div class='add'>+0x00, 0x04, 0x80, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x01, 0x80, 0x00, 0x00,</div><div class='add'>+0x00, 0x80, 0x0C, 0x00, 0x02, 0x00, 0x0A, 0x00, 0x6E, 0x0D, 0x01, 0x49, 0x04,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x80, 0x00, 0x20, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x48, 0x04, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,</div><div class='add'>+0x00, 0x20, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x02, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4A, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x01,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x09, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0xFE, 0x4B, 0x02, 0x3E, 0x00, 0xEA, 0x00, 0xA8, 0x00, 0xA0,</div><div class='add'>+0x0A, 0x80, 0x2A, 0x00, 0xAE, 0x00, 0xB8, 0x02, 0xA0, 0x02, 0x80, 0x28, 0x00,</div><div class='add'>+0xAA, 0x00, 0xB8, 0x02, 0x60, 0x02, 0x80, 0x0B, 0x00, 0x26, 0x00, 0xB8, 0x00,</div><div class='add'>+0xE0, 0x02, 0x80, 0x0B, 0x00, 0x2E, 0x00, 0xB8, 0x00, 0xE0, 0x02, 0x80, 0x0B,</div><div class='add'>+0x00, 0xAE, 0x00, 0xB8, 0x02, 0x80, 0x0A, 0xFC, 0x23, 0x01, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x03, 0xA0, 0x5B, 0x00, 0xF3, 0x04, 0xCC, 0x01, 0xF2, 0x96, 0xC2,</div><div class='add'>+0xDF, 0x30, 0xBB, 0x43, 0xD0, 0x73, 0xB0, 0x8F, 0xC0, 0x3D, 0x02, 0xFB, 0x48,</div><div class='add'>+0xFC, 0x13, 0x30, 0x13, 0xC0, 0x4F, 0x02, 0x3F, 0x01, 0xDC, 0x13, 0xB0, 0x4F,</div><div class='add'>+0xC0, 0x4F, 0x00, 0x3B, 0xC9, 0xCC, 0x04, 0xF2, 0x13, 0xC0, 0xFC, 0x00, 0xFB,</div><div class='add'>+0xC9, 0x8C, 0x27, 0x30, 0x03, 0xC0, 0x0F, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x01, 0x08, 0x57, 0x40, 0xE1, 0x08, 0x44, 0x03, 0xD0, 0x09, 0x40, 0x13,</div><div class='add'>+0x01, 0xD1, 0x04, 0xC4, 0x1B, 0x10, 0x6D, 0x40, 0x3C, 0x02, 0xDD, 0x06, 0xF4,</div><div class='add'>+0x0F, 0x10, 0x11, 0x40, 0x27, 0x11, 0x57, 0x81, 0xC4, 0x0F, 0xD0, 0xBF, 0x40,</div><div class='add'>+0x64, 0x00, 0x51, 0x04, 0x44, 0x04, 0xD0, 0x11, 0x50, 0x34, 0x00, 0xD1, 0x00,</div><div class='add'>+0x54, 0x11, 0x14, 0x19, 0x40, 0x17, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x11, 0x00, 0x37, 0x00, 0xC1, 0x00, 0x04, 0x00, 0xD8, 0x48, 0x44, 0x21, 0x00,</div><div class='add'>+0xC9, 0x00, 0x14, 0x03, 0xD0, 0xCC, 0x64, 0x33, 0x11, 0xCD, 0x06, 0x34, 0x23,</div><div class='add'>+0x50, 0x00, 0x00, 0x02, 0x01, 0x8D, 0x00, 0x04, 0x23, 0xD0, 0x0C, 0x42, 0x01,</div><div class='add'>+0x00, 0xC1, 0x00, 0x14, 0x00, 0xD0, 0x00, 0x44, 0x30, 0x09, 0xCD, 0x44, 0x44,</div><div class='add'>+0x12, 0x10, 0x00, 0x44, 0x47, 0x88, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03,</div><div class='add'>+0xA8, 0xB5, 0x01, 0xD1, 0x00, 0x44, 0x0A, 0xD8, 0x09, 0x40, 0x27, 0x00, 0xD1,</div><div class='add'>+0x40, 0x44, 0x03, 0x50, 0x0D, 0x60, 0x36, 0x00, 0xDD, 0x00, 0x74, 0x03, 0x50,</div><div class='add'>+0x01, 0x40, 0x27, 0x10, 0xD5, 0x00, 0x44, 0x03, 0xCA, 0x0D, 0x40, 0x65, 0x00,</div><div class='add'>+0xC1, 0x00, 0x44, 0xC6, 0xD0, 0x19, 0x40, 0x30, 0x00, 0xD1, 0x00, 0x54, 0x09,</div><div class='add'>+0x14, 0x11, 0x40, 0x1F, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA8,</div><div class='add'>+0xE3, 0x00, 0xD3, 0x00, 0x4C, 0x0A, 0xF0, 0x0D, 0xC4, 0xF7, 0x00, 0x9B, 0x40,</div><div class='add'>+0x5C, 0x03, 0xF2, 0x0D, 0xC6, 0x37, 0x10, 0xDB, 0x00, 0x74, 0x03, 0x70, 0xA1,</div><div class='add'>+0x81, 0x37, 0x00, 0xCF, 0x03, 0x4C, 0x03, 0xF0, 0x0D, 0xC0, 0xC7, 0x01, 0x93,</div><div class='add'>+0x00, 0x5D, 0x0C, 0xF0, 0x31, 0xC0, 0x34, 0x00, 0x5F, 0xC0, 0x0C, 0x07, 0x30,</div><div class='add'>+0x71, 0x80, 0x03, 0x20, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x80, 0x3D,</div><div class='add'>+0x08, 0xFF, 0x00, 0xFC, 0x03, 0xF0, 0x0B, 0xC0, 0xFF, 0x18, 0xFF, 0x04, 0xAC,</div><div class='add'>+0x03, 0xB1, 0x0D, 0xC8, 0x3D, 0x00, 0xFF, 0x80, 0x7C, 0x03, 0xB4, 0x13, 0xCA,</div><div class='add'>+0xFF, 0x00, 0xF7, 0x03, 0xE4, 0x43, 0xF0, 0x0E, 0xC1, 0x0E, 0x00, 0xFF, 0x00,</div><div class='add'>+0xFC, 0x40, 0xF0, 0x0B, 0xE2, 0x3F, 0x00, 0xFF, 0x83, 0xFD, 0x25, 0xF0, 0x0B,</div><div class='add'>+0xC0, 0x1E, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x08, 0x25, 0x00,</div><div class='add'>+0xD3, 0x00, 0x4C, 0x0A, 0x30, 0x0D, 0xC0, 0xA4, 0x00, 0xD7, 0x00, 0x5C, 0x03,</div><div class='add'>+0xF0, 0x0D, 0xC0, 0x35, 0x00, 0xD7, 0x00, 0x0C, 0x03, 0x30, 0x41, 0xC4, 0x35,</div><div class='add'>+0x00, 0xD3, 0x02, 0x5C, 0x03, 0xF0, 0x0D, 0xC0, 0x05, 0x00, 0xDF, 0x00, 0x7C,</div><div class='add'>+0x0E, 0x30, 0x01, 0xC1, 0x37, 0x10, 0xD7, 0x04, 0x4C, 0x0B, 0x30, 0x21, 0xC0,</div><div class='add'>+0x0B, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0xA0, 0xF4, 0x01, 0xF5,</div><div class='add'>+0x00, 0x44, 0x2E, 0x10, 0x09, 0x40, 0x25, 0x00, 0xD1, 0x00, 0xC4, 0x03, 0x10,</div><div class='add'>+0x0F, 0xC0, 0x3E, 0x00, 0xF1, 0x00, 0xEC, 0x03, 0x10, 0x11, 0xC0, 0x35, 0x00,</div><div class='add'>+0xD1, 0x01, 0xDC, 0x07, 0x70, 0x2F, 0xC3, 0x23, 0x06, 0xDD, 0x20, 0x64, 0x02,</div><div class='add'>+0xB0, 0x38, 0x41, 0x37, 0x00, 0xD1, 0x03, 0x6C, 0x29, 0x50, 0xA9, 0x40, 0x4E,</div><div class='add'>+0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xA0, 0x22, 0x01, 0xD1, 0x00,</div><div class='add'>+0x04, 0x29, 0x90, 0x04, 0x40, 0x24, 0x00, 0xD5, 0x00, 0x34, 0x03, 0x50, 0x0D,</div><div class='add'>+0x40, 0x33, 0x00, 0xCD, 0x00, 0x04, 0x03, 0x5D, 0x00, 0x40, 0x12, 0x20, 0x01,</div><div class='add'>+0x04, 0x10, 0x0B, 0xD0, 0x1C, 0x42, 0x21, 0x80, 0x0D, 0x40, 0x34, 0x08, 0x90,</div><div class='add'>+0x30, 0x40, 0x31, 0x10, 0xD5, 0x03, 0x04, 0x05, 0x18, 0x18, 0x44, 0x1F, 0x00,</div><div class='add'>+0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x80, 0x68, 0x00, 0xE5, 0x01, 0x84,</div><div class='add'>+0x07, 0x98, 0x1B, 0x40, 0x69, 0x80, 0xE1, 0x81, 0x24, 0x07, 0x10, 0x9E, 0x40,</div><div class='add'>+0x78, 0x80, 0xED, 0x01, 0xA4, 0x07, 0x50, 0x52, 0x61, 0x79, 0x00, 0x21, 0x19,</div><div class='add'>+0x90, 0x07, 0x51, 0x1C, 0x40, 0x6A, 0x00, 0x6D, 0x41, 0xA4, 0x06, 0xD2, 0x12,</div><div class='add'>+0x40, 0x7B, 0x00, 0xF1, 0x09, 0xE4, 0x45, 0x54, 0x1A, 0x40, 0x12, 0x00, 0x02,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x10, 0x20, 0x02, 0xC3, 0x88, 0x44, 0x02,</div><div class='add'>+0xB0, 0x88, 0x40, 0x20, 0x00, 0xD7, 0x08, 0x34, 0x03, 0x70, 0x0C, 0x40, 0x37,</div><div class='add'>+0x02, 0xDD, 0x00, 0x04, 0x03, 0x71, 0x10, 0xC0, 0x16, 0x02, 0x01, 0x80, 0x1C,</div><div class='add'>+0xC3, 0xF0, 0x0C, 0x40, 0x21, 0x00, 0xCF, 0x09, 0x3C, 0x91, 0xB0, 0x88, 0xC0,</div><div class='add'>+0x37, 0x00, 0xC7, 0x10, 0x0C, 0x11, 0x38, 0x84, 0xC1, 0x4B, 0x40, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x02, 0xB0, 0x2D, 0x00, 0xFF, 0x02, 0xFC, 0x02, 0x60,</div><div class='add'>+0x0B, 0xC0, 0x2F, 0x00, 0xFF, 0x00, 0xDC, 0x43, 0x70, 0x0F, 0xC0, 0x3F, 0x04,</div><div class='add'>+0xF3, 0x00, 0xFC, 0x0B, 0xB0, 0x02, 0xC0, 0x3F, 0x48, 0xFF, 0x00, 0x7C, 0x2B,</div><div class='add'>+0xF0, 0x8F, 0xC0, 0x2F, 0x00, 0xFF, 0x20, 0x3C, 0x03, 0x90, 0x09, 0xC0, 0x3F,</div><div class='add'>+0x00, 0xEE, 0x20, 0x7C, 0x01, 0xD4, 0x01, 0xC0, 0x0B, 0x60, 0x06, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x15, 0xA0, 0x27, 0x00, 0xDF, 0x0E, 0x7C, 0x00, 0xC0, 0x0D,</div><div class='add'>+0xC0, 0x75, 0x00, 0xD3, 0x00, 0x7C, 0x53, 0x70, 0x8D, 0xC6, 0xB4, 0x04, 0xDF,</div><div class='add'>+0x00, 0x7C, 0x13, 0xB0, 0x00, 0xC0, 0x34, 0x10, 0x07, 0x80, 0x5C, 0x13, 0x30,</div><div class='add'>+0x5C, 0xC1, 0x04, 0x00, 0x9F, 0x40, 0x7C, 0x03, 0xF0, 0x09, 0xC0, 0x37, 0x00,</div><div class='add'>+0x5F, 0x00, 0x4C, 0x01, 0x30, 0x09, 0xC0, 0x47, 0x00, 0x0E, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x12, 0x88, 0x29, 0x00, 0xED, 0x04, 0xB4, 0x03, 0xD0, 0x0A, 0x40,</div><div class='add'>+0x3B, 0x00, 0xE1, 0x00, 0xB4, 0x13, 0xD0, 0x4F, 0x40, 0x3A, 0x11, 0xED, 0x00,</div><div class='add'>+0xB4, 0x03, 0xD0, 0x02, 0x40, 0x39, 0x00, 0xAD, 0x00, 0x04, 0x03, 0x10, 0x2E,</div><div class='add'>+0x40, 0x08, 0x08, 0xED, 0x00, 0xB4, 0x03, 0xD0, 0x0A, 0x40, 0x3B, 0x00, 0xED,</div><div class='add'>+0x20, 0xC4, 0x01, 0x10, 0x0A, 0x40, 0x4B, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x03, 0x00, 0x69, 0x00, 0xED, 0x01, 0xB4, 0x06, 0x90, 0x3E, 0x4C, 0x6F,</div><div class='add'>+0x10, 0xE1, 0x01, 0xB4, 0x17, 0xD0, 0x0E, 0x40, 0x7A, 0x00, 0xED, 0x0D, 0x94,</div><div class='add'>+0x27, 0xD0, 0x13, 0x41, 0x7A, 0x80, 0x6D, 0x01, 0x94, 0x37, 0x51, 0x5E, 0x40,</div><div class='add'>+0x6A, 0x04, 0xED, 0x01, 0xB4, 0x07, 0xD1, 0x1A, 0x48, 0x7B, 0x80, 0xAD, 0x01,</div><div class='add'>+0x84, 0x05, 0x14, 0x1E, 0x42, 0x0F, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x12, 0x28, 0x23, 0x84, 0xCD, 0x00, 0x34, 0x2E, 0xD0, 0x08, 0x40, 0x23, 0x49,</div><div class='add'>+0xC1, 0x00, 0x34, 0x03, 0xD0, 0x0C, 0x40, 0x32, 0x00, 0xCD, 0x00, 0x36, 0x03,</div><div class='add'>+0xD0, 0x0C, 0x40, 0x33, 0x11, 0xCD, 0x03, 0x04, 0x03, 0x50, 0x0C, 0x40, 0x70,</div><div class='add'>+0x00, 0xCD, 0x00, 0x34, 0x6F, 0xD2, 0x0C, 0x40, 0x33, 0x00, 0x8D, 0x44, 0x05,</div><div class='add'>+0x21, 0x14, 0x1C, 0x40, 0x4B, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x17,</div><div class='add'>+0xA8, 0xD9, 0x00, 0x5F, 0x00, 0xFC, 0x01, 0xB0, 0x07, 0xC4, 0xDF, 0x01, 0x53,</div><div class='add'>+0x00, 0x7C, 0x01, 0x78, 0x05, 0xC0, 0x14, 0x00, 0x5F, 0x00, 0x7C, 0x01, 0xB0,</div><div class='add'>+0x17, 0xC0, 0x9E, 0x01, 0x7F, 0x0E, 0x5C, 0x01, 0x74, 0x05, 0xC8, 0x1E, 0x00,</div><div class='add'>+0x7F, 0x02, 0xFC, 0x0D, 0xE0, 0x07, 0xC0, 0x17, 0x20, 0x7F, 0x07, 0xCC, 0x05,</div><div class='add'>+0x10, 0x07, 0xC1, 0x5F, 0x20, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00,</div><div class='add'>+0x07, 0x02, 0x1F, 0x00, 0x3C, 0x40, 0xF0, 0x41, 0xC0, 0x07, 0x00, 0x1F, 0x60,</div><div class='add'>+0x7C, 0x00, 0xF0, 0x01, 0xC0, 0x05, 0x00, 0x1F, 0x00, 0x7C, 0x00, 0xF0, 0x01,</div><div class='add'>+0xC1, 0x05, 0x10, 0x1F, 0x00, 0x7C, 0x80, 0x91, 0x01, 0xD0, 0x87, 0x01, 0x1F,</div><div class='add'>+0x30, 0x70, 0x08, 0xF0, 0x41, 0xC0, 0x07, 0x18, 0x1F, 0x40, 0x7D, 0x00, 0xF0,</div><div class='add'>+0x11, 0xC0, 0x4B, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x08, 0x27,</div><div class='add'>+0x01, 0x9B, 0x00, 0x4D, 0x02, 0x30, 0x09, 0xC0, 0x25, 0x00, 0x9F, 0x00, 0x74,</div><div class='add'>+0x02, 0xF0, 0x09, 0xC0, 0x23, 0x40, 0x93, 0x00, 0x7C, 0x06, 0xF0, 0x09, 0xC0,</div><div class='add'>+0x24, 0x00, 0x9F, 0x00, 0x44, 0x02, 0x70, 0x09, 0xC4, 0x67, 0x02, 0x9D, 0x00,</div><div class='add'>+0x4C, 0x16, 0xF0, 0x19, 0xC0, 0x27, 0x80, 0x9F, 0x03, 0x4C, 0x22, 0x34, 0x08,</div><div class='add'>+0xC0, 0x40, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x20, 0x66, 0x00,</div><div class='add'>+0x95, 0x00, 0x44, 0x02, 0x10, 0x09, 0x40, 0x24, 0x00, 0x9D, 0x00, 0x74, 0x02,</div><div class='add'>+0xD0, 0x09, 0x40, 0x27, 0x00, 0x91, 0x00, 0x74, 0x06, 0xF0, 0xB8, 0x40, 0x24,</div><div class='add'>+0x00, 0x8D, 0x08, 0x01, 0x06, 0x30, 0x29, 0xC0, 0x27, 0x21, 0x8D, 0x00, 0x44,</div><div class='add'>+0x02, 0xD0, 0x09, 0x40, 0x27, 0x00, 0x8D, 0x03, 0x6C, 0x1E, 0x54, 0x29, 0x40,</div><div class='add'>+0x05, 0x80, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0xA0, 0x24, 0x00, 0x81,</div><div class='add'>+0x00, 0x44, 0x22, 0x10, 0x08, 0x40, 0x35, 0x00, 0x9D, 0x00, 0x74, 0x02, 0xD0,</div><div class='add'>+0x09, 0x40, 0x26, 0x00, 0x99, 0x00, 0x74, 0x22, 0xD0, 0x09, 0x60, 0x24, 0x80,</div><div class='add'>+0xDD, 0x80, 0x54, 0x12, 0x00, 0xA9, 0x40, 0x27, 0x00, 0x9D, 0x00, 0x44, 0x02,</div><div class='add'>+0xD0, 0x4D, 0x43, 0x27, 0x00, 0x98, 0x10, 0x04, 0x02, 0x10, 0xA9, 0x40, 0x60,</div><div class='add'>+0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x20, 0x30, 0x00, 0x85, 0x04,</div><div class='add'>+0x04, 0x1A, 0x14, 0x08, 0x40, 0x20, 0x20, 0x8D, 0x08, 0x34, 0x12, 0xD0, 0x88,</div><div class='add'>+0x64, 0x23, 0x01, 0x89, 0x08, 0x34, 0x12, 0xD0, 0x09, 0x40, 0x20, 0x02, 0xDD,</div><div class='add'>+0x00, 0x14, 0x02, 0x14, 0x08, 0x44, 0x23, 0x00, 0x9D, 0x08, 0x04, 0x02, 0xD8,</div><div class='add'>+0x08, 0x42, 0x23, 0x02, 0x9D, 0x08, 0x24, 0x22, 0x10, 0x48, 0x40, 0x41, 0x88,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xB0, 0x06, 0x00, 0x13, 0x0A, 0x4C,</div><div class='add'>+0x09, 0x30, 0xA1, 0xC0, 0x85, 0x02, 0x1D, 0x02, 0x7C, 0x28, 0xF0, 0x61, 0xC1,</div><div class='add'>+0x87, 0x02, 0x19, 0x16, 0x74, 0x00, 0xF0, 0x05, 0xC0, 0x84, 0x00, 0x1F, 0x00,</div><div class='add'>+0x5C, 0x51, 0x70, 0x41, 0x45, 0x07, 0x10, 0x1F, 0x02, 0x4D, 0x01, 0xF0, 0x01,</div><div class='add'>+0xC4, 0x87, 0x00, 0x0D, 0x02, 0x4C, 0x88, 0x30, 0x01, 0xC4, 0x74, 0xC0, 0x0A,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x19, 0xB8, 0x2F, 0x00, 0x9F, 0x08, 0xFC, 0x0A,</div><div class='add'>+0xF0, 0x0B, 0xC0, 0x2B, 0x00, 0xBF, 0x04, 0x7C, 0x22, 0xF0, 0x49, 0xC0, 0x27,</div><div class='add'>+0x02, 0x93, 0x04, 0x7C, 0x22, 0x70, 0x0B, 0xD0, 0x2F, 0x01, 0xBF, 0x00, 0x6C,</div><div class='add'>+0x02, 0x70, 0x09, 0xC0, 0x2D, 0x10, 0xBF, 0x04, 0xFC, 0x02, 0xF0, 0x0B, 0xC0,</div><div class='add'>+0x27, 0x01, 0xBF, 0x84, 0xFC, 0x12, 0xF0, 0x8B, 0xC0, 0x67, 0x60, 0x0E, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x18, 0xA0, 0x2F, 0x00, 0x93, 0x8C, 0xE8, 0x02, 0xF0,</div><div class='add'>+0x09, 0xC0, 0x27, 0x02, 0x93, 0x60, 0x7C, 0x52, 0x30, 0xC9, 0xC0, 0x25, 0x00,</div><div class='add'>+0x9B, 0x00, 0xDC, 0x02, 0xF0, 0x0B, 0xC0, 0x27, 0x00, 0xBF, 0x00, 0xCC, 0x02,</div><div class='add'>+0xB0, 0x0B, 0xC0, 0x2B, 0x28, 0x9F, 0x40, 0xBC, 0x02, 0xF0, 0x0F, 0xC0, 0x24,</div><div class='add'>+0x20, 0xBF, 0x40, 0xCC, 0x02, 0x30, 0x0B, 0xC0, 0x60, 0x00, 0x0E, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x1C, 0x08, 0x07, 0x00, 0x11, 0x0C, 0x44, 0x49, 0xD0, 0x01,</div><div class='add'>+0x41, 0x07, 0x00, 0x11, 0x14, 0x74, 0x10, 0x10, 0xC1, 0x48, 0x84, 0x04, 0x11,</div><div class='add'>+0x10, 0x44, 0x20, 0xD2, 0x01, 0x40, 0x07, 0x01, 0x1D, 0x00, 0x50, 0x08, 0x14,</div><div class='add'>+0x01, 0x40, 0x17, 0x00, 0x1D, 0x14, 0x64, 0x00, 0xD0, 0x01, 0x40, 0x05, 0x0C,</div><div class='add'>+0x5D, 0x90, 0x54, 0x00, 0x14, 0x01, 0x50, 0x70, 0x20, 0x0C, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x10, 0xA0, 0x27, 0x40, 0x81, 0x04, 0x34, 0x32, 0xD0, 0x08, 0x40,</div><div class='add'>+0x27, 0x40, 0x85, 0x04, 0x34, 0x52, 0x10, 0x48, 0x40, 0x21, 0x03, 0x89, 0x08,</div><div class='add'>+0x14, 0x02, 0xD0, 0x08, 0x40, 0x23, 0x05, 0x9D, 0x00, 0x04, 0x22, 0x12, 0x8C,</div><div class='add'>+0x42, 0x23, 0x00, 0x8D, 0x04, 0x34, 0x02, 0x50, 0x09, 0x40, 0x23, 0x01, 0x8D,</div><div class='add'>+0x00, 0x44, 0x02, 0x10, 0x08, 0x40, 0x40, 0x80, 0x0E, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x18, 0xA8, 0x25, 0x04, 0x91, 0x00, 0x74, 0x02, 0xD0, 0x69, 0x60, 0x27,</div><div class='add'>+0x00, 0x95, 0x00, 0x34, 0x02, 0x10, 0x09, 0x60, 0x21, 0x00, 0x91, 0x00, 0x44,</div><div class='add'>+0x02, 0xD0, 0x29, 0x40, 0x27, 0x80, 0x9C, 0x02, 0x54, 0x02, 0x10, 0x09, 0x40,</div><div class='add'>+0x27, 0x00, 0x9D, 0x00, 0x64, 0x0A, 0xD0, 0x29, 0x40, 0x27, 0x80, 0x8D, 0x08,</div><div class='add'>+0x54, 0x12, 0x12, 0x19, 0x40, 0x60, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x05, 0xA8, 0x27, 0x00, 0x93, 0x00, 0x7C, 0x0E, 0xF0, 0x39, 0xE0, 0x27, 0x21,</div><div class='add'>+0x97, 0x00, 0x7C, 0x02, 0x30, 0x09, 0xC2, 0x25, 0x00, 0x9B, 0x00, 0x5C, 0x02,</div><div class='add'>+0xF0, 0x29, 0xC0, 0x27, 0x00, 0x9F, 0x03, 0x4C, 0x02, 0xB0, 0x09, 0xC0, 0x67,</div><div class='add'>+0x00, 0x9F, 0x24, 0x7C, 0x02, 0xF8, 0x88, 0xC0, 0x27, 0x00, 0x9F, 0x00, 0x4C,</div><div class='add'>+0x02, 0x30, 0x59, 0xC0, 0x14, 0xA0, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14,</div><div class='add'>+0x00, 0x25, 0x00, 0x9F, 0x00, 0x4C, 0x56, 0xF0, 0x19, 0xC0, 0x67, 0x01, 0x9B,</div><div class='add'>+0x04, 0x7C, 0x02, 0xF4, 0x08, 0xCC, 0x26, 0x00, 0x8F, 0x00, 0x7C, 0x02, 0xF0,</div><div class='add'>+0x39, 0xC2, 0x27, 0x00, 0x9F, 0x02, 0x3C, 0x02, 0xF0, 0x09, 0xC0, 0x27, 0x01,</div><div class='add'>+0x9F, 0x05, 0x7C, 0x22, 0xF0, 0x19, 0xC2, 0x25, 0x00, 0x9F, 0x00, 0x7C, 0x02,</div><div class='add'>+0xF0, 0x08, 0xC0, 0x53, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x08,</div><div class='add'>+0x05, 0x00, 0x0F, 0x00, 0x5C, 0x08, 0xF0, 0x21, 0xC0, 0x85, 0x00, 0x1F, 0x00,</div><div class='add'>+0x7C, 0x00, 0xF0, 0x01, 0xE0, 0x07, 0x00, 0x1F, 0x00, 0x7C, 0x00, 0xF0, 0x21,</div><div class='add'>+0xC1, 0x07, 0x00, 0x1B, 0x06, 0x4C, 0x40, 0xF0, 0x01, 0xC1, 0x04, 0x01, 0x13,</div><div class='add'>+0x02, 0x7C, 0x00, 0xB0, 0x01, 0xC0, 0x07, 0x00, 0x13, 0x00, 0x4C, 0x20, 0x31,</div><div class='add'>+0x21, 0x80, 0x50, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x00, 0x18,</div><div class='add'>+0x00, 0x5D, 0x00, 0xC0, 0x05, 0x70, 0x05, 0x40, 0x10, 0x00, 0x5C, 0x00, 0x74,</div><div class='add'>+0x01, 0xD0, 0x05, 0xC0, 0x15, 0x00, 0x5D, 0x00, 0x74, 0x45, 0xD0, 0x07, 0xC0,</div><div class='add'>+0x15, 0x00, 0x61, 0x00, 0xDC, 0x4D, 0x70, 0x07, 0x40, 0xDD, 0x40, 0x51, 0x00,</div><div class='add'>+0xF4, 0x3D, 0x10, 0x77, 0x40, 0x17, 0x40, 0x71, 0x00, 0x84, 0x0D, 0xF0, 0xA7,</div><div class='add'>+0xC0, 0x52, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0xA0, 0x22, 0x20,</div><div class='add'>+0xCD, 0x80, 0x10, 0x0F, 0x50, 0x0C, 0x40, 0x33, 0x80, 0xCC, 0x00, 0x34, 0x03,</div><div class='add'>+0xD0, 0x0C, 0x00, 0x33, 0x00, 0xCD, 0x00, 0x34, 0x02, 0xD0, 0xBC, 0x40, 0x33,</div><div class='add'>+0x00, 0xC9, 0x01, 0x24, 0x07, 0x50, 0x0C, 0x40, 0xF0, 0x00, 0xC1, 0x20, 0x34,</div><div class='add'>+0x07, 0x10, 0x4C, 0x60, 0x33, 0x90, 0xC9, 0x00, 0x04, 0x4F, 0x10, 0x2C, 0x42,</div><div class='add'>+0x50, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x80, 0x38, 0x00, 0xCD,</div><div class='add'>+0x04, 0x84, 0x0B, 0x50, 0x1E, 0x40, 0x3A, 0x03, 0xED, 0x08, 0xB4, 0x03, 0xD0,</div><div class='add'>+0x8E, 0x40, 0x39, 0xA1, 0xED, 0x00, 0xB4, 0x02, 0xD0, 0x0E, 0x40, 0x7D, 0x00,</div><div class='add'>+0xFD, 0x42, 0x90, 0x03, 0x50, 0x18, 0x40, 0xFD, 0x10, 0xE1, 0x04, 0xF4, 0x06,</div><div class='add'>+0x10, 0x0E, 0x40, 0x7B, 0x00, 0xE9, 0x00, 0xC5, 0x01, 0x90, 0x0C, 0x60, 0x12,</div><div class='add'>+0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x10, 0x68, 0x00, 0xEF, 0x07,</div><div class='add'>+0x94, 0x07, 0x70, 0x1F, 0xC8, 0x7B, 0x00, 0xEF, 0x05, 0xB4, 0x0F, 0xF0, 0x1E,</div><div class='add'>+0x40, 0x7B, 0x04, 0xED, 0x01, 0xBC, 0x07, 0xF2, 0x1A, 0xC8, 0x7B, 0x24, 0xFB,</div><div class='add'>+0x01, 0xAC, 0x84, 0x70, 0x1A, 0xC0, 0x78, 0x00, 0xE1, 0x09, 0xB4, 0x06, 0x34,</div><div class='add'>+0x1E, 0xC4, 0x7F, 0x08, 0x79, 0x01, 0xCC, 0x06, 0x32, 0x16, 0xC0, 0x50, 0x40,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xB8, 0x25, 0x10, 0xDF, 0x02, 0x7C,</div><div class='add'>+0x03, 0x70, 0xED, 0xC8, 0xB5, 0x21, 0xDF, 0x00, 0x7C, 0x43, 0xF0, 0x0D, 0xC8,</div><div class='add'>+0x37, 0x02, 0xDF, 0x88, 0x7C, 0x03, 0xD0, 0x09, 0xC0, 0x33, 0x01, 0x93, 0x80,</div><div class='add'>+0x7C, 0x01, 0x60, 0x01, 0xC0, 0x17, 0x00, 0xDF, 0x2A, 0x7C, 0x00, 0x60, 0x09,</div><div class='add'>+0xC0, 0xB7, 0x06, 0x97, 0x00, 0x7C, 0x00, 0xF0, 0x01, 0xC2, 0x43, 0x60, 0x06,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xA0, 0x6F, 0x00, 0xFF, 0x03, 0xC8, 0x21,</div><div class='add'>+0xE0, 0x3E, 0xC2, 0xFC, 0x12, 0xFF, 0x09, 0xEC, 0x07, 0x30, 0x1F, 0xC0, 0x7F,</div><div class='add'>+0x02, 0xFB, 0x01, 0xDC, 0x27, 0xF0, 0x9F, 0xC0, 0x7D, 0x04, 0xB3, 0x41, 0xBC,</div><div class='add'>+0x27, 0xB0, 0x13, 0xC0, 0x7F, 0x00, 0xFF, 0x21, 0xFC, 0x06, 0xF0, 0x1F, 0xC0,</div><div class='add'>+0x7F, 0x00, 0xFF, 0x01, 0xBC, 0x87, 0x30, 0x1F, 0xC0, 0x0B, 0x00, 0x0E, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x15, 0x88, 0x39, 0x10, 0xFD, 0x04, 0x84, 0x01, 0xF0,</div><div class='add'>+0x0E, 0xC1, 0x3A, 0x00, 0xED, 0x00, 0xEC, 0x03, 0x15, 0x8E, 0x48, 0x3B, 0x40,</div><div class='add'>+0xF1, 0x00, 0x84, 0x23, 0xD0, 0xA8, 0x40, 0x3B, 0x20, 0x21, 0x00, 0xB4, 0x29,</div><div class='add'>+0x10, 0x62, 0x40, 0x3B, 0x00, 0xDF, 0x00, 0x84, 0x02, 0xF0, 0x0E, 0x40, 0x3B,</div><div class='add'>+0x02, 0xED, 0x08, 0xBC, 0x01, 0xB0, 0x0E, 0x41, 0x57, 0x20, 0x06, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x29, 0x00, 0xED, 0x00, 0x86, 0x63, 0xD8, 0x0F,</div><div class='add'>+0x40, 0x38, 0x80, 0xFD, 0x40, 0x84, 0x23, 0x90, 0x0E, 0x40, 0x33, 0x10, 0xE1,</div><div class='add'>+0x00, 0xB4, 0x23, 0xD2, 0x22, 0x60, 0x39, 0x00, 0xA5, 0x00, 0xB4, 0x00, 0x12,</div><div class='add'>+0x02, 0x40, 0x2A, 0x00, 0xED, 0x10, 0x94, 0x02, 0xD0, 0x06, 0x40, 0x3B, 0x00,</div><div class='add'>+0x6D, 0x00, 0xF4, 0x02, 0x10, 0x06, 0x40, 0x03, 0x00, 0x04, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x06, 0x28, 0x23, 0x00, 0xCD, 0x00, 0x04, 0x06, 0x58, 0x3C, 0x40,</div><div class='add'>+0x32, 0x00, 0xCD, 0x08, 0x24, 0x03, 0x90, 0x0C, 0x42, 0x33, 0x20, 0xC1, 0x00,</div><div class='add'>+0x16, 0x03, 0xD0, 0x00, 0x40, 0xB3, 0x00, 0x05, 0x0B, 0x36, 0x01, 0x10, 0x00,</div><div class='add'>+0x40, 0x03, 0x10, 0xCD, 0x40, 0x04, 0x10, 0x51, 0x00, 0x40, 0x33, 0x00, 0x9D,</div><div class='add'>+0x12, 0x14, 0xAF, 0x90, 0x50, 0x00, 0x1B, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x15, 0xA8, 0x25, 0x01, 0xFF, 0x00, 0x4D, 0x22, 0xD0, 0x3F, 0xC0, 0x3C,</div><div class='add'>+0x00, 0xFF, 0x00, 0xCC, 0x03, 0xB0, 0x0F, 0xC0, 0x3F, 0x00, 0xF3, 0x00, 0x1C,</div><div class='add'>+0x02, 0xF0, 0x25, 0xC0, 0xBD, 0x02, 0x57, 0x0B, 0x7C, 0x03, 0x11, 0x09, 0xC0,</div><div class='add'>+0xF7, 0x02, 0xEF, 0x00, 0x5C, 0x0A, 0xD0, 0x9D, 0x40, 0x3F, 0x00, 0x9F, 0x02,</div><div class='add'>+0x70, 0x03, 0x10, 0x21, 0xC0, 0x57, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x01, 0x00, 0x37, 0x00, 0xDF, 0x00, 0x7C, 0x0A, 0xF0, 0x4D, 0xC4, 0x37, 0x10,</div><div class='add'>+0xDF, 0x80, 0x7C, 0x83, 0x70, 0x0D, 0xC8, 0x37, 0x00, 0xD7, 0x80, 0x64, 0x02,</div><div class='add'>+0xF0, 0x3D, 0xC0, 0x37, 0x48, 0x5A, 0x00, 0x7C, 0x03, 0x70, 0x29, 0xC0, 0x67,</div><div class='add'>+0x00, 0xD7, 0x00, 0x5C, 0x0A, 0xF0, 0x15, 0xC4, 0x37, 0x20, 0x5F, 0x02, 0x7C,</div><div class='add'>+0x09, 0xF0, 0x29, 0xC0, 0x07, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,</div><div class='add'>+0x08, 0x2F, 0x00, 0xFF, 0x00, 0xFC, 0x00, 0x30, 0x0F, 0xC0, 0x3D, 0x00, 0xFF,</div><div class='add'>+0x00, 0xFE, 0x03, 0xF2, 0x0F, 0xC2, 0x3F, 0x80, 0xFF, 0x00, 0xFC, 0x03, 0xB1,</div><div class='add'>+0x17, 0xC2, 0x3F, 0x00, 0xF3, 0x01, 0xFC, 0x06, 0xF0, 0x0B, 0xC0, 0x7F, 0x00,</div><div class='add'>+0xFF, 0x00, 0xCC, 0x02, 0xD0, 0x8F, 0xC0, 0x3F, 0x00, 0x31, 0x00, 0xCC, 0x62,</div><div class='add'>+0x30, 0x03, 0xC0, 0x03, 0x22, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x81, 0x20,</div><div class='add'>+0x56, 0x00, 0xDD, 0x00, 0x34, 0x0E, 0xD0, 0x0D, 0x40, 0x37, 0x80, 0xDD, 0x00,</div><div class='add'>+0x74, 0x03, 0xD0, 0x0D, 0x40, 0x37, 0xA0, 0xDF, 0x20, 0x74, 0x03, 0x31, 0x9D,</div><div class='add'>+0xC0, 0x31, 0x00, 0x91, 0x0A, 0x74, 0x0F, 0x78, 0x11, 0x40, 0x87, 0x01, 0xDD,</div><div class='add'>+0x00, 0x6C, 0x44, 0x70, 0x01, 0x41, 0x37, 0x00, 0x13, 0x0F, 0x14, 0x44, 0x10,</div><div class='add'>+0x39, 0x40, 0x07, 0x02, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xA0, 0xA6,</div><div class='add'>+0x02, 0xDD, 0x00, 0x74, 0x0C, 0x90, 0x0D, 0x40, 0x37, 0x00, 0xDD, 0x80, 0x74,</div><div class='add'>+0x03, 0xD2, 0x0D, 0x48, 0x37, 0x00, 0xDD, 0x00, 0x74, 0x03, 0x90, 0x05, 0x40,</div><div class='add'>+0x37, 0x00, 0x55, 0x82, 0x74, 0x12, 0xD0, 0x19, 0x40, 0x17, 0x02, 0xD9, 0x00,</div><div class='add'>+0x44, 0x04, 0xD0, 0x09, 0x42, 0x33, 0x00, 0x95, 0x00, 0x44, 0x03, 0x10, 0x19,</div><div class='add'>+0x41, 0x07, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x30, 0x00,</div><div class='add'>+0xCD, 0x00, 0x74, 0x00, 0xD0, 0x0C, 0x40, 0x33, 0x00, 0xCD, 0x00, 0x36, 0x03,</div><div class='add'>+0xD0, 0x0C, 0x40, 0x33, 0x20, 0xC5, 0x00, 0x34, 0x03, 0x10, 0x88, 0x48, 0x35,</div><div class='add'>+0x00, 0x45, 0x00, 0x34, 0x00, 0x58, 0x08, 0x60, 0x03, 0x00, 0xDD, 0x00, 0x25,</div><div class='add'>+0x00, 0x50, 0x00, 0x48, 0x33, 0x40, 0x45, 0x00, 0x44, 0x00, 0x11, 0x08, 0x40,</div><div class='add'>+0x43, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x26, 0x00, 0xFF,</div><div class='add'>+0x00, 0x7C, 0x00, 0x10, 0x0F, 0xC0, 0x3D, 0x00, 0xDD, 0x00, 0xF4, 0x03, 0xF0,</div><div class='add'>+0x0D, 0xC0, 0x3F, 0x00, 0xDD, 0x00, 0x7E, 0x03, 0xB0, 0x05, 0x48, 0x3B, 0x00,</div><div class='add'>+0xD5, 0x00, 0x7C, 0x02, 0xD0, 0x09, 0xC0, 0x07, 0x00, 0xFF, 0x08, 0x4C, 0x00,</div><div class='add'>+0xF0, 0x01, 0xC0, 0x3F, 0x00, 0x17, 0x00, 0x4D, 0x00, 0x30, 0x09, 0xC0, 0x03,</div><div class='add'>+0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0xB8, 0x1F, 0x00, 0xFF, 0x00,</div><div class='add'>+0xFC, 0x02, 0x70, 0x0F, 0xC0, 0x3F, 0x00, 0xEF, 0x80, 0xFC, 0x03, 0xF0, 0x0F,</div><div class='add'>+0xC0, 0x3F, 0x00, 0xFF, 0x00, 0xFC, 0x03, 0x71, 0x43, 0xC0, 0x3D, 0x00, 0x3B,</div><div class='add'>+0x00, 0xFC, 0x00, 0x70, 0x03, 0xC0, 0x0F, 0x00, 0xFF, 0x00, 0xDC, 0x00, 0x78,</div><div class='add'>+0x03, 0xC0, 0x3F, 0x00, 0x33, 0x00, 0xFF, 0x80, 0xF0, 0x0B, 0xC2, 0x17, 0x60,</div><div class='add'>+0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x80, 0x0F, 0x04, 0x33, 0x01, 0xC4,</div><div class='add'>+0x02, 0xB8, 0x0B, 0xC0, 0xBF, 0x01, 0xFB, 0x2C, 0xEC, 0x8E, 0x70, 0x2F, 0xC0,</div><div class='add'>+0x4F, 0x00, 0xF7, 0x18, 0x8C, 0x24, 0xF0, 0x4F, 0xC1, 0x4F, 0x02, 0xFF, 0x44,</div><div class='add'>+0xDC, 0x27, 0x30, 0x8F, 0xC0, 0x3F, 0x00, 0xE7, 0x00, 0xEC, 0x04, 0xF0, 0x0F,</div><div class='add'>+0xC0, 0x6C, 0x00, 0xFB, 0x10, 0x9C, 0x52, 0xF0, 0x13, 0xC0, 0x0C, 0x00, 0x0E,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x08, 0x87, 0x00, 0x11, 0x00, 0x6C, 0x02,</div><div class='add'>+0xF0, 0x09, 0x40, 0xBF, 0x00, 0xF1, 0x02, 0x4C, 0x13, 0x10, 0x8F, 0x40, 0x67,</div><div class='add'>+0x08, 0xF1, 0x02, 0x44, 0x10, 0xD2, 0x3F, 0xC2, 0x23, 0x08, 0xF1, 0x03, 0x44,</div><div class='add'>+0x13, 0x04, 0x6F, 0x40, 0xFC, 0x20, 0xF1, 0x0B, 0x44, 0x04, 0xD1, 0x3F, 0xC0,</div><div class='add'>+0x44, 0x00, 0xD5, 0x43, 0x74, 0x04, 0xD0, 0x15, 0xC0, 0x06, 0x20, 0x0C, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x11, 0xA0, 0x03, 0x00, 0x01, 0x00, 0x15, 0x00, 0x92,</div><div class='add'>+0x08, 0x42, 0x33, 0x03, 0xC9, 0x0C, 0x34, 0x03, 0x50, 0x4C, 0x44, 0x07, 0x80,</div><div class='add'>+0xC5, 0x20, 0x04, 0x12, 0xD0, 0x0C, 0x42, 0x13, 0x10, 0xC9, 0x02, 0x14, 0x03,</div><div class='add'>+0x10, 0x2C, 0x40, 0xB1, 0x00, 0xC5, 0x00, 0x07, 0x00, 0x50, 0x2C, 0x40, 0x26,</div><div class='add'>+0x00, 0xC1, 0x20, 0x34, 0x02, 0xD0, 0x05, 0x40, 0x44, 0x80, 0x0E, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x03, 0xA8, 0x41, 0x04, 0x01, 0x01, 0x54, 0x0E, 0x50, 0x19,</div><div class='add'>+0x40, 0x37, 0x00, 0xD1, 0x00, 0x44, 0x03, 0x10, 0x0D, 0x40, 0x47, 0x00, 0xD1,</div><div class='add'>+0x00, 0x44, 0x0C, 0xD0, 0x0D, 0x40, 0x25, 0x04, 0xD5, 0x00, 0x44, 0x03, 0x18,</div><div class='add'>+0x0D, 0x08, 0x34, 0x00, 0xD1, 0x00, 0x64, 0x04, 0xD0, 0x0D, 0x40, 0x64, 0x00,</div><div class='add'>+0xD5, 0x00, 0x74, 0x06, 0xD0, 0x35, 0x40, 0x0E, 0x20, 0x06, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x02, 0xA8, 0xC7, 0x00, 0x13, 0x03, 0x54, 0x0C, 0x90, 0x51, 0xC0,</div><div class='add'>+0x37, 0x00, 0xDB, 0x00, 0x7C, 0x03, 0x70, 0x0D, 0xC4, 0x43, 0x00, 0xD7, 0x00,</div><div class='add'>+0x4C, 0x0E, 0xF0, 0x0D, 0x48, 0x97, 0x02, 0xDF, 0x00, 0x5C, 0x03, 0x32, 0x0D,</div><div class='add'>+0xC0, 0x37, 0x10, 0xD7, 0x00, 0x6E, 0x44, 0xF0, 0x0D, 0xD0, 0x62, 0x00, 0xDB,</div><div class='add'>+0x00, 0x5C, 0x16, 0xF2, 0x1D, 0xE0, 0x08, 0x20, 0x0E, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x07, 0x80, 0x05, 0x00, 0x3F, 0x00, 0x6D, 0x80, 0xF0, 0x03, 0xC0, 0x3F,</div><div class='add'>+0x00, 0xEF, 0x00, 0xEC, 0x03, 0xF8, 0x0D, 0xC0, 0x2F, 0x80, 0xEB, 0x40, 0xFC,</div><div class='add'>+0x00, 0xF2, 0x0F, 0xC0, 0x4F, 0x00, 0xEB, 0x00, 0xFC, 0x03, 0xF0, 0x0E, 0xC0,</div><div class='add'>+0x3B, 0x04, 0xFD, 0x80, 0xDC, 0x40, 0xF0, 0x0F, 0xC0, 0x2F, 0x00, 0xFF, 0x00,</div><div class='add'>+0xFC, 0x00, 0xF0, 0x0F, 0xC0, 0x1F, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x02, 0x08, 0x85, 0x00, 0x1B, 0x00, 0x4D, 0x08, 0x30, 0x09, 0xC3, 0x33, 0x00,</div><div class='add'>+0xDF, 0x00, 0x5C, 0x03, 0x70, 0x0D, 0xC0, 0x85, 0x00, 0xDF, 0x00, 0x4C, 0x0A,</div><div class='add'>+0x30, 0x0D, 0xC6, 0x16, 0x00, 0xD3, 0x10, 0x5C, 0x03, 0xF0, 0x0D, 0xC0, 0x36,</div><div class='add'>+0x00, 0xDF, 0x20, 0x4C, 0x08, 0x70, 0x0C, 0xC0, 0x27, 0x00, 0xDF, 0x00, 0x7E,</div><div class='add'>+0x42, 0x70, 0x2D, 0xC0, 0x08, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13,</div><div class='add'>+0xA0, 0x04, 0x00, 0x11, 0x01, 0x44, 0x4E, 0x00, 0x69, 0x40, 0x3F, 0x10, 0xFD,</div><div class='add'>+0x00, 0x4C, 0x03, 0x10, 0x0F, 0x40, 0xA4, 0x03, 0xFD, 0x00, 0x44, 0x00, 0x12,</div><div class='add'>+0x0F, 0x40, 0x24, 0x00, 0xF0, 0x03, 0x54, 0x03, 0xD0, 0x0F, 0x40, 0x7C, 0x04,</div><div class='add'>+0xED, 0x00, 0x45, 0x04, 0xD0, 0x1F, 0x40, 0x47, 0x00, 0xFD, 0x00, 0x74, 0x0E,</div><div class='add'>+0x10, 0x0D, 0x43, 0x4C, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xA0,</div><div class='add'>+0x42, 0x00, 0x09, 0x24, 0x00, 0x46, 0x90, 0x00, 0x40, 0x33, 0x20, 0xC9, 0x00,</div><div class='add'>+0x52, 0x02, 0xD0, 0x0C, 0x48, 0xA1, 0x00, 0xCC, 0x00, 0x14, 0x00, 0x10, 0x0C,</div><div class='add'>+0x48, 0x27, 0x60, 0xC1, 0x01, 0x44, 0x03, 0xD0, 0x0C, 0x40, 0x33, 0x00, 0xCD,</div><div class='add'>+0x04, 0x24, 0x04, 0xD0, 0x8C, 0x49, 0x23, 0x12, 0xCD, 0x00, 0x16, 0x04, 0x51,</div><div class='add'>+0x0D, 0x41, 0x1C, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x80, 0x48,</div><div class='add'>+0x24, 0x21, 0x01, 0x84, 0x07, 0x18, 0x1E, 0x40, 0x7B, 0x00, 0xCD, 0x01, 0x94,</div><div class='add'>+0x07, 0x90, 0x9E, 0x40, 0x78, 0xA0, 0xED, 0x01, 0xD4, 0x04, 0x14, 0x1E, 0x40,</div><div class='add'>+0x69, 0x00, 0xE1, 0x11, 0x94, 0x07, 0xC0, 0x1C, 0x40, 0x79, 0x00, 0xED, 0x95,</div><div class='add'>+0x84, 0x05, 0xD2, 0x1E, 0x40, 0x4B, 0x00, 0xED, 0x09, 0xB6, 0x44, 0x10, 0x1F,</div><div class='add'>+0x40, 0x10, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x10, 0x00, 0x00,</div><div class='add'>+0x1B, 0x10, 0x0D, 0x21, 0xB0, 0x04, 0xC0, 0x33, 0x00, 0xCF, 0x00, 0x5C, 0x03,</div><div class='add'>+0xF0, 0x0C, 0xC8, 0x81, 0x00, 0xDE, 0x00, 0x1C, 0x03, 0x30, 0x0C, 0xC0, 0x33,</div><div class='add'>+0x03, 0xC3, 0x80, 0x1C, 0x83, 0xF0, 0x4C, 0xC0, 0x33, 0x00, 0xCF, 0x00, 0x0C,</div><div class='add'>+0x40, 0x70, 0x0C, 0xE4, 0x23, 0x22, 0xCF, 0x00, 0x1E, 0x14, 0x70, 0x0C, 0xC0,</div><div class='add'>+0x48, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xB8, 0x2D, 0x12, 0x7F,</div><div class='add'>+0x08, 0xFC, 0x03, 0x54, 0x0F, 0xC0, 0x3F, 0x80, 0xFF, 0x02, 0xEC, 0x03, 0x70,</div><div class='add'>+0x0F, 0xC3, 0x1F, 0x00, 0xFF, 0x08, 0xEC, 0x03, 0xF0, 0x2E, 0xC4, 0x3E, 0x02,</div><div class='add'>+0xEF, 0x10, 0xF8, 0x23, 0xF0, 0x0F, 0xC1, 0x3E, 0x00, 0xFF, 0x06, 0xDC, 0x01,</div><div class='add'>+0xF0, 0x0F, 0xC0, 0x2F, 0x08, 0xFF, 0x20, 0xFE, 0x20, 0xF2, 0x0C, 0xC0, 0x0B,</div><div class='add'>+0x60, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0xA0, 0x07, 0x00, 0x03, 0x00,</div><div class='add'>+0x4C, 0x03, 0xF0, 0x05, 0xC0, 0xB7, 0x01, 0xDB, 0x0E, 0x7C, 0x03, 0xF0, 0x5D,</div><div class='add'>+0xC1, 0x24, 0x00, 0xDF, 0x86, 0x7C, 0x86, 0x70, 0x3D, 0xC0, 0x16, 0x00, 0xDF,</div><div class='add'>+0x10, 0x7C, 0x03, 0xF0, 0x4D, 0xC1, 0x36, 0x01, 0xDF, 0x01, 0x4C, 0x00, 0xF0,</div><div class='add'>+0xAC, 0xC0, 0x24, 0x00, 0xDF, 0x01, 0x4C, 0x06, 0x30, 0x0D, 0xC0, 0x54, 0x00,</div><div class='add'>+0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x88, 0x09, 0x08, 0x21, 0x00, 0x84,</div><div class='add'>+0x03, 0xD0, 0x0E, 0x40, 0xBB, 0x0D, 0xE1, 0x00, 0x9C, 0x03, 0xD0, 0x4E, 0x50,</div><div class='add'>+0x38, 0x80, 0xED, 0x12, 0xB4, 0x02, 0x10, 0x0E, 0x40, 0x18, 0x00, 0xED, 0x04,</div><div class='add'>+0xB0, 0x83, 0xD0, 0x4E, 0x42, 0xB8, 0x82, 0xCD, 0x04, 0xA5, 0x01, 0xD0, 0x4E,</div><div class='add'>+0x49, 0x29, 0x00, 0xED, 0x00, 0x94, 0x00, 0x11, 0x0E, 0xC0, 0x4A, 0x20, 0x06,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x49, 0x04, 0x21, 0x01, 0x84, 0x0D,</div><div class='add'>+0xD0, 0x16, 0x41, 0x73, 0x01, 0xE9, 0x05, 0x94, 0x07, 0xD0, 0x5E, 0x40, 0x68,</div><div class='add'>+0x00, 0xED, 0x05, 0xB4, 0x07, 0x50, 0x9C, 0x50, 0x79, 0x80, 0xED, 0x01, 0xB4,</div><div class='add'>+0x87, 0x58, 0x1E, 0x40, 0x78, 0x00, 0xED, 0x08, 0xA4, 0x04, 0x50, 0x1E, 0x40,</div><div class='add'>+0x78, 0x00, 0xCD, 0x01, 0x04, 0x06, 0x10, 0x1F, 0x40, 0x0C, 0x00, 0x04, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x12, 0x28, 0x77, 0x20, 0xD1, 0x04, 0x04, 0x07, 0xD0,</div><div class='add'>+0x3C, 0x41, 0x33, 0x00, 0xC1, 0x40, 0x14, 0xA7, 0xD8, 0x0C, 0x40, 0xB0, 0x00,</div><div class='add'>+0xCD, 0x00, 0x34, 0x0B, 0x10, 0x0C, 0x40, 0x71, 0x83, 0xCD, 0x00, 0x34, 0x03,</div><div class='add'>+0xD9, 0x0D, 0x50, 0x30, 0x00, 0xDD, 0x00, 0x24, 0x4B, 0xD1, 0x0C, 0x48, 0x11,</div><div class='add'>+0x14, 0xCD, 0x00, 0x16, 0x27, 0x10, 0x0C, 0x40, 0x4A, 0x20, 0x0C, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x17, 0xA8, 0x5D, 0x40, 0x73, 0x00, 0xCD, 0x0D, 0xF0, 0x07,</div><div class='add'>+0xC0, 0x17, 0x00, 0x5B, 0x00, 0x5C, 0x01, 0xF0, 0x05, 0xC0, 0x18, 0x02, 0x5F,</div><div class='add'>+0x00, 0xFC, 0x01, 0x70, 0x05, 0xC0, 0x5D, 0x18, 0x5F, 0x00, 0x7C, 0x01, 0xF0,</div><div class='add'>+0x05, 0xC0, 0x14, 0x00, 0x5D, 0x80, 0xC5, 0x01, 0xF8, 0x05, 0xC0, 0x5C, 0x00,</div><div class='add'>+0x5F, 0x00, 0xCC, 0x01, 0x30, 0x67, 0xC0, 0x5C, 0x20, 0x06, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x12, 0x00, 0x87, 0x00, 0x1F, 0x00, 0x7C, 0x10, 0xF0, 0x01, 0xC0,</div><div class='add'>+0x07, 0x00, 0x1F, 0x00, 0x5C, 0x00, 0xF0, 0x01, 0xC0, 0x07, 0x00, 0x1F, 0x00,</div><div class='add'>+0x7C, 0x00, 0xF0, 0x01, 0x40, 0x04, 0x20, 0x1F, 0x82, 0x7C, 0x00, 0xF0, 0x01,</div><div class='add'>+0xC0, 0x01, 0x00, 0x1F, 0x02, 0x5C, 0x80, 0xF0, 0x21, 0xC0, 0x07, 0x02, 0x1F,</div><div class='add'>+0x00, 0x7C, 0x8C, 0xF0, 0x01, 0xC1, 0x4B, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x10, 0x08, 0x67, 0x02, 0x93, 0x00, 0x4C, 0x0E, 0xF0, 0x39, 0xC0, 0x27,</div><div class='add'>+0x00, 0x97, 0x00, 0x7C, 0x02, 0xF0, 0x09, 0xC0, 0x27, 0x02, 0x93, 0x00, 0x7C,</div><div class='add'>+0x42, 0xF0, 0x29, 0xC0, 0x27, 0x00, 0x9F, 0x02, 0x7C, 0x02, 0xB2, 0x09, 0xC2,</div><div class='add'>+0xE5, 0x00, 0x97, 0x05, 0x4C, 0x02, 0xF0, 0x08, 0xD0, 0x24, 0x00, 0x9F, 0x00,</div><div class='add'>+0x5E, 0x02, 0xF0, 0x29, 0xC0, 0x40, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x01, 0x20, 0xE6, 0x60, 0x91, 0x03, 0x44, 0x06, 0xD0, 0x19, 0x40, 0x27, 0x00,</div><div class='add'>+0x91, 0x00, 0x5C, 0x02, 0xD0, 0x09, 0x46, 0x27, 0x00, 0x95, 0x00, 0x74, 0x02,</div><div class='add'>+0xD0, 0x19, 0x40, 0x27, 0x00, 0x9D, 0x03, 0x74, 0x02, 0x10, 0x09, 0x48, 0xE4,</div><div class='add'>+0x04, 0x91, 0x00, 0x44, 0x26, 0xD1, 0x49, 0x40, 0x24, 0x00, 0x9D, 0x00, 0x74,</div><div class='add'>+0x4E, 0xD2, 0x18, 0xC0, 0x04, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18,</div><div class='add'>+0xA0, 0x24, 0x04, 0xD1, 0x08, 0x44, 0x02, 0xD0, 0x09, 0x40, 0x23, 0x00, 0x95,</div><div class='add'>+0x00, 0x74, 0x02, 0xD0, 0x09, 0x40, 0x27, 0x04, 0x99, 0x00, 0x74, 0x02, 0xD0,</div><div class='add'>+0x09, 0x40, 0x27, 0x00, 0x95, 0x02, 0x34, 0x02, 0x90, 0x09, 0x60, 0x25, 0x00,</div><div class='add'>+0x95, 0x40, 0x46, 0x02, 0xD0, 0x09, 0x40, 0x24, 0x01, 0x9D, 0x00, 0x54, 0x22,</div><div class='add'>+0xD0, 0x09, 0x40, 0x60, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x20,</div><div class='add'>+0x20, 0x01, 0x81, 0x00, 0x04, 0x13, 0xD0, 0xC8, 0x40, 0x23, 0x11, 0x81, 0x0C,</div><div class='add'>+0x14, 0x22, 0xD0, 0x48, 0x40, 0x23, 0x00, 0x85, 0x04, 0x34, 0x22, 0xD0, 0x48,</div><div class='add'>+0x60, 0x23, 0x02, 0x8D, 0x00, 0x34, 0x22, 0x10, 0x88, 0x40, 0x20, 0x08, 0x91,</div><div class='add'>+0x00, 0x04, 0x06, 0xD0, 0x08, 0x40, 0x20, 0x00, 0x8D, 0x04, 0x34, 0x12, 0xD0,</div><div class='add'>+0x08, 0x40, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xB0, 0x82,</div><div class='add'>+0x02, 0x53, 0x0A, 0x4D, 0x30, 0xF0, 0x45, 0xC1, 0x87, 0x02, 0x17, 0x02, 0x7C,</div><div class='add'>+0x08, 0xF0, 0xA0, 0xC0, 0x07, 0x08, 0x13, 0x0A, 0x3C, 0x08, 0xF0, 0x01, 0xC0,</div><div class='add'>+0x87, 0x00, 0x17, 0x14, 0x7C, 0x08, 0xB0, 0x60, 0xC1, 0x05, 0x85, 0x56, 0x14,</div><div class='add'>+0x44, 0x00, 0xF0, 0x41, 0xD1, 0x04, 0x00, 0x1F, 0x14, 0x5C, 0x00, 0xF0, 0x01,</div><div class='add'>+0xD0, 0x74, 0xC0, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x19, 0x90, 0x2F, 0x22,</div><div class='add'>+0xBF, 0x00, 0xFC, 0x33, 0xF0, 0x4B, 0xC0, 0x27, 0x02, 0x9F, 0x0C, 0xDC, 0x12,</div><div class='add'>+0xF0, 0x89, 0xC0, 0x2F, 0x30, 0x9F, 0x08, 0xFC, 0x12, 0xF0, 0x89, 0xC8, 0x2F,</div><div class='add'>+0x01, 0x9F, 0x40, 0x7C, 0x12, 0xF0, 0x49, 0xC2, 0x27, 0x08, 0x9F, 0x00, 0xFC,</div><div class='add'>+0x02, 0xD0, 0x09, 0xC0, 0x2F, 0x08, 0x9F, 0x00, 0xFC, 0x22, 0xF0, 0x0A, 0xC0,</div><div class='add'>+0x65, 0x60, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0xA0, 0x2F, 0x01, 0xBF,</div><div class='add'>+0x00, 0xCC, 0x32, 0xE0, 0x0B, 0xC8, 0x24, 0x00, 0x9F, 0x08, 0x6C, 0x02, 0xE0,</div><div class='add'>+0x49, 0xC1, 0x2E, 0x00, 0x9F, 0x00, 0x7C, 0x02, 0x30, 0x0B, 0xD8, 0x24, 0x20,</div><div class='add'>+0xBF, 0x34, 0x7C, 0x22, 0xF0, 0x09, 0xE0, 0x2D, 0x00, 0xB3, 0x00, 0xEC, 0x02,</div><div class='add'>+0xF0, 0x4B, 0xC1, 0x2C, 0x20, 0x9F, 0x55, 0xF8, 0x02, 0xF0, 0x0A, 0xC0, 0x60,</div><div class='add'>+0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1C, 0x08, 0x07, 0x05, 0x1D, 0x04,</div><div class='add'>+0x44, 0xB0, 0xD0, 0x25, 0x41, 0x04, 0x04, 0x1D, 0x08, 0x44, 0x50, 0xD2, 0x41,</div><div class='add'>+0x44, 0x04, 0x00, 0x17, 0x12, 0x74, 0x40, 0x14, 0x81, 0x68, 0x04, 0x05, 0x1D,</div><div class='add'>+0x00, 0x74, 0x10, 0x71, 0x21, 0x41, 0x04, 0x00, 0x15, 0x08, 0x44, 0x00, 0xD0,</div><div class='add'>+0x01, 0x40, 0x05, 0x20, 0x1D, 0x00, 0x74, 0x00, 0xD0, 0x01, 0xC0, 0x72, 0x20,</div><div class='add'>+0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xA0, 0x23, 0x03, 0x8D, 0x15, 0x04,</div><div class='add'>+0x92, 0xD0, 0xC8, 0x40, 0x20, 0x02, 0x8D, 0x00, 0x24, 0x12, 0xD0, 0x48, 0x41,</div><div class='add'>+0x22, 0x20, 0x8D, 0x0C, 0x36, 0x02, 0x10, 0x08, 0x40, 0x22, 0x21, 0x8D, 0x00,</div><div class='add'>+0x30, 0x12, 0xD1, 0xC8, 0x40, 0x31, 0x02, 0x81, 0x00, 0x14, 0x02, 0xD0, 0x08,</div><div class='add'>+0x40, 0x22, 0x00, 0x8D, 0x80, 0x34, 0x02, 0xD0, 0x09, 0x40, 0x40, 0x88, 0x0E,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0xA8, 0x65, 0x00, 0x8D, 0x00, 0x44, 0x02,</div><div class='add'>+0xD0, 0x09, 0x40, 0x24, 0x00, 0x9D, 0x00, 0x44, 0x22, 0xD0, 0x09, 0x40, 0x24,</div><div class='add'>+0x00, 0x95, 0x00, 0x74, 0x42, 0x10, 0x09, 0x40, 0x26, 0x06, 0x9D, 0x00, 0x74,</div><div class='add'>+0x02, 0x50, 0x08, 0x48, 0x34, 0x08, 0x95, 0x20, 0x46, 0x43, 0xD0, 0x09, 0x40,</div><div class='add'>+0x67, 0x00, 0x9D, 0x00, 0x76, 0x0E, 0xD0, 0x49, 0x40, 0x62, 0x20, 0x06, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x05, 0x88, 0xE7, 0x04, 0x9F, 0x01, 0x4D, 0x02, 0xF0,</div><div class='add'>+0x39, 0xE0, 0x24, 0x00, 0x9D, 0x00, 0x6C, 0x02, 0xF0, 0x09, 0xC0, 0x26, 0x04,</div><div class='add'>+0x9F, 0x00, 0x7C, 0x0A, 0x30, 0x09, 0x40, 0x66, 0x00, 0x9F, 0x20, 0x7C, 0x02,</div><div class='add'>+0xD0, 0x09, 0x40, 0x25, 0x00, 0x93, 0x00, 0x5D, 0x8A, 0xF0, 0x09, 0xC0, 0xE6,</div><div class='add'>+0x04, 0x9F, 0x00, 0x7C, 0x0E, 0xF0, 0x08, 0x40, 0x14, 0x20, 0x0E, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x14, 0x80, 0x25, 0x00, 0x9F, 0x04, 0x7C, 0x66, 0xF3, 0x88,</div><div class='add'>+0xD1, 0x27, 0x00, 0x9F, 0x00, 0x7C, 0x06, 0xF0, 0x09, 0xC8, 0x27, 0x00, 0x9F,</div><div class='add'>+0x00, 0x7C, 0x26, 0xF0, 0x09, 0xC0, 0x25, 0x00, 0x9F, 0x20, 0x7C, 0x02, 0xF0,</div><div class='add'>+0x09, 0xC0, 0x27, 0x00, 0x8F, 0x00, 0x5C, 0x02, 0xF0, 0x08, 0xC1, 0x25, 0x00,</div><div class='add'>+0x9F, 0x00, 0x7C, 0x02, 0xF0, 0x09, 0xC1, 0x53, 0x00, 0x06, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x14, 0x08, 0x85, 0x02, 0x1F, 0x00, 0x4D, 0x08, 0xF8, 0x21, 0xC0,</div><div class='add'>+0x07, 0x00, 0x1F, 0x00, 0x7C, 0x00, 0xF0, 0x00, 0xC4, 0x07, 0x00, 0x1F, 0x00,</div><div class='add'>+0x7C, 0x08, 0xF0, 0x00, 0xC0, 0x84, 0x00, 0x1F, 0x01, 0x4C, 0x00, 0xF0, 0x01,</div><div class='add'>+0xC0, 0x02, 0x00, 0x13, 0x00, 0x7C, 0x40, 0xF0, 0x01, 0xC0, 0x04, 0x00, 0x1F,</div><div class='add'>+0x00, 0x7C, 0x40, 0x32, 0x01, 0xC0, 0x50, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x14, 0xA0, 0x1C, 0x02, 0x7D, 0x02, 0xC4, 0x01, 0xD0, 0x37, 0xC0, 0x15,</div><div class='add'>+0x00, 0x5D, 0x00, 0x74, 0x01, 0xD0, 0x05, 0x48, 0x5F, 0x00, 0x5F, 0x00, 0x74,</div><div class='add'>+0x01, 0xD0, 0x15, 0x01, 0x14, 0x00, 0x7D, 0x05, 0x45, 0x01, 0xF0, 0x05, 0xC0,</div><div class='add'>+0x1D, 0x00, 0x7F, 0x20, 0xF4, 0x4D, 0xD0, 0x07, 0x40, 0x54, 0x20, 0x5D, 0x00,</div><div class='add'>+0xF4, 0x01, 0x34, 0x07, 0xD0, 0x50, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x14, 0xA0, 0x72, 0x80, 0x8D, 0x10, 0x04, 0x03, 0xD0, 0xBC, 0x40, 0x31, 0x00,</div><div class='add'>+0xDD, 0x00, 0x34, 0x03, 0xD0, 0x0C, 0x40, 0x33, 0x06, 0xCD, 0x00, 0x74, 0x03,</div><div class='add'>+0xD0, 0x18, 0x60, 0x30, 0x00, 0xCD, 0x00, 0x04, 0x03, 0x90, 0x0C, 0x40, 0xB0,</div><div class='add'>+0x01, 0xC1, 0x12, 0x34, 0x0B, 0xD0, 0x34, 0x50, 0x70, 0x00, 0xCD, 0x00, 0x34,</div><div class='add'>+0x03, 0x90, 0x0C, 0x40, 0x50, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05,</div><div class='add'>+0x80, 0x28, 0x01, 0x7D, 0x08, 0x84, 0x43, 0xD0, 0x0E, 0x40, 0x39, 0x00, 0xED,</div><div class='add'>+0x0C, 0xB4, 0x13, 0xDA, 0xCE, 0x40, 0x1B, 0x00, 0xED, 0x08, 0xB4, 0x13, 0xD1,</div><div class='add'>+0x0B, 0x40, 0x38, 0x21, 0x0D, 0x01, 0x86, 0x23, 0xD2, 0x4C, 0x40, 0x21, 0x00,</div><div class='add'>+0x65, 0x10, 0xB0, 0x01, 0xD0, 0x0E, 0x41, 0x38, 0x04, 0xED, 0x00, 0xF4, 0x47,</div><div class='add'>+0x10, 0x0F, 0x40, 0x16, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x10,</div><div class='add'>+0xF8, 0x00, 0xAF, 0x05, 0x8C, 0x07, 0xD0, 0x16, 0xC0, 0x79, 0x00, 0xEF, 0x05,</div><div class='add'>+0xBC, 0x0F, 0xF0, 0x1E, 0xC4, 0x7B, 0x20, 0xED, 0x11, 0xB4, 0x87, 0xD0, 0x0F,</div><div class='add'>+0xC0, 0x78, 0x01, 0x2F, 0x21, 0x8C, 0x57, 0xF0, 0xBE, 0xC4, 0x68, 0x00, 0xE1,</div><div class='add'>+0x01, 0xB0, 0x05, 0xF0, 0x1C, 0xC4, 0x78, 0x00, 0xEF, 0x01, 0xF8, 0x05, 0xB0,</div><div class='add'>+0x1E, 0xD0, 0x54, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xB8, 0x35,</div><div class='add'>+0x00, 0x8F, 0x40, 0x7C, 0x03, 0xF0, 0x05, 0xC0, 0xB5, 0x00, 0xDF, 0x00, 0x7C,</div><div class='add'>+0x03, 0xF1, 0x4D, 0xC1, 0x37, 0x00, 0xD6, 0x44, 0x7C, 0xAB, 0xF0, 0x0D, 0xCC,</div><div class='add'>+0xB7, 0x06, 0x1F, 0x00, 0x6C, 0x03, 0x60, 0x6D, 0xC0, 0x25, 0x00, 0x5F, 0x00,</div><div class='add'>+0x7C, 0x00, 0xF0, 0x0D, 0xC0, 0x37, 0x00, 0xDF, 0x80, 0x7C, 0x03, 0xF0, 0x0D,</div><div class='add'>+0xC0, 0x41, 0x60, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA0, 0x4F, 0x00,</div><div class='add'>+0x23, 0x41, 0xDD, 0x27, 0xF8, 0x8F, 0xC0, 0xFF, 0x04, 0xFB, 0x01, 0xDC, 0x07,</div><div class='add'>+0xF0, 0x9F, 0xC0, 0x6C, 0x02, 0xFF, 0x01, 0xEC, 0x2F, 0xF2, 0x9B, 0xC2, 0x7F,</div><div class='add'>+0x42, 0x33, 0x01, 0xCC, 0x07, 0xF0, 0x1F, 0xC0, 0x48, 0x00, 0xB3, 0x89, 0xAE,</div><div class='add'>+0x25, 0x30, 0x1F, 0xC2, 0x7F, 0x02, 0xFF, 0x01, 0xFC, 0x06, 0xF0, 0x1E, 0xC0,</div><div class='add'>+0x00, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x88, 0x09, 0x00, 0x61,</div><div class='add'>+0x08, 0x85, 0x01, 0xD8, 0x0E, 0x41, 0x3F, 0x00, 0xF1, 0x00, 0x84, 0x03, 0xD2,</div><div class='add'>+0x0F, 0x54, 0x88, 0x20, 0xE7, 0x00, 0x85, 0x23, 0xD0, 0xCA, 0x40, 0x3B, 0x02,</div><div class='add'>+0x21, 0x08, 0xAC, 0x03, 0x70, 0x0F, 0x48, 0x28, 0x00, 0xEB, 0x00, 0x8C, 0x01,</div><div class='add'>+0xB0, 0x4A, 0x40, 0x3B, 0x02, 0xED, 0x00, 0x34, 0x1B, 0xD0, 0x0E, 0x50, 0x54,</div><div class='add'>+0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x29, 0x04, 0x21, 0x02,</div><div class='add'>+0x94, 0xC3, 0xD0, 0x86, 0x40, 0x3B, 0x00, 0xE9, 0x00, 0x94, 0x23, 0xD0, 0x0E,</div><div class='add'>+0x42, 0x38, 0x90, 0xED, 0x00, 0x84, 0x03, 0xD2, 0x0A, 0x00, 0x3F, 0x04, 0x01,</div><div class='add'>+0x00, 0x84, 0x23, 0xD0, 0x0E, 0x40, 0x09, 0x00, 0xA1, 0x40, 0x97, 0x01, 0x12,</div><div class='add'>+0x0E, 0x48, 0x2B, 0x10, 0xED, 0x00, 0xB4, 0x03, 0xD0, 0x0E, 0x40, 0x00, 0x00,</div><div class='add'>+0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x28, 0xA7, 0x01, 0x01, 0x81, 0x44,</div><div class='add'>+0x0E, 0xD0, 0x31, 0x40, 0x33, 0x00, 0xC1, 0x00, 0x04, 0x03, 0xD8, 0x0C, 0x40,</div><div class='add'>+0xB0, 0x08, 0xC5, 0x00, 0x04, 0x13, 0xD0, 0x08, 0x60, 0x33, 0x00, 0x01, 0x00,</div><div class='add'>+0x24, 0x03, 0x58, 0x0C, 0x50, 0x21, 0x00, 0xC9, 0x00, 0x04, 0x40, 0x12, 0x08,</div><div class='add'>+0x40, 0x23, 0x01, 0xCD, 0x00, 0x74, 0x9E, 0xD1, 0x8C, 0x40, 0x10, 0x20, 0x0C,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0xA8, 0xFD, 0x40, 0x33, 0x01, 0x5C, 0x04,</div><div class='add'>+0xD0, 0x19, 0xC0, 0x3F, 0x00, 0xFB, 0x00, 0xD4, 0x03, 0xF0, 0x0F, 0xC0, 0x74,</div><div class='add'>+0x00, 0xFE, 0x00, 0xCC, 0x03, 0xF0, 0x09, 0xC0, 0xBB, 0x80, 0x13, 0x00, 0xCC,</div><div class='add'>+0x03, 0xF0, 0x0F, 0x40, 0x25, 0x00, 0xD3, 0x00, 0x5C, 0x05, 0x10, 0x05, 0xC8,</div><div class='add'>+0x37, 0x00, 0xDF, 0x00, 0x7C, 0x4B, 0xF0, 0x0D, 0xC0, 0x54, 0x20, 0x06, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x27, 0x08, 0x5F, 0x0A, 0x7C, 0x40, 0xF0,</div><div class='add'>+0x29, 0xC1, 0x37, 0x00, 0xDF, 0x80, 0x7C, 0x23, 0xF3, 0x0D, 0xC4, 0xC7, 0x00,</div><div class='add'>+0xC4, 0x80, 0x5C, 0x03, 0xF0, 0x09, 0xC0, 0x37, 0x01, 0x1F, 0x00, 0x7C, 0x03,</div><div class='add'>+0x70, 0x0C, 0xC0, 0x26, 0x00, 0x5F, 0x02, 0x50, 0x05, 0xF0, 0x0D, 0xC0, 0x27,</div><div class='add'>+0x00, 0xDE, 0x40, 0x7C, 0x03, 0xF0, 0x2D, 0xC0, 0x07, 0x00, 0x0C, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x80, 0x08, 0x3F, 0x02, 0x33, 0x20, 0xCC, 0x00, 0x30, 0x0B,</div><div class='add'>+0xC0, 0x3C, 0x00, 0xFE, 0x00, 0xFE, 0x03, 0xB2, 0x0F, 0xC2, 0x7F, 0x05, 0xFF,</div><div class='add'>+0x00, 0xCD, 0x83, 0xF0, 0x0F, 0xC0, 0x3F, 0x00, 0x33, 0x00, 0xFC, 0x03, 0xF0,</div><div class='add'>+0x0F, 0xC2, 0x0E, 0x00, 0x0F, 0x01, 0xCD, 0x01, 0x30, 0x4F, 0xC0, 0x7C, 0x01,</div><div class='add'>+0xEF, 0x00, 0xCC, 0x07, 0x30, 0x1B, 0xC0, 0x00, 0x22, 0x0C, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x81, 0x20, 0x76, 0x20, 0x05, 0x04, 0x44, 0x04, 0x10, 0x39, 0x41,</div><div class='add'>+0x34, 0x00, 0xDD, 0x00, 0x34, 0x03, 0x70, 0x0D, 0x40, 0xA7, 0x80, 0xDD, 0x00,</div><div class='add'>+0x44, 0x03, 0xD0, 0x0D, 0xC0, 0x35, 0x00, 0x11, 0x03, 0x74, 0x03, 0x72, 0x0D,</div><div class='add'>+0x48, 0x45, 0x00, 0x1D, 0x05, 0x04, 0x08, 0x52, 0x0C, 0x40, 0x24, 0x00, 0xDD,</div><div class='add'>+0x00, 0x44, 0x09, 0x10, 0x9C, 0x40, 0x04, 0x02, 0x08, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x01, 0xA0, 0x14, 0x50, 0x11, 0x00, 0x44, 0x06, 0x10, 0x11, 0x60, 0x36,</div><div class='add'>+0x10, 0xDD, 0x00, 0x74, 0x03, 0x10, 0x0D, 0x4A, 0x07, 0x80, 0xDD, 0x00, 0x44,</div><div class='add'>+0x03, 0xD0, 0x09, 0x68, 0x37, 0x00, 0x11, 0x03, 0x74, 0x03, 0xD0, 0x0D, 0x40,</div><div class='add'>+0x44, 0x00, 0x9D, 0x08, 0x44, 0x20, 0x10, 0x0D, 0x40, 0x35, 0x00, 0xDD, 0x00,</div><div class='add'>+0x54, 0x13, 0x50, 0x05, 0x41, 0x04, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x10, 0x22, 0x00, 0x00, 0x51, 0x00, 0x05, 0x04, 0x14, 0x08, 0x50, 0x32, 0x00,</div><div class='add'>+0xCD, 0x00, 0x74, 0x03, 0x50, 0x0C, 0x40, 0x03, 0x00, 0xCD, 0x80, 0x04, 0x03,</div><div class='add'>+0xD0, 0x08, 0x40, 0x34, 0x20, 0x01, 0x00, 0x34, 0x03, 0x52, 0x0C, 0x40, 0x21,</div><div class='add'>+0x10, 0xCD, 0x00, 0x44, 0x00, 0x50, 0x0C, 0x44, 0x20, 0x00, 0xCD, 0x00, 0x45,</div><div class='add'>+0x0B, 0x14, 0x0D, 0x40, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0xB0, 0x32, 0x00, 0x11, 0x00, 0x4D, 0x02, 0x30, 0x01, 0xC2, 0x3E, 0x10, 0xDF,</div><div class='add'>+0x00, 0x74, 0x03, 0x30, 0x0F, 0xC0, 0x17, 0x10, 0xED, 0x00, 0xCC, 0x03, 0xF0,</div><div class='add'>+0x09, 0x88, 0x3F, 0x40, 0x13, 0x40, 0xFC, 0x03, 0xF0, 0x0F, 0xE0, 0x04, 0x20,</div><div class='add'>+0x1F, 0x00, 0x4E, 0x00, 0x30, 0x0D, 0xC0, 0x24, 0x00, 0xDF, 0x00, 0x4C, 0x0B,</div><div class='add'>+0x30, 0x01, 0xC0, 0x00, 0xC0, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0xB8,</div><div class='add'>+0x3F, 0x00, 0x3F, 0x00, 0xFC, 0x02, 0xF1, 0x0B, 0xCA, 0x3D, 0x00, 0xFF, 0x20,</div><div class='add'>+0xFC, 0x03, 0x70, 0x0F, 0xC0, 0x0F, 0x00, 0xFF, 0x00, 0xFC, 0x03, 0xF0, 0x0B,</div><div class='add'>+0xC0, 0x39, 0x00, 0x3F, 0x00, 0xFC, 0x03, 0x40, 0x0F, 0xC0, 0x0D, 0x00, 0x3F,</div><div class='add'>+0x00, 0xFC, 0x00, 0xF0, 0x0F, 0xC8, 0x2F, 0x00, 0xFF, 0x00, 0xFC, 0x13, 0xF0,</div><div class='add'>+0x0F, 0xC0, 0x17, 0x60, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xA0, 0x3F,</div><div class='add'>+0x00, 0xFB, 0x1C, 0xEC, 0x05, 0x30, 0x0B, 0xC0, 0x5F, 0x00, 0xBF, 0x00, 0xEC,</div><div class='add'>+0x03, 0xB0, 0x0F, 0xC1, 0x3F, 0x00, 0x3B, 0x81, 0xEC, 0x33, 0x70, 0x0F, 0xC0,</div><div class='add'>+0x4F, 0x00, 0x2F, 0x01, 0xFC, 0x84, 0xF0, 0x4F, 0x80, 0x7C, 0x00, 0x7B, 0x01,</div><div class='add'>+0xBC, 0x04, 0xF0, 0x13, 0xC2, 0x4E, 0x00, 0xFF, 0x01, 0xFE, 0x00, 0xF0, 0x03,</div><div class='add'>+0x44, 0x0F, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x08, 0xFF, 0x02,</div><div class='add'>+0xF1, 0x02, 0x44, 0x06, 0x14, 0x19, 0x40, 0x26, 0x00, 0x8D, 0x70, 0x74, 0xAF,</div><div class='add'>+0x10, 0x1F, 0x40, 0xFF, 0x00, 0x9D, 0x01, 0x74, 0x3B, 0x10, 0xBF, 0x40, 0x77,</div><div class='add'>+0x00, 0xDD, 0x01, 0x74, 0x07, 0xD0, 0xBF, 0x40, 0x38, 0x05, 0x91, 0x01, 0x74,</div><div class='add'>+0x04, 0xD0, 0x11, 0x40, 0x47, 0x00, 0xDD, 0x00, 0x76, 0x86, 0xD2, 0x19, 0x40,</div><div class='add'>+0x07, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0xA0, 0x33, 0x20, 0xC8,</div><div class='add'>+0x04, 0x64, 0x01, 0x50, 0x08, 0x40, 0x21, 0x00, 0x8D, 0x04, 0x06, 0x03, 0x90,</div><div class='add'>+0x0C, 0x42, 0xB3, 0x00, 0x81, 0x00, 0x34, 0x13, 0x50, 0x0C, 0x60, 0x33, 0x20,</div><div class='add'>+0xCD, 0x80, 0x34, 0x02, 0x52, 0x0C, 0x60, 0x30, 0x40, 0x85, 0x40, 0x16, 0x00,</div><div class='add'>+0xD0, 0x00, 0x42, 0x03, 0x00, 0xC5, 0x80, 0x34, 0x00, 0xD2, 0x00, 0x42, 0x47,</div><div class='add'>+0x80, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xA8, 0x35, 0x00, 0xD1, 0x00,</div><div class='add'>+0x44, 0x02, 0x50, 0x19, 0x40, 0x26, 0x00, 0x9D, 0x23, 0x74, 0x03, 0x50, 0x0D,</div><div class='add'>+0x40, 0x37, 0x00, 0x9C, 0x01, 0x34, 0x03, 0x10, 0x0D, 0x00, 0x37, 0x00, 0xDD,</div><div class='add'>+0x06, 0x74, 0x03, 0xD0, 0x0D, 0x40, 0x30, 0x10, 0x95, 0x00, 0x74, 0x0E, 0xD0,</div><div class='add'>+0x11, 0x40, 0x67, 0x00, 0xDD, 0x00, 0x74, 0x06, 0xC0, 0x19, 0x40, 0x0F, 0x20,</div><div class='add'>+0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA8, 0x37, 0x00, 0xDB, 0x80, 0x2C,</div><div class='add'>+0x12, 0x71, 0x11, 0xC1, 0x17, 0x01, 0x1F, 0x03, 0x4C, 0x03, 0xB0, 0x0D, 0xC0,</div><div class='add'>+0x37, 0x00, 0x13, 0x03, 0x6C, 0x03, 0x72, 0x0D, 0xC8, 0x07, 0x01, 0x1E, 0x00,</div><div class='add'>+0x7C, 0x01, 0xF0, 0x0C, 0xC0, 0x34, 0x00, 0x55, 0x05, 0x7C, 0x04, 0xD0, 0x31,</div><div class='add'>+0xC0, 0x47, 0x01, 0xDF, 0xA0, 0x74, 0x04, 0xF0, 0x19, 0xC1, 0x03, 0x20, 0x0E,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x80, 0x39, 0x00, 0xEF, 0x00, 0xFC, 0x02,</div><div class='add'>+0xB0, 0x03, 0xC0, 0x2F, 0x00, 0xBF, 0x80, 0xBC, 0x03, 0xB0, 0x0F, 0xC0, 0x3F,</div><div class='add'>+0x00, 0x3F, 0x00, 0x7C, 0x03, 0xD0, 0x0F, 0xC0, 0x3F, 0x01, 0xFF, 0x41, 0xFC,</div><div class='add'>+0x03, 0xF0, 0x0F, 0xC1, 0x3F, 0x00, 0xB3, 0x09, 0xF8, 0x02, 0xF0, 0x03, 0xC0,</div><div class='add'>+0x0F, 0x00, 0xFF, 0x00, 0xF8, 0x40, 0xF0, 0x09, 0xC1, 0x1F, 0x00, 0x06, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x02, 0x08, 0x35, 0x00, 0xD7, 0x00, 0x7C, 0x03, 0xF0,</div><div class='add'>+0x29, 0xC0, 0x37, 0x00, 0x1F, 0x22, 0x6C, 0x03, 0x30, 0x8D, 0xC0, 0x37, 0x00,</div><div class='add'>+0x13, 0x46, 0x7C, 0x03, 0xB2, 0x0D, 0xC4, 0x34, 0x00, 0xDF, 0x02, 0x4C, 0x17,</div><div class='add'>+0xB0, 0x8D, 0xC2, 0x37, 0x10, 0x9F, 0x80, 0x7E, 0x08, 0xB4, 0x81, 0xC8, 0x27,</div><div class='add'>+0x11, 0xDF, 0x00, 0x5E, 0x00, 0xF0, 0x29, 0xC0, 0x08, 0x20, 0x04, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x13, 0xA0, 0x3C, 0x00, 0xF1, 0x00, 0x44, 0x12, 0xD0, 0x09,</div><div class='add'>+0x40, 0x27, 0x22, 0x9D, 0xA0, 0xC4, 0x4B, 0x50, 0x1F, 0x40, 0x3F, 0x00, 0x1A,</div><div class='add'>+0x03, 0xF4, 0x03, 0x10, 0x0F, 0x40, 0x74, 0x01, 0xDD, 0x00, 0x44, 0x0B, 0x10,</div><div class='add'>+0x2F, 0x42, 0x37, 0x00, 0x91, 0x0B, 0x74, 0x02, 0x21, 0x01, 0x40, 0xA7, 0x01,</div><div class='add'>+0xDD, 0x00, 0x46, 0x1A, 0x90, 0x29, 0xC0, 0x4E, 0x00, 0x02, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x07, 0xA0, 0x32, 0x00, 0xC5, 0x00, 0x14, 0x13, 0xD0, 0x00, 0x40,</div><div class='add'>+0x32, 0x02, 0x0D, 0x00, 0x24, 0x1F, 0x10, 0x0C, 0x48, 0x33, 0x00, 0x04, 0x00,</div><div class='add'>+0x34, 0x03, 0x90, 0x0C, 0x40, 0x43, 0x01, 0x0D, 0xA0, 0x26, 0x88, 0x10, 0x2C,</div><div class='add'>+0x48, 0x33, 0x00, 0xC4, 0x08, 0x34, 0x00, 0x10, 0x50, 0x48, 0x42, 0x20, 0xC9,</div><div class='add'>+0x80, 0x24, 0x02, 0xD2, 0x20, 0x40, 0x1E, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x04, 0x80, 0x70, 0x00, 0xC1, 0x01, 0x84, 0x06, 0xD0, 0x1E, 0x40, 0x6B,</div><div class='add'>+0x00, 0x6D, 0x01, 0x84, 0x07, 0x50, 0x1E, 0x40, 0x7B, 0x02, 0xAD, 0x29, 0xB4,</div><div class='add'>+0x07, 0x10, 0x1E, 0x40, 0x4B, 0x00, 0x2D, 0x41, 0xB4, 0x07, 0x10, 0x1E, 0x60,</div><div class='add'>+0x7B, 0x22, 0xE1, 0x41, 0xF4, 0x04, 0x90, 0x92, 0x40, 0x7B, 0x00, 0xED, 0x01,</div><div class='add'>+0x84, 0x06, 0x90, 0x12, 0x40, 0x1A, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x12, 0x10, 0x30, 0x00, 0xC7, 0x08, 0x1C, 0x03, 0xD0, 0x04, 0xC0, 0x23, 0x00,</div><div class='add'>+0xCF, 0x00, 0x2E, 0x03, 0x30, 0x0C, 0xE8, 0x33, 0x02, 0x87, 0x12, 0x3C, 0x03,</div><div class='add'>+0xB0, 0x0C, 0xC1, 0x03, 0x20, 0x0D, 0x01, 0x2D, 0x16, 0x30, 0x8C, 0xC0, 0x33,</div><div class='add'>+0x00, 0x87, 0x08, 0x34, 0x06, 0x30, 0x50, 0xC2, 0x13, 0x00, 0xCF, 0x00, 0x3C,</div><div class='add'>+0x03, 0xF0, 0x84, 0xC0, 0x4A, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,</div><div class='add'>+0xB8, 0x3D, 0x00, 0xFC, 0x22, 0xDC, 0x02, 0xF0, 0x0F, 0x80, 0x2F, 0x02, 0xFF,</div><div class='add'>+0x00, 0x9C, 0x63, 0xF0, 0xAF, 0xC0, 0x33, 0x4A, 0x93, 0x00, 0xFC, 0x03, 0xF0,</div><div class='add'>+0x0E, 0xC1, 0x0C, 0x92, 0x1F, 0x80, 0x0C, 0x23, 0x74, 0x0F, 0xC0, 0x77, 0x00,</div><div class='add'>+0xB7, 0x08, 0x7C, 0x02, 0x70, 0x87, 0xE0, 0x3F, 0x00, 0xEF, 0x00, 0xFD, 0x02,</div><div class='add'>+0xF0, 0x0F, 0xC2, 0x0B, 0x60, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0xA0,</div><div class='add'>+0xB7, 0x03, 0xDF, 0x02, 0x7C, 0x02, 0x30, 0x05, 0xC0, 0x37, 0x00, 0x7F, 0x01,</div><div class='add'>+0x6C, 0x03, 0xF0, 0x0D, 0xC0, 0xB7, 0x86, 0x13, 0x01, 0x5C, 0x03, 0x71, 0x5D,</div><div class='add'>+0xC0, 0x40, 0x90, 0x13, 0x00, 0x7C, 0x01, 0x38, 0x0D, 0xC4, 0x37, 0x00, 0xD3,</div><div class='add'>+0x80, 0x7C, 0x02, 0xD0, 0x11, 0xC0, 0x24, 0x80, 0xCF, 0x00, 0x4C, 0x00, 0xF1,</div><div class='add'>+0x01, 0xC0, 0x57, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x88, 0x39,</div><div class='add'>+0x03, 0xED, 0x02, 0xB4, 0x02, 0x10, 0x06, 0x40, 0x2B, 0x00, 0xFD, 0x00, 0x84,</div><div class='add'>+0x93, 0xD0, 0x2E, 0x42, 0x33, 0x21, 0xA1, 0x00, 0x84, 0x13, 0xD0, 0xCE, 0x68,</div><div class='add'>+0x39, 0x30, 0xE1, 0x00, 0xB4, 0x03, 0x10, 0xCE, 0x40, 0x3F, 0x19, 0xE1, 0x20,</div><div class='add'>+0xB4, 0x02, 0xD2, 0x02, 0x44, 0x38, 0x10, 0xED, 0x00, 0x84, 0x00, 0xD0, 0x02,</div><div class='add'>+0x40, 0x4B, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x79, 0x00,</div><div class='add'>+0xED, 0x01, 0x94, 0x07, 0x10, 0x1E, 0x41, 0x7B, 0x08, 0x6D, 0x00, 0xB4, 0x07,</div><div class='add'>+0xD0, 0x5E, 0x40, 0x7B, 0x01, 0xB1, 0x21, 0xB4, 0x27, 0x50, 0x1C, 0x50, 0x3A,</div><div class='add'>+0x00, 0xE1, 0x01, 0x94, 0x07, 0x91, 0x9E, 0x44, 0x3B, 0x03, 0xA1, 0x01, 0xB4,</div><div class='add'>+0x46, 0xD8, 0x13, 0x44, 0x78, 0x00, 0xE5, 0x81, 0x84, 0xC7, 0xD0, 0x1A, 0x40,</div><div class='add'>+0x0F, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x28, 0x33, 0x08, 0xCD,</div><div class='add'>+0x00, 0x34, 0x2E, 0x15, 0x2C, 0x41, 0x23, 0x20, 0xCD, 0x13, 0x04, 0x03, 0xD0,</div><div class='add'>+0x0C, 0x40, 0x33, 0x00, 0xC1, 0x11, 0x24, 0x03, 0xD0, 0x0C, 0x44, 0x37, 0x00,</div><div class='add'>+0xC1, 0x00, 0x34, 0x87, 0x90, 0x0C, 0x40, 0x37, 0x00, 0x81, 0x00, 0x34, 0x47,</div><div class='add'>+0xD0, 0x0C, 0x40, 0x30, 0x00, 0xCD, 0x00, 0x04, 0x87, 0xD0, 0xEC, 0x40, 0x4B,</div><div class='add'>+0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x17, 0xA8, 0x15, 0x00, 0x5F, 0x00,</div><div class='add'>+0xBC, 0x0D, 0x30, 0x07, 0xC0, 0x5F, 0x01, 0x7F, 0x40, 0x7C, 0x01, 0xD0, 0x05,</div><div class='add'>+0xC0, 0x17, 0x10, 0x73, 0x03, 0x7C, 0x01, 0x71, 0x05, 0xC0, 0x9E, 0xC0, 0x73,</div><div class='add'>+0x09, 0x9C, 0x05, 0x91, 0x05, 0xC0, 0x17, 0x00, 0x61, 0x00, 0xF4, 0x01, 0xF0,</div><div class='add'>+0x27, 0x40, 0x1C, 0x80, 0x4F, 0x00, 0xC4, 0x8D, 0xF0, 0x37, 0x40, 0x5F, 0x20,</div><div class='add'>+0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x07, 0x00, 0x1F, 0x00, 0x7C,</div><div class='add'>+0x48, 0xF0, 0x01, 0xC0, 0x87, 0x20, 0x1F, 0x08, 0x7C, 0x00, 0xF0, 0x01, 0xE0,</div><div class='add'>+0x07, 0x40, 0x1F, 0x08, 0x5C, 0x00, 0xF0, 0x01, 0xC0, 0x84, 0x26, 0x1F, 0x8A,</div><div class='add'>+0x7C, 0x20, 0x70, 0x21, 0xC0, 0x07, 0x00, 0x1F, 0x02, 0x7C, 0x08, 0xF2, 0x01,</div><div class='add'>+0xC0, 0x87, 0x39, 0x1F, 0x00, 0x7D, 0x40, 0xF0, 0x01, 0xC0, 0x4B, 0x00, 0x0C,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x08, 0x27, 0x00, 0x9F, 0x00, 0x5C, 0x06,</div><div class='add'>+0x30, 0x09, 0xC0, 0x67, 0x00, 0x83, 0x00, 0x0C, 0x02, 0xB2, 0x09, 0xC8, 0x27,</div><div class='add'>+0x02, 0x9B, 0x05, 0x7C, 0x02, 0xF0, 0x09, 0xC0, 0x27, 0x20, 0x91, 0x00, 0x7C,</div><div class='add'>+0x22, 0xB4, 0x98, 0xC0, 0x25, 0x00, 0x93, 0x40, 0x4C, 0x26, 0x30, 0x09, 0xC1,</div><div class='add'>+0x67, 0x02, 0x9B, 0x00, 0x0C, 0x02, 0x30, 0x39, 0xC0, 0x43, 0x20, 0x0C, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x26, 0x00, 0x9D, 0x00, 0x44, 0x02, 0x14,</div><div class='add'>+0x09, 0xC0, 0x21, 0x02, 0x95, 0x00, 0x44, 0x02, 0x30, 0x09, 0xC0, 0x23, 0x00,</div><div class='add'>+0x90, 0x01, 0x74, 0x02, 0xD0, 0x99, 0x40, 0x27, 0x00, 0x91, 0x04, 0x7C, 0x0E,</div><div class='add'>+0x10, 0x09, 0x40, 0x2C, 0x00, 0x9B, 0x12, 0x2C, 0x0E, 0x14, 0x99, 0x40, 0xE3,</div><div class='add'>+0x40, 0x91, 0x00, 0x44, 0x0A, 0x50, 0x39, 0x48, 0x07, 0x00, 0x08, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x18, 0xA0, 0x24, 0x80, 0x8D, 0x00, 0x54, 0x22, 0x10, 0x09,</div><div class='add'>+0x60, 0x27, 0x00, 0x91, 0x00, 0x44, 0x02, 0x90, 0x09, 0x44, 0x27, 0x00, 0x99,</div><div class='add'>+0x00, 0x70, 0x02, 0xD8, 0x09, 0x40, 0x67, 0x00, 0x95, 0x20, 0x76, 0x0A, 0x18,</div><div class='add'>+0x09, 0x41, 0x25, 0x00, 0x91, 0x08, 0x40, 0x02, 0x10, 0x0D, 0x40, 0x27, 0x04,</div><div class='add'>+0x91, 0x01, 0x44, 0x47, 0x11, 0x29, 0x40, 0x63, 0x00, 0x02, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x10, 0x20, 0xA0, 0x01, 0x8D, 0x04, 0x04, 0x02, 0x10, 0x48, 0x40,</div><div class='add'>+0xA5, 0xA0, 0x85, 0x14, 0x04, 0x02, 0x90, 0x08, 0x40, 0x21, 0x00, 0xC9, 0x00,</div><div class='add'>+0x34, 0x22, 0xD2, 0x08, 0x40, 0x27, 0x00, 0x85, 0x00, 0x74, 0x02, 0x1A, 0x08,</div><div class='add'>+0x40, 0x20, 0x02, 0x99, 0x20, 0x24, 0x03, 0x10, 0x0C, 0x40, 0x27, 0x00, 0x81,</div><div class='add'>+0x01, 0x04, 0x12, 0x50, 0x48, 0x40, 0x43, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x1D, 0xB0, 0x06, 0x00, 0x1D, 0x8A, 0x54, 0x01, 0x31, 0x01, 0xC1, 0x97,</div><div class='add'>+0x00, 0x13, 0x0A, 0x4C, 0x50, 0xB0, 0x41, 0x41, 0x07, 0x05, 0x1B, 0x00, 0x7C,</div><div class='add'>+0x58, 0xD0, 0x41, 0x41, 0x17, 0x00, 0x17, 0x20, 0x7E, 0x00, 0xB0, 0x41, 0xC1,</div><div class='add'>+0xC5, 0x00, 0x13, 0x00, 0x4D, 0x00, 0x30, 0x01, 0xC0, 0x07, 0x00, 0x13, 0x0A,</div><div class='add'>+0x4C, 0x00, 0x33, 0x01, 0xC2, 0x77, 0xC0, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x19, 0xB8, 0x67, 0x02, 0x9F, 0x08, 0xBC, 0x02, 0xD0, 0x0B, 0xC8, 0x2D, 0x01,</div><div class='add'>+0xBF, 0x00, 0x7C, 0x02, 0x70, 0x09, 0xC0, 0x27, 0x00, 0xA6, 0x00, 0x7C, 0x12,</div><div class='add'>+0xF0, 0x09, 0xC0, 0x2F, 0x00, 0xBB, 0x00, 0x9C, 0x82, 0xF0, 0x09, 0xC0, 0xA7,</div><div class='add'>+0x09, 0xBF, 0x60, 0xDC, 0x82, 0xF0, 0x0A, 0xC0, 0x2F, 0x08, 0x97, 0x00, 0xFD,</div><div class='add'>+0x22, 0xF0, 0x8B, 0xC0, 0x67, 0x48, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18,</div><div class='add'>+0xA0, 0x27, 0x05, 0x9F, 0x0C, 0xFC, 0x02, 0xF0, 0x09, 0x40, 0x2F, 0x02, 0x9F,</div><div class='add'>+0x84, 0xF4, 0xD2, 0x70, 0x4B, 0xC0, 0x2C, 0x00, 0xBF, 0x00, 0x7C, 0x22, 0x70,</div><div class='add'>+0x4B, 0xC0, 0x2C, 0x00, 0xB7, 0x20, 0xFC, 0x02, 0xF0, 0x0B, 0xC2, 0x64, 0x03,</div><div class='add'>+0xA5, 0x80, 0xCC, 0x02, 0x71, 0x0B, 0x40, 0x2D, 0x00, 0xBB, 0x20, 0xCC, 0x02,</div><div class='add'>+0xF0, 0x0B, 0x82, 0x64, 0x20, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1C, 0x08,</div><div class='add'>+0x47, 0x05, 0x1D, 0x4C, 0x74, 0x00, 0xC0, 0x01, 0x44, 0x07, 0x20, 0x1D, 0xB4,</div><div class='add'>+0x74, 0x00, 0x70, 0x81, 0x40, 0x84, 0x00, 0x19, 0x80, 0x74, 0xA0, 0xD0, 0x01,</div><div class='add'>+0x44, 0x06, 0x00, 0x13, 0x80, 0x5C, 0x00, 0xD0, 0x01, 0x40, 0x84, 0x10, 0x57,</div><div class='add'>+0x00, 0x4C, 0x00, 0xD0, 0x01, 0xC0, 0x15, 0x20, 0x19, 0x50, 0x6C, 0x00, 0xD0,</div><div class='add'>+0x01, 0x50, 0x70, 0x60, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xA0, 0x23,</div><div class='add'>+0x00, 0x8D, 0x04, 0x34, 0x02, 0xD0, 0x88, 0x40, 0x23, 0x00, 0x8D, 0x0C, 0x34,</div><div class='add'>+0x02, 0x50, 0x08, 0x40, 0x20, 0x02, 0x8D, 0x00, 0x34, 0x02, 0x50, 0x88, 0x48,</div><div class='add'>+0x26, 0x80, 0x8D, 0x00, 0x34, 0x02, 0xD0, 0x88, 0x40, 0xA0, 0x20, 0x85, 0x00,</div><div class='add'>+0x17, 0x82, 0x50, 0x08, 0x40, 0x21, 0x00, 0x8D, 0x00, 0x24, 0x02, 0xD0, 0x08,</div><div class='add'>+0x40, 0x40, 0x80, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0xA8, 0x25, 0x00,</div><div class='add'>+0x9D, 0x00, 0x74, 0x13, 0xD0, 0x09, 0x40, 0xA7, 0x00, 0x9D, 0x10, 0x74, 0x02,</div><div class='add'>+0x50, 0x09, 0x40, 0x24, 0x00, 0xD9, 0x00, 0x74, 0x02, 0xD0, 0x09, 0x40, 0x26,</div><div class='add'>+0x00, 0x91, 0x06, 0x56, 0x02, 0xD0, 0x09, 0x40, 0x24, 0x10, 0x95, 0x08, 0x44,</div><div class='add'>+0x06, 0xD8, 0x19, 0x40, 0x25, 0x00, 0x99, 0x00, 0x64, 0x06, 0xD0, 0x19, 0x00,</div><div class='add'>+0x60, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x28, 0x2D, 0x00, 0x9F,</div><div class='add'>+0x00, 0x7C, 0x06, 0xF0, 0x59, 0xC0, 0xA7, 0x02, 0x9F, 0x03, 0x7C, 0x02, 0x70,</div><div class='add'>+0x09, 0xC4, 0x24, 0x00, 0x9F, 0x05, 0x7C, 0x02, 0x70, 0x09, 0xC0, 0x60, 0x01,</div><div class='add'>+0x9F, 0x00, 0x7C, 0x42, 0xF0, 0x09, 0xC0, 0x24, 0x00, 0x97, 0x00, 0x5C, 0x46,</div><div class='add'>+0x70, 0x59, 0xCE, 0xE5, 0x02, 0x9B, 0x00, 0x6C, 0x4E, 0xF0, 0x19, 0xC1, 0x14,</div><div class='add'>+0x80, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x00, 0x25, 0x00, 0x9F, 0x00,</div><div class='add'>+0x7C, 0x02, 0xF0, 0x29, 0xC0, 0x67, 0x00, 0x9F, 0x04, 0x7C, 0x02, 0xF0, 0x09,</div><div class='add'>+0x50, 0x27, 0x24, 0x9F, 0x09, 0x7C, 0x02, 0xF0, 0x09, 0xC4, 0x65, 0x02, 0x9F,</div><div class='add'>+0x41, 0x78, 0x02, 0xF1, 0x08, 0xD0, 0x27, 0x08, 0x9F, 0x01, 0x78, 0x02, 0xF0,</div><div class='add'>+0x09, 0xC0, 0x67, 0x80, 0x9E, 0x00, 0x78, 0x02, 0xF1, 0x08, 0xC0, 0x53, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x08, 0x05, 0x00, 0x1F, 0x00, 0x5C,</div><div class='add'>+0x00, 0xF8, 0x01, 0xC0, 0x07, 0x00, 0x13, 0x00, 0x7C, 0x00, 0xF0, 0x80, 0xC0,</div><div class='add'>+0x07, 0x00, 0x1F, 0x03, 0x7C, 0x00, 0xD2, 0x00, 0xD0, 0x04, 0x00, 0x1F, 0x12,</div><div class='add'>+0x4C, 0x40, 0xB0, 0x81, 0xC0, 0x04, 0x00, 0x1F, 0x02, 0x7C, 0x18, 0xF0, 0x21,</div><div class='add'>+0xC0, 0x07, 0x04, 0x13, 0x00, 0x4C, 0x18, 0x30, 0x01, 0xC0, 0x53, 0x00, 0x04,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x00, 0x14, 0x00, 0x5D, 0x00, 0xC4, 0x01,</div><div class='add'>+0x70, 0x05, 0x40, 0x9F, 0x08, 0x51, 0x00, 0xF4, 0x6D, 0xD0, 0x15, 0x40, 0x9F,</div><div class='add'>+0x00, 0x7D, 0x10, 0x74, 0x01, 0xD1, 0x15, 0x43, 0x9C, 0x10, 0x7D, 0x00, 0xEC,</div><div class='add'>+0x11, 0x70, 0x37, 0xC8, 0x16, 0x00, 0x6D, 0x10, 0xC5, 0x01, 0xD0, 0x87, 0x40,</div><div class='add'>+0x5F, 0x04, 0x61, 0x18, 0xC4, 0x09, 0xB0, 0x07, 0x40, 0x53, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x14, 0xA0, 0x32, 0x00, 0xCD, 0x00, 0x14, 0x01, 0x50,</div><div class='add'>+0x0C, 0x48, 0xB3, 0x04, 0xC1, 0x00, 0x36, 0x0E, 0xD0, 0x08, 0x40, 0xB3, 0x00,</div><div class='add'>+0xCD, 0x01, 0x34, 0x03, 0xD8, 0x1C, 0x44, 0xB2, 0x81, 0xCD, 0x0B, 0x24, 0x03,</div><div class='add'>+0x50, 0x3C, 0x41, 0x31, 0x00, 0xCD, 0x11, 0x04, 0x0E, 0xD0, 0x2C, 0x40, 0x73,</div><div class='add'>+0x00, 0xC1, 0x40, 0x04, 0x03, 0x10, 0xAC, 0x61, 0x53, 0x00, 0x0A, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x04, 0x80, 0x38, 0x01, 0xED, 0x09, 0x84, 0x01, 0x50, 0x0E,</div><div class='add'>+0x40, 0xFB, 0x40, 0xE1, 0x00, 0xB6, 0x02, 0xD0, 0x0E, 0x40, 0x3B, 0x04, 0xED,</div><div class='add'>+0x20, 0xB4, 0x93, 0xD0, 0x1E, 0x40, 0xAA, 0x08, 0xFD, 0x01, 0xA4, 0x00, 0x51,</div><div class='add'>+0x0E, 0x40, 0x3B, 0x02, 0x2D, 0x00, 0x86, 0x0A, 0xD0, 0x0E, 0x60, 0x7B, 0x08,</div><div class='add'>+0xE1, 0x00, 0x05, 0x87, 0x90, 0x0E, 0x60, 0x13, 0x00, 0x02, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x14, 0x10, 0x78, 0x01, 0xFF, 0x05, 0x9C, 0x05, 0x70, 0x1E, 0xC0,</div><div class='add'>+0x7F, 0x00, 0xE3, 0x0F, 0xBC, 0x06, 0xF0, 0x1A, 0x40, 0x7B, 0x00, 0x2D, 0x01,</div><div class='add'>+0xB4, 0x3F, 0xF0, 0x0C, 0xCC, 0x4A, 0x80, 0xEF, 0x01, 0xAE, 0x04, 0x70, 0x1C,</div><div class='add'>+0xC0, 0x79, 0x05, 0x2D, 0x01, 0x9C, 0x07, 0xE9, 0x1E, 0xC0, 0x7B, 0x40, 0xE1,</div><div class='add'>+0x21, 0x8C, 0x05, 0x30, 0x16, 0xC0, 0x53, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x10, 0xB8, 0x35, 0x00, 0xDF, 0x10, 0x7C, 0x01, 0x70, 0x0D, 0xC0, 0x37,</div><div class='add'>+0x00, 0xDF, 0x04, 0x7C, 0x02, 0xF2, 0x0D, 0xC4, 0x37, 0x00, 0xDF, 0x00, 0x7C,</div><div class='add'>+0x83, 0xF1, 0x0D, 0xC2, 0x25, 0x00, 0xCF, 0x40, 0x7C, 0x00, 0x60, 0x0D, 0xC0,</div><div class='add'>+0xB6, 0x20, 0x1F, 0x00, 0x58, 0x83, 0xFA, 0x09, 0xC0, 0x13, 0x08, 0xCF, 0x00,</div><div class='add'>+0x74, 0x02, 0xF1, 0x05, 0xC0, 0x43, 0x60, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x02, 0xA2, 0x7F, 0x14, 0xFF, 0x01, 0xFC, 0x11, 0xF0, 0x1F, 0xC0, 0x7F, 0x02,</div><div class='add'>+0xFF, 0x09, 0xFC, 0x06, 0x30, 0x9F, 0xC0, 0x7E, 0x02, 0xFF, 0x09, 0xFC, 0x07,</div><div class='add'>+0x70, 0x1F, 0xC8, 0x6F, 0x02, 0xEF, 0x41, 0xDC, 0x24, 0xF0, 0x1E, 0xC0, 0x7C,</div><div class='add'>+0x00, 0x33, 0x09, 0xF8, 0x07, 0xF0, 0x9F, 0xC0, 0x7F, 0x02, 0xFB, 0x41, 0xCC,</div><div class='add'>+0x05, 0x30, 0x97, 0xC4, 0x0B, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15,</div><div class='add'>+0x88, 0x39, 0x00, 0xED, 0x00, 0xB4, 0x41, 0xD1, 0x0E, 0xC0, 0x39, 0x23, 0xED,</div><div class='add'>+0x08, 0xB4, 0x02, 0xB0, 0x8E, 0x08, 0x38, 0x00, 0xED, 0x08, 0xDC, 0x23, 0x30,</div><div class='add'>+0x4E, 0x44, 0x6B, 0x2A, 0xC9, 0xC0, 0x10, 0x20, 0xD0, 0x82, 0x40, 0x39, 0x00,</div><div class='add'>+0x2D, 0x0C, 0x34, 0x07, 0xD0, 0x04, 0x00, 0x3B, 0x07, 0xE7, 0x08, 0xAC, 0x29,</div><div class='add'>+0x30, 0xAE, 0xC0, 0x55, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x79, 0x00, 0xED, 0x00, 0xB4, 0x21, 0xD0, 0x0E, 0x40, 0x1B, 0x24, 0xED, 0x40,</div><div class='add'>+0x96, 0x02, 0x90, 0x8E, 0x48, 0x29, 0x08, 0x2D, 0x00, 0x90, 0x03, 0x50, 0x0A,</div><div class='add'>+0x48, 0x0B, 0x07, 0x65, 0x18, 0x94, 0x40, 0xD0, 0x0E, 0x40, 0x31, 0x00, 0x2D,</div><div class='add'>+0x80, 0xB4, 0x43, 0xD0, 0x0E, 0x48, 0x2B, 0x00, 0x65, 0x00, 0x84, 0x01, 0x90,</div><div class='add'>+0x82, 0x40, 0x63, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x28, 0x33,</div><div class='add'>+0x00, 0xCD, 0x00, 0x34, 0x0D, 0xD0, 0x2C, 0x40, 0xE1, 0x04, 0xCD, 0x02, 0x34,</div><div class='add'>+0x02, 0x80, 0x0C, 0x50, 0x21, 0x10, 0xCD, 0x12, 0x14, 0x03, 0x10, 0x08, 0x40,</div><div class='add'>+0x63, 0x11, 0x49, 0x01, 0x04, 0x0C, 0xC0, 0x00, 0x42, 0x31, 0x00, 0x0D, 0x00,</div><div class='add'>+0x34, 0x4B, 0xD8, 0x90, 0x42, 0x73, 0x01, 0x45, 0x00, 0x24, 0x2E, 0x14, 0x18,</div><div class='add'>+0x40, 0x19, 0x20, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0xA8, 0x35, 0x00,</div><div class='add'>+0xFF, 0x00, 0x3C, 0x0F, 0xF0, 0x2D, 0xC1, 0x83, 0x00, 0xFF, 0x05, 0x5E, 0x03,</div><div class='add'>+0xB0, 0x08, 0xC0, 0x35, 0x00, 0xCF, 0x81, 0xDC, 0x83, 0x70, 0x09, 0xC2, 0x23,</div><div class='add'>+0x10, 0xD7, 0x00, 0x5C, 0x00, 0xF0, 0x0D, 0xC0, 0x3D, 0x08, 0x17, 0x18, 0x74,</div><div class='add'>+0x03, 0xF0, 0x39, 0x68, 0x37, 0x10, 0xD7, 0x00, 0x4C, 0x82, 0xB8, 0x59, 0xC0,</div><div class='add'>+0x77, 0x21, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x37, 0x00, 0xDF,</div><div class='add'>+0x40, 0x7C, 0x11, 0xF0, 0x4D, 0xC2, 0x87, 0x00, 0xDF, 0x00, 0x7C, 0x0A, 0xF1,</div><div class='add'>+0x0D, 0x40, 0xB4, 0x00, 0xDF, 0x01, 0x5C, 0x03, 0x70, 0x0D, 0x82, 0xA7, 0x00,</div><div class='add'>+0xDC, 0x44, 0x7C, 0x00, 0xF2, 0x0D, 0xC0, 0x33, 0x00, 0x16, 0x20, 0x7C, 0x03,</div><div class='add'>+0xF0, 0x09, 0xC5, 0x36, 0x00, 0xD7, 0x00, 0x7C, 0x02, 0xF0, 0x09, 0xC9, 0x07,</div><div class='add'>+0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x08, 0x3F, 0x00, 0xFB, 0x00,</div><div class='add'>+0xFC, 0x0B, 0x30, 0x0E, 0xC0, 0x2C, 0x00, 0xF3, 0x10, 0xFC, 0x27, 0xF0, 0x09,</div><div class='add'>+0xC0, 0x38, 0x40, 0x33, 0x05, 0xCC, 0x03, 0xF0, 0x0A, 0xC0, 0x0C, 0x00, 0xF3,</div><div class='add'>+0xA0, 0xE8, 0xC0, 0x30, 0x13, 0xC0, 0x3F, 0x00, 0x3B, 0x01, 0xCC, 0x05, 0xF0,</div><div class='add'>+0x03, 0xC2, 0x3D, 0x00, 0xFB, 0x01, 0x7C, 0x42, 0xF0, 0x02, 0x40, 0x04, 0x28,</div><div class='add'>+0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x81, 0x20, 0x36, 0x00, 0xD1, 0x00, 0x74,</div><div class='add'>+0x02, 0x14, 0x0D, 0x60, 0x64, 0x81, 0xD5, 0x00, 0x74, 0x0E, 0xD0, 0x0D, 0x40,</div><div class='add'>+0x35, 0x81, 0xD1, 0x23, 0x4C, 0x03, 0x30, 0x0D, 0x40, 0xE5, 0x00, 0xC1, 0x00,</div><div class='add'>+0x10, 0x20, 0xB0, 0x51, 0x40, 0x37, 0x00, 0x05, 0x43, 0x44, 0x15, 0xD0, 0x11,</div><div class='add'>+0x43, 0x13, 0x00, 0xD1, 0x00, 0x7C, 0x0E, 0xD1, 0x31, 0x50, 0x04, 0x06, 0x08,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xA0, 0x32, 0x00, 0xD9, 0x00, 0x74, 0x03,</div><div class='add'>+0x92, 0x0D, 0x50, 0x44, 0x08, 0xD1, 0x00, 0x74, 0xC3, 0xDA, 0x0D, 0x00, 0x14,</div><div class='add'>+0x20, 0x11, 0x40, 0x64, 0x03, 0xD0, 0x49, 0x40, 0xC4, 0x00, 0x91, 0x08, 0x74,</div><div class='add'>+0x40, 0x90, 0x4D, 0x40, 0x37, 0x00, 0x15, 0x14, 0x64, 0x23, 0xD1, 0x19, 0x04,</div><div class='add'>+0x37, 0x00, 0x91, 0x04, 0x74, 0x04, 0xD9, 0x19, 0x40, 0x05, 0x00, 0x0A, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x10, 0x20, 0x30, 0x00, 0xC1, 0x00, 0x74, 0x01, 0x90,</div><div class='add'>+0x0C, 0x40, 0x04, 0x00, 0xC5, 0x00, 0x34, 0x01, 0xD0, 0x0C, 0x40, 0x11, 0x10,</div><div class='add'>+0x01, 0x00, 0x24, 0x03, 0x50, 0x0C, 0x46, 0x05, 0xE1, 0x91, 0x02, 0x54, 0x20,</div><div class='add'>+0x90, 0x00, 0x40, 0x33, 0x00, 0x15, 0x00, 0x05, 0xB3, 0xD8, 0x00, 0x00, 0x33,</div><div class='add'>+0xC0, 0x81, 0x40, 0x24, 0x00, 0xD0, 0x08, 0x60, 0x40, 0x80, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x90, 0x3E, 0x00, 0xFB, 0x00, 0x7C, 0x03, 0xB0, 0x0D,</div><div class='add'>+0x40, 0x04, 0x00, 0xF1, 0x00, 0x7C, 0x03, 0xF0, 0x0D, 0xC0, 0x04, 0x00, 0x11,</div><div class='add'>+0x00, 0xEC, 0x03, 0xF0, 0x09, 0xC0, 0x04, 0x05, 0x13, 0x02, 0x6C, 0x00, 0xB0,</div><div class='add'>+0x01, 0x40, 0x3F, 0x00, 0x17, 0x00, 0x6C, 0x03, 0xF2, 0xA1, 0xC0, 0x27, 0x00,</div><div class='add'>+0x43, 0x00, 0x7C, 0x02, 0xF0, 0x09, 0xC8, 0x05, 0x40, 0x08, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x05, 0xB8, 0x3F, 0x00, 0xFF, 0x00, 0xFC, 0x02, 0x70, 0x0F, 0xC0,</div><div class='add'>+0x2F, 0x00, 0xFF, 0x00, 0xBC, 0x01, 0xF0, 0x0F, 0xC0, 0x0F, 0x00, 0x3F, 0x00,</div><div class='add'>+0xD0, 0x03, 0x30, 0x0B, 0xC0, 0x07, 0x10, 0x3F, 0x80, 0xEC, 0x90, 0xF0, 0x03,</div><div class='add'>+0xC0, 0x3F, 0x00, 0x3C, 0x00, 0x7C, 0x1B, 0xF0, 0x43, 0xC0, 0x3F, 0x00, 0x7F,</div><div class='add'>+0x00, 0xDC, 0x02, 0xF0, 0x0B, 0xC8, 0x17, 0x60, 0x06, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x03, 0x80, 0x0F, 0x06, 0xAF, 0x00, 0xEC, 0x02, 0xE0, 0x1E, 0xC0, 0x0F,</div><div class='add'>+0x05, 0xFB, 0x0C, 0xFC, 0x50, 0x30, 0x43, 0xC0, 0x2C, 0x01, 0x33, 0x00, 0xCC,</div><div class='add'>+0x03, 0x30, 0x1F, 0xC0, 0x0F, 0x05, 0x23, 0x01, 0xEC, 0x03, 0xB0, 0x13, 0xC0,</div><div class='add'>+0x3F, 0x01, 0x3B, 0x01, 0xC4, 0x06, 0xB6, 0x83, 0xC0, 0x0D, 0x03, 0x37, 0x00,</div><div class='add'>+0xAC, 0x27, 0x30, 0x1E, 0xC0, 0x0E, 0x20, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x01, 0x10, 0x87, 0x01, 0x9D, 0x01, 0x44, 0x00, 0xD0, 0x0D, 0x40, 0x83, 0x00,</div><div class='add'>+0xF1, 0x08, 0x74, 0x10, 0x10, 0x09, 0x40, 0xB4, 0x07, 0x55, 0x10, 0x84, 0x2B,</div><div class='add'>+0x10, 0x41, 0xC3, 0x44, 0x00, 0x11, 0x01, 0xC4, 0x07, 0xB0, 0x15, 0xC0, 0xBD,</div><div class='add'>+0x12, 0xD1, 0x01, 0x44, 0x42, 0x10, 0xE1, 0x40, 0x90, 0x03, 0x11, 0x23, 0x44,</div><div class='add'>+0x12, 0x10, 0x11, 0x40, 0x0C, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11,</div><div class='add'>+0xA0, 0x03, 0x00, 0x8D, 0x80, 0x14, 0x06, 0xC0, 0x0C, 0x40, 0x01, 0x00, 0xC9,</div><div class='add'>+0x04, 0x36, 0x40, 0x10, 0x64, 0x49, 0x20, 0x09, 0x01, 0x08, 0x04, 0xC3, 0x10,</div><div class='add'>+0x44, 0x40, 0x13, 0x00, 0x01, 0x00, 0x14, 0x0B, 0x98, 0x08, 0x42, 0x33, 0x95,</div><div class='add'>+0x15, 0x00, 0x64, 0x13, 0x10, 0x48, 0x48, 0x01, 0x00, 0x05, 0x82, 0x76, 0x11,</div><div class='add'>+0x11, 0x0C, 0x50, 0x4C, 0x80, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xA0,</div><div class='add'>+0x45, 0x00, 0xDD, 0x22, 0x54, 0x04, 0xD1, 0x0D, 0x40, 0x47, 0x10, 0xD1, 0x00,</div><div class='add'>+0x74, 0x09, 0x10, 0x0D, 0x40, 0x34, 0x00, 0xD5, 0x10, 0x44, 0x03, 0x10, 0x21,</div><div class='add'>+0x40, 0x84, 0x00, 0x11, 0x01, 0x54, 0x03, 0x80, 0x0D, 0x42, 0x35, 0x00, 0x15,</div><div class='add'>+0x10, 0x64, 0x02, 0x10, 0x09, 0x44, 0x25, 0x04, 0xD5, 0x14, 0x54, 0x03, 0x10,</div><div class='add'>+0x09, 0x00, 0x0C, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xA8, 0x47,</div><div class='add'>+0x00, 0x9F, 0x09, 0x7D, 0x04, 0xF0, 0x9D, 0xC0, 0xC7, 0x20, 0xDB, 0x80, 0x7C,</div><div class='add'>+0x09, 0x31, 0x51, 0xC0, 0x64, 0x02, 0x13, 0x02, 0x4C, 0x03, 0x30, 0x2D, 0xC0,</div><div class='add'>+0xC7, 0x42, 0x13, 0x01, 0x7C, 0x03, 0xB0, 0x89, 0xC0, 0x37, 0x00, 0x9F, 0x02,</div><div class='add'>+0x2D, 0x02, 0xB1, 0xB5, 0xC0, 0x85, 0x00, 0x05, 0x03, 0x7C, 0x6F, 0x24, 0x1C,</div><div class='add'>+0x80, 0x8A, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x80, 0x0D, 0x00,</div><div class='add'>+0xAF, 0x00, 0xEC, 0x00, 0xF0, 0x0F, 0xC0, 0x0B, 0x10, 0xFF, 0x00, 0xBC, 0x02,</div><div class='add'>+0xF2, 0x91, 0xC0, 0x7B, 0x00, 0x2F, 0x00, 0xBC, 0x03, 0xF0, 0x57, 0xC0, 0x2D,</div><div class='add'>+0x00, 0x3E, 0x00, 0xAC, 0x83, 0xF0, 0x0B, 0xC8, 0x3B, 0x00, 0xFB, 0x49, 0xDC,</div><div class='add'>+0x02, 0xD0, 0x12, 0xC0, 0x1A, 0x40, 0xFB, 0x00, 0xEC, 0x03, 0xF4, 0x5F, 0xC0,</div><div class='add'>+0x1F, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x08, 0x05, 0x80, 0x9F,</div><div class='add'>+0x07, 0x6C, 0x02, 0x70, 0x8D, 0xC0, 0x06, 0x00, 0xD3, 0x20, 0x5E, 0x09, 0x38,</div><div class='add'>+0x00, 0xC0, 0x24, 0x02, 0x5F, 0x00, 0x4C, 0x03, 0x30, 0x0D, 0xC0, 0x93, 0x00,</div><div class='add'>+0x1F, 0x06, 0x4C, 0x63, 0x30, 0x09, 0xC0, 0x34, 0x20, 0x1B, 0x20, 0x4E, 0x03,</div><div class='add'>+0xF1, 0x0D, 0xC0, 0x96, 0x0A, 0x17, 0x02, 0x6C, 0x43, 0x30, 0x0D, 0xC0, 0x28,</div><div class='add'>+0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0xA0, 0x44, 0x86, 0xDD, 0xC2,</div><div class='add'>+0x44, 0xE8, 0x12, 0x1D, 0x40, 0x04, 0x00, 0xF1, 0x00, 0x6C, 0x03, 0x31, 0x01,</div><div class='add'>+0x40, 0xF4, 0x02, 0xDD, 0x04, 0xC4, 0x03, 0x10, 0x05, 0xC6, 0xE7, 0x81, 0x0F,</div><div class='add'>+0x40, 0xD0, 0x0B, 0xB1, 0x1D, 0x40, 0x3D, 0x00, 0x41, 0x00, 0x4C, 0x02, 0x70,</div><div class='add'>+0x09, 0x44, 0x34, 0x12, 0xDB, 0x1B, 0x08, 0x43, 0x10, 0x7D, 0x40, 0x4D, 0x00,</div><div class='add'>+0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x20, 0x02, 0x30, 0x0D, 0x00, 0x04,</div><div class='add'>+0x06, 0x10, 0x58, 0x50, 0x00, 0x00, 0xC1, 0x00, 0x24, 0x02, 0x90, 0x00, 0x40,</div><div class='add'>+0x30, 0x00, 0x8D, 0x01, 0x04, 0x27, 0x10, 0x09, 0x40, 0x23, 0x21, 0x09, 0x42,</div><div class='add'>+0x04, 0x0F, 0x50, 0xF4, 0x48, 0x30, 0x10, 0x41, 0x00, 0x06, 0x02, 0xDA, 0x00,</div><div class='add'>+0x00, 0x62, 0x40, 0xCC, 0x03, 0x01, 0x07, 0x58, 0x7C, 0x40, 0x0C, 0x20, 0x08,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x4A, 0x00, 0x6D, 0x01, 0x84, 0x07,</div><div class='add'>+0x12, 0x1F, 0x44, 0x48, 0x00, 0xE1, 0x01, 0x24, 0x04, 0x10, 0x9A, 0x40, 0x78,</div><div class='add'>+0x80, 0x4D, 0x01, 0x84, 0x27, 0x10, 0x1A, 0x42, 0x59, 0x00, 0x35, 0x01, 0x94,</div><div class='add'>+0x03, 0xDC, 0x16, 0x60, 0x71, 0x02, 0xE1, 0x01, 0x84, 0x06, 0x50, 0x94, 0x40,</div><div class='add'>+0x78, 0x83, 0xE9, 0x09, 0xC4, 0x27, 0x50, 0x16, 0x40, 0x35, 0x20, 0x08, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x82, 0x00, 0x8D, 0x00, 0x4C, 0x23, 0x70,</div><div class='add'>+0x88, 0xC0, 0x80, 0x42, 0xD3, 0x00, 0x34, 0x02, 0x90, 0x84, 0xC4, 0x30, 0x00,</div><div class='add'>+0x8D, 0x00, 0x0C, 0x03, 0x30, 0x44, 0x40, 0x33, 0x01, 0x0D, 0x08, 0x0C, 0x13,</div><div class='add'>+0x50, 0x04, 0x40, 0x30, 0x00, 0x03, 0x08, 0x0C, 0x83, 0xF0, 0xA0, 0xD0, 0x02,</div><div class='add'>+0x01, 0x07, 0x88, 0x0C, 0x23, 0x70, 0x4C, 0xC0, 0x48, 0x40, 0x08, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x02, 0xB8, 0x0D, 0x00, 0xFF, 0x08, 0xDE, 0x03, 0xF4, 0x0F,</div><div class='add'>+0xC2, 0x0D, 0x00, 0xFF, 0x00, 0xFC, 0x01, 0xF0, 0x8F, 0xC2, 0x3F, 0x00, 0xFF,</div><div class='add'>+0x40, 0xFC, 0x03, 0xF0, 0x03, 0xC0, 0x1F, 0x00, 0x3F, 0x08, 0xBC, 0x1B, 0x30,</div><div class='add'>+0x8E, 0xC0, 0x3F, 0x00, 0xA7, 0xA0, 0xFD, 0x02, 0xF0, 0x87, 0xC0, 0x2F, 0x41,</div><div class='add'>+0xEF, 0x08, 0x7C, 0x23, 0xB0, 0x0D, 0xC4, 0x0B, 0x20, 0x06, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x10, 0xA8, 0x0F, 0x00, 0x1F, 0x00, 0x4C, 0x01, 0xE1, 0x09, 0xC0,</div><div class='add'>+0x07, 0x08, 0xDF, 0x06, 0x5C, 0x03, 0xF0, 0x1D, 0xC0, 0x34, 0x00, 0x93, 0x00,</div><div class='add'>+0x4C, 0x27, 0x30, 0x09, 0xC0, 0x27, 0x00, 0x1B, 0x00, 0x7C, 0x23, 0xF8, 0x11,</div><div class='add'>+0xC0, 0x36, 0x03, 0xDB, 0x00, 0x7C, 0x02, 0xF0, 0x1D, 0xC0, 0x24, 0x00, 0x13,</div><div class='add'>+0x20, 0x4D, 0x03, 0x30, 0x0D, 0xC0, 0x43, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x12, 0x98, 0x29, 0x00, 0x6D, 0x00, 0x84, 0x03, 0xD0, 0x0E, 0x40, 0x0B,</div><div class='add'>+0x00, 0xFD, 0x12, 0x84, 0x02, 0xD0, 0x0F, 0x48, 0x38, 0x00, 0x21, 0x00, 0x04,</div><div class='add'>+0x33, 0x14, 0x0A, 0x40, 0x3B, 0x40, 0x22, 0x00, 0xB4, 0x13, 0xD0, 0x0A, 0x40,</div><div class='add'>+0x3C, 0x02, 0xE1, 0x00, 0xB4, 0x02, 0xD0, 0x0E, 0x52, 0x3D, 0x00, 0xC5, 0x00,</div><div class='add'>+0x84, 0x02, 0x10, 0x0E, 0x40, 0x4F, 0x60, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x04, 0x00, 0xF9, 0x00, 0x8D, 0x01, 0x94, 0x0F, 0xD0, 0x1A, 0x40, 0x5B, 0x08,</div><div class='add'>+0xED, 0x01, 0x94, 0x07, 0xD0, 0x3E, 0x40, 0x78, 0x40, 0xC1, 0x11, 0xA5, 0x07,</div><div class='add'>+0x18, 0x1E, 0x40, 0x73, 0x00, 0x21, 0x01, 0xB4, 0x07, 0x50, 0x17, 0x46, 0x79,</div><div class='add'>+0x01, 0xE9, 0x01, 0xB4, 0x07, 0xD2, 0x1C, 0x70, 0x58, 0x00, 0x21, 0x01, 0x86,</div><div class='add'>+0x47, 0x10, 0x1E, 0x41, 0x13, 0x08, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16,</div><div class='add'>+0x20, 0xB3, 0x00, 0xCD, 0x00, 0x14, 0x03, 0xD0, 0x0C, 0x40, 0xB7, 0x00, 0xCD,</div><div class='add'>+0x00, 0x04, 0x17, 0xD8, 0x0C, 0x40, 0x34, 0x00, 0xC1, 0x00, 0x24, 0x03, 0x10,</div><div class='add'>+0x2C, 0x40, 0xB3, 0x01, 0xC1, 0x07, 0x34, 0x03, 0xD8, 0x2C, 0x40, 0x31, 0x00,</div><div class='add'>+0xC1, 0x48, 0x74, 0x02, 0xD0, 0x2C, 0x64, 0x71, 0x80, 0xC5, 0x0B, 0x04, 0x9B,</div><div class='add'>+0x12, 0x3C, 0x60, 0x5B, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x17, 0xA0,</div><div class='add'>+0x1F, 0x00, 0x6F, 0x00, 0xDD, 0x0D, 0xF0, 0x05, 0xC0, 0x1F, 0x00, 0x5F, 0x00,</div><div class='add'>+0xDC, 0x49, 0xF0, 0x07, 0xD0, 0x14, 0x00, 0x73, 0x01, 0x6C, 0x01, 0x30, 0xD7,</div><div class='add'>+0xC0, 0x9B, 0x40, 0x73, 0x11, 0x7C, 0x01, 0xF0, 0xB7, 0x54, 0x17, 0x00, 0x7B,</div><div class='add'>+0x02, 0x7C, 0x01, 0xF0, 0x47, 0xC0, 0x5C, 0x09, 0x73, 0x80, 0x8C, 0x05, 0x35,</div><div class='add'>+0x06, 0xC0, 0x5F, 0x20, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x80, 0x05,</div><div class='add'>+0x00, 0x1F, 0x00, 0x6C, 0x98, 0xF2, 0x01, 0xC0, 0x07, 0x04, 0x0F, 0x00, 0x7C,</div><div class='add'>+0x00, 0xF0, 0x41, 0xC0, 0x07, 0x08, 0x0F, 0x02, 0x5C, 0x80, 0xF0, 0x01, 0xC0,</div><div class='add'>+0x07, 0x00, 0x1F, 0x82, 0x7C, 0x80, 0xF0, 0x81, 0xC0, 0x04, 0x00, 0x1F, 0x04,</div><div class='add'>+0x7C, 0x00, 0xB8, 0x01, 0xC1, 0x07, 0x00, 0x0F, 0x12, 0x7C, 0x00, 0xF0, 0x21,</div><div class='add'>+0xC5, 0x4B, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x61, 0x04,</div><div class='add'>+0x93, 0x00, 0x0D, 0x0E, 0x30, 0x19, 0xC0, 0x27, 0x00, 0x93, 0x00, 0x1C, 0x02,</div><div class='add'>+0xB4, 0x09, 0xC0, 0x27, 0x00, 0x93, 0x00, 0x4D, 0x02, 0xF0, 0x09, 0xC8, 0x27,</div><div class='add'>+0x02, 0x9F, 0x40, 0x7C, 0x02, 0xF2, 0x89, 0xC0, 0x27, 0x00, 0x97, 0x00, 0x7C,</div><div class='add'>+0x02, 0x30, 0x09, 0xC8, 0x23, 0x20, 0x9B, 0x01, 0x4D, 0x22, 0x70, 0x19, 0xC2,</div><div class='add'>+0x41, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x20, 0x26, 0x02, 0x95,</div><div class='add'>+0x02, 0x44, 0x0E, 0x14, 0x09, 0x42, 0x27, 0x00, 0x91, 0x00, 0x44, 0x02, 0x10,</div><div class='add'>+0x09, 0x48, 0x27, 0x08, 0x91, 0x12, 0x44, 0x42, 0xD0, 0x09, 0x44, 0x67, 0x10,</div><div class='add'>+0x91, 0x00, 0x74, 0x46, 0xD0, 0x39, 0xE0, 0x25, 0x00, 0x93, 0x00, 0x5C, 0x02,</div><div class='add'>+0x50, 0x09, 0x40, 0x27, 0x00, 0x91, 0x03, 0x4C, 0x02, 0x10, 0xA9, 0x40, 0x04,</div><div class='add'>+0x08, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xA0, 0x24, 0x00, 0x91, 0x02,</div><div class='add'>+0x44, 0x02, 0x90, 0x89, 0x40, 0x27, 0x00, 0x91, 0x00, 0x54, 0x02, 0x10, 0x09,</div><div class='add'>+0x40, 0x27, 0x00, 0x9D, 0x40, 0x44, 0x02, 0xD0, 0x09, 0x40, 0x27, 0x20, 0xD5,</div><div class='add'>+0x00, 0x74, 0x12, 0xD8, 0x0D, 0x45, 0x23, 0x00, 0x95, 0x00, 0x74, 0x02, 0x10,</div><div class='add'>+0x09, 0x40, 0x27, 0x40, 0x99, 0x88, 0x44, 0x42, 0x50, 0x09, 0x42, 0x71, 0x00,</div><div class='add'>+0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x28, 0x20, 0x01, 0x85, 0x04, 0x04,</div><div class='add'>+0x1B, 0x90, 0x28, 0x40, 0x23, 0x41, 0x81, 0x0C, 0x04, 0x12, 0x10, 0x48, 0x40,</div><div class='add'>+0x23, 0x01, 0x8D, 0x04, 0x06, 0x12, 0xD0, 0x88, 0x40, 0x23, 0x01, 0xC1, 0x00,</div><div class='add'>+0x36, 0x02, 0xD0, 0x08, 0x44, 0x23, 0x03, 0x81, 0x00, 0x14, 0x02, 0x50, 0x08,</div><div class='add'>+0x44, 0x23, 0x02, 0xC9, 0x00, 0x44, 0x22, 0x10, 0x0D, 0x60, 0x50, 0xA8, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xB0, 0x86, 0x02, 0x13, 0x00, 0x4C, 0x08,</div><div class='add'>+0xB0, 0x25, 0xC0, 0x87, 0x02, 0x13, 0x02, 0x5C, 0x28, 0x30, 0xA1, 0xC0, 0x83,</div><div class='add'>+0x42, 0x1F, 0x0A, 0x44, 0x28, 0xD0, 0x21, 0x00, 0x17, 0x00, 0x1F, 0x40, 0x7C,</div><div class='add'>+0x50, 0xF0, 0x01, 0x40, 0x87, 0x00, 0x17, 0x00, 0x7C, 0x28, 0x30, 0xE1, 0xC1,</div><div class='add'>+0x87, 0x45, 0x1B, 0x14, 0x0C, 0x08, 0x70, 0x01, 0xC0, 0x75, 0xC0, 0x0A, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x19, 0xA8, 0x2F, 0x12, 0xBF, 0x08, 0xFC, 0x0A, 0x70,</div><div class='add'>+0x0B, 0xC2, 0x2F, 0x02, 0x9F, 0x0C, 0xFC, 0x22, 0xF0, 0x8B, 0xC0, 0x2F, 0x02,</div><div class='add'>+0xB3, 0x08, 0x7C, 0x22, 0xF2, 0x4F, 0xC0, 0x2F, 0x22, 0xBF, 0x00, 0x7C, 0x02,</div><div class='add'>+0xF0, 0x0A, 0xC0, 0x25, 0x03, 0xB6, 0x00, 0xD8, 0x02, 0xF0, 0x0B, 0xC0, 0x3F,</div><div class='add'>+0x41, 0xB7, 0x00, 0xDC, 0x12, 0xF4, 0x0F, 0xC0, 0x67, 0x20, 0x0E, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x18, 0xA0, 0x2F, 0x05, 0xBF, 0x04, 0xCC, 0x02, 0xF0, 0x0B,</div><div class='add'>+0xC0, 0x33, 0x02, 0x93, 0x04, 0x7C, 0xD2, 0xB0, 0xC9, 0xC0, 0x2C, 0x00, 0xB3,</div><div class='add'>+0x00, 0xCC, 0x22, 0x34, 0x09, 0xC0, 0x28, 0x05, 0xBB, 0x00, 0xDC, 0x02, 0xB0,</div><div class='add'>+0x0B, 0xC0, 0x27, 0x02, 0xB3, 0x20, 0x5C, 0x8A, 0xF2, 0x49, 0xC2, 0x2D, 0x40,</div><div class='add'>+0xBE, 0x00, 0xCC, 0x02, 0x30, 0x0A, 0xD0, 0x60, 0x00, 0x0E, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x1C, 0x18, 0x15, 0x01, 0x1D, 0x08, 0x45, 0xC8, 0xD0, 0x01, 0x49,</div><div class='add'>+0x07, 0x02, 0x11, 0x14, 0x30, 0x10, 0x00, 0xC1, 0x42, 0x84, 0x04, 0x01, 0x10,</div><div class='add'>+0x44, 0x20, 0x11, 0x41, 0x83, 0x05, 0x20, 0x57, 0x40, 0x5C, 0x08, 0x01, 0x01,</div><div class='add'>+0x40, 0x03, 0x02, 0x11, 0x00, 0x64, 0x14, 0xD0, 0xD1, 0x41, 0x81, 0x44, 0x55,</div><div class='add'>+0x00, 0x04, 0x01, 0x50, 0x01, 0x40, 0x70, 0x60, 0x04, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x12, 0x20, 0x31, 0x05, 0x8D, 0x00, 0x34, 0xB2, 0xD0, 0x08, 0x40, 0x23,</div><div class='add'>+0x00, 0x81, 0x2C, 0x34, 0x52, 0x98, 0x48, 0x48, 0x20, 0x03, 0x81, 0xC8, 0x04,</div><div class='add'>+0x02, 0x10, 0x49, 0x04, 0x20, 0x10, 0x81, 0x00, 0x14, 0x22, 0xD1, 0x08, 0x40,</div><div class='add'>+0x23, 0x20, 0x81, 0x00, 0x16, 0x12, 0xD0, 0x08, 0x40, 0x21, 0x4B, 0x8D, 0xC0,</div><div class='add'>+0x45, 0x02, 0x12, 0x09, 0x40, 0x48, 0x80, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x18, 0x00, 0x25, 0x01, 0x9D, 0x03, 0x74, 0x0A, 0xD2, 0x09, 0x40, 0xA3, 0x40,</div><div class='add'>+0x91, 0x40, 0x74, 0x02, 0x10, 0x08, 0x40, 0x30, 0x00, 0x91, 0x03, 0x04, 0x02,</div><div class='add'>+0x10, 0x49, 0x50, 0x26, 0x12, 0x95, 0x00, 0x54, 0x03, 0x50, 0xA9, 0x40, 0x27,</div><div class='add'>+0x00, 0x91, 0x00, 0x64, 0x12, 0xD0, 0x09, 0x40, 0x25, 0x40, 0x95, 0x08, 0x44,</div><div class='add'>+0x12, 0x50, 0x09, 0x40, 0x60, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05,</div><div class='add'>+0xA8, 0x67, 0x00, 0x9F, 0x00, 0x7C, 0x02, 0xF0, 0x09, 0xC4, 0x27, 0x00, 0x93,</div><div class='add'>+0x60, 0x7C, 0x02, 0xB0, 0x19, 0xD0, 0x24, 0x40, 0x93, 0x02, 0x44, 0x02, 0x30,</div><div class='add'>+0x08, 0xC2, 0x24, 0x08, 0x93, 0x02, 0x5C, 0x82, 0xF0, 0x19, 0xC8, 0x27, 0x40,</div><div class='add'>+0x91, 0x18, 0x5C, 0x06, 0xF0, 0x29, 0xC1, 0x25, 0x00, 0x9F, 0x00, 0x44, 0x02,</div><div class='add'>+0x20, 0x28, 0xC0, 0x14, 0x20, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x80,</div><div class='add'>+0x65, 0x00, 0x8F, 0x00, 0x4C, 0x4E, 0xF0, 0x09, 0xC1, 0xE7, 0x30, 0x9F, 0x40,</div><div class='add'>+0x7C, 0x22, 0xF0, 0x49, 0xC0, 0x27, 0x00, 0x9F, 0x00, 0x7D, 0x02, 0xF0, 0x09,</div><div class='add'>+0xC0, 0x65, 0x00, 0x9F, 0x19, 0x7C, 0x02, 0xB0, 0x09, 0xC0, 0x27, 0x10, 0x9F,</div><div class='add'>+0x01, 0x7C, 0x02, 0xF0, 0x09, 0xC8, 0xE7, 0x40, 0x8B, 0x10, 0x7C, 0x82, 0xF0,</div><div class='add'>+0x09, 0xC0, 0x4B, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x08, 0x05,</div><div class='add'>+0x80, 0x1F, 0x06, 0x4E, 0x08, 0xF0, 0x01, 0xC4, 0x04, 0x80, 0x13, 0x00, 0x7E,</div><div class='add'>+0x80, 0xF0, 0x01, 0xC0, 0x07, 0x06, 0x1F, 0x12, 0x5C, 0x20, 0xF8, 0x21, 0xC0,</div><div class='add'>+0x07, 0x94, 0x13, 0x02, 0x3C, 0x00, 0xF0, 0x21, 0xC0, 0x07, 0x00, 0x1B, 0x0A,</div><div class='add'>+0x7C, 0x00, 0xE1, 0x20, 0xC0, 0x80, 0x04, 0x17, 0x20, 0x4C, 0x00, 0x30, 0x81,</div><div class='add'>+0xC2, 0x40, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x80, 0x1C, 0x00,</div><div class='add'>+0x7D, 0x00, 0xC4, 0x01, 0x70, 0x57, 0x40, 0x15, 0x80, 0x5B, 0x40, 0x64, 0x01,</div><div class='add'>+0xB2, 0x05, 0xC2, 0x1F, 0x20, 0x7D, 0x11, 0xC4, 0x25, 0x78, 0x05, 0xE0, 0xDB,</div><div class='add'>+0x00, 0x7B, 0x04, 0xFC, 0x2D, 0x70, 0x37, 0x44, 0x17, 0x20, 0x53, 0x40, 0x58,</div><div class='add'>+0x01, 0x70, 0x05, 0xD0, 0x1C, 0x00, 0x71, 0x00, 0xC4, 0x05, 0x14, 0x17, 0x40,</div><div class='add'>+0x51, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0xA0, 0x32, 0x00, 0xCD,</div><div class='add'>+0x20, 0x06, 0x03, 0x50, 0x3C, 0x40, 0x30, 0x00, 0xC1, 0x00, 0x74, 0x03, 0x50,</div><div class='add'>+0x0C, 0x60, 0xF3, 0x08, 0xDD, 0x02, 0x14, 0x0F, 0xD1, 0x0C, 0x40, 0x13, 0x02,</div><div class='add'>+0xC1, 0x03, 0x34, 0x0F, 0x41, 0x4C, 0x60, 0x37, 0x80, 0x81, 0x01, 0x34, 0x03,</div><div class='add'>+0x90, 0x0C, 0x40, 0x32, 0x00, 0xC5, 0x03, 0x44, 0x1F, 0x50, 0x4C, 0x40, 0x50,</div><div class='add'>+0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x88, 0x28, 0x00, 0xAD, 0x00,</div><div class='add'>+0x86, 0x41, 0x58, 0x1E, 0x60, 0x3D, 0x10, 0xE9, 0x40, 0xB4, 0x33, 0x10, 0x4E,</div><div class='add'>+0x40, 0x39, 0x08, 0xED, 0x00, 0x84, 0x03, 0x50, 0x4E, 0x40, 0x19, 0x08, 0xE9,</div><div class='add'>+0x00, 0x94, 0x09, 0x50, 0x26, 0x40, 0x3B, 0x03, 0xA1, 0x40, 0xB6, 0x13, 0x50,</div><div class='add'>+0x8E, 0x40, 0x08, 0x04, 0xC1, 0x02, 0x84, 0x40, 0x50, 0x0E, 0x40, 0x05, 0x20,</div><div class='add'>+0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x10, 0x68, 0x00, 0xCD, 0x01, 0x85,</div><div class='add'>+0x07, 0x70, 0x17, 0xC0, 0x78, 0x01, 0xE1, 0x01, 0xB4, 0x07, 0x50, 0x5E, 0x40,</div><div class='add'>+0x7B, 0x00, 0xED, 0x01, 0x9C, 0x85, 0xD0, 0x1E, 0x60, 0x7B, 0x00, 0xE1, 0x01,</div><div class='add'>+0xB4, 0x06, 0x70, 0x1E, 0xC0, 0x7B, 0x40, 0xA3, 0x01, 0xBC, 0x1F, 0xF1, 0x5F,</div><div class='add'>+0xC0, 0x7A, 0x00, 0xE7, 0x01, 0x8D, 0x07, 0x70, 0x1E, 0xC0, 0x44, 0x40, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xA0, 0x2D, 0x00, 0x9F, 0x00, 0x7C, 0x01,</div><div class='add'>+0x70, 0x0D, 0xC0, 0xB7, 0x00, 0xDF, 0x00, 0x6C, 0x43, 0xF1, 0x2D, 0xC1, 0x37,</div><div class='add'>+0x30, 0xDC, 0x00, 0x7C, 0x81, 0xF0, 0x0D, 0xC0, 0x27, 0x00, 0xDF, 0x00, 0x7C,</div><div class='add'>+0x02, 0x70, 0x0D, 0xC0, 0xB7, 0x04, 0x9B, 0x00, 0x58, 0x83, 0xFA, 0x0D, 0xCC,</div><div class='add'>+0x06, 0x00, 0xDF, 0x00, 0x7C, 0x00, 0xB0, 0x0D, 0xC0, 0x43, 0x20, 0x06, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x6F, 0x00, 0xF3, 0x41, 0xCC, 0x13, 0xF0,</div><div class='add'>+0x1F, 0xC0, 0xFF, 0x04, 0xFB, 0x91, 0xEC, 0x07, 0x80, 0x9F, 0xC1, 0x5C, 0x08,</div><div class='add'>+0x7B, 0x89, 0xCC, 0x06, 0x30, 0x1F, 0xC1, 0x5F, 0x00, 0xB3, 0x01, 0xF8, 0xA7,</div><div class='add'>+0xB0, 0x1F, 0xD0, 0x7C, 0x00, 0xFF, 0x21, 0xFC, 0x07, 0xF0, 0x1F, 0xC0, 0x7D,</div><div class='add'>+0x02, 0x77, 0x01, 0xCC, 0x07, 0xB0, 0x1F, 0xC0, 0x03, 0x00, 0x04, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x15, 0x10, 0xAD, 0x40, 0xA1, 0x30, 0x84, 0x03, 0xD0, 0x0E,</div><div class='add'>+0x45, 0x3F, 0x00, 0xE1, 0x00, 0x84, 0x63, 0x10, 0x0E, 0x48, 0x0C, 0x02, 0x31,</div><div class='add'>+0x0C, 0xC5, 0x22, 0x10, 0x0E, 0x43, 0x9B, 0x02, 0xA1, 0x02, 0xB4, 0x01, 0x50,</div><div class='add'>+0xA2, 0x40, 0x38, 0x80, 0xED, 0x10, 0xB4, 0x03, 0x70, 0x4E, 0x50, 0x18, 0x47,</div><div class='add'>+0xFB, 0x00, 0xC4, 0x08, 0x14, 0x0A, 0x48, 0x57, 0x60, 0x04, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x08, 0x28, 0x00, 0x61, 0x08, 0x84, 0x63, 0xD0, 0x86, 0x40,</div><div class='add'>+0x3B, 0x00, 0xE1, 0x00, 0x24, 0x03, 0x14, 0x0C, 0x50, 0x18, 0x44, 0x61, 0x00,</div><div class='add'>+0xA4, 0x00, 0x14, 0x0E, 0x40, 0x33, 0x44, 0x21, 0x10, 0xB4, 0x03, 0x11, 0x0E,</div><div class='add'>+0x40, 0x38, 0x00, 0xED, 0x00, 0xB4, 0x43, 0xD0, 0x0E, 0x44, 0x39, 0x80, 0xF5,</div><div class='add'>+0x00, 0x84, 0x43, 0x90, 0x0E, 0x40, 0x03, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x04, 0x20, 0x23, 0x14, 0x01, 0x20, 0x04, 0x0E, 0xD0, 0x18, 0x40, 0xB3,</div><div class='add'>+0x04, 0xC1, 0x00, 0x04, 0x03, 0x10, 0x2C, 0x41, 0x40, 0x00, 0x01, 0x03, 0x64,</div><div class='add'>+0x00, 0x11, 0x2C, 0x40, 0xF3, 0x00, 0x01, 0x12, 0x34, 0x03, 0x50, 0x38, 0x40,</div><div class='add'>+0x30, 0x00, 0xCD, 0x03, 0x76, 0x07, 0x50, 0x0D, 0x40, 0x54, 0x00, 0x49, 0x0C,</div><div class='add'>+0x05, 0x0E, 0x10, 0x9C, 0x40, 0x13, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x15, 0x28, 0x25, 0x00, 0x93, 0x01, 0x45, 0x0A, 0xF8, 0x09, 0xC0, 0xBF, 0x40,</div><div class='add'>+0xF3, 0x00, 0xEC, 0x0F, 0x30, 0x2F, 0xC0, 0x64, 0x00, 0x93, 0x12, 0x6C, 0x03,</div><div class='add'>+0x30, 0x0E, 0xC0, 0x17, 0x10, 0x13, 0x03, 0x7C, 0x83, 0xB0, 0x18, 0xC0, 0x3C,</div><div class='add'>+0x20, 0x9F, 0x00, 0xF4, 0x07, 0xF0, 0x5F, 0xC0, 0x75, 0x00, 0x97, 0x22, 0x04,</div><div class='add'>+0x2F, 0xB0, 0xBC, 0xC0, 0x57, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,</div><div class='add'>+0x00, 0x87, 0x00, 0x0F, 0x80, 0x7E, 0x00, 0xF0, 0x21, 0xC0, 0x37, 0x00, 0xD7,</div><div class='add'>+0x80, 0x7C, 0x13, 0x70, 0x0D, 0xC0, 0x87, 0x00, 0x97, 0x02, 0x5C, 0x0A, 0xF0,</div><div class='add'>+0x0D, 0xE0, 0x17, 0x00, 0x9F, 0x20, 0x3C, 0x08, 0xF0, 0xC1, 0xC8, 0x37, 0x00,</div><div class='add'>+0x9F, 0x04, 0x7C, 0x03, 0xF1, 0x0D, 0xC0, 0xA7, 0x44, 0xDF, 0x02, 0x7C, 0x88,</div><div class='add'>+0xF2, 0x0D, 0xC0, 0x07, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x84, 0x08,</div><div class='add'>+0x2D, 0x00, 0x9F, 0x00, 0xEC, 0x42, 0xE0, 0x03, 0xE0, 0x3F, 0x00, 0xDF, 0x00,</div><div class='add'>+0xFC, 0x03, 0xF8, 0x0E, 0xD0, 0x2C, 0x02, 0x3F, 0x10, 0xCD, 0x07, 0x34, 0x0F,</div><div class='add'>+0xC1, 0x3C, 0x04, 0x3F, 0x00, 0xFC, 0x02, 0xB1, 0x8F, 0xC0, 0x3E, 0x00, 0xBF,</div><div class='add'>+0x00, 0xCC, 0x03, 0x30, 0x0D, 0xC0, 0x74, 0x40, 0xF7, 0x00, 0xFC, 0x17, 0x30,</div><div class='add'>+0x0F, 0x00, 0x10, 0x22, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x85, 0x20, 0xC6,</div><div class='add'>+0x08, 0x1D, 0x81, 0x44, 0x44, 0xD0, 0x11, 0x41, 0x37, 0x00, 0xDD, 0x00, 0x74,</div><div class='add'>+0x03, 0xD0, 0x0D, 0x40, 0xC4, 0x08, 0x19, 0x02, 0x4C, 0x0A, 0x10, 0x0D, 0x40,</div><div class='add'>+0x84, 0x00, 0x97, 0x03, 0x74, 0x06, 0xB8, 0x1D, 0x00, 0x34, 0x00, 0x8D, 0x01,</div><div class='add'>+0x54, 0x03, 0x10, 0x0D, 0x40, 0x24, 0x42, 0xD3, 0x09, 0x74, 0x05, 0x10, 0x05,</div><div class='add'>+0x48, 0x14, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xA0, 0x64, 0x00,</div><div class='add'>+0x9D, 0x01, 0x64, 0x04, 0xD0, 0x19, 0x40, 0x37, 0x00, 0xDD, 0x00, 0x54, 0x03,</div><div class='add'>+0xD0, 0x0D, 0x40, 0x34, 0x00, 0xCD, 0x03, 0x44, 0x19, 0x10, 0x0D, 0x50, 0x14,</div><div class='add'>+0x00, 0x18, 0x01, 0x74, 0x21, 0x10, 0x01, 0x00, 0x36, 0x00, 0x9D, 0x04, 0x44,</div><div class='add'>+0x03, 0x10, 0x0D, 0x40, 0x84, 0x40, 0xDD, 0x02, 0x74, 0x03, 0x10, 0x0D, 0x40,</div><div class='add'>+0x04, 0x08, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x20, 0x00, 0x00, 0x0D,</div><div class='add'>+0x01, 0x05, 0x00, 0xD1, 0x08, 0x48, 0x33, 0x80, 0xCD, 0x00, 0x34, 0x03, 0xD0,</div><div class='add'>+0x0C, 0x40, 0x00, 0x00, 0x8D, 0x00, 0x06, 0x00, 0x10, 0x0D, 0x60, 0x10, 0x10,</div><div class='add'>+0x85, 0x00, 0x34, 0x00, 0x91, 0x01, 0x40, 0x30, 0x00, 0x9D, 0x80, 0x16, 0x03,</div><div class='add'>+0x10, 0x0C, 0x50, 0x00, 0x00, 0x81, 0x00, 0x74, 0x00, 0x50, 0x18, 0x50, 0x41,</div><div class='add'>+0xA0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA0, 0x26, 0x00, 0x1F, 0x00,</div><div class='add'>+0x6C, 0x02, 0xF1, 0x01, 0x40, 0x3F, 0x00, 0xDF, 0x00, 0xDC, 0x03, 0xD0, 0x0F,</div><div class='add'>+0xC0, 0x34, 0x00, 0x5D, 0x00, 0x4C, 0x01, 0x30, 0x0D, 0xC0, 0x34, 0x00, 0x1F,</div><div class='add'>+0x00, 0x7C, 0x01, 0x11, 0x05, 0xC0, 0x3E, 0x00, 0x9F, 0x00, 0x4C, 0x03, 0x30,</div><div class='add'>+0x0D, 0xC0, 0x04, 0x00, 0xDF, 0x80, 0x7C, 0x00, 0x31, 0x0D, 0xC0, 0x00, 0xC0,</div><div class='add'>+0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0xA8, 0x0F, 0x00, 0x3F, 0x00, 0xFE,</div><div class='add'>+0x02, 0xF0, 0x0B, 0xC0, 0x3F, 0x00, 0xFF, 0x00, 0xFC, 0x03, 0xF0, 0x0F, 0xC0,</div><div class='add'>+0x0F, 0x00, 0x3B, 0x00, 0xDC, 0x00, 0xF0, 0x0F, 0xC4, 0x3F, 0x08, 0x37, 0x00,</div><div class='add'>+0xBC, 0x00, 0xF2, 0x02, 0xC0, 0x3F, 0x00, 0xBF, 0x00, 0xFC, 0x03, 0xF0, 0x0F,</div><div class='add'>+0xC0, 0x0F, 0x00, 0xF7, 0x40, 0xFC, 0x00, 0xB0, 0x0F, 0xC0, 0x16, 0x21, 0x0E,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xA0, 0x5F, 0x00, 0x73, 0x01, 0xCC, 0x07,</div><div class='add'>+0xF0, 0x1F, 0xC0, 0x3C, 0x01, 0xB3, 0x01, 0xAC, 0x05, 0xF0, 0x4F, 0xC0, 0x4D,</div><div class='add'>+0x08, 0x3F, 0x03, 0x4C, 0x04, 0xF0, 0x0F, 0xC0, 0x4F, 0x40, 0x33, 0x01, 0xFC,</div><div class='add'>+0x0C, 0x71, 0x90, 0xC0, 0x4C, 0x00, 0xA3, 0x01, 0xED, 0x04, 0xF0, 0x12, 0xC0,</div><div class='add'>+0x4F, 0x00, 0x3F, 0x02, 0xCE, 0x26, 0x34, 0x03, 0xC0, 0x0F, 0x08, 0x0E, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x01, 0x18, 0x53, 0x00, 0x51, 0x01, 0xEC, 0x07, 0xD0,</div><div class='add'>+0x1F, 0x40, 0x74, 0x00, 0x95, 0x01, 0x51, 0x06, 0xD0, 0x9F, 0x42, 0x44, 0x00,</div><div class='add'>+0x1D, 0x00, 0x4C, 0x04, 0xD0, 0x3F, 0x40, 0x47, 0x00, 0x11, 0x01, 0x74, 0x00,</div><div class='add'>+0x10, 0x45, 0x44, 0x45, 0x00, 0x11, 0x41, 0x44, 0x00, 0xD0, 0x11, 0x40, 0x47,</div><div class='add'>+0x00, 0x97, 0x82, 0x6C, 0x10, 0x10, 0x11, 0x48, 0x0F, 0x00, 0x0C, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x11, 0xA0, 0x25, 0x00, 0x81, 0x00, 0x04, 0x03, 0x51, 0x0C,</div><div class='add'>+0x40, 0xB0, 0x00, 0x45, 0x00, 0x04, 0x01, 0x50, 0x0C, 0x40, 0x21, 0x00, 0x05,</div><div class='add'>+0x04, 0x24, 0x03, 0xD0, 0x2C, 0x40, 0x07, 0x00, 0x01, 0x00, 0x74, 0x10, 0xD0,</div><div class='add'>+0x09, 0x40, 0x35, 0x00, 0x95, 0x80, 0x14, 0x50, 0xD1, 0x00, 0x40, 0x01, 0x08,</div><div class='add'>+0x4D, 0x06, 0x44, 0x02, 0x10, 0x08, 0x40, 0x4F, 0x80, 0x0E, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x03, 0xA0, 0x27, 0x00, 0xC1, 0x00, 0x64, 0x03, 0xD0, 0x0D, 0x40,</div><div class='add'>+0x34, 0x00, 0x55, 0x06, 0x54, 0x02, 0xD0, 0x0D, 0x40, 0x44, 0x00, 0x0D, 0x81,</div><div class='add'>+0x44, 0x23, 0xD0, 0x0D, 0x40, 0x07, 0x00, 0x11, 0x04, 0x74, 0x46, 0x10, 0x0D,</div><div class='add'>+0x40, 0x35, 0x40, 0x15, 0x02, 0x50, 0x06, 0xD0, 0x11, 0x60, 0x07, 0x00, 0x95,</div><div class='add'>+0x08, 0x45, 0x06, 0x10, 0x11, 0x40, 0x0F, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0xA8, 0x73, 0x00, 0x93, 0x02, 0x4C, 0x03, 0xF0, 0x0C, 0xD0, 0x34,</div><div class='add'>+0x80, 0xC7, 0x03, 0x6C, 0x1B, 0xF0, 0x0C, 0xC0, 0x65, 0x01, 0x9F, 0x01, 0x6C,</div><div class='add'>+0x4E, 0xF0, 0x0D, 0xC0, 0x83, 0x01, 0x13, 0x00, 0x3C, 0x04, 0x70, 0x3D, 0xC0,</div><div class='add'>+0xF5, 0x08, 0x87, 0x03, 0x54, 0x44, 0xF0, 0x31, 0xC1, 0x07, 0x11, 0x1F, 0x05,</div><div class='add'>+0x44, 0x06, 0x30, 0x31, 0xC0, 0x03, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x07, 0x80, 0xFD, 0x40, 0xBF, 0x00, 0xFC, 0x03, 0xF2, 0x0F, 0xC0, 0x3B, 0x20,</div><div class='add'>+0xFF, 0x00, 0xE8, 0x96, 0xF0, 0x0F, 0xC0, 0x0F, 0x20, 0x3F, 0x00, 0xFC, 0x06,</div><div class='add'>+0xE0, 0x0D, 0xC4, 0x4E, 0x02, 0x3F, 0x41, 0xF4, 0x02, 0xF0, 0x2F, 0xC0, 0xBF,</div><div class='add'>+0x00, 0xBB, 0x02, 0xC4, 0x02, 0xD0, 0x03, 0x41, 0x0F, 0x00, 0x1F, 0x01, 0xFC,</div><div class='add'>+0x00, 0xF0, 0x03, 0xC4, 0x3F, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,</div><div class='add'>+0x08, 0xA5, 0x00, 0x93, 0x02, 0x7C, 0x03, 0xF0, 0x0D, 0xC0, 0x37, 0x00, 0xDF,</div><div class='add'>+0x00, 0x6E, 0x0B, 0x30, 0x0D, 0xC0, 0xA4, 0x80, 0x9F, 0x02, 0x7C, 0x02, 0xF0,</div><div class='add'>+0x8D, 0xC2, 0x07, 0x02, 0x1E, 0x00, 0x7C, 0x18, 0xF0, 0x0D, 0xC0, 0x36, 0x01,</div><div class='add'>+0x9F, 0x06, 0x6C, 0x08, 0xF2, 0x81, 0xC8, 0x16, 0x44, 0x83, 0x02, 0x4D, 0x8A,</div><div class='add'>+0x30, 0x29, 0xC4, 0x08, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0xA0,</div><div class='add'>+0x24, 0x00, 0x91, 0x00, 0x74, 0x03, 0x50, 0x0D, 0x40, 0x3F, 0x00, 0xDD, 0x07,</div><div class='add'>+0x76, 0x1E, 0xF0, 0xAF, 0x40, 0x44, 0x00, 0x9F, 0x80, 0x74, 0x4F, 0xD0, 0x1F,</div><div class='add'>+0xC0, 0xC4, 0x00, 0x1F, 0x0C, 0x70, 0x02, 0xF0, 0x0C, 0x40, 0xF0, 0x08, 0x9D,</div><div class='add'>+0x02, 0x50, 0x02, 0xD2, 0x11, 0x50, 0x54, 0x04, 0x91, 0x09, 0x64, 0x02, 0x34,</div><div class='add'>+0x39, 0xC0, 0x6C, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x20, 0x22,</div><div class='add'>+0x00, 0xC1, 0x40, 0x24, 0x03, 0x10, 0x4C, 0x60, 0x33, 0x00, 0x4D, 0x04, 0x34,</div><div class='add'>+0x1E, 0x10, 0x1C, 0x40, 0x40, 0x00, 0x89, 0x00, 0x36, 0x11, 0xD0, 0x4C, 0x60,</div><div class='add'>+0x02, 0x04, 0x09, 0x00, 0x34, 0x0C, 0xDA, 0x00, 0x00, 0x82, 0x02, 0x08, 0x00,</div><div class='add'>+0x14, 0x00, 0xD0, 0x20, 0x40, 0x40, 0x00, 0x09, 0x83, 0x64, 0x32, 0x90, 0xC8,</div><div class='add'>+0x40, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x08, 0x7A, 0x40,</div><div class='add'>+0xE1, 0x01, 0x34, 0x07, 0x50, 0x1E, 0x40, 0x7B, 0x00, 0x6D, 0x81, 0xF6, 0x26,</div><div class='add'>+0xD0, 0x1C, 0x40, 0x48, 0x00, 0x25, 0x49, 0xB6, 0x25, 0xD0, 0x9E, 0x40, 0x48,</div><div class='add'>+0x00, 0x2D, 0x01, 0xB4, 0x05, 0xD1, 0x53, 0x40, 0x4A, 0x01, 0x7D, 0x81, 0x94,</div><div class='add'>+0x24, 0xD8, 0x12, 0x60, 0x4C, 0x80, 0x69, 0x21, 0xA4, 0x24, 0x10, 0x13, 0x40,</div><div class='add'>+0x3C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x10, 0xA2, 0x00, 0x81,</div><div class='add'>+0x00, 0x2C, 0x23, 0x10, 0x0C, 0xC0, 0x33, 0x00, 0x4F, 0x00, 0x34, 0x22, 0x10,</div><div class='add'>+0x0C, 0xC1, 0x60, 0x05, 0x89, 0x07, 0x3C, 0x15, 0xF0, 0x8C, 0xC0, 0x03, 0x02,</div><div class='add'>+0x0F, 0x01, 0x38, 0x46, 0xF0, 0x50, 0xE8, 0x42, 0x10, 0xCD, 0x14, 0x14, 0x23,</div><div class='add'>+0xF0, 0x80, 0xC0, 0x00, 0x00, 0xCB, 0x10, 0x4C, 0x23, 0xB2, 0x2D, 0xE0, 0x4A,</div><div class='add'>+0x68, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xA8, 0x2D, 0x00, 0xFF, 0x80,</div><div class='add'>+0xFC, 0x07, 0x70, 0x1F, 0xC0, 0x3F, 0x00, 0x7F, 0x08, 0xFC, 0x22, 0x70, 0x0D,</div><div class='add'>+0xD0, 0x27, 0x02, 0xBE, 0x00, 0xFC, 0x23, 0xF0, 0x8F, 0xC0, 0x0F, 0x02, 0x35,</div><div class='add'>+0x40, 0xFC, 0x03, 0x70, 0x0F, 0xE8, 0x3D, 0x00, 0x7F, 0x00, 0xDC, 0x23, 0xF0,</div><div class='add'>+0x03, 0xC8, 0x09, 0x02, 0xF7, 0x00, 0xDC, 0x23, 0xD0, 0x83, 0xD0, 0x0B, 0x60,</div><div class='add'>+0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xA8, 0x67, 0x00, 0x93, 0x00, 0x7C,</div><div class='add'>+0x23, 0xF0, 0x1D, 0xD0, 0x34, 0x00, 0x57, 0x00, 0x7C, 0x03, 0x30, 0xDC, 0xC0,</div><div class='add'>+0x65, 0x20, 0x9B, 0x20, 0x6C, 0x04, 0xB0, 0x9D, 0xC0, 0x04, 0x00, 0x1F, 0x80,</div><div class='add'>+0x7C, 0x07, 0xBC, 0x01, 0xC0, 0x07, 0x00, 0x5F, 0x01, 0x6E, 0x07, 0x39, 0x01,</div><div class='add'>+0xC0, 0x07, 0x80, 0x5F, 0x00, 0x4C, 0x01, 0x33, 0x09, 0xC0, 0x40, 0x00, 0x0E,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x88, 0x39, 0x00, 0xAB, 0x00, 0xB4, 0x13,</div><div class='add'>+0xD0, 0x2C, 0x40, 0x38, 0x11, 0x61, 0x00, 0x8C, 0x02, 0x18, 0x4E, 0x41, 0x28,</div><div class='add'>+0x30, 0x31, 0x00, 0x84, 0x03, 0x11, 0xCC, 0x40, 0x08, 0x88, 0x2D, 0x00, 0xB4,</div><div class='add'>+0x03, 0x10, 0x0A, 0x42, 0x3B, 0x80, 0x6D, 0x00, 0x94, 0x03, 0x14, 0x02, 0x40,</div><div class='add'>+0x0B, 0x00, 0x7D, 0xC0, 0xC4, 0x01, 0xB0, 0x0A, 0x40, 0x4D, 0x00, 0x06, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x69, 0x00, 0xA1, 0x03, 0x94, 0x07, 0x52,</div><div class='add'>+0x5E, 0x60, 0x70, 0x03, 0x65, 0x43, 0xB4, 0x07, 0x90, 0x1E, 0x40, 0x6D, 0x00,</div><div class='add'>+0xA5, 0x01, 0x84, 0x04, 0x10, 0x1E, 0x40, 0xC9, 0x00, 0x25, 0x01, 0xB4, 0x07,</div><div class='add'>+0x10, 0x16, 0x44, 0x4B, 0x10, 0xFD, 0x01, 0x94, 0x87, 0x10, 0x16, 0x44, 0x5B,</div><div class='add'>+0x20, 0xED, 0x01, 0xA4, 0x05, 0x10, 0x1C, 0x64, 0x10, 0x00, 0x04, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x16, 0x28, 0x23, 0x04, 0x89, 0x00, 0x34, 0x03, 0xD0, 0x0C,</div><div class='add'>+0x40, 0x30, 0x00, 0x41, 0x45, 0x30, 0x2E, 0x10, 0x0C, 0x40, 0x30, 0x00, 0xC5,</div><div class='add'>+0x20, 0x04, 0x1F, 0x10, 0x0C, 0x50, 0xF1, 0x01, 0xCD, 0x48, 0x34, 0x0F, 0x12,</div><div class='add'>+0x3C, 0x41, 0xF3, 0x00, 0xCD, 0x22, 0x14, 0x13, 0x10, 0x1C, 0x40, 0xF3, 0x0C,</div><div class='add'>+0xCD, 0x07, 0x24, 0x4F, 0x10, 0x4C, 0x48, 0x59, 0x20, 0x0C, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x17, 0xA0, 0x9F, 0x00, 0x73, 0x00, 0x7C, 0x01, 0xF0, 0x05, 0xC0,</div><div class='add'>+0x14, 0x00, 0x77, 0x00, 0xB4, 0x01, 0xB5, 0x05, 0xC0, 0xDD, 0x01, 0x77, 0x08,</div><div class='add'>+0xEC, 0x0D, 0xB0, 0x05, 0xE0, 0xDD, 0x00, 0x7F, 0x0B, 0xFC, 0x15, 0xB1, 0x37,</div><div class='add'>+0xC1, 0xDB, 0x16, 0x7F, 0x02, 0xDD, 0x09, 0x30, 0x27, 0xC1, 0x5F, 0x14, 0x7F,</div><div class='add'>+0x04, 0xE4, 0x1D, 0x10, 0x17, 0x45, 0x5C, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x12, 0x80, 0x05, 0x00, 0x1F, 0x24, 0x7C, 0x00, 0xF0, 0x01, 0xC0, 0x07,</div><div class='add'>+0x00, 0x1F, 0x80, 0x4C, 0x10, 0xF0, 0x21, 0xC0, 0x07, 0x04, 0x12, 0x00, 0x7D,</div><div class='add'>+0x20, 0xF0, 0x01, 0x00, 0x86, 0x00, 0x1F, 0x00, 0x7C, 0x48, 0xF2, 0x01, 0xC0,</div><div class='add'>+0x87, 0x00, 0x1F, 0x0A, 0x64, 0x20, 0xF0, 0x01, 0xC1, 0x87, 0x00, 0x1F, 0x40,</div><div class='add'>+0x5D, 0x00, 0xF4, 0x01, 0xC0, 0x4B, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x10, 0x00, 0x25, 0x00, 0x9F, 0x00, 0x4C, 0x02, 0xF0, 0x89, 0xC0, 0x27, 0x00,</div><div class='add'>+0x93, 0x80, 0x7C, 0x0A, 0x30, 0x19, 0x40, 0x27, 0x00, 0x9F, 0x00, 0x6C, 0x02,</div><div class='add'>+0xF0, 0x19, 0xC8, 0x26, 0x00, 0x93, 0x01, 0x7C, 0x02, 0xF0, 0x09, 0xC0, 0x27,</div><div class='add'>+0x00, 0x93, 0x10, 0x5C, 0x02, 0xF0, 0x19, 0xC0, 0x24, 0x00, 0x9F, 0x02, 0x6C,</div><div class='add'>+0x0A, 0x30, 0x58, 0xC4, 0x40, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,</div><div class='add'>+0x20, 0x26, 0x00, 0x8D, 0x00, 0xC4, 0x02, 0xD8, 0x1B, 0x40, 0x27, 0x00, 0x95,</div><div class='add'>+0x01, 0x74, 0x02, 0x50, 0x09, 0x44, 0x27, 0x00, 0x87, 0x00, 0x44, 0x06, 0xD0,</div><div class='add'>+0x29, 0x44, 0xE3, 0x1C, 0x91, 0x01, 0x74, 0x12, 0xD0, 0x09, 0x4A, 0x67, 0x00,</div><div class='add'>+0x95, 0x22, 0x74, 0x82, 0xD0, 0x18, 0x40, 0x24, 0x08, 0x9C, 0x03, 0x04, 0x42,</div><div class='add'>+0x14, 0x19, 0x40, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xA0,</div><div class='add'>+0x24, 0x00, 0xDD, 0x00, 0x44, 0x02, 0xD0, 0x09, 0x40, 0x23, 0x00, 0x91, 0x04,</div><div class='add'>+0x54, 0x02, 0x10, 0x69, 0x44, 0x27, 0x80, 0x9D, 0x00, 0x44, 0x06, 0xD0, 0x89,</div><div class='add'>+0x41, 0x27, 0x41, 0xD1, 0x0A, 0x74, 0x02, 0xD2, 0x0D, 0x48, 0x37, 0x02, 0x91,</div><div class='add'>+0x82, 0x74, 0x02, 0x52, 0x89, 0x00, 0x24, 0x00, 0x8D, 0x00, 0x42, 0x03, 0x10,</div><div class='add'>+0x09, 0x40, 0x60, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x28, 0xA0,</div><div class='add'>+0x00, 0x9D, 0x02, 0x04, 0x0A, 0xD0, 0x08, 0x40, 0xA3, 0x00, 0x85, 0x20, 0x74,</div><div class='add'>+0x03, 0x50, 0x08, 0x48, 0x23, 0x00, 0x95, 0x08, 0x04, 0x83, 0xD2, 0x08, 0x40,</div><div class='add'>+0x23, 0x00, 0x81, 0x00, 0x34, 0x22, 0xD0, 0x88, 0x40, 0x23, 0x00, 0x85, 0x80,</div><div class='add'>+0x34, 0x22, 0xD0, 0x09, 0x50, 0x30, 0x90, 0xCD, 0x68, 0x45, 0xA2, 0x10, 0x48,</div><div class='add'>+0x50, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xB0, 0x02, 0x00,</div><div class='add'>+0x1F, 0x00, 0x4D, 0x04, 0xD0, 0x11, 0xC0, 0x07, 0x05, 0x13, 0x80, 0x5C, 0x80,</div><div class='add'>+0x30, 0x41, 0xC1, 0x07, 0x20, 0x1F, 0x02, 0x4D, 0x00, 0xF0, 0x41, 0xC1, 0x07,</div><div class='add'>+0x00, 0x13, 0x80, 0x38, 0x08, 0xF0, 0x21, 0xC0, 0x17, 0x20, 0x13, 0x00, 0x3E,</div><div class='add'>+0x08, 0x70, 0x01, 0xC0, 0x04, 0x08, 0x1F, 0x16, 0x4C, 0x08, 0x30, 0x05, 0xC0,</div><div class='add'>+0x74, 0xE0, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x19, 0xA8, 0x7F, 0x00, 0xBF,</div><div class='add'>+0x01, 0x7C, 0x0E, 0xD0, 0x29, 0xC0, 0x67, 0x10, 0xBF, 0x00, 0xBC, 0x02, 0xF0,</div><div class='add'>+0x09, 0xC0, 0x2B, 0x00, 0xB7, 0x04, 0x9C, 0x02, 0xF2, 0x09, 0xC0, 0x3F, 0x20,</div><div class='add'>+0xFF, 0x40, 0xFC, 0x12, 0xD0, 0x4B, 0xC0, 0x2F, 0x10, 0xAF, 0x80, 0xFE, 0x12,</div><div class='add'>+0xF0, 0x0B, 0xC8, 0x2F, 0x00, 0xBE, 0x44, 0xDC, 0x13, 0xF0, 0x8B, 0xC0, 0x77,</div><div class='add'>+0x60, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x19, 0x00, 0x27, 0x00, 0x9F, 0x42,</div><div class='add'>+0x7C, 0x36, 0xF0, 0x1B, 0xC1, 0x27, 0x02, 0xBF, 0x00, 0xDC, 0x02, 0xF2, 0x4B,</div><div class='add'>+0xC1, 0x2F, 0x00, 0xDB, 0x80, 0xCC, 0x02, 0xF0, 0x0B, 0xC8, 0x2F, 0x00, 0xBF,</div><div class='add'>+0x00, 0xC4, 0x22, 0xF0, 0x09, 0x40, 0x28, 0x00, 0xBE, 0x00, 0x4C, 0x82, 0x30,</div><div class='add'>+0x0B, 0xC0, 0x2B, 0x08, 0xBF, 0x00, 0xCC, 0x02, 0x30, 0x0B, 0xC0, 0x74, 0x00,</div><div class='add'>+0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1C, 0x10, 0x47, 0x05, 0x1D, 0xC1, 0x34,</div><div class='add'>+0x0C, 0xD0, 0x21, 0x40, 0x43, 0x20, 0x1D, 0x00, 0x44, 0x00, 0xD0, 0x01, 0x40,</div><div class='add'>+0x07, 0x00, 0x1D, 0x70, 0x44, 0x00, 0xD0, 0x81, 0x40, 0x07, 0x00, 0x1D, 0x00,</div><div class='add'>+0x44, 0x11, 0x72, 0x01, 0x41, 0x04, 0x30, 0x1D, 0x20, 0x54, 0x50, 0x10, 0x01,</div><div class='add'>+0x40, 0x17, 0x00, 0x1D, 0x00, 0x0C, 0x00, 0x10, 0x01, 0x44, 0x61, 0x20, 0x0C,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x28, 0x21, 0x00, 0x8D, 0x00, 0x34, 0x32,</div><div class='add'>+0xD0, 0x08, 0x40, 0x23, 0x03, 0x8D, 0x00, 0x05, 0x02, 0xD0, 0x08, 0x40, 0x23,</div><div class='add'>+0x00, 0x89, 0x04, 0x05, 0x02, 0xD0, 0x08, 0x08, 0x33, 0x00, 0x9D, 0x00, 0x05,</div><div class='add'>+0x12, 0xD8, 0x48, 0x40, 0x20, 0x00, 0x8D, 0x00, 0x14, 0x92, 0x10, 0x08, 0x60,</div><div class='add'>+0x23, 0x00, 0x8D, 0x00, 0x04, 0x82, 0x10, 0x09, 0x40, 0x4A, 0x00, 0x04, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x18, 0x20, 0x25, 0x00, 0x9D, 0x00, 0x74, 0x02, 0xD0,</div><div class='add'>+0x09, 0x40, 0x27, 0x08, 0xDD, 0x00, 0x44, 0x02, 0xD0, 0x0D, 0x40, 0x67, 0x20,</div><div class='add'>+0x8D, 0x18, 0x44, 0x02, 0xD0, 0x09, 0x44, 0x66, 0x10, 0x9D, 0x00, 0x44, 0x02,</div><div class='add'>+0x50, 0x28, 0x54, 0xB4, 0x02, 0x9D, 0x10, 0x55, 0x02, 0x10, 0x09, 0x41, 0x27,</div><div class='add'>+0x00, 0xDD, 0x00, 0x04, 0x02, 0x90, 0x19, 0x60, 0x63, 0x28, 0x04, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x05, 0xA8, 0xEF, 0x00, 0xBF, 0x0D, 0xFC, 0x82, 0xF2, 0x09,</div><div class='add'>+0xC0, 0x2F, 0x00, 0x9F, 0x13, 0x4C, 0x02, 0xF0, 0x09, 0xC4, 0xE7, 0x24, 0x9B,</div><div class='add'>+0x81, 0x44, 0x46, 0xF2, 0x09, 0xC8, 0x67, 0x20, 0x9F, 0x00, 0x4C, 0x02, 0xF0,</div><div class='add'>+0x09, 0xC0, 0xE4, 0x00, 0x9F, 0x20, 0x54, 0x1A, 0x30, 0x29, 0xC0, 0x27, 0x00,</div><div class='add'>+0x9F, 0x12, 0x4C, 0x0E, 0x34, 0x59, 0xC0, 0x16, 0x00, 0x0C, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x12, 0x80, 0xE5, 0x00, 0x9F, 0x00, 0x7C, 0x02, 0xF0, 0x09, 0xC0,</div><div class='add'>+0x27, 0x00, 0x9F, 0x05, 0x6C, 0x02, 0xF0, 0x09, 0xC0, 0x27, 0x00, 0x9F, 0x01,</div><div class='add'>+0x7C, 0x62, 0xE0, 0x09, 0x00, 0x27, 0x00, 0x9F, 0x02, 0x7C, 0x02, 0x72, 0x49,</div><div class='add'>+0xC0, 0x27, 0x00, 0x9F, 0x03, 0x7C, 0x22, 0xD4, 0x99, 0xC0, 0x27, 0x01, 0x9D,</div><div class='add'>+0x13, 0x7F, 0xD2, 0x70, 0x09, 0xC1, 0x59, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x10, 0x08, 0x85, 0x00, 0x1F, 0x00, 0x7C, 0x00, 0xB0, 0x01, 0xD0, 0x06,</div><div class='add'>+0x00, 0x13, 0x02, 0x4C, 0x00, 0xF0, 0x01, 0xC0, 0x87, 0x80, 0x1F, 0x02, 0x5C,</div><div class='add'>+0x88, 0x30, 0x01, 0xC5, 0x85, 0x40, 0x13, 0x30, 0x4C, 0x00, 0xF0, 0x21, 0xC0,</div><div class='add'>+0x07, 0x01, 0x13, 0x23, 0x5C, 0x08, 0xF0, 0x01, 0xC1, 0x05, 0x14, 0x03, 0x00,</div><div class='add'>+0x4C, 0x00, 0x21, 0x01, 0xC0, 0x53, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x14, 0xA0, 0x14, 0x00, 0x5D, 0x00, 0x74, 0x01, 0x58, 0x77, 0x40, 0x14, 0x00,</div><div class='add'>+0x65, 0x02, 0xD8, 0x01, 0xD0, 0x17, 0x40, 0x17, 0x80, 0x5C, 0x00, 0xD4, 0x01,</div><div class='add'>+0x11, 0x07, 0x01, 0x9D, 0x00, 0x61, 0x02, 0xC4, 0x85, 0x32, 0x05, 0xC0, 0x9D,</div><div class='add'>+0x40, 0x61, 0x10, 0x48, 0x01, 0xD1, 0x07, 0x40, 0x5F, 0x04, 0x71, 0x00, 0xD4,</div><div class='add'>+0x81, 0x50, 0x07, 0x48, 0x43, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14,</div><div class='add'>+0xA0, 0x32, 0x00, 0xCD, 0x00, 0x34, 0x03, 0x10, 0x78, 0x40, 0x30, 0x00, 0x41,</div><div class='add'>+0x04, 0x24, 0x02, 0xD0, 0xDC, 0x40, 0x33, 0x20, 0xCD, 0x40, 0x14, 0x03, 0x10,</div><div class='add'>+0x0C, 0x0A, 0xB0, 0x0C, 0xC1, 0x08, 0x05, 0x07, 0xD0, 0x0C, 0x40, 0x71, 0x00,</div><div class='add'>+0xC1, 0x80, 0x50, 0x83, 0xD0, 0x0C, 0x40, 0x31, 0x00, 0xC1, 0x03, 0x04, 0x2B,</div><div class='add'>+0x1C, 0x2D, 0x40, 0x43, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x80,</div><div class='add'>+0x38, 0x01, 0xED, 0x04, 0xB4, 0x27, 0x58, 0x1A, 0x40, 0x78, 0x01, 0xF5, 0x00,</div><div class='add'>+0x94, 0x02, 0xD8, 0x0A, 0x40, 0x3B, 0x00, 0xED, 0x0C, 0x94, 0x0C, 0x10, 0x1A,</div><div class='add'>+0x4A, 0x7D, 0x00, 0xE1, 0x20, 0x84, 0x43, 0x00, 0x4E, 0x40, 0x4D, 0x24, 0xF1,</div><div class='add'>+0x40, 0xA4, 0x03, 0xD0, 0x0E, 0x40, 0x7F, 0x08, 0xE1, 0x82, 0x84, 0x01, 0x10,</div><div class='add'>+0x06, 0x44, 0x13, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x00, 0xF8,</div><div class='add'>+0x00, 0xEF, 0x03, 0xBC, 0x07, 0x30, 0x1A, 0xC2, 0x78, 0x01, 0x63, 0x01, 0xAC,</div><div class='add'>+0x06, 0xF0, 0x1E, 0xC0, 0x7B, 0x00, 0xFD, 0x31, 0x96, 0x04, 0x30, 0x1A, 0x40,</div><div class='add'>+0x79, 0x00, 0x63, 0x01, 0x8C, 0x07, 0xF0, 0x1E, 0xC1, 0x49, 0x20, 0xE3, 0x01,</div><div class='add'>+0x9E, 0x17, 0xF2, 0x1E, 0xC8, 0x79, 0x40, 0xF3, 0x01, 0x8D, 0x06, 0x30, 0x1E,</div><div class='add'>+0xC0, 0x53, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xA8, 0x35, 0x00,</div><div class='add'>+0xDF, 0x00, 0x7C, 0x03, 0xF0, 0x08, 0xC0, 0x37, 0x10, 0xCF, 0x00, 0x7C, 0x02,</div><div class='add'>+0xF1, 0x01, 0xC0, 0x37, 0x00, 0xDD, 0x02, 0x2C, 0x00, 0xF0, 0x08, 0xE0, 0x33,</div><div class='add'>+0x00, 0x4F, 0x00, 0x7C, 0x01, 0xA2, 0x4D, 0xC0, 0x05, 0x20, 0xCF, 0x20, 0x5C,</div><div class='add'>+0x1B, 0xF2, 0x09, 0xE0, 0x37, 0x00, 0xDD, 0x00, 0x7C, 0x00, 0xF0, 0x09, 0xC0,</div><div class='add'>+0x43, 0x60, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x20, 0x79, 0x00, 0xE3,</div><div class='add'>+0x01, 0xCC, 0x13, 0xF8, 0x8F, 0xC0, 0x7D, 0x04, 0x7F, 0x09, 0xCC, 0x06, 0xF0,</div><div class='add'>+0x9F, 0xC0, 0x7F, 0x02, 0xF7, 0x01, 0x3C, 0x24, 0x70, 0x9B, 0xC0, 0x47, 0x22,</div><div class='add'>+0xBF, 0x0D, 0xCC, 0x06, 0xB0, 0x9D, 0x41, 0x4F, 0x02, 0xBF, 0x01, 0xCD, 0x4F,</div><div class='add'>+0x30, 0x9E, 0xC8, 0x7C, 0x12, 0x3B, 0x09, 0xCC, 0x07, 0x34, 0x97, 0xD8, 0x18,</div><div class='add'>+0x08, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x18, 0x38, 0x00, 0xE1, 0x18,</div><div class='add'>+0x84, 0x03, 0xD8, 0x0E, 0x40, 0x38, 0x20, 0xED, 0x0C, 0xAC, 0x02, 0xD0, 0x0A,</div><div class='add'>+0x44, 0x33, 0x00, 0xCD, 0x08, 0xB4, 0x24, 0x10, 0xCA, 0x08, 0x7B, 0x01, 0x4D,</div><div class='add'>+0x98, 0x44, 0x43, 0x10, 0x5E, 0x40, 0x03, 0x03, 0xAD, 0x04, 0x94, 0x23, 0x10,</div><div class='add'>+0x0E, 0x42, 0x29, 0x03, 0x2D, 0x0C, 0xFC, 0x11, 0x10, 0x86, 0x40, 0x54, 0x00,</div><div class='add'>+0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x7D, 0x00, 0xF1, 0x01, 0x84,</div><div class='add'>+0x27, 0xD0, 0xC8, 0x40, 0x79, 0x02, 0x7D, 0x00, 0xA6, 0x02, 0x50, 0x0A, 0x48,</div><div class='add'>+0x3B, 0x80, 0xED, 0x00, 0xF4, 0x00, 0xD0, 0x02, 0x0A, 0x09, 0x08, 0x3D, 0x06,</div><div class='add'>+0xA6, 0x22, 0x10, 0x0E, 0x44, 0x0B, 0x14, 0xBD, 0x00, 0xC6, 0x03, 0x10, 0x0E,</div><div class='add'>+0x40, 0x19, 0x10, 0x2D, 0x40, 0xC4, 0x02, 0x12, 0x06, 0x42, 0x60, 0x02, 0x04,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x20, 0x31, 0x00, 0xC1, 0x00, 0x04, 0x03,</div><div class='add'>+0xD8, 0x08, 0x40, 0x30, 0x00, 0xCD, 0x00, 0x24, 0x22, 0xD0, 0x00, 0x40, 0x33,</div><div class='add'>+0x00, 0xCD, 0x20, 0x34, 0x4C, 0x90, 0x00, 0x40, 0xB2, 0x01, 0x4D, 0x01, 0x24,</div><div class='add'>+0x85, 0x9A, 0x2D, 0x48, 0xC3, 0x00, 0x8D, 0x10, 0x14, 0x9B, 0x10, 0x28, 0x41,</div><div class='add'>+0x81, 0x00, 0x8D, 0x08, 0x05, 0x08, 0x10, 0xB8, 0x40, 0x08, 0x20, 0x04, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x1D, 0xA8, 0x35, 0x41, 0xD3, 0x01, 0x4D, 0x03, 0xD0,</div><div class='add'>+0x09, 0xC0, 0x35, 0x00, 0x5F, 0x00, 0x2C, 0x03, 0x70, 0x05, 0xC0, 0x77, 0x04,</div><div class='add'>+0xFF, 0x11, 0x7C, 0x1C, 0xF0, 0x01, 0xC0, 0x35, 0x08, 0xDF, 0x02, 0x6D, 0x09,</div><div class='add'>+0x34, 0x0F, 0xC0, 0xC7, 0x20, 0xCD, 0x81, 0xC4, 0x03, 0x30, 0x2D, 0xC0, 0x21,</div><div class='add'>+0x00, 0xDB, 0x2B, 0x44, 0x0B, 0x30, 0xB9, 0xC0, 0x74, 0x00, 0x06, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x01, 0x00, 0x37, 0x00, 0xDF, 0x00, 0x3C, 0x03, 0xF0, 0x29,</div><div class='add'>+0xC0, 0x37, 0x00, 0x5F, 0x42, 0x7C, 0x4A, 0xF0, 0x05, 0xC0, 0x27, 0x91, 0xDF,</div><div class='add'>+0x24, 0x7C, 0x00, 0x70, 0x09, 0xC0, 0x37, 0x0A, 0xDF, 0x02, 0x5C, 0x42, 0x70,</div><div class='add'>+0xCD, 0xC0, 0x07, 0x04, 0x9F, 0x01, 0x6C, 0x03, 0xF0, 0x25, 0x40, 0x07, 0x01,</div><div class='add'>+0xDF, 0x02, 0x7C, 0x09, 0xF0, 0x29, 0xC8, 0x17, 0x20, 0x0C, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x05, 0x08, 0x3F, 0x00, 0xFF, 0x00, 0xC8, 0x03, 0x30, 0x1B, 0xC0,</div><div class='add'>+0x3F, 0x20, 0x7F, 0x41, 0xFC, 0x27, 0x30, 0x46, 0xC0, 0x7E, 0x01, 0xFF, 0x20,</div><div class='add'>+0xCC, 0x0C, 0x70, 0x03, 0xC0, 0x0F, 0x00, 0xBF, 0x08, 0xF8, 0x05, 0xB4, 0x0F,</div><div class='add'>+0xC0, 0x0D, 0x08, 0xFF, 0x00, 0xDC, 0x03, 0xF0, 0x0F, 0xC0, 0x2F, 0x10, 0xE7,</div><div class='add'>+0x01, 0xCC, 0x46, 0xF0, 0x09, 0xC0, 0x07, 0x22, 0x0C, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x85, 0x20, 0x36, 0x00, 0xDD, 0x00, 0x54, 0x03, 0x50, 0x19, 0x40, 0x37,</div><div class='add'>+0x00, 0x1D, 0x02, 0x74, 0x0D, 0x10, 0x15, 0x40, 0x24, 0x00, 0xDD, 0x00, 0x44,</div><div class='add'>+0x0C, 0xD1, 0x19, 0xC0, 0x07, 0x01, 0x9D, 0x02, 0x74, 0x08, 0x90, 0x0D, 0x40,</div><div class='add'>+0xC4, 0x00, 0x9D, 0x03, 0x6C, 0x03, 0xD2, 0xF5, 0x40, 0x47, 0x00, 0x11, 0x01,</div><div class='add'>+0x44, 0x02, 0xD0, 0x39, 0x48, 0x07, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x01, 0xA0, 0x34, 0x00, 0xCD, 0x00, 0x54, 0x03, 0x90, 0x8D, 0x41, 0x37, 0x00,</div><div class='add'>+0x5D, 0x08, 0x74, 0x43, 0x50, 0x0D, 0x40, 0x36, 0x00, 0xC9, 0x00, 0x44, 0xC0,</div><div class='add'>+0xD8, 0x11, 0x00, 0x07, 0x02, 0x9D, 0x02, 0x36, 0x18, 0x12, 0x0D, 0x40, 0x46,</div><div class='add'>+0x00, 0x9D, 0x03, 0x60, 0x03, 0xD0, 0x0D, 0x40, 0xE7, 0x00, 0x11, 0x04, 0x44,</div><div class='add'>+0x9B, 0xD0, 0x11, 0x4D, 0x07, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10,</div><div class='add'>+0x28, 0x30, 0x00, 0xCD, 0x00, 0x14, 0x03, 0x50, 0x04, 0x40, 0x32, 0x00, 0xCD,</div><div class='add'>+0x00, 0x34, 0x02, 0x56, 0x0C, 0x42, 0x20, 0x80, 0xCD, 0x00, 0x05, 0x10, 0xD0,</div><div class='add'>+0x18, 0x40, 0x31, 0x09, 0x4D, 0x20, 0x34, 0x22, 0x11, 0x6C, 0x50, 0x02, 0x02,</div><div class='add'>+0x8D, 0x00, 0x24, 0x03, 0xD2, 0x0C, 0x42, 0x03, 0x80, 0x01, 0x00, 0x04, 0x00,</div><div class='add'>+0xD0, 0x08, 0x4A, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xB0,</div><div class='add'>+0x3E, 0x08, 0xFF, 0x00, 0xDC, 0x03, 0x30, 0x0D, 0xC0, 0x3F, 0x00, 0x5F, 0x00,</div><div class='add'>+0x74, 0x03, 0x70, 0x09, 0xC0, 0x36, 0x10, 0xFB, 0x00, 0x4C, 0x50, 0x71, 0x01,</div><div class='add'>+0x64, 0x07, 0x00, 0x9F, 0x08, 0x7C, 0x00, 0xB0, 0x6F, 0xC0, 0x07, 0xA0, 0x9F,</div><div class='add'>+0x80, 0xDC, 0x03, 0xF0, 0x0D, 0xC0, 0x07, 0x40, 0x47, 0x80, 0x4E, 0x01, 0xF2,</div><div class='add'>+0x01, 0xC0, 0x07, 0x60, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0xA0, 0x3F,</div><div class='add'>+0x00, 0xFF, 0x00, 0xFC, 0x03, 0x70, 0x07, 0xC0, 0x3F, 0x00, 0xAF, 0x00, 0xFC,</div><div class='add'>+0x01, 0xB0, 0x03, 0xC0, 0x2F, 0x04, 0xFC, 0x10, 0xFC, 0x40, 0xF0, 0x03, 0xC0,</div><div class='add'>+0x8F, 0x08, 0x2F, 0x00, 0xFC, 0x10, 0xD2, 0x8F, 0xC0, 0x0D, 0x01, 0x2E, 0x00,</div><div class='add'>+0xBC, 0x03, 0xE0, 0x0F, 0xC2, 0x0F, 0x00, 0x3F, 0x00, 0xFD, 0x00, 0xF0, 0x0B,</div><div class='add'>+0xC2, 0x17, 0x64, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x80, 0x3F, 0x00,</div><div class='add'>+0xA3, 0x40, 0xCC, 0x02, 0xF0, 0x0B, 0xC0, 0x3F, 0x11, 0xB3, 0x20, 0xFC, 0x26,</div><div class='add'>+0xB0, 0x9F, 0xD2, 0x2C, 0x00, 0xFF, 0x21, 0xEC, 0x10, 0xB2, 0x8F, 0xC8, 0x3C,</div><div class='add'>+0x12, 0xFF, 0x04, 0xEC, 0x20, 0x72, 0x0F, 0xC0, 0x7F, 0x02, 0xF3, 0x03, 0xED,</div><div class='add'>+0x1B, 0xB0, 0x9B, 0xC0, 0x7C, 0x0A, 0xDF, 0x01, 0xFC, 0x1A, 0x34, 0x49, 0xC0,</div><div class='add'>+0x0E, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x3F, 0x00, 0xB1,</div><div class='add'>+0x01, 0x44, 0x82, 0x70, 0x01, 0x02, 0x3F, 0x22, 0x91, 0x00, 0x34, 0x13, 0x10,</div><div class='add'>+0x4C, 0x48, 0xB4, 0x01, 0xD1, 0x01, 0x54, 0x24, 0xD0, 0x6F, 0x60, 0xBC, 0x01,</div><div class='add'>+0xFD, 0x09, 0x44, 0x18, 0x10, 0x9F, 0x40, 0x33, 0x01, 0xD1, 0x00, 0x84, 0x1B,</div><div class='add'>+0x14, 0x48, 0x50, 0x34, 0x21, 0xDD, 0x04, 0x74, 0x12, 0x11, 0x19, 0x40, 0x0D,</div><div class='add'>+0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0xA0, 0x31, 0x00, 0x81, 0x00,</div><div class='add'>+0x04, 0x02, 0xD0, 0x08, 0x40, 0x33, 0x20, 0xC5, 0x20, 0x14, 0x07, 0x50, 0x0C,</div><div class='add'>+0x40, 0x81, 0x04, 0xC5, 0x00, 0x04, 0x00, 0xD0, 0x6C, 0x48, 0xB0, 0x01, 0xCD,</div><div class='add'>+0x00, 0x24, 0x1C, 0x10, 0x0C, 0x40, 0x33, 0x00, 0xC1, 0x04, 0x04, 0x0B, 0x50,</div><div class='add'>+0x0D, 0x40, 0x30, 0x01, 0xCD, 0x14, 0x34, 0x18, 0x10, 0x81, 0x40, 0x5C, 0x80,</div><div class='add'>+0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xA8, 0x37, 0x00, 0x91, 0x41, 0x44,</div><div class='add'>+0x0E, 0x52, 0x11, 0x45, 0x37, 0x10, 0xD5, 0x43, 0x74, 0x07, 0x50, 0x0D, 0x44,</div><div class='add'>+0x55, 0x00, 0xD5, 0x04, 0x56, 0x88, 0xD0, 0x0C, 0x40, 0x34, 0x00, 0xDD, 0x00,</div><div class='add'>+0x24, 0x02, 0x13, 0x0D, 0x40, 0x37, 0x80, 0xC1, 0x01, 0x44, 0x03, 0x50, 0x0D,</div><div class='add'>+0x40, 0x34, 0x00, 0xDD, 0x80, 0x74, 0x06, 0x10, 0x11, 0x40, 0x1D, 0x20, 0x06,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA0, 0x37, 0x00, 0x93, 0x01, 0x4D, 0x04,</div><div class='add'>+0xF0, 0x11, 0xC4, 0x37, 0xC0, 0xD7, 0x03, 0x7C, 0x07, 0xF0, 0x8D, 0xC0, 0xC5,</div><div class='add'>+0x00, 0xDF, 0x01, 0x4C, 0x0C, 0xB2, 0x0D, 0x40, 0x34, 0x00, 0xDF, 0x00, 0x6C,</div><div class='add'>+0x01, 0x70, 0x0D, 0xC0, 0x77, 0x0A, 0xD3, 0x80, 0x6C, 0x03, 0xF0, 0x08, 0xC4,</div><div class='add'>+0x34, 0x00, 0xDF, 0x00, 0x7C, 0x0E, 0x30, 0x39, 0xC0, 0x82, 0x00, 0x0E, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x07, 0x88, 0x3D, 0x10, 0xEF, 0x00, 0xFC, 0x80, 0x70,</div><div class='add'>+0x03, 0xC0, 0x3F, 0x00, 0xFB, 0x80, 0xF8, 0x03, 0xB4, 0x0F, 0xC0, 0x1A, 0x00,</div><div class='add'>+0xFB, 0x00, 0x5C, 0x22, 0xF0, 0x0F, 0xC2, 0x37, 0x30, 0xEF, 0x00, 0x5C, 0x0D,</div><div class='add'>+0xF3, 0x0F, 0xC0, 0x7F, 0x40, 0xFF, 0x80, 0xDC, 0x03, 0xB0, 0x0B, 0xC0, 0x3F,</div><div class='add'>+0x20, 0xFF, 0x00, 0xFC, 0x02, 0xF0, 0x0B, 0xC0, 0x0F, 0x20, 0x06, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x02, 0x08, 0x35, 0x0A, 0x93, 0x00, 0x4C, 0x0A, 0xF2, 0x69,</div><div class='add'>+0xC0, 0x33, 0x20, 0xDF, 0x02, 0x5D, 0x83, 0xF0, 0xCD, 0xC0, 0x84, 0x00, 0xD3,</div><div class='add'>+0x01, 0x7C, 0x09, 0x70, 0x0D, 0xC0, 0x34, 0x40, 0xD3, 0x84, 0x7C, 0x81, 0x30,</div><div class='add'>+0x8D, 0xC0, 0x35, 0x00, 0xD3, 0x00, 0x7C, 0x03, 0x70, 0x09, 0xC0, 0x34, 0x00,</div><div class='add'>+0xDB, 0x00, 0x7C, 0x08, 0xF0, 0x09, 0xC0, 0x2B, 0x20, 0x04, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x13, 0xA0, 0xF8, 0x02, 0x51, 0x20, 0x44, 0x02, 0xD0, 0x09, 0x45,</div><div class='add'>+0x3F, 0x00, 0xDD, 0x01, 0x7C, 0x83, 0x10, 0x3D, 0x40, 0x14, 0x08, 0xC0, 0x20,</div><div class='add'>+0x74, 0x03, 0x12, 0xBF, 0x40, 0xFC, 0x02, 0xF1, 0x00, 0x74, 0x83, 0x10, 0x1F,</div><div class='add'>+0x40, 0x34, 0x00, 0xD1, 0x00, 0xF4, 0x03, 0x10, 0x09, 0x40, 0x34, 0x80, 0xD1,</div><div class='add'>+0x00, 0x74, 0x02, 0xD0, 0x09, 0x40, 0x4F, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x03, 0x20, 0x30, 0x00, 0x81, 0x12, 0x04, 0x4C, 0xD9, 0x38, 0x40, 0x33,</div><div class='add'>+0x00, 0xCD, 0x09, 0x54, 0x03, 0x10, 0x2D, 0x40, 0x20, 0x08, 0xC1, 0x00, 0x34,</div><div class='add'>+0x07, 0x11, 0xAC, 0x48, 0xB1, 0x00, 0xC1, 0x01, 0x34, 0x82, 0x10, 0x1C, 0x41,</div><div class='add'>+0x36, 0x00, 0xC9, 0x20, 0x74, 0x03, 0x50, 0x08, 0x40, 0x30, 0x00, 0xC1, 0x00,</div><div class='add'>+0x74, 0x00, 0xD0, 0x01, 0x60, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x04, 0x00, 0x70, 0x00, 0xA1, 0x89, 0x84, 0x07, 0xD8, 0x1E, 0x40, 0x7B, 0x02,</div><div class='add'>+0xFD, 0x09, 0xB4, 0x07, 0x12, 0x1E, 0x40, 0x68, 0x00, 0xE1, 0x81, 0xB4, 0x07,</div><div class='add'>+0x10, 0x1E, 0x40, 0x79, 0x05, 0xE1, 0x11, 0xB4, 0x27, 0x10, 0x1C, 0x40, 0xFA,</div><div class='add'>+0x00, 0xE9, 0x81, 0xB4, 0x07, 0x10, 0x1A, 0x40, 0x78, 0x00, 0xE8, 0x0B, 0xB4,</div><div class='add'>+0x84, 0xD0, 0x1A, 0x40, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12,</div><div class='add'>+0x18, 0x30, 0x00, 0x83, 0x20, 0x0C, 0x41, 0xF0, 0x8C, 0xC4, 0x33, 0x20, 0x4F,</div><div class='add'>+0x00, 0x1D, 0x23, 0x70, 0x8C, 0xC0, 0x84, 0x40, 0xC3, 0x00, 0x3C, 0x43, 0x74,</div><div class='add'>+0x0D, 0xC0, 0x31, 0x00, 0xC3, 0x00, 0x3C, 0x00, 0x30, 0x0C, 0xD0, 0x33, 0x00,</div><div class='add'>+0xCA, 0x08, 0x3C, 0x03, 0x74, 0x0C, 0xD0, 0x34, 0x00, 0xC3, 0x1D, 0x3C, 0x08,</div><div class='add'>+0xF0, 0x70, 0xC8, 0x4B, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x38,</div><div class='add'>+0x3D, 0x00, 0xFF, 0x00, 0xFC, 0x03, 0xF0, 0x0F, 0xC0, 0x3F, 0x04, 0x6F, 0x00,</div><div class='add'>+0xFC, 0xA3, 0x70, 0x0F, 0xE0, 0x2F, 0x00, 0xFF, 0x00, 0xFC, 0x03, 0xF0, 0x2F,</div><div class='add'>+0xC1, 0x3E, 0x0D, 0xFF, 0x00, 0xFE, 0x03, 0xF2, 0x0F, 0xC0, 0x3D, 0x00, 0xF7,</div><div class='add'>+0x00, 0xFC, 0x03, 0xF0, 0x0F, 0xC0, 0x3F, 0x00, 0xF5, 0x28, 0xFC, 0x00, 0xF0,</div><div class='add'>+0x83, 0xC0, 0x0B, 0x60, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xA0, 0x37,</div><div class='add'>+0x01, 0xB3, 0x02, 0x4D, 0x01, 0xF0, 0x05, 0xC0, 0xB7, 0x00, 0xD3, 0x80, 0x6C,</div><div class='add'>+0x03, 0xF2, 0x0D, 0xC2, 0x17, 0x00, 0xDF, 0x00, 0x7C, 0x00, 0x30, 0x2D, 0xC0,</div><div class='add'>+0xB4, 0x04, 0xD3, 0x04, 0x7C, 0x86, 0x30, 0x6D, 0xC0, 0x77, 0x00, 0xD3, 0x40,</div><div class='add'>+0x7C, 0x53, 0xB0, 0x09, 0xC0, 0x37, 0x00, 0xDF, 0x01, 0x44, 0x82, 0xF0, 0x11,</div><div class='add'>+0xC0, 0x40, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x80, 0x3D, 0x05,</div><div class='add'>+0xE1, 0x10, 0x84, 0x01, 0xD0, 0x06, 0x40, 0x3F, 0x04, 0xE5, 0x00, 0x84, 0x03,</div><div class='add'>+0xD0, 0x0E, 0x40, 0x3B, 0x20, 0xED, 0xA0, 0x9C, 0x02, 0x10, 0x4F, 0x42, 0x3C,</div><div class='add'>+0x21, 0xE1, 0x0A, 0x9C, 0x03, 0x18, 0x8E, 0x40, 0x3B, 0x00, 0xE1, 0x00, 0xB4,</div><div class='add'>+0x0B, 0x10, 0x0A, 0x48, 0x3B, 0x00, 0xFD, 0x00, 0x84, 0x02, 0xD0, 0x0A, 0x40,</div><div class='add'>+0x4C, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x79, 0x42, 0x81,</div><div class='add'>+0x01, 0x84, 0x07, 0x50, 0x1E, 0x40, 0x7B, 0x00, 0x49, 0x01, 0xA4, 0x47, 0x50,</div><div class='add'>+0x1E, 0x40, 0x5B, 0x00, 0xED, 0x01, 0x14, 0x05, 0x14, 0x1E, 0x50, 0x7A, 0x40,</div><div class='add'>+0xE1, 0x21, 0x34, 0x04, 0xD0, 0x9E, 0x60, 0x7B, 0x40, 0xE1, 0x01, 0x34, 0x17,</div><div class='add'>+0x90, 0x1A, 0x40, 0x7B, 0x00, 0xED, 0x01, 0x84, 0x04, 0xD0, 0x10, 0x40, 0x02,</div><div class='add'>+0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16, 0x28, 0x33, 0x00, 0x41, 0x0A,</div><div class='add'>+0x04, 0xC3, 0xC1, 0xBC, 0x44, 0x33, 0x00, 0x5D, 0x01, 0x04, 0x05, 0xD0, 0x08,</div><div class='add'>+0x40, 0x73, 0x0A, 0x8D, 0x20, 0x14, 0x0F, 0x10, 0x0C, 0x40, 0x32, 0x80, 0xC1,</div><div class='add'>+0x00, 0x14, 0x03, 0xD0, 0x0C, 0x40, 0x23, 0x00, 0x81, 0x40, 0x34, 0x03, 0x12,</div><div class='add'>+0x89, 0x42, 0x33, 0x00, 0xCD, 0x00, 0x04, 0x83, 0xD8, 0x1C, 0x40, 0x5A, 0x20,</div><div class='add'>+0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x17, 0xA0, 0x15, 0x00, 0x73, 0x03, 0xCC,</div><div class='add'>+0x0D, 0xE0, 0x07, 0xC0, 0x17, 0x00, 0x7B, 0x00, 0xEC, 0x05, 0xF0, 0x15, 0xC2,</div><div class='add'>+0x1F, 0x00, 0x5F, 0x05, 0xDC, 0x61, 0x30, 0x05, 0xC0, 0x16, 0x60, 0x53, 0x80,</div><div class='add'>+0xF4, 0x01, 0xF1, 0x05, 0xC0, 0x17, 0x00, 0x53, 0x00, 0x7C, 0x01, 0xB0, 0x05,</div><div class='add'>+0xC0, 0x17, 0x10, 0x5F, 0x00, 0xCC, 0x39, 0xF0, 0x37, 0xC0, 0x5E, 0x00, 0x04,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x08, 0x81, 0x00, 0x0F, 0x04, 0x7C, 0x28,</div><div class='add'>+0xF1, 0x01, 0xC3, 0x07, 0x10, 0x17, 0x08, 0x7C, 0x04, 0xF0, 0xA1, 0xC0, 0x07,</div><div class='add'>+0x01, 0x1F, 0x00, 0x1C, 0x00, 0xF0, 0x20, 0xC0, 0x05, 0x00, 0x1F, 0x00, 0x5C,</div><div class='add'>+0x80, 0x34, 0x21, 0xC0, 0x07, 0x02, 0x1F, 0x00, 0x3C, 0x80, 0xF0, 0x01, 0xC0,</div><div class='add'>+0x07, 0x80, 0x1E, 0x02, 0x7C, 0x00, 0xF0, 0x81, 0xC1, 0x49, 0x20, 0x04, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x10, 0x08, 0x65, 0x00, 0x93, 0x08, 0x6C, 0x06, 0xF0,</div><div class='add'>+0x89, 0xC0, 0x63, 0x00, 0x93, 0x02, 0x4C, 0x02, 0x31, 0x09, 0xD0, 0x24, 0x00,</div><div class='add'>+0x9B, 0x00, 0x7C, 0x02, 0x34, 0x09, 0xD0, 0x64, 0xC0, 0x93, 0x08, 0x7C, 0x02,</div><div class='add'>+0xF0, 0x09, 0xC0, 0x27, 0x00, 0x9F, 0x00, 0x7C, 0x02, 0x70, 0x09, 0xC0, 0x24,</div><div class='add'>+0x00, 0x97, 0x00, 0x7C, 0x02, 0xF0, 0x09, 0xC0, 0x43, 0x20, 0x04, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x01, 0x20, 0x64, 0x40, 0x91, 0x00, 0x44, 0x6E, 0xD2, 0x29,</div><div class='add'>+0x40, 0x27, 0x02, 0x91, 0x03, 0x04, 0x02, 0x10, 0x39, 0x41, 0x24, 0x08, 0x91,</div><div class='add'>+0x20, 0x7C, 0x26, 0x11, 0x29, 0x40, 0x24, 0x02, 0x91, 0x02, 0x74, 0x02, 0xD0,</div><div class='add'>+0x79, 0x40, 0x27, 0x00, 0x9D, 0x00, 0x7C, 0x02, 0xB0, 0x09, 0x40, 0x24, 0x00,</div><div class='add'>+0x9D, 0x04, 0x74, 0x02, 0xD0, 0x09, 0x42, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x18, 0xA0, 0x24, 0x02, 0x91, 0x00, 0x64, 0x02, 0xD0, 0x29, 0x40,</div><div class='add'>+0x27, 0x00, 0x91, 0x10, 0x44, 0x02, 0x10, 0x88, 0x48, 0x20, 0x00, 0x99, 0x04,</div><div class='add'>+0x74, 0x02, 0x10, 0x09, 0x40, 0x20, 0x00, 0x91, 0x10, 0x74, 0x02, 0x50, 0x49,</div><div class='add'>+0x40, 0x67, 0x00, 0x9D, 0x00, 0x74, 0x02, 0x50, 0x09, 0x40, 0x64, 0x00, 0x95,</div><div class='add'>+0x01, 0x74, 0x02, 0xD0, 0x09, 0x40, 0x63, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x10, 0x20, 0x20, 0x41, 0x81, 0x04, 0x04, 0x1A, 0x90, 0x08, 0x40, 0x23,</div><div class='add'>+0xC1, 0x81, 0x04, 0x45, 0x02, 0x18, 0x08, 0x40, 0x20, 0x01, 0x89, 0x00, 0x34,</div><div class='add'>+0x12, 0x10, 0x4C, 0x40, 0x20, 0x01, 0x81, 0x04, 0x34, 0x12, 0xD0, 0x48, 0x40,</div><div class='add'>+0x23, 0x00, 0x8D, 0x00, 0x34, 0x22, 0x90, 0x08, 0x54, 0x20, 0x00, 0x8D, 0x00,</div><div class='add'>+0x34, 0x12, 0xD0, 0x48, 0x60, 0x43, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x1D, 0xB8, 0x96, 0x02, 0x13, 0x00, 0x6C, 0x08, 0xF0, 0x81, 0x44, 0x87, 0x02,</div><div class='add'>+0x13, 0x0A, 0x4C, 0x28, 0x30, 0xA1, 0xC0, 0x84, 0x02, 0x1B, 0x00, 0x7C, 0x00,</div><div class='add'>+0x30, 0xA1, 0x42, 0x84, 0x02, 0x11, 0x00, 0x7C, 0xA8, 0xF0, 0x01, 0xC0, 0x83,</div><div class='add'>+0x12, 0x1F, 0x0A, 0x7C, 0x58, 0x70, 0xA1, 0xC0, 0x84, 0x02, 0x17, 0x0A, 0x7C,</div><div class='add'>+0x28, 0xF0, 0x01, 0xC0, 0x77, 0xE0, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1D,</div><div class='add'>+0xB0, 0x27, 0x02, 0xBF, 0x08, 0xF4, 0x0A, 0xF0, 0x8B, 0xC0, 0x27, 0x02, 0xFF,</div><div class='add'>+0x08, 0xFC, 0x02, 0xF4, 0x0B, 0xC2, 0x2F, 0x02, 0xB7, 0x00, 0xDC, 0x22, 0xF0,</div><div class='add'>+0x89, 0xC8, 0x27, 0x02, 0x9F, 0x08, 0xFC, 0x22, 0xF0, 0x89, 0xC0, 0x2F, 0x08,</div><div class='add'>+0xBF, 0x00, 0x5C, 0x92, 0x70, 0x0B, 0xC2, 0x27, 0x00, 0x9F, 0x00, 0xFC, 0x22,</div><div class='add'>+0xF0, 0x8B, 0xC0, 0x77, 0x60, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xA0,</div><div class='add'>+0x2F, 0x05, 0xB3, 0x84, 0xFC, 0x02, 0xF0, 0x0B, 0xC0, 0x2F, 0x02, 0xB3, 0x04,</div><div class='add'>+0x5C, 0x02, 0x30, 0x8B, 0xE0, 0x25, 0x00, 0xB7, 0x00, 0xDC, 0x02, 0xF0, 0x4B,</div><div class='add'>+0xC0, 0x2F, 0x05, 0xBF, 0x04, 0x4C, 0x03, 0xF4, 0x0B, 0xC0, 0x2F, 0x02, 0xDF,</div><div class='add'>+0x00, 0x4C, 0x52, 0xB0, 0x89, 0xC0, 0x2F, 0x00, 0xBF, 0x00, 0x7C, 0x02, 0xE2,</div><div class='add'>+0x09, 0x00, 0x77, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x07,</div><div class='add'>+0x01, 0x11, 0x88, 0x74, 0x49, 0xD0, 0x05, 0x41, 0x07, 0x02, 0x15, 0x14, 0x44,</div><div class='add'>+0x90, 0x11, 0x41, 0x42, 0x87, 0x44, 0x11, 0x00, 0x74, 0x20, 0x72, 0x41, 0xC1,</div><div class='add'>+0x05, 0x01, 0x1C, 0x08, 0x54, 0x49, 0x10, 0x01, 0x44, 0x07, 0x00, 0x1D, 0x14,</div><div class='add'>+0x54, 0x10, 0x70, 0x41, 0x40, 0x07, 0x24, 0x1D, 0x00, 0x74, 0x00, 0xD0, 0x01,</div><div class='add'>+0x42, 0x63, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x20, 0x05,</div><div class='add'>+0x81, 0x00, 0x34, 0x32, 0xD0, 0x88, 0x40, 0x23, 0x20, 0x81, 0x2C, 0x44, 0x56,</div><div class='add'>+0x04, 0x48, 0x40, 0x25, 0x43, 0x85, 0x40, 0x14, 0x02, 0xD0, 0xC8, 0x40, 0x23,</div><div class='add'>+0x25, 0xCD, 0x00, 0x24, 0x32, 0x10, 0x88, 0x40, 0x33, 0x00, 0x9D, 0x04, 0x04,</div><div class='add'>+0x52, 0x90, 0x48, 0x44, 0x23, 0x01, 0x8D, 0x00, 0x34, 0x02, 0xD0, 0x08, 0x40,</div><div class='add'>+0x4B, 0x80, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x28, 0x25, 0x00, 0x91,</div><div class='add'>+0x01, 0x74, 0x83, 0xD0, 0x89, 0x40, 0x23, 0x00, 0x95, 0x00, 0x44, 0x02, 0x10,</div><div class='add'>+0x19, 0x40, 0xA7, 0xC0, 0x91, 0x01, 0x74, 0x06, 0x50, 0x09, 0x00, 0x27, 0x08,</div><div class='add'>+0x99, 0x00, 0x74, 0x02, 0x10, 0x09, 0x40, 0x27, 0x00, 0x9D, 0x00, 0x50, 0x02,</div><div class='add'>+0x58, 0x09, 0x40, 0x27, 0x08, 0x9D, 0x00, 0x74, 0x12, 0xD0, 0x09, 0x43, 0x63,</div><div class='add'>+0x28, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x20, 0x24, 0x40, 0x93, 0x05,</div><div class='add'>+0x7C, 0x0E, 0xF0, 0x39, 0xC0, 0x27, 0x00, 0x93, 0x03, 0x1D, 0x02, 0x10, 0x09,</div><div class='add'>+0xC8, 0x25, 0x40, 0x97, 0x20, 0x5C, 0x02, 0xF3, 0x09, 0xC0, 0x27, 0x10, 0x9F,</div><div class='add'>+0x00, 0x6C, 0x02, 0x70, 0x09, 0xC0, 0x67, 0x20, 0x8F, 0x01, 0x49, 0x02, 0xB0,</div><div class='add'>+0x19, 0xC8, 0x27, 0x10, 0x9F, 0x00, 0x7C, 0x16, 0xF0, 0x29, 0xC0, 0x17, 0x08,</div><div class='add'>+0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16, 0x08, 0x21, 0x10, 0x9F, 0x20, 0x7C,</div><div class='add'>+0x12, 0xF0, 0x09, 0xC1, 0x27, 0x00, 0x9F, 0x02, 0x7C, 0x26, 0xF0, 0x09, 0xC0,</div><div class='add'>+0x27, 0x00, 0x9F, 0x00, 0x7C, 0x02, 0xF0, 0x09, 0xE0, 0x25, 0x04, 0x9F, 0x00,</div><div class='add'>+0x5C, 0x02, 0x70, 0x09, 0xC1, 0x27, 0x01, 0x9F, 0x84, 0x6C, 0x02, 0xB0, 0x59,</div><div class='add'>+0xC0, 0x27, 0x00, 0x9F, 0x00, 0x7C, 0x06, 0xF0, 0x59, 0xC0, 0x5B, 0x20, 0x04,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x08, 0x05, 0x00, 0x13, 0x04, 0x7E, 0x68,</div><div class='add'>+0xB4, 0x21, 0xD0, 0x04, 0x08, 0x1D, 0x02, 0x6C, 0x00, 0xF0, 0x01, 0xC8, 0x07,</div><div class='add'>+0x00, 0x1F, 0x08, 0x7C, 0x00, 0xF0, 0x81, 0xC0, 0x07, 0x40, 0x13, 0x00, 0x5C,</div><div class='add'>+0x08, 0xF0, 0x01, 0xC0, 0x04, 0x00, 0x1F, 0x00, 0x7C, 0x00, 0x30, 0x01, 0xC0,</div><div class='add'>+0x07, 0x00, 0x1F, 0x0C, 0x7C, 0x08, 0x30, 0x21, 0xC2, 0x53, 0x20, 0x04, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x1C, 0x40, 0x71, 0x01, 0xE4, 0x0D, 0x30,</div><div class='add'>+0x07, 0x41, 0x14, 0x00, 0x7D, 0x0D, 0x44, 0x01, 0x70, 0x07, 0xC0, 0x11, 0x00,</div><div class='add'>+0x5D, 0x00, 0x76, 0x05, 0x90, 0x07, 0x40, 0x9F, 0x08, 0x61, 0x02, 0x44, 0x01,</div><div class='add'>+0x70, 0x17, 0xC8, 0x9E, 0x02, 0x5D, 0x00, 0x74, 0x01, 0x52, 0x05, 0x40, 0x17,</div><div class='add'>+0x01, 0x7D, 0x03, 0x74, 0x01, 0x10, 0x05, 0x44, 0x43, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x10, 0xA0, 0x72, 0x00, 0x81, 0x09, 0x24, 0x0B, 0x50, 0x2C,</div><div class='add'>+0x42, 0x30, 0x00, 0xDD, 0x03, 0x24, 0x03, 0xD0, 0x9C, 0x40, 0x33, 0x00, 0x8D,</div><div class='add'>+0x01, 0x34, 0x22, 0xD0, 0x1C, 0x40, 0x33, 0x00, 0xC1, 0x10, 0x54, 0x83, 0x50,</div><div class='add'>+0xB4, 0x40, 0x30, 0x00, 0xCD, 0x40, 0x74, 0x03, 0x10, 0x0C, 0x40, 0x72, 0x00,</div><div class='add'>+0xCD, 0x81, 0x36, 0x83, 0x10, 0x0C, 0x40, 0x43, 0x00, 0x0A, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x04, 0x80, 0x20, 0x05, 0xA1, 0x00, 0xA4, 0x07, 0x50, 0x1E, 0x60,</div><div class='add'>+0x38, 0x00, 0xAD, 0x04, 0x84, 0x13, 0xD0, 0x0E, 0x48, 0x3B, 0x00, 0xED, 0x80,</div><div class='add'>+0xB4, 0x03, 0x90, 0x0E, 0x44, 0x6B, 0x10, 0x21, 0x40, 0x84, 0x23, 0x40, 0x1E,</div><div class='add'>+0x40, 0x3A, 0x00, 0xED, 0x08, 0xB4, 0x13, 0x50, 0x4E, 0x40, 0x3B, 0x10, 0xAC,</div><div class='add'>+0x00, 0x34, 0x27, 0x10, 0x0E, 0x40, 0x13, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x14, 0x18, 0xE8, 0x00, 0xA1, 0x01, 0xF4, 0x07, 0x70, 0x17, 0xC0, 0x78,</div><div class='add'>+0x00, 0xEF, 0x03, 0xAC, 0x27, 0xF0, 0x1E, 0xC0, 0x7B, 0x22, 0xED, 0x01, 0xB6,</div><div class='add'>+0x07, 0xF0, 0x16, 0x82, 0x73, 0x00, 0x03, 0x01, 0x9C, 0x17, 0x60, 0x1E, 0xC0,</div><div class='add'>+0x78, 0x08, 0xEF, 0x89, 0x3C, 0x17, 0x38, 0xDE, 0xC8, 0x7B, 0x00, 0xAF, 0x01,</div><div class='add'>+0xBC, 0x27, 0x30, 0x1E, 0xC0, 0x53, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x10, 0xB8, 0x05, 0x00, 0x9F, 0x00, 0x74, 0x03, 0x30, 0x05, 0xC0, 0x37, 0x08,</div><div class='add'>+0x8F, 0x00, 0x7C, 0x03, 0x70, 0x01, 0xC0, 0x35, 0x03, 0xDF, 0x00, 0x7C, 0x83,</div><div class='add'>+0xB1, 0x0D, 0xC0, 0x27, 0x00, 0x1F, 0x00, 0x7C, 0x9B, 0x51, 0x0C, 0xC0, 0x37,</div><div class='add'>+0x00, 0xDF, 0x02, 0x7C, 0x4B, 0x70, 0x8D, 0xC0, 0x37, 0x00, 0x9F, 0x00, 0x7C,</div><div class='add'>+0x03, 0xF2, 0x0D, 0xC0, 0x43, 0x60, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06,</div><div class='add'>+0x20, 0x6D, 0x00, 0xF3, 0x01, 0xCC, 0x11, 0xB0, 0x1F, 0xC0, 0xFF, 0x00, 0xFF,</div><div class='add'>+0x01, 0xCC, 0x47, 0xF0, 0x1B, 0xC0, 0x7F, 0x00, 0xFF, 0x01, 0xBC, 0x07, 0x30,</div><div class='add'>+0x9F, 0xE0, 0x5C, 0x00, 0x3F, 0x01, 0xF8, 0x2F, 0x38, 0x1F, 0xC8, 0x6E, 0x28,</div><div class='add'>+0xF3, 0x81, 0xFC, 0x47, 0xFA, 0x9F, 0xC8, 0x6F, 0x00, 0x33, 0x21, 0x7C, 0x27,</div><div class='add'>+0x30, 0x9F, 0xC4, 0x1B, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x00,</div><div class='add'>+0x29, 0x20, 0xE1, 0x08, 0x84, 0x21, 0x31, 0x0E, 0x40, 0x3B, 0x00, 0xED, 0x00,</div><div class='add'>+0x84, 0x03, 0xD0, 0x0A, 0x40, 0x3B, 0x14, 0xED, 0x80, 0x9C, 0x23, 0x70, 0x8A,</div><div class='add'>+0xC0, 0x28, 0x01, 0x2D, 0x20, 0x9C, 0x03, 0x30, 0x4E, 0x40, 0x0C, 0x12, 0xE1,</div><div class='add'>+0x18, 0xB4, 0x03, 0x70, 0x0E, 0x40, 0x2F, 0x30, 0x01, 0x00, 0xB4, 0x07, 0xB0,</div><div class='add'>+0x0C, 0x40, 0x57, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28,</div><div class='add'>+0x00, 0xA1, 0x00, 0x84, 0x01, 0x10, 0x0E, 0x41, 0x3B, 0x00, 0x6D, 0x00, 0x84,</div><div class='add'>+0x0B, 0x50, 0x0E, 0x40, 0x3B, 0x00, 0xED, 0x00, 0xB4, 0x03, 0x10, 0x06, 0x70,</div><div class='add'>+0x18, 0x10, 0x2D, 0x00, 0x14, 0x43, 0x1D, 0x0E, 0x40, 0x28, 0x44, 0xE5, 0x00,</div><div class='add'>+0xB4, 0x03, 0xD0, 0x0E, 0x44, 0x2B, 0x02, 0xA9, 0x00, 0xB4, 0x03, 0x10, 0x0E,</div><div class='add'>+0x40, 0x23, 0x02, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x28, 0x01, 0x00,</div><div class='add'>+0x81, 0x06, 0x05, 0x80, 0x10, 0x08, 0x40, 0x37, 0x00, 0x4D, 0x00, 0x04, 0x87,</div><div class='add'>+0xD0, 0x00, 0x46, 0x73, 0x08, 0xCD, 0x00, 0x14, 0x93, 0x51, 0x08, 0x40, 0x20,</div><div class='add'>+0x08, 0x0D, 0x00, 0x14, 0x03, 0x10, 0x0C, 0x40, 0x40, 0x10, 0xD5, 0x80, 0x34,</div><div class='add'>+0x03, 0x50, 0x0C, 0x60, 0x23, 0x00, 0x89, 0x20, 0x76, 0x13, 0x1C, 0xED, 0x48,</div><div class='add'>+0x4B, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0xA0, 0x2D, 0x40, 0x93,</div><div class='add'>+0x00, 0x44, 0x06, 0x30, 0x09, 0xC0, 0x27, 0x00, 0xBF, 0x00, 0xCD, 0x07, 0xF0,</div><div class='add'>+0x05, 0xC0, 0xFF, 0x02, 0xDF, 0x00, 0x7C, 0x0B, 0x30, 0x09, 0xC4, 0x34, 0x00,</div><div class='add'>+0x1F, 0x00, 0xDC, 0x07, 0x30, 0x0D, 0xD0, 0x54, 0x00, 0xF7, 0x01, 0xFC, 0x03,</div><div class='add'>+0xF0, 0x0F, 0xC0, 0x37, 0x40, 0x1B, 0x00, 0xFC, 0x03, 0x10, 0x3D, 0xC4, 0x77,</div><div class='add'>+0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x08, 0x27, 0x00, 0x0F, 0x01,</div><div class='add'>+0x7C, 0x68, 0x70, 0x29, 0xC0, 0x27, 0x10, 0x9F, 0x00, 0x7C, 0x23, 0xF0, 0x1D,</div><div class='add'>+0xC8, 0x37, 0x00, 0xDF, 0x01, 0x1C, 0x03, 0x72, 0x25, 0xC0, 0x95, 0x00, 0x1F,</div><div class='add'>+0x82, 0x1C, 0x03, 0x70, 0x0D, 0xC0, 0x17, 0x00, 0xDB, 0x00, 0x7C, 0x03, 0x70,</div><div class='add'>+0x0D, 0xC0, 0x37, 0x00, 0x97, 0x00, 0x7C, 0x87, 0xF0, 0x0D, 0xC4, 0x17, 0x20,</div><div class='add'>+0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x08, 0x2F, 0x00, 0x93, 0x00, 0x4C,</div><div class='add'>+0x02, 0xF0, 0x02, 0xC1, 0x3C, 0x00, 0xF3, 0x02, 0xCC, 0x03, 0xF0, 0x07, 0xC0,</div><div class='add'>+0x3C, 0x00, 0xFF, 0x03, 0xCC, 0x03, 0x30, 0x82, 0xC0, 0x6C, 0x40, 0x33, 0x00,</div><div class='add'>+0xFC, 0x43, 0x30, 0x0D, 0xC0, 0x4F, 0x00, 0xF3, 0x00, 0x8D, 0x03, 0x30, 0x0F,</div><div class='add'>+0xC0, 0x6F, 0x00, 0x3F, 0x00, 0xFC, 0x03, 0x30, 0x0F, 0xD0, 0x04, 0x20, 0x0C,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x81, 0x20, 0x46, 0x02, 0x11, 0x02, 0x54, 0x06,</div><div class='add'>+0x90, 0x71, 0x40, 0x34, 0x00, 0x91, 0x00, 0x44, 0x03, 0xD0, 0x20, 0x40, 0x34,</div><div class='add'>+0x00, 0xCD, 0x00, 0x6C, 0x03, 0x10, 0x25, 0x41, 0x84, 0x06, 0x11, 0x01, 0x74,</div><div class='add'>+0x03, 0x10, 0x1D, 0xC0, 0x41, 0x00, 0xD1, 0x00, 0x44, 0x03, 0x50, 0x0D, 0x40,</div><div class='add'>+0x67, 0x00, 0x9D, 0x05, 0x74, 0x03, 0x10, 0x0D, 0xC2, 0x06, 0x00, 0x08, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x01, 0xA0, 0x22, 0x00, 0xD1, 0x02, 0x44, 0x06, 0xD0,</div><div class='add'>+0x11, 0x40, 0x64, 0x00, 0x81, 0x00, 0x44, 0x03, 0xD8, 0x21, 0x40, 0x34, 0x00,</div><div class='add'>+0xDD, 0x00, 0x44, 0x07, 0x10, 0x09, 0x40, 0x10, 0x80, 0x11, 0x03, 0x74, 0x03,</div><div class='add'>+0x90, 0x1D, 0x41, 0x37, 0x01, 0xD1, 0x00, 0x44, 0x03, 0x10, 0x0D, 0x40, 0x37,</div><div class='add'>+0x01, 0x1D, 0x01, 0x74, 0x03, 0x14, 0x0D, 0x44, 0x04, 0x00, 0x0A, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x10, 0x20, 0x20, 0x00, 0xC1, 0x00, 0x14, 0x00, 0x98, 0x08,</div><div class='add'>+0x40, 0x20, 0x00, 0x81, 0x80, 0x05, 0x03, 0xD0, 0x09, 0x40, 0x30, 0x00, 0xDD,</div><div class='add'>+0x00, 0x24, 0x03, 0x14, 0x00, 0x50, 0x10, 0x00, 0x01, 0x00, 0x34, 0x03, 0x90,</div><div class='add'>+0x0C, 0x40, 0x57, 0x00, 0xC1, 0x00, 0x04, 0x03, 0x50, 0x0C, 0x40, 0x33, 0x80,</div><div class='add'>+0x0D, 0x02, 0x74, 0x03, 0x10, 0x0D, 0x4C, 0x42, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x98, 0x22, 0x40, 0x93, 0x00, 0x4C, 0x02, 0xF1, 0x01, 0x50,</div><div class='add'>+0x3C, 0x00, 0x43, 0x00, 0xCC, 0x03, 0xF0, 0x05, 0xD0, 0x3C, 0x00, 0xDF, 0x00,</div><div class='add'>+0x44, 0x03, 0x30, 0x00, 0xC0, 0x04, 0x00, 0x13, 0x00, 0xFC, 0x03, 0xB0, 0x0D,</div><div class='add'>+0xC0, 0x27, 0x40, 0xF3, 0x00, 0xC4, 0x03, 0x30, 0x0F, 0xC0, 0x27, 0x00, 0x1F,</div><div class='add'>+0x02, 0xBC, 0x13, 0x30, 0xAD, 0xC2, 0x04, 0x60, 0x08, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x05, 0xB0, 0x0F, 0x00, 0xBF, 0x00, 0xFC, 0x02, 0xF8, 0x0B, 0xC0, 0x3F,</div><div class='add'>+0x00, 0x7F, 0x00, 0xFC, 0x03, 0xF0, 0x03, 0x40, 0x3F, 0x00, 0xFF, 0x00, 0xFC,</div><div class='add'>+0x03, 0xF0, 0x03, 0xC0, 0x0F, 0x00, 0x3F, 0x00, 0xFC, 0x03, 0x74, 0x0B, 0xE0,</div><div class='add'>+0x0D, 0x00, 0xFF, 0x00, 0xFC, 0x03, 0xF0, 0x0F, 0xC8, 0x2F, 0x30, 0xBF, 0x04,</div><div class='add'>+0x7C, 0x0B, 0xF0, 0x4F, 0xC0, 0x17, 0x62, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x03, 0xA0, 0x7F, 0x00, 0x7E, 0x01, 0xFC, 0x07, 0x30, 0x1F, 0x44, 0x3C, 0x05,</div><div class='add'>+0xF7, 0x00, 0xEC, 0x23, 0xB0, 0x4F, 0xC0, 0x49, 0x00, 0x37, 0x03, 0xFC, 0x03,</div><div class='add'>+0x32, 0x2F, 0x40, 0x3D, 0x02, 0x23, 0x03, 0xDC, 0x24, 0x78, 0x93, 0xC0, 0x48,</div><div class='add'>+0x00, 0x23, 0x01, 0xE4, 0x03, 0xB0, 0x17, 0xC0, 0x4C, 0x00, 0xFF, 0x21, 0xCC,</div><div class='add'>+0x06, 0xE0, 0x03, 0xC0, 0x0E, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03,</div><div class='add'>+0x08, 0x7F, 0x00, 0xDD, 0x01, 0xF4, 0x07, 0x10, 0x1F, 0x40, 0xF4, 0x00, 0xF1,</div><div class='add'>+0x03, 0x84, 0x3B, 0x10, 0x9D, 0xC0, 0x64, 0x00, 0x1D, 0x00, 0xF4, 0x2F, 0x14,</div><div class='add'>+0x6F, 0x44, 0xBC, 0x03, 0x11, 0x84, 0x4C, 0x00, 0xD0, 0x41, 0xC0, 0x54, 0x48,</div><div class='add'>+0x51, 0x01, 0x44, 0x2F, 0x10, 0x11, 0x50, 0x44, 0x00, 0xFD, 0xA1, 0x44, 0x04,</div><div class='add'>+0xD1, 0x09, 0x40, 0x0C, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0xA0,</div><div class='add'>+0x33, 0x00, 0x0D, 0x40, 0x34, 0x03, 0x91, 0x0C, 0x40, 0x30, 0x00, 0xC5, 0x22,</div><div class='add'>+0x24, 0x13, 0x91, 0x0C, 0x40, 0x01, 0x08, 0x0D, 0x84, 0x34, 0x03, 0x90, 0x2C,</div><div class='add'>+0x40, 0x31, 0x21, 0x01, 0xC0, 0x14, 0x14, 0x50, 0x01, 0x40, 0x32, 0x20, 0x91,</div><div class='add'>+0x00, 0x04, 0x03, 0x90, 0x0D, 0x40, 0x02, 0x00, 0xCD, 0x00, 0x04, 0x02, 0xD0,</div><div class='add'>+0x01, 0x42, 0x4D, 0x80, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xA8, 0x35,</div><div class='add'>+0x00, 0xDD, 0x00, 0x74, 0x03, 0x90, 0x0D, 0x40, 0x34, 0x00, 0xD1, 0x60, 0x44,</div><div class='add'>+0x03, 0x10, 0x0D, 0x40, 0x64, 0x24, 0x1D, 0x01, 0x74, 0x03, 0x92, 0x0D, 0x40,</div><div class='add'>+0x32, 0x88, 0x01, 0x01, 0x54, 0x04, 0xC0, 0x19, 0x50, 0x94, 0x01, 0x90, 0x08,</div><div class='add'>+0x44, 0x03, 0xD0, 0x09, 0x40, 0x46, 0x04, 0xDD, 0x00, 0x44, 0x46, 0xD1, 0x31,</div><div class='add'>+0x40, 0x0D, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA8, 0x37, 0x00,</div><div class='add'>+0x9F, 0x04, 0x3C, 0x03, 0x94, 0x0C, 0xD0, 0x34, 0x10, 0xD7, 0x00, 0x6C, 0x03,</div><div class='add'>+0xB0, 0x0D, 0xC8, 0x45, 0x10, 0x9F, 0x03, 0x7C, 0x03, 0xB0, 0x0D, 0xC0, 0x35,</div><div class='add'>+0x00, 0x13, 0x11, 0x5C, 0x04, 0x71, 0x30, 0xC0, 0x26, 0x00, 0x13, 0x83, 0x6C,</div><div class='add'>+0x03, 0xB0, 0x48, 0xC0, 0xC6, 0x00, 0xCF, 0x00, 0x4D, 0x0E, 0xF0, 0x31, 0xD0,</div><div class='add'>+0x23, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x80, 0x3D, 0x00, 0xBF,</div><div class='add'>+0x00, 0xFC, 0x03, 0x70, 0x0F, 0xC0, 0x3B, 0x00, 0xED, 0x40, 0xFC, 0x83, 0xF0,</div><div class='add'>+0x0E, 0xC0, 0x0F, 0x00, 0x3F, 0x00, 0xFC, 0x03, 0x70, 0x0E, 0xC4, 0x3D, 0x00,</div><div class='add'>+0xBF, 0x00, 0xEC, 0x02, 0xF0, 0x03, 0xC0, 0x0F, 0x00, 0x7F, 0x00, 0x3C, 0x03,</div><div class='add'>+0x10, 0x4B, 0xC0, 0x0D, 0x00, 0xFF, 0x00, 0xFC, 0x00, 0xF0, 0x09, 0xC0, 0x1E,</div><div class='add'>+0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x08, 0x35, 0x20, 0x9F, 0x00,</div><div class='add'>+0x7C, 0x03, 0xF0, 0x4D, 0xC0, 0x37, 0x00, 0xDF, 0x00, 0x5C, 0x83, 0x70, 0x0D,</div><div class='add'>+0xC0, 0x07, 0x00, 0x93, 0x02, 0x7C, 0x03, 0xB0, 0x0D, 0xC0, 0x34, 0x00, 0x9F,</div><div class='add'>+0x02, 0x5C, 0x02, 0xF0, 0x29, 0xC2, 0xA7, 0x01, 0x93, 0x06, 0x7C, 0x47, 0x30,</div><div class='add'>+0x49, 0xC0, 0x87, 0x00, 0xDF, 0x00, 0x7C, 0x02, 0xF0, 0x01, 0xC4, 0x08, 0x20,</div><div class='add'>+0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0xA0, 0x34, 0x20, 0x9D, 0x80, 0x74,</div><div class='add'>+0x03, 0xD0, 0x4D, 0x60, 0x3F, 0x00, 0xFD, 0x00, 0xC4, 0x83, 0x10, 0x0F, 0x44,</div><div class='add'>+0xA7, 0x1A, 0x91, 0x00, 0xBC, 0x13, 0xD0, 0x0F, 0x40, 0x3C, 0x00, 0x9D, 0x00,</div><div class='add'>+0x44, 0x02, 0xD0, 0x19, 0x40, 0x83, 0x01, 0xC1, 0x51, 0xC4, 0x0B, 0x50, 0x09,</div><div class='add'>+0x40, 0x87, 0x00, 0xDC, 0x00, 0x74, 0x0A, 0xD0, 0x99, 0x40, 0x6D, 0x00, 0x02,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xA0, 0x32, 0x00, 0xCD, 0x00, 0x34, 0x13,</div><div class='add'>+0xD0, 0x2C, 0x40, 0x33, 0x00, 0xCD, 0x00, 0x54, 0x03, 0x58, 0x0C, 0x41, 0x23,</div><div class='add'>+0x00, 0x81, 0x00, 0x34, 0x13, 0x90, 0x0C, 0x44, 0x30, 0x00, 0x0D, 0x80, 0x14,</div><div class='add'>+0x00, 0xD1, 0x00, 0x40, 0x82, 0x08, 0xC5, 0x63, 0x14, 0x03, 0x10, 0x3C, 0x40,</div><div class='add'>+0xC3, 0x03, 0xCD, 0x00, 0x34, 0x16, 0xD0, 0x19, 0x40, 0x0C, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x0D, 0x80, 0x78, 0x00, 0xED, 0x81, 0xB4, 0x27, 0xD0,</div><div class='add'>+0x1E, 0x40, 0x7B, 0x00, 0xCD, 0x89, 0x84, 0x07, 0x18, 0x1E, 0x40, 0x6F, 0x01,</div><div class='add'>+0x21, 0x01, 0xB4, 0x07, 0xC0, 0x1C, 0x48, 0x78, 0x00, 0xBD, 0x41, 0x84, 0x07,</div><div class='add'>+0xD0, 0x1A, 0x41, 0x5F, 0x00, 0xE5, 0x01, 0x84, 0x07, 0x50, 0x1E, 0x40, 0x4B,</div><div class='add'>+0x01, 0xED, 0x21, 0xB4, 0x04, 0xD0, 0x5A, 0x40, 0x3D, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x12, 0x10, 0x30, 0x00, 0x8F, 0x08, 0x3C, 0x03, 0xF0, 0x8C,</div><div class='add'>+0x40, 0x33, 0x00, 0xCF, 0x00, 0x1C, 0x23, 0x70, 0x1C, 0xC0, 0x63, 0x21, 0x83,</div><div class='add'>+0x02, 0x3E, 0x03, 0xB0, 0x8C, 0xC0, 0x30, 0x00, 0xCF, 0x08, 0x1C, 0x02, 0xF0,</div><div class='add'>+0x04, 0xC0, 0x33, 0x01, 0x87, 0x04, 0x1C, 0x23, 0x38, 0x0C, 0xC1, 0x03, 0x02,</div><div class='add'>+0xCF, 0x00, 0x3C, 0xE3, 0xF0, 0x00, 0xC1, 0x48, 0x48, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x02, 0xB8, 0x7D, 0x00, 0xFF, 0x00, 0xFC, 0x87, 0xF0, 0x9F, 0xC0,</div><div class='add'>+0x3F, 0x00, 0xFF, 0x50, 0xFC, 0x03, 0xF2, 0x8F, 0xC0, 0x2F, 0x42, 0xBF, 0x08,</div><div class='add'>+0xDC, 0x03, 0xF8, 0x0F, 0xC2, 0x3F, 0x94, 0xFF, 0x40, 0xFC, 0x23, 0xF0, 0x8D,</div><div class='add'>+0x40, 0x3F, 0x40, 0xBB, 0x00, 0x5C, 0x63, 0xF0, 0x0F, 0xC8, 0x0F, 0x03, 0xFF,</div><div class='add'>+0x01, 0xFC, 0x03, 0xF0, 0x43, 0xC0, 0x0B, 0x60, 0x04, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x15, 0xA0, 0x37, 0x80, 0x9E, 0x00, 0x7C, 0x03, 0xB0, 0x0D, 0xC0, 0x37,</div><div class='add'>+0x02, 0xDF, 0x11, 0x4C, 0x53, 0xF0, 0x0D, 0xC0, 0x07, 0x00, 0x9F, 0x20, 0x4C,</div><div class='add'>+0x03, 0xF0, 0x4D, 0xC0, 0xF7, 0x01, 0x5B, 0x00, 0x7C, 0x01, 0x72, 0x1D, 0xC0,</div><div class='add'>+0x24, 0x00, 0xDF, 0x00, 0x4C, 0x03, 0xF0, 0x08, 0xC0, 0x44, 0xC0, 0xDB, 0x01,</div><div class='add'>+0x4C, 0x01, 0xD0, 0x1D, 0x40, 0x40, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x13, 0x88, 0x39, 0x01, 0xAD, 0x00, 0x34, 0x8B, 0x10, 0x2E, 0x48, 0x3B, 0x31,</div><div class='add'>+0xED, 0x04, 0xAC, 0x03, 0xD0, 0x2E, 0x40, 0x0B, 0x28, 0x3D, 0x00, 0x84, 0x3B,</div><div class='add'>+0xD0, 0xAE, 0xC0, 0x39, 0x0A, 0xE1, 0x00, 0xB4, 0x03, 0xD0, 0x0E, 0x00, 0x38,</div><div class='add'>+0x00, 0xED, 0x80, 0x84, 0x13, 0xD2, 0x0A, 0x40, 0x08, 0x00, 0xC5, 0x02, 0x94,</div><div class='add'>+0x01, 0xD0, 0x0F, 0x40, 0x4C, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,</div><div class='add'>+0x00, 0x79, 0x02, 0xA5, 0x43, 0xB4, 0x17, 0x10, 0x5E, 0x40, 0x7B, 0x00, 0xED,</div><div class='add'>+0x01, 0x84, 0x27, 0x58, 0x5E, 0x44, 0x6B, 0x10, 0xAD, 0x11, 0x85, 0x07, 0xD0,</div><div class='add'>+0x1E, 0x46, 0x73, 0x01, 0xE9, 0x91, 0xB4, 0x87, 0x42, 0x1E, 0x40, 0x7A, 0x00,</div><div class='add'>+0xFD, 0x01, 0x94, 0x07, 0xD0, 0x0A, 0x41, 0xC8, 0x40, 0xED, 0x05, 0x84, 0x05,</div><div class='add'>+0xD0, 0x1A, 0x40, 0x10, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x28,</div><div class='add'>+0x33, 0x00, 0x8D, 0x00, 0x34, 0x03, 0x14, 0x0C, 0x40, 0x33, 0x00, 0xCD, 0x00,</div><div class='add'>+0x24, 0x03, 0xD0, 0x0C, 0x40, 0x73, 0x02, 0xCD, 0x03, 0x44, 0x03, 0xD0, 0x0C,</div><div class='add'>+0x40, 0x31, 0x00, 0xC9, 0x01, 0x34, 0x17, 0xD0, 0x5C, 0x42, 0xF2, 0x00, 0xCD,</div><div class='add'>+0x80, 0x04, 0x03, 0xD0, 0x38, 0x40, 0x70, 0x41, 0xCD, 0x40, 0x14, 0x63, 0xD0,</div><div class='add'>+0x3C, 0x49, 0x58, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x17, 0xA8, 0x15,</div><div class='add'>+0x00, 0x7F, 0x00, 0x3C, 0x01, 0xB0, 0x04, 0xC0, 0x17, 0x00, 0x5F, 0x00, 0x4C,</div><div class='add'>+0x01, 0xF0, 0x04, 0xC0, 0x9F, 0x00, 0x7F, 0x01, 0x44, 0x01, 0xF0, 0x05, 0xC4,</div><div class='add'>+0x17, 0x00, 0x7B, 0x02, 0xF4, 0x15, 0x70, 0x17, 0xD0, 0x9A, 0x10, 0x7F, 0x10,</div><div class='add'>+0x5C, 0x01, 0xF0, 0x07, 0xC0, 0x1C, 0x00, 0x5F, 0x00, 0xCC, 0x05, 0xF0, 0x57,</div><div class='add'>+0xD0, 0x5C, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x07, 0x00,</div><div class='add'>+0x1F, 0x04, 0x7C, 0x00, 0xF0, 0x01, 0xC0, 0x07, 0x00, 0x1F, 0x00, 0x3C, 0x00,</div><div class='add'>+0xF0, 0x01, 0xC4, 0x07, 0x00, 0x1D, 0x00, 0x7C, 0x88, 0xF0, 0x01, 0xC0, 0x05,</div><div class='add'>+0x00, 0x17, 0x10, 0x7C, 0x00, 0xF0, 0x81, 0xC0, 0x05, 0x02, 0x1F, 0x00, 0x75,</div><div class='add'>+0x00, 0xF0, 0x01, 0xC0, 0x07, 0x40, 0x17, 0x80, 0x7C, 0x08, 0xF0, 0x01, 0xC0,</div><div class='add'>+0x4B, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x08, 0x27, 0x00, 0x9F,</div><div class='add'>+0x00, 0x4C, 0x12, 0x30, 0x29, 0xC2, 0x24, 0x00, 0x9F, 0x00, 0x7C, 0x02, 0x30,</div><div class='add'>+0x49, 0xC0, 0x24, 0x06, 0x9F, 0x10, 0x4C, 0x22, 0x30, 0x09, 0xE0, 0x27, 0x00,</div><div class='add'>+0x97, 0x00, 0x7C, 0x02, 0x32, 0x59, 0xC0, 0x27, 0x26, 0x93, 0x80, 0x7D, 0x0A,</div><div class='add'>+0xF0, 0x19, 0xC1, 0x67, 0x02, 0x9F, 0x02, 0x7C, 0x02, 0x30, 0x59, 0xC0, 0x43,</div><div class='add'>+0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x20, 0x2E, 0x00, 0x8D, 0x00,</div><div class='add'>+0xC4, 0x1E, 0x10, 0x2B, 0x40, 0x24, 0x00, 0x9D, 0x00, 0x74, 0x02, 0x10, 0x79,</div><div class='add'>+0x40, 0x65, 0x00, 0x9D, 0x80, 0x68, 0x06, 0x50, 0x09, 0x60, 0x27, 0x00, 0x9D,</div><div class='add'>+0x00, 0x5C, 0x02, 0xB1, 0x39, 0xC2, 0xE7, 0x00, 0x81, 0x82, 0x6C, 0x1A, 0xD0,</div><div class='add'>+0x89, 0xC0, 0x25, 0x00, 0xBD, 0x03, 0x34, 0x1A, 0x12, 0x49, 0x40, 0x07, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0xA0, 0x24, 0x20, 0x9D, 0x40, 0x44,</div><div class='add'>+0x02, 0x10, 0x29, 0x40, 0x24, 0x00, 0x9D, 0x00, 0x74, 0x02, 0x18, 0x09, 0x42,</div><div class='add'>+0x24, 0x00, 0x8D, 0x00, 0x44, 0x82, 0x12, 0x09, 0x40, 0x27, 0x00, 0x95, 0x60,</div><div class='add'>+0x34, 0x02, 0x58, 0x2D, 0x40, 0xA7, 0x80, 0xD1, 0x98, 0x64, 0x02, 0xD0, 0x09,</div><div class='add'>+0x40, 0x27, 0x00, 0x9D, 0x40, 0x74, 0x22, 0x14, 0x09, 0x40, 0x63, 0x00, 0x02,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x20, 0x20, 0x00, 0x9D, 0x02, 0x04, 0x02,</div><div class='add'>+0x10, 0x08, 0x40, 0xA0, 0x00, 0x8D, 0x06, 0x34, 0x02, 0x10, 0x08, 0x40, 0x21,</div><div class='add'>+0x00, 0x8D, 0x08, 0x45, 0x83, 0x5A, 0x88, 0x60, 0x23, 0x82, 0x8D, 0x08, 0x34,</div><div class='add'>+0x22, 0xD0, 0x88, 0x40, 0x27, 0x00, 0x81, 0x00, 0x24, 0x02, 0xD0, 0x08, 0x40,</div><div class='add'>+0x31, 0x80, 0xCD, 0x00, 0x74, 0x02, 0x10, 0x48, 0x40, 0x43, 0x80, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x1D, 0xB0, 0x46, 0x00, 0x1F, 0x00, 0x4D, 0x04, 0x34,</div><div class='add'>+0x11, 0x50, 0x04, 0x05, 0x0F, 0x00, 0x7C, 0x78, 0x30, 0x41, 0x41, 0x04, 0x00,</div><div class='add'>+0x1D, 0x02, 0x44, 0x50, 0x31, 0x61, 0x41, 0x87, 0x05, 0x17, 0x42, 0x74, 0x08,</div><div class='add'>+0x74, 0x20, 0xC0, 0x07, 0x00, 0x13, 0x40, 0x6C, 0x50, 0xF0, 0x01, 0xC0, 0x07,</div><div class='add'>+0x00, 0x1F, 0x81, 0x7C, 0x00, 0x30, 0xA1, 0xC0, 0x77, 0xC0, 0x0A, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x19, 0xB8, 0xA7, 0x00, 0xBF, 0x01, 0x7C, 0x0A, 0xF1, 0x29,</div><div class='add'>+0xC0, 0x67, 0x00, 0x9F, 0x09, 0x7C, 0x82, 0xF4, 0x09, 0xC0, 0x2F, 0x20, 0xBF,</div><div class='add'>+0x04, 0x7C, 0x02, 0xF0, 0x49, 0xC0, 0x27, 0x01, 0xFF, 0x24, 0xDC, 0x12, 0x00,</div><div class='add'>+0x4B, 0xC0, 0x2D, 0x40, 0xAF, 0x00, 0x6C, 0x02, 0xF0, 0x0B, 0xC8, 0x39, 0x00,</div><div class='add'>+0x9F, 0x22, 0xFC, 0x03, 0xF0, 0x8B, 0xC0, 0x77, 0x60, 0x0E, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x18, 0xA0, 0x67, 0x01, 0x93, 0x02, 0xCC, 0x06, 0xF0, 0x1B, 0xC0,</div><div class='add'>+0x25, 0x02, 0x9B, 0xE0, 0x7C, 0x12, 0xF0, 0x4B, 0xC5, 0x2F, 0x00, 0x93, 0x00,</div><div class='add'>+0xDC, 0x02, 0x38, 0x89, 0xC0, 0x27, 0x49, 0x93, 0x00, 0x5E, 0x22, 0x30, 0x0B,</div><div class='add'>+0x40, 0x2C, 0x00, 0xA3, 0x00, 0xCC, 0x12, 0xF0, 0x0A, 0xC0, 0x2F, 0x00, 0xBB,</div><div class='add'>+0x11, 0xFC, 0x82, 0xE0, 0x0B, 0xD0, 0x74, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x1C, 0x08, 0x07, 0x08, 0x0B, 0x01, 0x45, 0x00, 0xD0, 0x01, 0x46, 0x47,</div><div class='add'>+0x01, 0x1D, 0x9D, 0x74, 0x50, 0xD0, 0x01, 0x40, 0x07, 0x00, 0x11, 0x10, 0x5C,</div><div class='add'>+0x00, 0x14, 0x81, 0x00, 0x07, 0x25, 0x11, 0x04, 0x5C, 0x10, 0x10, 0x01, 0x51,</div><div class='add'>+0x04, 0x20, 0x11, 0x00, 0x74, 0x00, 0xD2, 0x05, 0x48, 0x07, 0x10, 0x13, 0x42,</div><div class='add'>+0x74, 0x00, 0xD0, 0x05, 0x40, 0x60, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x12, 0xA0, 0xA3, 0x00, 0x81, 0x00, 0x04, 0x0A, 0xD0, 0x28, 0x40, 0x23, 0x02,</div><div class='add'>+0x8D, 0x00, 0x34, 0x32, 0xD0, 0x08, 0x40, 0x21, 0x00, 0x81, 0x04, 0x14, 0x22,</div><div class='add'>+0x90, 0x08, 0x44, 0x23, 0x03, 0x89, 0x14, 0x54, 0x12, 0x18, 0x48, 0x40, 0x22,</div><div class='add'>+0x40, 0x81, 0x00, 0x04, 0x22, 0xD0, 0x08, 0x40, 0x23, 0x00, 0x89, 0x00, 0x34,</div><div class='add'>+0x02, 0xD1, 0x08, 0x40, 0x48, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18,</div><div class='add'>+0x88, 0x25, 0x00, 0x89, 0x04, 0x44, 0x02, 0xD0, 0x0D, 0x40, 0x27, 0x00, 0x9D,</div><div class='add'>+0x80, 0x74, 0x02, 0xD0, 0x09, 0x00, 0xA7, 0x42, 0x91, 0x02, 0x54, 0x02, 0x98,</div><div class='add'>+0x09, 0x40, 0x27, 0x00, 0x91, 0x00, 0x54, 0x02, 0x10, 0x0C, 0x40, 0x26, 0x20,</div><div class='add'>+0x91, 0x00, 0x74, 0x02, 0xD0, 0x09, 0x40, 0x27, 0x01, 0x91, 0x00, 0x74, 0x02,</div><div class='add'>+0xD0, 0x0D, 0x40, 0x60, 0x28, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x28,</div><div class='add'>+0x25, 0x00, 0xB3, 0x81, 0x4C, 0x02, 0xF0, 0x09, 0xC8, 0x2F, 0x08, 0xBB, 0x80,</div><div class='add'>+0x7C, 0x02, 0xF1, 0x09, 0x80, 0x65, 0x00, 0x93, 0x00, 0x1C, 0x02, 0x90, 0x09,</div><div class='add'>+0x48, 0x27, 0x00, 0x9B, 0x03, 0x1C, 0x1A, 0x30, 0x59, 0xC0, 0x22, 0x01, 0x83,</div><div class='add'>+0xA7, 0x4C, 0x02, 0xD0, 0x29, 0xC4, 0x67, 0x00, 0x9B, 0x80, 0x7C, 0x2A, 0xF0,</div><div class='add'>+0x29, 0xC0, 0x14, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16, 0x00, 0x25,</div><div class='add'>+0x00, 0x9F, 0x01, 0x70, 0x02, 0xF0, 0x09, 0xC0, 0x27, 0x80, 0x9C, 0xA0, 0x7C,</div><div class='add'>+0x82, 0xF0, 0x09, 0xC0, 0x67, 0x00, 0x9F, 0x03, 0x7E, 0x02, 0x50, 0x09, 0xC4,</div><div class='add'>+0x27, 0x00, 0x9F, 0x05, 0x7C, 0x02, 0xF4, 0x49, 0xE0, 0x65, 0x01, 0x9C, 0x44,</div><div class='add'>+0x5C, 0x42, 0xF0, 0x09, 0x00, 0x67, 0x04, 0x9F, 0x20, 0x7E, 0x06, 0xD0, 0x58,</div><div class='add'>+0xC1, 0x5B, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x08, 0x01, 0x00,</div><div class='add'>+0x1F, 0x00, 0x5C, 0x40, 0xF0, 0x01, 0xE0, 0x07, 0x00, 0x1F, 0x00, 0x7C, 0x00,</div><div class='add'>+0x31, 0x01, 0xE0, 0x06, 0x11, 0x1F, 0x00, 0x7C, 0x00, 0x90, 0x01, 0xC8, 0x03,</div><div class='add'>+0x00, 0x1F, 0x00, 0x7C, 0x80, 0xF8, 0x01, 0xC0, 0x86, 0x00, 0x1F, 0x80, 0x5C,</div><div class='add'>+0x00, 0x60, 0x01, 0xC0, 0x85, 0x00, 0x1F, 0x04, 0x4D, 0x00, 0xF0, 0x21, 0xC0,</div><div class='add'>+0x50, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x20, 0x14, 0x00, 0x5D,</div><div class='add'>+0x00, 0xD4, 0x0D, 0xD8, 0x07, 0x60, 0x17, 0x10, 0x5E, 0x00, 0x74, 0x01, 0x10,</div><div class='add'>+0x57, 0xE0, 0x9B, 0x80, 0x5D, 0x20, 0xF4, 0x01, 0xB2, 0x05, 0xC0, 0x17, 0x80,</div><div class='add'>+0x5D, 0x00, 0x7C, 0x01, 0x70, 0x17, 0xC0, 0x1C, 0x00, 0x7D, 0x02, 0xC4, 0x01,</div><div class='add'>+0xB0, 0x17, 0x40, 0x98, 0x00, 0x7F, 0x03, 0xC4, 0x45, 0xD2, 0x07, 0x48, 0x41,</div><div class='add'>+0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0xA0, 0x32, 0x00, 0xCD, 0x00,</div><div class='add'>+0x04, 0x2E, 0x50, 0x08, 0x40, 0x31, 0x80, 0xC9, 0x00, 0x34, 0x03, 0x13, 0x18,</div><div class='add'>+0x60, 0x32, 0x80, 0xCD, 0x00, 0x34, 0x02, 0x18, 0x0C, 0x40, 0x33, 0x10, 0xCD,</div><div class='add'>+0x00, 0x34, 0x03, 0xD0, 0x7C, 0x50, 0x20, 0x00, 0xCD, 0x1A, 0x16, 0x0B, 0x10,</div><div class='add'>+0x04, 0x00, 0xF1, 0x02, 0x8D, 0x00, 0x04, 0x1E, 0xD0, 0x8C, 0x40, 0x40, 0x00,</div><div class='add'>+0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x80, 0x38, 0x00, 0xED, 0x04, 0x94,</div><div class='add'>+0x02, 0xD0, 0x0A, 0x40, 0x3B, 0x01, 0xED, 0x04, 0x34, 0x07, 0x18, 0x0A, 0x40,</div><div class='add'>+0x3B, 0x00, 0xED, 0x04, 0x34, 0x02, 0x92, 0x4E, 0x40, 0x3B, 0x01, 0xED, 0x00,</div><div class='add'>+0xB4, 0x03, 0x50, 0x0E, 0x41, 0x28, 0x10, 0xAD, 0x40, 0x84, 0x04, 0x90, 0x3E,</div><div class='add'>+0x40, 0x38, 0x00, 0xAD, 0x83, 0x86, 0x03, 0xD0, 0x0A, 0x40, 0x11, 0x00, 0x02,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x10, 0x78, 0x00, 0xEF, 0x03, 0x94, 0x07,</div><div class='add'>+0x70, 0x1A, 0xC0, 0x79, 0x01, 0xED, 0x05, 0xB4, 0x37, 0x31, 0x1E, 0x40, 0x7A,</div><div class='add'>+0x08, 0xED, 0x0B, 0xB4, 0x06, 0x34, 0x1E, 0xC0, 0x7B, 0x02, 0xED, 0x85, 0xBC,</div><div class='add'>+0x27, 0xD8, 0x17, 0xE0, 0x68, 0x00, 0xAF, 0x81, 0x9C, 0x04, 0x78, 0x16, 0xC0,</div><div class='add'>+0x79, 0x00, 0xEF, 0x01, 0x8C, 0x07, 0xF0, 0x1B, 0xC0, 0x50, 0x60, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x10, 0xB8, 0x35, 0x10, 0xDF, 0x40, 0x7C, 0x03, 0xF0,</div><div class='add'>+0x09, 0xC0, 0x37, 0x00, 0xD7, 0x00, 0x7C, 0x2B, 0xF4, 0x0D, 0xC0, 0x35, 0x00,</div><div class='add'>+0xDF, 0x00, 0x7C, 0x02, 0x70, 0x0D, 0xC0, 0x35, 0x82, 0xDF, 0x3E, 0x5C, 0x3B,</div><div class='add'>+0x70, 0x01, 0xE0, 0x25, 0x20, 0x9F, 0x00, 0x3C, 0x00, 0x70, 0x0D, 0xC2, 0x27,</div><div class='add'>+0x00, 0xC7, 0x00, 0x7C, 0x03, 0xF0, 0x09, 0xC0, 0x43, 0x60, 0x06, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x02, 0xA0, 0x7F, 0x00, 0xEF, 0x09, 0xCC, 0x32, 0xF8, 0x8B,</div><div class='add'>+0xC0, 0x7C, 0x04, 0xFF, 0x11, 0xFC, 0x07, 0xF0, 0x1B, 0xC8, 0x7F, 0x00, 0xFF,</div><div class='add'>+0x01, 0xDE, 0x06, 0xF0, 0xBD, 0xC1, 0x74, 0x00, 0xFF, 0x01, 0xFC, 0x07, 0xF0,</div><div class='add'>+0x1B, 0xC0, 0x6C, 0x00, 0x9B, 0x89, 0xFC, 0x25, 0xF0, 0x17, 0xC0, 0x7C, 0x00,</div><div class='add'>+0xBB, 0x01, 0xBC, 0x07, 0x38, 0x9F, 0xC0, 0x1B, 0x00, 0x04, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x15, 0x80, 0x39, 0x00, 0xED, 0x1C, 0x84, 0x22, 0xD8, 0x0A, 0xC0,</div><div class='add'>+0x3A, 0xA0, 0xED, 0x08, 0xB4, 0x03, 0xD0, 0x08, 0x40, 0x13, 0x00, 0xED, 0x00,</div><div class='add'>+0x8C, 0x12, 0xD0, 0x5E, 0x40, 0x78, 0x02, 0xED, 0x00, 0x9C, 0x43, 0xD0, 0x0B,</div><div class='add'>+0x60, 0x28, 0x06, 0xAD, 0x05, 0xB4, 0x24, 0xD2, 0x0E, 0xC0, 0x3A, 0x80, 0xA5,</div><div class='add'>+0x00, 0xB4, 0x09, 0xF2, 0xC2, 0x40, 0x57, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x08, 0x39, 0x00, 0xFD, 0x81, 0xA4, 0x03, 0xD8, 0x88, 0x40, 0x78,</div><div class='add'>+0x02, 0xE5, 0x01, 0xB4, 0x03, 0x50, 0x0A, 0x40, 0x3B, 0x02, 0xFD, 0x18, 0x94,</div><div class='add'>+0x02, 0xD1, 0x4E, 0x54, 0x3A, 0x10, 0xED, 0x00, 0xB4, 0x23, 0xD0, 0x0E, 0x40,</div><div class='add'>+0x28, 0x00, 0xA9, 0x14, 0xB4, 0x80, 0xD8, 0x86, 0x40, 0x39, 0x00, 0xE1, 0x00,</div><div class='add'>+0xB4, 0x03, 0x10, 0x0E, 0x40, 0x63, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x06, 0x28, 0x33, 0x00, 0xCD, 0x00, 0x04, 0x01, 0xD0, 0x08, 0x64, 0x32, 0x00,</div><div class='add'>+0xCD, 0x80, 0x34, 0x03, 0xD0, 0x08, 0x60, 0x13, 0x00, 0xCD, 0x81, 0x04, 0x02,</div><div class='add'>+0xD0, 0x0D, 0x40, 0x36, 0x00, 0xDD, 0x40, 0x54, 0x0F, 0xD1, 0x28, 0x44, 0xE0,</div><div class='add'>+0x10, 0x8D, 0x40, 0x34, 0x00, 0xD0, 0x88, 0x40, 0x63, 0x00, 0xC5, 0x00, 0x34,</div><div class='add'>+0x09, 0x52, 0x30, 0x40, 0x0B, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15,</div><div class='add'>+0xA8, 0x35, 0x00, 0xDF, 0x41, 0x6D, 0x02, 0xD0, 0x0D, 0xC0, 0x34, 0x00, 0xDF,</div><div class='add'>+0x00, 0xFC, 0x03, 0xF0, 0x09, 0xC8, 0xF7, 0x08, 0xFF, 0x03, 0x54, 0x83, 0xD2,</div><div class='add'>+0x0F, 0x48, 0x3E, 0x00, 0xFF, 0x08, 0xF4, 0x0B, 0xD0, 0x2D, 0xD0, 0x34, 0x02,</div><div class='add'>+0x8B, 0x01, 0x7C, 0x00, 0xD0, 0x0C, 0xC0, 0xB5, 0x06, 0x93, 0x00, 0x7C, 0x0A,</div><div class='add'>+0x10, 0x21, 0xC0, 0x57, 0x01, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00,</div><div class='add'>+0x33, 0x00, 0xDF, 0x10, 0x3C, 0x02, 0xF0, 0x09, 0xC0, 0x37, 0x00, 0xDF, 0x00,</div><div class='add'>+0x7C, 0x03, 0xF0, 0x29, 0xC4, 0x77, 0x04, 0xDF, 0x04, 0x1C, 0x0A, 0xF0, 0x0D,</div><div class='add'>+0xC0, 0x35, 0x00, 0xDF, 0x00, 0x5C, 0x03, 0xF0, 0x4D, 0xC0, 0xA7, 0x08, 0x9F,</div><div class='add'>+0x60, 0x7C, 0x88, 0xF1, 0x2D, 0x40, 0xB6, 0x00, 0x9F, 0x00, 0x7C, 0x02, 0xF0,</div><div class='add'>+0xA1, 0xC8, 0x37, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x08, 0x3F,</div><div class='add'>+0x00, 0xF3, 0x00, 0xFC, 0x12, 0x30, 0x2F, 0xC0, 0x3F, 0x20, 0xF3, 0x40, 0xFC,</div><div class='add'>+0x03, 0xF0, 0x1F, 0xC0, 0x2C, 0x02, 0xFF, 0x80, 0xFC, 0x87, 0x30, 0x0F, 0xD0,</div><div class='add'>+0x3C, 0x00, 0xF5, 0x00, 0xCD, 0x43, 0xB0, 0x07, 0xC0, 0x7F, 0x00, 0xBF, 0x00,</div><div class='add'>+0xCC, 0x80, 0xF0, 0x0F, 0x80, 0x3C, 0x00, 0xB3, 0x04, 0xFC, 0x40, 0xF0, 0x0A,</div><div class='add'>+0xC1, 0x04, 0x26, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x36, 0x20,</div><div class='add'>+0xD1, 0x00, 0x74, 0x06, 0x94, 0x05, 0xC0, 0x35, 0x00, 0xD1, 0x00, 0x74, 0x03,</div><div class='add'>+0xD0, 0x84, 0x41, 0x25, 0x00, 0xDD, 0x20, 0x74, 0x01, 0x10, 0x0D, 0x40, 0x34,</div><div class='add'>+0x00, 0xD1, 0x00, 0x44, 0x03, 0xB0, 0x21, 0x40, 0x17, 0x00, 0x9D, 0x23, 0x44,</div><div class='add'>+0x4C, 0xD0, 0x0D, 0x50, 0x60, 0x84, 0x95, 0x07, 0x74, 0x0C, 0xD0, 0x39, 0x50,</div><div class='add'>+0x04, 0x82, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xA0, 0x36, 0xC0, 0xD1,</div><div class='add'>+0x00, 0x74, 0x02, 0x90, 0x0D, 0x40, 0x33, 0x00, 0xD1, 0x00, 0x74, 0x03, 0xD0,</div><div class='add'>+0x09, 0x40, 0x34, 0x00, 0xDD, 0x00, 0x64, 0x1B, 0x10, 0x0D, 0x40, 0x34, 0x00,</div><div class='add'>+0xD5, 0x00, 0x64, 0x03, 0x10, 0x01, 0x40, 0xB7, 0x01, 0x9D, 0x11, 0x44, 0x04,</div><div class='add'>+0xD0, 0x0D, 0x41, 0x45, 0x00, 0x91, 0x00, 0x74, 0x06, 0x50, 0x11, 0x40, 0x04,</div><div class='add'>+0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x30, 0x00, 0xC1, 0x00,</div><div class='add'>+0x34, 0x02, 0x90, 0x08, 0x40, 0x31, 0x00, 0xC1, 0x00, 0x34, 0x03, 0xD0, 0x08,</div><div class='add'>+0x40, 0x11, 0x00, 0xCD, 0x00, 0x34, 0x02, 0x14, 0x4C, 0x40, 0x30, 0x04, 0xC5,</div><div class='add'>+0x20, 0x04, 0x03, 0xD4, 0x00, 0x44, 0x23, 0x80, 0x8D, 0x30, 0x05, 0x40, 0xD0,</div><div class='add'>+0x0D, 0x40, 0x25, 0x00, 0x85, 0x00, 0x34, 0x00, 0xD0, 0x00, 0x42, 0x40, 0x81,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x36, 0x00, 0xF3, 0x40, 0x7C,</div><div class='add'>+0x03, 0x30, 0x0D, 0xC4, 0x3F, 0x00, 0xF3, 0x00, 0xFC, 0x03, 0xF0, 0x2D, 0xC2,</div><div class='add'>+0xA4, 0x02, 0xFD, 0x00, 0x7C, 0x03, 0x30, 0x0E, 0xC0, 0x3C, 0x01, 0xF7, 0x00,</div><div class='add'>+0xCC, 0x03, 0x32, 0x05, 0xC2, 0x37, 0x00, 0x9F, 0x00, 0x4C, 0x10, 0xF0, 0x0D,</div><div class='add'>+0xC0, 0x25, 0x00, 0x51, 0x00, 0x7C, 0x00, 0x70, 0x09, 0xC0, 0x04, 0x04, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x25, 0xA8, 0x3F, 0x00, 0xFF, 0x00, 0xFC, 0x01,</div><div class='add'>+0x78, 0x07, 0xC8, 0x3F, 0x00, 0xFF, 0x00, 0xFC, 0x03, 0xF0, 0x47, 0xC1, 0x0F,</div><div class='add'>+0x00, 0xEF, 0x00, 0xFC, 0x01, 0xF0, 0x2F, 0xC0, 0x3F, 0x00, 0xFB, 0x00, 0xFC,</div><div class='add'>+0x03, 0x30, 0x03, 0xC0, 0x1F, 0x00, 0x3F, 0x00, 0x7C, 0x00, 0xF0, 0x0A, 0x40,</div><div class='add'>+0x2A, 0x08, 0x7F, 0x00, 0xFC, 0x00, 0xF0, 0x03, 0xC0, 0x17, 0x20, 0x0E, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x03, 0x80, 0x3F, 0x08, 0xA3, 0x00, 0xFC, 0x33, 0x30,</div><div class='add'>+0x9B, 0xC0, 0xEF, 0x00, 0xFF, 0x03, 0x9D, 0x27, 0xB0, 0x1F, 0xC0, 0x7C, 0x02,</div><div class='add'>+0xFB, 0x09, 0xCD, 0x07, 0x70, 0x1F, 0xC8, 0x7A, 0x08, 0xFF, 0x01, 0xFC, 0x07,</div><div class='add'>+0x31, 0x9F, 0xC0, 0x7F, 0x00, 0xFF, 0x09, 0xFE, 0x27, 0x30, 0x1F, 0xC0, 0x7A,</div><div class='add'>+0x40, 0xB3, 0x01, 0xFC, 0x00, 0x30, 0x26, 0xC0, 0x0F, 0x00, 0x0E, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x01, 0x00, 0x3B, 0x38, 0xD1, 0x43, 0xF4, 0x13, 0x12, 0x4C,</div><div class='add'>+0x44, 0x27, 0x11, 0x1C, 0x84, 0x44, 0x10, 0x10, 0x11, 0x50, 0x04, 0x01, 0x11,</div><div class='add'>+0x04, 0x44, 0xD0, 0x50, 0x11, 0x40, 0x07, 0x05, 0x0D, 0x10, 0x34, 0x40, 0x10,</div><div class='add'>+0x41, 0x40, 0x07, 0x00, 0x1D, 0x44, 0x5C, 0x10, 0x10, 0x11, 0x40, 0x44, 0x00,</div><div class='add'>+0x91, 0x01, 0x5C, 0x0C, 0x14, 0x45, 0x40, 0x0F, 0x60, 0x0C, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x11, 0xA0, 0x23, 0x05, 0x81, 0x22, 0x14, 0x33, 0x10, 0x0C, 0x48,</div><div class='add'>+0x21, 0x01, 0xCD, 0x00, 0x44, 0x13, 0x54, 0x0D, 0x40, 0x31, 0x00, 0xC1, 0x80,</div><div class='add'>+0x04, 0x03, 0x56, 0x0C, 0x44, 0x33, 0x00, 0xCD, 0x04, 0x34, 0x13, 0x90, 0x4C,</div><div class='add'>+0x40, 0x33, 0x05, 0xCD, 0x20, 0x34, 0x13, 0x10, 0x0D, 0x40, 0x30, 0x00, 0x01,</div><div class='add'>+0x01, 0x34, 0x0A, 0xD0, 0x40, 0x40, 0x4F, 0x80, 0x0E, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x07, 0x88, 0x35, 0x40, 0xD1, 0x84, 0x74, 0x03, 0x14, 0x3D, 0x40, 0x27,</div><div class='add'>+0x20, 0x0D, 0x00, 0x54, 0x00, 0x90, 0x01, 0x42, 0x05, 0x00, 0x01, 0x00, 0x44,</div><div class='add'>+0x00, 0x54, 0x01, 0x60, 0x07, 0x00, 0x1D, 0x80, 0x70, 0x00, 0x90, 0x01, 0x40,</div><div class='add'>+0x07, 0x00, 0x1D, 0x20, 0x14, 0x00, 0x18, 0x01, 0x40, 0x04, 0x00, 0x51, 0x01,</div><div class='add'>+0x74, 0x00, 0xD1, 0x01, 0x40, 0x0F, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0xA0, 0x37, 0x00, 0x93, 0x01, 0x5C, 0x03, 0x30, 0x3D, 0xC0, 0x65, 0x0A,</div><div class='add'>+0xDF, 0x00, 0x4C, 0x83, 0xF0, 0x0D, 0xC8, 0x35, 0x40, 0xDB, 0x80, 0x08, 0x03,</div><div class='add'>+0x74, 0x0D, 0xC4, 0x36, 0x10, 0xDF, 0x00, 0x78, 0x03, 0xA0, 0x0D, 0xC0, 0x37,</div><div class='add'>+0x80, 0xDF, 0x00, 0x74, 0x03, 0x34, 0x0C, 0xC2, 0x36, 0x00, 0x91, 0x01, 0x3C,</div><div class='add'>+0x15, 0xF0, 0x15, 0xC0, 0x03, 0x20, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03,</div><div class='add'>+0x88, 0x3D, 0x00, 0xFF, 0x21, 0xF4, 0x03, 0xD0, 0x0F, 0xC0, 0x2F, 0x00, 0x3F,</div><div class='add'>+0x40, 0xE4, 0x00, 0x30, 0x03, 0xC0, 0x0E, 0x00, 0x3F, 0x00, 0xFC, 0x40, 0xF0,</div><div class='add'>+0x03, 0x00, 0x0F, 0x00, 0x3F, 0x30, 0xFC, 0x80, 0x70, 0x03, 0xC0, 0x0F, 0xA0,</div><div class='add'>+0x3F, 0x40, 0xDC, 0x00, 0xF0, 0x03, 0xC0, 0x0F, 0x14, 0xFF, 0x00, 0xDC, 0x24,</div><div class='add'>+0x30, 0x47, 0xC0, 0x1F, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x08,</div><div class='add'>+0x61, 0x10, 0x9B, 0x01, 0x6C, 0x03, 0x34, 0x3D, 0xC0, 0x24, 0x00, 0xD3, 0x50,</div><div class='add'>+0x7C, 0x03, 0x30, 0x0D, 0xC0, 0x77, 0x00, 0xD3, 0x08, 0x4C, 0x07, 0xB0, 0x4D,</div><div class='add'>+0xC0, 0x37, 0x00, 0xD7, 0x01, 0x4C, 0x83, 0x30, 0x1D, 0xC1, 0x37, 0x00, 0xDF,</div><div class='add'>+0x01, 0x7C, 0x97, 0xF0, 0x1D, 0xC0, 0x34, 0x00, 0x93, 0x10, 0x7C, 0x20, 0x30,</div><div class='add'>+0x25, 0xD0, 0x08, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0xA0, 0xB4,</div><div class='add'>+0x02, 0xD1, 0x20, 0xD4, 0x2B, 0x10, 0x2D, 0x40, 0x64, 0x01, 0x1A, 0x03, 0x3C,</div><div class='add'>+0x00, 0x14, 0x40, 0x42, 0x87, 0x00, 0x11, 0x01, 0x44, 0x00, 0x10, 0x51, 0xC0,</div><div class='add'>+0x05, 0x40, 0x15, 0x01, 0x44, 0x04, 0x10, 0x11, 0x40, 0x07, 0x00, 0x1D, 0x21,</div><div class='add'>+0x74, 0x0C, 0xD0, 0x01, 0x44, 0xC0, 0x04, 0x59, 0x03, 0x74, 0x20, 0x00, 0xB5,</div><div class='add'>+0x40, 0x0C, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x23, 0x20, 0x30, 0x00,</div><div class='add'>+0x89, 0x40, 0x44, 0x03, 0x90, 0x2C, 0x41, 0x60, 0x00, 0xC9, 0x02, 0x34, 0x03,</div><div class='add'>+0x10, 0x1C, 0x40, 0xB7, 0x04, 0xC1, 0x01, 0x14, 0x03, 0x90, 0x2C, 0x40, 0x33,</div><div class='add'>+0x00, 0xC9, 0x02, 0x54, 0x27, 0x91, 0x0C, 0x40, 0x33, 0x00, 0xCD, 0x00, 0x34,</div><div class='add'>+0x0B, 0xD0, 0x0C, 0x40, 0xF0, 0x40, 0x89, 0x03, 0x14, 0x0C, 0x10, 0x9C, 0x40,</div><div class='add'>+0x4C, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x00, 0x78, 0x00, 0xF1,</div><div class='add'>+0x01, 0x14, 0x07, 0x90, 0x1E, 0x40, 0x68, 0x00, 0x29, 0x11, 0xC4, 0x04, 0x10,</div><div class='add'>+0x92, 0x48, 0x4B, 0x00, 0x21, 0x03, 0x94, 0x04, 0x12, 0x12, 0x40, 0x4D, 0x20,</div><div class='add'>+0x29, 0x09, 0x95, 0x0C, 0x50, 0x12, 0x40, 0x4B, 0x20, 0x2C, 0x41, 0xB0, 0x04,</div><div class='add'>+0xD0, 0x13, 0x40, 0x48, 0x00, 0xA9, 0x29, 0xB4, 0x17, 0x10, 0x1F, 0x40, 0x3C,</div><div class='add'>+0x20, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x32, 0x18, 0x20, 0x00, 0x8B, 0x00,</div><div class='add'>+0x0C, 0x03, 0x30, 0x0C, 0xC0, 0x24, 0x00, 0xCB, 0x88, 0x34, 0x23, 0x31, 0x0C,</div><div class='add'>+0xC0, 0x37, 0x00, 0xD3, 0x80, 0x5C, 0x23, 0xB0, 0x8C, 0xC0, 0x33, 0x02, 0xCF,</div><div class='add'>+0x00, 0x1C, 0x23, 0x30, 0x0C, 0xC0, 0x33, 0x00, 0xCE, 0x00, 0x3C, 0x03, 0xF2,</div><div class='add'>+0x0C, 0xC4, 0x30, 0x00, 0x43, 0x30, 0x1C, 0x03, 0x30, 0x7C, 0xC0, 0x48, 0x40,</div><div class='add'>+0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x30, 0x3D, 0x00, 0xFF, 0x00, 0xDC,</div><div class='add'>+0x4B, 0x50, 0x0F, 0xC0, 0x2F, 0x02, 0x3F, 0x28, 0xFE, 0x00, 0xF2, 0x03, 0x48,</div><div class='add'>+0x0F, 0x00, 0x3F, 0x00, 0xEC, 0x80, 0xF0, 0x03, 0xC0, 0x0F, 0x00, 0x37, 0x00,</div><div class='add'>+0xEC, 0x00, 0xB0, 0x83, 0xC0, 0x0F, 0x00, 0x3F, 0x40, 0xFC, 0x00, 0xF0, 0x02,</div><div class='add'>+0xC0, 0x4F, 0x40, 0x77, 0x00, 0x3C, 0x13, 0xF2, 0x8D, 0xC0, 0x0B, 0x20, 0x06,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xA0, 0x37, 0x01, 0x9F, 0x00, 0x7C, 0x13,</div><div class='add'>+0xF0, 0x0D, 0xC0, 0x24, 0x00, 0xDD, 0x00, 0x7C, 0x03, 0xF0, 0x1C, 0xC0, 0x30,</div><div class='add'>+0x40, 0xD3, 0x00, 0x6F, 0x03, 0xF0, 0x0D, 0xC0, 0x37, 0x00, 0xDF, 0x00, 0x4D,</div><div class='add'>+0x03, 0xF0, 0x1D, 0xD0, 0x34, 0x00, 0xDF, 0x21, 0x4D, 0x07, 0x24, 0x0D, 0xC0,</div><div class='add'>+0x33, 0x00, 0x53, 0x00, 0x4C, 0x07, 0x32, 0x15, 0xC0, 0x40, 0x00, 0x0E, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x12, 0x80, 0x39, 0x22, 0xED, 0x00, 0xB4, 0x03, 0xD0,</div><div class='add'>+0x0F, 0x50, 0x28, 0x00, 0x2D, 0x00, 0xBC, 0x00, 0xD0, 0x02, 0x48, 0x09, 0x00,</div><div class='add'>+0x21, 0x00, 0x84, 0x00, 0xD2, 0x02, 0x40, 0x0B, 0x00, 0x3D, 0x00, 0x84, 0x00,</div><div class='add'>+0xD0, 0x03, 0x40, 0x08, 0x00, 0x3D, 0x00, 0xC4, 0x00, 0x10, 0x02, 0x44, 0x0B,</div><div class='add'>+0x00, 0xE1, 0x20, 0xAC, 0x03, 0xB0, 0x07, 0xC0, 0x4E, 0x68, 0x06, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x02, 0x69, 0x10, 0xED, 0x03, 0x94, 0x17, 0xD0, 0x1E,</div><div class='add'>+0x40, 0x68, 0x04, 0xED, 0x41, 0xB4, 0x07, 0x50, 0x1E, 0x44, 0x7C, 0x20, 0xF9,</div><div class='add'>+0x81, 0x84, 0x07, 0x50, 0x1E, 0x40, 0x7B, 0x00, 0xE5, 0x01, 0x84, 0x07, 0xD0,</div><div class='add'>+0x1E, 0x40, 0x79, 0x00, 0xED, 0x01, 0x84, 0x87, 0x18, 0x1E, 0x40, 0x7B, 0x40,</div><div class='add'>+0x71, 0x01, 0x04, 0x07, 0x10, 0x16, 0x40, 0x10, 0x00, 0x04, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x16, 0x28, 0x33, 0x00, 0xCD, 0x01, 0x34, 0x03, 0xD0, 0x24, 0x4C,</div><div class='add'>+0x30, 0x10, 0x0D, 0x00, 0x12, 0x00, 0xD0, 0x00, 0x40, 0x01, 0x10, 0x09, 0xC0,</div><div class='add'>+0x04, 0x80, 0xD0, 0x00, 0x42, 0x03, 0x08, 0x1D, 0x00, 0x44, 0x00, 0xD0, 0x00,</div><div class='add'>+0x40, 0x01, 0x00, 0x0D, 0x00, 0x06, 0x00, 0x10, 0x00, 0x40, 0x03, 0x00, 0x51,</div><div class='add'>+0x03, 0x24, 0xCF, 0x12, 0x34, 0x40, 0x58, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x17, 0xA0, 0x15, 0x00, 0x5F, 0x00, 0x7C, 0x01, 0xD0, 0x27, 0xC0, 0x54,</div><div class='add'>+0x00, 0x5F, 0x00, 0x74, 0x01, 0x70, 0x05, 0xC4, 0x14, 0x00, 0x4B, 0x00, 0x6C,</div><div class='add'>+0x01, 0xF0, 0x04, 0xC0, 0x17, 0x00, 0x5F, 0x00, 0x4C, 0x01, 0xF0, 0x05, 0xC0,</div><div class='add'>+0x15, 0x00, 0x5F, 0x00, 0x44, 0x01, 0x30, 0x05, 0xC0, 0x13, 0x00, 0x71, 0x07,</div><div class='add'>+0xCC, 0x11, 0x14, 0x17, 0x40, 0x5C, 0x20, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x12, 0x08, 0x04, 0x00, 0x1F, 0x00, 0x7C, 0x08, 0xF0, 0x21, 0xC1, 0x07, 0x00,</div><div class='add'>+0x3D, 0x00, 0xFC, 0x00, 0xF0, 0x03, 0xC0, 0x0F, 0x00, 0x37, 0x02, 0xFC, 0x00,</div><div class='add'>+0xF0, 0x03, 0xC0, 0x0F, 0x00, 0x3F, 0x00, 0xFC, 0x00, 0xF0, 0x03, 0xC0, 0x0E,</div><div class='add'>+0x00, 0x3F, 0x00, 0xFC, 0x00, 0xF0, 0x03, 0xC0, 0x0F, 0x40, 0x1F, 0x06, 0x7C,</div><div class='add'>+0x00, 0xF0, 0xA1, 0xC9, 0x4B, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10,</div><div class='add'>+0x08, 0x21, 0x00, 0x93, 0x00, 0x3C, 0x02, 0xB0, 0x09, 0xC0, 0x24, 0x10, 0x9F,</div><div class='add'>+0x01, 0x4C, 0x02, 0xF0, 0x19, 0xC0, 0xE7, 0x00, 0x93, 0x00, 0x6C, 0x06, 0xF0,</div><div class='add'>+0x99, 0xC0, 0x25, 0x00, 0x9F, 0x00, 0x4C, 0x02, 0x34, 0x59, 0xC0, 0x27, 0x00,</div><div class='add'>+0x9F, 0x05, 0x7C, 0x02, 0xF0, 0x09, 0xC0, 0x27, 0x40, 0x9B, 0x00, 0x6C, 0x02,</div><div class='add'>+0xF0, 0x49, 0xC0, 0x43, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x20,</div><div class='add'>+0x26, 0x40, 0x91, 0x80, 0x74, 0x42, 0x10, 0xA9, 0x41, 0x24, 0x00, 0x8D, 0x09,</div><div class='add'>+0x5E, 0x2A, 0xD0, 0x19, 0x40, 0x63, 0x40, 0x91, 0x02, 0x45, 0x1A, 0xD0, 0x69,</div><div class='add'>+0xC2, 0x26, 0x08, 0x9D, 0x02, 0x44, 0x42, 0x10, 0x39, 0x40, 0x27, 0x00, 0x9D,</div><div class='add'>+0x02, 0x74, 0x0A, 0xD0, 0x09, 0x48, 0x67, 0x04, 0x91, 0x82, 0x44, 0x86, 0xD0,</div><div class='add'>+0x69, 0x40, 0x07, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0xA0, 0x64,</div><div class='add'>+0x00, 0x91, 0x00, 0x74, 0x02, 0x10, 0x08, 0x40, 0x24, 0x00, 0x9D, 0x00, 0xC4,</div><div class='add'>+0x42, 0xD0, 0x4B, 0x40, 0x2F, 0x00, 0xB9, 0x03, 0xC4, 0x12, 0xD0, 0x0B, 0x40,</div><div class='add'>+0x2C, 0x00, 0xBD, 0x00, 0xC4, 0x06, 0x92, 0x0B, 0x44, 0x2F, 0x00, 0xBD, 0xC0,</div><div class='add'>+0xF4, 0x02, 0xD0, 0x1B, 0x40, 0x2F, 0x41, 0x91, 0x08, 0x64, 0x22, 0xD0, 0x09,</div><div class='add'>+0x40, 0x73, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x2A, 0x20, 0x01,</div><div class='add'>+0x81, 0x04, 0x34, 0x12, 0x18, 0x08, 0x50, 0x20, 0x00, 0xBC, 0x00, 0x84, 0x02,</div><div class='add'>+0xD0, 0x0A, 0x40, 0x6F, 0x00, 0xB9, 0x00, 0x84, 0x02, 0xD0, 0x0A, 0x40, 0x2A,</div><div class='add'>+0x00, 0xAD, 0x01, 0x84, 0x02, 0x90, 0x1A, 0x40, 0x2B, 0x00, 0xAD, 0x41, 0xB4,</div><div class='add'>+0x06, 0xD0, 0x0A, 0x40, 0x2B, 0x00, 0x91, 0x00, 0x24, 0x02, 0xD0, 0x48, 0x40,</div><div class='add'>+0x53, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xA0, 0x86, 0x02, 0x13,</div><div class='add'>+0x00, 0x7C, 0x28, 0x34, 0xA1, 0xC0, 0x84, 0x02, 0x1F, 0x0A, 0x44, 0x28, 0xF0,</div><div class='add'>+0x01, 0xC0, 0x87, 0x02, 0x1B, 0x0A, 0x4C, 0x28, 0xF0, 0x01, 0xC0, 0x85, 0x02,</div><div class='add'>+0x1F, 0x0A, 0x4C, 0x28, 0xB3, 0xA1, 0xC0, 0x87, 0x02, 0x1F, 0x0A, 0x7C, 0x28,</div><div class='add'>+0xF0, 0x01, 0xC0, 0x0F, 0x10, 0x53, 0x00, 0x6C, 0x51, 0xFA, 0xA1, 0xC0, 0x77,</div><div class='add'>+0xC0, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1D, 0x88, 0x2F, 0x02, 0xBF, 0x08,</div><div class='add'>+0x7C, 0x22, 0x78, 0x0B, 0xC0, 0x2F, 0x20, 0x9E, 0x00, 0x5D, 0x02, 0xF0, 0x09,</div><div class='add'>+0xC0, 0x27, 0x00, 0x87, 0x00, 0x5C, 0x02, 0xF0, 0x09, 0xC0, 0x27, 0x00, 0x9F,</div><div class='add'>+0x00, 0x7D, 0x02, 0x71, 0x09, 0xC0, 0x27, 0x08, 0x9F, 0x20, 0x7C, 0x82, 0xF0,</div><div class='add'>+0x09, 0xC2, 0x27, 0x00, 0xA7, 0x00, 0xDC, 0x02, 0xF0, 0x8B, 0xC0, 0x67, 0x20,</div><div class='add'>+0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xA0, 0x2F, 0x01, 0xB3, 0x14, 0xCC,</div><div class='add'>+0xB2, 0x30, 0x0F, 0xC0, 0x2D, 0x00, 0xBF, 0x08, 0xCC, 0x02, 0x10, 0x0B, 0xC0,</div><div class='add'>+0x2F, 0x02, 0xBF, 0x00, 0xCC, 0x02, 0x30, 0x0B, 0xC0, 0x24, 0x00, 0xB3, 0x00,</div><div class='add'>+0xFC, 0x22, 0xF0, 0x0B, 0xC0, 0x24, 0x00, 0xB3, 0x08, 0xDC, 0x02, 0x30, 0x0B,</div><div class='add'>+0xC0, 0x2F, 0x00, 0xB3, 0x00, 0xFC, 0x82, 0x30, 0x0B, 0xC0, 0x67, 0x00, 0x0E,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x07, 0x0D, 0x11, 0x00, 0x45, 0x30,</div><div class='add'>+0x10, 0x01, 0x43, 0x04, 0x04, 0x1D, 0x00, 0x04, 0x50, 0x10, 0x01, 0x40, 0x03,</div><div class='add'>+0x01, 0x1D, 0x10, 0x4C, 0x40, 0x14, 0x01, 0x50, 0x04, 0x05, 0x01, 0x04, 0x74,</div><div class='add'>+0x10, 0xD0, 0x00, 0x41, 0x00, 0x24, 0x01, 0x40, 0x5C, 0x50, 0x10, 0x01, 0x40,</div><div class='add'>+0x07, 0x00, 0x11, 0x00, 0x74, 0x00, 0x10, 0x81, 0x40, 0x73, 0x60, 0x0C, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x21, 0x03, 0x91, 0x20, 0x04, 0x12, 0x90,</div><div class='add'>+0x49, 0x40, 0x21, 0x80, 0x8D, 0x00, 0x04, 0x12, 0x10, 0x0C, 0x40, 0x23, 0x01,</div><div class='add'>+0x8D, 0x04, 0x65, 0x02, 0x10, 0x09, 0x40, 0x24, 0x41, 0x81, 0x14, 0x34, 0x12,</div><div class='add'>+0xD8, 0x48, 0x50, 0x20, 0x00, 0x81, 0x00, 0x14, 0x12, 0x10, 0x08, 0x40, 0x23,</div><div class='add'>+0x00, 0x89, 0x00, 0x34, 0x02, 0x10, 0x08, 0x48, 0x4B, 0x00, 0x04, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x18, 0x28, 0x25, 0x41, 0x91, 0x00, 0x44, 0x03, 0x90, 0x29,</div><div class='add'>+0x40, 0x24, 0x02, 0x8D, 0x00, 0x44, 0x02, 0x10, 0x09, 0x40, 0x27, 0x00, 0x8D,</div><div class='add'>+0x00, 0x44, 0x02, 0x10, 0x09, 0x40, 0x24, 0x00, 0x91, 0x00, 0x74, 0x02, 0xD0,</div><div class='add'>+0x09, 0x40, 0x24, 0x00, 0xD1, 0x00, 0x54, 0x02, 0x10, 0x09, 0x40, 0x37, 0x20,</div><div class='add'>+0x99, 0x00, 0x74, 0x0A, 0x12, 0x89, 0x40, 0x63, 0x00, 0x04, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x05, 0x00, 0x25, 0x00, 0x83, 0x89, 0x0C, 0x02, 0xB4, 0x18, 0xC0,</div><div class='add'>+0x65, 0x20, 0x9F, 0x00, 0x4D, 0x02, 0x34, 0x09, 0xC0, 0x27, 0x80, 0x9F, 0x00,</div><div class='add'>+0x6C, 0x02, 0x30, 0x08, 0xC0, 0x24, 0x00, 0x93, 0x00, 0x7C, 0x02, 0xF0, 0x09,</div><div class='add'>+0xC0, 0x24, 0x40, 0x93, 0x00, 0x5C, 0x02, 0x34, 0x09, 0xC0, 0x27, 0x00, 0x99,</div><div class='add'>+0x12, 0x7C, 0x02, 0x34, 0x19, 0xC0, 0x17, 0x20, 0x0E, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x16, 0x08, 0x25, 0x00, 0x9F, 0x41, 0x7C, 0x02, 0x74, 0x29, 0xC0, 0x27,</div><div class='add'>+0x00, 0x9F, 0x50, 0x7C, 0x42, 0xF0, 0x09, 0xC0, 0x27, 0x00, 0x9F, 0x00, 0x7C,</div><div class='add'>+0x02, 0xF0, 0x09, 0xC0, 0x27, 0x00, 0x9F, 0x00, 0x7C, 0x02, 0xF0, 0x09, 0xC0,</div><div class='add'>+0x27, 0x00, 0x9F, 0x00, 0x5C, 0x02, 0xF0, 0x09, 0xC0, 0x27, 0x40, 0x97, 0x15,</div><div class='add'>+0x7E, 0x52, 0xF0, 0x09, 0xE0, 0x4B, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x14, 0x08, 0x41, 0x40, 0x13, 0x00, 0x7C, 0x10, 0xF0, 0x41, 0xC0, 0x07, 0x00,</div><div class='add'>+0x1F, 0x08, 0x4C, 0x00, 0x34, 0x01, 0xC0, 0x07, 0x00, 0x13, 0x00, 0x7C, 0x00,</div><div class='add'>+0xF0, 0x11, 0xF0, 0x04, 0x00, 0x1F, 0x20, 0x4C, 0x04, 0xD0, 0x01, 0xC0, 0x06,</div><div class='add'>+0x40, 0x13, 0x40, 0x4C, 0x00, 0xF0, 0x01, 0xC0, 0x07, 0x00, 0x13, 0x02, 0x0C,</div><div class='add'>+0x08, 0x14, 0x01, 0xC4, 0x40, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10,</div><div class='add'>+0xA0, 0x5C, 0x00, 0x51, 0x00, 0xF4, 0x09, 0xD0, 0x27, 0xC0, 0x15, 0x00, 0x7D,</div><div class='add'>+0x00, 0xC6, 0x05, 0x50, 0x05, 0x40, 0x5F, 0x04, 0x73, 0x02, 0xB4, 0x29, 0xD1,</div><div class='add'>+0x07, 0xC2, 0x12, 0x00, 0x7D, 0x45, 0xC4, 0x15, 0xD0, 0x07, 0xC0, 0x14, 0x00,</div><div class='add'>+0x71, 0x02, 0xCC, 0x01, 0xD0, 0x15, 0x40, 0x9B, 0x08, 0x71, 0x02, 0xD4, 0x0D,</div><div class='add'>+0x50, 0xF7, 0x40, 0x50, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xA0,</div><div class='add'>+0x32, 0x00, 0xC1, 0x00, 0x34, 0x03, 0xD0, 0x0C, 0x40, 0x31, 0x20, 0xCD, 0x00,</div><div class='add'>+0x64, 0x0F, 0x50, 0x08, 0x44, 0x73, 0x00, 0xC1, 0x04, 0x24, 0x03, 0xD0, 0x04,</div><div class='add'>+0x40, 0x32, 0x10, 0xCD, 0x01, 0x05, 0x03, 0x50, 0x0D, 0x40, 0x34, 0x00, 0xC1,</div><div class='add'>+0x06, 0x65, 0x07, 0xD0, 0x98, 0x40, 0x63, 0x03, 0x41, 0x08, 0x04, 0x23, 0x10,</div><div class='add'>+0x0C, 0x40, 0x52, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x80, 0x08,</div><div class='add'>+0x04, 0xE1, 0x00, 0xB4, 0x43, 0x90, 0x0E, 0x40, 0x39, 0x00, 0x7D, 0x00, 0xA5,</div><div class='add'>+0x0B, 0x50, 0x0E, 0x40, 0x7B, 0x00, 0xE1, 0x00, 0xB4, 0x02, 0xD0, 0x0E, 0x41,</div><div class='add'>+0x38, 0x01, 0xED, 0x01, 0x84, 0x03, 0xD0, 0x0E, 0x40, 0x38, 0x0A, 0xE1, 0x83,</div><div class='add'>+0xA4, 0x43, 0xD0, 0x0E, 0x40, 0x1F, 0x00, 0x71, 0x01, 0x14, 0x03, 0x10, 0x12,</div><div class='add'>+0x58, 0x06, 0x20, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x18, 0x60, 0x00,</div><div class='add'>+0xE3, 0x01, 0xBC, 0x07, 0xD0, 0x1E, 0xC0, 0x79, 0x00, 0xEF, 0x01, 0xA4, 0x06,</div><div class='add'>+0x70, 0x1E, 0xC0, 0x6B, 0x40, 0xE3, 0x01, 0xB0, 0x05, 0xF0, 0x1E, 0x40, 0x7A,</div><div class='add'>+0x00, 0xEF, 0x01, 0x8C, 0x07, 0x70, 0x1E, 0xC0, 0x78, 0x05, 0xE3, 0x01, 0xAC,</div><div class='add'>+0x07, 0xF1, 0x1E, 0xC0, 0x6B, 0x00, 0x63, 0x81, 0x84, 0x07, 0x30, 0x18, 0xC0,</div><div class='add'>+0x46, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xB8, 0x05, 0x00, 0xDF,</div><div class='add'>+0x00, 0x7C, 0x03, 0xF0, 0x01, 0xC0, 0x35, 0x10, 0x0F, 0x00, 0x5C, 0x02, 0xB0,</div><div class='add'>+0x0D, 0xC0, 0x07, 0x00, 0x17, 0x00, 0x7C, 0x80, 0xF0, 0x0C, 0xC0, 0x37, 0x04,</div><div class='add'>+0x5F, 0x00, 0x7C, 0x00, 0xF0, 0x01, 0xD0, 0xB5, 0x00, 0x9F, 0x00, 0x5C, 0x01,</div><div class='add'>+0xF0, 0x0D, 0xC0, 0x33, 0x20, 0x4F, 0x00, 0x7C, 0x03, 0xF0, 0x09, 0xC0, 0x41,</div><div class='add'>+0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x28, 0x4D, 0x00, 0xE7, 0x21,</div><div class='add'>+0xCC, 0x07, 0xF8, 0x87, 0xC0, 0x7C, 0x02, 0xBF, 0x01, 0xCC, 0x07, 0x30, 0x1F,</div><div class='add'>+0xC0, 0x7C, 0x00, 0x73, 0x01, 0xEC, 0x05, 0x32, 0x1F, 0xC0, 0x7F, 0x04, 0xF3,</div><div class='add'>+0x01, 0xFC, 0x04, 0xB0, 0x1F, 0xC0, 0x7F, 0x10, 0xB3, 0x01, 0xCC, 0x07, 0xF0,</div><div class='add'>+0x1E, 0xC0, 0x3C, 0x00, 0xF3, 0x05, 0xCC, 0x06, 0xF0, 0x13, 0x84, 0x0B, 0x00,</div><div class='add'>+0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x00, 0x8D, 0x10, 0xE1, 0x08, 0x84,</div><div class='add'>+0x21, 0x78, 0x0E, 0x44, 0x38, 0x00, 0x7D, 0x06, 0xC5, 0x03, 0x10, 0x0E, 0x40,</div><div class='add'>+0x28, 0x00, 0x71, 0x40, 0x84, 0xE0, 0x10, 0x0E, 0x40, 0x3B, 0x00, 0xA1, 0x10,</div><div class='add'>+0xB4, 0x01, 0x10, 0x0E, 0x40, 0x3B, 0x02, 0xBB, 0x18, 0x8C, 0x0A, 0xD0, 0x8E,</div><div class='add'>+0x40, 0x19, 0x02, 0xA1, 0x06, 0xAC, 0x03, 0xD0, 0x20, 0x40, 0x57, 0x60, 0x04,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0xE5, 0x00, 0x85, 0x01,</div><div class='add'>+0x50, 0x87, 0x40, 0x38, 0x8C, 0xAD, 0x00, 0x86, 0x01, 0x90, 0x0F, 0x40, 0x3A,</div><div class='add'>+0x40, 0xE1, 0x00, 0xC4, 0x01, 0x10, 0x0E, 0x40, 0x3B, 0x00, 0xE1, 0x00, 0xF4,</div><div class='add'>+0x0A, 0x10, 0x0E, 0x40, 0x3F, 0x00, 0x61, 0x00, 0x84, 0x03, 0xD0, 0x0E, 0x40,</div><div class='add'>+0x29, 0x42, 0x61, 0x0C, 0x94, 0x43, 0xD0, 0x02, 0x40, 0x23, 0x00, 0x04, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x02, 0x28, 0x01, 0x00, 0xC1, 0x00, 0x04, 0x01, 0x50,</div><div class='add'>+0x31, 0x40, 0x70, 0x00, 0x1D, 0x41, 0x02, 0x45, 0x90, 0x3C, 0x50, 0x82, 0x04,</div><div class='add'>+0x01, 0x10, 0x04, 0x08, 0x10, 0x2C, 0x42, 0x77, 0x01, 0x01, 0x05, 0x30, 0x04,</div><div class='add'>+0x10, 0xD0, 0x40, 0xB3, 0x04, 0x09, 0x05, 0x06, 0x34, 0xD0, 0x1C, 0x40, 0x91,</div><div class='add'>+0x00, 0x81, 0x13, 0x34, 0x0E, 0xD0, 0x00, 0x40, 0x1B, 0x00, 0x04, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x15, 0x80, 0x05, 0x00, 0xD7, 0x00, 0x4C, 0x03, 0x70, 0xE9,</div><div class='add'>+0xC0, 0x74, 0x00, 0xDF, 0x05, 0x4C, 0x09, 0xB0, 0x0D, 0xC0, 0x16, 0x00, 0x93,</div><div class='add'>+0x01, 0x4C, 0x07, 0x34, 0x7C, 0x40, 0xBF, 0x00, 0x13, 0x03, 0x3C, 0x03, 0x10,</div><div class='add'>+0x21, 0xC0, 0x3B, 0x00, 0x53, 0x03, 0x4C, 0x08, 0xF0, 0x3D, 0xC0, 0xB5, 0x02,</div><div class='add'>+0x43, 0x11, 0x50, 0x0D, 0xF0, 0x09, 0x40, 0x77, 0x20, 0x06, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x05, 0x00, 0x47, 0x00, 0x9F, 0x01, 0x7C, 0x83, 0x70, 0x09, 0xD2,</div><div class='add'>+0x27, 0x00, 0xDF, 0x04, 0x7C, 0x21, 0x70, 0x8D, 0xC0, 0xB5, 0x02, 0xDF, 0x08,</div><div class='add'>+0x7C, 0x8B, 0xF2, 0x0D, 0xC0, 0x37, 0x42, 0x9F, 0x00, 0x7C, 0x23, 0x70, 0x29,</div><div class='add'>+0xC0, 0x77, 0x00, 0x57, 0x02, 0x5C, 0x02, 0xF0, 0xCD, 0xC0, 0xF7, 0x40, 0x5F,</div><div class='add'>+0x40, 0x2C, 0x0B, 0xF2, 0x01, 0xC0, 0x07, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x80, 0x00, 0x0B, 0x40, 0xE3, 0x00, 0xEC, 0x03, 0xF0, 0x8F, 0xC0, 0x3C,</div><div class='add'>+0x00, 0xFB, 0x00, 0xCC, 0x02, 0x30, 0x0F, 0xC1, 0x0F, 0x00, 0xBF, 0x09, 0xFC,</div><div class='add'>+0x40, 0xF0, 0x0F, 0xC1, 0x3C, 0x00, 0x33, 0x05, 0xFC, 0x03, 0xB0, 0x47, 0xC0,</div><div class='add'>+0x3D, 0x00, 0x73, 0x00, 0xCC, 0x20, 0x30, 0x9F, 0xC0, 0xFF, 0x00, 0xB3, 0x00,</div><div class='add'>+0xCC, 0x43, 0x32, 0x0B, 0xC4, 0x17, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x81, 0x20, 0xC6, 0x00, 0x91, 0x00, 0x44, 0x0F, 0xF0, 0x11, 0x60, 0x61, 0x02,</div><div class='add'>+0x91, 0x02, 0x44, 0x02, 0x10, 0x0D, 0x40, 0x87, 0x04, 0x1D, 0x00, 0x5C, 0x1E,</div><div class='add'>+0xD1, 0x1D, 0x40, 0x34, 0x08, 0x11, 0x12, 0x74, 0x00, 0x10, 0x71, 0x40, 0x34,</div><div class='add'>+0x00, 0x11, 0x02, 0x4C, 0x0C, 0x10, 0x0D, 0x40, 0x33, 0x00, 0x11, 0x01, 0x44,</div><div class='add'>+0x2F, 0x15, 0x19, 0x40, 0x37, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,</div><div class='add'>+0xA0, 0x46, 0x00, 0xD1, 0x04, 0x64, 0x04, 0xD0, 0x01, 0x40, 0x37, 0x20, 0x19,</div><div class='add'>+0x00, 0x04, 0x10, 0x10, 0x1D, 0x48, 0x17, 0x10, 0x1D, 0x00, 0x74, 0x05, 0x50,</div><div class='add'>+0x1D, 0x44, 0x34, 0x40, 0x51, 0x00, 0x74, 0x00, 0x10, 0x00, 0x40, 0x36, 0x00,</div><div class='add'>+0x81, 0x00, 0x04, 0x01, 0x10, 0x0D, 0x40, 0x37, 0x00, 0xD9, 0x01, 0x64, 0xC3,</div><div class='add'>+0x10, 0x19, 0x40, 0x07, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x20,</div><div class='add'>+0x00, 0x18, 0x81, 0x00, 0x04, 0x00, 0xD8, 0x08, 0x40, 0x26, 0x80, 0x41, 0x00,</div><div class='add'>+0x05, 0x04, 0x18, 0x0C, 0x40, 0x23, 0x00, 0x4D, 0x00, 0x34, 0x03, 0xD0, 0x1D,</div><div class='add'>+0x40, 0x30, 0x00, 0x81, 0x00, 0x74, 0x01, 0x18, 0x08, 0x50, 0x36, 0x00, 0x81,</div><div class='add'>+0x00, 0x04, 0x02, 0x14, 0x0C, 0x40, 0x37, 0x00, 0x89, 0x00, 0x04, 0x03, 0x10,</div><div class='add'>+0x00, 0x44, 0x43, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x98, 0x06,</div><div class='add'>+0x00, 0xD3, 0x00, 0x6C, 0x00, 0xF0, 0x05, 0x50, 0x37, 0x00, 0x1B, 0x00, 0x4C,</div><div class='add'>+0x00, 0x20, 0x0D, 0xC0, 0x13, 0x00, 0x9F, 0x00, 0x7C, 0x00, 0xF0, 0x0D, 0x50,</div><div class='add'>+0x38, 0x00, 0x53, 0x00, 0x7C, 0x02, 0x30, 0x05, 0xC0, 0x3F, 0x00, 0x53, 0x00,</div><div class='add'>+0x4C, 0x01, 0x30, 0x0D, 0xC0, 0x37, 0x10, 0x9B, 0x20, 0x6C, 0x81, 0x30, 0xA9,</div><div class='add'>+0xC0, 0x07, 0xC0, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0xB8, 0x0F, 0x00,</div><div class='add'>+0xBF, 0x00, 0xFC, 0x00, 0x70, 0x02, 0xC0, 0x2D, 0x00, 0x3F, 0x00, 0xFC, 0x00,</div><div class='add'>+0xF0, 0x0E, 0xC0, 0x0F, 0x00, 0x3F, 0x40, 0x9C, 0x02, 0xF0, 0x0B, 0xC0, 0x3F,</div><div class='add'>+0x00, 0x3F, 0x00, 0xBC, 0x00, 0x78, 0x03, 0xC0, 0x39, 0x00, 0x3E, 0x00, 0xDC,</div><div class='add'>+0x80, 0xF0, 0x0F, 0xC0, 0x3B, 0x00, 0xA7, 0x00, 0xFE, 0x03, 0xF0, 0x4B, 0xE0,</div><div class='add'>+0x17, 0x22, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x80, 0xDF, 0x00, 0xB3,</div><div class='add'>+0x08, 0xFC, 0x06, 0x70, 0x9F, 0xC8, 0x7E, 0x12, 0xF3, 0x09, 0xEC, 0x27, 0x11,</div><div class='add'>+0x1F, 0xC0, 0x7C, 0x00, 0xE3, 0x09, 0xDC, 0x27, 0xF0, 0x1F, 0xC0, 0x7C, 0x40,</div><div class='add'>+0xF3, 0x09, 0xBC, 0x0F, 0xF8, 0x1F, 0xC0, 0x7F, 0x00, 0xFF, 0x09, 0x9C, 0x07,</div><div class='add'>+0xF0, 0x1F, 0xC0, 0x5C, 0x00, 0x33, 0x01, 0xCC, 0x06, 0xF0, 0x1B, 0xC8, 0x0D,</div><div class='add'>+0x08, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x18, 0x27, 0x01, 0x91, 0x20,</div><div class='add'>+0x44, 0x53, 0x10, 0x01, 0x40, 0x06, 0x00, 0x15, 0x00, 0x50, 0x00, 0x50, 0x11,</div><div class='add'>+0x40, 0x44, 0x08, 0x15, 0x00, 0x04, 0x10, 0xD2, 0x01, 0x41, 0x45, 0x00, 0x11,</div><div class='add'>+0x80, 0x74, 0x00, 0xD0, 0x11, 0x42, 0x03, 0x25, 0x11, 0x04, 0x64, 0x04, 0xD1,</div><div class='add'>+0x1F, 0x48, 0x74, 0x40, 0x15, 0x81, 0x54, 0x02, 0xD2, 0x09, 0x42, 0x0F, 0x60,</div><div class='add'>+0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0xA0, 0x37, 0x00, 0xC1, 0x44, 0x14,</div><div class='add'>+0x13, 0x50, 0x4D, 0x48, 0x37, 0x11, 0xD1, 0x84, 0x46, 0x13, 0x10, 0x0C, 0x62,</div><div class='add'>+0x30, 0x20, 0xC5, 0x04, 0x14, 0x03, 0xD0, 0x4D, 0x40, 0x30, 0x00, 0xC9, 0x44,</div><div class='add'>+0x14, 0x13, 0xD0, 0x0C, 0x40, 0x36, 0x10, 0xD5, 0x00, 0x14, 0x03, 0x58, 0x0C,</div><div class='add'>+0x40, 0x21, 0x00, 0x15, 0x20, 0x14, 0x00, 0xD8, 0x00, 0x40, 0x4F, 0x80, 0x0E,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x80, 0x25, 0x10, 0xD1, 0x21, 0x64, 0x07,</div><div class='add'>+0x10, 0x01, 0x40, 0x07, 0x00, 0x15, 0x00, 0x54, 0x00, 0x50, 0x01, 0x70, 0x04,</div><div class='add'>+0x00, 0x15, 0x00, 0x54, 0x00, 0xD0, 0x01, 0x40, 0x05, 0x00, 0x19, 0x00, 0x74,</div><div class='add'>+0x00, 0xD0, 0x01, 0x42, 0x07, 0x00, 0x11, 0x00, 0x64, 0x00, 0xD0, 0x0D, 0x00,</div><div class='add'>+0x25, 0x00, 0x15, 0x01, 0x54, 0x44, 0xD0, 0x11, 0x41, 0x0F, 0x00, 0x06, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x02, 0xA8, 0x13, 0x03, 0xD3, 0x31, 0x7C, 0x17, 0x70,</div><div class='add'>+0x0C, 0xC0, 0x37, 0x00, 0xD3, 0x00, 0x0C, 0x03, 0x30, 0x0D, 0xC0, 0x34, 0x30,</div><div class='add'>+0xD3, 0x00, 0x5C, 0x03, 0xF0, 0x0D, 0x02, 0x34, 0x00, 0xDB, 0x00, 0x7C, 0x03,</div><div class='add'>+0xD0, 0x0D, 0x40, 0x37, 0x20, 0xC7, 0x40, 0x5C, 0x03, 0xF0, 0x0D, 0xD0, 0x15,</div><div class='add'>+0x00, 0x06, 0x01, 0x5C, 0x0E, 0xF0, 0x39, 0xC0, 0x09, 0x20, 0x0E, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x07, 0x80, 0x2D, 0x40, 0xDF, 0x00, 0xDC, 0x03, 0xF0, 0x03,</div><div class='add'>+0xC0, 0x0C, 0x00, 0x3F, 0x80, 0xFC, 0x00, 0xF0, 0x03, 0xC0, 0x0F, 0x40, 0x3B,</div><div class='add'>+0x00, 0xEC, 0x00, 0xF0, 0x03, 0x08, 0x0F, 0x00, 0x37, 0x00, 0xFC, 0x00, 0xF0,</div><div class='add'>+0x03, 0xC0, 0x0F, 0x00, 0x3F, 0x00, 0xCC, 0x00, 0xD0, 0x0F, 0xC0, 0x3E, 0x81,</div><div class='add'>+0xBB, 0x00, 0xFC, 0x00, 0xF0, 0x03, 0xC0, 0x1F, 0x00, 0x06, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x02, 0x08, 0xB5, 0x00, 0xDF, 0x00, 0x4D, 0x03, 0x70, 0x8D, 0xC0,</div><div class='add'>+0x37, 0x01, 0xD3, 0x00, 0x7C, 0x03, 0x30, 0x8D, 0xC0, 0x37, 0x01, 0xD7, 0x00,</div><div class='add'>+0x4C, 0x03, 0x30, 0x0D, 0xC0, 0x37, 0x01, 0xDF, 0x00, 0x7C, 0x03, 0xB0, 0x0D,</div><div class='add'>+0xC2, 0x34, 0x00, 0xD7, 0x00, 0x6C, 0x13, 0xB0, 0x0C, 0xC0, 0x24, 0x01, 0x9F,</div><div class='add'>+0x00, 0x7C, 0x08, 0xF0, 0x21, 0x48, 0x2B, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x13, 0xA0, 0x24, 0x00, 0xDD, 0x00, 0x44, 0x03, 0x10, 0x11, 0x40, 0x00,</div><div class='add'>+0x04, 0x0B, 0x00, 0x5C, 0x00, 0xB0, 0x00, 0x40, 0x83, 0x00, 0x1B, 0x00, 0x6E,</div><div class='add'>+0x00, 0x10, 0x00, 0x40, 0xC3, 0x00, 0x1D, 0x00, 0x5C, 0x00, 0x10, 0x01, 0xE8,</div><div class='add'>+0x03, 0x00, 0x11, 0x80, 0x44, 0x40, 0x10, 0x0D, 0xC0, 0x20, 0x01, 0x9D, 0x00,</div><div class='add'>+0x5C, 0x00, 0xD0, 0x11, 0x41, 0x4F, 0x08, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x03, 0x20, 0x22, 0x00, 0x9D, 0x00, 0x44, 0x03, 0x50, 0x0C, 0x40, 0xB1, 0x00,</div><div class='add'>+0xC5, 0x00, 0x14, 0x03, 0x10, 0x1C, 0x40, 0x33, 0x00, 0xD1, 0x00, 0x04, 0x03,</div><div class='add'>+0x10, 0x0C, 0x48, 0x73, 0x00, 0xC9, 0x00, 0x34, 0x83, 0x90, 0x0C, 0x40, 0x30,</div><div class='add'>+0x00, 0xC5, 0x00, 0x24, 0x07, 0x80, 0x0C, 0x40, 0xE3, 0x00, 0x4D, 0x05, 0x36,</div><div class='add'>+0x12, 0xD0, 0x48, 0x40, 0x4F, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04,</div><div class='add'>+0x08, 0x6A, 0x00, 0xED, 0x09, 0x86, 0x07, 0x10, 0x13, 0x60, 0x4C, 0x00, 0x2D,</div><div class='add'>+0x01, 0xD4, 0x04, 0x90, 0x12, 0x40, 0x4F, 0x00, 0x38, 0x01, 0xA4, 0x04, 0x1C,</div><div class='add'>+0x12, 0x40, 0x4B, 0x04, 0x2D, 0x01, 0xD4, 0x04, 0x00, 0x13, 0x40, 0x49, 0x00,</div><div class='add'>+0x21, 0x01, 0xC4, 0x04, 0x50, 0x1C, 0x40, 0x79, 0x00, 0xED, 0x11, 0x94, 0x07,</div><div class='add'>+0xD0, 0x9A, 0x40, 0x37, 0x20, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x10,</div><div class='add'>+0x32, 0x02, 0x0D, 0x08, 0x4C, 0x03, 0x50, 0x0C, 0x40, 0x31, 0x12, 0xD7, 0x00,</div><div class='add'>+0x1C, 0x03, 0x30, 0x0C, 0x40, 0x33, 0x00, 0xC7, 0x00, 0x04, 0x03, 0x30, 0x0C,</div><div class='add'>+0xC0, 0x33, 0x00, 0xCF, 0x08, 0x34, 0x13, 0xB0, 0x0D, 0x40, 0x30, 0x02, 0xD7,</div><div class='add'>+0x00, 0x2C, 0x03, 0xB0, 0x0C, 0xD0, 0x23, 0x02, 0xCF, 0x20, 0x3C, 0x42, 0xF0,</div><div class='add'>+0x8C, 0xC0, 0x4B, 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xA8, 0x2D,</div><div class='add'>+0x00, 0x7F, 0x08, 0xF8, 0x03, 0xE0, 0x02, 0x80, 0x09, 0x00, 0x3B, 0x00, 0xA8,</div><div class='add'>+0x20, 0xF2, 0x81, 0xC0, 0x0B, 0x00, 0x1F, 0x00, 0x7C, 0x00, 0xF0, 0x03, 0xC8,</div><div class='add'>+0x07, 0x00, 0x3F, 0x28, 0x7C, 0x00, 0x70, 0x03, 0xC0, 0x0F, 0x00, 0x3F, 0x40,</div><div class='add'>+0x54, 0x24, 0x20, 0x9D, 0xC0, 0x2C, 0x08, 0xFF, 0x00, 0xFC, 0x23, 0xF0, 0x8F,</div><div class='add'>+0xC2, 0x0B, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xA8, 0x27, 0x00,</div><div class='add'>+0xDF, 0x00, 0x4C, 0x03, 0xF0, 0x1D, 0xC0, 0x35, 0x00, 0xDE, 0x00, 0x7C, 0x07,</div><div class='add'>+0x30, 0x1D, 0xC0, 0x34, 0x00, 0xDF, 0x00, 0x3C, 0x03, 0x30, 0x1D, 0xC0, 0x34,</div><div class='add'>+0x00, 0xDF, 0x00, 0x7C, 0x03, 0xF0, 0x0D, 0xC0, 0x37, 0x00, 0xDF, 0x00, 0x3C,</div><div class='add'>+0x03, 0xB0, 0x0D, 0xC4, 0x24, 0x00, 0x5F, 0x00, 0x7C, 0x83, 0x30, 0x0D, 0xC2,</div><div class='add'>+0x40, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x88, 0x29, 0x00, 0xFD,</div><div class='add'>+0x00, 0x84, 0x03, 0xD0, 0x03, 0x40, 0x08, 0x00, 0x2D, 0x00, 0xB4, 0x00, 0x50,</div><div class='add'>+0x02, 0x00, 0x08, 0x88, 0x2D, 0x00, 0xB4, 0x00, 0x50, 0x02, 0x40, 0x09, 0x00,</div><div class='add'>+0x2F, 0x00, 0xA4, 0x00, 0xD1, 0x02, 0x48, 0x0B, 0x00, 0x2D, 0x20, 0xB6, 0x00,</div><div class='add'>+0x18, 0x4E, 0x40, 0x38, 0x20, 0xED, 0x00, 0xF4, 0x01, 0x10, 0x07, 0x40, 0x4C,</div><div class='add'>+0x60, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x79, 0x00, 0x6D, 0x00,</div><div class='add'>+0x84, 0x47, 0xD0, 0x1E, 0x40, 0x7B, 0x00, 0xED, 0x81, 0xF4, 0x07, 0x18, 0x1F,</div><div class='add'>+0x48, 0x78, 0x80, 0xED, 0x01, 0xF6, 0x07, 0x13, 0x1F, 0x44, 0x7B, 0x80, 0xED,</div><div class='add'>+0x01, 0xB4, 0x87, 0x58, 0x1E, 0x40, 0x7B, 0x00, 0xED, 0x01, 0xF4, 0x07, 0xD8,</div><div class='add'>+0xDE, 0x40, 0x6A, 0x00, 0xED, 0x01, 0xB4, 0x07, 0x10, 0x1E, 0x40, 0x10, 0x00,</div><div class='add'>+0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16, 0x20, 0x23, 0x00, 0x4C, 0x00, 0x04,</div><div class='add'>+0x05, 0xD0, 0x00, 0x40, 0x00, 0x00, 0x0D, 0x00, 0x34, 0x00, 0x50, 0x00, 0x40,</div><div class='add'>+0x00, 0xA0, 0x0D, 0x00, 0x74, 0x00, 0x50, 0x00, 0x40, 0x03, 0x10, 0x05, 0x00,</div><div class='add'>+0x34, 0x00, 0xD0, 0x00, 0x40, 0x03, 0x00, 0x0D, 0x20, 0x34, 0x00, 0x51, 0x0C,</div><div class='add'>+0x50, 0x22, 0x00, 0x8D, 0x0F, 0x74, 0x0F, 0x1A, 0x6D, 0x40, 0x58, 0x00, 0x0C,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x17, 0xA0, 0x1F, 0x00, 0x7F, 0x10, 0xCC, 0x0D,</div><div class='add'>+0xF0, 0x05, 0xC0, 0x17, 0x00, 0x5F, 0x00, 0x7C, 0x01, 0x30, 0x05, 0xD0, 0x14,</div><div class='add'>+0x00, 0x5F, 0x00, 0x7C, 0x01, 0x30, 0x05, 0xC0, 0x17, 0x00, 0x5D, 0x00, 0x7C,</div><div class='add'>+0x01, 0xF0, 0x05, 0xC0, 0x17, 0x00, 0x5F, 0x00, 0x3C, 0x01, 0xF0, 0x04, 0xC0,</div><div class='add'>+0x1A, 0x00, 0x7F, 0x00, 0xFC, 0x0D, 0x34, 0x07, 0xD0, 0x5C, 0x20, 0x0E, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x12, 0x80, 0x05, 0x00, 0x1F, 0x20, 0x7C, 0x40, 0xF2,</div><div class='add'>+0x03, 0xC0, 0x0F, 0x00, 0x3F, 0x20, 0xFC, 0x00, 0xF0, 0x03, 0xC0, 0x8F, 0x00,</div><div class='add'>+0x3F, 0x00, 0xFC, 0x00, 0xF0, 0x03, 0xC0, 0x0D, 0x00, 0x3D, 0x00, 0xE4, 0x00,</div><div class='add'>+0xF0, 0x03, 0xC0, 0x0F, 0x00, 0x3F, 0x20, 0xFC, 0x08, 0x90, 0x01, 0xC0, 0x05,</div><div class='add'>+0x00, 0x1F, 0x00, 0x7C, 0x28, 0xF0, 0x81, 0xC0, 0x4B, 0x00, 0x06, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x10, 0x00, 0x65, 0x00, 0x9F, 0x40, 0x7C, 0x02, 0xF0, 0x19,</div><div class='add'>+0xC0, 0x27, 0x00, 0x9F, 0x00, 0x5C, 0x82, 0xF0, 0x09, 0xC0, 0x27, 0x02, 0x9F,</div><div class='add'>+0x00, 0x7C, 0x02, 0x30, 0x09, 0xC0, 0xE7, 0x80, 0x9F, 0x00, 0x4D, 0x02, 0x34,</div><div class='add'>+0x09, 0xC0, 0x27, 0x00, 0x9B, 0x00, 0x7C, 0x06, 0x72, 0x09, 0xC0, 0x24, 0x00,</div><div class='add'>+0x93, 0x05, 0x7C, 0x42, 0x30, 0x09, 0xC0, 0x40, 0x20, 0x04, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x01, 0x28, 0x66, 0x00, 0x9D, 0x00, 0x74, 0x02, 0xD0, 0x19, 0x40,</div><div class='add'>+0x27, 0x00, 0x8D, 0x00, 0x44, 0x02, 0xD8, 0x19, 0x40, 0xE7, 0x20, 0x9D, 0x00,</div><div class='add'>+0x74, 0x02, 0x10, 0x09, 0x40, 0x27, 0x04, 0x97, 0x20, 0x44, 0x02, 0x30, 0x09,</div><div class='add'>+0x40, 0x23, 0x00, 0x91, 0x20, 0x70, 0x16, 0x30, 0x0B, 0xD0, 0x24, 0x00, 0x91,</div><div class='add'>+0x00, 0x74, 0x96, 0x50, 0x39, 0x40, 0x04, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x1C, 0xA0, 0x24, 0x02, 0x9D, 0x00, 0x74, 0x02, 0xD0, 0x89, 0x40, 0x6F,</div><div class='add'>+0x00, 0xBD, 0x00, 0xD4, 0x02, 0xD0, 0xAB, 0x40, 0x2F, 0x00, 0xBD, 0x00, 0xF4,</div><div class='add'>+0x02, 0x10, 0x0B, 0x60, 0x2F, 0x00, 0xAD, 0x00, 0x84, 0x02, 0x10, 0x0B, 0x40,</div><div class='add'>+0x2F, 0x80, 0xB9, 0x00, 0xF4, 0x12, 0x10, 0x69, 0x60, 0x36, 0x00, 0xD9, 0x02,</div><div class='add'>+0x74, 0x06, 0x10, 0x19, 0x41, 0x70, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x14, 0x28, 0xA0, 0x00, 0x8D, 0x1C, 0x34, 0x22, 0xD0, 0x2A, 0x40, 0xEB, 0x00,</div><div class='add'>+0xBD, 0x08, 0x84, 0x22, 0xD0, 0x0A, 0x40, 0x2B, 0x00, 0xAD, 0x00, 0xB0, 0x22,</div><div class='add'>+0x10, 0x8A, 0x40, 0x2B, 0x00, 0xA5, 0x88, 0x84, 0x22, 0x10, 0x0A, 0x40, 0x2F,</div><div class='add'>+0x02, 0xA1, 0x08, 0xB4, 0x02, 0x14, 0x08, 0x64, 0x24, 0x08, 0x89, 0x00, 0x34,</div><div class='add'>+0x02, 0x50, 0x09, 0x40, 0x50, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1D,</div><div class='add'>+0xB0, 0x06, 0x00, 0x1F, 0x06, 0x7C, 0x08, 0xF0, 0x01, 0xC0, 0x07, 0x00, 0x1F,</div><div class='add'>+0x02, 0x5C, 0x08, 0xD0, 0x01, 0xC0, 0x17, 0x00, 0x1D, 0x8A, 0x7C, 0x08, 0x34,</div><div class='add'>+0x21, 0xC0, 0x07, 0x00, 0x1D, 0x02, 0x44, 0x08, 0x30, 0x01, 0xC0, 0x87, 0x00,</div><div class='add'>+0x1B, 0x02, 0xFC, 0x00, 0x70, 0x11, 0xC0, 0x06, 0x40, 0x1B, 0x00, 0x7C, 0x28,</div><div class='add'>+0x32, 0xA1, 0xD0, 0x74, 0xC0, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x19, 0xA0,</div><div class='add'>+0x6F, 0x00, 0xBF, 0x04, 0xFC, 0x12, 0xF0, 0x19, 0x40, 0x67, 0x00, 0x9F, 0x44,</div><div class='add'>+0x3C, 0x12, 0xF2, 0x08, 0x40, 0x27, 0x00, 0x9D, 0x00, 0x7C, 0x12, 0xF0, 0x48,</div><div class='add'>+0xC0, 0x27, 0x00, 0x97, 0x84, 0x7C, 0x12, 0x70, 0x09, 0xC2, 0x27, 0x01, 0x9F,</div><div class='add'>+0x84, 0x7C, 0x02, 0x70, 0x28, 0xC0, 0x2D, 0x00, 0xB7, 0x00, 0xFC, 0x02, 0xF0,</div><div class='add'>+0x0B, 0xC0, 0x67, 0x60, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0xA0, 0x2F,</div><div class='add'>+0x00, 0x93, 0x2C, 0x7C, 0x02, 0xF0, 0x0B, 0xC0, 0xAB, 0x00, 0x97, 0x00, 0x7C,</div><div class='add'>+0x02, 0xF0, 0x0B, 0xC0, 0x28, 0x00, 0x9F, 0x00, 0x7C, 0x22, 0xF0, 0x09, 0xC8,</div><div class='add'>+0x2D, 0x00, 0x93, 0x08, 0x5C, 0x02, 0x70, 0x09, 0xC0, 0x27, 0x02, 0x9F, 0x00,</div><div class='add'>+0xDC, 0x02, 0xB0, 0x1B, 0xC3, 0x2B, 0x00, 0xBF, 0x60, 0xFC, 0x82, 0x30, 0x0B,</div><div class='add'>+0xC0, 0x63, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1C, 0x18, 0x54, 0x45,</div><div class='add'>+0x51, 0x4C, 0x74, 0x40, 0xD0, 0x51, 0x41, 0x47, 0x01, 0x11, 0x14, 0x74, 0x10,</div><div class='add'>+0xD0, 0x01, 0x40, 0x04, 0x08, 0x1D, 0x05, 0x74, 0x80, 0xD2, 0x41, 0x41, 0x04,</div><div class='add'>+0x00, 0x11, 0x04, 0x4C, 0x40, 0x10, 0x01, 0xC0, 0x05, 0x00, 0x1D, 0x14, 0x74,</div><div class='add'>+0x00, 0x10, 0x21, 0x42, 0x07, 0x08, 0x5D, 0x00, 0x74, 0x00, 0x50, 0x05, 0x40,</div><div class='add'>+0x73, 0x40, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x20, 0x21, 0x00, 0x81,</div><div class='add'>+0x04, 0x34, 0x12, 0xD0, 0x08, 0x40, 0x23, 0x01, 0x85, 0x04, 0x34, 0x52, 0xD0,</div><div class='add'>+0x09, 0x62, 0x21, 0x00, 0x8D, 0x10, 0x34, 0x02, 0xD0, 0x48, 0x40, 0x25, 0x00,</div><div class='add'>+0x91, 0x04, 0x54, 0x12, 0x50, 0x08, 0x48, 0x23, 0x80, 0x8D, 0x04, 0x14, 0x02,</div><div class='add'>+0xD2, 0x08, 0x48, 0x23, 0x20, 0x8D, 0x20, 0x74, 0x02, 0x18, 0x08, 0x40, 0x4B,</div><div class='add'>+0x28, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x25, 0x00, 0x91, 0x00,</div><div class='add'>+0x74, 0x0A, 0xD0, 0x09, 0x40, 0x23, 0x00, 0x91, 0x00, 0x74, 0x02, 0xD0, 0x09,</div><div class='add'>+0x00, 0x25, 0x80, 0x9D, 0x00, 0x74, 0x02, 0xD0, 0x09, 0x40, 0x24, 0x00, 0x91,</div><div class='add'>+0x00, 0x54, 0x02, 0x10, 0x09, 0x40, 0x25, 0x00, 0x9D, 0x00, 0x74, 0x02, 0x10,</div><div class='add'>+0x0D, 0x40, 0x27, 0x00, 0x9D, 0x00, 0x76, 0x02, 0x50, 0x09, 0x40, 0x63, 0x00,</div><div class='add'>+0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0xA8, 0x6F, 0x00, 0x93, 0x02, 0x78,</div><div class='add'>+0x02, 0xF0, 0x0B, 0xC0, 0x2F, 0x00, 0x97, 0x00, 0x7C, 0x02, 0xF0, 0x08, 0xC0,</div><div class='add'>+0x25, 0x00, 0x9F, 0x00, 0x7C, 0x02, 0xF0, 0x09, 0x48, 0x21, 0x40, 0x81, 0x00,</div><div class='add'>+0x54, 0x02, 0x70, 0x09, 0xC0, 0x27, 0x00, 0x9F, 0x00, 0x1C, 0x02, 0xB0, 0x09,</div><div class='add'>+0xC0, 0xE7, 0x81, 0x9F, 0x02, 0x78, 0x42, 0x32, 0x29, 0xC0, 0x17, 0x20, 0x0E,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x80, 0xA5, 0x00, 0x9F, 0x04, 0x7C, 0x26,</div><div class='add'>+0xF1, 0x09, 0xC0, 0x27, 0x00, 0x9F, 0x00, 0x7C, 0x02, 0xF0, 0x09, 0xD0, 0x26,</div><div class='add'>+0x20, 0x9F, 0x00, 0x7C, 0x02, 0xF0, 0x09, 0xC2, 0x27, 0x08, 0x9F, 0x00, 0x4C,</div><div class='add'>+0x02, 0xF0, 0x09, 0xC0, 0x25, 0x00, 0x9F, 0x80, 0x7C, 0x02, 0xBC, 0x09, 0xC0,</div><div class='add'>+0x67, 0x01, 0x9F, 0x09, 0x7C, 0x02, 0xF1, 0x49, 0xC0, 0x4B, 0x00, 0x06, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x10, 0x08, 0x05, 0x00, 0x1F, 0x02, 0x4D, 0x00, 0xF0,</div><div class='add'>+0x01, 0xC0, 0x06, 0x00, 0x13, 0x00, 0x7E, 0x00, 0x70, 0x01, 0xC0, 0x04, 0x00,</div><div class='add'>+0x17, 0x00, 0x7C, 0x00, 0xF0, 0x01, 0xE2, 0x07, 0x08, 0x1B, 0x00, 0x4C, 0x00,</div><div class='add'>+0xF0, 0x01, 0xC0, 0x07, 0x00, 0x1F, 0x00, 0x7C, 0x40, 0xF0, 0x41, 0xC8, 0x87,</div><div class='add'>+0x40, 0x17, 0x00, 0x7C, 0x00, 0x34, 0x01, 0x87, 0x40, 0x20, 0x04, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x14, 0x80, 0x54, 0x80, 0x5D, 0x00, 0x44, 0x01, 0x70, 0x45,</div><div class='add'>+0x40, 0x1C, 0x00, 0x5B, 0x00, 0x74, 0x01, 0x70, 0x07, 0x60, 0x9C, 0x00, 0x51,</div><div class='add'>+0x00, 0x74, 0x01, 0xD8, 0x05, 0xC0, 0x1F, 0x00, 0x55, 0x00, 0x1E, 0x01, 0x72,</div><div class='add'>+0x05, 0x40, 0x17, 0x08, 0x53, 0x00, 0xCC, 0x0D, 0xC0, 0x07, 0xC0, 0xDD, 0x01,</div><div class='add'>+0x70, 0x0A, 0xF0, 0x35, 0x10, 0x17, 0x50, 0x50, 0x00, 0x02, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x14, 0xA0, 0x36, 0x10, 0xCD, 0x00, 0x16, 0x03, 0x50, 0x0C, 0x40,</div><div class='add'>+0x62, 0x00, 0xC1, 0x00, 0x34, 0x03, 0x58, 0x98, 0x48, 0xF3, 0x06, 0xCD, 0x00,</div><div class='add'>+0x34, 0x03, 0xD2, 0x0D, 0x40, 0xB3, 0x01, 0xC1, 0x00, 0x04, 0x03, 0x50, 0x0C,</div><div class='add'>+0x40, 0x33, 0x80, 0xC9, 0x00, 0x14, 0x0A, 0x90, 0x34, 0x40, 0xE3, 0x01, 0x81,</div><div class='add'>+0x02, 0x74, 0x03, 0x90, 0x0C, 0x40, 0x50, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x01, 0x88, 0xB8, 0x11, 0xED, 0xA5, 0x96, 0x13, 0x50, 0x5E, 0x40, 0x9C,</div><div class='add'>+0x01, 0xE9, 0x08, 0xB4, 0x03, 0x50, 0x0B, 0x40, 0x5F, 0x00, 0xE9, 0x04, 0xB4,</div><div class='add'>+0x13, 0xD8, 0x0E, 0x40, 0x3D, 0x00, 0xF5, 0x00, 0x96, 0x13, 0x50, 0x0E, 0x40,</div><div class='add'>+0x7F, 0x03, 0xE1, 0x05, 0x90, 0x0B, 0xD0, 0x26, 0x60, 0x6D, 0x00, 0xE1, 0x82,</div><div class='add'>+0xB4, 0x02, 0x90, 0x1E, 0x41, 0x04, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x11, 0x10, 0xF8, 0x00, 0xFD, 0x07, 0x9C, 0x17, 0x70, 0x1F, 0xC0, 0xFA, 0x01,</div><div class='add'>+0xE3, 0x01, 0xB4, 0x17, 0x70, 0x1E, 0x50, 0x6B, 0x00, 0xED, 0x05, 0xBC, 0x47,</div><div class='add'>+0xD0, 0x9E, 0x68, 0x7B, 0x08, 0xEB, 0x01, 0x84, 0x17, 0x70, 0x1E, 0xC0, 0x7B,</div><div class='add'>+0x00, 0xFB, 0x09, 0x9C, 0x07, 0xF0, 0x1E, 0x80, 0x6B, 0x00, 0xE6, 0x21, 0xFC,</div><div class='add'>+0x06, 0xB0, 0x1B, 0xC0, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10,</div><div class='add'>+0xA8, 0x35, 0x00, 0xDF, 0x00, 0x6C, 0x03, 0x70, 0x89, 0xC0, 0x17, 0x00, 0xDF,</div><div class='add'>+0x00, 0x7C, 0x03, 0xF0, 0x0C, 0xC0, 0x24, 0x18, 0xD7, 0x00, 0x7C, 0xB3, 0xF0,</div><div class='add'>+0x4D, 0xC2, 0x23, 0x00, 0xC7, 0x92, 0x7C, 0x4B, 0x70, 0x0D, 0xC0, 0xB3, 0x04,</div><div class='add'>+0xDB, 0x08, 0x6C, 0x03, 0xF0, 0x0D, 0x80, 0x27, 0x00, 0xDF, 0x00, 0x7C, 0x02,</div><div class='add'>+0x70, 0x01, 0xC0, 0x43, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20,</div><div class='add'>+0x79, 0x00, 0xE3, 0x04, 0xCD, 0x53, 0x70, 0x1B, 0xC0, 0x7F, 0x40, 0xF2, 0x01,</div><div class='add'>+0xDC, 0x67, 0xF0, 0x1B, 0xC0, 0x6F, 0x00, 0xEF, 0x19, 0xCC, 0x07, 0x30, 0x1F,</div><div class='add'>+0x85, 0x7F, 0x00, 0xF3, 0x11, 0xFC, 0x67, 0x70, 0x1F, 0xC0, 0x7D, 0x00, 0xF7,</div><div class='add'>+0x01, 0xCD, 0x07, 0xF0, 0x17, 0xC0, 0x7F, 0x00, 0xFF, 0xC1, 0xF4, 0x07, 0xF2,</div><div class='add'>+0x1B, 0xC4, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x18, 0x39,</div><div class='add'>+0x00, 0xE1, 0x00, 0xAC, 0x03, 0x10, 0x0A, 0x40, 0x1B, 0x00, 0xE1, 0x08, 0xDC,</div><div class='add'>+0xC3, 0x11, 0x0A, 0xC0, 0x09, 0x09, 0xED, 0x00, 0x94, 0x23, 0x50, 0x0E, 0x42,</div><div class='add'>+0x1B, 0x00, 0xE1, 0x04, 0xDC, 0x03, 0x10, 0x8E, 0x40, 0x38, 0x00, 0xED, 0x00,</div><div class='add'>+0x84, 0x2B, 0xD0, 0x86, 0x40, 0x2B, 0x06, 0x6D, 0x08, 0xB4, 0x11, 0xD0, 0x4F,</div><div class='add'>+0xC0, 0x56, 0x60, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x00,</div><div class='add'>+0xF1, 0x00, 0xC4, 0x23, 0x50, 0x8E, 0x41, 0x3B, 0x00, 0xE1, 0x00, 0xB4, 0x03,</div><div class='add'>+0x59, 0x8A, 0x41, 0x2A, 0x30, 0xFD, 0x10, 0xE6, 0x03, 0x90, 0x0E, 0x40, 0x3F,</div><div class='add'>+0x06, 0xE1, 0x20, 0xA6, 0x03, 0x51, 0x0F, 0x40, 0x39, 0x02, 0xED, 0x00, 0xA4,</div><div class='add'>+0x43, 0xD0, 0x0E, 0x40, 0x3B, 0x00, 0xED, 0x00, 0xB4, 0x02, 0xD2, 0x0A, 0x40,</div><div class='add'>+0x02, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x20, 0x25, 0x02, 0xC1,</div><div class='add'>+0x09, 0x24, 0x07, 0x10, 0x08, 0x60, 0x53, 0x0E, 0xC1, 0x0A, 0x34, 0x07, 0x12,</div><div class='add'>+0x08, 0x41, 0xA3, 0x20, 0xCD, 0x02, 0x34, 0x1F, 0x50, 0x3C, 0x40, 0x43, 0x00,</div><div class='add'>+0xD1, 0x0B, 0x14, 0x37, 0x10, 0x3C, 0x40, 0x74, 0x00, 0xCD, 0x05, 0x24, 0x17,</div><div class='add'>+0xD1, 0x0C, 0x40, 0x23, 0x00, 0x4D, 0x26, 0x34, 0x18, 0xD0, 0x00, 0x42, 0x12,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0xA8, 0x25, 0x40, 0xF3, 0x00,</div><div class='add'>+0xCD, 0x1B, 0x70, 0x2D, 0xC0, 0xB3, 0x00, 0xF3, 0x8A, 0xFC, 0x0B, 0x70, 0x18,</div><div class='add'>+0xC0, 0x26, 0x04, 0xFE, 0x01, 0xEC, 0x4F, 0xB0, 0x5F, 0xC0, 0x27, 0x40, 0xF3,</div><div class='add'>+0x00, 0xFC, 0x0B, 0x70, 0x9C, 0xC0, 0xBD, 0x02, 0xE7, 0x06, 0x6C, 0x0F, 0xD0,</div><div class='add'>+0x05, 0xC0, 0xE7, 0x00, 0x8D, 0x06, 0x7E, 0x00, 0xF0, 0x01, 0xD0, 0x56, 0x20,</div><div class='add'>+0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x27, 0x04, 0xDF, 0x00, 0x7C,</div><div class='add'>+0x43, 0xF0, 0x0D, 0xC0, 0xB7, 0x00, 0xDF, 0x00, 0x5C, 0x03, 0x70, 0x29, 0xC0,</div><div class='add'>+0x05, 0x00, 0xDF, 0x00, 0x5C, 0x03, 0xF0, 0x0D, 0xC0, 0xA7, 0x88, 0xDF, 0x00,</div><div class='add'>+0x7C, 0x03, 0x72, 0x8D, 0xC0, 0x37, 0x82, 0xDF, 0x00, 0x5C, 0x0B, 0xB0, 0x25,</div><div class='add'>+0x88, 0xA7, 0x09, 0x9F, 0x02, 0x7C, 0x0C, 0xF0, 0x01, 0xC1, 0x05, 0x00, 0x04,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x84, 0x08, 0x3F, 0x00, 0xFB, 0x00, 0xFC, 0x03,</div><div class='add'>+0xF0, 0x0F, 0xC1, 0x5F, 0x08, 0xF3, 0x00, 0xFC, 0x43, 0xF0, 0x03, 0xC2, 0x2C,</div><div class='add'>+0x0C, 0xFF, 0x10, 0xF8, 0x83, 0xF0, 0x0F, 0xC1, 0x0D, 0x04, 0xFB, 0x90, 0xCC,</div><div class='add'>+0x03, 0xF1, 0x0F, 0xC0, 0x3F, 0x00, 0xF7, 0x40, 0xE8, 0x03, 0xD0, 0x27, 0xC0,</div><div class='add'>+0x6F, 0x00, 0x33, 0x00, 0xCC, 0x02, 0xF0, 0x03, 0xC0, 0x13, 0x22, 0x0C, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x85, 0x20, 0x36, 0x08, 0xD1, 0x00, 0x74, 0x83, 0xD0,</div><div class='add'>+0x09, 0x60, 0x16, 0x0A, 0xD1, 0x00, 0x74, 0x03, 0xD2, 0x15, 0x40, 0x64, 0x00,</div><div class='add'>+0xDD, 0x00, 0x5C, 0x03, 0xD0, 0x0D, 0x40, 0xC4, 0x04, 0xDD, 0x00, 0x44, 0x03,</div><div class='add'>+0xD8, 0x0D, 0x40, 0x34, 0x00, 0xD1, 0x00, 0x44, 0x07, 0xC0, 0x25, 0x42, 0xE3,</div><div class='add'>+0xC0, 0x13, 0x05, 0x44, 0x4E, 0xD0, 0x31, 0x40, 0x17, 0x80, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x01, 0xA2, 0x64, 0x20, 0xD9, 0x00, 0x74, 0x03, 0xD0, 0x09,</div><div class='add'>+0x48, 0x37, 0x04, 0xD1, 0x00, 0x74, 0x03, 0x50, 0x19, 0x41, 0x45, 0x20, 0xDD,</div><div class='add'>+0x00, 0x74, 0x03, 0x50, 0x0C, 0x40, 0x67, 0x00, 0xDD, 0x00, 0x64, 0x03, 0xD0,</div><div class='add'>+0x0D, 0x40, 0x36, 0x00, 0xD5, 0x00, 0x76, 0x07, 0xD0, 0x05, 0x40, 0xB7, 0x01,</div><div class='add'>+0x91, 0x01, 0x44, 0x04, 0xD2, 0x39, 0x42, 0x05, 0x00, 0x02, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x10, 0x28, 0x20, 0x00, 0xC1, 0x00, 0x34, 0x03, 0xD0, 0x08, 0x40,</div><div class='add'>+0x33, 0x08, 0xC1, 0x00, 0x34, 0x03, 0xD0, 0x09, 0x40, 0x40, 0x00, 0xCD, 0x00,</div><div class='add'>+0x14, 0x03, 0xD0, 0x0C, 0x40, 0x00, 0x00, 0xCD, 0x00, 0x24, 0x03, 0xD0, 0x0D,</div><div class='add'>+0x40, 0x30, 0x00, 0xD1, 0x00, 0x16, 0x83, 0xD0, 0x04, 0x40, 0x13, 0x10, 0x01,</div><div class='add'>+0x00, 0x05, 0x00, 0xD0, 0x08, 0x60, 0x43, 0xA1, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0xB0, 0x26, 0x00, 0xDB, 0x00, 0x7C, 0x03, 0xF0, 0x0D, 0x48, 0x13,</div><div class='add'>+0x40, 0xD3, 0x80, 0x7C, 0x03, 0xF1, 0x01, 0xD0, 0x04, 0x00, 0xDE, 0x00, 0xFC,</div><div class='add'>+0x03, 0x72, 0x0F, 0xC4, 0x05, 0x00, 0xFF, 0x00, 0xEC, 0x03, 0xD0, 0x0D, 0xC0,</div><div class='add'>+0x3E, 0x00, 0xE7, 0x00, 0x7C, 0x03, 0xF0, 0x09, 0xC4, 0x37, 0x88, 0x11, 0x00,</div><div class='add'>+0x4C, 0x82, 0xF0, 0x09, 0xC0, 0x01, 0xC0, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x05, 0xA8, 0x2F, 0x10, 0xFF, 0x00, 0xBC, 0x03, 0xF0, 0x0B, 0xC0, 0x1E, 0x00,</div><div class='add'>+0xFF, 0x00, 0xFC, 0x03, 0xF0, 0x07, 0xC0, 0x0E, 0x00, 0xFF, 0x00, 0x9C, 0x03,</div><div class='add'>+0xF0, 0x0F, 0xC8, 0x0B, 0x00, 0xFF, 0x00, 0xDC, 0x03, 0xF0, 0x0E, 0x40, 0x3F,</div><div class='add'>+0x00, 0xFF, 0x00, 0xEC, 0x01, 0xF0, 0x0B, 0xC2, 0x1F, 0x08, 0x37, 0x00, 0xFC,</div><div class='add'>+0x00, 0xE1, 0x03, 0xC0, 0x17, 0x22, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03,</div><div class='add'>+0xA0, 0x2F, 0x00, 0x3B, 0x14, 0xBC, 0x0F, 0x34, 0x1F, 0xC0, 0x7E, 0x02, 0xFF,</div><div class='add'>+0x09, 0xFC, 0x07, 0xB0, 0x1F, 0xC0, 0x7C, 0x00, 0xF3, 0x09, 0x8C, 0x27, 0x72,</div><div class='add'>+0x1F, 0xC4, 0x7E, 0x02, 0xFB, 0x29, 0xCC, 0x07, 0xF0, 0x1F, 0xC0, 0x7C, 0x20,</div><div class='add'>+0xF3, 0x09, 0xCC, 0x27, 0x30, 0x83, 0xC2, 0x7C, 0x02, 0xF3, 0x24, 0xEE, 0x1A,</div><div class='add'>+0x30, 0x4B, 0xC4, 0x0C, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x08,</div><div class='add'>+0x27, 0x20, 0x01, 0x02, 0x74, 0x13, 0x18, 0x11, 0x40, 0x00, 0x00, 0x1D, 0x80,</div><div class='add'>+0x74, 0x04, 0x40, 0x11, 0x40, 0x00, 0x04, 0x11, 0x00, 0x44, 0x10, 0x10, 0x40,</div><div class='add'>+0x40, 0x00, 0x00, 0x11, 0x04, 0x44, 0x04, 0xD0, 0x11, 0x41, 0x44, 0x00, 0x13,</div><div class='add'>+0x44, 0x44, 0x10, 0x30, 0x65, 0x40, 0x34, 0x00, 0xF5, 0x0B, 0x6E, 0x10, 0x10,</div><div class='add'>+0x11, 0x40, 0x04, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0xA0, 0x02,</div><div class='add'>+0x40, 0x01, 0x40, 0x36, 0x03, 0x50, 0x0D, 0x50, 0x30, 0x01, 0xCD, 0x84, 0x34,</div><div class='add'>+0x03, 0x81, 0x0D, 0x50, 0x30, 0x01, 0xC1, 0x00, 0x24, 0x13, 0xD0, 0x0C, 0x41,</div><div class='add'>+0x30, 0x01, 0xC1, 0x04, 0x24, 0x03, 0xD0, 0x4D, 0x40, 0x34, 0x00, 0xC9, 0x04,</div><div class='add'>+0x24, 0x03, 0x10, 0x28, 0x40, 0x31, 0x81, 0xCD, 0x20, 0x04, 0x1A, 0x11, 0x88,</div><div class='add'>+0x40, 0x45, 0x80, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xA8, 0x15, 0x00,</div><div class='add'>+0x11, 0x22, 0x34, 0x03, 0x50, 0x01, 0x44, 0x04, 0x00, 0x1D, 0x00, 0x74, 0x80,</div><div class='add'>+0x90, 0x01, 0x40, 0x04, 0x00, 0x01, 0x00, 0x24, 0x00, 0x90, 0x01, 0x40, 0x04,</div><div class='add'>+0x00, 0x01, 0x00, 0x67, 0x00, 0xD0, 0x01, 0x00, 0x04, 0x00, 0x01, 0x00, 0x64,</div><div class='add'>+0x00, 0x10, 0x4D, 0x42, 0x36, 0x08, 0xDD, 0x00, 0x47, 0x04, 0x10, 0x19, 0x41,</div><div class='add'>+0x0D, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA8, 0x67, 0x40, 0x1B,</div><div class='add'>+0x01, 0x7C, 0x27, 0x50, 0x0C, 0xC8, 0x34, 0x20, 0xDF, 0x80, 0x3C, 0x03, 0xB4,</div><div class='add'>+0x0C, 0xC0, 0x34, 0x00, 0xD3, 0x00, 0x6C, 0x03, 0xF0, 0x0D, 0xC0, 0x34, 0x00,</div><div class='add'>+0xD3, 0x00, 0x6C, 0x03, 0xF2, 0x0C, 0x80, 0x30, 0x00, 0xDB, 0x00, 0x6D, 0x03,</div><div class='add'>+0x34, 0x01, 0xD1, 0x35, 0x00, 0xDF, 0x40, 0x44, 0x04, 0x22, 0x31, 0xC0, 0x01,</div><div class='add'>+0x20, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x80, 0x69, 0x01, 0x3F, 0x03,</div><div class='add'>+0xF8, 0x03, 0xB0, 0x03, 0x80, 0x0F, 0x00, 0x3F, 0x00, 0xFC, 0x00, 0x70, 0x03,</div><div class='add'>+0xC0, 0x0F, 0x00, 0x3F, 0x00, 0xDD, 0x00, 0x70, 0x03, 0xD0, 0x0D, 0x00, 0x37,</div><div class='add'>+0x00, 0xDC, 0x00, 0xF0, 0x03, 0xC4, 0x0F, 0x00, 0x3F, 0x00, 0xDC, 0x00, 0xF1,</div><div class='add'>+0x07, 0xC0, 0x3D, 0x20, 0xF7, 0x00, 0xF4, 0x00, 0xF5, 0x03, 0xC3, 0x1E, 0x00,</div><div class='add'>+0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x08, 0x35, 0x81, 0x37, 0x0A, 0x4D,</div><div class='add'>+0x03, 0x30, 0x0D, 0xC0, 0x77, 0x41, 0xD3, 0x05, 0x5C, 0x03, 0x30, 0x8D, 0xC0,</div><div class='add'>+0x35, 0x00, 0xD3, 0x00, 0x7C, 0x03, 0x30, 0x0D, 0xC0, 0x34, 0x00, 0xD3, 0x01,</div><div class='add'>+0x4C, 0x03, 0x70, 0x0D, 0xC0, 0x34, 0x02, 0xD7, 0x01, 0x7C, 0x03, 0xF0, 0x09,</div><div class='add'>+0xC0, 0x37, 0x00, 0xDF, 0x10, 0x74, 0x8A, 0x33, 0x21, 0xC4, 0x0B, 0x20, 0x04,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0xA0, 0xB4, 0x00, 0x11, 0x81, 0x44, 0x03,</div><div class='add'>+0x10, 0x41, 0x44, 0x47, 0x00, 0x11, 0x03, 0x74, 0x00, 0xB0, 0x11, 0x40, 0x04,</div><div class='add'>+0x00, 0x11, 0x20, 0x74, 0x00, 0x14, 0x01, 0x48, 0x04, 0x00, 0x10, 0x01, 0x44,</div><div class='add'>+0x44, 0xD0, 0x11, 0x40, 0x44, 0x08, 0x11, 0x01, 0x64, 0x00, 0xD0, 0x0D, 0xC0,</div><div class='add'>+0x37, 0x10, 0xE0, 0x13, 0x34, 0x04, 0x10, 0x30, 0x00, 0x4F, 0x00, 0x02, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x07, 0xA0, 0x22, 0x00, 0x41, 0x00, 0x25, 0x03, 0x50,</div><div class='add'>+0x1C, 0x40, 0xB3, 0x00, 0xC9, 0x02, 0x34, 0x43, 0x90, 0x0C, 0x41, 0x35, 0x80,</div><div class='add'>+0xC1, 0x00, 0x34, 0x03, 0x10, 0x0D, 0x40, 0x36, 0x00, 0xC1, 0x00, 0x34, 0x07,</div><div class='add'>+0x50, 0x8C, 0x40, 0x71, 0x80, 0xC9, 0x00, 0x74, 0x03, 0xD0, 0x01, 0x40, 0x36,</div><div class='add'>+0x08, 0xC4, 0x02, 0x34, 0x02, 0x54, 0x28, 0x02, 0x1F, 0x00, 0x0A, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x06, 0x80, 0x78, 0x40, 0x61, 0x09, 0xE4, 0x07, 0x10, 0x12,</div><div class='add'>+0x40, 0x4B, 0x00, 0x29, 0x09, 0xB4, 0x24, 0x90, 0x92, 0x40, 0x48, 0x00, 0x21,</div><div class='add'>+0x01, 0xF6, 0x24, 0x10, 0x12, 0x40, 0x4A, 0x00, 0x21, 0x01, 0xB4, 0x04, 0xD0,</div><div class='add'>+0x13, 0x40, 0x4D, 0x08, 0x29, 0x09, 0xA6, 0x04, 0xC0, 0x12, 0x40, 0x7B, 0x30,</div><div class='add'>+0xE9, 0x01, 0xB4, 0x66, 0x50, 0x12, 0x41, 0x1B, 0x00, 0x02, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x12, 0x10, 0x04, 0x40, 0x45, 0x00, 0x2C, 0x03, 0x70, 0x8C, 0xC0,</div><div class='add'>+0x33, 0x00, 0xCB, 0x00, 0x1C, 0x23, 0x30, 0x0C, 0xC0, 0x31, 0x90, 0xC3, 0x00,</div><div class='add'>+0x3C, 0x03, 0x30, 0x0C, 0xC0, 0x32, 0x00, 0xD3, 0x00, 0x34, 0x03, 0x70, 0x0C,</div><div class='add'>+0xC0, 0x31, 0x00, 0xCE, 0x80, 0x3E, 0x03, 0xF0, 0x00, 0xC0, 0x37, 0x00, 0xC7,</div><div class='add'>+0x08, 0x3C, 0x22, 0x70, 0x08, 0xC0, 0x4B, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x02, 0xB0, 0x1D, 0x00, 0x7F, 0x00, 0xDE, 0x03, 0xF0, 0x03, 0x60, 0x0F,</div><div class='add'>+0x00, 0x37, 0x00, 0xBC, 0x20, 0xF0, 0x02, 0xC0, 0x0F, 0x00, 0x3F, 0x00, 0xF4,</div><div class='add'>+0x00, 0xF0, 0x03, 0xC0, 0x0D, 0x00, 0x3F, 0x00, 0xCD, 0x00, 0xF0, 0x02, 0xC0,</div><div class='add'>+0x0A, 0x00, 0x37, 0x80, 0xEE, 0x04, 0xF0, 0x03, 0xC0, 0x3D, 0x82, 0xF7, 0x38,</div><div class='add'>+0xBC, 0x22, 0xB0, 0x89, 0xC0, 0x0B, 0x60, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x15, 0xA0, 0x37, 0x40, 0x13, 0x00, 0x6C, 0x03, 0xF0, 0x0D, 0xC0, 0x37, 0x40,</div><div class='add'>+0xD3, 0x01, 0x0D, 0x03, 0xB0, 0x1C, 0xD0, 0x34, 0x00, 0xDF, 0x00, 0x3C, 0x07,</div><div class='add'>+0xB4, 0x0D, 0xC0, 0x37, 0x00, 0xDF, 0x01, 0x0D, 0x07, 0x30, 0x0D, 0xC0, 0x37,</div><div class='add'>+0x00, 0xDF, 0x01, 0x6D, 0x03, 0x70, 0x0D, 0xC0, 0x37, 0x80, 0xDF, 0x04, 0x3C,</div><div class='add'>+0x00, 0x30, 0x19, 0xC0, 0x54, 0x20, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12,</div><div class='add'>+0x88, 0x39, 0x00, 0x31, 0x00, 0x85, 0x03, 0xD0, 0x02, 0x40, 0x0F, 0x00, 0x31,</div><div class='add'>+0x00, 0x84, 0x00, 0x30, 0x02, 0x40, 0x08, 0x00, 0x2D, 0x00, 0xB4, 0x00, 0x10,</div><div class='add'>+0x02, 0x40, 0x0B, 0x00, 0x3D, 0x00, 0xA4, 0x00, 0x70, 0x02, 0x40, 0x0B, 0x00,</div><div class='add'>+0x37, 0x00, 0x8C, 0x80, 0xD0, 0x0E, 0xC0, 0x39, 0x00, 0xED, 0x14, 0x9C, 0x00,</div><div class='add'>+0x14, 0x03, 0xC0, 0x4A, 0x60, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00,</div><div class='add'>+0x79, 0x00, 0x29, 0x01, 0x84, 0x07, 0xD0, 0x1E, 0x40, 0x7B, 0x00, 0xE1, 0x01,</div><div class='add'>+0x94, 0x07, 0x90, 0x1F, 0x40, 0x78, 0x00, 0xED, 0x01, 0xF4, 0x07, 0x10, 0x1E,</div><div class='add'>+0x40, 0x7B, 0x00, 0xED, 0x01, 0xA4, 0x07, 0x10, 0x1E, 0x40, 0x7B, 0x00, 0xED,</div><div class='add'>+0x01, 0x84, 0x87, 0x50, 0x1E, 0x40, 0x7B, 0x00, 0xED, 0x85, 0x94, 0x06, 0x55,</div><div class='add'>+0x1B, 0x40, 0x0D, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x28, 0x77,</div><div class='add'>+0x02, 0x91, 0x10, 0x04, 0x06, 0xD0, 0x00, 0x40, 0x07, 0x00, 0x01, 0x00, 0x14,</div><div class='add'>+0x00, 0x10, 0x00, 0x40, 0x00, 0x00, 0x0C, 0x00, 0x34, 0x00, 0x10, 0x00, 0x40,</div><div class='add'>+0x03, 0x00, 0x0D, 0x00, 0x24, 0x00, 0x50, 0x01, 0x40, 0x03, 0x10, 0x05, 0x40,</div><div class='add'>+0x04, 0x00, 0xD0, 0xEC, 0x40, 0x31, 0x00, 0xCD, 0x00, 0x14, 0x0B, 0x50, 0x8C,</div><div class='add'>+0x40, 0x4B, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x17, 0xA8, 0x9D, 0x00,</div><div class='add'>+0x7B, 0x87, 0x6C, 0x41, 0xF1, 0x05, 0xC0, 0x17, 0x00, 0x53, 0x00, 0x5C, 0x01,</div><div class='add'>+0xB4, 0x05, 0xC8, 0x14, 0x10, 0x5F, 0x00, 0x7C, 0x01, 0x30, 0x05, 0xC4, 0x17,</div><div class='add'>+0x00, 0x5F, 0x00, 0x44, 0x01, 0x30, 0x05, 0xC0, 0x17, 0x00, 0x5F, 0x00, 0x4C,</div><div class='add'>+0x01, 0x70, 0x37, 0xC0, 0x17, 0x00, 0x5F, 0x00, 0x9E, 0x21, 0x50, 0xB7, 0x40,</div><div class='add'>+0x5D, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x07, 0x04, 0x1F,</div><div class='add'>+0x00, 0x7C, 0x00, 0xF0, 0x03, 0xC0, 0x0F, 0x00, 0x3F, 0x40, 0xE8, 0x00, 0x70,</div><div class='add'>+0x03, 0xC0, 0x0F, 0x00, 0x3F, 0x20, 0xFC, 0x00, 0xF0, 0x03, 0xC0, 0x0F, 0x00,</div><div class='add'>+0x3F, 0x00, 0xDC, 0x00, 0x70, 0x03, 0xC0, 0x0F, 0x00, 0x37, 0x20, 0xDC, 0x00,</div><div class='add'>+0xF0, 0x01, 0xE0, 0x05, 0x00, 0x1F, 0x00, 0x5E, 0x80, 0x90, 0x01, 0x80, 0x4A,</div><div class='add'>+0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x08, 0x26, 0x02, 0x93, 0x00,</div><div class='add'>+0x5C, 0x02, 0xF0, 0x89, 0xC0, 0x27, 0x00, 0x93, 0x00, 0x7C, 0x16, 0x30, 0x09,</div><div class='add'>+0xC0, 0x27, 0x00, 0x9F, 0x00, 0x7C, 0x02, 0xF0, 0x09, 0xC0, 0x24, 0x00, 0x93,</div><div class='add'>+0x00, 0x5C, 0x02, 0xF0, 0x19, 0xC0, 0x27, 0x00, 0x9F, 0x02, 0x7C, 0x02, 0x30,</div><div class='add'>+0x09, 0xC0, 0x24, 0x10, 0x9F, 0x80, 0x7E, 0x26, 0x30, 0x89, 0xC2, 0x43, 0x00,</div><div class='add'>+0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x20, 0x66, 0x00, 0x91, 0x20, 0x44,</div><div class='add'>+0x02, 0x90, 0x19, 0x44, 0xA7, 0x00, 0x91, 0x02, 0x34, 0x02, 0x10, 0x09, 0x40,</div><div class='add'>+0x27, 0x00, 0x9D, 0x00, 0x74, 0x02, 0xD0, 0x08, 0x50, 0x20, 0x40, 0x91, 0x02,</div><div class='add'>+0x74, 0x02, 0xD0, 0x19, 0x40, 0x24, 0x00, 0x9F, 0x02, 0x34, 0x02, 0x10, 0x09,</div><div class='add'>+0x40, 0x24, 0x00, 0x9D, 0x02, 0x74, 0x06, 0x14, 0x39, 0x40, 0x07, 0x00, 0x08,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0xA0, 0x24, 0x40, 0x91, 0x00, 0x44, 0x02,</div><div class='add'>+0xD0, 0x09, 0x40, 0x2F, 0x00, 0xB1, 0x00, 0xF4, 0x02, 0x10, 0x0B, 0x40, 0x2F,</div><div class='add'>+0x00, 0xBD, 0x00, 0xF4, 0x82, 0xD0, 0x0B, 0x40, 0x2C, 0x00, 0xB1, 0x00, 0xF4,</div><div class='add'>+0x22, 0xD0, 0x4B, 0x40, 0x2E, 0x01, 0xBD, 0x00, 0xF4, 0x02, 0x10, 0x08, 0x40,</div><div class='add'>+0x24, 0x00, 0x9D, 0x0A, 0x54, 0x03, 0x10, 0x09, 0x40, 0x63, 0x00, 0x02, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x10, 0x20, 0x20, 0x41, 0x81, 0x04, 0x05, 0x02, 0x90,</div><div class='add'>+0x0A, 0x40, 0x6B, 0x00, 0xA1, 0x01, 0xF4, 0x02, 0x15, 0x0E, 0x42, 0x2B, 0x00,</div><div class='add'>+0xAD, 0x00, 0xB4, 0x82, 0xD0, 0x0B, 0x40, 0x2C, 0x00, 0xA1, 0x01, 0xB6, 0x02,</div><div class='add'>+0xD0, 0x0A, 0x40, 0x28, 0x00, 0xAD, 0x01, 0xF4, 0x02, 0x14, 0x48, 0x40, 0x20,</div><div class='add'>+0x02, 0x8D, 0x04, 0x34, 0x12, 0x10, 0x4C, 0x40, 0x43, 0x80, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x1D, 0xB0, 0x82, 0x02, 0x13, 0x0A, 0x5C, 0x28, 0xF0, 0x01,</div><div class='add'>+0xC0, 0x87, 0x42, 0x13, 0x0A, 0x7C, 0x00, 0x30, 0x01, 0xC0, 0x87, 0x02, 0x1F,</div><div class='add'>+0x0A, 0x7C, 0x28, 0xD0, 0xA1, 0xC0, 0x84, 0x02, 0x13, 0x0A, 0x7C, 0x00, 0xF0,</div><div class='add'>+0xA1, 0xC0, 0x07, 0x00, 0x1F, 0x0A, 0xFC, 0x28, 0x30, 0xA1, 0xD0, 0x84, 0x10,</div><div class='add'>+0x1F, 0x00, 0x7C, 0x28, 0x30, 0x01, 0xC0, 0x77, 0xC0, 0x0A, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x19, 0xB8, 0x3F, 0x02, 0xBF, 0x08, 0xFC, 0x02, 0xF0, 0x09, 0xC0,</div><div class='add'>+0x27, 0x00, 0x9F, 0x80, 0x7C, 0x02, 0xF0, 0x09, 0xC0, 0x27, 0x00, 0x9F, 0x00,</div><div class='add'>+0x7C, 0x02, 0xF0, 0x09, 0x80, 0x27, 0x00, 0x9F, 0x00, 0x7C, 0x02, 0xF0, 0x09,</div><div class='add'>+0xC0, 0x27, 0x00, 0x97, 0x00, 0x7C, 0x02, 0xF0, 0x8B, 0xC0, 0x27, 0x21, 0x9F,</div><div class='add'>+0x08, 0xFC, 0x23, 0xF8, 0x8B, 0xC0, 0x67, 0x60, 0x0E, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x19, 0xA0, 0x2F, 0x05, 0xA3, 0x8C, 0x5C, 0x02, 0x35, 0x0B, 0xC0, 0x2F,</div><div class='add'>+0x02, 0xBF, 0x00, 0xFC, 0x02, 0x70, 0x0B, 0xE0, 0x25, 0x00, 0x9F, 0x00, 0x4D,</div><div class='add'>+0x22, 0xF1, 0x09, 0xC0, 0x24, 0x00, 0xBF, 0x08, 0xFC, 0x02, 0xF0, 0x0B, 0xC0,</div><div class='add'>+0x2E, 0x00, 0xBF, 0x00, 0x7C, 0x02, 0x30, 0xC9, 0xE2, 0x24, 0x80, 0xBF, 0xA0,</div><div class='add'>+0xC8, 0x83, 0x30, 0x0B, 0xC0, 0x67, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x1C, 0x08, 0x03, 0x01, 0x11, 0x0C, 0x45, 0x40, 0x10, 0x01, 0x40, 0x03, 0x00,</div><div class='add'>+0x1D, 0x14, 0x74, 0x00, 0x10, 0x01, 0x40, 0x04, 0x04, 0x1D, 0x10, 0x44, 0x00,</div><div class='add'>+0xD0, 0x41, 0x41, 0x04, 0x01, 0x0D, 0x04, 0x74, 0x00, 0xD0, 0x01, 0x41, 0x04,</div><div class='add'>+0x10, 0x0D, 0x54, 0x74, 0x10, 0x50, 0xC1, 0x50, 0x04, 0x24, 0x1D, 0x00, 0x45,</div><div class='add'>+0x00, 0x10, 0x01, 0x40, 0x73, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10,</div><div class='add'>+0xA0, 0x23, 0x05, 0x81, 0x04, 0x04, 0x12, 0x10, 0x08, 0x40, 0x23, 0x00, 0x8D,</div><div class='add'>+0x04, 0x34, 0x02, 0x50, 0x08, 0x40, 0x20, 0x01, 0x8D, 0x00, 0x14, 0x02, 0xD0,</div><div class='add'>+0x49, 0x50, 0x20, 0x05, 0x8D, 0x04, 0x34, 0x03, 0xD0, 0x08, 0x40, 0x22, 0x00,</div><div class='add'>+0x8D, 0x04, 0x34, 0x52, 0x50, 0x58, 0x40, 0x21, 0x01, 0x8D, 0xA8, 0x04, 0x82,</div><div class='add'>+0x10, 0x08, 0x40, 0x43, 0x80, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0xA8,</div><div class='add'>+0x25, 0x40, 0x91, 0x02, 0x44, 0x22, 0x10, 0x09, 0x40, 0x37, 0x00, 0x9D, 0x00,</div><div class='add'>+0x74, 0x02, 0x50, 0x09, 0x40, 0x24, 0x00, 0x9D, 0x00, 0x56, 0x02, 0xC0, 0x09,</div><div class='add'>+0x40, 0x24, 0x00, 0xDD, 0x00, 0x74, 0x02, 0xD0, 0x09, 0x40, 0x24, 0x00, 0xDD,</div><div class='add'>+0x00, 0x34, 0x02, 0x50, 0x09, 0x40, 0x24, 0x00, 0x9D, 0x40, 0x06, 0x02, 0x14,</div><div class='add'>+0x49, 0x40, 0x63, 0x28, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0xA8, 0xA3,</div><div class='add'>+0x00, 0x93, 0x00, 0x4C, 0x02, 0x30, 0x09, 0xC0, 0x27, 0x00, 0x9F, 0x00, 0x7C,</div><div class='add'>+0x02, 0x50, 0x08, 0x50, 0x25, 0x08, 0x9F, 0x00, 0x5C, 0x02, 0xF2, 0x09, 0xC8,</div><div class='add'>+0x24, 0x00, 0x9F, 0x00, 0x7C, 0x02, 0xF0, 0x09, 0xC0, 0x26, 0x00, 0x9D, 0x00,</div><div class='add'>+0x7C, 0x02, 0x34, 0x09, 0x40, 0x25, 0x00, 0x9D, 0x80, 0x4C, 0x0A, 0x20, 0x09,</div><div class='add'>+0xC1, 0x17, 0xA0, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x80, 0x65, 0x02,</div><div class='add'>+0x9F, 0x00, 0x7C, 0x06, 0xF0, 0x09, 0xC0, 0x27, 0x00, 0x9F, 0x00, 0x7C, 0x02,</div><div class='add'>+0xB0, 0x09, 0xC0, 0x27, 0x00, 0x9F, 0x00, 0x6C, 0x02, 0xF0, 0x09, 0xC4, 0x27,</div><div class='add'>+0x00, 0x9F, 0x00, 0x7C, 0x02, 0xF0, 0x09, 0xC0, 0x27, 0x00, 0x9F, 0x10, 0x64,</div><div class='add'>+0x02, 0xB0, 0x08, 0xC0, 0x27, 0x00, 0x8F, 0x10, 0x7C, 0x0A, 0xF0, 0x09, 0xC2,</div><div class='add'>+0x53, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x08, 0x85, 0x20, 0x13,</div><div class='add'>+0x40, 0x5C, 0x00, 0xF0, 0x01, 0xC0, 0x07, 0x00, 0x13, 0x00, 0x4C, 0x90, 0xE2,</div><div class='add'>+0x01, 0xC0, 0x07, 0x20, 0x1F, 0x00, 0x6C, 0x00, 0xD0, 0x01, 0xC0, 0x07, 0x00,</div><div class='add'>+0x1F, 0x08, 0x4C, 0x00, 0xF0, 0x01, 0xC0, 0x07, 0x02, 0x13, 0x00, 0x4C, 0x00,</div><div class='add'>+0xF0, 0x01, 0xC0, 0x05, 0x08, 0x1D, 0x00, 0x7C, 0x00, 0x30, 0x01, 0xC0, 0x50,</div><div class='add'>+0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x80, 0x1C, 0x02, 0x51, 0x81,</div><div class='add'>+0x45, 0x01, 0x70, 0x15, 0x40, 0x5F, 0x01, 0x71, 0x00, 0x84, 0x0D, 0x10, 0x97,</div><div class='add'>+0x40, 0x17, 0x00, 0x5D, 0x00, 0x70, 0x01, 0x98, 0x04, 0x40, 0x17, 0x00, 0x7D,</div><div class='add'>+0x00, 0x44, 0x01, 0x70, 0x05, 0x40, 0x57, 0x00, 0x7B, 0x03, 0x44, 0x01, 0xC0,</div><div class='add'>+0x05, 0x40, 0x17, 0x10, 0x7C, 0x02, 0x74, 0x01, 0x10, 0x07, 0x00, 0x50, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0xA0, 0x72, 0x00, 0xD1, 0x00, 0x44,</div><div class='add'>+0x03, 0x50, 0x88, 0x40, 0x73, 0x40, 0xC5, 0x08, 0x04, 0x0B, 0x50, 0x2C, 0x40,</div><div class='add'>+0x33, 0x00, 0xDD, 0x00, 0x24, 0x03, 0xD2, 0x0C, 0x44, 0x33, 0x00, 0xCD, 0x10,</div><div class='add'>+0x25, 0x02, 0x50, 0x1D, 0x40, 0x63, 0x00, 0xC1, 0x0A, 0x25, 0x03, 0xD0, 0x0C,</div><div class='add'>+0x60, 0x33, 0x00, 0x4D, 0x0B, 0x34, 0x02, 0x50, 0x0C, 0x00, 0x50, 0x00, 0x0A,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x80, 0x38, 0x04, 0xB1, 0x02, 0x84, 0x33,</div><div class='add'>+0x50, 0x0E, 0x40, 0x5B, 0x00, 0x65, 0x01, 0x84, 0x43, 0x10, 0x0A, 0x41, 0x3B,</div><div class='add'>+0x01, 0xED, 0x04, 0xB4, 0x23, 0x90, 0x0E, 0x40, 0x3B, 0x10, 0xED, 0x01, 0xA4,</div><div class='add'>+0x03, 0x50, 0x2E, 0x40, 0x7B, 0x00, 0xE9, 0x21, 0xA6, 0x03, 0xD0, 0x4E, 0x40,</div><div class='add'>+0x3B, 0x01, 0x69, 0x00, 0xB4, 0x03, 0x58, 0x1C, 0x44, 0x10, 0x00, 0x02, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x15, 0x10, 0x78, 0x02, 0xE3, 0x01, 0x9C, 0x27, 0x71,</div><div class='add'>+0x1E, 0xC0, 0x7B, 0x20, 0xF7, 0x01, 0x8D, 0x06, 0x70, 0x1E, 0xC0, 0x7B, 0x00,</div><div class='add'>+0xED, 0x05, 0xAC, 0x87, 0xD0, 0x3E, 0xC0, 0x7B, 0x02, 0xEF, 0x01, 0xAC, 0x07,</div><div class='add'>+0x70, 0x1E, 0xC0, 0x7B, 0x00, 0xE3, 0x01, 0xAC, 0x97, 0xF0, 0x9E, 0xE0, 0x7B,</div><div class='add'>+0x20, 0x6D, 0x21, 0xBC, 0x07, 0x74, 0x1E, 0xC2, 0x50, 0x40, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x10, 0xB0, 0xBD, 0x40, 0x9F, 0x06, 0x7C, 0x03, 0x70, 0x0D,</div><div class='add'>+0xC0, 0x17, 0x00, 0x5B, 0x00, 0x3C, 0x02, 0x70, 0x09, 0xC0, 0x37, 0x04, 0xDF,</div><div class='add'>+0x02, 0x7C, 0x0B, 0xF0, 0x2D, 0xC0, 0x37, 0x00, 0xDF, 0x00, 0x5C, 0x03, 0x60,</div><div class='add'>+0x0D, 0xC0, 0x33, 0x00, 0x9F, 0x00, 0x5C, 0x0B, 0xF0, 0xAD, 0xC0, 0x37, 0x00,</div><div class='add'>+0x1F, 0x00, 0x3C, 0x5B, 0xB0, 0x09, 0xC2, 0x43, 0x60, 0x06, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x02, 0xA0, 0x4F, 0x40, 0xB3, 0x03, 0xCC, 0x13, 0xF0, 0x1E, 0xC0,</div><div class='add'>+0x6C, 0x00, 0xBF, 0x01, 0x8C, 0x06, 0x30, 0x1B, 0xC0, 0x7B, 0x04, 0xF3, 0x13,</div><div class='add'>+0xCC, 0x0F, 0x30, 0x3F, 0xC0, 0x7F, 0x04, 0xFF, 0x81, 0xFC, 0x87, 0xB0, 0x1F,</div><div class='add'>+0xC0, 0x7F, 0x00, 0xBF, 0x01, 0xFC, 0x4F, 0xF0, 0x1F, 0xC0, 0x7C, 0x04, 0x7F,</div><div class='add'>+0x09, 0xCC, 0x06, 0x30, 0x9D, 0xC2, 0x0B, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x15, 0x88, 0x09, 0x00, 0xA1, 0x00, 0x84, 0x03, 0xD0, 0x0E, 0x40, 0x08,</div><div class='add'>+0x04, 0x2D, 0x44, 0x84, 0x02, 0x10, 0x0A, 0x40, 0x3B, 0x00, 0xE1, 0x00, 0xC4,</div><div class='add'>+0x03, 0x10, 0x0E, 0x40, 0x3B, 0x00, 0xAD, 0x10, 0xB4, 0x03, 0x10, 0x0E, 0x40,</div><div class='add'>+0x3B, 0x00, 0xAD, 0x10, 0xBC, 0x23, 0xD0, 0x0E, 0xC0, 0x3A, 0x00, 0x6D, 0x08,</div><div class='add'>+0x84, 0x03, 0x11, 0x3E, 0x40, 0x57, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x08, 0x00, 0x11, 0x00, 0x81, 0x00, 0x84, 0x63, 0xD0, 0x0F, 0x40, 0x2A, 0x00,</div><div class='add'>+0xAD, 0x00, 0xC6, 0x02, 0x10, 0x0A, 0x40, 0xBF, 0x00, 0xF1, 0x02, 0x84, 0x23,</div><div class='add'>+0x10, 0x0E, 0x40, 0x3B, 0x00, 0x6D, 0x08, 0xF4, 0x03, 0x10, 0x0E, 0x40, 0x3B,</div><div class='add'>+0x02, 0x6D, 0x08, 0xB4, 0x03, 0xD0, 0x0C, 0x40, 0x38, 0x02, 0xCD, 0x48, 0x86,</div><div class='add'>+0x03, 0x50, 0x8E, 0x40, 0x23, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06,</div><div class='add'>+0x28, 0x13, 0x00, 0x81, 0x42, 0x06, 0x07, 0xD0, 0x4C, 0x40, 0x42, 0x01, 0x0D,</div><div class='add'>+0x0D, 0x04, 0x0E, 0x10, 0x68, 0x40, 0x73, 0x00, 0xC1, 0x01, 0x04, 0x43, 0x10,</div><div class='add'>+0x1C, 0x41, 0x33, 0x04, 0x0D, 0x05, 0x34, 0x43, 0x18, 0x38, 0x40, 0x73, 0x00,</div><div class='add'>+0x1D, 0x05, 0x16, 0x2B, 0xD1, 0x0C, 0x50, 0x30, 0x08, 0x0D, 0x00, 0x40, 0x0B,</div><div class='add'>+0x58, 0x28, 0x41, 0x1B, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xA8,</div><div class='add'>+0x21, 0x11, 0xD1, 0x02, 0xCC, 0x07, 0xF0, 0x2C, 0xC0, 0xF6, 0x00, 0xDF, 0x02,</div><div class='add'>+0x4D, 0x44, 0x34, 0x1D, 0xC0, 0x3F, 0x00, 0xE3, 0x04, 0xC4, 0x07, 0x30, 0x0F,</div><div class='add'>+0x40, 0x7B, 0x00, 0x1F, 0x03, 0x3C, 0x0B, 0x30, 0x9D, 0x40, 0xB7, 0x04, 0x5F,</div><div class='add'>+0x03, 0xB4, 0x07, 0xF0, 0x0F, 0x00, 0x3C, 0x00, 0xDF, 0x00, 0x4C, 0x22, 0x72,</div><div class='add'>+0x3D, 0xC4, 0x57, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x87,</div><div class='add'>+0x00, 0xDF, 0x00, 0x7C, 0x03, 0xF0, 0x1D, 0xC0, 0x25, 0x00, 0x9F, 0x00, 0x7C,</div><div class='add'>+0x02, 0xF0, 0x8D, 0xC0, 0x37, 0x22, 0xDF, 0x00, 0x7C, 0x23, 0xF0, 0x8D, 0xC0,</div><div class='add'>+0x37, 0x02, 0x1F, 0x02, 0x7C, 0x07, 0x70, 0x8D, 0xC0, 0x37, 0x01, 0x5F, 0x40,</div><div class='add'>+0x7C, 0x43, 0xF0, 0x1D, 0xC0, 0x37, 0x00, 0xDD, 0x02, 0x7C, 0x07, 0x96, 0x1D,</div><div class='add'>+0x40, 0x27, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x08, 0x2F, 0x80,</div><div class='add'>+0xF3, 0x10, 0xCC, 0x03, 0xF0, 0x1F, 0xC0, 0x9C, 0x20, 0x7F, 0x00, 0xCC, 0x51,</div><div class='add'>+0x70, 0x0F, 0xC0, 0x3F, 0x00, 0xF3, 0x20, 0xCC, 0x03, 0xF0, 0x0F, 0xC4, 0x3F,</div><div class='add'>+0x80, 0x33, 0x00, 0xFC, 0x03, 0x31, 0x0F, 0xC0, 0x3F, 0x00, 0x7F, 0x00, 0xCC,</div><div class='add'>+0x03, 0x30, 0x0E, 0xC0, 0x3C, 0x00, 0xFF, 0xA0, 0x4C, 0x83, 0x30, 0x17, 0xC2,</div><div class='add'>+0x07, 0x24, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA1, 0x20, 0x46, 0x01, 0xC1,</div><div class='add'>+0x09, 0x45, 0x03, 0xD0, 0x1D, 0x40, 0xC4, 0x10, 0x1D, 0x5B, 0x04, 0x1F, 0x50,</div><div class='add'>+0x75, 0x40, 0x33, 0x00, 0xD1, 0x00, 0x44, 0x03, 0xD0, 0x0D, 0x42, 0x37, 0x40,</div><div class='add'>+0x11, 0x02, 0x74, 0x03, 0x50, 0x0D, 0x48, 0x37, 0x20, 0x1D, 0x02, 0x6C, 0x03,</div><div class='add'>+0xB0, 0x0D, 0x40, 0x35, 0x10, 0x8D, 0x07, 0x54, 0x03, 0x14, 0x3D, 0x40, 0x87,</div><div class='add'>+0x02, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xA0, 0x44, 0x00, 0x99, 0x00,</div><div class='add'>+0x44, 0x03, 0xD0, 0x8D, 0x40, 0x34, 0x00, 0xCD, 0x00, 0x44, 0x03, 0x50, 0x1D,</div><div class='add'>+0x40, 0x37, 0x00, 0xD1, 0x00, 0x44, 0x03, 0xD0, 0x0D, 0x40, 0x37, 0x00, 0xD1,</div><div class='add'>+0x08, 0x74, 0x07, 0x90, 0x0D, 0x40, 0x37, 0x02, 0x9D, 0x00, 0x44, 0x03, 0x10,</div><div class='add'>+0x0D, 0x40, 0x34, 0x00, 0x1D, 0x01, 0x65, 0x02, 0x10, 0x8D, 0x40, 0x07, 0x00,</div><div class='add'>+0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x20, 0x04, 0x00, 0x91, 0x80, 0x04,</div><div class='add'>+0x03, 0xD0, 0x0C, 0x40, 0x20, 0x00, 0x8D, 0x00, 0x05, 0x03, 0x50, 0x0C, 0x40,</div><div class='add'>+0x37, 0x00, 0xD1, 0x00, 0x04, 0x03, 0xD0, 0x0C, 0x40, 0x37, 0x00, 0x81, 0x00,</div><div class='add'>+0x64, 0x03, 0x98, 0x0C, 0x40, 0x33, 0x00, 0x8D, 0x00, 0x65, 0x03, 0x90, 0x0C,</div><div class='add'>+0x40, 0x30, 0x00, 0x8D, 0x00, 0x14, 0x03, 0x10, 0x4C, 0x40, 0x43, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xB0, 0x0E, 0x00, 0xBB, 0x40, 0xCC, 0x03,</div><div class='add'>+0xF0, 0x0D, 0xC0, 0x14, 0x00, 0x4F, 0x00, 0x4C, 0x03, 0x70, 0x0D, 0xC0, 0x3F,</div><div class='add'>+0x00, 0xF3, 0x00, 0xCC, 0x03, 0xF0, 0x0F, 0x40, 0x3F, 0x00, 0x51, 0x00, 0x7C,</div><div class='add'>+0x03, 0xB0, 0x0D, 0xC0, 0x37, 0x10, 0x5F, 0x40, 0xCC, 0x03, 0x30, 0x0F, 0xC0,</div><div class='add'>+0x34, 0x00, 0x9F, 0x20, 0xCC, 0x03, 0x30, 0x05, 0xC2, 0x07, 0x40, 0x08, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x05, 0xB8, 0x0F, 0x00, 0xBF, 0x00, 0xFC, 0x03, 0xF0,</div><div class='add'>+0x0F, 0xC0, 0x0F, 0x00, 0x3F, 0x40, 0xFC, 0x03, 0xF0, 0x0F, 0xC0, 0x3F, 0x00,</div><div class='add'>+0xEF, 0x40, 0xFC, 0x03, 0xF0, 0x0F, 0xE0, 0x3F, 0x00, 0x3F, 0x80, 0xBC, 0x03,</div><div class='add'>+0x70, 0x0B, 0xC0, 0x3F, 0x10, 0x3F, 0x80, 0xDC, 0x03, 0xF0, 0x0F, 0xC0, 0x3F,</div><div class='add'>+0x20, 0xBF, 0x00, 0xFC, 0x03, 0xF0, 0x2F, 0xC0, 0x17, 0x60, 0x0E, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x03, 0xA0, 0x7B, 0x00, 0xFF, 0x01, 0xCC, 0x27, 0xE0, 0x1F,</div><div class='add'>+0xC0, 0x7C, 0x02, 0xFB, 0x01, 0xBE, 0x0F, 0x11, 0x3F, 0xC0, 0x7C, 0x82, 0xF3,</div><div class='add'>+0x01, 0xFC, 0x07, 0xF0, 0x1F, 0xC0, 0xFF, 0x00, 0xFB, 0x01, 0xDC, 0x07, 0x30,</div><div class='add'>+0x9F, 0xC0, 0x5E, 0x02, 0xB3, 0x84, 0xEC, 0x31, 0xF0, 0x1F, 0xE4, 0x7F, 0x00,</div><div class='add'>+0xFF, 0xC1, 0xEC, 0x24, 0xB0, 0x17, 0xC0, 0x0C, 0x00, 0x0E, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x01, 0x08, 0x07, 0x00, 0x1D, 0x10, 0x69, 0x00, 0xF1, 0x11, 0x40,</div><div class='add'>+0x00, 0x20, 0x11, 0x01, 0x74, 0x00, 0x10, 0x01, 0x40, 0x00, 0x01, 0x17, 0x01,</div><div class='add'>+0x74, 0x04, 0xD0, 0x11, 0x40, 0x04, 0x20, 0x1D, 0x01, 0x44, 0x84, 0xB0, 0x01,</div><div class='add'>+0x40, 0x15, 0x01, 0xD5, 0x09, 0x44, 0xB3, 0xD0, 0x1F, 0x42, 0x7F, 0x00, 0xFD,</div><div class='add'>+0x01, 0x04, 0x10, 0x10, 0x19, 0x40, 0x05, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x11, 0xA0, 0x33, 0x00, 0xDD, 0x84, 0x00, 0x13, 0xD0, 0x0D, 0x40, 0x30,</div><div class='add'>+0x21, 0xC9, 0x00, 0x30, 0x13, 0x10, 0x4D, 0x40, 0x34, 0x00, 0xC1, 0x00, 0x34,</div><div class='add'>+0x83, 0xC0, 0x0D, 0x00, 0x30, 0x01, 0xCD, 0x60, 0x40, 0x03, 0x92, 0x4C, 0x40,</div><div class='add'>+0x20, 0x00, 0x85, 0x00, 0x14, 0x01, 0x50, 0x0C, 0x40, 0x33, 0x80, 0xC5, 0x00,</div><div class='add'>+0x44, 0x10, 0x91, 0x0D, 0x64, 0x44, 0x80, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x03, 0xA8, 0x05, 0x00, 0x1D, 0x00, 0x46, 0x80, 0x50, 0x01, 0x40, 0x04, 0x00,</div><div class='add'>+0x11, 0x00, 0x74, 0x00, 0x10, 0x01, 0x40, 0x04, 0x00, 0x15, 0x00, 0x74, 0x00,</div><div class='add'>+0xD0, 0x01, 0x50, 0x04, 0x08, 0x1D, 0x00, 0x54, 0x00, 0x98, 0x01, 0x40, 0x21,</div><div class='add'>+0x00, 0x94, 0x00, 0x64, 0x11, 0xD0, 0x0D, 0x60, 0x37, 0x00, 0xDD, 0x00, 0x44,</div><div class='add'>+0x06, 0x10, 0x09, 0x40, 0x0D, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x88, 0x37, 0x00, 0xCF, 0x00, 0x44, 0x03, 0xD1, 0x0C, 0xD0, 0x34, 0x00, 0xDB,</div><div class='add'>+0x00, 0x74, 0x03, 0x34, 0x0C, 0xD0, 0x30, 0x00, 0xD3, 0x80, 0x7C, 0x03, 0xF1,</div><div class='add'>+0x0D, 0x40, 0x36, 0x08, 0xDB, 0x00, 0x1C, 0x03, 0xB0, 0x0D, 0xC2, 0xA6, 0x00,</div><div class='add'>+0x87, 0x01, 0x7D, 0x01, 0xF0, 0x0D, 0x40, 0x37, 0x00, 0xCF, 0x00, 0x2D, 0x04,</div><div class='add'>+0xB0, 0xD4, 0x40, 0x00, 0x20, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x80,</div><div class='add'>+0x0D, 0x00, 0x3F, 0x00, 0xFC, 0x00, 0xF0, 0x03, 0xC0, 0x0F, 0x00, 0x3F, 0x00,</div><div class='add'>+0xFC, 0x00, 0xF0, 0x03, 0xC0, 0x0F, 0x00, 0x3F, 0x80, 0xF4, 0x00, 0xF0, 0x03,</div><div class='add'>+0xC0, 0x0D, 0x00, 0x3D, 0x00, 0xED, 0x40, 0xF0, 0x03, 0xC0, 0x3F, 0x08, 0xFF,</div><div class='add'>+0x05, 0xCC, 0x03, 0xF0, 0x0F, 0x40, 0x3E, 0x20, 0xFF, 0x00, 0xFE, 0x00, 0xF0,</div><div class='add'>+0x1B, 0xD0, 0x1E, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x08, 0x35,</div><div class='add'>+0x04, 0xD3, 0x01, 0x7C, 0x03, 0xF0, 0x0D, 0xC8, 0x34, 0x10, 0xD7, 0x08, 0x6E,</div><div class='add'>+0xA3, 0x30, 0x0D, 0xC0, 0x37, 0x00, 0xDB, 0x84, 0x7C, 0x83, 0xF0, 0x0D, 0xC0,</div><div class='add'>+0x37, 0x00, 0xDF, 0x08, 0x6C, 0x03, 0xF0, 0x0D, 0xC0, 0xA6, 0x20, 0x97, 0x24,</div><div class='add'>+0x6E, 0x09, 0xF0, 0x0D, 0xC0, 0x37, 0x28, 0xDF, 0x20, 0x7C, 0x02, 0x30, 0x2D,</div><div class='add'>+0xC0, 0x0B, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0xA0, 0xC4, 0x01,</div><div class='add'>+0x11, 0x01, 0x74, 0x00, 0xD0, 0x01, 0xD0, 0x06, 0x00, 0x11, 0x01, 0x44, 0x04,</div><div class='add'>+0x14, 0x51, 0x40, 0x07, 0x30, 0x11, 0x10, 0x5C, 0x00, 0xD9, 0x00, 0xC1, 0x45,</div><div class='add'>+0x24, 0x0D, 0xAA, 0x64, 0x00, 0x70, 0x41, 0x40, 0x64, 0x00, 0x9B, 0x04, 0x74,</div><div class='add'>+0x01, 0xD0, 0x0D, 0x48, 0x37, 0x00, 0xDD, 0x04, 0x5C, 0x6E, 0x10, 0x09, 0xC0,</div><div class='add'>+0x4D, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xA0, 0x32, 0x80, 0xC1,</div><div class='add'>+0x00, 0x34, 0x03, 0xD0, 0x8C, 0x40, 0x34, 0x00, 0xC5, 0x01, 0x44, 0x07, 0x92,</div><div class='add'>+0x1C, 0x00, 0x33, 0x00, 0xC1, 0x02, 0x34, 0x03, 0xD0, 0x1C, 0x60, 0x73, 0x20,</div><div class='add'>+0xCD, 0x23, 0x34, 0x27, 0xD0, 0x1D, 0x40, 0xF0, 0x04, 0x81, 0x03, 0x34, 0x01,</div><div class='add'>+0xD0, 0x0C, 0x40, 0x73, 0x00, 0xCD, 0x05, 0x34, 0x0D, 0x10, 0x08, 0x40, 0x1F,</div><div class='add'>+0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x80, 0x4C, 0x00, 0x21, 0x01,</div><div class='add'>+0xB4, 0x04, 0xD0, 0x13, 0x40, 0x48, 0x00, 0x21, 0x01, 0xC4, 0x04, 0x98, 0x52,</div><div class='add'>+0x44, 0x4B, 0x00, 0x21, 0x05, 0x94, 0x04, 0xD0, 0x12, 0x68, 0x4B, 0x00, 0x2D,</div><div class='add'>+0x01, 0xB0, 0x04, 0x50, 0x12, 0x40, 0x79, 0x00, 0xE9, 0x01, 0xB4, 0x07, 0xD0,</div><div class='add'>+0x1E, 0x40, 0x7B, 0x00, 0xED, 0xA1, 0x94, 0x27, 0x10, 0x9A, 0x40, 0x19, 0x00,</div><div class='add'>+0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x10, 0x30, 0x00, 0xC3, 0x00, 0x3C,</div><div class='add'>+0x03, 0xF0, 0x8C, 0x40, 0x30, 0x20, 0xC7, 0x00, 0x05, 0x23, 0xB0, 0x5C, 0xC4,</div><div class='add'>+0x33, 0x00, 0xC1, 0x05, 0x3C, 0x03, 0xD0, 0x0C, 0xC0, 0x33, 0x20, 0xCF, 0x88,</div><div class='add'>+0x3C, 0x03, 0xF2, 0x0D, 0x50, 0xA0, 0x04, 0xC3, 0x00, 0x34, 0x03, 0xF0, 0x8C,</div><div class='add'>+0xC0, 0x33, 0x06, 0xCF, 0x00, 0x3C, 0x01, 0x30, 0x88, 0xC4, 0x4B, 0x40, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xB8, 0x0D, 0x00, 0x3F, 0x80, 0xFC, 0x00,</div><div class='add'>+0xF0, 0x82, 0xC0, 0x0F, 0x00, 0x2E, 0x08, 0xD4, 0x00, 0x71, 0x03, 0xC0, 0x07,</div><div class='add'>+0x02, 0x17, 0x08, 0xFC, 0x00, 0xF0, 0x01, 0xC0, 0x0D, 0x00, 0x1D, 0x80, 0x64,</div><div class='add'>+0x00, 0xF0, 0x11, 0xC0, 0x20, 0x02, 0xD8, 0x00, 0x7C, 0x03, 0xF0, 0x1F, 0xC0,</div><div class='add'>+0x7F, 0x08, 0xFF, 0x01, 0xDC, 0x03, 0xF0, 0x8B, 0xC0, 0x0B, 0x60, 0x06, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x15, 0xA0, 0x37, 0x00, 0xDF, 0x00, 0x7C, 0x03, 0xF0,</div><div class='add'>+0x0D, 0xC0, 0x35, 0x10, 0xCE, 0x01, 0x6C, 0x03, 0xD0, 0x0C, 0xC0, 0x34, 0x20,</div><div class='add'>+0xDF, 0x00, 0x7C, 0x03, 0x30, 0x0D, 0xC0, 0x73, 0x00, 0xD7, 0x00, 0x7C, 0x03,</div><div class='add'>+0xF0, 0x0D, 0xC0, 0x27, 0x00, 0x9F, 0x00, 0x7C, 0x01, 0x70, 0x8D, 0xC0, 0x37,</div><div class='add'>+0x02, 0xDF, 0x00, 0x7C, 0x07, 0x30, 0x1D, 0xC0, 0x54, 0x00, 0x0E, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x12, 0x88, 0x09, 0x00, 0x2D, 0x00, 0xB4, 0x00, 0xC0, 0x02,</div><div class='add'>+0x40, 0x0B, 0x00, 0x2D, 0x00, 0x84, 0x00, 0xD0, 0x02, 0x40, 0x09, 0x00, 0x2D,</div><div class='add'>+0x00, 0xB4, 0x00, 0x50, 0x02, 0x40, 0x0B, 0x00, 0x21, 0x00, 0xA4, 0x00, 0xD0,</div><div class='add'>+0x02, 0x40, 0x3B, 0x00, 0xED, 0x02, 0x9C, 0x1B, 0xF0, 0x4E, 0x48, 0x3B, 0x01,</div><div class='add'>+0xE9, 0x02, 0xB4, 0x03, 0x10, 0x0A, 0xC0, 0x4B, 0x20, 0x06, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x03, 0x02, 0x79, 0x08, 0xED, 0x01, 0xB4, 0x07, 0xC0, 0x1E, 0x40,</div><div class='add'>+0x7B, 0x00, 0xFD, 0x01, 0x84, 0x07, 0xD0, 0x1F, 0x40, 0x78, 0x10, 0xE4, 0x01,</div><div class='add'>+0xB4, 0x07, 0x10, 0x1E, 0x08, 0x7F, 0x00, 0xE5, 0x01, 0xB4, 0x07, 0x40, 0x1E,</div><div class='add'>+0x60, 0x6B, 0x04, 0xE5, 0x05, 0x94, 0x17, 0xD0, 0x1E, 0x40, 0x7B, 0x00, 0xED,</div><div class='add'>+0x05, 0xB4, 0x07, 0x10, 0x1E, 0x44, 0x0E, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x12, 0x28, 0x03, 0x80, 0x0D, 0x00, 0x34, 0x00, 0xD0, 0x00, 0x44, 0x03,</div><div class='add'>+0x00, 0x0D, 0x00, 0x04, 0x00, 0xD8, 0x01, 0x42, 0x05, 0x00, 0x08, 0x00, 0x34,</div><div class='add'>+0x80, 0x52, 0x00, 0x40, 0x03, 0x00, 0x01, 0x00, 0x34, 0x00, 0x90, 0x00, 0x40,</div><div class='add'>+0xE3, 0x00, 0xCD, 0x00, 0x04, 0x06, 0xD0, 0x0C, 0x40, 0x33, 0x00, 0xC9, 0x00,</div><div class='add'>+0x34, 0x0E, 0x1C, 0x08, 0x40, 0x4B, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x17, 0xA8, 0x15, 0x00, 0x5F, 0x00, 0x7C, 0x01, 0xF0, 0x05, 0xC0, 0x17, 0x00,</div><div class='add'>+0x5F, 0x00, 0x45, 0x01, 0xF0, 0x05, 0xC0, 0x14, 0x00, 0x57, 0x00, 0x7C, 0x01,</div><div class='add'>+0x30, 0x05, 0xC0, 0x17, 0x00, 0x57, 0x00, 0x7C, 0x01, 0xF0, 0x05, 0xC0, 0x1F,</div><div class='add'>+0x00, 0x4F, 0x00, 0xDC, 0x81, 0x78, 0x05, 0xC4, 0x17, 0x00, 0x5F, 0x80, 0xFC,</div><div class='add'>+0x25, 0x30, 0x47, 0x40, 0x5E, 0x20, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12,</div><div class='add'>+0x00, 0x8F, 0x20, 0x3F, 0x00, 0xFC, 0x00, 0xF2, 0x03, 0xC0, 0x0F, 0x08, 0x3F,</div><div class='add'>+0x00, 0xDC, 0x00, 0xF1, 0x03, 0xC0, 0x0F, 0x20, 0x3D, 0x00, 0xFC, 0x00, 0xF0,</div><div class='add'>+0x03, 0xC8, 0x0F, 0x00, 0x3F, 0x00, 0xEC, 0x00, 0xF0, 0x03, 0x40, 0x87, 0x01,</div><div class='add'>+0x1F, 0x00, 0x5C, 0x20, 0x70, 0x00, 0xC0, 0x87, 0x00, 0x1F, 0x00, 0x7C, 0x20,</div><div class='add'>+0xF0, 0x01, 0xE0, 0x49, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x08,</div><div class='add'>+0x67, 0x00, 0x9F, 0x08, 0x7C, 0x02, 0xF8, 0x29, 0xC0, 0x27, 0x00, 0x93, 0x04,</div><div class='add'>+0x7C, 0x02, 0xF0, 0x19, 0xC0, 0x24, 0x20, 0x97, 0x09, 0x4C, 0x02, 0xB0, 0x09,</div><div class='add'>+0xC0, 0x27, 0x01, 0x9F, 0x00, 0x7C, 0x22, 0xF0, 0x59, 0xC0, 0x24, 0x01, 0x9F,</div><div class='add'>+0x00, 0x5C, 0x02, 0xF0, 0x09, 0xC0, 0x24, 0x00, 0x9F, 0x00, 0x7C, 0x16, 0xF0,</div><div class='add'>+0x09, 0xC8, 0x43, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x20, 0xA6,</div><div class='add'>+0x06, 0x9D, 0x20, 0x74, 0x06, 0xD8, 0x39, 0x44, 0x23, 0x20, 0x91, 0x01, 0x74,</div><div class='add'>+0x06, 0xD0, 0x09, 0x40, 0x24, 0x08, 0x83, 0x01, 0x04, 0x02, 0x10, 0x09, 0x44,</div><div class='add'>+0x27, 0x00, 0x9D, 0x10, 0x74, 0x06, 0xD0, 0x18, 0x50, 0xE4, 0x00, 0xBD, 0x00,</div><div class='add'>+0xC4, 0x02, 0xD0, 0x0B, 0x40, 0x2C, 0x01, 0xBD, 0x40, 0x74, 0x0E, 0xD2, 0x09,</div><div class='add'>+0x42, 0x07, 0x80, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0xA0, 0x24, 0x08,</div><div class='add'>+0xBD, 0x00, 0xF4, 0x06, 0xD2, 0x0B, 0x40, 0x2F, 0x00, 0xB1, 0x40, 0xF4, 0x12,</div><div class='add'>+0x50, 0x8B, 0x40, 0x2C, 0x20, 0xBD, 0x00, 0xE4, 0x02, 0x90, 0x0B, 0x60, 0x2E,</div><div class='add'>+0x00, 0xB5, 0x01, 0xF4, 0x0A, 0xD0, 0x0B, 0x40, 0x25, 0x00, 0x9D, 0x00, 0x64,</div><div class='add'>+0x13, 0xD2, 0x09, 0x40, 0x24, 0x80, 0x9D, 0x00, 0x74, 0x43, 0xD0, 0x09, 0x60,</div><div class='add'>+0x63, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x22, 0x28, 0x00, 0xAD,</div><div class='add'>+0x02, 0xB4, 0x0A, 0xD0, 0x0E, 0x40, 0x2F, 0x00, 0xA1, 0x00, 0xB6, 0x0A, 0xD0,</div><div class='add'>+0x2A, 0x50, 0x28, 0x02, 0xBD, 0x00, 0xE5, 0x0A, 0x10, 0x0A, 0x60, 0xAB, 0x00,</div><div class='add'>+0xAD, 0x00, 0xB6, 0x02, 0xD0, 0x2B, 0x62, 0xA1, 0x00, 0x8D, 0x20, 0x04, 0x8A,</div><div class='add'>+0xD2, 0x28, 0x40, 0x20, 0x88, 0x8D, 0x80, 0x34, 0x22, 0xD0, 0x28, 0x40, 0x43,</div><div class='add'>+0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xB0, 0x06, 0x00, 0x1F, 0x00,</div><div class='add'>+0x7C, 0x00, 0xD0, 0x01, 0xC0, 0x87, 0x42, 0x13, 0x00, 0x7E, 0x00, 0x70, 0x01,</div><div class='add'>+0xC0, 0x84, 0x00, 0x57, 0x00, 0x2C, 0x00, 0xB0, 0x01, 0xC0, 0x06, 0x00, 0x1F,</div><div class='add'>+0x00, 0x7C, 0x00, 0xF0, 0x03, 0xC2, 0x15, 0x00, 0x1F, 0x01, 0x4D, 0x04, 0xE0,</div><div class='add'>+0x11, 0xD0, 0x44, 0x00, 0x1D, 0x01, 0x3C, 0x08, 0xF0, 0x00, 0xE2, 0x77, 0xC0,</div><div class='add'>+0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x19, 0xB8, 0x27, 0x0D, 0x9F, 0x01, 0x7C,</div><div class='add'>+0x86, 0xF2, 0x09, 0xC0, 0x27, 0x10, 0x9D, 0x00, 0x7C, 0x06, 0xF0, 0x19, 0x44,</div><div class='add'>+0x27, 0x01, 0x93, 0x00, 0x5C, 0x06, 0xE0, 0x09, 0x40, 0x67, 0x00, 0x9F, 0x00,</div><div class='add'>+0x7C, 0x02, 0xF0, 0x19, 0xC8, 0x6E, 0x00, 0xBF, 0x02, 0xF4, 0x0E, 0xF0, 0x39,</div><div class='add'>+0xC0, 0xA7, 0x08, 0x9F, 0x02, 0xFC, 0x12, 0xF0, 0x1F, 0xC0, 0x67, 0x60, 0x0E,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0xA0, 0x2F, 0x00, 0xB3, 0x02, 0xFC, 0x02,</div><div class='add'>+0xD1, 0x0A, 0xC0, 0x27, 0x10, 0xBE, 0x00, 0xD8, 0x02, 0xF0, 0x0B, 0xC0, 0x27,</div><div class='add'>+0x02, 0xBF, 0x00, 0x74, 0x02, 0xF0, 0x0B, 0xC0, 0xAF, 0x00, 0xB7, 0x00, 0xDC,</div><div class='add'>+0x02, 0xC0, 0x2B, 0xC0, 0x2F, 0x00, 0xB3, 0x01, 0xBC, 0x46, 0x30, 0xD9, 0xC0,</div><div class='add'>+0x6C, 0x01, 0xB3, 0x11, 0xC8, 0x02, 0xF0, 0x09, 0xC0, 0x67, 0x00, 0x0E, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x1C, 0x08, 0x07, 0x05, 0x1B, 0x05, 0x74, 0x14, 0xD0,</div><div class='add'>+0x01, 0x40, 0x07, 0x04, 0x1D, 0x00, 0x74, 0x54, 0xD0, 0x11, 0x40, 0x07, 0x01,</div><div class='add'>+0x1D, 0x00, 0x74, 0x54, 0xD0, 0x01, 0xC0, 0x44, 0x00, 0x11, 0x00, 0x44, 0x00,</div><div class='add'>+0x90, 0x51, 0x40, 0x47, 0x05, 0x11, 0x20, 0x74, 0x14, 0x50, 0x31, 0x40, 0x85,</div><div class='add'>+0x00, 0x11, 0x02, 0x54, 0x00, 0xD0, 0x50, 0x41, 0x73, 0x20, 0x0C, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x10, 0xA0, 0x23, 0x01, 0x81, 0x00, 0x34, 0x42, 0xD0, 0x08,</div><div class='add'>+0x40, 0x23, 0x00, 0xCD, 0x00, 0x14, 0x02, 0xD0, 0x48, 0x41, 0x23, 0x21, 0x8C,</div><div class='add'>+0x00, 0x34, 0x02, 0xD0, 0x08, 0x40, 0x27, 0x20, 0x94, 0x00, 0x14, 0x02, 0x90,</div><div class='add'>+0x08, 0x40, 0x27, 0x00, 0x81, 0x02, 0x34, 0x52, 0x50, 0xC8, 0x40, 0x20, 0x02,</div><div class='add'>+0x85, 0x00, 0x04, 0x02, 0xD0, 0x08, 0x40, 0x43, 0x80, 0x0E, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x18, 0xA8, 0x25, 0x00, 0x99, 0x20, 0x74, 0x02, 0xD0, 0x09, 0x40,</div><div class='add'>+0x27, 0x10, 0x9D, 0x00, 0x74, 0x02, 0xD0, 0x09, 0x40, 0x27, 0x00, 0x9D, 0x80,</div><div class='add'>+0x74, 0x02, 0xD0, 0x09, 0x40, 0x24, 0x00, 0x91, 0x00, 0x44, 0x02, 0x90, 0x09,</div><div class='add'>+0x00, 0xA7, 0x01, 0x91, 0x00, 0x70, 0x42, 0x50, 0x08, 0x40, 0x37, 0x00, 0x95,</div><div class='add'>+0x00, 0x56, 0x02, 0xD0, 0x09, 0x40, 0x63, 0x28, 0x06, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x05, 0x08, 0x25, 0x00, 0xB3, 0x00, 0xFC, 0x02, 0xF0, 0x09, 0xC0, 0x27,</div><div class='add'>+0x00, 0x9F, 0x00, 0xDC, 0x02, 0xF0, 0x0B, 0xC0, 0x27, 0x00, 0x9D, 0x00, 0xFC,</div><div class='add'>+0x02, 0xF0, 0x09, 0xC0, 0x2B, 0x00, 0x97, 0x00, 0x5C, 0x02, 0x90, 0x0B, 0xC0,</div><div class='add'>+0x2F, 0xC0, 0x93, 0x01, 0xFC, 0x2A, 0x71, 0x0B, 0xC8, 0x20, 0x40, 0x97, 0x40,</div><div class='add'>+0x4C, 0x9E, 0xF0, 0x2B, 0x40, 0x17, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x14, 0x00, 0x25, 0x04, 0x9F, 0x00, 0x7C, 0x02, 0xF0, 0x09, 0xE1, 0x27, 0x00,</div><div class='add'>+0x9F, 0x00, 0x7C, 0x02, 0xF0, 0x09, 0xC4, 0x27, 0x00, 0x9F, 0x00, 0x7C, 0x02,</div><div class='add'>+0xF0, 0x09, 0xC4, 0x25, 0x00, 0x9F, 0x20, 0x7C, 0x02, 0xB0, 0x09, 0xC2, 0x67,</div><div class='add'>+0x00, 0x9F, 0x89, 0x6C, 0x02, 0xF0, 0x09, 0xC0, 0x25, 0x00, 0x9B, 0x80, 0x7C,</div><div class='add'>+0x12, 0xF0, 0x09, 0xC0, 0x53, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14,</div><div class='add'>+0x08, 0x05, 0x00, 0x1F, 0x00, 0x7C, 0x00, 0x3A, 0x01, 0xD0, 0x06, 0x00, 0x13,</div><div class='add'>+0x00, 0x6C, 0x00, 0xF2, 0x01, 0xC0, 0x04, 0x80, 0x13, 0x28, 0x7C, 0x00, 0xB2,</div><div class='add'>+0x01, 0xD0, 0x05, 0x40, 0x13, 0x00, 0x7C, 0x40, 0xF0, 0x01, 0xC2, 0x87, 0x00,</div><div class='add'>+0x1F, 0x00, 0x0C, 0x08, 0x31, 0x01, 0xD0, 0x04, 0x00, 0x03, 0x00, 0x4D, 0x88,</div><div class='add'>+0x30, 0x21, 0xC0, 0x50, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x20,</div><div class='add'>+0xDC, 0x00, 0x5D, 0x40, 0x74, 0x11, 0x15, 0x57, 0xC0, 0x14, 0x10, 0x55, 0x40,</div><div class='add'>+0x74, 0x01, 0xD0, 0x05, 0x40, 0x14, 0x00, 0x7B, 0x00, 0x74, 0x01, 0x10, 0x05,</div><div class='add'>+0x40, 0x54, 0x00, 0x6B, 0x02, 0xF4, 0x0D, 0x34, 0x05, 0x40, 0x9B, 0x00, 0x7D,</div><div class='add'>+0x02, 0x6E, 0x01, 0xB0, 0x05, 0x40, 0x9C, 0x00, 0x7B, 0x1B, 0xC4, 0x05, 0x10,</div><div class='add'>+0x05, 0xC8, 0x52, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0xA0, 0xF6,</div><div class='add'>+0x82, 0xCD, 0x09, 0x34, 0x03, 0x10, 0x38, 0x40, 0x30, 0x00, 0x81, 0x00, 0x34,</div><div class='add'>+0x03, 0xC0, 0x0C, 0x40, 0x30, 0x00, 0x45, 0x05, 0x34, 0x03, 0x90, 0x08, 0x40,</div><div class='add'>+0x32, 0x02, 0xC1, 0x04, 0x34, 0x01, 0x18, 0x0C, 0x40, 0xE3, 0x03, 0x8D, 0x10,</div><div class='add'>+0x24, 0x03, 0x10, 0x0C, 0x44, 0xA2, 0x01, 0x89, 0x03, 0x24, 0x1B, 0x1D, 0x0C,</div><div class='add'>+0x40, 0x50, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x80, 0x18, 0x80,</div><div class='add'>+0xAD, 0x44, 0xF4, 0x17, 0x10, 0x1A, 0x44, 0x7C, 0x00, 0xE5, 0x00, 0xB4, 0x12,</div><div class='add'>+0xD2, 0x5A, 0x40, 0x7C, 0x01, 0xE9, 0x00, 0xF6, 0x17, 0x10, 0x1A, 0x40, 0x2A,</div><div class='add'>+0x00, 0xE1, 0x00, 0xF4, 0x0F, 0x90, 0x0E, 0x40, 0x3B, 0x01, 0x8D, 0x11, 0xF4,</div><div class='add'>+0x0B, 0x90, 0x8E, 0x40, 0x28, 0x04, 0xA9, 0x20, 0xA4, 0x0F, 0x10, 0x5E, 0x40,</div><div class='add'>+0x12, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x10, 0x78, 0x00, 0xEF,</div><div class='add'>+0x21, 0xBC, 0x1E, 0x10, 0x1E, 0xC0, 0x78, 0x02, 0xE3, 0x01, 0xBC, 0x07, 0xD2,</div><div class='add'>+0x5F, 0xC0, 0x78, 0x04, 0xE5, 0x01, 0xBC, 0x97, 0xB0, 0x1A, 0x60, 0x7E, 0x00,</div><div class='add'>+0xE1, 0x01, 0xBC, 0x07, 0x19, 0x3E, 0xC0, 0x7B, 0x11, 0xAF, 0x01, 0xA6, 0x0E,</div><div class='add'>+0x30, 0x1C, 0x88, 0x6A, 0x00, 0xAB, 0x01, 0xEC, 0x05, 0x30, 0x3E, 0xC0, 0x50,</div><div class='add'>+0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xB8, 0x15, 0x08, 0x9F, 0x00,</div><div class='add'>+0x3C, 0x02, 0xF0, 0x0D, 0xC8, 0xB1, 0x01, 0xDF, 0x00, 0x7C, 0x22, 0xF0, 0x89,</div><div class='add'>+0xDA, 0x33, 0x02, 0xDC, 0x00, 0x3C, 0x23, 0xF0, 0x08, 0x80, 0x25, 0x00, 0x9F,</div><div class='add'>+0x00, 0x3C, 0x03, 0x70, 0x09, 0x80, 0x17, 0x10, 0x9D, 0x00, 0x6C, 0x02, 0xC0,</div><div class='add'>+0x0D, 0xC0, 0x21, 0x00, 0x8F, 0x00, 0x5C, 0x01, 0xF0, 0x0D, 0xC8, 0x43, 0x60,</div><div class='add'>+0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xA0, 0x7B, 0x00, 0xF3, 0x11, 0xCC,</div><div class='add'>+0x07, 0xB8, 0x0B, 0xC0, 0x7F, 0x04, 0xFF, 0x01, 0xED, 0x07, 0x30, 0x1F, 0xC0,</div><div class='add'>+0x7F, 0x20, 0xEF, 0x09, 0x4C, 0x27, 0x30, 0x1B, 0xC0, 0x7D, 0x04, 0xFB, 0x01,</div><div class='add'>+0x9C, 0x07, 0xB0, 0x9E, 0xC2, 0x5D, 0x04, 0xBF, 0x01, 0xFC, 0x07, 0xF0, 0x1F,</div><div class='add'>+0xC8, 0x6C, 0x00, 0xF3, 0x01, 0xFC, 0x07, 0xF0, 0x1E, 0xC0, 0x08, 0x00, 0x0E,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x88, 0x19, 0x06, 0xF1, 0x40, 0xC4, 0x13,</div><div class='add'>+0x39, 0x4A, 0x40, 0x3B, 0x01, 0xED, 0x00, 0xC4, 0x02, 0x10, 0x08, 0x48, 0x3B,</div><div class='add'>+0x01, 0xC7, 0x02, 0x84, 0x77, 0x10, 0x0A, 0x40, 0x3C, 0x00, 0x61, 0x00, 0x84,</div><div class='add'>+0x03, 0x40, 0x1E, 0x40, 0x39, 0x00, 0xAD, 0x84, 0xA4, 0x13, 0xF0, 0x0E, 0x40,</div><div class='add'>+0x28, 0x00, 0xE5, 0x08, 0xB4, 0x03, 0xD0, 0x0E, 0x40, 0x54, 0x20, 0x06, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xBC, 0x00, 0xA1, 0x08, 0x84, 0x02, 0x01,</div><div class='add'>+0x8A, 0x41, 0x3B, 0x10, 0xFD, 0x00, 0x84, 0x43, 0x10, 0x0E, 0x40, 0x3B, 0x20,</div><div class='add'>+0xED, 0x02, 0x80, 0x17, 0x10, 0x0B, 0x41, 0x29, 0x00, 0xF1, 0x00, 0x94, 0x03,</div><div class='add'>+0x10, 0x4F, 0x40, 0x1A, 0x00, 0xAD, 0x80, 0xB4, 0x42, 0xD0, 0x1E, 0x40, 0x20,</div><div class='add'>+0x00, 0xE5, 0x00, 0xB4, 0x01, 0xD0, 0x1F, 0x40, 0x20, 0x01, 0x04, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x06, 0x28, 0x03, 0x00, 0x90, 0x02, 0x44, 0x0E, 0x10, 0x3C,</div><div class='add'>+0x40, 0xB3, 0x02, 0xCD, 0x02, 0x06, 0x0E, 0x00, 0x38, 0x40, 0xF3, 0x01, 0xC9,</div><div class='add'>+0x08, 0x04, 0x4F, 0x11, 0x68, 0x42, 0xA5, 0x02, 0x01, 0x0B, 0x04, 0x4B, 0x50,</div><div class='add'>+0x08, 0x41, 0x13, 0x22, 0x8D, 0x81, 0x66, 0x1A, 0x52, 0x0C, 0x44, 0x20, 0x00,</div><div class='add'>+0xC5, 0x80, 0x74, 0x08, 0xD0, 0x0C, 0x40, 0x18, 0x20, 0x0C, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x15, 0xA8, 0x65, 0x00, 0xD2, 0x01, 0x4C, 0x4F, 0x34, 0x18, 0xC0,</div><div class='add'>+0x7F, 0x00, 0xDF, 0x03, 0x0C, 0x07, 0x30, 0x3D, 0xC1, 0xBF, 0x04, 0xCD, 0x01,</div><div class='add'>+0x4D, 0x0B, 0x36, 0x2D, 0xE4, 0xB5, 0x02, 0x93, 0x02, 0x54, 0x42, 0x10, 0x19,</div><div class='add'>+0xC0, 0x36, 0x00, 0xDD, 0x05, 0x74, 0x0F, 0xD0, 0x0D, 0xD0, 0x34, 0x00, 0x97,</div><div class='add'>+0x20, 0x7C, 0x02, 0xF2, 0xBD, 0xD5, 0x54, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x01, 0x00, 0xA7, 0x20, 0x9F, 0x18, 0x7C, 0x03, 0x70, 0x29, 0xC0, 0x37,</div><div class='add'>+0x01, 0xDE, 0x08, 0x7C, 0x03, 0xF4, 0x4D, 0xC0, 0x37, 0x00, 0xD7, 0x02, 0x7C,</div><div class='add'>+0x03, 0xF0, 0x09, 0xC0, 0x26, 0x00, 0x97, 0x82, 0x7C, 0x0B, 0x70, 0x8D, 0xE0,</div><div class='add'>+0x35, 0x00, 0xDF, 0x02, 0x7C, 0x03, 0xF0, 0x0D, 0xC0, 0x27, 0x00, 0x9D, 0x02,</div><div class='add'>+0x7C, 0x2A, 0xF0, 0x0D, 0xC0, 0xA7, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x80, 0x0A, 0x2F, 0x00, 0xFF, 0x00, 0xCC, 0x43, 0x70, 0x0F, 0xC1, 0x3C, 0x00,</div><div class='add'>+0xFF, 0x15, 0xDC, 0x66, 0x30, 0x1B, 0xC0, 0x3F, 0x20, 0xFF, 0x00, 0xCC, 0x03,</div><div class='add'>+0xF0, 0x9F, 0xC0, 0x3F, 0x00, 0x33, 0x10, 0xFC, 0x03, 0xE0, 0x0B, 0xC0, 0x7F,</div><div class='add'>+0x10, 0xE3, 0x49, 0xCC, 0x03, 0x30, 0x0F, 0xC0, 0xBF, 0x00, 0xBF, 0x22, 0xFC,</div><div class='add'>+0x40, 0x30, 0x0F, 0xC0, 0x07, 0x22, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x81,</div><div class='add'>+0x20, 0x66, 0x00, 0x9D, 0x00, 0x44, 0x83, 0x10, 0x2D, 0x40, 0x34, 0x08, 0xDD,</div><div class='add'>+0x40, 0x74, 0x02, 0x50, 0x09, 0x44, 0x37, 0x08, 0xDD, 0x03, 0x44, 0x03, 0xD0,</div><div class='add'>+0x19, 0x68, 0x27, 0x80, 0x15, 0x13, 0x74, 0x47, 0xD2, 0x99, 0xC4, 0x51, 0x28,</div><div class='add'>+0xD1, 0x03, 0x6C, 0x27, 0xF0, 0x0D, 0x40, 0x27, 0x00, 0x9D, 0x04, 0x7C, 0x2F,</div><div class='add'>+0x11, 0x0D, 0x40, 0x07, 0x02, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xA0,</div><div class='add'>+0x46, 0x04, 0xDD, 0x00, 0x44, 0x12, 0x12, 0x09, 0x41, 0x36, 0x00, 0xDD, 0x00,</div><div class='add'>+0x74, 0x03, 0x12, 0x8D, 0x42, 0x37, 0x00, 0xDD, 0x01, 0x44, 0x03, 0xD0, 0x0D,</div><div class='add'>+0x42, 0x37, 0x20, 0x91, 0x01, 0x74, 0x07, 0xD0, 0x09, 0x44, 0x17, 0x02, 0x95,</div><div class='add'>+0x50, 0x44, 0x02, 0x10, 0x0D, 0x48, 0x36, 0x00, 0x9D, 0x00, 0x74, 0x0A, 0x10,</div><div class='add'>+0x0D, 0x40, 0x07, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00,</div><div class='add'>+0x00, 0xCD, 0x00, 0x05, 0x02, 0x10, 0x08, 0x50, 0x32, 0x08, 0xCD, 0x00, 0x74,</div><div class='add'>+0x03, 0x50, 0x8C, 0x40, 0x33, 0x00, 0xDD, 0x02, 0x04, 0x13, 0xD0, 0x08, 0x40,</div><div class='add'>+0x36, 0x00, 0x05, 0x00, 0x34, 0x03, 0xD0, 0x0C, 0x61, 0x35, 0x40, 0x45, 0x80,</div><div class='add'>+0x24, 0x02, 0x98, 0x0C, 0x40, 0x33, 0x00, 0x4D, 0x20, 0x34, 0x00, 0x10, 0x0C,</div><div class='add'>+0x40, 0x43, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x26, 0x00,</div><div class='add'>+0x9F, 0x20, 0x4C, 0x02, 0x34, 0x01, 0xC0, 0x3E, 0x00, 0xDF, 0x00, 0x58, 0x82,</div><div class='add'>+0x30, 0x09, 0xC0, 0x3F, 0x08, 0xDF, 0x02, 0x84, 0x43, 0xF0, 0x0D, 0x40, 0x27,</div><div class='add'>+0x00, 0x11, 0x00, 0x7C, 0x03, 0xF0, 0x09, 0x40, 0x17, 0x80, 0x97, 0x80, 0x4C,</div><div class='add'>+0x02, 0x30, 0x0E, 0x80, 0x17, 0x00, 0x9F, 0x00, 0x7C, 0x00, 0x34, 0x0F, 0xC8,</div><div class='add'>+0x07, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0xB0, 0x2F, 0x00, 0xBF,</div><div class='add'>+0x40, 0xFC, 0x02, 0xB0, 0x07, 0xC0, 0x3D, 0x08, 0xEF, 0x00, 0xFC, 0x02, 0xF0,</div><div class='add'>+0x4B, 0xC8, 0x3F, 0x00, 0xBF, 0x00, 0xFC, 0x03, 0xF0, 0x0A, 0xC0, 0x2F, 0x00,</div><div class='add'>+0x2F, 0x00, 0xFC, 0x03, 0xD0, 0x09, 0xC0, 0x1F, 0x00, 0x7B, 0x00, 0xF8, 0x02,</div><div class='add'>+0xF0, 0x0F, 0xC2, 0x1F, 0x20, 0x7F, 0x00, 0xDC, 0x00, 0xF0, 0x0F, 0xC0, 0x17,</div><div class='add'>+0x60, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xA8, 0x6F, 0x00, 0x2F, 0x04,</div><div class='add'>+0xCC, 0x06, 0x70, 0x43, 0xC1, 0x0F, 0x01, 0xE3, 0x01, 0xCC, 0x10, 0x74, 0x03,</div><div class='add'>+0xC0, 0x0F, 0x00, 0x33, 0x10, 0xCC, 0x80, 0x30, 0x03, 0xD0, 0x0C, 0x00, 0x33,</div><div class='add'>+0x04, 0xCC, 0x00, 0x34, 0x43, 0xC8, 0x7E, 0x02, 0xB3, 0x00, 0xFC, 0x53, 0xF0,</div><div class='add'>+0x12, 0xC0, 0x6D, 0x02, 0xAF, 0x01, 0xFC, 0x06, 0xF0, 0x4B, 0xC0, 0x0F, 0x00,</div><div class='add'>+0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x67, 0x00, 0x1D, 0xAB, 0x44,</div><div class='add'>+0x07, 0x10, 0x35, 0x48, 0xD7, 0x02, 0xD1, 0xA1, 0x44, 0x0D, 0x10, 0x35, 0x40,</div><div class='add'>+0x57, 0x02, 0x51, 0x43, 0x4C, 0x0D, 0x10, 0xB5, 0x40, 0xD4, 0x02, 0x51, 0x03,</div><div class='add'>+0x44, 0x0D, 0x10, 0x95, 0x40, 0x33, 0x11, 0xD1, 0x03, 0x74, 0x8F, 0xD0, 0x19,</div><div class='add'>+0x40, 0x27, 0x01, 0x9D, 0x01, 0x74, 0x04, 0xD2, 0x11, 0x40, 0x07, 0x60, 0x0C,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0xA8, 0x23, 0x00, 0x0D, 0x00, 0x44, 0x03,</div><div class='add'>+0x50, 0x08, 0x40, 0x21, 0x40, 0xC1, 0x00, 0x14, 0x0A, 0x18, 0x88, 0x40, 0x23,</div><div class='add'>+0x00, 0x81, 0x00, 0x04, 0x0A, 0x50, 0x08, 0x48, 0x20, 0x00, 0x89, 0x08, 0x06,</div><div class='add'>+0x0A, 0x10, 0x08, 0x40, 0x33, 0x01, 0x81, 0x02, 0x34, 0x03, 0xD0, 0x08, 0x40,</div><div class='add'>+0x01, 0x10, 0x85, 0x00, 0x34, 0x02, 0xD0, 0x88, 0x40, 0x47, 0x80, 0x0E, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x03, 0xA8, 0x25, 0x02, 0x1D, 0xC0, 0x64, 0xC7, 0x10,</div><div class='add'>+0x05, 0x44, 0x37, 0x02, 0xD1, 0x00, 0x56, 0x08, 0x10, 0x05, 0x40, 0xB7, 0x09,</div><div class='add'>+0x91, 0x03, 0x64, 0x03, 0x50, 0x09, 0x40, 0x34, 0x00, 0x91, 0x00, 0x44, 0x0E,</div><div class='add'>+0x10, 0x09, 0x42, 0x37, 0x01, 0x91, 0x00, 0x74, 0x03, 0xD0, 0x19, 0x40, 0x57,</div><div class='add'>+0x00, 0xDD, 0x01, 0x74, 0x05, 0xD0, 0x19, 0x41, 0x0F, 0x00, 0x06, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x02, 0xA8, 0x27, 0x00, 0xDF, 0x5A, 0x0C, 0x0F, 0x70, 0x91,</div><div class='add'>+0xC0, 0xC7, 0x04, 0xD3, 0x01, 0x5C, 0x24, 0x30, 0x11, 0xC2, 0xC7, 0x00, 0x13,</div><div class='add'>+0x02, 0x4C, 0x00, 0x70, 0x21, 0xC1, 0xC4, 0x86, 0x13, 0x1B, 0x4C, 0x08, 0x30,</div><div class='add'>+0x01, 0xC0, 0x36, 0x00, 0x93, 0x00, 0x7C, 0x03, 0xF0, 0x59, 0xC0, 0xE5, 0x00,</div><div class='add'>+0x9F, 0x07, 0x7C, 0x16, 0xF0, 0x39, 0xC0, 0x0B, 0x20, 0x0E, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x07, 0x80, 0x2D, 0x20, 0xBF, 0x00, 0xDC, 0x03, 0xF0, 0x17, 0xC0,</div><div class='add'>+0x4F, 0x00, 0xFD, 0x02, 0xEC, 0x01, 0xB0, 0x3F, 0xC0, 0x1A, 0x40, 0x6F, 0x00,</div><div class='add'>+0x9C, 0x0D, 0xB0, 0x07, 0xC0, 0x5B, 0x20, 0x7F, 0x00, 0xFD, 0x01, 0xF0, 0x07,</div><div class='add'>+0xC2, 0x7F, 0x40, 0xFF, 0x00, 0xFC, 0x03, 0xF0, 0x0B, 0xC0, 0x2F, 0x00, 0x7F,</div><div class='add'>+0x00, 0xFC, 0x01, 0xF2, 0x03, 0xC0, 0x1F, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x02, 0x08, 0x25, 0x00, 0xD3, 0x13, 0x4C, 0x23, 0xF0, 0x09, 0xD0, 0xA0,</div><div class='add'>+0x00, 0xDF, 0x11, 0x1C, 0x0A, 0x70, 0x09, 0xE0, 0x27, 0x00, 0x1F, 0x02, 0x4C,</div><div class='add'>+0x2A, 0x30, 0x2C, 0xC0, 0xA7, 0x02, 0x83, 0x02, 0x0D, 0x02, 0xF0, 0x2D, 0x41,</div><div class='add'>+0x74, 0x01, 0xD3, 0x00, 0x4C, 0x03, 0xF0, 0x29, 0xC0, 0x94, 0x00, 0x9F, 0x0E,</div><div class='add'>+0x4C, 0x0A, 0xF0, 0x29, 0xC0, 0x0B, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x13, 0xA0, 0x64, 0x01, 0x81, 0x22, 0x44, 0x03, 0xD0, 0xB5, 0x40, 0xE4, 0x02,</div><div class='add'>+0xCD, 0x02, 0x44, 0x28, 0xD0, 0xAD, 0x41, 0xB7, 0x06, 0x1D, 0x1A, 0x44, 0x07,</div><div class='add'>+0x12, 0xAD, 0x42, 0xB7, 0x00, 0x91, 0x0B, 0x6C, 0x2A, 0xD0, 0x0D, 0x41, 0xB5,</div><div class='add'>+0x08, 0xD1, 0x01, 0xC4, 0x83, 0xD0, 0x0D, 0xC0, 0x14, 0x00, 0xD1, 0x01, 0x44,</div><div class='add'>+0x99, 0xD0, 0x19, 0x40, 0x4F, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03,</div><div class='add'>+0x20, 0xE2, 0x01, 0x01, 0x00, 0x14, 0x13, 0xD0, 0x00, 0x40, 0x00, 0x28, 0xCD,</div><div class='add'>+0x00, 0x20, 0x24, 0x80, 0x10, 0x40, 0x43, 0x00, 0x0D, 0x01, 0x06, 0x90, 0x10,</div><div class='add'>+0x90, 0x40, 0x43, 0x04, 0x01, 0x00, 0x24, 0x24, 0xD0, 0x10, 0x40, 0x34, 0x00,</div><div class='add'>+0x81, 0x80, 0x24, 0x83, 0x90, 0x08, 0x40, 0x20, 0x00, 0x01, 0x02, 0x04, 0x42,</div><div class='add'>+0xD1, 0x00, 0x43, 0x0F, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00,</div><div class='add'>+0x6A, 0x00, 0xE1, 0x01, 0x84, 0x07, 0xD0, 0x98, 0x43, 0x58, 0x00, 0xED, 0x01,</div><div class='add'>+0xB4, 0x07, 0xD0, 0x12, 0x40, 0x6B, 0x00, 0x4C, 0x01, 0x04, 0x04, 0x10, 0x1E,</div><div class='add'>+0x40, 0x63, 0x00, 0xC1, 0x11, 0x84, 0x05, 0xD0, 0x14, 0x50, 0x78, 0x00, 0xE1,</div><div class='add'>+0x01, 0xA4, 0x07, 0xD0, 0x0B, 0x40, 0x7A, 0x12, 0xB1, 0x01, 0x85, 0x06, 0xD0,</div><div class='add'>+0x12, 0x48, 0x13, 0x20, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x22,</div><div class='add'>+0x00, 0x03, 0x08, 0x1C, 0x03, 0xF0, 0xA8, 0xC8, 0x00, 0x84, 0xCF, 0x00, 0x3C,</div><div class='add'>+0x83, 0x70, 0x0C, 0x40, 0x13, 0x00, 0xCE, 0x00, 0x0C, 0x00, 0x30, 0x00, 0xCA,</div><div class='add'>+0x13, 0x10, 0x43, 0x00, 0x24, 0x01, 0xF0, 0xE0, 0xC0, 0x30, 0x40, 0x83, 0x18,</div><div class='add'>+0x2C, 0x03, 0xF0, 0x88, 0xC0, 0x24, 0x40, 0x47, 0x08, 0x0C, 0x03, 0xF0, 0x00,</div><div class='add'>+0xC1, 0x4B, 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xA8, 0x39, 0x40,</div><div class='add'>+0xFF, 0x00, 0xFC, 0x03, 0xF1, 0x8B, 0xC0, 0x1F, 0x20, 0xFF, 0x00, 0xCC, 0x03,</div><div class='add'>+0xF8, 0x07, 0xC0, 0x3F, 0x00, 0xFF, 0x00, 0xFC, 0x00, 0xF0, 0x8B, 0xC0, 0x3F,</div><div class='add'>+0x00, 0xFF, 0x08, 0xFC, 0x01, 0xF0, 0x83, 0xE0, 0x3F, 0x00, 0xAF, 0x00, 0xDD,</div><div class='add'>+0x43, 0xF0, 0x4F, 0xC0, 0x1D, 0x00, 0x7F, 0x00, 0xFC, 0x01, 0xF0, 0x83, 0xC0,</div><div class='add'>+0x0B, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xA0, 0x67, 0x00, 0x53,</div><div class='add'>+0x00, 0x7C, 0x03, 0xF0, 0x05, 0xC0, 0x36, 0x00, 0xD7, 0x00, 0x7C, 0x00, 0xF0,</div><div class='add'>+0x01, 0xC0, 0x07, 0x00, 0x93, 0x80, 0x7C, 0x07, 0x32, 0x01, 0xC2, 0x44, 0x00,</div><div class='add'>+0x13, 0x00, 0x4C, 0x02, 0x30, 0x09, 0xC0, 0x37, 0x00, 0x93, 0x00, 0x5C, 0x03,</div><div class='add'>+0xF0, 0x09, 0xC0, 0x57, 0x00, 0x53, 0x80, 0x7C, 0x01, 0x30, 0x19, 0xC0, 0x40,</div><div class='add'>+0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x98, 0x39, 0x00, 0xE1, 0x00,</div><div class='add'>+0xB4, 0x03, 0xD0, 0x0E, 0x40, 0x38, 0x08, 0xED, 0x00, 0xB4, 0x03, 0xD0, 0x0A,</div><div class='add'>+0x40, 0x23, 0x40, 0xE1, 0x00, 0x36, 0x03, 0x04, 0x0C, 0x40, 0x28, 0x40, 0xE1,</div><div class='add'>+0x20, 0x04, 0x03, 0x10, 0x0E, 0x40, 0x3B, 0x00, 0xE5, 0x00, 0xB4, 0x13, 0xD0,</div><div class='add'>+0x0A, 0x40, 0x3B, 0x00, 0x61, 0x00, 0xF4, 0x01, 0xB1, 0x02, 0x40, 0x48, 0x60,</div><div class='add'>+0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x69, 0x00, 0x61, 0x01, 0xB4,</div><div class='add'>+0x07, 0xD0, 0x1C, 0x44, 0x78, 0x00, 0xE5, 0x11, 0xB6, 0x07, 0x50, 0x1E, 0x40,</div><div class='add'>+0x5B, 0x00, 0xE1, 0x01, 0xB4, 0x07, 0x10, 0x16, 0x40, 0x50, 0x00, 0x41, 0x01,</div><div class='add'>+0x84, 0x07, 0x14, 0x3E, 0x40, 0x7F, 0x00, 0xE1, 0x01, 0x94, 0x07, 0xD0, 0x1A,</div><div class='add'>+0x40, 0xDF, 0x00, 0x61, 0x01, 0xF4, 0x07, 0x10, 0x18, 0x50, 0x10, 0x00, 0x04,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x16, 0x20, 0x33, 0x00, 0xC1, 0x13, 0x34, 0x01,</div><div class='add'>+0xD0, 0x9C, 0x40, 0xB0, 0x04, 0x8D, 0x01, 0x36, 0x03, 0xD0, 0x0C, 0x40, 0x33,</div><div class='add'>+0x00, 0xC1, 0x02, 0x34, 0x07, 0x10, 0x0C, 0x40, 0x30, 0x00, 0xC1, 0x00, 0x04,</div><div class='add'>+0x03, 0x10, 0x2C, 0x40, 0x63, 0x02, 0xC5, 0x08, 0x34, 0x03, 0xD0, 0xAC, 0x41,</div><div class='add'>+0xD3, 0x00, 0x41, 0x62, 0x34, 0x85, 0x90, 0x1C, 0x40, 0x58, 0x00, 0x0C, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x17, 0xA8, 0x57, 0x04, 0x73, 0x07, 0xBC, 0x09, 0xF0,</div><div class='add'>+0x07, 0xD0, 0x9E, 0x04, 0x57, 0x00, 0xFC, 0x01, 0xF0, 0x87, 0xE0, 0x1F, 0x00,</div><div class='add'>+0x73, 0x02, 0xFC, 0x1D, 0x30, 0x17, 0xD1, 0x1C, 0x00, 0x73, 0x00, 0xCD, 0x01,</div><div class='add'>+0x30, 0x27, 0xC0, 0x17, 0x00, 0x53, 0x01, 0x5C, 0x01, 0xF0, 0x17, 0xC0, 0x1F,</div><div class='add'>+0x00, 0x63, 0x07, 0xBC, 0x05, 0x30, 0x77, 0xC0, 0x5C, 0x20, 0x0E, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x12, 0x80, 0x05, 0x40, 0x0F, 0x00, 0x7C, 0x40, 0xF0, 0x01,</div><div class='add'>+0xC0, 0x07, 0x00, 0x1F, 0x00, 0x7C, 0x00, 0xF0, 0x01, 0xC0, 0x07, 0x00, 0x1F,</div><div class='add'>+0x00, 0x7C, 0x40, 0xF0, 0x01, 0xC0, 0x07, 0x00, 0x1F, 0x00, 0x7C, 0x04, 0xF0,</div><div class='add'>+0x01, 0xC1, 0x07, 0x00, 0x1F, 0x00, 0x7C, 0x00, 0xF0, 0x01, 0xC0, 0x07, 0x44,</div><div class='add'>+0x1F, 0x06, 0x7C, 0x24, 0xF0, 0x41, 0xC0, 0x4B, 0x00, 0x06, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x10, 0x08, 0x25, 0x00, 0x9F, 0x00, 0x4C, 0x02, 0x30, 0x08, 0xE0,</div><div class='add'>+0x20, 0x00, 0x93, 0x00, 0x3C, 0x02, 0x30, 0x08, 0xC0, 0x20, 0x00, 0x83, 0x10,</div><div class='add'>+0x4C, 0x02, 0xF0, 0x08, 0xC0, 0x24, 0x00, 0x8F, 0x00, 0x0C, 0x02, 0x70, 0x08,</div><div class='add'>+0xC0, 0x64, 0x00, 0x93, 0x00, 0x3C, 0x02, 0x30, 0x09, 0xC0, 0x27, 0x00, 0x9F,</div><div class='add'>+0x08, 0x4C, 0x22, 0x30, 0x59, 0xC0, 0x43, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x01, 0x20, 0x26, 0x00, 0x9D, 0x80, 0x44, 0x02, 0x10, 0x09, 0x10, 0x24,</div><div class='add'>+0x40, 0x91, 0x00, 0x74, 0x02, 0x14, 0x09, 0xD0, 0x24, 0x50, 0x91, 0x40, 0x4D,</div><div class='add'>+0x02, 0xD0, 0x09, 0x50, 0x24, 0x00, 0x9D, 0x00, 0x45, 0x02, 0x14, 0x09, 0x50,</div><div class='add'>+0x64, 0x42, 0x91, 0x00, 0x74, 0x06, 0x50, 0x09, 0x40, 0x27, 0x00, 0x9D, 0x01,</div><div class='add'>+0x54, 0x06, 0x54, 0x29, 0x40, 0x07, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x1C, 0xA0, 0x24, 0x00, 0x9D, 0x00, 0x44, 0x02, 0x10, 0x09, 0x40, 0x24, 0x00,</div><div class='add'>+0x91, 0x00, 0x74, 0x02, 0x10, 0x09, 0x00, 0x26, 0x00, 0x99, 0x00, 0x44, 0x03,</div><div class='add'>+0xD0, 0x09, 0x40, 0x24, 0x00, 0x9D, 0x00, 0x44, 0x02, 0x90, 0x09, 0x40, 0x20,</div><div class='add'>+0x00, 0x91, 0x00, 0x74, 0x12, 0x10, 0x09, 0x40, 0x37, 0x00, 0x9D, 0x00, 0x44,</div><div class='add'>+0x42, 0x11, 0x29, 0x40, 0x73, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14,</div><div class='add'>+0x28, 0x20, 0x00, 0x8D, 0x04, 0x05, 0x02, 0x10, 0x48, 0x40, 0x20, 0x01, 0x81,</div><div class='add'>+0x00, 0x34, 0x12, 0x10, 0x48, 0x44, 0x20, 0x01, 0x89, 0x04, 0x04, 0x12, 0xD0,</div><div class='add'>+0x48, 0x40, 0x20, 0x01, 0x8D, 0x04, 0x04, 0x12, 0x10, 0x48, 0x40, 0x60, 0x00,</div><div class='add'>+0x81, 0x04, 0x34, 0x12, 0x50, 0x08, 0x40, 0x23, 0x00, 0x8D, 0x00, 0x54, 0x02,</div><div class='add'>+0x50, 0x48, 0x40, 0x53, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xB0,</div><div class='add'>+0x06, 0x00, 0x1F, 0x00, 0x44, 0x00, 0x34, 0x01, 0x40, 0x04, 0x00, 0x13, 0x00,</div><div class='add'>+0x7C, 0x00, 0x30, 0x01, 0xC0, 0x06, 0x00, 0x1B, 0x20, 0x4C, 0x00, 0xF0, 0x01,</div><div class='add'>+0xC0, 0x04, 0x00, 0x1F, 0x00, 0x4C, 0x00, 0x70, 0x01, 0xC0, 0x84, 0x02, 0x13,</div><div class='add'>+0x00, 0x7C, 0x00, 0x30, 0x01, 0xC0, 0x87, 0x02, 0x5F, 0x80, 0x4C, 0x00, 0x32,</div><div class='add'>+0x01, 0xC0, 0x77, 0xC0, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x19, 0xA8, 0x2B,</div><div class='add'>+0x00, 0xBF, 0x28, 0xFD, 0x02, 0xF1, 0x8B, 0xC0, 0x2F, 0x0A, 0xBF, 0x20, 0xFC,</div><div class='add'>+0x22, 0xF0, 0x8B, 0xC0, 0x2F, 0x02, 0xB7, 0x08, 0xDC, 0x22, 0xF2, 0x8B, 0xC0,</div><div class='add'>+0x2F, 0x22, 0xBF, 0x08, 0xFC, 0x22, 0xF2, 0x8B, 0xC0, 0x2B, 0x00, 0xBF, 0x08,</div><div class='add'>+0x7C, 0x22, 0xF0, 0x0B, 0xC0, 0x2B, 0x00, 0xBF, 0x00, 0xFC, 0x02, 0xF1, 0x8B,</div><div class='add'>+0xC0, 0x67, 0x20, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0xA0, 0x27, 0x00,</div><div class='add'>+0x9F, 0x84, 0x7C, 0x03, 0xF0, 0x09, 0xC0, 0x27, 0x00, 0x93, 0x00, 0x7C, 0x52,</div><div class='add'>+0x30, 0x49, 0xC0, 0x27, 0x00, 0x9F, 0x00, 0x7C, 0x02, 0x30, 0x49, 0xC0, 0x24,</div><div class='add'>+0x05, 0x9F, 0x04, 0x7C, 0x02, 0xF0, 0x08, 0xC0, 0x2C, 0x02, 0xB3, 0x04, 0xCC,</div><div class='add'>+0x16, 0xF0, 0x09, 0xC0, 0x27, 0x00, 0xBF, 0x00, 0xBC, 0x02, 0xF2, 0x0B, 0xC0,</div><div class='add'>+0x63, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1C, 0x18, 0x07, 0x00, 0x1D,</div><div class='add'>+0x28, 0x74, 0x80, 0xD0, 0x01, 0x40, 0x07, 0x02, 0x11, 0x00, 0x74, 0x00, 0x10,</div><div class='add'>+0x81, 0x40, 0x87, 0x00, 0x1D, 0x00, 0x74, 0xA0, 0x12, 0x01, 0x40, 0x04, 0x00,</div><div class='add'>+0x1D, 0x88, 0x74, 0x08, 0xD0, 0x03, 0x40, 0x04, 0x40, 0x11, 0x20, 0x45, 0x00,</div><div class='add'>+0xD0, 0x01, 0x40, 0x16, 0x14, 0x1D, 0x00, 0x74, 0x00, 0xD0, 0x01, 0x40, 0x73,</div><div class='add'>+0x60, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x29, 0x00, 0xAD, 0x00,</div><div class='add'>+0xB4, 0x02, 0xD0, 0x9A, 0x40, 0x6B, 0x00, 0xA1, 0x00, 0xB4, 0x06, 0x10, 0x1A,</div><div class='add'>+0x40, 0x6B, 0x02, 0xAD, 0x09, 0xB4, 0x06, 0x10, 0x9A, 0x48, 0x68, 0x20, 0xAD,</div><div class='add'>+0x01, 0xB0, 0x26, 0xD0, 0x9A, 0x40, 0x20, 0x00, 0x81, 0x08, 0x04, 0x0A, 0xD0,</div><div class='add'>+0x08, 0x40, 0x23, 0x01, 0x8D, 0x80, 0x34, 0x02, 0xD0, 0x18, 0x40, 0x4B, 0x00,</div><div class='add'>+0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x20, 0x65, 0x00, 0xBD, 0x00, 0xF4,</div><div class='add'>+0x8A, 0xD0, 0x0B, 0x40, 0x2F, 0x00, 0xB1, 0x00, 0xF4, 0x02, 0x10, 0x0B, 0x40,</div><div class='add'>+0x6F, 0x00, 0xBD, 0x00, 0xF4, 0x02, 0x10, 0x0B, 0x40, 0x6C, 0x00, 0xBD, 0x00,</div><div class='add'>+0xF4, 0x12, 0xD0, 0x0B, 0x50, 0x24, 0x00, 0x91, 0x04, 0x44, 0x02, 0xD0, 0x09,</div><div class='add'>+0x40, 0x26, 0x02, 0x9D, 0x02, 0x74, 0x0A, 0xD0, 0x19, 0x40, 0x63, 0x00, 0x06,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0xA8, 0x27, 0x00, 0x9F, 0x00, 0x7C, 0x26,</div><div class='add'>+0xF0, 0x29, 0xC8, 0xA7, 0x40, 0x91, 0x00, 0x7C, 0x2A, 0x34, 0x39, 0xC0, 0xA7,</div><div class='add'>+0x00, 0x9F, 0x0B, 0x7C, 0x0A, 0x34, 0xA9, 0xD0, 0xA4, 0x00, 0x9F, 0x03, 0x7C,</div><div class='add'>+0x0A, 0xF0, 0x09, 0xC0, 0x64, 0x00, 0x93, 0x00, 0x4C, 0x02, 0xF0, 0x39, 0xC1,</div><div class='add'>+0xA7, 0x00, 0x9F, 0x82, 0x7C, 0x0E, 0xF0, 0x29, 0xC0, 0x17, 0x20, 0x0E, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x12, 0x80, 0x25, 0x08, 0x9F, 0x00, 0x78, 0x06, 0xF0,</div><div class='add'>+0x09, 0x80, 0x27, 0x00, 0x9F, 0x09, 0x7C, 0x02, 0xF0, 0x49, 0xC0, 0x27, 0x00,</div><div class='add'>+0x9F, 0x01, 0x3C, 0x02, 0xF0, 0x08, 0xC0, 0x27, 0x00, 0x9F, 0x09, 0x7C, 0x06,</div><div class='add'>+0xF0, 0x98, 0xC0, 0x27, 0x01, 0x8F, 0x01, 0x7C, 0x02, 0xF0, 0x89, 0xC0, 0x27,</div><div class='add'>+0x00, 0x9F, 0x28, 0x7C, 0x66, 0xF0, 0x09, 0xC0, 0x4B, 0x00, 0x06, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x10, 0x08, 0x0D, 0x00, 0x3F, 0x00, 0xCC, 0x00, 0xF0, 0x03,</div><div class='add'>+0xC0, 0x0B, 0x00, 0x3F, 0x00, 0xBC, 0x00, 0x70, 0x03, 0xC0, 0x0C, 0x00, 0x3F,</div><div class='add'>+0x00, 0xFE, 0x00, 0xF0, 0x03, 0xC0, 0x0F, 0x00, 0x3F, 0x00, 0xFC, 0x00, 0xB0,</div><div class='add'>+0x03, 0xC0, 0x44, 0x00, 0x1F, 0x00, 0x7C, 0x00, 0xF0, 0x01, 0xC0, 0x07, 0x00,</div><div class='add'>+0x1F, 0x12, 0x7C, 0x08, 0x30, 0x01, 0xC0, 0x40, 0x20, 0x04, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x14, 0x80, 0x14, 0x00, 0x5D, 0x20, 0x40, 0x01, 0x70, 0x05, 0x40,</div><div class='add'>+0x17, 0x00, 0x5D, 0x00, 0x74, 0x01, 0xD0, 0x05, 0x40, 0x14, 0x00, 0x5D, 0x20,</div><div class='add'>+0x74, 0x01, 0xD2, 0x05, 0x48, 0x17, 0x00, 0x5D, 0x00, 0x74, 0x01, 0x30, 0x05,</div><div class='add'>+0xC0, 0x1E, 0x00, 0x5D, 0x00, 0x74, 0x01, 0xD0, 0x05, 0x40, 0x17, 0x10, 0x7D,</div><div class='add'>+0x03, 0xF4, 0x4D, 0x50, 0x17, 0x50, 0x51, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x14, 0xA0, 0x02, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x50, 0x00, 0x40, 0x03,</div><div class='add'>+0x00, 0x0D, 0x00, 0x34, 0x00, 0x50, 0x00, 0x40, 0x02, 0x00, 0x0D, 0x00, 0x36,</div><div class='add'>+0x00, 0xD0, 0x00, 0x40, 0x03, 0x00, 0x09, 0x00, 0x30, 0x00, 0x14, 0x00, 0x40,</div><div class='add'>+0x34, 0x08, 0x8D, 0x00, 0x34, 0x02, 0xD0, 0x0C, 0x40, 0x33, 0x00, 0x4D, 0x00,</div><div class='add'>+0x34, 0x09, 0x10, 0x8C, 0x41, 0x50, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x01, 0x88, 0x38, 0x00, 0xCD, 0x01, 0x84, 0x03, 0x50, 0x0E, 0x40, 0x3B, 0x00,</div><div class='add'>+0xED, 0x00, 0xB4, 0x03, 0xD0, 0x1E, 0x40, 0x3A, 0x00, 0xED, 0x00, 0xB4, 0x03,</div><div class='add'>+0xD0, 0x0E, 0x40, 0x3B, 0x00, 0xED, 0x00, 0x34, 0x07, 0x10, 0x0E, 0x40, 0x2A,</div><div class='add'>+0x00, 0xAD, 0x00, 0xB4, 0x42, 0xD0, 0x0E, 0x40, 0x3B, 0x00, 0x6D, 0x42, 0xB4,</div><div class='add'>+0x05, 0x50, 0x1E, 0x40, 0x05, 0x20, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11,</div><div class='add'>+0x10, 0x48, 0x00, 0x2F, 0x01, 0x8D, 0x84, 0x70, 0x12, 0xC0, 0x4B, 0x00, 0x2F,</div><div class='add'>+0x01, 0xBC, 0x04, 0x72, 0x10, 0xD0, 0x4A, 0x08, 0x2D, 0x21, 0xB4, 0x04, 0xF0,</div><div class='add'>+0x12, 0xC0, 0x4B, 0x00, 0x2F, 0x01, 0xBC, 0x04, 0x30, 0x12, 0xC0, 0x58, 0x00,</div><div class='add'>+0xAF, 0x01, 0xBC, 0x06, 0xF0, 0x1E, 0xC0, 0x7B, 0x03, 0xEF, 0x01, 0xBC, 0x05,</div><div class='add'>+0x30, 0x1E, 0xC0, 0x44, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xA8,</div><div class='add'>+0x35, 0x00, 0xDF, 0x00, 0x7E, 0x03, 0x70, 0x0D, 0xC0, 0x37, 0x00, 0xDF, 0x00,</div><div class='add'>+0x7C, 0x03, 0xF0, 0x0D, 0xC0, 0x35, 0x00, 0xDF, 0x00, 0x7C, 0x03, 0xF0, 0x0D,</div><div class='add'>+0xC8, 0x37, 0x00, 0xDF, 0x00, 0x7C, 0x03, 0x70, 0x0D, 0xC0, 0x37, 0x00, 0x9F,</div><div class='add'>+0x00, 0x7C, 0x02, 0xF0, 0x0D, 0xC0, 0x37, 0x00, 0xDF, 0x00, 0x7C, 0x01, 0xF0,</div><div class='add'>+0x0C, 0xC0, 0x43, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x4D,</div><div class='add'>+0x00, 0x3F, 0x01, 0xCC, 0x20, 0xF0, 0x13, 0xC0, 0x4C, 0x00, 0x3F, 0x01, 0xCC,</div><div class='add'>+0x04, 0xF0, 0x13, 0xC0, 0x4E, 0x00, 0x33, 0x01, 0xCC, 0x84, 0xF0, 0x13, 0xC2,</div><div class='add'>+0x4F, 0x02, 0x3F, 0x09, 0xFC, 0x04, 0xF0, 0x13, 0xC0, 0x7C, 0x00, 0xBF, 0x01,</div><div class='add'>+0xFC, 0x07, 0xF0, 0x1E, 0xC0, 0x7C, 0x04, 0x73, 0x01, 0x8C, 0x07, 0x30, 0x17,</div><div class='add'>+0xC0, 0x03, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x18, 0x39, 0x08,</div><div class='add'>+0xED, 0x00, 0x84, 0x03, 0xF0, 0x8E, 0x40, 0x38, 0x00, 0xED, 0x30, 0x94, 0x03,</div><div class='add'>+0xD0, 0x0E, 0x50, 0x38, 0x42, 0xE1, 0x08, 0x85, 0x23, 0xD0, 0x0E, 0x40, 0x3B,</div><div class='add'>+0x00, 0xED, 0x08, 0xB4, 0x03, 0xF0, 0x0E, 0x40, 0x08, 0x00, 0xAD, 0x00, 0xB4,</div><div class='add'>+0x03, 0xF0, 0x0E, 0xC0, 0x3B, 0x00, 0x21, 0x00, 0xAC, 0x12, 0xB0, 0x5E, 0x40,</div><div class='add'>+0x57, 0x60, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x2D,</div><div class='add'>+0x18, 0x84, 0x20, 0xD8, 0x00, 0x40, 0x08, 0x00, 0x3D, 0x00, 0x84, 0x00, 0xD0,</div><div class='add'>+0x00, 0x40, 0x80, 0x00, 0x01, 0x00, 0x94, 0x00, 0xD0, 0x22, 0x40, 0x8B, 0x20,</div><div class='add'>+0x2D, 0x08, 0xB4, 0x00, 0xD0, 0x10, 0x40, 0x18, 0x04, 0xAD, 0x00, 0xB4, 0x02,</div><div class='add'>+0xD0, 0x0F, 0x40, 0x38, 0x00, 0x61, 0x10, 0x84, 0x43, 0x18, 0x4E, 0x40, 0x03,</div><div class='add'>+0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x20, 0x31, 0x00, 0xCD, 0x06,</div><div class='add'>+0x06, 0x0B, 0x50, 0x2C, 0x40, 0x30, 0x00, 0xCD, 0x00, 0x14, 0x0B, 0xD0, 0x0C,</div><div class='add'>+0x44, 0x30, 0x00, 0xC1, 0x00, 0x04, 0x03, 0xD0, 0x0C, 0x40, 0x33, 0x00, 0xCD,</div><div class='add'>+0x02, 0x34, 0x03, 0x50, 0x0C, 0x50, 0x50, 0x00, 0x8D, 0x00, 0x34, 0x02, 0x50,</div><div class='add'>+0x7C, 0x40, 0xF3, 0x00, 0x81, 0x03, 0x24, 0x16, 0x90, 0x2D, 0x40, 0x13, 0x00,</div><div class='add'>+0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0xA8, 0x05, 0x00, 0x1F, 0x01, 0x4C,</div><div class='add'>+0x28, 0xD0, 0x11, 0xD0, 0x44, 0x00, 0x1F, 0x00, 0x4C, 0x04, 0xF0, 0x31, 0xC0,</div><div class='add'>+0x44, 0x00, 0x13, 0x01, 0x5C, 0x04, 0xF0, 0x11, 0xC0, 0x47, 0x00, 0x1F, 0x01,</div><div class='add'>+0x7C, 0x04, 0xD0, 0x00, 0xC0, 0x74, 0x00, 0xDF, 0x01, 0x3C, 0x02, 0xD0, 0x0D,</div><div class='add'>+0xC1, 0xB8, 0x01, 0x43, 0x03, 0x4C, 0x05, 0x30, 0xBD, 0xC0, 0x57, 0x20, 0x06,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x77, 0x00, 0xDF, 0x20, 0x7D, 0x87,</div><div class='add'>+0xF0, 0x1D, 0xC1, 0x77, 0x00, 0xDF, 0x00, 0x7C, 0x07, 0xF0, 0x1D, 0xC0, 0x77,</div><div class='add'>+0x10, 0xDF, 0x01, 0x7C, 0x07, 0xF0, 0x1D, 0xC0, 0x73, 0x00, 0xDF, 0x81, 0x7C,</div><div class='add'>+0x07, 0xF0, 0x1D, 0xC0, 0x27, 0x10, 0x9F, 0x08, 0x7C, 0x02, 0xF0, 0x0D, 0xC0,</div><div class='add'>+0x35, 0x44, 0x5F, 0x10, 0x7C, 0x0B, 0xF2, 0x3D, 0xC4, 0x07, 0x00, 0x0C, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x84, 0x08, 0x0F, 0x00, 0x13, 0x00, 0xFC, 0x80, 0x30,</div><div class='add'>+0x03, 0xC0, 0x0B, 0x00, 0x33, 0x00, 0xBC, 0x40, 0x30, 0x02, 0xC1, 0x0C, 0x08,</div><div class='add'>+0x3F, 0x00, 0xFC, 0x00, 0xF0, 0x03, 0xC0, 0x0F, 0x00, 0x32, 0x10, 0xFC, 0x80,</div><div class='add'>+0xF0, 0x03, 0xC0, 0x0C, 0x00, 0xEF, 0x09, 0xCC, 0x02, 0x30, 0x0F, 0xC0, 0x3F,</div><div class='add'>+0x00, 0xB3, 0x00, 0xCC, 0x00, 0x30, 0x5F, 0xC0, 0x10, 0x22, 0x0C, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x85, 0x20, 0x32, 0x00, 0xD1, 0x00, 0x34, 0x03, 0x92, 0x0D,</div><div class='add'>+0x42, 0x37, 0x00, 0xD1, 0x00, 0x74, 0x03, 0x10, 0x0D, 0x40, 0x34, 0x00, 0xDD,</div><div class='add'>+0x00, 0x76, 0x03, 0xD0, 0x0D, 0x42, 0x37, 0x40, 0xD1, 0x00, 0x64, 0x03, 0xD2,</div><div class='add'>+0x0D, 0xC0, 0x24, 0x08, 0x9D, 0x01, 0x44, 0x02, 0x14, 0x0D, 0x40, 0x37, 0x00,</div><div class='add'>+0x95, 0x93, 0x14, 0x0C, 0x10, 0x4D, 0x40, 0x15, 0x02, 0x08, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x01, 0xA0, 0x04, 0x00, 0x11, 0x40, 0x74, 0x00, 0x90, 0x01, 0x40,</div><div class='add'>+0x07, 0x00, 0x11, 0x00, 0x74, 0x00, 0x10, 0x01, 0x40, 0x04, 0x00, 0x1D, 0x00,</div><div class='add'>+0x74, 0x00, 0xD0, 0x01, 0x40, 0x07, 0x00, 0x15, 0x00, 0x54, 0x00, 0xD0, 0x01,</div><div class='add'>+0x40, 0x76, 0x80, 0xD9, 0x00, 0x44, 0x03, 0x18, 0x0D, 0x40, 0x37, 0x00, 0xD1,</div><div class='add'>+0x21, 0x54, 0x0D, 0x12, 0x0D, 0x48, 0x04, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x10, 0x28, 0x34, 0x00, 0xC1, 0x00, 0x34, 0x03, 0x94, 0x0C, 0x40, 0x33,</div><div class='add'>+0x00, 0xC1, 0x00, 0x34, 0x03, 0x14, 0x0C, 0x40, 0x30, 0x00, 0xCD, 0x00, 0x34,</div><div class='add'>+0x03, 0xD0, 0x0C, 0x40, 0x33, 0x00, 0xC5, 0x00, 0x34, 0x03, 0x90, 0x0C, 0x48,</div><div class='add'>+0x00, 0x00, 0x8D, 0x00, 0x05, 0x03, 0x10, 0x0C, 0x40, 0x37, 0x20, 0x15, 0x00,</div><div class='add'>+0x54, 0x02, 0x11, 0x0D, 0x40, 0x41, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0xB0, 0x06, 0x00, 0x13, 0x00, 0x7C, 0x00, 0x30, 0x01, 0xC8, 0x07, 0x40,</div><div class='add'>+0x13, 0x00, 0x7C, 0x00, 0x32, 0x01, 0xD0, 0x04, 0x00, 0x1F, 0x00, 0x74, 0x00,</div><div class='add'>+0xF0, 0x01, 0xC0, 0x07, 0x00, 0x17, 0x00, 0x5C, 0x00, 0xF0, 0x01, 0xD0, 0x04,</div><div class='add'>+0x10, 0xDF, 0x00, 0x4C, 0x02, 0x30, 0x0D, 0xC0, 0x3B, 0x00, 0x93, 0x00, 0x4C,</div><div class='add'>+0x02, 0x32, 0x45, 0xC0, 0x00, 0xC0, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05,</div><div class='add'>+0xA0, 0x3F, 0x40, 0xFF, 0x80, 0xFC, 0x03, 0x51, 0x0F, 0xC0, 0x3F, 0x00, 0xEF,</div><div class='add'>+0x00, 0xFC, 0x03, 0xF0, 0x0F, 0xC4, 0x3F, 0x00, 0xFF, 0x00, 0xFC, 0x03, 0xF0,</div><div class='add'>+0x0F, 0xC0, 0x3F, 0x00, 0xFB, 0x00, 0xEC, 0x03, 0xF0, 0x0F, 0xC0, 0x0D, 0x10,</div><div class='add'>+0xBD, 0x20, 0xFC, 0x02, 0xF0, 0x0F, 0xC0, 0x3F, 0x40, 0xAF, 0x80, 0xFD, 0x02,</div><div class='add'>+0xF0, 0x29, 0xC0, 0x17, 0x60, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xA0,</div><div class='add'>+0x2F, 0x01, 0x73, 0x01, 0xFC, 0x11, 0x34, 0x33, 0xC0, 0x1E, 0x01, 0xB3, 0x14,</div><div class='add'>+0xCC, 0x07, 0xF0, 0x0B, 0xC0, 0x3C, 0x01, 0xBF, 0x80, 0xCC, 0x27, 0xF0, 0x83,</div><div class='add'>+0xC0, 0x78, 0x00, 0x23, 0x01, 0xCC, 0xB3, 0xF0, 0x4B, 0xC0, 0x1A, 0x21, 0x73,</div><div class='add'>+0x01, 0xEC, 0x10, 0xF2, 0x13, 0xC0, 0x3C, 0x05, 0x7F, 0x01, 0xFC, 0x05, 0xF0,</div><div class='add'>+0x1F, 0xC0, 0x0F, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x08, 0xF7,</div><div class='add'>+0x00, 0xD1, 0x81, 0x74, 0x25, 0x12, 0x0D, 0x40, 0xD4, 0x02, 0x91, 0x03, 0x44,</div><div class='add'>+0x87, 0xD0, 0x39, 0x80, 0xFE, 0x02, 0x9D, 0x03, 0x44, 0x13, 0xD0, 0x61, 0x40,</div><div class='add'>+0x34, 0x44, 0x13, 0x81, 0xD4, 0x23, 0xD0, 0xB9, 0x40, 0xD4, 0x02, 0x91, 0x01,</div><div class='add'>+0x44, 0x31, 0xD1, 0x11, 0x40, 0xFC, 0x00, 0x9D, 0x81, 0x34, 0x87, 0xD0, 0x1D,</div><div class='add'>+0x44, 0x0F, 0x60, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0xA0, 0xA3, 0x00,</div><div class='add'>+0xC1, 0x00, 0x74, 0x01, 0x50, 0x4C, 0x40, 0x16, 0x00, 0xC5, 0x00, 0x04, 0x03,</div><div class='add'>+0xD0, 0x20, 0x40, 0x30, 0x00, 0x8D, 0x02, 0x04, 0x13, 0xD0, 0x28, 0x40, 0x30,</div><div class='add'>+0x01, 0x01, 0x00, 0x04, 0x13, 0xD0, 0x08, 0x60, 0x13, 0x00, 0x81, 0x80, 0x24,</div><div class='add'>+0x42, 0xD2, 0x0C, 0x40, 0x33, 0x00, 0xCD, 0x00, 0x34, 0x02, 0x50, 0x0C, 0x40,</div><div class='add'>+0x4F, 0x80, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xA8, 0x75, 0x00, 0xD1,</div><div class='add'>+0x00, 0x74, 0x01, 0x10, 0x1D, 0x40, 0x34, 0x04, 0x95, 0x00, 0x44, 0x13, 0xD0,</div><div class='add'>+0x39, 0x60, 0x36, 0x00, 0x9D, 0x00, 0x44, 0x03, 0xD0, 0x01, 0x40, 0x74, 0x00,</div><div class='add'>+0x59, 0x00, 0x54, 0x03, 0xD0, 0x0D, 0x40, 0x15, 0x00, 0x91, 0x10, 0x44, 0x63,</div><div class='add'>+0xD0, 0x21, 0x40, 0x36, 0x00, 0x9D, 0x06, 0x74, 0x9B, 0xD8, 0x0D, 0x40, 0x0F,</div><div class='add'>+0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x22, 0xA8, 0x23, 0x40, 0x93, 0x40,</div><div class='add'>+0x3C, 0x3B, 0x71, 0x1D, 0xC0, 0xD2, 0x00, 0x97, 0x00, 0x4C, 0x07, 0xF0, 0x1D,</div><div class='add'>+0xC0, 0x34, 0x00, 0x8F, 0x00, 0x4D, 0x03, 0xF0, 0x91, 0xD0, 0x34, 0x00, 0x11,</div><div class='add'>+0x07, 0x4C, 0x03, 0xF0, 0x0C, 0xC0, 0x13, 0x46, 0x53, 0x00, 0x6C, 0x0C, 0xF0,</div><div class='add'>+0x98, 0xE0, 0x36, 0x00, 0x5F, 0x00, 0x7C, 0x05, 0xE0, 0x0D, 0xC0, 0x0B, 0x20,</div><div class='add'>+0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x80, 0x25, 0x00, 0xBF, 0x45, 0xFC,</div><div class='add'>+0x05, 0xF0, 0x0F, 0xC0, 0x9F, 0x40, 0xEB, 0x00, 0xFC, 0x03, 0xF0, 0x0E, 0xC0,</div><div class='add'>+0x3F, 0x10, 0xDF, 0x04, 0xFC, 0x03, 0xF0, 0x0C, 0xC0, 0x3F, 0x40, 0xB7, 0x04,</div><div class='add'>+0xFC, 0x03, 0xF0, 0x0B, 0xC4, 0x7E, 0x00, 0xFF, 0x00, 0x7C, 0x84, 0xF0, 0x03,</div><div class='add'>+0x70, 0x35, 0x00, 0xBF, 0x01, 0xFC, 0x07, 0xF0, 0x0F, 0xC0, 0x1F, 0x00, 0x06,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x08, 0x25, 0x00, 0x93, 0x01, 0x7C, 0x03,</div><div class='add'>+0xF0, 0x0D, 0xC0, 0x17, 0x00, 0xD3, 0x10, 0x7C, 0x03, 0xF0, 0x05, 0xC0, 0x34,</div><div class='add'>+0x00, 0x97, 0x00, 0x4C, 0x03, 0xF0, 0x09, 0xC0, 0x34, 0x00, 0xDB, 0x10, 0x5C,</div><div class='add'>+0x03, 0xF0, 0x0D, 0xC0, 0x96, 0x84, 0x93, 0x02, 0x7C, 0x08, 0xB4, 0x2D, 0xC0,</div><div class='add'>+0x37, 0x00, 0xD7, 0x02, 0x7C, 0x02, 0xB0, 0x0D, 0xC0, 0x29, 0x20, 0x04, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x1B, 0xA0, 0xE4, 0x01, 0x91, 0x00, 0x76, 0x05, 0xD0,</div><div class='add'>+0x0D, 0x40, 0x37, 0x00, 0xD1, 0x00, 0x74, 0x03, 0xF0, 0x0D, 0xC0, 0x3D, 0x01,</div><div class='add'>+0xD1, 0x00, 0x44, 0x83, 0xDA, 0x0D, 0x40, 0x34, 0x00, 0xCB, 0x82, 0xC4, 0x43,</div><div class='add'>+0xD1, 0x0D, 0xC0, 0x37, 0x10, 0x8B, 0x1A, 0x76, 0x00, 0x10, 0x05, 0x40, 0x3F,</div><div class='add'>+0x00, 0x91, 0x00, 0x74, 0x03, 0xB0, 0x1D, 0xC0, 0x4F, 0x00, 0x02, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x07, 0xA0, 0x22, 0x01, 0x01, 0x00, 0x34, 0x05, 0xD0, 0x0D,</div><div class='add'>+0x40, 0x33, 0x02, 0x81, 0x02, 0x34, 0x03, 0xD0, 0x08, 0x44, 0x30, 0x00, 0xC5,</div><div class='add'>+0x00, 0x24, 0x03, 0xD0, 0x04, 0x40, 0x34, 0x00, 0x01, 0x00, 0x14, 0x07, 0xC0,</div><div class='add'>+0x08, 0x40, 0xF0, 0x20, 0xC1, 0x03, 0x34, 0x00, 0x90, 0x04, 0x48, 0x33, 0x00,</div><div class='add'>+0x80, 0x00, 0x36, 0x02, 0x50, 0x8C, 0x40, 0x4E, 0x00, 0x08, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x0D, 0x80, 0x78, 0x20, 0xE1, 0x81, 0xB4, 0x47, 0xD0, 0x1E, 0x60,</div><div class='add'>+0x5B, 0x10, 0xA1, 0x81, 0xB4, 0x07, 0x50, 0x9B, 0x42, 0x79, 0x00, 0xA1, 0x01,</div><div class='add'>+0xA4, 0x07, 0xD8, 0x12, 0x40, 0x7C, 0x00, 0xF9, 0x01, 0xA4, 0x07, 0xD0, 0x1A,</div><div class='add'>+0x40, 0x5E, 0x04, 0xA9, 0x01, 0xB4, 0x05, 0x90, 0x52, 0x40, 0x7B, 0x00, 0xA1,</div><div class='add'>+0x01, 0xB4, 0x06, 0x90, 0x1E, 0x40, 0x36, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x12, 0x10, 0x20, 0x00, 0x81, 0x00, 0x34, 0x01, 0xF2, 0x0C, 0xE0, 0x33,</div><div class='add'>+0x40, 0xC3, 0x00, 0x3C, 0x03, 0xD0, 0x0D, 0xC0, 0x30, 0x00, 0xC6, 0x20, 0x24,</div><div class='add'>+0x03, 0xD0, 0x4C, 0xC0, 0x30, 0x30, 0x83, 0x58, 0x1C, 0x03, 0xF0, 0x08, 0xC0,</div><div class='add'>+0x30, 0x00, 0x81, 0x00, 0x34, 0x02, 0xB4, 0x0C, 0xC0, 0x33, 0x40, 0x87, 0x00,</div><div class='add'>+0x3C, 0x02, 0x70, 0x0C, 0xC4, 0x4B, 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x02, 0xB8, 0x3D, 0x00, 0xFF, 0x00, 0xFC, 0x03, 0xF0, 0x0F, 0xC0, 0x3B, 0x02,</div><div class='add'>+0xBF, 0x00, 0xFC, 0x03, 0xF0, 0x0F, 0xC0, 0xB3, 0x00, 0xBF, 0x00, 0x5C, 0x03,</div><div class='add'>+0xF0, 0x03, 0xD0, 0x3F, 0x00, 0xFF, 0x20, 0xDC, 0x03, 0xF0, 0x0E, 0xC0, 0x1F,</div><div class='add'>+0x00, 0xBF, 0x00, 0xFC, 0x23, 0x70, 0x4B, 0xCA, 0xBF, 0x82, 0xBF, 0x00, 0xFC,</div><div class='add'>+0x02, 0xF0, 0x0E, 0xC0, 0x0B, 0x60, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15,</div><div class='add'>+0xA8, 0x37, 0x00, 0x9F, 0x00, 0x7C, 0x03, 0xF0, 0x0D, 0xC2, 0x77, 0x00, 0x93,</div><div class='add'>+0x80, 0x5C, 0x83, 0x70, 0x09, 0x80, 0xB5, 0x22, 0xD3, 0x00, 0x5C, 0x03, 0xF0,</div><div class='add'>+0x05, 0xC0, 0x77, 0x20, 0x53, 0x00, 0x7C, 0x33, 0xE0, 0x0D, 0xC0, 0x37, 0x00,</div><div class='add'>+0xDF, 0x00, 0x78, 0x03, 0xB0, 0x1D, 0xC0, 0x36, 0x81, 0xDF, 0x00, 0x4C, 0x02,</div><div class='add'>+0xF0, 0x0D, 0xC0, 0x43, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0x98,</div><div class='add'>+0xB9, 0x10, 0xAD, 0x40, 0x9C, 0x0B, 0xD3, 0x0E, 0x40, 0x13, 0x01, 0xE1, 0x00,</div><div class='add'>+0x84, 0x03, 0xD0, 0x2A, 0x40, 0x30, 0x11, 0xE1, 0x22, 0xB4, 0x83, 0xD0, 0x0E,</div><div class='add'>+0x40, 0x3B, 0x00, 0xE1, 0x00, 0xB4, 0x53, 0x80, 0x0A, 0x40, 0xBB, 0x00, 0xED,</div><div class='add'>+0x00, 0x34, 0x03, 0x10, 0x0E, 0x60, 0x38, 0x08, 0xAD, 0x00, 0x94, 0x02, 0xD0,</div><div class='add'>+0x0E, 0x40, 0x4F, 0x60, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x79,</div><div class='add'>+0x05, 0xAD, 0x03, 0xB4, 0x57, 0xD0, 0x1E, 0x40, 0x7B, 0x03, 0xC1, 0x09, 0x96,</div><div class='add'>+0x47, 0xD0, 0x7C, 0x4C, 0x79, 0x60, 0xE1, 0x05, 0xB6, 0x07, 0xD0, 0x1E, 0x40,</div><div class='add'>+0x7B, 0x00, 0xE1, 0x83, 0xB4, 0x07, 0xC0, 0xDE, 0x08, 0x7B, 0x01, 0xAD, 0x01,</div><div class='add'>+0xB4, 0x07, 0x10, 0x1F, 0x40, 0x7A, 0x92, 0xED, 0x43, 0x84, 0x06, 0xD0, 0x1E,</div><div class='add'>+0x40, 0x13, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x20, 0x33, 0x00,</div><div class='add'>+0x8D, 0x40, 0x14, 0x02, 0xD0, 0x3D, 0x41, 0x23, 0x00, 0xC1, 0x00, 0x04, 0x06,</div><div class='add'>+0xD0, 0x1C, 0x40, 0x30, 0x00, 0xC1, 0x00, 0x74, 0x03, 0xD0, 0xEC, 0x60, 0x23,</div><div class='add'>+0x00, 0xC1, 0x07, 0x34, 0x03, 0x91, 0x1C, 0x40, 0xA3, 0x09, 0x8D, 0x00, 0x34,</div><div class='add'>+0x1F, 0x10, 0x3C, 0x44, 0x30, 0x00, 0x8D, 0x00, 0x14, 0x02, 0xD0, 0x0C, 0x40,</div><div class='add'>+0x5B, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x17, 0xA0, 0x11, 0x10, 0x6F,</div><div class='add'>+0x00, 0xBC, 0x21, 0xF0, 0x07, 0xC1, 0x1F, 0x40, 0x53, 0x00, 0x5C, 0x01, 0x72,</div><div class='add'>+0x17, 0xC2, 0x15, 0x00, 0x52, 0x00, 0x7C, 0x01, 0xF0, 0x37, 0xC0, 0x17, 0x00,</div><div class='add'>+0x73, 0x23, 0x7C, 0x01, 0xF2, 0x15, 0xC3, 0x9F, 0x01, 0x7F, 0x05, 0xFC, 0x1D,</div><div class='add'>+0x34, 0x17, 0xC5, 0x16, 0x00, 0x7F, 0x40, 0xCC, 0x81, 0xE0, 0x05, 0xC0, 0x5F,</div><div class='add'>+0x20, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x87, 0x20, 0x1F, 0x04,</div><div class='add'>+0x5C, 0x00, 0xF0, 0x01, 0xC0, 0x07, 0x02, 0x1F, 0x08, 0x7C, 0x00, 0xF0, 0x01,</div><div class='add'>+0xC0, 0x07, 0x00, 0x1F, 0x00, 0x7C, 0x00, 0xF0, 0x00, 0xC8, 0x07, 0x42, 0x1F,</div><div class='add'>+0x02, 0x3C, 0x00, 0xB0, 0x01, 0xC2, 0x03, 0x00, 0x1F, 0x00, 0x3C, 0x00, 0x70,</div><div class='add'>+0x01, 0xC0, 0x07, 0x00, 0x1B, 0x20, 0x7C, 0x00, 0xF0, 0x01, 0xC0, 0x4B, 0x00,</div><div class='add'>+0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x27, 0x01, 0x9B, 0x01, 0x4C,</div><div class='add'>+0x22, 0x30, 0x09, 0xC0, 0x24, 0x00, 0x9F, 0x01, 0x4C, 0x02, 0xF0, 0x09, 0xD0,</div><div class='add'>+0x61, 0x00, 0x96, 0x04, 0x7C, 0x02, 0x70, 0x09, 0xC2, 0x24, 0x00, 0x9F, 0x00,</div><div class='add'>+0x5C, 0x02, 0x78, 0x89, 0xC0, 0x27, 0x00, 0x93, 0x00, 0x7C, 0x02, 0x30, 0x49,</div><div class='add'>+0xC9, 0x27, 0x00, 0x9F, 0x00, 0x4C, 0x02, 0x30, 0x09, 0xC0, 0x43, 0x20, 0x04,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x20, 0xEE, 0x00, 0x91, 0x89, 0xC4, 0x06,</div><div class='add'>+0x10, 0x09, 0x40, 0x6C, 0x00, 0xAD, 0x03, 0x44, 0x02, 0xD0, 0x0B, 0x42, 0x64,</div><div class='add'>+0x00, 0xB1, 0x07, 0x74, 0x02, 0x10, 0x09, 0x40, 0xA4, 0x82, 0x8D, 0x02, 0x44,</div><div class='add'>+0x02, 0x10, 0x0B, 0x48, 0x2F, 0x00, 0x91, 0x40, 0x74, 0x02, 0xB0, 0x79, 0x40,</div><div class='add'>+0x27, 0x00, 0x87, 0x00, 0x2C, 0x02, 0x50, 0x09, 0x40, 0x07, 0x00, 0x08, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x18, 0xA0, 0x24, 0x04, 0x91, 0x00, 0x44, 0x02, 0x16,</div><div class='add'>+0x0D, 0x60, 0x24, 0x01, 0x9D, 0x0A, 0x40, 0x02, 0xD0, 0x08, 0x40, 0x24, 0x02,</div><div class='add'>+0x9D, 0x00, 0x74, 0x02, 0x50, 0x09, 0x40, 0xA4, 0x20, 0x9D, 0x18, 0x54, 0x02,</div><div class='add'>+0x50, 0x09, 0x41, 0x27, 0x00, 0x91, 0x00, 0x64, 0x02, 0x00, 0x09, 0x40, 0x27,</div><div class='add'>+0x00, 0x98, 0x00, 0x44, 0x02, 0x10, 0x09, 0x40, 0x73, 0x00, 0x02, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x10, 0x20, 0x20, 0x00, 0x81, 0x00, 0x04, 0x02, 0x10, 0x88,</div><div class='add'>+0x40, 0x20, 0x00, 0x8D, 0x00, 0x04, 0x0A, 0xD0, 0x28, 0x40, 0x20, 0x00, 0x89,</div><div class='add'>+0x00, 0x34, 0x22, 0x50, 0x88, 0x40, 0x20, 0x02, 0x8D, 0x40, 0x00, 0x0A, 0x10,</div><div class='add'>+0x08, 0x48, 0x23, 0x40, 0x81, 0x00, 0x34, 0x22, 0x98, 0x08, 0x40, 0x23, 0x20,</div><div class='add'>+0x95, 0xC2, 0x64, 0x0A, 0x10, 0x08, 0x40, 0x53, 0xA0, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x1D, 0xB0, 0x46, 0x40, 0x13, 0x00, 0x4C, 0x04, 0x32, 0x21, 0xD0,</div><div class='add'>+0x44, 0x00, 0x1F, 0x01, 0x4D, 0x00, 0xF0, 0x11, 0xC0, 0x05, 0x15, 0x1F, 0x01,</div><div class='add'>+0x7C, 0x08, 0x70, 0x61, 0xD1, 0x80, 0x00, 0x1D, 0x00, 0x5C, 0x50, 0x50, 0x11,</div><div class='add'>+0x40, 0x47, 0x00, 0x53, 0x40, 0x6C, 0x58, 0x30, 0x01, 0xC0, 0x07, 0x05, 0x0F,</div><div class='add'>+0x00, 0x4D, 0x00, 0x34, 0x01, 0xC4, 0x77, 0xC0, 0x0A, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x19, 0xB8, 0xAF, 0x08, 0xBF, 0x00, 0xFD, 0x0A, 0xF0, 0x4B, 0xC0, 0xAF,</div><div class='add'>+0x00, 0xBF, 0x02, 0xFC, 0x06, 0xF0, 0x3B, 0xC0, 0x27, 0x00, 0xB3, 0x02, 0x7C,</div><div class='add'>+0x12, 0xB1, 0x4B, 0x80, 0x2F, 0x01, 0xBF, 0x00, 0x7C, 0x06, 0xF0, 0x2B, 0xC0,</div><div class='add'>+0xAF, 0x08, 0xBF, 0x00, 0xF8, 0x12, 0xF2, 0x0A, 0xC4, 0x27, 0x00, 0xB7, 0x01,</div><div class='add'>+0xDC, 0x06, 0xF0, 0x09, 0xC0, 0x67, 0x20, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x18, 0xA0, 0x6F, 0x00, 0xBF, 0x40, 0xC4, 0x56, 0xF0, 0x09, 0xC0, 0x6F, 0x01,</div><div class='add'>+0xBF, 0x41, 0x7C, 0x02, 0x30, 0x79, 0xC0, 0x2C, 0x00, 0xFF, 0x31, 0x4C, 0x22,</div><div class='add'>+0xF0, 0x49, 0xC0, 0x2C, 0x00, 0xB3, 0x00, 0xFC, 0x02, 0xB0, 0x5B, 0xC1, 0x6D,</div><div class='add'>+0x14, 0xB3, 0x60, 0x4C, 0x52, 0x32, 0x0B, 0xC0, 0x27, 0x28, 0x9F, 0x02, 0x7C,</div><div class='add'>+0x0A, 0xF0, 0x0B, 0xC6, 0x63, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1C,</div><div class='add'>+0x08, 0x07, 0x00, 0x1D, 0x00, 0x44, 0x08, 0xD0, 0x01, 0x43, 0x97, 0x00, 0x1D,</div><div class='add'>+0x02, 0x34, 0x54, 0x52, 0x75, 0x50, 0x84, 0x00, 0x1D, 0x02, 0x54, 0x00, 0x90,</div><div class='add'>+0x41, 0x11, 0x04, 0x41, 0x11, 0x00, 0x74, 0x9C, 0x10, 0x21, 0x40, 0x84, 0x00,</div><div class='add'>+0x51, 0x00, 0x54, 0x11, 0x50, 0x05, 0x00, 0x87, 0x10, 0x1D, 0x01, 0x74, 0x04,</div><div class='add'>+0xD0, 0x01, 0x40, 0x73, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0xA0,</div><div class='add'>+0xA3, 0x80, 0xDD, 0x00, 0x14, 0x02, 0xD0, 0x08, 0x40, 0xB3, 0x30, 0x8C, 0x02,</div><div class='add'>+0x34, 0x02, 0x10, 0xC8, 0x40, 0x22, 0x02, 0x8D, 0x00, 0x04, 0x02, 0x50, 0xC8,</div><div class='add'>+0x40, 0x20, 0x25, 0x80, 0x00, 0x34, 0x62, 0x92, 0x08, 0x60, 0x23, 0x00, 0x95,</div><div class='add'>+0x00, 0x14, 0x52, 0xD0, 0x08, 0x42, 0x23, 0x82, 0x8D, 0x00, 0x34, 0x02, 0xD0,</div><div class='add'>+0x08, 0x40, 0x4B, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0xA8, 0x25,</div><div class='add'>+0x00, 0x9D, 0x22, 0x54, 0x02, 0xD0, 0x69, 0x42, 0x27, 0x00, 0x9D, 0x00, 0x34,</div><div class='add'>+0x02, 0x50, 0x09, 0x40, 0x26, 0x80, 0x9D, 0x00, 0x54, 0x82, 0x90, 0x08, 0x41,</div><div class='add'>+0x20, 0x00, 0x91, 0x24, 0x76, 0x02, 0x10, 0x09, 0x40, 0x24, 0x02, 0xD5, 0x48,</div><div class='add'>+0x14, 0x02, 0x50, 0x09, 0x42, 0x27, 0x00, 0x9D, 0x00, 0x74, 0x1A, 0xD0, 0x09,</div><div class='add'>+0x40, 0x63, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0xA8, 0x27, 0x00,</div><div class='add'>+0x8F, 0x82, 0x5D, 0x82, 0xF0, 0x09, 0xC0, 0x27, 0x02, 0x9F, 0x00, 0xFC, 0x02,</div><div class='add'>+0x30, 0xAB, 0xC0, 0x26, 0x10, 0x9F, 0x00, 0x4C, 0x02, 0xF0, 0x29, 0xC0, 0x24,</div><div class='add'>+0x00, 0x93, 0x04, 0xFC, 0x02, 0xB0, 0x18, 0xC8, 0x27, 0x40, 0x87, 0x00, 0x5C,</div><div class='add'>+0x0A, 0x60, 0x29, 0xC0, 0x27, 0x00, 0xBF, 0x24, 0xFC, 0x02, 0xF0, 0x09, 0xC0,</div><div class='add'>+0x17, 0xA0, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16, 0x80, 0x25, 0x00, 0x9F,</div><div class='add'>+0x00, 0x6C, 0x0E, 0xF0, 0x19, 0xC0, 0x27, 0x00, 0x9E, 0x09, 0x7C, 0x0E, 0xF0,</div><div class='add'>+0x08, 0xC0, 0x25, 0x80, 0x8F, 0x00, 0x7C, 0x02, 0xF0, 0x09, 0xC2, 0xA7, 0x14,</div><div class='add'>+0x9F, 0x20, 0x3C, 0x02, 0x70, 0x59, 0xCA, 0x27, 0x08, 0x9B, 0x11, 0x7C, 0x02,</div><div class='add'>+0xF8, 0x49, 0xC0, 0x27, 0x80, 0x9F, 0x00, 0x7C, 0x02, 0xF2, 0x09, 0xC0, 0x4B,</div><div class='add'>+0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x08, 0x05, 0x00, 0x1F, 0x00,</div><div class='add'>+0x7C, 0x00, 0xB0, 0x01, 0xC0, 0x87, 0x00, 0x1B, 0x10, 0x7C, 0x00, 0x30, 0x21,</div><div class='add'>+0xD0, 0x04, 0x02, 0x1F, 0x08, 0x4D, 0x00, 0xF0, 0x01, 0xE0, 0x04, 0x00, 0x17,</div><div class='add'>+0x10, 0x4C, 0x00, 0xF0, 0x41, 0xC0, 0x02, 0x40, 0x13, 0x02, 0x4C, 0x08, 0xF2,</div><div class='add'>+0x01, 0xC0, 0x05, 0x00, 0x1F, 0x00, 0x7C, 0x00, 0xF0, 0x01, 0xC0, 0x43, 0x20,</div><div class='add'>+0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0xA0, 0x1C, 0x00, 0x5D, 0x00, 0x70,</div><div class='add'>+0x01, 0x18, 0x05, 0x48, 0x17, 0x00, 0x7C, 0x03, 0x74, 0x01, 0x10, 0x05, 0x50,</div><div class='add'>+0x54, 0x00, 0x7C, 0x03, 0x44, 0x01, 0xD0, 0x05, 0x40, 0x9C, 0x01, 0x7D, 0x41,</div><div class='add'>+0x7C, 0x11, 0x70, 0x07, 0xC0, 0xDE, 0x01, 0x70, 0x03, 0x68, 0x01, 0x10, 0x37,</div><div class='add'>+0x05, 0x14, 0x80, 0x5D, 0x00, 0x74, 0x01, 0xC0, 0x45, 0x40, 0x53, 0x00, 0x02,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0xA0, 0x22, 0x20, 0x8D, 0x00, 0x30, 0x06,</div><div class='add'>+0x10, 0x0C, 0x40, 0x23, 0x10, 0x8C, 0x08, 0x36, 0x03, 0x10, 0x0C, 0x40, 0x30,</div><div class='add'>+0x00, 0x8D, 0x13, 0x24, 0x03, 0xC0, 0x0C, 0x40, 0xB0, 0x00, 0xCD, 0x00, 0x24,</div><div class='add'>+0x03, 0x50, 0x38, 0x40, 0x20, 0x29, 0xC0, 0x0A, 0x04, 0x03, 0x90, 0x38, 0x01,</div><div class='add'>+0x31, 0x00, 0xCD, 0x80, 0x36, 0x03, 0xC0, 0x0C, 0x40, 0x53, 0x00, 0x0A, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x05, 0x80, 0x38, 0x00, 0xED, 0x40, 0xB4, 0x0F, 0x10,</div><div class='add'>+0x0E, 0x48, 0x3B, 0x00, 0xAD, 0x00, 0xB4, 0x23, 0x10, 0x4C, 0x40, 0x28, 0x00,</div><div class='add'>+0xAD, 0x00, 0xA4, 0x03, 0xD0, 0x4E, 0x60, 0x38, 0x80, 0xFD, 0x03, 0xA4, 0x23,</div><div class='add'>+0x50, 0x28, 0x40, 0x3A, 0x00, 0xF1, 0x00, 0x26, 0x23, 0x10, 0x1B, 0x40, 0x38,</div><div class='add'>+0x00, 0xED, 0x04, 0xB4, 0x13, 0x90, 0x0E, 0x40, 0x07, 0x20, 0x02, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x15, 0x10, 0x68, 0x00, 0xEF, 0x01, 0x3C, 0x07, 0x34, 0x3E,</div><div class='add'>+0xC0, 0x7B, 0x00, 0xAF, 0x81, 0xBC, 0x07, 0x34, 0x7E, 0x40, 0x78, 0x00, 0xAD,</div><div class='add'>+0x01, 0xA4, 0x1F, 0xF9, 0xBF, 0x40, 0x48, 0x00, 0xE7, 0x01, 0xAC, 0x17, 0x70,</div><div class='add'>+0x16, 0xE0, 0x68, 0x00, 0xE3, 0x01, 0x8C, 0x57, 0xB0, 0x1E, 0xE0, 0x79, 0x00,</div><div class='add'>+0xED, 0x03, 0xBE, 0x0F, 0xF0, 0x1E, 0xC4, 0x47, 0x40, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x10, 0xB8, 0x25, 0x20, 0xDF, 0x00, 0x7C, 0x03, 0xF1, 0x0D, 0x44,</div><div class='add'>+0x37, 0x00, 0x9F, 0x00, 0x7C, 0x03, 0xD0, 0x0D, 0x40, 0x27, 0x10, 0x8F, 0x00,</div><div class='add'>+0x5C, 0x4B, 0xF0, 0x6D, 0xD0, 0x07, 0x00, 0x0F, 0x00, 0x7C, 0x83, 0x70, 0x05,</div><div class='add'>+0xC0, 0x33, 0x08, 0xCF, 0x00, 0x7C, 0x0B, 0x71, 0x0C, 0xC0, 0x37, 0x10, 0xDF,</div><div class='add'>+0x00, 0x74, 0x03, 0xF0, 0x0D, 0xC0, 0x43, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0xA0, 0x6F, 0x00, 0xF3, 0x09, 0xFC, 0x83, 0x30, 0x9F, 0xC0, 0x7F,</div><div class='add'>+0x02, 0xF3, 0x01, 0xFC, 0x07, 0xF0, 0x1E, 0x80, 0x7D, 0x00, 0xBF, 0x01, 0xFC,</div><div class='add'>+0x27, 0x30, 0x1F, 0xC0, 0x7E, 0x22, 0xFF, 0x01, 0xFC, 0x06, 0xF0, 0x1F, 0xC0,</div><div class='add'>+0x6C, 0x00, 0xFF, 0x01, 0xFC, 0x07, 0xB0, 0x1B, 0xC0, 0x7F, 0x02, 0xEF, 0x09,</div><div class='add'>+0x8C, 0x07, 0x30, 0x1F, 0xC0, 0x03, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x15, 0x88, 0x39, 0x00, 0xE1, 0x80, 0xB0, 0x53, 0xB4, 0x0E, 0x46, 0x3B, 0x02,</div><div class='add'>+0xE1, 0x80, 0xB4, 0x03, 0x70, 0x4E, 0x48, 0x39, 0x00, 0xAD, 0x04, 0xB4, 0x03,</div><div class='add'>+0x10, 0x0E, 0x41, 0x38, 0x00, 0xED, 0x06, 0xB4, 0x02, 0x90, 0x0E, 0xC4, 0x39,</div><div class='add'>+0x00, 0x2F, 0x00, 0xF4, 0x83, 0x10, 0x4A, 0x00, 0x3B, 0x08, 0xED, 0x20, 0xAC,</div><div class='add'>+0x03, 0xF0, 0x0E, 0x40, 0x57, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x29, 0x04, 0xE1, 0x00, 0x30, 0x33, 0x18, 0x0E, 0x60, 0x33, 0xC0, 0xE9,</div><div class='add'>+0x10, 0xB4, 0x27, 0xD0, 0x1F, 0x72, 0x3B, 0x00, 0xAD, 0x80, 0xB4, 0x03, 0x98,</div><div class='add'>+0x0C, 0x40, 0x29, 0x20, 0xEC, 0x10, 0xA4, 0x02, 0xD0, 0x0E, 0x40, 0x2A, 0x00,</div><div class='add'>+0xED, 0x00, 0xB4, 0x03, 0x50, 0x0E, 0x48, 0x3B, 0xA0, 0xFD, 0x11, 0xC4, 0x07,</div><div class='add'>+0x10, 0x0E, 0x40, 0x03, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x28,</div><div class='add'>+0x63, 0x00, 0xC1, 0x20, 0x34, 0x8B, 0x90, 0x1C, 0x40, 0xB3, 0x01, 0x49, 0x20,</div><div class='add'>+0x34, 0x07, 0x50, 0x2C, 0x40, 0x31, 0x00, 0x8D, 0x01, 0x34, 0x03, 0x94, 0x1C,</div><div class='add'>+0x64, 0x61, 0x00, 0x0D, 0x13, 0x74, 0x82, 0x90, 0x9C, 0x40, 0xF1, 0x00, 0x05,</div><div class='add'>+0x03, 0x34, 0x03, 0x11, 0x1C, 0x40, 0x33, 0x10, 0xCD, 0x03, 0x04, 0x0B, 0x58,</div><div class='add'>+0x0C, 0x40, 0x13, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x88, 0x65,</div><div class='add'>+0x00, 0xC3, 0x04, 0x7C, 0x07, 0x10, 0x1F, 0x40, 0x37, 0x04, 0x8B, 0x01, 0x74,</div><div class='add'>+0x03, 0xF0, 0x0D, 0xD0, 0x37, 0x00, 0xDF, 0x11, 0xFC, 0x03, 0xB0, 0x2F, 0xC0,</div><div class='add'>+0x35, 0x11, 0x5F, 0x03, 0x7C, 0x03, 0xF0, 0x09, 0xC0, 0xA6, 0x08, 0x9D, 0x04,</div><div class='add'>+0xFC, 0x17, 0x54, 0x68, 0xC0, 0x37, 0x00, 0xDF, 0xC3, 0x45, 0x13, 0x15, 0x0D,</div><div class='add'>+0xC0, 0x57, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x37, 0x40,</div><div class='add'>+0xDF, 0x00, 0x7C, 0x13, 0x70, 0x8D, 0xC0, 0x37, 0x00, 0x97, 0x00, 0x7C, 0x23,</div><div class='add'>+0xF0, 0x4D, 0xD0, 0x27, 0x00, 0xDF, 0x02, 0x7C, 0x03, 0x70, 0x0D, 0x00, 0xB4,</div><div class='add'>+0x08, 0x5F, 0x80, 0x7C, 0x02, 0xB2, 0x09, 0xC0, 0x27, 0x06, 0x9F, 0x02, 0x3C,</div><div class='add'>+0x03, 0x50, 0x09, 0xC0, 0x33, 0x00, 0xDE, 0x00, 0x7C, 0x03, 0xB0, 0x0D, 0xC0,</div><div class='add'>+0x07, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x08, 0x27, 0x00, 0xFF,</div><div class='add'>+0x90, 0xCD, 0x03, 0xF1, 0x0F, 0xC1, 0x3E, 0x00, 0xBF, 0x01, 0xCE, 0x03, 0x32,</div><div class='add'>+0x0F, 0xE0, 0x2C, 0x00, 0xBF, 0x01, 0xFC, 0x03, 0xF0, 0x0F, 0xC1, 0x5F, 0x00,</div><div class='add'>+0x7F, 0x01, 0xFC, 0x23, 0x38, 0x05, 0xE0, 0x2C, 0x01, 0x38, 0x90, 0xFC, 0x03,</div><div class='add'>+0x30, 0x4B, 0xDD, 0x3D, 0x00, 0xF3, 0x10, 0xCC, 0x43, 0x78, 0x9F, 0xC0, 0x13,</div><div class='add'>+0x02, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x20, 0x56, 0x00, 0xDD, 0x49,</div><div class='add'>+0x44, 0x03, 0x70, 0x0C, 0x40, 0x74, 0x08, 0x9D, 0x00, 0x04, 0x03, 0xB0, 0x0D,</div><div class='add'>+0xC0, 0x66, 0x80, 0x9D, 0x00, 0x74, 0x03, 0xD0, 0x0D, 0xC0, 0x15, 0x03, 0x1D,</div><div class='add'>+0x23, 0x5C, 0x02, 0xB0, 0x04, 0x44, 0x25, 0x00, 0x1D, 0x41, 0x74, 0x03, 0x70,</div><div class='add'>+0x09, 0x40, 0x34, 0x00, 0xD3, 0x00, 0x7C, 0x03, 0xD0, 0x1D, 0x40, 0x17, 0x02,</div><div class='add'>+0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xA0, 0xA4, 0x01, 0xDD, 0x00, 0x44,</div><div class='add'>+0x07, 0xD0, 0x0D, 0x60, 0x36, 0x02, 0x9D, 0x04, 0x44, 0x03, 0x10, 0x0C, 0x48,</div><div class='add'>+0x34, 0x02, 0xDD, 0x06, 0x74, 0x03, 0xD0, 0x0D, 0x60, 0x07, 0x00, 0x9D, 0x44,</div><div class='add'>+0x74, 0x03, 0x93, 0x0D, 0x40, 0xA4, 0x00, 0x9D, 0x01, 0x74, 0x03, 0x10, 0x29,</div><div class='add'>+0x40, 0x34, 0x00, 0xC0, 0x00, 0x44, 0x03, 0xD0, 0x0D, 0x40, 0x07, 0x20, 0x02,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x20, 0x30, 0x00, 0xDD, 0x20, 0x04, 0x03,</div><div class='add'>+0xD0, 0x0D, 0x40, 0x30, 0x80, 0x8D, 0x00, 0x45, 0x03, 0x99, 0x0C, 0x40, 0x30,</div><div class='add'>+0x80, 0xCD, 0x00, 0x34, 0x03, 0xD0, 0x0C, 0x40, 0x01, 0x00, 0x8D, 0x00, 0x10,</div><div class='add'>+0x02, 0x90, 0x0C, 0x60, 0x11, 0x00, 0x0D, 0x00, 0x34, 0x03, 0x50, 0x08, 0x40,</div><div class='add'>+0x30, 0x40, 0xC1, 0x00, 0x24, 0x03, 0xD0, 0x08, 0x40, 0x43, 0xA1, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0xB0, 0x26, 0x00, 0xDD, 0x00, 0x44, 0x03, 0xF8,</div><div class='add'>+0x0D, 0xC0, 0x36, 0x00, 0xDF, 0x40, 0xC6, 0x03, 0x32, 0x0F, 0x50, 0x24, 0x20,</div><div class='add'>+0x5D, 0x00, 0xBC, 0x03, 0xF0, 0x0F, 0xC0, 0x07, 0x00, 0x9D, 0x00, 0x78, 0x03,</div><div class='add'>+0x90, 0x0D, 0x40, 0x24, 0x08, 0x1F, 0x00, 0xFC, 0x03, 0x31, 0x05, 0xC0, 0x35,</div><div class='add'>+0x00, 0xF3, 0x00, 0xCC, 0x03, 0xF0, 0x0D, 0xC0, 0x03, 0xC4, 0x0A, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x05, 0xB8, 0x1F, 0x20, 0xFF, 0x00, 0xFC, 0x03, 0x7A, 0x0F,</div><div class='add'>+0xC0, 0x3F, 0x00, 0x7C, 0x00, 0xFC, 0x03, 0xF3, 0x0F, 0xC0, 0x2F, 0x00, 0x7F,</div><div class='add'>+0x00, 0xFC, 0x83, 0xF1, 0x0F, 0x80, 0x0D, 0x00, 0x3E, 0x00, 0xDC, 0x82, 0xF0,</div><div class='add'>+0x0F, 0xC0, 0x1F, 0x00, 0x3F, 0x00, 0xFC, 0x03, 0x70, 0x07, 0x40, 0x3F, 0x00,</div><div class='add'>+0xF7, 0x00, 0xFC, 0x03, 0xF8, 0x0B, 0xC0, 0x17, 0x20, 0x0E, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x03, 0x80, 0x5F, 0x00, 0x33, 0x8C, 0xCC, 0x10, 0x30, 0x1F, 0xC0,</div><div class='add'>+0x2F, 0x00, 0x33, 0x00, 0xCC, 0x02, 0x30, 0x1F, 0xE0, 0x7F, 0x00, 0xBB, 0x01,</div><div class='add'>+0xF4, 0x07, 0x70, 0x0B, 0xC0, 0x7C, 0x05, 0xFF, 0x42, 0xFC, 0x32, 0xF0, 0x4F,</div><div class='add'>+0xC8, 0x3F, 0x01, 0xFF, 0x01, 0xFC, 0x0C, 0x30, 0x4F, 0xC0, 0x4E, 0x00, 0xB3,</div><div class='add'>+0x00, 0x7C, 0x73, 0xF0, 0x4F, 0xC0, 0x0F, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x01, 0x08, 0x77, 0x00, 0x11, 0x0E, 0x6C, 0x24, 0x30, 0x1D, 0x40, 0x23,</div><div class='add'>+0x00, 0x51, 0x03, 0x14, 0x02, 0x50, 0x4D, 0x49, 0x33, 0x10, 0xC1, 0x10, 0x74,</div><div class='add'>+0x04, 0x10, 0xB9, 0xE0, 0xFE, 0x00, 0xFD, 0x0A, 0x74, 0x22, 0xD0, 0xBF, 0x40,</div><div class='add'>+0x3F, 0x0B, 0xCD, 0x00, 0x74, 0x00, 0x50, 0x3D, 0x40, 0x44, 0x00, 0x91, 0x0B,</div><div class='add'>+0xF4, 0x03, 0xD1, 0x1F, 0x40, 0x07, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x11, 0xA0, 0x27, 0x00, 0x41, 0x00, 0x05, 0x00, 0x10, 0x0C, 0x40, 0x23, 0x00,</div><div class='add'>+0x81, 0x02, 0x04, 0x03, 0x10, 0x4C, 0x40, 0x33, 0x00, 0xC9, 0x00, 0x74, 0x03,</div><div class='add'>+0x54, 0x04, 0x50, 0x32, 0x20, 0xC5, 0x84, 0x34, 0x12, 0xD0, 0x0C, 0x40, 0x31,</div><div class='add'>+0x04, 0xCD, 0x00, 0x54, 0x11, 0x10, 0x2C, 0x48, 0x46, 0x80, 0xC1, 0x00, 0x14,</div><div class='add'>+0x13, 0xD0, 0x2C, 0x40, 0x47, 0x80, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03,</div><div class='add'>+0xA8, 0x25, 0x02, 0x51, 0x00, 0x44, 0x08, 0x10, 0x0D, 0x40, 0x27, 0x02, 0x51,</div><div class='add'>+0x00, 0x54, 0x03, 0x50, 0x0D, 0x48, 0x37, 0x00, 0xD9, 0x03, 0x74, 0x18, 0x14,</div><div class='add'>+0x15, 0x50, 0x36, 0x00, 0xD9, 0x00, 0x70, 0x22, 0xD0, 0x0D, 0x40, 0x37, 0x20,</div><div class='add'>+0xDD, 0x00, 0x74, 0x09, 0x50, 0x0D, 0x40, 0x46, 0x40, 0xD1, 0x11, 0x74, 0x03,</div><div class='add'>+0xD1, 0x0D, 0x40, 0x0F, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA8,</div><div class='add'>+0x53, 0x01, 0x13, 0x10, 0x44, 0x0C, 0x30, 0x0D, 0xC0, 0x27, 0x40, 0x13, 0x80,</div><div class='add'>+0x44, 0x06, 0x34, 0x0D, 0x40, 0x37, 0x00, 0xDB, 0x01, 0x3C, 0x09, 0x70, 0x31,</div><div class='add'>+0x40, 0x36, 0x30, 0xDF, 0x00, 0x78, 0x02, 0xF0, 0x0D, 0xC0, 0x37, 0x00, 0xDF,</div><div class='add'>+0x00, 0x7C, 0x0C, 0x30, 0x0D, 0xC0, 0x42, 0x10, 0xD3, 0x01, 0x7C, 0x03, 0xF1,</div><div class='add'>+0x0D, 0xC0, 0x03, 0x20, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x80, 0x7D,</div><div class='add'>+0x50, 0xEF, 0x10, 0xBC, 0x22, 0x70, 0x0F, 0xC0, 0x2B, 0x00, 0x9F, 0x00, 0xB8,</div><div class='add'>+0x26, 0xB0, 0x0F, 0x88, 0x3F, 0x00, 0xF7, 0x00, 0xFC, 0x00, 0xF0, 0x03, 0xC0,</div><div class='add'>+0x3F, 0x00, 0xFF, 0x20, 0xF8, 0x06, 0xF0, 0x0F, 0xC0, 0x3F, 0x00, 0xFF, 0x10,</div><div class='add'>+0xFC, 0x24, 0xF0, 0x0E, 0xC0, 0x0D, 0x28, 0xFF, 0x00, 0xFC, 0x03, 0xF0, 0x0F,</div><div class='add'>+0xC0, 0x1F, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x08, 0x25, 0x08,</div><div class='add'>+0x1F, 0x00, 0x6C, 0x29, 0x30, 0x0D, 0xC0, 0x27, 0x01, 0xC7, 0x80, 0x4C, 0x03,</div><div class='add'>+0x34, 0x0D, 0xC0, 0x34, 0x00, 0xDF, 0x02, 0x4E, 0x08, 0x22, 0x05, 0xC8, 0x34,</div><div class='add'>+0x00, 0xDF, 0x00, 0x7C, 0x03, 0xF0, 0x0D, 0xC0, 0x34, 0x00, 0xDF, 0x00, 0x6D,</div><div class='add'>+0x09, 0x70, 0x0D, 0xC0, 0x07, 0x00, 0xDF, 0x0A, 0x7C, 0x03, 0xF1, 0x0D, 0xC4,</div><div class='add'>+0x0B, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0xA0, 0x24, 0x00, 0xDD,</div><div class='add'>+0x00, 0x45, 0x03, 0x10, 0x0D, 0x40, 0xA7, 0x00, 0xD1, 0x00, 0x4D, 0x03, 0x10,</div><div class='add'>+0x0D, 0xC0, 0x76, 0x02, 0xD1, 0x00, 0x45, 0x01, 0xB0, 0x04, 0xC1, 0x3E, 0x00,</div><div class='add'>+0xFD, 0x00, 0x7C, 0x03, 0xC1, 0x1F, 0xC1, 0x3E, 0x00, 0xDD, 0x00, 0x04, 0x01,</div><div class='add'>+0x10, 0x0F, 0xC0, 0x45, 0x00, 0xDD, 0x41, 0xF4, 0x83, 0xD0, 0x5F, 0x40, 0x4F,</div><div class='add'>+0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xA0, 0x22, 0x00, 0x8D, 0x01,</div><div class='add'>+0x04, 0x07, 0x10, 0x0C, 0x40, 0x32, 0x00, 0x05, 0x00, 0x04, 0x03, 0xD0, 0x0C,</div><div class='add'>+0x40, 0xF4, 0x00, 0xC5, 0x00, 0x04, 0x06, 0x18, 0x08, 0x40, 0x70, 0x00, 0xCD,</div><div class='add'>+0x80, 0x34, 0x03, 0xC0, 0x1C, 0x40, 0x30, 0x08, 0xCD, 0xC0, 0x04, 0x01, 0x50,</div><div class='add'>+0x0C, 0x40, 0x53, 0x00, 0xCD, 0x00, 0x14, 0x03, 0xD0, 0x0C, 0x40, 0x1F, 0x00,</div><div class='add'>+0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x80, 0x68, 0x00, 0x2D, 0x19, 0x04,</div><div class='add'>+0x07, 0x10, 0x1E, 0x40, 0x6B, 0x00, 0x61, 0x01, 0xA4, 0x27, 0x90, 0x1E, 0x40,</div><div class='add'>+0x7A, 0x00, 0xE1, 0x01, 0xC4, 0x04, 0x99, 0x9A, 0x40, 0x7A, 0x00, 0xED, 0x81,</div><div class='add'>+0x94, 0x07, 0xD0, 0x9E, 0x40, 0x7A, 0x00, 0xED, 0x81, 0x84, 0x07, 0x10, 0x1E,</div><div class='add'>+0x40, 0x49, 0x00, 0x6D, 0x01, 0xB4, 0x27, 0xD0, 0x1E, 0x40, 0x13, 0x00, 0x02,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x10, 0x20, 0x00, 0xDF, 0x00, 0x04, 0x03,</div><div class='add'>+0x30, 0x0C, 0xC0, 0x22, 0x02, 0x85, 0x08, 0x04, 0x23, 0xF0, 0x0D, 0x40, 0x30,</div><div class='add'>+0x04, 0xC7, 0x08, 0x04, 0x42, 0x30, 0x00, 0xC0, 0x30, 0x04, 0xCF, 0x00, 0x34,</div><div class='add'>+0x02, 0xF0, 0x8C, 0xC0, 0x30, 0x00, 0xCF, 0x80, 0x4C, 0x01, 0x70, 0x0C, 0xC0,</div><div class='add'>+0x13, 0x84, 0xCF, 0x00, 0x1C, 0x17, 0xF0, 0x0C, 0xC0, 0x4B, 0x40, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x02, 0xB8, 0x2D, 0x00, 0x7F, 0x00, 0xDD, 0x03, 0xD0,</div><div class='add'>+0x0F, 0xC0, 0x2F, 0x80, 0x7F, 0x00, 0xDE, 0xA3, 0x70, 0x0F, 0xC8, 0x3F, 0x00,</div><div class='add'>+0xF7, 0x00, 0xBC, 0x22, 0xF0, 0x0A, 0xC0, 0x3F, 0x00, 0xFF, 0x08, 0xFC, 0x22,</div><div class='add'>+0xF0, 0xAE, 0xC2, 0x3F, 0x20, 0xFF, 0x08, 0xDC, 0x21, 0xF0, 0x0F, 0xC4, 0x0F,</div><div class='add'>+0x10, 0xFF, 0x00, 0xFC, 0x03, 0xF0, 0x2F, 0xC0, 0x0B, 0x60, 0x06, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x15, 0xA8, 0x37, 0x00, 0x9F, 0x00, 0x4C, 0x00, 0x31, 0x0D,</div><div class='add'>+0xC0, 0x3F, 0x00, 0x1F, 0x00, 0x7C, 0x07, 0x30, 0x0D, 0xC0, 0x37, 0x00, 0xDF,</div><div class='add'>+0x00, 0x7C, 0x04, 0x30, 0x15, 0xC0, 0xB5, 0x04, 0xDF, 0x07, 0x6C, 0x03, 0xF0,</div><div class='add'>+0x5D, 0xC0, 0x36, 0x05, 0xDF, 0x00, 0x7C, 0x01, 0xF0, 0x0D, 0xC0, 0x53, 0x00,</div><div class='add'>+0xD1, 0x40, 0x78, 0x17, 0x34, 0x2D, 0xC0, 0x57, 0x00, 0x0E, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x12, 0x98, 0x39, 0x00, 0xED, 0x00, 0x84, 0x02, 0x10, 0x0E, 0x40,</div><div class='add'>+0x3B, 0x90, 0xAC, 0x00, 0xB4, 0x03, 0x10, 0x0E, 0x40, 0x3B, 0x10, 0xED, 0x20,</div><div class='add'>+0xB4, 0x00, 0x50, 0x0E, 0x40, 0x38, 0x01, 0xCD, 0x12, 0x84, 0x03, 0xD0, 0x0E,</div><div class='add'>+0x40, 0xB8, 0x00, 0xE7, 0x00, 0x9C, 0x03, 0xD0, 0x6E, 0x40, 0x0B, 0x00, 0xE1,</div><div class='add'>+0x00, 0xF4, 0x2B, 0x10, 0x0E, 0x40, 0x4B, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x03, 0x00, 0xE9, 0x00, 0x8D, 0x03, 0x24, 0x05, 0x94, 0x1E, 0x40, 0x7B,</div><div class='add'>+0x10, 0xEC, 0x03, 0xB4, 0x07, 0x90, 0x1E, 0x40, 0x7B, 0x20, 0xED, 0x01, 0xF6,</div><div class='add'>+0x07, 0x10, 0x14, 0x41, 0x79, 0x02, 0xED, 0x05, 0x84, 0x07, 0x50, 0xDC, 0x40,</div><div class='add'>+0x7A, 0x00, 0xED, 0x01, 0x96, 0x05, 0xD0, 0x1E, 0x40, 0x5B, 0x80, 0xE1, 0x41,</div><div class='add'>+0xB4, 0x17, 0x10, 0x9E, 0x40, 0x0F, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x12, 0x20, 0x63, 0x00, 0xCD, 0x00, 0x05, 0x13, 0x90, 0x0C, 0x40, 0x33, 0x02,</div><div class='add'>+0xC9, 0x00, 0x34, 0x03, 0x90, 0x0C, 0x42, 0x33, 0x00, 0x4C, 0x08, 0x34, 0x0B,</div><div class='add'>+0x50, 0x3C, 0x40, 0x30, 0x00, 0xCC, 0x00, 0x04, 0x07, 0xD1, 0x0C, 0x40, 0x32,</div><div class='add'>+0x20, 0xC5, 0x00, 0x54, 0x0B, 0xD0, 0x0C, 0x44, 0x23, 0x00, 0xC1, 0x07, 0x34,</div><div class='add'>+0x03, 0x10, 0x0C, 0x40, 0x4B, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x17,</div><div class='add'>+0xA8, 0x1D, 0x00, 0x7F, 0x0A, 0xEC, 0x1D, 0xB0, 0x05, 0x40, 0x57, 0x00, 0x7F,</div><div class='add'>+0x0A, 0x7C, 0x01, 0xB4, 0x05, 0xC0, 0x17, 0x10, 0x7D, 0x02, 0xFC, 0x21, 0x30,</div><div class='add'>+0x27, 0xC0, 0x15, 0x10, 0x5F, 0x00, 0x4C, 0x15, 0xF0, 0x05, 0xC0, 0x16, 0x80,</div><div class='add'>+0x5F, 0xC0, 0xDC, 0x01, 0xF1, 0x05, 0xC0, 0x1F, 0x02, 0x73, 0x02, 0x74, 0x01,</div><div class='add'>+0x30, 0x05, 0xC0, 0x5F, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00,</div><div class='add'>+0x07, 0x00, 0x0F, 0x02, 0x3C, 0x00, 0x70, 0x01, 0xC8, 0x07, 0x00, 0x1F, 0x00,</div><div class='add'>+0x7C, 0x00, 0x70, 0x01, 0xC0, 0x07, 0x00, 0x1F, 0x10, 0x7C, 0x20, 0xF0, 0x41,</div><div class='add'>+0xC0, 0x03, 0x80, 0x1F, 0x00, 0x5D, 0x00, 0xF0, 0x01, 0xC0, 0x01, 0x80, 0x1F,</div><div class='add'>+0x02, 0x5C, 0x40, 0xF0, 0x01, 0xC0, 0x07, 0x40, 0x1F, 0x08, 0x7C, 0x00, 0xF0,</div><div class='add'>+0x01, 0xC0, 0x4B, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x08, 0x27,</div><div class='add'>+0x00, 0x9F, 0x00, 0x4C, 0x22, 0x34, 0x09, 0xC0, 0x23, 0x00, 0x83, 0x00, 0x4C,</div><div class='add'>+0x02, 0xF0, 0x09, 0xC0, 0x67, 0x00, 0x9F, 0x00, 0x4C, 0xA2, 0xF0, 0x09, 0xC0,</div><div class='add'>+0x67, 0x00, 0x9B, 0x80, 0x7C, 0x02, 0xD2, 0x89, 0xC0, 0x27, 0x00, 0x93, 0x84,</div><div class='add'>+0x7C, 0x02, 0xB0, 0x08, 0xC0, 0x64, 0x00, 0x8F, 0x01, 0x6C, 0x02, 0xF0, 0x09,</div><div class='add'>+0xC0, 0x43, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x20, 0x26, 0x00,</div><div class='add'>+0x9D, 0x03, 0x44, 0x06, 0x10, 0x09, 0x40, 0x27, 0x00, 0x95, 0x00, 0x6C, 0x22,</div><div class='add'>+0xD0, 0x09, 0x40, 0xA7, 0x00, 0x8D, 0x00, 0x6C, 0x06, 0xD0, 0x09, 0x40, 0x27,</div><div class='add'>+0x00, 0x91, 0x00, 0x74, 0x02, 0xD0, 0x09, 0xC4, 0x27, 0x00, 0x91, 0x03, 0x74,</div><div class='add'>+0x02, 0x50, 0x09, 0xC0, 0x66, 0x02, 0x9D, 0x09, 0x6C, 0x02, 0xD0, 0x09, 0x40,</div><div class='add'>+0x07, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0xA0, 0x24, 0x00, 0x9D,</div><div class='add'>+0x04, 0x44, 0x02, 0x19, 0x09, 0x40, 0x27, 0x00, 0x91, 0x00, 0x44, 0x02, 0x58,</div><div class='add'>+0x09, 0x40, 0x27, 0x05, 0x9D, 0x00, 0x66, 0x02, 0x52, 0x8D, 0x40, 0x27, 0x01,</div><div class='add'>+0x99, 0x00, 0x74, 0x02, 0xD0, 0x09, 0x40, 0x26, 0x00, 0x90, 0x02, 0x74, 0x02,</div><div class='add'>+0x10, 0x09, 0x40, 0x24, 0x00, 0x9D, 0xC0, 0x44, 0x82, 0xD0, 0x09, 0x40, 0x63,</div><div class='add'>+0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x20, 0xA0, 0x00, 0x8D, 0x04,</div><div class='add'>+0x04, 0x12, 0x10, 0x08, 0x40, 0x33, 0x01, 0x85, 0x04, 0x24, 0x12, 0xD0, 0x08,</div><div class='add'>+0x40, 0x23, 0x00, 0x9D, 0x00, 0x04, 0x02, 0xD0, 0x48, 0x40, 0x23, 0x01, 0x81,</div><div class='add'>+0x04, 0x34, 0x12, 0xD0, 0x08, 0x48, 0x21, 0x01, 0x81, 0x00, 0x34, 0x22, 0x50,</div><div class='add'>+0x08, 0x4A, 0x22, 0x00, 0x8D, 0x04, 0x26, 0x12, 0xD0, 0x48, 0x48, 0x43, 0x80,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xB0, 0x06, 0x00, 0x5F, 0x0A, 0x4C,</div><div class='add'>+0x00, 0x31, 0x01, 0x40, 0x87, 0x02, 0x13, 0x00, 0x0C, 0x28, 0x70, 0xA1, 0xC0,</div><div class='add'>+0x87, 0x02, 0x1F, 0x0A, 0x64, 0x00, 0x70, 0x01, 0xC4, 0x07, 0x00, 0x1B, 0x0A,</div><div class='add'>+0x74, 0x28, 0xF0, 0x41, 0x41, 0x87, 0x42, 0x13, 0x0A, 0x7C, 0x08, 0xB0, 0x41,</div><div class='add'>+0xC1, 0x04, 0x00, 0x1F, 0x00, 0x4C, 0x28, 0xF0, 0x01, 0xC0, 0x77, 0xC0, 0x0A,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x19, 0x98, 0x6F, 0x00, 0xBF, 0x28, 0xF5, 0x22,</div><div class='add'>+0xF0, 0x09, 0xC0, 0x2F, 0x02, 0xBF, 0x28, 0xFC, 0x22, 0xF0, 0x09, 0xC0, 0x27,</div><div class='add'>+0x00, 0xBE, 0x40, 0xBD, 0x02, 0xF0, 0x8B, 0xC0, 0x27, 0x02, 0x9F, 0x08, 0xFC,</div><div class='add'>+0x22, 0xF0, 0x09, 0xC2, 0x27, 0x02, 0x9F, 0x00, 0xFC, 0x12, 0xF0, 0x09, 0xC0,</div><div class='add'>+0x2F, 0x00, 0xBF, 0x08, 0x7C, 0x22, 0xF0, 0x89, 0xC0, 0x67, 0x60, 0x0E, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x18, 0x80, 0x27, 0x00, 0xBF, 0x14, 0xCC, 0x12, 0xF0,</div><div class='add'>+0x09, 0xC0, 0x2F, 0x00, 0x93, 0x00, 0xFC, 0x12, 0x70, 0x0B, 0xC0, 0x2F, 0x02,</div><div class='add'>+0x8F, 0x00, 0xBC, 0x02, 0x32, 0x0B, 0xC0, 0x2C, 0x01, 0x9F, 0x14, 0x4C, 0x32,</div><div class='add'>+0x30, 0x0B, 0xC0, 0x24, 0x00, 0xB3, 0x08, 0x4C, 0x02, 0xF2, 0x49, 0xC1, 0x2F,</div><div class='add'>+0x00, 0xBF, 0x00, 0x7C, 0x02, 0x20, 0x0B, 0xC0, 0x60, 0x00, 0x0E, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x1C, 0x08, 0x57, 0x05, 0x1D, 0x04, 0x44, 0x20, 0xD0, 0x01,</div><div class='add'>+0x48, 0x07, 0x04, 0x1B, 0x08, 0x74, 0x50, 0x10, 0x41, 0x40, 0x07, 0x81, 0x1D,</div><div class='add'>+0x50, 0x74, 0x00, 0x11, 0x81, 0xC0, 0x06, 0x00, 0x1D, 0x04, 0x45, 0x30, 0xB0,</div><div class='add'>+0x21, 0xC0, 0x06, 0x0C, 0x11, 0x00, 0x44, 0x50, 0xD0, 0x01, 0x40, 0x07, 0x00,</div><div class='add'>+0x1D, 0x02, 0x74, 0x40, 0x10, 0x01, 0xC0, 0x72, 0x20, 0x0C, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x10, 0xA0, 0x23, 0x00, 0x8D, 0x14, 0x05, 0x02, 0xD0, 0x08, 0x40,</div><div class='add'>+0x23, 0x02, 0x81, 0x01, 0x14, 0x32, 0x51, 0x48, 0x41, 0x23, 0x01, 0x8D, 0x05,</div><div class='add'>+0x74, 0x03, 0x10, 0x08, 0x40, 0x30, 0x02, 0x89, 0x14, 0x04, 0x12, 0x10, 0x88,</div><div class='add'>+0x40, 0x20, 0x42, 0x81, 0x00, 0x24, 0x12, 0x90, 0x08, 0x40, 0x23, 0x80, 0x8D,</div><div class='add'>+0x09, 0x34, 0x02, 0x14, 0x08, 0x40, 0x40, 0x80, 0x0E, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x18, 0xA8, 0x25, 0x02, 0x9D, 0x04, 0x44, 0x12, 0xD0, 0x09, 0x40, 0x27,</div><div class='add'>+0x02, 0x99, 0x00, 0x74, 0x02, 0x10, 0x09, 0x40, 0x27, 0x00, 0x9D, 0x00, 0x74,</div><div class='add'>+0x02, 0x10, 0x29, 0x40, 0x24, 0x00, 0x8D, 0x00, 0x44, 0x22, 0x94, 0x09, 0x40,</div><div class='add'>+0x26, 0x00, 0xD1, 0x00, 0x64, 0x02, 0xD0, 0x09, 0x40, 0xA7, 0x00, 0x9D, 0x08,</div><div class='add'>+0x74, 0x02, 0x11, 0x09, 0x40, 0x62, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x05, 0x08, 0x2D, 0x10, 0x9F, 0x01, 0x4C, 0x06, 0xF0, 0x09, 0x40, 0x27, 0x00,</div><div class='add'>+0x93, 0x01, 0x7C, 0x02, 0x70, 0x09, 0xC0, 0x27, 0x00, 0x9D, 0x00, 0x3C, 0x46,</div><div class='add'>+0x34, 0x09, 0x50, 0x24, 0x00, 0x9F, 0x00, 0x4C, 0x02, 0x30, 0x09, 0xC0, 0x24,</div><div class='add'>+0x00, 0x93, 0x00, 0x6D, 0x6E, 0xF0, 0x09, 0xC0, 0xA7, 0x00, 0x9F, 0x02, 0x78,</div><div class='add'>+0x02, 0x30, 0x09, 0xC0, 0x14, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14,</div><div class='add'>+0x00, 0x65, 0x00, 0x9F, 0x01, 0x7C, 0x02, 0xF0, 0x09, 0xC0, 0x27, 0x00, 0x9F,</div><div class='add'>+0x83, 0x7E, 0x0E, 0xF0, 0x09, 0xC0, 0x27, 0x08, 0x9F, 0x49, 0x7C, 0x26, 0xF0,</div><div class='add'>+0x49, 0xC0, 0x27, 0x08, 0x9F, 0x20, 0x3C, 0x06, 0x71, 0x09, 0xC0, 0x23, 0x00,</div><div class='add'>+0x9F, 0x00, 0x5C, 0x82, 0xF0, 0x09, 0xC0, 0x27, 0x00, 0x9F, 0x01, 0x3C, 0x02,</div><div class='add'>+0xF0, 0x09, 0xC0, 0x53, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x08,</div><div class='add'>+0x85, 0x00, 0x0F, 0x01, 0x7C, 0x00, 0xF0, 0x01, 0xC0, 0x07, 0x01, 0x1F, 0x00,</div><div class='add'>+0x7E, 0x00, 0xF0, 0x01, 0xC0, 0x07, 0x20, 0x1B, 0x00, 0x4F, 0x00, 0xB0, 0x01,</div><div class='add'>+0xC0, 0x06, 0x00, 0x1F, 0x00, 0x7C, 0x00, 0x70, 0x00, 0xC0, 0x07, 0x00, 0x1F,</div><div class='add'>+0x00, 0x6C, 0x00, 0xF0, 0x01, 0xC0, 0x87, 0x00, 0x1F, 0x00, 0x7C, 0x00, 0xF0,</div><div class='add'>+0x01, 0xC0, 0x53, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x20, 0x14,</div><div class='add'>+0x00, 0x7D, 0x00, 0x74, 0x81, 0xD0, 0x05, 0xC0, 0x9D, 0x04, 0x5D, 0x00, 0x7E,</div><div class='add'>+0x01, 0xD0, 0x15, 0x40, 0x5F, 0x01, 0x51, 0x00, 0x44, 0x01, 0x14, 0x04, 0xD0,</div><div class='add'>+0x16, 0x00, 0x5D, 0x00, 0x74, 0x01, 0x10, 0x45, 0xC0, 0x14, 0x00, 0x7D, 0x10,</div><div class='add'>+0x44, 0x01, 0xD0, 0x05, 0x44, 0x17, 0x20, 0x5D, 0x00, 0x74, 0x01, 0xD0, 0x04,</div><div class='add'>+0x40, 0x53, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0xA0, 0x32, 0x00,</div><div class='add'>+0xCD, 0x00, 0x34, 0x02, 0xDA, 0x0C, 0x48, 0x35, 0x20, 0xCD, 0x00, 0x74, 0x03,</div><div class='add'>+0xD0, 0x9C, 0x40, 0x33, 0x80, 0xC9, 0x20, 0x10, 0x02, 0x90, 0x8C, 0x40, 0x22,</div><div class='add'>+0x00, 0xCD, 0x00, 0x36, 0x03, 0x18, 0x08, 0x40, 0x31, 0x00, 0xDD, 0x01, 0x24,</div><div class='add'>+0x83, 0xD0, 0x0C, 0x40, 0x23, 0x82, 0xCD, 0x00, 0x34, 0x03, 0xD0, 0x08, 0x40,</div><div class='add'>+0x53, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x80, 0x38, 0x81, 0xED,</div><div class='add'>+0x00, 0xB4, 0x43, 0xD9, 0x0E, 0x40, 0x39, 0x00, 0xED, 0x00, 0x94, 0x43, 0xD0,</div><div class='add'>+0x0E, 0x40, 0x6B, 0x01, 0xF1, 0x05, 0xD4, 0x03, 0x10, 0x0F, 0x50, 0x3A, 0x00,</div><div class='add'>+0xED, 0x08, 0x34, 0x03, 0x18, 0x0E, 0x40, 0x39, 0x08, 0xED, 0x00, 0xA4, 0x03,</div><div class='add'>+0xC0, 0x0E, 0x40, 0x3B, 0x80, 0xED, 0x00, 0xB4, 0x13, 0xD0, 0x0E, 0x40, 0x13,</div><div class='add'>+0x20, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x10, 0xF8, 0x00, 0x2F, 0x01,</div><div class='add'>+0xBC, 0x07, 0xF0, 0x1E, 0xC0, 0x59, 0x00, 0xEF, 0x01, 0xB4, 0x06, 0xF0, 0x1E,</div><div class='add'>+0xE4, 0xFB, 0x00, 0xEB, 0x11, 0x94, 0x07, 0xB2, 0x1E, 0xD0, 0x7A, 0x00, 0xEF,</div><div class='add'>+0x15, 0xBC, 0x5F, 0x70, 0x1C, 0xC0, 0x79, 0x00, 0xFF, 0x01, 0xAC, 0x07, 0xE0,</div><div class='add'>+0x1E, 0xC0, 0x7B, 0x00, 0xEF, 0x01, 0xB4, 0x37, 0xF0, 0x1A, 0xC0, 0x53, 0x40,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xB8, 0x35, 0x00, 0xDF, 0x00, 0x7C,</div><div class='add'>+0x03, 0xF0, 0x0D, 0xC4, 0x15, 0x10, 0xDF, 0x00, 0x7C, 0x0A, 0xB0, 0x0D, 0xC0,</div><div class='add'>+0x03, 0x00, 0xDF, 0x08, 0x6C, 0x03, 0xF2, 0x0C, 0xD0, 0x37, 0x00, 0xDF, 0x20,</div><div class='add'>+0x7C, 0x03, 0xF4, 0x0D, 0xC0, 0x34, 0x07, 0x5F, 0x00, 0x5C, 0x03, 0xF0, 0x0D,</div><div class='add'>+0xC8, 0x37, 0x00, 0x9F, 0x00, 0x7C, 0x23, 0xF0, 0x0D, 0xC0, 0x43, 0x20, 0x06,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xA0, 0x7B, 0x00, 0xF3, 0x01, 0xCC, 0x07,</div><div class='add'>+0xFA, 0x8F, 0xC0, 0x6F, 0x02, 0xF3, 0x09, 0x8C, 0x0F, 0x30, 0x1F, 0xC0, 0x7F,</div><div class='add'>+0x00, 0xF3, 0x01, 0xEC, 0x07, 0x30, 0x1E, 0xC0, 0x7C, 0x30, 0xF7, 0x41, 0xCC,</div><div class='add'>+0x07, 0x70, 0x1F, 0xC4, 0x7C, 0x00, 0xF3, 0x01, 0xDC, 0x47, 0x72, 0x1F, 0xC8,</div><div class='add'>+0x7B, 0x22, 0xF7, 0xA1, 0xFC, 0x87, 0x32, 0x1B, 0xC2, 0x08, 0x00, 0x0E, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x15, 0x88, 0x39, 0x00, 0x61, 0x40, 0x84, 0x03, 0x78,</div><div class='add'>+0x0E, 0x44, 0x2B, 0x10, 0xE1, 0x20, 0xAC, 0x03, 0x10, 0x0E, 0x40, 0x3B, 0x00,</div><div class='add'>+0xF1, 0x00, 0x84, 0x13, 0x50, 0x4E, 0x44, 0x39, 0x00, 0xF1, 0x00, 0xC4, 0x03,</div><div class='add'>+0x10, 0x0E, 0xC0, 0x3E, 0x02, 0xE1, 0x00, 0x86, 0x03, 0xF0, 0x0E, 0x40, 0x3B,</div><div class='add'>+0x40, 0xE5, 0x00, 0x34, 0x03, 0x10, 0x0E, 0x40, 0x54, 0x20, 0x06, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x7D, 0x00, 0x25, 0x00, 0x84, 0x03, 0x50, 0x8E,</div><div class='add'>+0x40, 0x0B, 0x00, 0xC0, 0x20, 0x84, 0x02, 0x10, 0x0E, 0x40, 0x3B, 0x00, 0xE1,</div><div class='add'>+0x02, 0xC4, 0x03, 0x12, 0x0E, 0x60, 0x38, 0x00, 0xE5, 0x00, 0x84, 0x03, 0x10,</div><div class='add'>+0x0E, 0x40, 0x39, 0x00, 0xE1, 0x00, 0xD4, 0x03, 0x10, 0x0E, 0x40, 0x3F, 0x40,</div><div class='add'>+0xED, 0x00, 0x34, 0x03, 0x10, 0x08, 0x40, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x06, 0x28, 0x33, 0x00, 0x41, 0x03, 0x05, 0x1B, 0x50, 0x0C, 0x40,</div><div class='add'>+0x43, 0x40, 0xC1, 0x02, 0x24, 0x02, 0x10, 0x0C, 0x40, 0x13, 0x00, 0xC1, 0x41,</div><div class='add'>+0x04, 0x03, 0x51, 0x0C, 0x60, 0x31, 0x00, 0xC1, 0x00, 0x05, 0x03, 0x10, 0x0C,</div><div class='add'>+0x40, 0x33, 0x00, 0x41, 0x00, 0x04, 0x0B, 0xD0, 0x0C, 0x40, 0x33, 0x02, 0x8D,</div><div class='add'>+0x42, 0x34, 0x03, 0x14, 0x0C, 0x50, 0x18, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x15, 0xA8, 0xB5, 0x42, 0xD7, 0x06, 0x0C, 0x03, 0x70, 0x0D, 0xC0, 0x27,</div><div class='add'>+0x04, 0xD3, 0x00, 0x4C, 0x02, 0x34, 0x0D, 0xC0, 0x3F, 0x40, 0xF1, 0x01, 0x0C,</div><div class='add'>+0x07, 0x30, 0xAC, 0x40, 0x30, 0x00, 0xF7, 0x00, 0xCC, 0x03, 0x30, 0x0D, 0xC0,</div><div class='add'>+0x3D, 0x00, 0xD3, 0x00, 0xDC, 0x23, 0x70, 0x0D, 0x40, 0xF7, 0x42, 0xDF, 0x02,</div><div class='add'>+0xFC, 0x03, 0x30, 0x09, 0xC0, 0x54, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x01, 0x00, 0x37, 0x00, 0x9F, 0x10, 0x7C, 0x03, 0x70, 0x0D, 0xC0, 0xA7, 0x00,</div><div class='add'>+0xDF, 0x01, 0x5C, 0x02, 0xF0, 0x0D, 0xC0, 0x27, 0x00, 0xDF, 0x08, 0x5C, 0x63,</div><div class='add'>+0xF0, 0x0D, 0xC0, 0x37, 0x00, 0xDF, 0x00, 0x7C, 0x03, 0xF0, 0x0D, 0xC0, 0x36,</div><div class='add'>+0x00, 0xDF, 0x00, 0x7C, 0x03, 0xF0, 0x0D, 0xC0, 0x37, 0x00, 0xD7, 0x00, 0x7C,</div><div class='add'>+0x03, 0xF0, 0x09, 0xC0, 0x07, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,</div><div class='add'>+0x08, 0x3F, 0x00, 0x33, 0x00, 0xFC, 0x03, 0x30, 0x0F, 0xC0, 0x07, 0x00, 0xF7,</div><div class='add'>+0x10, 0xFC, 0x02, 0x30, 0x5F, 0xC0, 0x2F, 0x00, 0xFF, 0x00, 0xFC, 0x03, 0x30,</div><div class='add'>+0x9B, 0xC0, 0x34, 0x00, 0xE3, 0x00, 0xCC, 0x03, 0x30, 0x1D, 0xC0, 0x3F, 0x00,</div><div class='add'>+0xB3, 0x01, 0xFE, 0x03, 0xF0, 0x0F, 0xCA, 0xBF, 0x00, 0xFE, 0x10, 0xF4, 0x03,</div><div class='add'>+0x30, 0x5A, 0x80, 0x00, 0x22, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x81, 0x20,</div><div class='add'>+0x36, 0x00, 0x95, 0x00, 0x74, 0x07, 0x10, 0x0D, 0x40, 0xC7, 0x04, 0xD1, 0x00,</div><div class='add'>+0x74, 0x26, 0x10, 0x1D, 0x40, 0x07, 0x00, 0xD9, 0x00, 0x74, 0x03, 0x10, 0x1D,</div><div class='add'>+0x50, 0x35, 0x00, 0xDB, 0x00, 0x44, 0x03, 0x10, 0x0D, 0x40, 0x37, 0x00, 0x91,</div><div class='add'>+0x03, 0x76, 0x03, 0xD0, 0x0D, 0x40, 0x37, 0x20, 0xDD, 0x09, 0x74, 0x03, 0x10,</div><div class='add'>+0x09, 0xC0, 0x05, 0x02, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xA0, 0x32,</div><div class='add'>+0x00, 0xD1, 0x01, 0x74, 0x23, 0x10, 0x0D, 0x40, 0x63, 0x00, 0xD5, 0x00, 0x34,</div><div class='add'>+0x03, 0x10, 0x09, 0x40, 0x37, 0x02, 0xDD, 0x00, 0x76, 0x07, 0x10, 0x0D, 0x40,</div><div class='add'>+0x74, 0x20, 0xD1, 0x00, 0x04, 0x03, 0x10, 0x4D, 0x40, 0x33, 0x28, 0xD1, 0x04,</div><div class='add'>+0x74, 0x03, 0xD0, 0x0D, 0x40, 0x36, 0x00, 0xDD, 0x00, 0x24, 0x03, 0x00, 0x09,</div><div class='add'>+0x40, 0x05, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x20, 0x30, 0x00,</div><div class='add'>+0x05, 0x00, 0x34, 0x03, 0x10, 0x0C, 0x40, 0x03, 0x00, 0xC1, 0x00, 0x34, 0x03,</div><div class='add'>+0x10, 0x08, 0x40, 0x33, 0x00, 0xC9, 0x00, 0x34, 0x03, 0x10, 0x0C, 0x40, 0x30,</div><div class='add'>+0x00, 0xC9, 0x00, 0x05, 0x03, 0x10, 0x0C, 0x40, 0x33, 0x00, 0xC1, 0x00, 0x34,</div><div class='add'>+0x03, 0xD0, 0x0C, 0x40, 0x33, 0x00, 0xCC, 0x00, 0x34, 0x23, 0x10, 0x08, 0x40,</div><div class='add'>+0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x3E, 0x00, 0x03,</div><div class='add'>+0x00, 0x7C, 0x03, 0x30, 0x0D, 0xC0, 0x07, 0x00, 0xD7, 0x00, 0xFC, 0x02, 0x14,</div><div class='add'>+0x09, 0xC0, 0x23, 0x10, 0xFF, 0x00, 0x7C, 0x03, 0x34, 0x0D, 0xC0, 0x34, 0x00,</div><div class='add'>+0xF3, 0x00, 0xCC, 0x03, 0x30, 0x0D, 0xC0, 0x3F, 0x00, 0xC3, 0x20, 0x74, 0x03,</div><div class='add'>+0xF0, 0x0D, 0xC0, 0x37, 0x00, 0xDF, 0x00, 0xFC, 0x03, 0x30, 0x09, 0xC0, 0x01,</div><div class='add'>+0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0xB8, 0x3F, 0x00, 0x3F, 0x00,</div><div class='add'>+0xFC, 0x03, 0xF0, 0x0F, 0xC0, 0x0F, 0x00, 0xFF, 0x00, 0xFC, 0x02, 0xF0, 0x0B,</div><div class='add'>+0x80, 0x0F, 0x00, 0xFA, 0x00, 0xBC, 0x03, 0xF0, 0x0F, 0xC0, 0x3F, 0x00, 0xFF,</div><div class='add'>+0x00, 0xFC, 0x03, 0xF0, 0x0F, 0x80, 0x3F, 0x08, 0xFF, 0x00, 0xB0, 0x03, 0xF0,</div><div class='add'>+0x0F, 0xC8, 0x3F, 0x00, 0xFF, 0x00, 0xFC, 0x13, 0xF0, 0x0B, 0xC0, 0x15, 0x60,</div><div class='add'>+0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xA0, 0x7F, 0x00, 0xBF, 0x8C, 0xCC,</div><div class='add'>+0x12, 0x32, 0xCF, 0xC0, 0x5E, 0x22, 0xB3, 0x21, 0xFC, 0x06, 0xF0, 0xCF, 0xC4,</div><div class='add'>+0x3D, 0x03, 0x23, 0x01, 0xFC, 0x23, 0xF0, 0x13, 0xC0, 0x3F, 0x00, 0xFF, 0x4C,</div><div class='add'>+0xCC, 0x06, 0xB0, 0x17, 0xD8, 0x5C, 0x00, 0xF7, 0x04, 0xAC, 0x04, 0xB0, 0x4F,</div><div class='add'>+0xC1, 0x7A, 0x08, 0x3F, 0x01, 0xDC, 0x30, 0xB0, 0x1B, 0xC4, 0x0F, 0x00, 0x0E,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x08, 0x77, 0x00, 0xDD, 0x0E, 0x44, 0x26,</div><div class='add'>+0x10, 0xEF, 0x40, 0x24, 0x01, 0xD1, 0x04, 0x74, 0x05, 0x70, 0x2F, 0x40, 0xBC,</div><div class='add'>+0x02, 0x91, 0x01, 0xF4, 0x1B, 0x90, 0x40, 0x40, 0xFF, 0x02, 0xFD, 0x08, 0x44,</div><div class='add'>+0xC3, 0x10, 0x19, 0x40, 0x34, 0x00, 0xF1, 0x01, 0x44, 0x05, 0x10, 0x3F, 0x40,</div><div class='add'>+0x74, 0x10, 0x1D, 0xA1, 0x34, 0x38, 0xB0, 0x1C, 0x40, 0x07, 0x20, 0x0C, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x11, 0xA0, 0x33, 0x00, 0x8D, 0x04, 0x04, 0x02, 0x10,</div><div class='add'>+0x4C, 0x40, 0x32, 0x00, 0xC1, 0x10, 0x14, 0x02, 0xD0, 0x6C, 0x48, 0x33, 0x11,</div><div class='add'>+0x45, 0x00, 0x34, 0x0B, 0xD0, 0x00, 0x41, 0x33, 0x10, 0xC5, 0x44, 0x04, 0x13,</div><div class='add'>+0x90, 0x08, 0x40, 0x00, 0x05, 0xC9, 0x08, 0x64, 0x01, 0xD0, 0x0C, 0x40, 0x30,</div><div class='add'>+0x20, 0x05, 0x00, 0x14, 0x00, 0xD0, 0x04, 0x40, 0x47, 0x80, 0x0E, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x03, 0xA8, 0x35, 0x00, 0xDD, 0x20, 0x44, 0x03, 0x10, 0x0D,</div><div class='add'>+0x40, 0xA4, 0x0A, 0xD1, 0x04, 0x74, 0x01, 0x50, 0x0D, 0x40, 0x34, 0x40, 0x95,</div><div class='add'>+0x02, 0x74, 0x03, 0xD1, 0x19, 0x42, 0x37, 0x00, 0xCD, 0x00, 0x44, 0x03, 0x90,</div><div class='add'>+0x08, 0x40, 0xB4, 0x01, 0xD9, 0x00, 0x64, 0x05, 0xD0, 0x0D, 0x50, 0x36, 0x04,</div><div class='add'>+0x1D, 0x18, 0x74, 0x01, 0xD0, 0x05, 0x40, 0x0F, 0x20, 0x06, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0xA8, 0x37, 0x00, 0x9F, 0x09, 0x0C, 0x03, 0x34, 0x0D, 0xC0,</div><div class='add'>+0xD6, 0x08, 0x93, 0x01, 0x5C, 0x03, 0xF0, 0x0D, 0xC0, 0x37, 0x10, 0xD7, 0x09,</div><div class='add'>+0x7C, 0x03, 0xF0, 0x21, 0xC0, 0x37, 0x00, 0xDF, 0x00, 0x4C, 0x83, 0xB1, 0x25,</div><div class='add'>+0xC9, 0x34, 0x40, 0xDB, 0x00, 0x6C, 0x17, 0xF0, 0x0D, 0xC0, 0xA6, 0x00, 0x1F,</div><div class='add'>+0x02, 0x5C, 0x16, 0xF0, 0x39, 0xC0, 0x03, 0x20, 0x0E, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x07, 0x80, 0x3D, 0x00, 0xEF, 0xC1, 0x7C, 0x02, 0xF2, 0x0E, 0xC0, 0x6F,</div><div class='add'>+0x00, 0xFF, 0x80, 0xFC, 0x8D, 0xF0, 0x0F, 0xC0, 0x3B, 0x00, 0xBB, 0x00, 0xFC,</div><div class='add'>+0x03, 0xB0, 0x0F, 0xC8, 0x3F, 0x00, 0xFF, 0x10, 0xDD, 0x83, 0x70, 0x0B, 0xC0,</div><div class='add'>+0x3F, 0x00, 0xF7, 0x00, 0xDC, 0x03, 0x30, 0x0F, 0xC0, 0x3D, 0x00, 0x3F, 0x01,</div><div class='add'>+0xFC, 0x0E, 0xB4, 0x2F, 0xC0, 0x1F, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x02, 0x08, 0x35, 0x01, 0x93, 0x40, 0x7C, 0x03, 0x30, 0x8D, 0xC0, 0x35, 0x08,</div><div class='add'>+0xDF, 0x00, 0x4C, 0x0B, 0xF0, 0x0D, 0xC0, 0x34, 0x88, 0xDF, 0x00, 0x5C, 0x03,</div><div class='add'>+0x70, 0x25, 0xC0, 0x34, 0x08, 0xDF, 0x00, 0x7C, 0x03, 0x30, 0x2D, 0xE2, 0x27,</div><div class='add'>+0x00, 0xDF, 0x04, 0x7C, 0x09, 0xF0, 0x0D, 0xC1, 0x25, 0x00, 0x57, 0x00, 0x5C,</div><div class='add'>+0x02, 0x30, 0x05, 0xC0, 0x08, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13,</div><div class='add'>+0xA0, 0x34, 0x00, 0xD1, 0x05, 0x74, 0x83, 0x18, 0x1F, 0x40, 0x24, 0x00, 0xDD,</div><div class='add'>+0x10, 0x44, 0x81, 0xD0, 0x0F, 0xC0, 0x3E, 0x88, 0x9F, 0x00, 0xC4, 0x03, 0x10,</div><div class='add'>+0x0D, 0x42, 0x3C, 0x00, 0xFD, 0x00, 0x74, 0x03, 0xB0, 0x09, 0x40, 0x77, 0x00,</div><div class='add'>+0xED, 0x00, 0x36, 0x05, 0x10, 0x6E, 0x40, 0xB4, 0x02, 0x1B, 0x11, 0x4C, 0x03,</div><div class='add'>+0x40, 0x05, 0xC0, 0x4E, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xA0,</div><div class='add'>+0xB2, 0x02, 0x81, 0x00, 0x34, 0x82, 0x10, 0x1C, 0x40, 0x65, 0x02, 0xCD, 0x01,</div><div class='add'>+0x04, 0x81, 0xD0, 0x0D, 0x40, 0x30, 0x08, 0x0D, 0x00, 0x14, 0x03, 0x52, 0x00,</div><div class='add'>+0x42, 0x32, 0x20, 0xCD, 0x43, 0x74, 0x02, 0x10, 0x0C, 0x40, 0x67, 0x02, 0xCD,</div><div class='add'>+0x03, 0x24, 0x03, 0x58, 0x0C, 0x44, 0x31, 0x08, 0x05, 0x01, 0x54, 0x11, 0x10,</div><div class='add'>+0x04, 0x40, 0x1C, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x80, 0x78,</div><div class='add'>+0x00, 0xA1, 0x01, 0xB4, 0x06, 0x10, 0x1C, 0x40, 0x68, 0x00, 0xED, 0x01, 0x84,</div><div class='add'>+0x05, 0xD0, 0x1E, 0x48, 0x7A, 0x00, 0x35, 0x01, 0x84, 0x27, 0x10, 0x96, 0x50,</div><div class='add'>+0x7A, 0x00, 0xED, 0x19, 0xB4, 0x03, 0x10, 0x1A, 0x40, 0x6B, 0x00, 0xED, 0x01,</div><div class='add'>+0xF4, 0x05, 0x19, 0x1C, 0x40, 0x7C, 0x00, 0x39, 0x81, 0xA4, 0x24, 0x10, 0x1E,</div><div class='add'>+0x40, 0x1A, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x10, 0x30, 0x00,</div><div class='add'>+0xC3, 0x04, 0x34, 0x02, 0x10, 0x0C, 0xC0, 0x31, 0x00, 0xDF, 0x00, 0x0D, 0x01,</div><div class='add'>+0xF8, 0x0D, 0xC0, 0x30, 0x02, 0x4D, 0x00, 0x5C, 0x07, 0x70, 0x2C, 0xC0, 0x32,</div><div class='add'>+0x02, 0xCF, 0x00, 0x7C, 0x23, 0x10, 0x08, 0x40, 0x23, 0x00, 0xCF, 0x14, 0x34,</div><div class='add'>+0x43, 0x70, 0x0C, 0xC0, 0x31, 0x00, 0xC7, 0x00, 0x1E, 0x03, 0x34, 0x04, 0xC2,</div><div class='add'>+0x48, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xB8, 0x39, 0x42, 0xFF,</div><div class='add'>+0x00, 0xFC, 0x03, 0xF0, 0x2F, 0xC1, 0x2F, 0x00, 0xFF, 0x00, 0xFC, 0x01, 0xF0,</div><div class='add'>+0x0F, 0x81, 0x3F, 0x00, 0xFF, 0x00, 0x7C, 0x2B, 0xB0, 0x0F, 0xC0, 0x3D, 0x04,</div><div class='add'>+0xFF, 0x10, 0xF4, 0x13, 0xF0, 0x09, 0xC0, 0x2F, 0x00, 0xFF, 0x10, 0x7C, 0x21,</div><div class='add'>+0x70, 0x0F, 0xC0, 0x1F, 0x10, 0xEF, 0x00, 0xDC, 0x03, 0xF0, 0x07, 0xC0, 0x0B,</div><div class='add'>+0x60, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0xA0, 0x37, 0x00, 0x9F, 0x00,</div><div class='add'>+0x4C, 0x03, 0xF0, 0x6D, 0xC0, 0x27, 0x10, 0xDF, 0x00, 0x7C, 0x03, 0xB0, 0x0D,</div><div class='add'>+0xC0, 0x37, 0x05, 0x57, 0x00, 0x5C, 0x37, 0x34, 0x08, 0xC0, 0x36, 0x01, 0xDF,</div><div class='add'>+0x12, 0x4D, 0x03, 0x70, 0x0D, 0xC0, 0x27, 0x00, 0xDF, 0x00, 0x7C, 0x03, 0xF2,</div><div class='add'>+0x4C, 0xC1, 0x66, 0x00, 0x9B, 0x01, 0x4C, 0x01, 0xB0, 0x05, 0xC0, 0x57, 0x00,</div><div class='add'>+0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x88, 0x39, 0x00, 0xBD, 0x04, 0x85,</div><div class='add'>+0x0A, 0xD0, 0x0E, 0x40, 0x2B, 0x00, 0xED, 0x00, 0xB4, 0x01, 0x10, 0x8E, 0x40,</div><div class='add'>+0x3B, 0x01, 0x6D, 0x00, 0x9C, 0x13, 0x10, 0x0E, 0x40, 0x38, 0x03, 0xE7, 0x04,</div><div class='add'>+0x84, 0x03, 0xD0, 0x0A, 0x40, 0x2B, 0x08, 0xED, 0x14, 0xB4, 0x03, 0x70, 0x4E,</div><div class='add'>+0xC2, 0x3A, 0x40, 0x23, 0x00, 0x85, 0x00, 0xB0, 0x0E, 0x40, 0x4B, 0x20, 0x06,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x79, 0x00, 0xED, 0x09, 0xA4, 0x17,</div><div class='add'>+0xD0, 0x1E, 0x40, 0x7B, 0x00, 0xED, 0x01, 0xB4, 0x07, 0x90, 0x5E, 0x40, 0x7B,</div><div class='add'>+0x02, 0xED, 0x31, 0x16, 0x07, 0x10, 0x1F, 0x42, 0x7A, 0x00, 0xE5, 0x01, 0x84,</div><div class='add'>+0x07, 0xD0, 0x1E, 0x40, 0x6B, 0x00, 0xED, 0x05, 0xB4, 0x07, 0x50, 0xDE, 0x40,</div><div class='add'>+0x69, 0x00, 0xE9, 0x81, 0x84, 0x87, 0x90, 0x16, 0x40, 0x0F, 0x00, 0x04, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x12, 0x28, 0x33, 0x00, 0xCD, 0x00, 0x04, 0x03, 0xD0,</div><div class='add'>+0x0C, 0x40, 0x23, 0x20, 0xDD, 0x40, 0x34, 0x45, 0x10, 0x0C, 0x40, 0x37, 0x08,</div><div class='add'>+0xCD, 0x06, 0x14, 0x03, 0x10, 0xBC, 0x40, 0x30, 0x00, 0xD5, 0x20, 0x04, 0x07,</div><div class='add'>+0xD0, 0x18, 0x40, 0x23, 0x00, 0xCD, 0x00, 0x34, 0x01, 0x50, 0x0C, 0x40, 0x53,</div><div class='add'>+0x30, 0xC1, 0x08, 0x04, 0x0B, 0x90, 0x04, 0x40, 0x4B, 0x20, 0x0C, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x17, 0x88, 0x15, 0x00, 0x5F, 0x00, 0x6C, 0x41, 0xF0, 0x05,</div><div class='add'>+0xC0, 0x1F, 0x00, 0x5F, 0x00, 0xBC, 0x4D, 0xB0, 0x05, 0xC0, 0x17, 0x00, 0x6F,</div><div class='add'>+0x01, 0x5C, 0x01, 0x30, 0x37, 0xC0, 0x16, 0x00, 0x57, 0x80, 0x4C, 0x91, 0xF0,</div><div class='add'>+0x47, 0xC0, 0x9F, 0x00, 0x5F, 0x00, 0xBC, 0x15, 0x70, 0x04, 0xC0, 0x5D, 0x0C,</div><div class='add'>+0x7B, 0x03, 0xCC, 0x09, 0xA0, 0x07, 0xC0, 0x5F, 0x20, 0x06, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x12, 0x00, 0x87, 0x00, 0x1F, 0x00, 0x7C, 0x00, 0xF0, 0x01, 0xC0,</div><div class='add'>+0x07, 0x00, 0x1F, 0x40, 0x7C, 0x00, 0xF0, 0x01, 0xC0, 0x07, 0x00, 0x1F, 0x00,</div><div class='add'>+0x7C, 0x00, 0xF0, 0x01, 0xC1, 0x07, 0x00, 0x17, 0x00, 0x7C, 0x00, 0xF0, 0x01,</div><div class='add'>+0xC0, 0x07, 0x00, 0x0F, 0x02, 0x7C, 0x40, 0x70, 0x21, 0x80, 0x86, 0x00, 0x17,</div><div class='add'>+0x12, 0x3C, 0x10, 0xF0, 0x01, 0xC0, 0x4B, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x10, 0x08, 0x27, 0x08, 0x8F, 0x40, 0x4D, 0x16, 0xF0, 0x99, 0xC0, 0xE7,</div><div class='add'>+0x00, 0x93, 0x09, 0x4D, 0x02, 0x30, 0x09, 0xC0, 0x27, 0x00, 0x97, 0x00, 0x5C,</div><div class='add'>+0x02, 0xF0, 0x29, 0xC0, 0x23, 0x00, 0x97, 0x00, 0x5C, 0x02, 0x34, 0x09, 0xC0,</div><div class='add'>+0x64, 0x06, 0x93, 0x03, 0x5C, 0xA2, 0x71, 0x99, 0xC0, 0x24, 0x00, 0x9F, 0x01,</div><div class='add'>+0x7C, 0x06, 0x30, 0x09, 0xC0, 0x43, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x01, 0x20, 0xA6, 0x00, 0xBD, 0x40, 0xC4, 0x06, 0x70, 0x09, 0x40, 0x63, 0x00,</div><div class='add'>+0x91, 0x01, 0x44, 0x02, 0x18, 0x09, 0x44, 0x27, 0x00, 0x99, 0x00, 0x44, 0x02,</div><div class='add'>+0xD0, 0x28, 0x40, 0x24, 0x08, 0x93, 0x20, 0x04, 0x02, 0x90, 0x08, 0x40, 0x60,</div><div class='add'>+0x00, 0x91, 0x04, 0x44, 0x4E, 0x10, 0x09, 0x50, 0x25, 0x10, 0x9D, 0x06, 0x74,</div><div class='add'>+0x06, 0x50, 0x09, 0x42, 0x07, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18,</div><div class='add'>+0xA0, 0x24, 0x10, 0x9D, 0x00, 0x44, 0x0A, 0xD0, 0x09, 0x40, 0x27, 0x00, 0x91,</div><div class='add'>+0x80, 0x44, 0x03, 0x10, 0x09, 0x40, 0x27, 0x00, 0x9D, 0x00, 0x54, 0x02, 0xD0,</div><div class='add'>+0x29, 0x40, 0x25, 0x00, 0x95, 0x00, 0x54, 0x02, 0x90, 0x09, 0x40, 0x24, 0x00,</div><div class='add'>+0x91, 0x00, 0x54, 0x02, 0x50, 0x29, 0x40, 0x24, 0x30, 0x9D, 0x08, 0x74, 0x52,</div><div class='add'>+0x10, 0x0D, 0x40, 0x63, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x22,</div><div class='add'>+0x30, 0x00, 0x8D, 0x02, 0x04, 0x02, 0x58, 0x68, 0x40, 0xA7, 0x00, 0x81, 0x02,</div><div class='add'>+0x44, 0x0A, 0x10, 0x88, 0x40, 0x23, 0x02, 0x99, 0x00, 0x04, 0x22, 0xD0, 0x89,</div><div class='add'>+0x40, 0x20, 0x00, 0x89, 0x08, 0x44, 0x22, 0x90, 0x29, 0x40, 0xA4, 0x00, 0x81,</div><div class='add'>+0x00, 0x04, 0x02, 0x12, 0x08, 0x40, 0x21, 0x00, 0x8D, 0x00, 0x34, 0x22, 0x54,</div><div class='add'>+0x28, 0x40, 0x43, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1D, 0x30, 0x06,</div><div class='add'>+0x00, 0x1F, 0x01, 0x4C, 0x04, 0xF0, 0x01, 0xC0, 0x07, 0x40, 0x13, 0x00, 0x0C,</div><div class='add'>+0x00, 0x14, 0x61, 0xC1, 0x87, 0x0D, 0x17, 0x00, 0x5C, 0x58, 0xF1, 0x21, 0xC0,</div><div class='add'>+0x05, 0x05, 0x07, 0x16, 0x5C, 0x88, 0x30, 0x01, 0xD0, 0x04, 0x40, 0x13, 0x54,</div><div class='add'>+0x5C, 0x80, 0x78, 0x41, 0xC1, 0x14, 0x10, 0x1F, 0x00, 0x3C, 0x58, 0x30, 0x01,</div><div class='add'>+0xC0, 0x77, 0xC0, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x19, 0x38, 0x27, 0x08,</div><div class='add'>+0xBF, 0x03, 0xFC, 0x0A, 0xF0, 0x99, 0xC0, 0x6F, 0x08, 0xBF, 0x01, 0xFC, 0x06,</div><div class='add'>+0xF0, 0x49, 0xC0, 0x27, 0x09, 0xB7, 0x00, 0x7C, 0x12, 0xF0, 0x4B, 0xC2, 0x25,</div><div class='add'>+0x00, 0x97, 0x04, 0xFC, 0x12, 0x70, 0x1B, 0xC0, 0x6F, 0x30, 0x9F, 0x00, 0xFC,</div><div class='add'>+0x02, 0xF8, 0x09, 0xD2, 0x2B, 0x80, 0xAF, 0x00, 0xFC, 0x12, 0xF0, 0x1B, 0xC0,</div><div class='add'>+0x67, 0x60, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0xA0, 0x2B, 0x00, 0xBF,</div><div class='add'>+0x13, 0xFC, 0x46, 0xF0, 0x0B, 0xC0, 0xAC, 0x00, 0xBF, 0x00, 0x7C, 0x0A, 0x30,</div><div class='add'>+0xC9, 0xC0, 0x26, 0x00, 0x9B, 0x00, 0x7C, 0x22, 0xF0, 0x0B, 0xC0, 0x24, 0x05,</div><div class='add'>+0xBF, 0x0C, 0x49, 0x02, 0xF2, 0x29, 0xC2, 0xAF, 0x00, 0xAF, 0x04, 0xFC, 0x02,</div><div class='add'>+0xF0, 0x4B, 0xC0, 0x2C, 0x00, 0xBF, 0x00, 0xFC, 0x22, 0xB0, 0x09, 0xC0, 0x67,</div><div class='add'>+0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1C, 0x08, 0x07, 0x00, 0x1D, 0x07,</div><div class='add'>+0x74, 0x88, 0xD0, 0x51, 0x40, 0x44, 0x20, 0x1D, 0x05, 0x74, 0x04, 0x10, 0xC1,</div><div class='add'>+0x48, 0x84, 0x04, 0x11, 0x00, 0x74, 0x20, 0xD0, 0x45, 0x53, 0x04, 0x00, 0x1D,</div><div class='add'>+0x0C, 0x44, 0x40, 0xD0, 0x14, 0x40, 0x47, 0x00, 0x1D, 0x00, 0x74, 0x00, 0x10,</div><div class='add'>+0x81, 0x40, 0x14, 0x20, 0x5D, 0x20, 0x74, 0x20, 0x14, 0x11, 0x40, 0x73, 0x20,</div><div class='add'>+0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xA0, 0x23, 0x00, 0x8D, 0x04, 0x34,</div><div class='add'>+0x02, 0xD0, 0x88, 0x41, 0x20, 0x00, 0x8D, 0x10, 0x34, 0x02, 0x10, 0x48, 0x40,</div><div class='add'>+0x22, 0x03, 0x89, 0x00, 0x34, 0x02, 0xD1, 0x48, 0x40, 0x20, 0x00, 0x8D, 0x04,</div><div class='add'>+0x26, 0x12, 0xD0, 0x08, 0x40, 0x23, 0x10, 0x8D, 0x08, 0x34, 0x02, 0xDC, 0x08,</div><div class='add'>+0x40, 0x20, 0x10, 0x8D, 0x00, 0x34, 0x02, 0x94, 0x48, 0x41, 0x43, 0x80, 0x0E,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0xA8, 0x25, 0x00, 0x9D, 0x20, 0x74, 0x82,</div><div class='add'>+0xD0, 0x09, 0x40, 0x24, 0x00, 0x9D, 0x04, 0x34, 0x02, 0x10, 0x09, 0x40, 0x20,</div><div class='add'>+0x00, 0x91, 0x10, 0x74, 0x02, 0xD0, 0x88, 0x40, 0x24, 0x00, 0x9D, 0x00, 0x66,</div><div class='add'>+0x82, 0xD0, 0x89, 0x66, 0x27, 0x00, 0x9D, 0x00, 0x74, 0x02, 0x51, 0x09, 0x58,</div><div class='add'>+0x24, 0x00, 0x9D, 0x01, 0x74, 0x2A, 0x10, 0x69, 0x40, 0x63, 0x20, 0x06, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x05, 0x28, 0x25, 0x00, 0xBF, 0x01, 0x7C, 0x06, 0xF0,</div><div class='add'>+0x0B, 0xD0, 0x2C, 0x03, 0xBF, 0x00, 0xFC, 0x02, 0x10, 0x09, 0xC0, 0x26, 0x00,</div><div class='add'>+0x9B, 0x00, 0x7C, 0x02, 0xF0, 0x39, 0xC0, 0x24, 0x00, 0x9D, 0x80, 0x64, 0x22,</div><div class='add'>+0xF0, 0x3B, 0xC0, 0x2F, 0x08, 0x9D, 0x00, 0x34, 0x4A, 0xF0, 0x09, 0x40, 0xA4,</div><div class='add'>+0x00, 0x9F, 0x03, 0x70, 0x06, 0xB0, 0x3B, 0xC4, 0x17, 0xA0, 0x04, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x14, 0x00, 0x25, 0x00, 0x9F, 0x04, 0x7C, 0x12, 0xF0, 0x09,</div><div class='add'>+0xC4, 0x27, 0x00, 0x9F, 0x00, 0x7C, 0x02, 0xF4, 0x08, 0xC0, 0x27, 0x10, 0x9F,</div><div class='add'>+0x04, 0x7C, 0x02, 0xF0, 0x09, 0xC0, 0x27, 0x00, 0x9F, 0x40, 0x5C, 0x06, 0xF8,</div><div class='add'>+0x19, 0xC2, 0x27, 0x01, 0x9F, 0x00, 0x7C, 0x22, 0xB0, 0x09, 0x05, 0x27, 0x80,</div><div class='add'>+0x9E, 0x10, 0x6C, 0x06, 0xF0, 0x19, 0xC0, 0x53, 0x00, 0x06, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x14, 0x08, 0x05, 0x00, 0x13, 0x40, 0x7C, 0x00, 0xB4, 0x81, 0xC0,</div><div class='add'>+0x07, 0x00, 0x1F, 0x08, 0x7C, 0x00, 0xF0, 0x01, 0xC0, 0x05, 0x00, 0x13, 0x02,</div><div class='add'>+0x7C, 0x00, 0xF0, 0xA1, 0xD0, 0x04, 0x00, 0x03, 0x00, 0x7C, 0x00, 0xF2, 0x21,</div><div class='add'>+0xC0, 0x04, 0x20, 0x13, 0x10, 0x5C, 0x98, 0xF0, 0x01, 0xD0, 0x84, 0x00, 0x1F,</div><div class='add'>+0x42, 0x2C, 0x00, 0x34, 0x21, 0xD0, 0x50, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x14, 0xA0, 0x1C, 0x01, 0x51, 0x01, 0xF4, 0x1D, 0x10, 0x15, 0x40, 0x17,</div><div class='add'>+0x00, 0x5D, 0x00, 0x74, 0x01, 0xD0, 0x05, 0x40, 0x14, 0x00, 0x51, 0x00, 0x74,</div><div class='add'>+0x01, 0xD0, 0x97, 0xC0, 0x14, 0x00, 0x71, 0x03, 0x44, 0x01, 0x70, 0x05, 0x40,</div><div class='add'>+0x14, 0x00, 0x71, 0x01, 0xC4, 0x05, 0xD0, 0x16, 0x42, 0x1C, 0x00, 0x7D, 0x00,</div><div class='add'>+0xF4, 0x01, 0x14, 0x05, 0x40, 0x50, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x14, 0xA0, 0x62, 0x00, 0xC1, 0x00, 0x34, 0x1E, 0x10, 0x0D, 0x48, 0x33, 0x00,</div><div class='add'>+0xCD, 0x00, 0x34, 0x03, 0xD0, 0x0C, 0x40, 0x31, 0xC0, 0xC1, 0x00, 0x34, 0x03,</div><div class='add'>+0xD0, 0x2C, 0x40, 0x32, 0x40, 0xC1, 0x11, 0x14, 0x03, 0x50, 0x0C, 0x40, 0x32,</div><div class='add'>+0x02, 0x81, 0x00, 0x14, 0x05, 0x90, 0x18, 0x40, 0x60, 0x01, 0xC9, 0x02, 0x24,</div><div class='add'>+0x03, 0x14, 0x0C, 0x60, 0x50, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04,</div><div class='add'>+0x80, 0x68, 0x00, 0xA1, 0x06, 0xB4, 0x06, 0x10, 0x8E, 0x40, 0x3B, 0x01, 0xAD,</div><div class='add'>+0x04, 0xB4, 0x13, 0xD0, 0x8E, 0x40, 0x38, 0x81, 0xE1, 0x00, 0xB4, 0x13, 0xD0,</div><div class='add'>+0x0E, 0x40, 0x78, 0x00, 0xC1, 0x10, 0x84, 0x13, 0x50, 0x5E, 0x40, 0x7A, 0x11,</div><div class='add'>+0xA1, 0x11, 0x86, 0x09, 0xD0, 0x2C, 0x42, 0xA8, 0x00, 0xED, 0x00, 0x34, 0x0B,</div><div class='add'>+0x10, 0x5F, 0x60, 0x14, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x10,</div><div class='add'>+0x68, 0x00, 0xE3, 0x07, 0xBC, 0x06, 0x30, 0x5A, 0xC0, 0xEB, 0x00, 0xEF, 0x03,</div><div class='add'>+0xB4, 0x0F, 0xF0, 0x1C, 0xC0, 0xF1, 0x00, 0xE1, 0x01, 0xBC, 0x17, 0xF0, 0x17,</div><div class='add'>+0xC4, 0x72, 0x00, 0xE3, 0x01, 0x9C, 0x17, 0x70, 0x3E, 0xC8, 0xFE, 0x40, 0xE3,</div><div class='add'>+0x01, 0x9C, 0x05, 0xB0, 0x1A, 0xC0, 0x68, 0x08, 0xED, 0x01, 0xAC, 0x05, 0x30,</div><div class='add'>+0x3E, 0xC0, 0x54, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xB8, 0x25,</div><div class='add'>+0x50, 0x9F, 0x00, 0x3C, 0x02, 0xF0, 0x0D, 0xC0, 0x37, 0x00, 0xDF, 0x80, 0x7C,</div><div class='add'>+0x03, 0xF0, 0x0D, 0xC2, 0xB7, 0x0D, 0xDF, 0x00, 0x7C, 0x4B, 0xF0, 0x05, 0xC0,</div><div class='add'>+0x37, 0x00, 0xDF, 0x00, 0x5C, 0x23, 0x72, 0x0D, 0xD0, 0x25, 0x00, 0xDF, 0x00,</div><div class='add'>+0x7E, 0x01, 0xF0, 0x09, 0xC4, 0x27, 0x00, 0x9F, 0x00, 0x7C, 0x03, 0xF4, 0x0C,</div><div class='add'>+0xC0, 0x43, 0x40, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xA0, 0x6F, 0x00,</div><div class='add'>+0xFF, 0x09, 0xCC, 0x13, 0x30, 0x1F, 0xC0, 0x7B, 0x00, 0xF3, 0x01, 0xCC, 0x27,</div><div class='add'>+0x30, 0x5F, 0x80, 0x7F, 0x00, 0xFF, 0x01, 0xFC, 0x47, 0x30, 0x1B, 0xC0, 0x7C,</div><div class='add'>+0x00, 0xBF, 0x01, 0xCC, 0x07, 0xF0, 0x1E, 0xC0, 0x68, 0x0A, 0xB1, 0x0C, 0xFC,</div><div class='add'>+0x25, 0xF0, 0x1F, 0xC0, 0x78, 0x42, 0xF3, 0x01, 0xFC, 0x06, 0xF0, 0x1F, 0xC4,</div><div class='add'>+0x08, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x80, 0x29, 0x00, 0xBD,</div><div class='add'>+0x18, 0x84, 0x43, 0x11, 0x0A, 0x48, 0x3B, 0x00, 0xA1, 0x10, 0x84, 0x23, 0x10,</div><div class='add'>+0x0E, 0x48, 0x3B, 0x00, 0xED, 0x00, 0x34, 0x03, 0x10, 0x8B, 0x41, 0x38, 0x00,</div><div class='add'>+0x7D, 0x00, 0x94, 0x03, 0xD0, 0x4E, 0x40, 0x38, 0x03, 0xA1, 0x04, 0xB4, 0x09,</div><div class='add'>+0xD0, 0x8E, 0x40, 0x19, 0x02, 0xE1, 0x00, 0xB4, 0x0A, 0xF0, 0x8E, 0x40, 0x54,</div><div class='add'>+0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x29, 0x00, 0xED, 0x40,</div><div class='add'>+0xA7, 0x22, 0x14, 0x0A, 0x40, 0x2F, 0x06, 0xB1, 0x08, 0xC4, 0x07, 0x12, 0x4E,</div><div class='add'>+0x60, 0x3B, 0x00, 0xED, 0x02, 0xB4, 0x03, 0x90, 0x02, 0x50, 0x38, 0x02, 0xAD,</div><div class='add'>+0x00, 0xA4, 0x03, 0xD0, 0x1F, 0x49, 0x2C, 0x04, 0xE9, 0x88, 0xB4, 0x01, 0xD0,</div><div class='add'>+0x0A, 0x40, 0x38, 0x80, 0x61, 0x10, 0xB4, 0x01, 0xD0, 0x1F, 0x40, 0x60, 0x00,</div><div class='add'>+0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x28, 0x23, 0x00, 0x8D, 0x00, 0x24,</div><div class='add'>+0x06, 0x10, 0x09, 0x40, 0x77, 0x00, 0x81, 0x00, 0x04, 0x23, 0x10, 0x0C, 0x60,</div><div class='add'>+0x33, 0x00, 0xCD, 0x08, 0x34, 0x03, 0x91, 0x00, 0x41, 0x30, 0x00, 0x4D, 0x00,</div><div class='add'>+0x06, 0x03, 0xD2, 0x3C, 0x40, 0x60, 0x20, 0xC9, 0x00, 0x34, 0x09, 0xD0, 0x08,</div><div class='add'>+0x40, 0x31, 0x02, 0x01, 0x03, 0x30, 0x07, 0x50, 0x0C, 0x60, 0x18, 0x20, 0x0C,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0xA8, 0x35, 0x00, 0xDF, 0x01, 0x6C, 0x02,</div><div class='add'>+0x30, 0x0D, 0x40, 0xB7, 0x42, 0xD3, 0x21, 0x4D, 0x03, 0x14, 0x0F, 0xC2, 0x3F,</div><div class='add'>+0x00, 0xDF, 0x00, 0xF4, 0x03, 0x90, 0x1D, 0xC0, 0x34, 0x00, 0x5F, 0x00, 0xCD,</div><div class='add'>+0x17, 0xF0, 0x3D, 0xD0, 0xF4, 0x40, 0x9A, 0x00, 0x7C, 0x09, 0xF1, 0x0D, 0xC2,</div><div class='add'>+0xF0, 0x00, 0xD1, 0x23, 0x74, 0x07, 0xD0, 0x2D, 0x50, 0x74, 0x20, 0x06, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0xB7, 0x00, 0xDF, 0x00, 0x5C, 0x02, 0xF0,</div><div class='add'>+0x0D, 0xC0, 0x27, 0x00, 0x9F, 0x00, 0x7C, 0x43, 0xF0, 0x0D, 0xC0, 0x37, 0x00,</div><div class='add'>+0xDF, 0x00, 0x3C, 0x03, 0x72, 0x2D, 0xC0, 0x37, 0x00, 0x9F, 0x00, 0x7C, 0x03,</div><div class='add'>+0xF0, 0x0D, 0xC0, 0x37, 0x01, 0x97, 0x22, 0x7C, 0x0D, 0xE0, 0x0D, 0xC0, 0xB7,</div><div class='add'>+0x04, 0xDF, 0x20, 0x7C, 0x21, 0xF0, 0xCD, 0xC0, 0x07, 0x00, 0x0C, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x80, 0x08, 0x7F, 0x02, 0xFF, 0x00, 0x7C, 0x22, 0xF0, 0x0B,</div><div class='add'>+0xD0, 0x2C, 0x00, 0xF3, 0x00, 0xFC, 0x03, 0xF0, 0x0F, 0xC0, 0x3E, 0x00, 0xFF,</div><div class='add'>+0x00, 0xDC, 0x03, 0x30, 0x9B, 0xC0, 0x3F, 0x00, 0x7F, 0x01, 0xEE, 0x03, 0xF0,</div><div class='add'>+0x0F, 0xC1, 0x3F, 0x00, 0xEF, 0x05, 0xCC, 0x41, 0xF0, 0x0B, 0xC0, 0x3D, 0x00,</div><div class='add'>+0xFB, 0x10, 0x8C, 0x10, 0x30, 0x0F, 0xC0, 0x07, 0x20, 0x0C, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x81, 0x20, 0xD6, 0x00, 0xDD, 0x09, 0x74, 0x0A, 0xD0, 0x0D, 0x40,</div><div class='add'>+0x64, 0x22, 0xD1, 0x20, 0x74, 0x03, 0xD0, 0x0D, 0x40, 0x37, 0x00, 0xDD, 0x00,</div><div class='add'>+0x74, 0x03, 0x10, 0x09, 0x40, 0x37, 0x00, 0x9D, 0x02, 0x7E, 0x03, 0xD0, 0x0D,</div><div class='add'>+0x40, 0x27, 0x00, 0xDD, 0x07, 0x44, 0x05, 0xD0, 0x38, 0xC8, 0x76, 0x01, 0x89,</div><div class='add'>+0x00, 0x54, 0x0C, 0x50, 0x0D, 0x42, 0x07, 0x02, 0x08, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x01, 0xA0, 0x24, 0x04, 0x9D, 0x00, 0x74, 0x0B, 0xD2, 0x0D, 0x42, 0x34,</div><div class='add'>+0x40, 0xD1, 0x00, 0x74, 0x03, 0xD0, 0x0D, 0x40, 0x37, 0x00, 0xDD, 0x00, 0x74,</div><div class='add'>+0x03, 0x10, 0x05, 0x41, 0x37, 0x80, 0x1D, 0x66, 0x74, 0x03, 0xD0, 0x0D, 0x40,</div><div class='add'>+0x27, 0x00, 0x9D, 0x00, 0x64, 0x07, 0xD2, 0x35, 0x40, 0x75, 0x00, 0xD1, 0x00,</div><div class='add'>+0x44, 0x02, 0x11, 0x0D, 0x40, 0x07, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x10, 0x08, 0x30, 0x00, 0x8D, 0x20, 0x36, 0x03, 0xD0, 0x08, 0x40, 0x20, 0x00,</div><div class='add'>+0x81, 0x00, 0x34, 0x03, 0xD2, 0x0C, 0x40, 0x33, 0x00, 0xCD, 0x00, 0x34, 0x03,</div><div class='add'>+0x18, 0x04, 0x40, 0x33, 0xA0, 0x0D, 0x00, 0x14, 0x03, 0xD2, 0x0C, 0x48, 0x33,</div><div class='add'>+0x00, 0xCD, 0x00, 0x24, 0x03, 0xD0, 0x0C, 0x5A, 0x36, 0x00, 0xD1, 0x00, 0x14,</div><div class='add'>+0x00, 0x50, 0x0C, 0x40, 0x42, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x20, 0x26, 0x00, 0x9F, 0x20, 0x7C, 0x01, 0xF0, 0x09, 0xE8, 0x24, 0x00, 0x93,</div><div class='add'>+0x40, 0xFC, 0x03, 0xF0, 0x0D, 0x40, 0x3F, 0x00, 0xDF, 0x00, 0xBC, 0x23, 0x34,</div><div class='add'>+0x01, 0xC0, 0x37, 0x00, 0x1F, 0x00, 0x64, 0x03, 0xF0, 0x0F, 0xC0, 0x27, 0x00,</div><div class='add'>+0xDF, 0x00, 0x6C, 0x01, 0xF0, 0x09, 0xC0, 0x35, 0x80, 0x5B, 0x80, 0x4E, 0x00,</div><div class='add'>+0x32, 0x0F, 0xC8, 0x07, 0xC0, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0xA8,</div><div class='add'>+0x1F, 0x00, 0xBF, 0x00, 0xFC, 0x01, 0xF0, 0x0B, 0xC0, 0x2F, 0x00, 0xAF, 0x20,</div><div class='add'>+0xBC, 0x03, 0xF0, 0x0F, 0xC8, 0x3F, 0x00, 0xFF, 0x00, 0xFC, 0x03, 0xF0, 0x03,</div><div class='add'>+0xC0, 0x3F, 0x00, 0x3F, 0x00, 0xFC, 0x03, 0xF0, 0x0F, 0xC2, 0x2F, 0x00, 0x3F,</div><div class='add'>+0x00, 0xDC, 0x00, 0xF0, 0x0A, 0xC0, 0x3F, 0x00, 0x3F, 0x00, 0xFC, 0x80, 0xF8,</div><div class='add'>+0x0E, 0xC0, 0x17, 0x60, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xB0, 0x7F,</div><div class='add'>+0x00, 0x3F, 0x00, 0xEC, 0x07, 0x70, 0x03, 0xC0, 0x7D, 0x02, 0xF3, 0x09, 0xFC,</div><div class='add'>+0x10, 0xF0, 0x0B, 0xC0, 0x3C, 0x01, 0xBF, 0x21, 0xFC, 0x03, 0xF0, 0x0F, 0xC1,</div><div class='add'>+0x3F, 0x00, 0x3F, 0x18, 0xCD, 0x03, 0x30, 0x1F, 0xC0, 0x0F, 0x00, 0xFB, 0x00,</div><div class='add'>+0xFC, 0x03, 0xE0, 0x0F, 0xC0, 0x4C, 0x00, 0xF3, 0x00, 0xCC, 0x03, 0x30, 0x0F,</div><div class='add'>+0xC0, 0x0C, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x10, 0x77, 0x00,</div><div class='add'>+0x5D, 0x01, 0x44, 0x07, 0x10, 0xB1, 0x40, 0x33, 0x00, 0xC1, 0x04, 0x74, 0x06,</div><div class='add'>+0xD0, 0x29, 0x41, 0x3D, 0x00, 0xDD, 0x01, 0xF4, 0x07, 0xD0, 0x0E, 0x40, 0x77,</div><div class='add'>+0x00, 0x1D, 0x82, 0x44, 0x07, 0x10, 0x2F, 0x40, 0x67, 0x00, 0x51, 0x01, 0x74,</div><div class='add'>+0x07, 0xD0, 0x15, 0x40, 0x44, 0x00, 0x5B, 0x01, 0x44, 0x05, 0x10, 0x1D, 0x40,</div><div class='add'>+0x04, 0x60, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0xA0, 0x33, 0x00, 0x0D,</div><div class='add'>+0x08, 0x04, 0x03, 0x50, 0x14, 0x68, 0x31, 0x01, 0xC1, 0x00, 0x34, 0x20, 0xD0,</div><div class='add'>+0x6C, 0x40, 0xB1, 0x04, 0xCD, 0x01, 0x34, 0x23, 0xD0, 0x4C, 0x41, 0x31, 0x02,</div><div class='add'>+0x0D, 0x05, 0x24, 0x03, 0x10, 0x2C, 0x40, 0x23, 0x00, 0x85, 0x00, 0x34, 0x02,</div><div class='add'>+0x50, 0x08, 0x40, 0x01, 0x00, 0x85, 0x20, 0x04, 0x03, 0x10, 0x0C, 0x40, 0x44,</div><div class='add'>+0x80, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xA0, 0x35, 0x80, 0x5D, 0x14,</div><div class='add'>+0x65, 0x03, 0x10, 0x01, 0x40, 0x37, 0x00, 0xD1, 0x00, 0x74, 0x00, 0xD0, 0x0D,</div><div class='add'>+0x40, 0x35, 0x20, 0xDD, 0x01, 0x74, 0x03, 0xD1, 0x0D, 0x40, 0x37, 0x00, 0x1D,</div><div class='add'>+0x00, 0x64, 0x43, 0x10, 0x0D, 0x44, 0x67, 0x00, 0xD5, 0x06, 0x74, 0x03, 0xD1,</div><div class='add'>+0x0D, 0x51, 0x45, 0x40, 0xDD, 0x00, 0x44, 0x03, 0x10, 0x8D, 0x40, 0x0C, 0x00,</div><div class='add'>+0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x88, 0x37, 0x00, 0x9F, 0x01, 0x6C,</div><div class='add'>+0x07, 0x70, 0x01, 0xC0, 0x75, 0x40, 0xD3, 0x00, 0x7C, 0x11, 0xF0, 0x0D, 0xC0,</div><div class='add'>+0x35, 0x00, 0xDF, 0x01, 0x7C, 0x03, 0xF0, 0x0D, 0xC0, 0x37, 0x00, 0x5F, 0x00,</div><div class='add'>+0x6C, 0x03, 0x30, 0x0D, 0xC0, 0xE7, 0x00, 0xDF, 0x00, 0x7C, 0x01, 0xF0, 0x3D,</div><div class='add'>+0xC0, 0xC1, 0x84, 0xD7, 0x00, 0x4C, 0x07, 0x30, 0x0D, 0xC0, 0x08, 0x20, 0x0E,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x80, 0x3D, 0x00, 0x6F, 0x00, 0xDC, 0x0B,</div><div class='add'>+0xF0, 0x0F, 0xC0, 0x7F, 0x02, 0xFF, 0x00, 0xFC, 0x0F, 0xF0, 0x0D, 0xE0, 0x3F,</div><div class='add'>+0x00, 0xFF, 0x00, 0xFC, 0x03, 0xF0, 0x0F, 0xC6, 0x3F, 0x80, 0x9F, 0x28, 0xDC,</div><div class='add'>+0x27, 0xF0, 0x0F, 0xC0, 0x2F, 0x40, 0x7B, 0x00, 0xFC, 0x03, 0xF0, 0x96, 0xC0,</div><div class='add'>+0x0E, 0x00, 0xE3, 0x00, 0xBC, 0x09, 0xF0, 0x1E, 0xC0, 0x1F, 0x00, 0x06, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x02, 0x08, 0x35, 0x00, 0x9F, 0x02, 0x4C, 0x03, 0xF0,</div><div class='add'>+0x05, 0xC0, 0x34, 0x00, 0xD3, 0x00, 0x5C, 0x05, 0x70, 0x0D, 0xC8, 0x35, 0x08,</div><div class='add'>+0xD3, 0x80, 0x7C, 0x07, 0xF1, 0x0D, 0xC2, 0x34, 0x00, 0x5F, 0x00, 0x0C, 0x23,</div><div class='add'>+0x30, 0x0D, 0xC0, 0xA3, 0x00, 0x97, 0x00, 0x7C, 0x03, 0xB0, 0x29, 0xC0, 0x04,</div><div class='add'>+0x00, 0xDF, 0x00, 0x4C, 0x03, 0x30, 0x2D, 0xC0, 0x08, 0x20, 0x04, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x13, 0xA0, 0x34, 0x00, 0x5C, 0x00, 0x34, 0x3F, 0xD0, 0x0D,</div><div class='add'>+0xC0, 0x74, 0x01, 0xD1, 0x00, 0x44, 0x01, 0xD0, 0x9C, 0x48, 0x7C, 0x01, 0xD1,</div><div class='add'>+0x00, 0xF4, 0x03, 0xD0, 0x0F, 0x40, 0x3C, 0x01, 0x9D, 0x00, 0x6E, 0x03, 0xB0,</div><div class='add'>+0x4F, 0x40, 0x27, 0x08, 0xD1, 0x00, 0x74, 0x03, 0x10, 0x4D, 0xC0, 0x04, 0x00,</div><div class='add'>+0xDD, 0x00, 0x44, 0x93, 0x10, 0x0D, 0x40, 0x4C, 0x00, 0x02, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x03, 0x20, 0x32, 0x00, 0x0D, 0x00, 0x34, 0x0F, 0x90, 0x08, 0x40,</div><div class='add'>+0x34, 0x00, 0xC1, 0x00, 0x04, 0x00, 0x50, 0x08, 0x00, 0x31, 0x00, 0xC1, 0x00,</div><div class='add'>+0x34, 0x03, 0xD8, 0x0C, 0x40, 0x70, 0x00, 0x9D, 0x40, 0x04, 0x04, 0x90, 0x2C,</div><div class='add'>+0x41, 0x23, 0x00, 0xC5, 0x00, 0x36, 0x03, 0x10, 0x0C, 0x40, 0x42, 0x02, 0xCD,</div><div class='add'>+0x00, 0x24, 0x02, 0x10, 0x00, 0x40, 0x0C, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x04, 0x00, 0x7A, 0x08, 0xAD, 0x21, 0xB4, 0x07, 0xD2, 0x10, 0x40, 0xF8,</div><div class='add'>+0x02, 0xE1, 0x0B, 0x94, 0x26, 0xD0, 0x1A, 0x41, 0xF8, 0x00, 0xE0, 0x01, 0xB4,</div><div class='add'>+0x07, 0xD8, 0x3E, 0x40, 0x78, 0x00, 0x6D, 0x01, 0x84, 0x06, 0x90, 0x1E, 0x40,</div><div class='add'>+0x63, 0x80, 0xE1, 0x01, 0x34, 0x27, 0x10, 0x1C, 0x40, 0x48, 0x00, 0x4D, 0x01,</div><div class='add'>+0x24, 0x07, 0x10, 0x14, 0x42, 0x10, 0x20, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x12, 0x00, 0x32, 0x00, 0x0F, 0x00, 0x3C, 0x23, 0xF0, 0x0C, 0xC0, 0x30, 0x02,</div><div class='add'>+0xC3, 0x00, 0x1C, 0x03, 0x70, 0x8C, 0x40, 0x35, 0x00, 0xC1, 0x00, 0x3C, 0x23,</div><div class='add'>+0xF0, 0x0C, 0xC0, 0x30, 0x00, 0x8F, 0x00, 0x04, 0x11, 0x30, 0x8C, 0xC0, 0xB3,</div><div class='add'>+0x82, 0xC7, 0x00, 0x3C, 0x02, 0x30, 0x0C, 0xC0, 0x02, 0x00, 0x8F, 0x00, 0x2C,</div><div class='add'>+0x02, 0x30, 0x2C, 0xC0, 0x48, 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,</div><div class='add'>+0xA8, 0x3D, 0x00, 0xBF, 0x00, 0xFE, 0xA3, 0xF0, 0x83, 0xC0, 0x3F, 0x92, 0xFF,</div><div class='add'>+0x00, 0xEC, 0x83, 0xF0, 0x0F, 0xC0, 0xBF, 0x04, 0xFF, 0x00, 0xFC, 0x03, 0xF0,</div><div class='add'>+0x0F, 0xC0, 0x3F, 0x04, 0x7F, 0x08, 0xBC, 0x03, 0xF0, 0x0F, 0xC0, 0x3F, 0x00,</div><div class='add'>+0xFF, 0x00, 0xFC, 0x03, 0x75, 0x8F, 0xD0, 0x0F, 0x00, 0xFF, 0x00, 0x5C, 0x03,</div><div class='add'>+0xF0, 0x0F, 0xE0, 0x0B, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xA0,</div><div class='add'>+0x37, 0x00, 0xDF, 0x00, 0x7C, 0x03, 0xF0, 0x09, 0xC0, 0x37, 0x00, 0xD3, 0x01,</div><div class='add'>+0x0C, 0x04, 0x30, 0x0D, 0xC0, 0xB5, 0x01, 0xDB, 0x00, 0x7C, 0x7B, 0xF0, 0xED,</div><div class='add'>+0xC1, 0x34, 0x00, 0xDF, 0x00, 0x6C, 0x03, 0xB8, 0x8D, 0xC1, 0x27, 0x00, 0xDF,</div><div class='add'>+0x01, 0x4C, 0x05, 0x10, 0x0D, 0xC4, 0x04, 0x00, 0xDF, 0x00, 0x4C, 0x03, 0x30,</div><div class='add'>+0x19, 0xC0, 0x40, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x98, 0x39,</div><div class='add'>+0x00, 0xED, 0x00, 0xB4, 0x03, 0xD2, 0x0E, 0x40, 0x3B, 0x00, 0xF1, 0x00, 0x85,</div><div class='add'>+0x02, 0x50, 0x0E, 0x40, 0x33, 0x01, 0xE1, 0x00, 0xB4, 0x03, 0xD0, 0x0C, 0x40,</div><div class='add'>+0x38, 0x01, 0xCD, 0x00, 0xA4, 0x83, 0x10, 0x4E, 0xC0, 0x2B, 0x00, 0xED, 0x00,</div><div class='add'>+0x84, 0x03, 0x10, 0x0E, 0x40, 0x08, 0x00, 0xED, 0x80, 0x84, 0x03, 0x10, 0x0E,</div><div class='add'>+0x40, 0x48, 0x68, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x79, 0x00,</div><div class='add'>+0xED, 0x01, 0xB4, 0x47, 0xD0, 0x1E, 0x40, 0x7B, 0x00, 0xE1, 0x81, 0x84, 0x07,</div><div class='add'>+0x00, 0x1E, 0x41, 0x7B, 0x00, 0xE1, 0x03, 0xB4, 0x97, 0xD8, 0x5E, 0x40, 0x7A,</div><div class='add'>+0x00, 0xED, 0x01, 0x05, 0x07, 0x14, 0x5E, 0x44, 0x7B, 0x00, 0xC5, 0x01, 0x04,</div><div class='add'>+0x07, 0x90, 0x1C, 0x40, 0x4A, 0x00, 0xCD, 0x11, 0x04, 0x47, 0x10, 0x1C, 0x40,</div><div class='add'>+0x12, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16, 0x20, 0x33, 0xA0, 0xCD,</div><div class='add'>+0x1A, 0x34, 0x86, 0xD0, 0x0C, 0x41, 0x23, 0x02, 0xC1, 0x00, 0x04, 0x27, 0x5B,</div><div class='add'>+0x1D, 0x42, 0x33, 0x40, 0x41, 0x00, 0x34, 0x03, 0xD0, 0x0D, 0x50, 0x32, 0x00,</div><div class='add'>+0xCD, 0x06, 0x04, 0x07, 0x10, 0x0D, 0x40, 0xB1, 0x00, 0xCD, 0x00, 0x05, 0x07,</div><div class='add'>+0x94, 0x0C, 0x50, 0xF2, 0x04, 0xCD, 0x00, 0x05, 0x03, 0x14, 0x0C, 0x78, 0x5A,</div><div class='add'>+0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x17, 0xA8, 0x17, 0x00, 0x7F, 0x03,</div><div class='add'>+0x7C, 0x01, 0xF0, 0x77, 0x40, 0x57, 0x40, 0x53, 0x00, 0xCC, 0x05, 0x30, 0x05,</div><div class='add'>+0xC0, 0x17, 0x00, 0x73, 0xC1, 0x74, 0x01, 0xF0, 0x05, 0xC8, 0x16, 0x10, 0x7F,</div><div class='add'>+0x02, 0xEC, 0x11, 0xB0, 0x05, 0x40, 0x1F, 0x00, 0x7F, 0x00, 0xCC, 0x15, 0xB0,</div><div class='add'>+0x07, 0xC0, 0xDA, 0x09, 0x7F, 0x03, 0xCC, 0x05, 0x30, 0x27, 0xC0, 0x5E, 0x20,</div><div class='add'>+0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x80, 0x05, 0x00, 0x0F, 0x00, 0x74,</div><div class='add'>+0x00, 0xF0, 0x01, 0xC0, 0x07, 0x00, 0x1F, 0x00, 0x7C, 0x00, 0xF0, 0x01, 0xC0,</div><div class='add'>+0x07, 0x00, 0x17, 0x01, 0x3C, 0x00, 0xF0, 0x01, 0xC0, 0x05, 0xA0, 0x1B, 0x00,</div><div class='add'>+0x3E, 0x04, 0x70, 0x01, 0xC0, 0x07, 0x04, 0x1F, 0x00, 0x7C, 0x00, 0x74, 0x01,</div><div class='add'>+0xC0, 0x85, 0x00, 0x0F, 0x00, 0x3C, 0x00, 0xF0, 0x01, 0xC0, 0x49, 0x00, 0x06,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x08, 0x25, 0x00, 0x9F, 0x00, 0x4C, 0x02,</div><div class='add'>+0xF0, 0x08, 0xD4, 0x24, 0x00, 0x93, 0x02, 0x7C, 0x02, 0xF0, 0x09, 0xC0, 0x26,</div><div class='add'>+0x40, 0x93, 0x00, 0x4C, 0x02, 0xB0, 0x09, 0xD0, 0x24, 0x00, 0x9F, 0x00, 0x4C,</div><div class='add'>+0x82, 0x30, 0x09, 0xC0, 0x24, 0x00, 0x9F, 0x00, 0x7C, 0x42, 0xF0, 0x08, 0xC0,</div><div class='add'>+0x24, 0x00, 0x93, 0x10, 0x4C, 0x02, 0x34, 0x09, 0xC1, 0x43, 0x20, 0x04, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x01, 0x20, 0x26, 0x00, 0x9D, 0x00, 0x44, 0x06, 0xD0,</div><div class='add'>+0x09, 0x40, 0x20, 0x00, 0x91, 0x10, 0x74, 0x02, 0xD0, 0x19, 0x48, 0xA4, 0x00,</div><div class='add'>+0x81, 0x00, 0x44, 0x02, 0x10, 0x29, 0xC0, 0x26, 0x00, 0x9D, 0x00, 0x44, 0x02,</div><div class='add'>+0xB0, 0x09, 0xC0, 0xA6, 0x00, 0x9D, 0x02, 0x5C, 0x0A, 0xD0, 0x29, 0x40, 0x24,</div><div class='add'>+0x00, 0x91, 0x02, 0x4C, 0x0A, 0x10, 0x29, 0x40, 0x07, 0x00, 0x08, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x1C, 0xA0, 0x24, 0x00, 0x9D, 0x00, 0x44, 0x06, 0xD0, 0x09,</div><div class='add'>+0x48, 0x64, 0x00, 0x91, 0x00, 0x74, 0x06, 0x50, 0x89, 0x40, 0x62, 0x84, 0x99,</div><div class='add'>+0x00, 0x44, 0x06, 0x10, 0x19, 0x63, 0x64, 0x80, 0x8D, 0x00, 0x44, 0x02, 0x10,</div><div class='add'>+0x09, 0x42, 0x24, 0x04, 0x91, 0x10, 0x74, 0x42, 0xD0, 0x09, 0x51, 0x24, 0x00,</div><div class='add'>+0x99, 0x30, 0x44, 0xC3, 0x10, 0x09, 0x41, 0x73, 0x00, 0x02, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x14, 0x28, 0x20, 0x00, 0x8D, 0x04, 0x04, 0x02, 0xD0, 0x48, 0x40,</div><div class='add'>+0x34, 0x40, 0x81, 0x00, 0x34, 0x12, 0xD0, 0x4C, 0x40, 0x20, 0x81, 0x99, 0x00,</div><div class='add'>+0x04, 0x12, 0x10, 0x48, 0x40, 0x20, 0x21, 0x8D, 0x04, 0x06, 0x12, 0x90, 0x4C,</div><div class='add'>+0x48, 0x20, 0x01, 0x8D, 0x04, 0x14, 0x12, 0xD8, 0x48, 0x60, 0x20, 0x00, 0x89,</div><div class='add'>+0xC4, 0x04, 0x12, 0x10, 0x48, 0x60, 0x53, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x1D, 0xB0, 0x06, 0x00, 0x1F, 0x00, 0x4C, 0x01, 0xF0, 0x01, 0xC0, 0x80,</div><div class='add'>+0x02, 0x13, 0x0A, 0x74, 0x00, 0x70, 0xA1, 0xC0, 0x86, 0x22, 0x19, 0x00, 0x45,</div><div class='add'>+0x00, 0x30, 0xA1, 0x40, 0x04, 0x00, 0x1F, 0x0A, 0x4D, 0x00, 0x30, 0xA1, 0x40,</div><div class='add'>+0x04, 0x00, 0x1F, 0x00, 0x7C, 0x00, 0xF1, 0x01, 0xC8, 0x14, 0x00, 0x13, 0x00,</div><div class='add'>+0x4C, 0x00, 0x30, 0x01, 0xC0, 0x77, 0xC0, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x19, 0xA8, 0x27, 0x00, 0xBF, 0x88, 0xFD, 0x02, 0xF0, 0x8B, 0x80, 0x2F, 0x00,</div><div class='add'>+0x9F, 0x00, 0xFC, 0xA2, 0xF0, 0x8B, 0xC0, 0x27, 0x42, 0xB7, 0x00, 0x7C, 0x22,</div><div class='add'>+0xF4, 0x89, 0xC0, 0x27, 0x22, 0xBF, 0x08, 0xFC, 0x22, 0x74, 0x89, 0xD0, 0x2F,</div><div class='add'>+0x02, 0xBF, 0x08, 0xDC, 0x22, 0xF1, 0x8B, 0xC0, 0x2F, 0x40, 0xB7, 0x28, 0xDD,</div><div class='add'>+0x22, 0xF0, 0x8B, 0xC0, 0x67, 0x20, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18,</div><div class='add'>+0xA8, 0x27, 0x00, 0x9F, 0x04, 0xFE, 0x02, 0xF0, 0x09, 0xC0, 0x2F, 0x02, 0xBF,</div><div class='add'>+0x00, 0xDC, 0x52, 0xB0, 0xCA, 0xC8, 0x2E, 0x08, 0xBF, 0xA0, 0xDC, 0x82, 0x32,</div><div class='add'>+0x4B, 0xC2, 0x6F, 0x01, 0xDF, 0x0C, 0xFC, 0x02, 0x34, 0x0B, 0xC0, 0x26, 0x00,</div><div class='add'>+0x93, 0x04, 0x5C, 0x52, 0xF0, 0x49, 0xC0, 0x24, 0x00, 0x9F, 0x00, 0x7C, 0x02,</div><div class='add'>+0x30, 0x49, 0xC0, 0x63, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1C, 0x08,</div><div class='add'>+0x07, 0x00, 0x1D, 0x08, 0x74, 0x00, 0xD0, 0x01, 0x40, 0x07, 0x00, 0x1D, 0x14,</div><div class='add'>+0x74, 0x00, 0xD0, 0xC1, 0x40, 0x84, 0x04, 0x1D, 0x00, 0x5C, 0x20, 0x10, 0x41,</div><div class='add'>+0x43, 0x07, 0x00, 0x1D, 0x0C, 0x74, 0x08, 0x10, 0x01, 0x41, 0x04, 0x42, 0x13,</div><div class='add'>+0x00, 0x44, 0x00, 0xD0, 0x81, 0x40, 0x04, 0x00, 0x1D, 0x00, 0x7C, 0x20, 0x10,</div><div class='add'>+0x03, 0x40, 0x73, 0x60, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x21,</div><div class='add'>+0x00, 0x8D, 0x00, 0x34, 0x02, 0xD0, 0x88, 0x40, 0x23, 0x00, 0x8D, 0x04, 0x34,</div><div class='add'>+0x02, 0x90, 0x48, 0x40, 0x22, 0x03, 0x8D, 0x00, 0x34, 0x02, 0x10, 0xC8, 0x40,</div><div class='add'>+0x23, 0x02, 0x8D, 0x44, 0x34, 0x22, 0x12, 0x88, 0x48, 0x28, 0x80, 0xA1, 0x09,</div><div class='add'>+0xB4, 0x06, 0xD0, 0x1A, 0x40, 0x28, 0x00, 0xAD, 0x89, 0xB4, 0x06, 0x10, 0x9A,</div><div class='add'>+0x40, 0x4B, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x28, 0x25, 0x00,</div><div class='add'>+0x9D, 0x00, 0x74, 0x06, 0xD0, 0x09, 0x40, 0x27, 0x00, 0x9D, 0x00, 0x74, 0x02,</div><div class='add'>+0xD0, 0x0D, 0x60, 0x24, 0x00, 0x9D, 0x02, 0x74, 0x02, 0x10, 0x09, 0x40, 0x27,</div><div class='add'>+0x00, 0x9D, 0x00, 0x74, 0x02, 0x10, 0x0D, 0x40, 0xA4, 0x00, 0xB9, 0x00, 0xE4,</div><div class='add'>+0x02, 0xD0, 0x4B, 0x40, 0x2C, 0x00, 0xBC, 0x40, 0xF4, 0x02, 0x10, 0x8B, 0x40,</div><div class='add'>+0x63, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0xA8, 0x27, 0x00, 0x9F,</div><div class='add'>+0x00, 0x74, 0x02, 0xF0, 0x19, 0x40, 0x27, 0x00, 0x9F, 0x00, 0x7C, 0x6A, 0x90,</div><div class='add'>+0x09, 0xC0, 0x26, 0x00, 0x9F, 0x00, 0x7C, 0x02, 0x30, 0x09, 0xC0, 0x27, 0x00,</div><div class='add'>+0x9F, 0x00, 0x7C, 0x22, 0x30, 0x09, 0xD0, 0x60, 0x00, 0x93, 0x0B, 0x7C, 0x0A,</div><div class='add'>+0xF0, 0x39, 0xD0, 0x64, 0x04, 0x9F, 0x02, 0x7C, 0x0A, 0x34, 0x39, 0xC0, 0x17,</div><div class='add'>+0xA0, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x80, 0x25, 0x00, 0x9F, 0x20,</div><div class='add'>+0x7C, 0x42, 0xF0, 0x49, 0xC0, 0x67, 0x02, 0x9F, 0x00, 0x7C, 0x02, 0xD0, 0x98,</div><div class='add'>+0xC0, 0x27, 0x00, 0x9F, 0x09, 0x1C, 0x02, 0xF4, 0x09, 0xC0, 0x27, 0x80, 0x9F,</div><div class='add'>+0x00, 0x3C, 0x02, 0xF0, 0x09, 0xC0, 0x25, 0x01, 0x87, 0x01, 0x5C, 0x16, 0xF0,</div><div class='add'>+0x19, 0xC0, 0x67, 0x01, 0x9E, 0x05, 0x5C, 0x02, 0xF0, 0x19, 0xC0, 0x4B, 0x00,</div><div class='add'>+0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x08, 0x05, 0x00, 0x1F, 0x00, 0x4C,</div><div class='add'>+0x80, 0xF2, 0x01, 0xC2, 0x04, 0x04, 0x1F, 0x00, 0x7C, 0x08, 0x30, 0x01, 0xC0,</div><div class='add'>+0x07, 0x04, 0x13, 0x00, 0x6C, 0x00, 0xF0, 0x01, 0xD0, 0x04, 0x00, 0x1F, 0x00,</div><div class='add'>+0x4C, 0x80, 0xB0, 0x01, 0xC0, 0x06, 0x00, 0x17, 0x00, 0x7C, 0x00, 0x70, 0x00,</div><div class='add'>+0xC0, 0x04, 0x00, 0x1F, 0x00, 0x0C, 0x00, 0xF2, 0x01, 0xC0, 0x43, 0x20, 0x04,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x80, 0x14, 0x20, 0x5D, 0x00, 0xD0, 0x11,</div><div class='add'>+0x70, 0x05, 0x40, 0x9C, 0x00, 0x7D, 0x11, 0x74, 0x01, 0x00, 0x37, 0xC1, 0x5E,</div><div class='add'>+0x00, 0x51, 0x05, 0x40, 0x05, 0xD0, 0x17, 0x40, 0x54, 0x00, 0x5D, 0x00, 0x44,</div><div class='add'>+0x01, 0x30, 0x07, 0x40, 0x14, 0x00, 0x51, 0x00, 0x74, 0x01, 0x50, 0x05, 0x50,</div><div class='add'>+0x14, 0x10, 0x5D, 0x21, 0x54, 0x01, 0xD0, 0x15, 0x40, 0x53, 0x00, 0x02, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x14, 0xA0, 0x32, 0x00, 0xCD, 0x00, 0x04, 0x0D, 0x50,</div><div class='add'>+0x0C, 0x40, 0x30, 0x00, 0xCD, 0x00, 0x34, 0x06, 0x10, 0x34, 0x51, 0x71, 0x00,</div><div class='add'>+0x81, 0x01, 0x34, 0x26, 0xD0, 0x1C, 0x40, 0x60, 0x02, 0xCD, 0x00, 0x04, 0x22,</div><div class='add'>+0x10, 0x85, 0x40, 0x32, 0x00, 0xCD, 0x00, 0x34, 0x03, 0x10, 0x0C, 0x40, 0x32,</div><div class='add'>+0x00, 0xC9, 0x01, 0x04, 0x03, 0xD0, 0x1C, 0x60, 0x53, 0x00, 0x0A, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x01, 0x88, 0x38, 0x00, 0xED, 0x21, 0x84, 0x03, 0x50, 0x1E,</div><div class='add'>+0x40, 0x38, 0xA0, 0xED, 0x00, 0x34, 0x0F, 0x10, 0x06, 0x40, 0x7A, 0x44, 0xA1,</div><div class='add'>+0x01, 0x94, 0x03, 0xD0, 0x1E, 0x41, 0x38, 0x00, 0xCD, 0x09, 0x04, 0x02, 0x10,</div><div class='add'>+0x06, 0x40, 0x32, 0x00, 0xE9, 0x00, 0xB4, 0x07, 0x50, 0x0A, 0x40, 0x2A, 0x00,</div><div class='add'>+0xCD, 0x11, 0x94, 0x02, 0xD0, 0x0E, 0x41, 0x07, 0x20, 0x02, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x11, 0x10, 0x78, 0x00, 0xCF, 0x01, 0x85, 0x07, 0x70, 0x1C, 0xD0,</div><div class='add'>+0x58, 0x00, 0x2F, 0x01, 0xBC, 0x07, 0x34, 0x16, 0xC0, 0x5D, 0x00, 0xA1, 0x01,</div><div class='add'>+0xBC, 0x07, 0xF0, 0x17, 0xC0, 0x78, 0x00, 0xEE, 0x11, 0x8D, 0x06, 0x39, 0x14,</div><div class='add'>+0xC0, 0x5A, 0x00, 0x6F, 0x01, 0x3C, 0x05, 0x70, 0x14, 0xC0, 0x5A, 0x00, 0x6D,</div><div class='add'>+0x01, 0x8C, 0x05, 0xF0, 0x16, 0xC4, 0x47, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x10, 0xA8, 0x35, 0x00, 0xDF, 0x00, 0x7C, 0x03, 0x70, 0x0D, 0xC0, 0x07,</div><div class='add'>+0x00, 0x1F, 0x00, 0x7C, 0x03, 0x78, 0x01, 0xC8, 0x07, 0x00, 0x8F, 0x00, 0x6C,</div><div class='add'>+0x03, 0xF0, 0x05, 0xC0, 0x37, 0x00, 0xDF, 0x82, 0x7E, 0x02, 0x74, 0x07, 0xC4,</div><div class='add'>+0x15, 0x00, 0x57, 0x00, 0x7C, 0x01, 0xB4, 0x01, 0xC0, 0x05, 0x00, 0x5F, 0x20,</div><div class='add'>+0x6D, 0x00, 0xF0, 0x05, 0xC0, 0x43, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x20, 0x7D, 0x00, 0xFF, 0x01, 0x8C, 0x13, 0x70, 0x1F, 0xC0, 0x7F, 0x00,</div><div class='add'>+0xF3, 0x01, 0xCC, 0x07, 0x30, 0x17, 0xC2, 0x6F, 0x10, 0xF2, 0x01, 0xFC, 0x07,</div><div class='add'>+0xF0, 0x1B, 0xC0, 0x7C, 0x20, 0xF7, 0x81, 0xFC, 0x06, 0xF0, 0x13, 0xC2, 0x79,</div><div class='add'>+0x00, 0xF3, 0x01, 0xFC, 0x07, 0x30, 0x1F, 0xC8, 0x7F, 0x00, 0xBB, 0x01, 0xCC,</div><div class='add'>+0x87, 0x30, 0x1B, 0xC0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15,</div><div class='add'>+0x18, 0x39, 0x00, 0xED, 0x08, 0x8C, 0x03, 0x10, 0x0E, 0x40, 0x1F, 0x00, 0xE1,</div><div class='add'>+0x08, 0x84, 0x03, 0x14, 0x02, 0x40, 0x1B, 0x01, 0xE1, 0x00, 0xB4, 0x03, 0xD0,</div><div class='add'>+0x0A, 0x40, 0x38, 0x00, 0xE1, 0x10, 0xB4, 0x13, 0x10, 0x42, 0x40, 0x38, 0x01,</div><div class='add'>+0xE1, 0x00, 0x9C, 0x03, 0x10, 0x4A, 0x40, 0x2B, 0x20, 0xA1, 0x00, 0xAC, 0x02,</div><div class='add'>+0x10, 0x0A, 0x40, 0x54, 0x60, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x39, 0x00, 0xED, 0x10, 0xA4, 0x23, 0x50, 0x0E, 0x41, 0x3B, 0x44, 0x61, 0x00,</div><div class='add'>+0x84, 0x03, 0x50, 0x06, 0x40, 0x2B, 0x00, 0xE1, 0x00, 0xB4, 0x23, 0xD0, 0x02,</div><div class='add'>+0x40, 0x38, 0x00, 0xE5, 0x00, 0x34, 0x02, 0x50, 0x02, 0x60, 0x19, 0x10, 0x61,</div><div class='add'>+0x00, 0xB4, 0x01, 0x90, 0x06, 0x44, 0x1F, 0x02, 0x01, 0x00, 0x84, 0x01, 0x10,</div><div class='add'>+0x00, 0x40, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x20, 0x31,</div><div class='add'>+0x20, 0xCD, 0x03, 0x24, 0x03, 0x10, 0x0C, 0x40, 0x03, 0x00, 0x51, 0x00, 0x04,</div><div class='add'>+0x4B, 0x50, 0x00, 0x40, 0x03, 0x00, 0xC1, 0x43, 0x36, 0x03, 0xD0, 0x00, 0x40,</div><div class='add'>+0x30, 0x00, 0xC1, 0x03, 0x34, 0x0B, 0x10, 0x00, 0x40, 0x90, 0x40, 0x41, 0x42,</div><div class='add'>+0x14, 0x01, 0x90, 0x20, 0x40, 0x83, 0x2E, 0x01, 0x02, 0x24, 0x08, 0x10, 0x00,</div><div class='add'>+0x40, 0x10, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0xA8, 0x35, 0x00,</div><div class='add'>+0xDF, 0x03, 0x6D, 0x03, 0x70, 0x3D, 0xC0, 0x67, 0x00, 0xD3, 0x00, 0x4D, 0x0B,</div><div class='add'>+0x70, 0x0D, 0xC2, 0x37, 0x40, 0x93, 0x01, 0x3C, 0x03, 0xF0, 0x0D, 0xD0, 0x30,</div><div class='add'>+0x00, 0xF7, 0x23, 0x7C, 0x0A, 0x70, 0x05, 0xC0, 0xA1, 0x00, 0x93, 0x03, 0x7C,</div><div class='add'>+0x06, 0xB0, 0x3D, 0xC0, 0xF7, 0x00, 0xD3, 0xA3, 0x4D, 0x8F, 0x34, 0x1D, 0xD0,</div><div class='add'>+0x54, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x37, 0x00, 0xDF,</div><div class='add'>+0x04, 0x5C, 0x0F, 0xF0, 0x0D, 0xC0, 0x37, 0x08, 0x5F, 0x00, 0x3C, 0x03, 0xB0,</div><div class='add'>+0x09, 0xC0, 0x37, 0x20, 0x9F, 0x08, 0x7C, 0x83, 0xF0, 0x05, 0xC0, 0x37, 0x00,</div><div class='add'>+0xCF, 0x04, 0x7C, 0x02, 0x70, 0x20, 0xC0, 0x27, 0x04, 0x8F, 0x11, 0x1C, 0x46,</div><div class='add'>+0x74, 0x19, 0xC1, 0x27, 0x00, 0xD7, 0x01, 0x5C, 0x06, 0xF0, 0x1D, 0xC0, 0x07,</div><div class='add'>+0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x84, 0x08, 0x3F, 0x00, 0xDF, 0x00,</div><div class='add'>+0xFC, 0x03, 0xF0, 0x0E, 0xC1, 0x0C, 0x08, 0xBF, 0x03, 0x4C, 0x03, 0x30, 0x0E,</div><div class='add'>+0xD0, 0x14, 0x00, 0xBF, 0x19, 0xCC, 0x17, 0x30, 0x89, 0xC0, 0x34, 0x00, 0xF7,</div><div class='add'>+0x00, 0xCC, 0x42, 0xF0, 0x05, 0xC0, 0x8E, 0x00, 0x37, 0x08, 0x68, 0x20, 0x30,</div><div class='add'>+0x07, 0xC0, 0x1F, 0x00, 0x7F, 0x10, 0x7C, 0x41, 0xF0, 0x07, 0xC0, 0x13, 0x22,</div><div class='add'>+0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x85, 0x00, 0x36, 0x00, 0xDD, 0x00, 0x74,</div><div class='add'>+0x0F, 0xD0, 0x0D, 0xC0, 0x46, 0x00, 0x1D, 0x01, 0x44, 0x27, 0x10, 0x31, 0x40,</div><div class='add'>+0x04, 0x00, 0x8D, 0x01, 0x44, 0x07, 0x10, 0x01, 0x40, 0x34, 0x00, 0xDB, 0x00,</div><div class='add'>+0x44, 0x02, 0xD0, 0x19, 0x40, 0x44, 0x00, 0x11, 0x00, 0x44, 0x00, 0x10, 0x01,</div><div class='add'>+0x40, 0x07, 0x00, 0x5D, 0x00, 0x74, 0x00, 0xD0, 0x05, 0x40, 0x17, 0x02, 0x08,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xA0, 0x34, 0x00, 0xDD, 0x00, 0x74, 0x0F,</div><div class='add'>+0xD0, 0x0D, 0x40, 0x24, 0x01, 0x9D, 0x10, 0x54, 0x03, 0x14, 0x1D, 0x40, 0x24,</div><div class='add'>+0x20, 0x9D, 0x00, 0x46, 0x03, 0x10, 0x0C, 0x41, 0x36, 0x02, 0xD0, 0x00, 0x44,</div><div class='add'>+0x02, 0xD8, 0x11, 0x40, 0x27, 0x00, 0x95, 0x00, 0x74, 0x02, 0x50, 0x0D, 0x40,</div><div class='add'>+0x37, 0x00, 0x98, 0x00, 0x74, 0x03, 0xD0, 0x09, 0x40, 0x07, 0x00, 0x02, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x10, 0x28, 0x30, 0x80, 0xCD, 0x00, 0x34, 0x03, 0xD0,</div><div class='add'>+0x0C, 0x50, 0x12, 0x00, 0x0D, 0x00, 0x14, 0x03, 0x10, 0x08, 0x40, 0x10, 0x00,</div><div class='add'>+0x9D, 0x00, 0x04, 0x03, 0x10, 0x04, 0x48, 0x30, 0x00, 0xC9, 0x00, 0x04, 0x03,</div><div class='add'>+0xD0, 0x00, 0x40, 0x25, 0x00, 0x81, 0x00, 0x15, 0x02, 0x54, 0x08, 0x40, 0x23,</div><div class='add'>+0x80, 0x8D, 0x00, 0x34, 0x02, 0xD0, 0x08, 0x40, 0x43, 0xA0, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0xB0, 0x36, 0x00, 0xDF, 0x00, 0x7C, 0x03, 0xF0, 0x0D,</div><div class='add'>+0xC0, 0x24, 0x00, 0x8F, 0x00, 0x5D, 0x03, 0x14, 0x05, 0xC0, 0x24, 0x20, 0x9E,</div><div class='add'>+0x00, 0x4D, 0x03, 0x34, 0x09, 0xD0, 0x34, 0x00, 0xF7, 0x00, 0x4D, 0x02, 0xF0,</div><div class='add'>+0x01, 0xC0, 0x07, 0x00, 0x17, 0x00, 0x7C, 0x00, 0x70, 0x05, 0xC8, 0x17, 0x10,</div><div class='add'>+0x1F, 0x00, 0x7C, 0x01, 0xF0, 0x01, 0xC0, 0x03, 0xC0, 0x0A, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x05, 0xA8, 0x3F, 0x20, 0xFF, 0x00, 0xFC, 0x02, 0xF0, 0x0F, 0xC0,</div><div class='add'>+0x0D, 0x00, 0x3F, 0x00, 0xEC, 0x03, 0xF0, 0x03, 0xC0, 0x0F, 0x00, 0xBF, 0x00,</div><div class='add'>+0xFC, 0x03, 0xF0, 0x03, 0xC0, 0x3F, 0x00, 0xFF, 0x00, 0xFC, 0x03, 0xF0, 0x0B,</div><div class='add'>+0xC0, 0x0E, 0x00, 0x3F, 0x20, 0xEC, 0x00, 0xB0, 0x03, 0xC0, 0x0B, 0x00, 0x3F,</div><div class='add'>+0x40, 0xFC, 0x00, 0xF0, 0x03, 0xC0, 0x17, 0x20, 0x0E, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x03, 0xA0, 0x2F, 0x00, 0xBF, 0x00, 0xCC, 0x03, 0xB0, 0x1B, 0xC0, 0x2F,</div><div class='add'>+0x21, 0xF3, 0x24, 0xEC, 0x25, 0xF0, 0x1F, 0xD0, 0x3C, 0x00, 0xFB, 0x88, 0xCC,</div><div class='add'>+0x84, 0xB0, 0x4F, 0xC0, 0x7F, 0x22, 0x2F, 0x01, 0xF4, 0x05, 0x30, 0x0B, 0xC1,</div><div class='add'>+0xEF, 0x00, 0x2F, 0x01, 0xEC, 0x04, 0x30, 0x12, 0xC0, 0x5E, 0x08, 0x2F, 0x01,</div><div class='add'>+0xCE, 0x0D, 0x30, 0x0B, 0xC0, 0x0D, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x01, 0x00, 0x27, 0x10, 0x9D, 0x01, 0x44, 0x0F, 0x10, 0x15, 0x40, 0x67, 0x00,</div><div class='add'>+0xD1, 0x14, 0x44, 0x02, 0xD0, 0x4D, 0x40, 0xBC, 0x04, 0xF1, 0x0E, 0x44, 0x07,</div><div class='add'>+0x10, 0xBF, 0x40, 0x37, 0x00, 0x17, 0x94, 0x64, 0x05, 0x10, 0x39, 0x40, 0x37,</div><div class='add'>+0x11, 0x5D, 0x21, 0x44, 0x05, 0x51, 0x19, 0x40, 0x75, 0x30, 0x1D, 0x21, 0x46,</div><div class='add'>+0x02, 0x10, 0x11, 0xC0, 0x0D, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11,</div><div class='add'>+0xA0, 0x23, 0x00, 0x0D, 0x80, 0x05, 0x0B, 0xD8, 0x08, 0x40, 0x23, 0x02, 0xC1,</div><div class='add'>+0x0C, 0x24, 0x02, 0x50, 0x08, 0x41, 0xB0, 0x81, 0xC9, 0x04, 0x54, 0x07, 0x90,</div><div class='add'>+0x0C, 0x40, 0x33, 0x11, 0x0D, 0x00, 0x74, 0x00, 0x10, 0x0C, 0x44, 0x31, 0x01,</div><div class='add'>+0x49, 0x00, 0x24, 0x00, 0x12, 0x0D, 0x44, 0x31, 0x00, 0x1D, 0x40, 0x64, 0x13,</div><div class='add'>+0x90, 0x08, 0x40, 0x4D, 0x80, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xA8,</div><div class='add'>+0x65, 0x00, 0x9D, 0x11, 0x44, 0x03, 0x18, 0x65, 0x40, 0x27, 0x00, 0xD1, 0x00,</div><div class='add'>+0x42, 0x02, 0xD0, 0x08, 0x40, 0x34, 0x08, 0xC1, 0x00, 0x55, 0x03, 0x10, 0x0D,</div><div class='add'>+0x40, 0x37, 0x00, 0x9D, 0x11, 0x64, 0x00, 0x1C, 0x0D, 0x40, 0x37, 0x10, 0x5D,</div><div class='add'>+0x11, 0x44, 0x45, 0x50, 0x89, 0x00, 0x75, 0x00, 0x1D, 0x10, 0x64, 0x43, 0x96,</div><div class='add'>+0x11, 0x40, 0x0D, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA0, 0x47,</div><div class='add'>+0x04, 0x9F, 0x21, 0x44, 0x03, 0xF2, 0x05, 0xC0, 0x33, 0x40, 0xD3, 0x00, 0x6C,</div><div class='add'>+0x03, 0xF1, 0x0D, 0xC0, 0x34, 0x00, 0xDB, 0x00, 0x54, 0x04, 0xB0, 0x0D, 0xC0,</div><div class='add'>+0x37, 0x00, 0x1F, 0x01, 0x7C, 0x14, 0x30, 0x09, 0xC0, 0x35, 0x00, 0x5B, 0x01,</div><div class='add'>+0x2C, 0x0D, 0x30, 0x31, 0x82, 0x77, 0x01, 0x1D, 0x22, 0x64, 0x0F, 0xB1, 0x31,</div><div class='add'>+0xC1, 0x81, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x88, 0x2D, 0x00,</div><div class='add'>+0xAF, 0x00, 0xBC, 0x03, 0xF0, 0x07, 0xC0, 0x3F, 0x02, 0xEF, 0x80, 0xFC, 0x82,</div><div class='add'>+0xF0, 0x8F, 0xC0, 0x3F, 0x00, 0xFF, 0x00, 0xEC, 0xA0, 0xF0, 0x0F, 0xC2, 0x3F,</div><div class='add'>+0x10, 0x37, 0x00, 0xEC, 0xA4, 0x70, 0x9B, 0xC0, 0x3F, 0x00, 0x7F, 0x00, 0xFC,</div><div class='add'>+0x01, 0xF0, 0x13, 0xC0, 0x2F, 0x00, 0x3F, 0x08, 0xDD, 0x27, 0x70, 0x03, 0xC0,</div><div class='add'>+0x1F, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x08, 0x05, 0x02, 0x13,</div><div class='add'>+0x10, 0x7E, 0x23, 0xB0, 0x05, 0xC0, 0x37, 0x03, 0xDF, 0x80, 0x7C, 0x03, 0xF1,</div><div class='add'>+0x09, 0xC0, 0x35, 0x80, 0xDF, 0x08, 0x4C, 0x80, 0x70, 0x0D, 0xC1, 0x37, 0x00,</div><div class='add'>+0x93, 0x02, 0x5C, 0x08, 0xF8, 0x0D, 0xC2, 0x37, 0x00, 0x5F, 0x0E, 0x78, 0x1B,</div><div class='add'>+0x70, 0x25, 0xC4, 0xA5, 0x00, 0x53, 0x00, 0x6C, 0x4B, 0x31, 0x09, 0xC4, 0x0B,</div><div class='add'>+0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0xA0, 0xE4, 0x02, 0x91, 0x00,</div><div class='add'>+0xF4, 0x07, 0x10, 0x05, 0x41, 0x77, 0x00, 0xFD, 0x00, 0x44, 0x02, 0xD0, 0x19,</div><div class='add'>+0xC8, 0x3E, 0x20, 0xFF, 0x00, 0x00, 0x2C, 0x10, 0x1F, 0x40, 0x37, 0x00, 0x91,</div><div class='add'>+0x00, 0x04, 0x00, 0xF0, 0x0D, 0x40, 0x37, 0x00, 0x4C, 0x01, 0x44, 0x05, 0xB0,</div><div class='add'>+0x04, 0x40, 0x24, 0x00, 0x4B, 0x04, 0x24, 0x83, 0x14, 0x71, 0x40, 0x6F, 0x00,</div><div class='add'>+0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x20, 0x40, 0x00, 0x01, 0x00, 0x34,</div><div class='add'>+0x83, 0x14, 0x3C, 0x41, 0xA3, 0x10, 0xCD, 0x00, 0x14, 0x01, 0xD0, 0x9C, 0x40,</div><div class='add'>+0x35, 0x08, 0xCD, 0x01, 0x04, 0x08, 0x50, 0xBC, 0x60, 0x32, 0x00, 0x05, 0x00,</div><div class='add'>+0x14, 0x01, 0xD0, 0x68, 0x40, 0x23, 0x00, 0x49, 0x03, 0x14, 0x8C, 0xD1, 0xB4,</div><div class='add'>+0x41, 0x31, 0x00, 0x00, 0x00, 0x04, 0x23, 0x10, 0x48, 0x40, 0x0F, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x58, 0x00, 0x61, 0x01, 0xB4, 0x07,</div><div class='add'>+0x10, 0x16, 0x40, 0x6B, 0x00, 0xED, 0x01, 0x96, 0x06, 0xD0, 0x1E, 0x40, 0x7A,</div><div class='add'>+0x00, 0xC5, 0x41, 0x84, 0x47, 0x10, 0x1E, 0x68, 0x7B, 0x00, 0xF1, 0x00, 0x84,</div><div class='add'>+0x05, 0x50, 0x9A, 0x40, 0x7B, 0x02, 0x7D, 0x01, 0xC4, 0x14, 0x90, 0x1A, 0x48,</div><div class='add'>+0x79, 0x20, 0x39, 0x09, 0x85, 0x27, 0x15, 0x1A, 0x40, 0x3F, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x12, 0x18, 0x34, 0x02, 0x43, 0x04, 0x34, 0x03, 0x10,</div><div class='add'>+0x0C, 0xC0, 0x33, 0x10, 0xDF, 0x00, 0x1C, 0x02, 0xF0, 0x0C, 0xC0, 0x31, 0x00,</div><div class='add'>+0xCD, 0x00, 0x0C, 0x03, 0x70, 0xCC, 0xC0, 0x37, 0x42, 0x05, 0x00, 0x1C, 0x11,</div><div class='add'>+0xD0, 0x08, 0xC0, 0x33, 0x00, 0x4B, 0x00, 0x1C, 0x40, 0xF0, 0x8C, 0xC0, 0x31,</div><div class='add'>+0x02, 0xC3, 0x00, 0x6C, 0x23, 0x30, 0x88, 0xE0, 0x4B, 0x40, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x02, 0x38, 0x3D, 0x40, 0x7F, 0x00, 0xBC, 0x03, 0x70, 0x07,</div><div class='add'>+0xC0, 0x3F, 0x02, 0xFF, 0x00, 0xCC, 0x02, 0xF0, 0x0C, 0xC0, 0xBF, 0x20, 0xDF,</div><div class='add'>+0x00, 0x3C, 0x03, 0xC0, 0x8F, 0xC8, 0x37, 0x08, 0xFF, 0x8C, 0x7C, 0x01, 0xF0,</div><div class='add'>+0x09, 0xC0, 0x3F, 0x00, 0xFF, 0x48, 0x1C, 0x11, 0xF0, 0x89, 0xC0, 0x3A, 0x00,</div><div class='add'>+0xBF, 0x00, 0xFC, 0x23, 0xF2, 0x0F, 0xC0, 0x0B, 0x60, 0x04, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x10, 0xA0, 0x17, 0x00, 0xDF, 0x01, 0x6C, 0x03, 0xF0, 0x0D, 0xC0,</div><div class='add'>+0x27, 0x00, 0xDF, 0x00, 0x7C, 0x03, 0xF0, 0x0C, 0xC4, 0x74, 0x03, 0xD1, 0x0E,</div><div class='add'>+0x7C, 0x80, 0x70, 0x6D, 0xE0, 0x37, 0x00, 0xD7, 0x00, 0x7C, 0x00, 0x70, 0x1D,</div><div class='add'>+0xC0, 0x36, 0x00, 0x5B, 0x00, 0x7C, 0x04, 0xB0, 0x05, 0xC0, 0x37, 0x00, 0x97,</div><div class='add'>+0x00, 0x4C, 0x03, 0x34, 0x01, 0xC0, 0x43, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x12, 0x80, 0x19, 0x00, 0xED, 0x00, 0x84, 0x0B, 0xC0, 0x06, 0x40, 0xAB,</div><div class='add'>+0x20, 0xED, 0x04, 0xB4, 0x02, 0xD0, 0x0E, 0x40, 0x31, 0x00, 0xE1, 0x10, 0xB4,</div><div class='add'>+0x03, 0xD0, 0xEE, 0xC0, 0x39, 0x00, 0xED, 0x00, 0xB4, 0x00, 0xD0, 0x4E, 0x40,</div><div class='add'>+0x38, 0x00, 0x61, 0x00, 0xA4, 0x00, 0x10, 0x0E, 0x60, 0x3B, 0x00, 0x2D, 0x00,</div><div class='add'>+0x8D, 0x03, 0xB0, 0x06, 0x40, 0x4F, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x04, 0x00, 0x79, 0x00, 0xED, 0x01, 0x85, 0x17, 0x50, 0x1E, 0x41, 0x7B, 0x01,</div><div class='add'>+0xED, 0x09, 0xB4, 0x07, 0x50, 0x1E, 0x40, 0x78, 0x41, 0xE1, 0x05, 0x94, 0x47,</div><div class='add'>+0x50, 0x1E, 0x02, 0x7B, 0x10, 0xED, 0x01, 0xB4, 0x04, 0xD2, 0xDC, 0x00, 0x7A,</div><div class='add'>+0x24, 0x6D, 0x01, 0xD6, 0x0D, 0xD8, 0x1E, 0x40, 0x7B, 0x04, 0xE5, 0x01, 0xF4,</div><div class='add'>+0x07, 0x10, 0x1A, 0x60, 0x13, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16,</div><div class='add'>+0x28, 0x33, 0x00, 0xCD, 0x1A, 0x04, 0x03, 0xD0, 0x14, 0x40, 0x73, 0x02, 0xCD,</div><div class='add'>+0x00, 0x34, 0x02, 0xD0, 0x0C, 0x40, 0x31, 0x00, 0xC1, 0x00, 0x34, 0x13, 0xD0,</div><div class='add'>+0x0C, 0x48, 0x30, 0x00, 0xDD, 0x01, 0x34, 0x06, 0xD0, 0x8C, 0x40, 0x30, 0x00,</div><div class='add'>+0x45, 0x08, 0x34, 0x0D, 0xD0, 0x8C, 0x40, 0x73, 0x00, 0xCD, 0x01, 0x04, 0x03,</div><div class='add'>+0x17, 0x0C, 0x40, 0x5B, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x17, 0xA0,</div><div class='add'>+0x1D, 0x06, 0x7D, 0x03, 0x6C, 0x01, 0xF0, 0x17, 0xC0, 0x17, 0x00, 0x5F, 0x00,</div><div class='add'>+0xF4, 0x2D, 0x70, 0x04, 0xC4, 0x14, 0x10, 0x53, 0x80, 0xFC, 0x0D, 0x71, 0x05,</div><div class='add'>+0xC0, 0x17, 0x00, 0x7F, 0x07, 0xFC, 0x19, 0xF0, 0x15, 0xC0, 0x56, 0x00, 0x6F,</div><div class='add'>+0x02, 0xFC, 0x05, 0xF0, 0x27, 0xC8, 0x1F, 0x20, 0x67, 0x07, 0xFC, 0x01, 0x10,</div><div class='add'>+0x97, 0xC2, 0x5F, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x08, 0x05,</div><div class='add'>+0x00, 0x1F, 0x00, 0x7C, 0x00, 0xF0, 0x21, 0xC1, 0x87, 0x00, 0x1F, 0x80, 0x7C,</div><div class='add'>+0x20, 0xF2, 0x01, 0xC0, 0x07, 0x00, 0x1B, 0x00, 0x7C, 0x08, 0xF0, 0x21, 0xC0,</div><div class='add'>+0x05, 0x00, 0x1F, 0x04, 0x7C, 0x00, 0xF0, 0x01, 0xC0, 0x07, 0x00, 0x19, 0x50,</div><div class='add'>+0x6C, 0x18, 0x10, 0x21, 0xC1, 0xC7, 0x08, 0x1B, 0x30, 0x7E, 0x0C, 0xF0, 0x81,</div><div class='add'>+0xC0, 0x4B, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x08, 0x65, 0x00,</div><div class='add'>+0x9F, 0x44, 0x7E, 0x0A, 0xF0, 0x09, 0xD0, 0x64, 0x10, 0x9F, 0x00, 0x7C, 0x06,</div><div class='add'>+0x30, 0x09, 0xD0, 0x24, 0x80, 0x9F, 0x00, 0x7C, 0x02, 0xF0, 0x09, 0xC2, 0x27,</div><div class='add'>+0x00, 0x93, 0xC0, 0x4C, 0x42, 0xF0, 0x29, 0xC0, 0x26, 0x00, 0x93, 0x80, 0x5C,</div><div class='add'>+0x0A, 0xF0, 0x19, 0xC0, 0x65, 0x00, 0x9F, 0x00, 0x5C, 0x26, 0x30, 0x29, 0xC0,</div><div class='add'>+0x43, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x20, 0x26, 0x02, 0x9D,</div><div class='add'>+0x47, 0x74, 0x06, 0xD0, 0x48, 0x40, 0xEC, 0x10, 0x9D, 0x00, 0x34, 0x26, 0x10,</div><div class='add'>+0x09, 0xC0, 0x26, 0x10, 0x9D, 0x02, 0x74, 0x1A, 0xD0, 0x09, 0x44, 0x27, 0x00,</div><div class='add'>+0x91, 0x40, 0x4C, 0x02, 0x78, 0x1B, 0x40, 0x23, 0x00, 0x91, 0x10, 0x44, 0x0E,</div><div class='add'>+0xD0, 0x08, 0x42, 0x20, 0x10, 0x9B, 0x40, 0x0C, 0x1E, 0x54, 0x09, 0xC0, 0x07,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0xA0, 0x24, 0x00, 0x9D, 0x00,</div><div class='add'>+0x74, 0x02, 0xD0, 0x09, 0x40, 0x24, 0x02, 0x9D, 0x00, 0x74, 0x02, 0x10, 0x09,</div><div class='add'>+0x40, 0x24, 0x00, 0x99, 0x10, 0x74, 0x02, 0xD0, 0x29, 0x40, 0x23, 0x00, 0x91,</div><div class='add'>+0x00, 0x64, 0x02, 0xD1, 0x29, 0x40, 0x27, 0x00, 0x91, 0x01, 0x54, 0x02, 0x50,</div><div class='add'>+0x4D, 0x40, 0x25, 0x02, 0x94, 0x00, 0x74, 0x02, 0x10, 0x09, 0x40, 0x63, 0x00,</div><div class='add'>+0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x20, 0x30, 0x05, 0x8D, 0x14, 0x34,</div><div class='add'>+0x02, 0xD0, 0x09, 0x40, 0x20, 0x00, 0x8D, 0x08, 0x74, 0x0A, 0x10, 0x28, 0x40,</div><div class='add'>+0x22, 0x02, 0x8D, 0x08, 0x34, 0x02, 0xD0, 0x08, 0x40, 0x23, 0x02, 0x81, 0x08,</div><div class='add'>+0x04, 0x02, 0xD0, 0x08, 0x40, 0x27, 0x02, 0x91, 0x40, 0x04, 0x02, 0xD2, 0x09,</div><div class='add'>+0x40, 0x24, 0x00, 0x99, 0x00, 0x46, 0x22, 0x51, 0x48, 0x44, 0x43, 0x80, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xB8, 0x06, 0x01, 0x1F, 0x04, 0x74, 0xD0,</div><div class='add'>+0xF0, 0x01, 0xC0, 0x54, 0x10, 0x1F, 0x16, 0x7E, 0x00, 0x34, 0x01, 0x40, 0x84,</div><div class='add'>+0x05, 0x19, 0x96, 0x7C, 0x00, 0xF0, 0x41, 0xC1, 0x87, 0x00, 0x13, 0x02, 0x6D,</div><div class='add'>+0x80, 0xD0, 0x11, 0x40, 0x83, 0x40, 0x13, 0x00, 0x54, 0x01, 0x70, 0x05, 0xC0,</div><div class='add'>+0x15, 0x00, 0x17, 0x00, 0x7C, 0x08, 0x30, 0x05, 0xC0, 0x77, 0xE0, 0x0A, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x1D, 0xB0, 0x2F, 0x25, 0xAF, 0x20, 0x7C, 0x02, 0xF0,</div><div class='add'>+0x0B, 0xC8, 0xAF, 0x00, 0x9D, 0x04, 0xFC, 0x07, 0xF0, 0x1B, 0xC0, 0x27, 0x09,</div><div class='add'>+0x9F, 0x04, 0xFC, 0x02, 0xF2, 0x09, 0xC2, 0x27, 0x41, 0xBF, 0x04, 0xFC, 0x02,</div><div class='add'>+0x50, 0x2B, 0xC0, 0x2F, 0x01, 0xBF, 0x00, 0xB4, 0x02, 0xF2, 0x0B, 0xC0, 0x2F,</div><div class='add'>+0x00, 0xA7, 0x00, 0xBC, 0x12, 0xF4, 0x8B, 0xC0, 0x75, 0x60, 0x0E, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x1C, 0xA0, 0x2F, 0x05, 0xBF, 0x04, 0xFC, 0x02, 0xF0, 0x0B,</div><div class='add'>+0xD0, 0x6C, 0x04, 0x91, 0x24, 0xFC, 0x0A, 0xF0, 0x2B, 0xD0, 0x24, 0x00, 0xBF,</div><div class='add'>+0x00, 0x9E, 0x02, 0xF0, 0x4B, 0xC0, 0x26, 0x00, 0x9F, 0x08, 0x7C, 0x82, 0x34,</div><div class='add'>+0x5B, 0xD1, 0x24, 0x02, 0xBF, 0x00, 0xEC, 0x02, 0xF2, 0x0B, 0xC0, 0x2E, 0x80,</div><div class='add'>+0xA7, 0x00, 0xCE, 0x83, 0x30, 0x0B, 0xC0, 0x74, 0x00, 0x0E, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x18, 0x00, 0x07, 0x11, 0x1D, 0x08, 0x74, 0x08, 0xD0, 0x01, 0x40,</div><div class='add'>+0x84, 0x00, 0x11, 0x14, 0x74, 0x04, 0xD0, 0x51, 0x40, 0x84, 0x04, 0x0D, 0x10,</div><div class='add'>+0x76, 0x00, 0xD1, 0x01, 0x00, 0x04, 0x01, 0x1D, 0x04, 0x74, 0x00, 0x19, 0x21,</div><div class='add'>+0x40, 0x04, 0x00, 0x19, 0x00, 0x5C, 0x00, 0xD2, 0x01, 0x40, 0x04, 0x10, 0x1D,</div><div class='add'>+0x00, 0x05, 0x00, 0xB4, 0x01, 0x40, 0x60, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x12, 0x00, 0x21, 0x05, 0x8D, 0x00, 0x34, 0x22, 0xD0, 0x09, 0x40, 0x20,</div><div class='add'>+0x00, 0x81, 0x0C, 0x34, 0x02, 0xD0, 0x48, 0x40, 0x20, 0x83, 0x8D, 0x08, 0x14,</div><div class='add'>+0x02, 0xD3, 0x88, 0x00, 0x22, 0x05, 0x8D, 0x04, 0x74, 0x02, 0x10, 0x08, 0x40,</div><div class='add'>+0x20, 0x10, 0x8D, 0x00, 0x36, 0x82, 0xD0, 0x08, 0x40, 0x22, 0x00, 0x95, 0x00,</div><div class='add'>+0x54, 0x02, 0x14, 0x0C, 0x40, 0x48, 0x80, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x18, 0x2A, 0x25, 0x86, 0x9D, 0x20, 0x74, 0x02, 0xD2, 0x09, 0x40, 0x24, 0x00,</div><div class='add'>+0x91, 0x20, 0x74, 0x02, 0xD0, 0x1D, 0x40, 0x24, 0x00, 0x9D, 0x40, 0x74, 0x42,</div><div class='add'>+0xD0, 0x09, 0x40, 0x24, 0x00, 0x9D, 0x02, 0x74, 0x02, 0x10, 0x09, 0x44, 0x24,</div><div class='add'>+0x01, 0x9D, 0x02, 0x55, 0x0B, 0xD1, 0x89, 0x40, 0xE4, 0x00, 0x9D, 0x03, 0x54,</div><div class='add'>+0x2A, 0x90, 0x2D, 0x40, 0x60, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05,</div><div class='add'>+0x02, 0x25, 0x10, 0x9F, 0x12, 0x7C, 0x02, 0xF0, 0x09, 0xC0, 0x24, 0x00, 0x93,</div><div class='add'>+0x00, 0xFC, 0x22, 0xF0, 0x09, 0xC0, 0x24, 0x00, 0x9F, 0x00, 0x5C, 0x2A, 0xF0,</div><div class='add'>+0x09, 0xC2, 0x26, 0x00, 0x9F, 0x00, 0x3E, 0x3A, 0x10, 0x99, 0xC8, 0x24, 0x20,</div><div class='add'>+0x8F, 0x4B, 0x7C, 0x22, 0xF0, 0x49, 0xC0, 0xA6, 0x80, 0x87, 0x01, 0x54, 0x02,</div><div class='add'>+0x31, 0x09, 0xE0, 0x14, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16, 0x08,</div><div class='add'>+0x25, 0x0C, 0x9F, 0x84, 0x7C, 0x02, 0xF8, 0x09, 0xE0, 0x23, 0x41, 0x9F, 0x00,</div><div class='add'>+0x7C, 0x02, 0xF0, 0x09, 0xC0, 0x27, 0x10, 0x9F, 0x10, 0x7C, 0x02, 0xF0, 0x09,</div><div class='add'>+0xC0, 0x27, 0x00, 0x9F, 0x80, 0x7C, 0x06, 0xF8, 0x19, 0xC4, 0x67, 0x00, 0x9B,</div><div class='add'>+0x00, 0x7C, 0x02, 0xF0, 0x09, 0xE8, 0x27, 0x88, 0x9F, 0x00, 0x6C, 0x06, 0xD1,</div><div class='add'>+0x48, 0xD8, 0x5B, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x08, 0x05,</div><div class='add'>+0x00, 0x1F, 0x82, 0x7C, 0x80, 0xF8, 0x41, 0xD0, 0x06, 0x40, 0x13, 0x00, 0x7C,</div><div class='add'>+0x00, 0x70, 0x41, 0xC0, 0x06, 0x00, 0x13, 0x00, 0x4D, 0xC8, 0x71, 0x01, 0x41,</div><div class='add'>+0x06, 0x00, 0x1F, 0x00, 0x7C, 0x08, 0xF0, 0x01, 0xC1, 0x07, 0x20, 0x1F, 0x30,</div><div class='add'>+0x5C, 0x10, 0x70, 0xC1, 0xC8, 0x87, 0x20, 0x1F, 0x10, 0x4C, 0x10, 0x32, 0x41,</div><div class='add'>+0xC4, 0x50, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0xDC, 0x04,</div><div class='add'>+0x7D, 0x07, 0x74, 0x15, 0x78, 0x76, 0xC0, 0x1C, 0x00, 0x51, 0x00, 0x74, 0x01,</div><div class='add'>+0x10, 0x16, 0x45, 0x14, 0x00, 0x71, 0x86, 0xC4, 0x09, 0x12, 0x16, 0x40, 0x17,</div><div class='add'>+0x00, 0x5D, 0x00, 0x74, 0x01, 0x70, 0x36, 0x40, 0x17, 0x10, 0x7D, 0x00, 0xF0,</div><div class='add'>+0x0D, 0x12, 0x36, 0x48, 0xDF, 0x02, 0x7D, 0x04, 0x80, 0x15, 0x50, 0x07, 0x50,</div><div class='add'>+0x40, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xA0, 0xF2, 0x00, 0x8D,</div><div class='add'>+0x06, 0x34, 0x07, 0x50, 0x18, 0x40, 0x20, 0x00, 0xC1, 0x00, 0x36, 0x23, 0x50,</div><div class='add'>+0x08, 0x40, 0x32, 0x40, 0xC9, 0x00, 0x04, 0x2F, 0x50, 0xBC, 0x40, 0x33, 0x00,</div><div class='add'>+0xCD, 0x00, 0x14, 0x03, 0x50, 0x28, 0x40, 0x33, 0x80, 0x4D, 0x0A, 0x34, 0x2F,</div><div class='add'>+0x50, 0x1C, 0x40, 0xD3, 0x00, 0xC9, 0x00, 0x04, 0x0B, 0x11, 0x0C, 0x40, 0x40,</div><div class='add'>+0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x80, 0x38, 0x80, 0xAD, 0x00,</div><div class='add'>+0xB4, 0x03, 0x50, 0x02, 0x40, 0x28, 0x00, 0xE1, 0x00, 0xB4, 0x17, 0x18, 0x0E,</div><div class='add'>+0x40, 0x70, 0x02, 0xE9, 0x01, 0xC4, 0x07, 0x10, 0x0E, 0x40, 0x3B, 0x01, 0xED,</div><div class='add'>+0x08, 0xB4, 0x03, 0x50, 0x22, 0x40, 0x3B, 0xB0, 0x6D, 0x00, 0xB6, 0x07, 0x11,</div><div class='add'>+0x06, 0x40, 0x1B, 0x8C, 0xFD, 0x00, 0x85, 0x03, 0x10, 0x0C, 0x40, 0x10, 0x00,</div><div class='add'>+0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x18, 0x78, 0x00, 0xEF, 0x01, 0xBC,</div><div class='add'>+0x07, 0x70, 0x12, 0xC0, 0x68, 0x00, 0xE3, 0x01, 0xFC, 0x0F, 0x70, 0x1A, 0xD0,</div><div class='add'>+0x7A, 0x01, 0xE9, 0x01, 0x8C, 0x07, 0x70, 0x1E, 0xE8, 0x7B, 0x03, 0xEF, 0x01,</div><div class='add'>+0xBC, 0x07, 0x70, 0x12, 0xC0, 0x7B, 0x25, 0x6F, 0x01, 0x9E, 0x06, 0x70, 0x1A,</div><div class='add'>+0xC0, 0x6B, 0x00, 0xEF, 0x01, 0x8C, 0x06, 0x34, 0x1E, 0xC0, 0x50, 0x60, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xB8, 0x15, 0x00, 0xDF, 0x00, 0x7C, 0x03,</div><div class='add'>+0x70, 0x00, 0xC0, 0x21, 0x00, 0xDF, 0x40, 0x7C, 0x03, 0xF2, 0x0C, 0xC0, 0x37,</div><div class='add'>+0x20, 0xD7, 0x80, 0x7C, 0x01, 0xF2, 0x0D, 0xC0, 0x37, 0x02, 0xDF, 0x10, 0x78,</div><div class='add'>+0x03, 0x70, 0x01, 0xC2, 0x37, 0x1A, 0x1F, 0x80, 0x3C, 0x02, 0xF0, 0x05, 0xC0,</div><div class='add'>+0x27, 0x20, 0xDF, 0x00, 0x7C, 0x02, 0xF6, 0x0D, 0xC0, 0x43, 0x60, 0x06, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x06, 0x20, 0x5D, 0x00, 0xA3, 0x01, 0xCC, 0x13, 0xF8,</div><div class='add'>+0x03, 0xC0, 0x6D, 0x00, 0xFF, 0x11, 0xBC, 0x07, 0x20, 0xDB, 0xC0, 0x7C, 0x00,</div><div class='add'>+0x7F, 0x01, 0xCC, 0x07, 0xF0, 0x9F, 0xD0, 0x7C, 0x00, 0xDF, 0x09, 0xFC, 0x07,</div><div class='add'>+0xF0, 0x13, 0xC0, 0x7F, 0x20, 0x2F, 0x09, 0xEE, 0x17, 0xF0, 0x1F, 0xC0, 0x5F,</div><div class='add'>+0x00, 0xFF, 0x01, 0x8C, 0x05, 0x30, 0xDB, 0xC0, 0x18, 0x00, 0x04, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x15, 0x00, 0x39, 0x00, 0xA1, 0x00, 0x84, 0x03, 0x78, 0x42,</div><div class='add'>+0x40, 0x28, 0x02, 0xED, 0x00, 0xB4, 0x13, 0x10, 0x8A, 0x50, 0x38, 0x11, 0x2D,</div><div class='add'>+0x04, 0x8C, 0x1A, 0xD0, 0x8A, 0x40, 0x38, 0x00, 0xED, 0x05, 0xB4, 0x03, 0x90,</div><div class='add'>+0x02, 0x40, 0x3B, 0x00, 0x2D, 0x00, 0x9E, 0x03, 0xD0, 0x0E, 0x40, 0x9B, 0x22,</div><div class='add'>+0xAD, 0x04, 0xAC, 0x01, 0x10, 0xCE, 0x48, 0x55, 0x20, 0x04, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x19, 0x00, 0xA1, 0x00, 0x85, 0x23, 0x50, 0x82, 0x43,</div><div class='add'>+0x29, 0x00, 0xED, 0x00, 0xF4, 0x02, 0x10, 0x4B, 0x48, 0x38, 0x80, 0x6D, 0x80,</div><div class='add'>+0x84, 0x03, 0xD2, 0x06, 0x00, 0x38, 0x00, 0xED, 0x04, 0xB4, 0x03, 0xD0, 0x02,</div><div class='add'>+0x40, 0x3B, 0x00, 0x3D, 0x00, 0x84, 0x12, 0xD0, 0x0A, 0x40, 0x9B, 0x00, 0xF5,</div><div class='add'>+0x10, 0xD4, 0x20, 0x10, 0xC2, 0x44, 0x60, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x02, 0x28, 0xC3, 0x00, 0x01, 0x01, 0x00, 0x02, 0x50, 0x30, 0x40, 0x20,</div><div class='add'>+0x00, 0xCD, 0x00, 0x34, 0x22, 0x10, 0x08, 0x40, 0x30, 0x00, 0x1D, 0x00, 0x04,</div><div class='add'>+0x4C, 0xD0, 0x00, 0x40, 0x30, 0x00, 0xCD, 0x04, 0x34, 0x43, 0xD0, 0x00, 0x40,</div><div class='add'>+0x77, 0x00, 0x0D, 0x12, 0x14, 0xC6, 0xD9, 0x8C, 0x40, 0x13, 0x00, 0x8D, 0x23,</div><div class='add'>+0x05, 0x03, 0x14, 0x24, 0x40, 0x09, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x15, 0xA0, 0xE5, 0x41, 0x93, 0x0A, 0x4C, 0x03, 0x70, 0x35, 0xC0, 0x35, 0x00,</div><div class='add'>+0xFF, 0x00, 0x74, 0x02, 0x34, 0x08, 0xC0, 0x3C, 0x00, 0x9F, 0x00, 0x4C, 0x4E,</div><div class='add'>+0xF0, 0x09, 0xC0, 0x3C, 0x00, 0xFF, 0x13, 0x7C, 0x03, 0xF0, 0x05, 0xC0, 0x3F,</div><div class='add'>+0x01, 0x5F, 0x01, 0x4C, 0x07, 0xF1, 0xBD, 0xC0, 0xB7, 0x00, 0xD7, 0x03, 0x14,</div><div class='add'>+0x4F, 0x30, 0x94, 0xC0, 0x54, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05,</div><div class='add'>+0x08, 0x27, 0x00, 0x9F, 0x88, 0x7C, 0x03, 0x70, 0x21, 0xC0, 0xB7, 0x00, 0xDF,</div><div class='add'>+0x00, 0x7C, 0x42, 0xF0, 0x29, 0xC0, 0x37, 0x00, 0x9F, 0x00, 0x5D, 0x02, 0xF0,</div><div class='add'>+0x00, 0xC4, 0x37, 0x00, 0xDF, 0x20, 0x7C, 0x03, 0xB0, 0x25, 0xE4, 0x37, 0x00,</div><div class='add'>+0x5F, 0x01, 0x4D, 0x23, 0xF0, 0x05, 0xC0, 0xF7, 0x00, 0xDF, 0x02, 0x7C, 0x1B,</div><div class='add'>+0xF0, 0x3D, 0xC0, 0x37, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x08,</div><div class='add'>+0x27, 0x04, 0xFF, 0x02, 0xFC, 0x03, 0xF0, 0x17, 0xC1, 0x6B, 0x00, 0xF7, 0x00,</div><div class='add'>+0xFC, 0x07, 0xD0, 0x1B, 0xC0, 0x3C, 0x08, 0x1F, 0x00, 0xCC, 0x02, 0xF0, 0x09,</div><div class='add'>+0xC0, 0x3D, 0x80, 0xFF, 0x80, 0xCC, 0x03, 0xF8, 0x13, 0xC0, 0x3D, 0x00, 0xF3,</div><div class='add'>+0x00, 0xFC, 0x26, 0xF0, 0x03, 0xCC, 0x2F, 0x00, 0xF7, 0x10, 0xCC, 0x02, 0x30,</div><div class='add'>+0x11, 0xC8, 0x04, 0x26, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x81, 0x20, 0x66,</div><div class='add'>+0x00, 0xDD, 0x00, 0x74, 0x03, 0xD0, 0x01, 0x40, 0x17, 0x00, 0xD1, 0x80, 0x74,</div><div class='add'>+0x07, 0xD0, 0x39, 0x50, 0x34, 0x00, 0x1D, 0x09, 0x44, 0x0C, 0xD0, 0x11, 0x40,</div><div class='add'>+0x34, 0x80, 0xDD, 0x00, 0x44, 0x03, 0xD8, 0x00, 0xC1, 0x34, 0x40, 0x11, 0x03,</div><div class='add'>+0x72, 0x0E, 0x70, 0x05, 0x41, 0x23, 0x00, 0xCB, 0x22, 0x44, 0x64, 0x14, 0x39,</div><div class='add'>+0xC0, 0x06, 0x02, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xA0, 0x46, 0x0C,</div><div class='add'>+0x9D, 0x00, 0x74, 0x03, 0xD0, 0x45, 0x41, 0xB7, 0x01, 0xD5, 0x00, 0x74, 0x12,</div><div class='add'>+0xD0, 0x81, 0x40, 0x36, 0x00, 0xDD, 0x02, 0x44, 0x04, 0xD2, 0x19, 0x41, 0x34,</div><div class='add'>+0x00, 0xCD, 0x00, 0x44, 0x03, 0xD0, 0x45, 0x40, 0x36, 0x20, 0x51, 0x11, 0x64,</div><div class='add'>+0x03, 0xD0, 0x19, 0x40, 0x37, 0x00, 0x51, 0x02, 0x44, 0x01, 0x10, 0x41, 0x40,</div><div class='add'>+0x04, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x20, 0x00, 0x8D,</div><div class='add'>+0x00, 0x34, 0x03, 0xD0, 0x04, 0x40, 0x32, 0x00, 0xC1, 0x00, 0x34, 0x02, 0xD0,</div><div class='add'>+0x00, 0x40, 0x32, 0x00, 0x8D, 0x00, 0x04, 0x00, 0xD2, 0x00, 0x40, 0x30, 0x00,</div><div class='add'>+0xCD, 0x10, 0x04, 0x03, 0xD0, 0x04, 0x60, 0x30, 0x00, 0x41, 0x20, 0x34, 0x01,</div><div class='add'>+0x50, 0x08, 0x40, 0x37, 0x80, 0x09, 0x00, 0x45, 0x00, 0x10, 0x0C, 0x44, 0x42,</div><div class='add'>+0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x06, 0x00, 0xDF, 0x00,</div><div class='add'>+0x7C, 0x03, 0xF0, 0x05, 0xC0, 0x27, 0x00, 0xD7, 0x00, 0x7C, 0x02, 0xF2, 0x01,</div><div class='add'>+0xD0, 0x36, 0x00, 0x5F, 0x00, 0x45, 0x00, 0xF0, 0x01, 0xD0, 0x3C, 0x20, 0xFD,</div><div class='add'>+0x00, 0x4D, 0x03, 0xD0, 0x05, 0xC0, 0x3F, 0x10, 0x53, 0x20, 0x74, 0x83, 0xF0,</div><div class='add'>+0x01, 0xC8, 0x37, 0x80, 0x57, 0x00, 0x4C, 0x00, 0x31, 0x01, 0xC0, 0x04, 0x44,</div><div class='add'>+0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0xB8, 0x2F, 0x00, 0x7F, 0x00, 0xFC,</div><div class='add'>+0x02, 0xF0, 0x06, 0xC0, 0x1F, 0x00, 0xFF, 0x00, 0xFC, 0x02, 0xF0, 0x02, 0xC0,</div><div class='add'>+0x3D, 0x00, 0x3F, 0x00, 0xFD, 0x00, 0xF0, 0x03, 0x82, 0x3F, 0x10, 0xFF, 0x80,</div><div class='add'>+0xFC, 0x03, 0xF0, 0x07, 0xC0, 0x3F, 0x00, 0x3F, 0x00, 0xFC, 0x02, 0x70, 0x03,</div><div class='add'>+0xC0, 0x3F, 0x00, 0x2D, 0x00, 0xFC, 0x00, 0xF2, 0x03, 0x80, 0x14, 0x20, 0x0E,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xA0, 0x7F, 0x00, 0xF3, 0x09, 0x8C, 0x07,</div><div class='add'>+0xF0, 0x1F, 0xC0, 0x7C, 0x00, 0xFF, 0x01, 0xFC, 0x27, 0xF0, 0x9F, 0xC0, 0x7F,</div><div class='add'>+0x02, 0xFF, 0x09, 0xFC, 0x27, 0xF0, 0x9F, 0xC0, 0x7D, 0x02, 0xEF, 0x01, 0xCC,</div><div class='add'>+0x07, 0xF0, 0x1E, 0x40, 0x3C, 0x00, 0xF3, 0x00, 0xCC, 0x03, 0xB0, 0x0F, 0xC0,</div><div class='add'>+0x3C, 0x00, 0xF3, 0x01, 0xCC, 0x07, 0x30, 0x1F, 0xC0, 0x0F, 0x00, 0x0E, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x47, 0x40, 0x11, 0x00, 0x45, 0x04, 0xD0,</div><div class='add'>+0x11, 0x52, 0x04, 0x00, 0x0D, 0x00, 0x74, 0x10, 0xD0, 0x01, 0x40, 0x07, 0x01,</div><div class='add'>+0x1D, 0x04, 0x74, 0x10, 0xD0, 0x40, 0xC0, 0x06, 0x01, 0x1D, 0x81, 0x44, 0x04,</div><div class='add'>+0xD0, 0x11, 0x40, 0x74, 0x08, 0x51, 0x21, 0x44, 0x07, 0x10, 0x15, 0x42, 0x74,</div><div class='add'>+0x00, 0xD1, 0x00, 0x44, 0x07, 0x10, 0x19, 0x48, 0x07, 0x00, 0x0C, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x11, 0xA0, 0x37, 0x00, 0xC1, 0x04, 0x14, 0x03, 0xD0, 0x0D,</div><div class='add'>+0x60, 0x30, 0x05, 0xCD, 0x14, 0x34, 0x03, 0xD0, 0x4C, 0x40, 0x33, 0x00, 0xC5,</div><div class='add'>+0x00, 0x34, 0x03, 0xD0, 0x0C, 0x40, 0x33, 0x00, 0xCD, 0x00, 0x24, 0x03, 0xD0,</div><div class='add'>+0x0C, 0x40, 0x32, 0x00, 0x81, 0x00, 0x04, 0x02, 0x50, 0x0C, 0x40, 0x32, 0x00,</div><div class='add'>+0xC5, 0x00, 0x44, 0x02, 0x14, 0x0C, 0x40, 0x45, 0x80, 0x0E, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x03, 0xA8, 0x05, 0x00, 0x01, 0x40, 0x54, 0x00, 0xD0, 0x01, 0x60,</div><div class='add'>+0x04, 0x30, 0x1D, 0x00, 0x74, 0x00, 0xD0, 0x01, 0x40, 0x07, 0x00, 0x1D, 0x20,</div><div class='add'>+0x74, 0x00, 0xD0, 0x01, 0x40, 0x04, 0x00, 0x1D, 0x00, 0x64, 0x80, 0xC0, 0x01,</div><div class='add'>+0x40, 0x36, 0x00, 0xD1, 0x00, 0x44, 0x43, 0xD0, 0xAD, 0x40, 0x36, 0x04, 0xC5,</div><div class='add'>+0x00, 0x44, 0x02, 0x10, 0x09, 0x40, 0x0F, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0xA0, 0x33, 0x00, 0xD3, 0x00, 0x5C, 0x03, 0xF0, 0x0D, 0xC0, 0x34,</div><div class='add'>+0x00, 0xDF, 0x80, 0x7C, 0x83, 0xF0, 0x0D, 0xC0, 0x37, 0x00, 0xDF, 0x00, 0x7C,</div><div class='add'>+0x03, 0xF0, 0x0D, 0x40, 0x37, 0x00, 0xDF, 0x00, 0x6C, 0x03, 0xF0, 0x0D, 0x40,</div><div class='add'>+0x86, 0x04, 0xD3, 0x09, 0x4C, 0x25, 0xF0, 0x3D, 0xC0, 0x26, 0x00, 0xD7, 0x09,</div><div class='add'>+0x0D, 0x03, 0x30, 0x09, 0xC0, 0x03, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x07, 0x88, 0x0D, 0x00, 0x3F, 0x00, 0xEC, 0x00, 0xF0, 0x03, 0xC0, 0x0F, 0x00,</div><div class='add'>+0x3F, 0x00, 0xF4, 0x00, 0xF1, 0x03, 0xC8, 0x0F, 0x00, 0x3F, 0x00, 0xFC, 0x00,</div><div class='add'>+0xA0, 0x03, 0xC8, 0x0F, 0x00, 0x3F, 0x00, 0xDC, 0x00, 0xF1, 0x03, 0xC8, 0x19,</div><div class='add'>+0x00, 0xCF, 0x21, 0xBC, 0x01, 0x30, 0x16, 0xC2, 0x39, 0x02, 0xFB, 0x00, 0xFC,</div><div class='add'>+0x13, 0xF0, 0x0F, 0xC0, 0x1F, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,</div><div class='add'>+0x08, 0x35, 0x00, 0xDF, 0x05, 0x7C, 0x03, 0x32, 0x0D, 0xC2, 0x37, 0x00, 0xDF,</div><div class='add'>+0x00, 0x4C, 0x07, 0xF0, 0x0D, 0xC0, 0x77, 0x00, 0xDF, 0x01, 0x7C, 0x07, 0xF0,</div><div class='add'>+0x0D, 0xC0, 0x74, 0x00, 0xDF, 0x01, 0x4C, 0x03, 0x30, 0x0D, 0xC0, 0xB5, 0x00,</div><div class='add'>+0x93, 0x00, 0x4C, 0x0A, 0x70, 0x0D, 0xC2, 0xA4, 0x00, 0xD7, 0x00, 0x4C, 0x02,</div><div class='add'>+0xF0, 0x09, 0xC0, 0x08, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0xA0,</div><div class='add'>+0x04, 0x10, 0x1D, 0x01, 0x74, 0x00, 0x14, 0xB0, 0x40, 0x07, 0x00, 0x1D, 0x00,</div><div class='add'>+0x44, 0x04, 0xC1, 0xA1, 0x42, 0x07, 0x00, 0x1D, 0x01, 0x74, 0x84, 0xD0, 0xE1,</div><div class='add'>+0x40, 0x44, 0x00, 0x0D, 0x00, 0x44, 0x00, 0xB0, 0x00, 0x40, 0x34, 0x00, 0xD1,</div><div class='add'>+0x80, 0x44, 0x13, 0x10, 0x0D, 0x40, 0x34, 0x10, 0xDD, 0x0A, 0x44, 0x46, 0xD0,</div><div class='add'>+0x1D, 0x40, 0x4C, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x20, 0x30,</div><div class='add'>+0x00, 0xCD, 0x02, 0x34, 0x03, 0x10, 0x3C, 0x40, 0x33, 0x00, 0xCD, 0x00, 0x04,</div><div class='add'>+0x1B, 0xD0, 0x0C, 0x40, 0x32, 0x00, 0xCD, 0x10, 0x34, 0x03, 0xD0, 0x0D, 0x40,</div><div class='add'>+0x30, 0x00, 0xCD, 0x00, 0x04, 0x03, 0x50, 0x0C, 0x44, 0x30, 0x00, 0xC1, 0x00,</div><div class='add'>+0x04, 0x83, 0x14, 0x08, 0x40, 0x12, 0x00, 0xC4, 0x00, 0x04, 0x03, 0xD0, 0x1C,</div><div class='add'>+0x40, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x48, 0x00,</div><div class='add'>+0x2D, 0x09, 0xF4, 0x24, 0x10, 0x12, 0x40, 0x4B, 0x00, 0x2D, 0x00, 0x84, 0x24,</div><div class='add'>+0xD0, 0x12, 0x40, 0x4B, 0x00, 0x2D, 0x41, 0xB4, 0x0C, 0xD0, 0x12, 0x60, 0xC8,</div><div class='add'>+0x00, 0x2D, 0x01, 0xC4, 0x04, 0xD2, 0x32, 0x40, 0x70, 0x00, 0x61, 0x01, 0x05,</div><div class='add'>+0x07, 0x10, 0x1C, 0x40, 0x7A, 0x00, 0xED, 0x01, 0x84, 0x07, 0xD1, 0x1A, 0x60,</div><div class='add'>+0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x18, 0x30, 0x00, 0xCF,</div><div class='add'>+0x00, 0x3C, 0x03, 0x30, 0x0C, 0xC3, 0x33, 0x02, 0xCF, 0x08, 0x0C, 0x03, 0xF0,</div><div class='add'>+0x0C, 0xC2, 0x32, 0x00, 0xCD, 0x00, 0x3C, 0x03, 0xF0, 0x0C, 0xC0, 0x30, 0x00,</div><div class='add'>+0xCF, 0x00, 0x0C, 0x03, 0x70, 0x0C, 0xC0, 0x31, 0x00, 0xC3, 0x04, 0x0C, 0x03,</div><div class='add'>+0x70, 0x0C, 0xC0, 0x32, 0x00, 0xD7, 0x00, 0x0D, 0x03, 0xF2, 0x8C, 0x51, 0x48,</div><div class='add'>+0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x38, 0x0D, 0x00, 0x3F, 0x00,</div><div class='add'>+0xFC, 0x00, 0xF0, 0x03, 0xC8, 0x0F, 0x08, 0x3F, 0x04, 0xFC, 0x00, 0xF0, 0x03,</div><div class='add'>+0xC0, 0x0F, 0x00, 0x3F, 0x00, 0xFC, 0x00, 0xF0, 0x03, 0xC0, 0x0F, 0x00, 0x3F,</div><div class='add'>+0x40, 0xBC, 0x00, 0xB0, 0x13, 0xC4, 0x3F, 0x02, 0xFF, 0x00, 0xFE, 0x03, 0xF2,</div><div class='add'>+0x0F, 0xC0, 0x3D, 0x00, 0xFF, 0x00, 0xFC, 0x02, 0xF0, 0x0A, 0xC2, 0x0B, 0xE0,</div><div class='add'>+0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xA8, 0x37, 0x00, 0xDF, 0x01, 0x0D,</div><div class='add'>+0x07, 0x34, 0x0D, 0xC0, 0x37, 0x00, 0xDF, 0x01, 0x4C, 0x07, 0x3C, 0x0D, 0xC0,</div><div class='add'>+0x77, 0x00, 0xD7, 0x01, 0x4D, 0x87, 0x34, 0x1D, 0xC0, 0x75, 0x40, 0xD3, 0x00,</div><div class='add'>+0x7E, 0x03, 0xF0, 0x1D, 0xC0, 0x24, 0x00, 0xD3, 0x00, 0x4C, 0x03, 0xB8, 0x09,</div><div class='add'>+0xC0, 0x54, 0x00, 0xDB, 0x00, 0x4D, 0x02, 0xF0, 0x09, 0xC0, 0x41, 0x00, 0x0E,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x90, 0x08, 0x00, 0x2D, 0x00, 0x84, 0x00,</div><div class='add'>+0x18, 0x02, 0x40, 0x0B, 0x00, 0x3D, 0x00, 0xD4, 0x00, 0x10, 0x02, 0x40, 0x0F,</div><div class='add'>+0x00, 0x31, 0x00, 0xC4, 0x00, 0x10, 0x02, 0x40, 0x0C, 0x00, 0x21, 0x00, 0x9C,</div><div class='add'>+0x80, 0xD0, 0x02, 0x40, 0x39, 0x00, 0xE1, 0x00, 0x84, 0x03, 0x10, 0x0E, 0x42,</div><div class='add'>+0x38, 0x00, 0xF1, 0x00, 0x84, 0x03, 0xD0, 0x0E, 0x40, 0x4B, 0x00, 0x06, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x79, 0x00, 0xED, 0x01, 0xC4, 0x87, 0x12,</div><div class='add'>+0x1E, 0x60, 0x7B, 0x80, 0xE9, 0x01, 0x84, 0x07, 0x10, 0x1E, 0x42, 0x7B, 0x20,</div><div class='add'>+0xE5, 0x01, 0xA0, 0x07, 0x10, 0x1E, 0x40, 0x7B, 0x00, 0xE9, 0x01, 0x94, 0x07,</div><div class='add'>+0xD0, 0x1F, 0x40, 0x72, 0x08, 0xC1, 0x01, 0x04, 0x07, 0x10, 0x1C, 0x40, 0x70,</div><div class='add'>+0x00, 0xE1, 0x01, 0x84, 0x06, 0xD0, 0x1A, 0x40, 0x13, 0x00, 0x04, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x16, 0x20, 0x03, 0x00, 0x0D, 0x00, 0x04, 0x00, 0x10, 0x00,</div><div class='add'>+0x40, 0x03, 0x00, 0x0D, 0x00, 0x14, 0x00, 0x18, 0x00, 0x40, 0x03, 0x00, 0x01,</div><div class='add'>+0x00, 0x24, 0x00, 0x10, 0x00, 0x40, 0x02, 0x00, 0x09, 0x00, 0x14, 0x00, 0xD0,</div><div class='add'>+0x00, 0x40, 0x33, 0x40, 0xC1, 0x00, 0x05, 0x03, 0x14, 0x0C, 0x50, 0x30, 0x52,</div><div class='add'>+0x91, 0x48, 0x04, 0x02, 0xD0, 0x1C, 0x40, 0x5B, 0x20, 0x0C, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x17, 0x28, 0x15, 0x00, 0x5F, 0x00, 0x4C, 0x01, 0x30, 0x05, 0xC0,</div><div class='add'>+0x17, 0x00, 0x5F, 0x00, 0x4C, 0x01, 0x30, 0x04, 0xC0, 0x17, 0x10, 0x57, 0x00,</div><div class='add'>+0x64, 0x01, 0x30, 0x05, 0xC0, 0x17, 0x00, 0x5B, 0x00, 0x5C, 0x01, 0xF0, 0x05,</div><div class='add'>+0xC0, 0x1E, 0x00, 0x73, 0x02, 0xCC, 0x09, 0x30, 0x07, 0xC0, 0x5C, 0x00, 0x53,</div><div class='add'>+0x01, 0x4C, 0x01, 0xF2, 0x05, 0xC1, 0x5F, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x12, 0x00, 0x0D, 0x00, 0x3F, 0x00, 0xFC, 0x00, 0xF0, 0x23, 0xC0, 0x0F,</div><div class='add'>+0x00, 0x3F, 0x20, 0xFC, 0x00, 0xF0, 0x03, 0xC0, 0x0F, 0x00, 0x3F, 0x00, 0xDC,</div><div class='add'>+0x00, 0xF0, 0x23, 0xC0, 0x0D, 0x20, 0x37, 0x02, 0xDC, 0x00, 0xF0, 0x03, 0xE2,</div><div class='add'>+0x41, 0x00, 0x0F, 0x10, 0x7C, 0x40, 0xF0, 0x01, 0xC0, 0x07, 0x00, 0x17, 0x02,</div><div class='add'>+0x7C, 0x00, 0xF0, 0x01, 0xC0, 0x4B, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x10, 0x08, 0x25, 0x00, 0x9F, 0x05, 0x7C, 0x16, 0xF0, 0x09, 0xC0, 0x27, 0x00,</div><div class='add'>+0x9F, 0x00, 0x7C, 0x0A, 0xF0, 0x29, 0xC0, 0x24, 0x01, 0x9F, 0x01, 0x5C, 0x02,</div><div class='add'>+0xF0, 0x19, 0xC0, 0x27, 0x00, 0x9F, 0x00, 0x7C, 0x02, 0x20, 0x09, 0xC0, 0x27,</div><div class='add'>+0x20, 0x93, 0x20, 0x0C, 0x02, 0x34, 0x08, 0xC0, 0x24, 0x00, 0x9F, 0x05, 0x4C,</div><div class='add'>+0x06, 0xF0, 0x09, 0xC0, 0x40, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,</div><div class='add'>+0x20, 0x26, 0x00, 0x9D, 0x02, 0x74, 0x02, 0x90, 0x49, 0x48, 0x27, 0x00, 0x9D,</div><div class='add'>+0x00, 0x74, 0x0A, 0xD9, 0x39, 0x40, 0x24, 0x00, 0x9D, 0x02, 0x74, 0x0A, 0xD0,</div><div class='add'>+0xD9, 0x40, 0xA7, 0x80, 0x9F, 0x12, 0x34, 0x02, 0xB0, 0x09, 0x40, 0xA7, 0x20,</div><div class='add'>+0x91, 0x82, 0x44, 0x0A, 0x30, 0x29, 0x40, 0xA4, 0x00, 0x9D, 0x02, 0x44, 0x06,</div><div class='add'>+0xD0, 0x08, 0xC0, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0xA0,</div><div class='add'>+0x24, 0x00, 0xBD, 0x00, 0xF4, 0x02, 0xD0, 0x0B, 0x40, 0x2F, 0x00, 0xB5, 0x00,</div><div class='add'>+0xF4, 0x02, 0xD0, 0x0B, 0x60, 0x2C, 0x00, 0xBD, 0x08, 0xF6, 0x06, 0xD0, 0x0B,</div><div class='add'>+0x40, 0x6F, 0x10, 0xBD, 0x00, 0xF4, 0x02, 0x50, 0x1B, 0x42, 0x27, 0x04, 0x91,</div><div class='add'>+0x10, 0x64, 0x42, 0x00, 0x09, 0x41, 0x24, 0x84, 0x9D, 0x00, 0x64, 0x22, 0xD0,</div><div class='add'>+0x89, 0x40, 0x60, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x20, 0x28,</div><div class='add'>+0x00, 0xAD, 0x01, 0xB4, 0x02, 0x91, 0x0A, 0x40, 0x2B, 0x00, 0xAD, 0x00, 0xB4,</div><div class='add'>+0x06, 0xD0, 0x0B, 0x42, 0x29, 0x00, 0xAD, 0x01, 0xB4, 0x06, 0xD0, 0x0A, 0x60,</div><div class='add'>+0x6B, 0x00, 0xA5, 0x00, 0xF4, 0x02, 0xD2, 0x0A, 0x60, 0x23, 0x41, 0x81, 0x04,</div><div class='add'>+0x24, 0x92, 0x90, 0x48, 0x40, 0x20, 0x01, 0x8D, 0x40, 0x24, 0x02, 0xD0, 0x09,</div><div class='add'>+0x40, 0x42, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xB8, 0x06, 0x00,</div><div class='add'>+0x0F, 0x0A, 0x7C, 0x00, 0xF0, 0x01, 0xC0, 0x87, 0x12, 0x17, 0x0A, 0x7C, 0x28,</div><div class='add'>+0xD0, 0xA5, 0xD0, 0x84, 0x02, 0x1D, 0x0A, 0x5C, 0x28, 0xF0, 0xA0, 0xC0, 0x87,</div><div class='add'>+0x02, 0x1D, 0x00, 0x7C, 0x00, 0x60, 0x03, 0xC0, 0x07, 0x00, 0x13, 0x00, 0x65,</div><div class='add'>+0x00, 0x32, 0x01, 0xD0, 0x04, 0x00, 0x5F, 0x0A, 0x6C, 0x00, 0xF0, 0x01, 0xC0,</div><div class='add'>+0x74, 0xE0, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xB8, 0x27, 0x00, 0x9F,</div><div class='add'>+0x00, 0x7C, 0x02, 0xB0, 0x09, 0xC0, 0x27, 0x00, 0x9F, 0x00, 0x7C, 0x02, 0xF0,</div><div class='add'>+0x09, 0xC0, 0x26, 0x00, 0x9F, 0x00, 0x7C, 0x02, 0xF0, 0x09, 0xC0, 0x27, 0x00,</div><div class='add'>+0x9F, 0x00, 0x7C, 0x02, 0xB0, 0x08, 0xC0, 0x2F, 0x02, 0xBF, 0x08, 0xDC, 0x22,</div><div class='add'>+0x70, 0x8B, 0xC0, 0x2F, 0x02, 0xBF, 0x00, 0xDD, 0x02, 0xF0, 0x0B, 0xC0, 0x77,</div><div class='add'>+0x60, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xA0, 0x27, 0x00, 0xB3, 0x00,</div><div class='add'>+0xCC, 0x02, 0xF0, 0x0B, 0xC0, 0x24, 0x00, 0xBF, 0x00, 0xCC, 0x02, 0xF0, 0x0A,</div><div class='add'>+0xC0, 0x2D, 0x02, 0xB7, 0x00, 0xFE, 0x02, 0xF0, 0x8B, 0xC0, 0x2F, 0x00, 0x9F,</div><div class='add'>+0x00, 0x3C, 0x02, 0xF0, 0x09, 0xC0, 0x34, 0x00, 0x9F, 0x00, 0x6D, 0x12, 0x30,</div><div class='add'>+0x49, 0xC1, 0x24, 0x01, 0xB3, 0x00, 0xCC, 0x03, 0xF0, 0x0B, 0xC0, 0x73, 0x00,</div><div class='add'>+0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x05, 0x00, 0x11, 0x04, 0x45,</div><div class='add'>+0x00, 0xD0, 0x01, 0x40, 0x04, 0x00, 0x1D, 0x00, 0x45, 0x50, 0x70, 0x41, 0x40,</div><div class='add'>+0x04, 0x01, 0x11, 0x10, 0x74, 0x40, 0xD1, 0x01, 0x40, 0x07, 0x05, 0x1D, 0x00,</div><div class='add'>+0x74, 0x00, 0xD0, 0x01, 0x40, 0x05, 0x00, 0x1D, 0x08, 0x44, 0x00, 0x10, 0x01,</div><div class='add'>+0x40, 0x0C, 0x12, 0x01, 0x10, 0x44, 0x00, 0xD0, 0x01, 0x40, 0x63, 0x00, 0x0C,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x20, 0x25, 0x40, 0x81, 0x14, 0x04, 0x02,</div><div class='add'>+0xD0, 0x08, 0x40, 0x20, 0x00, 0x9D, 0x00, 0x04, 0x12, 0xD0, 0x48, 0x41, 0x21,</div><div class='add'>+0x21, 0x85, 0x04, 0x30, 0x02, 0xD0, 0x08, 0x40, 0x23, 0x01, 0xAD, 0x00, 0xB4,</div><div class='add'>+0x03, 0xD0, 0x0B, 0x40, 0x6A, 0x02, 0xAD, 0x01, 0x84, 0x26, 0x10, 0x1A, 0x40,</div><div class='add'>+0x68, 0x00, 0x99, 0x04, 0x05, 0x02, 0xD0, 0x0C, 0x40, 0x4B, 0x00, 0x04, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x18, 0x28, 0x25, 0x00, 0xD1, 0x00, 0x44, 0x02, 0xD0,</div><div class='add'>+0x09, 0x40, 0x24, 0x80, 0x9D, 0x40, 0x44, 0x02, 0xD0, 0x09, 0x40, 0x24, 0x00,</div><div class='add'>+0x91, 0x80, 0x74, 0x02, 0xD2, 0x09, 0x40, 0x27, 0x00, 0x9D, 0x00, 0xF4, 0x82,</div><div class='add'>+0xD0, 0x0B, 0x40, 0x2F, 0x00, 0xBD, 0x00, 0xC4, 0x02, 0x10, 0x0B, 0x40, 0x2C,</div><div class='add'>+0x10, 0x99, 0x01, 0x44, 0x02, 0xD0, 0x09, 0x40, 0x63, 0x20, 0x04, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x05, 0x00, 0x25, 0x00, 0x93, 0x00, 0x48, 0x02, 0xF0, 0x08,</div><div class='add'>+0xC0, 0x24, 0x00, 0x9F, 0x20, 0x4C, 0x02, 0xF0, 0x09, 0xC0, 0x25, 0x00, 0x95,</div><div class='add'>+0x00, 0x74, 0x02, 0xE0, 0x09, 0x80, 0x27, 0x00, 0x9F, 0x40, 0x7E, 0x02, 0xF0,</div><div class='add'>+0x09, 0xC0, 0xA6, 0x02, 0x9F, 0x03, 0x4C, 0x2A, 0x34, 0xB9, 0xC0, 0xA4, 0x00,</div><div class='add'>+0x8B, 0xA0, 0x4C, 0x82, 0xF0, 0x09, 0xC0, 0x17, 0x00, 0x04, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x16, 0x08, 0x24, 0x00, 0x9F, 0x80, 0x7C, 0x02, 0xF0, 0x09, 0xD0,</div><div class='add'>+0x27, 0x00, 0x9F, 0x00, 0x7C, 0x02, 0x70, 0x09, 0xC8, 0x27, 0x00, 0x9F, 0x00,</div><div class='add'>+0x7C, 0x02, 0xF0, 0x09, 0xC0, 0x27, 0x00, 0x9F, 0x00, 0x7C, 0x02, 0xF0, 0x09,</div><div class='add'>+0xC0, 0x25, 0x00, 0x9F, 0x03, 0x5C, 0x06, 0xF0, 0x19, 0xD0, 0x27, 0x40, 0x97,</div><div class='add'>+0x20, 0x7C, 0x12, 0xF0, 0x09, 0xC0, 0x5B, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x14, 0x08, 0x05, 0x00, 0x1F, 0x00, 0x7E, 0x00, 0xF0, 0x01, 0xC0, 0x07,</div><div class='add'>+0x00, 0x13, 0x10, 0x7C, 0x00, 0xF2, 0x81, 0xD1, 0x06, 0x00, 0x1F, 0x00, 0x7C,</div><div class='add'>+0x60, 0xF2, 0x01, 0xC0, 0x07, 0x00, 0x1F, 0x00, 0x7C, 0x00, 0x30, 0x01, 0xC0,</div><div class='add'>+0x07, 0x00, 0x03, 0x00, 0x3C, 0x00, 0xF0, 0x00, 0xC0, 0x03, 0x00, 0x1F, 0x00,</div><div class='add'>+0x4D, 0x04, 0xF0, 0x01, 0xC0, 0x53, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x10, 0x20, 0x10, 0x00, 0x7D, 0x00, 0x76, 0x45, 0xD0, 0x07, 0xC0, 0x15, 0x20,</div><div class='add'>+0x65, 0x00, 0xF4, 0x09, 0xD0, 0x27, 0xD0, 0x16, 0x00, 0x77, 0x00, 0xF4, 0x09,</div><div class='add'>+0xD2, 0x07, 0x40, 0x1F, 0x00, 0x5D, 0x00, 0x74, 0x01, 0x14, 0x04, 0xC0, 0x15,</div><div class='add'>+0x00, 0x51, 0x01, 0x74, 0x01, 0xD0, 0x15, 0x40, 0x57, 0x10, 0x7D, 0x41, 0xC4,</div><div class='add'>+0x01, 0xD0, 0x05, 0x40, 0x43, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10,</div><div class='add'>+0xA0, 0x32, 0x00, 0xDD, 0x40, 0x34, 0x07, 0xD0, 0x04, 0x40, 0x31, 0x80, 0x49,</div><div class='add'>+0x00, 0x34, 0x4B, 0xD0, 0x3D, 0x40, 0x36, 0x30, 0xCD, 0x00, 0x34, 0x07, 0xD8,</div><div class='add'>+0x0C, 0x40, 0x33, 0x00, 0xCD, 0x00, 0x34, 0x03, 0x10, 0x0C, 0x40, 0x31, 0x00,</div><div class='add'>+0xC1, 0x21, 0x34, 0x03, 0xD0, 0x1C, 0x40, 0x73, 0x00, 0xCD, 0x00, 0x04, 0x07,</div><div class='add'>+0xD0, 0x0C, 0x40, 0x43, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x80,</div><div class='add'>+0x38, 0x00, 0x6D, 0x00, 0xB4, 0x03, 0xD0, 0x0A, 0x40, 0x79, 0x02, 0x6D, 0x10,</div><div class='add'>+0xB6, 0x03, 0xD0, 0x0E, 0x58, 0x2A, 0x00, 0x6D, 0x00, 0xB4, 0x01, 0xD9, 0x02,</div><div class='add'>+0x40, 0x1B, 0x00, 0xAD, 0x00, 0xB4, 0x07, 0x10, 0x06, 0x40, 0x71, 0x40, 0xE1,</div><div class='add'>+0x10, 0xB4, 0x02, 0xD0, 0x0E, 0x41, 0x3B, 0x04, 0xED, 0x02, 0x84, 0x43, 0xD0,</div><div class='add'>+0x0A, 0x40, 0x13, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x18, 0x78,</div><div class='add'>+0x00, 0xAF, 0x01, 0xB4, 0x07, 0xD0, 0x16, 0xC0, 0x7D, 0x00, 0x6B, 0x01, 0xBC,</div><div class='add'>+0x06, 0xF0, 0x16, 0xD0, 0x7A, 0x00, 0xAF, 0x01, 0xB4, 0x06, 0xF0, 0x1E, 0xC0,</div><div class='add'>+0x6B, 0x00, 0x6F, 0x01, 0xB8, 0x07, 0x30, 0x1A, 0xC0, 0x59, 0x00, 0x63, 0x01,</div><div class='add'>+0xBC, 0x05, 0xF0, 0x16, 0xC0, 0x5B, 0x00, 0xEF, 0x01, 0x8C, 0x07, 0xF0, 0x1E,</div><div class='add'>+0xC0, 0x53, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xB8, 0x35, 0x00,</div><div class='add'>+0x1F, 0x00, 0x7C, 0x03, 0xF0, 0x01, 0xC0, 0x75, 0x20, 0x57, 0x00, 0x7C, 0x00,</div><div class='add'>+0xF0, 0x05, 0xD0, 0x27, 0x00, 0x17, 0x00, 0x7C, 0x00, 0xF0, 0x01, 0xC0, 0x07,</div><div class='add'>+0x00, 0x1F, 0x00, 0x7C, 0x03, 0xF0, 0x01, 0xC2, 0x15, 0x00, 0x5F, 0x00, 0x7C,</div><div class='add'>+0x00, 0xF8, 0x05, 0xC0, 0x17, 0x00, 0x5F, 0x00, 0x7C, 0x03, 0xF0, 0x0D, 0xC0,</div><div class='add'>+0x43, 0x60, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x28, 0x7D, 0x00, 0xFF,</div><div class='add'>+0x01, 0xBC, 0x07, 0xF8, 0x87, 0xC0, 0x7C, 0x00, 0xB3, 0x89, 0xCC, 0x05, 0xA0,</div><div class='add'>+0x1B, 0xC0, 0x7F, 0x20, 0xF3, 0x01, 0xDC, 0x07, 0x30, 0x1F, 0xC0, 0x7C, 0x00,</div><div class='add'>+0xF3, 0x01, 0xCC, 0x06, 0xF2, 0x1F, 0xC0, 0x7F, 0x00, 0xBF, 0x01, 0xCC, 0x07,</div><div class='add'>+0xF0, 0x1B, 0xC0, 0x6C, 0x00, 0xF3, 0x01, 0xFC, 0x05, 0x30, 0x1F, 0xC0, 0x1B,</div><div class='add'>+0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x00, 0x39, 0x00, 0x6D, 0x00,</div><div class='add'>+0x9C, 0x03, 0x18, 0x0A, 0x40, 0x38, 0x00, 0xA1, 0x00, 0xC4, 0x03, 0x11, 0x0A,</div><div class='add'>+0x40, 0x2B, 0x00, 0x71, 0x00, 0xC4, 0x02, 0x10, 0x02, 0x40, 0x1C, 0x00, 0xA1,</div><div class='add'>+0x00, 0x84, 0x0A, 0xD0, 0x06, 0x40, 0x3B, 0x00, 0xAD, 0x00, 0x84, 0x02, 0xD0,</div><div class='add'>+0x0A, 0x40, 0x28, 0x12, 0xE1, 0x00, 0xB4, 0x00, 0xB0, 0x0E, 0x40, 0x57, 0x20,</div><div class='add'>+0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x39, 0x00, 0xAD, 0x00, 0xB4,</div><div class='add'>+0x03, 0x50, 0x87, 0x40, 0x3C, 0x00, 0xB1, 0x00, 0x84, 0x20, 0x10, 0x02, 0x40,</div><div class='add'>+0xBF, 0x00, 0xA9, 0x00, 0x84, 0x01, 0x10, 0x0F, 0x40, 0x2A, 0x00, 0x79, 0x02,</div><div class='add'>+0x84, 0x02, 0xD0, 0x0A, 0x40, 0x1B, 0x00, 0x0D, 0x00, 0x84, 0x01, 0xD0, 0x80,</div><div class='add'>+0x40, 0x00, 0x00, 0xA1, 0x00, 0xF4, 0x40, 0x10, 0x0E, 0x40, 0x03, 0x00, 0x04,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x28, 0xF1, 0x00, 0x1D, 0x02, 0x34, 0x43,</div><div class='add'>+0x10, 0x00, 0x41, 0xB0, 0x04, 0x81, 0x04, 0x04, 0x34, 0x91, 0x38, 0x40, 0x23,</div><div class='add'>+0x00, 0x09, 0x0D, 0x04, 0x34, 0x10, 0x00, 0x41, 0x42, 0x43, 0x09, 0x20, 0x04,</div><div class='add'>+0x06, 0xD0, 0x10, 0x40, 0x13, 0x00, 0x0D, 0x12, 0x04, 0x00, 0xD0, 0x00, 0x40,</div><div class='add'>+0x80, 0x00, 0x01, 0x20, 0x34, 0x84, 0x90, 0x0C, 0x40, 0x0B, 0x20, 0x04, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x15, 0xA8, 0xB5, 0x00, 0xDF, 0x05, 0x7C, 0x07, 0x50,</div><div class='add'>+0x24, 0xC0, 0x38, 0x00, 0x93, 0x02, 0x44, 0x0B, 0xB0, 0x05, 0xC0, 0x73, 0x00,</div><div class='add'>+0xD9, 0x02, 0x44, 0x0B, 0x10, 0x2C, 0xC0, 0xB6, 0x00, 0xCB, 0x00, 0x0C, 0x69,</div><div class='add'>+0xF1, 0x2D, 0x41, 0x67, 0x00, 0xDF, 0x03, 0x4D, 0x07, 0xF0, 0xBD, 0xD0, 0x74,</div><div class='add'>+0x40, 0xD3, 0x00, 0x3C, 0x05, 0x30, 0x0D, 0xC0, 0x57, 0x00, 0x06, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x05, 0x00, 0x37, 0x06, 0x9F, 0x10, 0x5C, 0x23, 0x70, 0x1D,</div><div class='add'>+0xC0, 0x77, 0x00, 0x9F, 0x03, 0x7C, 0x02, 0x71, 0x85, 0xC0, 0x37, 0x22, 0x97,</div><div class='add'>+0x02, 0x7C, 0x01, 0xF0, 0x3D, 0xC0, 0x25, 0x00, 0x97, 0x08, 0x7C, 0x01, 0xF0,</div><div class='add'>+0x05, 0xC1, 0x63, 0x00, 0xDF, 0x81, 0x7C, 0x06, 0xF0, 0x1D, 0xC2, 0x77, 0x14,</div><div class='add'>+0xDF, 0x03, 0x7C, 0x01, 0xF0, 0x8D, 0xC2, 0x17, 0x20, 0x0C, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x80, 0x08, 0x3F, 0x00, 0x7F, 0x00, 0xCC, 0x0F, 0xF0, 0x07, 0xC0,</div><div class='add'>+0x3E, 0x00, 0xB3, 0x00, 0xFC, 0x17, 0x32, 0x03, 0xC5, 0x2C, 0x00, 0x73, 0x00,</div><div class='add'>+0xCE, 0x02, 0x30, 0x13, 0xC0, 0x1C, 0x01, 0x72, 0x00, 0xCC, 0x01, 0x30, 0x0B,</div><div class='add'>+0xC0, 0x0F, 0x02, 0x73, 0x00, 0xFC, 0x01, 0xF0, 0x07, 0xC0, 0x1F, 0x00, 0xFF,</div><div class='add'>+0x00, 0xCC, 0x01, 0x30, 0x0F, 0xC0, 0x03, 0x22, 0x0C, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x81, 0x20, 0x36, 0x00, 0x1D, 0x00, 0x44, 0x03, 0xD0, 0x05, 0x40, 0x34,</div><div class='add'>+0x20, 0x91, 0x09, 0x74, 0x04, 0x10, 0x10, 0x41, 0x24, 0x00, 0x11, 0x02, 0x44,</div><div class='add'>+0x00, 0x10, 0x11, 0x40, 0xC4, 0x01, 0x11, 0x00, 0x44, 0x09, 0x10, 0x01, 0xC0,</div><div class='add'>+0x05, 0x00, 0x51, 0x20, 0x74, 0x00, 0xD0, 0x05, 0x40, 0x17, 0x10, 0xDD, 0x00,</div><div class='add'>+0x44, 0x05, 0x10, 0x0D, 0x40, 0x07, 0x02, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x01, 0xA0, 0x36, 0x00, 0xDD, 0x04, 0x44, 0x02, 0xD8, 0x85, 0x40, 0x36, 0x00,</div><div class='add'>+0x91, 0x02, 0x14, 0x01, 0x18, 0x15, 0x40, 0x34, 0x81, 0xC9, 0x06, 0x04, 0x03,</div><div class='add'>+0x10, 0x6D, 0x40, 0x32, 0x80, 0xD5, 0x00, 0x44, 0x00, 0x10, 0x0D, 0x40, 0x27,</div><div class='add'>+0x00, 0x91, 0x00, 0x74, 0x03, 0xD0, 0x09, 0x40, 0x27, 0x00, 0xCD, 0x86, 0x44,</div><div class='add'>+0x04, 0x10, 0x1D, 0x40, 0x07, 0x08, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10,</div><div class='add'>+0x00, 0x30, 0x00, 0x8D, 0x00, 0x05, 0x02, 0xD0, 0x0C, 0x40, 0x36, 0x00, 0x81,</div><div class='add'>+0x00, 0x34, 0x02, 0x14, 0x0D, 0x50, 0x34, 0x00, 0x80, 0x00, 0x05, 0x02, 0x14,</div><div class='add'>+0x0D, 0x60, 0x22, 0x40, 0x95, 0xA0, 0x04, 0x00, 0x10, 0x04, 0x40, 0x23, 0x40,</div><div class='add'>+0x81, 0x00, 0x34, 0x02, 0xD0, 0x08, 0x40, 0x23, 0x00, 0xCD, 0x00, 0x04, 0x04,</div><div class='add'>+0x14, 0x0C, 0x40, 0x43, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18,</div><div class='add'>+0x36, 0x00, 0x5F, 0x00, 0x4C, 0x03, 0xF0, 0x05, 0xC0, 0x36, 0x00, 0x93, 0x00,</div><div class='add'>+0x7C, 0x01, 0x30, 0x01, 0xC0, 0x24, 0x10, 0x5B, 0x80, 0x46, 0x81, 0x30, 0x01,</div><div class='add'>+0xC0, 0x16, 0x00, 0x57, 0x00, 0x4C, 0x00, 0x30, 0x09, 0xC0, 0x07, 0x00, 0x13,</div><div class='add'>+0x00, 0x7C, 0x01, 0xF0, 0x01, 0xC0, 0x07, 0x00, 0xDF, 0x00, 0x4D, 0x00, 0x30,</div><div class='add'>+0x0D, 0xC0, 0x03, 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0xB8, 0x3F,</div><div class='add'>+0x00, 0x3F, 0x00, 0xFC, 0x03, 0xF0, 0x06, 0xC0, 0x39, 0x00, 0xAF, 0x80, 0xFC,</div><div class='add'>+0x00, 0xF0, 0x0B, 0xC0, 0x2B, 0x80, 0x3F, 0x00, 0xFE, 0x00, 0xF0, 0x02, 0xC0,</div><div class='add'>+0x0D, 0x00, 0x2B, 0x00, 0xFC, 0x00, 0xF0, 0x03, 0xC0, 0x0D, 0x00, 0x3F, 0x00,</div><div class='add'>+0xFC, 0x00, 0xF0, 0x03, 0xC0, 0x0F, 0x00, 0xFF, 0x00, 0xBC, 0x00, 0xF0, 0x0F,</div><div class='add'>+0xC0, 0x17, 0x20, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xA0, 0x2F, 0x00,</div><div class='add'>+0xFF, 0x01, 0xFC, 0x02, 0xF0, 0x0F, 0xC0, 0x5D, 0x00, 0x6F, 0x01, 0xCC, 0x06,</div><div class='add'>+0xF1, 0x0F, 0xC0, 0x7C, 0x00, 0x33, 0x03, 0xEC, 0x24, 0xB2, 0xCF, 0xC8, 0x3C,</div><div class='add'>+0x21, 0xFB, 0x84, 0xDC, 0x87, 0xB0, 0x0F, 0x40, 0x5C, 0x02, 0x3F, 0x08, 0xAC,</div><div class='add'>+0x85, 0xB0, 0x0F, 0xC2, 0x5F, 0x00, 0x37, 0x80, 0xCD, 0x06, 0x90, 0x0B, 0x80,</div><div class='add'>+0x0E, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x27, 0x00, 0xDD,</div><div class='add'>+0x01, 0x74, 0x00, 0xD0, 0x3D, 0x42, 0x60, 0x00, 0x1D, 0x01, 0x44, 0x06, 0xD2,</div><div class='add'>+0x1D, 0x40, 0x7C, 0x00, 0x11, 0x20, 0x44, 0x10, 0x10, 0xAF, 0x40, 0x7C, 0x02,</div><div class='add'>+0xF1, 0x02, 0x44, 0x07, 0x14, 0x6D, 0x40, 0x04, 0x01, 0x9D, 0x04, 0x54, 0x85,</div><div class='add'>+0x10, 0x9F, 0x00, 0x47, 0x40, 0x93, 0x8B, 0x44, 0x52, 0x10, 0x09, 0x40, 0x0D,</div><div class='add'>+0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0xA0, 0x03, 0x00, 0xCD, 0x00,</div><div class='add'>+0x34, 0x00, 0xD0, 0x2C, 0x40, 0x31, 0x00, 0x4D, 0x00, 0x04, 0x02, 0xD0, 0x0C,</div><div class='add'>+0x60, 0x30, 0x20, 0x10, 0x04, 0x64, 0x10, 0x90, 0x4C, 0x48, 0x30, 0x10, 0xC9,</div><div class='add'>+0x08, 0x34, 0x03, 0x02, 0x2C, 0x45, 0x12, 0x01, 0x0D, 0x00, 0x24, 0x01, 0xD0,</div><div class='add'>+0x0C, 0x42, 0x33, 0x10, 0x09, 0x20, 0x04, 0x03, 0x10, 0x00, 0x40, 0x4D, 0x80,</div><div class='add'>+0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xA8, 0x64, 0x00, 0xDD, 0x00, 0x74,</div><div class='add'>+0x04, 0xC0, 0x0D, 0x60, 0x24, 0x00, 0x1D, 0x04, 0x45, 0x02, 0xD0, 0x0D, 0x40,</div><div class='add'>+0x34, 0x08, 0x11, 0x00, 0x64, 0x44, 0x10, 0x0D, 0x48, 0x34, 0x80, 0xD1, 0x00,</div><div class='add'>+0x64, 0x03, 0x50, 0x0D, 0x40, 0x06, 0x04, 0x8D, 0x11, 0x74, 0x85, 0x54, 0x0D,</div><div class='add'>+0x42, 0x07, 0x00, 0x55, 0x08, 0x44, 0x02, 0x10, 0x11, 0x41, 0x0D, 0x20, 0x02,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA0, 0x66, 0x00, 0xDF, 0x00, 0x78, 0x4E,</div><div class='add'>+0xE0, 0x0D, 0xC0, 0x25, 0x10, 0x4F, 0x07, 0x4C, 0x22, 0xF0, 0x9D, 0x40, 0x34,</div><div class='add'>+0x40, 0x13, 0x0D, 0x2C, 0x0C, 0xB2, 0x0D, 0xD0, 0x34, 0x10, 0xDB, 0x00, 0x74,</div><div class='add'>+0x03, 0x30, 0x0D, 0x50, 0x06, 0x28, 0x9E, 0x01, 0x6C, 0x14, 0xF0, 0x0D, 0xC0,</div><div class='add'>+0x13, 0x00, 0x1B, 0x03, 0x4C, 0x06, 0x30, 0x19, 0xC0, 0x21, 0x80, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x07, 0x88, 0x2D, 0x00, 0xFF, 0x00, 0xFC, 0x02, 0xF0,</div><div class='add'>+0x0E, 0xC0, 0x2F, 0x00, 0x7F, 0x00, 0xFC, 0x06, 0xF0, 0x0E, 0xC0, 0x3F, 0x00,</div><div class='add'>+0xFF, 0x00, 0xDC, 0x02, 0x70, 0x0E, 0xC0, 0x3F, 0x00, 0xEF, 0x00, 0xDC, 0x03,</div><div class='add'>+0xB0, 0x0F, 0xC2, 0x0D, 0x10, 0xBD, 0x00, 0xDC, 0x01, 0xB4, 0x0F, 0xC0, 0x8F,</div><div class='add'>+0x50, 0x6B, 0x00, 0xFC, 0x26, 0xF4, 0x0A, 0xC0, 0x1F, 0x20, 0x06, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x02, 0x08, 0x85, 0x02, 0xDF, 0x00, 0x7C, 0x40, 0x30, 0x0D,</div><div class='add'>+0xC0, 0x37, 0x00, 0x57, 0x02, 0x4C, 0x42, 0xF0, 0x0D, 0xC0, 0x37, 0x02, 0xDF,</div><div class='add'>+0x00, 0x7C, 0x0A, 0xF0, 0x0D, 0xC4, 0x34, 0x0A, 0xDF, 0x00, 0x5C, 0x23, 0x70,</div><div class='add'>+0x0D, 0xC1, 0x15, 0x00, 0x13, 0x02, 0x4C, 0x00, 0x50, 0x0D, 0xC9, 0x36, 0x08,</div><div class='add'>+0x17, 0x12, 0x4D, 0x03, 0xF0, 0x09, 0x82, 0x2B, 0x20, 0x04, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x13, 0xA0, 0x24, 0x00, 0xDD, 0x60, 0x70, 0x18, 0x10, 0x0F, 0x40,</div><div class='add'>+0x27, 0x00, 0x51, 0x05, 0x44, 0x4E, 0xD0, 0x0D, 0x40, 0x33, 0x00, 0xCD, 0x00,</div><div class='add'>+0x74, 0x02, 0xD0, 0xAF, 0x40, 0x38, 0x02, 0xFD, 0x00, 0x34, 0x2B, 0xB0, 0x2E,</div><div class='add'>+0x40, 0x04, 0x40, 0x11, 0x08, 0x2C, 0x03, 0x10, 0x2F, 0x48, 0x04, 0x02, 0x51,</div><div class='add'>+0x00, 0x44, 0x13, 0xD0, 0x09, 0x40, 0x4F, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x03, 0x20, 0xC0, 0x04, 0xCD, 0x00, 0x34, 0x0E, 0x50, 0x0C, 0x40, 0x13,</div><div class='add'>+0x00, 0x05, 0x06, 0x05, 0x0E, 0xD0, 0x08, 0x40, 0xF3, 0x04, 0x0D, 0x00, 0x34,</div><div class='add'>+0x00, 0xD0, 0x0C, 0x60, 0x70, 0x00, 0xCD, 0x07, 0x34, 0x03, 0x10, 0x0C, 0x48,</div><div class='add'>+0x11, 0x80, 0x04, 0x00, 0x04, 0x00, 0x40, 0x3C, 0x40, 0x90, 0x00, 0x49, 0x02,</div><div class='add'>+0x44, 0x13, 0xD1, 0x50, 0x44, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x04, 0x00, 0x58, 0x00, 0xED, 0x01, 0xB4, 0x01, 0x50, 0x1E, 0x40, 0x6B, 0x00,</div><div class='add'>+0x31, 0x01, 0x84, 0x06, 0xD0, 0x1A, 0x40, 0x7B, 0x00, 0xED, 0x01, 0xB4, 0x07,</div><div class='add'>+0xD0, 0x1C, 0x40, 0x78, 0x00, 0xED, 0x31, 0xB4, 0x07, 0x90, 0x1E, 0x40, 0x48,</div><div class='add'>+0x80, 0xE5, 0x01, 0xE4, 0x04, 0x10, 0x9C, 0x40, 0x4C, 0x01, 0xC9, 0x01, 0x84,</div><div class='add'>+0x16, 0xD8, 0x9A, 0x40, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12,</div><div class='add'>+0x1A, 0x90, 0x02, 0xCF, 0x00, 0x7C, 0x23, 0x70, 0x0C, 0xC0, 0x33, 0x00, 0x07,</div><div class='add'>+0x04, 0x0C, 0x02, 0xF0, 0x4C, 0xC0, 0x33, 0x01, 0xCD, 0x00, 0x3C, 0x02, 0xF0,</div><div class='add'>+0x8C, 0x40, 0x30, 0x02, 0xCF, 0x00, 0x3C, 0x03, 0x30, 0xDD, 0xC0, 0x15, 0x2A,</div><div class='add'>+0x57, 0x24, 0x0C, 0x61, 0x70, 0x8C, 0xC9, 0x22, 0x90, 0x89, 0x12, 0x0C, 0x03,</div><div class='add'>+0xF0, 0x00, 0xC1, 0x4B, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x38,</div><div class='add'>+0x3D, 0x08, 0xFF, 0x00, 0xFC, 0x13, 0xB0, 0x0F, 0xC1, 0x2F, 0x00, 0x3F, 0x00,</div><div class='add'>+0xFC, 0x22, 0xF0, 0x0F, 0xC0, 0x77, 0x00, 0xDF, 0x08, 0xFC, 0x23, 0xF0, 0x2D,</div><div class='add'>+0x52, 0x3F, 0x20, 0xDF, 0x00, 0x3C, 0x03, 0xF4, 0x0D, 0xC0, 0x07, 0x20, 0xDB,</div><div class='add'>+0x00, 0x7C, 0x81, 0xF0, 0x8F, 0xC2, 0x0B, 0x81, 0xF7, 0x00, 0xF0, 0x12, 0xF0,</div><div class='add'>+0x03, 0xC2, 0x0B, 0x60, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xA0, 0x37,</div><div class='add'>+0x00, 0xDF, 0x00, 0x7C, 0x03, 0xF0, 0x0D, 0xC0, 0x27, 0x00, 0x1F, 0x00, 0x7C,</div><div class='add'>+0x02, 0xF0, 0x09, 0xC0, 0x37, 0x00, 0x1F, 0x00, 0x6C, 0x01, 0xF0, 0x0D, 0xC0,</div><div class='add'>+0xB7, 0x00, 0xDF, 0x08, 0x3C, 0x03, 0x31, 0x1D, 0xC8, 0x07, 0x10, 0x9F, 0x00,</div><div class='add'>+0x4F, 0x00, 0xF0, 0x4D, 0xC8, 0x10, 0x08, 0x9B, 0x00, 0x4D, 0x83, 0x30, 0x01,</div><div class='add'>+0xC0, 0x40, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x80, 0x39, 0x00,</div><div class='add'>+0xED, 0x00, 0xB4, 0x03, 0xD3, 0x4E, 0x40, 0x2B, 0x00, 0x2D, 0x00, 0x9C, 0x02,</div><div class='add'>+0xD0, 0x0A, 0x60, 0xBB, 0x10, 0xFC, 0x00, 0x84, 0x03, 0xD0, 0x4E, 0x40, 0xBB,</div><div class='add'>+0x04, 0xED, 0x0C, 0xB4, 0x03, 0x40, 0x2E, 0x40, 0x0B, 0x00, 0xED, 0x20, 0x84,</div><div class='add'>+0x00, 0xD0, 0xAE, 0x40, 0x08, 0x00, 0xE7, 0x00, 0xC4, 0x83, 0x12, 0x0F, 0x40,</div><div class='add'>+0x4C, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x02, 0x59, 0x18, 0xE5,</div><div class='add'>+0x01, 0xB4, 0x07, 0x50, 0x5E, 0x40, 0x7B, 0x00, 0x2D, 0x01, 0xB4, 0x06, 0x50,</div><div class='add'>+0x1E, 0x40, 0x7B, 0x01, 0xED, 0x11, 0x84, 0x07, 0xD0, 0xDE, 0x40, 0x7B, 0x01,</div><div class='add'>+0xED, 0x81, 0xB4, 0x07, 0x00, 0x4E, 0x40, 0x5B, 0x20, 0xED, 0x01, 0x94, 0x04,</div><div class='add'>+0xD1, 0x5C, 0x50, 0x69, 0x00, 0x85, 0x01, 0x94, 0x0F, 0x10, 0x16, 0x40, 0x12,</div><div class='add'>+0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16, 0x28, 0xB3, 0x80, 0xCD, 0x40,</div><div class='add'>+0x34, 0x27, 0xD0, 0x0C, 0x40, 0x23, 0x11, 0x8D, 0x03, 0x14, 0x07, 0xD0, 0x0C,</div><div class='add'>+0x40, 0x33, 0x00, 0xCD, 0x01, 0x04, 0x47, 0xD0, 0x0C, 0x40, 0x33, 0x00, 0xCD,</div><div class='add'>+0x00, 0x34, 0x83, 0x00, 0x0C, 0x44, 0xA3, 0x02, 0xDD, 0x02, 0x04, 0x05, 0xD0,</div><div class='add'>+0x0C, 0x44, 0x01, 0x00, 0xC5, 0x07, 0x14, 0x87, 0x10, 0x6C, 0x40, 0x5A, 0x20,</div><div class='add'>+0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x17, 0x20, 0x1D, 0x04, 0x5F, 0x00, 0xFC,</div><div class='add'>+0x09, 0xF0, 0x05, 0xC0, 0xDF, 0x01, 0x7F, 0x44, 0x74, 0x45, 0xF8, 0x05, 0xC0,</div><div class='add'>+0x17, 0x00, 0x7F, 0x02, 0xCD, 0x95, 0xF0, 0x05, 0x40, 0x17, 0x00, 0x5F, 0x80,</div><div class='add'>+0x3C, 0x01, 0x31, 0x05, 0xC0, 0x5F, 0x00, 0x7F, 0x02, 0x8C, 0xBD, 0xF1, 0x05,</div><div class='add'>+0xC0, 0x1D, 0x00, 0x67, 0x07, 0x5C, 0x01, 0x36, 0x27, 0xC4, 0x5E, 0x00, 0x0C,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x08, 0x05, 0x04, 0x1F, 0x00, 0x7C, 0x80,</div><div class='add'>+0xF0, 0x01, 0xC0, 0x07, 0x08, 0x1F, 0x10, 0x70, 0x00, 0xF9, 0x01, 0xC4, 0x07,</div><div class='add'>+0x00, 0x1F, 0x04, 0x7C, 0x00, 0xF0, 0x01, 0xC0, 0x07, 0x00, 0x1F, 0x42, 0x7C,</div><div class='add'>+0x08, 0xF4, 0x01, 0xC0, 0x07, 0x01, 0x1D, 0x82, 0x7C, 0x00, 0xF0, 0x01, 0xA0,</div><div class='add'>+0x86, 0x00, 0x16, 0x00, 0x68, 0x08, 0xF2, 0x01, 0xD0, 0x49, 0x20, 0x04, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x10, 0x08, 0x65, 0x01, 0x97, 0x00, 0x7C, 0x4E, 0xF8,</div><div class='add'>+0x09, 0xC0, 0x27, 0x00, 0x93, 0x82, 0x7C, 0x02, 0xF0, 0x09, 0xC8, 0x27, 0x89,</div><div class='add'>+0x93, 0x80, 0x7C, 0x02, 0x30, 0x19, 0xC0, 0x64, 0x00, 0x9F, 0x00, 0x7C, 0x16,</div><div class='add'>+0x30, 0x08, 0xC0, 0x24, 0x00, 0x9F, 0x39, 0x4C, 0x02, 0x34, 0x29, 0xD8, 0x24,</div><div class='add'>+0x40, 0x91, 0x09, 0x4C, 0x0E, 0x34, 0x08, 0xC0, 0x40, 0x20, 0x04, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x01, 0x20, 0x66, 0x01, 0x9D, 0x00, 0x74, 0x0E, 0xD0, 0x09,</div><div class='add'>+0x60, 0x23, 0x20, 0x91, 0x03, 0x76, 0x06, 0xD0, 0x09, 0x40, 0xEB, 0x81, 0x8B,</div><div class='add'>+0x00, 0x6C, 0x02, 0x50, 0x19, 0xD0, 0x64, 0x12, 0x9D, 0x02, 0x74, 0x02, 0xB0,</div><div class='add'>+0x09, 0xC0, 0x26, 0x00, 0x9D, 0x43, 0x45, 0x2E, 0x10, 0x38, 0x48, 0xA0, 0x11,</div><div class='add'>+0x91, 0x01, 0x44, 0x02, 0x12, 0x29, 0x40, 0x05, 0x80, 0x08, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x18, 0xA0, 0x24, 0x18, 0x9D, 0x00, 0x54, 0x0A, 0xD0, 0x09, 0x40,</div><div class='add'>+0x27, 0x00, 0x91, 0x10, 0x74, 0x0E, 0xD1, 0x09, 0x48, 0x25, 0x80, 0x91, 0x00,</div><div class='add'>+0x14, 0x02, 0x10, 0x88, 0x40, 0x24, 0x00, 0x9D, 0x02, 0x54, 0x0A, 0x90, 0x09,</div><div class='add'>+0x44, 0x24, 0x00, 0x9D, 0x02, 0x44, 0x02, 0x10, 0x09, 0x40, 0x24, 0x00, 0x95,</div><div class='add'>+0x02, 0x25, 0x02, 0x10, 0x49, 0x60, 0x60, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x10, 0x22, 0x20, 0x05, 0x8D, 0x00, 0x34, 0x52, 0xD0, 0x08, 0x40, 0xA7,</div><div class='add'>+0x08, 0x81, 0x00, 0x36, 0x02, 0xDA, 0x08, 0x40, 0x23, 0x00, 0x91, 0x08, 0x04,</div><div class='add'>+0x22, 0x10, 0x8C, 0x60, 0x22, 0x80, 0x8D, 0x24, 0x34, 0x02, 0x94, 0x58, 0x40,</div><div class='add'>+0x22, 0x00, 0x8D, 0x0C, 0x44, 0x03, 0x10, 0x0C, 0x40, 0x24, 0x00, 0x85, 0x00,</div><div class='add'>+0x24, 0x22, 0x10, 0x48, 0x40, 0x41, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x1D, 0xB8, 0x06, 0x11, 0x1F, 0x00, 0x5C, 0x10, 0xD0, 0x41, 0x41, 0x07, 0x40,</div><div class='add'>+0x13, 0x00, 0x76, 0x00, 0xF0, 0x01, 0xC0, 0x47, 0x40, 0x11, 0x02, 0x54, 0x08,</div><div class='add'>+0x34, 0x61, 0xC1, 0x14, 0x15, 0x1F, 0x8A, 0x7C, 0x00, 0xB4, 0xA1, 0xC4, 0x84,</div><div class='add'>+0x02, 0x0F, 0x02, 0x4C, 0x00, 0x30, 0x41, 0xC1, 0x04, 0x00, 0x15, 0x14, 0x6C,</div><div class='add'>+0x09, 0x30, 0xA5, 0xC0, 0x74, 0xE0, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1D,</div><div class='add'>+0xB8, 0x2F, 0x05, 0x9F, 0x00, 0xFC, 0x52, 0xF0, 0x09, 0xC0, 0x6F, 0x20, 0xBF,</div><div class='add'>+0x00, 0xFC, 0x02, 0xF0, 0x2B, 0xC0, 0xA7, 0x00, 0xBF, 0x04, 0xFC, 0x12, 0xF0,</div><div class='add'>+0x49, 0x42, 0x25, 0x00, 0x9F, 0x08, 0x7C, 0x02, 0xF4, 0x89, 0xC0, 0x2D, 0x00,</div><div class='add'>+0xBF, 0x0C, 0xFC, 0x02, 0xF0, 0x09, 0xC0, 0x3F, 0x00, 0xBB, 0x00, 0xDC, 0x12,</div><div class='add'>+0xF0, 0x8B, 0xC0, 0x77, 0x60, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xA8,</div><div class='add'>+0x2F, 0x01, 0x9F, 0x00, 0xFC, 0x32, 0xB0, 0x09, 0xC0, 0xA7, 0x20, 0xBF, 0x00,</div><div class='add'>+0xCD, 0x02, 0xF0, 0x49, 0xC5, 0x6F, 0x00, 0x9B, 0x80, 0x6E, 0x02, 0x79, 0x8B,</div><div class='add'>+0xC0, 0x2F, 0x01, 0xBB, 0x14, 0xAC, 0x82, 0x30, 0x0B, 0xCC, 0x21, 0x00, 0xBF,</div><div class='add'>+0x28, 0xCC, 0x82, 0x31, 0x4B, 0xC1, 0x2E, 0x68, 0xA3, 0x00, 0xBC, 0x02, 0xF0,</div><div class='add'>+0x0F, 0xC0, 0x77, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x07,</div><div class='add'>+0x05, 0x1D, 0x00, 0x70, 0x31, 0x14, 0x21, 0x40, 0x47, 0x00, 0x1D, 0x00, 0x44,</div><div class='add'>+0x00, 0xD0, 0x01, 0x00, 0x07, 0x00, 0x5A, 0x30, 0x44, 0xC0, 0xD8, 0x81, 0x40,</div><div class='add'>+0x07, 0x00, 0x11, 0x04, 0x51, 0x00, 0x10, 0x01, 0xC0, 0x05, 0x04, 0x5D, 0x08,</div><div class='add'>+0x4C, 0x00, 0x11, 0x01, 0x40, 0x07, 0x30, 0x11, 0x00, 0x64, 0x80, 0xD0, 0x01,</div><div class='add'>+0x40, 0x63, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x21, 0x03,</div><div class='add'>+0x8D, 0x00, 0x34, 0x12, 0x10, 0x88, 0x40, 0x23, 0x00, 0x8D, 0x80, 0x04, 0x82,</div><div class='add'>+0xD2, 0x08, 0x0A, 0xA3, 0x00, 0x89, 0x04, 0x04, 0x02, 0x50, 0x08, 0x40, 0x23,</div><div class='add'>+0x02, 0x89, 0x14, 0x14, 0x02, 0x14, 0x08, 0x40, 0x21, 0x00, 0x8D, 0x00, 0x05,</div><div class='add'>+0x02, 0x18, 0x08, 0x48, 0x27, 0x20, 0x85, 0x00, 0x36, 0x02, 0xD0, 0x08, 0x40,</div><div class='add'>+0x4B, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x20, 0xA5, 0x00, 0x9D,</div><div class='add'>+0x00, 0x74, 0x12, 0x10, 0x09, 0x40, 0x27, 0x00, 0x9D, 0x10, 0x44, 0x02, 0xD0,</div><div class='add'>+0x09, 0x48, 0x26, 0x20, 0x89, 0x00, 0x44, 0x02, 0xD8, 0x09, 0x40, 0x27, 0x00,</div><div class='add'>+0x91, 0x00, 0x44, 0x02, 0xD0, 0x09, 0x68, 0x25, 0x10, 0x9D, 0x04, 0x46, 0x02,</div><div class='add'>+0x99, 0x0D, 0x40, 0x27, 0x00, 0xD5, 0x00, 0x64, 0x22, 0xD0, 0x09, 0x41, 0x63,</div><div class='add'>+0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x65, 0x00, 0x9D, 0x00,</div><div class='add'>+0x7C, 0x06, 0x30, 0x09, 0xC0, 0x2F, 0x06, 0x9F, 0x00, 0x4C, 0x02, 0xF0, 0x09,</div><div class='add'>+0xC0, 0x27, 0x00, 0x9B, 0x02, 0x65, 0x42, 0x72, 0x09, 0xC2, 0x27, 0x00, 0x9B,</div><div class='add'>+0x00, 0x54, 0x02, 0x30, 0x09, 0xC0, 0x25, 0x33, 0x9F, 0x21, 0x4C, 0x46, 0x30,</div><div class='add'>+0x09, 0xC0, 0x22, 0x00, 0x95, 0xA7, 0x7E, 0x82, 0xE0, 0x39, 0xC0, 0x17, 0x00,</div><div class='add'>+0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16, 0x00, 0x25, 0x25, 0x9F, 0x80, 0x3C,</div><div class='add'>+0x06, 0x70, 0x09, 0xE2, 0x27, 0x00, 0x9F, 0x10, 0x7C, 0x26, 0xF0, 0x59, 0xC0,</div><div class='add'>+0x27, 0x0C, 0x97, 0x02, 0x5C, 0x02, 0xF0, 0x09, 0xC0, 0x27, 0x00, 0x9F, 0x50,</div><div class='add'>+0x5C, 0x02, 0x32, 0x09, 0xE8, 0x27, 0x10, 0x8F, 0x01, 0x5C, 0x0A, 0x74, 0x09,</div><div class='add'>+0xC1, 0xA6, 0x00, 0x9B, 0x05, 0x7E, 0x02, 0xF0, 0x59, 0xC0, 0x5B, 0x20, 0x04,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x00, 0x05, 0x00, 0x1F, 0x00, 0x6C, 0x40,</div><div class='add'>+0xF0, 0x01, 0xC0, 0x07, 0x00, 0x1F, 0x00, 0x7C, 0x80, 0xB0, 0x01, 0xC0, 0x03,</div><div class='add'>+0x00, 0x17, 0x02, 0x7C, 0x08, 0xF0, 0x01, 0xC2, 0x00, 0x01, 0x1F, 0x00, 0x4C,</div><div class='add'>+0x00, 0xB0, 0x81, 0xC1, 0x07, 0x40, 0x17, 0x22, 0x5C, 0x10, 0xF0, 0x01, 0xC0,</div><div class='add'>+0x07, 0x00, 0x13, 0x02, 0x4C, 0x40, 0x30, 0x01, 0x82, 0x53, 0x20, 0x04, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x10, 0xA0, 0x9C, 0x00, 0x5D, 0x40, 0xF4, 0x05, 0xD8,</div><div class='add'>+0x05, 0xC0, 0x15, 0x20, 0x6C, 0x00, 0xF4, 0x49, 0x10, 0x05, 0x40, 0x9F, 0x80,</div><div class='add'>+0x5B, 0x00, 0x76, 0x01, 0xD0, 0x87, 0x40, 0x9C, 0x00, 0x7D, 0x02, 0x84, 0x01,</div><div class='add'>+0xF4, 0x27, 0xC0, 0x15, 0x00, 0x71, 0x00, 0x84, 0x89, 0x10, 0x77, 0x40, 0xDF,</div><div class='add'>+0x00, 0x70, 0x07, 0xC4, 0x01, 0x16, 0x97, 0x40, 0x43, 0x00, 0x02, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x10, 0xA8, 0xF2, 0x00, 0xCD, 0x00, 0x34, 0x23, 0xD0, 0x0C,</div><div class='add'>+0x48, 0x31, 0x00, 0x88, 0x02, 0x36, 0x1F, 0x90, 0x0C, 0x40, 0x13, 0x10, 0xC5,</div><div class='add'>+0x00, 0x34, 0x03, 0x90, 0x3C, 0x60, 0xB0, 0x00, 0xD5, 0x0B, 0x00, 0x03, 0x91,</div><div class='add'>+0x3C, 0x44, 0x31, 0x00, 0xC1, 0x01, 0x34, 0x0A, 0x50, 0x14, 0x40, 0xF2, 0x01,</div><div class='add'>+0xC1, 0x07, 0x24, 0x0B, 0x12, 0x8C, 0x44, 0x43, 0x00, 0x0A, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x04, 0x80, 0x38, 0x04, 0xED, 0x00, 0xB4, 0x03, 0xD0, 0x0E, 0x40,</div><div class='add'>+0x39, 0x01, 0x6D, 0x10, 0xB4, 0x04, 0x18, 0x0E, 0x40, 0x1B, 0x00, 0xE1, 0x44,</div><div class='add'>+0xB4, 0x03, 0xD0, 0x36, 0x40, 0x38, 0x00, 0xED, 0x00, 0x85, 0x03, 0xD4, 0x06,</div><div class='add'>+0x60, 0x7D, 0x02, 0xE1, 0x02, 0xE6, 0x02, 0x10, 0x06, 0x40, 0xBB, 0x20, 0xE1,</div><div class='add'>+0x61, 0xE5, 0x8F, 0x50, 0x06, 0x40, 0x13, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x14, 0x18, 0x78, 0x00, 0xEF, 0x01, 0xBC, 0x05, 0xD0, 0x1E, 0xC0, 0xF9,</div><div class='add'>+0x00, 0x2B, 0x01, 0xBC, 0x04, 0xB1, 0x1E, 0xC0, 0x73, 0x00, 0xE5, 0x35, 0xB4,</div><div class='add'>+0x2F, 0xB0, 0x1F, 0xD0, 0x78, 0x00, 0xCF, 0x41, 0x8C, 0x05, 0xB4, 0x16, 0xC0,</div><div class='add'>+0x79, 0x03, 0xF3, 0x01, 0xBD, 0x04, 0x70, 0x16, 0xC0, 0x7B, 0x40, 0x23, 0x01,</div><div class='add'>+0xAC, 0x07, 0x31, 0x1E, 0xC4, 0x53, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x10, 0xB8, 0x35, 0x00, 0xDF, 0x00, 0xFC, 0x01, 0xF0, 0x0D, 0xC0, 0x35, 0x00,</div><div class='add'>+0x1E, 0x00, 0x3C, 0x00, 0xF0, 0x0D, 0xC0, 0x37, 0x10, 0xDF, 0x4A, 0x7C, 0x1B,</div><div class='add'>+0xF0, 0x05, 0xC8, 0x07, 0x00, 0xDF, 0x00, 0x7C, 0x01, 0xF6, 0x05, 0xC6, 0xB5,</div><div class='add'>+0x01, 0x5E, 0x00, 0x1C, 0x00, 0x50, 0x05, 0xC0, 0x33, 0x00, 0x1F, 0x00, 0x5C,</div><div class='add'>+0x03, 0xB0, 0x09, 0xC8, 0x43, 0x60, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06,</div><div class='add'>+0x20, 0x5D, 0x00, 0xF3, 0x01, 0xFC, 0x27, 0xF8, 0x8F, 0xC0, 0x7B, 0x00, 0x3B,</div><div class='add'>+0x01, 0xFC, 0x04, 0x70, 0x1F, 0xC0, 0x5F, 0x00, 0xFF, 0x09, 0xFE, 0x27, 0xB0,</div><div class='add'>+0x1B, 0xC0, 0x76, 0x00, 0xFF, 0x01, 0x8C, 0x07, 0x30, 0x93, 0xC4, 0x7F, 0x00,</div><div class='add'>+0xB3, 0x01, 0xCC, 0x16, 0xF8, 0x97, 0xC0, 0x7B, 0x00, 0xFB, 0x41, 0xF8, 0x04,</div><div class='add'>+0x34, 0x9B, 0xC0, 0x18, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x00,</div><div class='add'>+0x19, 0x22, 0xE1, 0x40, 0xB4, 0x81, 0x78, 0x0E, 0x42, 0x3B, 0x00, 0x61, 0x00,</div><div class='add'>+0xB4, 0x00, 0xD0, 0x0E, 0x44, 0x1B, 0x21, 0xE6, 0x08, 0xF4, 0x23, 0x14, 0x0A,</div><div class='add'>+0x40, 0x78, 0x00, 0xBD, 0x00, 0x84, 0x23, 0xF0, 0x00, 0x40, 0x3B, 0x01, 0xA1,</div><div class='add'>+0x24, 0xAC, 0x12, 0xB0, 0x06, 0xC0, 0x3B, 0x06, 0xE1, 0x08, 0xB4, 0x20, 0xB0,</div><div class='add'>+0x03, 0x48, 0x55, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x39,</div><div class='add'>+0x04, 0xE1, 0x00, 0xB4, 0x03, 0x58, 0x8E, 0x40, 0x7F, 0x04, 0x21, 0x00, 0xB4,</div><div class='add'>+0x00, 0x50, 0x0E, 0x40, 0x19, 0x08, 0xEC, 0x42, 0xB4, 0x03, 0x10, 0x02, 0x40,</div><div class='add'>+0x38, 0x00, 0x6D, 0x00, 0xA4, 0x01, 0x10, 0x02, 0x60, 0x39, 0x24, 0xE1, 0x80,</div><div class='add'>+0xB4, 0x72, 0x1C, 0x06, 0x46, 0x3B, 0x00, 0xED, 0x00, 0xB4, 0x40, 0x50, 0x0A,</div><div class='add'>+0x42, 0x20, 0x02, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x28, 0x25, 0x00,</div><div class='add'>+0xC1, 0x20, 0x34, 0x08, 0x58, 0x0C, 0x40, 0xF3, 0x00, 0x49, 0x11, 0x34, 0x20,</div><div class='add'>+0xD8, 0x0C, 0x40, 0x33, 0x00, 0xCD, 0x01, 0x34, 0x03, 0x90, 0x01, 0x40, 0x02,</div><div class='add'>+0x80, 0x0D, 0x00, 0x24, 0x01, 0x90, 0x00, 0x40, 0xF3, 0x00, 0x41, 0x01, 0x34,</div><div class='add'>+0x06, 0x90, 0x04, 0x40, 0xF1, 0x00, 0xC1, 0x00, 0x36, 0x04, 0x18, 0x39, 0x40,</div><div class='add'>+0x09, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0xA0, 0xA5, 0x40, 0xD3,</div><div class='add'>+0x00, 0x7C, 0x6E, 0x70, 0x0D, 0x40, 0xF7, 0x40, 0x0B, 0x07, 0x7C, 0x00, 0x70,</div><div class='add'>+0x0D, 0xC2, 0x15, 0x00, 0xFF, 0x01, 0xF4, 0x4F, 0x30, 0x0D, 0xC0, 0x24, 0x00,</div><div class='add'>+0x1F, 0x00, 0x24, 0x02, 0x30, 0x01, 0xC0, 0xF9, 0x00, 0x53, 0xA3, 0x3C, 0x02,</div><div class='add'>+0x30, 0x04, 0x40, 0x77, 0x08, 0xDF, 0x25, 0x7C, 0x07, 0x50, 0x61, 0xC0, 0x54,</div><div class='add'>+0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x08, 0x27, 0x11, 0xDF, 0x00,</div><div class='add'>+0x7C, 0x0A, 0x70, 0x0D, 0xC0, 0x37, 0x00, 0x57, 0x02, 0x7C, 0x00, 0xF0, 0x0D,</div><div class='add'>+0xC0, 0x17, 0x00, 0xD7, 0x08, 0x7C, 0x43, 0x70, 0x05, 0xD8, 0x25, 0x10, 0x9F,</div><div class='add'>+0x00, 0x5C, 0x02, 0xF0, 0x21, 0xC0, 0x37, 0x04, 0xDF, 0x08, 0x68, 0x0A, 0xF9,</div><div class='add'>+0x25, 0x80, 0x37, 0x01, 0x0E, 0x10, 0x7C, 0x0B, 0xF2, 0x21, 0xC0, 0xB7, 0x20,</div><div class='add'>+0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x08, 0x07, 0x00, 0xF3, 0x00, 0xFC,</div><div class='add'>+0x00, 0xF0, 0x0E, 0xC0, 0x3E, 0x04, 0x33, 0x00, 0xEC, 0x00, 0xF0, 0x0F, 0xC0,</div><div class='add'>+0x7F, 0x00, 0xFF, 0x00, 0xEC, 0x03, 0x70, 0x2B, 0xC0, 0x2B, 0x00, 0x3B, 0x20,</div><div class='add'>+0xFC, 0x00, 0xB0, 0x03, 0xC0, 0x3F, 0x00, 0x23, 0x11, 0xCC, 0x42, 0x76, 0x87,</div><div class='add'>+0xC0, 0x3C, 0x00, 0x3F, 0x02, 0xC4, 0x07, 0xF0, 0x03, 0xC1, 0x04, 0x20, 0x0C,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x81, 0x20, 0x66, 0x08, 0xD1, 0x40, 0x76, 0x04,</div><div class='add'>+0xD0, 0x0D, 0x48, 0x35, 0x00, 0x11, 0x00, 0x44, 0x14, 0xD0, 0x0D, 0xC0, 0x27,</div><div class='add'>+0x80, 0xDD, 0x80, 0x7C, 0x03, 0xD0, 0x11, 0x40, 0xC4, 0x44, 0x91, 0x21, 0x7C,</div><div class='add'>+0x07, 0xB0, 0x51, 0x40, 0x37, 0x00, 0x11, 0x0B, 0x44, 0x07, 0x10, 0x0D, 0x48,</div><div class='add'>+0xF0, 0x00, 0x11, 0x03, 0x44, 0x00, 0xD2, 0x31, 0x40, 0x04, 0x00, 0x08, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x01, 0xA2, 0x46, 0x04, 0xD1, 0x00, 0x74, 0x0E, 0xD0,</div><div class='add'>+0x0D, 0x40, 0x30, 0x00, 0x11, 0x30, 0x64, 0x04, 0xD0, 0x0D, 0x48, 0x17, 0x01,</div><div class='add'>+0xDD, 0x00, 0x74, 0x03, 0xD2, 0x0D, 0x40, 0x44, 0x00, 0x91, 0x83, 0x76, 0x46,</div><div class='add'>+0x90, 0x11, 0x40, 0x37, 0x00, 0x11, 0x02, 0x46, 0x0E, 0x50, 0x05, 0x40, 0x64,</div><div class='add'>+0x44, 0xD1, 0x20, 0x54, 0x18, 0xD2, 0x39, 0x40, 0x04, 0x08, 0x0A, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0xC1, 0x00, 0x34, 0x02, 0xD0, 0x0C,</div><div class='add'>+0x40, 0x31, 0x00, 0x51, 0x00, 0x04, 0x00, 0xD0, 0x0C, 0x40, 0x11, 0x00, 0xCD,</div><div class='add'>+0x00, 0x34, 0x03, 0xD0, 0x0C, 0x70, 0x00, 0x01, 0x81, 0x00, 0x34, 0x02, 0x99,</div><div class='add'>+0x00, 0x40, 0x37, 0x00, 0x81, 0x20, 0x04, 0x02, 0x10, 0x04, 0x40, 0x24, 0x00,</div><div class='add'>+0x01, 0x00, 0x14, 0x03, 0xD0, 0x00, 0x52, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x18, 0x06, 0x00, 0xD3, 0x00, 0x74, 0x02, 0xF0, 0x0D, 0x40,</div><div class='add'>+0x3C, 0x80, 0x13, 0x00, 0x6C, 0x00, 0xF0, 0x0D, 0x60, 0x17, 0x00, 0xFD, 0x00,</div><div class='add'>+0xEC, 0x03, 0xF8, 0x00, 0xC0, 0x06, 0x00, 0x13, 0x00, 0x7C, 0x00, 0xB0, 0x81,</div><div class='add'>+0xC0, 0x3B, 0x40, 0x03, 0x00, 0x4C, 0x02, 0x70, 0x01, 0xC0, 0x24, 0x10, 0xD3,</div><div class='add'>+0x00, 0x1C, 0x00, 0xF0, 0x09, 0xC4, 0x04, 0x64, 0x08, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x05, 0xB8, 0x2F, 0x00, 0xFF, 0x00, 0xFC, 0x02, 0xF0, 0x0F, 0xC2, 0x3D,</div><div class='add'>+0x40, 0x7F, 0x00, 0xFC, 0x00, 0xF0, 0x0F, 0xC0, 0x2F, 0x00, 0xFF, 0x00, 0xDC,</div><div class='add'>+0x03, 0xF0, 0x03, 0x00, 0x0F, 0x2A, 0x3F, 0x00, 0xDC, 0x03, 0x70, 0x03, 0xC0,</div><div class='add'>+0x3F, 0x00, 0x3F, 0x00, 0xBC, 0x03, 0xF0, 0x07, 0x40, 0x0F, 0x40, 0x37, 0x00,</div><div class='add'>+0xEC, 0x00, 0xF0, 0x0B, 0xC8, 0x17, 0x60, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x03, 0xA8, 0x7F, 0x00, 0x3E, 0x00, 0xFC, 0x04, 0x30, 0x1F, 0xC0, 0x2C, 0x00,</div><div class='add'>+0xBF, 0x24, 0xCC, 0x03, 0xF0, 0x43, 0xC1, 0x3D, 0x21, 0x3F, 0xA0, 0xDC, 0x13,</div><div class='add'>+0x30, 0x9E, 0xC0, 0x3F, 0x00, 0xFF, 0x00, 0x98, 0x17, 0xF0, 0x1F, 0xC0, 0x4C,</div><div class='add'>+0x00, 0xFF, 0x03, 0xFC, 0x07, 0xF0, 0x4F, 0xC0, 0x7E, 0x02, 0xFF, 0x00, 0xCC,</div><div class='add'>+0x03, 0x30, 0x83, 0xC0, 0x0C, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,</div><div class='add'>+0x10, 0x36, 0x05, 0x1D, 0x02, 0x44, 0x00, 0x10, 0x0D, 0x50, 0x24, 0x08, 0x9D,</div><div class='add'>+0x08, 0xC4, 0x2B, 0x10, 0x39, 0x44, 0x7C, 0x02, 0x9D, 0x01, 0xC4, 0x23, 0x11,</div><div class='add'>+0x1D, 0x40, 0xFF, 0x01, 0x5D, 0x01, 0xC4, 0x0F, 0xD0, 0x0D, 0x40, 0x44, 0x00,</div><div class='add'>+0xDD, 0x00, 0x5C, 0x07, 0xD0, 0xBF, 0x40, 0x34, 0x01, 0xF7, 0x03, 0xC4, 0x2F,</div><div class='add'>+0x10, 0x09, 0x40, 0x0D, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0xA0,</div><div class='add'>+0x33, 0x00, 0x0D, 0x03, 0x54, 0x00, 0x90, 0x0C, 0x40, 0x21, 0x00, 0x8D, 0x00,</div><div class='add'>+0x04, 0x83, 0x10, 0x01, 0x60, 0x30, 0x08, 0x05, 0x00, 0x24, 0x03, 0x10, 0x4C,</div><div class='add'>+0x40, 0x32, 0x06, 0x89, 0x00, 0x05, 0x23, 0xD2, 0x0C, 0x48, 0x00, 0x20, 0xCD,</div><div class='add'>+0x04, 0x36, 0x03, 0xD0, 0x0C, 0x40, 0x30, 0x01, 0xCD, 0x02, 0x05, 0x03, 0x14,</div><div class='add'>+0x40, 0x44, 0x4C, 0x80, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xA0, 0x35,</div><div class='add'>+0x00, 0x1D, 0x01, 0x44, 0x46, 0x94, 0x0D, 0x40, 0xE5, 0x00, 0x9D, 0x20, 0x44,</div><div class='add'>+0x03, 0x10, 0x19, 0x40, 0x34, 0x00, 0x1D, 0x01, 0x64, 0x03, 0x11, 0x0D, 0x40,</div><div class='add'>+0x37, 0x20, 0xDC, 0x10, 0x44, 0x03, 0xD0, 0x8C, 0x40, 0x44, 0x00, 0xDC, 0x00,</div><div class='add'>+0x54, 0x03, 0xD0, 0x0D, 0x40, 0x34, 0x00, 0xD5, 0x00, 0x44, 0x03, 0x10, 0x49,</div><div class='add'>+0x40, 0x0D, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA8, 0x37, 0x00,</div><div class='add'>+0x1F, 0x01, 0x7C, 0x0C, 0xB0, 0x0D, 0xC0, 0x65, 0x00, 0x9F, 0x80, 0x0C, 0x03,</div><div class='add'>+0xB4, 0x35, 0xC0, 0x35, 0x00, 0x9F, 0x01, 0x6C, 0x03, 0x34, 0x0D, 0xC2, 0x36,</div><div class='add'>+0x20, 0xDB, 0x80, 0x5C, 0x03, 0xE0, 0x1D, 0x80, 0x44, 0x04, 0x9F, 0x08, 0x7C,</div><div class='add'>+0x07, 0xF0, 0x0D, 0xC0, 0x36, 0x00, 0xDD, 0x00, 0x4C, 0x03, 0x30, 0x1D, 0xC0,</div><div class='add'>+0x00, 0x20, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x80, 0x3D, 0x00, 0x2F,</div><div class='add'>+0x00, 0xFC, 0x00, 0x70, 0x0F, 0xC0, 0x2E, 0x00, 0x9F, 0x00, 0xFD, 0x03, 0xB0,</div><div class='add'>+0x0F, 0xC0, 0x3F, 0x00, 0xAF, 0x00, 0xDC, 0x03, 0xF0, 0x2F, 0xC6, 0x3F, 0x00,</div><div class='add'>+0x69, 0x08, 0xFC, 0x03, 0xF0, 0x1F, 0xD0, 0x0F, 0x00, 0xBF, 0x00, 0xFC, 0x27,</div><div class='add'>+0xF1, 0x0E, 0xC4, 0x3F, 0x01, 0xDF, 0x00, 0xBC, 0x03, 0xF0, 0x17, 0xC8, 0x1F,</div><div class='add'>+0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x08, 0x35, 0x04, 0x1F, 0x21,</div><div class='add'>+0x7C, 0x02, 0xF0, 0x0D, 0xC0, 0xA7, 0x00, 0xD3, 0x00, 0x4C, 0xC3, 0x30, 0x25,</div><div class='add'>+0xC0, 0x34, 0x00, 0x17, 0x00, 0x7C, 0x13, 0xF0, 0x0D, 0xD0, 0x34, 0x00, 0x9F,</div><div class='add'>+0x21, 0x6C, 0x43, 0x30, 0x0D, 0xD1, 0x44, 0x00, 0xD3, 0x00, 0x7C, 0x03, 0xF0,</div><div class='add'>+0x0D, 0xC2, 0x36, 0x00, 0xCF, 0x04, 0x4C, 0x13, 0xF0, 0x0D, 0xC0, 0x8B, 0x20,</div><div class='add'>+0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0xA0, 0xB4, 0x00, 0x1D, 0x00, 0x34,</div><div class='add'>+0x12, 0xD0, 0xBD, 0x41, 0x27, 0x04, 0xD1, 0x00, 0xD4, 0x13, 0x10, 0x0C, 0x45,</div><div class='add'>+0x3C, 0x00, 0x1D, 0x00, 0xE4, 0x03, 0xD2, 0x0D, 0x40, 0x3C, 0x00, 0xDD, 0x00,</div><div class='add'>+0xC4, 0x07, 0x10, 0x0D, 0x40, 0x04, 0x00, 0xD1, 0x20, 0x74, 0x03, 0xD0, 0x1F,</div><div class='add'>+0x40, 0x34, 0x00, 0xFD, 0x82, 0xC4, 0x0B, 0xD0, 0x05, 0x40, 0x6F, 0x00, 0x02,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x20, 0x30, 0x00, 0x0D, 0x20, 0x34, 0x00,</div><div class='add'>+0xD0, 0x1D, 0x40, 0x33, 0x00, 0x94, 0x60, 0x24, 0x03, 0x10, 0x04, 0x40, 0x32,</div><div class='add'>+0x00, 0x0D, 0x00, 0x74, 0x03, 0xD0, 0x0C, 0x40, 0x32, 0x00, 0xCD, 0x00, 0x24,</div><div class='add'>+0x23, 0x50, 0x2C, 0x40, 0x03, 0x84, 0xC5, 0x12, 0x34, 0x03, 0xD0, 0x9C, 0x40,</div><div class='add'>+0x30, 0x00, 0xC9, 0x49, 0x24, 0x27, 0xD0, 0x05, 0x40, 0x1F, 0x00, 0x0A, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x78, 0x00, 0x2D, 0x21, 0xB4, 0x07, 0xD0,</div><div class='add'>+0x9E, 0x40, 0x6B, 0x02, 0xA4, 0x01, 0xB4, 0x07, 0x10, 0x1F, 0x40, 0x7A, 0x00,</div><div class='add'>+0xED, 0x81, 0xA4, 0x07, 0xD0, 0x1F, 0x60, 0x7A, 0x00, 0xC9, 0x03, 0x84, 0x07,</div><div class='add'>+0x50, 0x1E, 0x40, 0x4B, 0x50, 0xE5, 0x89, 0xB4, 0x17, 0xD1, 0x1C, 0x40, 0x78,</div><div class='add'>+0x00, 0xED, 0x81, 0xA4, 0x07, 0xD0, 0x9E, 0x40, 0x37, 0x00, 0x02, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x12, 0x18, 0x30, 0x00, 0x0F, 0x00, 0x3C, 0x00, 0xF0, 0x8C,</div><div class='add'>+0xC0, 0x37, 0x08, 0x87, 0x00, 0x6C, 0x13, 0x30, 0x04, 0xC0, 0x32, 0x00, 0x4F,</div><div class='add'>+0x02, 0x3C, 0x23, 0xF0, 0x0C, 0xC0, 0x32, 0x00, 0xCF, 0x00, 0x2C, 0x03, 0x70,</div><div class='add'>+0x0D, 0xC0, 0x03, 0x00, 0xC7, 0x08, 0x3C, 0x03, 0xF0, 0x0C, 0xC0, 0x30, 0x00,</div><div class='add'>+0xCB, 0x00, 0x2C, 0x03, 0xF0, 0x84, 0xC0, 0x4B, 0x40, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x02, 0x38, 0x3D, 0x00, 0x3F, 0x00, 0xFC, 0x23, 0xF0, 0x8F, 0xE8,</div><div class='add'>+0x3F, 0x40, 0xBB, 0x00, 0xDC, 0x03, 0xF0, 0x0E, 0xC0, 0x3D, 0x02, 0xFF, 0x00,</div><div class='add'>+0xEC, 0x03, 0xF0, 0x0F, 0xC0, 0x3D, 0x24, 0xFF, 0x00, 0xFC, 0x23, 0xB2, 0x0F,</div><div class='add'>+0xC0, 0x08, 0x02, 0xFB, 0x28, 0xFC, 0x93, 0xF0, 0x0F, 0xD0, 0x3D, 0x00, 0xFF,</div><div class='add'>+0x00, 0xDD, 0x03, 0xF2, 0x8F, 0xC0, 0x0B, 0x60, 0x06, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x10, 0xB0, 0x37, 0x00, 0x1F, 0x00, 0x7C, 0x02, 0xF1, 0x1D, 0xC0, 0x34,</div><div class='add'>+0x00, 0x93, 0x00, 0x4C, 0x03, 0x70, 0x05, 0xC4, 0x77, 0x01, 0x9B, 0x00, 0x7C,</div><div class='add'>+0x4B, 0xE0, 0x1D, 0xC2, 0x35, 0x05, 0xCD, 0x01, 0x4C, 0x1B, 0xF0, 0x0D, 0xC0,</div><div class='add'>+0x07, 0x00, 0xDF, 0x01, 0x1C, 0x07, 0x70, 0xCD, 0xC0, 0x37, 0x20, 0xDF, 0x0A,</div><div class='add'>+0x3C, 0x4F, 0x30, 0x09, 0xC0, 0x54, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x12, 0x80, 0x39, 0x00, 0x2D, 0x00, 0xB4, 0x03, 0x70, 0x0E, 0x40, 0x1C, 0x00,</div><div class='add'>+0xA1, 0x00, 0xAC, 0x53, 0x10, 0x0E, 0x40, 0xBB, 0x04, 0xE1, 0x00, 0xB4, 0x03,</div><div class='add'>+0xD0, 0x0E, 0x40, 0x3C, 0x01, 0xE1, 0x00, 0x84, 0x53, 0xD0, 0x0E, 0x40, 0x0B,</div><div class='add'>+0x00, 0xFD, 0x00, 0x8C, 0x03, 0x10, 0x8E, 0x40, 0x3B, 0x00, 0xE7, 0x10, 0xB4,</div><div class='add'>+0x13, 0xB0, 0x00, 0xC0, 0x4E, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04,</div><div class='add'>+0x00, 0x79, 0x00, 0x6D, 0x01, 0x94, 0x06, 0xD0, 0x1E, 0x40, 0x78, 0x0C, 0xC1,</div><div class='add'>+0x01, 0x04, 0x27, 0x50, 0x1E, 0x40, 0x73, 0x01, 0xE1, 0x01, 0xB4, 0x27, 0x50,</div><div class='add'>+0x3E, 0x40, 0x7B, 0x00, 0xE5, 0x01, 0x85, 0x27, 0xD0, 0x1E, 0x43, 0x4B, 0x00,</div><div class='add'>+0xED, 0x01, 0x84, 0x07, 0x10, 0x5E, 0x40, 0x6B, 0x00, 0xE5, 0x25, 0xB6, 0x37,</div><div class='add'>+0x10, 0x1A, 0x40, 0x04, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16, 0x28,</div><div class='add'>+0x33, 0x00, 0xCD, 0x01, 0x34, 0x4B, 0x50, 0x0C, 0x60, 0x70, 0x01, 0xC1, 0x01,</div><div class='add'>+0x24, 0x03, 0x10, 0x0C, 0x41, 0x33, 0x80, 0xC1, 0x10, 0x34, 0x03, 0xD0, 0x18,</div><div class='add'>+0x40, 0x32, 0x00, 0xC1, 0x00, 0x04, 0x03, 0xD0, 0x09, 0x40, 0xF3, 0x00, 0xCD,</div><div class='add'>+0x01, 0x04, 0x06, 0x14, 0x0C, 0x40, 0x37, 0x10, 0xC5, 0x80, 0x36, 0x03, 0x90,</div><div class='add'>+0x41, 0x40, 0x4A, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x17, 0xA0, 0x15,</div><div class='add'>+0x00, 0x7F, 0x05, 0xFC, 0x01, 0xF0, 0x05, 0xD0, 0x1C, 0x00, 0x53, 0x41, 0x4C,</div><div class='add'>+0x01, 0x70, 0x27, 0xC0, 0x17, 0x40, 0x73, 0xC2, 0x7C, 0x01, 0xF0, 0x05, 0xC0,</div><div class='add'>+0x17, 0x10, 0x7F, 0x00, 0x4C, 0x01, 0xF0, 0x15, 0xC0, 0x5F, 0x01, 0x5F, 0x01,</div><div class='add'>+0x5D, 0x15, 0x70, 0x04, 0xC2, 0x57, 0x01, 0x47, 0x00, 0x7C, 0x01, 0x30, 0x17,</div><div class='add'>+0xC1, 0x5C, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x08, 0x85, 0x00,</div><div class='add'>+0x1F, 0x01, 0x7C, 0x00, 0xF0, 0x01, 0xC0, 0x07, 0x40, 0x1F, 0x08, 0x3C, 0x00,</div><div class='add'>+0xF0, 0x01, 0xC0, 0x07, 0x00, 0x17, 0x00, 0x7C, 0x80, 0xF0, 0x01, 0xC0, 0x05,</div><div class='add'>+0x00, 0x1F, 0x00, 0x7E, 0x00, 0xF0, 0x01, 0xC0, 0x07, 0x01, 0x1F, 0x08, 0x5C,</div><div class='add'>+0x00, 0xF2, 0x01, 0xC0, 0x07, 0x00, 0x1F, 0x00, 0x7C, 0x08, 0xF0, 0x01, 0xC8,</div><div class='add'>+0x4B, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x08, 0x25, 0x00, 0x9F,</div><div class='add'>+0x05, 0x4C, 0x02, 0x36, 0x09, 0xC0, 0xA3, 0x40, 0x83, 0x05, 0x4C, 0x06, 0xB0,</div><div class='add'>+0x08, 0xC0, 0x26, 0x00, 0x9F, 0x00, 0x74, 0x02, 0xF0, 0x09, 0xC0, 0x27, 0x00,</div><div class='add'>+0x9B, 0x00, 0x7C, 0x06, 0xF0, 0x19, 0xC0, 0x24, 0x20, 0x9F, 0x00, 0x7C, 0x26,</div><div class='add'>+0xF0, 0x09, 0xC0, 0x24, 0x00, 0x9C, 0x00, 0x48, 0x02, 0xF0, 0x09, 0xC8, 0x40,</div><div class='add'>+0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x20, 0x64, 0x00, 0x9D, 0x00,</div><div class='add'>+0x44, 0x02, 0x10, 0x19, 0x40, 0x27, 0x40, 0x91, 0x01, 0x7C, 0x2A, 0x10, 0x09,</div><div class='add'>+0x40, 0x24, 0x00, 0x9D, 0x00, 0x74, 0x02, 0xD0, 0x09, 0xE0, 0x27, 0x00, 0x91,</div><div class='add'>+0x10, 0x74, 0x1E, 0xD1, 0x99, 0x40, 0xA4, 0x00, 0x9D, 0x42, 0x5C, 0x02, 0xD0,</div><div class='add'>+0x09, 0xC0, 0x26, 0x00, 0x95, 0x80, 0x54, 0x1A, 0xD0, 0x09, 0xC0, 0x06, 0x00,</div><div class='add'>+0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0xA0, 0x24, 0x02, 0x8D, 0x00, 0x04,</div><div class='add'>+0x02, 0x18, 0x49, 0x40, 0x27, 0x40, 0x91, 0x00, 0x44, 0x02, 0x90, 0x1D, 0x40,</div><div class='add'>+0x26, 0x00, 0x95, 0x00, 0x74, 0x22, 0xD0, 0x09, 0x60, 0x23, 0x00, 0x99, 0x01,</div><div class='add'>+0x74, 0x12, 0xD0, 0x29, 0x40, 0x25, 0x00, 0x9D, 0x04, 0x74, 0x02, 0x50, 0x89,</div><div class='add'>+0x40, 0x24, 0x00, 0x95, 0x18, 0x54, 0x22, 0xD0, 0x09, 0x40, 0x60, 0x00, 0x02,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x20, 0x20, 0x00, 0x8D, 0x04, 0x04, 0x02,</div><div class='add'>+0x10, 0x0C, 0x40, 0x23, 0x01, 0x81, 0x04, 0x14, 0x13, 0x10, 0x48, 0x40, 0x20,</div><div class='add'>+0x01, 0x8D, 0x04, 0x36, 0x16, 0xD1, 0x08, 0x42, 0x21, 0x01, 0x81, 0x04, 0x34,</div><div class='add'>+0x12, 0xD8, 0x08, 0x40, 0x61, 0x80, 0x8D, 0x01, 0x14, 0x02, 0xD0, 0x48, 0x40,</div><div class='add'>+0x22, 0x30, 0x85, 0x44, 0x16, 0x12, 0xD0, 0x48, 0x40, 0x42, 0x80, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x1D, 0xA0, 0x96, 0x02, 0x1F, 0x0A, 0x4D, 0x28, 0x30,</div><div class='add'>+0xA0, 0xC0, 0x87, 0x02, 0x13, 0x0A, 0x44, 0x28, 0xB0, 0x01, 0xC0, 0x06, 0x00,</div><div class='add'>+0x17, 0x10, 0x7C, 0x00, 0xF0, 0xA0, 0x40, 0x87, 0x02, 0x1B, 0x00, 0x74, 0x00,</div><div class='add'>+0xF0, 0xA1, 0xC8, 0x05, 0x00, 0x1F, 0x0A, 0x74, 0x00, 0xF0, 0x01, 0xC0, 0x84,</div><div class='add'>+0x00, 0x17, 0x00, 0x5C, 0x00, 0xF2, 0x21, 0xC0, 0x74, 0xC0, 0x0A, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x1D, 0x88, 0x27, 0x00, 0xFF, 0x08, 0xFC, 0x02, 0xF0, 0x09,</div><div class='add'>+0xC0, 0x2F, 0x02, 0xBF, 0x48, 0x7C, 0x22, 0xF0, 0x8B, 0xC4, 0x27, 0x02, 0xBF,</div><div class='add'>+0x00, 0x7C, 0x62, 0xF0, 0x0B, 0xC0, 0x27, 0x02, 0xBF, 0x08, 0x7C, 0x22, 0xF0,</div><div class='add'>+0x0B, 0xD8, 0x2E, 0x00, 0xBF, 0x40, 0xDC, 0x02, 0xF0, 0x89, 0xC2, 0x2F, 0x04,</div><div class='add'>+0x93, 0x08, 0x7C, 0x22, 0xF2, 0x8B, 0xC1, 0x67, 0x60, 0x0E, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x1C, 0xA0, 0x2D, 0x00, 0xBF, 0x0C, 0xCC, 0x02, 0x30, 0x0B, 0xC0,</div><div class='add'>+0x2C, 0x02, 0xB3, 0x00, 0xFC, 0x52, 0x34, 0x4F, 0x80, 0x27, 0x00, 0x9F, 0x00,</div><div class='add'>+0xF8, 0x22, 0xF0, 0x09, 0xC0, 0x27, 0x25, 0xBF, 0x04, 0xD4, 0x02, 0x70, 0x0A,</div><div class='add'>+0xC0, 0x2C, 0x00, 0xBF, 0x00, 0xFC, 0x02, 0xF0, 0x4B, 0xC0, 0x27, 0x00, 0xA3,</div><div class='add'>+0x80, 0xBC, 0x02, 0xF0, 0x29, 0xC0, 0x61, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x18, 0x00, 0x07, 0x01, 0x0D, 0x2C, 0x44, 0x41, 0x10, 0x01, 0x41, 0x14,</div><div class='add'>+0x02, 0x01, 0x14, 0x74, 0x10, 0x13, 0x81, 0x40, 0x87, 0x00, 0x1D, 0x00, 0x74,</div><div class='add'>+0x20, 0xD0, 0x41, 0x41, 0x06, 0x01, 0x1D, 0x08, 0x44, 0x08, 0x10, 0x01, 0x41,</div><div class='add'>+0x04, 0x00, 0x1D, 0x14, 0x74, 0x00, 0xC0, 0x81, 0x44, 0x47, 0x05, 0x1B, 0x00,</div><div class='add'>+0x74, 0x20, 0xD0, 0x11, 0x40, 0x71, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x12, 0x20, 0x21, 0x05, 0x8D, 0x04, 0x05, 0x12, 0x10, 0x08, 0x40, 0x20, 0x40,</div><div class='add'>+0x81, 0x04, 0x34, 0x52, 0x10, 0x08, 0x48, 0x22, 0x02, 0x88, 0x08, 0x34, 0x02,</div><div class='add'>+0xD0, 0x48, 0x40, 0x21, 0x05, 0x8D, 0x01, 0x14, 0x22, 0xD0, 0x08, 0x40, 0x61,</div><div class='add'>+0x00, 0x8D, 0x04, 0x24, 0x02, 0xD0, 0x08, 0x40, 0x23, 0x00, 0x81, 0x08, 0x34,</div><div class='add'>+0x02, 0xD0, 0x48, 0x40, 0x4B, 0x88, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18,</div><div class='add'>+0x28, 0x25, 0x00, 0x9D, 0x00, 0x04, 0x02, 0x10, 0x09, 0x60, 0x24, 0x01, 0xD1,</div><div class='add'>+0x00, 0x34, 0x03, 0x10, 0x09, 0x40, 0x27, 0x00, 0x9D, 0x0A, 0x74, 0x02, 0xD0,</div><div class='add'>+0x19, 0x40, 0x24, 0x00, 0x9D, 0x08, 0x44, 0x02, 0x90, 0x08, 0x50, 0x25, 0x01,</div><div class='add'>+0x9D, 0x01, 0x74, 0x06, 0xD0, 0x09, 0x40, 0x67, 0x00, 0x98, 0x00, 0x74, 0x02,</div><div class='add'>+0xD0, 0x09, 0x40, 0x63, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x20,</div><div class='add'>+0x25, 0x00, 0x9F, 0x02, 0x4C, 0x02, 0x30, 0x09, 0xD0, 0xE4, 0x08, 0x93, 0x01,</div><div class='add'>+0x7C, 0x02, 0x34, 0x69, 0xC8, 0x26, 0x00, 0x9B, 0x03, 0x7C, 0x02, 0xF0, 0x09,</div><div class='add'>+0xCC, 0x27, 0x00, 0x9F, 0x01, 0x5C, 0x02, 0xF0, 0x19, 0xC0, 0x25, 0x00, 0x9E,</div><div class='add'>+0x00, 0x74, 0x02, 0xF0, 0x09, 0xC0, 0x27, 0x00, 0x90, 0x00, 0x7C, 0x02, 0xF0,</div><div class='add'>+0x09, 0xC0, 0x17, 0xA0, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16, 0x08, 0x25,</div><div class='add'>+0x00, 0x9F, 0x09, 0x7C, 0x02, 0xF4, 0x09, 0xC0, 0x67, 0x00, 0x9F, 0x04, 0x7C,</div><div class='add'>+0x02, 0x70, 0x09, 0xC0, 0x27, 0x00, 0x9F, 0x01, 0x7C, 0x82, 0xF0, 0x09, 0xC8,</div><div class='add'>+0x27, 0x00, 0x8F, 0x00, 0x7C, 0x42, 0x70, 0x49, 0xC0, 0x26, 0x08, 0x9F, 0x00,</div><div class='add'>+0x7C, 0x02, 0xF0, 0x09, 0xC0, 0x27, 0x10, 0x9F, 0x00, 0x7C, 0x02, 0xF0, 0x08,</div><div class='add'>+0xC0, 0x59, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x08, 0x05, 0x01,</div><div class='add'>+0x1F, 0x00, 0x4C, 0x00, 0xB0, 0x01, 0xC0, 0x84, 0x40, 0x13, 0x10, 0x4C, 0x00,</div><div class='add'>+0x30, 0x21, 0xC0, 0x07, 0x20, 0x1F, 0x00, 0x7C, 0x80, 0xF0, 0x01, 0xE0, 0x07,</div><div class='add'>+0x00, 0x1F, 0x00, 0x3C, 0x00, 0xB0, 0x11, 0xC0, 0x04, 0x00, 0x1F, 0x00, 0x7C,</div><div class='add'>+0x00, 0xF0, 0x11, 0xC0, 0x07, 0x00, 0x17, 0x00, 0x4C, 0x00, 0x30, 0x01, 0xC0,</div><div class='add'>+0x51, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x5C, 0x00, 0x5D,</div><div class='add'>+0x80, 0x44, 0x05, 0x30, 0x07, 0x40, 0x54, 0x40, 0x71, 0x05, 0xC6, 0x29, 0x10,</div><div class='add'>+0x05, 0x40, 0x17, 0x00, 0x5D, 0x00, 0xF4, 0x09, 0xD0, 0x05, 0xC0, 0x17, 0x00,</div><div class='add'>+0x7D, 0x0A, 0xF4, 0x01, 0x70, 0x17, 0x40, 0x9C, 0x00, 0x7D, 0x10, 0x5C, 0x01,</div><div class='add'>+0xD0, 0x17, 0x40, 0x17, 0x00, 0x71, 0x07, 0xC4, 0x19, 0x50, 0x05, 0x48, 0x50,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xA0, 0x72, 0x02, 0xDD, 0x00,</div><div class='add'>+0x04, 0x03, 0x50, 0x15, 0x49, 0x76, 0x20, 0xC1, 0x02, 0x24, 0x0F, 0x10, 0x0C,</div><div class='add'>+0x40, 0x33, 0x00, 0xCD, 0x00, 0x34, 0x37, 0xD0, 0x0D, 0x40, 0x33, 0x00, 0xCD,</div><div class='add'>+0x0B, 0x34, 0x07, 0x50, 0x9C, 0x42, 0xA0, 0x04, 0xCD, 0x05, 0x34, 0x03, 0xD0,</div><div class='add'>+0x1C, 0x40, 0x37, 0x00, 0x05, 0x04, 0x04, 0x10, 0x10, 0x0C, 0x40, 0x51, 0x00,</div><div class='add'>+0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x80, 0x18, 0x00, 0xED, 0x00, 0x84,</div><div class='add'>+0x0A, 0x10, 0x2A, 0x40, 0x32, 0x24, 0xE1, 0x01, 0xA4, 0x0A, 0x10, 0x2E, 0x48,</div><div class='add'>+0x3B, 0x00, 0xED, 0x00, 0xB4, 0x83, 0xD0, 0x4E, 0x40, 0x39, 0x00, 0xAD, 0x00,</div><div class='add'>+0xB4, 0x09, 0x40, 0x0F, 0x40, 0x18, 0x00, 0xED, 0x00, 0xB4, 0x03, 0xD0, 0x0E,</div><div class='add'>+0x49, 0x3B, 0x00, 0x25, 0x00, 0x84, 0x04, 0x50, 0x0E, 0x48, 0x10, 0x00, 0x02,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x18, 0x69, 0x00, 0xEF, 0x01, 0xCC, 0x07,</div><div class='add'>+0x70, 0x1F, 0xD0, 0x7A, 0x00, 0xA3, 0x01, 0xE4, 0x07, 0x34, 0x1A, 0xC0, 0x7B,</div><div class='add'>+0x00, 0xED, 0x01, 0xBC, 0x05, 0xF0, 0x7E, 0x41, 0x7B, 0x05, 0xAF, 0x01, 0xB8,</div><div class='add'>+0x05, 0x70, 0x1E, 0xC0, 0x48, 0x00, 0xEF, 0x01, 0xBC, 0x06, 0xF0, 0x1E, 0xC0,</div><div class='add'>+0x7F, 0x00, 0xA5, 0x00, 0x8C, 0x06, 0x30, 0x1F, 0xC0, 0x51, 0x40, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x10, 0xB0, 0x0D, 0x00, 0x9F, 0x02, 0x7D, 0x1A, 0x74,</div><div class='add'>+0x6B, 0xC0, 0x35, 0x00, 0x9F, 0x00, 0x5D, 0x1A, 0xF0, 0x09, 0xC0, 0x37, 0x00,</div><div class='add'>+0xDF, 0x00, 0x7C, 0x01, 0xF0, 0x0D, 0xC0, 0x37, 0x00, 0x9F, 0x00, 0x3C, 0x81,</div><div class='add'>+0x70, 0x0D, 0xD0, 0x17, 0x08, 0xDF, 0x00, 0x5C, 0x82, 0xF0, 0x0D, 0xC0, 0x37,</div><div class='add'>+0x00, 0xDA, 0x00, 0x7C, 0x03, 0xF0, 0x0D, 0xC0, 0x43, 0x60, 0x06, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x06, 0x20, 0x4D, 0x00, 0xF7, 0x03, 0xCC, 0x1B, 0x70, 0x3F,</div><div class='add'>+0xC0, 0x7C, 0x00, 0x73, 0x01, 0xCD, 0x0F, 0x30, 0x1B, 0xC0, 0x7F, 0x00, 0xF3,</div><div class='add'>+0x01, 0xFC, 0x07, 0x30, 0x1F, 0xC0, 0x7F, 0x04, 0xB3, 0x01, 0xCC, 0x85, 0xF0,</div><div class='add'>+0x1F, 0xC0, 0x4C, 0x20, 0xFF, 0x01, 0xFC, 0x07, 0xF0, 0x17, 0xC0, 0x7F, 0x00,</div><div class='add'>+0x23, 0x01, 0xCC, 0x05, 0xF0, 0x1F, 0xC0, 0x0B, 0x00, 0x0E, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x15, 0x00, 0x0D, 0x00, 0xF1, 0x08, 0x84, 0xC3, 0x18, 0x0B, 0x40,</div><div class='add'>+0x28, 0x00, 0x71, 0x00, 0xC4, 0x22, 0x10, 0x0A, 0x40, 0x3B, 0x00, 0xE1, 0x00,</div><div class='add'>+0xB4, 0x23, 0x10, 0x0E, 0xC0, 0x39, 0x02, 0xE1, 0x02, 0x84, 0x00, 0x70, 0x07,</div><div class='add'>+0x40, 0x18, 0x20, 0xED, 0x80, 0xB4, 0x03, 0xD0, 0x02, 0x40, 0x3B, 0x00, 0x25,</div><div class='add'>+0x0A, 0xAC, 0x28, 0xD0, 0x0E, 0xC0, 0x55, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x09, 0x00, 0xED, 0x00, 0xC4, 0x23, 0x50, 0x0A, 0x50, 0x28,</div><div class='add'>+0x00, 0x25, 0x08, 0x84, 0x03, 0x10, 0x0A, 0x40, 0x33, 0x00, 0xE1, 0x00, 0x34,</div><div class='add'>+0x02, 0x10, 0x0E, 0x40, 0x33, 0x00, 0x41, 0x00, 0xA4, 0x01, 0xD0, 0x0E, 0x40,</div><div class='add'>+0x88, 0x04, 0xED, 0x00, 0xB4, 0x02, 0xD0, 0x02, 0x40, 0x3F, 0x00, 0xA1, 0x00,</div><div class='add'>+0x94, 0x03, 0xD0, 0x0E, 0x40, 0x01, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x02, 0x28, 0x01, 0x00, 0x89, 0x00, 0x44, 0x0B, 0x10, 0x08, 0x40, 0xE4, 0x01,</div><div class='add'>+0x05, 0x00, 0x44, 0x02, 0x10, 0x28, 0x40, 0x33, 0x00, 0xC1, 0x11, 0x34, 0x02,</div><div class='add'>+0x10, 0x0C, 0x68, 0x31, 0x00, 0x41, 0x52, 0x24, 0x00, 0x50, 0x0C, 0x40, 0x50,</div><div class='add'>+0x00, 0xDD, 0x00, 0x34, 0x02, 0xD0, 0x00, 0x40, 0x73, 0x02, 0x85, 0x00, 0x34,</div><div class='add'>+0x03, 0xD0, 0x0C, 0x40, 0x19, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15,</div><div class='add'>+0xA0, 0x25, 0x00, 0xDF, 0x00, 0x4D, 0x0B, 0x50, 0x05, 0xC0, 0x74, 0x40, 0x17,</div><div class='add'>+0x00, 0x44, 0x03, 0x34, 0x0C, 0xC0, 0x37, 0x00, 0xD3, 0x06, 0x7C, 0x02, 0x30,</div><div class='add'>+0x0F, 0xC0, 0x3F, 0x00, 0xD3, 0x02, 0x6C, 0x01, 0xF0, 0x1D, 0xC0, 0x44, 0x00,</div><div class='add'>+0xDF, 0x40, 0x7C, 0x02, 0xF0, 0x05, 0xC0, 0x3F, 0x00, 0x53, 0x00, 0x5C, 0x00,</div><div class='add'>+0xF0, 0x2F, 0xC0, 0x55, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x08,</div><div class='add'>+0x87, 0x00, 0xD7, 0x10, 0x7C, 0x02, 0xF0, 0x09, 0xC0, 0x37, 0x02, 0x1A, 0x02,</div><div class='add'>+0x7C, 0x02, 0xF1, 0x09, 0xC1, 0x37, 0x00, 0xDF, 0x00, 0x7C, 0x00, 0xF0, 0x1D,</div><div class='add'>+0xC0, 0x37, 0x20, 0x1F, 0x03, 0x5C, 0x01, 0x70, 0x8D, 0xC0, 0x07, 0x28, 0xDF,</div><div class='add'>+0x02, 0x7C, 0x06, 0xF0, 0x05, 0xCA, 0x37, 0x00, 0x9F, 0x02, 0x2C, 0x0A, 0xF0,</div><div class='add'>+0x0D, 0xC0, 0x05, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x08, 0x0F,</div><div class='add'>+0x00, 0xFF, 0x00, 0xCC, 0x43, 0x30, 0x0F, 0xC0, 0x74, 0x01, 0x23, 0x01, 0xC4,</div><div class='add'>+0x03, 0x30, 0x0B, 0xC0, 0x3C, 0x00, 0xFF, 0x00, 0xBC, 0x00, 0x30, 0x0F, 0xC0,</div><div class='add'>+0x3B, 0x00, 0xB3, 0x00, 0x8E, 0x00, 0x30, 0x0B, 0xC0, 0x0D, 0x00, 0x7B, 0x00,</div><div class='add'>+0xCC, 0x03, 0x30, 0x07, 0xC0, 0x3F, 0x10, 0x7F, 0x00, 0xCC, 0x0C, 0x30, 0x0F,</div><div class='add'>+0xC1, 0x03, 0x2A, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x81, 0x00, 0xC6, 0x24,</div><div class='add'>+0x8D, 0x00, 0x44, 0x02, 0x90, 0x19, 0xC0, 0x36, 0x40, 0x11, 0x03, 0x54, 0x0E,</div><div class='add'>+0x50, 0x09, 0x50, 0x34, 0x00, 0xDD, 0x00, 0x74, 0x4C, 0x10, 0x0D, 0x40, 0x37,</div><div class='add'>+0x00, 0x01, 0x00, 0x54, 0x0C, 0x51, 0x09, 0x40, 0xC0, 0x00, 0xDB, 0x03, 0x04,</div><div class='add'>+0x07, 0x10, 0x15, 0xC0, 0x35, 0x00, 0xCD, 0x08, 0x54, 0x06, 0x10, 0x0D, 0x40,</div><div class='add'>+0x07, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xA0, 0x46, 0x80, 0xDD,</div><div class='add'>+0x00, 0x44, 0x03, 0x90, 0x18, 0x40, 0x25, 0x00, 0x51, 0x88, 0x54, 0x07, 0x10,</div><div class='add'>+0x89, 0x40, 0x34, 0x00, 0xD5, 0x00, 0x74, 0x06, 0x10, 0x0D, 0x40, 0x37, 0x00,</div><div class='add'>+0x91, 0x00, 0x46, 0x45, 0x90, 0x1C, 0x40, 0x44, 0x44, 0xD9, 0x03, 0x44, 0x12,</div><div class='add'>+0x10, 0x11, 0x60, 0x37, 0x00, 0x5D, 0x00, 0x44, 0x01, 0x10, 0x0D, 0x40, 0x07,</div><div class='add'>+0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0xDD, 0x00,</div><div class='add'>+0x04, 0x03, 0x90, 0x08, 0x40, 0x22, 0x00, 0x41, 0x00, 0x14, 0x02, 0x14, 0x08,</div><div class='add'>+0x48, 0x30, 0x00, 0xCD, 0x00, 0x34, 0x00, 0x10, 0x0C, 0x40, 0x33, 0x20, 0x41,</div><div class='add'>+0x00, 0x16, 0x00, 0xD0, 0x04, 0x40, 0x00, 0x40, 0xC9, 0x80, 0x45, 0x02, 0x14,</div><div class='add'>+0x10, 0x60, 0x31, 0x00, 0x4D, 0x00, 0x14, 0x01, 0x10, 0x0C, 0x40, 0x43, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x06, 0x00, 0xFF, 0x00, 0xCD,</div><div class='add'>+0x03, 0x34, 0x0B, 0xC0, 0x25, 0x00, 0x13, 0x00, 0xDC, 0x02, 0x30, 0x09, 0xC0,</div><div class='add'>+0x34, 0x00, 0xD7, 0x00, 0x7C, 0x02, 0x11, 0x0F, 0xC0, 0x3F, 0x00, 0x53, 0x00,</div><div class='add'>+0x44, 0x00, 0xB0, 0x0D, 0xC8, 0x05, 0x40, 0x9B, 0x00, 0x4C, 0x03, 0x30, 0x01,</div><div class='add'>+0xC0, 0x37, 0x00, 0xDF, 0x00, 0x4C, 0x03, 0x30, 0x0D, 0xC0, 0x03, 0x40, 0x08,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0xB8, 0x0F, 0x00, 0xBF, 0x00, 0xBC, 0x03,</div><div class='add'>+0x70, 0x0B, 0xC0, 0x2F, 0x00, 0x3F, 0x00, 0xFE, 0x00, 0xF0, 0x0B, 0xC0, 0x3F,</div><div class='add'>+0x00, 0xFF, 0x00, 0xFC, 0x00, 0xF0, 0x0F, 0xC0, 0x3F, 0x00, 0x7F, 0x00, 0xFC,</div><div class='add'>+0x00, 0x70, 0x0F, 0xC0, 0x0F, 0x00, 0xBF, 0x00, 0xF4, 0x03, 0xF1, 0x03, 0xCA,</div><div class='add'>+0x39, 0x00, 0xFF, 0x00, 0xFC, 0x03, 0xF0, 0x0F, 0xC0, 0x17, 0x60, 0x0E, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x03, 0xA0, 0x2F, 0x00, 0xBF, 0x00, 0xDC, 0x53, 0xF0,</div><div class='add'>+0x03, 0xC0, 0x0F, 0x00, 0xAF, 0x01, 0xFC, 0x87, 0xF0, 0x1F, 0xD0, 0x0C, 0x00,</div><div class='add'>+0xFF, 0x01, 0xCC, 0x03, 0xF0, 0x4F, 0xC0, 0x0D, 0x02, 0xB3, 0x01, 0xEC, 0x07,</div><div class='add'>+0xF0, 0x03, 0xC0, 0x0F, 0x08, 0xEF, 0x01, 0xBC, 0x05, 0xB4, 0x1A, 0xC0, 0x7B,</div><div class='add'>+0x00, 0x33, 0x04, 0xBC, 0x02, 0x20, 0x0B, 0xC8, 0x0C, 0x08, 0x0E, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x01, 0x00, 0x27, 0x00, 0x1D, 0x00, 0xF4, 0x0B, 0xD0, 0x11,</div><div class='add'>+0x40, 0x47, 0x00, 0xDD, 0x01, 0x74, 0x07, 0xD0, 0x0D, 0x40, 0x20, 0x01, 0xCC,</div><div class='add'>+0x10, 0xC4, 0x2B, 0xD0, 0x0D, 0x40, 0x27, 0x00, 0xD1, 0x01, 0x44, 0x03, 0xD0,</div><div class='add'>+0x11, 0x42, 0x07, 0x00, 0xDD, 0x01, 0x74, 0x07, 0x12, 0x19, 0x40, 0x57, 0x20,</div><div class='add'>+0x15, 0x83, 0x74, 0x06, 0x51, 0x01, 0x40, 0x0D, 0x20, 0x0C, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x11, 0xA0, 0x03, 0x00, 0x8D, 0x00, 0x34, 0x03, 0xD0, 0x08, 0x40,</div><div class='add'>+0x03, 0x00, 0xCD, 0x00, 0x34, 0x03, 0xD0, 0x0C, 0x40, 0x20, 0x04, 0xCD, 0x04,</div><div class='add'>+0x05, 0x03, 0xD2, 0x8C, 0x42, 0x23, 0x08, 0xD1, 0x80, 0x34, 0x03, 0xD0, 0x08,</div><div class='add'>+0x40, 0x63, 0x00, 0xCD, 0x00, 0x34, 0x81, 0x10, 0x0C, 0x40, 0x27, 0x00, 0x81,</div><div class='add'>+0x08, 0x34, 0x02, 0x19, 0x08, 0x40, 0x4C, 0x80, 0x0E, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x03, 0xA8, 0x65, 0x00, 0x1D, 0x21, 0x74, 0x03, 0xD0, 0x39, 0x40, 0x47,</div><div class='add'>+0x00, 0xDD, 0x01, 0x74, 0x03, 0xD0, 0x0D, 0x40, 0xE4, 0x00, 0xCD, 0x20, 0x44,</div><div class='add'>+0x03, 0xD1, 0x0D, 0x40, 0x63, 0x00, 0xD1, 0x03, 0x54, 0x03, 0x90, 0x19, 0x40,</div><div class='add'>+0x67, 0x10, 0xDD, 0x04, 0x74, 0x06, 0x11, 0x1D, 0x40, 0x37, 0x00, 0x55, 0x90,</div><div class='add'>+0x74, 0x06, 0x58, 0x19, 0x42, 0x0D, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0xA0, 0xE7, 0x00, 0x9F, 0x11, 0x5C, 0x03, 0xF1, 0x19, 0xC0, 0x67, 0x04,</div><div class='add'>+0xDF, 0x05, 0x7C, 0x03, 0xF0, 0x0D, 0xC0, 0xC4, 0x00, 0xDF, 0x01, 0x4C, 0x03,</div><div class='add'>+0xF0, 0x0D, 0xC0, 0x45, 0x40, 0xC3, 0x01, 0x7C, 0x03, 0xF0, 0x39, 0xC1, 0x67,</div><div class='add'>+0x00, 0xDF, 0x00, 0x3C, 0x0D, 0xB8, 0x39, 0xC0, 0x37, 0x00, 0x53, 0x02, 0x7C,</div><div class='add'>+0x04, 0x30, 0x11, 0xC0, 0x80, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07,</div><div class='add'>+0x88, 0x2D, 0x00, 0xBF, 0x80, 0x7C, 0x03, 0xF0, 0x03, 0xC0, 0x0F, 0x00, 0xFF,</div><div class='add'>+0x00, 0xFC, 0x03, 0xF0, 0x8F, 0xC0, 0x2F, 0x00, 0xFF, 0x02, 0xFC, 0x03, 0xF2,</div><div class='add'>+0x0F, 0xE0, 0x27, 0x80, 0xFF, 0x00, 0xEC, 0x03, 0xF0, 0x09, 0xC0, 0x0F, 0x00,</div><div class='add'>+0xFF, 0x01, 0xFC, 0x03, 0xF0, 0x03, 0xC0, 0x7F, 0x01, 0x3F, 0x04, 0xBC, 0x02,</div><div class='add'>+0xF0, 0x01, 0xC1, 0x1F, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x08,</div><div class='add'>+0x05, 0x02, 0x9F, 0x02, 0x7C, 0x03, 0x30, 0x29, 0xC0, 0xA7, 0x00, 0xDF, 0x0A,</div><div class='add'>+0x6C, 0x03, 0x70, 0x0D, 0xC0, 0x27, 0x00, 0xD3, 0x04, 0x4C, 0x13, 0xF2, 0x8D,</div><div class='add'>+0xC2, 0xA7, 0x00, 0xD7, 0x03, 0x4C, 0x47, 0xF0, 0x29, 0xC0, 0x24, 0x04, 0xDB,</div><div class='add'>+0x04, 0x4C, 0x19, 0x70, 0x2D, 0xC5, 0x34, 0x00, 0x57, 0x02, 0x7C, 0x60, 0x74,</div><div class='add'>+0x01, 0xC0, 0x28, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0xA0, 0x24,</div><div class='add'>+0x00, 0x9D, 0x18, 0xF4, 0x2B, 0x10, 0x01, 0x40, 0x27, 0x00, 0xDD, 0x00, 0x44,</div><div class='add'>+0x03, 0xD0, 0x8D, 0x40, 0x27, 0x00, 0xD1, 0x02, 0xC4, 0x4B, 0xD0, 0x2F, 0x40,</div><div class='add'>+0x27, 0x00, 0xD1, 0x80, 0x50, 0x0B, 0xF0, 0x49, 0x00, 0x85, 0x00, 0xDD, 0x41,</div><div class='add'>+0x6C, 0x4F, 0x10, 0x0D, 0x40, 0x30, 0x02, 0x5B, 0x00, 0x70, 0x0A, 0x10, 0x21,</div><div class='add'>+0xC0, 0x4E, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x20, 0x00, 0x04,</div><div class='add'>+0x0D, 0x00, 0x34, 0x03, 0x10, 0x00, 0x40, 0x23, 0x00, 0xCD, 0x01, 0x24, 0x03,</div><div class='add'>+0x50, 0x3D, 0x40, 0x03, 0x00, 0xC5, 0x00, 0x04, 0x03, 0xD0, 0x4C, 0x40, 0x02,</div><div class='add'>+0x00, 0xC9, 0x00, 0x04, 0x8B, 0xD0, 0x10, 0x40, 0x00, 0x20, 0xCD, 0x02, 0x04,</div><div class='add'>+0x0B, 0x50, 0x28, 0x40, 0x32, 0x00, 0x0D, 0x07, 0x34, 0x04, 0xD4, 0x19, 0x40,</div><div class='add'>+0x0C, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x58, 0x00, 0x6D,</div><div class='add'>+0x01, 0xB4, 0x27, 0x14, 0x16, 0x40, 0x7B, 0x00, 0xFD, 0x01, 0x84, 0x87, 0xD0,</div><div class='add'>+0x1E, 0x40, 0x7B, 0x10, 0xE1, 0x01, 0x84, 0x07, 0xD0, 0x1E, 0x48, 0x6B, 0x50,</div><div class='add'>+0xF9, 0x01, 0x94, 0x87, 0x58, 0x16, 0x50, 0x48, 0x02, 0xFD, 0x11, 0xE4, 0x17,</div><div class='add'>+0x10, 0x0F, 0x40, 0x7E, 0x8C, 0xA9, 0x01, 0xB4, 0x24, 0x90, 0x12, 0x48, 0x3E,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x1A, 0x90, 0x00, 0xCF, 0x00,</div><div class='add'>+0x3C, 0x03, 0x30, 0x0C, 0xC0, 0x33, 0x00, 0xCF, 0x00, 0x2C, 0x03, 0x70, 0x0C,</div><div class='add'>+0xC1, 0x03, 0x40, 0xC5, 0x00, 0x0C, 0x23, 0xF0, 0x0C, 0x40, 0x12, 0x02, 0xD7,</div><div class='add'>+0x00, 0x0C, 0x03, 0xD0, 0x80, 0xC0, 0x30, 0x02, 0xCF, 0x00, 0x04, 0x03, 0x70,</div><div class='add'>+0x8C, 0xC0, 0x32, 0x00, 0xCF, 0x10, 0x3C, 0x22, 0xF4, 0x88, 0xC9, 0x48, 0x40,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x38, 0x1D, 0x00, 0xFF, 0x00, 0xFC,</div><div class='add'>+0x03, 0xF0, 0x8F, 0xC0, 0x3F, 0x10, 0xFF, 0x08, 0xFC, 0x03, 0xF0, 0x0F, 0xC0,</div><div class='add'>+0x17, 0x00, 0xFF, 0x00, 0xFC, 0x03, 0xF0, 0x8F, 0xC8, 0x1F, 0x08, 0xF7, 0x00,</div><div class='add'>+0xFC, 0x03, 0xF0, 0x0F, 0xC0, 0x3F, 0x02, 0xFF, 0x00, 0xFC, 0x13, 0xF0, 0x4F,</div><div class='add'>+0xE0, 0x3D, 0x00, 0xFE, 0x08, 0xFC, 0x23, 0x74, 0x0F, 0xC0, 0x0B, 0x60, 0x04,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xA0, 0x37, 0x08, 0x5F, 0x01, 0x4C, 0x03,</div><div class='add'>+0x70, 0x09, 0xC0, 0x27, 0x00, 0xDF, 0x00, 0x7C, 0x03, 0xF0, 0x0D, 0xC4, 0x17,</div><div class='add'>+0x00, 0xD7, 0x00, 0x5C, 0x1B, 0xF0, 0x0D, 0xC0, 0x17, 0x00, 0xDF, 0x00, 0x7C,</div><div class='add'>+0x03, 0x70, 0x0D, 0xC8, 0x37, 0x00, 0xC3, 0x00, 0x2C, 0x03, 0xB0, 0x0D, 0x40,</div><div class='add'>+0x37, 0x00, 0x9F, 0x40, 0x4C, 0x80, 0x20, 0x09, 0xC2, 0x43, 0x00, 0x0E, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x12, 0x82, 0x39, 0x00, 0x6D, 0x00, 0xC4, 0x2B, 0x10,</div><div class='add'>+0x0E, 0x40, 0x1B, 0x00, 0xE9, 0x00, 0xB4, 0x03, 0xD0, 0x0E, 0x40, 0x3B, 0x00,</div><div class='add'>+0xED, 0x00, 0xB4, 0x33, 0xD0, 0x2E, 0x40, 0x3B, 0x00, 0xEF, 0x00, 0xB4, 0x03,</div><div class='add'>+0xD0, 0x0E, 0x40, 0x3B, 0x20, 0xE1, 0x00, 0x84, 0x03, 0x50, 0x0E, 0x00, 0x3B,</div><div class='add'>+0x00, 0x8D, 0x00, 0x84, 0x01, 0xB0, 0x02, 0x40, 0x4F, 0x00, 0x06, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x04, 0x00, 0x79, 0x00, 0xCD, 0x03, 0xA5, 0x17, 0x50, 0x1E,</div><div class='add'>+0x40, 0x7B, 0x00, 0xED, 0x11, 0xB4, 0x07, 0xD0, 0x1E, 0x41, 0x7B, 0x00, 0xED,</div><div class='add'>+0x01, 0x96, 0x27, 0xD0, 0x1E, 0x40, 0x7B, 0x88, 0xED, 0x01, 0xB4, 0x07, 0xD0,</div><div class='add'>+0x36, 0x40, 0x73, 0x00, 0xE1, 0x01, 0xA4, 0x07, 0x90, 0x1E, 0x40, 0x7B, 0x00,</div><div class='add'>+0xED, 0x11, 0x14, 0x44, 0x19, 0x3E, 0x40, 0x13, 0x00, 0x04, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x16, 0x28, 0x73, 0x00, 0xCD, 0x01, 0x24, 0x03, 0x10, 0x0C, 0x40,</div><div class='add'>+0x33, 0x00, 0x49, 0x05, 0x34, 0x03, 0xD0, 0x18, 0x40, 0xF3, 0x00, 0x8D, 0x01,</div><div class='add'>+0x74, 0x03, 0xD0, 0x0C, 0x40, 0x73, 0x02, 0x45, 0x1A, 0x34, 0x03, 0xD0, 0x5C,</div><div class='add'>+0x40, 0x77, 0x00, 0x81, 0x00, 0x04, 0x07, 0x50, 0x2C, 0x60, 0xB3, 0x00, 0xCD,</div><div class='add'>+0x47, 0x14, 0x07, 0x90, 0x1C, 0x40, 0x5B, 0x20, 0x08, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x17, 0xA0, 0x1D, 0x00, 0x7F, 0x02, 0x6C, 0x01, 0x70, 0x27, 0xC0, 0x9F,</div><div class='add'>+0x00, 0x7F, 0x01, 0x7C, 0x01, 0xF0, 0x05, 0xC0, 0x1F, 0x00, 0x5F, 0x01, 0x5C,</div><div class='add'>+0x01, 0xF0, 0x05, 0xC0, 0xDF, 0x00, 0x7D, 0x02, 0x7C, 0x81, 0xF1, 0x37, 0xC0,</div><div class='add'>+0xDF, 0x40, 0x43, 0x00, 0xEC, 0x01, 0xB0, 0x27, 0xC0, 0x1B, 0x01, 0x7F, 0x23,</div><div class='add'>+0x9D, 0xA5, 0x20, 0xB7, 0xC0, 0x5F, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x12, 0x08, 0x45, 0x02, 0x1F, 0x02, 0x1C, 0x00, 0xF0, 0x01, 0xC0, 0x07, 0x00,</div><div class='add'>+0x1D, 0x20, 0x7C, 0x00, 0xF2, 0x21, 0xC8, 0x07, 0x06, 0x1F, 0x0A, 0x7C, 0x00,</div><div class='add'>+0xF0, 0x21, 0xC0, 0x07, 0x04, 0x1F, 0x80, 0x7C, 0x00, 0xF0, 0x01, 0xC0, 0x87,</div><div class='add'>+0x06, 0x1F, 0x42, 0x7C, 0x28, 0xB0, 0x41, 0xC0, 0x07, 0x04, 0x1F, 0x00, 0x64,</div><div class='add'>+0x88, 0xF0, 0x21, 0xC0, 0x4B, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10,</div><div class='add'>+0x08, 0x25, 0x00, 0x9F, 0x19, 0x7C, 0x06, 0x30, 0x08, 0xC5, 0x24, 0x04, 0x9F,</div><div class='add'>+0x08, 0x74, 0x02, 0xF0, 0x09, 0xC0, 0x23, 0x00, 0x9B, 0x01, 0x7C, 0x02, 0x30,</div><div class='add'>+0x09, 0xC2, 0x23, 0x80, 0x93, 0x04, 0x4C, 0x02, 0xF0, 0x59, 0xC0, 0x27, 0x00,</div><div class='add'>+0x93, 0x03, 0x5C, 0x02, 0x71, 0x59, 0xC0, 0xA7, 0x40, 0x83, 0x00, 0x4C, 0x22,</div><div class='add'>+0x30, 0x28, 0xC0, 0x40, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x20,</div><div class='add'>+0x64, 0x00, 0x9D, 0x12, 0x74, 0x0A, 0x14, 0x09, 0x50, 0x24, 0x00, 0x97, 0x01,</div><div class='add'>+0x74, 0x02, 0xD8, 0x49, 0x40, 0x27, 0x40, 0x91, 0x11, 0x74, 0x0A, 0x50, 0x29,</div><div class='add'>+0x40, 0x27, 0xC0, 0x8B, 0x01, 0x44, 0x4A, 0xD0, 0x09, 0x44, 0xE7, 0x40, 0x91,</div><div class='add'>+0x86, 0x00, 0x12, 0x20, 0x19, 0x40, 0xE7, 0x10, 0x91, 0x01, 0x44, 0x06, 0x14,</div><div class='add'>+0x39, 0x41, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x80, 0x24,</div><div class='add'>+0x25, 0x9D, 0x00, 0x74, 0x62, 0x10, 0x09, 0x40, 0x24, 0x00, 0x9D, 0x00, 0x74,</div><div class='add'>+0x02, 0xD0, 0x09, 0x40, 0x27, 0x00, 0x91, 0x08, 0x74, 0x0A, 0x10, 0x09, 0x40,</div><div class='add'>+0x37, 0x08, 0x91, 0x00, 0x44, 0x82, 0xD0, 0x09, 0x40, 0x27, 0x01, 0x99, 0x00,</div><div class='add'>+0x50, 0x03, 0x50, 0x0D, 0x40, 0x36, 0x00, 0x99, 0x04, 0x44, 0x03, 0x10, 0x0D,</div><div class='add'>+0x40, 0x60, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x22, 0x20, 0x05,</div><div class='add'>+0x8D, 0x14, 0x36, 0x12, 0x10, 0x48, 0x40, 0x20, 0x01, 0x85, 0x80, 0x34, 0x02,</div><div class='add'>+0xD0, 0x08, 0x40, 0x23, 0x01, 0x81, 0x08, 0x74, 0x12, 0x50, 0x08, 0x40, 0x23,</div><div class='add'>+0x01, 0x91, 0x00, 0x04, 0x02, 0xD2, 0x48, 0x40, 0x33, 0x01, 0x89, 0x00, 0x44,</div><div class='add'>+0x02, 0x10, 0x08, 0x44, 0x33, 0x00, 0x89, 0x01, 0x05, 0x93, 0x10, 0x48, 0x50,</div><div class='add'>+0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xB8, 0x06, 0x01, 0x1F,</div><div class='add'>+0x04, 0x7C, 0x28, 0x30, 0x01, 0xC0, 0x04, 0x00, 0x1F, 0x00, 0x7C, 0x00, 0xD0,</div><div class='add'>+0xA1, 0xC0, 0x87, 0x02, 0x13, 0x02, 0x7C, 0x28, 0x30, 0xE5, 0xC5, 0x87, 0x02,</div><div class='add'>+0x11, 0x00, 0x4C, 0x28, 0xF0, 0x01, 0xC0, 0x87, 0x22, 0x1B, 0x00, 0x5C, 0x00,</div><div class='add'>+0x72, 0x01, 0xC0, 0x07, 0x00, 0x1B, 0x14, 0x4C, 0x00, 0x30, 0xA1, 0xC0, 0x74,</div><div class='add'>+0xE0, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xB0, 0x2F, 0x05, 0xBF, 0x14,</div><div class='add'>+0x74, 0xA2, 0xF2, 0x8B, 0xC0, 0x2F, 0x22, 0xBF, 0x00, 0x7C, 0x02, 0xF0, 0x0B,</div><div class='add'>+0xC0, 0x2F, 0x0A, 0xB7, 0x04, 0x7C, 0x22, 0xF0, 0x09, 0xC0, 0x2F, 0x02, 0xBF,</div><div class='add'>+0x00, 0x7D, 0x02, 0xF0, 0x8F, 0x00, 0x2F, 0x02, 0xB7, 0x80, 0xFC, 0x02, 0x70,</div><div class='add'>+0x0B, 0xC0, 0x2F, 0x08, 0xF7, 0x00, 0xFD, 0x23, 0xF0, 0x8B, 0xC2, 0x77, 0x60,</div><div class='add'>+0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xA0, 0x2F, 0x05, 0xBF, 0x0C, 0xFC,</div><div class='add'>+0x82, 0x32, 0x09, 0xC0, 0x24, 0x00, 0xB3, 0x00, 0x7C, 0x02, 0xF0, 0x8A, 0xC0,</div><div class='add'>+0x24, 0x00, 0xBF, 0x00, 0xFC, 0x22, 0x30, 0x4B, 0xC0, 0x26, 0x05, 0xBF, 0x00,</div><div class='add'>+0xFC, 0x02, 0x30, 0x0B, 0xE0, 0x2F, 0x02, 0xFF, 0x00, 0xCD, 0x02, 0xB0, 0x0F,</div><div class='add'>+0xC2, 0x2F, 0x48, 0xB3, 0x00, 0xCC, 0x02, 0xF0, 0x0B, 0xC4, 0x74, 0x00, 0x0E,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x07, 0x01, 0x1D, 0x0C, 0x74, 0x48,</div><div class='add'>+0x10, 0x05, 0x40, 0x04, 0x02, 0x51, 0x00, 0x74, 0x00, 0xD0, 0x41, 0x48, 0x84,</div><div class='add'>+0x04, 0x1D, 0x10, 0x74, 0x20, 0x14, 0x41, 0x41, 0x04, 0x01, 0x57, 0x80, 0x74,</div><div class='add'>+0x40, 0x10, 0x01, 0x60, 0x07, 0x02, 0x1D, 0x00, 0x44, 0x00, 0x10, 0x01, 0x40,</div><div class='add'>+0x17, 0x50, 0x11, 0x00, 0x45, 0x00, 0xF0, 0x01, 0xC0, 0x62, 0x00, 0x0C, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x21, 0x05, 0x8D, 0x05, 0x36, 0x32, 0x14,</div><div class='add'>+0x88, 0x40, 0x62, 0x60, 0xC1, 0x00, 0x34, 0x02, 0xD0, 0x48, 0x50, 0x20, 0x03,</div><div class='add'>+0x8D, 0x00, 0x34, 0x02, 0x10, 0xCC, 0x40, 0x22, 0x05, 0xCD, 0x00, 0x36, 0x13,</div><div class='add'>+0x10, 0x88, 0x40, 0x23, 0x00, 0x8D, 0x00, 0x24, 0x02, 0x94, 0x18, 0x40, 0x23,</div><div class='add'>+0x00, 0x85, 0x40, 0x14, 0x02, 0xD2, 0x08, 0x40, 0x48, 0x00, 0x04, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x18, 0xA8, 0x25, 0x04, 0x9D, 0x80, 0x74, 0x02, 0x10, 0x09,</div><div class='add'>+0x50, 0x26, 0x01, 0x91, 0x01, 0x74, 0x02, 0xD0, 0x09, 0x40, 0xA4, 0x00, 0x9D,</div><div class='add'>+0x00, 0x74, 0x02, 0x11, 0x09, 0x40, 0x64, 0x10, 0x9D, 0x01, 0x74, 0x02, 0x10,</div><div class='add'>+0x09, 0x40, 0xE7, 0x10, 0x9D, 0x00, 0x64, 0x12, 0x12, 0x09, 0x40, 0x27, 0x08,</div><div class='add'>+0xD5, 0x04, 0x44, 0x02, 0xD0, 0x29, 0x40, 0x62, 0x28, 0x06, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x05, 0x20, 0x25, 0x00, 0x9F, 0x00, 0x7C, 0x02, 0x30, 0x09, 0xC0,</div><div class='add'>+0x66, 0x00, 0x93, 0x03, 0x7C, 0x02, 0xF0, 0x19, 0xC0, 0xA4, 0x00, 0x9F, 0x01,</div><div class='add'>+0x7C, 0x02, 0x30, 0x09, 0xC0, 0xA6, 0x04, 0x9F, 0x03, 0x74, 0x02, 0x34, 0x29,</div><div class='add'>+0x40, 0xA7, 0x00, 0x8F, 0x00, 0x2C, 0x82, 0xB0, 0x29, 0xC0, 0xA3, 0x00, 0x97,</div><div class='add'>+0x02, 0x5C, 0x06, 0xF0, 0x29, 0xC0, 0x14, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x16, 0x08, 0x65, 0x0A, 0x9F, 0x14, 0x7C, 0x02, 0xF2, 0x48, 0xC0, 0x21,</div><div class='add'>+0x00, 0x9F, 0x00, 0x7C, 0x02, 0xF2, 0x59, 0xC0, 0x27, 0x00, 0x9F, 0x03, 0x7C,</div><div class='add'>+0x02, 0xF0, 0x08, 0xC0, 0x27, 0x00, 0x97, 0x80, 0x7C, 0x02, 0xF0, 0x09, 0x82,</div><div class='add'>+0x27, 0x00, 0x9F, 0x18, 0x5C, 0x02, 0xD0, 0x99, 0xC0, 0xA7, 0x64, 0x9B, 0x00,</div><div class='add'>+0x7C, 0x8E, 0x78, 0x38, 0xC0, 0x5B, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x14, 0x08, 0x85, 0x04, 0x1F, 0x08, 0x7C, 0x40, 0xF1, 0x01, 0xC0, 0x07, 0x80,</div><div class='add'>+0x13, 0x20, 0x7C, 0x00, 0xF2, 0x41, 0xD0, 0x84, 0x00, 0x1F, 0x00, 0x0C, 0x00,</div><div class='add'>+0x30, 0x01, 0xC2, 0x87, 0x08, 0x1F, 0x02, 0x7E, 0x00, 0xF2, 0x21, 0xF0, 0x04,</div><div class='add'>+0x0C, 0x1B, 0x80, 0x7C, 0x00, 0x70, 0x01, 0xC9, 0x87, 0x00, 0x07, 0x80, 0x4D,</div><div class='add'>+0x08, 0x32, 0x01, 0xC0, 0x50, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10,</div><div class='add'>+0x00, 0xDC, 0x20, 0x7D, 0x01, 0xF6, 0x1D, 0x70, 0x05, 0x60, 0x17, 0x00, 0x51,</div><div class='add'>+0x00, 0x74, 0x01, 0xD0, 0x07, 0xC0, 0x16, 0x00, 0x7D, 0x05, 0xCD, 0x19, 0x30,</div><div class='add'>+0x27, 0x60, 0x17, 0x20, 0x5D, 0x00, 0xFC, 0xA9, 0x72, 0x45, 0x62, 0x1C, 0x11,</div><div class='add'>+0x71, 0x25, 0xDC, 0x8D, 0x14, 0x27, 0xC0, 0x9D, 0x01, 0x71, 0x89, 0xCC, 0x01,</div><div class='add'>+0x10, 0x37, 0x40, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xA0,</div><div class='add'>+0xF2, 0x02, 0xCD, 0x02, 0x74, 0x03, 0x52, 0x0C, 0x44, 0x33, 0x00, 0x81, 0x00,</div><div class='add'>+0x34, 0x03, 0xD0, 0x2D, 0x40, 0x30, 0x00, 0xCD, 0x01, 0x24, 0x1F, 0x10, 0x2C,</div><div class='add'>+0x49, 0x33, 0x10, 0x8D, 0x00, 0x74, 0x03, 0x51, 0x18, 0x40, 0x30, 0x00, 0x41,</div><div class='add'>+0x01, 0x34, 0x40, 0x10, 0x0C, 0x40, 0xA3, 0x20, 0xC5, 0x09, 0x20, 0x07, 0x10,</div><div class='add'>+0x2C, 0x41, 0x40, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x80, 0x38,</div><div class='add'>+0x00, 0xED, 0x00, 0xB4, 0x01, 0x50, 0x0E, 0x40, 0x33, 0x40, 0xE1, 0x80, 0xB4,</div><div class='add'>+0x03, 0xD8, 0x0F, 0x41, 0x38, 0x00, 0x6D, 0x01, 0x84, 0x03, 0x10, 0x0E, 0x48,</div><div class='add'>+0x3B, 0x02, 0xED, 0x40, 0xB4, 0x01, 0x50, 0x1E, 0x48, 0x59, 0x00, 0x61, 0x81,</div><div class='add'>+0xD4, 0x42, 0x10, 0x06, 0x40, 0x2D, 0x00, 0x61, 0x00, 0x04, 0x46, 0x10, 0x0E,</div><div class='add'>+0x41, 0x10, 0x08, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x18, 0x78, 0x00,</div><div class='add'>+0x6F, 0x01, 0xB4, 0x07, 0x70, 0x1E, 0x40, 0x7B, 0x08, 0xE1, 0x01, 0xBC, 0x07,</div><div class='add'>+0xF0, 0x1E, 0x40, 0x78, 0x81, 0xBD, 0x01, 0xEC, 0x05, 0x34, 0x1E, 0x40, 0x7B,</div><div class='add'>+0x02, 0xEF, 0x01, 0xB4, 0x07, 0x70, 0x1E, 0x40, 0x7C, 0x40, 0x6B, 0x00, 0xBC,</div><div class='add'>+0x06, 0x30, 0x1A, 0xC0, 0x6B, 0x00, 0xE7, 0x01, 0xAC, 0x07, 0x34, 0x17, 0xC0,</div><div class='add'>+0x50, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xB8, 0x15, 0x00, 0xDF,</div><div class='add'>+0x00, 0x7C, 0x81, 0x70, 0x0D, 0xC8, 0x37, 0x00, 0xDF, 0x00, 0x7C, 0x03, 0xF0,</div><div class='add'>+0x0D, 0xC0, 0x37, 0x04, 0x1F, 0x00, 0x7C, 0x03, 0xF0, 0x0D, 0xC8, 0xB7, 0x00,</div><div class='add'>+0xDF, 0x00, 0x5C, 0x83, 0x72, 0x0C, 0xE0, 0x16, 0x08, 0xDF, 0x00, 0x3C, 0x02,</div><div class='add'>+0xC4, 0x01, 0xC0, 0x23, 0x00, 0x0F, 0x00, 0x7C, 0x83, 0xF0, 0x01, 0xD0, 0x43,</div><div class='add'>+0x60, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x30, 0x7D, 0x00, 0xF3, 0x01,</div><div class='add'>+0xCC, 0x13, 0xF0, 0x1F, 0xC0, 0x7F, 0x01, 0xFF, 0x01, 0xFC, 0x07, 0xF0, 0x1F,</div><div class='add'>+0xC0, 0x7F, 0x04, 0xF3, 0x01, 0xCC, 0x13, 0x30, 0x17, 0xC0, 0x7C, 0x02, 0xFF,</div><div class='add'>+0x89, 0xFC, 0x87, 0x30, 0x9F, 0xC0, 0x7F, 0x00, 0x73, 0x01, 0xFC, 0x26, 0xF0,</div><div class='add'>+0x17, 0xC8, 0x6B, 0x20, 0xBB, 0x01, 0xFC, 0x07, 0xD0, 0x13, 0xC0, 0x1B, 0x00,</div><div class='add'>+0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x00, 0x3D, 0x50, 0x71, 0x20, 0x84,</div><div class='add'>+0x83, 0xD0, 0x0E, 0x40, 0x3B, 0x00, 0xED, 0x00, 0xB4, 0x03, 0xD0, 0x2A, 0x48,</div><div class='add'>+0x3F, 0x00, 0x61, 0x00, 0xD4, 0x08, 0x11, 0x0B, 0xC0, 0x38, 0x00, 0xE9, 0x88,</div><div class='add'>+0xDC, 0x82, 0x10, 0xCE, 0x40, 0x3B, 0x01, 0x61, 0x00, 0xB4, 0x32, 0xD0, 0x06,</div><div class='add'>+0x42, 0x3B, 0x12, 0x21, 0x30, 0xB4, 0x02, 0xD0, 0x4A, 0x42, 0x57, 0x00, 0x04,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x39, 0x00, 0x61, 0x00, 0x84, 0x20,</div><div class='add'>+0xD0, 0x0E, 0x40, 0x3B, 0x09, 0xED, 0x00, 0xB4, 0x03, 0xD0, 0x86, 0x40, 0x3B,</div><div class='add'>+0x00, 0xB1, 0x00, 0xA4, 0x21, 0x10, 0x0E, 0x40, 0x38, 0x20, 0xED, 0x08, 0xB6,</div><div class='add'>+0x03, 0x10, 0x0E, 0x49, 0x2B, 0x00, 0x61, 0x10, 0xB4, 0x02, 0xD1, 0x02, 0x40,</div><div class='add'>+0x2F, 0x00, 0x29, 0x00, 0xB4, 0x03, 0xD0, 0x02, 0x44, 0x23, 0x02, 0x04, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x02, 0x08, 0xE1, 0x00, 0x01, 0x07, 0x04, 0x00, 0xD0,</div><div class='add'>+0x0C, 0x40, 0x73, 0x00, 0xCD, 0x03, 0x34, 0x03, 0xD1, 0x00, 0x44, 0x33, 0x00,</div><div class='add'>+0x11, 0x00, 0x34, 0x00, 0x14, 0x09, 0x50, 0xB6, 0x10, 0xCD, 0x03, 0x34, 0x02,</div><div class='add'>+0x14, 0x3C, 0x40, 0xA3, 0x40, 0x41, 0x01, 0x34, 0x4A, 0xD0, 0x20, 0x40, 0x23,</div><div class='add'>+0x02, 0x01, 0x03, 0x34, 0x6F, 0xD0, 0x11, 0x41, 0x0B, 0x20, 0x04, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x15, 0xA0, 0xC5, 0x00, 0x93, 0x04, 0x47, 0x02, 0xF1, 0x2D,</div><div class='add'>+0x80, 0xF7, 0x01, 0xDF, 0x07, 0x74, 0x03, 0xF0, 0x01, 0x40, 0x3F, 0x42, 0xD3,</div><div class='add'>+0x00, 0x6C, 0x02, 0x30, 0x09, 0xC0, 0x3C, 0x00, 0xDF, 0x05, 0x74, 0x02, 0x30,</div><div class='add'>+0x1D, 0xC4, 0x27, 0x00, 0x53, 0x01, 0x7C, 0x12, 0xF0, 0x25, 0xC0, 0x73, 0x00,</div><div class='add'>+0xDB, 0x03, 0x7C, 0x0B, 0xF2, 0x69, 0x40, 0x57, 0x00, 0x06, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x05, 0x08, 0x27, 0x03, 0x9F, 0x00, 0x7E, 0x0A, 0xF0, 0x1D, 0xC0,</div><div class='add'>+0x37, 0x00, 0xDF, 0x00, 0x7C, 0x03, 0xF0, 0x39, 0xC0, 0x77, 0x10, 0xDF, 0x03,</div><div class='add'>+0x5C, 0x0A, 0xF0, 0x29, 0xC0, 0x35, 0x00, 0xDB, 0x10, 0x54, 0x80, 0xF0, 0x0D,</div><div class='add'>+0xCD, 0x27, 0x01, 0x5F, 0x00, 0x7C, 0x03, 0xF0, 0x85, 0xC1, 0xB7, 0x04, 0xDF,</div><div class='add'>+0x04, 0x7C, 0x02, 0xF0, 0x29, 0xC0, 0x37, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x80, 0x08, 0x0B, 0x00, 0x33, 0x00, 0xFC, 0x82, 0xF0, 0x0F, 0xC1, 0x3F,</div><div class='add'>+0x24, 0xFF, 0x30, 0xFC, 0x03, 0xF2, 0x03, 0xC4, 0x3B, 0x00, 0x73, 0x05, 0x8D,</div><div class='add'>+0x02, 0x30, 0x03, 0xC2, 0x3C, 0x04, 0xF3, 0x04, 0xFC, 0x00, 0xF1, 0x0E, 0xC0,</div><div class='add'>+0x06, 0x00, 0x3F, 0x00, 0xFC, 0x02, 0x70, 0x27, 0xC0, 0x3C, 0x40, 0xF3, 0x02,</div><div class='add'>+0xCC, 0x01, 0xF1, 0x0B, 0xC0, 0x04, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x81, 0x20, 0xC6, 0x34, 0x91, 0x13, 0x5C, 0x16, 0xD0, 0x0D, 0x40, 0x37, 0x00,</div><div class='add'>+0xDD, 0x00, 0x74, 0x03, 0xD9, 0x39, 0x40, 0x37, 0x00, 0x51, 0x04, 0x44, 0x0E,</div><div class='add'>+0x10, 0x71, 0x40, 0x34, 0x00, 0xD3, 0x01, 0x74, 0x0C, 0xD0, 0x0D, 0x40, 0x44,</div><div class='add'>+0x00, 0x5D, 0x03, 0x34, 0x17, 0x11, 0x34, 0x40, 0xF4, 0x04, 0x81, 0x00, 0x44,</div><div class='add'>+0x07, 0xD0, 0x59, 0x48, 0x84, 0x02, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,</div><div class='add'>+0xA0, 0x46, 0x00, 0x91, 0x01, 0x74, 0x06, 0xD0, 0x0D, 0x40, 0x37, 0x00, 0xDD,</div><div class='add'>+0x04, 0x74, 0x83, 0xD0, 0x19, 0x40, 0x37, 0x00, 0x91, 0x40, 0x44, 0x06, 0x90,</div><div class='add'>+0x11, 0x40, 0x34, 0x20, 0xD1, 0x00, 0x74, 0x46, 0xD0, 0x1D, 0x40, 0x66, 0x04,</div><div class='add'>+0x5D, 0x11, 0x74, 0x06, 0x50, 0x25, 0x40, 0x74, 0x00, 0xD1, 0x00, 0x44, 0x0E,</div><div class='add'>+0xD0, 0x11, 0x40, 0x04, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00,</div><div class='add'>+0x20, 0x00, 0x81, 0x20, 0x34, 0x02, 0xD0, 0x0C, 0x40, 0x33, 0x00, 0xCD, 0x00,</div><div class='add'>+0x34, 0x03, 0xD0, 0x08, 0x40, 0x33, 0x48, 0x81, 0x00, 0x06, 0x00, 0x90, 0x08,</div><div class='add'>+0x40, 0x30, 0x00, 0xC1, 0x00, 0x34, 0x02, 0xD0, 0x0C, 0x42, 0x20, 0x00, 0x49,</div><div class='add'>+0x00, 0x74, 0x02, 0x18, 0x04, 0x40, 0x10, 0x00, 0xC1, 0x20, 0x04, 0x02, 0xD0,</div><div class='add'>+0x08, 0x42, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06,</div><div class='add'>+0x40, 0x13, 0x40, 0x7E, 0x00, 0xF0, 0x0D, 0xC0, 0x37, 0x00, 0xDF, 0x20, 0x7E,</div><div class='add'>+0x03, 0xD0, 0x01, 0xC2, 0x3F, 0x00, 0x13, 0x00, 0x4C, 0x02, 0xB0, 0x01, 0xC0,</div><div class='add'>+0x3C, 0x00, 0xD3, 0x00, 0x7C, 0x00, 0xF0, 0x0D, 0xC0, 0x06, 0x00, 0x5F, 0x00,</div><div class='add'>+0x7C, 0x02, 0x70, 0x05, 0xD0, 0x34, 0x10, 0x53, 0x00, 0x4C, 0x00, 0xF2, 0x01,</div><div class='add'>+0xD0, 0x04, 0x60, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0xA8, 0x2F, 0x10,</div><div class='add'>+0xBF, 0x00, 0xDE, 0x00, 0xF0, 0x0F, 0xC6, 0x3F, 0x00, 0xFF, 0x80, 0xFC, 0x03,</div><div class='add'>+0xD0, 0x03, 0xE0, 0x3F, 0x00, 0x2F, 0x00, 0xF4, 0x00, 0x70, 0x03, 0xD0, 0x3F,</div><div class='add'>+0x00, 0xF7, 0x00, 0xFC, 0x00, 0xF0, 0x0F, 0xC0, 0x0F, 0x00, 0x7F, 0x00, 0xFC,</div><div class='add'>+0x02, 0xF0, 0x07, 0xC8, 0x3F, 0x00, 0x3F, 0xA0, 0xFD, 0x02, 0xF0, 0x0B, 0xC0,</div><div class='add'>+0x17, 0x61, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xA8, 0x3F, 0x00, 0xB3,</div><div class='add'>+0x00, 0xCC, 0x02, 0xF0, 0x0B, 0xC0, 0x2F, 0x00, 0xBF, 0x00, 0xCC, 0x03, 0x30,</div><div class='add'>+0x0A, 0xC0, 0x0C, 0x01, 0x33, 0x00, 0xCC, 0x00, 0xF0, 0x03, 0xC0, 0x0B, 0x00,</div><div class='add'>+0xFB, 0x06, 0xEC, 0x05, 0x30, 0x4F, 0xC1, 0x2F, 0x00, 0xF3, 0x14, 0xFC, 0x23,</div><div class='add'>+0xF0, 0x0B, 0xC0, 0x0F, 0x00, 0xF7, 0x04, 0xCC, 0x22, 0x34, 0x03, 0xC0, 0x0C,</div><div class='add'>+0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x10, 0x07, 0x10, 0x91, 0x80,</div><div class='add'>+0x44, 0x00, 0x70, 0x01, 0x40, 0x07, 0x00, 0x9D, 0x00, 0x44, 0x43, 0x10, 0x09,</div><div class='add'>+0x48, 0x84, 0x00, 0x91, 0x00, 0x44, 0x00, 0xD0, 0x01, 0x40, 0x27, 0x00, 0xF9,</div><div class='add'>+0x0B, 0x44, 0x55, 0x15, 0x2F, 0x40, 0x6F, 0x00, 0xD1, 0x03, 0x70, 0x3B, 0xD0,</div><div class='add'>+0x39, 0x40, 0x47, 0x40, 0xF1, 0x00, 0x6C, 0x0A, 0x10, 0x15, 0x40, 0x0D, 0x20,</div><div class='add'>+0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0xA0, 0x33, 0x05, 0x01, 0x20, 0x14,</div><div class='add'>+0x00, 0xD0, 0x00, 0x40, 0x23, 0x00, 0x0D, 0x20, 0x14, 0x13, 0x10, 0x00, 0x40,</div><div class='add'>+0x01, 0x02, 0x01, 0x20, 0x04, 0x02, 0xD0, 0x08, 0x42, 0x23, 0x00, 0xC1, 0x04,</div><div class='add'>+0x24, 0x81, 0x10, 0x0C, 0x4A, 0x27, 0x08, 0xCD, 0x00, 0x34, 0x03, 0xD1, 0x88,</div><div class='add'>+0x40, 0x03, 0x00, 0xC5, 0x08, 0x44, 0xA2, 0x13, 0x08, 0x46, 0x4C, 0x80, 0x0E,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xA0, 0x05, 0x11, 0x11, 0x04, 0x54, 0x04,</div><div class='add'>+0xD0, 0x11, 0x41, 0x47, 0x00, 0x1D, 0x11, 0x74, 0x03, 0x10, 0x15, 0x40, 0x41,</div><div class='add'>+0x00, 0x11, 0x01, 0x44, 0x04, 0xD2, 0x31, 0x4C, 0xE7, 0x00, 0xD1, 0x00, 0x64,</div><div class='add'>+0x21, 0x10, 0x0D, 0x40, 0x27, 0x01, 0xDD, 0x00, 0x74, 0x03, 0xD0, 0x19, 0x48,</div><div class='add'>+0x87, 0x00, 0xD1, 0x00, 0x64, 0x46, 0x10, 0x0D, 0x40, 0x0D, 0x20, 0x06, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0xA8, 0x67, 0x00, 0x93, 0x00, 0x5D, 0x46, 0xF0,</div><div class='add'>+0x39, 0xC0, 0x47, 0x01, 0x1F, 0x03, 0x5C, 0x03, 0x10, 0x29, 0xE1, 0x45, 0x40,</div><div class='add'>+0x93, 0x05, 0x4C, 0x0C, 0xD0, 0x19, 0xC0, 0xC7, 0x00, 0xDB, 0x00, 0x6C, 0x17,</div><div class='add'>+0x30, 0x0D, 0x60, 0x23, 0x40, 0xDF, 0x80, 0x7C, 0x03, 0xF2, 0x09, 0xC0, 0xC7,</div><div class='add'>+0x00, 0xD7, 0x00, 0x0C, 0x0E, 0x30, 0xB1, 0x81, 0x00, 0x20, 0x0E, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x07, 0x80, 0x69, 0x40, 0x9F, 0x01, 0xEC, 0x00, 0x70, 0x0B,</div><div class='add'>+0xC0, 0x0F, 0x00, 0xAF, 0x20, 0x8C, 0x03, 0xF0, 0x0B, 0xE2, 0x0E, 0x00, 0xAF,</div><div class='add'>+0x00, 0xFD, 0x00, 0xF0, 0x01, 0xC0, 0x2F, 0x00, 0xFF, 0x00, 0xDC, 0x06, 0xF8,</div><div class='add'>+0x0F, 0xC1, 0x6F, 0x00, 0xF2, 0x00, 0xFC, 0x03, 0xF0, 0x0B, 0x40, 0x4F, 0x02,</div><div class='add'>+0xFF, 0x00, 0xDF, 0x02, 0xF0, 0x07, 0xE0, 0x1F, 0x00, 0x06, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x02, 0x08, 0x35, 0x00, 0x83, 0x00, 0x4D, 0x0A, 0xF0, 0x21, 0xC0,</div><div class='add'>+0x24, 0x81, 0x1F, 0x02, 0x5C, 0x03, 0x30, 0xA5, 0xC0, 0x44, 0x00, 0x1B, 0x00,</div><div class='add'>+0x7C, 0x0A, 0x32, 0x29, 0xC9, 0xA6, 0x42, 0xC3, 0x00, 0x5C, 0x01, 0x34, 0x0D,</div><div class='add'>+0xC0, 0x27, 0x80, 0xD3, 0x08, 0x7C, 0x03, 0x30, 0x49, 0xC0, 0x07, 0x10, 0xDF,</div><div class='add'>+0x00, 0x4C, 0x22, 0x30, 0x09, 0xC0, 0x0B, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x13, 0xA0, 0x2C, 0x14, 0x91, 0x20, 0x44, 0x2A, 0xD0, 0x89, 0x41, 0x84,</div><div class='add'>+0x00, 0x1D, 0x09, 0xF0, 0x03, 0x30, 0x85, 0x00, 0x24, 0x00, 0x11, 0x1A, 0x74,</div><div class='add'>+0x82, 0x30, 0x01, 0x40, 0xA4, 0x00, 0xFB, 0x40, 0x44, 0x01, 0x10, 0x0F, 0x40,</div><div class='add'>+0x27, 0x00, 0xF1, 0x01, 0xF4, 0x03, 0x50, 0x79, 0x40, 0x03, 0x00, 0xFD, 0x24,</div><div class='add'>+0x54, 0x02, 0xB0, 0x1C, 0x40, 0x6F, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x03, 0x20, 0x30, 0x08, 0x81, 0x00, 0x20, 0x26, 0xD1, 0x38, 0x40, 0x60, 0x20,</div><div class='add'>+0x8D, 0x20, 0x34, 0x03, 0x10, 0x39, 0x40, 0x00, 0x00, 0x09, 0x03, 0x16, 0x02,</div><div class='add'>+0x10, 0x20, 0x40, 0x04, 0x01, 0xC1, 0x00, 0x54, 0x02, 0x10, 0x3C, 0x40, 0x31,</div><div class='add'>+0x00, 0xC8, 0x01, 0x14, 0x03, 0x90, 0x28, 0x40, 0x13, 0x00, 0xD9, 0x00, 0x06,</div><div class='add'>+0x03, 0x10, 0x8C, 0x40, 0x5F, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04,</div><div class='add'>+0x02, 0x50, 0x00, 0xE1, 0x01, 0xA4, 0x07, 0xD0, 0x16, 0x60, 0x7A, 0x20, 0xED,</div><div class='add'>+0x01, 0xB4, 0x03, 0x90, 0x1E, 0x40, 0x40, 0x00, 0xE1, 0x41, 0xB6, 0x0D, 0x94,</div><div class='add'>+0x16, 0x42, 0x4A, 0x00, 0xC9, 0x01, 0x84, 0x05, 0x10, 0x1E, 0x40, 0x7B, 0x00,</div><div class='add'>+0xE9, 0x01, 0xB4, 0x27, 0xD0, 0x1A, 0x40, 0x5B, 0x00, 0xCD, 0x01, 0x16, 0x26,</div><div class='add'>+0x90, 0x9A, 0x40, 0x3F, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x18,</div><div class='add'>+0x30, 0x02, 0x01, 0x00, 0x0D, 0x01, 0xF0, 0x8D, 0xC0, 0x30, 0x04, 0xCD, 0x30,</div><div class='add'>+0x7C, 0x23, 0x10, 0x08, 0xC0, 0x00, 0x01, 0x0B, 0x00, 0x7C, 0x0B, 0x30, 0x88,</div><div class='add'>+0xC0, 0x12, 0x02, 0xC3, 0x00, 0x5C, 0x22, 0x32, 0x0C, 0xC1, 0x23, 0x00, 0xC9,</div><div class='add'>+0x08, 0x7C, 0x03, 0x30, 0x08, 0xC0, 0x23, 0x00, 0xCF, 0x00, 0x0C, 0x03, 0x30,</div><div class='add'>+0x04, 0xC0, 0x4B, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xB8, 0x1D,</div><div class='add'>+0x14, 0x7F, 0x00, 0xDD, 0x01, 0xF2, 0x87, 0xD0, 0x3D, 0x00, 0xFF, 0x08, 0xFC,</div><div class='add'>+0x13, 0x70, 0x0F, 0xC0, 0x0F, 0x00, 0xFF, 0x00, 0xFC, 0x01, 0x70, 0x0F, 0xC8,</div><div class='add'>+0x1D, 0x40, 0xFF, 0x10, 0xFC, 0x00, 0xF0, 0x0F, 0xC0, 0xAB, 0x42, 0xF7, 0x20,</div><div class='add'>+0xFC, 0x03, 0x70, 0x0B, 0xC8, 0x2F, 0x12, 0xFC, 0x00, 0xFC, 0x02, 0xF0, 0x03,</div><div class='add'>+0xC0, 0x0B, 0x60, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xA0, 0x27, 0x00,</div><div class='add'>+0xDF, 0x00, 0x4E, 0x03, 0x31, 0x0D, 0xC0, 0x17, 0x00, 0x5F, 0x01, 0xCC, 0x03,</div><div class='add'>+0xF0, 0x0D, 0xC0, 0x04, 0x00, 0xD3, 0x00, 0x7C, 0x02, 0xF0, 0x0D, 0xC0, 0x1F,</div><div class='add'>+0x20, 0xDF, 0x06, 0x5C, 0x00, 0xF0, 0x2D, 0xC1, 0xB6, 0x00, 0xD3, 0x00, 0x7C,</div><div class='add'>+0x03, 0xA8, 0x1D, 0xC0, 0x15, 0x00, 0xDF, 0x06, 0x4D, 0x01, 0x30, 0x1D, 0xC0,</div><div class='add'>+0x54, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x80, 0x29, 0x09, 0xED,</div><div class='add'>+0x20, 0xC4, 0x03, 0x10, 0x0E, 0x40, 0x3B, 0x00, 0xFD, 0x00, 0x84, 0x07, 0xD0,</div><div class='add'>+0x0C, 0x40, 0x08, 0x00, 0xE1, 0x00, 0xB4, 0x03, 0xD8, 0x0E, 0x40, 0x3B, 0x08,</div><div class='add'>+0xFD, 0x10, 0xAC, 0x00, 0xD0, 0x2E, 0x44, 0x3B, 0x00, 0xE1, 0x02, 0xF4, 0x03,</div><div class='add'>+0x10, 0x0E, 0x40, 0x18, 0x00, 0xED, 0x16, 0xC4, 0x02, 0xB0, 0x0A, 0xC0, 0x4E,</div><div class='add'>+0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0xF9, 0x00, 0xED, 0x81,</div><div class='add'>+0x84, 0x07, 0x11, 0x1E, 0x48, 0xFB, 0x08, 0xED, 0x11, 0x84, 0x07, 0xD0, 0x1E,</div><div class='add'>+0x40, 0x48, 0x00, 0xE1, 0x01, 0xB4, 0x07, 0xD0, 0x1E, 0x41, 0xFB, 0x00, 0xED,</div><div class='add'>+0x05, 0x94, 0x44, 0xD9, 0x5E, 0x40, 0x73, 0x00, 0xE5, 0x05, 0xB4, 0x07, 0x90,</div><div class='add'>+0x1C, 0x44, 0x79, 0x00, 0xED, 0x41, 0x84, 0x07, 0x10, 0x14, 0x40, 0x04, 0x00,</div><div class='add'>+0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16, 0x28, 0xB3, 0x04, 0xCD, 0x02, 0x05,</div><div class='add'>+0x83, 0x12, 0x6C, 0x60, 0x73, 0x10, 0xCD, 0x03, 0x04, 0x03, 0xD0, 0x1C, 0x50,</div><div class='add'>+0x30, 0x02, 0xC1, 0x09, 0x34, 0x0B, 0xD0, 0x3C, 0x44, 0x73, 0x01, 0xCD, 0x40,</div><div class='add'>+0x24, 0x04, 0xD8, 0x0C, 0x40, 0x73, 0x80, 0xC5, 0x00, 0x34, 0x03, 0x10, 0x0C,</div><div class='add'>+0x42, 0x30, 0x00, 0xCD, 0x00, 0x24, 0x02, 0x90, 0x00, 0x50, 0x4A, 0x20, 0x0C,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x17, 0xA0, 0x5D, 0x00, 0x7F, 0x00, 0xCC, 0x05,</div><div class='add'>+0x30, 0x27, 0xC0, 0x1F, 0x00, 0x7F, 0x08, 0x4D, 0x01, 0xF0, 0x17, 0xC1, 0x5C,</div><div class='add'>+0x40, 0x73, 0x01, 0xFC, 0x01, 0xF0, 0x27, 0x40, 0x5F, 0x00, 0x5F, 0x00, 0xDC,</div><div class='add'>+0x01, 0xF0, 0x05, 0xC0, 0x56, 0x41, 0x57, 0x00, 0x7C, 0x01, 0xB0, 0x05, 0xC0,</div><div class='add'>+0x1D, 0x89, 0x5F, 0x00, 0x8C, 0x01, 0x30, 0x07, 0xC0, 0x5C, 0x20, 0x06, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x12, 0x08, 0x81, 0x08, 0x1F, 0x10, 0x7C, 0x24, 0xF4,</div><div class='add'>+0xA1, 0xC0, 0x07, 0x04, 0x1F, 0x00, 0x7C, 0x00, 0xF0, 0x01, 0xC4, 0x47, 0x08,</div><div class='add'>+0x1F, 0x26, 0x7C, 0x00, 0xF0, 0x41, 0xC2, 0x87, 0x00, 0x0F, 0x00, 0x7C, 0x00,</div><div class='add'>+0xF2, 0x00, 0xC0, 0x07, 0x00, 0x1B, 0x00, 0x7C, 0x00, 0x70, 0x01, 0xC0, 0x03,</div><div class='add'>+0x00, 0x1F, 0x00, 0x5C, 0x04, 0xF0, 0x01, 0xC0, 0x4B, 0x00, 0x0C, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x10, 0x08, 0x25, 0x00, 0x83, 0x00, 0x0C, 0x02, 0x30, 0x89,</div><div class='add'>+0xC0, 0x27, 0x00, 0x9F, 0x01, 0x7C, 0x02, 0xF0, 0x09, 0xD0, 0x60, 0x02, 0x93,</div><div class='add'>+0x01, 0x7C, 0x46, 0xF0, 0x59, 0xC0, 0x23, 0x00, 0x9B, 0x00, 0x4C, 0x42, 0xB0,</div><div class='add'>+0x09, 0xC0, 0x22, 0x01, 0x93, 0x00, 0x3C, 0x02, 0x90, 0x49, 0xC0, 0xA7, 0x40,</div><div class='add'>+0x93, 0x00, 0x4D, 0x02, 0x14, 0x09, 0xC0, 0x43, 0x20, 0x0C, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x01, 0x00, 0xE4, 0x21, 0x91, 0x00, 0x44, 0x0E, 0x14, 0x29, 0xC0,</div><div class='add'>+0x25, 0x02, 0x9D, 0x1B, 0x74, 0x02, 0xD0, 0x09, 0xC0, 0x24, 0x00, 0x95, 0x12,</div><div class='add'>+0x5C, 0x22, 0xD2, 0x19, 0x40, 0x67, 0x00, 0x91, 0x80, 0x44, 0x02, 0x10, 0x29,</div><div class='add'>+0x41, 0x64, 0x00, 0x91, 0x00, 0x74, 0x02, 0x50, 0x39, 0x41, 0x67, 0x00, 0x91,</div><div class='add'>+0x02, 0x44, 0x02, 0x10, 0x09, 0x40, 0x07, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x18, 0xA0, 0x64, 0x00, 0x91, 0x00, 0x44, 0x22, 0x10, 0x09, 0x41, 0x27,</div><div class='add'>+0x00, 0x9D, 0x00, 0x74, 0x02, 0xD0, 0x08, 0x40, 0x24, 0x00, 0x99, 0x08, 0x74,</div><div class='add'>+0x02, 0xD0, 0x09, 0x40, 0x27, 0x01, 0x99, 0x00, 0x04, 0x82, 0x94, 0x09, 0x40,</div><div class='add'>+0x26, 0x00, 0x95, 0x00, 0x74, 0x02, 0x50, 0x09, 0x40, 0x27, 0x20, 0x89, 0x42,</div><div class='add'>+0x44, 0x02, 0x50, 0x09, 0x40, 0x63, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x10, 0x20, 0x20, 0x01, 0x81, 0x04, 0x04, 0x12, 0x10, 0x08, 0x40, 0x21, 0x82,</div><div class='add'>+0x8D, 0x10, 0x34, 0x12, 0xD0, 0x58, 0x40, 0x20, 0x01, 0x8D, 0x10, 0x14, 0x42,</div><div class='add'>+0xD0, 0x78, 0x41, 0x33, 0x06, 0x81, 0x00, 0x04, 0x02, 0x10, 0x48, 0x40, 0x20,</div><div class='add'>+0x01, 0x85, 0x04, 0x34, 0x52, 0x59, 0x48, 0x40, 0x23, 0x01, 0x89, 0x04, 0x44,</div><div class='add'>+0x12, 0x50, 0x48, 0x40, 0x43, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1D,</div><div class='add'>+0xB8, 0x86, 0x42, 0x03, 0x0A, 0x45, 0x31, 0x30, 0xE1, 0x40, 0x97, 0x04, 0x1F,</div><div class='add'>+0x08, 0x7C, 0x28, 0xF0, 0xA1, 0xC0, 0x80, 0x02, 0x1B, 0x06, 0x7C, 0x19, 0xF0,</div><div class='add'>+0x21, 0xC0, 0x87, 0x01, 0x1B, 0x1E, 0x4C, 0x28, 0xB1, 0xA1, 0xC0, 0x06, 0x40,</div><div class='add'>+0x17, 0x00, 0x7C, 0x20, 0xF0, 0x01, 0x80, 0x07, 0x00, 0x0B, 0x0A, 0x4C, 0x28,</div><div class='add'>+0x70, 0x01, 0xC0, 0x77, 0xC0, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xB8,</div><div class='add'>+0x2F, 0x0A, 0xBF, 0x08, 0xFC, 0x0A, 0xF2, 0xCB, 0xC0, 0x2D, 0x00, 0xBF, 0x00,</div><div class='add'>+0x7C, 0x22, 0xF0, 0x8B, 0xC8, 0x2D, 0x02, 0xB7, 0x14, 0xDC, 0x52, 0xF0, 0x0B,</div><div class='add'>+0xC2, 0x3F, 0x00, 0x9F, 0x00, 0xFD, 0x83, 0xF0, 0x89, 0xC0, 0x2F, 0x02, 0x9B,</div><div class='add'>+0x08, 0x7C, 0x02, 0x70, 0x8B, 0xC8, 0x2E, 0x02, 0x97, 0x08, 0xFC, 0x22, 0xB0,</div><div class='add'>+0x8B, 0xC0, 0x67, 0x60, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xA8, 0x2F,</div><div class='add'>+0x05, 0xD3, 0x4C, 0xCC, 0x02, 0xF1, 0x0B, 0xC0, 0x2F, 0x02, 0xB3, 0x04, 0xFC,</div><div class='add'>+0x52, 0x30, 0xCB, 0xC0, 0x2C, 0x00, 0xB3, 0x00, 0xCC, 0x22, 0xF0, 0x4B, 0xC0,</div><div class='add'>+0x2D, 0x05, 0x9F, 0x0C, 0x5C, 0x02, 0xB0, 0x0B, 0xC0, 0x2C, 0x00, 0xB3, 0x05,</div><div class='add'>+0x5C, 0x16, 0xB0, 0x0F, 0xC0, 0x2C, 0x00, 0xBF, 0x80, 0xCD, 0x02, 0x31, 0x0B,</div><div class='add'>+0xC0, 0x64, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x07, 0x01,</div><div class='add'>+0x11, 0x0C, 0x45, 0x48, 0xD0, 0x01, 0x41, 0x07, 0x02, 0x11, 0x54, 0x74, 0x00,</div><div class='add'>+0x38, 0xC1, 0xC0, 0x90, 0x04, 0x11, 0x10, 0x44, 0x20, 0xD2, 0x41, 0x41, 0x07,</div><div class='add'>+0x21, 0x1D, 0x0C, 0x44, 0x40, 0x40, 0x01, 0x41, 0x04, 0x02, 0x1B, 0x00, 0x70,</div><div class='add'>+0x54, 0x10, 0x01, 0xC0, 0x96, 0x00, 0x03, 0x10, 0x45, 0x20, 0x50, 0x01, 0x40,</div><div class='add'>+0x71, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x21, 0x05, 0x81,</div><div class='add'>+0x04, 0x04, 0x32, 0xD0, 0x88, 0x60, 0x23, 0x00, 0x81, 0x2C, 0x36, 0x02, 0x18,</div><div class='add'>+0x4C, 0x62, 0x21, 0x4B, 0x80, 0x08, 0x24, 0x02, 0xD0, 0xC8, 0x40, 0x21, 0x2D,</div><div class='add'>+0x8D, 0x44, 0x74, 0x12, 0x80, 0x88, 0x50, 0x20, 0x00, 0x85, 0x02, 0x14, 0x0A,</div><div class='add'>+0x50, 0x0C, 0x48, 0x22, 0x12, 0x8D, 0x08, 0x24, 0x02, 0x10, 0x08, 0x40, 0x48,</div><div class='add'>+0x80, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x28, 0x25, 0x00, 0x91, 0x82,</div><div class='add'>+0x44, 0x42, 0xD0, 0x0D, 0x40, 0x27, 0x05, 0x91, 0x00, 0x74, 0x02, 0x10, 0x49,</div><div class='add'>+0x40, 0x25, 0x01, 0xD1, 0x00, 0x64, 0x02, 0xD0, 0x09, 0x40, 0x27, 0x02, 0x8D,</div><div class='add'>+0x00, 0x64, 0x02, 0x10, 0x08, 0x40, 0x24, 0x01, 0x9D, 0x00, 0x74, 0x02, 0x50,</div><div class='add'>+0x0D, 0x40, 0x26, 0x00, 0x91, 0x00, 0x64, 0x02, 0x50, 0x29, 0x40, 0x61, 0x20,</div><div class='add'>+0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x28, 0x25, 0x42, 0x93, 0x00, 0x4D,</div><div class='add'>+0x02, 0xF0, 0x79, 0xC0, 0x67, 0x40, 0x93, 0x11, 0x7C, 0x02, 0x34, 0x39, 0xC1,</div><div class='add'>+0x25, 0x00, 0x93, 0x10, 0x6D, 0x4E, 0xF0, 0x69, 0xC0, 0xE5, 0x00, 0x9F, 0x00,</div><div class='add'>+0x7C, 0x8A, 0xB0, 0x09, 0xC0, 0x64, 0x00, 0x97, 0x00, 0x5C, 0x02, 0x70, 0x09,</div><div class='add'>+0xC0, 0xA6, 0x00, 0x9F, 0x00, 0x6D, 0x1A, 0x30, 0x29, 0xC0, 0x14, 0xA0, 0x04,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x16, 0x00, 0x65, 0x00, 0x9F, 0x20, 0x7C, 0x26,</div><div class='add'>+0xF0, 0x49, 0xC0, 0x27, 0x00, 0x9F, 0x04, 0x3C, 0x02, 0xF0, 0x19, 0xD0, 0x24,</div><div class='add'>+0x00, 0x9F, 0x00, 0x4C, 0x26, 0xF0, 0x09, 0xC0, 0x67, 0x84, 0x9F, 0x00, 0x5C,</div><div class='add'>+0x22, 0x70, 0x09, 0xC0, 0x67, 0x08, 0x9B, 0x00, 0x7C, 0x02, 0x34, 0x09, 0xC0,</div><div class='add'>+0x67, 0x82, 0x9F, 0x00, 0x5D, 0x02, 0xF0, 0x09, 0xC0, 0x5B, 0x00, 0x06, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x14, 0x08, 0x01, 0x00, 0x0F, 0x00, 0x4E, 0x48, 0xF2,</div><div class='add'>+0x41, 0xE4, 0x87, 0x01, 0x1F, 0x08, 0x7C, 0x80, 0x70, 0x00, 0xC0, 0x84, 0x00,</div><div class='add'>+0x13, 0x01, 0x7C, 0x00, 0xF8, 0x21, 0xC4, 0x87, 0x08, 0x1F, 0x00, 0x5C, 0x08,</div><div class='add'>+0xF0, 0x01, 0xC0, 0x03, 0x00, 0x1F, 0x00, 0x7C, 0x00, 0xF0, 0x41, 0xC0, 0x87,</div><div class='add'>+0x40, 0x13, 0x00, 0x0C, 0x00, 0xF0, 0xA0, 0xC0, 0x50, 0x20, 0x04, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x10, 0x00, 0x1C, 0x00, 0x5D, 0x20, 0xC6, 0x1D, 0x70, 0x27,</div><div class='add'>+0x40, 0x5F, 0x04, 0x7D, 0x08, 0x74, 0x15, 0xD0, 0x27, 0xC0, 0x14, 0x00, 0x71,</div><div class='add'>+0x00, 0xDC, 0x09, 0xF0, 0x37, 0x60, 0x9F, 0x00, 0x5D, 0x00, 0x04, 0x01, 0x30,</div><div class='add'>+0x47, 0x40, 0x17, 0x40, 0x52, 0x00, 0x5C, 0x01, 0xD0, 0x26, 0x40, 0x17, 0x04,</div><div class='add'>+0x74, 0x82, 0x44, 0x01, 0xD0, 0x05, 0x40, 0x50, 0x00, 0x02, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x10, 0xA0, 0xF2, 0x04, 0xCD, 0x00, 0x24, 0x0F, 0x50, 0x8C, 0x40,</div><div class='add'>+0x77, 0x00, 0xCD, 0x03, 0x34, 0x03, 0xD0, 0x2C, 0x41, 0x36, 0x00, 0xD1, 0x20,</div><div class='add'>+0x34, 0x47, 0xD2, 0x0C, 0x41, 0xB3, 0x00, 0xCD, 0x00, 0x14, 0x03, 0x50, 0x1C,</div><div class='add'>+0x40, 0x23, 0x08, 0x88, 0x20, 0x74, 0x03, 0xD0, 0x20, 0x60, 0x63, 0x00, 0x90,</div><div class='add'>+0x12, 0x05, 0x03, 0xD0, 0x1C, 0x40, 0x50, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x04, 0x80, 0xA8, 0x10, 0xED, 0x00, 0xA4, 0x01, 0x50, 0x0E, 0x40, 0x3B,</div><div class='add'>+0x20, 0xED, 0x00, 0xB4, 0x03, 0xD0, 0x0B, 0x60, 0x28, 0x00, 0xE1, 0x00, 0x94,</div><div class='add'>+0x09, 0x10, 0x0E, 0x41, 0x9B, 0x08, 0xCD, 0x04, 0xC4, 0x13, 0x12, 0x06, 0x40,</div><div class='add'>+0x2B, 0x00, 0xE9, 0x00, 0xB6, 0x03, 0xD0, 0x06, 0x40, 0x63, 0x00, 0xE5, 0x00,</div><div class='add'>+0x84, 0x02, 0xD0, 0x0E, 0x60, 0x14, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x14, 0x18, 0x48, 0x10, 0xFF, 0x01, 0xA5, 0x07, 0x70, 0x1E, 0x40, 0x5B, 0x00,</div><div class='add'>+0xED, 0x01, 0xBC, 0x87, 0xF0, 0x16, 0xC0, 0x7A, 0x42, 0xE1, 0x01, 0xBC, 0x07,</div><div class='add'>+0xD0, 0x16, 0x40, 0x7B, 0x00, 0xEF, 0x09, 0x9D, 0x5F, 0x70, 0x16, 0xE4, 0x73,</div><div class='add'>+0x00, 0xAB, 0x01, 0xBC, 0x07, 0xF0, 0x12, 0x80, 0x7B, 0x00, 0x21, 0x01, 0x8C,</div><div class='add'>+0x07, 0xF0, 0x1E, 0xD0, 0x54, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10,</div><div class='add'>+0xB8, 0x05, 0x00, 0xDF, 0x16, 0x5C, 0x01, 0x70, 0x0D, 0xC0, 0x17, 0x00, 0xDF,</div><div class='add'>+0x00, 0x7C, 0x03, 0xA1, 0x42, 0xD1, 0x37, 0x20, 0x1F, 0x00, 0x7C, 0x01, 0xF0,</div><div class='add'>+0x05, 0xC0, 0x27, 0x00, 0xDF, 0x08, 0x3C, 0x1B, 0x70, 0x05, 0xC0, 0x37, 0x40,</div><div class='add'>+0xD3, 0x00, 0x5C, 0x83, 0xF0, 0x0D, 0x80, 0x37, 0x00, 0x5B, 0x20, 0x7C, 0x02,</div><div class='add'>+0xF0, 0x0C, 0xC0, 0x43, 0x60, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x20,</div><div class='add'>+0x4D, 0x00, 0xF7, 0x31, 0xCC, 0x13, 0xF0, 0x97, 0xC0, 0x7C, 0x00, 0xFF, 0x01,</div><div class='add'>+0xFC, 0x06, 0xB0, 0x9F, 0xC0, 0x7C, 0x00, 0x73, 0x09, 0xFC, 0x27, 0xF0, 0x1F,</div><div class='add'>+0xC0, 0x7F, 0x00, 0xFF, 0x81, 0xCC, 0x07, 0x70, 0x9F, 0xC0, 0x6C, 0x40, 0xB7,</div><div class='add'>+0x41, 0xCC, 0x07, 0xB0, 0x1A, 0xC0, 0x6C, 0x20, 0xBF, 0x21, 0xCC, 0x07, 0xF0,</div><div class='add'>+0x1B, 0xC0, 0x0B, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x00, 0x0D,</div><div class='add'>+0x00, 0xEB, 0x00, 0x84, 0x03, 0xD0, 0x8E, 0x40, 0x38, 0x00, 0xED, 0x00, 0xB4,</div><div class='add'>+0x22, 0xD0, 0xC6, 0x50, 0x28, 0x30, 0x60, 0x18, 0x9C, 0x23, 0xD0, 0x0E, 0xC0,</div><div class='add'>+0x39, 0x02, 0xED, 0x04, 0x84, 0x13, 0x40, 0x03, 0xC0, 0x2A, 0x00, 0xE5, 0x00,</div><div class='add'>+0xAC, 0x23, 0x10, 0x0E, 0xC2, 0x2A, 0x00, 0xE9, 0x00, 0x85, 0x42, 0xD0, 0x0E,</div><div class='add'>+0x40, 0x57, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00,</div><div class='add'>+0xE5, 0x10, 0x84, 0x23, 0xD0, 0x06, 0x42, 0x18, 0x04, 0x6D, 0x00, 0xB4, 0x02,</div><div class='add'>+0xD0, 0x06, 0x42, 0x38, 0x00, 0x61, 0x80, 0xB4, 0x02, 0xD0, 0x8A, 0x40, 0xBB,</div><div class='add'>+0x00, 0xED, 0x20, 0xC4, 0x4B, 0x42, 0x06, 0x40, 0x32, 0x00, 0xA5, 0x00, 0xA4,</div><div class='add'>+0x03, 0x90, 0x02, 0x40, 0x28, 0x00, 0xA5, 0x08, 0xA4, 0x03, 0xD0, 0x0A, 0x40,</div><div class='add'>+0x63, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x28, 0x01, 0x00, 0xD1,</div><div class='add'>+0x01, 0x04, 0x02, 0xD0, 0x28, 0x50, 0x80, 0x04, 0x8D, 0x47, 0x34, 0x02, 0xD0,</div><div class='add'>+0x05, 0x58, 0x34, 0x42, 0x01, 0x91, 0x14, 0xCE, 0xD0, 0x39, 0x40, 0x01, 0x20,</div><div class='add'>+0xCD, 0x00, 0x04, 0x07, 0x00, 0x00, 0x40, 0x32, 0x40, 0xC5, 0x00, 0x24, 0x03,</div><div class='add'>+0x10, 0x0C, 0x40, 0x22, 0x00, 0xC9, 0x00, 0x24, 0x0E, 0xD0, 0x8C, 0x40, 0x1B,</div><div class='add'>+0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0xA0, 0x05, 0x06, 0xF5, 0x20,</div><div class='add'>+0x4C, 0x02, 0xF0, 0xB9, 0xC1, 0xA4, 0x00, 0x1F, 0x05, 0x74, 0x82, 0xB0, 0x09,</div><div class='add'>+0xC0, 0x74, 0x00, 0x93, 0x03, 0x7C, 0x42, 0xD0, 0x39, 0xC1, 0xB7, 0x00, 0xFF,</div><div class='add'>+0x00, 0xCC, 0x07, 0x70, 0x05, 0xC0, 0x26, 0x40, 0x85, 0x00, 0xEC, 0x03, 0xB0,</div><div class='add'>+0x01, 0xC8, 0x24, 0x00, 0x57, 0x80, 0x6C, 0x0E, 0xF0, 0x0D, 0xC0, 0x57, 0x20,</div><div class='add'>+0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x08, 0x07, 0x20, 0xDF, 0x00, 0x7C,</div><div class='add'>+0x28, 0xF0, 0x21, 0xC0, 0x87, 0x00, 0x1F, 0x00, 0x7C, 0x02, 0xF2, 0x19, 0xC0,</div><div class='add'>+0x27, 0x04, 0x9F, 0x02, 0x7C, 0x00, 0xF0, 0x41, 0xC0, 0x17, 0x00, 0xCF, 0x00,</div><div class='add'>+0x7D, 0x03, 0xF0, 0x05, 0xC0, 0x23, 0x40, 0x9E, 0x00, 0x7C, 0x03, 0xF0, 0x01,</div><div class='add'>+0xC0, 0x27, 0x00, 0x5C, 0x00, 0x1C, 0x02, 0xF0, 0x0D, 0xC0, 0x27, 0x00, 0x0C,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x08, 0x0B, 0x00, 0xFB, 0x00, 0xCC, 0x42,</div><div class='add'>+0xF0, 0x09, 0xC0, 0x2B, 0x00, 0xB3, 0x00, 0xFC, 0x02, 0xF0, 0x01, 0xC0, 0x34,</div><div class='add'>+0x00, 0xB3, 0x00, 0xB4, 0x00, 0x30, 0x03, 0xC0, 0x3C, 0x00, 0xDF, 0x00, 0xCC,</div><div class='add'>+0x03, 0xF0, 0x06, 0xC0, 0xEC, 0x00, 0x93, 0x08, 0x0C, 0x03, 0x34, 0x53, 0x40,</div><div class='add'>+0x38, 0x00, 0xE3, 0xC0, 0xCC, 0x56, 0x31, 0x0F, 0xC0, 0x07, 0x20, 0x0C, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x81, 0x20, 0xC6, 0x01, 0xD1, 0x00, 0x44, 0x14, 0xD0,</div><div class='add'>+0x39, 0x40, 0x47, 0x01, 0x91, 0x01, 0x74, 0x02, 0xC8, 0x11, 0x50, 0x34, 0x00,</div><div class='add'>+0x1F, 0x83, 0x74, 0x0C, 0x12, 0x31, 0x44, 0xC4, 0x0C, 0xDF, 0x00, 0x54, 0x03,</div><div class='add'>+0xF0, 0x25, 0x44, 0x24, 0x00, 0x91, 0x01, 0x45, 0x03, 0xB0, 0x04, 0x40, 0x35,</div><div class='add'>+0x00, 0xD3, 0x03, 0x54, 0x02, 0x10, 0x0D, 0x40, 0x07, 0x00, 0x08, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x01, 0xA0, 0x46, 0x40, 0xD1, 0x00, 0x44, 0x04, 0xD0, 0x11,</div><div class='add'>+0x40, 0x67, 0x00, 0x11, 0x11, 0x76, 0x06, 0xD1, 0x19, 0x54, 0x34, 0x00, 0x91,</div><div class='add'>+0x01, 0x76, 0x46, 0x10, 0x39, 0x60, 0x64, 0x10, 0xDD, 0x40, 0x44, 0x03, 0xD0,</div><div class='add'>+0x25, 0x40, 0x24, 0x18, 0x91, 0x40, 0x54, 0x03, 0x10, 0x0D, 0x40, 0x25, 0x40,</div><div class='add'>+0xD1, 0x0A, 0x44, 0x02, 0x10, 0x09, 0x40, 0x07, 0x00, 0x02, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x10, 0x20, 0x00, 0x00, 0xC1, 0x40, 0x04, 0x00, 0xD0, 0x00, 0x42,</div><div class='add'>+0x23, 0x00, 0x01, 0x00, 0x34, 0x02, 0xD0, 0x00, 0x40, 0x20, 0x00, 0x81, 0x00,</div><div class='add'>+0x34, 0x02, 0x10, 0x00, 0x70, 0x00, 0x00, 0xC5, 0x00, 0x14, 0x03, 0x10, 0x00,</div><div class='add'>+0x50, 0x20, 0x20, 0x81, 0x00, 0x14, 0x03, 0x90, 0x0C, 0x48, 0x21, 0x00, 0xC9,</div><div class='add'>+0x80, 0x14, 0x02, 0x10, 0x0C, 0x4C, 0x43, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x18, 0x06, 0x00, 0xE3, 0x00, 0x4C, 0x02, 0xD0, 0x01, 0xC2, 0x27,</div><div class='add'>+0x00, 0x13, 0x00, 0x7E, 0x02, 0xC0, 0x03, 0xC0, 0x3C, 0x40, 0x91, 0x00, 0x7C,</div><div class='add'>+0x00, 0x38, 0x09, 0xC0, 0x24, 0x00, 0xFC, 0x00, 0xCC, 0x83, 0xD0, 0x05, 0xC0,</div><div class='add'>+0x24, 0x40, 0x93, 0x40, 0x5C, 0x03, 0x10, 0x09, 0xC0, 0x25, 0x00, 0xC3, 0x80,</div><div class='add'>+0x4C, 0x02, 0x34, 0x09, 0xC0, 0x07, 0x80, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x05, 0xB8, 0x0D, 0x00, 0xF7, 0x00, 0xFC, 0x02, 0xF0, 0x0B, 0xC0, 0x2F, 0x40,</div><div class='add'>+0xBF, 0x00, 0xFC, 0x02, 0xF0, 0x03, 0xC0, 0x3F, 0x00, 0x3F, 0x00, 0xFC, 0x00,</div><div class='add'>+0xF0, 0x03, 0xC4, 0x0F, 0x00, 0xFF, 0x00, 0xB8, 0x03, 0xF0, 0x03, 0xC4, 0x2F,</div><div class='add'>+0x40, 0xBF, 0x00, 0xEC, 0x03, 0x70, 0x0F, 0xC0, 0x2F, 0x00, 0xF7, 0x00, 0xFC,</div><div class='add'>+0x02, 0xF0, 0x0F, 0xC0, 0x17, 0xE0, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03,</div><div class='add'>+0x80, 0x7F, 0x00, 0xBF, 0x20, 0xCC, 0x13, 0x70, 0x1F, 0xC0, 0x7F, 0x02, 0xF3,</div><div class='add'>+0x01, 0xCC, 0x07, 0x30, 0x1F, 0xC0, 0x7B, 0x00, 0xFF, 0x01, 0x8C, 0x07, 0x30,</div><div class='add'>+0x1F, 0xC0, 0x7D, 0x00, 0xF3, 0x01, 0xCC, 0x07, 0x30, 0x1F, 0xC0, 0x7F, 0x00,</div><div class='add'>+0xF3, 0x03, 0xEC, 0x07, 0xB0, 0x16, 0xC0, 0x5C, 0x00, 0x2B, 0x01, 0xEC, 0x05,</div><div class='add'>+0x30, 0x0B, 0xC0, 0x0C, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x08,</div><div class='add'>+0x37, 0x00, 0x9D, 0x00, 0xEC, 0x0B, 0x10, 0x01, 0x40, 0x07, 0x01, 0x11, 0x00,</div><div class='add'>+0x44, 0x00, 0x14, 0x01, 0x40, 0x07, 0x00, 0x1D, 0x20, 0x40, 0x00, 0x10, 0x01,</div><div class='add'>+0x40, 0x04, 0x00, 0x13, 0x00, 0x44, 0x00, 0x10, 0x01, 0x40, 0x07, 0x00, 0x11,</div><div class='add'>+0x84, 0x4C, 0x04, 0x52, 0x1D, 0x40, 0x55, 0x00, 0x11, 0x01, 0x54, 0x03, 0xB4,</div><div class='add'>+0x01, 0x40, 0x0D, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0xA0, 0x33,</div><div class='add'>+0x00, 0x8D, 0x00, 0x04, 0x23, 0xD0, 0x0C, 0x60, 0x33, 0x01, 0xC1, 0x00, 0x44,</div><div class='add'>+0x83, 0x10, 0x0C, 0x40, 0x33, 0x00, 0xDD, 0x00, 0x04, 0x03, 0x10, 0x0D, 0x48,</div><div class='add'>+0x34, 0x80, 0xC1, 0x00, 0x44, 0x03, 0x10, 0x0C, 0x40, 0x35, 0x00, 0xC1, 0x04,</div><div class='add'>+0x64, 0x03, 0x10, 0x04, 0x44, 0x16, 0x80, 0x59, 0x00, 0x66, 0x83, 0x5C, 0x00,</div><div class='add'>+0x44, 0x4C, 0x80, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xA8, 0x35, 0x00,</div><div class='add'>+0x9D, 0x21, 0x44, 0x03, 0x91, 0x01, 0x60, 0x03, 0x00, 0x11, 0x00, 0x60, 0x00,</div><div class='add'>+0x10, 0x01, 0x40, 0x07, 0x00, 0x1D, 0x00, 0x44, 0x00, 0x10, 0x01, 0x40, 0x04,</div><div class='add'>+0x80, 0x19, 0x20, 0x44, 0x00, 0x10, 0x01, 0x40, 0x06, 0x00, 0x11, 0x00, 0x44,</div><div class='add'>+0x00, 0x50, 0x1D, 0x4C, 0x17, 0x04, 0x51, 0x10, 0x54, 0x0B, 0xDC, 0x11, 0x40,</div><div class='add'>+0x0D, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xA8, 0x37, 0x00, 0x1F,</div><div class='add'>+0x33, 0x44, 0x03, 0xD0, 0x0D, 0xC0, 0x37, 0x10, 0xD3, 0x00, 0x4C, 0x03, 0x30,</div><div class='add'>+0x0D, 0xC0, 0x37, 0x00, 0xDD, 0x00, 0x4D, 0x03, 0x34, 0x0C, 0xC0, 0x30, 0x00,</div><div class='add'>+0xD3, 0x20, 0x0C, 0x03, 0x10, 0x0D, 0xC0, 0x31, 0x00, 0xD3, 0x00, 0x2C, 0x03,</div><div class='add'>+0xB0, 0x18, 0xC0, 0x92, 0x00, 0x9B, 0x01, 0x2C, 0x0B, 0x70, 0x59, 0xC2, 0x00,</div><div class='add'>+0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x80, 0x3D, 0x10, 0xAF, 0x00,</div><div class='add'>+0xFC, 0x03, 0x72, 0x03, 0xCB, 0x0F, 0x00, 0x3F, 0x00, 0xDC, 0x00, 0xF0, 0x03,</div><div class='add'>+0xC0, 0x0F, 0x00, 0x3F, 0x00, 0xFC, 0x00, 0xF0, 0x03, 0xC8, 0x0E, 0x04, 0x37,</div><div class='add'>+0x00, 0xFC, 0x00, 0xF0, 0x03, 0xC0, 0x0F, 0x04, 0x3F, 0x00, 0xFC, 0x00, 0xF0,</div><div class='add'>+0x0F, 0xC0, 0x8D, 0x10, 0xBF, 0x08, 0xFC, 0x23, 0xB0, 0x09, 0xC0, 0x3F, 0x20,</div><div class='add'>+0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x08, 0x35, 0x06, 0x1F, 0x00, 0x7C,</div><div class='add'>+0x03, 0xF0, 0x0D, 0xC0, 0x34, 0x00, 0xDF, 0x01, 0x7C, 0x43, 0xF0, 0x0D, 0xC0,</div><div class='add'>+0x34, 0x1B, 0xD3, 0x00, 0x4C, 0x47, 0x30, 0x1D, 0xC0, 0x77, 0x00, 0xD7, 0x01,</div><div class='add'>+0x7C, 0x47, 0xF0, 0x0D, 0xC0, 0x34, 0x02, 0xDF, 0x00, 0x4D, 0x43, 0x30, 0x0D,</div><div class='add'>+0xC0, 0x35, 0x00, 0x9F, 0x06, 0x4C, 0x0B, 0x30, 0x01, 0xC0, 0x29, 0x20, 0x04,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0xA0, 0x74, 0x10, 0x9D, 0x08, 0xF4, 0x03,</div><div class='add'>+0xD1, 0x21, 0x40, 0x04, 0x00, 0x1D, 0x03, 0x1C, 0x00, 0xD0, 0x81, 0x40, 0xC4,</div><div class='add'>+0x00, 0x01, 0x00, 0x44, 0x0C, 0x12, 0x31, 0x40, 0x47, 0x00, 0x15, 0x03, 0x74,</div><div class='add'>+0x04, 0xD0, 0x21, 0x40, 0x44, 0x00, 0x1D, 0x0B, 0x46, 0x40, 0xB2, 0xAD, 0x48,</div><div class='add'>+0xC4, 0x22, 0x8B, 0x07, 0x6C, 0x0B, 0xA0, 0x91, 0xC0, 0x4C, 0x00, 0x02, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x07, 0xA0, 0xF2, 0x00, 0x0D, 0x09, 0x74, 0x17, 0xD0,</div><div class='add'>+0x0C, 0x40, 0x32, 0x00, 0xDD, 0x04, 0x34, 0x0B, 0xD0, 0x2C, 0x40, 0xF0, 0x00,</div><div class='add'>+0xC1, 0x0C, 0x54, 0x03, 0x14, 0x4C, 0x40, 0x33, 0x00, 0xD9, 0x04, 0x34, 0x0B,</div><div class='add'>+0xD0, 0x4C, 0x40, 0xB0, 0x20, 0xD9, 0x00, 0x04, 0x0B, 0x10, 0x24, 0x40, 0x53,</div><div class='add'>+0x00, 0xC1, 0x01, 0x24, 0x22, 0x90, 0x99, 0x40, 0x0F, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x04, 0x80, 0x78, 0x00, 0x6D, 0x01, 0xB4, 0x47, 0xD8, 0x13,</div><div class='add'>+0x40, 0x4A, 0x00, 0x2D, 0x01, 0xB4, 0x04, 0xD0, 0x12, 0x40, 0x4C, 0x00, 0x21,</div><div class='add'>+0x01, 0xC4, 0x04, 0x10, 0x12, 0x40, 0x4F, 0x00, 0x2D, 0x08, 0xB4, 0x00, 0xD0,</div><div class='add'>+0x12, 0x40, 0x48, 0x00, 0x2D, 0x31, 0x84, 0x04, 0x90, 0x9F, 0x44, 0x5E, 0x08,</div><div class='add'>+0x79, 0x21, 0xA4, 0x0F, 0x90, 0x12, 0x48, 0x3C, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x12, 0x10, 0x30, 0x00, 0xCF, 0x00, 0x3C, 0x23, 0xF0, 0x0C, 0xC0,</div><div class='add'>+0x32, 0x00, 0xCF, 0x00, 0x3C, 0x03, 0xF0, 0x0D, 0xC0, 0x30, 0x00, 0xD3, 0x00,</div><div class='add'>+0x1C, 0x03, 0x30, 0x0C, 0xC0, 0x37, 0x80, 0xC9, 0x00, 0x3C, 0x03, 0xD0, 0x0D,</div><div class='add'>+0x40, 0x30, 0x00, 0xDD, 0x00, 0x04, 0x23, 0x30, 0x04, 0xC0, 0x13, 0x14, 0xC3,</div><div class='add'>+0x00, 0x4C, 0x23, 0xB0, 0x88, 0xC6, 0x4B, 0x68, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x02, 0xB8, 0x3D, 0x00, 0xFF, 0x00, 0xFC, 0x83, 0xF0, 0x02, 0xC0, 0x0D,</div><div class='add'>+0x00, 0x3F, 0x00, 0xDC, 0x00, 0xF0, 0x03, 0xC0, 0x0F, 0x02, 0x3F, 0x08, 0x7C,</div><div class='add'>+0x00, 0xF0, 0x03, 0xC0, 0x0F, 0x00, 0x36, 0x08, 0xFC, 0x10, 0xF0, 0x01, 0x80,</div><div class='add'>+0x0F, 0x00, 0x3E, 0x00, 0xBC, 0x84, 0xF9, 0x0F, 0xC8, 0x19, 0x00, 0x7F, 0x00,</div><div class='add'>+0xFC, 0x23, 0xF0, 0x03, 0xC8, 0x0B, 0x60, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x15, 0xA0, 0x37, 0x10, 0x5F, 0x00, 0x7C, 0x03, 0xF0, 0x0D, 0xC0, 0x37, 0x00,</div><div class='add'>+0xDF, 0x00, 0x7C, 0x07, 0x34, 0x1D, 0xD0, 0x30, 0x00, 0xD3, 0x01, 0x4D, 0x03,</div><div class='add'>+0xF0, 0x0D, 0xC0, 0x37, 0x00, 0xDF, 0x00, 0x7C, 0x03, 0x70, 0x1D, 0xD0, 0x34,</div><div class='add'>+0x00, 0xD7, 0x00, 0x4C, 0x03, 0xF0, 0x1C, 0xD0, 0x54, 0x00, 0xD3, 0x00, 0x4C,</div><div class='add'>+0x03, 0xD1, 0x09, 0xC0, 0x43, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12,</div><div class='add'>+0x88, 0x39, 0x00, 0x6D, 0x00, 0xB4, 0x2B, 0xD0, 0x02, 0x40, 0x0B, 0x00, 0x2D,</div><div class='add'>+0x00, 0xF4, 0x00, 0x10, 0x03, 0x40, 0x08, 0x00, 0x31, 0x00, 0x84, 0x00, 0xD0,</div><div class='add'>+0x02, 0x40, 0x0B, 0x00, 0x2D, 0x00, 0xB4, 0x00, 0xD0, 0x03, 0x40, 0x08, 0x10,</div><div class='add'>+0x2D, 0x00, 0xA4, 0x00, 0xD0, 0x0E, 0x40, 0x18, 0x40, 0xE1, 0x00, 0x94, 0x03,</div><div class='add'>+0xD0, 0x0E, 0x40, 0x4F, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00,</div><div class='add'>+0x79, 0x00, 0xED, 0x03, 0xB4, 0x07, 0xD0, 0x1E, 0x40, 0x7B, 0x00, 0xED, 0x01,</div><div class='add'>+0xB4, 0x07, 0x10, 0x1E, 0x40, 0x7C, 0x00, 0xE1, 0x01, 0x84, 0x07, 0xD0, 0x1E,</div><div class='add'>+0x40, 0x7B, 0x00, 0xED, 0x01, 0xB4, 0x07, 0xD0, 0x1E, 0x40, 0x78, 0x00, 0xED,</div><div class='add'>+0x01, 0xA5, 0x07, 0xD0, 0x1F, 0x49, 0x58, 0x80, 0xF5, 0x01, 0x84, 0x07, 0xD0,</div><div class='add'>+0x1E, 0x42, 0x13, 0x08, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x28, 0x33,</div><div class='add'>+0x00, 0xDD, 0x01, 0x34, 0x03, 0xD0, 0x01, 0x40, 0x03, 0x00, 0x0D, 0x00, 0x34,</div><div class='add'>+0x00, 0x10, 0x00, 0x40, 0x04, 0x00, 0x01, 0x00, 0x04, 0x00, 0xD0, 0x00, 0x44,</div><div class='add'>+0x07, 0x00, 0x0D, 0x00, 0x34, 0x00, 0xD0, 0x00, 0x40, 0x00, 0x00, 0x0D, 0x00,</div><div class='add'>+0x24, 0x00, 0xD0, 0x5C, 0x44, 0xD0, 0x01, 0xC5, 0x13, 0x14, 0x4F, 0xD8, 0x5D,</div><div class='add'>+0x40, 0x5B, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x17, 0xA8, 0x15, 0x00,</div><div class='add'>+0x7F, 0x02, 0x7C, 0x01, 0xF0, 0x05, 0xC0, 0x17, 0x00, 0x5F, 0x00, 0x7C, 0x01,</div><div class='add'>+0x30, 0x05, 0xC0, 0x14, 0x50, 0x53, 0x00, 0x4C, 0x01, 0xF0, 0x05, 0xC0, 0x17,</div><div class='add'>+0x00, 0x5F, 0x00, 0x7C, 0x01, 0xF0, 0x05, 0xC0, 0x14, 0x00, 0x5F, 0x00, 0x44,</div><div class='add'>+0x01, 0xD0, 0x27, 0xC0, 0xDC, 0x00, 0x67, 0x07, 0x8C, 0x01, 0xF0, 0x57, 0x44,</div><div class='add'>+0x5F, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x87, 0x00, 0x1F,</div><div class='add'>+0x12, 0x7C, 0x00, 0xF2, 0x23, 0xC0, 0x0F, 0x00, 0x3F, 0x02, 0xFC, 0x00, 0xF0,</div><div class='add'>+0x03, 0xC8, 0x0F, 0x00, 0x3F, 0x00, 0xFC, 0x00, 0xF0, 0x23, 0xC0, 0x0F, 0x00,</div><div class='add'>+0x3F, 0x02, 0xFC, 0x80, 0xF3, 0x23, 0xC0, 0x8F, 0x00, 0x3F, 0x22, 0xDC, 0x00,</div><div class='add'>+0xF0, 0x01, 0xC0, 0x07, 0x02, 0x1B, 0x00, 0x7C, 0x20, 0xF0, 0x21, 0xC0, 0x4B,</div><div class='add'>+0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x08, 0x27, 0x00, 0x9F, 0x05,</div><div class='add'>+0x4C, 0x06, 0xF0, 0x99, 0xC0, 0x24, 0x00, 0x93, 0x05, 0x7C, 0x02, 0xF0, 0x09,</div><div class='add'>+0xC0, 0x67, 0x40, 0x93, 0x00, 0x7C, 0x02, 0xF0, 0x39, 0xC0, 0x67, 0x40, 0x93,</div><div class='add'>+0x00, 0x7C, 0x02, 0xF0, 0x09, 0xC0, 0x27, 0x00, 0x9F, 0x03, 0x4C, 0x22, 0xF0,</div><div class='add'>+0x49, 0xE0, 0xA7, 0x00, 0x9F, 0x00, 0x5E, 0x0A, 0x30, 0x09, 0xC0, 0x40, 0x20,</div><div class='add'>+0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x20, 0xA6, 0x04, 0x9D, 0x12, 0x44,</div><div class='add'>+0x02, 0xD0, 0x29, 0x41, 0x20, 0x00, 0x91, 0x00, 0x74, 0x0E, 0xD0, 0x19, 0x41,</div><div class='add'>+0x27, 0x00, 0x91, 0x03, 0x74, 0x02, 0xD0, 0x19, 0x40, 0x67, 0x00, 0x91, 0x02,</div><div class='add'>+0x74, 0x02, 0xD8, 0x39, 0x40, 0x27, 0x01, 0x9D, 0x00, 0x45, 0x86, 0xD0, 0x39,</div><div class='add'>+0x40, 0x67, 0x14, 0x97, 0x0A, 0x44, 0x0A, 0x56, 0x49, 0x40, 0x04, 0x08, 0x08,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0xA0, 0x24, 0x02, 0x9D, 0x00, 0x64, 0x2A,</div><div class='add'>+0xD0, 0x09, 0x40, 0x2C, 0x08, 0xB1, 0x00, 0xF4, 0x0E, 0xD0, 0x1B, 0x40, 0xAF,</div><div class='add'>+0x02, 0xB1, 0x03, 0xF4, 0x02, 0xD0, 0x0B, 0x40, 0x2F, 0x02, 0xB1, 0x02, 0xF4,</div><div class='add'>+0x0A, 0xD1, 0x1B, 0x41, 0x2F, 0x01, 0xA9, 0x00, 0xC6, 0x02, 0x91, 0x09, 0x40,</div><div class='add'>+0x25, 0x00, 0x9D, 0x42, 0x54, 0x02, 0x15, 0x49, 0x40, 0x60, 0x00, 0x02, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x10, 0x20, 0x20, 0x00, 0x8D, 0x14, 0x25, 0x12, 0xD0,</div><div class='add'>+0x0A, 0x40, 0x2C, 0x00, 0xE1, 0x80, 0xB4, 0x02, 0xD0, 0x0A, 0x4A, 0x2B, 0x00,</div><div class='add'>+0xA1, 0x00, 0xB4, 0x06, 0xD0, 0x0E, 0x40, 0x6B, 0x00, 0xA1, 0x00, 0xB4, 0x02,</div><div class='add'>+0xD2, 0x0A, 0x40, 0x2B, 0x00, 0xED, 0x08, 0x84, 0x02, 0xD2, 0x0C, 0x4A, 0x23,</div><div class='add'>+0x00, 0x95, 0x00, 0x64, 0x06, 0x58, 0x48, 0x40, 0x40, 0x80, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x1D, 0xB0, 0x06, 0x00, 0x1F, 0x04, 0x6C, 0x28, 0xF0, 0xA1,</div><div class='add'>+0xC8, 0x84, 0x42, 0x13, 0x0A, 0x7C, 0x28, 0xF0, 0xA1, 0xC0, 0x87, 0x02, 0x13,</div><div class='add'>+0x0A, 0x7C, 0x28, 0xF0, 0xA1, 0xC0, 0x87, 0x02, 0x13, 0x0A, 0x7C, 0x28, 0xD0,</div><div class='add'>+0xA1, 0xC0, 0x87, 0x02, 0x0F, 0x82, 0xCC, 0x01, 0xF8, 0x01, 0xCA, 0x05, 0x00,</div><div class='add'>+0x1F, 0x00, 0x5C, 0x28, 0x30, 0xA1, 0xC0, 0x74, 0xE0, 0x0A, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x19, 0xB8, 0x27, 0x05, 0xBF, 0x14, 0x5C, 0x22, 0xF0, 0x09, 0xD0,</div><div class='add'>+0x27, 0x00, 0x9F, 0x00, 0x7C, 0x02, 0xF0, 0x09, 0xC8, 0x27, 0x20, 0x9F, 0x00,</div><div class='add'>+0x7C, 0x02, 0xF0, 0x09, 0xC0, 0x27, 0x20, 0x9F, 0x00, 0x7C, 0x02, 0xF0, 0x09,</div><div class='add'>+0xC0, 0x27, 0x00, 0x9F, 0x04, 0x7C, 0x02, 0xE0, 0x0B, 0xC0, 0x2B, 0x00, 0xA7,</div><div class='add'>+0x40, 0xDC, 0x02, 0xF0, 0x8B, 0xD4, 0x77, 0x60, 0x0E, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x18, 0x80, 0x2F, 0x00, 0xBF, 0x14, 0xFC, 0x32, 0x30, 0x0A, 0xC0, 0x24,</div><div class='add'>+0x00, 0xAF, 0x08, 0xFC, 0x02, 0xF0, 0x0B, 0xC0, 0x2F, 0x02, 0xB3, 0x00, 0xFC,</div><div class='add'>+0x02, 0xF0, 0x8B, 0xC8, 0x2F, 0x08, 0xBF, 0x00, 0xFC, 0x22, 0x70, 0x0B, 0xC0,</div><div class='add'>+0x2F, 0x00, 0xB3, 0x28, 0xCE, 0x02, 0xF0, 0x0A, 0xC0, 0x2E, 0x00, 0xB3, 0x00,</div><div class='add'>+0xFC, 0x02, 0xC1, 0x0B, 0xC2, 0x74, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x1C, 0x00, 0x07, 0x05, 0x1D, 0x04, 0x74, 0x30, 0x10, 0x01, 0x41, 0x04, 0x04,</div><div class='add'>+0x1D, 0x20, 0x74, 0x50, 0xD0, 0x41, 0x4C, 0x07, 0x01, 0x11, 0x10, 0x74, 0x40,</div><div class='add'>+0xD0, 0x01, 0x40, 0x07, 0x05, 0x1D, 0x04, 0x74, 0x10, 0xD0, 0x01, 0x41, 0x07,</div><div class='add'>+0x04, 0x01, 0x00, 0x44, 0x00, 0xD0, 0x01, 0xC0, 0x16, 0x00, 0x1B, 0x00, 0x74,</div><div class='add'>+0x00, 0xD0, 0x01, 0x40, 0x60, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10,</div><div class='add'>+0xA2, 0x23, 0x21, 0x8D, 0x14, 0x34, 0x12, 0x10, 0x48, 0x40, 0x20, 0x00, 0x8D,</div><div class='add'>+0x00, 0x34, 0x12, 0xD0, 0x48, 0x41, 0x23, 0x01, 0x81, 0x04, 0x34, 0x02, 0xD0,</div><div class='add'>+0x08, 0x40, 0x23, 0x01, 0x8D, 0x14, 0x34, 0x12, 0x50, 0x48, 0x40, 0x27, 0x00,</div><div class='add'>+0x85, 0x00, 0x05, 0x02, 0xD0, 0x08, 0x44, 0x24, 0x00, 0x85, 0x40, 0x34, 0x82,</div><div class='add'>+0xD1, 0x08, 0x40, 0x48, 0x80, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0xA8,</div><div class='add'>+0x25, 0x00, 0x9D, 0x02, 0x74, 0x02, 0x12, 0x09, 0x50, 0x24, 0x20, 0x9D, 0x00,</div><div class='add'>+0x74, 0x02, 0xD0, 0x09, 0x40, 0x27, 0x40, 0x99, 0x00, 0x74, 0x02, 0xD0, 0x09,</div><div class='add'>+0x40, 0x27, 0x00, 0xDD, 0x00, 0x74, 0x02, 0xD0, 0x09, 0x40, 0x27, 0x20, 0x91,</div><div class='add'>+0x00, 0x64, 0x82, 0xD1, 0x19, 0x40, 0x26, 0x00, 0x9D, 0x01, 0x74, 0x0A, 0xD8,</div><div class='add'>+0x09, 0x40, 0x60, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x88, 0x27,</div><div class='add'>+0x00, 0x9D, 0x01, 0x7C, 0x02, 0x34, 0x09, 0xC0, 0x24, 0x00, 0x9F, 0x00, 0x7C,</div><div class='add'>+0x02, 0xF1, 0x09, 0xC0, 0x27, 0x20, 0x93, 0x00, 0x7C, 0x02, 0xF0, 0x09, 0x40,</div><div class='add'>+0x27, 0x00, 0x9F, 0x00, 0x7C, 0x02, 0x70, 0x09, 0xC0, 0x27, 0x00, 0x93, 0x00,</div><div class='add'>+0x4C, 0x02, 0xF0, 0x09, 0x80, 0x20, 0x00, 0x97, 0x00, 0x7C, 0x06, 0xF0, 0x49,</div><div class='add'>+0xCA, 0x14, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x80, 0x25, 0x00,</div><div class='add'>+0x9F, 0x08, 0x7C, 0x02, 0xF0, 0x09, 0xC0, 0x27, 0x00, 0x9F, 0x40, 0x7C, 0x02,</div><div class='add'>+0xF0, 0x09, 0xC8, 0x27, 0x00, 0x97, 0x00, 0x7C, 0x02, 0xF1, 0x09, 0xC0, 0x27,</div><div class='add'>+0x00, 0x9F, 0x00, 0x7C, 0x02, 0xF0, 0x09, 0xC6, 0x27, 0x50, 0x9F, 0x80, 0x5C,</div><div class='add'>+0x02, 0xF0, 0x09, 0xC0, 0x27, 0x20, 0x9B, 0x00, 0x7E, 0x12, 0xF0, 0x49, 0xD1,</div><div class='add'>+0x5B, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x08, 0x05, 0x00, 0x1F,</div><div class='add'>+0x04, 0x3C, 0x40, 0x30, 0x01, 0xD0, 0x06, 0x00, 0x13, 0x00, 0x4D, 0x00, 0xF0,</div><div class='add'>+0x01, 0xC0, 0x07, 0x00, 0x1F, 0x00, 0x7C, 0x00, 0xF0, 0x11, 0xC0, 0x06, 0x00,</div><div class='add'>+0x1F, 0x01, 0x7C, 0x20, 0xF0, 0x91, 0xC0, 0x07, 0x04, 0x13, 0x80, 0x7C, 0x40,</div><div class='add'>+0xF0, 0x11, 0xC4, 0x84, 0x04, 0x1F, 0x10, 0x5C, 0x48, 0xF0, 0x21, 0xC0, 0x53,</div><div class='add'>+0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0xA0, 0x9C, 0x00, 0x7D, 0x12,</div><div class='add'>+0xF4, 0x01, 0x12, 0x17, 0xC0, 0x14, 0x20, 0x71, 0x0A, 0xEC, 0x01, 0xD0, 0x87,</div><div class='add'>+0x48, 0x9F, 0x80, 0x7D, 0x00, 0xF4, 0x6D, 0xD0, 0x07, 0xC0, 0x1E, 0x00, 0x7D,</div><div class='add'>+0x00, 0xF4, 0x29, 0x70, 0x07, 0xC0, 0x99, 0x00, 0x71, 0x81, 0xCC, 0x0D, 0xD1,</div><div class='add'>+0x16, 0x44, 0x1C, 0x20, 0x7D, 0x02, 0xC4, 0x15, 0xC0, 0x27, 0x40, 0x43, 0x00,</div><div class='add'>+0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0xA0, 0xF2, 0x03, 0xCD, 0x01, 0x34,</div><div class='add'>+0x03, 0x10, 0x9D, 0x41, 0x30, 0x00, 0xC1, 0x02, 0x04, 0x13, 0xD0, 0x2C, 0x48,</div><div class='add'>+0xB7, 0x01, 0xCD, 0x10, 0x34, 0x0B, 0xD0, 0x0C, 0x42, 0x30, 0x01, 0xCD, 0x00,</div><div class='add'>+0x34, 0x07, 0xD0, 0x1C, 0x40, 0x31, 0x00, 0xD1, 0x08, 0x14, 0x09, 0xD8, 0x9C,</div><div class='add'>+0x40, 0x31, 0x10, 0x0D, 0x01, 0x14, 0x0F, 0xD0, 0x8D, 0x40, 0x43, 0x00, 0x0A,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x80, 0x38, 0x00, 0xED, 0x00, 0x34, 0x01,</div><div class='add'>+0x10, 0x0F, 0x40, 0x78, 0x41, 0xF1, 0x01, 0x84, 0x43, 0xD0, 0x0E, 0x41, 0x3B,</div><div class='add'>+0x10, 0xED, 0x00, 0xB4, 0x03, 0xD0, 0x1E, 0x60, 0x38, 0x00, 0xED, 0x10, 0xB4,</div><div class='add'>+0x01, 0x50, 0x0E, 0x42, 0x39, 0x40, 0x21, 0x00, 0xA4, 0x08, 0xD0, 0x0E, 0x40,</div><div class='add'>+0x29, 0x00, 0x7D, 0x11, 0x84, 0x01, 0xD0, 0x06, 0x40, 0x13, 0x00, 0x02, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x15, 0x00, 0x58, 0x08, 0xEF, 0x01, 0xBC, 0x07, 0x30,</div><div class='add'>+0x1E, 0xC0, 0x7C, 0x05, 0xE3, 0x01, 0x84, 0x07, 0xF0, 0x16, 0xC0, 0x7B, 0x00,</div><div class='add'>+0xED, 0x01, 0xB4, 0x05, 0xF0, 0x1F, 0x40, 0x58, 0x00, 0xEF, 0x01, 0xBC, 0x07,</div><div class='add'>+0xF0, 0x1E, 0xC0, 0x7D, 0x00, 0xE3, 0x01, 0x9C, 0x05, 0xF0, 0x0E, 0xC0, 0x69,</div><div class='add'>+0x10, 0x2F, 0x01, 0x9C, 0x05, 0xF2, 0x1E, 0xC4, 0x53, 0x60, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x10, 0xBA, 0x15, 0x00, 0xDF, 0x20, 0x7C, 0x02, 0xF4, 0x0D,</div><div class='add'>+0xC8, 0x35, 0x23, 0x9F, 0x00, 0x7C, 0x03, 0xF0, 0x0D, 0xC0, 0x07, 0x00, 0x9F,</div><div class='add'>+0x00, 0x7C, 0x01, 0xF0, 0x09, 0xD8, 0x27, 0x00, 0xDF, 0x00, 0x7C, 0x03, 0xF0,</div><div class='add'>+0x0D, 0xC4, 0x25, 0x80, 0xDF, 0x00, 0x5C, 0x00, 0xF2, 0x0D, 0xC0, 0x26, 0x00,</div><div class='add'>+0x8F, 0x20, 0x7C, 0x00, 0xF2, 0x01, 0xC0, 0x43, 0x60, 0x06, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0xA0, 0x7D, 0x00, 0xFF, 0x01, 0xFC, 0x87, 0xF9, 0x0F, 0xC0,</div><div class='add'>+0x7D, 0x00, 0xFF, 0x01, 0xFC, 0x25, 0xF0, 0x1E, 0xC0, 0x7C, 0x00, 0xFF, 0x09,</div><div class='add'>+0xDC, 0x07, 0xF0, 0x17, 0xC0, 0x7F, 0x0A, 0x7F, 0x81, 0xCC, 0x87, 0xF0, 0x17,</div><div class='add'>+0xC0, 0x5F, 0x22, 0xF3, 0x01, 0xCC, 0x25, 0x30, 0x1A, 0xC0, 0x78, 0x02, 0x23,</div><div class='add'>+0x01, 0xCC, 0x06, 0xF0, 0x9B, 0xC0, 0x1B, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x15, 0x88, 0x39, 0x22, 0x6D, 0x00, 0xB4, 0x19, 0xD8, 0x46, 0x40, 0x3B,</div><div class='add'>+0x05, 0xED, 0x04, 0xB4, 0x83, 0xD0, 0x8E, 0x40, 0x38, 0x00, 0x6D, 0x00, 0xB4,</div><div class='add'>+0x88, 0xD0, 0x2E, 0x40, 0x3B, 0x00, 0xAD, 0x18, 0x85, 0x0A, 0xD0, 0xAE, 0x40,</div><div class='add'>+0x1F, 0x03, 0x21, 0x84, 0xC4, 0x01, 0xB0, 0x4A, 0x40, 0xA8, 0x02, 0x2F, 0x00,</div><div class='add'>+0x94, 0x02, 0xD0, 0x8A, 0x40, 0x57, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x19, 0x00, 0xED, 0x00, 0xB4, 0x81, 0xD0, 0x8A, 0x41, 0x39, 0x20,</div><div class='add'>+0x6D, 0x90, 0xB4, 0x08, 0xD1, 0x23, 0x40, 0x38, 0x00, 0xED, 0x20, 0x96, 0x23,</div><div class='add'>+0xD0, 0x0E, 0x40, 0x1B, 0x10, 0xFD, 0x00, 0x84, 0x03, 0xD0, 0x22, 0x40, 0x3B,</div><div class='add'>+0x60, 0xB1, 0x00, 0xD6, 0x01, 0x11, 0x0E, 0x48, 0x28, 0x00, 0x25, 0x0A, 0x84,</div><div class='add'>+0x40, 0xD0, 0x8A, 0x41, 0x63, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04,</div><div class='add'>+0x28, 0x05, 0x00, 0x8D, 0x03, 0x74, 0x00, 0xD0, 0x30, 0x44, 0xF3, 0x00, 0x1D,</div><div class='add'>+0x03, 0x74, 0x02, 0xD0, 0x08, 0x40, 0xC0, 0x00, 0x0D, 0x02, 0x74, 0x0C, 0xD0,</div><div class='add'>+0x39, 0x00, 0xE7, 0x00, 0x9D, 0x02, 0x44, 0x0E, 0xD0, 0x08, 0x40, 0xE3, 0x00,</div><div class='add'>+0x81, 0x02, 0x14, 0x08, 0x90, 0x1C, 0x44, 0x20, 0x04, 0x0D, 0x00, 0x56, 0x0C,</div><div class='add'>+0xD0, 0x28, 0x41, 0x0B, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x28,</div><div class='add'>+0x25, 0x00, 0x1F, 0x06, 0x7E, 0x02, 0xD8, 0x91, 0xC8, 0xB9, 0x00, 0x1F, 0x01,</div><div class='add'>+0x7C, 0x16, 0xF0, 0x59, 0xC0, 0x84, 0x04, 0x1D, 0x07, 0x5C, 0x06, 0xF0, 0x19,</div><div class='add'>+0xC0, 0x27, 0x04, 0x9F, 0x01, 0x4C, 0x06, 0xF0, 0x58, 0xC0, 0x67, 0x02, 0xC3,</div><div class='add'>+0x00, 0x1C, 0x4D, 0x10, 0x8C, 0xD0, 0xE0, 0x01, 0x17, 0x00, 0x4C, 0x0E, 0xF0,</div><div class='add'>+0x01, 0xC0, 0x57, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x27,</div><div class='add'>+0x00, 0x9F, 0x02, 0x7C, 0x82, 0xF0, 0x21, 0xC0, 0x37, 0x00, 0x9F, 0x10, 0x7C,</div><div class='add'>+0x0A, 0xF0, 0x09, 0xC0, 0x07, 0x08, 0x1F, 0x02, 0x7C, 0x6A, 0xF0, 0x89, 0xC1,</div><div class='add'>+0xA7, 0x04, 0x9F, 0x10, 0x7C, 0x60, 0xF0, 0x09, 0xC8, 0x87, 0x02, 0x1F, 0x23,</div><div class='add'>+0x6C, 0x00, 0xF0, 0x8D, 0xC2, 0x27, 0x00, 0x1F, 0x00, 0x7C, 0x00, 0xF0, 0x01,</div><div class='add'>+0xC0, 0x37, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x08, 0x2D, 0x00,</div><div class='add'>+0x33, 0x10, 0xFC, 0x02, 0x30, 0x0B, 0xE2, 0x3F, 0x04, 0xB3, 0x00, 0xCC, 0x00,</div><div class='add'>+0x38, 0x0B, 0xC0, 0x2F, 0x04, 0xBF, 0x10, 0xFC, 0x02, 0x30, 0x03, 0xC2, 0x2C,</div><div class='add'>+0x80, 0x33, 0x00, 0xCC, 0x00, 0x34, 0x03, 0xC0, 0x2C, 0x00, 0x7F, 0x10, 0xCC,</div><div class='add'>+0x41, 0x31, 0x0F, 0xC0, 0x2D, 0x10, 0x33, 0x00, 0xFC, 0x42, 0x30, 0x0A, 0xC0,</div><div class='add'>+0x04, 0x24, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x81, 0x20, 0xE6, 0x00, 0x91,</div><div class='add'>+0x05, 0x74, 0x06, 0x12, 0x39, 0x40, 0x37, 0x00, 0x91, 0x81, 0x44, 0x04, 0xB8,</div><div class='add'>+0x19, 0x44, 0x47, 0x30, 0x9D, 0x43, 0x5C, 0x0E, 0x10, 0x31, 0x40, 0x65, 0x00,</div><div class='add'>+0x1F, 0x01, 0x44, 0x0C, 0x10, 0x11, 0x40, 0x44, 0x01, 0x5D, 0x02, 0x4C, 0x0C,</div><div class='add'>+0x70, 0x3D, 0x40, 0xE4, 0x00, 0x95, 0x01, 0x74, 0x0C, 0x12, 0x71, 0x40, 0x04,</div><div class='add'>+0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xA0, 0xC4, 0x40, 0x11, 0x01,</div><div class='add'>+0x74, 0x06, 0x14, 0x39, 0x44, 0x37, 0x00, 0x11, 0x03, 0x44, 0x46, 0x1A, 0x11,</div><div class='add'>+0x41, 0x67, 0x00, 0x9D, 0x43, 0x74, 0x06, 0x10, 0x11, 0x40, 0x44, 0x04, 0x11,</div><div class='add'>+0x01, 0x44, 0x06, 0x10, 0x19, 0x64, 0x66, 0x00, 0xDD, 0x02, 0x44, 0x45, 0x10,</div><div class='add'>+0xA5, 0x40, 0x66, 0x20, 0x19, 0x81, 0x74, 0x0E, 0x11, 0x11, 0x54, 0x04, 0x08,</div><div class='add'>+0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x20, 0x20, 0x00, 0x01, 0x00, 0x34,</div><div class='add'>+0x02, 0x10, 0x00, 0x68, 0x37, 0x00, 0x81, 0x00, 0x05, 0x02, 0x10, 0x00, 0x40,</div><div class='add'>+0x63, 0x00, 0x0D, 0x00, 0x16, 0x00, 0x14, 0x08, 0x50, 0x00, 0x40, 0x81, 0x00,</div><div class='add'>+0x05, 0x02, 0x1C, 0x09, 0x64, 0x02, 0x00, 0x1D, 0x00, 0x45, 0x00, 0x94, 0x0D,</div><div class='add'>+0x40, 0x02, 0x00, 0x0D, 0x00, 0x34, 0x02, 0x10, 0x00, 0x40, 0x40, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xB0, 0x06, 0x00, 0x11, 0x00, 0x7C, 0x00,</div><div class='add'>+0x30, 0x09, 0x60, 0x3F, 0x40, 0x13, 0x00, 0x4C, 0x00, 0x14, 0x01, 0xC0, 0x27,</div><div class='add'>+0x20, 0x9F, 0x00, 0x7E, 0x82, 0x30, 0x01, 0x40, 0x04, 0x00, 0x11, 0x00, 0x4C,</div><div class='add'>+0x00, 0x30, 0x01, 0xC0, 0x26, 0x00, 0x1F, 0x00, 0x4C, 0x03, 0x30, 0x0D, 0xD0,</div><div class='add'>+0x27, 0x08, 0x1B, 0x00, 0x7C, 0x02, 0x30, 0x09, 0xD0, 0x04, 0x64, 0x08, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x05, 0xB8, 0x2F, 0x00, 0xBF, 0x00, 0xFC, 0x00, 0xF1,</div><div class='add'>+0x03, 0xC2, 0x3F, 0x00, 0x3F, 0x00, 0xFC, 0x80, 0xF0, 0x03, 0xC0, 0x0F, 0x00,</div><div class='add'>+0x3F, 0x00, 0xDC, 0x00, 0xF0, 0x03, 0xC0, 0x0F, 0x08, 0x2F, 0x00, 0xFC, 0x00,</div><div class='add'>+0xF0, 0x03, 0xC0, 0x0D, 0x00, 0x2F, 0x40, 0xCC, 0x00, 0x59, 0x0F, 0xC8, 0x2D,</div><div class='add'>+0x00, 0x37, 0x80, 0xFC, 0x02, 0xF4, 0x0B, 0xC8, 0x17, 0x60, 0x0E, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x03, 0xA0, 0x0F, 0x00, 0x3F, 0x41, 0xEC, 0x02, 0xF0, 0x0F,</div><div class='add'>+0xC0, 0x2C, 0x00, 0xBF, 0x00, 0xBE, 0x07, 0xF0, 0x03, 0xC1, 0x3E, 0x00, 0xA3,</div><div class='add'>+0x01, 0xDC, 0x00, 0x30, 0x03, 0xC0, 0x0F, 0x00, 0xAC, 0x01, 0xDC, 0x33, 0x34,</div><div class='add'>+0x3F, 0xC0, 0x2F, 0x80, 0xA3, 0x01, 0xFC, 0x53, 0xF0, 0x83, 0xC0, 0x4F, 0x00,</div><div class='add'>+0x33, 0x01, 0xBC, 0x0C, 0x30, 0x13, 0xC0, 0x0F, 0x00, 0x0E, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x03, 0x08, 0x27, 0x12, 0x1D, 0x00, 0x44, 0x02, 0xD0, 0x0F, 0x44,</div><div class='add'>+0x04, 0x14, 0x1D, 0x00, 0x55, 0x07, 0xD0, 0x21, 0x50, 0x3C, 0x00, 0x91, 0x41,</div><div class='add'>+0x44, 0x02, 0x10, 0x01, 0x40, 0x27, 0x20, 0x9D, 0x11, 0x54, 0x3B, 0x10, 0x4D,</div><div class='add'>+0x40, 0x27, 0x20, 0x91, 0x10, 0x74, 0x0F, 0xD2, 0x0B, 0x40, 0x07, 0x08, 0x11,</div><div class='add'>+0x80, 0x74, 0x00, 0x14, 0x05, 0x40, 0x07, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x13, 0xA0, 0x03, 0x00, 0x0D, 0x00, 0x05, 0x00, 0xD0, 0x0C, 0x40, 0x20,</div><div class='add'>+0x08, 0x8D, 0x00, 0x35, 0x02, 0x50, 0x00, 0x40, 0x31, 0x00, 0xC1, 0x00, 0x14,</div><div class='add'>+0x02, 0x10, 0x08, 0x44, 0x03, 0x00, 0x9D, 0x00, 0x14, 0x03, 0x90, 0x0C, 0x60,</div><div class='add'>+0x23, 0x00, 0x81, 0x04, 0x34, 0x03, 0xD0, 0x58, 0x48, 0x23, 0x15, 0x81, 0x14,</div><div class='add'>+0x34, 0x10, 0x10, 0x00, 0x40, 0x47, 0x80, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x03, 0x88, 0x65, 0x10, 0x1D, 0x03, 0x44, 0x0C, 0xD0, 0x0D, 0x40, 0x44, 0x00,</div><div class='add'>+0x1D, 0x01, 0x54, 0x12, 0xD0, 0x00, 0x40, 0x35, 0x00, 0xD1, 0x00, 0x44, 0x06,</div><div class='add'>+0x14, 0x19, 0x40, 0x47, 0x14, 0x9D, 0x00, 0x54, 0x03, 0x90, 0x0D, 0x40, 0x27,</div><div class='add'>+0x42, 0x91, 0x20, 0x74, 0x03, 0xD0, 0x1D, 0x40, 0x23, 0x00, 0x91, 0x00, 0x74,</div><div class='add'>+0x04, 0x10, 0x05, 0x40, 0x0F, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x88, 0x47, 0x04, 0x1F, 0x01, 0x4C, 0x8E, 0xF1, 0x0D, 0xC8, 0x64, 0x20, 0x0F,</div><div class='add'>+0x43, 0x7D, 0x07, 0x70, 0x55, 0xC0, 0x35, 0x40, 0xC3, 0x00, 0x5C, 0x14, 0x30,</div><div class='add'>+0x59, 0xC0, 0xE7, 0x00, 0x8E, 0x00, 0x5C, 0x03, 0xB0, 0x0D, 0xC0, 0x37, 0x20,</div><div class='add'>+0xD1, 0x20, 0x7C, 0x03, 0xF2, 0x19, 0xC2, 0x47, 0x00, 0x13, 0x81, 0x3C, 0x02,</div><div class='add'>+0x34, 0x01, 0xC0, 0x0B, 0x20, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x80,</div><div class='add'>+0x2D, 0x08, 0x3F, 0x00, 0xFC, 0x42, 0xF0, 0x0E, 0xC0, 0x2F, 0x00, 0x3F, 0x00,</div><div class='add'>+0xFC, 0x03, 0xF0, 0x87, 0xC0, 0x38, 0x00, 0xFF, 0x00, 0xBC, 0x42, 0xF0, 0x0B,</div><div class='add'>+0xC1, 0x2F, 0x00, 0xBF, 0x04, 0xBC, 0x03, 0x70, 0x0F, 0xC0, 0x7B, 0x20, 0xBF,</div><div class='add'>+0x00, 0xFC, 0x03, 0xD0, 0x09, 0xC0, 0x4F, 0x02, 0x3F, 0x09, 0xFC, 0x02, 0xF0,</div><div class='add'>+0x07, 0xC1, 0x1F, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x08, 0x05,</div><div class='add'>+0x00, 0x13, 0x02, 0x5D, 0x0A, 0xF0, 0x0D, 0xC0, 0x24, 0x00, 0x93, 0x00, 0x7C,</div><div class='add'>+0x82, 0x30, 0x27, 0xC0, 0x34, 0x44, 0xD3, 0x00, 0x6C, 0x02, 0xF0, 0x09, 0xC6,</div><div class='add'>+0x87, 0x04, 0x9F, 0x00, 0x5C, 0x03, 0x70, 0x0D, 0xC0, 0x37, 0x00, 0xD3, 0x20,</div><div class='add'>+0x4C, 0x03, 0xF0, 0x0D, 0xC0, 0x64, 0x00, 0x93, 0x01, 0x7C, 0x02, 0x30, 0x01,</div><div class='add'>+0xC0, 0x0B, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0xA0, 0x24, 0x00,</div><div class='add'>+0x01, 0x00, 0x44, 0x06, 0xD0, 0x2F, 0xC5, 0x26, 0x00, 0x9B, 0x20, 0x74, 0x02,</div><div class='add'>+0xB0, 0x45, 0x40, 0x7C, 0x40, 0xD1, 0x01, 0x6C, 0x02, 0xD0, 0x29, 0x40, 0x87,</div><div class='add'>+0x00, 0x9D, 0x00, 0xC4, 0x03, 0x12, 0x0D, 0x40, 0xB7, 0x06, 0x91, 0x0A, 0xC4,</div><div class='add'>+0x03, 0xD0, 0x0D, 0x50, 0xE4, 0x00, 0x91, 0x03, 0x74, 0x42, 0x10, 0x05, 0x40,</div><div class='add'>+0x4F, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xA0, 0x22, 0x80, 0x01,</div><div class='add'>+0x12, 0x04, 0x20, 0xD0, 0x3C, 0x41, 0x00, 0x00, 0x81, 0x09, 0x24, 0x03, 0x10,</div><div class='add'>+0x00, 0x40, 0x30, 0x20, 0x8D, 0x13, 0x24, 0x08, 0x90, 0x20, 0x40, 0x83, 0x00,</div><div class='add'>+0xCD, 0x00, 0x14, 0x03, 0x50, 0x0C, 0x00, 0x23, 0x00, 0x81, 0x02, 0x04, 0x03,</div><div class='add'>+0xC0, 0x08, 0x40, 0x90, 0x14, 0x41, 0x12, 0x34, 0x85, 0x10, 0x08, 0x40, 0x1F,</div><div class='add'>+0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x80, 0x68, 0x40, 0x21, 0x01,</div><div class='add'>+0x84, 0x07, 0xD0, 0x1C, 0x40, 0x5A, 0x00, 0xE9, 0x01, 0xF4, 0x07, 0x90, 0x10,</div><div class='add'>+0x54, 0x70, 0x26, 0xAD, 0x91, 0xA4, 0x05, 0xD0, 0x12, 0x08, 0x6B, 0x02, 0xFD,</div><div class='add'>+0x01, 0x84, 0x07, 0x10, 0x1E, 0x40, 0x6B, 0x00, 0xB5, 0x01, 0x84, 0x07, 0xD0,</div><div class='add'>+0x9A, 0x40, 0x58, 0x02, 0x61, 0x81, 0xF4, 0x0D, 0x12, 0x9E, 0x40, 0x13, 0x00,</div><div class='add'>+0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x10, 0x24, 0x02, 0x11, 0x00, 0x1D,</div><div class='add'>+0x21, 0xF0, 0x0C, 0x40, 0xB4, 0x00, 0xC3, 0x02, 0x3C, 0x03, 0x30, 0x40, 0xC0,</div><div class='add'>+0x30, 0x02, 0xCF, 0x00, 0x2C, 0x00, 0xB3, 0x84, 0xC0, 0x13, 0x8A, 0xCF, 0x00,</div><div class='add'>+0x5C, 0x03, 0x70, 0x0C, 0xC0, 0x27, 0x40, 0x83, 0x08, 0x0C, 0x03, 0xF0, 0x0C,</div><div class='add'>+0xC0, 0x34, 0x02, 0xC3, 0x04, 0x3C, 0x01, 0x30, 0x08, 0xC0, 0x4B, 0x40, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xB8, 0x2D, 0x00, 0x7F, 0x88, 0xFC, 0x01,</div><div class='add'>+0xC0, 0x0F, 0xC1, 0x1D, 0x00, 0xFF, 0x00, 0xFC, 0x23, 0xF0, 0x03, 0xC0, 0xBF,</div><div class='add'>+0x06, 0xF3, 0x08, 0xFC, 0x21, 0xF0, 0x8F, 0xC8, 0x3F, 0xA2, 0xFF, 0x08, 0xFC,</div><div class='add'>+0x23, 0xF0, 0x0F, 0xC0, 0x3E, 0x02, 0xBB, 0x20, 0xFD, 0x43, 0xF0, 0x0F, 0xC0,</div><div class='add'>+0x3F, 0x02, 0xFF, 0x00, 0xFC, 0x01, 0xF0, 0x0F, 0xC2, 0x0B, 0x60, 0x06, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x15, 0xA0, 0x2F, 0x00, 0x0F, 0x00, 0x4C, 0x01, 0xF0,</div><div class='add'>+0x4D, 0xC0, 0x17, 0x00, 0x5F, 0x00, 0x7C, 0x03, 0xF8, 0x01, 0xC0, 0xB6, 0x40,</div><div class='add'>+0xD3, 0x01, 0x7C, 0x81, 0xF2, 0x05, 0xC8, 0x77, 0x00, 0x93, 0x00, 0x6C, 0x23,</div><div class='add'>+0x30, 0x0D, 0xC0, 0x37, 0x00, 0xD7, 0x00, 0x7C, 0x03, 0xF0, 0x29, 0xC0, 0x54,</div><div class='add'>+0x00, 0x53, 0x00, 0x4C, 0x03, 0xF0, 0x09, 0xC0, 0x56, 0x00, 0x0E, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x13, 0x88, 0x29, 0x00, 0x2D, 0x00, 0x84, 0x03, 0xD0, 0x0E,</div><div class='add'>+0x41, 0x3B, 0x00, 0x6D, 0x00, 0xB4, 0x03, 0xD0, 0x03, 0x50, 0x38, 0x01, 0xE1,</div><div class='add'>+0x00, 0x84, 0x03, 0xD1, 0x0E, 0x40, 0x3F, 0x00, 0xA1, 0x00, 0x94, 0x83, 0x10,</div><div class='add'>+0x0E, 0x40, 0x3B, 0x00, 0xA1, 0x00, 0xB6, 0x13, 0xD0, 0x8A, 0x40, 0x19, 0x00,</div><div class='add'>+0x61, 0x00, 0x84, 0x03, 0xD2, 0x0E, 0x40, 0x48, 0x20, 0x06, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x01, 0x00, 0x69, 0x00, 0x3D, 0x01, 0x84, 0x0F, 0xD1, 0x5E, 0x40,</div><div class='add'>+0x7B, 0x00, 0xED, 0x81, 0xB4, 0x07, 0xD2, 0x12, 0x40, 0x71, 0x00, 0xE1, 0x11,</div><div class='add'>+0x94, 0x07, 0xD0, 0x16, 0x40, 0x7B, 0x00, 0xB9, 0x43, 0x24, 0x07, 0x50, 0x1E,</div><div class='add'>+0x40, 0x73, 0x00, 0xED, 0x01, 0xB4, 0x17, 0xD0, 0x1C, 0x41, 0x78, 0x00, 0xE1,</div><div class='add'>+0x01, 0x84, 0x07, 0xD0, 0x1A, 0x40, 0x0E, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x12, 0x28, 0x73, 0x10, 0xCD, 0x40, 0x04, 0x0F, 0xD0, 0x0C, 0x40, 0xB3,</div><div class='add'>+0x00, 0xCD, 0x02, 0x34, 0x03, 0xD0, 0x69, 0x40, 0x37, 0x00, 0xC1, 0x00, 0x06,</div><div class='add'>+0x27, 0xD0, 0x9D, 0x40, 0x33, 0x00, 0x99, 0x00, 0x14, 0x03, 0x10, 0x0D, 0x40,</div><div class='add'>+0x77, 0x02, 0x89, 0x08, 0x34, 0x03, 0xD0, 0x6D, 0x42, 0x31, 0x00, 0xD1, 0x00,</div><div class='add'>+0x44, 0x03, 0xD0, 0x0C, 0x50, 0x48, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x17, 0xA8, 0x5D, 0x01, 0x7F, 0x02, 0xCD, 0x05, 0xF0, 0x05, 0xC0, 0x5F, 0x04,</div><div class='add'>+0x7D, 0x0B, 0x7C, 0x81, 0xF0, 0x37, 0xC0, 0x15, 0x00, 0x53, 0x00, 0xDC, 0x09,</div><div class='add'>+0xF0, 0xA7, 0xC0, 0x1F, 0x41, 0x5B, 0x00, 0x6C, 0x01, 0x34, 0x05, 0xC0, 0x17,</div><div class='add'>+0x00, 0x5F, 0x00, 0x7C, 0x01, 0xF0, 0x37, 0xE0, 0x14, 0x40, 0x53, 0x00, 0x4D,</div><div class='add'>+0x01, 0xF0, 0x05, 0xC0, 0x5E, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12,</div><div class='add'>+0x00, 0x07, 0x00, 0x1F, 0x12, 0x7C, 0x00, 0xF0, 0x01, 0xCC, 0x07, 0x00, 0x1F,</div><div class='add'>+0x0A, 0x7C, 0x00, 0xF8, 0x81, 0x40, 0x04, 0x10, 0x1F, 0x02, 0x5C, 0x48, 0xF8,</div><div class='add'>+0x21, 0xC2, 0x07, 0x01, 0x17, 0x00, 0x7C, 0x00, 0xF1, 0x01, 0xC0, 0x87, 0x40,</div><div class='add'>+0x17, 0x00, 0x7C, 0x80, 0xF0, 0x01, 0xC0, 0x07, 0x00, 0x1F, 0x00, 0x7C, 0x04,</div><div class='add'>+0xF0, 0x01, 0xC8, 0x4B, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x08,</div><div class='add'>+0x23, 0x00, 0x9B, 0x00, 0x4E, 0x62, 0xF0, 0x19, 0xC0, 0x27, 0x04, 0x87, 0x04,</div><div class='add'>+0x4C, 0x82, 0xF0, 0x09, 0xC4, 0x24, 0x10, 0x93, 0x40, 0x7C, 0x02, 0xF2, 0x09,</div><div class='add'>+0xC0, 0x24, 0x00, 0x9E, 0x80, 0x2C, 0x02, 0x70, 0x09, 0xC0, 0x64, 0x08, 0x93,</div><div class='add'>+0x05, 0x78, 0x06, 0xF0, 0x09, 0x40, 0x26, 0x00, 0x9F, 0x01, 0x4C, 0x02, 0x30,</div><div class='add'>+0x39, 0xC0, 0x40, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x20, 0x26,</div><div class='add'>+0x00, 0x81, 0x04, 0x44, 0x0A, 0xD0, 0x19, 0x40, 0x27, 0x00, 0x9D, 0x10, 0x44,</div><div class='add'>+0x02, 0xD0, 0x09, 0xC0, 0x26, 0x40, 0x91, 0x01, 0x74, 0x16, 0xD0, 0x19, 0x40,</div><div class='add'>+0xA4, 0x00, 0x9D, 0x80, 0x4C, 0x82, 0x10, 0x09, 0x40, 0x24, 0x41, 0x91, 0x01,</div><div class='add'>+0x74, 0x06, 0xD2, 0x09, 0x40, 0xA4, 0x20, 0x9D, 0x03, 0x44, 0x02, 0x12, 0x08,</div><div class='add'>+0x40, 0x04, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0xA0, 0x24, 0x08,</div><div class='add'>+0x99, 0x00, 0x44, 0x8A, 0xD0, 0x69, 0x40, 0x27, 0x00, 0x9D, 0x00, 0x44, 0x82,</div><div class='add'>+0x50, 0x09, 0x40, 0x24, 0x02, 0x99, 0x21, 0x56, 0x12, 0x90, 0x69, 0x42, 0x24,</div><div class='add'>+0x86, 0x9D, 0x00, 0x64, 0x02, 0x50, 0x09, 0x40, 0x24, 0x02, 0x91, 0x00, 0x74,</div><div class='add'>+0x22, 0xD0, 0x09, 0x40, 0x67, 0x00, 0xBD, 0x04, 0xC4, 0x02, 0x1C, 0x0F, 0x40,</div><div class='add'>+0x60, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x20, 0x20, 0x01, 0x91,</div><div class='add'>+0x00, 0x04, 0x82, 0xD0, 0x68, 0x40, 0x23, 0x00, 0x8D, 0x02, 0x04, 0x02, 0xD2,</div><div class='add'>+0x48, 0x40, 0x30, 0x01, 0xC9, 0x00, 0x34, 0x1A, 0xD8, 0x08, 0x41, 0x20, 0x80,</div><div class='add'>+0x8D, 0x00, 0x04, 0x22, 0x10, 0x08, 0x50, 0x20, 0x01, 0x81, 0x00, 0x34, 0x12,</div><div class='add'>+0xD0, 0x48, 0x40, 0x69, 0x00, 0xAD, 0x01, 0x84, 0x06, 0x00, 0x0B, 0x40, 0x40,</div><div class='add'>+0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xB0, 0x86, 0x22, 0x1B, 0x0A,</div><div class='add'>+0x45, 0x18, 0xF0, 0x21, 0xC0, 0x87, 0x02, 0x1F, 0x06, 0x4C, 0x00, 0xF0, 0xA1,</div><div class='add'>+0x50, 0x84, 0x02, 0x1B, 0x00, 0x5C, 0x08, 0xB0, 0x61, 0xD0, 0x84, 0x00, 0x1F,</div><div class='add'>+0x0A, 0x6C, 0x58, 0x71, 0xA1, 0xC0, 0x84, 0x02, 0x13, 0x0A, 0x7C, 0x00, 0xF0,</div><div class='add'>+0xA1, 0xC0, 0x83, 0x02, 0x0F, 0x4A, 0x4C, 0x28, 0x30, 0xA2, 0xD0, 0x74, 0xC0,</div><div class='add'>+0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x19, 0xB8, 0x2F, 0x12, 0xBF, 0x00, 0xFC,</div><div class='add'>+0x5A, 0xF0, 0x89, 0xC0, 0x2F, 0x02, 0xBF, 0x46, 0xFD, 0x02, 0xF0, 0x8B, 0xC0,</div><div class='add'>+0x27, 0x22, 0xA7, 0x20, 0xFC, 0x0A, 0xF0, 0x4B, 0xC3, 0x2F, 0x27, 0xAF, 0x00,</div><div class='add'>+0x5C, 0x12, 0xF0, 0x09, 0xC8, 0x2F, 0x02, 0xBD, 0x00, 0x7C, 0x22, 0xF0, 0x8B,</div><div class='add'>+0xC0, 0x26, 0x00, 0x9F, 0x00, 0x7D, 0x02, 0xF0, 0x09, 0xC0, 0x67, 0x60, 0x0E,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x19, 0xA0, 0x27, 0x05, 0xBF, 0x08, 0xEC, 0x02,</div><div class='add'>+0x30, 0x0B, 0xC0, 0x24, 0x00, 0xBF, 0x04, 0x7C, 0x02, 0x30, 0xCA, 0xC0, 0x2C,</div><div class='add'>+0x00, 0x83, 0x40, 0xD0, 0x22, 0xF0, 0x4B, 0xC0, 0x2F, 0x05, 0x8F, 0x88, 0x5C,</div><div class='add'>+0x82, 0xB0, 0x09, 0xC0, 0x2F, 0x02, 0xB3, 0x00, 0xFC, 0x16, 0xF0, 0x49, 0xD0,</div><div class='add'>+0x2F, 0x00, 0xBF, 0x00, 0xCC, 0x22, 0x30, 0x0B, 0xC0, 0x60, 0x00, 0x0E, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x1C, 0x08, 0x03, 0x01, 0x5D, 0x04, 0x44, 0x48, 0x14,</div><div class='add'>+0x01, 0x49, 0x04, 0x02, 0x17, 0x14, 0x74, 0x00, 0x14, 0xC1, 0x44, 0x80, 0x04,</div><div class='add'>+0x11, 0x00, 0x44, 0x20, 0xD2, 0x41, 0x49, 0x07, 0x21, 0x1D, 0x04, 0x44, 0x48,</div><div class='add'>+0x10, 0x01, 0x40, 0x07, 0x02, 0x11, 0x00, 0x74, 0x00, 0xD2, 0x81, 0x40, 0x16,</div><div class='add'>+0x04, 0x5D, 0x90, 0x44, 0x00, 0x10, 0x01, 0x40, 0x71, 0x20, 0x0C, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x12, 0xA0, 0x23, 0x05, 0x8D, 0x04, 0x05, 0x32, 0x10, 0x88,</div><div class='add'>+0x40, 0x20, 0x00, 0x8D, 0x8D, 0x74, 0x02, 0x11, 0x58, 0x40, 0x20, 0x43, 0x81,</div><div class='add'>+0x40, 0x16, 0x02, 0xD0, 0xC8, 0x40, 0x23, 0x05, 0x8D, 0x24, 0x14, 0x32, 0x90,</div><div class='add'>+0x08, 0x40, 0x23, 0x00, 0x81, 0x00, 0x34, 0x0A, 0xD0, 0x08, 0x40, 0x21, 0x01,</div><div class='add'>+0x8D, 0x00, 0x44, 0x02, 0x10, 0x08, 0x40, 0x40, 0x80, 0x0E, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x18, 0xA8, 0x25, 0x00, 0x9D, 0x04, 0x44, 0x42, 0x10, 0x09, 0x40,</div><div class='add'>+0xA4, 0x01, 0x95, 0x40, 0x74, 0x06, 0x10, 0x09, 0x42, 0x24, 0x00, 0x91, 0x00,</div><div class='add'>+0x46, 0x03, 0xD0, 0x0D, 0x40, 0x27, 0x00, 0x9D, 0x00, 0x44, 0x02, 0x10, 0x09,</div><div class='add'>+0x40, 0x27, 0x40, 0x91, 0x20, 0x74, 0x02, 0xD0, 0x29, 0x40, 0x24, 0x00, 0x8D,</div><div class='add'>+0x20, 0x45, 0x02, 0x00, 0x09, 0x40, 0x61, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x05, 0xA8, 0x27, 0x02, 0x9F, 0x01, 0x44, 0x02, 0x30, 0x09, 0xD0, 0x24,</div><div class='add'>+0x00, 0x9F, 0x01, 0x3C, 0x02, 0x30, 0x09, 0xF0, 0x24, 0x00, 0x83, 0x01, 0x5C,</div><div class='add'>+0x1A, 0xD2, 0x39, 0xC5, 0x27, 0x24, 0x9E, 0x00, 0x5E, 0x02, 0xB0, 0x09, 0xC0,</div><div class='add'>+0x67, 0x40, 0x93, 0x00, 0x7C, 0x02, 0xF0, 0x09, 0xC0, 0xA7, 0x00, 0x9F, 0x02,</div><div class='add'>+0x4C, 0x02, 0x30, 0x09, 0xC0, 0x14, 0xA0, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x16, 0x80, 0x65, 0x00, 0x9F, 0x00, 0x1C, 0x26, 0xF0, 0x08, 0xC0, 0x67, 0x00,</div><div class='add'>+0x97, 0x02, 0x7C, 0x02, 0xF0, 0x09, 0xC0, 0x27, 0x00, 0xDF, 0x82, 0x7C, 0xC2,</div><div class='add'>+0xF0, 0x49, 0xC0, 0xE7, 0x00, 0x9D, 0x00, 0x3C, 0x02, 0xF0, 0x09, 0xC0, 0xE7,</div><div class='add'>+0x00, 0x9F, 0x00, 0x7C, 0x02, 0xF0, 0x89, 0xC0, 0x27, 0x00, 0x9F, 0x80, 0x7C,</div><div class='add'>+0x42, 0xF4, 0x09, 0xC0, 0x53, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14,</div><div class='add'>+0x08, 0x05, 0x00, 0x13, 0x00, 0x4C, 0x48, 0xF0, 0x01, 0xD3, 0x04, 0x00, 0x1F,</div><div class='add'>+0x00, 0x7C, 0x80, 0xF0, 0x81, 0xC0, 0x04, 0x40, 0x13, 0x00, 0x4C, 0x08, 0xF3,</div><div class='add'>+0x21, 0xC5, 0xC7, 0x00, 0x1F, 0x00, 0x5C, 0x00, 0xF0, 0x01, 0xC0, 0x07, 0x00,</div><div class='add'>+0x1B, 0x00, 0x6C, 0x00, 0xF0, 0x01, 0xC0, 0x84, 0x41, 0x13, 0x02, 0x4D, 0x00,</div><div class='add'>+0xF0, 0x41, 0xC0, 0x53, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x80,</div><div class='add'>+0x14, 0x00, 0x71, 0x07, 0xC5, 0x0D, 0x70, 0x17, 0x40, 0x14, 0x00, 0x7D, 0x04,</div><div class='add'>+0x74, 0x01, 0xD0, 0x05, 0x42, 0x58, 0x00, 0x51, 0x00, 0xD4, 0x09, 0xD0, 0x27,</div><div class='add'>+0x40, 0x1F, 0x00, 0x5D, 0x00, 0x44, 0x01, 0x78, 0x05, 0x40, 0x5F, 0x00, 0x71,</div><div class='add'>+0x00, 0x74, 0x01, 0xD0, 0x05, 0xC0, 0x1E, 0x00, 0x71, 0x11, 0x84, 0x05, 0xD2,</div><div class='add'>+0x27, 0x40, 0x53, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0xA0, 0x32,</div><div class='add'>+0x00, 0x91, 0x07, 0x24, 0x2F, 0x50, 0x1C, 0x40, 0x30, 0x80, 0x4D, 0x11, 0x34,</div><div class='add'>+0x03, 0xD0, 0x0D, 0x40, 0x32, 0x10, 0xC9, 0x06, 0x04, 0x07, 0xD0, 0x3C, 0x40,</div><div class='add'>+0x33, 0x80, 0xDD, 0x00, 0x14, 0x03, 0x50, 0x0C, 0x40, 0x37, 0x86, 0x8D, 0x00,</div><div class='add'>+0x34, 0x02, 0xD0, 0x0D, 0x40, 0x30, 0x00, 0xC1, 0x00, 0x04, 0x2F, 0xD0, 0x01,</div><div class='add'>+0x40, 0x53, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x80, 0x78, 0x00,</div><div class='add'>+0x21, 0x24, 0x84, 0x03, 0x50, 0x0E, 0x41, 0x38, 0x02, 0x6D, 0x00, 0xB4, 0x03,</div><div class='add'>+0xD0, 0x0B, 0x50, 0x28, 0x05, 0x69, 0x10, 0xB4, 0x09, 0xD0, 0x2E, 0x42, 0x3B,</div><div class='add'>+0x04, 0xFD, 0x00, 0x84, 0x03, 0x51, 0x0E, 0x40, 0x1B, 0x00, 0x25, 0x00, 0xB4,</div><div class='add'>+0x02, 0xD2, 0x4F, 0x64, 0x7A, 0x20, 0xE1, 0x00, 0x84, 0x03, 0xD0, 0x0A, 0x60,</div><div class='add'>+0x17, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x10, 0x78, 0x00, 0x23,</div><div class='add'>+0x07, 0xAD, 0x05, 0x70, 0x14, 0xC0, 0x78, 0x01, 0xEF, 0x01, 0xBC, 0x07, 0xF0,</div><div class='add'>+0x9E, 0xC0, 0x68, 0x41, 0xA9, 0x09, 0x8C, 0x07, 0xF3, 0x1E, 0xC0, 0x7B, 0x10,</div><div class='add'>+0xEF, 0x01, 0x94, 0x17, 0x70, 0x3E, 0x80, 0x7F, 0x00, 0xEF, 0x01, 0xBC, 0x07,</div><div class='add'>+0xF0, 0x5E, 0x80, 0x7C, 0x00, 0xF1, 0x01, 0x8C, 0x07, 0xF0, 0x16, 0xC0, 0x57,</div><div class='add'>+0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xB8, 0xB5, 0x42, 0x0F, 0x00,</div><div class='add'>+0x7C, 0x01, 0x72, 0x05, 0xC0, 0x77, 0x00, 0xDF, 0x00, 0x7C, 0x03, 0xF0, 0x49,</div><div class='add'>+0xD0, 0x07, 0x0A, 0x17, 0x00, 0x5C, 0x01, 0xF0, 0x0D, 0xC0, 0x37, 0x00, 0xDF,</div><div class='add'>+0x06, 0x7C, 0x03, 0x70, 0x1D, 0xC0, 0x27, 0x40, 0x5B, 0x00, 0x7C, 0x03, 0xF0,</div><div class='add'>+0x1C, 0xC0, 0x27, 0x00, 0xDE, 0x00, 0x7C, 0x03, 0xF0, 0x0D, 0xC0, 0x43, 0x60,</div><div class='add'>+0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xA8, 0xFF, 0x00, 0xB3, 0x01, 0xCC,</div><div class='add'>+0x23, 0xF0, 0x5F, 0xC2, 0x7F, 0x00, 0xFF, 0x01, 0xFC, 0x07, 0x30, 0x1F, 0xC0,</div><div class='add'>+0x6C, 0x00, 0xFB, 0x41, 0xC8, 0x27, 0x30, 0x17, 0xC0, 0x5F, 0x20, 0xFF, 0x13,</div><div class='add'>+0xDC, 0x47, 0xB0, 0x1F, 0xC8, 0x7F, 0x00, 0xBF, 0x01, 0xDC, 0x06, 0x30, 0x1F,</div><div class='add'>+0xD1, 0x7C, 0x00, 0xFF, 0x81, 0xFC, 0x87, 0xF0, 0x1B, 0xC0, 0x03, 0x08, 0x0E,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x88, 0x3D, 0x00, 0xA1, 0x0A, 0x84, 0x09,</div><div class='add'>+0x70, 0x0E, 0x48, 0x3B, 0x04, 0xAD, 0x00, 0xB4, 0x03, 0x10, 0x0F, 0x40, 0x28,</div><div class='add'>+0x10, 0x61, 0x04, 0xC4, 0x23, 0x10, 0x86, 0x40, 0x3B, 0x0A, 0xED, 0x00, 0xC4,</div><div class='add'>+0x03, 0xB2, 0x0E, 0x40, 0x3B, 0x00, 0x3D, 0x00, 0x84, 0x02, 0xB0, 0x0E, 0x40,</div><div class='add'>+0x38, 0x00, 0xAD, 0x88, 0xB4, 0x22, 0xD0, 0x02, 0x40, 0x57, 0x20, 0x06, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x39, 0x00, 0x31, 0x00, 0x84, 0x23, 0xD8,</div><div class='add'>+0x46, 0x40, 0x3B, 0x00, 0xED, 0x02, 0xF4, 0x03, 0x90, 0x2E, 0x40, 0x20, 0x00,</div><div class='add'>+0xA1, 0x20, 0x86, 0x22, 0x98, 0x2A, 0x40, 0x8B, 0x00, 0xED, 0x00, 0x94, 0x03,</div><div class='add'>+0x10, 0x0E, 0x40, 0x3B, 0x00, 0xED, 0x00, 0x94, 0x23, 0x10, 0x0C, 0x40, 0x18,</div><div class='add'>+0x00, 0xED, 0x00, 0xB4, 0x03, 0xD0, 0x0E, 0x41, 0x03, 0x08, 0x04, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x06, 0x20, 0x33, 0x04, 0x01, 0x03, 0x45, 0x00, 0x50, 0x01,</div><div class='add'>+0x40, 0xF3, 0x00, 0x9D, 0x40, 0x36, 0x83, 0x90, 0x0C, 0x40, 0x04, 0x00, 0x01,</div><div class='add'>+0x20, 0x06, 0x02, 0x90, 0x08, 0x44, 0x23, 0x08, 0xCD, 0x00, 0x04, 0x03, 0x90,</div><div class='add'>+0x0C, 0x40, 0x33, 0x02, 0x4D, 0x08, 0x04, 0x03, 0x90, 0x1C, 0x40, 0x20, 0x00,</div><div class='add'>+0xCD, 0x00, 0x74, 0x02, 0xD0, 0x14, 0x40, 0x13, 0x20, 0x0C, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x1D, 0xA0, 0xBD, 0x40, 0x73, 0x11, 0x4C, 0x0A, 0xF0, 0x09, 0xC0,</div><div class='add'>+0x3F, 0x10, 0x5F, 0x03, 0x74, 0x83, 0xB4, 0x09, 0x40, 0x2C, 0x00, 0xD3, 0x00,</div><div class='add'>+0x4C, 0x1A, 0xB0, 0x09, 0xC0, 0x27, 0x00, 0xFF, 0x00, 0xDC, 0x03, 0x30, 0x0F,</div><div class='add'>+0x40, 0x27, 0x00, 0x5F, 0x00, 0x1C, 0x02, 0x30, 0xBF, 0xC1, 0x34, 0x00, 0xDF,</div><div class='add'>+0x00, 0x7C, 0x03, 0xF0, 0x14, 0xC0, 0x57, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x01, 0x00, 0x77, 0x00, 0x5F, 0x06, 0x7C, 0x62, 0xF0, 0x09, 0xC0, 0x37,</div><div class='add'>+0x01, 0x5F, 0x01, 0x7C, 0x03, 0x70, 0x09, 0xC0, 0x27, 0x00, 0xD7, 0x02, 0x7D,</div><div class='add'>+0x00, 0x70, 0x01, 0xC0, 0x27, 0x00, 0xDF, 0x00, 0x7C, 0x03, 0xF2, 0x0D, 0xC4,</div><div class='add'>+0x27, 0x00, 0x5F, 0x02, 0x7C, 0x02, 0xF0, 0x0D, 0xE0, 0x37, 0x00, 0xDF, 0x02,</div><div class='add'>+0x7C, 0x0B, 0xF1, 0x0D, 0xC0, 0x07, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x01, 0x00, 0x3F, 0x00, 0x73, 0x08, 0xCC, 0x00, 0x30, 0x0B, 0xC2, 0x38, 0x00,</div><div class='add'>+0xF3, 0x00, 0xCC, 0x03, 0x31, 0x1B, 0xC0, 0x2E, 0x00, 0xF3, 0x00, 0xCC, 0x40,</div><div class='add'>+0xF0, 0x0A, 0xC4, 0x08, 0x00, 0xF3, 0x00, 0xBC, 0x03, 0x30, 0x0F, 0xC0, 0x2F,</div><div class='add'>+0x00, 0x7F, 0x01, 0x4C, 0x06, 0x30, 0x0E, 0xC8, 0x3C, 0x00, 0x7F, 0x00, 0xFC,</div><div class='add'>+0x03, 0x30, 0x83, 0xC0, 0x00, 0x22, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,</div><div class='add'>+0x20, 0x36, 0x00, 0x51, 0x00, 0x45, 0x0C, 0x11, 0x39, 0x41, 0x34, 0x00, 0xD1,</div><div class='add'>+0x01, 0x2C, 0x03, 0x50, 0x09, 0x40, 0x44, 0x00, 0xC1, 0x02, 0x7C, 0x0C, 0xD0,</div><div class='add'>+0x31, 0xC0, 0x46, 0x00, 0xD1, 0x00, 0x74, 0x03, 0x50, 0x0D, 0xC0, 0x65, 0x00,</div><div class='add'>+0x5D, 0x02, 0x6C, 0x06, 0x14, 0x0D, 0x40, 0x34, 0x00, 0xDD, 0x04, 0x70, 0x07,</div><div class='add'>+0x10, 0x09, 0x40, 0x04, 0x02, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xA8,</div><div class='add'>+0x30, 0x40, 0x01, 0x00, 0x64, 0x06, 0x90, 0x11, 0x40, 0x34, 0x00, 0xD1, 0x01,</div><div class='add'>+0x44, 0x03, 0x18, 0x88, 0x40, 0x24, 0x01, 0xD1, 0x14, 0x44, 0x06, 0xD0, 0x11,</div><div class='add'>+0x40, 0x44, 0x00, 0xD1, 0x00, 0x54, 0x03, 0x90, 0x0D, 0x40, 0x67, 0x04, 0x49,</div><div class='add'>+0x06, 0x44, 0x22, 0x10, 0x0D, 0x40, 0x34, 0x22, 0xDD, 0x40, 0x74, 0x0F, 0x10,</div><div class='add'>+0x0D, 0x40, 0x04, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x20, 0x30,</div><div class='add'>+0x00, 0x01, 0x00, 0x05, 0x02, 0x90, 0x08, 0x56, 0x30, 0x40, 0xC1, 0x00, 0x45,</div><div class='add'>+0x03, 0x50, 0x08, 0x40, 0x20, 0x00, 0x81, 0x00, 0x14, 0x02, 0xD0, 0x00, 0x40,</div><div class='add'>+0x60, 0x00, 0xC1, 0x00, 0x34, 0x03, 0xD2, 0x0C, 0x40, 0x21, 0x00, 0x4D, 0x00,</div><div class='add'>+0x24, 0x02, 0x10, 0x0C, 0x00, 0x30, 0x08, 0x8D, 0x00, 0x34, 0x03, 0x10, 0x05,</div><div class='add'>+0x00, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xB0, 0x3E, 0x10,</div><div class='add'>+0x13, 0x00, 0x4D, 0x02, 0xB0, 0x01, 0x42, 0x34, 0x00, 0x93, 0x20, 0x46, 0x03,</div><div class='add'>+0x30, 0x0B, 0xC0, 0x26, 0x00, 0x53, 0x00, 0x44, 0x00, 0xF1, 0x09, 0x40, 0x04,</div><div class='add'>+0x40, 0xE3, 0x00, 0x7C, 0x03, 0xB0, 0x0D, 0xC0, 0x27, 0x00, 0x5F, 0x00, 0x4C,</div><div class='add'>+0x02, 0x30, 0x0D, 0x90, 0x14, 0x00, 0x5F, 0x00, 0x7C, 0x03, 0x30, 0x09, 0xD0,</div><div class='add'>+0x00, 0xC0, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x98, 0x3F, 0x00, 0x2F,</div><div class='add'>+0x00, 0xFC, 0x02, 0x70, 0x0B, 0xC4, 0x3F, 0x00, 0xBF, 0x00, 0xBC, 0x03, 0xF0,</div><div class='add'>+0x0B, 0xC0, 0x0F, 0x00, 0x2F, 0x00, 0xFC, 0x00, 0xF0, 0x03, 0xC2, 0x0F, 0x00,</div><div class='add'>+0xFF, 0x20, 0xFC, 0x03, 0x70, 0x0F, 0xC0, 0x2D, 0x00, 0x7F, 0x00, 0xFC, 0x02,</div><div class='add'>+0xF0, 0x0F, 0xC0, 0x3F, 0x08, 0xFF, 0x00, 0xFC, 0x01, 0xF0, 0x03, 0xC0, 0x17,</div><div class='add'>+0x60, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xA0, 0xFF, 0x00, 0xFF, 0x09,</div><div class='add'>+0xFC, 0x32, 0xF0, 0x4F, 0xE1, 0x2D, 0x21, 0xFF, 0x09, 0xFC, 0x00, 0xF0, 0x0F,</div><div class='add'>+0xC0, 0x3C, 0x00, 0xFF, 0x1C, 0xCC, 0x52, 0xF0, 0x4F, 0xC0, 0x7C, 0x80, 0xFF,</div><div class='add'>+0x00, 0xCC, 0x13, 0xB0, 0x0F, 0xC0, 0x7C, 0x00, 0xFF, 0x84, 0xBC, 0x05, 0x30,</div><div class='add'>+0x1F, 0xC0, 0x7C, 0x40, 0xFB, 0x01, 0xCC, 0x04, 0xB0, 0x0B, 0xC0, 0x0C, 0x00,</div><div class='add'>+0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x37, 0x00, 0xCD, 0x00, 0x74,</div><div class='add'>+0x3A, 0xD0, 0x3F, 0x40, 0xA7, 0x03, 0xDD, 0x04, 0x74, 0x06, 0xD0, 0x2F, 0x40,</div><div class='add'>+0xFC, 0x00, 0xFD, 0x06, 0x44, 0x1A, 0xD0, 0xBF, 0x46, 0x74, 0x00, 0xFD, 0x06,</div><div class='add'>+0xC4, 0x3B, 0x34, 0xAF, 0x40, 0x74, 0x00, 0xFC, 0x02, 0x74, 0x05, 0x10, 0x1D,</div><div class='add'>+0x40, 0x74, 0x00, 0x91, 0x01, 0x54, 0x03, 0x52, 0x01, 0x40, 0x0D, 0x00, 0x0C,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0xA0, 0x33, 0x01, 0xCD, 0x00, 0x34, 0x00,</div><div class='add'>+0xD0, 0x0C, 0x40, 0x03, 0x04, 0xCD, 0x04, 0x34, 0x02, 0xD0, 0x8C, 0x40, 0x32,</div><div class='add'>+0x02, 0xCD, 0x00, 0x04, 0x40, 0xD1, 0x0C, 0x40, 0x30, 0x00, 0xCD, 0x18, 0x04,</div><div class='add'>+0x43, 0x10, 0x0C, 0x42, 0x30, 0x00, 0xCD, 0x02, 0x74, 0x03, 0x10, 0x0D, 0x40,</div><div class='add'>+0x31, 0x00, 0x49, 0x80, 0x04, 0x01, 0x80, 0x08, 0x60, 0x4C, 0x80, 0x0E, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x03, 0xA8, 0x35, 0x00, 0xDD, 0x00, 0x74, 0x0C, 0xD0,</div><div class='add'>+0x0D, 0x40, 0x47, 0x00, 0xDD, 0x00, 0x74, 0x0E, 0xD0, 0x0D, 0x40, 0x36, 0x00,</div><div class='add'>+0xDD, 0x00, 0x45, 0x06, 0xD0, 0x0D, 0x40, 0x34, 0x10, 0xDD, 0x00, 0x44, 0x03,</div><div class='add'>+0x10, 0x0D, 0x40, 0x34, 0x14, 0xDD, 0x00, 0x74, 0x21, 0x10, 0x0D, 0x60, 0x74,</div><div class='add'>+0x90, 0x11, 0x00, 0x56, 0x01, 0x09, 0x31, 0x40, 0x0D, 0x20, 0x06, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0xA0, 0x37, 0x00, 0xDF, 0x00, 0x7C, 0x0C, 0xF0, 0x0D,</div><div class='add'>+0xC0, 0x67, 0x04, 0xDF, 0x00, 0x7C, 0x04, 0xF0, 0x0D, 0x40, 0x36, 0x00, 0xDF,</div><div class='add'>+0x20, 0x4C, 0x1E, 0xF0, 0x0D, 0xC0, 0x34, 0x00, 0xDD, 0x00, 0x4C, 0x03, 0x30,</div><div class='add'>+0x0D, 0xC0, 0x34, 0x00, 0xDF, 0x00, 0x7C, 0x81, 0x31, 0x2C, 0xC0, 0xF0, 0x04,</div><div class='add'>+0xDB, 0x00, 0x4C, 0x16, 0xA0, 0x31, 0xC0, 0x00, 0x00, 0x0E, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x07, 0x88, 0x3D, 0x00, 0xFF, 0x00, 0x7C, 0x02, 0xF0, 0x0F, 0xC2,</div><div class='add'>+0x2F, 0x00, 0xFF, 0x00, 0x7C, 0x02, 0xF0, 0x0F, 0xD0, 0x35, 0x00, 0xDF, 0x00,</div><div class='add'>+0xFC, 0x02, 0xF0, 0x0E, 0xC0, 0x3F, 0x00, 0xEF, 0x00, 0xFC, 0x43, 0xF0, 0x0F,</div><div class='add'>+0xC4, 0x3F, 0x02, 0xFD, 0x00, 0xF8, 0x01, 0xF4, 0x2F, 0x40, 0x3F, 0x40, 0xFF,</div><div class='add'>+0x00, 0xFC, 0x67, 0xF0, 0x02, 0xC2, 0x1F, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x02, 0x08, 0x35, 0x80, 0xDF, 0x00, 0x5C, 0x08, 0x30, 0x0D, 0xC0, 0xA4,</div><div class='add'>+0x08, 0xDF, 0x00, 0x4C, 0x08, 0x30, 0x5C, 0xC0, 0x34, 0x00, 0xC3, 0x40, 0x4C,</div><div class='add'>+0x48, 0xF0, 0x0D, 0xC0, 0x34, 0x00, 0xD3, 0x00, 0x3C, 0x83, 0xF0, 0x0C, 0xC0,</div><div class='add'>+0x34, 0x04, 0xD7, 0x91, 0x4C, 0x13, 0x74, 0x0D, 0xC5, 0x35, 0x00, 0xDF, 0x84,</div><div class='add'>+0x4C, 0x05, 0xE0, 0x29, 0x81, 0x09, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x13, 0xA0, 0x34, 0x00, 0xDD, 0x00, 0x44, 0x04, 0x10, 0x0F, 0x40, 0xE4, 0x02,</div><div class='add'>+0xDD, 0x00, 0x44, 0x00, 0xB0, 0x2F, 0x40, 0x3D, 0x00, 0xF1, 0x01, 0x44, 0x16,</div><div class='add'>+0xD0, 0x0F, 0xC0, 0x34, 0x00, 0xF7, 0x04, 0xF4, 0x4B, 0xD0, 0xAF, 0x40, 0xB5,</div><div class='add'>+0x00, 0xF0, 0x02, 0x04, 0x15, 0x10, 0x3D, 0x44, 0x34, 0x10, 0xC9, 0x80, 0x44,</div><div class='add'>+0x85, 0x90, 0x31, 0x41, 0x6D, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07,</div><div class='add'>+0x20, 0x30, 0x10, 0xCD, 0x00, 0x04, 0x4E, 0x11, 0x0C, 0x44, 0x40, 0x00, 0xCD,</div><div class='add'>+0x00, 0x04, 0x00, 0x10, 0x2C, 0x40, 0x30, 0x08, 0xC1, 0x04, 0x24, 0x04, 0xD0,</div><div class='add'>+0x0C, 0x50, 0x32, 0x00, 0xC1, 0x07, 0x34, 0x07, 0xD0, 0x0C, 0x40, 0xD0, 0x00,</div><div class='add'>+0xC5, 0x02, 0x00, 0x09, 0x10, 0x14, 0x40, 0x83, 0x41, 0xC1, 0x02, 0x64, 0x00,</div><div class='add'>+0xD0, 0x18, 0x40, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00,</div><div class='add'>+0x78, 0x00, 0xED, 0x01, 0x85, 0x07, 0x14, 0x1C, 0x50, 0x78, 0x04, 0xED, 0x01,</div><div class='add'>+0x85, 0x06, 0x10, 0x1E, 0x40, 0x78, 0x80, 0xE1, 0x11, 0xA4, 0x05, 0xD0, 0x1C,</div><div class='add'>+0x40, 0x7C, 0x00, 0xED, 0x01, 0xB4, 0x07, 0xD0, 0x1E, 0x40, 0x59, 0x06, 0xE5,</div><div class='add'>+0x01, 0x84, 0x05, 0x10, 0x9E, 0x40, 0x7A, 0x07, 0xA1, 0x01, 0xA4, 0x06, 0x91,</div><div class='add'>+0x1A, 0x40, 0x7F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16, 0x18, 0x30,</div><div class='add'>+0x00, 0xCD, 0x00, 0x1C, 0x43, 0x30, 0x0C, 0xC0, 0x10, 0x00, 0xDF, 0x00, 0x04,</div><div class='add'>+0x03, 0x10, 0x0D, 0xC0, 0x30, 0x00, 0xC3, 0x00, 0x2C, 0x21, 0xF0, 0x0C, 0xC0,</div><div class='add'>+0x36, 0x02, 0xC3, 0x00, 0x3C, 0x03, 0xF2, 0x0D, 0xE0, 0x20, 0x00, 0xD7, 0x00,</div><div class='add'>+0x0C, 0x33, 0x30, 0x8C, 0xC1, 0x23, 0x03, 0x4B, 0x20, 0x2C, 0x20, 0xF0, 0x09,</div><div class='add'>+0xC0, 0x4B, 0x68, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x38, 0x3D, 0x10,</div><div class='add'>+0xFF, 0x48, 0xFC, 0x23, 0xF8, 0x0F, 0xC0, 0x1F, 0x00, 0xFF, 0x00, 0xFC, 0x03,</div><div class='add'>+0xF0, 0x0F, 0xC0, 0x3F, 0x10, 0xFF, 0x02, 0x5D, 0x21, 0xF0, 0x0F, 0xC0, 0x3F,</div><div class='add'>+0x00, 0xF7, 0x10, 0x7C, 0x43, 0xF0, 0x0D, 0xC1, 0x2A, 0x00, 0xFB, 0x02, 0x7C,</div><div class='add'>+0x21, 0xF2, 0x88, 0x00, 0x28, 0x03, 0x2F, 0x08, 0xDC, 0x22, 0xF2, 0x8B, 0xC4,</div><div class='add'>+0x09, 0x60, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xA0, 0x37, 0x80, 0xDF,</div><div class='add'>+0x00, 0x7E, 0x01, 0x30, 0x4D, 0xC1, 0x17, 0x00, 0xDF, 0x00, 0x7C, 0x01, 0xF0,</div><div class='add'>+0xAD, 0xD0, 0x34, 0x01, 0xDF, 0x02, 0x5C, 0x03, 0xF0, 0xCD, 0xC0, 0x37, 0x00,</div><div class='add'>+0xDF, 0x04, 0x7C, 0x1B, 0xF8, 0x6D, 0xC0, 0x37, 0x00, 0xD3, 0x0E, 0x7C, 0x01,</div><div class='add'>+0xF0, 0x1D, 0xC0, 0x22, 0x40, 0xCB, 0x00, 0x4C, 0x02, 0xF0, 0x11, 0x40, 0x40,</div><div class='add'>+0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x80, 0x39, 0x00, 0xED, 0x00,</div><div class='add'>+0xF4, 0x03, 0x10, 0x4E, 0x40, 0x3B, 0x00, 0xEC, 0x00, 0xB4, 0x03, 0xD0, 0x8E,</div><div class='add'>+0x40, 0xB8, 0x05, 0xFD, 0x04, 0x84, 0x03, 0xD0, 0x0E, 0x41, 0x3B, 0x00, 0xED,</div><div class='add'>+0x0C, 0xB4, 0x53, 0x70, 0xCE, 0x40, 0x3B, 0x00, 0xE5, 0x00, 0xB4, 0x00, 0xD0,</div><div class='add'>+0x0E, 0x40, 0x28, 0x00, 0xEB, 0x00, 0x84, 0x03, 0xD0, 0x06, 0x40, 0x4C, 0x00,</div><div class='add'>+0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x79, 0x00, 0xE5, 0x01, 0xB4,</div><div class='add'>+0x87, 0x92, 0xDE, 0x42, 0x7B, 0x00, 0xED, 0x01, 0xB4, 0x07, 0xD0, 0x5C, 0x40,</div><div class='add'>+0x78, 0x00, 0xFD, 0x4D, 0x94, 0x07, 0xD0, 0x5E, 0x40, 0x7B, 0x00, 0xED, 0x05,</div><div class='add'>+0xB4, 0x07, 0xD0, 0x1E, 0x44, 0x7F, 0x00, 0xE1, 0x05, 0xB4, 0x07, 0xD0, 0x1E,</div><div class='add'>+0x41, 0x6E, 0x80, 0xF9, 0x01, 0x84, 0x07, 0xD0, 0x1C, 0x60, 0x10, 0x20, 0x04,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x28, 0x33, 0x00, 0xDD, 0x00, 0x74, 0x43,</div><div class='add'>+0x94, 0x0C, 0x40, 0xF3, 0x01, 0xCD, 0x00, 0x36, 0x3F, 0xD0, 0x0D, 0x40, 0x30,</div><div class='add'>+0x10, 0xDD, 0x00, 0x04, 0x47, 0x90, 0x0C, 0x42, 0x33, 0x00, 0xDD, 0x00, 0x74,</div><div class='add'>+0x03, 0x52, 0x0C, 0x40, 0xB3, 0x02, 0xC5, 0x00, 0x34, 0x00, 0xD0, 0x4C, 0x46,</div><div class='add'>+0x60, 0xA2, 0xC9, 0x09, 0x44, 0x03, 0xC0, 0x1C, 0x40, 0x58, 0x20, 0x0C, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x17, 0xA0, 0x15, 0x08, 0x5F, 0x00, 0xF4, 0x15, 0xB0,</div><div class='add'>+0x05, 0xC0, 0x9F, 0x01, 0x5F, 0x00, 0xFC, 0x01, 0xF2, 0x05, 0xC0, 0x14, 0x08,</div><div class='add'>+0x5F, 0x00, 0xDC, 0x19, 0xF3, 0x05, 0xC0, 0x17, 0x00, 0x5F, 0x00, 0x7C, 0x01,</div><div class='add'>+0xF0, 0x05, 0xC0, 0x5F, 0x20, 0x53, 0x00, 0xFC, 0x15, 0xF0, 0x07, 0xCC, 0x9A,</div><div class='add'>+0x20, 0x6B, 0x02, 0xCD, 0x09, 0xF0, 0x37, 0xD0, 0x5C, 0x00, 0x04, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x12, 0x0A, 0x05, 0x00, 0x1F, 0x00, 0x7C, 0x00, 0x70, 0x01,</div><div class='add'>+0xC0, 0x07, 0x00, 0x1F, 0x00, 0x7C, 0x00, 0xF0, 0x01, 0xC0, 0x07, 0x20, 0x1F,</div><div class='add'>+0x40, 0x7C, 0x00, 0xF0, 0x01, 0xC0, 0x07, 0x00, 0x1F, 0x00, 0x7C, 0x00, 0x70,</div><div class='add'>+0x21, 0xC0, 0x87, 0x01, 0x1F, 0x02, 0x7E, 0x00, 0xF2, 0x01, 0xC0, 0x07, 0x04,</div><div class='add'>+0x1F, 0x10, 0x7C, 0x48, 0xB0, 0xE1, 0xC8, 0x4B, 0x20, 0x04, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x10, 0x08, 0x25, 0x00, 0x9F, 0x80, 0x4C, 0x02, 0x30, 0x09, 0xC0,</div><div class='add'>+0xA7, 0x00, 0x9F, 0x00, 0x7C, 0x02, 0xF0, 0x09, 0xC0, 0x25, 0x80, 0x9F, 0x08,</div><div class='add'>+0x0C, 0x02, 0x30, 0x09, 0xC0, 0x27, 0x00, 0x9F, 0x00, 0x4C, 0x0E, 0x30, 0x08,</div><div class='add'>+0xC0, 0x24, 0x00, 0x97, 0x00, 0x7C, 0x86, 0x72, 0x29, 0xCA, 0xA7, 0x08, 0x97,</div><div class='add'>+0x05, 0x5C, 0x02, 0x30, 0x19, 0xC0, 0x43, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x01, 0x20, 0x24, 0x08, 0x9D, 0x20, 0x44, 0x36, 0x04, 0x09, 0x44, 0xE7,</div><div class='add'>+0x00, 0x9D, 0x00, 0x74, 0x02, 0xD0, 0x29, 0x40, 0x25, 0x90, 0x9C, 0x01, 0x44,</div><div class='add'>+0x0A, 0x14, 0x09, 0x40, 0x27, 0x00, 0x9D, 0x03, 0x45, 0x0A, 0xA4, 0x09, 0x51,</div><div class='add'>+0xA0, 0x00, 0x90, 0x12, 0x34, 0x26, 0x10, 0x29, 0x40, 0x27, 0x00, 0x99, 0x00,</div><div class='add'>+0x6C, 0x8A, 0x50, 0x19, 0x41, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x18, 0xA0, 0x24, 0x00, 0x9D, 0x00, 0x45, 0x02, 0x00, 0x09, 0x40, 0x27, 0x00,</div><div class='add'>+0x9D, 0x00, 0x40, 0x02, 0xD0, 0x09, 0x00, 0x24, 0x20, 0x9C, 0x10, 0x44, 0x22,</div><div class='add'>+0x10, 0x09, 0x44, 0x25, 0x00, 0x9D, 0x14, 0x44, 0x42, 0x90, 0x19, 0x40, 0x24,</div><div class='add'>+0x04, 0x95, 0x00, 0x54, 0x02, 0x40, 0x0D, 0x41, 0x26, 0x00, 0x9D, 0x42, 0x54,</div><div class='add'>+0x12, 0x10, 0x49, 0x40, 0x63, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10,</div><div class='add'>+0x20, 0x20, 0x00, 0x8D, 0x00, 0x04, 0x12, 0x11, 0x48, 0x40, 0x33, 0x01, 0x8D,</div><div class='add'>+0x00, 0x34, 0x12, 0xD0, 0x4D, 0x4C, 0x21, 0x11, 0x8D, 0x04, 0x04, 0x13, 0x10,</div><div class='add'>+0x48, 0x60, 0x23, 0x00, 0x8D, 0x04, 0x04, 0x12, 0x90, 0x48, 0x44, 0x24, 0x00,</div><div class='add'>+0x81, 0x84, 0x76, 0x02, 0x1A, 0x08, 0x40, 0x23, 0x88, 0x89, 0x80, 0x24, 0x02,</div><div class='add'>+0x50, 0x48, 0x40, 0x43, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1D, 0x38,</div><div class='add'>+0x86, 0x0A, 0x1F, 0x0A, 0x4C, 0x28, 0x30, 0x01, 0xC0, 0x87, 0x02, 0x1F, 0x0A,</div><div class='add'>+0x7C, 0x00, 0xF0, 0xA1, 0xC0, 0x04, 0x00, 0x1D, 0x0A, 0x4D, 0x28, 0x32, 0x01,</div><div class='add'>+0xC4, 0x07, 0x00, 0x1F, 0x0A, 0x4C, 0x28, 0x30, 0xA1, 0x40, 0x04, 0x08, 0x17,</div><div class='add'>+0x4A, 0x5C, 0x00, 0x70, 0x01, 0xC0, 0x06, 0x00, 0x17, 0x00, 0x5C, 0x29, 0x30,</div><div class='add'>+0xA1, 0xC0, 0x77, 0x80, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xB2, 0x25,</div><div class='add'>+0x00, 0x9F, 0x40, 0xFC, 0x22, 0xF0, 0x89, 0xC0, 0x2F, 0x02, 0x9F, 0x00, 0xFC,</div><div class='add'>+0x22, 0xF0, 0x89, 0xC0, 0x27, 0x02, 0x9F, 0x48, 0xFC, 0x22, 0xF0, 0x89, 0xC2,</div><div class='add'>+0x27, 0x00, 0x9F, 0x08, 0x7C, 0x22, 0x70, 0x89, 0xC0, 0x3B, 0x00, 0x9F, 0x08,</div><div class='add'>+0xFC, 0x02, 0xF0, 0x0A, 0xC0, 0x2F, 0x00, 0xB7, 0x80, 0xDC, 0x02, 0xF1, 0x8F,</div><div class='add'>+0xC0, 0x77, 0x20, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1C, 0x80, 0x27, 0x00,</div><div class='add'>+0x9F, 0x08, 0xFC, 0x02, 0x30, 0x09, 0xC0, 0x2C, 0x02, 0x93, 0x00, 0x7C, 0x52,</div><div class='add'>+0xF0, 0xCB, 0xC0, 0x27, 0x00, 0xBF, 0x00, 0xFC, 0x22, 0xB0, 0x49, 0xC0, 0x27,</div><div class='add'>+0x00, 0xBF, 0x0C, 0xFC, 0x02, 0xE0, 0x0B, 0xC0, 0x2D, 0x00, 0xB3, 0x04, 0xDC,</div><div class='add'>+0x02, 0xB0, 0x0B, 0xC0, 0x2A, 0x40, 0xB3, 0x00, 0xBC, 0x03, 0x30, 0x0B, 0xC0,</div><div class='add'>+0x77, 0x80, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x07, 0x01, 0x1D,</div><div class='add'>+0x04, 0x74, 0x49, 0x10, 0x01, 0x44, 0x14, 0x42, 0x01, 0x14, 0x74, 0x00, 0xD0,</div><div class='add'>+0xC1, 0x4C, 0x87, 0x10, 0x1D, 0x50, 0x74, 0x20, 0x10, 0x01, 0x40, 0x07, 0x00,</div><div class='add'>+0x1D, 0x0C, 0x74, 0x48, 0xD0, 0x01, 0x45, 0x07, 0x00, 0x11, 0x14, 0x74, 0x00,</div><div class='add'>+0xD0, 0x05, 0x40, 0x04, 0x00, 0x11, 0x00, 0x74, 0x00, 0x10, 0x01, 0x40, 0x63,</div><div class='add'>+0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x21, 0x05, 0x8D, 0x04,</div><div class='add'>+0x34, 0xB2, 0x14, 0x88, 0x40, 0x20, 0x00, 0x81, 0x04, 0x36, 0x02, 0xD0, 0x48,</div><div class='add'>+0x48, 0x23, 0x82, 0x8D, 0x08, 0x34, 0x02, 0x14, 0x88, 0x60, 0x23, 0x00, 0x8D,</div><div class='add'>+0x04, 0x34, 0x32, 0xD0, 0x88, 0x40, 0x27, 0x00, 0x81, 0x0C, 0x36, 0x02, 0x52,</div><div class='add'>+0x08, 0x40, 0x23, 0x00, 0x81, 0x00, 0x14, 0x02, 0x18, 0x08, 0x40, 0x4B, 0x80,</div><div class='add'>+0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x28, 0x25, 0x00, 0x9D, 0x00, 0x74,</div><div class='add'>+0x12, 0x10, 0x09, 0x50, 0x24, 0x01, 0x91, 0x00, 0x74, 0x02, 0xD0, 0x09, 0x40,</div><div class='add'>+0x27, 0x00, 0x9D, 0x00, 0x74, 0x0B, 0x10, 0x09, 0x40, 0x27, 0x00, 0xDD, 0x00,</div><div class='add'>+0x74, 0x02, 0xD8, 0x09, 0x40, 0x27, 0x00, 0x91, 0x00, 0x74, 0x02, 0xD0, 0x09,</div><div class='add'>+0x40, 0x27, 0x04, 0x91, 0x02, 0x70, 0x12, 0x19, 0x09, 0x40, 0x63, 0x20, 0x04,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x20, 0x24, 0x00, 0x9F, 0x00, 0x78, 0x06,</div><div class='add'>+0x30, 0x09, 0xC0, 0x64, 0x00, 0x93, 0x00, 0x7C, 0x4E, 0xF0, 0x09, 0xC0, 0x27,</div><div class='add'>+0x00, 0x9F, 0x00, 0x7C, 0x02, 0xB2, 0x09, 0xC0, 0x27, 0x00, 0x9F, 0x00, 0x7C,</div><div class='add'>+0x02, 0xF2, 0x09, 0xC0, 0x67, 0x40, 0x93, 0x00, 0x7C, 0x42, 0xB0, 0xB9, 0xC0,</div><div class='add'>+0x27, 0x00, 0x93, 0x00, 0x7C, 0x46, 0x34, 0x19, 0xC0, 0x17, 0x00, 0x0C, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x16, 0x08, 0x25, 0x00, 0x9F, 0x00, 0x3C, 0x06, 0xF0,</div><div class='add'>+0x08, 0xC0, 0x67, 0x00, 0x9C, 0x00, 0x7C, 0x12, 0xF0, 0x09, 0xC1, 0x27, 0x00,</div><div class='add'>+0x9F, 0x00, 0x7C, 0x22, 0xF0, 0x09, 0xC0, 0x27, 0x00, 0x9F, 0x00, 0x7C, 0x02,</div><div class='add'>+0xF0, 0x09, 0xC1, 0x27, 0x02, 0x9F, 0xB0, 0x7C, 0x42, 0xF0, 0x19, 0x02, 0x24,</div><div class='add'>+0x01, 0x9F, 0x00, 0x7C, 0x06, 0xF0, 0x99, 0xC1, 0x5B, 0x20, 0x04, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x14, 0x08, 0x05, 0x00, 0x1F, 0x00, 0x7C, 0x08, 0xF0, 0x01,</div><div class='add'>+0xC0, 0xC7, 0x00, 0x1F, 0x00, 0x4C, 0x08, 0x30, 0x01, 0xC0, 0x04, 0x00, 0x1F,</div><div class='add'>+0x01, 0x7C, 0x30, 0xF0, 0x01, 0xC0, 0x07, 0x00, 0x1F, 0x01, 0x5C, 0x04, 0xF0,</div><div class='add'>+0x01, 0xC8, 0x86, 0x09, 0x13, 0x08, 0x6D, 0x08, 0xE0, 0x41, 0xC0, 0x84, 0x00,</div><div class='add'>+0x17, 0x40, 0x6C, 0x10, 0x10, 0xA1, 0xC2, 0x50, 0x20, 0x04, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x10, 0x00, 0x14, 0x00, 0x5D, 0x80, 0xF4, 0x1D, 0x70, 0x05, 0x40,</div><div class='add'>+0x5F, 0x20, 0x5D, 0x00, 0x4C, 0x01, 0x10, 0x27, 0x40, 0x14, 0x00, 0x7D, 0x00,</div><div class='add'>+0xF4, 0x0D, 0xD0, 0x05, 0x40, 0x17, 0x00, 0x7D, 0x01, 0xC4, 0x05, 0x70, 0x27,</div><div class='add'>+0x40, 0x18, 0x00, 0x71, 0x82, 0xC4, 0x19, 0xD0, 0x16, 0x41, 0x18, 0x01, 0x71,</div><div class='add'>+0x1B, 0xE4, 0x45, 0x10, 0x07, 0x40, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x10, 0xA0, 0x32, 0x00, 0xCD, 0x00, 0x34, 0x1F, 0x58, 0x0C, 0x40, 0x77,</div><div class='add'>+0x00, 0xC9, 0x00, 0x25, 0x03, 0x14, 0x2C, 0x50, 0x30, 0x00, 0xCD, 0x01, 0x74,</div><div class='add'>+0x07, 0xD0, 0x0C, 0x40, 0x33, 0x00, 0xCD, 0x00, 0x14, 0x03, 0x50, 0x1C, 0x50,</div><div class='add'>+0xB0, 0x42, 0xC1, 0x00, 0x04, 0x03, 0xD0, 0x2C, 0x40, 0x50, 0x40, 0xC5, 0x02,</div><div class='add'>+0x64, 0x07, 0x94, 0x1C, 0x40, 0x40, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x04, 0x80, 0x38, 0x02, 0xED, 0x08, 0xB4, 0x03, 0x58, 0x0E, 0x40, 0x3B, 0x0C,</div><div class='add'>+0xED, 0x05, 0x04, 0x07, 0x10, 0x1E, 0x41, 0x38, 0x00, 0x6D, 0x10, 0xB4, 0x03,</div><div class='add'>+0xD0, 0x0E, 0x40, 0x3B, 0x00, 0xED, 0x03, 0x84, 0x09, 0x50, 0x36, 0x40, 0x3C,</div><div class='add'>+0x00, 0xE1, 0x01, 0x84, 0x03, 0xD0, 0x0F, 0x40, 0x1C, 0x00, 0xE1, 0x00, 0xE6,</div><div class='add'>+0x82, 0x90, 0x16, 0x40, 0x11, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14,</div><div class='add'>+0x18, 0x78, 0x00, 0xEF, 0x11, 0xBC, 0x05, 0x70, 0x1E, 0xC0, 0x7B, 0x00, 0xEF,</div><div class='add'>+0x87, 0xAC, 0x87, 0x30, 0x1F, 0xC0, 0x78, 0x00, 0xED, 0x21, 0xBC, 0x07, 0xF0,</div><div class='add'>+0x1E, 0xC0, 0x7B, 0x00, 0xCF, 0x81, 0x9C, 0x07, 0x78, 0x1F, 0xC0, 0x78, 0x00,</div><div class='add'>+0xC3, 0x81, 0x8C, 0x07, 0xDA, 0x0A, 0xC4, 0x58, 0x20, 0xE7, 0x21, 0xAE, 0x07,</div><div class='add'>+0xB1, 0x1B, 0xC4, 0x50, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xB8,</div><div class='add'>+0x35, 0x01, 0xDF, 0x06, 0x7E, 0x01, 0x70, 0x0D, 0xC0, 0x37, 0x00, 0xDF, 0x16,</div><div class='add'>+0x7C, 0x03, 0xF0, 0x0D, 0xC0, 0x37, 0x00, 0xDF, 0x00, 0x7C, 0x03, 0xF0, 0x0D,</div><div class='add'>+0xC0, 0x37, 0x20, 0xDF, 0x00, 0x7C, 0x01, 0x70, 0x05, 0xC0, 0x31, 0x00, 0x5F,</div><div class='add'>+0x00, 0x5C, 0x03, 0xF8, 0x0C, 0xC0, 0x17, 0x00, 0xDF, 0x00, 0x70, 0x02, 0x70,</div><div class='add'>+0x01, 0xC0, 0x43, 0x60, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x20, 0xFD,</div><div class='add'>+0x02, 0xF3, 0x01, 0xFC, 0x23, 0xF0, 0x1F, 0xC0, 0x7F, 0x00, 0xF3, 0x81, 0xFC,</div><div class='add'>+0x07, 0xF0, 0x1F, 0xC0, 0x7F, 0x02, 0xFF, 0x01, 0xCC, 0x07, 0x30, 0x1F, 0xC0,</div><div class='add'>+0x7F, 0x00, 0xF7, 0x01, 0xCC, 0x27, 0x38, 0x1F, 0xC0, 0x7F, 0x00, 0x73, 0x01,</div><div class='add'>+0x8C, 0x87, 0xB8, 0x97, 0xC0, 0x5C, 0x00, 0xEF, 0x21, 0xCC, 0x05, 0xF0, 0x17,</div><div class='add'>+0xC0, 0x18, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x00, 0x39, 0x00,</div><div class='add'>+0xE1, 0x00, 0xB4, 0x03, 0xD8, 0x0E, 0x40, 0x3B, 0x02, 0xE1, 0x00, 0xB4, 0x03,</div><div class='add'>+0xD0, 0x82, 0x40, 0x3B, 0x00, 0x7D, 0x08, 0xC4, 0x03, 0x10, 0x0E, 0x40, 0x3B,</div><div class='add'>+0x00, 0x7D, 0x04, 0x84, 0x01, 0x14, 0x4E, 0x40, 0x3B, 0x01, 0x3B, 0x00, 0x85,</div><div class='add'>+0x43, 0x10, 0xCE, 0x40, 0x18, 0x01, 0xED, 0x08, 0x94, 0x62, 0xD0, 0x62, 0x40,</div><div class='add'>+0x54, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x39, 0x08, 0xE1,</div><div class='add'>+0x00, 0xB4, 0x23, 0xD8, 0x0E, 0x40, 0x9B, 0x04, 0xE1, 0x00, 0xB4, 0x23, 0xD0,</div><div class='add'>+0x0E, 0x40, 0x3B, 0x88, 0x6D, 0x00, 0x84, 0x09, 0x10, 0x0E, 0x40, 0x3B, 0x00,</div><div class='add'>+0xE5, 0x80, 0x94, 0x03, 0x18, 0x0A, 0x4C, 0x3B, 0x10, 0xE1, 0x00, 0xB4, 0x03,</div><div class='add'>+0x90, 0x0F, 0x44, 0x89, 0x10, 0xED, 0x00, 0x84, 0x00, 0xD0, 0x0A, 0x61, 0x60,</div><div class='add'>+0x02, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x28, 0x35, 0x00, 0xC1, 0x40,</div><div class='add'>+0x34, 0x1A, 0xD0, 0x0C, 0x40, 0x67, 0xC0, 0xC1, 0x00, 0x34, 0x03, 0xD0, 0x00,</div><div class='add'>+0x40, 0x33, 0x80, 0x0D, 0x00, 0x05, 0x02, 0x10, 0x0C, 0x40, 0x33, 0x10, 0x8D,</div><div class='add'>+0x40, 0x44, 0x00, 0x18, 0x08, 0x40, 0x33, 0x20, 0x01, 0x00, 0x24, 0x03, 0x10,</div><div class='add'>+0x2C, 0x40, 0x50, 0x10, 0xCD, 0x01, 0x14, 0x0A, 0xD8, 0x20, 0x42, 0x08, 0x20,</div><div class='add'>+0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0xA0, 0x3D, 0x00, 0xF3, 0x00, 0x7C,</div><div class='add'>+0x16, 0xD0, 0x0D, 0xC4, 0x47, 0x00, 0xF3, 0x00, 0x7C, 0x0B, 0xD0, 0x01, 0xC0,</div><div class='add'>+0x37, 0x00, 0x9F, 0x00, 0x4C, 0x04, 0x30, 0x0D, 0xC0, 0x37, 0x00, 0x17, 0x00,</div><div class='add'>+0x5C, 0x02, 0x30, 0x09, 0x00, 0x37, 0x00, 0x91, 0x00, 0x6C, 0x8B, 0xB0, 0x2C,</div><div class='add'>+0xC1, 0x50, 0x01, 0xDF, 0x00, 0x40, 0x08, 0xD0, 0x89, 0xC0, 0x74, 0x00, 0x06,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x08, 0x37, 0x00, 0xDF, 0x00, 0x7C, 0x02,</div><div class='add'>+0xF0, 0x0D, 0xC0, 0x07, 0x00, 0xDF, 0x00, 0x7C, 0x43, 0xF0, 0x01, 0xC0, 0x33,</div><div class='add'>+0x00, 0x1F, 0x02, 0x7C, 0x20, 0xF0, 0x0D, 0xC8, 0x37, 0x00, 0x9F, 0x02, 0x7C,</div><div class='add'>+0x0A, 0xF0, 0x09, 0xE0, 0xA7, 0x08, 0x9F, 0x42, 0x5C, 0x43, 0xF2, 0x0D, 0xD0,</div><div class='add'>+0xB7, 0x08, 0xDF, 0x2A, 0x7C, 0x08, 0xF0, 0x29, 0xD0, 0x17, 0x20, 0x0C, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x80, 0x08, 0x3F, 0x00, 0xF3, 0x00, 0xFC, 0x00, 0xF0,</div><div class='add'>+0x0F, 0xC0, 0x27, 0x00, 0xF3, 0x00, 0xFC, 0x03, 0xF0, 0x0B, 0xC0, 0x3F, 0x40,</div><div class='add'>+0xB3, 0x00, 0x9C, 0x02, 0x30, 0x0F, 0xC0, 0x3F, 0x00, 0x3F, 0x00, 0x7C, 0x02,</div><div class='add'>+0xB0, 0x03, 0xC0, 0x3F, 0x20, 0xAF, 0x20, 0xDC, 0x03, 0x30, 0x0F, 0xC1, 0x1D,</div><div class='add'>+0x00, 0xB6, 0x00, 0xCC, 0x42, 0x80, 0x09, 0xC0, 0x07, 0x20, 0x0C, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x81, 0x20, 0x36, 0x40, 0xD1, 0x00, 0x74, 0x04, 0xD0, 0x0D,</div><div class='add'>+0x60, 0x67, 0x00, 0xD1, 0x00, 0x74, 0x03, 0xD0, 0x39, 0x40, 0x37, 0x00, 0x91,</div><div class='add'>+0x03, 0x5C, 0x06, 0x10, 0x0D, 0x40, 0x37, 0x00, 0x9D, 0x01, 0x74, 0x46, 0x10,</div><div class='add'>+0x11, 0x41, 0x67, 0x01, 0x19, 0x01, 0x04, 0x06, 0xB0, 0x3D, 0x40, 0x74, 0x01,</div><div class='add'>+0x01, 0x45, 0x44, 0x4E, 0x90, 0x19, 0x40, 0x07, 0x00, 0x08, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x01, 0xA0, 0x34, 0x00, 0xD1, 0x00, 0x76, 0x04, 0xD0, 0x0D, 0x4A,</div><div class='add'>+0x47, 0x04, 0xD1, 0x00, 0x74, 0x03, 0xD0, 0x39, 0x40, 0x37, 0x00, 0x91, 0x11,</div><div class='add'>+0x74, 0x04, 0x10, 0x0D, 0x40, 0x37, 0x00, 0x1D, 0x01, 0x74, 0x04, 0x10, 0x19,</div><div class='add'>+0x40, 0x77, 0x00, 0x9D, 0x03, 0x40, 0x47, 0x10, 0x8D, 0x01, 0x55, 0x00, 0xD5,</div><div class='add'>+0x81, 0x44, 0x84, 0x90, 0x11, 0x48, 0x07, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x10, 0x00, 0x30, 0x00, 0xC1, 0x00, 0x34, 0x06, 0xD0, 0x0C, 0x40, 0x03,</div><div class='add'>+0x00, 0xC1, 0x00, 0x34, 0x03, 0xD0, 0x00, 0x40, 0x33, 0x00, 0x01, 0x00, 0x14,</div><div class='add'>+0x00, 0x10, 0x0C, 0x40, 0x33, 0x00, 0x0D, 0x00, 0x34, 0x00, 0x90, 0x08, 0x64,</div><div class='add'>+0x33, 0x00, 0x89, 0x00, 0x47, 0x01, 0x90, 0x0C, 0x40, 0x30, 0x08, 0xD5, 0x00,</div><div class='add'>+0x04, 0x00, 0x90, 0x00, 0x44, 0x43, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x38, 0x3A, 0x00, 0xF3, 0x00, 0x7C, 0x00, 0xF0, 0x0D, 0x40, 0x07, 0x00,</div><div class='add'>+0xF3, 0x00, 0x7C, 0x03, 0xF0, 0x09, 0xC0, 0x37, 0x00, 0x93, 0x00, 0x5C, 0x00,</div><div class='add'>+0x30, 0x0D, 0xC0, 0x37, 0x00, 0x1D, 0x00, 0x7C, 0x02, 0x30, 0x01, 0xC0, 0x37,</div><div class='add'>+0x00, 0x9F, 0x00, 0x5C, 0x03, 0x30, 0x0D, 0xC0, 0x15, 0x08, 0xD7, 0x00, 0x4D,</div><div class='add'>+0x80, 0xB0, 0x09, 0xC0, 0x07, 0x60, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05,</div><div class='add'>+0xB8, 0x3F, 0x00, 0xFF, 0x00, 0xFC, 0x02, 0xF0, 0x0F, 0xC4, 0x2F, 0x00, 0xFF,</div><div class='add'>+0x00, 0xFC, 0x03, 0xF2, 0x03, 0xC0, 0x3F, 0x00, 0xBF, 0x00, 0xDC, 0x02, 0xF0,</div><div class='add'>+0x0F, 0xC0, 0x3F, 0x00, 0xBF, 0x00, 0xFC, 0x02, 0x70, 0x03, 0xC0, 0x1B, 0x80,</div><div class='add'>+0x3F, 0x00, 0xFC, 0x01, 0xD0, 0x0E, 0xC0, 0x3F, 0x00, 0xFB, 0x00, 0xFE, 0x02,</div><div class='add'>+0xF0, 0x0B, 0xC0, 0x17, 0x42, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xA0,</div><div class='add'>+0x6F, 0x00, 0xF3, 0x01, 0xFC, 0x40, 0xF0, 0x02, 0xC0, 0x2C, 0x00, 0xB3, 0x40,</div><div class='add'>+0xEC, 0x02, 0x70, 0x1F, 0xC0, 0x2F, 0x00, 0xFB, 0x10, 0xFC, 0x02, 0x30, 0x03,</div><div class='add'>+0xC0, 0x68, 0x00, 0xFF, 0x00, 0xCC, 0x07, 0xB0, 0x0F, 0xC0, 0x3E, 0x09, 0xFF,</div><div class='add'>+0x01, 0xAC, 0x07, 0xF0, 0x4F, 0xC0, 0x7B, 0x00, 0xB3, 0x00, 0xCD, 0x03, 0x34,</div><div class='add'>+0x0F, 0xC0, 0x0F, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x08, 0x21,</div><div class='add'>+0x00, 0xD1, 0x10, 0x5C, 0x00, 0xD0, 0x11, 0x40, 0x6C, 0x08, 0x91, 0x0B, 0x58,</div><div class='add'>+0x00, 0x10, 0x1D, 0xC0, 0xA5, 0x06, 0xC1, 0x12, 0x74, 0x02, 0x10, 0x11, 0xC8,</div><div class='add'>+0x65, 0x00, 0xCD, 0x00, 0x54, 0x07, 0x10, 0x0D, 0x40, 0x74, 0x12, 0xDD, 0x01,</div><div class='add'>+0x54, 0x07, 0xD2, 0xBD, 0x40, 0x77, 0x40, 0x91, 0x10, 0x44, 0x0B, 0x10, 0x1D,</div><div class='add'>+0x00, 0x0F, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0x20, 0x33, 0x00,</div><div class='add'>+0xC1, 0x00, 0x34, 0x04, 0xD0, 0x10, 0x40, 0x20, 0x00, 0xD1, 0x00, 0x04, 0x00,</div><div class='add'>+0x50, 0x0C, 0x40, 0x23, 0x09, 0xC1, 0x84, 0x34, 0x02, 0x12, 0x00, 0x40, 0x20,</div><div class='add'>+0x00, 0xC1, 0x00, 0x04, 0x03, 0x90, 0x0C, 0x40, 0x30, 0x00, 0xDD, 0x00, 0x04,</div><div class='add'>+0x03, 0x90, 0x0C, 0x40, 0x35, 0x80, 0x95, 0x84, 0x04, 0x70, 0x14, 0x0C, 0x40,</div><div class='add'>+0x4F, 0x80, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xA8, 0x35, 0x00, 0xD1,</div><div class='add'>+0x00, 0x74, 0x04, 0xD0, 0x41, 0x40, 0x64, 0x40, 0xD1, 0x08, 0x74, 0x44, 0x10,</div><div class='add'>+0x0D, 0x40, 0x27, 0x40, 0xD1, 0x00, 0x74, 0x06, 0x10, 0x01, 0x40, 0x26, 0x00,</div><div class='add'>+0xDD, 0x00, 0x54, 0x83, 0x10, 0x0D, 0x40, 0x34, 0x00, 0x1D, 0x01, 0x54, 0x13,</div><div class='add'>+0xD0, 0x0D, 0x40, 0x27, 0x40, 0xD5, 0x18, 0x44, 0x02, 0x10, 0x0D, 0x48, 0x0F,</div><div class='add'>+0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x88, 0x36, 0x00, 0xD3, 0x00,</div><div class='add'>+0x7C, 0x04, 0xF2, 0x14, 0xD0, 0x64, 0x00, 0x83, 0x80, 0x4C, 0x0E, 0x70, 0x0D,</div><div class='add'>+0xC0, 0x27, 0x00, 0xDB, 0x00, 0x7C, 0x1E, 0x30, 0x15, 0xD0, 0x24, 0x00, 0xDF,</div><div class='add'>+0x00, 0x0C, 0x03, 0xB1, 0x0D, 0xC0, 0x36, 0x00, 0xCF, 0x81, 0x4C, 0x03, 0xF0,</div><div class='add'>+0x0D, 0xC0, 0x33, 0x00, 0x87, 0x03, 0x4C, 0x27, 0x30, 0x0D, 0xC0, 0x03, 0x20,</div><div class='add'>+0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x80, 0x3D, 0x00, 0xFF, 0x00, 0xDC,</div><div class='add'>+0x40, 0xF0, 0x07, 0xC0, 0x3F, 0x08, 0xBF, 0x00, 0x9C, 0x02, 0xD0, 0x0F, 0xC0,</div><div class='add'>+0x21, 0x00, 0xFF, 0x00, 0xBC, 0x02, 0xF0, 0x96, 0xC0, 0x6D, 0x01, 0xEF, 0x00,</div><div class='add'>+0xFC, 0x03, 0xF0, 0x0E, 0xC0, 0x3F, 0x00, 0xFF, 0x00, 0xDC, 0x07, 0xF0, 0x0F,</div><div class='add'>+0xC0, 0x3F, 0x00, 0xFB, 0x01, 0xFC, 0x03, 0xF0, 0x0D, 0xC0, 0x1F, 0x00, 0x06,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x08, 0x35, 0x00, 0xD3, 0x00, 0x74, 0x00,</div><div class='add'>+0x30, 0x85, 0xC0, 0x25, 0x00, 0xD3, 0x00, 0x7C, 0x08, 0xF0, 0x0D, 0xC0, 0x37,</div><div class='add'>+0x00, 0xDF, 0x00, 0x4C, 0x3A, 0xD0, 0x05, 0x40, 0x24, 0x20, 0xD3, 0x08, 0x4D,</div><div class='add'>+0x03, 0xF0, 0x0D, 0xC0, 0x34, 0x00, 0xD3, 0x00, 0x7C, 0x02, 0x70, 0x0D, 0xC0,</div><div class='add'>+0x37, 0x00, 0x93, 0x00, 0x4D, 0x03, 0xF0, 0x0D, 0xC0, 0x28, 0x20, 0x04, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x13, 0xA0, 0x34, 0x00, 0xD5, 0x05, 0x74, 0x14, 0x10,</div><div class='add'>+0x07, 0xC0, 0xB2, 0x00, 0xD1, 0x00, 0x74, 0x28, 0xD0, 0x0D, 0x40, 0x37, 0x00,</div><div class='add'>+0xF1, 0x00, 0x7C, 0x06, 0xD1, 0x0D, 0x43, 0x25, 0x00, 0xF5, 0x00, 0x54, 0x2F,</div><div class='add'>+0xD0, 0x0F, 0x40, 0x7C, 0x00, 0x51, 0x11, 0x7C, 0x02, 0x10, 0x1F, 0x40, 0x37,</div><div class='add'>+0x00, 0xD1, 0x04, 0x2C, 0x2F, 0xD0, 0x0F, 0x50, 0x4C, 0x00, 0x02, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x07, 0xA0, 0x26, 0x00, 0xC1, 0x01, 0x34, 0x0C, 0x18, 0x10,</div><div class='add'>+0x40, 0x20, 0x04, 0x81, 0x00, 0x34, 0x06, 0xD8, 0x0C, 0x40, 0x23, 0x00, 0xC9,</div><div class='add'>+0x40, 0x14, 0x0C, 0xD0, 0x04, 0x70, 0x20, 0x40, 0xC1, 0x00, 0x04, 0x03, 0xD8,</div><div class='add'>+0x0C, 0x40, 0x71, 0x00, 0xC1, 0x00, 0x34, 0x02, 0x18, 0x1C, 0x40, 0x33, 0x00,</div><div class='add'>+0x88, 0x80, 0x14, 0x07, 0xD0, 0x0C, 0x40, 0x1C, 0x00, 0x0A, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x0F, 0x80, 0x68, 0x00, 0xE1, 0x01, 0xB4, 0x24, 0x18, 0x3B, 0x40,</div><div class='add'>+0x62, 0x00, 0xA0, 0x01, 0xB4, 0x45, 0xD8, 0x1E, 0x42, 0x6B, 0x60, 0xE1, 0x03,</div><div class='add'>+0xA4, 0x26, 0xD0, 0x14, 0x40, 0x6D, 0x00, 0xE5, 0x01, 0x94, 0x07, 0xD0, 0x1E,</div><div class='add'>+0x40, 0x79, 0x00, 0xE1, 0x01, 0xF4, 0x06, 0x10, 0x1E, 0x40, 0x7F, 0x40, 0x49,</div><div class='add'>+0x81, 0xB4, 0x47, 0xD0, 0x1E, 0x40, 0x7C, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x12, 0x10, 0x30, 0x08, 0xC3, 0x08, 0x7C, 0x20, 0x30, 0x00, 0x40, 0xA1,</div><div class='add'>+0x40, 0xC3, 0x00, 0x3C, 0x03, 0xF0, 0x0C, 0xC0, 0x23, 0x00, 0xCF, 0x00, 0x1C,</div><div class='add'>+0x03, 0xF0, 0x84, 0x42, 0x20, 0x02, 0xC3, 0x00, 0x0C, 0x43, 0xF0, 0x0D, 0x48,</div><div class='add'>+0x31, 0x44, 0xC3, 0x88, 0x3E, 0x02, 0x71, 0x0C, 0xC1, 0x33, 0x00, 0x0B, 0x00,</div><div class='add'>+0x1C, 0x01, 0xF0, 0x8C, 0xC0, 0x48, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x02, 0xB8, 0x3D, 0x00, 0xFF, 0x00, 0xFC, 0x20, 0xC4, 0x8B, 0xC0, 0x1F, 0x02,</div><div class='add'>+0xFF, 0x00, 0xFC, 0x23, 0xF0, 0x0F, 0xC0, 0x2F, 0x00, 0xF7, 0x10, 0xFC, 0x03,</div><div class='add'>+0xA0, 0x87, 0xC0, 0x2E, 0x10, 0xFB, 0x00, 0xEC, 0x03, 0xF0, 0x0F, 0xC0, 0x3A,</div><div class='add'>+0x02, 0x7F, 0x08, 0xDC, 0x22, 0xF4, 0x8F, 0xC0, 0x2F, 0x42, 0xF7, 0x00, 0xCE,</div><div class='add'>+0x03, 0xF0, 0x0F, 0xC0, 0x0B, 0x60, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15,</div><div class='add'>+0xA0, 0x37, 0x00, 0xDF, 0x00, 0x7E, 0x04, 0x30, 0x01, 0xC0, 0x2C, 0x01, 0x93,</div><div class='add'>+0x00, 0xEC, 0x07, 0x30, 0x0D, 0xC0, 0x26, 0x00, 0xDF, 0x00, 0x1C, 0x02, 0x30,</div><div class='add'>+0x05, 0xC0, 0x26, 0x00, 0xFF, 0x00, 0x4C, 0x03, 0xF0, 0x8D, 0xE0, 0x37, 0x00,</div><div class='add'>+0xD3, 0x00, 0x7C, 0x02, 0xF0, 0x1D, 0xC0, 0x34, 0x00, 0x13, 0x81, 0x4C, 0x07,</div><div class='add'>+0x34, 0x0F, 0xC0, 0x57, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0x88,</div><div class='add'>+0x39, 0x00, 0xED, 0x00, 0xB6, 0x00, 0x12, 0x62, 0xC0, 0x38, 0x04, 0xE1, 0x00,</div><div class='add'>+0xF4, 0x03, 0x10, 0x0E, 0x40, 0x2B, 0x00, 0xFB, 0x01, 0x84, 0x02, 0x10, 0x06,</div><div class='add'>+0x40, 0x3B, 0x00, 0xFD, 0x01, 0x85, 0x03, 0xD0, 0x4E, 0x40, 0x3B, 0x00, 0xE1,</div><div class='add'>+0x40, 0xB4, 0x02, 0xD0, 0x0E, 0x40, 0x38, 0x00, 0xE1, 0x00, 0xAD, 0x03, 0x10,</div><div class='add'>+0x1E, 0x40, 0x4F, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x79,</div><div class='add'>+0x00, 0xED, 0x01, 0xB4, 0x86, 0x12, 0x13, 0x40, 0x60, 0x00, 0xED, 0x21, 0xB4,</div><div class='add'>+0x0F, 0xD0, 0x1E, 0x40, 0x73, 0x00, 0xE5, 0x05, 0xD4, 0x07, 0xD9, 0x16, 0x41,</div><div class='add'>+0x6B, 0x00, 0xED, 0x21, 0xA4, 0x07, 0x50, 0x1E, 0x40, 0x72, 0x20, 0xE1, 0x03,</div><div class='add'>+0xB4, 0x06, 0xD0, 0x1C, 0x40, 0x7E, 0x00, 0x25, 0x03, 0x84, 0x07, 0x10, 0x1E,</div><div class='add'>+0x40, 0x07, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x28, 0x73, 0x02,</div><div class='add'>+0xCD, 0x00, 0x34, 0x03, 0x10, 0x48, 0x06, 0x52, 0x00, 0xC9, 0x00, 0x34, 0xCF,</div><div class='add'>+0x90, 0x0C, 0x40, 0x73, 0x00, 0xC9, 0x00, 0x04, 0x13, 0x90, 0x7C, 0x40, 0x23,</div><div class='add'>+0x00, 0xDD, 0x00, 0x24, 0x03, 0xD0, 0x0C, 0x40, 0x33, 0x00, 0x49, 0x01, 0x34,</div><div class='add'>+0x02, 0xD0, 0x0C, 0x40, 0x70, 0x00, 0xC5, 0x04, 0x24, 0x4B, 0x10, 0x0C, 0x40,</div><div class='add'>+0x4B, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x17, 0xA8, 0x55, 0x00, 0x5F,</div><div class='add'>+0x00, 0xFC, 0x49, 0x34, 0x47, 0xD0, 0x5C, 0x41, 0x5F, 0x11, 0xFC, 0x01, 0xF4,</div><div class='add'>+0x05, 0xC0, 0x57, 0x00, 0x57, 0x00, 0xDC, 0x01, 0xE0, 0x27, 0xE0, 0x17, 0x00,</div><div class='add'>+0x5F, 0x00, 0x6E, 0x81, 0xF0, 0x05, 0xC0, 0x17, 0x00, 0x63, 0x01, 0x3C, 0x15,</div><div class='add'>+0xF2, 0x05, 0xF0, 0x54, 0x01, 0x77, 0x03, 0xC4, 0x1D, 0x30, 0x05, 0xC0, 0x5F,</div><div class='add'>+0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x07, 0x00, 0x1F, 0x02,</div><div class='add'>+0x7C, 0xC0, 0xF0, 0x01, 0xC0, 0x85, 0x00, 0x17, 0x00, 0x7C, 0x08, 0x72, 0x01,</div><div class='add'>+0xC0, 0x07, 0x02, 0x1F, 0x02, 0x7C, 0x00, 0x74, 0x01, 0xC0, 0x07, 0x02, 0x1F,</div><div class='add'>+0x40, 0x5C, 0x00, 0xF0, 0x01, 0xC0, 0x07, 0x40, 0x17, 0x00, 0x7C, 0x00, 0xF0,</div><div class='add'>+0x21, 0xE0, 0x07, 0x40, 0x1A, 0x00, 0x7C, 0x08, 0xF0, 0x01, 0xC8, 0x4B, 0x00,</div><div class='add'>+0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x08, 0x27, 0x00, 0x93, 0x02, 0x7C,</div><div class='add'>+0x02, 0xF0, 0x08, 0xC0, 0x20, 0x00, 0x83, 0x03, 0x6C, 0x06, 0xF0, 0x09, 0xC0,</div><div class='add'>+0x23, 0x40, 0x91, 0x00, 0x04, 0x26, 0x34, 0x09, 0x00, 0x27, 0x00, 0x9F, 0x00,</div><div class='add'>+0x68, 0x06, 0xD0, 0x09, 0xE0, 0xE7, 0x08, 0x93, 0x45, 0x4C, 0x06, 0x32, 0x09,</div><div class='add'>+0xC0, 0x27, 0x08, 0x93, 0x00, 0x7C, 0x22, 0xF0, 0x09, 0xC0, 0x43, 0x20, 0x0C,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x20, 0x22, 0x40, 0x91, 0x01, 0x74, 0x82,</div><div class='add'>+0xD0, 0x09, 0x40, 0xA4, 0x04, 0x91, 0x01, 0x44, 0x36, 0xD0, 0x09, 0x40, 0x27,</div><div class='add'>+0x00, 0x95, 0x12, 0x6C, 0x0A, 0x10, 0x19, 0x42, 0x27, 0x00, 0x9D, 0x20, 0x44,</div><div class='add'>+0x06, 0xF0, 0x09, 0x40, 0x63, 0x01, 0x9B, 0x01, 0x44, 0x06, 0xB0, 0x29, 0x44,</div><div class='add'>+0x23, 0x40, 0x93, 0x0E, 0x5C, 0x1E, 0xD0, 0x09, 0x40, 0x07, 0x00, 0x08, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x18, 0xA0, 0x24, 0x20, 0x91, 0x00, 0x54, 0x06, 0xD2,</div><div class='add'>+0x09, 0x40, 0x24, 0x00, 0x91, 0x00, 0x64, 0x02, 0xD0, 0x09, 0x40, 0x25, 0x00,</div><div class='add'>+0x8D, 0x01, 0x74, 0x02, 0x50, 0x89, 0x64, 0x27, 0x00, 0x9D, 0x00, 0x75, 0x12,</div><div class='add'>+0xD2, 0x09, 0x00, 0x27, 0x80, 0x91, 0x00, 0x45, 0x12, 0x50, 0x89, 0x41, 0x27,</div><div class='add'>+0x00, 0x99, 0x00, 0x74, 0x02, 0xD2, 0x09, 0x44, 0x63, 0x00, 0x02, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x10, 0x22, 0x24, 0x00, 0x81, 0x00, 0x34, 0x12, 0xD0, 0x48,</div><div class='add'>+0x50, 0x20, 0x01, 0x81, 0x84, 0x04, 0x02, 0xD8, 0x08, 0x40, 0x23, 0x01, 0x89,</div><div class='add'>+0x04, 0x34, 0x13, 0x00, 0x48, 0x60, 0x23, 0x20, 0x8D, 0x04, 0x14, 0x02, 0x50,</div><div class='add'>+0xC8, 0x40, 0x23, 0x01, 0x89, 0x00, 0x04, 0x02, 0xD0, 0x08, 0x40, 0x27, 0x00,</div><div class='add'>+0x81, 0x04, 0x34, 0x12, 0xD0, 0x48, 0x48, 0x43, 0x80, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x1D, 0xB0, 0x86, 0x02, 0x53, 0x0A, 0x1C, 0x28, 0xF0, 0x05, 0x50,</div><div class='add'>+0x04, 0x40, 0x13, 0x00, 0x6C, 0x08, 0xF0, 0x01, 0xC4, 0x87, 0x02, 0x1D, 0x0A,</div><div class='add'>+0x7C, 0x28, 0x50, 0x01, 0xC0, 0x07, 0x00, 0x1D, 0x0A, 0x7C, 0x80, 0xC2, 0x61,</div><div class='add'>+0x40, 0x07, 0x05, 0x13, 0x00, 0x4C, 0x00, 0x70, 0x01, 0xC0, 0x07, 0x00, 0x1B,</div><div class='add'>+0x8A, 0x38, 0x28, 0xF0, 0x01, 0xC0, 0x77, 0xC0, 0x0A, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x19, 0xB8, 0x2F, 0x00, 0x9F, 0x00, 0xFC, 0x22, 0xF2, 0x8A, 0xD0, 0x2F,</div><div class='add'>+0x02, 0xBF, 0x08, 0xFC, 0x62, 0xF0, 0x09, 0xC0, 0x2F, 0x02, 0x97, 0x08, 0xEC,</div><div class='add'>+0x22, 0xF2, 0x8B, 0xC0, 0x2F, 0x00, 0x9B, 0x08, 0x6C, 0x02, 0xF0, 0x29, 0xCA,</div><div class='add'>+0x27, 0x00, 0xFF, 0x00, 0xFC, 0x02, 0xB0, 0x89, 0xC2, 0x2B, 0x00, 0xA7, 0x08,</div><div class='add'>+0xDC, 0x22, 0xF0, 0x89, 0xC0, 0x67, 0x60, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x19, 0xA0, 0x27, 0x00, 0xBF, 0x08, 0xFC, 0x02, 0x30, 0x0B, 0xC0, 0x2C, 0x00,</div><div class='add'>+0xBF, 0x04, 0xFC, 0x52, 0xB0, 0x0B, 0xC0, 0x27, 0x40, 0xBB, 0x00, 0xC8, 0x22,</div><div class='add'>+0x34, 0x4B, 0xC0, 0x24, 0x00, 0xBF, 0x0C, 0xDD, 0x02, 0xB0, 0x19, 0xC0, 0x6F,</div><div class='add'>+0x00, 0xB3, 0x00, 0xFC, 0x02, 0xF0, 0x5B, 0xC0, 0x20, 0x00, 0xB3, 0x00, 0xCC,</div><div class='add'>+0x22, 0x30, 0x4B, 0xC0, 0x67, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1C,</div><div class='add'>+0x08, 0x07, 0x01, 0x1D, 0x04, 0x36, 0xC9, 0x10, 0x05, 0xE2, 0x04, 0x02, 0x1D,</div><div class='add'>+0x00, 0x74, 0x10, 0xD0, 0x01, 0x40, 0x07, 0x00, 0x13, 0x00, 0x54, 0x20, 0x18,</div><div class='add'>+0x01, 0xE0, 0x06, 0x80, 0x0D, 0x0C, 0x44, 0x00, 0x50, 0x11, 0x40, 0x07, 0x02,</div><div class='add'>+0x11, 0x00, 0x74, 0x00, 0xD0, 0xA1, 0x40, 0x04, 0x00, 0x11, 0x10, 0x44, 0x20,</div><div class='add'>+0x10, 0x01, 0x40, 0x73, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0xA0,</div><div class='add'>+0x23, 0x05, 0x8D, 0x04, 0x34, 0xB2, 0x10, 0x88, 0x40, 0x20, 0x00, 0x8D, 0x08,</div><div class='add'>+0x34, 0x52, 0xD0, 0x08, 0x42, 0x23, 0x00, 0x85, 0x00, 0x04, 0x02, 0x54, 0x88,</div><div class='add'>+0x42, 0x22, 0x00, 0x8D, 0x04, 0x14, 0x02, 0x10, 0x68, 0x41, 0x23, 0x00, 0x81,</div><div class='add'>+0x00, 0x34, 0x02, 0xD0, 0x08, 0x40, 0x26, 0x10, 0x85, 0x48, 0x04, 0x07, 0x14,</div><div class='add'>+0x88, 0x40, 0x4B, 0x80, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0xA8, 0x25,</div><div class='add'>+0x00, 0x9D, 0x00, 0x74, 0x06, 0x14, 0x09, 0x40, 0x26, 0x04, 0x9D, 0x01, 0x74,</div><div class='add'>+0x02, 0xD0, 0x09, 0x40, 0x27, 0x00, 0x89, 0x00, 0x54, 0x52, 0x10, 0x09, 0x40,</div><div class='add'>+0x26, 0x01, 0x9D, 0x00, 0x44, 0x02, 0x52, 0x09, 0x40, 0x27, 0x40, 0x91, 0x08,</div><div class='add'>+0x74, 0x12, 0xD0, 0x0D, 0x40, 0x66, 0x40, 0x95, 0x04, 0x04, 0x06, 0x10, 0x09,</div><div class='add'>+0x40, 0x63, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0xA8, 0x27, 0x00,</div><div class='add'>+0x9F, 0x00, 0x74, 0x0E, 0x30, 0x29, 0x50, 0xE4, 0x00, 0x9F, 0x01, 0x7C, 0x46,</div><div class='add'>+0xF0, 0x09, 0xC0, 0x67, 0x00, 0x97, 0x00, 0x4C, 0x02, 0x50, 0x09, 0x41, 0x26,</div><div class='add'>+0x80, 0x9D, 0x00, 0x5C, 0x02, 0x30, 0x09, 0xC0, 0x27, 0x00, 0x92, 0x03, 0x7C,</div><div class='add'>+0x06, 0xF2, 0x09, 0xD0, 0x22, 0x00, 0x97, 0x07, 0x4D, 0x02, 0x30, 0x09, 0xC0,</div><div class='add'>+0x17, 0xA0, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16, 0x80, 0x65, 0x02, 0x9F,</div><div class='add'>+0x10, 0x7C, 0x02, 0xF0, 0x09, 0xC0, 0x25, 0x05, 0x9F, 0x00, 0x7C, 0x4E, 0xF0,</div><div class='add'>+0x09, 0xC0, 0x67, 0x02, 0x97, 0x00, 0x7C, 0x06, 0xF0, 0x09, 0xC0, 0x67, 0x00,</div><div class='add'>+0x9F, 0x00, 0x7C, 0x02, 0x70, 0x09, 0x80, 0x23, 0x00, 0x9F, 0x00, 0x7C, 0x06,</div><div class='add'>+0xF0, 0x08, 0xC0, 0x25, 0x00, 0x9B, 0x00, 0x7C, 0x02, 0xF0, 0x09, 0xC2, 0x5B,</div><div class='add'>+0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x08, 0x05, 0x00, 0x1F, 0x00,</div><div class='add'>+0x7C, 0x18, 0x94, 0x31, 0x50, 0x06, 0x40, 0x13, 0x00, 0x7C, 0x20, 0x70, 0x01,</div><div class='add'>+0xC0, 0x07, 0x00, 0x1D, 0x48, 0x78, 0x48, 0x32, 0x21, 0xC0, 0x07, 0x00, 0x1F,</div><div class='add'>+0x00, 0x4C, 0x40, 0xF0, 0x01, 0xC0, 0x07, 0x00, 0x1B, 0x00, 0x7C, 0x00, 0xF0,</div><div class='add'>+0x41, 0xC0, 0x07, 0x00, 0x03, 0x02, 0x4C, 0x04, 0x30, 0x01, 0xC0, 0x50, 0x20,</div><div class='add'>+0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x80, 0x14, 0x00, 0x7D, 0x04, 0xF4,</div><div class='add'>+0x01, 0x30, 0x46, 0x40, 0x5C, 0x00, 0x51, 0x11, 0xF4, 0x09, 0x70, 0x55, 0x40,</div><div class='add'>+0x17, 0x00, 0x7D, 0x00, 0xF4, 0x09, 0x10, 0x14, 0x40, 0x17, 0x00, 0x5D, 0x00,</div><div class='add'>+0x84, 0x41, 0x70, 0x05, 0x40, 0x1F, 0x01, 0x5D, 0x00, 0x74, 0x01, 0xD0, 0x27,</div><div class='add'>+0x40, 0x17, 0x00, 0x72, 0x00, 0xC4, 0x01, 0x14, 0x05, 0xC1, 0x52, 0x00, 0x02,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0xA0, 0x32, 0x00, 0xCD, 0x03, 0x74, 0x03,</div><div class='add'>+0x10, 0x1C, 0x60, 0xB0, 0x00, 0xC1, 0x00, 0x34, 0x0B, 0x58, 0x0C, 0x40, 0x37,</div><div class='add'>+0x00, 0x8D, 0x01, 0x74, 0x09, 0x10, 0x0C, 0x40, 0x33, 0x00, 0xDD, 0x01, 0x14,</div><div class='add'>+0x8F, 0xD0, 0x0C, 0x40, 0xF3, 0x01, 0x89, 0x00, 0x34, 0x03, 0xD0, 0x24, 0x40,</div><div class='add'>+0x33, 0x80, 0x49, 0x0D, 0x04, 0x02, 0x12, 0x18, 0x00, 0x50, 0x00, 0x0A, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x05, 0x80, 0x38, 0x01, 0xA9, 0x00, 0xB4, 0x18, 0x10,</div><div class='add'>+0x02, 0x40, 0x70, 0x04, 0xE1, 0x00, 0xB4, 0x01, 0x50, 0x0E, 0x40, 0x3A, 0x01,</div><div class='add'>+0x29, 0x00, 0xA4, 0x00, 0x14, 0x0A, 0x41, 0x3B, 0x00, 0xED, 0x02, 0x84, 0x03,</div><div class='add'>+0x40, 0x4E, 0x40, 0x2B, 0x00, 0xAD, 0x00, 0xB4, 0x03, 0xD0, 0x06, 0x41, 0x3F,</div><div class='add'>+0x00, 0x61, 0x00, 0x84, 0x02, 0x10, 0x18, 0x40, 0x16, 0x00, 0x02, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x15, 0x10, 0x78, 0x01, 0xAD, 0x01, 0xBC, 0x0E, 0x30, 0x14,</div><div class='add'>+0xD0, 0x78, 0x00, 0xE3, 0x41, 0xBE, 0x07, 0x70, 0x1E, 0xC0, 0x7B, 0x01, 0x6D,</div><div class='add'>+0x01, 0x3C, 0x05, 0x30, 0x1A, 0xC0, 0x7B, 0x00, 0xEF, 0x01, 0x9D, 0x07, 0xD0,</div><div class='add'>+0x5E, 0xC2, 0x7B, 0x00, 0xAB, 0x01, 0xB4, 0x06, 0xF0, 0x16, 0xC0, 0x7B, 0x00,</div><div class='add'>+0xF9, 0x01, 0x8D, 0x07, 0x30, 0x1A, 0xC4, 0x54, 0x40, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x10, 0xB8, 0xB5, 0x00, 0xBF, 0x00, 0x7C, 0x00, 0x70, 0x01, 0xC0,</div><div class='add'>+0x17, 0x00, 0xDF, 0x00, 0x7E, 0x03, 0xC0, 0x0D, 0xC0, 0x77, 0x00, 0x5F, 0x00,</div><div class='add'>+0xFC, 0x00, 0xF0, 0x09, 0x80, 0x37, 0x00, 0xDF, 0x02, 0x7C, 0x03, 0x70, 0x8D,</div><div class='add'>+0xC0, 0x27, 0x00, 0xDF, 0x00, 0x7C, 0x02, 0xF0, 0x05, 0xC0, 0x37, 0x40, 0xDF,</div><div class='add'>+0x00, 0x3C, 0x00, 0xF4, 0x09, 0xC0, 0x43, 0x60, 0x06, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x02, 0xA0, 0xFF, 0x04, 0xB3, 0x01, 0xFC, 0x23, 0x38, 0x03, 0xC0, 0x6C,</div><div class='add'>+0x00, 0xF3, 0x01, 0xFC, 0x07, 0xF0, 0x1F, 0x40, 0x7F, 0x06, 0xF3, 0x01, 0xCC,</div><div class='add'>+0x85, 0x30, 0x1B, 0xE0, 0x7F, 0x02, 0xAF, 0x03, 0xCC, 0x06, 0xF0, 0x1F, 0xC0,</div><div class='add'>+0x4F, 0x00, 0xBF, 0x01, 0xFC, 0x07, 0xF0, 0x16, 0xC0, 0x7C, 0x40, 0xFB, 0x81,</div><div class='add'>+0xFC, 0x06, 0x31, 0x1A, 0xC0, 0x08, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x15, 0x88, 0x3D, 0x00, 0xA1, 0x00, 0xB4, 0x13, 0x18, 0x42, 0x00, 0x28, 0x40,</div><div class='add'>+0xE1, 0x50, 0xB4, 0x01, 0xD0, 0x0E, 0x40, 0x3F, 0x00, 0x6F, 0x00, 0x94, 0x02,</div><div class='add'>+0x10, 0x0A, 0xC0, 0x3B, 0x00, 0xED, 0x24, 0x84, 0x03, 0xD0, 0x8E, 0x40, 0x1B,</div><div class='add'>+0x00, 0xAD, 0x00, 0xB4, 0x23, 0xD0, 0x06, 0xC0, 0x38, 0x00, 0xE1, 0x00, 0xB4,</div><div class='add'>+0x02, 0x10, 0x0A, 0x40, 0x55, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08,</div><div class='add'>+0x00, 0x39, 0x00, 0x21, 0x00, 0xB4, 0x22, 0x18, 0x83, 0x40, 0x20, 0x00, 0xE9,</div><div class='add'>+0x08, 0xB4, 0x03, 0xD0, 0x0E, 0x40, 0x3B, 0x40, 0x61, 0x00, 0x04, 0x01, 0x90,</div><div class='add'>+0x0A, 0x40, 0x3B, 0x20, 0xAD, 0x40, 0xA4, 0x03, 0xD0, 0x0E, 0x40, 0x2B, 0x00,</div><div class='add'>+0xAD, 0x00, 0xB4, 0x02, 0xD0, 0x06, 0x40, 0x3D, 0x00, 0xE1, 0x00, 0x34, 0x0B,</div><div class='add'>+0x10, 0x0A, 0x40, 0x20, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16, 0x28,</div><div class='add'>+0x33, 0x00, 0x11, 0x00, 0x34, 0x02, 0x12, 0x20, 0x40, 0x00, 0x00, 0xC9, 0x00,</div><div class='add'>+0x34, 0x26, 0xD0, 0x0C, 0x40, 0x33, 0x00, 0x4D, 0x00, 0x14, 0x00, 0x90, 0x28,</div><div class='add'>+0x40, 0x71, 0x00, 0xCD, 0x00, 0x24, 0x03, 0xD0, 0x0C, 0x40, 0x33, 0x00, 0xCD,</div><div class='add'>+0x02, 0x24, 0x02, 0xD0, 0x04, 0x40, 0x30, 0x10, 0x81, 0x02, 0x34, 0x03, 0x11,</div><div class='add'>+0x08, 0x40, 0x19, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xA8, 0x3D,</div><div class='add'>+0x40, 0x93, 0x00, 0xFC, 0x03, 0x14, 0x21, 0xC0, 0xE4, 0x02, 0xDB, 0x01, 0x74,</div><div class='add'>+0x2A, 0xF0, 0x0C, 0xC0, 0x3F, 0x00, 0x93, 0x00, 0x4C, 0x01, 0xB4, 0x09, 0x40,</div><div class='add'>+0x37, 0x00, 0x9F, 0x00, 0x6D, 0x01, 0xF0, 0x0F, 0xC0, 0x37, 0x00, 0x8F, 0x13,</div><div class='add'>+0x7C, 0x02, 0xF0, 0x04, 0xC0, 0x34, 0x00, 0x53, 0x0B, 0x7C, 0x82, 0x30, 0x0D,</div><div class='add'>+0xC0, 0x54, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x37, 0x00,</div><div class='add'>+0x9F, 0x00, 0x7C, 0x20, 0xF0, 0x00, 0xD0, 0xE7, 0x10, 0xD7, 0x00, 0x7C, 0x80,</div><div class='add'>+0xF0, 0x0D, 0xC0, 0x37, 0x00, 0x17, 0x00, 0x3C, 0x40, 0x70, 0x09, 0xC0, 0x37,</div><div class='add'>+0x02, 0x9F, 0x00, 0x5C, 0x83, 0xF2, 0x0D, 0xC0, 0x27, 0x00, 0xDF, 0x00, 0x7C,</div><div class='add'>+0x02, 0xF0, 0x05, 0xC0, 0x75, 0x00, 0x47, 0x81, 0x7C, 0x02, 0xF0, 0x0D, 0xC0,</div><div class='add'>+0x27, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x08, 0x3F, 0x00, 0xBF,</div><div class='add'>+0x00, 0x8C, 0x23, 0xB0, 0x03, 0xD1, 0x28, 0x00, 0xB3, 0x05, 0xFC, 0x00, 0xF0,</div><div class='add'>+0x0F, 0xC0, 0x38, 0x00, 0x6B, 0x00, 0xCC, 0x00, 0xB0, 0x8B, 0xE1, 0x3F, 0x00,</div><div class='add'>+0xBF, 0x00, 0xCC, 0x01, 0xF0, 0x0F, 0xC0, 0x4F, 0x00, 0xBF, 0x14, 0xDC, 0x0F,</div><div class='add'>+0xF0, 0x0F, 0xC0, 0x3C, 0x00, 0xF3, 0x00, 0x8C, 0x22, 0x10, 0x9F, 0xC0, 0x07,</div><div class='add'>+0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x20, 0x36, 0x00, 0x9D, 0x01,</div><div class='add'>+0x44, 0x04, 0x90, 0x11, 0x58, 0x44, 0x04, 0x91, 0x00, 0x76, 0x04, 0xD0, 0x0D,</div><div class='add'>+0xE0, 0x36, 0x00, 0x51, 0x00, 0x44, 0x04, 0x10, 0x09, 0xC0, 0x36, 0x00, 0x9D,</div><div class='add'>+0x00, 0x6C, 0x47, 0xD0, 0x0D, 0x40, 0x97, 0x02, 0xDD, 0x01, 0x6C, 0x07, 0xD0,</div><div class='add'>+0x3D, 0xC0, 0x32, 0x00, 0xD1, 0x01, 0x44, 0x04, 0x10, 0x1D, 0xC2, 0x25, 0x00,</div><div class='add'>+0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xA0, 0x34, 0x10, 0x9D, 0x01, 0x44,</div><div class='add'>+0x03, 0x90, 0x11, 0x40, 0x46, 0x40, 0xD1, 0x00, 0x74, 0x0E, 0xD1, 0x19, 0x42,</div><div class='add'>+0x34, 0x00, 0xD9, 0x00, 0x44, 0x05, 0x9A, 0x09, 0x40, 0x37, 0x20, 0x8D, 0x08,</div><div class='add'>+0x46, 0x07, 0xD0, 0x0D, 0x42, 0x17, 0x04, 0x9D, 0x00, 0x54, 0x02, 0xD0, 0x1D,</div><div class='add'>+0x40, 0x34, 0x00, 0xD1, 0x01, 0x40, 0x02, 0x50, 0x09, 0x40, 0x07, 0x00, 0x02,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x20, 0x30, 0x00, 0x8D, 0x00, 0x04, 0x03,</div><div class='add'>+0x90, 0x10, 0x40, 0x02, 0x00, 0xC1, 0x00, 0x34, 0x00, 0xD2, 0x08, 0x40, 0x32,</div><div class='add'>+0x00, 0x41, 0x00, 0x04, 0x02, 0x10, 0x08, 0x60, 0x31, 0x00, 0x8D, 0x00, 0x05,</div><div class='add'>+0x03, 0xD8, 0x0C, 0x40, 0x03, 0x00, 0xDD, 0x00, 0x04, 0x02, 0xD0, 0x0C, 0x48,</div><div class='add'>+0x36, 0x00, 0xC1, 0x00, 0x04, 0x02, 0x50, 0x08, 0x40, 0x41, 0x80, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x01, 0xB0, 0x3E, 0x00, 0x1F, 0x00, 0x05, 0x03, 0xB0,</div><div class='add'>+0x01, 0xC0, 0x06, 0x00, 0xD3, 0x00, 0x74, 0x02, 0xF0, 0x09, 0x40, 0x34, 0x00,</div><div class='add'>+0x4B, 0x00, 0x4C, 0x00, 0xB0, 0x09, 0x44, 0x37, 0x00, 0xBF, 0x00, 0x44, 0x03,</div><div class='add'>+0xF0, 0x0D, 0xC0, 0x07, 0x00, 0x9F, 0x00, 0x54, 0x03, 0xF0, 0x0D, 0xC0, 0x34,</div><div class='add'>+0x00, 0xD3, 0x00, 0x4D, 0x02, 0x70, 0x09, 0xC0, 0x07, 0xC0, 0x0A, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x05, 0xB8, 0x3F, 0x00, 0x3F, 0x00, 0xFC, 0x03, 0x78, 0x02,</div><div class='add'>+0xC0, 0x0D, 0x00, 0xFF, 0x40, 0xF6, 0x02, 0xF0, 0x0B, 0xC0, 0x3F, 0x00, 0x7F,</div><div class='add'>+0x00, 0xFD, 0x00, 0xF0, 0x0B, 0xC8, 0x3E, 0x00, 0xBF, 0x00, 0xFC, 0x03, 0xF0,</div><div class='add'>+0x0F, 0xC0, 0x1F, 0x00, 0xFF, 0x00, 0xFC, 0x03, 0xF0, 0x0B, 0xC0, 0x3B, 0x00,</div><div class='add'>+0xFF, 0x00, 0xFC, 0x02, 0xB0, 0x0B, 0xC0, 0x15, 0x60, 0x0E, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x03, 0xA0, 0x7F, 0x02, 0xF3, 0x01, 0xFC, 0x27, 0xF0, 0x1F, 0xC0,</div><div class='add'>+0x7F, 0x00, 0xF3, 0x01, 0xFC, 0x07, 0xF0, 0x1F, 0xC0, 0x7F, 0x00, 0xFF, 0x09,</div><div class='add'>+0xCC, 0x07, 0xF0, 0x3F, 0xC0, 0x7C, 0x02, 0xFF, 0x21, 0xCC, 0x07, 0x30, 0x9F,</div><div class='add'>+0xC0, 0x78, 0x00, 0xF3, 0x01, 0xFC, 0x22, 0xF0, 0x3F, 0xC0, 0x5E, 0x10, 0xBB,</div><div class='add'>+0x01, 0xEC, 0x84, 0x38, 0x0B, 0xC0, 0x0C, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x01, 0x00, 0x07, 0x00, 0x11, 0x01, 0x74, 0x10, 0xD1, 0x01, 0x40, 0x47,</div><div class='add'>+0x00, 0x11, 0x04, 0x74, 0x04, 0xD0, 0x11, 0x40, 0x47, 0x00, 0x1D, 0x04, 0x44,</div><div class='add'>+0x84, 0xD0, 0x01, 0x48, 0x04, 0x01, 0x1D, 0x01, 0x44, 0x04, 0x12, 0x41, 0x40,</div><div class='add'>+0x44, 0x40, 0x11, 0x01, 0x74, 0x38, 0xD0, 0x0D, 0x40, 0x55, 0x00, 0xD1, 0x01,</div><div class='add'>+0x54, 0x03, 0xB0, 0x01, 0x40, 0x0D, 0x60, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x11, 0xA0, 0x33, 0x11, 0xC1, 0x00, 0x34, 0x83, 0xD0, 0x4C, 0x41, 0x37, 0x00,</div><div class='add'>+0xC1, 0x10, 0x34, 0x03, 0xD0, 0x0C, 0x40, 0x33, 0x00, 0xDD, 0x00, 0x04, 0x03,</div><div class='add'>+0xD0, 0x4D, 0x40, 0x30, 0x01, 0xD5, 0xA0, 0x64, 0x83, 0x10, 0x4C, 0x40, 0x35,</div><div class='add'>+0x00, 0xC9, 0x00, 0x34, 0x10, 0xD0, 0x4C, 0x40, 0x30, 0x60, 0xD9, 0x40, 0x24,</div><div class='add'>+0x01, 0x10, 0x08, 0x44, 0x4C, 0x80, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03,</div><div class='add'>+0xA8, 0x05, 0x40, 0x11, 0x00, 0x74, 0x00, 0xD2, 0x01, 0x40, 0x07, 0x00, 0x11,</div><div class='add'>+0x00, 0x74, 0x00, 0xD1, 0x01, 0x40, 0x07, 0x00, 0x1D, 0x00, 0x44, 0x00, 0xD0,</div><div class='add'>+0x01, 0x48, 0x04, 0x00, 0x1D, 0x00, 0x64, 0x00, 0x10, 0x01, 0x40, 0x04, 0x20,</div><div class='add'>+0x19, 0x00, 0x74, 0x0C, 0xD0, 0x1C, 0x40, 0x75, 0x00, 0xD1, 0x01, 0x54, 0x0B,</div><div class='add'>+0x15, 0x19, 0x41, 0x0D, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA0,</div><div class='add'>+0x37, 0x00, 0xD3, 0x00, 0x7C, 0x03, 0xF0, 0x0D, 0xC0, 0x33, 0x00, 0xD3, 0x00,</div><div class='add'>+0x7C, 0x03, 0xD0, 0x0D, 0xC0, 0x37, 0x00, 0xCF, 0x00, 0x4C, 0x03, 0xF0, 0x0D,</div><div class='add'>+0xD0, 0x34, 0x00, 0xD7, 0x00, 0x6C, 0x03, 0x30, 0x0D, 0xD0, 0x34, 0x00, 0xDB,</div><div class='add'>+0x00, 0x7C, 0x0E, 0xE0, 0x1D, 0xC0, 0xC0, 0x04, 0xCB, 0x01, 0x6C, 0x04, 0x10,</div><div class='add'>+0x19, 0xC0, 0x20, 0x20, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x88, 0x0D,</div><div class='add'>+0x00, 0x3F, 0x00, 0xFC, 0x00, 0xF0, 0x03, 0x40, 0x0F, 0x00, 0x3F, 0x00, 0xFC,</div><div class='add'>+0x00, 0xF0, 0x03, 0xC0, 0x0F, 0x00, 0x3F, 0x00, 0xFC, 0x00, 0xF0, 0x03, 0xC4,</div><div class='add'>+0x0F, 0x00, 0x3F, 0x00, 0xDC, 0x00, 0xF1, 0x03, 0xC8, 0x0F, 0x00, 0x37, 0x40,</div><div class='add'>+0x7C, 0x42, 0xF0, 0x07, 0xC2, 0x1F, 0x00, 0xFF, 0x00, 0xEC, 0xA4, 0xF0, 0x00,</div><div class='add'>+0xC0, 0x1F, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x08, 0x75, 0x01,</div><div class='add'>+0xDF, 0x00, 0x7C, 0x03, 0x30, 0x0D, 0xD0, 0x74, 0x00, 0xD3, 0x00, 0x4D, 0x03,</div><div class='add'>+0xF0, 0x0D, 0xC8, 0x37, 0x40, 0xD3, 0x00, 0x7C, 0x07, 0x30, 0x8D, 0xC1, 0x37,</div><div class='add'>+0x14, 0xDF, 0x01, 0x4C, 0x23, 0xF0, 0x0D, 0xC0, 0x76, 0x04, 0xD3, 0x40, 0x6C,</div><div class='add'>+0x28, 0x30, 0x09, 0xC0, 0x37, 0x01, 0xD3, 0x00, 0x7C, 0xC8, 0x20, 0x29, 0xC6,</div><div class='add'>+0x28, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0xA0, 0x04, 0x00, 0x1D,</div><div class='add'>+0x0F, 0x74, 0x10, 0x10, 0x11, 0x42, 0x04, 0x00, 0x11, 0x0A, 0x44, 0x00, 0xD0,</div><div class='add'>+0x01, 0x40, 0x07, 0x00, 0x11, 0x13, 0x74, 0x00, 0x10, 0x00, 0x40, 0xC7, 0x10,</div><div class='add'>+0x0D, 0x00, 0x34, 0x04, 0xD0, 0x31, 0x40, 0x83, 0x00, 0x11, 0xA5, 0x74, 0x08,</div><div class='add'>+0x10, 0x05, 0x40, 0x37, 0x00, 0xD1, 0x11, 0x74, 0x0E, 0xB0, 0x09, 0x40, 0x4C,</div><div class='add'>+0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x20, 0xB4, 0x00, 0xCD, 0x03,</div><div class='add'>+0x34, 0x43, 0x10, 0x6C, 0x40, 0x30, 0x00, 0xC1, 0x01, 0x04, 0x03, 0xD0, 0x0C,</div><div class='add'>+0x40, 0x73, 0x00, 0xC1, 0x00, 0x14, 0x03, 0x10, 0x2C, 0x44, 0x33, 0x00, 0xCD,</div><div class='add'>+0x00, 0x34, 0x07, 0xD0, 0x7D, 0x40, 0x33, 0x80, 0xC1, 0x81, 0x34, 0x0E, 0xD0,</div><div class='add'>+0x0C, 0x40, 0xB3, 0x00, 0xC1, 0x11, 0x64, 0x02, 0x10, 0x00, 0x40, 0x0C, 0x00,</div><div class='add'>+0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x48, 0x00, 0x2D, 0x01, 0xF4,</div><div class='add'>+0x04, 0x10, 0x13, 0x48, 0x4C, 0x00, 0x21, 0x01, 0x84, 0x04, 0xD0, 0x12, 0x40,</div><div class='add'>+0x4B, 0x04, 0x21, 0x03, 0xF4, 0x04, 0x10, 0x12, 0x40, 0x4B, 0x14, 0x2D, 0x01,</div><div class='add'>+0xB4, 0x04, 0xD0, 0x12, 0x40, 0x4F, 0x40, 0x21, 0x01, 0xB4, 0x05, 0xD0, 0x1E,</div><div class='add'>+0x40, 0x7F, 0x00, 0x61, 0x01, 0xB4, 0xA7, 0x90, 0x12, 0x40, 0x3C, 0x20, 0x08,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x18, 0x30, 0x92, 0xCF, 0x00, 0x3C, 0x03,</div><div class='add'>+0x30, 0x0C, 0xC1, 0x30, 0x00, 0xD3, 0x10, 0x0C, 0x23, 0xF0, 0x0C, 0xC0, 0x33,</div><div class='add'>+0x00, 0xC3, 0x00, 0x1C, 0x03, 0x30, 0x0C, 0xC0, 0x33, 0x00, 0xCF, 0x00, 0x1C,</div><div class='add'>+0x03, 0xF0, 0x0C, 0xC1, 0x33, 0x20, 0xC1, 0x00, 0x3E, 0x23, 0xF4, 0x0C, 0xC0,</div><div class='add'>+0x33, 0x80, 0xC3, 0x08, 0x7C, 0x63, 0x30, 0x80, 0xD0, 0x48, 0x40, 0x08, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x02, 0x38, 0x0D, 0x00, 0x3F, 0x00, 0xBC, 0x00, 0xF0,</div><div class='add'>+0x02, 0xC0, 0x0B, 0x00, 0x3F, 0x00, 0xFC, 0x00, 0xF0, 0x83, 0xC0, 0x03, 0x00,</div><div class='add'>+0x1F, 0x40, 0xBC, 0x20, 0xF2, 0x03, 0xC0, 0x0F, 0x00, 0x1F, 0x00, 0x7C, 0x00,</div><div class='add'>+0xF0, 0x81, 0xC0, 0x07, 0x02, 0x1F, 0x41, 0xFC, 0xA3, 0x20, 0x8F, 0xC8, 0x3B,</div><div class='add'>+0x00, 0x7F, 0x00, 0xFC, 0x23, 0xF0, 0x07, 0xC0, 0x0B, 0x20, 0x06, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x10, 0xA0, 0x37, 0x00, 0xDF, 0x00, 0x7C, 0x03, 0xF0, 0x0D,</div><div class='add'>+0xC0, 0x37, 0x00, 0xDF, 0x00, 0x7C, 0x03, 0xF0, 0x1D, 0xC0, 0x34, 0x00, 0xDF,</div><div class='add'>+0x00, 0x7C, 0x03, 0xF0, 0x1D, 0xD0, 0x74, 0x40, 0xD3, 0x00, 0x7C, 0x03, 0xF0,</div><div class='add'>+0x1D, 0xD0, 0x30, 0x00, 0xC3, 0x00, 0x4C, 0x03, 0xF0, 0x0D, 0xC0, 0x37, 0x80,</div><div class='add'>+0xDF, 0x00, 0x7C, 0x00, 0x30, 0x09, 0xC0, 0x43, 0x00, 0x0E, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x32, 0x88, 0x09, 0x00, 0x2D, 0x00, 0xB4, 0x00, 0xD0, 0x02, 0x40,</div><div class='add'>+0x0B, 0x20, 0x2D, 0x00, 0xB4, 0x00, 0xD0, 0x02, 0x40, 0x08, 0x00, 0x2D, 0x00,</div><div class='add'>+0xB4, 0x00, 0xD0, 0x03, 0x40, 0x0C, 0x00, 0x21, 0x00, 0xB4, 0x00, 0xD0, 0x03,</div><div class='add'>+0x40, 0x08, 0x00, 0x21, 0x00, 0x84, 0x83, 0xD0, 0x06, 0x40, 0x3B, 0x20, 0x6D,</div><div class='add'>+0x40, 0xF4, 0x01, 0x10, 0x02, 0x40, 0x4F, 0x60, 0x06, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x04, 0x00, 0x79, 0x00, 0xED, 0x01, 0xB4, 0x07, 0xD0, 0x1E, 0x40, 0x7B,</div><div class='add'>+0x00, 0xED, 0x01, 0xB4, 0x07, 0xD0, 0x1F, 0x40, 0x7A, 0x00, 0xED, 0x01, 0xB4,</div><div class='add'>+0x87, 0xD0, 0x1E, 0x40, 0x7A, 0x00, 0xE1, 0x01, 0xB4, 0x07, 0xD0, 0x1E, 0x40,</div><div class='add'>+0x78, 0x00, 0xF1, 0x01, 0x84, 0x07, 0xD0, 0x1E, 0x40, 0x7B, 0x20, 0xED, 0x51,</div><div class='add'>+0xB4, 0x87, 0x10, 0x1E, 0x41, 0x13, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x36, 0x28, 0x03, 0x00, 0x0D, 0x00, 0x34, 0x00, 0xD0, 0x00, 0x40, 0x03, 0x00,</div><div class='add'>+0x0D, 0x00, 0x34, 0x00, 0xD0, 0x00, 0x40, 0x02, 0x10, 0x1D, 0x20, 0x34, 0x00,</div><div class='add'>+0xD0, 0x00, 0x40, 0x02, 0x00, 0x01, 0x00, 0x34, 0x00, 0xD0, 0x00, 0x40, 0x00,</div><div class='add'>+0x10, 0x01, 0x00, 0x14, 0x9B, 0xD0, 0x04, 0x42, 0x33, 0x00, 0x4D, 0x01, 0x34,</div><div class='add'>+0x03, 0x11, 0x2C, 0x41, 0x5B, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x17,</div><div class='add'>+0xA0, 0x15, 0x00, 0x4F, 0x00, 0x7C, 0x01, 0xF0, 0x05, 0xC4, 0x13, 0x00, 0x5F,</div><div class='add'>+0x00, 0x7C, 0x01, 0xF0, 0x05, 0xD0, 0x16, 0x00, 0x5F, 0x00, 0x74, 0x01, 0xF0,</div><div class='add'>+0x05, 0xC2, 0x16, 0x00, 0x51, 0x00, 0x3C, 0x01, 0xF0, 0x05, 0xC4, 0x14, 0x40,</div><div class='add'>+0x53, 0x00, 0xCC, 0x09, 0xD1, 0x87, 0x40, 0x1F, 0x00, 0x7D, 0x01, 0xBC, 0x05,</div><div class='add'>+0x14, 0x27, 0xC0, 0x5F, 0x20, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x08,</div><div class='add'>+0x0D, 0x08, 0x3F, 0x00, 0xFC, 0x00, 0xF2, 0x03, 0xC4, 0x0F, 0x00, 0x3F, 0x00,</div><div class='add'>+0xFC, 0x00, 0xF0, 0x03, 0xC0, 0x0D, 0x20, 0x3F, 0x80, 0xFC, 0x00, 0xB0, 0x03,</div><div class='add'>+0xC0, 0x0D, 0x00, 0x3F, 0x80, 0xFC, 0x00, 0xF2, 0x03, 0xC4, 0x0F, 0x00, 0x3F,</div><div class='add'>+0x00, 0x65, 0x20, 0xF0, 0x81, 0xC0, 0x07, 0x02, 0x1F, 0x00, 0x7C, 0x38, 0xF0,</div><div class='add'>+0x01, 0xC0, 0x4B, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x08, 0x25,</div><div class='add'>+0x02, 0x9F, 0x00, 0x6C, 0x0E, 0xF0, 0x19, 0xC0, 0x27, 0x00, 0x93, 0x05, 0x7C,</div><div class='add'>+0x02, 0x30, 0x09, 0xC0, 0x67, 0x02, 0x9F, 0x08, 0x6C, 0x82, 0xF0, 0x49, 0xC0,</div><div class='add'>+0x67, 0x00, 0x9F, 0x00, 0x7C, 0x02, 0x30, 0x19, 0xC8, 0x27, 0x00, 0x93, 0x05,</div><div class='add'>+0x0C, 0x02, 0x32, 0x09, 0xC2, 0x27, 0x02, 0x9D, 0x04, 0x5C, 0x02, 0x34, 0x09,</div><div class='add'>+0xC0, 0x43, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x20, 0xE6, 0x00,</div><div class='add'>+0x9D, 0x02, 0x44, 0x0E, 0xD8, 0x29, 0x40, 0x27, 0x00, 0x9B, 0x43, 0x34, 0x02,</div><div class='add'>+0x10, 0x09, 0x40, 0x27, 0x08, 0x9F, 0x02, 0x44, 0x02, 0xE0, 0x29, 0x40, 0xA7,</div><div class='add'>+0x00, 0x9D, 0x00, 0x74, 0x02, 0xB0, 0x29, 0x40, 0x23, 0x10, 0x8B, 0x01, 0x44,</div><div class='add'>+0x16, 0x10, 0x09, 0x48, 0xA7, 0x04, 0x8D, 0x00, 0x6C, 0x4E, 0x10, 0x09, 0x48,</div><div class='add'>+0x07, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x80, 0x24, 0x00, 0xBD,</div><div class='add'>+0x50, 0xE6, 0x02, 0xD0, 0x8B, 0x41, 0x6F, 0x08, 0xB5, 0x40, 0xF4, 0x02, 0x10,</div><div class='add'>+0x0B, 0x40, 0x2F, 0x00, 0xBD, 0x10, 0xC4, 0x06, 0xC0, 0x0B, 0x40, 0x2F, 0x01,</div><div class='add'>+0xBD, 0x08, 0xF4, 0x06, 0x10, 0x8B, 0x40, 0x2F, 0x00, 0xB1, 0x00, 0x45, 0x22,</div><div class='add'>+0x18, 0x09, 0x40, 0x27, 0x00, 0xDC, 0x00, 0x64, 0x06, 0x10, 0x09, 0x40, 0x73,</div><div class='add'>+0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x28, 0x68, 0x00, 0xAD, 0x00,</div><div class='add'>+0x86, 0x86, 0xD0, 0x0A, 0x40, 0x2B, 0x80, 0xA1, 0x01, 0xF4, 0x02, 0x10, 0x0A,</div><div class='add'>+0x40, 0x2B, 0x00, 0xA5, 0x00, 0x84, 0x02, 0x50, 0x1A, 0x40, 0x6B, 0x00, 0xAD,</div><div class='add'>+0x00, 0xB4, 0x02, 0x90, 0x1A, 0x40, 0x2B, 0x00, 0xB9, 0x00, 0x04, 0x12, 0x14,</div><div class='add'>+0x08, 0x40, 0x23, 0x00, 0xCD, 0x00, 0x64, 0x02, 0x10, 0x48, 0x40, 0x53, 0xA0,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xB0, 0x86, 0x02, 0x1F, 0x00, 0x6C,</div><div class='add'>+0x28, 0xD0, 0xA1, 0xC0, 0x07, 0x00, 0x15, 0x4A, 0x7C, 0x00, 0x34, 0x01, 0xC0,</div><div class='add'>+0x07, 0x00, 0x1D, 0x0A, 0x4D, 0x00, 0xD0, 0xA1, 0xC0, 0x87, 0x02, 0x1F, 0x00,</div><div class='add'>+0x7C, 0x00, 0x30, 0xA1, 0x40, 0x07, 0x00, 0x33, 0x00, 0x4C, 0x28, 0x30, 0xA1,</div><div class='add'>+0xC0, 0x07, 0x80, 0x1F, 0x00, 0x7C, 0x28, 0x39, 0xA1, 0xC0, 0x77, 0xC0, 0x0A,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xA8, 0x27, 0x00, 0x9F, 0x00, 0x7C, 0x82,</div><div class='add'>+0xF0, 0x09, 0xC0, 0x27, 0x48, 0x9F, 0x00, 0x7C, 0x02, 0xF1, 0x08, 0xC0, 0x27,</div><div class='add'>+0x08, 0x9F, 0x40, 0x5C, 0x02, 0xF0, 0x09, 0xC0, 0x27, 0x00, 0x9F, 0x00, 0x7C,</div><div class='add'>+0x02, 0xF2, 0x09, 0xC0, 0x27, 0x00, 0x9F, 0x00, 0xFC, 0xA2, 0xF0, 0x0B, 0xC0,</div><div class='add'>+0x2F, 0x00, 0xBF, 0x20, 0xFC, 0x02, 0xF0, 0x8F, 0xC0, 0x67, 0x20, 0x0E, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x1C, 0xA0, 0x2F, 0x00, 0xB3, 0x00, 0xFC, 0x02, 0x30,</div><div class='add'>+0x0B, 0xC2, 0x2C, 0x00, 0xBF, 0x00, 0x7C, 0x02, 0xF0, 0x09, 0xC0, 0x2F, 0x28,</div><div class='add'>+0xBF, 0x00, 0xDC, 0x02, 0x30, 0x0B, 0xC0, 0x2F, 0x00, 0xBF, 0x00, 0xDC, 0x02,</div><div class='add'>+0xF0, 0x0B, 0x80, 0x2F, 0x10, 0xBF, 0x00, 0xDC, 0x52, 0x30, 0x88, 0xC2, 0x29,</div><div class='add'>+0x00, 0xB3, 0x00, 0xDC, 0x02, 0xF0, 0x09, 0xC0, 0x67, 0x00, 0x0E, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x18, 0x00, 0x07, 0x01, 0x11, 0x00, 0x74, 0x40, 0x12, 0x01,</div><div class='add'>+0x49, 0x04, 0x00, 0x1D, 0x14, 0x74, 0x00, 0xD0, 0x01, 0x48, 0x07, 0x20, 0x17,</div><div class='add'>+0x10, 0x74, 0x00, 0x50, 0x41, 0x41, 0x07, 0x01, 0x1D, 0x80, 0x74, 0x00, 0xD0,</div><div class='add'>+0x01, 0x49, 0x07, 0x00, 0x1D, 0x00, 0x74, 0x10, 0x10, 0x41, 0x44, 0x07, 0x00,</div><div class='add'>+0x11, 0x00, 0x5C, 0x81, 0xD2, 0x41, 0x45, 0x73, 0x60, 0x0C, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x12, 0x00, 0x21, 0x05, 0x81, 0x60, 0x14, 0x12, 0x14, 0x08, 0x40,</div><div class='add'>+0x20, 0x00, 0x8D, 0x04, 0x34, 0x02, 0xD0, 0x08, 0x40, 0x33, 0x00, 0x8D, 0x00,</div><div class='add'>+0x14, 0x03, 0x10, 0x48, 0x40, 0x33, 0x85, 0xCD, 0x00, 0x14, 0x03, 0xD0, 0x08,</div><div class='add'>+0x40, 0x23, 0x00, 0x8D, 0x00, 0x14, 0x52, 0xD0, 0x48, 0x40, 0x21, 0x00, 0x89,</div><div class='add'>+0x00, 0x14, 0x02, 0xD9, 0x48, 0x40, 0x4B, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x18, 0x08, 0x25, 0x00, 0x91, 0x00, 0x74, 0x03, 0x10, 0x0D, 0x50, 0x24,</div><div class='add'>+0x10, 0x9D, 0x00, 0x74, 0x02, 0xD0, 0x09, 0x40, 0x27, 0x00, 0x95, 0x00, 0x74,</div><div class='add'>+0x02, 0x51, 0x09, 0x40, 0x27, 0x00, 0x9D, 0x00, 0x74, 0x02, 0xD0, 0x0D, 0x40,</div><div class='add'>+0x27, 0x00, 0x9D, 0x00, 0x74, 0x06, 0xD0, 0x89, 0x40, 0xE7, 0x00, 0x99, 0x01,</div><div class='add'>+0x50, 0x12, 0xD0, 0x09, 0x60, 0x63, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x05, 0x20, 0x25, 0x00, 0x93, 0x80, 0x5C, 0x02, 0x31, 0x09, 0xC2, 0x24, 0x00,</div><div class='add'>+0x9F, 0x00, 0x7C, 0x02, 0xF0, 0x09, 0xE0, 0x27, 0x00, 0x9F, 0x40, 0x5C, 0x02,</div><div class='add'>+0x30, 0x09, 0xC0, 0x27, 0x00, 0x9F, 0x00, 0x5C, 0x02, 0xF0, 0x09, 0xC0, 0x27,</div><div class='add'>+0x00, 0x9F, 0x80, 0x5C, 0x12, 0xB4, 0x09, 0xC0, 0xE1, 0x40, 0x9B, 0x01, 0x58,</div><div class='add'>+0x06, 0xF0, 0x09, 0xC4, 0x17, 0xA0, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16,</div><div class='add'>+0x08, 0x25, 0x40, 0x9F, 0x00, 0x7C, 0x02, 0xF3, 0x09, 0x40, 0x27, 0x10, 0x9F,</div><div class='add'>+0x00, 0x7C, 0x02, 0xF0, 0x09, 0x80, 0x27, 0x00, 0x96, 0x00, 0x70, 0x02, 0x70,</div><div class='add'>+0x09, 0xC0, 0x27, 0x00, 0x9F, 0x00, 0x7C, 0x02, 0xF0, 0x09, 0xC2, 0x27, 0x04,</div><div class='add'>+0x9F, 0xA0, 0x7C, 0x02, 0x20, 0x09, 0xC0, 0x27, 0x00, 0x96, 0x00, 0x5C, 0x42,</div><div class='add'>+0xF1, 0x49, 0xC0, 0x4B, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x08,</div><div class='add'>+0x05, 0x06, 0x1F, 0x01, 0x6C, 0x10, 0xF0, 0x01, 0xC0, 0x04, 0x00, 0x1F, 0x00,</div><div class='add'>+0x4C, 0x00, 0xF0, 0x01, 0xC0, 0x07, 0x00, 0x1F, 0x00, 0x7C, 0x00, 0xF0, 0x01,</div><div class='add'>+0xC3, 0x04, 0x00, 0x13, 0x00, 0x7C, 0x00, 0xF0, 0x01, 0xC0, 0x07, 0x08, 0x13,</div><div class='add'>+0x00, 0x4C, 0x00, 0xB0, 0x01, 0xC0, 0x05, 0x08, 0x17, 0x00, 0x6C, 0x28, 0xF0,</div><div class='add'>+0x21, 0xC0, 0x43, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x5C,</div><div class='add'>+0x00, 0x7D, 0x11, 0xC4, 0x0D, 0x72, 0x57, 0x40, 0x14, 0x04, 0x7F, 0x41, 0x44,</div><div class='add'>+0x01, 0xD0, 0x05, 0x40, 0x17, 0x00, 0x7D, 0x20, 0x34, 0x01, 0x72, 0x07, 0xC9,</div><div class='add'>+0x1E, 0x02, 0x51, 0x00, 0x74, 0x01, 0x70, 0xD7, 0x00, 0x9F, 0x04, 0x51, 0x01,</div><div class='add'>+0xC4, 0x15, 0x00, 0x05, 0x40, 0x1C, 0x00, 0x71, 0x05, 0xE4, 0x0D, 0xD0, 0x05,</div><div class='add'>+0x40, 0x53, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xA0, 0xF6, 0x00,</div><div class='add'>+0x4D, 0x21, 0x64, 0x2F, 0x50, 0x4D, 0x40, 0x20, 0x20, 0xCD, 0x04, 0x04, 0x03,</div><div class='add'>+0xD0, 0x0C, 0x40, 0x23, 0x00, 0xCD, 0x0D, 0x34, 0x02, 0xD0, 0x0C, 0x40, 0xB0,</div><div class='add'>+0x00, 0x89, 0x00, 0x34, 0x02, 0x50, 0x2C, 0x40, 0xF3, 0x00, 0x81, 0x89, 0x44,</div><div class='add'>+0x13, 0x91, 0x0C, 0x40, 0x01, 0x00, 0x85, 0x01, 0x24, 0x0F, 0xD0, 0x0C, 0x42,</div><div class='add'>+0x53, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x80, 0x38, 0x00, 0xED,</div><div class='add'>+0x01, 0x86, 0x01, 0x50, 0x0E, 0x50, 0x38, 0x00, 0xF5, 0x11, 0x84, 0x03, 0xD0,</div><div class='add'>+0x0E, 0x40, 0x3B, 0x00, 0xED, 0x00, 0xB4, 0x03, 0xD0, 0x1F, 0x40, 0x5A, 0x40,</div><div class='add'>+0xE9, 0x00, 0xB4, 0x03, 0x50, 0x0E, 0x40, 0x6B, 0x40, 0xE1, 0x01, 0xC6, 0x03,</div><div class='add'>+0x10, 0x5F, 0x40, 0x2C, 0x08, 0x61, 0x00, 0xA4, 0x03, 0xD2, 0x4E, 0x60, 0x07,</div><div class='add'>+0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x18, 0x78, 0x00, 0xEF, 0x01,</div><div class='add'>+0xAC, 0x07, 0x70, 0x1F, 0xC0, 0x78, 0x20, 0xED, 0x01, 0x85, 0x07, 0xF0, 0x1E,</div><div class='add'>+0xC6, 0x7B, 0x00, 0xED, 0x01, 0xBC, 0x07, 0xF0, 0x1F, 0xC0, 0x7C, 0x00, 0xEB,</div><div class='add'>+0x01, 0xBC, 0x07, 0x70, 0x1E, 0xC0, 0x7B, 0x00, 0xE3, 0x01, 0xCC, 0x05, 0xB0,</div><div class='add'>+0x9E, 0xC0, 0x79, 0x00, 0x65, 0x41, 0xAC, 0x04, 0xF0, 0x5E, 0xC0, 0x47, 0x40,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xB8, 0x35, 0x00, 0xCF, 0x00, 0x7C,</div><div class='add'>+0x01, 0x71, 0x0D, 0xC4, 0x37, 0x00, 0xCF, 0x00, 0x7C, 0x03, 0xF0, 0x0D, 0x40,</div><div class='add'>+0x37, 0x00, 0xDF, 0x40, 0x7C, 0x03, 0x70, 0x0D, 0xC0, 0x17, 0x10, 0xD7, 0x80,</div><div class='add'>+0x7C, 0x83, 0x70, 0x0D, 0xC0, 0x23, 0x00, 0xCF, 0x00, 0x7C, 0x01, 0xF0, 0x8D,</div><div class='add'>+0xC0, 0x37, 0x00, 0x5F, 0x00, 0x7C, 0x00, 0xF0, 0x8D, 0xC0, 0x43, 0x60, 0x06,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x20, 0x5D, 0x00, 0xFF, 0x01, 0xCC, 0x13,</div><div class='add'>+0xF0, 0x5F, 0xC0, 0x7B, 0x62, 0x73, 0x41, 0xBC, 0x07, 0x30, 0x1F, 0xC0, 0x7F,</div><div class='add'>+0x00, 0xF3, 0x01, 0xFC, 0x27, 0xF0, 0x17, 0xC0, 0x78, 0x00, 0xFB, 0x09, 0xEC,</div><div class='add'>+0x27, 0x30, 0x1E, 0xC0, 0x78, 0x00, 0xF3, 0x00, 0xFC, 0x07, 0xF0, 0x1F, 0xC0,</div><div class='add'>+0x4C, 0x00, 0xFF, 0x01, 0xFC, 0x07, 0xF0, 0x1F, 0xC0, 0x08, 0x00, 0x06, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x15, 0x00, 0x19, 0x16, 0xED, 0x00, 0x84, 0x01, 0xD0,</div><div class='add'>+0x06, 0x40, 0x3B, 0x06, 0x65, 0x00, 0xB4, 0x03, 0x10, 0x8E, 0x40, 0x3B, 0x02,</div><div class='add'>+0x61, 0x08, 0xB4, 0x03, 0xD2, 0x47, 0x40, 0x38, 0x00, 0xE1, 0x08, 0x84, 0x03,</div><div class='add'>+0x10, 0x0E, 0x40, 0x38, 0x04, 0xE5, 0x08, 0xB4, 0x29, 0xD0, 0x0F, 0x40, 0x29,</div><div class='add'>+0x02, 0x6D, 0x00, 0xB4, 0x22, 0xD0, 0x0E, 0xC0, 0x56, 0x60, 0x04, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x99, 0x00, 0xFD, 0x00, 0x84, 0x23, 0xD0, 0x4E,</div><div class='add'>+0x48, 0x3B, 0x12, 0x60, 0x00, 0xF4, 0x03, 0x10, 0x2E, 0x40, 0x3F, 0x00, 0xE1,</div><div class='add'>+0x00, 0xB4, 0x03, 0xC1, 0x06, 0x60, 0x9C, 0x00, 0xF1, 0x80, 0xC6, 0x03, 0x10,</div><div class='add'>+0x87, 0x40, 0xB8, 0x00, 0xE1, 0x08, 0xB4, 0x03, 0xD0, 0x0E, 0x40, 0x38, 0x00,</div><div class='add'>+0x6D, 0x00, 0xB4, 0x02, 0xD0, 0x0E, 0x40, 0x60, 0x08, 0x04, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x02, 0x28, 0x01, 0x00, 0xCD, 0x12, 0x44, 0x2C, 0xD0, 0xA8, 0x40,</div><div class='add'>+0xB3, 0x04, 0x11, 0x03, 0x34, 0x0B, 0x10, 0x0C, 0x40, 0xB3, 0x04, 0x91, 0x03,</div><div class='add'>+0x34, 0x0B, 0x90, 0x20, 0x40, 0x00, 0x00, 0xC1, 0x02, 0x04, 0x0B, 0x10, 0x08,</div><div class='add'>+0x41, 0x30, 0x40, 0xC5, 0x01, 0x74, 0x40, 0xD0, 0x1C, 0x40, 0x31, 0x10, 0x4D,</div><div class='add'>+0x0A, 0x30, 0x02, 0xC1, 0x2D, 0x48, 0x1A, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x15, 0xA0, 0x61, 0x00, 0xCF, 0x00, 0x4C, 0x22, 0xF0, 0x21, 0xC0, 0xF7,</div><div class='add'>+0x00, 0x93, 0x11, 0x7C, 0x0B, 0x34, 0x5C, 0xC0, 0x33, 0x00, 0x13, 0x01, 0x7C,</div><div class='add'>+0x23, 0xF0, 0x79, 0xD0, 0x64, 0x01, 0xC3, 0x08, 0x4C, 0x23, 0x30, 0x51, 0xC0,</div><div class='add'>+0x34, 0x00, 0xD3, 0x00, 0x7C, 0x06, 0xF0, 0x5F, 0xC0, 0x10, 0x20, 0xCF, 0x23,</div><div class='add'>+0x7C, 0x08, 0xC0, 0xBF, 0x80, 0x54, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x05, 0x08, 0x27, 0x20, 0xDF, 0x01, 0x7C, 0x02, 0xF1, 0x21, 0xC8, 0x37, 0x00,</div><div class='add'>+0x9F, 0x02, 0x7C, 0x23, 0xF1, 0x0D, 0xC0, 0x77, 0x00, 0x1F, 0x1A, 0x7C, 0x07,</div><div class='add'>+0xF0, 0x29, 0xC8, 0x87, 0x00, 0xDF, 0x01, 0x7C, 0x07, 0xF0, 0x21, 0xC0, 0x87,</div><div class='add'>+0x00, 0xDF, 0x08, 0x7C, 0x22, 0xF0, 0x0D, 0xC0, 0x37, 0x02, 0x5F, 0x04, 0x7C,</div><div class='add'>+0x3A, 0xF1, 0x8D, 0xC0, 0x27, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,</div><div class='add'>+0x08, 0x0F, 0x00, 0xF3, 0x00, 0xCC, 0x00, 0x30, 0x03, 0xC1, 0x7C, 0x08, 0x3F,</div><div class='add'>+0x90, 0xCC, 0x43, 0xF0, 0x0F, 0xC0, 0x3C, 0x00, 0x33, 0x00, 0xCC, 0x07, 0x30,</div><div class='add'>+0x03, 0xC1, 0x2F, 0x00, 0xFF, 0x00, 0xCC, 0x07, 0xF0, 0x03, 0xC0, 0x3F, 0x00,</div><div class='add'>+0xFF, 0x12, 0xFC, 0x00, 0x30, 0x0F, 0xC1, 0x7F, 0x01, 0x73, 0x01, 0xCC, 0x00,</div><div class='add'>+0xF1, 0x0D, 0xC0, 0x14, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x81, 0x20,</div><div class='add'>+0xE6, 0x09, 0xD0, 0x01, 0x44, 0x04, 0x12, 0x30, 0x42, 0x34, 0x08, 0x9D, 0x03,</div><div class='add'>+0x4C, 0x03, 0xD0, 0x0D, 0x60, 0x34, 0x00, 0x11, 0x25, 0x04, 0x07, 0x12, 0x39,</div><div class='add'>+0x40, 0xC7, 0x00, 0xDD, 0x80, 0x6C, 0x03, 0xD0, 0x11, 0x40, 0x87, 0x00, 0xDD,</div><div class='add'>+0x01, 0x70, 0x0C, 0x10, 0x0D, 0x40, 0x37, 0x00, 0x51, 0x08, 0x7D, 0x4C, 0xD2,</div><div class='add'>+0x0D, 0x4C, 0x14, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xA0, 0x66,</div><div class='add'>+0x00, 0xD1, 0x01, 0x44, 0x06, 0x98, 0x19, 0x40, 0x36, 0x01, 0x9D, 0x11, 0x64,</div><div class='add'>+0x03, 0xD0, 0x0D, 0x40, 0x74, 0x00, 0x90, 0x01, 0x44, 0x23, 0x10, 0x19, 0x41,</div><div class='add'>+0x67, 0x04, 0xDD, 0x04, 0x54, 0xA3, 0xD1, 0x19, 0x40, 0x37, 0x04, 0xDD, 0x00,</div><div class='add'>+0x74, 0x06, 0x18, 0x0D, 0x40, 0x17, 0x00, 0xD1, 0x00, 0x44, 0x04, 0xD0, 0x0D,</div><div class='add'>+0x58, 0x04, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x24, 0x00,</div><div class='add'>+0x91, 0x01, 0x04, 0x02, 0x94, 0x01, 0x50, 0x32, 0x00, 0x8D, 0x00, 0x04, 0x03,</div><div class='add'>+0xD0, 0x0D, 0x40, 0x34, 0x00, 0x01, 0x00, 0x45, 0x03, 0x10, 0x08, 0x40, 0x23,</div><div class='add'>+0x00, 0xCD, 0x00, 0x24, 0x03, 0xD0, 0x08, 0x48, 0x33, 0x00, 0xCD, 0x00, 0x34,</div><div class='add'>+0x02, 0x10, 0x0C, 0x40, 0x37, 0x00, 0x51, 0x00, 0x24, 0x02, 0x90, 0x0C, 0x40,</div><div class='add'>+0x40, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x06, 0x00, 0xD3,</div><div class='add'>+0x00, 0x4C, 0x02, 0xB0, 0x09, 0xC4, 0x36, 0x00, 0x1F, 0x00, 0x6D, 0x03, 0xF0,</div><div class='add'>+0x0D, 0x40, 0x34, 0x00, 0x93, 0x00, 0x4C, 0x03, 0x30, 0x01, 0xC4, 0x27, 0x00,</div><div class='add'>+0xDF, 0x00, 0x5C, 0x03, 0xF1, 0x01, 0x40, 0x37, 0x00, 0xDF, 0x00, 0x7C, 0x02,</div><div class='add'>+0x34, 0x0F, 0xC0, 0x37, 0x00, 0x53, 0x00, 0x4C, 0x00, 0xF0, 0x0D, 0xC0, 0x04,</div><div class='add'>+0xC0, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x98, 0x2F, 0x00, 0xAF, 0x00,</div><div class='add'>+0xF4, 0x02, 0x70, 0x0B, 0xC4, 0x3D, 0x10, 0xBF, 0x00, 0xFC, 0x03, 0xF0, 0x0F,</div><div class='add'>+0x80, 0x3B, 0x00, 0xBF, 0x00, 0xFC, 0x03, 0xF0, 0x0B, 0xC0, 0x2F, 0x00, 0xEF,</div><div class='add'>+0x00, 0xB8, 0x03, 0xF0, 0x0B, 0xC8, 0x3F, 0x00, 0xFF, 0x00, 0xFC, 0x02, 0xF0,</div><div class='add'>+0x0F, 0xC0, 0x3F, 0x00, 0x7F, 0x00, 0xFC, 0x02, 0xF8, 0x0F, 0xC0, 0x17, 0x24,</div><div class='add'>+0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xA0, 0x0B, 0x80, 0x33, 0x00, 0xFC,</div><div class='add'>+0x10, 0x30, 0x0F, 0xC0, 0x3C, 0x00, 0xF3, 0x00, 0xCC, 0x27, 0x30, 0x03, 0xC8,</div><div class='add'>+0x2C, 0x05, 0xB5, 0x00, 0xCC, 0x02, 0x30, 0x83, 0xC0, 0x2F, 0x03, 0x33, 0x01,</div><div class='add'>+0xCC, 0x01, 0xF0, 0x1B, 0xC0, 0x2F, 0x01, 0x3F, 0x01, 0xCC, 0x26, 0xB0, 0x0B,</div><div class='add'>+0xC0, 0x7C, 0x00, 0xBF, 0x14, 0xFC, 0x27, 0x30, 0x4F, 0xC1, 0x0C, 0x00, 0x0E,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x27, 0x10, 0x11, 0x0A, 0x74, 0x28,</div><div class='add'>+0x12, 0x4F, 0x40, 0x7C, 0x10, 0xD5, 0x01, 0x04, 0x02, 0x10, 0x01, 0x50, 0xE4,</div><div class='add'>+0x08, 0x91, 0x08, 0x54, 0x02, 0x10, 0x0B, 0x40, 0xAF, 0x00, 0x91, 0x00, 0x44,</div><div class='add'>+0x2C, 0xD0, 0x19, 0x40, 0xE7, 0x00, 0x1D, 0x01, 0x44, 0x02, 0x14, 0x08, 0x40,</div><div class='add'>+0x74, 0x00, 0x9D, 0x03, 0x74, 0x03, 0x10, 0x3D, 0x40, 0x04, 0x60, 0x0C, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x11, 0xA0, 0x23, 0x00, 0x01, 0x20, 0x34, 0x00, 0x50,</div><div class='add'>+0x0C, 0x51, 0x30, 0x00, 0xC1, 0x00, 0x04, 0x02, 0x10, 0x00, 0x40, 0x20, 0x00,</div><div class='add'>+0x85, 0x00, 0x04, 0x02, 0x14, 0x48, 0x40, 0xB7, 0x20, 0x91, 0x14, 0x16, 0x81,</div><div class='add'>+0x90, 0x0C, 0x42, 0xB3, 0x00, 0x1D, 0x00, 0x64, 0x02, 0x10, 0x08, 0x40, 0x30,</div><div class='add'>+0x00, 0x09, 0x01, 0x34, 0x03, 0x10, 0x0C, 0x40, 0x44, 0x80, 0x0E, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x03, 0xA8, 0x25, 0x00, 0x11, 0x01, 0x74, 0x44, 0x10, 0x8D,</div><div class='add'>+0x40, 0x34, 0x00, 0xD5, 0x00, 0x44, 0x02, 0x10, 0x01, 0x40, 0x24, 0x01, 0xD1,</div><div class='add'>+0x20, 0x54, 0x46, 0x10, 0x19, 0x40, 0x27, 0x00, 0x91, 0x01, 0x54, 0x40, 0xD0,</div><div class='add'>+0x15, 0x40, 0x77, 0x00, 0x1D, 0x11, 0x64, 0x12, 0x10, 0x09, 0x41, 0x74, 0x00,</div><div class='add'>+0xDD, 0x44, 0x74, 0x23, 0x10, 0x0D, 0x40, 0x1C, 0x00, 0x06, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x80, 0x47, 0x42, 0x11, 0x81, 0x7C, 0x0C, 0x34, 0x1D, 0xC0,</div><div class='add'>+0x34, 0x00, 0xD3, 0x00, 0x49, 0x03, 0x30, 0x15, 0xD0, 0x24, 0x00, 0x97, 0x80,</div><div class='add'>+0x4C, 0x06, 0x30, 0x39, 0xC0, 0x63, 0x40, 0x83, 0x01, 0x5D, 0x01, 0xF0, 0x19,</div><div class='add'>+0xC0, 0x77, 0x00, 0x0F, 0x01, 0x2D, 0x07, 0xB0, 0x29, 0xD0, 0x34, 0x00, 0x9F,</div><div class='add'>+0x01, 0x7E, 0x06, 0x30, 0x0D, 0xC0, 0x00, 0x20, 0x0E, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x07, 0x88, 0x6D, 0x00, 0x3F, 0x00, 0xBC, 0x00, 0xE2, 0x1E, 0xE1, 0x3F,</div><div class='add'>+0x00, 0xFF, 0x00, 0xF8, 0x03, 0xF0, 0x4E, 0xE0, 0x6B, 0x00, 0x8F, 0x20, 0x7C,</div><div class='add'>+0x02, 0xF0, 0x0F, 0xC0, 0x67, 0x22, 0xBF, 0x10, 0xEC, 0x25, 0xF0, 0x0B, 0xC0,</div><div class='add'>+0x3F, 0x08, 0x3F, 0x00, 0xDC, 0x03, 0xF0, 0x47, 0xC0, 0x3F, 0x00, 0xBF, 0x81,</div><div class='add'>+0xFE, 0x06, 0xF4, 0x0C, 0xC0, 0x1F, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x02, 0x08, 0x21, 0x00, 0x13, 0x80, 0x6C, 0x18, 0x32, 0x0D, 0xC0, 0x73, 0x00,</div><div class='add'>+0xD3, 0x00, 0x7C, 0x03, 0x30, 0x05, 0xC0, 0x24, 0x00, 0x93, 0x00, 0x4C, 0x3A,</div><div class='add'>+0x34, 0x2D, 0xC0, 0x3C, 0x00, 0x93, 0x00, 0x7C, 0x01, 0x30, 0x0D, 0xC0, 0x77,</div><div class='add'>+0x00, 0x1F, 0x02, 0x7C, 0x23, 0x30, 0x24, 0xD0, 0x34, 0x00, 0xDF, 0x00, 0x4C,</div><div class='add'>+0x02, 0xF0, 0x0D, 0xE0, 0x0A, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13,</div><div class='add'>+0xA0, 0x6C, 0x01, 0x91, 0x01, 0x44, 0x0C, 0x10, 0x1D, 0xE4, 0x3F, 0x00, 0xE1,</div><div class='add'>+0x00, 0x74, 0x07, 0x10, 0x0D, 0x48, 0x24, 0x00, 0xD1, 0x00, 0x6C, 0x0A, 0x12,</div><div class='add'>+0x0D, 0x48, 0x24, 0x30, 0x9B, 0x00, 0x70, 0x15, 0x11, 0x05, 0x40, 0x34, 0x00,</div><div class='add'>+0x1D, 0x00, 0x74, 0x07, 0x10, 0xA5, 0x40, 0x34, 0x00, 0xDD, 0x84, 0x44, 0x02,</div><div class='add'>+0xD0, 0x0F, 0x40, 0x4C, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x20,</div><div class='add'>+0x40, 0x00, 0x01, 0x00, 0x24, 0x84, 0x10, 0x08, 0x40, 0x33, 0x40, 0xC1, 0x80,</div><div class='add'>+0x74, 0x07, 0x90, 0x20, 0x41, 0x20, 0x40, 0x81, 0x00, 0x44, 0x03, 0x91, 0x08,</div><div class='add'>+0x40, 0x21, 0x20, 0x81, 0x02, 0x30, 0x41, 0x16, 0x0C, 0x52, 0x33, 0x00, 0x4D,</div><div class='add'>+0x00, 0x34, 0x06, 0x10, 0x08, 0x40, 0x30, 0x00, 0x8D, 0x01, 0x44, 0x02, 0xD0,</div><div class='add'>+0x0C, 0x40, 0x0C, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x6C,</div><div class='add'>+0x00, 0x01, 0x11, 0x84, 0x64, 0x10, 0x1E, 0x40, 0x79, 0x40, 0xE1, 0x61, 0xB4,</div><div class='add'>+0x4E, 0x90, 0x12, 0x50, 0x78, 0x00, 0xA1, 0x11, 0xA4, 0x26, 0x90, 0x0A, 0x40,</div><div class='add'>+0x69, 0x00, 0xE9, 0x01, 0xB4, 0x06, 0x10, 0x1F, 0x40, 0x5A, 0x00, 0x6D, 0x01,</div><div class='add'>+0xB4, 0x06, 0x10, 0x1A, 0x40, 0x78, 0x20, 0x8D, 0x01, 0x84, 0x06, 0xD0, 0x1E,</div><div class='add'>+0x40, 0x19, 0x20, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16, 0x18, 0x20, 0x00,</div><div class='add'>+0x03, 0x20, 0x6E, 0x20, 0x34, 0x08, 0x41, 0x33, 0x00, 0xC3, 0x00, 0x3C, 0x02,</div><div class='add'>+0x90, 0x01, 0xC1, 0x20, 0x00, 0x83, 0x00, 0x0C, 0x23, 0xB4, 0x89, 0xC0, 0x31,</div><div class='add'>+0x09, 0x83, 0x00, 0x3C, 0x00, 0x30, 0x0C, 0xC0, 0x33, 0x00, 0x0F, 0x00, 0x7C,</div><div class='add'>+0x02, 0x34, 0x08, 0xC0, 0x30, 0x00, 0xCF, 0x08, 0x0D, 0x02, 0xF2, 0x0C, 0xD0,</div><div class='add'>+0x48, 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x38, 0x2D, 0x40, 0x3F,</div><div class='add'>+0x00, 0xF6, 0x20, 0xF5, 0x0F, 0xC0, 0x3B, 0x00, 0xFF, 0x00, 0xFC, 0x02, 0x50,</div><div class='add'>+0x03, 0xC0, 0x3B, 0x02, 0xFF, 0x08, 0xFC, 0xA1, 0x70, 0xCB, 0xE0, 0xBE, 0x00,</div><div class='add'>+0xBF, 0x00, 0xBC, 0x02, 0xF0, 0x06, 0xC0, 0x3D, 0x00, 0x3F, 0x00, 0xFC, 0x02,</div><div class='add'>+0xF0, 0x8B, 0xC0, 0x3F, 0x00, 0xFF, 0x00, 0xFC, 0x02, 0xF0, 0x0F, 0xC0, 0x0A,</div><div class='add'>+0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xA0, 0x07, 0x00, 0x13, 0x00,</div><div class='add'>+0xCC, 0x00, 0x30, 0x59, 0xC8, 0x30, 0x13, 0xF7, 0x00, 0x74, 0x03, 0x70, 0x01,</div><div class='add'>+0xC0, 0x24, 0x00, 0x9E, 0x00, 0x4C, 0x03, 0x30, 0x2D, 0xC1, 0xAC, 0x00, 0x93,</div><div class='add'>+0x00, 0x7C, 0x01, 0xC0, 0x1D, 0xC0, 0x34, 0x00, 0x5B, 0x00, 0x7C, 0x02, 0x30,</div><div class='add'>+0x05, 0xD0, 0x30, 0x00, 0x93, 0x00, 0x7C, 0x07, 0x30, 0x0D, 0xC0, 0x53, 0x00,</div><div class='add'>+0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x80, 0xA9, 0x00, 0x21, 0xC0, 0x84,</div><div class='add'>+0x02, 0x11, 0x0E, 0xC1, 0x38, 0x04, 0xE1, 0x01, 0xB4, 0x03, 0xD0, 0x0F, 0x40,</div><div class='add'>+0x38, 0x00, 0xAD, 0x00, 0xBC, 0x03, 0x10, 0x0E, 0x42, 0x20, 0x00, 0xE1, 0xC0,</div><div class='add'>+0xB4, 0x03, 0xC0, 0x0E, 0xC0, 0x38, 0x00, 0x6D, 0x00, 0xB4, 0x02, 0x50, 0x0C,</div><div class='add'>+0x40, 0x38, 0x00, 0xA5, 0x00, 0xB4, 0x03, 0x10, 0x0E, 0x40, 0x4B, 0x60, 0x06,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x69, 0x01, 0x21, 0x01, 0x84, 0x07,</div><div class='add'>+0x10, 0x18, 0x00, 0x78, 0x01, 0xE5, 0x01, 0xB4, 0x47, 0xD1, 0x12, 0x50, 0x6A,</div><div class='add'>+0x00, 0x8D, 0x01, 0x04, 0x07, 0x10, 0x1C, 0x48, 0x78, 0x00, 0xA0, 0x01, 0xB4,</div><div class='add'>+0x05, 0xD0, 0x1F, 0x50, 0x78, 0x00, 0x2D, 0x01, 0xB4, 0x06, 0x18, 0x1E, 0x40,</div><div class='add'>+0x68, 0x00, 0xE9, 0x01, 0xF4, 0x07, 0x10, 0x1E, 0x40, 0x03, 0x00, 0x04, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x12, 0x28, 0x33, 0x00, 0xD1, 0x53, 0x04, 0x03, 0x10,</div><div class='add'>+0x0C, 0x50, 0x32, 0x00, 0xC1, 0x00, 0x34, 0x07, 0xD0, 0x0D, 0x40, 0x32, 0x00,</div><div class='add'>+0xCD, 0x40, 0x34, 0x2B, 0x10, 0x5C, 0x60, 0x30, 0x00, 0x81, 0x00, 0x34, 0x03,</div><div class='add'>+0xD0, 0x04, 0x40, 0xF2, 0x00, 0x8D, 0x00, 0x34, 0x26, 0x50, 0x7C, 0x42, 0x30,</div><div class='add'>+0x00, 0xCD, 0x00, 0x34, 0x07, 0x14, 0x0C, 0x40, 0x5B, 0x00, 0x0C, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x17, 0xA0, 0x1D, 0x00, 0x73, 0x27, 0xCC, 0x0D, 0x34, 0x05,</div><div class='add'>+0xC8, 0x10, 0x00, 0x57, 0x20, 0x7C, 0x05, 0xF0, 0x27, 0xC1, 0x16, 0x00, 0x5F,</div><div class='add'>+0x00, 0xCC, 0x05, 0x34, 0x57, 0xD0, 0x14, 0x40, 0x73, 0x00, 0xFC, 0x01, 0xF0,</div><div class='add'>+0x07, 0xC0, 0x1C, 0x01, 0x6B, 0x00, 0x7C, 0x01, 0x30, 0x77, 0xD0, 0x14, 0x00,</div><div class='add'>+0x6B, 0x00, 0x7C, 0x01, 0x30, 0x05, 0xC0, 0x5F, 0x20, 0x0E, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x12, 0x08, 0x05, 0x40, 0x1F, 0x00, 0x7D, 0x20, 0xF0, 0x01, 0xC0,</div><div class='add'>+0x05, 0x00, 0x1F, 0x02, 0x7C, 0x00, 0xF2, 0x01, 0xC5, 0x05, 0x00, 0x1F, 0x00,</div><div class='add'>+0x7C, 0x40, 0xF0, 0x00, 0xC0, 0x03, 0x40, 0x1F, 0x04, 0x7C, 0x20, 0xF0, 0x01,</div><div class='add'>+0xC0, 0x05, 0x30, 0x1F, 0x01, 0x7C, 0x00, 0xF4, 0x21, 0xC4, 0x07, 0x00, 0x17,</div><div class='add'>+0x01, 0x7C, 0x20, 0xF0, 0x01, 0xC0, 0x4B, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x10, 0x08, 0x25, 0x00, 0x97, 0x00, 0x4C, 0x4A, 0x30, 0x59, 0xC0, 0xE7,</div><div class='add'>+0x00, 0x8B, 0x01, 0x6C, 0x02, 0xF0, 0x19, 0x80, 0x24, 0x10, 0x8F, 0x89, 0x4C,</div><div class='add'>+0x02, 0x38, 0x09, 0xC0, 0x24, 0x00, 0x93, 0x05, 0x7C, 0x02, 0xF0, 0x09, 0xC0,</div><div class='add'>+0x23, 0x04, 0x93, 0x01, 0x6D, 0x02, 0x30, 0x59, 0x40, 0xA4, 0x00, 0x93, 0x00,</div><div class='add'>+0x4C, 0x02, 0xF0, 0x09, 0xC0, 0x43, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x01, 0x20, 0x24, 0x00, 0x91, 0x00, 0x44, 0x0A, 0x10, 0x19, 0x40, 0x27, 0x00,</div><div class='add'>+0x91, 0x03, 0x44, 0x02, 0xD0, 0x19, 0x40, 0x24, 0x00, 0x9D, 0x01, 0x6C, 0x02,</div><div class='add'>+0x10, 0x09, 0x40, 0x24, 0x00, 0x91, 0x03, 0x74, 0x06, 0xD0, 0x09, 0x40, 0x27,</div><div class='add'>+0x20, 0x9B, 0x00, 0x2C, 0x12, 0x50, 0x79, 0x50, 0x60, 0x00, 0x9B, 0x00, 0x44,</div><div class='add'>+0x02, 0xD2, 0x09, 0x40, 0x07, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18,</div><div class='add'>+0xA0, 0x20, 0x40, 0x95, 0x20, 0x04, 0x0A, 0x56, 0x29, 0x40, 0x27, 0x40, 0x99,</div><div class='add'>+0xA8, 0x64, 0x06, 0xD8, 0x89, 0x60, 0x25, 0xA0, 0x9D, 0x00, 0x04, 0x02, 0x14,</div><div class='add'>+0x0D, 0x40, 0x26, 0x00, 0xD1, 0x00, 0x74, 0x06, 0xD8, 0x09, 0x40, 0x77, 0x00,</div><div class='add'>+0x91, 0x08, 0x66, 0x92, 0x12, 0x08, 0x42, 0x25, 0xA0, 0x99, 0x00, 0x44, 0x02,</div><div class='add'>+0xD0, 0x09, 0x40, 0x73, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x20,</div><div class='add'>+0x20, 0x01, 0x81, 0x04, 0x04, 0x12, 0x50, 0x48, 0x40, 0x23, 0x01, 0x81, 0x04,</div><div class='add'>+0x00, 0x06, 0xD0, 0x48, 0x50, 0x21, 0x01, 0x8D, 0x04, 0x25, 0x13, 0x10, 0x48,</div><div class='add'>+0x40, 0x22, 0x11, 0xC1, 0x00, 0x36, 0x12, 0xD0, 0x08, 0x42, 0x23, 0x21, 0x99,</div><div class='add'>+0x00, 0x64, 0x02, 0x50, 0x48, 0x40, 0x25, 0x00, 0x89, 0x04, 0x05, 0x02, 0xD0,</div><div class='add'>+0x48, 0x41, 0x53, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xB8, 0x83,</div><div class='add'>+0x02, 0x07, 0x0A, 0x0C, 0x28, 0x72, 0xA1, 0x40, 0x07, 0x00, 0x5B, 0x00, 0x6C,</div><div class='add'>+0x28, 0xF0, 0xA1, 0xC0, 0x05, 0x00, 0x1F, 0x0A, 0x4C, 0x28, 0x10, 0xA1, 0x50,</div><div class='add'>+0x86, 0x02, 0x13, 0x0A, 0x7C, 0x01, 0xD1, 0x01, 0xC0, 0x07, 0x00, 0x13, 0x00,</div><div class='add'>+0x6D, 0x28, 0x30, 0xA1, 0xC0, 0x05, 0x00, 0x1B, 0x00, 0x4C, 0x08, 0xF0, 0x01,</div><div class='add'>+0xC0, 0x77, 0xC0, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xB8, 0x3F, 0x02,</div><div class='add'>+0xBF, 0x08, 0xFD, 0x22, 0xB0, 0x8B, 0xC0, 0x27, 0x42, 0x9F, 0x08, 0xFC, 0x02,</div><div class='add'>+0xF0, 0x8B, 0xC8, 0x2E, 0x12, 0xBF, 0x48, 0xFC, 0x22, 0xF0, 0x8B, 0xC0, 0x2D,</div><div class='add'>+0x42, 0xBF, 0x00, 0xFC, 0x22, 0xF0, 0x0A, 0xC0, 0x2F, 0x02, 0xBF, 0x00, 0xBD,</div><div class='add'>+0x02, 0xF0, 0x8B, 0xC0, 0x2E, 0x00, 0xBF, 0x08, 0xBC, 0x42, 0xF0, 0x09, 0xC0,</div><div class='add'>+0x67, 0x20, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xA0, 0x3F, 0x05, 0xB3,</div><div class='add'>+0x0C, 0xCC, 0x02, 0x30, 0x0B, 0xC0, 0x2F, 0x00, 0xA3, 0x04, 0x8C, 0x02, 0xF0,</div><div class='add'>+0xCB, 0xC0, 0x2C, 0x00, 0xB3, 0x00, 0xCC, 0x22, 0xF0, 0x4B, 0xC0, 0x24, 0x05,</div><div class='add'>+0xAF, 0x08, 0xFC, 0x16, 0xF0, 0x09, 0xC0, 0x2F, 0x00, 0xBF, 0x00, 0xFC, 0x02,</div><div class='add'>+0xF0, 0xCA, 0xC0, 0x3C, 0x00, 0xF3, 0x00, 0x7C, 0x22, 0xF0, 0x19, 0xC0, 0x67,</div><div class='add'>+0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x07, 0x01, 0x51, 0x0C,</div><div class='add'>+0x4C, 0x48, 0x14, 0x01, 0xC1, 0x04, 0x02, 0x11, 0x60, 0x44, 0x10, 0x70, 0xC0,</div><div class='add'>+0x40, 0x05, 0x00, 0x11, 0x10, 0x44, 0x20, 0xD0, 0x05, 0x40, 0x04, 0x01, 0x1D,</div><div class='add'>+0x04, 0x74, 0x08, 0xC0, 0x01, 0x40, 0x07, 0x02, 0x1D, 0x00, 0x74, 0x10, 0xD2,</div><div class='add'>+0xC1, 0x40, 0x04, 0x00, 0x55, 0x00, 0x74, 0x04, 0xD0, 0x01, 0x40, 0x73, 0x60,</div><div class='add'>+0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x21, 0x05, 0x81, 0x04, 0x24,</div><div class='add'>+0x32, 0x10, 0x88, 0x40, 0x21, 0x00, 0x81, 0x08, 0x04, 0x52, 0xD2, 0x48, 0x40,</div><div class='add'>+0x20, 0x00, 0x81, 0x00, 0x04, 0x06, 0xD0, 0x88, 0x44, 0x20, 0x05, 0x8D, 0x04,</div><div class='add'>+0x34, 0x22, 0xD8, 0x18, 0x40, 0x63, 0x00, 0x8D, 0x20, 0x34, 0x52, 0xD0, 0x48,</div><div class='add'>+0x40, 0x20, 0x00, 0x81, 0x08, 0x34, 0x12, 0xD0, 0x28, 0x40, 0x4B, 0x00, 0x04,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x28, 0x65, 0x58, 0x81, 0x00, 0x44, 0x02,</div><div class='add'>+0x10, 0x09, 0x40, 0x26, 0x00, 0x91, 0x00, 0x45, 0x12, 0x50, 0x08, 0x50, 0x25,</div><div class='add'>+0x00, 0x91, 0x04, 0x45, 0x02, 0xD0, 0x09, 0x40, 0x24, 0x20, 0x9D, 0x24, 0x74,</div><div class='add'>+0x83, 0xD0, 0x09, 0x40, 0x27, 0x00, 0x9D, 0x06, 0x74, 0x02, 0xD0, 0x49, 0x41,</div><div class='add'>+0x24, 0x00, 0x95, 0x00, 0x74, 0x02, 0xD0, 0x09, 0x40, 0x63, 0x00, 0x04, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x05, 0x20, 0x25, 0x00, 0x93, 0x82, 0x6D, 0x1A, 0x32,</div><div class='add'>+0x09, 0xC0, 0x25, 0x40, 0x93, 0x00, 0x4C, 0x06, 0xF2, 0x09, 0xC0, 0x24, 0x00,</div><div class='add'>+0x93, 0x00, 0x4C, 0x06, 0xF0, 0xB9, 0xC0, 0x24, 0x00, 0x9F, 0x06, 0x7C, 0x02,</div><div class='add'>+0xF0, 0x09, 0xC0, 0xE7, 0x00, 0x9F, 0x00, 0x7C, 0x02, 0xF0, 0x09, 0xD0, 0x24,</div><div class='add'>+0x02, 0x93, 0x09, 0x7C, 0x02, 0xF0, 0x09, 0xC0, 0x17, 0xA0, 0x04, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x16, 0x08, 0x25, 0x00, 0x9F, 0x03, 0x7C, 0x26, 0xF0, 0x09,</div><div class='add'>+0xC1, 0x21, 0x00, 0x8F, 0x00, 0x7C, 0x46, 0x70, 0x09, 0x40, 0x26, 0x40, 0x9F,</div><div class='add'>+0x01, 0x7C, 0x0A, 0xF0, 0x18, 0xD0, 0x67, 0x01, 0x9F, 0x00, 0x7C, 0x12, 0xF0,</div><div class='add'>+0x39, 0xC0, 0x27, 0x01, 0x9F, 0x00, 0x7C, 0x02, 0xF0, 0x19, 0xD0, 0x27, 0x80,</div><div class='add'>+0x9F, 0x00, 0x7C, 0x02, 0xF0, 0x09, 0xC0, 0x4B, 0x00, 0x06, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x14, 0x08, 0x85, 0x00, 0x13, 0x02, 0x4C, 0x00, 0xB0, 0x01, 0xC0,</div><div class='add'>+0x04, 0x40, 0x13, 0x04, 0x4C, 0x20, 0x30, 0x01, 0xC0, 0x04, 0x80, 0x1F, 0x00,</div><div class='add'>+0x4C, 0x00, 0x34, 0x01, 0xC0, 0x04, 0x00, 0x13, 0x82, 0x4C, 0x84, 0xB0, 0x01,</div><div class='add'>+0xC0, 0x07, 0x00, 0x1F, 0x02, 0x7C, 0x40, 0xF0, 0x01, 0xC0, 0x04, 0x00, 0x1F,</div><div class='add'>+0x00, 0x7C, 0x00, 0x30, 0x01, 0xC0, 0x43, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x10, 0x00, 0x14, 0x48, 0x51, 0x00, 0xD4, 0x01, 0x34, 0x07, 0x40, 0x14,</div><div class='add'>+0x00, 0x71, 0x00, 0xC4, 0x01, 0x10, 0x07, 0x50, 0x10, 0x00, 0x5D, 0x10, 0xFC,</div><div class='add'>+0x11, 0x12, 0x05, 0x40, 0x14, 0x00, 0x71, 0x02, 0xC0, 0x05, 0x30, 0x05, 0x40,</div><div class='add'>+0x57, 0x04, 0x5D, 0x01, 0xF4, 0x41, 0xD0, 0x07, 0x40, 0x10, 0x00, 0x5D, 0x01,</div><div class='add'>+0x74, 0x01, 0x10, 0x05, 0x40, 0x53, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x10, 0xA0, 0x36, 0x00, 0xC1, 0x00, 0x44, 0x03, 0x10, 0x2D, 0x40, 0x30, 0x00,</div><div class='add'>+0x81, 0x00, 0x04, 0x0F, 0xD4, 0x1C, 0x40, 0x30, 0x00, 0xDD, 0x00, 0x04, 0x07,</div><div class='add'>+0x10, 0x1C, 0x40, 0x30, 0x20, 0xC1, 0x12, 0x00, 0x03, 0x0C, 0x0C, 0x40, 0x23,</div><div class='add'>+0x00, 0xCD, 0x01, 0x34, 0x01, 0x90, 0x09, 0x40, 0x20, 0x00, 0x8D, 0x00, 0x34,</div><div class='add'>+0x03, 0x10, 0x0C, 0x40, 0x53, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04,</div><div class='add'>+0x80, 0x30, 0x08, 0xC1, 0x00, 0x94, 0x03, 0x10, 0x02, 0x40, 0x38, 0x00, 0xA1,</div><div class='add'>+0x02, 0xC4, 0x07, 0xD0, 0x0E, 0x41, 0x38, 0x04, 0xCD, 0x00, 0xB4, 0x05, 0x10,</div><div class='add'>+0x2C, 0x40, 0x7A, 0x00, 0xF1, 0x01, 0x84, 0x0F, 0x10, 0x0E, 0x40, 0x3B, 0x00,</div><div class='add'>+0xED, 0x10, 0xB4, 0x01, 0xD0, 0x03, 0x40, 0x28, 0x00, 0xAD, 0x02, 0xB4, 0x07,</div><div class='add'>+0x10, 0x0E, 0x40, 0x07, 0x20, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x18,</div><div class='add'>+0x78, 0x40, 0xE3, 0x01, 0xCC, 0x04, 0x33, 0x12, 0x50, 0x60, 0x20, 0x23, 0x01,</div><div class='add'>+0x8D, 0x07, 0xF0, 0x1A, 0xC2, 0x78, 0x00, 0xED, 0x01, 0xC8, 0x85, 0x30, 0x1E,</div><div class='add'>+0xD0, 0x7C, 0x41, 0xE3, 0x01, 0x8D, 0x06, 0x30, 0x1E, 0xC0, 0x7B, 0x00, 0xEF,</div><div class='add'>+0x01, 0xBC, 0x07, 0xF0, 0x1E, 0xD0, 0x78, 0x00, 0xAD, 0x01, 0xFC, 0x07, 0x34,</div><div class='add'>+0x1E, 0xC0, 0x47, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xB8, 0xB5,</div><div class='add'>+0x05, 0xDF, 0x02, 0x7C, 0x02, 0x70, 0x00, 0xC0, 0x37, 0x00, 0x1C, 0x00, 0x7C,</div><div class='add'>+0x03, 0x30, 0x29, 0xC0, 0x37, 0x00, 0xDF, 0x00, 0x7C, 0x81, 0xF0, 0x0D, 0xC0,</div><div class='add'>+0x35, 0x02, 0xDF, 0x00, 0x3D, 0x00, 0x70, 0x0D, 0xC0, 0x37, 0x00, 0xDF, 0x00,</div><div class='add'>+0x7C, 0x03, 0xF0, 0x0D, 0xC0, 0x37, 0x00, 0x9F, 0x00, 0x7C, 0x03, 0xF0, 0x0D,</div><div class='add'>+0xC0, 0x43, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x20, 0x7D, 0x00,</div><div class='add'>+0xF3, 0x03, 0xCC, 0x13, 0x30, 0x17, 0xC0, 0x7C, 0x10, 0xF3, 0x01, 0xFC, 0x07,</div><div class='add'>+0xF0, 0x3F, 0xC0, 0x78, 0x00, 0xF3, 0x01, 0xCC, 0x06, 0x30, 0x1A, 0xC0, 0x7D,</div><div class='add'>+0x00, 0xFF, 0x01, 0xCC, 0x07, 0xF0, 0x1F, 0xC0, 0x7F, 0x00, 0xFF, 0x01, 0xFC,</div><div class='add'>+0x27, 0xF0, 0x1B, 0xD0, 0x6C, 0x00, 0xBF, 0x01, 0xFC, 0x07, 0xF0, 0x1F, 0xC0,</div><div class='add'>+0x0B, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x00, 0x39, 0x40, 0xF1,</div><div class='add'>+0x00, 0x86, 0x03, 0x10, 0x02, 0x40, 0x38, 0x02, 0xE1, 0x04, 0xB4, 0x00, 0xD0,</div><div class='add'>+0x8E, 0x40, 0x38, 0x00, 0xB1, 0x00, 0x84, 0x01, 0x10, 0x8A, 0x43, 0x38, 0x08,</div><div class='add'>+0xED, 0x02, 0x84, 0x02, 0x10, 0x0E, 0x40, 0x3B, 0x00, 0xED, 0x00, 0xB4, 0x23,</div><div class='add'>+0xD0, 0x82, 0x40, 0x28, 0x00, 0xED, 0x08, 0xB4, 0x03, 0xD0, 0x0E, 0x40, 0x57,</div><div class='add'>+0x60, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xB1, 0x02, 0xE1, 0x00,</div><div class='add'>+0x84, 0x20, 0x10, 0x00, 0x41, 0x20, 0x00, 0xA9, 0x40, 0xB4, 0x03, 0xD0, 0x08,</div><div class='add'>+0x40, 0x38, 0x06, 0xA1, 0x00, 0x84, 0x60, 0x10, 0x0B, 0x40, 0x38, 0x04, 0xED,</div><div class='add'>+0x00, 0x04, 0x00, 0x50, 0x2E, 0x40, 0x3B, 0x00, 0xED, 0x00, 0xB4, 0x23, 0xD8,</div><div class='add'>+0x0E, 0x40, 0x3A, 0x00, 0xA9, 0x00, 0xB4, 0x03, 0xD0, 0x0E, 0x40, 0x23, 0x00,</div><div class='add'>+0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x28, 0x35, 0x00, 0xC1, 0x0A, 0x44,</div><div class='add'>+0x42, 0x10, 0x00, 0x48, 0x30, 0x00, 0x89, 0x00, 0x34, 0x07, 0xD0, 0xB9, 0x40,</div><div class='add'>+0x70, 0x48, 0x91, 0x01, 0x04, 0x01, 0x10, 0x28, 0x40, 0x30, 0x00, 0xDD, 0x10,</div><div class='add'>+0x04, 0x24, 0x10, 0x0C, 0x40, 0x33, 0x90, 0xCD, 0x02, 0x34, 0x02, 0xD0, 0x2D,</div><div class='add'>+0x40, 0x32, 0x00, 0xCD, 0x03, 0x34, 0x83, 0xD2, 0x0C, 0x40, 0x5B, 0x00, 0x04,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0xA0, 0x25, 0x00, 0xD3, 0x03, 0x4D, 0x0B,</div><div class='add'>+0x30, 0x10, 0xC0, 0x34, 0x50, 0x9B, 0x00, 0x7C, 0x47, 0xF0, 0x2D, 0xD0, 0x60,</div><div class='add'>+0x00, 0xD3, 0x05, 0x4D, 0x0E, 0x34, 0x19, 0xD0, 0x7C, 0x00, 0xDF, 0x01, 0x4D,</div><div class='add'>+0x22, 0x70, 0x0D, 0xC0, 0xB7, 0x02, 0xCF, 0x0A, 0x7C, 0x01, 0xF0, 0xF5, 0xD0,</div><div class='add'>+0x66, 0x00, 0x9F, 0x09, 0xFC, 0x03, 0xF0, 0x0D, 0xC0, 0x57, 0x20, 0x06, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x05, 0x08, 0x77, 0x00, 0x9F, 0x00, 0x7C, 0x02, 0xF0,</div><div class='add'>+0x21, 0xC0, 0x37, 0x00, 0x97, 0x00, 0x7C, 0x03, 0xF0, 0x05, 0xC0, 0x27, 0x00,</div><div class='add'>+0xDF, 0x00, 0x7C, 0x40, 0xF1, 0x08, 0xC1, 0x37, 0x00, 0xDF, 0x01, 0x7C, 0x02,</div><div class='add'>+0x70, 0x0D, 0xC0, 0x37, 0x00, 0xDF, 0x00, 0x7C, 0x01, 0xF0, 0x0D, 0xC0, 0x25,</div><div class='add'>+0x02, 0x9F, 0x08, 0x7C, 0x03, 0xF0, 0x0D, 0xC0, 0x27, 0x00, 0x0C, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x80, 0x08, 0x2F, 0x40, 0xF3, 0x10, 0xDC, 0x04, 0x30, 0x03,</div><div class='add'>+0xC0, 0xF8, 0x00, 0x33, 0x00, 0xFC, 0x03, 0xF0, 0x0B, 0xC1, 0xAC, 0x40, 0xF3,</div><div class='add'>+0x00, 0x4C, 0x04, 0xF0, 0x0B, 0xE0, 0x3C, 0x00, 0xBF, 0x00, 0xCC, 0x00, 0xD0,</div><div class='add'>+0x0F, 0xC0, 0x7F, 0x01, 0xB7, 0x01, 0xCC, 0x03, 0xF0, 0x3F, 0xC0, 0xEC, 0x00,</div><div class='add'>+0xBF, 0x03, 0xCC, 0x03, 0xF0, 0x0F, 0x40, 0x17, 0x20, 0x0C, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x81, 0x20, 0x36, 0x00, 0x91, 0x01, 0x74, 0x02, 0x10, 0x71, 0x40,</div><div class='add'>+0x74, 0x00, 0x11, 0x40, 0x74, 0x03, 0xD0, 0x31, 0x41, 0x24, 0x50, 0xD1, 0x08,</div><div class='add'>+0x44, 0x00, 0xD0, 0x99, 0x40, 0x34, 0x00, 0x9C, 0x03, 0x44, 0x0C, 0xD0, 0x0D,</div><div class='add'>+0x48, 0x37, 0x00, 0x9D, 0x09, 0x44, 0x07, 0xD0, 0x1D, 0x40, 0x24, 0x00, 0x8D,</div><div class='add'>+0x00, 0x45, 0x03, 0xD0, 0x0D, 0x40, 0x17, 0x02, 0x08, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x01, 0xA0, 0x66, 0x00, 0xD1, 0x08, 0x74, 0x23, 0x90, 0x11, 0x40, 0x34,</div><div class='add'>+0x80, 0xD1, 0x00, 0x74, 0x03, 0xD0, 0x1D, 0x40, 0x34, 0x00, 0x91, 0x00, 0x44,</div><div class='add'>+0x12, 0xD0, 0x09, 0x40, 0x36, 0x00, 0x5D, 0x01, 0x44, 0x06, 0xD1, 0x0D, 0x40,</div><div class='add'>+0x37, 0x00, 0xDD, 0x00, 0x74, 0x07, 0xD0, 0x05, 0x41, 0x24, 0x00, 0xDD, 0x00,</div><div class='add'>+0x44, 0x03, 0xD0, 0x0D, 0x40, 0x07, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x10, 0x00, 0x30, 0x00, 0x81, 0x00, 0x34, 0x02, 0x90, 0x00, 0x42, 0x30, 0xC0,</div><div class='add'>+0xC1, 0x00, 0x34, 0x00, 0xD0, 0x00, 0x50, 0x30, 0x00, 0x81, 0x00, 0x04, 0x00,</div><div class='add'>+0xD0, 0x08, 0x48, 0x30, 0x00, 0xCD, 0x00, 0x04, 0x02, 0xD8, 0x0C, 0x42, 0x33,</div><div class='add'>+0x00, 0xCD, 0x80, 0x35, 0x03, 0xD0, 0x0C, 0x70, 0x20, 0x00, 0xDD, 0x00, 0x04,</div><div class='add'>+0x03, 0xD0, 0x0C, 0x40, 0x43, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x18, 0x2E, 0x00, 0xF3, 0x00, 0x1C, 0x00, 0xB0, 0x01, 0xD0, 0x34, 0x00, 0x93,</div><div class='add'>+0x00, 0x7C, 0x03, 0xF2, 0x0B, 0xC0, 0x34, 0x00, 0x93, 0x80, 0x4C, 0x80, 0xF0,</div><div class='add'>+0x09, 0xD0, 0x34, 0x00, 0x9F, 0x00, 0x4D, 0x00, 0xF0, 0x0D, 0xC0, 0x37, 0x20,</div><div class='add'>+0xD7, 0x00, 0x7C, 0x03, 0xF0, 0x0C, 0xD0, 0x24, 0x00, 0xDF, 0x00, 0x4C, 0x03,</div><div class='add'>+0xF0, 0x0D, 0xC0, 0x07, 0xC0, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0xB8,</div><div class='add'>+0x3F, 0x00, 0xBF, 0x00, 0xFC, 0x02, 0x70, 0x03, 0xC0, 0x3F, 0x00, 0xBF, 0x00,</div><div class='add'>+0xFC, 0x03, 0xF0, 0x03, 0xC0, 0x3F, 0x00, 0xBF, 0x40, 0xFC, 0x00, 0xF0, 0x0B,</div><div class='add'>+0xC0, 0x3F, 0x00, 0xAF, 0x00, 0xFC, 0x00, 0xF0, 0x0F, 0xC0, 0x3F, 0x20, 0xFF,</div><div class='add'>+0x00, 0xCC, 0x03, 0xF0, 0x0F, 0xC0, 0x2F, 0x00, 0xFF, 0x00, 0xFC, 0x03, 0xF0,</div><div class='add'>+0x0F, 0xC8, 0x17, 0x20, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x80, 0x2F,</div><div class='add'>+0x00, 0xBF, 0x0C, 0xCC, 0x12, 0xF0, 0x1F, 0xC0, 0xBE, 0x09, 0xBF, 0xC0, 0x9D,</div><div class='add'>+0x40, 0xB0, 0x8F, 0xC0, 0x2F, 0x01, 0xB3, 0x10, 0xDC, 0xE2, 0x30, 0x1F, 0xC0,</div><div class='add'>+0x3F, 0x01, 0xF3, 0x02, 0xCC, 0x02, 0x33, 0x16, 0xC4, 0x3C, 0x00, 0xEF, 0x01,</div><div class='add'>+0xCC, 0x33, 0x30, 0x1F, 0xC0, 0x5A, 0x00, 0xFB, 0x01, 0xAC, 0x27, 0xB0, 0x0B,</div><div class='add'>+0xC0, 0x0F, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x08, 0x07, 0x00,</div><div class='add'>+0x1D, 0x0E, 0x44, 0x12, 0xD0, 0x4D, 0x40, 0x3C, 0x03, 0x1D, 0x03, 0x44, 0x0F,</div><div class='add'>+0x10, 0x2F, 0x40, 0x27, 0x05, 0xD1, 0x06, 0x44, 0x12, 0x10, 0x1D, 0x48, 0xBF,</div><div class='add'>+0x00, 0xF1, 0x06, 0x44, 0x2C, 0x10, 0x05, 0x41, 0xBC, 0x02, 0xDD, 0x01, 0xD4,</div><div class='add'>+0x0B, 0x10, 0x1D, 0x40, 0x74, 0x00, 0xD1, 0x01, 0x44, 0x03, 0x10, 0x01, 0x40,</div><div class='add'>+0x0F, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0xA0, 0xA3, 0x05, 0x8D,</div><div class='add'>+0x01, 0x06, 0x62, 0xD0, 0x09, 0x41, 0x30, 0x20, 0x8D, 0x08, 0x15, 0x03, 0x92,</div><div class='add'>+0xCC, 0x40, 0x43, 0x03, 0xC5, 0x10, 0x34, 0x10, 0x12, 0x0C, 0x42, 0xB2, 0x25,</div><div class='add'>+0xC1, 0x8C, 0x04, 0x04, 0x50, 0x01, 0x50, 0x30, 0x0C, 0x5D, 0x00, 0x24, 0x33,</div><div class='add'>+0x10, 0x0C, 0x40, 0x06, 0x00, 0xD9, 0xA0, 0x64, 0x12, 0x90, 0x08, 0x40, 0x4F,</div><div class='add'>+0x80, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xA8, 0x65, 0x00, 0x1D, 0x01,</div><div class='add'>+0x44, 0x06, 0xD0, 0x19, 0x50, 0x34, 0x00, 0x9D, 0x03, 0x55, 0x0F, 0x10, 0x0D,</div><div class='add'>+0x42, 0x67, 0x00, 0xD5, 0x00, 0x64, 0x0C, 0x10, 0x0D, 0x40, 0x37, 0x00, 0xD1,</div><div class='add'>+0x00, 0x44, 0x04, 0x40, 0x05, 0x40, 0x34, 0x00, 0xDD, 0x80, 0x74, 0x03, 0x10,</div><div class='add'>+0x0D, 0x40, 0x74, 0x00, 0x59, 0x01, 0x44, 0x03, 0x18, 0x11, 0x41, 0x0F, 0xA0,</div><div class='add'>+0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA8, 0x67, 0x04, 0x1F, 0x01, 0x4C,</div><div class='add'>+0x14, 0xF0, 0x5C, 0xC0, 0x34, 0x00, 0x9F, 0x01, 0x5D, 0x0F, 0xB0, 0x0D, 0xC0,</div><div class='add'>+0x47, 0x00, 0xD7, 0x00, 0x7C, 0x06, 0x30, 0x0D, 0xE0, 0x37, 0x00, 0xD1, 0x20,</div><div class='add'>+0x4C, 0x06, 0x60, 0x04, 0xC0, 0x34, 0x00, 0x9F, 0x01, 0x6E, 0x03, 0x30, 0x0C,</div><div class='add'>+0xC0, 0x76, 0x00, 0xDB, 0x05, 0x2C, 0x03, 0xB0, 0x19, 0x44, 0x23, 0x00, 0x0E,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x80, 0x05, 0x00, 0x1F, 0x10, 0xFC, 0x02,</div><div class='add'>+0xF0, 0x0F, 0xC0, 0x3F, 0x04, 0x3F, 0x40, 0xAC, 0x03, 0xF2, 0x0F, 0xC0, 0x07,</div><div class='add'>+0x0C, 0xEB, 0x05, 0x1C, 0x02, 0xF0, 0x0F, 0xC8, 0x3F, 0x00, 0xFF, 0x00, 0x3C,</div><div class='add'>+0x00, 0xB2, 0x0F, 0xC0, 0x3F, 0x00, 0xBF, 0x89, 0x9C, 0x03, 0xF0, 0x5F, 0xC8,</div><div class='add'>+0x3F, 0x40, 0xF7, 0x00, 0xFC, 0x03, 0xF0, 0x0B, 0xC0, 0x1F, 0x20, 0x06, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x02, 0x08, 0xA5, 0x80, 0x93, 0x00, 0x4C, 0x00, 0xF0,</div><div class='add'>+0x09, 0xC0, 0x37, 0x00, 0x93, 0x80, 0x6C, 0x0B, 0x3C, 0x0D, 0xC0, 0x04, 0x00,</div><div class='add'>+0xD3, 0x00, 0x7C, 0x02, 0x30, 0x0D, 0xC0, 0x32, 0x00, 0xDB, 0x00, 0x4C, 0x02,</div><div class='add'>+0x31, 0x0D, 0xE0, 0x34, 0x10, 0x93, 0x02, 0x4C, 0x03, 0x34, 0x4D, 0xC0, 0x74,</div><div class='add'>+0x00, 0x93, 0x00, 0x4C, 0x02, 0xF0, 0x09, 0xC0, 0x08, 0x20, 0x04, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x13, 0xA0, 0x24, 0x10, 0x9B, 0x06, 0x44, 0x02, 0xD0, 0x09,</div><div class='add'>+0x40, 0x3F, 0x00, 0x81, 0x0B, 0x68, 0x07, 0xB0, 0x1F, 0xC0, 0xE4, 0x00, 0xD0,</div><div class='add'>+0x00, 0x74, 0x02, 0x10, 0x0D, 0x48, 0x3F, 0x00, 0xFB, 0x10, 0x44, 0x02, 0x00,</div><div class='add'>+0x0D, 0xC0, 0x3F, 0x00, 0x81, 0x81, 0xC4, 0x2B, 0x10, 0x2D, 0x40, 0x70, 0x00,</div><div class='add'>+0x05, 0x05, 0x6C, 0x2F, 0x10, 0x49, 0xC0, 0x6E, 0x00, 0x02, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x07, 0xA0, 0x02, 0x00, 0x91, 0x02, 0x24, 0x00, 0xD0, 0x08, 0x64,</div><div class='add'>+0xF3, 0x00, 0x01, 0x03, 0x20, 0x07, 0x10, 0x5C, 0x48, 0xE4, 0x00, 0xC5, 0x00,</div><div class='add'>+0x34, 0x00, 0x11, 0x0C, 0x40, 0x31, 0x02, 0xD5, 0x01, 0x04, 0x02, 0x50, 0x14,</div><div class='add'>+0x40, 0x70, 0x01, 0xC1, 0x00, 0x24, 0x23, 0x90, 0x2C, 0x40, 0x10, 0x00, 0xC1,</div><div class='add'>+0x01, 0x04, 0x07, 0x50, 0x60, 0x44, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x04, 0x80, 0x58, 0x00, 0xE9, 0x01, 0xA4, 0x05, 0xD0, 0x1A, 0x60, 0x7B,</div><div class='add'>+0x04, 0x61, 0x01, 0xE4, 0x07, 0x94, 0x1E, 0x40, 0x78, 0x00, 0xE5, 0x01, 0xB4,</div><div class='add'>+0x07, 0x10, 0x1E, 0x00, 0xFB, 0x00, 0xED, 0x03, 0x84, 0x07, 0x58, 0x37, 0x41,</div><div class='add'>+0x79, 0x04, 0xF1, 0x00, 0xA0, 0x07, 0x91, 0x0E, 0x40, 0x78, 0x00, 0xF5, 0x01,</div><div class='add'>+0xE4, 0x27, 0x18, 0x12, 0x48, 0x3E, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x12, 0x10, 0x10, 0x00, 0xC1, 0x00, 0x24, 0x03, 0xF0, 0x08, 0xC0, 0x37, 0x00,</div><div class='add'>+0x43, 0x14, 0x2C, 0x43, 0x10, 0x8D, 0xC1, 0x10, 0x04, 0xC7, 0x00, 0x34, 0x21,</div><div class='add'>+0x30, 0x0C, 0xC0, 0x37, 0x00, 0xD7, 0x88, 0x0C, 0x01, 0x70, 0x00, 0x40, 0x34,</div><div class='add'>+0x00, 0xC3, 0x18, 0x64, 0x13, 0xB0, 0x8C, 0x40, 0x10, 0x00, 0xC3, 0x00, 0x0C,</div><div class='add'>+0x42, 0x70, 0x09, 0xC0, 0x48, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,</div><div class='add'>+0x98, 0x3D, 0x20, 0xF7, 0x00, 0xDC, 0x03, 0xF0, 0x0B, 0xC0, 0x3F, 0x40, 0xEF,</div><div class='add'>+0x00, 0xFC, 0x23, 0xF5, 0x0F, 0xC4, 0x35, 0x00, 0xFB, 0x00, 0xFC, 0x03, 0xF0,</div><div class='add'>+0x0F, 0xC0, 0xBF, 0x02, 0xF3, 0x00, 0xFC, 0x01, 0xB0, 0x07, 0xC0, 0x3F, 0x00,</div><div class='add'>+0xFF, 0x0C, 0xDC, 0x03, 0x70, 0x4E, 0xC0, 0x3F, 0x00, 0xEF, 0x00, 0xFE, 0x83,</div><div class='add'>+0x70, 0x07, 0xC8, 0x0B, 0x60, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0xA0,</div><div class='add'>+0x37, 0x80, 0x5B, 0x00, 0x5C, 0x01, 0x34, 0x09, 0xC0, 0xB7, 0x04, 0xCF, 0x80,</div><div class='add'>+0x5C, 0x03, 0xF8, 0x4D, 0xC9, 0x37, 0x00, 0xDF, 0x01, 0x4C, 0x01, 0xF0, 0x0D,</div><div class='add'>+0xC0, 0x37, 0x03, 0xDF, 0x02, 0x7E, 0x03, 0xF0, 0x05, 0xC0, 0xB6, 0x02, 0xDF,</div><div class='add'>+0x00, 0x5C, 0x5B, 0xF0, 0x1D, 0xC0, 0x36, 0x00, 0xCF, 0x20, 0x4C, 0x03, 0x22,</div><div class='add'>+0x01, 0xC4, 0x40, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x88, 0x1D,</div><div class='add'>+0x08, 0x63, 0x00, 0xB4, 0x01, 0x10, 0x0A, 0x40, 0xBB, 0x11, 0x6D, 0x00, 0x94,</div><div class='add'>+0x03, 0x30, 0x6E, 0x48, 0x3B, 0x00, 0xED, 0x00, 0x84, 0x03, 0xD0, 0x0E, 0x40,</div><div class='add'>+0x3B, 0x01, 0xED, 0x48, 0xB4, 0x03, 0xD0, 0x0F, 0x40, 0x38, 0x04, 0xAD, 0x00,</div><div class='add'>+0xB4, 0x0B, 0xD0, 0x0E, 0x40, 0x38, 0x00, 0xED, 0x80, 0xD4, 0x83, 0x10, 0x06,</div><div class='add'>+0xC0, 0x4E, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x79, 0x00,</div><div class='add'>+0xE1, 0x01, 0xB4, 0x47, 0x10, 0x1A, 0x40, 0x7B, 0x00, 0xED, 0x11, 0xD4, 0x47,</div><div class='add'>+0x50, 0x1E, 0x48, 0x5B, 0x00, 0xED, 0x01, 0xA5, 0x05, 0xD0, 0x1E, 0x40, 0x7B,</div><div class='add'>+0x00, 0xED, 0x09, 0xB4, 0x07, 0xD2, 0x1E, 0x55, 0x78, 0x00, 0xAD, 0x01, 0xB4,</div><div class='add'>+0x07, 0xD0, 0x1B, 0x40, 0x7A, 0x00, 0xF5, 0x01, 0x84, 0x06, 0x14, 0x18, 0x40,</div><div class='add'>+0x10, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x28, 0x33, 0x10, 0xC1,</div><div class='add'>+0x0D, 0x34, 0x07, 0x90, 0x00, 0x40, 0x33, 0x00, 0xCD, 0x03, 0x14, 0x0B, 0x90,</div><div class='add'>+0x0C, 0x40, 0xF3, 0x04, 0xCD, 0x08, 0x04, 0x07, 0xD0, 0x0C, 0x40, 0x37, 0x20,</div><div class='add'>+0xCD, 0x00, 0x34, 0x27, 0xD0, 0x4C, 0x40, 0x30, 0x00, 0x8D, 0x04, 0x34, 0x03,</div><div class='add'>+0xD0, 0x18, 0x40, 0x70, 0x08, 0xCD, 0x01, 0x14, 0x03, 0x10, 0xAD, 0x43, 0x5A,</div><div class='add'>+0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x17, 0xA8, 0x1D, 0x04, 0x73, 0x02,</div><div class='add'>+0xFC, 0x01, 0x30, 0x27, 0xC0, 0x17, 0x10, 0x7F, 0x02, 0xDD, 0xA9, 0x74, 0x05,</div><div class='add'>+0xC0, 0x9F, 0x00, 0x5F, 0x00, 0xEC, 0x15, 0xF0, 0x05, 0x40, 0x17, 0x80, 0x5F,</div><div class='add'>+0x00, 0xFC, 0x09, 0xF0, 0x36, 0xC0, 0x14, 0x00, 0x7F, 0x02, 0x7C, 0x01, 0xF9,</div><div class='add'>+0x15, 0xC2, 0x1E, 0x04, 0x67, 0x81, 0x44, 0x01, 0x10, 0x27, 0xC0, 0x5C, 0x00,</div><div class='add'>+0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x47, 0x40, 0x1F, 0x00, 0x7C,</div><div class='add'>+0x40, 0x70, 0x41, 0xC0, 0x83, 0x00, 0x1F, 0x12, 0x7C, 0x00, 0x74, 0x01, 0xC0,</div><div class='add'>+0x07, 0x02, 0x1F, 0x00, 0x5C, 0x04, 0xF0, 0x01, 0xC2, 0x87, 0x00, 0x1F, 0x00,</div><div class='add'>+0x7C, 0x00, 0xF0, 0x01, 0xC0, 0x05, 0x00, 0x1F, 0x0A, 0x7C, 0x00, 0xF0, 0x81,</div><div class='add'>+0xC0, 0x07, 0x10, 0x1F, 0x08, 0x7C, 0x00, 0xF0, 0x21, 0xC0, 0x4B, 0x20, 0x04,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x08, 0x27, 0x80, 0x93, 0x05, 0x3C, 0x02,</div><div class='add'>+0x30, 0x09, 0xC0, 0x67, 0x02, 0x83, 0x00, 0x4C, 0x02, 0xB0, 0x28, 0xC0, 0x64,</div><div class='add'>+0x01, 0x9E, 0x00, 0x78, 0x02, 0x30, 0x09, 0xC0, 0xA7, 0x40, 0x9B, 0x01, 0x7C,</div><div class='add'>+0x42, 0xF0, 0x59, 0xC0, 0x20, 0x01, 0x93, 0x42, 0x7C, 0x82, 0xF0, 0x39, 0xC0,</div><div class='add'>+0x27, 0x04, 0x97, 0x08, 0x6C, 0x16, 0x30, 0x89, 0xC0, 0x40, 0x20, 0x04, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x26, 0x00, 0x91, 0x01, 0x74, 0x02, 0x10,</div><div class='add'>+0x09, 0xC0, 0xA7, 0x04, 0x91, 0x86, 0x0C, 0x02, 0xB0, 0x09, 0x40, 0x64, 0x00,</div><div class='add'>+0x9D, 0x00, 0x7C, 0x02, 0x10, 0x09, 0x40, 0xE7, 0x00, 0x91, 0x01, 0x74, 0x02,</div><div class='add'>+0xD0, 0x49, 0xC0, 0xE6, 0x04, 0x91, 0x20, 0x74, 0x0E, 0xD0, 0x29, 0x40, 0x23,</div><div class='add'>+0x40, 0x9B, 0x41, 0x44, 0x46, 0x14, 0x39, 0x40, 0x04, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x18, 0xA0, 0x20, 0x00, 0x91, 0x00, 0x74, 0x02, 0x10, 0x09,</div><div class='add'>+0x60, 0x27, 0x00, 0x91, 0x00, 0x65, 0x22, 0x94, 0x09, 0x58, 0x26, 0x00, 0x9D,</div><div class='add'>+0x00, 0x36, 0x02, 0x10, 0x09, 0x40, 0x27, 0x00, 0x91, 0x08, 0x74, 0x02, 0xD0,</div><div class='add'>+0x09, 0x60, 0x24, 0x00, 0xD1, 0x00, 0x74, 0x22, 0xD0, 0x09, 0x40, 0x67, 0x00,</div><div class='add'>+0x95, 0x00, 0x04, 0x02, 0x12, 0x29, 0x40, 0x60, 0x00, 0x02, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x10, 0x20, 0x20, 0x81, 0x81, 0x05, 0x34, 0x12, 0x10, 0x08, 0x40,</div><div class='add'>+0x21, 0x09, 0x81, 0x04, 0x44, 0x12, 0x90, 0x58, 0x40, 0x62, 0x01, 0x8D, 0x04,</div><div class='add'>+0x14, 0x12, 0x10, 0x08, 0x40, 0x23, 0x01, 0xC1, 0x04, 0x34, 0x12, 0xD0, 0x09,</div><div class='add'>+0x68, 0x22, 0x01, 0xC1, 0x00, 0x36, 0x12, 0xD0, 0x0C, 0x40, 0x23, 0x08, 0x99,</div><div class='add'>+0x00, 0x05, 0x22, 0x10, 0x48, 0x50, 0x40, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x1D, 0xB0, 0x86, 0x02, 0x11, 0x0A, 0x3C, 0x28, 0x30, 0xA1, 0x40, 0x87,</div><div class='add'>+0x02, 0x13, 0x40, 0x6C, 0x00, 0xB4, 0xA1, 0xC8, 0x86, 0x02, 0x0F, 0x0A, 0x74,</div><div class='add'>+0x28, 0x34, 0x01, 0x84, 0x97, 0x02, 0x1B, 0x0A, 0x7C, 0x00, 0xD0, 0xA1, 0xC0,</div><div class='add'>+0x84, 0x42, 0x13, 0x40, 0x7C, 0x29, 0xF0, 0x01, 0xC0, 0x07, 0x00, 0x17, 0x00,</div><div class='add'>+0x4C, 0x08, 0x30, 0xA1, 0xC0, 0x74, 0xC0, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x19, 0x98, 0x2F, 0x4A, 0xBF, 0x08, 0xFC, 0x22, 0xD4, 0x0B, 0xC0, 0x27, 0x62,</div><div class='add'>+0xBF, 0x88, 0xBC, 0x22, 0xF4, 0x89, 0xC0, 0x2D, 0x02, 0xBF, 0x08, 0xFC, 0x22,</div><div class='add'>+0xF0, 0x09, 0xC4, 0x27, 0x02, 0x9F, 0x08, 0xFC, 0x22, 0xF0, 0x0B, 0xC0, 0x27,</div><div class='add'>+0x02, 0xBF, 0x40, 0x7C, 0x22, 0xD0, 0x0A, 0xC0, 0x2F, 0x80, 0xBF, 0x00, 0xDE,</div><div class='add'>+0x92, 0xF0, 0x8B, 0xC0, 0x77, 0x20, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18,</div><div class='add'>+0xA0, 0x27, 0x01, 0xB3, 0x14, 0x7C, 0x32, 0x30, 0x09, 0xD0, 0x2C, 0x40, 0xA3,</div><div class='add'>+0x00, 0x9C, 0x12, 0x30, 0x4B, 0xC1, 0x2C, 0x03, 0x9F, 0x25, 0x7C, 0x02, 0xF0,</div><div class='add'>+0x09, 0xC0, 0x2D, 0x01, 0xBF, 0x14, 0x4C, 0x12, 0x70, 0x0B, 0xC0, 0x2F, 0x40,</div><div class='add'>+0xB3, 0x00, 0xFC, 0x12, 0xF0, 0x0B, 0xC0, 0x2F, 0x00, 0xAB, 0x00, 0x8C, 0x02,</div><div class='add'>+0xF0, 0x0B, 0xC0, 0x76, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1C, 0x08,</div><div class='add'>+0x17, 0x0D, 0x11, 0x44, 0x74, 0xB0, 0x10, 0x00, 0x41, 0x04, 0x04, 0x11, 0x08,</div><div class='add'>+0x44, 0x00, 0x90, 0x41, 0x40, 0x04, 0x03, 0x1D, 0x1A, 0x74, 0x40, 0xD0, 0x01,</div><div class='add'>+0x40, 0x07, 0x05, 0x1D, 0x04, 0x44, 0x20, 0xD0, 0x01, 0x43, 0x07, 0x04, 0x11,</div><div class='add'>+0x00, 0x74, 0x50, 0xD0, 0x01, 0x40, 0x07, 0x00, 0x11, 0x40, 0x45, 0x00, 0xD2,</div><div class='add'>+0x05, 0x40, 0x60, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xA0, 0x23,</div><div class='add'>+0x03, 0x81, 0x34, 0x34, 0x12, 0x10, 0x48, 0x40, 0x20, 0x02, 0x81, 0x00, 0x54,</div><div class='add'>+0x27, 0x90, 0x48, 0x41, 0x20, 0x01, 0x8D, 0x04, 0x34, 0x22, 0xD0, 0x08, 0x40,</div><div class='add'>+0x21, 0x03, 0x8D, 0xB4, 0x04, 0x82, 0x50, 0x48, 0x40, 0x23, 0x02, 0xC5, 0x00,</div><div class='add'>+0x34, 0x32, 0xD0, 0x08, 0x40, 0x27, 0x80, 0x89, 0x00, 0x24, 0x82, 0xD0, 0x0C,</div><div class='add'>+0x40, 0x4A, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0xA8, 0x25, 0x40,</div><div class='add'>+0x91, 0x06, 0x74, 0x02, 0x10, 0x29, 0x40, 0x24, 0x00, 0x91, 0x04, 0x44, 0x02,</div><div class='add'>+0x90, 0x09, 0x50, 0x24, 0x01, 0x9D, 0x08, 0x74, 0x02, 0xD0, 0x09, 0x40, 0x27,</div><div class='add'>+0x00, 0x9D, 0x00, 0x44, 0x02, 0xD0, 0x0D, 0x48, 0x37, 0x00, 0x95, 0x10, 0x74,</div><div class='add'>+0x82, 0xD0, 0x8D, 0x44, 0x67, 0x88, 0x91, 0x08, 0x64, 0x82, 0xD0, 0x19, 0x40,</div><div class='add'>+0x62, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x08, 0x25, 0x00, 0x93,</div><div class='add'>+0x82, 0x7C, 0x1E, 0x31, 0x09, 0xC0, 0x24, 0x10, 0x93, 0x06, 0x5C, 0x0A, 0x34,</div><div class='add'>+0x09, 0xC4, 0x24, 0x01, 0x9E, 0x00, 0x7C, 0x32, 0xF0, 0x09, 0xC0, 0x25, 0x00,</div><div class='add'>+0x9F, 0x00, 0x4C, 0x1E, 0x70, 0xE9, 0xC0, 0x27, 0x00, 0x97, 0x00, 0x74, 0x02,</div><div class='add'>+0xF0, 0x09, 0xC0, 0x23, 0x00, 0x9B, 0x04, 0x6E, 0x26, 0xD2, 0x09, 0xC0, 0x16,</div><div class='add'>+0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x00, 0xE1, 0x00, 0x9F, 0x00,</div><div class='add'>+0x7C, 0x16, 0xF6, 0x99, 0xC0, 0x23, 0x28, 0x9F, 0x20, 0x7C, 0x12, 0x70, 0x09,</div><div class='add'>+0xC5, 0x27, 0x0C, 0x9F, 0x00, 0x7C, 0x02, 0xF0, 0x09, 0xE0, 0x27, 0xA0, 0x8F,</div><div class='add'>+0x00, 0x7D, 0x12, 0xF0, 0x19, 0xC3, 0x27, 0x00, 0x9B, 0x02, 0x7C, 0x42, 0xF0,</div><div class='add'>+0x09, 0xC0, 0x27, 0x00, 0x9F, 0x00, 0x5E, 0x06, 0xF2, 0x08, 0xC0, 0x59, 0x20,</div><div class='add'>+0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x08, 0x05, 0x00, 0x1F, 0x02, 0x7C,</div><div class='add'>+0x00, 0x30, 0x01, 0xC0, 0x06, 0x01, 0x1F, 0x02, 0x6C, 0x00, 0xB0, 0x00, 0xC0,</div><div class='add'>+0x07, 0x00, 0x1F, 0x00, 0x7C, 0x08, 0xF0, 0x01, 0xC0, 0x07, 0x04, 0x13, 0x00,</div><div class='add'>+0x7C, 0x08, 0xF0, 0x21, 0xC0, 0x06, 0x41, 0x13, 0x00, 0x4C, 0x00, 0x31, 0x01,</div><div class='add'>+0xC1, 0x07, 0x20, 0x1F, 0x02, 0x4D, 0x00, 0x70, 0x01, 0xC1, 0x50, 0x20, 0x04,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x20, 0x14, 0x00, 0x7D, 0x02, 0x74, 0x01,</div><div class='add'>+0x12, 0x05, 0xC0, 0x9C, 0x04, 0x6D, 0x21, 0x04, 0x81, 0x10, 0x57, 0x40, 0x5F,</div><div class='add'>+0x01, 0x5D, 0x80, 0x74, 0x01, 0xD0, 0x05, 0x42, 0x1F, 0x20, 0x71, 0x08, 0x74,</div><div class='add'>+0x01, 0xD0, 0x57, 0xC0, 0x1C, 0x01, 0x71, 0x00, 0xC4, 0x05, 0x10, 0x27, 0xC1,</div><div class='add'>+0x9D, 0x04, 0x41, 0x05, 0xC4, 0xAD, 0x10, 0x07, 0x50, 0x40, 0x00, 0x02, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x14, 0xA0, 0x32, 0x00, 0xCD, 0x13, 0x74, 0x03, 0x10,</div><div class='add'>+0x0D, 0x42, 0x30, 0x10, 0xCD, 0x04, 0x24, 0x02, 0x90, 0x3C, 0x40, 0x73, 0x00,</div><div class='add'>+0xCD, 0x00, 0x34, 0x03, 0xD0, 0x0C, 0x40, 0xF3, 0x00, 0xC1, 0x00, 0x34, 0x03,</div><div class='add'>+0xD0, 0x0C, 0x40, 0x34, 0x80, 0x49, 0x50, 0x05, 0x07, 0x10, 0x18, 0x40, 0xD3,</div><div class='add'>+0x01, 0xC5, 0x01, 0x04, 0x07, 0x50, 0x0C, 0x40, 0x40, 0x00, 0x0A, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x04, 0x88, 0x38, 0x02, 0xED, 0x02, 0x34, 0x03, 0x14, 0x4E,</div><div class='add'>+0x40, 0x38, 0x00, 0xED, 0x02, 0xC4, 0x03, 0x10, 0x0E, 0x42, 0x3B, 0x08, 0xED,</div><div class='add'>+0x0C, 0xB6, 0x03, 0xD0, 0x0E, 0x40, 0xF3, 0x00, 0xE1, 0x10, 0xB4, 0x03, 0xD0,</div><div class='add'>+0x1E, 0x40, 0x38, 0x80, 0x69, 0x01, 0x84, 0x45, 0x12, 0x0A, 0x40, 0x19, 0x00,</div><div class='add'>+0xB1, 0x00, 0xC4, 0x45, 0x10, 0x0A, 0x42, 0x10, 0x00, 0x02, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x14, 0x10, 0x78, 0x00, 0xEF, 0x01, 0xBC, 0x47, 0x30, 0x5E, 0xC2,</div><div class='add'>+0x78, 0x10, 0x6F, 0x01, 0xAC, 0x07, 0xB0, 0x1E, 0xC0, 0x7B, 0x00, 0xEF, 0x01,</div><div class='add'>+0xB4, 0x17, 0xF0, 0x1E, 0x80, 0x7B, 0x40, 0xE3, 0x01, 0xB4, 0x07, 0xF0, 0x17,</div><div class='add'>+0xD0, 0x70, 0x00, 0xEB, 0x01, 0xCC, 0x07, 0x34, 0x1A, 0xC0, 0x5B, 0x00, 0xE7,</div><div class='add'>+0x01, 0x8C, 0x07, 0x70, 0x17, 0xC0, 0x50, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x10, 0xA8, 0x35, 0x04, 0xDF, 0x00, 0x7C, 0x33, 0xF0, 0x8D, 0xD0, 0x15,</div><div class='add'>+0x00, 0x5F, 0x00, 0x7C, 0x03, 0xF0, 0x05, 0xC4, 0x37, 0x10, 0xDF, 0x06, 0x7C,</div><div class='add'>+0x53, 0xF0, 0x0D, 0xC4, 0x37, 0x00, 0x5F, 0x00, 0x7C, 0x83, 0xF0, 0x05, 0xC0,</div><div class='add'>+0x35, 0x00, 0xC7, 0x00, 0x7C, 0x01, 0xF0, 0x09, 0xC4, 0x13, 0x00, 0x97, 0x00,</div><div class='add'>+0x7C, 0x01, 0xF0, 0x01, 0xC0, 0x43, 0x60, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x02, 0xA0, 0x7F, 0x00, 0x7F, 0x21, 0xCC, 0x07, 0xF8, 0xAE, 0xC0, 0x5F, 0x08,</div><div class='add'>+0xEF, 0x01, 0xCC, 0x07, 0x70, 0x9F, 0xC4, 0x5C, 0x02, 0xF3, 0x0B, 0xCC, 0x47,</div><div class='add'>+0x31, 0x1F, 0x40, 0x5F, 0x20, 0x7F, 0x01, 0xCC, 0x07, 0xF0, 0x1F, 0xC0, 0x7C,</div><div class='add'>+0x00, 0xFF, 0x01, 0xFC, 0x07, 0x31, 0x9B, 0xC0, 0x7F, 0x00, 0xEF, 0x01, 0xCF,</div><div class='add'>+0x36, 0x30, 0xDF, 0xD0, 0x18, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15,</div><div class='add'>+0x88, 0x39, 0x00, 0x7D, 0x10, 0x84, 0x23, 0xD8, 0x4E, 0x04, 0xB8, 0x00, 0xAD,</div><div class='add'>+0x04, 0x81, 0x03, 0x10, 0xAF, 0x40, 0x1C, 0x02, 0xF1, 0x20, 0xD5, 0x03, 0x14,</div><div class='add'>+0x0E, 0x40, 0x1A, 0x01, 0x6D, 0x08, 0x85, 0x03, 0xD0, 0x8E, 0x00, 0x39, 0x02,</div><div class='add'>+0xED, 0x00, 0xA4, 0x11, 0x10, 0x8A, 0x40, 0xBB, 0x01, 0xED, 0x04, 0xDC, 0x20,</div><div class='add'>+0x10, 0xCA, 0x40, 0x54, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x39, 0x00, 0x6D, 0x00, 0x85, 0x03, 0xD0, 0x8F, 0x40, 0x19, 0x00, 0x6D, 0x40,</div><div class='add'>+0xC0, 0x03, 0x50, 0x0E, 0x42, 0x18, 0x64, 0xE1, 0x00, 0x80, 0x43, 0x10, 0x0E,</div><div class='add'>+0x40, 0x3A, 0x08, 0xCD, 0x00, 0x84, 0x03, 0xD0, 0x07, 0x40, 0x18, 0x00, 0xED,</div><div class='add'>+0x00, 0x34, 0x03, 0x12, 0x0A, 0x48, 0x3B, 0x24, 0xFD, 0x20, 0x84, 0x52, 0x12,</div><div class='add'>+0xCA, 0x40, 0x20, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x28, 0x73,</div><div class='add'>+0x12, 0x0D, 0x02, 0x04, 0x4B, 0xD0, 0x2C, 0x40, 0x04, 0x00, 0x0D, 0x08, 0x04,</div><div class='add'>+0x6F, 0x10, 0x08, 0x40, 0x40, 0x00, 0xC1, 0x40, 0x04, 0x0F, 0x10, 0x0C, 0x40,</div><div class='add'>+0x22, 0x00, 0x0D, 0x00, 0x04, 0x0F, 0xD2, 0x00, 0x40, 0x21, 0x00, 0xCD, 0x85,</div><div class='add'>+0x24, 0x00, 0x10, 0x08, 0x40, 0x73, 0x11, 0xCD, 0x00, 0x14, 0x04, 0x10, 0x38,</div><div class='add'>+0x40, 0x08, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0xA8, 0x3D, 0x00,</div><div class='add'>+0x9F, 0x00, 0xCC, 0x1F, 0xD0, 0x2F, 0x80, 0x25, 0x00, 0x8F, 0x20, 0x4C, 0x0F,</div><div class='add'>+0x74, 0x01, 0xD2, 0xE4, 0x00, 0xF3, 0x00, 0xC4, 0x07, 0x30, 0x0D, 0xC0, 0x26,</div><div class='add'>+0x00, 0x9F, 0x00, 0x4C, 0x0B, 0xF0, 0x39, 0xC1, 0x04, 0x00, 0x4F, 0x47, 0x74,</div><div class='add'>+0x02, 0x34, 0x09, 0xC0, 0xF3, 0x00, 0xDF, 0x00, 0x44, 0x07, 0x34, 0x21, 0x80,</div><div class='add'>+0x54, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x37, 0x21, 0x9F,</div><div class='add'>+0x10, 0x7C, 0x03, 0xF0, 0x0D, 0xC0, 0xA5, 0x00, 0x9F, 0x10, 0x7D, 0x03, 0xF0,</div><div class='add'>+0x09, 0xC0, 0xA7, 0x04, 0xDF, 0x01, 0x7C, 0x03, 0xF0, 0x0D, 0xC0, 0x86, 0x00,</div><div class='add'>+0x9F, 0x02, 0x7C, 0x23, 0xF0, 0x41, 0xC0, 0x87, 0x00, 0x5F, 0x40, 0x6C, 0x02,</div><div class='add'>+0xF0, 0x29, 0xC0, 0xB7, 0x00, 0x9F, 0x90, 0x5C, 0x09, 0xF0, 0xC9, 0xC0, 0x37,</div><div class='add'>+0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x08, 0x3F, 0x80, 0x3F, 0x00,</div><div class='add'>+0xFC, 0x03, 0xF0, 0x0F, 0xC1, 0x2F, 0x00, 0x33, 0x89, 0xCC, 0x07, 0x10, 0x03,</div><div class='add'>+0xC0, 0x0F, 0x00, 0xFF, 0x00, 0xF4, 0x43, 0xF0, 0x0F, 0xC0, 0x2F, 0x00, 0xBF,</div><div class='add'>+0x00, 0xFC, 0x43, 0xC0, 0x0B, 0xC0, 0x2C, 0x00, 0xFF, 0x00, 0xDC, 0x02, 0xF0,</div><div class='add'>+0x0B, 0xC0, 0x3F, 0x00, 0xB7, 0x00, 0xFC, 0x07, 0x34, 0x01, 0xC8, 0x07, 0x24,</div><div class='add'>+0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x81, 0x20, 0x36, 0x80, 0x9D, 0x07, 0x74,</div><div class='add'>+0x83, 0xD0, 0x0D, 0x42, 0xE7, 0x20, 0x11, 0x87, 0x04, 0x07, 0xB0, 0x31, 0x40,</div><div class='add'>+0xE7, 0x00, 0xDD, 0x20, 0x64, 0x03, 0xD0, 0x0D, 0x40, 0x46, 0x00, 0x99, 0x01,</div><div class='add'>+0x74, 0x83, 0x91, 0x30, 0x40, 0xE5, 0x00, 0xDD, 0x01, 0x44, 0x06, 0xD0, 0x39,</div><div class='add'>+0x40, 0x77, 0x00, 0x91, 0x00, 0x74, 0x02, 0x10, 0x31, 0x44, 0x87, 0x00, 0x08,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xA0, 0x36, 0x20, 0x9D, 0x01, 0x74, 0x03,</div><div class='add'>+0xD0, 0x0D, 0x64, 0x47, 0x40, 0x91, 0x00, 0x44, 0x23, 0x50, 0x11, 0x40, 0x67,</div><div class='add'>+0x04, 0xDD, 0x00, 0x74, 0x03, 0xD0, 0x0D, 0x40, 0xC7, 0x00, 0x1D, 0x03, 0x74,</div><div class='add'>+0x03, 0xD0, 0x19, 0x40, 0x47, 0x00, 0x9D, 0x01, 0x54, 0xC4, 0xD0, 0x1D, 0x40,</div><div class='add'>+0x77, 0x00, 0xD5, 0x01, 0x34, 0x1A, 0x10, 0x31, 0x40, 0x07, 0x00, 0x0A, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x30, 0x00, 0x8D, 0x00, 0x34, 0x03, 0xD0,</div><div class='add'>+0x0C, 0x60, 0x23, 0x00, 0x81, 0x00, 0x44, 0x03, 0xD4, 0x08, 0x40, 0x23, 0x20,</div><div class='add'>+0xCD, 0x00, 0x34, 0x03, 0xD0, 0x0C, 0x40, 0x03, 0x00, 0x09, 0x00, 0x34, 0x03,</div><div class='add'>+0x90, 0x09, 0x40, 0x03, 0x00, 0xCD, 0x00, 0x04, 0x00, 0xD0, 0x0C, 0x40, 0x33,</div><div class='add'>+0x00, 0xC1, 0x00, 0x34, 0x01, 0x10, 0x08, 0x40, 0x43, 0x80, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x10, 0x3E, 0x00, 0x1D, 0x00, 0xFC, 0x03, 0xF0, 0x0F,</div><div class='add'>+0xC0, 0x07, 0x08, 0x93, 0x00, 0x4D, 0x03, 0x70, 0x01, 0xC0, 0x07, 0x00, 0xFF,</div><div class='add'>+0x00, 0xFC, 0x03, 0xF0, 0x0D, 0xC4, 0x27, 0x00, 0x9F, 0x00, 0x7C, 0x03, 0xF0,</div><div class='add'>+0x09, 0xD0, 0x06, 0x00, 0xDF, 0x00, 0x5C, 0x02, 0xF0, 0x09, 0xC0, 0x37, 0x00,</div><div class='add'>+0x97, 0x00, 0x7C, 0x00, 0x30, 0x01, 0xC0, 0x07, 0x60, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x05, 0xB8, 0x3F, 0x00, 0xBF, 0x00, 0xFC, 0x03, 0xF0, 0x0F, 0xC0,</div><div class='add'>+0x2F, 0x00, 0x3F, 0x00, 0xBC, 0x03, 0xA0, 0x0B, 0xC0, 0x2F, 0x00, 0xFE, 0x00,</div><div class='add'>+0xEC, 0x03, 0xF0, 0x0F, 0xC0, 0x0E, 0x00, 0xBA, 0x00, 0xFC, 0x03, 0xB0, 0x0A,</div><div class='add'>+0xC0, 0x2D, 0x00, 0xFF, 0x00, 0xFC, 0x02, 0xF0, 0x03, 0xC2, 0x2F, 0x00, 0xBF,</div><div class='add'>+0x00, 0xFC, 0x00, 0xF2, 0x0B, 0xC0, 0x17, 0x61, 0x0E, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x03, 0xA0, 0x2F, 0x40, 0x23, 0x10, 0xCD, 0x00, 0x30, 0x03, 0xC0, 0x4C,</div><div class='add'>+0x40, 0x33, 0x81, 0xCC, 0x24, 0x30, 0x13, 0xD0, 0x2C, 0x05, 0xF3, 0x09, 0xDC,</div><div class='add'>+0x00, 0x30, 0x4E, 0xC0, 0x2C, 0x00, 0x3F, 0x01, 0xCD, 0x04, 0xF1, 0x13, 0xC0,</div><div class='add'>+0x4C, 0x08, 0x33, 0x01, 0xFC, 0x04, 0xB0, 0x13, 0xD4, 0x4C, 0x40, 0xF3, 0x00,</div><div class='add'>+0xCD, 0x07, 0xF0, 0x4F, 0xC1, 0x0C, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x01, 0x00, 0x27, 0x00, 0x51, 0x92, 0x04, 0x08, 0x13, 0x09, 0x40, 0x04, 0x05,</div><div class='add'>+0x11, 0x10, 0x44, 0x01, 0x10, 0x01, 0x41, 0xA4, 0x05, 0xC1, 0x04, 0x44, 0x2C,</div><div class='add'>+0x10, 0x3F, 0xC0, 0x64, 0x02, 0x1D, 0x00, 0x64, 0x04, 0xD0, 0x05, 0xC0, 0x04,</div><div class='add'>+0x20, 0x11, 0x01, 0x74, 0x04, 0x10, 0x01, 0x60, 0x04, 0x00, 0xC1, 0x00, 0x44,</div><div class='add'>+0x07, 0xD1, 0x2D, 0x40, 0x0C, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11,</div><div class='add'>+0xA0, 0x27, 0x00, 0x01, 0x05, 0x06, 0x0C, 0x10, 0x00, 0x40, 0x20, 0x01, 0x81,</div><div class='add'>+0x00, 0x14, 0x02, 0x10, 0x48, 0x48, 0x21, 0x00, 0x81, 0x04, 0x34, 0x00, 0xD4,</div><div class='add'>+0x8C, 0x44, 0x30, 0x00, 0x8D, 0x00, 0x34, 0x01, 0xD0, 0x00, 0x42, 0x46, 0x20,</div><div class='add'>+0x0D, 0x01, 0x74, 0x02, 0x10, 0x08, 0x40, 0x20, 0x00, 0xC9, 0x00, 0x24, 0x03,</div><div class='add'>+0xD0, 0x0C, 0x40, 0x4C, 0x80, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xA8,</div><div class='add'>+0x25, 0x02, 0x51, 0x44, 0x14, 0x04, 0x14, 0x1D, 0x40, 0x20, 0x00, 0x80, 0x00,</div><div class='add'>+0x55, 0x03, 0x14, 0x09, 0x40, 0x64, 0x00, 0x51, 0x00, 0x64, 0x0C, 0xC0, 0x1D,</div><div class='add'>+0x44, 0x76, 0x04, 0x8D, 0x00, 0x74, 0x89, 0xD0, 0x05, 0x50, 0x04, 0x00, 0x15,</div><div class='add'>+0x00, 0x74, 0x02, 0x10, 0x08, 0x40, 0x20, 0x00, 0x99, 0x00, 0x44, 0x03, 0xD0,</div><div class='add'>+0x1C, 0x40, 0x0C, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA0, 0x43,</div><div class='add'>+0x00, 0x13, 0x00, 0x4C, 0x04, 0x30, 0x31, 0xC2, 0x04, 0x00, 0x13, 0x01, 0x5C,</div><div class='add'>+0x00, 0x30, 0x11, 0xC0, 0xE4, 0x04, 0xD3, 0x04, 0x7C, 0x0C, 0xF0, 0x35, 0xC0,</div><div class='add'>+0xE4, 0x00, 0x1F, 0x00, 0x5C, 0x00, 0xF0, 0x21, 0xC0, 0x12, 0x00, 0x57, 0x00,</div><div class='add'>+0x3C, 0x01, 0xB0, 0x01, 0x40, 0x04, 0x00, 0xDB, 0x00, 0x4C, 0x03, 0xF0, 0x1D,</div><div class='add'>+0xC0, 0x08, 0x20, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x88, 0x4D, 0x00,</div><div class='add'>+0x7F, 0x00, 0xEC, 0x00, 0xF0, 0x0F, 0xC0, 0x0F, 0x12, 0x3F, 0x09, 0xEC, 0x01,</div><div class='add'>+0xF0, 0x93, 0x80, 0x2F, 0x50, 0xFF, 0x00, 0x5C, 0x00, 0x30, 0x06, 0xC0, 0x25,</div><div class='add'>+0x00, 0x3F, 0x08, 0xCC, 0x00, 0xF2, 0x07, 0xC4, 0x1F, 0x00, 0x7B, 0x00, 0xFC,</div><div class='add'>+0x81, 0xF0, 0x83, 0xC0, 0x0F, 0x02, 0xE7, 0x08, 0xFC, 0x03, 0xF0, 0x0F, 0xD4,</div><div class='add'>+0x1F, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x08, 0x25, 0x40, 0x33,</div><div class='add'>+0x00, 0x4C, 0x00, 0x32, 0x31, 0xC0, 0x64, 0x00, 0x9F, 0x01, 0x4C, 0x02, 0xF0,</div><div class='add'>+0x09, 0xC0, 0x24, 0x00, 0x53, 0x04, 0x6C, 0x88, 0xB0, 0x2D, 0xC0, 0x34, 0x11,</div><div class='add'>+0x97, 0x05, 0x7C, 0x01, 0x30, 0x41, 0xC0, 0x17, 0x02, 0x5B, 0x10, 0x4C, 0x03,</div><div class='add'>+0x30, 0x19, 0xC0, 0x64, 0x00, 0x9F, 0x04, 0x4C, 0x03, 0xF0, 0x15, 0xC0, 0x08,</div><div class='add'>+0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0xA0, 0x24, 0x20, 0x41, 0x01,</div><div class='add'>+0x44, 0x14, 0x10, 0xBD, 0x40, 0x64, 0x00, 0x9D, 0x0B, 0x44, 0x2F, 0xD0, 0xA8,</div><div class='add'>+0xC2, 0x26, 0x00, 0xD1, 0x82, 0x04, 0x00, 0x10, 0xAD, 0x40, 0xB4, 0x00, 0x91,</div><div class='add'>+0x03, 0x70, 0x09, 0x11, 0x35, 0x40, 0x97, 0x02, 0x51, 0x13, 0x44, 0x43, 0x10,</div><div class='add'>+0xB9, 0x40, 0x64, 0x00, 0x9D, 0x02, 0x45, 0x13, 0xD0, 0x15, 0x40, 0x6C, 0x00,</div><div class='add'>+0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x20, 0x20, 0x02, 0x01, 0x1A, 0x20,</div><div class='add'>+0x00, 0x14, 0x21, 0x40, 0x10, 0x00, 0x4D, 0x00, 0x60, 0x2C, 0xD0, 0x14, 0x40,</div><div class='add'>+0x34, 0x40, 0xD1, 0x02, 0x24, 0x00, 0xD0, 0x2C, 0x40, 0x00, 0x20, 0x45, 0x02,</div><div class='add'>+0x30, 0x62, 0x10, 0x19, 0x40, 0x21, 0x00, 0x80, 0x41, 0x04, 0x04, 0x10, 0x04,</div><div class='add'>+0x40, 0x10, 0x00, 0xCD, 0x00, 0x04, 0x07, 0xD0, 0x08, 0x40, 0x1C, 0x00, 0x0A,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x68, 0x00, 0x31, 0x01, 0xA5, 0x04,</div><div class='add'>+0x10, 0x1B, 0x40, 0x58, 0x00, 0x6D, 0x01, 0xA4, 0x05, 0xD0, 0x16, 0x40, 0x6A,</div><div class='add'>+0x00, 0xE1, 0x01, 0x84, 0x24, 0x50, 0x9E, 0x40, 0x58, 0x00, 0x61, 0x01, 0xB6,</div><div class='add'>+0x06, 0x10, 0x1E, 0x40, 0x6F, 0x00, 0xB1, 0x81, 0xC4, 0x04, 0x10, 0x16, 0x40,</div><div class='add'>+0x58, 0x00, 0xED, 0x09, 0x84, 0x07, 0xD0, 0x2F, 0x40, 0x74, 0x00, 0x02, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x12, 0x18, 0x24, 0x01, 0x03, 0x08, 0x24, 0x00, 0x30,</div><div class='add'>+0x64, 0xC0, 0x30, 0x00, 0xDF, 0x00, 0x2C, 0x02, 0xF0, 0x0C, 0xC1, 0x14, 0x20,</div><div class='add'>+0x83, 0x00, 0x2C, 0x20, 0xF2, 0x08, 0xD0, 0x10, 0x00, 0xC7, 0x00, 0x3C, 0x03,</div><div class='add'>+0x30, 0x48, 0xC1, 0x23, 0x10, 0x83, 0x00, 0x0C, 0x02, 0x32, 0x0D, 0xD0, 0x30,</div><div class='add'>+0x00, 0x8F, 0x00, 0x0D, 0x03, 0xF0, 0x8C, 0xC8, 0x48, 0x40, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x02, 0x38, 0x3D, 0x40, 0x3F, 0x00, 0xDC, 0x00, 0xF0, 0x0E,</div><div class='add'>+0xC0, 0x3F, 0x00, 0xFF, 0x08, 0xDD, 0x03, 0xF2, 0x8E, 0xC4, 0x2F, 0x20, 0xFF,</div><div class='add'>+0x00, 0xFC, 0x20, 0xB0, 0x0F, 0xC2, 0x1F, 0x02, 0xFF, 0x08, 0xBC, 0x23, 0xF0,</div><div class='add'>+0x0F, 0xC0, 0x2B, 0x00, 0xA7, 0x00, 0xBC, 0x02, 0xF1, 0x0F, 0xC0, 0x3F, 0x00,</div><div class='add'>+0xFF, 0x00, 0xFC, 0x03, 0xF0, 0x4E, 0xC0, 0x0B, 0x60, 0x06, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x14, 0xA0, 0x07, 0x00, 0x13, 0x00, 0x7C, 0x00, 0x34, 0x05, 0xC0,</div><div class='add'>+0x14, 0x00, 0x5F, 0x01, 0x4C, 0x00, 0xF0, 0x05, 0xC0, 0x34, 0x00, 0xCF, 0x00,</div><div class='add'>+0x4C, 0x04, 0x30, 0x4C, 0xC0, 0x34, 0x00, 0x5B, 0x00, 0x7C, 0x02, 0xF0, 0x09,</div><div class='add'>+0xD0, 0x34, 0x00, 0xD3, 0x00, 0x7C, 0x01, 0xF0, 0x05, 0xC0, 0x17, 0x00, 0xDF,</div><div class='add'>+0x00, 0x0D, 0x03, 0x30, 0x0C, 0xD0, 0x54, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x12, 0x80, 0x0D, 0x10, 0x21, 0x00, 0xF4, 0x02, 0x10, 0x0E, 0x40, 0x18,</div><div class='add'>+0x30, 0x6D, 0x00, 0x84, 0x01, 0xD0, 0x06, 0x40, 0x28, 0x00, 0xED, 0x00, 0xAC,</div><div class='add'>+0x00, 0x90, 0x0E, 0x43, 0x38, 0x48, 0x61, 0x00, 0xB4, 0x02, 0xD0, 0x0E, 0x42,</div><div class='add'>+0x38, 0x00, 0xE1, 0x00, 0xB4, 0x01, 0xD0, 0x06, 0x40, 0x1B, 0x00, 0xFD, 0x00,</div><div class='add'>+0x84, 0x03, 0x10, 0x0E, 0x60, 0x4C, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x79, 0x00, 0x21, 0x01, 0xB4, 0x04, 0x10, 0x1E, 0x40, 0x78, 0x00,</div><div class='add'>+0xED, 0x01, 0x84, 0x06, 0xD0, 0x1E, 0x60, 0x78, 0x00, 0xFD, 0x01, 0x04, 0x40,</div><div class='add'>+0xD0, 0x1A, 0x40, 0x78, 0x00, 0xE9, 0x21, 0xB6, 0x07, 0xD0, 0x1A, 0x40, 0x78,</div><div class='add'>+0x00, 0xE1, 0x01, 0xB4, 0x07, 0xD0, 0x1E, 0x40, 0x7B, 0x00, 0xED, 0x01, 0x84,</div><div class='add'>+0x07, 0x10, 0x17, 0x40, 0x04, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16,</div><div class='add'>+0x28, 0x33, 0x02, 0x81, 0x00, 0x74, 0x27, 0x10, 0x7C, 0x40, 0x30, 0x00, 0xCD,</div><div class='add'>+0x00, 0x44, 0x03, 0xD0, 0x0C, 0x62, 0x20, 0x01, 0xCD, 0x83, 0x24, 0x07, 0xD0,</div><div class='add'>+0x2C, 0x40, 0x70, 0x00, 0xC1, 0x00, 0x34, 0x03, 0xD0, 0x0D, 0x42, 0x34, 0x00,</div><div class='add'>+0xC1, 0x40, 0x34, 0x03, 0xD0, 0x0C, 0x40, 0x33, 0x00, 0xCD, 0x09, 0x04, 0x03,</div><div class='add'>+0x15, 0x04, 0x60, 0x48, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x17, 0x20,</div><div class='add'>+0x19, 0x40, 0x73, 0x42, 0xFC, 0x05, 0x30, 0x57, 0xD0, 0x14, 0x00, 0x5F, 0x00,</div><div class='add'>+0x4D, 0x01, 0xF0, 0x05, 0xD0, 0x1C, 0x20, 0x7F, 0x05, 0xCC, 0x09, 0x74, 0x27,</div><div class='add'>+0xC0, 0xDC, 0x03, 0x5B, 0x80, 0x3C, 0x01, 0xF1, 0x05, 0xC0, 0x14, 0x00, 0x53,</div><div class='add'>+0x00, 0x7C, 0x01, 0xF0, 0x05, 0xC0, 0x17, 0x00, 0x5F, 0x00, 0x0C, 0x01, 0x30,</div><div class='add'>+0x27, 0xC0, 0x5C, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x08, 0x85,</div><div class='add'>+0x14, 0x0F, 0x24, 0x7C, 0x04, 0xF4, 0x21, 0xC0, 0x07, 0x00, 0x1F, 0x80, 0x7C,</div><div class='add'>+0x00, 0xF0, 0x01, 0xC0, 0x03, 0x00, 0x1F, 0x10, 0x7C, 0x10, 0x30, 0x61, 0xD0,</div><div class='add'>+0x07, 0x00, 0x1F, 0x00, 0x7C, 0x08, 0xD1, 0x01, 0xC8, 0x07, 0x40, 0x1F, 0x00,</div><div class='add'>+0x7C, 0x00, 0xF0, 0x01, 0xC0, 0x07, 0x20, 0x1F, 0x00, 0x7C, 0x00, 0xF0, 0x01,</div><div class='add'>+0xC1, 0x4B, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x08, 0x65, 0x00,</div><div class='add'>+0x93, 0x01, 0x4C, 0x02, 0x30, 0x09, 0xC0, 0x24, 0x00, 0x9F, 0x00, 0x7C, 0x02,</div><div class='add'>+0x30, 0x89, 0xC0, 0x24, 0x00, 0x93, 0x04, 0x0C, 0x0A, 0x30, 0x29, 0xC0, 0x22,</div><div class='add'>+0x70, 0x93, 0x80, 0x7C, 0x06, 0x30, 0x09, 0xC0, 0x64, 0x02, 0x93, 0x05, 0x7C,</div><div class='add'>+0x02, 0xF0, 0x49, 0xC0, 0x27, 0x02, 0x9F, 0x01, 0x4C, 0x02, 0x30, 0x09, 0xC0,</div><div class='add'>+0x40, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x20, 0x26, 0x10, 0x91,</div><div class='add'>+0x28, 0x44, 0x02, 0x10, 0x28, 0x40, 0xA4, 0x00, 0x9D, 0x02, 0x74, 0x02, 0x10,</div><div class='add'>+0x39, 0x40, 0x24, 0x20, 0x81, 0x00, 0x6C, 0x02, 0x10, 0x28, 0x40, 0xA4, 0x00,</div><div class='add'>+0x91, 0x02, 0x5C, 0x02, 0x10, 0x09, 0x40, 0xE4, 0x08, 0x91, 0x21, 0x74, 0x82,</div><div class='add'>+0xD0, 0x29, 0x40, 0xE7, 0x00, 0x9D, 0x03, 0x45, 0x02, 0x14, 0x09, 0x40, 0x04,</div><div class='add'>+0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0xA0, 0x24, 0x46, 0x91, 0x20,</div><div class='add'>+0x44, 0x02, 0x12, 0x29, 0x40, 0x24, 0x01, 0xBD, 0x04, 0xF4, 0x02, 0x18, 0x0A,</div><div class='add'>+0x40, 0x24, 0x00, 0x91, 0x80, 0x64, 0x02, 0x19, 0x0D, 0x40, 0x26, 0x00, 0x91,</div><div class='add'>+0x00, 0xF4, 0x22, 0x1C, 0x0F, 0x40, 0x2C, 0x04, 0xB1, 0x00, 0xF4, 0x06, 0xD0,</div><div class='add'>+0x0B, 0x40, 0x2F, 0x00, 0x8D, 0x0A, 0x64, 0x02, 0x10, 0x18, 0x40, 0x62, 0x00,</div><div class='add'>+0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x20, 0x24, 0x01, 0x81, 0x04, 0x04,</div><div class='add'>+0x12, 0x10, 0x48, 0x50, 0x68, 0x00, 0xAD, 0x01, 0xB4, 0x02, 0x10, 0x1A, 0x42,</div><div class='add'>+0x20, 0x01, 0x91, 0x00, 0x24, 0x12, 0x10, 0x48, 0x40, 0x32, 0x01, 0xA1, 0x01,</div><div class='add'>+0xD4, 0x03, 0x10, 0x0A, 0x40, 0x28, 0x20, 0xA1, 0x01, 0xB4, 0x02, 0xD0, 0x1A,</div><div class='add'>+0x40, 0x6B, 0x00, 0x8D, 0x04, 0x25, 0x02, 0x10, 0x58, 0x50, 0x42, 0x80, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xB8, 0x86, 0x02, 0x53, 0x0A, 0x4D, 0x28,</div><div class='add'>+0x34, 0xA0, 0x40, 0x84, 0x02, 0x0F, 0x0A, 0x7C, 0x29, 0x30, 0xA2, 0x40, 0x84,</div><div class='add'>+0x02, 0x13, 0x0A, 0x6C, 0x00, 0x30, 0x05, 0xC0, 0x06, 0x00, 0x13, 0x0A, 0x7C,</div><div class='add'>+0x00, 0x30, 0xA0, 0xD0, 0x80, 0x02, 0x13, 0x00, 0x7C, 0x00, 0xF0, 0xA1, 0xC0,</div><div class='add'>+0x8F, 0x02, 0x1F, 0x0A, 0x6C, 0x00, 0x30, 0xA1, 0xC0, 0x76, 0xC0, 0x0A, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x1D, 0xB8, 0x2F, 0x02, 0xBF, 0x08, 0xFC, 0x22, 0xF0,</div><div class='add'>+0x8B, 0xC0, 0x27, 0x00, 0x9F, 0x00, 0x7C, 0x02, 0xF4, 0x09, 0xD0, 0x2F, 0x42,</div><div class='add'>+0xBF, 0x80, 0xFC, 0x22, 0xF0, 0x8B, 0xC0, 0x29, 0x82, 0x9F, 0x00, 0x5C, 0x02,</div><div class='add'>+0xF0, 0x09, 0xC0, 0x27, 0x40, 0x9F, 0x00, 0x7C, 0x02, 0xF0, 0x09, 0xC0, 0x27,</div><div class='add'>+0x00, 0xBF, 0x08, 0x5C, 0x02, 0xF0, 0x8B, 0xC0, 0x65, 0x60, 0x0E, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x1C, 0xA0, 0x2F, 0x01, 0xA3, 0x14, 0xFC, 0x32, 0xF0, 0x0B,</div><div class='add'>+0xD0, 0x2C, 0x00, 0xB3, 0x08, 0xFC, 0x02, 0x30, 0x0B, 0xC0, 0x26, 0x19, 0xB3,</div><div class='add'>+0x00, 0xCC, 0x06, 0x30, 0x1B, 0xC1, 0x6E, 0x04, 0xBF, 0x00, 0xFC, 0x02, 0x30,</div><div class='add'>+0x0B, 0xC0, 0x3C, 0x00, 0xF3, 0x00, 0xCC, 0x03, 0x31, 0x0B, 0xC0, 0x2C, 0x02,</div><div class='add'>+0xBF, 0x00, 0xCC, 0x02, 0xF0, 0x8F, 0xC0, 0x60, 0x00, 0x0E, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x18, 0x00, 0x17, 0x45, 0x11, 0x04, 0x74, 0x30, 0xD0, 0x20, 0x41,</div><div class='add'>+0x14, 0x44, 0x51, 0x00, 0x74, 0x50, 0x10, 0x41, 0x50, 0x04, 0x02, 0x13, 0x00,</div><div class='add'>+0x6C, 0x28, 0x14, 0x01, 0x40, 0x04, 0x00, 0x5D, 0x04, 0x74, 0x00, 0x10, 0x01,</div><div class='add'>+0x41, 0x04, 0x04, 0x11, 0x00, 0x44, 0x00, 0x10, 0x45, 0x40, 0x14, 0x01, 0x1D,</div><div class='add'>+0x12, 0x45, 0x00, 0xD0, 0x81, 0x40, 0x70, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x12, 0x00, 0x21, 0x43, 0x81, 0x14, 0x34, 0x12, 0xD0, 0xC8, 0x50, 0x20,</div><div class='add'>+0x10, 0x81, 0x00, 0x74, 0x16, 0x14, 0x48, 0x41, 0x24, 0x00, 0x81, 0x00, 0x24,</div><div class='add'>+0x02, 0x90, 0x08, 0x40, 0x22, 0x00, 0x8D, 0x94, 0x74, 0x02, 0x98, 0x49, 0x40,</div><div class='add'>+0x22, 0x00, 0x91, 0x00, 0x14, 0x02, 0x90, 0x48, 0x41, 0x22, 0x11, 0x8D, 0x0C,</div><div class='add'>+0x04, 0x02, 0xD0, 0x18, 0x40, 0x48, 0x80, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x18, 0x28, 0x25, 0x00, 0x91, 0x10, 0x74, 0x02, 0xD0, 0x49, 0x41, 0x20, 0x00,</div><div class='add'>+0x91, 0x00, 0x74, 0x02, 0x10, 0x29, 0x40, 0xA4, 0x00, 0x91, 0x00, 0x64, 0x62,</div><div class='add'>+0x98, 0x19, 0x44, 0x24, 0x02, 0x9D, 0x00, 0x74, 0x02, 0x9C, 0x09, 0x50, 0x22,</div><div class='add'>+0x00, 0x91, 0x00, 0x54, 0x02, 0x90, 0x08, 0x50, 0x26, 0x00, 0x9D, 0x08, 0x44,</div><div class='add'>+0x02, 0xD0, 0x08, 0x40, 0x60, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05,</div><div class='add'>+0x00, 0x25, 0x00, 0x93, 0x00, 0x7C, 0x06, 0xF0, 0x09, 0xC0, 0xA4, 0x00, 0x93,</div><div class='add'>+0x02, 0x7C, 0x02, 0x30, 0x09, 0xC0, 0x24, 0x40, 0x93, 0x10, 0x6D, 0x0A, 0xB0,</div><div class='add'>+0x79, 0xC0, 0x26, 0x10, 0x9F, 0x02, 0x3C, 0x02, 0xB0, 0x08, 0xC2, 0x26, 0x40,</div><div class='add'>+0x83, 0x00, 0x5C, 0x42, 0xB4, 0x29, 0xC0, 0xA6, 0x00, 0x9F, 0x00, 0x4C, 0x02,</div><div class='add'>+0xF0, 0x19, 0xC0, 0x14, 0x20, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16, 0x08,</div><div class='add'>+0xE5, 0x00, 0x9F, 0x10, 0x7C, 0xA6, 0xF0, 0x18, 0xD0, 0x27, 0x00, 0x9F, 0x00,</div><div class='add'>+0x7C, 0x02, 0xF2, 0x09, 0xC0, 0x25, 0x00, 0x97, 0x15, 0x7E, 0x06, 0x70, 0x09,</div><div class='add'>+0xC0, 0x25, 0x00, 0x9F, 0x00, 0x7C, 0x26, 0x72, 0x09, 0xC1, 0x25, 0x00, 0x9F,</div><div class='add'>+0x00, 0x6D, 0x02, 0x70, 0x09, 0xC0, 0x25, 0x04, 0x9F, 0x10, 0x7E, 0x02, 0xF0,</div><div class='add'>+0x49, 0xD1, 0x5B, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x08, 0x81,</div><div class='add'>+0x01, 0x13, 0x02, 0x4C, 0x20, 0x34, 0x81, 0xC0, 0x86, 0x44, 0x13, 0x12, 0x6D,</div><div class='add'>+0x04, 0xF0, 0x81, 0xC0, 0x04, 0x00, 0x1F, 0x02, 0x4C, 0x88, 0x30, 0x20, 0xC0,</div><div class='add'>+0x04, 0x08, 0x1F, 0x02, 0x4D, 0x40, 0xF0, 0x01, 0xC0, 0x06, 0x00, 0x13, 0x00,</div><div class='add'>+0x7C, 0x40, 0xF0, 0x21, 0xD0, 0x84, 0x40, 0x13, 0x08, 0x4C, 0x00, 0xF0, 0x01,</div><div class='add'>+0xC0, 0x50, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x20, 0x1C, 0x00,</div><div class='add'>+0x71, 0x82, 0x44, 0x05, 0x10, 0x17, 0xC0, 0x9C, 0x00, 0x71, 0x02, 0x84, 0x05,</div><div class='add'>+0xD0, 0x16, 0x40, 0x10, 0x00, 0x7D, 0x00, 0x14, 0x01, 0x14, 0x37, 0x40, 0x9C,</div><div class='add'>+0x00, 0x7D, 0x03, 0xC4, 0x11, 0xD0, 0x17, 0xC0, 0x1C, 0x00, 0x71, 0x00, 0xB0,</div><div class='add'>+0x4D, 0xD0, 0x07, 0x40, 0x1C, 0x00, 0x71, 0x01, 0x45, 0x01, 0xD0, 0x17, 0x41,</div><div class='add'>+0x50, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xA0, 0x32, 0x40, 0x81,</div><div class='add'>+0x02, 0x24, 0x07, 0x10, 0x0C, 0x40, 0xB0, 0x00, 0xC1, 0x02, 0x04, 0x27, 0xD0,</div><div class='add'>+0x08, 0x40, 0x30, 0x00, 0x5D, 0x00, 0x04, 0x03, 0x90, 0xB8, 0x51, 0xB0, 0x21,</div><div class='add'>+0xCD, 0x05, 0x00, 0x07, 0xD0, 0x2C, 0x40, 0x30, 0x00, 0xC1, 0x13, 0x34, 0x0B,</div><div class='add'>+0xD8, 0x0C, 0x40, 0x30, 0x00, 0x91, 0x03, 0x04, 0x02, 0xD0, 0x2C, 0x40, 0x50,</div><div class='add'>+0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x80, 0x28, 0x00, 0x31, 0x01,</div><div class='add'>+0xA4, 0x06, 0x10, 0x06, 0x40, 0x38, 0x00, 0xE1, 0x01, 0x84, 0x03, 0xD0, 0x0E,</div><div class='add'>+0x42, 0x38, 0x21, 0xED, 0x00, 0x94, 0x03, 0x90, 0x08, 0x40, 0x18, 0x04, 0xED,</div><div class='add'>+0x03, 0x84, 0x01, 0xD1, 0x2F, 0x50, 0x38, 0x00, 0x21, 0x10, 0xB4, 0x03, 0xD0,</div><div class='add'>+0x0E, 0x40, 0x78, 0x00, 0xA1, 0x00, 0x84, 0x02, 0xD0, 0x08, 0x40, 0x14, 0x00,</div><div class='add'>+0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x18, 0x5C, 0x02, 0x63, 0x01, 0xEC,</div><div class='add'>+0x07, 0x30, 0x1E, 0xD1, 0x7C, 0x00, 0xF3, 0x01, 0x8C, 0x07, 0xF0, 0x1A, 0xD0,</div><div class='add'>+0xF8, 0x21, 0x3F, 0x01, 0x84, 0x07, 0xB0, 0x16, 0xC0, 0x78, 0x00, 0xFF, 0x21,</div><div class='add'>+0x8C, 0x07, 0xF0, 0x1E, 0xC0, 0x7C, 0x40, 0x23, 0x01, 0xBC, 0x07, 0xF0, 0x1F,</div><div class='add'>+0xC0, 0x7C, 0x00, 0x73, 0x01, 0x84, 0x06, 0xF0, 0x1E, 0xD0, 0x54, 0x40, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xB8, 0x9D, 0x00, 0x1F, 0x80, 0x5D, 0x12,</div><div class='add'>+0xF0, 0x07, 0xC0, 0x35, 0x08, 0x5F, 0x00, 0x7C, 0x03, 0xF2, 0x00, 0xC0, 0x77,</div><div class='add'>+0x00, 0x9F, 0x00, 0x3C, 0x03, 0x70, 0x0D, 0xC0, 0x37, 0x00, 0xDF, 0x00, 0x7C,</div><div class='add'>+0x03, 0xF0, 0x0C, 0xC0, 0x35, 0x08, 0x1F, 0x00, 0x7C, 0x02, 0xF0, 0x0D, 0xC0,</div><div class='add'>+0x37, 0x00, 0xDF, 0x00, 0x7C, 0x02, 0xF0, 0x01, 0xC0, 0x43, 0x60, 0x06, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x06, 0x20, 0x7D, 0x00, 0x23, 0x01, 0xCC, 0x3F, 0xF8,</div><div class='add'>+0x8B, 0xC0, 0x7C, 0x00, 0xF3, 0x01, 0xFC, 0x07, 0xB0, 0x9B, 0xC0, 0x7F, 0x00,</div><div class='add'>+0xE7, 0x01, 0x8C, 0x87, 0x24, 0x1E, 0xC0, 0x5D, 0x00, 0xF3, 0x01, 0xD4, 0x25,</div><div class='add'>+0xB0, 0x1F, 0xD8, 0x7C, 0x00, 0x32, 0x01, 0xFC, 0x05, 0xF0, 0x1F, 0xC0, 0x7C,</div><div class='add'>+0x00, 0x73, 0x01, 0xCC, 0x06, 0xF0, 0x17, 0xC0, 0x03, 0x00, 0x0E, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x15, 0x00, 0x29, 0x00, 0x21, 0x82, 0x84, 0x62, 0x30, 0x47,</div><div class='add'>+0x40, 0x3C, 0x00, 0xE1, 0x00, 0xBC, 0x02, 0x10, 0xCE, 0x40, 0x3B, 0x00, 0xEB,</div><div class='add'>+0x00, 0xAC, 0x13, 0x30, 0x0E, 0x40, 0x98, 0x40, 0xE1, 0x08, 0x84, 0x01, 0x14,</div><div class='add'>+0x4B, 0xC1, 0x3C, 0x00, 0x21, 0x08, 0xB4, 0x08, 0xD0, 0x2E, 0x40, 0x3C, 0x00,</div><div class='add'>+0xE1, 0x00, 0x84, 0x02, 0xD0, 0x82, 0x40, 0x57, 0x20, 0x06, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x19, 0x00, 0x61, 0x00, 0x04, 0x13, 0x50, 0x8A, 0x50,</div><div class='add'>+0x38, 0x00, 0xE9, 0x00, 0xF4, 0x03, 0x10, 0x0A, 0x60, 0x33, 0x00, 0xB5, 0x00,</div><div class='add'>+0xA4, 0x83, 0x80, 0x0F, 0x50, 0x3B, 0x00, 0x61, 0x00, 0x94, 0x00, 0x94, 0x0E,</div><div class='add'>+0x60, 0x38, 0x00, 0x29, 0x00, 0xB4, 0x01, 0xD0, 0x0E, 0x40, 0x38, 0x00, 0xE1,</div><div class='add'>+0x00, 0x84, 0x02, 0xD0, 0x06, 0x40, 0x03, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x02, 0x28, 0x51, 0x00, 0x01, 0x06, 0x05, 0x0A, 0x12, 0xB5, 0x41, 0x30,</div><div class='add'>+0x00, 0xC9, 0x00, 0x34, 0x02, 0x10, 0x04, 0x60, 0xF3, 0x40, 0x89, 0x03, 0x24,</div><div class='add'>+0x23, 0x10, 0x1C, 0x40, 0x32, 0x00, 0xD1, 0x00, 0x04, 0x01, 0x90, 0x08, 0x40,</div><div class='add'>+0x30, 0x00, 0x09, 0x00, 0x34, 0x00, 0xD0, 0x0D, 0x40, 0x30, 0x00, 0xD1, 0x00,</div><div class='add'>+0x05, 0x02, 0xD0, 0x18, 0x40, 0x13, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x15, 0xA0, 0x65, 0x40, 0x13, 0x07, 0x4C, 0x0E, 0x70, 0x09, 0xC0, 0x34, 0x00,</div><div class='add'>+0xDB, 0x00, 0x7C, 0x03, 0xB0, 0x08, 0xC2, 0x3F, 0x20, 0x07, 0x0D, 0x0C, 0x0A,</div><div class='add'>+0xB0, 0x5D, 0xC0, 0x73, 0x04, 0xD3, 0x00, 0x5C, 0x02, 0xB0, 0x0D, 0xC0, 0x34,</div><div class='add'>+0x00, 0x0B, 0x00, 0x7C, 0x01, 0xF0, 0x0D, 0xD0, 0x34, 0x00, 0x93, 0x05, 0x4C,</div><div class='add'>+0x03, 0xF0, 0x0C, 0xC1, 0x57, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05,</div><div class='add'>+0x08, 0x27, 0x02, 0x3F, 0x00, 0x7C, 0x02, 0x70, 0x21, 0xC0, 0x27, 0x20, 0x97,</div><div class='add'>+0x00, 0x5C, 0x07, 0xF0, 0x29, 0xC0, 0x37, 0x06, 0x97, 0x00, 0x7C, 0x42, 0xF0,</div><div class='add'>+0x0D, 0xC0, 0x35, 0x20, 0x9F, 0x00, 0x7C, 0x00, 0x72, 0x25, 0xC0, 0xA5, 0x00,</div><div class='add'>+0x13, 0x00, 0x7C, 0x08, 0xF0, 0x09, 0xC0, 0x27, 0x00, 0x9F, 0x00, 0x7C, 0x02,</div><div class='add'>+0xF0, 0x09, 0xC0, 0x07, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x08,</div><div class='add'>+0x0F, 0x60, 0x73, 0x00, 0xAC, 0x42, 0xB0, 0x03, 0xC0, 0x1C, 0x00, 0xFF, 0x00,</div><div class='add'>+0xFC, 0x03, 0x30, 0x4B, 0xC0, 0x3E, 0x00, 0x33, 0x05, 0xCC, 0x07, 0x30, 0x4F,</div><div class='add'>+0x40, 0x37, 0x00, 0xF3, 0x00, 0xEC, 0x02, 0xE0, 0x3F, 0xC0, 0x1C, 0x00, 0x31,</div><div class='add'>+0x00, 0xCC, 0x01, 0xF0, 0x07, 0x80, 0x5C, 0x00, 0x53, 0x00, 0xCC, 0x07, 0xF0,</div><div class='add'>+0x3F, 0xE0, 0x00, 0x22, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x81, 0x20, 0xC6,</div><div class='add'>+0x00, 0x11, 0x22, 0x44, 0x06, 0x10, 0x31, 0x40, 0x14, 0x00, 0x5D, 0x01, 0x34,</div><div class='add'>+0x07, 0x10, 0x59, 0x42, 0x30, 0x40, 0x91, 0x40, 0x54, 0x03, 0x10, 0x7D, 0x40,</div><div class='add'>+0xF7, 0x00, 0x9B, 0x01, 0x44, 0x06, 0xD0, 0x05, 0x50, 0x34, 0x00, 0x11, 0x07,</div><div class='add'>+0x4C, 0x0C, 0xD0, 0x3D, 0x40, 0xD4, 0x02, 0xD1, 0x00, 0x44, 0x02, 0xD0, 0x39,</div><div class='add'>+0x50, 0x04, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xA0, 0xC2, 0x00,</div><div class='add'>+0x01, 0x00, 0x64, 0x13, 0x90, 0x19, 0x41, 0x76, 0x00, 0xDD, 0x88, 0x74, 0x07,</div><div class='add'>+0x14, 0x09, 0x48, 0x34, 0x00, 0x99, 0x40, 0x46, 0x12, 0x10, 0x0D, 0x48, 0x67,</div><div class='add'>+0x00, 0xD1, 0x04, 0x64, 0x04, 0xD0, 0x2C, 0x40, 0xB2, 0x01, 0x15, 0x01, 0x64,</div><div class='add'>+0x05, 0xD0, 0x8D, 0x40, 0x31, 0x04, 0x51, 0x00, 0x44, 0x13, 0xD0, 0x2D, 0x40,</div><div class='add'>+0x06, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x20, 0x00, 0x00, 0x01,</div><div class='add'>+0x00, 0x04, 0x02, 0x10, 0x00, 0x50, 0x62, 0x00, 0x8D, 0x00, 0x34, 0x07, 0x14,</div><div class='add'>+0x09, 0x42, 0x34, 0x00, 0x91, 0x00, 0x14, 0x02, 0x10, 0x0C, 0x60, 0x23, 0x40,</div><div class='add'>+0xC9, 0x00, 0x04, 0x00, 0xD0, 0x0C, 0x40, 0x22, 0x80, 0x05, 0x80, 0x04, 0x00,</div><div class='add'>+0xD0, 0x08, 0x40, 0x21, 0x00, 0xC1, 0x00, 0x04, 0x02, 0xD0, 0x08, 0x40, 0x40,</div><div class='add'>+0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x98, 0x0E, 0x00, 0x53, 0x00,</div><div class='add'>+0xEC, 0x03, 0xB2, 0x03, 0xD0, 0x36, 0x00, 0xDF, 0x80, 0x7C, 0x03, 0x14, 0x09,</div><div class='add'>+0xD0, 0x36, 0x00, 0x92, 0x00, 0x4C, 0x03, 0x34, 0x0D, 0x40, 0x27, 0x10, 0x43,</div><div class='add'>+0x00, 0x6C, 0x00, 0xF0, 0x0D, 0xD0, 0x16, 0x00, 0x17, 0x00, 0x6C, 0x01, 0xF0,</div><div class='add'>+0x04, 0xD0, 0x35, 0x00, 0xD3, 0x00, 0x4C, 0x03, 0xF0, 0x09, 0xC0, 0x00, 0xC0,</div><div class='add'>+0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0xB8, 0x0B, 0x00, 0x3F, 0x00, 0xFC,</div><div class='add'>+0x02, 0xF1, 0x03, 0xC0, 0x3D, 0x00, 0xFF, 0x00, 0xBC, 0x01, 0xF4, 0x0B, 0xC0,</div><div class='add'>+0x3F, 0x00, 0xBF, 0x00, 0xFC, 0x03, 0xF0, 0x0F, 0xC0, 0x2F, 0x00, 0xFF, 0x00,</div><div class='add'>+0xB4, 0x00, 0xF0, 0x0F, 0xC0, 0x3D, 0x00, 0x3B, 0x00, 0xFC, 0x00, 0xF0, 0x0F,</div><div class='add'>+0xC0, 0x3E, 0x00, 0xFF, 0x00, 0xFC, 0x02, 0xF0, 0x0B, 0xC0, 0x17, 0x60, 0x0E,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xA0, 0x7F, 0x00, 0xFF, 0x01, 0xFC, 0x02,</div><div class='add'>+0xF0, 0x1F, 0xC8, 0x3F, 0x01, 0xBF, 0x22, 0xFC, 0x0A, 0x30, 0x0B, 0xC0, 0xBF,</div><div class='add'>+0x05, 0xEF, 0x09, 0xEC, 0x10, 0xB0, 0x3F, 0xC0, 0xBD, 0x00, 0xB3, 0x04, 0xCC,</div><div class='add'>+0x82, 0x32, 0x2F, 0xC4, 0x2F, 0x40, 0xF2, 0x01, 0xCC, 0x13, 0xF0, 0x12, 0x44,</div><div class='add'>+0x7A, 0x20, 0x33, 0xCC, 0xEC, 0x06, 0x90, 0x1F, 0x40, 0x0E, 0x00, 0x0E, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x03, 0x08, 0x77, 0x00, 0xDD, 0x01, 0x74, 0x26, 0xD0,</div><div class='add'>+0x1D, 0x40, 0xBF, 0x05, 0x1D, 0x02, 0x74, 0x38, 0x10, 0xC1, 0x40, 0xBF, 0x00,</div><div class='add'>+0xDD, 0x00, 0x64, 0x2C, 0x04, 0x4D, 0x40, 0xBF, 0x08, 0x11, 0x14, 0x74, 0x40,</div><div class='add'>+0x10, 0x6F, 0x40, 0xE7, 0x00, 0xD5, 0x01, 0xC4, 0x0F, 0xD0, 0x19, 0x40, 0x74,</div><div class='add'>+0x00, 0x01, 0x22, 0x44, 0x06, 0x12, 0x1D, 0x40, 0x0C, 0x00, 0x0C, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x13, 0xA0, 0x31, 0x00, 0xCD, 0x00, 0x34, 0x80, 0xD8, 0x0C,</div><div class='add'>+0x40, 0xB3, 0x00, 0x8D, 0x26, 0x34, 0x02, 0x10, 0x00, 0x41, 0x33, 0x11, 0xCD,</div><div class='add'>+0x80, 0x24, 0x02, 0x00, 0x0C, 0x40, 0x31, 0x83, 0x81, 0x8C, 0x04, 0xB2, 0x12,</div><div class='add'>+0x2C, 0x60, 0x03, 0x42, 0xD5, 0x00, 0x14, 0x23, 0xD0, 0x08, 0x40, 0x33, 0x00,</div><div class='add'>+0x45, 0x26, 0x64, 0x01, 0x90, 0x0C, 0x40, 0x4E, 0x80, 0x0E, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x03, 0x28, 0x35, 0x00, 0xDD, 0x00, 0x74, 0x04, 0xD0, 0x0D, 0x44,</div><div class='add'>+0x37, 0x00, 0x9D, 0x01, 0x74, 0x04, 0x10, 0x11, 0x44, 0x37, 0x00, 0xDD, 0x00,</div><div class='add'>+0x66, 0x84, 0x10, 0x0D, 0x40, 0x37, 0x00, 0x91, 0x01, 0x74, 0x06, 0x18, 0x0D,</div><div class='add'>+0x40, 0x47, 0x00, 0x55, 0x11, 0x54, 0x03, 0xD0, 0x19, 0x43, 0x37, 0x80, 0x11,</div><div class='add'>+0x18, 0x44, 0x0E, 0x10, 0x0D, 0x42, 0x0C, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x20, 0xA8, 0x37, 0x00, 0xDF, 0x00, 0x7C, 0x1E, 0xF0, 0x0D, 0xC0, 0x37,</div><div class='add'>+0x00, 0x9F, 0x87, 0x7C, 0xC4, 0x30, 0x19, 0xC2, 0x37, 0x18, 0xDF, 0x00, 0x6C,</div><div class='add'>+0x04, 0x30, 0x0D, 0xC4, 0x35, 0x08, 0x13, 0x01, 0x4C, 0x1E, 0x34, 0x0D, 0xC2,</div><div class='add'>+0x67, 0x40, 0xD7, 0x01, 0x5C, 0x03, 0xF0, 0x19, 0xC0, 0x37, 0x00, 0x95, 0x02,</div><div class='add'>+0x2C, 0x0E, 0xB0, 0x0D, 0xC0, 0x22, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x07, 0x80, 0x3D, 0x00, 0xFF, 0x00, 0xFC, 0x82, 0xF0, 0x0F, 0xC0, 0x3F, 0x90,</div><div class='add'>+0x3F, 0x90, 0xBC, 0x00, 0xF0, 0x0B, 0xC0, 0x3F, 0x00, 0xFF, 0x03, 0x9C, 0x40,</div><div class='add'>+0x70, 0x0F, 0xC0, 0x37, 0x40, 0x3F, 0x40, 0xFC, 0x00, 0x70, 0x0F, 0xC0, 0x2F,</div><div class='add'>+0x00, 0xBF, 0x00, 0xEC, 0x03, 0xF0, 0x0B, 0xC0, 0x3C, 0x0C, 0x2F, 0x01, 0xFC,</div><div class='add'>+0x02, 0xF0, 0x0F, 0xC0, 0x1F, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,</div><div class='add'>+0x08, 0x35, 0x00, 0xDF, 0x00, 0x7C, 0x02, 0xF0, 0x0D, 0xC0, 0x37, 0x00, 0x93,</div><div class='add'>+0x02, 0x7C, 0x0A, 0x30, 0x01, 0xC0, 0x34, 0x40, 0xD3, 0x04, 0x4E, 0x02, 0xF1,</div><div class='add'>+0x0D, 0xC0, 0x30, 0x00, 0x13, 0x08, 0x7C, 0x0A, 0xF0, 0x0D, 0xC0, 0x24, 0x00,</div><div class='add'>+0xD3, 0x22, 0x7C, 0x03, 0x30, 0x29, 0xC0, 0x34, 0x00, 0x13, 0x02, 0x4C, 0x0D,</div><div class='add'>+0xF0, 0x0D, 0xC0, 0x0B, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xA0,</div><div class='add'>+0x34, 0x00, 0xDD, 0x00, 0x74, 0x12, 0xD1, 0x0D, 0x00, 0x3F, 0x00, 0x91, 0x80,</div><div class='add'>+0x74, 0x00, 0x10, 0x01, 0x40, 0x3C, 0x24, 0xDB, 0x02, 0x66, 0x4A, 0xD0, 0x0D,</div><div class='add'>+0x48, 0xBC, 0x42, 0x1B, 0x8B, 0x74, 0x02, 0xF0, 0x3F, 0xC1, 0x62, 0x01, 0x8A,</div><div class='add'>+0x04, 0xF0, 0x03, 0xB1, 0xA8, 0x40, 0x30, 0x00, 0x1B, 0x0E, 0x44, 0x0F, 0xD0,</div><div class='add'>+0x0C, 0x40, 0x6F, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xA0, 0x32,</div><div class='add'>+0x00, 0xCD, 0x00, 0x34, 0x00, 0xD0, 0x0C, 0x40, 0x33, 0x00, 0x01, 0x00, 0x34,</div><div class='add'>+0x02, 0x10, 0x08, 0x40, 0xF0, 0x09, 0xD1, 0x81, 0x24, 0x0E, 0xD0, 0x0C, 0x48,</div><div class='add'>+0x70, 0x00, 0x89, 0x03, 0x74, 0x00, 0xD0, 0x6C, 0x42, 0x02, 0x01, 0xC5, 0x30,</div><div class='add'>+0x20, 0x07, 0x00, 0xBC, 0x40, 0x30, 0x00, 0x00, 0x00, 0x04, 0x03, 0xD0, 0x0C,</div><div class='add'>+0x40, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0D, 0x80, 0x78, 0x00,</div><div class='add'>+0xED, 0x01, 0xB4, 0x07, 0xD0, 0x1E, 0x40, 0x7B, 0x00, 0x61, 0x11, 0xB4, 0x07,</div><div class='add'>+0x10, 0x16, 0x40, 0x78, 0x00, 0xE1, 0x01, 0xA4, 0x25, 0xD0, 0x1E, 0x40, 0x78,</div><div class='add'>+0x00, 0x61, 0x01, 0xB4, 0x05, 0x50, 0x1E, 0x40, 0x7A, 0x00, 0xED, 0x01, 0xB4,</div><div class='add'>+0x07, 0x90, 0x0F, 0x40, 0x78, 0x04, 0xE9, 0x01, 0x84, 0x0E, 0xD0, 0x1E, 0x40,</div><div class='add'>+0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x10, 0x30, 0x00, 0xCF,</div><div class='add'>+0x00, 0x3C, 0x01, 0xD0, 0x8C, 0xC0, 0x37, 0x00, 0x43, 0x00, 0x7C, 0x03, 0x10,</div><div class='add'>+0x8D, 0xD0, 0x34, 0x22, 0xC1, 0x90, 0x04, 0x2B, 0xD8, 0x0D, 0xD0, 0x30, 0x06,</div><div class='add'>+0xC9, 0x00, 0x3C, 0x01, 0xD0, 0x4D, 0xC0, 0x12, 0x00, 0xC3, 0x04, 0x2C, 0x53,</div><div class='add'>+0x30, 0x8C, 0x80, 0x30, 0x00, 0xC3, 0xE4, 0x0C, 0x83, 0xF0, 0x0C, 0xC0, 0x4B,</div><div class='add'>+0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xB8, 0x3D, 0x00, 0xFF, 0x00,</div><div class='add'>+0xFC, 0x01, 0xF0, 0x0F, 0xC0, 0x3F, 0x40, 0xFF, 0x00, 0xFC, 0x03, 0xF4, 0x8F,</div><div class='add'>+0xC0, 0x3F, 0x02, 0xFF, 0x00, 0x5D, 0xA1, 0xF8, 0x0F, 0xC0, 0xBF, 0x00, 0xFF,</div><div class='add'>+0x80, 0xFC, 0x03, 0xF0, 0x0F, 0xC1, 0x1B, 0x02, 0xFB, 0x00, 0xB0, 0x4B, 0xF0,</div><div class='add'>+0xCF, 0xC0, 0x3F, 0x00, 0xFF, 0x00, 0xFC, 0x02, 0xF0, 0x0F, 0xC0, 0x0B, 0x60,</div><div class='add'>+0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0xA0, 0x37, 0x80, 0xDF, 0x00, 0x7C,</div><div class='add'>+0x01, 0x70, 0x0D, 0xC4, 0x37, 0x00, 0xDF, 0x00, 0x7C, 0x05, 0x30, 0x0D, 0xC2,</div><div class='add'>+0xB5, 0x02, 0xCF, 0x00, 0x5D, 0x03, 0x38, 0x1D, 0xC0, 0x35, 0x01, 0xDF, 0x00,</div><div class='add'>+0x7C, 0x03, 0xF0, 0x6D, 0xC0, 0x10, 0x00, 0xC3, 0x00, 0x6C, 0x13, 0xF0, 0x09,</div><div class='add'>+0xC0, 0x37, 0xA0, 0xDF, 0x00, 0x4C, 0x03, 0xD0, 0x0C, 0xC0, 0x42, 0x00, 0x0E,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0x88, 0x39, 0x00, 0xED, 0x00, 0xB4, 0x03,</div><div class='add'>+0xD0, 0x0E, 0x00, 0x3B, 0x13, 0x6C, 0x00, 0xB4, 0x03, 0x10, 0x0E, 0x40, 0x3B,</div><div class='add'>+0x04, 0xED, 0x00, 0x94, 0x03, 0x41, 0x0E, 0x40, 0x38, 0x00, 0xED, 0x00, 0xB4,</div><div class='add'>+0x01, 0xD0, 0x8F, 0xC0, 0x3A, 0x00, 0xE5, 0x00, 0x84, 0x03, 0xD0, 0x0A, 0x42,</div><div class='add'>+0x3B, 0x80, 0xCD, 0x00, 0x84, 0x03, 0xD0, 0x0E, 0x40, 0x4C, 0x00, 0x06, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x79, 0x88, 0xE5, 0x21, 0xB4, 0x47, 0xD0,</div><div class='add'>+0x1E, 0x44, 0x7B, 0x12, 0xEC, 0x01, 0x34, 0x07, 0x90, 0x1E, 0x40, 0x7B, 0x01,</div><div class='add'>+0xED, 0x21, 0x14, 0x07, 0x01, 0x1E, 0x4C, 0x79, 0x02, 0xED, 0x01, 0xB4, 0x07,</div><div class='add'>+0xD8, 0x5F, 0x40, 0x78, 0x00, 0xF5, 0x11, 0xB4, 0x17, 0xD0, 0x3A, 0x40, 0x7B,</div><div class='add'>+0x00, 0xED, 0x21, 0x84, 0x47, 0xD0, 0x1E, 0x48, 0x12, 0x00, 0x04, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x12, 0x28, 0x33, 0x00, 0xCD, 0x00, 0x36, 0x0F, 0xD0, 0x0C,</div><div class='add'>+0x40, 0x33, 0x00, 0xCD, 0x01, 0x34, 0x03, 0x10, 0x9C, 0x40, 0x33, 0x00, 0x8D,</div><div class='add'>+0xA0, 0x15, 0x07, 0x10, 0x0C, 0x40, 0x30, 0x10, 0xDD, 0x03, 0x34, 0x07, 0xD0,</div><div class='add'>+0x0C, 0x40, 0xF2, 0x00, 0xC5, 0x01, 0x14, 0x03, 0xD0, 0x08, 0x40, 0x33, 0x80,</div><div class='add'>+0xDD, 0x0D, 0x04, 0x07, 0xD0, 0x0C, 0x40, 0x5A, 0x20, 0x0C, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x17, 0xA8, 0x15, 0x08, 0x5F, 0x00, 0xFC, 0x01, 0xF0, 0x05, 0xC0,</div><div class='add'>+0x17, 0x00, 0x7F, 0x0E, 0xF4, 0x01, 0xB0, 0xA7, 0xC2, 0x15, 0x08, 0x4F, 0x05,</div><div class='add'>+0xDC, 0x1D, 0x35, 0x05, 0xC4, 0x15, 0x00, 0x7F, 0x85, 0xFC, 0xED, 0xF0, 0x05,</div><div class='add'>+0xC0, 0x1C, 0x81, 0x77, 0x01, 0x7C, 0x01, 0xF1, 0x06, 0xC0, 0x17, 0x08, 0x7D,</div><div class='add'>+0x02, 0xCD, 0x05, 0xF0, 0x04, 0xC0, 0x5E, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x12, 0x00, 0x07, 0x00, 0x1F, 0x00, 0x7C, 0x40, 0xF0, 0x01, 0xC0, 0x07,</div><div class='add'>+0x00, 0x1F, 0x02, 0x78, 0x04, 0x74, 0x01, 0x00, 0x07, 0x00, 0x1E, 0x00, 0x7D,</div><div class='add'>+0x40, 0xF0, 0x01, 0xC0, 0x07, 0x00, 0x1F, 0x06, 0x7C, 0x00, 0xC0, 0x00, 0xC0,</div><div class='add'>+0x87, 0x81, 0x1F, 0x10, 0x64, 0x08, 0xF2, 0x21, 0xC1, 0x87, 0x20, 0x1F, 0x02,</div><div class='add'>+0x7D, 0x08, 0xF0, 0x01, 0xC0, 0x49, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x10, 0x08, 0x27, 0x00, 0x9F, 0x00, 0x3C, 0x02, 0x30, 0x09, 0xE0, 0x27, 0x00,</div><div class='add'>+0x83, 0x00, 0x4C, 0x02, 0xF0, 0x09, 0xC8, 0x26, 0x02, 0x9F, 0x04, 0x0C, 0x02,</div><div class='add'>+0x34, 0x09, 0xC0, 0x27, 0x01, 0x9C, 0x08, 0x0C, 0x02, 0x30, 0x59, 0xC0, 0xA0,</div><div class='add'>+0x20, 0x93, 0x00, 0x5C, 0x86, 0xF0, 0x19, 0xC0, 0xA4, 0x00, 0x9F, 0x00, 0x4C,</div><div class='add'>+0x06, 0xF0, 0x09, 0xD0, 0x40, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,</div><div class='add'>+0x20, 0x26, 0x00, 0x9D, 0x00, 0x74, 0x02, 0x14, 0x09, 0x40, 0x27, 0x00, 0x91,</div><div class='add'>+0x00, 0x45, 0x02, 0xD0, 0x09, 0xD0, 0xA4, 0x00, 0x9D, 0x02, 0x6C, 0x42, 0x50,</div><div class='add'>+0x09, 0x40, 0x27, 0x21, 0x9D, 0x02, 0x45, 0x02, 0x14, 0x29, 0x50, 0xE4, 0x40,</div><div class='add'>+0x81, 0x13, 0x44, 0x86, 0xD0, 0x89, 0x40, 0x64, 0x08, 0x9D, 0x02, 0x44, 0x1A,</div><div class='add'>+0xD0, 0x19, 0x40, 0x04, 0x80, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0xA0,</div><div class='add'>+0x24, 0x00, 0x9D, 0x00, 0x74, 0x02, 0x10, 0x09, 0x40, 0x23, 0x00, 0x91, 0x08,</div><div class='add'>+0x44, 0x02, 0xD9, 0x0C, 0x40, 0x24, 0x00, 0x9D, 0x00, 0x65, 0x22, 0x92, 0x09,</div><div class='add'>+0x44, 0x27, 0x00, 0xDD, 0x02, 0x56, 0x02, 0x50, 0x09, 0x48, 0x34, 0x04, 0x91,</div><div class='add'>+0xA4, 0x54, 0x2A, 0xD1, 0x29, 0x50, 0xA6, 0x00, 0x9D, 0x0A, 0x64, 0x22, 0xD0,</div><div class='add'>+0x89, 0x60, 0x60, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x20, 0x20,</div><div class='add'>+0x00, 0x8D, 0x00, 0x34, 0x12, 0x10, 0x08, 0x40, 0x23, 0x31, 0x81, 0x04, 0x04,</div><div class='add'>+0x12, 0xD8, 0x48, 0x4C, 0x20, 0x01, 0x8D, 0x01, 0x24, 0x12, 0x90, 0x08, 0x40,</div><div class='add'>+0x23, 0x21, 0x8D, 0x24, 0x16, 0x12, 0x50, 0x4C, 0x04, 0x20, 0x01, 0x90, 0x20,</div><div class='add'>+0x00, 0x12, 0xD0, 0x08, 0x40, 0x22, 0x00, 0x8D, 0x08, 0x24, 0x02, 0xD0, 0x08,</div><div class='add'>+0x40, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xB0, 0x06, 0x00,</div><div class='add'>+0x1F, 0x00, 0x74, 0x00, 0x30, 0x01, 0x40, 0x87, 0x0A, 0x53, 0x0A, 0x4C, 0x28,</div><div class='add'>+0xF0, 0xA1, 0xC2, 0x94, 0x02, 0x1F, 0x0A, 0x6C, 0x00, 0x30, 0xA0, 0xC0, 0x87,</div><div class='add'>+0x02, 0x1F, 0x0A, 0x5C, 0x28, 0x70, 0xA1, 0x80, 0x04, 0x10, 0x12, 0x00, 0x5C,</div><div class='add'>+0x00, 0xF0, 0x01, 0xC0, 0x06, 0x00, 0x1D, 0x36, 0x6D, 0x00, 0xF0, 0x01, 0xC0,</div><div class='add'>+0x74, 0xE0, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x19, 0xB8, 0x27, 0x00, 0x9F,</div><div class='add'>+0x00, 0xFC, 0x23, 0xF0, 0x09, 0xC0, 0x27, 0x42, 0xBF, 0x08, 0xFC, 0x22, 0xF0,</div><div class='add'>+0x8B, 0x40, 0x27, 0x02, 0xBF, 0x20, 0xFD, 0x22, 0x70, 0x09, 0xC0, 0x27, 0x02,</div><div class='add'>+0xBF, 0x08, 0xE8, 0x22, 0xB0, 0x89, 0xC0, 0x2F, 0x02, 0xBF, 0x00, 0x7C, 0x22,</div><div class='add'>+0xF3, 0x0B, 0xC0, 0x25, 0x00, 0xBF, 0x04, 0xDC, 0x02, 0xF0, 0x09, 0xC0, 0x77,</div><div class='add'>+0x60, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0xA0, 0x27, 0x00, 0x9F, 0x20,</div><div class='add'>+0xFC, 0x16, 0x30, 0x09, 0xC0, 0xE7, 0x20, 0xBF, 0x21, 0x6C, 0x13, 0xF0, 0xD9,</div><div class='add'>+0xC6, 0xEF, 0x08, 0xB3, 0x02, 0xCC, 0x16, 0xF0, 0x09, 0xC0, 0x6F, 0x04, 0xB3,</div><div class='add'>+0x07, 0x4C, 0x1E, 0xF0, 0x5B, 0xC0, 0x68, 0x00, 0xB3, 0x00, 0xFC, 0x12, 0x34,</div><div class='add'>+0x0B, 0xC2, 0x2F, 0x20, 0xBF, 0x00, 0xC4, 0x02, 0xB4, 0x0B, 0xC0, 0x77, 0x80,</div><div class='add'>+0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1C, 0x08, 0x07, 0x00, 0x1D, 0x00, 0x74,</div><div class='add'>+0x28, 0x10, 0x01, 0x4C, 0x47, 0x08, 0x1C, 0x17, 0x45, 0x51, 0xD0, 0xF5, 0x40,</div><div class='add'>+0xC7, 0x40, 0x11, 0x05, 0x54, 0x08, 0x70, 0x51, 0x41, 0x47, 0x40, 0x11, 0x03,</div><div class='add'>+0x45, 0x0D, 0xD0, 0x71, 0x51, 0x84, 0x40, 0x15, 0x00, 0x74, 0x00, 0x11, 0x01,</div><div class='add'>+0x40, 0x07, 0x00, 0x1D, 0x20, 0x44, 0x01, 0x10, 0x01, 0x40, 0x62, 0x00, 0x0C,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0xA0, 0x23, 0x00, 0x8D, 0x00, 0x34, 0x03,</div><div class='add'>+0x10, 0x08, 0x40, 0xA3, 0x01, 0x8D, 0x02, 0x04, 0xB2, 0xD0, 0x08, 0x40, 0xA3,</div><div class='add'>+0x01, 0x81, 0x00, 0x25, 0x0E, 0xC1, 0x08, 0x40, 0x21, 0x04, 0x81, 0x07, 0x24,</div><div class='add'>+0x32, 0x50, 0x88, 0x40, 0xA2, 0x20, 0x81, 0x40, 0x34, 0x22, 0x50, 0x08, 0x40,</div><div class='add'>+0x23, 0x00, 0x8D, 0x00, 0x46, 0x03, 0xD1, 0x08, 0x40, 0x4B, 0x80, 0x04, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x18, 0xA8, 0x25, 0x00, 0x9D, 0x00, 0x74, 0x22, 0x10,</div><div class='add'>+0x09, 0x40, 0x27, 0x00, 0x9D, 0x14, 0x44, 0x02, 0xD0, 0x09, 0x40, 0x37, 0x00,</div><div class='add'>+0x91, 0x00, 0x74, 0x02, 0x10, 0x09, 0x40, 0x27, 0x80, 0x91, 0x40, 0x64, 0x12,</div><div class='add'>+0xD8, 0x09, 0x60, 0x26, 0x01, 0x95, 0x02, 0x64, 0x02, 0x58, 0x0D, 0x40, 0x27,</div><div class='add'>+0x00, 0xDD, 0x04, 0x44, 0x02, 0x50, 0x09, 0x40, 0x62, 0x20, 0x06, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x05, 0x28, 0x25, 0x00, 0x9F, 0x00, 0x7C, 0x0A, 0x34, 0x09,</div><div class='add'>+0xC0, 0x27, 0x08, 0x9F, 0x42, 0x4C, 0x02, 0xF0, 0x29, 0xC0, 0x27, 0x20, 0x91,</div><div class='add'>+0x08, 0x6D, 0x0A, 0xF0, 0x09, 0xC0, 0x25, 0x20, 0x93, 0x00, 0x6C, 0x06, 0x70,</div><div class='add'>+0x09, 0x42, 0xA6, 0xA1, 0x93, 0x22, 0x74, 0x02, 0x78, 0x09, 0xC1, 0x27, 0x00,</div><div class='add'>+0x9F, 0x06, 0x4D, 0x02, 0xF4, 0x09, 0xC0, 0x17, 0x80, 0x04, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x16, 0x00, 0x25, 0x08, 0x9F, 0x00, 0x3C, 0x02, 0xF0, 0x09, 0xC0,</div><div class='add'>+0x27, 0x00, 0x9F, 0x80, 0x7C, 0x22, 0xF0, 0x99, 0xC0, 0x27, 0x00, 0x9F, 0x11,</div><div class='add'>+0x5C, 0x16, 0xF0, 0x09, 0xC0, 0x27, 0x00, 0x8F, 0x13, 0x5C, 0x06, 0xF0, 0x09,</div><div class='add'>+0xC0, 0x65, 0x80, 0x9F, 0x00, 0x7C, 0x02, 0xB0, 0x09, 0xC1, 0x27, 0x00, 0x9F,</div><div class='add'>+0x01, 0x7E, 0x22, 0xB4, 0x09, 0xC0, 0x5B, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x14, 0x08, 0x05, 0x00, 0x1F, 0x00, 0x7C, 0x08, 0xF8, 0x01, 0xC0, 0x07,</div><div class='add'>+0x80, 0x13, 0x06, 0x7C, 0x08, 0xF0, 0x01, 0xC0, 0x47, 0x80, 0x1F, 0x00, 0x4C,</div><div class='add'>+0x00, 0x70, 0x01, 0xC0, 0x47, 0x10, 0x1F, 0x00, 0x7C, 0x08, 0x34, 0x11, 0xC0,</div><div class='add'>+0x87, 0x04, 0x13, 0x26, 0x2C, 0x10, 0xF0, 0x01, 0xC0, 0x05, 0x00, 0x1F, 0x04,</div><div class='add'>+0x7C, 0x48, 0x30, 0x81, 0xC0, 0x53, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x14, 0x20, 0x14, 0x00, 0x5D, 0x00, 0x74, 0x01, 0xD0, 0x05, 0x40, 0x17, 0xC0,</div><div class='add'>+0x70, 0x00, 0x74, 0x01, 0xD0, 0x05, 0x00, 0x5F, 0x80, 0x6F, 0x46, 0xC5, 0x05,</div><div class='add'>+0x70, 0x05, 0x40, 0x1F, 0x00, 0x7D, 0x81, 0x74, 0x01, 0x30, 0x47, 0x40, 0x1B,</div><div class='add'>+0x00, 0x71, 0x03, 0xCC, 0x09, 0x60, 0x37, 0x40, 0x1C, 0xA0, 0x7D, 0x02, 0xB4,</div><div class='add'>+0x09, 0x10, 0x05, 0x40, 0x43, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14,</div><div class='add'>+0xA0, 0x32, 0x00, 0xCD, 0x00, 0x34, 0x02, 0xD0, 0x0C, 0x40, 0x31, 0x10, 0xD1,</div><div class='add'>+0x03, 0x34, 0x03, 0xD2, 0x0C, 0x48, 0x77, 0x0A, 0xCD, 0x03, 0x04, 0x07, 0xD3,</div><div class='add'>+0x0C, 0x44, 0x37, 0x00, 0xCD, 0x08, 0x36, 0x03, 0x10, 0x1D, 0x40, 0xB1, 0x60,</div><div class='add'>+0x01, 0x02, 0x04, 0x23, 0xD0, 0x3C, 0x40, 0x81, 0x04, 0xDD, 0x80, 0x34, 0x0B,</div><div class='add'>+0x04, 0x1C, 0x60, 0x43, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x80,</div><div class='add'>+0x38, 0x00, 0xED, 0x00, 0xB4, 0x03, 0xD0, 0x0E, 0x40, 0x7B, 0x00, 0xE1, 0x02,</div><div class='add'>+0xB6, 0x03, 0xD0, 0x0E, 0x40, 0x3B, 0x00, 0xE5, 0x80, 0x85, 0x08, 0x50, 0x0E,</div><div class='add'>+0x60, 0x9B, 0x00, 0x6D, 0x40, 0x36, 0x07, 0x18, 0x0E, 0x40, 0x3B, 0x40, 0x21,</div><div class='add'>+0x10, 0x86, 0x03, 0x50, 0x17, 0x49, 0x08, 0x00, 0xAD, 0x02, 0xB6, 0x03, 0x10,</div><div class='add'>+0x0E, 0x60, 0x13, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x10, 0x78,</div><div class='add'>+0x00, 0xEF, 0x01, 0xBC, 0x06, 0xD0, 0x1E, 0xC2, 0x71, 0x02, 0x61, 0x01, 0xBC,</div><div class='add'>+0x3F, 0xF0, 0xFE, 0xC0, 0x5B, 0x00, 0xED, 0x01, 0x8D, 0x05, 0x78, 0x3E, 0x41,</div><div class='add'>+0x7B, 0x00, 0xED, 0x01, 0xBC, 0x07, 0x30, 0x1E, 0xC2, 0x69, 0x00, 0x63, 0xA0,</div><div class='add'>+0x8C, 0x07, 0xD1, 0x12, 0xC0, 0x49, 0x00, 0xED, 0x81, 0xBC, 0x06, 0x38, 0x1E,</div><div class='add'>+0xC0, 0x53, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xB0, 0x35, 0x00,</div><div class='add'>+0xDF, 0x00, 0x7C, 0x03, 0xF0, 0x0D, 0xC0, 0xB7, 0x00, 0x5F, 0x00, 0x7C, 0x03,</div><div class='add'>+0xC0, 0x0D, 0x40, 0x17, 0x00, 0xCF, 0x00, 0x7C, 0x00, 0xF1, 0x2D, 0xC0, 0x37,</div><div class='add'>+0x20, 0x5F, 0x80, 0x7C, 0xB3, 0xC0, 0x0D, 0xC8, 0x27, 0x00, 0x4F, 0x00, 0x7C,</div><div class='add'>+0x03, 0xF0, 0x04, 0xC0, 0x17, 0x00, 0x9D, 0x00, 0x3C, 0x00, 0xF1, 0x0D, 0xC8,</div><div class='add'>+0x43, 0x60, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xA0, 0x7F, 0x00, 0xFF,</div><div class='add'>+0x01, 0xFC, 0x13, 0xF8, 0x8F, 0xC0, 0x7F, 0x04, 0xF7, 0x09, 0xCC, 0x87, 0xF0,</div><div class='add'>+0x1F, 0xC0, 0x7C, 0x00, 0xEB, 0x01, 0xEC, 0x07, 0xF9, 0x9F, 0xC0, 0x7F, 0x00,</div><div class='add'>+0xFF, 0x09, 0xCC, 0x0F, 0xB1, 0x1F, 0xC0, 0x3B, 0x00, 0x33, 0x01, 0xEE, 0x27,</div><div class='add'>+0x30, 0x17, 0xC0, 0x4F, 0x00, 0x7F, 0x81, 0xCC, 0x05, 0xC0, 0x9A, 0xC0, 0x1A,</div><div class='add'>+0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x88, 0x39, 0x00, 0xED, 0x08,</div><div class='add'>+0xB4, 0x23, 0xD0, 0x0E, 0x48, 0x3B, 0x01, 0xED, 0x00, 0x84, 0x03, 0xD1, 0x0E,</div><div class='add'>+0x4E, 0x38, 0x40, 0xE1, 0x00, 0x84, 0x00, 0x78, 0x0E, 0x40, 0x1B, 0x08, 0xFD,</div><div class='add'>+0x00, 0x84, 0x13, 0x10, 0x0E, 0x42, 0x3B, 0x03, 0xA1, 0x80, 0xBC, 0x03, 0x14,</div><div class='add'>+0x06, 0x40, 0x0B, 0x08, 0x2D, 0x98, 0x84, 0x20, 0x90, 0x0A, 0x40, 0x54, 0x20,</div><div class='add'>+0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x39, 0x00, 0xED, 0x00, 0xB4,</div><div class='add'>+0x0B, 0xD0, 0x8E, 0x40, 0x3B, 0x28, 0xED, 0x00, 0xA4, 0x03, 0xD0, 0x0E, 0x40,</div><div class='add'>+0x1A, 0x00, 0xE1, 0x00, 0x84, 0x41, 0xD0, 0x0E, 0x44, 0x1B, 0x00, 0xED, 0x90,</div><div class='add'>+0xA4, 0xC3, 0x18, 0x86, 0x40, 0xAB, 0x0A, 0x61, 0x08, 0xA4, 0x01, 0x54, 0x06,</div><div class='add'>+0x40, 0x0B, 0x00, 0x6D, 0x00, 0x84, 0x40, 0xD0, 0x0E, 0x40, 0x22, 0x01, 0x04,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x28, 0x33, 0x00, 0xCD, 0x00, 0x34, 0x03,</div><div class='add'>+0xD0, 0x0C, 0x00, 0x33, 0x10, 0x9D, 0x0B, 0x24, 0x2F, 0xD0, 0x1C, 0x5A, 0x02,</div><div class='add'>+0x00, 0xC1, 0x40, 0x05, 0x01, 0x50, 0x0C, 0x40, 0x07, 0x00, 0x8D, 0x02, 0x24,</div><div class='add'>+0x07, 0x1A, 0x08, 0x40, 0x63, 0xC0, 0x41, 0x00, 0x14, 0x01, 0x50, 0x24, 0x40,</div><div class='add'>+0x13, 0x20, 0x0D, 0x03, 0x05, 0x0C, 0x90, 0x0C, 0x40, 0x08, 0x20, 0x0C, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x15, 0xA8, 0x35, 0x00, 0xDF, 0x00, 0x3C, 0x42, 0xD0,</div><div class='add'>+0x0D, 0xC0, 0x3F, 0x00, 0x9F, 0x00, 0xEC, 0x03, 0xF0, 0x1F, 0xC0, 0x26, 0x00,</div><div class='add'>+0xC1, 0x00, 0x4C, 0x23, 0xF0, 0x0F, 0xC0, 0x27, 0x00, 0x9F, 0x01, 0xEC, 0x0F,</div><div class='add'>+0x14, 0x01, 0xE2, 0x77, 0x04, 0x13, 0x02, 0x64, 0x03, 0x50, 0xA5, 0x40, 0x07,</div><div class='add'>+0x00, 0xDF, 0x03, 0x4C, 0x0F, 0xD0, 0x0D, 0xC2, 0x56, 0x00, 0x06, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x01, 0x00, 0x37, 0x00, 0xDD, 0x00, 0x7C, 0x03, 0xF1, 0x0D,</div><div class='add'>+0x40, 0x37, 0x20, 0x9F, 0x10, 0x5C, 0x03, 0xF0, 0xCD, 0xC0, 0xA1, 0x10, 0x97,</div><div class='add'>+0x01, 0x7D, 0x00, 0x70, 0x0D, 0xC0, 0x87, 0x00, 0x1F, 0x04, 0x5C, 0x43, 0x72,</div><div class='add'>+0x21, 0xE0, 0xA7, 0x80, 0x1F, 0x28, 0x74, 0x03, 0xA0, 0x05, 0xC0, 0x07, 0x00,</div><div class='add'>+0x9D, 0x04, 0x7C, 0x0B, 0xB0, 0x0D, 0xC0, 0xB7, 0x20, 0x0C, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x80, 0x08, 0x3F, 0x00, 0xFF, 0x20, 0xFC, 0x02, 0xB0, 0x0F, 0xE0,</div><div class='add'>+0x3B, 0xA0, 0x1B, 0x00, 0xCE, 0x43, 0x30, 0x0C, 0xC0, 0x24, 0x00, 0xFB, 0x00,</div><div class='add'>+0xAC, 0x01, 0xB0, 0x0F, 0xC0, 0x2F, 0x00, 0xA3, 0x00, 0xCC, 0x03, 0xF0, 0x0A,</div><div class='add'>+0xC0, 0x28, 0x10, 0x73, 0x59, 0x8C, 0x03, 0x32, 0x47, 0xC0, 0x0C, 0x00, 0xED,</div><div class='add'>+0x02, 0xCC, 0x47, 0x30, 0x0F, 0xC0, 0x07, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x01, 0x20, 0x36, 0x00, 0xDD, 0x00, 0x74, 0x03, 0x90, 0x0D, 0x40, 0x37,</div><div class='add'>+0x98, 0x11, 0x01, 0x44, 0x03, 0x10, 0x0D, 0x42, 0x64, 0x08, 0xD1, 0x01, 0x6C,</div><div class='add'>+0x04, 0xB0, 0x0D, 0xC2, 0xE7, 0x04, 0x11, 0x01, 0x44, 0x03, 0xD0, 0x39, 0x44,</div><div class='add'>+0x64, 0x01, 0x41, 0x01, 0x6C, 0x07, 0x10, 0x24, 0x40, 0x84, 0x02, 0x1D, 0x00,</div><div class='add'>+0x05, 0x01, 0x10, 0x0D, 0x4E, 0x07, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x01, 0xA0, 0x36, 0x00, 0xDD, 0x00, 0x74, 0x03, 0x90, 0x0D, 0x48, 0x37, 0x20,</div><div class='add'>+0x11, 0x01, 0x04, 0x03, 0x10, 0x0D, 0x60, 0x44, 0x00, 0xD1, 0x11, 0x64, 0x07,</div><div class='add'>+0x92, 0x0D, 0x42, 0x67, 0x80, 0x11, 0x01, 0x64, 0x83, 0x50, 0x11, 0x41, 0x56,</div><div class='add'>+0x00, 0x19, 0x00, 0x46, 0x07, 0x10, 0x05, 0x40, 0x04, 0x04, 0x5D, 0x00, 0x44,</div><div class='add'>+0x1B, 0x14, 0x09, 0x40, 0x07, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10,</div><div class='add'>+0x08, 0x30, 0x00, 0xCD, 0x00, 0x34, 0x03, 0x90, 0x0C, 0x40, 0x33, 0x00, 0x81,</div><div class='add'>+0x01, 0x04, 0x03, 0x14, 0x0C, 0x60, 0x20, 0x20, 0xC1, 0x00, 0x24, 0x00, 0x92,</div><div class='add'>+0x0C, 0x60, 0x01, 0x90, 0x01, 0x01, 0x24, 0x03, 0xD0, 0x00, 0x42, 0x22, 0x00,</div><div class='add'>+0xCD, 0x00, 0x24, 0x03, 0x14, 0x04, 0x40, 0x20, 0x00, 0xCD, 0x00, 0x04, 0x02,</div><div class='add'>+0x10, 0x08, 0x40, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10,</div><div class='add'>+0x36, 0x00, 0xDF, 0x00, 0x7C, 0x03, 0xB0, 0x0D, 0x40, 0x3F, 0x00, 0x11, 0x20,</div><div class='add'>+0xC4, 0x03, 0x30, 0x0F, 0xC0, 0x04, 0x20, 0xDB, 0x00, 0x6D, 0x01, 0xB1, 0x0F,</div><div class='add'>+0x40, 0x27, 0x18, 0x93, 0x00, 0xAC, 0x03, 0x70, 0x01, 0xC0, 0x26, 0x00, 0x5B,</div><div class='add'>+0x00, 0x4C, 0x01, 0x30, 0x05, 0xE0, 0x04, 0x00, 0x0F, 0x00, 0x4C, 0x03, 0x30,</div><div class='add'>+0x0D, 0xC2, 0x07, 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0xA8, 0x3F,</div><div class='add'>+0x00, 0xFF, 0x00, 0xFC, 0x03, 0x78, 0x0F, 0xC0, 0x3F, 0x10, 0xB7, 0x00, 0xFC,</div><div class='add'>+0x03, 0xF0, 0x0F, 0xC0, 0x2F, 0x10, 0x7F, 0x00, 0xFC, 0x00, 0x70, 0x0F, 0xC0,</div><div class='add'>+0x2F, 0x00, 0xBF, 0x00, 0xDC, 0x03, 0xF0, 0x0B, 0xC0, 0x2D, 0x00, 0x73, 0x00,</div><div class='add'>+0xBC, 0x00, 0xF0, 0x07, 0x00, 0x0F, 0x08, 0x3F, 0x00, 0xFC, 0x00, 0xF0, 0x0F,</div><div class='add'>+0xC0, 0x17, 0x61, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xA0, 0x7B, 0x00,</div><div class='add'>+0x33, 0x00, 0xCC, 0x03, 0x30, 0x0B, 0xC0, 0x2F, 0x00, 0xA3, 0x00, 0x8C, 0x06,</div><div class='add'>+0xB0, 0x03, 0xC0, 0x68, 0x02, 0x3F, 0x01, 0x8C, 0x04, 0x70, 0x1B, 0xC0, 0x3F,</div><div class='add'>+0x00, 0x33, 0x0C, 0xCC, 0x04, 0xB0, 0x2B, 0x10, 0x4C, 0x00, 0xF3, 0x01, 0xCC,</div><div class='add'>+0x02, 0x30, 0x0B, 0xD0, 0x4C, 0x00, 0xB3, 0x00, 0xCC, 0x07, 0xF0, 0x0F, 0xC0,</div><div class='add'>+0x0C, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x37, 0x14, 0x11,</div><div class='add'>+0x00, 0xC4, 0x03, 0x11, 0x49, 0x40, 0x6F, 0x00, 0x91, 0x0B, 0x44, 0x84, 0x50,</div><div class='add'>+0x01, 0x40, 0x24, 0x21, 0x1D, 0x21, 0x44, 0x84, 0x10, 0x19, 0x40, 0x3F, 0x04,</div><div class='add'>+0x11, 0x02, 0x44, 0x04, 0x10, 0x2F, 0x42, 0x24, 0x10, 0xD1, 0x20, 0x44, 0x02,</div><div class='add'>+0x10, 0x0C, 0x41, 0x44, 0x00, 0x8B, 0x00, 0x54, 0x07, 0xD0, 0x1D, 0x40, 0x0C,</div><div class='add'>+0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0xA0, 0x37, 0x21, 0x00, 0x00,</div><div class='add'>+0x04, 0x03, 0x10, 0x08, 0x41, 0x23, 0x00, 0xC1, 0x00, 0x44, 0x02, 0x10, 0x00,</div><div class='add'>+0x40, 0x20, 0x10, 0x1D, 0x00, 0x05, 0x00, 0x52, 0x08, 0x42, 0x33, 0x82, 0x81,</div><div class='add'>+0x02, 0x04, 0x00, 0x12, 0x68, 0x60, 0x00, 0x00, 0xD1, 0x40, 0x04, 0x06, 0x50,</div><div class='add'>+0x58, 0x40, 0x00, 0x00, 0xC1, 0x00, 0x24, 0x03, 0xD0, 0x0C, 0x40, 0x4E, 0x80,</div><div class='add'>+0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xA8, 0x35, 0x08, 0x51, 0x01, 0x44,</div><div class='add'>+0x03, 0x10, 0x09, 0x40, 0x67, 0x40, 0xD1, 0x00, 0x45, 0x00, 0x50, 0x11, 0x50,</div><div class='add'>+0x34, 0x00, 0x1D, 0x01, 0x44, 0x44, 0x11, 0x19, 0x41, 0x37, 0x00, 0x91, 0x00,</div><div class='add'>+0x40, 0x04, 0x18, 0x0C, 0x60, 0x40, 0x40, 0xD1, 0x04, 0x44, 0x06, 0x50, 0x41,</div><div class='add'>+0x40, 0x44, 0x20, 0xD9, 0x00, 0x74, 0x03, 0xD0, 0x0D, 0x40, 0x0E, 0x20, 0x06,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA0, 0x73, 0x00, 0x13, 0x13, 0x4D, 0x03,</div><div class='add'>+0x34, 0x01, 0xC0, 0x67, 0x00, 0x93, 0x00, 0x4C, 0x03, 0x30, 0x39, 0xC8, 0x24,</div><div class='add'>+0x10, 0x0F, 0x03, 0x4C, 0x0C, 0x70, 0x19, 0xC8, 0x37, 0x40, 0x13, 0x04, 0x4C,</div><div class='add'>+0x18, 0x34, 0x09, 0xC0, 0xE4, 0x00, 0xC3, 0x00, 0x4D, 0x06, 0x70, 0x1D, 0xC0,</div><div class='add'>+0xC4, 0x00, 0x93, 0x01, 0x6C, 0x03, 0xF0, 0x4D, 0xD0, 0x02, 0x20, 0x0E, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x07, 0x88, 0xFD, 0x40, 0x2F, 0x00, 0xBC, 0x03, 0xF1,</div><div class='add'>+0x93, 0xC0, 0x37, 0x00, 0xAF, 0x02, 0xFC, 0x02, 0x70, 0x0D, 0xC0, 0x2F, 0x00,</div><div class='add'>+0x3F, 0x10, 0xFC, 0x80, 0xF0, 0x03, 0xC8, 0x3F, 0x20, 0x3F, 0x23, 0xFC, 0x00,</div><div class='add'>+0x70, 0x9D, 0xC0, 0x2F, 0x00, 0xFF, 0x00, 0xFC, 0x00, 0xB4, 0x1F, 0xC0, 0x0F,</div><div class='add'>+0x00, 0xAF, 0x09, 0xDC, 0x03, 0xF0, 0x01, 0xC0, 0x1D, 0x00, 0x06, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x02, 0x08, 0x25, 0x00, 0x53, 0x00, 0x6D, 0x03, 0x32, 0x09,</div><div class='add'>+0xD0, 0x24, 0x00, 0xD3, 0x80, 0x4C, 0x03, 0x34, 0x6D, 0xC0, 0x24, 0x00, 0x13,</div><div class='add'>+0x42, 0x7C, 0x10, 0x30, 0x29, 0xD1, 0x30, 0x00, 0x83, 0x00, 0x4C, 0x18, 0x30,</div><div class='add'>+0x09, 0xC0, 0x84, 0x00, 0xD3, 0x00, 0x3C, 0x02, 0xB0, 0x11, 0xC0, 0x04, 0x00,</div><div class='add'>+0xDB, 0x00, 0x4D, 0x03, 0xF0, 0x0C, 0xC0, 0xA8, 0x20, 0x04, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x13, 0xA0, 0x24, 0x00, 0xD1, 0x00, 0xC4, 0x43, 0x10, 0x09, 0x40,</div><div class='add'>+0x10, 0x00, 0xD1, 0x00, 0x04, 0x46, 0x10, 0x2D, 0x50, 0x34, 0x00, 0x13, 0x82,</div><div class='add'>+0x34, 0x08, 0x10, 0x79, 0x40, 0x7C, 0x04, 0xB5, 0x20, 0x2C, 0x0C, 0xB2, 0xAD,</div><div class='add'>+0x40, 0xC4, 0x06, 0xD1, 0x01, 0x74, 0x2A, 0x10, 0x08, 0x40, 0x40, 0x00, 0xDB,</div><div class='add'>+0x00, 0x44, 0x03, 0xD0, 0x01, 0x40, 0x4C, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x03, 0x20, 0x30, 0x40, 0x81, 0x21, 0x04, 0x03, 0x14, 0x08, 0x08, 0x20,</div><div class='add'>+0x89, 0x81, 0x00, 0x06, 0x06, 0x10, 0x01, 0x40, 0x20, 0x00, 0x08, 0x03, 0x34,</div><div class='add'>+0x0C, 0x18, 0x08, 0x40, 0x70, 0x00, 0x09, 0x00, 0x14, 0x2C, 0x94, 0x8C, 0x40,</div><div class='add'>+0x02, 0x00, 0xC1, 0x41, 0x34, 0x02, 0x90, 0x0C, 0x40, 0x52, 0x40, 0xC9, 0x00,</div><div class='add'>+0x05, 0x03, 0xD0, 0x0C, 0x40, 0x1C, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x04, 0x00, 0x7C, 0x40, 0xF1, 0x19, 0x04, 0x07, 0x10, 0x18, 0x40, 0x68, 0x00,</div><div class='add'>+0xB1, 0x81, 0xC6, 0x04, 0x10, 0x96, 0x40, 0x6C, 0x40, 0x21, 0x21, 0xB4, 0x44,</div><div class='add'>+0x18, 0x16, 0x62, 0x78, 0x10, 0x0D, 0x01, 0xB4, 0x04, 0x94, 0x1E, 0x40, 0x6A,</div><div class='add'>+0x00, 0xE1, 0x50, 0x36, 0x06, 0x10, 0x3E, 0x50, 0x4E, 0x04, 0xE9, 0x01, 0x86,</div><div class='add'>+0x07, 0xD0, 0x16, 0x60, 0x3C, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12,</div><div class='add'>+0x18, 0x30, 0x00, 0x83, 0x08, 0x0D, 0x03, 0x10, 0x08, 0xC0, 0x20, 0x40, 0xC3,</div><div class='add'>+0x00, 0x0D, 0x22, 0x30, 0x04, 0x48, 0x20, 0xB2, 0x09, 0x52, 0x3C, 0x20, 0x34,</div><div class='add'>+0x88, 0xC0, 0x30, 0x00, 0x0B, 0x00, 0x1C, 0x00, 0x90, 0x0C, 0xC0, 0x86, 0x00,</div><div class='add'>+0xC3, 0x00, 0x3C, 0x02, 0xB0, 0x00, 0xC0, 0x92, 0x10, 0xCB, 0x04, 0x0C, 0x03,</div><div class='add'>+0xF0, 0x0C, 0xD0, 0x48, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x38,</div><div class='add'>+0x3D, 0x00, 0xEF, 0x68, 0xFE, 0x0B, 0xF0, 0x0F, 0xC0, 0xBF, 0x00, 0xFF, 0x00,</div><div class='add'>+0xFC, 0x00, 0xF0, 0x07, 0xC0, 0x3F, 0x20, 0xBF, 0x00, 0xFC, 0x20, 0xF0, 0x8E,</div><div class='add'>+0xC0, 0x3B, 0x00, 0xB7, 0x80, 0xAD, 0x22, 0xF0, 0x8F, 0xC0, 0x2D, 0x40, 0xFF,</div><div class='add'>+0x04, 0xFC, 0x02, 0xE0, 0x0B, 0xE0, 0x09, 0x40, 0xFF, 0x00, 0xFC, 0x03, 0xF0,</div><div class='add'>+0x07, 0xC0, 0x0B, 0x60, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xA0, 0x37,</div><div class='add'>+0x00, 0xD7, 0x60, 0x4C, 0x0B, 0x34, 0x01, 0xC0, 0x6F, 0x00, 0x97, 0x00, 0x7C,</div><div class='add'>+0x03, 0xF0, 0x09, 0xD0, 0x24, 0x00, 0x9F, 0x01, 0x4C, 0x00, 0xF0, 0x01, 0xC0,</div><div class='add'>+0x37, 0x81, 0x12, 0x08, 0x0C, 0x00, 0x31, 0x4D, 0xC0, 0x24, 0x00, 0xD3, 0x00,</div><div class='add'>+0x4C, 0x02, 0xB0, 0x1D, 0xD0, 0x54, 0x00, 0xD3, 0xA0, 0x4C, 0x83, 0xF0, 0x0D,</div><div class='add'>+0xC0, 0x57, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x80, 0x3D, 0x00,</div><div class='add'>+0xE1, 0x00, 0x06, 0x13, 0x10, 0x02, 0x40, 0x3B, 0x00, 0xE1, 0x00, 0xB4, 0x02,</div><div class='add'>+0xD0, 0x0E, 0x42, 0x28, 0x20, 0xA8, 0x00, 0x84, 0x00, 0xD0, 0x0E, 0x40, 0x3F,</div><div class='add'>+0x05, 0x31, 0x00, 0x84, 0x00, 0xD4, 0x0F, 0x51, 0x2C, 0x00, 0xE1, 0x00, 0x04,</div><div class='add'>+0x02, 0x14, 0x0C, 0x40, 0x08, 0x40, 0xF1, 0x00, 0x94, 0x03, 0xD0, 0x0A, 0x44,</div><div class='add'>+0x4F, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x79, 0x00, 0xC5,</div><div class='add'>+0x01, 0x84, 0x27, 0x00, 0x1E, 0x40, 0x63, 0x00, 0xED, 0x01, 0xB4, 0x47, 0xD0,</div><div class='add'>+0x3C, 0x40, 0x68, 0x08, 0xAC, 0x11, 0x84, 0x05, 0xD0, 0x1A, 0x40, 0x7B, 0x43,</div><div class='add'>+0x29, 0x05, 0xA5, 0x04, 0x98, 0x1E, 0x40, 0x68, 0x80, 0xE1, 0x01, 0x84, 0x07,</div><div class='add'>+0x10, 0x12, 0x60, 0x5C, 0x00, 0xE1, 0x01, 0x84, 0x07, 0xD0, 0x1E, 0x40, 0x07,</div><div class='add'>+0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16, 0x28, 0x33, 0x10, 0xD1, 0x00,</div><div class='add'>+0x04, 0x03, 0x10, 0x0C, 0x40, 0x53, 0x22, 0xC9, 0x00, 0x34, 0x0A, 0xD0, 0x15,</div><div class='add'>+0x40, 0x30, 0x00, 0xC9, 0x82, 0x04, 0x6B, 0xD0, 0x2C, 0x40, 0x33, 0x00, 0xD9,</div><div class='add'>+0x01, 0x24, 0x03, 0xD0, 0x0C, 0x50, 0xF0, 0x81, 0x91, 0x01, 0x04, 0x07, 0x10,</div><div class='add'>+0x08, 0x60, 0x20, 0x00, 0xC1, 0x00, 0x14, 0x03, 0xD0, 0x98, 0x40, 0x4B, 0x20,</div><div class='add'>+0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x17, 0x20, 0x15, 0x00, 0x77, 0x8A, 0x4D,</div><div class='add'>+0x81, 0x30, 0x76, 0xC0, 0x9F, 0x00, 0x5F, 0x01, 0xFC, 0x0D, 0xF1, 0xB7, 0xC0,</div><div class='add'>+0x14, 0x20, 0x7F, 0x4B, 0xCC, 0x0D, 0xF0, 0x26, 0xC0, 0x17, 0x10, 0x7B, 0x01,</div><div class='add'>+0xAC, 0x05, 0x34, 0x05, 0xC2, 0x9C, 0x04, 0x53, 0x01, 0xCC, 0x09, 0x30, 0x07,</div><div class='add'>+0xC1, 0x1C, 0x00, 0x53, 0x00, 0x4D, 0x01, 0xF2, 0x27, 0xC2, 0x5F, 0x20, 0x06,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x08, 0x05, 0x10, 0x1F, 0x00, 0x3C, 0x00,</div><div class='add'>+0xF0, 0x01, 0xC1, 0x07, 0x00, 0x17, 0x08, 0x7C, 0x10, 0xF0, 0x21, 0xC0, 0x07,</div><div class='add'>+0x00, 0x1B, 0x02, 0x7D, 0x08, 0xF0, 0x41, 0xC0, 0x87, 0x00, 0x17, 0x08, 0x5C,</div><div class='add'>+0x28, 0x70, 0x20, 0xD0, 0x07, 0x40, 0x1F, 0x08, 0x7D, 0x60, 0x70, 0x11, 0xC0,</div><div class='add'>+0x47, 0x00, 0x1F, 0x00, 0x7C, 0x00, 0xF0, 0x00, 0xC1, 0x4B, 0x00, 0x0C, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x10, 0x08, 0x25, 0x00, 0x93, 0x00, 0x4C, 0x26, 0x30,</div><div class='add'>+0x09, 0xC0, 0x24, 0x04, 0x9F, 0x00, 0x7C, 0x16, 0xF0, 0x09, 0xC0, 0x24, 0x00,</div><div class='add'>+0x9F, 0x04, 0x7C, 0x82, 0xB0, 0x09, 0xC4, 0x26, 0x40, 0x93, 0x04, 0x4C, 0x12,</div><div class='add'>+0x34, 0x19, 0xC0, 0x24, 0x01, 0x93, 0x08, 0x0C, 0x02, 0x30, 0x09, 0xC0, 0x27,</div><div class='add'>+0x00, 0x9F, 0x01, 0x4C, 0x02, 0xF0, 0x09, 0xC0, 0x40, 0x20, 0x0C, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x01, 0x20, 0x22, 0x00, 0x91, 0x00, 0x44, 0x02, 0x11, 0x09,</div><div class='add'>+0x40, 0x24, 0x00, 0x9D, 0x00, 0x74, 0x02, 0xD0, 0xA9, 0x41, 0x24, 0x00, 0x9D,</div><div class='add'>+0x00, 0x34, 0x0A, 0x10, 0x69, 0x40, 0x24, 0x00, 0x91, 0x01, 0x44, 0x16, 0x10,</div><div class='add'>+0x19, 0xD0, 0x22, 0x00, 0x91, 0x02, 0x45, 0x02, 0x10, 0x09, 0x40, 0x27, 0x20,</div><div class='add'>+0x9D, 0x09, 0x6C, 0x02, 0xD0, 0x09, 0x50, 0x04, 0x00, 0x08, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x18, 0xA0, 0x24, 0x40, 0x91, 0x20, 0x44, 0x02, 0x11, 0x09, 0x40,</div><div class='add'>+0x25, 0x00, 0x9D, 0x00, 0x74, 0x02, 0xD0, 0x0D, 0x50, 0x25, 0x00, 0x9D, 0x00,</div><div class='add'>+0x74, 0x06, 0x90, 0x09, 0x40, 0x22, 0x02, 0x91, 0x00, 0x64, 0x02, 0x14, 0x49,</div><div class='add'>+0x48, 0x24, 0x00, 0x91, 0x02, 0x64, 0x22, 0x18, 0x19, 0x40, 0x27, 0x00, 0x8D,</div><div class='add'>+0x00, 0x65, 0x02, 0xD0, 0x09, 0x40, 0x60, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x10, 0x20, 0x24, 0x00, 0x81, 0x04, 0x24, 0x12, 0x10, 0x49, 0x40, 0x61,</div><div class='add'>+0x91, 0x8D, 0x04, 0x34, 0x02, 0xC0, 0x48, 0x40, 0x21, 0x00, 0x8D, 0x20, 0x74,</div><div class='add'>+0x02, 0x00, 0x08, 0x42, 0x20, 0x89, 0x81, 0x44, 0x26, 0x02, 0x18, 0x48, 0x40,</div><div class='add'>+0x26, 0x40, 0x81, 0x00, 0x24, 0x12, 0x14, 0x58, 0x40, 0x23, 0x00, 0x8D, 0x04,</div><div class='add'>+0x24, 0x02, 0xD0, 0x48, 0x40, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x1D, 0xB8, 0x86, 0x02, 0x13, 0x0A, 0x4C, 0x28, 0x34, 0xA1, 0xD0, 0x05, 0x00,</div><div class='add'>+0x1F, 0x00, 0x7C, 0x00, 0xF0, 0xA1, 0xC0, 0x85, 0x02, 0x5F, 0x00, 0x74, 0x01,</div><div class='add'>+0xB1, 0x01, 0xC8, 0x96, 0x42, 0x13, 0x0A, 0x6D, 0x00, 0x30, 0xA5, 0x40, 0x84,</div><div class='add'>+0x0A, 0x03, 0x4A, 0x6C, 0x28, 0x30, 0xA1, 0xC0, 0x07, 0x00, 0x1F, 0x0A, 0x6D,</div><div class='add'>+0x00, 0xF0, 0x01, 0xC0, 0x74, 0xC0, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1D,</div><div class='add'>+0xB8, 0x2F, 0x10, 0xBF, 0x08, 0x5D, 0x22, 0xF0, 0x8B, 0xC0, 0x3E, 0x02, 0xBF,</div><div class='add'>+0x08, 0xF4, 0x02, 0xF0, 0x8B, 0xC0, 0x2E, 0x00, 0xAF, 0x00, 0xFC, 0x02, 0xF2,</div><div class='add'>+0x0B, 0x00, 0x27, 0x02, 0xBF, 0x88, 0xDC, 0x82, 0xF2, 0x8B, 0xC0, 0x3F, 0x00,</div><div class='add'>+0xBF, 0x00, 0xDC, 0x22, 0xD0, 0x8B, 0xC0, 0x2B, 0x00, 0xBF, 0x08, 0x7C, 0x02,</div><div class='add'>+0xF0, 0x8B, 0xC0, 0x67, 0x60, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xA8,</div><div class='add'>+0x3B, 0x00, 0xF2, 0x14, 0xCC, 0x32, 0x34, 0x0B, 0xC0, 0x2C, 0x00, 0x93, 0x00,</div><div class='add'>+0xCC, 0x02, 0xF0, 0x4B, 0xC1, 0x24, 0x00, 0xB3, 0x00, 0xFC, 0x02, 0x30, 0x0B,</div><div class='add'>+0xC0, 0xED, 0x00, 0xB3, 0x03, 0xCC, 0x02, 0x30, 0x3B, 0xC0, 0x2C, 0x00, 0xBF,</div><div class='add'>+0x88, 0xFC, 0x12, 0x30, 0x4A, 0xC1, 0x2C, 0x00, 0xB3, 0x00, 0x4D, 0x02, 0xF0,</div><div class='add'>+0x09, 0xC0, 0x64, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x05,</div><div class='add'>+0x05, 0x01, 0x04, 0x04, 0x30, 0x11, 0x21, 0x43, 0x04, 0x08, 0x11, 0x08, 0x44,</div><div class='add'>+0x00, 0xD0, 0x41, 0x50, 0x04, 0x00, 0x11, 0x00, 0x74, 0x00, 0x10, 0x01, 0x40,</div><div class='add'>+0xC4, 0x08, 0x41, 0x43, 0x44, 0x01, 0x10, 0x30, 0x40, 0x00, 0x04, 0x1D, 0x00,</div><div class='add'>+0x5C, 0x51, 0x10, 0x41, 0x42, 0x04, 0x08, 0x0B, 0x12, 0x54, 0x00, 0xD0, 0x81,</div><div class='add'>+0x40, 0x70, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x20, 0x25, 0x01,</div><div class='add'>+0x81, 0x94, 0x05, 0x92, 0x90, 0xCC, 0x40, 0x20, 0x02, 0x91, 0x20, 0x04, 0x02,</div><div class='add'>+0xD0, 0x48, 0x41, 0x20, 0x00, 0x81, 0x01, 0x74, 0x02, 0x10, 0x0D, 0x40, 0xA1,</div><div class='add'>+0x09, 0x81, 0x06, 0x04, 0x82, 0x10, 0x68, 0x48, 0x20, 0x00, 0x8D, 0x00, 0x34,</div><div class='add'>+0x32, 0x10, 0x48, 0x51, 0x20, 0x00, 0x89, 0x0C, 0x04, 0x02, 0xD0, 0x08, 0x40,</div><div class='add'>+0x48, 0x80, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x28, 0x25, 0x4A, 0x91,</div><div class='add'>+0x10, 0x44, 0x02, 0x90, 0x39, 0x40, 0x24, 0x40, 0x91, 0x00, 0x44, 0x02, 0xD0,</div><div class='add'>+0x09, 0x40, 0x24, 0x00, 0x91, 0x40, 0x74, 0x12, 0x10, 0x09, 0x40, 0x24, 0x00,</div><div class='add'>+0x91, 0x00, 0x45, 0x12, 0x10, 0x09, 0x40, 0x24, 0x00, 0x9D, 0x00, 0x14, 0x02,</div><div class='add'>+0x10, 0x69, 0x40, 0x24, 0x20, 0x89, 0x00, 0x54, 0x02, 0xD0, 0x09, 0x40, 0x60,</div><div class='add'>+0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x08, 0x21, 0x00, 0x93, 0x00,</div><div class='add'>+0x4C, 0x02, 0xB0, 0x29, 0xD0, 0xA4, 0x02, 0x83, 0x00, 0x4D, 0x02, 0xF0, 0x09,</div><div class='add'>+0xC9, 0x24, 0x40, 0x93, 0x03, 0x7C, 0x4E, 0x34, 0x48, 0xC0, 0x25, 0x40, 0x93,</div><div class='add'>+0x0B, 0x4C, 0x06, 0x24, 0x09, 0xD0, 0x64, 0x02, 0x9F, 0x00, 0x7C, 0x0E, 0x34,</div><div class='add'>+0x09, 0xC0, 0xA4, 0x24, 0x9B, 0x01, 0x4D, 0x02, 0xF0, 0x09, 0xD0, 0x14, 0x20,</div><div class='add'>+0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16, 0x00, 0x65, 0x10, 0x9F, 0x04, 0x3C,</div><div class='add'>+0x42, 0x70, 0x09, 0xC0, 0x67, 0x00, 0x9F, 0x02, 0x7C, 0x02, 0xF1, 0x48, 0xC0,</div><div class='add'>+0xE7, 0x00, 0x9F, 0x02, 0x7C, 0x06, 0xF1, 0x09, 0xC8, 0x23, 0x40, 0x9F, 0x01,</div><div class='add'>+0x7C, 0x06, 0xF0, 0x08, 0xC0, 0x67, 0x00, 0x9F, 0x05, 0x7C, 0x12, 0xF0, 0x19,</div><div class='add'>+0xC1, 0x27, 0x00, 0x9F, 0x04, 0x7D, 0x02, 0xF0, 0x08, 0xC0, 0x5B, 0x00, 0x04,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x08, 0x05, 0x00, 0x13, 0x80, 0x4C, 0x00,</div><div class='add'>+0x30, 0x00, 0xC0, 0x83, 0x40, 0x13, 0x00, 0x7C, 0x00, 0xF0, 0x01, 0xC0, 0x04,</div><div class='add'>+0x00, 0x1F, 0x10, 0x7E, 0x08, 0xF2, 0x01, 0xD1, 0x06, 0x01, 0x03, 0x82, 0x4C,</div><div class='add'>+0x40, 0x31, 0x01, 0xC1, 0xC6, 0x00, 0x13, 0x00, 0x4C, 0x04, 0x30, 0x20, 0xC0,</div><div class='add'>+0x84, 0x00, 0x1F, 0x00, 0x4D, 0x00, 0xF0, 0x01, 0xC0, 0x50, 0x20, 0x04, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x10, 0x20, 0x14, 0x04, 0x51, 0x01, 0xC5, 0x09, 0x10,</div><div class='add'>+0x05, 0xC0, 0x5D, 0x00, 0x51, 0x00, 0x74, 0x01, 0xD0, 0x17, 0x60, 0x14, 0x00,</div><div class='add'>+0x7D, 0x03, 0xB4, 0x01, 0xD0, 0x27, 0x44, 0x5C, 0x00, 0x5B, 0x11, 0xAC, 0x15,</div><div class='add'>+0xB1, 0x57, 0xC0, 0x1E, 0x40, 0x70, 0x00, 0xC4, 0x11, 0x14, 0x37, 0x40, 0x10,</div><div class='add'>+0x00, 0x5D, 0x11, 0x44, 0x01, 0xD0, 0x05, 0x50, 0x50, 0x80, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x10, 0xA0, 0x32, 0x40, 0xD1, 0x00, 0x24, 0x07, 0x11, 0x0C,</div><div class='add'>+0x40, 0x31, 0x04, 0xC1, 0x00, 0x34, 0x07, 0xD0, 0x1C, 0x48, 0x34, 0x00, 0xCD,</div><div class='add'>+0x02, 0x34, 0x02, 0xD8, 0x2C, 0x60, 0x32, 0x90, 0xC9, 0x21, 0x04, 0x87, 0x58,</div><div class='add'>+0x0C, 0x42, 0x30, 0x00, 0xC0, 0x04, 0x04, 0x03, 0x10, 0x3C, 0x40, 0x20, 0x00,</div><div class='add'>+0xCD, 0x00, 0x04, 0x83, 0xD0, 0x0C, 0x40, 0x50, 0x00, 0x0A, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x04, 0x80, 0x3C, 0x20, 0xA1, 0x10, 0xA5, 0x1A, 0x10, 0x0E, 0x40,</div><div class='add'>+0x31, 0x04, 0xE1, 0x00, 0xB4, 0x0A, 0xD0, 0x04, 0x41, 0x38, 0x01, 0x6D, 0x02,</div><div class='add'>+0xB6, 0x40, 0xD8, 0x03, 0x40, 0xAA, 0x82, 0xE9, 0x00, 0xA4, 0x00, 0xD0, 0x0E,</div><div class='add'>+0x40, 0x7A, 0x00, 0xE1, 0x01, 0x84, 0x03, 0x10, 0x0F, 0x41, 0x28, 0x00, 0xED,</div><div class='add'>+0x00, 0x85, 0x03, 0xD0, 0x0E, 0x40, 0x14, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x14, 0x18, 0x78, 0x00, 0xE3, 0x01, 0xAC, 0x16, 0x34, 0x1E, 0xC0, 0x79,</div><div class='add'>+0x00, 0xE3, 0x01, 0xBC, 0x06, 0xD0, 0x16, 0x40, 0xF8, 0x01, 0x2D, 0x01, 0xB4,</div><div class='add'>+0x05, 0xF0, 0x16, 0xD0, 0x72, 0x00, 0xAB, 0x01, 0x8C, 0x04, 0x74, 0x9E, 0xC0,</div><div class='add'>+0x78, 0x00, 0xF3, 0x81, 0xCC, 0x07, 0x34, 0x1E, 0xC0, 0x68, 0x00, 0xAF, 0x01,</div><div class='add'>+0x84, 0x07, 0xF0, 0x1C, 0xC0, 0x54, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x10, 0xB8, 0x35, 0x40, 0x9F, 0x14, 0x5C, 0x22, 0xF0, 0x0D, 0xC0, 0x35, 0x00,</div><div class='add'>+0xDF, 0x00, 0x7C, 0x02, 0xF0, 0x05, 0xD0, 0x77, 0x00, 0x5F, 0x00, 0x6C, 0x00,</div><div class='add'>+0xF0, 0x00, 0xD0, 0x25, 0x20, 0x9F, 0x02, 0x3C, 0x00, 0xB1, 0x09, 0xD0, 0x37,</div><div class='add'>+0x00, 0xDF, 0x00, 0x7D, 0x03, 0xE0, 0x0D, 0xC0, 0x27, 0x00, 0x9F, 0x02, 0x7D,</div><div class='add'>+0x03, 0xF0, 0x0D, 0xC0, 0x43, 0x60, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06,</div><div class='add'>+0x20, 0x7D, 0x00, 0xFF, 0x21, 0x8C, 0x06, 0x38, 0x8F, 0xC0, 0x6D, 0x00, 0xF3,</div><div class='add'>+0x01, 0xFC, 0x06, 0xF0, 0x1F, 0xD0, 0x7C, 0x00, 0x3F, 0x01, 0xFC, 0x06, 0xF0,</div><div class='add'>+0x13, 0xC0, 0x5F, 0x20, 0xF7, 0x23, 0xCC, 0x04, 0x31, 0x9F, 0xC0, 0x7C, 0x08,</div><div class='add'>+0xF3, 0x01, 0x8C, 0x07, 0x31, 0x0B, 0xC0, 0x6F, 0x00, 0xEF, 0x03, 0xCC, 0x07,</div><div class='add'>+0xF2, 0x1F, 0xC2, 0x08, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x00,</div><div class='add'>+0x39, 0x00, 0xED, 0x00, 0x84, 0x02, 0x38, 0x0F, 0x40, 0x08, 0x40, 0xE1, 0x00,</div><div class='add'>+0xBC, 0x02, 0xD0, 0x26, 0x40, 0x38, 0x02, 0x6D, 0x10, 0xB4, 0xA0, 0xD0, 0x82,</div><div class='add'>+0x40, 0x0F, 0x10, 0xE1, 0x04, 0x94, 0x10, 0x10, 0xE6, 0x41, 0x3C, 0x00, 0xF1,</div><div class='add'>+0x10, 0x84, 0x83, 0x14, 0x8A, 0x40, 0x2B, 0x04, 0xED, 0x08, 0x84, 0x03, 0xD0,</div><div class='add'>+0x0E, 0x40, 0x54, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x39,</div><div class='add'>+0x00, 0xED, 0x00, 0x84, 0x02, 0x90, 0x8E, 0x40, 0x29, 0x00, 0xE1, 0x00, 0xB4,</div><div class='add'>+0x42, 0xD0, 0x06, 0x40, 0x38, 0x04, 0x2D, 0x00, 0xB4, 0x00, 0xD0, 0x02, 0x40,</div><div class='add'>+0x2B, 0x02, 0xED, 0x80, 0xC4, 0x00, 0x10, 0x04, 0x40, 0x38, 0x04, 0x61, 0x00,</div><div class='add'>+0xF4, 0x03, 0x10, 0x8A, 0x41, 0x2B, 0x02, 0xAD, 0x00, 0x84, 0x03, 0xD0, 0x2C,</div><div class='add'>+0x40, 0x20, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x28, 0x31, 0x00,</div><div class='add'>+0xCD, 0x00, 0x44, 0x02, 0x10, 0x1C, 0x40, 0x00, 0x04, 0xC1, 0x49, 0x34, 0x02,</div><div class='add'>+0xD0, 0x25, 0x40, 0x70, 0x00, 0x4D, 0x01, 0x34, 0x00, 0xD2, 0x10, 0x40, 0x23,</div><div class='add'>+0x00, 0xC9, 0x0A, 0x14, 0xC8, 0x14, 0x04, 0x50, 0xF0, 0x00, 0x41, 0x00, 0x34,</div><div class='add'>+0x0B, 0x10, 0x18, 0x40, 0x23, 0x00, 0x9D, 0x00, 0x04, 0x03, 0xD0, 0x0C, 0x40,</div><div class='add'>+0x58, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0xA0, 0x35, 0x00, 0xDF,</div><div class='add'>+0x07, 0xCC, 0x02, 0xB0, 0x4D, 0xC0, 0xE5, 0x00, 0xD3, 0x00, 0x3C, 0x02, 0xF0,</div><div class='add'>+0x05, 0xD0, 0x3C, 0x00, 0x1F, 0x02, 0x7C, 0x08, 0xF0, 0x21, 0xC1, 0x3F, 0x00,</div><div class='add'>+0xDF, 0x23, 0x0D, 0x08, 0x30, 0x11, 0xC0, 0xF4, 0x08, 0xD3, 0x00, 0x7C, 0x23,</div><div class='add'>+0x30, 0x0D, 0xC0, 0xB7, 0x00, 0x9F, 0x00, 0x4D, 0x03, 0xF0, 0x0D, 0xC0, 0x74,</div><div class='add'>+0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x08, 0x37, 0x10, 0x9F, 0x00,</div><div class='add'>+0x7E, 0x02, 0x70, 0x0D, 0xC2, 0x63, 0x10, 0xDF, 0x00, 0x5C, 0x02, 0xF0, 0xC5,</div><div class='add'>+0xC0, 0x37, 0x00, 0x5F, 0x00, 0x7C, 0x10, 0xF0, 0x41, 0xC0, 0x37, 0x00, 0xD7,</div><div class='add'>+0x10, 0x7C, 0x0C, 0xF0, 0x00, 0xC0, 0x37, 0x04, 0xDF, 0x00, 0x44, 0x0B, 0xF0,</div><div class='add'>+0x0C, 0xC1, 0x27, 0x01, 0x9F, 0x00, 0x7C, 0x03, 0xF0, 0x1D, 0xC2, 0x07, 0x00,</div><div class='add'>+0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x08, 0x3F, 0x00, 0xEF, 0x10, 0xCC,</div><div class='add'>+0x06, 0x30, 0x0F, 0xC0, 0x04, 0x00, 0xF3, 0x00, 0xFE, 0x52, 0x30, 0x05, 0xC0,</div><div class='add'>+0x3C, 0x00, 0x37, 0x10, 0xFC, 0x80, 0xF0, 0x03, 0xC0, 0x7B, 0x00, 0x93, 0x00,</div><div class='add'>+0xCC, 0x00, 0xB0, 0x03, 0x40, 0x2C, 0x00, 0xB3, 0x00, 0xCC, 0x83, 0x32, 0x8F,</div><div class='add'>+0xC2, 0xBC, 0x00, 0xBF, 0x00, 0xCC, 0x03, 0xF0, 0x0E, 0xC0, 0x04, 0x20, 0x0C,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x81, 0x20, 0x36, 0x00, 0x9D, 0x20, 0x44, 0x0A,</div><div class='add'>+0x10, 0x0C, 0x50, 0xC4, 0x00, 0xD1, 0x00, 0x74, 0x06, 0x50, 0x15, 0x50, 0x35,</div><div class='add'>+0x00, 0x5D, 0x07, 0x74, 0x0C, 0xD0, 0x11, 0xC0, 0x35, 0x02, 0x81, 0x00, 0x44,</div><div class='add'>+0x4C, 0x11, 0x31, 0xC0, 0x36, 0x00, 0xD1, 0x02, 0x44, 0x43, 0x10, 0x21, 0x42,</div><div class='add'>+0x24, 0x00, 0x9D, 0x09, 0x44, 0x03, 0xD0, 0x0D, 0x40, 0x04, 0x00, 0x08, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x01, 0xA0, 0x66, 0x00, 0xDD, 0x00, 0x44, 0x28, 0x10,</div><div class='add'>+0x19, 0x40, 0xE6, 0x00, 0xD1, 0x00, 0x74, 0x02, 0xD0, 0x11, 0x40, 0x36, 0x00,</div><div class='add'>+0x1D, 0x01, 0x74, 0x44, 0xD0, 0x31, 0x40, 0x17, 0x40, 0xD1, 0x00, 0x44, 0x84,</div><div class='add'>+0x10, 0x11, 0x02, 0xD3, 0x00, 0xC1, 0x11, 0x06, 0x04, 0x10, 0x29, 0x40, 0x36,</div><div class='add'>+0x00, 0xDD, 0x00, 0x44, 0x03, 0xD0, 0x0D, 0x40, 0x06, 0x00, 0x02, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x10, 0x20, 0x20, 0x00, 0xCD, 0x00, 0x05, 0x00, 0x10, 0x09,</div><div class='add'>+0x40, 0x02, 0x40, 0xC1, 0x00, 0x34, 0x82, 0x50, 0x00, 0x40, 0x33, 0x08, 0x4D,</div><div class='add'>+0x40, 0x36, 0x00, 0xD0, 0x00, 0x40, 0x11, 0x80, 0xD1, 0x00, 0x44, 0x00, 0x10,</div><div class='add'>+0x00, 0x40, 0x33, 0x00, 0xC1, 0x00, 0x06, 0x02, 0x10, 0x08, 0x50, 0x22, 0x00,</div><div class='add'>+0xCD, 0x00, 0x04, 0x03, 0xD0, 0x0C, 0x40, 0x42, 0x80, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x98, 0x26, 0x00, 0xEF, 0x00, 0x4C, 0x00, 0x34, 0x09, 0xC0,</div><div class='add'>+0x06, 0x00, 0xD3, 0x00, 0x74, 0x02, 0x70, 0x05, 0xC0, 0x36, 0x00, 0x17, 0x00,</div><div class='add'>+0x74, 0x00, 0xF2, 0x01, 0xC2, 0x27, 0x20, 0xF3, 0x20, 0x4C, 0x00, 0xB0, 0x03,</div><div class='add'>+0xD0, 0x07, 0x00, 0x93, 0x00, 0x4C, 0x01, 0x30, 0x09, 0xC0, 0x36, 0x00, 0xBF,</div><div class='add'>+0x00, 0x4D, 0x03, 0xF0, 0x0D, 0xC0, 0x06, 0xC0, 0x0A, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x05, 0xB8, 0x2F, 0x00, 0xFF, 0x00, 0xFC, 0x00, 0xF0, 0x0B, 0xC0, 0x0D,</div><div class='add'>+0x00, 0xFF, 0x00, 0xFC, 0x02, 0xF0, 0x07, 0xC0, 0x3D, 0x00, 0x7F, 0x00, 0xFC,</div><div class='add'>+0x00, 0xD0, 0x03, 0xC0, 0x2F, 0x00, 0xFF, 0x00, 0xBD, 0x00, 0xF4, 0x03, 0xC2,</div><div class='add'>+0x3E, 0x00, 0xFF, 0x00, 0xFC, 0x03, 0xF0, 0x0B, 0xC0, 0x2D, 0x00, 0xBF, 0x00,</div><div class='add'>+0xFC, 0x03, 0xF0, 0x0F, 0xC0, 0x15, 0x60, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x03, 0xA0, 0x7F, 0x00, 0xFF, 0x01, 0xFC, 0x27, 0x30, 0x1F, 0xC8, 0x7F, 0x0A,</div><div class='add'>+0xFF, 0x01, 0xCC, 0x27, 0xF0, 0x1F, 0xC0, 0x7C, 0x00, 0xF3, 0x09, 0xFC, 0x27,</div><div class='add'>+0xF0, 0x3F, 0xC0, 0x7F, 0x00, 0xF3, 0x01, 0xCC, 0x27, 0x30, 0x9F, 0xC0, 0x78,</div><div class='add'>+0x00, 0xFF, 0x09, 0xCC, 0x07, 0xB0, 0x13, 0xC0, 0x7E, 0x00, 0xEF, 0x01, 0xFC,</div><div class='add'>+0x07, 0x30, 0x1F, 0xC0, 0x0F, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,</div><div class='add'>+0x08, 0x77, 0x00, 0xDD, 0x01, 0x74, 0x00, 0x10, 0x11, 0x40, 0x07, 0x01, 0x1D,</div><div class='add'>+0x01, 0x44, 0x00, 0x90, 0x11, 0x40, 0x04, 0x01, 0x11, 0x00, 0x74, 0x10, 0xD0,</div><div class='add'>+0x01, 0x40, 0x47, 0x00, 0x11, 0x01, 0x44, 0x00, 0x10, 0x01, 0x48, 0x44, 0x00,</div><div class='add'>+0x1D, 0x00, 0x44, 0x87, 0x51, 0x11, 0x40, 0x74, 0x00, 0x9D, 0x01, 0x74, 0x13,</div><div class='add'>+0x10, 0x1D, 0x40, 0x0F, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0xA0,</div><div class='add'>+0x33, 0x00, 0xCD, 0x00, 0x34, 0x03, 0x10, 0x0C, 0x40, 0x33, 0x00, 0xDD, 0x00,</div><div class='add'>+0x04, 0x03, 0xD0, 0x0D, 0x48, 0x34, 0x14, 0xC1, 0x20, 0x34, 0x03, 0xD0, 0x4C,</div><div class='add'>+0x40, 0x37, 0x00, 0xD9, 0x00, 0x64, 0x03, 0x10, 0x0D, 0x40, 0x31, 0x00, 0xCD,</div><div class='add'>+0x04, 0x24, 0x03, 0x10, 0x01, 0x48, 0x32, 0x80, 0x8D, 0x00, 0x34, 0x43, 0x19,</div><div class='add'>+0x0C, 0x40, 0x4F, 0x80, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xA8, 0x35,</div><div class='add'>+0x00, 0xDD, 0x00, 0x74, 0x00, 0x10, 0x01, 0x40, 0x07, 0x00, 0x1D, 0x00, 0x44,</div><div class='add'>+0x00, 0x90, 0x01, 0x40, 0x04, 0x00, 0x11, 0x00, 0x74, 0x80, 0xD0, 0x01, 0x40,</div><div class='add'>+0x07, 0x00, 0x19, 0x00, 0x64, 0x00, 0x11, 0x01, 0x42, 0x05, 0x08, 0x1D, 0x20,</div><div class='add'>+0x64, 0x07, 0x50, 0x11, 0x41, 0x34, 0x80, 0x1D, 0x01, 0x34, 0x03, 0x18, 0x0D,</div><div class='add'>+0x42, 0x0F, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xA8, 0x37, 0x00,</div><div class='add'>+0xDF, 0x00, 0x7C, 0x03, 0x30, 0x0D, 0xC0, 0x37, 0x18, 0xCF, 0x00, 0x4C, 0x03,</div><div class='add'>+0xF0, 0x0D, 0xC0, 0x34, 0x00, 0xD3, 0x00, 0x7C, 0x03, 0xF0, 0x0D, 0xC0, 0x33,</div><div class='add'>+0x00, 0xCB, 0x00, 0x6C, 0x03, 0x30, 0x0C, 0xC0, 0x35, 0x00, 0xDF, 0x00, 0x6D,</div><div class='add'>+0x07, 0x30, 0x10, 0xC2, 0x36, 0x00, 0x9F, 0x13, 0x7C, 0x03, 0x30, 0x0D, 0xC2,</div><div class='add'>+0x23, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x80, 0x3D, 0x00, 0xFF,</div><div class='add'>+0x00, 0xFC, 0x40, 0xF2, 0x03, 0xC0, 0x0F, 0x00, 0x3F, 0x00, 0xFD, 0x00, 0xF0,</div><div class='add'>+0x03, 0xD2, 0x0F, 0x00, 0x3F, 0x00, 0xFE, 0x00, 0xF0, 0x03, 0xC2, 0x0F, 0x00,</div><div class='add'>+0x37, 0x00, 0xDC, 0x00, 0xF6, 0x03, 0xC0, 0x0E, 0x20, 0x3F, 0x00, 0xDC, 0x03,</div><div class='add'>+0xF0, 0x07, 0xC0, 0x3F, 0x00, 0xBF, 0x00, 0xFC, 0x03, 0xF0, 0x0F, 0xC0, 0x1F,</div><div class='add'>+0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x08, 0x35, 0x00, 0xDF, 0x00,</div><div class='add'>+0x7C, 0x03, 0x30, 0x8D, 0xC0, 0x36, 0x00, 0xDF, 0x01, 0x4C, 0x23, 0xF0, 0x0D,</div><div class='add'>+0xC2, 0x34, 0x04, 0xDF, 0x01, 0x4C, 0x43, 0xF0, 0x0D, 0xE0, 0x37, 0x00, 0xDB,</div><div class='add'>+0x01, 0x4C, 0x13, 0xF0, 0x8D, 0x80, 0x34, 0x02, 0xD3, 0x18, 0x4C, 0x0E, 0xF0,</div><div class='add'>+0x01, 0xC0, 0x37, 0x00, 0x93, 0x02, 0x4C, 0x43, 0xF0, 0x0D, 0xC0, 0x2B, 0x20,</div><div class='add'>+0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0xA0, 0x34, 0x00, 0xDD, 0x00, 0x74,</div><div class='add'>+0x00, 0x11, 0x01, 0x40, 0x84, 0x00, 0x1D, 0x00, 0x44, 0x00, 0xD0, 0x10, 0x40,</div><div class='add'>+0x80, 0x00, 0x1D, 0x80, 0x44, 0x9C, 0xD0, 0x51, 0x40, 0xC7, 0x0A, 0x1D, 0x00,</div><div class='add'>+0x04, 0x48, 0xD0, 0x21, 0x40, 0x44, 0x20, 0x11, 0xA0, 0x2C, 0x02, 0xD0, 0xA5,</div><div class='add'>+0x40, 0x77, 0x04, 0x91, 0x00, 0x68, 0x07, 0xD0, 0x0D, 0x40, 0x4F, 0x00, 0x02,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xA0, 0x32, 0x00, 0xCD, 0x00, 0x74, 0x0F,</div><div class='add'>+0x10, 0x1C, 0x40, 0x32, 0x02, 0xCD, 0x00, 0x04, 0x43, 0xD0, 0x8C, 0x40, 0xF0,</div><div class='add'>+0x08, 0xCD, 0x00, 0x04, 0x03, 0xD0, 0x4C, 0x40, 0x73, 0x02, 0xCD, 0x00, 0x04,</div><div class='add'>+0x0F, 0xD0, 0x0C, 0x40, 0x70, 0x00, 0xD1, 0x00, 0x24, 0x03, 0xD0, 0x04, 0x48,</div><div class='add'>+0x73, 0x00, 0x88, 0x00, 0x04, 0x27, 0xD0, 0x0C, 0x40, 0x0F, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x04, 0x80, 0x78, 0x00, 0xED, 0x01, 0xF4, 0x64, 0x10,</div><div class='add'>+0x12, 0x40, 0xC8, 0x00, 0x3D, 0x01, 0x84, 0x04, 0xD0, 0x12, 0x50, 0x48, 0x04,</div><div class='add'>+0x2D, 0x03, 0x84, 0x04, 0xD0, 0x12, 0x40, 0x4B, 0x02, 0x3D, 0x01, 0x84, 0x04,</div><div class='add'>+0xD0, 0x33, 0x40, 0x4C, 0x00, 0x31, 0x01, 0xA4, 0x07, 0xD0, 0x16, 0x40, 0x3B,</div><div class='add'>+0x00, 0xB9, 0x01, 0xA4, 0x07, 0xD0, 0x1E, 0x40, 0x3F, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x12, 0x10, 0x30, 0x00, 0xCF, 0x00, 0x3C, 0x03, 0x30, 0x0C,</div><div class='add'>+0xC0, 0x32, 0x00, 0xCF, 0x00, 0x0C, 0x03, 0xF0, 0x0C, 0xC0, 0x30, 0x02, 0xDF,</div><div class='add'>+0x00, 0x0C, 0x03, 0xF0, 0x0C, 0x40, 0x33, 0x00, 0xCF, 0x04, 0x0C, 0x23, 0xF2,</div><div class='add'>+0x0D, 0x40, 0x30, 0x00, 0xC3, 0x00, 0x2C, 0x0B, 0xF0, 0x00, 0xC0, 0x33, 0x02,</div><div class='add'>+0x8B, 0x80, 0x0C, 0x23, 0xF0, 0x0C, 0xC0, 0x4B, 0x40, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x02, 0xB8, 0x3D, 0x00, 0xFF, 0x00, 0xBC, 0x00, 0xF0, 0x82, 0x80,</div><div class='add'>+0x0F, 0x02, 0x2F, 0x00, 0xFC, 0x00, 0xF1, 0x02, 0xC0, 0x0F, 0x08, 0x3F, 0x00,</div><div class='add'>+0x7C, 0x00, 0xF0, 0x83, 0xC0, 0x0F, 0x08, 0x2F, 0x00, 0x7C, 0x00, 0xF0, 0x03,</div><div class='add'>+0xD0, 0x0F, 0x00, 0x2F, 0x09, 0xFC, 0x03, 0xF0, 0x83, 0xC4, 0x3B, 0x01, 0xB7,</div><div class='add'>+0x00, 0xFC, 0x23, 0xF0, 0x0F, 0xC0, 0x0B, 0x60, 0x04, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x15, 0xA0, 0x37, 0x00, 0xDF, 0x00, 0x7C, 0x07, 0x34, 0x0D, 0xC0, 0x77,</div><div class='add'>+0x40, 0xD3, 0x00, 0x7C, 0x07, 0x34, 0x0D, 0xC0, 0x37, 0x08, 0xDF, 0x00, 0x7C,</div><div class='add'>+0x07, 0x30, 0x1D, 0xD0, 0x70, 0x00, 0xC3, 0x01, 0x4C, 0x03, 0xF0, 0x0D, 0xC0,</div><div class='add'>+0x37, 0x20, 0xDF, 0x40, 0x7C, 0x01, 0xF0, 0x04, 0xC0, 0x34, 0x00, 0x9F, 0x00,</div><div class='add'>+0x7C, 0x03, 0xF0, 0x0D, 0xC0, 0x43, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x12, 0x88, 0x39, 0x00, 0xED, 0x00, 0xF4, 0x00, 0x10, 0x02, 0x48, 0x0F, 0x00,</div><div class='add'>+0x21, 0x00, 0xF4, 0x00, 0x10, 0x02, 0x40, 0x0B, 0x00, 0x2D, 0x00, 0xF4, 0x00,</div><div class='add'>+0x13, 0x03, 0x40, 0x08, 0x00, 0x25, 0x00, 0x84, 0x00, 0xD0, 0x02, 0x40, 0x0B,</div><div class='add'>+0x00, 0x2D, 0x00, 0xB4, 0x01, 0xD0, 0x06, 0x40, 0x38, 0x00, 0xA9, 0x00, 0xB4,</div><div class='add'>+0x03, 0xD0, 0x0E, 0x40, 0x4F, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03,</div><div class='add'>+0x00, 0x79, 0x00, 0xED, 0x01, 0xB4, 0x07, 0x50, 0x1E, 0x40, 0x7B, 0x00, 0xE1,</div><div class='add'>+0x01, 0xB4, 0x07, 0x10, 0x1E, 0x00, 0x7B, 0x00, 0xED, 0x01, 0xB4, 0x07, 0x54,</div><div class='add'>+0x1E, 0x40, 0x78, 0x00, 0xE1, 0x01, 0x84, 0x07, 0xD0, 0x1E, 0x40, 0x7B, 0x00,</div><div class='add'>+0xED, 0x01, 0xB4, 0x07, 0xD0, 0x12, 0x40, 0x78, 0x80, 0xAD, 0x11, 0xB4, 0x07,</div><div class='add'>+0xD0, 0x1E, 0x40, 0x13, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x28,</div><div class='add'>+0x33, 0x00, 0xCD, 0x00, 0x34, 0x80, 0x50, 0x00, 0x40, 0x03, 0x00, 0x01, 0x00,</div><div class='add'>+0x34, 0x00, 0x10, 0x00, 0x40, 0x03, 0x00, 0x0D, 0x00, 0x34, 0x00, 0x50, 0x00,</div><div class='add'>+0x40, 0x00, 0x00, 0x05, 0x00, 0x16, 0x00, 0xD0, 0x00, 0x40, 0x03, 0x00, 0x0D,</div><div class='add'>+0x00, 0x34, 0x07, 0xD0, 0x6C, 0x40, 0x30, 0x80, 0x89, 0x01, 0x34, 0x03, 0xD0,</div><div class='add'>+0x0C, 0x40, 0x5B, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x17, 0x28, 0x15,</div><div class='add'>+0x00, 0x5F, 0x00, 0x7C, 0x01, 0x70, 0x05, 0xC0, 0x17, 0x00, 0x53, 0x00, 0x7C,</div><div class='add'>+0x01, 0x30, 0x05, 0xC0, 0x17, 0x00, 0x5F, 0x00, 0x7C, 0x01, 0x70, 0x05, 0xC0,</div><div class='add'>+0x14, 0x00, 0x51, 0x00, 0x4D, 0x01, 0xF0, 0x05, 0xC0, 0x17, 0x00, 0x5F, 0x00,</div><div class='add'>+0xBC, 0x95, 0xF0, 0x27, 0xD0, 0x14, 0x00, 0x6F, 0x02, 0x7C, 0x01, 0xD0, 0x05,</div><div class='add'>+0xC0, 0x5F, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x07, 0x00,</div><div class='add'>+0x1F, 0x00, 0xFC, 0x00, 0x90, 0x03, 0xC0, 0x0F, 0x00, 0x3F, 0x00, 0xFC, 0x00,</div><div class='add'>+0xF0, 0x03, 0xC0, 0x0F, 0x00, 0x3F, 0x80, 0xFC, 0x00, 0x90, 0x03, 0xC0, 0x0F,</div><div class='add'>+0x00, 0x3F, 0x00, 0xEC, 0x00, 0xF0, 0x03, 0xC0, 0x0F, 0x00, 0x3C, 0x00, 0x7C,</div><div class='add'>+0x40, 0xE0, 0x21, 0xC0, 0x07, 0x08, 0x1F, 0x10, 0x74, 0x00, 0xF0, 0x01, 0xC0,</div><div class='add'>+0x4B, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x08, 0x25, 0x00, 0x9F,</div><div class='add'>+0x00, 0x7C, 0x06, 0xF0, 0x09, 0xC0, 0x27, 0x10, 0x9F, 0x00, 0x7C, 0x02, 0xF0,</div><div class='add'>+0x09, 0xC0, 0x27, 0x00, 0x9F, 0x00, 0x7C, 0x06, 0xF0, 0x19, 0xC0, 0x27, 0x01,</div><div class='add'>+0x9F, 0x00, 0x7C, 0x26, 0xF0, 0x09, 0xC0, 0x27, 0x00, 0x9F, 0x00, 0x7C, 0x06,</div><div class='add'>+0x70, 0x49, 0xC0, 0xE5, 0x00, 0x9F, 0x00, 0x4C, 0x16, 0xF0, 0x09, 0xC0, 0x43,</div><div class='add'>+0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x20, 0x26, 0x00, 0x9D, 0x00,</div><div class='add'>+0x74, 0x0A, 0xD0, 0x09, 0x40, 0x27, 0x04, 0x9D, 0x00, 0x74, 0x2E, 0xD0, 0x09,</div><div class='add'>+0x46, 0xA7, 0x00, 0x9D, 0x03, 0x74, 0x2A, 0xD0, 0x29, 0x40, 0x67, 0x80, 0x9D,</div><div class='add'>+0x00, 0x74, 0x0A, 0xD0, 0x09, 0x40, 0x27, 0x00, 0x9D, 0x43, 0x74, 0xA2, 0x30,</div><div class='add'>+0x38, 0x40, 0x24, 0x01, 0x9D, 0x80, 0x6C, 0x0E, 0xD1, 0x09, 0x40, 0x07, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0xA0, 0x24, 0x00, 0x9D, 0x00, 0x74,</div><div class='add'>+0x12, 0xD0, 0x4B, 0x40, 0x6F, 0x00, 0xBD, 0x01, 0xF4, 0x02, 0xD0, 0x1B, 0x40,</div><div class='add'>+0x6F, 0x00, 0xBD, 0x08, 0xF4, 0x02, 0xD0, 0x8B, 0x40, 0x2F, 0x18, 0xBD, 0x01,</div><div class='add'>+0xF4, 0x02, 0xD0, 0x1B, 0x41, 0x6F, 0x00, 0xBD, 0x04, 0x64, 0x02, 0x58, 0x09,</div><div class='add'>+0x40, 0x25, 0x08, 0x9D, 0x00, 0x44, 0x0A, 0xD0, 0x09, 0x40, 0x63, 0x00, 0x02,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x20, 0x20, 0x00, 0x8D, 0x00, 0xB4, 0x06,</div><div class='add'>+0xD0, 0x0A, 0x40, 0x2B, 0x00, 0xAD, 0x00, 0xB4, 0x06, 0xD2, 0x0A, 0x40, 0x6B,</div><div class='add'>+0x00, 0xAD, 0x01, 0xB4, 0x06, 0xD0, 0x1A, 0x48, 0x6B, 0x20, 0xAD, 0xC0, 0xB4,</div><div class='add'>+0x06, 0xD0, 0x0A, 0x48, 0x2B, 0x00, 0xAD, 0x01, 0x74, 0x02, 0x10, 0x09, 0x40,</div><div class='add'>+0x20, 0x00, 0x9D, 0x00, 0x25, 0x22, 0xD0, 0x08, 0x40, 0x43, 0x80, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x1D, 0xB0, 0x06, 0x00, 0x1F, 0x00, 0x7C, 0x28, 0xF0,</div><div class='add'>+0x01, 0xC2, 0x87, 0x02, 0x1F, 0x00, 0x7C, 0x28, 0xF0, 0x01, 0xC0, 0x87, 0x22,</div><div class='add'>+0x1F, 0x2A, 0x7C, 0x28, 0xF0, 0xA1, 0xC0, 0x07, 0x00, 0x1D, 0x00, 0x7C, 0x28,</div><div class='add'>+0xF0, 0xA1, 0x40, 0x07, 0x00, 0x3F, 0x0A, 0x6C, 0x00, 0x72, 0x05, 0xC0, 0x05,</div><div class='add'>+0x00, 0x1F, 0x00, 0x4C, 0x08, 0xF0, 0x01, 0xC8, 0x77, 0xE0, 0x0A, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x19, 0xB8, 0x27, 0x00, 0x9F, 0x00, 0x7C, 0x02, 0xF1, 0x09,</div><div class='add'>+0xCA, 0x27, 0x08, 0x9F, 0x00, 0x7C, 0x02, 0xF0, 0x09, 0xC0, 0x27, 0x00, 0x9F,</div><div class='add'>+0x00, 0x74, 0x82, 0xF1, 0x09, 0xC0, 0x27, 0x08, 0x9F, 0x00, 0x7C, 0x02, 0xF0,</div><div class='add'>+0x09, 0xC0, 0x27, 0x00, 0x9F, 0x00, 0xF8, 0x02, 0x72, 0x0B, 0xC0, 0x27, 0x00,</div><div class='add'>+0xBF, 0x00, 0x7C, 0x12, 0xF8, 0x09, 0xC0, 0x77, 0x60, 0x0E, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x18, 0xA0, 0x27, 0x00, 0x9F, 0x00, 0xFC, 0x22, 0xF0, 0x0B, 0xC6,</div><div class='add'>+0xAC, 0x18, 0xBF, 0x00, 0xFC, 0x22, 0xB0, 0x0B, 0xC0, 0xAF, 0x20, 0xBF, 0x02,</div><div class='add'>+0xCC, 0x0A, 0xF0, 0x0B, 0xC0, 0x2C, 0x00, 0xB7, 0x00, 0xFC, 0x0A, 0x30, 0x2B,</div><div class='add'>+0xC0, 0x2C, 0x20, 0xBF, 0x48, 0xBC, 0x02, 0x30, 0x0F, 0xC0, 0x2F, 0x20, 0x9F,</div><div class='add'>+0x00, 0xF4, 0x02, 0x30, 0x09, 0xC0, 0x77, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x1C, 0x08, 0x07, 0x00, 0x1D, 0x00, 0x74, 0x14, 0xD0, 0x01, 0x40, 0x44,</div><div class='add'>+0x00, 0x1D, 0x00, 0x74, 0x14, 0xD0, 0x01, 0x48, 0x47, 0x01, 0x1D, 0x81, 0x44,</div><div class='add'>+0x94, 0x90, 0x11, 0x52, 0x04, 0x00, 0x11, 0x00, 0x74, 0x04, 0x10, 0x51, 0x40,</div><div class='add'>+0x04, 0x00, 0x1D, 0x05, 0x74, 0x00, 0x10, 0x01, 0x40, 0x07, 0x00, 0x1D, 0x00,</div><div class='add'>+0x64, 0x00, 0x14, 0x01, 0x40, 0x63, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x10, 0xA0, 0x23, 0x00, 0x8D, 0x00, 0x34, 0x03, 0xD0, 0x0D, 0x50, 0x21, 0x01,</div><div class='add'>+0x8D, 0x00, 0x34, 0x03, 0x90, 0x0C, 0x40, 0x23, 0x01, 0xC5, 0x04, 0x15, 0x03,</div><div class='add'>+0xD0, 0x4D, 0x41, 0x20, 0x00, 0x81, 0x00, 0x34, 0x13, 0x10, 0x08, 0x14, 0x32,</div><div class='add'>+0x20, 0x8D, 0x00, 0x76, 0x82, 0x50, 0x08, 0x48, 0x23, 0x10, 0x8D, 0x00, 0x34,</div><div class='add'>+0x02, 0x10, 0x08, 0x40, 0x4B, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18,</div><div class='add'>+0xA8, 0x25, 0x00, 0x9D, 0x00, 0x74, 0x02, 0xD0, 0x09, 0x40, 0x25, 0x00, 0x9D,</div><div class='add'>+0x00, 0x74, 0x02, 0xD0, 0x09, 0x40, 0x27, 0x00, 0x9D, 0x00, 0x54, 0x02, 0xD0,</div><div class='add'>+0x0D, 0x40, 0x24, 0x00, 0x91, 0xC0, 0x74, 0x02, 0x12, 0x09, 0x00, 0x24, 0x00,</div><div class='add'>+0x9D, 0x00, 0x74, 0x12, 0x54, 0x19, 0x40, 0x27, 0x00, 0x9D, 0x00, 0x24, 0x02,</div><div class='add'>+0x10, 0x09, 0x40, 0x63, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0xA8,</div><div class='add'>+0x27, 0x00, 0x9F, 0x00, 0x7C, 0x02, 0xF0, 0x09, 0xC0, 0x25, 0x00, 0x9F, 0x00,</div><div class='add'>+0x7C, 0x02, 0xB0, 0x09, 0xC0, 0x27, 0x00, 0x97, 0x00, 0x5C, 0x02, 0xF0, 0x09,</div><div class='add'>+0xC0, 0x24, 0x40, 0x95, 0x00, 0x7C, 0x02, 0x34, 0x09, 0xC0, 0x26, 0x00, 0x9F,</div><div class='add'>+0x00, 0x7C, 0x4E, 0x70, 0x69, 0xC0, 0x27, 0x00, 0x9F, 0x05, 0x7C, 0x02, 0x10,</div><div class='add'>+0x09, 0x40, 0x17, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x80, 0x25,</div><div class='add'>+0x00, 0x9F, 0x00, 0x7C, 0x02, 0xF0, 0x09, 0xC0, 0x26, 0x04, 0x9F, 0x00, 0x7C,</div><div class='add'>+0x02, 0xF0, 0x09, 0xC0, 0x27, 0x00, 0x9F, 0x00, 0x6C, 0x02, 0xB0, 0x09, 0xC0,</div><div class='add'>+0x27, 0x20, 0x9F, 0x00, 0x7C, 0x02, 0xF0, 0x09, 0xC2, 0x25, 0x20, 0x9F, 0x00,</div><div class='add'>+0x7C, 0x02, 0xB2, 0x09, 0xC0, 0x27, 0x04, 0x9F, 0x04, 0x6C, 0x02, 0xF0, 0x09,</div><div class='add'>+0xC0, 0x5B, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x08, 0x05, 0x00,</div><div class='add'>+0x1F, 0x00, 0x7C, 0x00, 0xF0, 0x01, 0xC0, 0x07, 0x00, 0x1F, 0x00, 0x7E, 0x00,</div><div class='add'>+0x34, 0x01, 0xC0, 0x07, 0x40, 0x1B, 0x00, 0x7C, 0x00, 0xF0, 0x01, 0xC4, 0x47,</div><div class='add'>+0x00, 0x1F, 0x00, 0x7C, 0x00, 0x30, 0x41, 0xC2, 0x04, 0x00, 0x13, 0x00, 0x7C,</div><div class='add'>+0x00, 0x70, 0x01, 0xC0, 0x07, 0x00, 0x1F, 0x00, 0x7C, 0x10, 0xF0, 0x01, 0xC0,</div><div class='add'>+0x53, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0xA0, 0x14, 0x00, 0x5D,</div><div class='add'>+0x00, 0xF4, 0x01, 0xD0, 0x04, 0x40, 0x9F, 0x04, 0x5D, 0x01, 0xF4, 0x21, 0x10,</div><div class='add'>+0x05, 0x00, 0xDF, 0x02, 0x71, 0x88, 0xF0, 0x01, 0xD0, 0x86, 0xC0, 0x19, 0x01,</div><div class='add'>+0x5D, 0x11, 0xF4, 0x09, 0x10, 0x37, 0x48, 0x14, 0x20, 0x7B, 0x91, 0x74, 0x01,</div><div class='add'>+0x10, 0xB7, 0x40, 0x1F, 0x00, 0x5D, 0x00, 0xF4, 0x45, 0xD0, 0x05, 0x40, 0x43,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0xA0, 0x32, 0x00, 0xCD, 0x00,</div><div class='add'>+0x34, 0x43, 0xD0, 0x08, 0x40, 0xF3, 0x00, 0x8D, 0x08, 0x34, 0x03, 0x10, 0x08,</div><div class='add'>+0x40, 0xF3, 0x20, 0xD0, 0x02, 0x34, 0x13, 0xD0, 0x2C, 0x40, 0x53, 0x00, 0x8D,</div><div class='add'>+0x40, 0x76, 0x43, 0x14, 0x3D, 0x40, 0x20, 0x00, 0xC1, 0x04, 0x74, 0x02, 0x50,</div><div class='add'>+0x30, 0x48, 0x43, 0x00, 0xCC, 0x00, 0x34, 0x03, 0xD0, 0x0C, 0x40, 0x43, 0x00,</div><div class='add'>+0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x80, 0x38, 0x00, 0xED, 0x00, 0xB4,</div><div class='add'>+0x03, 0xD0, 0x0E, 0x40, 0x3B, 0x00, 0xED, 0x00, 0xB4, 0x07, 0x10, 0x0E, 0x40,</div><div class='add'>+0x7B, 0x14, 0xE1, 0x40, 0xB4, 0x03, 0xD0, 0x0E, 0x40, 0x39, 0x00, 0xED, 0x00,</div><div class='add'>+0xB4, 0x03, 0x12, 0x2E, 0x50, 0x78, 0x00, 0xE9, 0x00, 0xF4, 0xC2, 0x00, 0x02,</div><div class='add'>+0x41, 0x0B, 0x04, 0xED, 0x00, 0xB4, 0x03, 0xD0, 0x0E, 0x40, 0x13, 0x00, 0x02,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x10, 0x78, 0x00, 0xEF, 0x01, 0xBC, 0x07,</div><div class='add'>+0xF0, 0x1E, 0xC2, 0x5B, 0x00, 0xEF, 0x01, 0xF4, 0x07, 0x30, 0x1E, 0xC8, 0x7F,</div><div class='add'>+0x10, 0xE3, 0x01, 0xBC, 0x07, 0xD0, 0x1E, 0xC0, 0x7B, 0x00, 0xEF, 0x01, 0xFC,</div><div class='add'>+0x07, 0x30, 0x17, 0xC8, 0x78, 0x08, 0xE3, 0x21, 0xBC, 0x07, 0x70, 0x16, 0xC0,</div><div class='add'>+0x4B, 0x00, 0xEF, 0x21, 0xBC, 0x05, 0xF0, 0x1E, 0xC0, 0x53, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x10, 0xB8, 0x35, 0x00, 0xDF, 0x00, 0x7C, 0x03, 0xF0,</div><div class='add'>+0x0D, 0xC0, 0x17, 0x08, 0xDF, 0x00, 0x7C, 0x03, 0xF0, 0x0D, 0x40, 0x17, 0x00,</div><div class='add'>+0xD7, 0x20, 0x7C, 0x01, 0xF0, 0x0D, 0xC4, 0x37, 0x00, 0xDF, 0x00, 0x7C, 0x01,</div><div class='add'>+0xF3, 0x05, 0xC0, 0x32, 0x10, 0x5F, 0x00, 0x7C, 0x03, 0xE0, 0x05, 0xC0, 0x07,</div><div class='add'>+0x00, 0xDF, 0x00, 0x7C, 0x01, 0xF1, 0x0D, 0xC0, 0x43, 0x20, 0x06, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0xA0, 0x7F, 0x00, 0xFF, 0x01, 0xFC, 0x05, 0xF0, 0x1F,</div><div class='add'>+0xC0, 0x7F, 0x00, 0xF3, 0x01, 0xFC, 0x07, 0xF0, 0x1F, 0xC0, 0x7C, 0x00, 0xFF,</div><div class='add'>+0x21, 0xBC, 0x85, 0x30, 0x1F, 0xC0, 0x78, 0x02, 0xF3, 0x01, 0xFC, 0x05, 0xF0,</div><div class='add'>+0x5F, 0xC0, 0x7F, 0x00, 0xFF, 0x09, 0xFC, 0x16, 0xF0, 0x17, 0xC4, 0x6D, 0x00,</div><div class='add'>+0xFF, 0x09, 0xF4, 0x27, 0x30, 0x9F, 0xC0, 0x1B, 0x00, 0x04, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x15, 0x80, 0x39, 0x00, 0xED, 0x00, 0xB4, 0x09, 0xD0, 0x0E, 0x40,</div><div class='add'>+0x3B, 0x00, 0xE1, 0x28, 0xB4, 0x03, 0xD0, 0x0E, 0x40, 0x38, 0x00, 0xED, 0x08,</div><div class='add'>+0xB4, 0x03, 0x12, 0x0F, 0x40, 0x38, 0x06, 0xE1, 0x18, 0xB4, 0x43, 0xD0, 0x06,</div><div class='add'>+0x41, 0x3B, 0x00, 0xED, 0x0A, 0xB4, 0x03, 0xD0, 0x07, 0x40, 0x28, 0x00, 0xED,</div><div class='add'>+0x08, 0xF4, 0x0B, 0x14, 0x0E, 0x40, 0x57, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x39, 0x00, 0xED, 0x00, 0xB4, 0x01, 0xD0, 0x8E, 0x40, 0x1F,</div><div class='add'>+0x00, 0xE1, 0x00, 0xB4, 0x09, 0xD0, 0x8F, 0x40, 0x39, 0x02, 0x6D, 0x02, 0xF4,</div><div class='add'>+0x09, 0x10, 0x26, 0x40, 0xBC, 0x08, 0xE1, 0x00, 0xB4, 0x01, 0xD0, 0x4E, 0x40,</div><div class='add'>+0x3B, 0x02, 0xED, 0x80, 0xB4, 0x93, 0xD0, 0x07, 0x40, 0x19, 0x00, 0xED, 0x40,</div><div class='add'>+0xB4, 0x01, 0x12, 0x0E, 0x40, 0x23, 0x01, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x04, 0x28, 0x33, 0x00, 0xCD, 0x00, 0x34, 0x08, 0xD0, 0x0C, 0x41, 0x07, 0x01,</div><div class='add'>+0xC1, 0x01, 0x34, 0x82, 0xD0, 0x2C, 0x4D, 0x65, 0x02, 0x8D, 0x88, 0x74, 0x24,</div><div class='add'>+0x10, 0x08, 0x40, 0x30, 0x00, 0xC1, 0x02, 0x34, 0x0C, 0xD0, 0x00, 0x40, 0x73,</div><div class='add'>+0x04, 0x9D, 0x0F, 0x34, 0x02, 0xD0, 0x24, 0x40, 0x00, 0x20, 0xCD, 0x09, 0x74,</div><div class='add'>+0x00, 0x10, 0x0C, 0x60, 0x0B, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15,</div><div class='add'>+0xA8, 0x35, 0x00, 0xDF, 0x00, 0x7C, 0x36, 0xF0, 0x0D, 0xC0, 0xA7, 0x00, 0xC3,</div><div class='add'>+0x12, 0x3C, 0x14, 0xF0, 0x2D, 0xC0, 0x85, 0x00, 0x0F, 0x00, 0x7C, 0x02, 0x30,</div><div class='add'>+0x51, 0x40, 0x74, 0x80, 0xD3, 0x09, 0x74, 0x26, 0xF0, 0x19, 0xC0, 0x33, 0x04,</div><div class='add'>+0x1E, 0x00, 0x7C, 0x02, 0xF0, 0x14, 0xC0, 0x05, 0x00, 0xDF, 0x01, 0x7C, 0x02,</div><div class='add'>+0x30, 0x0D, 0xC8, 0x77, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00,</div><div class='add'>+0x37, 0x00, 0xDF, 0x00, 0x7C, 0x02, 0xF0, 0x1D, 0xC8, 0xC7, 0x20, 0xDF, 0x04,</div><div class='add'>+0x7C, 0x00, 0xF0, 0x1D, 0x00, 0x26, 0x01, 0x1D, 0x80, 0x7C, 0x0A, 0xF0, 0x01,</div><div class='add'>+0xD0, 0x37, 0x00, 0xDF, 0x00, 0x7C, 0x0A, 0xF0, 0x09, 0x41, 0x37, 0x20, 0x9F,</div><div class='add'>+0x00, 0x78, 0x02, 0xC0, 0x15, 0xC0, 0x07, 0x00, 0xDF, 0x00, 0x7C, 0x0A, 0xF0,</div><div class='add'>+0x0D, 0xC0, 0x17, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x08, 0x3F,</div><div class='add'>+0x00, 0xFF, 0x00, 0xFC, 0x00, 0xF0, 0x0F, 0xC0, 0x2C, 0x00, 0xF3, 0x05, 0xEC,</div><div class='add'>+0x00, 0xB0, 0x5F, 0xC0, 0x0F, 0x00, 0x33, 0x20, 0xCC, 0x02, 0x30, 0x03, 0xC0,</div><div class='add'>+0x3F, 0x00, 0xFF, 0x04, 0xFC, 0x02, 0xF0, 0x03, 0xC0, 0x3F, 0x20, 0x33, 0x20,</div><div class='add'>+0xCC, 0x17, 0xF0, 0x17, 0xD1, 0x0C, 0x00, 0xFF, 0x10, 0xFC, 0x00, 0x10, 0x0F,</div><div class='add'>+0xC2, 0x27, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x81, 0x20, 0x36, 0x00,</div><div class='add'>+0xDD, 0x00, 0x74, 0x06, 0xD1, 0x0C, 0x40, 0x44, 0x08, 0xD1, 0x01, 0x44, 0x04,</div><div class='add'>+0x10, 0x1D, 0x40, 0x47, 0x01, 0x11, 0x01, 0x44, 0x06, 0x10, 0x31, 0x40, 0xF7,</div><div class='add'>+0x04, 0xDD, 0x01, 0x74, 0x1E, 0xD0, 0x51, 0x40, 0x37, 0x20, 0x11, 0x03, 0x44,</div><div class='add'>+0x03, 0xD0, 0xC5, 0x40, 0x44, 0x01, 0xDD, 0x00, 0x74, 0x2C, 0x10, 0x0D, 0x46,</div><div class='add'>+0x07, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xA0, 0x34, 0x00, 0xDD,</div><div class='add'>+0x00, 0x74, 0x06, 0xD0, 0x1D, 0x40, 0x64, 0x04, 0xD1, 0x00, 0x64, 0x0E, 0x10,</div><div class='add'>+0x0D, 0x40, 0x47, 0x80, 0x91, 0x03, 0x44, 0x0C, 0x10, 0x19, 0x42, 0x77, 0x00,</div><div class='add'>+0xDD, 0x00, 0x74, 0x04, 0xD0, 0x19, 0x40, 0x37, 0x09, 0x11, 0x01, 0x44, 0x02,</div><div class='add'>+0xD0, 0x05, 0x40, 0x44, 0x00, 0xDD, 0x00, 0x74, 0x82, 0x40, 0x0D, 0x40, 0x07,</div><div class='add'>+0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x28, 0x30, 0x00, 0xCD, 0x00,</div><div class='add'>+0x34, 0x02, 0xD0, 0x0D, 0x40, 0x20, 0x40, 0xC1, 0x00, 0x44, 0x02, 0x10, 0x0C,</div><div class='add'>+0x40, 0x23, 0x60, 0x91, 0x00, 0x04, 0x02, 0x16, 0x08, 0x40, 0x33, 0x20, 0xCD,</div><div class='add'>+0x00, 0x34, 0x02, 0xD0, 0x08, 0x40, 0x37, 0x08, 0x81, 0x20, 0x05, 0x02, 0xD0,</div><div class='add'>+0x04, 0x40, 0x00, 0x00, 0xCD, 0x00, 0x34, 0x00, 0x50, 0x0C, 0x40, 0x43, 0x20,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA0, 0x36, 0x00, 0xDF, 0x00, 0x7C,</div><div class='add'>+0x00, 0xF0, 0x0D, 0xC2, 0x24, 0x00, 0xD3, 0x00, 0x6C, 0x00, 0x30, 0x0D, 0xC0,</div><div class='add'>+0x07, 0x00, 0x13, 0x00, 0x4C, 0x00, 0x30, 0x01, 0xC0, 0x37, 0x00, 0xDF, 0x00,</div><div class='add'>+0x7C, 0x00, 0xF0, 0x09, 0xC0, 0x37, 0x00, 0x13, 0x40, 0x4C, 0x03, 0xF0, 0x05,</div><div class='add'>+0xC0, 0x04, 0x00, 0xDF, 0x00, 0x7C, 0x03, 0x74, 0x0D, 0xC0, 0x07, 0x40, 0x08,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0xA8, 0x3F, 0x00, 0xFF, 0x00, 0xFC, 0x02,</div><div class='add'>+0xF0, 0x0F, 0xC8, 0x2B, 0x08, 0xFF, 0x20, 0xFC, 0x02, 0xF0, 0x0E, 0xC0, 0x2F,</div><div class='add'>+0x00, 0xBF, 0x00, 0xFC, 0x02, 0xF0, 0x0B, 0xC2, 0x2F, 0x00, 0xFF, 0x00, 0xFC,</div><div class='add'>+0x02, 0xF0, 0x0B, 0xC0, 0x3F, 0x00, 0xBF, 0x00, 0xFC, 0x03, 0xF0, 0x0F, 0xC0,</div><div class='add'>+0x0F, 0x00, 0xFF, 0x00, 0xFC, 0x00, 0xB0, 0x0F, 0xC0, 0x17, 0x22, 0x0E, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x03, 0xA0, 0x4F, 0x00, 0x33, 0x01, 0xCC, 0x24, 0x30,</div><div class='add'>+0x13, 0xC0, 0x2C, 0x02, 0xF3, 0x00, 0x8C, 0x07, 0x30, 0xCF, 0xC0, 0x2C, 0x40,</div><div class='add'>+0x33, 0x08, 0xCC, 0x23, 0x72, 0xC7, 0xC0, 0xCE, 0x00, 0x33, 0x04, 0xDC, 0x00,</div><div class='add'>+0x30, 0x13, 0xC0, 0xCF, 0x00, 0x3F, 0x01, 0xED, 0x04, 0x30, 0x13, 0xC0, 0x4C,</div><div class='add'>+0x00, 0x33, 0x01, 0xCC, 0x04, 0x30, 0x13, 0xC0, 0x0C, 0x00, 0x0E, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x01, 0x00, 0x03, 0x21, 0x11, 0x00, 0x44, 0x00, 0x10, 0x04,</div><div class='add'>+0x40, 0x24, 0x09, 0xF1, 0x00, 0x44, 0x03, 0x30, 0x21, 0x40, 0xB0, 0x05, 0x01,</div><div class='add'>+0x26, 0x05, 0x3B, 0x30, 0xE1, 0x40, 0x05, 0x21, 0x51, 0x0B, 0x44, 0x18, 0x15,</div><div class='add'>+0x41, 0xC0, 0x23, 0x00, 0x1D, 0x00, 0x44, 0x82, 0x10, 0x01, 0x42, 0x44, 0x00,</div><div class='add'>+0x11, 0x80, 0x44, 0x00, 0x10, 0x01, 0x40, 0x04, 0x20, 0x0C, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x11, 0xA0, 0x03, 0x04, 0x11, 0x01, 0x04, 0x12, 0x10, 0x00, 0x40,</div><div class='add'>+0x00, 0x00, 0xC1, 0x00, 0x64, 0x53, 0x90, 0x3C, 0x48, 0x24, 0x02, 0x01, 0x06,</div><div class='add'>+0x25, 0x83, 0xD0, 0x05, 0x40, 0x00, 0x00, 0x09, 0x00, 0x34, 0x48, 0x90, 0x00,</div><div class='add'>+0x41, 0x03, 0x01, 0x89, 0x00, 0x44, 0x00, 0x90, 0x01, 0x40, 0x46, 0x00, 0x89,</div><div class='add'>+0x00, 0x24, 0x02, 0x10, 0x08, 0x40, 0x45, 0x80, 0x0E, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x03, 0xA8, 0x05, 0x00, 0x11, 0x40, 0x04, 0x02, 0x10, 0x05, 0x40, 0x04,</div><div class='add'>+0x12, 0xC1, 0x00, 0x64, 0x03, 0x14, 0x09, 0x40, 0x34, 0x02, 0x11, 0x01, 0x64,</div><div class='add'>+0x07, 0x10, 0x01, 0x40, 0x45, 0x04, 0x59, 0x20, 0x64, 0x44, 0x92, 0x11, 0x42,</div><div class='add'>+0x27, 0x00, 0x8C, 0x00, 0x44, 0x02, 0x98, 0x11, 0x00, 0x06, 0x00, 0x89, 0x00,</div><div class='add'>+0x24, 0x02, 0x10, 0x08, 0x40, 0x0D, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0xA0, 0x37, 0x40, 0x43, 0x00, 0x4C, 0x04, 0x30, 0x21, 0xC1, 0x64, 0x00,</div><div class='add'>+0xD3, 0x00, 0x2D, 0x03, 0xB0, 0x0D, 0xC4, 0xC0, 0x40, 0x13, 0x00, 0x6C, 0x07,</div><div class='add'>+0xF2, 0x0D, 0xC0, 0x84, 0x40, 0x5B, 0x81, 0x7C, 0x0C, 0xB1, 0x51, 0xE0, 0x07,</div><div class='add'>+0x00, 0x1F, 0x00, 0x4C, 0x01, 0xB0, 0x08, 0xC0, 0x12, 0x18, 0x1B, 0x01, 0x6C,</div><div class='add'>+0x04, 0x30, 0x11, 0xC0, 0x09, 0x20, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07,</div><div class='add'>+0x88, 0x3D, 0x20, 0x7F, 0x00, 0xFC, 0x24, 0xF0, 0x07, 0xC0, 0x73, 0x00, 0xFF,</div><div class='add'>+0x00, 0xDC, 0x02, 0xF0, 0x26, 0xC0, 0x0F, 0x30, 0x3F, 0x20, 0x9C, 0x03, 0xF0,</div><div class='add'>+0x05, 0xC0, 0x0D, 0x00, 0x77, 0x03, 0xDC, 0x00, 0x72, 0x03, 0xC0, 0x2D, 0x02,</div><div class='add'>+0x3F, 0x08, 0xDC, 0x03, 0x74, 0x0B, 0xC0, 0x1D, 0x18, 0x36, 0x49, 0xDC, 0x24,</div><div class='add'>+0xF0, 0x93, 0xC0, 0x1E, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x08,</div><div class='add'>+0x75, 0x00, 0x53, 0x10, 0x4C, 0x06, 0x32, 0x01, 0xCA, 0x24, 0x00, 0xD3, 0x00,</div><div class='add'>+0x4D, 0x03, 0x30, 0x0D, 0xC0, 0x24, 0x00, 0x13, 0x02, 0x6C, 0x02, 0x30, 0x0D,</div><div class='add'>+0xC1, 0x86, 0x00, 0x4F, 0x50, 0xCC, 0x18, 0x30, 0x01, 0xC8, 0x07, 0x40, 0x93,</div><div class='add'>+0x05, 0x7C, 0x01, 0xF0, 0x09, 0xC0, 0x14, 0x04, 0x93, 0x11, 0x4C, 0x46, 0x30,</div><div class='add'>+0x59, 0xC0, 0x08, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0xA0, 0x74,</div><div class='add'>+0x00, 0x51, 0x80, 0x44, 0x06, 0x12, 0x05, 0x40, 0x34, 0x09, 0xF1, 0x00, 0x44,</div><div class='add'>+0x0B, 0x10, 0xBD, 0x40, 0xA4, 0x02, 0x35, 0x00, 0x44, 0x00, 0x10, 0x7C, 0x40,</div><div class='add'>+0x04, 0x06, 0x5D, 0x11, 0x2C, 0x08, 0x10, 0x11, 0x00, 0x67, 0x08, 0x9B, 0x23,</div><div class='add'>+0x34, 0x2B, 0xD0, 0xA9, 0x40, 0x94, 0x04, 0x91, 0x03, 0x44, 0x0E, 0x10, 0x39,</div><div class='add'>+0x40, 0x4C, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x20, 0x04, 0x00,</div><div class='add'>+0x89, 0x00, 0x04, 0x01, 0x10, 0x09, 0x40, 0x60, 0x00, 0xC1, 0x01, 0x04, 0x4B,</div><div class='add'>+0x14, 0x3C, 0x40, 0xA0, 0x00, 0x11, 0x00, 0x24, 0x03, 0x18, 0x24, 0x40, 0x06,</div><div class='add'>+0x08, 0x8D, 0x02, 0x14, 0x00, 0x11, 0x10, 0x48, 0x53, 0x02, 0x45, 0x00, 0x34,</div><div class='add'>+0x00, 0xD0, 0x04, 0x40, 0x61, 0x00, 0x41, 0x02, 0x04, 0x09, 0x10, 0x04, 0x02,</div><div class='add'>+0x1C, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x48, 0x00, 0xB9,</div><div class='add'>+0x09, 0x84, 0x0D, 0x10, 0x1E, 0x42, 0xF8, 0x00, 0xE1, 0x01, 0xC4, 0x87, 0x14,</div><div class='add'>+0x1C, 0x41, 0x68, 0x02, 0xA5, 0x01, 0x84, 0x07, 0x10, 0x92, 0x50, 0x48, 0x20,</div><div class='add'>+0xAD, 0x21, 0x36, 0x84, 0x18, 0x12, 0x40, 0x7B, 0x00, 0x6D, 0x01, 0xB4, 0x06,</div><div class='add'>+0xD0, 0x97, 0x40, 0x6D, 0x00, 0x61, 0x09, 0x84, 0x25, 0x10, 0x16, 0x40, 0x10,</div><div class='add'>+0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x18, 0x00, 0x40, 0x8B, 0x08,</div><div class='add'>+0x4C, 0x13, 0x30, 0x08, 0xC0, 0x00, 0x42, 0xD3, 0x10, 0x0C, 0x03, 0x30, 0x0C,</div><div class='add'>+0x40, 0x20, 0x02, 0x83, 0x00, 0x2C, 0x03, 0x12, 0x04, 0xC2, 0x02, 0x00, 0x8F,</div><div class='add'>+0x08, 0x1C, 0x12, 0x30, 0x00, 0xE5, 0x13, 0x00, 0xC7, 0x00, 0x3C, 0x20, 0xF0,</div><div class='add'>+0x04, 0xC0, 0x21, 0x00, 0xD3, 0x08, 0x4C, 0x23, 0x30, 0x0D, 0xC0, 0x48, 0x40,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x38, 0x0D, 0x00, 0xA7, 0x08, 0xFC,</div><div class='add'>+0x03, 0xF0, 0x0F, 0xC8, 0x1F, 0x00, 0xFF, 0x80, 0xFD, 0x03, 0xF0, 0x0F, 0xC0,</div><div class='add'>+0x3F, 0x0A, 0xBE, 0x80, 0xFC, 0x03, 0xF4, 0x03, 0xC2, 0x0F, 0x02, 0xEF, 0x20,</div><div class='add'>+0xEC, 0x02, 0xF0, 0x83, 0xC0, 0x3F, 0x02, 0xFB, 0x00, 0xFC, 0x02, 0xF1, 0x06,</div><div class='add'>+0xC0, 0x2A, 0x02, 0xFF, 0x08, 0xFC, 0x23, 0xF0, 0x8F, 0xC0, 0x0B, 0x60, 0x06,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xA0, 0x37, 0x00, 0xCF, 0x00, 0x5C, 0x05,</div><div class='add'>+0x30, 0x09, 0xC0, 0x24, 0x00, 0xDF, 0x0D, 0x4C, 0x03, 0xF0, 0x0D, 0xC0, 0x27,</div><div class='add'>+0x00, 0x13, 0x00, 0xCD, 0x03, 0x34, 0x0D, 0xD8, 0x05, 0x10, 0x13, 0x00, 0x7C,</div><div class='add'>+0x02, 0x70, 0x01, 0xC4, 0x13, 0x00, 0x53, 0x00, 0x7C, 0x01, 0xF0, 0x0D, 0xD0,</div><div class='add'>+0x34, 0x00, 0x5F, 0x00, 0x4E, 0x01, 0x30, 0x15, 0xC0, 0x54, 0x00, 0x0E, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x12, 0x80, 0x39, 0x00, 0xED, 0x80, 0x84, 0x01, 0x10,</div><div class='add'>+0x0E, 0x40, 0x38, 0x00, 0xCD, 0x10, 0x84, 0x02, 0xD0, 0x0E, 0x40, 0x2B, 0x10,</div><div class='add'>+0x81, 0x04, 0x84, 0x03, 0x10, 0x04, 0xC0, 0x0A, 0x00, 0x21, 0x00, 0xB4, 0x02,</div><div class='add'>+0x11, 0x06, 0x48, 0x3B, 0x00, 0x61, 0x00, 0xB4, 0x03, 0xD2, 0x0F, 0x40, 0x38,</div><div class='add'>+0x20, 0x6D, 0x00, 0x84, 0x01, 0x10, 0x06, 0x40, 0x48, 0x20, 0x06, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x04, 0x00, 0x79, 0x00, 0xED, 0x01, 0x94, 0x07, 0x10, 0x1A,</div><div class='add'>+0x50, 0x68, 0x00, 0xED, 0x05, 0x84, 0x47, 0xD8, 0x1E, 0x40, 0x6F, 0x00, 0xA1,</div><div class='add'>+0x1D, 0x85, 0x07, 0x10, 0x1E, 0x40, 0xC9, 0x18, 0xE1, 0x01, 0xF4, 0x0E, 0x50,</div><div class='add'>+0x12, 0x40, 0x5B, 0x00, 0xE1, 0x01, 0xB4, 0x05, 0xD0, 0x1E, 0x42, 0x78, 0x00,</div><div class='add'>+0xED, 0x01, 0x84, 0x87, 0x10, 0x1E, 0x40, 0x0C, 0x00, 0x04, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x16, 0x28, 0x73, 0x02, 0xDD, 0x00, 0x04, 0x03, 0x10, 0x0C, 0x40,</div><div class='add'>+0xB0, 0x00, 0xCD, 0x00, 0x04, 0x07, 0xD0, 0x0D, 0x40, 0xA3, 0x01, 0xC1, 0x40,</div><div class='add'>+0x04, 0x09, 0x10, 0x8D, 0x40, 0x76, 0x00, 0xC1, 0x03, 0x34, 0x0F, 0x10, 0x88,</div><div class='add'>+0x42, 0x33, 0x00, 0xC1, 0x00, 0x34, 0x07, 0xD0, 0x0C, 0x40, 0x30, 0x00, 0xCD,</div><div class='add'>+0x00, 0x04, 0x03, 0x10, 0x0C, 0x40, 0x48, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x17, 0xA0, 0x95, 0x00, 0x5F, 0x00, 0x5C, 0x01, 0x34, 0x05, 0xC0, 0x1C,</div><div class='add'>+0x01, 0x5F, 0x00, 0x4C, 0x01, 0xF0, 0x07, 0xC0, 0xDF, 0x44, 0x73, 0x00, 0xCC,</div><div class='add'>+0x31, 0x30, 0x17, 0xC2, 0x9D, 0x40, 0x73, 0x07, 0xFC, 0x29, 0x72, 0x16, 0xC0,</div><div class='add'>+0x17, 0x50, 0x53, 0x20, 0x7C, 0x01, 0xF1, 0x05, 0xC0, 0x14, 0x10, 0x5F, 0x00,</div><div class='add'>+0x4D, 0x01, 0x34, 0x05, 0xD0, 0x5C, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x12, 0x08, 0x05, 0x04, 0x1D, 0x00, 0x7C, 0x00, 0xF2, 0x01, 0xC8, 0x03, 0x04,</div><div class='add'>+0x1F, 0x40, 0x7D, 0x08, 0xF0, 0x01, 0xC0, 0x07, 0x10, 0x1F, 0x20, 0x7C, 0x00,</div><div class='add'>+0xF2, 0x11, 0xD0, 0x07, 0x04, 0x0F, 0x12, 0x3C, 0x08, 0xF1, 0x41, 0xC0, 0x07,</div><div class='add'>+0x00, 0x1F, 0x00, 0x7C, 0x20, 0xF0, 0x11, 0xC8, 0x07, 0x00, 0x1F, 0x00, 0x7C,</div><div class='add'>+0x00, 0xF0, 0x01, 0xC0, 0x4B, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10,</div><div class='add'>+0x08, 0x25, 0x00, 0x9F, 0x02, 0x4C, 0x02, 0xF0, 0x09, 0xC0, 0x24, 0x02, 0x90,</div><div class='add'>+0x01, 0x7C, 0x02, 0x34, 0x09, 0xC0, 0x24, 0x00, 0x83, 0x00, 0x4C, 0x02, 0x30,</div><div class='add'>+0x09, 0xC0, 0x64, 0x00, 0x93, 0x05, 0x4C, 0x06, 0x10, 0x09, 0xC8, 0x24, 0x00,</div><div class='add'>+0x93, 0x00, 0x64, 0x0A, 0x30, 0x09, 0xC0, 0xE4, 0x10, 0x9F, 0x02, 0x4D, 0x0A,</div><div class='add'>+0x30, 0x59, 0xC0, 0x43, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00,</div><div class='add'>+0xA6, 0x10, 0x9D, 0x00, 0x45, 0x0A, 0xD0, 0x08, 0xC0, 0x66, 0x00, 0x91, 0x01,</div><div class='add'>+0x34, 0x1A, 0x12, 0x09, 0x48, 0xA4, 0x02, 0x95, 0x00, 0x44, 0x02, 0x12, 0x99,</div><div class='add'>+0x51, 0x24, 0x08, 0x91, 0x25, 0x44, 0xA6, 0x10, 0x09, 0x40, 0x20, 0x00, 0x91,</div><div class='add'>+0x02, 0x04, 0x0A, 0x10, 0x29, 0x50, 0x64, 0x08, 0x9D, 0x42, 0x44, 0x0A, 0x10,</div><div class='add'>+0x39, 0x40, 0x07, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0xA0, 0x24,</div><div class='add'>+0x80, 0xBD, 0x00, 0xC4, 0x02, 0xD0, 0x0B, 0x40, 0x24, 0x40, 0x95, 0x08, 0x74,</div><div class='add'>+0x22, 0x14, 0x09, 0x48, 0xB0, 0x00, 0xD9, 0x04, 0x24, 0x02, 0x14, 0x09, 0x40,</div><div class='add'>+0x24, 0x42, 0xD1, 0x00, 0x45, 0x42, 0x50, 0x09, 0x52, 0x24, 0x40, 0xA1, 0x00,</div><div class='add'>+0xF4, 0x02, 0x10, 0x2A, 0x42, 0x2C, 0x00, 0xAD, 0x00, 0xA4, 0x02, 0x10, 0x0B,</div><div class='add'>+0x42, 0x63, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x20, 0x68, 0x00,</div><div class='add'>+0xED, 0x00, 0x84, 0x06, 0xD0, 0x0B, 0x40, 0x22, 0x01, 0x85, 0x04, 0x74, 0x02,</div><div class='add'>+0x10, 0x48, 0x40, 0x20, 0x01, 0x8D, 0x04, 0x25, 0x12, 0x10, 0x48, 0x40, 0x60,</div><div class='add'>+0x20, 0x81, 0x84, 0x05, 0x12, 0x14, 0x08, 0x40, 0x2C, 0x00, 0xA1, 0x01, 0xD4,</div><div class='add'>+0x02, 0x10, 0x0A, 0x42, 0x68, 0x80, 0xAD, 0x01, 0xA4, 0x06, 0x10, 0x1A, 0x40,</div><div class='add'>+0x43, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xB8, 0x86, 0x02, 0x1F,</div><div class='add'>+0x0A, 0x0D, 0x28, 0xF0, 0xA2, 0xC0, 0x94, 0x02, 0x17, 0x0A, 0x7C, 0x28, 0x30,</div><div class='add'>+0xA5, 0xD0, 0x84, 0x02, 0x1B, 0x0A, 0x2C, 0x28, 0x31, 0xA1, 0xD0, 0x80, 0x22,</div><div class='add'>+0x13, 0x00, 0x4C, 0x28, 0x70, 0xA1, 0xC0, 0x84, 0x02, 0x13, 0x0A, 0x7C, 0x29,</div><div class='add'>+0x30, 0xA1, 0xC0, 0x04, 0x00, 0x0F, 0x0A, 0x2C, 0x28, 0x32, 0xA2, 0xC0, 0x77,</div><div class='add'>+0xC0, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xB8, 0x27, 0x00, 0x9F, 0x00,</div><div class='add'>+0x7C, 0x02, 0xF0, 0x09, 0xC0, 0x2F, 0x02, 0x9B, 0x08, 0xEC, 0x02, 0xF4, 0x8B,</div><div class='add'>+0xC8, 0x2B, 0x02, 0xB7, 0x08, 0xDC, 0x23, 0xF0, 0x8B, 0xC2, 0x2F, 0x00, 0xBF,</div><div class='add'>+0x68, 0xBC, 0x22, 0xF0, 0x0B, 0xC2, 0x27, 0x00, 0x9F, 0x20, 0x6C, 0x02, 0xF4,</div><div class='add'>+0x09, 0xC8, 0x27, 0x00, 0x9F, 0x00, 0x5C, 0x02, 0xF4, 0x09, 0xC0, 0x67, 0x60,</div><div class='add'>+0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xA0, 0x2F, 0x00, 0xF3, 0x28, 0xDC,</div><div class='add'>+0x02, 0xF0, 0x09, 0xC0, 0x2F, 0x42, 0xB3, 0x04, 0xCC, 0x02, 0x30, 0xCF, 0xC0,</div><div class='add'>+0x2B, 0x00, 0xA3, 0x05, 0x4D, 0x16, 0x32, 0x9B, 0xC0, 0xAF, 0x10, 0xB3, 0x05,</div><div class='add'>+0xDC, 0x36, 0x30, 0x0B, 0xC4, 0x2C, 0x00, 0xB3, 0x00, 0xFC, 0x02, 0xF0, 0x8B,</div><div class='add'>+0xC0, 0x3C, 0x18, 0xBF, 0x40, 0xFC, 0x22, 0xF0, 0x0B, 0xC0, 0x63, 0x00, 0x0E,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x07, 0x01, 0x01, 0x04, 0x44, 0x41,</div><div class='add'>+0xD0, 0x01, 0x41, 0x07, 0x02, 0x11, 0x14, 0x44, 0x10, 0x10, 0xC0, 0x40, 0x87,</div><div class='add'>+0x44, 0x11, 0x17, 0x44, 0x5C, 0x14, 0x31, 0x44, 0x47, 0x00, 0x11, 0x22, 0x44,</div><div class='add'>+0x04, 0x10, 0x55, 0x41, 0x44, 0x05, 0x51, 0x14, 0x74, 0x10, 0xD0, 0x41, 0x50,</div><div class='add'>+0x04, 0x00, 0x5D, 0x10, 0x74, 0x01, 0xD0, 0x45, 0x41, 0x73, 0x20, 0x0C, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x21, 0x45, 0x81, 0x04, 0x14, 0x12, 0xD0,</div><div class='add'>+0x08, 0x40, 0x23, 0x00, 0x81, 0x0C, 0x24, 0x52, 0x10, 0x48, 0x44, 0x23, 0x03,</div><div class='add'>+0x81, 0x08, 0x04, 0x22, 0x10, 0x68, 0x40, 0x27, 0x01, 0x89, 0x08, 0x34, 0x1A,</div><div class='add'>+0x14, 0x09, 0x50, 0x24, 0x00, 0x89, 0x24, 0x34, 0x52, 0xD1, 0x48, 0x40, 0x20,</div><div class='add'>+0x00, 0x8D, 0x00, 0x34, 0x02, 0xD0, 0x48, 0x40, 0x43, 0x80, 0x0E, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x18, 0x28, 0x21, 0x00, 0x91, 0x00, 0x44, 0x02, 0xD2, 0x09,</div><div class='add'>+0x40, 0x27, 0x00, 0x91, 0x00, 0x65, 0x02, 0x14, 0x29, 0x40, 0xA7, 0x01, 0x91,</div><div class='add'>+0x11, 0x44, 0x12, 0x10, 0x09, 0x40, 0x67, 0x00, 0x99, 0x06, 0x64, 0x0A, 0x10,</div><div class='add'>+0x19, 0x40, 0x24, 0x40, 0x99, 0x00, 0x74, 0x02, 0xD0, 0x09, 0x40, 0x24, 0x00,</div><div class='add'>+0x9D, 0x00, 0x74, 0x02, 0xD0, 0x09, 0x40, 0x63, 0x20, 0x06, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x05, 0x20, 0x25, 0x00, 0x93, 0x00, 0x5C, 0x0A, 0xF0, 0x09, 0xC0,</div><div class='add'>+0xA7, 0x01, 0x93, 0x00, 0x6D, 0x06, 0x30, 0x09, 0xC0, 0x27, 0x00, 0x93, 0x01,</div><div class='add'>+0x4C, 0x0A, 0x30, 0x69, 0xC0, 0x23, 0x24, 0x9B, 0x00, 0x7C, 0x06, 0x32, 0x18,</div><div class='add'>+0xC0, 0x24, 0x00, 0x9A, 0x02, 0x7C, 0x02, 0xF0, 0x09, 0xC0, 0x24, 0x80, 0x9F,</div><div class='add'>+0x02, 0x7C, 0x0A, 0xF0, 0x29, 0xC0, 0x17, 0xA0, 0x04, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x16, 0x08, 0x25, 0x10, 0x9F, 0x00, 0x7C, 0x02, 0xF0, 0x09, 0xC0, 0x23,</div><div class='add'>+0x00, 0x8F, 0x00, 0x5C, 0x4E, 0xF0, 0x09, 0xC0, 0x27, 0x44, 0x8F, 0x40, 0x7C,</div><div class='add'>+0x02, 0xF2, 0x09, 0xC2, 0x27, 0x40, 0x87, 0x01, 0x54, 0xCA, 0xF0, 0x09, 0xC0,</div><div class='add'>+0x27, 0x00, 0x97, 0x00, 0x7C, 0x02, 0xF1, 0x09, 0xC0, 0x27, 0x0C, 0x9F, 0x00,</div><div class='add'>+0x7C, 0x02, 0xF0, 0x09, 0xC0, 0x53, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x14, 0x08, 0x05, 0x04, 0x1F, 0x04, 0x4C, 0x08, 0xB4, 0x01, 0xD0, 0x04, 0x01,</div><div class='add'>+0x13, 0x00, 0x4C, 0x00, 0x30, 0x01, 0xC0, 0x00, 0x00, 0x13, 0x02, 0x4C, 0x08,</div><div class='add'>+0x30, 0x21, 0xC0, 0x84, 0x00, 0x13, 0x01, 0x0C, 0x00, 0xB4, 0x01, 0xC0, 0x07,</div><div class='add'>+0x00, 0x1F, 0x06, 0x4D, 0x00, 0x30, 0x01, 0xC0, 0x07, 0x02, 0x1F, 0x02, 0x4D,</div><div class='add'>+0x48, 0x34, 0x21, 0xD0, 0x50, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10,</div><div class='add'>+0x00, 0xDC, 0x00, 0x6D, 0x00, 0xC4, 0x05, 0x30, 0x05, 0x40, 0x1C, 0x00, 0x51,</div><div class='add'>+0x00, 0xC5, 0x05, 0x10, 0x07, 0x48, 0x1C, 0x00, 0x51, 0x20, 0x44, 0x01, 0x50,</div><div class='add'>+0x67, 0x40, 0x1C, 0x48, 0x71, 0x10, 0xEC, 0x09, 0x10, 0x15, 0x40, 0x13, 0x00,</div><div class='add'>+0x7D, 0x83, 0xC4, 0x01, 0x00, 0x17, 0x40, 0x1F, 0x00, 0x7D, 0x00, 0xC4, 0x09,</div><div class='add'>+0x10, 0x07, 0x40, 0x50, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xA0,</div><div class='add'>+0xF2, 0x02, 0x8D, 0x02, 0x04, 0x07, 0x50, 0x0C, 0x40, 0xB0, 0x40, 0xC5, 0x00,</div><div class='add'>+0x44, 0x0F, 0x10, 0x8C, 0x40, 0x20, 0x00, 0xC1, 0x00, 0x45, 0x03, 0x18, 0x6C,</div><div class='add'>+0x44, 0x30, 0x20, 0xC1, 0x01, 0x04, 0x07, 0x10, 0x18, 0x40, 0x33, 0x08, 0xCD,</div><div class='add'>+0x03, 0x04, 0x05, 0x10, 0x89, 0x40, 0x33, 0x00, 0xCD, 0x00, 0x05, 0x0B, 0x10,</div><div class='add'>+0x0C, 0x40, 0x50, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x80, 0x38,</div><div class='add'>+0x10, 0x2D, 0x04, 0x84, 0x47, 0x50, 0xDF, 0x42, 0x08, 0x04, 0xE5, 0x00, 0x84,</div><div class='add'>+0x41, 0x10, 0x1E, 0x40, 0x2C, 0x00, 0xF1, 0x00, 0x84, 0x13, 0x50, 0x1E, 0x50,</div><div class='add'>+0x3C, 0x05, 0x41, 0x20, 0xA4, 0x0B, 0x10, 0x0E, 0x41, 0x3B, 0x00, 0xED, 0x03,</div><div class='add'>+0x84, 0x0D, 0x11, 0x02, 0x40, 0x0B, 0x00, 0xED, 0x01, 0x84, 0x07, 0x10, 0x1E,</div><div class='add'>+0x44, 0x14, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x18, 0x79, 0x00,</div><div class='add'>+0xAF, 0x07, 0xCD, 0x07, 0x70, 0x1E, 0xC0, 0x40, 0x40, 0x87, 0x89, 0x8C, 0x04,</div><div class='add'>+0x34, 0x1E, 0x10, 0x78, 0x40, 0xE3, 0x31, 0xCC, 0x0F, 0x34, 0x1E, 0xC0, 0xE8,</div><div class='add'>+0x00, 0x63, 0x01, 0x0C, 0x04, 0x34, 0x1A, 0xC0, 0x7B, 0x00, 0xFF, 0x01, 0xCC,</div><div class='add'>+0x06, 0x34, 0x12, 0xC0, 0x4B, 0x00, 0xFD, 0x01, 0xCC, 0x07, 0x30, 0x1F, 0xC0,</div><div class='add'>+0x54, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xB8, 0x35, 0x00, 0x1F,</div><div class='add'>+0x20, 0x7C, 0x03, 0x30, 0x2C, 0xC0, 0x07, 0x00, 0xDB, 0x04, 0x3C, 0x00, 0xF2,</div><div class='add'>+0x05, 0xC0, 0x37, 0x00, 0xDF, 0x06, 0x7C, 0x5B, 0xB0, 0x88, 0xC0, 0x13, 0x00,</div><div class='add'>+0x5F, 0x20, 0x7C, 0x00, 0xF0, 0x0F, 0xC0, 0xB7, 0x0D, 0xDF, 0x00, 0xFC, 0x80,</div><div class='add'>+0xF0, 0x09, 0xC0, 0x07, 0x00, 0xDF, 0x20, 0x7C, 0x01, 0xF0, 0x09, 0xC2, 0x43,</div><div class='add'>+0x60, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x20, 0x7D, 0x00, 0x2F, 0x01,</div><div class='add'>+0xDC, 0x13, 0xF0, 0x3F, 0xC0, 0x4C, 0x10, 0xF7, 0x01, 0xDC, 0x04, 0x30, 0x1F,</div><div class='add'>+0xC8, 0x6C, 0x00, 0xF3, 0x01, 0xCC, 0x07, 0x31, 0x1B, 0xD0, 0x6D, 0x00, 0x73,</div><div class='add'>+0x01, 0x9D, 0x04, 0xB2, 0x4F, 0xC0, 0x7C, 0x00, 0xF3, 0x01, 0xDC, 0x05, 0x30,</div><div class='add'>+0x1F, 0xC0, 0x4C, 0x00, 0xFF, 0x01, 0xFC, 0x07, 0xF0, 0x1F, 0xC0, 0x03, 0x08,</div><div class='add'>+0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x00, 0x39, 0x00, 0x27, 0x00, 0x84,</div><div class='add'>+0x0A, 0xD0, 0x8F, 0x41, 0x0C, 0x00, 0xE1, 0x00, 0xEC, 0x00, 0x12, 0x4A, 0x40,</div><div class='add'>+0x08, 0x02, 0xE0, 0x00, 0x84, 0x13, 0xA1, 0x0B, 0x40, 0x38, 0x00, 0x61, 0x08,</div><div class='add'>+0x84, 0x02, 0x50, 0x0F, 0x40, 0x3C, 0x02, 0xA7, 0x00, 0xC4, 0x21, 0x12, 0x07,</div><div class='add'>+0x40, 0x08, 0x00, 0xED, 0x00, 0xB4, 0x03, 0xD0, 0x2E, 0x40, 0x57, 0x20, 0x06,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x39, 0x00, 0xAD, 0x00, 0x94, 0x23,</div><div class='add'>+0xD0, 0x0E, 0x40, 0x08, 0x00, 0x85, 0x00, 0x94, 0x40, 0x10, 0x0E, 0x40, 0x3C,</div><div class='add'>+0x00, 0xE1, 0x08, 0x84, 0x03, 0x80, 0x02, 0x40, 0x29, 0x02, 0x21, 0x00, 0xD4,</div><div class='add'>+0x00, 0x14, 0x2E, 0x40, 0x38, 0x00, 0x61, 0x00, 0x94, 0x02, 0x10, 0x06, 0x40,</div><div class='add'>+0x08, 0x00, 0xED, 0x00, 0xB4, 0x03, 0xD0, 0x0E, 0x40, 0x03, 0x00, 0x04, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x02, 0x28, 0x35, 0x00, 0x05, 0x00, 0x04, 0x02, 0xD0,</div><div class='add'>+0x1C, 0x40, 0x00, 0x00, 0xC1, 0x00, 0x24, 0x00, 0x12, 0x31, 0x40, 0x30, 0x00,</div><div class='add'>+0xC1, 0x00, 0x05, 0x83, 0x90, 0x10, 0x40, 0x10, 0x04, 0x41, 0x61, 0x04, 0x04,</div><div class='add'>+0x54, 0x9C, 0x44, 0x30, 0x08, 0x95, 0x00, 0x04, 0x00, 0x10, 0x0C, 0x40, 0x00,</div><div class='add'>+0x00, 0xCD, 0x00, 0x34, 0x03, 0xD0, 0x08, 0x40, 0x13, 0x20, 0x0C, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x15, 0xA0, 0x35, 0x00, 0xFF, 0x00, 0x5C, 0x03, 0xF0, 0x1F,</div><div class='add'>+0xD0, 0x24, 0x00, 0xD7, 0x00, 0x1C, 0x04, 0x30, 0x8D, 0xD5, 0x60, 0x00, 0xD3,</div><div class='add'>+0x0A, 0xCC, 0x0B, 0xB0, 0x83, 0xD1, 0x39, 0x48, 0x13, 0x10, 0x5D, 0x02, 0x30,</div><div class='add'>+0x0D, 0xC4, 0xA4, 0x00, 0xD3, 0x00, 0x5C, 0x09, 0x30, 0x0D, 0xC0, 0x00, 0x00,</div><div class='add'>+0xDF, 0x00, 0x7C, 0x03, 0xF0, 0x0D, 0xC0, 0x57, 0x20, 0x06, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x05, 0x08, 0x27, 0x00, 0x5F, 0x00, 0x7C, 0x03, 0xF0, 0x0D, 0xC0,</div><div class='add'>+0x07, 0x02, 0xDF, 0x20, 0x5C, 0x08, 0xF4, 0x2D, 0xC0, 0xE7, 0x40, 0xDF, 0x08,</div><div class='add'>+0x7C, 0x03, 0xF0, 0x09, 0xC0, 0x37, 0x02, 0x1F, 0x20, 0x7C, 0xA2, 0x74, 0x0D,</div><div class='add'>+0xC0, 0x37, 0x01, 0xD7, 0x40, 0x7C, 0x11, 0xF0, 0x2D, 0xC0, 0x07, 0x00, 0x9F,</div><div class='add'>+0x00, 0x7C, 0x02, 0xF0, 0x0D, 0xC0, 0x07, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x80, 0x08, 0x1F, 0x00, 0xB3, 0x00, 0xCC, 0x01, 0xF0, 0x0F, 0xC0, 0x0B,</div><div class='add'>+0x00, 0xB2, 0x00, 0xCC, 0x00, 0x30, 0x1F, 0xC0, 0x2C, 0x40, 0x97, 0x00, 0x7C,</div><div class='add'>+0x43, 0x32, 0x53, 0xD0, 0x2E, 0x00, 0x13, 0x00, 0xFC, 0x20, 0x20, 0x1F, 0xC0,</div><div class='add'>+0x2F, 0x00, 0xFD, 0x00, 0xEC, 0x00, 0xF0, 0x0F, 0xC0, 0x0C, 0x10, 0x72, 0x00,</div><div class='add'>+0xFC, 0x27, 0xF0, 0x07, 0xC0, 0x03, 0x22, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x81, 0x00, 0x06, 0x08, 0x11, 0x00, 0x45, 0x0B, 0xD0, 0x0D, 0xC8, 0x45, 0x00,</div><div class='add'>+0xD1, 0x00, 0x44, 0x04, 0x10, 0xBD, 0x41, 0x64, 0x20, 0x91, 0x08, 0x34, 0x03,</div><div class='add'>+0x12, 0x09, 0x40, 0x15, 0x00, 0x11, 0x01, 0x7C, 0x00, 0x50, 0x1D, 0x40, 0x77,</div><div class='add'>+0x00, 0xDD, 0x09, 0x44, 0x04, 0xD0, 0x3D, 0x48, 0xC4, 0x04, 0xD1, 0x00, 0x74,</div><div class='add'>+0x05, 0xD0, 0xBD, 0x40, 0x07, 0x02, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,</div><div class='add'>+0xA0, 0x76, 0x00, 0x41, 0x08, 0x44, 0x23, 0xD0, 0x0D, 0x40, 0x47, 0x00, 0xC5,</div><div class='add'>+0x00, 0x44, 0x0C, 0x10, 0x0D, 0x40, 0xE5, 0x00, 0xD1, 0x00, 0x74, 0x03, 0x12,</div><div class='add'>+0x00, 0x41, 0x26, 0x00, 0x11, 0x23, 0x34, 0x00, 0xD8, 0x4D, 0x40, 0x27, 0x01,</div><div class='add'>+0xDD, 0x00, 0x64, 0x44, 0xD0, 0x6C, 0x40, 0x44, 0x80, 0xD5, 0x01, 0x74, 0x03,</div><div class='add'>+0xD0, 0x0D, 0x40, 0x07, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x20,</div><div class='add'>+0x70, 0x00, 0x41, 0x00, 0x04, 0x03, 0xD0, 0x0C, 0x40, 0x01, 0x00, 0xC5, 0x00,</div><div class='add'>+0x04, 0x80, 0x14, 0x0C, 0x50, 0x21, 0x00, 0xC1, 0x00, 0x74, 0x83, 0x18, 0x08,</div><div class='add'>+0x50, 0x31, 0x00, 0x01, 0x00, 0x34, 0x02, 0xD0, 0x0C, 0x40, 0x33, 0x00, 0xCD,</div><div class='add'>+0x00, 0x04, 0x00, 0xD0, 0x0C, 0x40, 0x00, 0x80, 0x85, 0x01, 0x34, 0x02, 0xD0,</div><div class='add'>+0x0C, 0x40, 0x43, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x98, 0x36,</div><div class='add'>+0x00, 0x93, 0x80, 0x4C, 0x81, 0xF0, 0x0F, 0xC0, 0x07, 0x20, 0xB7, 0x00, 0x4D,</div><div class='add'>+0x00, 0x30, 0x0C, 0x44, 0x25, 0x00, 0xB3, 0x00, 0xFC, 0x03, 0x31, 0x01, 0xC4,</div><div class='add'>+0x22, 0x00, 0x13, 0x00, 0x7C, 0x00, 0xF0, 0x0D, 0xC2, 0x2F, 0x00, 0x4F, 0x40,</div><div class='add'>+0x6C, 0x00, 0xF0, 0x0D, 0xC0, 0x04, 0x00, 0x57, 0x00, 0x7C, 0x03, 0xF0, 0x05,</div><div class='add'>+0xC4, 0x03, 0xC0, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0xB8, 0x3F, 0x00,</div><div class='add'>+0x3F, 0x40, 0xFC, 0x03, 0xF0, 0x0F, 0xC0, 0x0F, 0x00, 0xFB, 0x40, 0xFC, 0x00,</div><div class='add'>+0xF0, 0x0F, 0xC0, 0x2A, 0x00, 0xBF, 0x00, 0xFC, 0x03, 0xF0, 0x03, 0x40, 0x1F,</div><div class='add'>+0x40, 0x3F, 0x00, 0xD8, 0x00, 0x72, 0x0F, 0xC0, 0x3F, 0x00, 0xFF, 0x00, 0xFC,</div><div class='add'>+0x00, 0xF0, 0x0F, 0xC8, 0x0F, 0x08, 0xFB, 0x00, 0xFC, 0x03, 0xF0, 0x0F, 0xC0,</div><div class='add'>+0x17, 0x60, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xA0, 0x7F, 0x00, 0xFF,</div><div class='add'>+0x01, 0xFC, 0x13, 0x32, 0x8B, 0xC2, 0x2C, 0x09, 0xFF, 0x01, 0xFC, 0x63, 0x30,</div><div class='add'>+0x4B, 0xC2, 0x7C, 0x00, 0xBF, 0x04, 0xCC, 0x82, 0x30, 0x2F, 0xC1, 0x7C, 0x00,</div><div class='add'>+0xF3, 0x01, 0xFC, 0x43, 0x30, 0x4F, 0x50, 0x28, 0x00, 0xF3, 0x01, 0xFE, 0x07,</div><div class='add'>+0xB0, 0x1F, 0xC0, 0x7C, 0x00, 0xF9, 0x01, 0xFC, 0x03, 0xF0, 0x1F, 0xC0, 0x0F,</div><div class='add'>+0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x08, 0x77, 0x00, 0xDD, 0x01,</div><div class='add'>+0xF4, 0x63, 0x10, 0x81, 0x46, 0xE4, 0x0A, 0xDD, 0x41, 0xF4, 0x0B, 0x50, 0x91,</div><div class='add'>+0x42, 0x74, 0x00, 0x9C, 0x22, 0x44, 0x08, 0x10, 0x2F, 0xC4, 0x34, 0x08, 0xD5,</div><div class='add'>+0x21, 0xF4, 0x0F, 0x41, 0x9F, 0x40, 0xC4, 0x02, 0xD1, 0x01, 0x74, 0x07, 0x10,</div><div class='add'>+0x15, 0x40, 0x74, 0x00, 0xD9, 0x01, 0x74, 0x07, 0xD0, 0x1D, 0x40, 0x0F, 0x20,</div><div class='add'>+0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0xA0, 0x33, 0x28, 0xCD, 0x80, 0x34,</div><div class='add'>+0x13, 0x00, 0x08, 0x48, 0x40, 0x20, 0xCD, 0x80, 0x30, 0x03, 0x12, 0x10, 0x40,</div><div class='add'>+0x30, 0x10, 0x0D, 0x1C, 0x04, 0x76, 0x10, 0x4C, 0x40, 0x33, 0x05, 0xC1, 0x40,</div><div class='add'>+0x34, 0x83, 0x80, 0x0C, 0x40, 0x20, 0x08, 0xC1, 0x80, 0x34, 0x03, 0x90, 0x0D,</div><div class='add'>+0x40, 0x32, 0x00, 0xCD, 0x00, 0x34, 0x03, 0xD0, 0x0C, 0x40, 0x4F, 0x80, 0x0E,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xA8, 0x35, 0x00, 0xDD, 0x00, 0x74, 0x03,</div><div class='add'>+0x11, 0x11, 0x40, 0x64, 0x00, 0xDD, 0x40, 0x64, 0x03, 0x10, 0x11, 0x40, 0x34,</div><div class='add'>+0x20, 0x09, 0x03, 0x04, 0x06, 0x10, 0x0D, 0x44, 0x35, 0x00, 0xD1, 0x00, 0x74,</div><div class='add'>+0x03, 0x90, 0x0D, 0x40, 0x64, 0x04, 0xD1, 0x00, 0x74, 0x03, 0x50, 0x19, 0x40,</div><div class='add'>+0x36, 0x00, 0xDD, 0x00, 0x74, 0x03, 0xD0, 0x0D, 0x00, 0x0F, 0x20, 0x06, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x02, 0xA8, 0x37, 0x00, 0xDF, 0x00, 0x74, 0x03, 0x30,</div><div class='add'>+0x31, 0xC0, 0x44, 0x00, 0xDF, 0x40, 0x7C, 0x03, 0x32, 0x19, 0xC0, 0x34, 0x08,</div><div class='add'>+0x9F, 0x01, 0x4C, 0x04, 0x30, 0x0D, 0xC6, 0x37, 0x00, 0xD1, 0x80, 0x7C, 0x83,</div><div class='add'>+0xA0, 0x0D, 0xC0, 0x64, 0x00, 0xD3, 0x00, 0x74, 0x03, 0xB0, 0x3D, 0xC1, 0x36,</div><div class='add'>+0x00, 0xDF, 0x00, 0x7C, 0x03, 0xD0, 0x0D, 0xC0, 0x83, 0x00, 0x0E, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x07, 0x80, 0x3D, 0x00, 0xFF, 0x00, 0x7C, 0x03, 0xF0, 0x02,</div><div class='add'>+0xC0, 0x07, 0x00, 0xFF, 0x40, 0xFC, 0x03, 0xF0, 0x00, 0x40, 0x3F, 0x00, 0x9F,</div><div class='add'>+0x20, 0x7C, 0x80, 0xF1, 0x0F, 0xC0, 0x3E, 0x00, 0xFD, 0x00, 0xFC, 0x03, 0x72,</div><div class='add'>+0x0F, 0x40, 0x0B, 0x00, 0xFD, 0x00, 0xFC, 0x03, 0xB0, 0x0F, 0x40, 0x3D, 0x00,</div><div class='add'>+0xFB, 0x00, 0xFC, 0x03, 0xF0, 0x0F, 0xC0, 0x1F, 0x20, 0x06, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x02, 0x08, 0x35, 0x00, 0xDF, 0x00, 0x3C, 0x03, 0x30, 0xA9, 0xC0,</div><div class='add'>+0x04, 0x00, 0xD3, 0x60, 0x2C, 0x63, 0x30, 0x09, 0xC0, 0x34, 0x00, 0x9B, 0x20,</div><div class='add'>+0x4C, 0x00, 0x30, 0x8C, 0xC0, 0x34, 0x00, 0xD2, 0x00, 0x3C, 0x03, 0x30, 0x0C,</div><div class='add'>+0xC0, 0x27, 0x00, 0xD7, 0x00, 0x7C, 0x23, 0xF1, 0x2D, 0xC0, 0x37, 0x10, 0xDF,</div><div class='add'>+0x00, 0x7C, 0x03, 0xF0, 0x0D, 0xC0, 0x2B, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x13, 0xA0, 0x34, 0x00, 0xDD, 0x00, 0xF4, 0x03, 0x10, 0x31, 0x40, 0x24,</div><div class='add'>+0x00, 0xD1, 0x00, 0xF4, 0x0B, 0x10, 0x09, 0x44, 0x34, 0x00, 0x9D, 0x00, 0x44,</div><div class='add'>+0x02, 0x12, 0xAF, 0x40, 0x74, 0x20, 0xD1, 0x00, 0xF4, 0x03, 0x10, 0x0F, 0x40,</div><div class='add'>+0x27, 0x00, 0xD1, 0x80, 0x34, 0x0F, 0xD0, 0x0C, 0x40, 0x37, 0x00, 0xDD, 0x00,</div><div class='add'>+0xF4, 0x03, 0xD0, 0x0D, 0x40, 0x4F, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x07, 0xA0, 0x32, 0x00, 0xCD, 0x00, 0x34, 0x03, 0x14, 0x08, 0x41, 0x20, 0x00,</div><div class='add'>+0xC1, 0x00, 0x34, 0x0B, 0x10, 0x08, 0x40, 0x30, 0x00, 0x0D, 0x00, 0x04, 0x02,</div><div class='add'>+0x10, 0x2C, 0x40, 0x34, 0x02, 0xC1, 0x00, 0x34, 0x03, 0x10, 0x0C, 0x40, 0x03,</div><div class='add'>+0x00, 0xC5, 0x20, 0x34, 0x4F, 0xD0, 0x0C, 0x40, 0x33, 0x00, 0xCD, 0x00, 0x34,</div><div class='add'>+0x03, 0xD0, 0x0C, 0x40, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04,</div><div class='add'>+0x80, 0x78, 0x00, 0xED, 0x01, 0xB4, 0x27, 0x10, 0x1E, 0x40, 0x78, 0x00, 0xE1,</div><div class='add'>+0x01, 0xB4, 0x07, 0x10, 0x1E, 0x40, 0x78, 0x00, 0xED, 0x01, 0x84, 0x05, 0x10,</div><div class='add'>+0x1E, 0x40, 0xF8, 0x00, 0xE1, 0x01, 0xF4, 0x07, 0x10, 0x1E, 0x40, 0x5B, 0x00,</div><div class='add'>+0xE1, 0x01, 0xB0, 0x07, 0xD0, 0x1E, 0x40, 0x7B, 0x00, 0xED, 0x01, 0xB4, 0x07,</div><div class='add'>+0xD0, 0x1E, 0x40, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x10,</div><div class='add'>+0x30, 0x00, 0xCF, 0x00, 0x3C, 0x03, 0x30, 0x2D, 0xC0, 0x10, 0x08, 0xC3, 0x08,</div><div class='add'>+0x7C, 0x03, 0x30, 0x44, 0xC0, 0x30, 0x02, 0x4F, 0x00, 0x0C, 0x03, 0x30, 0x8D,</div><div class='add'>+0xE0, 0x34, 0x00, 0xC3, 0x08, 0x7C, 0x23, 0x30, 0x0C, 0xC0, 0x13, 0x00, 0xC7,</div><div class='add'>+0x00, 0x3C, 0x03, 0xF1, 0x0C, 0xC0, 0x33, 0x00, 0xCF, 0x00, 0x3C, 0x03, 0xF0,</div><div class='add'>+0x0C, 0xC0, 0x4B, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xB8, 0x35,</div><div class='add'>+0x10, 0xDF, 0x00, 0x7C, 0x0B, 0xC0, 0x0D, 0x40, 0x37, 0x00, 0xDF, 0x00, 0x74,</div><div class='add'>+0x03, 0xF0, 0x05, 0xC0, 0x37, 0x20, 0xDE, 0x00, 0x7C, 0x03, 0xF0, 0x2D, 0xC0,</div><div class='add'>+0x37, 0x00, 0xDF, 0x08, 0x7C, 0x83, 0xB4, 0x0D, 0xC1, 0x37, 0x00, 0xDF, 0x00,</div><div class='add'>+0x7C, 0x03, 0xF0, 0x0D, 0xC0, 0x37, 0x00, 0xDF, 0x00, 0x7C, 0x03, 0xF0, 0x0D,</div><div class='add'>+0xC0, 0x0B, 0x60, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0xA0, 0x37, 0x00,</div><div class='add'>+0xDF, 0x00, 0x7C, 0xB3, 0x30, 0x15, 0xC0, 0x34, 0x00, 0xDF, 0x00, 0x7C, 0x4B,</div><div class='add'>+0xF0, 0x0D, 0xC8, 0x37, 0x28, 0x5F, 0x00, 0x7C, 0x03, 0xF0, 0xAD, 0xC0, 0x37,</div><div class='add'>+0x00, 0xDF, 0x00, 0x7C, 0x53, 0xF0, 0x1D, 0xC4, 0x34, 0x10, 0xD3, 0x00, 0x7C,</div><div class='add'>+0x03, 0xF0, 0x0D, 0xC0, 0x37, 0x00, 0xDF, 0x00, 0x7C, 0x03, 0xF0, 0x0D, 0xC0,</div><div class='add'>+0x43, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x88, 0x39, 0x00, 0xED,</div><div class='add'>+0x00, 0xB4, 0x03, 0x10, 0x0E, 0x40, 0x38, 0x00, 0xED, 0x00, 0xB4, 0x13, 0xD0,</div><div class='add'>+0x0E, 0x40, 0x3B, 0x00, 0xED, 0x00, 0xB4, 0x01, 0xD3, 0x4E, 0x40, 0x3B, 0x00,</div><div class='add'>+0xED, 0x00, 0xB4, 0x1B, 0xD0, 0x4E, 0x41, 0x18, 0x08, 0xE1, 0x80, 0xB4, 0x03,</div><div class='add'>+0xD0, 0x0E, 0x40, 0x3B, 0x00, 0xED, 0x00, 0xB4, 0x0B, 0xD0, 0x0E, 0x40, 0x4F,</div><div class='add'>+0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x79, 0x00, 0xED, 0x01,</div><div class='add'>+0xB0, 0x17, 0x10, 0x1C, 0x51, 0x58, 0x00, 0xED, 0x01, 0xB4, 0x27, 0xD0, 0x1E,</div><div class='add'>+0x40, 0x7B, 0x00, 0x6D, 0x21, 0xB4, 0x07, 0xD0, 0x1E, 0x40, 0x7B, 0x00, 0xED,</div><div class='add'>+0x01, 0xB4, 0x07, 0xD0, 0x1C, 0x40, 0x70, 0x40, 0xE1, 0x01, 0xB4, 0x07, 0xD0,</div><div class='add'>+0x1E, 0x41, 0x7B, 0x80, 0xED, 0x01, 0xB4, 0x07, 0xD0, 0x1E, 0x40, 0x13, 0x00,</div><div class='add'>+0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x28, 0x33, 0x00, 0xCD, 0x00, 0x74,</div><div class='add'>+0x83, 0x10, 0x3C, 0x45, 0xF0, 0x02, 0xCD, 0x00, 0x34, 0x03, 0xD8, 0xBC, 0x40,</div><div class='add'>+0x33, 0x00, 0xDD, 0x01, 0x34, 0x2B, 0xD1, 0x0D, 0x40, 0x33, 0x00, 0xCD, 0x00,</div><div class='add'>+0x34, 0x03, 0xD0, 0x0C, 0x40, 0x70, 0x00, 0xD1, 0x80, 0x34, 0x03, 0xD0, 0x7C,</div><div class='add'>+0x40, 0x33, 0x00, 0xCD, 0x00, 0x34, 0x03, 0xD0, 0x0C, 0x60, 0x5B, 0x20, 0x0C,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x17, 0xA8, 0x15, 0x00, 0x5F, 0xC0, 0x7C, 0x01,</div><div class='add'>+0x30, 0x17, 0xC0, 0xDC, 0x00, 0x5F, 0x00, 0x7C, 0x01, 0xF0, 0x17, 0xC0, 0x17,</div><div class='add'>+0x00, 0x7F, 0x05, 0xFC, 0x25, 0xF0, 0x05, 0xC0, 0x17, 0x00, 0x5F, 0x00, 0x7C,</div><div class='add'>+0x01, 0xF0, 0x05, 0xC0, 0x58, 0x01, 0x53, 0x00, 0x7C, 0x01, 0xF0, 0x37, 0xC0,</div><div class='add'>+0x17, 0x00, 0x5F, 0x00, 0x7C, 0x01, 0xF0, 0x05, 0xC0, 0x5F, 0x00, 0x04, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x07, 0x00, 0x1F, 0x00, 0x7C, 0x00, 0xF4,</div><div class='add'>+0x01, 0xC0, 0x07, 0x04, 0x1F, 0x00, 0x7C, 0x00, 0xF0, 0x01, 0xC1, 0x06, 0x10,</div><div class='add'>+0x1F, 0x41, 0x7C, 0x00, 0xE0, 0x01, 0xC0, 0x07, 0x00, 0x1F, 0x00, 0x7C, 0x00,</div><div class='add'>+0xF0, 0x01, 0xD0, 0xC7, 0x00, 0x1F, 0x00, 0x7C, 0x08, 0xF0, 0x01, 0xC0, 0x07,</div><div class='add'>+0x00, 0x1F, 0x00, 0x7C, 0x00, 0xF0, 0x01, 0xC0, 0x4B, 0x20, 0x04, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x10, 0x08, 0x27, 0x00, 0x9F, 0x00, 0x7C, 0x02, 0x30, 0x59,</div><div class='add'>+0xC0, 0x27, 0x00, 0x9F, 0x00, 0x7C, 0x26, 0xF0, 0x09, 0xC4, 0x27, 0x00, 0x9F,</div><div class='add'>+0x00, 0x4C, 0x02, 0xF0, 0x99, 0xC0, 0x64, 0x00, 0x9F, 0x40, 0x7C, 0x02, 0xF0,</div><div class='add'>+0x09, 0xC0, 0x67, 0x00, 0x97, 0x00, 0x4C, 0x02, 0x70, 0x09, 0xC0, 0x27, 0x00,</div><div class='add'>+0x9F, 0x00, 0x7C, 0x02, 0xF0, 0x09, 0xC0, 0x43, 0x20, 0x04, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x01, 0x20, 0x26, 0x00, 0x9D, 0x00, 0x74, 0x02, 0x10, 0x19, 0x40,</div><div class='add'>+0x27, 0x00, 0x9D, 0x00, 0x76, 0x82, 0xD0, 0x09, 0x40, 0x27, 0x00, 0x9D, 0x00,</div><div class='add'>+0x44, 0x02, 0xD0, 0x69, 0xC0, 0xA4, 0x01, 0x9D, 0x00, 0x74, 0x02, 0xD0, 0x09,</div><div class='add'>+0x40, 0xA7, 0x12, 0x91, 0x40, 0x0C, 0x9A, 0x11, 0x09, 0x40, 0x27, 0x00, 0x9D,</div><div class='add'>+0x00, 0x74, 0x02, 0xD0, 0x09, 0x40, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x18, 0xA0, 0x24, 0x00, 0x9D, 0x00, 0x74, 0x02, 0x10, 0x09, 0x40, 0x27,</div><div class='add'>+0x00, 0x9D, 0x40, 0x74, 0x02, 0xD0, 0x09, 0x40, 0x27, 0x00, 0x9D, 0x20, 0x44,</div><div class='add'>+0x82, 0xD0, 0x09, 0x40, 0x24, 0x0A, 0x9D, 0x00, 0x74, 0x02, 0xD0, 0x09, 0x40,</div><div class='add'>+0xA7, 0x00, 0x95, 0x00, 0x44, 0x02, 0x50, 0x09, 0x40, 0x27, 0x00, 0x9D, 0x00,</div><div class='add'>+0x74, 0x02, 0xD0, 0x09, 0x40, 0x63, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x10, 0x20, 0x20, 0x00, 0x8D, 0x00, 0x34, 0x12, 0x10, 0x58, 0x40, 0x23, 0x01,</div><div class='add'>+0x8D, 0x40, 0x34, 0x16, 0xD0, 0x48, 0x40, 0x23, 0x00, 0x8D, 0x44, 0x04, 0x12,</div><div class='add'>+0xD0, 0x48, 0x40, 0x20, 0x00, 0x8D, 0x00, 0x34, 0x12, 0xD8, 0x48, 0x40, 0x23,</div><div class='add'>+0x01, 0x91, 0x00, 0x04, 0x02, 0x10, 0x08, 0x40, 0x23, 0x00, 0x8D, 0x00, 0x34,</div><div class='add'>+0x12, 0xD0, 0x08, 0x40, 0x43, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1D,</div><div class='add'>+0xB0, 0x06, 0x00, 0x1F, 0x00, 0x3C, 0x28, 0x30, 0xA1, 0xC0, 0x07, 0x00, 0x1F,</div><div class='add'>+0x00, 0x74, 0x28, 0xF0, 0x01, 0xC0, 0x07, 0x00, 0x1F, 0x0A, 0x4D, 0x28, 0xF1,</div><div class='add'>+0xA1, 0x40, 0x84, 0x02, 0x1F, 0x00, 0x7C, 0x00, 0xF0, 0x01, 0xC0, 0x07, 0x00,</div><div class='add'>+0x17, 0x00, 0x4D, 0x00, 0x70, 0x01, 0xC0, 0x07, 0x00, 0x1F, 0x00, 0x7C, 0x00,</div><div class='add'>+0xF0, 0x01, 0xC0, 0x77, 0xC0, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x19, 0xB8,</div><div class='add'>+0x27, 0x00, 0x9F, 0x00, 0x7C, 0x22, 0xF4, 0x8B, 0xC0, 0x2F, 0x0A, 0x9F, 0x00,</div><div class='add'>+0x7C, 0x22, 0xF0, 0x8B, 0xC0, 0x27, 0x00, 0xFF, 0x08, 0xFC, 0x22, 0xF0, 0x89,</div><div class='add'>+0xD0, 0x25, 0x00, 0x9F, 0x00, 0x7C, 0x22, 0xF0, 0x89, 0xC0, 0x2F, 0x02, 0x9F,</div><div class='add'>+0x00, 0x5C, 0x02, 0xF0, 0x0B, 0xC0, 0x27, 0x00, 0x9F, 0x00, 0x7C, 0x22, 0xF0,</div><div class='add'>+0x09, 0xC0, 0x77, 0x20, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0xA0, 0x27,</div><div class='add'>+0x00, 0x9F, 0x00, 0x7C, 0x1E, 0xF0, 0xDB, 0xC0, 0x67, 0x01, 0x9F, 0x00, 0xFC,</div><div class='add'>+0x36, 0x34, 0x59, 0xC0, 0x27, 0x00, 0x9F, 0x07, 0x4C, 0x1E, 0xF1, 0x7B, 0xD0,</div><div class='add'>+0xAC, 0x00, 0x9F, 0x00, 0x7C, 0x06, 0xF0, 0x59, 0xC0, 0x6F, 0x01, 0x9B, 0x00,</div><div class='add'>+0xFC, 0x02, 0xF0, 0x08, 0xC0, 0x27, 0x00, 0x9F, 0x00, 0x7C, 0x02, 0xF0, 0x09,</div><div class='add'>+0xC0, 0x77, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1C, 0x08, 0x07, 0x00,</div><div class='add'>+0x1D, 0x00, 0x74, 0x3C, 0xD0, 0xF5, 0x42, 0x87, 0x02, 0x1D, 0x00, 0x74, 0x3C,</div><div class='add'>+0x10, 0x01, 0x40, 0x07, 0x00, 0x1D, 0x05, 0x44, 0x1D, 0xD0, 0x71, 0x40, 0x44,</div><div class='add'>+0x01, 0x1D, 0x00, 0x74, 0x08, 0xD0, 0x21, 0x40, 0x97, 0x02, 0x11, 0x00, 0x74,</div><div class='add'>+0x00, 0xD0, 0x01, 0x40, 0x07, 0x00, 0x1D, 0x00, 0x74, 0x20, 0xD0, 0x01, 0x40,</div><div class='add'>+0x63, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xA0, 0x23, 0x00, 0x8D,</div><div class='add'>+0x00, 0x34, 0x12, 0xD0, 0x08, 0x40, 0x23, 0x00, 0x8D, 0x00, 0x34, 0x02, 0x10,</div><div class='add'>+0x28, 0x40, 0x23, 0x00, 0x8D, 0x06, 0x04, 0x0A, 0xD0, 0x28, 0x40, 0x20, 0x00,</div><div class='add'>+0x8D, 0x00, 0x34, 0x0A, 0xD0, 0x88, 0x40, 0x23, 0x00, 0x89, 0x00, 0x34, 0x02,</div><div class='add'>+0xD0, 0x08, 0x40, 0x23, 0x00, 0x8D, 0x00, 0x34, 0x02, 0xD0, 0x08, 0x40, 0x4B,</div><div class='add'>+0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0xA8, 0x25, 0x00, 0x9D, 0x00,</div><div class='add'>+0x74, 0x02, 0xD0, 0x49, 0x40, 0x27, 0x00, 0x9D, 0x00, 0x74, 0x02, 0x10, 0x69,</div><div class='add'>+0x40, 0x27, 0x00, 0x9D, 0x00, 0x44, 0x02, 0xD0, 0x0D, 0x40, 0x24, 0x00, 0x9D,</div><div class='add'>+0x00, 0x74, 0x02, 0xD0, 0x09, 0x40, 0x27, 0x00, 0x91, 0x80, 0x74, 0x82, 0xD0,</div><div class='add'>+0x89, 0x40, 0x27, 0x00, 0x9D, 0x00, 0x74, 0x02, 0xD0, 0x09, 0x40, 0x63, 0x20,</div><div class='add'>+0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0xA8, 0x27, 0x00, 0x9F, 0x00, 0x7C,</div><div class='add'>+0x02, 0xF0, 0x09, 0xC0, 0xA7, 0x16, 0x9F, 0x00, 0x7C, 0x02, 0x30, 0x39, 0xC0,</div><div class='add'>+0x27, 0x00, 0x9F, 0x08, 0x4C, 0x06, 0xF0, 0x09, 0xC0, 0x24, 0x00, 0x9F, 0x00,</div><div class='add'>+0x7C, 0x02, 0xF0, 0x09, 0xC4, 0x23, 0x00, 0x9B, 0x00, 0x7C, 0x02, 0xF0, 0x19,</div><div class='add'>+0x41, 0x27, 0x20, 0x9D, 0x00, 0x7C, 0x02, 0xF0, 0x09, 0xC0, 0x17, 0x80, 0x04,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x80, 0x25, 0x00, 0x9F, 0x00, 0x7C, 0x02,</div><div class='add'>+0xF0, 0x09, 0xC0, 0x27, 0x00, 0x9F, 0x00, 0x3C, 0x02, 0xF0, 0x19, 0xC0, 0x27,</div><div class='add'>+0x00, 0x8F, 0x00, 0x7D, 0x16, 0xF1, 0x08, 0xC0, 0x27, 0x00, 0x9F, 0x00, 0x7C,</div><div class='add'>+0x02, 0xF0, 0x09, 0xCA, 0x27, 0x01, 0x9F, 0x00, 0x7C, 0x02, 0xF0, 0x19, 0xC0,</div><div class='add'>+0x27, 0x00, 0x9F, 0x00, 0x74, 0x02, 0xF0, 0x09, 0x80, 0x5B, 0x20, 0x04, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x14, 0x08, 0x05, 0x00, 0x1F, 0x00, 0x7C, 0x00, 0xF0,</div><div class='add'>+0x21, 0xC0, 0x87, 0x00, 0x1F, 0x00, 0x7C, 0x00, 0xF0, 0x01, 0xC4, 0x07, 0x00,</div><div class='add'>+0x1F, 0x02, 0x7C, 0x00, 0xF0, 0x01, 0xC0, 0x07, 0x80, 0x1F, 0x00, 0x7C, 0x00,</div><div class='add'>+0xF0, 0x01, 0xC0, 0x87, 0x04, 0x17, 0x00, 0x7C, 0x40, 0xF2, 0x21, 0xC0, 0x04,</div><div class='add'>+0x00, 0x1F, 0x00, 0x7C, 0x00, 0xF0, 0x01, 0xC0, 0x53, 0x20, 0x04, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x14, 0xA0, 0x14, 0x00, 0x5D, 0x00, 0x74, 0x01, 0xD0, 0x27,</div><div class='add'>+0x40, 0x17, 0x00, 0x5D, 0x00, 0xF4, 0x19, 0xD0, 0x05, 0x40, 0x17, 0x00, 0x5D,</div><div class='add'>+0x00, 0x74, 0x01, 0xD0, 0xC7, 0x40, 0x9F, 0x83, 0x5D, 0x00, 0x74, 0x01, 0xD0,</div><div class='add'>+0x05, 0x40, 0x5F, 0x01, 0x51, 0x00, 0xF4, 0x01, 0x70, 0x05, 0x40, 0x14, 0x00,</div><div class='add'>+0x5D, 0x00, 0x74, 0x01, 0xD0, 0x05, 0x40, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x14, 0xA0, 0x32, 0x00, 0xCD, 0x00, 0x34, 0x03, 0xD0, 0x2C, 0x41,</div><div class='add'>+0x33, 0x00, 0xCD, 0x00, 0x34, 0x47, 0xD0, 0x0C, 0x40, 0x33, 0x00, 0xCD, 0x00,</div><div class='add'>+0x34, 0x03, 0xD0, 0x2C, 0x40, 0xF3, 0x00, 0xCD, 0x40, 0x34, 0x03, 0xD0, 0x0C,</div><div class='add'>+0x40, 0x53, 0x08, 0xC5, 0x00, 0x34, 0x00, 0xD0, 0x0C, 0x40, 0x30, 0x00, 0xCD,</div><div class='add'>+0x00, 0x34, 0x03, 0xD0, 0x0C, 0x40, 0x43, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x05, 0x80, 0x38, 0x00, 0xED, 0x00, 0xB4, 0x13, 0xD0, 0x0E, 0x41, 0x3B,</div><div class='add'>+0x00, 0xED, 0x00, 0xB4, 0x01, 0xD0, 0x0E, 0x40, 0x3B, 0x00, 0xED, 0x04, 0xB4,</div><div class='add'>+0x13, 0xD0, 0x0E, 0x40, 0x3B, 0x00, 0xED, 0x00, 0xB4, 0x03, 0xD0, 0x0E, 0x40,</div><div class='add'>+0x1B, 0x00, 0xE1, 0x40, 0xB4, 0x09, 0x50, 0x0F, 0x40, 0x38, 0x00, 0xED, 0x00,</div><div class='add'>+0xB4, 0x03, 0xD0, 0x0E, 0x42, 0x13, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x15, 0x10, 0x78, 0x00, 0xEF, 0x01, 0xBC, 0x17, 0xF0, 0x1E, 0xC0, 0x7B, 0x08,</div><div class='add'>+0xEF, 0x01, 0xBC, 0x07, 0xF0, 0x1E, 0xC2, 0x7B, 0x00, 0xEF, 0x0D, 0xBC, 0x37,</div><div class='add'>+0xF0, 0x16, 0xC0, 0x7B, 0x00, 0xED, 0x41, 0xBC, 0x07, 0xF0, 0x1E, 0xC0, 0x5B,</div><div class='add'>+0x00, 0xE7, 0x01, 0xBC, 0x04, 0xF0, 0x0E, 0xC4, 0x78, 0x00, 0xED, 0x01, 0xBC,</div><div class='add'>+0x07, 0xF0, 0x1E, 0xC0, 0x53, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10,</div><div class='add'>+0xB8, 0x35, 0x00, 0xDF, 0x00, 0x7C, 0x53, 0xF0, 0x0D, 0xC0, 0x37, 0x00, 0xDF,</div><div class='add'>+0x00, 0x7C, 0x01, 0xF0, 0x0D, 0xC0, 0x37, 0x00, 0xDF, 0x08, 0x7C, 0x03, 0xF0,</div><div class='add'>+0x05, 0xC4, 0x17, 0x00, 0xDF, 0x00, 0x7C, 0x03, 0xF0, 0x0D, 0xC8, 0x13, 0x10,</div><div class='add'>+0xDF, 0x00, 0x7C, 0x01, 0xF0, 0x0D, 0xC8, 0x37, 0x08, 0xDF, 0x00, 0x7C, 0x03,</div><div class='add'>+0xF0, 0x0D, 0xC0, 0x43, 0x60, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA0,</div><div class='add'>+0x7F, 0x00, 0xFF, 0x01, 0xFC, 0x63, 0xF0, 0x17, 0xC0, 0x7F, 0x00, 0xFF, 0x09,</div><div class='add'>+0xFC, 0x27, 0xF3, 0x1F, 0xC0, 0x7F, 0x00, 0xFF, 0x81, 0xF8, 0x47, 0x30, 0x1F,</div><div class='add'>+0x48, 0x5F, 0x02, 0xFE, 0x21, 0xFC, 0x07, 0xD0, 0x9F, 0x80, 0x5D, 0x00, 0xF3,</div><div class='add'>+0x09, 0xFC, 0x27, 0xF0, 0x1F, 0xC0, 0x7F, 0x02, 0xFF, 0x09, 0xFC, 0x07, 0xF0,</div><div class='add'>+0x1F, 0xC0, 0x1B, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x88, 0x39,</div><div class='add'>+0x00, 0xED, 0x00, 0xB4, 0x03, 0xD0, 0x86, 0x41, 0x3B, 0x00, 0xED, 0x00, 0xB4,</div><div class='add'>+0x01, 0xC0, 0x0E, 0x40, 0x3B, 0x00, 0xED, 0x08, 0xB4, 0x03, 0x14, 0x8E, 0x40,</div><div class='add'>+0x1A, 0x00, 0xE9, 0x00, 0xB4, 0x03, 0xD0, 0x0F, 0x42, 0x1C, 0x05, 0xE5, 0x08,</div><div class='add'>+0xB4, 0x09, 0xD0, 0x0E, 0x40, 0x3B, 0x00, 0xED, 0x00, 0xB4, 0x03, 0xD0, 0x8E,</div><div class='add'>+0x40, 0x57, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x39, 0x00,</div><div class='add'>+0xED, 0x00, 0xB4, 0x23, 0x58, 0x06, 0x40, 0x3B, 0x06, 0xED, 0x80, 0xB0, 0x03,</div><div class='add'>+0xD1, 0x8E, 0x40, 0x3B, 0x00, 0xED, 0x00, 0xB4, 0x03, 0x10, 0x0E, 0x40, 0x3B,</div><div class='add'>+0x00, 0xED, 0x00, 0xB4, 0x03, 0xD0, 0x0F, 0x44, 0x3D, 0x00, 0xE5, 0x40, 0xB4,</div><div class='add'>+0x81, 0xD0, 0x0E, 0x40, 0x3B, 0x20, 0xED, 0x40, 0xB4, 0x23, 0xD0, 0x0E, 0x40,</div><div class='add'>+0x23, 0x01, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x28, 0x33, 0x00, 0xCD,</div><div class='add'>+0x00, 0x34, 0x03, 0xD0, 0x00, 0x40, 0xB3, 0x00, 0xCD, 0x00, 0x74, 0x00, 0x90,</div><div class='add'>+0x1C, 0x40, 0x37, 0x10, 0xCD, 0x02, 0x74, 0x27, 0x10, 0x08, 0x08, 0x02, 0x00,</div><div class='add'>+0xC9, 0x00, 0x34, 0x03, 0xD0, 0x0C, 0x40, 0x70, 0x00, 0xC5, 0x40, 0x34, 0x01,</div><div class='add'>+0xD1, 0x0C, 0x40, 0x33, 0x00, 0xCC, 0x00, 0x34, 0x03, 0xD0, 0x0C, 0x40, 0x0B,</div><div class='add'>+0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0xA8, 0x35, 0x00, 0xDF, 0x00,</div><div class='add'>+0xFC, 0x03, 0x70, 0x19, 0xC0, 0x77, 0x00, 0xDF, 0x00, 0x7C, 0x02, 0xF0, 0x2D,</div><div class='add'>+0xC3, 0x37, 0x00, 0xFF, 0x44, 0xFC, 0x03, 0x31, 0x09, 0x80, 0x27, 0x10, 0xDE,</div><div class='add'>+0x00, 0x7C, 0x03, 0xF0, 0x0D, 0xC0, 0x45, 0x00, 0xD7, 0x40, 0x78, 0x01, 0xD0,</div><div class='add'>+0x0D, 0xC1, 0x37, 0x10, 0xDD, 0x00, 0x7C, 0x03, 0xF0, 0x0D, 0xC0, 0x57, 0x00,</div><div class='add'>+0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x37, 0x20, 0xDF, 0x00, 0x7C,</div><div class='add'>+0x03, 0xF0, 0x49, 0xC4, 0x37, 0x04, 0xDF, 0x20, 0x7C, 0x0A, 0xF0, 0x0D, 0xC8,</div><div class='add'>+0x37, 0x10, 0xDF, 0x10, 0x7C, 0x43, 0xF0, 0x29, 0xC4, 0x26, 0x20, 0xDB, 0x80,</div><div class='add'>+0x7C, 0x03, 0xF2, 0x0D, 0xC0, 0x87, 0x04, 0xDE, 0x00, 0x7C, 0x09, 0xF1, 0x4D,</div><div class='add'>+0xC0, 0x37, 0x10, 0xDF, 0x00, 0x7C, 0x03, 0xF0, 0x0D, 0xC0, 0x37, 0x20, 0x0C,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x08, 0x3F, 0x00, 0xFF, 0x00, 0xFC, 0x03,</div><div class='add'>+0xF0, 0x03, 0xC0, 0x3B, 0x00, 0xF3, 0x00, 0xFC, 0x00, 0x30, 0x0F, 0xC1, 0x3F,</div><div class='add'>+0x08, 0xF3, 0x00, 0x7C, 0x03, 0x30, 0x03, 0xC0, 0x2F, 0x00, 0xFF, 0x00, 0xBC,</div><div class='add'>+0x03, 0x34, 0x0F, 0xC0, 0x5F, 0x02, 0xFF, 0x00, 0xFC, 0x05, 0xD0, 0x0F, 0xC4,</div><div class='add'>+0x3D, 0x00, 0xFF, 0x00, 0xBC, 0x03, 0x30, 0x0F, 0xC4, 0x07, 0x20, 0x0C, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x81, 0x20, 0x36, 0x00, 0xDD, 0x00, 0x74, 0x03, 0xD0,</div><div class='add'>+0x79, 0x48, 0x37, 0x30, 0xD1, 0x00, 0x74, 0x1C, 0x10, 0x0D, 0x40, 0x37, 0x00,</div><div class='add'>+0xD1, 0x00, 0x74, 0x03, 0x10, 0x31, 0x40, 0x67, 0x04, 0xDD, 0x00, 0x74, 0x03,</div><div class='add'>+0x10, 0x0D, 0x40, 0x17, 0x01, 0xDD, 0x40, 0x74, 0x8D, 0xD0, 0x0C, 0x48, 0x34,</div><div class='add'>+0x00, 0xDD, 0x00, 0x74, 0x03, 0x10, 0x0D, 0x48, 0x87, 0x00, 0x08, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x01, 0xA0, 0x34, 0x00, 0xDD, 0x00, 0x74, 0x03, 0xD0, 0x19,</div><div class='add'>+0x40, 0x37, 0x00, 0xD1, 0x00, 0x74, 0x06, 0x10, 0x0D, 0x40, 0x37, 0x40, 0xD1,</div><div class='add'>+0x00, 0x74, 0x03, 0x10, 0x11, 0x48, 0x47, 0x20, 0xDD, 0x00, 0x74, 0x03, 0x90,</div><div class='add'>+0x0D, 0x40, 0x17, 0x00, 0xDC, 0x00, 0x74, 0x11, 0xD0, 0x0D, 0x42, 0x35, 0x00,</div><div class='add'>+0xDD, 0x40, 0x74, 0x03, 0x10, 0x0D, 0x40, 0x07, 0x00, 0x0A, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x10, 0x20, 0x30, 0x00, 0xCD, 0x00, 0x34, 0x03, 0xD2, 0x08, 0x40,</div><div class='add'>+0x33, 0x00, 0xC1, 0x80, 0x34, 0x02, 0x15, 0x0C, 0x40, 0x37, 0x20, 0xC1, 0xC0,</div><div class='add'>+0x34, 0x03, 0x14, 0x08, 0x44, 0x03, 0x00, 0xCD, 0x00, 0x34, 0x03, 0x90, 0x0C,</div><div class='add'>+0x40, 0x13, 0x00, 0xCD, 0x00, 0x34, 0x01, 0xD0, 0x0D, 0x44, 0x30, 0x00, 0xCD,</div><div class='add'>+0x00, 0x34, 0x03, 0x10, 0x0C, 0x48, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0xB0, 0x36, 0x00, 0xDF, 0x00, 0xFC, 0x03, 0xF0, 0x01, 0xC4, 0x37,</div><div class='add'>+0x40, 0xD3, 0x00, 0x7C, 0x02, 0x30, 0x0D, 0xC0, 0x37, 0x00, 0xF3, 0x00, 0xFC,</div><div class='add'>+0x03, 0x30, 0x01, 0xC0, 0x27, 0x00, 0xDF, 0x00, 0x7C, 0x03, 0xB0, 0x0D, 0xC0,</div><div class='add'>+0x17, 0x00, 0xDF, 0x00, 0x7C, 0x01, 0xF8, 0x0D, 0xC0, 0x35, 0x80, 0xDF, 0x00,</div><div class='add'>+0x7C, 0x03, 0x30, 0x0D, 0xC0, 0x07, 0x60, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x05, 0xB8, 0x3F, 0x00, 0xFF, 0x00, 0xFC, 0x03, 0xF0, 0x0B, 0x40, 0x3F, 0x20,</div><div class='add'>+0xFF, 0xC0, 0xFC, 0x02, 0xF0, 0x0F, 0xC0, 0x3F, 0x00, 0xFF, 0x00, 0xFC, 0x83,</div><div class='add'>+0xF0, 0x0B, 0xC0, 0x2F, 0x00, 0xFF, 0x00, 0xF8, 0x03, 0x70, 0x0F, 0xC0, 0x1F,</div><div class='add'>+0x00, 0xFF, 0x00, 0xFC, 0x01, 0xF0, 0x0F, 0xC0, 0x3F, 0x00, 0xFF, 0x20, 0xFC,</div><div class='add'>+0x03, 0xF2, 0x0F, 0xC0, 0x17, 0x61, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03,</div><div class='add'>+0xA0, 0x7F, 0x00, 0xB3, 0x02, 0xCD, 0x27, 0x30, 0x0B, 0xC0, 0x0C, 0x05, 0x3F,</div><div class='add'>+0x04, 0xFC, 0x07, 0x30, 0x47, 0xC8, 0x3F, 0x05, 0xFF, 0x04, 0xBC, 0xD3, 0x30,</div><div class='add'>+0x9B, 0xC0, 0x2C, 0x01, 0x23, 0x89, 0xCC, 0x12, 0xF0, 0x03, 0xC8, 0x2C, 0x02,</div><div class='add'>+0x33, 0x04, 0xFC, 0x07, 0xF0, 0x0F, 0xC0, 0x7C, 0x18, 0xB3, 0x00, 0xCC, 0x04,</div><div class='add'>+0xF0, 0x1F, 0xC0, 0x0F, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x08,</div><div class='add'>+0x37, 0x11, 0x91, 0x02, 0x44, 0x03, 0x10, 0x1B, 0x50, 0x84, 0x10, 0x1D, 0x0B,</div><div class='add'>+0x74, 0x07, 0x14, 0xBD, 0x40, 0xF7, 0x00, 0xFD, 0x49, 0xF4, 0x0F, 0x12, 0x48,</div><div class='add'>+0x50, 0xFC, 0x40, 0x11, 0x84, 0x44, 0x4A, 0xD0, 0x31, 0x44, 0xAC, 0x23, 0x13,</div><div class='add'>+0x0A, 0x74, 0x03, 0xD1, 0x04, 0x40, 0x34, 0x00, 0xD1, 0x03, 0x45, 0x05, 0xD0,</div><div class='add'>+0x1D, 0x40, 0x07, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0xA0, 0x33,</div><div class='add'>+0x04, 0x91, 0x8C, 0x34, 0x13, 0x14, 0x08, 0x40, 0x20, 0x00, 0x0D, 0x00, 0x34,</div><div class='add'>+0x03, 0x10, 0x0C, 0x40, 0x23, 0x00, 0xCD, 0x00, 0x34, 0x03, 0x10, 0x08, 0x40,</div><div class='add'>+0xA0, 0x00, 0x05, 0x00, 0x04, 0x0A, 0xD2, 0x21, 0x40, 0x20, 0x41, 0x81, 0x00,</div><div class='add'>+0x34, 0x03, 0xD8, 0x08, 0x60, 0x32, 0x10, 0xC1, 0x82, 0x04, 0x00, 0xD0, 0x0C,</div><div class='add'>+0x40, 0x47, 0x80, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xA8, 0x35, 0x40,</div><div class='add'>+0x91, 0x01, 0x64, 0x03, 0x10, 0x89, 0x40, 0x64, 0x00, 0x1C, 0x11, 0x74, 0x03,</div><div class='add'>+0x10, 0x1D, 0x40, 0x37, 0x00, 0xDD, 0x00, 0x74, 0x03, 0x14, 0x09, 0x40, 0x34,</div><div class='add'>+0x00, 0x15, 0x01, 0x45, 0x42, 0xD0, 0x49, 0x40, 0x20, 0xC2, 0x91, 0x03, 0x74,</div><div class='add'>+0x03, 0xD0, 0x0D, 0x50, 0x36, 0x40, 0xD1, 0x01, 0x46, 0x07, 0xD0, 0x0D, 0x40,</div><div class='add'>+0x0F, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA8, 0x37, 0x00, 0x83,</div><div class='add'>+0x01, 0x6C, 0x03, 0x30, 0x08, 0xC0, 0x44, 0x20, 0x1E, 0x01, 0x7C, 0x03, 0x30,</div><div class='add'>+0x3D, 0xC0, 0x37, 0x00, 0xDF, 0xC0, 0x7C, 0x03, 0x30, 0x99, 0xC0, 0x24, 0x02,</div><div class='add'>+0x17, 0x81, 0x4C, 0x02, 0xF1, 0x00, 0xD0, 0x24, 0x00, 0x13, 0x01, 0x7C, 0x03,</div><div class='add'>+0xF0, 0x0D, 0xE0, 0x36, 0x00, 0x93, 0x01, 0x4C, 0x04, 0xF2, 0x0D, 0xC2, 0x0B,</div><div class='add'>+0x20, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x80, 0x3D, 0x00, 0xBF, 0x00,</div><div class='add'>+0xDC, 0x03, 0xF0, 0x19, 0xC0, 0x0F, 0x10, 0x3F, 0x00, 0xF4, 0x03, 0xF1, 0x0D,</div><div class='add'>+0xC0, 0x7F, 0x12, 0xFF, 0x10, 0xBC, 0x03, 0xC0, 0x0B, 0xC0, 0x7F, 0x20, 0x3B,</div><div class='add'>+0x00, 0xF8, 0x26, 0xE1, 0x03, 0xC0, 0x27, 0x00, 0x14, 0x00, 0xFC, 0x03, 0xF0,</div><div class='add'>+0x5F, 0xC0, 0xBD, 0x00, 0xEF, 0x00, 0xFC, 0x81, 0xF1, 0x0F, 0xC0, 0x1F, 0x00,</div><div class='add'>+0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x08, 0x35, 0x00, 0x93, 0x04, 0x4C,</div><div class='add'>+0x13, 0xF0, 0x09, 0xC4, 0x24, 0x00, 0x13, 0x02, 0x7C, 0x03, 0xF0, 0x0D, 0xC0,</div><div class='add'>+0x24, 0x00, 0xDF, 0x40, 0x4C, 0x03, 0xB0, 0x09, 0xC8, 0x20, 0x40, 0x13, 0x02,</div><div class='add'>+0x6C, 0x0E, 0xB0, 0x03, 0xC0, 0x37, 0x00, 0x93, 0x06, 0x6C, 0x03, 0xD0, 0x08,</div><div class='add'>+0xC0, 0x34, 0x80, 0x5F, 0x00, 0x7C, 0x00, 0x30, 0x0D, 0xC0, 0x0B, 0x20, 0x04,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0xA0, 0x30, 0x00, 0x91, 0x00, 0x44, 0x0B,</div><div class='add'>+0xD0, 0x09, 0x50, 0x64, 0x08, 0x91, 0x00, 0x34, 0x2B, 0xD0, 0x0D, 0x40, 0xB4,</div><div class='add'>+0x02, 0xFD, 0x06, 0xC5, 0x6F, 0x10, 0x49, 0x54, 0xB4, 0x03, 0x10, 0x24, 0x44,</div><div class='add'>+0x06, 0x10, 0xB9, 0x45, 0x37, 0x00, 0x91, 0x83, 0x44, 0x03, 0xD1, 0xAD, 0x40,</div><div class='add'>+0xB4, 0x02, 0xDD, 0x00, 0x74, 0x47, 0x10, 0x1D, 0x43, 0x4F, 0x00, 0x02, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x07, 0xA0, 0x72, 0x00, 0xC1, 0x02, 0x44, 0x8B, 0xD0,</div><div class='add'>+0x68, 0x40, 0x60, 0x00, 0x05, 0x00, 0x34, 0x03, 0xD0, 0x08, 0x40, 0x12, 0x20,</div><div class='add'>+0xCD, 0x02, 0x04, 0x03, 0x90, 0x09, 0x48, 0xF0, 0x10, 0x11, 0x20, 0x04, 0x4A,</div><div class='add'>+0x92, 0x10, 0x40, 0x23, 0x20, 0x09, 0x00, 0x24, 0x03, 0xD0, 0x0C, 0x40, 0x36,</div><div class='add'>+0x10, 0xC5, 0x08, 0x34, 0x04, 0x10, 0x0C, 0x40, 0x1F, 0x00, 0x0A, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x04, 0x80, 0x78, 0x40, 0xE1, 0x01, 0x84, 0x07, 0xD0, 0x9E,</div><div class='add'>+0x40, 0x68, 0x04, 0x25, 0x01, 0xB4, 0x07, 0xD1, 0x1A, 0x50, 0x58, 0x00, 0xCD,</div><div class='add'>+0x89, 0x84, 0x07, 0x10, 0x9A, 0x40, 0x78, 0x00, 0x31, 0x29, 0x85, 0x04, 0x10,</div><div class='add'>+0x12, 0x40, 0x6B, 0x08, 0xA9, 0x01, 0x84, 0x07, 0xD0, 0x16, 0x50, 0x7A, 0x80,</div><div class='add'>+0xED, 0x41, 0xB4, 0x05, 0x10, 0x1E, 0x40, 0x13, 0x00, 0x02, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x12, 0x10, 0x30, 0x04, 0x53, 0x00, 0x0E, 0x03, 0xF0, 0x08, 0xD0,</div><div class='add'>+0xA4, 0x40, 0x07, 0x08, 0x3C, 0x03, 0xF0, 0x0C, 0xC0, 0x30, 0x02, 0xCF, 0x00,</div><div class='add'>+0x0C, 0x03, 0xB0, 0x08, 0xC0, 0x30, 0x00, 0x03, 0x4A, 0x6C, 0x02, 0xB0, 0x00,</div><div class='add'>+0xC0, 0x33, 0x41, 0xCB, 0x10, 0x2C, 0x23, 0xF0, 0x0C, 0xD0, 0x32, 0x02, 0xCF,</div><div class='add'>+0x00, 0x3C, 0x00, 0x34, 0x0C, 0xC0, 0x4B, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x02, 0xB8, 0x39, 0x00, 0xFF, 0x00, 0xFD, 0x03, 0xF0, 0x0B, 0xC0, 0x2F,</div><div class='add'>+0x10, 0x7B, 0x00, 0xFC, 0x03, 0xF8, 0x0F, 0xC0, 0x3F, 0x00, 0xFF, 0x00, 0xFC,</div><div class='add'>+0x03, 0xF0, 0x0B, 0xC4, 0x3B, 0x00, 0x3F, 0x28, 0xFC, 0x00, 0xF0, 0x0F, 0xC0,</div><div class='add'>+0x3F, 0x00, 0xF7, 0x00, 0xFC, 0x83, 0xF0, 0x0F, 0xD0, 0x3D, 0x00, 0xFF, 0x08,</div><div class='add'>+0xBC, 0x03, 0xF0, 0x0F, 0xC0, 0x0B, 0x60, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x15, 0xA0, 0x37, 0x00, 0x9F, 0x00, 0x7C, 0x03, 0xF0, 0x49, 0xD0, 0x2C, 0x00,</div><div class='add'>+0x33, 0x00, 0x7C, 0x03, 0xF0, 0x0D, 0xC8, 0x37, 0x00, 0xDF, 0x04, 0x5C, 0x4F,</div><div class='add'>+0x30, 0x09, 0xC0, 0xB5, 0x00, 0x13, 0x00, 0x6C, 0x02, 0xF2, 0x01, 0xC0, 0xA7,</div><div class='add'>+0x01, 0xD3, 0x00, 0x5C, 0x03, 0xF0, 0x0D, 0xC0, 0x37, 0x00, 0xDF, 0x00, 0x7C,</div><div class='add'>+0x00, 0xF0, 0x0D, 0xC0, 0x57, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12,</div><div class='add'>+0x88, 0x39, 0x00, 0xAD, 0x40, 0xB4, 0x03, 0xD0, 0x8C, 0x44, 0x28, 0x00, 0x2B,</div><div class='add'>+0x00, 0xB4, 0x03, 0xD0, 0x0E, 0x40, 0x3B, 0x00, 0xCD, 0x0E, 0x04, 0x03, 0x10,</div><div class='add'>+0x0E, 0x40, 0x30, 0x02, 0x61, 0x00, 0x86, 0x00, 0xD0, 0x02, 0x44, 0x23, 0x04,</div><div class='add'>+0xF1, 0x00, 0x84, 0x03, 0xD0, 0x0E, 0x40, 0x3B, 0x10, 0xED, 0x00, 0xB4, 0x01,</div><div class='add'>+0xD0, 0x0E, 0x40, 0x4B, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00,</div><div class='add'>+0x79, 0x00, 0xAD, 0x01, 0xB4, 0x07, 0xD0, 0x1A, 0x40, 0x60, 0x00, 0xA1, 0x41,</div><div class='add'>+0xB4, 0x07, 0xD0, 0x1E, 0x40, 0x7B, 0x00, 0xED, 0x05, 0x94, 0x37, 0x10, 0x3B,</div><div class='add'>+0x40, 0x79, 0x08, 0x29, 0x11, 0x84, 0x06, 0xD0, 0x12, 0x40, 0xFB, 0x00, 0xE1,</div><div class='add'>+0x81, 0x94, 0x87, 0xD0, 0x1E, 0x40, 0x7B, 0x00, 0xED, 0x01, 0xB4, 0x05, 0xD0,</div><div class='add'>+0x1E, 0x40, 0x0F, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x28, 0x33,</div><div class='add'>+0x10, 0x8D, 0x09, 0x34, 0x03, 0xD0, 0x9C, 0x50, 0x70, 0x00, 0xC9, 0x06, 0x34,</div><div class='add'>+0x03, 0xD0, 0x3C, 0x40, 0xB3, 0x04, 0xCD, 0x00, 0x04, 0x03, 0x14, 0x1C, 0x40,</div><div class='add'>+0x30, 0xC0, 0x99, 0x06, 0x05, 0x01, 0xD1, 0x0C, 0x44, 0x73, 0x20, 0xC1, 0x03,</div><div class='add'>+0x04, 0x03, 0xD1, 0x0D, 0x41, 0x63, 0x00, 0xCD, 0x06, 0x34, 0x07, 0xD0, 0x0C,</div><div class='add'>+0x40, 0x4B, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x17, 0xA8, 0x15, 0x00,</div><div class='add'>+0x7F, 0x02, 0x7C, 0x01, 0xF0, 0x04, 0xC0, 0x58, 0x01, 0x73, 0x02, 0x7C, 0x01,</div><div class='add'>+0xF0, 0x16, 0xC0, 0x9F, 0x10, 0x5F, 0x00, 0x5C, 0x01, 0x30, 0x04, 0xC4, 0x15,</div><div class='add'>+0x00, 0x7B, 0x00, 0xCC, 0x45, 0xF1, 0x07, 0xC0, 0x17, 0x48, 0x73, 0x05, 0x5C,</div><div class='add'>+0x01, 0xF0, 0x27, 0xC0, 0x57, 0x00, 0x7F, 0x02, 0xFC, 0x05, 0xF0, 0x05, 0xC0,</div><div class='add'>+0x5F, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x07, 0x00, 0x1F,</div><div class='add'>+0x00, 0x7C, 0x00, 0xF0, 0x01, 0xD0, 0x07, 0x10, 0x1F, 0x00, 0x7C, 0x00, 0xF0,</div><div class='add'>+0x81, 0xC0, 0x07, 0x00, 0x1F, 0x00, 0x7C, 0x08, 0xF0, 0x01, 0xC0, 0x07, 0x00,</div><div class='add'>+0x17, 0x00, 0x5C, 0x00, 0xF0, 0x01, 0xC0, 0x07, 0x00, 0x1F, 0x10, 0x7C, 0x00,</div><div class='add'>+0xF0, 0x01, 0xC0, 0x07, 0x12, 0x1F, 0x00, 0x7C, 0x20, 0xF0, 0x01, 0xC0, 0x4B,</div><div class='add'>+0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x08, 0x27, 0x00, 0x93, 0x11,</div><div class='add'>+0x4C, 0x22, 0xF0, 0x09, 0xC0, 0x64, 0x00, 0x93, 0x02, 0x7C, 0x02, 0xF0, 0x09,</div><div class='add'>+0xC1, 0x20, 0x00, 0x83, 0x00, 0x6D, 0x0E, 0xF0, 0x59, 0xC0, 0x20, 0x00, 0x91,</div><div class='add'>+0x40, 0x4C, 0x02, 0x10, 0x89, 0xC0, 0x24, 0x00, 0x83, 0x08, 0x4C, 0x02, 0xF0,</div><div class='add'>+0x19, 0xC0, 0x64, 0x01, 0x90, 0x00, 0x7C, 0x02, 0x30, 0x19, 0xC0, 0x43, 0x20,</div><div class='add'>+0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x20, 0xA6, 0x02, 0x91, 0x01, 0x44,</div><div class='add'>+0x06, 0xD0, 0x39, 0x41, 0x64, 0x10, 0x91, 0x00, 0x74, 0x02, 0xD0, 0x09, 0x50,</div><div class='add'>+0x24, 0x40, 0x91, 0x40, 0x44, 0x02, 0xD0, 0x19, 0x44, 0xE4, 0x40, 0x91, 0x01,</div><div class='add'>+0x04, 0x02, 0x15, 0x08, 0x40, 0x20, 0x00, 0x9B, 0x03, 0x44, 0x02, 0xD0, 0x19,</div><div class='add'>+0x40, 0x20, 0x20, 0x91, 0x09, 0x34, 0x02, 0x10, 0x19, 0x40, 0x07, 0x00, 0x08,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0xA0, 0x20, 0x44, 0xC1, 0x04, 0x45, 0x02,</div><div class='add'>+0xD0, 0x49, 0x40, 0x24, 0x01, 0x91, 0x00, 0x74, 0x02, 0xD0, 0x0D, 0x50, 0x34,</div><div class='add'>+0x10, 0x99, 0x00, 0x65, 0x02, 0xC0, 0x09, 0x40, 0x24, 0x01, 0x95, 0x04, 0x44,</div><div class='add'>+0x12, 0x51, 0x29, 0x50, 0x24, 0x20, 0x91, 0x00, 0x44, 0x02, 0xD0, 0x49, 0x50,</div><div class='add'>+0x24, 0x40, 0xDD, 0x80, 0x74, 0x12, 0x10, 0x89, 0x40, 0x63, 0x00, 0x02, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x10, 0x20, 0x20, 0x00, 0x81, 0x04, 0x04, 0x02, 0xD0,</div><div class='add'>+0x48, 0x40, 0x20, 0x01, 0x81, 0x04, 0x34, 0x02, 0xD0, 0x49, 0x40, 0x20, 0x01,</div><div class='add'>+0x89, 0x04, 0x04, 0x13, 0xD0, 0x08, 0x40, 0x60, 0x81, 0x85, 0x20, 0x46, 0x12,</div><div class='add'>+0x50, 0x48, 0x40, 0x24, 0x01, 0xC9, 0x04, 0x04, 0x02, 0xD0, 0x48, 0x40, 0x24,</div><div class='add'>+0x00, 0x8D, 0x04, 0x74, 0x02, 0x14, 0x08, 0x40, 0x43, 0x80, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x1D, 0xB0, 0x86, 0x02, 0x13, 0x0A, 0x4C, 0x29, 0xF0, 0x01,</div><div class='add'>+0xC0, 0x84, 0x02, 0x13, 0x00, 0x7C, 0x00, 0xF0, 0x01, 0xC0, 0x04, 0x00, 0x1B,</div><div class='add'>+0x00, 0x6C, 0x00, 0xD2, 0xA1, 0xC0, 0x04, 0x20, 0x07, 0x2A, 0x4C, 0x28, 0x70,</div><div class='add'>+0x01, 0xD0, 0x84, 0x42, 0x13, 0x0A, 0x4D, 0x28, 0xF0, 0xA1, 0xC0, 0x84, 0x02,</div><div class='add'>+0x1F, 0x00, 0x7C, 0x00, 0x30, 0x01, 0xC0, 0x77, 0xC0, 0x0A, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x19, 0xB8, 0x27, 0x00, 0xBF, 0x08, 0x7C, 0x02, 0xF0, 0x8B, 0xD0,</div><div class='add'>+0x2F, 0x42, 0xBF, 0x08, 0x7C, 0x02, 0xF0, 0x8B, 0xD0, 0x2F, 0x02, 0x97, 0x08,</div><div class='add'>+0x7C, 0x22, 0xF0, 0x0A, 0xD0, 0x2F, 0x22, 0xBB, 0x00, 0xFD, 0x22, 0xB0, 0x8B,</div><div class='add'>+0xD0, 0x2F, 0x02, 0xBF, 0x08, 0x7C, 0x02, 0xF0, 0x8B, 0xC0, 0x2F, 0x10, 0xB3,</div><div class='add'>+0x08, 0xFC, 0x02, 0xF0, 0x09, 0xC0, 0x67, 0x60, 0x0E, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x18, 0xA0, 0x2F, 0x00, 0xB7, 0x0C, 0xCC, 0x02, 0xF0, 0x0B, 0xC0, 0x2C,</div><div class='add'>+0x02, 0xB3, 0x04, 0x3C, 0x02, 0xF0, 0x49, 0xC0, 0x24, 0x00, 0x9F, 0x01, 0xCC,</div><div class='add'>+0x16, 0x30, 0x0A, 0xC0, 0x6C, 0x28, 0xBF, 0x00, 0xCC, 0x1E, 0x30, 0x5B, 0xC0,</div><div class='add'>+0x6F, 0x41, 0xB3, 0x05, 0xCC, 0x02, 0xF0, 0xCB, 0xC0, 0x2C, 0x00, 0xB3, 0x00,</div><div class='add'>+0xFC, 0x02, 0xF0, 0x0B, 0xC0, 0x60, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x1C, 0x08, 0x07, 0x01, 0x11, 0x0C, 0x6C, 0x40, 0xD0, 0x01, 0x40, 0x04, 0x02,</div><div class='add'>+0x11, 0x00, 0x74, 0x00, 0xD0, 0x81, 0x40, 0x84, 0x10, 0x3D, 0x02, 0x45, 0x08,</div><div class='add'>+0xB0, 0x51, 0x40, 0x04, 0x00, 0x1D, 0x15, 0x45, 0x14, 0x10, 0x01, 0x40, 0xC3,</div><div class='add'>+0x15, 0x11, 0x14, 0x44, 0x10, 0xD1, 0xC1, 0x40, 0x04, 0x04, 0x11, 0x00, 0x74,</div><div class='add'>+0x00, 0xD0, 0x01, 0x40, 0x70, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10,</div><div class='add'>+0xA0, 0x23, 0x05, 0x85, 0x04, 0x04, 0x12, 0xD0, 0x88, 0x40, 0x70, 0x60, 0x81,</div><div class='add'>+0x08, 0xB4, 0x02, 0xD0, 0x1A, 0x50, 0x6A, 0x02, 0xAD, 0x02, 0x04, 0x22, 0x10,</div><div class='add'>+0x08, 0x61, 0xA0, 0x00, 0x8D, 0x81, 0x04, 0x1A, 0x90, 0x38, 0x40, 0x23, 0x42,</div><div class='add'>+0x81, 0x06, 0x04, 0x52, 0xD1, 0x58, 0x40, 0x20, 0x41, 0xC1, 0x08, 0x34, 0x06,</div><div class='add'>+0xD0, 0x0C, 0x40, 0x40, 0x80, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0xA8,</div><div class='add'>+0x21, 0x00, 0x91, 0x10, 0x64, 0x02, 0xD0, 0x89, 0x10, 0x20, 0x01, 0x91, 0x04,</div><div class='add'>+0x74, 0x02, 0xD0, 0x0B, 0x40, 0x2E, 0x01, 0xBD, 0x00, 0x44, 0x02, 0x90, 0x09,</div><div class='add'>+0x60, 0x24, 0x00, 0x9D, 0x40, 0x44, 0x02, 0x90, 0x09, 0x40, 0x27, 0x20, 0x91,</div><div class='add'>+0x04, 0x44, 0x02, 0xD0, 0x09, 0x40, 0x30, 0x00, 0x91, 0x11, 0x74, 0x02, 0xD0,</div><div class='add'>+0x09, 0x40, 0x60, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x28, 0x25,</div><div class='add'>+0x00, 0x97, 0x00, 0x4C, 0x02, 0xF0, 0x19, 0xC0, 0x24, 0x00, 0x93, 0x05, 0x7C,</div><div class='add'>+0x02, 0xF0, 0x09, 0xC0, 0xA6, 0x00, 0x9F, 0x00, 0x4C, 0x02, 0x30, 0x09, 0xD0,</div><div class='add'>+0x24, 0x20, 0x9F, 0x02, 0x4C, 0x06, 0xB0, 0x29, 0xE0, 0x67, 0x02, 0x93, 0x04,</div><div class='add'>+0x4D, 0x02, 0xF0, 0x19, 0xD0, 0x64, 0x00, 0x93, 0x03, 0x7C, 0x02, 0xF2, 0x09,</div><div class='add'>+0xD0, 0x14, 0xA0, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x00, 0x25, 0x00,</div><div class='add'>+0x9F, 0x00, 0x7C, 0x02, 0xF0, 0x09, 0xC0, 0x27, 0x10, 0x9F, 0x01, 0x7C, 0x02,</div><div class='add'>+0xF0, 0x98, 0xC0, 0x25, 0x00, 0x9F, 0x40, 0x7C, 0x02, 0xF2, 0x09, 0xC0, 0x27,</div><div class='add'>+0x00, 0x9F, 0x09, 0x7C, 0x0E, 0x70, 0x89, 0xC0, 0x27, 0x00, 0x9F, 0x00, 0x7C,</div><div class='add'>+0x02, 0xF0, 0x39, 0xC0, 0xE7, 0x00, 0x9F, 0x40, 0x7C, 0x12, 0xF0, 0x09, 0xC0,</div><div class='add'>+0x53, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x08, 0x05, 0x00, 0x0F,</div><div class='add'>+0x03, 0x4D, 0x04, 0xF0, 0x11, 0xC0, 0x04, 0x00, 0x13, 0x00, 0x7C, 0x00, 0x30,</div><div class='add'>+0x11, 0xC0, 0x07, 0x00, 0x13, 0x00, 0x2C, 0x00, 0xF8, 0x01, 0xC1, 0x06, 0x04,</div><div class='add'>+0x13, 0x00, 0x0C, 0x40, 0xF0, 0x01, 0xC0, 0x04, 0x02, 0x13, 0x02, 0x7C, 0x00,</div><div class='add'>+0xF0, 0x41, 0xC0, 0x44, 0x02, 0x13, 0x02, 0x4C, 0x00, 0xF0, 0x01, 0xC0, 0x53,</div><div class='add'>+0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x00, 0xDC, 0x00, 0x7D, 0x01,</div><div class='add'>+0xC4, 0x15, 0x70, 0x16, 0x40, 0x9C, 0x00, 0x51, 0x01, 0x74, 0x01, 0x14, 0x05,</div><div class='add'>+0x40, 0x57, 0x00, 0x41, 0x00, 0xC4, 0x41, 0xD0, 0x07, 0x40, 0x1C, 0x20, 0x51,</div><div class='add'>+0x04, 0xC4, 0x09, 0xD1, 0x57, 0x40, 0x14, 0x10, 0x7B, 0x00, 0x74, 0x01, 0xD0,</div><div class='add'>+0x37, 0x40, 0x1C, 0x00, 0x51, 0x00, 0x45, 0x01, 0xD0, 0x04, 0x40, 0x53, 0x00,</div><div class='add'>+0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0xA0, 0xE2, 0x04, 0xCD, 0x01, 0x04,</div><div class='add'>+0x03, 0x50, 0x1C, 0x40, 0xB1, 0x04, 0x81, 0x01, 0x34, 0x03, 0x10, 0x0C, 0x40,</div><div class='add'>+0x73, 0x00, 0xC1, 0x00, 0x24, 0x13, 0xD0, 0x2D, 0x40, 0x72, 0x00, 0xD1, 0x40,</div><div class='add'>+0x04, 0x2A, 0x58, 0x7C, 0x40, 0x34, 0x00, 0xD1, 0x00, 0x34, 0x27, 0xD0, 0x0D,</div><div class='add'>+0x40, 0x30, 0x00, 0x81, 0x00, 0x04, 0x03, 0xD0, 0x0C, 0x40, 0x53, 0x00, 0x0A,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x80, 0x38, 0x04, 0xFD, 0x10, 0x84, 0x03,</div><div class='add'>+0x50, 0x06, 0x41, 0x29, 0x01, 0xA1, 0x10, 0xB4, 0x05, 0x10, 0x0E, 0x40, 0x53,</div><div class='add'>+0x04, 0x01, 0x00, 0x84, 0x00, 0xD0, 0x0B, 0x40, 0x4A, 0xC4, 0xA1, 0x00, 0x84,</div><div class='add'>+0x05, 0xD0, 0x12, 0x40, 0x38, 0x00, 0xE9, 0x00, 0xB4, 0x03, 0xD0, 0x2E, 0x40,</div><div class='add'>+0x38, 0x00, 0xC1, 0x01, 0x84, 0x03, 0xD0, 0x0E, 0x40, 0x17, 0x00, 0x02, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x14, 0x10, 0x68, 0x00, 0xEF, 0x01, 0x8C, 0x07, 0x70,</div><div class='add'>+0x10, 0xC0, 0xFD, 0x40, 0xE3, 0x01, 0xBC, 0x07, 0x30, 0x1E, 0xC0, 0x7B, 0x40,</div><div class='add'>+0xE3, 0x01, 0xAC, 0x04, 0xD0, 0x1A, 0xC0, 0x42, 0x00, 0xA3, 0x01, 0x8D, 0x02,</div><div class='add'>+0x78, 0x10, 0xC0, 0x78, 0x04, 0xE3, 0x01, 0xBC, 0x07, 0xF0, 0x1F, 0xC0, 0x7C,</div><div class='add'>+0x00, 0xE1, 0x01, 0x8C, 0x07, 0xF0, 0x1A, 0xC0, 0x57, 0x40, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x10, 0xB8, 0x25, 0x00, 0xCF, 0x00, 0x7C, 0x03, 0x70, 0x01,</div><div class='add'>+0xD0, 0x26, 0x00, 0xDF, 0x00, 0x7C, 0x01, 0xF0, 0x0D, 0xC0, 0x17, 0x00, 0x1F,</div><div class='add'>+0x00, 0x7C, 0x00, 0xF0, 0x09, 0xC0, 0x05, 0x00, 0x8F, 0x02, 0xFC, 0x00, 0xF0,</div><div class='add'>+0x01, 0xD0, 0xB7, 0x00, 0xDF, 0x00, 0x7C, 0x03, 0xF0, 0x0D, 0xD0, 0x37, 0x50,</div><div class='add'>+0xDF, 0x00, 0x7C, 0x03, 0xF0, 0x0D, 0xC0, 0x43, 0x60, 0x06, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x02, 0xA0, 0x6B, 0x00, 0xF3, 0x01, 0xCC, 0x23, 0xB4, 0x13, 0xC0,</div><div class='add'>+0x6C, 0x20, 0xF3, 0x01, 0xCC, 0x07, 0xF0, 0x16, 0xC0, 0x6C, 0x00, 0xF3, 0x01,</div><div class='add'>+0xBC, 0x04, 0x30, 0x1F, 0xD0, 0x4D, 0x00, 0xF3, 0x03, 0xCC, 0x24, 0xF0, 0x13,</div><div class='add'>+0xC0, 0x7F, 0x08, 0xF3, 0x01, 0xDC, 0x06, 0x30, 0x1F, 0xC0, 0x7C, 0x10, 0xF3,</div><div class='add'>+0x81, 0xFC, 0x07, 0xF0, 0x1F, 0xC0, 0x03, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x15, 0x80, 0xB9, 0x00, 0x71, 0x02, 0x84, 0x03, 0x10, 0x02, 0x40, 0x28,</div><div class='add'>+0x00, 0xE1, 0x00, 0xAC, 0x01, 0xC0, 0x06, 0xC0, 0x08, 0x00, 0x21, 0x00, 0x84,</div><div class='add'>+0x08, 0x00, 0x4B, 0x40, 0x08, 0x01, 0xA5, 0x04, 0x94, 0x00, 0xD0, 0x02, 0xC0,</div><div class='add'>+0x39, 0x00, 0xE5, 0x02, 0xC4, 0x02, 0x50, 0x0E, 0x40, 0x1C, 0x00, 0xE1, 0x14,</div><div class='add'>+0xB4, 0x03, 0xD0, 0x0E, 0x40, 0x57, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x08, 0x09, 0x00, 0xE1, 0x00, 0x84, 0x22, 0x18, 0x02, 0x41, 0x38, 0x00,</div><div class='add'>+0xA1, 0x10, 0x84, 0x03, 0xD0, 0x26, 0x40, 0x20, 0x00, 0xC1, 0x00, 0x94, 0x00,</div><div class='add'>+0x10, 0x0A, 0x45, 0x09, 0x20, 0xE1, 0x80, 0x84, 0x08, 0xD8, 0x02, 0x40, 0x33,</div><div class='add'>+0x00, 0xE1, 0x00, 0x94, 0x02, 0x10, 0x0C, 0x40, 0x38, 0x00, 0xE1, 0x00, 0xB4,</div><div class='add'>+0x0B, 0xD0, 0x0E, 0x40, 0x03, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06,</div><div class='add'>+0x28, 0x13, 0x00, 0x41, 0x00, 0x44, 0x02, 0x14, 0x00, 0x40, 0x20, 0x02, 0x81,</div><div class='add'>+0x01, 0x24, 0x01, 0xD0, 0x04, 0x40, 0x00, 0x00, 0x01, 0x00, 0x05, 0x00, 0x14,</div><div class='add'>+0x18, 0x40, 0x40, 0x0A, 0x81, 0x53, 0x14, 0x04, 0xD0, 0x30, 0x40, 0x31, 0x20,</div><div class='add'>+0xC5, 0x02, 0x04, 0x02, 0x50, 0x2C, 0x40, 0x50, 0x00, 0xC1, 0x00, 0x34, 0x23,</div><div class='add'>+0xD0, 0x0C, 0x40, 0x13, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0xA8,</div><div class='add'>+0x21, 0x00, 0xD3, 0x02, 0x4C, 0x03, 0x34, 0x01, 0xD0, 0x1C, 0x50, 0x83, 0x03,</div><div class='add'>+0x4D, 0x02, 0xF0, 0x09, 0xC0, 0x74, 0x40, 0xD3, 0x00, 0x5C, 0x00, 0x30, 0x1D,</div><div class='add'>+0xC8, 0x45, 0xE0, 0x93, 0x05, 0x0C, 0x12, 0xF0, 0x69, 0xC0, 0x37, 0x00, 0xD3,</div><div class='add'>+0x02, 0x5C, 0x02, 0x31, 0x0D, 0xC4, 0x74, 0x24, 0xD3, 0x80, 0x7C, 0x07, 0xF0,</div><div class='add'>+0x0D, 0xC0, 0x57, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0xA7,</div><div class='add'>+0x40, 0xDF, 0x42, 0x7C, 0x03, 0x70, 0x01, 0xC0, 0x97, 0x08, 0x9F, 0x10, 0x5C,</div><div class='add'>+0x00, 0xF0, 0x09, 0xC0, 0x51, 0x00, 0x1F, 0x00, 0x5C, 0x08, 0xF0, 0x0D, 0xC0,</div><div class='add'>+0x83, 0x00, 0x9F, 0x00, 0x7C, 0x00, 0xF0, 0x01, 0xC0, 0x37, 0x00, 0xDF, 0x00,</div><div class='add'>+0x7C, 0x02, 0xF0, 0x75, 0xD0, 0x37, 0x00, 0xDF, 0x00, 0x7C, 0x02, 0xF0, 0x0D,</div><div class='add'>+0xC0, 0x07, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x08, 0x6F, 0x21,</div><div class='add'>+0xB3, 0x90, 0xCC, 0x03, 0x30, 0x00, 0xC0, 0x1C, 0x00, 0xDF, 0x00, 0xCC, 0x06,</div><div class='add'>+0xF0, 0x0B, 0xC0, 0x3C, 0x00, 0xF3, 0x00, 0x8C, 0x04, 0x30, 0x4B, 0xC8, 0x04,</div><div class='add'>+0x00, 0xBD, 0x05, 0xFC, 0x02, 0x10, 0x03, 0xC1, 0x7B, 0x00, 0x33, 0x19, 0xCC,</div><div class='add'>+0x02, 0xF0, 0x0A, 0xC0, 0x2C, 0x00, 0xF1, 0x10, 0xFC, 0x03, 0xF0, 0x0F, 0xC0,</div><div class='add'>+0x03, 0x22, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x81, 0x20, 0xE6, 0x40, 0x91,</div><div class='add'>+0x02, 0x44, 0x07, 0x10, 0x11, 0x40, 0x94, 0x02, 0xDD, 0x00, 0x44, 0x00, 0xD0,</div><div class='add'>+0x08, 0x40, 0x14, 0x00, 0x01, 0x00, 0x44, 0x00, 0x10, 0x49, 0x40, 0xC4, 0x00,</div><div class='add'>+0x91, 0x00, 0x64, 0x04, 0x10, 0x11, 0x40, 0x37, 0x12, 0xD5, 0x03, 0x44, 0x06,</div><div class='add'>+0xD0, 0x11, 0x50, 0xA4, 0x00, 0xD1, 0x00, 0x74, 0x03, 0xD0, 0x0D, 0x40, 0x07,</div><div class='add'>+0x02, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xA0, 0x26, 0x00, 0xC1, 0x01,</div><div class='add'>+0x44, 0x07, 0x92, 0x11, 0x40, 0xA4, 0x00, 0xDD, 0x00, 0x44, 0x22, 0x50, 0x11,</div><div class='add'>+0x40, 0x24, 0x00, 0xD1, 0x00, 0x44, 0x20, 0x14, 0x04, 0x40, 0x44, 0x04, 0x91,</div><div class='add'>+0x00, 0x74, 0x04, 0xD0, 0x11, 0x44, 0x27, 0x00, 0xC1, 0x00, 0x44, 0x12, 0xD0,</div><div class='add'>+0x4D, 0x51, 0x70, 0x00, 0xD5, 0x01, 0x74, 0x07, 0xD0, 0x1D, 0x48, 0x07, 0x00,</div><div class='add'>+0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x20, 0x20, 0x00, 0xC1, 0x00, 0x04,</div><div class='add'>+0x07, 0x90, 0x10, 0x50, 0x20, 0x00, 0xCD, 0x00, 0x05, 0x00, 0xD0, 0x00, 0x40,</div><div class='add'>+0x00, 0x40, 0x01, 0x00, 0x06, 0x00, 0x50, 0x04, 0x40, 0x00, 0x00, 0x81, 0x00,</div><div class='add'>+0x64, 0x00, 0xD0, 0x00, 0x00, 0x23, 0x40, 0xC5, 0x20, 0x04, 0x02, 0xD0, 0x0C,</div><div class='add'>+0x48, 0x30, 0x00, 0xC5, 0x00, 0x34, 0x02, 0xD0, 0x0C, 0x40, 0x43, 0x80, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x26, 0x00, 0xD3, 0x40, 0x4C, 0x03,</div><div class='add'>+0xB4, 0x01, 0xC0, 0x30, 0x00, 0x9F, 0x00, 0x4C, 0x02, 0x70, 0x01, 0xC0, 0x24,</div><div class='add'>+0x20, 0xD3, 0x00, 0x4D, 0x00, 0x30, 0x01, 0xC0, 0x04, 0x00, 0xAB, 0x00, 0x7C,</div><div class='add'>+0x00, 0xF4, 0x01, 0xC8, 0x2F, 0x40, 0x03, 0x00, 0x4D, 0x02, 0xF0, 0x0D, 0xC0,</div><div class='add'>+0x34, 0x00, 0xD7, 0x00, 0x7C, 0x03, 0xF0, 0x0D, 0x80, 0x03, 0xC0, 0x0A, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x05, 0xA8, 0x2F, 0x00, 0xFF, 0x00, 0xBC, 0x01, 0x70,</div><div class='add'>+0x03, 0xC0, 0x3F, 0x00, 0xBF, 0x00, 0xFC, 0x00, 0xF0, 0x03, 0xC0, 0x0F, 0x00,</div><div class='add'>+0x3F, 0x00, 0xFC, 0x00, 0x91, 0x03, 0xC0, 0x0F, 0x10, 0xBB, 0x00, 0xEC, 0x00,</div><div class='add'>+0x30, 0x03, 0xC0, 0x2F, 0x00, 0xFF, 0x00, 0xFC, 0x02, 0xF0, 0x0F, 0xC0, 0x3F,</div><div class='add'>+0x00, 0xFB, 0x00, 0xFC, 0x03, 0xF0, 0x0F, 0xC0, 0x17, 0x60, 0x0E, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0xA3, 0x80, 0xC0, 0x0E, 0x02, 0x3A, 0x08, 0xE8, 0x28,</div><div class='add'>+0xB8, 0xA3, 0xC0, 0x8E, 0x02, 0x3A, 0x08, 0xEC, 0x28, 0xA0, 0x83, 0xE0, 0x8E,</div><div class='add'>+0x82, 0x3B, 0x0A, 0xEC, 0x28, 0xA8, 0x83, 0xC0, 0x8E, 0x82, 0x3B, 0x0E, 0xE6,</div><div class='add'>+0x28, 0xA0, 0x83, 0xE0, 0x8E, 0x82, 0x3B, 0x0A, 0xEC, 0x20, 0xB8, 0x83, 0xE0,</div><div class='add'>+0x0E, 0x82, 0x3A, 0x0A, 0xEE, 0x20, 0xB0, 0x03, 0x8C, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x83, 0x22, 0x20, 0x8E, 0x80, 0x3B, 0x02, 0xCA, 0x08, 0xA8,</div><div class='add'>+0x23, 0xA0, 0x8E, 0x80, 0x3A, 0x02, 0xE8, 0x08, 0xA8, 0x23, 0xE0, 0x8E, 0x00,</div><div class='add'>+0x13, 0x02, 0xE8, 0x08, 0xA8, 0x23, 0xA0, 0x84, 0x00, 0x3B, 0x02, 0xEC, 0x08,</div><div class='add'>+0x28, 0x23, 0xE0, 0x8A, 0x00, 0x39, 0x02, 0xE8, 0x08, 0xBA, 0x23, 0x40, 0x84,</div><div class='add'>+0x80, 0x3B, 0x00, 0xEE, 0x08, 0xA8, 0x03, 0x8C, 0x0A, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x21, 0x40, 0x80, 0x04, 0x01, 0x12, 0x04, 0x40, 0x10, 0x20, 0x41,</div><div class='add'>+0x80, 0x04, 0x01, 0x12, 0x04, 0x48, 0x10, 0x20, 0x41, 0x80, 0x84, 0x01, 0x12,</div><div class='add'>+0x06, 0x48, 0x10, 0x20, 0x41, 0x80, 0x04, 0x01, 0x12, 0x06, 0x48, 0x10, 0x00,</div><div class='add'>+0x41, 0x80, 0x04, 0x01, 0x12, 0x04, 0x48, 0x10, 0x20, 0x41, 0x80, 0x04, 0x01,</div><div class='add'>+0x12, 0x04, 0x48, 0x10, 0x20, 0x01, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x83, 0x00, 0x80, 0x0E, 0x00, 0x1A, 0x00, 0x6A, 0x08, 0xA2, 0x61, 0x80,</div><div class='add'>+0x86, 0xA0, 0x1A, 0x00, 0x28, 0x08, 0xA8, 0x01, 0x80, 0x06, 0x00, 0x1A, 0x80,</div><div class='add'>+0x68, 0x08, 0xAA, 0x01, 0x80, 0x86, 0x01, 0x1A, 0x00, 0x68, 0x08, 0xA8, 0x00,</div><div class='add'>+0x80, 0x86, 0x00, 0x3A, 0x02, 0x68, 0x00, 0xA0, 0x01, 0x80, 0x0E, 0x00, 0x0A,</div><div class='add'>+0x04, 0x60, 0x00, 0xA0, 0x01, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0xA0, 0x12, 0xA0, 0x4E, 0x80, 0x3A, 0x01, 0xEA, 0x04, 0xA0, 0x13, 0xA0, 0x4E,</div><div class='add'>+0x81, 0x3A, 0x01, 0xE8, 0x04, 0xA8, 0x13, 0xA0, 0xCE, 0x80, 0x3A, 0x01, 0xE8,</div><div class='add'>+0x34, 0xA8, 0x13, 0xA0, 0xCE, 0x80, 0x3A, 0x01, 0xEA, 0x04, 0xA8, 0x13, 0xA0,</div><div class='add'>+0x4E, 0x80, 0x2A, 0x01, 0xA8, 0x04, 0xA8, 0x12, 0xA0, 0x4E, 0x80, 0x32, 0x01,</div><div class='add'>+0xEA, 0x04, 0xA8, 0x03, 0x8C, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA3,</div><div class='add'>+0x02, 0x00, 0x06, 0x00, 0x18, 0x00, 0x60, 0x00, 0x80, 0x00, 0x00, 0x06, 0x00,</div><div class='add'>+0x18, 0x01, 0x62, 0x00, 0x80, 0x81, 0x00, 0x06, 0x01, 0x18, 0x00, 0x42, 0x00,</div><div class='add'>+0x80, 0x01, 0x00, 0x06, 0x00, 0x18, 0x08, 0x60, 0x10, 0x80, 0x01, 0x00, 0x06,</div><div class='add'>+0x03, 0x18, 0x00, 0x62, 0x00, 0x80, 0x01, 0x00, 0x06, 0x00, 0x18, 0x00, 0x60,</div><div class='add'>+0x00, 0x80, 0x01, 0x8C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA3, 0x82,</div><div class='add'>+0x20, 0x04, 0x80, 0x10, 0x00, 0x42, 0x14, 0x00, 0x10, 0x20, 0x84, 0x80, 0x10,</div><div class='add'>+0x08, 0x42, 0x10, 0x08, 0x11, 0x20, 0x04, 0x80, 0x10, 0x0C, 0x42, 0x08, 0x08,</div><div class='add'>+0x11, 0x20, 0x04, 0x80, 0x10, 0x00, 0x42, 0x00, 0x08, 0x11, 0x20, 0x04, 0x80,</div><div class='add'>+0x10, 0x04, 0x42, 0x04, 0x08, 0x01, 0x20, 0x04, 0x80, 0x10, 0x01, 0x42, 0x04,</div><div class='add'>+0x08, 0x01, 0x8C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA2, 0xF2, 0xA0,</div><div class='add'>+0x02, 0x03, 0x0A, 0x04, 0x28, 0x1C, 0xAA, 0x50, 0xA0, 0x02, 0x01, 0x0A, 0x06,</div><div class='add'>+0x2A, 0x10, 0xA0, 0xD0, 0x80, 0x02, 0x01, 0x0A, 0x04, 0x0A, 0x30, 0xA0, 0x50,</div><div class='add'>+0xA0, 0x02, 0x01, 0x0A, 0x0E, 0x28, 0x10, 0xA0, 0x50, 0x80, 0x82, 0x01, 0x0A,</div><div class='add'>+0x04, 0x2A, 0x14, 0xA0, 0x40, 0x80, 0x02, 0x01, 0x2A, 0x05, 0x28, 0x3C, 0xA8,</div><div class='add'>+0x00, 0x8C, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x30, 0x80, 0xC8,</div><div class='add'>+0x00, 0xA2, 0x03, 0xA8, 0x2E, 0xA0, 0x32, 0x80, 0xEA, 0x00, 0xAA, 0x03, 0x08,</div><div class='add'>+0x0C, 0xA0, 0x3A, 0x80, 0x6A, 0x00, 0x82, 0x01, 0x08, 0x0C, 0x20, 0x3A, 0x80,</div><div class='add'>+0x6A, 0x00, 0x82, 0x03, 0x08, 0x0C, 0xA0, 0x3A, 0x80, 0xEA, 0x01, 0xA2, 0x03,</div><div class='add'>+0x08, 0x0E, 0xA0, 0x3A, 0x80, 0xE0, 0x00, 0xAA, 0x03, 0x08, 0x1C, 0x20, 0x02,</div><div class='add'>+0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x30, 0x00, 0x08, 0x80,</div><div class='add'>+0x30, 0x01, 0x20, 0x18, 0x80, 0x00, 0x00, 0xC2, 0x01, 0x08, 0x02, 0x00, 0x04,</div><div class='add'>+0x80, 0x00, 0x00, 0x82, 0x00, 0x00, 0x02, 0x00, 0x08, 0x08, 0x02, 0x00, 0x82,</div><div class='add'>+0x00, 0x10, 0x06, 0x00, 0x04, 0x80, 0x00, 0x00, 0x82, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x80, 0x00, 0x00, 0x44, 0x00, 0x08, 0x00, 0x00, 0x08, 0x00, 0x82, 0x04,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA3, 0x16, 0x40, 0x18, 0x00, 0x61,</div><div class='add'>+0x00, 0x04, 0x21, 0x10, 0x04, 0x40, 0x10, 0x00, 0x41, 0x01, 0x06, 0x01, 0x10,</div><div class='add'>+0x04, 0x40, 0x10, 0x80, 0x41, 0x00, 0x06, 0x01, 0x10, 0x06, 0x40, 0x10, 0x80,</div><div class='add'>+0x41, 0x00, 0x06, 0x01, 0x10, 0x04, 0x40, 0x10, 0x80, 0x41, 0x00, 0x06, 0x01,</div><div class='add'>+0x10, 0x04, 0x60, 0x14, 0x00, 0x41, 0x00, 0x04, 0x01, 0x10, 0x82, 0x8C, 0x0A,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA3, 0x02, 0xA0, 0x06, 0x80, 0x9A, 0x00,</div><div class='add'>+0x6D, 0x02, 0xA0, 0x01, 0xA0, 0x26, 0x40, 0x9B, 0x00, 0x4A, 0x00, 0xB0, 0x09,</div><div class='add'>+0x88, 0x26, 0x80, 0x92, 0x00, 0x48, 0x00, 0x80, 0x09, 0xA0, 0x26, 0x40, 0x92,</div><div class='add'>+0x00, 0x48, 0x00, 0xB0, 0x09, 0x80, 0x26, 0x80, 0x9A, 0x00, 0x4A, 0x02, 0xA8,</div><div class='add'>+0x09, 0xA0, 0x24, 0x80, 0x9B, 0x00, 0x4A, 0x00, 0xA8, 0x01, 0x8C, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0xA3, 0x02, 0xC0, 0x06, 0x00, 0x1A, 0x01, 0x68,</div><div class='add'>+0x00, 0xB0, 0x01, 0xC0, 0x46, 0x80, 0x1A, 0x00, 0x6E, 0x04, 0xA8, 0x01, 0xC0,</div><div class='add'>+0x06, 0x80, 0x1B, 0x00, 0x6A, 0x00, 0xB0, 0x01, 0xE0, 0x06, 0x80, 0x1B, 0x00,</div><div class='add'>+0x6E, 0x04, 0xA8, 0x01, 0xC8, 0x06, 0x00, 0x1A, 0x00, 0x6E, 0x00, 0xB0, 0x01,</div><div class='add'>+0xE0, 0x46, 0x80, 0x1A, 0x00, 0x6E, 0x00, 0xB0, 0x01, 0x8C, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0xA3, 0x42, 0x20, 0x0C, 0x81, 0x31, 0x0C, 0x82, 0x10,</div><div class='add'>+0x08, 0x43, 0x20, 0x0C, 0x81, 0x30, 0x04, 0xC0, 0x30, 0x08, 0x43, 0x20, 0x0C,</div><div class='add'>+0x01, 0x30, 0x0C, 0xC2, 0x30, 0x10, 0x43, 0x20, 0x0C, 0x03, 0x30, 0x0C, 0xC0,</div><div class='add'>+0x30, 0x08, 0x43, 0x20, 0x0C, 0x81, 0x30, 0x0C, 0xC0, 0x10, 0x08, 0x43, 0x00,</div><div class='add'>+0x0C, 0x81, 0x30, 0x04, 0xC2, 0x10, 0x08, 0x03, 0x8C, 0x0A, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x4C, 0x00, 0x30, 0x00, 0xC0, 0x00, 0x00,</div><div class='add'>+0x03, 0x00, 0x0C, 0x00, 0x30, 0x01, 0xC0, 0x00, 0x00, 0x03, 0x00, 0x4C, 0x00,</div><div class='add'>+0x30, 0x01, 0xC0, 0x04, 0x00, 0x03, 0x00, 0x4C, 0x00, 0x30, 0x01, 0xC0, 0x00,</div><div class='add'>+0x00, 0x03, 0x00, 0x4C, 0x00, 0x30, 0x01, 0xC0, 0x00, 0x00, 0x13, 0x08, 0x08,</div><div class='add'>+0x00, 0x20, 0x00, 0xC0, 0x00, 0x00, 0x03, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x21, 0x40, 0x80, 0x4C, 0x23, 0x32, 0x04, 0xCA, 0x10, 0x20, 0x43,</div><div class='add'>+0x80, 0x0C, 0x03, 0x32, 0x0C, 0xCA, 0x10, 0x20, 0x43, 0x88, 0x4C, 0x23, 0x32,</div><div class='add'>+0x05, 0xC8, 0x14, 0x20, 0x43, 0x80, 0x4C, 0x81, 0x32, 0x05, 0xCA, 0x10, 0x20,</div><div class='add'>+0x43, 0x80, 0x48, 0x03, 0x32, 0x05, 0x88, 0x10, 0x20, 0xD3, 0xA0, 0x0C, 0x03,</div><div class='add'>+0x32, 0x04, 0xCA, 0x10, 0x20, 0x03, 0x84, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0xA2, 0x42, 0xA0, 0x06, 0x83, 0x3A, 0x04, 0x6A, 0x10, 0xA8, 0x41, 0xA0,</div><div class='add'>+0x06, 0x83, 0x1A, 0x0C, 0x4A, 0x30, 0xA8, 0x41, 0xA0, 0x06, 0x81, 0x1A, 0x0C,</div><div class='add'>+0x4A, 0x30, 0xA8, 0x41, 0x80, 0x0E, 0x83, 0x1A, 0x0C, 0x4A, 0x30, 0x88, 0x41,</div><div class='add'>+0xA0, 0x06, 0x01, 0x0A, 0x0C, 0x08, 0x10, 0xA8, 0x41, 0xA0, 0x06, 0x83, 0x1A,</div><div class='add'>+0x04, 0x6A, 0x10, 0xA8, 0x01, 0x8C, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0xA3, 0x40, 0x00, 0x04, 0x01, 0x18, 0x04, 0xC0, 0x10, 0x00, 0x41, 0x00, 0x04,</div><div class='add'>+0x01, 0x20, 0x04, 0x40, 0x10, 0x00, 0x42, 0x00, 0x00, 0x01, 0x10, 0x04, 0x40,</div><div class='add'>+0x10, 0x80, 0x41, 0x00, 0x04, 0x01, 0x10, 0x04, 0x00, 0x10, 0x00, 0x43, 0x00,</div><div class='add'>+0x00, 0x81, 0x10, 0x04, 0x40, 0x10, 0x00, 0x41, 0x00, 0x0C, 0x01, 0x30, 0x04,</div><div class='add'>+0x40, 0x10, 0x00, 0x01, 0x8C, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA3,</div><div class='add'>+0x4A, 0x20, 0x2C, 0x81, 0x10, 0x0C, 0x82, 0x12, 0x88, 0x41, 0x20, 0x26, 0x81,</div><div class='add'>+0xB0, 0x04, 0x42, 0x10, 0x08, 0x43, 0x20, 0x26, 0x83, 0x90, 0x04, 0x02, 0x12,</div><div class='add'>+0x08, 0x41, 0x00, 0x26, 0x81, 0x90, 0x04, 0x42, 0x10, 0x08, 0x43, 0x20, 0x26,</div><div class='add'>+0x83, 0x90, 0x04, 0x40, 0x10, 0x88, 0xC9, 0x20, 0x0C, 0x81, 0xB0, 0x04, 0x62,</div><div class='add'>+0x12, 0x88, 0x01, 0x8C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA2, 0x06,</div><div class='add'>+0x20, 0x1A, 0x00, 0x62, 0x00, 0x88, 0x01, 0xA8, 0x06, 0xA0, 0x1A, 0x80, 0x62,</div><div class='add'>+0x00, 0x80, 0x01, 0x28, 0x06, 0xA0, 0x1A, 0x80, 0x42, 0x00, 0x0A, 0x01, 0xA0,</div><div class='add'>+0x06, 0x80, 0x18, 0x00, 0x6A, 0x00, 0x88, 0x01, 0x28, 0x06, 0xA0, 0x1A, 0x80,</div><div class='add'>+0x6A, 0x80, 0x08, 0x01, 0xA8, 0x06, 0x80, 0x18, 0x80, 0x62, 0x00, 0xA8, 0x01,</div><div class='add'>+0x88, 0x02, 0x8C, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x80,</div><div class='add'>+0x82, 0x01, 0x0A, 0x06, 0x28, 0x18, 0xA0, 0x60, 0x80, 0x82, 0x01, 0x0A, 0x06,</div><div class='add'>+0x28, 0x18, 0xA0, 0x60, 0x80, 0x82, 0x01, 0x0A, 0x06, 0x28, 0x18, 0xA0, 0x60,</div><div class='add'>+0xA0, 0x82, 0x01, 0x2A, 0x06, 0x28, 0x18, 0xA0, 0x60, 0x80, 0x82, 0x01, 0x0A,</div><div class='add'>+0x06, 0xAA, 0x18, 0xA0, 0x60, 0x80, 0x8A, 0x01, 0x0A, 0x06, 0x28, 0x18, 0xA0,</div><div class='add'>+0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x48, 0x80, 0x20,</div><div class='add'>+0x81, 0x02, 0x84, 0x08, 0x12, 0x20, 0x40, 0x80, 0x20, 0x81, 0x82, 0x04, 0x08,</div><div class='add'>+0x10, 0x20, 0x40, 0x80, 0x20, 0x01, 0x82, 0x04, 0x4A, 0x12, 0x20, 0x40, 0x80,</div><div class='add'>+0x20, 0x01, 0x82, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x20, 0x01, 0x82, 0x04,</div><div class='add'>+0x08, 0x10, 0x20, 0x48, 0x80, 0x00, 0x01, 0x82, 0x04, 0x48, 0x12, 0x20, 0x00,</div><div class='add'>+0x0C, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA3, 0x62, 0xC0, 0x80, 0x01,</div><div class='add'>+0x03, 0x06, 0xAC, 0x18, 0xB0, 0x62, 0xC0, 0x8A, 0x01, 0x2B, 0x06, 0xAE, 0x18,</div><div class='add'>+0xB0, 0x62, 0xC0, 0x8A, 0x81, 0x2B, 0x06, 0xAC, 0x18, 0xA0, 0x62, 0xC0, 0x8A,</div><div class='add'>+0x81, 0x29, 0x06, 0xAE, 0x18, 0xB0, 0x62, 0xC0, 0x8A, 0x01, 0x2B, 0x06, 0xA6,</div><div class='add'>+0x18, 0xB0, 0x62, 0x60, 0x8A, 0x01, 0x2B, 0x06, 0xAC, 0x18, 0xB0, 0x02, 0x8C,</div><div class='add'>+0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA2, 0x62, 0x80, 0x8E, 0x01, 0x3A,</div><div class='add'>+0x06, 0xEE, 0x18, 0xA4, 0x63, 0x80, 0x8E, 0x81, 0x3A, 0x06, 0xE8, 0x18, 0xB0,</div><div class='add'>+0x63, 0x80, 0x8E, 0x01, 0x3A, 0x06, 0xEA, 0x18, 0xA8, 0x63, 0x80, 0x8E, 0x81,</div><div class='add'>+0x3A, 0x06, 0xE0, 0x18, 0xB0, 0x63, 0x80, 0x8E, 0x81, 0x3B, 0x06, 0xE8, 0x18,</div><div class='add'>+0xA8, 0x63, 0x20, 0x8E, 0x81, 0x3B, 0x06, 0xEA, 0x18, 0xA8, 0x03, 0x8C, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA2, 0x62, 0xC0, 0x8E, 0x01, 0x3A, 0x06,</div><div class='add'>+0xE8, 0x18, 0xB0, 0x63, 0xC0, 0x8E, 0x01, 0x3A, 0x06, 0xCC, 0x18, 0xA0, 0x63,</div><div class='add'>+0xC0, 0x8E, 0x01, 0x3B, 0x86, 0xEA, 0x18, 0x30, 0x63, 0xC0, 0x8E, 0x01, 0x3B,</div><div class='add'>+0x06, 0xCC, 0x18, 0xA0, 0x63, 0xC0, 0x8E, 0x01, 0x3B, 0x06, 0xEC, 0x18, 0xB0,</div><div class='add'>+0x63, 0xE0, 0x8E, 0x81, 0x3A, 0x06, 0xEE, 0x18, 0xB0, 0x03, 0x88, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0xA2, 0x62, 0xA0, 0x8E, 0x81, 0x31, 0x06, 0xC2,</div><div class='add'>+0x18, 0xA8, 0x63, 0xA0, 0x8E, 0x81, 0x30, 0x06, 0xC2, 0x18, 0x0A, 0x63, 0xA0,</div><div class='add'>+0x8E, 0x01, 0x10, 0x06, 0xC4, 0x18, 0x30, 0x63, 0x00, 0x8C, 0x21, 0x10, 0x06,</div><div class='add'>+0xC0, 0x18, 0x08, 0x61, 0xA0, 0x8E, 0xA1, 0x38, 0x86, 0x80, 0x18, 0xA8, 0x63,</div><div class='add'>+0x00, 0x84, 0x81, 0x38, 0x06, 0xEE, 0x18, 0xA8, 0x03, 0x88, 0x0A, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x80, 0x04, 0x01, 0x1A, 0x04, 0xE8, 0x10,</div><div class='add'>+0x20, 0x41, 0x80, 0x04, 0x01, 0x3A, 0x04, 0x48, 0x10, 0xA0, 0x43, 0x80, 0x04,</div><div class='add'>+0x01, 0x12, 0x04, 0x68, 0x10, 0x20, 0x41, 0x00, 0x04, 0x01, 0x12, 0x04, 0x48,</div><div class='add'>+0x10, 0x20, 0x43, 0x80, 0x04, 0x01, 0x32, 0x04, 0x68, 0x10, 0x20, 0x41, 0x80,</div><div class='add'>+0x04, 0x01, 0x32, 0x04, 0x48, 0x10, 0x20, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x60, 0x80, 0x86, 0x01, 0x12, 0x06, 0x6A, 0x18, 0xA0,</div><div class='add'>+0x60, 0x88, 0x86, 0x81, 0x1A, 0x06, 0x48, 0x18, 0xA8, 0x60, 0x00, 0x82, 0x01,</div><div class='add'>+0x02, 0x86, 0x48, 0x18, 0xA0, 0x61, 0x80, 0x84, 0x01, 0x1A, 0x06, 0x48, 0x18,</div><div class='add'>+0xA8, 0x61, 0x88, 0x86, 0x01, 0x1A, 0x06, 0x48, 0x18, 0xA0, 0x61, 0x80, 0x84,</div><div class='add'>+0x01, 0x18, 0x06, 0x68, 0x18, 0xA0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0xA2, 0x02, 0xA0, 0x0E, 0x80, 0x3A, 0x00, 0xCA, 0x00, 0x28, 0x03,</div><div class='add'>+0xA0, 0x0A, 0x80, 0x32, 0x00, 0xC8, 0x00, 0xA8, 0x02, 0xA0, 0x0C, 0x00, 0x32,</div><div class='add'>+0x00, 0xC8, 0x00, 0xA8, 0x03, 0xA0, 0x0C, 0x00, 0x32, 0x00, 0xC8, 0x00, 0xA8,</div><div class='add'>+0x03, 0xA0, 0x0C, 0x00, 0x32, 0x00, 0xE8, 0x00, 0x28, 0x03, 0xA0, 0x0C, 0x80,</div><div class='add'>+0x32, 0x00, 0xCA, 0x00, 0xA8, 0x03, 0x88, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0xA2, 0x42, 0x00, 0x06, 0x01, 0x18, 0x04, 0x40, 0x10, 0x00, 0x41, 0x00,</div><div class='add'>+0x06, 0x01, 0x10, 0x0C, 0x42, 0x10, 0x80, 0x41, 0x00, 0x04, 0x83, 0x10, 0x0C,</div><div class='add'>+0x40, 0x10, 0x80, 0xC1, 0x00, 0x04, 0x83, 0x10, 0x04, 0x42, 0x10, 0x80, 0xC1,</div><div class='add'>+0x00, 0x04, 0x83, 0x10, 0x0C, 0x42, 0x30, 0x00, 0xC0, 0x00, 0x04, 0x03, 0x10,</div><div class='add'>+0x04, 0x60, 0x10, 0x80, 0x01, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0xA2, 0x42, 0x20, 0x04, 0x81, 0x10, 0x04, 0x62, 0x10, 0x88, 0x41, 0x20, 0x04,</div><div class='add'>+0x81, 0x18, 0x04, 0x62, 0x10, 0x08, 0x41, 0x20, 0x06, 0x81, 0x18, 0x04, 0x60,</div><div class='add'>+0x10, 0x08, 0x41, 0x20, 0x06, 0x81, 0x18, 0x04, 0x62, 0x10, 0x08, 0x41, 0x20,</div><div class='add'>+0x06, 0x81, 0x18, 0x04, 0x62, 0x10, 0x88, 0x41, 0x20, 0x06, 0x81, 0x18, 0x05,</div><div class='add'>+0x42, 0x10, 0x08, 0x01, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA2,</div><div class='add'>+0x42, 0xA0, 0x02, 0x01, 0x0A, 0x0C, 0xA8, 0x30, 0xA8, 0x42, 0xA0, 0x02, 0x03,</div><div class='add'>+0x2A, 0x04, 0xAA, 0x10, 0xA0, 0xC0, 0xA0, 0x0A, 0x81, 0x2A, 0x84, 0xA0, 0x10,</div><div class='add'>+0xA0, 0x40, 0xA0, 0x0A, 0x81, 0x2A, 0x0C, 0xAA, 0x10, 0xA0, 0x40, 0xA8, 0x0A,</div><div class='add'>+0x81, 0x2A, 0x04, 0x2A, 0x10, 0xA8, 0x42, 0xA0, 0x0A, 0x81, 0x2A, 0x0C, 0xA8,</div><div class='add'>+0x10, 0xA8, 0x00, 0x88, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+0x80, 0x0A, 0x01, 0x2A, 0x0C, 0xA8, 0x30, 0xA0, 0xC2, 0x80, 0x0A, 0x03, 0x2A,</div><div class='add'>+0x0C, 0xA8, 0x30, 0xA0, 0xC2, 0x80, 0x0A, 0x01, 0x2A, 0x04, 0xA8, 0x30, 0xA0,</div><div class='add'>+0xC2, 0x80, 0x0A, 0x01, 0x2A, 0x0C, 0xA8, 0x30, 0xA0, 0xC2, 0x80, 0x0A, 0x01,</div><div class='add'>+0x2A, 0x04, 0xA8, 0x30, 0xA0, 0x42, 0x80, 0x0A, 0x03, 0x2A, 0x05, 0xA8, 0x30,</div><div class='add'>+0xA0, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x10, 0x00,</div><div class='add'>+0x42, 0x80, 0x08, 0x00, 0x20, 0x00, 0x80, 0x10, 0x00, 0x02, 0x80, 0x08, 0x00,</div><div class='add'>+0x20, 0x04, 0x82, 0x00, 0x00, 0x02, 0x00, 0x08, 0x00, 0x22, 0x04, 0x80, 0x00,</div><div class='add'>+0x00, 0x02, 0x20, 0x08, 0x00, 0x20, 0x04, 0x80, 0x00, 0x00, 0x02, 0x20, 0x08,</div><div class='add'>+0x00, 0x20, 0x00, 0x80, 0x00, 0x00, 0x02, 0x00, 0x08, 0x00, 0x60, 0x04, 0x80,</div><div class='add'>+0x01, 0x80, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA2, 0x42, 0x40, 0x00,</div><div class='add'>+0x01, 0x01, 0x05, 0x04, 0x14, 0x10, 0x40, 0x40, 0x40, 0x01, 0x01, 0x0C, 0x44,</div><div class='add'>+0x10, 0x10, 0x50, 0x40, 0x00, 0x81, 0x01, 0x04, 0x00, 0x30, 0x00, 0x50, 0x00,</div><div class='add'>+0x00, 0x81, 0x01, 0x0C, 0x06, 0x10, 0x10, 0x50, 0x40, 0x00, 0x01, 0x01, 0x04,</div><div class='add'>+0x46, 0x14, 0x10, 0x40, 0x60, 0x44, 0x01, 0x01, 0x04, 0x04, 0x30, 0x10, 0x00,</div><div class='add'>+0x88, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA2, 0x00, 0xA0, 0x06, 0x80,</div><div class='add'>+0x1A, 0x00, 0x6E, 0x00, 0xA8, 0x01, 0x80, 0x06, 0x80, 0x1A, 0x00, 0x6A, 0x00,</div><div class='add'>+0xB8, 0x01, 0xA0, 0x06, 0x80, 0x1A, 0x00, 0x6A, 0x00, 0xA8, 0x01, 0xA0, 0x06,</div><div class='add'>+0x80, 0x1A, 0x00, 0x68, 0x00, 0xB0, 0x01, 0x80, 0x06, 0x80, 0x1A, 0x00, 0x6A,</div><div class='add'>+0x00, 0xA8, 0x01, 0xA0, 0x06, 0x80, 0x1B, 0x00, 0x6A, 0x00, 0xA8, 0x01, 0x88,</div><div class='add'>+0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA3, 0x02, 0xC0, 0x06, 0x00, 0x12,</div><div class='add'>+0x00, 0xE8, 0x00, 0xB0, 0x01, 0xC0, 0x06, 0x80, 0x3A, 0x00, 0x4C, 0x00, 0xA0,</div><div class='add'>+0x03, 0xC0, 0x06, 0x80, 0x13, 0x00, 0x4E, 0x00, 0xB0, 0x01, 0xC0, 0x06, 0x00,</div><div class='add'>+0x13, 0x00, 0x6E, 0x00, 0xA0, 0x03, 0xC0, 0x06, 0x00, 0x1B, 0x00, 0x4C, 0x00,</div><div class='add'>+0xB0, 0x01, 0xC0, 0x04, 0x00, 0x3A, 0x00, 0x6E, 0x00, 0xB0, 0x01, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x0C, 0x80, 0x11, 0x00,</div><div class='add'>+0x62, 0x00, 0x08, 0x02, 0x20, 0x0C, 0x80, 0x18, 0x00, 0x42, 0x00, 0x8A, 0x01,</div><div class='add'>+0x20, 0x0C, 0x02, 0x10, 0x00, 0x44, 0x00, 0x10, 0x01, 0x00, 0x0C, 0x02, 0x10,</div><div class='add'>+0x00, 0x40, 0x00, 0x80, 0x01, 0x20, 0x0C, 0x00, 0x10, 0x00, 0x40, 0x00, 0x08,</div><div class='add'>+0x83, 0x00, 0x04, 0x80, 0x18, 0x00, 0xC2, 0x00, 0x08, 0x03, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2C, 0x00, 0x90, 0x00, 0x40,</div><div class='add'>+0x02, 0x00, 0x0B, 0x00, 0x2C, 0x00, 0x90, 0x12, 0x40, 0x02, 0x00, 0x21, 0x00,</div><div class='add'>+0xA8, 0x01, 0x90, 0x12, 0x40, 0x02, 0x00, 0x21, 0x02, 0xAC, 0x08, 0x90, 0x22,</div><div class='add'>+0x40, 0x02, 0x00, 0x21, 0x00, 0xAC, 0x05, 0x90, 0x22, 0x40, 0x08, 0x00, 0x2B,</div><div class='add'>+0x02, 0xA4, 0x00, 0x90, 0x00, 0xC0, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x80, 0x8C, 0x00, 0x32, 0x0A, 0xCA, 0x28,</div><div class='add'>+0x22, 0xA3, 0x80, 0x8C, 0x02, 0x32, 0x06, 0x48, 0x28, 0x28, 0xA2, 0x88, 0x8C,</div><div class='add'>+0x82, 0x12, 0x00, 0x48, 0x08, 0x20, 0xA1, 0x80, 0x8C, 0x03, 0x32, 0x00, 0x48,</div><div class='add'>+0x28, 0x28, 0xA2, 0x80, 0x8C, 0x00, 0x22, 0x06, 0x08, 0x38, 0x20, 0xA3, 0x80,</div><div class='add'>+0x84, 0x82, 0x32, 0x02, 0xCA, 0x08, 0x20, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0xC4, 0xA0, 0x16, 0x83, 0x5A, 0x0C, 0x4A, 0x31, 0xA8,</div><div class='add'>+0xC5, 0xA0, 0x16, 0x83, 0x5A, 0x0E, 0x68, 0x31, 0xA8, 0x85, 0xA0, 0x16, 0x83,</div><div class='add'>+0x5A, 0x0C, 0x60, 0x31, 0xA8, 0x85, 0xA0, 0x16, 0x03, 0x5A, 0x0C, 0x6A, 0x31,</div><div class='add'>+0xA8, 0xC5, 0xA0, 0x16, 0x03, 0x58, 0x0E, 0x28, 0x31, 0xA8, 0xE4, 0x80, 0x12,</div><div class='add'>+0x82, 0x5A, 0x0C, 0x6A, 0x31, 0xA8, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x90, 0x01, 0x40, 0x06, 0x00, 0x09,</div><div class='add'>+0x00, 0x64, 0x00, 0x90, 0x00, 0x42, 0x02, 0x00, 0x91, 0x00, 0xA4, 0x00, 0x90,</div><div class='add'>+0x00, 0x40, 0x02, 0x00, 0x91, 0x00, 0xA4, 0x80, 0x90, 0x08, 0x40, 0x02, 0x00,</div><div class='add'>+0x31, 0x00, 0xA4, 0x80, 0x80, 0x00, 0x42, 0x0C, 0x00, 0x09, 0x20, 0x64, 0x02,</div><div class='add'>+0x90, 0x00, 0x40, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x10, 0x22, 0x42, 0x88, 0x18, 0x20, 0x42, 0x80, 0x88, 0x11, 0x22,</div><div class='add'>+0x06, 0x88, 0x18, 0x20, 0x62, 0x84, 0x88, 0x01, 0x22, 0x06, 0x88, 0x18, 0x20,</div><div class='add'>+0x60, 0x84, 0x88, 0x01, 0x22, 0x06, 0x88, 0x18, 0x20, 0x62, 0x84, 0x88, 0x21,</div><div class='add'>+0x26, 0x06, 0x88, 0x18, 0x20, 0x62, 0x80, 0x88, 0x21, 0x22, 0x06, 0x88, 0x18,</div><div class='add'>+0x20, 0x62, 0x84, 0x88, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0xA2, 0x0A, 0x08, 0x2A, 0x20, 0x08, 0x00, 0xA8, 0x02, 0xA2, 0x0A,</div><div class='add'>+0x84, 0x2A, 0x20, 0xAA, 0x80, 0xA0, 0x02, 0xA6, 0x0A, 0x1C, 0x2A, 0x28, 0xA8,</div><div class='add'>+0xC0, 0xA0, 0x02, 0xA2, 0x0A, 0x88, 0x2A, 0x20, 0xAA, 0x80, 0xA0, 0x02, 0xA2,</div><div class='add'>+0x0A, 0x88, 0x2A, 0xA0, 0xAA, 0x80, 0xA9, 0x02, 0xA2, 0x0A, 0x18, 0x28, 0x20,</div><div class='add'>+0xA8, 0x80, 0xA8, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x10, 0x84, 0x42, 0x10, 0x0A, 0x41, 0xA8, 0x04, 0xA0, 0x12, 0x80, 0x42, 0x10,</div><div class='add'>+0x2A, 0x41, 0x28, 0x84, 0xA1, 0x10, 0x84, 0x4A, 0x10, 0x2A, 0x61, 0xA8, 0x04,</div><div class='add'>+0xA1, 0x10, 0x84, 0x4A, 0x18, 0x2A, 0x61, 0xA8, 0x44, 0xA1, 0x10, 0x84, 0x4A,</div><div class='add'>+0x14, 0x2A, 0x61, 0xA8, 0x04, 0xA1, 0x12, 0x84, 0x4A, 0x10, 0x2A, 0x01, 0xA8,</div><div class='add'>+0x04, 0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50,</div><div class='add'>+0x80, 0x40, 0x81, 0x02, 0x8D, 0x08, 0x14, 0x00, 0x50, 0x80, 0x40, 0x83, 0x02,</div><div class='add'>+0x05, 0x08, 0x14, 0x20, 0x50, 0x80, 0x40, 0x01, 0x00, 0x05, 0x08, 0x14, 0x20,</div><div class='add'>+0x50, 0x00, 0x40, 0x01, 0x02, 0x05, 0x08, 0x14, 0x28, 0x50, 0x80, 0x40, 0x01,</div><div class='add'>+0x02, 0x85, 0x00, 0x14, 0x20, 0x50, 0x00, 0x40, 0x01, 0x00, 0x05, 0x00, 0x14,</div><div class='add'>+0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0xC0,</div><div class='add'>+0xCA, 0x00, 0x2B, 0x03, 0xA4, 0x0C, 0x10, 0x32, 0xC0, 0xCA, 0x00, 0x01, 0x03,</div><div class='add'>+0x0C, 0x0C, 0xB0, 0x32, 0x40, 0xC0, 0x80, 0x21, 0x03, 0x86, 0x0C, 0xA1, 0x32,</div><div class='add'>+0x00, 0xC8, 0x80, 0x01, 0x03, 0x86, 0x0C, 0xA0, 0x32, 0x40, 0xC8, 0x00, 0x20,</div><div class='add'>+0x03, 0x86, 0x0C, 0x10, 0x30, 0x60, 0xC8, 0x20, 0x21, 0x03, 0x84, 0x0C, 0xB0,</div><div class='add'>+0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xA2, 0x4E,</div><div class='add'>+0x80, 0x3A, 0x09, 0xEE, 0x04, 0xA0, 0x13, 0x80, 0x4E, 0x82, 0x3A, 0x11, 0xEA,</div><div class='add'>+0x04, 0xB8, 0x13, 0x90, 0x4E, 0x90, 0x3A, 0x21, 0x6A, 0x04, 0xA8, 0x13, 0xA0,</div><div class='add'>+0x4E, 0x88, 0x3A, 0x21, 0xCA, 0x04, 0xA8, 0x13, 0x10, 0x4C, 0x84, 0x32, 0x01,</div><div class='add'>+0xE8, 0x04, 0xA8, 0x13, 0xA0, 0x4E, 0x80, 0x3B, 0x01, 0xEA, 0x04, 0xA9, 0x03,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC4, 0x10, 0x12, 0x03,</div><div class='add'>+0x08, 0x8C, 0x20, 0x32, 0x80, 0xC4, 0x08, 0x02, 0x03, 0x08, 0x0C, 0x20, 0x31,</div><div class='add'>+0x82, 0xC0, 0x18, 0x02, 0x03, 0x08, 0x0C, 0x20, 0x31, 0x80, 0xC0, 0x18, 0x02,</div><div class='add'>+0x03, 0x08, 0x0C, 0x20, 0x31, 0x82, 0xC0, 0x18, 0x02, 0x03, 0x08, 0x0C, 0x20,</div><div class='add'>+0x30, 0x86, 0xC0, 0x00, 0x02, 0x23, 0x08, 0x0C, 0x20, 0x31, 0x84, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xF2, 0xFF, 0xCB,</div><div class='add'>+0xFF, 0x2F, 0xFF, 0xBF, 0xFC, 0xFF, 0xF2, 0xFF, 0xCB, 0xFF, 0x2F, 0xFF, 0xBF,</div><div class='add'>+0xFC, 0xFF, 0xF2, 0xFF, 0xCB, 0xFF, 0x2F, 0xFF, 0xBF, 0xFC, 0xFF, 0xF2, 0xFF,</div><div class='add'>+0xCB, 0xFF, 0x2F, 0xFF, 0xBF, 0xFC, 0xFF, 0xF2, 0xFF, 0xCB, 0xFF, 0x2F, 0xFF,</div><div class='add'>+0xBF, 0xFC, 0xFF, 0xF2, 0xFF, 0xCB, 0xFF, 0x2F, 0xFF, 0xBF, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xB4, 0xDF, 0xD0, 0x6C, 0x43, 0xB3, 0x0D,</div><div class='add'>+0xED, 0xBF, 0x34, 0xFB, 0xD2, 0xFE, 0xCB, 0xFF, 0x0D, 0xCD, 0xBE, 0x7C, 0xDB,</div><div class='add'>+0xF0, 0xFF, 0xCB, 0xFF, 0x2F, 0xED, 0xBF, 0x7C, 0xDB, 0xF0, 0xFF, 0xCB, 0xFF,</div><div class='add'>+0x2F, 0xCD, 0xBE, 0x7C, 0xDB, 0xF0, 0xFF, 0xCB, 0xB7, 0x2F, 0xDF, 0x36, 0x7C,</div><div class='add'>+0xDB, 0xF0, 0x6D, 0x43, 0xB3, 0x2F, 0xED, 0x37, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0xCC, 0x3F, 0x32, 0xF3, 0xC8, 0xCC, 0x23, 0xF3,</div><div class='add'>+0xBF, 0xCC, 0xFC, 0x32, 0xFF, 0xCB, 0xFF, 0x23, 0x33, 0xBF, 0xFC, 0x3C, 0xF2,</div><div class='add'>+0xFF, 0xCB, 0xFF, 0x2F, 0xF3, 0xBF, 0xFC, 0x3C, 0xF2, 0xFF, 0xCB, 0xFF, 0x2F,</div><div class='add'>+0x33, 0xBF, 0xFC, 0x3C, 0xF2, 0xFF, 0xCB, 0xCF, 0x2F, 0x3F, 0x8F, 0xFC, 0x3C,</div><div class='add'>+0xF2, 0xF3, 0xC8, 0xCC, 0x2F, 0xF3, 0x8F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0xDC, 0x78, 0x72, 0x63, 0x48, 0xEC, 0x21, 0xB1, 0x9F,</div><div class='add'>+0xDC, 0x7E, 0x12, 0x7B, 0x48, 0x8C, 0x21, 0xB7, 0x87, 0xC4, 0x7E, 0x12, 0x63,</div><div class='add'>+0x48, 0x8C, 0x21, 0x37, 0x86, 0xC4, 0x7E, 0x12, 0x63, 0x48, 0x8C, 0x21, 0xB7,</div><div class='add'>+0x87, 0xC4, 0x7E, 0x12, 0x63, 0x48, 0x8C, 0x21, 0xB1, 0x9F, 0xC4, 0x18, 0x12,</div><div class='add'>+0x7B, 0x48, 0x8C, 0x27, 0x37, 0x9E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x80, 0x00, 0x0E, 0x02, 0x39, 0x0A, 0xE4, 0x20, 0x90, 0x83,</div><div class='add'>+0x00, 0x0E, 0x02, 0x39, 0x08, 0xE0, 0x20, 0x80, 0x83, 0x40, 0x0E, 0x02, 0x39,</div><div class='add'>+0x08, 0xE4, 0x20, 0x90, 0x83, 0x00, 0x0E, 0x02, 0x38, 0x0A, 0xE4, 0x20, 0x80,</div><div class='add'>+0x83, 0x40, 0x0E, 0x02, 0x38, 0x06, 0xE6, 0x20, 0x90, 0xA3, 0x40, 0x0E, 0x02,</div><div class='add'>+0x39, 0x08, 0xE4, 0x28, 0x90, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x20, 0x60, 0x8E, 0x00, 0x3A, 0x02, 0xEA, 0x08, 0xA0, 0x23, 0xA0,</div><div class='add'>+0x8E, 0x00, 0x3A, 0x02, 0xEA, 0x08, 0xB8, 0x23, 0xA0, 0x8E, 0x00, 0x3A, 0x02,</div><div class='add'>+0xE8, 0x08, 0xA0, 0x23, 0xA0, 0x8E, 0x80, 0x3A, 0x02, 0xEA, 0x08, 0xA8, 0x23,</div><div class='add'>+0xA0, 0x8E, 0x80, 0x3A, 0x02, 0xEE, 0x08, 0xA8, 0x23, 0xA0, 0x8E, 0x80, 0x3A,</div><div class='add'>+0x02, 0xEA, 0x08, 0xA8, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x40, 0x80, 0x04, 0x01, 0x12, 0x06, 0x48, 0x10, 0x20, 0x41, 0x80, 0x04,</div><div class='add'>+0x01, 0x12, 0x04, 0x48, 0x10, 0x20, 0x41, 0x80, 0x04, 0x01, 0x12, 0x04, 0x48,</div><div class='add'>+0x10, 0x20, 0x41, 0x80, 0x04, 0x01, 0x12, 0x04, 0x48, 0x10, 0x20, 0x41, 0x80,</div><div class='add'>+0x04, 0x01, 0x12, 0x06, 0x48, 0x10, 0x20, 0x61, 0x80, 0x04, 0x01, 0x12, 0x04,</div><div class='add'>+0x48, 0x18, 0x20, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x80, 0x0E, 0x00, 0x18, 0x00, 0x60, 0x00, 0x80, 0x01, 0x20, 0x06, 0x00,</div><div class='add'>+0x18, 0x00, 0x62, 0x00, 0x80, 0x01, 0x00, 0x06, 0x00, 0x18, 0x00, 0x60, 0x00,</div><div class='add'>+0x80, 0x01, 0x28, 0x06, 0x80, 0x18, 0x02, 0x60, 0x00, 0x88, 0x01, 0x00, 0x06,</div><div class='add'>+0x80, 0x18, 0x00, 0x60, 0x00, 0x80, 0x01, 0x00, 0x06, 0x00, 0x18, 0x00, 0x60,</div><div class='add'>+0x00, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10,</div><div class='add'>+0x20, 0x4E, 0x00, 0x38, 0x05, 0xE2, 0x04, 0x80, 0x13, 0x20, 0x4E, 0x00, 0x38,</div><div class='add'>+0x09, 0xE2, 0x04, 0x88, 0x13, 0x20, 0x4E, 0x00, 0x38, 0x01, 0xE0, 0x04, 0x80,</div><div class='add'>+0x13, 0x20, 0x4E, 0x82, 0x38, 0x05, 0xE2, 0x04, 0x88, 0x12, 0x20, 0x4E, 0x80,</div><div class='add'>+0x38, 0xA1, 0xE2, 0x04, 0x28, 0x51, 0x20, 0x4E, 0x80, 0x30, 0x01, 0xE2, 0x14,</div><div class='add'>+0x88, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x06, 0x80, 0x18, 0x00, 0x60, 0x00, 0x88, 0x01, 0x00, 0x06, 0x80, 0x18, 0x00,</div><div class='add'>+0x60, 0x00, 0x80, 0x01, 0x00, 0x06, 0x80, 0x18, 0x00, 0x62, 0x00, 0x88, 0x81,</div><div class='add'>+0x00, 0x06, 0x02, 0x18, 0x00, 0x60, 0x00, 0x80, 0x01, 0x00, 0x06, 0x00, 0x18,</div><div class='add'>+0x00, 0x60, 0x00, 0x80, 0x01, 0x00, 0x06, 0x08, 0x10, 0x00, 0x60, 0x00, 0x80,</div><div class='add'>+0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x20, 0x24,</div><div class='add'>+0x80, 0x90, 0x01, 0x42, 0x02, 0x08, 0x29, 0x20, 0x24, 0x80, 0x90, 0x02, 0x42,</div><div class='add'>+0x02, 0x08, 0x11, 0x20, 0x24, 0x80, 0x90, 0x00, 0x42, 0x02, 0x08, 0x09, 0x20,</div><div class='add'>+0xA4, 0x80, 0x90, 0x01, 0x42, 0x02, 0x08, 0x11, 0x20, 0xA4, 0x80, 0x90, 0x01,</div><div class='add'>+0x42, 0x04, 0x08, 0x39, 0x20, 0x44, 0x80, 0x18, 0x01, 0x42, 0x06, 0x08, 0x01,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC4, 0x00, 0x12, 0x81,</div><div class='add'>+0x48, 0x05, 0x22, 0x11, 0x88, 0x44, 0x00, 0x12, 0x81, 0x48, 0x04, 0x20, 0x31,</div><div class='add'>+0x80, 0x54, 0x20, 0x12, 0x81, 0x48, 0x04, 0x22, 0x11, 0x88, 0xC4, 0x00, 0x12,</div><div class='add'>+0x03, 0x48, 0x0D, 0x22, 0x11, 0x80, 0x54, 0x20, 0x12, 0x01, 0x48, 0x05, 0x20,</div><div class='add'>+0x15, 0x88, 0x54, 0x20, 0x52, 0x81, 0x68, 0x0D, 0x22, 0x1D, 0x88, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x03, 0x30, 0x00, 0xC8, 0x00, 0x00,</div><div class='add'>+0x03, 0x00, 0x0C, 0x00, 0x30, 0x00, 0xCA, 0x00, 0x20, 0x03, 0xA0, 0x0C, 0x00,</div><div class='add'>+0x32, 0x00, 0xC0, 0x02, 0x00, 0x03, 0x00, 0x0C, 0x00, 0x30, 0x00, 0xCA, 0x00,</div><div class='add'>+0x28, 0x03, 0x80, 0x0C, 0x80, 0x32, 0x00, 0xCA, 0x00, 0x28, 0x03, 0xA0, 0x0C,</div><div class='add'>+0x80, 0x72, 0x00, 0xCA, 0x00, 0x28, 0x03, 0x80, 0x1C, 0x80, 0x02, 0x08, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x08, 0x20, 0x2C, 0x00, 0x90, 0x00,</div><div class='add'>+0x00, 0x02, 0x00, 0x78, 0x00, 0x26, 0x00, 0x90, 0x03, 0x60, 0x02, 0x08, 0x03,</div><div class='add'>+0x00, 0x20, 0x00, 0x90, 0x00, 0x40, 0x02, 0x00, 0x19, 0x00, 0xE2, 0x00, 0x88,</div><div class='add'>+0x00, 0x80, 0x06, 0x80, 0x00, 0x00, 0xE2, 0x01, 0x88, 0x00, 0x20, 0x00, 0x80,</div><div class='add'>+0x28, 0x00, 0x02, 0x00, 0x08, 0x00, 0x80, 0x0A, 0x80, 0x00, 0x0C, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x10, 0x03, 0x02, 0x40, 0x08, 0x80, 0x01, 0x00, 0x04,</div><div class='add'>+0x00, 0x18, 0x00, 0x40, 0x00, 0x80, 0x01, 0x00, 0x04, 0x00, 0x10, 0x02, 0x40,</div><div class='add'>+0x00, 0x82, 0x01, 0x00, 0x06, 0x00, 0x18, 0x00, 0x40, 0x00, 0x00, 0x01, 0x00,</div><div class='add'>+0x84, 0x00, 0x10, 0x00, 0x40, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00, 0x10, 0x00,</div><div class='add'>+0x40, 0x00, 0x00, 0x01, 0x00, 0x84, 0x00, 0x10, 0x00, 0x0C, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x10, 0x03, 0x02, 0x20, 0x06, 0x80, 0x10, 0x00, 0x42, 0x00,</div><div class='add'>+0x08, 0x01, 0x60, 0x06, 0x80, 0x10, 0x00, 0x66, 0x00, 0x88, 0x01, 0x20, 0x04,</div><div class='add'>+0x80, 0x10, 0x00, 0x42, 0x00, 0x08, 0x01, 0x40, 0x06, 0x80, 0x19, 0x00, 0x62,</div><div class='add'>+0x00, 0x98, 0x01, 0x20, 0x06, 0x80, 0x19, 0x00, 0x62, 0x00, 0x88, 0x01, 0x20,</div><div class='add'>+0x06, 0x80, 0x18, 0x00, 0x62, 0x00, 0x88, 0x01, 0x0C, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x08, 0x80, 0x02, 0x00, 0x06, 0x00, 0x19, 0x00, 0x64, 0x00, 0x90,</div><div class='add'>+0x11, 0x00, 0x06, 0x00, 0x19, 0x01, 0x60, 0x00, 0x80, 0x01, 0x40, 0x06, 0x00,</div><div class='add'>+0x19, 0x00, 0x64, 0x00, 0x90, 0x11, 0x00, 0x46, 0x00, 0x18, 0x00, 0x64, 0x04,</div><div class='add'>+0x80, 0x01, 0x40, 0x46, 0x00, 0x18, 0x00, 0x66, 0x00, 0x90, 0x01, 0x40, 0x06,</div><div class='add'>+0x00, 0x19, 0x00, 0x64, 0x00, 0x90, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x02, 0xA2, 0x42, 0x60, 0x0C, 0x01, 0x30, 0x04, 0xC2, 0x10, 0x00, 0x43,</div><div class='add'>+0x20, 0x0C, 0x01, 0x30, 0x04, 0xC2, 0x10, 0x18, 0x43, 0x20, 0x0C, 0x01, 0x30,</div><div class='add'>+0x04, 0xC0, 0x10, 0x00, 0x43, 0x20, 0x0C, 0x81, 0x30, 0x04, 0xC2, 0x10, 0x08,</div><div class='add'>+0x43, 0x20, 0x0C, 0x81, 0x30, 0x04, 0xC2, 0x10, 0x08, 0x43, 0x20, 0x0C, 0x81,</div><div class='add'>+0x30, 0x04, 0xC2, 0x10, 0x08, 0x03, 0x88, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x02, 0x00, 0x10, 0x00, 0x4C, 0x00, 0x30, 0x00, 0xC0, 0x04, 0x00, 0x03, 0x00,</div><div class='add'>+0x4C, 0x00, 0x30, 0x00, 0xC0, 0x04, 0x00, 0x03, 0x00, 0x4C, 0x00, 0x30, 0x01,</div><div class='add'>+0xC0, 0x04, 0x00, 0x03, 0x00, 0x0C, 0x00, 0x30, 0x00, 0xC0, 0x00, 0x00, 0x03,</div><div class='add'>+0x00, 0x0C, 0x00, 0x30, 0x00, 0xC0, 0x00, 0x00, 0x03, 0x00, 0x0C, 0x00, 0x30,</div><div class='add'>+0x00, 0xC0, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,</div><div class='add'>+0x00, 0xD0, 0x00, 0x4C, 0x03, 0x30, 0x04, 0xC0, 0x34, 0x00, 0xC3, 0x20, 0x4C,</div><div class='add'>+0x03, 0x30, 0x0C, 0xC2, 0x34, 0x00, 0x43, 0x00, 0x4C, 0x03, 0x30, 0x0D, 0xC0,</div><div class='add'>+0x34, 0x00, 0xC3, 0x20, 0x0C, 0x83, 0x30, 0x04, 0xC0, 0x30, 0x08, 0x43, 0x00,</div><div class='add'>+0x0C, 0x83, 0x30, 0x04, 0xC2, 0x10, 0x00, 0x43, 0x00, 0x0C, 0x01, 0x30, 0x04,</div><div class='add'>+0xC0, 0x10, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xA2,</div><div class='add'>+0xC2, 0x20, 0x0E, 0x03, 0x10, 0x04, 0x62, 0x30, 0x00, 0xC1, 0x20, 0x06, 0x03,</div><div class='add'>+0x10, 0x0C, 0x62, 0x30, 0x88, 0x43, 0x20, 0x06, 0x03, 0x18, 0x0C, 0x40, 0x30,</div><div class='add'>+0x00, 0xC1, 0x20, 0x06, 0x81, 0x18, 0x04, 0x62, 0x30, 0x88, 0x41, 0x20, 0x06,</div><div class='add'>+0x83, 0x18, 0x04, 0x60, 0x10, 0x88, 0x41, 0x20, 0x06, 0x81, 0x18, 0x04, 0x62,</div><div class='add'>+0x10, 0x88, 0x01, 0x88, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x80, 0x42,</div><div class='add'>+0x00, 0x06, 0x81, 0x10, 0x04, 0x40, 0x10, 0x08, 0x41, 0x00, 0x0C, 0x81, 0x10,</div><div class='add'>+0x04, 0xC0, 0x10, 0x80, 0x41, 0x00, 0x04, 0x81, 0x10, 0x04, 0x42, 0x10, 0x08,</div><div class='add'>+0x41, 0x00, 0x08, 0x01, 0x30, 0x04, 0x40, 0x10, 0x00, 0x43, 0x00, 0x04, 0x01,</div><div class='add'>+0x30, 0x04, 0x42, 0x10, 0x00, 0x41, 0x00, 0x04, 0x01, 0x10, 0x04, 0x40, 0x10,</div><div class='add'>+0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x80, 0x42, 0x20,</div><div class='add'>+0x04, 0x81, 0x10, 0x04, 0x62, 0x10, 0x08, 0x41, 0x20, 0x0C, 0x81, 0x10, 0x04,</div><div class='add'>+0xC2, 0x10, 0x08, 0x41, 0x20, 0x06, 0x81, 0x10, 0x04, 0x42, 0x10, 0x08, 0x41,</div><div class='add'>+0x20, 0x0C, 0x83, 0x30, 0x04, 0x62, 0x10, 0x08, 0x43, 0x20, 0x06, 0x81, 0x30,</div><div class='add'>+0x04, 0x62, 0x10, 0x88, 0x41, 0x20, 0x06, 0x81, 0x18, 0x04, 0x62, 0x10, 0x88,</div><div class='add'>+0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xA2, 0x02, 0x00, 0x08,</div><div class='add'>+0x80, 0x00, 0x00, 0xA2, 0x00, 0x08, 0x00, 0x00, 0x08, 0x80, 0x00, 0x00, 0x80,</div><div class='add'>+0x00, 0x00, 0x02, 0x20, 0x0A, 0x80, 0x20, 0x00, 0x82, 0x00, 0x08, 0x02, 0x00,</div><div class='add'>+0x08, 0x00, 0x20, 0x00, 0xA2, 0x00, 0x00, 0x02, 0x20, 0x0A, 0x00, 0x20, 0x00,</div><div class='add'>+0xA0, 0x00, 0x88, 0x02, 0x20, 0x0A, 0x80, 0x28, 0x00, 0xA2, 0x00, 0x88, 0x42,</div><div class='add'>+0x88, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x60, 0x00, 0x82, 0x01,</div><div class='add'>+0x08, 0x06, 0x20, 0x18, 0x80, 0x60, 0x00, 0x82, 0x01, 0x08, 0x06, 0x20, 0x18,</div><div class='add'>+0x80, 0x60, 0x00, 0x82, 0x01, 0x08, 0x06, 0x20, 0x18, 0x80, 0x60, 0x00, 0x82,</div><div class='add'>+0x01, 0x08, 0x06, 0x20, 0x18, 0x80, 0x60, 0x00, 0x82, 0x01, 0x08, 0x06, 0x20,</div><div class='add'>+0x18, 0x80, 0x60, 0x00, 0x82, 0x01, 0x28, 0x06, 0x20, 0x18, 0x80, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x40, 0xA0, 0x00, 0x01, 0x02,</div><div class='add'>+0x04, 0x08, 0x10, 0x20, 0x41, 0x80, 0x00, 0x01, 0x02, 0x04, 0x48, 0x10, 0x28,</div><div class='add'>+0x40, 0x80, 0x04, 0x01, 0x02, 0x04, 0x48, 0x10, 0x20, 0x40, 0x80, 0x00, 0x01,</div><div class='add'>+0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x00, 0x01, 0x02, 0x04, 0x08, 0x10,</div><div class='add'>+0x20, 0x40, 0x80, 0x00, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xA2, 0x62, 0xC0, 0x8A, 0x81, 0x2B, 0x06,</div><div class='add'>+0xAC, 0x18, 0xB8, 0x62, 0xC0, 0x8A, 0x81, 0x2B, 0x06, 0xAC, 0x18, 0xB0, 0x62,</div><div class='add'>+0xC0, 0x8A, 0x81, 0x2B, 0x06, 0xAE, 0x18, 0xB8, 0x62, 0xC0, 0x8A, 0x01, 0x2B,</div><div class='add'>+0x06, 0xAC, 0x18, 0xB0, 0x62, 0xC0, 0x8A, 0x01, 0x2B, 0x06, 0xAC, 0x18, 0xB0,</div><div class='add'>+0x62, 0xC0, 0x8A, 0x01, 0x29, 0x06, 0xAC, 0x18, 0xB0, 0x02, 0x88, 0x0A, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x62, 0x20, 0x8E, 0x81, 0x38, 0x06, 0xE2,</div><div class='add'>+0x18, 0x88, 0x63, 0x60, 0x8E, 0x81, 0x38, 0x06, 0xE6, 0x18, 0x88, 0x63, 0x20,</div><div class='add'>+0x8E, 0x81, 0x38, 0x06, 0xE2, 0x18, 0x88, 0x63, 0x50, 0x8E, 0x81, 0x39, 0x06,</div><div class='add'>+0xE2, 0x18, 0x98, 0x63, 0x20, 0x8E, 0x81, 0x39, 0x04, 0xE2, 0x18, 0x88, 0x63,</div><div class='add'>+0x20, 0x8E, 0x81, 0x3A, 0x06, 0xE2, 0x18, 0x88, 0x03, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x02, 0x80, 0x62, 0x00, 0x8E, 0x01, 0x3B, 0x06, 0xE4, 0x18,</div><div class='add'>+0xB0, 0x63, 0x00, 0x8E, 0x01, 0x39, 0x06, 0xE0, 0x18, 0x80, 0x63, 0x40, 0x8E,</div><div class='add'>+0x01, 0x39, 0x06, 0xEC, 0x18, 0xB0, 0x63, 0x80, 0x8E, 0x01, 0x38, 0x06, 0xE4,</div><div class='add'>+0x18, 0x80, 0x63, 0x40, 0x8E, 0x01, 0x38, 0x06, 0xE4, 0x18, 0x90, 0x63, 0x40,</div><div class='add'>+0x0E, 0x01, 0x39, 0x06, 0xE4, 0x18, 0x90, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x0A, 0xA2, 0x62, 0x60, 0x8C, 0x01, 0x30, 0x06, 0xEA, 0x18, 0x80,</div><div class='add'>+0x63, 0x20, 0x8C, 0x01, 0x30, 0x06, 0xC2, 0x18, 0x18, 0x63, 0xA0, 0x8E, 0x01,</div><div class='add'>+0x30, 0x06, 0xC0, 0x18, 0x00, 0x63, 0x20, 0x8E, 0x81, 0x30, 0x06, 0xEA, 0x18,</div><div class='add'>+0x08, 0x63, 0xA0, 0x8E, 0x81, 0x30, 0x06, 0xEA, 0x18, 0xA8, 0x63, 0xA0, 0x8E,</div><div class='add'>+0x81, 0x3A, 0x06, 0xEA, 0x18, 0xA8, 0x43, 0x88, 0x0A, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x02, 0x00, 0x48, 0x00, 0x24, 0x01, 0x9A, 0x04, 0x48, 0x12, 0x20, 0x49,</div><div class='add'>+0x80, 0x2E, 0x01, 0x90, 0x04, 0xE8, 0x12, 0x00, 0x49, 0x80, 0x24, 0x01, 0x90,</div><div class='add'>+0x04, 0x68, 0x12, 0xA0, 0x41, 0x80, 0x2C, 0x01, 0xBA, 0x04, 0x48, 0x10, 0xA0,</div><div class='add'>+0x43, 0x80, 0x24, 0x01, 0xBA, 0x04, 0x48, 0x10, 0x20, 0x49, 0x80, 0x04, 0x01,</div><div class='add'>+0x92, 0x04, 0x48, 0x12, 0x20, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x02, 0x00, 0x60, 0x00, 0x84, 0x01, 0x10, 0x06, 0x60, 0x18, 0x00, 0x61, 0x20,</div><div class='add'>+0x86, 0x01, 0x10, 0x06, 0x62, 0x18, 0x00, 0x61, 0x00, 0x86, 0x01, 0x10, 0x06,</div><div class='add'>+0x40, 0x18, 0x00, 0x61, 0x20, 0x86, 0x81, 0x18, 0x06, 0x60, 0x18, 0x88, 0x61,</div><div class='add'>+0x00, 0x86, 0x81, 0x58, 0x06, 0x60, 0x18, 0x80, 0x61, 0x00, 0x86, 0x01, 0x18,</div><div class='add'>+0x06, 0x60, 0x18, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0xA2, 0x06, 0x20, 0x1E, 0x00, 0x70, 0x00, 0xC2, 0x01, 0x00, 0x07, 0x20, 0x1E,</div><div class='add'>+0x00, 0x70, 0x00, 0xC2, 0x01, 0x88, 0x07, 0x20, 0x1C, 0x00, 0x70, 0x00, 0xC0,</div><div class='add'>+0x01, 0x00, 0x07, 0x20, 0x1C, 0x80, 0x70, 0x00, 0xE2, 0x01, 0x88, 0x07, 0x20,</div><div class='add'>+0x1E, 0x80, 0x78, 0x00, 0xC2, 0x01, 0x88, 0x07, 0x20, 0x1E, 0x80, 0x78, 0x00,</div><div class='add'>+0xE2, 0x01, 0x88, 0x03, 0x88, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x80,</div><div class='add'>+0x4A, 0x00, 0x26, 0x83, 0x90, 0x04, 0x40, 0x12, 0x08, 0x49, 0x00, 0x26, 0x81,</div><div class='add'>+0x90, 0x04, 0x40, 0x12, 0x80, 0x49, 0x00, 0x24, 0x81, 0x90, 0x04, 0x42, 0x12,</div><div class='add'>+0x08, 0x41, 0x00, 0x24, 0x01, 0x90, 0x04, 0x60, 0x10, 0x80, 0x41, 0x00, 0x26,</div><div class='add'>+0x01, 0x98, 0x04, 0x40, 0x10, 0x80, 0x49, 0x00, 0x06, 0x01, 0x98, 0x04, 0x60,</div><div class='add'>+0x12, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x80, 0x42,</div><div class='add'>+0x20, 0x04, 0x81, 0x18, 0x05, 0x62, 0x10, 0x88, 0x41, 0x20, 0x04, 0x81, 0x18,</div><div class='add'>+0x04, 0x62, 0x10, 0x08, 0x51, 0x20, 0x06, 0x81, 0x18, 0x04, 0x62, 0x10, 0x88,</div><div class='add'>+0x41, 0x20, 0x06, 0x81, 0x18, 0x04, 0x42, 0x10, 0x08, 0x41, 0x20, 0x04, 0x81,</div><div class='add'>+0x10, 0x04, 0x62, 0x10, 0x08, 0x41, 0x20, 0x04, 0x81, 0x10, 0x04, 0x42, 0x10,</div><div class='add'>+0x08, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xA2, 0x42, 0x00,</div><div class='add'>+0x02, 0x81, 0x28, 0x0C, 0xA2, 0x30, 0x88, 0x42, 0x00, 0x02, 0x83, 0x28, 0x0C,</div><div class='add'>+0xA0, 0x10, 0x80, 0xC0, 0x20, 0x0A, 0x83, 0x28, 0x0C, 0xA2, 0x30, 0x88, 0xC2,</div><div class='add'>+0x00, 0x0A, 0x03, 0x28, 0x04, 0x22, 0x10, 0x80, 0x40, 0x20, 0x02, 0x01, 0x08,</div><div class='add'>+0x04, 0xA2, 0x10, 0x88, 0x40, 0x20, 0x02, 0x81, 0x08, 0x04, 0x22, 0x10, 0x88,</div><div class='add'>+0x00, 0x88, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x40, 0x00, 0x0A,</div><div class='add'>+0x01, 0x28, 0x05, 0xA0, 0x10, 0x80, 0xC2, 0x00, 0x0A, 0x03, 0x28, 0x0C, 0xA0,</div><div class='add'>+0x10, 0x80, 0x52, 0x00, 0x0A, 0x01, 0x28, 0x04, 0xA0, 0x10, 0x80, 0xC2, 0x00,</div><div class='add'>+0x0A, 0x03, 0x28, 0x0C, 0xA0, 0x30, 0x80, 0xC2, 0x00, 0x0A, 0x03, 0x28, 0x0C,</div><div class='add'>+0x80, 0x30, 0x80, 0xC2, 0x00, 0x0A, 0x03, 0x28, 0x04, 0xA0, 0x30, 0x80, 0x02,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x10, 0x20, 0x06, 0x00,</div><div class='add'>+0x08, 0x00, 0x60, 0x00, 0x80, 0x11, 0x00, 0x02, 0x00, 0x08, 0x00, 0x20, 0x04,</div><div class='add'>+0x88, 0x01, 0x00, 0x06, 0x00, 0x18, 0x00, 0x20, 0x00, 0x80, 0x00, 0x00, 0x02,</div><div class='add'>+0x00, 0x08, 0x01, 0x20, 0x04, 0x80, 0x10, 0x00, 0x42, 0x00, 0x08, 0x00, 0x80,</div><div class='add'>+0x04, 0x80, 0x10, 0x00, 0x42, 0x00, 0x08, 0x01, 0x20, 0x04, 0x80, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xA2, 0x42, 0x40, 0x00, 0x81, 0x01,</div><div class='add'>+0x04, 0x04, 0x10, 0x18, 0x40, 0x40, 0x00, 0x83, 0x01, 0x05, 0x04, 0x10, 0x10,</div><div class='add'>+0x40, 0x40, 0x00, 0x81, 0x01, 0x04, 0x06, 0x10, 0x18, 0x50, 0x40, 0x40, 0x01,</div><div class='add'>+0x01, 0x0C, 0x04, 0x10, 0x10, 0x40, 0x40, 0x00, 0x01, 0x01, 0x05, 0x84, 0x10,</div><div class='add'>+0x10, 0x40, 0x40, 0x00, 0x01, 0x01, 0x04, 0x04, 0x10, 0x10, 0x00, 0x88, 0x0A,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x80, 0x02, 0x20, 0x06, 0x80, 0x18, 0x00,</div><div class='add'>+0x62, 0x00, 0x88, 0x01, 0x60, 0x06, 0x80, 0x18, 0x00, 0x66, 0x00, 0x88, 0x01,</div><div class='add'>+0x20, 0x06, 0x80, 0x18, 0x00, 0x62, 0x00, 0x88, 0x01, 0x60, 0x06, 0x80, 0x19,</div><div class='add'>+0x00, 0x62, 0x00, 0x98, 0x01, 0x20, 0x06, 0x80, 0x19, 0x00, 0x62, 0x00, 0x88,</div><div class='add'>+0x01, 0x20, 0x06, 0x80, 0x18, 0x00, 0x62, 0x00, 0x88, 0x01, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x02, 0x80, 0x02, 0x00, 0x24, 0x00, 0x99, 0x00, 0x64,</div><div class='add'>+0x02, 0x10, 0x09, 0x00, 0x2E, 0x00, 0x91, 0x00, 0xE0, 0x00, 0x00, 0x09, 0x40,</div><div class='add'>+0x26, 0x00, 0x91, 0x00, 0x44, 0x02, 0x10, 0x09, 0x00, 0x2E, 0x00, 0xB8, 0x00,</div><div class='add'>+0x64, 0x00, 0x80, 0x0B, 0x40, 0x26, 0x00, 0xB8, 0x00, 0x64, 0x02, 0x98, 0x09,</div><div class='add'>+0x40, 0x26, 0x00, 0x99, 0x00, 0x64, 0x00, 0x90, 0x01, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x02, 0xA2, 0x06, 0x60, 0x14, 0x00, 0x50, 0x00, 0xC2, 0x01,</div><div class='add'>+0x00, 0x05, 0x20, 0x16, 0x00, 0x50, 0x00, 0x62, 0x01, 0x18, 0x05, 0x20, 0x1C,</div><div class='add'>+0x00, 0x50, 0x00, 0x40, 0x01, 0x00, 0x05, 0x20, 0x16, 0x80, 0x58, 0x00, 0xC2,</div><div class='add'>+0x01, 0x88, 0x05, 0x28, 0x1C, 0x80, 0x58, 0x00, 0xC2, 0x01, 0x08, 0x07, 0x20,</div><div class='add'>+0x1C, 0x80, 0x70, 0x08, 0xC2, 0x01, 0x08, 0x03, 0x88, 0x0A, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x0A, 0x00, 0x80, 0x00, 0x04, 0x02, 0x10, 0x08, 0xC0, 0x20, 0x00,</div><div class='add'>+0xA1, 0x00, 0x04, 0x02, 0x10, 0x08, 0x40, 0x20, 0x00, 0x81, 0x00, 0x0C, 0x02,</div><div class='add'>+0x10, 0x08, 0x40, 0x20, 0x00, 0x81, 0x00, 0x04, 0x02, 0x10, 0x0A, 0xC0, 0x20,</div><div class='add'>+0x00, 0xA1, 0x00, 0x8C, 0x02, 0x10, 0x08, 0xC0, 0x28, 0x00, 0xE3, 0x00, 0x1C,</div><div class='add'>+0x02, 0x30, 0x0A, 0xC0, 0x20, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x02, 0x00, 0x20, 0x00, 0xA4, 0x00, 0x90, 0x02, 0xC0, 0x0A, 0x00, 0xA9,</div><div class='add'>+0x20, 0xAC, 0x00, 0xB0, 0x0A, 0xC2, 0x08, 0x00, 0x29, 0x00, 0xAC, 0x00, 0xB0,</div><div class='add'>+0x02, 0xC0, 0x0A, 0x00, 0xAB, 0x20, 0xAC, 0x82, 0xB0, 0x06, 0xC0, 0x28, 0x08,</div><div class='add'>+0xAB, 0x00, 0xAC, 0x82, 0xB0, 0x0A, 0xC0, 0x3A, 0x08, 0xAB, 0x00, 0xAC, 0x02,</div><div class='add'>+0xB0, 0x0E, 0xC0, 0x28, 0x00, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x02, 0xA2, 0xC2, 0x20, 0x06, 0x03, 0x18, 0x0C, 0x62, 0x30, 0x80, 0xE1, 0x20,</div><div class='add'>+0x06, 0x03, 0x18, 0x0C, 0x62, 0x30, 0x88, 0xC1, 0x20, 0x06, 0x03, 0x18, 0x0C,</div><div class='add'>+0x60, 0x30, 0x80, 0xC1, 0x20, 0x06, 0x83, 0x18, 0x0E, 0x62, 0x30, 0x88, 0xE1,</div><div class='add'>+0x20, 0x06, 0x83, 0x18, 0x0C, 0x62, 0x38, 0x80, 0xE1, 0x20, 0x06, 0x83, 0x18,</div><div class='add'>+0x0E, 0x62, 0x30, 0x88, 0x01, 0x88, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,</div><div class='add'>+0x80, 0x02, 0x00, 0x04, 0x80, 0x10, 0x00, 0x40, 0x00, 0x08, 0x01, 0x00, 0x04,</div><div class='add'>+0x80, 0x10, 0x01, 0x40, 0x00, 0x00, 0x01, 0x00, 0x04, 0x80, 0x10, 0x00, 0x42,</div><div class='add'>+0x00, 0x08, 0x11, 0x00, 0x44, 0x00, 0x10, 0x00, 0x40, 0x00, 0x00, 0x01, 0x00,</div><div class='add'>+0x84, 0x00, 0x10, 0x01, 0x40, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00, 0x10, 0x00,</div><div class='add'>+0x40, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x80,</div><div class='add'>+0x12, 0x22, 0x06, 0x88, 0x18, 0x20, 0x62, 0x80, 0x88, 0x11, 0x20, 0x06, 0x88,</div><div class='add'>+0x18, 0x20, 0x62, 0x84, 0x88, 0x01, 0x22, 0x06, 0x88, 0x18, 0x20, 0x62, 0x80,</div><div class='add'>+0x88, 0x01, 0x22, 0x06, 0x88, 0x18, 0x01, 0x62, 0x84, 0x88, 0x31, 0x20, 0x46,</div><div class='add'>+0x80, 0x18, 0x20, 0x62, 0x04, 0x80, 0x11, 0x20, 0x46, 0x88, 0x18, 0x01, 0x62,</div><div class='add'>+0x84, 0x88, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xA2, 0x02,</div><div class='add'>+0x02, 0x0A, 0x88, 0x28, 0x20, 0xA2, 0x80, 0x88, 0x22, 0x00, 0x0A, 0x88, 0x28,</div><div class='add'>+0x00, 0xA0, 0x80, 0x80, 0x02, 0x22, 0x0A, 0x88, 0x28, 0x20, 0xA2, 0x80, 0x88,</div><div class='add'>+0x02, 0x02, 0x0A, 0x00, 0x28, 0x20, 0xA2, 0x80, 0x80, 0x02, 0x22, 0x0A, 0x02,</div><div class='add'>+0x28, 0x20, 0xA2, 0x80, 0x80, 0x02, 0x20, 0x0A, 0x88, 0x28, 0x20, 0xA2, 0x00,</div><div class='add'>+0x88, 0x02, 0x88, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x10, 0x04,</div><div class='add'>+0x42, 0x10, 0x28, 0x01, 0xA0, 0x04, 0x81, 0x12, 0x04, 0x42, 0x10, 0x28, 0x41,</div><div class='add'>+0xA0, 0x04, 0x81, 0x10, 0x04, 0x4A, 0x10, 0x28, 0x41, 0xA0, 0x04, 0x81, 0x12,</div><div class='add'>+0x04, 0x4A, 0x10, 0x28, 0x01, 0x20, 0x04, 0x81, 0x10, 0x04, 0x42, 0x10, 0x08,</div><div class='add'>+0x01, 0xA0, 0x04, 0x81, 0x10, 0x00, 0x42, 0x10, 0x08, 0x41, 0x20, 0x04, 0x80,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0xA0, 0x40,</div><div class='add'>+0x01, 0x00, 0x05, 0x08, 0x14, 0x00, 0x50, 0x80, 0x40, 0x01, 0x02, 0x05, 0x00,</div><div class='add'>+0x14, 0x28, 0x50, 0x00, 0x40, 0x01, 0x00, 0x05, 0x00, 0x14, 0x20, 0x50, 0x00,</div><div class='add'>+0x40, 0x01, 0x00, 0x85, 0x08, 0x34, 0x20, 0x50, 0x80, 0x40, 0x03, 0x02, 0x05,</div><div class='add'>+0x00, 0x14, 0x20, 0x50, 0x80, 0x40, 0x01, 0x02, 0x05, 0x08, 0x14, 0x20, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x82, 0xB2, 0xC0, 0xCA, 0x82,</div><div class='add'>+0x21, 0x0B, 0xA4, 0x2C, 0x18, 0xB2, 0xC0, 0xCA, 0x02, 0x28, 0x0B, 0x84, 0x2C,</div><div class='add'>+0xB0, 0xB2, 0x40, 0xC8, 0x82, 0x21, 0x0B, 0x86, 0x2C, 0x80, 0xB2, 0x40, 0xC8,</div><div class='add'>+0x02, 0x21, 0x0B, 0xAC, 0x2C, 0xB0, 0xB2, 0xC0, 0xCA, 0x02, 0x2B, 0x0B, 0x84,</div><div class='add'>+0x2C, 0xB0, 0xB2, 0xC0, 0xCA, 0x02, 0x2B, 0x0B, 0xAC, 0x2C, 0xB0, 0x02, 0x88,</div><div class='add'>+0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x80, 0x12, 0x20, 0x4E, 0x80, 0x38,</div><div class='add'>+0x01, 0xEA, 0x04, 0x88, 0x13, 0x60, 0x4E, 0x80, 0x3A, 0x01, 0xE6, 0x04, 0x88,</div><div class='add'>+0x13, 0x20, 0x4E, 0x80, 0x38, 0x01, 0xE2, 0x04, 0xA8, 0x13, 0x60, 0x4E, 0x00,</div><div class='add'>+0x39, 0x01, 0xE2, 0x24, 0x98, 0x13, 0x20, 0x4E, 0x82, 0x39, 0x01, 0xE2, 0x04,</div><div class='add'>+0x88, 0x13, 0x20, 0x4E, 0x82, 0x38, 0x01, 0xE2, 0x04, 0x88, 0x03, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC4, 0x00, 0x02, 0x03, 0x08, 0x0C,</div><div class='add'>+0x20, 0x30, 0x80, 0xC0, 0x00, 0x02, 0x03, 0x08, 0x0C, 0x20, 0x31, 0x80, 0xC0,</div><div class='add'>+0x10, 0x02, 0x03, 0x08, 0x0C, 0x20, 0x30, 0x80, 0xC0, 0x08, 0x02, 0x03, 0x08,</div><div class='add'>+0x0C, 0x20, 0x31, 0x82, 0xC0, 0x18, 0x02, 0x43, 0x08, 0x0C, 0x20, 0x30, 0x86,</div><div class='add'>+0xC0, 0x00, 0x02, 0x63, 0x08, 0x0C, 0x21, 0x31, 0x80, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xF2, 0xFF, 0xCB, 0xFF, 0x2F,</div><div class='add'>+0xFF, 0xBF, 0xFC, 0xFF, 0xF2, 0xFF, 0xCB, 0xFF, 0x2F, 0xFF, 0xBF, 0xFC, 0xFF,</div><div class='add'>+0xF2, 0xFF, 0xCB, 0xFF, 0x2F, 0xFF, 0xBF, 0xFC, 0xFF, 0xF2, 0xFF, 0xCB, 0xFF,</div><div class='add'>+0x2F, 0xFF, 0xBF, 0xFC, 0xFF, 0xF2, 0xFF, 0xCB, 0xFF, 0x2F, 0xFF, 0xBF, 0xFC,</div><div class='add'>+0xFF, 0xF2, 0xFF, 0xCB, 0xFF, 0x2F, 0xFF, 0xBF, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x34, 0xDB, 0xD0, 0x6C, 0x43, 0xB3, 0x2F, 0xCD, 0x36,</div><div class='add'>+0xFC, 0xDF, 0xD0, 0x6C, 0x43, 0xFB, 0x0D, 0xCD, 0x36, 0x34, 0xDB, 0xD0, 0x6C,</div><div class='add'>+0x43, 0xB3, 0x0D, 0xCD, 0x36, 0x34, 0xDB, 0xD0, 0x7E, 0xC3, 0xB7, 0x2F, 0xCD,</div><div class='add'>+0x36, 0x7C, 0xDB, 0xF0, 0x7F, 0x43, 0xB3, 0x2F, 0xDF, 0x36, 0xFC, 0xFF, 0xD2,</div><div class='add'>+0x6C, 0xC3, 0xB7, 0x0D, 0xED, 0xBF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0xCC, 0x3C, 0x32, 0xF3, 0xC8, 0xCC, 0x2F, 0x33, 0x8F, 0xFC,</div><div class='add'>+0x3F, 0x32, 0xF3, 0xC8, 0xFC, 0x23, 0x33, 0x8F, 0xCC, 0x3C, 0x32, 0xF3, 0xC8,</div><div class='add'>+0xCC, 0x23, 0x33, 0x8F, 0xCC, 0x3C, 0x32, 0xFF, 0xC8, 0xCF, 0x2F, 0x33, 0x8F,</div><div class='add'>+0xFC, 0x3C, 0xF2, 0xFF, 0xC8, 0xCC, 0x2F, 0x3F, 0x8F, 0xFC, 0xFF, 0x32, 0xF3,</div><div class='add'>+0xC8, 0xCF, 0x23, 0xF3, 0xBF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0xDC, 0x18, 0x12, 0x63, 0x48, 0x8C, 0x27, 0x31, 0x86, 0xDC, 0x1E,</div><div class='add'>+0x12, 0x63, 0x48, 0xEC, 0x21, 0x37, 0x86, 0xC4, 0x78, 0x12, 0x63, 0x48, 0x8C,</div><div class='add'>+0x21, 0x31, 0x86, 0xC4, 0x1E, 0x12, 0x7B, 0xC8, 0x8D, 0x27, 0xB7, 0x87, 0xDC,</div><div class='add'>+0x7E, 0x72, 0x7B, 0x48, 0x8C, 0x27, 0xB7, 0x9F, 0xDC, 0x7E, 0x12, 0xFB, 0xC9,</div><div class='add'>+0x8D, 0x27, 0xB7, 0x9F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x40, 0xE1, 0x0C, 0x85, 0x33, 0x14, 0x02, 0x50, 0x08, 0x40, 0x21, 0x00,</div><div class='add'>+0x85, 0x00, 0x14, 0x02, 0x50, 0x08, 0x40, 0x21, 0x00, 0x85, 0x00, 0x14, 0x02,</div><div class='add'>+0x50, 0x08, 0x40, 0x21, 0x00, 0x85, 0x00, 0x14, 0xCE, 0x50, 0x08, 0x40, 0x21,</div><div class='add'>+0x00, 0x85, 0x00, 0x14, 0x02, 0x50, 0x08, 0x40, 0xE1, 0x0C, 0x85, 0x00, 0x14,</div><div class='add'>+0x02, 0x50, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x10, 0x20, 0x40, 0x80, 0x00, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80,</div><div class='add'>+0x00, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x00, 0x01, 0x02, 0x04,</div><div class='add'>+0x08, 0x10, 0x20, 0x40, 0x80, 0x00, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40,</div><div class='add'>+0x80, 0x00, 0x01, 0x02, 0x04, 0x08, 0x00, 0x20, 0x00, 0x80, 0x00, 0x01, 0x02,</div><div class='add'>+0x04, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10,</div><div class='add'>+0x21, 0x40, 0x84, 0x00, 0x11, 0x02, 0x40, 0x08, 0x00, 0x21, 0x00, 0x84, 0x00,</div><div class='add'>+0x10, 0x02, 0x40, 0x08, 0x00, 0x21, 0x00, 0x84, 0x00, 0x10, 0x02, 0x40, 0x08,</div><div class='add'>+0x00, 0x21, 0x00, 0x84, 0x00, 0x10, 0x02, 0x40, 0x08, 0x00, 0x21, 0x00, 0x84,</div><div class='add'>+0x00, 0x10, 0x02, 0x40, 0x08, 0x00, 0x21, 0x00, 0x84, 0x00, 0x10, 0x02, 0x40,</div><div class='add'>+0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE0,</div><div class='add'>+0x0C, 0x80, 0x33, 0x00, 0x02, 0x04, 0x08, 0x00, 0x20, 0x00, 0x80, 0x00, 0x00,</div><div class='add'>+0x02, 0x00, 0x08, 0x00, 0x20, 0x40, 0x80, 0x00, 0x01, 0x02, 0x04, 0x08, 0x10,</div><div class='add'>+0x20, 0x00, 0x80, 0x00, 0x00, 0xCE, 0x00, 0x08, 0x00, 0x20, 0x40, 0x80, 0x00,</div><div class='add'>+0x00, 0x02, 0x04, 0x08, 0x00, 0xE0, 0x4C, 0x80, 0x00, 0x01, 0x02, 0x00, 0x08,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00,</div><div class='add'>+0x04, 0x00, 0x10, 0xCC, 0x40, 0x00, 0x10, 0x01, 0x00, 0x04, 0x00, 0x10, 0x00,</div><div class='add'>+0x44, 0x00, 0x10, 0x01, 0x00, 0x04, 0x33, 0x10, 0x00, 0x40, 0x00, 0x00, 0xC1,</div><div class='add'>+0x0C, 0x04, 0x00, 0x10, 0xCC, 0x40, 0x30, 0x03, 0x01, 0x00, 0x04, 0x00, 0x10,</div><div class='add'>+0x00, 0x40, 0x00, 0x00, 0xC1, 0x0C, 0x04, 0x00, 0x10, 0x00, 0x40, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x40, 0x00, 0x00, 0x01,</div><div class='add'>+0x00, 0x04, 0x00, 0x10, 0x00, 0x40, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00, 0x10,</div><div class='add'>+0x00, 0x40, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00, 0x10, 0x00, 0x40, 0x00, 0x00,</div><div class='add'>+0x01, 0x00, 0x04, 0x00, 0x10, 0x00, 0x40, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00,</div><div class='add'>+0x10, 0x00, 0x40, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00, 0x10, 0x00, 0x40, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x10, 0x01, 0x40, 0x04, 0x00,</div><div class='add'>+0x11, 0x00, 0x44, 0x00, 0x10, 0x01, 0x40, 0x04, 0x00, 0x11, 0x00, 0x44, 0x00,</div><div class='add'>+0x10, 0x01, 0x40, 0x04, 0x00, 0x11, 0x00, 0x44, 0x00, 0x10, 0x01, 0x40, 0x04,</div><div class='add'>+0x00, 0x11, 0x00, 0x44, 0x00, 0x10, 0x01, 0x40, 0x04, 0x00, 0x11, 0x00, 0x44,</div><div class='add'>+0x00, 0x10, 0x01, 0x40, 0x04, 0x00, 0x11, 0x00, 0x44, 0x00, 0x40, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x10, 0x00, 0x40, 0x00, 0x00, 0x01,</div><div class='add'>+0xCC, 0x04, 0x00, 0x10, 0x00, 0x40, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00, 0x10,</div><div class='add'>+0x00, 0x40, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00, 0x10, 0x00, 0x40, 0x00, 0x00,</div><div class='add'>+0x01, 0x00, 0x04, 0x30, 0x13, 0x00, 0x40, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00,</div><div class='add'>+0x10, 0x00, 0x40, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00, 0x40, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x50, 0x21, 0x40, 0x85, 0x00, 0x15, 0x02,</div><div class='add'>+0x54, 0x08, 0x50, 0x21, 0x40, 0x85, 0x00, 0x15, 0x02, 0x54, 0x08, 0x50, 0x21,</div><div class='add'>+0x40, 0x85, 0x00, 0x15, 0x02, 0x54, 0x08, 0x50, 0x21, 0x40, 0x85, 0x00, 0x15,</div><div class='add'>+0x02, 0x54, 0x08, 0x50, 0x21, 0x40, 0x85, 0x00, 0x15, 0x02, 0x54, 0x08, 0x50,</div><div class='add'>+0x21, 0x40, 0x85, 0x00, 0x15, 0x02, 0x54, 0x08, 0x40, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x10, 0x00, 0x10, 0x20, 0x40, 0x80, 0x00, 0x01, 0x02, 0x04,</div><div class='add'>+0x08, 0x10, 0x20, 0x40, 0x80, 0x00, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40,</div><div class='add'>+0x80, 0x00, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x00, 0x01, 0x02,</div><div class='add'>+0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x00, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20,</div><div class='add'>+0x40, 0x80, 0x00, 0x01, 0x02, 0x04, 0x08, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x10, 0x00, 0x00, 0x21, 0x00, 0x84, 0x00, 0x10, 0x02, 0x40, 0x08,</div><div class='add'>+0x00, 0x21, 0x00, 0x84, 0x00, 0x10, 0x02, 0x40, 0x08, 0x00, 0x21, 0x00, 0x84,</div><div class='add'>+0x00, 0x10, 0x02, 0x40, 0x08, 0x00, 0x21, 0x00, 0x84, 0x00, 0x10, 0x02, 0x40,</div><div class='add'>+0x08, 0x00, 0x21, 0x00, 0x84, 0x00, 0x10, 0x02, 0x40, 0x08, 0x00, 0x21, 0x00,</div><div class='add'>+0x84, 0x00, 0x10, 0x02, 0x40, 0x08, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x10, 0x08, 0x00, 0xE0, 0x0C, 0x80, 0x33, 0x00, 0xCE, 0x00, 0x38, 0x03,</div><div class='add'>+0xE0, 0x0C, 0x80, 0x33, 0x00, 0x02, 0x00, 0x38, 0x03, 0x20, 0x00, 0x80, 0x33,</div><div class='add'>+0x00, 0x02, 0x00, 0x38, 0x03, 0xE0, 0x0C, 0x80, 0x33, 0x00, 0xCE, 0x00, 0x08,</div><div class='add'>+0x00, 0x20, 0x00, 0x80, 0x00, 0x00, 0x02, 0x00, 0x38, 0x03, 0xE0, 0x0C, 0x80,</div><div class='add'>+0x00, 0x00, 0xCE, 0x00, 0x38, 0x43, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x10, 0x00, 0x00, 0x21, 0x00, 0x84, 0x33, 0x10, 0x02, 0x40, 0x08, 0x00, 0x21,</div><div class='add'>+0x00, 0x84, 0x00, 0x10, 0x02, 0x40, 0x08, 0x00, 0x21, 0x00, 0x84, 0x00, 0x10,</div><div class='add'>+0xCE, 0x40, 0x08, 0x00, 0xE1, 0x0C, 0x84, 0x00, 0x10, 0xCE, 0x40, 0x38, 0x03,</div><div class='add'>+0x21, 0x00, 0x84, 0x33, 0x10, 0xCE, 0x40, 0x08, 0x00, 0x21, 0x00, 0x84, 0x33,</div><div class='add'>+0x10, 0x02, 0x40, 0x08, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x40, 0x00, 0x00, 0x81, 0x00, 0x04, 0x00, 0x10, 0x00, 0x40, 0x00, 0x00,</div><div class='add'>+0x01, 0x00, 0x04, 0x00, 0x10, 0x00, 0x40, 0x00, 0x00, 0x01, 0x00, 0x04, 0x02,</div><div class='add'>+0x10, 0x00, 0x40, 0x20, 0x00, 0x01, 0x00, 0x04, 0x02, 0x10, 0x08, 0x40, 0x00,</div><div class='add'>+0x00, 0x81, 0x00, 0x04, 0x02, 0x10, 0x00, 0x40, 0x00, 0x00, 0x81, 0x00, 0x04,</div><div class='add'>+0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x01, 0x00, 0x84, 0x00, 0x10, 0x00, 0x40, 0x00, 0x00, 0x01, 0x00, 0x04,</div><div class='add'>+0x00, 0x10, 0x00, 0x40, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00, 0x10, 0x02, 0x40,</div><div class='add'>+0x00, 0x00, 0x21, 0x00, 0x04, 0x00, 0x10, 0x02, 0x40, 0x08, 0x00, 0x01, 0x00,</div><div class='add'>+0x84, 0x00, 0x10, 0x02, 0x40, 0x00, 0x00, 0x01, 0x00, 0x84, 0x00, 0x10, 0x00,</div><div class='add'>+0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x01,</div><div class='add'>+0x00, 0x00, 0x00, 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xCC, 0x00, 0x00,</div><div class='add'>+0x00, 0xC0, 0x0C, 0x00, 0x00, 0x00, 0xCC, 0x00, 0x30, 0x03, 0x00, 0x00, 0x00,</div><div class='add'>+0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3C, 0x3C, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF0,</div><div class='add'>+0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF,</div><div class='add'>+0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x03, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0xFC,</div><div class='add'>+0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF,</div><div class='add'>+0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF,</div><div class='add'>+0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0xFC, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF,</div><div class='add'>+0x03, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF,</div><div class='add'>+0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0xFC,</div><div class='add'>+0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x03,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0xFC, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF,</div><div class='add'>+0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF,</div><div class='add'>+0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x03, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0xFC,</div><div class='add'>+0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x03,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF,</div><div class='add'>+0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF,</div><div class='add'>+0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x03, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x40, 0x21, 0x00, 0x85, 0x00, 0x14, 0x02, 0x50, 0x08, 0x40, 0x21, 0x00, 0x85,</div><div class='add'>+0x00, 0x14, 0x02, 0x50, 0x08, 0x40, 0x21, 0x00, 0x85, 0x00, 0x14, 0x02, 0x50,</div><div class='add'>+0x08, 0x40, 0x21, 0x00, 0x85, 0x00, 0x14, 0x02, 0x50, 0x08, 0x40, 0x21, 0x00,</div><div class='add'>+0x85, 0x00, 0x14, 0x02, 0x50, 0x08, 0x40, 0x21, 0x00, 0x85, 0x00, 0x14, 0x02,</div><div class='add'>+0x50, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10,</div><div class='add'>+0x20, 0x40, 0x80, 0x00, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x00,</div><div class='add'>+0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x00, 0x01, 0x02, 0x04, 0x08,</div><div class='add'>+0x10, 0x20, 0x40, 0x80, 0x00, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80,</div><div class='add'>+0x00, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x00, 0x01, 0x02, 0x04,</div><div class='add'>+0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x21,</div><div class='add'>+0x00, 0x84, 0x00, 0x10, 0x02, 0x40, 0x08, 0x00, 0x21, 0x00, 0x84, 0x00, 0x10,</div><div class='add'>+0x02, 0x40, 0x08, 0x00, 0x21, 0x00, 0x84, 0x00, 0x10, 0x02, 0x40, 0x08, 0x00,</div><div class='add'>+0x21, 0x00, 0x84, 0x00, 0x10, 0x02, 0x40, 0x08, 0x00, 0x21, 0x00, 0x84, 0x00,</div><div class='add'>+0x10, 0x02, 0x40, 0x08, 0x00, 0x21, 0x00, 0x84, 0x00, 0x10, 0x02, 0x40, 0x08,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00,</div><div class='add'>+0x80, 0x00, 0x00, 0x02, 0x00, 0x08, 0x00, 0x20, 0x00, 0x80, 0x00, 0x00, 0x02,</div><div class='add'>+0x00, 0x08, 0x00, 0x20, 0x00, 0x80, 0x00, 0x00, 0x02, 0x00, 0x08, 0x00, 0x20,</div><div class='add'>+0x40, 0x80, 0x00, 0x01, 0x02, 0x00, 0x08, 0x00, 0x20, 0x00, 0x80, 0x00, 0x00,</div><div class='add'>+0x02, 0x00, 0x08, 0x00, 0x20, 0x00, 0x80, 0x00, 0x00, 0x02, 0x00, 0x08, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x04,</div><div class='add'>+0x00, 0x10, 0x00, 0x40, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00, 0x10, 0x00, 0x40,</div><div class='add'>+0x00, 0x00, 0x01, 0x00, 0x04, 0x00, 0x10, 0x00, 0x40, 0x00, 0x00, 0x01, 0x00,</div><div class='add'>+0x04, 0x00, 0x10, 0x00, 0x40, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00, 0x10, 0x00,</div><div class='add'>+0x40, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00, 0x10, 0x00, 0x40, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x40, 0x00, 0x00, 0x01, 0x00,</div><div class='add'>+0x04, 0x00, 0x10, 0x00, 0x40, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00, 0x10, 0x00,</div><div class='add'>+0x40, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00, 0x10, 0x00, 0x40, 0x00, 0x00, 0x01,</div><div class='add'>+0x00, 0x04, 0x00, 0x10, 0x00, 0x40, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00, 0x10,</div><div class='add'>+0x00, 0x40, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00, 0x10, 0x00, 0x40, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x10, 0x01, 0x40, 0x04, 0x00, 0x11,</div><div class='add'>+0x00, 0x44, 0x00, 0x10, 0x01, 0x40, 0x04, 0x00, 0x11, 0x00, 0x44, 0x00, 0x10,</div><div class='add'>+0x01, 0x40, 0x04, 0x00, 0x11, 0x00, 0x44, 0x00, 0x10, 0x01, 0x40, 0x04, 0x00,</div><div class='add'>+0x11, 0x00, 0x44, 0x00, 0x10, 0x01, 0x40, 0x04, 0x00, 0x10, 0x00, 0x44, 0x00,</div><div class='add'>+0x10, 0x01, 0x00, 0x04, 0x00, 0x11, 0x00, 0x44, 0x00, 0x40, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x10, 0x00, 0x40, 0x00, 0x00, 0x01, 0x00,</div><div class='add'>+0x04, 0x00, 0x10, 0x00, 0x40, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00, 0x10, 0x00,</div><div class='add'>+0x40, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00, 0x10, 0x00, 0x40, 0x00, 0x00, 0x01,</div><div class='add'>+0x00, 0x04, 0x00, 0x10, 0x00, 0x40, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00, 0x10,</div><div class='add'>+0x00, 0x40, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x10, 0x00, 0x50, 0x21, 0x40, 0x85, 0x00, 0x15, 0xCE, 0x54,</div><div class='add'>+0x08, 0x50, 0x21, 0x40, 0x85, 0x33, 0x15, 0x02, 0x54, 0x08, 0x50, 0x21, 0x40,</div><div class='add'>+0x85, 0x00, 0x15, 0x02, 0x54, 0x38, 0x53, 0x21, 0x40, 0x85, 0x00, 0x15, 0x02,</div><div class='add'>+0x54, 0x08, 0x50, 0x21, 0x40, 0x85, 0x00, 0x15, 0x02, 0x54, 0x08, 0x50, 0x21,</div><div class='add'>+0x40, 0x85, 0x00, 0x15, 0x02, 0x54, 0x08, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x10, 0x00, 0x10, 0x20, 0x40, 0x80, 0x00, 0x01, 0x02, 0x04, 0x08,</div><div class='add'>+0x10, 0x20, 0x40, 0x80, 0x00, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80,</div><div class='add'>+0x00, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x00, 0x01, 0x02, 0x04,</div><div class='add'>+0x08, 0x10, 0x20, 0x40, 0x80, 0x00, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40,</div><div class='add'>+0x80, 0x00, 0x01, 0x02, 0x04, 0x08, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x10, 0x00, 0x00, 0x21, 0x00, 0x84, 0x00, 0x10, 0x02, 0x40, 0x08, 0x00,</div><div class='add'>+0x21, 0x00, 0x84, 0x00, 0x10, 0x02, 0x40, 0x08, 0x00, 0x21, 0x00, 0x84, 0x00,</div><div class='add'>+0x10, 0x02, 0x40, 0x08, 0x00, 0x21, 0x00, 0x84, 0x00, 0x10, 0x02, 0x40, 0x08,</div><div class='add'>+0x00, 0x21, 0x00, 0x84, 0x00, 0x10, 0x02, 0x40, 0x08, 0x00, 0x21, 0x00, 0x84,</div><div class='add'>+0x00, 0x10, 0x02, 0x40, 0x08, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x10, 0x08, 0x00, 0xE0, 0x0C, 0x80, 0x33, 0x00, 0xCE, 0x00, 0x38, 0x03, 0xE0,</div><div class='add'>+0x0C, 0x80, 0x33, 0x00, 0xCE, 0x00, 0x38, 0x03, 0xE0, 0x0C, 0x80, 0x33, 0x00,</div><div class='add'>+0x02, 0x00, 0x38, 0x03, 0xE0, 0x0C, 0x80, 0x33, 0x00, 0xCE, 0x00, 0x38, 0x03,</div><div class='add'>+0xE0, 0x0C, 0x80, 0x33, 0x00, 0xCE, 0x00, 0x38, 0x03, 0x20, 0x00, 0x80, 0x33,</div><div class='add'>+0x00, 0xCE, 0x00, 0x38, 0x43, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10,</div><div class='add'>+0x00, 0x00, 0x21, 0x00, 0x84, 0x00, 0x10, 0x02, 0x40, 0x08, 0x00, 0x21, 0x00,</div><div class='add'>+0x84, 0x00, 0x10, 0x02, 0x40, 0x08, 0x00, 0x21, 0x00, 0x84, 0x00, 0x10, 0x02,</div><div class='add'>+0x40, 0x08, 0x00, 0x21, 0x00, 0x84, 0x00, 0x10, 0x02, 0x40, 0x08, 0x00, 0x21,</div><div class='add'>+0x00, 0x84, 0x00, 0x10, 0x02, 0x40, 0x08, 0x00, 0x21, 0x00, 0x84, 0x00, 0x10,</div><div class='add'>+0x02, 0x40, 0x08, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x40, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00, 0x10, 0x00, 0x40, 0x00, 0x00, 0x01,</div><div class='add'>+0x00, 0x04, 0x00, 0x10, 0x00, 0x40, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00, 0x10,</div><div class='add'>+0x00, 0x40, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00, 0x10, 0x00, 0x40, 0x00, 0x00,</div><div class='add'>+0x01, 0x00, 0x04, 0x00, 0x10, 0x00, 0x40, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00,</div><div class='add'>+0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x01, 0x00, 0x04, 0x00, 0x10, 0x00, 0x40, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00,</div><div class='add'>+0x10, 0x00, 0x40, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00, 0x10, 0x00, 0x40, 0x00,</div><div class='add'>+0x00, 0x01, 0x00, 0x04, 0x00, 0x10, 0x00, 0x40, 0x00, 0x00, 0x01, 0x00, 0x04,</div><div class='add'>+0x00, 0x10, 0x00, 0x40, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00, 0x10, 0x00, 0x40,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x01, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3C, 0x3C, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF0, 0xF0,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF,</div><div class='add'>+0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF,</div><div class='add'>+0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0xFC, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF,</div><div class='add'>+0x03, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF,</div><div class='add'>+0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0xFC,</div><div class='add'>+0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x03,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0xFC, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF,</div><div class='add'>+0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF,</div><div class='add'>+0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x03, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0xFC,</div><div class='add'>+0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x03,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF,</div><div class='add'>+0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF,</div><div class='add'>+0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x03, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0xFC, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF,</div><div class='add'>+0x03, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF,</div><div class='add'>+0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x04, 0x80,</div><div class='add'>+0x40, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x22, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x04, 0x80, 0x40,</div><div class='add'>+0x40, 0x00, 0x00, 0x0C, 0x00, 0x22, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x80, 0x00,</div><div class='add'>+0x00, 0x22, 0x25, 0x0C, 0x00, 0x01, 0x80, 0x00, 0x00, 0x00, 0xC0, 0x0C, 0x00,</div><div class='add'>+0x02, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x0C, 0x00, 0x01, 0x80, 0x00, 0x00, 0x00, 0xA0, 0x0C, 0x00, 0x05, 0x80,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x80, 0x00, 0x00, 0x87, 0xE8, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00</div><div class='add'>+};</div><div class='head'>diff --git a/drivers/staging/me4000/me4610_firmware.h b/drivers/staging/me4000/me4610_firmware.h<br/>new file mode 100644<br/>index 000000000000..c550d99286c0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/me4000/me4610_firmware.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/me4000/me4610_firmware.h</a></div><div class='hunk'>@@ -0,0 +1,5409 @@</div><div class='add'>+/*</div><div class='add'>+   This file is copyright by Meilhaus Electronic GmbH 2003.</div><div class='add'>+   You are not allowed to distribute, sell, modify, reverse engineer or use this</div><div class='add'>+   code (or parts of it) for any other purpose or under any other conditions</div><div class='add'>+   than stated below.</div><div class='add'>+</div><div class='add'>+   1) You are allowed to distribute verbatim copies of this file together</div><div class='add'>+   with device drivers for the Meilhaus ME-4000, board family.</div><div class='add'>+</div><div class='add'>+   2) Derived work (device drivers using this file) can be published under</div><div class='add'>+   the terms of the GNU General Public License as published by</div><div class='add'>+   the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+   (at your option) any later version. Any other license terms have</div><div class='add'>+   to be agreed by Meilhaus GmbH in written.</div><div class='add'>+</div><div class='add'>+   2) This file is distributed WITHOUT ANY WARRANTY;</div><div class='add'>+   without even the implied warranty of MERCHANTABILITY</div><div class='add'>+   or FITNESS FOR A PARTICULAR PURPOSE. Meilhaus is under</div><div class='add'>+   no means liable for products using this file or parts of it.</div><div class='add'>+</div><div class='add'>+   3) The copyright of this file has to be mentioned in derived work.</div><div class='add'>+</div><div class='add'>+   4) If this license terms are not valid due to any other law</div><div class='add'>+   or restrictions imposed on you, you are not allowed to use</div><div class='add'>+   this file in any way at all.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* Version 0 of ME-4610 firmware */</div><div class='add'>+static unsigned char xilinx_firm_4610[] = {</div><div class='add'>+0x00, 0x01, 0x11, 0x0c, 0x01, 0x01, 0x04, 0x00, 0x00, 0x09, 0x04, 0x02, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x55, 0x99, 0xAA, 0x66, 0x0C, 0x00,</div><div class='add'>+0x01, 0x80, 0x00, 0x00, 0x00, 0xE0, 0x0C, 0x80, 0x06, 0x80, 0x00, 0x00, 0x00,</div><div class='add'>+0xD0, 0x0C, 0x80, 0x04, 0x80, 0x00, 0x01, 0xFC, 0xB4, 0x0C, 0x00, 0x03, 0x80,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x01, 0x80, 0x00, 0x00, 0x00, 0x90, 0x0C,</div><div class='add'>+0x00, 0x04, 0x80, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x01, 0x80, 0x00, 0x00,</div><div class='add'>+0x00, 0x80, 0x0C, 0x00, 0x02, 0x00, 0x0A, 0x00, 0x7C, 0x20, 0x40, 0x58, 0x04,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x20, 0x01, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x48, 0x04, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x20, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x48, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x01, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x40, 0x48, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x20, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20,</div><div class='add'>+0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xBF, 0x58, 0x80, 0x54, 0x00,</div><div class='add'>+0x44, 0x01, 0x18, 0x05, 0x60, 0x04, 0x80, 0x01, 0x00, 0x66, 0x00, 0xD8, 0x00,</div><div class='add'>+0x60, 0x0A, 0x80, 0x2D, 0x00, 0xF6, 0x00, 0xD8, 0x03, 0x60, 0x0A, 0x80, 0x69,</div><div class='add'>+0x00, 0xC6, 0x01, 0x98, 0x05, 0x20, 0x16, 0xFC, 0x23, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x03, 0xA0, 0xFF, 0x00, 0xBF, 0x00, 0xDC, 0x32, 0xF0,</div><div class='add'>+0x13, 0xC0, 0x4F, 0x00, 0xFB, 0x28, 0xBC, 0x04, 0xB0, 0x17, 0xC0, 0x4E, 0x12,</div><div class='add'>+0x1B, 0x10, 0xFC, 0x13, 0x30, 0x93, 0xC0, 0x4B, 0x00, 0x1F, 0x01, 0xFC, 0x24,</div><div class='add'>+0x30, 0xCF, 0xE2, 0x0C, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x01, 0x08, 0x37, 0x01, 0x9D, 0x06, 0x44, 0x30, 0xD1, 0x11, 0x40, 0x47, 0x00,</div><div class='add'>+0xFD, 0x0A, 0x74, 0x06, 0x10, 0x09, 0x40, 0x17, 0x09, 0x11, 0x42, 0xF4, 0x0B,</div><div class='add'>+0x50, 0x49, 0x40, 0x06, 0x0C, 0x1D, 0x00, 0x74, 0x00, 0x10, 0x8F, 0x40, 0x04,</div><div class='add'>+0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x00, 0x33, 0x00,</div><div class='add'>+0x8D, 0x18, 0x05, 0x16, 0xDA, 0x08, 0x40, 0x33, 0x00, 0xCD, 0x40, 0x74, 0x03,</div><div class='add'>+0x91, 0x0C, 0x40, 0x35, 0x01, 0x0D, 0x20, 0x34, 0xA3, 0x10, 0x48, 0x40, 0x01,</div><div class='add'>+0x01, 0xCD, 0xA0, 0x74, 0x13, 0xD2, 0x4C, 0x40, 0x44, 0x80, 0x0E, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xA8, 0x34, 0x00, 0x9D, 0x01, 0x44, 0x86,</div><div class='add'>+0xD0, 0x39, 0x40, 0x07, 0x00, 0xDD, 0x00, 0x64, 0x8A, 0x10, 0x89, 0x02, 0x37,</div><div class='add'>+0x00, 0x15, 0x10, 0x74, 0x03, 0x50, 0x19, 0x07, 0x47, 0x20, 0x5D, 0x04, 0x74,</div><div class='add'>+0xA3, 0xDA, 0x0D, 0x48, 0x0C, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0xA8, 0x77, 0x00, 0x1F, 0x91, 0x4C, 0x86, 0xE0, 0x19, 0xC0, 0x57,</div><div class='add'>+0x21, 0xDB, 0x00, 0x7C, 0x01, 0xB0, 0x05, 0x80, 0x06, 0x91, 0x1B, 0x0B, 0x7C,</div><div class='add'>+0x03, 0x31, 0x31, 0xC0, 0x47, 0x01, 0x9F, 0x44, 0x7C, 0x02, 0xD0, 0x0D, 0x60,</div><div class='add'>+0x00, 0x20, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x80, 0x3D,</div><div class='add'>+0x02, 0x3E, 0x40, 0xE8, 0x00, 0xF0, 0x0B, 0x40, 0x8F, 0x00, 0xFE, 0x00, 0xF4,</div><div class='add'>+0x48, 0xF0, 0x0B, 0xC0, 0x1F, 0x80, 0x1A, 0x20, 0xBC, 0x03, 0xE1, 0x0B, 0xC8,</div><div class='add'>+0x0E, 0x00, 0x3E, 0x01, 0xF8, 0x02, 0x30, 0x0F, 0xD1, 0x1F, 0x00, 0x06, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x08, 0x35, 0x00, 0x9F, 0x00, 0x5C,</div><div class='add'>+0x46, 0x70, 0x09, 0xC0, 0x37, 0x00, 0xDF, 0x20, 0x7C, 0x21, 0x30, 0x0D, 0xC4,</div><div class='add'>+0x34, 0x00, 0xDF, 0x00, 0x4C, 0x83, 0xB0, 0x29, 0xC0, 0x84, 0x08, 0x9F, 0x44,</div><div class='add'>+0x7C, 0x43, 0xF0, 0x0C, 0xC4, 0x0A, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x13, 0xA0, 0x34, 0x00, 0x9D, 0x00, 0x74, 0x0A, 0x90, 0x09, 0x40,</div><div class='add'>+0x67, 0x00, 0xF0, 0x80, 0x34, 0x04, 0xB0, 0xB9, 0x40, 0x32, 0x00, 0xD1, 0x41,</div><div class='add'>+0xC0, 0x03, 0xD0, 0x09, 0x40, 0x07, 0x00, 0x51, 0x00, 0x34, 0x43, 0xD0, 0x3F,</div><div class='add'>+0x40, 0x4C, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xA0,</div><div class='add'>+0x32, 0x10, 0x1D, 0x40, 0x30, 0x00, 0x90, 0x10, 0x40, 0xA3, 0x84, 0xC9, 0x00,</div><div class='add'>+0x34, 0x00, 0x10, 0x08, 0x40, 0x20, 0x00, 0xC0, 0x21, 0x00, 0x03, 0x90, 0x00,</div><div class='add'>+0x40, 0x00, 0x00, 0x49, 0x83, 0x04, 0x89, 0xD8, 0x0C, 0x40, 0x1C, 0x00, 0x0A,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x82, 0x78, 0x02, 0xEC, 0x81,</div><div class='add'>+0xB4, 0x05, 0x9A, 0x92, 0x60, 0x4B, 0x90, 0xE1, 0xA9, 0xB6, 0x06, 0x90, 0x1A,</div><div class='add'>+0x60, 0x7A, 0x00, 0xE1, 0x13, 0xA4, 0x07, 0xC0, 0x12, 0x40, 0x4F, 0x00, 0x61,</div><div class='add'>+0x35, 0xB4, 0x25, 0xC0, 0x9F, 0x61, 0x18, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x12, 0x10, 0x30, 0x10, 0x4D, 0x00, 0x1C, 0xA1, 0x78, 0x80,</div><div class='add'>+0xE1, 0x33, 0x25, 0xCF, 0x20, 0x3C, 0x23, 0x30, 0x2C, 0xC1, 0x34, 0x08, 0x07,</div><div class='add'>+0x05, 0x0D, 0x03, 0xB0, 0xC0, 0xE8, 0x10, 0x22, 0xCF, 0x41, 0x3C, 0x17, 0xF2,</div><div class='add'>+0xDD, 0xD0, 0x48, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,</div><div class='add'>+0xB2, 0x3D, 0x08, 0xFF, 0x00, 0xFE, 0xA3, 0x80, 0x8F, 0xC2, 0x1B, 0x00, 0xFF,</div><div class='add'>+0x80, 0xFE, 0x03, 0xF0, 0x0B, 0x40, 0x3F, 0x10, 0x37, 0x08, 0xDC, 0x63, 0xF0,</div><div class='add'>+0x87, 0xC6, 0x3F, 0x08, 0xDF, 0x00, 0x7C, 0x23, 0xFA, 0x8F, 0xC2, 0x09, 0x60,</div><div class='add'>+0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0xA8, 0x77, 0x00, 0x57,</div><div class='add'>+0x00, 0x7C, 0x03, 0xF0, 0x11, 0xC0, 0x35, 0x00, 0xDF, 0x10, 0x5C, 0x01, 0xF0,</div><div class='add'>+0x18, 0xC0, 0x66, 0x00, 0xD3, 0x00, 0x6C, 0x13, 0xF0, 0x01, 0xC8, 0x17, 0x10,</div><div class='add'>+0x9F, 0x00, 0x7C, 0x03, 0x32, 0xBD, 0xC5, 0x54, 0x20, 0x0E, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x12, 0x98, 0x3D, 0x00, 0x61, 0x80, 0xB6, 0x01, 0xD0,</div><div class='add'>+0x0A, 0x48, 0x38, 0x00, 0xFD, 0x06, 0x84, 0x03, 0xD2, 0x0A, 0x40, 0x39, 0x40,</div><div class='add'>+0xF1, 0x80, 0x86, 0x43, 0xD0, 0x0A, 0x48, 0x1B, 0x00, 0xED, 0x00, 0xB4, 0x03,</div><div class='add'>+0x10, 0x0F, 0x40, 0x48, 0x60, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x03, 0x00, 0x79, 0x80, 0xE5, 0x01, 0x94, 0x07, 0xD0, 0x17, 0x40, 0x79, 0x08,</div><div class='add'>+0xEC, 0x01, 0x94, 0x07, 0xD0, 0x1F, 0x40, 0x7B, 0x00, 0xE1, 0x01, 0x84, 0x07,</div><div class='add'>+0xD0, 0x1E, 0x60, 0x79, 0x00, 0xAD, 0x11, 0xA4, 0x07, 0x50, 0x1E, 0x40, 0x0C,</div><div class='add'>+0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x20, 0x23, 0x00,</div><div class='add'>+0xC1, 0x00, 0x34, 0x03, 0xD0, 0x0C, 0x42, 0x31, 0x02, 0xCD, 0x00, 0x14, 0x4B,</div><div class='add'>+0xD1, 0x08, 0x40, 0x31, 0x00, 0xC1, 0x0D, 0x04, 0x03, 0xD0, 0x0C, 0x40, 0x73,</div><div class='add'>+0x01, 0xCD, 0x80, 0x74, 0x0B, 0x50, 0x0C, 0x40, 0x48, 0x00, 0x0C, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x17, 0xA0, 0x14, 0x01, 0x77, 0x03, 0xFC, 0x29,</div><div class='add'>+0xD0, 0x17, 0xC1, 0x5D, 0x00, 0x5F, 0x00, 0x9C, 0x19, 0xD0, 0x07, 0xC0, 0x1E,</div><div class='add'>+0x00, 0x73, 0x02, 0x4C, 0x01, 0xF0, 0x47, 0xC0, 0x1F, 0x8C, 0x7F, 0x00, 0xFC,</div><div class='add'>+0x09, 0x72, 0x05, 0x40, 0x5C, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x12, 0x00, 0x07, 0x00, 0x1F, 0x08, 0x7C, 0x00, 0xD0, 0x11, 0x40, 0x46,</div><div class='add'>+0x00, 0x0E, 0x40, 0x68, 0x00, 0xF0, 0x01, 0xC0, 0x06, 0x00, 0x1F, 0x42, 0x5C,</div><div class='add'>+0x00, 0xB2, 0x11, 0xC0, 0x07, 0x00, 0x1B, 0x10, 0x7C, 0x10, 0x82, 0x01, 0xC0,</div><div class='add'>+0x4B, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x27,</div><div class='add'>+0x00, 0x8F, 0x10, 0x54, 0x0A, 0xF2, 0x09, 0x40, 0x27, 0x00, 0x9B, 0x00, 0x4C,</div><div class='add'>+0x06, 0xD0, 0x99, 0xC0, 0x27, 0x00, 0x8F, 0x04, 0x5C, 0x82, 0xE0, 0x09, 0xC0,</div><div class='add'>+0x27, 0x00, 0x97, 0x00, 0x7C, 0x02, 0x30, 0x89, 0xC2, 0x43, 0x20, 0x0C, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x20, 0x26, 0x10, 0x9C, 0x00, 0x54,</div><div class='add'>+0x02, 0xD0, 0xB9, 0x40, 0xE7, 0x00, 0x9D, 0x00, 0x44, 0x6A, 0x10, 0x19, 0x04,</div><div class='add'>+0x27, 0x00, 0x9D, 0x02, 0x45, 0x02, 0xC2, 0x09, 0x40, 0x27, 0x00, 0x90, 0x13,</div><div class='add'>+0x74, 0x22, 0x10, 0x59, 0x40, 0x07, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x18, 0xA0, 0x24, 0x00, 0x9D, 0x00, 0x44, 0x02, 0x90, 0x09, 0x40,</div><div class='add'>+0xE7, 0x00, 0x9D, 0x80, 0x45, 0x02, 0x90, 0x09, 0x41, 0x26, 0x00, 0x9D, 0x02,</div><div class='add'>+0x44, 0x82, 0x90, 0x09, 0x40, 0x23, 0x00, 0x91, 0x01, 0x74, 0x02, 0x10, 0x09,</div><div class='add'>+0x40, 0x63, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x20,</div><div class='add'>+0x20, 0x02, 0x8D, 0x14, 0x14, 0x56, 0xD0, 0x0C, 0x40, 0x23, 0x08, 0x8D, 0x00,</div><div class='add'>+0x04, 0x02, 0x10, 0x08, 0x40, 0x23, 0x02, 0x8D, 0x00, 0x04, 0x02, 0xD0, 0x88,</div><div class='add'>+0x00, 0x23, 0x02, 0x81, 0x00, 0x30, 0x02, 0x14, 0x48, 0x49, 0x43, 0x80, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xB0, 0x86, 0x00, 0x1F, 0x24,</div><div class='add'>+0x4C, 0x10, 0xF0, 0x01, 0xC0, 0x07, 0x10, 0x1E, 0x14, 0x4C, 0x00, 0xB0, 0xA1,</div><div class='add'>+0xC2, 0x83, 0x00, 0x1F, 0x1E, 0x4C, 0x78, 0xF0, 0x21, 0xC0, 0x87, 0x00, 0x17,</div><div class='add'>+0x0A, 0x3C, 0x81, 0x30, 0x41, 0xC0, 0x77, 0xC0, 0x0A, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x19, 0xB0, 0x2F, 0x01, 0xBF, 0x94, 0xFC, 0x52, 0xF2, 0x0A,</div><div class='add'>+0xC8, 0x2F, 0x00, 0x9C, 0x14, 0xFC, 0x02, 0xB0, 0x1F, 0x80, 0x2F, 0x01, 0xBF,</div><div class='add'>+0x81, 0x70, 0x06, 0xF1, 0x4F, 0xC0, 0x2F, 0x41, 0xBF, 0x01, 0xFC, 0x53, 0xF0,</div><div class='add'>+0x49, 0x41, 0x67, 0x60, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x19,</div><div class='add'>+0x80, 0x23, 0x00, 0x97, 0x08, 0xF0, 0x37, 0x30, 0x0A, 0xC0, 0x2F, 0x20, 0x9F,</div><div class='add'>+0x0C, 0xFC, 0x02, 0xF0, 0x0B, 0xC0, 0xA2, 0x00, 0xBF, 0x10, 0x4C, 0x02, 0xF0,</div><div class='add'>+0x29, 0xC0, 0x25, 0x02, 0xB3, 0x00, 0xFC, 0x02, 0x30, 0x0B, 0xC0, 0x64, 0x00,</div><div class='add'>+0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1C, 0x08, 0x07, 0x01, 0x01,</div><div class='add'>+0x05, 0x74, 0x3D, 0xB0, 0x01, 0x40, 0x17, 0x00, 0x1D, 0x01, 0x74, 0x01, 0xD1,</div><div class='add'>+0x01, 0x40, 0x04, 0x00, 0x0D, 0x02, 0x51, 0x28, 0x91, 0x01, 0x40, 0x14, 0x11,</div><div class='add'>+0x11, 0x00, 0x74, 0x00, 0x10, 0x01, 0x48, 0x71, 0x00, 0x0C, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x10, 0xA0, 0x23, 0x04, 0x85, 0x42, 0x34, 0x02, 0x59,</div><div class='add'>+0x08, 0x40, 0x23, 0x08, 0x8D, 0x02, 0x34, 0x02, 0xD0, 0x09, 0x42, 0x22, 0x10,</div><div class='add'>+0x8D, 0x00, 0x16, 0x82, 0xD0, 0x09, 0x40, 0x21, 0x00, 0xC5, 0x20, 0x74, 0x02,</div><div class='add'>+0x11, 0x08, 0x50, 0x40, 0x80, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x18, 0xA8, 0x21, 0x00, 0x91, 0x04, 0x74, 0x03, 0xD0, 0x39, 0x60, 0x27, 0x08,</div><div class='add'>+0x9D, 0x00, 0x74, 0x02, 0xD0, 0x8D, 0x42, 0x24, 0x00, 0x9D, 0x00, 0x54, 0x02,</div><div class='add'>+0xD0, 0x09, 0x40, 0x24, 0x40, 0x95, 0x04, 0x74, 0x02, 0x52, 0x09, 0x40, 0x61,</div><div class='add'>+0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x28, 0x25, 0x08,</div><div class='add'>+0x97, 0x93, 0x78, 0x0A, 0x74, 0x19, 0xC0, 0xE7, 0x00, 0x9F, 0x00, 0x7C, 0x0A,</div><div class='add'>+0xF0, 0x08, 0xC8, 0xE6, 0x01, 0x9F, 0xB8, 0x5C, 0x02, 0xF0, 0x28, 0xC2, 0x25,</div><div class='add'>+0x00, 0x97, 0x04, 0x3C, 0x0E, 0x20, 0x09, 0xC4, 0x14, 0x20, 0x04, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x02, 0x64, 0x02, 0x9F, 0x00, 0x3C, 0x16,</div><div class='add'>+0xB0, 0x09, 0xC4, 0xE7, 0x00, 0x9F, 0x80, 0x7C, 0x26, 0xF0, 0x09, 0xC0, 0x27,</div><div class='add'>+0x01, 0x9F, 0x01, 0x68, 0x02, 0xB0, 0x29, 0xC4, 0x27, 0x01, 0x9B, 0x00, 0x7C,</div><div class='add'>+0x0E, 0xB4, 0x08, 0x40, 0x52, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x14, 0x08, 0x05, 0x00, 0x13, 0x02, 0x4C, 0x08, 0xF0, 0x61, 0xC0, 0x07,</div><div class='add'>+0x00, 0x17, 0x00, 0x4C, 0x40, 0xF0, 0x21, 0x40, 0x04, 0x00, 0x03, 0x42, 0x5C,</div><div class='add'>+0x00, 0x30, 0x21, 0xC0, 0x87, 0x10, 0x1F, 0x00, 0x4C, 0x08, 0xF0, 0x01, 0xD1,</div><div class='add'>+0x50, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x20, 0x14,</div><div class='add'>+0x00, 0x51, 0x00, 0xC4, 0x0D, 0xD0, 0x37, 0x40, 0x1C, 0x02, 0x51, 0x20, 0xCC,</div><div class='add'>+0x41, 0xD2, 0x07, 0x48, 0x14, 0x00, 0x71, 0x49, 0x44, 0x81, 0x50, 0x05, 0x40,</div><div class='add'>+0x17, 0x00, 0x7C, 0x82, 0xC4, 0x69, 0xD0, 0x07, 0x40, 0x50, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0xA0, 0x32, 0x60, 0xC1, 0x40, 0x14,</div><div class='add'>+0xCF, 0xC0, 0xB4, 0x40, 0x72, 0x02, 0xC5, 0x00, 0x24, 0x03, 0xD0, 0x8C, 0x40,</div><div class='add'>+0x30, 0x10, 0xC1, 0x0B, 0x24, 0x03, 0x10, 0x0C, 0x40, 0x37, 0x00, 0xC9, 0x04,</div><div class='add'>+0x04, 0x80, 0xD0, 0x30, 0x40, 0x50, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x04, 0x82, 0x3C, 0x22, 0xE1, 0x0D, 0x94, 0x43, 0xD0, 0x12, 0x40,</div><div class='add'>+0x7E, 0x00, 0xC1, 0x01, 0x84, 0x01, 0xD0, 0x0E, 0x40, 0x7C, 0x43, 0x61, 0x00,</div><div class='add'>+0xA4, 0x27, 0x50, 0x0E, 0x40, 0x3B, 0x10, 0xAD, 0x21, 0x84, 0x01, 0xD0, 0x23,</div><div class='add'>+0x44, 0x10, 0x20, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x10,</div><div class='add'>+0x78, 0x01, 0xE3, 0x91, 0x9D, 0x07, 0xF0, 0x16, 0xC0, 0x4A, 0x00, 0xE7, 0x01,</div><div class='add'>+0xAD, 0x07, 0xE1, 0x13, 0xC0, 0x78, 0x02, 0xA3, 0x61, 0xFC, 0x37, 0x30, 0x5E,</div><div class='add'>+0xC1, 0x7B, 0x00, 0xBB, 0x01, 0x8C, 0x06, 0xFA, 0x1B, 0xC0, 0x50, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xB0, 0x35, 0x04, 0xDF, 0x40,</div><div class='add'>+0x6C, 0x03, 0xF3, 0x01, 0xC0, 0x00, 0x20, 0xDF, 0x00, 0x7C, 0x01, 0xD0, 0x05,</div><div class='add'>+0x90, 0x37, 0x01, 0x1F, 0x00, 0x5C, 0x93, 0xF1, 0xAD, 0x80, 0xB7, 0x03, 0x9C,</div><div class='add'>+0x40, 0x7C, 0x02, 0xF0, 0x09, 0xC0, 0x43, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x02, 0xA0, 0x7F, 0x00, 0xFF, 0x01, 0xDC, 0x25, 0x30, 0x1F,</div><div class='add'>+0xC0, 0x7F, 0x00, 0xF7, 0x11, 0xFC, 0x26, 0x10, 0x1F, 0xC0, 0x7F, 0x10, 0x7F,</div><div class='add'>+0x09, 0xCC, 0x87, 0x30, 0x9F, 0xC0, 0xFC, 0x8A, 0xBF, 0x0D, 0xEC, 0x24, 0xF1,</div><div class='add'>+0x17, 0xC0, 0x0B, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15,</div><div class='add'>+0x88, 0x39, 0x24, 0xED, 0x00, 0xF4, 0x03, 0xB0, 0x4A, 0x48, 0x0B, 0x00, 0xED,</div><div class='add'>+0x04, 0xB4, 0x21, 0x10, 0x4E, 0x42, 0x7B, 0x01, 0x29, 0x01, 0x84, 0x03, 0xF0,</div><div class='add'>+0x0E, 0x44, 0x38, 0x00, 0x8D, 0x43, 0x34, 0x21, 0xD0, 0x84, 0x40, 0x57, 0x20,</div><div class='add'>+0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x48, 0x00, 0x39, 0x00, 0xED,</div><div class='add'>+0x10, 0x94, 0x01, 0x98, 0x02, 0x40, 0x0B, 0x04, 0xED, 0x80, 0xF4, 0x00, 0x90,</div><div class='add'>+0x02, 0x41, 0x3B, 0x01, 0x0D, 0x08, 0x94, 0x03, 0x10, 0x0E, 0x48, 0x38, 0x20,</div><div class='add'>+0x25, 0x02, 0xB4, 0x20, 0xD8, 0x0E, 0x40, 0x23, 0x00, 0x04, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x06, 0x28, 0x33, 0x00, 0xCD, 0x01, 0x74, 0x42, 0x90,</div><div class='add'>+0x00, 0x40, 0x03, 0x00, 0xCD, 0x00, 0x34, 0x2D, 0x90, 0x10, 0x40, 0x37, 0x00,</div><div class='add'>+0x19, 0x00, 0x14, 0x03, 0xD0, 0x2D, 0x40, 0xB0, 0x00, 0x0D, 0x08, 0x34, 0x03,</div><div class='add'>+0xD0, 0x0C, 0x40, 0x1B, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x05, 0x88, 0x3D, 0x00, 0xFF, 0x01, 0x5C, 0x02, 0xB0, 0xA5, 0xC0, 0x27, 0x90,</div><div class='add'>+0xF7, 0x00, 0x7C, 0x27, 0xB6, 0xB9, 0xC8, 0x3F, 0x00, 0x9F, 0x20, 0xDC, 0x03,</div><div class='add'>+0x30, 0xAF, 0xC8, 0x3C, 0x08, 0x8F, 0x01, 0x6C, 0x83, 0xD0, 0x0D, 0xC8, 0x57,</div><div class='add'>+0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x37, 0x00,</div><div class='add'>+0xDF, 0x10, 0x7C, 0x28, 0xF0, 0x15, 0xC0, 0xA7, 0x00, 0xDF, 0x00, 0x7C, 0x03,</div><div class='add'>+0x70, 0x21, 0xC0, 0x77, 0x00, 0x1E, 0x42, 0x25, 0x83, 0xB0, 0x8D, 0xC0, 0x37,</div><div class='add'>+0x00, 0x1D, 0x02, 0x7C, 0x03, 0xD0, 0x0D, 0xC4, 0x27, 0x00, 0x0C, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x81, 0x08, 0x3F, 0x28, 0xFB, 0x40, 0xFC, 0x02,</div><div class='add'>+0x30, 0x37, 0xC0, 0x2F, 0x04, 0xFF, 0x00, 0xFC, 0x16, 0xF0, 0x03, 0xC0, 0x3F,</div><div class='add'>+0x00, 0x33, 0x00, 0xCC, 0x03, 0x71, 0x0F, 0xE0, 0x3C, 0x0C, 0xBF, 0x20, 0xDC,</div><div class='add'>+0x03, 0xF2, 0x0B, 0xC2, 0x04, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0xA1, 0x00, 0x36, 0x00, 0xDD, 0x00, 0x74, 0x06, 0xB0, 0x05, 0xC0, 0xE7,</div><div class='add'>+0x00, 0xDD, 0x00, 0x74, 0x0A, 0xD0, 0x11, 0x40, 0x36, 0x00, 0x1B, 0x00, 0x6C,</div><div class='add'>+0x03, 0x10, 0x0D, 0x40, 0x35, 0x00, 0x1C, 0x03, 0x40, 0x04, 0xD0, 0x35, 0x40,</div><div class='add'>+0x84, 0x06, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xA0, 0x34,</div><div class='add'>+0x00, 0xDD, 0x00, 0x74, 0x04, 0x18, 0x0D, 0x40, 0x67, 0x04, 0xDD, 0x00, 0x64,</div><div class='add'>+0x0A, 0xD0, 0x1B, 0x40, 0x37, 0x00, 0x31, 0x06, 0xC0, 0x03, 0x00, 0x0D, 0x44,</div><div class='add'>+0x36, 0x00, 0xBD, 0x01, 0x44, 0xA3, 0xD0, 0x64, 0x50, 0x04, 0x00, 0x0A, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x20, 0x30, 0x80, 0xCD, 0x00, 0x36,</div><div class='add'>+0x00, 0x18, 0x0C, 0x40, 0x01, 0x00, 0xCD, 0x00, 0x34, 0x03, 0xD1, 0x00, 0x42,</div><div class='add'>+0x36, 0x21, 0x19, 0x24, 0x24, 0x03, 0x15, 0x0C, 0x40, 0x30, 0x00, 0x1D, 0x04,</div><div class='add'>+0x04, 0xA6, 0xD0, 0x28, 0x40, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x01, 0xB0, 0x3E, 0x08, 0xFB, 0x80, 0x7C, 0x00, 0x14, 0x01, 0x40,</div><div class='add'>+0x27, 0x08, 0xDF, 0x00, 0x6C, 0x00, 0xF0, 0x01, 0xC2, 0x3F, 0x05, 0x13, 0x16,</div><div class='add'>+0x8C, 0x03, 0x70, 0x0E, 0xD0, 0x3C, 0x10, 0x1F, 0x1C, 0x5C, 0x01, 0xF0, 0x21,</div><div class='add'>+0xC0, 0x04, 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0xB0,</div><div class='add'>+0x3F, 0x00, 0xFF, 0x40, 0xFC, 0x02, 0xF2, 0x03, 0xC0, 0x0F, 0x00, 0xFF, 0x40,</div><div class='add'>+0xBC, 0x00, 0xF0, 0x03, 0xC0, 0x36, 0x00, 0x1F, 0x14, 0xFC, 0x03, 0xF0, 0x0F,</div><div class='add'>+0xC4, 0x3F, 0x00, 0x1F, 0x04, 0xFD, 0x10, 0xF2, 0x43, 0x00, 0x17, 0x60, 0x0E,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xA0, 0x7D, 0x02, 0xFA, 0x00,</div><div class='add'>+0xFC, 0x20, 0xB0, 0x0F, 0xC0, 0x3F, 0x20, 0xF7, 0xA0, 0xEC, 0x03, 0x30, 0x4F,</div><div class='add'>+0xC4, 0x0D, 0x10, 0x33, 0x01, 0xFC, 0x27, 0xF1, 0x33, 0xC0, 0x3E, 0x00, 0x2F,</div><div class='add'>+0x01, 0x6C, 0x80, 0xF2, 0x03, 0xC4, 0x0F, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x01, 0x08, 0x37, 0x20, 0xF1, 0x82, 0x34, 0x3A, 0x10, 0x3F,</div><div class='add'>+0x40, 0xBE, 0x16, 0xF1, 0x89, 0xF4, 0x0F, 0x10, 0x9F, 0xC8, 0x45, 0x32, 0x95,</div><div class='add'>+0x00, 0x74, 0x11, 0xD1, 0x41, 0x40, 0x3F, 0x20, 0x1D, 0x54, 0x44, 0x04, 0xD0,</div><div class='add'>+0x01, 0x40, 0x07, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11,</div><div class='add'>+0x20, 0x33, 0x11, 0xC1, 0x36, 0x74, 0x03, 0x11, 0x2C, 0x44, 0x33, 0x01, 0xC5,</div><div class='add'>+0x80, 0x34, 0x23, 0x10, 0x0C, 0x40, 0x03, 0x00, 0x01, 0x00, 0x34, 0x13, 0x90,</div><div class='add'>+0x00, 0x40, 0x32, 0x00, 0xCD, 0x00, 0x24, 0x80, 0xD8, 0x00, 0x40, 0x47, 0x80,</div><div class='add'>+0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xA8, 0x75, 0x20, 0xD1,</div><div class='add'>+0x00, 0x74, 0x07, 0x10, 0x0D, 0x40, 0x36, 0x20, 0xD1, 0x00, 0x74, 0x83, 0x10,</div><div class='add'>+0x0D, 0x40, 0x97, 0x00, 0x94, 0x04, 0x74, 0x21, 0xD0, 0x11, 0x43, 0x3F, 0x00,</div><div class='add'>+0x1D, 0x10, 0xC0, 0x60, 0xC0, 0x3B, 0x40, 0x0F, 0x20, 0x06, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x02, 0xA8, 0x37, 0x40, 0xDB, 0x00, 0x3C, 0x06, 0xB4,</div><div class='add'>+0x0D, 0xC0, 0x37, 0x00, 0xD7, 0x00, 0x6E, 0x03, 0x30, 0x0D, 0xC0, 0x83, 0x00,</div><div class='add'>+0xD3, 0x80, 0x7C, 0x97, 0xF0, 0x11, 0xC8, 0x36, 0x00, 0xDF, 0x00, 0x6C, 0x00,</div><div class='add'>+0xF1, 0x31, 0xC0, 0x0B, 0x20, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x07, 0x80, 0x3D, 0x00, 0xFF, 0x80, 0xFC, 0x02, 0xF0, 0x0F, 0xC0, 0x3F, 0x20,</div><div class='add'>+0xDF, 0x00, 0xFA, 0x43, 0xF0, 0x0D, 0xC2, 0x4D, 0x01, 0xFF, 0x01, 0xFC, 0x01,</div><div class='add'>+0xF0, 0x03, 0xC0, 0x3F, 0x00, 0x3F, 0x09, 0xFC, 0x00, 0xF0, 0x03, 0x40, 0x1F,</div><div class='add'>+0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x08, 0x35, 0x01,</div><div class='add'>+0xDF, 0x08, 0x7C, 0x03, 0x30, 0x0D, 0xC0, 0x33, 0x00, 0xDF, 0x40, 0x3C, 0x03,</div><div class='add'>+0xF0, 0x0D, 0xC0, 0x27, 0x08, 0xDB, 0x00, 0x7C, 0x03, 0x30, 0x21, 0xC0, 0x37,</div><div class='add'>+0x04, 0xDF, 0x02, 0x4C, 0x00, 0xF0, 0x09, 0xC0, 0x0B, 0x20, 0x04, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0xA0, 0xF4, 0x09, 0xFD, 0xC1, 0x74, 0x83,</div><div class='add'>+0x50, 0x3F, 0x44, 0x3F, 0x00, 0xFC, 0x0A, 0xC4, 0x8F, 0xD0, 0x0F, 0x41, 0x34,</div><div class='add'>+0x00, 0xDD, 0x01, 0x74, 0x81, 0x00, 0x01, 0x00, 0xFF, 0x00, 0x1C, 0x00, 0x44,</div><div class='add'>+0x12, 0xD0, 0x39, 0x40, 0x4F, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x07, 0xA0, 0x76, 0x00, 0xC9, 0x47, 0x34, 0x03, 0x18, 0x0C, 0x49, 0x33,</div><div class='add'>+0x00, 0xCD, 0x03, 0x04, 0x2F, 0xD0, 0x5C, 0x40, 0x31, 0x00, 0x49, 0x00, 0x34,</div><div class='add'>+0x02, 0x10, 0x00, 0x40, 0xF3, 0x00, 0x1D, 0x00, 0x14, 0x04, 0xD0, 0x00, 0x01,</div><div class='add'>+0x1F, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x80, 0x78,</div><div class='add'>+0x00, 0xED, 0x01, 0xB4, 0x27, 0x50, 0x9E, 0x40, 0x7B, 0x00, 0xED, 0x35, 0x85,</div><div class='add'>+0x07, 0xD0, 0x5E, 0x40, 0x69, 0x80, 0xED, 0x03, 0xF4, 0x06, 0x90, 0x92, 0x02,</div><div class='add'>+0x7B, 0x00, 0x3D, 0x01, 0x96, 0x24, 0xD0, 0x9A, 0x48, 0x13, 0x00, 0x02, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x10, 0x30, 0x02, 0xCF, 0x08, 0x3C,</div><div class='add'>+0x03, 0x3A, 0x0C, 0xC1, 0x33, 0x00, 0xCF, 0x0D, 0x2C, 0x03, 0xF0, 0x5C, 0xC0,</div><div class='add'>+0x11, 0x00, 0x4B, 0x10, 0x3C, 0x06, 0x30, 0x00, 0xC2, 0x33, 0x06, 0xCF, 0x00,</div><div class='add'>+0x1C, 0x14, 0xF0, 0x00, 0xC1, 0x4B, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x02, 0xB8, 0x3D, 0x00, 0xFE, 0x00, 0xF8, 0x03, 0xF8, 0x0F, 0xC9,</div><div class='add'>+0x3F, 0x00, 0xFF, 0x00, 0xFC, 0x03, 0xF0, 0x0F, 0xC1, 0x1C, 0x00, 0xFF, 0x08,</div><div class='add'>+0x3C, 0x02, 0x75, 0x07, 0xC6, 0x3F, 0x00, 0xFF, 0x00, 0xED, 0x20, 0xF0, 0x0B,</div><div class='add'>+0xE8, 0x0B, 0x60, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0xA0,</div><div class='add'>+0x37, 0x10, 0xDE, 0x44, 0x7C, 0x03, 0x30, 0x5D, 0xC2, 0x34, 0x11, 0xD3, 0x04,</div><div class='add'>+0x7C, 0x0B, 0xF3, 0x3D, 0xD1, 0x34, 0x00, 0xD3, 0x01, 0x4C, 0x03, 0xF0, 0x01,</div><div class='add'>+0xD0, 0xB4, 0x07, 0xCE, 0x00, 0x4C, 0x04, 0x32, 0x19, 0xC0, 0x54, 0x00, 0x0E,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x88, 0x38, 0x00, 0xED, 0x96,</div><div class='add'>+0xF4, 0x03, 0xB0, 0x0C, 0x55, 0x38, 0x14, 0xE1, 0x16, 0xB4, 0x5B, 0xD0, 0x4C,</div><div class='add'>+0x40, 0x20, 0x10, 0xF1, 0x80, 0x84, 0x03, 0xD0, 0x02, 0x40, 0x38, 0x01, 0xED,</div><div class='add'>+0x00, 0x84, 0x02, 0x11, 0x0B, 0xC0, 0x4A, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x03, 0x00, 0x78, 0x00, 0xED, 0x01, 0xB4, 0x07, 0x10, 0x1E,</div><div class='add'>+0x4A, 0x70, 0x13, 0xE1, 0x01, 0xA4, 0x07, 0xD0, 0x5E, 0x40, 0x78, 0x40, 0xE1,</div><div class='add'>+0x01, 0x84, 0x07, 0xD0, 0x16, 0x43, 0x78, 0x81, 0xFD, 0x01, 0x04, 0x84, 0x18,</div><div class='add'>+0x1A, 0x40, 0x0C, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12,</div><div class='add'>+0x28, 0x23, 0x02, 0xDD, 0x00, 0x34, 0x03, 0x92, 0x0C, 0x40, 0x30, 0x40, 0xC1,</div><div class='add'>+0x20, 0x34, 0x03, 0xD0, 0x0C, 0x48, 0x30, 0x04, 0xC1, 0x08, 0x04, 0x07, 0xD0,</div><div class='add'>+0x2C, 0x41, 0x30, 0x00, 0xDD, 0x10, 0x04, 0x0F, 0x18, 0x3C, 0x40, 0x4A, 0x20,</div><div class='add'>+0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x17, 0xA8, 0x55, 0x00, 0x5F,</div><div class='add'>+0x80, 0xFC, 0x29, 0x30, 0x05, 0xC0, 0x14, 0x00, 0x43, 0x00, 0x7C, 0x01, 0xF0,</div><div class='add'>+0x05, 0x82, 0x1C, 0x00, 0x73, 0x03, 0xCD, 0x15, 0xF0, 0x37, 0xC0, 0x14, 0x00,</div><div class='add'>+0x7F, 0x12, 0xCC, 0x15, 0x30, 0x17, 0xC0, 0x5C, 0x20, 0x06, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x07, 0x00, 0x1F, 0x20, 0x7C, 0x00, 0xF0,</div><div class='add'>+0x01, 0xC0, 0x07, 0x08, 0x1F, 0x02, 0x7C, 0x00, 0xF0, 0x01, 0xC8, 0x87, 0x00,</div><div class='add'>+0x1F, 0x10, 0x7C, 0x80, 0xF3, 0x01, 0xC0, 0x07, 0x30, 0x1F, 0x00, 0x7D, 0x10,</div><div class='add'>+0xF1, 0x81, 0xC1, 0x4B, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x10, 0x08, 0x67, 0x00, 0x93, 0x00, 0x4C, 0x02, 0x70, 0x19, 0xC0, 0x27, 0x00,</div><div class='add'>+0x97, 0x01, 0x5C, 0x26, 0xF0, 0x19, 0xC0, 0x23, 0x00, 0x90, 0x80, 0x7C, 0x02,</div><div class='add'>+0x30, 0x09, 0xC0, 0xA4, 0x00, 0x9F, 0x05, 0x4C, 0x12, 0xF0, 0x29, 0xC0, 0x43,</div><div class='add'>+0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x20, 0xE2, 0x22,</div><div class='add'>+0x91, 0x00, 0x14, 0x02, 0x10, 0x09, 0x40, 0x27, 0x00, 0x91, 0x03, 0x44, 0x8A,</div><div class='add'>+0xD0, 0x99, 0x44, 0x27, 0x02, 0x91, 0x02, 0x74, 0x82, 0x12, 0x08, 0x42, 0x24,</div><div class='add'>+0x00, 0x9D, 0x01, 0x44, 0x02, 0xD0, 0x09, 0x40, 0x07, 0x00, 0x08, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0xA0, 0x24, 0x44, 0x91, 0x21, 0x54, 0x03,</div><div class='add'>+0x50, 0x49, 0x41, 0x23, 0x00, 0x95, 0x86, 0x54, 0x0A, 0xD1, 0x09, 0x40, 0x27,</div><div class='add'>+0x00, 0x95, 0x01, 0x34, 0x02, 0x10, 0x09, 0x40, 0x24, 0x00, 0x9D, 0x00, 0x44,</div><div class='add'>+0x02, 0xD0, 0x09, 0x41, 0x63, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x10, 0x20, 0x24, 0x00, 0xC1, 0x00, 0x54, 0x52, 0x54, 0x08, 0x40, 0x23,</div><div class='add'>+0x02, 0x81, 0x80, 0x00, 0x02, 0xD0, 0x08, 0x40, 0x23, 0x40, 0x85, 0x01, 0x34,</div><div class='add'>+0x22, 0x10, 0x89, 0x42, 0x60, 0x01, 0x8D, 0x08, 0x04, 0x12, 0xD0, 0x48, 0x48,</div><div class='add'>+0x43, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xB0, 0x06,</div><div class='add'>+0x00, 0x13, 0x94, 0x5C, 0x10, 0x74, 0x41, 0xC1, 0x87, 0x05, 0x16, 0x94, 0x5C,</div><div class='add'>+0x50, 0xF1, 0x45, 0xC1, 0x17, 0x05, 0x17, 0x0A, 0x7C, 0x08, 0x34, 0x20, 0xC0,</div><div class='add'>+0xC4, 0x02, 0x1F, 0x02, 0x4D, 0x04, 0xF0, 0xB1, 0xC0, 0x77, 0xC0, 0x0A, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x19, 0xB8, 0x2F, 0x05, 0x9F, 0x34, 0xFC,</div><div class='add'>+0x52, 0xB0, 0x09, 0xC2, 0x27, 0x01, 0x9F, 0x00, 0x7C, 0x02, 0xF0, 0x09, 0xC0,</div><div class='add'>+0x2F, 0x00, 0xBB, 0x01, 0xFC, 0x12, 0xF0, 0x4B, 0xD0, 0x67, 0x02, 0xBF, 0x04,</div><div class='add'>+0xFC, 0x22, 0xF0, 0x9B, 0xC2, 0x67, 0x60, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x18, 0xA0, 0x2F, 0x02, 0xBF, 0x86, 0x0C, 0x16, 0xB0, 0x4B, 0xC0,</div><div class='add'>+0x27, 0x05, 0xBB, 0x00, 0xDC, 0x82, 0x30, 0x0B, 0xC0, 0x2D, 0x00, 0xBF, 0xC0,</div><div class='add'>+0x7C, 0x22, 0x30, 0x29, 0xC0, 0x2F, 0x00, 0xB1, 0x02, 0xCC, 0x02, 0xE0, 0x0B,</div><div class='add'>+0xC0, 0x60, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1C, 0x08,</div><div class='add'>+0x47, 0x01, 0x1D, 0x01, 0x44, 0x5C, 0x10, 0x01, 0x40, 0x87, 0x01, 0x1D, 0x00,</div><div class='add'>+0x44, 0x00, 0x14, 0xA1, 0x40, 0x04, 0x00, 0x0D, 0x00, 0x74, 0x00, 0x10, 0x01,</div><div class='add'>+0x40, 0x07, 0x00, 0x15, 0x04, 0x45, 0x00, 0xD2, 0x01, 0x48, 0x70, 0x20, 0x0C,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xA0, 0x23, 0x00, 0x8D, 0x06,</div><div class='add'>+0x04, 0x22, 0x92, 0x28, 0x40, 0x23, 0x04, 0x8D, 0x22, 0x04, 0x8A, 0x10, 0x08,</div><div class='add'>+0x50, 0xA0, 0x00, 0x8D, 0x00, 0x34, 0x12, 0x10, 0x08, 0x60, 0x23, 0x10, 0x81,</div><div class='add'>+0x20, 0x05, 0x83, 0xD0, 0x09, 0x60, 0x42, 0x80, 0x0E, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x18, 0xA8, 0x25, 0x80, 0x9D, 0x00, 0x45, 0x02, 0x10, 0x09,</div><div class='add'>+0x60, 0x27, 0x00, 0x9D, 0x00, 0x47, 0x02, 0x10, 0x09, 0x00, 0x24, 0x01, 0x9D,</div><div class='add'>+0x00, 0x74, 0x02, 0x10, 0xA9, 0x40, 0x27, 0x00, 0x95, 0x14, 0x45, 0x0E, 0xD1,</div><div class='add'>+0x69, 0x40, 0x62, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05,</div><div class='add'>+0x88, 0x67, 0x02, 0x9F, 0x00, 0x4C, 0x36, 0xB0, 0x09, 0xC8, 0x27, 0x00, 0x9B,</div><div class='add'>+0x40, 0x5C, 0x02, 0x12, 0x09, 0xC0, 0x24, 0x01, 0x9E, 0x00, 0x7C, 0x02, 0x34,</div><div class='add'>+0x29, 0xC0, 0x27, 0x00, 0x83, 0x01, 0x4C, 0x0E, 0xF2, 0x29, 0xD0, 0x16, 0x20,</div><div class='add'>+0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x80, 0x65, 0x10, 0x9F,</div><div class='add'>+0x00, 0x3C, 0x02, 0xF0, 0x09, 0xC0, 0x27, 0x00, 0x9F, 0x50, 0x3C, 0x02, 0xF0,</div><div class='add'>+0x09, 0xC0, 0x26, 0x00, 0x9F, 0x00, 0x7C, 0x02, 0xF0, 0x09, 0xC0, 0x27, 0x00,</div><div class='add'>+0x9F, 0x01, 0x7D, 0x02, 0xF0, 0x09, 0xC0, 0x51, 0x00, 0x06, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x14, 0x08, 0x04, 0x00, 0x03, 0x00, 0x4D, 0x00, 0x50,</div><div class='add'>+0x01, 0xC0, 0x05, 0x00, 0x03, 0x08, 0x7C, 0x00, 0xF0, 0x01, 0xC1, 0x87, 0x01,</div><div class='add'>+0x13, 0x00, 0x4C, 0x00, 0xF0, 0x01, 0xC0, 0x01, 0x01, 0x13, 0x02, 0x4C, 0x00,</div><div class='add'>+0x30, 0x21, 0xC1, 0x50, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x14, 0xA0, 0xDC, 0x00, 0x75, 0x19, 0x44, 0x01, 0x50, 0x27, 0xC0, 0x16, 0x50,</div><div class='add'>+0x71, 0x23, 0xF4, 0x21, 0xD0, 0x06, 0x41, 0x1F, 0x20, 0x75, 0x01, 0x44, 0x01,</div><div class='add'>+0xD0, 0x05, 0x48, 0x1F, 0x18, 0x75, 0x0A, 0x44, 0x01, 0x11, 0x27, 0xC0, 0x52,</div><div class='add'>+0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0xA0, 0x72, 0x81,</div><div class='add'>+0xC9, 0x03, 0x04, 0x03, 0x10, 0x9C, 0x41, 0x33, 0x00, 0x81, 0x03, 0x34, 0x2B,</div><div class='add'>+0xD0, 0x2C, 0x40, 0x33, 0x00, 0xC5, 0x11, 0x44, 0x03, 0xD0, 0x0C, 0x40, 0xF1,</div><div class='add'>+0x80, 0xC9, 0x01, 0x04, 0x03, 0x12, 0x8D, 0x40, 0x52, 0x00, 0x0A, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x80, 0x78, 0x04, 0xED, 0x20, 0xC4, 0x03,</div><div class='add'>+0x50, 0x1A, 0x40, 0x7A, 0x00, 0xE1, 0x00, 0xB0, 0x01, 0xD0, 0x0E, 0x40, 0x7B,</div><div class='add'>+0x48, 0xE5, 0x11, 0x84, 0x23, 0xC0, 0x8E, 0x40, 0x13, 0x04, 0xED, 0x10, 0xC4,</div><div class='add'>+0x07, 0x1C, 0x0B, 0x40, 0x16, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x15, 0x10, 0x7C, 0x00, 0xFB, 0x81, 0x8C, 0x47, 0x74, 0x1E, 0xC0, 0x73,</div><div class='add'>+0x01, 0xA3, 0x01, 0xBC, 0x06, 0xF0, 0x1E, 0xC0, 0x7B, 0x00, 0x67, 0x81, 0x84,</div><div class='add'>+0xD7, 0xF0, 0x1E, 0xC1, 0x69, 0x20, 0xBB, 0x01, 0x8D, 0x07, 0x30, 0x1B, 0xC0,</div><div class='add'>+0x56, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xB8, 0x15,</div><div class='add'>+0x00, 0xD7, 0x00, 0x7C, 0x33, 0xF0, 0x00, 0xC0, 0xB5, 0x20, 0x9F, 0x00, 0x7C,</div><div class='add'>+0x00, 0xF1, 0x09, 0xC0, 0x33, 0x00, 0x1B, 0x00, 0x75, 0x03, 0xF2, 0x6D, 0xC0,</div><div class='add'>+0x07, 0x00, 0x97, 0x00, 0x3C, 0x02, 0xF1, 0x01, 0xC0, 0x43, 0x60, 0x06, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA0, 0x5F, 0x00, 0x7F, 0x01, 0xFC,</div><div class='add'>+0x07, 0x70, 0x1F, 0xC0, 0xFF, 0x44, 0xB3, 0x09, 0x9C, 0x27, 0x70, 0x9F, 0xC0,</div><div class='add'>+0x7F, 0x00, 0xA3, 0x41, 0xEC, 0x07, 0x31, 0x1D, 0xC0, 0x4F, 0x00, 0xF3, 0x01,</div><div class='add'>+0xCC, 0x07, 0x30, 0x9B, 0xC0, 0x00, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x15, 0x88, 0xB9, 0x00, 0x6D, 0x02, 0xB4, 0x03, 0xB0, 0x0A, 0x60,</div><div class='add'>+0x3B, 0x00, 0xC1, 0x08, 0xB4, 0x82, 0x10, 0x04, 0x48, 0x3B, 0x00, 0x21, 0x00,</div><div class='add'>+0x04, 0x37, 0x10, 0x1E, 0xC0, 0x0F, 0x00, 0xFB, 0x18, 0xC4, 0x23, 0xB2, 0xCA,</div><div class='add'>+0x50, 0x54, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x19, 0x00, 0x6D, 0x08, 0xF4, 0x03, 0x50, 0x0A, 0x40, 0x39, 0x00, 0xA9, 0x80,</div><div class='add'>+0x94, 0x02, 0x50, 0x0E, 0x60, 0x1B, 0x02, 0x39, 0x00, 0xC4, 0x13, 0x10, 0x0E,</div><div class='add'>+0x41, 0x0B, 0x00, 0xB1, 0x00, 0xC4, 0x43, 0x50, 0x0A, 0x40, 0x01, 0x00, 0x04,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x28, 0x43, 0x20, 0x0D, 0x80,</div><div class='add'>+0x34, 0x03, 0x90, 0x00, 0x40, 0x37, 0x08, 0x49, 0x40, 0x34, 0x02, 0x10, 0x00,</div><div class='add'>+0x44, 0x53, 0x42, 0x09, 0x02, 0x04, 0x03, 0x94, 0x1D, 0x40, 0x01, 0x00, 0x89,</div><div class='add'>+0x10, 0x04, 0x06, 0xD8, 0x60, 0x40, 0x11, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x15, 0xA8, 0x64, 0x01, 0x9F, 0x00, 0xFC, 0x03, 0x74, 0x01,</div><div class='add'>+0xC0, 0x3F, 0x00, 0x9B, 0x00, 0x5C, 0x02, 0x50, 0x01, 0xC0, 0x37, 0x08, 0x13,</div><div class='add'>+0x02, 0xCC, 0x03, 0x30, 0xBF, 0x40, 0x37, 0x00, 0x53, 0x00, 0x4D, 0xAB, 0x50,</div><div class='add'>+0x09, 0xC1, 0x55, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,</div><div class='add'>+0x00, 0xA7, 0x00, 0x9F, 0x00, 0x7C, 0x43, 0xF0, 0x21, 0xC0, 0x37, 0x00, 0xD7,</div><div class='add'>+0x20, 0x7C, 0x08, 0xF0, 0x01, 0xC0, 0x33, 0x00, 0x17, 0x82, 0x5C, 0x43, 0x70,</div><div class='add'>+0x0D, 0xC0, 0x87, 0x00, 0x5F, 0xC2, 0x7C, 0x03, 0xB0, 0x29, 0x88, 0x06, 0x00,</div><div class='add'>+0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x08, 0x2F, 0x20, 0x2F,</div><div class='add'>+0x80, 0xD4, 0x03, 0x3C, 0x02, 0xC8, 0x34, 0x00, 0xB3, 0x00, 0xDC, 0x00, 0xF0,</div><div class='add'>+0x2B, 0xE0, 0x24, 0x20, 0x33, 0x10, 0xF4, 0x03, 0xB0, 0x0F, 0xC0, 0x0C, 0x00,</div><div class='add'>+0x7F, 0x00, 0xCC, 0x27, 0xF0, 0x09, 0xC0, 0x03, 0x22, 0x0C, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x81, 0x20, 0xE6, 0x00, 0x9D, 0x43, 0x06, 0x03, 0x10,</div><div class='add'>+0x11, 0x40, 0x34, 0x00, 0x81, 0x00, 0x44, 0x14, 0xD0, 0x18, 0xE0, 0x26, 0x00,</div><div class='add'>+0x11, 0x04, 0x74, 0x03, 0xD0, 0x0D, 0xC0, 0x44, 0x01, 0x47, 0x85, 0x7C, 0x02,</div><div class='add'>+0xD0, 0x51, 0x40, 0x07, 0x02, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x01, 0xA0, 0x44, 0x00, 0x9D, 0x21, 0x40, 0x03, 0x92, 0x39, 0x44, 0x34, 0x00,</div><div class='add'>+0x91, 0x00, 0x56, 0x06, 0xD2, 0x25, 0x48, 0x74, 0x00, 0x31, 0x84, 0x74, 0x83,</div><div class='add'>+0xD8, 0x0D, 0x40, 0x4C, 0x00, 0x9D, 0x01, 0x45, 0x02, 0xD0, 0x13, 0x40, 0x07,</div><div class='add'>+0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x20, 0x20, 0x00,</div><div class='add'>+0x8D, 0x20, 0x54, 0x03, 0x12, 0x08, 0x40, 0x30, 0x20, 0xC1, 0x40, 0x16, 0x02,</div><div class='add'>+0xD0, 0x24, 0x44, 0x32, 0x10, 0x01, 0x00, 0x34, 0x33, 0xD8, 0x0C, 0x45, 0x00,</div><div class='add'>+0x10, 0x85, 0x00, 0x34, 0x22, 0xD0, 0x00, 0x40, 0x43, 0x80, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xB0, 0x06, 0x08, 0x1F, 0x00, 0xD4, 0x03,</div><div class='add'>+0x32, 0x09, 0xC2, 0x3C, 0x00, 0x93, 0x2A, 0x54, 0x00, 0xD9, 0x0D, 0x40, 0x04,</div><div class='add'>+0x00, 0x13, 0x00, 0xFC, 0x9B, 0xB1, 0x0F, 0xC0, 0x04, 0x00, 0x9F, 0x00, 0x4C,</div><div class='add'>+0x02, 0xF1, 0x01, 0xC0, 0x03, 0xC0, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x05, 0xB2, 0x2F, 0x00, 0xBF, 0x00, 0xAD, 0x03, 0xF1, 0x03, 0xC0, 0x3F,</div><div class='add'>+0x10, 0x7F, 0x04, 0xEC, 0x00, 0xF0, 0x03, 0xC6, 0x0F, 0x40, 0x3F, 0x00, 0x3C,</div><div class='add'>+0x0B, 0xF0, 0x0F, 0xC0, 0x0D, 0x10, 0xB7, 0x00, 0xFC, 0x12, 0xF8, 0x03, 0xC0,</div><div class='add'>+0x17, 0x60, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x80, 0x2F,</div><div class='add'>+0x01, 0xBF, 0x08, 0xFC, 0x43, 0x30, 0x8F, 0xC0, 0x3F, 0x05, 0x3F, 0x03, 0xDC,</div><div class='add'>+0x23, 0xF0, 0x3B, 0xD0, 0x3C, 0x00, 0xFB, 0x00, 0xFC, 0x13, 0x30, 0x13, 0xC0,</div><div class='add'>+0x7C, 0x10, 0x3D, 0x61, 0xCC, 0x18, 0x30, 0x43, 0xC1, 0x0C, 0x00, 0x0E, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x10, 0x87, 0x1D, 0x9D, 0x02, 0xDC,</div><div class='add'>+0x0F, 0x00, 0x6F, 0x40, 0xBF, 0x01, 0x1D, 0x04, 0xC4, 0x0B, 0x70, 0x0D, 0x40,</div><div class='add'>+0xFC, 0x00, 0xF1, 0x03, 0xF4, 0xA7, 0x10, 0x11, 0x40, 0x04, 0x08, 0x1D, 0x00,</div><div class='add'>+0x04, 0xAB, 0x10, 0x29, 0x51, 0x0C, 0x60, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x13, 0xA0, 0x21, 0x82, 0x0D, 0x08, 0x14, 0x03, 0x10, 0x6C, 0x48,</div><div class='add'>+0x33, 0x14, 0x9D, 0x00, 0x14, 0x33, 0xD2, 0x48, 0x60, 0x30, 0x0A, 0xC9, 0x08,</div><div class='add'>+0x34, 0x03, 0x10, 0x01, 0x40, 0x30, 0x20, 0x1D, 0x00, 0x04, 0x10, 0x10, 0x40,</div><div class='add'>+0x42, 0x4D, 0x80, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xA0,</div><div class='add'>+0x47, 0x00, 0x9D, 0x03, 0x54, 0x83, 0x14, 0x0D, 0x40, 0x37, 0x00, 0x9D, 0x01,</div><div class='add'>+0x44, 0x03, 0x50, 0x0C, 0x60, 0x34, 0x10, 0xD0, 0x00, 0x74, 0x03, 0x14, 0x15,</div><div class='add'>+0x18, 0x24, 0x00, 0x1D, 0x01, 0x44, 0x81, 0x16, 0x01, 0x41, 0x0D, 0x00, 0x06,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x22, 0xA8, 0xC7, 0x00, 0x9F, 0x01,</div><div class='add'>+0x5C, 0x03, 0x30, 0x0D, 0xC0, 0x37, 0x00, 0x0F, 0x03, 0x5C, 0x83, 0xF0, 0x8D,</div><div class='add'>+0xC0, 0x30, 0x08, 0xDB, 0x60, 0x3C, 0x03, 0x30, 0x20, 0xC4, 0x34, 0x00, 0x0F,</div><div class='add'>+0x53, 0x4C, 0x24, 0x30, 0x11, 0xC4, 0x29, 0x20, 0x0E, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x07, 0x80, 0x0D, 0x00, 0xBF, 0x00, 0xDC, 0x03, 0xF1, 0x0D,</div><div class='add'>+0xC0, 0x3F, 0x00, 0x3F, 0x00, 0xFC, 0x03, 0xD0, 0x1F, 0xC0, 0x3F, 0x00, 0xFF,</div><div class='add'>+0x50, 0xF0, 0x83, 0xF0, 0x03, 0xC8, 0x8F, 0x00, 0x3F, 0x00, 0xBC, 0xC7, 0xF0,</div><div class='add'>+0x3D, 0xC0, 0x1E, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A,</div><div class='add'>+0x08, 0xA5, 0x00, 0x1F, 0x00, 0x0C, 0x03, 0xF0, 0x0D, 0xC4, 0x35, 0x00, 0x1F,</div><div class='add'>+0x02, 0x7C, 0x03, 0xF0, 0x0D, 0xC0, 0x37, 0x00, 0xD7, 0x00, 0x7C, 0x03, 0xF0,</div><div class='add'>+0x05, 0xC0, 0x34, 0x10, 0x1F, 0x00, 0x4C, 0x22, 0x34, 0x2C, 0xC0, 0x28, 0x20,</div><div class='add'>+0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0xA0, 0x64, 0x04, 0x9D,</div><div class='add'>+0x00, 0xC4, 0x3B, 0xD0, 0x0F, 0x40, 0x3C, 0x00, 0x9D, 0x00, 0xFC, 0x03, 0xD0,</div><div class='add'>+0x0D, 0x48, 0x3F, 0x00, 0xF1, 0x03, 0xF4, 0x2B, 0xD0, 0xA5, 0xC0, 0x26, 0x08,</div><div class='add'>+0x1D, 0x00, 0x44, 0x0F, 0x10, 0x3D, 0x40, 0x4C, 0x00, 0x02, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x03, 0x20, 0xE2, 0x34, 0x0D, 0x40, 0x04, 0x07, 0x90,</div><div class='add'>+0x0C, 0x44, 0x30, 0x08, 0x8C, 0x00, 0x34, 0x03, 0x90, 0x0C, 0x48, 0x32, 0x00,</div><div class='add'>+0xC0, 0x01, 0x34, 0x27, 0xD0, 0x20, 0x40, 0x30, 0x04, 0x0D, 0x00, 0x04, 0x00,</div><div class='add'>+0x10, 0x04, 0x41, 0x0C, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x0D, 0x02, 0x7A, 0x02, 0x6D, 0x01, 0x84, 0x07, 0xD0, 0x9E, 0x42, 0x78, 0x00,</div><div class='add'>+0xAD, 0x01, 0x94, 0x07, 0xD0, 0x1E, 0x40, 0x73, 0x02, 0xE5, 0x01, 0xB4, 0x07,</div><div class='add'>+0xD0, 0x17, 0x40, 0x5B, 0x04, 0x3D, 0x01, 0x84, 0x06, 0x12, 0x92, 0x41, 0x34,</div><div class='add'>+0x20, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x32, 0x00,</div><div class='add'>+0x5F, 0x08, 0x0D, 0x03, 0xF0, 0x0C, 0xC0, 0x31, 0x02, 0x8F, 0x08, 0x34, 0x03,</div><div class='add'>+0xF0, 0x4C, 0xC0, 0x33, 0x0A, 0xC7, 0x10, 0x3C, 0x03, 0xF0, 0xA1, 0xE0, 0x30,</div><div class='add'>+0x00, 0x5F, 0x00, 0x0C, 0x80, 0x30, 0x50, 0xD0, 0x48, 0x40, 0x08, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xBA, 0x3D, 0x20, 0xFF, 0x00, 0xFC, 0x03,</div><div class='add'>+0xF0, 0x0F, 0xC3, 0x3F, 0x00, 0xBF, 0x28, 0xFC, 0x23, 0xF0, 0x0F, 0xC4, 0x3F,</div><div class='add'>+0x02, 0xDB, 0x10, 0xFC, 0x23, 0xF0, 0x07, 0xE0, 0x3E, 0x80, 0x7F, 0x00, 0xFC,</div><div class='add'>+0x00, 0xF8, 0x81, 0xC2, 0x0B, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x10, 0xA0, 0x57, 0x00, 0xD3, 0x00, 0x7C, 0x6F, 0xB0, 0x5D, 0xE0, 0xB7,</div><div class='add'>+0x14, 0x1F, 0x00, 0x7C, 0x13, 0xF0, 0x0D, 0xC0, 0xB7, 0x03, 0xD3, 0x15, 0x4C,</div><div class='add'>+0x53, 0xF0, 0x05, 0xE0, 0x77, 0x00, 0x53, 0x00, 0x7C, 0x01, 0x30, 0x0D, 0xC0,</div><div class='add'>+0x40, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0x98, 0x1D,</div><div class='add'>+0x00, 0xEB, 0x00, 0xB4, 0x03, 0x18, 0xCF, 0x60, 0xB8, 0x01, 0xED, 0x00, 0xB4,</div><div class='add'>+0x4B, 0xD0, 0x0E, 0x40, 0x3B, 0x03, 0xC1, 0x04, 0x84, 0x1B, 0xD0, 0x06, 0x40,</div><div class='add'>+0x1B, 0x20, 0x61, 0x20, 0xF4, 0x03, 0x14, 0x0F, 0x40, 0x4C, 0x60, 0x06, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x02, 0x79, 0x14, 0x61, 0x21, 0x36,</div><div class='add'>+0x07, 0x18, 0x5E, 0x4C, 0x79, 0x00, 0x6D, 0x01, 0xB4, 0x07, 0xD0, 0x1E, 0x64,</div><div class='add'>+0x71, 0x01, 0xE1, 0x41, 0x96, 0x17, 0xD0, 0x16, 0x40, 0x7F, 0x00, 0x65, 0x01,</div><div class='add'>+0xB6, 0x07, 0x94, 0x1E, 0x42, 0x10, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x16, 0x20, 0x33, 0x00, 0xC9, 0x0B, 0x34, 0x83, 0x10, 0x0C, 0x40,</div><div class='add'>+0x30, 0x00, 0xCD, 0x07, 0x74, 0x03, 0xD0, 0x9C, 0x60, 0x33, 0x40, 0xC1, 0x00,</div><div class='add'>+0x15, 0x03, 0xD1, 0x1C, 0x42, 0x33, 0x00, 0xC4, 0x06, 0x34, 0x17, 0x90, 0x9C,</div><div class='add'>+0x40, 0x58, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x17, 0xA8,</div><div class='add'>+0x1F, 0x00, 0x73, 0x02, 0x7C, 0x01, 0xB0, 0x05, 0xC2, 0x17, 0x00, 0x7F, 0x10,</div><div class='add'>+0x7C, 0x01, 0xF0, 0x15, 0xC0, 0x13, 0x00, 0x51, 0x00, 0x5C, 0x01, 0xF0, 0x46,</div><div class='add'>+0xC0, 0x1F, 0x00, 0x77, 0x12, 0xFA, 0x1D, 0xB0, 0xB7, 0xC4, 0x5C, 0x20, 0x0E,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x80, 0x05, 0x00, 0x1F, 0x04,</div><div class='add'>+0x7C, 0x00, 0xF4, 0x01, 0xC8, 0x07, 0x00, 0x1C, 0x00, 0x7C, 0x00, 0xF0, 0x01,</div><div class='add'>+0xC0, 0x07, 0x00, 0x1F, 0x00, 0x64, 0x00, 0xF0, 0x01, 0xC4, 0x07, 0x40, 0x1B,</div><div class='add'>+0x00, 0x7C, 0x08, 0x70, 0x01, 0xC0, 0x4B, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x10, 0x08, 0xE5, 0x04, 0x9F, 0x00, 0x7C, 0x06, 0xF0, 0x09,</div><div class='add'>+0xC0, 0x27, 0x00, 0x9F, 0xA0, 0x4C, 0x02, 0x32, 0x09, 0xC8, 0x27, 0x09, 0x93,</div><div class='add'>+0x00, 0x3C, 0x92, 0x30, 0x19, 0xC1, 0x26, 0x01, 0x9F, 0x00, 0x3C, 0x06, 0x30,</div><div class='add'>+0x89, 0xC0, 0x41, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,</div><div class='add'>+0x20, 0x26, 0x10, 0x9D, 0x80, 0x74, 0x32, 0xD0, 0x09, 0x40, 0x27, 0x00, 0x9D,</div><div class='add'>+0x00, 0x44, 0x02, 0x10, 0x09, 0x40, 0x27, 0x09, 0x91, 0x23, 0x74, 0x4E, 0x14,</div><div class='add'>+0x99, 0x42, 0xA4, 0x04, 0x9D, 0x00, 0x74, 0x0A, 0x10, 0x29, 0x44, 0x04, 0x00,</div><div class='add'>+0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xA0, 0x34, 0x00, 0x9D,</div><div class='add'>+0x00, 0x54, 0x02, 0xC0, 0x09, 0x40, 0x27, 0x00, 0xCD, 0x00, 0x44, 0x02, 0x50,</div><div class='add'>+0x09, 0x42, 0x25, 0x40, 0x91, 0x18, 0x74, 0x02, 0x90, 0x29, 0x40, 0x26, 0x00,</div><div class='add'>+0x9D, 0x00, 0x74, 0x22, 0x08, 0x08, 0x40, 0x71, 0x00, 0x02, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x14, 0x28, 0x30, 0x05, 0x8D, 0x54, 0x34, 0x02, 0xD0,</div><div class='add'>+0x88, 0x40, 0x23, 0x02, 0x8D, 0x88, 0x05, 0x22, 0x10, 0x88, 0x40, 0x23, 0x00,</div><div class='add'>+0x81, 0x00, 0x30, 0x02, 0x10, 0x08, 0x42, 0x20, 0x00, 0x8D, 0x00, 0x36, 0x23,</div><div class='add'>+0x10, 0x08, 0x40, 0x50, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x1D, 0xB0, 0x06, 0x21, 0x1F, 0x24, 0x5C, 0xD0, 0xF0, 0x61, 0xC5, 0x87, 0x05,</div><div class='add'>+0x1F, 0x02, 0x4C, 0x58, 0x70, 0x21, 0xC0, 0x05, 0x05, 0x13, 0x34, 0x7C, 0x50,</div><div class='add'>+0x30, 0x01, 0xC0, 0x86, 0x02, 0x1F, 0x0A, 0x7C, 0x58, 0x34, 0x45, 0xC1, 0x75,</div><div class='add'>+0xC0, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x19, 0xA0, 0x2F, 0x05,</div><div class='add'>+0xBF, 0x34, 0x7C, 0x02, 0xF0, 0x49, 0xC0, 0x27, 0x01, 0xBF, 0x04, 0x7C, 0x12,</div><div class='add'>+0xF4, 0x4B, 0xC0, 0x27, 0x00, 0x9F, 0x00, 0x7C, 0x02, 0xF0, 0x0B, 0xC0, 0x6B,</div><div class='add'>+0x00, 0xBF, 0x21, 0xFC, 0x12, 0xF0, 0x4B, 0xC1, 0x67, 0x20, 0x0E, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0xA0, 0x2F, 0x00, 0x93, 0x02, 0xDC, 0x02,</div><div class='add'>+0xF0, 0x89, 0xC0, 0xA6, 0x15, 0x9B, 0x00, 0x5C, 0x42, 0x30, 0x09, 0xC0, 0x2E,</div><div class='add'>+0x04, 0xBF, 0x00, 0xDC, 0x02, 0xB2, 0x0B, 0xC0, 0x2F, 0x08, 0x9F, 0x00, 0xCC,</div><div class='add'>+0xC2, 0x32, 0x0B, 0xD0, 0x60, 0x20, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x1C, 0x18, 0x07, 0x01, 0x1B, 0x60, 0x74, 0xA8, 0xD0, 0xA0, 0x42, 0x84,</div><div class='add'>+0x00, 0x11, 0x20, 0x74, 0x08, 0x10, 0x41, 0x40, 0x84, 0x00, 0x17, 0x4A, 0x44,</div><div class='add'>+0x28, 0x10, 0x01, 0x44, 0x07, 0x20, 0x1D, 0x00, 0x44, 0x08, 0x14, 0x01, 0x40,</div><div class='add'>+0x70, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0xA0, 0xA1,</div><div class='add'>+0x84, 0x81, 0x02, 0x34, 0x02, 0xD0, 0x48, 0x40, 0x22, 0x01, 0x85, 0x14, 0x34,</div><div class='add'>+0x52, 0x12, 0x09, 0x61, 0x22, 0x00, 0x8D, 0x00, 0x14, 0x02, 0x10, 0x08, 0x40,</div><div class='add'>+0x33, 0x80, 0x8D, 0x00, 0x04, 0x02, 0x10, 0x08, 0x62, 0x4A, 0x00, 0x04, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x20, 0x25, 0x00, 0x99, 0x80, 0x74,</div><div class='add'>+0x02, 0xC0, 0x08, 0x40, 0x26, 0x20, 0x95, 0x02, 0x34, 0x02, 0x10, 0x09, 0x4A,</div><div class='add'>+0x24, 0x00, 0x95, 0x00, 0x54, 0x02, 0x10, 0x0D, 0x40, 0xA7, 0x00, 0x8D, 0x14,</div><div class='add'>+0x45, 0x02, 0x10, 0x0D, 0x40, 0x62, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x05, 0xA8, 0x27, 0x01, 0x93, 0x87, 0x7C, 0x02, 0xF0, 0x09, 0xC8,</div><div class='add'>+0x26, 0x08, 0x97, 0x00, 0x5E, 0x02, 0x10, 0x08, 0xC0, 0x26, 0x20, 0x9F, 0x20,</div><div class='add'>+0x5C, 0x02, 0xB0, 0x59, 0xC0, 0x27, 0x20, 0x9E, 0x23, 0x4C, 0x42, 0x30, 0x49,</div><div class='add'>+0xC0, 0x16, 0x20, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x80,</div><div class='add'>+0x61, 0x02, 0x9F, 0x05, 0x7C, 0x02, 0xD0, 0x09, 0xC0, 0x21, 0x40, 0x9B, 0x84,</div><div class='add'>+0x7C, 0x02, 0xF4, 0x09, 0xC0, 0x27, 0x00, 0x9F, 0x00, 0x6C, 0x42, 0xD4, 0x39,</div><div class='add'>+0xC0, 0x27, 0x00, 0x9F, 0x21, 0x7C, 0x02, 0xF0, 0x48, 0xC0, 0x49, 0x00, 0x06,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x08, 0x84, 0x04, 0x1F, 0x02,</div><div class='add'>+0x6C, 0x00, 0xE0, 0x01, 0xC0, 0x04, 0x00, 0x13, 0x80, 0x7C, 0x00, 0x30, 0x01,</div><div class='add'>+0xC0, 0x05, 0x04, 0x1F, 0x10, 0x4C, 0x00, 0x70, 0x11, 0xC2, 0x07, 0x01, 0x1F,</div><div class='add'>+0xA2, 0x3C, 0x20, 0x10, 0x41, 0xC2, 0x43, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x14, 0xA0, 0xDC, 0x00, 0x5D, 0x20, 0xD4, 0x65, 0xC0, 0x05,</div><div class='add'>+0x40, 0x14, 0x00, 0x50, 0x00, 0x74, 0x81, 0x10, 0x05, 0xC0, 0x1C, 0x00, 0x6D,</div><div class='add'>+0x20, 0x80, 0x0D, 0x70, 0x07, 0x80, 0x1D, 0x10, 0x5D, 0x80, 0xF4, 0x01, 0x10,</div><div class='add'>+0x37, 0x42, 0x53, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14,</div><div class='add'>+0xA0, 0xF2, 0x02, 0xCD, 0x00, 0x04, 0x03, 0xD0, 0x0C, 0x50, 0x30, 0x80, 0xC1,</div><div class='add'>+0x00, 0x34, 0x03, 0x10, 0x0C, 0x40, 0x31, 0x00, 0xCD, 0x0A, 0x00, 0x0B, 0xD8,</div><div class='add'>+0x8C, 0x48, 0xB2, 0x00, 0xCC, 0x00, 0x36, 0x93, 0x90, 0x00, 0x44, 0x53, 0x00,</div><div class='add'>+0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x88, 0x38, 0x00, 0xCD,</div><div class='add'>+0x01, 0x94, 0x00, 0xD0, 0x0E, 0x40, 0x38, 0xC2, 0xE1, 0x04, 0xB4, 0x23, 0x11,</div><div class='add'>+0x0E, 0x40, 0x38, 0x80, 0x8D, 0x00, 0x85, 0x0B, 0xD8, 0x06, 0x40, 0x09, 0x20,</div><div class='add'>+0xED, 0x04, 0x34, 0x00, 0x94, 0x0A, 0x41, 0x07, 0x00, 0x02, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x11, 0x10, 0x78, 0x00, 0xEF, 0x0D, 0x84, 0x04, 0xF0,</div><div class='add'>+0x1E, 0xC1, 0x70, 0x05, 0xE1, 0x0D, 0x34, 0x57, 0x34, 0x3F, 0xC0, 0x79, 0x00,</div><div class='add'>+0xAF, 0x01, 0x8C, 0x07, 0x70, 0x16, 0xC0, 0x6B, 0x00, 0xEF, 0x0B, 0xBC, 0x07,</div><div class='add'>+0xB0, 0x16, 0xC0, 0x47, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x10, 0xA2, 0x15, 0x10, 0xDF, 0x84, 0x5C, 0x00, 0xF0, 0x4D, 0xC0, 0x37, 0x00,</div><div class='add'>+0xDF, 0x04, 0x7C, 0x1B, 0xF0, 0x6D, 0xC9, 0x37, 0x20, 0x1B, 0x00, 0x7C, 0x00,</div><div class='add'>+0x78, 0x05, 0xC0, 0x07, 0x10, 0xDF, 0x00, 0x7C, 0x00, 0x74, 0x0D, 0xC0, 0x43,</div><div class='add'>+0x60, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x7D, 0x00,</div><div class='add'>+0xFF, 0x11, 0x8C, 0x24, 0x70, 0x1F, 0xC5, 0x7C, 0x00, 0xF3, 0x11, 0xFC, 0x07,</div><div class='add'>+0x30, 0x1F, 0xC0, 0x7F, 0x02, 0xB7, 0x05, 0xFC, 0x07, 0xF8, 0x96, 0xC0, 0x6C,</div><div class='add'>+0x02, 0xF3, 0x89, 0xCC, 0x07, 0x24, 0x1B, 0xC4, 0x00, 0x00, 0x04, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x08, 0x39, 0x20, 0xED, 0x04, 0x84, 0x00,</div><div class='add'>+0x18, 0x0E, 0x50, 0x38, 0x22, 0xE1, 0x00, 0xB4, 0x23, 0x10, 0x0E, 0x40, 0x3B,</div><div class='add'>+0x00, 0xA7, 0x00, 0xB4, 0x23, 0xD0, 0x06, 0x48, 0x0D, 0x02, 0xFB, 0x40, 0x85,</div><div class='add'>+0x00, 0xF0, 0x88, 0xE1, 0x54, 0x60, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x39, 0x04, 0xED, 0x80, 0xA4, 0x00, 0x58, 0x0C, 0x40, 0x39,</div><div class='add'>+0x00, 0xE9, 0x00, 0xB4, 0x03, 0x10, 0x0E, 0x40, 0x1B, 0x00, 0xA5, 0x04, 0xB4,</div><div class='add'>+0x03, 0xD0, 0x03, 0x46, 0x08, 0x82, 0xE1, 0x00, 0x84, 0x03, 0x50, 0x0C, 0x40,</div><div class='add'>+0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x28, 0x61,</div><div class='add'>+0x00, 0xCD, 0x41, 0x04, 0x00, 0x10, 0x0C, 0x40, 0x34, 0x00, 0xD1, 0x42, 0x34,</div><div class='add'>+0x03, 0x12, 0x8C, 0x40, 0x13, 0x00, 0x05, 0x00, 0x34, 0x00, 0xD0, 0xB0, 0x44,</div><div class='add'>+0x01, 0x00, 0xC9, 0x02, 0x04, 0x41, 0xD0, 0x34, 0x50, 0x10, 0x00, 0x04, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0xA8, 0x45, 0x20, 0xFF, 0x9A, 0x6C,</div><div class='add'>+0x00, 0x41, 0x0F, 0xC0, 0x3D, 0x00, 0xFB, 0x00, 0xFC, 0x03, 0x30, 0x1F, 0xC0,</div><div class='add'>+0x37, 0x00, 0x97, 0x00, 0x7C, 0x03, 0xF0, 0x01, 0x44, 0x00, 0x06, 0xF3, 0x42,</div><div class='add'>+0x4C, 0x4B, 0x30, 0x25, 0xC0, 0x54, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x01, 0x00, 0xA7, 0x01, 0xDF, 0x00, 0x7C, 0x08, 0xF0, 0x0D, 0xC0,</div><div class='add'>+0x37, 0x20, 0xDF, 0x08, 0x7C, 0x03, 0xF0, 0x0D, 0xC4, 0x37, 0x00, 0x9F, 0x80,</div><div class='add'>+0x3C, 0x8B, 0xF0, 0x01, 0xC8, 0x87, 0x00, 0xDF, 0x00, 0x3C, 0x00, 0x96, 0x65,</div><div class='add'>+0xC0, 0x05, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x84, 0x08,</div><div class='add'>+0x0F, 0x00, 0xFF, 0x00, 0xFC, 0x00, 0xF0, 0x0F, 0xC0, 0x3C, 0x00, 0xF3, 0x10,</div><div class='add'>+0x5C, 0x03, 0xE0, 0x0F, 0xC0, 0x2F, 0x02, 0xBF, 0x00, 0xFC, 0x83, 0x30, 0x03,</div><div class='add'>+0xC1, 0x0D, 0x20, 0xF3, 0x10, 0x7C, 0x07, 0x30, 0x97, 0xC2, 0x13, 0x22, 0x0C,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x85, 0x20, 0xC6, 0x04, 0xDD, 0x00,</div><div class='add'>+0x74, 0x0C, 0xD0, 0x0D, 0x50, 0x34, 0x20, 0xD1, 0x00, 0x44, 0x03, 0xD0, 0x0D,</div><div class='add'>+0x40, 0x27, 0x00, 0x19, 0x01, 0x74, 0x18, 0x00, 0x31, 0xC0, 0x47, 0x01, 0xD1,</div><div class='add'>+0x00, 0x74, 0x20, 0x10, 0x29, 0x40, 0x17, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x01, 0xA0, 0x44, 0x00, 0xDD, 0x00, 0x74, 0x44, 0xD0, 0x0C,</div><div class='add'>+0x40, 0x34, 0x00, 0xD1, 0x00, 0x44, 0x03, 0xD0, 0x0D, 0x40, 0x37, 0x80, 0x1D,</div><div class='add'>+0x03, 0x74, 0x10, 0x10, 0x11, 0x40, 0x4F, 0x00, 0xF1, 0x00, 0x74, 0x43, 0x19,</div><div class='add'>+0x09, 0x40, 0x07, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10,</div><div class='add'>+0x28, 0x20, 0x20, 0xCD, 0x80, 0x24, 0x00, 0xD2, 0x0C, 0x40, 0x30, 0x20, 0xC1,</div><div class='add'>+0x00, 0x04, 0x03, 0xD0, 0x0C, 0x40, 0x33, 0x80, 0x09, 0x00, 0x34, 0x00, 0x10,</div><div class='add'>+0x00, 0x44, 0x07, 0x40, 0xC1, 0x00, 0x34, 0x02, 0x13, 0x84, 0x40, 0x43, 0xA0,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xB0, 0x06, 0x00, 0xEF,</div><div class='add'>+0x80, 0x7C, 0x80, 0xF0, 0x0F, 0xC0, 0x38, 0x00, 0xF3, 0x00, 0xC5, 0x03, 0xF0,</div><div class='add'>+0x0F, 0xC0, 0x07, 0x00, 0x1F, 0x00, 0x7C, 0x00, 0x30, 0x01, 0xC0, 0x05, 0x00,</div><div class='add'>+0xF3, 0x00, 0x7C, 0x00, 0x30, 0x09, 0xC8, 0x03, 0xC0, 0x0A, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x85, 0xA8, 0x2F, 0x00, 0xFF, 0x00, 0xFC, 0x00, 0xF0,</div><div class='add'>+0x0F, 0xC0, 0x3F, 0x00, 0xFF, 0x00, 0xEC, 0x83, 0xF0, 0x0F, 0xC0, 0x0F, 0x00,</div><div class='add'>+0x3B, 0x40, 0xFC, 0x00, 0xF0, 0x03, 0xE8, 0x0D, 0x00, 0xFF, 0x00, 0xFC, 0x00,</div><div class='add'>+0xF0, 0x43, 0xC0, 0x17, 0x21, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x03, 0xA8, 0x3F, 0x04, 0xB3, 0x08, 0xCC, 0x93, 0xF1, 0xCF, 0xC0, 0x3C, 0x42,</div><div class='add'>+0xF3, 0x00, 0xFC, 0x03, 0x30, 0x13, 0xC0, 0x3D, 0x05, 0xF7, 0x2C, 0xFC, 0x04,</div><div class='add'>+0xB0, 0x0F, 0xC0, 0x3E, 0x06, 0x3F, 0x04, 0xEC, 0x03, 0xF0, 0x83, 0xC0, 0x0F,</div><div class='add'>+0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x18, 0xBF, 0x00,</div><div class='add'>+0x1B, 0x04, 0xC4, 0xAF, 0xD0, 0x6F, 0x40, 0xBC, 0x03, 0xF1, 0x84, 0xF4, 0x0F,</div><div class='add'>+0x10, 0x09, 0xC4, 0x7D, 0x08, 0xD5, 0x08, 0x74, 0x00, 0x50, 0x2F, 0x42, 0x3C,</div><div class='add'>+0x10, 0x1D, 0x12, 0xC4, 0x87, 0xD0, 0x40, 0x40, 0x07, 0x20, 0x0C, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0xA0, 0x33, 0x04, 0x81, 0x22, 0x04, 0x03,</div><div class='add'>+0xD0, 0x2C, 0x44, 0x31, 0x01, 0xC1, 0x18, 0x24, 0x0B, 0x50, 0x04, 0x40, 0x31,</div><div class='add'>+0x00, 0xC5, 0x00, 0x74, 0x02, 0x10, 0x2C, 0x44, 0x33, 0x01, 0x8D, 0x06, 0x24,</div><div class='add'>+0x03, 0xD0, 0x00, 0x40, 0x47, 0x80, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x03, 0xA0, 0x34, 0x30, 0x09, 0x41, 0x46, 0x03, 0xD0, 0x0D, 0x40, 0x35,</div><div class='add'>+0x00, 0xD1, 0x00, 0x74, 0x03, 0x14, 0x0D, 0x40, 0x35, 0x00, 0xD4, 0x00, 0x74,</div><div class='add'>+0x22, 0x50, 0x0D, 0x40, 0x35, 0x00, 0xDD, 0x00, 0xC4, 0x03, 0xD0, 0x33, 0x40,</div><div class='add'>+0x0F, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA8, 0x37,</div><div class='add'>+0x00, 0x93, 0x03, 0x4C, 0x83, 0xF0, 0x0D, 0xC0, 0x35, 0x20, 0xD3, 0x80, 0x7C,</div><div class='add'>+0x03, 0x72, 0x91, 0xC8, 0x35, 0x00, 0xD7, 0x80, 0x7C, 0x45, 0xB0, 0x0D, 0xC0,</div><div class='add'>+0x37, 0x18, 0x1F, 0xA2, 0x6C, 0x03, 0xF0, 0x11, 0xC0, 0x03, 0x20, 0x0E, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x80, 0x3D, 0x00, 0xBF, 0x40, 0xFD,</div><div class='add'>+0x03, 0xF0, 0x0D, 0xC2, 0x36, 0x00, 0xFF, 0x00, 0xBC, 0x03, 0xF0, 0x03, 0xC1,</div><div class='add'>+0x3F, 0x00, 0xD9, 0x00, 0xFC, 0x41, 0xF0, 0x0D, 0xC0, 0x3E, 0x08, 0xFC, 0x09,</div><div class='add'>+0xFC, 0x03, 0xF0, 0x03, 0x80, 0x1F, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x02, 0x08, 0x31, 0x01, 0x9F, 0x02, 0x7C, 0x03, 0xF0, 0x0D, 0xC0,</div><div class='add'>+0x31, 0x00, 0xD3, 0x00, 0x7C, 0x03, 0xF0, 0x01, 0xC0, 0x35, 0x00, 0xD7, 0x00,</div><div class='add'>+0x4C, 0x22, 0xB0, 0x0C, 0xC8, 0x34, 0x08, 0x07, 0x00, 0x5C, 0x03, 0x30, 0x21,</div><div class='add'>+0xC0, 0x08, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0xA0,</div><div class='add'>+0xFC, 0x0C, 0x9D, 0x00, 0xFC, 0x0F, 0xD0, 0x0F, 0x44, 0x3C, 0x00, 0xF1, 0x00,</div><div class='add'>+0xF4, 0x07, 0xD0, 0x15, 0xC2, 0x39, 0x08, 0xF0, 0x03, 0x2C, 0x8B, 0xD0, 0x0F,</div><div class='add'>+0x48, 0x3C, 0x00, 0xD5, 0x10, 0xC4, 0x2F, 0x10, 0x09, 0x40, 0x4C, 0x00, 0x02,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x80, 0x32, 0x00, 0x0D, 0x00,</div><div class='add'>+0x34, 0x43, 0xD0, 0x0D, 0x40, 0x31, 0x00, 0xC1, 0x00, 0x34, 0x1B, 0xD2, 0x14,</div><div class='add'>+0x48, 0x32, 0x00, 0xC8, 0x87, 0x04, 0x0D, 0xD0, 0x0C, 0x00, 0x31, 0x00, 0x41,</div><div class='add'>+0x10, 0x14, 0x23, 0x10, 0x00, 0x40, 0x1C, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x06, 0x88, 0x78, 0x00, 0x6D, 0x01, 0xB4, 0x67, 0xD0, 0x9E,</div><div class='add'>+0x40, 0x78, 0x00, 0xE1, 0x01, 0xB4, 0x07, 0xD0, 0x1E, 0x40, 0x73, 0x48, 0xED,</div><div class='add'>+0x01, 0xA4, 0x05, 0xD1, 0x1E, 0x40, 0x71, 0x00, 0xE5, 0x01, 0xC4, 0x17, 0x14,</div><div class='add'>+0x92, 0x40, 0x18, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12,</div><div class='add'>+0x10, 0x30, 0x02, 0xCF, 0x0C, 0x34, 0x03, 0xF0, 0x0C, 0x48, 0x31, 0x00, 0xC3,</div><div class='add'>+0x00, 0x3C, 0x43, 0xF0, 0x04, 0xC1, 0x32, 0x00, 0xCF, 0x10, 0x0C, 0x00, 0xB0,</div><div class='add'>+0x8C, 0xD0, 0x31, 0xA0, 0x17, 0x22, 0x5C, 0x17, 0x30, 0x50, 0xD0, 0x48, 0x40,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xA8, 0x3D, 0x0C, 0xFF,</div><div class='add'>+0x88, 0xDC, 0x83, 0xF0, 0x2F, 0x00, 0x3F, 0x00, 0xDF, 0x00, 0xF4, 0x03, 0xF0,</div><div class='add'>+0x0F, 0xC0, 0x3D, 0x30, 0xF3, 0x08, 0x7C, 0x01, 0xF0, 0x0F, 0xC0, 0x3E, 0xA0,</div><div class='add'>+0xFF, 0x00, 0xFC, 0x03, 0xF0, 0x89, 0xC0, 0x0B, 0x60, 0x06, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x15, 0xA0, 0x37, 0x24, 0x5F, 0x40, 0x7C, 0x6F, 0x30,</div><div class='add'>+0xBD, 0xC0, 0xF4, 0x05, 0xD3, 0x68, 0x1C, 0x63, 0x70, 0x01, 0xD0, 0x36, 0x01,</div><div class='add'>+0xDF, 0x49, 0x4C, 0x05, 0x30, 0x4D, 0xC9, 0x37, 0x03, 0x1F, 0x00, 0x4D, 0x63,</div><div class='add'>+0xF0, 0x11, 0x84, 0x54, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x12, 0x88, 0x39, 0x01, 0x6D, 0x60, 0x36, 0x13, 0x10, 0x4E, 0x40, 0xB8, 0x01,</div><div class='add'>+0xE1, 0x0C, 0x84, 0x03, 0x10, 0x07, 0xC0, 0xB8, 0x04, 0xED, 0x84, 0xAC, 0x01,</div><div class='add'>+0x10, 0x4E, 0x48, 0x3B, 0x04, 0xCD, 0x00, 0x84, 0x03, 0xD0, 0x02, 0x40, 0x48,</div><div class='add'>+0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x79, 0x01,</div><div class='add'>+0xED, 0x03, 0x94, 0x07, 0x18, 0x1E, 0x50, 0x7A, 0x00, 0xC5, 0x01, 0x94, 0x17,</div><div class='add'>+0x50, 0x12, 0x41, 0x78, 0x00, 0xCD, 0x01, 0xC4, 0x04, 0x92, 0x9E, 0x42, 0x7B,</div><div class='add'>+0x01, 0x2D, 0x21, 0x84, 0x07, 0xD0, 0x10, 0x40, 0x0D, 0x00, 0x04, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x28, 0x33, 0x00, 0xCD, 0x00, 0x34, 0x03,</div><div class='add'>+0x15, 0x0C, 0x60, 0x30, 0x00, 0xC1, 0x00, 0x24, 0x03, 0x10, 0x14, 0x41, 0x30,</div><div class='add'>+0x00, 0xCD, 0x40, 0x24, 0x21, 0x90, 0x0C, 0x40, 0x33, 0x00, 0xCD, 0x04, 0x04,</div><div class='add'>+0x03, 0xD0, 0x8C, 0x40, 0x49, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x17, 0xA8, 0x15, 0x00, 0x7F, 0x0A, 0x7C, 0x81, 0x38, 0x05, 0xC0, 0x16,</div><div class='add'>+0x00, 0x53, 0x00, 0x5C, 0x01, 0x70, 0x27, 0xC0, 0x14, 0x00, 0x5F, 0x00, 0xCC,</div><div class='add'>+0x85, 0xB0, 0x05, 0xC0, 0x17, 0x10, 0x7F, 0x04, 0x4C, 0x01, 0xF0, 0x17, 0xC0,</div><div class='add'>+0x5D, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x80, 0x07,</div><div class='add'>+0x08, 0x1F, 0x00, 0x7C, 0x00, 0xF0, 0x01, 0xC0, 0x07, 0x40, 0x1F, 0x00, 0x1C,</div><div class='add'>+0x00, 0xF0, 0x01, 0xC4, 0x05, 0x80, 0x1F, 0x00, 0x7C, 0x00, 0x74, 0x01, 0xC2,</div><div class='add'>+0x07, 0x00, 0x1F, 0x02, 0x7C, 0x00, 0xF2, 0x41, 0x80, 0x4A, 0x00, 0x0C, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x08, 0x65, 0x00, 0x9F, 0x40, 0x7C,</div><div class='add'>+0x06, 0x70, 0x09, 0xC0, 0x27, 0x00, 0x9F, 0x08, 0x4C, 0x16, 0x30, 0x39, 0xC0,</div><div class='add'>+0x24, 0x00, 0x9D, 0x00, 0x74, 0x12, 0xF0, 0x09, 0xC0, 0x23, 0x00, 0x97, 0x08,</div><div class='add'>+0x5C, 0x06, 0x30, 0x09, 0xC0, 0x43, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x01, 0x20, 0x66, 0x0E, 0x9D, 0x20, 0x74, 0x0A, 0xD2, 0x09, 0x40,</div><div class='add'>+0x27, 0x00, 0x9D, 0x03, 0x44, 0x0E, 0x15, 0x08, 0x40, 0x64, 0x20, 0x9D, 0x1B,</div><div class='add'>+0x70, 0x02, 0xD0, 0x09, 0x40, 0x27, 0x00, 0x91, 0x11, 0x04, 0xAE, 0x10, 0x09,</div><div class='add'>+0x40, 0x07, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0xA0,</div><div class='add'>+0x24, 0x00, 0xDD, 0x00, 0x74, 0x62, 0xD0, 0x09, 0x40, 0x27, 0x00, 0x8D, 0x02,</div><div class='add'>+0x44, 0x42, 0x11, 0x09, 0x40, 0x27, 0x09, 0x9D, 0x00, 0x70, 0x42, 0xD2, 0x09,</div><div class='add'>+0x40, 0x27, 0x00, 0x81, 0x00, 0x54, 0x0A, 0x10, 0x09, 0x40, 0x63, 0x00, 0x02,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x28, 0x20, 0x05, 0x8D, 0x14,</div><div class='add'>+0x34, 0x02, 0xD0, 0x88, 0x40, 0x23, 0x22, 0x8D, 0x48, 0x04, 0x02, 0x11, 0x09,</div><div class='add'>+0x40, 0x21, 0x10, 0x8D, 0x08, 0x34, 0x02, 0xD8, 0x08, 0x40, 0x23, 0x40, 0x81,</div><div class='add'>+0x08, 0x04, 0x92, 0x10, 0x48, 0x48, 0x43, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x1D, 0xB0, 0x06, 0x01, 0x1F, 0x04, 0x7C, 0x50, 0x70, 0x60,</div><div class='add'>+0xC1, 0x83, 0x05, 0x1F, 0x96, 0x4C, 0x50, 0x30, 0xA1, 0xD0, 0x05, 0x05, 0x1F,</div><div class='add'>+0x16, 0x7C, 0x28, 0xE0, 0xE1, 0xC9, 0x07, 0x15, 0x17, 0x16, 0x5C, 0x04, 0x30,</div><div class='add'>+0x11, 0xC0, 0x77, 0xC0, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x19,</div><div class='add'>+0xA8, 0x27, 0x25, 0xBF, 0x34, 0x7E, 0x02, 0xF0, 0x49, 0xC0, 0x27, 0x01, 0x9F,</div><div class='add'>+0x04, 0x7D, 0x02, 0xF0, 0x1B, 0xC0, 0x26, 0x20, 0x9F, 0x04, 0xBC, 0x07, 0xF0,</div><div class='add'>+0x19, 0xC0, 0x27, 0x05, 0xBF, 0x04, 0x7C, 0x22, 0xF4, 0xCB, 0xC1, 0x67, 0x60,</div><div class='add'>+0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x19, 0xA0, 0x2F, 0x03, 0x93,</div><div class='add'>+0x03, 0xCC, 0x12, 0x70, 0x29, 0xC0, 0xA5, 0x00, 0xBF, 0x00, 0xCC, 0x42, 0x30,</div><div class='add'>+0x0B, 0xC0, 0x2E, 0x00, 0xB3, 0x00, 0xCC, 0x02, 0xB0, 0x09, 0xC0, 0x24, 0x0B,</div><div class='add'>+0xB3, 0x40, 0xCC, 0x02, 0x30, 0x09, 0xC0, 0x67, 0x00, 0x0E, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x1C, 0x08, 0x47, 0x01, 0x1B, 0x43, 0x68, 0x28, 0x10,</div><div class='add'>+0x01, 0x40, 0x84, 0x02, 0x1D, 0x0E, 0x45, 0x08, 0x10, 0x01, 0x40, 0x85, 0x02,</div><div class='add'>+0x11, 0x20, 0x44, 0x00, 0x13, 0x21, 0xC0, 0x46, 0x01, 0x1B, 0x00, 0x44, 0x00,</div><div class='add'>+0x10, 0x01, 0x44, 0x73, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x10, 0xA2, 0xA3, 0x10, 0x81, 0x06, 0x04, 0x02, 0x50, 0x68, 0x40, 0x21, 0x81,</div><div class='add'>+0x8D, 0x90, 0x06, 0x02, 0x10, 0x09, 0x40, 0x21, 0x40, 0x81, 0x16, 0x44, 0x02,</div><div class='add'>+0x90, 0x28, 0x40, 0xA0, 0x01, 0x81, 0x40, 0x05, 0x02, 0x90, 0x08, 0x40, 0x43,</div><div class='add'>+0x80, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0xA8, 0x25, 0x20,</div><div class='add'>+0x99, 0x02, 0x66, 0x02, 0x10, 0x09, 0x40, 0x24, 0x00, 0x8D, 0x20, 0x46, 0x02,</div><div class='add'>+0x04, 0x09, 0x40, 0x25, 0x00, 0xC1, 0x00, 0x44, 0x03, 0x18, 0x09, 0x40, 0x27,</div><div class='add'>+0x20, 0x89, 0x00, 0x44, 0x02, 0x84, 0x69, 0x40, 0x63, 0x20, 0x06, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x28, 0x25, 0x20, 0x93, 0x21, 0x4C, 0x02,</div><div class='add'>+0x70, 0x09, 0xC0, 0x25, 0x00, 0x9F, 0x80, 0x4C, 0x02, 0x32, 0x09, 0xC8, 0x27,</div><div class='add'>+0x00, 0x93, 0x00, 0x4C, 0x02, 0xB1, 0x09, 0xC4, 0x24, 0x10, 0x93, 0x13, 0x4C,</div><div class='add'>+0x02, 0xB0, 0x09, 0xC0, 0x17, 0x20, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x14, 0x00, 0x21, 0x00, 0x8F, 0x04, 0x7C, 0x02, 0xF0, 0x09, 0xC0, 0x27,</div><div class='add'>+0x00, 0x9F, 0x00, 0x3C, 0x02, 0xF0, 0x89, 0xC0, 0x23, 0x00, 0x9F, 0x00, 0x7D,</div><div class='add'>+0x26, 0xF1, 0x09, 0xC4, 0x26, 0xA8, 0x9F, 0x03, 0x3C, 0x82, 0x70, 0x09, 0xC0,</div><div class='add'>+0x53, 0x08, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x08, 0x05,</div><div class='add'>+0x04, 0x1F, 0x40, 0x4C, 0x10, 0xF0, 0x00, 0xC0, 0x07, 0x80, 0x13, 0x10, 0x5C,</div><div class='add'>+0x84, 0x70, 0x01, 0xC0, 0x06, 0x00, 0x1F, 0x20, 0x4C, 0x08, 0x30, 0x01, 0xC0,</div><div class='add'>+0x07, 0x00, 0x1F, 0x26, 0x4C, 0x00, 0x30, 0x21, 0xC0, 0x53, 0x20, 0x04, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x20, 0x5C, 0x04, 0x5D, 0x00, 0x84,</div><div class='add'>+0x01, 0xD0, 0x05, 0x44, 0x17, 0x40, 0x71, 0x83, 0xF4, 0x01, 0xD0, 0x07, 0x40,</div><div class='add'>+0x14, 0x00, 0x7D, 0x00, 0x84, 0xC5, 0x34, 0x05, 0x40, 0x17, 0x00, 0x7D, 0x01,</div><div class='add'>+0xC4, 0x1D, 0x50, 0x05, 0x40, 0x53, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x14, 0xA0, 0xB2, 0x20, 0xCD, 0x20, 0x24, 0x2B, 0xD1, 0x0C, 0x40,</div><div class='add'>+0x33, 0x00, 0xC9, 0x08, 0x14, 0x07, 0x52, 0x0D, 0x21, 0x72, 0x80, 0xCD, 0x01,</div><div class='add'>+0x04, 0x07, 0x10, 0x0D, 0x40, 0x37, 0x00, 0xCD, 0x00, 0x07, 0x4F, 0x50, 0x0C,</div><div class='add'>+0x46, 0x53, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x82,</div><div class='add'>+0x38, 0x00, 0xCD, 0x04, 0xA4, 0x01, 0xD0, 0x4E, 0x40, 0x7B, 0x02, 0xE9, 0x00,</div><div class='add'>+0xB4, 0x0A, 0xD0, 0x27, 0x48, 0x38, 0x04, 0xED, 0x02, 0x84, 0x03, 0x10, 0x0E,</div><div class='add'>+0x40, 0x3B, 0x00, 0xED, 0x82, 0xC4, 0x03, 0x50, 0x0E, 0x40, 0x17, 0x08, 0x02,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x10, 0x78, 0x00, 0xEF, 0x05,</div><div class='add'>+0xAD, 0x07, 0xF0, 0x5E, 0xC0, 0x7F, 0x01, 0x69, 0x41, 0x9C, 0x05, 0x70, 0x1E,</div><div class='add'>+0xE0, 0x7A, 0x00, 0xFE, 0x01, 0xCD, 0x84, 0x30, 0x1E, 0xC0, 0x7B, 0x00, 0xFF,</div><div class='add'>+0x01, 0xCC, 0x07, 0x70, 0x9E, 0xC2, 0x57, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x10, 0xB8, 0x15, 0x00, 0xDF, 0x42, 0x5C, 0x00, 0xF0, 0xAD,</div><div class='add'>+0xC0, 0x37, 0x00, 0x57, 0x00, 0x7C, 0x02, 0xF0, 0x04, 0xC0, 0x35, 0x00, 0x1F,</div><div class='add'>+0x00, 0x7C, 0x00, 0xF0, 0x0D, 0xC1, 0x37, 0x02, 0xDF, 0x00, 0x7C, 0x03, 0xF0,</div><div class='add'>+0x4D, 0xC0, 0x43, 0x40, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,</div><div class='add'>+0xA0, 0x5F, 0x00, 0xF3, 0x53, 0xFC, 0x26, 0x30, 0x3F, 0xC0, 0xFF, 0x00, 0xFF,</div><div class='add'>+0x01, 0xCC, 0x07, 0xF0, 0x1B, 0xC0, 0x7F, 0x22, 0xBF, 0x01, 0xCC, 0x07, 0xF0,</div><div class='add'>+0x1F, 0xC1, 0x7C, 0x00, 0xF3, 0x01, 0xEC, 0x07, 0x30, 0x1F, 0xC1, 0x08, 0x00,</div><div class='add'>+0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x88, 0xBD, 0x00, 0xE1,</div><div class='add'>+0x00, 0xB4, 0x0A, 0x10, 0x0E, 0x40, 0x3B, 0x00, 0xED, 0x22, 0x80, 0x02, 0xD0,</div><div class='add'>+0x02, 0x40, 0x3B, 0x00, 0xAD, 0x08, 0x84, 0x23, 0xD2, 0x0E, 0x60, 0x3D, 0x00,</div><div class='add'>+0xEB, 0x00, 0x04, 0x15, 0x10, 0xDD, 0x40, 0x54, 0x20, 0x06, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x19, 0x00, 0xE1, 0x00, 0xB4, 0x02, 0x94,</div><div class='add'>+0x0E, 0x40, 0x3B, 0x00, 0x8D, 0x00, 0x84, 0x00, 0xD0, 0x0E, 0x40, 0x3B, 0x80,</div><div class='add'>+0xED, 0x00, 0x84, 0x41, 0xD0, 0x0E, 0x40, 0x38, 0x00, 0xE1, 0x08, 0x24, 0x12,</div><div class='add'>+0x10, 0x4E, 0x40, 0x20, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x06, 0x28, 0x07, 0x10, 0xD1, 0x11, 0x36, 0x02, 0x98, 0x0C, 0x40, 0x33, 0x88,</div><div class='add'>+0x9D, 0x40, 0x04, 0x02, 0xD1, 0x30, 0x40, 0x33, 0x08, 0x1D, 0x00, 0x04, 0x00,</div><div class='add'>+0xD0, 0x0C, 0x40, 0x31, 0x00, 0x09, 0x05, 0x04, 0x80, 0x18, 0x3C, 0x50, 0x58,</div><div class='add'>+0x20, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xA8, 0x24, 0x00,</div><div class='add'>+0xF3, 0x13, 0x7C, 0x02, 0xB0, 0x0F, 0xC0, 0x3F, 0x00, 0x9F, 0x40, 0x4E, 0x02,</div><div class='add'>+0xF0, 0x29, 0xC1, 0x37, 0x00, 0x5F, 0x00, 0x4C, 0x02, 0xD1, 0x0F, 0x40, 0x3C,</div><div class='add'>+0x00, 0x13, 0x13, 0x2C, 0x03, 0x30, 0x0F, 0xC1, 0x74, 0x20, 0x06, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x21, 0x00, 0xA7, 0x00, 0xDF, 0x80, 0x7C, 0x00,</div><div class='add'>+0x70, 0x0D, 0xC0, 0x37, 0x00, 0x9F, 0x42, 0x3F, 0x02, 0xF0, 0x01, 0xC0, 0x37,</div><div class='add'>+0x00, 0x5F, 0x82, 0x7C, 0x00, 0xF0, 0x0D, 0xC8, 0x37, 0x10, 0x1F, 0xA2, 0x7C,</div><div class='add'>+0x02, 0xF5, 0x4D, 0xC0, 0x07, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x81, 0x09, 0x2F, 0x10, 0xF3, 0x00, 0x44, 0x00, 0xF0, 0x0F, 0xC0, 0x3F,</div><div class='add'>+0x00, 0x3F, 0x08, 0xCD, 0x00, 0x30, 0x0B, 0xC1, 0x7F, 0x00, 0xFF, 0x00, 0xCC,</div><div class='add'>+0x00, 0xF0, 0x0F, 0xC0, 0x3B, 0x00, 0x03, 0x02, 0xCC, 0x25, 0x32, 0x0F, 0xC0,</div><div class='add'>+0x07, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x81, 0x20, 0x66,</div><div class='add'>+0x00, 0xD5, 0x00, 0x44, 0x0C, 0xD0, 0x0D, 0x40, 0x37, 0x00, 0x1D, 0x02, 0x44,</div><div class='add'>+0x06, 0x50, 0x31, 0x41, 0x37, 0x00, 0x1D, 0x02, 0x44, 0x0C, 0xD0, 0x0D, 0x40,</div><div class='add'>+0x37, 0x00, 0x11, 0x02, 0x44, 0x44, 0x50, 0x0D, 0x40, 0x07, 0x02, 0x08, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xA0, 0x46, 0x00, 0xD1, 0x00, 0x54,</div><div class='add'>+0x06, 0xD8, 0x0D, 0x40, 0x37, 0x00, 0x5D, 0x00, 0x44, 0x44, 0x10, 0x13, 0x40,</div><div class='add'>+0x37, 0x12, 0x1D, 0x00, 0xE4, 0x06, 0xD0, 0x0F, 0x40, 0x37, 0x00, 0x11, 0x50,</div><div class='add'>+0x44, 0x83, 0x50, 0x0D, 0x48, 0x07, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x10, 0x20, 0x20, 0x00, 0xC5, 0x00, 0x14, 0x02, 0xD8, 0x0C, 0x40,</div><div class='add'>+0x33, 0x08, 0x4C, 0x00, 0x05, 0x00, 0x50, 0x00, 0x40, 0x33, 0x00, 0x0D, 0x00,</div><div class='add'>+0x04, 0x00, 0xD0, 0x0C, 0x48, 0x33, 0x00, 0xC1, 0x00, 0x04, 0x10, 0x51, 0x4C,</div><div class='add'>+0x40, 0x43, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x90,</div><div class='add'>+0x06, 0x00, 0xF3, 0x40, 0x5C, 0x00, 0xF0, 0x0F, 0xC0, 0x3F, 0x00, 0x1F, 0x00,</div><div class='add'>+0x4C, 0x00, 0x32, 0x01, 0xC0, 0x27, 0x00, 0xCF, 0x00, 0x4C, 0x00, 0xF0, 0x0E,</div><div class='add'>+0xC4, 0x37, 0x00, 0x13, 0x00, 0x4D, 0x60, 0x30, 0xAF, 0xC0, 0x07, 0xC0, 0x0A,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0xB8, 0x2F, 0x20, 0xFF, 0x00,</div><div class='add'>+0xEC, 0x00, 0xF1, 0x0F, 0xC0, 0x3F, 0x00, 0x3F, 0x40, 0xFC, 0x00, 0xF0, 0x03,</div><div class='add'>+0xC2, 0x2F, 0x00, 0x3F, 0x00, 0xFC, 0x00, 0xF0, 0x0F, 0xE0, 0x3F, 0x00, 0x3F,</div><div class='add'>+0x40, 0x7C, 0x10, 0xE0, 0x6D, 0xC0, 0x17, 0x60, 0x0E, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x03, 0xA8, 0x3F, 0x0B, 0xFF, 0x2C, 0xFC, 0x0A, 0xD0, 0x8F,</div><div class='add'>+0xC0, 0x4C, 0x00, 0x3F, 0x49, 0xEC, 0x93, 0x30, 0x4F, 0xC0, 0x0F, 0x10, 0x33,</div><div class='add'>+0x00, 0xFC, 0x24, 0xB0, 0x4F, 0xC0, 0x6C, 0x00, 0xF3, 0x00, 0x8C, 0x03, 0xB1,</div><div class='add'>+0x03, 0xC0, 0x0F, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03,</div><div class='add'>+0x10, 0xBF, 0x01, 0xFD, 0x08, 0x74, 0x8A, 0xD0, 0x6F, 0x44, 0x64, 0x00, 0x19,</div><div class='add'>+0x00, 0xF4, 0x0F, 0x51, 0xAF, 0x40, 0x27, 0x12, 0x11, 0x41, 0x74, 0x12, 0x10,</div><div class='add'>+0x9F, 0x40, 0x74, 0x00, 0xF1, 0x42, 0x44, 0x87, 0x10, 0x11, 0x40, 0x0F, 0x00,</div><div class='add'>+0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0xA8, 0xB3, 0x01, 0xCD,</div><div class='add'>+0x00, 0x36, 0x1A, 0xD0, 0x2C, 0x50, 0x20, 0x00, 0x8D, 0x44, 0x24, 0x0B, 0x11,</div><div class='add'>+0x0C, 0x40, 0x01, 0x00, 0x05, 0x80, 0x74, 0x90, 0x90, 0x0C, 0x40, 0x35, 0x00,</div><div class='add'>+0xC1, 0x02, 0x04, 0x07, 0x90, 0x00, 0x40, 0x4F, 0x80, 0x0E, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x03, 0xA0, 0x35, 0x00, 0xDD, 0x00, 0x74, 0x06, 0xD0,</div><div class='add'>+0x0D, 0x40, 0xE4, 0x00, 0x19, 0x01, 0x74, 0x03, 0x50, 0x0D, 0x60, 0x07, 0x00,</div><div class='add'>+0x31, 0x01, 0x74, 0x0E, 0x10, 0x0D, 0x00, 0x74, 0x00, 0xD1, 0x00, 0x44, 0x87,</div><div class='add'>+0x00, 0x11, 0x40, 0x0F, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0xA8, 0x37, 0x00, 0xDF, 0x80, 0x7C, 0x8C, 0xF0, 0x0D, 0xC0, 0xC4, 0x30,</div><div class='add'>+0x9F, 0x01, 0x6C, 0x03, 0x34, 0x0D, 0xC0, 0x07, 0x00, 0x12, 0x05, 0x3C, 0x0E,</div><div class='add'>+0xB1, 0x0C, 0xC0, 0x60, 0x00, 0xD3, 0x00, 0x4C, 0x80, 0xB0, 0x19, 0xC0, 0x23,</div><div class='add'>+0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x80, 0x3D, 0x00,</div><div class='add'>+0xFF, 0x00, 0xFC, 0x02, 0xF2, 0x0E, 0x40, 0x2F, 0x08, 0x3D, 0x40, 0xFC, 0x03,</div><div class='add'>+0xB0, 0x0F, 0xC0, 0x6B, 0xD1, 0xBF, 0x40, 0xFC, 0x02, 0xF1, 0x0F, 0xC0, 0x2F,</div><div class='add'>+0x00, 0xEF, 0x10, 0xFD, 0x00, 0xF0, 0x03, 0xC0, 0x1F, 0x20, 0x06, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x08, 0x35, 0x08, 0xDF, 0x05, 0x7C, 0x10,</div><div class='add'>+0x70, 0x0D, 0xC6, 0x25, 0x00, 0x9F, 0xC0, 0x3C, 0x03, 0xF0, 0x0D, 0xC0, 0x37,</div><div class='add'>+0x09, 0x1F, 0x10, 0x7C, 0x02, 0xF0, 0x4D, 0xC0, 0x06, 0x01, 0xD7, 0x00, 0x0C,</div><div class='add'>+0x01, 0x30, 0x09, 0xC0, 0x2B, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x13, 0xA0, 0x3C, 0x20, 0xFD, 0x42, 0x74, 0x0E, 0xD0, 0x0F, 0x50, 0x64,</div><div class='add'>+0x00, 0x1D, 0x80, 0xF0, 0x13, 0xD0, 0xAF, 0x40, 0xB7, 0x01, 0x9D, 0x23, 0x74,</div><div class='add'>+0x02, 0xD0, 0x3F, 0x40, 0xA7, 0x80, 0xF1, 0x01, 0x54, 0x01, 0x14, 0x09, 0x41,</div><div class='add'>+0x4F, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x20, 0x30,</div><div class='add'>+0x00, 0xCD, 0x02, 0x34, 0x2C, 0x50, 0x0C, 0x48, 0x00, 0x02, 0x09, 0x40, 0x30,</div><div class='add'>+0x03, 0xD0, 0x1C, 0x40, 0x13, 0x00, 0x0D, 0x0B, 0x34, 0x00, 0x90, 0x3C, 0x4C,</div><div class='add'>+0xA2, 0x08, 0xCD, 0x41, 0x04, 0x03, 0x51, 0x08, 0x40, 0x0E, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1F, 0x00, 0x78, 0x00, 0xED, 0x01, 0xB4,</div><div class='add'>+0x05, 0xD1, 0x1C, 0x40, 0xC8, 0x00, 0x2D, 0x01, 0xB6, 0x0F, 0xD0, 0x1E, 0x41,</div><div class='add'>+0x7B, 0x02, 0x2D, 0x01, 0xB4, 0x04, 0xD0, 0x1E, 0x40, 0x7F, 0x00, 0xE1, 0x41,</div><div class='add'>+0xD4, 0x2F, 0x50, 0x16, 0x60, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x12, 0x02, 0x30, 0x08, 0xCF, 0x00, 0x3C, 0x03, 0x70, 0x8C, 0xC0,</div><div class='add'>+0x01, 0x00, 0x8F, 0x8A, 0x3E, 0x23, 0xF0, 0x0C, 0xC0, 0x13, 0x00, 0x4F, 0x00,</div><div class='add'>+0x3C, 0x80, 0xF1, 0x0C, 0xC1, 0x32, 0x00, 0xD7, 0x10, 0x0C, 0x23, 0x70, 0x4C,</div><div class='add'>+0xC0, 0x4B, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x28,</div><div class='add'>+0x3D, 0x24, 0xFF, 0x00, 0xF8, 0x03, 0xF0, 0x0F, 0x80, 0x1F, 0x00, 0xFF, 0x28,</div><div class='add'>+0xFC, 0x63, 0xF0, 0x0F, 0xC0, 0x1F, 0x80, 0x3F, 0x00, 0x7C, 0x03, 0xF0, 0x0F,</div><div class='add'>+0xE9, 0x3B, 0x00, 0xFF, 0x00, 0xFC, 0x23, 0xB4, 0x0D, 0xE0, 0x0B, 0x60, 0x04,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xA8, 0xF7, 0x04, 0xD7, 0x02,</div><div class='add'>+0x7C, 0x05, 0x30, 0xCD, 0xC0, 0x07, 0x00, 0x9B, 0x00, 0x7C, 0x13, 0xF1, 0xCD,</div><div class='add'>+0xD0, 0x04, 0x40, 0xD3, 0x01, 0x4D, 0x00, 0xF0, 0x6D, 0xC0, 0x27, 0x80, 0xD7,</div><div class='add'>+0x02, 0x7C, 0x03, 0x34, 0x18, 0xC4, 0x40, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x13, 0x80, 0x30, 0x00, 0xE1, 0x56, 0xB4, 0x03, 0xB0, 0x8E,</div><div class='add'>+0x44, 0x2B, 0x00, 0xED, 0x00, 0xB4, 0x33, 0xD0, 0x0F, 0x41, 0x2C, 0x00, 0xE1,</div><div class='add'>+0x00, 0x84, 0x01, 0xD0, 0x4E, 0x41, 0x3B, 0x80, 0xED, 0x0E, 0xB4, 0x03, 0xB0,</div><div class='add'>+0x06, 0x40, 0x4C, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04,</div><div class='add'>+0x00, 0x78, 0x01, 0xED, 0x01, 0x36, 0x05, 0x10, 0x5E, 0x40, 0x7B, 0x18, 0xAD,</div><div class='add'>+0x01, 0xA4, 0x17, 0xD0, 0x5E, 0x40, 0x7A, 0x00, 0xC1, 0x01, 0xA4, 0x06, 0xD0,</div><div class='add'>+0x1E, 0x40, 0x5B, 0x04, 0xED, 0x25, 0xB4, 0x07, 0x10, 0x1E, 0x40, 0x10, 0x00,</div><div class='add'>+0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16, 0x28, 0x33, 0x00, 0xC9,</div><div class='add'>+0x00, 0x34, 0x43, 0x98, 0x0C, 0x40, 0x33, 0x22, 0xCD, 0x0A, 0x34, 0x03, 0xD0,</div><div class='add'>+0x0C, 0x40, 0xB2, 0x03, 0xC1, 0x0A, 0x24, 0x03, 0xD0, 0x0C, 0x40, 0x73, 0x01,</div><div class='add'>+0xCD, 0x00, 0x34, 0x03, 0x90, 0x6C, 0x40, 0x58, 0x20, 0x0C, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x17, 0x28, 0x17, 0x10, 0x5F, 0x00, 0xFC, 0x81, 0x30,</div><div class='add'>+0x05, 0xE0, 0x5B, 0x00, 0x7B, 0x61, 0x3C, 0x01, 0xF2, 0x05, 0xC0, 0xDE, 0x00,</div><div class='add'>+0x73, 0x01, 0xEC, 0x05, 0xF0, 0x05, 0xCA, 0x1B, 0x00, 0x5F, 0x00, 0xFC, 0x01,</div><div class='add'>+0x30, 0x07, 0xD4, 0x5C, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x12, 0x00, 0x05, 0x08, 0x17, 0x00, 0x78, 0x20, 0xF0, 0x01, 0xC6, 0x47, 0x08,</div><div class='add'>+0x1F, 0x10, 0x7C, 0x00, 0xF0, 0x20, 0xC8, 0x01, 0x00, 0x1F, 0x04, 0x5C, 0x24,</div><div class='add'>+0xF0, 0x01, 0xC0, 0x07, 0x20, 0x1F, 0x00, 0x7C, 0x04, 0xF1, 0x21, 0xC0, 0x4B,</div><div class='add'>+0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x08, 0x25, 0x00,</div><div class='add'>+0x8F, 0x01, 0x4C, 0x02, 0xF0, 0x09, 0xC0, 0x27, 0x02, 0x9B, 0x20, 0x4C, 0x82,</div><div class='add'>+0xB0, 0x19, 0x80, 0x24, 0x00, 0x91, 0x01, 0x7C, 0x02, 0x30, 0x09, 0xC0, 0xE5,</div><div class='add'>+0x00, 0x93, 0x00, 0x7C, 0x02, 0x32, 0x09, 0xC0, 0x43, 0x20, 0x04, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x20, 0x26, 0x00, 0x9D, 0x03, 0x45, 0x8E,</div><div class='add'>+0xD0, 0x09, 0x40, 0xE7, 0x10, 0x80, 0x00, 0x44, 0x06, 0x10, 0x49, 0x50, 0x24,</div><div class='add'>+0x02, 0x91, 0x02, 0x74, 0x02, 0x10, 0x09, 0x40, 0xA7, 0x00, 0x91, 0x0B, 0x34,</div><div class='add'>+0x02, 0x14, 0x29, 0x44, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x18, 0xA0, 0x24, 0x00, 0x9D, 0x18, 0x54, 0x2B, 0xD0, 0x09, 0x40, 0x27,</div><div class='add'>+0x00, 0x98, 0x20, 0x44, 0x52, 0x92, 0x49, 0x48, 0x25, 0x08, 0x95, 0x38, 0x34,</div><div class='add'>+0x02, 0x00, 0x09, 0x42, 0x27, 0x40, 0x91, 0x00, 0x74, 0x06, 0x1C, 0x2D, 0x40,</div><div class='add'>+0x63, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x20, 0x20,</div><div class='add'>+0x00, 0x89, 0x14, 0x14, 0x52, 0xD1, 0x88, 0x40, 0x23, 0x08, 0x91, 0x48, 0x00,</div><div class='add'>+0x02, 0x00, 0x08, 0x60, 0x21, 0x00, 0x85, 0x04, 0x36, 0x22, 0x14, 0x08, 0x40,</div><div class='add'>+0x23, 0x00, 0xC1, 0x14, 0x34, 0x56, 0x10, 0x48, 0x41, 0x43, 0x80, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xB8, 0x06, 0x05, 0x1F, 0x04, 0x5C,</div><div class='add'>+0x10, 0xF0, 0x61, 0xC1, 0x17, 0x00, 0x1A, 0x02, 0x4C, 0x50, 0xB0, 0xE1, 0xC1,</div><div class='add'>+0x85, 0x47, 0x17, 0x01, 0x7C, 0x08, 0x20, 0x41, 0xC1, 0x15, 0x00, 0x13, 0x0E,</div><div class='add'>+0x7C, 0x10, 0x30, 0x41, 0xC0, 0x77, 0xE0, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x1D, 0xB8, 0x27, 0x05, 0x9F, 0x14, 0xEC, 0x52, 0xF0, 0x49, 0xC2,</div><div class='add'>+0x2F, 0x10, 0xBF, 0x44, 0x7D, 0x02, 0xF0, 0x19, 0xC2, 0x6E, 0x00, 0xBB, 0x08,</div><div class='add'>+0xFC, 0x12, 0xF0, 0x09, 0xC0, 0x2F, 0x00, 0x9F, 0x81, 0xBC, 0x02, 0xF0, 0x0B,</div><div class='add'>+0xC0, 0x77, 0x60, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1D, 0x00,</div><div class='add'>+0xA7, 0x10, 0xBF, 0x06, 0xCC, 0x46, 0x10, 0x29, 0xC0, 0x2D, 0x00, 0x9F, 0x82,</div><div class='add'>+0xDC, 0x12, 0xF0, 0x0B, 0xC0, 0x2C, 0x05, 0xB3, 0x00, 0x7C, 0x82, 0x30, 0x4B,</div><div class='add'>+0xC1, 0x2F, 0x00, 0xB3, 0x00, 0xBC, 0x93, 0x30, 0x0B, 0xC0, 0x77, 0x00, 0x0E,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x87, 0x00, 0x11, 0x0A,</div><div class='add'>+0x45, 0x0C, 0xB0, 0xE0, 0x40, 0x07, 0x08, 0x17, 0x00, 0x44, 0x00, 0xD0, 0xA1,</div><div class='add'>+0x40, 0x84, 0x08, 0x11, 0x00, 0x74, 0x50, 0x10, 0x21, 0x40, 0x17, 0x00, 0x11,</div><div class='add'>+0x00, 0x74, 0x00, 0x10, 0x01, 0x44, 0x63, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x12, 0x20, 0xA1, 0x01, 0x85, 0x04, 0x04, 0x52, 0x58, 0x48,</div><div class='add'>+0x40, 0x23, 0x00, 0x89, 0x00, 0x14, 0x0B, 0xD0, 0x08, 0x40, 0x20, 0x00, 0x85,</div><div class='add'>+0x80, 0x34, 0x02, 0x10, 0x08, 0x42, 0x25, 0x00, 0xC1, 0x00, 0x34, 0x8A, 0x10,</div><div class='add'>+0x08, 0x40, 0x4B, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18,</div><div class='add'>+0x28, 0x25, 0x00, 0xD1, 0x00, 0x44, 0x03, 0xD1, 0x09, 0x40, 0x27, 0x0C, 0x95,</div><div class='add'>+0x04, 0x44, 0x02, 0xD0, 0x09, 0x10, 0x24, 0x14, 0x94, 0x04, 0x74, 0x0A, 0x14,</div><div class='add'>+0x09, 0x40, 0x27, 0x00, 0x91, 0x00, 0x74, 0x12, 0x18, 0x49, 0x40, 0x63, 0x28,</div><div class='add'>+0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0xA2, 0x27, 0x10, 0x97,</div><div class='add'>+0x00, 0x48, 0x1A, 0x70, 0x09, 0xE0, 0xA5, 0x00, 0x9F, 0x93, 0x54, 0x02, 0xF0,</div><div class='add'>+0x09, 0xC4, 0xE4, 0x40, 0x97, 0x00, 0x7C, 0x02, 0x33, 0x09, 0xC0, 0x67, 0x00,</div><div class='add'>+0x91, 0x00, 0x7C, 0x06, 0x34, 0x49, 0x42, 0x17, 0x08, 0x04, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x16, 0x08, 0x20, 0x00, 0x9F, 0x90, 0x7C, 0x12, 0xB0,</div><div class='add'>+0x09, 0xC0, 0x67, 0x09, 0x97, 0x21, 0x7C, 0x02, 0xF0, 0x08, 0xC0, 0x23, 0x11,</div><div class='add'>+0x9B, 0x00, 0x7C, 0x0A, 0xF0, 0x09, 0xC0, 0x27, 0x41, 0x9F, 0x20, 0x7C, 0x06,</div><div class='add'>+0xF0, 0x09, 0xC0, 0x5B, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x14, 0x08, 0x04, 0x00, 0x1F, 0x00, 0x6C, 0x08, 0xF2, 0x01, 0xC0, 0x86, 0x14,</div><div class='add'>+0x1F, 0x02, 0x4C, 0x40, 0xF0, 0x01, 0xC0, 0x86, 0x03, 0x1F, 0x28, 0x7C, 0x00,</div><div class='add'>+0xF0, 0x11, 0xC4, 0x04, 0x01, 0x13, 0x10, 0x7C, 0x40, 0x30, 0x21, 0xC0, 0x50,</div><div class='add'>+0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x20, 0x14, 0x00,</div><div class='add'>+0x7D, 0x85, 0xC4, 0x81, 0xD0, 0x05, 0x58, 0xDC, 0x00, 0x5C, 0x00, 0xEC, 0x01,</div><div class='add'>+0xD0, 0x27, 0x41, 0x1F, 0x10, 0x7D, 0x00, 0x74, 0x01, 0xD0, 0x07, 0x40, 0xD8,</div><div class='add'>+0x40, 0x73, 0x02, 0xB4, 0x09, 0x15, 0x07, 0x40, 0x40, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xA0, 0x32, 0x00, 0xDD, 0x03, 0x74, 0x33,</div><div class='add'>+0xD0, 0x0C, 0x40, 0x71, 0x00, 0xDD, 0x00, 0x04, 0x0B, 0xD0, 0x2C, 0x41, 0xB2,</div><div class='add'>+0x00, 0xCC, 0x04, 0x74, 0x03, 0xD0, 0x0C, 0x40, 0x70, 0x00, 0xC1, 0x02, 0x34,</div><div class='add'>+0x03, 0x90, 0x0C, 0x40, 0x40, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x04, 0x80, 0x38, 0x00, 0xED, 0x00, 0x94, 0x03, 0xD1, 0x9E, 0x40, 0x99,</div><div class='add'>+0x28, 0xFD, 0x08, 0xA0, 0x03, 0xDA, 0x0E, 0x40, 0x3B, 0x00, 0xED, 0x00, 0xB6,</div><div class='add'>+0x13, 0xD0, 0x1E, 0x50, 0x3C, 0x04, 0xA9, 0x00, 0xF4, 0x03, 0x90, 0x1C, 0x41,</div><div class='add'>+0x10, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x18, 0x78,</div><div class='add'>+0x10, 0xFF, 0x01, 0xBC, 0x07, 0xF1, 0x5E, 0xC1, 0x6B, 0x00, 0xFE, 0x11, 0x8C,</div><div class='add'>+0x06, 0xC0, 0x12, 0xC0, 0x6A, 0x00, 0xEF, 0x21, 0xBC, 0x47, 0xF0, 0x1C, 0xE2,</div><div class='add'>+0x58, 0x00, 0xA3, 0x01, 0xBC, 0x07, 0xB0, 0x1E, 0xD0, 0x50, 0x60, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xB0, 0xB5, 0x05, 0x5F, 0x00, 0x6C,</div><div class='add'>+0x01, 0xF1, 0x2D, 0xC0, 0x06, 0x00, 0xDF, 0x06, 0x7C, 0x00, 0xF0, 0x01, 0xC0,</div><div class='add'>+0x27, 0x10, 0xDF, 0x00, 0x7C, 0x2B, 0xF0, 0x0D, 0xC0, 0x13, 0x00, 0x17, 0x40,</div><div class='add'>+0x7C, 0x03, 0x74, 0x0D, 0xD0, 0x43, 0x60, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x06, 0x28, 0x7D, 0x04, 0x73, 0x01, 0xCD, 0x27, 0x30, 0x1F, 0xC2,</div><div class='add'>+0x7F, 0x02, 0xF7, 0x01, 0xCC, 0x05, 0xB4, 0x9F, 0xC8, 0x5F, 0x92, 0x6F, 0x09,</div><div class='add'>+0xDC, 0x07, 0xF0, 0x1F, 0xC0, 0x58, 0x40, 0xB3, 0x09, 0xCC, 0xA5, 0x30, 0x1F,</div><div class='add'>+0xC0, 0x18, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x08,</div><div class='add'>+0x39, 0xA0, 0x61, 0x00, 0xAC, 0x03, 0x10, 0x4E, 0x48, 0x2B, 0x82, 0xE1, 0x00,</div><div class='add'>+0x84, 0x08, 0x10, 0x06, 0x40, 0x1B, 0x00, 0xED, 0x08, 0x84, 0x03, 0xD0, 0x06,</div><div class='add'>+0x50, 0x18, 0x02, 0xA1, 0x00, 0x85, 0x33, 0xB0, 0x0A, 0xC8, 0x56, 0x00, 0x04,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x48, 0x00, 0x39, 0x00, 0xC1, 0x08,</div><div class='add'>+0x94, 0x43, 0x18, 0x0E, 0x60, 0x2F, 0x84, 0xE5, 0x00, 0x84, 0x00, 0x10, 0x06,</div><div class='add'>+0x08, 0x1B, 0x00, 0x2D, 0x00, 0x94, 0x43, 0xD0, 0x8E, 0x40, 0x0E, 0x00, 0x81,</div><div class='add'>+0x80, 0xC4, 0x01, 0x18, 0x0E, 0x40, 0x20, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x02, 0x28, 0x35, 0x00, 0x01, 0x00, 0x50, 0x02, 0x18, 0x0D,</div><div class='add'>+0x44, 0x63, 0x00, 0xC5, 0x02, 0x04, 0x00, 0x10, 0x00, 0x44, 0x83, 0x00, 0x8D,</div><div class='add'>+0x02, 0x04, 0x4F, 0xD0, 0x04, 0x40, 0xC2, 0x02, 0x01, 0x00, 0x44, 0x01, 0x90,</div><div class='add'>+0xA8, 0x40, 0x0A, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05,</div><div class='add'>+0xA8, 0x3D, 0x00, 0x93, 0x00, 0x54, 0x28, 0x30, 0x0F, 0xC0, 0x67, 0x00, 0xF7,</div><div class='add'>+0x00, 0x4C, 0x02, 0x30, 0x09, 0x40, 0x27, 0x00, 0x9F, 0x06, 0xDC, 0x0F, 0xF0,</div><div class='add'>+0x0C, 0x40, 0x62, 0x08, 0x91, 0x00, 0x4C, 0x03, 0x11, 0x3D, 0xC8, 0x54, 0x00,</div><div class='add'>+0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x37, 0x00, 0x9F,</div><div class='add'>+0x02, 0x64, 0x02, 0xF0, 0x0D, 0xC0, 0x87, 0x28, 0xDA, 0x11, 0x7C, 0x0A, 0x70,</div><div class='add'>+0x09, 0xC0, 0x87, 0x10, 0xDF, 0x10, 0x7C, 0x03, 0xF0, 0x09, 0xC4, 0x05, 0x04,</div><div class='add'>+0x9F, 0xC0, 0x6C, 0x03, 0xF0, 0x2D, 0xC2, 0x37, 0x20, 0x0C, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x81, 0x08, 0x3F, 0x00, 0xB3, 0x80, 0x7C, 0x00, 0x31,</div><div class='add'>+0x0F, 0xE0, 0x0C, 0x04, 0xF7, 0x00, 0x7C, 0x02, 0xF0, 0x03, 0x40, 0x2F, 0x04,</div><div class='add'>+0x37, 0x00, 0xCC, 0x03, 0xF0, 0x0D, 0xC0, 0x0C, 0x40, 0xB2, 0x00, 0xFC, 0x02,</div><div class='add'>+0x70, 0x05, 0xC1, 0x05, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0xA1, 0x20, 0x36, 0x00, 0x91, 0x03, 0x74, 0x04, 0x10, 0x0D, 0x48, 0x44, 0x01,</div><div class='add'>+0xDD, 0x00, 0x74, 0x04, 0xD0, 0x11, 0x40, 0x47, 0x00, 0x4D, 0x00, 0x6C, 0x03,</div><div class='add'>+0xD0, 0x09, 0x40, 0x44, 0x00, 0x11, 0x07, 0x74, 0x02, 0x10, 0x44, 0x42, 0x84,</div><div class='add'>+0x04, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xA0, 0x36, 0x00,</div><div class='add'>+0x11, 0x01, 0x74, 0x04, 0x10, 0x0D, 0x40, 0x64, 0x18, 0xDD, 0x00, 0x74, 0x06,</div><div class='add'>+0xD0, 0x1B, 0x60, 0xCF, 0x00, 0x1D, 0x58, 0x44, 0x03, 0xD0, 0x1D, 0x70, 0xC4,</div><div class='add'>+0x00, 0x35, 0x81, 0x74, 0x21, 0x50, 0x0D, 0x40, 0x05, 0x00, 0x0A, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x20, 0x30, 0x00, 0x01, 0x00, 0x24, 0x02,</div><div class='add'>+0x10, 0x0C, 0x40, 0x20, 0x00, 0xCD, 0x00, 0x34, 0x02, 0xD0, 0x00, 0x40, 0x02,</div><div class='add'>+0x20, 0xCD, 0x00, 0x24, 0x03, 0xD0, 0x00, 0x40, 0x04, 0x00, 0x05, 0x00, 0x64,</div><div class='add'>+0x83, 0x14, 0x08, 0x40, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x01, 0x10, 0x3A, 0x08, 0x93, 0x00, 0x7C, 0x00, 0x30, 0x0F, 0x40, 0x04,</div><div class='add'>+0x10, 0xE7, 0x00, 0x7C, 0x02, 0xF0, 0x01, 0xC0, 0x07, 0x00, 0x17, 0x60, 0xCC,</div><div class='add'>+0x03, 0xF0, 0x0D, 0xC0, 0x04, 0x00, 0x17, 0x00, 0x7C, 0x00, 0x71, 0x05, 0xC0,</div><div class='add'>+0x05, 0x60, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x45, 0x38, 0x3F,</div><div class='add'>+0x20, 0xBF, 0x80, 0xFE, 0x02, 0xF0, 0x0F, 0xC0, 0x0B, 0x00, 0xFF, 0x00, 0xFC,</div><div class='add'>+0x00, 0xF0, 0x03, 0xC0, 0x0F, 0x00, 0x3F, 0x00, 0xFC, 0x83, 0xF0, 0x03, 0xC8,</div><div class='add'>+0x0F, 0x00, 0x3B, 0x00, 0xBC, 0x00, 0xF0, 0x03, 0xC2, 0x17, 0x62, 0x0E, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xA0, 0x7F, 0x02, 0xFB, 0x09, 0xAC,</div><div class='add'>+0x07, 0xB0, 0x1F, 0xC0, 0x7A, 0x00, 0xFD, 0x21, 0xEC, 0x07, 0xB0, 0x1F, 0xC0,</div><div class='add'>+0x7A, 0x08, 0xFB, 0x89, 0xCC, 0x07, 0xF2, 0x1F, 0xC0, 0x7D, 0x12, 0xFB, 0x09,</div><div class='add'>+0xEC, 0x87, 0x33, 0x1E, 0xD2, 0x0C, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x03, 0x00, 0x07, 0x01, 0x11, 0x04, 0x44, 0x04, 0x30, 0x11, 0x40,</div><div class='add'>+0x44, 0x00, 0x11, 0x01, 0x40, 0x00, 0x10, 0x40, 0x47, 0x44, 0x00, 0x0D, 0x00,</div><div class='add'>+0x44, 0x04, 0x10, 0x11, 0xC0, 0x05, 0x39, 0x11, 0x24, 0x44, 0x10, 0xB2, 0x11,</div><div class='add'>+0x44, 0x0C, 0x60, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0xA0,</div><div class='add'>+0x35, 0x18, 0xD9, 0x60, 0x34, 0x03, 0xD0, 0x0D, 0x40, 0x36, 0x00, 0xD9, 0xA0,</div><div class='add'>+0x64, 0x53, 0x92, 0x0D, 0x40, 0x33, 0x00, 0xD5, 0x00, 0x44, 0x03, 0x90, 0x0C,</div><div class='add'>+0x40, 0x36, 0x00, 0xDD, 0x04, 0x34, 0x43, 0x19, 0x0C, 0x40, 0x4C, 0x80, 0x0E,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xA8, 0x07, 0x08, 0x11, 0x00,</div><div class='add'>+0x44, 0x00, 0xD1, 0x01, 0x40, 0x04, 0x08, 0x11, 0x00, 0x44, 0x00, 0x10, 0x01,</div><div class='add'>+0x40, 0x05, 0x00, 0x1D, 0x00, 0x44, 0x00, 0x10, 0x01, 0x40, 0x05, 0x18, 0x15,</div><div class='add'>+0x00, 0x14, 0x00, 0x90, 0x01, 0x40, 0x0C, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0xA0, 0x32, 0x20, 0xCB, 0x20, 0x6C, 0x03, 0xF0, 0x0D,</div><div class='add'>+0xC0, 0x36, 0x80, 0xCF, 0x00, 0x2C, 0x03, 0xB0, 0x0D, 0xC0, 0x37, 0x08, 0xDB,</div><div class='add'>+0x00, 0x4C, 0x03, 0xB0, 0x0C, 0x80, 0x36, 0x00, 0xDF, 0x00, 0x7C, 0x03, 0x32,</div><div class='add'>+0x0C, 0xC8, 0x20, 0x20, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03,</div><div class='add'>+0x88, 0x0D, 0x00, 0x3F, 0x80, 0xF8, 0x40, 0x30, 0x03, 0xC3, 0x0D, 0x80, 0x3E,</div><div class='add'>+0x00, 0xF8, 0x00, 0xF0, 0x03, 0xC0, 0x0E, 0x08, 0x3D, 0x00, 0xF8, 0x00, 0xB0,</div><div class='add'>+0x03, 0x82, 0x0F, 0x00, 0x3B, 0x30, 0xE8, 0x00, 0xF0, 0x03, 0xC0, 0x1F, 0x00,</div><div class='add'>+0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x08, 0x35, 0x00, 0xD7,</div><div class='add'>+0x00, 0x6C, 0x03, 0x71, 0x0D, 0xC0, 0x37, 0x00, 0xDF, 0x00, 0x7C, 0x03, 0xF0,</div><div class='add'>+0x0D, 0xC0, 0x36, 0x04, 0xDF, 0x00, 0x5C, 0x93, 0x31, 0x0D, 0xC1, 0x34, 0x02,</div><div class='add'>+0xDF, 0x00, 0x7C, 0x03, 0x70, 0x0D, 0xC1, 0x09, 0x20, 0x04, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x13, 0xA0, 0x84, 0x06, 0x11, 0x40, 0x34, 0x4C, 0x10,</div><div class='add'>+0x20, 0x41, 0x83, 0x24, 0x10, 0x00, 0x74, 0x04, 0x10, 0xB0, 0x00, 0x04, 0x00,</div><div class='add'>+0x02, 0x00, 0x04, 0x0C, 0x10, 0x31, 0x42, 0x03, 0x00, 0x0C, 0x03, 0x70, 0x80,</div><div class='add'>+0x10, 0x21, 0x40, 0x6C, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x13, 0x20, 0x70, 0x10, 0xC5, 0x80, 0x24, 0x07, 0x40, 0x0C, 0x40, 0x33, 0x01,</div><div class='add'>+0xC5, 0x00, 0x24, 0x47, 0x50, 0xAC, 0x40, 0x31, 0x08, 0xC4, 0x00, 0x14, 0x0B,</div><div class='add'>+0x14, 0x3C, 0x00, 0x30, 0x04, 0xCD, 0x00, 0x34, 0x03, 0x98, 0x2C, 0x40, 0x0F,</div><div class='add'>+0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x02, 0x4C, 0x0A,</div><div class='add'>+0x21, 0x09, 0xF4, 0x04, 0x10, 0x12, 0x40, 0x4F, 0x00, 0x25, 0x37, 0xF6, 0x04,</div><div class='add'>+0x12, 0x12, 0x60, 0x49, 0x02, 0x21, 0x01, 0x84, 0x04, 0x00, 0x12, 0x41, 0x4B,</div><div class='add'>+0x02, 0x2D, 0x11, 0xB4, 0x24, 0x80, 0x12, 0x42, 0x3E, 0x20, 0x08, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x18, 0x30, 0x00, 0xC7, 0x00, 0x2C, 0x23,</div><div class='add'>+0x51, 0x8C, 0xC0, 0x33, 0x00, 0xCF, 0x08, 0x3C, 0x43, 0x70, 0x0C, 0xC4, 0x31,</div><div class='add'>+0x06, 0xC7, 0x00, 0x1C, 0x43, 0x30, 0x0C, 0xC0, 0x30, 0x00, 0xCF, 0x00, 0x7C,</div><div class='add'>+0x03, 0xF0, 0x0C, 0xE4, 0x4B, 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x02, 0x38, 0x09, 0x20, 0x3F, 0x00, 0xF0, 0x00, 0xF0, 0x03, 0xC2, 0x0F,</div><div class='add'>+0x00, 0x3B, 0x2C, 0xBC, 0x20, 0x70, 0x03, 0xC0, 0x0C, 0x02, 0x3F, 0x00, 0xBC,</div><div class='add'>+0x20, 0xF8, 0x83, 0xC0, 0x0F, 0x00, 0x1F, 0x00, 0xFC, 0x00, 0x71, 0x11, 0xC8,</div><div class='add'>+0x09, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xA8, 0x77,</div><div class='add'>+0x00, 0xC3, 0x40, 0x6C, 0x03, 0xF0, 0x0D, 0xC0, 0x73, 0x00, 0xC7, 0x01, 0x6C,</div><div class='add'>+0x07, 0x36, 0x0D, 0xC4, 0x70, 0x00, 0xDB, 0x40, 0x6C, 0x03, 0xF0, 0x0C, 0xD0,</div><div class='add'>+0x34, 0x40, 0xD3, 0x00, 0x7C, 0x03, 0xB0, 0x0D, 0xC0, 0x43, 0x00, 0x0E, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0x98, 0x0D, 0x08, 0x2B, 0x00, 0x84,</div><div class='add'>+0x00, 0xD2, 0x02, 0x40, 0x0B, 0x00, 0x21, 0x60, 0x84, 0x00, 0x10, 0x02, 0x42,</div><div class='add'>+0x08, 0x00, 0x31, 0x00, 0x84, 0x00, 0x90, 0x02, 0x40, 0x08, 0x00, 0x21, 0x00,</div><div class='add'>+0xB4, 0x00, 0x10, 0x02, 0x40, 0x4F, 0x68, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x79, 0x00, 0xF9, 0x01, 0xA6, 0x07, 0xD9, 0x1E, 0x40,</div><div class='add'>+0x7B, 0x00, 0xF5, 0x01, 0xA4, 0x07, 0x10, 0x1E, 0x40, 0x78, 0x10, 0xE9, 0x01,</div><div class='add'>+0xB4, 0x07, 0xD0, 0x1E, 0x60, 0x78, 0x00, 0xE1, 0x01, 0xD4, 0x07, 0x90, 0x1E,</div><div class='add'>+0x60, 0x13, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16, 0x20,</div><div class='add'>+0x03, 0x00, 0x19, 0x00, 0x06, 0x00, 0xD0, 0x00, 0x42, 0x03, 0x00, 0x05, 0x00,</div><div class='add'>+0x04, 0x00, 0x18, 0x00, 0x50, 0x01, 0x00, 0x01, 0x00, 0x14, 0x00, 0x90, 0x00,</div><div class='add'>+0x60, 0x00, 0x00, 0x05, 0x00, 0x74, 0x00, 0x10, 0x00, 0x40, 0x5B, 0x00, 0x0C,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x17, 0x28, 0x15, 0x00, 0x5B, 0x80,</div><div class='add'>+0x2C, 0x01, 0xF0, 0x05, 0xC0, 0x17, 0x00, 0x57, 0x40, 0x6C, 0x01, 0x30, 0x05,</div><div class='add'>+0xCA, 0x14, 0x10, 0x5B, 0x00, 0x7C, 0x01, 0xF0, 0x04, 0xC0, 0x10, 0x00, 0x53,</div><div class='add'>+0x00, 0x7C, 0x01, 0xB0, 0x05, 0xC0, 0x5F, 0x20, 0x0E, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x12, 0x00, 0x8D, 0x08, 0x3F, 0x00, 0xFC, 0x08, 0xE0, 0x03,</div><div class='add'>+0xC0, 0x0F, 0x20, 0x39, 0x20, 0xFC, 0x08, 0xF0, 0x03, 0x00, 0x0E, 0x00, 0x3F,</div><div class='add'>+0x40, 0xE4, 0x80, 0xC2, 0x03, 0xC0, 0x8F, 0x00, 0x3B, 0x20, 0xFC, 0x00, 0xF0,</div><div class='add'>+0x03, 0xC0, 0x4B, 0x08, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10,</div><div class='add'>+0x08, 0x25, 0x00, 0x9F, 0x00, 0x4C, 0x22, 0x30, 0x49, 0xC0, 0x25, 0x00, 0x9F,</div><div class='add'>+0xC0, 0x7C, 0x02, 0xF1, 0x09, 0x80, 0xE5, 0x08, 0x9F, 0x00, 0x5C, 0x02, 0x70,</div><div class='add'>+0x09, 0xC0, 0x24, 0x00, 0x97, 0x01, 0x7C, 0x16, 0x30, 0x09, 0x80, 0x41, 0x20,</div><div class='add'>+0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0xE4, 0x23, 0x9D,</div><div class='add'>+0x00, 0x45, 0x0A, 0x10, 0x18, 0x80, 0x26, 0x00, 0x9C, 0x11, 0x70, 0x06, 0xD0,</div><div class='add'>+0x28, 0x40, 0x64, 0x04, 0x8D, 0x80, 0x04, 0x02, 0x00, 0x09, 0x40, 0x64, 0x03,</div><div class='add'>+0x91, 0x02, 0x74, 0x0E, 0x10, 0x18, 0x40, 0x04, 0x00, 0x08, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x18, 0xA0, 0x24, 0x80, 0xBD, 0x80, 0xC4, 0x02, 0x50,</div><div class='add'>+0x0B, 0x40, 0x2C, 0x01, 0xBC, 0x08, 0xF0, 0x22, 0xD2, 0x0B, 0x41, 0x2D, 0x00,</div><div class='add'>+0xBD, 0x00, 0xD4, 0x02, 0x42, 0x0B, 0x40, 0x2C, 0x00, 0xB5, 0x0A, 0xF4, 0xC2,</div><div class='add'>+0x00, 0x4B, 0x40, 0x71, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x10, 0x20, 0x29, 0x00, 0xAD, 0x00, 0xD4, 0x03, 0x54, 0x1B, 0x40, 0x6A, 0x20,</div><div class='add'>+0xAC, 0xA0, 0xB0, 0xA3, 0xD1, 0x8B, 0x40, 0x29, 0x00, 0xBD, 0x68, 0xC4, 0x02,</div><div class='add'>+0x51, 0x0B, 0x40, 0x28, 0x02, 0xA1, 0x08, 0xB0, 0x22, 0x11, 0x0B, 0x44, 0x51,</div><div class='add'>+0xA0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xB0, 0x07, 0x08,</div><div class='add'>+0x1F, 0x80, 0x4C, 0x00, 0x74, 0x01, 0xC0, 0x05, 0x00, 0x1F, 0x00, 0x38, 0x08,</div><div class='add'>+0xF0, 0x20, 0xC0, 0x05, 0x00, 0x1F, 0x22, 0x5C, 0x00, 0x72, 0x01, 0xD0, 0x80,</div><div class='add'>+0x00, 0x17, 0x02, 0x78, 0x08, 0x34, 0x03, 0xC0, 0x75, 0xC0, 0x0A, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xB8, 0x27, 0x05, 0x9F, 0x14, 0x6C, 0x02,</div><div class='add'>+0xB0, 0x09, 0xC0, 0x27, 0x00, 0x9F, 0x00, 0x7C, 0x12, 0xF0, 0x49, 0x80, 0x26,</div><div class='add'>+0x00, 0x9F, 0x04, 0x7C, 0x02, 0xB0, 0x09, 0xC0, 0x27, 0x01, 0x9F, 0x04, 0x3C,</div><div class='add'>+0x12, 0xF4, 0x09, 0xC0, 0x66, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x1D, 0xA8, 0xAF, 0x00, 0x9F, 0x02, 0xF4, 0x02, 0x30, 0x0B, 0xC0, 0x2B,</div><div class='add'>+0x00, 0xBF, 0x80, 0xCC, 0x82, 0xF0, 0x0B, 0xD0, 0x2C, 0x00, 0x8B, 0x82, 0x8C,</div><div class='add'>+0x02, 0xB0, 0x0B, 0xC0, 0x2E, 0x00, 0xAF, 0x00, 0xCD, 0x0A, 0xB0, 0x0A, 0xC0,</div><div class='add'>+0x64, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x10, 0x47,</div><div class='add'>+0x01, 0x0D, 0x05, 0x74, 0x00, 0xB0, 0x01, 0x40, 0x07, 0x08, 0x1D, 0x00, 0x6C,</div><div class='add'>+0x10, 0xD0, 0x41, 0x40, 0x04, 0x00, 0x11, 0x00, 0x54, 0x00, 0x10, 0x01, 0x40,</div><div class='add'>+0x00, 0x01, 0x1D, 0x00, 0x45, 0x10, 0x10, 0x01, 0x42, 0x70, 0x60, 0x0C, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0xA2, 0x21, 0x00, 0x8D, 0x00, 0x34,</div><div class='add'>+0x02, 0x10, 0x0C, 0x40, 0x23, 0x08, 0x9D, 0xA0, 0x04, 0x42, 0xD0, 0x08, 0x41,</div><div class='add'>+0x24, 0x00, 0x89, 0x00, 0x64, 0x02, 0x90, 0x09, 0x40, 0x22, 0x04, 0x8D, 0x00,</div><div class='add'>+0x44, 0x02, 0x90, 0x08, 0x50, 0x48, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x18, 0x20, 0x25, 0x10, 0x9D, 0x00, 0x74, 0x03, 0x90, 0x0D, 0x40,</div><div class='add'>+0x27, 0x00, 0x9D, 0x00, 0x64, 0x02, 0xD0, 0x09, 0x40, 0x24, 0x00, 0x91, 0x00,</div><div class='add'>+0x74, 0x02, 0x10, 0x09, 0x40, 0x24, 0x00, 0x8C, 0x00, 0x44, 0x02, 0x10, 0x09,</div><div class='add'>+0x40, 0x60, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x28,</div><div class='add'>+0x25, 0x00, 0x9F, 0x00, 0x3C, 0x02, 0x30, 0x09, 0xC0, 0x27, 0x00, 0x9F, 0x20,</div><div class='add'>+0x4C, 0x02, 0xF0, 0x09, 0xC0, 0x20, 0x00, 0x9B, 0x00, 0x2C, 0x02, 0xB0, 0x08,</div><div class='add'>+0xC0, 0x26, 0x00, 0x9E, 0x00, 0x4C, 0x02, 0xB0, 0x09, 0xC0, 0x14, 0x28, 0x0E,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16, 0x80, 0x25, 0x00, 0x9F, 0x00,</div><div class='add'>+0x7C, 0x02, 0xF8, 0x09, 0xC0, 0x27, 0x10, 0x9F, 0x00, 0x7C, 0x82, 0xF0, 0x09,</div><div class='add'>+0xC0, 0x27, 0x00, 0x9F, 0x00, 0x58, 0x02, 0xF0, 0x09, 0xC0, 0x27, 0x00, 0x9F,</div><div class='add'>+0x00, 0x7C, 0x02, 0xF0, 0x09, 0xC1, 0x4B, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x14, 0x08, 0x05, 0x01, 0x1F, 0x00, 0x4D, 0x10, 0xF0, 0x01,</div><div class='add'>+0xC0, 0x07, 0x04, 0x17, 0x40, 0x7C, 0x00, 0x30, 0x01, 0xC0, 0x07, 0x00, 0x17,</div><div class='add'>+0x00, 0x5C, 0x40, 0x30, 0x81, 0xC0, 0x07, 0x00, 0x17, 0x00, 0x5C, 0x90, 0x34,</div><div class='add'>+0x01, 0xC0, 0x41, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10,</div><div class='add'>+0xA0, 0xDC, 0x01, 0x5D, 0x00, 0xC4, 0x05, 0xD0, 0x87, 0x48, 0x5F, 0x04, 0x71,</div><div class='add'>+0x07, 0xF4, 0x01, 0x10, 0x07, 0x40, 0x1F, 0x02, 0x51, 0x00, 0xC0, 0x11, 0x10,</div><div class='add'>+0xB7, 0x40, 0x5F, 0x00, 0x70, 0x01, 0x84, 0x01, 0x10, 0x06, 0x40, 0x50, 0x00,</div><div class='add'>+0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xA0, 0xB2, 0x08, 0xCD,</div><div class='add'>+0x00, 0x14, 0x0A, 0xD8, 0x2C, 0x40, 0xB3, 0x00, 0xD4, 0x11, 0x34, 0x07, 0x10,</div><div class='add'>+0x1D, 0x40, 0xA3, 0x00, 0xD5, 0x00, 0x14, 0x0E, 0x14, 0x1C, 0x40, 0x63, 0x00,</div><div class='add'>+0xC4, 0x05, 0x14, 0x2B, 0x14, 0x24, 0x40, 0x51, 0x00, 0x0A, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x04, 0x80, 0x39, 0x00, 0xED, 0x01, 0x84, 0x08, 0xD1,</div><div class='add'>+0x0E, 0x40, 0x7F, 0x00, 0x61, 0x80, 0xB0, 0x0F, 0x10, 0x0E, 0x4D, 0x2F, 0x00,</div><div class='add'>+0xF1, 0x00, 0x84, 0x02, 0x10, 0x0E, 0x40, 0x6B, 0x04, 0xF5, 0x30, 0x84, 0x03,</div><div class='add'>+0x14, 0x07, 0x40, 0x04, 0x20, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x14, 0x18, 0x59, 0x00, 0xEF, 0x09, 0x9C, 0x05, 0xF1, 0x1A, 0xC0, 0x4B, 0x00,</div><div class='add'>+0xE7, 0x41, 0xFC, 0x07, 0x34, 0x16, 0xC0, 0x7B, 0x00, 0xE7, 0x77, 0x9C, 0x06,</div><div class='add'>+0x30, 0x1E, 0xC2, 0x7B, 0x00, 0x67, 0xE1, 0xDC, 0x06, 0x30, 0x16, 0x80, 0x45,</div><div class='add'>+0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xB8, 0x15, 0x00,</div><div class='add'>+0xDF, 0x00, 0x7C, 0x00, 0xF2, 0x01, 0xC4, 0x27, 0x00, 0xDF, 0x00, 0x7C, 0x00,</div><div class='add'>+0xE0, 0x05, 0xC0, 0x33, 0x00, 0xDF, 0x00, 0x7C, 0x02, 0xF0, 0x0D, 0xC4, 0x17,</div><div class='add'>+0x00, 0x5B, 0x00, 0x7C, 0x02, 0xF0, 0x05, 0xC8, 0x43, 0x20, 0x06, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x20, 0x7F, 0x22, 0xFF, 0x11, 0xF8, 0x04,</div><div class='add'>+0xF0, 0x9F, 0xC0, 0x7F, 0x00, 0xAF, 0x01, 0xDC, 0x86, 0x30, 0x9F, 0xC8, 0x6B,</div><div class='add'>+0x00, 0xFB, 0x01, 0xCC, 0x07, 0xF0, 0x1B, 0xE4, 0x6F, 0x00, 0xB3, 0x09, 0xC4,</div><div class='add'>+0x07, 0x30, 0x16, 0xC8, 0x0A, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x15, 0x00, 0x39, 0x00, 0xED, 0x04, 0xBC, 0x40, 0xD8, 0x8A, 0x40, 0x2B,</div><div class='add'>+0x01, 0x2D, 0x00, 0x84, 0x22, 0x10, 0x8A, 0x42, 0x2B, 0x00, 0xE1, 0x08, 0x84,</div><div class='add'>+0x42, 0xD0, 0x02, 0x40, 0x2B, 0x01, 0xBB, 0x0C, 0xC4, 0x13, 0xB0, 0x0E, 0x40,</div><div class='add'>+0x54, 0x60, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x02, 0x19,</div><div class='add'>+0x30, 0xED, 0x40, 0xB4, 0x01, 0xD0, 0x0A, 0x48, 0x0B, 0x80, 0xED, 0x00, 0xB4,</div><div class='add'>+0x03, 0x94, 0x86, 0x44, 0x3F, 0x04, 0xE9, 0x00, 0x84, 0x03, 0xD0, 0x8A, 0x41,</div><div class='add'>+0x2B, 0x24, 0x21, 0x40, 0xD5, 0x00, 0x11, 0x07, 0x40, 0x22, 0x00, 0x04, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x28, 0x83, 0x00, 0xCD, 0x09, 0x36,</div><div class='add'>+0x85, 0xD0, 0xA0, 0x40, 0xE3, 0x84, 0xCD, 0x0C, 0x74, 0x08, 0x90, 0x01, 0x40,</div><div class='add'>+0xD3, 0x00, 0xD1, 0x52, 0x04, 0x06, 0xD0, 0x00, 0x48, 0xD3, 0x80, 0x09, 0x03,</div><div class='add'>+0x14, 0x28, 0x90, 0xAC, 0x40, 0x18, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x1D, 0xA0, 0xE5, 0x2C, 0xFF, 0x0B, 0x7C, 0x2C, 0xF0, 0x30, 0xC0,</div><div class='add'>+0x67, 0x01, 0xDF, 0x02, 0x7C, 0x19, 0xB0, 0xD9, 0xC0, 0xA7, 0x02, 0xFB, 0x87,</div><div class='add'>+0x4F, 0x02, 0xE0, 0x2C, 0x00, 0x07, 0x02, 0xD3, 0x11, 0x5D, 0x0D, 0x31, 0x95,</div><div class='add'>+0xC0, 0x56, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x08,</div><div class='add'>+0xA7, 0x00, 0xDE, 0x60, 0x5C, 0x00, 0xF0, 0x21, 0xC0, 0x27, 0x00, 0x1F, 0x02,</div><div class='add'>+0x40, 0x01, 0x70, 0x25, 0xC0, 0x27, 0x20, 0xDF, 0x80, 0x7C, 0xCA, 0xF0, 0x09,</div><div class='add'>+0xC9, 0x07, 0x00, 0xDF, 0x52, 0x68, 0x41, 0xF0, 0x05, 0xC0, 0xA7, 0x00, 0x0C,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x81, 0x09, 0x2F, 0x14, 0xFF, 0x00,</div><div class='add'>+0xFC, 0x01, 0xF8, 0x03, 0xC1, 0x0E, 0x00, 0xFF, 0x01, 0xCC, 0x43, 0x30, 0x8B,</div><div class='add'>+0xC0, 0x6C, 0x20, 0xFF, 0x00, 0xCD, 0x06, 0xF0, 0x8F, 0xC8, 0x3C, 0x00, 0x77,</div><div class='add'>+0x05, 0xFC, 0x07, 0x34, 0x03, 0xC0, 0x15, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x89, 0x20, 0x66, 0x01, 0xDD, 0x00, 0x74, 0x08, 0xD8, 0x31,</div><div class='add'>+0x40, 0x64, 0x00, 0x8D, 0x05, 0x44, 0x08, 0x50, 0x05, 0x40, 0x34, 0x00, 0xDE,</div><div class='add'>+0x00, 0x44, 0x62, 0xD0, 0x19, 0x44, 0x90, 0x00, 0x91, 0x04, 0x74, 0x4B, 0x30,</div><div class='add'>+0x00, 0x40, 0x14, 0x02, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,</div><div class='add'>+0xA0, 0x46, 0x00, 0xDD, 0x80, 0x74, 0x00, 0xD0, 0x19, 0x00, 0x46, 0x00, 0x1D,</div><div class='add'>+0x08, 0x44, 0x08, 0x10, 0x09, 0x41, 0x25, 0x02, 0xD9, 0x00, 0x64, 0x03, 0xD0,</div><div class='add'>+0x09, 0x40, 0x84, 0x30, 0x95, 0x00, 0x30, 0x20, 0x02, 0x45, 0x40, 0x05, 0x00,</div><div class='add'>+0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x20, 0x20, 0x00, 0xCD,</div><div class='add'>+0x00, 0x34, 0x00, 0xD0, 0x08, 0x44, 0x40, 0x00, 0x0D, 0x00, 0x05, 0x00, 0x50,</div><div class='add'>+0x00, 0x50, 0x20, 0x10, 0xC5, 0x00, 0x04, 0x01, 0xD0, 0x01, 0x10, 0x04, 0x88,</div><div class='add'>+0x41, 0x00, 0x34, 0x00, 0x11, 0x0C, 0x40, 0x40, 0xA0, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x01, 0x19, 0x06, 0x00, 0xFF, 0x00, 0x7C, 0x01, 0xD0,</div><div class='add'>+0x09, 0xC0, 0x06, 0x00, 0x5F, 0x00, 0x0C, 0x03, 0x30, 0x09, 0xC0, 0x24, 0x10,</div><div class='add'>+0xED, 0x00, 0x4C, 0x03, 0xF0, 0x09, 0xC0, 0x20, 0x20, 0x17, 0x00, 0x7C, 0x00,</div><div class='add'>+0x34, 0x01, 0xC0, 0x05, 0xC0, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x05, 0xB8, 0x2D, 0x00, 0xFF, 0x00, 0xFC, 0x01, 0xF0, 0x03, 0xC0, 0x0F, 0x00,</div><div class='add'>+0x3F, 0x00, 0xFC, 0x00, 0xF0, 0x03, 0xC4, 0x1F, 0x00, 0xFF, 0x00, 0xFC, 0x01,</div><div class='add'>+0xF1, 0x03, 0xE0, 0x1F, 0x00, 0x3F, 0x00, 0xFC, 0x00, 0x70, 0x0B, 0xD0, 0x17,</div><div class='add'>+0x24, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xA8, 0x2F, 0x04,</div><div class='add'>+0xFF, 0x01, 0xEC, 0x52, 0xD0, 0x1F, 0xC0, 0x3E, 0x21, 0x2F, 0x01, 0xFC, 0x13,</div><div class='add'>+0x30, 0x0D, 0xC0, 0x57, 0x00, 0x8B, 0x21, 0xCE, 0x23, 0xB0, 0x6F, 0xC0, 0xBC,</div><div class='add'>+0x09, 0x3F, 0x04, 0xCC, 0x93, 0x33, 0x03, 0xC2, 0x0F, 0x00, 0x0E, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x08, 0x87, 0x10, 0xDD, 0x00, 0x74, 0x0E,</div><div class='add'>+0xD8, 0x1D, 0x40, 0x7F, 0x0A, 0x9D, 0x01, 0xF4, 0x2F, 0x10, 0x2F, 0x44, 0x57,</div><div class='add'>+0x10, 0x91, 0x00, 0x44, 0x33, 0x10, 0x2F, 0x40, 0xBC, 0x01, 0x5D, 0x09, 0xC4,</div><div class='add'>+0xDB, 0x10, 0x01, 0x40, 0x0F, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x13, 0xA0, 0x03, 0x05, 0xCD, 0x54, 0x34, 0x00, 0xD0, 0x0C, 0x40, 0x33,</div><div class='add'>+0x00, 0xCD, 0x01, 0x34, 0x03, 0x18, 0x2C, 0x40, 0x14, 0x00, 0xDD, 0x00, 0x15,</div><div class='add'>+0x13, 0xD0, 0x6C, 0x40, 0xB1, 0x08, 0x8D, 0x00, 0x54, 0x23, 0x10, 0x00, 0x40,</div><div class='add'>+0x4D, 0x80, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xA8, 0x45,</div><div class='add'>+0x00, 0xDD, 0x04, 0x74, 0x84, 0xD1, 0x0D, 0x40, 0x37, 0x00, 0xDC, 0x00, 0x74,</div><div class='add'>+0x03, 0x10, 0x0D, 0x40, 0x17, 0x00, 0x95, 0x00, 0x64, 0x03, 0x50, 0x0D, 0x4A,</div><div class='add'>+0x35, 0x00, 0xDD, 0x00, 0x54, 0x03, 0x10, 0x11, 0x40, 0x0F, 0x20, 0x02, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA8, 0x67, 0x00, 0xDF, 0x20, 0x6C,</div><div class='add'>+0x14, 0xD0, 0x0D, 0xC0, 0x36, 0x00, 0x5F, 0xE8, 0x7C, 0x03, 0x31, 0x0D, 0xC0,</div><div class='add'>+0x42, 0x00, 0x8B, 0x40, 0x4C, 0x03, 0xF0, 0x0D, 0x40, 0x35, 0x10, 0x4E, 0x52,</div><div class='add'>+0x1C, 0x03, 0x14, 0x19, 0xC0, 0x23, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x0F, 0x80, 0x05, 0x00, 0xFF, 0x41, 0xFC, 0x02, 0xF2, 0x2F, 0xC1,</div><div class='add'>+0x3F, 0x0C, 0x7F, 0x01, 0xB0, 0x03, 0xF0, 0x0F, 0xC0, 0x4F, 0x02, 0xB8, 0x40,</div><div class='add'>+0xD8, 0x03, 0xB0, 0x0F, 0xC0, 0x3E, 0x00, 0xFF, 0x03, 0xEC, 0x23, 0xF4, 0x03,</div><div class='add'>+0x40, 0x1F, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x08,</div><div class='add'>+0x65, 0x01, 0xD3, 0x00, 0x7C, 0x0C, 0xF0, 0x0D, 0xC8, 0x37, 0x00, 0x5B, 0x00,</div><div class='add'>+0x4C, 0x43, 0xF0, 0x8D, 0xC0, 0x97, 0x00, 0xDF, 0x08, 0x5C, 0x03, 0xF1, 0x0D,</div><div class='add'>+0xC0, 0x37, 0x00, 0x5F, 0x00, 0x5C, 0x43, 0xF0, 0x89, 0xC0, 0x2B, 0x20, 0x04,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0xA0, 0x04, 0x00, 0xD1, 0x0B,</div><div class='add'>+0x74, 0x00, 0xD0, 0x3D, 0x40, 0xBF, 0x24, 0x51, 0x0A, 0xC4, 0x1B, 0xD0, 0xBF,</div><div class='add'>+0x40, 0x17, 0x06, 0x9C, 0x00, 0xC4, 0x03, 0xD0, 0x0F, 0x04, 0x3C, 0x10, 0xDC,</div><div class='add'>+0x01, 0x40, 0x0B, 0x10, 0xB9, 0x40, 0x4F, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x03, 0x20, 0xA0, 0x00, 0xC1, 0x01, 0x24, 0x02, 0xD0, 0x1C,</div><div class='add'>+0x40, 0x33, 0x00, 0x09, 0x0B, 0x34, 0x03, 0xD0, 0x1C, 0x60, 0x83, 0x08, 0x88,</div><div class='add'>+0x01, 0x54, 0x03, 0xD0, 0x0D, 0x40, 0x30, 0x00, 0x4D, 0x13, 0x10, 0x2F, 0x50,</div><div class='add'>+0x08, 0x40, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F,</div><div class='add'>+0x00, 0x78, 0x40, 0xE1, 0x01, 0xB4, 0x07, 0xD0, 0x1E, 0x49, 0x7B, 0x00, 0xB5,</div><div class='add'>+0x09, 0xA4, 0x87, 0xD0, 0x5E, 0x40, 0x4B, 0x09, 0xAD, 0x25, 0x80, 0x07, 0xD0,</div><div class='add'>+0x1C, 0x40, 0x78, 0x00, 0xCD, 0x21, 0xC0, 0x27, 0x00, 0x12, 0x40, 0x3F, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x10, 0x10, 0x02, 0xC3,</div><div class='add'>+0x18, 0x3C, 0x23, 0xF8, 0x0C, 0xC0, 0x33, 0x01, 0x8B, 0x08, 0x2C, 0x03, 0xF0,</div><div class='add'>+0x5C, 0x80, 0x43, 0x01, 0xCF, 0x05, 0x1C, 0x03, 0xF0, 0x4C, 0xC0, 0x31, 0x00,</div><div class='add'>+0x4F, 0x10, 0x5C, 0x37, 0x70, 0x0C, 0xC0, 0x4B, 0x60, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x02, 0x38, 0x3D, 0x00, 0xFF, 0x08, 0xFC, 0x23, 0xF0,</div><div class='add'>+0x0F, 0xC8, 0x3B, 0x00, 0xFB, 0x68, 0xDC, 0x23, 0xF0, 0x2F, 0xC1, 0x0F, 0x20,</div><div class='add'>+0x9F, 0x00, 0x7C, 0x03, 0xF0, 0x0F, 0xC0, 0x3C, 0x00, 0xFF, 0x08, 0x7C, 0xAB,</div><div class='add'>+0x52, 0x0F, 0xC0, 0x0B, 0x60, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x10, 0xA8, 0x37, 0x00, 0xDF, 0x00, 0x78, 0x01, 0xF0, 0x0D, 0xC0, 0x36, 0x04,</div><div class='add'>+0x1F, 0x00, 0x4C, 0x63, 0xF0, 0x4D, 0xC8, 0x06, 0x08, 0x93, 0x00, 0x7C, 0x03,</div><div class='add'>+0xF1, 0xFD, 0xC0, 0xB6, 0x01, 0x5F, 0x01, 0x6C, 0x0A, 0x30, 0x0D, 0xC0, 0x40,</div><div class='add'>+0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0x90, 0x39, 0x00,</div><div class='add'>+0xED, 0x80, 0xB4, 0x03, 0xC1, 0x0E, 0xC0, 0x39, 0x01, 0xED, 0x00, 0x84, 0x03,</div><div class='add'>+0xD1, 0x4E, 0x42, 0x0A, 0x00, 0xA5, 0x00, 0xB4, 0x13, 0xD1, 0x0E, 0x41, 0x38,</div><div class='add'>+0x0D, 0xED, 0x00, 0x84, 0x02, 0x12, 0x06, 0xC0, 0x4E, 0x00, 0x06, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x79, 0x28, 0xED, 0x21, 0xB0, 0x07,</div><div class='add'>+0xD9, 0x1E, 0x40, 0x7B, 0x03, 0xAD, 0x01, 0xA4, 0x17, 0xD0, 0x5E, 0x40, 0x4A,</div><div class='add'>+0x08, 0xE1, 0x21, 0xB4, 0x27, 0xD0, 0x1C, 0x40, 0x7A, 0x02, 0x7D, 0x01, 0xA4,</div><div class='add'>+0x06, 0x10, 0x1C, 0x40, 0x10, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x16, 0x00, 0x37, 0x04, 0x9D, 0x41, 0x34, 0x47, 0xD0, 0x08, 0x40, 0x31,</div><div class='add'>+0x00, 0xCD, 0x08, 0x24, 0x03, 0xD0, 0x0C, 0x40, 0x62, 0x80, 0x85, 0x00, 0x34,</div><div class='add'>+0x03, 0xD0, 0x0C, 0x40, 0x30, 0x00, 0xCD, 0x03, 0x04, 0x02, 0x10, 0x2D, 0x40,</div><div class='add'>+0x5A, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x17, 0x28, 0x9F,</div><div class='add'>+0x00, 0x5D, 0x01, 0xFE, 0x1D, 0xF0, 0x15, 0xE1, 0x16, 0x00, 0x6F, 0x03, 0x6F,</div><div class='add'>+0x01, 0xF0, 0x05, 0xC0, 0x5A, 0x04, 0x53, 0x00, 0x7C, 0x01, 0xF0, 0x05, 0xC0,</div><div class='add'>+0x16, 0x00, 0x7F, 0x10, 0x6C, 0x45, 0x30, 0x47, 0xC0, 0x5C, 0x00, 0x04, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x02, 0x05, 0x00, 0x1F, 0x08, 0x7E,</div><div class='add'>+0x00, 0xF0, 0x01, 0xA0, 0x07, 0x00, 0x1F, 0x04, 0x5E, 0x00, 0xF0, 0x20, 0x08,</div><div class='add'>+0x07, 0x01, 0x1F, 0x80, 0x7C, 0x00, 0xD0, 0x01, 0xC0, 0x03, 0x20, 0x1D, 0x24,</div><div class='add'>+0x7C, 0x00, 0xF0, 0x21, 0xD8, 0x4B, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x10, 0x08, 0x65, 0x00, 0x93, 0xC1, 0x2C, 0x82, 0xE1, 0x19, 0xC0,</div><div class='add'>+0x25, 0x09, 0x9F, 0x00, 0x4C, 0x92, 0xD0, 0x19, 0xC0, 0x64, 0x10, 0x93, 0x08,</div><div class='add'>+0x3C, 0x02, 0x40, 0x09, 0xC4, 0x27, 0x00, 0x93, 0x80, 0x7C, 0x02, 0x75, 0x09,</div><div class='add'>+0xC1, 0x40, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x20,</div><div class='add'>+0x66, 0x00, 0x91, 0x81, 0x4C, 0x02, 0x10, 0x98, 0x00, 0xA5, 0x00, 0x9D, 0x18,</div><div class='add'>+0x45, 0x0A, 0xD0, 0xA9, 0x50, 0x24, 0x03, 0x95, 0x00, 0x74, 0x02, 0x13, 0x09,</div><div class='add'>+0x44, 0x27, 0x00, 0x91, 0x1B, 0x34, 0x06, 0x12, 0x69, 0x50, 0x04, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0xA0, 0x34, 0x82, 0x99, 0x08,</div><div class='add'>+0x64, 0x06, 0x10, 0x09, 0x00, 0xA4, 0x00, 0x99, 0x00, 0x54, 0x42, 0xD2, 0x09,</div><div class='add'>+0x45, 0x34, 0x00, 0x91, 0x00, 0x74, 0x02, 0x50, 0x09, 0x40, 0x27, 0x40, 0x91,</div><div class='add'>+0x00, 0x74, 0x12, 0x51, 0x0D, 0x40, 0x60, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x10, 0x22, 0x30, 0x15, 0xC1, 0x00, 0x04, 0x52, 0x12, 0x19,</div><div class='add'>+0x42, 0x21, 0x80, 0x8D, 0x40, 0x06, 0x82, 0xD0, 0x08, 0x40, 0x24, 0x00, 0x85,</div><div class='add'>+0x00, 0x34, 0x22, 0x50, 0x88, 0x40, 0x23, 0x02, 0x81, 0x00, 0x70, 0xD2, 0x10,</div><div class='add'>+0x48, 0x41, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1D,</div><div class='add'>+0x38, 0x07, 0x01, 0x1B, 0x00, 0x6C, 0x10, 0x70, 0x01, 0xC0, 0x05, 0x05, 0x1B,</div><div class='add'>+0x40, 0x48, 0xD0, 0xF0, 0xE1, 0xC1, 0x04, 0x00, 0x53, 0x0A, 0x7C, 0x58, 0x71,</div><div class='add'>+0x61, 0xC1, 0x87, 0x05, 0x13, 0x14, 0x38, 0x11, 0x70, 0x41, 0xC0, 0x74, 0xE0,</div><div class='add'>+0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xB0, 0x2D, 0x45, 0xBF,</div><div class='add'>+0x14, 0xDC, 0x02, 0xB4, 0x0B, 0xC0, 0x27, 0x00, 0xAC, 0x00, 0x7C, 0x02, 0xF0,</div><div class='add'>+0x19, 0xC0, 0x2B, 0x08, 0xBF, 0x01, 0x7C, 0x12, 0xB1, 0x49, 0xC0, 0x27, 0x11,</div><div class='add'>+0xAF, 0x00, 0xFC, 0x52, 0xF0, 0x4B, 0xC1, 0x77, 0x60, 0x0E, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x1D, 0xA0, 0xBF, 0x00, 0xB3, 0x00, 0xFC, 0x52, 0xF0,</div><div class='add'>+0x0B, 0xC0, 0x2D, 0x05, 0xB3, 0x00, 0xCC, 0x02, 0xF0, 0x0B, 0xC0, 0x2C, 0x00,</div><div class='add'>+0xBF, 0x80, 0x6C, 0x02, 0x10, 0x09, 0xC0, 0x24, 0x00, 0xBF, 0x00, 0xCC, 0x02,</div><div class='add'>+0x32, 0x0B, 0xD0, 0x74, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x18, 0x00, 0x87, 0x00, 0x1B, 0xA4, 0x74, 0x08, 0xD0, 0x01, 0x40, 0x84, 0x48,</div><div class='add'>+0x11, 0x20, 0x44, 0x00, 0xD2, 0xA1, 0x40, 0x05, 0x00, 0x1D, 0x00, 0x40, 0x90,</div><div class='add'>+0x10, 0x41, 0x40, 0x04, 0x01, 0x1D, 0x00, 0x44, 0x00, 0x10, 0x01, 0x40, 0x60,</div><div class='add'>+0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0xA0, 0xA1, 0x21,</div><div class='add'>+0x81, 0x10, 0x30, 0x02, 0xD0, 0x08, 0x40, 0x21, 0x00, 0xD5, 0x00, 0x04, 0x0B,</div><div class='add'>+0xD0, 0x0D, 0x40, 0x20, 0x00, 0x8D, 0x80, 0x30, 0x4A, 0x11, 0x28, 0x41, 0xA2,</div><div class='add'>+0x04, 0x8D, 0x00, 0x05, 0x82, 0x14, 0x08, 0x40, 0x49, 0x00, 0x04, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x28, 0x25, 0x00, 0x99, 0x04, 0x74, 0x02,</div><div class='add'>+0xD0, 0x49, 0x40, 0x26, 0x08, 0x95, 0x00, 0x44, 0x02, 0xC0, 0x09, 0x40, 0x25,</div><div class='add'>+0x0D, 0x9D, 0x80, 0x14, 0x02, 0x10, 0x08, 0x46, 0x26, 0x00, 0x9D, 0x10, 0x44,</div><div class='add'>+0x02, 0x10, 0x0D, 0x40, 0x60, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x05, 0x20, 0xE5, 0x06, 0x93, 0x40, 0x78, 0x1A, 0xD1, 0x09, 0xC0, 0x25,</div><div class='add'>+0x00, 0x97, 0x0F, 0x45, 0x02, 0xF0, 0x09, 0xC0, 0xA4, 0x00, 0x8F, 0x81, 0x7E,</div><div class='add'>+0x02, 0x34, 0x09, 0xD0, 0x26, 0x00, 0x9F, 0x00, 0x4C, 0x02, 0x30, 0x49, 0xC0,</div><div class='add'>+0x15, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16, 0x08, 0x24,</div><div class='add'>+0x00, 0x9F, 0xC0, 0x7C, 0x12, 0xF0, 0x09, 0xC8, 0x25, 0x00, 0x9B, 0x00, 0x7C,</div><div class='add'>+0x02, 0xF0, 0x09, 0xC0, 0x67, 0x00, 0x9F, 0x05, 0x6C, 0x02, 0xF0, 0x09, 0xC0,</div><div class='add'>+0x25, 0x00, 0x9F, 0x40, 0x7C, 0x02, 0xF0, 0x49, 0xC1, 0x5B, 0x20, 0x04, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x08, 0x05, 0x00, 0x1F, 0x10, 0x78,</div><div class='add'>+0x08, 0xF0, 0x01, 0xC1, 0x01, 0x04, 0x1F, 0x04, 0x7C, 0x90, 0xB0, 0x01, 0xC0,</div><div class='add'>+0x84, 0x00, 0x1F, 0x10, 0x4C, 0x00, 0xF1, 0x01, 0xC0, 0x07, 0x10, 0x07, 0x10,</div><div class='add'>+0x3C, 0x04, 0x30, 0x21, 0xC0, 0x50, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x10, 0x20, 0xDC, 0x01, 0x7D, 0x07, 0x74, 0x01, 0x10, 0x26, 0x40,</div><div class='add'>+0x1F, 0x19, 0x6D, 0x00, 0xF4, 0x09, 0x10, 0x07, 0x40, 0xDC, 0x02, 0x7D, 0x03,</div><div class='add'>+0x44, 0x01, 0xD0, 0x05, 0x40, 0x17, 0x00, 0x71, 0x45, 0xF4, 0x41, 0x11, 0x27,</div><div class='add'>+0x40, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xA0,</div><div class='add'>+0xF6, 0x01, 0xCD, 0x03, 0x34, 0x22, 0x58, 0x2C, 0x48, 0x73, 0x00, 0xCC, 0x00,</div><div class='add'>+0x34, 0x03, 0xD0, 0x0D, 0x40, 0x30, 0x00, 0xCD, 0x0A, 0x32, 0x03, 0xD0, 0x0C,</div><div class='add'>+0x40, 0x33, 0x80, 0xC5, 0x00, 0x34, 0x04, 0x90, 0xAD, 0x40, 0x40, 0x00, 0x0A,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x80, 0x38, 0x00, 0x6D, 0x00,</div><div class='add'>+0xB4, 0x07, 0x5A, 0x2A, 0x40, 0x3B, 0x00, 0xED, 0x00, 0xB0, 0x07, 0x52, 0x0A,</div><div class='add'>+0x40, 0x98, 0x00, 0xED, 0x00, 0x84, 0x13, 0xD0, 0x4E, 0x40, 0x7B, 0x81, 0xE1,</div><div class='add'>+0x00, 0xB4, 0x02, 0x90, 0x04, 0x44, 0x10, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x14, 0x18, 0x79, 0x08, 0xEF, 0x01, 0xBC, 0x87, 0x70, 0x1E,</div><div class='add'>+0xC0, 0x5B, 0x00, 0xEE, 0x01, 0xBC, 0x06, 0xF0, 0x1F, 0xC0, 0x78, 0x00, 0xBF,</div><div class='add'>+0x01, 0x9C, 0x07, 0xF0, 0xBE, 0xC4, 0x7F, 0x21, 0xE7, 0x01, 0xFC, 0x04, 0xB0,</div><div class='add'>+0x1E, 0xD0, 0x50, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10,</div><div class='add'>+0xB2, 0x35, 0x00, 0x5F, 0x60, 0x3C, 0x03, 0x38, 0x01, 0xC8, 0x07, 0x00, 0xDF,</div><div class='add'>+0x00, 0x3C, 0x00, 0xB0, 0x05, 0xC0, 0x37, 0x00, 0x9F, 0x20, 0x7C, 0x2B, 0xF0,</div><div class='add'>+0x6D, 0xC8, 0xB7, 0x20, 0x9D, 0x00, 0x7C, 0x82, 0x71, 0x05, 0xC0, 0x43, 0x60,</div><div class='add'>+0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x28, 0x7D, 0x02, 0xFF,</div><div class='add'>+0x81, 0xCC, 0x17, 0x71, 0x17, 0xC0, 0x6F, 0x02, 0xFF, 0x81, 0xFC, 0x85, 0xF0,</div><div class='add'>+0x9F, 0x40, 0x78, 0x02, 0xB3, 0x29, 0xFE, 0x2F, 0xB0, 0x1F, 0xE0, 0xFF, 0x04,</div><div class='add'>+0x73, 0x09, 0xFC, 0x27, 0xF1, 0x5F, 0xC0, 0x1B, 0x00, 0x04, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x15, 0x00, 0x19, 0x26, 0x6D, 0x08, 0xAC, 0x83, 0xD0,</div><div class='add'>+0x22, 0x40, 0x8B, 0x00, 0x2D, 0x00, 0xB4, 0x08, 0xD0, 0x1A, 0x40, 0x98, 0x00,</div><div class='add'>+0xA1, 0x01, 0xB4, 0x03, 0xD0, 0x0E, 0xC0, 0x39, 0x01, 0xEB, 0x00, 0x34, 0x07,</div><div class='add'>+0xD0, 0x0A, 0x40, 0x57, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x48, 0x08, 0x39, 0x18, 0xFD, 0x00, 0xA4, 0x13, 0xD0, 0x02, 0x40, 0x0B, 0x00,</div><div class='add'>+0xED, 0x10, 0xB4, 0x20, 0xD0, 0x0E, 0x40, 0x2B, 0x40, 0x21, 0x00, 0xB4, 0x83,</div><div class='add'>+0x91, 0x0E, 0x40, 0x39, 0x10, 0x61, 0x10, 0xB4, 0x02, 0xD0, 0x4E, 0x40, 0x23,</div><div class='add'>+0x02, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x28, 0x21, 0x00,</div><div class='add'>+0x1D, 0x01, 0x26, 0x07, 0xD0, 0x00, 0x40, 0x03, 0x00, 0x0D, 0x03, 0x34, 0x80,</div><div class='add'>+0xD0, 0x00, 0x40, 0xA3, 0x00, 0x01, 0x01, 0x34, 0x03, 0xD0, 0x0C, 0x48, 0x31,</div><div class='add'>+0x80, 0x85, 0x00, 0x34, 0x81, 0xD0, 0x29, 0x40, 0x0B, 0x20, 0x04, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x88, 0x04, 0x00, 0x9F, 0x01, 0x64, 0x0B,</div><div class='add'>+0x71, 0x09, 0xC0, 0x27, 0x90, 0x1F, 0x03, 0x7C, 0x02, 0xF0, 0x01, 0xC0, 0x27,</div><div class='add'>+0x20, 0xD3, 0x11, 0xFC, 0x03, 0xB0, 0x0F, 0xC0, 0x3D, 0x00, 0x81, 0x01, 0x7C,</div><div class='add'>+0x01, 0xD0, 0x29, 0xC0, 0x57, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x0D, 0x00, 0x87, 0x01, 0x9F, 0x08, 0x7C, 0x23, 0xF0, 0x19, 0xC0, 0x27,</div><div class='add'>+0x00, 0x1F, 0x32, 0x3E, 0x0A, 0xF0, 0x01, 0x40, 0x14, 0xA1, 0x9F, 0x00, 0x70,</div><div class='add'>+0x03, 0xD0, 0x0D, 0xC8, 0x35, 0x40, 0x9B, 0x10, 0x74, 0x01, 0xE0, 0x21, 0xC0,</div><div class='add'>+0x37, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x08, 0x0B,</div><div class='add'>+0x00, 0xBB, 0x00, 0x8C, 0x43, 0xB0, 0x0B, 0xC4, 0x2B, 0x00, 0xF3, 0x00, 0xFC,</div><div class='add'>+0x02, 0x32, 0x01, 0xC4, 0x2F, 0x01, 0xBF, 0x40, 0xEC, 0x03, 0xF0, 0x0F, 0xC4,</div><div class='add'>+0x3B, 0x00, 0x37, 0x05, 0x94, 0x81, 0x33, 0x03, 0x81, 0x04, 0x28, 0x0C, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x81, 0x20, 0xC6, 0x21, 0x91, 0x07, 0x44,</div><div class='add'>+0x83, 0xB0, 0x31, 0x40, 0xE7, 0x00, 0xD1, 0x06, 0x74, 0x04, 0x10, 0x31, 0x48,</div><div class='add'>+0x77, 0x10, 0x9C, 0x01, 0x74, 0x03, 0x71, 0x0D, 0x40, 0x37, 0x00, 0x11, 0x32,</div><div class='add'>+0x44, 0x0B, 0x10, 0x31, 0x40, 0x85, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x01, 0xA0, 0x64, 0x00, 0x19, 0x01, 0x54, 0x07, 0x90, 0x19, 0x00,</div><div class='add'>+0x66, 0x00, 0x11, 0x01, 0x74, 0x06, 0x10, 0x13, 0x41, 0x07, 0x00, 0xB9, 0x01,</div><div class='add'>+0x74, 0x03, 0xD0, 0x0D, 0x40, 0x37, 0x00, 0x55, 0x00, 0x54, 0x47, 0x50, 0x19,</div><div class='add'>+0x40, 0x05, 0x08, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x20,</div><div class='add'>+0x00, 0x00, 0x01, 0x20, 0x14, 0x03, 0x90, 0x08, 0x62, 0x03, 0x00, 0x00, 0x00,</div><div class='add'>+0x34, 0x02, 0x14, 0x40, 0x40, 0x13, 0x00, 0x8D, 0x04, 0x34, 0x03, 0x50, 0x0C,</div><div class='add'>+0x40, 0x33, 0x08, 0xC1, 0x00, 0x14, 0x20, 0x10, 0x08, 0x42, 0x41, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xA0, 0x26, 0x08, 0x9B, 0x00,</div><div class='add'>+0x5E, 0x03, 0xB1, 0x09, 0xC0, 0x27, 0x40, 0xD1, 0x00, 0x7C, 0x02, 0x30, 0x41,</div><div class='add'>+0xC0, 0x07, 0x10, 0x1F, 0x1C, 0xEC, 0x03, 0xF1, 0x0F, 0xE4, 0x3B, 0x00, 0x57,</div><div class='add'>+0x00, 0x5C, 0x12, 0x34, 0x01, 0xC0, 0x05, 0x60, 0x08, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x45, 0xA8, 0x2F, 0x00, 0xAF, 0x00, 0xEC, 0x03, 0x70, 0x03,</div><div class='add'>+0xC0, 0x0F, 0x00, 0x3F, 0x00, 0xFC, 0x00, 0xF0, 0xC1, 0xC1, 0x0F, 0x04, 0x1F,</div><div class='add'>+0x04, 0xFC, 0x03, 0x72, 0x0F, 0xC4, 0x3F, 0x00, 0x3F, 0x00, 0x6C, 0x30, 0xF0,</div><div class='add'>+0x03, 0xC4, 0x17, 0x62, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03,</div><div class='add'>+0xA0, 0x2D, 0x11, 0xBF, 0x00, 0xFC, 0x13, 0xB2, 0x93, 0xC8, 0x3D, 0x11, 0x13,</div><div class='add'>+0x08, 0xDC, 0x22, 0x32, 0x4F, 0xC8, 0x0F, 0x20, 0x7B, 0x41, 0xEC, 0x03, 0xF0,</div><div class='add'>+0x17, 0xC0, 0x3C, 0x00, 0xBF, 0x01, 0xEC, 0x00, 0x30, 0x03, 0xC4, 0x0C, 0x00,</div><div class='add'>+0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x47, 0x02, 0x9C,</div><div class='add'>+0x8C, 0xF4, 0x27, 0x04, 0x09, 0x4C, 0x7D, 0x22, 0x1D, 0x04, 0x74, 0x12, 0x50,</div><div class='add'>+0xAF, 0x42, 0x07, 0x00, 0x99, 0x81, 0x44, 0x0B, 0xD0, 0x09, 0x40, 0x3C, 0x10,</div><div class='add'>+0x9D, 0x40, 0x44, 0x00, 0x10, 0x11, 0x40, 0x0C, 0x00, 0x0C, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x13, 0x20, 0x21, 0x08, 0x0D, 0x50, 0x34, 0x03, 0x18,</div><div class='add'>+0x51, 0x44, 0x31, 0x00, 0x0D, 0x20, 0x74, 0x02, 0x10, 0x0C, 0x64, 0x01, 0x00,</div><div class='add'>+0x89, 0x00, 0x24, 0x0B, 0xD0, 0x01, 0x50, 0x30, 0x00, 0x9D, 0x00, 0x24, 0x00,</div><div class='add'>+0x10, 0x00, 0x40, 0x4C, 0x80, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x03, 0xA8, 0x47, 0x80, 0x1D, 0x51, 0x74, 0x03, 0x10, 0x11, 0x40, 0x35, 0x00,</div><div class='add'>+0x3D, 0x02, 0xF4, 0x02, 0x50, 0x0D, 0x00, 0x4F, 0x08, 0x89, 0x08, 0x44, 0x03,</div><div class='add'>+0xD2, 0x19, 0x00, 0x3C, 0x00, 0x9D, 0x01, 0x44, 0x04, 0x10, 0x11, 0x42, 0x0C,</div><div class='add'>+0xA0, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA0, 0x67, 0x00,</div><div class='add'>+0x9F, 0x03, 0x7C, 0x03, 0x30, 0x18, 0xCC, 0x35, 0x18, 0x1B, 0x01, 0x5E, 0x06,</div><div class='add'>+0x20, 0x0D, 0xC0, 0xC7, 0x00, 0xDB, 0x00, 0x6C, 0x03, 0xF0, 0x1C, 0xC0, 0x34,</div><div class='add'>+0x20, 0xCF, 0x01, 0x6C, 0x84, 0x30, 0x11, 0xC0, 0x00, 0x00, 0x0E, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x88, 0x2D, 0x00, 0xBF, 0x80, 0xBC, 0x03,</div><div class='add'>+0xF0, 0x0B, 0xC0, 0x3E, 0x80, 0x1D, 0x03, 0xFC, 0x26, 0xF0, 0x0F, 0xC0, 0x2F,</div><div class='add'>+0x00, 0xBF, 0x01, 0xFC, 0x03, 0xF2, 0x0B, 0xC0, 0x3F, 0x00, 0xFF, 0x00, 0xFC,</div><div class='add'>+0x00, 0xF4, 0x09, 0xD0, 0x1F, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x02, 0x08, 0x25, 0x18, 0x93, 0x01, 0x7C, 0xA3, 0xF0, 0x01, 0xC0, 0x77,</div><div class='add'>+0x00, 0x1B, 0x02, 0x4C, 0x42, 0xF0, 0x0D, 0xC0, 0x87, 0x00, 0x9F, 0x00, 0x7C,</div><div class='add'>+0x03, 0x30, 0x09, 0x80, 0x37, 0x00, 0x5F, 0x00, 0x7C, 0x00, 0x30, 0x01, 0xC1,</div><div class='add'>+0x08, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xA0, 0x64,</div><div class='add'>+0x04, 0x91, 0x02, 0xF4, 0x2F, 0xD0, 0x01, 0x40, 0xBF, 0x00, 0x11, 0x80, 0x45,</div><div class='add'>+0x47, 0xD1, 0x0F, 0x44, 0x27, 0x00, 0x9D, 0x00, 0xF4, 0x03, 0x10, 0x09, 0x40,</div><div class='add'>+0x3F, 0x00, 0x5D, 0x00, 0x34, 0x44, 0x10, 0x38, 0x58, 0x6C, 0x00, 0x02, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0x20, 0x00, 0x60, 0x08, 0x30, 0x36,</div><div class='add'>+0x0F, 0xD8, 0x00, 0x40, 0x33, 0x01, 0x09, 0x00, 0x50, 0x0E, 0xD0, 0x9C, 0x22,</div><div class='add'>+0x43, 0x02, 0x4C, 0x80, 0x34, 0x03, 0x10, 0x00, 0x40, 0x33, 0x00, 0xCD, 0x06,</div><div class='add'>+0x34, 0x00, 0x14, 0xA0, 0x40, 0x4C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x0F, 0x00, 0x58, 0x02, 0xE9, 0x81, 0xB4, 0x07, 0xD0, 0x1A, 0x40,</div><div class='add'>+0x7B, 0x00, 0x21, 0x09, 0x84, 0x06, 0xD1, 0x9E, 0x40, 0x5B, 0x00, 0xAD, 0x01,</div><div class='add'>+0xB4, 0x07, 0x10, 0x1A, 0x40, 0x7B, 0x00, 0xED, 0x41, 0xB4, 0x07, 0x18, 0x9A,</div><div class='add'>+0x40, 0x3C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x1A,</div><div class='add'>+0x30, 0x00, 0x4B, 0x08, 0x3C, 0x03, 0xF0, 0x80, 0xC0, 0x33, 0x00, 0x0B, 0x05,</div><div class='add'>+0x0C, 0x02, 0xF0, 0x0C, 0xC0, 0x43, 0x01, 0xCF, 0x00, 0x7C, 0x23, 0x34, 0x00,</div><div class='add'>+0x40, 0x33, 0x00, 0xCF, 0x00, 0x3C, 0x01, 0x30, 0x04, 0xC8, 0x48, 0x68, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x30, 0x19, 0x00, 0xF0, 0x60,</div><div class='add'>+0xFC, 0x63, 0xF0, 0x0F, 0xC0, 0x3B, 0x02, 0xFF, 0x08, 0xF0, 0x23, 0xF0, 0x0F,</div><div class='add'>+0xC4, 0x1F, 0x02, 0xBF, 0x00, 0xFC, 0x83, 0xF0, 0x0B, 0xC0, 0xBF, 0x10, 0xFF,</div><div class='add'>+0x00, 0xBC, 0x03, 0xF1, 0x0D, 0xC0, 0x0B, 0x60, 0x04, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x10, 0xA0, 0x17, 0x10, 0x53, 0x00, 0x74, 0x5F, 0x34, 0x09,</div><div class='add'>+0xC0, 0x37, 0x00, 0x1F, 0x00, 0x4C, 0x02, 0x31, 0x9D, 0x80, 0x74, 0x00, 0xD3,</div><div class='add'>+0x00, 0x7C, 0x03, 0xF0, 0x0D, 0xC0, 0xB7, 0x82, 0xCF, 0x00, 0x2C, 0x02, 0x30,</div><div class='add'>+0x15, 0xD0, 0x40, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13,</div><div class='add'>+0x8A, 0x39, 0x00, 0xE1, 0x00, 0x34, 0x13, 0x10, 0x0A, 0x40, 0xBB, 0x03, 0x8D,</div><div class='add'>+0x80, 0x84, 0x02, 0x12, 0x8C, 0x42, 0x3C, 0x08, 0xA1, 0x00, 0xB4, 0x13, 0xD0,</div><div class='add'>+0x0A, 0x40, 0x3A, 0x80, 0xED, 0x00, 0x84, 0x03, 0x10, 0x0E, 0x40, 0x4C, 0x00,</div><div class='add'>+0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x79, 0x40, 0x69,</div><div class='add'>+0x01, 0xB4, 0x17, 0xD0, 0x1E, 0x40, 0x7B, 0x00, 0x6D, 0x11, 0x94, 0x46, 0x90,</div><div class='add'>+0x5E, 0x40, 0x68, 0x00, 0xE1, 0x01, 0xB4, 0x37, 0x90, 0x1E, 0x40, 0x7B, 0x00,</div><div class='add'>+0x7D, 0x61, 0xA4, 0x07, 0x14, 0x14, 0x40, 0x10, 0x00, 0x04, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x16, 0x28, 0xB3, 0x00, 0xC9, 0x01, 0x34, 0x03, 0x50,</div><div class='add'>+0x8C, 0x40, 0x33, 0x00, 0xCD, 0xC3, 0x54, 0x07, 0x90, 0x0C, 0x50, 0x70, 0x01,</div><div class='add'>+0x81, 0x00, 0x34, 0x03, 0xD0, 0x48, 0x40, 0x36, 0x00, 0x4D, 0x09, 0x04, 0x03,</div><div class='add'>+0x10, 0x1C, 0x41, 0x58, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x17, 0xA0, 0x1F, 0x20, 0x7B, 0x85, 0x7C, 0x01, 0x78, 0x17, 0xC6, 0x17, 0x08,</div><div class='add'>+0x7F, 0x03, 0x5C, 0x05, 0xB6, 0x05, 0xC0, 0x5C, 0x01, 0x73, 0x02, 0x7C, 0x01,</div><div class='add'>+0xB0, 0x37, 0xC1, 0x17, 0x00, 0x7F, 0x09, 0xAC, 0x01, 0x30, 0x77, 0xC0, 0x5C,</div><div class='add'>+0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x88, 0x05, 0x24,</div><div class='add'>+0x17, 0x46, 0x7C, 0x00, 0xA0, 0x01, 0xE0, 0x83, 0x20, 0x1E, 0xA0, 0x6C, 0x00,</div><div class='add'>+0x70, 0x01, 0xC0, 0x87, 0x00, 0x1F, 0x04, 0x7C, 0x00, 0xF0, 0x01, 0xC0, 0x06,</div><div class='add'>+0x00, 0x1F, 0x02, 0x7C, 0x04, 0xF0, 0x01, 0xC0, 0x4B, 0x20, 0x04, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x08, 0xA1, 0x00, 0x93, 0x08, 0x7C, 0x86,</div><div class='add'>+0xF0, 0x09, 0xC1, 0x25, 0x08, 0x93, 0x10, 0x4C, 0x02, 0x30, 0x09, 0xC0, 0x67,</div><div class='add'>+0x00, 0x9F, 0x00, 0x4C, 0x02, 0xF0, 0x09, 0xC0, 0x27, 0x00, 0x93, 0x00, 0x48,</div><div class='add'>+0x16, 0x30, 0x49, 0xC0, 0x43, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x01, 0x20, 0x26, 0x00, 0x95, 0x03, 0x74, 0x66, 0xD0, 0x09, 0x40, 0x27,</div><div class='add'>+0x20, 0x91, 0x00, 0x44, 0x0A, 0x10, 0x39, 0x44, 0xA7, 0x02, 0x8D, 0x20, 0x44,</div><div class='add'>+0x02, 0xD0, 0x09, 0x40, 0x27, 0x00, 0x85, 0x40, 0x44, 0x42, 0x10, 0x49, 0x40,</div><div class='add'>+0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0xA0, 0x34,</div><div class='add'>+0x00, 0x91, 0x82, 0x74, 0x82, 0xD0, 0x09, 0x40, 0x67, 0x00, 0x81, 0x00, 0x54,</div><div class='add'>+0x0A, 0x10, 0x49, 0x49, 0xB7, 0x00, 0x9D, 0x00, 0x44, 0x02, 0xD0, 0x09, 0x40,</div><div class='add'>+0x27, 0x00, 0x91, 0x00, 0x55, 0x03, 0x10, 0x0D, 0x40, 0x63, 0x00, 0x02, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x20, 0x30, 0xA5, 0x85, 0x14, 0x34,</div><div class='add'>+0x82, 0xD0, 0x88, 0x40, 0x33, 0x60, 0x81, 0x4C, 0x04, 0x32, 0x18, 0x08, 0x40,</div><div class='add'>+0x23, 0x01, 0x9D, 0x02, 0x04, 0x02, 0xD0, 0x08, 0x40, 0x23, 0x01, 0x85, 0x00,</div><div class='add'>+0x14, 0xD2, 0x10, 0x48, 0x41, 0x43, 0x80, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x1D, 0xB0, 0x07, 0x01, 0x13, 0x24, 0x7C, 0x50, 0xF0, 0x21, 0xC4,</div><div class='add'>+0x05, 0x05, 0x13, 0x03, 0x09, 0x0C, 0x30, 0xE1, 0xC1, 0xC7, 0x02, 0x1F, 0x00,</div><div class='add'>+0x4D, 0x78, 0xF0, 0xA1, 0xC8, 0xC7, 0x0A, 0x53, 0x00, 0x5C, 0x10, 0x32, 0x41,</div><div class='add'>+0xC0, 0x77, 0xE0, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xB8,</div><div class='add'>+0x2B, 0x00, 0xBF, 0x14, 0x7C, 0x02, 0xF0, 0x4B, 0xC0, 0x27, 0x00, 0xBF, 0x0C,</div><div class='add'>+0xFC, 0x32, 0xF4, 0x19, 0xC2, 0x6F, 0x02, 0xBD, 0x01, 0x7C, 0x06, 0xF0, 0x1B,</div><div class='add'>+0xC0, 0x67, 0x02, 0xFF, 0x14, 0xE4, 0x52, 0xF4, 0x0B, 0xC0, 0x77, 0x40, 0x0E,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xA8, 0x7F, 0x04, 0xBF, 0x02,</div><div class='add'>+0xFC, 0x02, 0xF0, 0x29, 0xC0, 0x2D, 0x20, 0x9F, 0x00, 0xFC, 0x0A, 0x30, 0x4B,</div><div class='add'>+0xC0, 0x2C, 0x00, 0x93, 0x02, 0x7C, 0x02, 0x30, 0x09, 0xC0, 0x24, 0x00, 0xB3,</div><div class='add'>+0x00, 0xFC, 0x0A, 0x30, 0x0B, 0xC0, 0x74, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x18, 0x08, 0x17, 0x00, 0x1D, 0x02, 0x74, 0x28, 0xD0, 0x00,</div><div class='add'>+0x48, 0x87, 0x02, 0x1D, 0x04, 0x5C, 0x10, 0x14, 0xA1, 0x50, 0x04, 0x00, 0x15,</div><div class='add'>+0x01, 0x74, 0x28, 0x10, 0x01, 0x40, 0x05, 0x00, 0x1B, 0x00, 0x74, 0x10, 0x10,</div><div class='add'>+0x01, 0xC0, 0x62, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12,</div><div class='add'>+0x00, 0x21, 0x20, 0x8D, 0x86, 0x34, 0x02, 0xC0, 0x08, 0x40, 0x23, 0x00, 0x8D,</div><div class='add'>+0x10, 0x30, 0x12, 0x18, 0x08, 0x40, 0x24, 0x00, 0x81, 0x01, 0x34, 0x02, 0x14,</div><div class='add'>+0x08, 0x40, 0x20, 0x00, 0x81, 0x00, 0x34, 0x13, 0x10, 0x08, 0x44, 0x48, 0x00,</div><div class='add'>+0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x28, 0x25, 0x00, 0xDD,</div><div class='add'>+0x0A, 0x74, 0x02, 0xC0, 0x09, 0x40, 0x37, 0x00, 0x9D, 0x02, 0x14, 0x22, 0x10,</div><div class='add'>+0x09, 0x40, 0x24, 0x00, 0x95, 0x01, 0x34, 0x02, 0x10, 0x49, 0x44, 0x25, 0x00,</div><div class='add'>+0x99, 0x00, 0x34, 0x06, 0x14, 0x49, 0x40, 0x62, 0x20, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x05, 0x0A, 0x25, 0x10, 0x9F, 0x00, 0x7C, 0x02, 0xE0,</div><div class='add'>+0x29, 0xC1, 0x27, 0x00, 0x9F, 0x02, 0x7C, 0x02, 0x30, 0x08, 0xC6, 0x64, 0x02,</div><div class='add'>+0xB3, 0x00, 0x7C, 0x02, 0x30, 0x09, 0xC0, 0x24, 0x00, 0x93, 0x02, 0x7C, 0x06,</div><div class='add'>+0x30, 0x09, 0xC0, 0x14, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x16, 0x00, 0xA5, 0x20, 0x9F, 0x21, 0x7C, 0x02, 0xF0, 0x39, 0xC0, 0x27, 0x04,</div><div class='add'>+0x9F, 0x04, 0x7C, 0x02, 0xF0, 0x09, 0x40, 0x67, 0x00, 0x9F, 0x00, 0x7C, 0x02,</div><div class='add'>+0xF2, 0x19, 0xC0, 0x23, 0x00, 0x9F, 0x00, 0x7C, 0x02, 0xF2, 0x08, 0xC0, 0x5B,</div><div class='add'>+0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x08, 0x05, 0x00,</div><div class='add'>+0x1F, 0x04, 0x6C, 0x00, 0x70, 0x21, 0xC0, 0x04, 0x02, 0x1F, 0x02, 0x7C, 0x00,</div><div class='add'>+0x31, 0x01, 0xC0, 0x04, 0x00, 0x13, 0x40, 0x4C, 0x00, 0xF0, 0x01, 0xC0, 0x07,</div><div class='add'>+0x08, 0x13, 0x0A, 0x7C, 0x04, 0x30, 0xC1, 0xC0, 0x53, 0x20, 0x04, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x20, 0xDC, 0x0E, 0x7D, 0x06, 0xF4, 0x41,</div><div class='add'>+0x10, 0x05, 0x80, 0x5E, 0x00, 0x5D, 0x60, 0xF4, 0x6D, 0x10, 0x37, 0x40, 0x1C,</div><div class='add'>+0x00, 0x51, 0x00, 0x6C, 0x01, 0xD0, 0x05, 0x40, 0x17, 0x00, 0x75, 0x40, 0xF4,</div><div class='add'>+0x01, 0x10, 0x17, 0x40, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x10, 0xA0, 0xE2, 0x00, 0xCD, 0x41, 0x24, 0x17, 0x80, 0x0C, 0x58, 0xF0,</div><div class='add'>+0x20, 0xCD, 0x00, 0x34, 0x0F, 0x90, 0x2C, 0x41, 0x74, 0x04, 0xC1, 0x00, 0x04,</div><div class='add'>+0x03, 0xD1, 0x0D, 0x40, 0x33, 0x00, 0x81, 0x10, 0x34, 0x03, 0x10, 0x2C, 0x40,</div><div class='add'>+0x43, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x88, 0x29,</div><div class='add'>+0x80, 0xED, 0x80, 0xB4, 0x07, 0x94, 0xDE, 0x40, 0x28, 0x20, 0xEC, 0x08, 0x34,</div><div class='add'>+0x03, 0x90, 0x2C, 0x50, 0x20, 0x04, 0xF1, 0x45, 0xA4, 0x23, 0xD0, 0x0E, 0x40,</div><div class='add'>+0x3B, 0x00, 0x25, 0x00, 0x34, 0x03, 0x12, 0x0A, 0x40, 0x13, 0x00, 0x02, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x10, 0x79, 0x00, 0xEF, 0x01, 0xAC,</div><div class='add'>+0x05, 0xB1, 0x5E, 0x41, 0x78, 0x00, 0xEF, 0x05, 0xBC, 0x05, 0xB0, 0x1A, 0xC0,</div><div class='add'>+0x78, 0x00, 0xF3, 0x43, 0x8C, 0x57, 0xF0, 0x1E, 0xC3, 0x73, 0x00, 0xA3, 0x01,</div><div class='add'>+0xBC, 0x07, 0x34, 0x12, 0xC0, 0x53, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x10, 0xA8, 0x35, 0x00, 0x5F, 0x40, 0x3C, 0x00, 0x31, 0x4D, 0xC8,</div><div class='add'>+0x27, 0x08, 0xDF, 0x10, 0x7C, 0x01, 0x70, 0x09, 0xC8, 0x37, 0x40, 0xDF, 0x00,</div><div class='add'>+0x7C, 0x13, 0xF0, 0xCD, 0xC0, 0xB7, 0x02, 0x1F, 0x00, 0x7C, 0x03, 0xB4, 0x09,</div><div class='add'>+0xC0, 0x43, 0x60, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x20,</div><div class='add'>+0x6D, 0x00, 0xFF, 0x01, 0xCC, 0x06, 0xF0, 0x9F, 0xC0, 0x5F, 0x02, 0xFF, 0x09,</div><div class='add'>+0xCC, 0x27, 0xF0, 0x1B, 0xC0, 0x7D, 0x00, 0xEF, 0x41, 0xCC, 0x87, 0x70, 0x1F,</div><div class='add'>+0xC0, 0xFC, 0x00, 0xE3, 0x01, 0xCC, 0x07, 0x30, 0x1F, 0xC8, 0x1B, 0x00, 0x04,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x00, 0x29, 0x20, 0xFD, 0x00,</div><div class='add'>+0xAC, 0x1A, 0xD2, 0xCE, 0x40, 0x2B, 0x00, 0xFD, 0x00, 0x84, 0x04, 0xD0, 0x0F,</div><div class='add'>+0xC0, 0x20, 0x01, 0xED, 0x25, 0xC4, 0x07, 0x50, 0x0E, 0xC1, 0x3A, 0x20, 0x6B,</div><div class='add'>+0x00, 0x94, 0x03, 0xB0, 0x0A, 0x40, 0x57, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x08, 0x00, 0x29, 0x00, 0xED, 0x00, 0xB4, 0x02, 0xD2, 0x0E,</div><div class='add'>+0x60, 0x0B, 0x20, 0xED, 0x00, 0x96, 0x03, 0xD0, 0x02, 0x40, 0x1B, 0x80, 0xFD,</div><div class='add'>+0x05, 0xC4, 0x03, 0x11, 0x8E, 0x40, 0x38, 0x00, 0xF1, 0x00, 0x84, 0x43, 0x10,</div><div class='add'>+0x2E, 0x40, 0x23, 0x01, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,</div><div class='add'>+0x28, 0xF1, 0x04, 0x8D, 0x13, 0x34, 0x02, 0xD0, 0x2D, 0x40, 0x23, 0x00, 0xC9,</div><div class='add'>+0x03, 0x54, 0x04, 0xD0, 0x00, 0x40, 0xC0, 0x10, 0xCD, 0x04, 0x04, 0x03, 0x58,</div><div class='add'>+0x3C, 0x41, 0x32, 0x00, 0x59, 0x00, 0x14, 0x07, 0x91, 0x0C, 0x40, 0x0B, 0x20,</div><div class='add'>+0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0xA0, 0x25, 0x10, 0x1F,</div><div class='add'>+0x12, 0x7C, 0x02, 0xF0, 0x2F, 0xC0, 0x27, 0x00, 0xFF, 0x05, 0x5C, 0x46, 0xF0,</div><div class='add'>+0x05, 0xC0, 0x07, 0x01, 0xDF, 0x07, 0xCD, 0x03, 0x32, 0x0F, 0x40, 0x3C, 0x00,</div><div class='add'>+0x53, 0x00, 0x4C, 0x07, 0x30, 0x25, 0xC0, 0x57, 0x00, 0x06, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x0D, 0x08, 0x27, 0x02, 0x9F, 0x00, 0x64, 0x08, 0xF0,</div><div class='add'>+0xCD, 0xC0, 0x27, 0x00, 0xDF, 0x00, 0x6C, 0x02, 0xF0, 0x05, 0xC0, 0x87, 0x00,</div><div class='add'>+0xDF, 0x00, 0x7C, 0x03, 0xE0, 0x0D, 0xC0, 0x37, 0x00, 0x5F, 0x00, 0x7C, 0x03,</div><div class='add'>+0xF0, 0x01, 0xC2, 0x37, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x89, 0x09, 0x3F, 0x10, 0x2F, 0x00, 0xCC, 0x80, 0xF0, 0x0F, 0xC0, 0x08, 0x00,</div><div class='add'>+0xF3, 0x10, 0xFC, 0x20, 0x30, 0x03, 0xC0, 0x0F, 0x04, 0xFF, 0x00, 0xBC, 0x03,</div><div class='add'>+0x10, 0x0F, 0xC0, 0x3F, 0x10, 0xFF, 0x01, 0x4C, 0x65, 0xF0, 0x97, 0xC0, 0x07,</div><div class='add'>+0x22, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x81, 0x20, 0xB6, 0x00,</div><div class='add'>+0x1D, 0x21, 0x54, 0x04, 0xD0, 0x0D, 0x40, 0xC4, 0x00, 0xD1, 0x40, 0x74, 0x00,</div><div class='add'>+0x10, 0x21, 0x40, 0xC6, 0x01, 0xDD, 0x00, 0x74, 0x03, 0xB0, 0x0D, 0xC0, 0x35,</div><div class='add'>+0x00, 0xDD, 0x0B, 0x54, 0x00, 0xD0, 0x2D, 0x44, 0x87, 0x02, 0x08, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xA0, 0x24, 0x14, 0x1D, 0x01, 0x46, 0x06,</div><div class='add'>+0xD0, 0x0D, 0x40, 0x44, 0x00, 0xD1, 0x00, 0x74, 0x03, 0x10, 0x13, 0x41, 0x4F,</div><div class='add'>+0x80, 0xDD, 0x00, 0xF4, 0x03, 0x50, 0x0F, 0x40, 0x3F, 0x00, 0x9D, 0x10, 0x44,</div><div class='add'>+0x03, 0x90, 0x25, 0x40, 0x07, 0x08, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x10, 0x22, 0x20, 0x00, 0x8D, 0x80, 0x14, 0x00, 0xD8, 0x0C, 0x40, 0x20,</div><div class='add'>+0x00, 0xC1, 0x22, 0x34, 0x40, 0x14, 0x00, 0x40, 0x03, 0x00, 0xCD, 0x04, 0x34,</div><div class='add'>+0x13, 0xD0, 0x0C, 0x40, 0x33, 0x00, 0x8D, 0x00, 0x14, 0x07, 0xD0, 0x00, 0x40,</div><div class='add'>+0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xB8, 0x06,</div><div class='add'>+0x00, 0x1F, 0x00, 0x4C, 0x02, 0xF0, 0x0F, 0xC0, 0x04, 0x00, 0xF1, 0x02, 0x74,</div><div class='add'>+0x13, 0x30, 0x01, 0xC0, 0x87, 0x02, 0xFF, 0x10, 0xFC, 0x53, 0x70, 0x0E, 0xC0,</div><div class='add'>+0x3B, 0x00, 0x9F, 0x00, 0x4C, 0x03, 0xF0, 0x0D, 0xC0, 0x07, 0x60, 0x08, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x85, 0xB0, 0x1F, 0x00, 0xBF, 0x80, 0xF8,</div><div class='add'>+0x00, 0xF0, 0x0F, 0xC2, 0x0F, 0x00, 0xFF, 0x20, 0x7C, 0x00, 0xF0, 0x03, 0xC0,</div><div class='add'>+0x0E, 0x00, 0xDF, 0x00, 0x7C, 0x03, 0xB1, 0x0F, 0xC0, 0x3D, 0x00, 0xBF, 0x00,</div><div class='add'>+0xFC, 0x83, 0xF0, 0x0F, 0xC0, 0x17, 0x61, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x03, 0xA0, 0x7F, 0x00, 0xFF, 0x09, 0xFC, 0x02, 0x30, 0x4B, 0xC1,</div><div class='add'>+0x3F, 0x13, 0xFF, 0x00, 0xCC, 0x13, 0x70, 0x83, 0xC0, 0x3C, 0x40, 0xF3, 0x00,</div><div class='add'>+0xBC, 0x06, 0xB0, 0x0F, 0xC0, 0x2C, 0x17, 0x3B, 0x0C, 0xCC, 0x00, 0xB0, 0x03,</div><div class='add'>+0xC0, 0x0F, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x18,</div><div class='add'>+0x37, 0x01, 0xCD, 0x04, 0x74, 0xEA, 0x10, 0x69, 0xC8, 0xBD, 0x22, 0xFD, 0xDE,</div><div class='add'>+0xD4, 0x2F, 0x10, 0x01, 0x40, 0xFC, 0x00, 0xD1, 0x02, 0x44, 0x87, 0x10, 0x1F,</div><div class='add'>+0x40, 0xA5, 0x01, 0x11, 0x0E, 0x44, 0x08, 0x10, 0x01, 0x40, 0x0F, 0x60, 0x0C,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0xA0, 0x33, 0x04, 0xCD, 0x00,</div><div class='add'>+0x34, 0x10, 0x50, 0x00, 0x41, 0x33, 0x09, 0xCD, 0x44, 0x14, 0x03, 0x10, 0x50,</div><div class='add'>+0x60, 0xB1, 0x00, 0xC5, 0x02, 0x14, 0x82, 0x90, 0x0D, 0x60, 0x34, 0x01, 0xC9,</div><div class='add'>+0x00, 0x04, 0x08, 0x12, 0x00, 0x40, 0x4F, 0x80, 0x0E, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x03, 0xA0, 0x35, 0x00, 0xDD, 0x04, 0x36, 0x0E, 0x54, 0x19,</div><div class='add'>+0x42, 0x37, 0x00, 0xDD, 0x00, 0x44, 0x03, 0x10, 0x12, 0x40, 0x35, 0x00, 0xD5,</div><div class='add'>+0x20, 0x55, 0x03, 0x10, 0x0F, 0x40, 0x55, 0x00, 0xC1, 0x18, 0x45, 0x63, 0x10,</div><div class='add'>+0x11, 0x40, 0x0F, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,</div><div class='add'>+0xA8, 0x37, 0x00, 0xDD, 0x00, 0x7C, 0x06, 0x70, 0x31, 0xC0, 0x37, 0x00, 0xDF,</div><div class='add'>+0x00, 0x4C, 0x03, 0x30, 0x11, 0x40, 0x35, 0x00, 0xD6, 0x00, 0x7C, 0x02, 0xB0,</div><div class='add'>+0x0D, 0xC0, 0x64, 0x80, 0x1B, 0x03, 0x4E, 0x07, 0x30, 0x19, 0xC0, 0x2B, 0x20,</div><div class='add'>+0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x80, 0xFD, 0x20, 0xFF,</div><div class='add'>+0x81, 0x7E, 0x02, 0xB0, 0x01, 0xC4, 0x3D, 0x00, 0xDF, 0x00, 0xBC, 0x43, 0xB0,</div><div class='add'>+0x0B, 0xC0, 0x3E, 0x10, 0xFA, 0x00, 0xEC, 0x02, 0xF0, 0x0F, 0xC0, 0x3F, 0x00,</div><div class='add'>+0xFF, 0x80, 0x7C, 0x01, 0x70, 0x03, 0xC0, 0x1F, 0x00, 0x06, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x02, 0x08, 0x35, 0x00, 0xDF, 0x00, 0x4C, 0x08, 0x38,</div><div class='add'>+0x21, 0xC0, 0x34, 0x08, 0xD7, 0xC0, 0x4C, 0x03, 0x70, 0x01, 0xD1, 0x30, 0x00,</div><div class='add'>+0xDF, 0x84, 0x4D, 0x42, 0x32, 0x4D, 0xC0, 0x27, 0x00, 0x1B, 0x12, 0x3C, 0x02,</div><div class='add'>+0x30, 0x09, 0xC0, 0x2B, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x1B, 0xA0, 0x34, 0x00, 0xDD, 0x00, 0x6C, 0x82, 0x10, 0x19, 0x41, 0x3C, 0x00,</div><div class='add'>+0xF1, 0x00, 0xC4, 0x4B, 0xD0, 0x19, 0x40, 0x3C, 0x01, 0xE7, 0x01, 0x04, 0x46,</div><div class='add'>+0x12, 0x3F, 0xC0, 0x11, 0x00, 0xDD, 0x00, 0x74, 0x1B, 0x10, 0xB9, 0x41, 0x4F,</div><div class='add'>+0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x32, 0x00,</div><div class='add'>+0xCD, 0x00, 0x24, 0x00, 0x10, 0x58, 0x40, 0x30, 0x00, 0xD5, 0x00, 0x04, 0x0B,</div><div class='add'>+0x50, 0x20, 0x40, 0x32, 0x00, 0xC8, 0x2B, 0x04, 0x0A, 0x12, 0x0D, 0x44, 0x23,</div><div class='add'>+0x10, 0x09, 0x08, 0x34, 0x40, 0x90, 0x18, 0x40, 0x0E, 0x00, 0x08, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x0D, 0x08, 0x7A, 0x00, 0xED, 0x01, 0xA4, 0x05,</div><div class='add'>+0x10, 0x1E, 0x40, 0x78, 0x00, 0xE1, 0x01, 0x84, 0x07, 0xD0, 0x1E, 0x41, 0x78,</div><div class='add'>+0x80, 0xE5, 0x01, 0xC4, 0x07, 0x10, 0x1E, 0x40, 0x79, 0x00, 0xED, 0x01, 0xB4,</div><div class='add'>+0x15, 0x90, 0x12, 0x40, 0x37, 0x20, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x12, 0x10, 0x32, 0x00, 0xCE, 0x40, 0x2C, 0x21, 0x10, 0x84, 0xC0, 0x34,</div><div class='add'>+0x02, 0xC7, 0x08, 0x06, 0x03, 0x70, 0x05, 0xC0, 0x32, 0x00, 0xCF, 0x40, 0x0C,</div><div class='add'>+0x02, 0x30, 0x0C, 0xC1, 0x23, 0x00, 0x0B, 0x04, 0x3C, 0x02, 0xB0, 0x0C, 0xC0,</div><div class='add'>+0x4B, 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xA0, 0x3D,</div><div class='add'>+0x20, 0xFF, 0x80, 0xDD, 0x81, 0xF0, 0x8F, 0xC0, 0x3F, 0x00, 0xFF, 0x20, 0xFE,</div><div class='add'>+0x03, 0xF0, 0x0F, 0xC0, 0xBD, 0x04, 0xEF, 0x00, 0xFC, 0x03, 0xF5, 0x0F, 0xC0,</div><div class='add'>+0x1F, 0x00, 0xDF, 0x00, 0x7C, 0x13, 0x72, 0x0F, 0xC0, 0x0B, 0x20, 0x06, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xA8, 0x37, 0x20, 0xDF, 0x00, 0x7C,</div><div class='add'>+0x03, 0x70, 0x0D, 0xC0, 0x37, 0x01, 0xDF, 0x04, 0x7C, 0x13, 0xD1, 0x11, 0xD0,</div><div class='add'>+0x30, 0x01, 0xD3, 0x08, 0x4C, 0x06, 0x30, 0x5D, 0xC8, 0x20, 0x00, 0x17, 0x00,</div><div class='add'>+0x5C, 0x00, 0xB4, 0x0D, 0xC0, 0x40, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x13, 0x88, 0x38, 0x10, 0xED, 0x20, 0xB6, 0x03, 0xD0, 0x0E, 0x40,</div><div class='add'>+0xBB, 0x03, 0xED, 0x28, 0xB4, 0x23, 0xD0, 0x0B, 0x40, 0x38, 0x00, 0xE1, 0x00,</div><div class='add'>+0xAC, 0x02, 0x50, 0xAE, 0x40, 0x38, 0x00, 0xE1, 0x40, 0xB4, 0x01, 0x10, 0x06,</div><div class='add'>+0x40, 0x4C, 0x60, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00,</div><div class='add'>+0x79, 0x80, 0xED, 0x81, 0x94, 0x07, 0xD8, 0x16, 0x40, 0x7B, 0x00, 0xED, 0x09,</div><div class='add'>+0xB4, 0x27, 0xD0, 0x16, 0x49, 0x78, 0x01, 0xE1, 0x05, 0x94, 0x06, 0x90, 0x5E,</div><div class='add'>+0x58, 0x6C, 0x40, 0x21, 0x03, 0x34, 0x06, 0x50, 0x1C, 0x40, 0x10, 0x00, 0x04,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16, 0x28, 0x23, 0x80, 0x8D, 0x00,</div><div class='add'>+0x34, 0x07, 0xD8, 0xAC, 0x40, 0x33, 0x10, 0xCD, 0x00, 0x34, 0x03, 0xD0, 0x2C,</div><div class='add'>+0x40, 0x30, 0x80, 0xC1, 0x00, 0x34, 0x86, 0xD0, 0x0C, 0x40, 0x10, 0x00, 0xC1,</div><div class='add'>+0x10, 0x74, 0x2F, 0x50, 0x2D, 0x40, 0x58, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x17, 0xA8, 0x17, 0x01, 0x5F, 0x00, 0xFC, 0x0D, 0x72, 0x17,</div><div class='add'>+0xCA, 0x17, 0x08, 0x5F, 0x00, 0x7C, 0x01, 0xF0, 0x07, 0x48, 0x14, 0x00, 0x43,</div><div class='add'>+0x00, 0x54, 0x01, 0xB0, 0x05, 0xC4, 0x1C, 0x01, 0x73, 0x03, 0xDC, 0x2D, 0x70,</div><div class='add'>+0x47, 0xC0, 0x5C, 0x20, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12,</div><div class='add'>+0x00, 0x05, 0x20, 0x1F, 0x00, 0x7C, 0x60, 0xF8, 0x01, 0xC1, 0x07, 0x00, 0x0F,</div><div class='add'>+0x00, 0x7C, 0x08, 0xF0, 0x41, 0xC8, 0x03, 0x40, 0x1F, 0x00, 0x64, 0x20, 0x73,</div><div class='add'>+0x01, 0xC0, 0x07, 0x20, 0x19, 0x02, 0x7C, 0x00, 0xB0, 0x21, 0xD0, 0x4B, 0x00,</div><div class='add'>+0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x08, 0x27, 0x00, 0x9F,</div><div class='add'>+0x00, 0x78, 0x02, 0xF0, 0x89, 0xC2, 0x27, 0x00, 0x9B, 0x00, 0x4C, 0x06, 0xF0,</div><div class='add'>+0x09, 0xC0, 0x25, 0x01, 0x93, 0x09, 0x5C, 0x02, 0xF0, 0x99, 0xC0, 0x23, 0x00,</div><div class='add'>+0x97, 0x28, 0x44, 0x82, 0x31, 0x09, 0xC1, 0x40, 0x20, 0x04, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x01, 0x20, 0x26, 0x00, 0x9D, 0x00, 0x74, 0x02, 0xD0,</div><div class='add'>+0x09, 0x40, 0x27, 0x00, 0x9D, 0x00, 0x44, 0x0E, 0xD0, 0x29, 0x40, 0x27, 0x00,</div><div class='add'>+0x91, 0x03, 0x44, 0x02, 0xD0, 0x39, 0x40, 0x27, 0x00, 0x91, 0x07, 0x44, 0x0A,</div><div class='add'>+0x10, 0x29, 0x51, 0x04, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x1C, 0xA0, 0x24, 0x00, 0x9D, 0x00, 0x70, 0x02, 0xD0, 0x0D, 0x40, 0x27, 0x00,</div><div class='add'>+0x9D, 0x00, 0x44, 0x1A, 0xD0, 0x29, 0x00, 0x27, 0x40, 0x91, 0x02, 0x54, 0x02,</div><div class='add'>+0xD8, 0x09, 0x41, 0x27, 0x00, 0x85, 0x00, 0x54, 0x02, 0x10, 0x0D, 0x40, 0x70,</div><div class='add'>+0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x20, 0x20, 0x00,</div><div class='add'>+0x8D, 0x00, 0x34, 0x52, 0xD0, 0x4C, 0x41, 0x23, 0x02, 0x8D, 0x08, 0x04, 0x82,</div><div class='add'>+0xD0, 0xC8, 0x40, 0x23, 0x00, 0x81, 0x14, 0x04, 0x03, 0xD9, 0x48, 0x40, 0x23,</div><div class='add'>+0x00, 0x81, 0x08, 0x14, 0x82, 0x14, 0x48, 0x41, 0x50, 0xA0, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xB0, 0x06, 0x00, 0x1F, 0x40, 0x7C, 0x10,</div><div class='add'>+0xF0, 0x41, 0xC0, 0x87, 0x05, 0x1B, 0x16, 0x4C, 0x50, 0xF0, 0x31, 0xC0, 0x05,</div><div class='add'>+0x05, 0x03, 0x0E, 0x5C, 0x00, 0xF0, 0x11, 0xC0, 0x87, 0x05, 0x17, 0x16, 0x5D,</div><div class='add'>+0x51, 0x30, 0x41, 0xC0, 0x74, 0xC0, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x19, 0xB8, 0x2F, 0x0D, 0xBF, 0x34, 0xFC, 0x52, 0xF0, 0x4B, 0xC1, 0x27,</div><div class='add'>+0x01, 0x9F, 0x04, 0x7D, 0x82, 0xF0, 0xCB, 0x80, 0x27, 0x00, 0x9F, 0x01, 0xBC,</div><div class='add'>+0x02, 0xF0, 0x88, 0xC0, 0x2F, 0x04, 0xBF, 0x04, 0xEC, 0x52, 0xF8, 0x4B, 0xC1,</div><div class='add'>+0x67, 0x20, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0xA0, 0xA7,</div><div class='add'>+0x00, 0xDF, 0x02, 0x54, 0x1E, 0xF0, 0x2B, 0xC0, 0x25, 0x01, 0x9F, 0x54, 0xFC,</div><div class='add'>+0x12, 0x30, 0x8B, 0xC0, 0x2E, 0x05, 0xB3, 0x01, 0xCC, 0x02, 0xF0, 0x0B, 0xC0,</div><div class='add'>+0xA4, 0x00, 0xBF, 0x00, 0xCC, 0x02, 0x32, 0x0B, 0xC0, 0x60, 0x00, 0x0E, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1C, 0x18, 0x03, 0x20, 0x1D, 0x01, 0x6E,</div><div class='add'>+0x08, 0x10, 0x85, 0x40, 0x00, 0x05, 0x0D, 0x04, 0x74, 0x80, 0x10, 0x01, 0x50,</div><div class='add'>+0x84, 0x00, 0x11, 0x00, 0x44, 0x00, 0xD0, 0x01, 0x40, 0x54, 0x01, 0x1D, 0x40,</div><div class='add'>+0x44, 0x00, 0xBA, 0x05, 0xC0, 0x72, 0x60, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x12, 0xA0, 0x21, 0x81, 0x9D, 0x00, 0x04, 0xB2, 0x58, 0x48, 0x40,</div><div class='add'>+0x21, 0x02, 0x8D, 0x14, 0x34, 0x0A, 0x12, 0x48, 0x44, 0x20, 0x00, 0x81, 0x22,</div><div class='add'>+0x04, 0x02, 0xD0, 0x08, 0x50, 0x21, 0x01, 0x8D, 0x00, 0x14, 0x02, 0x10, 0x08,</div><div class='add'>+0x40, 0x48, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x20,</div><div class='add'>+0x25, 0x80, 0x9D, 0x00, 0x64, 0x62, 0x58, 0x0D, 0x40, 0x24, 0x00, 0x9C, 0x00,</div><div class='add'>+0x70, 0x02, 0x00, 0x0C, 0x60, 0x24, 0x40, 0x91, 0x00, 0x45, 0x02, 0xD0, 0x0D,</div><div class='add'>+0x40, 0x25, 0x22, 0x9D, 0x80, 0x54, 0x2A, 0x90, 0x09, 0x40, 0x62, 0x00, 0x04,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0xA8, 0x67, 0x00, 0x8D, 0x40,</div><div class='add'>+0x44, 0x06, 0x68, 0x09, 0xC0, 0x25, 0x00, 0x9F, 0x00, 0x3C, 0x02, 0x30, 0x19,</div><div class='add'>+0xC4, 0x26, 0x00, 0x93, 0x00, 0x4C, 0x02, 0xF0, 0x09, 0x40, 0x25, 0x00, 0x9D,</div><div class='add'>+0x0F, 0x5C, 0x06, 0x30, 0x29, 0xC0, 0x14, 0x20, 0x0E, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x12, 0x80, 0x24, 0x01, 0x9F, 0x04, 0x3C, 0x02, 0xB0, 0x59,</div><div class='add'>+0xC0, 0x27, 0x08, 0x9F, 0x00, 0x7E, 0x02, 0xF4, 0x49, 0xC0, 0x21, 0x00, 0x9F,</div><div class='add'>+0x00, 0x7C, 0x02, 0xF0, 0x08, 0xC0, 0x66, 0x00, 0x9F, 0x11, 0x6D, 0x42, 0xF2,</div><div class='add'>+0x49, 0xC1, 0x4B, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10,</div><div class='add'>+0x08, 0x05, 0x48, 0x1B, 0x00, 0x7C, 0x00, 0xB8, 0x21, 0xC1, 0x07, 0x00, 0x17,</div><div class='add'>+0x00, 0x4C, 0x00, 0xF0, 0x01, 0xC0, 0x06, 0x00, 0x13, 0x00, 0x5C, 0x20, 0xF0,</div><div class='add'>+0x11, 0xC0, 0x05, 0x00, 0x07, 0x22, 0x4C, 0x08, 0xE0, 0x21, 0xD0, 0x40, 0x20,</div><div class='add'>+0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x80, 0x14, 0x00, 0x51,</div><div class='add'>+0x00, 0x74, 0x01, 0xB8, 0x07, 0x40, 0x17, 0x00, 0x51, 0x00, 0xC4, 0x09, 0xD0,</div><div class='add'>+0x17, 0xC0, 0x14, 0x00, 0x73, 0x81, 0xC4, 0x29, 0xD0, 0x07, 0x40, 0x14, 0x00,</div><div class='add'>+0x71, 0x02, 0xC0, 0x45, 0xD1, 0x07, 0x40, 0x50, 0x00, 0x02, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x14, 0xA0, 0x32, 0x00, 0xC1, 0x80, 0x34, 0x03, 0x93,</div><div class='add'>+0x8D, 0x46, 0x33, 0x00, 0xC5, 0x00, 0x14, 0x17, 0xD0, 0x0C, 0x40, 0x22, 0x30,</div><div class='add'>+0x59, 0x8F, 0x14, 0x02, 0xC8, 0x1C, 0x40, 0x31, 0x80, 0xC5, 0x03, 0x45, 0x0B,</div><div class='add'>+0xD0, 0x8D, 0x40, 0x50, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x01, 0x88, 0x78, 0x09, 0xE1, 0x00, 0xB4, 0x13, 0x10, 0x0E, 0x40, 0x7B, 0x03,</div><div class='add'>+0xE4, 0x0D, 0x91, 0x43, 0xD0, 0x28, 0x40, 0x30, 0x00, 0x01, 0x00, 0xA4, 0x01,</div><div class='add'>+0xD1, 0x0E, 0x41, 0x78, 0x00, 0xE1, 0x02, 0x84, 0x03, 0xD0, 0x04, 0x40, 0x04,</div><div class='add'>+0x20, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x10, 0x79, 0x04,</div><div class='add'>+0xE3, 0x0D, 0xB4, 0x0F, 0x90, 0x1E, 0xC0, 0x7B, 0x04, 0xE7, 0x15, 0x9C, 0x07,</div><div class='add'>+0xF0, 0x16, 0xE0, 0x6A, 0x00, 0x2B, 0x01, 0x9C, 0x04, 0xF0, 0x1E, 0xC0, 0x7D,</div><div class='add'>+0x00, 0x77, 0x01, 0x8D, 0x07, 0xF0, 0x1E, 0xC4, 0x44, 0x40, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xA8, 0x35, 0x23, 0xD7, 0x80, 0x7C, 0x43,</div><div class='add'>+0xF0, 0x0D, 0xC0, 0xB7, 0x01, 0xDB, 0x04, 0x6C, 0x03, 0xF0, 0x01, 0xC2, 0x27,</div><div class='add'>+0x40, 0x1F, 0x22, 0x5C, 0x01, 0xF0, 0x08, 0xC0, 0x37, 0x08, 0x5F, 0x00, 0x7C,</div><div class='add'>+0x01, 0xF2, 0x05, 0xC0, 0x43, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x20, 0x7D, 0x00, 0xF3, 0x19, 0xF8, 0x27, 0x78, 0x9F, 0xC0, 0x7D,</div><div class='add'>+0x00, 0xF3, 0x01, 0xBC, 0x06, 0x30, 0x1F, 0xC0, 0x6F, 0x00, 0x63, 0x83, 0xCC,</div><div class='add'>+0x04, 0xF0, 0x17, 0xC4, 0x78, 0x00, 0xB3, 0x01, 0xCE, 0x25, 0x30, 0x1F, 0xC0,</div><div class='add'>+0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x18, 0x39,</div><div class='add'>+0x1A, 0xEB, 0x38, 0xB4, 0x03, 0x70, 0x0E, 0x40, 0x38, 0x02, 0xE1, 0x00, 0xB4,</div><div class='add'>+0x80, 0x10, 0x0E, 0x40, 0x3B, 0x01, 0x65, 0x00, 0x84, 0x08, 0xD0, 0x56, 0x40,</div><div class='add'>+0x39, 0x00, 0xA1, 0x02, 0x84, 0x28, 0x10, 0x62, 0xC0, 0x56, 0x60, 0x04, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3D, 0x04, 0xE1, 0x88, 0xB4,</div><div class='add'>+0x03, 0xD8, 0x06, 0x45, 0x31, 0x40, 0xE9, 0x00, 0xB4, 0x23, 0x90, 0x06, 0x40,</div><div class='add'>+0x23, 0x80, 0xA9, 0x00, 0x84, 0x00, 0xD0, 0x4C, 0x40, 0x3E, 0x00, 0x05, 0x08,</div><div class='add'>+0x05, 0x81, 0x10, 0x06, 0x40, 0x01, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x04, 0x20, 0x75, 0x00, 0xD8, 0x00, 0x74, 0x07, 0xDA, 0x19, 0x41,</div><div class='add'>+0x30, 0x00, 0xC9, 0x00, 0x34, 0x01, 0x93, 0x25, 0x40, 0x27, 0x00, 0x1D, 0x00,</div><div class='add'>+0x04, 0x20, 0xD0, 0x08, 0x40, 0x71, 0x40, 0x45, 0x01, 0x44, 0x80, 0x18, 0x21,</div><div class='add'>+0x40, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0xA8,</div><div class='add'>+0x7D, 0x00, 0xF3, 0x01, 0xFC, 0x13, 0xF0, 0x01, 0xC4, 0x3D, 0x00, 0xFB, 0x80,</div><div class='add'>+0x7E, 0x01, 0xB0, 0x5D, 0xC0, 0x27, 0x00, 0x1B, 0x00, 0x4D, 0x84, 0xF0, 0x09,</div><div class='add'>+0xC0, 0x7C, 0x04, 0xD5, 0x13, 0x4C, 0x3E, 0x36, 0x29, 0xC0, 0x55, 0x20, 0x06,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x37, 0x00, 0xDF, 0x40,</div><div class='add'>+0x7C, 0x43, 0x70, 0x01, 0xC0, 0x37, 0x00, 0xD7, 0x00, 0x3E, 0x08, 0x72, 0x01,</div><div class='add'>+0xC0, 0x37, 0x00, 0x17, 0x02, 0x7C, 0x01, 0xF0, 0x01, 0xC0, 0x37, 0x0C, 0xDA,</div><div class='add'>+0x04, 0x7C, 0x0A, 0xF0, 0x29, 0x80, 0x06, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x84, 0x08, 0x3F, 0x00, 0xF3, 0x00, 0xCE, 0x83, 0x30, 0x01,</div><div class='add'>+0xC0, 0x38, 0x00, 0xF3, 0x00, 0xFE, 0x83, 0x32, 0x1F, 0xC1, 0x2C, 0x10, 0x33,</div><div class='add'>+0x00, 0xCC, 0x14, 0xF0, 0x0B, 0x80, 0x3B, 0x00, 0x63, 0x08, 0xCC, 0x02, 0xF0,</div><div class='add'>+0x09, 0xD1, 0x10, 0x22, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x85,</div><div class='add'>+0x20, 0x36, 0x00, 0xD1, 0x20, 0x44, 0x03, 0x18, 0x11, 0x40, 0x35, 0x00, 0xD1,</div><div class='add'>+0x00, 0x74, 0x12, 0x50, 0x21, 0xC0, 0x26, 0x00, 0x1B, 0x23, 0x6C, 0x09, 0xD0,</div><div class='add'>+0x21, 0x00, 0x37, 0x00, 0x91, 0x02, 0x44, 0x04, 0x10, 0x19, 0x40, 0x14, 0x00,</div><div class='add'>+0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xA0, 0x34, 0x10, 0xD1,</div><div class='add'>+0x00, 0x44, 0x03, 0x10, 0x19, 0x40, 0x34, 0x40, 0xD1, 0x00, 0x54, 0x10, 0x50,</div><div class='add'>+0x49, 0x40, 0x24, 0x00, 0x31, 0x11, 0x44, 0x00, 0xD0, 0x15, 0x40, 0x37, 0x00,</div><div class='add'>+0x91, 0x00, 0x44, 0x86, 0x50, 0x19, 0x40, 0x04, 0x08, 0x02, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x10, 0x2A, 0x30, 0x00, 0xC1, 0x00, 0x04, 0x83, 0x10,</div><div class='add'>+0x08, 0x48, 0x31, 0x00, 0xC1, 0x00, 0x34, 0x00, 0x10, 0x01, 0x40, 0x36, 0x80,</div><div class='add'>+0x19, 0x00, 0x20, 0x01, 0xD0, 0x44, 0x44, 0x33, 0x00, 0x01, 0x60, 0x04, 0x82,</div><div class='add'>+0x12, 0x08, 0x40, 0x40, 0xA1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x30, 0x3C, 0x08, 0xF3, 0x00, 0xC4, 0x03, 0x10, 0x01, 0x40, 0x3C, 0x00,</div><div class='add'>+0xF3, 0x00, 0x7C, 0x03, 0x70, 0x09, 0xC0, 0x24, 0x00, 0x33, 0x00, 0x4C, 0x00,</div><div class='add'>+0xF1, 0x4D, 0xC1, 0x37, 0x40, 0x13, 0x00, 0x4D, 0x02, 0x70, 0x01, 0xC0, 0x00,</div><div class='add'>+0xC4, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x45, 0xA8, 0x3B, 0x00,</div><div class='add'>+0xFF, 0x00, 0xFC, 0x03, 0xF0, 0x0B, 0xC0, 0x3F, 0x00, 0xFF, 0x40, 0xF4, 0x00,</div><div class='add'>+0xF1, 0x03, 0xC8, 0x2F, 0x00, 0x3E, 0x20, 0xFC, 0x81, 0xF0, 0x01, 0xC0, 0x3F,</div><div class='add'>+0x20, 0x3F, 0x00, 0xFD, 0x00, 0xE0, 0x03, 0xC0, 0x17, 0x20, 0x0E, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xA0, 0x3B, 0x04, 0xFF, 0xC0, 0xFC, 0x43,</div><div class='add'>+0xB2, 0x4F, 0xC0, 0x3D, 0x00, 0xEF, 0x04, 0xEC, 0x23, 0xF1, 0x12, 0xC0, 0x35,</div><div class='add'>+0x03, 0x7B, 0x01, 0xFC, 0x42, 0xB0, 0x13, 0xC0, 0x2E, 0x00, 0xBB, 0x01, 0xEC,</div><div class='add'>+0x86, 0x30, 0x03, 0xC0, 0x0F, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x01, 0x08, 0xFF, 0x00, 0xFD, 0x0C, 0xF4, 0x8F, 0xD0, 0x9F, 0x48, 0xFC,</div><div class='add'>+0x22, 0xDD, 0x03, 0xC4, 0x3B, 0xD2, 0x19, 0x40, 0xB4, 0x01, 0x91, 0xE1, 0x74,</div><div class='add'>+0x0E, 0x10, 0x05, 0x43, 0x74, 0x00, 0x91, 0x01, 0x44, 0x03, 0x13, 0x11, 0x48,</div><div class='add'>+0x07, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0xA0, 0x33,</div><div class='add'>+0x18, 0xCD, 0x50, 0x34, 0x03, 0xC0, 0x0C, 0x40, 0x32, 0x00, 0xCD, 0x42, 0x24,</div><div class='add'>+0x13, 0xD2, 0x01, 0x60, 0xB1, 0x00, 0xCD, 0x00, 0x34, 0x02, 0xD0, 0x41, 0x40,</div><div class='add'>+0x22, 0x00, 0x4D, 0x00, 0x74, 0x04, 0x10, 0x00, 0x40, 0x47, 0x80, 0x0E, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xA8, 0x34, 0x08, 0xDD, 0x00, 0x74,</div><div class='add'>+0x83, 0xD0, 0x0D, 0x40, 0x36, 0x08, 0xDD, 0x00, 0x44, 0x83, 0xD0, 0x11, 0x48,</div><div class='add'>+0x34, 0x08, 0x99, 0x00, 0x74, 0x07, 0x51, 0x81, 0x41, 0x34, 0x00, 0xD5, 0x08,</div><div class='add'>+0x56, 0x91, 0x10, 0x19, 0x40, 0x0F, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0xA8, 0x37, 0x00, 0xDF, 0x00, 0x7C, 0x03, 0xA0, 0x0D, 0xC0,</div><div class='add'>+0x36, 0x20, 0xDF, 0x20, 0x6C, 0x03, 0xF2, 0x38, 0xC8, 0x35, 0x30, 0xDB, 0x08,</div><div class='add'>+0x7C, 0x02, 0xF0, 0x35, 0x86, 0x62, 0x00, 0xCF, 0x03, 0x3C, 0x07, 0x30, 0x11,</div><div class='add'>+0xC0, 0x03, 0x20, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x80,</div><div class='add'>+0x3D, 0x24, 0xFF, 0x00, 0xFC, 0x03, 0xF0, 0x0F, 0xC0, 0x3C, 0x00, 0xFF, 0x00,</div><div class='add'>+0xFC, 0x03, 0xE0, 0x0B, 0x80, 0x36, 0x00, 0xB5, 0x00, 0xBC, 0x43, 0xB0, 0x17,</div><div class='add'>+0xC0, 0x7F, 0x0A, 0xFB, 0x00, 0xEC, 0x01, 0xF2, 0x0B, 0xC0, 0x1F, 0x00, 0x06,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x08, 0x35, 0x00, 0xD7, 0x04,</div><div class='add'>+0x7C, 0x03, 0x71, 0x0D, 0xC0, 0x37, 0x00, 0xDF, 0x00, 0x5C, 0x03, 0xF0, 0x21,</div><div class='add'>+0xC0, 0x35, 0x00, 0xD7, 0x00, 0x7C, 0x22, 0xF0, 0x21, 0xC0, 0x27, 0x00, 0x5F,</div><div class='add'>+0x00, 0x7C, 0x11, 0x30, 0x81, 0xC0, 0x0B, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x13, 0xA0, 0x3C, 0x00, 0xF1, 0x82, 0xF4, 0x8F, 0x18, 0x5E,</div><div class='add'>+0x44, 0xFF, 0x24, 0xED, 0x02, 0xC4, 0x03, 0xD2, 0x81, 0x41, 0x7C, 0x00, 0x9B,</div><div class='add'>+0x00, 0x74, 0x0F, 0xC0, 0x00, 0x40, 0x37, 0x00, 0xDC, 0x09, 0x40, 0x09, 0x10,</div><div class='add'>+0x09, 0x40, 0x4F, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07,</div><div class='add'>+0xA0, 0xF2, 0x00, 0xC5, 0x01, 0x34, 0x17, 0x51, 0x0C, 0x40, 0xB2, 0x04, 0xCD,</div><div class='add'>+0x10, 0x14, 0x03, 0xD0, 0x00, 0x40, 0x37, 0x02, 0x05, 0x00, 0x34, 0x0B, 0xC0,</div><div class='add'>+0x00, 0x4A, 0x33, 0x10, 0x4C, 0x01, 0x14, 0x03, 0x10, 0x00, 0x41, 0x1F, 0x00,</div><div class='add'>+0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x80, 0x78, 0x06, 0xE1,</div><div class='add'>+0xB1, 0xB4, 0x07, 0x10, 0x1E, 0x40, 0x7B, 0x20, 0xED, 0x89, 0x94, 0x07, 0xD0,</div><div class='add'>+0x1E, 0x42, 0x7A, 0x01, 0xA9, 0x81, 0xB4, 0x87, 0xD0, 0x16, 0x40, 0x6B, 0x00,</div><div class='add'>+0x6D, 0x31, 0xC0, 0x07, 0x10, 0x12, 0x40, 0x1B, 0x00, 0x02, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x12, 0x10, 0x30, 0x00, 0xC7, 0x08, 0x3C, 0x43, 0x50,</div><div class='add'>+0x0C, 0xC0, 0x33, 0x00, 0xCF, 0x20, 0x1C, 0x03, 0xF0, 0x40, 0xC0, 0x73, 0x81,</div><div class='add'>+0xC7, 0x00, 0x3C, 0x32, 0xF0, 0x40, 0xC0, 0x33, 0x00, 0x4F, 0x22, 0x1C, 0x12,</div><div class='add'>+0x30, 0x84, 0xC0, 0x4B, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x02, 0xB8, 0x3D, 0x00, 0xFF, 0x40, 0xBC, 0x2B, 0xB1, 0x0F, 0xC0, 0x3F, 0x00,</div><div class='add'>+0xFF, 0x90, 0xE4, 0x03, 0xF0, 0x0B, 0xC0, 0x3D, 0x00, 0xB7, 0x00, 0xFC, 0x63,</div><div class='add'>+0xF0, 0x07, 0xC0, 0x2F, 0x02, 0x6F, 0x00, 0x1C, 0x03, 0xF0, 0x8D, 0xC2, 0x0B,</div><div class='add'>+0x40, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0xA8, 0x73, 0x01,</div><div class='add'>+0xDB, 0x0A, 0x7C, 0x97, 0x39, 0x6D, 0xC1, 0xB7, 0x01, 0xDF, 0x00, 0x5C, 0x4B,</div><div class='add'>+0x71, 0x18, 0xC0, 0x36, 0x20, 0x9F, 0x20, 0x7C, 0x02, 0xF0, 0x05, 0xC0, 0x32,</div><div class='add'>+0x00, 0x5B, 0x00, 0x7C, 0x03, 0x36, 0x05, 0xC0, 0x57, 0x00, 0x0E, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x88, 0xB9, 0x05, 0xE1, 0x54, 0xB4, 0x13,</div><div class='add'>+0x18, 0x2E, 0x60, 0xBB, 0x03, 0xED, 0x04, 0x04, 0x03, 0x10, 0x0E, 0x60, 0x38,</div><div class='add'>+0x01, 0xA7, 0x00, 0xB4, 0x13, 0xD0, 0x07, 0x42, 0x28, 0x10, 0x61, 0x20, 0xB4,</div><div class='add'>+0x01, 0x10, 0x0E, 0x40, 0x4B, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x03, 0x00, 0x79, 0x00, 0xE9, 0x05, 0x34, 0x27, 0x12, 0x5E, 0x40, 0x7B,</div><div class='add'>+0x00, 0xCD, 0x05, 0x94, 0x27, 0x52, 0x1A, 0x64, 0x7A, 0x02, 0xED, 0x01, 0xB4,</div><div class='add'>+0x0E, 0xD0, 0x1E, 0x40, 0x7A, 0x20, 0x6D, 0x21, 0xF4, 0x07, 0x10, 0x16, 0x40,</div><div class='add'>+0x0F, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x20, 0x33,</div><div class='add'>+0x08, 0xC1, 0x00, 0x34, 0x83, 0x10, 0x0C, 0x40, 0x33, 0x10, 0xCD, 0x20, 0x04,</div><div class='add'>+0x03, 0x10, 0x0C, 0x40, 0x32, 0x00, 0x85, 0x00, 0x34, 0x03, 0xD0, 0x25, 0x41,</div><div class='add'>+0x20, 0x00, 0x45, 0x08, 0x34, 0x8F, 0x10, 0xEC, 0x40, 0x4B, 0x20, 0x0C, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x17, 0xA0, 0x15, 0x00, 0x5B, 0x20, 0x7C,</div><div class='add'>+0x01, 0x35, 0x05, 0xC0, 0x17, 0x00, 0x5F, 0x00, 0x5C, 0x01, 0x70, 0x27, 0xC2,</div><div class='add'>+0x16, 0x00, 0x7F, 0x22, 0x7C, 0x01, 0xF8, 0x27, 0xD3, 0x16, 0x20, 0x6F, 0x20,</div><div class='add'>+0xF4, 0x0D, 0x30, 0x17, 0xC2, 0x5F, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x12, 0x00, 0x07, 0x00, 0x1F, 0x02, 0x7C, 0x08, 0xF0, 0x21, 0xC4,</div><div class='add'>+0x87, 0x00, 0x1F, 0x00, 0x7C, 0x00, 0xF0, 0x21, 0xC0, 0x05, 0x00, 0x17, 0x04,</div><div class='add'>+0x7C, 0x08, 0xF2, 0x01, 0xC0, 0x87, 0x00, 0x1A, 0x02, 0x74, 0x60, 0xF0, 0x01,</div><div class='add'>+0xC0, 0x4B, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00,</div><div class='add'>+0x27, 0x02, 0x9F, 0x09, 0x7C, 0x06, 0xF0, 0x19, 0xC0, 0x67, 0x80, 0x83, 0x08,</div><div class='add'>+0x5C, 0x02, 0x30, 0x99, 0xC3, 0x23, 0x00, 0x92, 0x00, 0x0C, 0x86, 0x70, 0x09,</div><div class='add'>+0xC0, 0x21, 0x01, 0x93, 0x04, 0x5C, 0x06, 0x32, 0x08, 0xC2, 0x40, 0x20, 0x0C,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x20, 0xE6, 0x00, 0x9D, 0x03,</div><div class='add'>+0x74, 0x02, 0xD0, 0xA9, 0x41, 0xE3, 0x04, 0x9B, 0x01, 0x44, 0x02, 0x10, 0x09,</div><div class='add'>+0x40, 0x27, 0x00, 0x81, 0x00, 0xC4, 0x0A, 0xB0, 0x09, 0x40, 0xA4, 0x00, 0x95,</div><div class='add'>+0x00, 0x04, 0x0E, 0x10, 0x09, 0x40, 0x05, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x18, 0x88, 0x24, 0x04, 0x9D, 0x10, 0x74, 0x22, 0xD0, 0x09,</div><div class='add'>+0x40, 0x27, 0x01, 0x91, 0x00, 0x14, 0x02, 0x14, 0x0D, 0x41, 0x27, 0x41, 0x95,</div><div class='add'>+0x00, 0x54, 0x12, 0x50, 0x09, 0x40, 0xA5, 0x00, 0x91, 0x00, 0x54, 0x12, 0x14,</div><div class='add'>+0x89, 0x40, 0x60, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10,</div><div class='add'>+0x20, 0x20, 0x05, 0x8D, 0x34, 0x36, 0x52, 0xD2, 0x08, 0x40, 0x23, 0x40, 0x89,</div><div class='add'>+0xC0, 0x04, 0x22, 0x10, 0x08, 0x40, 0xA3, 0x00, 0x95, 0x02, 0x14, 0x03, 0x90,</div><div class='add'>+0x88, 0x40, 0x20, 0x05, 0x94, 0x00, 0x44, 0x06, 0x10, 0x48, 0x41, 0x41, 0x80,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xB0, 0x06, 0x01, 0x1F,</div><div class='add'>+0x24, 0x7C, 0x91, 0xF0, 0x41, 0xC1, 0x07, 0x05, 0x11, 0x54, 0x5C, 0x58, 0x30,</div><div class='add'>+0x01, 0xCA, 0x07, 0x05, 0x17, 0x00, 0x5D, 0x04, 0x70, 0x21, 0xC0, 0x05, 0x01,</div><div class='add'>+0x53, 0x00, 0x5C, 0x00, 0x30, 0x45, 0xC0, 0x74, 0xC0, 0x0A, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x19, 0xB8, 0x27, 0x00, 0x9F, 0x54, 0x7C, 0x02, 0xF0,</div><div class='add'>+0x09, 0xC0, 0x27, 0x00, 0x97, 0x00, 0x7C, 0x12, 0xF2, 0x0B, 0xC0, 0x67, 0x00,</div><div class='add'>+0xBB, 0x01, 0xEC, 0x0A, 0x70, 0x4B, 0xC8, 0x2F, 0x00, 0xFF, 0x00, 0xAE, 0x52,</div><div class='add'>+0xF4, 0x0B, 0xC0, 0x67, 0x60, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x19, 0xA8, 0x6F, 0x04, 0xBF, 0x36, 0xFC, 0x42, 0xF0, 0x0A, 0xC0, 0x2C, 0x00,</div><div class='add'>+0xBF, 0x90, 0x7F, 0x32, 0xF0, 0x0F, 0xC0, 0xAF, 0x04, 0x9F, 0x02, 0xCD, 0x86,</div><div class='add'>+0x34, 0x89, 0xC0, 0x2F, 0x00, 0xAF, 0x00, 0xFC, 0x02, 0x30, 0x0B, 0xC0, 0x64,</div><div class='add'>+0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1C, 0x18, 0x07, 0x00,</div><div class='add'>+0x1D, 0x02, 0x74, 0x08, 0xD0, 0xA1, 0x52, 0x84, 0x02, 0x1D, 0x02, 0x44, 0x00,</div><div class='add'>+0x70, 0x05, 0x40, 0xC7, 0x00, 0x1D, 0x01, 0x44, 0x88, 0x10, 0x05, 0x48, 0x04,</div><div class='add'>+0x00, 0x1D, 0x00, 0x74, 0x00, 0x10, 0x01, 0x40, 0x70, 0x20, 0x0C, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xA0, 0x23, 0x00, 0x8D, 0x04, 0x34, 0x02,</div><div class='add'>+0xD0, 0x08, 0x40, 0x20, 0x00, 0x8D, 0x00, 0x14, 0x1A, 0xD0, 0x08, 0x62, 0x23,</div><div class='add'>+0x00, 0x8D, 0x00, 0x04, 0x0A, 0x10, 0x48, 0x40, 0x22, 0x00, 0x8D, 0x00, 0x74,</div><div class='add'>+0x03, 0x10, 0x08, 0x40, 0x40, 0x80, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x18, 0xA0, 0x25, 0x00, 0x9D, 0xA0, 0x74, 0x02, 0xD0, 0x09, 0x40, 0x24,</div><div class='add'>+0x20, 0x9D, 0x00, 0x44, 0x02, 0x50, 0x09, 0x48, 0x27, 0x00, 0x8D, 0x00, 0x44,</div><div class='add'>+0x02, 0x11, 0x89, 0x40, 0x24, 0x00, 0x9D, 0x00, 0x74, 0x02, 0x10, 0x29, 0x40,</div><div class='add'>+0x60, 0x28, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0xA8, 0x27,</div><div class='add'>+0x10, 0x9F, 0x00, 0x78, 0x02, 0xF0, 0x09, 0xC0, 0x24, 0x08, 0x9F, 0x00, 0x7C,</div><div class='add'>+0x02, 0xF0, 0x09, 0x40, 0x2F, 0x00, 0xBE, 0x07, 0x4C, 0x02, 0x31, 0x39, 0xC2,</div><div class='add'>+0x27, 0x00, 0x9F, 0x00, 0x3C, 0x16, 0x20, 0x09, 0xD0, 0x14, 0x20, 0x04, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x00, 0x24, 0x00, 0x9F, 0x80, 0x7C,</div><div class='add'>+0x42, 0xF0, 0x08, 0xE0, 0x27, 0x0C, 0x8F, 0x10, 0x7D, 0x02, 0xF0, 0x39, 0xC0,</div><div class='add'>+0x27, 0x00, 0x9F, 0x02, 0x7C, 0x4A, 0xF0, 0x09, 0xC0, 0x27, 0x00, 0x9F, 0x23,</div><div class='add'>+0x7C, 0x16, 0xF4, 0x59, 0xC0, 0x53, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x14, 0x08, 0x05, 0x01, 0x1F, 0x00, 0x4C, 0x20, 0x30, 0x41, 0xC0,</div><div class='add'>+0x04, 0x00, 0x12, 0x00, 0x5C, 0x80, 0x30, 0x01, 0xC0, 0x07, 0x00, 0x13, 0x02,</div><div class='add'>+0x7C, 0x00, 0xF0, 0x21, 0xC0, 0x07, 0x24, 0x1F, 0x22, 0x5C, 0x00, 0x30, 0x41,</div><div class='add'>+0xC0, 0x50, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x00,</div><div class='add'>+0xDC, 0x04, 0x7D, 0x00, 0xC4, 0x09, 0xF0, 0x17, 0x44, 0xDD, 0x4C, 0x71, 0x03,</div><div class='add'>+0x44, 0x01, 0x10, 0x77, 0xC0, 0x55, 0x00, 0x5B, 0x00, 0xB4, 0x11, 0xD0, 0x05,</div><div class='add'>+0x40, 0x5F, 0x00, 0x7D, 0x03, 0xC4, 0x01, 0x50, 0x36, 0x40, 0x50, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0xA0, 0xE2, 0x00, 0xCD, 0x45,</div><div class='add'>+0x14, 0x0A, 0x10, 0x24, 0x40, 0x70, 0x80, 0x81, 0x00, 0x14, 0x03, 0x10, 0x48,</div><div class='add'>+0x40, 0x33, 0x00, 0xC5, 0x00, 0x34, 0x02, 0xD0, 0x0D, 0x42, 0xA3, 0x00, 0x8D,</div><div class='add'>+0x12, 0x14, 0x03, 0x10, 0x8C, 0x40, 0x50, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x04, 0x80, 0x38, 0x00, 0xED, 0x03, 0x94, 0x05, 0x51, 0x22,</div><div class='add'>+0x40, 0x61, 0x00, 0x81, 0x10, 0x84, 0x17, 0x14, 0x0A, 0x40, 0xFD, 0x01, 0xED,</div><div class='add'>+0x04, 0xB4, 0x02, 0xD0, 0x4E, 0x00, 0x2B, 0x04, 0xBD, 0x11, 0x84, 0x03, 0x52,</div><div class='add'>+0x00, 0x40, 0x10, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14,</div><div class='add'>+0x10, 0x68, 0x00, 0xCF, 0x01, 0x15, 0x04, 0x10, 0x16, 0xE0, 0x78, 0x88, 0xA3,</div><div class='add'>+0x01, 0xDC, 0x47, 0x30, 0x1E, 0xE8, 0x7F, 0x01, 0xE7, 0x03, 0xBC, 0x06, 0xF0,</div><div class='add'>+0x1E, 0xC0, 0x6B, 0x00, 0xAF, 0x41, 0xDC, 0x07, 0x32, 0x1E, 0xC0, 0x50, 0x40,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xB8, 0x35, 0x00, 0x5F,</div><div class='add'>+0x00, 0x6C, 0x01, 0xF0, 0x01, 0xC2, 0x27, 0x00, 0x9F, 0x20, 0x7E, 0x23, 0xF0,</div><div class='add'>+0x09, 0xC0, 0x37, 0x12, 0xDB, 0x00, 0x7C, 0x02, 0xF0, 0x8D, 0xC0, 0x27, 0x00,</div><div class='add'>+0x9F, 0x00, 0x7C, 0x01, 0xF0, 0x0D, 0xD0, 0x43, 0x60, 0x06, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x02, 0xA0, 0x6F, 0x40, 0x73, 0x81, 0xE4, 0x04, 0xF1,</div><div class='add'>+0x17, 0xC0, 0x78, 0x00, 0xF3, 0x01, 0xFC, 0x07, 0xF0, 0x1B, 0xC0, 0x6F, 0x80,</div><div class='add'>+0xE7, 0x09, 0xCC, 0x07, 0xF0, 0x1F, 0xC2, 0x7C, 0x00, 0xFF, 0x01, 0xFC, 0x07,</div><div class='add'>+0x30, 0x17, 0xC0, 0x08, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x15, 0x88, 0x29, 0x00, 0x61, 0x00, 0x84, 0x10, 0x70, 0x02, 0x40, 0x98, 0x02,</div><div class='add'>+0xE1, 0x80, 0xB4, 0x03, 0xD0, 0x0A, 0x40, 0x2B, 0x81, 0xE1, 0x00, 0x84, 0x02,</div><div class='add'>+0xD0, 0x8E, 0xC0, 0x3A, 0x00, 0xED, 0x00, 0xF4, 0x23, 0x18, 0x26, 0x40, 0x54,</div><div class='add'>+0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x21, 0x00,</div><div class='add'>+0xE1, 0x00, 0x84, 0x00, 0xD1, 0x08, 0x40, 0x38, 0x00, 0xE1, 0x08, 0xB4, 0x03,</div><div class='add'>+0xD0, 0x0E, 0x41, 0x2B, 0x30, 0xF5, 0x01, 0x84, 0x03, 0xD0, 0x0F, 0x40, 0x28,</div><div class='add'>+0x04, 0xAD, 0x00, 0xB4, 0x02, 0x50, 0x26, 0x40, 0x20, 0x01, 0x04, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x16, 0x28, 0x13, 0x00, 0x11, 0x40, 0x04, 0x01,</div><div class='add'>+0x50, 0x08, 0x4C, 0x10, 0x00, 0xC9, 0x00, 0x34, 0x03, 0xD0, 0x24, 0x40, 0x23,</div><div class='add'>+0x00, 0xC1, 0x04, 0x04, 0x05, 0xD0, 0x2C, 0x40, 0x22, 0x80, 0x4D, 0x00, 0x36,</div><div class='add'>+0x0C, 0x50, 0x0C, 0x52, 0x18, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x05, 0xA8, 0x25, 0x00, 0x93, 0x00, 0x4C, 0x00, 0xF0, 0x05, 0xC4, 0x14,</div><div class='add'>+0x00, 0x93, 0x00, 0xFC, 0x03, 0xD0, 0x09, 0xC4, 0x37, 0x00, 0xD7, 0x04, 0x4D,</div><div class='add'>+0x12, 0xF0, 0x3F, 0xC1, 0x24, 0x00, 0x9F, 0x0A, 0x7C, 0x0C, 0x70, 0x29, 0xC0,</div><div class='add'>+0x54, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x37,</div><div class='add'>+0x10, 0x9F, 0x82, 0x5C, 0x01, 0xF0, 0x05, 0xC0, 0x03, 0x00, 0x97, 0x80, 0x7E,</div><div class='add'>+0x03, 0xF0, 0x09, 0xC0, 0x37, 0x00, 0xDF, 0x00, 0x7C, 0x02, 0xF0, 0x0D, 0xC1,</div><div class='add'>+0xA7, 0x00, 0x9F, 0x00, 0x7C, 0x60, 0xB4, 0x29, 0xC0, 0x27, 0x00, 0x0C, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x81, 0x0A, 0x2B, 0x20, 0x93, 0x80, 0xCC,</div><div class='add'>+0x00, 0x30, 0x07, 0xC0, 0xAF, 0x00, 0xA3, 0x09, 0x8D, 0x03, 0x32, 0x0F, 0xC1,</div><div class='add'>+0x77, 0x00, 0xFB, 0x00, 0xCC, 0x02, 0x34, 0x0F, 0x00, 0x2E, 0x00, 0xBF, 0x00,</div><div class='add'>+0xFC, 0x00, 0x30, 0x09, 0xC0, 0x07, 0x2A, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x81, 0x21, 0x36, 0x00, 0x91, 0x11, 0x14, 0x41, 0x51, 0x95, 0x40,</div><div class='add'>+0xA7, 0x00, 0x91, 0x02, 0x44, 0x03, 0x10, 0x09, 0x44, 0x67, 0x02, 0xDD, 0x00,</div><div class='add'>+0x04, 0x02, 0x30, 0x0D, 0x40, 0x27, 0x04, 0x9D, 0x00, 0x34, 0x1C, 0x10, 0xBD,</div><div class='add'>+0x44, 0x87, 0x02, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xA0,</div><div class='add'>+0x24, 0x10, 0x11, 0x81, 0x64, 0x80, 0x18, 0x05, 0x40, 0x17, 0x00, 0x91, 0x02,</div><div class='add'>+0x44, 0x03, 0x14, 0x09, 0x40, 0x27, 0x00, 0xCD, 0x00, 0x44, 0x03, 0x10, 0x0D,</div><div class='add'>+0x40, 0x36, 0x02, 0xDD, 0x00, 0x74, 0x04, 0x10, 0x01, 0x40, 0x07, 0x00, 0x0A,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x28, 0x20, 0x00, 0x01, 0x00,</div><div class='add'>+0x16, 0x80, 0x50, 0x04, 0x40, 0x13, 0x00, 0x01, 0x00, 0x04, 0x03, 0x10, 0x08,</div><div class='add'>+0x48, 0xB3, 0x20, 0xCD, 0x00, 0x05, 0x02, 0x10, 0x0C, 0x40, 0x33, 0x00, 0xCD,</div><div class='add'>+0x00, 0x74, 0x00, 0x10, 0x0C, 0x40, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x01, 0xB0, 0x26, 0x00, 0x93, 0x00, 0x4C, 0x00, 0x30, 0x09,</div><div class='add'>+0xC0, 0x27, 0x00, 0xD1, 0x00, 0xCC, 0x03, 0x30, 0x0D, 0xC0, 0x27, 0x08, 0xFB,</div><div class='add'>+0x00, 0x4C, 0x03, 0x30, 0x0D, 0xC0, 0x16, 0x00, 0x9F, 0x00, 0x7C, 0x00, 0x30,</div><div class='add'>+0x01, 0xC4, 0x07, 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05,</div><div class='add'>+0xA8, 0x1F, 0x00, 0xBF, 0x00, 0xFC, 0x01, 0xF0, 0x0B, 0xC0, 0x0F, 0x00, 0x7F,</div><div class='add'>+0x40, 0xFC, 0x03, 0xF1, 0x07, 0xC0, 0x2F, 0x01, 0xFF, 0x00, 0xFC, 0x01, 0x70,</div><div class='add'>+0x0E, 0xC0, 0x1F, 0x00, 0x7F, 0x00, 0xFC, 0x00, 0xF0, 0x0F, 0xC0, 0x17, 0x60,</div><div class='add'>+0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x88, 0x7B, 0x22, 0xFB,</div><div class='add'>+0x29, 0xEC, 0x27, 0xF0, 0x9F, 0xC4, 0x7C, 0x02, 0xEF, 0x09, 0xCC, 0x07, 0x30,</div><div class='add'>+0x9F, 0xC0, 0x7C, 0x00, 0xE3, 0x01, 0xCC, 0x07, 0xF0, 0x9F, 0xC0, 0x7C, 0x00,</div><div class='add'>+0xEF, 0x09, 0xCC, 0x07, 0xF0, 0x1F, 0xC0, 0x0F, 0x00, 0x0E, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x03, 0x18, 0x07, 0x00, 0x11, 0x04, 0x4C, 0x00, 0xD1,</div><div class='add'>+0x01, 0x00, 0x04, 0x31, 0x1D, 0x04, 0x44, 0x04, 0x50, 0x41, 0x00, 0x05, 0x05,</div><div class='add'>+0x11, 0x00, 0x5C, 0x10, 0xD0, 0x41, 0x40, 0x00, 0x25, 0x1D, 0x04, 0x44, 0x00,</div><div class='add'>+0xD0, 0x01, 0x40, 0x0F, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x13, 0xA0, 0x35, 0x00, 0xD9, 0x00, 0x24, 0x13, 0x52, 0x4C, 0x42, 0x31, 0x01,</div><div class='add'>+0xCD, 0x04, 0x44, 0x83, 0x50, 0x0D, 0x0A, 0x30, 0x00, 0xD5, 0x00, 0x04, 0x43,</div><div class='add'>+0xD0, 0x4C, 0x60, 0x30, 0x00, 0xCD, 0x00, 0x05, 0x03, 0xD0, 0x0C, 0x40, 0x4D,</div><div class='add'>+0x80, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xA0, 0x07, 0x00,</div><div class='add'>+0x11, 0x00, 0x40, 0x80, 0xD0, 0x01, 0x40, 0x05, 0x00, 0x1D, 0x00, 0x47, 0x00,</div><div class='add'>+0x50, 0x01, 0x48, 0x01, 0x40, 0x15, 0x20, 0x74, 0x00, 0xD0, 0x00, 0x48, 0x05,</div><div class='add'>+0x00, 0x0D, 0x00, 0x54, 0x00, 0xC0, 0x01, 0x40, 0x0F, 0x20, 0x06, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA8, 0x36, 0x00, 0xDB, 0x00, 0x6C, 0x03,</div><div class='add'>+0xF0, 0x0D, 0xC0, 0x35, 0x00, 0xDF, 0x40, 0x0C, 0x03, 0x70, 0x0D, 0x40, 0x34,</div><div class='add'>+0x00, 0xD7, 0x00, 0x4C, 0x03, 0xF0, 0x0D, 0xC0, 0x34, 0x00, 0xDF, 0x00, 0x4C,</div><div class='add'>+0x03, 0xE0, 0x0D, 0xC0, 0x03, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x07, 0x80, 0x0D, 0x00, 0x3F, 0x00, 0xDC, 0x40, 0xF3, 0x03, 0xD4, 0x0E,</div><div class='add'>+0x10, 0x3F, 0x00, 0xF8, 0x40, 0xF0, 0x03, 0xC0, 0x0F, 0x20, 0x3B, 0x00, 0xDC,</div><div class='add'>+0x00, 0xF1, 0x03, 0xC0, 0x0E, 0x00, 0x3F, 0x00, 0xEC, 0x00, 0xF0, 0x03, 0xC0,</div><div class='add'>+0x1F, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x08, 0x35,</div><div class='add'>+0x00, 0xD7, 0x04, 0x7C, 0x03, 0xF0, 0x4D, 0xC0, 0x37, 0x00, 0xD7, 0x60, 0x5C,</div><div class='add'>+0x07, 0xB0, 0x0D, 0xC0, 0x37, 0x00, 0xD7, 0x00, 0x4C, 0x13, 0xF0, 0x0D, 0xC0,</div><div class='add'>+0x34, 0x40, 0xD3, 0x04, 0x4C, 0x43, 0xF0, 0x0D, 0xC0, 0xAB, 0x20, 0x04, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xA0, 0x00, 0x06, 0x01, 0x12, 0x74,</div><div class='add'>+0x14, 0xD0, 0x71, 0x60, 0x07, 0x00, 0x11, 0x00, 0x6C, 0x00, 0x10, 0x00, 0x40,</div><div class='add'>+0xC7, 0x02, 0x0D, 0x11, 0x6C, 0x18, 0xD2, 0x01, 0x40, 0x04, 0x00, 0x11, 0x12,</div><div class='add'>+0x6C, 0x00, 0xD0, 0xB1, 0x40, 0x4C, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x03, 0x20, 0xF0, 0x10, 0xC5, 0x80, 0x34, 0x03, 0xD1, 0x0D, 0x42,</div><div class='add'>+0x33, 0x00, 0xDD, 0x00, 0x24, 0x0B, 0x90, 0x0C, 0x40, 0xB3, 0x00, 0xC5, 0x01,</div><div class='add'>+0x04, 0x0F, 0xD8, 0x0C, 0x40, 0x32, 0x00, 0xC1, 0x01, 0x04, 0x0B, 0xD2, 0x1C,</div><div class='add'>+0x40, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1F, 0x02,</div><div class='add'>+0x4C, 0x00, 0x21, 0x01, 0xB4, 0x04, 0xD9, 0x12, 0x40, 0x4F, 0x02, 0x39, 0x01,</div><div class='add'>+0xA4, 0x04, 0x10, 0x12, 0x40, 0x4B, 0x04, 0x3D, 0x01, 0xA6, 0x24, 0xD0, 0x12,</div><div class='add'>+0x68, 0x4A, 0x00, 0x31, 0x01, 0xA4, 0x04, 0xD0, 0x12, 0x53, 0x3C, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x10, 0x30, 0x00, 0xC7, 0x00,</div><div class='add'>+0x3C, 0x03, 0xF0, 0x0C, 0x48, 0x33, 0x10, 0xCF, 0x00, 0x3C, 0x03, 0xB0, 0x0C,</div><div class='add'>+0x40, 0x33, 0x00, 0xC7, 0x00, 0x0C, 0xA3, 0xF1, 0x0D, 0xCC, 0x32, 0x80, 0xC3,</div><div class='add'>+0x00, 0x0C, 0x03, 0xF0, 0x0D, 0xC0, 0x49, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x02, 0x38, 0x0D, 0x00, 0x3F, 0x00, 0xFC, 0x00, 0xF8, 0x03,</div><div class='add'>+0x80, 0x0B, 0x08, 0x36, 0x00, 0xBC, 0x00, 0xF0, 0x03, 0xC0, 0x0F, 0x00, 0x3F,</div><div class='add'>+0x00, 0xFC, 0x20, 0xD2, 0x03, 0xC0, 0x0D, 0x10, 0x3F, 0x00, 0xFC, 0x00, 0xFA,</div><div class='add'>+0x11, 0xC0, 0x09, 0x60, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10,</div><div class='add'>+0xA8, 0x77, 0x20, 0xD7, 0x41, 0x6C, 0x03, 0xF0, 0x0D, 0xC0, 0x74, 0x00, 0xC3,</div><div class='add'>+0x01, 0x4C, 0x03, 0xF0, 0x0D, 0xC0, 0x33, 0x00, 0xD3, 0x01, 0x4D, 0x03, 0x70,</div><div class='add'>+0x1D, 0xC0, 0x30, 0x00, 0xD3, 0x01, 0x4C, 0x07, 0x30, 0x1D, 0xD0, 0x40, 0x00,</div><div class='add'>+0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0x80, 0x0D, 0x48, 0x21,</div><div class='add'>+0x40, 0x84, 0x00, 0xD0, 0x02, 0x40, 0x09, 0x00, 0x25, 0x00, 0x90, 0x00, 0xD0,</div><div class='add'>+0x02, 0x40, 0x0B, 0x00, 0x35, 0x00, 0xC4, 0x00, 0x10, 0x02, 0x40, 0x09, 0x00,</div><div class='add'>+0x2B, 0x40, 0x84, 0x00, 0xB0, 0x03, 0xC0, 0x4E, 0x08, 0x06, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x79, 0x00, 0xF9, 0x01, 0xA4, 0x07, 0xC2,</div><div class='add'>+0x1F, 0x40, 0x7C, 0x00, 0xF5, 0x01, 0x84, 0x07, 0xD0, 0x1E, 0x40, 0x7F, 0x00,</div><div class='add'>+0xE1, 0x01, 0x94, 0x07, 0x50, 0x1F, 0x48, 0x7C, 0x80, 0xE1, 0x01, 0xC4, 0x07,</div><div class='add'>+0x18, 0x1E, 0x48, 0x10, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x16, 0x28, 0x03, 0x00, 0x09, 0x00, 0x40, 0x00, 0xD8, 0x00, 0x42, 0x01, 0x00,</div><div class='add'>+0x05, 0x20, 0x14, 0x00, 0xD0, 0x00, 0x40, 0x07, 0x00, 0x05, 0x00, 0x14, 0x00,</div><div class='add'>+0x50, 0x00, 0x40, 0x05, 0x08, 0x09, 0x00, 0x04, 0x00, 0x98, 0x00, 0x40, 0x5A,</div><div class='add'>+0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x17, 0x28, 0x15, 0x00,</div><div class='add'>+0x5B, 0x00, 0x6C, 0x01, 0xD0, 0x04, 0xC0, 0x14, 0x00, 0x57, 0x00, 0x4C, 0x01,</div><div class='add'>+0xF0, 0x05, 0xC4, 0x17, 0x00, 0x53, 0x00, 0x1C, 0x01, 0x70, 0x05, 0xC0, 0x14,</div><div class='add'>+0x08, 0x53, 0x60, 0x4C, 0x01, 0x30, 0x05, 0x40, 0x5C, 0x00, 0x04, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x8D, 0x00, 0x37, 0x02, 0xFC, 0x00,</div><div class='add'>+0xF0, 0x03, 0xC0, 0x0F, 0x00, 0x3F, 0x00, 0xFC, 0x08, 0xF0, 0x03, 0xC8, 0x0F,</div><div class='add'>+0x00, 0x3F, 0x02, 0xE4, 0x08, 0xB0, 0x03, 0xC0, 0x0F, 0x00, 0x3F, 0x80, 0xFD,</div><div class='add'>+0x00, 0xF0, 0x03, 0xC0, 0x4B, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x10, 0x08, 0x25, 0x00, 0x9F, 0x00, 0x7C, 0x02, 0x30, 0x19, 0x40, 0x24,</div><div class='add'>+0x00, 0x9F, 0x00, 0x7C, 0x02, 0xF0, 0x09, 0xC0, 0x24, 0x00, 0x93, 0x00, 0x7C,</div><div class='add'>+0x16, 0x30, 0x09, 0xC0, 0x27, 0x40, 0x93, 0x04, 0x78, 0x16, 0xF0, 0x09, 0xC0,</div><div class='add'>+0x43, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x24,</div><div class='add'>+0x01, 0x9D, 0x00, 0x74, 0x42, 0x14, 0x59, 0xC0, 0x26, 0x00, 0x9D, 0x00, 0x74,</div><div class='add'>+0x0A, 0xD0, 0x09, 0x40, 0xA4, 0x00, 0x91, 0x9A, 0x74, 0x8E, 0xB2, 0x09, 0x40,</div><div class='add'>+0x27, 0x10, 0x91, 0x02, 0x64, 0x16, 0xD1, 0x09, 0x40, 0x07, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0xA0, 0x6C, 0x80, 0xBD, 0x01, 0xE4,</div><div class='add'>+0x06, 0x10, 0x4B, 0x40, 0x2D, 0x00, 0xBD, 0x00, 0xF4, 0x0E, 0xD0, 0x0A, 0x40,</div><div class='add'>+0x2C, 0x04, 0xB1, 0x00, 0xF4, 0x02, 0x10, 0x0B, 0x00, 0x2F, 0x00, 0xB1, 0x10,</div><div class='add'>+0xF4, 0x02, 0xD0, 0x0B, 0x41, 0x63, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x10, 0x20, 0x28, 0x00, 0xEC, 0x00, 0xB4, 0x02, 0x10, 0x0B, 0x40,</div><div class='add'>+0x2B, 0x22, 0xAD, 0x08, 0xB4, 0x82, 0xD0, 0x8A, 0x60, 0x28, 0x42, 0xA1, 0x40,</div><div class='add'>+0xF4, 0x02, 0x90, 0x8A, 0x40, 0x2B, 0x0A, 0xA1, 0x08, 0xA4, 0x02, 0xD0, 0x0A,</div><div class='add'>+0x40, 0x43, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xB8,</div><div class='add'>+0x06, 0x00, 0x1F, 0x40, 0x6C, 0x00, 0x30, 0x01, 0xC0, 0x85, 0x00, 0x1D, 0x02,</div><div class='add'>+0x7C, 0x00, 0xF0, 0x21, 0xD0, 0x84, 0x00, 0x13, 0x0A, 0x7C, 0x01, 0x30, 0x21,</div><div class='add'>+0xC0, 0x87, 0x08, 0x03, 0x22, 0x7C, 0x00, 0xF0, 0x03, 0xE0, 0x77, 0xE0, 0x0A,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xB8, 0x27, 0x05, 0x8D, 0x14,</div><div class='add'>+0x7C, 0x52, 0xF0, 0x48, 0xC1, 0x22, 0x01, 0x9F, 0x04, 0x7C, 0x02, 0xF0, 0x49,</div><div class='add'>+0xC0, 0x27, 0x01, 0x9F, 0x81, 0x7C, 0x52, 0xF0, 0x48, 0xC0, 0x27, 0x01, 0x9F,</div><div class='add'>+0x24, 0x3C, 0x52, 0xF0, 0x49, 0xC1, 0x77, 0x60, 0x0E, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x1D, 0xA0, 0xAF, 0x00, 0xB7, 0x02, 0xDC, 0x0A, 0xB0, 0x2B,</div><div class='add'>+0xC0, 0x27, 0x00, 0x9F, 0x02, 0xDC, 0x02, 0x30, 0x89, 0xC0, 0x2F, 0x10, 0xB3,</div><div class='add'>+0x00, 0xFC, 0x02, 0xF0, 0x29, 0xC0, 0xA7, 0x10, 0xBF, 0x00, 0xCC, 0x02, 0xB0,</div><div class='add'>+0x0B, 0xC0, 0x77, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18,</div><div class='add'>+0x00, 0x05, 0x01, 0x11, 0x81, 0x44, 0x00, 0x10, 0x41, 0x40, 0x07, 0x05, 0x1D,</div><div class='add'>+0x00, 0x44, 0x00, 0x50, 0x01, 0x40, 0x07, 0x01, 0x11, 0x00, 0x74, 0x50, 0xD0,</div><div class='add'>+0x01, 0x40, 0x07, 0x00, 0x1D, 0x00, 0x44, 0x00, 0x50, 0x01, 0x40, 0x63, 0x00,</div><div class='add'>+0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x20, 0x21, 0x01, 0x85,</div><div class='add'>+0x00, 0x54, 0x12, 0x90, 0x48, 0x40, 0x23, 0x80, 0x8D, 0x04, 0x44, 0x02, 0x10,</div><div class='add'>+0x48, 0x40, 0x23, 0x44, 0x81, 0x00, 0x34, 0x02, 0xD0, 0x08, 0x40, 0x23, 0x80,</div><div class='add'>+0x8D, 0x00, 0x06, 0x02, 0x90, 0x08, 0x40, 0x4B, 0x00, 0x04, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x18, 0x28, 0x25, 0x00, 0x91, 0x00, 0x44, 0x03, 0x08,</div><div class='add'>+0x09, 0x40, 0x27, 0x00, 0x8C, 0x00, 0x45, 0x82, 0x50, 0x09, 0x42, 0x23, 0x08,</div><div class='add'>+0x91, 0x00, 0x74, 0x02, 0xD0, 0x09, 0x40, 0x27, 0x00, 0x9D, 0x00, 0x44, 0x02,</div><div class='add'>+0xD8, 0x09, 0x40, 0x63, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x05, 0x20, 0x25, 0x00, 0x97, 0x00, 0x1C, 0x02, 0xB0, 0x09, 0xC4, 0x27, 0x00,</div><div class='add'>+0x9F, 0x00, 0x5C, 0x02, 0x30, 0x09, 0xC0, 0x27, 0x00, 0x92, 0x00, 0x7C, 0x02,</div><div class='add'>+0xF0, 0x09, 0xC0, 0x27, 0x00, 0x9F, 0x00, 0x4C, 0x02, 0xB0, 0x09, 0xC8, 0x17,</div><div class='add'>+0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16, 0x88, 0x25, 0x00,</div><div class='add'>+0x9F, 0x00, 0x7C, 0x02, 0xF8, 0x09, 0xC0, 0x27, 0x00, 0x9F, 0x80, 0x7C, 0x02,</div><div class='add'>+0xF0, 0x09, 0xC2, 0x27, 0x00, 0x9F, 0x00, 0x7C, 0x02, 0xF0, 0x09, 0xC0, 0x27,</div><div class='add'>+0x00, 0x9F, 0x80, 0x7D, 0x42, 0x70, 0x09, 0xC0, 0x5B, 0x20, 0x04, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x08, 0x05, 0x00, 0x1D, 0x10, 0x7C, 0x10,</div><div class='add'>+0xD0, 0x01, 0xC0, 0x07, 0x00, 0x1B, 0x00, 0x5C, 0x00, 0x70, 0x01, 0xC0, 0x04,</div><div class='add'>+0x00, 0x1B, 0x49, 0x7C, 0x40, 0xF0, 0x01, 0xC0, 0x04, 0x00, 0x1F, 0x00, 0x7C,</div><div class='add'>+0x00, 0xB4, 0x41, 0xC0, 0x53, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x10, 0xA0, 0xDC, 0x00, 0x7D, 0x23, 0xF4, 0x9D, 0x10, 0x97, 0x40, 0x17,</div><div class='add'>+0x00, 0x5D, 0x00, 0xB4, 0x21, 0xD0, 0x05, 0x40, 0x1C, 0x00, 0x7D, 0x01, 0xF4,</div><div class='add'>+0x01, 0xD0, 0x05, 0x40, 0x15, 0x20, 0x7D, 0x02, 0xF4, 0x09, 0x10, 0x07, 0x40,</div><div class='add'>+0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xA0, 0xB6,</div><div class='add'>+0x06, 0xDD, 0x0B, 0x34, 0x03, 0x50, 0xAC, 0x40, 0x33, 0x00, 0xCD, 0x80, 0x14,</div><div class='add'>+0x8F, 0xD0, 0x0C, 0x50, 0x70, 0x80, 0xC9, 0x21, 0x32, 0x27, 0xD0, 0x0C, 0x40,</div><div class='add'>+0x32, 0x00, 0xDD, 0x12, 0x74, 0x23, 0x10, 0x1C, 0x40, 0x43, 0x00, 0x0A, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x80, 0x39, 0x00, 0xED, 0x00, 0xF4,</div><div class='add'>+0x03, 0x10, 0x0E, 0x40, 0x3B, 0x03, 0xEC, 0x04, 0xB4, 0x0A, 0xC0, 0x5E, 0x40,</div><div class='add'>+0x38, 0x04, 0xE9, 0x00, 0xB4, 0x03, 0xD0, 0x5F, 0x40, 0x3B, 0x00, 0x2D, 0x10,</div><div class='add'>+0xB4, 0x03, 0x10, 0x2E, 0x40, 0x13, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x14, 0x18, 0x79, 0x00, 0xEF, 0x01, 0xBC, 0x07, 0x70, 0x1E, 0xC0,</div><div class='add'>+0x7B, 0x05, 0xEB, 0x89, 0x9C, 0x07, 0x70, 0xBF, 0xC0, 0x78, 0x20, 0x2B, 0x21,</div><div class='add'>+0xBC, 0x07, 0xF0, 0x3E, 0xC0, 0x7A, 0x05, 0xEF, 0x01, 0xFC, 0x07, 0x31, 0x1E,</div><div class='add'>+0xC0, 0x53, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xB8,</div><div class='add'>+0x15, 0x10, 0x5F, 0x00, 0x3C, 0x03, 0x70, 0x0D, 0x80, 0xB7, 0x01, 0xDF, 0x0C,</div><div class='add'>+0x7C, 0x00, 0xF0, 0x4D, 0xC0, 0x17, 0x00, 0x1F, 0x20, 0x7C, 0x03, 0xF0, 0x0C,</div><div class='add'>+0x41, 0x35, 0x08, 0x1F, 0x00, 0x7C, 0x01, 0x70, 0x0D, 0xC0, 0x43, 0x60, 0x06,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x7D, 0x00, 0xFF, 0x89,</div><div class='add'>+0xF8, 0x05, 0x70, 0x1F, 0xC2, 0x7D, 0x00, 0xFB, 0x01, 0xFC, 0x07, 0xF0, 0x1F,</div><div class='add'>+0xC0, 0x6F, 0x00, 0xF7, 0x01, 0xCE, 0x25, 0x30, 0x1F, 0xC0, 0x7F, 0x04, 0xF3,</div><div class='add'>+0x01, 0x8C, 0x25, 0x30, 0x1E, 0xC0, 0x18, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x15, 0x08, 0x39, 0x04, 0xED, 0x08, 0xF4, 0x11, 0x00, 0x0E,</div><div class='add'>+0x40, 0x3F, 0x00, 0xE0, 0x10, 0xB4, 0x42, 0xD0, 0x8E, 0x41, 0x3B, 0x00, 0xF5,</div><div class='add'>+0x02, 0x94, 0x0B, 0x50, 0x0E, 0xC0, 0x3B, 0x00, 0x3B, 0x08, 0x85, 0x39, 0xB0,</div><div class='add'>+0x0A, 0x40, 0x55, 0x40, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x98,</div><div class='add'>+0x00, 0x39, 0x02, 0xED, 0x08, 0xB0, 0x01, 0xD1, 0x06, 0x40, 0x39, 0x04, 0xE9,</div><div class='add'>+0x08, 0xB4, 0x02, 0xD0, 0x0E, 0x40, 0x2F, 0x00, 0x71, 0x08, 0xC4, 0x01, 0x90,</div><div class='add'>+0x0E, 0x40, 0x3F, 0x00, 0xE9, 0x00, 0xC4, 0x00, 0x18, 0x07, 0x40, 0x20, 0x00,</div><div class='add'>+0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x08, 0x21, 0x10, 0x9D,</div><div class='add'>+0x03, 0x34, 0x00, 0x90, 0x89, 0x40, 0xF2, 0x80, 0xC1, 0x02, 0x34, 0x0C, 0xD0,</div><div class='add'>+0x1C, 0x60, 0x57, 0x00, 0x05, 0x06, 0x14, 0x0E, 0xD8, 0x2C, 0x40, 0xB1, 0x00,</div><div class='add'>+0xCD, 0x0A, 0x00, 0xAC, 0x98, 0x00, 0x42, 0x09, 0x00, 0x04, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x55, 0xA0, 0xC4, 0x20, 0x1F, 0x52, 0x7C, 0x0A, 0xD0,</div><div class='add'>+0xA1, 0xC0, 0xFD, 0x80, 0xFB, 0x01, 0x7C, 0x2C, 0xF0, 0x0F, 0xC8, 0xD7, 0x01,</div><div class='add'>+0x93, 0x11, 0x4C, 0x12, 0xB0, 0x3F, 0x41, 0xBF, 0x00, 0xC9, 0x08, 0x48, 0x0E,</div><div class='add'>+0x10, 0x91, 0xC0, 0x74, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x0D, 0x08, 0x27, 0x20, 0x9F, 0x84, 0x7E, 0x60, 0x70, 0x21, 0xC8, 0x37, 0x09,</div><div class='add'>+0xDF, 0x00, 0x7C, 0x08, 0xF0, 0x0D, 0xC1, 0xA6, 0x00, 0x9E, 0x40, 0x7E, 0x40,</div><div class='add'>+0x70, 0x0D, 0xC1, 0x37, 0x22, 0x1B, 0x00, 0x7C, 0x1A, 0xF0, 0x89, 0xC4, 0x97,</div><div class='add'>+0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x81, 0x08, 0x0B, 0x84,</div><div class='add'>+0x33, 0x80, 0xCC, 0x02, 0xF0, 0x03, 0xC0, 0x3E, 0x00, 0xF7, 0x10, 0xF8, 0x00,</div><div class='add'>+0xF2, 0x0F, 0xC0, 0x1C, 0x04, 0x33, 0x80, 0xFC, 0x02, 0xF0, 0x0F, 0xC0, 0x3F,</div><div class='add'>+0x04, 0xFF, 0x00, 0xCC, 0x02, 0xF0, 0x03, 0xC0, 0x04, 0x20, 0x0C, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x81, 0x20, 0x46, 0x08, 0x17, 0x11, 0x4C, 0x06,</div><div class='add'>+0xD0, 0x11, 0x40, 0x34, 0x00, 0xD1, 0x80, 0x74, 0x04, 0xF0, 0x0C, 0x40, 0x85,</div><div class='add'>+0x02, 0x11, 0x03, 0x64, 0x06, 0xD0, 0x0D, 0x40, 0x37, 0x08, 0x1D, 0x11, 0x6C,</div><div class='add'>+0x04, 0xD0, 0x38, 0xC8, 0x06, 0x04, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x01, 0xA0, 0x44, 0x04, 0x11, 0x21, 0x54, 0x06, 0xD8, 0x39, 0x66, 0x32,</div><div class='add'>+0x00, 0xD5, 0x00, 0x74, 0x0E, 0xD0, 0x0D, 0x40, 0x04, 0x04, 0x31, 0x21, 0x74,</div><div class='add'>+0x04, 0xD8, 0x0D, 0x40, 0x37, 0x00, 0xDD, 0x08, 0x44, 0x06, 0xD0, 0x31, 0x40,</div><div class='add'>+0x04, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x0A, 0x24,</div><div class='add'>+0x00, 0x85, 0x00, 0x05, 0x00, 0xD2, 0x08, 0x60, 0x30, 0x00, 0xC1, 0x00, 0x34,</div><div class='add'>+0x02, 0xD0, 0x0D, 0x40, 0x21, 0x20, 0x01, 0x00, 0x34, 0x00, 0xD2, 0x0C, 0x40,</div><div class='add'>+0x33, 0x00, 0x1D, 0x00, 0x24, 0x02, 0xD0, 0x09, 0x40, 0x42, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x30, 0x06, 0x00, 0x11, 0x00, 0x5C,</div><div class='add'>+0x82, 0xF8, 0x01, 0xC0, 0x3E, 0x00, 0xF6, 0x00, 0x7C, 0x02, 0xF0, 0x0F, 0x40,</div><div class='add'>+0x04, 0x00, 0x13, 0x00, 0x74, 0x00, 0xF0, 0x0F, 0xC0, 0x3F, 0x90, 0x1F, 0x00,</div><div class='add'>+0x4C, 0x02, 0xF0, 0x01, 0xC0, 0x04, 0x60, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x85, 0xA8, 0x2F, 0x00, 0xB6, 0x00, 0xCC, 0x02, 0xF8, 0x0B, 0xC0,</div><div class='add'>+0x3F, 0x00, 0xFE, 0x80, 0xFC, 0x00, 0x70, 0x0F, 0xC0, 0x0B, 0x40, 0x3F, 0x00,</div><div class='add'>+0xA4, 0x02, 0xF2, 0x0F, 0xC0, 0x3B, 0x00, 0x3F, 0x00, 0xFC, 0x00, 0xF0, 0x03,</div><div class='add'>+0xC0, 0x17, 0x61, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xA8,</div><div class='add'>+0x7F, 0x40, 0xF3, 0x46, 0xFC, 0x03, 0x30, 0x4F, 0xC0, 0x4F, 0x12, 0x3B, 0x4C,</div><div class='add'>+0xCC, 0x23, 0x30, 0x4F, 0xC2, 0x0C, 0x80, 0x3F, 0x01, 0xFC, 0x07, 0x71, 0x8F,</div><div class='add'>+0xC0, 0x0F, 0x08, 0x73, 0x01, 0xFC, 0x00, 0x30, 0x03, 0xC0, 0x0C, 0x00, 0x0E,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x10, 0x7D, 0x00, 0xE1, 0x08,</div><div class='add'>+0xF4, 0xAF, 0x10, 0xBF, 0x40, 0x27, 0x01, 0x5D, 0x08, 0xC4, 0x3B, 0x50, 0x9F,</div><div class='add'>+0x40, 0x44, 0x00, 0x5D, 0x00, 0xF4, 0x07, 0x10, 0x0F, 0x40, 0x07, 0x00, 0xD5,</div><div class='add'>+0x81, 0x74, 0x00, 0xB1, 0x01, 0x80, 0x0E, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x13, 0x20, 0x33, 0x00, 0xC4, 0x04, 0x34, 0x03, 0x55, 0x0C,</div><div class='add'>+0x40, 0x43, 0x01, 0x8D, 0x44, 0x14, 0x03, 0x50, 0x0C, 0x50, 0x00, 0x00, 0x0D,</div><div class='add'>+0x80, 0x34, 0x03, 0x10, 0x4C, 0x40, 0x07, 0x00, 0x41, 0x00, 0x34, 0x00, 0xD0,</div><div class='add'>+0x00, 0x40, 0x4D, 0x80, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03,</div><div class='add'>+0xA0, 0x35, 0x00, 0xD5, 0x00, 0x70, 0x03, 0x50, 0x0D, 0x40, 0x67, 0x00, 0x5D,</div><div class='add'>+0x14, 0x54, 0x03, 0x10, 0x0D, 0x00, 0x6C, 0x00, 0x5D, 0x10, 0x74, 0x03, 0x10,</div><div class='add'>+0x0F, 0x40, 0x6F, 0x00, 0xD5, 0x04, 0x70, 0x06, 0xD0, 0x11, 0x40, 0x0F, 0x20,</div><div class='add'>+0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA8, 0x36, 0x00, 0xD7,</div><div class='add'>+0x00, 0x7E, 0x03, 0x70, 0x0D, 0xC4, 0x47, 0x00, 0x1B, 0x03, 0x5D, 0x03, 0x70,</div><div class='add'>+0x0D, 0x80, 0x44, 0x20, 0xDD, 0x00, 0x3C, 0x03, 0x74, 0x0D, 0xC4, 0x47, 0x00,</div><div class='add'>+0x93, 0x06, 0x78, 0x04, 0x70, 0x51, 0xC0, 0x01, 0x00, 0x0E, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x07, 0x80, 0x3D, 0x00, 0xFB, 0x00, 0xBC, 0x03, 0xB0,</div><div class='add'>+0x0F, 0xC0, 0x0F, 0x00, 0x6A, 0x20, 0xEC, 0x03, 0xF0, 0x0F, 0x84, 0x0F, 0x08,</div><div class='add'>+0xFC, 0x00, 0xFE, 0x03, 0xE0, 0x0F, 0x80, 0x0F, 0x00, 0xBF, 0x01, 0xB8, 0x02,</div><div class='add'>+0xB0, 0x09, 0xC2, 0x3E, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x02, 0x08, 0x31, 0x10, 0xD3, 0x40, 0x5C, 0x03, 0xF3, 0x0D, 0xC0, 0x06, 0x00,</div><div class='add'>+0x9F, 0x02, 0x2C, 0x03, 0x70, 0x4C, 0xC0, 0x26, 0x04, 0xD7, 0x22, 0x7C, 0x13,</div><div class='add'>+0x30, 0x0D, 0xC0, 0x24, 0x00, 0x9F, 0x02, 0x4C, 0x00, 0x30, 0x01, 0xC0, 0x28,</div><div class='add'>+0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xA0, 0x34, 0x00,</div><div class='add'>+0xF1, 0x20, 0xC4, 0x17, 0xD0, 0x4F, 0x40, 0x24, 0x00, 0x5D, 0x40, 0xC0, 0x17,</div><div class='add'>+0x10, 0x7F, 0x40, 0xE7, 0x00, 0xDD, 0x06, 0x70, 0x03, 0x11, 0xAF, 0x10, 0x24,</div><div class='add'>+0x00, 0x9D, 0x45, 0x44, 0x46, 0x11, 0x19, 0x11, 0x4C, 0x00, 0x02, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0xA0, 0x72, 0x40, 0xC9, 0x20, 0x24, 0x03,</div><div class='add'>+0xD0, 0x6C, 0x40, 0x22, 0x00, 0x08, 0x20, 0x20, 0x03, 0xD0, 0x1C, 0x40, 0xC2,</div><div class='add'>+0x88, 0x84, 0x20, 0x30, 0x0B, 0x10, 0x0C, 0x40, 0x04, 0x00, 0x8D, 0x21, 0x25,</div><div class='add'>+0x04, 0x14, 0x11, 0x02, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x0F, 0x00, 0x70, 0x04, 0xE9, 0x01, 0xB4, 0x17, 0xD8, 0x1E, 0x40, 0x6A,</div><div class='add'>+0x08, 0xAD, 0x05, 0xA4, 0x07, 0x90, 0x1E, 0x4A, 0x5B, 0x0A, 0xED, 0x6B, 0x34,</div><div class='add'>+0x07, 0x81, 0x9E, 0x42, 0x58, 0x00, 0xAD, 0x01, 0xB6, 0x05, 0x10, 0xB6, 0x40,</div><div class='add'>+0x3C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x18, 0x30,</div><div class='add'>+0x00, 0xCB, 0x00, 0x2C, 0x03, 0xF0, 0x0C, 0xC0, 0x22, 0x01, 0x9F, 0x00, 0x6C,</div><div class='add'>+0x03, 0xF0, 0x0C, 0xC0, 0x02, 0x04, 0x87, 0x05, 0x3C, 0x43, 0x20, 0x0D, 0xC0,</div><div class='add'>+0x10, 0x00, 0xCF, 0x00, 0x6C, 0x01, 0x30, 0x00, 0xC0, 0x48, 0x68, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x38, 0x7D, 0x00, 0xF7, 0x10, 0xC1,</div><div class='add'>+0x53, 0xF0, 0x0E, 0xC0, 0x3D, 0x00, 0xBB, 0x04, 0xDC, 0x0B, 0x7A, 0x8F, 0xC1,</div><div class='add'>+0x3F, 0x08, 0xFF, 0x28, 0xFC, 0x07, 0x72, 0x2F, 0xC0, 0x3F, 0x00, 0xEF, 0x00,</div><div class='add'>+0x4C, 0x03, 0xF0, 0x07, 0xC0, 0x0B, 0x60, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x10, 0xA0, 0x37, 0x00, 0xDF, 0x03, 0x5C, 0x4F, 0x30, 0x3D, 0xC9,</div><div class='add'>+0x04, 0x10, 0x5F, 0x40, 0x4C, 0x37, 0x30, 0x2D, 0xC0, 0x56, 0x40, 0xDB, 0x01,</div><div class='add'>+0x4C, 0x03, 0xB3, 0x2D, 0xC2, 0x14, 0x00, 0x8F, 0x00, 0x4C, 0x00, 0xF0, 0x0D,</div><div class='add'>+0xC0, 0x40, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0x80,</div><div class='add'>+0x39, 0x01, 0xCD, 0x14, 0x02, 0x13, 0xB0, 0x4C, 0x4A, 0x08, 0x00, 0xCC, 0x00,</div><div class='add'>+0x84, 0x13, 0xB0, 0x4E, 0x41, 0x1B, 0x00, 0xE1, 0x00, 0x84, 0x0B, 0xD0, 0x0F,</div><div class='add'>+0x40, 0x18, 0x00, 0xAD, 0x00, 0x84, 0x03, 0xD0, 0x0E, 0xC0, 0x4E, 0x00, 0x06,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x79, 0x02, 0xED, 0x01,</div><div class='add'>+0x94, 0x17, 0x10, 0x9E, 0x40, 0x79, 0x00, 0xED, 0x01, 0x04, 0x17, 0x10, 0x1E,</div><div class='add'>+0x40, 0x61, 0x88, 0xE1, 0x21, 0x96, 0x17, 0xD0, 0x9E, 0x44, 0x78, 0x00, 0xBD,</div><div class='add'>+0x01, 0x85, 0x05, 0xD0, 0x1C, 0x40, 0x11, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x16, 0x28, 0x33, 0x00, 0xCD, 0x00, 0x14, 0x03, 0x90, 0x0C,</div><div class='add'>+0x40, 0x71, 0x01, 0xCD, 0x88, 0x04, 0x03, 0x90, 0x0C, 0x40, 0x33, 0x00, 0xC1,</div><div class='add'>+0x3A, 0x14, 0x03, 0xD0, 0x0C, 0x42, 0xF0, 0x04, 0x8D, 0x03, 0x44, 0x0B, 0xD0,</div><div class='add'>+0x8D, 0x40, 0x5B, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x17,</div><div class='add'>+0x20, 0x15, 0x00, 0x5F, 0x00, 0x5C, 0x01, 0x30, 0x05, 0x40, 0xDD, 0x01, 0x7F,</div><div class='add'>+0xC1, 0x4D, 0x01, 0x31, 0x05, 0xC0, 0x9E, 0x04, 0x71, 0x03, 0x5C, 0x01, 0xB0,</div><div class='add'>+0x05, 0xC4, 0xDC, 0x01, 0x7F, 0x59, 0xCC, 0x09, 0xF0, 0xB7, 0x40, 0x5D, 0x00,</div><div class='add'>+0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x08, 0x05, 0x00, 0x1F,</div><div class='add'>+0x00, 0x64, 0x00, 0xF0, 0x21, 0x50, 0x06, 0x20, 0x0B, 0x80, 0x7C, 0x00, 0xF0,</div><div class='add'>+0x01, 0xC0, 0x86, 0x04, 0x17, 0x00, 0x68, 0x08, 0xA2, 0x01, 0xD0, 0x07, 0x08,</div><div class='add'>+0x1F, 0x22, 0x7C, 0x48, 0xF0, 0x01, 0xC0, 0x4A, 0x20, 0x04, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x10, 0x08, 0x65, 0x00, 0x9F, 0x00, 0x6C, 0x82, 0xF0,</div><div class='add'>+0x09, 0xC0, 0x27, 0x00, 0x97, 0x00, 0x6C, 0x22, 0xF0, 0x49, 0xC4, 0x27, 0x00,</div><div class='add'>+0x9F, 0x00, 0x7C, 0x0A, 0xD0, 0x29, 0xC0, 0x24, 0x00, 0x9F, 0x00, 0x50, 0x02,</div><div class='add'>+0x30, 0x09, 0xC0, 0x40, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x01, 0x20, 0x2C, 0x00, 0x9D, 0x40, 0x74, 0x02, 0xD0, 0xA9, 0x40, 0x27, 0x10,</div><div class='add'>+0x94, 0x00, 0x44, 0x02, 0xD0, 0x29, 0x04, 0xA7, 0x01, 0x9D, 0x11, 0xF4, 0x4E,</div><div class='add'>+0xC2, 0x29, 0x50, 0x24, 0x00, 0x8D, 0x04, 0x44, 0x2A, 0x50, 0x09, 0x40, 0x04,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0xA0, 0x24, 0x02,</div><div class='add'>+0x9D, 0x00, 0x74, 0x22, 0xD0, 0x09, 0x40, 0x23, 0x00, 0x90, 0x40, 0x64, 0x02,</div><div class='add'>+0xD0, 0x09, 0x01, 0x26, 0x82, 0x9D, 0x01, 0x74, 0x02, 0xC0, 0x28, 0x40, 0x24,</div><div class='add'>+0x00, 0x9C, 0x80, 0x54, 0x02, 0x12, 0x29, 0x46, 0x60, 0x00, 0x02, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x20, 0x21, 0x00, 0x8D, 0x48, 0x34, 0x02,</div><div class='add'>+0xD1, 0x08, 0x40, 0x23, 0x62, 0x81, 0x08, 0x04, 0x0A, 0xD0, 0x08, 0x40, 0x23,</div><div class='add'>+0x21, 0x8D, 0x20, 0x34, 0x02, 0xD0, 0xC8, 0x40, 0x20, 0x01, 0x8D, 0x80, 0x10,</div><div class='add'>+0x53, 0x52, 0x48, 0x41, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x1D, 0xB8, 0x46, 0x00, 0x1F, 0x36, 0x7C, 0x50, 0xF0, 0x45, 0xC1, 0x87,</div><div class='add'>+0x00, 0x12, 0x16, 0x6C, 0x50, 0xF1, 0x41, 0x81, 0x46, 0x00, 0x0F, 0x0A, 0x7C,</div><div class='add'>+0x04, 0xF0, 0x31, 0xC4, 0xC4, 0x02, 0x1F, 0x00, 0x58, 0x10, 0x30, 0x41, 0xE2,</div><div class='add'>+0x74, 0xE0, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xB8, 0xA7,</div><div class='add'>+0x00, 0x9F, 0x24, 0x78, 0x82, 0xF0, 0x09, 0xCA, 0x2F, 0x01, 0xFC, 0x04, 0x7C,</div><div class='add'>+0x06, 0xF1, 0x09, 0x80, 0x2F, 0x02, 0xBF, 0x01, 0x7C, 0x0A, 0xB0, 0xC9, 0xC0,</div><div class='add'>+0x6F, 0x02, 0xBF, 0x00, 0xEC, 0x52, 0xF0, 0x4B, 0xD1, 0x77, 0x60, 0x0E, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xA8, 0x6F, 0x00, 0x9F, 0x16, 0xFC,</div><div class='add'>+0x02, 0x34, 0x4B, 0xC0, 0x24, 0x00, 0x9F, 0x02, 0xFC, 0x22, 0xF0, 0x0B, 0xC0,</div><div class='add'>+0x2C, 0x60, 0xB3, 0x00, 0xFC, 0x46, 0xF0, 0x0B, 0xC0, 0x24, 0x00, 0xB3, 0x80,</div><div class='add'>+0xCD, 0x82, 0xF0, 0x0B, 0xC0, 0x77, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x18, 0x00, 0x87, 0x00, 0x1D, 0x02, 0x74, 0x00, 0x10, 0x01, 0x40,</div><div class='add'>+0x04, 0x01, 0x0D, 0x8A, 0x74, 0x04, 0xD0, 0xA1, 0x40, 0x04, 0x08, 0x11, 0x00,</div><div class='add'>+0x74, 0x08, 0xD0, 0x41, 0x40, 0x04, 0x00, 0x11, 0x00, 0x44, 0x00, 0xD1, 0x01,</div><div class='add'>+0x42, 0x63, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0xA0,</div><div class='add'>+0xA1, 0x00, 0x8D, 0x00, 0x34, 0x0A, 0x11, 0x2C, 0x40, 0x20, 0x24, 0x89, 0x40,</div><div class='add'>+0x34, 0x1A, 0xD0, 0x08, 0x40, 0x20, 0x10, 0x85, 0x00, 0x34, 0x02, 0xD8, 0x08,</div><div class='add'>+0x61, 0x20, 0x40, 0x95, 0x00, 0x14, 0x06, 0xD0, 0x08, 0x40, 0x4B, 0x00, 0x04,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x28, 0x25, 0x00, 0x9D, 0x00,</div><div class='add'>+0x70, 0x02, 0x12, 0x09, 0x40, 0xA4, 0x0A, 0x9D, 0x20, 0x74, 0x02, 0xD0, 0x09,</div><div class='add'>+0x10, 0x24, 0x10, 0x95, 0x20, 0x74, 0x82, 0xD0, 0x08, 0x4C, 0x24, 0x04, 0x95,</div><div class='add'>+0x08, 0x54, 0xA3, 0xD0, 0x09, 0x40, 0x63, 0x28, 0x04, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x05, 0x2A, 0x25, 0x20, 0x9D, 0x00, 0x74, 0x02, 0x10, 0x09,</div><div class='add'>+0xD0, 0x64, 0x00, 0x9F, 0x02, 0xFC, 0x02, 0xF0, 0x09, 0xC4, 0xA4, 0x04, 0x97,</div><div class='add'>+0x00, 0x7C, 0x02, 0xF2, 0x09, 0x50, 0x64, 0x02, 0x87, 0x00, 0x5C, 0x02, 0xF0,</div><div class='add'>+0x09, 0xC0, 0x17, 0x08, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16,</div><div class='add'>+0x00, 0x25, 0x00, 0x9F, 0x00, 0x7E, 0x02, 0xF0, 0x08, 0xC0, 0x67, 0x20, 0x9F,</div><div class='add'>+0x00, 0x7C, 0x02, 0xF0, 0x09, 0xC3, 0x27, 0x02, 0x9B, 0x10, 0x7C, 0x82, 0xF0,</div><div class='add'>+0x09, 0xC0, 0x67, 0x00, 0x9A, 0x00, 0x6C, 0x02, 0xF0, 0x09, 0xC0, 0x5B, 0x20,</div><div class='add'>+0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x08, 0x05, 0x00, 0x17,</div><div class='add'>+0x00, 0x4C, 0x00, 0xB0, 0x01, 0xC8, 0x07, 0x00, 0x13, 0x02, 0x6C, 0x20, 0xF0,</div><div class='add'>+0x81, 0xC0, 0x07, 0x00, 0x1F, 0x00, 0x4C, 0x00, 0x34, 0x01, 0xC0, 0x87, 0x00,</div><div class='add'>+0x13, 0x04, 0x7C, 0x04, 0x30, 0x01, 0xC0, 0x53, 0x20, 0x04, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x10, 0x20, 0x14, 0x04, 0x51, 0x00, 0x2C, 0x01, 0xD0,</div><div class='add'>+0xA7, 0x48, 0x17, 0x08, 0x51, 0x00, 0x44, 0x01, 0xD0, 0x26, 0x40, 0x5B, 0x20,</div><div class='add'>+0x7C, 0x83, 0xC4, 0x01, 0x11, 0x07, 0x41, 0x17, 0x00, 0x70, 0x00, 0xF4, 0x01,</div><div class='add'>+0x10, 0x07, 0x44, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x10, 0x80, 0x32, 0x00, 0xC5, 0x00, 0x14, 0x27, 0x9A, 0x0C, 0x44, 0x33, 0x00,</div><div class='add'>+0xC0, 0x00, 0x24, 0x07, 0xD0, 0x2C, 0x40, 0x63, 0x20, 0xCD, 0x00, 0x00, 0x02,</div><div class='add'>+0x90, 0x5C, 0x40, 0x37, 0x00, 0x81, 0x03, 0x30, 0x03, 0x94, 0x1C, 0x40, 0x43,</div><div class='add'>+0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x80, 0x79, 0x00,</div><div class='add'>+0xE1, 0x01, 0xA5, 0x03, 0xD0, 0x06, 0x40, 0x7B, 0x02, 0xE1, 0x49, 0x84, 0x02,</div><div class='add'>+0xD0, 0x06, 0x40, 0xBB, 0x80, 0x6D, 0x03, 0x84, 0x46, 0x92, 0x06, 0x40, 0x33,</div><div class='add'>+0x00, 0xE1, 0x02, 0xB4, 0x07, 0x90, 0x26, 0x40, 0x13, 0x00, 0x02, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x18, 0x79, 0x00, 0xF7, 0x09, 0x9C, 0x06,</div><div class='add'>+0xB0, 0x1E, 0xC0, 0x7F, 0x45, 0xE2, 0x15, 0xAC, 0x07, 0xF0, 0x1A, 0xC0, 0x6B,</div><div class='add'>+0x20, 0xBF, 0x01, 0x8C, 0x06, 0xA0, 0x1A, 0xC0, 0x7B, 0x05, 0xA3, 0x01, 0xFC,</div><div class='add'>+0x07, 0xB0, 0x1E, 0xC0, 0x53, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x10, 0xB8, 0x31, 0x00, 0xDF, 0x0C, 0x5C, 0x02, 0xF1, 0x01, 0xC0, 0xB7,</div><div class='add'>+0x01, 0xDF, 0x86, 0x7C, 0x22, 0xF0, 0x09, 0xE0, 0x26, 0x00, 0x1F, 0x00, 0x3C,</div><div class='add'>+0x02, 0x70, 0x09, 0xC0, 0x37, 0x01, 0xDF, 0x80, 0x7C, 0x02, 0x72, 0x05, 0xC0,</div><div class='add'>+0x43, 0x60, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x28, 0x7D,</div><div class='add'>+0x00, 0xFF, 0x01, 0xDE, 0x27, 0x70, 0x9B, 0xC0, 0x7F, 0x00, 0xFF, 0x21, 0xDC,</div><div class='add'>+0x27, 0xF0, 0x1F, 0xC0, 0x6F, 0x00, 0x7B, 0x09, 0xCC, 0x07, 0x30, 0x1F, 0xC0,</div><div class='add'>+0x7C, 0x26, 0xBF, 0x81, 0xFC, 0x27, 0x31, 0x9F, 0xC0, 0x18, 0x00, 0x04, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x10, 0x39, 0x00, 0xED, 0x00, 0x84,</div><div class='add'>+0x02, 0xC0, 0x22, 0x42, 0x3B, 0x00, 0xE9, 0x00, 0x80, 0x02, 0xD0, 0x22, 0x40,</div><div class='add'>+0x3B, 0x00, 0x19, 0x01, 0x94, 0x0A, 0x50, 0x06, 0x40, 0x79, 0x0A, 0xED, 0x00,</div><div class='add'>+0xB4, 0x33, 0x30, 0x22, 0x40, 0x54, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x88, 0x00, 0x39, 0x00, 0xED, 0x00, 0x94, 0x82, 0x50, 0x02, 0x00,</div><div class='add'>+0x3B, 0x00, 0xED, 0x08, 0x94, 0x03, 0xD1, 0x0A, 0x40, 0x2B, 0x00, 0x39, 0x10,</div><div class='add'>+0x24, 0x03, 0xD0, 0x04, 0x40, 0x38, 0x00, 0xAD, 0x00, 0xB4, 0x09, 0x12, 0x0E,</div><div class='add'>+0x60, 0x61, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x20,</div><div class='add'>+0x21, 0x00, 0xCD, 0x00, 0x04, 0x02, 0xD0, 0x00, 0x40, 0xF3, 0x00, 0xCD, 0x02,</div><div class='add'>+0x04, 0x02, 0xD0, 0x08, 0x48, 0x73, 0x84, 0x09, 0x01, 0x34, 0x03, 0xD0, 0x04,</div><div class='add'>+0x64, 0x31, 0x82, 0xCD, 0x00, 0x34, 0x04, 0x11, 0x00, 0x40, 0x09, 0x20, 0x04,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0xA8, 0x35, 0x10, 0xFF, 0x00,</div><div class='add'>+0x54, 0x03, 0x70, 0x09, 0xC0, 0x3F, 0x03, 0xFF, 0x01, 0x5C, 0x03, 0xF0, 0x09,</div><div class='add'>+0xC8, 0xA7, 0x01, 0x9B, 0x01, 0x64, 0x02, 0xB0, 0x0D, 0xCC, 0xFC, 0x12, 0x9D,</div><div class='add'>+0x0A, 0x7C, 0x90, 0x33, 0x19, 0xC2, 0x75, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x0D, 0x00, 0x37, 0x20, 0xDF, 0x00, 0x7C, 0x03, 0xF0, 0x29,</div><div class='add'>+0xC0, 0x37, 0x08, 0xDB, 0x18, 0x7E, 0x02, 0xF2, 0x01, 0x40, 0x37, 0x00, 0x1E,</div><div class='add'>+0x00, 0x5C, 0x0A, 0x38, 0x05, 0xC0, 0x37, 0x00, 0x9F, 0x00, 0x7C, 0x08, 0x74,</div><div class='add'>+0x81, 0x50, 0x16, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x81,</div><div class='add'>+0x08, 0x3F, 0x10, 0xDF, 0x00, 0xFC, 0x0B, 0xF0, 0x0B, 0xC0, 0x3F, 0x00, 0xDF,</div><div class='add'>+0x00, 0xFC, 0x07, 0xF1, 0x0A, 0xC0, 0x2C, 0x40, 0x32, 0x01, 0xFC, 0x02, 0xF2,</div><div class='add'>+0x1A, 0x80, 0x3C, 0x00, 0xB3, 0x00, 0x7C, 0x00, 0xF0, 0x01, 0xC1, 0x07, 0x26,</div><div class='add'>+0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x81, 0x20, 0x36, 0x00, 0xDD,</div><div class='add'>+0x00, 0x64, 0x07, 0xD0, 0x19, 0x42, 0x33, 0x00, 0xD1, 0x80, 0x74, 0x07, 0xD0,</div><div class='add'>+0x39, 0x40, 0x00, 0x00, 0x11, 0x07, 0x74, 0x00, 0xD0, 0x19, 0xC0, 0x37, 0x00,</div><div class='add'>+0x9B, 0x18, 0x64, 0x0C, 0xD0, 0x31, 0x40, 0x07, 0x02, 0x08, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x01, 0xA0, 0x36, 0x00, 0xDD, 0x00, 0x74, 0x03, 0xD8,</div><div class='add'>+0x19, 0x40, 0x37, 0x00, 0xD9, 0x00, 0x74, 0x13, 0xD0, 0x11, 0x40, 0xA6, 0x00,</div><div class='add'>+0x35, 0x08, 0x74, 0x03, 0xC8, 0x49, 0x46, 0x39, 0x00, 0x91, 0x00, 0x60, 0x04,</div><div class='add'>+0xD0, 0x19, 0x40, 0x07, 0x08, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x10, 0x20, 0x30, 0x00, 0xCD, 0x00, 0x24, 0x02, 0xD8, 0x08, 0x40, 0x37, 0x00,</div><div class='add'>+0xC1, 0x00, 0x34, 0x82, 0xD0, 0x00, 0x40, 0x30, 0x80, 0x05, 0x00, 0x34, 0x02,</div><div class='add'>+0xD0, 0x00, 0x40, 0x32, 0x01, 0xC9, 0xA0, 0x24, 0x00, 0xD0, 0x00, 0x40, 0x43,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x98, 0x36, 0x00,</div><div class='add'>+0xFF, 0x00, 0x7C, 0x03, 0xF0, 0x01, 0xC0, 0x3F, 0x00, 0xFB, 0x00, 0x74, 0x02,</div><div class='add'>+0xD1, 0x01, 0xC0, 0x24, 0x00, 0x17, 0x04, 0x7C, 0x03, 0xF0, 0x01, 0xC0, 0x3D,</div><div class='add'>+0x05, 0x13, 0x40, 0x7C, 0x00, 0xF0, 0x01, 0xC2, 0x07, 0x64, 0x08, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x85, 0xB8, 0x2F, 0x00, 0xFF, 0x00, 0xEC, 0x02,</div><div class='add'>+0xF0, 0x03, 0xCC, 0x3F, 0x00, 0xFB, 0x00, 0xF8, 0x02, 0xF2, 0x03, 0x88, 0x1F,</div><div class='add'>+0x00, 0x1B, 0x16, 0xFC, 0x01, 0xF0, 0x03, 0xC0, 0x37, 0x00, 0x7F, 0x00, 0xFC,</div><div class='add'>+0x00, 0xF0, 0x03, 0xC0, 0x17, 0x60, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x03, 0xAA, 0x7B, 0x12, 0xEF, 0x09, 0xEC, 0x07, 0xB0, 0x9E, 0xC0, 0x7A,</div><div class='add'>+0x00, 0xF7, 0x09, 0xEC, 0x07, 0xF0, 0x3F, 0xC0, 0x7B, 0x00, 0xF7, 0x29, 0xCC,</div><div class='add'>+0x07, 0xF0, 0x1F, 0xC0, 0x7F, 0x00, 0xF3, 0x01, 0xFC, 0xA7, 0xB0, 0x1F, 0xC0,</div><div class='add'>+0x0C, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x18, 0x07,</div><div class='add'>+0x00, 0x1D, 0x44, 0x44, 0x04, 0x32, 0x01, 0x40, 0x44, 0x20, 0x11, 0x04, 0x4C,</div><div class='add'>+0x10, 0x10, 0x01, 0xC0, 0x44, 0x00, 0x11, 0x00, 0x44, 0x10, 0xD0, 0x01, 0x40,</div><div class='add'>+0x44, 0x10, 0x11, 0x20, 0x74, 0x00, 0x10, 0x11, 0xC0, 0x0E, 0x00, 0x0C, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0xA0, 0x33, 0x11, 0xDD, 0x00, 0x24,</div><div class='add'>+0x03, 0x91, 0x4D, 0x42, 0x33, 0x00, 0xC5, 0x00, 0x34, 0x43, 0xD0, 0x4C, 0x40,</div><div class='add'>+0x32, 0x00, 0xC5, 0x44, 0x14, 0x43, 0xD0, 0x0C, 0x62, 0x32, 0x00, 0xC1, 0x80,</div><div class='add'>+0x34, 0x13, 0x90, 0x0D, 0x42, 0x4D, 0x80, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x03, 0xA0, 0x05, 0x00, 0x1D, 0x00, 0x54, 0x00, 0x90, 0x01, 0x40,</div><div class='add'>+0x05, 0x08, 0x01, 0x00, 0x34, 0x00, 0x10, 0x01, 0x40, 0x04, 0x00, 0x05, 0x00,</div><div class='add'>+0x54, 0x00, 0xDA, 0x01, 0x44, 0x04, 0x40, 0x11, 0x00, 0x34, 0x00, 0x11, 0x01,</div><div class='add'>+0x40, 0x0F, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA0,</div><div class='add'>+0x37, 0x08, 0xDF, 0x80, 0x6C, 0x83, 0xB0, 0x0D, 0xC0, 0x37, 0x00, 0xD6, 0x00,</div><div class='add'>+0x7C, 0x03, 0xF0, 0x0D, 0xC0, 0x33, 0x00, 0xD7, 0x00, 0x5C, 0x03, 0xE0, 0x0D,</div><div class='add'>+0xC0, 0x32, 0x00, 0xD3, 0x00, 0x7C, 0x03, 0xB1, 0x0C, 0xC0, 0x21, 0x00, 0x0E,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x80, 0x0D, 0x00, 0x3F, 0x00,</div><div class='add'>+0xEC, 0x00, 0x70, 0x03, 0xC8, 0x0E, 0x20, 0x3E, 0x00, 0xCC, 0x00, 0xF0, 0x03,</div><div class='add'>+0xC0, 0x0C, 0x08, 0x3B, 0x00, 0xEC, 0x00, 0xF2, 0x03, 0xC0, 0x0E, 0x00, 0x3F,</div><div class='add'>+0x00, 0xE4, 0x00, 0xF0, 0x03, 0xC0, 0x1E, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x0A, 0x00, 0x35, 0x20, 0xD7, 0xC8, 0x5C, 0x83, 0xC0, 0x0D,</div><div class='add'>+0xC0, 0x35, 0x01, 0xD7, 0x00, 0x5C, 0x03, 0xF0, 0x4D, 0xC0, 0x36, 0x00, 0xD7,</div><div class='add'>+0x00, 0x7C, 0x13, 0x30, 0x4D, 0xC4, 0x36, 0x00, 0xD7, 0x00, 0x7C, 0x03, 0xF0,</div><div class='add'>+0x0D, 0xD0, 0x28, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13,</div><div class='add'>+0xA0, 0xC4, 0x00, 0x01, 0x83, 0x04, 0x04, 0x10, 0xE0, 0x40, 0x80, 0x00, 0x11,</div><div class='add'>+0x00, 0x44, 0x00, 0xD0, 0x01, 0x40, 0x07, 0x02, 0x11, 0x00, 0x74, 0x48, 0xB0,</div><div class='add'>+0x50, 0x40, 0xC7, 0x00, 0x11, 0x00, 0x70, 0x24, 0xD1, 0x01, 0x40, 0x4D, 0x00,</div><div class='add'>+0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0x20, 0xB0, 0x04, 0xC5,</div><div class='add'>+0x53, 0x14, 0x03, 0x50, 0x0C, 0x42, 0x31, 0x00, 0xC5, 0x00, 0x14, 0x03, 0xD0,</div><div class='add'>+0x0D, 0x00, 0x32, 0x00, 0xC5, 0x00, 0x34, 0x0F, 0x92, 0x3C, 0x44, 0xB2, 0x09,</div><div class='add'>+0xC5, 0x00, 0x24, 0x03, 0xD0, 0x0C, 0x40, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x0F, 0x08, 0x4C, 0x06, 0x31, 0x01, 0xC4, 0x04, 0x11,</div><div class='add'>+0x13, 0x40, 0x48, 0x08, 0x25, 0x01, 0x84, 0x04, 0xD0, 0x12, 0x40, 0x4B, 0x00,</div><div class='add'>+0x21, 0x01, 0xF4, 0x04, 0xD2, 0x92, 0x40, 0x4B, 0x0C, 0x21, 0x01, 0xB4, 0x14,</div><div class='add'>+0xD0, 0x92, 0x40, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x12, 0x10, 0x30, 0x00, 0xC7, 0x08, 0x1C, 0x63, 0x72, 0x0C, 0xC0, 0x31, 0x02,</div><div class='add'>+0xD5, 0x00, 0x1C, 0x13, 0xF0, 0x4C, 0xC0, 0x32, 0x01, 0xC7, 0x28, 0x3C, 0x23,</div><div class='add'>+0xB0, 0x8C, 0xC0, 0x32, 0x00, 0xC6, 0x00, 0x3C, 0x63, 0xF2, 0x8C, 0xC0, 0x4A,</div><div class='add'>+0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x28, 0x0D, 0x00,</div><div class='add'>+0x3F, 0x00, 0xBC, 0x00, 0x70, 0x03, 0xC0, 0x0F, 0x0A, 0x3B, 0x08, 0xFC, 0x00,</div><div class='add'>+0xF0, 0x03, 0xC0, 0x0F, 0x00, 0x3F, 0x08, 0xBC, 0xA0, 0xA0, 0x81, 0xC0, 0x0B,</div><div class='add'>+0x10, 0x1F, 0x00, 0xFC, 0x30, 0xF0, 0x90, 0xC0, 0x09, 0x60, 0x04, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xA0, 0x37, 0x00, 0xD3, 0x00, 0x7E, 0x03,</div><div class='add'>+0x70, 0x0D, 0x80, 0x37, 0x00, 0xDF, 0x00, 0x7C, 0x03, 0x30, 0x0D, 0xC0, 0x30,</div><div class='add'>+0x00, 0xDA, 0x00, 0x5C, 0x03, 0xF0, 0x0C, 0xC0, 0x30, 0x00, 0xD3, 0x00, 0x7C,</div><div class='add'>+0x03, 0x34, 0x0D, 0xC0, 0x40, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x13, 0x80, 0x0D, 0x08, 0x20, 0x00, 0xB2, 0x00, 0xD1, 0x02, 0x40, 0x0B,</div><div class='add'>+0x00, 0x2D, 0x00, 0xB4, 0x00, 0x50, 0x02, 0xC0, 0x09, 0x00, 0x21, 0xA0, 0xB4,</div><div class='add'>+0x00, 0xD0, 0x02, 0xC4, 0x0A, 0x00, 0x2B, 0x80, 0xB4, 0x00, 0x10, 0x02, 0xC0,</div><div class='add'>+0x4E, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x02, 0x79,</div><div class='add'>+0x20, 0xE9, 0x01, 0x94, 0x87, 0xD0, 0x1E, 0x60, 0x7B, 0x00, 0xED, 0x01, 0xF4,</div><div class='add'>+0x07, 0xD0, 0x1F, 0x40, 0x7B, 0x00, 0xE9, 0x01, 0xB4, 0x07, 0xD0, 0x1F, 0x40,</div><div class='add'>+0x7E, 0x00, 0xE9, 0x21, 0xB4, 0x07, 0x10, 0x1E, 0x40, 0x10, 0x00, 0x04, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16, 0x28, 0x02, 0x00, 0x09, 0x00, 0x34,</div><div class='add'>+0x00, 0xD2, 0x01, 0x40, 0x03, 0x00, 0x0D, 0x00, 0x74, 0x00, 0xD0, 0x00, 0x40,</div><div class='add'>+0x01, 0x80, 0x0D, 0x00, 0x34, 0x80, 0xD0, 0x00, 0x40, 0x02, 0x00, 0x09, 0x00,</div><div class='add'>+0x36, 0x00, 0x10, 0x00, 0x40, 0x5A, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x17, 0xA0, 0x11, 0x00, 0x5B, 0x00, 0x78, 0x01, 0x70, 0x05, 0xE0,</div><div class='add'>+0x17, 0x00, 0x5F, 0x00, 0x7E, 0x01, 0xB1, 0x04, 0xC0, 0x16, 0x00, 0x5B, 0x20,</div><div class='add'>+0x5C, 0x01, 0xF0, 0x05, 0xC4, 0x14, 0x00, 0x5B, 0x20, 0x7C, 0x01, 0x30, 0x05,</div><div class='add'>+0xC0, 0x5C, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x88,</div><div class='add'>+0x8F, 0x40, 0x37, 0x00, 0xFC, 0x00, 0xF0, 0x03, 0xE0, 0x0F, 0x00, 0x3F, 0x00,</div><div class='add'>+0xFA, 0x00, 0x70, 0x23, 0xC0, 0x0F, 0x00, 0x33, 0x00, 0xF4, 0x08, 0xF0, 0x23,</div><div class='add'>+0xC0, 0x8F, 0x00, 0x3F, 0x40, 0xF4, 0x08, 0xF0, 0x03, 0xC0, 0x4B, 0x20, 0x04,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x08, 0x25, 0x01, 0x97, 0x00,</div><div class='add'>+0x7C, 0x16, 0x50, 0x09, 0xC0, 0x27, 0x10, 0x9F, 0xA0, 0x7C, 0x02, 0x33, 0x09,</div><div class='add'>+0xC2, 0x25, 0x20, 0x93, 0x40, 0x74, 0x02, 0x02, 0x09, 0x54, 0xA4, 0x00, 0x97,</div><div class='add'>+0x00, 0x7C, 0x06, 0x32, 0x29, 0xC2, 0x40, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x01, 0x20, 0xE6, 0x00, 0x91, 0x05, 0x34, 0x86, 0x10, 0x39,</div><div class='add'>+0x40, 0x24, 0x00, 0x9D, 0x00, 0x74, 0x02, 0x50, 0x09, 0x10, 0xA0, 0x04, 0x91,</div><div class='add'>+0x00, 0x34, 0x06, 0xB2, 0x28, 0x40, 0xE0, 0x08, 0x95, 0x00, 0x30, 0x06, 0x51,</div><div class='add'>+0x08, 0x40, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18,</div><div class='add'>+0xA0, 0x24, 0x00, 0xB5, 0x04, 0xF4, 0x02, 0x50, 0x6B, 0x40, 0x2D, 0x00, 0xBD,</div><div class='add'>+0x80, 0xD4, 0x82, 0x18, 0x0B, 0x41, 0x2C, 0xC0, 0xB1, 0x00, 0xD4, 0x12, 0x10,</div><div class='add'>+0x2B, 0x40, 0x2D, 0x90, 0xB0, 0x80, 0xF4, 0x22, 0x12, 0x0B, 0x42, 0x60, 0x00,</div><div class='add'>+0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x20, 0x3D, 0x00, 0xA1,</div><div class='add'>+0x00, 0xF4, 0x02, 0x50, 0x0A, 0x40, 0x28, 0x20, 0xAC, 0x28, 0xB4, 0x22, 0x50,</div><div class='add'>+0x0A, 0x40, 0x28, 0x00, 0xA1, 0xC8, 0xF4, 0x03, 0xD0, 0x0A, 0x40, 0x2D, 0x00,</div><div class='add'>+0xA4, 0x00, 0xF4, 0x23, 0x50, 0x0E, 0x40, 0x41, 0x80, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x1D, 0x38, 0x06, 0x00, 0x17, 0x80, 0x7C, 0x00, 0x70,</div><div class='add'>+0x01, 0xC0, 0x07, 0x00, 0x1C, 0x02, 0x7C, 0x08, 0x30, 0x01, 0xC0, 0x05, 0x00,</div><div class='add'>+0x13, 0x02, 0x5C, 0x00, 0x32, 0xA1, 0xC0, 0x15, 0x00, 0x17, 0x0A, 0x38, 0x08,</div><div class='add'>+0x30, 0x03, 0xC8, 0x74, 0xE0, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x1D, 0xB0, 0x25, 0x05, 0x9F, 0x34, 0x7C, 0x02, 0xB0, 0x49, 0xC1, 0x27, 0x00,</div><div class='add'>+0x9F, 0x04, 0x2C, 0x12, 0xF0, 0x48, 0xC9, 0x27, 0x00, 0x9F, 0x04, 0x7C, 0x52,</div><div class='add'>+0xB0, 0x19, 0xC0, 0x26, 0x00, 0x9F, 0x01, 0x7C, 0x12, 0xF0, 0x08, 0xC0, 0x77,</div><div class='add'>+0x40, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1D, 0x80, 0x2F, 0x00,</div><div class='add'>+0xBF, 0x08, 0xDC, 0x02, 0xF8, 0x0B, 0xC2, 0x2F, 0x00, 0x8F, 0x02, 0x7C, 0x02,</div><div class='add'>+0x34, 0x0B, 0xC0, 0x2C, 0x00, 0x93, 0x00, 0xFC, 0x0A, 0x30, 0x0B, 0xC0, 0x2C,</div><div class='add'>+0x40, 0x83, 0x00, 0xCC, 0x02, 0xB0, 0x0B, 0xC0, 0x74, 0x00, 0x0E, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x08, 0x47, 0x01, 0x1D, 0x25, 0x44, 0x00,</div><div class='add'>+0xD1, 0x41, 0x41, 0x07, 0x00, 0x1D, 0x04, 0x74, 0x80, 0x10, 0x01, 0x42, 0x05,</div><div class='add'>+0x08, 0x11, 0x00, 0x74, 0x00, 0xB0, 0x01, 0x42, 0x04, 0x00, 0x11, 0x40, 0x44,</div><div class='add'>+0x00, 0x11, 0x01, 0x40, 0x61, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x12, 0x00, 0x31, 0x15, 0x8D, 0x44, 0x10, 0x02, 0xD8, 0x0C, 0x40, 0x23,</div><div class='add'>+0x00, 0x8D, 0x04, 0x34, 0x42, 0x10, 0x09, 0x40, 0x20, 0x00, 0x81, 0x14, 0x34,</div><div class='add'>+0x02, 0x10, 0x08, 0x50, 0x20, 0x80, 0x81, 0x20, 0x15, 0x02, 0xD0, 0x09, 0x40,</div><div class='add'>+0x48, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x2A, 0x25,</div><div class='add'>+0x00, 0x9D, 0x00, 0x44, 0x82, 0xD0, 0x09, 0x40, 0x27, 0x00, 0x9D, 0x00, 0x74,</div><div class='add'>+0x02, 0x11, 0x09, 0x40, 0x25, 0x20, 0x91, 0x00, 0x74, 0x02, 0x90, 0x08, 0x60,</div><div class='add'>+0x24, 0x00, 0x91, 0x00, 0x54, 0x02, 0xD0, 0x09, 0x40, 0x61, 0x20, 0x04, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x22, 0x25, 0x10, 0x9F, 0x00, 0x5C,</div><div class='add'>+0x02, 0xD0, 0x09, 0xC0, 0x27, 0x00, 0x9F, 0x00, 0x7C, 0x02, 0x30, 0x09, 0xC0,</div><div class='add'>+0x20, 0x08, 0x93, 0x80, 0x7C, 0x02, 0x30, 0x09, 0xC0, 0x20, 0x00, 0x93, 0x00,</div><div class='add'>+0x5C, 0x82, 0xF0, 0x09, 0xC0, 0x14, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x16, 0x08, 0x25, 0x00, 0x9F, 0x00, 0x7C, 0x02, 0xF0, 0x09, 0xC0,</div><div class='add'>+0x27, 0x00, 0x9F, 0x00, 0x7C, 0x02, 0xF0, 0x09, 0xC0, 0x27, 0x40, 0x9F, 0x00,</div><div class='add'>+0x7C, 0x02, 0xF0, 0x09, 0xC1, 0x27, 0x04, 0x9F, 0x00, 0x6C, 0x42, 0x30, 0x09,</div><div class='add'>+0x40, 0x5B, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x08,</div><div class='add'>+0x05, 0x00, 0x17, 0x00, 0x4C, 0x00, 0xF0, 0x41, 0xC4, 0x07, 0x01, 0x17, 0x00,</div><div class='add'>+0x4C, 0x00, 0x70, 0x01, 0xC3, 0x07, 0x00, 0x1F, 0x00, 0x5C, 0x40, 0xB0, 0x01,</div><div class='add'>+0xC0, 0x04, 0x00, 0x1F, 0x00, 0x4C, 0x00, 0x30, 0x01, 0xC1, 0x51, 0x20, 0x04,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x1C, 0x02, 0x7D, 0xD8,</div><div class='add'>+0x44, 0x01, 0x70, 0x27, 0x40, 0x9F, 0x00, 0x51, 0x20, 0x6C, 0x01, 0xD0, 0x76,</div><div class='add'>+0x42, 0xDF, 0x00, 0x5D, 0x40, 0xEC, 0x0D, 0x11, 0x27, 0x40, 0x1C, 0x00, 0x59,</div><div class='add'>+0x00, 0xD4, 0x01, 0x14, 0x06, 0x50, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x10, 0xA0, 0x32, 0x00, 0xD5, 0x40, 0x04, 0x26, 0xD0, 0x0C,</div><div class='add'>+0x40, 0xA3, 0x00, 0xC5, 0x00, 0x44, 0x03, 0x58, 0x0C, 0x48, 0xF3, 0x03, 0xCD,</div><div class='add'>+0x00, 0x46, 0x07, 0x90, 0x2C, 0x40, 0x32, 0x00, 0xDD, 0x00, 0x40, 0x0F, 0x00,</div><div class='add'>+0x3C, 0x40, 0x40, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04,</div><div class='add'>+0x80, 0x38, 0x20, 0xED, 0x40, 0x85, 0x03, 0x58, 0x0E, 0x68, 0xEF, 0x00, 0xF5,</div><div class='add'>+0x09, 0xA4, 0x23, 0xD0, 0x06, 0x40, 0x3B, 0x00, 0xFD, 0x45, 0xA4, 0x0B, 0x10,</div><div class='add'>+0x02, 0x41, 0x2A, 0x04, 0xF9, 0x04, 0x96, 0x0B, 0x12, 0x0E, 0x45, 0x10, 0x00,</div><div class='add'>+0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x10, 0x59, 0x00, 0x77,</div><div class='add'>+0x01, 0x8C, 0x07, 0xF1, 0x1E, 0x40, 0x6B, 0x00, 0xE7, 0x15, 0x8C, 0x07, 0x70,</div><div class='add'>+0x16, 0x80, 0x7B, 0x00, 0xEF, 0x01, 0xDC, 0x05, 0xB0, 0x1E, 0xD0, 0x5A, 0x08,</div><div class='add'>+0xEF, 0x07, 0xCC, 0x06, 0x30, 0x1E, 0xC0, 0x51, 0x60, 0x04, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x10, 0xB8, 0x15, 0x00, 0x5F, 0x40, 0x7C, 0x83, 0xF0,</div><div class='add'>+0x0D, 0xC0, 0x23, 0x00, 0xDB, 0x06, 0x7C, 0x03, 0xF0, 0x05, 0xC0, 0x37, 0x00,</div><div class='add'>+0xCF, 0x08, 0x7E, 0x83, 0xF0, 0x60, 0xD5, 0x15, 0x20, 0xDB, 0x06, 0x7C, 0x02,</div><div class='add'>+0xD0, 0x0C, 0xC0, 0x43, 0x60, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x06, 0x20, 0x7D, 0x0A, 0xFF, 0x01, 0xDC, 0xA7, 0xF0, 0x1F, 0xC0, 0x7F, 0x00,</div><div class='add'>+0xE7, 0x01, 0x8C, 0x0F, 0xB0, 0x13, 0xC8, 0x7B, 0x00, 0xF3, 0x03, 0xCC, 0x07,</div><div class='add'>+0x30, 0x1B, 0xD0, 0x78, 0xA2, 0xFB, 0x03, 0xCC, 0x07, 0xF0, 0x1A, 0xC0, 0x18,</div><div class='add'>+0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x00, 0x39, 0x00,</div><div class='add'>+0xEC, 0x18, 0xB4, 0x83, 0xD0, 0x0E, 0x42, 0x3B, 0x28, 0xE1, 0x10, 0x94, 0x03,</div><div class='add'>+0x50, 0x22, 0x44, 0x3B, 0x06, 0xE5, 0x00, 0xD4, 0x03, 0x50, 0x43, 0x40, 0x28,</div><div class='add'>+0x02, 0xE1, 0x04, 0x84, 0x13, 0x71, 0x4A, 0x48, 0x54, 0x00, 0x04, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x98, 0x02, 0x39, 0x10, 0xED, 0x00, 0x94, 0x03,</div><div class='add'>+0xC0, 0x06, 0x40, 0x3B, 0x04, 0xF5, 0x00, 0xE4, 0x43, 0x10, 0x02, 0x40, 0x3F,</div><div class='add'>+0x00, 0xFD, 0x00, 0xD4, 0x01, 0x50, 0x0A, 0x61, 0x18, 0x84, 0xE1, 0xB0, 0x84,</div><div class='add'>+0x42, 0xD2, 0x0A, 0x40, 0x20, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x02, 0x28, 0x65, 0x00, 0x8D, 0x00, 0x36, 0x13, 0xD0, 0x39, 0x40, 0xF3,</div><div class='add'>+0x00, 0xC5, 0x03, 0x34, 0x0B, 0x50, 0xA0, 0x40, 0xF3, 0x00, 0xDD, 0x02, 0x14,</div><div class='add'>+0x2A, 0x50, 0x38, 0x62, 0x40, 0x04, 0xC9, 0x53, 0x05, 0x04, 0x50, 0x28, 0x40,</div><div class='add'>+0x08, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xA0, 0xE5,</div><div class='add'>+0x10, 0x9F, 0x01, 0x5C, 0x43, 0xD0, 0xA1, 0xC4, 0x07, 0x02, 0xF7, 0x01, 0xEC,</div><div class='add'>+0x07, 0x30, 0xB1, 0xC8, 0xB7, 0x00, 0xFF, 0x01, 0x5E, 0x0E, 0x10, 0x99, 0xC4,</div><div class='add'>+0x44, 0x00, 0xEB, 0x00, 0x0C, 0x81, 0xF3, 0x3D, 0xC6, 0x54, 0x00, 0x06, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x08, 0x27, 0x06, 0x9F, 0x04, 0x7C,</div><div class='add'>+0x03, 0xF0, 0x81, 0xC0, 0xA7, 0x10, 0xDA, 0x00, 0x5C, 0x43, 0x78, 0x21, 0x80,</div><div class='add'>+0x37, 0x0C, 0xD7, 0xB8, 0x78, 0x00, 0xF0, 0x09, 0xC0, 0xA7, 0x40, 0xD7, 0x00,</div><div class='add'>+0x7C, 0x81, 0x70, 0xAD, 0xC1, 0x37, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x81, 0x08, 0x0F, 0x00, 0x3B, 0x00, 0xFC, 0x03, 0xF0, 0x0B, 0xC0,</div><div class='add'>+0x0E, 0x00, 0xF3, 0x10, 0xCC, 0x03, 0xF0, 0x03, 0x40, 0x3E, 0x00, 0xF3, 0x00,</div><div class='add'>+0xFC, 0x40, 0xF0, 0x0B, 0xC0, 0x0C, 0x00, 0xF7, 0x00, 0xD4, 0x54, 0x30, 0x0F,</div><div class='add'>+0xC0, 0x04, 0x28, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x81, 0x20,</div><div class='add'>+0xC6, 0x00, 0x11, 0x03, 0x74, 0x03, 0xD0, 0x19, 0x40, 0x60, 0x01, 0xDB, 0x00,</div><div class='add'>+0x54, 0x03, 0xD0, 0x11, 0x40, 0xD3, 0x00, 0xDB, 0x00, 0x44, 0x0C, 0xD0, 0x18,</div><div class='add'>+0xC0, 0x83, 0x20, 0xD1, 0x00, 0x54, 0x89, 0x51, 0x4C, 0x50, 0x84, 0x04, 0x08,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x80, 0xC6, 0x00, 0x19, 0x03,</div><div class='add'>+0x74, 0x13, 0xD8, 0x31, 0x40, 0x66, 0x00, 0xC1, 0x80, 0x44, 0x03, 0xD0, 0x11,</div><div class='add'>+0x40, 0x66, 0x04, 0xD1, 0x00, 0x44, 0xC6, 0x90, 0x1B, 0x40, 0x04, 0x06, 0xF5,</div><div class='add'>+0x00, 0x40, 0x09, 0x50, 0x45, 0x48, 0x04, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x10, 0x00, 0x20, 0x00, 0x81, 0x00, 0x34, 0x83, 0xD0, 0x00,</div><div class='add'>+0x40, 0x24, 0x00, 0xCD, 0x00, 0x14, 0x03, 0xD0, 0x00, 0x40, 0x27, 0x00, 0xC9,</div><div class='add'>+0x00, 0x04, 0x82, 0xC2, 0x19, 0x40, 0x02, 0xA0, 0xD1, 0x40, 0x54, 0x02, 0x50,</div><div class='add'>+0x04, 0x42, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,</div><div class='add'>+0x18, 0x06, 0x10, 0x1B, 0x00, 0x7C, 0x03, 0xDA, 0x01, 0xC0, 0x26, 0x00, 0xF3,</div><div class='add'>+0x00, 0xC4, 0x03, 0xF0, 0x01, 0xC4, 0x26, 0x00, 0xF3, 0x00, 0x5D, 0x00, 0xF0,</div><div class='add'>+0x0B, 0xC0, 0x04, 0x00, 0xE7, 0x00, 0x5C, 0x00, 0x30, 0x09, 0xD0, 0x04, 0x60,</div><div class='add'>+0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x85, 0xB8, 0x2F, 0x00, 0xBF,</div><div class='add'>+0x00, 0xFC, 0x03, 0xD0, 0x0B, 0xC0, 0x2B, 0x00, 0xFB, 0x00, 0xFC, 0x03, 0xE0,</div><div class='add'>+0x03, 0xC0, 0x2F, 0x00, 0xEF, 0x00, 0xFC, 0x02, 0xF1, 0x0B, 0xC2, 0x0F, 0x00,</div><div class='add'>+0xFF, 0x00, 0xFC, 0x00, 0xF0, 0x0B, 0xC4, 0x17, 0x62, 0x0E, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x03, 0xA0, 0x6F, 0x00, 0xBF, 0x10, 0xFC, 0x05, 0x30,</div><div class='add'>+0x16, 0xC8, 0x3F, 0x10, 0xFF, 0x14, 0xFC, 0x00, 0x30, 0x17, 0xC0, 0x2C, 0x00,</div><div class='add'>+0x63, 0x01, 0xFC, 0x0F, 0x30, 0x4B, 0xC0, 0x5F, 0x00, 0xF3, 0x01, 0xBC, 0x02,</div><div class='add'>+0xB0, 0x1F, 0xC8, 0x0F, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x01, 0x00, 0x67, 0x00, 0xDD, 0x01, 0x74, 0x05, 0x00, 0x19, 0x40, 0xFF, 0x30,</div><div class='add'>+0xFD, 0x03, 0x74, 0x0D, 0x10, 0x1D, 0x42, 0xE4, 0x00, 0x95, 0x01, 0xF4, 0x13,</div><div class='add'>+0x12, 0x19, 0x40, 0x77, 0x00, 0xF1, 0x41, 0x74, 0x02, 0x50, 0x11, 0x40, 0x0F,</div><div class='add'>+0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0xA0, 0x33, 0x00,</div><div class='add'>+0x8D, 0x40, 0x74, 0x00, 0x00, 0x08, 0x40, 0xB3, 0x00, 0xCD, 0x00, 0x14, 0x08,</div><div class='add'>+0x14, 0x0D, 0x48, 0xB0, 0x10, 0x84, 0x00, 0x34, 0x13, 0x10, 0x8C, 0x40, 0x23,</div><div class='add'>+0x00, 0xC1, 0x00, 0x54, 0x02, 0x90, 0x0C, 0x40, 0x4F, 0x80, 0x06, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xA8, 0x35, 0x00, 0x9D, 0x00, 0x74, 0x10,</div><div class='add'>+0x18, 0x09, 0x40, 0x37, 0x20, 0xDD, 0x00, 0x76, 0x23, 0x10, 0x0D, 0x48, 0x30,</div><div class='add'>+0x00, 0x91, 0x00, 0x74, 0x03, 0x10, 0x0D, 0x04, 0x23, 0x00, 0xD1, 0x40, 0x74,</div><div class='add'>+0x06, 0x50, 0x0D, 0x42, 0x0F, 0xA0, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0xA0, 0x77, 0x00, 0x9F, 0x01, 0x3C, 0x09, 0x30, 0x0D, 0xC2, 0x37,</div><div class='add'>+0x00, 0xDF, 0x60, 0x5C, 0x13, 0x31, 0x08, 0xC8, 0x64, 0x02, 0xD3, 0x00, 0x7C,</div><div class='add'>+0x03, 0x34, 0x0D, 0xC0, 0xD7, 0x00, 0xD3, 0x00, 0x7C, 0x17, 0xB2, 0x6D, 0xC0,</div><div class='add'>+0x03, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x88, 0x3D,</div><div class='add'>+0x21, 0x9F, 0x04, 0xFC, 0x45, 0xF4, 0x0B, 0xC2, 0x3F, 0x00, 0xFF, 0x00, 0xFC,</div><div class='add'>+0x03, 0xF0, 0x2B, 0xD0, 0x3F, 0x40, 0xFD, 0x00, 0xFC, 0x03, 0xF0, 0x0F, 0xC0,</div><div class='add'>+0x7F, 0x01, 0xFF, 0x80, 0xFC, 0x03, 0xF1, 0x23, 0xC0, 0x1F, 0x20, 0x06, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x08, 0x35, 0x01, 0x9F, 0x00, 0x5C,</div><div class='add'>+0x09, 0xB8, 0x0D, 0xC1, 0x34, 0x00, 0xDB, 0x50, 0x7C, 0x01, 0xB0, 0x0D, 0xC0,</div><div class='add'>+0x27, 0x80, 0x9E, 0x04, 0x0C, 0x03, 0xD0, 0x0D, 0xC4, 0xB7, 0x08, 0xDF, 0x40,</div><div class='add'>+0x7C, 0x13, 0x32, 0x0D, 0xC2, 0x0B, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x13, 0x80, 0x34, 0x00, 0x9D, 0x00, 0x44, 0x0D, 0xF0, 0x29, 0x40,</div><div class='add'>+0x3C, 0x00, 0xFD, 0x01, 0x34, 0x0B, 0x10, 0x0D, 0x48, 0x37, 0x80, 0x9F, 0x12,</div><div class='add'>+0x44, 0x2B, 0xD0, 0x0D, 0x40, 0x37, 0x00, 0xDD, 0x11, 0x34, 0x03, 0xB0, 0x1D,</div><div class='add'>+0x41, 0x6F, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x20,</div><div class='add'>+0x30, 0x00, 0x8D, 0x00, 0x14, 0x0C, 0xD0, 0xB4, 0x50, 0x70, 0x01, 0xCD, 0x02,</div><div class='add'>+0x20, 0x10, 0x92, 0x00, 0x4C, 0x23, 0x00, 0x4D, 0x01, 0x24, 0x23, 0xD0, 0x08,</div><div class='add'>+0x40, 0x23, 0x00, 0xCD, 0x00, 0x34, 0x08, 0x1C, 0x0C, 0x40, 0x0F, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x78, 0x00, 0xED, 0x01,</div><div class='add'>+0x84, 0x44, 0x50, 0x1B, 0x40, 0x78, 0x00, 0xED, 0x01, 0x34, 0x06, 0x10, 0x1A,</div><div class='add'>+0x40, 0x7B, 0x00, 0xB5, 0x09, 0xA6, 0x97, 0xD0, 0x1A, 0x40, 0x6B, 0x00, 0xED,</div><div class='add'>+0x01, 0xF4, 0x86, 0x90, 0x12, 0x40, 0x7F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x12, 0x18, 0x30, 0x04, 0xCF, 0x08, 0x1C, 0x00, 0xDA, 0x08,</div><div class='add'>+0xC8, 0x30, 0x14, 0xCB, 0x10, 0x2C, 0x20, 0xB0, 0x48, 0xC0, 0x23, 0x02, 0x8D,</div><div class='add'>+0x00, 0x2C, 0x23, 0xF0, 0x8C, 0x40, 0xA3, 0x00, 0xCF, 0x8C, 0x3E, 0x00, 0x30,</div><div class='add'>+0x0C, 0xC0, 0x4B, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,</div><div class='add'>+0x38, 0x3D, 0x00, 0xFF, 0x00, 0xFC, 0x00, 0xF0, 0x0B, 0xC0, 0x3F, 0x00, 0xFF,</div><div class='add'>+0x12, 0xF4, 0x23, 0xF0, 0x0B, 0xC0, 0x3F, 0x00, 0xBF, 0x00, 0xDD, 0x37, 0xF0,</div><div class='add'>+0x0F, 0x00, 0x2F, 0x00, 0xDF, 0x29, 0x7E, 0x22, 0xF4, 0x0F, 0xC0, 0x0B, 0x60,</div><div class='add'>+0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0xA0, 0x33, 0x00, 0xD3,</div><div class='add'>+0x48, 0x7C, 0x00, 0x60, 0x0C, 0xC0, 0xB4, 0x04, 0xDF, 0x04, 0x5C, 0x00, 0xF0,</div><div class='add'>+0x09, 0xC0, 0x24, 0x00, 0xD7, 0x01, 0x6C, 0x27, 0x30, 0x0D, 0xC0, 0x27, 0x00,</div><div class='add'>+0xDF, 0x00, 0x7C, 0x00, 0x30, 0x00, 0xC0, 0x40, 0x00, 0x0E, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x12, 0x80, 0x39, 0x00, 0xE1, 0xC0, 0xB4, 0x00, 0xD0,</div><div class='add'>+0x0A, 0x44, 0x38, 0x00, 0xED, 0x04, 0xB4, 0x02, 0xD0, 0x0A, 0x40, 0x38, 0x00,</div><div class='add'>+0xED, 0x00, 0x04, 0x13, 0x10, 0x0E, 0x40, 0x2B, 0x00, 0xED, 0x04, 0xB4, 0x02,</div><div class='add'>+0x50, 0x02, 0x40, 0x4C, 0x08, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x02, 0x79, 0x10, 0xE1, 0x05, 0xB4, 0x44, 0xD8, 0x1F, 0x51, 0x78, 0x13,</div><div class='add'>+0xE9, 0x05, 0x94, 0x25, 0xD0, 0x3A, 0x40, 0xE8, 0x02, 0xAD, 0x01, 0xA4, 0x07,</div><div class='add'>+0x90, 0x1E, 0x40, 0x6B, 0x04, 0xED, 0x09, 0xF4, 0x0C, 0x10, 0x02, 0x40, 0x10,</div><div class='add'>+0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16, 0x28, 0x33, 0x00,</div><div class='add'>+0xC1, 0x01, 0x34, 0x16, 0xD0, 0x38, 0x40, 0x30, 0x10, 0xCD, 0x00, 0x34, 0x07,</div><div class='add'>+0xD0, 0x18, 0x41, 0x70, 0x00, 0x8D, 0x00, 0x04, 0x03, 0x90, 0x9C, 0x40, 0x63,</div><div class='add'>+0x00, 0xCD, 0x00, 0x34, 0x06, 0x50, 0x8C, 0x40, 0x58, 0x20, 0x0C, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x17, 0x20, 0x15, 0x00, 0x43, 0x11, 0xFC, 0x05,</div><div class='add'>+0xF0, 0x36, 0xC0, 0x14, 0x20, 0x4F, 0x00, 0xDC, 0x15, 0xF1, 0x27, 0xD4, 0x14,</div><div class='add'>+0x00, 0x77, 0x1B, 0x6C, 0x01, 0xB5, 0x15, 0xC0, 0x1F, 0x00, 0x5F, 0x00, 0xBC,</div><div class='add'>+0x01, 0x34, 0x37, 0xC4, 0x5C, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x12, 0x08, 0x05, 0x42, 0x1F, 0x00, 0x7C, 0x08, 0xF0, 0x21, 0xC0, 0x07,</div><div class='add'>+0x20, 0x1F, 0x00, 0x70, 0x00, 0xF0, 0x01, 0xC0, 0x07, 0x00, 0x1F, 0x00, 0x7C,</div><div class='add'>+0x08, 0x71, 0x01, 0xC0, 0x07, 0x00, 0x1F, 0x22, 0x7C, 0x00, 0xF0, 0x01, 0xC1,</div><div class='add'>+0x4B, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x08, 0x25,</div><div class='add'>+0x00, 0x93, 0x00, 0x45, 0x06, 0x50, 0x19, 0xD1, 0x24, 0x40, 0x93, 0x08, 0x5C,</div><div class='add'>+0x42, 0xF0, 0x09, 0x40, 0x22, 0x40, 0x93, 0x02, 0x7C, 0x16, 0xF0, 0x29, 0xC0,</div><div class='add'>+0x27, 0x00, 0x93, 0x82, 0x7C, 0x06, 0x34, 0x09, 0xC0, 0x43, 0x20, 0x04, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x20, 0x20, 0x00, 0xB1, 0x03, 0x44,</div><div class='add'>+0x02, 0xD0, 0x29, 0x40, 0x20, 0x13, 0x91, 0x40, 0xC4, 0x02, 0xD0, 0x09, 0x40,</div><div class='add'>+0x2C, 0x00, 0x91, 0x40, 0xF4, 0x0E, 0xD0, 0x09, 0x40, 0x22, 0x20, 0xB1, 0x83,</div><div class='add'>+0x74, 0x06, 0x10, 0x09, 0x40, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x18, 0xA0, 0x24, 0x40, 0x91, 0x08, 0x54, 0x1B, 0xD0, 0x69, 0x40,</div><div class='add'>+0x24, 0x00, 0x91, 0x50, 0x50, 0x1A, 0xD0, 0x08, 0x40, 0x27, 0x00, 0x91, 0x00,</div><div class='add'>+0x74, 0x0A, 0xD8, 0x09, 0x40, 0x27, 0x00, 0x91, 0x40, 0x74, 0x52, 0x10, 0x09,</div><div class='add'>+0x40, 0x63, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x20,</div><div class='add'>+0x21, 0x00, 0x81, 0x00, 0x04, 0x02, 0xD0, 0x08, 0x40, 0x20, 0x00, 0x80, 0x00,</div><div class='add'>+0x04, 0x02, 0xD0, 0x28, 0x40, 0xA0, 0x00, 0x81, 0x00, 0x34, 0x0A, 0x80, 0x08,</div><div class='add'>+0x40, 0xA6, 0x00, 0x81, 0x00, 0x74, 0x02, 0x14, 0x08, 0x40, 0x43, 0x80, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xB8, 0x07, 0x00, 0x53, 0x01,</div><div class='add'>+0x5C, 0x00, 0x70, 0x01, 0xC0, 0x04, 0x05, 0x12, 0x14, 0x5C, 0x04, 0xF0, 0x00,</div><div class='add'>+0xC0, 0x47, 0x00, 0x13, 0x00, 0x7C, 0x04, 0xF0, 0x11, 0xC0, 0x07, 0x40, 0x53,</div><div class='add'>+0x81, 0x7C, 0x00, 0x34, 0x01, 0xC0, 0x77, 0xE0, 0x0E, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x1D, 0xB8, 0x2F, 0x00, 0xBF, 0x02, 0xFC, 0x02, 0xF0, 0x0B,</div><div class='add'>+0xC0, 0x27, 0x08, 0x9F, 0x40, 0xFC, 0x0A, 0xF1, 0x1B, 0xC0, 0xEF, 0x00, 0xEF,</div><div class='add'>+0x00, 0x7C, 0x0E, 0xF0, 0x2B, 0x00, 0x6E, 0x20, 0x9F, 0x82, 0xBC, 0x5A, 0xE0,</div><div class='add'>+0x0B, 0xC0, 0x77, 0x60, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1D,</div><div class='add'>+0xA0, 0x29, 0x00, 0xBF, 0x01, 0xCC, 0x02, 0x34, 0x0B, 0xD0, 0x2C, 0x40, 0xA3,</div><div class='add'>+0x00, 0xBC, 0x46, 0xB0, 0x09, 0x40, 0x67, 0x00, 0xBB, 0x00, 0xC4, 0x16, 0x24,</div><div class='add'>+0x5B, 0xC0, 0xA7, 0x10, 0xB3, 0x15, 0xCD, 0x42, 0xB0, 0x0B, 0xC0, 0x74, 0x00,</div><div class='add'>+0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x07, 0x00, 0x1D,</div><div class='add'>+0x00, 0x44, 0x00, 0x10, 0x05, 0x40, 0x85, 0x02, 0x11, 0x40, 0x74, 0x08, 0x30,</div><div class='add'>+0x55, 0x41, 0xC3, 0x01, 0x11, 0x00, 0x54, 0x14, 0x10, 0x01, 0x40, 0x47, 0x08,</div><div class='add'>+0x11, 0x02, 0x44, 0x08, 0x11, 0x01, 0x40, 0x60, 0x00, 0x0C, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x12, 0x22, 0x21, 0x00, 0x8D, 0x02, 0x14, 0x02, 0x90,</div><div class='add'>+0x08, 0x68, 0x20, 0x00, 0x81, 0x02, 0x34, 0x02, 0x90, 0x08, 0x40, 0xA3, 0x04,</div><div class='add'>+0x99, 0x00, 0x04, 0x4A, 0x10, 0x28, 0x40, 0x23, 0x00, 0x81, 0x20, 0x04, 0x52,</div><div class='add'>+0x91, 0x09, 0x42, 0x48, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x18, 0x28, 0x25, 0x00, 0x9D, 0x00, 0x44, 0x02, 0x10, 0x09, 0x64, 0x24, 0x00,</div><div class='add'>+0x90, 0x00, 0x74, 0x06, 0x10, 0x89, 0x4C, 0x27, 0x00, 0x91, 0x00, 0x14, 0x02,</div><div class='add'>+0x10, 0x09, 0x40, 0x23, 0x40, 0x91, 0x00, 0x44, 0x02, 0x90, 0x19, 0x40, 0x60,</div><div class='add'>+0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x20, 0x65, 0x02,</div><div class='add'>+0x8F, 0x09, 0x5C, 0x12, 0xB0, 0x18, 0x40, 0x24, 0x00, 0x93, 0x00, 0x7C, 0x4A,</div><div class='add'>+0xB0, 0x3B, 0xC0, 0x6F, 0x00, 0x9B, 0x00, 0xCC, 0x02, 0x30, 0x19, 0xC0, 0xEF,</div><div class='add'>+0x01, 0x93, 0x80, 0x4C, 0x02, 0xB0, 0x49, 0xD0, 0x14, 0x00, 0x04, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x16, 0x08, 0x25, 0x00, 0x9F, 0x00, 0x6D, 0x12,</div><div class='add'>+0xF0, 0x59, 0xC0, 0x27, 0x00, 0x9F, 0x00, 0x7C, 0x02, 0x70, 0x09, 0xC0, 0x23,</div><div class='add'>+0x01, 0x9F, 0x02, 0x7C, 0x02, 0xF0, 0x89, 0xC0, 0x67, 0x01, 0x9F, 0x00, 0x7C,</div><div class='add'>+0x02, 0x71, 0x09, 0xC0, 0x5B, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x14, 0x08, 0x05, 0x10, 0x13, 0x08, 0x7C, 0x00, 0x30, 0x01, 0xC0, 0x05,</div><div class='add'>+0xC1, 0x13, 0x08, 0x1C, 0x10, 0x34, 0x01, 0xC0, 0x07, 0x00, 0x1B, 0x00, 0x7C,</div><div class='add'>+0x00, 0x30, 0x01, 0xC0, 0x87, 0x00, 0x1F, 0x08, 0x7C, 0x00, 0x31, 0x01, 0xC0,</div><div class='add'>+0x53, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x20, 0xDC,</div><div class='add'>+0x06, 0x71, 0x00, 0xB0, 0x1D, 0x50, 0x07, 0x42, 0x1B, 0x80, 0x71, 0x01, 0xC4,</div><div class='add'>+0x0D, 0x10, 0x05, 0x40, 0x17, 0x00, 0x71, 0x02, 0xF4, 0x61, 0xB0, 0x05, 0x40,</div><div class='add'>+0x17, 0x00, 0x6D, 0x00, 0xF4, 0x01, 0x11, 0x04, 0x40, 0x43, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xA0, 0xE2, 0x00, 0x81, 0x10, 0x34,</div><div class='add'>+0x1E, 0x18, 0x04, 0x40, 0x23, 0x10, 0x85, 0x51, 0x14, 0x0D, 0x10, 0x0C, 0x40,</div><div class='add'>+0x33, 0x00, 0xD9, 0x13, 0x34, 0x06, 0x14, 0x1C, 0x40, 0x33, 0x00, 0x8D, 0x10,</div><div class='add'>+0x74, 0x02, 0x10, 0x08, 0x40, 0x43, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x04, 0x82, 0x7C, 0x00, 0xA1, 0x00, 0xF4, 0x03, 0x50, 0x06, 0x40,</div><div class='add'>+0x33, 0x00, 0xA5, 0x01, 0x84, 0x09, 0x11, 0x4E, 0x40, 0x3B, 0x03, 0xE1, 0x02,</div><div class='add'>+0xB4, 0x33, 0x90, 0x0E, 0x61, 0x3B, 0x09, 0xED, 0x00, 0xB4, 0x02, 0x10, 0x0E,</div><div class='add'>+0x40, 0x13, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x18,</div><div class='add'>+0x68, 0x00, 0xA3, 0x01, 0xBC, 0x06, 0x30, 0x16, 0xC0, 0x6B, 0x00, 0xE5, 0x01,</div><div class='add'>+0x9C, 0x05, 0x30, 0x3E, 0xC0, 0x7B, 0x00, 0xEB, 0x01, 0xBC, 0x07, 0x30, 0x1E,</div><div class='add'>+0xC0, 0xFB, 0x00, 0xAF, 0x01, 0x3C, 0x01, 0x30, 0x1A, 0xC0, 0x53, 0x60, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xB8, 0x35, 0x40, 0x9D, 0x00,</div><div class='add'>+0x3C, 0x02, 0xF0, 0x05, 0xC0, 0x27, 0x00, 0xDB, 0x00, 0x7C, 0x01, 0xF0, 0x0D,</div><div class='add'>+0xC0, 0x37, 0x00, 0xDF, 0x00, 0x3C, 0x03, 0x70, 0x0D, 0xC0, 0x37, 0x00, 0xDF,</div><div class='add'>+0x00, 0x7C, 0x03, 0xF0, 0x0D, 0xC0, 0x43, 0x60, 0x06, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x06, 0x28, 0x6D, 0x00, 0xBB, 0x21, 0xFC, 0x06, 0xF0, 0x17,</div><div class='add'>+0xC0, 0x6F, 0x00, 0xB3, 0x01, 0xDE, 0x07, 0x31, 0x9E, 0xC8, 0x7C, 0x00, 0xAE,</div><div class='add'>+0x01, 0xEC, 0x07, 0xF8, 0x9F, 0xC0, 0x78, 0x00, 0xB3, 0x41, 0xCC, 0x06, 0x30,</div><div class='add'>+0x1B, 0xC0, 0x18, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15,</div><div class='add'>+0x10, 0x29, 0x00, 0xAD, 0x08, 0xB4, 0x03, 0xD0, 0x06, 0x40, 0x3B, 0x08, 0xA1,</div><div class='add'>+0x00, 0x84, 0x13, 0xB0, 0x0E, 0x40, 0x38, 0x00, 0xED, 0x02, 0x84, 0x03, 0xD0,</div><div class='add'>+0x0E, 0xC0, 0x3A, 0x02, 0xA1, 0x00, 0x94, 0x02, 0xB0, 0x0E, 0x44, 0x54, 0x00,</div><div class='add'>+0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, 0x00, 0x29, 0x00, 0xAD,</div><div class='add'>+0x00, 0xB4, 0x02, 0xD0, 0x06, 0x40, 0x23, 0x00, 0xA1, 0x00, 0xD4, 0x01, 0x11,</div><div class='add'>+0x1F, 0x00, 0x78, 0x00, 0xED, 0x00, 0xA4, 0x03, 0xD0, 0x0E, 0x44, 0x7C, 0x00,</div><div class='add'>+0x81, 0x00, 0x84, 0x01, 0x50, 0x0B, 0x40, 0x20, 0x00, 0x04, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x02, 0x20, 0x21, 0x00, 0x8D, 0x01, 0x34, 0x41, 0xD0,</div><div class='add'>+0x04, 0x40, 0x03, 0x00, 0x41, 0x00, 0x04, 0x33, 0x90, 0x2C, 0x41, 0x30, 0x20,</div><div class='add'>+0xCD, 0x0C, 0x04, 0x01, 0xD0, 0x0C, 0x40, 0x32, 0x04, 0xC1, 0x00, 0x54, 0x03,</div><div class='add'>+0xD0, 0x3C, 0x40, 0x08, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x1D, 0xA8, 0x25, 0x10, 0xDF, 0x11, 0x7C, 0x8A, 0xF0, 0x8D, 0xC1, 0x27, 0x00,</div><div class='add'>+0x93, 0x00, 0x5C, 0x05, 0x31, 0x0D, 0xD0, 0x34, 0x01, 0x4F, 0x02, 0x6C, 0x01,</div><div class='add'>+0xF1, 0x0C, 0xC0, 0xB4, 0x40, 0x93, 0x00, 0x4C, 0xAA, 0x70, 0x29, 0xC0, 0x74,</div><div class='add'>+0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x37, 0x00,</div><div class='add'>+0xDF, 0x00, 0x7C, 0x03, 0xF0, 0x25, 0xC0, 0x37, 0x00, 0x8F, 0x00, 0x7E, 0x01,</div><div class='add'>+0xF0, 0x0D, 0xC0, 0x37, 0x00, 0xDF, 0x80, 0x7C, 0x09, 0xF0, 0x0D, 0xC0, 0x37,</div><div class='add'>+0x08, 0xDF, 0x00, 0x7C, 0x02, 0xB0, 0x89, 0xC0, 0x17, 0x20, 0x0C, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x81, 0x08, 0x6F, 0x00, 0xAF, 0x00, 0xDC, 0x02,</div><div class='add'>+0x34, 0x1F, 0x00, 0x6F, 0x00, 0xDF, 0x00, 0xEC, 0x89, 0xF1, 0x0F, 0xC0, 0x3F,</div><div class='add'>+0x00, 0x7F, 0x00, 0xCC, 0x01, 0x70, 0x4D, 0xD0, 0x3C, 0x00, 0xBF, 0x00, 0xCD,</div><div class='add'>+0x00, 0x34, 0x0B, 0xC1, 0x07, 0x26, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0xA1, 0x20, 0x36, 0x10, 0x9D, 0x03, 0x04, 0x02, 0x10, 0x89, 0x43, 0x37,</div><div class='add'>+0x00, 0xDD, 0x00, 0x44, 0x05, 0xD0, 0x0D, 0x40, 0x37, 0x00, 0xDD, 0x03, 0x44,</div><div class='add'>+0x19, 0x10, 0x0D, 0x42, 0x34, 0x00, 0xCD, 0x02, 0x44, 0x06, 0x10, 0x19, 0x40,</div><div class='add'>+0x27, 0x02, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xA0, 0xA6,</div><div class='add'>+0x01, 0xDD, 0x06, 0x54, 0x02, 0x10, 0x0D, 0x40, 0x27, 0x01, 0x9D, 0x00, 0x60,</div><div class='add'>+0x03, 0xD0, 0x0D, 0x44, 0x37, 0x00, 0xDD, 0x01, 0x04, 0x85, 0x50, 0x0D, 0x40,</div><div class='add'>+0x34, 0x10, 0x9D, 0x50, 0x44, 0x06, 0x10, 0x49, 0x40, 0x07, 0x00, 0x0A, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x10, 0x00, 0xCD, 0x00, 0x04,</div><div class='add'>+0x03, 0x10, 0x04, 0x40, 0x33, 0x00, 0x8D, 0x00, 0x04, 0x03, 0xD0, 0x0C, 0x40,</div><div class='add'>+0x33, 0x80, 0xDD, 0xA0, 0x04, 0x03, 0x10, 0x0C, 0x40, 0x30, 0x00, 0x8D, 0xC0,</div><div class='add'>+0x44, 0x02, 0x10, 0x08, 0x44, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x01, 0x18, 0x26, 0x00, 0x5F, 0x00, 0x5C, 0x02, 0x30, 0x0D, 0xC0,</div><div class='add'>+0x27, 0x00, 0x9F, 0x00, 0x6C, 0x00, 0xF0, 0x0F, 0xC0, 0x3F, 0x00, 0xDF, 0x00,</div><div class='add'>+0x4C, 0x01, 0x70, 0x09, 0x80, 0x3C, 0x00, 0x1F, 0x00, 0x4C, 0x00, 0x30, 0x09,</div><div class='add'>+0xC0, 0x07, 0x60, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0xB8,</div><div class='add'>+0x1F, 0x00, 0x7F, 0x00, 0xFC, 0x01, 0xF0, 0x0B, 0xC0, 0x1F, 0x00, 0x7F, 0x00,</div><div class='add'>+0xBC, 0x02, 0xF0, 0x0F, 0xC0, 0x3F, 0x00, 0xFF, 0x00, 0xFD, 0x01, 0xD0, 0x0B,</div><div class='add'>+0xC0, 0x3F, 0x00, 0x7F, 0x00, 0xBC, 0x02, 0xF0, 0x0A, 0xC4, 0x17, 0x62, 0x0E,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xA0, 0x7F, 0x00, 0xB3, 0x0C,</div><div class='add'>+0xDC, 0x00, 0x30, 0x4F, 0xC0, 0x3C, 0x01, 0xF3, 0x18, 0xFC, 0x32, 0x70, 0x17,</div><div class='add'>+0xC0, 0x7F, 0x00, 0x5B, 0x01, 0x8C, 0x06, 0x32, 0x1A, 0xC2, 0x7E, 0x00, 0x3B,</div><div class='add'>+0x08, 0xCD, 0x00, 0xB0, 0x03, 0xC2, 0x0C, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x03, 0x18, 0x37, 0x01, 0x91, 0x8E, 0x44, 0x27, 0x10, 0x3F,</div><div class='add'>+0x40, 0xBC, 0x40, 0xF5, 0x26, 0x74, 0x38, 0x10, 0x05, 0x44, 0x77, 0x00, 0x53,</div><div class='add'>+0x01, 0x54, 0x05, 0x52, 0x19, 0x40, 0x55, 0x00, 0x11, 0x06, 0x44, 0x82, 0x10,</div><div class='add'>+0x01, 0xC0, 0x0E, 0x60, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13,</div><div class='add'>+0xA0, 0x33, 0x04, 0x81, 0x00, 0x54, 0x03, 0x10, 0x2C, 0x44, 0xB2, 0x05, 0xC1,</div><div class='add'>+0x00, 0x34, 0x02, 0x50, 0x44, 0x41, 0x31, 0x00, 0x4D, 0x00, 0x54, 0x03, 0x10,</div><div class='add'>+0x08, 0x40, 0x22, 0x00, 0x89, 0x02, 0x04, 0x21, 0xD0, 0x10, 0x42, 0x4F, 0x80,</div><div class='add'>+0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xA0, 0x31, 0x00, 0x91,</div><div class='add'>+0x01, 0x44, 0x07, 0x10, 0x0D, 0x40, 0x36, 0x00, 0xD1, 0x00, 0x74, 0x84, 0x10,</div><div class='add'>+0x05, 0x41, 0x37, 0x01, 0x51, 0x01, 0x54, 0x09, 0x50, 0x1D, 0x00, 0x35, 0x00,</div><div class='add'>+0x11, 0x02, 0x44, 0x83, 0x51, 0x11, 0x40, 0x0F, 0x00, 0x06, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x02, 0x88, 0x36, 0x00, 0x13, 0x07, 0x10, 0x17, 0x30,</div><div class='add'>+0x0D, 0xC0, 0x36, 0x08, 0xD3, 0x40, 0x7C, 0x44, 0x50, 0xB1, 0xE0, 0x35, 0x20,</div><div class='add'>+0x5B, 0x07, 0x5C, 0x0B, 0x30, 0x18, 0x80, 0x36, 0x00, 0x1B, 0x02, 0x4C, 0x28,</div><div class='add'>+0xF4, 0x19, 0xC0, 0x2B, 0x20, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x0F, 0x80, 0x3D, 0x00, 0x9F, 0x00, 0x7C, 0x03, 0xF4, 0x0F, 0xC0, 0x39, 0x00,</div><div class='add'>+0xDF, 0x00, 0x7C, 0x40, 0xF0, 0x13, 0xC0, 0x7F, 0x00, 0x79, 0x10, 0xFC, 0x13,</div><div class='add'>+0xE0, 0x0F, 0xC0, 0x1F, 0x00, 0x5F, 0x02, 0xBC, 0x04, 0xB0, 0x02, 0xC0, 0x1E,</div><div class='add'>+0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x08, 0x35, 0x00,</div><div class='add'>+0x1F, 0x04, 0x4C, 0x03, 0x70, 0x0C, 0xE1, 0x35, 0x04, 0xD7, 0x08, 0x4C, 0x02,</div><div class='add'>+0x70, 0x25, 0xC0, 0x37, 0x00, 0x57, 0x02, 0x5C, 0x0B, 0xB0, 0x49, 0xC0, 0x34,</div><div class='add'>+0x00, 0x5B, 0x00, 0x4C, 0x49, 0x34, 0x09, 0xC0, 0x2B, 0x20, 0x04, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xA0, 0x34, 0x00, 0x9D, 0x00, 0x44, 0x03,</div><div class='add'>+0x11, 0x1F, 0xC4, 0xFC, 0x04, 0xF1, 0x00, 0x44, 0x10, 0x10, 0x05, 0x40, 0x70,</div><div class='add'>+0x00, 0x4B, 0x41, 0x68, 0x2F, 0xB0, 0x2D, 0x40, 0xB0, 0x01, 0x51, 0x00, 0x44,</div><div class='add'>+0x89, 0x00, 0x19, 0x40, 0x4F, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x03, 0x20, 0x32, 0x00, 0x1D, 0x00, 0x34, 0x83, 0x50, 0x1C, 0x40, 0x73,</div><div class='add'>+0x80, 0xC1, 0x26, 0x64, 0x0E, 0x10, 0x00, 0x48, 0x31, 0x00, 0xC5, 0x03, 0x70,</div><div class='add'>+0x0F, 0x90, 0x00, 0x48, 0x31, 0x21, 0x59, 0x0F, 0x04, 0x24, 0x10, 0x08, 0x60,</div><div class='add'>+0x0F, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x7A,</div><div class='add'>+0x80, 0x6D, 0x51, 0x95, 0x47, 0x10, 0x9E, 0x41, 0x70, 0x80, 0xE1, 0x81, 0xA6,</div><div class='add'>+0x07, 0x14, 0x12, 0x00, 0x78, 0x00, 0x69, 0x05, 0xB4, 0x47, 0x99, 0xDA, 0x40,</div><div class='add'>+0x5D, 0x00, 0xA1, 0x49, 0x04, 0x26, 0x10, 0x32, 0x41, 0x37, 0x20, 0x08, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x10, 0x32, 0x00, 0xCF, 0x20, 0x1C,</div><div class='add'>+0x03, 0x50, 0x8C, 0x40, 0x33, 0x00, 0xC1, 0x00, 0x2C, 0x13, 0x30, 0x41, 0xC0,</div><div class='add'>+0x33, 0x24, 0x47, 0x15, 0x3C, 0x03, 0xB0, 0x5C, 0xC8, 0x21, 0x08, 0x8B, 0x05,</div><div class='add'>+0x0D, 0x08, 0x30, 0x0C, 0xC0, 0x4B, 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x02, 0xB8, 0x3D, 0x20, 0xFF, 0x00, 0xE8, 0x03, 0xF0, 0xAE, 0xC0,</div><div class='add'>+0x3F, 0x40, 0xFB, 0x00, 0xDD, 0x03, 0xF1, 0x03, 0xC0, 0x3B, 0x00, 0x45, 0x80,</div><div class='add'>+0xEC, 0x03, 0xF0, 0x0D, 0xC0, 0x3A, 0x00, 0xBF, 0x00, 0xFC, 0x02, 0xF4, 0x8F,</div><div class='add'>+0xC0, 0x0B, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0xA0,</div><div class='add'>+0x77, 0x20, 0x53, 0x20, 0x7E, 0x83, 0xF0, 0xCD, 0xC0, 0x34, 0x11, 0xDF, 0x44,</div><div class='add'>+0x5C, 0x01, 0xF0, 0x11, 0xC0, 0x32, 0x00, 0x1B, 0x00, 0x1C, 0x03, 0x70, 0x0D,</div><div class='add'>+0xC2, 0x36, 0x00, 0xDF, 0x00, 0x4D, 0x03, 0x30, 0x0D, 0xC2, 0x40, 0x00, 0x0E,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0x98, 0x3D, 0x00, 0x61, 0x00,</div><div class='add'>+0xB4, 0x83, 0x14, 0x0E, 0x40, 0xB8, 0x05, 0xFD, 0x16, 0x84, 0x03, 0xD0, 0x02,</div><div class='add'>+0x40, 0x38, 0x80, 0x27, 0x40, 0x84, 0x03, 0x11, 0x0E, 0x40, 0x18, 0x00, 0xED,</div><div class='add'>+0x00, 0x85, 0x03, 0x10, 0x07, 0x40, 0x4C, 0x60, 0x06, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x79, 0x00, 0xE1, 0x01, 0xF6, 0x87, 0xD2, 0x4E,</div><div class='add'>+0x40, 0x7B, 0x00, 0xED, 0x01, 0x94, 0x07, 0xD0, 0x33, 0x40, 0x7B, 0x00, 0x31,</div><div class='add'>+0x01, 0x94, 0x07, 0x58, 0x1F, 0x41, 0x7A, 0x00, 0xED, 0x01, 0x04, 0x07, 0x54,</div><div class='add'>+0x1E, 0x40, 0x10, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16,</div><div class='add'>+0x20, 0x33, 0x00, 0xC1, 0x43, 0x36, 0x03, 0x10, 0x0C, 0x40, 0x30, 0x00, 0xDD,</div><div class='add'>+0x00, 0x44, 0x1F, 0xD0, 0x48, 0x60, 0x21, 0x02, 0x05, 0x01, 0x06, 0x0F, 0x10,</div><div class='add'>+0x3C, 0x40, 0x72, 0x00, 0xCD, 0x19, 0x04, 0x23, 0x50, 0x2D, 0x40, 0x58, 0x00,</div><div class='add'>+0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x17, 0xA8, 0x17, 0x00, 0x71,</div><div class='add'>+0x05, 0xFC, 0x49, 0xF0, 0x05, 0xC0, 0x16, 0x00, 0x5F, 0x00, 0xDC, 0x0D, 0xF0,</div><div class='add'>+0x17, 0xC0, 0x17, 0x00, 0x63, 0x02, 0x9C, 0x6D, 0x70, 0x27, 0xE0, 0x1E, 0x09,</div><div class='add'>+0x7F, 0x02, 0xCC, 0x25, 0x70, 0x87, 0xC0, 0x5C, 0x20, 0x0E, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x12, 0x80, 0x05, 0x40, 0x1F, 0x30, 0x7C, 0x10, 0x74,</div><div class='add'>+0x01, 0xC0, 0x87, 0x00, 0x1F, 0x00, 0x7E, 0x28, 0xF0, 0x01, 0xC0, 0x06, 0x08,</div><div class='add'>+0x17, 0x58, 0x7C, 0x00, 0xF0, 0x61, 0xC0, 0x85, 0x00, 0x1E, 0x82, 0x3C, 0x00,</div><div class='add'>+0x90, 0x21, 0xD0, 0x4B, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x10, 0x08, 0x25, 0x00, 0x9F, 0x00, 0x7C, 0x02, 0x30, 0x19, 0xC0, 0x67, 0x01,</div><div class='add'>+0x9F, 0x01, 0x68, 0x06, 0x32, 0x09, 0xC2, 0x27, 0x00, 0x92, 0x20, 0x5C, 0x06,</div><div class='add'>+0x70, 0x19, 0xD0, 0x24, 0x00, 0x8A, 0x05, 0x44, 0x02, 0x70, 0x09, 0xC2, 0x40,</div><div class='add'>+0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x20, 0x26, 0x00,</div><div class='add'>+0x9D, 0x11, 0x34, 0x02, 0x10, 0x59, 0x40, 0xE7, 0x00, 0x9D, 0x8B, 0x44, 0x06,</div><div class='add'>+0x10, 0x09, 0x40, 0x23, 0x00, 0x91, 0x08, 0x44, 0x8A, 0x10, 0x88, 0x40, 0xE4,</div><div class='add'>+0x20, 0x9D, 0x07, 0x44, 0x0A, 0x50, 0x29, 0x40, 0x04, 0x00, 0x08, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xA0, 0x24, 0x00, 0x9D, 0x08, 0x74, 0x12,</div><div class='add'>+0x50, 0x89, 0x42, 0x27, 0x04, 0x9D, 0x00, 0x74, 0x52, 0x50, 0x09, 0x48, 0x27,</div><div class='add'>+0x40, 0x9D, 0x90, 0x54, 0xA2, 0x53, 0x0D, 0x61, 0x64, 0x00, 0x98, 0x00, 0x54,</div><div class='add'>+0x2A, 0x51, 0x39, 0x40, 0x70, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x14, 0x28, 0x20, 0x00, 0x8D, 0x14, 0x74, 0x52, 0x15, 0x48, 0x41, 0x23,</div><div class='add'>+0x25, 0xCD, 0x14, 0x14, 0x52, 0x50, 0x08, 0x40, 0x23, 0x00, 0x95, 0x00, 0x04,</div><div class='add'>+0x02, 0x11, 0x08, 0x60, 0x20, 0x00, 0x8D, 0x08, 0x14, 0x02, 0x50, 0x48, 0x51,</div><div class='add'>+0x50, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1D, 0x30, 0x06,</div><div class='add'>+0x00, 0x1F, 0x04, 0x7C, 0x10, 0x70, 0x41, 0xC8, 0x07, 0x01, 0x1F, 0x04, 0x7C,</div><div class='add'>+0x10, 0x70, 0x01, 0xC8, 0x07, 0x08, 0x17, 0x00, 0x58, 0x01, 0x72, 0x01, 0xD0,</div><div class='add'>+0x14, 0x00, 0x0B, 0x16, 0x5C, 0x50, 0x70, 0x41, 0xC0, 0x74, 0xC0, 0x0A, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x19, 0xA8, 0x25, 0x05, 0xBF, 0x34, 0xBC,</div><div class='add'>+0x02, 0xF6, 0x08, 0xC0, 0x27, 0x05, 0x9F, 0x14, 0xE4, 0x52, 0xB4, 0x4A, 0xC1,</div><div class='add'>+0x2F, 0x10, 0xAB, 0x00, 0xFC, 0x02, 0xF0, 0x0A, 0xC0, 0x2F, 0x00, 0xBF, 0x04,</div><div class='add'>+0xED, 0x52, 0xF0, 0x4B, 0xC1, 0x67, 0x20, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x18, 0xA0, 0x27, 0x00, 0xBF, 0x11, 0xBC, 0x02, 0xC4, 0x0B, 0xC0,</div><div class='add'>+0x6E, 0x01, 0xBF, 0x54, 0xFC, 0x32, 0xF0, 0x09, 0xC8, 0x29, 0x90, 0xB3, 0x00,</div><div class='add'>+0xAD, 0x02, 0xB0, 0x0B, 0xC0, 0x2C, 0x00, 0xB7, 0x00, 0xCC, 0x12, 0x36, 0x0F,</div><div class='add'>+0xC0, 0x63, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1C, 0x18,</div><div class='add'>+0x47, 0x05, 0x1D, 0x87, 0x74, 0x00, 0x10, 0x81, 0x40, 0x07, 0x05, 0x1D, 0x04,</div><div class='add'>+0x7C, 0x30, 0xD0, 0x05, 0x40, 0x07, 0x80, 0x55, 0x40, 0x44, 0x00, 0x12, 0x05,</div><div class='add'>+0x54, 0x04, 0x00, 0x11, 0x00, 0x45, 0x28, 0x54, 0x01, 0x40, 0x73, 0x60, 0x0C,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0xA0, 0x21, 0x00, 0xCD, 0x10,</div><div class='add'>+0x74, 0x27, 0xC0, 0x0C, 0x40, 0xA3, 0x00, 0x8D, 0x14, 0x34, 0x13, 0xD2, 0x08,</div><div class='add'>+0x40, 0x27, 0x00, 0x81, 0x00, 0x24, 0x03, 0x90, 0x09, 0x40, 0x24, 0x00, 0x85,</div><div class='add'>+0x80, 0x04, 0x02, 0x18, 0x08, 0x40, 0x4B, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x18, 0x20, 0x25, 0x00, 0x9D, 0x02, 0x76, 0x02, 0x10, 0x09,</div><div class='add'>+0x40, 0x27, 0x00, 0x9D, 0x00, 0x74, 0x02, 0xC2, 0x09, 0x48, 0x27, 0x01, 0x95,</div><div class='add'>+0x00, 0x44, 0x22, 0x10, 0x09, 0x44, 0xA4, 0x02, 0x91, 0x00, 0x44, 0x22, 0x50,</div><div class='add'>+0x09, 0x00, 0x63, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05,</div><div class='add'>+0xA8, 0x27, 0x00, 0x9D, 0x01, 0x3C, 0x0A, 0xF0, 0x09, 0xC0, 0x26, 0x08, 0x9F,</div><div class='add'>+0x40, 0x7A, 0x42, 0xF0, 0xB9, 0xC0, 0x21, 0x80, 0x91, 0x00, 0x2C, 0x02, 0xB0,</div><div class='add'>+0x19, 0xC0, 0x64, 0x00, 0x97, 0x04, 0x4C, 0x02, 0x30, 0x49, 0xC0, 0x17, 0x28,</div><div class='add'>+0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x80, 0x25, 0x20, 0x9F,</div><div class='add'>+0x04, 0x7C, 0x16, 0xF4, 0x09, 0xC0, 0x27, 0x0C, 0x9F, 0x20, 0x5E, 0x52, 0xF0,</div><div class='add'>+0x19, 0xC0, 0x27, 0x20, 0x9F, 0x00, 0x7C, 0x02, 0xF0, 0x89, 0xC1, 0x27, 0x00,</div><div class='add'>+0x9F, 0x53, 0x7C, 0x02, 0xF0, 0x49, 0xC1, 0x4B, 0x00, 0x06, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x10, 0x08, 0x05, 0x00, 0x1F, 0x42, 0x7C, 0x00, 0x70,</div><div class='add'>+0x11, 0xCC, 0x07, 0x00, 0x1B, 0x00, 0x4C, 0x00, 0xF0, 0x21, 0xC0, 0x07, 0x00,</div><div class='add'>+0x12, 0x30, 0x4C, 0x40, 0x70, 0x01, 0xC0, 0x85, 0x09, 0x0F, 0x8A, 0x5C, 0x00,</div><div class='add'>+0x34, 0x21, 0xC0, 0x40, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x14, 0xA0, 0x14, 0x00, 0x7D, 0x0A, 0x74, 0x01, 0x10, 0x07, 0x40, 0x9F, 0x00,</div><div class='add'>+0x71, 0x80, 0xC4, 0x01, 0xD0, 0x05, 0xC0, 0x9F, 0x00, 0x61, 0x41, 0xC5, 0x09,</div><div class='add'>+0x10, 0x06, 0x42, 0x58, 0x08, 0x7D, 0x21, 0xC4, 0x09, 0x10, 0x07, 0x40, 0x50,</div><div class='add'>+0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0xA0, 0x32, 0x00,</div><div class='add'>+0xCD, 0x00, 0x34, 0x02, 0xD0, 0x00, 0x48, 0x73, 0x80, 0xC9, 0x11, 0x14, 0x03,</div><div class='add'>+0xD0, 0x0C, 0x40, 0xB3, 0x06, 0xC1, 0x88, 0x04, 0x03, 0x51, 0x2C, 0x40, 0x31,</div><div class='add'>+0x02, 0xCD, 0x01, 0x54, 0x43, 0x90, 0x2C, 0x40, 0x53, 0x00, 0x0A, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x88, 0x38, 0x01, 0xED, 0x80, 0xF4, 0x03,</div><div class='add'>+0x14, 0x02, 0x40, 0xFB, 0x00, 0xE1, 0x03, 0x94, 0x03, 0xD0, 0x8E, 0x64, 0x2B,</div><div class='add'>+0x40, 0xF1, 0x00, 0x84, 0x03, 0x10, 0x0E, 0x44, 0x18, 0x00, 0xAD, 0x00, 0xC4,</div><div class='add'>+0x03, 0x91, 0x1C, 0x40, 0x07, 0x20, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x11, 0x10, 0x78, 0x00, 0xEF, 0x81, 0xB4, 0x07, 0x70, 0x12, 0xCA, 0x7F,</div><div class='add'>+0x00, 0x4B, 0x01, 0x9D, 0x05, 0xF2, 0x1E, 0xC8, 0x7B, 0x80, 0x62, 0x01, 0x8C,</div><div class='add'>+0x07, 0x70, 0x1E, 0xE8, 0x69, 0x20, 0xFF, 0x01, 0xDC, 0x85, 0xB0, 0x1E, 0xD0,</div><div class='add'>+0x47, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xA8, 0xB5,</div><div class='add'>+0x0A, 0xDF, 0x00, 0x7C, 0x03, 0xF0, 0x01, 0xC0, 0x17, 0x00, 0xDF, 0x00, 0x6C,</div><div class='add'>+0x03, 0xF0, 0x0D, 0xC0, 0x25, 0x00, 0xCF, 0x00, 0x7C, 0x03, 0xF0, 0x0C, 0x40,</div><div class='add'>+0x27, 0x00, 0x9F, 0x00, 0x7C, 0x00, 0x70, 0x09, 0xC2, 0x40, 0x00, 0x06, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0xFD, 0x00, 0xFF, 0x01, 0xCC,</div><div class='add'>+0x87, 0xB0, 0x17, 0x80, 0x5F, 0x00, 0xFF, 0x41, 0xFC, 0x07, 0xF9, 0x9E, 0xC0,</div><div class='add'>+0x58, 0x00, 0x73, 0x81, 0x8C, 0x86, 0xB0, 0x9E, 0xC0, 0x7D, 0x08, 0xDF, 0x01,</div><div class='add'>+0xFC, 0x07, 0x34, 0x17, 0xC2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x15, 0x18, 0x39, 0x00, 0x7D, 0x08, 0x84, 0x23, 0x10, 0x82, 0x40,</div><div class='add'>+0x1B, 0x00, 0xED, 0x00, 0xB4, 0x01, 0xD0, 0x0E, 0x62, 0x18, 0x01, 0x6B, 0x04,</div><div class='add'>+0x84, 0x22, 0x10, 0x1C, 0xC0, 0x2A, 0x04, 0x8D, 0x0D, 0xB4, 0x29, 0xB4, 0x07,</div><div class='add'>+0x40, 0x54, 0x60, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x39, 0x00, 0xED, 0x00, 0xC4, 0x03, 0x90, 0x02, 0x40, 0x3B, 0x00, 0x6D, 0x00,</div><div class='add'>+0xB4, 0x01, 0xD0, 0x0F, 0x5A, 0x18, 0x20, 0x71, 0x00, 0xF4, 0x43, 0xD0, 0x4F,</div><div class='add'>+0x40, 0x2B, 0x00, 0xED, 0x00, 0xB4, 0x01, 0x90, 0x0E, 0x40, 0x00, 0x00, 0x04,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x20, 0x31, 0x80, 0x8D, 0x22,</div><div class='add'>+0x04, 0x0B, 0x19, 0x08, 0x40, 0x07, 0x00, 0x8D, 0x00, 0x34, 0x08, 0xD1, 0x2C,</div><div class='add'>+0x40, 0x50, 0x00, 0x49, 0x00, 0x34, 0x4A, 0x51, 0x3C, 0x40, 0xE3, 0x04, 0x0D,</div><div class='add'>+0x10, 0x34, 0x00, 0x90, 0x28, 0x51, 0x10, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x15, 0xA8, 0x3D, 0x10, 0x1F, 0x01, 0x4C, 0x0B, 0xB0, 0x01,</div><div class='add'>+0xC0, 0x27, 0x00, 0x9F, 0x00, 0x7C, 0x1A, 0xF0, 0x2F, 0xC0, 0x30, 0x04, 0xC1,</div><div class='add'>+0x20, 0x7C, 0x80, 0xF0, 0x0C, 0xCC, 0xA3, 0x00, 0x5D, 0x20, 0x7C, 0x0A, 0x90,</div><div class='add'>+0x29, 0x48, 0x54, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,</div><div class='add'>+0x00, 0x37, 0x28, 0x9F, 0x0C, 0x7D, 0x23, 0xF0, 0x01, 0xC0, 0x27, 0x00, 0x1F,</div><div class='add'>+0x02, 0x7C, 0x4A, 0xF0, 0x0D, 0xC0, 0x27, 0xC0, 0xD7, 0x50, 0x49, 0x0A, 0xA0,</div><div class='add'>+0xCD, 0x00, 0xA6, 0x00, 0x0F, 0x08, 0x78, 0x12, 0x74, 0x01, 0xC0, 0x07, 0x00,</div><div class='add'>+0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x84, 0x08, 0x3F, 0x10, 0x2F,</div><div class='add'>+0x00, 0xEC, 0x47, 0xB0, 0x02, 0xD0, 0x2C, 0x00, 0x33, 0x00, 0xBC, 0x80, 0xB0,</div><div class='add'>+0x0F, 0xC3, 0x3F, 0x00, 0x7F, 0xC0, 0xEC, 0x80, 0x71, 0x0B, 0xC0, 0x2E, 0x08,</div><div class='add'>+0x73, 0x00, 0x0D, 0x02, 0x14, 0x0A, 0xD0, 0x11, 0x22, 0x0C, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x85, 0x20, 0x36, 0x00, 0x9D, 0x25, 0x04, 0x27, 0x10,</div><div class='add'>+0x21, 0x40, 0x64, 0x00, 0x11, 0x05, 0x74, 0x16, 0x12, 0x0D, 0x40, 0x27, 0x10,</div><div class='add'>+0xD5, 0x01, 0x04, 0x24, 0x10, 0x19, 0x45, 0xE4, 0x01, 0x55, 0x0A, 0x44, 0x06,</div><div class='add'>+0x54, 0x71, 0x42, 0x14, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x01, 0xA0, 0x34, 0x00, 0x1D, 0x81, 0x64, 0x03, 0x90, 0x05, 0x49, 0xC4, 0x80,</div><div class='add'>+0x91, 0x01, 0x76, 0x06, 0x90, 0x0D, 0x40, 0xB7, 0x00, 0x55, 0x01, 0x66, 0x8A,</div><div class='add'>+0x50, 0x1D, 0x60, 0x66, 0x80, 0x55, 0x02, 0x44, 0x06, 0x54, 0x11, 0x40, 0x04,</div><div class='add'>+0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x28, 0x30, 0x08,</div><div class='add'>+0x0D, 0x00, 0x44, 0x03, 0x14, 0x00, 0x40, 0x00, 0x48, 0x81, 0x40, 0x36, 0x02,</div><div class='add'>+0x10, 0x0C, 0x40, 0x33, 0x00, 0x11, 0x08, 0x44, 0x02, 0x10, 0x4D, 0x60, 0x04,</div><div class='add'>+0xC0, 0x05, 0x06, 0x04, 0x00, 0x58, 0x00, 0x40, 0x40, 0xA0, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xB0, 0x3E, 0x00, 0x1F, 0x00, 0x6C, 0x83,</div><div class='add'>+0xB0, 0x01, 0xC0, 0x24, 0x00, 0x13, 0x00, 0x7C, 0x00, 0xB0, 0x0D, 0xC8, 0x37,</div><div class='add'>+0x40, 0x1F, 0x02, 0x6C, 0x02, 0x70, 0xE9, 0xC3, 0x26, 0x80, 0x93, 0x16, 0x4C,</div><div class='add'>+0x02, 0x70, 0x09, 0xC2, 0x01, 0xC0, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x85, 0xA0, 0x3F, 0x20, 0xBF, 0x00, 0xBC, 0x03, 0xF0, 0x03, 0xC0, 0x2F,</div><div class='add'>+0x00, 0xBF, 0x40, 0xFC, 0x02, 0xF1, 0x0F, 0xC0, 0x3F, 0x08, 0x2F, 0x00, 0xFC,</div><div class='add'>+0x02, 0xF0, 0x41, 0xC0, 0x2F, 0x00, 0x3F, 0x04, 0xFC, 0x00, 0xF0, 0x03, 0xC0,</div><div class='add'>+0x17, 0x22, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xA0, 0x7F,</div><div class='add'>+0x00, 0x63, 0x04, 0xCC, 0x32, 0x72, 0x1F, 0xC8, 0x2C, 0x03, 0x72, 0x01, 0xCC,</div><div class='add'>+0x05, 0x70, 0x0B, 0xC0, 0x3D, 0x00, 0xBB, 0x80, 0xEC, 0x04, 0xD0, 0x9B, 0xD0,</div><div class='add'>+0x5C, 0x4A, 0xF3, 0x01, 0xCC, 0x12, 0xF1, 0x17, 0xC0, 0x0C, 0x00, 0x0E, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x08, 0x7F, 0x00, 0x51, 0x03, 0x44,</div><div class='add'>+0xB2, 0x12, 0x1F, 0x40, 0x24, 0x13, 0xD1, 0x01, 0x44, 0x07, 0x10, 0x3D, 0x40,</div><div class='add'>+0xFC, 0x00, 0xB1, 0x03, 0x44, 0x80, 0xD0, 0x45, 0x40, 0x04, 0x01, 0xF1, 0x21,</div><div class='add'>+0x44, 0x26, 0xD0, 0x1D, 0x40, 0x05, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x11, 0xA0, 0x33, 0x00, 0x55, 0x02, 0x04, 0x12, 0x50, 0x0C, 0x40,</div><div class='add'>+0x21, 0x01, 0x91, 0x00, 0x16, 0x02, 0x50, 0x88, 0x40, 0x31, 0x02, 0x89, 0x08,</div><div class='add'>+0x24, 0x00, 0xD8, 0x08, 0x40, 0x30, 0x88, 0xC1, 0x00, 0x14, 0x82, 0xD2, 0x08,</div><div class='add'>+0x40, 0x44, 0x80, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xA8,</div><div class='add'>+0x35, 0x00, 0xD5, 0x00, 0x44, 0x82, 0x50, 0x0D, 0x40, 0x25, 0x00, 0xD1, 0x00,</div><div class='add'>+0x10, 0x22, 0x00, 0x09, 0x40, 0x35, 0x80, 0x95, 0x04, 0x44, 0x06, 0xC0, 0x81,</div><div class='add'>+0x00, 0x34, 0x04, 0xD1, 0x40, 0x54, 0x12, 0xD0, 0x0C, 0x40, 0x0D, 0x20, 0x06,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA8, 0x33, 0x40, 0xC7, 0x00,</div><div class='add'>+0x4C, 0x26, 0x71, 0x0D, 0xD0, 0x64, 0x00, 0x83, 0x80, 0x5C, 0x07, 0x70, 0x05,</div><div class='add'>+0xC0, 0x35, 0x00, 0x9B, 0x00, 0x6C, 0x4C, 0xF0, 0x09, 0xC8, 0x24, 0x00, 0xD3,</div><div class='add'>+0x00, 0x5C, 0x07, 0xF0, 0x0D, 0xC0, 0x00, 0x20, 0x0E, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x07, 0x80, 0x3D, 0x10, 0x7B, 0x09, 0xFC, 0x03, 0xB3, 0x0F,</div><div class='add'>+0xC0, 0x3E, 0x41, 0xBF, 0x00, 0xED, 0x83, 0xF0, 0x9F, 0x82, 0x36, 0x20, 0x9B,</div><div class='add'>+0x01, 0xFC, 0x00, 0xF0, 0x1F, 0xC0, 0x2F, 0x00, 0xFD, 0x80, 0xEC, 0x02, 0xF2,</div><div class='add'>+0x8F, 0xC0, 0x1F, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,</div><div class='add'>+0x08, 0x35, 0x12, 0xDF, 0x0A, 0x4D, 0x03, 0xF0, 0x8C, 0xC4, 0x34, 0x00, 0x9F,</div><div class='add'>+0x00, 0x7C, 0x03, 0xF0, 0x00, 0xC0, 0x73, 0x00, 0x8B, 0x00, 0x5C, 0x08, 0xF0,</div><div class='add'>+0x09, 0xC0, 0xA7, 0x00, 0xCF, 0x00, 0x7C, 0x42, 0xF2, 0x09, 0xC2, 0x08, 0x20,</div><div class='add'>+0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0xA2, 0x34, 0x00, 0xDD,</div><div class='add'>+0x80, 0x44, 0x03, 0xD0, 0x0D, 0x40, 0x74, 0x00, 0x9D, 0x00, 0x74, 0x03, 0xD0,</div><div class='add'>+0x0B, 0x02, 0x3F, 0x00, 0x91, 0x01, 0x44, 0x02, 0xD0, 0x0D, 0x40, 0x67, 0x04,</div><div class='add'>+0xDD, 0x00, 0x74, 0x02, 0xD2, 0x0D, 0x40, 0x4C, 0x00, 0x02, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x07, 0xA0, 0x32, 0x0C, 0x4C, 0x00, 0x44, 0x03, 0xD0,</div><div class='add'>+0x0C, 0x51, 0x34, 0x02, 0x4D, 0x00, 0x30, 0x00, 0xD0, 0x08, 0x40, 0x32, 0x00,</div><div class='add'>+0x81, 0x00, 0x14, 0x00, 0xD0, 0x0D, 0x40, 0x37, 0x00, 0xCD, 0x20, 0x34, 0x2E,</div><div class='add'>+0xD0, 0x00, 0x50, 0x1C, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x04, 0x80, 0x78, 0x00, 0x6D, 0x41, 0x84, 0x46, 0xD0, 0x1E, 0x48, 0x68, 0x00,</div><div class='add'>+0xED, 0x01, 0xB4, 0x06, 0xD0, 0x1E, 0x42, 0x7B, 0x60, 0xA1, 0x21, 0x84, 0x84,</div><div class='add'>+0xD0, 0x5E, 0x41, 0x6B, 0x00, 0xEC, 0x81, 0xB4, 0x07, 0xD2, 0x1B, 0x40, 0x18,</div><div class='add'>+0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x10, 0x30, 0x00,</div><div class='add'>+0xCF, 0x00, 0x0C, 0x02, 0xF2, 0x0C, 0xC0, 0x20, 0x00, 0x8F, 0x00, 0x3C, 0x12,</div><div class='add'>+0xF0, 0x48, 0xC0, 0x33, 0x00, 0x83, 0x10, 0x1C, 0x80, 0xF8, 0x08, 0xE0, 0x33,</div><div class='add'>+0x00, 0xCF, 0x48, 0x3C, 0x03, 0xF0, 0x09, 0xC0, 0x48, 0x40, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xB8, 0x7D, 0x00, 0xFF, 0x00, 0xFC, 0x42,</div><div class='add'>+0xF0, 0x1E, 0xC0, 0x2F, 0x00, 0xFF, 0x00, 0xFC, 0x02, 0xF0, 0x0F, 0xC0, 0x3F,</div><div class='add'>+0x00, 0xB7, 0x00, 0xEC, 0x22, 0xF2, 0x4B, 0xC0, 0x3F, 0x00, 0xFE, 0x01, 0xFC,</div><div class='add'>+0x43, 0xF0, 0x09, 0xC0, 0x0B, 0x60, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x11, 0xA0, 0x37, 0x00, 0x5F, 0x00, 0x7C, 0x03, 0xF0, 0x0D, 0xC0, 0x37,</div><div class='add'>+0x00, 0x9F, 0x00, 0x78, 0x02, 0xF0, 0x85, 0xC0, 0xF0, 0x22, 0xDB, 0x14, 0x74,</div><div class='add'>+0x00, 0xE0, 0x1C, 0xC0, 0x24, 0x00, 0xDF, 0x00, 0x7C, 0x03, 0xF0, 0x09, 0xC0,</div><div class='add'>+0x57, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x88, 0xB9,</div><div class='add'>+0x00, 0x6D, 0x04, 0xB4, 0x13, 0xD0, 0x4E, 0x40, 0x3B, 0x00, 0xAD, 0x00, 0xB6,</div><div class='add'>+0x02, 0xD0, 0x4E, 0x50, 0x38, 0x04, 0xA1, 0x00, 0xB4, 0x02, 0xD0, 0x0E, 0x40,</div><div class='add'>+0x28, 0x00, 0xED, 0x04, 0xB4, 0x03, 0xD0, 0x0A, 0x40, 0x4B, 0x20, 0x06, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x79, 0x89, 0xED, 0x09, 0xB4,</div><div class='add'>+0x07, 0xD0, 0x9E, 0x40, 0x79, 0x03, 0xAD, 0x01, 0xB4, 0x06, 0xD0, 0x14, 0x62,</div><div class='add'>+0x78, 0x01, 0xE9, 0x11, 0xB4, 0x04, 0xD0, 0x1F, 0x40, 0x69, 0x88, 0xED, 0x0D,</div><div class='add'>+0xB4, 0x57, 0xD0, 0x1A, 0x40, 0x0F, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x12, 0x28, 0x33, 0x00, 0x8D, 0xA0, 0x34, 0x07, 0xD0, 0x0C, 0x40,</div><div class='add'>+0x73, 0x10, 0x8D, 0x0B, 0x34, 0x2A, 0xD0, 0x2C, 0x40, 0x30, 0x00, 0xC1, 0x01,</div><div class='add'>+0x34, 0x03, 0xD0, 0xDC, 0x40, 0x21, 0x23, 0xCD, 0x00, 0x34, 0x07, 0xD0, 0x08,</div><div class='add'>+0x41, 0x4B, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x17, 0xA8,</div><div class='add'>+0x11, 0x00, 0x7F, 0x20, 0x7C, 0x11, 0xF0, 0x05, 0xC0, 0x17, 0x24, 0x7F, 0x02,</div><div class='add'>+0xFC, 0x0D, 0xF0, 0x07, 0xC0, 0x14, 0x00, 0x5B, 0x01, 0xFC, 0x31, 0xF0, 0x07,</div><div class='add'>+0xD0, 0x9D, 0x00, 0x5F, 0x00, 0x7C, 0x01, 0xF0, 0x27, 0xC0, 0x5F, 0x20, 0x06,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x87, 0x00, 0x1F, 0x01,</div><div class='add'>+0x7C, 0x00, 0xF0, 0x01, 0xC0, 0x07, 0x00, 0x1F, 0x10, 0x70, 0x40, 0xF0, 0x80,</div><div class='add'>+0xC0, 0x07, 0x00, 0x1F, 0x00, 0x7C, 0x00, 0xF1, 0x01, 0x80, 0x06, 0x28, 0x1F,</div><div class='add'>+0x80, 0x78, 0x08, 0xF0, 0x01, 0xC0, 0x4B, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x10, 0x08, 0x67, 0x00, 0x93, 0x00, 0x7C, 0x26, 0xF0, 0x39,</div><div class='add'>+0xC0, 0x27, 0x01, 0x9F, 0x00, 0x4D, 0x02, 0x32, 0x09, 0xC3, 0x64, 0x00, 0x8F,</div><div class='add'>+0x01, 0x4C, 0x02, 0xF1, 0x29, 0xC0, 0x27, 0x01, 0x9F, 0x00, 0x4C, 0x06, 0x30,</div><div class='add'>+0x09, 0xC0, 0x40, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,</div><div class='add'>+0x20, 0x2E, 0x00, 0xB1, 0x03, 0xF4, 0x02, 0xD0, 0x0B, 0x40, 0x6F, 0x00, 0x9D,</div><div class='add'>+0x00, 0x04, 0x02, 0x10, 0x09, 0x40, 0x24, 0x00, 0x9D, 0x01, 0x44, 0x02, 0xD0,</div><div class='add'>+0x09, 0x40, 0x67, 0x08, 0xBD, 0x00, 0x84, 0x0E, 0x10, 0x08, 0x40, 0x04, 0x00,</div><div class='add'>+0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0xA0, 0x24, 0x02, 0xD1,</div><div class='add'>+0x08, 0x74, 0x02, 0xD0, 0x09, 0x41, 0x27, 0x00, 0x8D, 0x00, 0x44, 0x02, 0x10,</div><div class='add'>+0x09, 0x50, 0x24, 0x01, 0x9D, 0x04, 0x44, 0x02, 0xD0, 0x0D, 0x42, 0x27, 0x00,</div><div class='add'>+0x8D, 0x00, 0x44, 0x1A, 0x10, 0x09, 0x40, 0x60, 0x00, 0x02, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x10, 0x20, 0x20, 0x00, 0x81, 0x00, 0x34, 0x0A, 0xD0,</div><div class='add'>+0x08, 0x42, 0xA3, 0x08, 0x8D, 0x02, 0x44, 0x0A, 0x10, 0x68, 0x41, 0x20, 0x05,</div><div class='add'>+0x8D, 0x14, 0x05, 0x02, 0xD0, 0x28, 0x40, 0xA3, 0x08, 0x8D, 0x02, 0x05, 0x02,</div><div class='add'>+0x10, 0x29, 0x40, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x1D, 0xB0, 0x56, 0x40, 0x53, 0x01, 0x7C, 0x04, 0xF0, 0x11, 0xC0, 0x47, 0x00,</div><div class='add'>+0x1F, 0x00, 0x4C, 0x00, 0x34, 0x41, 0xC0, 0x04, 0x01, 0x1F, 0x04, 0x4C, 0x28,</div><div class='add'>+0xF0, 0x01, 0xC0, 0x07, 0x00, 0x1F, 0x01, 0x4C, 0x04, 0x34, 0x01, 0xD0, 0x74,</div><div class='add'>+0xC0, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x19, 0xB8, 0xA7, 0x00,</div><div class='add'>+0xBF, 0x02, 0xFC, 0x0E, 0xF0, 0x29, 0xC0, 0xEF, 0x00, 0xBF, 0x01, 0xFC, 0x06,</div><div class='add'>+0xF0, 0x1B, 0xC0, 0x27, 0x00, 0xBF, 0x80, 0xFC, 0x06, 0xF0, 0x1B, 0xC0, 0x6F,</div><div class='add'>+0x08, 0x9F, 0x23, 0xFC, 0x0A, 0xF0, 0x1B, 0xC0, 0x67, 0x60, 0x0E, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0xA0, 0x6F, 0x00, 0xFB, 0x11, 0xCD, 0x16,</div><div class='add'>+0xF0, 0x1B, 0xC0, 0x6F, 0x01, 0x93, 0x00, 0x6C, 0x0A, 0x20, 0x59, 0x80, 0x6D,</div><div class='add'>+0x01, 0xA3, 0x05, 0x0C, 0x02, 0xF0, 0x2B, 0xC8, 0x2B, 0x00, 0x9D, 0x85, 0xCC,</div><div class='add'>+0x06, 0x30, 0x29, 0xC0, 0x67, 0x20, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x1C, 0x08, 0x07, 0x00, 0x11, 0x42, 0x44, 0x14, 0xD0, 0x21, 0x40, 0xC7,</div><div class='add'>+0x03, 0x51, 0x15, 0x64, 0x04, 0x10, 0x30, 0x40, 0x04, 0x00, 0x11, 0x00, 0x54,</div><div class='add'>+0x00, 0xD0, 0x51, 0x40, 0x57, 0x00, 0x1D, 0x07, 0x44, 0x28, 0x10, 0x11, 0x40,</div><div class='add'>+0x73, 0x60, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xA0, 0xA3,</div><div class='add'>+0x00, 0x89, 0x00, 0x04, 0x4A, 0xD0, 0x28, 0x42, 0x23, 0x04, 0x81, 0x20, 0x24,</div><div class='add'>+0x02, 0x10, 0xC8, 0x61, 0xA3, 0x00, 0x81, 0x02, 0x04, 0x02, 0x50, 0x48, 0x60,</div><div class='add'>+0x33, 0x05, 0x8D, 0x12, 0x14, 0x02, 0xD0, 0x08, 0x40, 0x43, 0x80, 0x0E, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0xA8, 0x25, 0x00, 0x91, 0x40, 0x44,</div><div class='add'>+0x02, 0xD0, 0x09, 0x42, 0x27, 0x60, 0x91, 0x08, 0x24, 0x02, 0x10, 0x09, 0x42,</div><div class='add'>+0x26, 0x00, 0x91, 0x04, 0x54, 0x0A, 0xD0, 0x89, 0x42, 0x27, 0x01, 0x9D, 0x00,</div><div class='add'>+0x54, 0x06, 0xD0, 0x09, 0x40, 0x63, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x05, 0x28, 0x25, 0x00, 0x9B, 0x0E, 0xCC, 0x22, 0xF0, 0x09, 0xC0,</div><div class='add'>+0x2F, 0x00, 0xB3, 0x03, 0xEC, 0x12, 0x30, 0x1B, 0xC0, 0x27, 0x00, 0x93, 0x00,</div><div class='add'>+0x4C, 0x06, 0xE0, 0x1B, 0xC0, 0xEF, 0x20, 0xBF, 0x00, 0x5D, 0x02, 0xF0, 0x6B,</div><div class='add'>+0xC0, 0x17, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x00,</div><div class='add'>+0x25, 0x00, 0x9F, 0x10, 0x7C, 0x02, 0xF0, 0x09, 0xC0, 0xA7, 0x00, 0x9F, 0x21,</div><div class='add'>+0x7C, 0x12, 0xF4, 0x38, 0xD0, 0x21, 0x40, 0x9F, 0x00, 0x7C, 0x0A, 0xF2, 0x09,</div><div class='add'>+0xC0, 0x67, 0x08, 0x9F, 0x00, 0x2C, 0x82, 0x34, 0x39, 0xC0, 0x53, 0x00, 0x04,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x08, 0x01, 0x01, 0x0F, 0x00,</div><div class='add'>+0x4D, 0x80, 0x30, 0x81, 0xC0, 0x07, 0x00, 0x1F, 0x02, 0x7C, 0x00, 0xF0, 0x01,</div><div class='add'>+0xC0, 0x04, 0x10, 0x17, 0x00, 0x4C, 0x08, 0x72, 0x01, 0xD0, 0x04, 0x40, 0x03,</div><div class='add'>+0x00, 0x7C, 0x00, 0xF0, 0x01, 0xC0, 0x53, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x14, 0x20, 0xDC, 0x20, 0x7D, 0x00, 0x44, 0x05, 0x10, 0x07,</div><div class='add'>+0x40, 0x17, 0x04, 0x5D, 0x00, 0x74, 0x01, 0xD0, 0x05, 0xC0, 0x16, 0x00, 0x41,</div><div class='add'>+0x11, 0x44, 0x01, 0x10, 0x15, 0x43, 0x14, 0x00, 0x51, 0x00, 0xF0, 0x01, 0xC0,</div><div class='add'>+0x05, 0x40, 0x53, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14,</div><div class='add'>+0xA0, 0xE2, 0x00, 0x8D, 0x00, 0x04, 0x07, 0x10, 0x08, 0x42, 0x37, 0x00, 0xCD,</div><div class='add'>+0x00, 0x30, 0x03, 0xD0, 0x0C, 0x40, 0x32, 0x00, 0x85, 0x01, 0x05, 0x03, 0x50,</div><div class='add'>+0x0C, 0x40, 0x32, 0x00, 0xC1, 0x80, 0x34, 0x02, 0xC0, 0x0C, 0x40, 0x53, 0x00,</div><div class='add'>+0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x80, 0xB8, 0x00, 0xAD,</div><div class='add'>+0x00, 0x04, 0x77, 0x14, 0x0E, 0x40, 0x2B, 0x82, 0xED, 0x04, 0xB4, 0x13, 0xD0,</div><div class='add'>+0x4E, 0x40, 0x2A, 0x00, 0xF5, 0x00, 0xC4, 0x07, 0x50, 0xDE, 0x40, 0x7E, 0x01,</div><div class='add'>+0xE1, 0x0C, 0xB4, 0x03, 0xD1, 0x4E, 0x40, 0x13, 0x00, 0x02, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x14, 0x10, 0x68, 0x00, 0xAF, 0x01, 0x84, 0x06, 0x30,</div><div class='add'>+0x1A, 0xC0, 0x7B, 0x01, 0xEF, 0x03, 0xBC, 0x0F, 0xF0, 0x5E, 0xC0, 0x6A, 0x00,</div><div class='add'>+0xE7, 0x01, 0x8C, 0x07, 0x70, 0x1F, 0x80, 0xFA, 0x00, 0xE3, 0x01, 0xBC, 0x06,</div><div class='add'>+0xF0, 0x3E, 0xC0, 0x53, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x10, 0xB8, 0x35, 0x00, 0x8F, 0x00, 0x7C, 0x02, 0xC0, 0x0D, 0xC0, 0x27, 0x00,</div><div class='add'>+0xDF, 0x00, 0x7C, 0x03, 0xE0, 0x8D, 0xC4, 0x23, 0x00, 0xDB, 0x00, 0x7C, 0x63,</div><div class='add'>+0xB8, 0x0D, 0xC0, 0x35, 0x00, 0xDF, 0x00, 0x7C, 0x03, 0xF0, 0x0D, 0xC0, 0x43,</div><div class='add'>+0x60, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xA0, 0x6F, 0x00,</div><div class='add'>+0xB3, 0x01, 0xFC, 0x87, 0x30, 0x1B, 0x80, 0x7F, 0x02, 0xE3, 0x01, 0x8C, 0x07,</div><div class='add'>+0x30, 0x1F, 0x40, 0x7C, 0x01, 0xFF, 0x01, 0xEC, 0x07, 0x30, 0x1B, 0xC0, 0x78,</div><div class='add'>+0x28, 0xF3, 0x21, 0xFC, 0x06, 0x30, 0x1E, 0xC8, 0x08, 0x00, 0x0E, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x88, 0x29, 0x40, 0xA1, 0x00, 0xF4, 0x03,</div><div class='add'>+0x14, 0x0A, 0x40, 0x2B, 0x48, 0xE1, 0x00, 0x84, 0x23, 0x10, 0x8E, 0x40, 0x29,</div><div class='add'>+0x00, 0xED, 0x00, 0xC4, 0x43, 0xB0, 0x0A, 0xC0, 0x3A, 0x02, 0xE1, 0x00, 0xB4,</div><div class='add'>+0x0B, 0x10, 0x8E, 0x40, 0x54, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x21, 0x00, 0xA1, 0x10, 0xB4, 0x02, 0x10, 0x0A, 0x40, 0x3B,</div><div class='add'>+0x80, 0xF1, 0x01, 0xC4, 0x07, 0x10, 0x1F, 0x40, 0x28, 0x01, 0xCD, 0x00, 0xA4,</div><div class='add'>+0x03, 0x10, 0x0B, 0x41, 0x3D, 0x00, 0xE1, 0x01, 0xB4, 0x62, 0x14, 0x1F, 0x40,</div><div class='add'>+0x20, 0x02, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x28, 0x13,</div><div class='add'>+0x00, 0x81, 0x01, 0x34, 0x86, 0x10, 0x0C, 0x40, 0x63, 0x00, 0xC1, 0x07, 0x04,</div><div class='add'>+0x0B, 0x18, 0x3C, 0x40, 0x21, 0x00, 0xCD, 0x00, 0x04, 0x17, 0x90, 0x3C, 0x43,</div><div class='add'>+0x67, 0x00, 0xC1, 0x00, 0x34, 0x07, 0x10, 0x1C, 0x40, 0x18, 0x20, 0x0C, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0xA8, 0x25, 0x00, 0xD3, 0x03, 0x7C,</div><div class='add'>+0x13, 0x30, 0x09, 0xC2, 0x77, 0x04, 0xD3, 0x04, 0x45, 0x2B, 0x34, 0x6D, 0xC0,</div><div class='add'>+0x24, 0x00, 0xDF, 0x11, 0xEC, 0x03, 0x30, 0x3C, 0xC0, 0x65, 0x44, 0xD3, 0x20,</div><div class='add'>+0x3C, 0x02, 0x30, 0x6D, 0xD0, 0x54, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x01, 0x00, 0x37, 0x00, 0xCF, 0x00, 0x7C, 0x03, 0xF0, 0x2D, 0xC0,</div><div class='add'>+0x27, 0x08, 0xDF, 0x00, 0x7C, 0x03, 0xF0, 0x0D, 0xC0, 0x27, 0x00, 0xDD, 0x40,</div><div class='add'>+0x7C, 0x83, 0xF2, 0x0D, 0xC0, 0x26, 0x00, 0xDF, 0x00, 0x7C, 0x0A, 0xF0, 0x4D,</div><div class='add'>+0xC0, 0x27, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x08,</div><div class='add'>+0x2F, 0x00, 0xBF, 0x10, 0x8C, 0x06, 0x31, 0x0B, 0xD0, 0xB4, 0x00, 0xFF, 0x00,</div><div class='add'>+0xCC, 0x03, 0xF0, 0x0F, 0xC1, 0xEF, 0x00, 0xFF, 0x85, 0xCC, 0x03, 0x30, 0x4F,</div><div class='add'>+0xC0, 0xEC, 0x00, 0xF3, 0x00, 0x4C, 0x16, 0x30, 0x0F, 0xC0, 0x04, 0x20, 0x0C,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x81, 0x20, 0x36, 0x00, 0xDD, 0x03,</div><div class='add'>+0x44, 0x02, 0x11, 0x24, 0x40, 0x74, 0x00, 0xDD, 0x40, 0x44, 0x03, 0xD0, 0x0D,</div><div class='add'>+0x42, 0x67, 0x20, 0xCD, 0x01, 0x44, 0x03, 0x10, 0x19, 0x48, 0x74, 0x20, 0xD1,</div><div class='add'>+0x00, 0x44, 0x01, 0x00, 0x0D, 0x40, 0x84, 0x02, 0x08, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x01, 0xA0, 0x26, 0x00, 0xDD, 0x06, 0x44, 0xA3, 0x14, 0x09,</div><div class='add'>+0x41, 0x34, 0x00, 0xCD, 0x00, 0x64, 0x03, 0xD0, 0x0D, 0x40, 0x27, 0x10, 0xDD,</div><div class='add'>+0x00, 0x84, 0x03, 0x10, 0x09, 0x40, 0x24, 0x40, 0xC1, 0x00, 0x44, 0x02, 0x10,</div><div class='add'>+0x0C, 0x40, 0x04, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10,</div><div class='add'>+0x00, 0x20, 0x00, 0xCD, 0x00, 0x14, 0x02, 0x10, 0x08, 0x40, 0x20, 0x00, 0xCD,</div><div class='add'>+0x00, 0x05, 0x03, 0xD0, 0x0C, 0x40, 0x23, 0x80, 0xDD, 0x40, 0x04, 0x03, 0x14,</div><div class='add'>+0x09, 0x50, 0x20, 0x00, 0xC1, 0x40, 0x04, 0x02, 0x16, 0x0C, 0x54, 0x40, 0x80,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x26, 0x00, 0x1F,</div><div class='add'>+0x00, 0x4C, 0x03, 0x30, 0x09, 0xCA, 0x24, 0x00, 0xFF, 0x00, 0xEC, 0x03, 0xF0,</div><div class='add'>+0x0F, 0xC0, 0x27, 0x00, 0xDF, 0x00, 0xCD, 0x03, 0x30, 0x09, 0xC0, 0x24, 0x00,</div><div class='add'>+0xF3, 0x00, 0x4D, 0x02, 0x30, 0x0F, 0xC0, 0x04, 0x40, 0x08, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x05, 0xB8, 0x1F, 0x00, 0x7F, 0x00, 0xED, 0x02, 0xF0,</div><div class='add'>+0x07, 0xC0, 0x2F, 0x00, 0xFF, 0x00, 0xFC, 0x03, 0xF0, 0x0E, 0xC0, 0x2F, 0x00,</div><div class='add'>+0xFF, 0x00, 0xFC, 0x03, 0xF0, 0x0A, 0xC0, 0x2F, 0x00, 0xFF, 0x00, 0xFC, 0x01,</div><div class='add'>+0xF0, 0x0F, 0xC0, 0x17, 0x60, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x03, 0xA0, 0x7F, 0x00, 0xF7, 0x0C, 0xCC, 0x1B, 0x70, 0x3A, 0xC0, 0xEC, 0x00,</div><div class='add'>+0xBB, 0x04, 0xFC, 0x03, 0x30, 0x1E, 0xC0, 0x3E, 0x00, 0xA7, 0x01, 0x8C, 0x06,</div><div class='add'>+0x30, 0x1B, 0xC0, 0x7E, 0x12, 0xBF, 0x04, 0xCC, 0x07, 0xF0, 0x03, 0xC4, 0x0E,</div><div class='add'>+0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x08, 0x77, 0x00,</div><div class='add'>+0xF1, 0x8E, 0xC4, 0x3B, 0x10, 0x49, 0x40, 0x24, 0x00, 0x91, 0x0E, 0xF4, 0x2F,</div><div class='add'>+0x50, 0x19, 0x40, 0xF4, 0x00, 0x5D, 0x01, 0x44, 0x50, 0x10, 0x19, 0x40, 0x34,</div><div class='add'>+0x00, 0xC9, 0x14, 0x44, 0x03, 0xD0, 0x19, 0x40, 0x04, 0x20, 0x0C, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0xA2, 0x33, 0x20, 0xC5, 0x04, 0x04, 0x13,</div><div class='add'>+0x50, 0x49, 0x40, 0x30, 0x01, 0x09, 0x10, 0x14, 0x03, 0x12, 0x08, 0x60, 0x32,</div><div class='add'>+0x02, 0xCD, 0x80, 0x44, 0x10, 0x10, 0x08, 0x40, 0x33, 0x00, 0x8D, 0x0C, 0x04,</div><div class='add'>+0x03, 0xD0, 0x08, 0x40, 0x47, 0x80, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x03, 0xA8, 0x35, 0x00, 0xD1, 0x00, 0x46, 0x03, 0x10, 0x19, 0x41, 0x70,</div><div class='add'>+0x00, 0x11, 0x01, 0x74, 0x03, 0x10, 0x19, 0x40, 0x34, 0x00, 0xDD, 0x84, 0x46,</div><div class='add'>+0x84, 0x10, 0x09, 0x40, 0x35, 0x00, 0x99, 0x00, 0x44, 0x03, 0xD0, 0x19, 0x41,</div><div class='add'>+0x0D, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0xA8, 0x36,</div><div class='add'>+0x08, 0xD7, 0x00, 0x48, 0x03, 0x70, 0x39, 0xC0, 0x44, 0x01, 0x9B, 0x05, 0x5C,</div><div class='add'>+0x83, 0x30, 0x19, 0xC0, 0x36, 0x80, 0xD7, 0x00, 0x4C, 0x4E, 0x31, 0x08, 0xC0,</div><div class='add'>+0x37, 0x02, 0x9F, 0x00, 0x4D, 0x07, 0xF0, 0x30, 0xC0, 0x03, 0x20, 0x0E, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x82, 0x3D, 0x10, 0xEF, 0x00, 0xFC,</div><div class='add'>+0x03, 0xF0, 0x0B, 0xC0, 0x2F, 0x00, 0xBF, 0x80, 0xFC, 0x43, 0xF0, 0x0B, 0xC0,</div><div class='add'>+0x3F, 0xA4, 0xFF, 0x01, 0xFD, 0x03, 0xF0, 0x0F, 0xC2, 0x3E, 0x00, 0xEF, 0x02,</div><div class='add'>+0xFC, 0x8F, 0xF0, 0x03, 0xC0, 0x1E, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x02, 0x08, 0x35, 0x00, 0xDF, 0x00, 0x7C, 0x03, 0x70, 0x21, 0xC0,</div><div class='add'>+0x35, 0x00, 0x97, 0x08, 0x0C, 0x03, 0x70, 0x01, 0xC0, 0x34, 0x02, 0xD7, 0x10,</div><div class='add'>+0x4C, 0x00, 0xB1, 0x0D, 0xC0, 0x37, 0x04, 0xD3, 0x18, 0x44, 0x03, 0xF0, 0x21,</div><div class='add'>+0xC0, 0x0B, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0xA0,</div><div class='add'>+0x70, 0x00, 0xFD, 0x0F, 0xF4, 0x03, 0xD0, 0x0C, 0x60, 0x34, 0x00, 0x91, 0x03,</div><div class='add'>+0xC4, 0x4F, 0x30, 0xC0, 0xC0, 0x3C, 0x08, 0xC1, 0x11, 0x2C, 0x00, 0x10, 0x8D,</div><div class='add'>+0x40, 0xF4, 0x00, 0xD5, 0x00, 0x44, 0x0B, 0xD0, 0xB1, 0x40, 0x4C, 0x00, 0x02,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xA0, 0x72, 0x00, 0xCD, 0x03,</div><div class='add'>+0x74, 0x07, 0x50, 0x08, 0x44, 0x31, 0x00, 0x05, 0x12, 0x14, 0x0B, 0xD0, 0x18,</div><div class='add'>+0x40, 0xF0, 0x20, 0xC5, 0x00, 0x24, 0x02, 0xD2, 0x00, 0x06, 0xF3, 0x00, 0x89,</div><div class='add'>+0x01, 0x04, 0x37, 0xD0, 0x90, 0x40, 0x1D, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x06, 0x82, 0x78, 0x04, 0xED, 0x81, 0xB4, 0x4F, 0xD0, 0x1B,</div><div class='add'>+0x48, 0x7D, 0x08, 0xE1, 0x09, 0x95, 0x07, 0x00, 0x9B, 0x40, 0x78, 0x00, 0x61,</div><div class='add'>+0x01, 0xE4, 0x04, 0x10, 0x9A, 0x40, 0x78, 0x06, 0xAD, 0x01, 0x84, 0x07, 0xD9,</div><div class='add'>+0x1A, 0x48, 0x18, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16,</div><div class='add'>+0x10, 0x30, 0x00, 0xCD, 0x00, 0x34, 0x03, 0x70, 0x08, 0x40, 0x31, 0x00, 0x57,</div><div class='add'>+0x00, 0x1C, 0x03, 0xF0, 0x88, 0xC0, 0x30, 0x00, 0xC7, 0x00, 0x2C, 0x00, 0xB0,</div><div class='add'>+0x00, 0xC0, 0x37, 0x00, 0x8B, 0x0C, 0x0C, 0x03, 0xF0, 0x0C, 0xC0, 0x49, 0x48,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xB0, 0x3D, 0x00, 0xFF,</div><div class='add'>+0x02, 0xFC, 0x4B, 0xF0, 0x8B, 0x80, 0x3A, 0x02, 0xFF, 0x00, 0xAC, 0x63, 0xF1,</div><div class='add'>+0x8B, 0xD0, 0x3B, 0x00, 0xFF, 0x48, 0xFC, 0x00, 0xF0, 0x0A, 0xC2, 0x3F, 0x00,</div><div class='add'>+0x97, 0x28, 0xFD, 0x03, 0xF0, 0x8E, 0xC0, 0x09, 0x60, 0x06, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x15, 0xA0, 0x37, 0x00, 0xDF, 0x0C, 0x7C, 0x0B, 0xF0,</div><div class='add'>+0x09, 0xC0, 0x34, 0x00, 0x57, 0x01, 0x4C, 0x1B, 0xF1, 0x09, 0xC0, 0x34, 0x12,</div><div class='add'>+0xCF, 0x00, 0x4C, 0x03, 0xB0, 0x01, 0xC0, 0x76, 0x90, 0xDB, 0x00, 0x7C, 0x83,</div><div class='add'>+0x30, 0x05, 0xC0, 0x54, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x12, 0x88, 0x39, 0x00, 0xED, 0x04, 0xB4, 0x13, 0xD0, 0x0F, 0x44, 0x38, 0x00,</div><div class='add'>+0xE1, 0x00, 0x84, 0x33, 0xD8, 0x0A, 0x42, 0x38, 0x00, 0xED, 0xA0, 0x84, 0x81,</div><div class='add'>+0x14, 0x0E, 0x44, 0x39, 0x00, 0xE5, 0x00, 0xB4, 0x03, 0x50, 0x0E, 0x40, 0x48,</div><div class='add'>+0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x02, 0x79, 0x00,</div><div class='add'>+0xED, 0x05, 0xB4, 0x07, 0xD0, 0x1A, 0x54, 0x7C, 0x00, 0x45, 0x01, 0x84, 0x17,</div><div class='add'>+0xC0, 0x13, 0x48, 0x78, 0x01, 0xEC, 0x01, 0xC5, 0x05, 0x12, 0x16, 0x40, 0x7D,</div><div class='add'>+0x80, 0xE1, 0xA1, 0xF4, 0x8F, 0x11, 0x1C, 0x60, 0x0C, 0x00, 0x04, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x28, 0x33, 0x00, 0xCD, 0x00, 0x34, 0x03,</div><div class='add'>+0xD8, 0x2C, 0x40, 0x30, 0x00, 0xC1, 0x03, 0x04, 0x03, 0xD0, 0x80, 0x40, 0x30,</div><div class='add'>+0x20, 0xCD, 0x05, 0x04, 0x15, 0x10, 0x0C, 0x40, 0x21, 0x00, 0xC5, 0x08, 0x74,</div><div class='add'>+0x06, 0x50, 0x2C, 0x41, 0x48, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x17, 0xA8, 0x15, 0x00, 0x5F, 0x00, 0x7C, 0x01, 0xD0, 0x47, 0xC0, 0x98,</div><div class='add'>+0x00, 0x77, 0x49, 0x4C, 0x01, 0xF0, 0xA7, 0xC8, 0x14, 0x00, 0x7F, 0x07, 0x8C,</div><div class='add'>+0x15, 0x30, 0x47, 0xC0, 0x55, 0x00, 0x5B, 0x21, 0x7C, 0x01, 0x10, 0x27, 0xD1,</div><div class='add'>+0x5C, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x07,</div><div class='add'>+0x00, 0x1F, 0x82, 0x7C, 0x00, 0xF1, 0x01, 0xC1, 0x07, 0x01, 0x1F, 0xA8, 0x7D,</div><div class='add'>+0x08, 0xD0, 0x21, 0xD4, 0x87, 0x00, 0x1F, 0x40, 0x7C, 0x00, 0x70, 0x21, 0xC0,</div><div class='add'>+0x05, 0x02, 0x1F, 0x00, 0x7C, 0x00, 0xF0, 0x21, 0xC0, 0x4B, 0x00, 0x0C, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x08, 0x27, 0x01, 0x9F, 0x03, 0x3C,</div><div class='add'>+0x02, 0x30, 0x09, 0xC0, 0x24, 0x08, 0x97, 0x01, 0x7C, 0x12, 0xF2, 0x29, 0xC0,</div><div class='add'>+0x26, 0x00, 0x9F, 0x08, 0x5C, 0x02, 0x34, 0x09, 0xC0, 0x24, 0x00, 0x8F, 0x09,</div><div class='add'>+0x4D, 0x02, 0x30, 0x48, 0xC0, 0x40, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x01, 0x20, 0x26, 0x00, 0x9D, 0x03, 0x74, 0x0A, 0x10, 0x09, 0x40,</div><div class='add'>+0x24, 0x00, 0x91, 0x01, 0x74, 0x1A, 0xD0, 0x08, 0x41, 0xE4, 0x01, 0x8D, 0x60,</div><div class='add'>+0x44, 0x02, 0x12, 0x68, 0x40, 0x24, 0x03, 0x9D, 0x02, 0x44, 0x02, 0x30, 0x29,</div><div class='add'>+0x50, 0x04, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0xA0,</div><div class='add'>+0x24, 0x00, 0x9D, 0x00, 0x74, 0x46, 0x50, 0x08, 0x42, 0x24, 0x00, 0x95, 0x08,</div><div class='add'>+0x74, 0x82, 0xD0, 0x09, 0x40, 0x27, 0x02, 0x9D, 0x00, 0x54, 0x02, 0x52, 0x0D,</div><div class='add'>+0x40, 0x24, 0x00, 0x9D, 0x02, 0x44, 0x0A, 0x10, 0x09, 0x40, 0x60, 0x00, 0x02,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x20, 0x20, 0x00, 0xCD, 0x14,</div><div class='add'>+0x34, 0x52, 0x54, 0x08, 0x40, 0x24, 0x0A, 0xC1, 0x94, 0x30, 0xD2, 0xD0, 0x09,</div><div class='add'>+0x40, 0x21, 0x00, 0x8D, 0x00, 0x44, 0x02, 0x19, 0x09, 0x70, 0x20, 0x10, 0x8D,</div><div class='add'>+0x08, 0x04, 0x02, 0x14, 0x4C, 0x41, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x1D, 0xB0, 0x07, 0x00, 0x1F, 0x04, 0x7C, 0x10, 0x70, 0x01,</div><div class='add'>+0xD0, 0x84, 0x00, 0x17, 0x04, 0x78, 0x10, 0xF0, 0x01, 0xC4, 0x07, 0x05, 0x1D,</div><div class='add'>+0x40, 0x5C, 0x00, 0x30, 0x01, 0xC0, 0x04, 0x00, 0x1F, 0x16, 0x4C, 0x00, 0x30,</div><div class='add'>+0x41, 0xC0, 0x74, 0xC0, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x19,</div><div class='add'>+0xB0, 0x27, 0x00, 0x9F, 0x14, 0x7C, 0x52, 0xB1, 0x4B, 0xC1, 0x2B, 0x01, 0xBF,</div><div class='add'>+0x94, 0x7C, 0x02, 0xF2, 0x0A, 0xC0, 0x26, 0x10, 0xFE, 0x00, 0xBC, 0x53, 0xF0,</div><div class='add'>+0x0A, 0xC0, 0x2B, 0x15, 0xBF, 0x04, 0xBC, 0x52, 0x70, 0x0B, 0xC0, 0x67, 0x60,</div><div class='add'>+0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x19, 0xA0, 0x2F, 0x00, 0xBF,</div><div class='add'>+0x01, 0xCC, 0x5E, 0xE0, 0x28, 0xC0, 0xA7, 0x00, 0xB7, 0x09, 0xEC, 0x12, 0x70,</div><div class='add'>+0x0A, 0xC0, 0x2F, 0x04, 0xAD, 0x00, 0x4C, 0x02, 0x30, 0x0A, 0xC0, 0xAE, 0x00,</div><div class='add'>+0xBB, 0x00, 0xCD, 0x02, 0xB0, 0x0B, 0xC0, 0x67, 0x00, 0x0E, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x1C, 0x08, 0x07, 0x00, 0x1D, 0x0F, 0x44, 0x08, 0xD0,</div><div class='add'>+0x01, 0x40, 0x07, 0x01, 0x11, 0x0B, 0x44, 0x00, 0x10, 0x01, 0x40, 0x87, 0x00,</div><div class='add'>+0x19, 0x00, 0x44, 0x10, 0x10, 0x01, 0x40, 0x04, 0x01, 0x11, 0x00, 0x44, 0x00,</div><div class='add'>+0x10, 0x01, 0x40, 0x73, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x10, 0xA0, 0x23, 0x00, 0x8D, 0x10, 0x04, 0x12, 0xD0, 0x48, 0x40, 0x67, 0x00,</div><div class='add'>+0x85, 0x04, 0x24, 0x0B, 0x50, 0x08, 0x40, 0x33, 0x00, 0x99, 0x00, 0x04, 0x42,</div><div class='add'>+0x10, 0x09, 0x40, 0x22, 0x01, 0x89, 0x00, 0x24, 0x02, 0x90, 0x08, 0x40, 0x43,</div><div class='add'>+0x80, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0xA8, 0x25, 0x00,</div><div class='add'>+0x9D, 0x60, 0x44, 0x02, 0xC8, 0x09, 0x41, 0x27, 0x02, 0x91, 0x00, 0x64, 0x02,</div><div class='add'>+0x10, 0x09, 0x44, 0x27, 0x00, 0x99, 0x00, 0x00, 0x02, 0x11, 0x09, 0x00, 0x64,</div><div class='add'>+0x00, 0x91, 0x00, 0x44, 0x02, 0x10, 0x09, 0x40, 0x63, 0x20, 0x06, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x08, 0x25, 0x00, 0x9F, 0x00, 0x4C, 0x02,</div><div class='add'>+0xC1, 0x39, 0xC8, 0x67, 0x00, 0x95, 0x51, 0x6C, 0x02, 0x70, 0x79, 0xC0, 0x27,</div><div class='add'>+0x00, 0x9B, 0x01, 0x4C, 0x0E, 0x30, 0x19, 0xC0, 0x26, 0x00, 0x9B, 0x00, 0x4C,</div><div class='add'>+0x06, 0xB0, 0x09, 0xC1, 0x17, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x14, 0x00, 0x25, 0x00, 0x9F, 0x00, 0x7D, 0x02, 0xF0, 0x29, 0xC0, 0x67,</div><div class='add'>+0x00, 0x8F, 0x05, 0x1C, 0x02, 0xF0, 0x99, 0xC4, 0x27, 0x24, 0x9B, 0x03, 0x7D,</div><div class='add'>+0x12, 0xF4, 0x99, 0xC3, 0x27, 0x00, 0x9F, 0x13, 0x7C, 0xD6, 0xF0, 0x49, 0xC1,</div><div class='add'>+0x53, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x08, 0x04,</div><div class='add'>+0x00, 0x0F, 0x04, 0x7C, 0x00, 0xF4, 0x21, 0xC2, 0x04, 0x40, 0x13, 0x00, 0x6C,</div><div class='add'>+0x40, 0xF0, 0x01, 0xC0, 0x06, 0x00, 0x1F, 0x02, 0x5C, 0x08, 0x31, 0x01, 0xC0,</div><div class='add'>+0x04, 0x00, 0x1F, 0x00, 0x4C, 0x00, 0x30, 0x01, 0xC0, 0x50, 0x20, 0x04, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x20, 0x54, 0x04, 0x7D, 0x00, 0xF4,</div><div class='add'>+0x61, 0x10, 0x05, 0xC0, 0x12, 0x00, 0x71, 0x07, 0xC4, 0x09, 0xD0, 0x27, 0x40,</div><div class='add'>+0x1C, 0x00, 0x6D, 0x60, 0x44, 0x01, 0x12, 0x36, 0x41, 0x1C, 0x01, 0x7D, 0x47,</div><div class='add'>+0xC4, 0x85, 0x50, 0x27, 0x40, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x14, 0xA0, 0x32, 0x80, 0xCD, 0x00, 0x34, 0x0F, 0x10, 0x0C, 0x40,</div><div class='add'>+0x30, 0x00, 0xC1, 0x07, 0x24, 0x09, 0xD1, 0xC4, 0x40, 0xB3, 0x00, 0x8D, 0x00,</div><div class='add'>+0x14, 0x03, 0x10, 0x00, 0x48, 0x35, 0x09, 0xDD, 0x03, 0x45, 0xAF, 0x10, 0xAC,</div><div class='add'>+0x40, 0x50, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x88,</div><div class='add'>+0x28, 0x00, 0x6D, 0x82, 0xB4, 0x07, 0x10, 0xDF, 0x40, 0x3A, 0x03, 0xE1, 0x00,</div><div class='add'>+0x84, 0x03, 0xD0, 0x13, 0x48, 0x39, 0x80, 0x7D, 0x80, 0xD4, 0x13, 0x1C, 0x02,</div><div class='add'>+0x40, 0x39, 0x10, 0xED, 0x20, 0xC4, 0x03, 0x41, 0x1C, 0x40, 0x10, 0x00, 0x02,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x10, 0x68, 0x00, 0xEF, 0x01,</div><div class='add'>+0x3C, 0x05, 0x30, 0xDE, 0xC0, 0x7C, 0x00, 0x73, 0x01, 0xAC, 0x07, 0xF0, 0x1E,</div><div class='add'>+0xC0, 0x5B, 0x00, 0xAF, 0x01, 0x9C, 0x17, 0x30, 0x12, 0xD0, 0x79, 0x90, 0xBF,</div><div class='add'>+0x01, 0xCC, 0x07, 0x20, 0x1E, 0xC0, 0x50, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x10, 0xA8, 0x25, 0x00, 0xDF, 0x00, 0x7C, 0x01, 0x31, 0x0D,</div><div class='add'>+0xC8, 0xB7, 0x05, 0x5F, 0x20, 0x70, 0x03, 0xF1, 0x01, 0xC0, 0x16, 0x00, 0x5F,</div><div class='add'>+0x80, 0x2C, 0x6B, 0xF0, 0x01, 0xD0, 0x36, 0x00, 0x9F, 0x00, 0x7C, 0x01, 0xF0,</div><div class='add'>+0x0D, 0xD0, 0x43, 0x60, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,</div><div class='add'>+0xA0, 0x6F, 0x02, 0xF7, 0x09, 0xFC, 0x07, 0xF0, 0x1F, 0xC0, 0x78, 0x00, 0xFB,</div><div class='add'>+0x01, 0xFC, 0x07, 0xF0, 0x17, 0xC0, 0x7E, 0x00, 0xBB, 0x01, 0xCC, 0x17, 0xB0,</div><div class='add'>+0x97, 0xC0, 0x7C, 0x08, 0x7F, 0x01, 0xCC, 0x05, 0xF1, 0x1F, 0xC0, 0x0B, 0x00,</div><div class='add'>+0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x88, 0x29, 0x00, 0x6D,</div><div class='add'>+0x48, 0xB0, 0x03, 0xD0, 0x4E, 0xC0, 0x3B, 0x01, 0x61, 0x22, 0xB4, 0x8B, 0xD0,</div><div class='add'>+0x46, 0x40, 0xB8, 0x08, 0x71, 0x00, 0xFC, 0x13, 0x10, 0xC6, 0x40, 0x38, 0x00,</div><div class='add'>+0x6D, 0x48, 0x84, 0x00, 0xD0, 0x42, 0x40, 0x57, 0x20, 0x06, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x29, 0x20, 0xE5, 0x40, 0xB4, 0x03, 0xD0,</div><div class='add'>+0x0F, 0x40, 0x3C, 0x10, 0xE9, 0x08, 0xB4, 0x03, 0xD0, 0x07, 0x41, 0x1B, 0x02,</div><div class='add'>+0xB9, 0x08, 0xA4, 0x73, 0x92, 0x06, 0x41, 0x18, 0x00, 0x2D, 0x00, 0xA4, 0x61,</div><div class='add'>+0xD0, 0x0E, 0x60, 0x23, 0x02, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x06, 0x28, 0x23, 0x00, 0x9D, 0x00, 0x34, 0x02, 0xD0, 0xEC, 0x60, 0xB2, 0x04,</div><div class='add'>+0x09, 0x01, 0x34, 0x03, 0xD0, 0x10, 0x40, 0x10, 0x00, 0x41, 0x23, 0x36, 0x0F,</div><div class='add'>+0x12, 0x34, 0x41, 0x20, 0x20, 0x0D, 0x09, 0x60, 0x04, 0xD0, 0x00, 0x40, 0x1B,</div><div class='add'>+0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0xA8, 0x25, 0x00,</div><div class='add'>+0x97, 0x00, 0x74, 0x02, 0xF0, 0x0F, 0xC0, 0x3C, 0x00, 0x9B, 0x02, 0x7C, 0x03,</div><div class='add'>+0xF0, 0x05, 0x80, 0x37, 0x00, 0x4B, 0x05, 0xEC, 0x07, 0xB0, 0x34, 0xD0, 0x04,</div><div class='add'>+0x80, 0xDF, 0x01, 0x6D, 0x06, 0xD0, 0x0D, 0x48, 0x57, 0x20, 0x06, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x29, 0x00, 0x27, 0x00, 0x1F, 0x00, 0x7C, 0x02,</div><div class='add'>+0xF0, 0x0D, 0xC0, 0x37, 0x08, 0x97, 0x0E, 0x74, 0x0B, 0xE0, 0x01, 0xA0, 0x36,</div><div class='add'>+0x10, 0x5F, 0x02, 0x5C, 0x13, 0xF0, 0x05, 0xC0, 0x87, 0x0A, 0xDF, 0x02, 0x5C,</div><div class='add'>+0x02, 0xF0, 0x0D, 0xC8, 0x27, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x81, 0x08, 0xAF, 0x00, 0x3F, 0x00, 0xEC, 0x00, 0xF0, 0x0F, 0xC0, 0x3E,</div><div class='add'>+0x00, 0x3F, 0x00, 0xFC, 0x03, 0xF1, 0x07, 0xC8, 0x17, 0x20, 0x3B, 0x18, 0xCC,</div><div class='add'>+0x03, 0xB2, 0x07, 0xD0, 0x0E, 0x00, 0xBF, 0x01, 0xFC, 0x02, 0x30, 0x23, 0xC1,</div><div class='add'>+0x07, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x81, 0x01, 0x26,</div><div class='add'>+0x20, 0x1D, 0x01, 0x44, 0x04, 0xD0, 0x0C, 0xC0, 0x36, 0x00, 0x1D, 0x01, 0x74,</div><div class='add'>+0x0F, 0xD0, 0x31, 0x42, 0xD7, 0x00, 0x5D, 0x52, 0x04, 0x03, 0x10, 0x35, 0x40,</div><div class='add'>+0x44, 0x04, 0x1D, 0x03, 0x74, 0x8C, 0x10, 0x21, 0x40, 0x87, 0x02, 0x08, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xA0, 0x26, 0x80, 0x9D, 0x31, 0x64,</div><div class='add'>+0x0C, 0xD0, 0x0D, 0x40, 0x36, 0x00, 0x9D, 0x01, 0x74, 0x07, 0x50, 0x15, 0x41,</div><div class='add'>+0x77, 0x00, 0x5D, 0x00, 0x47, 0x03, 0x90, 0x1D, 0x41, 0x64, 0x00, 0x5D, 0x94,</div><div class='add'>+0x74, 0x46, 0x10, 0x2D, 0x48, 0x07, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x10, 0x20, 0x20, 0x00, 0x0D, 0x00, 0x04, 0x02, 0xD0, 0x0D, 0x40,</div><div class='add'>+0x32, 0x00, 0x8D, 0x20, 0x34, 0x83, 0xD0, 0x00, 0x40, 0x23, 0x00, 0x4D, 0x00,</div><div class='add'>+0x46, 0x03, 0x10, 0x04, 0x40, 0x20, 0x00, 0x8D, 0x00, 0x26, 0x82, 0x1C, 0x00,</div><div class='add'>+0x40, 0x43, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x10,</div><div class='add'>+0x24, 0x00, 0x9F, 0x80, 0x6C, 0x00, 0xF1, 0x0F, 0xC0, 0x3E, 0x00, 0x9F, 0x00,</div><div class='add'>+0x7C, 0x03, 0x70, 0x05, 0xC4, 0x17, 0x00, 0x1B, 0x00, 0xCC, 0x03, 0xB4, 0x05,</div><div class='add'>+0xC0, 0x04, 0x00, 0x4F, 0x00, 0x7C, 0x02, 0x30, 0x01, 0xC4, 0x07, 0x40, 0x08,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0xB0, 0x2F, 0x00, 0xBE, 0x00,</div><div class='add'>+0xFC, 0x02, 0xF0, 0x0E, 0xC0, 0x3F, 0x00, 0xBF, 0x00, 0xFC, 0x02, 0xF0, 0x02,</div><div class='add'>+0xC0, 0x3F, 0x20, 0x7F, 0x40, 0xFC, 0x03, 0xF0, 0x06, 0xC0, 0x2F, 0x00, 0x3F,</div><div class='add'>+0x00, 0xFC, 0x00, 0xF2, 0x03, 0xE0, 0x17, 0x60, 0x0E, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x03, 0xA0, 0x7F, 0x00, 0xBF, 0x01, 0xEC, 0x32, 0xF2, 0xC7,</div><div class='add'>+0xC8, 0x5F, 0x02, 0x33, 0xA1, 0xFC, 0x07, 0x30, 0x6B, 0xC8, 0x3F, 0x08, 0xB3,</div><div class='add'>+0x00, 0xEC, 0x04, 0x10, 0x1B, 0xC8, 0x1F, 0x03, 0xFD, 0x09, 0xCC, 0x82, 0x32,</div><div class='add'>+0x1F, 0xC6, 0x0F, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,</div><div class='add'>+0x08, 0x7F, 0x00, 0xDD, 0x81, 0x74, 0x32, 0xD2, 0xC5, 0x40, 0x07, 0x11, 0xD1,</div><div class='add'>+0x01, 0xF4, 0x07, 0x10, 0x69, 0x48, 0xFF, 0x00, 0x95, 0x03, 0x74, 0x04, 0x10,</div><div class='add'>+0x1D, 0x40, 0x97, 0x01, 0xED, 0x04, 0x44, 0x0E, 0x10, 0x1F, 0x40, 0x0F, 0x60,</div><div class='add'>+0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0xA0, 0x33, 0x00, 0xCD,</div><div class='add'>+0x00, 0x24, 0x03, 0xD0, 0x44, 0x40, 0x37, 0x01, 0xC5, 0x01, 0x14, 0x83, 0x10,</div><div class='add'>+0x28, 0x40, 0x33, 0x0A, 0x01, 0x08, 0x74, 0x00, 0x10, 0x0C, 0x40, 0x93, 0x00,</div><div class='add'>+0xCD, 0x00, 0x14, 0x22, 0x1A, 0x0C, 0x40, 0x4F, 0x80, 0x0E, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x03, 0x88, 0x35, 0x00, 0xDD, 0x01, 0x74, 0x82, 0xD0,</div><div class='add'>+0x65, 0x40, 0x27, 0x00, 0xD0, 0x01, 0x74, 0x03, 0x50, 0x0D, 0x42, 0x37, 0x08,</div><div class='add'>+0x95, 0x20, 0x74, 0x04, 0x10, 0x1D, 0x42, 0x37, 0x09, 0xDC, 0x00, 0x54, 0x13,</div><div class='add'>+0x10, 0x0D, 0x40, 0x0F, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x02, 0xA8, 0x37, 0x00, 0xDF, 0x05, 0x6C, 0x02, 0xF0, 0x05, 0xC0, 0xB3, 0x01,</div><div class='add'>+0xD7, 0x21, 0x3C, 0x03, 0x34, 0x1D, 0xC0, 0x37, 0x10, 0x93, 0x80, 0x28, 0x0C,</div><div class='add'>+0x32, 0x1D, 0xC1, 0x57, 0x00, 0xDF, 0x80, 0x5C, 0x86, 0x31, 0x0D, 0xC0, 0x0B,</div><div class='add'>+0x20, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x80, 0x3D, 0x00,</div><div class='add'>+0xFE, 0x00, 0xFC, 0x23, 0xF1, 0x0F, 0xC0, 0xBF, 0x40, 0xFF, 0x00, 0xFC, 0x03,</div><div class='add'>+0xA0, 0x3B, 0xC0, 0x37, 0x04, 0xBF, 0x23, 0xF0, 0x00, 0xF0, 0x0F, 0xC1, 0x1F,</div><div class='add'>+0x00, 0xFF, 0x00, 0x2C, 0x02, 0xF0, 0x0F, 0xC4, 0x1F, 0x00, 0x06, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x08, 0x35, 0x00, 0xD7, 0x00, 0x7C, 0x07,</div><div class='add'>+0x70, 0x0D, 0xC0, 0x34, 0x00, 0xD3, 0x80, 0x7C, 0x43, 0x34, 0x0D, 0xC0, 0x33,</div><div class='add'>+0x42, 0x13, 0x00, 0x4C, 0x00, 0xF0, 0x0D, 0xC0, 0xB7, 0x08, 0xC3, 0x00, 0x4C,</div><div class='add'>+0x43, 0x70, 0x0D, 0xC1, 0x0B, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x13, 0xA0, 0x34, 0x00, 0xD1, 0x00, 0x74, 0x03, 0x10, 0x0D, 0x40, 0xB4,</div><div class='add'>+0x08, 0xDA, 0x01, 0x74, 0x07, 0x00, 0x4D, 0x46, 0xBF, 0x00, 0xB1, 0x00, 0x44,</div><div class='add'>+0x48, 0xD0, 0x2D, 0x40, 0x77, 0x04, 0xD1, 0x00, 0x40, 0x0F, 0x10, 0x3D, 0x40,</div><div class='add'>+0x6F, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xA0, 0x32,</div><div class='add'>+0x00, 0xC1, 0x00, 0x20, 0x02, 0x10, 0x9C, 0x40, 0x60, 0x26, 0xC5, 0x01, 0x24,</div><div class='add'>+0x27, 0x10, 0x08, 0x00, 0xF3, 0x00, 0x89, 0x01, 0x35, 0x44, 0xD0, 0x2C, 0x40,</div><div class='add'>+0x33, 0x00, 0xC5, 0x29, 0x04, 0x2F, 0x90, 0xBC, 0x42, 0x0F, 0x00, 0x08, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x80, 0x78, 0x00, 0xE1, 0x01, 0xB6,</div><div class='add'>+0x06, 0x10, 0x14, 0x58, 0x68, 0x10, 0xED, 0x51, 0x34, 0x07, 0x10, 0x1A, 0x42,</div><div class='add'>+0x7B, 0x10, 0x89, 0x01, 0x94, 0x04, 0xD0, 0x1E, 0x40, 0x5B, 0xC2, 0xE5, 0x03,</div><div class='add'>+0x84, 0x06, 0x90, 0x1E, 0x40, 0x77, 0x20, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x12, 0x10, 0x30, 0x00, 0xC7, 0x00, 0x7E, 0x02, 0x70, 0x04, 0xC0,</div><div class='add'>+0x20, 0x82, 0xC7, 0x80, 0x2C, 0x13, 0x38, 0x0C, 0xE0, 0x33, 0x00, 0x0B, 0x90,</div><div class='add'>+0x1C, 0x30, 0xF0, 0x0C, 0xC0, 0xB7, 0xA0, 0xC7, 0x80, 0x0C, 0x03, 0xF0, 0x0C,</div><div class='add'>+0xC0, 0x4B, 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xB8,</div><div class='add'>+0x79, 0xC0, 0xFF, 0x00, 0xF4, 0x02, 0xF8, 0x07, 0xC8, 0x2B, 0x08, 0xFB, 0x08,</div><div class='add'>+0xFC, 0x07, 0xF0, 0x0F, 0xC0, 0x3F, 0x00, 0xB7, 0x10, 0xEC, 0xA0, 0xF0, 0x0F,</div><div class='add'>+0xC0, 0x3F, 0x00, 0xFB, 0x01, 0x7E, 0x23, 0x70, 0x1D, 0xC1, 0x0B, 0x20, 0x06,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0xA0, 0x37, 0x00, 0xDF, 0x00,</div><div class='add'>+0x7C, 0x83, 0xF0, 0x8D, 0x80, 0x27, 0x00, 0xDF, 0x40, 0x7E, 0x83, 0xF0, 0x89,</div><div class='add'>+0x40, 0x37, 0x03, 0x9F, 0x00, 0x6E, 0x00, 0xF0, 0x0D, 0xC0, 0x17, 0x10, 0xD3,</div><div class='add'>+0x00, 0x7E, 0x02, 0xF0, 0x0D, 0xC0, 0x40, 0x20, 0x0E, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x12, 0x88, 0x39, 0x00, 0xED, 0x00, 0xB4, 0x1B, 0xD0, 0x0E,</div><div class='add'>+0x40, 0x2B, 0x00, 0xED, 0x00, 0xB6, 0x0B, 0xD0, 0x4A, 0x44, 0x3B, 0x02, 0x8D,</div><div class='add'>+0x04, 0x84, 0x80, 0xD0, 0x0E, 0x40, 0x93, 0x01, 0xE1, 0x04, 0xB4, 0x82, 0xD8,</div><div class='add'>+0x4C, 0x40, 0x4D, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03,</div><div class='add'>+0x00, 0x79, 0x02, 0xED, 0x01, 0x94, 0x07, 0xD0, 0x1E, 0x60, 0x6B, 0x24, 0xED,</div><div class='add'>+0x01, 0xB4, 0x97, 0xD0, 0x5E, 0x62, 0x7B, 0x18, 0x2D, 0x01, 0xA4, 0xC4, 0xD2,</div><div class='add'>+0x1E, 0x41, 0xFB, 0x00, 0xE1, 0x0D, 0xB4, 0x2F, 0xD1, 0x1E, 0x40, 0x10, 0x00,</div><div class='add'>+0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x28, 0x33, 0x10, 0x4D,</div><div class='add'>+0x07, 0x74, 0x07, 0xD0, 0x38, 0x49, 0xE3, 0x20, 0xCD, 0x05, 0x34, 0x03, 0xD0,</div><div class='add'>+0x1C, 0x40, 0x33, 0x80, 0xCD, 0x00, 0x04, 0x0F, 0xD0, 0x74, 0x40, 0x63, 0x40,</div><div class='add'>+0xC1, 0x00, 0x34, 0x07, 0xD0, 0x0C, 0x40, 0x59, 0x20, 0x0C, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x17, 0xA8, 0x15, 0x00, 0x7F, 0x10, 0x7C, 0x41, 0xF0,</div><div class='add'>+0x17, 0xC0, 0xDF, 0x00, 0x7F, 0x04, 0x3C, 0x01, 0xF0, 0x05, 0xC0, 0x17, 0x00,</div><div class='add'>+0x7F, 0x11, 0xAC, 0x05, 0xF0, 0x27, 0xC8, 0xDF, 0x08, 0x53, 0x80, 0x7C, 0x01,</div><div class='add'>+0xF1, 0x04, 0xC0, 0x5C, 0x20, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x12, 0x00, 0x87, 0x08, 0x1F, 0x80, 0x78, 0x00, 0xF0, 0x81, 0xC8, 0x87, 0x00,</div><div class='add'>+0x1C, 0x00, 0x7C, 0x08, 0xF0, 0x81, 0x82, 0x02, 0x00, 0x0F, 0x00, 0x7C, 0x10,</div><div class='add'>+0xF0, 0x21, 0xC0, 0x03, 0x00, 0x1F, 0x02, 0x74, 0x00, 0xF0, 0x01, 0xC8, 0x4B,</div><div class='add'>+0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x08, 0x67, 0x02,</div><div class='add'>+0x9F, 0x00, 0x7C, 0x06, 0x30, 0x49, 0xC0, 0x67, 0x04, 0x9F, 0xC8, 0x7C, 0x02,</div><div class='add'>+0x31, 0x19, 0xC0, 0x27, 0x00, 0x93, 0x00, 0x4D, 0x8A, 0x30, 0x49, 0xC0, 0x67,</div><div class='add'>+0x04, 0x93, 0x08, 0x4C, 0x22, 0x30, 0x09, 0xC0, 0x40, 0x20, 0x04, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x20, 0xEE, 0x00, 0x9D, 0x40, 0xF0, 0x06,</div><div class='add'>+0x10, 0x0B, 0x40, 0xA7, 0x02, 0x9D, 0x01, 0xF4, 0x0A, 0x10, 0x9B, 0x40, 0x27,</div><div class='add'>+0x01, 0x9B, 0x80, 0x44, 0x06, 0x10, 0x29, 0x44, 0x2F, 0x00, 0xB1, 0x03, 0x84,</div><div class='add'>+0x02, 0x10, 0x0B, 0x00, 0x04, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x18, 0xA0, 0x24, 0x04, 0x9D, 0x80, 0x70, 0x22, 0x10, 0x09, 0x40, 0x27,</div><div class='add'>+0x00, 0x9D, 0x00, 0x74, 0x42, 0x10, 0x09, 0x40, 0x27, 0x00, 0x91, 0x08, 0x44,</div><div class='add'>+0x43, 0x14, 0x29, 0x40, 0x27, 0x02, 0x80, 0x00, 0x44, 0xC2, 0x10, 0x09, 0x40,</div><div class='add'>+0x70, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x20, 0x20,</div><div class='add'>+0x18, 0x8D, 0x42, 0x34, 0x0A, 0x14, 0x28, 0x44, 0xB3, 0x00, 0x8D, 0x00, 0x36,</div><div class='add'>+0x02, 0x11, 0x28, 0x40, 0x23, 0x45, 0x89, 0x14, 0x04, 0x02, 0x10, 0x08, 0x40,</div><div class='add'>+0xA3, 0x00, 0x81, 0x02, 0x04, 0x02, 0x10, 0x08, 0x40, 0x50, 0xA0, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xB0, 0x46, 0x00, 0x1F, 0x00, 0x7C,</div><div class='add'>+0x04, 0x12, 0x11, 0xC2, 0x07, 0x10, 0x1F, 0x00, 0x7C, 0x04, 0x34, 0x11, 0xC0,</div><div class='add'>+0x07, 0x01, 0x13, 0x04, 0x4C, 0x00, 0x32, 0x01, 0xC0, 0x47, 0x40, 0x53, 0x01,</div><div class='add'>+0x4C, 0x04, 0x34, 0x11, 0xD0, 0x74, 0xC0, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x19, 0xB8, 0xA7, 0x00, 0xBF, 0x01, 0xFC, 0x8E, 0xF0, 0x3B, 0xC0,</div><div class='add'>+0x7F, 0x20, 0xBE, 0x00, 0x7C, 0x0A, 0xF0, 0x3B, 0xC0, 0x27, 0x00, 0xF7, 0x00,</div><div class='add'>+0xFC, 0x02, 0xF0, 0x0B, 0xC0, 0xEF, 0x00, 0x9C, 0x23, 0xFD, 0x0A, 0xF0, 0x29,</div><div class='add'>+0xC0, 0x67, 0x20, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0xA0,</div><div class='add'>+0x6B, 0x00, 0x93, 0x82, 0xFC, 0x16, 0xF0, 0x7B, 0xC1, 0x2C, 0x00, 0xB3, 0x00,</div><div class='add'>+0xFC, 0x06, 0xF0, 0x7B, 0xC1, 0x6C, 0x01, 0xBE, 0x81, 0xCC, 0x02, 0xF0, 0x0B,</div><div class='add'>+0xD0, 0xEC, 0x01, 0xBF, 0x07, 0xFC, 0x16, 0xF0, 0x1B, 0xC0, 0x60, 0x00, 0x0E,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1C, 0x08, 0x87, 0x00, 0x51, 0x05,</div><div class='add'>+0x74, 0x54, 0xD0, 0x31, 0x40, 0x40, 0x05, 0x11, 0x00, 0x74, 0x00, 0xD1, 0x31,</div><div class='add'>+0x44, 0x05, 0x00, 0x1D, 0x0A, 0x44, 0x01, 0xD0, 0x01, 0x40, 0x44, 0x20, 0x1D,</div><div class='add'>+0x03, 0x74, 0x28, 0xD2, 0x01, 0x48, 0x70, 0x60, 0x04, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x10, 0xA0, 0xA3, 0x40, 0x85, 0x44, 0x36, 0x0A, 0xD8, 0x49,</div><div class='add'>+0x40, 0x22, 0x00, 0x81, 0x21, 0x34, 0x0A, 0xD1, 0x48, 0x40, 0xA0, 0x00, 0x8D,</div><div class='add'>+0xA0, 0x04, 0x02, 0xD1, 0x08, 0x60, 0xA2, 0x11, 0xCD, 0x06, 0x34, 0x82, 0xD0,</div><div class='add'>+0x28, 0x40, 0x48, 0x80, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18,</div><div class='add'>+0xA8, 0x25, 0x80, 0x95, 0x01, 0x74, 0x82, 0xD0, 0x19, 0x41, 0x22, 0x40, 0x91,</div><div class='add'>+0x00, 0x74, 0x03, 0xD0, 0x09, 0x40, 0x25, 0x00, 0x9D, 0x00, 0x44, 0x02, 0xD0,</div><div class='add'>+0x09, 0x41, 0x26, 0x05, 0x9D, 0x00, 0x74, 0x02, 0xD0, 0x09, 0x40, 0x60, 0x00,</div><div class='add'>+0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0xA8, 0x27, 0x00, 0xB7,</div><div class='add'>+0x00, 0xFC, 0x06, 0xF2, 0x0A, 0xD0, 0xAE, 0x10, 0x93, 0x0B, 0x7C, 0x02, 0xF0,</div><div class='add'>+0x0B, 0xC0, 0x24, 0x20, 0x9F, 0x03, 0x4C, 0x8E, 0xF0, 0x08, 0xC0, 0xEE, 0x00,</div><div class='add'>+0xBF, 0x00, 0x7C, 0x06, 0xF0, 0x08, 0xD0, 0x14, 0x20, 0x0E, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x14, 0x80, 0x25, 0x00, 0x9B, 0x00, 0x7C, 0x0E, 0xF0,</div><div class='add'>+0x09, 0xC0, 0x25, 0x00, 0x9F, 0x00, 0x7C, 0x02, 0xF0, 0x39, 0xC0, 0x27, 0x0C,</div><div class='add'>+0x8F, 0x49, 0x7D, 0x12, 0xF1, 0x49, 0xC0, 0x25, 0x00, 0x9F, 0x00, 0x7C, 0x52,</div><div class='add'>+0xF0, 0x09, 0x81, 0x4B, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x14, 0x08, 0x01, 0x01, 0x13, 0x02, 0x7C, 0x00, 0x30, 0x01, 0xC0, 0x04, 0x00,</div><div class='add'>+0x1B, 0x08, 0x7C, 0x80, 0xF0, 0x01, 0xC0, 0x04, 0x00, 0x17, 0x88, 0x7C, 0x00,</div><div class='add'>+0xF1, 0x21, 0xC0, 0x05, 0x00, 0x1B, 0x04, 0x7C, 0x00, 0xF0, 0x01, 0xC0, 0x43,</div><div class='add'>+0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0xA0, 0xDC, 0x00,</div><div class='add'>+0x50, 0x00, 0x74, 0x01, 0x10, 0x05, 0x42, 0x5C, 0x02, 0x51, 0x00, 0xF4, 0x05,</div><div class='add'>+0xD0, 0x15, 0x41, 0x1C, 0x00, 0x51, 0x81, 0xF4, 0x05, 0xD0, 0x07, 0x41, 0x14,</div><div class='add'>+0x04, 0x71, 0x40, 0xF4, 0x0D, 0xD0, 0x27, 0x40, 0x53, 0x00, 0x02, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0xA0, 0xE2, 0x00, 0xC9, 0x00, 0x34, 0x07,</div><div class='add'>+0x90, 0x9C, 0x40, 0x20, 0x22, 0x89, 0x20, 0x34, 0x06, 0xD0, 0x0D, 0x40, 0xB0,</div><div class='add'>+0x0A, 0x85, 0x01, 0x34, 0x23, 0xD0, 0x08, 0x43, 0x73, 0x00, 0x89, 0x00, 0x34,</div><div class='add'>+0x0E, 0xD0, 0xA8, 0x40, 0x53, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x05, 0x80, 0xA8, 0x00, 0xE9, 0x04, 0x34, 0x0E, 0x90, 0xCA, 0x50, 0x38,</div><div class='add'>+0x01, 0xE1, 0x00, 0xB4, 0x0A, 0xD0, 0x0E, 0x70, 0x48, 0x00, 0xE1, 0x00, 0xB4,</div><div class='add'>+0x00, 0xD0, 0x02, 0x40, 0x7A, 0x00, 0x61, 0x00, 0xB4, 0x42, 0xD1, 0x0A, 0x60,</div><div class='add'>+0x07, 0x20, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x10, 0x68,</div><div class='add'>+0x00, 0xEB, 0x07, 0xBC, 0x07, 0xB0, 0x1C, 0xC0, 0xD8, 0x00, 0xEB, 0x01, 0xBC,</div><div class='add'>+0x06, 0xF0, 0x5F, 0xC0, 0x58, 0x00, 0xE7, 0x01, 0xBC, 0x04, 0xF1, 0x16, 0xC2,</div><div class='add'>+0x73, 0x00, 0xEB, 0x07, 0xBC, 0x06, 0xF0, 0x1A, 0xC0, 0x47, 0x40, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xB8, 0x25, 0x40, 0xD7, 0x00, 0x7C,</div><div class='add'>+0x02, 0x74, 0x09, 0xC0, 0x17, 0x00, 0xDE, 0x00, 0x7C, 0x02, 0xF0, 0x0D, 0xC0,</div><div class='add'>+0x03, 0x00, 0xDF, 0x00, 0x7C, 0x00, 0xF0, 0x04, 0xC6, 0x35, 0x02, 0x5F, 0x00,</div><div class='add'>+0x7C, 0x02, 0xFA, 0x09, 0xC0, 0x43, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0xA0, 0x7F, 0x00, 0xF3, 0x01, 0xDC, 0x47, 0x30, 0x1F, 0xC2,</div><div class='add'>+0x78, 0x00, 0xF3, 0x01, 0xFC, 0x07, 0x30, 0x1B, 0x41, 0x4D, 0x00, 0xF1, 0x09,</div><div class='add'>+0xCC, 0x06, 0xE0, 0x16, 0xE0, 0x6C, 0x01, 0xE3, 0x01, 0xCC, 0x07, 0x30, 0x9B,</div><div class='add'>+0xC2, 0x03, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x88,</div><div class='add'>+0xB9, 0x10, 0xE1, 0x10, 0x84, 0x02, 0x12, 0x0B, 0x41, 0x38, 0x20, 0xE1, 0x00,</div><div class='add'>+0xB4, 0x02, 0x10, 0x0A, 0x40, 0x08, 0x01, 0xE1, 0x08, 0x84, 0x00, 0xD1, 0x0E,</div><div class='add'>+0xD0, 0x2C, 0x41, 0x61, 0x00, 0xC4, 0x02, 0x10, 0x8A, 0x40, 0x57, 0x60, 0x04,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x21, 0x00, 0xF9, 0x01,</div><div class='add'>+0x94, 0x03, 0x14, 0x8E, 0x40, 0x1C, 0x00, 0xE1, 0x00, 0x34, 0x03, 0x90, 0x0A,</div><div class='add'>+0x40, 0x08, 0x00, 0xF9, 0x00, 0xA4, 0x00, 0xD0, 0x8E, 0x41, 0x28, 0x13, 0xE1,</div><div class='add'>+0x00, 0xD4, 0x23, 0x90, 0x0A, 0x44, 0x03, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x04, 0x28, 0x23, 0x00, 0xC9, 0x02, 0x06, 0x06, 0x10, 0x09,</div><div class='add'>+0x42, 0x10, 0x00, 0xC1, 0x06, 0x34, 0x02, 0x90, 0x08, 0x40, 0x00, 0x00, 0xC9,</div><div class='add'>+0x01, 0x26, 0x4C, 0xD0, 0x0C, 0x42, 0x20, 0x04, 0x41, 0x00, 0x14, 0x81, 0x90,</div><div class='add'>+0x08, 0x40, 0x13, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15,</div><div class='add'>+0xA8, 0x25, 0x00, 0xDB, 0x00, 0x5C, 0x03, 0x30, 0x1D, 0xC0, 0x74, 0x48, 0xD3,</div><div class='add'>+0x13, 0x7C, 0x02, 0xB4, 0x1D, 0xC0, 0x05, 0x00, 0xCB, 0x01, 0x6C, 0x46, 0xF0,</div><div class='add'>+0x1D, 0xE0, 0x74, 0x00, 0xD3, 0x40, 0x1D, 0x06, 0xB0, 0x0D, 0xC0, 0x57, 0x20,</div><div class='add'>+0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x27, 0x40, 0xD7,</div><div class='add'>+0x00, 0x7C, 0x22, 0xF0, 0x49, 0xD0, 0x37, 0x02, 0xDF, 0x00, 0x7C, 0x0A, 0x70,</div><div class='add'>+0x8D, 0xD0, 0x07, 0x00, 0xD7, 0x0C, 0x5D, 0x00, 0xF0, 0x05, 0xC9, 0x35, 0x02,</div><div class='add'>+0x4F, 0x00, 0x64, 0x22, 0x74, 0x29, 0xC0, 0x07, 0x00, 0x0C, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x80, 0x08, 0x2F, 0x00, 0xFF, 0x10, 0x4C, 0x0B, 0xF0,</div><div class='add'>+0x0F, 0xC0, 0x5C, 0x00, 0xFF, 0x80, 0xEC, 0x0E, 0xF0, 0x8C, 0xC0, 0x04, 0x00,</div><div class='add'>+0xFF, 0x08, 0xCC, 0x00, 0xF0, 0x87, 0xC0, 0x7E, 0x20, 0xF3, 0x08, 0xCC, 0x02,</div><div class='add'>+0x33, 0x2F, 0xC6, 0x13, 0x22, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x81, 0x00, 0x26, 0x00, 0xDD, 0x00, 0x44, 0x87, 0xD0, 0x19, 0xC0, 0xF6, 0x00,</div><div class='add'>+0xCD, 0x09, 0x44, 0x00, 0xD2, 0x19, 0x40, 0x44, 0x04, 0xDC, 0x20, 0x6C, 0x04,</div><div class='add'>+0x90, 0x04, 0x40, 0x21, 0x00, 0xD3, 0x02, 0x44, 0x02, 0x10, 0x19, 0x40, 0x17,</div><div class='add'>+0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xA0, 0x34, 0x82,</div><div class='add'>+0xCD, 0x00, 0x44, 0x03, 0xD0, 0x4D, 0x50, 0xB4, 0x02, 0xDD, 0x00, 0x64, 0x03,</div><div class='add'>+0xD8, 0x09, 0x40, 0x44, 0x20, 0xDD, 0x00, 0x44, 0x06, 0xD0, 0x05, 0x44, 0x24,</div><div class='add'>+0x01, 0xD0, 0x10, 0x44, 0x03, 0x10, 0x0D, 0x41, 0x07, 0x00, 0x02, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x20, 0x30, 0x00, 0xCD, 0x00, 0x04, 0x02,</div><div class='add'>+0xD0, 0x0C, 0x40, 0x12, 0x00, 0xDD, 0x00, 0x04, 0x03, 0xD0, 0x08, 0x40, 0x00,</div><div class='add'>+0x00, 0xCD, 0x00, 0x26, 0x00, 0x90, 0x0D, 0x40, 0x35, 0x40, 0x41, 0x00, 0x05,</div><div class='add'>+0x02, 0x1C, 0x04, 0x44, 0x43, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0xB0, 0x16, 0x00, 0xFF, 0x40, 0x4C, 0x02, 0xF0, 0x09, 0x40, 0x14,</div><div class='add'>+0x20, 0xDF, 0x00, 0x6C, 0x03, 0xD0, 0x0D, 0xC4, 0x04, 0x08, 0xDF, 0x00, 0x4C,</div><div class='add'>+0x00, 0xF0, 0x0D, 0xC0, 0x26, 0x10, 0x53, 0x00, 0x4C, 0x03, 0x30, 0x0D, 0xC2,</div><div class='add'>+0x03, 0xC0, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0xB8, 0x1F,</div><div class='add'>+0x00, 0xEF, 0x00, 0xFC, 0x02, 0xF0, 0x0B, 0xC0, 0x1D, 0x00, 0xFF, 0x00, 0xFC,</div><div class='add'>+0x01, 0xF0, 0x0B, 0xD0, 0x0F, 0x00, 0xEF, 0x00, 0xFC, 0x00, 0xF0, 0x0F, 0xC0,</div><div class='add'>+0x2F, 0x00, 0x77, 0x40, 0xFC, 0x01, 0xF0, 0x07, 0xC0, 0x17, 0x22, 0x0E, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x80, 0x7F, 0x00, 0xEF, 0x09, 0xDC,</div><div class='add'>+0x06, 0xF2, 0x1F, 0xC0, 0x7D, 0x00, 0xE3, 0x01, 0xDC, 0x12, 0x30, 0x13, 0xC0,</div><div class='add'>+0x4E, 0x10, 0xB3, 0x00, 0xDC, 0x32, 0x70, 0x2B, 0xC0, 0xBC, 0x00, 0xB3, 0x20,</div><div class='add'>+0xFC, 0x10, 0x30, 0x02, 0x00, 0x0E, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x03, 0x18, 0x77, 0x00, 0xDD, 0x04, 0x44, 0x06, 0x10, 0x1D, 0x40,</div><div class='add'>+0x74, 0x00, 0xD1, 0x01, 0x44, 0x0E, 0x10, 0x11, 0x40, 0x74, 0x00, 0x51, 0x43,</div><div class='add'>+0x44, 0xB2, 0x10, 0xA1, 0x40, 0xBC, 0x03, 0x11, 0x32, 0x74, 0x26, 0x50, 0x11,</div><div class='add'>+0x40, 0x0C, 0x60, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0xA0,</div><div class='add'>+0x33, 0x00, 0xCD, 0x04, 0x14, 0x03, 0x58, 0x0C, 0x40, 0x27, 0x00, 0xD5, 0x00,</div><div class='add'>+0x17, 0x08, 0x10, 0x01, 0x60, 0x06, 0x08, 0x81, 0x28, 0x16, 0x12, 0xD8, 0x40,</div><div class='add'>+0x40, 0x30, 0x00, 0x05, 0x86, 0x34, 0x00, 0x18, 0x08, 0x60, 0x4E, 0x80, 0x0E,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xA0, 0x35, 0x00, 0xDD, 0x04,</div><div class='add'>+0x54, 0x07, 0x10, 0x0D, 0x46, 0x26, 0x00, 0xD5, 0x11, 0x44, 0x0C, 0x12, 0x11,</div><div class='add'>+0x40, 0x74, 0x00, 0x91, 0x01, 0x44, 0x46, 0x18, 0x10, 0x40, 0x36, 0x00, 0x15,</div><div class='add'>+0x01, 0x74, 0x43, 0x52, 0x19, 0x41, 0x0C, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x02, 0xA8, 0x37, 0x08, 0xDF, 0x00, 0x1E, 0x06, 0x70, 0xD5,</div><div class='add'>+0xC0, 0xD3, 0x00, 0xC7, 0x03, 0x5C, 0x0C, 0x30, 0x30, 0xC4, 0x52, 0x04, 0x92,</div><div class='add'>+0x07, 0x5D, 0x04, 0x70, 0x39, 0xC0, 0x34, 0x00, 0x97, 0x61, 0x7C, 0x8D, 0x30,</div><div class='add'>+0x39, 0xC0, 0x2A, 0x20, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07,</div><div class='add'>+0x80, 0x3D, 0x30, 0xFF, 0x01, 0xEC, 0x02, 0xF0, 0x0F, 0xC0, 0x7D, 0x02, 0xFB,</div><div class='add'>+0x00, 0xFC, 0x02, 0xF0, 0x03, 0xC0, 0x1F, 0x00, 0x6F, 0x20, 0xBC, 0x00, 0xF0,</div><div class='add'>+0x03, 0xD0, 0x3D, 0x00, 0x3B, 0x20, 0xFC, 0x24, 0xF1, 0x0B, 0xC0, 0x1F, 0x00,</div><div class='add'>+0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x08, 0x35, 0x00, 0xDF,</div><div class='add'>+0x00, 0x5C, 0x03, 0xB0, 0x49, 0xC0, 0xA5, 0x00, 0xDB, 0x02, 0x4C, 0x00, 0xF0,</div><div class='add'>+0x21, 0xC0, 0x17, 0x02, 0xD7, 0x05, 0x6C, 0x02, 0xF1, 0x09, 0xC0, 0x37, 0x44,</div><div class='add'>+0x93, 0x02, 0x6C, 0x0B, 0xF0, 0x29, 0xC4, 0x2B, 0x20, 0x04, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x13, 0xA0, 0x34, 0x00, 0xDD, 0x4D, 0x40, 0x0F, 0x15,</div><div class='add'>+0x38, 0x40, 0x24, 0x10, 0x91, 0x00, 0x2C, 0x44, 0xD1, 0xB1, 0x44, 0x54, 0x10,</div><div class='add'>+0xD1, 0x01, 0x74, 0xB2, 0xD2, 0x01, 0x4A, 0xFF, 0x00, 0x90, 0x30, 0x34, 0x83,</div><div class='add'>+0xD1, 0x08, 0x40, 0x4C, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x13, 0xA0, 0x32, 0x00, 0xDD, 0x00, 0x14, 0x26, 0x10, 0x9C, 0x48, 0x31, 0x00,</div><div class='add'>+0xCC, 0x08, 0x25, 0x02, 0xD0, 0x10, 0x40, 0x11, 0x00, 0x85, 0x02, 0x34, 0x00,</div><div class='add'>+0xD0, 0x08, 0x42, 0x36, 0x00, 0x85, 0x25, 0x24, 0x00, 0xD0, 0xB0, 0x41, 0x0D,</div><div class='add'>+0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0D, 0x08, 0x7A, 0x00,</div><div class='add'>+0xFD, 0x01, 0xC4, 0x1E, 0x18, 0x9F, 0x40, 0x7C, 0x10, 0xF5, 0x41, 0xB4, 0x07,</div><div class='add'>+0xD0, 0x12, 0x00, 0x58, 0x00, 0xA0, 0x01, 0xB4, 0x07, 0xD0, 0x1E, 0x00, 0x73,</div><div class='add'>+0x04, 0xE5, 0x01, 0xB4, 0x04, 0xD1, 0x16, 0x00, 0x34, 0x20, 0x08, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x10, 0x30, 0x00, 0xCF, 0x00, 0x1C, 0x02,</div><div class='add'>+0x30, 0x8C, 0xC0, 0xB1, 0x00, 0xCF, 0x00, 0x2C, 0x03, 0xF0, 0xE0, 0xC3, 0x11,</div><div class='add'>+0x00, 0x87, 0x00, 0x28, 0x01, 0xF0, 0x04, 0xC0, 0x32, 0x30, 0x47, 0x00, 0x2C,</div><div class='add'>+0x03, 0xF0, 0x00, 0xC0, 0x49, 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x02, 0xA0, 0x3D, 0x00, 0xFF, 0x00, 0xBC, 0x12, 0x70, 0x8E, 0xC0, 0x3B,</div><div class='add'>+0x02, 0xFB, 0x88, 0xEC, 0x23, 0xF0, 0x82, 0xC0, 0x19, 0x00, 0xBB, 0x00, 0xFC,</div><div class='add'>+0x03, 0xF0, 0x0F, 0xC0, 0x3F, 0x20, 0x7B, 0x40, 0xFC, 0x23, 0xF0, 0x8F, 0xC0,</div><div class='add'>+0x09, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xA0, 0x37,</div><div class='add'>+0x00, 0x9F, 0x00, 0x3C, 0x06, 0x70, 0x0D, 0xE0, 0x35, 0x00, 0xDF, 0x00, 0x44,</div><div class='add'>+0x01, 0xB2, 0x05, 0xC2, 0x13, 0x00, 0xCB, 0x00, 0x6C, 0x05, 0x72, 0x0D, 0xC2,</div><div class='add'>+0xB7, 0x03, 0xDD, 0x00, 0x6C, 0x00, 0xF0, 0x15, 0x80, 0x40, 0x00, 0x0E, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0x98, 0x39, 0x10, 0xEC, 0x00, 0xB4,</div><div class='add'>+0x82, 0x10, 0x0E, 0x52, 0x38, 0x00, 0x6D, 0x00, 0x94, 0x03, 0x90, 0x06, 0x40,</div><div class='add'>+0x1B, 0x00, 0xE1, 0x00, 0xC5, 0x01, 0x10, 0x0E, 0x48, 0x3B, 0x05, 0xED, 0x00,</div><div class='add'>+0x84, 0x00, 0x90, 0x0E, 0x40, 0x4C, 0x60, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x04, 0x00, 0x79, 0x20, 0xAC, 0x91, 0xB4, 0x06, 0xD0, 0x1F, 0x48,</div><div class='add'>+0x79, 0x20, 0xFD, 0x01, 0xB4, 0x47, 0x90, 0x1E, 0x60, 0x5B, 0x00, 0xE9, 0x01,</div><div class='add'>+0xA4, 0x07, 0x50, 0x1E, 0x41, 0x7B, 0x00, 0xCD, 0x03, 0xB4, 0x07, 0xD8, 0x14,</div><div class='add'>+0x64, 0x10, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16, 0x20,</div><div class='add'>+0x33, 0x00, 0xCD, 0x01, 0x34, 0x40, 0xD0, 0x5C, 0x40, 0x31, 0x00, 0xCD, 0x05,</div><div class='add'>+0x34, 0x03, 0x98, 0x24, 0x40, 0x93, 0x08, 0xC1, 0x08, 0x04, 0x03, 0x10, 0x2C,</div><div class='add'>+0x41, 0x33, 0x88, 0xDD, 0x00, 0x14, 0x1F, 0x90, 0x2C, 0x40, 0x58, 0x00, 0x0C,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x17, 0xA8, 0x17, 0x00, 0x5F, 0x01,</div><div class='add'>+0xFC, 0x09, 0xF0, 0x07, 0x40, 0x1D, 0x00, 0x7F, 0x01, 0xFC, 0x01, 0xB0, 0x77,</div><div class='add'>+0xC0, 0x5B, 0x00, 0x6B, 0x01, 0xEC, 0x29, 0x70, 0x07, 0xC0, 0x17, 0x00, 0x7F,</div><div class='add'>+0x08, 0xFC, 0x01, 0xF0, 0x47, 0x40, 0x5C, 0x20, 0x0E, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x12, 0x80, 0x05, 0x00, 0x1F, 0xC2, 0x7C, 0x00, 0x00, 0xA1,</div><div class='add'>+0x80, 0x06, 0x01, 0x1C, 0x08, 0x58, 0x00, 0xC3, 0x01, 0x88, 0x07, 0x02, 0x1F,</div><div class='add'>+0x42, 0x7C, 0x20, 0xF0, 0x01, 0xC0, 0x87, 0x20, 0x1F, 0x40, 0x60, 0x20, 0xB0,</div><div class='add'>+0x01, 0xD0, 0x4B, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10,</div><div class='add'>+0x08, 0x25, 0x00, 0x9F, 0x03, 0x7C, 0x12, 0xF9, 0x09, 0xC8, 0x25, 0x00, 0x9F,</div><div class='add'>+0x04, 0x1C, 0x56, 0x31, 0x89, 0xC3, 0x27, 0x04, 0x97, 0x05, 0x40, 0x06, 0xF0,</div><div class='add'>+0x09, 0xC0, 0x27, 0x01, 0x9F, 0x00, 0x4C, 0x82, 0xF3, 0x39, 0xC1, 0x43, 0x20,</div><div class='add'>+0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x20, 0x26, 0x00, 0x9D,</div><div class='add'>+0x03, 0x74, 0x0A, 0xD8, 0x48, 0x40, 0x24, 0x10, 0x8D, 0x00, 0x44, 0x06, 0x14,</div><div class='add'>+0x19, 0x44, 0xE7, 0x81, 0x9B, 0x12, 0x44, 0x0E, 0xD0, 0x09, 0x40, 0x67, 0x20,</div><div class='add'>+0x9D, 0x0E, 0x44, 0x02, 0x78, 0x39, 0x40, 0x07, 0x00, 0x08, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x1C, 0xA0, 0x24, 0x00, 0x9D, 0x00, 0x74, 0x0B, 0x98,</div><div class='add'>+0x09, 0x40, 0x25, 0x00, 0x9D, 0x02, 0x56, 0x02, 0x50, 0x09, 0x48, 0x67, 0x00,</div><div class='add'>+0x95, 0x00, 0x54, 0x1A, 0xD0, 0x0D, 0x60, 0x27, 0x00, 0xDD, 0x00, 0x44, 0x02,</div><div class='add'>+0x50, 0x29, 0x40, 0x73, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x14, 0x28, 0x20, 0x00, 0xCD, 0x00, 0x34, 0x02, 0xD0, 0x09, 0x40, 0x20, 0x00,</div><div class='add'>+0x8D, 0x80, 0x14, 0xD2, 0x50, 0x0C, 0x40, 0x23, 0x00, 0x81, 0x00, 0x10, 0x52,</div><div class='add'>+0xD0, 0x48, 0x61, 0x33, 0x0D, 0x8D, 0x14, 0x14, 0x02, 0x50, 0x48, 0x41, 0x53,</div><div class='add'>+0xA0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1D, 0x30, 0x04, 0x00,</div><div class='add'>+0x1F, 0x00, 0x7C, 0x00, 0x90, 0x01, 0xC0, 0x05, 0x00, 0x1F, 0x80, 0x5C, 0x10,</div><div class='add'>+0x70, 0x01, 0xC0, 0x07, 0x20, 0x14, 0x14, 0x4D, 0x10, 0xF0, 0x41, 0xC0, 0x07,</div><div class='add'>+0x01, 0x1F, 0x04, 0x4D, 0x50, 0x70, 0x41, 0xE2, 0x77, 0xC0, 0x0A, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x19, 0xA0, 0x27, 0x00, 0xBF, 0x94, 0xFC, 0x02,</div><div class='add'>+0xC0, 0x0E, 0x40, 0x3F, 0x00, 0xAF, 0x80, 0xEC, 0x02, 0xB0, 0x0B, 0xC0, 0x2F,</div><div class='add'>+0x00, 0xBF, 0x00, 0xEC, 0x52, 0xF0, 0x4B, 0x41, 0x27, 0x05, 0xBF, 0x14, 0xEC,</div><div class='add'>+0x02, 0x70, 0x0B, 0xC0, 0x67, 0x20, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x18, 0xA0, 0x27, 0x00, 0xBF, 0x08, 0xFC, 0x02, 0x79, 0x0A, 0xC0, 0x25,</div><div class='add'>+0x00, 0xBF, 0x00, 0xCC, 0x06, 0xB1, 0x0B, 0xC0, 0x2F, 0x00, 0xBF, 0x00, 0xDD,</div><div class='add'>+0x12, 0xF0, 0x99, 0xC0, 0x6D, 0x03, 0xB9, 0x0D, 0xF8, 0x02, 0x30, 0x0B, 0xC8,</div><div class='add'>+0x60, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1C, 0x18, 0x07,</div><div class='add'>+0x00, 0x1D, 0x41, 0x74, 0x00, 0x10, 0x01, 0x40, 0x04, 0x00, 0x1D, 0x00, 0x44,</div><div class='add'>+0x28, 0x10, 0x01, 0x40, 0x07, 0x00, 0x1D, 0x40, 0x44, 0x10, 0xD0, 0xB1, 0x40,</div><div class='add'>+0xC4, 0x03, 0x11, 0x0F, 0x74, 0x00, 0x10, 0x01, 0x50, 0x70, 0x60, 0x0C, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x23, 0x00, 0x8D, 0x04, 0x74,</div><div class='add'>+0x02, 0xD4, 0x08, 0x40, 0x21, 0x20, 0x9D, 0x00, 0x17, 0x02, 0x90, 0x08, 0x40,</div><div class='add'>+0x23, 0x00, 0x9D, 0x00, 0x36, 0x62, 0xD0, 0x48, 0x40, 0x23, 0x00, 0x89, 0x00,</div><div class='add'>+0x34, 0x02, 0x14, 0x08, 0x48, 0x49, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x18, 0xA0, 0x25, 0x00, 0x9D, 0x80, 0x74, 0x42, 0x12, 0x09, 0x44,</div><div class='add'>+0x24, 0x00, 0x9D, 0x40, 0x52, 0x46, 0x00, 0x09, 0x41, 0x27, 0x00, 0x9D, 0x00,</div><div class='add'>+0x74, 0x8E, 0xD0, 0x09, 0x61, 0x24, 0x00, 0x91, 0x10, 0x74, 0x02, 0x10, 0x09,</div><div class='add'>+0x40, 0x60, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0xA8,</div><div class='add'>+0x26, 0x00, 0x9D, 0x00, 0x78, 0x0A, 0xF2, 0x08, 0xC0, 0x25, 0x80, 0x9F, 0x04,</div><div class='add'>+0x5C, 0x0A, 0xB2, 0x09, 0xC2, 0x27, 0x08, 0x9F, 0x19, 0x7C, 0x02, 0xF0, 0x39,</div><div class='add'>+0xC0, 0x25, 0x20, 0x9A, 0x03, 0x7E, 0x16, 0x20, 0x09, 0xE5, 0x15, 0x20, 0x0E,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x80, 0x25, 0x00, 0x9F, 0x00,</div><div class='add'>+0x7C, 0x12, 0xF0, 0x29, 0xC0, 0xA6, 0x00, 0x9F, 0x28, 0x2C, 0x02, 0xF0, 0x09,</div><div class='add'>+0xC0, 0x27, 0x00, 0x9F, 0x90, 0x4C, 0x02, 0xF0, 0x48, 0xC4, 0x27, 0x00, 0x9F,</div><div class='add'>+0x89, 0x7E, 0x22, 0xF2, 0x08, 0xE0, 0x4B, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x10, 0x08, 0x05, 0x00, 0x1F, 0x04, 0x7C, 0x18, 0xB2, 0x41,</div><div class='add'>+0xC0, 0x04, 0x20, 0x1F, 0x06, 0x4C, 0x28, 0xF2, 0x61, 0xC0, 0x05, 0x02, 0x1F,</div><div class='add'>+0x02, 0x6C, 0x08, 0xB0, 0x21, 0xC2, 0x07, 0x00, 0x1F, 0x12, 0x1C, 0x08, 0x30,</div><div class='add'>+0x21, 0xC0, 0x40, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14,</div><div class='add'>+0xA0, 0x14, 0x00, 0x7D, 0x11, 0xB0, 0x0D, 0x10, 0x17, 0x58, 0x14, 0x00, 0x6D,</div><div class='add'>+0x03, 0x45, 0x05, 0xD0, 0x17, 0x44, 0x9F, 0x02, 0x6D, 0x00, 0xC0, 0x01, 0x10,</div><div class='add'>+0x05, 0x40, 0x9F, 0x02, 0x7D, 0x80, 0x44, 0x01, 0x10, 0x27, 0x00, 0x50, 0x00,</div><div class='add'>+0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0xA0, 0x32, 0x00, 0xCD,</div><div class='add'>+0x00, 0x34, 0x8A, 0x90, 0xAC, 0x04, 0x30, 0x00, 0x45, 0x02, 0x12, 0x06, 0xD1,</div><div class='add'>+0x2C, 0x40, 0x91, 0x00, 0xCD, 0x22, 0x24, 0x17, 0x90, 0x0C, 0x40, 0x37, 0xA2,</div><div class='add'>+0xCD, 0x08, 0x16, 0xA7, 0x10, 0x4C, 0x50, 0x50, 0x00, 0x0A, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x01, 0x80, 0x38, 0x00, 0x6D, 0x00, 0xF4, 0x0A, 0x10,</div><div class='add'>+0x0E, 0x40, 0x38, 0x00, 0x6D, 0x10, 0xB4, 0x03, 0xD0, 0x0E, 0x61, 0x1B, 0x80,</div><div class='add'>+0xFD, 0x30, 0xA0, 0x47, 0x90, 0x4E, 0x40, 0x3B, 0xA0, 0x6D, 0x01, 0x84, 0x03,</div><div class='add'>+0x50, 0x2C, 0x40, 0x04, 0x20, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x11, 0x10, 0x78, 0x00, 0xEF, 0x01, 0xBC, 0x06, 0xB0, 0x1E, 0xC0, 0x78, 0x20,</div><div class='add'>+0x6F, 0x01, 0x9C, 0x07, 0xF0, 0x1E, 0xE0, 0x59, 0x00, 0xEF, 0x01, 0xE8, 0x07,</div><div class='add'>+0xB0, 0xBE, 0xC0, 0x7B, 0x20, 0xFF, 0x21, 0x1C, 0x07, 0x34, 0x1E, 0xC0, 0x44,</div><div class='add'>+0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xB8, 0x35, 0x00,</div><div class='add'>+0xDF, 0x00, 0x3C, 0x02, 0xF0, 0x0D, 0xC0, 0x37, 0x10, 0x4F, 0x00, 0x4D, 0x83,</div><div class='add'>+0xF0, 0x0D, 0xE0, 0x17, 0x00, 0xCF, 0x00, 0x5C, 0x03, 0x70, 0x6D, 0xC4, 0x17,</div><div class='add'>+0x08, 0x5E, 0x40, 0x7C, 0x03, 0xB0, 0x09, 0xC0, 0x43, 0x20, 0x06, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x7D, 0x00, 0xFF, 0x01, 0xFC, 0x07,</div><div class='add'>+0x30, 0x17, 0xC0, 0x7D, 0x00, 0x7F, 0x01, 0xDC, 0x27, 0xF1, 0x9F, 0xC0, 0x5F,</div><div class='add'>+0x00, 0xEF, 0x01, 0xEC, 0x85, 0xB0, 0x9F, 0x00, 0x5F, 0x02, 0xF3, 0x4D, 0xC8,</div><div class='add'>+0x07, 0x20, 0x1F, 0xC0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x15, 0x18, 0x39, 0x00, 0x6D, 0x42, 0xB4, 0x12, 0x10, 0x0E, 0x40, 0x38,</div><div class='add'>+0x00, 0x29, 0x44, 0x80, 0x03, 0xD0, 0x0E, 0x40, 0x1B, 0x00, 0x6D, 0x02, 0x94,</div><div class='add'>+0x01, 0xD0, 0x0E, 0x43, 0x1A, 0x00, 0xE1, 0x18, 0x84, 0x53, 0x10, 0x07, 0x41,</div><div class='add'>+0x55, 0x60, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x39,</div><div class='add'>+0x00, 0xED, 0x00, 0xF4, 0x02, 0x18, 0x2E, 0x50, 0xB9, 0x00, 0x6D, 0xB2, 0x80,</div><div class='add'>+0x43, 0xD0, 0x0E, 0x42, 0x1B, 0x04, 0xED, 0x18, 0x95, 0x01, 0x90, 0x0E, 0x42,</div><div class='add'>+0x3A, 0x30, 0xE1, 0x44, 0xB5, 0x03, 0x1C, 0x0F, 0x40, 0x00, 0x00, 0x04, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x20, 0x30, 0x00, 0x8D, 0x00, 0x34,</div><div class='add'>+0x0A, 0x18, 0x0C, 0x58, 0x31, 0x08, 0x49, 0x01, 0x04, 0x07, 0xD0, 0x08, 0x40,</div><div class='add'>+0xD3, 0x00, 0x4D, 0x03, 0x04, 0x9C, 0xD0, 0x1D, 0x48, 0x02, 0x80, 0x91, 0x01,</div><div class='add'>+0x34, 0x13, 0x10, 0x30, 0x00, 0x11, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x15, 0xA8, 0x35, 0x00, 0x9F, 0x00, 0x74, 0x0B, 0x30, 0x2D, 0xC0,</div><div class='add'>+0x31, 0x00, 0xCF, 0x02, 0x4D, 0x23, 0xF2, 0x0D, 0xC0, 0xD7, 0x00, 0xCF, 0x09,</div><div class='add'>+0x5C, 0x1A, 0xB0, 0x3F, 0x40, 0x26, 0x20, 0x91, 0x02, 0x7C, 0x02, 0x30, 0x2D,</div><div class='add'>+0xC0, 0x54, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00,</div><div class='add'>+0x37, 0x00, 0x1F, 0x01, 0x7C, 0x43, 0xF0, 0x0D, 0x40, 0x36, 0x00, 0xDB, 0x02,</div><div class='add'>+0x7C, 0x03, 0xF0, 0x6D, 0xC4, 0x17, 0x01, 0xDF, 0x00, 0x74, 0x00, 0xD0, 0x0D,</div><div class='add'>+0xC1, 0x26, 0x00, 0x1F, 0x02, 0x4C, 0x02, 0xF1, 0x4D, 0xC0, 0x07, 0x00, 0x0C,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x84, 0x08, 0x3F, 0x08, 0x3F, 0x00,</div><div class='add'>+0xFC, 0x02, 0xF0, 0x0F, 0xC0, 0x3D, 0x08, 0x77, 0x00, 0xCC, 0x03, 0xE0, 0x9F,</div><div class='add'>+0xD0, 0x1C, 0x00, 0xF9, 0x00, 0x8D, 0x02, 0xB0, 0x0F, 0xC0, 0x24, 0x00, 0x9F,</div><div class='add'>+0x10, 0x48, 0x82, 0xD0, 0x07, 0xC0, 0x13, 0x22, 0x0C, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x85, 0x20, 0x36, 0x00, 0x1D, 0x03, 0x74, 0x86, 0xD2, 0x3C,</div><div class='add'>+0x41, 0x34, 0x00, 0x51, 0x21, 0x44, 0x03, 0xD0, 0x5C, 0x40, 0x54, 0x08, 0xDD,</div><div class='add'>+0x43, 0x44, 0x4E, 0x10, 0x0D, 0x40, 0x64, 0x00, 0x1D, 0x07, 0x6C, 0xA2, 0xD2,</div><div class='add'>+0x01, 0x40, 0x17, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,</div><div class='add'>+0xA0, 0x34, 0x00, 0x9D, 0x01, 0x74, 0x07, 0xD0, 0x1D, 0x40, 0x35, 0x00, 0x55,</div><div class='add'>+0x03, 0x45, 0x07, 0xD2, 0x0D, 0x42, 0x55, 0x04, 0x9D, 0x81, 0x54, 0x06, 0x90,</div><div class='add'>+0x0D, 0x50, 0xC4, 0x00, 0x1D, 0x01, 0x54, 0x03, 0xD0, 0x89, 0x41, 0x07, 0x08,</div><div class='add'>+0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x28, 0x30, 0x00, 0x0D,</div><div class='add'>+0x00, 0x34, 0x07, 0xD0, 0x09, 0x40, 0x34, 0x00, 0x51, 0x00, 0x04, 0x03, 0xD0,</div><div class='add'>+0x04, 0x40, 0x10, 0x00, 0x4D, 0x00, 0x04, 0x00, 0x18, 0x0C, 0x40, 0x00, 0x00,</div><div class='add'>+0x1D, 0x00, 0x36, 0x83, 0xD0, 0x00, 0x40, 0x43, 0xA0, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0xB1, 0x36, 0x00, 0x9F, 0x00, 0x7C, 0x02, 0xF0,</div><div class='add'>+0x0D, 0xC0, 0x35, 0x00, 0x57, 0x00, 0x48, 0x03, 0xF0, 0x0D, 0x40, 0x34, 0x10,</div><div class='add'>+0x5B, 0x00, 0x48, 0x02, 0xB0, 0x0F, 0xC0, 0x24, 0x00, 0x9F, 0x00, 0x5C, 0x03,</div><div class='add'>+0xF0, 0x01, 0xC8, 0x03, 0xC0, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x05, 0xA0, 0x3F, 0x00, 0xBF, 0x00, 0xB4, 0x00, 0xF0, 0x0A, 0xC0, 0x3F, 0x20,</div><div class='add'>+0x6F, 0x00, 0xFC, 0x03, 0xE0, 0x0F, 0xC0, 0x2F, 0x00, 0x7E, 0x00, 0xFC, 0x02,</div><div class='add'>+0xF0, 0x0F, 0xC0, 0x2F, 0x00, 0xBF, 0x00, 0xEC, 0x03, 0xF0, 0x03, 0xC0, 0x17,</div><div class='add'>+0x21, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xA8, 0x7F, 0x00,</div><div class='add'>+0xEF, 0x09, 0xCC, 0x27, 0xF2, 0x1F, 0xC0, 0x7C, 0x00, 0xFF, 0x01, 0xBC, 0x27,</div><div class='add'>+0xF0, 0x3F, 0xC0, 0x7F, 0x00, 0xEE, 0x09, 0xCC, 0x07, 0x31, 0x1E, 0xC0, 0x7C,</div><div class='add'>+0x00, 0xF3, 0x09, 0xFC, 0x07, 0x30, 0x1F, 0xC0, 0x0C, 0x00, 0x0E, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x08, 0x47, 0x10, 0x1D, 0x44, 0x44, 0x10,</div><div class='add'>+0xD0, 0x11, 0x40, 0x44, 0x00, 0x1D, 0x01, 0x74, 0x00, 0xD2, 0x01, 0x48, 0x47,</div><div class='add'>+0x00, 0x1D, 0x44, 0x44, 0x04, 0x50, 0x11, 0x40, 0x44, 0x00, 0x11, 0x84, 0x74,</div><div class='add'>+0x04, 0x14, 0x11, 0x40, 0x04, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x11, 0xA0, 0x33, 0x00, 0xDD, 0x00, 0x14, 0x03, 0xD0, 0x0D, 0x40, 0x30,</div><div class='add'>+0x08, 0xCC, 0x80, 0x36, 0x13, 0xD0, 0x4C, 0x40, 0x33, 0x00, 0xCD, 0x00, 0x04,</div><div class='add'>+0x03, 0x11, 0x0C, 0x40, 0x30, 0x00, 0xC1, 0x80, 0x74, 0x03, 0x18, 0x0C, 0x40,</div><div class='add'>+0x44, 0x80, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x80, 0x05,</div><div class='add'>+0x00, 0x1D, 0x00, 0x54, 0x80, 0xD0, 0x01, 0x40, 0x04, 0x18, 0x1D, 0x00, 0x74,</div><div class='add'>+0x00, 0xD0, 0x01, 0x40, 0x07, 0x00, 0x0D, 0x00, 0x45, 0x00, 0x50, 0x01, 0x40,</div><div class='add'>+0x04, 0x00, 0x11, 0x60, 0x76, 0x00, 0x10, 0x01, 0x40, 0x0C, 0x20, 0x06, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA0, 0x37, 0x00, 0xDF, 0x20, 0x5C,</div><div class='add'>+0x03, 0xF2, 0x0D, 0xD0, 0x34, 0x00, 0xDF, 0x00, 0x7C, 0x03, 0xF0, 0x0D, 0xC0,</div><div class='add'>+0x37, 0x00, 0xDF, 0x00, 0x4C, 0x83, 0x30, 0x0C, 0xC0, 0x30, 0x00, 0xD3, 0x00,</div><div class='add'>+0x3C, 0x83, 0x31, 0x0D, 0xC0, 0x00, 0x20, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x07, 0x80, 0x0D, 0x00, 0x3F, 0x00, 0xEC, 0x00, 0xF0, 0x03, 0xC0,</div><div class='add'>+0x0F, 0x00, 0x3F, 0x00, 0xFC, 0x00, 0xF2, 0x03, 0xC0, 0x0F, 0x00, 0x3F, 0xB0,</div><div class='add'>+0xFC, 0x00, 0xF2, 0x03, 0xD0, 0x0F, 0x00, 0x3F, 0x80, 0xFC, 0x00, 0xF0, 0x03,</div><div class='add'>+0xD1, 0x1F, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00,</div><div class='add'>+0x35, 0x00, 0xDF, 0x01, 0x4C, 0x03, 0x30, 0x0D, 0xC0, 0x34, 0x00, 0xD3, 0x80,</div><div class='add'>+0x4C, 0x23, 0x34, 0x8D, 0xC0, 0x74, 0x00, 0xDF, 0x00, 0x4C, 0x03, 0x30, 0x0D,</div><div class='add'>+0xC0, 0x34, 0x01, 0xD3, 0x00, 0x4C, 0x83, 0xF0, 0x0D, 0xC0, 0x0B, 0x20, 0x04,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0xA0, 0x04, 0x00, 0x0D, 0x00,</div><div class='add'>+0x40, 0x40, 0x10, 0x10, 0x50, 0x04, 0x00, 0x1A, 0x05, 0x44, 0x00, 0x10, 0x11,</div><div class='add'>+0xC0, 0x86, 0x00, 0x1D, 0x03, 0x04, 0x04, 0x10, 0x11, 0x40, 0x85, 0x08, 0x11,</div><div class='add'>+0x11, 0x6E, 0x2C, 0xD0, 0x30, 0x40, 0x4F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x07, 0xA8, 0x72, 0x02, 0xCD, 0x00, 0x06, 0x07, 0x00, 0x9C,</div><div class='add'>+0x40, 0x70, 0x80, 0xC1, 0x01, 0x20, 0x87, 0x10, 0x0C, 0x42, 0x30, 0x04, 0xCD,</div><div class='add'>+0x20, 0x04, 0x23, 0x1A, 0x1C, 0x40, 0x30, 0x00, 0xC1, 0x81, 0x24, 0x07, 0xD0,</div><div class='add'>+0x3C, 0x40, 0x1F, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04,</div><div class='add'>+0x80, 0x48, 0x02, 0x3D, 0x01, 0x84, 0x04, 0x10, 0x92, 0x40, 0x48, 0x00, 0x39,</div><div class='add'>+0x01, 0xE4, 0x04, 0x10, 0x33, 0x40, 0x4A, 0x20, 0x2D, 0x91, 0x85, 0x14, 0x18,</div><div class='add'>+0x13, 0x41, 0x49, 0x00, 0x21, 0x01, 0xA4, 0x44, 0xD0, 0x12, 0x41, 0x1B, 0x00,</div><div class='add'>+0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x10, 0x30, 0x00, 0xCF,</div><div class='add'>+0x80, 0x44, 0x23, 0x34, 0x0C, 0xC0, 0x30, 0x26, 0xC3, 0x00, 0x2D, 0x23, 0x30,</div><div class='add'>+0x0C, 0x40, 0x30, 0x20, 0xCF, 0x44, 0x0E, 0x03, 0x34, 0x0C, 0xC0, 0x30, 0x40,</div><div class='add'>+0xD3, 0x08, 0x25, 0x03, 0xF0, 0x0C, 0xC0, 0x4B, 0x40, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x02, 0xB8, 0x0D, 0x08, 0x3F, 0x80, 0xFD, 0x00, 0xF0,</div><div class='add'>+0x02, 0xC0, 0x0B, 0x80, 0x2F, 0x00, 0xDC, 0x20, 0xF0, 0x82, 0xE0, 0x0F, 0x02,</div><div class='add'>+0x3F, 0x00, 0xBC, 0x10, 0xF0, 0x03, 0xC0, 0x0B, 0x00, 0x3F, 0x00, 0x5E, 0x00,</div><div class='add'>+0xF0, 0x13, 0xC0, 0x0B, 0x60, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x15, 0xA0, 0x33, 0x00, 0xD7, 0x00, 0x7C, 0x83, 0xF0, 0x1D, 0xC0, 0x34, 0x00,</div><div class='add'>+0xDF, 0x00, 0x7C, 0x03, 0xF0, 0x0D, 0xC0, 0x73, 0x00, 0xD3, 0x00, 0x1C, 0x03,</div><div class='add'>+0x30, 0x0D, 0xC0, 0x33, 0x00, 0xD3, 0x00, 0x7E, 0x03, 0xF0, 0x1D, 0xC0, 0x54,</div><div class='add'>+0x20, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x88, 0x09, 0x20,</div><div class='add'>+0x21, 0x20, 0xB4, 0x00, 0xD0, 0x02, 0x40, 0x08, 0x10, 0x2D, 0x40, 0xB4, 0x00,</div><div class='add'>+0xD0, 0x02, 0x40, 0x0B, 0x00, 0x21, 0x00, 0x84, 0x00, 0x52, 0x02, 0x40, 0x0B,</div><div class='add'>+0x00, 0x21, 0x00, 0xB6, 0x00, 0xD1, 0x02, 0x40, 0x48, 0x60, 0x06, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x79, 0x00, 0xE5, 0xC1, 0xB4, 0x07,</div><div class='add'>+0xD8, 0x1F, 0x40, 0x78, 0x00, 0xED, 0x01, 0xB4, 0x07, 0xD0, 0x1E, 0x4A, 0x7B,</div><div class='add'>+0x88, 0xE1, 0x01, 0x94, 0x07, 0x94, 0x1E, 0x40, 0x7F, 0x00, 0xE9, 0x01, 0xB4,</div><div class='add'>+0x87, 0xD2, 0x1E, 0x52, 0x0C, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x12, 0x28, 0x03, 0x00, 0x01, 0x00, 0x34, 0x00, 0xD9, 0x00, 0x56, 0x00,</div><div class='add'>+0x08, 0x0D, 0x80, 0x76, 0x00, 0xD0, 0x00, 0x44, 0x03, 0x00, 0x01, 0x40, 0x04,</div><div class='add'>+0x00, 0xD0, 0x00, 0x48, 0x03, 0x08, 0x09, 0x00, 0x34, 0x00, 0xD0, 0x00, 0x40,</div><div class='add'>+0x48, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x17, 0xA8, 0x11,</div><div class='add'>+0x00, 0x57, 0x00, 0x3C, 0x01, 0xF0, 0x05, 0xC0, 0x10, 0x00, 0x5F, 0x00, 0x7C,</div><div class='add'>+0x01, 0xF0, 0x04, 0xC0, 0x17, 0x40, 0x43, 0x00, 0x1C, 0x01, 0xB4, 0x05, 0xC0,</div><div class='add'>+0x17, 0x00, 0x5B, 0x00, 0x7C, 0x01, 0xF0, 0x05, 0xC0, 0x5C, 0x20, 0x06, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x0F, 0x00, 0x3F, 0x00, 0xFC,</div><div class='add'>+0x00, 0xF0, 0x03, 0xC0, 0x0F, 0x00, 0x3F, 0x00, 0xF4, 0x00, 0xF0, 0x03, 0xC4,</div><div class='add'>+0x8F, 0x00, 0x3F, 0x00, 0xFD, 0x08, 0x70, 0x23, 0xC0, 0x8F, 0x40, 0x37, 0x00,</div><div class='add'>+0xFC, 0x00, 0xF0, 0x03, 0xC0, 0x4B, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x10, 0x08, 0x27, 0x00, 0x93, 0x09, 0x7C, 0x26, 0x30, 0x19, 0xC0,</div><div class='add'>+0x67, 0x00, 0x93, 0x08, 0x7C, 0x0A, 0x31, 0x19, 0xC8, 0x66, 0x02, 0x9F, 0x80,</div><div class='add'>+0x6C, 0x02, 0x34, 0x09, 0xC0, 0x67, 0x40, 0x92, 0x05, 0x7C, 0x02, 0xF0, 0x09,</div><div class='add'>+0xC0, 0x43, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x20,</div><div class='add'>+0x26, 0x00, 0x91, 0x01, 0x74, 0x02, 0x51, 0x19, 0x40, 0x27, 0x00, 0x91, 0x01,</div><div class='add'>+0x74, 0x02, 0x10, 0x89, 0x40, 0x64, 0x01, 0x9D, 0x00, 0x44, 0x12, 0x10, 0x39,</div><div class='add'>+0x48, 0x23, 0x02, 0x91, 0x01, 0x74, 0x0E, 0xD0, 0x09, 0x40, 0x07, 0x00, 0x08,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0xA0, 0x24, 0x01, 0xB1, 0x80,</div><div class='add'>+0xF4, 0x02, 0x10, 0x8B, 0x40, 0x2F, 0x01, 0xB1, 0x00, 0xF4, 0x02, 0x10, 0x0B,</div><div class='add'>+0x40, 0x2E, 0x20, 0xBD, 0x00, 0xC4, 0x02, 0x10, 0x8B, 0x40, 0x2F, 0x80, 0xB5,</div><div class='add'>+0x00, 0xF4, 0x52, 0xD0, 0x0B, 0x40, 0x63, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x10, 0x20, 0x2C, 0x00, 0xA1, 0x02, 0xF4, 0x0A, 0x50, 0x0A,</div><div class='add'>+0x40, 0x2F, 0x00, 0xA1, 0x00, 0xB4, 0x0A, 0x04, 0x1A, 0x40, 0x2A, 0x00, 0xBD,</div><div class='add'>+0x00, 0x85, 0x02, 0x18, 0x0E, 0x40, 0x2B, 0x00, 0xA5, 0x02, 0xB4, 0x02, 0xD0,</div><div class='add'>+0x0A, 0x40, 0x43, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1D,</div><div class='add'>+0xB0, 0x06, 0x00, 0x13, 0x00, 0x7C, 0x00, 0x30, 0x01, 0xC8, 0x07, 0x40, 0x13,</div><div class='add'>+0x00, 0x7C, 0x00, 0x30, 0x01, 0xC0, 0x06, 0x00, 0x0F, 0x40, 0x4C, 0x00, 0x32,</div><div class='add'>+0x01, 0xC2, 0x17, 0x40, 0x17, 0x00, 0x7C, 0x00, 0xF0, 0x03, 0xC0, 0x77, 0xC0,</div><div class='add'>+0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x19, 0xB8, 0x27, 0x40, 0x9F,</div><div class='add'>+0x01, 0x7C, 0x86, 0xF0, 0x08, 0xC0, 0x27, 0x00, 0x9F, 0x00, 0x7C, 0x06, 0xF2,</div><div class='add'>+0x49, 0x41, 0x25, 0x20, 0x9F, 0x14, 0x7C, 0x02, 0xF0, 0x09, 0xC0, 0x27, 0x00,</div><div class='add'>+0x9B, 0x01, 0x7C, 0x02, 0xF0, 0x08, 0xC0, 0x67, 0x60, 0x0E, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x18, 0xA0, 0x2F, 0x00, 0xBF, 0x00, 0xCC, 0x02, 0xF0,</div><div class='add'>+0x0B, 0xC0, 0x2F, 0x00, 0xBF, 0x00, 0xFC, 0x02, 0x30, 0x0A, 0xC0, 0x2B, 0x20,</div><div class='add'>+0xAF, 0x42, 0x8D, 0x02, 0x30, 0x0B, 0xC0, 0x28, 0x00, 0xB3, 0x02, 0xCC, 0x02,</div><div class='add'>+0xF0, 0x0A, 0xC0, 0x64, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x1C, 0x08, 0x07, 0x00, 0x1D, 0x15, 0x44, 0x54, 0xD0, 0x01, 0x48, 0x07, 0x00,</div><div class='add'>+0x1D, 0x00, 0x74, 0x14, 0x10, 0x51, 0x41, 0x07, 0x00, 0x1D, 0x81, 0x44, 0x00,</div><div class='add'>+0x50, 0x01, 0x48, 0x04, 0x10, 0x15, 0x01, 0x44, 0x00, 0xD0, 0x01, 0x40, 0x71,</div><div class='add'>+0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xA0, 0x23, 0x00,</div><div class='add'>+0x8D, 0x00, 0x04, 0x02, 0xD0, 0x08, 0x48, 0x23, 0x00, 0x8D, 0x00, 0x34, 0x42,</div><div class='add'>+0x10, 0x08, 0x40, 0x23, 0xA0, 0x8D, 0x00, 0x44, 0x03, 0x10, 0x08, 0x52, 0x20,</div><div class='add'>+0x00, 0xD1, 0x04, 0x04, 0x02, 0xD0, 0x09, 0x40, 0x40, 0x80, 0x0E, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0xA8, 0x25, 0x00, 0x9D, 0x00, 0x44, 0x02,</div><div class='add'>+0xD0, 0x09, 0x40, 0x27, 0x10, 0x9D, 0x00, 0x74, 0x02, 0x14, 0x09, 0x44, 0x27,</div><div class='add'>+0x00, 0x8D, 0x00, 0x44, 0x82, 0x50, 0x09, 0x46, 0x24, 0x00, 0x95, 0x00, 0x44,</div><div class='add'>+0x02, 0xD0, 0x09, 0x40, 0x61, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x05, 0x28, 0x25, 0x00, 0xBF, 0x00, 0xCD, 0x82, 0xF0, 0x09, 0xC0, 0x27,</div><div class='add'>+0x00, 0x9F, 0x00, 0xFC, 0x02, 0x30, 0x09, 0xC0, 0x27, 0x00, 0x9F, 0x00, 0x4C,</div><div class='add'>+0x02, 0x30, 0x09, 0xC0, 0x20, 0x08, 0xA3, 0x00, 0x4D, 0x02, 0xF0, 0x09, 0xC0,</div><div class='add'>+0x14, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x00, 0x25,</div><div class='add'>+0x00, 0x9F, 0x00, 0x7C, 0x02, 0xF0, 0x09, 0xC0, 0x27, 0x00, 0x9F, 0x00, 0x7C,</div><div class='add'>+0x02, 0xF0, 0x09, 0xC2, 0x27, 0x00, 0x9F, 0x00, 0x7C, 0x82, 0xF0, 0x09, 0xC0,</div><div class='add'>+0x27, 0x00, 0x9F, 0x00, 0x7C, 0x02, 0xF0, 0x09, 0xC0, 0x53, 0x00, 0x04, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x08, 0x05, 0x02, 0x1F, 0x00, 0x4C,</div><div class='add'>+0x00, 0xF0, 0x01, 0xC0, 0x07, 0x02, 0x1F, 0x00, 0x7C, 0x00, 0x70, 0x01, 0xD0,</div><div class='add'>+0x04, 0x40, 0x13, 0x00, 0x4C, 0x10, 0x30, 0x01, 0xC0, 0x07, 0x40, 0x13, 0x00,</div><div class='add'>+0x7C, 0x04, 0x30, 0x01, 0xC1, 0x50, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x14, 0x20, 0x14, 0x00, 0x5D, 0x20, 0x44, 0x01, 0xD1, 0x05, 0x40,</div><div class='add'>+0x17, 0x10, 0x5D, 0x01, 0x70, 0x01, 0xD0, 0x07, 0x40, 0xDC, 0x00, 0x71, 0x81,</div><div class='add'>+0x94, 0x01, 0x50, 0x16, 0x41, 0x1F, 0x00, 0x51, 0x00, 0xF4, 0x05, 0x11, 0x26,</div><div class='add'>+0x50, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0xA0,</div><div class='add'>+0x62, 0x00, 0xDD, 0x08, 0x04, 0x07, 0xD0, 0x88, 0x48, 0x33, 0x00, 0x8D, 0x80,</div><div class='add'>+0x74, 0x03, 0x50, 0x04, 0x40, 0xA0, 0x06, 0xC9, 0x11, 0x06, 0x01, 0x10, 0x4C,</div><div class='add'>+0x48, 0x33, 0x0C, 0xC1, 0x80, 0x34, 0x05, 0x90, 0x18, 0x44, 0x50, 0x00, 0x0A,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x80, 0x38, 0x00, 0xED, 0x08,</div><div class='add'>+0x84, 0x53, 0xD0, 0x0E, 0x40, 0x3B, 0x00, 0xED, 0x10, 0xB4, 0x43, 0xD0, 0x1F,</div><div class='add'>+0x40, 0x5C, 0x20, 0xF9, 0x50, 0xD4, 0x80, 0x50, 0x0A, 0x40, 0x1F, 0x20, 0xE1,</div><div class='add'>+0x08, 0xF4, 0x47, 0x91, 0x2B, 0x40, 0x10, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x14, 0x10, 0x78, 0x00, 0xFF, 0x05, 0x8C, 0x07, 0xF0, 0x1E,</div><div class='add'>+0xC0, 0x7B, 0x00, 0xEF, 0x01, 0xBC, 0x87, 0x70, 0x1E, 0xC0, 0x48, 0x00, 0xEB,</div><div class='add'>+0x01, 0x8C, 0x07, 0x30, 0x12, 0xC0, 0x7B, 0x00, 0xA3, 0x81, 0xBC, 0x07, 0xB4,</div><div class='add'>+0x1A, 0xC0, 0x50, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10,</div><div class='add'>+0xB8, 0x35, 0x10, 0xDF, 0x00, 0x7C, 0x23, 0xF1, 0x0D, 0xC0, 0x37, 0x00, 0xDF,</div><div class='add'>+0x00, 0x7C, 0x03, 0xF0, 0x0F, 0xC0, 0x06, 0x00, 0xD7, 0x00, 0x78, 0x02, 0xF0,</div><div class='add'>+0x01, 0xC0, 0x37, 0x00, 0x9D, 0x00, 0x3C, 0x03, 0x70, 0x09, 0xC0, 0x43, 0x60,</div><div class='add'>+0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xA8, 0x7F, 0x00, 0xBF,</div><div class='add'>+0x00, 0xFC, 0x06, 0x30, 0x9F, 0xC0, 0x7F, 0x00, 0xE3, 0x01, 0x8C, 0x47, 0x30,</div><div class='add'>+0x17, 0xC0, 0x4F, 0x00, 0x3F, 0x01, 0x9C, 0x04, 0x70, 0x16, 0xC4, 0x5C, 0x00,</div><div class='add'>+0xEF, 0x01, 0xCC, 0x07, 0xF0, 0x1B, 0xC2, 0x0B, 0x00, 0x0E, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x15, 0x98, 0x39, 0x04, 0xAD, 0x0C, 0xB4, 0x02, 0x11,</div><div class='add'>+0x8E, 0x40, 0x3B, 0x10, 0xE1, 0x00, 0x84, 0x23, 0x10, 0x0E, 0x40, 0x0B, 0x10,</div><div class='add'>+0x6D, 0x0A, 0x85, 0x60, 0x55, 0x86, 0xC0, 0x9A, 0x10, 0xED, 0x00, 0x84, 0x03,</div><div class='add'>+0xD0, 0x0A, 0x44, 0x57, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x39, 0x00, 0xAD, 0x08, 0xF4, 0x02, 0x10, 0x8E, 0x40, 0x3F, 0x04,</div><div class='add'>+0xE1, 0x10, 0xE4, 0x03, 0x10, 0x0E, 0x41, 0x0B, 0x00, 0x2D, 0x10, 0x94, 0x00,</div><div class='add'>+0xD0, 0x07, 0x41, 0x3A, 0x00, 0xBD, 0x0A, 0xA4, 0x03, 0xD0, 0x0A, 0x41, 0x23,</div><div class='add'>+0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x20, 0x33, 0x00,</div><div class='add'>+0x8D, 0x03, 0x74, 0x0A, 0x10, 0x5C, 0x40, 0xE3, 0x00, 0xC1, 0x41, 0x24, 0x0E,</div><div class='add'>+0x10, 0x1D, 0x40, 0x83, 0x02, 0x5D, 0x03, 0x04, 0x04, 0xD0, 0x14, 0x40, 0x72,</div><div class='add'>+0x10, 0x9D, 0x01, 0x24, 0x0B, 0xD1, 0x18, 0x40, 0x1B, 0x20, 0x0C, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0xA8, 0x35, 0x00, 0xDF, 0x89, 0x7C, 0x03,</div><div class='add'>+0x30, 0x2D, 0xC0, 0x77, 0x40, 0xD3, 0x01, 0x6C, 0x46, 0x34, 0x19, 0xC0, 0x83,</div><div class='add'>+0x00, 0x5F, 0x41, 0x1C, 0x08, 0xF0, 0xB1, 0xC0, 0x76, 0x04, 0xDF, 0x11, 0x2C,</div><div class='add'>+0x02, 0xF0, 0x1D, 0xC2, 0x77, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x01, 0x00, 0x37, 0x00, 0xDF, 0x08, 0x78, 0x17, 0xF0, 0x8D, 0xC0, 0x37,</div><div class='add'>+0x00, 0xDF, 0x10, 0x5C, 0x02, 0xF0, 0x0D, 0xC1, 0x07, 0x04, 0xDF, 0x00, 0x7C,</div><div class='add'>+0x48, 0x60, 0x01, 0xC4, 0x37, 0x00, 0xDF, 0x00, 0x5C, 0x0F, 0xF0, 0x2D, 0xC1,</div><div class='add'>+0x07, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x08, 0x3F,</div><div class='add'>+0x06, 0xF3, 0x04, 0xFC, 0x0B, 0x30, 0x9F, 0xC8, 0x3F, 0x04, 0xFF, 0x80, 0xCC,</div><div class='add'>+0x56, 0xF0, 0x0F, 0xD0, 0x0C, 0x00, 0x73, 0x10, 0xCC, 0x00, 0xB0, 0x03, 0xC0,</div><div class='add'>+0x2F, 0x04, 0xB2, 0x03, 0xC8, 0x43, 0x30, 0x0F, 0xC0, 0x07, 0x24, 0x0C, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x81, 0x20, 0x72, 0x40, 0x91, 0x01, 0x74,</div><div class='add'>+0x06, 0x10, 0x1D, 0x44, 0x37, 0x08, 0xCD, 0x40, 0x44, 0x06, 0xD0, 0x3D, 0x40,</div><div class='add'>+0x44, 0x30, 0xDF, 0xC0, 0x45, 0x04, 0x10, 0x71, 0x44, 0x63, 0x10, 0xD1, 0x01,</div><div class='add'>+0x44, 0x17, 0xB0, 0x0D, 0x40, 0x27, 0x02, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x01, 0xA0, 0x36, 0x00, 0x91, 0x80, 0x74, 0x02, 0x10, 0x0D, 0x40,</div><div class='add'>+0x37, 0x00, 0xDD, 0x04, 0x44, 0x02, 0xD0, 0x19, 0x41, 0x46, 0x00, 0x11, 0x00,</div><div class='add'>+0x44, 0x0C, 0x9A, 0x15, 0x42, 0x77, 0x00, 0xD5, 0x00, 0x77, 0x07, 0x00, 0x49,</div><div class='add'>+0x41, 0x07, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00,</div><div class='add'>+0x34, 0x00, 0x81, 0x00, 0x34, 0x02, 0x14, 0x0C, 0x40, 0x33, 0x00, 0xDD, 0x00,</div><div class='add'>+0x06, 0x03, 0xD0, 0x0C, 0x40, 0x44, 0x28, 0x45, 0x00, 0x04, 0x00, 0x10, 0x04,</div><div class='add'>+0x40, 0x33, 0x60, 0x85, 0x00, 0x34, 0x03, 0x90, 0x04, 0x40, 0x43, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x36, 0x00, 0xD3, 0x00,</div><div class='add'>+0x7C, 0x03, 0x10, 0x0D, 0xC0, 0x37, 0x20, 0xDF, 0x00, 0x4D, 0x02, 0xF0, 0x0D,</div><div class='add'>+0xC0, 0x04, 0x00, 0x01, 0x80, 0x4C, 0x00, 0xB4, 0x05, 0xC0, 0x27, 0x00, 0x97,</div><div class='add'>+0x00, 0x7C, 0x03, 0x30, 0x09, 0xC0, 0x07, 0x40, 0x08, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x05, 0xB8, 0x3F, 0x00, 0xBF, 0x00, 0xBC, 0x02, 0xF1, 0x0F,</div><div class='add'>+0xC0, 0x2B, 0x10, 0xFF, 0x00, 0xFC, 0x02, 0xF0, 0x0F, 0x80, 0x0F, 0x20, 0x7F,</div><div class='add'>+0x00, 0xFD, 0x00, 0xF0, 0x07, 0xC0, 0x2F, 0x00, 0xBB, 0x40, 0xCC, 0x83, 0xF0,</div><div class='add'>+0x07, 0xC4, 0x17, 0x60, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03,</div><div class='add'>+0xA0, 0x7F, 0x00, 0xEF, 0x01, 0x8C, 0x07, 0x70, 0x1B, 0xD0, 0x28, 0x01, 0xA7,</div><div class='add'>+0x01, 0xFC, 0x32, 0x30, 0x1A, 0xC0, 0x3C, 0x00, 0xB3, 0x14, 0xEC, 0x12, 0x30,</div><div class='add'>+0x8B, 0xC0, 0x3D, 0x0C, 0xBF, 0x08, 0xCC, 0x02, 0xF1, 0x0F, 0xC0, 0x0F, 0x00,</div><div class='add'>+0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x18, 0x77, 0x00, 0x9D,</div><div class='add'>+0x01, 0x44, 0x06, 0x10, 0x11, 0x42, 0x64, 0x00, 0x51, 0x01, 0x44, 0x0A, 0x10,</div><div class='add'>+0x19, 0x40, 0xFC, 0x12, 0x91, 0x02, 0x44, 0x3A, 0x10, 0x49, 0x40, 0xBC, 0x00,</div><div class='add'>+0x9D, 0x00, 0x44, 0x2A, 0xD0, 0x0D, 0x44, 0x0F, 0x60, 0x0C, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x13, 0xA0, 0x31, 0x00, 0xDD, 0x00, 0x44, 0x85, 0x50,</div><div class='add'>+0x04, 0x48, 0x00, 0x82, 0xD5, 0x00, 0x14, 0x18, 0x50, 0x09, 0x40, 0x32, 0x00,</div><div class='add'>+0x85, 0x00, 0x34, 0x40, 0x50, 0x88, 0x42, 0x31, 0x24, 0x09, 0x06, 0x04, 0x00,</div><div class='add'>+0xD0, 0x0C, 0x40, 0x4F, 0x80, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x03, 0xA0, 0x37, 0x00, 0xDD, 0x11, 0x45, 0x05, 0x10, 0x11, 0x44, 0x44, 0x00,</div><div class='add'>+0xD1, 0x03, 0x04, 0x8C, 0x11, 0x89, 0x40, 0x36, 0x80, 0x94, 0x41, 0x14, 0x04,</div><div class='add'>+0x50, 0x19, 0x40, 0x34, 0x00, 0x0D, 0x11, 0x44, 0x0C, 0xD0, 0x0D, 0x20, 0x0F,</div><div class='add'>+0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xA8, 0x37, 0x00,</div><div class='add'>+0xCF, 0x01, 0x0C, 0x04, 0x70, 0x10, 0x40, 0x44, 0x20, 0xC7, 0x03, 0x5C, 0x0E,</div><div class='add'>+0x70, 0x40, 0xD0, 0x32, 0x08, 0x17, 0xA3, 0x7C, 0x96, 0x71, 0x11, 0xC0, 0x35,</div><div class='add'>+0x10, 0x1F, 0x03, 0x4E, 0x0E, 0xF8, 0x0D, 0xC0, 0x0B, 0x20, 0x0E, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x80, 0x3D, 0x00, 0xFF, 0x80, 0xFC, 0x00,</div><div class='add'>+0xF0, 0x03, 0xC0, 0x2B, 0x00, 0x7F, 0x00, 0x7C, 0x02, 0xF2, 0x0B, 0xC0, 0x3D,</div><div class='add'>+0x60, 0x9B, 0x00, 0xEC, 0x02, 0xB0, 0x00, 0xC0, 0x3F, 0x00, 0xBF, 0xA0, 0xFF,</div><div class='add'>+0x02, 0xF0, 0x0D, 0xC0, 0x1F, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x2A, 0x08, 0x35, 0x00, 0xDF, 0x03, 0x4C, 0x01, 0x30, 0x05, 0xC0, 0x07,</div><div class='add'>+0x24, 0xD3, 0x04, 0x5C, 0x02, 0x30, 0x21, 0xC0, 0x36, 0x01, 0x17, 0x00, 0x5C,</div><div class='add'>+0x82, 0xF0, 0x29, 0xC0, 0x76, 0x04, 0x13, 0x02, 0x7C, 0x06, 0x30, 0x0D, 0xC2,</div><div class='add'>+0xA9, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0xA0, 0x34,</div><div class='add'>+0x08, 0xDC, 0x01, 0x46, 0x05, 0x10, 0x41, 0x48, 0x27, 0x00, 0x51, 0x81, 0x44,</div><div class='add'>+0x02, 0x10, 0x19, 0xC4, 0xBE, 0x00, 0x9B, 0x00, 0x44, 0x02, 0xD1, 0x09, 0x48,</div><div class='add'>+0xBC, 0x00, 0x11, 0x80, 0x74, 0x22, 0x10, 0x0F, 0x40, 0x4C, 0x00, 0x02, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x20, 0x32, 0x08, 0xCD, 0x00, 0x06,</div><div class='add'>+0x33, 0x10, 0x04, 0x40, 0x23, 0x02, 0x49, 0x02, 0x14, 0x00, 0x10, 0x2C, 0x51,</div><div class='add'>+0x33, 0x00, 0x14, 0x00, 0x10, 0x00, 0xD0, 0x00, 0x40, 0xB2, 0x00, 0x81, 0x80,</div><div class='add'>+0x34, 0x00, 0x11, 0x0C, 0x48, 0x0F, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x0D, 0x08, 0x7A, 0x00, 0xFD, 0x01, 0x84, 0x07, 0x11, 0x12, 0x40,</div><div class='add'>+0x7B, 0x10, 0x79, 0x11, 0x94, 0x07, 0x10, 0x1F, 0x41, 0x7B, 0x00, 0x6C, 0x01,</div><div class='add'>+0x94, 0x07, 0xD8, 0x1E, 0x40, 0x70, 0x42, 0xE1, 0x01, 0xB4, 0x07, 0x5C, 0x1E,</div><div class='add'>+0x40, 0x37, 0x20, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x10,</div><div class='add'>+0x32, 0x00, 0xCF, 0x00, 0x04, 0x21, 0x12, 0x84, 0xC0, 0x33, 0x01, 0xCB, 0x00,</div><div class='add'>+0x1C, 0x21, 0x30, 0x4C, 0xC0, 0x33, 0x00, 0xC7, 0xE8, 0x1C, 0x81, 0xF0, 0x24,</div><div class='add'>+0xC0, 0x32, 0x02, 0xC3, 0x00, 0x7C, 0x11, 0x30, 0x0C, 0xC0, 0x4B, 0x40, 0x08,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xA8, 0x3D, 0x00, 0xFF, 0x00,</div><div class='add'>+0xFC, 0x81, 0xF0, 0x83, 0xC0, 0x3F, 0x00, 0xF7, 0x00, 0xEC, 0x03, 0xF0, 0x0F,</div><div class='add'>+0xCC, 0x3A, 0x00, 0xFB, 0x00, 0xEC, 0x03, 0xF0, 0x0F, 0xC0, 0xBF, 0x02, 0xFF,</div><div class='add'>+0x48, 0xFC, 0x01, 0xB0, 0x0F, 0xC0, 0x08, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x10, 0xA2, 0x37, 0x20, 0xDF, 0x00, 0x4C, 0x03, 0xF0, 0x05,</div><div class='add'>+0xC2, 0x13, 0x00, 0x57, 0x00, 0x7C, 0x01, 0xF0, 0x1D, 0xC0, 0x36, 0x00, 0x5F,</div><div class='add'>+0x40, 0x7C, 0x01, 0x70, 0x15, 0xC0, 0x34, 0x01, 0x53, 0x01, 0x4D, 0x01, 0x10,</div><div class='add'>+0x0D, 0xC4, 0x43, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13,</div><div class='add'>+0x98, 0x39, 0x08, 0xED, 0x00, 0x84, 0x01, 0xD0, 0x02, 0x40, 0x3B, 0x00, 0x61,</div><div class='add'>+0x00, 0xB4, 0x03, 0xD0, 0x0E, 0x40, 0x3A, 0x04, 0xED, 0x00, 0xB4, 0x03, 0xD0,</div><div class='add'>+0x07, 0x50, 0xBC, 0x00, 0xF1, 0x00, 0xC4, 0x03, 0x10, 0x4E, 0x40, 0x4F, 0x60,</div><div class='add'>+0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x79, 0x00, 0xFD,</div><div class='add'>+0x11, 0xA6, 0x05, 0xD0, 0x16, 0x40, 0x5B, 0x04, 0x65, 0x01, 0xB4, 0x05, 0xD0,</div><div class='add'>+0x0A, 0x50, 0x7A, 0x93, 0x6D, 0x01, 0xB4, 0x05, 0x50, 0x1E, 0x40, 0x78, 0x41,</div><div class='add'>+0xE5, 0x03, 0x84, 0x07, 0x10, 0x9E, 0x40, 0x13, 0x00, 0x04, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x16, 0x20, 0x33, 0x00, 0x4D, 0x12, 0x06, 0xBD, 0xD0,</div><div class='add'>+0x20, 0x40, 0x33, 0x00, 0x41, 0x01, 0x74, 0x47, 0xD0, 0xEC, 0x40, 0x32, 0x80,</div><div class='add'>+0xCD, 0x0A, 0x34, 0x2B, 0xD0, 0x0C, 0x40, 0x34, 0x00, 0xC5, 0x00, 0x04, 0x8B,</div><div class='add'>+0x10, 0x0C, 0x40, 0x5B, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x17, 0xA8, 0x17, 0x00, 0x6F, 0x02, 0xEC, 0x09, 0xF2, 0x07, 0xC0, 0x1B, 0x0A,</div><div class='add'>+0x77, 0x07, 0xFC, 0x15, 0xF0, 0x06, 0xC0, 0x16, 0x00, 0x7F, 0x21, 0xF4, 0x2D,</div><div class='add'>+0x78, 0x87, 0xC1, 0x14, 0x00, 0x77, 0x00, 0xCC, 0x39, 0x30, 0x05, 0xC0, 0x5F,</div><div class='add'>+0x20, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x80, 0x05, 0x00,</div><div class='add'>+0x1F, 0x82, 0x7D, 0x00, 0xF3, 0x01, 0x01, 0x07, 0x00, 0x1F, 0x10, 0x7C, 0x00,</div><div class='add'>+0xC0, 0x21, 0xC0, 0x05, 0x20, 0x1F, 0x10, 0x7C, 0x00, 0xF0, 0x01, 0xC0, 0x07,</div><div class='add'>+0x00, 0x19, 0x04, 0x7C, 0x08, 0xF4, 0x01, 0xC0, 0x4B, 0x00, 0x06, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x08, 0x25, 0x00, 0x9F, 0x04, 0x5C, 0x0E,</div><div class='add'>+0xF0, 0x49, 0xC4, 0x24, 0x08, 0x9B, 0x00, 0x4D, 0x02, 0x30, 0x99, 0x02, 0x67,</div><div class='add'>+0x01, 0x9F, 0x00, 0x7C, 0x02, 0xF0, 0x09, 0xC0, 0x27, 0x10, 0x97, 0x80, 0x3C,</div><div class='add'>+0x0E, 0x70, 0x49, 0xC0, 0x43, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x01, 0x20, 0x26, 0x00, 0x9D, 0x00, 0x44, 0x1A, 0xD0, 0x78, 0x44, 0x24,</div><div class='add'>+0x10, 0x81, 0x00, 0x44, 0x02, 0x10, 0x29, 0x44, 0xA4, 0x08, 0x9D, 0x00, 0x74,</div><div class='add'>+0x82, 0xD1, 0x09, 0x40, 0x67, 0x00, 0x91, 0x80, 0x74, 0x06, 0x10, 0x09, 0x40,</div><div class='add'>+0x07, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xA0, 0x24,</div><div class='add'>+0x00, 0x9D, 0x00, 0x54, 0x02, 0xD0, 0x0D, 0x44, 0x34, 0x20, 0x99, 0x08, 0x44,</div><div class='add'>+0x02, 0x10, 0x09, 0x60, 0x27, 0x04, 0xDD, 0x00, 0x74, 0x02, 0xD0, 0x09, 0x40,</div><div class='add'>+0x27, 0x01, 0x95, 0x00, 0x74, 0x42, 0x50, 0x09, 0x40, 0x73, 0x00, 0x02, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x28, 0x20, 0x00, 0xCD, 0x00, 0x04,</div><div class='add'>+0x02, 0xD0, 0x09, 0x48, 0x20, 0x05, 0x81, 0x00, 0x04, 0x52, 0x10, 0x0C, 0x40,</div><div class='add'>+0x21, 0x15, 0x8D, 0x14, 0x34, 0x52, 0xD0, 0x48, 0x41, 0x33, 0x05, 0x81, 0x14,</div><div class='add'>+0x34, 0x52, 0x10, 0x48, 0x40, 0x53, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x1D, 0xB0, 0x06, 0x00, 0x1F, 0x00, 0x5C, 0x00, 0xF0, 0x01, 0xC0,</div><div class='add'>+0x04, 0x01, 0x1B, 0x00, 0x4C, 0x10, 0x34, 0x01, 0xC0, 0x07, 0x21, 0x1F, 0x06,</div><div class='add'>+0x7C, 0x10, 0xF0, 0x41, 0xC8, 0x07, 0x01, 0x17, 0x04, 0x7C, 0x10, 0x70, 0x01,</div><div class='add'>+0xC4, 0x77, 0xC0, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x19, 0xA0,</div><div class='add'>+0x27, 0x00, 0xAF, 0x00, 0xFC, 0x02, 0xF2, 0x0B, 0xD0, 0x2F, 0x00, 0xBF, 0x00,</div><div class='add'>+0xFC, 0x52, 0xF0, 0x0A, 0xC0, 0x26, 0x00, 0xBF, 0x10, 0xFC, 0x52, 0xF0, 0x4B,</div><div class='add'>+0xC1, 0x27, 0x05, 0xBF, 0x14, 0xFC, 0x52, 0xF0, 0x69, 0xC3, 0x67, 0x20, 0x0E,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x80, 0x25, 0x00, 0xBF, 0x00,</div><div class='add'>+0xCC, 0x02, 0xF0, 0x0B, 0xC0, 0x6F, 0x60, 0xB3, 0x00, 0x7C, 0x26, 0xF0, 0x0A,</div><div class='add'>+0xC0, 0x2D, 0x00, 0x93, 0x02, 0x7C, 0x52, 0x30, 0x39, 0xC1, 0xAF, 0x00, 0x9F,</div><div class='add'>+0x09, 0xCC, 0x06, 0xF0, 0x5B, 0xE0, 0x63, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x1C, 0x18, 0x07, 0x00, 0x5D, 0x00, 0x44, 0x00, 0xD0, 0x01,</div><div class='add'>+0x40, 0x07, 0x00, 0x11, 0x00, 0x74, 0x2C, 0xD0, 0x01, 0x40, 0x04, 0x00, 0x11,</div><div class='add'>+0x01, 0x74, 0x18, 0x10, 0x21, 0x40, 0x47, 0x09, 0x1D, 0x0B, 0x44, 0x00, 0xD0,</div><div class='add'>+0x01, 0x40, 0x73, 0x60, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12,</div><div class='add'>+0x20, 0x21, 0x00, 0x8D, 0x00, 0x04, 0x02, 0xD0, 0x08, 0x40, 0xA3, 0x00, 0x85,</div><div class='add'>+0x01, 0x34, 0x12, 0xD0, 0x09, 0x40, 0xA3, 0x80, 0x81, 0x26, 0x34, 0x42, 0x14,</div><div class='add'>+0x08, 0x40, 0xA3, 0x00, 0x8D, 0x04, 0x04, 0x0A, 0xD0, 0x68, 0x41, 0x4B, 0x00,</div><div class='add'>+0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x20, 0x25, 0x00, 0x9D,</div><div class='add'>+0x00, 0x46, 0x06, 0xD3, 0x19, 0x40, 0x27, 0x04, 0x95, 0x04, 0x76, 0x12, 0xD2,</div><div class='add'>+0x49, 0x40, 0x24, 0xC0, 0x91, 0x02, 0x74, 0x82, 0x00, 0x09, 0x41, 0x27, 0x00,</div><div class='add'>+0x9D, 0x02, 0x44, 0x02, 0xD2, 0x09, 0x48, 0x63, 0x00, 0x04, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x05, 0xA8, 0x27, 0x00, 0x8F, 0x02, 0x44, 0x16, 0xF2,</div><div class='add'>+0x39, 0xC1, 0xA7, 0x00, 0x97, 0x02, 0x7C, 0x16, 0xF2, 0x09, 0xC0, 0x25, 0x00,</div><div class='add'>+0x93, 0xC2, 0x7C, 0x12, 0x30, 0x09, 0xC0, 0x27, 0x00, 0x9F, 0x09, 0x4D, 0x6E,</div><div class='add'>+0xD8, 0x09, 0x48, 0x17, 0x28, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x12, 0x80, 0x25, 0x00, 0x9F, 0x02, 0x7D, 0x02, 0xF0, 0x09, 0xC0, 0x63, 0x02,</div><div class='add'>+0x9B, 0xA0, 0x7C, 0x02, 0xF1, 0x19, 0xC0, 0x27, 0x20, 0x9F, 0x05, 0x7C, 0x16,</div><div class='add'>+0xF0, 0x59, 0xC0, 0x27, 0x00, 0x8F, 0x01, 0x7C, 0x46, 0xF0, 0x09, 0xC0, 0x4B,</div><div class='add'>+0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x08, 0x05, 0x00,</div><div class='add'>+0x1F, 0x04, 0x6C, 0x08, 0xF0, 0x01, 0xC0, 0x87, 0x00, 0x1F, 0x00, 0x7C, 0x08,</div><div class='add'>+0xF0, 0x01, 0xD0, 0x00, 0x00, 0x17, 0x00, 0x7C, 0x08, 0xF0, 0x21, 0xC2, 0x04,</div><div class='add'>+0x04, 0x1F, 0x02, 0x4C, 0x08, 0x30, 0x01, 0xC0, 0x40, 0x20, 0x04, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0xA0, 0x14, 0x00, 0x7D, 0x02, 0xC4, 0x45,</div><div class='add'>+0xC2, 0x07, 0x00, 0x1F, 0x20, 0x7D, 0x21, 0x7C, 0x01, 0xD0, 0x16, 0x58, 0x1C,</div><div class='add'>+0x00, 0x5D, 0x00, 0x74, 0x01, 0xD1, 0x05, 0xC0, 0x1E, 0x04, 0x5D, 0x00, 0xC4,</div><div class='add'>+0x89, 0x10, 0x05, 0x50, 0x50, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x14, 0xA0, 0x32, 0x00, 0x8D, 0x8B, 0x24, 0x06, 0xC8, 0xCC, 0x00, 0x53,</div><div class='add'>+0x04, 0x0C, 0x05, 0x34, 0x03, 0xD1, 0xD4, 0x40, 0x40, 0x00, 0xC5, 0x00, 0x74,</div><div class='add'>+0x03, 0xD0, 0x0C, 0x60, 0x72, 0x00, 0xCD, 0x00, 0x04, 0x0B, 0x15, 0x8C, 0x40,</div><div class='add'>+0x50, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x80, 0x38,</div><div class='add'>+0x00, 0xAD, 0x00, 0x84, 0x02, 0xD0, 0x0A, 0x40, 0xBB, 0x80, 0x2D, 0x82, 0x94,</div><div class='add'>+0x03, 0xD0, 0x07, 0x40, 0x88, 0x00, 0xED, 0x24, 0xB4, 0x23, 0xD0, 0x1F, 0x40,</div><div class='add'>+0x3A, 0x00, 0xFD, 0x80, 0x04, 0x07, 0x12, 0x1E, 0x40, 0x04, 0x20, 0x02, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x10, 0x79, 0x00, 0xAF, 0x01, 0xAC,</div><div class='add'>+0x06, 0xF0, 0x1A, 0xC8, 0x5B, 0x00, 0x2F, 0x01, 0xB0, 0x07, 0xF0, 0x12, 0xCA,</div><div class='add'>+0x78, 0x00, 0xE7, 0xA3, 0xBC, 0x87, 0xF0, 0x7F, 0xC4, 0x5A, 0x00, 0xFF, 0x0F,</div><div class='add'>+0x89, 0x07, 0x32, 0x1F, 0xC0, 0x44, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x10, 0xB8, 0x35, 0x00, 0x8F, 0x00, 0x5C, 0x00, 0xF0, 0x09, 0xC0,</div><div class='add'>+0x37, 0x00, 0x1F, 0x80, 0x7C, 0x03, 0xF0, 0x05, 0xC0, 0x17, 0x10, 0xDF, 0x00,</div><div class='add'>+0x7C, 0x0B, 0xF0, 0x2D, 0xC4, 0x37, 0x00, 0xDF, 0xA4, 0x7C, 0x02, 0xF0, 0x0D,</div><div class='add'>+0xC0, 0x43, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20,</div><div class='add'>+0x7D, 0x00, 0xBF, 0x01, 0xCC, 0x26, 0xF0, 0x9B, 0xC0, 0x6F, 0x02, 0x33, 0x09,</div><div class='add'>+0xDC, 0xEF, 0x73, 0x17, 0xC8, 0x5C, 0x22, 0xFD, 0x09, 0xFC, 0x0F, 0xF1, 0x3F,</div><div class='add'>+0xC0, 0x7F, 0x02, 0xF7, 0x81, 0xDC, 0x05, 0x10, 0x9B, 0xC0, 0x00, 0x00, 0x04,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x18, 0x39, 0x00, 0xAD, 0x48,</div><div class='add'>+0x85, 0x22, 0xD0, 0x0A, 0x00, 0x3B, 0x00, 0x21, 0xC0, 0x84, 0xE3, 0x10, 0x86,</div><div class='add'>+0x41, 0x98, 0x00, 0xED, 0x18, 0xB4, 0x03, 0xD0, 0x0E, 0x40, 0x3B, 0x00, 0xE1,</div><div class='add'>+0x00, 0xF4, 0x11, 0x12, 0xCB, 0x40, 0x55, 0x60, 0x04, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x39, 0x00, 0x2D, 0x10, 0x84, 0x2A, 0xD8, 0x0A,</div><div class='add'>+0x61, 0x2B, 0x60, 0x31, 0x50, 0x94, 0x23, 0x51, 0x06, 0x50, 0x3A, 0x98, 0xED,</div><div class='add'>+0x08, 0xB4, 0x23, 0xD0, 0x0E, 0x41, 0x1B, 0x00, 0xE1, 0x00, 0x94, 0x43, 0x99,</div><div class='add'>+0x0F, 0x44, 0x01, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04,</div><div class='add'>+0x20, 0x31, 0x00, 0x0D, 0x47, 0x04, 0x00, 0xD8, 0x58, 0x40, 0xB3, 0x02, 0x01,</div><div class='add'>+0x53, 0x04, 0x07, 0x58, 0x34, 0x40, 0x12, 0x80, 0xCD, 0x41, 0x24, 0x33, 0xD0,</div><div class='add'>+0x3C, 0x40, 0x23, 0x50, 0xC1, 0x42, 0x34, 0x46, 0x98, 0x0C, 0x40, 0x11, 0x00,</div><div class='add'>+0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0xA8, 0x35, 0x10, 0x9D,</div><div class='add'>+0x00, 0x4C, 0x02, 0xD0, 0x19, 0xC0, 0x93, 0x40, 0x13, 0x01, 0xDC, 0x0B, 0x70,</div><div class='add'>+0x05, 0xC0, 0x06, 0x00, 0xFF, 0x03, 0xFC, 0x0B, 0xF8, 0x3F, 0xC4, 0x27, 0x00,</div><div class='add'>+0xF3, 0x0F, 0x5C, 0x02, 0xB4, 0x0D, 0x40, 0x55, 0x20, 0x06, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x36, 0x00, 0xDF, 0x00, 0x7C, 0x22, 0xF0,</div><div class='add'>+0x09, 0xC0, 0x37, 0x01, 0x9F, 0x00, 0x7C, 0x13, 0x90, 0x45, 0xC0, 0x05, 0x00,</div><div class='add'>+0xDF, 0x10, 0x74, 0x03, 0xF0, 0x4D, 0xC0, 0x87, 0x00, 0xDF, 0x00, 0x7C, 0x00,</div><div class='add'>+0x70, 0x0D, 0x88, 0x07, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x84, 0x08, 0x3E, 0x00, 0xBF, 0x00, 0xFC, 0x02, 0xC0, 0x03, 0xC8, 0x1F, 0x00,</div><div class='add'>+0x3B, 0x02, 0x7C, 0x03, 0xF0, 0x07, 0xC0, 0x18, 0x00, 0xFA, 0x00, 0xAC, 0x03,</div><div class='add'>+0xB0, 0x0F, 0xC8, 0x06, 0x10, 0xEF, 0x00, 0xDC, 0x02, 0xF0, 0x0F, 0x80, 0x13,</div><div class='add'>+0x22, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x85, 0x20, 0x36, 0x00,</div><div class='add'>+0x9D, 0x01, 0x74, 0x05, 0xD0, 0x11, 0x40, 0x37, 0x00, 0xD1, 0x83, 0x74, 0x03,</div><div class='add'>+0xD0, 0x14, 0x40, 0x94, 0x00, 0xD1, 0x00, 0x74, 0x03, 0x10, 0x0D, 0x40, 0xC4,</div><div class='add'>+0x04, 0xDD, 0x00, 0x44, 0x1C, 0xD2, 0x0D, 0x42, 0x17, 0x00, 0x08, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xA0, 0x34, 0x00, 0x9D, 0x01, 0x74, 0x06,</div><div class='add'>+0xD0, 0x69, 0x40, 0x27, 0x00, 0x19, 0x10, 0x74, 0x03, 0xD0, 0x35, 0x60, 0x14,</div><div class='add'>+0x00, 0xD5, 0x00, 0x64, 0x03, 0xD0, 0x0C, 0x60, 0x65, 0x00, 0xDD, 0x20, 0x54,</div><div class='add'>+0x04, 0xD8, 0x09, 0x40, 0x07, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x10, 0x28, 0x30, 0x00, 0x8D, 0x00, 0x34, 0x02, 0xD0, 0x08, 0x40, 0x33,</div><div class='add'>+0x00, 0x00, 0x20, 0x34, 0x83, 0xD0, 0x05, 0x40, 0x10, 0x00, 0xC5, 0x00, 0x34,</div><div class='add'>+0x03, 0x10, 0x0C, 0x60, 0x20, 0x00, 0xCD, 0x00, 0x06, 0x00, 0xD8, 0x08, 0x40,</div><div class='add'>+0x43, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xB0, 0x36,</div><div class='add'>+0x00, 0x1F, 0x00, 0x7C, 0x02, 0xF0, 0x09, 0xC0, 0x27, 0x00, 0x1B, 0x20, 0xFC,</div><div class='add'>+0x03, 0xF2, 0x05, 0xD0, 0x14, 0x10, 0xD7, 0x00, 0xEC, 0x03, 0xB0, 0x0F, 0xC0,</div><div class='add'>+0x04, 0x10, 0xFF, 0x20, 0x5C, 0x02, 0xF0, 0x0D, 0xC8, 0x03, 0xC0, 0x0A, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x85, 0xA8, 0x3F, 0x00, 0x2F, 0x00, 0xFC,</div><div class='add'>+0x80, 0xF1, 0x0B, 0xC0, 0x3B, 0x00, 0x2F, 0x00, 0xFC, 0x03, 0xF0, 0x0E, 0xC0,</div><div class='add'>+0x1F, 0x20, 0xFB, 0x00, 0xFC, 0x03, 0xF0, 0x0F, 0xC0, 0x2F, 0x20, 0xFF, 0x00,</div><div class='add'>+0xFC, 0x00, 0xF0, 0x0F, 0xE0, 0x17, 0x21, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x03, 0xA0, 0x5F, 0x40, 0xB3, 0x00, 0xFC, 0x12, 0xF0, 0x17, 0xC0,</div><div class='add'>+0x7F, 0x00, 0x73, 0x81, 0xFC, 0x10, 0xF1, 0xC3, 0xC0, 0x2C, 0x02, 0x33, 0x81,</div><div class='add'>+0xCC, 0x23, 0x30, 0x0F, 0xC0, 0x48, 0x10, 0xBF, 0x20, 0xFC, 0x05, 0x30, 0x1F,</div><div class='add'>+0xC0, 0x0C, 0x20, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x08,</div><div class='add'>+0x77, 0x08, 0x91, 0x4B, 0x74, 0x2E, 0xD2, 0x19, 0x00, 0x7F, 0x00, 0x51, 0x01,</div><div class='add'>+0x74, 0x2C, 0xD0, 0xE1, 0x40, 0xA4, 0x01, 0x11, 0x01, 0xC4, 0x1B, 0x51, 0xBB,</div><div class='add'>+0x48, 0x64, 0x00, 0x8D, 0x4E, 0x74, 0x07, 0x10, 0x0F, 0x48, 0x04, 0x60, 0x0C,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0xA0, 0x23, 0x00, 0x81, 0x40,</div><div class='add'>+0x34, 0x02, 0xD0, 0x0C, 0x40, 0x33, 0x00, 0x81, 0x00, 0x34, 0x00, 0xD0, 0x09,</div><div class='add'>+0x40, 0xA0, 0x80, 0x15, 0x00, 0x04, 0x1B, 0x10, 0x0C, 0x40, 0x00, 0x00, 0x8D,</div><div class='add'>+0x10, 0x34, 0x82, 0x10, 0x0C, 0x40, 0x44, 0x80, 0x0E, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x03, 0xA8, 0x25, 0x20, 0xD1, 0x00, 0x74, 0x02, 0xD0, 0x0D,</div><div class='add'>+0x40, 0x37, 0x00, 0x91, 0x82, 0x74, 0x04, 0xD0, 0x09, 0x48, 0x25, 0x84, 0x11,</div><div class='add'>+0x01, 0x45, 0x07, 0x53, 0x89, 0x40, 0x64, 0x00, 0x9D, 0x40, 0x34, 0x43, 0x10,</div><div class='add'>+0x0D, 0x40, 0x0C, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,</div><div class='add'>+0x88, 0x23, 0x00, 0xD3, 0x08, 0x7C, 0x02, 0xF0, 0x0D, 0x44, 0x33, 0x40, 0xD3,</div><div class='add'>+0x00, 0x7C, 0x0C, 0xF0, 0x88, 0xC0, 0x64, 0x40, 0x13, 0x81, 0x4C, 0x05, 0x30,</div><div class='add'>+0x1D, 0x90, 0x44, 0x00, 0x9E, 0x40, 0x7C, 0x2D, 0x34, 0x0D, 0xC0, 0x00, 0x20,</div><div class='add'>+0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x80, 0xAD, 0x00, 0xBF,</div><div class='add'>+0x81, 0xFC, 0x13, 0xD0, 0x4B, 0x48, 0x3F, 0x00, 0xFF, 0x09, 0x7C, 0x00, 0xF0,</div><div class='add'>+0x1B, 0xC0, 0x6E, 0x2A, 0x3E, 0x10, 0xBC, 0x83, 0xF0, 0x09, 0xC4, 0x2F, 0x28,</div><div class='add'>+0xBF, 0x00, 0xF4, 0x03, 0xF1, 0x0F, 0xC0, 0x1F, 0x00, 0x06, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x02, 0x08, 0x25, 0x02, 0xD3, 0x00, 0x7C, 0x03, 0xF0,</div><div class='add'>+0x0D, 0xC0, 0x37, 0x02, 0x93, 0x02, 0x7C, 0x00, 0x34, 0x09, 0xE0, 0x24, 0x20,</div><div class='add'>+0x1B, 0x01, 0x7C, 0x03, 0x30, 0x0D, 0xC8, 0x04, 0x44, 0xD3, 0x00, 0x4C, 0x02,</div><div class='add'>+0xF0, 0x0D, 0xC5, 0x08, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x13, 0xA0, 0x24, 0x00, 0xD1, 0x00, 0x74, 0x03, 0xD0, 0x0D, 0xC0, 0x35, 0x02,</div><div class='add'>+0x95, 0x00, 0x74, 0x04, 0x10, 0x0B, 0x42, 0x64, 0x04, 0x01, 0x03, 0x5C, 0xAF,</div><div class='add'>+0x51, 0x18, 0xC0, 0xE6, 0x18, 0xD1, 0x01, 0x6C, 0x03, 0xD0, 0x6D, 0x40, 0x4C,</div><div class='add'>+0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xA0, 0x12, 0x04,</div><div class='add'>+0x81, 0x00, 0x34, 0x03, 0xD0, 0x00, 0x40, 0x33, 0x00, 0x81, 0x00, 0x34, 0x10,</div><div class='add'>+0x12, 0x00, 0x01, 0x64, 0x88, 0x09, 0x00, 0x34, 0x0F, 0x51, 0xBC, 0x41, 0x81,</div><div class='add'>+0x10, 0x85, 0x11, 0x04, 0x82, 0xD2, 0x2D, 0x42, 0x1C, 0x00, 0x0A, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x80, 0x78, 0x82, 0xA1, 0x21, 0xB4, 0x16,</div><div class='add'>+0xD0, 0x1A, 0x40, 0x73, 0x08, 0xA5, 0x01, 0xB4, 0x04, 0x18, 0x92, 0x40, 0x68,</div><div class='add'>+0x08, 0x29, 0x01, 0x14, 0x27, 0x52, 0x1E, 0x64, 0x6F, 0x00, 0xA5, 0x29, 0xA4,</div><div class='add'>+0x06, 0xD0, 0x1E, 0x40, 0x18, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x12, 0x10, 0x20, 0x00, 0xC3, 0x08, 0x3C, 0x02, 0xF0, 0x08, 0x42, 0x33,</div><div class='add'>+0x02, 0x83, 0x00, 0x34, 0x48, 0x30, 0x08, 0x40, 0x20, 0x01, 0x0B, 0x00, 0x3C,</div><div class='add'>+0x43, 0x70, 0x0C, 0xC0, 0x01, 0x04, 0x87, 0x50, 0x0A, 0x02, 0xF0, 0x0D, 0xC0,</div><div class='add'>+0x48, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xB8, 0x29,</div><div class='add'>+0x40, 0xFF, 0x08, 0xFC, 0x12, 0xF0, 0x0B, 0xC0, 0x7D, 0x08, 0xBF, 0x00, 0xFC,</div><div class='add'>+0x00, 0xD0, 0x0E, 0x52, 0x2B, 0x00, 0x37, 0x00, 0xFC, 0x0B, 0xF0, 0x0F, 0xE0,</div><div class='add'>+0x3E, 0x10, 0x9B, 0x00, 0xFC, 0x22, 0xF0, 0x1F, 0xC0, 0x0B, 0x60, 0x06, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0xA0, 0x77, 0x00, 0x93, 0x00, 0x7C,</div><div class='add'>+0x23, 0x30, 0x09, 0xC0, 0x37, 0x00, 0xDF, 0x80, 0xFC, 0x00, 0xF0, 0x09, 0xC0,</div><div class='add'>+0x06, 0x10, 0x93, 0x80, 0x3C, 0x08, 0x34, 0x4D, 0xE1, 0x07, 0x08, 0x9F, 0x01,</div><div class='add'>+0x4C, 0x02, 0xF0, 0x0D, 0xD0, 0x54, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x12, 0x88, 0x39, 0x00, 0xA1, 0x04, 0xB4, 0x13, 0x10, 0x0A, 0x40,</div><div class='add'>+0xBB, 0x28, 0xEC, 0x20, 0xB4, 0x82, 0xD0, 0x6E, 0x48, 0x08, 0x00, 0xA1, 0x00,</div><div class='add'>+0xB4, 0x02, 0x50, 0x0E, 0x4A, 0x3B, 0x00, 0xBD, 0x40, 0xBC, 0x02, 0xD0, 0x4E,</div><div class='add'>+0x40, 0x48, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00,</div><div class='add'>+0xED, 0x00, 0xE9, 0x09, 0x34, 0x0F, 0x10, 0x1A, 0x40, 0x7B, 0x01, 0xAD, 0x01,</div><div class='add'>+0xB4, 0x04, 0xD0, 0x18, 0x40, 0x48, 0x00, 0xA1, 0x01, 0xB4, 0x07, 0x90, 0x1E,</div><div class='add'>+0x40, 0x6B, 0x10, 0xED, 0x01, 0xA4, 0x06, 0xD0, 0x9E, 0x50, 0x0C, 0x00, 0x04,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x28, 0xE3, 0x00, 0xC9, 0x88,</div><div class='add'>+0x34, 0x07, 0x10, 0x28, 0x41, 0x33, 0x00, 0x8D, 0x23, 0x34, 0x07, 0xD0, 0x0D,</div><div class='add'>+0x40, 0x14, 0x02, 0xC1, 0x01, 0x34, 0xCB, 0xD0, 0x0C, 0x40, 0x73, 0x04, 0xCD,</div><div class='add'>+0x00, 0x34, 0x02, 0xD0, 0x0D, 0x50, 0x48, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x17, 0xA8, 0xDD, 0x20, 0x5B, 0x21, 0x7C, 0x05, 0x34, 0x07,</div><div class='add'>+0xC0, 0x17, 0x00, 0x7F, 0x03, 0xFC, 0x01, 0xF1, 0x07, 0xC0, 0x5C, 0x40, 0x73,</div><div class='add'>+0x05, 0xBC, 0x1D, 0xB0, 0x05, 0xC4, 0xDF, 0x21, 0x5F, 0x00, 0xEC, 0x01, 0xF0,</div><div class='add'>+0x05, 0xC0, 0x5C, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12,</div><div class='add'>+0x00, 0x87, 0x41, 0x17, 0x00, 0x7C, 0x00, 0xF0, 0x01, 0xC0, 0x07, 0x00, 0x1F,</div><div class='add'>+0x08, 0x6C, 0x30, 0xF0, 0x31, 0xD0, 0x45, 0x00, 0x1F, 0x01, 0x7C, 0x00, 0x70,</div><div class='add'>+0x21, 0xC0, 0x87, 0x10, 0x1F, 0x00, 0x7E, 0x00, 0xF0, 0x21, 0xC8, 0x4B, 0x00,</div><div class='add'>+0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x08, 0x27, 0x00, 0x8F,</div><div class='add'>+0x80, 0x4C, 0x02, 0x34, 0x09, 0xC0, 0x24, 0x00, 0x9F, 0x10, 0x4C, 0x02, 0xF0,</div><div class='add'>+0x09, 0xC0, 0x66, 0x01, 0x9B, 0x01, 0x4C, 0x02, 0xB0, 0x19, 0xC0, 0x27, 0x00,</div><div class='add'>+0x9F, 0x04, 0x7C, 0x82, 0x30, 0x09, 0xC0, 0x40, 0x20, 0x0C, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x26, 0x01, 0xBD, 0x00, 0x85, 0x02, 0x10,</div><div class='add'>+0x08, 0xC0, 0x2C, 0x00, 0x9D, 0x00, 0x54, 0x0A, 0xD2, 0x29, 0x40, 0xE4, 0x20,</div><div class='add'>+0x81, 0x4F, 0x54, 0x02, 0xB0, 0xD9, 0x46, 0xA7, 0x1E, 0x9D, 0x00, 0x34, 0x02,</div><div class='add'>+0x10, 0x6B, 0x40, 0x04, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x18, 0xA0, 0x24, 0x80, 0x9D, 0x00, 0x44, 0x62, 0x10, 0x09, 0x40, 0x24, 0x00,</div><div class='add'>+0x8D, 0x00, 0x40, 0x2A, 0xD0, 0x19, 0x60, 0x26, 0x00, 0xD1, 0x20, 0x44, 0x2A,</div><div class='add'>+0x80, 0x09, 0x20, 0x37, 0x00, 0x9D, 0x00, 0x74, 0x02, 0x10, 0x09, 0x40, 0x60,</div><div class='add'>+0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x20, 0x20, 0x10,</div><div class='add'>+0x8D, 0x02, 0x04, 0x02, 0x10, 0x29, 0x40, 0x20, 0x00, 0x8D, 0x02, 0x14, 0x52,</div><div class='add'>+0xD0, 0x48, 0x41, 0x20, 0x0D, 0x91, 0x20, 0x54, 0x52, 0x98, 0x48, 0x49, 0x23,</div><div class='add'>+0x00, 0x8D, 0x95, 0x76, 0x0A, 0x10, 0x08, 0x40, 0x40, 0x80, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xB0, 0x06, 0x00, 0x1F, 0x01, 0x4C, 0x84,</div><div class='add'>+0x30, 0x01, 0xD0, 0x44, 0x00, 0x1D, 0x00, 0x4C, 0x10, 0xF0, 0x45, 0xD0, 0x12,</div><div class='add'>+0x01, 0x13, 0x00, 0x4C, 0x90, 0xB0, 0x41, 0xC0, 0x07, 0x00, 0x1F, 0x24, 0x7C,</div><div class='add'>+0x00, 0x34, 0x10, 0xD0, 0x74, 0xC0, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x19, 0xB8, 0x3B, 0x10, 0xBF, 0x03, 0xFC, 0x0A, 0xC0, 0x1F, 0xC0, 0xA5,</div><div class='add'>+0x00, 0xFF, 0x01, 0xFC, 0x02, 0xF0, 0x4B, 0xC3, 0x2F, 0x45, 0xBF, 0x00, 0xFC,</div><div class='add'>+0x52, 0x80, 0x0B, 0xC0, 0x2F, 0x00, 0xBF, 0x14, 0xFC, 0x06, 0xF0, 0x69, 0xC1,</div><div class='add'>+0x67, 0x60, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0xA0, 0x2F,</div><div class='add'>+0x00, 0x9F, 0x07, 0xCC, 0x86, 0x34, 0x29, 0xC0, 0x6C, 0x04, 0x8F, 0x00, 0xFC,</div><div class='add'>+0x06, 0xF0, 0x5F, 0xC0, 0x6C, 0x05, 0xBB, 0x40, 0xCC, 0x06, 0x30, 0x1B, 0xC2,</div><div class='add'>+0x2C, 0x08, 0xF3, 0x05, 0x4C, 0x0A, 0xF0, 0x7B, 0xC0, 0x64, 0x00, 0x0E, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1C, 0x08, 0x07, 0x00, 0x1D, 0x01, 0x44,</div><div class='add'>+0x80, 0x10, 0x11, 0x50, 0x84, 0x00, 0x1D, 0x21, 0x74, 0x20, 0xD0, 0x50, 0xC1,</div><div class='add'>+0x42, 0x01, 0x11, 0x00, 0x44, 0x6D, 0x50, 0x01, 0x50, 0x04, 0x00, 0x01, 0x55,</div><div class='add'>+0x44, 0x05, 0xD0, 0x61, 0x40, 0x70, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x10, 0xA0, 0x23, 0x00, 0x8D, 0x02, 0x05, 0x0A, 0x10, 0x08, 0x40,</div><div class='add'>+0x22, 0x00, 0x8D, 0x14, 0x34, 0x02, 0xD0, 0xC8, 0x40, 0x20, 0x05, 0x85, 0x00,</div><div class='add'>+0x05, 0x92, 0x58, 0x88, 0x40, 0x60, 0x40, 0x81, 0x08, 0x04, 0x82, 0xD0, 0x88,</div><div class='add'>+0x40, 0x42, 0x80, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0xA8,</div><div class='add'>+0x25, 0x80, 0x8D, 0x01, 0x44, 0x12, 0x10, 0x08, 0x40, 0x26, 0x00, 0x9D, 0x80,</div><div class='add'>+0x74, 0x22, 0xD0, 0x09, 0x50, 0x26, 0x20, 0x95, 0x08, 0x04, 0x02, 0x58, 0x09,</div><div class='add'>+0x40, 0x34, 0x02, 0x91, 0x00, 0x45, 0x22, 0xD0, 0x09, 0x40, 0x62, 0x20, 0x06,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0xA8, 0x67, 0x00, 0xBF, 0x80,</div><div class='add'>+0x4C, 0x06, 0x30, 0x1B, 0xC0, 0x26, 0x00, 0xBF, 0x00, 0x7C, 0x02, 0xF0, 0x49,</div><div class='add'>+0xC0, 0x64, 0x00, 0x97, 0x00, 0x4C, 0x86, 0x72, 0x09, 0xCA, 0x64, 0x20, 0x93,</div><div class='add'>+0x21, 0xCC, 0x0E, 0xF0, 0x09, 0xD0, 0x16, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x14, 0x80, 0x25, 0x02, 0x9F, 0x00, 0x7C, 0x42, 0xF0, 0x49,</div><div class='add'>+0xC0, 0x25, 0x04, 0x9F, 0x03, 0x7C, 0x06, 0xF0, 0x58, 0xD0, 0x27, 0x02, 0x93,</div><div class='add'>+0x20, 0x7C, 0x22, 0xF0, 0x08, 0xC0, 0x67, 0x00, 0x8F, 0x09, 0x7C, 0x02, 0xD0,</div><div class='add'>+0x09, 0xC0, 0x51, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14,</div><div class='add'>+0x08, 0x05, 0x00, 0x13, 0x00, 0x7C, 0x00, 0xF0, 0x21, 0xC0, 0x07, 0x40, 0x13,</div><div class='add'>+0x02, 0x4D, 0x00, 0x32, 0x21, 0xF0, 0x00, 0x00, 0x13, 0x44, 0x4C, 0x20, 0x34,</div><div class='add'>+0x41, 0xC0, 0x04, 0x0A, 0x13, 0x00, 0x4C, 0x00, 0xF0, 0x81, 0xC6, 0x50, 0x20,</div><div class='add'>+0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0xA0, 0x5C, 0x00, 0x51,</div><div class='add'>+0x00, 0xB4, 0x01, 0xD0, 0x05, 0x40, 0x1F, 0x80, 0x51, 0x00, 0xC4, 0x09, 0x50,</div><div class='add'>+0x27, 0x50, 0x1D, 0x00, 0x61, 0xD2, 0xC4, 0x05, 0x20, 0x07, 0x40, 0x18, 0x00,</div><div class='add'>+0x75, 0x08, 0x6C, 0x01, 0xD0, 0x17, 0xD0, 0x52, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x14, 0xA0, 0x62, 0x00, 0xC9, 0x00, 0x34, 0x02, 0xD0,</div><div class='add'>+0x0C, 0x40, 0x23, 0x08, 0xC1, 0x00, 0x04, 0x4A, 0x10, 0x3C, 0x49, 0x30, 0x00,</div><div class='add'>+0xC0, 0x01, 0x05, 0x17, 0x19, 0x28, 0x40, 0x30, 0x84, 0xC1, 0x01, 0x04, 0x03,</div><div class='add'>+0xD0, 0x19, 0x40, 0x50, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x05, 0x80, 0xFC, 0x00, 0xE9, 0x04, 0xB4, 0x42, 0xD0, 0x4E, 0x40, 0xFB, 0x00,</div><div class='add'>+0xF5, 0x25, 0x84, 0x46, 0x50, 0x6E, 0x68, 0x69, 0x21, 0x21, 0x20, 0x84, 0x01,</div><div class='add'>+0x18, 0x06, 0x41, 0x38, 0x00, 0xE5, 0x10, 0xA6, 0x13, 0xD0, 0x0E, 0x40, 0x12,</div><div class='add'>+0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x10, 0x68, 0x00,</div><div class='add'>+0xEB, 0x07, 0xBC, 0x06, 0xF0, 0x3E, 0xC0, 0x6B, 0x00, 0xE1, 0x03, 0x8C, 0x06,</div><div class='add'>+0x32, 0x72, 0x40, 0x28, 0x41, 0x23, 0x01, 0x84, 0x07, 0x32, 0x10, 0xC0, 0x78,</div><div class='add'>+0x00, 0xE3, 0x01, 0x8C, 0x0F, 0xF0, 0x10, 0xC0, 0x50, 0x40, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xB8, 0x31, 0x40, 0xD7, 0x00, 0x7C, 0x02,</div><div class='add'>+0xF0, 0x0D, 0xC0, 0x33, 0x00, 0xDB, 0x00, 0x3C, 0x02, 0xF0, 0x01, 0xD8, 0x27,</div><div class='add'>+0x02, 0x0F, 0x20, 0x3C, 0x00, 0xF0, 0x01, 0xD2, 0x33, 0x10, 0x5F, 0x12, 0x7C,</div><div class='add'>+0x03, 0xF0, 0x0D, 0xC0, 0x43, 0x60, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0xA2, 0x6F, 0x00, 0xFF, 0x01, 0xCC, 0x07, 0xF0, 0x1E, 0xC0, 0x6C,</div><div class='add'>+0x00, 0xEF, 0x01, 0xCC, 0x07, 0x32, 0x1F, 0xC0, 0x78, 0x10, 0x23, 0x01, 0x8C,</div><div class='add'>+0x05, 0x30, 0x13, 0xC0, 0x7F, 0x08, 0x7F, 0x01, 0xBC, 0x07, 0x30, 0x1F, 0xC0,</div><div class='add'>+0x0B, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x88, 0x29,</div><div class='add'>+0x00, 0xED, 0x00, 0x84, 0x03, 0xD2, 0x0E, 0x40, 0xA8, 0x00, 0xED, 0x08, 0x84,</div><div class='add'>+0x03, 0xB0, 0x2F, 0x40, 0x28, 0x01, 0x21, 0x80, 0x94, 0x00, 0x52, 0x02, 0x40,</div><div class='add'>+0x3B, 0x0A, 0x6D, 0x04, 0xB4, 0x03, 0x10, 0x0E, 0x40, 0x57, 0x20, 0x06, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x29, 0x00, 0xED, 0x01, 0x84,</div><div class='add'>+0x03, 0xD0, 0x1F, 0x40, 0x28, 0x00, 0xFD, 0x01, 0x84, 0x22, 0x10, 0x8E, 0x40,</div><div class='add'>+0x2C, 0x10, 0x39, 0x08, 0x84, 0x03, 0x10, 0x02, 0x40, 0x3B, 0x00, 0x2D, 0x00,</div><div class='add'>+0xF4, 0x07, 0x10, 0x06, 0x40, 0x63, 0x01, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x04, 0x28, 0x23, 0x01, 0xCD, 0x00, 0x04, 0x07, 0xD0, 0x0C, 0x41,</div><div class='add'>+0x20, 0x00, 0xCD, 0x00, 0x06, 0x45, 0x90, 0x1C, 0x40, 0x20, 0x00, 0x09, 0x01,</div><div class='add'>+0x16, 0x19, 0x50, 0x90, 0x40, 0xB3, 0x00, 0x5D, 0x00, 0x34, 0x6F, 0x10, 0x0C,</div><div class='add'>+0x40, 0x1B, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0xA8,</div><div class='add'>+0xA5, 0x00, 0xDF, 0x04, 0x4C, 0x12, 0xF0, 0x0D, 0xD0, 0x24, 0x00, 0xDF, 0x00,</div><div class='add'>+0x4D, 0x12, 0x30, 0x1B, 0xC0, 0x3C, 0x41, 0x1B, 0x05, 0x4C, 0x01, 0x34, 0x01,</div><div class='add'>+0xC0, 0x47, 0x12, 0x9F, 0x00, 0x7C, 0x0F, 0x36, 0x01, 0xC8, 0x57, 0x20, 0x06,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0xB7, 0x00, 0xDF, 0x40,</div><div class='add'>+0x7C, 0x02, 0xF0, 0x8D, 0xC0, 0x33, 0x10, 0xDF, 0x00, 0x7C, 0x02, 0xF0, 0x80,</div><div class='add'>+0xC0, 0xA7, 0x00, 0x17, 0x40, 0x7C, 0x08, 0xF1, 0x00, 0xC0, 0xD7, 0x00, 0x1F,</div><div class='add'>+0x40, 0x7C, 0x03, 0xF0, 0x0D, 0xCC, 0x27, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x80, 0x08, 0x6F, 0x00, 0xEF, 0x00, 0x8C, 0x0E, 0x30, 0x0F,</div><div class='add'>+0xC0, 0x2C, 0x00, 0xF3, 0x00, 0xCC, 0x02, 0xF0, 0x33, 0xC4, 0x0C, 0x00, 0x33,</div><div class='add'>+0x00, 0xBC, 0x09, 0x30, 0x03, 0xC0, 0x1C, 0x00, 0xBF, 0x00, 0xCC, 0x03, 0x30,</div><div class='add'>+0x0B, 0xD0, 0x04, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x81,</div><div class='add'>+0x20, 0xD6, 0x10, 0xDD, 0x40, 0x44, 0x4A, 0x10, 0x0D, 0x40, 0xF5, 0x50, 0xD1,</div><div class='add'>+0x00, 0x44, 0x02, 0xD0, 0x31, 0x42, 0x01, 0x08, 0x11, 0x23, 0x74, 0x0D, 0x10,</div><div class='add'>+0x51, 0xC0, 0xB6, 0x00, 0x1D, 0x61, 0x44, 0x03, 0x11, 0x2D, 0x40, 0x04, 0x02,</div><div class='add'>+0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xA0, 0xA4, 0x01, 0xDD,</div><div class='add'>+0x00, 0x44, 0x02, 0x10, 0x0C, 0x40, 0x24, 0x02, 0xC1, 0x20, 0x44, 0x03, 0xD0,</div><div class='add'>+0x0D, 0x40, 0xB4, 0x90, 0x19, 0x51, 0x74, 0x09, 0x10, 0x11, 0x00, 0x14, 0x02,</div><div class='add'>+0x1D, 0x03, 0x05, 0x83, 0x10, 0x24, 0x40, 0x04, 0x00, 0x0A, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x10, 0x20, 0x30, 0x00, 0xCD, 0x00, 0x04, 0x02, 0x14,</div><div class='add'>+0x0C, 0x40, 0x11, 0x00, 0xC1, 0x00, 0x04, 0x03, 0xD0, 0x04, 0x40, 0x25, 0x00,</div><div class='add'>+0x01, 0x00, 0x34, 0x01, 0x14, 0x00, 0x60, 0x32, 0x00, 0x1D, 0x00, 0x04, 0x03,</div><div class='add'>+0x10, 0x0C, 0x40, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0xB0, 0x26, 0x00, 0xEF, 0x00, 0x4D, 0x01, 0x30, 0x0F, 0xC0, 0x24, 0x00,</div><div class='add'>+0xF3, 0x00, 0x45, 0x02, 0xF0, 0x0D, 0xC0, 0x04, 0x00, 0x13, 0x00, 0x7C, 0x01,</div><div class='add'>+0x30, 0x01, 0xC0, 0x14, 0x00, 0x3F, 0x00, 0xCC, 0x03, 0x34, 0x0D, 0xC8, 0x04,</div><div class='add'>+0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0xB8, 0x1F, 0x00,</div><div class='add'>+0xFF, 0x00, 0xFC, 0x81, 0xF0, 0x0F, 0xC0, 0x1F, 0x00, 0xFF, 0x00, 0xBC, 0x01,</div><div class='add'>+0xE2, 0x07, 0x98, 0x0F, 0x40, 0x3F, 0x40, 0xFC, 0x01, 0xF0, 0x03, 0xC0, 0x3F,</div><div class='add'>+0x00, 0x3F, 0x00, 0xFC, 0x03, 0xF0, 0x0F, 0xC0, 0x17, 0x60, 0x0E, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xA0, 0x7F, 0x00, 0xFB, 0x10, 0x9C, 0x07,</div><div class='add'>+0xF0, 0x1F, 0xC0, 0x4F, 0x00, 0xBF, 0x01, 0xFC, 0x05, 0xF0, 0x17, 0xC8, 0x2E,</div><div class='add'>+0x10, 0xBF, 0x04, 0xFC, 0x03, 0x30, 0x1F, 0xC0, 0x7F, 0x08, 0xB6, 0x00, 0xFC,</div><div class='add'>+0x27, 0x70, 0x02, 0xC0, 0x0E, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x01, 0x08, 0x77, 0x00, 0xFD, 0x03, 0x44, 0x06, 0x10, 0x1D, 0x40, 0x47,</div><div class='add'>+0x00, 0xDD, 0x01, 0x74, 0x00, 0x10, 0x1D, 0x40, 0xE4, 0x02, 0x1D, 0x04, 0xF4,</div><div class='add'>+0x5B, 0x10, 0x01, 0x40, 0x47, 0x08, 0x9D, 0x01, 0x74, 0x03, 0xD0, 0x19, 0x40,</div><div class='add'>+0x0C, 0x60, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0xA0, 0x33,</div><div class='add'>+0x00, 0xCD, 0x00, 0x14, 0x03, 0xD0, 0x0C, 0x40, 0x03, 0x00, 0x8D, 0x40, 0x74,</div><div class='add'>+0x51, 0x90, 0x05, 0x48, 0x02, 0x00, 0x0D, 0x12, 0x34, 0x1B, 0x10, 0x4C, 0x49,</div><div class='add'>+0x33, 0x00, 0x0D, 0x02, 0x34, 0x13, 0xD0, 0x00, 0x40, 0x4E, 0x80, 0x0E, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xA8, 0x35, 0x00, 0xDD, 0x20, 0x40,</div><div class='add'>+0x07, 0x10, 0x0D, 0x40, 0x67, 0x00, 0xDD, 0x23, 0x74, 0x81, 0x14, 0x1D, 0x41,</div><div class='add'>+0x44, 0x00, 0x1D, 0x01, 0x74, 0x03, 0x14, 0x01, 0x40, 0x07, 0x08, 0x9D, 0x51,</div><div class='add'>+0x74, 0x03, 0xD0, 0x19, 0x41, 0x0C, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x02, 0x88, 0x37, 0x00, 0xDF, 0x00, 0x54, 0x1F, 0xF0, 0x0D, 0xC0,</div><div class='add'>+0x47, 0x00, 0x9F, 0x01, 0x7C, 0x19, 0xF0, 0x14, 0xC0, 0xC6, 0x00, 0x9F, 0x07,</div><div class='add'>+0x74, 0x03, 0x30, 0x0D, 0xC0, 0x37, 0x00, 0x17, 0x01, 0x7C, 0x03, 0x79, 0x39,</div><div class='add'>+0xC0, 0x22, 0x20, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x80,</div><div class='add'>+0x3C, 0x00, 0xEF, 0x00, 0xFC, 0x03, 0xF0, 0x0F, 0xC0, 0x0F, 0x00, 0xFF, 0x40,</div><div class='add'>+0xFC, 0x00, 0xF0, 0x0F, 0xC0, 0x27, 0x00, 0x3F, 0x00, 0xFC, 0x03, 0xF0, 0x03,</div><div class='add'>+0xC4, 0x0F, 0x30, 0x1F, 0x20, 0xFE, 0xA7, 0xF0, 0x0B, 0x40, 0x1F, 0x00, 0x06,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x08, 0x35, 0x00, 0xDF, 0x00,</div><div class='add'>+0x7C, 0x03, 0x30, 0x0D, 0xC0, 0x07, 0x00, 0x1F, 0x02, 0x5C, 0x49, 0xB0, 0x25,</div><div class='add'>+0xC0, 0x06, 0x00, 0x9B, 0x00, 0x4E, 0x03, 0xF0, 0x0D, 0xC0, 0x34, 0x00, 0x17,</div><div class='add'>+0x02, 0x4C, 0x13, 0xF2, 0x29, 0xC5, 0x29, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x13, 0xA0, 0x34, 0x00, 0xFD, 0x00, 0x34, 0x07, 0x10, 0x0D,</div><div class='add'>+0xC0, 0x07, 0x00, 0xDD, 0x05, 0x04, 0x1D, 0x10, 0x0D, 0x40, 0x64, 0x00, 0x11,</div><div class='add'>+0x00, 0xEC, 0x63, 0xD0, 0x71, 0x40, 0x84, 0x0B, 0x11, 0x01, 0x44, 0x43, 0xD0,</div><div class='add'>+0x18, 0xC0, 0x4E, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07,</div><div class='add'>+0xA0, 0x32, 0x00, 0xCD, 0x00, 0x34, 0x3B, 0x10, 0x0C, 0x40, 0x03, 0x00, 0xCD,</div><div class='add'>+0x00, 0x14, 0x0B, 0x94, 0x00, 0x42, 0x62, 0x00, 0x89, 0x80, 0x54, 0x07, 0xD0,</div><div class='add'>+0x4C, 0x40, 0xF1, 0x10, 0x85, 0x00, 0x04, 0x03, 0xD0, 0xB0, 0x40, 0x0D, 0x00,</div><div class='add'>+0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x80, 0x78, 0x80, 0xED,</div><div class='add'>+0x41, 0xB4, 0x07, 0x10, 0x1E, 0x40, 0x49, 0x30, 0xED, 0xC9, 0x94, 0x06, 0x10,</div><div class='add'>+0x17, 0x00, 0x78, 0x00, 0xF0, 0x49, 0xB4, 0x07, 0xD0, 0x13, 0x40, 0x48, 0x00,</div><div class='add'>+0xE1, 0x11, 0x84, 0x07, 0xD0, 0x16, 0x40, 0x3E, 0x20, 0x08, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x12, 0x10, 0x30, 0x00, 0xCF, 0x00, 0x3C, 0x01, 0x30,</div><div class='add'>+0x8C, 0x40, 0x03, 0x00, 0xCF, 0x00, 0x5C, 0x33, 0xB0, 0x00, 0xC0, 0x32, 0x04,</div><div class='add'>+0x5B, 0x80, 0x14, 0x03, 0xF2, 0x0C, 0xD0, 0x30, 0x03, 0x46, 0x08, 0x0D, 0x03,</div><div class='add'>+0xF0, 0x00, 0xC0, 0x49, 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x02, 0xB0, 0x35, 0x00, 0xDF, 0x00, 0x7C, 0x01, 0xF0, 0x0D, 0xC2, 0x37, 0x00,</div><div class='add'>+0xCF, 0x00, 0x6C, 0xA3, 0xF0, 0x0C, 0xC0, 0x37, 0x00, 0xDF, 0x20, 0x6C, 0x43,</div><div class='add'>+0xF0, 0x80, 0xC0, 0x03, 0x0A, 0xDF, 0x08, 0x7C, 0x23, 0xF0, 0x8D, 0xC0, 0x09,</div><div class='add'>+0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0xA0, 0x37, 0x00,</div><div class='add'>+0xDF, 0x1E, 0x7C, 0x03, 0x30, 0x0D, 0xC4, 0x07, 0x00, 0xDF, 0x00, 0x5C, 0x01,</div><div class='add'>+0xF0, 0x15, 0xC0, 0x14, 0x00, 0xDF, 0x00, 0x4C, 0x4F, 0x71, 0x0D, 0xC8, 0x34,</div><div class='add'>+0x10, 0xDF, 0x00, 0x7C, 0x03, 0xF0, 0x05, 0xC4, 0x40, 0x00, 0x0E, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x88, 0x39, 0x00, 0xED, 0x00, 0xB4, 0x03,</div><div class='add'>+0x10, 0x0E, 0x48, 0x0B, 0x10, 0xED, 0x00, 0x84, 0x02, 0xD0, 0x0E, 0x40, 0x38,</div><div class='add'>+0x08, 0xFD, 0x80, 0x04, 0x03, 0x12, 0x02, 0x40, 0x08, 0x04, 0xED, 0x00, 0xB4,</div><div class='add'>+0x03, 0xD0, 0x06, 0x60, 0x4C, 0x60, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x03, 0x00, 0x79, 0x00, 0xED, 0x01, 0xF4, 0x07, 0x14, 0x1E, 0x40, 0x4B,</div><div class='add'>+0x00, 0xED, 0x01, 0x94, 0x07, 0xD0, 0x17, 0x50, 0x58, 0x00, 0xED, 0x01, 0x85,</div><div class='add'>+0x07, 0x50, 0x1F, 0x40, 0x78, 0x00, 0xED, 0x01, 0xB4, 0x87, 0xD0, 0x1C, 0x40,</div><div class='add'>+0x10, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x28, 0x33,</div><div class='add'>+0x00, 0xCD, 0x00, 0x34, 0x4F, 0x90, 0x0C, 0x48, 0xC3, 0x83, 0xCD, 0x12, 0x04,</div><div class='add'>+0x4B, 0xD0, 0x7C, 0x40, 0xB0, 0x0C, 0xCD, 0x02, 0x04, 0x03, 0x10, 0x01, 0x40,</div><div class='add'>+0x00, 0x00, 0xCD, 0x88, 0x30, 0x22, 0xD0, 0x1C, 0x40, 0x58, 0x00, 0x0C, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x17, 0xA8, 0x15, 0x00, 0x5F, 0x00, 0xBC,</div><div class='add'>+0x49, 0x30, 0x05, 0xC2, 0x9F, 0x00, 0x6F, 0x02, 0x9C, 0x09, 0xF0, 0x27, 0xC8,</div><div class='add'>+0x1C, 0x00, 0x7F, 0x00, 0x4C, 0x01, 0x70, 0x05, 0xD0, 0x14, 0x00, 0x7D, 0x21,</div><div class='add'>+0x7C, 0x05, 0xD0, 0x27, 0x40, 0x5C, 0x20, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x12, 0x00, 0x07, 0x00, 0x1F, 0x00, 0x7C, 0x00, 0x70, 0x01, 0xC0,</div><div class='add'>+0x07, 0x00, 0x1F, 0x00, 0x7C, 0x08, 0xF0, 0x81, 0xC0, 0x07, 0x00, 0x1F, 0x18,</div><div class='add'>+0x7C, 0x00, 0xF0, 0x23, 0xC0, 0x8F, 0x00, 0x1F, 0x00, 0x7C, 0x00, 0xF0, 0xA1,</div><div class='add'>+0xD1, 0x4B, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x08,</div><div class='add'>+0x27, 0x00, 0x9F, 0x00, 0x7C, 0x02, 0x34, 0x09, 0xC0, 0x27, 0x00, 0x9F, 0x08,</div><div class='add'>+0x6C, 0x26, 0x71, 0x09, 0xC0, 0x27, 0x00, 0x9E, 0x00, 0x4C, 0x16, 0xF0, 0x09,</div><div class='add'>+0xC0, 0x25, 0x20, 0x93, 0x38, 0x78, 0x0E, 0xF2, 0x18, 0xC0, 0x40, 0x20, 0x04,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x20, 0x26, 0x00, 0x9D, 0x00,</div><div class='add'>+0x74, 0x02, 0x11, 0x09, 0x40, 0x27, 0x00, 0x9D, 0x40, 0x44, 0x06, 0x11, 0x09,</div><div class='add'>+0x44, 0x27, 0x00, 0x9D, 0x80, 0x44, 0x8E, 0xD1, 0x29, 0x40, 0x20, 0x04, 0x91,</div><div class='add'>+0x01, 0x74, 0x06, 0xD0, 0x89, 0x41, 0x04, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x18, 0xA0, 0x24, 0x00, 0x9D, 0x00, 0x74, 0x12, 0x1C, 0x09,</div><div class='add'>+0x40, 0x27, 0x00, 0x9D, 0x00, 0x64, 0x42, 0x40, 0x09, 0x42, 0x37, 0x80, 0x8D,</div><div class='add'>+0x00, 0x44, 0x02, 0xD0, 0x19, 0x41, 0x2D, 0x40, 0x91, 0x00, 0x74, 0x42, 0xD0,</div><div class='add'>+0x09, 0x40, 0x70, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10,</div><div class='add'>+0x00, 0x20, 0x00, 0x8D, 0x14, 0x74, 0x02, 0x10, 0x08, 0x40, 0x23, 0x00, 0x8D,</div><div class='add'>+0x00, 0x44, 0x02, 0x10, 0x08, 0x40, 0x23, 0x05, 0x8D, 0x34, 0x04, 0x52, 0xD0,</div><div class='add'>+0x0A, 0x40, 0x2C, 0x20, 0x81, 0x14, 0x34, 0x02, 0xD0, 0x48, 0x51, 0x50, 0xA0,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1D, 0x30, 0x06, 0x00, 0x1F,</div><div class='add'>+0x04, 0x7C, 0x00, 0x30, 0x01, 0xC8, 0x07, 0x00, 0x1F, 0x00, 0x6C, 0x00, 0x70,</div><div class='add'>+0x01, 0xC0, 0x07, 0x21, 0x1F, 0x04, 0x4C, 0x11, 0xF0, 0x01, 0xC0, 0x0D, 0x00,</div><div class='add'>+0x13, 0xC4, 0x7C, 0x00, 0xF0, 0x41, 0xC0, 0x74, 0xC0, 0x0A, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x19, 0xB0, 0x27, 0x00, 0x9F, 0x00, 0xBC, 0x03, 0xF0,</div><div class='add'>+0x09, 0xC0, 0x2F, 0x00, 0xEF, 0x80, 0xFC, 0x52, 0xF0, 0x0A, 0xC0, 0x2F, 0x00,</div><div class='add'>+0xBF, 0x14, 0x7D, 0x52, 0xF0, 0x48, 0xC5, 0x27, 0x00, 0xBF, 0x40, 0xFC, 0x52,</div><div class='add'>+0xF0, 0x0B, 0xC0, 0x67, 0x20, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x18, 0xA0, 0x27, 0x00, 0x9F, 0x01, 0xFC, 0x02, 0xB0, 0x09, 0xC0, 0x27, 0x60,</div><div class='add'>+0xB3, 0x00, 0x9C, 0x0A, 0x70, 0x09, 0xC0, 0x3D, 0x00, 0x93, 0x02, 0xCC, 0xC6,</div><div class='add'>+0xF0, 0x2B, 0xC2, 0x2F, 0x00, 0xBF, 0x80, 0xCC, 0x0A, 0xD0, 0x0B, 0xC0, 0x67,</div><div class='add'>+0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1C, 0x08, 0x07, 0x00,</div><div class='add'>+0x1D, 0x0A, 0x74, 0x00, 0x10, 0x01, 0x40, 0x07, 0x00, 0x11, 0x00, 0x44, 0x04,</div><div class='add'>+0x10, 0x01, 0x40, 0x04, 0x00, 0x11, 0x00, 0x44, 0x10, 0xD0, 0x01, 0x40, 0x07,</div><div class='add'>+0x00, 0x1D, 0x00, 0x44, 0x00, 0xD0, 0x01, 0x40, 0x73, 0x60, 0x0C, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xA0, 0x23, 0x00, 0x8D, 0x00, 0x74, 0x02,</div><div class='add'>+0x90, 0x08, 0x40, 0x27, 0x00, 0x81, 0x00, 0x54, 0x02, 0x52, 0x09, 0x40, 0xA1,</div><div class='add'>+0x00, 0x81, 0x22, 0x04, 0x42, 0xD2, 0x08, 0x40, 0x23, 0x00, 0x8D, 0x02, 0x04,</div><div class='add'>+0x02, 0xD0, 0x08, 0x40, 0x4B, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x18, 0xA8, 0x25, 0x00, 0x9D, 0x00, 0x74, 0x06, 0x10, 0x09, 0x40, 0x27,</div><div class='add'>+0x00, 0x91, 0x00, 0x44, 0x1A, 0x12, 0x29, 0x42, 0x24, 0x40, 0x91, 0x80, 0x45,</div><div class='add'>+0x82, 0xD0, 0x09, 0x40, 0x27, 0x08, 0x9D, 0x00, 0x44, 0x03, 0xD0, 0x29, 0x40,</div><div class='add'>+0x63, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0xA8, 0x27,</div><div class='add'>+0x00, 0x9F, 0x00, 0x7C, 0x02, 0xB0, 0x09, 0xC4, 0xE3, 0x04, 0x93, 0x02, 0x5C,</div><div class='add'>+0x0E, 0x70, 0x08, 0xC0, 0xE5, 0x04, 0x92, 0x1B, 0x48, 0x02, 0xE0, 0x09, 0xC0,</div><div class='add'>+0x27, 0x00, 0x9F, 0x19, 0x4D, 0x06, 0xF0, 0x09, 0xC0, 0x17, 0x28, 0x0E, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x80, 0x25, 0x00, 0x9F, 0x00, 0x7C,</div><div class='add'>+0x02, 0xF0, 0x09, 0xC4, 0x67, 0x02, 0x9F, 0x00, 0x7C, 0x06, 0xF0, 0x09, 0xC0,</div><div class='add'>+0x27, 0x01, 0x8F, 0x21, 0x7C, 0x82, 0xF0, 0x09, 0xC0, 0x27, 0x10, 0x8F, 0x01,</div><div class='add'>+0x7C, 0x12, 0xF0, 0x09, 0xC0, 0x4B, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x14, 0x08, 0x05, 0x00, 0x1F, 0x00, 0x6C, 0x08, 0xF0, 0x01, 0xC0,</div><div class='add'>+0x07, 0x00, 0x1F, 0x00, 0x7C, 0x40, 0x31, 0x21, 0xC8, 0x87, 0x00, 0x1E, 0x02,</div><div class='add'>+0x7C, 0x00, 0x32, 0x81, 0x81, 0x04, 0x04, 0x1F, 0x80, 0x4C, 0x00, 0x34, 0x01,</div><div class='add'>+0xC0, 0x43, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0xA0,</div><div class='add'>+0x14, 0x00, 0x5D, 0x00, 0x84, 0x01, 0xD0, 0x05, 0x40, 0x17, 0x10, 0x6D, 0x80,</div><div class='add'>+0xB4, 0x05, 0x10, 0x05, 0x40, 0x13, 0x00, 0x5D, 0x00, 0xF4, 0x01, 0x10, 0x27,</div><div class='add'>+0x40, 0xDC, 0x00, 0x5D, 0x05, 0xC4, 0x61, 0x12, 0x07, 0x40, 0x53, 0x00, 0x02,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0xA0, 0x32, 0x00, 0xCD, 0x00,</div><div class='add'>+0x24, 0x05, 0xD0, 0x0C, 0x40, 0x33, 0x00, 0x8D, 0x0C, 0x34, 0x0F, 0x14, 0x0C,</div><div class='add'>+0x40, 0x33, 0x02, 0xCD, 0x00, 0x34, 0x1F, 0x50, 0x2C, 0x44, 0xD0, 0x20, 0x8D,</div><div class='add'>+0x00, 0x04, 0x0F, 0x10, 0x2C, 0x41, 0x53, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x05, 0x80, 0x38, 0x00, 0xED, 0x01, 0x84, 0x0B, 0xD0, 0x0E,</div><div class='add'>+0x40, 0x3B, 0x80, 0xAD, 0x00, 0xF4, 0x43, 0x10, 0x0E, 0x40, 0x2B, 0x00, 0xED,</div><div class='add'>+0x48, 0xB4, 0x47, 0x50, 0x1E, 0x50, 0x38, 0x04, 0xED, 0x00, 0x84, 0x05, 0x10,</div><div class='add'>+0x2E, 0x40, 0x07, 0x20, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15,</div><div class='add'>+0x10, 0x78, 0x00, 0xCF, 0x01, 0xAC, 0x05, 0xF0, 0x1E, 0xC4, 0x7B, 0x10, 0xAF,</div><div class='add'>+0x01, 0xBC, 0x07, 0x30, 0x1E, 0xC0, 0x7B, 0x00, 0xEF, 0x8D, 0xFC, 0x07, 0x70,</div><div class='add'>+0x17, 0xC0, 0x78, 0x08, 0xEE, 0x01, 0xCD, 0x07, 0x30, 0x1E, 0xC0, 0x47, 0x40,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xB8, 0x35, 0x00, 0xDF,</div><div class='add'>+0x00, 0x7C, 0x03, 0xF0, 0x0D, 0xC4, 0x37, 0x00, 0x9F, 0x00, 0x7C, 0x03, 0xF0,</div><div class='add'>+0x0D, 0xC0, 0x27, 0x00, 0xDF, 0x42, 0x7C, 0x03, 0xB4, 0x0D, 0xC0, 0x37, 0x00,</div><div class='add'>+0xCF, 0x00, 0x7C, 0x01, 0xF0, 0x05, 0xC8, 0x43, 0x20, 0x06, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0xA0, 0x7F, 0x00, 0xFF, 0x01, 0xFC, 0x85, 0xF0,</div><div class='add'>+0x1F, 0xC0, 0x7F, 0x02, 0x2F, 0x09, 0x8C, 0x05, 0xF0, 0x9F, 0xC2, 0x6D, 0x02,</div><div class='add'>+0xFB, 0x09, 0xFC, 0x07, 0x30, 0x1F, 0xC0, 0x7F, 0x20, 0xFF, 0x01, 0xFC, 0x07,</div><div class='add'>+0x30, 0x1F, 0xC0, 0x0A, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x15, 0x88, 0x39, 0x00, 0xED, 0x00, 0xB4, 0x03, 0xD0, 0x0E, 0x40, 0x3B, 0x00,</div><div class='add'>+0x2D, 0x10, 0x84, 0x01, 0x12, 0x0E, 0x40, 0x38, 0x04, 0xE9, 0x00, 0x84, 0x11,</div><div class='add'>+0x10, 0x06, 0x40, 0x3B, 0x00, 0xED, 0x00, 0xA4, 0x11, 0x18, 0x0A, 0x40, 0x54,</div><div class='add'>+0x60, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x39, 0x00,</div><div class='add'>+0xED, 0x00, 0xB4, 0x01, 0xD0, 0x0E, 0x40, 0x39, 0x20, 0x3D, 0x00, 0xC5, 0x01,</div><div class='add'>+0xD0, 0x0F, 0x09, 0x29, 0x00, 0xED, 0x40, 0x96, 0x83, 0x14, 0x06, 0x40, 0x3B,</div><div class='add'>+0x02, 0xED, 0x00, 0xF4, 0x83, 0x10, 0x0E, 0x41, 0x22, 0x00, 0x04, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x28, 0x33, 0x00, 0xCD, 0x40, 0x34, 0x03,</div><div class='add'>+0xD0, 0x0C, 0x64, 0xB3, 0x04, 0x0D, 0x07, 0x04, 0x0C, 0x90, 0x3C, 0x40, 0x70,</div><div class='add'>+0x00, 0xCD, 0x03, 0x04, 0x02, 0x10, 0xA1, 0x44, 0x73, 0x00, 0xCD, 0x02, 0x64,</div><div class='add'>+0x24, 0x10, 0x10, 0x40, 0x18, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x15, 0xA8, 0x35, 0x00, 0xDF, 0x00, 0x7C, 0x07, 0xF0, 0x0D, 0xC0, 0x77,</div><div class='add'>+0x14, 0x9F, 0x03, 0x0C, 0x4E, 0xF0, 0x9D, 0xC0, 0xF5, 0x00, 0xFF, 0x12, 0x78,</div><div class='add'>+0x00, 0x30, 0x39, 0x40, 0x73, 0x01, 0xDD, 0x10, 0x7C, 0x02, 0x14, 0x1D, 0xC0,</div><div class='add'>+0x56, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x37,</div><div class='add'>+0x00, 0xDF, 0x00, 0x7C, 0x22, 0xF0, 0x0D, 0xC0, 0x37, 0x08, 0x9F, 0x02, 0x7C,</div><div class='add'>+0x08, 0x70, 0x0D, 0xC0, 0x27, 0x00, 0xDB, 0x04, 0x7C, 0x0A, 0xF0, 0x09, 0xC4,</div><div class='add'>+0x37, 0x00, 0xDF, 0x30, 0x6C, 0x82, 0xF0, 0x6D, 0xC0, 0xA7, 0x00, 0x0C, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x08, 0x3F, 0x00, 0xFF, 0x80, 0xFC,</div><div class='add'>+0x83, 0xF0, 0x0F, 0xC0, 0x3F, 0x08, 0xBF, 0x00, 0xDC, 0x42, 0x70, 0x0F, 0xC0,</div><div class='add'>+0x3D, 0x04, 0xDF, 0x40, 0x78, 0x00, 0xE0, 0x03, 0x01, 0x3C, 0x24, 0xF2, 0x80,</div><div class='add'>+0xFC, 0x00, 0x30, 0x09, 0xE0, 0x17, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x81, 0x00, 0x36, 0x00, 0xDD, 0x00, 0x74, 0x1F, 0xD0, 0x0D, 0xC0,</div><div class='add'>+0x35, 0x00, 0x8D, 0x41, 0x46, 0x16, 0x10, 0x0C, 0x46, 0x24, 0x20, 0xDD, 0x00,</div><div class='add'>+0x74, 0x0E, 0xD0, 0x19, 0xC1, 0xF6, 0x01, 0xD1, 0x00, 0x74, 0x04, 0x30, 0x41,</div><div class='add'>+0x40, 0x17, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xA0,</div><div class='add'>+0x34, 0x80, 0xDD, 0x00, 0x74, 0x07, 0xD0, 0x0D, 0x48, 0x35, 0x10, 0x9D, 0x03,</div><div class='add'>+0x54, 0x06, 0x50, 0x0D, 0x40, 0x25, 0x00, 0xDD, 0x00, 0x54, 0x0C, 0xD0, 0x19,</div><div class='add'>+0x60, 0x75, 0x10, 0xD5, 0x04, 0x74, 0x06, 0x10, 0x85, 0x40, 0x05, 0x00, 0x02,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x20, 0x30, 0x80, 0xCD, 0x00,</div><div class='add'>+0x34, 0x03, 0xD0, 0x0C, 0x42, 0x31, 0x00, 0xDD, 0x20, 0x44, 0x00, 0x18, 0x0D,</div><div class='add'>+0x40, 0x30, 0x00, 0xCD, 0x00, 0x34, 0x00, 0xD0, 0x09, 0x48, 0x27, 0x80, 0xC5,</div><div class='add'>+0x00, 0x34, 0x02, 0x93, 0x00, 0x40, 0x43, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0xB0, 0x36, 0x00, 0xDF, 0x00, 0x7C, 0x03, 0xF0, 0x0D,</div><div class='add'>+0xC0, 0x35, 0x00, 0x9F, 0x00, 0x54, 0x02, 0x70, 0x0D, 0xC0, 0x25, 0x20, 0xFD,</div><div class='add'>+0x00, 0x5C, 0x00, 0xF0, 0x01, 0xC0, 0x35, 0x80, 0xD7, 0x80, 0x7C, 0x02, 0x24,</div><div class='add'>+0x01, 0xC0, 0x07, 0xC4, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05,</div><div class='add'>+0xB8, 0x3F, 0x10, 0xFF, 0x20, 0xFC, 0x03, 0xF0, 0x0F, 0xC4, 0x3D, 0x00, 0xBF,</div><div class='add'>+0x80, 0xF4, 0x02, 0xF2, 0x0E, 0xC0, 0x3F, 0x00, 0xFF, 0x00, 0xFC, 0x02, 0xF0,</div><div class='add'>+0x0B, 0xC0, 0x2E, 0x40, 0xFB, 0x00, 0xBC, 0x02, 0x70, 0x03, 0xC8, 0x17, 0x00,</div><div class='add'>+0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xA0, 0x5F, 0x00, 0x7F,</div><div class='add'>+0x41, 0xFC, 0x85, 0xF0, 0x1B, 0xC0, 0x5C, 0x02, 0xAF, 0x14, 0xCC, 0x04, 0xF0,</div><div class='add'>+0xC3, 0xC0, 0x0C, 0x04, 0xB3, 0x10, 0xCC, 0x0C, 0x30, 0x8B, 0xC0, 0x3F, 0x00,</div><div class='add'>+0xB3, 0x14, 0xCC, 0x53, 0x30, 0x0B, 0xC0, 0x0C, 0x00, 0x0E, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x01, 0x08, 0x57, 0x00, 0x9D, 0x01, 0x74, 0x05, 0xD1,</div><div class='add'>+0x15, 0x44, 0x14, 0x21, 0xFD, 0x03, 0x44, 0x10, 0xD0, 0xE1, 0x00, 0x84, 0x01,</div><div class='add'>+0xAB, 0x06, 0x44, 0x00, 0x10, 0xE9, 0x40, 0x77, 0x00, 0xB5, 0x06, 0xD4, 0x0F,</div><div class='add'>+0x10, 0x09, 0x40, 0x04, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x11, 0xA0, 0x33, 0x00, 0x8D, 0x00, 0x34, 0x02, 0xD0, 0x09, 0x40, 0x20, 0x20,</div><div class='add'>+0xCD, 0x00, 0x16, 0x40, 0xD2, 0x01, 0x50, 0x04, 0x44, 0x81, 0x10, 0x05, 0x10,</div><div class='add'>+0x10, 0x00, 0x40, 0x33, 0x00, 0xC1, 0x10, 0x04, 0x03, 0xD0, 0x48, 0x41, 0x44,</div><div class='add'>+0x80, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xA8, 0x35, 0x01,</div><div class='add'>+0x9D, 0x04, 0x74, 0x02, 0xD0, 0x85, 0x40, 0x24, 0x00, 0xDD, 0x00, 0x55, 0x04,</div><div class='add'>+0xD0, 0x01, 0x46, 0x64, 0x00, 0x99, 0x48, 0x44, 0x04, 0x10, 0x31, 0x48, 0x37,</div><div class='add'>+0x00, 0xC5, 0x00, 0x54, 0x03, 0xD0, 0x09, 0x40, 0x0C, 0x20, 0x06, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA8, 0xA7, 0x01, 0xDF, 0x01, 0x7C, 0x27,</div><div class='add'>+0xF0, 0x0D, 0xD0, 0x74, 0x12, 0x8F, 0x00, 0x5C, 0x44, 0xF0, 0x20, 0xC1, 0xC0,</div><div class='add'>+0x00, 0x93, 0x00, 0x4C, 0x14, 0x34, 0x1D, 0xC0, 0x37, 0x00, 0x93, 0x80, 0x4C,</div><div class='add'>+0x03, 0xF4, 0x39, 0xD0, 0x08, 0x20, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x07, 0x80, 0x6D, 0x00, 0xBF, 0x01, 0xF8, 0x07, 0xF0, 0x0F, 0xC8, 0x3F,</div><div class='add'>+0x00, 0xF8, 0x10, 0xEC, 0x00, 0xF0, 0x23, 0xC0, 0x0F, 0x00, 0xBF, 0x00, 0xFC,</div><div class='add'>+0x40, 0xF0, 0x0F, 0xC0, 0x3B, 0x10, 0x9F, 0x09, 0xB8, 0x83, 0x30, 0x3B, 0xC0,</div><div class='add'>+0x1F, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x08, 0x25,</div><div class='add'>+0x00, 0x9F, 0x40, 0x7C, 0x02, 0xF0, 0x0D, 0xC0, 0x27, 0x00, 0xDF, 0x80, 0x4C,</div><div class='add'>+0x00, 0x32, 0x01, 0xD0, 0x8C, 0x00, 0x93, 0x00, 0x4C, 0x00, 0xF0, 0x25, 0xC0,</div><div class='add'>+0x34, 0x00, 0xD3, 0x04, 0x4D, 0x03, 0xF0, 0x28, 0xC0, 0x0B, 0x20, 0x04, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0xA0, 0x24, 0x00, 0x9C, 0x00, 0x70,</div><div class='add'>+0x02, 0xD0, 0x0C, 0x60, 0x67, 0x00, 0xDD, 0x03, 0x40, 0x2C, 0x10, 0x03, 0x40,</div><div class='add'>+0x64, 0x00, 0x91, 0x0F, 0x6D, 0x08, 0x91, 0xB5, 0x40, 0xBC, 0x40, 0xD5, 0x13,</div><div class='add'>+0xC4, 0x03, 0xC0, 0x49, 0x40, 0x4F, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x07, 0xA0, 0x22, 0x20, 0x4D, 0x80, 0x34, 0x02, 0xC0, 0x04, 0x48,</div><div class='add'>+0x63, 0x00, 0x8D, 0x01, 0x24, 0x04, 0x10, 0x08, 0x42, 0x40, 0x00, 0x91, 0x01,</div><div class='add'>+0x44, 0x04, 0xD1, 0x18, 0x40, 0xB0, 0x04, 0xC1, 0x02, 0x04, 0x03, 0xD0, 0x08,</div><div class='add'>+0x40, 0x1F, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x80,</div><div class='add'>+0x68, 0x00, 0xED, 0x21, 0xB4, 0x06, 0xD0, 0x16, 0x40, 0x6B, 0x06, 0xED, 0x11,</div><div class='add'>+0xA5, 0x44, 0x14, 0x98, 0x50, 0x6C, 0x04, 0xE1, 0x09, 0xA4, 0x04, 0x90, 0x1E,</div><div class='add'>+0x40, 0x78, 0x02, 0xE5, 0x21, 0x84, 0x07, 0xD1, 0x16, 0x40, 0x13, 0x00, 0x02,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x10, 0x30, 0x00, 0x8F, 0x00,</div><div class='add'>+0x3C, 0x02, 0xF0, 0x04, 0x40, 0x23, 0x0A, 0xCF, 0x00, 0x6C, 0x00, 0x32, 0x88,</div><div class='add'>+0xC8, 0x80, 0x40, 0xC3, 0x08, 0x0C, 0x40, 0xF2, 0x8D, 0xD1, 0x30, 0x02, 0xC3,</div><div class='add'>+0x00, 0x0D, 0x03, 0xF0, 0x04, 0xC0, 0x4B, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x02, 0xB8, 0x3D, 0x00, 0xBF, 0x80, 0xF0, 0x02, 0xF0, 0x07,</div><div class='add'>+0xC0, 0x2F, 0x0A, 0xFF, 0x02, 0xDC, 0x00, 0xF0, 0x8B, 0xD0, 0x3B, 0x42, 0xFF,</div><div class='add'>+0x08, 0xF4, 0x00, 0xB0, 0x8F, 0xC0, 0x3B, 0x02, 0xFF, 0x00, 0xFC, 0x43, 0xF0,</div><div class='add'>+0x87, 0xC0, 0x0B, 0x60, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15,</div><div class='add'>+0xA0, 0x67, 0x00, 0xD3, 0x20, 0x7C, 0x07, 0x34, 0x05, 0xC0, 0x70, 0x00, 0x93,</div><div class='add'>+0x06, 0x5C, 0x00, 0xF0, 0x81, 0xD0, 0x00, 0x10, 0x93, 0x86, 0x4D, 0x04, 0x30,</div><div class='add'>+0x0D, 0xC0, 0x37, 0x00, 0xD3, 0x04, 0x0D, 0x13, 0x31, 0x05, 0xC0, 0x54, 0x00,</div><div class='add'>+0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x88, 0x29, 0x00, 0xE1,</div><div class='add'>+0x00, 0xB4, 0x03, 0x10, 0x06, 0xC0, 0x3A, 0x10, 0xE1, 0x00, 0x84, 0x02, 0xD0,</div><div class='add'>+0x43, 0x40, 0x29, 0x00, 0xEB, 0x08, 0x84, 0x01, 0x51, 0x0E, 0x40, 0x3B, 0x01,</div><div class='add'>+0xF1, 0x08, 0x94, 0x43, 0x10, 0x0F, 0xC0, 0x4A, 0x20, 0x06, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x6D, 0x00, 0xA1, 0x01, 0xF6, 0x06, 0x10,</div><div class='add'>+0x16, 0x40, 0x6C, 0x10, 0xF0, 0x01, 0xB4, 0x04, 0xD0, 0x3A, 0x40, 0x4C, 0x00,</div><div class='add'>+0xC1, 0x01, 0xC6, 0x04, 0x10, 0x3E, 0x40, 0x73, 0x02, 0xE9, 0x01, 0x84, 0x03,</div><div class='add'>+0x10, 0x1E, 0x40, 0x0C, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x12, 0x28, 0x63, 0x00, 0x81, 0x04, 0x36, 0x16, 0x10, 0x14, 0x44, 0x22, 0x02,</div><div class='add'>+0xC1, 0x00, 0x24, 0x0B, 0xD1, 0x0D, 0x41, 0x30, 0x08, 0xC9, 0x00, 0x04, 0x1F,</div><div class='add'>+0x50, 0x1D, 0x40, 0x33, 0x10, 0xD9, 0x00, 0x15, 0x03, 0x10, 0xEC, 0x40, 0x4A,</div><div class='add'>+0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x17, 0xA8, 0x1D, 0x01,</div><div class='add'>+0x73, 0x80, 0xFC, 0x05, 0x33, 0xE7, 0xCC, 0xDC, 0x40, 0x53, 0xC0, 0xBC, 0x15,</div><div class='add'>+0xF1, 0x27, 0xD0, 0x1C, 0x08, 0x53, 0x00, 0xCD, 0x05, 0x32, 0x17, 0xC0, 0x17,</div><div class='add'>+0x40, 0x5B, 0x00, 0x4C, 0x01, 0x30, 0x37, 0xC0, 0x5C, 0x20, 0x06, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x07, 0x54, 0x1F, 0x00, 0x7C, 0x20,</div><div class='add'>+0xF0, 0x01, 0xC0, 0x07, 0x24, 0x1F, 0x02, 0x5C, 0x48, 0xF0, 0x01, 0xC0, 0x03,</div><div class='add'>+0x00, 0x1F, 0x00, 0x7C, 0x20, 0xF0, 0x01, 0xC0, 0x07, 0x00, 0x17, 0x20, 0x7C,</div><div class='add'>+0x80, 0xF0, 0x00, 0xC0, 0x4B, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x10, 0x08, 0x27, 0x00, 0x9F, 0x00, 0x7C, 0x02, 0xF0, 0x09, 0xC0, 0x24,</div><div class='add'>+0x00, 0x9F, 0x05, 0x4C, 0x0E, 0x30, 0x09, 0xC0, 0x64, 0x20, 0x8A, 0x01, 0x6C,</div><div class='add'>+0x02, 0xF0, 0x09, 0xC8, 0x60, 0x00, 0x93, 0x00, 0x4C, 0x22, 0xF0, 0x89, 0xC2,</div><div class='add'>+0x40, 0x20, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x20, 0x26,</div><div class='add'>+0x00, 0x9D, 0x00, 0x70, 0x02, 0xD0, 0x09, 0x40, 0x25, 0x00, 0x8C, 0x00, 0x44,</div><div class='add'>+0x12, 0x10, 0x09, 0x40, 0x65, 0x08, 0x9B, 0x01, 0x6C, 0x02, 0xD0, 0xA9, 0x41,</div><div class='add'>+0xE4, 0x01, 0x91, 0x02, 0x45, 0x06, 0xD0, 0x19, 0x40, 0x04, 0x00, 0x08, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0xA0, 0x24, 0x00, 0x9D, 0x20, 0x70,</div><div class='add'>+0x03, 0xD0, 0x0C, 0x40, 0x34, 0x00, 0x9C, 0x10, 0x44, 0x02, 0x14, 0x09, 0x40,</div><div class='add'>+0x24, 0x02, 0x9D, 0x48, 0x65, 0x12, 0xD2, 0x09, 0x40, 0x24, 0x42, 0x91, 0x14,</div><div class='add'>+0x44, 0x82, 0xD0, 0x0D, 0x44, 0x60, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x10, 0x20, 0xA0, 0x10, 0x8D, 0x02, 0x34, 0x0A, 0xD0, 0x28, 0x40,</div><div class='add'>+0x21, 0x10, 0x9D, 0x14, 0x46, 0x02, 0x18, 0x48, 0x45, 0x21, 0x45, 0xCD, 0x14,</div><div class='add'>+0x24, 0x02, 0xD0, 0x48, 0x71, 0x20, 0x85, 0x81, 0x14, 0x04, 0x52, 0xD0, 0x48,</div><div class='add'>+0x41, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xB0,</div><div class='add'>+0x06, 0x00, 0x1F, 0x00, 0x7C, 0x00, 0xD0, 0x00, 0x40, 0x04, 0x10, 0x1F, 0x04,</div><div class='add'>+0x4C, 0x00, 0x30, 0x41, 0xC4, 0x14, 0x21, 0x1F, 0x44, 0x6C, 0x00, 0xF1, 0x41,</div><div class='add'>+0xC0, 0x04, 0x01, 0x13, 0xC4, 0x4C, 0x10, 0xF0, 0x41, 0xD0, 0x74, 0xC0, 0x0A,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x19, 0xB8, 0x7B, 0x00, 0xFF, 0x01,</div><div class='add'>+0xBC, 0x06, 0xF0, 0x1B, 0xC0, 0x2F, 0x05, 0xAE, 0x00, 0xFD, 0x52, 0xF1, 0x4F,</div><div class='add'>+0xC1, 0x2F, 0x45, 0xBB, 0x14, 0xBC, 0x52, 0xF0, 0x4B, 0xC1, 0x27, 0x40, 0xBF,</div><div class='add'>+0x14, 0x7C, 0x02, 0xF2, 0x4B, 0xC1, 0x67, 0x60, 0x0E, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x19, 0xA0, 0xA7, 0x00, 0x93, 0x02, 0x4C, 0x02, 0x30, 0x28,</div><div class='add'>+0xC0, 0xAF, 0x00, 0xAF, 0x01, 0xDC, 0x0A, 0xF0, 0x39, 0xC0, 0xED, 0x05, 0xB3,</div><div class='add'>+0x03, 0xDC, 0x02, 0x32, 0x5B, 0xC1, 0x2C, 0x00, 0xB3, 0x01, 0xCC, 0x06, 0x30,</div><div class='add'>+0x6A, 0xC0, 0x60, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1C,</div><div class='add'>+0x08, 0x47, 0x01, 0x1B, 0x01, 0x6C, 0x14, 0xB0, 0x51, 0x40, 0x47, 0x00, 0x1D,</div><div class='add'>+0x02, 0x45, 0x04, 0xD1, 0x10, 0x40, 0xC0, 0x00, 0x11, 0x01, 0x45, 0x14, 0x10,</div><div class='add'>+0x75, 0xC0, 0x07, 0x10, 0x11, 0x05, 0x54, 0x00, 0x10, 0x61, 0x40, 0x70, 0x20,</div><div class='add'>+0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xA0, 0x23, 0x00, 0x81,</div><div class='add'>+0x20, 0x04, 0x42, 0x10, 0x08, 0x40, 0x23, 0x08, 0x8D, 0x02, 0x14, 0x12, 0xD0,</div><div class='add'>+0x28, 0x40, 0x21, 0x00, 0x85, 0x02, 0x14, 0x46, 0x10, 0x08, 0x49, 0x21, 0x00,</div><div class='add'>+0x81, 0x12, 0x04, 0x0A, 0x10, 0x28, 0x40, 0x40, 0x80, 0x0E, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x18, 0xA8, 0x21, 0x00, 0x89, 0x00, 0x24, 0x42, 0x90,</div><div class='add'>+0x09, 0x40, 0x27, 0x00, 0x9D, 0x04, 0x44, 0x12, 0xD0, 0x19, 0x40, 0xA4, 0x00,</div><div class='add'>+0x95, 0x00, 0x44, 0x02, 0x10, 0x09, 0x40, 0x27, 0x00, 0x90, 0x04, 0x54, 0x02,</div><div class='add'>+0x10, 0x39, 0x40, 0x60, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x05, 0xA8, 0x2F, 0x02, 0xB3, 0x00, 0xCC, 0x0A, 0x30, 0x0B, 0xC0, 0xA7, 0x04,</div><div class='add'>+0x9F, 0x01, 0x5C, 0x02, 0xF0, 0x29, 0xC8, 0x25, 0x40, 0x97, 0x00, 0x5C, 0x0A,</div><div class='add'>+0x34, 0x09, 0xC8, 0x25, 0x40, 0x93, 0x00, 0x4D, 0x02, 0x34, 0x29, 0xD0, 0x14,</div><div class='add'>+0x20, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x80, 0x65, 0x00,</div><div class='add'>+0x9F, 0x03, 0x7C, 0x0A, 0xE0, 0x09, 0xC0, 0xA7, 0x00, 0x8F, 0x00, 0x7C, 0x02,</div><div class='add'>+0xF0, 0x08, 0xC4, 0x27, 0x01, 0x8B, 0x45, 0x7C, 0x02, 0xF0, 0x98, 0xE0, 0x21,</div><div class='add'>+0x00, 0x9F, 0x00, 0x3C, 0x02, 0xF0, 0x09, 0xC0, 0x53, 0x00, 0x06, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x08, 0x05, 0x00, 0x13, 0x00, 0x4D, 0x08,</div><div class='add'>+0xF0, 0x01, 0xC0, 0x04, 0x00, 0x13, 0x10, 0x6C, 0x00, 0xF0, 0x01, 0xD0, 0x04,</div><div class='add'>+0x40, 0x13, 0x00, 0x6C, 0x00, 0x30, 0x01, 0xC0, 0x04, 0x04, 0x03, 0x80, 0x7C,</div><div class='add'>+0x00, 0x34, 0x20, 0xC0, 0x50, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x14, 0xA0, 0x14, 0x10, 0x51, 0x00, 0x44, 0x01, 0xD0, 0x05, 0x40, 0x54,</div><div class='add'>+0x01, 0x75, 0x02, 0xC4, 0x05, 0xD0, 0x05, 0x50, 0xD8, 0x40, 0x75, 0x00, 0xC4,</div><div class='add'>+0x11, 0x10, 0x47, 0x50, 0x1C, 0x00, 0x71, 0x00, 0x74, 0x01, 0x10, 0x15, 0x40,</div><div class='add'>+0x50, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0xA0, 0x32,</div><div class='add'>+0x00, 0xC1, 0x00, 0x04, 0x03, 0xD0, 0x0C, 0x40, 0x20, 0x00, 0xC1, 0x0A, 0x24,</div><div class='add'>+0x26, 0xD0, 0x0C, 0x44, 0xF0, 0x86, 0xC4, 0x09, 0x65, 0x07, 0x50, 0x0C, 0x00,</div><div class='add'>+0xF0, 0x00, 0xC5, 0x20, 0x34, 0x02, 0x10, 0x1C, 0x40, 0x50, 0x00, 0x0A, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x80, 0x3C, 0x01, 0xF1, 0x04, 0x84,</div><div class='add'>+0xA3, 0xD0, 0x1F, 0x40, 0x78, 0x00, 0x25, 0x00, 0x84, 0x00, 0xD0, 0x4E, 0x40,</div><div class='add'>+0x28, 0x00, 0x65, 0x00, 0x85, 0x13, 0x50, 0x0A, 0x40, 0x90, 0x00, 0xA5, 0x00,</div><div class='add'>+0xB0, 0x02, 0x10, 0x0F, 0x41, 0x14, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x15, 0x10, 0x78, 0x00, 0xE3, 0x07, 0x8C, 0x17, 0xF0, 0x7E, 0xD0,</div><div class='add'>+0x6C, 0x00, 0xA3, 0x01, 0xAC, 0x05, 0xF0, 0x3E, 0xC1, 0x68, 0x00, 0x77, 0x01,</div><div class='add'>+0xED, 0x0F, 0x74, 0x13, 0x84, 0x48, 0x00, 0xA7, 0x01, 0x3C, 0x06, 0x30, 0x1E,</div><div class='add'>+0xC0, 0x54, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xB8,</div><div class='add'>+0x31, 0x40, 0xCF, 0x00, 0x7C, 0x03, 0xF0, 0x0D, 0xC0, 0x3F, 0x00, 0x9F, 0x00,</div><div class='add'>+0xFD, 0x00, 0xF0, 0x2D, 0xC0, 0x27, 0x02, 0x5D, 0x00, 0x7C, 0x03, 0x90, 0x01,</div><div class='add'>+0xC0, 0x07, 0x40, 0x1B, 0x00, 0x7C, 0x02, 0xF0, 0x0D, 0xD0, 0x43, 0x60, 0x06,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xA0, 0x7F, 0x04, 0xF3, 0x01,</div><div class='add'>+0xCC, 0x27, 0x3C, 0x1F, 0xC0, 0x7B, 0x00, 0x37, 0x01, 0xDC, 0x06, 0x72, 0x1F,</div><div class='add'>+0xC0, 0x6D, 0x00, 0xF7, 0x81, 0xCC, 0x06, 0x31, 0x1B, 0xC0, 0x4C, 0x10, 0xE3,</div><div class='add'>+0x01, 0xCC, 0x06, 0xF0, 0x1F, 0xC0, 0x03, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x15, 0x88, 0x39, 0x00, 0xE1, 0x00, 0xAC, 0x23, 0x18, 0x4E,</div><div class='add'>+0x40, 0x3B, 0x00, 0x21, 0x04, 0x84, 0x80, 0xD0, 0x4E, 0x40, 0x2C, 0x00, 0x61,</div><div class='add'>+0x02, 0x8C, 0x02, 0x10, 0x0A, 0x40, 0x09, 0x00, 0xAB, 0x00, 0x94, 0x02, 0xD0,</div><div class='add'>+0x0E, 0x40, 0x57, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18,</div><div class='add'>+0x00, 0x79, 0x00, 0xE1, 0x11, 0x84, 0x07, 0x12, 0x1E, 0x40, 0x3B, 0x00, 0x05,</div><div class='add'>+0x00, 0x90, 0x00, 0x50, 0x0E, 0x44, 0x09, 0x04, 0x3D, 0x10, 0x84, 0x03, 0x10,</div><div class='add'>+0x02, 0x41, 0x0A, 0x00, 0xA1, 0x00, 0x84, 0x02, 0xD0, 0x2E, 0x40, 0x03, 0x00,</div><div class='add'>+0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x28, 0x33, 0x40, 0xC1,</div><div class='add'>+0x10, 0x24, 0x03, 0x11, 0x8C, 0x40, 0x33, 0x00, 0x01, 0x00, 0x04, 0x0C, 0xD0,</div><div class='add'>+0x8C, 0x40, 0x80, 0x01, 0x09, 0x40, 0x24, 0x0F, 0x11, 0x11, 0x44, 0x03, 0x00,</div><div class='add'>+0x09, 0x00, 0x14, 0x02, 0xD0, 0x0C, 0x40, 0x13, 0x20, 0x0C, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x1D, 0xA8, 0x35, 0x00, 0xD3, 0x00, 0x0C, 0x03, 0x30,</div><div class='add'>+0x3D, 0xC0, 0x37, 0x00, 0x87, 0x00, 0x5C, 0x1E, 0x70, 0x1F, 0xC0, 0x4D, 0x00,</div><div class='add'>+0x9F, 0x00, 0xCD, 0x13, 0x34, 0x09, 0xC0, 0x06, 0x08, 0xD3, 0x00, 0x4C, 0x03,</div><div class='add'>+0xF3, 0x0D, 0xC4, 0x57, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x01, 0x00, 0x37, 0x00, 0xDF, 0x00, 0x7C, 0x03, 0xF0, 0x0D, 0xC1, 0x37, 0x00,</div><div class='add'>+0x1F, 0x08, 0x7C, 0x40, 0xF0, 0x0D, 0xC4, 0x83, 0x00, 0x47, 0x00, 0x5C, 0x00,</div><div class='add'>+0xF0, 0x01, 0xC0, 0x85, 0x10, 0xCF, 0x00, 0x3C, 0x03, 0xF0, 0x8D, 0xC4, 0x07,</div><div class='add'>+0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x08, 0x3F, 0x00,</div><div class='add'>+0xFF, 0x00, 0xCC, 0x03, 0x30, 0x0F, 0xC0, 0x3F, 0x00, 0xB3, 0x40, 0xEC, 0x00,</div><div class='add'>+0x30, 0x0D, 0xC0, 0x4D, 0x00, 0xB3, 0x02, 0xCC, 0x43, 0x10, 0x01, 0x40, 0x04,</div><div class='add'>+0x00, 0xBF, 0x01, 0xCC, 0x16, 0x30, 0x0F, 0xC0, 0x03, 0x22, 0x0C, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x81, 0x20, 0x36, 0x00, 0xCD, 0x00, 0x44, 0x03,</div><div class='add'>+0x14, 0x0D, 0x44, 0x73, 0x02, 0x91, 0x01, 0x04, 0x04, 0x14, 0x0D, 0x50, 0x04,</div><div class='add'>+0x86, 0x51, 0x02, 0x6C, 0x3C, 0x50, 0x31, 0x40, 0xC5, 0x01, 0x1D, 0x01, 0x44,</div><div class='add'>+0x02, 0xB0, 0x09, 0x40, 0x07, 0x02, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x01, 0xA0, 0x34, 0x00, 0xDD, 0x00, 0x44, 0x03, 0x10, 0x0D, 0x40, 0x37,</div><div class='add'>+0x00, 0x11, 0x01, 0x64, 0x06, 0x10, 0x0C, 0x4A, 0x04, 0x00, 0x95, 0x00, 0x04,</div><div class='add'>+0x02, 0x50, 0x39, 0x40, 0x45, 0x10, 0xDD, 0x04, 0x40, 0x03, 0x11, 0x1D, 0x40,</div><div class='add'>+0x07, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x20, 0x30,</div><div class='add'>+0x00, 0xDD, 0x00, 0x45, 0x03, 0x10, 0x0C, 0x40, 0x37, 0x40, 0x01, 0x00, 0x44,</div><div class='add'>+0x00, 0x10, 0x0C, 0x40, 0x01, 0x80, 0x41, 0x00, 0x24, 0x00, 0x40, 0x00, 0x40,</div><div class='add'>+0x01, 0x00, 0xCD, 0x00, 0x05, 0x03, 0x80, 0x0C, 0x40, 0x43, 0x80, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xB0, 0x3A, 0x10, 0xEF, 0x00, 0x8C,</div><div class='add'>+0x03, 0x30, 0x0F, 0x40, 0x37, 0x00, 0x13, 0x00, 0x6C, 0x00, 0x38, 0x0F, 0xD0,</div><div class='add'>+0x04, 0x00, 0x95, 0x00, 0x0D, 0x03, 0x61, 0x01, 0x80, 0x05, 0x20, 0x9F, 0x00,</div><div class='add'>+0x4D, 0x02, 0x30, 0x0D, 0xC0, 0x03, 0xC0, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x05, 0xB8, 0x3F, 0x00, 0xFF, 0x00, 0xFC, 0x03, 0xF0, 0x0F, 0xC0,</div><div class='add'>+0x3F, 0x20, 0x3F, 0x00, 0xFC, 0x00, 0xF1, 0x0F, 0xC0, 0x0E, 0x00, 0x2E, 0x00,</div><div class='add'>+0xFC, 0x00, 0xF0, 0x03, 0xC0, 0x0F, 0x00, 0x3F, 0x00, 0xFC, 0x02, 0xF1, 0x0F,</div><div class='add'>+0xC0, 0x17, 0x60, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA1,</div><div class='add'>+0x82, 0xC0, 0x0E, 0x02, 0x3B, 0x08, 0xE0, 0x28, 0xB0, 0x83, 0xE0, 0x0E, 0x82,</div><div class='add'>+0x38, 0x08, 0xEC, 0x20, 0x90, 0x83, 0xC8, 0x0E, 0x02, 0x1B, 0x08, 0xEC, 0x28,</div><div class='add'>+0xA8, 0x83, 0xA0, 0x0E, 0x02, 0x3A, 0x08, 0xCC, 0x20, 0x98, 0x03, 0x8C, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA3, 0x22, 0xA0, 0x8E, 0xA0,</div><div class='add'>+0x3A, 0x02, 0xEA, 0x08, 0xA0, 0x23, 0x20, 0x8E, 0xA0, 0x3B, 0x02, 0xEA, 0x08,</div><div class='add'>+0xA8, 0x23, 0xA0, 0x8E, 0xA0, 0x32, 0x02, 0x4A, 0x08, 0xA8, 0x23, 0x88, 0x8E,</div><div class='add'>+0x80, 0x3A, 0x02, 0xCA, 0x08, 0xA8, 0x03, 0x8C, 0x0A, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x81, 0x40, 0x80, 0x04, 0x01, 0x12, 0x04, 0x48, 0x18,</div><div class='add'>+0x20, 0x41, 0x80, 0x04, 0x01, 0x12, 0x04, 0x48, 0x10, 0x20, 0x41, 0x80, 0x04,</div><div class='add'>+0x01, 0x12, 0x04, 0x48, 0x18, 0x20, 0x41, 0xA0, 0x04, 0x01, 0x12, 0x04, 0x48,</div><div class='add'>+0x10, 0x20, 0x01, 0x84, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x21, 0x00, 0x80, 0x02, 0x80, 0x1A, 0x00, 0x68, 0x00, 0xA0, 0x01, 0xA0, 0x0E,</div><div class='add'>+0x20, 0x1A, 0x00, 0x68, 0x00, 0xA0, 0x01, 0x00, 0x06, 0x00, 0x0A, 0x00, 0x28,</div><div class='add'>+0x10, 0xA8, 0x01, 0x88, 0x06, 0x80, 0x1A, 0x00, 0x68, 0x00, 0x88, 0x01, 0x04,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA3, 0x12, 0xA0, 0x4E,</div><div class='add'>+0x80, 0x3A, 0x01, 0xEA, 0x14, 0xA0, 0x13, 0xA0, 0x4A, 0x80, 0x3A, 0x01, 0xEA,</div><div class='add'>+0x04, 0xA8, 0x13, 0xA0, 0x4E, 0x82, 0x3A, 0x01, 0xEA, 0x04, 0xA0, 0x13, 0x80,</div><div class='add'>+0x4A, 0x80, 0x3A, 0x01, 0xEA, 0x0C, 0xA8, 0x03, 0x8C, 0x0A, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0xA3, 0x00, 0x00, 0x06, 0x00, 0x18, 0x00, 0x60,</div><div class='add'>+0x00, 0x88, 0x01, 0x00, 0x06, 0x00, 0x18, 0x00, 0x60, 0x00, 0x80, 0x01, 0x00,</div><div class='add'>+0x06, 0x00, 0x18, 0x00, 0x60, 0x00, 0x80, 0x01, 0x00, 0x06, 0x00, 0x18, 0x00,</div><div class='add'>+0x60, 0x00, 0x80, 0x01, 0x8C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0xA3, 0x20, 0x20, 0x04, 0x80, 0x10, 0x01, 0x42, 0x00, 0x08, 0x11, 0x20,</div><div class='add'>+0x04, 0x80, 0x10, 0x01, 0x42, 0x04, 0x08, 0x11, 0x20, 0xC0, 0x80, 0x10, 0x01,</div><div class='add'>+0x42, 0x00, 0x00, 0x11, 0x00, 0x04, 0x80, 0x10, 0x01, 0x42, 0x04, 0x08, 0x01,</div><div class='add'>+0x8C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x82, 0xD2, 0xA0,</div><div class='add'>+0x02, 0x01, 0x0A, 0x05, 0x2A, 0x10, 0xA8, 0x50, 0x80, 0x02, 0x01, 0x0A, 0x07,</div><div class='add'>+0x2A, 0x1C, 0xA8, 0x50, 0xA0, 0x42, 0x83, 0x0A, 0x05, 0x2A, 0x10, 0xA0, 0x50,</div><div class='add'>+0x88, 0x02, 0x01, 0x0A, 0x05, 0x2A, 0x3C, 0xA0, 0x00, 0x8C, 0x0A, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x21, 0x30, 0x80, 0xC8, 0x00, 0xAA, 0x03,</div><div class='add'>+0xA8, 0x0E, 0x20, 0x38, 0x80, 0xE0, 0x00, 0xAA, 0x07, 0x08, 0x1E, 0xA0, 0x32,</div><div class='add'>+0x80, 0xCA, 0x00, 0x22, 0x03, 0xA8, 0x0C, 0xA0, 0x3A, 0xA0, 0xCA, 0x00, 0x2A,</div><div class='add'>+0x03, 0xA8, 0x0C, 0x20, 0x02, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x21, 0x72, 0x00, 0x48, 0x20, 0x18, 0x80, 0x22, 0x00, 0x00, 0x00,</div><div class='add'>+0x08, 0x40, 0x20, 0x08, 0x02, 0x00, 0x08, 0x80, 0x00, 0x00, 0x82, 0x00, 0x20,</div><div class='add'>+0x00, 0x20, 0x04, 0x80, 0x00, 0x08, 0x42, 0x00, 0x18, 0x00, 0x20, 0x08, 0x00,</div><div class='add'>+0x82, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA3, 0x16,</div><div class='add'>+0x40, 0x18, 0x00, 0x41, 0x00, 0x04, 0x01, 0x1A, 0x04, 0x40, 0x10, 0x20, 0x41,</div><div class='add'>+0x80, 0x04, 0x01, 0x10, 0x04, 0x40, 0x10, 0x00, 0x61, 0x00, 0x04, 0x01, 0x10,</div><div class='add'>+0x04, 0x08, 0x10, 0x00, 0x41, 0x00, 0x04, 0x01, 0x10, 0x82, 0x8C, 0x0A, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA3, 0x02, 0xA0, 0x06, 0x80, 0x9A,</div><div class='add'>+0x00, 0x6A, 0x02, 0x28, 0x09, 0xA0, 0x24, 0x00, 0x9B, 0x00, 0x48, 0x02, 0xA8,</div><div class='add'>+0x01, 0xA0, 0x06, 0x00, 0x1A, 0x00, 0x6A, 0x00, 0xB8, 0x09, 0xA0, 0x06, 0xA0,</div><div class='add'>+0x1B, 0x00, 0x6A, 0x00, 0xA8, 0x01, 0x8C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0xA3, 0x00, 0xC0, 0x46, 0x00, 0x1A, 0x00, 0x6C, 0x00, 0xBC,</div><div class='add'>+0x01, 0x90, 0x46, 0x00, 0x1B, 0x00, 0x6C, 0x00, 0xA8, 0x01, 0xC0, 0x06, 0x20,</div><div class='add'>+0x1B, 0x80, 0x6C, 0x04, 0xA0, 0x01, 0xE8, 0x46, 0x00, 0x1A, 0x00, 0x6C, 0x00,</div><div class='add'>+0x32, 0x01, 0x8C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA2,</div><div class='add'>+0x42, 0x20, 0x0C, 0x81, 0x30, 0x04, 0xC2, 0x10, 0x08, 0x43, 0x20, 0x08, 0x81,</div><div class='add'>+0x30, 0x04, 0xC2, 0x10, 0x18, 0x43, 0x28, 0x0C, 0x01, 0x30, 0x04, 0xC2, 0x30,</div><div class='add'>+0x08, 0x43, 0x20, 0x0C, 0x81, 0x30, 0x04, 0xC2, 0x10, 0x08, 0x03, 0x8C, 0x0A,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x02, 0x00, 0x0C, 0x00,</div><div class='add'>+0x30, 0x00, 0xC0, 0x04, 0x00, 0x03, 0x00, 0x0C, 0x00, 0x30, 0x00, 0x80, 0x00,</div><div class='add'>+0x00, 0x03, 0x00, 0x0C, 0x00, 0x30, 0x00, 0xC0, 0x00, 0x00, 0x03, 0x00, 0x08,</div><div class='add'>+0x00, 0x30, 0x00, 0xC0, 0x00, 0x00, 0x01, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x01, 0x40, 0x80, 0x0C, 0x83, 0x32, 0x04, 0xC8, 0x34,</div><div class='add'>+0x28, 0x43, 0x80, 0x0C, 0x83, 0x32, 0x04, 0xC8, 0x10, 0x20, 0x43, 0x80, 0x0C,</div><div class='add'>+0x01, 0x32, 0x04, 0xC8, 0x10, 0x28, 0x43, 0x80, 0x0C, 0x83, 0x32, 0x04, 0xC8,</div><div class='add'>+0x10, 0x20, 0x03, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0xA3, 0x42, 0xA0, 0x06, 0x83, 0x1A, 0x04, 0x6A, 0x30, 0xA8, 0x41, 0xA0, 0x06,</div><div class='add'>+0x83, 0x1A, 0x04, 0x6A, 0x10, 0xA8, 0x41, 0xA0, 0x06, 0x81, 0x1A, 0x04, 0x6A,</div><div class='add'>+0x30, 0xA8, 0x41, 0x80, 0x0E, 0x83, 0x0A, 0x04, 0x6A, 0x10, 0xA8, 0x01, 0x8C,</div><div class='add'>+0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA3, 0x42, 0x00, 0x04,</div><div class='add'>+0x01, 0x30, 0x04, 0x40, 0x10, 0x00, 0x41, 0x00, 0x0C, 0x01, 0x30, 0x04, 0xC0,</div><div class='add'>+0x10, 0x00, 0x41, 0x00, 0x04, 0x01, 0x10, 0x04, 0x40, 0x10, 0x00, 0x43, 0x00,</div><div class='add'>+0x00, 0x01, 0x30, 0x04, 0x40, 0x10, 0x00, 0x01, 0x8C, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0xA3, 0x4A, 0x20, 0x06, 0x81, 0x30, 0x04, 0x62,</div><div class='add'>+0x12, 0x08, 0x4B, 0x20, 0x06, 0x81, 0xB0, 0x04, 0x62, 0x12, 0x88, 0x41, 0x20,</div><div class='add'>+0x26, 0x81, 0x18, 0x04, 0x62, 0x10, 0x08, 0x43, 0x00, 0x06, 0x81, 0x30, 0x04,</div><div class='add'>+0x62, 0x12, 0x88, 0x01, 0x8C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x23, 0x06, 0xA0, 0x1A, 0x00, 0x62, 0x00, 0xAA, 0x01, 0x20, 0x04, 0xA0,</div><div class='add'>+0x18, 0x00, 0x62, 0x00, 0x8A, 0x01, 0xA0, 0x06, 0xA0, 0x1A, 0x80, 0x6A, 0x80,</div><div class='add'>+0xAA, 0x01, 0x20, 0x06, 0x80, 0x18, 0x00, 0x62, 0x00, 0xAA, 0x01, 0xA8, 0x02,</div><div class='add'>+0x8C, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x82, 0x60, 0x80,</div><div class='add'>+0x82, 0x01, 0x2A, 0x06, 0x28, 0x18, 0xA0, 0x60, 0x80, 0x82, 0x01, 0x0A, 0x06,</div><div class='add'>+0x28, 0x18, 0xA0, 0x60, 0x00, 0x82, 0x01, 0x0A, 0x06, 0x28, 0x18, 0xA0, 0x60,</div><div class='add'>+0xA0, 0x82, 0x01, 0x0A, 0x06, 0x28, 0x18, 0xA0, 0x00, 0x04, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x48, 0x80, 0x00, 0x01, 0x02, 0x04,</div><div class='add'>+0x48, 0x12, 0x20, 0x49, 0xA0, 0x00, 0x01, 0x92, 0x04, 0x48, 0x12, 0x28, 0x41,</div><div class='add'>+0x80, 0x20, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x88, 0x00, 0x01, 0x02,</div><div class='add'>+0x04, 0x08, 0x12, 0x20, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0xA3, 0x62, 0xC0, 0x8A, 0x01, 0x01, 0x06, 0xAC, 0x18, 0xB0, 0x63,</div><div class='add'>+0xC0, 0x8A, 0x01, 0x2B, 0x06, 0x8C, 0x18, 0xB0, 0x62, 0xC0, 0x8A, 0x01, 0x2A,</div><div class='add'>+0x06, 0xAC, 0x18, 0xB0, 0x62, 0xC0, 0x8A, 0x01, 0x2B, 0x06, 0x8C, 0x18, 0xB0,</div><div class='add'>+0x02, 0x8C, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA3, 0x62,</div><div class='add'>+0xA0, 0x8E, 0x01, 0x3B, 0x06, 0xEA, 0x18, 0xA8, 0x63, 0xA0, 0x8E, 0x81, 0x3A,</div><div class='add'>+0x06, 0x68, 0x18, 0x88, 0x63, 0xA0, 0x8E, 0x81, 0x3A, 0x06, 0xEA, 0x18, 0x98,</div><div class='add'>+0x63, 0x20, 0x8E, 0x81, 0x3B, 0x06, 0xCA, 0x18, 0x88, 0x03, 0x8C, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA2, 0x62, 0x80, 0x8E, 0x01, 0x3A,</div><div class='add'>+0x06, 0xEC, 0x18, 0xA0, 0x61, 0xC0, 0x8E, 0x01, 0x3A, 0x06, 0xE8, 0x18, 0xA0,</div><div class='add'>+0x63, 0xE0, 0x8E, 0x01, 0x1B, 0x06, 0xE0, 0x18, 0xA0, 0x63, 0xC0, 0x8E, 0x01,</div><div class='add'>+0x3A, 0x06, 0xEE, 0x18, 0xB0, 0x03, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0xA2, 0x62, 0xA0, 0x8E, 0x81, 0x32, 0x06, 0xEA, 0x18, 0x08,</div><div class='add'>+0x63, 0xA0, 0x8E, 0xA1, 0x38, 0x86, 0xEA, 0x18, 0x28, 0x61, 0x20, 0x8E, 0x81,</div><div class='add'>+0x32, 0x86, 0xE8, 0x18, 0xA8, 0x63, 0xA0, 0x8E, 0xA1, 0x30, 0x06, 0xEA, 0x18,</div><div class='add'>+0xA8, 0x03, 0x88, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x40, 0x80, 0x04, 0x01, 0x1A, 0x84, 0x48, 0x10, 0x20, 0x41, 0x80, 0x04, 0x01,</div><div class='add'>+0x32, 0x04, 0x48, 0x10, 0x22, 0x41, 0x80, 0x04, 0x01, 0x12, 0x04, 0x48, 0x10,</div><div class='add'>+0x20, 0x41, 0x88, 0x04, 0x01, 0x3A, 0x04, 0x48, 0x10, 0x20, 0x01, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x80, 0x86, 0x81,</div><div class='add'>+0x1A, 0x06, 0x68, 0x18, 0xA0, 0x61, 0x80, 0x86, 0x81, 0x18, 0x06, 0x68, 0x18,</div><div class='add'>+0xA0, 0x61, 0x80, 0x84, 0x01, 0x1A, 0x06, 0x68, 0x18, 0xA8, 0x61, 0x80, 0x86,</div><div class='add'>+0x81, 0x1A, 0x06, 0x6A, 0x18, 0xA0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0xA2, 0x02, 0xA0, 0x0E, 0x80, 0x3A, 0x00, 0xCA, 0x00,</div><div class='add'>+0x22, 0x03, 0xA0, 0x0C, 0x80, 0x32, 0x00, 0xCA, 0x00, 0x28, 0x03, 0x80, 0x0E,</div><div class='add'>+0x80, 0x2A, 0x00, 0xEA, 0x00, 0xA8, 0x03, 0xA0, 0x0E, 0x80, 0x3A, 0x00, 0xE8,</div><div class='add'>+0x00, 0xA8, 0x03, 0x88, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0xA2, 0x42, 0x00, 0x06, 0x01, 0x08, 0x04, 0x40, 0x10, 0x08, 0x41, 0x00, 0x04,</div><div class='add'>+0x01, 0x00, 0x0C, 0x40, 0x10, 0x80, 0x41, 0x00, 0x06, 0x01, 0x18, 0x04, 0x60,</div><div class='add'>+0x10, 0x80, 0x41, 0x00, 0x04, 0x01, 0x18, 0x04, 0x60, 0x10, 0x80, 0x01, 0x88,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA2, 0x42, 0x20, 0x04,</div><div class='add'>+0x81, 0x10, 0x04, 0x22, 0x10, 0x88, 0x51, 0x20, 0x06, 0x81, 0x18, 0x05, 0x62,</div><div class='add'>+0x10, 0x08, 0x41, 0x00, 0x04, 0x81, 0x10, 0x04, 0x42, 0x10, 0x0A, 0x41, 0x20,</div><div class='add'>+0x06, 0x81, 0x10, 0x04, 0x40, 0x10, 0x08, 0x01, 0x88, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0xA2, 0x42, 0xA0, 0x02, 0x01, 0x0A, 0x0C, 0xAA,</div><div class='add'>+0x30, 0xA8, 0xC2, 0xA0, 0x0A, 0x03, 0x2A, 0x04, 0xAA, 0x30, 0xA8, 0x42, 0xA0,</div><div class='add'>+0x02, 0x81, 0x0A, 0x04, 0x2A, 0x10, 0xA0, 0xC0, 0xA0, 0x02, 0x21, 0x0A, 0x04,</div><div class='add'>+0x28, 0x10, 0xA8, 0x00, 0x88, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x40, 0x80, 0x0A, 0x03, 0x2A, 0x0C, 0xA8, 0x10, 0xA0, 0x52, 0x80,</div><div class='add'>+0x0A, 0x03, 0x2A, 0x05, 0xA8, 0x30, 0xA0, 0xC2, 0x80, 0x0A, 0x01, 0x2A, 0x0C,</div><div class='add'>+0xA8, 0x30, 0xA0, 0xC2, 0x80, 0x0A, 0x03, 0x2A, 0x0C, 0xA8, 0x10, 0xA0, 0x02,</div><div class='add'>+0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00,</div><div class='add'>+0x42, 0x00, 0x08, 0x00, 0x20, 0x00, 0x88, 0x01, 0x00, 0x02, 0x00, 0x08, 0x80,</div><div class='add'>+0x20, 0x00, 0x88, 0x10, 0x00, 0x42, 0x20, 0x08, 0x01, 0x20, 0x04, 0x82, 0x00,</div><div class='add'>+0x00, 0x42, 0x00, 0x08, 0x01, 0x20, 0x04, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA2, 0x42, 0x40, 0x00, 0x01, 0x01, 0x04,</div><div class='add'>+0x04, 0x10, 0x10, 0x41, 0x40, 0x44, 0x01, 0x01, 0x04, 0x04, 0x14, 0x10, 0x40,</div><div class='add'>+0x40, 0x00, 0x01, 0x01, 0x04, 0x00, 0x10, 0x10, 0x50, 0x40, 0x00, 0x01, 0x01,</div><div class='add'>+0x04, 0x04, 0x10, 0x10, 0x00, 0x88, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0xA2, 0x02, 0xE0, 0x06, 0x80, 0x1B, 0x00, 0x68, 0x00, 0xA8, 0x01,</div><div class='add'>+0xA0, 0x06, 0x80, 0x1B, 0x00, 0x6E, 0x00, 0xA8, 0x01, 0x80, 0x06, 0x80, 0x1A,</div><div class='add'>+0x00, 0x6E, 0x00, 0xB8, 0x01, 0xA0, 0x06, 0x80, 0x1B, 0x00, 0x6A, 0x00, 0xA8,</div><div class='add'>+0x01, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA3, 0x02,</div><div class='add'>+0xC0, 0x06, 0x00, 0x3B, 0x00, 0x6C, 0x00, 0xA0, 0x01, 0xC0, 0x06, 0x00, 0x3A,</div><div class='add'>+0x00, 0x68, 0x00, 0xB0, 0x01, 0xC0, 0x06, 0x00, 0x1A, 0x00, 0x6C, 0x00, 0xA0,</div><div class='add'>+0x03, 0xC0, 0x06, 0x00, 0x3A, 0x00, 0x4C, 0x00, 0xB0, 0x01, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x0C, 0x80, 0x18,</div><div class='add'>+0x00, 0xC2, 0x00, 0x08, 0x01, 0x28, 0x0C, 0x80, 0x18, 0x80, 0xC0, 0x00, 0x08,</div><div class='add'>+0x03, 0x20, 0x0C, 0x82, 0x38, 0x00, 0xC2, 0x00, 0x88, 0x01, 0x20, 0x0C, 0x80,</div><div class='add'>+0x18, 0x00, 0xC2, 0x00, 0x08, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2C, 0x00, 0x10, 0x00, 0xC0, 0x02, 0x00,</div><div class='add'>+0x63, 0x00, 0x2C, 0x00, 0x10, 0x00, 0xC2, 0x00, 0x00, 0x03, 0x00, 0x0C, 0x00,</div><div class='add'>+0x10, 0x00, 0xC0, 0x02, 0x00, 0x21, 0x00, 0x2C, 0x00, 0x10, 0x00, 0x40, 0x00,</div><div class='add'>+0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x20, 0x80, 0x8C, 0x82, 0x32, 0x0A, 0xC8, 0x08, 0x20, 0x21, 0x80, 0x8C, 0x82,</div><div class='add'>+0x32, 0x02, 0x88, 0x28, 0x20, 0xA3, 0x80, 0x8C, 0x02, 0x22, 0x0A, 0xC8, 0x28,</div><div class='add'>+0x28, 0xA3, 0x80, 0x8C, 0x82, 0x32, 0x0A, 0xC8, 0x08, 0x20, 0x03, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC4, 0xA0, 0x16, 0x83,</div><div class='add'>+0x5A, 0x0C, 0x6A, 0x31, 0xA0, 0xC4, 0xA0, 0x16, 0x83, 0x5A, 0x0C, 0x6A, 0x31,</div><div class='add'>+0xA8, 0xC5, 0xA0, 0x16, 0x83, 0x4A, 0x0C, 0x6A, 0x31, 0xA8, 0xE5, 0xA0, 0x16,</div><div class='add'>+0x83, 0x5A, 0x0C, 0x6A, 0x31, 0xA8, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x00, 0x10, 0x01, 0x40, 0x02,</div><div class='add'>+0x08, 0x21, 0x00, 0x64, 0x00, 0x10, 0x00, 0x40, 0x04, 0x00, 0x01, 0x00, 0x04,</div><div class='add'>+0x00, 0x10, 0x00, 0x00, 0x02, 0x00, 0x91, 0x00, 0x24, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x10, 0x22, 0x46, 0x88, 0x18, 0x21, 0x62, 0x80, 0x8A, 0x01, 0x26, 0x06,</div><div class='add'>+0x88, 0x18, 0x20, 0x62, 0x80, 0x88, 0x11, 0x22, 0x46, 0x88, 0x18, 0x21, 0x62,</div><div class='add'>+0x84, 0x88, 0x01, 0x22, 0x46, 0x88, 0x18, 0x21, 0x62, 0x84, 0x88, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA2, 0x0A,</div><div class='add'>+0x08, 0x2A, 0x20, 0xAA, 0x80, 0x88, 0x02, 0xA2, 0x0A, 0x08, 0x2A, 0x20, 0xAA,</div><div class='add'>+0x00, 0xAA, 0x02, 0xA2, 0x0A, 0x88, 0x28, 0x20, 0xAA, 0x80, 0xA0, 0x02, 0xA6,</div><div class='add'>+0x0A, 0x08, 0x2A, 0x20, 0xAA, 0x80, 0xA8, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x84, 0x42, 0x10, 0x0A, 0x41, 0x28,</div><div class='add'>+0x44, 0xA1, 0x10, 0x8C, 0x4A, 0x10, 0x2A, 0x41, 0x28, 0x04, 0xA1, 0x10, 0x04,</div><div class='add'>+0x42, 0x10, 0x0A, 0x41, 0x28, 0x84, 0x81, 0x10, 0x84, 0x4A, 0x10, 0x0A, 0x41,</div><div class='add'>+0x20, 0x04, 0xA1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x50, 0x80, 0x40, 0x01, 0x02, 0x05, 0x00, 0x14, 0x00, 0x50, 0x80,</div><div class='add'>+0x40, 0x01, 0x02, 0x05, 0x00, 0x14, 0x00, 0x50, 0x80, 0x40, 0x01, 0x02, 0x05,</div><div class='add'>+0x08, 0x14, 0x20, 0x50, 0x80, 0x40, 0x01, 0x02, 0x05, 0x08, 0x14, 0x20, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0xC0,</div><div class='add'>+0xCA, 0x20, 0x2B, 0x03, 0x8C, 0x0C, 0x30, 0x32, 0x40, 0xC0, 0x00, 0x01, 0x03,</div><div class='add'>+0x88, 0x0C, 0x30, 0x32, 0xC0, 0xCA, 0x00, 0x2B, 0x03, 0xAC, 0x0C, 0xB0, 0x32,</div><div class='add'>+0x40, 0xC0, 0x00, 0x2B, 0x03, 0xAC, 0x0C, 0xB0, 0x02, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xA4, 0x4E, 0x80, 0x3A, 0x01,</div><div class='add'>+0xEA, 0x04, 0xB8, 0x13, 0xA0, 0x4E, 0x80, 0x3B, 0x41, 0xEA, 0x04, 0xA8, 0x13,</div><div class='add'>+0xA0, 0x4E, 0x84, 0x3B, 0x01, 0xEA, 0x04, 0xB8, 0x13, 0xA0, 0x4E, 0x80, 0x3B,</div><div class='add'>+0x01, 0xE2, 0x44, 0xA8, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0xC4, 0x10, 0x12, 0x23, 0x08, 0x8C, 0x21, 0x30, 0x80, 0xC0,</div><div class='add'>+0x10, 0x02, 0x23, 0x08, 0x0C, 0x21, 0x30, 0x84, 0xC4, 0x18, 0x12, 0x43, 0x48,</div><div class='add'>+0x8C, 0x21, 0x31, 0x82, 0xC0, 0x18, 0x12, 0xA3, 0x48, 0x8C, 0x21, 0x31, 0x84,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFC,</div><div class='add'>+0xFF, 0xF2, 0xFF, 0xCB, 0xFF, 0x2F, 0xFF, 0xBF, 0xFC, 0xFF, 0xF2, 0xFF, 0xCB,</div><div class='add'>+0xFF, 0x2F, 0xFF, 0xBF, 0xFC, 0xFF, 0xF2, 0xFF, 0xCB, 0xFF, 0x2F, 0xFF, 0xBF,</div><div class='add'>+0xFC, 0xFF, 0xF2, 0xFF, 0xCB, 0xFF, 0x2F, 0xFF, 0xBF, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0xB4, 0xDF, 0xD0, 0x6C, 0x43, 0xB3, 0x0D, 0xCD, 0xBE,</div><div class='add'>+0x7C, 0xDB, 0xD0, 0x6C, 0x43, 0xFB, 0x0D, 0xED, 0x37, 0x34, 0xDB, 0xD0, 0x7E,</div><div class='add'>+0x43, 0xB3, 0x0D, 0xCD, 0xBE, 0x7C, 0xDB, 0xD0, 0x6C, 0x43, 0xB3, 0x0D, 0xED,</div><div class='add'>+0x37, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0xCC, 0x3F, 0x32, 0xF3, 0xC8, 0xCC, 0x23, 0x33, 0xBF, 0xFC, 0x3C, 0x32, 0xF3,</div><div class='add'>+0xC8, 0xFC, 0x23, 0xF3, 0x8F, 0xCC, 0x3C, 0x32, 0xFF, 0xC8, 0xCC, 0x23, 0x33,</div><div class='add'>+0xBF, 0xFC, 0x3C, 0x32, 0xF3, 0xC8, 0xCC, 0x23, 0xF3, 0x8F, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xDC, 0x78, 0x72, 0x7B,</div><div class='add'>+0x48, 0xEC, 0x27, 0x31, 0x86, 0xC4, 0x78, 0x12, 0x7B, 0x48, 0x8C, 0x27, 0xB1,</div><div class='add'>+0x9F, 0xDC, 0x7E, 0x72, 0xE3, 0xC9, 0xED, 0x27, 0xB7, 0x87, 0xC4, 0x7E, 0x72,</div><div class='add'>+0x7B, 0xC8, 0xED, 0x27, 0x37, 0x9E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x8E, 0x02, 0x39, 0x08, 0xE4, 0x20,</div><div class='add'>+0x80, 0x83, 0x40, 0x0E, 0x02, 0x39, 0x08, 0xE4, 0x20, 0x90, 0x83, 0x40, 0x0E,</div><div class='add'>+0x02, 0x39, 0x08, 0xE0, 0x20, 0x90, 0x83, 0x40, 0x8E, 0x02, 0x39, 0x0A, 0xE0,</div><div class='add'>+0x28, 0x80, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x20, 0xA0, 0x8E, 0x81, 0x3A, 0x02, 0xEA, 0x08, 0xA8, 0x23, 0xA0, 0x8E,</div><div class='add'>+0x80, 0x3A, 0x02, 0xEA, 0x08, 0xA8, 0x23, 0xA0, 0x8E, 0x80, 0x3A, 0x02, 0xEA,</div><div class='add'>+0x08, 0xAA, 0x23, 0xA0, 0x8E, 0x81, 0x3A, 0x06, 0xEA, 0x18, 0xB8, 0x03, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x80, 0x04,</div><div class='add'>+0x01, 0x12, 0x04, 0x48, 0x10, 0x20, 0x41, 0x80, 0x04, 0x01, 0x12, 0x04, 0x48,</div><div class='add'>+0x10, 0x20, 0x41, 0x80, 0x04, 0x01, 0x12, 0x04, 0x48, 0x10, 0x20, 0x41, 0x80,</div><div class='add'>+0x84, 0x01, 0x12, 0x06, 0x48, 0x18, 0x20, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x86, 0x00, 0x18, 0x00, 0x60,</div><div class='add'>+0x00, 0x88, 0x01, 0x00, 0x06, 0x00, 0x18, 0x00, 0x60, 0x00, 0x80, 0x01, 0x20,</div><div class='add'>+0x06, 0x00, 0x18, 0x00, 0x62, 0x00, 0x80, 0x01, 0x00, 0x06, 0x00, 0x18, 0x00,</div><div class='add'>+0x62, 0x00, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x10, 0x20, 0x4E, 0x80, 0x38, 0x01, 0xE2, 0x04, 0x88, 0x93, 0x20,</div><div class='add'>+0x4E, 0x80, 0x38, 0x01, 0xE2, 0x04, 0x88, 0x13, 0x20, 0x4A, 0x80, 0x38, 0x01,</div><div class='add'>+0xE2, 0x04, 0x88, 0x13, 0x20, 0x4E, 0x80, 0x38, 0x01, 0xE2, 0x04, 0x88, 0x03,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x06, 0x00, 0x18, 0x00, 0x60, 0x00, 0x80, 0x01, 0x00, 0x06, 0x00, 0x18, 0x00,</div><div class='add'>+0x60, 0x00, 0x80, 0x01, 0x00, 0x06, 0x00, 0x18, 0x00, 0x60, 0x00, 0x80, 0x01,</div><div class='add'>+0x00, 0x06, 0x00, 0x18, 0x08, 0x60, 0x28, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x20, 0x64, 0x80, 0x10, 0x01,</div><div class='add'>+0x42, 0x0A, 0x08, 0x31, 0x20, 0x44, 0x80, 0x10, 0x01, 0x42, 0x0C, 0x08, 0x09,</div><div class='add'>+0x20, 0x44, 0x80, 0x90, 0x00, 0x42, 0x04, 0x08, 0x11, 0x20, 0x64, 0x80, 0x90,</div><div class='add'>+0x00, 0x42, 0x02, 0x08, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0xD4, 0x20, 0x52, 0x81, 0x48, 0x05, 0x22, 0x11, 0x80, 0x54,</div><div class='add'>+0x20, 0x52, 0x81, 0x48, 0x05, 0x22, 0x15, 0x88, 0x44, 0x00, 0x52, 0x81, 0x48,</div><div class='add'>+0x04, 0x20, 0x15, 0x88, 0x54, 0x20, 0x52, 0x81, 0x48, 0x0C, 0x20, 0x11, 0x80,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x03, 0x30,</div><div class='add'>+0x00, 0xC8, 0x00, 0x28, 0x03, 0xA0, 0x3C, 0x20, 0x30, 0x00, 0xCA, 0x00, 0x00,</div><div class='add'>+0x03, 0xA0, 0x0C, 0x80, 0x32, 0x00, 0xCA, 0x00, 0x28, 0x03, 0xA0, 0x0C, 0x80,</div><div class='add'>+0x32, 0x00, 0xCA, 0x00, 0x28, 0x03, 0xA0, 0x04, 0x00, 0x02, 0x08, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x28, 0x00, 0x08,</div><div class='add'>+0x00, 0x20, 0x0E, 0x80, 0x20, 0x00, 0x02, 0x00, 0x00, 0x00, 0x20, 0x18, 0x80,</div><div class='add'>+0x18, 0x00, 0x02, 0x00, 0x88, 0x01, 0x60, 0x00, 0x80, 0x00, 0x00, 0x22, 0x00,</div><div class='add'>+0x88, 0x01, 0x20, 0x0A, 0x08, 0x02, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x10, 0x03, 0x02, 0x40, 0x08, 0x00, 0x01, 0x00, 0x04, 0x20, 0x10,</div><div class='add'>+0x00, 0x40, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00, 0x10, 0x00, 0x40, 0x00, 0x00,</div><div class='add'>+0x01, 0x00, 0x04, 0x00, 0x10, 0x00, 0x40, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00,</div><div class='add'>+0x10, 0x02, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x03,</div><div class='add'>+0x02, 0x20, 0x06, 0x80, 0x18, 0x00, 0x62, 0x00, 0x98, 0x01, 0x20, 0x06, 0x80,</div><div class='add'>+0x10, 0x00, 0x62, 0x00, 0x88, 0x01, 0x20, 0x06, 0x80, 0x18, 0x00, 0x66, 0x00,</div><div class='add'>+0x88, 0x01, 0x20, 0x06, 0x80, 0x18, 0x00, 0x66, 0x00, 0x88, 0x01, 0x0C, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x80, 0x02, 0x40, 0x06, 0x00,</div><div class='add'>+0x19, 0x00, 0x64, 0x04, 0x80, 0x01, 0x40, 0x06, 0x00, 0x18, 0x00, 0x64, 0x00,</div><div class='add'>+0x90, 0x11, 0x00, 0x06, 0x00, 0x19, 0x01, 0x60, 0x00, 0x90, 0x01, 0x40, 0x06,</div><div class='add'>+0x00, 0x19, 0x01, 0x62, 0x00, 0x80, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x02, 0xA2, 0x42, 0x20, 0x0C, 0x81, 0x30, 0x04, 0xC2, 0x10,</div><div class='add'>+0x08, 0x43, 0x20, 0x0C, 0x81, 0x30, 0x04, 0xC2, 0x10, 0x08, 0x43, 0x28, 0x0C,</div><div class='add'>+0x81, 0x30, 0x04, 0xC2, 0x10, 0x08, 0x43, 0x20, 0x0C, 0x81, 0x30, 0x04, 0xC2,</div><div class='add'>+0x10, 0x18, 0x03, 0x88, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,</div><div class='add'>+0x00, 0x00, 0x00, 0x0C, 0x00, 0x30, 0x00, 0xC0, 0x00, 0x00, 0x03, 0x00, 0x0C,</div><div class='add'>+0x00, 0x30, 0x00, 0xC0, 0x00, 0x00, 0x03, 0x00, 0x0C, 0x00, 0x30, 0x00, 0xC0,</div><div class='add'>+0x00, 0x00, 0x03, 0x00, 0x0C, 0x00, 0x30, 0x00, 0xC0, 0x04, 0x00, 0x03, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x40, 0x00, 0x0C,</div><div class='add'>+0x01, 0x30, 0x04, 0xC0, 0x30, 0x08, 0x43, 0x00, 0x0C, 0x01, 0x30, 0x04, 0xC0,</div><div class='add'>+0x10, 0x00, 0xC3, 0x20, 0x0C, 0x01, 0x30, 0x0C, 0xC2, 0x10, 0x00, 0x43, 0x00,</div><div class='add'>+0x0C, 0x01, 0x30, 0x0C, 0xC2, 0x34, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x02, 0xA2, 0x42, 0x20, 0x06, 0x81, 0x18, 0x04, 0x62,</div><div class='add'>+0x30, 0x88, 0x41, 0x20, 0x06, 0x81, 0x18, 0x04, 0x62, 0x10, 0x88, 0xC1, 0x20,</div><div class='add'>+0x06, 0x81, 0x18, 0x0C, 0x62, 0x10, 0x88, 0x41, 0x20, 0x06, 0x81, 0x18, 0x0C,</div><div class='add'>+0x60, 0x10, 0x88, 0x03, 0x88, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x02, 0x80, 0x42, 0x00, 0x04, 0x01, 0x10, 0x04, 0x40, 0x10, 0x00, 0x43, 0x00,</div><div class='add'>+0x04, 0x01, 0x10, 0x04, 0x40, 0x10, 0x00, 0x41, 0x00, 0x0C, 0x01, 0x10, 0x04,</div><div class='add'>+0xC0, 0x10, 0x00, 0x41, 0x00, 0x04, 0x01, 0x10, 0x04, 0xC0, 0x10, 0x80, 0x01,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x80, 0x42, 0x20,</div><div class='add'>+0x06, 0x81, 0x18, 0x04, 0x62, 0x10, 0x08, 0x43, 0x20, 0x06, 0x81, 0x18, 0x04,</div><div class='add'>+0x62, 0x10, 0x88, 0x41, 0x20, 0x0C, 0x81, 0x18, 0x04, 0xC2, 0x10, 0x88, 0x41,</div><div class='add'>+0x20, 0x06, 0x81, 0x18, 0x04, 0xC0, 0x30, 0x08, 0x01, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xA2, 0x02, 0x20, 0x0A, 0x80, 0x28, 0x00,</div><div class='add'>+0xA2, 0x00, 0x00, 0x02, 0x20, 0x0A, 0x80, 0x28, 0x00, 0xA2, 0x00, 0x88, 0x02,</div><div class='add'>+0x00, 0x08, 0x80, 0x28, 0x00, 0x80, 0x00, 0x88, 0x02, 0x20, 0x0A, 0x80, 0x28,</div><div class='add'>+0x80, 0x80, 0x00, 0x00, 0x42, 0x88, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x12, 0x00, 0x60, 0x00, 0x82, 0x01, 0x08, 0x06, 0x20, 0x18, 0x80, 0x60,</div><div class='add'>+0x00, 0x82, 0x01, 0x08, 0x06, 0x20, 0x18, 0x80, 0x60, 0x00, 0x82, 0x01, 0x08,</div><div class='add'>+0x06, 0x20, 0x18, 0x80, 0x60, 0x00, 0x82, 0x01, 0x08, 0x06, 0x20, 0x18, 0x80,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x40,</div><div class='add'>+0x80, 0x00, 0x01, 0x12, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x00, 0x81, 0x02,</div><div class='add'>+0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x00, 0x01, 0x02, 0x04, 0x48, 0x10, 0x20,</div><div class='add'>+0x40, 0x80, 0x00, 0x01, 0x02, 0x04, 0x08, 0x10, 0x28, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xA2, 0x62, 0xC0, 0x8A, 0x01, 0x2B,</div><div class='add'>+0x06, 0xAC, 0x18, 0xB0, 0x62, 0xC0, 0x8A, 0x01, 0x2B, 0x06, 0xAC, 0x18, 0xB0,</div><div class='add'>+0x62, 0xC0, 0x8A, 0x01, 0x2B, 0x06, 0xAC, 0x18, 0xB0, 0x62, 0xC0, 0x8A, 0x01,</div><div class='add'>+0x2B, 0x06, 0xAC, 0x18, 0xB0, 0x02, 0x88, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x80, 0x62, 0x20, 0x8E, 0x81, 0x38, 0x06, 0xE2, 0x18, 0x98,</div><div class='add'>+0x63, 0x20, 0x8E, 0x81, 0x38, 0x06, 0xE2, 0x18, 0x88, 0x63, 0x40, 0x8E, 0x81,</div><div class='add'>+0x38, 0x06, 0xE6, 0x18, 0x88, 0x63, 0x20, 0x8E, 0x81, 0x38, 0x86, 0xE6, 0x18,</div><div class='add'>+0x88, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x80,</div><div class='add'>+0x62, 0x40, 0x8E, 0x01, 0x39, 0x06, 0xE0, 0x18, 0xA0, 0x63, 0x40, 0x8E, 0x01,</div><div class='add'>+0x39, 0x06, 0xE4, 0x18, 0x90, 0x63, 0x00, 0x8E, 0x01, 0x39, 0x06, 0xE0, 0x18,</div><div class='add'>+0x90, 0x63, 0x40, 0x8E, 0x01, 0x39, 0x06, 0xE0, 0x18, 0x80, 0x03, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0xA2, 0x62, 0xA0, 0x8E, 0x81,</div><div class='add'>+0x3A, 0x06, 0xE8, 0x18, 0x88, 0x63, 0xA0, 0x8E, 0xA1, 0x3A, 0x06, 0xEA, 0x18,</div><div class='add'>+0xA8, 0x63, 0x20, 0x8C, 0x81, 0x3A, 0x06, 0xC2, 0x18, 0xA8, 0x63, 0xA0, 0x8E,</div><div class='add'>+0x81, 0x3A, 0x06, 0xC2, 0x18, 0x18, 0x43, 0x88, 0x0A, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x02, 0x00, 0x48, 0x80, 0x04, 0x01, 0x12, 0x04, 0x48, 0x12,</div><div class='add'>+0x20, 0x4B, 0x80, 0x24, 0x01, 0x12, 0x04, 0x48, 0x12, 0x20, 0x41, 0x80, 0x0E,</div><div class='add'>+0x01, 0x12, 0x04, 0xE8, 0x10, 0x20, 0x41, 0x80, 0x04, 0x01, 0x12, 0x04, 0xE8,</div><div class='add'>+0x12, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,</div><div class='add'>+0x00, 0x60, 0x00, 0x86, 0x01, 0x18, 0x06, 0x60, 0x18, 0x88, 0x61, 0x00, 0x86,</div><div class='add'>+0x01, 0x18, 0x06, 0x60, 0x18, 0x80, 0x61, 0x20, 0x86, 0x01, 0x18, 0x06, 0x62,</div><div class='add'>+0x18, 0x80, 0x61, 0x00, 0x86, 0x01, 0x18, 0x06, 0x62, 0x18, 0x00, 0x01, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA2, 0x06, 0x20, 0x1E,</div><div class='add'>+0x80, 0x70, 0x00, 0xE2, 0x01, 0x08, 0x07, 0x20, 0x1E, 0x80, 0x70, 0x00, 0xE2,</div><div class='add'>+0x01, 0x88, 0x07, 0x20, 0x1E, 0x80, 0x78, 0x00, 0xC2, 0x01, 0x88, 0x07, 0x20,</div><div class='add'>+0x1E, 0x80, 0x78, 0x00, 0xC2, 0x01, 0x88, 0x03, 0x88, 0x0A, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x02, 0x80, 0x4A, 0x00, 0x06, 0x01, 0x10, 0x04, 0x60,</div><div class='add'>+0x12, 0x00, 0x49, 0x00, 0x26, 0x01, 0x10, 0x04, 0x60, 0x12, 0x80, 0x41, 0x00,</div><div class='add'>+0x06, 0x01, 0x18, 0x04, 0x40, 0x10, 0x80, 0x41, 0x00, 0x06, 0x01, 0x18, 0x04,</div><div class='add'>+0x40, 0x12, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x02, 0x80, 0x42, 0x20, 0x04, 0x81, 0x18, 0x04, 0x42, 0x10, 0x88, 0x41, 0x20,</div><div class='add'>+0x44, 0x81, 0x18, 0x04, 0x42, 0x10, 0x08, 0x41, 0x20, 0x04, 0x81, 0x10, 0x04,</div><div class='add'>+0x62, 0x10, 0x08, 0x41, 0x20, 0x04, 0x81, 0x10, 0x04, 0x62, 0x10, 0x08, 0x01,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xA2, 0x42, 0x20,</div><div class='add'>+0x02, 0x83, 0x28, 0x04, 0x22, 0x30, 0x80, 0x42, 0x20, 0x02, 0x83, 0x28, 0x04,</div><div class='add'>+0x22, 0x10, 0x88, 0x40, 0x00, 0x02, 0x81, 0x08, 0x0C, 0xA0, 0x10, 0x88, 0x40,</div><div class='add'>+0x20, 0x02, 0x81, 0x08, 0x0C, 0xA0, 0x10, 0x80, 0x00, 0x88, 0x0A, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x40, 0x00, 0x0A, 0x03, 0x28, 0x0C,</div><div class='add'>+0xA0, 0x30, 0x80, 0xC2, 0x00, 0x4A, 0x01, 0x28, 0x0C, 0xA0, 0x30, 0x80, 0xC2,</div><div class='add'>+0x00, 0x0A, 0x03, 0x28, 0x0C, 0xA0, 0x30, 0x80, 0xC2, 0x00, 0x0A, 0x03, 0x28,</div><div class='add'>+0x0C, 0xA0, 0x10, 0x80, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x02, 0x00, 0x10, 0x00, 0x06, 0x00, 0x08, 0x01, 0x20, 0x00, 0x80, 0x10,</div><div class='add'>+0x00, 0x02, 0x00, 0x08, 0x01, 0x20, 0x04, 0x80, 0x10, 0x00, 0x42, 0x00, 0x08,</div><div class='add'>+0x00, 0x20, 0x04, 0x80, 0x10, 0x00, 0x42, 0x00, 0x08, 0x00, 0x20, 0x04, 0x88,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xA2, 0x42,</div><div class='add'>+0x40, 0x40, 0x01, 0x01, 0x04, 0x00, 0x14, 0x10, 0x40, 0x40, 0x00, 0x01, 0x01,</div><div class='add'>+0x04, 0x04, 0x10, 0x10, 0x40, 0x40, 0x00, 0x01, 0x01, 0x05, 0x04, 0x10, 0x10,</div><div class='add'>+0x40, 0x40, 0x00, 0x01, 0x01, 0x05, 0x04, 0x10, 0x10, 0x00, 0x88, 0x0A, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x80, 0x02, 0x20, 0x06, 0x80, 0x18,</div><div class='add'>+0x00, 0x66, 0x00, 0x98, 0x01, 0x20, 0x06, 0x80, 0x18, 0x00, 0x62, 0x00, 0x88,</div><div class='add'>+0x01, 0x60, 0x06, 0x80, 0x18, 0x00, 0x66, 0x00, 0x88, 0x01, 0x20, 0x06, 0x80,</div><div class='add'>+0x18, 0x00, 0x66, 0x00, 0x88, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x02, 0x80, 0x02, 0x40, 0x26, 0x00, 0x99, 0x00, 0x64, 0x02, 0x80,</div><div class='add'>+0x0B, 0x40, 0x26, 0x00, 0x99, 0x00, 0x64, 0x00, 0x90, 0x01, 0x00, 0x0E, 0x00,</div><div class='add'>+0x98, 0x00, 0xE0, 0x00, 0x90, 0x01, 0x40, 0x06, 0x80, 0x99, 0x00, 0xE0, 0x00,</div><div class='add'>+0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xA2,</div><div class='add'>+0x06, 0x20, 0x1C, 0x80, 0x70, 0x00, 0xC2, 0x01, 0x88, 0x05, 0x20, 0x1C, 0x82,</div><div class='add'>+0x70, 0x00, 0xC2, 0x01, 0x08, 0x07, 0x20, 0x16, 0x00, 0x70, 0x00, 0x62, 0x01,</div><div class='add'>+0x08, 0x07, 0x28, 0x1C, 0x00, 0x70, 0x00, 0x62, 0x01, 0x18, 0x01, 0x88, 0x0A,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x80, 0x00, 0x0C, 0x02,</div><div class='add'>+0x30, 0x0E, 0xC0, 0x20, 0x00, 0xE1, 0x00, 0x0C, 0x02, 0x30, 0x0A, 0xC0, 0x20,</div><div class='add'>+0x00, 0x83, 0x00, 0x04, 0x02, 0x30, 0x08, 0x40, 0x20, 0x00, 0x83, 0x00, 0x0C,</div><div class='add'>+0x02, 0x30, 0x0A, 0x40, 0x20, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x02, 0x00, 0x20, 0x00, 0xAC, 0x02, 0xB0, 0x0A, 0xC0, 0x2A,</div><div class='add'>+0x08, 0xAB, 0x00, 0xAC, 0x02, 0xB0, 0x0A, 0xC0, 0x28, 0x00, 0xA3, 0x20, 0x8C,</div><div class='add'>+0x02, 0xB0, 0x0A, 0xC2, 0x28, 0x00, 0xA3, 0x00, 0x8C, 0x82, 0xB0, 0x1E, 0xC2,</div><div class='add'>+0x08, 0x00, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,</div><div class='add'>+0xA2, 0xC2, 0x20, 0x06, 0x83, 0x18, 0x0E, 0x62, 0x30, 0x88, 0xE1, 0x20, 0x06,</div><div class='add'>+0x83, 0x18, 0x0E, 0x62, 0x30, 0x88, 0xC1, 0x20, 0x06, 0x83, 0x18, 0x0C, 0x62,</div><div class='add'>+0x30, 0x88, 0xC1, 0x20, 0x06, 0x03, 0x18, 0x1E, 0x62, 0x30, 0x88, 0x01, 0x88,</div><div class='add'>+0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x80, 0x02, 0x00, 0x44,</div><div class='add'>+0x00, 0x10, 0x00, 0x40, 0x04, 0x00, 0x01, 0x00, 0x04, 0x00, 0x10, 0x08, 0x40,</div><div class='add'>+0x00, 0x00, 0x01, 0x00, 0x04, 0x00, 0x10, 0x01, 0x40, 0x00, 0x00, 0x01, 0x00,</div><div class='add'>+0x04, 0x00, 0x10, 0x01, 0x40, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x02, 0x80, 0x12, 0x22, 0x06, 0x88, 0x18, 0x01, 0x62,</div><div class='add'>+0x80, 0x88, 0x11, 0x20, 0x06, 0x88, 0x18, 0x01, 0x62, 0x84, 0x88, 0x11, 0x22,</div><div class='add'>+0x46, 0x88, 0x18, 0x20, 0x62, 0x84, 0x88, 0x11, 0x22, 0x46, 0x08, 0x18, 0x40,</div><div class='add'>+0x62, 0x84, 0x88, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x02, 0xA2, 0x02, 0x22, 0x0A, 0x88, 0x28, 0x20, 0xA2, 0x00, 0x80, 0x02, 0x20,</div><div class='add'>+0x0A, 0x88, 0x28, 0x20, 0xA2, 0x00, 0x88, 0x02, 0x02, 0x0A, 0x88, 0x28, 0x20,</div><div class='add'>+0xA0, 0x80, 0x88, 0x02, 0x22, 0x0A, 0x08, 0x28, 0x20, 0xA0, 0x40, 0x80, 0x02,</div><div class='add'>+0x88, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x10, 0x04,</div><div class='add'>+0x42, 0x00, 0x28, 0x41, 0x20, 0x04, 0x81, 0x12, 0x04, 0x42, 0x10, 0x0A, 0x41,</div><div class='add'>+0x20, 0x04, 0x81, 0x10, 0x04, 0x42, 0x10, 0x08, 0x41, 0xA0, 0x04, 0x81, 0x10,</div><div class='add'>+0x04, 0x42, 0x00, 0x08, 0x00, 0xA0, 0x04, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x80, 0x40, 0x01, 0x00, 0x05,</div><div class='add'>+0x08, 0x14, 0x00, 0x50, 0x80, 0x40, 0x01, 0x00, 0x05, 0x08, 0x14, 0x20, 0x50,</div><div class='add'>+0x80, 0x40, 0x01, 0x02, 0x05, 0x00, 0x14, 0x20, 0x50, 0x80, 0x40, 0x01, 0x02,</div><div class='add'>+0x6D, 0x00, 0x94, 0x28, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x02, 0xA2, 0xB2, 0xC0, 0xCA, 0x02, 0x21, 0x0B, 0xAC, 0x2C, 0x10, 0xB2,</div><div class='add'>+0xC0, 0xCA, 0x02, 0x23, 0x0B, 0xAC, 0x2C, 0xB0, 0xB2, 0xC0, 0xCA, 0x02, 0x2A,</div><div class='add'>+0x0B, 0x84, 0x2C, 0xB0, 0xB2, 0xC0, 0xCA, 0x02, 0x2A, 0x2B, 0x84, 0x6C, 0xB0,</div><div class='add'>+0x02, 0x88, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x80, 0x12,</div><div class='add'>+0x20, 0x4E, 0x80, 0x38, 0x01, 0xE2, 0x04, 0x98, 0x13, 0x20, 0x4E, 0x80, 0x38,</div><div class='add'>+0x01, 0xE2, 0x04, 0x80, 0x13, 0x60, 0x4E, 0x80, 0x39, 0x01, 0xE6, 0x04, 0x88,</div><div class='add'>+0x13, 0x20, 0x4E, 0x80, 0x38, 0x09, 0xE6, 0x00, 0x89, 0x03, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC4, 0x10, 0x02, 0x23, 0x08,</div><div class='add'>+0x8C, 0x21, 0x30, 0x80, 0xC0, 0x10, 0x02, 0x43, 0x08, 0x8C, 0x21, 0x31, 0x84,</div><div class='add'>+0xC4, 0x08, 0x12, 0x63, 0x08, 0x8C, 0x20, 0x31, 0x86, 0xC4, 0x18, 0x12, 0x23,</div><div class='add'>+0x08, 0x8C, 0x20, 0x31, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xF2, 0xFF, 0xCB, 0xFF, 0x2F, 0xFF, 0xBF,</div><div class='add'>+0xFC, 0xFF, 0xF2, 0xFF, 0xCB, 0xFF, 0x2F, 0xFF, 0xBF, 0xFC, 0xFF, 0xF2, 0xFF,</div><div class='add'>+0xCB, 0xFF, 0x2F, 0xFF, 0xBF, 0xFC, 0xFF, 0xF2, 0xFF, 0xCB, 0xFF, 0x2F, 0xFF,</div><div class='add'>+0xBF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x34, 0xDB, 0xD0, 0xEC,</div><div class='add'>+0xCB, 0xB7, 0x0D, 0xED, 0x37, 0xFC, 0xDF, 0xD0, 0x6C, 0xC3, 0xB7, 0x0D, 0xED,</div><div class='add'>+0x37, 0x34, 0xDB, 0xD0, 0x6C, 0x43, 0xB3, 0x0D, 0xCD, 0x36, 0x34, 0xDB, 0xD0,</div><div class='add'>+0xEC, 0xCB, 0xB7, 0x2F, 0xED, 0xBF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0xCC, 0x3C, 0x32, 0xF3, 0xCB, 0xCF, 0x23, 0xF3,</div><div class='add'>+0x8F, 0xFC, 0x3F, 0x32, 0xF3, 0xC8, 0xCF, 0x23, 0xF3, 0x8F, 0xCC, 0x3C, 0x32,</div><div class='add'>+0xF3, 0xC8, 0xCC, 0x23, 0x33, 0x8F, 0xCC, 0x3C, 0x32, 0xF3, 0xCB, 0xCF, 0x2F,</div><div class='add'>+0xF3, 0xBF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0xDC, 0x78, 0x12, 0xFB, 0xC9, 0xED, 0x27, 0xB1, 0x87, 0xDC, 0x7E, 0x12,</div><div class='add'>+0xE3, 0xC9, 0xED, 0x27, 0xB7, 0x9F, 0xDC, 0x1E, 0x72, 0xFB, 0x49, 0xEC, 0x21,</div><div class='add'>+0xB7, 0x9F, 0xDC, 0x7E, 0x72, 0xFB, 0x49, 0xEC, 0x21, 0x37, 0x86, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x21, 0x00,</div><div class='add'>+0x85, 0x33, 0x14, 0x02, 0x50, 0x08, 0x40, 0x21, 0x00, 0x85, 0x00, 0x14, 0xCE,</div><div class='add'>+0x50, 0x30, 0x43, 0x21, 0x00, 0x85, 0x00, 0x14, 0x02, 0x50, 0x38, 0x43, 0xE1,</div><div class='add'>+0x0C, 0x85, 0x00, 0x14, 0xCE, 0x50, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x80, 0x00, 0x00, 0x02,</div><div class='add'>+0x00, 0x08, 0x00, 0x20, 0x00, 0x80, 0x00, 0x00, 0x02, 0x00, 0x08, 0x00, 0x20,</div><div class='add'>+0x00, 0x80, 0x00, 0x00, 0x02, 0x04, 0x08, 0x00, 0x20, 0x40, 0x80, 0x00, 0x00,</div><div class='add'>+0x02, 0x00, 0x18, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x10, 0x21, 0x40, 0x84, 0x00, 0x11, 0x02, 0x44, 0x08, 0x10, 0x21,</div><div class='add'>+0x40, 0x84, 0x00, 0x11, 0x02, 0x44, 0x08, 0x10, 0x21, 0x40, 0x84, 0x00, 0x11,</div><div class='add'>+0x02, 0x44, 0x08, 0x10, 0x21, 0x40, 0x84, 0x00, 0x11, 0x02, 0x44, 0x18, 0x02,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20,</div><div class='add'>+0x00, 0x80, 0x33, 0x00, 0x02, 0x00, 0x08, 0x10, 0x20, 0x40, 0x80, 0x00, 0x01,</div><div class='add'>+0xCE, 0x00, 0x08, 0x10, 0x20, 0x40, 0x80, 0x00, 0x00, 0x02, 0x00, 0x38, 0x03,</div><div class='add'>+0xE0, 0x4C, 0x80, 0x00, 0x01, 0xCE, 0x00, 0x38, 0x03, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00, 0x10,</div><div class='add'>+0xCC, 0x40, 0x00, 0x00, 0x01, 0x00, 0x04, 0x33, 0x10, 0x00, 0x40, 0x30, 0x03,</div><div class='add'>+0x01, 0x00, 0x04, 0x33, 0x10, 0xCC, 0x40, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00,</div><div class='add'>+0x10, 0xCC, 0x40, 0x30, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x10, 0x00, 0x40, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00, 0x10, 0x00, 0x40,</div><div class='add'>+0x00, 0x00, 0x01, 0x00, 0x04, 0x00, 0x10, 0x00, 0x40, 0x00, 0x00, 0x01, 0x00,</div><div class='add'>+0x04, 0x00, 0x10, 0x00, 0x40, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00, 0x10, 0x00,</div><div class='add'>+0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x10,</div><div class='add'>+0x01, 0x40, 0x04, 0x00, 0x11, 0x00, 0x44, 0x00, 0x10, 0x01, 0x40, 0x04, 0x00,</div><div class='add'>+0x11, 0x00, 0x44, 0x00, 0x10, 0x01, 0x40, 0x04, 0x00, 0x11, 0x00, 0x44, 0x00,</div><div class='add'>+0x10, 0x01, 0x40, 0x04, 0x00, 0x11, 0x00, 0x44, 0x00, 0x40, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x10, 0x00, 0x40, 0x00, 0x00,</div><div class='add'>+0x01, 0xCC, 0x04, 0x00, 0x10, 0x00, 0x40, 0x00, 0x33, 0x01, 0x00, 0x04, 0x30,</div><div class='add'>+0x13, 0x00, 0x40, 0x00, 0x33, 0x01, 0xCC, 0x04, 0x00, 0x10, 0x00, 0x40, 0x00,</div><div class='add'>+0x00, 0x01, 0xCC, 0x04, 0x30, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x10, 0x00, 0x50, 0x21, 0x40, 0x85, 0x00, 0x15, 0x02, 0x54, 0x38,</div><div class='add'>+0x53, 0x21, 0x40, 0x85, 0x00, 0x15, 0x02, 0x54, 0x08, 0x50, 0x21, 0x40, 0x85,</div><div class='add'>+0x33, 0x15, 0x02, 0x54, 0x08, 0x50, 0x21, 0x40, 0x85, 0x00, 0x15, 0x00, 0x54,</div><div class='add'>+0x08, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00,</div><div class='add'>+0x10, 0x20, 0x40, 0x80, 0x00, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80,</div><div class='add'>+0x00, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x00, 0x01, 0x02, 0x04,</div><div class='add'>+0x08, 0x10, 0x20, 0x40, 0x80, 0x00, 0x01, 0x86, 0x04, 0x08, 0x40, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x21, 0x00, 0x84,</div><div class='add'>+0x00, 0x10, 0x02, 0x40, 0x00, 0x00, 0x21, 0x00, 0x84, 0x00, 0x10, 0x02, 0x40,</div><div class='add'>+0x08, 0x00, 0x21, 0x00, 0x04, 0x00, 0x10, 0x02, 0x40, 0x08, 0x00, 0x21, 0x00,</div><div class='add'>+0x84, 0x00, 0x10, 0x86, 0x40, 0x08, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x10, 0x08, 0x00, 0xE0, 0x0C, 0x80, 0x00, 0x00, 0xCE, 0x00,</div><div class='add'>+0x08, 0x00, 0xE0, 0x0C, 0x80, 0x33, 0x00, 0xCE, 0x00, 0x38, 0x03, 0xE0, 0x0C,</div><div class='add'>+0x80, 0x00, 0x00, 0xCE, 0x00, 0x08, 0x00, 0xE0, 0x0C, 0x80, 0x33, 0x00, 0xCE,</div><div class='add'>+0x00, 0x08, 0x40, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10,</div><div class='add'>+0x00, 0x00, 0x21, 0x00, 0x84, 0x00, 0x10, 0x02, 0x40, 0x08, 0x00, 0x21, 0x00,</div><div class='add'>+0x84, 0x33, 0x10, 0x02, 0x40, 0x38, 0x03, 0x21, 0x00, 0x84, 0x33, 0x10, 0xCE,</div><div class='add'>+0x40, 0x38, 0x03, 0x21, 0x00, 0x84, 0x00, 0x10, 0x02, 0x40, 0x08, 0x40, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00,</div><div class='add'>+0x01, 0x00, 0x04, 0x00, 0x10, 0x00, 0x40, 0x00, 0x00, 0x81, 0x00, 0x04, 0x00,</div><div class='add'>+0x10, 0x08, 0x40, 0x00, 0x00, 0x81, 0x00, 0x04, 0x02, 0x10, 0x08, 0x40, 0x00,</div><div class='add'>+0x00, 0x01, 0x00, 0x04, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00, 0x10, 0x00,</div><div class='add'>+0x40, 0x00, 0x00, 0x01, 0x00, 0x84, 0x00, 0x10, 0x00, 0x40, 0x08, 0x00, 0x01,</div><div class='add'>+0x00, 0x84, 0x00, 0x10, 0x02, 0x40, 0x08, 0x00, 0x01, 0x00, 0x04, 0x00, 0x10,</div><div class='add'>+0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x08, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x33, 0x00, 0x00, 0x00, 0x30, 0x03, 0x00, 0x00, 0x00, 0x33, 0x00,</div><div class='add'>+0xCC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x3C, 0x3C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0xF0, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0xFC, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF,</div><div class='add'>+0x03, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0xFC, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF,</div><div class='add'>+0x03, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF,</div><div class='add'>+0x03, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF,</div><div class='add'>+0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF,</div><div class='add'>+0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF,</div><div class='add'>+0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF,</div><div class='add'>+0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF,</div><div class='add'>+0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x21, 0x00, 0x85, 0x00, 0x14, 0x02,</div><div class='add'>+0x50, 0x08, 0x40, 0x21, 0x00, 0x85, 0x00, 0x14, 0x02, 0x50, 0x08, 0x40, 0x21,</div><div class='add'>+0x00, 0x85, 0x00, 0x14, 0x02, 0x50, 0x08, 0x40, 0x21, 0x00, 0x85, 0x00, 0x14,</div><div class='add'>+0x02, 0x50, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x20, 0x00, 0x80, 0x00, 0x00, 0x02, 0x00, 0x08, 0x00, 0x20,</div><div class='add'>+0x00, 0x80, 0x00, 0x00, 0x02, 0x00, 0x08, 0x00, 0x20, 0x00, 0x80, 0x00, 0x01,</div><div class='add'>+0x02, 0x00, 0x08, 0x00, 0x20, 0x00, 0x80, 0x00, 0x00, 0x02, 0x00, 0x08, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x21,</div><div class='add'>+0x00, 0x84, 0x00, 0x10, 0x02, 0x40, 0x08, 0x10, 0x21, 0x40, 0x84, 0x00, 0x11,</div><div class='add'>+0x02, 0x44, 0x08, 0x10, 0x21, 0x40, 0x84, 0x00, 0x11, 0x02, 0x44, 0x08, 0x10,</div><div class='add'>+0x21, 0x40, 0x84, 0x00, 0x11, 0x02, 0x44, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x80, 0x00, 0x00,</div><div class='add'>+0x02, 0x00, 0x08, 0x10, 0x20, 0x40, 0x80, 0x00, 0x00, 0x02, 0x00, 0x08, 0x00,</div><div class='add'>+0x20, 0x00, 0x80, 0x00, 0x00, 0x02, 0x00, 0x08, 0x00, 0x20, 0x00, 0x80, 0x00,</div><div class='add'>+0x00, 0x02, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x10, 0x01, 0x40, 0x04, 0x00, 0x11, 0x00, 0x44, 0x00, 0x10,</div><div class='add'>+0x01, 0x40, 0x04, 0x00, 0x11, 0x00, 0x44, 0x00, 0x10, 0x01, 0x00, 0x04, 0x00,</div><div class='add'>+0x11, 0x00, 0x44, 0x00, 0x10, 0x01, 0x40, 0x04, 0x00, 0x11, 0x00, 0x44, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x40,</div><div class='add'>+0x00, 0x00, 0x01, 0x00, 0x04, 0x00, 0x10, 0x00, 0x40, 0x00, 0x00, 0x01, 0x00,</div><div class='add'>+0x04, 0x00, 0x10, 0x00, 0x40, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00, 0x10, 0x00,</div><div class='add'>+0x40, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00, 0x10, 0x00, 0x40, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x10, 0x01, 0x40, 0x04, 0x00,</div><div class='add'>+0x11, 0x00, 0x44, 0x00, 0x10, 0x01, 0x40, 0x04, 0x00, 0x11, 0x00, 0x44, 0x00,</div><div class='add'>+0x10, 0x01, 0x40, 0x04, 0x00, 0x11, 0x00, 0x44, 0x00, 0x10, 0x01, 0x40, 0x04,</div><div class='add'>+0x00, 0x11, 0x00, 0x44, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x10, 0x00, 0x10, 0x00, 0x40, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00,</div><div class='add'>+0x10, 0x00, 0x40, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00, 0x10, 0x00, 0x40, 0x00,</div><div class='add'>+0x00, 0x01, 0x00, 0x04, 0x00, 0x10, 0x00, 0x40, 0x00, 0x00, 0x01, 0x00, 0x04,</div><div class='add'>+0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00,</div><div class='add'>+0x50, 0x21, 0x40, 0x85, 0x00, 0x15, 0x02, 0x54, 0x08, 0x50, 0x21, 0x40, 0x85,</div><div class='add'>+0x00, 0x15, 0x02, 0x54, 0x08, 0x50, 0x21, 0x40, 0x85, 0x33, 0x15, 0x02, 0x54,</div><div class='add'>+0x08, 0x50, 0x21, 0x40, 0x85, 0x00, 0x15, 0x02, 0x54, 0x08, 0x40, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x10, 0x20, 0x40, 0x80,</div><div class='add'>+0x00, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x00, 0x01, 0x02, 0x04,</div><div class='add'>+0x08, 0x10, 0x20, 0x40, 0x80, 0x00, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40,</div><div class='add'>+0x80, 0x00, 0x01, 0x02, 0x04, 0x08, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x21, 0x00, 0x84, 0x00, 0x10, 0x02, 0x40,</div><div class='add'>+0x08, 0x00, 0x21, 0x00, 0x84, 0x00, 0x10, 0x02, 0x40, 0x08, 0x00, 0x21, 0x00,</div><div class='add'>+0x84, 0x00, 0x10, 0x02, 0x40, 0x08, 0x00, 0x21, 0x00, 0x84, 0x00, 0x10, 0x02,</div><div class='add'>+0x40, 0x08, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10,</div><div class='add'>+0x08, 0x00, 0xE0, 0x0C, 0x80, 0x33, 0x00, 0x02, 0x00, 0x38, 0x03, 0x20, 0x00,</div><div class='add'>+0x80, 0x33, 0x00, 0xCE, 0x00, 0x38, 0x03, 0xE0, 0x0C, 0x80, 0x33, 0x00, 0xCE,</div><div class='add'>+0x00, 0x38, 0x03, 0xE0, 0x0C, 0x80, 0x33, 0x00, 0xCE, 0x00, 0x38, 0x43, 0x20,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x21, 0x00,</div><div class='add'>+0x84, 0x00, 0x10, 0x02, 0x40, 0x08, 0x00, 0x21, 0x00, 0x84, 0x00, 0x10, 0x02,</div><div class='add'>+0x40, 0x08, 0x00, 0x21, 0x00, 0x84, 0x00, 0x10, 0x02, 0x40, 0x08, 0x00, 0x21,</div><div class='add'>+0x00, 0x84, 0x00, 0x10, 0x02, 0x40, 0x08, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00,</div><div class='add'>+0x10, 0x00, 0x40, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00, 0x10, 0x00, 0x40, 0x00,</div><div class='add'>+0x00, 0x01, 0x00, 0x04, 0x00, 0x10, 0x00, 0x40, 0x00, 0x00, 0x01, 0x00, 0x04,</div><div class='add'>+0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00, 0x10, 0x00, 0x40, 0x00, 0x00, 0x01,</div><div class='add'>+0x00, 0x04, 0x00, 0x10, 0x00, 0x40, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00, 0x10,</div><div class='add'>+0x00, 0x40, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00, 0x10, 0x00, 0x40, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x01, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x04, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x3C, 0x3C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0xF0, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0xFC, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF,</div><div class='add'>+0x03, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF,</div><div class='add'>+0x03, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF,</div><div class='add'>+0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF,</div><div class='add'>+0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF,</div><div class='add'>+0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF,</div><div class='add'>+0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF,</div><div class='add'>+0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF,</div><div class='add'>+0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x03, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x04, 0x80,</div><div class='add'>+0x40, 0x00, 0x00, 0x00, 0x0C, 0x00, 0xC2, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x04, 0x80, 0x40,</div><div class='add'>+0x40, 0x00, 0x00, 0x0C, 0x00, 0xC2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x00,</div><div class='add'>+0x00, 0x80, 0x00, 0x00, 0xA4, 0x07, 0x0C, 0x00, 0x01, 0x80, 0x00, 0x00, 0x00,</div><div class='add'>+0xC0, 0x0C, 0x00, 0x02, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x0C, 0x00, 0x01, 0x80, 0x00, 0x00, 0x00, 0xA0, 0x0C, 0x00, 0x05, 0x80,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x80, 0x00, 0x00, 0x87, 0x5A, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+0x00, 0x00</div><div class='add'>+};</div><div class='head'>diff --git a/drivers/staging/slicoss/Kconfig b/drivers/staging/slicoss/Kconfig<br/>new file mode 100644<br/>index 000000000000..d2993d339bc6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/slicoss/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/slicoss/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,14 @@</div><div class='add'>+config SLICOSS</div><div class='add'>+	tristate "Alacritech Gigabit IS-NIC support"</div><div class='add'>+	depends on PCI &amp;&amp; X86 &amp;&amp; NETDEV_1000</div><div class='add'>+	default n</div><div class='add'>+	help</div><div class='add'>+	  This driver supports Alacritech's IS-NIC gigabit ethernet cards.</div><div class='add'>+</div><div class='add'>+	  This includes the following devices:</div><div class='add'>+	    Mojave cards (single port PCI Gigabit) both copper and fiber</div><div class='add'>+	    Oasis cards (single and dual port PCI-x Gigabit) copper and fiber</div><div class='add'>+	    Kalahari cards (dual and quad port PCI-e Gigabit) copper and fiber</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here: the module</div><div class='add'>+	  will be called slicoss.</div><div class='head'>diff --git a/drivers/staging/slicoss/Makefile b/drivers/staging/slicoss/Makefile<br/>new file mode 100644<br/>index 000000000000..7bc9e9b9d3ab<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/slicoss/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/slicoss/Makefile</a></div><div class='hunk'>@@ -0,0 +1 @@</div><div class='add'>+obj-$(CONFIG_SLICOSS) += slicoss.o</div><div class='head'>diff --git a/drivers/staging/slicoss/README b/drivers/staging/slicoss/README<br/>new file mode 100644<br/>index 000000000000..2d5b1127ce51<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/slicoss/README?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/slicoss/README</a></div><div class='hunk'>@@ -0,0 +1,19 @@</div><div class='add'>+This driver is supposed to support:</div><div class='add'>+</div><div class='add'>+	Mojave cards (single port PCI Gigabit) both copper and fiber</div><div class='add'>+	Oasis cards (single and dual port PCI-x Gigabit) copper and fiber</div><div class='add'>+	Kalahari cards (dual and quad port PCI-e Gigabit) copper and fiber</div><div class='add'>+</div><div class='add'>+The driver was actually tested on Oasis and Kalahari cards.</div><div class='add'>+</div><div class='add'>+TODO:</div><div class='add'>+	- move firmware loading to request_firmware()</div><div class='add'>+	- remove direct memory access of structures</div><div class='add'>+	- any remaining sparse and checkpatch.pl warnings</div><div class='add'>+	- any netdev recommended changes</div><div class='add'>+</div><div class='add'>+Please send patches to:</div><div class='add'>+        Greg Kroah-Hartman &lt;gregkh@suse.de&gt;</div><div class='add'>+and Cc: Lior Dotan &lt;liodot@gmail.com&gt; and Christopher Harrer</div><div class='add'>+&lt;charrer@alacritech.com&gt; as well as they are also able to test out any</div><div class='add'>+changes.</div><div class='head'>diff --git a/drivers/staging/slicoss/gbdownload.h b/drivers/staging/slicoss/gbdownload.h<br/>new file mode 100644<br/>index 000000000000..794432bd1d77<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/slicoss/gbdownload.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/slicoss/gbdownload.h</a></div><div class='hunk'>@@ -0,0 +1,8215 @@</div><div class='add'>+#define MOJAVE_UCODE_VERS_STRING	"1.2"</div><div class='add'>+#define MOJAVE_UCODE_VERS_DATE  	"2006/03/27 15:12:22"</div><div class='add'>+#define MOJAVE_UCODE_HOSTIF_ID  	3</div><div class='add'>+</div><div class='add'>+static s32 MNumSections = 0x2;</div><div class='add'>+static u32 MSectionSize[] =</div><div class='add'>+{</div><div class='add'>+	0x00008000, 0x00010000,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u32 MSectionStart[] =</div><div class='add'>+{</div><div class='add'>+	0x00000000, 0x00008000,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u8 MojaveUCode[2][65536] =</div><div class='add'>+{</div><div class='add'>+	{</div><div class='add'>+	0x12, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x18, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x03, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa8,</div><div class='add'>+	0x98, 0xb0, 0x01, 0x00, 0x04, 0x80, 0xa2, 0x40, 0xfd, 0x7f, 0x00, 0x00,</div><div class='add'>+	0x09, 0x00, 0xa2, 0x49, 0xdd, 0x7d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4c,</div><div class='add'>+	0x80, 0xb2, 0x01, 0x00, 0x07, 0x00, 0x00, 0x40, 0xd1, 0xb1, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4c, 0x80, 0xb2, 0x01, 0x00, 0x09, 0x00, 0xa2, 0x40,</div><div class='add'>+	0x75, 0x7d, 0x00, 0x00, 0x60, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00,</div><div class='add'>+	0x0b, 0x00, 0xa8, 0xb1, 0x7e, 0x31, 0x00, 0x00, 0x09, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x11, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x00, 0x80, 0x1f, 0xe9, 0x18, 0x31, 0x00, 0x00, 0x00, 0x00, 0x41, 0xe9,</div><div class='add'>+	0x80, 0xb2, 0x01, 0x00, 0x0f, 0x00, 0x40, 0xe9, 0x80, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0xa5, 0x99, 0x01, 0x00, 0x16, 0x00, 0x29, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x16, 0x00, 0x14, 0xbc, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x0f, 0x00, 0x93, 0xbc, 0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x50, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x80, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x10, 0x00, 0x00, 0x40, 0xa5, 0x99, 0x01, 0x00, 0x1c, 0x00, 0x29, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x1c, 0x00, 0x14, 0xbc, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x11, 0x00, 0x93, 0xbc, 0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x50, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x01, 0x80, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x20, 0x00, 0x00, 0x40, 0xa5, 0x99, 0x01, 0x00, 0x22, 0x00, 0x29, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x22, 0x00, 0x14, 0xbc, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x0e, 0x00, 0x93, 0xbc, 0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x49,</div><div class='add'>+	0xdd, 0x81, 0x01, 0x00, 0x2b, 0x01, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x3c, 0x01, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x27, 0x00, 0x14, 0xbc,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x14, 0x01, 0x13, 0xbc, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x54, 0x95, 0x00, 0x40, 0x45, 0x99, 0x01, 0x00, 0xff, 0xff, 0x00, 0x40,</div><div class='add'>+	0xe5, 0x99, 0x01, 0x00, 0x00, 0x00, 0x2f, 0x40, 0x49, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0xe1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4b,</div><div class='add'>+	0xb7, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0xb5, 0xb3, 0x01, 0x00,</div><div class='add'>+	0xd9, 0x00, 0x00, 0x40, 0xb3, 0x33, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0xb6, 0xd3, 0x01, 0x00, 0x32, 0x00, 0x95, 0xe8, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0xff, 0xff, 0x00, 0xe8, 0x80, 0x88, 0x01, 0x00, 0xb8, 0x00, 0x26, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xfd, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0xff, 0xb3, 0x01, 0x00, 0x3c, 0x00, 0x22, 0x50,</div><div class='add'>+	0x83, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x45, 0xfd, 0x93, 0x01, 0x00,</div><div class='add'>+	0xa5, 0xa5, 0x00, 0xa6, 0xb4, 0xa7, 0x01, 0x00, 0x3c, 0x00, 0xa2, 0x50,</div><div class='add'>+	0xb5, 0x73, 0x00, 0x00, 0x00, 0x01, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x3c, 0x00, 0xa2, 0x45, 0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46,</div><div class='add'>+	0xfd, 0x93, 0x01, 0x00, 0x41, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x7f, 0x00, 0x00, 0x20, 0xf5, 0xcf, 0x01, 0x00, 0x1c, 0x01, 0x00, 0xfa,</div><div class='add'>+	0xb3, 0x33, 0x01, 0x00, 0xa5, 0xa5, 0x00, 0xda, 0xb5, 0xab, 0x01, 0x00,</div><div class='add'>+	0x99, 0x00, 0xa2, 0x50, 0xb5, 0x63, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0xfd, 0x93, 0x01, 0x00, 0xd5, 0x00, 0x00, 0x44, 0xb3, 0x33, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0xd5, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0xda,</div><div class='add'>+	0xd7, 0xb1, 0x01, 0x00, 0xff, 0xff, 0x00, 0xda, 0xed, 0x8b, 0x01, 0x00,</div><div class='add'>+	0xd5, 0x00, 0x00, 0x46, 0xb3, 0x33, 0x01, 0x00, 0x08, 0x00, 0x00, 0x40,</div><div class='add'>+	0xd5, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0xda, 0xd7, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xff, 0x00, 0x00, 0xda, 0xef, 0x8b, 0x01, 0x00, 0xff, 0x00, 0x00, 0xda,</div><div class='add'>+	0xe3, 0x8f, 0x01, 0x00, 0xd5, 0x00, 0x00, 0x48, 0xb3, 0x33, 0x01, 0x00,</div><div class='add'>+	0x3c, 0x00, 0x00, 0x40, 0xd5, 0x99, 0x01, 0x00, 0xff, 0x00, 0x00, 0xda,</div><div class='add'>+	0xd7, 0x8d, 0x01, 0x00, 0xff, 0xff, 0x00, 0xda, 0xf1, 0xdb, 0x01, 0x00,</div><div class='add'>+	0xff, 0x00, 0x00, 0xda, 0xe9, 0x8b, 0x01, 0x00, 0x00, 0x00, 0x00, 0x48,</div><div class='add'>+	0xe9, 0xe3, 0x01, 0x00, 0xd5, 0x00, 0x00, 0x4b, 0xb3, 0x33, 0x01, 0x00,</div><div class='add'>+	0x2c, 0x00, 0x00, 0x40, 0xd5, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0xda,</div><div class='add'>+	0xd7, 0xb1, 0x01, 0x00, 0xd5, 0x00, 0x00, 0x4c, 0xb3, 0x33, 0x01, 0x00,</div><div class='add'>+	0xff, 0xff, 0x00, 0xda, 0xeb, 0xdb, 0x01, 0x00, 0xd5, 0x00, 0x00, 0x4e,</div><div class='add'>+	0xb3, 0x33, 0x01, 0x00, 0x03, 0x00, 0x00, 0xda, 0x81, 0x88, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x5c, 0x81, 0xe0, 0x01, 0x00, 0xff, 0xff, 0x00, 0xda,</div><div class='add'>+	0xb5, 0xdb, 0x01, 0x00, 0x5c, 0x00, 0x26, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x01, 0x00, 0x00, 0xda, 0xb5, 0xcf, 0x01, 0x00, 0x00, 0xf0, 0x00, 0xa7,</div><div class='add'>+	0xb4, 0x87, 0x01, 0x00, 0x00, 0x00, 0x00, 0xda, 0x81, 0x94, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0xd8, 0xb1, 0x01, 0x00, 0xd5, 0x00, 0x00, 0x50,</div><div class='add'>+	0xb3, 0x33, 0x01, 0x00, 0xff, 0xff, 0x00, 0xda, 0xb5, 0x8b, 0x01, 0x00,</div><div class='add'>+	0x62, 0x00, 0x26, 0x4c, 0xb5, 0x63, 0x00, 0x00, 0x01, 0x00, 0x00, 0xda,</div><div class='add'>+	0xb5, 0xcf, 0x01, 0x00, 0x00, 0x00, 0x00, 0xda, 0xdf, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xd5, 0x00, 0x00, 0x52, 0xb3, 0x33, 0x01, 0x00, 0xff, 0x00, 0x00, 0xda,</div><div class='add'>+	0x4b, 0x89, 0x01, 0x00, 0x08, 0x00, 0x00, 0xda, 0xdf, 0xf7, 0x01, 0x00,</div><div class='add'>+	0xff, 0x00, 0x00, 0xef, 0xdf, 0x8b, 0x01, 0x00, 0x69, 0x00, 0x22, 0x40,</div><div class='add'>+	0xdf, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x47, 0xfd, 0x93, 0x01, 0x00,</div><div class='add'>+	0x20, 0x00, 0x00, 0x40, 0xb3, 0x9b, 0x01, 0x00, 0xd5, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x06, 0x00, 0x00, 0x40, 0xd5, 0x99, 0x01, 0x00,</div><div class='add'>+	0x08, 0x00, 0x00, 0xda, 0xd7, 0xe5, 0x01, 0x00, 0xf8, 0x00, 0x00, 0xda,</div><div class='add'>+	0xb3, 0x8b, 0x01, 0x00, 0x34, 0x00, 0x00, 0x40, 0xd5, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xd9, 0xd7, 0xb1, 0x01, 0x00, 0x02, 0x00, 0x00, 0xd9,</div><div class='add'>+	0xd5, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0xda, 0xd7, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x22, 0x00, 0x00, 0x40, 0xb3, 0x9b, 0x01, 0x00, 0xd5, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0x48, 0xb5, 0xf3, 0x01, 0x00,</div><div class='add'>+	0x03, 0x00, 0x00, 0xda, 0x7b, 0x89, 0x01, 0x00, 0x00, 0x01, 0x00, 0x40,</div><div class='add'>+	0xdd, 0x9b, 0x01, 0x00, 0xd5, 0x00, 0x00, 0x5d, 0xb3, 0x33, 0x01, 0x00,</div><div class='add'>+	0xff, 0xff, 0x00, 0xda, 0xe7, 0x8b, 0x01, 0x00, 0x8a, 0x00, 0x26, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0xfd, 0x93, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x50, 0xe7, 0xe3, 0x01, 0x00, 0x00, 0x01, 0x00, 0x40,</div><div class='add'>+	0xd5, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf6, 0xe7, 0x97, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf3, 0xd7, 0xb1, 0x01, 0x00, 0xd5, 0x00, 0x00, 0x5e,</div><div class='add'>+	0xb3, 0x33, 0x01, 0x00, 0xff, 0x00, 0x00, 0xda, 0xe5, 0x8b, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x48, 0xe5, 0xe3, 0x01, 0x00, 0x08, 0x01, 0x00, 0x40,</div><div class='add'>+	0xd5, 0x99, 0x01, 0x00, 0xff, 0x00, 0x00, 0xda, 0xb5, 0x8f, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf7, 0xb5, 0x97, 0x01, 0x00, 0x00, 0x00, 0x00, 0xda,</div><div class='add'>+	0xd7, 0xb1, 0x01, 0x00, 0x3c, 0x01, 0x00, 0x40, 0xd5, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf8, 0xe5, 0x97, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf2,</div><div class='add'>+	0xd7, 0xb1, 0x01, 0x00, 0x00, 0x02, 0x00, 0x40, 0xdd, 0x9b, 0x01, 0x00,</div><div class='add'>+	0x96, 0x00, 0x22, 0xf5, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42,</div><div class='add'>+	0xfd, 0x93, 0x01, 0x00, 0x00, 0x00, 0x00, 0xee, 0xd5, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf6, 0xeb, 0x97, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf5,</div><div class='add'>+	0xd7, 0xb1, 0x01, 0x00, 0x08, 0x00, 0x00, 0xea, 0xd4, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf7, 0xe3, 0x97, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf1,</div><div class='add'>+	0xd7, 0xb1, 0x01, 0x00, 0x3c, 0x00, 0x00, 0xee, 0xdd, 0xcb, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xee, 0xd5, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8,</div><div class='add'>+	0xe9, 0x97, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf4, 0xd7, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xd5, 0x00, 0x00, 0x4a, 0xb3, 0x33, 0x01, 0x00, 0xff, 0xff, 0x00, 0xda,</div><div class='add'>+	0xdd, 0x89, 0x01, 0x00, 0xb7, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0xd5, 0x99, 0x01, 0x00, 0x05, 0x00, 0x00, 0xa6,</div><div class='add'>+	0xd6, 0xb1, 0x01, 0x00, 0x9a, 0x13, 0x00, 0xeb, 0xd6, 0x99, 0x01, 0x00,</div><div class='add'>+	0x08, 0x00, 0x00, 0x40, 0xd5, 0x99, 0x01, 0x00, 0x00, 0x02, 0x00, 0xa6,</div><div class='add'>+	0xd6, 0xb1, 0x01, 0x00, 0x01, 0x00, 0x00, 0xeb, 0xd6, 0x99, 0x01, 0x00,</div><div class='add'>+	0x2c, 0x00, 0x00, 0x40, 0xd5, 0x99, 0x01, 0x00, 0x05, 0x00, 0x00, 0xa6,</div><div class='add'>+	0xd6, 0xb1, 0x01, 0x00, 0x9a, 0x13, 0x00, 0xeb, 0xd6, 0x99, 0x01, 0x00,</div><div class='add'>+	0x3c, 0x01, 0x00, 0x40, 0xd5, 0x99, 0x01, 0x00, 0x00, 0x02, 0x00, 0x40,</div><div class='add'>+	0xd7, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x42, 0xfd, 0x93, 0x01, 0x00,</div><div class='add'>+	0x3c, 0x00, 0x00, 0x40, 0xd5, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0xa6,</div><div class='add'>+	0xd6, 0xb1, 0x01, 0x00, 0x00, 0x01, 0x00, 0xeb, 0xd6, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x01, 0x00, 0x40, 0xd5, 0x99, 0x01, 0x00, 0x06, 0x00, 0x00, 0xa6,</div><div class='add'>+	0xd6, 0xb1, 0x01, 0x00, 0x9a, 0x13, 0x00, 0xeb, 0xd6, 0x99, 0x01, 0x00,</div><div class='add'>+	0x08, 0x01, 0x00, 0x40, 0xd5, 0x99, 0x01, 0x00, 0x00, 0x02, 0x00, 0xa6,</div><div class='add'>+	0xd6, 0xb1, 0x01, 0x00, 0x01, 0x00, 0x00, 0xeb, 0xd6, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0xd9, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0xdf, 0xb1, 0x01, 0x00, 0x06, 0x00, 0x00, 0x40, 0xd5, 0x99, 0x01, 0x00,</div><div class='add'>+	0xa0, 0x00, 0x00, 0xa6, 0xd6, 0xb1, 0x01, 0x00, 0x64, 0x00, 0x00, 0x40,</div><div class='add'>+	0x4b, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x7b, 0x99, 0x01, 0x00,</div><div class='add'>+	0x02, 0x04, 0x00, 0x40, 0xdd, 0x99, 0x01, 0x00, 0xb7, 0x00, 0x13, 0xbc,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x02, 0x08, 0x00, 0x40, 0xdd, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4c, 0xdd, 0x91, 0x01, 0x00, 0xb8, 0x00, 0x95, 0xe8,</div><div class='add'>+	0x84, 0x30, 0x00, 0x00, 0x00, 0x00, 0x2f, 0xe9, 0xfa, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0xd1, 0xb1, 0x01, 0x00, 0xff, 0x00, 0x00, 0x42,</div><div class='add'>+	0x80, 0x88, 0x01, 0x00, 0x34, 0x00, 0x00, 0x40, 0x80, 0xce, 0x01, 0x00,</div><div class='add'>+	0xb8, 0x00, 0xa6, 0x40, 0x81, 0x32, 0x00, 0x00, 0xc1, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x02, 0x80, 0x22, 0x40, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0xb8, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4f,</div><div class='add'>+	0x81, 0xb0, 0x01, 0x00, 0xca, 0x00, 0x09, 0xf9, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0xc8, 0x00, 0x08, 0xf9, 0x81, 0x32, 0x00, 0x00, 0xd4, 0x00, 0x1f, 0xfd,</div><div class='add'>+	0xf9, 0x33, 0x00, 0x00, 0xc7, 0x00, 0x9e, 0xfd, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4a, 0xf3, 0x93, 0x01, 0x00, 0x00, 0x00, 0x80, 0x48,</div><div class='add'>+	0xf3, 0x93, 0x01, 0x00, 0x00, 0x00, 0x00, 0xfd, 0xf7, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x49, 0xf3, 0x93, 0x01, 0x00, 0x00, 0x00, 0x00, 0xfc,</div><div class='add'>+	0x19, 0xb1, 0x01, 0x00, 0xcf, 0x00, 0x0a, 0xf9, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x40, 0xfb, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x41, 0xfd,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x07, 0x80, 0xf9, 0xf3, 0x8f, 0x01, 0x00,</div><div class='add'>+	0x00, 0x07, 0x42, 0xf9, 0xf3, 0x8f, 0x01, 0x00, 0xd3, 0x00, 0xa2, 0xff,</div><div class='add'>+	0xf7, 0x6f, 0x00, 0x00, 0x00, 0x00, 0x43, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0xa2, 0xff, 0xfb, 0xef, 0x00, 0x00, 0x00, 0x00, 0x80, 0xfc,</div><div class='add'>+	0xe1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x80, 0x40, 0x81, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xd8, 0x00, 0x06, 0xfe, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0xb3, 0xe3, 0x01, 0x00, 0x1c, 0x01, 0x00, 0xfa, 0xb3, 0xc3, 0x00, 0x00,</div><div class='add'>+	0xda, 0x00, 0x00, 0x42, 0x8d, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x8d, 0xb0, 0x01, 0x00, 0x00, 0x04, 0x00, 0x40, 0x83, 0x98, 0x01, 0x00,</div><div class='add'>+	0xeb, 0x00, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0x50,</div><div class='add'>+	0x83, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x84, 0x96, 0x80, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x26, 0x01, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x25, 0x01, 0x00, 0x40,</div><div class='add'>+	0x2d, 0x11, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x2d, 0x81, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xda, 0xb5, 0xeb, 0x01, 0x00, 0xe4, 0x00, 0x84, 0x96,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0xe5, 0x00, 0x00, 0x40, 0xb5, 0x93, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0xb5, 0x83, 0x01, 0x00, 0xde, 0x00, 0xa2, 0x41,</div><div class='add'>+	0x83, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x2d, 0x81, 0x01, 0x00,</div><div class='add'>+	0x26, 0x01, 0x00, 0x41, 0x2d, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0xb3, 0xc3, 0x01, 0x00, 0xda, 0x00, 0xa2, 0x41, 0x8d, 0x50, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0xda, 0xb5, 0xbf, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4b,</div><div class='add'>+	0x81, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xdb, 0x81, 0xd0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xd9, 0xb9, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0xb8, 0xe3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xdc, 0xb9, 0xeb, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0xb8, 0x97, 0x01, 0x00, 0x15, 0x00, 0x00, 0xdc,</div><div class='add'>+	0xb9, 0xe7, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41, 0x2d, 0x81, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xdb, 0x81, 0xb0, 0x01, 0x00, 0x27, 0x01, 0x00, 0x42,</div><div class='add'>+	0x2d, 0x11, 0x01, 0x00, 0x25, 0x01, 0x00, 0x40, 0x2d, 0x11, 0x01, 0x00,</div><div class='add'>+	0x28, 0x01, 0x00, 0x40, 0x2d, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x2d, 0x91, 0x01, 0x00, 0x26, 0x01, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x25, 0x01, 0x00, 0x40, 0x2d, 0x11, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x2d, 0x81, 0x01, 0x00, 0x00, 0x00, 0xa2, 0x41, 0x81, 0xd0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x84, 0x96, 0x80, 0x32, 0x01, 0x00, 0xff, 0x00, 0xa0, 0xdc,</div><div class='add'>+	0xb9, 0x6b, 0x00, 0x00, 0xf8, 0x00, 0x00, 0x41, 0x2d, 0x91, 0x00, 0x00,</div><div class='add'>+	0xf8, 0x00, 0x00, 0x41, 0x2d, 0x81, 0x00, 0x00, 0xd8, 0x00, 0x00, 0x40,</div><div class='add'>+	0xb3, 0x33, 0x01, 0x00, 0x00, 0x00, 0x90, 0xda, 0x8b, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x11, 0x00, 0x00, 0x45, 0x88, 0xf4, 0x01, 0x00, 0x40, 0x00, 0x00, 0x44,</div><div class='add'>+	0x80, 0xce, 0x01, 0x00, 0x00, 0x00, 0xa4, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0xa3, 0x44, 0x89, 0xec, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42,</div><div class='add'>+	0x89, 0xd0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x42, 0x87, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xd9, 0x00, 0x00, 0x43, 0xb2, 0x33, 0x01, 0x00, 0x00, 0x00, 0x00, 0x50,</div><div class='add'>+	0xb5, 0xf3, 0x01, 0x00, 0x0c, 0x01, 0xa0, 0xda, 0x8b, 0x40, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x8b, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x87, 0xc0, 0x01, 0x00, 0x08, 0x01, 0xa2, 0x41, 0x89, 0x50, 0x00, 0x00,</div><div class='add'>+	0xff, 0xff, 0x00, 0x45, 0x88, 0x88, 0x01, 0x00, 0x10, 0x00, 0x00, 0x45,</div><div class='add'>+	0x8a, 0xf4, 0x01, 0x00, 0x12, 0x01, 0x90, 0x44, 0x8a, 0x40, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x8b, 0xc0, 0x01, 0x00, 0xff, 0xff, 0x00, 0x45,</div><div class='add'>+	0x8a, 0xa8, 0x01, 0x00, 0x00, 0x00, 0x80, 0x50, 0x8b, 0xe0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x80, 0x00, 0x40, 0xf9, 0x9b, 0x01, 0x00, 0x00, 0xc0, 0x00, 0x40,</div><div class='add'>+	0xb3, 0xcf, 0x01, 0x00, 0x1c, 0x01, 0x00, 0xfc, 0x19, 0x31, 0x01, 0x00,</div><div class='add'>+	0x1c, 0x01, 0x40, 0xda, 0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x41, 0xda,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41, 0xf9, 0xc3, 0x01, 0x00,</div><div class='add'>+	0x16, 0x01, 0x9f, 0xda, 0x81, 0x32, 0x00, 0x00, 0x02, 0x80, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x91, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xd9, 0x2b, 0xb1, 0x01, 0x00, 0x1e, 0x01, 0x9f, 0x94,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x18, 0x00, 0x00, 0x94, 0x92, 0xe4, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x48, 0xb5, 0xf3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x49,</div><div class='add'>+	0xb4, 0x97, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41, 0xb3, 0xc3, 0x01, 0x00,</div><div class='add'>+	0x1d, 0x01, 0xa2, 0x41, 0x91, 0x50, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40,</div><div class='add'>+	0x2b, 0xb1, 0x01, 0x00, 0x29, 0x01, 0x00, 0x51, 0x93, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x29, 0x01, 0x00, 0x4d, 0x93, 0xb0, 0x00, 0x00, 0x29, 0x01, 0x00, 0x49,</div><div class='add'>+	0x93, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x93, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x29, 0x01, 0xa2, 0x41, 0x93, 0x50, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x10, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x11, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x12, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x13, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x14, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x15, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x16, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x17, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x18, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x19, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x1a, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x1b, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x1c, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x1d, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x1e, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x1f, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x04, 0x00, 0x40,</div><div class='add'>+	0xa1, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x50, 0xa1, 0xd1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x1b, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x19, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x17, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x15, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x13, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x11, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x0f, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x0d, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x0b, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x09, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x07, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x05, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x03, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x01, 0xb0, 0x01, 0x00, 0x44, 0x01, 0x20, 0x48, 0xa1, 0x51, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x50, 0x01, 0x22, 0x4b,</div><div class='add'>+	0x74, 0x7d, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x60, 0x00, 0x00, 0x4b, 0x60, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0xb1,</div><div class='add'>+	0x7e, 0xb1, 0x01, 0x00, 0x51, 0x01, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x4e, 0x01, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x80, 0x40,</div><div class='add'>+	0x97, 0x98, 0x01, 0x00, 0x00, 0x00, 0x00, 0x58, 0x07, 0x90, 0x01, 0x00,</div><div class='add'>+	0xf3, 0x9f, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0xa5, 0xb3, 0x01, 0x00, 0xaf, 0x02, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0xc5, 0x02, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5c,</div><div class='add'>+	0x07, 0x90, 0x01, 0x00, 0xf3, 0x9f, 0x00, 0x40, 0xbf, 0xb3, 0x00, 0x00,</div><div class='add'>+	0x5f, 0x01, 0x22, 0xcc, 0x85, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x51,</div><div class='add'>+	0x07, 0x90, 0x01, 0x00, 0xf3, 0x9f, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x49, 0xb1, 0x01, 0x00, 0xae, 0x03, 0x00, 0xcb,</div><div class='add'>+	0xa3, 0xc9, 0x01, 0x00, 0xd0, 0x14, 0x00, 0x40, 0xa1, 0x9b, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x20, 0x46, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x48,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd0, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xca, 0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd5,</div><div class='add'>+	0xe1, 0xb1, 0x01, 0x00, 0x07, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00,</div><div class='add'>+	0x20, 0x00, 0x00, 0x20, 0x62, 0xdd, 0x01, 0x00, 0x68, 0x01, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0xcc, 0x85, 0x93, 0x01, 0x00,</div><div class='add'>+	0xc5, 0x02, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0xd0, 0x14, 0x00, 0x40,</div><div class='add'>+	0x43, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0xfa, 0xba, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xfa, 0xa4, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8,</div><div class='add'>+	0xbc, 0xb3, 0x01, 0x00, 0x00, 0x14, 0x2f, 0x40, 0x81, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xe7, 0xa7, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd8,</div><div class='add'>+	0xa9, 0xb3, 0x01, 0x00, 0xff, 0x00, 0x00, 0xdd, 0x81, 0x88, 0x01, 0x00,</div><div class='add'>+	0x02, 0x00, 0x00, 0x40, 0x80, 0xf4, 0x01, 0x00, 0x78, 0x01, 0x00, 0x40,</div><div class='add'>+	0x80, 0xc8, 0x01, 0x00, 0x88, 0x01, 0x00, 0xdd, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x10, 0xb1, 0x00, 0x00, 0x89, 0x01, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x8a, 0x01, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x8b, 0x01, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x8c, 0x01, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x8d, 0x01, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x8f, 0x01, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x91, 0x01, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x55, 0x01, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xd2, 0x01, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x55, 0x01, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0xe0, 0x01, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xe1, 0x01, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x7f, 0x02, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x80, 0x02, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xf1, 0x9f, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xf2, 0x9f, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x77, 0x01, 0x00, 0x41, 0x81, 0xc0, 0x1a, 0x00,</div><div class='add'>+	0x5a, 0x01, 0x51, 0x40, 0x81, 0xb2, 0x1a, 0x00, 0x5a, 0x01, 0x52, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x1a, 0x00, 0x5a, 0x01, 0x55, 0x40, 0x81, 0xb2, 0x1a, 0x00,</div><div class='add'>+	0x5a, 0x01, 0x56, 0x40, 0x81, 0xb2, 0x1a, 0x00, 0x55, 0x01, 0x91, 0x81,</div><div class='add'>+	0x80, 0x30, 0x1a, 0x00, 0x5a, 0x01, 0x45, 0x40, 0x81, 0xb2, 0x1a, 0x00,</div><div class='add'>+	0x55, 0x01, 0x91, 0x82, 0x80, 0x30, 0x1a, 0x00, 0x5a, 0x01, 0x46, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x89, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x2f, 0x40, 0x81, 0xb0, 0x01, 0x00, 0x00, 0x14, 0x00, 0x40,</div><div class='add'>+	0x49, 0x99, 0x01, 0x00, 0xb5, 0x01, 0x22, 0xde, 0xe1, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4c, 0x49, 0xc1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x81, 0xc0, 0x01, 0x00, 0x94, 0x01, 0xa2, 0x44, 0x81, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4c, 0x49, 0xd1, 0x01, 0x00, 0x9c, 0x01, 0x22, 0x40,</div><div class='add'>+	0xe1, 0x6d, 0x00, 0x00, 0x98, 0x01, 0xa2, 0x41, 0x81, 0x50, 0x00, 0x00,</div><div class='add'>+	0x55, 0x01, 0x00, 0x41, 0xbf, 0xb3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42,</div><div class='add'>+	0xbf, 0xb3, 0x01, 0x00, 0x55, 0x01, 0xa0, 0x0f, 0xbd, 0x6f, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xde, 0xe1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0x49, 0xc1, 0x01, 0x00, 0xb7, 0x01, 0x00, 0x40, 0x19, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x42, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x43, 0xff,</div><div class='add'>+	0x85, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xde, 0x19, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x42, 0xff, 0x87, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x43, 0xff,</div><div class='add'>+	0xe1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44, 0x49, 0xc1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x2f, 0xff, 0xe1, 0xb1, 0x01, 0x00, 0x08, 0x14, 0x00, 0xa4,</div><div class='add'>+	0x80, 0xcc, 0x01, 0x00, 0xac, 0x01, 0x26, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x85, 0xc0, 0x01, 0x00, 0xaa, 0x01, 0xa2, 0x4c,</div><div class='add'>+	0x81, 0x50, 0x00, 0x00, 0xb6, 0x01, 0x22, 0xd2, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0xb1, 0x01, 0x22, 0x41, 0xa5, 0x6f, 0x00, 0x00, 0x55, 0x01, 0xa2, 0xe0,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd2, 0xc1, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x5c, 0x89, 0x90, 0x01, 0x00, 0x00, 0x00, 0x40, 0x42,</div><div class='add'>+	0x80, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x41, 0x43, 0x80, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf0, 0x88, 0x94, 0x01, 0x00, 0x5a, 0x01, 0x00, 0x44,</div><div class='add'>+	0xe0, 0xb1, 0x00, 0x00, 0xb3, 0x01, 0x00, 0x48, 0x49, 0xc1, 0x00, 0x00,</div><div class='add'>+	0xb1, 0x01, 0x00, 0x5b, 0x89, 0x90, 0x00, 0x00, 0xb0, 0x9f, 0x00, 0xa0,</div><div class='add'>+	0x9e, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4d, 0x81, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x43, 0xcb, 0x83, 0x01, 0x00, 0x00, 0x00, 0x45, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0xba, 0x01, 0xa2, 0x41, 0x81, 0x50, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x45, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x45, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0xc4, 0x01, 0x91, 0x82, 0x82, 0x30, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x8a, 0x80, 0xb0, 0x01, 0x00, 0xb6, 0x9f, 0x00, 0x40,</div><div class='add'>+	0x80, 0xce, 0x01, 0x00, 0xc3, 0x01, 0xa6, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0xc4, 0x01, 0x56, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x53,</div><div class='add'>+	0x6f, 0x93, 0x01, 0x00, 0xf3, 0x9f, 0x00, 0x52, 0x6f, 0x93, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4d, 0x81, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x42,</div><div class='add'>+	0xcd, 0x83, 0x01, 0x00, 0x00, 0x00, 0x46, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0xc7, 0x01, 0xa2, 0x41, 0x81, 0x50, 0x00, 0x00, 0x00, 0x00, 0x46, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x46, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0xd1, 0x01, 0x91, 0x81, 0x82, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89,</div><div class='add'>+	0x80, 0xb0, 0x01, 0x00, 0xb6, 0x9f, 0x00, 0x40, 0x80, 0xce, 0x01, 0x00,</div><div class='add'>+	0xd0, 0x01, 0xa6, 0x40, 0x81, 0x32, 0x00, 0x00, 0xd1, 0x01, 0x55, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x52, 0x6f, 0x93, 0x01, 0x00,</div><div class='add'>+	0xf3, 0x9f, 0x00, 0x53, 0x6f, 0x93, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x83, 0xb0, 0x01, 0x00, 0x00, 0x14, 0x00, 0x40, 0x49, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x23, 0x40, 0x81, 0xb0, 0x01, 0x00, 0xda, 0x01, 0x22, 0xde,</div><div class='add'>+	0xe1, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4c, 0x49, 0xc1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x81, 0xc0, 0x01, 0x00, 0xd5, 0x01, 0xa2, 0x44,</div><div class='add'>+	0x81, 0x6c, 0x00, 0x00, 0x55, 0x01, 0x00, 0x43, 0xbf, 0xb3, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf8, 0x18, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x40, 0xf8,</div><div class='add'>+	0x80, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x41, 0xf0, 0x80, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0x5a, 0x01, 0x00, 0x40, 0xe1, 0xb1, 0x00, 0x00,</div><div class='add'>+	0xe2, 0x01, 0x00, 0x40, 0x91, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x91, 0xb0, 0x01, 0x00, 0xd0, 0x14, 0x2e, 0x40, 0x49, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x05, 0x00, 0x00, 0x40, 0xa3, 0x9b, 0x01, 0x00, 0x08, 0x00, 0x00, 0xdd,</div><div class='add'>+	0x81, 0xf4, 0x01, 0x00, 0xe7, 0x01, 0x00, 0x40, 0x80, 0xc8, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x10, 0xb1, 0x00, 0x00, 0xed, 0x01, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb0, 0x00, 0x00, 0x58, 0x01, 0x00, 0xde, 0xa1, 0xb3, 0x00, 0x00,</div><div class='add'>+	0xff, 0x01, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x01, 0x02, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb0, 0x00, 0x00, 0x07, 0x02, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x57, 0x01, 0x00, 0xdf, 0xe1, 0xb1, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd0,</div><div class='add'>+	0xba, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xde, 0xa1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x02, 0x00, 0x00, 0xd2, 0xa5, 0xe7, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd2,</div><div class='add'>+	0xc1, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xf7, 0x01, 0x22, 0x44, 0xc1, 0x53, 0x00, 0x00, 0xf6, 0x01, 0x84, 0x41,</div><div class='add'>+	0x81, 0x40, 0x00, 0x00, 0xfa, 0x01, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xd0, 0x45, 0xb1, 0x01, 0x00, 0xf1, 0x01, 0x00, 0x41,</div><div class='add'>+	0xa1, 0xc1, 0x00, 0x00, 0xb1, 0x02, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0xc5, 0x02, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x5a, 0x01, 0x00, 0xdd,</div><div class='add'>+	0xa1, 0xb1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x81, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x40, 0xa5, 0x9b, 0x01, 0x00, 0xb1, 0x02, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x40, 0x00, 0x00, 0xd3, 0xa7, 0xcb, 0x01, 0x00,</div><div class='add'>+	0xc5, 0x02, 0x00, 0xe0, 0xa5, 0xb3, 0x00, 0x00, 0x03, 0x00, 0x00, 0x40,</div><div class='add'>+	0xa3, 0x9b, 0x01, 0x00, 0x58, 0x01, 0x00, 0xde, 0xa1, 0xb3, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x44, 0xbf, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xde,</div><div class='add'>+	0x81, 0x90, 0x01, 0x00, 0x55, 0x01, 0xa2, 0xba, 0x80, 0x04, 0x00, 0x00,</div><div class='add'>+	0x60, 0x00, 0x00, 0xde, 0x61, 0x99, 0x01, 0x00, 0x04, 0x02, 0xa8, 0xb1,</div><div class='add'>+	0x80, 0x30, 0x00, 0x00, 0x57, 0x01, 0x00, 0x40, 0xe0, 0xb1, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xd0, 0xba, 0xb3, 0x01, 0x00, 0x68, 0x02, 0x00, 0x40,</div><div class='add'>+	0x81, 0x98, 0x01, 0x00, 0x5d, 0x02, 0x00, 0x4d, 0x83, 0x30, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x44, 0xe1, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0xe3, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44, 0xe5, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x44, 0xe9, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0xeb, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44, 0xf5, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x44, 0xf7, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0xf9, 0xb3, 0x01, 0x00, 0x15, 0x02, 0x22, 0x40, 0x8f, 0x6f, 0x00, 0x00,</div><div class='add'>+	0x75, 0x02, 0x00, 0x40, 0x81, 0x98, 0x01, 0x00, 0x5d, 0x02, 0x00, 0xc7,</div><div class='add'>+	0x83, 0x30, 0x01, 0x00, 0x7d, 0x02, 0x00, 0x40, 0x81, 0x98, 0x01, 0x00,</div><div class='add'>+	0x5d, 0x02, 0x00, 0x42, 0x83, 0x30, 0x01, 0x00, 0x00, 0x00, 0x00, 0xe8,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xe9, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xea, 0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xeb,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x85, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xec, 0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xed,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xb2, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xe0, 0x9f, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xab, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xb8,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xb9, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xba, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xbb,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x29, 0x02, 0xb8, 0x40, 0x81, 0x30, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x81, 0x90, 0x01, 0x00, 0x2b, 0x02, 0xb9, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x81, 0x90, 0x01, 0x00,</div><div class='add'>+	0x2d, 0x02, 0xba, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42,</div><div class='add'>+	0x81, 0x90, 0x01, 0x00, 0x2f, 0x02, 0xbb, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x43, 0x81, 0x90, 0x01, 0x00, 0x31, 0x02, 0xbc, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x81, 0x90, 0x01, 0x00,</div><div class='add'>+	0x33, 0x02, 0xbd, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x45,</div><div class='add'>+	0x81, 0x90, 0x01, 0x00, 0x35, 0x02, 0xbe, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x46, 0x81, 0x90, 0x01, 0x00, 0x37, 0x02, 0xbf, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x47, 0x81, 0x90, 0x01, 0x00,</div><div class='add'>+	0x39, 0x02, 0xc8, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x48,</div><div class='add'>+	0x81, 0x90, 0x01, 0x00, 0x3b, 0x02, 0xc9, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x49, 0x81, 0x90, 0x01, 0x00, 0x3d, 0x02, 0xca, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4a, 0x81, 0x90, 0x01, 0x00,</div><div class='add'>+	0x3f, 0x02, 0xcb, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4b,</div><div class='add'>+	0x81, 0x90, 0x01, 0x00, 0x41, 0x02, 0xcc, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4c, 0x81, 0x90, 0x01, 0x00, 0x43, 0x02, 0xcd, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4d, 0x81, 0x90, 0x01, 0x00,</div><div class='add'>+	0x45, 0x02, 0xce, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4e,</div><div class='add'>+	0x81, 0x90, 0x01, 0x00, 0x47, 0x02, 0xcf, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4f, 0x81, 0x90, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x40, 0xa5, 0x9b, 0x01, 0x00,</div><div class='add'>+	0xaf, 0x02, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0xc5, 0x02, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0xd0, 0x14, 0x2e, 0x06, 0xa5, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0xd3, 0xa7, 0xcb, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf1, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf2, 0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf4,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf5, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xfa, 0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xfb,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xeb, 0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xee,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xef, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf3, 0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf6,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xfd, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xf7, 0x01, 0x00, 0xc7, 0xe1, 0xb1, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x63, 0x02, 0x00, 0x48, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x51, 0x40, 0x1a, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x4d, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x45, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x60, 0x02, 0xa2, 0x41, 0x83, 0x50, 0x00, 0x00, 0x5c, 0x02, 0x49, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x52, 0x40, 0x1c, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x4e, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x46, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x65, 0x02, 0xa2, 0x41, 0x83, 0x50, 0x00, 0x00,</div><div class='add'>+	0x5c, 0x02, 0x4a, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0,</div><div class='add'>+	0x9e, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x80, 0xd8, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xa1, 0xd0, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xa2,</div><div class='add'>+	0xd2, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xa4, 0xd4, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xd0, 0xd6, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd1,</div><div class='add'>+	0xdc, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd2, 0xde, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x88, 0xda, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd4,</div><div class='add'>+	0x8e, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd3, 0xe6, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xac, 0xec, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x99,</div><div class='add'>+	0xfa, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd5, 0xe0, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xd5, 0xe2, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd5,</div><div class='add'>+	0xe4, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd5, 0xe8, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xd5, 0xea, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd5,</div><div class='add'>+	0xf4, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd5, 0xf6, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xd5, 0xf8, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xc7,</div><div class='add'>+	0xa9, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4f, 0x40, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x81, 0x02, 0x00, 0x40, 0x91, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x91, 0xb0, 0x01, 0x00, 0x07, 0x00, 0x00, 0x40, 0xa3, 0x9b, 0x01, 0x00,</div><div class='add'>+	0x08, 0x00, 0x00, 0xdd, 0x81, 0xf4, 0x01, 0x00, 0x85, 0x02, 0x00, 0x40,</div><div class='add'>+	0x80, 0xc8, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x10, 0xb1, 0x00, 0x00,</div><div class='add'>+	0x8a, 0x02, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x95, 0x02, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x95, 0x02, 0x00, 0x46, 0xa3, 0xb3, 0x00, 0x00,</div><div class='add'>+	0x98, 0x02, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x9e, 0x02, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x8c, 0x02, 0x23, 0x50, 0xa5, 0x6f, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x50, 0xa5, 0xb3, 0x01, 0x00, 0xbc, 0x02, 0x00, 0x42,</div><div class='add'>+	0xa5, 0x63, 0x01, 0x00, 0xc5, 0x02, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0xd0, 0x14, 0x2d, 0x40, 0x49, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd0,</div><div class='add'>+	0xba, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xde, 0xa1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf8, 0x00, 0xb0, 0x01, 0x00, 0x94, 0x02, 0x22, 0x44,</div><div class='add'>+	0xa5, 0x53, 0x00, 0x00, 0x91, 0x02, 0x00, 0x41, 0xa1, 0xc1, 0x00, 0x00,</div><div class='add'>+	0x5a, 0x01, 0x00, 0xdd, 0xa1, 0xb1, 0x00, 0x00, 0xbc, 0x02, 0x00, 0xde,</div><div class='add'>+	0xa1, 0x33, 0x01, 0x00, 0xc5, 0x02, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x5a, 0x01, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x45,</div><div class='add'>+	0xbf, 0xb3, 0x01, 0x00, 0x55, 0x01, 0xa2, 0xd2, 0x77, 0x7d, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xd2, 0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xde,</div><div class='add'>+	0x63, 0xb1, 0x01, 0x00, 0x9b, 0x02, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x5a, 0x01, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xbc, 0x02, 0x00, 0x54,</div><div class='add'>+	0xa5, 0x33, 0x01, 0x00, 0xc5, 0x02, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0xd0, 0x14, 0x2d, 0x40, 0x49, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8,</div><div class='add'>+	0xd0, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xd2, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf8, 0xd4, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8,</div><div class='add'>+	0xd6, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x08, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xa9, 0x02, 0x00, 0x40, 0x81, 0x98, 0x01, 0x00, 0x5d, 0x02, 0x00, 0x46,</div><div class='add'>+	0x83, 0x30, 0x01, 0x00, 0x5a, 0x01, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xa0, 0x9e, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xe8,</div><div class='add'>+	0x43, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xe9, 0x45, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xea, 0x49, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xeb,</div><div class='add'>+	0xa1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4f, 0x40, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xe7, 0xa7, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd8,</div><div class='add'>+	0xa9, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x49, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xae, 0x03, 0x00, 0xcb, 0xa3, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x20,</div><div class='add'>+	0x46, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd2, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xd3, 0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd4,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd0, 0xe1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xd1, 0x61, 0xb1, 0x01, 0x00, 0x20, 0x00, 0x00, 0x20,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0xb9, 0x02, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0xcc, 0x85, 0x93, 0x01, 0x00, 0x00, 0x00, 0x00, 0xe7,</div><div class='add'>+	0xa7, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd8, 0xa9, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x49, 0xb1, 0x01, 0x00, 0xae, 0x03, 0x00, 0xcb,</div><div class='add'>+	0xa3, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x20, 0x46, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xd2, 0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd0,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd3, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xb8, 0x02, 0x00, 0xd4, 0xe1, 0xb1, 0x00, 0x00, 0x00, 0x00, 0xa2, 0xcc,</div><div class='add'>+	0x85, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x81, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xc7, 0x02, 0xa2, 0x41, 0x81, 0x50, 0x00, 0x00, 0xc6, 0x02, 0xa2, 0xf2,</div><div class='add'>+	0x80, 0x30, 0x00, 0x00, 0x00, 0x00, 0x80, 0xcc, 0x85, 0x83, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x81, 0xb0, 0x01, 0x00, 0xcb, 0x02, 0x80, 0xa5,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0xcc, 0x02, 0x00, 0xa5, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x81, 0xc0, 0x01, 0x00, 0xcd, 0x02, 0x80, 0xa5,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x80, 0x01, 0x00, 0x40, 0x83, 0x98, 0x01, 0x00,</div><div class='add'>+	0xd6, 0x02, 0x20, 0x4f, 0x81, 0x6c, 0x00, 0x00, 0x00, 0x01, 0x00, 0x40,</div><div class='add'>+	0x83, 0x98, 0x01, 0x00, 0xd6, 0x02, 0x20, 0x4b, 0x81, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x80, 0x00, 0x00, 0x40, 0x83, 0x98, 0x01, 0x00, 0xd6, 0x02, 0x20, 0x47,</div><div class='add'>+	0x81, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x83, 0x98, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x82, 0xdc, 0x01, 0x00, 0x03, 0x90, 0x00, 0x41,</div><div class='add'>+	0x20, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x49, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x14, 0x2f, 0x4c, 0x83, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0xda, 0x02, 0xa2, 0x41, 0x83, 0x50, 0x00, 0x00,</div><div class='add'>+	0x02, 0x00, 0x00, 0xa5, 0x80, 0xc8, 0x01, 0x00, 0xdd, 0x02, 0xa2, 0xa5,</div><div class='add'>+	0x80, 0x6c, 0x00, 0x00, 0x20, 0x00, 0x00, 0x90, 0x20, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x5f, 0x23, 0x91, 0x01, 0x00, 0xe0, 0x02, 0x1f, 0x91,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x30, 0x00, 0x00, 0x90, 0x20, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x5f, 0x23, 0x91, 0x01, 0x00, 0xe3, 0x02, 0x1f, 0x91,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x70, 0x00, 0x00, 0x90, 0x20, 0xa9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x5f, 0x23, 0x91, 0x01, 0x00, 0xe6, 0x02, 0x1f, 0x91,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5f, 0x23, 0x91, 0x01, 0x00,</div><div class='add'>+	0xe8, 0x02, 0x1f, 0x91, 0x80, 0x32, 0x00, 0x00, 0x40, 0x68, 0x00, 0x90,</div><div class='add'>+	0x20, 0xa9, 0x01, 0x00, 0xe0, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00,</div><div class='add'>+	0x21, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00, 0x22, 0x00, 0x00, 0x40,</div><div class='add'>+	0x61, 0x99, 0x01, 0x00, 0x23, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00,</div><div class='add'>+	0x24, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00, 0x25, 0x00, 0x00, 0x40,</div><div class='add'>+	0x61, 0x99, 0x01, 0x00, 0x26, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00,</div><div class='add'>+	0x27, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00, 0xc0, 0x00, 0x00, 0x40,</div><div class='add'>+	0x61, 0x99, 0x01, 0x00, 0xd0, 0x14, 0x00, 0x40, 0x45, 0x99, 0x01, 0x00,</div><div class='add'>+	0x02, 0x01, 0x00, 0xa6, 0x80, 0xb0, 0x01, 0x00, 0x04, 0x03, 0x00, 0x40,</div><div class='add'>+	0x80, 0x98, 0x01, 0x00, 0x06, 0x05, 0x00, 0xa6, 0x82, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x08, 0x07, 0x00, 0x41, 0x82, 0x98, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41, 0xe0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x30, 0x03, 0x00, 0x40, 0x85, 0x30, 0x01, 0x00, 0x39, 0x03, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0xd8, 0x14, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00,</div><div class='add'>+	0xff, 0x02, 0xa2, 0xf8, 0x80, 0x6c, 0x00, 0x00, 0x00, 0x03, 0x22, 0xf0,</div><div class='add'>+	0x82, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x21, 0x91, 0x01, 0x00,</div><div class='add'>+	0xd0, 0x14, 0x20, 0x40, 0xe1, 0xb1, 0x01, 0x00, 0x30, 0x03, 0x00, 0x0c,</div><div class='add'>+	0x85, 0x30, 0x01, 0x00, 0x30, 0x03, 0x00, 0x4d, 0x85, 0x10, 0x01, 0x00,</div><div class='add'>+	0x30, 0x03, 0x00, 0x4e, 0x85, 0x10, 0x01, 0x00, 0xd0, 0x14, 0x20, 0x4f,</div><div class='add'>+	0xe1, 0xb1, 0x01, 0x00, 0x30, 0x03, 0x00, 0x4f, 0x85, 0x10, 0x01, 0x00,</div><div class='add'>+	0x39, 0x03, 0x00, 0x0c, 0x85, 0x30, 0x01, 0x00, 0xd8, 0x14, 0x20, 0x43,</div><div class='add'>+	0x81, 0xb0, 0x01, 0x00, 0x0f, 0x03, 0x22, 0xf0, 0x9e, 0x6e, 0x00, 0x00,</div><div class='add'>+	0x39, 0x03, 0x00, 0x4d, 0x85, 0x10, 0x01, 0x00, 0xd8, 0x14, 0x20, 0x42,</div><div class='add'>+	0x81, 0xb0, 0x01, 0x00, 0x0f, 0x03, 0x22, 0xf0, 0x9e, 0x6e, 0x00, 0x00,</div><div class='add'>+	0x39, 0x03, 0x00, 0x4e, 0x85, 0x10, 0x01, 0x00, 0xd8, 0x14, 0x20, 0x41,</div><div class='add'>+	0x81, 0xb0, 0x01, 0x00, 0x11, 0x03, 0xa2, 0xf0, 0x9e, 0x6e, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x49, 0x81, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x20, 0x95, 0x01, 0x00, 0x03, 0x00, 0x00, 0x90, 0x20, 0x8d, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x43, 0x21, 0x95, 0x01, 0x00, 0x00, 0x00, 0x00, 0x1b,</div><div class='add'>+	0x89, 0xb0, 0x01, 0x00, 0xd0, 0x14, 0x20, 0x40, 0xe1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x30, 0x03, 0x00, 0x17, 0x85, 0x30, 0x01, 0x00, 0x30, 0x03, 0x00, 0x58,</div><div class='add'>+	0x85, 0x10, 0x01, 0x00, 0x30, 0x03, 0x00, 0x59, 0x85, 0x10, 0x01, 0x00,</div><div class='add'>+	0xd0, 0x14, 0x20, 0x4f, 0xe1, 0xb1, 0x01, 0x00, 0x30, 0x03, 0x00, 0x5a,</div><div class='add'>+	0x85, 0x10, 0x01, 0x00, 0x39, 0x03, 0x00, 0x17, 0x85, 0x30, 0x01, 0x00,</div><div class='add'>+	0xd8, 0x14, 0x20, 0x40, 0x81, 0xb0, 0x01, 0x00, 0x23, 0x03, 0x22, 0xf0,</div><div class='add'>+	0x9e, 0x6e, 0x00, 0x00, 0x39, 0x03, 0x00, 0x58, 0x85, 0x10, 0x01, 0x00,</div><div class='add'>+	0xd8, 0x14, 0x20, 0x41, 0x81, 0xb0, 0x01, 0x00, 0x23, 0x03, 0x22, 0xf0,</div><div class='add'>+	0x9e, 0x6e, 0x00, 0x00, 0x39, 0x03, 0x00, 0x59, 0x85, 0x10, 0x01, 0x00,</div><div class='add'>+	0xd8, 0x14, 0x20, 0x42, 0x81, 0xb0, 0x01, 0x00, 0x27, 0x03, 0xa2, 0xf0,</div><div class='add'>+	0x9e, 0x6e, 0x00, 0x00, 0x03, 0x00, 0x00, 0x90, 0x20, 0x8d, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x20, 0x95, 0x01, 0x00, 0x00, 0x00, 0x00, 0x18,</div><div class='add'>+	0x89, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x88, 0xe0, 0x01, 0x00,</div><div class='add'>+	0x2f, 0x03, 0xa2, 0x42, 0x21, 0x7d, 0x00, 0x00, 0xa5, 0xa5, 0x00, 0x40,</div><div class='add'>+	0x81, 0x98, 0x01, 0x00, 0xd0, 0x14, 0x20, 0x40, 0xe0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x30, 0x03, 0x00, 0x44, 0x84, 0x30, 0x01, 0x00, 0x39, 0x03, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0xd8, 0x14, 0x20, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x2f, 0x03, 0xa2, 0xf0, 0x80, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x89, 0xe0, 0x01, 0x00, 0xe0, 0x00, 0x80, 0x40, 0x61, 0x99, 0x01, 0x00,</div><div class='add'>+	0x70, 0x15, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x48,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x42, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xd0, 0x14, 0x00, 0x40, 0xf1, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x55,</div><div class='add'>+	0x87, 0xb4, 0x01, 0x00, 0x04, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00,</div><div class='add'>+	0x70, 0x15, 0x00, 0x43, 0x62, 0x99, 0x01, 0x00, 0x36, 0x03, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x41, 0x03, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x70, 0x15, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x48,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0xd8, 0x14, 0x00, 0x40, 0xf1, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x42, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x55,</div><div class='add'>+	0x87, 0xb4, 0x01, 0x00, 0x02, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00,</div><div class='add'>+	0x70, 0x15, 0x00, 0x43, 0x62, 0x99, 0x01, 0x00, 0x3f, 0x03, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x48, 0x87, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x42, 0x03, 0xa2, 0x41, 0x87, 0x50, 0x00, 0x00, 0x00, 0x00, 0xa2, 0xf2,</div><div class='add'>+	0x86, 0xb0, 0x00, 0x00, 0x10, 0x00, 0x00, 0xf1, 0x86, 0xf4, 0x01, 0x00,</div><div class='add'>+	0x41, 0x03, 0x26, 0x40, 0x81, 0x32, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x47, 0x84, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0xa2, 0x48, 0x84, 0x84, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5f,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5c, 0x8f, 0x90, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x47, 0x62, 0xb1, 0x01, 0x00, 0x49, 0x03, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0xf5, 0x9f, 0x00, 0x47, 0x98, 0x30, 0x01, 0x00,</div><div class='add'>+	0x00, 0x08, 0x00, 0x47, 0x8e, 0xc8, 0x01, 0x00, 0x47, 0x03, 0x00, 0x5c,</div><div class='add'>+	0x8f, 0x80, 0x00, 0x00, 0xe0, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00,</div><div class='add'>+	0x58, 0x15, 0x2d, 0x40, 0x8d, 0xb0, 0x01, 0x00, 0xd0, 0x14, 0x2d, 0xf0,</div><div class='add'>+	0x88, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xfa, 0x8a, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x45, 0x81, 0xb0, 0x01, 0x00, 0x07, 0x00, 0x00, 0x45,</div><div class='add'>+	0x82, 0x88, 0x01, 0x00, 0x00, 0x00, 0x00, 0x43, 0x8b, 0xf0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x48, 0x83, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x46,</div><div class='add'>+	0x82, 0x94, 0x01, 0x00, 0x20, 0x00, 0x00, 0x41, 0x60, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x8d, 0xc0, 0x01, 0x00, 0x64, 0x03, 0x22, 0x5f,</div><div class='add'>+	0x8d, 0x6c, 0x00, 0x00, 0x55, 0x03, 0xa2, 0x41, 0x81, 0x50, 0x00, 0x00,</div><div class='add'>+	0x53, 0x03, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x08, 0x00, 0x00, 0x40,</div><div class='add'>+	0x85, 0x98, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44, 0x82, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x86, 0xb0, 0x01, 0x00, 0x00, 0x1c, 0x00, 0x43,</div><div class='add'>+	0x86, 0xd8, 0x01, 0x00, 0x00, 0x00, 0xa6, 0x41, 0x85, 0x50, 0x01, 0x00,</div><div class='add'>+	0x60, 0x03, 0x00, 0x41, 0x83, 0xe0, 0x00, 0x00, 0x5e, 0x03, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0x48, 0x85, 0xe0, 0x01, 0x00,</div><div class='add'>+	0xd0, 0x14, 0x2f, 0x46, 0x84, 0x94, 0x01, 0x00, 0x20, 0x00, 0x00, 0x42,</div><div class='add'>+	0x60, 0x99, 0x01, 0x00, 0xc0, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x07, 0x00, 0x00, 0x45,</div><div class='add'>+	0x80, 0x88, 0x01, 0x00, 0x00, 0x00, 0x00, 0x43, 0x8b, 0xf0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x04, 0x00, 0x40, 0x83, 0x98, 0x01, 0x00, 0x6f, 0x03, 0xa0, 0x41,</div><div class='add'>+	0x81, 0x50, 0x00, 0x00, 0x6d, 0x03, 0x00, 0x41, 0x82, 0xe8, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x41, 0x8e, 0xc0, 0x01, 0x00, 0xae, 0x03, 0x00, 0x40,</div><div class='add'>+	0xa3, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x54, 0x81, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x60, 0x15, 0x00, 0x40, 0x85, 0x98, 0x01, 0x00, 0x08, 0x00, 0x00, 0x40,</div><div class='add'>+	0x40, 0xe4, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5a, 0x41, 0x94, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x50, 0x41, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x42,</div><div class='add'>+	0x40, 0x94, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41, 0x81, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0xa3, 0x55, 0x81, 0x6c, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0xa3, 0xc1, 0x01, 0x00, 0x73, 0x03, 0x00, 0x50, 0x85, 0xc0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x49, 0xb1, 0x01, 0x00, 0x00, 0x02, 0x00, 0x40,</div><div class='add'>+	0x83, 0x98, 0x01, 0x00, 0x00, 0x16, 0x00, 0x40, 0x45, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0xf1, 0xb1, 0x01, 0x00, 0x7e, 0x03, 0xa2, 0x41,</div><div class='add'>+	0x83, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x85, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x0b, 0x00, 0x00, 0x44, 0x82, 0xf4, 0x01, 0x00, 0x1a, 0x15, 0x00, 0xa6,</div><div class='add'>+	0x86, 0xb0, 0x01, 0x00, 0x70, 0x15, 0x00, 0x40, 0x45, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x08, 0x00, 0x40, 0xf1, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x42,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x16, 0x00, 0x40, 0xe1, 0x99, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00, 0x70, 0x15, 0x00, 0x43,</div><div class='add'>+	0x62, 0x99, 0x01, 0x00, 0x88, 0x03, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x8a, 0x03, 0x22, 0x5a, 0x73, 0x7d, 0x00, 0x00, 0x7a, 0x00, 0x00, 0x40,</div><div class='add'>+	0x61, 0x99, 0x01, 0x00, 0x8b, 0x03, 0xa8, 0xb1, 0x7e, 0x31, 0x00, 0x00,</div><div class='add'>+	0x00, 0x08, 0x00, 0x42, 0x84, 0xc8, 0x01, 0x00, 0x83, 0x03, 0xa2, 0x41,</div><div class='add'>+	0x83, 0x50, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xf7, 0x0f, 0x00, 0xbc,</div><div class='add'>+	0x80, 0xb2, 0x00, 0x00, 0x03, 0x80, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x03, 0x80, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x03, 0x80, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x03, 0x80, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x03, 0x80, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x03, 0x80, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x03, 0x80, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x03, 0x80, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+	0x31, 0x80, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x34, 0x80, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x35, 0x80, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x1b, 0x80, 0x81, 0x80,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0xe6, 0x89, 0xa2, 0x40, 0x91, 0x6f, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4c, 0x90, 0xb3, 0x01, 0x00, 0x5c, 0x95, 0x2e, 0xa2,</div><div class='add'>+	0x80, 0xb0, 0x01, 0x00, 0xff, 0x00, 0x00, 0x80, 0xf4, 0x89, 0x01, 0x00,</div><div class='add'>+	0x90, 0x95, 0x2a, 0xc8, 0xe5, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xa1,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xa4, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd0,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd1, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xd2, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4c,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd4, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xd3, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xee,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4e, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x44, 0xb1, 0x01, 0x00, 0x18, 0x80, 0x11, 0x81,</div><div class='add'>+	0x98, 0x30, 0x00, 0x00, 0x00, 0x00, 0x51, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x1a, 0x80, 0x11, 0x82, 0x98, 0x30, 0x00, 0x00, 0x00, 0x00, 0x52, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0xe6, 0x89, 0x00, 0x48, 0xfd, 0x93, 0x00, 0x00,</div><div class='add'>+	0xb6, 0x03, 0x00, 0x40, 0xa1, 0x99, 0x01, 0x00, 0x23, 0x80, 0xa2, 0x42,</div><div class='add'>+	0xfd, 0x7f, 0x00, 0x00, 0x20, 0x80, 0x00, 0x80, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x22, 0x80, 0x11, 0x81, 0x82, 0x30, 0x00, 0x00, 0x22, 0x80, 0x51, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x22, 0x80, 0x11, 0x82, 0x82, 0x30, 0x00, 0x00,</div><div class='add'>+	0x22, 0x80, 0x52, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x2c, 0x80, 0x00, 0x48,</div><div class='add'>+	0xfd, 0x93, 0x00, 0x00, 0x27, 0x80, 0x00, 0x80, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x26, 0x80, 0xa2, 0x53, 0x07, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x51, 0x53,</div><div class='add'>+	0x07, 0x90, 0x01, 0x00, 0x2a, 0x80, 0x00, 0x52, 0x07, 0x90, 0x00, 0x00,</div><div class='add'>+	0x29, 0x80, 0xa2, 0x52, 0x07, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x52, 0x52,</div><div class='add'>+	0x07, 0x90, 0x01, 0x00, 0x00, 0x00, 0x00, 0x53, 0x07, 0x90, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x48, 0xfd, 0x93, 0x01, 0x00, 0x00, 0x00, 0x00, 0x45,</div><div class='add'>+	0xf3, 0x93, 0x01, 0x00, 0x5c, 0x95, 0x2e, 0xa2, 0x52, 0xb3, 0x01, 0x00,</div><div class='add'>+	0xff, 0x00, 0x00, 0x80, 0xf4, 0x89, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4c,</div><div class='add'>+	0xe4, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xa9, 0x45, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x30, 0x80, 0x00, 0x4c, 0x80, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x45, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x55, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x1b, 0x84, 0x05, 0x40, 0x49, 0xb1, 0x00, 0x00, 0x1b, 0x84, 0x05, 0x40,</div><div class='add'>+	0x49, 0xb1, 0x00, 0x00, 0x00, 0x00, 0x05, 0x40, 0x49, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xe1, 0x80, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4b,</div><div class='add'>+	0xde, 0xb2, 0x01, 0x00, 0x77, 0x00, 0x00, 0x40, 0x4b, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0xfd, 0x93, 0x01, 0x00, 0x00, 0x00, 0x00, 0x48,</div><div class='add'>+	0xfd, 0x83, 0x01, 0x00, 0x02, 0x00, 0x00, 0x40, 0x9b, 0x9b, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xa5, 0x9c, 0xb3, 0x01, 0x00, 0xde, 0x99, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x58, 0x95, 0x20, 0x44, 0xe0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0xc0, 0x00, 0xa6, 0x36, 0xb1, 0x01, 0x00, 0xd0, 0x14, 0x00, 0x40,</div><div class='add'>+	0x47, 0x99, 0x01, 0x00, 0x05, 0x00, 0x00, 0x40, 0xf5, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x38, 0x00, 0x40, 0xf5, 0x99, 0x01, 0x00, 0x00, 0x06, 0x00, 0x40,</div><div class='add'>+	0xf5, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0xf5, 0x99, 0x01, 0x00,</div><div class='add'>+	0x05, 0x18, 0x00, 0x40, 0xf5, 0x99, 0x01, 0x00, 0x02, 0x09, 0x00, 0x40,</div><div class='add'>+	0xf5, 0x99, 0x01, 0x00, 0x04, 0x00, 0x00, 0x40, 0xf5, 0x99, 0x01, 0x00,</div><div class='add'>+	0x50, 0x03, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x7b, 0x03, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0xe0, 0x83, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x10, 0x84, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x08, 0x84, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x60, 0x95, 0x20, 0x40, 0xe1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x70, 0x95, 0x20, 0x40, 0xe1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x49,</div><div class='add'>+	0xdd, 0x91, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x91, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x85, 0xb3, 0x01, 0x00, 0x5c, 0x95, 0x20, 0x40,</div><div class='add'>+	0xe1, 0xb1, 0x01, 0x00, 0x1a, 0x82, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x71, 0x83, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x02, 0x00, 0x00, 0x97,</div><div class='add'>+	0x80, 0x98, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x2e, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x02, 0x00, 0x00, 0x40, 0x2e, 0xdd, 0x01, 0x00, 0x90, 0x01, 0x00, 0x40,</div><div class='add'>+	0x93, 0x98, 0x01, 0x00, 0x29, 0x01, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x5c, 0x81, 0x00, 0x40, 0xaf, 0x33, 0x01, 0x00, 0x61, 0x99, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x45, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x55, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x49, 0x84, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x77, 0x01, 0x00, 0x41, 0x81, 0xc0, 0x00, 0x00,</div><div class='add'>+	0x71, 0x80, 0x51, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x72, 0x80, 0x52, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x73, 0x80, 0x55, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x74, 0x80, 0x56, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x55, 0x01, 0x91, 0x81,</div><div class='add'>+	0x80, 0x30, 0x00, 0x00, 0x5a, 0x01, 0x45, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x55, 0x01, 0x91, 0x82, 0x80, 0x30, 0x00, 0x00, 0x5a, 0x01, 0x46, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x5a, 0x01, 0x00, 0x48, 0xfd, 0x93, 0x00, 0x00,</div><div class='add'>+	0x5a, 0x01, 0x00, 0x48, 0xfd, 0x93, 0x00, 0x00, 0x5a, 0x01, 0x00, 0x49,</div><div class='add'>+	0xfd, 0x83, 0x00, 0x00, 0x5a, 0x01, 0x00, 0x4a, 0xfd, 0x83, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x49, 0xb1, 0x01, 0x00, 0xae, 0x03, 0x00, 0xcb,</div><div class='add'>+	0xa3, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x20, 0x46, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xd2, 0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd3,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x42, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x45, 0x61, 0xb1, 0x01, 0x00, 0x20, 0x00, 0x00, 0x20,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x00, 0x00, 0xa8, 0xd0, 0xe1, 0xb1, 0x00, 0x00,</div><div class='add'>+	0x7c, 0x80, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa8,</div><div class='add'>+	0x98, 0xb0, 0x01, 0x00, 0x04, 0x80, 0x00, 0x40, 0x8b, 0xb3, 0x00, 0x00,</div><div class='add'>+	0xb1, 0x03, 0x00, 0x40, 0xa1, 0x99, 0x01, 0x00, 0x84, 0x80, 0xa2, 0x41,</div><div class='add'>+	0x97, 0x6f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x45, 0xa1, 0xc1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x80, 0xb0, 0x01, 0x00, 0x00, 0x00, 0xa2, 0x04,</div><div class='add'>+	0x80, 0x94, 0x00, 0x00, 0x80, 0x15, 0x3f, 0x42, 0x97, 0xe3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x49, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x60, 0x03,</div><div class='add'>+	0x02, 0x94, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x07, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0xcb, 0x99, 0xcb, 0x01, 0x00, 0x00, 0x00, 0x00, 0xcc,</div><div class='add'>+	0xf3, 0x83, 0x01, 0x00, 0x8e, 0x80, 0xa2, 0x41, 0x97, 0x6f, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xcb, 0xf3, 0x93, 0x01, 0x00, 0xae, 0x03, 0x00, 0xcb,</div><div class='add'>+	0xa3, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x20, 0x44, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x44, 0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x04, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xa1, 0xe0, 0xb1, 0x01, 0x00, 0x05, 0x00, 0x00, 0x40,</div><div class='add'>+	0x61, 0x99, 0x01, 0x00, 0x20, 0x00, 0x00, 0x20, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0x95, 0x80, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0xc6, 0x02, 0x00, 0x20,</div><div class='add'>+	0x42, 0x31, 0x01, 0x00, 0x00, 0x00, 0xa2, 0x41, 0x05, 0x6c, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0xcb, 0xdb, 0x91, 0x01, 0x00, 0x00, 0x00, 0x19, 0x41,</div><div class='add'>+	0x8b, 0xb3, 0x01, 0x00, 0x60, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00,</div><div class='add'>+	0x9b, 0x80, 0xa8, 0xb1, 0x8c, 0x33, 0x00, 0x00, 0x60, 0x00, 0x00, 0x40,</div><div class='add'>+	0x61, 0x99, 0x01, 0x00, 0x9d, 0x80, 0xa8, 0xb1, 0x94, 0x33, 0x00, 0x00,</div><div class='add'>+	0xa3, 0x80, 0x14, 0xc6, 0x81, 0x32, 0x00, 0x00, 0x18, 0x00, 0x00, 0xc6,</div><div class='add'>+	0x83, 0xf4, 0x01, 0x00, 0x6a, 0x84, 0x22, 0x4f, 0x83, 0x04, 0x00, 0x00,</div><div class='add'>+	0x7f, 0x80, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xff, 0x01, 0x00, 0xc6,</div><div class='add'>+	0x81, 0x88, 0x01, 0x00, 0x00, 0x00, 0x00, 0xc6, 0x97, 0xa3, 0x01, 0x00,</div><div class='add'>+	0x7f, 0x80, 0x1f, 0x5c, 0x97, 0x53, 0x00, 0x00, 0x9e, 0x83, 0x1d, 0xc6,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x2f, 0x43, 0x81, 0xf0, 0x01, 0x00,</div><div class='add'>+	0xa9, 0x80, 0x00, 0x40, 0x10, 0xc9, 0x00, 0x00, 0x05, 0x81, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x36, 0x81, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xda, 0x81, 0x00, 0xca, 0x63, 0xb3, 0x00, 0x00, 0x2d, 0x81, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x14, 0x81, 0x00, 0x4d, 0x83, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x1e, 0x81, 0x00, 0x4e, 0x61, 0xb1, 0x00, 0x00, 0x0d, 0x81, 0x00, 0x40,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x14, 0x81, 0x00, 0x4c, 0x83, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xf0, 0x80, 0x00, 0x40, 0x85, 0xb0, 0x00, 0x00, 0x91, 0x81, 0x00, 0x40,</div><div class='add'>+	0x49, 0xb1, 0x00, 0x00, 0x3d, 0x81, 0x00, 0x40, 0xc1, 0xb1, 0x00, 0x00,</div><div class='add'>+	0x8d, 0x81, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x0d, 0x81, 0x00, 0x40,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0xdd, 0x81, 0x00, 0x40, 0x49, 0xb1, 0x00, 0x00,</div><div class='add'>+	0x6a, 0x84, 0x00, 0xca, 0x9b, 0xb3, 0x00, 0x00, 0x46, 0x81, 0x00, 0x40,</div><div class='add'>+	0xc1, 0xb1, 0x00, 0x00, 0x4e, 0x81, 0x00, 0x40, 0xc1, 0xb1, 0x00, 0x00,</div><div class='add'>+	0x55, 0x81, 0x00, 0x40, 0xc1, 0xb1, 0x00, 0x00, 0x56, 0x81, 0x00, 0x40,</div><div class='add'>+	0xc1, 0xb1, 0x00, 0x00, 0x57, 0x81, 0x00, 0x40, 0xc1, 0xb1, 0x00, 0x00,</div><div class='add'>+	0x58, 0x81, 0x00, 0x40, 0xc1, 0xb1, 0x00, 0x00, 0x59, 0x81, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb0, 0x00, 0x00, 0x59, 0x81, 0x00, 0x41, 0x81, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xce, 0x81, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xdd, 0x83, 0x00, 0xbb,</div><div class='add'>+	0xab, 0xb3, 0x00, 0x00, 0xdb, 0x81, 0x00, 0xca, 0xcf, 0xb3, 0x00, 0x00,</div><div class='add'>+	0xd3, 0x80, 0x00, 0x40, 0x49, 0xb1, 0x00, 0x00, 0xdf, 0x80, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0xdc, 0x81, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x6a, 0x84, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xda, 0x80, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x6a, 0x84, 0x00, 0xca, 0x77, 0xb3, 0x00, 0x00,</div><div class='add'>+	0x15, 0x81, 0x00, 0x4d, 0x83, 0xb0, 0x00, 0x00, 0x1c, 0x81, 0x00, 0x4e,</div><div class='add'>+	0x61, 0xb1, 0x00, 0x00, 0x0d, 0x81, 0x00, 0xbb, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x15, 0x81, 0x00, 0x4c, 0x83, 0xb0, 0x00, 0x00, 0x0d, 0x81, 0x00, 0xbb,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0xf0, 0x80, 0x00, 0xbb, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xe2, 0x80, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x6a, 0x84, 0x00, 0xca,</div><div class='add'>+	0x4d, 0xb3, 0x00, 0x00, 0x64, 0x82, 0x00, 0x40, 0x49, 0xb1, 0x00, 0x00,</div><div class='add'>+	0x8f, 0x82, 0x00, 0x40, 0x49, 0xb1, 0x00, 0x00, 0xc8, 0x14, 0x2e, 0xbb,</div><div class='add'>+	0x85, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xee, 0x82, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0xe0, 0xb1, 0x01, 0x00, 0xff, 0x7f, 0x00, 0xa2,</div><div class='add'>+	0xa0, 0x8b, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44, 0xa5, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x75, 0x80, 0x00, 0xca, 0xa7, 0x33, 0x01, 0x00, 0x02, 0x81, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x4e, 0x01, 0x00, 0x4d, 0x93, 0x30, 0x01, 0x00,</div><div class='add'>+	0x4e, 0x01, 0x00, 0x4e, 0x93, 0x30, 0x01, 0x00, 0x4e, 0x01, 0x00, 0x4c,</div><div class='add'>+	0x93, 0x30, 0x01, 0x00, 0x08, 0x84, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x6a, 0x84, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x54, 0x95, 0x00, 0x40,</div><div class='add'>+	0x45, 0x99, 0x01, 0x00, 0x6a, 0x84, 0x00, 0xca, 0xe5, 0xb1, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x40, 0x97, 0xb0, 0x01, 0x00, 0xe8, 0x80, 0x22, 0x42,</div><div class='add'>+	0x8f, 0x6f, 0x00, 0x00, 0xea, 0x80, 0x22, 0x41, 0x8f, 0x6f, 0x00, 0x00,</div><div class='add'>+	0xec, 0x80, 0x1e, 0xca, 0x81, 0x32, 0x00, 0x00, 0xee, 0x80, 0x1f, 0xca,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0xca, 0xc9, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x6a, 0x84, 0x00, 0x42, 0x8f, 0xb3, 0x00, 0x00, 0x00, 0x00, 0x00, 0xca,</div><div class='add'>+	0xcd, 0xb1, 0x01, 0x00, 0x6a, 0x84, 0x00, 0x41, 0x8f, 0xb3, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xca, 0xcf, 0xb1, 0x01, 0x00, 0x6a, 0x84, 0x00, 0x40,</div><div class='add'>+	0x8f, 0xb3, 0x00, 0x00, 0x00, 0x81, 0x00, 0xa6, 0xc6, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x6a, 0x84, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x80, 0x00, 0xa6,</div><div class='add'>+	0xc6, 0xb1, 0x01, 0x00, 0x6a, 0x84, 0x00, 0x40, 0x8f, 0xb3, 0x00, 0x00,</div><div class='add'>+	0x78, 0x18, 0x00, 0x40, 0x49, 0x99, 0x01, 0x00, 0x10, 0x00, 0x2f, 0x9c,</div><div class='add'>+	0x89, 0xb0, 0x01, 0x00, 0x07, 0x81, 0x00, 0x40, 0x39, 0x33, 0x01, 0x00,</div><div class='add'>+	0x18, 0x00, 0x2f, 0x9b, 0x89, 0xb0, 0x01, 0x00, 0x07, 0x81, 0x00, 0x40,</div><div class='add'>+	0x37, 0x33, 0x01, 0x00, 0x00, 0x00, 0x2f, 0x9a, 0x89, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x07, 0x81, 0x00, 0x40, 0x35, 0x33, 0x01, 0x00, 0x08, 0x00, 0x2f, 0x99,</div><div class='add'>+	0x89, 0xb0, 0x01, 0x00, 0x07, 0x81, 0x00, 0x40, 0x33, 0x33, 0x01, 0x00,</div><div class='add'>+	0x00, 0x80, 0x00, 0xae, 0x47, 0xc9, 0x01, 0x00, 0x80, 0x00, 0x00, 0x40,</div><div class='add'>+	0xf1, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0xca, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x42, 0xf0, 0xb1, 0x01, 0x00, 0x40, 0x18, 0x00, 0x40,</div><div class='add'>+	0xe1, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x45, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x20, 0x00, 0x00, 0xae, 0x63, 0xdd, 0x01, 0x00, 0x02, 0x81, 0x28, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0xff, 0x80, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x02, 0x81, 0x42, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5c,</div><div class='add'>+	0x69, 0x93, 0x01, 0x00, 0x6a, 0x84, 0x1a, 0x44, 0x93, 0x93, 0x00, 0x00,</div><div class='add'>+	0x05, 0x81, 0x42, 0x40, 0x81, 0x32, 0x00, 0x00, 0x04, 0x81, 0x00, 0x58,</div><div class='add'>+	0x69, 0x93, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0xf0, 0xd1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0xa4, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x0c, 0x81, 0xa2, 0x40,</div><div class='add'>+	0xe1, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x45, 0xd1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x40, 0xe1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x80, 0x41,</div><div class='add'>+	0xe1, 0xd1, 0x01, 0x00, 0x0d, 0x81, 0x37, 0x5c, 0x61, 0x31, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x42, 0x62, 0xb1, 0x01, 0x00, 0x11, 0x81, 0x28, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x0e, 0x81, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xca, 0x63, 0xb1, 0x01, 0x00, 0x11, 0x81, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x6a, 0x84, 0x17, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x16, 0x81, 0x00, 0x40, 0x81, 0xb0, 0x00, 0x00, 0x16, 0x81, 0x00, 0xbb,</div><div class='add'>+	0x81, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x60, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x62, 0xb1, 0x01, 0x00, 0x17, 0x81, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0xca, 0x63, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x6a, 0x84, 0x28, 0x40, 0x81, 0x32, 0x00, 0x00, 0x19, 0x81, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x50, 0x95, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00,</div><div class='add'>+	0x1f, 0x81, 0x00, 0xbb, 0x87, 0xb0, 0x00, 0x00, 0x50, 0x95, 0x2f, 0x40,</div><div class='add'>+	0x87, 0xb0, 0x01, 0x00, 0x21, 0x81, 0x22, 0x40, 0x95, 0x7f, 0x00, 0x00,</div><div class='add'>+	0x6a, 0x84, 0x60, 0x40, 0x95, 0x83, 0x00, 0x00, 0x02, 0x00, 0x2d, 0xf0,</div><div class='add'>+	0x84, 0xb0, 0x01, 0x00, 0x22, 0x81, 0x36, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x42, 0x62, 0xb1, 0x01, 0x00, 0x23, 0x81, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x62, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x25, 0x81, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0xca,</div><div class='add'>+	0x63, 0xb1, 0x01, 0x00, 0x27, 0x81, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x16, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x6a, 0x84, 0x22, 0x41,</div><div class='add'>+	0x43, 0x51, 0x00, 0x00, 0x00, 0x08, 0x00, 0xca, 0x95, 0xcb, 0x01, 0x00,</div><div class='add'>+	0x22, 0x81, 0x00, 0x41, 0x85, 0xc0, 0x00, 0x00, 0x2f, 0x81, 0xa2, 0x42,</div><div class='add'>+	0x67, 0x6f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x67, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x2f, 0x81, 0x42, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x65, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x93, 0x83, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x1a, 0xca, 0x69, 0x97, 0x01, 0x00, 0x6a, 0x84, 0x26, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x34, 0x81, 0x42, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x6a, 0x84, 0x1a, 0x44, 0x93, 0x93, 0x00, 0x00, 0x6a, 0x84, 0x20, 0x43,</div><div class='add'>+	0x95, 0x6f, 0x00, 0x00, 0x6a, 0x84, 0x80, 0xca, 0x67, 0x33, 0x00, 0x00,</div><div class='add'>+	0x6a, 0x84, 0x22, 0x40, 0x65, 0x6f, 0x00, 0x00, 0x6a, 0x84, 0x00, 0x6f,</div><div class='add'>+	0xdb, 0x91, 0x00, 0x00, 0xc1, 0x00, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x35, 0x80, 0x22, 0x40, 0x80, 0x32, 0x00, 0x00, 0x6a, 0x84, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5f, 0x95, 0x93, 0x01, 0x00,</div><div class='add'>+	0x42, 0x81, 0xa2, 0x44, 0x21, 0x6f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5f,</div><div class='add'>+	0x95, 0x83, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5e, 0x95, 0x93, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x57, 0x95, 0x93, 0x01, 0x00, 0x00, 0x00, 0x00, 0xca,</div><div class='add'>+	0xc3, 0xb1, 0x01, 0x00, 0x45, 0x81, 0x22, 0x5b, 0x95, 0x7f, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4b, 0xfd, 0x93, 0x01, 0x00, 0x6a, 0x84, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x49, 0x81, 0x22, 0x40, 0xaf, 0x6f, 0x00, 0x00,</div><div class='add'>+	0x1b, 0xf5, 0x00, 0xca, 0x95, 0x9b, 0x01, 0x00, 0x4a, 0x81, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x1b, 0xfd, 0x00, 0xca, 0x95, 0x9b, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xca, 0x7f, 0xb3, 0x01, 0x00, 0x26, 0x01, 0x00, 0xca,</div><div class='add'>+	0xc5, 0x31, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5f, 0x95, 0x83, 0x01, 0x00,</div><div class='add'>+	0x6a, 0x84, 0x00, 0xca, 0xc5, 0xb1, 0x00, 0x00, 0xdf, 0x6f, 0x00, 0xca,</div><div class='add'>+	0x95, 0x9b, 0x01, 0x00, 0x00, 0x00, 0x00, 0x55, 0x95, 0x93, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xca, 0xc7, 0xb1, 0x01, 0x00, 0x6a, 0x84, 0x22, 0x5f,</div><div class='add'>+	0x95, 0x7f, 0x00, 0x00, 0x26, 0x01, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x5f, 0x95, 0x83, 0x01, 0x00, 0x6a, 0x84, 0x00, 0xca,</div><div class='add'>+	0xc7, 0xb1, 0x00, 0x00, 0x6a, 0x84, 0x00, 0xca, 0xc9, 0xb1, 0x00, 0x00,</div><div class='add'>+	0x6a, 0x84, 0x00, 0xca, 0xcb, 0xb1, 0x00, 0x00, 0x6a, 0x84, 0x00, 0xca,</div><div class='add'>+	0xcd, 0xb1, 0x00, 0x00, 0x6a, 0x84, 0x00, 0xca, 0xcf, 0xb1, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x2e, 0x42, 0x81, 0xe0, 0x01, 0x00, 0x98, 0x14, 0x00, 0x40,</div><div class='add'>+	0x48, 0xc9, 0x01, 0x00, 0x6a, 0x84, 0x00, 0xca, 0xe1, 0xb1, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x09, 0xb1, 0x01, 0x00, 0x20, 0x00, 0x00, 0xa6,</div><div class='add'>+	0x82, 0xb0, 0x01, 0x00, 0x5e, 0x81, 0xa2, 0x5e, 0x0b, 0x7d, 0x00, 0x00,</div><div class='add'>+	0x00, 0x80, 0x00, 0x41, 0x08, 0x99, 0x01, 0x00, 0x60, 0x81, 0xa2, 0x5e,</div><div class='add'>+	0x0b, 0x7d, 0x00, 0x00, 0x20, 0x80, 0x00, 0xa6, 0x08, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x62, 0x81, 0x9f, 0x85, 0x82, 0x30, 0x00, 0x00, 0x61, 0x81, 0xa2, 0x4f,</div><div class='add'>+	0x0b, 0x7d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x21, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x02, 0x80, 0x00, 0xa6, 0x82, 0xb0, 0x01, 0x00, 0xc9, 0x81, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x10, 0x00, 0x00, 0x41, 0x84, 0xe4, 0x01, 0x00,</div><div class='add'>+	0x03, 0x80, 0x00, 0xa6, 0x82, 0xb0, 0x01, 0x00, 0xc9, 0x81, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0xf0, 0xff, 0x00, 0x41, 0x86, 0x88, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x43, 0x84, 0x94, 0x01, 0x00, 0x0f, 0x00, 0x00, 0xa6,</div><div class='add'>+	0x86, 0xb0, 0x01, 0x00, 0x10, 0xc4, 0x00, 0x43, 0x86, 0x98, 0x01, 0x00,</div><div class='add'>+	0x75, 0x81, 0xa2, 0x43, 0x84, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43,</div><div class='add'>+	0x21, 0xb3, 0x01, 0x00, 0x20, 0x00, 0x00, 0xa6, 0x82, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x1c, 0x00, 0x00, 0x41, 0x82, 0xdc, 0x01, 0x00, 0x72, 0x81, 0xa2, 0x5e,</div><div class='add'>+	0x0b, 0x7d, 0x00, 0x00, 0x04, 0x00, 0x00, 0x41, 0x08, 0x99, 0x01, 0x00,</div><div class='add'>+	0x7e, 0x81, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x41, 0x01, 0x00, 0xa6,</div><div class='add'>+	0x86, 0xb0, 0x01, 0x00, 0x50, 0x0c, 0x00, 0x43, 0x86, 0x98, 0x01, 0x00,</div><div class='add'>+	0x7a, 0x81, 0xa2, 0x43, 0x84, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x21, 0xb3, 0x01, 0x00, 0x7e, 0x81, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x41, 0x01, 0x00, 0xa6, 0x86, 0xb0, 0x01, 0x00, 0x60, 0x0c, 0x00, 0x43,</div><div class='add'>+	0x86, 0x98, 0x01, 0x00, 0x7e, 0x81, 0xa2, 0x43, 0x84, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x42, 0x21, 0xb3, 0x01, 0x00, 0x20, 0x00, 0x00, 0xa6,</div><div class='add'>+	0x82, 0xb0, 0x01, 0x00, 0x7f, 0x81, 0xa2, 0x5e, 0x0b, 0x7d, 0x00, 0x00,</div><div class='add'>+	0x40, 0x13, 0x00, 0x41, 0x08, 0x99, 0x01, 0x00, 0x87, 0x81, 0x22, 0x43,</div><div class='add'>+	0x21, 0x6f, 0x00, 0x00, 0x20, 0x00, 0x00, 0xa6, 0x82, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x12, 0x00, 0x00, 0x41, 0x82, 0xdc, 0x01, 0x00, 0x84, 0x81, 0xa2, 0x5e,</div><div class='add'>+	0x0b, 0x7d, 0x00, 0x00, 0x00, 0x04, 0x00, 0x41, 0x08, 0x99, 0x01, 0x00,</div><div class='add'>+	0x8c, 0x81, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x20, 0x00, 0x00, 0xa6,</div><div class='add'>+	0x82, 0xb0, 0x01, 0x00, 0x19, 0x00, 0x00, 0x41, 0x82, 0xdc, 0x01, 0x00,</div><div class='add'>+	0x89, 0x81, 0xa2, 0x5e, 0x0b, 0x7d, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x41,</div><div class='add'>+	0x08, 0x99, 0x01, 0x00, 0x8c, 0x81, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x20, 0x00, 0x00, 0xa6,</div><div class='add'>+	0x80, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xca, 0x81, 0x94, 0x01, 0x00,</div><div class='add'>+	0x8f, 0x81, 0xa2, 0x5e, 0x0b, 0x7d, 0x00, 0x00, 0x6a, 0x84, 0x00, 0x40,</div><div class='add'>+	0x08, 0xb1, 0x00, 0x00, 0xc8, 0x14, 0x2e, 0xbb, 0x85, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x92, 0x81, 0xa2, 0x5e, 0x0b, 0x7d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x87, 0xb0, 0x01, 0x00, 0xa1, 0x81, 0x22, 0x43, 0x21, 0x6f, 0x00, 0x00,</div><div class='add'>+	0xb0, 0x81, 0x22, 0x44, 0x21, 0x6f, 0x00, 0x00, 0x11, 0x80, 0x00, 0xa6,</div><div class='add'>+	0x82, 0xb0, 0x01, 0x00, 0xc9, 0x81, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0xb8, 0x81, 0x22, 0x4a, 0x83, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x87, 0x90, 0x01, 0x00, 0x9c, 0x81, 0x22, 0x4d, 0x83, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x87, 0x90, 0x01, 0x00, 0x9e, 0x81, 0x22, 0x4f,</div><div class='add'>+	0x83, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x87, 0x90, 0x01, 0x00,</div><div class='add'>+	0xa0, 0x81, 0x22, 0x4e, 0x83, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42,</div><div class='add'>+	0x87, 0x90, 0x01, 0x00, 0xb8, 0x81, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x01, 0x80, 0x00, 0xa6, 0x82, 0xb0, 0x01, 0x00, 0xc9, 0x81, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x01, 0x80, 0x00, 0xa6, 0x82, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xc9, 0x81, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0xb8, 0x81, 0x22, 0x42,</div><div class='add'>+	0x83, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x87, 0x90, 0x01, 0x00,</div><div class='add'>+	0x1c, 0x80, 0x00, 0xa6, 0x82, 0xb0, 0x01, 0x00, 0xc9, 0x81, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0xab, 0x81, 0x22, 0x45, 0x83, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x87, 0x90, 0x01, 0x00, 0xad, 0x81, 0x22, 0x44,</div><div class='add'>+	0x83, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x87, 0x90, 0x01, 0x00,</div><div class='add'>+	0xaf, 0x81, 0x22, 0x43, 0x83, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42,</div><div class='add'>+	0x87, 0x90, 0x01, 0x00, 0xb8, 0x81, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x01, 0x80, 0x00, 0xa6, 0x82, 0xb0, 0x01, 0x00, 0xc9, 0x81, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x01, 0x80, 0x00, 0xa6, 0x82, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xc9, 0x81, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0xb8, 0x81, 0x22, 0x42,</div><div class='add'>+	0x83, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x87, 0x90, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x43, 0x87, 0x90, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x87, 0x90, 0x01, 0x00, 0x00, 0x80, 0x00, 0xa6, 0x82, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xc9, 0x81, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0xbc, 0x81, 0x22, 0x4b,</div><div class='add'>+	0x83, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x87, 0x80, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x43, 0xe0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0xaf, 0xb3, 0x01, 0x00, 0xc5, 0x81, 0x22, 0x40, 0x87, 0x7c, 0x00, 0x00,</div><div class='add'>+	0xc5, 0x81, 0xa2, 0x41, 0x87, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0xae, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x81, 0xb3, 0x01, 0x00,</div><div class='add'>+	0xc4, 0x81, 0x22, 0x42, 0x87, 0x7c, 0x00, 0x00, 0xc5, 0x81, 0x00, 0x0b,</div><div class='add'>+	0x7d, 0xb3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x7d, 0xb3, 0x01, 0x00,</div><div class='add'>+	0xff, 0x7f, 0x00, 0xa2, 0xa0, 0x8b, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0xa5, 0xb3, 0x01, 0x00, 0x75, 0x80, 0x00, 0xca, 0xa7, 0x33, 0x01, 0x00,</div><div class='add'>+	0x02, 0x81, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x20, 0x00, 0x00, 0x41,</div><div class='add'>+	0x82, 0xdc, 0x01, 0x00, 0xca, 0x81, 0xa2, 0x5e, 0x0b, 0x7d, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x08, 0xb1, 0x01, 0x00, 0xcc, 0x81, 0x9f, 0x85,</div><div class='add'>+	0x82, 0x30, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0xd1, 0x81, 0x14, 0xf7, 0x81, 0x30, 0x00, 0x00, 0xd1, 0x81, 0xa2, 0x49,</div><div class='add'>+	0xfd, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x48, 0xfd, 0x93, 0x01, 0x00,</div><div class='add'>+	0xd4, 0x81, 0x15, 0xf8, 0x81, 0x14, 0x00, 0x00, 0xd4, 0x81, 0xa2, 0x4a,</div><div class='add'>+	0xfd, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x48, 0xfd, 0x93, 0x01, 0x00,</div><div class='add'>+	0xd6, 0x81, 0xa2, 0xc8, 0x81, 0x32, 0x00, 0x00, 0x40, 0x00, 0x00, 0x40,</div><div class='add'>+	0x80, 0xdc, 0x01, 0x00, 0x00, 0x10, 0x00, 0x40, 0x80, 0xdc, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0xef, 0xb3, 0x01, 0x00, 0xd8, 0x81, 0x42, 0x40,</div><div class='add'>+	0xf1, 0x33, 0x00, 0x00, 0x04, 0x81, 0x00, 0x40, 0x68, 0x97, 0x00, 0x00,</div><div class='add'>+	0x6a, 0x84, 0x00, 0xbb, 0x6b, 0xb3, 0x00, 0x00, 0x6a, 0x84, 0x00, 0xbb,</div><div class='add'>+	0xb1, 0xb3, 0x00, 0x00, 0x6a, 0x84, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xcc, 0x14, 0x2e, 0x40, 0x87, 0xb0, 0x01, 0x00, 0xff, 0x7f, 0x00, 0xa2,</div><div class='add'>+	0xa0, 0x8b, 0x01, 0x00, 0xd8, 0x00, 0x00, 0x43, 0xb2, 0x33, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x68, 0xda, 0x89, 0xb0, 0x01, 0x00, 0x7c, 0x00, 0x00, 0x40,</div><div class='add'>+	0x8b, 0x98, 0x01, 0x00, 0x00, 0x00, 0x00, 0x50, 0x89, 0xf0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x89, 0xd0, 0x01, 0x00, 0x03, 0x00, 0x00, 0x44,</div><div class='add'>+	0x88, 0x8c, 0x01, 0x00, 0x00, 0x00, 0x00, 0x42, 0x87, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0xa5, 0xb3, 0x01, 0x00, 0xd8, 0x00, 0x00, 0x43,</div><div class='add'>+	0xb2, 0x33, 0x01, 0x00, 0x00, 0x00, 0x00, 0xda, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x42, 0x87, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0xa5, 0xc3, 0x01, 0x00, 0xf8, 0x81, 0x22, 0x44, 0x89, 0x50, 0x00, 0x00,</div><div class='add'>+	0xf8, 0x81, 0x22, 0x44, 0x8b, 0x50, 0x00, 0x00, 0xe7, 0x81, 0xa2, 0x50,</div><div class='add'>+	0xa5, 0x6f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0xa5, 0xe3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xca, 0xa7, 0xb3, 0x01, 0x00, 0x75, 0x80, 0x00, 0xbb,</div><div class='add'>+	0x85, 0x30, 0x01, 0x00, 0xcc, 0x14, 0x2e, 0xd2, 0x95, 0xc3, 0x01, 0x00,</div><div class='add'>+	0xae, 0x03, 0x00, 0xcb, 0xa3, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x20,</div><div class='add'>+	0x42, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x50, 0x81, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xf5, 0x81, 0xa2, 0x41, 0x81, 0x50, 0x00, 0x00, 0xf4, 0x81, 0xa2, 0xf2,</div><div class='add'>+	0x80, 0x30, 0x00, 0x00, 0xe7, 0x81, 0x00, 0x40, 0xa5, 0xb3, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x42, 0xa5, 0xe3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xca,</div><div class='add'>+	0xa7, 0xb3, 0x01, 0x00, 0x75, 0x80, 0x00, 0xbb, 0x85, 0x30, 0x01, 0x00,</div><div class='add'>+	0x02, 0x81, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xd9, 0x00, 0x00, 0x41,</div><div class='add'>+	0xb3, 0x73, 0x01, 0x00, 0x00, 0x00, 0x80, 0x50, 0xb5, 0xf3, 0x01, 0x00,</div><div class='add'>+	0xd8, 0x00, 0x00, 0x41, 0xb3, 0xf3, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd9,</div><div class='add'>+	0xb3, 0xfb, 0x01, 0x00, 0x00, 0x30, 0x00, 0xa6, 0xb8, 0xb3, 0x01, 0x00,</div><div class='add'>+	0xf2, 0x00, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x25, 0x01, 0x00, 0x42,</div><div class='add'>+	0x2d, 0x01, 0x01, 0x00, 0x00, 0x02, 0x00, 0x40, 0x83, 0x98, 0x01, 0x00,</div><div class='add'>+	0xeb, 0x00, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0x50,</div><div class='add'>+	0x81, 0xb0, 0x01, 0x00, 0x26, 0x01, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x09, 0x82, 0x10, 0xda, 0xb5, 0x6b, 0x00, 0x00, 0x0a, 0x82, 0x00, 0x41,</div><div class='add'>+	0x2d, 0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x2d, 0x91, 0x01, 0x00,</div><div class='add'>+	0x28, 0x01, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x25, 0x01, 0x00, 0x40,</div><div class='add'>+	0x2d, 0x11, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x2d, 0x81, 0x01, 0x00,</div><div class='add'>+	0x06, 0x82, 0xa2, 0x41, 0x81, 0x50, 0x00, 0x00, 0x26, 0x01, 0x00, 0x42,</div><div class='add'>+	0x2d, 0x01, 0x01, 0x00, 0x25, 0x01, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x26, 0x01, 0x00, 0x42, 0x2d, 0x11, 0x01, 0x00, 0x25, 0x01, 0x00, 0x40,</div><div class='add'>+	0x2d, 0x11, 0x01, 0x00, 0x15, 0x82, 0x04, 0x40, 0x2d, 0x01, 0x00, 0x00,</div><div class='add'>+	0x25, 0x01, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x11, 0x82, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x28, 0x01, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x25, 0x01, 0x00, 0x42, 0x2d, 0x01, 0x01, 0x00, 0xf2, 0x00, 0x00, 0x40,</div><div class='add'>+	0xb9, 0x33, 0x01, 0x00, 0x00, 0x00, 0x00, 0x42, 0x2d, 0x81, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x41, 0x2d, 0x81, 0x01, 0x00, 0x00, 0x00, 0x80, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x03, 0x00, 0x40, 0x81, 0x98, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x18, 0xb1, 0x01, 0x00, 0x80, 0x00, 0x00, 0x40,</div><div class='add'>+	0x83, 0x98, 0x01, 0x00, 0x00, 0x19, 0x00, 0x40, 0x45, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x42, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x43, 0xff,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xff, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x81, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x18, 0xb1, 0x01, 0x00, 0x1f, 0x82, 0xa2, 0x41, 0x83, 0x50, 0x00, 0x00,</div><div class='add'>+	0x00, 0x16, 0x00, 0x40, 0x45, 0x99, 0x01, 0x00, 0x00, 0x19, 0x00, 0x40,</div><div class='add'>+	0x43, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x47, 0x43, 0xc1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x83, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf3,</div><div class='add'>+	0x80, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5b, 0x81, 0xd0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x80, 0xd0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0xf6, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5b, 0x43, 0xc1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x83, 0xc0, 0x01, 0x00, 0x29, 0x82, 0xa2, 0x54,</div><div class='add'>+	0x83, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xf7, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x83, 0xc0, 0x01, 0x00, 0x30, 0x82, 0xa2, 0x06,</div><div class='add'>+	0x83, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x07, 0x91, 0xb0, 0x01, 0x00, 0xe1, 0x80, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x39, 0x82, 0xa2, 0x40, 0x97, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x28, 0x00, 0x00, 0x40, 0xb3, 0x9b, 0x01, 0x00, 0x3a, 0x82, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x28, 0x00, 0x00, 0x40, 0xb3, 0x9b, 0x01, 0x00,</div><div class='add'>+	0xfc, 0x81, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0xda,</div><div class='add'>+	0xf5, 0xb1, 0x01, 0x00, 0xfc, 0x81, 0x00, 0x42, 0xb3, 0x43, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xda, 0xf5, 0xb1, 0x01, 0x00, 0xfc, 0x81, 0x00, 0x42,</div><div class='add'>+	0xb3, 0x43, 0x01, 0x00, 0x00, 0x00, 0x00, 0xda, 0xf5, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x4e, 0x00, 0x00, 0x40, 0xb3, 0x9b, 0x01, 0x00, 0xfc, 0x81, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x08, 0x00, 0x00, 0xda, 0xf7, 0xf5, 0x01, 0x00,</div><div class='add'>+	0x50, 0x00, 0x00, 0x40, 0x91, 0x98, 0x01, 0x00, 0x00, 0x00, 0x00, 0x47,</div><div class='add'>+	0x8f, 0xb0, 0x01, 0x00, 0xfc, 0x81, 0x00, 0x48, 0xb2, 0x33, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xda, 0xf7, 0xb1, 0x01, 0x00, 0x08, 0x00, 0x00, 0xda,</div><div class='add'>+	0xf7, 0xf5, 0x01, 0x00, 0x00, 0x00, 0x00, 0x42, 0x91, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x45, 0x82, 0xa2, 0x41, 0x8f, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x45, 0xd1, 0x01, 0x00, 0x08, 0x00, 0x00, 0x40, 0xb3, 0x9b, 0x01, 0x00,</div><div class='add'>+	0xfc, 0x81, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0xda,</div><div class='add'>+	0xfd, 0xb1, 0x01, 0x00, 0x0a, 0x00, 0x00, 0x40, 0xb3, 0x9b, 0x01, 0x00,</div><div class='add'>+	0xfc, 0x81, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0xda,</div><div class='add'>+	0xfd, 0xb1, 0x01, 0x00, 0x18, 0x00, 0x00, 0x40, 0xb3, 0x9b, 0x01, 0x00,</div><div class='add'>+	0xfc, 0x81, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0xda,</div><div class='add'>+	0xfd, 0xb1, 0x01, 0x00, 0x16, 0x00, 0x00, 0x40, 0xb3, 0x9b, 0x01, 0x00,</div><div class='add'>+	0xfc, 0x81, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0xda,</div><div class='add'>+	0xfd, 0xb1, 0x01, 0x00, 0x34, 0x82, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x1e, 0x00, 0x00, 0x48, 0xb2, 0xcb, 0x01, 0x00, 0xfc, 0x81, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0xda, 0x91, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x48, 0xb2, 0xcb, 0x01, 0x00, 0xfc, 0x81, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x6e, 0xda, 0x8f, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x02, 0x00, 0x00, 0x48, 0xb2, 0xcb, 0x01, 0x00, 0xfc, 0x81, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0xda, 0xfd, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x48, 0xb2, 0xcb, 0x01, 0x00, 0xfc, 0x81, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x80, 0xda, 0xfd, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x6f, 0x82, 0x22, 0x50, 0xfd, 0x7f, 0x00, 0x00, 0x6f, 0x82, 0x22, 0x45,</div><div class='add'>+	0xfd, 0x7f, 0x00, 0x00, 0x40, 0x16, 0x00, 0x40, 0x45, 0x99, 0x01, 0x00,</div><div class='add'>+	0x35, 0x82, 0x00, 0x40, 0x49, 0x31, 0x01, 0x00, 0x08, 0x00, 0x00, 0x48,</div><div class='add'>+	0xb2, 0xcb, 0x01, 0x00, 0xfe, 0x81, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x6d, 0x82, 0xa2, 0x40, 0x8f, 0x6c, 0x00, 0x00, 0x72, 0x82, 0x22, 0x20,</div><div class='add'>+	0xb5, 0x6f, 0x00, 0x00, 0x6f, 0x82, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xdb, 0x82, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x72, 0x82, 0x22, 0x40,</div><div class='add'>+	0x97, 0x6c, 0x00, 0x00, 0x6f, 0x82, 0x42, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4f, 0x69, 0x93, 0x01, 0x00, 0x04, 0x81, 0x00, 0x58,</div><div class='add'>+	0x69, 0x93, 0x00, 0x00, 0x54, 0x16, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xfe, 0xf4, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xf4, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x00, 0xfe,</div><div class='add'>+	0xf4, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xfe, 0xf4, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xf4, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x00, 0xfe,</div><div class='add'>+	0xf4, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xfe, 0xf4, 0xb1, 0x01, 0x00, 0x46, 0x00, 0x00, 0x40,</div><div class='add'>+	0xb3, 0x9b, 0x01, 0x00, 0xfc, 0x81, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x08, 0x00, 0x00, 0xda, 0xf7, 0xf5, 0x01, 0x00, 0x48, 0x00, 0x00, 0x40,</div><div class='add'>+	0x95, 0x98, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44, 0x97, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xfc, 0x81, 0x00, 0x4a, 0xb2, 0x33, 0x01, 0x00, 0x00, 0x00, 0x00, 0xda,</div><div class='add'>+	0xf7, 0xb1, 0x01, 0x00, 0x08, 0x00, 0x00, 0xda, 0xf7, 0xf5, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x42, 0x95, 0xc0, 0x01, 0x00, 0x85, 0x82, 0xa2, 0x41,</div><div class='add'>+	0x97, 0x50, 0x00, 0x00, 0x2a, 0x00, 0x00, 0x40, 0xa5, 0x9b, 0x01, 0x00,</div><div class='add'>+	0x40, 0x16, 0x00, 0x40, 0xa1, 0x9b, 0x01, 0x00, 0x00, 0x00, 0x00, 0xca,</div><div class='add'>+	0xa7, 0xb3, 0x01, 0x00, 0x75, 0x80, 0x00, 0xbb, 0x85, 0x30, 0x01, 0x00,</div><div class='add'>+	0x02, 0x81, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xa7, 0x82, 0x22, 0x45,</div><div class='add'>+	0xfd, 0x7f, 0x00, 0x00, 0xe0, 0x15, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00,</div><div class='add'>+	0x1a, 0x00, 0x00, 0xa2, 0x80, 0xdc, 0x01, 0x00, 0x00, 0x00, 0x00, 0x50,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0xf0, 0x15, 0x00, 0x40, 0xf1, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xca, 0xf1, 0xb1, 0x01, 0x00, 0x07, 0x00, 0x00, 0x40,</div><div class='add'>+	0x61, 0x99, 0x01, 0x00, 0xa0, 0x00, 0x00, 0x40, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0x96, 0x82, 0xa8, 0xbb, 0xe1, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50,</div><div class='add'>+	0x83, 0xb0, 0x01, 0x00, 0x99, 0x82, 0xa2, 0x41, 0x83, 0x50, 0x00, 0x00,</div><div class='add'>+	0x98, 0x82, 0xa2, 0xf2, 0x82, 0x30, 0x00, 0x00, 0xe1, 0x80, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x9f, 0x82, 0xa2, 0x40, 0x97, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x28, 0x00, 0x00, 0x40, 0xb3, 0x9b, 0x01, 0x00, 0xa0, 0x82, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x28, 0x00, 0x00, 0x40, 0xb3, 0x9b, 0x01, 0x00,</div><div class='add'>+	0xf0, 0x15, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00, 0xfc, 0x81, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0xa7, 0x82, 0xa2, 0xfa, 0xb4, 0x6f, 0x00, 0x00,</div><div class='add'>+	0xfc, 0x81, 0x00, 0x42, 0xb3, 0x43, 0x01, 0x00, 0xa7, 0x82, 0xa2, 0xfa,</div><div class='add'>+	0xb4, 0x6f, 0x00, 0x00, 0xfc, 0x81, 0x00, 0x42, 0xb3, 0x43, 0x01, 0x00,</div><div class='add'>+	0xaa, 0x82, 0x22, 0xfa, 0xb4, 0x6f, 0x00, 0x00, 0xa7, 0x82, 0x42, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4e, 0x69, 0x93, 0x01, 0x00,</div><div class='add'>+	0x04, 0x81, 0x00, 0x58, 0x69, 0x93, 0x00, 0x00, 0x40, 0x16, 0x00, 0x40,</div><div class='add'>+	0x45, 0x99, 0x01, 0x00, 0x35, 0x82, 0x00, 0x40, 0x49, 0x31, 0x01, 0x00,</div><div class='add'>+	0xf6, 0x15, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00, 0x5c, 0x16, 0x00, 0x40,</div><div class='add'>+	0x45, 0x99, 0x01, 0x00, 0x00, 0x00, 0x6e, 0xfa, 0x8e, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x00, 0xfe,</div><div class='add'>+	0xf4, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xfe, 0xf4, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xb4, 0xb3, 0x01, 0x00,</div><div class='add'>+	0xb8, 0x82, 0xa2, 0x40, 0x8f, 0x6c, 0x00, 0x00, 0xfc, 0x15, 0x20, 0x20,</div><div class='add'>+	0xe1, 0xb1, 0x01, 0x00, 0xbd, 0x82, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xdb, 0x82, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0xbd, 0x82, 0x22, 0x40,</div><div class='add'>+	0x97, 0x6c, 0x00, 0x00, 0xba, 0x82, 0x42, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4f, 0x69, 0x93, 0x01, 0x00, 0x04, 0x81, 0x00, 0x58,</div><div class='add'>+	0x69, 0x93, 0x00, 0x00, 0x34, 0x82, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x1e, 0x00, 0x00, 0x48, 0xb2, 0xcb, 0x01, 0x00, 0xfc, 0x81, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0xc2, 0x82, 0x22, 0x50, 0xb5, 0x6f, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x50, 0x91, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x48,</div><div class='add'>+	0xb2, 0xcb, 0x01, 0x00, 0xf6, 0x15, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00,</div><div class='add'>+	0xff, 0x81, 0x00, 0xf2, 0xb4, 0x33, 0x01, 0x00, 0x02, 0x00, 0x00, 0x48,</div><div class='add'>+	0xb2, 0xcb, 0x01, 0x00, 0xf8, 0x15, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00,</div><div class='add'>+	0xff, 0x81, 0x00, 0xf2, 0xb4, 0x33, 0x01, 0x00, 0x04, 0x00, 0x00, 0x48,</div><div class='add'>+	0xb2, 0xcb, 0x01, 0x00, 0xfa, 0x15, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00,</div><div class='add'>+	0xff, 0x81, 0x00, 0xf2, 0xb4, 0x33, 0x01, 0x00, 0x08, 0x00, 0x00, 0x48,</div><div class='add'>+	0xb2, 0xcb, 0x01, 0x00, 0xfc, 0x15, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf0, 0x94, 0xb0, 0x01, 0x00, 0xff, 0xff, 0x00, 0x4a,</div><div class='add'>+	0xb4, 0x8b, 0x01, 0x00, 0xff, 0x81, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x0a, 0x00, 0x00, 0x48, 0xb2, 0xcb, 0x01, 0x00, 0x10, 0x00, 0x00, 0x4a,</div><div class='add'>+	0xb4, 0xf7, 0x01, 0x00, 0xff, 0x81, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x34, 0x82, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x1e, 0x00, 0x00, 0x48,</div><div class='add'>+	0xb2, 0xcb, 0x01, 0x00, 0xfc, 0x81, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0xd8, 0x82, 0x22, 0x50, 0xb5, 0x6f, 0x00, 0x00, 0xd9, 0x82, 0x00, 0x50,</div><div class='add'>+	0xb5, 0xb3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xb5, 0xb3, 0x01, 0x00,</div><div class='add'>+	0xff, 0x81, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x02, 0x81, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x16, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00,</div><div class='add'>+	0x30, 0x31, 0x00, 0x40, 0xf5, 0x99, 0x01, 0x00, 0x32, 0x33, 0x00, 0x40,</div><div class='add'>+	0xf5, 0x99, 0x01, 0x00, 0x34, 0x35, 0x00, 0x40, 0xf5, 0x99, 0x01, 0x00,</div><div class='add'>+	0x36, 0x37, 0x00, 0x40, 0xf5, 0x99, 0x01, 0x00, 0x38, 0x39, 0x00, 0x40,</div><div class='add'>+	0xf5, 0x99, 0x01, 0x00, 0x41, 0x42, 0x00, 0x40, 0xf5, 0x99, 0x01, 0x00,</div><div class='add'>+	0x43, 0x44, 0x00, 0x40, 0xf5, 0x99, 0x01, 0x00, 0x45, 0x46, 0x00, 0x40,</div><div class='add'>+	0xf5, 0x99, 0x01, 0x00, 0x47, 0x48, 0x00, 0x40, 0xf5, 0x99, 0x01, 0x00,</div><div class='add'>+	0x49, 0x4a, 0x00, 0x40, 0xf5, 0x99, 0x01, 0x00, 0x2c, 0x00, 0x00, 0x40,</div><div class='add'>+	0x83, 0x98, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0xf7, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xe7, 0x82, 0xa2, 0x41, 0x83, 0x50, 0x00, 0x00, 0x80, 0x16, 0x2e, 0x06,</div><div class='add'>+	0x83, 0xb0, 0x01, 0x00, 0x36, 0x00, 0x00, 0xfb, 0xf6, 0xa9, 0x01, 0x00,</div><div class='add'>+	0xea, 0x82, 0xa2, 0x41, 0x83, 0x50, 0x00, 0x00, 0x22, 0x00, 0x00, 0x40,</div><div class='add'>+	0x83, 0x98, 0x01, 0x00, 0x00, 0x00, 0x00, 0xfb, 0xf6, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xed, 0x82, 0xa2, 0x41, 0x83, 0x50, 0x00, 0x00, 0x62, 0x00, 0x00, 0x40,</div><div class='add'>+	0x95, 0x98, 0x01, 0x00, 0x00, 0x83, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x00, 0x16, 0x2d, 0x06, 0x83, 0xb0, 0x01, 0x00, 0x80, 0x16, 0x00, 0x40,</div><div class='add'>+	0x45, 0x99, 0x01, 0x00, 0x5c, 0x00, 0x00, 0xfb, 0xf6, 0xa9, 0x01, 0x00,</div><div class='add'>+	0xf3, 0x82, 0xa2, 0x41, 0x83, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70,</div><div class='add'>+	0xf9, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x71, 0xf9, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x72, 0xf9, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x73,</div><div class='add'>+	0xf9, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x74, 0xf9, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x54, 0x00, 0x00, 0x40, 0x95, 0x98, 0x01, 0x00, 0x00, 0x83, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0x70, 0x95, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xff, 0x82, 0x22, 0x70, 0xb5, 0x6f, 0x00, 0x00, 0x00, 0x00, 0x80, 0x41,</div><div class='add'>+	0x97, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x80, 0x40, 0x97, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x45, 0x67, 0x00, 0xa6, 0xe0, 0xb2, 0x01, 0x00, 0x01, 0x23, 0x00, 0x70,</div><div class='add'>+	0xe1, 0x9a, 0x01, 0x00, 0xcd, 0xef, 0x00, 0xa6, 0xe2, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x89, 0xab, 0x00, 0x71, 0xe3, 0x9a, 0x01, 0x00, 0xba, 0x98, 0x00, 0xa6,</div><div class='add'>+	0xe4, 0xb2, 0x01, 0x00, 0xfe, 0xdc, 0x00, 0x72, 0xe5, 0x9a, 0x01, 0x00,</div><div class='add'>+	0x32, 0x10, 0x00, 0xa6, 0xe6, 0xb2, 0x01, 0x00, 0x76, 0x54, 0x00, 0x73,</div><div class='add'>+	0xe7, 0x9a, 0x01, 0x00, 0xd2, 0xc3, 0x00, 0xa6, 0xe8, 0xb2, 0x01, 0x00,</div><div class='add'>+	0xf0, 0xe1, 0x00, 0x74, 0xe9, 0x9a, 0x01, 0x00, 0x80, 0x16, 0x00, 0x4a,</div><div class='add'>+	0x44, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x07, 0x81, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4a, 0x80, 0xd0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0xf7, 0xb1, 0x01, 0x00, 0x0d, 0x83, 0xa2, 0x41, 0x81, 0x50, 0x00, 0x00,</div><div class='add'>+	0x80, 0x16, 0x00, 0x4a, 0x44, 0xc9, 0x01, 0x00, 0xfc, 0x16, 0x2a, 0x47,</div><div class='add'>+	0xe7, 0xb5, 0x01, 0x00, 0x03, 0x00, 0x00, 0x4a, 0xe8, 0xe5, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x8d, 0xb0, 0x01, 0x00, 0x50, 0x03, 0x00, 0x40,</div><div class='add'>+	0xa3, 0x99, 0x01, 0x00, 0x80, 0x16, 0x3d, 0x46, 0x8d, 0xe0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x50, 0x89, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xfc,</div><div class='add'>+	0x40, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41, 0xa3, 0xc1, 0x01, 0x00,</div><div class='add'>+	0x16, 0x83, 0xa2, 0x41, 0x89, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70,</div><div class='add'>+	0xeb, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x00, 0x71, 0xed, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x72, 0xef, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x00, 0x73,</div><div class='add'>+	0xf1, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x00, 0x74, 0xf3, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x83, 0xb0, 0x01, 0x00, 0x0f, 0x00, 0x00, 0x41,</div><div class='add'>+	0x80, 0x88, 0x01, 0x00, 0x50, 0x03, 0x00, 0x40, 0xa2, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x33, 0x83, 0xa0, 0x50, 0x83, 0x6c, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x40,</div><div class='add'>+	0x98, 0xc8, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4f, 0x99, 0x84, 0x01, 0x00,</div><div class='add'>+	0x50, 0x03, 0x00, 0x4c, 0xa2, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x20,</div><div class='add'>+	0x86, 0xb0, 0x01, 0x00, 0x08, 0x00, 0x00, 0x40, 0x98, 0xc8, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4f, 0x99, 0x84, 0x01, 0x00, 0x50, 0x03, 0x00, 0x4c,</div><div class='add'>+	0xa2, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x20, 0x86, 0xa4, 0x01, 0x00,</div><div class='add'>+	0x02, 0x00, 0x00, 0x40, 0x98, 0xc8, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4f,</div><div class='add'>+	0x99, 0x84, 0x01, 0x00, 0x50, 0x03, 0x00, 0x4c, 0xa2, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x20, 0x86, 0xa4, 0x01, 0x00, 0x50, 0x03, 0x00, 0x40,</div><div class='add'>+	0xa2, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x43, 0x40, 0xa4, 0x01, 0x00,</div><div class='add'>+	0x01, 0x00, 0x00, 0x20, 0x88, 0xe4, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5f,</div><div class='add'>+	0x41, 0xf0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44, 0x40, 0x94, 0x01, 0x00,</div><div class='add'>+	0x05, 0x00, 0x00, 0x75, 0x89, 0xe4, 0x01, 0x00, 0x1b, 0x00, 0x00, 0x75,</div><div class='add'>+	0x85, 0xf4, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44, 0x84, 0x94, 0x01, 0x00,</div><div class='add'>+	0x3d, 0x83, 0xa3, 0x53, 0x83, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x76,</div><div class='add'>+	0x89, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x77, 0x89, 0x84, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x76, 0x8b, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8b, 0xa4, 0x01, 0x00, 0x00, 0x00, 0x00, 0x78, 0x8b, 0x84, 0x01, 0x00,</div><div class='add'>+	0x4c, 0x83, 0x00, 0x45, 0x88, 0x94, 0x00, 0x00, 0x27, 0x00, 0x00, 0x41,</div><div class='add'>+	0x80, 0xce, 0x01, 0x00, 0x42, 0x83, 0xaa, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x76, 0x89, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x77,</div><div class='add'>+	0x89, 0xa4, 0x01, 0x00, 0x4c, 0x83, 0x00, 0x78, 0x89, 0xa4, 0x00, 0x00,</div><div class='add'>+	0x3b, 0x00, 0x00, 0x41, 0x80, 0xce, 0x01, 0x00, 0x3f, 0x83, 0xaa, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x76, 0x89, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x77, 0x89, 0x84, 0x01, 0x00, 0x00, 0x00, 0x00, 0x76,</div><div class='add'>+	0x8b, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x78, 0x8b, 0x84, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x45, 0x88, 0x94, 0x01, 0x00, 0x00, 0x00, 0x00, 0x77,</div><div class='add'>+	0x8b, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x78, 0x8b, 0x84, 0x01, 0x00,</div><div class='add'>+	0x4c, 0x83, 0x00, 0x45, 0x88, 0x94, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0x84, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x79, 0x85, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x20, 0x84, 0xc0, 0x01, 0x00, 0x53, 0x83, 0xa3, 0x53,</div><div class='add'>+	0x83, 0x6c, 0x00, 0x00, 0x82, 0x5a, 0x00, 0xa6, 0x84, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x99, 0x79, 0x00, 0x42, 0x84, 0xc8, 0x01, 0x00, 0x60, 0x83, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x27, 0x00, 0x00, 0x41, 0x80, 0xce, 0x01, 0x00,</div><div class='add'>+	0x58, 0x83, 0xaa, 0x40, 0x81, 0x32, 0x00, 0x00, 0xd9, 0x6e, 0x00, 0xa6,</div><div class='add'>+	0x84, 0xc0, 0x01, 0x00, 0xa1, 0xeb, 0x00, 0x42, 0x84, 0xc8, 0x01, 0x00,</div><div class='add'>+	0x60, 0x83, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x3b, 0x00, 0x00, 0x41,</div><div class='add'>+	0x80, 0xce, 0x01, 0x00, 0x5d, 0x83, 0xaa, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x1b, 0x8f, 0x00, 0xa6, 0x84, 0xc0, 0x01, 0x00, 0xdc, 0xbc, 0x00, 0x42,</div><div class='add'>+	0x84, 0xc8, 0x01, 0x00, 0x60, 0x83, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x62, 0xca, 0x00, 0xa6, 0x84, 0xc0, 0x01, 0x00, 0xd6, 0xc1, 0x00, 0x42,</div><div class='add'>+	0x84, 0xc8, 0x01, 0x00, 0x60, 0x83, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x78, 0xf3, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x00, 0x77,</div><div class='add'>+	0xf1, 0xb2, 0x01, 0x00, 0x1e, 0x00, 0x00, 0x76, 0x89, 0xe4, 0x01, 0x00,</div><div class='add'>+	0x02, 0x00, 0x00, 0x76, 0xef, 0xf6, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0xee, 0x96, 0x01, 0x00, 0x00, 0x00, 0x00, 0x75, 0xed, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x42, 0xea, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x83, 0xc0, 0x01, 0x00, 0x4f, 0x00, 0x00, 0x41, 0x80, 0xce, 0x01, 0x00,</div><div class='add'>+	0x1f, 0x83, 0x2a, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x75,</div><div class='add'>+	0xe1, 0xc2, 0x01, 0x00, 0x00, 0x00, 0x00, 0x76, 0xe3, 0xc2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x77, 0xe5, 0xc2, 0x01, 0x00, 0x00, 0x00, 0x00, 0x78,</div><div class='add'>+	0xe7, 0xc2, 0x01, 0x00, 0x00, 0x00, 0x00, 0x79, 0xe9, 0xc2, 0x01, 0x00,</div><div class='add'>+	0x13, 0x83, 0x81, 0x41, 0x8d, 0x40, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x9d, 0x83, 0xa2, 0x4b, 0xb7, 0x6f, 0x00, 0x00,</div><div class='add'>+	0x9d, 0x83, 0xa2, 0x41, 0x2f, 0x7d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50,</div><div class='add'>+	0xfd, 0x93, 0x01, 0x00, 0x40, 0x16, 0x00, 0x40, 0x45, 0x99, 0x01, 0x00,</div><div class='add'>+	0x35, 0x82, 0x00, 0x40, 0x49, 0x31, 0x01, 0x00, 0x9c, 0x83, 0x22, 0x40,</div><div class='add'>+	0x8f, 0x6c, 0x00, 0x00, 0x08, 0x00, 0x00, 0x48, 0xb2, 0xcb, 0x01, 0x00,</div><div class='add'>+	0xfe, 0x81, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0xdb, 0x82, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x9c, 0x83, 0xa2, 0x40, 0x97, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x5e, 0x16, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00, 0x7c, 0x16, 0x20, 0xf6,</div><div class='add'>+	0xe0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x31, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x80, 0x83, 0x22, 0x4f, 0x8f, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x51,</div><div class='add'>+	0xfd, 0x93, 0x01, 0x00, 0x82, 0x83, 0x22, 0x40, 0x8f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x86, 0x83, 0x00, 0x54, 0xfd, 0x93, 0x00, 0x00, 0x84, 0x83, 0x22, 0x42,</div><div class='add'>+	0x8f, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x52, 0xfd, 0x93, 0x01, 0x00,</div><div class='add'>+	0x86, 0x83, 0x22, 0x41, 0x8f, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x53,</div><div class='add'>+	0xfd, 0x93, 0x01, 0x00, 0x9a, 0x83, 0x22, 0x51, 0xfd, 0x7f, 0x00, 0x00,</div><div class='add'>+	0x34, 0x82, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x0c, 0x00, 0x00, 0x48,</div><div class='add'>+	0xb2, 0xcb, 0x01, 0x00, 0xfc, 0x81, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x95, 0x83, 0xa2, 0x40, 0xb5, 0x6f, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x48,</div><div class='add'>+	0xb2, 0xcb, 0x01, 0x00, 0xfc, 0x81, 0x00, 0x48, 0x96, 0x30, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xda, 0x97, 0xc0, 0x01, 0x00, 0x04, 0x00, 0x00, 0x4b,</div><div class='add'>+	0xb2, 0xcb, 0x01, 0x00, 0xfc, 0x81, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x0e, 0x00, 0x00, 0x48, 0xb2, 0xcb, 0x01, 0x00, 0xff, 0x81, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x0c, 0x00, 0x00, 0x48, 0xb2, 0xcb, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x30, 0xb5, 0xb3, 0x01, 0x00, 0xff, 0x81, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x0e, 0x00, 0x00, 0x48, 0xb2, 0xcb, 0x01, 0x00,</div><div class='add'>+	0xfc, 0x81, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x99, 0x83, 0x22, 0x40,</div><div class='add'>+	0xb5, 0x6f, 0x00, 0x00, 0x9d, 0x83, 0x00, 0x54, 0xfd, 0x93, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x51, 0xfd, 0x83, 0x01, 0x00, 0x1c, 0x00, 0x00, 0xfe,</div><div class='add'>+	0x7f, 0xd9, 0x01, 0x00, 0x9d, 0x83, 0xa6, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x55, 0xfd, 0x93, 0x01, 0x00, 0x00, 0x00, 0x80, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0xb6, 0x03, 0x00, 0x40, 0xa1, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x2f, 0x41, 0x99, 0xb3, 0x01, 0x00, 0xa8, 0x83, 0x22, 0x44,</div><div class='add'>+	0x81, 0x6c, 0x00, 0x00, 0xb0, 0x83, 0x22, 0x48, 0x81, 0x6c, 0x00, 0x00,</div><div class='add'>+	0xaa, 0x83, 0x22, 0x4c, 0x81, 0x6c, 0x00, 0x00, 0xb4, 0x83, 0x22, 0x50,</div><div class='add'>+	0x81, 0x6c, 0x00, 0x00, 0xb5, 0x83, 0x22, 0x54, 0x81, 0x6c, 0x00, 0x00,</div><div class='add'>+	0xb7, 0x83, 0x22, 0x58, 0x81, 0x6c, 0x00, 0x00, 0xbc, 0x83, 0x22, 0x5c,</div><div class='add'>+	0x81, 0x6c, 0x00, 0x00, 0x55, 0x01, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xbc, 0x09, 0xb0, 0x01, 0x00, 0x6a, 0x84, 0x00, 0xca,</div><div class='add'>+	0x01, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x03, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0xf3, 0x83, 0x01, 0x00, 0xae, 0x83, 0xa2, 0x42,</div><div class='add'>+	0x05, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x05, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x6a, 0x84, 0x22, 0xca, 0x07, 0x14, 0x00, 0x00, 0x6a, 0x84, 0x00, 0x45,</div><div class='add'>+	0xf3, 0x93, 0x00, 0x00, 0x6a, 0x84, 0x20, 0x43, 0x95, 0x6f, 0x00, 0x00,</div><div class='add'>+	0x6a, 0x84, 0x80, 0xca, 0x05, 0x30, 0x00, 0x00, 0x6a, 0x84, 0x22, 0x01,</div><div class='add'>+	0x80, 0x30, 0x00, 0x00, 0x6a, 0x84, 0x00, 0xcb, 0xdb, 0x91, 0x00, 0x00,</div><div class='add'>+	0x5c, 0x01, 0x00, 0xbc, 0xab, 0xb3, 0x00, 0x00, 0x00, 0x00, 0x00, 0xbc,</div><div class='add'>+	0xb1, 0xb3, 0x01, 0x00, 0x6a, 0x84, 0x00, 0xca, 0xcf, 0xb3, 0x00, 0x00,</div><div class='add'>+	0xff, 0x00, 0x00, 0xca, 0x81, 0x88, 0x01, 0x00, 0x6a, 0x84, 0xa2, 0x40,</div><div class='add'>+	0x74, 0x7d, 0x00, 0x00, 0x60, 0x00, 0x20, 0x40, 0x60, 0x99, 0x01, 0x00,</div><div class='add'>+	0xb9, 0x83, 0xa8, 0xb1, 0x82, 0x30, 0x00, 0x00, 0xb8, 0x83, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x6a, 0x84, 0x00, 0xca, 0x79, 0xb3, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4e, 0x81, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x43,</div><div class='add'>+	0xcb, 0x83, 0x01, 0x00, 0x00, 0x00, 0x45, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0xbf, 0x83, 0xa2, 0x41, 0x81, 0x50, 0x00, 0x00, 0x00, 0x00, 0x45, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x45, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0xca, 0x83, 0x91, 0x82, 0x82, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8a,</div><div class='add'>+	0x80, 0xb0, 0x01, 0x00, 0xb6, 0x9f, 0x00, 0x40, 0x80, 0xce, 0x01, 0x00,</div><div class='add'>+	0xc8, 0x83, 0xa6, 0x40, 0x81, 0x32, 0x00, 0x00, 0xca, 0x83, 0x56, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0xb6, 0x03, 0x00, 0x40, 0xa1, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x53, 0x07, 0x90, 0x01, 0x00, 0xb6, 0x03, 0x00, 0x40,</div><div class='add'>+	0xa1, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x52, 0x07, 0x90, 0x01, 0x00,</div><div class='add'>+	0xf3, 0x9f, 0x00, 0x41, 0x8b, 0xb3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4e,</div><div class='add'>+	0x81, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x42, 0xcd, 0x83, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x46, 0x40, 0x81, 0xb2, 0x01, 0x00, 0xcf, 0x83, 0xa2, 0x41,</div><div class='add'>+	0x81, 0x50, 0x00, 0x00, 0x00, 0x00, 0x46, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x46, 0x40, 0x81, 0xb2, 0x01, 0x00, 0xda, 0x83, 0x91, 0x81,</div><div class='add'>+	0x82, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x80, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xb6, 0x9f, 0x00, 0x40, 0x80, 0xce, 0x01, 0x00, 0xd8, 0x83, 0xa6, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0xda, 0x83, 0x55, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xb6, 0x03, 0x00, 0x40, 0xa1, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x52,</div><div class='add'>+	0x07, 0x90, 0x01, 0x00, 0xb6, 0x03, 0x00, 0x40, 0xa1, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x53, 0x07, 0x90, 0x01, 0x00, 0xf3, 0x9f, 0x00, 0x41,</div><div class='add'>+	0x8b, 0xb3, 0x00, 0x00, 0xb1, 0x03, 0x00, 0x40, 0xa1, 0x99, 0x01, 0x00,</div><div class='add'>+	0xc4, 0x14, 0x2f, 0x40, 0x99, 0xb3, 0x01, 0x00, 0x5c, 0x01, 0x00, 0x40,</div><div class='add'>+	0x49, 0xb1, 0x00, 0x00, 0x58, 0x15, 0x2d, 0x40, 0x8d, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xd0, 0x14, 0x2d, 0xf0, 0x88, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x8f, 0xb0, 0x01, 0x00, 0x01, 0x00, 0x00, 0xa6, 0x90, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0xf8, 0x00, 0x48, 0x90, 0x98, 0x01, 0x00, 0x00, 0x00, 0x00, 0x45,</div><div class='add'>+	0x93, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xfa, 0x8a, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x6a, 0x03, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x02, 0x00, 0x00, 0xa6,</div><div class='add'>+	0x80, 0xb0, 0x01, 0x00, 0xec, 0x83, 0x22, 0x40, 0x82, 0x6c, 0x00, 0x00,</div><div class='add'>+	0xf0, 0x83, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x47, 0x03, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41, 0x8d, 0xc0, 0x01, 0x00,</div><div class='add'>+	0xf5, 0x83, 0x22, 0x5f, 0x8d, 0x6c, 0x00, 0x00, 0xe7, 0x83, 0xa2, 0x41,</div><div class='add'>+	0x93, 0x50, 0x00, 0x00, 0xe5, 0x83, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xff, 0x07, 0x00, 0x47, 0x84, 0x88, 0x01, 0x00, 0x00, 0x00, 0xa6, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0xf5, 0x9f, 0x00, 0x47, 0x80, 0x30, 0x01, 0x00,</div><div class='add'>+	0x00, 0x02, 0x00, 0x47, 0x8e, 0xc8, 0x01, 0x00, 0xf0, 0x83, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x50, 0xb3, 0x01, 0x00,</div><div class='add'>+	0xfb, 0x83, 0x20, 0x18, 0x89, 0x6c, 0x00, 0x00, 0x04, 0x00, 0x00, 0xa6,</div><div class='add'>+	0x84, 0xb0, 0x01, 0x00, 0x20, 0x00, 0x00, 0xa6, 0x86, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x10, 0x00, 0x40, 0x55, 0x9b, 0x01, 0x00, 0xfe, 0x83, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0xa6, 0x84, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x20, 0x00, 0x00, 0xa6, 0x86, 0xb0, 0x01, 0x00, 0x00, 0x10, 0x00, 0x40,</div><div class='add'>+	0x55, 0x9b, 0x01, 0x00, 0x00, 0x00, 0x00, 0x42, 0x50, 0xd3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xa8, 0x4f, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x43,</div><div class='add'>+	0x4e, 0xd3, 0x01, 0x00, 0x5e, 0x03, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x6c, 0x03, 0x00, 0x42, 0x80, 0x30, 0x01, 0x00, 0xf0, 0x83, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x07, 0x84, 0x22, 0xa7, 0x8f, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x49, 0x03, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x04, 0x84, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0xa0, 0x94, 0x2e, 0x43, 0x97, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0x09, 0x84, 0xa2, 0x41, 0x97, 0x50, 0x00, 0x00,</div><div class='add'>+	0x50, 0x95, 0x20, 0x40, 0xe1, 0xb1, 0x01, 0x00, 0xac, 0x94, 0x2e, 0x43,</div><div class='add'>+	0x97, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x0d, 0x84, 0xa2, 0x41, 0x97, 0x50, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0xae, 0x03, 0x00, 0x40, 0xa3, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x81, 0xb0, 0x01, 0x00, 0x60, 0x15, 0x00, 0x40,</div><div class='add'>+	0x85, 0x98, 0x01, 0x00, 0x08, 0x00, 0x00, 0x40, 0x40, 0xe4, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x59, 0x41, 0x94, 0x01, 0x00, 0x00, 0x00, 0x00, 0x50,</div><div class='add'>+	0x41, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x42, 0x40, 0x94, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x81, 0xc0, 0x01, 0x00, 0x00, 0x00, 0xa3, 0x41,</div><div class='add'>+	0x81, 0x6c, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41, 0xa3, 0xc1, 0x01, 0x00,</div><div class='add'>+	0x13, 0x84, 0x00, 0x50, 0x85, 0xc0, 0x00, 0x00, 0x49, 0x84, 0xa2, 0x41,</div><div class='add'>+	0x01, 0x7d, 0x00, 0x00, 0x21, 0x84, 0x22, 0x58, 0x73, 0x7d, 0x00, 0x00,</div><div class='add'>+	0x78, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00, 0x1c, 0x84, 0xa8, 0xb1,</div><div class='add'>+	0x9c, 0x30, 0x00, 0x00, 0x30, 0x00, 0x38, 0x45, 0x9d, 0xe0, 0x01, 0x00,</div><div class='add'>+	0x01, 0x00, 0x00, 0x0e, 0x10, 0xc9, 0x00, 0x00, 0x21, 0x84, 0x33, 0xc4,</div><div class='add'>+	0x81, 0x30, 0x00, 0x00, 0x24, 0x84, 0xa1, 0xad, 0x9d, 0x20, 0x00, 0x00,</div><div class='add'>+	0x1b, 0x84, 0x13, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x13, 0x4e,</div><div class='add'>+	0x5a, 0x83, 0x01, 0x00, 0x30, 0x00, 0x38, 0x45, 0x9d, 0xe0, 0x01, 0x00,</div><div class='add'>+	0x2c, 0x84, 0x22, 0xab, 0x80, 0x04, 0x00, 0x00, 0x2a, 0x84, 0xa2, 0x40,</div><div class='add'>+	0x01, 0x7d, 0x00, 0x00, 0x2c, 0x84, 0x22, 0x5f, 0x57, 0x7d, 0x00, 0x00,</div><div class='add'>+	0x21, 0x8a, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x2c, 0x84, 0x22, 0x5e,</div><div class='add'>+	0x57, 0x7d, 0x00, 0x00, 0x84, 0x8a, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x31, 0x84, 0x22, 0x54, 0x73, 0x7d, 0x00, 0x00, 0x74, 0x00, 0x00, 0x40,</div><div class='add'>+	0x61, 0x99, 0x01, 0x00, 0x2c, 0x84, 0xa8, 0xb1, 0x00, 0x30, 0x00, 0x00,</div><div class='add'>+	0xfa, 0x85, 0xa2, 0x5f, 0x01, 0x7c, 0x00, 0x00, 0x5c, 0x89, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x33, 0x84, 0xa2, 0x5f, 0x59, 0x27, 0x00, 0x00,</div><div class='add'>+	0x35, 0x84, 0xa2, 0x5c, 0x73, 0x7d, 0x00, 0x00, 0x3c, 0x84, 0xa2, 0x5e,</div><div class='add'>+	0x73, 0x7d, 0x00, 0x00, 0x46, 0x84, 0x22, 0x5c, 0x73, 0x7d, 0x00, 0x00,</div><div class='add'>+	0x47, 0x84, 0x37, 0x40, 0x81, 0x32, 0x00, 0x00, 0x7c, 0x00, 0x00, 0x40,</div><div class='add'>+	0x61, 0x99, 0x01, 0x00, 0x36, 0x84, 0xa8, 0xb1, 0x36, 0x30, 0x00, 0x00,</div><div class='add'>+	0x7c, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00, 0x38, 0x84, 0xa8, 0xb1,</div><div class='add'>+	0x00, 0x30, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00, 0x02, 0x88, 0x01, 0x00,</div><div class='add'>+	0x29, 0x86, 0x17, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x47, 0x84, 0x34, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00,</div><div class='add'>+	0x3d, 0x84, 0xa8, 0xb1, 0x12, 0x30, 0x00, 0x00, 0x44, 0x84, 0x52, 0x21,</div><div class='add'>+	0x13, 0x04, 0x00, 0x00, 0x00, 0x00, 0x14, 0x41, 0x2f, 0xc3, 0x01, 0x00,</div><div class='add'>+	0xff, 0x3f, 0x00, 0x09, 0x00, 0x8c, 0x01, 0x00, 0x00, 0x00, 0x00, 0x43,</div><div class='add'>+	0x01, 0xf0, 0x01, 0x00, 0x87, 0x84, 0x00, 0x34, 0x13, 0x84, 0x00, 0x00,</div><div class='add'>+	0xff, 0x3f, 0x14, 0x09, 0x00, 0x8c, 0x01, 0x00, 0xe5, 0x84, 0x00, 0x43,</div><div class='add'>+	0x01, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x47, 0x84, 0x33, 0x40, 0x81, 0x32, 0x00, 0x00, 0x1b, 0x84, 0x13, 0x4e,</div><div class='add'>+	0x5a, 0x93, 0x00, 0x00, 0xe6, 0x89, 0xa2, 0x48, 0xfd, 0x7f, 0x00, 0x00,</div><div class='add'>+	0x4e, 0x84, 0x22, 0x59, 0x73, 0x7d, 0x00, 0x00, 0x79, 0x00, 0x00, 0x40,</div><div class='add'>+	0x61, 0x99, 0x01, 0x00, 0x4a, 0x84, 0x28, 0xb1, 0x7e, 0x31, 0x00, 0x00,</div><div class='add'>+	0x4b, 0x84, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x52, 0x84, 0x21, 0xac,</div><div class='add'>+	0x9c, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x1f, 0xc3, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa0, 0x5f, 0x9d, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4e,</div><div class='add'>+	0x58, 0x91, 0x01, 0x00, 0x56, 0x84, 0x22, 0x5a, 0x73, 0x7d, 0x00, 0x00,</div><div class='add'>+	0x7a, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00, 0x53, 0x84, 0xa8, 0xb1,</div><div class='add'>+	0x7e, 0x31, 0x00, 0x00, 0x01, 0x00, 0x00, 0xcf, 0x11, 0xc9, 0x00, 0x00,</div><div class='add'>+	0x5c, 0x84, 0xa2, 0x40, 0x93, 0x7f, 0x00, 0x00, 0x5c, 0x84, 0x22, 0x44,</div><div class='add'>+	0x93, 0x7f, 0x00, 0x00, 0x58, 0x84, 0x42, 0xa5, 0x80, 0x30, 0x00, 0x00,</div><div class='add'>+	0x5b, 0x84, 0xa2, 0x40, 0x93, 0x7f, 0x00, 0x00, 0x71, 0x84, 0x1a, 0x40,</div><div class='add'>+	0x93, 0x93, 0x00, 0x00, 0x00, 0x00, 0x1a, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x9a, 0x80, 0xa2, 0x40, 0x73, 0x7d, 0x00, 0x00, 0x9b, 0x89, 0x22, 0x44,</div><div class='add'>+	0x21, 0x6f, 0x00, 0x00, 0x92, 0x89, 0x22, 0x40, 0x65, 0x7d, 0x00, 0x00,</div><div class='add'>+	0xa0, 0x89, 0xa2, 0x5b, 0x73, 0x7d, 0x00, 0x00, 0x04, 0x00, 0xa2, 0x49,</div><div class='add'>+	0x33, 0x7d, 0x00, 0x00, 0x66, 0x84, 0x22, 0x48, 0x33, 0x7d, 0x00, 0x00,</div><div class='add'>+	0xff, 0x01, 0x00, 0x99, 0x80, 0xd8, 0x01, 0x00, 0x00, 0x00, 0x00, 0x50,</div><div class='add'>+	0x81, 0xe0, 0x01, 0x00, 0xa8, 0x98, 0x2f, 0x40, 0x33, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0xe0, 0xc1, 0x01, 0x00, 0x69, 0x84, 0x22, 0x40,</div><div class='add'>+	0xaf, 0x6f, 0x00, 0x00, 0x69, 0x84, 0x22, 0x40, 0x81, 0x6f, 0x00, 0x00,</div><div class='add'>+	0xef, 0x89, 0x1f, 0xa5, 0x82, 0x6f, 0x00, 0x00, 0x49, 0x84, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x1b, 0x84, 0x00, 0x40, 0x8b, 0xb3, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x58, 0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4e,</div><div class='add'>+	0x62, 0xb1, 0x01, 0x00, 0x1b, 0x84, 0x28, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x6c, 0x84, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x6f, 0x84, 0x33, 0x40,</div><div class='add'>+	0x1f, 0x30, 0x00, 0x00, 0x1b, 0x84, 0x13, 0x4e, 0x5a, 0x93, 0x00, 0x00,</div><div class='add'>+	0x73, 0x84, 0xa0, 0xce, 0x81, 0x50, 0x00, 0x00, 0x85, 0x84, 0xa0, 0xcd,</div><div class='add'>+	0x81, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x9c, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xb1, 0x81, 0xb0, 0x01, 0x00, 0x85, 0x84, 0x22, 0xb5,</div><div class='add'>+	0x81, 0x14, 0x00, 0x00, 0x80, 0x15, 0x2f, 0x40, 0x49, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x77, 0x84, 0x42, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x60, 0xb4,</div><div class='add'>+	0x65, 0x97, 0x01, 0x00, 0xd0, 0x15, 0x2e, 0x40, 0x69, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x1a, 0x44, 0x93, 0x83, 0x01, 0x00, 0x1a, 0x00, 0x00, 0xa2,</div><div class='add'>+	0x80, 0xdc, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xb1, 0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xb5,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0x05, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x62, 0xb1, 0x01, 0x00, 0x80, 0x84, 0xa8, 0xa1,</div><div class='add'>+	0xe0, 0x31, 0x00, 0x00, 0x5c, 0x84, 0x00, 0x88, 0x9e, 0xb3, 0x00, 0x00,</div><div class='add'>+	0x5c, 0x84, 0xa2, 0x41, 0x67, 0x6f, 0x00, 0x00, 0x5c, 0x84, 0x00, 0x6f,</div><div class='add'>+	0xdb, 0x91, 0x00, 0x00, 0x85, 0x84, 0x42, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x5c, 0x84, 0x1a, 0x40, 0x93, 0x83, 0x00, 0x00, 0x00, 0x99, 0x00, 0x09,</div><div class='add'>+	0x46, 0xc9, 0x01, 0x00, 0x3f, 0x00, 0x00, 0xf3, 0x0c, 0x88, 0x01, 0x00,</div><div class='add'>+	0x90, 0x84, 0xa6, 0x42, 0x13, 0x60, 0x00, 0x00, 0x3f, 0x97, 0x00, 0x95,</div><div class='add'>+	0x03, 0x30, 0x01, 0x00, 0x8b, 0x84, 0x45, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x75, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00, 0x8c, 0x84, 0xa8, 0xb1,</div><div class='add'>+	0x0c, 0x30, 0x00, 0x00, 0x46, 0x97, 0x1d, 0x10, 0x94, 0x30, 0x01, 0x00,</div><div class='add'>+	0x91, 0x84, 0x00, 0x58, 0x1f, 0x90, 0x00, 0x00, 0x38, 0x97, 0x00, 0x95,</div><div class='add'>+	0x03, 0x30, 0x01, 0x00, 0x1b, 0x84, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x2d, 0x03, 0x48, 0xb1, 0x01, 0x00, 0x04, 0x00, 0x2d, 0xf0,</div><div class='add'>+	0x2e, 0xb0, 0x01, 0x00, 0xee, 0x07, 0x00, 0x40, 0x97, 0x98, 0x01, 0x00,</div><div class='add'>+	0x98, 0x84, 0x23, 0x4b, 0xe4, 0x6d, 0x00, 0x00, 0x98, 0x84, 0x22, 0x4b,</div><div class='add'>+	0xfd, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x1f, 0x90, 0x01, 0x00,</div><div class='add'>+	0x22, 0x00, 0x2f, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x9b, 0x84, 0x83, 0x17,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x26, 0x00, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00,</div><div class='add'>+	0x9d, 0x84, 0x85, 0x17, 0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x48,</div><div class='add'>+	0x47, 0xc1, 0x01, 0x00, 0xa2, 0x84, 0x22, 0x55, 0x2f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x42, 0x43, 0xd1, 0x01, 0x00, 0x0f, 0x00, 0x00, 0xfa,</div><div class='add'>+	0x96, 0x88, 0x01, 0x00, 0x00, 0x00, 0x00, 0x42, 0x97, 0xe0, 0x01, 0x00,</div><div class='add'>+	0xa3, 0x84, 0x00, 0x4b, 0x44, 0xc1, 0x00, 0x00, 0x12, 0x00, 0x00, 0xa2,</div><div class='add'>+	0x44, 0xc9, 0x01, 0x00, 0x28, 0x00, 0x00, 0xf6, 0x02, 0xcc, 0x01, 0x00,</div><div class='add'>+	0x0a, 0x00, 0x00, 0xa1, 0x42, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8,</div><div class='add'>+	0x16, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x28, 0xf0, 0x10, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf0, 0x1a, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xa2,</div><div class='add'>+	0x2a, 0xb0, 0x01, 0x00, 0xc0, 0x28, 0x3c, 0x46, 0x0d, 0xe0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x2d, 0x44, 0x95, 0xb0, 0x01, 0x00, 0xaf, 0x84, 0xa2, 0xf8,</div><div class='add'>+	0x0e, 0x30, 0x00, 0x00, 0xbf, 0x84, 0x22, 0x41, 0x95, 0x50, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x2d, 0x50, 0x49, 0xc1, 0x01, 0x00, 0xab, 0x84, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0xac, 0x84, 0xa2, 0xf8, 0x16, 0x6c, 0x00, 0x00,</div><div class='add'>+	0xac, 0x84, 0xa2, 0xf8, 0x10, 0x6c, 0x00, 0x00, 0xac, 0x84, 0xa2, 0xf0,</div><div class='add'>+	0x1a, 0x6c, 0x00, 0x00, 0xbd, 0x84, 0x22, 0x58, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x99, 0x3f, 0x42, 0x13, 0xf0, 0x01, 0x00, 0xb4, 0x84, 0x47, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0xb8, 0x84, 0xa2, 0xf3, 0x74, 0x06, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x06, 0xe6, 0x95, 0x01, 0x00, 0xbd, 0x84, 0x1f, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x96, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x3f, 0x00, 0x1f, 0xf3, 0x0c, 0x88, 0x01, 0x00, 0x00, 0x00, 0x00, 0x55,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4b, 0x62, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xbb, 0x84, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0xbd, 0x84, 0x47, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0xc5, 0x84, 0x1f, 0x41, 0x2d, 0xc3, 0x00, 0x00,</div><div class='add'>+	0xc3, 0x84, 0x22, 0x58, 0x1f, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x06, 0x62, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xc1, 0x84, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0xc3, 0x84, 0x47, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0xec, 0x84, 0x1f, 0x41, 0x2d, 0xc3, 0x00, 0x00,</div><div class='add'>+	0x03, 0x00, 0x00, 0x07, 0x1a, 0xf4, 0x01, 0x00, 0x0b, 0x96, 0x00, 0x07,</div><div class='add'>+	0x16, 0x30, 0x01, 0x00, 0xd3, 0x84, 0x22, 0x41, 0x81, 0x6c, 0x00, 0x00,</div><div class='add'>+	0xcb, 0x84, 0x22, 0x42, 0x81, 0x6c, 0x00, 0x00, 0x1b, 0x84, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0xd2, 0x84, 0x22, 0x5f, 0x0f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0xff, 0x96, 0x00, 0x5f, 0x01, 0x10, 0x01, 0x00, 0xd1, 0x84, 0x22, 0x40,</div><div class='add'>+	0x95, 0x6c, 0x00, 0x00, 0x04, 0x80, 0x00, 0x03, 0x42, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf2, 0x02, 0xb0, 0x01, 0x00, 0x74, 0x96, 0x00, 0x52,</div><div class='add'>+	0x95, 0x30, 0x01, 0x00, 0x7b, 0x96, 0x00, 0x4b, 0x02, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xff, 0x89, 0x00, 0x40, 0x0f, 0xb0, 0x00, 0x00, 0xdb, 0x84, 0xa2, 0x5a,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x86, 0x95, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0xdb, 0x84, 0x22, 0x20, 0x85, 0x6c, 0x00, 0x00, 0xd8, 0x84, 0x9c, 0x0f,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x1b, 0x84, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x66, 0x96, 0x00, 0x5c, 0x1f, 0x00, 0x01, 0x00, 0x85, 0x98, 0x00, 0x42,</div><div class='add'>+	0x61, 0x31, 0x01, 0x00, 0x1b, 0x84, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xce, 0x99, 0x00, 0x07, 0x96, 0x30, 0x01, 0x00, 0x00, 0x00, 0x2d, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0xde, 0x84, 0x82, 0xf0, 0x18, 0x30, 0x00, 0x00,</div><div class='add'>+	0x66, 0x8b, 0x00, 0x45, 0x8f, 0xb0, 0x00, 0x00, 0x28, 0x20, 0x00, 0xa6,</div><div class='add'>+	0x96, 0xb0, 0x01, 0x00, 0xe2, 0x84, 0x22, 0x17, 0x96, 0x04, 0x00, 0x00,</div><div class='add'>+	0xf5, 0x97, 0x00, 0x4b, 0x95, 0x30, 0x01, 0x00, 0x66, 0x8b, 0x00, 0x4b,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x0b, 0x97, 0x00, 0x03, 0x48, 0x31, 0x01, 0x00,</div><div class='add'>+	0xe7, 0x94, 0x00, 0x40, 0x81, 0x30, 0x01, 0x00, 0x66, 0x8b, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x2e, 0x10, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x68, 0x50, 0x03, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x03,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x42, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x10, 0x62, 0xb1, 0x01, 0x00, 0xe9, 0x84, 0xa8, 0x00,</div><div class='add'>+	0xe0, 0x31, 0x00, 0x00, 0x1b, 0x84, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x2d, 0x03, 0x48, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x0f, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x2e, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf2, 0x02, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x17, 0xb0, 0x01, 0x00, 0x00, 0x41, 0x00, 0xa6, 0x96, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xee, 0x07, 0x2e, 0x47, 0x97, 0x90, 0x01, 0x00, 0xff, 0x84, 0x22, 0x17,</div><div class='add'>+	0x96, 0x04, 0x00, 0x00, 0xfd, 0x84, 0x22, 0x4b, 0xfd, 0x7f, 0x00, 0x00,</div><div class='add'>+	0xfd, 0x84, 0x23, 0xa2, 0x02, 0x6c, 0x00, 0x00, 0x74, 0x96, 0x00, 0x52,</div><div class='add'>+	0x95, 0x30, 0x01, 0x00, 0x04, 0x00, 0x22, 0x41, 0x97, 0x50, 0x00, 0x00,</div><div class='add'>+	0x0c, 0x00, 0x2d, 0x00, 0x12, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0,</div><div class='add'>+	0x00, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5c, 0x01, 0x80, 0x01, 0x00,</div><div class='add'>+	0x7b, 0x96, 0x00, 0x4b, 0x02, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09,</div><div class='add'>+	0x00, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x50, 0x03, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x1c, 0x85, 0x00, 0x5c, 0x17, 0x90, 0x00, 0x00, 0x11, 0x85, 0x22, 0x43,</div><div class='add'>+	0x2f, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x45, 0x1f, 0x90, 0x01, 0x00,</div><div class='add'>+	0x0a, 0x85, 0x22, 0x5f, 0x2f, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x2e, 0x10,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x58, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x10, 0x00, 0x00, 0x03, 0xf0, 0xc9, 0x01, 0x00, 0x10, 0x00, 0x00, 0x00,</div><div class='add'>+	0xe0, 0xc9, 0x01, 0x00, 0x06, 0x85, 0x45, 0x42, 0x61, 0x31, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x10, 0x62, 0xb1, 0x01, 0x00, 0x07, 0x85, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x1b, 0x84, 0x1d, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x20, 0x00, 0x2d, 0x03, 0x48, 0xb1, 0x01, 0x00, 0xff, 0x0f, 0x00, 0xf6,</div><div class='add'>+	0x80, 0x88, 0x01, 0x00, 0x0e, 0x85, 0xa2, 0xa6, 0x81, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x11, 0x85, 0x00, 0xf2, 0x3a, 0xb0, 0x00, 0x00, 0xf7, 0x85, 0xa2, 0x4b,</div><div class='add'>+	0xfd, 0x7f, 0x00, 0x00, 0xcc, 0x95, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x15, 0x8a, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x1c, 0x85, 0x22, 0x4a,</div><div class='add'>+	0x2f, 0x7c, 0x00, 0x00, 0x1c, 0x85, 0x22, 0x48, 0x2f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x0a, 0x00, 0x2d, 0x03, 0x48, 0xb1, 0x01, 0x00, 0x3f, 0x00, 0x00, 0xf2,</div><div class='add'>+	0x86, 0x88, 0x01, 0x00, 0x1f, 0x00, 0x00, 0x43, 0x84, 0x88, 0x01, 0x00,</div><div class='add'>+	0x05, 0x00, 0x00, 0x43, 0x80, 0xf4, 0x01, 0x00, 0x98, 0x94, 0x3d, 0x42,</div><div class='add'>+	0x81, 0xe0, 0x01, 0x00, 0x1c, 0x85, 0xa2, 0x42, 0xe0, 0x7d, 0x00, 0x00,</div><div class='add'>+	0xf7, 0x85, 0xa2, 0x4b, 0xfd, 0x7f, 0x00, 0x00, 0xcc, 0x95, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x15, 0x8a, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x1c, 0x85, 0x47, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa3,</div><div class='add'>+	0x09, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x1f, 0x41, 0x47, 0xc3, 0x01, 0x00,</div><div class='add'>+	0x22, 0x85, 0x22, 0xa1, 0x09, 0x6c, 0x00, 0x00, 0x6b, 0x84, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x1f, 0x85, 0x00, 0x03, 0x48, 0xb1, 0x00, 0x00,</div><div class='add'>+	0x5b, 0x85, 0xa3, 0x92, 0x03, 0x6c, 0x00, 0x00, 0xf4, 0x98, 0x00, 0x40,</div><div class='add'>+	0x95, 0x30, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41, 0x43, 0xc3, 0x01, 0x00,</div><div class='add'>+	0x15, 0x8a, 0x22, 0x08, 0x80, 0x32, 0x00, 0x00, 0x28, 0x85, 0x22, 0x5c,</div><div class='add'>+	0x17, 0x7c, 0x00, 0x00, 0x29, 0x85, 0x00, 0x00, 0x2a, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x12, 0x00, 0x00, 0x00, 0x2a, 0xc8, 0x01, 0x00, 0x02, 0x00, 0x00, 0x08,</div><div class='add'>+	0x80, 0xc8, 0x01, 0x00, 0x2d, 0x85, 0xa2, 0x43, 0x2f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0xf8, 0x97, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x49, 0x85, 0x00, 0x5e,</div><div class='add'>+	0x17, 0x90, 0x00, 0x00, 0x04, 0x00, 0x00, 0x01, 0x8c, 0xcc, 0x01, 0x00,</div><div class='add'>+	0xf8, 0x97, 0x00, 0x4c, 0x03, 0x30, 0x01, 0x00, 0x00, 0x00, 0x2e, 0x46,</div><div class='add'>+	0x02, 0xb0, 0x01, 0x00, 0x10, 0x80, 0x00, 0x10, 0x48, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x0c, 0x00, 0x00, 0x01, 0xf0, 0xcd, 0x01, 0x00, 0x2c, 0x00, 0x00, 0x40,</div><div class='add'>+	0xf0, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x16, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x10, 0x00, 0x00, 0x15, 0xe0, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x43,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0xa0, 0x00, 0x00, 0xa4, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0x36, 0x85, 0xa8, 0x54, 0x17, 0x10, 0x00, 0x00, 0x49, 0x85, 0x00, 0x5e,</div><div class='add'>+	0x17, 0x90, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x2a, 0xc8, 0x01, 0x00,</div><div class='add'>+	0x48, 0x85, 0x22, 0x43, 0x2f, 0x7c, 0x00, 0x00, 0x04, 0x00, 0x00, 0x01,</div><div class='add'>+	0x8c, 0xcc, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4c, 0x03, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x19, 0x98, 0x00, 0x43, 0x61, 0x31, 0x01, 0x00, 0x00, 0x00, 0x2e, 0x46,</div><div class='add'>+	0x02, 0xb0, 0x01, 0x00, 0x10, 0x80, 0x00, 0x10, 0x48, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x0c, 0x00, 0x00, 0x01, 0xf0, 0xcd, 0x01, 0x00, 0x0c, 0x00, 0x00, 0x09,</div><div class='add'>+	0xf0, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x18, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x10, 0x00, 0x00, 0x15, 0xe0, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x43,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0xa0, 0x00, 0x00, 0xa4, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0x49, 0x85, 0x28, 0x54, 0x17, 0x10, 0x00, 0x00, 0x45, 0x85, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x19, 0x98, 0x00, 0x43, 0x61, 0x31, 0x01, 0x00,</div><div class='add'>+	0x4b, 0x85, 0x22, 0x50, 0x2f, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x56,</div><div class='add'>+	0x17, 0x90, 0x01, 0x00, 0x07, 0x00, 0x00, 0x17, 0x98, 0x88, 0x01, 0x00,</div><div class='add'>+	0x4e, 0x85, 0xa2, 0x41, 0x99, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55,</div><div class='add'>+	0x17, 0x90, 0x01, 0x00, 0x00, 0x00, 0x00, 0x43, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00, 0x4f, 0x85, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x1b, 0x84, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x98, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x56, 0x85, 0x22, 0x43,</div><div class='add'>+	0x2f, 0x7c, 0x00, 0x00, 0x16, 0x80, 0x00, 0x03, 0x44, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x1d, 0xe4, 0xb1, 0x01, 0x00, 0xa1, 0x97, 0x00, 0x5e,</div><div class='add'>+	0x05, 0x10, 0x01, 0x00, 0x59, 0x85, 0xa2, 0x5f, 0x2f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0xb9, 0x94, 0x00, 0x01, 0x38, 0x43, 0x01, 0x00, 0xcc, 0x95, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x15, 0x8a, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x5d, 0x85, 0xa2, 0x4b, 0xfd, 0x7f, 0x00, 0x00, 0xf4, 0x85, 0x00, 0x41,</div><div class='add'>+	0x43, 0xc3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x27, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x11, 0xb0, 0x01, 0x00, 0x5f, 0x85, 0x35, 0x01,</div><div class='add'>+	0x86, 0x30, 0x00, 0x00, 0x6d, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00,</div><div class='add'>+	0x66, 0x85, 0x28, 0xb1, 0x30, 0x30, 0x00, 0x00, 0x60, 0x85, 0x22, 0x4d,</div><div class='add'>+	0x75, 0x7d, 0x00, 0x00, 0xe4, 0x85, 0xa2, 0x40, 0x11, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x43, 0xc3, 0x01, 0x00, 0xf3, 0x85, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x6d, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00,</div><div class='add'>+	0x66, 0x85, 0xa8, 0xb1, 0x12, 0x30, 0x00, 0x00, 0x6f, 0x85, 0xa2, 0x40,</div><div class='add'>+	0x11, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x43, 0xc3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x09, 0x10, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x18,</div><div class='add'>+	0x2c, 0xb0, 0x01, 0x00, 0xde, 0x07, 0x00, 0x43, 0x80, 0xce, 0x01, 0x00,</div><div class='add'>+	0x60, 0x85, 0xaa, 0x40, 0x81, 0x32, 0x00, 0x00, 0x74, 0x85, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x40, 0x00, 0x3e, 0x43, 0x27, 0xe0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x09, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x18,</div><div class='add'>+	0xe0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41, 0x27, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x60, 0x85, 0xa3, 0x0b, 0x87, 0x50, 0x00, 0x00, 0x00, 0x00, 0x15, 0x40,</div><div class='add'>+	0x1b, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x23, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x12, 0x00, 0x00, 0x00, 0x2a, 0xc8, 0x01, 0x00, 0x40, 0x00, 0x2d, 0x40,</div><div class='add'>+	0x39, 0xb0, 0x01, 0x00, 0x7c, 0x85, 0xa2, 0x40, 0x27, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x22, 0x00, 0x00, 0x08, 0x12, 0xc8, 0x01, 0x00, 0xde, 0x07, 0x00, 0x40,</div><div class='add'>+	0x25, 0x98, 0x01, 0x00, 0x7f, 0x85, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf8, 0x12, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0,</div><div class='add'>+	0x30, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x0b, 0x25, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x10, 0x32, 0xb0, 0x01, 0x00, 0x14, 0x00, 0x20, 0x01,</div><div class='add'>+	0xe0, 0xb1, 0x01, 0x00, 0xee, 0x07, 0x00, 0x40, 0x37, 0x98, 0x01, 0x00,</div><div class='add'>+	0x84, 0x85, 0x23, 0x01, 0x36, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,</div><div class='add'>+	0x36, 0xb0, 0x01, 0x00, 0x8f, 0x85, 0x82, 0x41, 0x23, 0x40, 0x00, 0x00,</div><div class='add'>+	0x20, 0x80, 0x00, 0x10, 0x42, 0xc9, 0x01, 0x00, 0x8b, 0x85, 0x22, 0x40,</div><div class='add'>+	0xe3, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00, 0x88, 0x85, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x1b, 0x84, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xeb, 0x95, 0x00, 0x43, 0x23, 0x30, 0x01, 0x00, 0x00, 0x00, 0x00, 0x10,</div><div class='add'>+	0x32, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41, 0x23, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x03, 0x48, 0xb1, 0x01, 0x00, 0x00, 0x80, 0x00, 0x19,</div><div class='add'>+	0x44, 0xc9, 0x01, 0x00, 0x9e, 0x85, 0x22, 0x45, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4c, 0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x09,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x18, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x43, 0x61, 0xb1, 0x01, 0x00, 0x20, 0x00, 0x00, 0x19,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x95, 0x85, 0xa8, 0x15, 0xe0, 0x31, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x50, 0x03, 0xd0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x50,</div><div class='add'>+	0x33, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4c, 0x25, 0xd0, 0x01, 0x00,</div><div class='add'>+	0x0c, 0x00, 0x2d, 0x4c, 0x13, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x50,</div><div class='add'>+	0x37, 0xd0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x50, 0x2b, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x84, 0x85, 0x00, 0x45, 0x1f, 0x80, 0x00, 0x00, 0xa0, 0x85, 0xa3, 0x12,</div><div class='add'>+	0x36, 0x6c, 0x00, 0x00, 0xa1, 0x85, 0x68, 0x1b, 0x28, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x68, 0x12, 0x28, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x09,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x18, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x43, 0x61, 0xb1, 0x01, 0x00, 0x20, 0x00, 0x00, 0x19,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0xa4, 0x85, 0xa8, 0x15, 0xe0, 0x31, 0x00, 0x00,</div><div class='add'>+	0xca, 0x85, 0x22, 0x14, 0x02, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50,</div><div class='add'>+	0x33, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x14, 0x24, 0xd0, 0x01, 0x00,</div><div class='add'>+	0x0c, 0x00, 0x2d, 0x14, 0x12, 0xc0, 0x01, 0x00, 0xc3, 0x85, 0xa2, 0x14,</div><div class='add'>+	0x36, 0x50, 0x00, 0x00, 0xb4, 0x85, 0x22, 0x5c, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x30, 0x80, 0x00, 0x10, 0x42, 0xc9, 0x01, 0x00, 0xb2, 0x85, 0x22, 0x40,</div><div class='add'>+	0xe3, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00, 0xaf, 0x85, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x1b, 0x84, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x03, 0x48, 0xb1, 0x01, 0x00, 0x0c, 0x00, 0x2d, 0x5c,</div><div class='add'>+	0x1f, 0x80, 0x01, 0x00, 0x10, 0x00, 0x00, 0xf0, 0x2a, 0xc8, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x5c, 0x2b, 0x80, 0x01, 0x00, 0xf0, 0x07, 0x00, 0x40,</div><div class='add'>+	0x37, 0x98, 0x01, 0x00, 0xb9, 0x85, 0x23, 0x01, 0x36, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x01, 0x36, 0xb0, 0x01, 0x00, 0xc4, 0x85, 0x22, 0x1b,</div><div class='add'>+	0x02, 0x6c, 0x00, 0x00, 0x30, 0x00, 0x00, 0x10, 0x48, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x2e, 0x5c, 0x1f, 0x90, 0x01, 0x00, 0x00, 0x00, 0x00, 0x50,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x03, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xff, 0x07, 0x00, 0x15, 0xe0, 0x8d, 0x01, 0x00, 0x00, 0x00, 0x00, 0x42,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0xa0, 0x00, 0x00, 0xa4, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0xc0, 0x85, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0xc4, 0x85, 0x00, 0x03,</div><div class='add'>+	0x48, 0xb1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x2a, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x84, 0x85, 0xa2, 0x40, 0x25, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x39, 0xc0, 0x01, 0x00, 0x40, 0x00, 0x3d, 0x43, 0x39, 0xe0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x0b, 0x25, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8,</div><div class='add'>+	0x12, 0xb0, 0x01, 0x00, 0x84, 0x85, 0x00, 0xf0, 0x30, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x80, 0x00, 0x19, 0x42, 0xc9, 0x01, 0x00, 0xd0, 0x85, 0x22, 0x40,</div><div class='add'>+	0xe3, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x19, 0x62, 0xdd, 0x01, 0x00, 0xcd, 0x85, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x1b, 0x84, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xeb, 0x95, 0x00, 0x40, 0x2b, 0x30, 0x01, 0x00, 0x18, 0x00, 0x2e, 0x03,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0xd4, 0x85, 0x22, 0x50, 0x2f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x56, 0x17, 0x90, 0x01, 0x00, 0x07, 0x00, 0x00, 0x17,</div><div class='add'>+	0x98, 0x88, 0x01, 0x00, 0xd7, 0x85, 0xa2, 0x41, 0x99, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x55, 0x17, 0x90, 0x01, 0x00, 0xda, 0x85, 0x22, 0x43,</div><div class='add'>+	0x2f, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x54, 0x17, 0x90, 0x01, 0x00,</div><div class='add'>+	0x16, 0x00, 0x20, 0x1d, 0xe4, 0xb1, 0x01, 0x00, 0xdc, 0x85, 0xa3, 0x40,</div><div class='add'>+	0x27, 0x6c, 0x00, 0x00, 0xde, 0x85, 0x60, 0x5f, 0x17, 0x90, 0x00, 0x00,</div><div class='add'>+	0x00, 0x84, 0x00, 0x0b, 0x16, 0xdc, 0x01, 0x00, 0x00, 0x00, 0x60, 0x13,</div><div class='add'>+	0x16, 0x94, 0x01, 0x00, 0xa1, 0x97, 0x00, 0x5e, 0x05, 0x10, 0x01, 0x00,</div><div class='add'>+	0x15, 0x8a, 0xa2, 0x5f, 0x2f, 0x7c, 0x00, 0x00, 0x14, 0x80, 0x00, 0x03,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf2, 0x02, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xb9, 0x94, 0x00, 0x01, 0x38, 0x43, 0x01, 0x00, 0x15, 0x8a, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x83, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4d, 0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x16,</div><div class='add'>+	0x62, 0xb1, 0x01, 0x00, 0xe6, 0x85, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x08, 0x62, 0xb1, 0x01, 0x00, 0xe8, 0x85, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0xf3, 0x85, 0x22, 0x13, 0x82, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x40, 0x00, 0x3d, 0x43, 0x83, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8,</div><div class='add'>+	0x10, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x2c, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x16, 0x62, 0xb1, 0x01, 0x00, 0xee, 0x85, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x62, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xf0, 0x85, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0xea, 0x85, 0x00, 0x41,</div><div class='add'>+	0x83, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x15, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x82, 0x00, 0xa6, 0x04, 0xb0, 0x01, 0x00, 0xa0, 0x98, 0x00, 0x40,</div><div class='add'>+	0x47, 0x99, 0x01, 0x00, 0xe3, 0x89, 0x00, 0x41, 0x89, 0x30, 0x01, 0x00,</div><div class='add'>+	0x74, 0x96, 0x00, 0x52, 0x95, 0x30, 0x01, 0x00, 0x7b, 0x96, 0x00, 0x4b,</div><div class='add'>+	0x02, 0xb0, 0x00, 0x00, 0x15, 0x8a, 0x00, 0x40, 0x0f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x5f, 0x01, 0x80, 0x01, 0x00, 0x10, 0x00, 0x00, 0x00,</div><div class='add'>+	0x0e, 0xf4, 0x01, 0x00, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x88, 0x01, 0x00,</div><div class='add'>+	0x03, 0x00, 0x00, 0x07, 0x1a, 0xf4, 0x01, 0x00, 0x0b, 0x96, 0x00, 0x07,</div><div class='add'>+	0x16, 0x30, 0x01, 0x00, 0x05, 0x86, 0x22, 0x41, 0x81, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x03, 0x86, 0x22, 0x42, 0x81, 0x6c, 0x00, 0x00, 0x1b, 0x84, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x04, 0x86, 0x22, 0x5f, 0x0f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0xff, 0x89, 0x00, 0x40, 0x0f, 0xb0, 0x00, 0x00, 0x0d, 0x86, 0xa2, 0x5a,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x86, 0x95, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x0d, 0x86, 0x22, 0x20, 0x85, 0x6c, 0x00, 0x00, 0x0a, 0x86, 0x9c, 0x0f,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x1b, 0x84, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x66, 0x96, 0x00, 0x5c, 0x1f, 0x00, 0x01, 0x00, 0x85, 0x98, 0x00, 0x42,</div><div class='add'>+	0x61, 0x31, 0x01, 0x00, 0x1b, 0x84, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xce, 0x99, 0x00, 0x07, 0x96, 0x30, 0x01, 0x00, 0x00, 0x00, 0x2d, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x18, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x13, 0x86, 0x22, 0x3a, 0x01, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+	0x8e, 0xb0, 0x01, 0x00, 0x66, 0x8b, 0x00, 0x40, 0x01, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x2e, 0x00, 0x2d, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x17, 0x86, 0xa2, 0x40, 0xe7, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x0a, 0x00, 0x00, 0x40, 0x8f, 0x98, 0x01, 0x00, 0x66, 0x8b, 0x00, 0x40,</div><div class='add'>+	0x01, 0xb0, 0x00, 0x00, 0x51, 0x95, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x38, 0x97, 0x00, 0x95, 0x03, 0x30, 0x01, 0x00, 0x1b, 0x84, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x2d, 0x03, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x22, 0x00, 0x2d, 0xf0, 0x2e, 0xb0, 0x01, 0x00, 0x28, 0x20, 0x00, 0xa6,</div><div class='add'>+	0x96, 0xb0, 0x01, 0x00, 0x20, 0x86, 0x22, 0x17, 0x96, 0x04, 0x00, 0x00,</div><div class='add'>+	0xf5, 0x97, 0x00, 0x4b, 0x95, 0x30, 0x01, 0x00, 0x66, 0x8b, 0x00, 0x4c,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x22, 0x86, 0x83, 0x17, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x44, 0x43, 0xc1, 0x01, 0x00, 0x24, 0x86, 0x85, 0x17,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x48, 0x43, 0xc1, 0x01, 0x00,</div><div class='add'>+	0x28, 0x00, 0x00, 0xf6, 0x02, 0xcc, 0x01, 0x00, 0x12, 0x00, 0x00, 0xa1,</div><div class='add'>+	0x2a, 0xc8, 0x01, 0x00, 0x0b, 0x97, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0xe7, 0x94, 0x00, 0x41, 0x81, 0x30, 0x01, 0x00, 0x66, 0x8b, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0xd0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x2e, 0x10, 0x48, 0xb1, 0x01, 0x00, 0x28, 0x00, 0x00, 0x40,</div><div class='add'>+	0xf1, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x03, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xf0, 0xb1, 0x01, 0x00, 0x2e, 0x86, 0x46, 0x47,</div><div class='add'>+	0x61, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x62, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x2f, 0x86, 0xa8, 0x1b, 0xe0, 0x31, 0x00, 0x00, 0x1b, 0x84, 0x1e, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x45, 0x03, 0xe0, 0x01, 0x00,</div><div class='add'>+	0x08, 0x00, 0x2d, 0x03, 0x48, 0xb1, 0x01, 0x00, 0x54, 0x86, 0x01, 0xfb,</div><div class='add'>+	0x08, 0x30, 0x00, 0x00, 0xa7, 0x86, 0x87, 0xfb, 0x22, 0x30, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xfa, 0x0e, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8,</div><div class='add'>+	0x14, 0xb0, 0x01, 0x00, 0x03, 0x00, 0x00, 0x07, 0x1a, 0xf4, 0x01, 0x00,</div><div class='add'>+	0x0b, 0x96, 0x00, 0x07, 0x16, 0x30, 0x01, 0x00, 0x4a, 0x86, 0x22, 0x41,</div><div class='add'>+	0x81, 0x6c, 0x00, 0x00, 0x3e, 0x86, 0x22, 0x42, 0x81, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x1b, 0x84, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x49, 0x86, 0x22, 0x5f,</div><div class='add'>+	0x0f, 0x7c, 0x00, 0x00, 0x38, 0x00, 0x00, 0x04, 0x7e, 0x89, 0x01, 0x00,</div><div class='add'>+	0x42, 0x86, 0xa6, 0x5f, 0x0f, 0x00, 0x00, 0x00, 0x5f, 0x95, 0x00, 0x40,</div><div class='add'>+	0x05, 0x30, 0x01, 0x00, 0x47, 0x86, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x13, 0x00, 0x00, 0x40, 0x87, 0x98, 0x01, 0x00, 0x00, 0x00, 0x2d, 0x03,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x0c, 0x00, 0x2d, 0xf0, 0x82, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf0, 0x84, 0xb0, 0x01, 0x00, 0xea, 0x96, 0x00, 0x40,</div><div class='add'>+	0x05, 0x30, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5c, 0x1f, 0x90, 0x01, 0x00,</div><div class='add'>+	0xff, 0x89, 0x00, 0x40, 0x0f, 0xb0, 0x00, 0x00, 0x52, 0x86, 0xa2, 0x5a,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x86, 0x95, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x52, 0x86, 0x22, 0x20, 0x85, 0x6c, 0x00, 0x00, 0x4f, 0x86, 0x9c, 0x0f,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x1b, 0x84, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x66, 0x96, 0x00, 0x5c, 0x1f, 0x00, 0x01, 0x00, 0x85, 0x98, 0x00, 0x42,</div><div class='add'>+	0x61, 0x31, 0x01, 0x00, 0x1b, 0x84, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xce, 0x99, 0x00, 0x07, 0x96, 0x30, 0x01, 0x00, 0x00, 0x00, 0x2d, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x18, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x56, 0x86, 0x21, 0x04, 0x80, 0x20, 0x00, 0x00, 0x57, 0x86, 0x00, 0x40,</div><div class='add'>+	0x10, 0xc9, 0x00, 0x00, 0xa8, 0x8a, 0x00, 0x4b, 0x81, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x76, 0x86, 0x00, 0x43, 0x81, 0xb0, 0x00, 0x00, 0x7a, 0x86, 0x00, 0xfb,</div><div class='add'>+	0x22, 0xb0, 0x00, 0x00, 0xa8, 0x8a, 0x00, 0x41, 0x81, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x66, 0x8b, 0x00, 0x4e, 0x8f, 0xb0, 0x00, 0x00, 0x72, 0x86, 0x00, 0x5a,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x5f, 0x86, 0x00, 0x47, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xa8, 0x8a, 0x00, 0x53, 0x81, 0xb0, 0x00, 0x00, 0xa8, 0x8a, 0x00, 0x56,</div><div class='add'>+	0x81, 0xb0, 0x00, 0x00, 0x32, 0x00, 0x2d, 0x05, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x66, 0x8b, 0xa0, 0x0a, 0xe4, 0x6d, 0x00, 0x00, 0x65, 0x86, 0xa2, 0x41,</div><div class='add'>+	0x19, 0x7c, 0x00, 0x00, 0x64, 0x86, 0x22, 0x0a, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x66, 0x8b, 0x00, 0x53, 0x8f, 0xb0, 0x00, 0x00, 0x66, 0x8b, 0x00, 0x54,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x6e, 0x86, 0x22, 0x0a, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x68, 0x86, 0xa2, 0x0a, 0xe4, 0x6d, 0x00, 0x00, 0x66, 0x8b, 0x00, 0x5d,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf2, 0x80, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x0a, 0x80, 0xd0, 0x01, 0x00, 0x6c, 0x86, 0xa0, 0x91,</div><div class='add'>+	0x81, 0x6c, 0x00, 0x00, 0x66, 0x8b, 0x00, 0x5e, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x25, 0x00, 0x00, 0x40, 0x8f, 0x98, 0x01, 0x00, 0x66, 0x8b, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x70, 0x86, 0x20, 0x91, 0xe5, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x66, 0x8b, 0x00, 0x54, 0x8f, 0xb0, 0x00, 0x00, 0x21, 0x00, 0x00, 0x40,</div><div class='add'>+	0x8f, 0x98, 0x01, 0x00, 0x66, 0x8b, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x32, 0x00, 0x2d, 0x05, 0x48, 0xb1, 0x01, 0x00, 0x66, 0x8b, 0xa0, 0x0a,</div><div class='add'>+	0xe4, 0x6d, 0x00, 0x00, 0x24, 0x00, 0x00, 0x40, 0x8f, 0x98, 0x01, 0x00,</div><div class='add'>+	0x66, 0x8b, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x37, 0x00, 0x2d, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x04, 0x00, 0x00, 0xf3, 0x82, 0xf4, 0x01, 0x00,</div><div class='add'>+	0xa8, 0x8a, 0xa0, 0x42, 0x83, 0x6c, 0x00, 0x00, 0xa8, 0x8a, 0x00, 0x54,</div><div class='add'>+	0x81, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf2, 0x0e, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x03, 0x00, 0x00, 0x07, 0x1a, 0xf4, 0x01, 0x00, 0x00, 0xb5, 0x00, 0x0d,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0x07, 0x00, 0x00, 0x07, 0x16, 0x88, 0x01, 0x00,</div><div class='add'>+	0x83, 0x86, 0x22, 0x0b, 0xe6, 0x7d, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x40,</div><div class='add'>+	0x87, 0x98, 0x01, 0x00, 0x3d, 0x99, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x0f, 0xb0, 0x01, 0x00, 0xff, 0x89, 0x00, 0x5c,</div><div class='add'>+	0x1f, 0x90, 0x00, 0x00, 0x95, 0x86, 0x22, 0x50, 0xfd, 0x7f, 0x00, 0x00,</div><div class='add'>+	0x90, 0x86, 0xa2, 0x54, 0xfd, 0x7f, 0x00, 0x00, 0x88, 0x86, 0x22, 0x55,</div><div class='add'>+	0xfd, 0x7f, 0x00, 0x00, 0x82, 0x00, 0x00, 0x40, 0x87, 0x98, 0x01, 0x00,</div><div class='add'>+	0x80, 0x86, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x80, 0x86, 0x22, 0x53,</div><div class='add'>+	0xfd, 0x7f, 0x00, 0x00, 0x14, 0x80, 0x00, 0x03, 0x42, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf0, 0x96, 0xb0, 0x01, 0x00, 0x10, 0x00, 0x00, 0x4b,</div><div class='add'>+	0x80, 0xf4, 0x01, 0x00, 0x0c, 0xbc, 0x00, 0x40, 0x87, 0x98, 0x01, 0x00,</div><div class='add'>+	0x90, 0x86, 0x22, 0x43, 0x80, 0x6c, 0x00, 0x00, 0xff, 0xff, 0x00, 0x4b,</div><div class='add'>+	0x80, 0x88, 0x01, 0x00, 0x80, 0x86, 0xa2, 0x43, 0x80, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x7c, 0x96, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00, 0x91, 0x86, 0x43, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x94, 0x86, 0xa0, 0xf0, 0x30, 0x6f, 0x00, 0x00,</div><div class='add'>+	0x86, 0x86, 0x1b, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x1b, 0x41,</div><div class='add'>+	0x31, 0xc3, 0x01, 0x00, 0x90, 0x95, 0x00, 0x40, 0x25, 0x30, 0x01, 0x00,</div><div class='add'>+	0x99, 0x86, 0x9c, 0x0f, 0x80, 0x32, 0x00, 0x00, 0x1b, 0x84, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x66, 0x96, 0x00, 0x5c, 0x1f, 0x00, 0x01, 0x00,</div><div class='add'>+	0x14, 0x80, 0x00, 0x03, 0x42, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0,</div><div class='add'>+	0x96, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x2f, 0x05, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x10, 0x00, 0x00, 0x07, 0x18, 0xe4, 0x01, 0x00, 0x00, 0x08, 0x00, 0x0c,</div><div class='add'>+	0xe0, 0x99, 0x01, 0x00, 0xce, 0x99, 0x00, 0x07, 0x96, 0x30, 0x01, 0x00,</div><div class='add'>+	0x00, 0xb5, 0x00, 0x0d, 0x46, 0xc9, 0x01, 0x00, 0xa0, 0x86, 0x30, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0b, 0xe6, 0x91, 0x01, 0x00,</div><div class='add'>+	0x00, 0x02, 0x00, 0xa1, 0x46, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x0b,</div><div class='add'>+	0xe6, 0x91, 0x01, 0x00, 0x04, 0x00, 0x2e, 0x05, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x10, 0x40, 0xe1, 0xb1, 0x01, 0x00, 0xa8, 0x8a, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfb, 0x28, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xfb, 0x86, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8,</div><div class='add'>+	0x14, 0xb0, 0x01, 0x00, 0xb1, 0x86, 0x22, 0x46, 0x23, 0x7c, 0x00, 0x00,</div><div class='add'>+	0xad, 0x86, 0x22, 0x40, 0x87, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x48,</div><div class='add'>+	0x1f, 0x90, 0x01, 0x00, 0xaf, 0x86, 0x22, 0x41, 0x87, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x47, 0x1f, 0x90, 0x01, 0x00, 0xb1, 0x86, 0x22, 0x42,</div><div class='add'>+	0x87, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x45, 0x1f, 0x90, 0x01, 0x00,</div><div class='add'>+	0xb1, 0x86, 0x47, 0x1b, 0x2c, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0,</div><div class='add'>+	0x13, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x1f, 0x41, 0x41, 0xc3, 0x01, 0x00,</div><div class='add'>+	0xe0, 0x86, 0x23, 0x92, 0x15, 0x6c, 0x00, 0x00, 0xe0, 0x86, 0xa2, 0x45,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0xe4, 0x86, 0x22, 0x4b, 0xfd, 0x7f, 0x00, 0x00,</div><div class='add'>+	0x17, 0x00, 0x00, 0xd0, 0xa2, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x27, 0xb0, 0x01, 0x00, 0x02, 0x00, 0x00, 0x0a, 0x24, 0xc8, 0x01, 0x00,</div><div class='add'>+	0xc7, 0x95, 0x00, 0x40, 0x0f, 0x30, 0x01, 0x00, 0xde, 0x86, 0x22, 0x08,</div><div class='add'>+	0x40, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0xa3, 0xc1, 0x01, 0x00,</div><div class='add'>+	0xf0, 0x07, 0x00, 0x12, 0x24, 0xcc, 0x01, 0x00, 0xba, 0x86, 0xaa, 0x41,</div><div class='add'>+	0x27, 0x40, 0x00, 0x00, 0x01, 0x00, 0x00, 0x13, 0x80, 0xcc, 0x01, 0x00,</div><div class='add'>+	0xda, 0x86, 0x26, 0x40, 0x23, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x83, 0xb0, 0x01, 0x00, 0x60, 0x00, 0x00, 0x03, 0x84, 0xc8, 0x01, 0x00,</div><div class='add'>+	0x10, 0x00, 0x00, 0x10, 0x48, 0xcd, 0x01, 0x00, 0x17, 0x00, 0x00, 0xd0,</div><div class='add'>+	0xa2, 0xc9, 0x01, 0x00, 0xc7, 0x86, 0xa2, 0x40, 0x83, 0x6c, 0x00, 0x00,</div><div class='add'>+	0xd3, 0x86, 0x00, 0x41, 0x83, 0xb0, 0x00, 0x00, 0x00, 0x80, 0x00, 0x42,</div><div class='add'>+	0x44, 0x99, 0x01, 0x00, 0x00, 0x00, 0x68, 0x21, 0x38, 0x96, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x2e, 0x50, 0x49, 0xc1, 0x01, 0x00, 0xcc, 0x86, 0xa2, 0x44,</div><div class='add'>+	0x23, 0x6c, 0x00, 0x00, 0x30, 0x00, 0x00, 0x03, 0x48, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x44, 0xf1, 0xb1, 0x01, 0x00, 0x0c, 0x00, 0x00, 0x20,</div><div class='add'>+	0xf0, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xa0, 0x00, 0x00, 0xa4, 0x62, 0xdd, 0x01, 0x00, 0xcf, 0x86, 0xa8, 0x42,</div><div class='add'>+	0xe0, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x85, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x23, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0xa3, 0xc1, 0x01, 0x00, 0xc5, 0x86, 0xa2, 0x41, 0x81, 0x50, 0x00, 0x00,</div><div class='add'>+	0xda, 0x86, 0x22, 0x40, 0x23, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0xd7, 0x86, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0x1b, 0x84, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xee, 0x07, 0x00, 0x40, 0x25, 0x98, 0x01, 0x00, 0x17, 0x00, 0x00, 0xd0,</div><div class='add'>+	0x2a, 0xc8, 0x01, 0x00, 0xed, 0x86, 0x00, 0x17, 0x10, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xaa, 0x97, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0xe4, 0x86, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0xc7, 0x95, 0x00, 0x92, 0x25, 0x30, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x31, 0xb0, 0x01, 0x00, 0xe4, 0x86, 0x22, 0x08,</div><div class='add'>+	0x2e, 0x30, 0x00, 0x00, 0xed, 0x86, 0x00, 0x41, 0x27, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x80, 0x80, 0x00, 0xa6, 0x04, 0xb0, 0x01, 0x00, 0x06, 0x00, 0x00, 0x40,</div><div class='add'>+	0x87, 0x98, 0x01, 0x00, 0x3d, 0x99, 0x00, 0x0a, 0x8c, 0x30, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x0f, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5c,</div><div class='add'>+	0x1f, 0x90, 0x01, 0x00, 0xec, 0x86, 0x22, 0x9f, 0x13, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x02, 0x00, 0x00, 0x88, 0x1c, 0xcc, 0x01, 0x00, 0x6b, 0x84, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0xff, 0x89, 0x00, 0x41, 0x3f, 0xc3, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x0f, 0xb0, 0x01, 0x00, 0x28, 0x00, 0x00, 0x01,</div><div class='add'>+	0x80, 0xce, 0x01, 0x00, 0x01, 0x87, 0x2a, 0x40, 0x81, 0x30, 0x00, 0x00,</div><div class='add'>+	0x00, 0x80, 0x00, 0x10, 0x44, 0xc9, 0x01, 0x00, 0x40, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0x98, 0x01, 0x00, 0xf6, 0x86, 0xa2, 0x48, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0xf6, 0x86, 0xa2, 0x47, 0x1f, 0x7c, 0x00, 0x00, 0xf6, 0x86, 0xa3, 0x07,</div><div class='add'>+	0x03, 0x6c, 0x00, 0x00, 0x80, 0x00, 0x00, 0x40, 0x81, 0x98, 0x01, 0x00,</div><div class='add'>+	0xf9, 0x86, 0xa3, 0x40, 0x02, 0x6c, 0x00, 0x00, 0x28, 0x00, 0x00, 0x01,</div><div class='add'>+	0xf0, 0xcd, 0x01, 0x00, 0xfb, 0x86, 0x00, 0x40, 0x0f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x28, 0x00, 0x00, 0x40, 0xf0, 0xcd, 0x01, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x0e, 0xcc, 0x01, 0x00, 0x28, 0x00, 0x00, 0x03, 0xf0, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x28, 0x00, 0x00, 0x00, 0xf0, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x16,</div><div class='add'>+	0xe0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x47, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x20, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00, 0xff, 0x86, 0xa8, 0x5c,</div><div class='add'>+	0x1f, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf0, 0x08, 0xb0, 0x01, 0x00, 0xa0, 0x01, 0x2d, 0x40,</div><div class='add'>+	0x00, 0xc0, 0x01, 0x00, 0xe7, 0x88, 0x22, 0x0f, 0x42, 0x05, 0x00, 0x00,</div><div class='add'>+	0x12, 0x87, 0x9c, 0x0f, 0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5c,</div><div class='add'>+	0x1f, 0x80, 0x01, 0x00, 0x00, 0x80, 0x00, 0x10, 0x42, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x0d, 0x87, 0x22, 0x40, 0xe3, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x47,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0x0a, 0x87, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0x1b, 0x84, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x12, 0x87, 0x22, 0x07, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x03, 0x42, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x07,</div><div class='add'>+	0x42, 0xc1, 0x01, 0x00, 0x00, 0x80, 0x00, 0xa1, 0x46, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x5f, 0xe1, 0x91, 0x01, 0x00, 0xd1, 0x87, 0xa2, 0x45,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x10, 0x00, 0x00, 0x03, 0x48, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x2d, 0x54, 0x29, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8,</div><div class='add'>+	0x18, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x04, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf8, 0x0e, 0xb0, 0x01, 0x00, 0x42, 0x00, 0x00, 0x03,</div><div class='add'>+	0x0a, 0xc8, 0x01, 0x00, 0x0c, 0x00, 0x00, 0xa4, 0x0c, 0xc8, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x17, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x14,</div><div class='add'>+	0x02, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x14, 0x24, 0xd0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x14, 0x10, 0xc0, 0x01, 0x00, 0x12, 0x00, 0x00, 0x08,</div><div class='add'>+	0x10, 0xc8, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x23, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xfe, 0x7f, 0x00, 0x05, 0x44, 0xc9, 0x01, 0x00, 0x23, 0x87, 0x20, 0x94,</div><div class='add'>+	0x15, 0x6c, 0x00, 0x00, 0x24, 0x87, 0x00, 0x94, 0xe5, 0xb1, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x0a, 0xe4, 0xb1, 0x01, 0x00, 0x3d, 0x87, 0x22, 0x01,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x44, 0x23, 0xe0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x2e, 0xa4, 0x80, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x10,</div><div class='add'>+	0x48, 0xc1, 0x01, 0x00, 0x2a, 0x87, 0xa3, 0x07, 0x02, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x2b, 0x87, 0x68, 0x01, 0x1a, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x68, 0x07,</div><div class='add'>+	0x1a, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x0d, 0x02, 0xd0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x05, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x0c,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x02, 0xe0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x0d, 0x0a, 0xc0, 0x01, 0x00, 0x37, 0x87, 0x22, 0x40,</div><div class='add'>+	0x03, 0x6c, 0x00, 0x00, 0x37, 0x87, 0x22, 0x42, 0x23, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x23, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x47,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0xa0, 0x00, 0x00, 0xa4, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0x5f, 0x87, 0x28, 0x40, 0x81, 0x32, 0x00, 0x00, 0x34, 0x87, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x80, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x47, 0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x62, 0xb1, 0x01, 0x00, 0x39, 0x87, 0xa8, 0x40, 0x23, 0x30, 0x00, 0x00,</div><div class='add'>+	0x1b, 0x84, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x5f, 0x87, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x44, 0x23, 0xe0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xa4, 0x86, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x2e, 0x10,</div><div class='add'>+	0x48, 0xc1, 0x01, 0x00, 0x42, 0x87, 0xa3, 0x12, 0x0e, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x43, 0x87, 0x68, 0x07, 0x1a, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x68, 0x12,</div><div class='add'>+	0x1a, 0xb0, 0x01, 0x00, 0x46, 0x87, 0x80, 0x08, 0xf0, 0x31, 0x00, 0x00,</div><div class='add'>+	0x01, 0x00, 0x00, 0x11, 0x98, 0xc8, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4c,</div><div class='add'>+	0x1e, 0x90, 0x01, 0x00, 0x00, 0x00, 0x00, 0x0c, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x02, 0xe0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x10,</div><div class='add'>+	0x86, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x46, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x01, 0x1f, 0x00, 0x43, 0x62, 0xdd, 0x01, 0x00, 0x4a, 0x87, 0xa8, 0x5c,</div><div class='add'>+	0x1f, 0x10, 0x00, 0x00, 0x7d, 0x87, 0x22, 0x0d, 0x14, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x50, 0x87, 0x22, 0x0d, 0x24, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0d,</div><div class='add'>+	0x10, 0xc0, 0x01, 0x00, 0x54, 0x87, 0x00, 0x0d, 0x24, 0xd0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x2b, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x15,</div><div class='add'>+	0xa2, 0xb1, 0x01, 0x00, 0x10, 0x00, 0x00, 0x20, 0x10, 0xc8, 0x01, 0x00,</div><div class='add'>+	0xf0, 0x07, 0x00, 0x40, 0x25, 0x98, 0x01, 0x00, 0x56, 0x87, 0x22, 0x42,</div><div class='add'>+	0x23, 0x6c, 0x00, 0x00, 0x5f, 0x87, 0x00, 0x41, 0x23, 0xc0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x46, 0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x57, 0x87, 0xa8, 0x5c, 0x1f, 0x00, 0x00, 0x00,</div><div class='add'>+	0x1b, 0x84, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x5d, 0x87, 0x22, 0x47, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0xfb, 0x95, 0x00, 0x43, 0x23, 0x30, 0x01, 0x00, 0x0e, 0x00, 0x00, 0x0f,</div><div class='add'>+	0x1e, 0x8c, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x23, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x7d, 0x87, 0x22, 0x0d, 0x14, 0x50, 0x00, 0x00, 0x7c, 0x87, 0xa2, 0x0d,</div><div class='add'>+	0x0e, 0x50, 0x00, 0x00, 0x6b, 0x87, 0x22, 0x46, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x46, 0x1f, 0x80, 0x01, 0x00, 0x30, 0x80, 0x00, 0x10,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0x69, 0x87, 0x22, 0x40, 0xe3, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x47, 0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x66, 0x87, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x1b, 0x84, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x20, 0x80, 0x00, 0x03,</div><div class='add'>+	0x46, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5f, 0xe1, 0x91, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x2d, 0x06, 0x48, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8,</div><div class='add'>+	0x18, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x04, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x70, 0x87, 0x1f, 0xf0, 0x0e, 0x30, 0x00, 0x00, 0x24, 0x87, 0x00, 0x4c,</div><div class='add'>+	0x0d, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x2e, 0x5f, 0x0f, 0x80, 0x01, 0x00,</div><div class='add'>+	0x24, 0x87, 0x23, 0x07, 0x14, 0x6c, 0x00, 0x00, 0x30, 0x00, 0x00, 0x10,</div><div class='add'>+	0x48, 0xc9, 0x01, 0x00, 0x24, 0x00, 0x00, 0x40, 0xf1, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x03, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x16, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x24, 0x00, 0x00, 0x00, 0x00, 0xc8, 0x01, 0x00, 0x00, 0x00, 0x00, 0x47,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0xa0, 0x00, 0x00, 0xa4, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0x79, 0x87, 0xa8, 0x46, 0x1f, 0x10, 0x00, 0x00, 0x24, 0x87, 0x00, 0x03,</div><div class='add'>+	0x0c, 0xb0, 0x00, 0x00, 0x24, 0x87, 0x00, 0x0d, 0x18, 0xc0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x2e, 0x14, 0x0a, 0xd0, 0x01, 0x00, 0x12, 0x00, 0x00, 0x05,</div><div class='add'>+	0x48, 0xcd, 0x01, 0x00, 0xfe, 0x7f, 0x00, 0x05, 0x42, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x0c, 0x00, 0x2a, 0xf2, 0xe0, 0xb1, 0x01, 0x00, 0x83, 0x87, 0x22, 0x40,</div><div class='add'>+	0x31, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x60, 0x18, 0x38, 0x96, 0x01, 0x00,</div><div class='add'>+	0x1e, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00, 0x00, 0x81, 0x00, 0xf6,</div><div class='add'>+	0x80, 0xce, 0x01, 0x00, 0x87, 0x87, 0xa6, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x44, 0x43, 0xc1, 0x01, 0x00, 0x89, 0x87, 0x22, 0x0b,</div><div class='add'>+	0xed, 0x6d, 0x00, 0x00, 0x08, 0x00, 0x00, 0xa1, 0x42, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x02, 0x00, 0x00, 0xa1, 0x46, 0xc9, 0x01, 0x00, 0x0f, 0x00, 0x00, 0xfa,</div><div class='add'>+	0x94, 0x88, 0x01, 0x00, 0x02, 0x00, 0x00, 0x4a, 0x86, 0xe4, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf6, 0x0e, 0xb0, 0x01, 0x00, 0x91, 0x87, 0x22, 0x47,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x04, 0x00, 0x1f, 0x43, 0x0e, 0x50, 0x00, 0x00,</div><div class='add'>+	0x91, 0x87, 0xa0, 0x46, 0x0f, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x0f, 0xc0, 0x01, 0x00, 0x95, 0x87, 0x22, 0x48, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x91, 0xb0, 0x01, 0x00, 0x04, 0x00, 0x0f, 0xa2,</div><div class='add'>+	0x42, 0x31, 0x00, 0x00, 0x98, 0x87, 0x00, 0x40, 0x89, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x0c, 0x00, 0x00, 0xa2, 0x42, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x43,</div><div class='add'>+	0x89, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x43, 0x95, 0xd0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xfc, 0x82, 0xb0, 0x01, 0x00, 0x9b, 0x87, 0xa0, 0x41,</div><div class='add'>+	0x90, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x91, 0xc0, 0x01, 0x00,</div><div class='add'>+	0xa0, 0x87, 0x22, 0x47, 0x1f, 0x7c, 0x00, 0x00, 0xa0, 0x87, 0xa0, 0x43,</div><div class='add'>+	0x89, 0x6c, 0x00, 0x00, 0xa0, 0x87, 0x20, 0x45, 0x89, 0x6c, 0x00, 0x00,</div><div class='add'>+	0xa0, 0x87, 0xa0, 0x41, 0x0e, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x0f, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41, 0x89, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x98, 0x87, 0xa2, 0x41, 0x95, 0x50, 0x00, 0x00, 0xa9, 0x87, 0x22, 0x48,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x10, 0x00, 0x00, 0x48, 0x92, 0xf4, 0x01, 0x00,</div><div class='add'>+	0xff, 0xff, 0x00, 0x48, 0x90, 0x88, 0x01, 0x00, 0xa7, 0x87, 0x90, 0x48,</div><div class='add'>+	0x92, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x93, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x0a, 0x00, 0x00, 0xa2, 0x44, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x66, 0x20,</div><div class='add'>+	0x93, 0xa4, 0x01, 0x00, 0x30, 0x80, 0x00, 0x10, 0x44, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x12, 0x00, 0x00, 0x14, 0xf0, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x17,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x12, 0x00, 0x00, 0x05, 0xe0, 0xcd, 0x01, 0x00,</div><div class='add'>+	0x30, 0x00, 0x00, 0x10, 0x80, 0xc8, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x20, 0x00, 0x00, 0x40, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0xaf, 0x87, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0xbc, 0x87, 0x22, 0x5c,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x44, 0x23, 0xe0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x2d, 0x10, 0x48, 0xc1, 0x01, 0x00, 0xb9, 0x87, 0x22, 0x40,</div><div class='add'>+	0xe3, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00, 0xb6, 0x87, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x1b, 0x84, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xbc, 0x87, 0x87, 0x5c, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0xfb, 0x95, 0x00, 0x41, 0x23, 0x40, 0x01, 0x00,</div><div class='add'>+	0xbe, 0x87, 0xa2, 0x47, 0x1f, 0x7c, 0x00, 0x00, 0x52, 0x89, 0x00, 0x17,</div><div class='add'>+	0x10, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x2f, 0x03, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xc1, 0x87, 0xa0, 0x07, 0x16, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x17, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x0b, 0xe4, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x50, 0x17, 0xf0, 0x01, 0x00, 0xc5, 0x87, 0x90, 0xf2,</div><div class='add'>+	0x16, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x17, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x66, 0x20, 0x17, 0xa4, 0x01, 0x00, 0x10, 0x00, 0x00, 0x14,</div><div class='add'>+	0x2a, 0xc8, 0x01, 0x00, 0x00, 0x00, 0x00, 0x50, 0x2b, 0xe0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf2, 0x2a, 0x94, 0x01, 0x00, 0x30, 0x80, 0x00, 0x10,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0xcf, 0x87, 0x22, 0x40, 0xe3, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x44, 0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0xcc, 0x87, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x1b, 0x84, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x00, 0x80, 0x00, 0x17,</div><div class='add'>+	0x10, 0xdc, 0x01, 0x00, 0x52, 0x89, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x90, 0x95, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0xd5, 0x87, 0x22, 0x5c,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x1b, 0x84, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x66, 0x96, 0x00, 0x5c, 0x1f, 0x00, 0x01, 0x00, 0x00, 0x80, 0x00, 0x05,</div><div class='add'>+	0x44, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0xe1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x2d, 0x03, 0x48, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0,</div><div class='add'>+	0x3c, 0xb0, 0x01, 0x00, 0x28, 0x00, 0x00, 0x14, 0x02, 0xc8, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x01, 0x34, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x2d, 0x05,</div><div class='add'>+	0x32, 0xb0, 0x01, 0x00, 0x22, 0x00, 0x00, 0x05, 0x0a, 0xc8, 0x01, 0x00,</div><div class='add'>+	0x10, 0x00, 0x00, 0x03, 0x48, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8,</div><div class='add'>+	0x18, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x04, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf8, 0x0e, 0xb0, 0x01, 0x00, 0x0c, 0x00, 0x00, 0xa4,</div><div class='add'>+	0x0c, 0xc8, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x17, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x23, 0xb0, 0x01, 0x00, 0x1b, 0x88, 0x22, 0x01,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x44, 0x23, 0xe0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x2e, 0xa4, 0x80, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x10,</div><div class='add'>+	0x48, 0xc1, 0x01, 0x00, 0xea, 0x87, 0xa3, 0x07, 0x02, 0x6c, 0x00, 0x00,</div><div class='add'>+	0xeb, 0x87, 0x68, 0x01, 0x1a, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x68, 0x07,</div><div class='add'>+	0x1a, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x0d, 0x02, 0xd0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x05, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x0c,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x02, 0xe0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x0d, 0x0a, 0xc0, 0x01, 0x00, 0xfd, 0x87, 0x22, 0x40,</div><div class='add'>+	0x03, 0x6c, 0x00, 0x00, 0xf7, 0x87, 0x22, 0x42, 0x23, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x23, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x47,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0xa0, 0x00, 0x00, 0xa4, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0x37, 0x88, 0x28, 0x40, 0x81, 0x32, 0x00, 0x00, 0xf4, 0x87, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x80, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x47, 0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x62, 0xb1, 0x01, 0x00, 0xf9, 0x87, 0xa8, 0x40, 0x23, 0x30, 0x00, 0x00,</div><div class='add'>+	0x1b, 0x84, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x37, 0x88, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x80, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x47, 0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x62, 0xb1, 0x01, 0x00, 0xff, 0x87, 0xa8, 0x40, 0x23, 0x30, 0x00, 0x00,</div><div class='add'>+	0x1b, 0x84, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x22, 0x00, 0x00, 0x19,</div><div class='add'>+	0x48, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x2d, 0x14, 0x48, 0xc1, 0x01, 0x00,</div><div class='add'>+	0x0f, 0x00, 0x00, 0xf2, 0x3a, 0x88, 0x01, 0x00, 0x00, 0x00, 0x00, 0x42,</div><div class='add'>+	0x3b, 0xe0, 0x01, 0x00, 0x0e, 0x00, 0x00, 0x14, 0x02, 0xc8, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x1d, 0x02, 0xc0, 0x01, 0x00, 0x0b, 0x88, 0x23, 0x1a,</div><div class='add'>+	0x02, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46, 0x03, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x37, 0x88, 0x00, 0x01, 0x34, 0xc0, 0x00, 0x00, 0x0c, 0x00, 0x2d, 0x1d,</div><div class='add'>+	0x48, 0xc1, 0x01, 0x00, 0xf0, 0x00, 0x00, 0xf2, 0x30, 0x88, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x42, 0x31, 0xf0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x14,</div><div class='add'>+	0x02, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x1d, 0x02, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x18, 0x02, 0xc0, 0x01, 0x00, 0x13, 0x88, 0x22, 0x1a,</div><div class='add'>+	0x02, 0x50, 0x00, 0x00, 0x37, 0x88, 0x00, 0x01, 0x34, 0xc0, 0x00, 0x00,</div><div class='add'>+	0x22, 0x00, 0x00, 0x19, 0x48, 0xc9, 0x01, 0x00, 0x02, 0x00, 0x2d, 0x14,</div><div class='add'>+	0x48, 0xc1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf6, 0x14, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x1d, 0x14, 0xd0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x18,</div><div class='add'>+	0x14, 0xd0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x24, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x12, 0x00, 0x00, 0x17, 0x10, 0xc8, 0x01, 0x00, 0x37, 0x88, 0x00, 0x1a,</div><div class='add'>+	0x10, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x44, 0x23, 0xe0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xa4, 0x86, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x2e, 0x10,</div><div class='add'>+	0x48, 0xc1, 0x01, 0x00, 0x20, 0x88, 0xa3, 0x12, 0x0e, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x21, 0x88, 0x68, 0x07, 0x1a, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x68, 0x12,</div><div class='add'>+	0x1a, 0xb0, 0x01, 0x00, 0x24, 0x88, 0x80, 0x08, 0xf0, 0x31, 0x00, 0x00,</div><div class='add'>+	0x01, 0x00, 0x00, 0x11, 0x98, 0xc8, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4c,</div><div class='add'>+	0x1e, 0x90, 0x01, 0x00, 0x00, 0x00, 0x00, 0x0c, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x02, 0xe0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x10,</div><div class='add'>+	0x86, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x46, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x01, 0x1f, 0x00, 0x43, 0x62, 0xdd, 0x01, 0x00, 0x28, 0x88, 0xa8, 0x5c,</div><div class='add'>+	0x1f, 0x10, 0x00, 0x00, 0x54, 0x88, 0x22, 0x0d, 0x14, 0x50, 0x00, 0x00,</div><div class='add'>+	0x54, 0x88, 0x22, 0x0d, 0x24, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0d,</div><div class='add'>+	0x10, 0xc0, 0x01, 0x00, 0x2f, 0x88, 0x22, 0x42, 0x23, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x37, 0x88, 0x00, 0x41, 0x23, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0x30, 0x88, 0xa8, 0x5c, 0x1f, 0x00, 0x00, 0x00, 0x1b, 0x84, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xfb, 0x95, 0x00, 0x43, 0x23, 0x30, 0x01, 0x00, 0x0e, 0x00, 0x00, 0x0f,</div><div class='add'>+	0x1e, 0x8c, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x23, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x53, 0x88, 0xa2, 0x0d, 0x0e, 0x50, 0x00, 0x00, 0x42, 0x88, 0x22, 0x46,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46, 0x1f, 0x80, 0x01, 0x00,</div><div class='add'>+	0x30, 0x80, 0x00, 0x10, 0x42, 0xc9, 0x01, 0x00, 0x40, 0x88, 0x22, 0x40,</div><div class='add'>+	0xe3, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x47, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00, 0x3d, 0x88, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x1b, 0x84, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x20, 0x80, 0x00, 0x03, 0x46, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5f,</div><div class='add'>+	0xe1, 0x91, 0x01, 0x00, 0x00, 0x00, 0x2d, 0x06, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf8, 0x18, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8,</div><div class='add'>+	0x04, 0xb0, 0x01, 0x00, 0x47, 0x88, 0x1f, 0xf0, 0x0e, 0x30, 0x00, 0x00,</div><div class='add'>+	0xe4, 0x87, 0x00, 0x4c, 0x0d, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x2e, 0x5f,</div><div class='add'>+	0x0f, 0x80, 0x01, 0x00, 0xe4, 0x87, 0x23, 0x07, 0x14, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x30, 0x00, 0x00, 0x10, 0x48, 0xc9, 0x01, 0x00, 0x24, 0x00, 0x00, 0x40,</div><div class='add'>+	0xf1, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x03, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x16,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x24, 0x00, 0x00, 0x00, 0x00, 0xc8, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x47, 0x61, 0xb1, 0x01, 0x00, 0xa0, 0x00, 0x00, 0xa4,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x50, 0x88, 0xa8, 0x46, 0x1f, 0x10, 0x00, 0x00,</div><div class='add'>+	0xe4, 0x87, 0x00, 0x03, 0x0c, 0xb0, 0x00, 0x00, 0xe4, 0x87, 0x00, 0x0d,</div><div class='add'>+	0x18, 0xc0, 0x00, 0x00, 0x71, 0x88, 0xa2, 0x44, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x19, 0x0a, 0xb0, 0x01, 0x00, 0x22, 0x00, 0x00, 0x05,</div><div class='add'>+	0x48, 0xc9, 0x01, 0x00, 0x0a, 0x00, 0x2d, 0x14, 0x48, 0xc1, 0x01, 0x00,</div><div class='add'>+	0x02, 0x00, 0x20, 0x40, 0xe5, 0xb1, 0x01, 0x00, 0x04, 0x00, 0x20, 0x40,</div><div class='add'>+	0xe5, 0xb1, 0x01, 0x00, 0x0d, 0x00, 0x2d, 0x1d, 0x48, 0xc1, 0x01, 0x00,</div><div class='add'>+	0x09, 0x00, 0x00, 0xf3, 0x38, 0x88, 0x01, 0x00, 0x0d, 0x00, 0x20, 0x50,</div><div class='add'>+	0xe7, 0xb1, 0x01, 0x00, 0x04, 0x00, 0x2d, 0x40, 0x3f, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf4, 0x32, 0xb0, 0x01, 0x00, 0x04, 0x00, 0x20, 0x40,</div><div class='add'>+	0xe1, 0xb1, 0x01, 0x00, 0x22, 0x00, 0x00, 0x05, 0x48, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x2d, 0x14, 0x48, 0xc1, 0x01, 0x00, 0x02, 0x00, 0x00, 0x1d,</div><div class='add'>+	0x94, 0xf4, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x91, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x66, 0x88, 0xa0, 0xfc, 0x90, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x91, 0xc0, 0x01, 0x00, 0x64, 0x88, 0xa2, 0x41, 0x95, 0x50, 0x00, 0x00,</div><div class='add'>+	0x04, 0x80, 0x00, 0x05, 0x44, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x48,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x18, 0x48, 0xc1, 0x01, 0x00,</div><div class='add'>+	0x02, 0x00, 0x00, 0x18, 0x94, 0xf4, 0x01, 0x00, 0x00, 0x00, 0x2d, 0x18,</div><div class='add'>+	0x90, 0xb0, 0x01, 0x00, 0x6e, 0x88, 0xa0, 0xfc, 0x90, 0x40, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x91, 0xc0, 0x01, 0x00, 0x6c, 0x88, 0xa2, 0x41,</div><div class='add'>+	0x95, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x48, 0xe0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x10, 0x00, 0x20, 0x40, 0xe5, 0xb1, 0x01, 0x00, 0x22, 0x00, 0x00, 0x05,</div><div class='add'>+	0x48, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x14, 0x48, 0xc1, 0x01, 0x00,</div><div class='add'>+	0x04, 0x80, 0x00, 0x05, 0x42, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8,</div><div class='add'>+	0x80, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x16, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x76, 0x88, 0x42, 0x30, 0x3d, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9e,</div><div class='add'>+	0x85, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x1a, 0x41, 0x3d, 0xc3, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x20, 0x42, 0xec, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x1e,</div><div class='add'>+	0x82, 0xb0, 0x01, 0x00, 0x02, 0x00, 0x2e, 0x1d, 0x82, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x66, 0x18, 0x82, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x42,</div><div class='add'>+	0x80, 0xc0, 0x01, 0x00, 0x80, 0x88, 0xa0, 0x41, 0x80, 0x44, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x81, 0xc0, 0x01, 0x00, 0x10, 0x00, 0x00, 0x40,</div><div class='add'>+	0x92, 0xf4, 0x01, 0x00, 0x0a, 0x00, 0x2e, 0x30, 0x81, 0x84, 0x01, 0x00,</div><div class='add'>+	0x84, 0x88, 0x90, 0x40, 0x92, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x93, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x66, 0x20, 0x93, 0xa4, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x1d, 0x48, 0xc1, 0x01, 0x00, 0x04, 0x00, 0x20, 0x19,</div><div class='add'>+	0xe8, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x16, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x8a, 0x88, 0xa0, 0x19, 0x16, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x17, 0xc0, 0x01, 0x00, 0x0d, 0x00, 0x2f, 0x1e, 0x32, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x8f, 0x88, 0xa2, 0x40, 0x15, 0x6c, 0x00, 0x00, 0x8e, 0x88, 0xa0, 0x1c,</div><div class='add'>+	0x16, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x17, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x63, 0xf3, 0x38, 0x94, 0x01, 0x00, 0x10, 0x00, 0x00, 0x05,</div><div class='add'>+	0x48, 0xc9, 0x01, 0x00, 0x04, 0x00, 0x2e, 0x1e, 0x98, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x60, 0x1a, 0x98, 0xc0, 0x01, 0x00, 0x0c, 0x00, 0x20, 0x40,</div><div class='add'>+	0xe1, 0xb1, 0x01, 0x00, 0x9d, 0x88, 0x22, 0x46, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x46, 0x1f, 0x80, 0x01, 0x00, 0x30, 0x80, 0x00, 0x10,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0x9b, 0x88, 0x22, 0x40, 0xe3, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x47, 0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x98, 0x88, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x1b, 0x84, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x20, 0x80, 0x00, 0x03,</div><div class='add'>+	0x46, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5f, 0xe1, 0x91, 0x01, 0x00,</div><div class='add'>+	0x30, 0x80, 0x00, 0x10, 0x44, 0xc9, 0x01, 0x00, 0x12, 0x00, 0x00, 0x1a,</div><div class='add'>+	0xf0, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x17, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x10, 0x00, 0x00, 0x05, 0xe0, 0xc9, 0x01, 0x00, 0x30, 0x00, 0x00, 0x10,</div><div class='add'>+	0x80, 0xc8, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x20, 0x00, 0x00, 0x40, 0x62, 0xdd, 0x01, 0x00, 0xa3, 0x88, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0xb1, 0x88, 0x22, 0x5c, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x3c, 0x44, 0x23, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x2d, 0x10,</div><div class='add'>+	0x48, 0xc1, 0x01, 0x00, 0xad, 0x88, 0x22, 0x40, 0xe3, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x46, 0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0xaa, 0x88, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x1b, 0x84, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5c,</div><div class='add'>+	0x1f, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00, 0x10, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xfb, 0x95, 0x00, 0x41, 0x23, 0x40, 0x01, 0x00, 0x0e, 0x00, 0x00, 0x0f,</div><div class='add'>+	0x1e, 0x8c, 0x01, 0x00, 0x20, 0x00, 0x2f, 0x05, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x0b, 0xe4, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x50,</div><div class='add'>+	0x17, 0xf0, 0x01, 0x00, 0xb6, 0x88, 0x90, 0xf2, 0x16, 0x40, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x17, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x66, 0x20,</div><div class='add'>+	0x17, 0xa4, 0x01, 0x00, 0x10, 0x00, 0x00, 0x14, 0x2a, 0xc8, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x1d, 0x2a, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x50,</div><div class='add'>+	0x2b, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf2, 0x2a, 0x94, 0x01, 0x00,</div><div class='add'>+	0x30, 0x80, 0x00, 0x10, 0x42, 0xc9, 0x01, 0x00, 0xc1, 0x88, 0x22, 0x40,</div><div class='add'>+	0xe3, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00, 0xbe, 0x88, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x1b, 0x84, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x80, 0x00, 0x17, 0x10, 0xdc, 0x01, 0x00, 0xde, 0x88, 0x22, 0x40,</div><div class='add'>+	0x15, 0x6c, 0x00, 0x00, 0xc9, 0x88, 0xa2, 0x44, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x44, 0x1f, 0x90, 0x01, 0x00, 0xc8, 0x88, 0x22, 0x9f,</div><div class='add'>+	0x13, 0x6c, 0x00, 0x00, 0x02, 0x00, 0x00, 0x88, 0x1c, 0xcc, 0x01, 0x00,</div><div class='add'>+	0x6b, 0x84, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x3f, 0xc3, 0x01, 0x00, 0x4e, 0x99, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0xcc, 0x88, 0xa2, 0x41, 0x87, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1e,</div><div class='add'>+	0x3e, 0xc0, 0x01, 0x00, 0xde, 0x88, 0x22, 0x40, 0x15, 0x6c, 0x00, 0x00,</div><div class='add'>+	0xcf, 0x88, 0x20, 0x1e, 0x14, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a,</div><div class='add'>+	0x3c, 0xb0, 0x01, 0x00, 0xc7, 0x95, 0x00, 0x1e, 0x24, 0x30, 0x01, 0x00,</div><div class='add'>+	0xd4, 0x88, 0x22, 0x08, 0x2e, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x52,</div><div class='add'>+	0x11, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x1a, 0x10, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x37, 0x88, 0x00, 0x40, 0x17, 0xb0, 0x00, 0x00, 0x6b, 0x84, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0xc7, 0x95, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0xd1, 0x88, 0xa2, 0x08, 0x2e, 0x30, 0x00, 0x00, 0x80, 0x80, 0x00, 0xa6,</div><div class='add'>+	0x04, 0xb0, 0x01, 0x00, 0x06, 0x00, 0x00, 0x40, 0x87, 0x98, 0x01, 0x00,</div><div class='add'>+	0x00, 0x80, 0x00, 0x03, 0x44, 0x99, 0x01, 0x00, 0x04, 0x00, 0x22, 0x04,</div><div class='add'>+	0xe0, 0x31, 0x00, 0x00, 0x3d, 0x99, 0x00, 0x1f, 0x8c, 0x30, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x0f, 0xb0, 0x01, 0x00, 0xff, 0x89, 0x00, 0x5c,</div><div class='add'>+	0x1f, 0x90, 0x00, 0x00, 0x00, 0x80, 0x00, 0x03, 0x44, 0x99, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x22, 0x04, 0xe0, 0x31, 0x00, 0x00, 0x4e, 0x99, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0xe3, 0x88, 0xa2, 0x41, 0x87, 0x7c, 0x00, 0x00,</div><div class='add'>+	0xe4, 0x88, 0x00, 0x1e, 0x3e, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f,</div><div class='add'>+	0x8c, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x05, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x3d, 0x99, 0x00, 0x40, 0x0f, 0x30, 0x01, 0x00, 0xff, 0x89, 0x00, 0x5c,</div><div class='add'>+	0x1f, 0x90, 0x00, 0x00, 0xef, 0x88, 0x9c, 0x0f, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x5c, 0x1f, 0x80, 0x01, 0x00, 0x00, 0x80, 0x00, 0x10,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0xef, 0x88, 0x22, 0x40, 0xe3, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x47, 0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0xec, 0x88, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x1b, 0x84, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0xf4, 0x88, 0x22, 0x07,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x42, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x07, 0x42, 0xc1, 0x01, 0x00, 0x00, 0x80, 0x00, 0xa1,</div><div class='add'>+	0x46, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5f, 0xe1, 0x91, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x2e, 0x03, 0x48, 0xb1, 0x01, 0x00, 0xf7, 0x88, 0x20, 0x94,</div><div class='add'>+	0x15, 0x6c, 0x00, 0x00, 0xf8, 0x88, 0x00, 0x94, 0xe1, 0xb1, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x0a, 0xe0, 0xb1, 0x01, 0x00, 0xfb, 0x88, 0x22, 0x40,</div><div class='add'>+	0x31, 0x6c, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x40, 0x45, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x60, 0x18, 0x38, 0x96, 0x01, 0x00, 0x00, 0x00, 0x2e, 0x10,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x50, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x08, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x03,</div><div class='add'>+	0xe0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x10, 0x62, 0xb1, 0x01, 0x00, 0x00, 0x89, 0xa8, 0x40,</div><div class='add'>+	0x23, 0x30, 0x00, 0x00, 0x1b, 0x84, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x2d, 0x52, 0x11, 0xc0, 0x01, 0x00, 0x10, 0x00, 0x00, 0x03,</div><div class='add'>+	0x48, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x18, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf8, 0x04, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8,</div><div class='add'>+	0x0e, 0xb0, 0x01, 0x00, 0x0c, 0x00, 0x00, 0xa4, 0x0c, 0xc8, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x3c, 0x44, 0x23, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xa4,</div><div class='add'>+	0x86, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x2e, 0x10, 0x48, 0xc1, 0x01, 0x00,</div><div class='add'>+	0x0e, 0x89, 0xa3, 0x12, 0x0e, 0x6c, 0x00, 0x00, 0x0f, 0x89, 0x68, 0x07,</div><div class='add'>+	0x1a, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x68, 0x12, 0x1a, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x10, 0x86, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x08,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x0c, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x02, 0xe0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x46,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x01, 0x1f, 0x00, 0x43, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0x14, 0x89, 0xa8, 0x5c, 0x1f, 0x10, 0x00, 0x00, 0x45, 0x89, 0x22, 0x0d,</div><div class='add'>+	0x14, 0x6c, 0x00, 0x00, 0x1a, 0x89, 0x22, 0x0d, 0x24, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x0d, 0x10, 0xc0, 0x01, 0x00, 0x1e, 0x89, 0x00, 0x0d,</div><div class='add'>+	0x24, 0xd0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x2b, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x15, 0xa2, 0xb1, 0x01, 0x00, 0x10, 0x00, 0x00, 0x20,</div><div class='add'>+	0x10, 0xc8, 0x01, 0x00, 0xf0, 0x07, 0x00, 0x40, 0x25, 0x98, 0x01, 0x00,</div><div class='add'>+	0x20, 0x89, 0x22, 0x42, 0x23, 0x6c, 0x00, 0x00, 0x27, 0x89, 0x00, 0x41,</div><div class='add'>+	0x23, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00, 0x21, 0x89, 0xa8, 0x5c,</div><div class='add'>+	0x1f, 0x00, 0x00, 0x00, 0x1b, 0x84, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x10, 0x48, 0xb1, 0x01, 0x00, 0xc2, 0x94, 0x00, 0x43,</div><div class='add'>+	0x23, 0x30, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x23, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x22, 0x0d, 0x14, 0x50, 0x00, 0x00, 0x44, 0x89, 0xa2, 0x0d,</div><div class='add'>+	0x0e, 0x50, 0x00, 0x00, 0x33, 0x89, 0x22, 0x46, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x46, 0x1f, 0x80, 0x01, 0x00, 0x30, 0x80, 0x00, 0x10,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0x31, 0x89, 0x22, 0x40, 0xe3, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x47, 0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x2e, 0x89, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x1b, 0x84, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x20, 0x80, 0x00, 0x03,</div><div class='add'>+	0x46, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5f, 0xe1, 0x91, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x2d, 0x06, 0x48, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8,</div><div class='add'>+	0x18, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x04, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x38, 0x89, 0x1f, 0xf0, 0x0e, 0x30, 0x00, 0x00, 0x09, 0x89, 0x00, 0x4c,</div><div class='add'>+	0x0d, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x2e, 0x5f, 0x0f, 0x80, 0x01, 0x00,</div><div class='add'>+	0x09, 0x89, 0x23, 0x07, 0x14, 0x6c, 0x00, 0x00, 0x30, 0x00, 0x00, 0x10,</div><div class='add'>+	0x48, 0xc9, 0x01, 0x00, 0x24, 0x00, 0x00, 0x40, 0xf1, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x03, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x16, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x24, 0x00, 0x00, 0x00, 0x00, 0xc8, 0x01, 0x00, 0x00, 0x00, 0x00, 0x47,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0xa0, 0x00, 0x00, 0xa4, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0x41, 0x89, 0xa8, 0x46, 0x1f, 0x10, 0x00, 0x00, 0x09, 0x89, 0x00, 0x03,</div><div class='add'>+	0x0c, 0xb0, 0x00, 0x00, 0x09, 0x89, 0x00, 0x0d, 0x18, 0xc0, 0x00, 0x00,</div><div class='add'>+	0x4e, 0x89, 0x22, 0x5c, 0x1f, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5c,</div><div class='add'>+	0x1f, 0x80, 0x01, 0x00, 0x00, 0x00, 0x3c, 0x44, 0x23, 0xe0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x2d, 0x10, 0x48, 0xc1, 0x01, 0x00, 0x4e, 0x89, 0x22, 0x40,</div><div class='add'>+	0xe3, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00, 0x4b, 0x89, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x1b, 0x84, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x10, 0x48, 0xb1, 0x01, 0x00, 0xc2, 0x94, 0x00, 0x41,</div><div class='add'>+	0x23, 0x40, 0x01, 0x00, 0x00, 0x00, 0x00, 0x17, 0x10, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x52, 0x89, 0x00, 0x40, 0x2b, 0xb0, 0x00, 0x00, 0x00, 0x80, 0x00, 0x03,</div><div class='add'>+	0x44, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x04, 0xe0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x57, 0x89, 0x22, 0x9f, 0x13, 0x6c, 0x00, 0x00, 0x02, 0x00, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xcc, 0x01, 0x00, 0x6b, 0x84, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x4e, 0x99, 0x00, 0x41, 0x3f, 0x43, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x8d, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x05, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x3d, 0x99, 0x00, 0x40, 0x0f, 0x30, 0x01, 0x00, 0x15, 0x8a, 0x00, 0x5c,</div><div class='add'>+	0x1f, 0x90, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x0e, 0xf4, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x3a, 0x01, 0x84, 0x01, 0x00, 0x03, 0x00, 0x00, 0x07,</div><div class='add'>+	0x1a, 0xf4, 0x01, 0x00, 0x0b, 0x96, 0x00, 0x07, 0x16, 0x30, 0x01, 0x00,</div><div class='add'>+	0x66, 0x89, 0x22, 0x41, 0x81, 0x6c, 0x00, 0x00, 0x64, 0x89, 0x22, 0x42,</div><div class='add'>+	0x81, 0x6c, 0x00, 0x00, 0x1b, 0x84, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x65, 0x89, 0x22, 0x5f, 0x0f, 0x7c, 0x00, 0x00, 0xff, 0x89, 0x00, 0x40,</div><div class='add'>+	0x0f, 0xb0, 0x00, 0x00, 0x6e, 0x89, 0xa2, 0x5a, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x86, 0x95, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x6e, 0x89, 0x22, 0x20,</div><div class='add'>+	0x85, 0x6c, 0x00, 0x00, 0x6b, 0x89, 0x9c, 0x0f, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x1b, 0x84, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x66, 0x96, 0x00, 0x5c,</div><div class='add'>+	0x1f, 0x00, 0x01, 0x00, 0x85, 0x98, 0x00, 0x42, 0x61, 0x31, 0x01, 0x00,</div><div class='add'>+	0x1b, 0x84, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0xce, 0x99, 0x00, 0x07,</div><div class='add'>+	0x96, 0x30, 0x01, 0x00, 0x00, 0x00, 0x2d, 0x05, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf0, 0x18, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+	0x80, 0xb0, 0x01, 0x00, 0xa8, 0x8a, 0xa2, 0x5f, 0x81, 0x6c, 0x00, 0x00,</div><div class='add'>+	0xa8, 0x00, 0x2d, 0x43, 0x19, 0x80, 0x01, 0x00, 0x37, 0x00, 0x2d, 0xf0,</div><div class='add'>+	0x24, 0xb0, 0x01, 0x00, 0x04, 0x00, 0x00, 0xf3, 0x8e, 0xf4, 0x01, 0x00,</div><div class='add'>+	0x0f, 0x00, 0x00, 0xf3, 0x90, 0x88, 0x01, 0x00, 0x7d, 0x89, 0x22, 0x48,</div><div class='add'>+	0x8e, 0x6c, 0x00, 0x00, 0x36, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00,</div><div class='add'>+	0x58, 0x00, 0x3d, 0x43, 0xe7, 0xe1, 0x01, 0x00, 0x7d, 0x89, 0x1f, 0xf0,</div><div class='add'>+	0x24, 0x6c, 0x00, 0x00, 0x7c, 0x89, 0x23, 0x41, 0x8f, 0x6c, 0x00, 0x00,</div><div class='add'>+	0xa8, 0x8a, 0x00, 0x47, 0x81, 0xb0, 0x00, 0x00, 0xa8, 0x8a, 0x00, 0x48,</div><div class='add'>+	0x81, 0xb0, 0x00, 0x00, 0x40, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00,</div><div class='add'>+	0xb0, 0x00, 0x2d, 0xf0, 0x14, 0xb0, 0x01, 0x00, 0x82, 0x89, 0x22, 0x0a,</div><div class='add'>+	0x90, 0x40, 0x00, 0x00, 0x21, 0x99, 0x00, 0x40, 0x91, 0x30, 0x01, 0x00,</div><div class='add'>+	0xa8, 0x8a, 0xa2, 0x40, 0x80, 0x32, 0x00, 0x00, 0xb0, 0x00, 0x2d, 0x45,</div><div class='add'>+	0x81, 0xb0, 0x01, 0x00, 0x8e, 0x89, 0x22, 0xf0, 0x2c, 0x30, 0x00, 0x00,</div><div class='add'>+	0xa3, 0x00, 0x2d, 0x30, 0x83, 0xb0, 0x01, 0x00, 0xac, 0x00, 0x2d, 0xf3,</div><div class='add'>+	0x82, 0xe0, 0x01, 0x00, 0x88, 0x89, 0xa3, 0x41, 0x2c, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x16, 0x82, 0xb0, 0x01, 0x00, 0x98, 0x00, 0x2d, 0xf0,</div><div class='add'>+	0x82, 0xc0, 0x01, 0x00, 0x88, 0x00, 0x2d, 0xf0, 0x82, 0xd0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf2, 0x98, 0xe8, 0x01, 0x00, 0xa8, 0x8a, 0x20, 0x4c,</div><div class='add'>+	0x82, 0x6c, 0x00, 0x00, 0x7c, 0x00, 0x2d, 0x41, 0x98, 0xe8, 0x01, 0x00,</div><div class='add'>+	0xa8, 0x8a, 0x20, 0xf0, 0x98, 0x6c, 0x00, 0x00, 0xff, 0x89, 0x22, 0x0a,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x40, 0x02, 0x00, 0x0c, 0x7e, 0x89, 0x01, 0x00,</div><div class='add'>+	0xff, 0x89, 0xa6, 0x40, 0x81, 0x32, 0x00, 0x00, 0xa8, 0x8a, 0x00, 0x49,</div><div class='add'>+	0x81, 0xb0, 0x00, 0x00, 0x20, 0x00, 0x00, 0xa6, 0x80, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x96, 0x89, 0x22, 0x43, 0x21, 0x6f, 0x00, 0x00, 0x13, 0x80, 0x00, 0x40,</div><div class='add'>+	0x80, 0xdc, 0x01, 0x00, 0x97, 0x89, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x1a, 0x80, 0x00, 0x40, 0x80, 0xdc, 0x01, 0x00, 0x97, 0x89, 0xa2, 0x5e,</div><div class='add'>+	0x0b, 0x7d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x08, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x99, 0x89, 0x9f, 0x85, 0x80, 0x32, 0x00, 0x00, 0x9d, 0x89, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x5f, 0x84, 0x22, 0x40, 0x57, 0x7d, 0x00, 0x00,</div><div class='add'>+	0x01, 0x00, 0x00, 0x40, 0x57, 0x99, 0x01, 0x00, 0x9d, 0x89, 0x42, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x93, 0x93, 0x01, 0x00,</div><div class='add'>+	0x49, 0x84, 0x1a, 0x5b, 0x69, 0x93, 0x00, 0x00, 0x7b, 0x00, 0x00, 0x40,</div><div class='add'>+	0x61, 0x99, 0x01, 0x00, 0xa0, 0x89, 0xa8, 0xb1, 0x80, 0x30, 0x00, 0x00,</div><div class='add'>+	0xc9, 0x89, 0x1d, 0x40, 0x80, 0x32, 0x00, 0x00, 0xba, 0x89, 0x22, 0x40,</div><div class='add'>+	0xaf, 0x6f, 0x00, 0x00, 0xba, 0x89, 0x22, 0x5b, 0x81, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x22, 0x5d, 0x73, 0x7d, 0x00, 0x00, 0x7d, 0x00, 0x00, 0x40,</div><div class='add'>+	0x61, 0x99, 0x01, 0x00, 0xa6, 0x89, 0xa8, 0xb1, 0x94, 0x30, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x5f, 0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4a,</div><div class='add'>+	0x62, 0xb1, 0x01, 0x00, 0xa9, 0x89, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0xab, 0x89, 0x43, 0x40, 0x81, 0x32, 0x00, 0x00, 0xb9, 0x89, 0x22, 0x57,</div><div class='add'>+	0x73, 0x7d, 0x00, 0x00, 0x77, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00,</div><div class='add'>+	0xad, 0x89, 0xa8, 0xb1, 0x94, 0x30, 0x00, 0x00, 0x77, 0x00, 0x00, 0x40,</div><div class='add'>+	0x61, 0x99, 0x01, 0x00, 0xaf, 0x89, 0xa8, 0xb1, 0x96, 0x30, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x48, 0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4a,</div><div class='add'>+	0x62, 0xb1, 0x01, 0x00, 0xb2, 0x89, 0xa8, 0x4a, 0x80, 0x33, 0x00, 0x00,</div><div class='add'>+	0xb7, 0x89, 0x22, 0x5f, 0x95, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4b,</div><div class='add'>+	0x62, 0xb1, 0x01, 0x00, 0xb5, 0x89, 0xa8, 0x4b, 0xac, 0x33, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x1b, 0xa5, 0x82, 0xb3, 0x01, 0x00, 0xba, 0x89, 0x00, 0xbe,</div><div class='add'>+	0x83, 0xc3, 0x00, 0x00, 0x00, 0x00, 0x1b, 0x40, 0x81, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x40, 0x18, 0x00, 0x40, 0x49, 0x99, 0x01, 0x00, 0x04, 0x00, 0x00, 0xa6,</div><div class='add'>+	0x86, 0xb0, 0x01, 0x00, 0xc7, 0x89, 0xa2, 0x40, 0x86, 0x04, 0x00, 0x00,</div><div class='add'>+	0x1b, 0x84, 0x9c, 0x40, 0x80, 0x32, 0x00, 0x00, 0xff, 0xff, 0x00, 0x40,</div><div class='add'>+	0x88, 0x88, 0x01, 0x00, 0xe3, 0x89, 0x00, 0x50, 0x47, 0x31, 0x01, 0x00,</div><div class='add'>+	0x36, 0x00, 0x00, 0x44, 0x88, 0xcc, 0x01, 0x00, 0xc3, 0x89, 0x52, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0xe3, 0x89, 0x00, 0x40, 0x47, 0x31, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x89, 0xb0, 0x01, 0x00, 0xe3, 0x89, 0x00, 0x48,</div><div class='add'>+	0x47, 0x31, 0x01, 0x00, 0xe3, 0x89, 0x00, 0x05, 0x47, 0x31, 0x01, 0x00,</div><div class='add'>+	0x1b, 0x84, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x28, 0x00, 0x00, 0x40,</div><div class='add'>+	0x47, 0x99, 0x01, 0x00, 0x1b, 0x84, 0x00, 0x41, 0xe1, 0xc1, 0x00, 0x00,</div><div class='add'>+	0x78, 0x18, 0x00, 0x40, 0x49, 0x99, 0x01, 0x00, 0xd0, 0x89, 0x22, 0x54,</div><div class='add'>+	0x81, 0x7c, 0x00, 0x00, 0xcb, 0x89, 0x42, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x82, 0x00, 0xb4, 0x69, 0xdf, 0x01, 0x00, 0x00, 0x00, 0x1a, 0x44,</div><div class='add'>+	0x93, 0x93, 0x01, 0x00, 0x28, 0x00, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00,</div><div class='add'>+	0xe3, 0x89, 0x00, 0x41, 0x89, 0x30, 0x01, 0x00, 0xde, 0x89, 0x0f, 0x40,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0xff, 0x7f, 0x00, 0x40, 0x88, 0x88, 0x01, 0x00,</div><div class='add'>+	0xe3, 0x89, 0x00, 0x50, 0x47, 0x31, 0x01, 0x00, 0x36, 0x00, 0x00, 0x44,</div><div class='add'>+	0x88, 0xcc, 0x01, 0x00, 0xd6, 0x89, 0x99, 0x40, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x48, 0x89, 0xd0, 0x01, 0x00, 0xd8, 0x89, 0x9b, 0x40,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4c, 0x89, 0xd0, 0x01, 0x00,</div><div class='add'>+	0xda, 0x89, 0x1f, 0x44, 0x80, 0x32, 0x00, 0x00, 0xe3, 0x89, 0x00, 0x40,</div><div class='add'>+	0x47, 0x31, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41, 0x89, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xe3, 0x89, 0x00, 0x48, 0x47, 0x31, 0x01, 0x00, 0xe3, 0x89, 0x00, 0x58,</div><div class='add'>+	0x47, 0x31, 0x01, 0x00, 0x1b, 0x84, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x10, 0x00, 0x00, 0x40, 0x86, 0xf4, 0x01, 0x00, 0x6f, 0x00, 0x00, 0x43,</div><div class='add'>+	0x86, 0x88, 0x01, 0x00, 0x1b, 0x84, 0x26, 0x05, 0x47, 0x31, 0x00, 0x00,</div><div class='add'>+	0xe3, 0x89, 0x00, 0x41, 0x89, 0x30, 0x01, 0x00, 0x1b, 0x84, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x44, 0xf0, 0x41, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x80, 0x41,</div><div class='add'>+	0xe1, 0xc1, 0x01, 0x00, 0x04, 0x00, 0x00, 0xcb, 0x81, 0xc8, 0x01, 0x00,</div><div class='add'>+	0xe9, 0x89, 0x22, 0x40, 0xf2, 0x7f, 0x00, 0x00, 0x81, 0x80, 0x00, 0x6f,</div><div class='add'>+	0x97, 0x33, 0x01, 0x00, 0xeb, 0x89, 0x22, 0x40, 0x73, 0x7d, 0x00, 0x00,</div><div class='add'>+	0x9b, 0x80, 0x00, 0x41, 0x8b, 0xb3, 0x00, 0x00, 0xe6, 0x89, 0x22, 0x59,</div><div class='add'>+	0x73, 0x7d, 0x00, 0x00, 0x79, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00,</div><div class='add'>+	0xe6, 0x89, 0x28, 0xb1, 0x7e, 0x31, 0x00, 0x00, 0xec, 0x89, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x22, 0xc0, 0x95, 0x30, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xd6, 0x97, 0xb0, 0x01, 0x00, 0xf4, 0x89, 0x22, 0x5d,</div><div class='add'>+	0x73, 0x7d, 0x00, 0x00, 0x7d, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00,</div><div class='add'>+	0xf2, 0x89, 0xa8, 0xb1, 0x80, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5e,</div><div class='add'>+	0x7f, 0x83, 0x01, 0x00, 0x00, 0x00, 0x00, 0xbf, 0xc5, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0x98, 0x01, 0x00, 0x25, 0x01, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0xf7, 0x89, 0xa2, 0x41, 0x81, 0x50, 0x00, 0x00,</div><div class='add'>+	0xf9, 0x89, 0x43, 0x5f, 0x7f, 0x13, 0x00, 0x00, 0x26, 0x01, 0x00, 0xbf,</div><div class='add'>+	0xc5, 0x31, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5f, 0x7f, 0x83, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x5e, 0x7f, 0x93, 0x01, 0x00, 0x75, 0x98, 0x00, 0xbf,</div><div class='add'>+	0xc5, 0x31, 0x01, 0x00, 0x1b, 0x84, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x06, 0x8a, 0x9c, 0x0f, 0x80, 0x32, 0x00, 0x00, 0x00, 0x80, 0x00, 0x10,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0x06, 0x8a, 0x22, 0x40, 0xe3, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x45, 0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x03, 0x8a, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x1b, 0x84, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x62, 0x95, 0x22, 0x02,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x07, 0x8a, 0x42, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x44, 0x93, 0x93, 0x01, 0x00, 0x62, 0x95, 0x1a, 0x02,</div><div class='add'>+	0x68, 0x97, 0x00, 0x00, 0x11, 0x8a, 0x9c, 0x0f, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x80, 0x00, 0x10, 0x42, 0xc9, 0x01, 0x00, 0x11, 0x8a, 0x22, 0x40,</div><div class='add'>+	0xe3, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x45, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00, 0x0e, 0x8a, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x1b, 0x84, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x6c, 0x95, 0x22, 0x02, 0x80, 0x32, 0x00, 0x00, 0x12, 0x8a, 0x42, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x93, 0x93, 0x01, 0x00,</div><div class='add'>+	0x6c, 0x95, 0x1a, 0x02, 0x68, 0x97, 0x00, 0x00, 0x1c, 0x8a, 0x9c, 0x0f,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x00, 0x80, 0x00, 0x10, 0x42, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x1c, 0x8a, 0x22, 0x40, 0xe3, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x45,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0x19, 0x8a, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0x1b, 0x84, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x6f, 0x84, 0x22, 0x02, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x1d, 0x8a, 0x42, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0x93, 0x93, 0x01, 0x00, 0x00, 0x00, 0x1a, 0x02, 0x68, 0x97, 0x01, 0x00,</div><div class='add'>+	0x6f, 0x84, 0x00, 0x40, 0x05, 0xb0, 0x00, 0x00, 0x00, 0x80, 0x00, 0xa6,</div><div class='add'>+	0x56, 0xb1, 0x01, 0x00, 0x56, 0x95, 0x2f, 0x40, 0x05, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x6d, 0x8a, 0xa2, 0x40, 0xe7, 0x6d, 0x00, 0x00, 0xb8, 0x94, 0x29, 0x41,</div><div class='add'>+	0xe7, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x54, 0xef, 0x93, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf2, 0x0e, 0xb0, 0x01, 0x00, 0x29, 0x00, 0x00, 0x40,</div><div class='add'>+	0x0d, 0x98, 0x01, 0x00, 0x09, 0x00, 0x00, 0x07, 0x12, 0xe4, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xa7, 0x13, 0xc0, 0x01, 0x00, 0x03, 0x00, 0x00, 0x07,</div><div class='add'>+	0x1a, 0xf4, 0x01, 0x00, 0x07, 0x00, 0x00, 0x07, 0x16, 0x88, 0x01, 0x00,</div><div class='add'>+	0xff, 0xff, 0x00, 0x10, 0x34, 0xd8, 0x01, 0x00, 0x00, 0x00, 0x00, 0x03,</div><div class='add'>+	0x34, 0x94, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x23, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x20, 0x18, 0x00, 0x40, 0x11, 0x98, 0x01, 0x00, 0x00, 0xb5, 0x00, 0x0d,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0x51, 0x8a, 0x22, 0x0b, 0xe6, 0x7d, 0x00, 0x00,</div><div class='add'>+	0x32, 0x8a, 0x44, 0x40, 0x81, 0x32, 0x00, 0x00, 0xff, 0xff, 0x00, 0x07,</div><div class='add'>+	0x84, 0x89, 0x01, 0x00, 0x39, 0x8a, 0x05, 0xc2, 0x24, 0x30, 0x00, 0x00,</div><div class='add'>+	0x51, 0x98, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x2d, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x6e, 0x8a, 0x1c, 0xf0, 0x18, 0x30, 0x01, 0x00,</div><div class='add'>+	0x51, 0x8a, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x48, 0x8a, 0xa0, 0x48, 0x23, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x50, 0x35, 0xd0, 0x01, 0x00, 0x00, 0x80, 0x00, 0x1a,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0x42, 0x8a, 0x22, 0x40, 0xe3, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x42, 0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x1a,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x3f, 0x8a, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x1b, 0x84, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x20, 0x98, 0x00, 0x40,</div><div class='add'>+	0x43, 0x99, 0x01, 0x00, 0x6e, 0x8a, 0x00, 0xf8, 0x18, 0x30, 0x01, 0x00,</div><div class='add'>+	0x43, 0x8a, 0xa2, 0x41, 0x23, 0x50, 0x00, 0x00, 0xff, 0xff, 0x00, 0x10,</div><div class='add'>+	0x34, 0xd8, 0x01, 0x00, 0x00, 0x00, 0x00, 0x03, 0x34, 0x94, 0x01, 0x00,</div><div class='add'>+	0x20, 0x18, 0x00, 0x40, 0x11, 0x98, 0x01, 0x00, 0x00, 0x00, 0x2e, 0x1a,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x08, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x42,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x20, 0x00, 0x00, 0x1a, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0x4c, 0x8a, 0xa8, 0x09, 0xe0, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x23, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x50, 0x35, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x44, 0x11, 0xc0, 0x01, 0x00, 0x5d, 0x8a, 0x22, 0x41,</div><div class='add'>+	0x0d, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x0f, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x59, 0x8a, 0xa0, 0xaa, 0x0f, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x0f, 0xb0, 0x01, 0x00, 0x09, 0x00, 0x00, 0x07, 0x12, 0xe4, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xa7, 0x13, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x1b, 0xb0, 0x01, 0x00, 0x30, 0x8a, 0x00, 0x41, 0x17, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x02, 0x00, 0x09, 0x12, 0xc8, 0x01, 0x00, 0x30, 0x8a, 0x83, 0x41,</div><div class='add'>+	0x17, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x17, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x30, 0x8a, 0x00, 0x41, 0x1b, 0xc0, 0x00, 0x00, 0x68, 0x8a, 0x23, 0x40,</div><div class='add'>+	0x23, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x35, 0xd0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x80, 0x00, 0x1a, 0x42, 0xc9, 0x01, 0x00, 0x65, 0x8a, 0x22, 0x40,</div><div class='add'>+	0xe3, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x1a, 0x62, 0xdd, 0x01, 0x00, 0x62, 0x8a, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x1b, 0x84, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x20, 0x98, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00, 0x6e, 0x8a, 0x00, 0xf8,</div><div class='add'>+	0x18, 0x30, 0x01, 0x00, 0x66, 0x8a, 0xa2, 0x41, 0x23, 0x50, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x0f, 0xc0, 0x01, 0x00, 0x6b, 0x8a, 0xa0, 0xaa,</div><div class='add'>+	0x0f, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x0f, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xb8, 0x94, 0x20, 0x07, 0xe4, 0xb1, 0x01, 0x00, 0x56, 0x95, 0x20, 0x40,</div><div class='add'>+	0xe7, 0xb1, 0x01, 0x00, 0xff, 0x89, 0x00, 0x40, 0x0f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xff, 0xff, 0x00, 0x0c, 0x80, 0xd8, 0x01, 0x00, 0xc0, 0x02, 0x00, 0x0c,</div><div class='add'>+	0x7e, 0x89, 0x01, 0x00, 0x80, 0x8a, 0x26, 0x54, 0x61, 0x31, 0x00, 0x00,</div><div class='add'>+	0x76, 0x8a, 0x87, 0x0c, 0x80, 0x32, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x40,</div><div class='add'>+	0x62, 0x99, 0x01, 0x00, 0x76, 0x8a, 0x28, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x76, 0x8a, 0xa2, 0x54, 0x77, 0x7d, 0x00, 0x00, 0x72, 0x8a, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x7b, 0x8a, 0x22, 0x46, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x0d, 0x00, 0x00, 0x40, 0x62, 0x99, 0x01, 0x00, 0x00, 0x00, 0xa8, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0xa2, 0x54, 0x77, 0x7d, 0x01, 0x00,</div><div class='add'>+	0x77, 0x8a, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x80, 0x8a, 0x22, 0x49,</div><div class='add'>+	0x19, 0x7c, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x40, 0x62, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0xa8, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0xa2, 0x54,</div><div class='add'>+	0x77, 0x7d, 0x01, 0x00, 0x7b, 0x8a, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x10, 0x00, 0x00, 0x40, 0x62, 0x99, 0x01, 0x00, 0x00, 0x00, 0xa8, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0xa2, 0x54, 0x77, 0x7d, 0x01, 0x00,</div><div class='add'>+	0x80, 0x8a, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x30, 0x94, 0x2f, 0x55,</div><div class='add'>+	0xf1, 0x93, 0x01, 0x00, 0x00, 0x40, 0x00, 0xa6, 0x56, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x6f, 0x84, 0xa2, 0x41, 0xe5, 0x51, 0x00, 0x00, 0x64, 0x00, 0x00, 0x40,</div><div class='add'>+	0xe5, 0x99, 0x01, 0x00, 0x88, 0x8a, 0x42, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x8b, 0x8a, 0xa2, 0x93, 0x57, 0x6f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x57, 0xc3, 0x01, 0x00, 0x00, 0x00, 0x1a, 0xab, 0x27, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x6f, 0x84, 0x22, 0x50, 0xfd, 0x7f, 0x00, 0x00, 0x6f, 0x84, 0x22, 0x51,</div><div class='add'>+	0xfd, 0x7f, 0x00, 0x00, 0x6f, 0x84, 0xa2, 0x41, 0x1d, 0x53, 0x00, 0x00,</div><div class='add'>+	0x50, 0x46, 0x00, 0x40, 0x1d, 0x9b, 0x01, 0x00, 0x34, 0x82, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x0e, 0x00, 0x00, 0x48, 0xb2, 0xcb, 0x01, 0x00,</div><div class='add'>+	0xfc, 0x81, 0x00, 0x40, 0x49, 0x31, 0x01, 0x00, 0x97, 0x8a, 0x22, 0x40,</div><div class='add'>+	0xb5, 0x6f, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x48, 0xb2, 0xcb, 0x01, 0x00,</div><div class='add'>+	0xff, 0x81, 0x00, 0x41, 0xb5, 0x53, 0x01, 0x00, 0x6f, 0x84, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x51, 0xfd, 0x83, 0x01, 0x00,</div><div class='add'>+	0x40, 0x16, 0x00, 0x40, 0x45, 0x99, 0x01, 0x00, 0x35, 0x82, 0x00, 0x40,</div><div class='add'>+	0x49, 0x31, 0x01, 0x00, 0x1e, 0x00, 0x00, 0x48, 0xb2, 0xcb, 0x01, 0x00,</div><div class='add'>+	0xfc, 0x81, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0xda,</div><div class='add'>+	0x91, 0xc0, 0x01, 0x00, 0x04, 0x00, 0x00, 0x48, 0xb2, 0xcb, 0x01, 0x00,</div><div class='add'>+	0xff, 0x81, 0x00, 0x40, 0xb5, 0x33, 0x01, 0x00, 0x60, 0x16, 0x20, 0x40,</div><div class='add'>+	0xe5, 0xb1, 0x01, 0x00, 0xdb, 0x82, 0x00, 0x40, 0xb5, 0x33, 0x01, 0x00,</div><div class='add'>+	0x08, 0x00, 0x00, 0x48, 0xb2, 0xcb, 0x01, 0x00, 0xff, 0xff, 0x00, 0x4a,</div><div class='add'>+	0xb4, 0x8b, 0x01, 0x00, 0xff, 0x81, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x0a, 0x00, 0x00, 0x48, 0xb2, 0xcb, 0x01, 0x00, 0x10, 0x00, 0x00, 0x4a,</div><div class='add'>+	0xb4, 0xf7, 0x01, 0x00, 0xff, 0x81, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x6f, 0x84, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x05, 0x00, 0x00, 0x40,</div><div class='add'>+	0x43, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf3, 0x08, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x20, 0x40, 0xe6, 0xb1, 0x01, 0x00, 0x03, 0x00, 0x00, 0x40,</div><div class='add'>+	0x96, 0xe4, 0x01, 0x00, 0x00, 0x00, 0x00, 0x04, 0x96, 0xc0, 0x01, 0x00,</div><div class='add'>+	0xae, 0x8a, 0x00, 0x4b, 0x10, 0xc9, 0x00, 0x00, 0xd1, 0x8d, 0x00, 0x41,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x05, 0x8e, 0x00, 0x41,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x37, 0x8e, 0x00, 0x45,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x37, 0x8e, 0x00, 0x45, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x37, 0x8e, 0x00, 0x45, 0x09, 0xb0, 0x00, 0x00, 0x37, 0x8e, 0x00, 0x45,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x76, 0x8e, 0x00, 0x43, 0x09, 0xb0, 0x00, 0x00, 0x9f, 0x8e, 0x00, 0x43,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0xa3, 0x8e, 0x00, 0x44, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x0b, 0x90, 0x00, 0x45, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xaf, 0x8e, 0x00, 0x43, 0x09, 0xb0, 0x00, 0x00, 0xae, 0x8e, 0x00, 0x43,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0xcf, 0x8d, 0x00, 0x45, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x6f, 0x8f, 0x00, 0x42,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x6f, 0x8f, 0x00, 0x43, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x6f, 0x8f, 0x00, 0x44, 0x09, 0xb0, 0x00, 0x00, 0xcf, 0x8d, 0x00, 0x45,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x9b, 0x8f, 0x00, 0x43,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xcf, 0x8d, 0x00, 0x45, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xb9, 0x8f, 0x00, 0x43, 0x09, 0xb0, 0x00, 0x00, 0xb9, 0x8f, 0x00, 0x44,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0xcf, 0x8d, 0x00, 0x45, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0xb9, 0x8f, 0x00, 0x42, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0xcf, 0x8d, 0x00, 0x45,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0xe1, 0x8f, 0x00, 0x44,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xcf, 0x8d, 0x00, 0x45, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0xcf, 0x8d, 0x00, 0x42, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xf2, 0x8f, 0x00, 0x45, 0x09, 0xb0, 0x00, 0x00, 0xf2, 0x8f, 0x00, 0x45,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0xcf, 0x8d, 0x00, 0x45, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0xf4, 0x8f, 0x00, 0x42,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0xf4, 0x8f, 0x00, 0x43, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xf4, 0x8f, 0x00, 0x44, 0x09, 0xb0, 0x00, 0x00, 0xf4, 0x8f, 0x00, 0x45,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0xfc, 0x8f, 0x00, 0x44, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xcf, 0x8d, 0x00, 0x45, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x0d, 0x90, 0x00, 0x42, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xfd, 0x8f, 0x00, 0x43, 0x09, 0xb0, 0x00, 0x00, 0x0d, 0x90, 0x00, 0x44,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0xcf, 0x8d, 0x00, 0x45, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x0e, 0x90, 0x00, 0x43, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x90, 0x00, 0x44, 0x09, 0xb0, 0x00, 0x00, 0xcf, 0x8d, 0x00, 0x45,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0xcf, 0x8d, 0x00, 0x41, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x6d, 0x8f, 0x00, 0x42, 0x09, 0xb0, 0x00, 0x00, 0x6d, 0x8f, 0x00, 0x43,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x6d, 0x8f, 0x00, 0x44, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xcf, 0x8d, 0x00, 0x45, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0xcf, 0x8d, 0x00, 0x41,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x0f, 0x90, 0x00, 0x42, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x0f, 0x90, 0x00, 0x43, 0x09, 0xb0, 0x00, 0x00, 0x0f, 0x90, 0x00, 0x44,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0xcf, 0x8d, 0x00, 0x45, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x16, 0x90, 0x00, 0x45,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x18, 0x90, 0x00, 0x42, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x24, 0x90, 0x00, 0x43, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x8d, 0x90, 0x00, 0x43, 0x09, 0xb0, 0x00, 0x00, 0xa3, 0x8e, 0x00, 0x44,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x0b, 0x90, 0x00, 0x45, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x95, 0x90, 0x00, 0x43, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xa3, 0x8e, 0x00, 0x44, 0x09, 0xb0, 0x00, 0x00, 0x0b, 0x90, 0x00, 0x45,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0xa6, 0x90, 0x00, 0x43,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xcf, 0x8d, 0x00, 0x45, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x73, 0x8e, 0x00, 0x43, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x91, 0x90, 0x00, 0x43, 0x09, 0xb0, 0x00, 0x00, 0xa3, 0x8e, 0x00, 0x44,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x0b, 0x90, 0x00, 0x45, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x07, 0x00, 0x2d, 0x05, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf3, 0x08, 0xb0, 0x01, 0x00, 0x06, 0x00, 0x20, 0x47,</div><div class='add'>+	0xe6, 0xb1, 0x01, 0x00, 0x04, 0x00, 0x00, 0x47, 0x96, 0xe4, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x47, 0x96, 0xd0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x47,</div><div class='add'>+	0x96, 0xd0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x04, 0x96, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x6e, 0x8b, 0x00, 0x4b, 0x10, 0xc9, 0x00, 0x00, 0xbe, 0x90, 0x00, 0x49,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0xf7, 0x90, 0x00, 0x42,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xfd, 0x90, 0x00, 0x46, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x0b, 0x91, 0x00, 0x42, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x2c, 0x91, 0x00, 0x42, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x27, 0x91, 0x00, 0x4a, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x2f, 0x91, 0x00, 0x43, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x87, 0x91, 0x00, 0x44,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x86, 0x91, 0x00, 0x4b, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x91, 0x00, 0x41, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x00, 0x91, 0x00, 0x43, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x91, 0x00, 0x44, 0x09, 0xb0, 0x00, 0x00, 0x00, 0x91, 0x00, 0x45,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x00, 0x91, 0x00, 0x46, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x91, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00, 0x00, 0x91, 0x00, 0x48,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x00, 0x91, 0x00, 0x49, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x91, 0x00, 0x4a, 0x09, 0xb0, 0x00, 0x00, 0x00, 0x91, 0x00, 0x4b,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x00, 0x91, 0x00, 0x4c, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x91, 0x00, 0x4d, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xe6, 0x91, 0x00, 0x42, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0xe6, 0x91, 0x00, 0x44, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xe6, 0x91, 0x00, 0x4b, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xfe, 0x91, 0x00, 0x45, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x15, 0x92, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0xf2, 0x91, 0x00, 0x45,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x6a, 0x94, 0x00, 0x46,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x2c, 0x91, 0x00, 0x46,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x0b, 0x91, 0x00, 0x46, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x25, 0x91, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00, 0x25, 0x91, 0x00, 0x48,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x27, 0x91, 0x00, 0x4a, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x87, 0x91, 0x00, 0x45, 0x09, 0xb0, 0x00, 0x00, 0x2f, 0x91, 0x00, 0x43,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x25, 0x91, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x25, 0x91, 0x00, 0x48, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x86, 0x91, 0x00, 0x4c,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x1b, 0x92, 0x00, 0x44, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x1b, 0x92, 0x00, 0x42, 0x09, 0xb0, 0x00, 0x00, 0xba, 0x8d, 0x00, 0x47,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0xba, 0x8d, 0x00, 0x48, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x1b, 0x92, 0x00, 0x4b, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x91, 0x00, 0x41, 0x09, 0xb0, 0x00, 0x00, 0x3e, 0x92, 0x00, 0x47,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x26, 0x92, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x26, 0x92, 0x00, 0x47,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x26, 0x92, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00, 0x3e, 0x92, 0x00, 0x47,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x25, 0x91, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x25, 0x91, 0x00, 0x48, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x26, 0x92, 0x00, 0x47,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x4d, 0x92, 0x00, 0x47,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x4d, 0x92, 0x00, 0x48, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xaf, 0x92, 0x00, 0x40, 0x09, 0xb0, 0x00, 0x00, 0xcc, 0x92, 0x00, 0x47,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0xc0, 0x92, 0x00, 0x48, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x1e, 0x92, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00, 0x1e, 0x92, 0x00, 0x47,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0xcc, 0x92, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xd3, 0x92, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00, 0xd3, 0x92, 0x00, 0x48,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xc0, 0x92, 0x00, 0x48, 0x09, 0xb0, 0x00, 0x00, 0x1e, 0x92, 0x00, 0x47,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x1e, 0x92, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xc0, 0x92, 0x00, 0x48, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0xe6, 0x91, 0x00, 0x43,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xe6, 0x91, 0x00, 0x45, 0x09, 0xb0, 0x00, 0x00, 0xe6, 0x91, 0x00, 0x46,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x25, 0x91, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x25, 0x91, 0x00, 0x48, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0xe6, 0x91, 0x00, 0x4a, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0xe6, 0x91, 0x00, 0x4c,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x3d, 0x92, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x31, 0x92, 0x00, 0x48, 0x09, 0xb0, 0x00, 0x00, 0x25, 0x92, 0x00, 0x47,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x25, 0x92, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x3d, 0x92, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00, 0xba, 0x8d, 0x00, 0x47,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0xba, 0x8d, 0x00, 0x48, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x31, 0x92, 0x00, 0x48,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x25, 0x92, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x25, 0x92, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00, 0x31, 0x92, 0x00, 0x48,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0xd5, 0x92, 0x00, 0x42,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xd5, 0x92, 0x00, 0x44, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0xd5, 0x92, 0x00, 0x4b,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0xd5, 0x92, 0x00, 0x43,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xd5, 0x92, 0x00, 0x45, 0x09, 0xb0, 0x00, 0x00, 0xd5, 0x92, 0x00, 0x46,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0xd5, 0x92, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xd5, 0x92, 0x00, 0x48, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0xd5, 0x92, 0x00, 0x4a, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0xd5, 0x92, 0x00, 0x4c,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0xd5, 0x92, 0x00, 0x4c, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xef, 0x92, 0x00, 0x46, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x15, 0x92, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0xef, 0x92, 0x00, 0x46,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0xf6, 0x93, 0x00, 0x46, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x15, 0x92, 0x00, 0x47,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xf6, 0x93, 0x00, 0x46, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xf6, 0x93, 0x00, 0x46, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x19, 0x94, 0x00, 0x42, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x18, 0x94, 0x00, 0x4a, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x19, 0x94, 0x00, 0x46, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x25, 0x91, 0x00, 0x47,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x25, 0x91, 0x00, 0x48, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x18, 0x94, 0x00, 0x4a, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0xe0, 0x92, 0x00, 0x41, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xec, 0x92, 0x00, 0x42, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0xec, 0x92, 0x00, 0x44, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xec, 0x92, 0x00, 0x4b, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xec, 0x92, 0x00, 0x43, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0xec, 0x92, 0x00, 0x45, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xec, 0x92, 0x00, 0x46, 0x09, 0xb0, 0x00, 0x00, 0xec, 0x92, 0x00, 0x47,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0xec, 0x92, 0x00, 0x48, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xec, 0x92, 0x00, 0x4c, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0xfe, 0x91, 0x00, 0x4c, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x15, 0x92, 0x00, 0x47,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xf2, 0x91, 0x00, 0x4c, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xb8, 0x94, 0x00, 0x46, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x5f, 0x94, 0x00, 0x42, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x5f, 0x94, 0x00, 0x44, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x5f, 0x94, 0x00, 0x4b, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x5f, 0x94, 0x00, 0x45, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x5f, 0x94, 0x00, 0x46, 0x09, 0xb0, 0x00, 0x00, 0x25, 0x91, 0x00, 0x47,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x25, 0x91, 0x00, 0x48, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x5f, 0x94, 0x00, 0x4c, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0xf2, 0x91, 0x00, 0x42,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x6a, 0x94, 0x00, 0x46, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0xf2, 0x91, 0x00, 0x46, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x15, 0x92, 0x00, 0x47,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x6a, 0x94, 0x00, 0x46, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x6a, 0x94, 0x00, 0x46, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x6e, 0x94, 0x00, 0x43,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x15, 0x92, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0xb0, 0x94, 0x00, 0x4a, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x6e, 0x94, 0x00, 0x4d, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x7f, 0x94, 0x00, 0x43,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x5d, 0x94, 0x00, 0x4a, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x7f, 0x94, 0x00, 0x43,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x25, 0x91, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00, 0x25, 0x91, 0x00, 0x48,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x5d, 0x94, 0x00, 0x4a, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x90, 0x94, 0x00, 0x43,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x15, 0x92, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x90, 0x94, 0x00, 0x43, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x90, 0x94, 0x00, 0x4d, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x0b, 0x91, 0x00, 0x42, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x2c, 0x91, 0x00, 0x42,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0xae, 0x94, 0x00, 0x42, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x2c, 0x91, 0x00, 0x46,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x0b, 0x91, 0x00, 0x46, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x25, 0x91, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00, 0x25, 0x91, 0x00, 0x48,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0xae, 0x94, 0x00, 0x46, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0xb0, 0x94, 0x00, 0x4a,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x15, 0x92, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0xb0, 0x94, 0x00, 0x4a, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x6b, 0x94, 0x00, 0x46, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x6b, 0x94, 0x00, 0x46, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x15, 0x92, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x6b, 0x94, 0x00, 0x46,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x6b, 0x94, 0x00, 0x46,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xb6, 0x94, 0x00, 0x42, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x5d, 0x94, 0x00, 0x4a,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xb6, 0x94, 0x00, 0x46, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x25, 0x91, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x25, 0x91, 0x00, 0x48, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x5d, 0x94, 0x00, 0x4a,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x2f, 0x91, 0x00, 0x4d, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x2f, 0x91, 0x00, 0x4d, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x25, 0x91, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00, 0x25, 0x91, 0x00, 0x48,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x07, 0x00, 0x2e, 0x4b,</div><div class='add'>+	0x19, 0x90, 0x01, 0x00, 0x0a, 0x8a, 0x00, 0x04, 0xe6, 0xb1, 0x00, 0x00,</div><div class='add'>+	0xba, 0x8d, 0x22, 0x42, 0x19, 0x7c, 0x00, 0x00, 0xaf, 0x97, 0x00, 0x3a,</div><div class='add'>+	0x81, 0x30, 0x01, 0x00, 0xba, 0x8d, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xba, 0x8d, 0x22, 0x42, 0x19, 0x7c, 0x00, 0x00, 0xff, 0x1f, 0x00, 0x0f,</div><div class='add'>+	0x1e, 0x8c, 0x01, 0x00, 0x21, 0x97, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0xca, 0x8d, 0x9c, 0x0f, 0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5c,</div><div class='add'>+	0x1f, 0x80, 0x01, 0x00, 0x00, 0x80, 0x00, 0x10, 0x42, 0xc9, 0x01, 0x00,</div><div class='add'>+	0xca, 0x8d, 0x22, 0x40, 0xe3, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x45,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0xc7, 0x8d, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0x1b, 0x84, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x13, 0x86, 0x22, 0x02, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0xcb, 0x8d, 0x42, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0x93, 0x93, 0x01, 0x00, 0x00, 0x00, 0x1a, 0x02, 0x68, 0x97, 0x01, 0x00,</div><div class='add'>+	0x13, 0x86, 0x00, 0x40, 0x05, 0xb0, 0x00, 0x00, 0x05, 0x00, 0x2e, 0x4b,</div><div class='add'>+	0x19, 0x90, 0x01, 0x00, 0x0a, 0x8a, 0x00, 0x04, 0xe6, 0xb1, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x87, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x8d, 0xb0, 0x01, 0x00, 0x00, 0x80, 0x00, 0x03, 0x42, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0xa1, 0x44, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0,</div><div class='add'>+	0xe0, 0xb1, 0x01, 0x00, 0x3d, 0x99, 0x00, 0x06, 0x07, 0x40, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x06, 0x07, 0xd0, 0x01, 0x00, 0xd4, 0x00, 0x2e, 0x5c,</div><div class='add'>+	0x1f, 0x90, 0x01, 0x00, 0x00, 0x00, 0x00, 0x07, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x0c, 0x80, 0x00, 0x03, 0x42, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xfe, 0x96, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xfe,</div><div class='add'>+	0x96, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x00, 0xfe,</div><div class='add'>+	0x96, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x96, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf0, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x00, 0xfa, 0x96, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xfe, 0x96, 0xc0, 0x01, 0x00, 0x00, 0x30, 0x00, 0x4b,</div><div class='add'>+	0x94, 0x88, 0x01, 0x00, 0x00, 0x00, 0x00, 0x46, 0x95, 0xf0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4a, 0x96, 0xc0, 0x01, 0x00, 0x5e, 0x01, 0x2e, 0x34,</div><div class='add'>+	0x97, 0x84, 0x01, 0x00, 0x02, 0x00, 0x00, 0x4b, 0xe4, 0xe5, 0x01, 0x00,</div><div class='add'>+	0x64, 0x01, 0x20, 0x40, 0xe1, 0xb1, 0x01, 0x00, 0x09, 0x00, 0x00, 0x07,</div><div class='add'>+	0x86, 0xe4, 0x01, 0x00, 0x00, 0x00, 0x2e, 0xa7, 0x87, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x10, 0x00, 0x00, 0x10, 0x48, 0xc9, 0x01, 0x00, 0x10, 0x00, 0x00, 0x40,</div><div class='add'>+	0xf1, 0x99, 0x01, 0x00, 0x58, 0x01, 0x00, 0x43, 0xf0, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x58, 0x01, 0x00, 0x05, 0xe0, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0xa0, 0x00, 0x00, 0xa4, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0xf4, 0x8d, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x1a, 0x00, 0x00, 0x40, 0x97, 0x98, 0x01, 0x00,</div><div class='add'>+	0x08, 0x00, 0x2e, 0x40, 0x95, 0xb0, 0x01, 0x00, 0xfc, 0x8d, 0x20, 0x4b,</div><div class='add'>+	0x94, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xf9, 0x8d, 0x00, 0x41, 0x95, 0xc0, 0x00, 0x00, 0x10, 0x80, 0x00, 0x10,</div><div class='add'>+	0x44, 0xc9, 0x01, 0x00, 0x03, 0x8e, 0x22, 0x40, 0xe3, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x44, 0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0xff, 0x8d, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x1b, 0x84, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0xaf, 0x97, 0x00, 0x40, 0x81, 0x30, 0x01, 0x00,</div><div class='add'>+	0xcf, 0x8d, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x0c, 0x80, 0x00, 0x03,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x86, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf8, 0x88, 0xb0, 0x01, 0x00, 0x08, 0x8e, 0x42, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x0b, 0x8e, 0xa2, 0x4c, 0xfd, 0x7f, 0x00, 0x00,</div><div class='add'>+	0x0c, 0x8e, 0x00, 0x4c, 0xfd, 0x93, 0x00, 0x00, 0x0d, 0x8e, 0x20, 0xf0,</div><div class='add'>+	0x56, 0x6f, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x56, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x1a, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x80, 0x00, 0x10,</div><div class='add'>+	0x44, 0xc9, 0x01, 0x00, 0x64, 0x00, 0x00, 0x40, 0xf1, 0x99, 0x01, 0x00,</div><div class='add'>+	0x70, 0x00, 0x00, 0x05, 0xf0, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x43,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x47, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x20, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00, 0x13, 0x8e, 0xa8, 0x44,</div><div class='add'>+	0xe0, 0x31, 0x00, 0x00, 0x10, 0x00, 0x00, 0x10, 0x8c, 0xc8, 0x01, 0x00,</div><div class='add'>+	0x00, 0x80, 0x00, 0x46, 0x44, 0xc9, 0x01, 0x00, 0x40, 0x00, 0x00, 0x40,</div><div class='add'>+	0xf1, 0x99, 0x01, 0x00, 0x68, 0x01, 0x00, 0x05, 0xf0, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x64, 0x00, 0x00, 0x43, 0xf0, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x47,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x46, 0x62, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x1b, 0x8e, 0xa8, 0x44, 0xe0, 0x31, 0x00, 0x00, 0x1b, 0x84, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x09, 0x00, 0x00, 0x07, 0x86, 0xe4, 0x01, 0x00,</div><div class='add'>+	0x38, 0x00, 0x2e, 0xa7, 0x87, 0xc0, 0x01, 0x00, 0x8b, 0x00, 0x2d, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x23, 0x8e, 0x22, 0x43, 0xe7, 0x7d, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x44, 0x45, 0xc1, 0x01, 0x00, 0x26, 0x8e, 0x22, 0x44,</div><div class='add'>+	0xe7, 0x7d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4c, 0x45, 0xc1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4a, 0x19, 0x90, 0x01, 0x00, 0x68, 0x01, 0x20, 0xa2,</div><div class='add'>+	0xe4, 0xb1, 0x01, 0x00, 0x88, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00,</div><div class='add'>+	0x2a, 0x8e, 0x23, 0x0b, 0xe5, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x19, 0x90, 0x01, 0x00, 0x00, 0x80, 0x00, 0x10, 0x44, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x50, 0x00, 0x00, 0x40, 0xf1, 0x99, 0x01, 0x00, 0x58, 0x01, 0x00, 0x43,</div><div class='add'>+	0xf0, 0xc9, 0x01, 0x00, 0x58, 0x01, 0x00, 0x05, 0xe0, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x44, 0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xb1, 0x01, 0x00, 0x2f, 0x8e, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x1b, 0x84, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x5c, 0x00, 0x2e, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x00, 0x80, 0x00, 0x03, 0x42, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x60, 0xf0, 0x96, 0xb0, 0x01, 0x00, 0xaf, 0x97, 0x00, 0x41,</div><div class='add'>+	0x81, 0x30, 0x01, 0x00, 0xcf, 0x8d, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x3a, 0x8e, 0xa2, 0x49, 0x19, 0x7c, 0x00, 0x00, 0x86, 0x00, 0x00, 0x40,</div><div class='add'>+	0x47, 0x99, 0x01, 0x00, 0x3e, 0x8e, 0x00, 0x40, 0xe5, 0xb1, 0x00, 0x00,</div><div class='add'>+	0x86, 0x00, 0x2f, 0x49, 0x19, 0x80, 0x01, 0x00, 0x3e, 0x8e, 0xa2, 0xf2,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x8b, 0x00, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x42, 0xe7, 0x91, 0x01, 0x00, 0x41, 0x8e, 0xa2, 0x46,</div><div class='add'>+	0x19, 0x7c, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00,</div><div class='add'>+	0x45, 0x8e, 0x00, 0x40, 0xe5, 0xb1, 0x00, 0x00, 0xa0, 0x00, 0x2f, 0x46,</div><div class='add'>+	0x19, 0x80, 0x01, 0x00, 0x45, 0x8e, 0xa2, 0xf2, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x8b, 0x00, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0xe7, 0x91, 0x01, 0x00, 0xa8, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00,</div><div class='add'>+	0x34, 0x00, 0x2d, 0xf0, 0x24, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xfb,</div><div class='add'>+	0x0c, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xfb, 0x10, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xfb, 0x12, 0xb0, 0x01, 0x00, 0x0f, 0x00, 0x00, 0xf3,</div><div class='add'>+	0x16, 0x88, 0x01, 0x00, 0x04, 0x00, 0x00, 0xf3, 0x14, 0xf4, 0x01, 0x00,</div><div class='add'>+	0x70, 0x8e, 0x26, 0x40, 0x81, 0x32, 0x00, 0x00, 0x58, 0x8e, 0x22, 0x0a,</div><div class='add'>+	0x16, 0x6c, 0x00, 0x00, 0x58, 0x00, 0x3d, 0x43, 0x13, 0xe0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf8, 0x82, 0xb0, 0x01, 0x00, 0x04, 0x00, 0x22, 0xf0,</div><div class='add'>+	0x84, 0x30, 0x00, 0x00, 0xe7, 0x98, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x1b, 0x84, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41, 0x13, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x57, 0x8e, 0xa0, 0x43, 0x13, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x13, 0xb0, 0x01, 0x00, 0x4d, 0x8e, 0x00, 0x41, 0x15, 0xd0, 0x00, 0x00,</div><div class='add'>+	0x70, 0x8e, 0x22, 0x0a, 0x80, 0x32, 0x00, 0x00, 0x58, 0x00, 0x3d, 0x43,</div><div class='add'>+	0x13, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x82, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x22, 0xf0, 0x84, 0x30, 0x00, 0x00, 0xe7, 0x98, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x40, 0x00, 0x20, 0x40, 0xe1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x1b, 0x84, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x70, 0x8e, 0x22, 0x41, 0x15, 0x50, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x11, 0xc0, 0x01, 0x00, 0x64, 0x8e, 0xa0, 0x43,</div><div class='add'>+	0x11, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x11, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x58, 0x00, 0x3d, 0x43, 0x11, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8,</div><div class='add'>+	0x36, 0xb0, 0x01, 0x00, 0x04, 0x00, 0x22, 0xf0, 0x00, 0x30, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x50, 0x83, 0xb0, 0x01, 0x00, 0xee, 0x97, 0x00, 0x47,</div><div class='add'>+	0x61, 0x31, 0x01, 0x00, 0x1b, 0x84, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x5f, 0x95, 0x00, 0x05, 0x48, 0x31, 0x01, 0x00, 0x00, 0x00, 0x00, 0x45,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0x6c, 0x8e, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0x1b, 0x84, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x60, 0x8e, 0x00, 0x05, 0x48, 0xb1, 0x00, 0x00,</div><div class='add'>+	0x37, 0x00, 0x20, 0x40, 0xe7, 0xb1, 0x01, 0x00, 0x20, 0x98, 0x00, 0x51,</div><div class='add'>+	0x81, 0x30, 0x01, 0x00, 0xcf, 0x8d, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x34, 0x00, 0x2e, 0x41, 0xf5, 0xb1, 0x01, 0x00, 0x00, 0x11, 0x00, 0x40,</div><div class='add'>+	0xe5, 0x99, 0x01, 0x00, 0x78, 0x8e, 0x00, 0x48, 0x19, 0x90, 0x00, 0x00,</div><div class='add'>+	0x34, 0x00, 0x2e, 0x41, 0xf5, 0xb1, 0x01, 0x00, 0x00, 0x11, 0x00, 0x40,</div><div class='add'>+	0xe5, 0x99, 0x01, 0x00, 0x00, 0x80, 0x00, 0x03, 0x42, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf8, 0x94, 0xb0, 0x01, 0x00, 0x7d, 0x8e, 0x22, 0x45,</div><div class='add'>+	0x23, 0x7c, 0x00, 0x00, 0xb0, 0x00, 0x2f, 0xf0, 0x8c, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x60, 0xf0, 0x8c, 0xc0, 0x01, 0x00, 0x90, 0x00, 0x00, 0x40,</div><div class='add'>+	0x43, 0x99, 0x01, 0x00, 0x35, 0x00, 0x2d, 0xf0, 0x8c, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x58, 0x00, 0x3e, 0x43, 0xe7, 0xe1, 0x01, 0x00, 0x82, 0x8e, 0x22, 0x48,</div><div class='add'>+	0x19, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x8d, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x68, 0x0a, 0x8c, 0xc0, 0x01, 0x00, 0x38, 0x00, 0x2a, 0x4a,</div><div class='add'>+	0xe0, 0xb1, 0x01, 0x00, 0x28, 0x00, 0x00, 0x00, 0xe0, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x3c, 0x00, 0x20, 0x1b, 0xe0, 0xb1, 0x01, 0x00, 0x10, 0x80, 0x00, 0x03,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x38, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf8, 0x26, 0xb0, 0x01, 0x00, 0x04, 0x00, 0x22, 0xf8,</div><div class='add'>+	0x02, 0x30, 0x00, 0x00, 0x90, 0x8e, 0x23, 0x01, 0x14, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf8, 0x80, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8,</div><div class='add'>+	0x82, 0xb0, 0x01, 0x00, 0x4c, 0x00, 0x20, 0xf0, 0xe4, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x44, 0x00, 0x20, 0x40, 0xe0, 0xb1, 0x01, 0x00, 0x48, 0x00, 0x20, 0x41,</div><div class='add'>+	0xe0, 0xb1, 0x01, 0x00, 0xa8, 0x00, 0x2d, 0x10, 0x32, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x21, 0x99, 0x00, 0xf0, 0x24, 0x30, 0x01, 0x00, 0x99, 0x8e, 0xa2, 0x44,</div><div class='add'>+	0x81, 0x6c, 0x00, 0x00, 0x97, 0x8e, 0x22, 0x41, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x8a, 0x96, 0x00, 0x40, 0x3b, 0x30, 0x01, 0x00, 0xbd, 0x8e, 0xa2, 0x08,</div><div class='add'>+	0x3c, 0x30, 0x00, 0x00, 0x99, 0x8e, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xc7, 0x95, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0xbd, 0x8e, 0xa2, 0x08,</div><div class='add'>+	0x3c, 0x30, 0x00, 0x00, 0x50, 0x00, 0x20, 0x1c, 0xe0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x54, 0x00, 0x20, 0x13, 0xe0, 0xb1, 0x01, 0x00, 0x4e, 0x00, 0x20, 0x01,</div><div class='add'>+	0xe4, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x20, 0x0a, 0xe0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x20, 0x98, 0x00, 0x5f, 0x81, 0x30, 0x01, 0x00, 0xcf, 0x8d, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x37, 0x00, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00,</div><div class='add'>+	0x69, 0x96, 0x00, 0xf3, 0x94, 0x30, 0x01, 0x00, 0x78, 0x8e, 0x22, 0x4a,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0xa5, 0x8e, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x37, 0x00, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00, 0x69, 0x96, 0x00, 0xf3,</div><div class='add'>+	0x94, 0x30, 0x01, 0x00, 0x58, 0x00, 0x3e, 0x43, 0x97, 0xe0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x1b, 0xf0, 0xb1, 0x01, 0x00, 0x1f, 0x00, 0x60, 0x00,</div><div class='add'>+	0x00, 0x8c, 0x01, 0x00, 0xcf, 0x8d, 0x85, 0x11, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x04, 0x80, 0x00, 0x03, 0x42, 0xc9, 0x01, 0x00, 0xb0, 0x00, 0x2f, 0xf0,</div><div class='add'>+	0x8c, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x60, 0xf0, 0x8c, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x20, 0x98, 0x00, 0x5f, 0x81, 0x30, 0x01, 0x00, 0xcf, 0x8d, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0xaf, 0x8e, 0x00, 0x49, 0x19, 0x80, 0x00, 0x00,</div><div class='add'>+	0xb4, 0x8e, 0x22, 0x41, 0x19, 0x7c, 0x00, 0x00, 0x8a, 0x96, 0x00, 0x40,</div><div class='add'>+	0x3b, 0x30, 0x01, 0x00, 0xb8, 0x8e, 0xa2, 0x08, 0x3c, 0x30, 0x00, 0x00,</div><div class='add'>+	0x20, 0x98, 0x00, 0x5f, 0x81, 0x30, 0x01, 0x00, 0xcf, 0x8d, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0xc7, 0x95, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0xb8, 0x8e, 0xa2, 0x08, 0x3c, 0x30, 0x00, 0x00, 0x20, 0x98, 0x00, 0x5f,</div><div class='add'>+	0x81, 0x30, 0x01, 0x00, 0xcf, 0x8d, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x50, 0x00, 0x2d, 0x10, 0x32, 0xb0, 0x01, 0x00, 0x54, 0x00, 0x2d, 0xf0,</div><div class='add'>+	0x38, 0xb0, 0x01, 0x00, 0x4e, 0x00, 0x2d, 0xf0, 0x26, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x2d, 0xf2, 0x02, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0,</div><div class='add'>+	0x14, 0xb0, 0x01, 0x00, 0x30, 0x00, 0x00, 0x10, 0x8c, 0xc8, 0x01, 0x00,</div><div class='add'>+	0x00, 0x80, 0x00, 0x46, 0x44, 0xc9, 0x01, 0x00, 0x68, 0x01, 0x2d, 0x44,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x10, 0x00, 0x68, 0xf2, 0x80, 0xc8, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x08, 0xf0, 0xb1, 0x01, 0x00, 0x58, 0x01, 0x00, 0x05,</div><div class='add'>+	0xe0, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x0b, 0x37, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x36, 0xd0, 0x01, 0x00, 0x5c, 0x01, 0x2e, 0x40,</div><div class='add'>+	0x10, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x06, 0x80, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x52, 0x81, 0xd0, 0x01, 0x00, 0xcb, 0x8e, 0x20, 0x94,</div><div class='add'>+	0x81, 0x6c, 0x00, 0x00, 0xb5, 0x97, 0x00, 0x94, 0xe5, 0x31, 0x01, 0x00,</div><div class='add'>+	0xcc, 0x8e, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xb5, 0x97, 0x00, 0x40,</div><div class='add'>+	0xe4, 0x31, 0x01, 0x00, 0x20, 0x00, 0x00, 0x46, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0xcc, 0x8e, 0xa8, 0x40, 0x23, 0x30, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x0f,</div><div class='add'>+	0x1e, 0x8c, 0x01, 0x00, 0xdc, 0x8e, 0x82, 0x41, 0x23, 0x40, 0x00, 0x00,</div><div class='add'>+	0x20, 0x80, 0x00, 0x10, 0x42, 0xc9, 0x01, 0x00, 0xd6, 0x8e, 0x22, 0x40,</div><div class='add'>+	0xe3, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00, 0xd3, 0x8e, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x1b, 0x84, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x10, 0x48, 0xb1, 0x01, 0x00, 0xfb, 0x95, 0x00, 0x43,</div><div class='add'>+	0x23, 0x30, 0x01, 0x00, 0x00, 0x00, 0x00, 0x05, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x10, 0x32, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x23, 0xb0, 0x01, 0x00, 0x0e, 0x00, 0x00, 0x0f, 0x1e, 0x8c, 0x01, 0x00,</div><div class='add'>+	0x00, 0x80, 0x00, 0x19, 0x44, 0xc9, 0x01, 0x00, 0xe4, 0x8e, 0x22, 0x41,</div><div class='add'>+	0x19, 0x7c, 0x00, 0x00, 0xe0, 0x8e, 0xa3, 0x01, 0x0c, 0x6c, 0x00, 0x00,</div><div class='add'>+	0xe1, 0x8e, 0x00, 0x06, 0x04, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,</div><div class='add'>+	0x04, 0xb0, 0x01, 0x00, 0xe3, 0x8e, 0x20, 0x02, 0x36, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x1b, 0x04, 0xb0, 0x01, 0x00, 0xe7, 0x8e, 0x00, 0x02,</div><div class='add'>+	0xf0, 0xb1, 0x00, 0x00, 0xe6, 0x8e, 0xa3, 0x01, 0x0c, 0x6c, 0x00, 0x00,</div><div class='add'>+	0xe7, 0x8e, 0x68, 0x06, 0x04, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x68, 0x01,</div><div class='add'>+	0x04, 0xb0, 0x01, 0x00, 0xe9, 0x8e, 0x80, 0x08, 0xf0, 0x31, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x11, 0x1e, 0x90, 0x01, 0x00, 0x00, 0x00, 0x00, 0x1c,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x46, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x01, 0x1f, 0x00, 0x19, 0x62, 0xdd, 0x01, 0x00, 0xeb, 0x8e, 0xa8, 0x13,</div><div class='add'>+	0xe0, 0x31, 0x00, 0x00, 0x22, 0x8f, 0x22, 0x02, 0x14, 0x50, 0x00, 0x00,</div><div class='add'>+	0x44, 0x00, 0x2d, 0x02, 0x0c, 0xd0, 0x01, 0x00, 0x12, 0x8f, 0xa2, 0x02,</div><div class='add'>+	0x02, 0x50, 0x00, 0x00, 0xf9, 0x8e, 0x22, 0x5c, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x20, 0x80, 0x00, 0x03, 0x42, 0xc9, 0x01, 0x00, 0xf8, 0x8e, 0x22, 0x40,</div><div class='add'>+	0xe3, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x47, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00, 0xf4, 0x8e, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x1b, 0x84, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x05, 0x48, 0xb1, 0x01, 0x00, 0x44, 0x00, 0x2d, 0x5c,</div><div class='add'>+	0x1f, 0x80, 0x01, 0x00, 0x48, 0x00, 0x2d, 0xf0, 0x38, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x4c, 0x00, 0x2d, 0xf0, 0x26, 0xb0, 0x01, 0x00, 0x38, 0x00, 0x2f, 0xf2,</div><div class='add'>+	0x02, 0xb0, 0x01, 0x00, 0x13, 0x8f, 0x22, 0x01, 0x14, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x06, 0x8f, 0x22, 0x46, 0x1f, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46,</div><div class='add'>+	0x1f, 0x80, 0x01, 0x00, 0x20, 0x00, 0x2d, 0x03, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x05, 0x8f, 0x22, 0x40, 0xe3, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0x02, 0x8f, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0x1b, 0x84, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x38, 0x00, 0x2f, 0x05, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf8, 0x94, 0xb0, 0x01, 0x00, 0x38, 0x00, 0x2d, 0xf0,</div><div class='add'>+	0x96, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4c, 0xe1, 0xc1, 0x01, 0x00,</div><div class='add'>+	0x20, 0x00, 0x00, 0x03, 0x48, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x22, 0x4a,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0x44, 0x00, 0x00, 0x05, 0xf0, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4a, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4b,</div><div class='add'>+	0xe0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x47, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xa0, 0x00, 0x00, 0xa4, 0x62, 0xdd, 0x01, 0x00, 0x0f, 0x8f, 0xa8, 0x5c,</div><div class='add'>+	0x1f, 0x10, 0x00, 0x00, 0x13, 0x8f, 0x00, 0x05, 0x48, 0xb1, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x02, 0x38, 0xc0, 0x01, 0x00, 0x1d, 0x8f, 0x22, 0x06,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x33, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x1b, 0x8f, 0xa2, 0x02, 0x36, 0x6c, 0x00, 0x00, 0x04, 0x00, 0x8f, 0x0d,</div><div class='add'>+	0x42, 0x31, 0x00, 0x00, 0x10, 0x00, 0x00, 0xf8, 0x10, 0xc8, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x5c, 0x11, 0x80, 0x01, 0x00, 0xf0, 0x07, 0x00, 0x40,</div><div class='add'>+	0x37, 0x98, 0x01, 0x00, 0xcf, 0x8e, 0x00, 0xa1, 0x1a, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x02, 0x10, 0xc0, 0x01, 0x00, 0xcf, 0x8e, 0x00, 0x02,</div><div class='add'>+	0x36, 0xd0, 0x00, 0x00, 0x50, 0x00, 0x20, 0x1c, 0xe0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x54, 0x00, 0x20, 0x13, 0xe0, 0xb1, 0x01, 0x00, 0x4e, 0x00, 0x20, 0x01,</div><div class='add'>+	0xe4, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x20, 0x0a, 0xe0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x27, 0x8f, 0x00, 0x5f, 0x01, 0xb0, 0x00, 0x00, 0x37, 0x00, 0x2d, 0x46,</div><div class='add'>+	0x01, 0xb0, 0x01, 0x00, 0x04, 0x00, 0x00, 0xf3, 0x80, 0xf4, 0x01, 0x00,</div><div class='add'>+	0x26, 0x8f, 0xa0, 0x43, 0x81, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55,</div><div class='add'>+	0x01, 0xb0, 0x01, 0x00, 0x40, 0x00, 0x20, 0x40, 0xe1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x80, 0x00, 0x19, 0x42, 0xc9, 0x01, 0x00, 0x2d, 0x8f, 0x22, 0x40,</div><div class='add'>+	0xe3, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x19, 0x62, 0xdd, 0x01, 0x00, 0x2a, 0x8f, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x1b, 0x84, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xfb, 0x95, 0x00, 0x10, 0x48, 0x31, 0x01, 0x00, 0x30, 0x80, 0x00, 0x10,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0x34, 0x8f, 0x22, 0x40, 0xe3, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x44, 0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x31, 0x8f, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x1b, 0x84, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x60, 0x01, 0x2f, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x0b, 0xe4, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x50, 0x17, 0xf0, 0x01, 0x00, 0x39, 0x8f, 0x90, 0xf2,</div><div class='add'>+	0x16, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x17, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x66, 0x20, 0x17, 0xa4, 0x01, 0x00, 0x32, 0x00, 0x00, 0xa6,</div><div class='add'>+	0x2a, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf2, 0x2a, 0x94, 0x01, 0x00,</div><div class='add'>+	0x42, 0x8f, 0x22, 0x49, 0x1f, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x49,</div><div class='add'>+	0x1f, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x05, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0xf0, 0x00, 0x0c, 0x18, 0x8c, 0x01, 0x00, 0xf5, 0x97, 0x00, 0x4c,</div><div class='add'>+	0x95, 0x30, 0x01, 0x00, 0x52, 0x8f, 0x00, 0x00, 0x92, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x49, 0x8f, 0x22, 0x40, 0xaf, 0x6f, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x1e,</div><div class='add'>+	0x94, 0xdc, 0x01, 0x00, 0x00, 0x00, 0x00, 0x15, 0x96, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x72, 0x98, 0x00, 0x40, 0x05, 0x30, 0x01, 0x00, 0x48, 0x8f, 0xa2, 0x40,</div><div class='add'>+	0x97, 0x6c, 0x00, 0x00, 0x5b, 0x8f, 0x00, 0x47, 0x19, 0x80, 0x00, 0x00,</div><div class='add'>+	0x52, 0x8f, 0x00, 0x00, 0x92, 0xb0, 0x00, 0x00, 0x49, 0x8f, 0x43, 0x48,</div><div class='add'>+	0x61, 0x31, 0x00, 0x00, 0x00, 0xd0, 0x00, 0x1e, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0x4e, 0x8f, 0x28, 0x40, 0x05, 0x30, 0x00, 0x00, 0x4a, 0x8f, 0x22, 0x48,</div><div class='add'>+	0x77, 0x7d, 0x00, 0x00, 0x51, 0x8f, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x15, 0x62, 0xb1, 0x01, 0x00, 0x5a, 0x8f, 0x28, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x4e, 0x8f, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x1b, 0x00, 0x92, 0xb0, 0x01, 0x00, 0x57, 0x8f, 0x22, 0x41,</div><div class='add'>+	0x19, 0x7c, 0x00, 0x00, 0x00, 0x80, 0x00, 0x03, 0x42, 0xc9, 0x01, 0x00,</div><div class='add'>+	0xcc, 0x95, 0x00, 0xf8, 0x00, 0x30, 0x01, 0x00, 0x54, 0x8f, 0xa2, 0x41,</div><div class='add'>+	0x3b, 0x50, 0x00, 0x00, 0x5b, 0x8f, 0x00, 0x49, 0x00, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xff, 0x07, 0x00, 0x1e, 0x00, 0x8c, 0x01, 0x00, 0xcc, 0x95, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x5b, 0x8f, 0x00, 0x49, 0x00, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x1b, 0x47, 0x19, 0x80, 0x01, 0x00, 0x5e, 0x8f, 0x22, 0x5f,</div><div class='add'>+	0x01, 0x6c, 0x00, 0x00, 0x4b, 0x99, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0xaa, 0x8a, 0x00, 0x00, 0x80, 0xb0, 0x00, 0x00, 0x65, 0x8f, 0x22, 0x5c,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x20, 0x80, 0x00, 0x03, 0x42, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x65, 0x8f, 0x22, 0x40, 0xe3, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x47,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0x62, 0x8f, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0x1b, 0x84, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x65, 0x8f, 0x40, 0x05, 0x48, 0x31, 0x00, 0x00,</div><div class='add'>+	0xff, 0xff, 0x00, 0x07, 0x94, 0x89, 0x01, 0x00, 0x6b, 0x8f, 0x85, 0xca,</div><div class='add'>+	0x94, 0x30, 0x00, 0x00, 0x4b, 0x99, 0x18, 0x5c, 0x1f, 0x00, 0x01, 0x00,</div><div class='add'>+	0x0e, 0x00, 0x00, 0x0f, 0x1e, 0x8c, 0x01, 0x00, 0x72, 0x89, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x20, 0x98, 0x18, 0x00, 0x80, 0x30, 0x01, 0x00,</div><div class='add'>+	0xcf, 0x8d, 0x00, 0x47, 0x19, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x19, 0x80, 0x01, 0x00, 0xcf, 0x8d, 0x22, 0x47, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0xc7, 0x95, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x72, 0x8f, 0xa2, 0x08,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0xcf, 0x8d, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xb5, 0x97, 0x00, 0x40, 0x0d, 0x30, 0x01, 0x00, 0x9c, 0x01, 0x00, 0x40,</div><div class='add'>+	0x45, 0x99, 0x01, 0x00, 0xff, 0xff, 0x00, 0x0b, 0x98, 0x88, 0x01, 0x00,</div><div class='add'>+	0x8b, 0x00, 0x2d, 0x50, 0x17, 0xf0, 0x01, 0x00, 0x78, 0x8f, 0x90, 0x4c,</div><div class='add'>+	0x16, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x17, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x7a, 0x8f, 0x22, 0x43, 0xe7, 0x7d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0x45, 0xc1, 0x01, 0x00, 0x00, 0x00, 0x66, 0x20, 0x17, 0xa4, 0x01, 0x00,</div><div class='add'>+	0x68, 0x01, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00, 0x5c, 0x01, 0x2e, 0xf2,</div><div class='add'>+	0x80, 0xb0, 0x01, 0x00, 0x3e, 0x00, 0x00, 0x40, 0x80, 0xce, 0x01, 0x00,</div><div class='add'>+	0x81, 0x8f, 0x24, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46,</div><div class='add'>+	0x81, 0xc0, 0x01, 0x00, 0x82, 0x8f, 0x00, 0x94, 0xe5, 0xb1, 0x00, 0x00,</div><div class='add'>+	0x02, 0x00, 0x62, 0x40, 0x7e, 0xcd, 0x01, 0x00, 0x00, 0x00, 0x00, 0x57,</div><div class='add'>+	0x81, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x2e, 0x10, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x03, 0x00, 0x00, 0x40, 0xf0, 0x8d, 0x01, 0x00, 0x00, 0x00, 0x00, 0x08,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x58, 0x01, 0x00, 0x05, 0xe0, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x44, 0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xb1, 0x01, 0x00, 0x88, 0x8f, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x1b, 0x84, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x94, 0x8f, 0x22, 0x40, 0xaf, 0x6f, 0x00, 0x00,</div><div class='add'>+	0x00, 0x40, 0x00, 0x08, 0x94, 0xdc, 0x01, 0x00, 0x72, 0x98, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x92, 0x8f, 0x22, 0x40, 0x97, 0x6c, 0x00, 0x00,</div><div class='add'>+	0xcc, 0x95, 0x00, 0x08, 0x00, 0x30, 0x01, 0x00, 0xcf, 0x8d, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x05, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xcf, 0x8d, 0x00, 0x47, 0x19, 0x80, 0x00, 0x00, 0x94, 0x8f, 0x43, 0x48,</div><div class='add'>+	0x61, 0x31, 0x00, 0x00, 0x00, 0x50, 0x00, 0x08, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0x9a, 0x8f, 0x28, 0x40, 0x05, 0x30, 0x00, 0x00, 0x95, 0x8f, 0x22, 0x48,</div><div class='add'>+	0x77, 0x7d, 0x00, 0x00, 0xcc, 0x95, 0x1b, 0x08, 0x00, 0x30, 0x01, 0x00,</div><div class='add'>+	0xcf, 0x8d, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xcf, 0x8d, 0x1b, 0x47,</div><div class='add'>+	0x19, 0x80, 0x00, 0x00, 0x35, 0x00, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00,</div><div class='add'>+	0x01, 0x00, 0x63, 0xf3, 0x84, 0xc8, 0x01, 0x00, 0x9f, 0x8f, 0xa0, 0x43,</div><div class='add'>+	0x85, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x63, 0x40, 0x85, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xa8, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00, 0x37, 0x00, 0x2f, 0xf0,</div><div class='add'>+	0x24, 0xb0, 0x01, 0x00, 0x01, 0x00, 0x63, 0xf3, 0x82, 0xcc, 0x01, 0x00,</div><div class='add'>+	0xaa, 0x8f, 0xa2, 0x41, 0x9e, 0x06, 0x00, 0x00, 0xcf, 0x8d, 0x22, 0x44,</div><div class='add'>+	0x83, 0x70, 0x00, 0x00, 0x36, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00,</div><div class='add'>+	0x58, 0x00, 0x3d, 0x43, 0xe7, 0xe1, 0x01, 0x00, 0xcf, 0x8d, 0x1f, 0xf0,</div><div class='add'>+	0x24, 0x6c, 0x00, 0x00, 0x4b, 0x99, 0x00, 0x48, 0x81, 0x30, 0x01, 0x00,</div><div class='add'>+	0xaa, 0x8a, 0x23, 0x41, 0x83, 0x6c, 0x00, 0x00, 0xaa, 0x8a, 0x00, 0x47,</div><div class='add'>+	0x81, 0xb0, 0x00, 0x00, 0x58, 0x00, 0x3d, 0x43, 0x85, 0xe0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf8, 0x36, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0,</div><div class='add'>+	0x00, 0xb0, 0x01, 0x00, 0x28, 0x00, 0x00, 0x40, 0x83, 0x98, 0x01, 0x00,</div><div class='add'>+	0xee, 0x97, 0x00, 0x47, 0x61, 0x31, 0x01, 0x00, 0x1b, 0x84, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x2d, 0x03, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x08, 0x00, 0x2d, 0xf0, 0x94, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8,</div><div class='add'>+	0x8e, 0xb0, 0x01, 0x00, 0x90, 0x00, 0x2d, 0xf0, 0x14, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x05, 0x48, 0xb1, 0x01, 0x00, 0x7e, 0x8e, 0xa2, 0x40,</div><div class='add'>+	0x8f, 0x7c, 0x00, 0x00, 0xb8, 0x8f, 0x22, 0x47, 0x8f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x7e, 0x8e, 0x00, 0x48, 0x19, 0x90, 0x00, 0x00, 0x27, 0x90, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x36, 0x00, 0x2d, 0x5d, 0x05, 0xb4, 0x01, 0x00,</div><div class='add'>+	0x37, 0x00, 0x2d, 0xf3, 0x80, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf3,</div><div class='add'>+	0x8e, 0xb0, 0x01, 0x00, 0x5c, 0x00, 0x3d, 0x43, 0x81, 0xe0, 0x01, 0x00,</div><div class='add'>+	0xa8, 0x00, 0x2d, 0xf0, 0x94, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0,</div><div class='add'>+	0x24, 0xb0, 0x01, 0x00, 0x20, 0x00, 0x00, 0x10, 0x86, 0xdc, 0x01, 0x00,</div><div class='add'>+	0x40, 0x80, 0x00, 0x03, 0x44, 0xc9, 0x01, 0x00, 0xce, 0x94, 0x00, 0x4a,</div><div class='add'>+	0xf0, 0x31, 0x01, 0x00, 0x36, 0x00, 0x2f, 0x5c, 0x1f, 0x90, 0x01, 0x00,</div><div class='add'>+	0xc6, 0x8f, 0xa2, 0x50, 0x8f, 0x50, 0x00, 0x00, 0x34, 0x00, 0x20, 0x40,</div><div class='add'>+	0xe1, 0xb1, 0x01, 0x00, 0xcf, 0x8d, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x63, 0x41, 0x81, 0xc0, 0x01, 0x00, 0xc9, 0x8f, 0xa0, 0x43,</div><div class='add'>+	0x81, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x63, 0x40, 0x81, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x37, 0x00, 0x20, 0x47, 0xe6, 0xb1, 0x01, 0x00, 0xcf, 0x8d, 0x22, 0x47,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x04, 0x00, 0x00, 0x47, 0x0c, 0xf4, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4f, 0x8f, 0x84, 0x01, 0x00, 0xde, 0x8f, 0x22, 0x47,</div><div class='add'>+	0x0c, 0x6c, 0x00, 0x00, 0x58, 0x00, 0x3d, 0x43, 0x81, 0xe0, 0x01, 0x00,</div><div class='add'>+	0xde, 0x8f, 0x1f, 0xf0, 0x24, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5c,</div><div class='add'>+	0x1f, 0x80, 0x01, 0x00, 0x00, 0x80, 0x00, 0x10, 0x42, 0xc9, 0x01, 0x00,</div><div class='add'>+	0xd7, 0x8f, 0x22, 0x40, 0xe3, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x45,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0xd4, 0x8f, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0x1b, 0x84, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0xd7, 0x8f, 0x42, 0x40, 0x05, 0x30, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x44, 0x93, 0x93, 0x01, 0x00, 0x00, 0x00, 0x1a, 0x5d,</div><div class='add'>+	0x69, 0x93, 0x01, 0x00, 0xdc, 0x8f, 0x23, 0x41, 0x0d, 0x6c, 0x00, 0x00,</div><div class='add'>+	0xb9, 0x8f, 0x00, 0x05, 0x48, 0xb1, 0x00, 0x00, 0x4b, 0x99, 0x00, 0x05,</div><div class='add'>+	0x48, 0x31, 0x01, 0x00, 0xaa, 0x8a, 0x00, 0x48, 0x81, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xcf, 0x8d, 0x22, 0x40, 0x8f, 0x6c, 0x00, 0x00, 0x20, 0x98, 0x00, 0x5f,</div><div class='add'>+	0x81, 0x30, 0x01, 0x00, 0xcf, 0x8d, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xa2, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf3,</div><div class='add'>+	0x84, 0xb0, 0x01, 0x00, 0xa6, 0x00, 0x2d, 0x49, 0x19, 0x90, 0x01, 0x00,</div><div class='add'>+	0x02, 0x00, 0x00, 0xf2, 0x80, 0xf4, 0x01, 0x00, 0xb8, 0x00, 0x2d, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf2, 0x80, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x82, 0xf8, 0x01, 0x00, 0x19, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0x98, 0x01, 0x00, 0xed, 0x8f, 0xa0, 0x40, 0x82, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x2c, 0x01, 0x00, 0x40, 0x81, 0x98, 0x01, 0x00, 0xed, 0x8f, 0xa3, 0x40,</div><div class='add'>+	0x82, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x80, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xef, 0x8f, 0x20, 0x4c, 0x85, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x85, 0xc0, 0x01, 0x00, 0x86, 0x00, 0x20, 0x40, 0xe4, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xa2, 0x00, 0x20, 0x42, 0xe6, 0xb1, 0x01, 0x00, 0xcf, 0x8d, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0xaf, 0x97, 0x00, 0x50, 0x81, 0x30, 0x01, 0x00,</div><div class='add'>+	0xcf, 0x8d, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x80, 0x00, 0x03,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0x04, 0x00, 0x22, 0xf0, 0x80, 0x30, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x8d, 0xb0, 0x01, 0x00, 0x3d, 0x99, 0x00, 0x40,</div><div class='add'>+	0x87, 0x30, 0x01, 0x00, 0xb0, 0x00, 0x2f, 0x5c, 0x1f, 0x90, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x60, 0xf0, 0x80, 0xc0, 0x01, 0x00, 0x20, 0x98, 0x00, 0x5f,</div><div class='add'>+	0x81, 0x30, 0x01, 0x00, 0xcf, 0x8d, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xcf, 0x8d, 0x22, 0x46,</div><div class='add'>+	0x19, 0x7c, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00,</div><div class='add'>+	0x01, 0x00, 0x62, 0xf2, 0x96, 0xcc, 0x01, 0x00, 0xcf, 0x8d, 0xa6, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x20, 0x98, 0x00, 0x4a, 0x81, 0x30, 0x01, 0x00,</div><div class='add'>+	0xf5, 0x97, 0x00, 0x46, 0x95, 0x30, 0x01, 0x00, 0xcf, 0x8d, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0xcf, 0x8d, 0x22, 0x49, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x86, 0x00, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00, 0x01, 0x00, 0x62, 0xf2,</div><div class='add'>+	0x80, 0xcc, 0x01, 0x00, 0xcf, 0x8d, 0xa6, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x20, 0x98, 0x00, 0x4a, 0x81, 0x30, 0x01, 0x00, 0xf5, 0x97, 0x00, 0x47,</div><div class='add'>+	0x95, 0x30, 0x01, 0x00, 0xcf, 0x8d, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x5f, 0x95, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0xcf, 0x8d, 0x00, 0x5c,</div><div class='add'>+	0x1f, 0x90, 0x00, 0x00, 0xcf, 0x8d, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xcf, 0x8d, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xba, 0x00, 0x00, 0x40,</div><div class='add'>+	0x47, 0x99, 0x01, 0x00, 0x01, 0x00, 0x62, 0xf2, 0x80, 0xc8, 0x01, 0x00,</div><div class='add'>+	0x13, 0x90, 0x90, 0x40, 0x80, 0x32, 0x00, 0x00, 0xff, 0xff, 0x62, 0x40,</div><div class='add'>+	0x81, 0x98, 0x01, 0x00, 0xa4, 0x00, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00,</div><div class='add'>+	0xcf, 0x8d, 0x22, 0x40, 0xe5, 0x6d, 0x00, 0x00, 0xcf, 0x8d, 0x00, 0x41,</div><div class='add'>+	0xe5, 0xc1, 0x00, 0x00, 0xaf, 0x97, 0x00, 0x4d, 0x81, 0x30, 0x01, 0x00,</div><div class='add'>+	0xcf, 0x8d, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x5c, 0x00, 0x00, 0x40,</div><div class='add'>+	0x47, 0x99, 0x01, 0x00, 0x04, 0x00, 0x22, 0xf0, 0x96, 0x30, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0xe1, 0xb1, 0x01, 0x00, 0x00, 0x80, 0x00, 0x03,</div><div class='add'>+	0x44, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4b, 0xe0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x8d, 0xb0, 0x01, 0x00, 0x3d, 0x99, 0x00, 0x40,</div><div class='add'>+	0x87, 0x30, 0x01, 0x00, 0x8b, 0x00, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00,</div><div class='add'>+	0x23, 0x90, 0x80, 0xf3, 0x96, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0xe7, 0x81, 0x01, 0x00, 0x00, 0x00, 0x00, 0x47, 0x19, 0x90, 0x01, 0x00,</div><div class='add'>+	0xcf, 0x8d, 0x00, 0x5c, 0x1f, 0x90, 0x00, 0x00, 0x34, 0x00, 0x00, 0x40,</div><div class='add'>+	0x45, 0x99, 0x01, 0x00, 0x01, 0x00, 0x00, 0x40, 0xf5, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x11, 0x00, 0x40, 0xe5, 0x99, 0x01, 0x00, 0xc7, 0x95, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x38, 0x90, 0xa2, 0x08, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x37, 0x00, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf3,</div><div class='add'>+	0x82, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x63, 0x51, 0x83, 0xd0, 0x01, 0x00,</div><div class='add'>+	0x34, 0x00, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00, 0x01, 0x00, 0x63, 0xf3,</div><div class='add'>+	0x84, 0xcc, 0x01, 0x00, 0x30, 0x90, 0x9f, 0x42, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x63, 0x42, 0x85, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x45,</div><div class='add'>+	0x03, 0xf0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x32, 0x90, 0x37, 0x5c, 0x61, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1b,</div><div class='add'>+	0x62, 0xb1, 0x01, 0x00, 0x33, 0x90, 0xa8, 0x4b, 0x19, 0x10, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x62, 0xb1, 0x01, 0x00, 0x35, 0x90, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0xff, 0x89, 0x17, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x00, 0x80, 0x00, 0x03, 0x42, 0xc9, 0x01, 0x00, 0x90, 0x00, 0x2d, 0xf0,</div><div class='add'>+	0x94, 0xb0, 0x01, 0x00, 0xac, 0x00, 0x2d, 0xf0, 0x30, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x35, 0x00, 0x2d, 0xf0, 0x28, 0xb0, 0x01, 0x00, 0x58, 0x00, 0x3e, 0x43,</div><div class='add'>+	0xe7, 0xe1, 0x01, 0x00, 0x01, 0x00, 0x00, 0x18, 0xf0, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4a, 0xe0, 0xb1, 0x01, 0x00, 0x38, 0x00, 0x20, 0x00,</div><div class='add'>+	0xe0, 0xb1, 0x01, 0x00, 0x3c, 0x00, 0x20, 0x1b, 0xe0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x20, 0x40, 0xe1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x2b, 0xb0, 0x01, 0x00, 0x04, 0x98, 0x00, 0x40, 0x0d, 0x30, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x18, 0x16, 0xc0, 0x01, 0x00, 0x47, 0x90, 0xa0, 0x14,</div><div class='add'>+	0x16, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x17, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x0e, 0x00, 0x00, 0xa2, 0x44, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x18,</div><div class='add'>+	0xf8, 0xb1, 0x01, 0x00, 0xb0, 0x00, 0x2d, 0x14, 0xf8, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x10, 0x50, 0x00, 0x40, 0x87, 0x98, 0x01, 0x00, 0x50, 0x90, 0x22, 0x4a,</div><div class='add'>+	0x19, 0x7c, 0x00, 0x00, 0x00, 0x30, 0x00, 0x43, 0x86, 0xc8, 0x01, 0x00,</div><div class='add'>+	0x00, 0x30, 0x00, 0x0b, 0x16, 0xc8, 0x01, 0x00, 0x50, 0x90, 0xa4, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x17, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x01, 0x00, 0x6e, 0x43, 0x86, 0x98, 0x01, 0x00, 0x3b, 0x98, 0x00, 0x30,</div><div class='add'>+	0x81, 0x30, 0x01, 0x00, 0x54, 0x90, 0xa0, 0x41, 0x17, 0x40, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x17, 0xc0, 0x01, 0x00, 0x5b, 0x90, 0x22, 0x4a,</div><div class='add'>+	0x19, 0x7c, 0x00, 0x00, 0x08, 0x00, 0x00, 0xa2, 0x44, 0xc9, 0x01, 0x00,</div><div class='add'>+	0xcc, 0x00, 0x2d, 0xab, 0xf9, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xab,</div><div class='add'>+	0x17, 0xc0, 0x01, 0x00, 0x5a, 0x90, 0xa0, 0xf0, 0x16, 0x44, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x17, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x64, 0xf0,</div><div class='add'>+	0x82, 0xb0, 0x01, 0x00, 0x90, 0x00, 0x00, 0x40, 0x45, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x60, 0x41, 0x31, 0xc0, 0x01, 0x00, 0xbc, 0x00, 0x00, 0x40,</div><div class='add'>+	0x43, 0x99, 0x01, 0x00, 0x61, 0x90, 0x06, 0x0c, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0xa0, 0x00, 0x20, 0xf2, 0xe4, 0xb1, 0x01, 0x00, 0x04, 0x00, 0x09, 0x46,</div><div class='add'>+	0x19, 0x10, 0x00, 0x00, 0x9c, 0x01, 0x00, 0x40, 0x45, 0x99, 0x01, 0x00,</div><div class='add'>+	0xff, 0xff, 0x00, 0x0b, 0x98, 0x88, 0x01, 0x00, 0x8b, 0x00, 0x2d, 0x50,</div><div class='add'>+	0x17, 0xf0, 0x01, 0x00, 0x66, 0x90, 0x90, 0x4c, 0x16, 0x40, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x17, 0xc0, 0x01, 0x00, 0x68, 0x90, 0x22, 0x43,</div><div class='add'>+	0xe7, 0x7d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x45, 0xc1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x66, 0x20, 0x17, 0xa4, 0x01, 0x00, 0x68, 0x01, 0x00, 0x40,</div><div class='add'>+	0x43, 0x99, 0x01, 0x00, 0x5c, 0x01, 0x2e, 0xf2, 0x80, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x3e, 0x00, 0x00, 0x40, 0x80, 0xce, 0x01, 0x00, 0x6f, 0x90, 0x24, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46, 0x81, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x70, 0x90, 0x00, 0x94, 0xe5, 0xb1, 0x00, 0x00, 0x02, 0x00, 0x62, 0x40,</div><div class='add'>+	0x7e, 0xcd, 0x01, 0x00, 0x00, 0x00, 0x00, 0x57, 0x81, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x2e, 0x10, 0x48, 0xb1, 0x01, 0x00, 0x03, 0x00, 0x00, 0x40,</div><div class='add'>+	0xf0, 0x8d, 0x01, 0x00, 0x00, 0x00, 0x00, 0x08, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x58, 0x01, 0x00, 0x05, 0xe0, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x10, 0x62, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x76, 0x90, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0x1b, 0x84, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x80, 0x90, 0x22, 0x40, 0xaf, 0x6f, 0x00, 0x00, 0x00, 0x40, 0x00, 0x08,</div><div class='add'>+	0x94, 0xdc, 0x01, 0x00, 0x72, 0x98, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x7b, 0x90, 0xa2, 0x40, 0x97, 0x6c, 0x00, 0x00, 0x35, 0x00, 0x00, 0x40,</div><div class='add'>+	0x47, 0x99, 0x01, 0x00, 0x84, 0x90, 0x00, 0x40, 0x05, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x80, 0x90, 0x43, 0x48, 0x61, 0x31, 0x00, 0x00, 0x00, 0x50, 0x00, 0x08,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x81, 0x90, 0xa8, 0x40, 0x05, 0x30, 0x00, 0x00,</div><div class='add'>+	0x35, 0x00, 0x1b, 0x40, 0x47, 0x99, 0x01, 0x00, 0x01, 0x00, 0x63, 0xf3,</div><div class='add'>+	0x84, 0xc8, 0x01, 0x00, 0x87, 0x90, 0xa0, 0x43, 0x85, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x63, 0x40, 0x85, 0xb0, 0x01, 0x00, 0x37, 0x00, 0x00, 0x40,</div><div class='add'>+	0x47, 0x99, 0x01, 0x00, 0x01, 0x00, 0x63, 0xf3, 0x82, 0xcc, 0x01, 0x00,</div><div class='add'>+	0x8b, 0x00, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x45,</div><div class='add'>+	0xe7, 0x91, 0x01, 0x00, 0x20, 0x98, 0x00, 0x5f, 0x81, 0x30, 0x01, 0x00,</div><div class='add'>+	0xcf, 0x8d, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x37, 0x00, 0x00, 0x40,</div><div class='add'>+	0x47, 0x99, 0x01, 0x00, 0x69, 0x96, 0x00, 0xf3, 0x94, 0x30, 0x01, 0x00,</div><div class='add'>+	0x27, 0x90, 0x22, 0x4a, 0x80, 0x32, 0x00, 0x00, 0xa5, 0x8e, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x37, 0x00, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00,</div><div class='add'>+	0x69, 0x96, 0x00, 0xf3, 0x94, 0x30, 0x01, 0x00, 0x75, 0x8e, 0x22, 0x4a,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0xa5, 0x8e, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x36, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0xfb,</div><div class='add'>+	0x12, 0xb0, 0x01, 0x00, 0x0f, 0x00, 0x00, 0xf3, 0x90, 0x88, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0xf3, 0x0c, 0xf4, 0x01, 0x00, 0x9f, 0x8e, 0x22, 0x06,</div><div class='add'>+	0x90, 0x6c, 0x00, 0x00, 0x5c, 0x00, 0x3d, 0x43, 0x13, 0xe0, 0x01, 0x00,</div><div class='add'>+	0xa8, 0x00, 0x2d, 0xf0, 0x94, 0xb0, 0x01, 0x00, 0x37, 0x00, 0x2f, 0xf0,</div><div class='add'>+	0x24, 0xb0, 0x01, 0x00, 0x36, 0x00, 0x2a, 0x50, 0xe7, 0xd1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x63, 0x41, 0x13, 0xc0, 0x01, 0x00, 0xa1, 0x90, 0xa0, 0x43,</div><div class='add'>+	0x13, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xe7, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xcc, 0x94, 0x00, 0x10, 0x86, 0x30, 0x01, 0x00, 0x1b, 0x84, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0xa3, 0x90, 0x42, 0x05, 0x48, 0x31, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x44, 0x93, 0x93, 0x01, 0x00, 0x9f, 0x8e, 0x1a, 0x5d,</div><div class='add'>+	0x69, 0x93, 0x00, 0x00, 0x36, 0x00, 0x2d, 0x10, 0x86, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x5c, 0x00, 0x3d, 0x43, 0xe7, 0xe1, 0x01, 0x00, 0xa8, 0x00, 0x2d, 0xf0,</div><div class='add'>+	0x94, 0xb0, 0x01, 0x00, 0x35, 0x00, 0x2f, 0xf0, 0x24, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x01, 0x00, 0x6b, 0xfb, 0x84, 0xc8, 0x01, 0x00, 0xae, 0x90, 0xa0, 0x43,</div><div class='add'>+	0x85, 0x6c, 0x00, 0x00, 0x35, 0x00, 0x20, 0x40, 0xe7, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x01, 0x00, 0x63, 0xf3,</div><div class='add'>+	0x12, 0xc8, 0x01, 0x00, 0xb1, 0x90, 0xa0, 0x43, 0x13, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0xe7, 0xb1, 0x01, 0x00, 0x40, 0x80, 0x00, 0x03,</div><div class='add'>+	0x44, 0xc9, 0x01, 0x00, 0xce, 0x94, 0x00, 0x4a, 0xf0, 0x31, 0x01, 0x00,</div><div class='add'>+	0x1b, 0x84, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0xb4, 0x90, 0x42, 0x05,</div><div class='add'>+	0x48, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x93, 0x93, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x1a, 0x5d, 0x69, 0x93, 0x01, 0x00, 0x37, 0x00, 0x00, 0x40,</div><div class='add'>+	0x47, 0x99, 0x01, 0x00, 0x11, 0x00, 0x63, 0xf3, 0x82, 0xcc, 0x01, 0x00,</div><div class='add'>+	0xa3, 0x8f, 0x22, 0x41, 0x9e, 0x06, 0x00, 0x00, 0x35, 0x00, 0x00, 0x40,</div><div class='add'>+	0x43, 0x99, 0x01, 0x00, 0x58, 0x00, 0x3d, 0x43, 0xe7, 0xe1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf8, 0x36, 0xb0, 0x01, 0x00, 0xad, 0x8f, 0x00, 0xf0,</div><div class='add'>+	0x00, 0xb0, 0x00, 0x00, 0x5e, 0x01, 0x2d, 0x05, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xbf, 0x90, 0x47, 0xf2, 0x12, 0x30, 0x00, 0x00, 0x00, 0x99, 0x3f, 0x42,</div><div class='add'>+	0x13, 0xf0, 0x01, 0x00, 0xc4, 0x90, 0x22, 0x47, 0xe7, 0x7d, 0x00, 0x00,</div><div class='add'>+	0x6b, 0x84, 0x1f, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0xbe, 0x90, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x47, 0xe7, 0x91, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x1f, 0x42, 0x19, 0x90, 0x01, 0x00, 0x75, 0x00, 0x00, 0x40,</div><div class='add'>+	0x61, 0x99, 0x01, 0x00, 0xc6, 0x90, 0xa8, 0xb1, 0x0c, 0x30, 0x00, 0x00,</div><div class='add'>+	0x46, 0x97, 0x00, 0x10, 0x94, 0x30, 0x01, 0x00, 0x1b, 0x84, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x5e, 0x01, 0x2e, 0x05, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xc0, 0xa8, 0x3d, 0x46, 0x0d, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x97, 0xb0, 0x01, 0x00, 0xd0, 0x90, 0x22, 0x40, 0xe1, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x02, 0x41, 0x97, 0x40, 0x00, 0x00, 0xcd, 0x90, 0x00, 0x50,</div><div class='add'>+	0x43, 0xc1, 0x00, 0x00, 0xdc, 0x90, 0x22, 0x4b, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x62, 0x4b, 0x12, 0x94, 0x01, 0x00, 0x09, 0x00, 0x00, 0x07,</div><div class='add'>+	0x96, 0xe4, 0x01, 0x00, 0x00, 0x00, 0x00, 0xa7, 0x97, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x30, 0x00, 0x00, 0x10, 0x94, 0xc8, 0x01, 0x00, 0x00, 0x80, 0x00, 0x4a,</div><div class='add'>+	0x44, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x42, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x5e, 0x01, 0x00, 0x4b, 0xf0, 0xc9, 0x01, 0x00, 0x5e, 0x01, 0x00, 0x05,</div><div class='add'>+	0xe0, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x20, 0x00, 0x00, 0x4a, 0x62, 0xdd, 0x01, 0x00, 0xda, 0x90, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x80, 0x00, 0x10, 0x44, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x50, 0xf1, 0xb1, 0x01, 0x00, 0x04, 0x00, 0x00, 0x09,</div><div class='add'>+	0x96, 0xe4, 0x01, 0x00, 0x00, 0x00, 0x68, 0xa8, 0x97, 0xc0, 0x01, 0x00,</div><div class='add'>+	0xd4, 0x00, 0x00, 0x05, 0xe0, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x10, 0x62, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xe2, 0x90, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0x1b, 0x84, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x00, 0x99, 0x3f, 0x42, 0x13, 0xf0, 0x01, 0x00,</div><div class='add'>+	0xe6, 0x90, 0x47, 0x40, 0x81, 0x32, 0x00, 0x00, 0x3f, 0x00, 0x00, 0xf3,</div><div class='add'>+	0x96, 0x88, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0xe7, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x1f, 0x55, 0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x06,</div><div class='add'>+	0x62, 0xb1, 0x01, 0x00, 0xea, 0x90, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0xef, 0x90, 0x22, 0x4b, 0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4b,</div><div class='add'>+	0x62, 0xb1, 0x01, 0x00, 0xed, 0x90, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x97, 0x13, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x96,</div><div class='add'>+	0x97, 0xb0, 0x01, 0x00, 0xf5, 0x90, 0x20, 0x09, 0x96, 0x6c, 0x00, 0x00,</div><div class='add'>+	0xf5, 0x90, 0x1f, 0x09, 0x96, 0x24, 0x00, 0x00, 0x6b, 0x84, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0xf0, 0x90, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xaf, 0x97, 0x00, 0x57, 0x81, 0x30, 0x01, 0x00, 0xba, 0x8d, 0x00, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x00, 0x00, 0x2e, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00,</div><div class='add'>+	0xfb, 0x90, 0x22, 0xf3, 0x80, 0x32, 0x00, 0x00, 0xaf, 0x97, 0x00, 0x42,</div><div class='add'>+	0x81, 0x30, 0x01, 0x00, 0xff, 0x89, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x20, 0x98, 0x00, 0x52, 0x81, 0x30, 0x01, 0x00, 0xba, 0x8d, 0x00, 0x42,</div><div class='add'>+	0x19, 0x80, 0x00, 0x00, 0xaf, 0x97, 0x00, 0x3a, 0x81, 0x30, 0x01, 0x00,</div><div class='add'>+	0x20, 0x98, 0x00, 0x52, 0x81, 0x30, 0x01, 0x00, 0xba, 0x8d, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x05, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xc9, 0x96, 0x00, 0x40, 0x95, 0x30, 0x01, 0x00, 0xba, 0x8d, 0x22, 0x40,</div><div class='add'>+	0x95, 0x6c, 0x00, 0x00, 0x06, 0x91, 0xa2, 0x40, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0xcc, 0x95, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0xff, 0x89, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x80, 0x00, 0x03, 0x42, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf2, 0x02, 0xb0, 0x01, 0x00, 0x74, 0x96, 0x00, 0x52,</div><div class='add'>+	0x95, 0x30, 0x01, 0x00, 0x7b, 0x96, 0x00, 0x4b, 0x02, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xff, 0x89, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xf4, 0x98, 0x00, 0x40,</div><div class='add'>+	0x95, 0x30, 0x01, 0x00, 0x11, 0x91, 0xa2, 0x08, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0xff, 0x89, 0x22, 0x42, 0x19, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4b,</div><div class='add'>+	0x19, 0x90, 0x01, 0x00, 0xaf, 0x97, 0x00, 0x3a, 0x81, 0x30, 0x01, 0x00,</div><div class='add'>+	0xff, 0x89, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x23, 0x00, 0xa6,</div><div class='add'>+	0x16, 0xb0, 0x01, 0x00, 0x14, 0x91, 0x83, 0x1e, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x08, 0x00, 0x0b, 0x16, 0xdc, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+	0x2a, 0xc0, 0x01, 0x00, 0xf8, 0x97, 0x00, 0x08, 0x80, 0x30, 0x01, 0x00,</div><div class='add'>+	0x18, 0x91, 0x00, 0x5e, 0x17, 0x90, 0x00, 0x00, 0x19, 0x98, 0x00, 0x43,</div><div class='add'>+	0x61, 0x31, 0x01, 0x00, 0xda, 0x94, 0x00, 0x40, 0x8d, 0x30, 0x01, 0x00,</div><div class='add'>+	0x00, 0x98, 0x00, 0x07, 0x16, 0x14, 0x01, 0x00, 0x00, 0x80, 0x00, 0x10,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0x20, 0x91, 0x22, 0x40, 0xe3, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x43, 0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x1d, 0x91, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x1b, 0x84, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0xa1, 0x97, 0x00, 0x5e,</div><div class='add'>+	0x05, 0x10, 0x01, 0x00, 0xcc, 0x95, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x24, 0x91, 0x22, 0x09, 0x80, 0x30, 0x00, 0x00, 0x20, 0x98, 0x00, 0x40,</div><div class='add'>+	0x13, 0x30, 0x01, 0x00, 0xbf, 0x8d, 0x00, 0x05, 0x48, 0xb1, 0x00, 0x00,</div><div class='add'>+	0xf9, 0x96, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0xba, 0x8d, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4a, 0x1f, 0x90, 0x01, 0x00,</div><div class='add'>+	0x2b, 0x91, 0x22, 0x43, 0x3d, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0x19, 0x90, 0x01, 0x00, 0x00, 0x00, 0x00, 0x43, 0x3d, 0x80, 0x01, 0x00,</div><div class='add'>+	0x2c, 0x91, 0x00, 0x42, 0x19, 0x90, 0x00, 0x00, 0x14, 0x00, 0x2d, 0x45,</div><div class='add'>+	0x1f, 0x90, 0x01, 0x00, 0x87, 0x91, 0x83, 0x1e, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x87, 0x91, 0x00, 0x44, 0x19, 0x90, 0x00, 0x00, 0xbf, 0x95, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x3f, 0x91, 0xa2, 0x08, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x3b, 0x91, 0xa2, 0x42, 0x19, 0x7c, 0x00, 0x00, 0x00, 0x82, 0x00, 0x02,</div><div class='add'>+	0x04, 0xdc, 0x01, 0x00, 0xa0, 0x98, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00,</div><div class='add'>+	0xe3, 0x89, 0x00, 0x41, 0x89, 0x30, 0x01, 0x00, 0x38, 0x91, 0xa2, 0x41,</div><div class='add'>+	0x19, 0x7c, 0x00, 0x00, 0xcc, 0x95, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0xff, 0x89, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x74, 0x96, 0x00, 0x15,</div><div class='add'>+	0x94, 0x30, 0x01, 0x00, 0x7b, 0x96, 0x00, 0x4b, 0x02, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xff, 0x89, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xf9, 0x96, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4b, 0x19, 0x90, 0x01, 0x00,</div><div class='add'>+	0xaf, 0x97, 0x00, 0x3a, 0x81, 0x30, 0x01, 0x00, 0xff, 0x89, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x42, 0x91, 0x22, 0x42, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0xf9, 0x96, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x43, 0x91, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0xc9, 0x96, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x6f, 0x91, 0x22, 0x41, 0x19, 0x7c, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x15,</div><div class='add'>+	0x98, 0xc8, 0x01, 0x00, 0x6f, 0x91, 0xa0, 0x0b, 0x99, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x30, 0x00, 0x00, 0x10, 0x80, 0xc8, 0x01, 0x00, 0x00, 0x80, 0x00, 0x40,</div><div class='add'>+	0x44, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x50, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x03, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x42,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x62, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x4b, 0x91, 0xa8, 0x00, 0xe0, 0x31, 0x00, 0x00, 0x1b, 0x84, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xc0, 0x00, 0x00, 0x15, 0x98, 0xc8, 0x01, 0x00, 0x30, 0x00, 0x2e, 0x0b,</div><div class='add'>+	0x99, 0xd0, 0x01, 0x00, 0x00, 0x00, 0x6a, 0x50, 0x99, 0xc0, 0x01, 0x00,</div><div class='add'>+	0xc0, 0x00, 0x62, 0x01, 0x80, 0xcc, 0x01, 0x00, 0x0c, 0x80, 0x00, 0x03,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0x2d, 0x00, 0x2d, 0xf0, 0x22, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4c, 0x80, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5c,</div><div class='add'>+	0x23, 0x80, 0x01, 0x00, 0xd4, 0x00, 0x3f, 0x41, 0xe7, 0xe1, 0x01, 0x00,</div><div class='add'>+	0x0b, 0x00, 0x00, 0x11, 0xe4, 0xf5, 0x01, 0x00, 0x2f, 0x00, 0x20, 0x47,</div><div class='add'>+	0xe7, 0xb5, 0x01, 0x00, 0x5c, 0x91, 0x23, 0x0b, 0x81, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4f, 0xe5, 0x91, 0x01, 0x00, 0x00, 0x00, 0x00, 0x08,</div><div class='add'>+	0x80, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x0b, 0x03, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x15, 0x02, 0xd0, 0x01, 0x00, 0xf8, 0x97, 0x00, 0x00,</div><div class='add'>+	0x2a, 0x40, 0x01, 0x00, 0x00, 0x00, 0x00, 0x43, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00, 0x61, 0x91, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x1b, 0x84, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xcc, 0x95, 0x00, 0x05, 0x48, 0x31, 0x01, 0x00, 0xc0, 0x00, 0x00, 0x01,</div><div class='add'>+	0x80, 0xce, 0x01, 0x00, 0x6d, 0x91, 0x26, 0x11, 0x00, 0x30, 0x00, 0x00,</div><div class='add'>+	0x10, 0x00, 0x00, 0x00, 0x2a, 0xc8, 0x01, 0x00, 0x00, 0x00, 0x00, 0x08,</div><div class='add'>+	0x80, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x80, 0xc0, 0x01, 0x00,</div><div class='add'>+	0xc0, 0x00, 0x00, 0x40, 0x99, 0x98, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01,</div><div class='add'>+	0x98, 0xd0, 0x01, 0x00, 0xf8, 0x97, 0x00, 0x4c, 0x02, 0x30, 0x01, 0x00,</div><div class='add'>+	0xc0, 0x00, 0x00, 0x40, 0x03, 0x98, 0x01, 0x00, 0x74, 0x91, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x30, 0x00, 0x2f, 0x08, 0x80, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xc0, 0x00, 0x00, 0x15, 0xf4, 0xc9, 0x01, 0x00, 0xc0, 0x00, 0x00, 0x01,</div><div class='add'>+	0xe4, 0xcd, 0x01, 0x00, 0xc0, 0x00, 0x00, 0x40, 0x03, 0x98, 0x01, 0x00,</div><div class='add'>+	0xf8, 0x97, 0x00, 0x00, 0x2a, 0x40, 0x01, 0x00, 0x79, 0x91, 0x22, 0x44,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0xac, 0x00, 0x2f, 0x40, 0x13, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x01, 0xe0, 0xc1, 0x01, 0x00, 0xb0, 0x00, 0x00, 0x40,</div><div class='add'>+	0x47, 0x99, 0x01, 0x00, 0x7a, 0x91, 0x00, 0x01, 0xe0, 0xd1, 0x00, 0x00,</div><div class='add'>+	0xda, 0x94, 0x00, 0x40, 0x8d, 0x30, 0x01, 0x00, 0x80, 0x63, 0x00, 0xa6,</div><div class='add'>+	0x16, 0xb0, 0x01, 0x00, 0x00, 0x98, 0x00, 0x07, 0x16, 0x14, 0x01, 0x00,</div><div class='add'>+	0x00, 0x80, 0x00, 0x10, 0x42, 0xc9, 0x01, 0x00, 0x82, 0x91, 0x22, 0x40,</div><div class='add'>+	0xe3, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00, 0x7f, 0x91, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x1b, 0x84, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xa1, 0x97, 0x00, 0x5e, 0x05, 0x10, 0x01, 0x00, 0x85, 0x91, 0x22, 0x09,</div><div class='add'>+	0x80, 0x30, 0x00, 0x00, 0x20, 0x98, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0xba, 0x8d, 0x00, 0x05, 0x48, 0xb1, 0x00, 0x00, 0x87, 0x91, 0x00, 0x4a,</div><div class='add'>+	0x1f, 0x90, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x24, 0x00, 0x2d, 0x15, 0x10, 0xc0, 0x01, 0x00, 0x28, 0x00, 0x2d, 0xf0,</div><div class='add'>+	0x16, 0xb0, 0x01, 0x00, 0x22, 0x00, 0x2d, 0xf0, 0x26, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x14, 0x00, 0x2f, 0xf2, 0x0c, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01,</div><div class='add'>+	0xe0, 0xd1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x10, 0x32, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x0b, 0x1b, 0xb0, 0x01, 0x00, 0x04, 0x00, 0x1f, 0x15,</div><div class='add'>+	0x1a, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x23, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x01, 0x2a, 0xb0, 0x01, 0x00, 0x5b, 0x97, 0x00, 0x40,</div><div class='add'>+	0x35, 0xb0, 0x00, 0x00, 0x2f, 0x00, 0x20, 0x40, 0xe7, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xcb, 0x91, 0xa2, 0x45, 0x1f, 0x7c, 0x00, 0x00, 0x24, 0x00, 0x20, 0x0b,</div><div class='add'>+	0xe0, 0xb1, 0x01, 0x00, 0x28, 0x00, 0x20, 0x13, 0xe0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x22, 0x00, 0x20, 0x06, 0xe4, 0xb1, 0x01, 0x00, 0xa1, 0x91, 0x22, 0x5c,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5c, 0x1f, 0x80, 0x01, 0x00,</div><div class='add'>+	0x30, 0x80, 0x00, 0x10, 0x42, 0xc9, 0x01, 0x00, 0xa1, 0x91, 0x22, 0x40,</div><div class='add'>+	0xe3, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x47, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00, 0x9d, 0x91, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x1b, 0x84, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x05, 0x48, 0xb1, 0x01, 0x00, 0x00, 0x80, 0x00, 0x19,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0xc4, 0x91, 0x22, 0x40, 0xe3, 0x6d, 0x00, 0x00,</div><div class='add'>+	0xb2, 0x91, 0x22, 0x42, 0x19, 0x7c, 0x00, 0x00, 0x21, 0x97, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x74, 0x95, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0xbf, 0x91, 0x22, 0x4b, 0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0xa8, 0x91, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0x1b, 0x84, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0xae, 0x91, 0x22, 0x41, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0xe2, 0x95, 0x00, 0x40, 0x11, 0x30, 0x01, 0x00, 0xaf, 0x91, 0x00, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x00, 0x00, 0xcc, 0x95, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0xb1, 0x91, 0x22, 0x09, 0x80, 0x30, 0x00, 0x00, 0x20, 0x98, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x6f, 0x84, 0x00, 0x40, 0x05, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x21, 0x97, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x70, 0x95, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0x43, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00, 0xb5, 0x91, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x1b, 0x84, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xbb, 0x91, 0x22, 0x41, 0x19, 0x7c, 0x00, 0x00, 0xe2, 0x95, 0x00, 0x40,</div><div class='add'>+	0x11, 0x30, 0x01, 0x00, 0xbc, 0x91, 0x00, 0x05, 0x48, 0xb1, 0x00, 0x00,</div><div class='add'>+	0xcc, 0x95, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0xbe, 0x91, 0x22, 0x09,</div><div class='add'>+	0x80, 0x30, 0x00, 0x00, 0x20, 0x98, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x6f, 0x84, 0x00, 0x40, 0x05, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0xc0, 0x91, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0x1b, 0x84, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xc7, 0x91, 0x22, 0x41, 0x19, 0x7c, 0x00, 0x00, 0xe2, 0x95, 0x00, 0x40,</div><div class='add'>+	0x11, 0x30, 0x01, 0x00, 0xc8, 0x91, 0x00, 0x05, 0x48, 0xb1, 0x00, 0x00,</div><div class='add'>+	0xcc, 0x95, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0xca, 0x91, 0x22, 0x09,</div><div class='add'>+	0x80, 0x30, 0x00, 0x00, 0x20, 0x98, 0x00, 0x40, 0x13, 0x30, 0x01, 0x00,</div><div class='add'>+	0xbf, 0x8d, 0x00, 0x40, 0x05, 0xb0, 0x00, 0x00, 0x00, 0x80, 0x00, 0x19,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0xd2, 0x91, 0x22, 0x40, 0xe3, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x43, 0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0xce, 0x91, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x1b, 0x84, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x05, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xd6, 0x91, 0x22, 0x41, 0x19, 0x7c, 0x00, 0x00, 0xe2, 0x95, 0x00, 0x40,</div><div class='add'>+	0x11, 0x30, 0x01, 0x00, 0xd7, 0x91, 0x00, 0x05, 0x48, 0xb1, 0x00, 0x00,</div><div class='add'>+	0xcc, 0x95, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x08, 0x00, 0x2d, 0x0a,</div><div class='add'>+	0x84, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x82, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x14, 0x00, 0x20, 0x40, 0xe1, 0xb1, 0x01, 0x00, 0xdc, 0x91, 0x03, 0x1e,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0xdd, 0x91, 0x00, 0x41, 0x87, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x21, 0x00, 0x00, 0x40, 0x87, 0x98, 0x01, 0x00, 0xea, 0x96, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5c, 0x1f, 0x90, 0x01, 0x00,</div><div class='add'>+	0xe1, 0x91, 0x22, 0x09, 0x80, 0x30, 0x00, 0x00, 0x20, 0x98, 0x00, 0x40,</div><div class='add'>+	0x13, 0x30, 0x01, 0x00, 0xe4, 0x91, 0x22, 0x44, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x20, 0x98, 0x00, 0x4f, 0x81, 0x30, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0x19, 0x80, 0x01, 0x00, 0xba, 0x8d, 0xa2, 0x4a, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0xbf, 0x8d, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xba, 0x00, 0x20, 0x40,</div><div class='add'>+	0xe5, 0xb1, 0x01, 0x00, 0xea, 0x91, 0x9c, 0x17, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0xcc, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00, 0xfb, 0x98, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x8d, 0x98, 0x00, 0x40, 0x13, 0x30, 0x01, 0x00,</div><div class='add'>+	0xc0, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00, 0xc4, 0x00, 0x2d, 0xf0,</div><div class='add'>+	0x82, 0xb0, 0x01, 0x00, 0xd8, 0x98, 0x00, 0xf0, 0x84, 0x30, 0x01, 0x00,</div><div class='add'>+	0xcc, 0x95, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0xbf, 0x8d, 0x22, 0x09,</div><div class='add'>+	0x80, 0x30, 0x00, 0x00, 0x20, 0x98, 0x00, 0x40, 0x13, 0x30, 0x01, 0x00,</div><div class='add'>+	0xbf, 0x8d, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x2e, 0x00, 0x00, 0x40,</div><div class='add'>+	0x43, 0x99, 0x01, 0x00, 0xf6, 0x91, 0x22, 0x40, 0xe7, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x32, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00, 0xfe, 0x91, 0xa2, 0x40,</div><div class='add'>+	0xe5, 0x6d, 0x00, 0x00, 0xb6, 0x96, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x24, 0x00, 0x20, 0x0b, 0xe0, 0xb1, 0x01, 0x00, 0x28, 0x00, 0x20, 0x13,</div><div class='add'>+	0xe0, 0xb1, 0x01, 0x00, 0x22, 0x00, 0x20, 0x06, 0xe4, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x14, 0x00, 0x20, 0x0a, 0xe0, 0xb1, 0x01, 0x00, 0xbf, 0x8d, 0x22, 0x09,</div><div class='add'>+	0x80, 0x30, 0x00, 0x00, 0x20, 0x98, 0x00, 0x40, 0x13, 0x30, 0x01, 0x00,</div><div class='add'>+	0xbf, 0x8d, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xb6, 0x96, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x6f, 0x96, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x0c, 0x92, 0x22, 0x41, 0x19, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0b,</div><div class='add'>+	0x99, 0xb0, 0x01, 0x00, 0x04, 0x00, 0x1f, 0x15, 0x98, 0x50, 0x00, 0x00,</div><div class='add'>+	0x0c, 0x92, 0x20, 0x01, 0x98, 0x6c, 0x00, 0x00, 0x70, 0x00, 0x00, 0x03,</div><div class='add'>+	0x48, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x2e, 0x46, 0x1f, 0x90, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x50, 0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x03,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x42, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xa0, 0x00, 0x00, 0xa4, 0x62, 0xdd, 0x01, 0x00, 0x09, 0x92, 0xa8, 0x00,</div><div class='add'>+	0xe0, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xac, 0x00, 0x2f, 0x00, 0x10, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01,</div><div class='add'>+	0xe0, 0xc1, 0x01, 0x00, 0x14, 0x00, 0x2f, 0x15, 0x10, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x0a, 0x80, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x60, 0x01,</div><div class='add'>+	0x80, 0xd0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x47, 0x19, 0x90, 0x01, 0x00,</div><div class='add'>+	0x8e, 0x91, 0x22, 0x09, 0x80, 0x32, 0x00, 0x00, 0x20, 0x98, 0x00, 0x09,</div><div class='add'>+	0x80, 0x30, 0x01, 0x00, 0x8e, 0x91, 0x00, 0x40, 0x13, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x80, 0x00, 0x03, 0x42, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0,</div><div class='add'>+	0x82, 0xb0, 0x01, 0x00, 0x13, 0x00, 0x00, 0x40, 0x87, 0x98, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4c, 0x43, 0xc1, 0x01, 0x00, 0xea, 0x96, 0x00, 0xf0,</div><div class='add'>+	0x84, 0x30, 0x01, 0x00, 0xba, 0x8d, 0x00, 0x5c, 0x1f, 0x90, 0x00, 0x00,</div><div class='add'>+	0x2c, 0x00, 0x20, 0x40, 0xe7, 0xb1, 0x01, 0x00, 0x2d, 0x00, 0x20, 0x40,</div><div class='add'>+	0xe7, 0xb1, 0x01, 0x00, 0xba, 0x8d, 0x00, 0x42, 0x19, 0x80, 0x00, 0x00,</div><div class='add'>+	0xdc, 0x96, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0xf5, 0x97, 0x00, 0x48,</div><div class='add'>+	0x95, 0x30, 0x01, 0x00, 0x00, 0x00, 0x00, 0x45, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00, 0x21, 0x92, 0xa8, 0x40,</div><div class='add'>+	0x13, 0x30, 0x00, 0x00, 0x1b, 0x84, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x27, 0x92, 0x00, 0x05, 0x48, 0xb1, 0x00, 0x00, 0x26, 0x92, 0x00, 0x40,</div><div class='add'>+	0x13, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x08, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00, 0x14, 0x00, 0x2d, 0xf0,</div><div class='add'>+	0x82, 0xb0, 0x01, 0x00, 0x04, 0x00, 0x22, 0xf0, 0x84, 0x30, 0x00, 0x00,</div><div class='add'>+	0x13, 0x00, 0x00, 0x40, 0x87, 0x98, 0x01, 0x00, 0xea, 0x96, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5c, 0x1f, 0x90, 0x01, 0x00,</div><div class='add'>+	0x3f, 0x92, 0x00, 0x09, 0x00, 0xb0, 0x00, 0x00, 0xba, 0x8d, 0x87, 0x42,</div><div class='add'>+	0x19, 0x10, 0x00, 0x00, 0x8b, 0x00, 0x2f, 0x47, 0x19, 0x80, 0x01, 0x00,</div><div class='add'>+	0xba, 0x8d, 0x00, 0x40, 0xe7, 0x91, 0x00, 0x00, 0x2f, 0x00, 0x00, 0x40,</div><div class='add'>+	0x47, 0x99, 0x01, 0x00, 0x3d, 0x92, 0x22, 0x47, 0xe7, 0x7d, 0x00, 0x00,</div><div class='add'>+	0x51, 0x95, 0x00, 0x40, 0xe7, 0x31, 0x01, 0x00, 0x3d, 0x92, 0x22, 0x00,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x38, 0x92, 0xa2, 0x40, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0xcc, 0x95, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x3d, 0x92, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x30, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00,</div><div class='add'>+	0x32, 0x00, 0x2d, 0xf2, 0x94, 0xb0, 0x01, 0x00, 0x74, 0x96, 0x00, 0xf2,</div><div class='add'>+	0x02, 0x30, 0x01, 0x00, 0x7b, 0x96, 0x00, 0x4b, 0x02, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x05, 0x48, 0xb1, 0x01, 0x00, 0x3e, 0x92, 0x00, 0x40,</div><div class='add'>+	0x01, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x05, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x44, 0x92, 0x22, 0x00, 0x80, 0x32, 0x00, 0x00, 0x43, 0x92, 0xa2, 0x42,</div><div class='add'>+	0x19, 0x7c, 0x00, 0x00, 0xc9, 0x96, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x44, 0x92, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xf9, 0x96, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0xce, 0x92, 0x22, 0x5c, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x5c, 0x1f, 0x80, 0x01, 0x00, 0x00, 0x80, 0x00, 0x10,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0x4c, 0x92, 0x22, 0x40, 0xe3, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x45, 0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x49, 0x92, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x1b, 0x84, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0xce, 0x92, 0x00, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x00, 0x00, 0xbf, 0x95, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x52, 0x92, 0xa2, 0x08, 0x80, 0x32, 0x00, 0x00, 0xaf, 0x97, 0x00, 0x4d,</div><div class='add'>+	0x81, 0x30, 0x01, 0x00, 0x00, 0x82, 0x00, 0x02, 0x04, 0xdc, 0x01, 0x00,</div><div class='add'>+	0xff, 0x89, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x74, 0x00, 0x00, 0x40,</div><div class='add'>+	0x43, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x82, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf0, 0x84, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x96, 0xb0, 0x01, 0x00, 0x60, 0x92, 0x22, 0x42, 0x96, 0x14, 0x00, 0x00,</div><div class='add'>+	0x00, 0x80, 0x00, 0x10, 0x44, 0xc9, 0x01, 0x00, 0x64, 0x00, 0x68, 0x40,</div><div class='add'>+	0x97, 0x98, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x42, 0xf0, 0xb1, 0x01, 0x00, 0x70, 0x00, 0x00, 0x05,</div><div class='add'>+	0xe0, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x45, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x20, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00, 0x5d, 0x92, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5c, 0x1f, 0x90, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x45, 0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x61, 0x92, 0xa8, 0x5c, 0x1f, 0x00, 0x00, 0x00,</div><div class='add'>+	0x1b, 0x84, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x5e, 0x01, 0x2d, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x65, 0x92, 0x47, 0xf2, 0x12, 0x30, 0x00, 0x00,</div><div class='add'>+	0x00, 0x99, 0x3f, 0x42, 0x13, 0xf0, 0x01, 0x00, 0x6a, 0x92, 0x22, 0x47,</div><div class='add'>+	0xe7, 0x7d, 0x00, 0x00, 0x6b, 0x84, 0x1f, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x64, 0x92, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x47,</div><div class='add'>+	0xe7, 0x91, 0x01, 0x00, 0x04, 0x00, 0x1f, 0x09, 0x96, 0xe4, 0x01, 0x00,</div><div class='add'>+	0x00, 0x80, 0x00, 0x10, 0x44, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x68, 0xa8, 0x97, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x03, 0xe0, 0xb1, 0x01, 0x00, 0x00, 0x80, 0x00, 0x03,</div><div class='add'>+	0x44, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x10, 0x62, 0xb1, 0x01, 0x00, 0x72, 0x92, 0xa8, 0x40,</div><div class='add'>+	0xe1, 0x31, 0x00, 0x00, 0x1b, 0x84, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x99, 0x3f, 0x42, 0x13, 0xf0, 0x01, 0x00, 0x76, 0x92, 0x47, 0x05,</div><div class='add'>+	0x48, 0x31, 0x00, 0x00, 0x3f, 0x00, 0x00, 0xf3, 0x96, 0x88, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0xe7, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x1f, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x7e, 0x92, 0x22, 0x4b, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x55, 0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4b,</div><div class='add'>+	0x62, 0xb1, 0x01, 0x00, 0x7c, 0x92, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x07, 0x16, 0xb0, 0x01, 0x00, 0x00, 0x62, 0x00, 0x0b,</div><div class='add'>+	0x16, 0xdc, 0x01, 0x00, 0x51, 0x95, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x96, 0x92, 0x22, 0x00, 0x80, 0x32, 0x00, 0x00, 0xff, 0x96, 0x00, 0x5f,</div><div class='add'>+	0x01, 0x10, 0x01, 0x00, 0x80, 0x92, 0x22, 0x40, 0x95, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x80, 0x00, 0x10, 0x44, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x50,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x03, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x42, 0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xb1, 0x01, 0x00, 0x88, 0x92, 0xa8, 0x00, 0xe0, 0x31, 0x00, 0x00,</div><div class='add'>+	0x1b, 0x84, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x04, 0x80, 0x00, 0x03, 0x42, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf2, 0x02, 0xb0, 0x01, 0x00, 0x74, 0x96, 0x00, 0x52,</div><div class='add'>+	0x95, 0x30, 0x01, 0x00, 0xcc, 0x95, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x80, 0x92, 0x22, 0x41, 0x97, 0x50, 0x00, 0x00, 0x0c, 0x80, 0x00, 0x03,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x5c, 0x01, 0x80, 0x01, 0x00, 0x7b, 0x96, 0x00, 0x4b,</div><div class='add'>+	0x02, 0xb0, 0x00, 0x00, 0x80, 0x92, 0x00, 0x05, 0x48, 0xb1, 0x00, 0x00,</div><div class='add'>+	0x00, 0x98, 0x00, 0x40, 0x03, 0x30, 0x01, 0x00, 0x17, 0x80, 0x00, 0x03,</div><div class='add'>+	0x44, 0xc9, 0x01, 0x00, 0x00, 0xf0, 0x00, 0x0c, 0x96, 0x88, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x63, 0x4c, 0x97, 0xf0, 0x01, 0x00, 0x10, 0x80, 0x00, 0x03,</div><div class='add'>+	0x44, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0xab, 0xe1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xa1, 0x97, 0x00, 0x5e, 0x05, 0x10, 0x01, 0x00, 0x03, 0x00, 0x00, 0x07,</div><div class='add'>+	0x1a, 0xf4, 0x01, 0x00, 0x07, 0x00, 0x00, 0x07, 0x16, 0x88, 0x01, 0x00,</div><div class='add'>+	0x00, 0xb5, 0x00, 0x0d, 0x46, 0xc9, 0x01, 0x00, 0xa0, 0x92, 0x30, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0b, 0xe6, 0x81, 0x01, 0x00,</div><div class='add'>+	0x00, 0xb7, 0x00, 0x0d, 0x46, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x0b,</div><div class='add'>+	0xe6, 0x81, 0x01, 0x00, 0x10, 0x00, 0x10, 0x0f, 0x94, 0xf4, 0x01, 0x00,</div><div class='add'>+	0xd1, 0x99, 0x00, 0x5f, 0x95, 0x04, 0x01, 0x00, 0x55, 0x96, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0xaa, 0x92, 0x22, 0x50, 0xfd, 0x7f, 0x00, 0x00,</div><div class='add'>+	0xa8, 0x92, 0x43, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x1b, 0x41,</div><div class='add'>+	0x31, 0xd3, 0x01, 0x00, 0x00, 0x00, 0x2e, 0x05, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0xe1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x0f, 0xb0, 0x01, 0x00, 0xb8, 0x95, 0x00, 0x41, 0x81, 0x30, 0x01, 0x00,</div><div class='add'>+	0xff, 0x89, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xbf, 0x95, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0xbb, 0x92, 0xa2, 0x08, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x82, 0x00, 0x02, 0x04, 0xdc, 0x01, 0x00, 0x00, 0x00, 0x00, 0x45,</div><div class='add'>+	0x03, 0xf0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0xc0, 0x01, 0x00,</div><div class='add'>+	0xb4, 0x92, 0x37, 0x5c, 0x61, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1b,</div><div class='add'>+	0x62, 0xb1, 0x01, 0x00, 0xb8, 0x92, 0x28, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0xb5, 0x92, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+	0x62, 0xb1, 0x01, 0x00, 0xb8, 0x92, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0xff, 0x89, 0x17, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x74, 0x00, 0x22, 0x40,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0xe1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xf5, 0x97, 0x00, 0x4a, 0x95, 0x30, 0x01, 0x00, 0xdc, 0x96, 0x00, 0x5c,</div><div class='add'>+	0x1f, 0x10, 0x01, 0x00, 0x52, 0x92, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x2f, 0x00, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00, 0xcc, 0x92, 0x22, 0x47,</div><div class='add'>+	0xe7, 0x7d, 0x00, 0x00, 0x51, 0x95, 0x00, 0x40, 0xe7, 0x31, 0x01, 0x00,</div><div class='add'>+	0xcc, 0x92, 0x22, 0x00, 0x80, 0x32, 0x00, 0x00, 0xc7, 0x92, 0xa2, 0x40,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0xcc, 0x95, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0xcc, 0x92, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x30, 0x00, 0x00, 0x40,</div><div class='add'>+	0x43, 0x99, 0x01, 0x00, 0x32, 0x00, 0x2d, 0xf2, 0x94, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x74, 0x96, 0x00, 0xf2, 0x02, 0x30, 0x01, 0x00, 0x7b, 0x96, 0x00, 0x4b,</div><div class='add'>+	0x02, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xf5, 0x97, 0x00, 0x48, 0x95, 0x30, 0x01, 0x00, 0xdc, 0x96, 0x00, 0x5c,</div><div class='add'>+	0x1f, 0x10, 0x01, 0x00, 0xd1, 0x92, 0x87, 0x42, 0x19, 0x10, 0x00, 0x00,</div><div class='add'>+	0x8b, 0x00, 0x2f, 0x47, 0x19, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0xe7, 0x91, 0x01, 0x00, 0x20, 0x98, 0x00, 0x42, 0x81, 0x30, 0x01, 0x00,</div><div class='add'>+	0xba, 0x8d, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xdc, 0x96, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0xba, 0x8d, 0x00, 0x5c, 0x1f, 0x90, 0x00, 0x00,</div><div class='add'>+	0xba, 0x00, 0x20, 0x40, 0xe5, 0xb1, 0x01, 0x00, 0x8d, 0x98, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0xc0, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00,</div><div class='add'>+	0xc4, 0x00, 0x2d, 0xf0, 0x82, 0xb0, 0x01, 0x00, 0xd8, 0x98, 0x00, 0xf0,</div><div class='add'>+	0x84, 0x30, 0x01, 0x00, 0xcc, 0x95, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x20, 0x98, 0x00, 0x45, 0x81, 0x30, 0x01, 0x00, 0xba, 0x8d, 0x22, 0x42,</div><div class='add'>+	0x19, 0x7c, 0x00, 0x00, 0xaf, 0x97, 0x00, 0x3a, 0x81, 0x30, 0x01, 0x00,</div><div class='add'>+	0xba, 0x8d, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0xbf, 0x95, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0xe5, 0x92, 0xa2, 0x08, 0x80, 0x32, 0x00, 0x00, 0xaf, 0x97, 0x00, 0x47,</div><div class='add'>+	0x80, 0x30, 0x01, 0x00, 0x00, 0x82, 0x00, 0x02, 0x04, 0xdc, 0x01, 0x00,</div><div class='add'>+	0xff, 0x89, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x10, 0x80, 0x00, 0x03,</div><div class='add'>+	0x44, 0xc9, 0x01, 0x00, 0x00, 0xe1, 0x00, 0xa6, 0x84, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x60, 0x07, 0x84, 0x94, 0x01, 0x00,</div><div class='add'>+	0xa1, 0x97, 0x00, 0x5e, 0x05, 0x10, 0x01, 0x00, 0xba, 0x8d, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x8a, 0x00, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00,</div><div class='add'>+	0xcc, 0x95, 0x00, 0x41, 0xe7, 0x41, 0x01, 0x00, 0xbf, 0x8d, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0xb6, 0x96, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x6f, 0x96, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01,</div><div class='add'>+	0x2c, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x15, 0x10, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x10, 0xc0, 0x01, 0x00, 0x04, 0x00, 0x1f, 0x0a,</div><div class='add'>+	0x2c, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x32, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x07, 0x00, 0x00, 0x0b, 0x96, 0x88, 0x01, 0x00, 0x01, 0x93, 0x26, 0x47,</div><div class='add'>+	0x97, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x97, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x01, 0x93, 0x23, 0x4b, 0x0c, 0x6c, 0x00, 0x00, 0x33, 0x98, 0x00, 0x4b,</div><div class='add'>+	0x04, 0x30, 0x01, 0x00, 0x00, 0x00, 0x00, 0x50, 0x33, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x02, 0x10, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x02,</div><div class='add'>+	0x16, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x06, 0x04, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x33, 0x98, 0x00, 0x4b, 0x04, 0x50, 0x01, 0x00, 0x02, 0x93, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x33, 0x98, 0x00, 0x06, 0x04, 0x30, 0x01, 0x00,</div><div class='add'>+	0x08, 0x93, 0xa2, 0x48, 0x1f, 0x7c, 0x00, 0x00, 0x06, 0x93, 0x84, 0x48,</div><div class='add'>+	0x1f, 0x10, 0x00, 0x00, 0xac, 0x00, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00,</div><div class='add'>+	0x08, 0x93, 0x00, 0x0a, 0xe0, 0xc1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a,</div><div class='add'>+	0x02, 0xb0, 0x01, 0x00, 0xda, 0x94, 0x00, 0x01, 0x8c, 0x30, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x43, 0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x09, 0x93, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x1b, 0x84, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x02, 0x10, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x16, 0x93, 0x22, 0x06, 0x14, 0x50, 0x00, 0x00, 0x24, 0x97, 0x00, 0x45,</div><div class='add'>+	0x1f, 0x00, 0x01, 0x00, 0xf5, 0x92, 0x22, 0x5c, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x47, 0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x12, 0x93, 0xa8, 0x5c, 0x1f, 0x00, 0x00, 0x00,</div><div class='add'>+	0x1b, 0x84, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0xf5, 0x92, 0x00, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0b, 0x1b, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x08, 0x00, 0x2d, 0x40, 0x85, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0,</div><div class='add'>+	0x82, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x05, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xea, 0x96, 0x00, 0x41, 0x87, 0x30, 0x01, 0x00, 0x00, 0x00, 0x00, 0x45,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0x1c, 0x93, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0x1b, 0x84, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x22, 0x93, 0x22, 0x09, 0x80, 0x30, 0x00, 0x00, 0x20, 0x98, 0x00, 0x40,</div><div class='add'>+	0x13, 0x30, 0x01, 0x00, 0x26, 0x93, 0x22, 0x44, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x20, 0x98, 0x00, 0x4f, 0x81, 0x30, 0x01, 0x00, 0x26, 0x93, 0xa2, 0x47,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x19, 0x80, 0x01, 0x00,</div><div class='add'>+	0xff, 0x07, 0x00, 0x08, 0x00, 0x8c, 0x01, 0x00, 0x34, 0x93, 0x22, 0x4a,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x2c, 0x93, 0xa2, 0x16, 0x02, 0x30, 0x00, 0x00,</div><div class='add'>+	0xcc, 0x95, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x2f, 0x00, 0x20, 0x40,</div><div class='add'>+	0xe7, 0xb1, 0x01, 0x00, 0xba, 0x8d, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x2d, 0x00, 0x2d, 0x08, 0x2a, 0xb0, 0x01, 0x00, 0x30, 0x93, 0x22, 0x42,</div><div class='add'>+	0x19, 0x7c, 0x00, 0x00, 0xf9, 0x96, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x31, 0x93, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xc9, 0x96, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x30, 0x00, 0x2e, 0x00, 0x2a, 0xd0, 0x01, 0x00,</div><div class='add'>+	0x32, 0x00, 0x2a, 0x15, 0xe4, 0xb1, 0x01, 0x00, 0xba, 0x8d, 0x00, 0x16,</div><div class='add'>+	0xe4, 0xb1, 0x00, 0x00, 0x46, 0x93, 0x22, 0x16, 0x02, 0x30, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x08, 0x2a, 0xb0, 0x01, 0x00, 0xf4, 0x98, 0x00, 0x40,</div><div class='add'>+	0x95, 0x30, 0x01, 0x00, 0x47, 0x93, 0x22, 0x40, 0x11, 0x6c, 0x00, 0x00,</div><div class='add'>+	0xac, 0x00, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00, 0xb0, 0x00, 0x2b, 0x01,</div><div class='add'>+	0xe0, 0xc1, 0x01, 0x00, 0x00, 0x2b, 0x00, 0xa6, 0x16, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x01, 0xe0, 0xd1, 0x01, 0x00, 0xf8, 0x97, 0x00, 0x08,</div><div class='add'>+	0x80, 0x30, 0x01, 0x00, 0x3f, 0x93, 0x00, 0x5e, 0x17, 0x90, 0x00, 0x00,</div><div class='add'>+	0x19, 0x98, 0x00, 0x43, 0x61, 0x31, 0x01, 0x00, 0x00, 0x00, 0x00, 0x43,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0x40, 0x93, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0x1b, 0x84, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x98, 0x00, 0x07, 0x16, 0x14, 0x01, 0x00, 0xa1, 0x97, 0x00, 0x5e,</div><div class='add'>+	0x05, 0x10, 0x01, 0x00, 0xcc, 0x95, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x2f, 0x00, 0x20, 0x40, 0xe7, 0xb1, 0x01, 0x00, 0xbf, 0x8d, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0b, 0x1b, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x1f, 0x15, 0x1a, 0x50, 0x00, 0x00, 0x54, 0x93, 0x20, 0x16,</div><div class='add'>+	0x1a, 0x6c, 0x00, 0x00, 0x70, 0x00, 0x00, 0x03, 0x48, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x22, 0x50, 0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x03,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x42, 0x61, 0xb1, 0x01, 0x00, 0xa0, 0x00, 0x00, 0xa4,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x51, 0x93, 0xa8, 0x46, 0x1f, 0x10, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x05, 0x48, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+	0x10, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x15, 0x10, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x0a, 0x2a, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x0a,</div><div class='add'>+	0x2c, 0xd0, 0x01, 0x00, 0xac, 0x00, 0x2f, 0x40, 0x23, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x5b, 0x93, 0x84, 0x45, 0x1f, 0x10, 0x00, 0x00, 0x5c, 0x93, 0x00, 0x0a,</div><div class='add'>+	0xe0, 0xc1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x02, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x5b, 0x97, 0x00, 0x40, 0x35, 0xb0, 0x00, 0x00, 0x00, 0x80, 0x00, 0x19,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0x64, 0x93, 0x22, 0x40, 0xe3, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x43, 0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x60, 0x93, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x1b, 0x84, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x73, 0x93, 0xa2, 0x02, 0x1a, 0x50, 0x00, 0x00,</div><div class='add'>+	0x74, 0x93, 0x22, 0x40, 0x2d, 0x6c, 0x00, 0x00, 0x00, 0x80, 0x00, 0x10,</div><div class='add'>+	0x44, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x50, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x03, 0xf0, 0xb1, 0x01, 0x00, 0xff, 0x07, 0x00, 0x08,</div><div class='add'>+	0xe0, 0x8d, 0x01, 0x00, 0x00, 0x00, 0x00, 0x42, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x10, 0x62, 0xb1, 0x01, 0x00, 0x6b, 0x93, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x1b, 0x84, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x05, 0x48, 0xb1, 0x01, 0x00, 0x0c, 0x80, 0x00, 0x03,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0x10, 0x00, 0x00, 0xf0, 0x10, 0xc8, 0x01, 0x00,</div><div class='add'>+	0xf0, 0x07, 0x00, 0x40, 0x1b, 0x98, 0x01, 0x00, 0x74, 0x93, 0x00, 0x5c,</div><div class='add'>+	0x11, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x10, 0xc0, 0x01, 0x00,</div><div class='add'>+	0xe2, 0x95, 0x00, 0x40, 0x1f, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x78, 0x93, 0x23, 0x0d, 0x2c, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x1f, 0x90, 0x01, 0x00, 0x80, 0x93, 0x22, 0x46,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x70, 0x80, 0x00, 0x03, 0x42, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x80, 0x93, 0x22, 0x40, 0xe3, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0x7c, 0x93, 0xa8, 0x46, 0x1f, 0x00, 0x00, 0x00, 0x1b, 0x84, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x08, 0x00, 0x2d, 0x40, 0x85, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0,</div><div class='add'>+	0x82, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x05, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xea, 0x96, 0x00, 0x41, 0x87, 0x30, 0x01, 0x00, 0x00, 0x00, 0x00, 0x45,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0x85, 0x93, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0x1b, 0x84, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x8b, 0x93, 0x22, 0x09, 0x80, 0x30, 0x00, 0x00, 0x20, 0x98, 0x00, 0x40,</div><div class='add'>+	0x13, 0x30, 0x01, 0x00, 0x8f, 0x93, 0x22, 0x44, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x20, 0x98, 0x00, 0x4f, 0x81, 0x30, 0x01, 0x00, 0x8f, 0x93, 0xa2, 0x47,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x19, 0x80, 0x01, 0x00,</div><div class='add'>+	0xff, 0x07, 0x00, 0x08, 0x00, 0x8c, 0x01, 0x00, 0xa4, 0x93, 0x22, 0x4a,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x95, 0x93, 0xa2, 0x16, 0x02, 0x30, 0x00, 0x00,</div><div class='add'>+	0xcc, 0x95, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x2f, 0x00, 0x20, 0x40,</div><div class='add'>+	0xe7, 0xb1, 0x01, 0x00, 0xba, 0x8d, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x2d, 0x00, 0x2d, 0x08, 0x2a, 0xb0, 0x01, 0x00, 0xa0, 0x93, 0x22, 0x42,</div><div class='add'>+	0x19, 0x7c, 0x00, 0x00, 0x99, 0x93, 0xa2, 0xf3, 0x84, 0x30, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xa5, 0x85, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x85, 0xd0, 0x01, 0x00, 0xd4, 0x00, 0x3e, 0x41, 0x85, 0xe0, 0x01, 0x00,</div><div class='add'>+	0x9d, 0x93, 0x22, 0x40, 0x1f, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5a,</div><div class='add'>+	0x11, 0x90, 0x01, 0x00, 0x0b, 0x00, 0x00, 0x08, 0xe4, 0xf5, 0x01, 0x00,</div><div class='add'>+	0xf9, 0x96, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0xa1, 0x93, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0xc9, 0x96, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x30, 0x00, 0x2e, 0x00, 0x2a, 0xd0, 0x01, 0x00, 0x32, 0x00, 0x2a, 0x15,</div><div class='add'>+	0xe4, 0xb1, 0x01, 0x00, 0xba, 0x8d, 0x00, 0x16, 0xe4, 0xb1, 0x00, 0x00,</div><div class='add'>+	0xa7, 0x93, 0xa2, 0x16, 0x02, 0x30, 0x00, 0x00, 0xcc, 0x95, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0xf4, 0x93, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x2d, 0x00, 0x2d, 0x08, 0x2a, 0xb0, 0x01, 0x00, 0xb4, 0x93, 0x22, 0x47,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0xb1, 0x93, 0x22, 0x42, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0xac, 0x93, 0xa2, 0xf3, 0x84, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5,</div><div class='add'>+	0x85, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41, 0x85, 0xd0, 0x01, 0x00,</div><div class='add'>+	0xd4, 0x00, 0x3e, 0x41, 0x85, 0xe0, 0x01, 0x00, 0xb0, 0x93, 0x22, 0x40,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5a, 0x11, 0x90, 0x01, 0x00,</div><div class='add'>+	0x0b, 0x00, 0x00, 0x08, 0xe4, 0xf5, 0x01, 0x00, 0x58, 0x01, 0x2d, 0x00,</div><div class='add'>+	0x2a, 0xd0, 0x01, 0x00, 0x60, 0x01, 0x2d, 0xf0, 0x10, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x3f, 0x91, 0x00, 0xf0, 0x2c, 0xb0, 0x00, 0x00, 0xf4, 0x98, 0x00, 0x41,</div><div class='add'>+	0x95, 0x30, 0x01, 0x00, 0xbb, 0x93, 0xa2, 0x08, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x97, 0xb0, 0x01, 0x00, 0xb9, 0x93, 0x23, 0x0d,</div><div class='add'>+	0x02, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x97, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x7b, 0x96, 0x00, 0x4b, 0x02, 0xb0, 0x00, 0x00, 0xf4, 0x93, 0x00, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x00, 0x00, 0xac, 0x00, 0x2f, 0x01, 0x14, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xb0, 0x00, 0x2b, 0x01, 0xe0, 0xc1, 0x01, 0x00, 0x00, 0x2b, 0x00, 0xa6,</div><div class='add'>+	0x16, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0xe0, 0xd1, 0x01, 0x00,</div><div class='add'>+	0xcb, 0x93, 0x23, 0x0d, 0x02, 0x6c, 0x00, 0x00, 0x00, 0x80, 0x00, 0x10,</div><div class='add'>+	0x44, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x50, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x03, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x42,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x10, 0x62, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xc4, 0x93, 0xa8, 0x00, 0xe0, 0x31, 0x00, 0x00, 0x1b, 0x84, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x0c, 0x80, 0x00, 0x03, 0x42, 0xc9, 0x01, 0x00, 0x10, 0x00, 0x00, 0xf0,</div><div class='add'>+	0x22, 0xc8, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5c, 0x23, 0x80, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x01, 0x84, 0xb0, 0x01, 0x00, 0xce, 0x93, 0x23, 0x0d,</div><div class='add'>+	0x02, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0d, 0x02, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x08, 0x80, 0xb0, 0x01, 0x00, 0xd3, 0x93, 0x22, 0x40,</div><div class='add'>+	0x1b, 0x6c, 0x00, 0x00, 0xf8, 0x97, 0x00, 0x01, 0x84, 0x50, 0x01, 0x00,</div><div class='add'>+	0xdb, 0x93, 0x22, 0x40, 0x85, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,</div><div class='add'>+	0x80, 0xc0, 0x01, 0x00, 0x10, 0x80, 0x00, 0x10, 0x46, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4f, 0x43, 0x81, 0x01, 0x00, 0x00, 0x00, 0x00, 0x42,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x20, 0x00, 0x00, 0x40, 0xf0, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x16, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x43,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0xa0, 0x00, 0x00, 0xa1, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0xd9, 0x93, 0xa8, 0x11, 0xe0, 0x31, 0x00, 0x00, 0xea, 0x93, 0x00, 0x5e,</div><div class='add'>+	0x17, 0x90, 0x00, 0x00, 0xde, 0x93, 0x23, 0x0d, 0x02, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x0d, 0x02, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01,</div><div class='add'>+	0x84, 0xd0, 0x01, 0x00, 0xe3, 0x93, 0x22, 0x40, 0x1b, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x19, 0x98, 0x00, 0x43, 0x61, 0x31, 0x01, 0x00, 0xea, 0x93, 0x22, 0x40,</div><div class='add'>+	0x85, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x12, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x10, 0x80, 0x00, 0x10, 0x46, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4f,</div><div class='add'>+	0x43, 0x81, 0x01, 0x00, 0x00, 0x00, 0x00, 0x42, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x09, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x18,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0xa0, 0x00, 0x00, 0xa1, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0xe8, 0x93, 0xa8, 0x11, 0xe0, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0xeb, 0x93, 0xa8, 0x0a, 0x02, 0x30, 0x00, 0x00, 0x1b, 0x84, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0xcc, 0x95, 0x00, 0x05, 0x48, 0x31, 0x01, 0x00,</div><div class='add'>+	0xf2, 0x93, 0x23, 0x0d, 0x02, 0x6c, 0x00, 0x00, 0xff, 0x07, 0x00, 0x11,</div><div class='add'>+	0x00, 0x8c, 0x01, 0x00, 0xcc, 0x95, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x00, 0x98, 0x00, 0x07, 0x16, 0x14, 0x01, 0x00, 0xa1, 0x97, 0x00, 0x5e,</div><div class='add'>+	0x05, 0x10, 0x01, 0x00, 0x2f, 0x00, 0x20, 0x40, 0xe7, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xbf, 0x8d, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x80, 0x00, 0x03,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x82, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf8, 0x8c, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0,</div><div class='add'>+	0x8e, 0xb0, 0x01, 0x00, 0xb3, 0x96, 0x00, 0x40, 0x13, 0x30, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x85, 0xb0, 0x01, 0x00, 0xea, 0x96, 0x00, 0x41,</div><div class='add'>+	0x87, 0x30, 0x01, 0x00, 0x6f, 0x96, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x00, 0x80, 0x00, 0x10, 0x42, 0xc9, 0x01, 0x00, 0x05, 0x94, 0x22, 0x40,</div><div class='add'>+	0xe3, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x45, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00, 0x01, 0x94, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x1b, 0x84, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x05, 0x48, 0xb1, 0x01, 0x00, 0x07, 0x94, 0x22, 0x09,</div><div class='add'>+	0x80, 0x30, 0x00, 0x00, 0x20, 0x98, 0x00, 0x40, 0x13, 0x30, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x0b, 0x1b, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x15,</div><div class='add'>+	0x1a, 0xd0, 0x01, 0x00, 0x0d, 0x94, 0xa2, 0x41, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0xf4, 0x98, 0x00, 0x40, 0x95, 0x30, 0x01, 0x00, 0x15, 0x94, 0x22, 0x08,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x38, 0x93, 0x00, 0x00, 0x2a, 0xc0, 0x00, 0x00,</div><div class='add'>+	0xf4, 0x98, 0x00, 0x41, 0x95, 0x30, 0x01, 0x00, 0x10, 0x94, 0x22, 0x08,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0xbb, 0x93, 0x00, 0x00, 0x2a, 0xc0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x97, 0xb0, 0x01, 0x00, 0x13, 0x94, 0x23, 0x0d,</div><div class='add'>+	0x02, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x97, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x7b, 0x96, 0x00, 0x4b, 0x02, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0xba, 0x8d, 0x22, 0x42, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0xaf, 0x97, 0x00, 0x3a, 0x81, 0x30, 0x01, 0x00, 0xba, 0x8d, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x19, 0x94, 0x00, 0x4a, 0x1f, 0x90, 0x00, 0x00,</div><div class='add'>+	0xf4, 0x95, 0x00, 0x00, 0x10, 0x30, 0x01, 0x00, 0x00, 0x00, 0x00, 0x15,</div><div class='add'>+	0x10, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x10, 0x32, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x07, 0x00, 0x00, 0x0b, 0x96, 0x88, 0x01, 0x00, 0x27, 0x94, 0x26, 0x47,</div><div class='add'>+	0x97, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x97, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x27, 0x94, 0x23, 0x4b, 0x0c, 0x6c, 0x00, 0x00, 0x33, 0x98, 0x00, 0x4b,</div><div class='add'>+	0x04, 0x30, 0x01, 0x00, 0x00, 0x00, 0x00, 0x50, 0x33, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x02, 0x10, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x02,</div><div class='add'>+	0x16, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x06, 0x04, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x33, 0x98, 0x00, 0x4b, 0x04, 0x50, 0x01, 0x00, 0x28, 0x94, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x33, 0x98, 0x00, 0x06, 0x04, 0x30, 0x01, 0x00,</div><div class='add'>+	0x2d, 0x94, 0xa2, 0x44, 0x1f, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0b,</div><div class='add'>+	0x1b, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x2c, 0xd0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x0a, 0x02, 0xb0, 0x01, 0x00, 0xda, 0x94, 0x00, 0x01,</div><div class='add'>+	0x8c, 0x30, 0x01, 0x00, 0x00, 0x80, 0x00, 0x19, 0x42, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x34, 0x94, 0x22, 0x40, 0xe3, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0x30, 0x94, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0x1b, 0x84, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x02, 0x10, 0xc0, 0x01, 0x00, 0x3d, 0x94, 0x22, 0x06,</div><div class='add'>+	0x14, 0x50, 0x00, 0x00, 0x24, 0x97, 0x00, 0x45, 0x1f, 0x00, 0x01, 0x00,</div><div class='add'>+	0x1b, 0x94, 0x22, 0x5c, 0x1f, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x47,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0x39, 0x94, 0xa8, 0x5c, 0x1f, 0x00, 0x00, 0x00, 0x1b, 0x84, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x1b, 0x94, 0x00, 0x05, 0x48, 0xb1, 0x00, 0x00,</div><div class='add'>+	0x08, 0x00, 0x2d, 0x40, 0x85, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0,</div><div class='add'>+	0x82, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x05, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xea, 0x96, 0x00, 0x41, 0x87, 0x30, 0x01, 0x00, 0x00, 0x00, 0x00, 0x45,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0x42, 0x94, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0x1b, 0x84, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x48, 0x94, 0x22, 0x09, 0x80, 0x30, 0x00, 0x00, 0x20, 0x98, 0x00, 0x40,</div><div class='add'>+	0x13, 0x30, 0x01, 0x00, 0x4b, 0x94, 0x22, 0x44, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x20, 0x98, 0x00, 0x4f, 0x81, 0x30, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0x19, 0x80, 0x01, 0x00, 0xff, 0x07, 0x00, 0x08, 0x00, 0x8c, 0x01, 0x00,</div><div class='add'>+	0x59, 0x94, 0x22, 0x4a, 0x1f, 0x7c, 0x00, 0x00, 0x51, 0x94, 0xa2, 0x16,</div><div class='add'>+	0x02, 0x30, 0x00, 0x00, 0xcc, 0x95, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x2f, 0x00, 0x20, 0x40, 0xe7, 0xb1, 0x01, 0x00, 0xba, 0x8d, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x2d, 0x00, 0x2d, 0x08, 0x2a, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x55, 0x94, 0x22, 0x42, 0x19, 0x7c, 0x00, 0x00, 0xf9, 0x96, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x56, 0x94, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xc9, 0x96, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x30, 0x00, 0x2e, 0x00,</div><div class='add'>+	0x2a, 0xd0, 0x01, 0x00, 0x32, 0x00, 0x2a, 0x15, 0xe4, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xba, 0x8d, 0x00, 0x16, 0xe4, 0xb1, 0x00, 0x00, 0x35, 0x93, 0xa2, 0x16,</div><div class='add'>+	0x02, 0x30, 0x00, 0x00, 0xcc, 0x95, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x2f, 0x00, 0x20, 0x40, 0xe7, 0xb1, 0x01, 0x00, 0xbf, 0x8d, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0xf4, 0x95, 0x00, 0x4a, 0x1f, 0x10, 0x01, 0x00,</div><div class='add'>+	0x49, 0x93, 0x00, 0x10, 0x32, 0xb0, 0x00, 0x00, 0x8a, 0x00, 0x20, 0x40,</div><div class='add'>+	0xe7, 0xb1, 0x01, 0x00, 0x63, 0x94, 0xa2, 0x41, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0xcc, 0x95, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x66, 0x94, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x74, 0x96, 0x00, 0x15, 0x94, 0x30, 0x01, 0x00,</div><div class='add'>+	0x7b, 0x96, 0x00, 0x4b, 0x02, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x68, 0x94, 0x22, 0x42, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0xaf, 0x97, 0x00, 0x3a, 0x81, 0x30, 0x01, 0x00, 0x20, 0x98, 0x00, 0x45,</div><div class='add'>+	0x81, 0x30, 0x01, 0x00, 0xba, 0x8d, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xfe, 0x91, 0x00, 0x45, 0x1f, 0x90, 0x00, 0x00, 0xb6, 0x96, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x6f, 0x96, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x49, 0x93, 0x00, 0x01, 0x2c, 0xb0, 0x00, 0x00, 0xbf, 0x95, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x7a, 0x94, 0xa2, 0x08, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x82, 0x00, 0x02, 0x04, 0xdc, 0x01, 0x00, 0x00, 0x00, 0x00, 0x45,</div><div class='add'>+	0x03, 0xf0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x73, 0x94, 0x37, 0x5c, 0x61, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1b,</div><div class='add'>+	0x62, 0xb1, 0x01, 0x00, 0x77, 0x94, 0x28, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x74, 0x94, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+	0x62, 0xb1, 0x01, 0x00, 0x77, 0x94, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0xff, 0x89, 0x17, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x58, 0x01, 0x20, 0x08,</div><div class='add'>+	0xe0, 0xb1, 0x01, 0x00, 0x60, 0x01, 0x20, 0x16, 0xe0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xb6, 0x96, 0x00, 0x47, 0x1f, 0x10, 0x01, 0x00, 0x6f, 0x96, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x49, 0x93, 0x00, 0x01, 0x2c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xbf, 0x95, 0x00, 0x47, 0x1f, 0x10, 0x01, 0x00, 0x8c, 0x94, 0xa2, 0x08,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x88, 0x94, 0xa2, 0x42, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x82, 0x00, 0x02, 0x04, 0xdc, 0x01, 0x00, 0xa0, 0x98, 0x00, 0x40,</div><div class='add'>+	0x47, 0x99, 0x01, 0x00, 0xe3, 0x89, 0x00, 0x41, 0x89, 0x30, 0x01, 0x00,</div><div class='add'>+	0x74, 0x96, 0x00, 0x15, 0x94, 0x30, 0x01, 0x00, 0x7b, 0x96, 0x00, 0x4b,</div><div class='add'>+	0x02, 0xb0, 0x00, 0x00, 0xff, 0x89, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xf9, 0x96, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4b,</div><div class='add'>+	0x19, 0x90, 0x01, 0x00, 0xaf, 0x97, 0x00, 0x3a, 0x81, 0x30, 0x01, 0x00,</div><div class='add'>+	0xff, 0x89, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x58, 0x01, 0x20, 0x08,</div><div class='add'>+	0xe0, 0xb1, 0x01, 0x00, 0x60, 0x01, 0x20, 0x16, 0xe0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xf4, 0x95, 0x00, 0x10, 0x32, 0x30, 0x01, 0x00, 0x49, 0x93, 0x00, 0x40,</div><div class='add'>+	0x13, 0xb0, 0x00, 0x00, 0xbf, 0x95, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x9c, 0x94, 0xa2, 0x08, 0x80, 0x32, 0x00, 0x00, 0x00, 0x82, 0x00, 0x02,</div><div class='add'>+	0x04, 0xdc, 0x01, 0x00, 0x00, 0x00, 0x00, 0x45, 0x03, 0xf0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x01, 0x00, 0xc0, 0x01, 0x00, 0x95, 0x94, 0x37, 0x5c,</div><div class='add'>+	0x61, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1b, 0x62, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x99, 0x94, 0x28, 0x40, 0x81, 0x32, 0x00, 0x00, 0x96, 0x94, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x62, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x99, 0x94, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0xff, 0x89, 0x17, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x80, 0x00, 0x03, 0x42, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf8, 0x82, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8,</div><div class='add'>+	0x8c, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x8e, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xb3, 0x96, 0x00, 0x40, 0x13, 0x30, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x85, 0xb0, 0x01, 0x00, 0xea, 0x96, 0x00, 0x41, 0x87, 0x30, 0x01, 0x00,</div><div class='add'>+	0x6f, 0x96, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x00, 0x80, 0x00, 0x10,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0xab, 0x94, 0x22, 0x40, 0xe3, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x45, 0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0xa7, 0x94, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x1b, 0x84, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x3f, 0x91, 0x22, 0x09, 0x80, 0x30, 0x00, 0x00,</div><div class='add'>+	0x20, 0x98, 0x00, 0x40, 0x13, 0x30, 0x01, 0x00, 0x3f, 0x91, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x14, 0x00, 0x2d, 0x45, 0x1f, 0x90, 0x01, 0x00,</div><div class='add'>+	0x87, 0x91, 0x00, 0x44, 0x19, 0x90, 0x00, 0x00, 0xb3, 0x94, 0xa2, 0x41,</div><div class='add'>+	0x19, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4a, 0x1f, 0x90, 0x01, 0x00,</div><div class='add'>+	0xef, 0x92, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xb6, 0x96, 0x00, 0x4a,</div><div class='add'>+	0x1f, 0x10, 0x01, 0x00, 0x6f, 0x96, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x49, 0x93, 0x00, 0x01, 0x2c, 0xb0, 0x00, 0x00, 0xf4, 0x95, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x49, 0x93, 0x00, 0x10, 0x32, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xfe, 0x91, 0x00, 0x45, 0x1f, 0x90, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x37, 0xc3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41, 0x33, 0xc3, 0x01, 0x00,</div><div class='add'>+	0x36, 0x00, 0x00, 0x01, 0x02, 0xcc, 0x01, 0x00, 0x00, 0x00, 0xd2, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0xbf, 0x94, 0x85, 0x17, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x9f, 0x48, 0x03, 0xd0, 0x00, 0x00, 0xc1, 0x94, 0x9c, 0x17,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x9f, 0x4c, 0x03, 0xd0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x01, 0x34, 0xc3, 0x01, 0x00, 0x02, 0x00, 0x2d, 0x11,</div><div class='add'>+	0x10, 0xc1, 0x00, 0x00, 0xc6, 0x94, 0x00, 0x40, 0x43, 0xc1, 0x00, 0x00,</div><div class='add'>+	0xc6, 0x94, 0x00, 0x50, 0x43, 0xc1, 0x00, 0x00, 0x20, 0x00, 0x00, 0xa1,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0xca, 0x94, 0x22, 0x40, 0xe5, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa2, 0x40, 0xe5, 0x7d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x23, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x80, 0x49, 0x1f, 0x90, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0xa2, 0x41, 0x23, 0xd0, 0x00, 0x00, 0xc6, 0x94, 0x00, 0x50,</div><div class='add'>+	0x43, 0xd1, 0x00, 0x00, 0x40, 0x80, 0x00, 0x03, 0x44, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4a, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x12, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xd0, 0x95, 0x00, 0x41, 0xe1, 0x31, 0x01, 0x00, 0x00, 0x80, 0x00, 0x43,</div><div class='add'>+	0x44, 0xc9, 0x01, 0x00, 0x10, 0x00, 0x00, 0x40, 0xf1, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x48, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x49,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x03, 0xe0, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x45, 0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x43,</div><div class='add'>+	0x62, 0xb1, 0x01, 0x00, 0x00, 0x00, 0xa8, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xd7, 0x94, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xba, 0x00, 0x20, 0x40,</div><div class='add'>+	0xe5, 0xb1, 0x01, 0x00, 0xb0, 0x00, 0x2f, 0x01, 0x8c, 0xd0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x46, 0xe0, 0xc1, 0x01, 0x00, 0xac, 0x00, 0x2f, 0x40,</div><div class='add'>+	0x13, 0xb0, 0x01, 0x00, 0xcc, 0x00, 0x2d, 0x01, 0xe0, 0xc1, 0x01, 0x00,</div><div class='add'>+	0xe1, 0x94, 0x9c, 0x17, 0x80, 0x32, 0x00, 0x00, 0xfb, 0x98, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0xe3, 0x94, 0x22, 0x47, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x5f, 0x13, 0x90, 0x01, 0x00, 0x8d, 0x98, 0x00, 0x47,</div><div class='add'>+	0x19, 0x10, 0x01, 0x00, 0xc0, 0x00, 0x2d, 0x44, 0x1f, 0x90, 0x01, 0x00,</div><div class='add'>+	0xc4, 0x00, 0x2d, 0xf0, 0x82, 0xb0, 0x01, 0x00, 0xd8, 0x98, 0x00, 0xf0,</div><div class='add'>+	0x84, 0xb0, 0x00, 0x00, 0x90, 0x00, 0x2d, 0x05, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xf8, 0x94, 0xa2, 0x4b, 0x1f, 0x7c, 0x00, 0x00, 0x4b, 0x95, 0xa2, 0x4c,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0xf8, 0x94, 0x1f, 0x1c, 0xe0, 0x6d, 0x00, 0x00,</div><div class='add'>+	0xfb, 0x94, 0xa2, 0x01, 0x80, 0x32, 0x00, 0x00, 0xa8, 0x00, 0x2d, 0x46,</div><div class='add'>+	0x8f, 0xb0, 0x01, 0x00, 0xf1, 0x94, 0x1f, 0x1c, 0xe0, 0x6d, 0x00, 0x00,</div><div class='add'>+	0xb4, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00, 0xf3, 0x94, 0x22, 0xf0,</div><div class='add'>+	0x3a, 0x6c, 0x00, 0x00, 0x48, 0x95, 0x1f, 0xf0, 0x3a, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0xa2, 0x40, 0x80, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x80, 0x4f,</div><div class='add'>+	0x8f, 0xb0, 0x01, 0x00, 0x8a, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00,</div><div class='add'>+	0x49, 0x95, 0x20, 0x42, 0xe7, 0x6d, 0x00, 0x00, 0xf7, 0x94, 0x22, 0x40,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x80, 0x59, 0x8f, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x58, 0x8f, 0xb0, 0x01, 0x00, 0xfa, 0x94, 0x22, 0x40,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x80, 0x5c, 0x8f, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x5b, 0x8f, 0xb0, 0x01, 0x00, 0xac, 0x00, 0x00, 0x40,</div><div class='add'>+	0x43, 0x99, 0x01, 0x00, 0xb0, 0x00, 0x2d, 0xf0, 0x84, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xff, 0x94, 0xa2, 0x42, 0x24, 0x6c, 0x00, 0x00, 0x08, 0x95, 0x23, 0xf0,</div><div class='add'>+	0x02, 0x6c, 0x00, 0x00, 0x05, 0x95, 0xa2, 0xf0, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x4a, 0x95, 0xa2, 0x42, 0x24, 0x6c, 0x00, 0x00, 0x4a, 0x95, 0xa2, 0x41,</div><div class='add'>+	0x03, 0x6c, 0x00, 0x00, 0x04, 0x95, 0xa2, 0x40, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x51, 0x8f, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x80, 0x52,</div><div class='add'>+	0x8f, 0xb0, 0x01, 0x00, 0x4a, 0x95, 0x1f, 0x12, 0x84, 0x50, 0x00, 0x00,</div><div class='add'>+	0x4a, 0x95, 0xa0, 0x01, 0x84, 0x6c, 0x00, 0x00, 0xf8, 0x94, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x8b, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00,</div><div class='add'>+	0x33, 0x95, 0xa2, 0x46, 0xe7, 0x7d, 0x00, 0x00, 0x14, 0x00, 0x00, 0x40,</div><div class='add'>+	0x43, 0x99, 0x01, 0x00, 0x25, 0x95, 0x22, 0xf0, 0x14, 0x30, 0x00, 0x00,</div><div class='add'>+	0x11, 0x95, 0x20, 0x0a, 0x02, 0x6c, 0x00, 0x00, 0x22, 0x95, 0x03, 0x1e,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x10, 0x95, 0xa2, 0x40, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x44, 0x8f, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x80, 0x49,</div><div class='add'>+	0x8f, 0xb0, 0x01, 0x00, 0x16, 0x95, 0x22, 0x0a, 0x02, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x19, 0x95, 0xa2, 0x41, 0x19, 0x7c, 0x00, 0x00, 0x15, 0x95, 0xa2, 0x40,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x80, 0x55, 0x8f, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x56, 0x8f, 0xb0, 0x01, 0x00, 0x18, 0x95, 0xa2, 0x40,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x80, 0x43, 0x8f, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x48, 0x8f, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01,</div><div class='add'>+	0x82, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x82, 0xd0, 0x01, 0x00,</div><div class='add'>+	0x1f, 0x95, 0x20, 0x91, 0x83, 0x6c, 0x00, 0x00, 0x1e, 0x95, 0xa2, 0x40,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x26, 0x00, 0x80, 0x40, 0x8f, 0x98, 0x01, 0x00,</div><div class='add'>+	0x27, 0x00, 0x80, 0x40, 0x8f, 0x98, 0x01, 0x00, 0x21, 0x95, 0xa2, 0x40,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x1f, 0x00, 0x80, 0x40, 0x8f, 0x98, 0x01, 0x00,</div><div class='add'>+	0x20, 0x00, 0x80, 0x40, 0x8f, 0x98, 0x01, 0x00, 0x24, 0x95, 0xa2, 0x40,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x22, 0x00, 0x80, 0x40, 0x8f, 0x98, 0x01, 0x00,</div><div class='add'>+	0x23, 0x00, 0x80, 0x40, 0x8f, 0x98, 0x01, 0x00, 0x88, 0x00, 0x2d, 0x44,</div><div class='add'>+	0x8f, 0xb0, 0x01, 0x00, 0x2e, 0x95, 0xa2, 0x41, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x2b, 0x95, 0xa2, 0x43, 0x3d, 0x7c, 0x00, 0x00, 0x2b, 0x95, 0xa2, 0xf2,</div><div class='add'>+	0x02, 0x6c, 0x00, 0x00, 0x00, 0x00, 0xa2, 0x40, 0x80, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x49, 0x8f, 0xb0, 0x01, 0x00, 0x2d, 0x95, 0xa2, 0x40,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x80, 0x43, 0x8f, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x48, 0x8f, 0xb0, 0x01, 0x00, 0x2b, 0x95, 0xa0, 0x91,</div><div class='add'>+	0x03, 0x6c, 0x00, 0x00, 0x29, 0x95, 0x22, 0x43, 0x3d, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x32, 0x95, 0xa2, 0x40, 0x80, 0x32, 0x00, 0x00, 0x28, 0x00, 0x80, 0x40,</div><div class='add'>+	0x8f, 0x98, 0x01, 0x00, 0x29, 0x00, 0x80, 0x40, 0x8f, 0x98, 0x01, 0x00,</div><div class='add'>+	0x14, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00, 0x3c, 0x95, 0xa2, 0xf0,</div><div class='add'>+	0x14, 0x30, 0x00, 0x00, 0x88, 0x00, 0x2d, 0x44, 0x8f, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x39, 0x95, 0xa2, 0xf2, 0x02, 0x6c, 0x00, 0x00, 0x00, 0x00, 0xa2, 0x40,</div><div class='add'>+	0x80, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x80, 0x49, 0x8f, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x2b, 0x95, 0x22, 0x41, 0x19, 0x7c, 0x00, 0x00, 0x29, 0x95, 0x20, 0x91,</div><div class='add'>+	0x03, 0x6c, 0x00, 0x00, 0x2b, 0x95, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x40, 0x95, 0x20, 0x0a, 0x02, 0x6c, 0x00, 0x00, 0x3f, 0x95, 0xa2, 0x40,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x80, 0x44, 0x8f, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x49, 0x8f, 0xb0, 0x01, 0x00, 0x45, 0x95, 0x22, 0x0a,</div><div class='add'>+	0x02, 0x6c, 0x00, 0x00, 0x19, 0x95, 0xa2, 0x41, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x44, 0x95, 0xa2, 0x40, 0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x80, 0x55,</div><div class='add'>+	0x8f, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x80, 0x56, 0x8f, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x47, 0x95, 0xa2, 0x40, 0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x80, 0x43,</div><div class='add'>+	0x8f, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x80, 0x48, 0x8f, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x4d, 0x95, 0x00, 0x43, 0x95, 0xb0, 0x00, 0x00, 0x4d, 0x95, 0x00, 0x41,</div><div class='add'>+	0x95, 0xb0, 0x00, 0x00, 0x4d, 0x95, 0x00, 0x42, 0x95, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x4d, 0x95, 0x00, 0x44, 0x95, 0xb0, 0x00, 0x00, 0x4d, 0x95, 0x00, 0x4c,</div><div class='add'>+	0x95, 0xb0, 0x00, 0x00, 0xf5, 0x97, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x50, 0x95, 0xa2, 0x40, 0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x80, 0x4b,</div><div class='add'>+	0x8f, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x80, 0x4c, 0x8f, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x2d, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00, 0x2e, 0x00, 0x2f, 0xf3,</div><div class='add'>+	0x84, 0xb0, 0x01, 0x00, 0x55, 0x95, 0xa2, 0xf3, 0x96, 0x30, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x40, 0x01, 0xb0, 0x01, 0x00, 0x2d, 0x00, 0x2a, 0x41,</div><div class='add'>+	0xe7, 0xd1, 0x01, 0x00, 0xd4, 0x00, 0x3d, 0x41, 0x85, 0xe0, 0x01, 0x00,</div><div class='add'>+	0x0b, 0x00, 0x00, 0xf2, 0x00, 0xe4, 0x01, 0x00, 0x5b, 0x95, 0x22, 0x5a,</div><div class='add'>+	0x01, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x1f, 0x90, 0x01, 0x00,</div><div class='add'>+	0x5c, 0x95, 0x00, 0x5a, 0x01, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x1f, 0x80, 0x01, 0x00, 0x00, 0x00, 0x63, 0x41, 0x85, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0xa0, 0xa5, 0x85, 0x6c, 0x01, 0x00, 0x00, 0x00, 0xe3, 0x40,</div><div class='add'>+	0x85, 0xb0, 0x01, 0x00, 0x0c, 0x80, 0x00, 0x03, 0x42, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x12, 0x00, 0x00, 0x40, 0x87, 0x98, 0x01, 0x00, 0x3d, 0x99, 0x00, 0xf0,</div><div class='add'>+	0x8c, 0xb0, 0x00, 0x00, 0x69, 0x95, 0x22, 0x40, 0x0f, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x2f, 0x05, 0x48, 0xb1, 0x01, 0x00, 0x66, 0x95, 0xa2, 0x4b,</div><div class='add'>+	0x19, 0x7c, 0x00, 0x00, 0x67, 0x95, 0x22, 0xf0, 0x18, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x60, 0x4b, 0x19, 0x90, 0x01, 0x00, 0x32, 0x96, 0x00, 0x07,</div><div class='add'>+	0x10, 0x30, 0x01, 0x00, 0x6f, 0x84, 0x00, 0x40, 0x05, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x6b, 0x95, 0x22, 0x5a, 0x1f, 0x7c, 0x00, 0x00, 0xb8, 0x95, 0x00, 0x40,</div><div class='add'>+	0x81, 0x30, 0x01, 0x00, 0x6f, 0x84, 0x00, 0x40, 0x05, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x2f, 0x05, 0x48, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x60, 0x4b,</div><div class='add'>+	0x19, 0x90, 0x01, 0x00, 0x32, 0x96, 0x00, 0x07, 0x10, 0x30, 0x01, 0x00,</div><div class='add'>+	0x6f, 0x84, 0x00, 0x40, 0x05, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x2f, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x60, 0x4b, 0x19, 0x90, 0x01, 0x00,</div><div class='add'>+	0x32, 0x96, 0x00, 0x07, 0x10, 0x30, 0x01, 0x00, 0x00, 0x00, 0x80, 0x40,</div><div class='add'>+	0x05, 0xb0, 0x01, 0x00, 0x74, 0x95, 0x33, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x77, 0x95, 0xa1, 0xad, 0x95, 0x20, 0x00, 0x00, 0x85, 0x95, 0x13, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x13, 0x4a, 0x5a, 0x83, 0x01, 0x00,</div><div class='add'>+	0x30, 0x00, 0x39, 0x45, 0x95, 0xe0, 0x01, 0x00, 0x1f, 0x00, 0x00, 0x0f,</div><div class='add'>+	0x5e, 0xd8, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5a, 0x5f, 0x90, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x45, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x04,</div><div class='add'>+	0x48, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x05, 0x4a, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x0c, 0x58, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x07,</div><div class='add'>+	0x4e, 0xb0, 0x01, 0x00, 0x12, 0x86, 0x00, 0x40, 0x5d, 0x98, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x58, 0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4a,</div><div class='add'>+	0x62, 0xb1, 0x01, 0x00, 0x00, 0x00, 0xa8, 0x41, 0x97, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x82, 0x95, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40,</div><div class='add'>+	0x97, 0xb0, 0x01, 0x00, 0x86, 0x95, 0x44, 0x07, 0x96, 0x30, 0x00, 0x00,</div><div class='add'>+	0xff, 0xff, 0x00, 0x4b, 0x84, 0x89, 0x01, 0x00, 0x00, 0x00, 0x1c, 0xc2,</div><div class='add'>+	0x24, 0xb0, 0x01, 0x00, 0x90, 0x95, 0xa2, 0x45, 0x25, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x8a, 0x95, 0x31, 0x20, 0x85, 0x30, 0x00, 0x00, 0x91, 0x95, 0x22, 0x12,</div><div class='add'>+	0x48, 0x7f, 0x00, 0x00, 0x51, 0x98, 0x11, 0x12, 0x48, 0x03, 0x01, 0x00,</div><div class='add'>+	0x10, 0x00, 0x00, 0x12, 0x96, 0xe4, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4b,</div><div class='add'>+	0x1e, 0x94, 0x01, 0x00, 0x00, 0x00, 0x80, 0x5a, 0x1f, 0x90, 0x01, 0x00,</div><div class='add'>+	0x90, 0x95, 0x31, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb4,</div><div class='add'>+	0x24, 0xb0, 0x01, 0x00, 0x91, 0x95, 0x22, 0x12, 0x48, 0x7f, 0x00, 0x00,</div><div class='add'>+	0x51, 0x98, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x2f, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x9e, 0x95, 0x0b, 0xf0, 0x84, 0x30, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x11, 0x12, 0x48, 0x83, 0x01, 0x00, 0x9b, 0x95, 0x22, 0x50,</div><div class='add'>+	0x85, 0x70, 0x00, 0x00, 0x5e, 0x01, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00,</div><div class='add'>+	0x51, 0x97, 0x00, 0xf2, 0x96, 0x30, 0x01, 0x00, 0xd1, 0x99, 0x00, 0x12,</div><div class='add'>+	0x94, 0x30, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5a, 0x1f, 0x90, 0x01, 0x00,</div><div class='add'>+	0x10, 0x00, 0x00, 0x12, 0x96, 0xe4, 0x01, 0x00, 0x00, 0x00, 0x80, 0x4b,</div><div class='add'>+	0x1e, 0x94, 0x01, 0x00, 0x10, 0x00, 0x00, 0x42, 0x10, 0xf4, 0x01, 0x00,</div><div class='add'>+	0x00, 0xb7, 0x3f, 0x43, 0x11, 0xf0, 0x01, 0x00, 0x07, 0x00, 0x00, 0x08,</div><div class='add'>+	0x8a, 0x88, 0x01, 0x00, 0xa1, 0x95, 0x30, 0xa1, 0x0c, 0x30, 0x00, 0x00,</div><div class='add'>+	0xa4, 0x95, 0x22, 0x45, 0xe6, 0x7d, 0x00, 0x00, 0x91, 0x95, 0x10, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x2a, 0x45, 0xe6, 0x91, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x10, 0x12, 0x48, 0x83, 0x01, 0x00, 0x00, 0x00, 0x11, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x60, 0x4b, 0x85, 0x80, 0x01, 0x00,</div><div class='add'>+	0x5e, 0x01, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00, 0x51, 0x97, 0x00, 0xf2,</div><div class='add'>+	0x96, 0x30, 0x01, 0x00, 0x00, 0x80, 0x00, 0x10, 0x44, 0xc9, 0x01, 0x00,</div><div class='add'>+	0xd8, 0x00, 0x00, 0x40, 0x81, 0x98, 0x01, 0x00, 0x2e, 0x00, 0x2d, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0xaf, 0x95, 0x22, 0x40, 0xe7, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x80, 0x00, 0x00, 0x40, 0x80, 0xc8, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x09, 0x00, 0x00, 0x08, 0x86, 0xe4, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x68, 0xa7, 0x87, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x10, 0x62, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xb3, 0x95, 0xa8, 0x05, 0xe0, 0x31, 0x00, 0x00, 0x10, 0x00, 0x00, 0x12,</div><div class='add'>+	0x96, 0xe4, 0x01, 0x00, 0x00, 0x14, 0x00, 0x4b, 0x96, 0xdc, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x4b, 0x1e, 0x94, 0x01, 0x00, 0x10, 0x00, 0x00, 0x0f,</div><div class='add'>+	0x84, 0xf4, 0x01, 0x00, 0x1f, 0x00, 0x00, 0x42, 0x84, 0x88, 0x01, 0x00,</div><div class='add'>+	0xbc, 0x95, 0x22, 0x40, 0x80, 0x32, 0x00, 0x00, 0xbd, 0x95, 0x00, 0x42,</div><div class='add'>+	0x68, 0xb1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x6a, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xbd, 0x95, 0x31, 0x5a, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x91, 0x42,</div><div class='add'>+	0x48, 0x93, 0x01, 0x00, 0xbf, 0x95, 0x35, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x6d, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00, 0xc4, 0x95, 0x28, 0xb1,</div><div class='add'>+	0x2c, 0x30, 0x00, 0x00, 0xc0, 0x95, 0x22, 0x4d, 0x75, 0x7d, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x95, 0x40, 0x11, 0xb0, 0x01, 0x00, 0x6d, 0x00, 0x00, 0x40,</div><div class='add'>+	0x61, 0x99, 0x01, 0x00, 0xc4, 0x95, 0xa8, 0xb1, 0x10, 0x30, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x95, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x7f, 0x00, 0x00, 0x40,</div><div class='add'>+	0x61, 0x99, 0x01, 0x00, 0xcb, 0x95, 0x28, 0xb1, 0x10, 0x30, 0x00, 0x00,</div><div class='add'>+	0xc7, 0x95, 0x9f, 0xba, 0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40,</div><div class='add'>+	0x11, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x80, 0x24, 0x11, 0x84, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x5f, 0x61, 0xb1, 0x01, 0x00, 0x00, 0x10, 0x00, 0x00,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x00, 0x00, 0xa8, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xcd, 0x95, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xac, 0x94, 0x00, 0x40,</div><div class='add'>+	0x47, 0x99, 0x01, 0x00, 0xd1, 0x95, 0x32, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0xd7, 0x95, 0x22, 0xf8, 0x96, 0x30, 0x00, 0x00, 0x04, 0x00, 0x22, 0xf8,</div><div class='add'>+	0x90, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x92, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x01, 0x00, 0x00, 0x4b, 0xf0, 0xcd, 0x01, 0x00, 0x20, 0x00, 0x92, 0x48,</div><div class='add'>+	0xe0, 0xc9, 0x01, 0x00, 0x6c, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00,</div><div class='add'>+	0xdb, 0x95, 0x28, 0xb1, 0x92, 0x30, 0x00, 0x00, 0xd7, 0x95, 0x22, 0x4c,</div><div class='add'>+	0x75, 0x7d, 0x00, 0x00, 0x04, 0x00, 0x12, 0x40, 0x91, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x6c, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00, 0xdb, 0x95, 0xa8, 0xb1,</div><div class='add'>+	0x90, 0x30, 0x00, 0x00, 0xff, 0x00, 0x00, 0x48, 0x96, 0x88, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4b, 0x90, 0xd0, 0x01, 0x00, 0x01, 0x00, 0x00, 0x4b,</div><div class='add'>+	0xf0, 0xcd, 0x01, 0x00, 0x20, 0x00, 0x00, 0x48, 0xf0, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x92, 0x49, 0xe0, 0xb1, 0x01, 0x00, 0x0c, 0x00, 0x2d, 0x10,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0xff, 0x07, 0x00, 0x08, 0x82, 0x8c, 0x01, 0x00,</div><div class='add'>+	0xff, 0x07, 0x00, 0xf0, 0x00, 0x8c, 0x01, 0x00, 0x00, 0x00, 0xa2, 0x41,</div><div class='add'>+	0x00, 0xec, 0x00, 0x00, 0xe8, 0x95, 0x22, 0x1a, 0x00, 0x6c, 0x00, 0x00,</div><div class='add'>+	0xcc, 0x95, 0x00, 0x00, 0x34, 0x30, 0x01, 0x00, 0x00, 0x00, 0x00, 0x50,</div><div class='add'>+	0x49, 0xc1, 0x01, 0x00, 0xe4, 0x95, 0xa2, 0x41, 0x23, 0x50, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x0c, 0x00, 0x2d, 0x10,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0xff, 0x07, 0x00, 0x15, 0x82, 0x8c, 0x01, 0x00,</div><div class='add'>+	0xff, 0x07, 0x00, 0xf0, 0x00, 0x8c, 0x01, 0x00, 0x00, 0x00, 0xa2, 0x41,</div><div class='add'>+	0x00, 0xec, 0x00, 0x00, 0xf1, 0x95, 0x22, 0x0d, 0x00, 0x6c, 0x00, 0x00,</div><div class='add'>+	0xcc, 0x95, 0x00, 0x00, 0x1a, 0x30, 0x01, 0x00, 0x00, 0x00, 0x00, 0x50,</div><div class='add'>+	0x49, 0xc1, 0x01, 0x00, 0xed, 0x95, 0xa2, 0x41, 0x23, 0x50, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x40, 0x81, 0xb2, 0x01, 0x00, 0xf6, 0x95, 0x83, 0x1e,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x19, 0x90, 0x01, 0x00,</div><div class='add'>+	0x24, 0x00, 0x2d, 0x01, 0x2c, 0xb0, 0x01, 0x00, 0x28, 0x00, 0x2d, 0xf0,</div><div class='add'>+	0x16, 0xb0, 0x01, 0x00, 0x22, 0x00, 0x2d, 0xf0, 0x26, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x14, 0x00, 0x2f, 0xf2, 0x0c, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x80, 0x40,</div><div class='add'>+	0xe1, 0xb1, 0x01, 0x00, 0x02, 0x00, 0x2d, 0x11, 0x10, 0xc1, 0x00, 0x00,</div><div class='add'>+	0xff, 0x95, 0x00, 0x40, 0x43, 0xc1, 0x00, 0x00, 0xff, 0x95, 0x00, 0x50,</div><div class='add'>+	0x43, 0xc1, 0x00, 0x00, 0x20, 0x00, 0x00, 0xa1, 0x42, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x04, 0x96, 0x22, 0x40, 0xf5, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42,</div><div class='add'>+	0x43, 0xd1, 0x01, 0x00, 0x04, 0x00, 0xa2, 0x40, 0xe5, 0x7d, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x23, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x80, 0x49,</div><div class='add'>+	0x1f, 0x90, 0x01, 0x00, 0x07, 0x96, 0x22, 0x11, 0x1e, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x09, 0x96, 0xa0, 0xf0, 0x16, 0x40, 0x00, 0x00, 0x09, 0x96, 0x00, 0x41,</div><div class='add'>+	0x17, 0xc0, 0x00, 0x00, 0x09, 0x96, 0xa0, 0xf4, 0x16, 0x40, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x17, 0xc0, 0x01, 0x00, 0x00, 0x00, 0xa2, 0x41,</div><div class='add'>+	0x23, 0xd0, 0x00, 0x00, 0xff, 0x95, 0x00, 0x52, 0x43, 0xd1, 0x00, 0x00,</div><div class='add'>+	0x00, 0xb5, 0x00, 0x0d, 0x42, 0xc9, 0x01, 0x00, 0x0c, 0x96, 0x30, 0x47,</div><div class='add'>+	0x17, 0x04, 0x00, 0x00, 0x0f, 0x96, 0xa2, 0x0b, 0xe6, 0x7d, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x90, 0x42, 0x81, 0xb0, 0x01, 0x00, 0x00, 0xb7, 0x00, 0x0d,</div><div class='add'>+	0x46, 0xc9, 0x01, 0x00, 0x13, 0x96, 0xa2, 0x0b, 0xe6, 0x7d, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x0b, 0xe6, 0x91, 0x01, 0x00, 0x00, 0x00, 0x90, 0x41,</div><div class='add'>+	0x81, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x10, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x14, 0x96, 0x40, 0x07, 0x96, 0x30, 0x00, 0x00, 0xdb, 0x99, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x1e, 0x96, 0xa2, 0x45, 0x95, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x01, 0x97, 0x3f, 0x41, 0x95, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf3,</div><div class='add'>+	0x96, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4e, 0xe6, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x40, 0x97, 0x3e, 0x40, 0x97, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4e,</div><div class='add'>+	0xe6, 0xb1, 0x01, 0x00, 0x40, 0x97, 0x3e, 0x40, 0x9d, 0xe0, 0x01, 0x00,</div><div class='add'>+	0x31, 0x96, 0x00, 0x3b, 0xe7, 0xb1, 0x00, 0x00, 0x1e, 0x96, 0x30, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x28, 0x96, 0xa2, 0x0b, 0xe6, 0x7d, 0x00, 0x00,</div><div class='add'>+	0x00, 0xb5, 0x00, 0x0d, 0x46, 0xc9, 0x01, 0x00, 0x24, 0x96, 0xa2, 0x0b,</div><div class='add'>+	0xe6, 0x7d, 0x00, 0x00, 0x00, 0x00, 0x10, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x98, 0x42, 0x81, 0xb0, 0x01, 0x00, 0x00, 0xb7, 0x00, 0x0d,</div><div class='add'>+	0x46, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x0b, 0xe6, 0x91, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x10, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x98, 0x41,</div><div class='add'>+	0x81, 0xb0, 0x01, 0x00, 0x04, 0x00, 0x21, 0xa2, 0x95, 0x20, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x10, 0x4a, 0x44, 0x83, 0x01, 0x00, 0x00, 0x97, 0x3e, 0x41,</div><div class='add'>+	0x95, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4e, 0xf6, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4e, 0xe6, 0xb1, 0x01, 0x00, 0x40, 0x97, 0x3e, 0x40,</div><div class='add'>+	0x9d, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x3b, 0xe7, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4a, 0x90, 0xb1, 0x01, 0x00, 0xff, 0xff, 0x00, 0x07,</div><div class='add'>+	0x92, 0x89, 0x01, 0x00, 0x00, 0x00, 0x98, 0x40, 0x81, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x03, 0x00, 0x00, 0x08, 0x86, 0xf4, 0x01, 0x00, 0x00, 0xb7, 0x00, 0x43,</div><div class='add'>+	0x46, 0xc9, 0x01, 0x00, 0x07, 0x00, 0x00, 0x08, 0x82, 0x88, 0x01, 0x00,</div><div class='add'>+	0x35, 0x96, 0x40, 0x08, 0x96, 0x30, 0x00, 0x00, 0xdb, 0x99, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x41, 0x96, 0x22, 0x45, 0x95, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x3d, 0x96, 0x22, 0x5a, 0x1f, 0x7c, 0x00, 0x00, 0x10, 0x00, 0x00, 0x0f,</div><div class='add'>+	0x96, 0xf4, 0x01, 0x00, 0x3a, 0x96, 0x31, 0x5f, 0x97, 0x04, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x11, 0x4b, 0x48, 0x93, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4b,</div><div class='add'>+	0x6a, 0xb1, 0x01, 0x00, 0x3d, 0x96, 0x30, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0xe6, 0x81, 0x01, 0x00, 0x00, 0x00, 0x10, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x98, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x97, 0x3f, 0x41, 0x95, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf3,</div><div class='add'>+	0x96, 0xb0, 0x01, 0x00, 0x40, 0x97, 0x3d, 0x40, 0x97, 0xe0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x63, 0xf3, 0x88, 0xb0, 0x01, 0x00, 0x49, 0x96, 0xa2, 0x3b,</div><div class='add'>+	0x89, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4a, 0x90, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x01, 0x00, 0x00, 0xa6, 0x92, 0xb1, 0x01, 0x00, 0x4a, 0x96, 0x18, 0x4a,</div><div class='add'>+	0x44, 0x93, 0x00, 0x00, 0x00, 0x00, 0x18, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x30, 0x00, 0x39, 0x45, 0x97, 0xe0, 0x01, 0x00, 0x4f, 0x96, 0x22, 0x5a,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x1f, 0x04, 0x00, 0x0f, 0x98, 0xd8, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4c, 0x5e, 0x94, 0x01, 0x00, 0x51, 0x96, 0x00, 0x05,</div><div class='add'>+	0x4a, 0xb0, 0x00, 0x00, 0x1f, 0x04, 0x00, 0xa7, 0x5e, 0x84, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x4b, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x58,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4b, 0x62, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0xa8, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x52, 0x96, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x55, 0x96, 0x40, 0x07, 0x96, 0x30, 0x00, 0x00,</div><div class='add'>+	0xdb, 0x99, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x59, 0x96, 0x22, 0x45,</div><div class='add'>+	0x95, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x98, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0xd9, 0x99, 0x00, 0x4a, 0x44, 0x13, 0x01, 0x00, 0x00, 0x97, 0x3f, 0x41,</div><div class='add'>+	0x95, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf3, 0x96, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x40, 0x97, 0x3d, 0x40, 0x97, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x63, 0xf3,</div><div class='add'>+	0x88, 0xb0, 0x01, 0x00, 0x30, 0x00, 0x38, 0x45, 0x97, 0xe0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x5f, 0x0f, 0x90, 0x01, 0x00, 0x00, 0x00, 0x00, 0x58,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4b, 0x62, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x61, 0x96, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0x5a, 0x96, 0xa2, 0x3b,</div><div class='add'>+	0x89, 0x6c, 0x00, 0x00, 0x30, 0x00, 0x38, 0x45, 0x9d, 0xe0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x98, 0x40, 0x81, 0xb2, 0x01, 0x00, 0xd1, 0x99, 0x00, 0x12,</div><div class='add'>+	0x94, 0x30, 0x01, 0x00, 0x32, 0x96, 0x00, 0x5a, 0x1f, 0x00, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x5a, 0x1f, 0x90, 0x01, 0x00, 0x11, 0x00, 0x00, 0x4a,</div><div class='add'>+	0xe6, 0xc9, 0x01, 0x00, 0x34, 0x00, 0x2f, 0x4f, 0x95, 0x84, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf3, 0x96, 0xb0, 0x01, 0x00, 0x01, 0x00, 0x63, 0x4b,</div><div class='add'>+	0x84, 0xc8, 0x01, 0x00, 0x00, 0x00, 0xa0, 0x43, 0x85, 0x6c, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0xe3, 0x40, 0x85, 0xb0, 0x01, 0x00, 0x30, 0x00, 0x2d, 0x44,</div><div class='add'>+	0x1f, 0x90, 0x01, 0x00, 0x32, 0x00, 0x2d, 0xf2, 0x2a, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x22, 0xf2, 0x02, 0x30, 0x00, 0x00, 0x51, 0x95, 0x00, 0x10,</div><div class='add'>+	0x32, 0x30, 0x01, 0x00, 0x32, 0x00, 0xa0, 0x40, 0xe5, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x97, 0xb0, 0x01, 0x00, 0xf0, 0x07, 0x00, 0x40,</div><div class='add'>+	0x99, 0x98, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4a, 0x02, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x50, 0x03, 0xd0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x97, 0xc0, 0x01, 0x00, 0x00, 0x00, 0xa3, 0x4c, 0x02, 0xd0, 0x00, 0x00,</div><div class='add'>+	0x78, 0x96, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa8,</div><div class='add'>+	0x36, 0xb0, 0x01, 0x00, 0x88, 0x96, 0x22, 0x41, 0x03, 0x50, 0x00, 0x00,</div><div class='add'>+	0x00, 0x80, 0x00, 0x10, 0x44, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x50,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0x70, 0x00, 0x00, 0x03, 0xf0, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x42, 0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xb1, 0x01, 0x00, 0x81, 0x96, 0xa8, 0x00, 0xe0, 0x31, 0x00, 0x00,</div><div class='add'>+	0x1b, 0x84, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0xcc, 0x95, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x7c, 0x80, 0x00, 0x03, 0x42, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf0, 0x00, 0xb0, 0x01, 0x00, 0x7c, 0x96, 0x00, 0x5c,</div><div class='add'>+	0x01, 0x80, 0x00, 0x00, 0xcc, 0x95, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x1b, 0x10, 0xb1, 0x00, 0x00, 0x68, 0x01, 0x2d, 0x06,</div><div class='add'>+	0x82, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf2, 0x82, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x80, 0x00, 0x03, 0x46, 0xc9, 0x01, 0x00, 0xc7, 0x95, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0xaf, 0x96, 0x22, 0x40, 0x11, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x68, 0x08, 0x38, 0x96, 0x01, 0x00, 0xf0, 0x07, 0x00, 0x41,</div><div class='add'>+	0x82, 0xcc, 0x01, 0x00, 0x8d, 0x96, 0xaa, 0x41, 0x3b, 0x40, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf8, 0x10, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5c,</div><div class='add'>+	0x11, 0x80, 0x01, 0x00, 0x01, 0x00, 0x00, 0x1d, 0x04, 0xcc, 0x01, 0x00,</div><div class='add'>+	0xae, 0x96, 0x26, 0x46, 0x23, 0x30, 0x00, 0x00, 0x08, 0x00, 0x00, 0x03,</div><div class='add'>+	0x12, 0xc8, 0x01, 0x00, 0x64, 0x01, 0x20, 0xf0, 0xe0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xad, 0x96, 0x22, 0x41, 0x05, 0x50, 0x00, 0x00, 0x20, 0x00, 0x00, 0x03,</div><div class='add'>+	0x48, 0xc9, 0x01, 0x00, 0x0c, 0x00, 0x00, 0xf8, 0x86, 0xc8, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x22, 0x44, 0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x43,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x09, 0xe0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x44, 0x61, 0xb1, 0x01, 0x00, 0xa0, 0x00, 0x00, 0xa4,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x9f, 0x96, 0xa8, 0x46, 0x1f, 0x10, 0x00, 0x00,</div><div class='add'>+	0xac, 0x96, 0x22, 0x41, 0x05, 0x50, 0x00, 0x00, 0xaa, 0x96, 0xa2, 0x41,</div><div class='add'>+	0x23, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa1, 0x1a, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x44, 0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0xa5, 0x96, 0xa8, 0x46, 0x23, 0x30, 0x00, 0x00,</div><div class='add'>+	0x1b, 0x84, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x10, 0x00, 0x00, 0x03,</div><div class='add'>+	0x48, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x0d, 0x42, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x44, 0x13, 0xc0, 0x01, 0x00, 0x9a, 0x96, 0x00, 0x50,</div><div class='add'>+	0x49, 0xc1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x04, 0x80, 0x00, 0x03, 0x1a, 0xc8, 0x01, 0x00, 0x00, 0x00, 0x80, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0xae, 0x96, 0x22, 0x40, 0x3b, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf8, 0x00, 0xb0, 0x01, 0x00, 0xcc, 0x95, 0x00, 0x5c,</div><div class='add'>+	0x01, 0x00, 0x01, 0x00, 0xaf, 0x96, 0x00, 0x41, 0x3b, 0xd0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x8d, 0x47, 0x80, 0x32, 0x01, 0x00, 0xb0, 0x00, 0x2f, 0x5f,</div><div class='add'>+	0x13, 0xb0, 0x01, 0x00, 0x00, 0x00, 0xe0, 0xf0, 0x8c, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x80, 0x00, 0x03, 0x42, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8,</div><div class='add'>+	0x94, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x8c, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xbb, 0x96, 0x8c, 0xf8, 0x8e, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0x19, 0x90, 0x01, 0x00, 0x04, 0x00, 0x22, 0xf8, 0x14, 0x30, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf8, 0x16, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8,</div><div class='add'>+	0x26, 0xb0, 0x01, 0x00, 0x08, 0x00, 0x2e, 0xf8, 0x0c, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x0c, 0x00, 0x2a, 0x4a, 0xe0, 0xb1, 0x01, 0x00, 0x28, 0x00, 0x00, 0x00,</div><div class='add'>+	0xe0, 0xc9, 0x01, 0x00, 0x10, 0x00, 0x20, 0x1b, 0xe0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xc8, 0x96, 0x20, 0x0a, 0x0c, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8,</div><div class='add'>+	0x94, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x96, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x20, 0x00, 0x20, 0xf0, 0xe4, 0xb1, 0x01, 0x00, 0x18, 0x00, 0x20, 0x4a,</div><div class='add'>+	0xe0, 0xb1, 0x01, 0x00, 0x1c, 0x00, 0x20, 0x4b, 0xe0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xb3, 0x96, 0x00, 0x40, 0x13, 0xb0, 0x00, 0x00, 0x2c, 0x00, 0x2d, 0x42,</div><div class='add'>+	0x19, 0x90, 0x01, 0x00, 0x2e, 0x00, 0x2f, 0xf3, 0x82, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf3, 0x96, 0xb0, 0x01, 0x00, 0xce, 0x96, 0xa2, 0xa5,</div><div class='add'>+	0x97, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x80, 0x41, 0x95, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xd1, 0x96, 0xa2, 0x40, 0x97, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x83, 0xb0, 0x01, 0x00, 0x2d, 0x00, 0x20, 0x40, 0xe7, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x63, 0x41, 0x97, 0xc0, 0x01, 0x00, 0xd4, 0x00, 0x3e, 0x41,</div><div class='add'>+	0x83, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41, 0x83, 0xc0, 0x01, 0x00,</div><div class='add'>+	0xd6, 0x96, 0xa0, 0xa5, 0x83, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x83, 0xb0, 0x01, 0x00, 0x2c, 0x00, 0x20, 0x41, 0xe6, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xdb, 0x96, 0x22, 0x40, 0x1f, 0x7c, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00,</div><div class='add'>+	0x98, 0xdc, 0x01, 0x00, 0x0b, 0x00, 0x00, 0x4c, 0xe4, 0xf5, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x40, 0x1f, 0x80, 0x01, 0x00, 0x0b, 0x00, 0x80, 0x00,</div><div class='add'>+	0xe4, 0xf5, 0x01, 0x00, 0xd0, 0x95, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x04, 0x80, 0x00, 0x03, 0x44, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x60, 0x41, 0x87, 0xb0, 0x01, 0x00, 0x00, 0x80, 0x00, 0x10,</div><div class='add'>+	0x44, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x50, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x48, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x49,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x03, 0xe0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x45, 0x61, 0xb1, 0x01, 0x00, 0x20, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x00, 0x00, 0xa8, 0x5d, 0x05, 0x90, 0x00, 0x00,</div><div class='add'>+	0xe7, 0x96, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xd0, 0x95, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x00, 0x80, 0x00, 0x03, 0x44, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x42,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x43, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x80, 0x00, 0x10,</div><div class='add'>+	0x44, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x50, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x48, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x49,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x03, 0xe0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x45, 0x61, 0xb1, 0x01, 0x00, 0x20, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x00, 0x00, 0xa8, 0x5d, 0x05, 0x90, 0x00, 0x00,</div><div class='add'>+	0xf6, 0x96, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x2d, 0x00, 0x00, 0x40,</div><div class='add'>+	0x43, 0x99, 0x01, 0x00, 0x2e, 0x00, 0x2f, 0xf3, 0x84, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x01, 0x00, 0x63, 0xf3, 0x96, 0xc8, 0x01, 0x00, 0xfe, 0x96, 0x9f, 0x41,</div><div class='add'>+	0x85, 0x50, 0x00, 0x00, 0x01, 0x00, 0x00, 0xa5, 0x85, 0xcc, 0x01, 0x00,</div><div class='add'>+	0x2d, 0x00, 0xa0, 0x42, 0xe6, 0xb1, 0x01, 0x00, 0x5e, 0x01, 0x2d, 0x00,</div><div class='add'>+	0x80, 0xb0, 0x01, 0x00, 0x03, 0x97, 0x52, 0x43, 0x81, 0x60, 0x00, 0x00,</div><div class='add'>+	0x02, 0x00, 0x00, 0xf2, 0x82, 0xf4, 0x01, 0x00, 0x04, 0x97, 0x00, 0x41,</div><div class='add'>+	0x80, 0x94, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5f, 0x81, 0x90, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x5e, 0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x62, 0xb1, 0x01, 0x00, 0x00, 0x00, 0xa8, 0x40, 0x95, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x05, 0x97, 0x9e, 0xbb, 0x80, 0x32, 0x00, 0x00, 0x0a, 0x97, 0xa2, 0x40,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0xcc, 0x95, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x41, 0x95, 0xb0, 0x01, 0x00, 0x04, 0x00, 0x00, 0x15,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x54, 0x2b, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xfc, 0x24, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xfc,</div><div class='add'>+	0x38, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x3c, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xfe, 0x3a, 0xb0, 0x01, 0x00, 0x1f, 0x97, 0x9c, 0x17,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x14, 0x97, 0xa2, 0x4a, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x4c, 0x1f, 0x90, 0x01, 0x00, 0x0c, 0x00, 0x00, 0x1e,</div><div class='add'>+	0x98, 0xf4, 0x01, 0x00, 0x13, 0x97, 0xa2, 0x48, 0x99, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x15, 0x42, 0xb1, 0x01, 0x00, 0x13, 0x97, 0xa2, 0x8a,</div><div class='add'>+	0xf1, 0x6d, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x01, 0x02, 0xcc, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xfc, 0x3e, 0xb0, 0x01, 0x00, 0x01, 0x00, 0x00, 0xf4,</div><div class='add'>+	0x28, 0xcc, 0x01, 0x00, 0xcc, 0x00, 0x2d, 0x05, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x1e, 0x97, 0x20, 0xf0, 0x3e, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4b,</div><div class='add'>+	0x1f, 0x90, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4c, 0x2b, 0xc0, 0x01, 0x00,</div><div class='add'>+	0xbf, 0x00, 0x2d, 0x05, 0x48, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x80, 0xf3,</div><div class='add'>+	0x3a, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x2e, 0x4b, 0x19, 0x90, 0x01, 0x00,</div><div class='add'>+	0x07, 0x00, 0x2a, 0x0c, 0xe4, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x80, 0x04,</div><div class='add'>+	0xe6, 0xb1, 0x01, 0x00, 0x18, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00,</div><div class='add'>+	0x1c, 0x00, 0x2d, 0xf0, 0x16, 0xb0, 0x01, 0x00, 0x20, 0x00, 0x2d, 0xf0,</div><div class='add'>+	0x26, 0xb0, 0x01, 0x00, 0x0c, 0x00, 0x2f, 0xf2, 0x0c, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0xa2, 0x06, 0x14, 0xec, 0x00, 0x00, 0x2b, 0x97, 0x22, 0x45,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x00, 0x00, 0xa3, 0x06, 0x2a, 0xec, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf8, 0x94, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0,</div><div class='add'>+	0x96, 0xb0, 0x01, 0x00, 0x0c, 0x00, 0x2d, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x2a, 0x4c, 0xe1, 0xc1, 0x01, 0x00, 0x30, 0x00, 0x00, 0x10,</div><div class='add'>+	0x48, 0xc9, 0x01, 0x00, 0x0a, 0x00, 0x00, 0x40, 0xf1, 0x99, 0x01, 0x00,</div><div class='add'>+	0x18, 0x00, 0x00, 0x05, 0xf0, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4a,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4b, 0xe0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x47, 0x61, 0xb1, 0x01, 0x00, 0xa0, 0x00, 0x00, 0xa4,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x35, 0x97, 0xa8, 0x5c, 0x1f, 0x10, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x05, 0x48, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x2e, 0x10,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x68, 0x01, 0x96, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x03, 0xf0, 0xb1, 0x01, 0x00, 0x3b, 0x97, 0x45, 0x42,</div><div class='add'>+	0x61, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x62, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x3c, 0x97, 0xa8, 0x00, 0xe0, 0x31, 0x00, 0x00, 0x00, 0x00, 0x9d, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x2e, 0x10, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x68, 0x01, 0x96, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x03,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x42, 0x97, 0x45, 0x42, 0x61, 0x31, 0x00, 0x00,</div><div class='add'>+	0x20, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00, 0x43, 0x97, 0xa8, 0x00,</div><div class='add'>+	0xe0, 0x31, 0x00, 0x00, 0x00, 0x00, 0x9d, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x30, 0x80, 0x00, 0x4a, 0x44, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x06,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0xc0, 0xa8, 0x3d, 0x46, 0x0d, 0xe0, 0x01, 0x00,</div><div class='add'>+	0xff, 0x7f, 0x00, 0xa1, 0xf0, 0x89, 0x01, 0x00, 0x02, 0x00, 0x00, 0x09,</div><div class='add'>+	0x96, 0xf4, 0x01, 0x00, 0x00, 0x00, 0x00, 0x46, 0x97, 0xe0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x60, 0xa8, 0x97, 0xc0, 0x01, 0x00, 0x4d, 0x97, 0x46, 0x42,</div><div class='add'>+	0x61, 0x31, 0x00, 0x00, 0x30, 0x00, 0x00, 0x4a, 0x62, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x4e, 0x97, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x9e, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x99, 0x3f, 0x42, 0x97, 0xf0, 0x01, 0x00,</div><div class='add'>+	0x52, 0x97, 0x47, 0x40, 0x81, 0x32, 0x00, 0x00, 0x5a, 0x97, 0x22, 0xf3,</div><div class='add'>+	0x74, 0x06, 0x00, 0x00, 0x3f, 0x00, 0x00, 0xf3, 0x94, 0x88, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x07, 0xe7, 0x85, 0x01, 0x00, 0x00, 0x00, 0x1f, 0x55,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4a, 0x62, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0xa8, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x57, 0x97, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x9f, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xa8, 0x36, 0xb0, 0x01, 0x00, 0x6a, 0x97, 0x82, 0x41,</div><div class='add'>+	0x23, 0x40, 0x00, 0x00, 0x5f, 0x97, 0xa2, 0x44, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0xda, 0x94, 0x00, 0x01, 0x8c, 0x30, 0x01, 0x00, 0x20, 0x80, 0x00, 0x10,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0x65, 0x97, 0x22, 0x40, 0xe3, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x43, 0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x62, 0x97, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x1b, 0x84, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x23, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x10, 0x32, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x6a, 0x97, 0x22, 0x41, 0x19, 0x7c, 0x00, 0x00, 0xe2, 0x95, 0x00, 0x43,</div><div class='add'>+	0x23, 0x30, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41, 0x23, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x6c, 0x97, 0xa3, 0x15, 0x0c, 0x6c, 0x00, 0x00, 0x6d, 0x97, 0x00, 0x06,</div><div class='add'>+	0x04, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x04, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x6f, 0x97, 0x20, 0x02, 0x1a, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0d,</div><div class='add'>+	0x04, 0xb0, 0x01, 0x00, 0x07, 0x00, 0x00, 0x0b, 0x96, 0x88, 0x01, 0x00,</div><div class='add'>+	0x74, 0x97, 0x26, 0x47, 0x97, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x97, 0xc0, 0x01, 0x00, 0x74, 0x97, 0x23, 0x4b, 0x04, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4b, 0x04, 0xb0, 0x01, 0x00, 0x33, 0x98, 0x00, 0x05,</div><div class='add'>+	0x48, 0x31, 0x01, 0x00, 0x9e, 0x97, 0x22, 0x02, 0x14, 0x50, 0x00, 0x00,</div><div class='add'>+	0x78, 0x97, 0xa2, 0x02, 0x2a, 0x50, 0x00, 0x00, 0x9e, 0x97, 0xa2, 0x45,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x7a, 0x97, 0x22, 0x02, 0x0c, 0x50, 0x00, 0x00,</div><div class='add'>+	0x83, 0x97, 0x00, 0x02, 0x16, 0xc0, 0x00, 0x00, 0x82, 0x97, 0x22, 0x5c,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x30, 0x80, 0x00, 0x10, 0x42, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x82, 0x97, 0x22, 0x40, 0xe3, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x47,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0x7e, 0x97, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0x1b, 0x84, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x24, 0x97, 0x00, 0x5c, 0x1f, 0x00, 0x01, 0x00, 0x9e, 0x97, 0x22, 0x15,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x33, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x9d, 0x97, 0xa2, 0x02, 0x1a, 0x50, 0x00, 0x00, 0x8f, 0x97, 0x22, 0x46,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x70, 0x80, 0x00, 0x03, 0x42, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x46, 0x1f, 0x80, 0x01, 0x00, 0x8f, 0x97, 0x22, 0x40,</div><div class='add'>+	0xe3, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00, 0x8b, 0x97, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x1b, 0x84, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x05, 0x48, 0xb1, 0x01, 0x00, 0x0c, 0x80, 0x00, 0x03,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0x10, 0x00, 0x00, 0xf0, 0x10, 0xc8, 0x01, 0x00,</div><div class='add'>+	0x2f, 0x00, 0x2f, 0x5c, 0x11, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00, 0x47,</div><div class='add'>+	0xe7, 0x91, 0x01, 0x00, 0xf0, 0x07, 0x00, 0x40, 0x1b, 0x98, 0x01, 0x00,</div><div class='add'>+	0x5c, 0x97, 0x20, 0x15, 0x1a, 0x6c, 0x00, 0x00, 0x70, 0x00, 0x00, 0x03,</div><div class='add'>+	0x48, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x22, 0x50, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x03, 0xf0, 0xb1, 0x01, 0x00, 0xff, 0x07, 0x00, 0x08,</div><div class='add'>+	0xe0, 0x8d, 0x01, 0x00, 0x00, 0x00, 0x00, 0x42, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xa0, 0x00, 0x00, 0xa4, 0x62, 0xdd, 0x01, 0x00, 0x9a, 0x97, 0xa8, 0x46,</div><div class='add'>+	0x1f, 0x10, 0x00, 0x00, 0x5c, 0x97, 0x00, 0x05, 0x48, 0xb1, 0x00, 0x00,</div><div class='add'>+	0x5c, 0x97, 0x00, 0x02, 0x10, 0xc0, 0x00, 0x00, 0xa0, 0x97, 0xa2, 0x44,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0xda, 0x94, 0x00, 0x01, 0x8c, 0x30, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x1b, 0x10, 0xb1, 0x00, 0x00, 0x00, 0x80, 0x00, 0x10,</div><div class='add'>+	0x44, 0xc9, 0x01, 0x00, 0x10, 0x00, 0x00, 0x40, 0xf1, 0x99, 0x01, 0x00,</div><div class='add'>+	0x10, 0x00, 0x00, 0x08, 0xf0, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x16,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x10, 0x00, 0x00, 0x03, 0xe0, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x45, 0x61, 0xb1, 0x01, 0x00, 0x20, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x00, 0x00, 0xa8, 0x5c, 0x1f, 0x90, 0x00, 0x00,</div><div class='add'>+	0xa7, 0x97, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x17, 0x00, 0x00, 0xd0,</div><div class='add'>+	0xa2, 0xc9, 0x01, 0x00, 0x00, 0x00, 0xa2, 0x40, 0x27, 0xec, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x20, 0x00, 0xb0, 0x01, 0x00, 0xcc, 0x95, 0x00, 0x41,</div><div class='add'>+	0xa3, 0x41, 0x01, 0x00, 0xab, 0x97, 0x00, 0x41, 0x27, 0xd0, 0x00, 0x00,</div><div class='add'>+	0x10, 0x00, 0x00, 0x07, 0x96, 0xe4, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4b,</div><div class='add'>+	0x80, 0x94, 0x01, 0x00, 0x00, 0x00, 0x00, 0x54, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x80, 0x00, 0x40, 0x62, 0xdd, 0x01, 0x00, 0x00, 0x00, 0xa8, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0xb2, 0x97, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x98, 0x00, 0x40, 0x2b, 0x30, 0x01, 0x00, 0xac, 0x00, 0x2d, 0x06,</div><div class='add'>+	0x16, 0xc0, 0x01, 0x00, 0x90, 0x00, 0x2d, 0xf0, 0x16, 0xc4, 0x01, 0x00,</div><div class='add'>+	0xba, 0x97, 0xa0, 0xf0, 0x16, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x17, 0xc0, 0x01, 0x00, 0x0e, 0x00, 0x00, 0xa2, 0x44, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x6c, 0xf0, 0x30, 0xb0, 0x01, 0x00, 0xac, 0x00, 0x2d, 0x40,</div><div class='add'>+	0x87, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x6c, 0xf0, 0x28, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xc3, 0x97, 0x22, 0x4a, 0x19, 0x7c, 0x00, 0x00, 0x00, 0x30, 0x00, 0x43,</div><div class='add'>+	0x86, 0xc8, 0x01, 0x00, 0x00, 0x30, 0x00, 0x0b, 0x16, 0xc8, 0x01, 0x00,</div><div class='add'>+	0xc3, 0x97, 0xa4, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x17, 0xc0, 0x01, 0x00, 0xe4, 0x97, 0x22, 0x06, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0xd0, 0x97, 0xa2, 0x06, 0x14, 0x6c, 0x00, 0x00, 0xcd, 0x97, 0x22, 0x48,</div><div class='add'>+	0x19, 0x7c, 0x00, 0x00, 0xc8, 0x97, 0xa0, 0x41, 0x17, 0x40, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x17, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x31, 0xc0, 0x01, 0x00, 0x90, 0x00, 0x20, 0x18, 0xe0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x8b, 0x00, 0x2d, 0x48, 0x19, 0x80, 0x01, 0x00, 0x8b, 0x00, 0x20, 0x45,</div><div class='add'>+	0xe7, 0x91, 0x01, 0x00, 0xd0, 0x97, 0x00, 0x40, 0x87, 0x90, 0x00, 0x00,</div><div class='add'>+	0x08, 0x00, 0x00, 0x43, 0x86, 0x98, 0x01, 0x00, 0xd0, 0x97, 0xa0, 0x48,</div><div class='add'>+	0x17, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x17, 0xc0, 0x01, 0x00,</div><div class='add'>+	0xb0, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00, 0x10, 0x50, 0x00, 0x43,</div><div class='add'>+	0xfc, 0xc9, 0x01, 0x00, 0x3b, 0x98, 0x00, 0x30, 0x81, 0x30, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0xe5, 0xb1, 0x01, 0x00, 0xdb, 0x97, 0x22, 0x4a,</div><div class='add'>+	0x19, 0x7c, 0x00, 0x00, 0x08, 0x00, 0x00, 0xa2, 0x44, 0xc9, 0x01, 0x00,</div><div class='add'>+	0xcc, 0x00, 0x2d, 0xab, 0xf9, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xab,</div><div class='add'>+	0x17, 0xc0, 0x01, 0x00, 0xda, 0x97, 0xa0, 0xf0, 0x16, 0x44, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x17, 0xc0, 0x01, 0x00, 0xdf, 0x97, 0x64, 0xf0,</div><div class='add'>+	0x82, 0xb0, 0x00, 0x00, 0xa4, 0x00, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00,</div><div class='add'>+	0xdf, 0x97, 0xa2, 0xf2, 0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0xe5, 0xb1, 0x01, 0x00, 0x8c, 0x00, 0x20, 0x18, 0xe0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x90, 0x00, 0x00, 0x40, 0x45, 0x99, 0x01, 0x00, 0x00, 0x00, 0x60, 0x06,</div><div class='add'>+	0x30, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x86, 0x0c, 0x80, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xbc, 0x00, 0x2d, 0x46, 0x19, 0x90, 0x01, 0x00, 0xa0, 0x00, 0xa0, 0xf2,</div><div class='add'>+	0xe4, 0xb1, 0x01, 0x00, 0xb0, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00,</div><div class='add'>+	0x10, 0x50, 0x00, 0x43, 0xfc, 0xc9, 0x01, 0x00, 0x3b, 0x98, 0x00, 0x30,</div><div class='add'>+	0x81, 0x30, 0x01, 0x00, 0x00, 0x00, 0xa2, 0x4a, 0x19, 0xfc, 0x00, 0x00,</div><div class='add'>+	0x08, 0x00, 0x00, 0xa2, 0x44, 0xc9, 0x01, 0x00, 0xcc, 0x00, 0x2d, 0xab,</div><div class='add'>+	0xf9, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xab, 0x17, 0xc0, 0x01, 0x00,</div><div class='add'>+	0xed, 0x97, 0xa0, 0xf0, 0x16, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x17, 0xc0, 0x01, 0x00, 0x00, 0x00, 0xe4, 0xf0, 0x82, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x80, 0x00, 0x10, 0x44, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x03, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xb1, 0x01, 0x00, 0x00, 0x00, 0xa8, 0x1b, 0xe0, 0xb1, 0x00, 0x00,</div><div class='add'>+	0xf2, 0x97, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x0c,</div><div class='add'>+	0x7e, 0x89, 0x01, 0x00, 0x00, 0x00, 0xa6, 0x4c, 0x95, 0x60, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x4a, 0x18, 0x94, 0x01, 0x00, 0x00, 0x80, 0x00, 0x10,</div><div class='add'>+	0x44, 0xc9, 0x01, 0x00, 0x04, 0x00, 0x22, 0x01, 0xf0, 0x31, 0x00, 0x00,</div><div class='add'>+	0x20, 0x00, 0x00, 0x40, 0xf0, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x16,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x43, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x20, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00, 0x00, 0x00, 0xa8, 0x15,</div><div class='add'>+	0xe0, 0xb1, 0x00, 0x00, 0xfd, 0x97, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x10, 0x80, 0x00, 0x03, 0x44, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x06,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0xe8, 0x5f, 0x17, 0x90, 0x01, 0x00, 0x70, 0x00, 0x00, 0x40,</div><div class='add'>+	0x43, 0x99, 0x01, 0x00, 0x7a, 0x01, 0x2e, 0xfe, 0x92, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x8b, 0x00, 0x2d, 0xf6, 0x16, 0xb0, 0x01, 0x00, 0x0a, 0x98, 0x22, 0x43,</div><div class='add'>+	0xe7, 0x7d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x45, 0xc1, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0xa6, 0x2a, 0xb0, 0x01, 0x00, 0x28, 0x00, 0x6e, 0x06,</div><div class='add'>+	0x82, 0xc8, 0x01, 0x00, 0x0e, 0x98, 0x22, 0x4a, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x42, 0x45, 0xd1, 0x01, 0x00, 0x00, 0x00, 0x6e, 0x4c,</div><div class='add'>+	0x83, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41, 0x92, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x0f, 0x98, 0x42, 0x30, 0x3d, 0x07, 0x00, 0x00, 0x00, 0x00, 0x66, 0x9e,</div><div class='add'>+	0x83, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x1a, 0x41, 0x3d, 0xc3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x92, 0xc0, 0x01, 0x00, 0x06, 0x00, 0x00, 0xa2,</div><div class='add'>+	0x44, 0xc9, 0x01, 0x00, 0x10, 0x00, 0x00, 0x49, 0x98, 0xf4, 0x01, 0x00,</div><div class='add'>+	0x18, 0x98, 0x26, 0x30, 0x93, 0x04, 0x00, 0x00, 0x18, 0x98, 0x90, 0x4c,</div><div class='add'>+	0x92, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x93, 0xc0, 0x01, 0x00,</div><div class='add'>+	0xff, 0xff, 0x80, 0x49, 0xec, 0xa9, 0x01, 0x00, 0x00, 0x80, 0x00, 0x10,</div><div class='add'>+	0x44, 0xc9, 0x01, 0x00, 0x04, 0x00, 0x22, 0x01, 0xf0, 0x31, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x09, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x18,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x20, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0xa8, 0x15, 0xe0, 0xb1, 0x00, 0x00, 0x1d, 0x98, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x2a, 0x98, 0x22, 0x5f, 0x81, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x29, 0x98, 0xa2, 0x40, 0x19, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x19, 0x90, 0x01, 0x00, 0x00, 0x00, 0x00, 0x54, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x10, 0x00, 0x00, 0x07, 0x96, 0xe4, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4f,</div><div class='add'>+	0x97, 0x94, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4b, 0x62, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x29, 0x98, 0x28, 0x40, 0x81, 0x32, 0x00, 0x00, 0x26, 0x98, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0xa2, 0x21, 0x81, 0x84, 0x00, 0x00,</div><div class='add'>+	0x2d, 0x98, 0xa2, 0x5f, 0x81, 0x6c, 0x00, 0x00, 0x00, 0x00, 0xa2, 0x43,</div><div class='add'>+	0x19, 0x7c, 0x01, 0x00, 0x00, 0x00, 0x00, 0x43, 0x19, 0x90, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x54, 0x61, 0xb1, 0x01, 0x00, 0x10, 0x00, 0x00, 0x07,</div><div class='add'>+	0x96, 0xe4, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x96, 0x94, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4b, 0x62, 0xb1, 0x01, 0x00, 0x00, 0x00, 0xa8, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x30, 0x98, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x00, 0x80, 0x00, 0x19, 0x44, 0xc9, 0x01, 0x00, 0x04, 0x00, 0x22, 0x02,</div><div class='add'>+	0xf0, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0b, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x13, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x43,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x20, 0x00, 0x00, 0x19, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0xa8, 0x08, 0xe0, 0xb1, 0x00, 0x00, 0x38, 0x98, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x7c, 0x00, 0x2d, 0xf0, 0x84, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x02, 0x00, 0x00, 0xf0, 0x98, 0xf4, 0x01, 0x00, 0x41, 0x98, 0x20, 0x4c,</div><div class='add'>+	0x84, 0x6c, 0x00, 0x00, 0x88, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00,</div><div class='add'>+	0x41, 0x98, 0x20, 0xf2, 0x84, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x85, 0xb0, 0x01, 0x00, 0x98, 0x00, 0x2d, 0x14, 0x82, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf0, 0x98, 0xb0, 0x01, 0x00, 0xa3, 0x00, 0x2d, 0x14,</div><div class='add'>+	0x98, 0xd0, 0x01, 0x00, 0x46, 0x98, 0x20, 0x4c, 0x84, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4c, 0x84, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf3,</div><div class='add'>+	0x80, 0xe0, 0x01, 0x00, 0x49, 0x98, 0x23, 0x40, 0x84, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x84, 0xb0, 0x01, 0x00, 0xd0, 0x00, 0x20, 0x14,</div><div class='add'>+	0xe0, 0xb1, 0x01, 0x00, 0x98, 0x00, 0x25, 0x42, 0x80, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x6e, 0xf3, 0x80, 0xf0, 0x01, 0x00, 0x00, 0x00, 0xa6, 0x42,</div><div class='add'>+	0x82, 0xc0, 0x00, 0x00, 0x4f, 0x98, 0xa0, 0x40, 0x16, 0x40, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x17, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x9f, 0xf0,</div><div class='add'>+	0x82, 0xec, 0x00, 0x00, 0x98, 0x00, 0xa0, 0x41, 0xe0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x52, 0x98, 0x00, 0x12, 0x10, 0xc9, 0x00, 0x00, 0x00, 0x48, 0x80, 0x40,</div><div class='add'>+	0x0b, 0x98, 0x01, 0x00, 0xc0, 0x49, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00,</div><div class='add'>+	0x80, 0x4b, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00, 0x40, 0x4d, 0x80, 0x40,</div><div class='add'>+	0x0b, 0x98, 0x01, 0x00, 0x00, 0x4f, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00,</div><div class='add'>+	0xc0, 0x50, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00, 0x80, 0x52, 0x80, 0x40,</div><div class='add'>+	0x0b, 0x98, 0x01, 0x00, 0x40, 0x54, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00,</div><div class='add'>+	0x00, 0x56, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00, 0xc0, 0x57, 0x80, 0x40,</div><div class='add'>+	0x0b, 0x98, 0x01, 0x00, 0x80, 0x59, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00,</div><div class='add'>+	0x40, 0x5b, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00, 0x00, 0x5d, 0x80, 0x40,</div><div class='add'>+	0x0b, 0x98, 0x01, 0x00, 0xc0, 0x5e, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00,</div><div class='add'>+	0x80, 0x60, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00, 0x40, 0x62, 0x80, 0x40,</div><div class='add'>+	0x0b, 0x98, 0x01, 0x00, 0x00, 0x64, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00,</div><div class='add'>+	0xc0, 0x65, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00, 0x80, 0x67, 0x80, 0x40,</div><div class='add'>+	0x0b, 0x98, 0x01, 0x00, 0x40, 0x69, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00,</div><div class='add'>+	0x00, 0x6b, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00, 0xc0, 0x6c, 0x80, 0x40,</div><div class='add'>+	0x0b, 0x98, 0x01, 0x00, 0x80, 0x6e, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00,</div><div class='add'>+	0x40, 0x70, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00, 0x00, 0x72, 0x80, 0x40,</div><div class='add'>+	0x0b, 0x98, 0x01, 0x00, 0xc0, 0x73, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00,</div><div class='add'>+	0x80, 0x75, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00, 0x40, 0x77, 0x80, 0x40,</div><div class='add'>+	0x0b, 0x98, 0x01, 0x00, 0x00, 0x79, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00,</div><div class='add'>+	0xc0, 0x7a, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00, 0x80, 0x7c, 0x80, 0x40,</div><div class='add'>+	0x0b, 0x98, 0x01, 0x00, 0x40, 0x7e, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00,</div><div class='add'>+	0x72, 0x98, 0x43, 0x57, 0x61, 0x31, 0x00, 0x00, 0x7e, 0x98, 0xa2, 0x57,</div><div class='add'>+	0x73, 0x7d, 0x00, 0x00, 0x7e, 0x98, 0xa2, 0x40, 0x81, 0x6f, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x48, 0x61, 0xb1, 0x01, 0x00, 0x00, 0x10, 0x00, 0x4a,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x76, 0x98, 0xa8, 0x4a, 0x80, 0x33, 0x00, 0x00,</div><div class='add'>+	0x7b, 0x98, 0x22, 0x5f, 0x95, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4b,</div><div class='add'>+	0x62, 0xb1, 0x01, 0x00, 0x79, 0x98, 0xa8, 0x4b, 0xac, 0x33, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x1b, 0xa5, 0x82, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xbe,</div><div class='add'>+	0x83, 0xc3, 0x01, 0x00, 0x00, 0x00, 0x80, 0x40, 0x97, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x10, 0x00, 0x4a, 0x62, 0xdd, 0x01, 0x00, 0x82, 0x98, 0x28, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x7e, 0x98, 0x22, 0x57, 0x77, 0x7d, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x9b, 0x20, 0x97, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4b,</div><div class='add'>+	0x62, 0xb1, 0x01, 0x00, 0x82, 0x98, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x9b, 0x40, 0x97, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x2e, 0x10,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0xa8, 0x01, 0x00, 0x40, 0xf1, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x05, 0xf0, 0xb1, 0x01, 0x00, 0x09, 0x00, 0x00, 0x07,</div><div class='add'>+	0x96, 0xe4, 0x01, 0x00, 0x00, 0x00, 0x60, 0xa7, 0x97, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x10, 0x62, 0xb1, 0x01, 0x00, 0x00, 0x00, 0xa8, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x8a, 0x98, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xa8, 0x00, 0x2d, 0x1c, 0x8a, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x9f, 0xf0,</div><div class='add'>+	0x8a, 0xd0, 0x00, 0x00, 0x00, 0x00, 0xa2, 0x40, 0x8b, 0xec, 0x00, 0x00,</div><div class='add'>+	0x8a, 0x00, 0x20, 0x40, 0xe7, 0xb1, 0x01, 0x00, 0xb4, 0x00, 0x00, 0x40,</div><div class='add'>+	0x47, 0x99, 0x01, 0x00, 0xa4, 0x00, 0x2d, 0x45, 0xe0, 0xd1, 0x01, 0x00,</div><div class='add'>+	0x97, 0x98, 0x9c, 0x17, 0x80, 0x32, 0x00, 0x00, 0xbe, 0x00, 0x2f, 0xab,</div><div class='add'>+	0x83, 0xb0, 0x01, 0x00, 0xff, 0x98, 0x00, 0x14, 0x82, 0x50, 0x01, 0x00,</div><div class='add'>+	0x9c, 0x98, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x9c, 0x98, 0x22, 0xf2,</div><div class='add'>+	0x82, 0x30, 0x00, 0x00, 0x8c, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00,</div><div class='add'>+	0x9c, 0x98, 0x9f, 0x1c, 0xe0, 0x6d, 0x00, 0x00, 0xbe, 0x00, 0x00, 0x40,</div><div class='add'>+	0x47, 0x99, 0x01, 0x00, 0xff, 0x98, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0xa8, 0x00, 0x20, 0x1c, 0xe0, 0xb1, 0x01, 0x00, 0x9c, 0x00, 0x2d, 0x30,</div><div class='add'>+	0x81, 0xb0, 0x01, 0x00, 0x88, 0x00, 0x2d, 0xf0, 0x84, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x94, 0x00, 0x2d, 0xf2, 0x86, 0xb0, 0x01, 0x00, 0xc6, 0x98, 0x23, 0xf0,</div><div class='add'>+	0x84, 0x6c, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x42, 0x88, 0xf4, 0x01, 0x00,</div><div class='add'>+	0xc6, 0x98, 0x20, 0x50, 0x89, 0x6c, 0x00, 0x00, 0xb5, 0x98, 0xa3, 0x92,</div><div class='add'>+	0x87, 0x6c, 0x00, 0x00, 0xa5, 0x98, 0x00, 0x44, 0x10, 0xc9, 0x00, 0x00,</div><div class='add'>+	0xc6, 0x98, 0x00, 0x0a, 0x87, 0xb0, 0x00, 0x00, 0xc6, 0x98, 0x00, 0x09,</div><div class='add'>+	0x87, 0xb0, 0x00, 0x00, 0xc6, 0x98, 0x00, 0x08, 0x87, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xc6, 0x98, 0x00, 0x07, 0x87, 0xb0, 0x00, 0x00, 0xc6, 0x98, 0x00, 0x07,</div><div class='add'>+	0x87, 0xb0, 0x00, 0x00, 0xc6, 0x98, 0x00, 0x07, 0x87, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xc6, 0x98, 0x00, 0x06, 0x87, 0xb0, 0x00, 0x00, 0xc6, 0x98, 0x00, 0x06,</div><div class='add'>+	0x87, 0xb0, 0x00, 0x00, 0xc6, 0x98, 0x00, 0x06, 0x87, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xc6, 0x98, 0x00, 0x06, 0x87, 0xb0, 0x00, 0x00, 0xc6, 0x98, 0x00, 0x06,</div><div class='add'>+	0x87, 0xb0, 0x00, 0x00, 0xc6, 0x98, 0x00, 0x05, 0x87, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xc6, 0x98, 0x00, 0x05, 0x87, 0xb0, 0x00, 0x00, 0xc6, 0x98, 0x00, 0x05,</div><div class='add'>+	0x87, 0xb0, 0x00, 0x00, 0xc6, 0x98, 0x00, 0x05, 0x87, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xc6, 0x98, 0x00, 0x05, 0x87, 0xb0, 0x00, 0x00, 0xb6, 0x98, 0x00, 0x44,</div><div class='add'>+	0x10, 0xc9, 0x00, 0x00, 0xc6, 0x98, 0x00, 0x0f, 0x87, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xc6, 0x98, 0x00, 0x0e, 0x87, 0xb0, 0x00, 0x00, 0xc6, 0x98, 0x00, 0x0d,</div><div class='add'>+	0x87, 0xb0, 0x00, 0x00, 0xc6, 0x98, 0x00, 0x0c, 0x87, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xc6, 0x98, 0x00, 0x0c, 0x87, 0xb0, 0x00, 0x00, 0xc6, 0x98, 0x00, 0x0c,</div><div class='add'>+	0x87, 0xb0, 0x00, 0x00, 0xc6, 0x98, 0x00, 0x0c, 0x87, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xc6, 0x98, 0x00, 0x0c, 0x87, 0xb0, 0x00, 0x00, 0xc6, 0x98, 0x00, 0x0c,</div><div class='add'>+	0x87, 0xb0, 0x00, 0x00, 0xc6, 0x98, 0x00, 0x0b, 0x87, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xc6, 0x98, 0x00, 0x0b, 0x87, 0xb0, 0x00, 0x00, 0xc6, 0x98, 0x00, 0x0b,</div><div class='add'>+	0x87, 0xb0, 0x00, 0x00, 0xc6, 0x98, 0x00, 0x0b, 0x87, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xc6, 0x98, 0x00, 0x0b, 0x87, 0xb0, 0x00, 0x00, 0xc6, 0x98, 0x00, 0x0b,</div><div class='add'>+	0x87, 0xb0, 0x00, 0x00, 0xc6, 0x98, 0x00, 0x0b, 0x87, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xbf, 0x00, 0x2d, 0x43, 0x84, 0xc0, 0x01, 0x00, 0x90, 0x00, 0x2d, 0xf3,</div><div class='add'>+	0x80, 0xe0, 0x01, 0x00, 0xcb, 0x98, 0x23, 0x40, 0x84, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x94, 0x00, 0x20, 0x9d, 0xe1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x84, 0xb0, 0x01, 0x00, 0xcf, 0x98, 0xa2, 0xf0, 0x38, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x9c, 0x00, 0x20, 0x42, 0xe0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5f,</div><div class='add'>+	0x13, 0x94, 0x01, 0x00, 0x00, 0x00, 0x80, 0x46, 0x19, 0x80, 0x01, 0x00,</div><div class='add'>+	0x9c, 0x00, 0x20, 0x42, 0xe0, 0xb1, 0x01, 0x00, 0x37, 0x00, 0x00, 0x40,</div><div class='add'>+	0x43, 0x99, 0x01, 0x00, 0x04, 0x00, 0x00, 0xf3, 0x80, 0xf4, 0x01, 0x00,</div><div class='add'>+	0x0f, 0x00, 0x00, 0xf3, 0x82, 0x88, 0x01, 0x00, 0xd5, 0x98, 0x23, 0x41,</div><div class='add'>+	0x80, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5f, 0x13, 0x94, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x89, 0x0c, 0x80, 0xb2, 0x00, 0x00, 0xbc, 0x00, 0x00, 0x40,</div><div class='add'>+	0x43, 0x99, 0x01, 0x00, 0xa0, 0x00, 0xa0, 0xf2, 0xe4, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x9f, 0x41, 0x24, 0xec, 0x00, 0x00, 0xdf, 0x98, 0xa6, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x9f, 0x42, 0x38, 0xec, 0x00, 0x00,</div><div class='add'>+	0xdf, 0x98, 0xa6, 0x40, 0x81, 0x32, 0x00, 0x00, 0xb4, 0x00, 0x00, 0x40,</div><div class='add'>+	0x43, 0x99, 0x01, 0x00, 0xe1, 0x98, 0xa3, 0xf0, 0x3a, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x40, 0x81, 0xb2, 0x01, 0x00, 0xb4, 0x00, 0x00, 0x40,</div><div class='add'>+	0x43, 0x99, 0x01, 0x00, 0xe5, 0x98, 0x22, 0xf0, 0x3a, 0x6c, 0x00, 0x00,</div><div class='add'>+	0xb4, 0x00, 0x20, 0x1d, 0xe0, 0xb1, 0x01, 0x00, 0x80, 0x00, 0x2d, 0x5f,</div><div class='add'>+	0x13, 0x94, 0x01, 0x00, 0xe5, 0x98, 0x23, 0xf0, 0x3a, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x80, 0x00, 0x20, 0x1d, 0xe0, 0xb1, 0x01, 0x00, 0xc0, 0x00, 0x20, 0x12,</div><div class='add'>+	0xe0, 0xb1, 0x01, 0x00, 0xc4, 0x00, 0xa0, 0x1c, 0xe0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x80, 0x00, 0x03, 0x44, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x42,</div><div class='add'>+	0xe0, 0xb1, 0x01, 0x00, 0x12, 0x00, 0x00, 0x40, 0x87, 0x98, 0x01, 0x00,</div><div class='add'>+	0xee, 0x98, 0x9f, 0x41, 0x24, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x8c, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x12, 0x8c, 0xd0, 0x01, 0x00,</div><div class='add'>+	0xef, 0x98, 0x00, 0x41, 0x24, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x8d, 0xb0, 0x01, 0x00, 0x3d, 0x99, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x45, 0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x00, 0x00, 0xa8, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xf1, 0x98, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xbf, 0x95, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0xa2, 0x08, 0x80, 0x32, 0x01, 0x00,</div><div class='add'>+	0xf8, 0x98, 0xa2, 0x40, 0x95, 0x6c, 0x00, 0x00, 0xcc, 0x95, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x00, 0x82, 0x00, 0xa6, 0x04, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xa0, 0x98, 0x2f, 0x40, 0x11, 0xb0, 0x01, 0x00, 0xe3, 0x89, 0x00, 0x41,</div><div class='add'>+	0x89, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x9f, 0xf8, 0x3e, 0xec, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x9f, 0x12, 0xe0, 0xed, 0x00, 0x00, 0xc8, 0x00, 0x20, 0xab,</div><div class='add'>+	0xe1, 0xb1, 0x01, 0x00, 0xcc, 0x00, 0xa0, 0x1f, 0xe0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x01, 0x99, 0xa3, 0x5f, 0xe7, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0xe7, 0xc1, 0x01, 0x00, 0xa6, 0x00, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00,</div><div class='add'>+	0x15, 0x99, 0x22, 0xf2, 0x86, 0x30, 0x00, 0x00, 0x03, 0x00, 0x00, 0x43,</div><div class='add'>+	0x84, 0xf4, 0x01, 0x00, 0x01, 0x00, 0x00, 0x41, 0x80, 0xcc, 0x01, 0x00,</div><div class='add'>+	0xb8, 0x00, 0x2d, 0x42, 0x80, 0xd0, 0x01, 0x00, 0x00, 0x00, 0x62, 0x40,</div><div class='add'>+	0x86, 0xc0, 0x01, 0x00, 0x09, 0x99, 0x1f, 0x43, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x0a, 0x99, 0xa2, 0x40, 0x87, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x62, 0x41,</div><div class='add'>+	0x87, 0xb0, 0x01, 0x00, 0x0e, 0x99, 0x9f, 0x40, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x85, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x84, 0xd0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x42, 0x80, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf2, 0x88, 0xb0, 0x01, 0x00, 0x02, 0x00, 0x00, 0x44,</div><div class='add'>+	0x84, 0xf4, 0x01, 0x00, 0xb8, 0x00, 0x2e, 0x42, 0x80, 0xd0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x62, 0x40, 0x88, 0xc0, 0x01, 0x00, 0x14, 0x99, 0x1f, 0x44,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x18, 0x99, 0xa2, 0x40, 0x89, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x18, 0x99, 0x62, 0x41, 0x89, 0xb0, 0x00, 0x00, 0x03, 0x00, 0x62, 0x41,</div><div class='add'>+	0x86, 0xe4, 0x01, 0x00, 0xb8, 0x00, 0x00, 0x40, 0x45, 0x99, 0x01, 0x00,</div><div class='add'>+	0x01, 0x00, 0x62, 0x41, 0x88, 0xe4, 0x01, 0x00, 0xa4, 0x00, 0x20, 0x40,</div><div class='add'>+	0xe5, 0xb1, 0x01, 0x00, 0xa2, 0x00, 0x20, 0x40, 0xe7, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xbc, 0x00, 0x2e, 0x43, 0x87, 0xf0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0x86, 0xc0, 0x01, 0x00, 0x1e, 0x99, 0x20, 0x43, 0x87, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x43, 0xe5, 0xb1, 0x01, 0x00, 0x40, 0x01, 0x00, 0x43,</div><div class='add'>+	0x80, 0xce, 0x01, 0x00, 0x00, 0x00, 0xa4, 0x43, 0xe4, 0x31, 0x01, 0x00,</div><div class='add'>+	0x40, 0x01, 0xe2, 0x40, 0x87, 0x98, 0x01, 0x00, 0x88, 0x00, 0x2d, 0x44,</div><div class='add'>+	0x81, 0xb0, 0x01, 0x00, 0x90, 0x00, 0x2d, 0xf2, 0x2e, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x9c, 0x00, 0x2d, 0xf0, 0x86, 0xb0, 0x01, 0x00, 0x90, 0x00, 0x2d, 0xf0,</div><div class='add'>+	0x82, 0xb0, 0x01, 0x00, 0xba, 0x00, 0x2d, 0xf0, 0x98, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x2b, 0x99, 0xa2, 0x12, 0x98, 0x6c, 0x00, 0x00, 0xbc, 0x00, 0x2d, 0xf2,</div><div class='add'>+	0x98, 0xb0, 0x01, 0x00, 0x2b, 0x99, 0xa0, 0xf2, 0x98, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x17, 0x82, 0xb0, 0x01, 0x00, 0x9c, 0x00, 0x20, 0x41,</div><div class='add'>+	0xe0, 0xb1, 0x01, 0x00, 0xb4, 0x00, 0x2d, 0x12, 0x86, 0xd0, 0x01, 0x00,</div><div class='add'>+	0x2e, 0x99, 0xa3, 0x41, 0xe0, 0x6d, 0x00, 0x00, 0x2f, 0x99, 0x00, 0xf0,</div><div class='add'>+	0x84, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x80, 0x00, 0x2d, 0x43, 0x84, 0xd0, 0x01, 0x00, 0x32, 0x99, 0x9f, 0x42,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x85, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x34, 0x99, 0xa3, 0x42, 0x14, 0x6c, 0x00, 0x00, 0x35, 0x99, 0x00, 0x0a,</div><div class='add'>+	0x0c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x0c, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x37, 0x99, 0xa0, 0x17, 0x0c, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x80, 0x17,</div><div class='add'>+	0x0c, 0xb0, 0x01, 0x00, 0x3c, 0x99, 0x22, 0x40, 0x0d, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0xa0, 0x0a, 0x0c, 0xec, 0x00, 0x00, 0x01, 0x00, 0x00, 0xf0,</div><div class='add'>+	0x82, 0xf4, 0x01, 0x00, 0x3c, 0x99, 0xa0, 0x41, 0x0c, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0xa2, 0xf0, 0x80, 0x32, 0x01, 0x00, 0x00, 0x00, 0x80, 0x40,</div><div class='add'>+	0x81, 0xb0, 0x01, 0x00, 0xd0, 0x95, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x04, 0x80, 0x00, 0x03, 0x44, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x46,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x60, 0x41, 0x87, 0x94, 0x01, 0x00, 0x00, 0x80, 0x00, 0x10,</div><div class='add'>+	0x44, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x50, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x48, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x49,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x03, 0xe0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x45, 0x61, 0xb1, 0x01, 0x00, 0x20, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x00, 0x00, 0xa8, 0x5d, 0x05, 0x90, 0x00, 0x00,</div><div class='add'>+	0x48, 0x99, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x2e, 0x4b,</div><div class='add'>+	0x19, 0x90, 0x01, 0x00, 0x05, 0x00, 0x2a, 0x0c, 0xe4, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x04, 0xe6, 0xb1, 0x01, 0x00, 0x52, 0x99, 0x22, 0x49,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x42, 0x00, 0x00, 0x40, 0x87, 0x98, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x49, 0x1f, 0x80, 0x01, 0x00, 0xaa, 0x97, 0x00, 0x40,</div><div class='add'>+	0x8d, 0xb0, 0x00, 0x00, 0x58, 0x99, 0x22, 0x40, 0xaf, 0x6f, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x15, 0x96, 0xb0, 0x01, 0x00, 0x72, 0x98, 0x00, 0x08,</div><div class='add'>+	0x94, 0x30, 0x01, 0x00, 0x57, 0x99, 0x22, 0x40, 0x97, 0x6c, 0x00, 0x00,</div><div class='add'>+	0xaa, 0x97, 0x00, 0x46, 0x87, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40,</div><div class='add'>+	0x87, 0xb0, 0x01, 0x00, 0x58, 0x99, 0x43, 0x48, 0x61, 0x31, 0x00, 0x00,</div><div class='add'>+	0x00, 0x10, 0x00, 0x08, 0x62, 0xdd, 0x01, 0x00, 0x5d, 0x99, 0x28, 0x40,</div><div class='add'>+	0x87, 0x30, 0x00, 0x00, 0x59, 0x99, 0x22, 0x48, 0x77, 0x7d, 0x00, 0x00,</div><div class='add'>+	0xaa, 0x97, 0x1b, 0x46, 0x87, 0xb0, 0x00, 0x00, 0x60, 0x99, 0x22, 0x5f,</div><div class='add'>+	0x11, 0x7c, 0x00, 0x00, 0x04, 0x00, 0x22, 0x15, 0x62, 0x31, 0x00, 0x00,</div><div class='add'>+	0x5e, 0x99, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x9b, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x49, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x30, 0x00, 0x00, 0x40, 0xa1, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x93, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x1f, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xb1, 0x99, 0x00, 0x49, 0x96, 0x30, 0x01, 0x00, 0x07, 0x00, 0x00, 0x49,</div><div class='add'>+	0x06, 0xe4, 0x01, 0x00, 0x00, 0x39, 0x00, 0x03, 0x06, 0xc8, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x05, 0xb0, 0x01, 0x00, 0x20, 0x00, 0x00, 0xd0,</div><div class='add'>+	0xa0, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41, 0x93, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x65, 0x99, 0xa0, 0x54, 0x93, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x2e, 0x05,</div><div class='add'>+	0x97, 0xb0, 0x01, 0x00, 0x00, 0x48, 0x00, 0x40, 0x49, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0xe1, 0xb1, 0x01, 0x00, 0xc0, 0x01, 0x00, 0xa2,</div><div class='add'>+	0x44, 0xc9, 0x01, 0x00, 0x6e, 0x99, 0xa2, 0x41, 0x97, 0x50, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x20, 0x49, 0xb3, 0x01, 0x00, 0xb6, 0x99, 0x00, 0x40,</div><div class='add'>+	0x49, 0x31, 0x01, 0x00, 0x00, 0xb5, 0x2e, 0x08, 0x97, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0xf1, 0xb1, 0x01, 0x00, 0x74, 0x99, 0xa2, 0x41,</div><div class='add'>+	0x97, 0x50, 0x00, 0x00, 0x18, 0x00, 0x00, 0x40, 0x97, 0x98, 0x01, 0x00,</div><div class='add'>+	0x00, 0x97, 0x2e, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0x78, 0x99, 0xa2, 0x41, 0x97, 0x50, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x49, 0xb1, 0x01, 0x00, 0x40, 0x18, 0x2e, 0x05,</div><div class='add'>+	0x97, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x7c, 0x99, 0xa2, 0x41, 0x97, 0x50, 0x00, 0x00, 0x57, 0x95, 0x20, 0x40,</div><div class='add'>+	0xe7, 0xb1, 0x01, 0x00, 0x30, 0x94, 0x00, 0x40, 0x45, 0x99, 0x01, 0x00,</div><div class='add'>+	0x64, 0x00, 0x00, 0x40, 0xe5, 0x99, 0x01, 0x00, 0x56, 0x95, 0x20, 0x40,</div><div class='add'>+	0xe7, 0xb1, 0x01, 0x00, 0xb8, 0x94, 0x20, 0x41, 0xe5, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xba, 0x94, 0x20, 0x41, 0xe5, 0xb1, 0x01, 0x00, 0x98, 0x94, 0x00, 0x40,</div><div class='add'>+	0x45, 0x99, 0x01, 0x00, 0x02, 0x00, 0x00, 0x40, 0x97, 0x98, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0xf1, 0xb1, 0x01, 0x00, 0x86, 0x99, 0xa2, 0x41,</div><div class='add'>+	0x97, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x97, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x6f, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4b,</div><div class='add'>+	0x68, 0xb1, 0x01, 0x00, 0x8a, 0x99, 0x85, 0x41, 0x97, 0x40, 0x00, 0x00,</div><div class='add'>+	0xc3, 0x99, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x39, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x37, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x35, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x33, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x41, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x3f, 0xb3, 0x01, 0x00, 0x3c, 0x00, 0x00, 0x40,</div><div class='add'>+	0x29, 0x9b, 0x01, 0x00, 0xee, 0x05, 0x00, 0x40, 0x25, 0x9b, 0x01, 0x00,</div><div class='add'>+	0x42, 0x00, 0x00, 0x40, 0x4b, 0x9b, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x2f, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x2d, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x47, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x43, 0xb3, 0x01, 0x00, 0x60, 0x00, 0x00, 0x40, 0x2b, 0x9b, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x54, 0xef, 0x93, 0x01, 0x00, 0x00, 0x00, 0x00, 0x55,</div><div class='add'>+	0xf1, 0x93, 0x01, 0x00, 0xff, 0xff, 0x00, 0xa5, 0x3c, 0x8b, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x2c, 0x5b, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x2c,</div><div class='add'>+	0x45, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x59, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x57, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x27, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x53, 0xb3, 0x01, 0x00,</div><div class='add'>+	0xa7, 0x99, 0xa2, 0x50, 0xfd, 0x7f, 0x00, 0x00, 0xa7, 0x99, 0xa2, 0x51,</div><div class='add'>+	0xfd, 0x7f, 0x00, 0x00, 0xa8, 0x99, 0x00, 0x40, 0x1d, 0xb3, 0x00, 0x00,</div><div class='add'>+	0x50, 0x46, 0x00, 0x40, 0x1d, 0x9b, 0x01, 0x00, 0x00, 0xc0, 0x00, 0xa6,</div><div class='add'>+	0x88, 0xb3, 0x01, 0x00, 0xff, 0x3f, 0x00, 0xa6, 0x3a, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0xc0, 0x00, 0x9d, 0x3b, 0x9b, 0x01, 0x00, 0xb4, 0x05, 0x00, 0x40,</div><div class='add'>+	0x23, 0x9b, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x4d, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x08, 0x0a, 0x00, 0xa6, 0x14, 0xb3, 0x01, 0x00, 0x01, 0x01, 0x00, 0x8a,</div><div class='add'>+	0x15, 0x9b, 0x01, 0x00, 0x00, 0x80, 0x00, 0xa6, 0x56, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x5e, 0x57, 0xb5, 0x01, 0x00, 0x18, 0x00, 0x00, 0x4b,</div><div class='add'>+	0x20, 0xe4, 0x01, 0x00, 0x06, 0x00, 0x00, 0x4b, 0x96, 0xe4, 0x01, 0x00,</div><div class='add'>+	0x00, 0x43, 0x00, 0x4b, 0x96, 0xc8, 0x01, 0x00, 0x18, 0x00, 0x00, 0x10,</div><div class='add'>+	0x20, 0xdc, 0x01, 0x00, 0x00, 0x00, 0x80, 0x4b, 0x20, 0x94, 0x01, 0x00,</div><div class='add'>+	0x00, 0x99, 0x2e, 0x0a, 0x97, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0xb7, 0x99, 0xa2, 0x41, 0x97, 0x50, 0x00, 0x00,</div><div class='add'>+	0x00, 0x03, 0x00, 0x40, 0x97, 0x98, 0x01, 0x00, 0x00, 0xa9, 0x00, 0x40,</div><div class='add'>+	0x45, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xbb, 0x99, 0xa2, 0x41, 0x97, 0x50, 0x00, 0x00, 0x30, 0x00, 0x00, 0x40,</div><div class='add'>+	0x97, 0x98, 0x01, 0x00, 0x00, 0x00, 0x00, 0x55, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4b, 0x62, 0xb1, 0x01, 0x00, 0xbf, 0x99, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0xbf, 0x99, 0xa2, 0x41, 0x97, 0x50, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x87, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x97, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4b, 0x80, 0xb1, 0x01, 0x00, 0x01, 0x00, 0x00, 0xa6,</div><div class='add'>+	0x82, 0xb1, 0x01, 0x00, 0xc5, 0x99, 0x85, 0x41, 0x97, 0x40, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x97, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x97, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4b, 0x90, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x01, 0x00, 0x00, 0xa6, 0x92, 0xb1, 0x01, 0x00, 0xca, 0x99, 0x85, 0x41,</div><div class='add'>+	0x97, 0x40, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0xce, 0x99, 0x44, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12,</div><div class='add'>+	0x80, 0xb1, 0x01, 0x00, 0xff, 0xff, 0x9c, 0x4b, 0x82, 0x89, 0x01, 0x00,</div><div class='add'>+	0xd1, 0x99, 0x44, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4a,</div><div class='add'>+	0x80, 0xb1, 0x01, 0x00, 0x01, 0x00, 0x9c, 0xa6, 0x82, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xd4, 0x99, 0x44, 0x40, 0x81, 0x32, 0x00, 0x00, 0xff, 0xff, 0x00, 0x4b,</div><div class='add'>+	0x84, 0x89, 0x01, 0x00, 0x00, 0x00, 0x9c, 0xc2, 0x24, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4a, 0x90, 0xb1, 0x01, 0x00, 0xff, 0xff, 0x80, 0x4b,</div><div class='add'>+	0x92, 0x89, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4a, 0x90, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x01, 0x00, 0x80, 0xa6, 0x92, 0xb1, 0x01, 0x00, 0xff, 0xff, 0x00, 0x4b,</div><div class='add'>+	0x94, 0x89, 0x01, 0x00, 0x00, 0x00, 0x80, 0xca, 0x94, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb0, 0x01, 0x00, 0xdf, 0x99, 0x80, 0xa5, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0xe0, 0x99, 0x00, 0xa5, 0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x81, 0xc0, 0x01, 0x00, 0xe1, 0x99, 0x80, 0xa5, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x80, 0x01, 0x00, 0x40, 0x83, 0x98, 0x01, 0x00, 0xea, 0x99, 0x20, 0x4f,</div><div class='add'>+	0x81, 0x6c, 0x00, 0x00, 0x00, 0x01, 0x00, 0x40, 0x83, 0x98, 0x01, 0x00,</div><div class='add'>+	0xea, 0x99, 0x20, 0x4b, 0x81, 0x6c, 0x00, 0x00, 0x80, 0x00, 0x00, 0x40,</div><div class='add'>+	0x83, 0x98, 0x01, 0x00, 0xea, 0x99, 0x20, 0x47, 0x81, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x83, 0x98, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x82, 0xdc, 0x01, 0x00, 0x03, 0x90, 0x00, 0x41, 0x20, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x49, 0xb1, 0x01, 0x00, 0x00, 0x14, 0x2f, 0x4c,</div><div class='add'>+	0x83, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xee, 0x99, 0xa2, 0x41, 0x83, 0x50, 0x00, 0x00, 0x64, 0x00, 0x00, 0xa5,</div><div class='add'>+	0x80, 0xc8, 0x01, 0x00, 0xf1, 0x99, 0xa2, 0xa5, 0x80, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x20, 0x00, 0x00, 0x90, 0x20, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5f,</div><div class='add'>+	0x23, 0x91, 0x01, 0x00, 0xf4, 0x99, 0x1f, 0x91, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x30, 0x00, 0x00, 0x90, 0x20, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5f,</div><div class='add'>+	0x23, 0x91, 0x01, 0x00, 0xf7, 0x99, 0x1f, 0x91, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x70, 0x00, 0x00, 0x90, 0x20, 0xa9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5f,</div><div class='add'>+	0x23, 0x91, 0x01, 0x00, 0xfa, 0x99, 0x1f, 0x91, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x5f, 0x23, 0x91, 0x01, 0x00, 0xfc, 0x99, 0x1f, 0x91,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x40, 0x68, 0x00, 0x90, 0x20, 0xa9, 0x01, 0x00,</div><div class='add'>+	0xe0, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00, 0x21, 0x00, 0x00, 0x40,</div><div class='add'>+	0x61, 0x99, 0x01, 0x00, 0x22, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00,</div><div class='add'>+	0x23, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00, 0x24, 0x00, 0x00, 0x40,</div><div class='add'>+	0x61, 0x99, 0x01, 0x00, 0x25, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00,</div><div class='add'>+	0x26, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00, 0x27, 0x00, 0x00, 0x40,</div><div class='add'>+	0x61, 0x99, 0x01, 0x00, 0xc0, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00,</div><div class='add'>+	0xd0, 0x14, 0x00, 0x40, 0x45, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0xe1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x30, 0x03, 0x00, 0x40, 0x85, 0x30, 0x01, 0x00, 0xd0, 0x14, 0x00, 0x40,</div><div class='add'>+	0x45, 0x99, 0x01, 0x00, 0x02, 0x01, 0x00, 0xa6, 0x80, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x04, 0x03, 0x00, 0x40, 0x80, 0x98, 0x01, 0x00, 0x06, 0x05, 0x00, 0xa6,</div><div class='add'>+	0x82, 0xb0, 0x01, 0x00, 0x08, 0x07, 0x00, 0x41, 0x82, 0x98, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0xe0, 0xb1, 0x01, 0x00, 0x08, 0x00, 0x00, 0x40, 0x85, 0x98, 0x01, 0x00,</div><div class='add'>+	0x30, 0x03, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x39, 0x03, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0xd8, 0x14, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00,</div><div class='add'>+	0xff, 0x02, 0xa2, 0xf8, 0x80, 0x6c, 0x00, 0x00, 0x00, 0x03, 0x22, 0xf0,</div><div class='add'>+	0x82, 0x6c, 0x00, 0x00, 0xff, 0x02, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xd0, 0x14, 0x2e, 0x40, 0x49, 0xb1, 0x01, 0x00, 0x05, 0x00, 0x00, 0x40,</div><div class='add'>+	0xa3, 0x9b, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0xc1, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x08, 0x00, 0x00, 0xdd, 0x81, 0xf4, 0x01, 0x00, 0x1e, 0x9a, 0x00, 0x40,</div><div class='add'>+	0x10, 0xc9, 0x00, 0x00, 0x24, 0x9a, 0x00, 0x05, 0x81, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x55, 0x01, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x2c, 0x9a, 0x00, 0x05,</div><div class='add'>+	0x81, 0xb0, 0x00, 0x00, 0x55, 0x01, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x31, 0x9a, 0x00, 0x44, 0xa5, 0xb3, 0x00, 0x00, 0x33, 0x9a, 0x00, 0x44,</div><div class='add'>+	0xa5, 0xb3, 0x00, 0x00, 0x02, 0x00, 0x00, 0x40, 0xa4, 0xe7, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xe0, 0x81, 0xb1, 0x01, 0x00, 0xff, 0xff, 0x00, 0xc1,</div><div class='add'>+	0xf0, 0x89, 0x01, 0x00, 0x29, 0x9a, 0x22, 0x41, 0x81, 0x50, 0x00, 0x00,</div><div class='add'>+	0x25, 0x9a, 0x00, 0x41, 0xc1, 0xc3, 0x00, 0x00, 0xb1, 0x02, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0xc5, 0x02, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x5a, 0x01, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x02, 0x00, 0x00, 0x40,</div><div class='add'>+	0xa4, 0xe7, 0x01, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x91, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xff, 0xff, 0x00, 0xc9, 0xf0, 0x89, 0x01, 0x00, 0x29, 0x9a, 0x22, 0x41,</div><div class='add'>+	0x81, 0x50, 0x00, 0x00, 0x2d, 0x9a, 0x00, 0x41, 0xc1, 0xc3, 0x00, 0x00,</div><div class='add'>+	0xff, 0xff, 0x00, 0xde, 0x85, 0x89, 0x01, 0x00, 0x29, 0x9a, 0x00, 0xc2,</div><div class='add'>+	0xe0, 0xb1, 0x00, 0x00, 0xff, 0xff, 0x00, 0xde, 0x95, 0x89, 0x01, 0x00,</div><div class='add'>+	0x29, 0x9a, 0x00, 0xca, 0xe0, 0xb1, 0x00, 0x00, 0x04, 0x00, 0x00, 0xcb,</div><div class='add'>+	0x81, 0xc8, 0x01, 0x00, 0x6a, 0x84, 0x00, 0x40, 0xf2, 0x93, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xb6, 0x9f, 0x00, 0x88, 0x9a, 0xb0, 0x00, 0x00, 0xb6, 0x9f, 0x00, 0x88,</div><div class='add'>+	0x9a, 0xb0, 0x00, 0x00, 0xb6, 0x9f, 0x00, 0x88, 0x9a, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xb6, 0x9f, 0x00, 0x88, 0x9a, 0xb0, 0x00, 0x00, 0xb6, 0x9f, 0x00, 0x88,</div><div class='add'>+	0x9a, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, 0x9a, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xb6, 0x9f, 0x41, 0x40, 0x81, 0x32, 0x00, 0x00, 0xb9, 0x9f, 0x22, 0x40,</div><div class='add'>+	0x7b, 0x6f, 0x00, 0x00, 0xb6, 0x9f, 0x19, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x19, 0x41, 0x7b, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xa4,</div><div class='add'>+	0xc4, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xa1, 0xc6, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x2f, 0xa2, 0xc8, 0xb3, 0x01, 0x00, 0x08, 0x14, 0x00, 0x40,</div><div class='add'>+	0x49, 0x99, 0x01, 0x00, 0xb0, 0x9f, 0x00, 0x4d, 0x9a, 0xcc, 0x01, 0x00,</div><div class='add'>+	0xc2, 0x9f, 0x26, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4c,</div><div class='add'>+	0x49, 0xc1, 0x01, 0x00, 0xc0, 0x9f, 0xa2, 0x41, 0x9b, 0x50, 0x00, 0x00,</div><div class='add'>+	0xc6, 0x9f, 0x80, 0x80, 0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x52, 0x49,</div><div class='add'>+	0xfd, 0x93, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4a, 0xfd, 0x93, 0x01, 0x00,</div><div class='add'>+	0xc9, 0x9f, 0x00, 0x42, 0xcd, 0x93, 0x00, 0x00, 0x00, 0x00, 0x51, 0x4a,</div><div class='add'>+	0xfd, 0x93, 0x01, 0x00, 0x00, 0x00, 0x00, 0x49, 0xfd, 0x93, 0x01, 0x00,</div><div class='add'>+	0xc9, 0x9f, 0x00, 0x43, 0xcb, 0x93, 0x00, 0x00, 0x00, 0x00, 0x50, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0xd9, 0x9f, 0x00, 0x40, 0x19, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf0, 0x9a, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0x49, 0xd1, 0x01, 0x00, 0x00, 0x00, 0x40, 0xf0, 0x80, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x41, 0x4d, 0x80, 0xb2, 0x01, 0x00, 0xd1, 0x9f, 0x00, 0x40,</div><div class='add'>+	0x19, 0x99, 0x01, 0x00, 0x00, 0x00, 0x4c, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x44, 0x49, 0xd1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0,</div><div class='add'>+	0x9a, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4d, 0x10, 0xb1, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xe2, 0x49, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xe3,</div><div class='add'>+	0x43, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xe4, 0x45, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x7b, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x48, 0x4f,</div><div class='add'>+	0x40, 0xb1, 0x01, 0x00, 0xd9, 0x9f, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x40, 0x81, 0xb0, 0x01, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x6a, 0x84, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x19, 0x9a, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x35, 0x9a, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x00, 0xa8,</div><div class='add'>+	0x10, 0xb1, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='head'>diff --git a/drivers/staging/slicoss/gbrcvucode.h b/drivers/staging/slicoss/gbrcvucode.h<br/>new file mode 100644<br/>index 000000000000..4fa5a4c23e57<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/slicoss/gbrcvucode.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/slicoss/gbrcvucode.h</a></div><div class='hunk'>@@ -0,0 +1,238 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 1997-2002 Alacritech, Inc. All rights reserved</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions</div><div class='add'>+ * are met:</div><div class='add'>+ *</div><div class='add'>+ * 1. Redistributions of source code must retain the above copyright</div><div class='add'>+ *    notice, this list of conditions and the following disclaimer.</div><div class='add'>+ * 2. Redistributions in binary form must reproduce the above</div><div class='add'>+ *    copyright notice, this list of conditions and the following</div><div class='add'>+ *    disclaimer in the documentation and/or other materials provided</div><div class='add'>+ *    with the distribution.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY ALACRITECH, INC. ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE</div><div class='add'>+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR</div><div class='add'>+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL ALACRITECH, INC. OR</div><div class='add'>+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,</div><div class='add'>+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT</div><div class='add'>+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF</div><div class='add'>+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,</div><div class='add'>+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT</div><div class='add'>+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF</div><div class='add'>+ * SUCH DAMAGE.</div><div class='add'>+ *</div><div class='add'>+ * The views and conclusions contained in the software and documentation</div><div class='add'>+ * are those of the authors and should not be interpreted as representing</div><div class='add'>+ * official policies, either expressed or implied, of Alacritech, Inc.</div><div class='add'>+ *</div><div class='add'>+ **************************************************************************/</div><div class='add'>+#define GB_RCVUCODE_VERS_STRING	"1.2"</div><div class='add'>+#define GB_RCVUCODE_VERS_DATE  	"2006/03/27 15:12:15"</div><div class='add'>+</div><div class='add'>+static u32 GBRcvUCodeLen = 512;</div><div class='add'>+</div><div class='add'>+static u8 GBRcvUCode[2560] =</div><div class='add'>+{</div><div class='add'>+0x47, 0x75, 0x01, 0x00, 0x04, 0xa0, 0x13, 0x01, 0x00, 0x1c, 0xb7, 0x5b, 0x09,</div><div class='add'>+0x30, 0x00, 0xb6, 0x5f, 0x01, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x20, 0x18, 0x3b,</div><div class='add'>+0x78, 0x3a, 0x00, 0x1c, 0xa2, 0x77, 0x01, 0x00, 0x1c, 0x07, 0x1d, 0x01, 0x70,</div><div class='add'>+0x18, 0xb3, 0x7b, 0xa9, 0xaa, 0x1e, 0xb4, 0x7b, 0x01, 0x0c, 0x1c, 0xb5, 0x7b,</div><div class='add'>+0x1d, 0x06, 0x1c, 0x00, 0x00, 0x40, 0x64, 0x08, 0x0c, 0x31, 0x56, 0x70, 0x04,</div><div class='add'>+0x0c, 0x31, 0x56, 0x80, 0x04, 0x0c, 0x31, 0x4a, 0x90, 0x04, 0x0c, 0x31, 0x46,</div><div class='add'>+0xa0, 0x00, 0x09, 0x25, 0x51, 0xc0, 0x04, 0x0c, 0x31, 0x4e, 0xb0, 0x00, 0xe9,</div><div class='add'>+0x24, 0x51, 0xc0, 0x04, 0xcc, 0xb3, 0x00, 0x1c, 0x1c, 0xeb, 0x2d, 0x01, 0x00,</div><div class='add'>+0x1c, 0x06, 0x56, 0x42, 0xd4, 0x08, 0x07, 0x9d, 0x00, 0x00, 0x1c, 0x7b, 0xb7,</div><div class='add'>+0x02, 0x00, 0x10, 0xa0, 0x0f, 0x41, 0x54, 0x09, 0x06, 0x56, 0x5a, 0xc0, 0x04,</div><div class='add'>+0xa0, 0x30, 0x6c, 0x03, 0x00, 0xac, 0x30, 0x6d, 0x03, 0x00, 0xcd, 0x03, 0x3a,</div><div class='add'>+0x00, 0x1c, 0x7b, 0xb7, 0x02, 0x00, 0x1c, 0x60, 0x8e, 0x41, 0x54, 0x09, 0x29,</div><div class='add'>+0x25, 0x6d, 0x03, 0x00, 0x80, 0x8e, 0x41, 0x54, 0x09, 0x8c, 0x30, 0x8d, 0x00,</div><div class='add'>+0x04, 0x47, 0x1c, 0x01, 0x00, 0x1c, 0xa0, 0x0f, 0x41, 0x54, 0x09, 0x00, 0x00,</div><div class='add'>+0x60, 0x00, 0x04, 0x47, 0x1c, 0x61, 0xc0, 0x04, 0x47, 0x1c, 0x6d, 0x03, 0x00,</div><div class='add'>+0x6c, 0x30, 0x01, 0x00, 0x1c, 0x4d, 0x34, 0x02, 0x00, 0x1c, 0x7b, 0xb7, 0x02,</div><div class='add'>+0x00, 0x1c, 0xa0, 0x0f, 0x41, 0x54, 0x09, 0xc8, 0x83, 0x37, 0x00, 0x1c, 0x80,</div><div class='add'>+0x01, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x60, 0x00, 0x04, 0xa0, 0x0f, 0x40, 0x54,</div><div class='add'>+0x09, 0x00, 0x00, 0x6c, 0xc3, 0x04, 0x7b, 0xfb, 0xf2, 0x00, 0x1c, 0xcc, 0x33,</div><div class='add'>+0x0d, 0x00, 0x1c, 0xb4, 0x7b, 0xfd, 0x03, 0x1c, 0x80, 0x0e, 0x40, 0x54, 0x09,</div><div class='add'>+0xe0, 0xfb, 0x05, 0x00, 0x1c, 0x00, 0x00, 0xa0, 0x03, 0x00, 0xb3, 0x0f, 0x41,</div><div class='add'>+0x54, 0x09, 0x00, 0x00, 0xe8, 0x70, 0x04, 0x00, 0x00, 0xe8, 0x80, 0x04, 0x00,</div><div class='add'>+0x00, 0xa0, 0x93, 0x00, 0x61, 0x76, 0xa1, 0xc3, 0x04, 0xc0, 0x8d, 0x41, 0x54,</div><div class='add'>+0x09, 0xe0, 0x7b, 0x00, 0xc0, 0x1f, 0xa0, 0xfd, 0xc1, 0x01, 0x00, 0xcc, 0x33,</div><div class='add'>+0x05, 0x00, 0x1c, 0xd4, 0x03, 0x00, 0x3c, 0x1c, 0xd4, 0xd3, 0x1b, 0x00, 0x1c,</div><div class='add'>+0xc0, 0xd3, 0x52, 0x00, 0x1c, 0x00, 0x00, 0x74, 0x13, 0x04, 0x8e, 0x8e, 0x42,</div><div class='add'>+0x54, 0x09, 0x5b, 0x80, 0x76, 0x13, 0x04, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x00,</div><div class='add'>+0x00, 0x90, 0x01, 0x00, 0xa0, 0x0f, 0x41, 0x54, 0x09, 0xa0, 0x0f, 0x41, 0x54,</div><div class='add'>+0x09, 0xc0, 0x03, 0xfc, 0x7f, 0x1c, 0xa0, 0x01, 0x9c, 0x01, 0x00, 0x00, 0x00,</div><div class='add'>+0xa0, 0x01, 0x00, 0xa0, 0x0f, 0x41, 0x54, 0x09, 0xc0, 0x03, 0xfc, 0x03, 0x1c,</div><div class='add'>+0xf5, 0x77, 0x01, 0x00, 0x1c, 0x26, 0x7a, 0xf6, 0x05, 0x1c, 0xa0, 0x0f, 0x41,</div><div class='add'>+0x54, 0x09, 0xb3, 0x0f, 0x41, 0x54, 0x09, 0xb5, 0x02, 0x02, 0x00, 0x1c, 0xa0,</div><div class='add'>+0x0f, 0x41, 0x54, 0x09, 0x7a, 0x06, 0x02, 0x00, 0x1c, 0xb5, 0x02, 0x02, 0x00,</div><div class='add'>+0x1c, 0x53, 0x0f, 0x42, 0x54, 0x09, 0xaf, 0x03, 0x01, 0x00, 0x1c, 0x7a, 0x0e,</div><div class='add'>+0x42, 0x54, 0x09, 0xb5, 0x02, 0x02, 0x00, 0x1c, 0x00, 0x00, 0x02, 0x00, 0x1c,</div><div class='add'>+0xa0, 0x3d, 0xa6, 0x11, 0x04, 0x00, 0x00, 0xa8, 0x11, 0x04, 0xd4, 0xd3, 0x52,</div><div class='add'>+0x00, 0x1c, 0xb5, 0x3e, 0xae, 0x01, 0x00, 0x20, 0xfb, 0xfd, 0xff, 0x1f, 0x80,</div><div class='add'>+0x2c, 0x84, 0x03, 0x00, 0xb9, 0x3a, 0x9a, 0x01, 0x00, 0x75, 0x3b, 0x02, 0x00,</div><div class='add'>+0x1c, 0xa7, 0x1c, 0x01, 0x00, 0x10, 0xdb, 0x83, 0x16, 0x00, 0x1c, 0xc7, 0x1d,</div><div class='add'>+0x1d, 0xc1, 0x04, 0xb9, 0x3b, 0x89, 0xc1, 0x04, 0x8b, 0x2c, 0x01, 0x00, 0x1c,</div><div class='add'>+0x6b, 0x2c, 0x31, 0xc1, 0x04, 0x00, 0x00, 0x74, 0x11, 0x00, 0xcb, 0x2c, 0x75,</div><div class='add'>+0xc1, 0x04, 0xa0, 0x0f, 0x41, 0x54, 0x09, 0xa0, 0x0f, 0x41, 0x54, 0x09, 0x54,</div><div class='add'>+0xd0, 0x02, 0x00, 0x1c, 0x49, 0x25, 0xad, 0x01, 0x00, 0xab, 0x2c, 0x7d, 0xc1,</div><div class='add'>+0x04, 0xa7, 0x1d, 0x6d, 0x03, 0x00, 0xcc, 0x33, 0x09, 0x00, 0x1c, 0xeb, 0x2d,</div><div class='add'>+0x01, 0x00, 0x1c, 0xea, 0x29, 0x01, 0x00, 0x1c, 0xa0, 0x0f, 0x41, 0x54, 0x09,</div><div class='add'>+0xae, 0x0f, 0x41, 0x54, 0x09, 0xa0, 0x0f, 0x41, 0x54, 0x09, 0xd4, 0x07, 0xfc,</div><div class='add'>+0x03, 0x1c, 0x99, 0x3a, 0x02, 0x00, 0x1c, 0xbb, 0x38, 0x02, 0x00, 0x1c, 0x00,</div><div class='add'>+0x38, 0x00, 0x00, 0x1c, 0x00, 0x00, 0xf8, 0x01, 0x04, 0xdb, 0x3b, 0x7e, 0x00,</div><div class='add'>+0x1c, 0xc7, 0x1d, 0x01, 0x00, 0x1c, 0x26, 0x7a, 0x0a, 0x06, 0x1c, 0x27, 0x1d,</div><div class='add'>+0x01, 0x00, 0x1c, 0xb3, 0x0f, 0x41, 0x54, 0x09, 0x7a, 0x0e, 0x42, 0x54, 0x09,</div><div class='add'>+0x53, 0x0f, 0x42, 0x54, 0x09, 0x7a, 0x0e, 0x42, 0x54, 0x09, 0x53, 0x0f, 0x42,</div><div class='add'>+0x54, 0x09, 0x7a, 0x0e, 0x42, 0x54, 0x09, 0x53, 0x0f, 0x42, 0x54, 0x09, 0xa0,</div><div class='add'>+0x0f, 0x41, 0x54, 0x09, 0x7a, 0x06, 0x02, 0x00, 0x1c, 0x53, 0x0f, 0x42, 0x54,</div><div class='add'>+0x09, 0xaf, 0x03, 0x01, 0x00, 0x1c, 0x7a, 0x0e, 0x42, 0x54, 0x09, 0x53, 0x0f,</div><div class='add'>+0x42, 0x54, 0x09, 0x7a, 0x0e, 0x42, 0x54, 0x09, 0x53, 0x0f, 0x42, 0x54, 0x09,</div><div class='add'>+0x7a, 0x0e, 0x42, 0x54, 0x09, 0x53, 0x0f, 0x42, 0x54, 0x09, 0x7a, 0x0e, 0x42,</div><div class='add'>+0x54, 0x09, 0x00, 0x3d, 0x02, 0x00, 0x1c, 0x00, 0x00, 0x54, 0x12, 0x00, 0xcb,</div><div class='add'>+0x2c, 0x01, 0x00, 0x1c, 0x75, 0x3b, 0x02, 0x00, 0x1c, 0xa7, 0x1c, 0x01, 0x00,</div><div class='add'>+0x10, 0xa6, 0x7b, 0xf1, 0x05, 0x1c, 0x00, 0x00, 0x88, 0xc2, 0x04, 0xa6, 0x7b,</div><div class='add'>+0xf1, 0x05, 0x1c, 0x00, 0x00, 0xa0, 0xc2, 0x04, 0xcb, 0x2f, 0x05, 0x00, 0x1c,</div><div class='add'>+0x60, 0x2c, 0x00, 0x00, 0x1c, 0xc7, 0x1c, 0xe1, 0x02, 0x00, 0x53, 0x0f, 0x42,</div><div class='add'>+0x54, 0x09, 0xc0, 0x83, 0xf1, 0x32, 0x1c, 0x00, 0x00, 0x5c, 0x02, 0x04, 0x46,</div><div class='add'>+0x7a, 0xda, 0x05, 0x1c, 0x7a, 0x0e, 0x42, 0x54, 0x09, 0xc0, 0x83, 0xf1, 0x32,</div><div class='add'>+0x1c, 0x00, 0x00, 0x64, 0x02, 0x04, 0x40, 0xfa, 0x15, 0x00, 0x1c, 0x00, 0x00,</div><div class='add'>+0xa0, 0x02, 0x04, 0x46, 0x7a, 0xda, 0x05, 0x1c, 0xa0, 0x0f, 0x41, 0x54, 0x09,</div><div class='add'>+0xa0, 0x0f, 0x41, 0x54, 0x09, 0xa0, 0x0f, 0x41, 0x54, 0x09, 0xa0, 0x0f, 0x41,</div><div class='add'>+0x54, 0x09, 0xb3, 0x7b, 0x01, 0xc0, 0x1f, 0x74, 0x0e, 0x40, 0x54, 0x09, 0xc0,</div><div class='add'>+0x03, 0x9c, 0x00, 0x1c, 0x80, 0x00, 0xf0, 0x02, 0x00, 0x00, 0x00, 0xf0, 0x02,</div><div class='add'>+0x04, 0x00, 0x00, 0xc4, 0x12, 0x05, 0x07, 0x1d, 0x01, 0x00, 0x1c, 0xd4, 0xd3,</div><div class='add'>+0x2b, 0x00, 0x1c, 0xd4, 0xd3, 0x52, 0x00, 0x1c, 0x80, 0x76, 0x95, 0x13, 0x04,</div><div class='add'>+0x00, 0x00, 0xf8, 0x02, 0x00, 0xa6, 0x7b, 0xa9, 0x03, 0x10, 0xc7, 0x9c, 0x00,</div><div class='add'>+0x00, 0x1c, 0x80, 0x2c, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x78, 0x02, 0x04, 0x00,</div><div class='add'>+0x00, 0x6c, 0xc3, 0x04, 0xab, 0x2d, 0xf1, 0x12, 0x05, 0x07, 0x1d, 0xcd, 0xc2,</div><div class='add'>+0x04, 0x8b, 0x2d, 0x01, 0x00, 0x1c, 0x69, 0x25, 0x01, 0x00, 0x1c, 0xa6, 0x7b,</div><div class='add'>+0xa9, 0x03, 0x10, 0xcb, 0x2f, 0x09, 0x00, 0x1c, 0x60, 0x2c, 0x00, 0x00, 0x1c,</div><div class='add'>+0x00, 0x00, 0x60, 0x03, 0x00, 0x53, 0x0f, 0x42, 0x54, 0x09, 0x46, 0x7a, 0xda,</div><div class='add'>+0x05, 0x1c, 0x7a, 0x0e, 0x42, 0x54, 0x09, 0x40, 0xfa, 0x15, 0x00, 0x1c, 0x00,</div><div class='add'>+0x00, 0x28, 0x03, 0x04, 0x46, 0x7a, 0xda, 0x05, 0x1c, 0xb5, 0x0f, 0x41, 0x54,</div><div class='add'>+0x09, 0xa0, 0x0f, 0x41, 0x54, 0x09, 0x73, 0xec, 0x42, 0x03, 0x04, 0x60, 0x2c,</div><div class='add'>+0x00, 0x00, 0x1c, 0x00, 0x00, 0x40, 0x03, 0x00, 0xc7, 0x1c, 0x01, 0x00, 0x1c,</div><div class='add'>+0x00, 0x00, 0x40, 0x13, 0x05, 0x07, 0x1d, 0x01, 0x00, 0x1c, 0xc0, 0xd7, 0x22,</div><div class='add'>+0x00, 0x1c, 0x75, 0x56, 0x96, 0x13, 0x04, 0x60, 0x2c, 0x00, 0x00, 0x1c, 0xe7,</div><div class='add'>+0x1c, 0x5d, 0x03, 0x04, 0xe7, 0x9c, 0x00, 0x00, 0x1c, 0xa6, 0x7b, 0xa9, 0x03,</div><div class='add'>+0x10, 0x80, 0x2c, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x10, 0x03, 0x04, 0x00, 0x00,</div><div class='add'>+0x6c, 0xc3, 0x04, 0xb9, 0x7b, 0x01, 0x00, 0x1c, 0x00, 0x00, 0xa0, 0xc3, 0x04,</div><div class='add'>+0xcb, 0xaf, 0xfc, 0x07, 0x1c, 0xcb, 0x2f, 0x01, 0x04, 0x1c, 0xc7, 0x9f, 0x80,</div><div class='add'>+0x03, 0x1c, 0x00, 0x00, 0xa0, 0xc3, 0x04, 0xcb, 0xaf, 0xfc, 0x07, 0x1c, 0xcb,</div><div class='add'>+0x2f, 0x0d, 0x04, 0x1c, 0xc7, 0x9f, 0x80, 0x03, 0x1c, 0x00, 0x00, 0xa0, 0xc3,</div><div class='add'>+0x04, 0xcb, 0xaf, 0x00, 0xf8, 0x1d, 0xcb, 0x2f, 0x01, 0x00, 0x1d, 0x00, 0x00,</div><div class='add'>+0xa0, 0xc3, 0x04, 0x00, 0x00, 0xa0, 0x13, 0x05, 0x07, 0x1d, 0x01, 0x00, 0x1c,</div><div class='add'>+0xc0, 0x1d, 0xf0, 0xd3, 0x08, 0x27, 0x9d, 0xf8, 0x03, 0x00, 0xa0, 0xee, 0x56,</div><div class='add'>+0xd4, 0x00, 0xfb, 0x75, 0x19, 0x14, 0x04, 0x20, 0x7b, 0x06, 0x00, 0x1c, 0xc0,</div><div class='add'>+0x1c, 0x2c, 0x04, 0x00, 0x00, 0x00, 0xc4, 0xd3, 0x08, 0x00, 0x00, 0x10, 0xf4,</div><div class='add'>+0x00, 0xc0, 0xef, 0xf2, 0x00, 0x1c, 0x20, 0x25, 0x6c, 0x14, 0x04, 0x60, 0xb7,</div><div class='add'>+0xe6, 0x03, 0x00, 0x00, 0x00, 0x1c, 0x15, 0x00, 0xcc, 0xb3, 0xfc, 0x03, 0x1c,</div><div class='add'>+0xcc, 0x33, 0x05, 0x02, 0x1c, 0x00, 0x00, 0x1c, 0xc5, 0x04, 0x60, 0xb7, 0x1e,</div><div class='add'>+0x05, 0x04, 0x00, 0x00, 0x1c, 0x15, 0x04, 0x00, 0x00, 0x6c, 0xc4, 0x04, 0xc0,</div><div class='add'>+0x1d, 0xac, 0xf3, 0x04, 0x00, 0x00, 0x78, 0xc4, 0x04, 0x07, 0x9d, 0x00, 0x00,</div><div class='add'>+0x1c, 0x1b, 0x74, 0x0d, 0xf4, 0x04, 0xa0, 0x0f, 0x41, 0x54, 0x09, 0xe0, 0x7b,</div><div class='add'>+0x00, 0xfc, 0x1f, 0x39, 0x7f, 0x02, 0x00, 0x1c, 0x07, 0x1d, 0xb1, 0xc3, 0x04,</div><div class='add'>+0xa6, 0x7b, 0xc1, 0x03, 0x1c, 0x00, 0x00, 0x78, 0xc4, 0x04, 0xe0, 0x1c, 0x00,</div><div class='add'>+0x00, 0x1c, 0x00, 0x00, 0xb8, 0x03, 0x04, 0xcb, 0xaf, 0x00, 0xf8, 0x1d, 0xcb,</div><div class='add'>+0x2f, 0x01, 0x10, 0x1d, 0x00, 0x00, 0xc0, 0xc3, 0x04, 0x00, 0x00, 0xc0, 0x03,</div><div class='add'>+0x04, 0xcb, 0xaf, 0x00, 0xf8, 0x1d, 0xcb, 0x2f, 0x01, 0x18, 0x1d, 0xc7, 0x9f,</div><div class='add'>+0x00, 0x0b, 0x1c, 0x00, 0x00, 0xc0, 0xc3, 0x04, 0xfb, 0x75, 0x01, 0x00, 0x1c,</div><div class='add'>+0x07, 0x1d, 0x01, 0x00, 0x1c, 0xcc, 0xb3, 0xfc, 0x03, 0x1c, 0xcc, 0x33, 0x01,</div><div class='add'>+0x02, 0x1c, 0x00, 0x00, 0xc0, 0xc3, 0x04, 0xa0, 0x1c, 0x00, 0x00, 0x1c, 0xa0,</div><div class='add'>+0xee, 0xb6, 0x03, 0x04, 0xcb, 0xaf, 0xfc, 0x07, 0x1c, 0xcb, 0x2f, 0x09, 0x04,</div><div class='add'>+0x1c, 0xfb, 0x75, 0x01, 0x00, 0x1c, 0x00, 0x00, 0xc0, 0xc3, 0x04, 0xcc, 0xb3,</div><div class='add'>+0xfc, 0x03, 0x1c, 0xcc, 0x33, 0x01, 0x02, 0x1c, 0x00, 0x00, 0x1c, 0xc5, 0x04,</div><div class='add'>+0x00, 0x00, 0x88, 0x34, 0x05, 0xcc, 0xb3, 0xfc, 0x03, 0x1c, 0xcc, 0x33, 0x15,</div><div class='add'>+0x02, 0x1c, 0x47, 0x9d, 0x64, 0xc4, 0x04, 0x00, 0x00, 0x88, 0x44, 0x00, 0x80,</div><div class='add'>+0x1d, 0x8c, 0x54, 0x04, 0x87, 0x1d, 0x9d, 0x04, 0x00, 0xce, 0x76, 0x01, 0x00,</div><div class='add'>+0x1c, 0xef, 0x76, 0xad, 0xc4, 0x04, 0xa4, 0x77, 0x9d, 0x24, 0x09, 0xe4, 0x76,</div><div class='add'>+0x01, 0x00, 0x1c, 0xc4, 0x76, 0x01, 0x00, 0x1c, 0x00, 0x00, 0xa8, 0x54, 0x04,</div><div class='add'>+0xd7, 0x76, 0x01, 0x50, 0x18, 0xf6, 0x76, 0x01, 0x00, 0x1c, 0x00, 0x00, 0x00,</div><div class='add'>+0x30, 0x18, 0x00, 0x00, 0x00, 0x00, 0x10, 0xcc, 0x30, 0x51, 0xc5, 0x04, 0xeb,</div><div class='add'>+0x2d, 0x01, 0x00, 0x1c, 0xea, 0x29, 0x01, 0x00, 0x1c, 0xc0, 0x59, 0x01, 0x00,</div><div class='add'>+0x1c, 0xf5, 0x77, 0x39, 0xc5, 0x04, 0xe0, 0x30, 0xec, 0x04, 0x00, 0x00, 0x4c,</div><div class='add'>+0xc0, 0x04, 0x00, 0x20, 0x4c, 0x04, 0x05, 0x00, 0x00, 0x00, 0xf8, 0x04, 0x00,</div><div class='add'>+0xcc, 0xb3, 0xfc, 0x03, 0x1c, 0xcc, 0x33, 0x09, 0x02, 0x1c, 0xeb, 0x2d, 0xc5,</div><div class='add'>+0xc4, 0x04, 0xcc, 0xb3, 0xfc, 0x03, 0x1c, 0xcc, 0x33, 0x19, 0x02, 0x1c, 0xeb,</div><div class='add'>+0x2d, 0xc5, 0xc4, 0x04, 0xcc, 0xb3, 0xfc, 0x03, 0x1c, 0xcc, 0x33, 0x0d, 0x02,</div><div class='add'>+0x1c, 0xeb, 0x2d, 0xc5, 0xc4, 0x04, 0xcc, 0xb3, 0xfc, 0x03, 0x1c, 0xcc, 0x33,</div><div class='add'>+0x11, 0x02, 0x1c, 0xeb, 0x2d, 0xc5, 0xc4, 0x04, 0x00, 0x7b, 0x00, 0x80, 0x1c,</div><div class='add'>+0xae, 0x77, 0x51, 0x05, 0x00, 0x00, 0x00, 0x04, 0xc0, 0x04, 0xd3, 0x8b, 0x00,</div><div class='add'>+0xfc, 0x1f, 0x60, 0x7a, 0x3c, 0x00, 0x1c, 0x60, 0x4c, 0xd0, 0x04, 0x00, 0xc0,</div><div class='add'>+0x2f, 0x20, 0x05, 0x1f, 0xe0, 0x30, 0xc0, 0x04, 0x00, 0x80, 0x25, 0xc0, 0x04,</div><div class='add'>+0x00, 0xb5, 0x5b, 0xc1, 0x04, 0x04, 0x69, 0x26, 0x01, 0x00, 0x1c, 0x6a, 0x2b,</div><div class='add'>+0x01, 0x00, 0x1c, 0x80, 0x1d, 0x00, 0x00, 0x1c, 0xa9, 0x25, 0x51, 0x05, 0x00,</div><div class='add'>+0xee, 0x30, 0x00, 0x00, 0x1c, 0xaf, 0x77, 0x11, 0x05, 0x00, 0xb4, 0x5f, 0x01,</div><div class='add'>+0x40, 0x18, 0x07, 0x9d, 0x54, 0x55, 0x04, 0xb7, 0x76, 0x01, 0x00, 0x1c, 0x96,</div><div class='add'>+0x76, 0x01, 0x00, 0x1c, 0x47, 0x1d, 0x01, 0x00, 0x1c, 0xa4, 0x33, 0x01, 0x60,</div><div class='add'>+0x18, 0xa4, 0x2f, 0x01, 0x60, 0x18, 0x64, 0x77, 0x01, 0x60, 0x18, 0x24, 0x77,</div><div class='add'>+0x01, 0x60, 0x18, 0x44, 0x77, 0x01, 0x00, 0x1c, 0x64, 0x88, 0x03, 0x00, 0x1c,</div><div class='add'>+0xa4, 0x3f, 0x01, 0x00, 0x1c, 0xa4, 0x3b, 0x01, 0x00, 0x1c, 0x53, 0x77, 0x01,</div><div class='add'>+0x00, 0x1c, 0xd3, 0xcf, 0x3b, 0x00, 0x1c, 0x53, 0x4f, 0x02, 0x00, 0x1c, 0xd3,</div><div class='add'>+0xcf, 0x00, 0x00, 0x1f, 0xda, 0xcf, 0x0b, 0x00, 0x1c, 0xd5, 0x57, 0x0f, 0x00,</div><div class='add'>+0x1c, 0xd3, 0xd3, 0x37, 0x00, 0x1c, 0xd4, 0x53, 0x0f, 0x00, 0x1c, 0xe0, 0x29,</div><div class='add'>+0x00, 0x00, 0x1c, 0xf5, 0xd5, 0xc0, 0x05, 0x00, 0x00, 0x00, 0xac, 0x55, 0x04,</div><div class='add'>+0x77, 0x56, 0x01, 0x00, 0x1c, 0x56, 0x53, 0x01, 0x00, 0x1c, 0x00, 0x00, 0x00,</div><div class='add'>+0x10, 0x18, 0x00, 0x00, 0x04, 0xc0, 0x04, 0xf5, 0x55, 0x01, 0x00, 0x1c, 0x00,</div><div class='add'>+0x00, 0xc4, 0x55, 0x04, 0x77, 0x56, 0x01, 0x00, 0x1c, 0x56, 0x53, 0x01, 0x00,</div><div class='add'>+0x1c, 0x00, 0x00, 0x00, 0x10, 0x18, 0x00, 0x00, 0x04, 0xc0, 0x04, 0xcb, 0x2f,</div><div class='add'>+0x01, 0x18, 0x10, 0xcb, 0x2f, 0x01, 0x10, 0x10, 0xcb, 0x2f, 0x01, 0x08, 0x10,</div><div class='add'>+0xcb, 0x2f, 0x01, 0x08, 0x10, 0xcb, 0x2f, 0x01, 0x20, 0x10, 0xcb, 0x2f, 0x01,</div><div class='add'>+0x00, 0x10, 0xcb, 0x2f, 0x01, 0x28, 0x10, 0x89, 0x25, 0x6d, 0xc2, 0x04, 0x00,</div><div class='add'>+0x00, 0x04, 0xc3, 0x04, 0x00, 0x00, 0x6c, 0xc3, 0x04, 0x00, 0x00, 0x6c, 0xc3,</div><div class='add'>+0x04, 0x00, 0x00, 0x6c, 0xc3, 0x04, 0x00, 0x00, 0x6c, 0xc2, 0x04, 0x00, 0x00,</div><div class='add'>+0x04, 0xc3, 0x04, 0x00, 0x00, 0x6c, 0xc3, 0x04, 0x00, 0x00, 0x6c, 0xc3, 0x04,</div><div class='add'>+0x00, 0x00, 0x6c, 0xc3, 0x04, 0x40, 0x1c, 0x68, 0xc0, 0x04, 0x40, 0x1c, 0x98,</div><div class='add'>+0xc0, 0x04, 0xa7, 0x77, 0x6d, 0xc3, 0x04, 0x00, 0x00, 0xc0, 0xc0, 0x04, 0x27,</div><div class='add'>+0x1d, 0xed, 0xc0, 0x04, 0x00, 0x00, 0x6c, 0xc3, 0x04, 0x00, 0x00, 0x6c, 0xc3,</div><div class='add'>+0x04, 0x00, 0x00, 0x6c, 0xc3, 0x04, 0x00, 0x00, 0x3c, 0xc6, 0x04, 0x00, 0x00,</div><div class='add'>+0x3c, 0xc6, 0x04, 0x00, 0x00, 0x3c, 0xc6, 0x04, 0x00, 0x00, 0x3c, 0xc6, 0x04,</div><div class='add'>+0x00, 0x00, 0x3c, 0xc6, 0x04, 0x00, 0x00, 0x3c, 0xc6, 0x04, 0x00, 0x00, 0x3c,</div><div class='add'>+0xc6, 0x04, 0x00, 0x00, 0x3c, 0xc6, 0x04, 0x00, 0x00, 0x3c, 0xc6, 0x04, 0x00,</div><div class='add'>+0x00, 0x3c, 0xc6, 0x04, 0x00, 0x00, 0x3c, 0xc6, 0x04, 0x00, 0x00, 0x3c, 0xc6,</div><div class='add'>+0x04, 0x00, 0x00, 0x3c, 0xc6, 0x04, 0x00, 0x00, 0x3c, 0xc6, 0x04, 0x00, 0x00,</div><div class='add'>+0x3c, 0xc6, 0x04, 0x00, 0x00, 0x3c, 0xc6, 0x04, 0x00, 0x00, 0x3c, 0xc6, 0x04,</div><div class='add'>+0x00, 0x00, 0x3c, 0xc6, 0x04, 0x00, 0x00, 0x3c, 0xc6, 0x04, 0x00, 0x00, 0x3c,</div><div class='add'>+0xc6, 0x04, 0x00, 0x00, 0x3c, 0xc6, 0x04, 0x00, 0x00, 0x3c, 0xc6, 0x04, 0x00,</div><div class='add'>+0x00, 0x3c, 0xc6, 0x04, 0x00, 0x00, 0x3c, 0xc6, 0x04, 0x00, 0x00, 0x3c, 0xc6,</div><div class='add'>+0x04, 0x00, 0x00, 0x3c, 0xc6, 0x04, 0x00, 0x00, 0x3c, 0xc6, 0x04, 0x00, 0x00,</div><div class='add'>+0x3c, 0xc6, 0x04, 0x00, 0x00, 0x3c, 0xc6, 0x04, 0x00, 0x00, 0x3c, 0xc6, 0x04,</div><div class='add'>+0x00, 0x00, 0x3c, 0xc6, 0x04, 0x00, 0x00, 0x3c, 0xc6, 0x04, 0x00, 0x00, 0x3c,</div><div class='add'>+0xc6, 0x04, 0x00, 0x00, 0x3c, 0xc6, 0x04, 0x00, 0x00, 0x3c, 0xc6, 0x04, 0x00,</div><div class='add'>+0x00, 0x3c, 0xc6, 0x04, 0x00, 0x00, 0x3c, 0xc6, 0x04, 0x00, 0x00, 0x3c, 0xc6,</div><div class='add'>+0x04, 0x00, 0x00, 0x3c, 0xc6, 0x04, 0x00, 0x00, 0x3c, 0xc6, 0x04, 0x00, 0x00,</div><div class='add'>+0x3c, 0xc6, 0x04, 0x00, 0x00, 0x3c, 0xc6, 0x04, 0x00, 0x00, 0x3c, 0xc6, 0x04,</div><div class='add'>+0x00, 0x00, 0x3c, 0xc6, 0x04, 0x00, 0x00, 0x3c, 0xc6, 0x04, 0x00, 0x00, 0x3c,</div><div class='add'>+0xc6, 0x04, 0x00, 0x00, 0x3c, 0xc6, 0x04, 0x00, 0x00, 0x3c, 0xc6, 0x04, 0x00,</div><div class='add'>+0x00, 0x3c, 0xc6, 0x04, 0x00, 0x00, 0x3c, 0xc6, 0x04, 0x00, 0x00, 0x3c, 0xc6,</div><div class='add'>+0x04, 0x00, 0x00, 0x3c, 0xc6, 0x04, 0x00, 0x00, 0x3c, 0xc6, 0x04, 0x00, 0x00,</div><div class='add'>+0x3c, 0xc6, 0x04, 0x00, 0x00, 0x3c, 0xc6, 0x04, 0x00, 0x00, 0x3c, 0xc6, 0x04,</div><div class='add'>+0x00, 0x00, 0x3c, 0xc6, 0x04, 0x00, 0x00, 0x3c, 0xc6, 0x04, 0x00, 0x00, 0x3c,</div><div class='add'>+0xc6, 0x04, 0x00, 0x00, 0x3c, 0xc6, 0x04, 0x00, 0x00, 0x3c, 0xc6, 0x04, 0x00,</div><div class='add'>+0x00, 0x3c, 0xc6, 0x04, 0x00, 0x00, 0x3c, 0xc6, 0x04, 0x00, 0x00, 0x3c, 0xc6,</div><div class='add'>+0x04, 0x00, 0x00, 0x3c, 0xc6, 0x04, 0x00, 0x00, 0x3c, 0xc6, 0x04, 0x00, 0x00,</div><div class='add'>+0x3c, 0xc6, 0x04, 0x00, 0x00, 0x3c, 0xc6, 0x04, 0x00, 0x00, 0x3c, 0xc6, 0x04,</div><div class='add'>+0x00, 0x00, 0x3c, 0xc6, 0x04, 0x00, 0x00, 0x3c, 0xc6, 0x04, 0x00, 0x00, 0x3c,</div><div class='add'>+0xc6, 0x04, 0x00, 0x00, 0x3c, 0xc6, 0x04, 0x00, 0x00, 0x3c, 0xc6, 0x04, 0x00,</div><div class='add'>+0x00, 0x3c, 0xc6, 0x04, 0x00, 0x00, 0x3c, 0xc6, 0x04, 0x00, 0x00, 0x3c, 0xc6,</div><div class='add'>+0x04, 0x00, 0x00, 0x3c, 0xc6, 0x04, 0x00, 0x00, 0x3c, 0xc6, 0x04, 0x00, 0x00,</div><div class='add'>+0x3c, 0xc6, 0x04, 0x00, 0x00, 0x3c, 0xc6, 0x04, 0x00, 0x00, 0x3c, 0xc6, 0x04,</div><div class='add'>+0x00, 0x00, 0x3c, 0xc6, 0x04, 0x00, 0x00, 0x3c, 0xc6, 0x04, 0x00, 0x00, 0x3c,</div><div class='add'>+0xc6, 0x04, 0x00, 0x00, 0x3c, 0xc6, 0x04, 0x00, 0x00, 0x3c, 0xc6, 0x04, 0x00,</div><div class='add'>+0x00, 0x3c, 0xc6, 0x04, 0x00, 0x00, 0x3c, 0xc6, 0x04, 0x00, 0x00, 0x3c, 0xc6,</div><div class='add'>+0x04, 0x00, 0x00, 0x3c, 0xc6, 0x04, 0x00, 0x00, 0x3c, 0xc6, 0x04, 0x00, 0x00,</div><div class='add'>+0x3c, 0xc6, 0x04, 0x00, 0x00, 0x3c, 0xc6, 0x04, 0x00, 0x00, 0x3c, 0xc6, 0x04,</div><div class='add'>+0x00, 0x00, 0x3c, 0xc6, 0x04, 0x00, 0x00, 0x3c, 0xc6, 0x04, 0x00, 0x00, 0x3c,</div><div class='add'>+0xc6, 0x04, 0x00, 0x00, 0x3c, 0xc6, 0x04, 0x00, 0x00, 0x3c, 0xc6, 0x04, 0x00,</div><div class='add'>+0x00, 0x3c, 0xc6, 0x04, 0x00, 0x00, 0x3c, 0xc6, 0x04, 0x00, 0x00, 0x3c, 0xc6,</div><div class='add'>+0x04, 0x00, 0x00, 0x3c, 0xc6, 0x04, 0x00, 0x00, 0x3c, 0xc6, 0x04, 0x00, 0x00,</div><div class='add'>+0x3c, 0xc6, 0x04, 0x00, 0x00, 0x3c, 0xc6, 0x04, 0x00, 0x00, 0x3c, 0xc6, 0x04,</div><div class='add'>+0x00, 0x00, 0x3c, 0xc6, 0x04, 0x00, 0x00, 0x3c, 0xc6, 0x04, 0x00, 0x00, 0x3c,</div><div class='add'>+0xc6, 0x04, 0x00, 0x00, 0x3c, 0xc6, 0x04, 0x00, 0x00, 0x3c, 0xc6, 0x04,</div><div class='add'>+};</div><div class='head'>diff --git a/drivers/staging/slicoss/oasisdbgdownload.h b/drivers/staging/slicoss/oasisdbgdownload.h<br/>new file mode 100644<br/>index 000000000000..519e00797d44<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/slicoss/oasisdbgdownload.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/slicoss/oasisdbgdownload.h</a></div><div class='hunk'>@@ -0,0 +1,6850 @@</div><div class='add'>+#define OASIS_UCODE_VERS_STRING	"1.2"</div><div class='add'>+#define OASIS_UCODE_VERS_DATE  	"2006/03/27 15:11:22"</div><div class='add'>+#define OASIS_UCODE_HOSTIF_ID  	3</div><div class='add'>+</div><div class='add'>+static s32 ONumSections = 0x2;</div><div class='add'>+static u32 OSectionSize[] =</div><div class='add'>+{</div><div class='add'>+	0x00004000, 0x00010000,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u32 OSectionStart[] =</div><div class='add'>+{</div><div class='add'>+	0x00000000, 0x00008000,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u8 OasisUCode[2][65536] =</div><div class='add'>+{</div><div class='add'>+	{</div><div class='add'>+	0x15, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x1b, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x21, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x03, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa8,</div><div class='add'>+	0x98, 0xb0, 0x01, 0x00, 0x04, 0x80, 0xa2, 0x40, 0xfd, 0x7f, 0x00, 0x00,</div><div class='add'>+	0x09, 0x00, 0xa2, 0x49, 0xdd, 0x7d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4c,</div><div class='add'>+	0x80, 0xb2, 0x01, 0x00, 0x07, 0x00, 0x00, 0x40, 0xd1, 0xb1, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4c, 0x80, 0xb2, 0x01, 0x00, 0x09, 0x00, 0xa2, 0x40,</div><div class='add'>+	0x75, 0x7d, 0x00, 0x00, 0x60, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00,</div><div class='add'>+	0x0b, 0x00, 0xa8, 0xb1, 0x7e, 0x31, 0x00, 0x00, 0x09, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x80, 0x8f, 0x98, 0x18, 0x31, 0x00, 0x00,</div><div class='add'>+	0x10, 0x00, 0x00, 0x98, 0x80, 0xe4, 0x01, 0x00, 0x00, 0x00, 0x41, 0x98,</div><div class='add'>+	0x80, 0x94, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x10, 0x00, 0x00, 0x98, 0x80, 0xe4, 0x01, 0x00, 0x0e, 0x00, 0x40, 0x98,</div><div class='add'>+	0x80, 0x94, 0x00, 0x00, 0x11, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0xa5, 0x99, 0x01, 0x00, 0x19, 0x00, 0x29, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x19, 0x00, 0x14, 0xbc, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x0e, 0x00, 0x93, 0xbc, 0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x50, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x80, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x10, 0x00, 0x00, 0x40, 0xa5, 0x99, 0x01, 0x00, 0x1f, 0x00, 0x29, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x1f, 0x00, 0x14, 0xbc, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x12, 0x00, 0x93, 0xbc, 0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x50, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x01, 0x80, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x20, 0x00, 0x00, 0x40, 0xa5, 0x99, 0x01, 0x00, 0x25, 0x00, 0x29, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x25, 0x00, 0x14, 0xbc, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x14, 0x00, 0x93, 0xbc, 0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x49,</div><div class='add'>+	0xdd, 0x81, 0x01, 0x00, 0x12, 0x01, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x33, 0x01, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x2a, 0x00, 0x14, 0xbc,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0xfe, 0x00, 0x13, 0xbc, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x54, 0x95, 0x00, 0x40, 0x45, 0x99, 0x01, 0x00, 0xff, 0xff, 0x00, 0x40,</div><div class='add'>+	0xe5, 0x99, 0x01, 0x00, 0x00, 0x00, 0x2f, 0x40, 0x49, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0xe1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0xfd, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0xff, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x33, 0x00, 0x18, 0xee, 0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50,</div><div class='add'>+	0x89, 0xb0, 0x01, 0x00, 0x32, 0x00, 0xa2, 0x41, 0x89, 0x50, 0x00, 0x00,</div><div class='add'>+	0x99, 0x00, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x30, 0x94, 0x00, 0x40,</div><div class='add'>+	0x43, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x20, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xfa, 0xe0, 0xb3, 0x01, 0x00, 0x39, 0x00, 0x98, 0xee,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfb, 0x80, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x3b, 0x00, 0x80, 0xf3, 0xde, 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x47,</div><div class='add'>+	0xfd, 0x93, 0x01, 0x00, 0x3e, 0x00, 0x83, 0xf3, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0xf0, 0x00, 0x00, 0xf3, 0x80, 0x88, 0x01, 0x00, 0x01, 0x80, 0x00, 0x40,</div><div class='add'>+	0x2e, 0xdd, 0x01, 0x00, 0x00, 0x94, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x46, 0x43, 0xc1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xfa,</div><div class='add'>+	0x24, 0xb1, 0x01, 0x00, 0x7c, 0x00, 0x18, 0xee, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x45, 0x00, 0x95, 0xe8, 0x80, 0x32, 0x00, 0x00, 0xff, 0xff, 0x00, 0xe8,</div><div class='add'>+	0x80, 0x88, 0x01, 0x00, 0x7c, 0x00, 0x26, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0xd5, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf2,</div><div class='add'>+	0xec, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xd6, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x08, 0x00, 0x00, 0x40, 0xd5, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0,</div><div class='add'>+	0xd6, 0xb1, 0x01, 0x00, 0xff, 0x00, 0x00, 0xf8, 0xee, 0x8b, 0x01, 0x00,</div><div class='add'>+	0x08, 0x01, 0x00, 0x40, 0xd5, 0x99, 0x01, 0x00, 0xff, 0x00, 0x00, 0xf0,</div><div class='add'>+	0x80, 0x8c, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf7, 0x81, 0x94, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0xd6, 0xb1, 0x01, 0x00, 0xff, 0x00, 0x00, 0xf8,</div><div class='add'>+	0x80, 0x88, 0x01, 0x00, 0x3c, 0x00, 0x00, 0x40, 0xd5, 0x99, 0x01, 0x00,</div><div class='add'>+	0xff, 0x00, 0x00, 0xf0, 0xd6, 0x8d, 0x01, 0x00, 0xff, 0xff, 0x00, 0xf0,</div><div class='add'>+	0xf0, 0xdb, 0x01, 0x00, 0x00, 0x00, 0x00, 0x48, 0x81, 0xe0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf8, 0x81, 0x94, 0x01, 0x00, 0x3c, 0x01, 0x00, 0x40,</div><div class='add'>+	0xd5, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0xd6, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xff, 0x00, 0x00, 0xf8, 0x80, 0x88, 0x01, 0x00, 0x00, 0x00, 0x00, 0x48,</div><div class='add'>+	0x81, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x81, 0x94, 0x01, 0x00,</div><div class='add'>+	0x3c, 0x02, 0x00, 0x40, 0xd5, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0xd6, 0xb1, 0x01, 0x00, 0x2c, 0x00, 0x00, 0x40, 0xd5, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf8, 0xd6, 0xb1, 0x01, 0x00, 0x1e, 0x00, 0x00, 0xf0,</div><div class='add'>+	0x82, 0xf4, 0x01, 0x00, 0xff, 0x3f, 0x00, 0xf8, 0x80, 0xd8, 0x01, 0x00,</div><div class='add'>+	0x64, 0x00, 0x26, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x81, 0xd0, 0x01, 0x00, 0xff, 0xff, 0x00, 0x40, 0x80, 0xd8, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x80, 0x94, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0xd8, 0xb1, 0x01, 0x00, 0x68, 0x00, 0x22, 0xfa, 0x80, 0x30, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4c, 0x81, 0xe0, 0x01, 0x00, 0x01, 0x00, 0x00, 0x40,</div><div class='add'>+	0x80, 0xcc, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0xde, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x01, 0x00, 0x40, 0xd5, 0x99, 0x01, 0x00, 0x10, 0x00, 0x00, 0xfa,</div><div class='add'>+	0x80, 0xe4, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf6, 0x81, 0x94, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0xd6, 0xb1, 0x01, 0x00, 0x00, 0x02, 0x00, 0x40,</div><div class='add'>+	0xd5, 0x99, 0x01, 0x00, 0x10, 0x00, 0x00, 0xfa, 0x80, 0xe4, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf6, 0x81, 0x94, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0xd6, 0xb1, 0x01, 0x00, 0x06, 0x00, 0x00, 0x40, 0xd5, 0x99, 0x01, 0x00,</div><div class='add'>+	0x10, 0x00, 0x00, 0xfb, 0xd6, 0xe5, 0x01, 0x00, 0x07, 0x00, 0x00, 0x40,</div><div class='add'>+	0xd5, 0x99, 0x01, 0x00, 0x18, 0x00, 0x00, 0xfb, 0xd6, 0xe5, 0x01, 0x00,</div><div class='add'>+	0x48, 0x00, 0x00, 0x40, 0xd5, 0x99, 0x01, 0x00, 0x10, 0x00, 0x00, 0xfa,</div><div class='add'>+	0xd6, 0xe5, 0x01, 0x00, 0x50, 0x00, 0x00, 0x40, 0xd5, 0x99, 0x01, 0x00,</div><div class='add'>+	0x10, 0x00, 0x00, 0xfb, 0xd6, 0xe5, 0x01, 0x00, 0x03, 0x00, 0x00, 0xfb,</div><div class='add'>+	0x7a, 0x89, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xdc, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x7c, 0x00, 0x00, 0x4c, 0xdd, 0x91, 0x00, 0x00, 0x7c, 0x00, 0x95, 0xe8,</div><div class='add'>+	0x84, 0x30, 0x00, 0x00, 0x00, 0x00, 0x2f, 0xe9, 0xfa, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0xd1, 0xb1, 0x01, 0x00, 0xff, 0x00, 0x00, 0x42,</div><div class='add'>+	0x80, 0x88, 0x01, 0x00, 0x34, 0x00, 0x00, 0x40, 0x80, 0xce, 0x01, 0x00,</div><div class='add'>+	0x7c, 0x00, 0xa6, 0x40, 0x81, 0x32, 0x00, 0x00, 0x85, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x02, 0x80, 0x22, 0x40, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x7c, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4f,</div><div class='add'>+	0x81, 0xb0, 0x01, 0x00, 0x8e, 0x00, 0x09, 0xf9, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x8c, 0x00, 0x08, 0xf9, 0x81, 0x32, 0x00, 0x00, 0x98, 0x00, 0x1f, 0xfd,</div><div class='add'>+	0xf9, 0x33, 0x00, 0x00, 0x8b, 0x00, 0x9e, 0xfd, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4a, 0xf3, 0x93, 0x01, 0x00, 0x00, 0x00, 0x80, 0x48,</div><div class='add'>+	0xf3, 0x93, 0x01, 0x00, 0x00, 0x00, 0x00, 0xfd, 0xf7, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x49, 0xf3, 0x93, 0x01, 0x00, 0x00, 0x00, 0x00, 0xfc,</div><div class='add'>+	0x19, 0xb1, 0x01, 0x00, 0x93, 0x00, 0x0a, 0xf9, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x40, 0xfb, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x41, 0xfd,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x07, 0x80, 0xf9, 0xf3, 0x8f, 0x01, 0x00,</div><div class='add'>+	0x00, 0x07, 0x42, 0xf9, 0xf3, 0x8f, 0x01, 0x00, 0x97, 0x00, 0xa2, 0xff,</div><div class='add'>+	0xf7, 0x6f, 0x00, 0x00, 0x00, 0x00, 0x43, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0xa2, 0xff, 0xfb, 0xef, 0x00, 0x00, 0x00, 0x00, 0x80, 0xfc,</div><div class='add'>+	0xe1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x80, 0x40, 0x81, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x94, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00, 0xbb, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0xa2, 0x46, 0xfd, 0x7f, 0x01, 0x00,</div><div class='add'>+	0x00, 0x94, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00, 0xce, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0xa2, 0x44, 0xfd, 0x7f, 0x01, 0x00,</div><div class='add'>+	0x00, 0x94, 0x00, 0x40, 0x45, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0xff, 0x7f, 0x00, 0x40, 0xf5, 0x99, 0x01, 0x00,</div><div class='add'>+	0xff, 0x7f, 0x00, 0x40, 0xf5, 0x99, 0x01, 0x00, 0x9a, 0x13, 0x00, 0x40,</div><div class='add'>+	0xf5, 0x99, 0x01, 0x00, 0x07, 0x00, 0x00, 0x40, 0xf5, 0x99, 0x01, 0x00,</div><div class='add'>+	0x01, 0x00, 0x00, 0x40, 0xf5, 0x99, 0x01, 0x00, 0x00, 0x02, 0x00, 0x40,</div><div class='add'>+	0xf5, 0x99, 0x01, 0x00, 0x02, 0x00, 0x00, 0x40, 0xf5, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x02, 0x00, 0x40, 0xf5, 0x99, 0x01, 0x00, 0x03, 0x01, 0x00, 0x40,</div><div class='add'>+	0xf5, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0xf5, 0x99, 0x01, 0x00,</div><div class='add'>+	0x9a, 0x13, 0x00, 0x40, 0xf5, 0x99, 0x01, 0x00, 0x0b, 0x00, 0x00, 0x40,</div><div class='add'>+	0xf5, 0x99, 0x01, 0x00, 0x80, 0x00, 0x00, 0x40, 0xf5, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0xf5, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0xf5, 0x99, 0x01, 0x00, 0x07, 0x00, 0x00, 0x40, 0xf5, 0x99, 0x01, 0x00,</div><div class='add'>+	0x08, 0x00, 0x00, 0x40, 0xf5, 0x99, 0x01, 0x00, 0xb0, 0x02, 0x00, 0x40,</div><div class='add'>+	0xf5, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0xf5, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0xf5, 0x99, 0x01, 0x00, 0x02, 0x29, 0x00, 0x40,</div><div class='add'>+	0xf5, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0xf5, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x67, 0x00, 0x40, 0xf5, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0xf5, 0x99, 0x01, 0x00, 0x80, 0x00, 0x00, 0x40, 0xf5, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x40, 0xf5, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x45,</div><div class='add'>+	0xfd, 0x83, 0x01, 0x00, 0x00, 0x00, 0x00, 0x46, 0xfd, 0x83, 0x01, 0x00,</div><div class='add'>+	0xff, 0x7f, 0x00, 0x40, 0x25, 0x99, 0x01, 0x00, 0xc4, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0xa2, 0x44, 0x80, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x45, 0xfd, 0x93, 0x01, 0x00, 0xe2, 0x00, 0x00, 0x40,</div><div class='add'>+	0x83, 0x30, 0x01, 0x00, 0x00, 0x00, 0xa2, 0x45, 0x80, 0x32, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x46, 0xfd, 0x93, 0x01, 0x00, 0x00, 0x10, 0x00, 0x40,</div><div class='add'>+	0x83, 0x98, 0x01, 0x00, 0xdd, 0x00, 0x00, 0x40, 0x2b, 0x31, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0xa2, 0x46, 0x88, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x89, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x94, 0x8c, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xff, 0xff, 0x00, 0x46, 0x80, 0x88, 0x01, 0x00, 0xa5, 0xa5, 0xa2, 0x40,</div><div class='add'>+	0x80, 0xce, 0x00, 0x00, 0x00, 0x00, 0x00, 0x48, 0x8d, 0xf0, 0x01, 0x00,</div><div class='add'>+	0xc9, 0x00, 0x82, 0x41, 0x89, 0x40, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40,</div><div class='add'>+	0x89, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44, 0xfd, 0x83, 0x01, 0x00,</div><div class='add'>+	0xd4, 0x00, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0xa2, 0x44,</div><div class='add'>+	0x80, 0xb2, 0x00, 0x00, 0xe2, 0x00, 0x00, 0x08, 0x83, 0x30, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0xa2, 0x45, 0x80, 0x32, 0x01, 0x00, 0x00, 0x00, 0x80, 0x44,</div><div class='add'>+	0xfd, 0x93, 0x01, 0x00, 0x00, 0x30, 0x00, 0x08, 0x83, 0x98, 0x01, 0x00,</div><div class='add'>+	0x80, 0x00, 0x00, 0x40, 0x2b, 0x99, 0x01, 0x00, 0xdb, 0x00, 0x00, 0x40,</div><div class='add'>+	0x89, 0x30, 0x01, 0x00, 0x00, 0x00, 0xa2, 0x46, 0x80, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xff, 0xff, 0x00, 0x94, 0x80, 0x88, 0x01, 0x00, 0xa5, 0xa5, 0xa2, 0x40,</div><div class='add'>+	0x80, 0x4e, 0x01, 0x00, 0x00, 0x00, 0x80, 0x43, 0x89, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x03, 0x84, 0x00, 0x41, 0x2c, 0x99, 0x01, 0x00, 0xde, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x03, 0x88, 0x00, 0x41, 0x2c, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x20, 0x8d, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x9f, 0x96,</div><div class='add'>+	0x80, 0xb2, 0x00, 0x00, 0xdf, 0x00, 0xa2, 0x41, 0x8d, 0x50, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x40, 0x81, 0xb2, 0x01, 0x00, 0xff, 0x7f, 0x00, 0x40,</div><div class='add'>+	0x25, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4c, 0x89, 0xe0, 0x01, 0x00,</div><div class='add'>+	0xdd, 0x00, 0x00, 0x44, 0x82, 0x14, 0x01, 0x00, 0x00, 0x00, 0x90, 0x94,</div><div class='add'>+	0x8a, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x45, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x10, 0x00, 0x00, 0x45, 0x88, 0xf4, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0x89, 0xd0, 0x01, 0x00, 0xdd, 0x00, 0x00, 0x44, 0x2b, 0x41, 0x01, 0x00,</div><div class='add'>+	0xec, 0x00, 0x08, 0x41, 0x80, 0x32, 0x00, 0x00, 0xed, 0x00, 0x00, 0x94,</div><div class='add'>+	0x24, 0xb1, 0x00, 0x00, 0x10, 0x00, 0x00, 0x94, 0x24, 0xf5, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x94, 0xf0, 0xb1, 0x01, 0x00, 0xf2, 0x00, 0xa0, 0x44,</div><div class='add'>+	0x89, 0x50, 0x00, 0x00, 0xdd, 0x00, 0x00, 0x44, 0x2b, 0x41, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x94, 0xf0, 0xb1, 0x01, 0x00, 0xef, 0x00, 0x20, 0x44,</div><div class='add'>+	0x89, 0x50, 0x00, 0x00, 0x10, 0x00, 0x00, 0x45, 0x88, 0xf4, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xfa, 0x8a, 0xb0, 0x01, 0x00, 0x00, 0x00, 0xa3, 0x42,</div><div class='add'>+	0x89, 0xd0, 0x00, 0x00, 0xf7, 0x00, 0xa0, 0xfa, 0x8a, 0x40, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x8b, 0xc0, 0x01, 0x00, 0xf5, 0x00, 0xa3, 0x42,</div><div class='add'>+	0x89, 0x50, 0x00, 0x00, 0xff, 0xff, 0x00, 0x45, 0x88, 0x88, 0x01, 0x00,</div><div class='add'>+	0x10, 0x00, 0x00, 0x45, 0x8a, 0xf4, 0x01, 0x00, 0xfc, 0x00, 0x90, 0x44,</div><div class='add'>+	0x8a, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x8b, 0xc0, 0x01, 0x00,</div><div class='add'>+	0xff, 0xff, 0x00, 0x45, 0x8a, 0xa8, 0x01, 0x00, 0x00, 0x00, 0x80, 0x50,</div><div class='add'>+	0x8b, 0xe0, 0x01, 0x00, 0xff, 0x7f, 0x00, 0x40, 0x25, 0x99, 0x01, 0x00,</div><div class='add'>+	0x7c, 0x00, 0x00, 0x40, 0x2b, 0x99, 0x01, 0x00, 0x00, 0x30, 0x00, 0x40,</div><div class='add'>+	0x83, 0x98, 0x01, 0x00, 0xdd, 0x00, 0x00, 0x08, 0x83, 0x14, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x94, 0x2a, 0xb1, 0x01, 0x00, 0x00, 0x80, 0x00, 0x40,</div><div class='add'>+	0xf9, 0x9b, 0x01, 0x00, 0xdd, 0x00, 0x00, 0xfc, 0x19, 0x31, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x40, 0x94, 0x80, 0xb2, 0x01, 0x00, 0xdd, 0x00, 0x00, 0x44,</div><div class='add'>+	0x2b, 0x41, 0x01, 0x00, 0x00, 0x00, 0x41, 0x94, 0x80, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0xf9, 0xc3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0x2b, 0xc1, 0x01, 0x00, 0x04, 0x01, 0x9f, 0x94, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x02, 0x80, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x10, 0x01, 0x00, 0x51,</div><div class='add'>+	0x93, 0xb0, 0x00, 0x00, 0x10, 0x01, 0x00, 0x4d, 0x93, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x10, 0x01, 0x00, 0x49, 0x93, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42,</div><div class='add'>+	0x93, 0xb0, 0x01, 0x00, 0x10, 0x01, 0xa2, 0x41, 0x93, 0x50, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x10, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x11, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x12, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x13, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x14, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x15, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x16, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x17, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x18, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x19, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x1a, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x1b, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x1c, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x1d, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x1e, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x1f, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x70, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x71, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x72, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x73, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x74, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x75, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x76, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x77, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x78, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x79, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x7a, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x7b, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x7c, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x7d, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x7e, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x7f, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x04, 0x00, 0x40,</div><div class='add'>+	0xa1, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x50, 0xa1, 0xd1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x1b, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x19, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x17, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x15, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x13, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x11, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x0f, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x0d, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x0b, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x09, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x07, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x05, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x03, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x01, 0xb0, 0x01, 0x00, 0x3b, 0x01, 0x20, 0x48, 0xa1, 0x51, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x47, 0x01, 0x22, 0x4b,</div><div class='add'>+	0x74, 0x7d, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x60, 0x00, 0x00, 0x4b, 0x60, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0xb1,</div><div class='add'>+	0x7e, 0xb1, 0x01, 0x00, 0x48, 0x01, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x45, 0x01, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x05, 0x00, 0x80, 0x40,</div><div class='add'>+	0x97, 0x98, 0x01, 0x00, 0x18, 0x00, 0x00, 0xaa, 0x96, 0x88, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x43, 0x97, 0xf0, 0x01, 0x00, 0x07, 0x00, 0x00, 0xaa,</div><div class='add'>+	0x96, 0x88, 0x01, 0x00, 0x00, 0x00, 0x80, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x58, 0x07, 0x90, 0x01, 0x00, 0xd8, 0x9f, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0xa5, 0xb3, 0x01, 0x00,</div><div class='add'>+	0xd8, 0x02, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0xf8, 0x02, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5c, 0x07, 0x90, 0x01, 0x00,</div><div class='add'>+	0xd8, 0x9f, 0x00, 0x40, 0xbf, 0xb3, 0x00, 0x00, 0x5a, 0x01, 0x22, 0xcc,</div><div class='add'>+	0x85, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x51, 0x07, 0x90, 0x01, 0x00,</div><div class='add'>+	0xd8, 0x9f, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x49, 0xb1, 0x01, 0x00, 0xae, 0x03, 0x00, 0xcb, 0xa3, 0xc9, 0x01, 0x00,</div><div class='add'>+	0xd0, 0x14, 0x00, 0x40, 0xa1, 0x9b, 0x01, 0x00, 0x00, 0x00, 0x00, 0x20,</div><div class='add'>+	0x46, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x48, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xd0, 0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xca,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd5, 0xe1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x07, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00, 0x20, 0x00, 0x00, 0x20,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x63, 0x01, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xcc, 0x85, 0x93, 0x01, 0x00, 0xf8, 0x02, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0xd0, 0x14, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xfa, 0xba, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xfa,</div><div class='add'>+	0xa4, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xbc, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x14, 0x2f, 0x40, 0x81, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xe7,</div><div class='add'>+	0xa7, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd8, 0xa9, 0xb3, 0x01, 0x00,</div><div class='add'>+	0xff, 0x00, 0x00, 0xdd, 0x81, 0x88, 0x01, 0x00, 0x02, 0x00, 0x00, 0x40,</div><div class='add'>+	0x80, 0xf4, 0x01, 0x00, 0x73, 0x01, 0x00, 0x40, 0x80, 0xc8, 0x01, 0x00,</div><div class='add'>+	0x86, 0x01, 0x00, 0xdd, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x10, 0xb1, 0x00, 0x00, 0x87, 0x01, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x88, 0x01, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x89, 0x01, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x8a, 0x01, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x8b, 0x01, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x8d, 0x01, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x8f, 0x01, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x50, 0x01, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xb6, 0x01, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x50, 0x01, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xc4, 0x01, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xc5, 0x01, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x82, 0x02, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x83, 0x02, 0x00, 0x40, 0x81, 0xb2, 0x28, 0x00, 0xb8, 0x02, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x28, 0x00, 0xd4, 0x9f, 0x00, 0x40, 0x81, 0xb2, 0x28, 0x00,</div><div class='add'>+	0xd5, 0x9f, 0x00, 0x40, 0x81, 0xb2, 0x28, 0x00, 0xd6, 0x9f, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x28, 0x00, 0xd7, 0x9f, 0x00, 0x40, 0x81, 0xb2, 0x28, 0x00,</div><div class='add'>+	0x72, 0x01, 0x00, 0x41, 0x81, 0xc0, 0x28, 0x00, 0x55, 0x01, 0x51, 0x49,</div><div class='add'>+	0xfd, 0x93, 0x28, 0x00, 0x55, 0x01, 0x52, 0x4a, 0xfd, 0x93, 0x2a, 0x00,</div><div class='add'>+	0x55, 0x01, 0x55, 0x49, 0xfd, 0x83, 0x2a, 0x00, 0x55, 0x01, 0x56, 0x4a,</div><div class='add'>+	0xfd, 0x83, 0x2a, 0x00, 0x50, 0x01, 0x91, 0x81, 0x80, 0x30, 0x2a, 0x00,</div><div class='add'>+	0x55, 0x01, 0x45, 0x40, 0x81, 0xb2, 0x2a, 0x00, 0x50, 0x01, 0x91, 0x82,</div><div class='add'>+	0x80, 0x30, 0x2a, 0x00, 0x55, 0x01, 0x46, 0x40, 0x81, 0xb2, 0x2a, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x89, 0xb0, 0x2b, 0x00, 0x00, 0x00, 0x2f, 0x40,</div><div class='add'>+	0x81, 0xb0, 0x01, 0x00, 0x00, 0x14, 0x00, 0x40, 0x49, 0x99, 0x01, 0x00,</div><div class='add'>+	0xb3, 0x01, 0x22, 0xde, 0xe1, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4c,</div><div class='add'>+	0x49, 0xc1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41, 0x81, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x92, 0x01, 0xa2, 0x44, 0x81, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4c,</div><div class='add'>+	0x49, 0xd1, 0x01, 0x00, 0x9a, 0x01, 0x22, 0x40, 0xe1, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x96, 0x01, 0xa2, 0x41, 0x81, 0x50, 0x00, 0x00, 0x50, 0x01, 0x00, 0x41,</div><div class='add'>+	0xbf, 0xb3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0xbf, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x50, 0x01, 0xa0, 0x0f, 0xbd, 0x6f, 0x00, 0x00, 0x00, 0x00, 0x00, 0xde,</div><div class='add'>+	0xe1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44, 0x49, 0xc1, 0x01, 0x00,</div><div class='add'>+	0xb5, 0x01, 0x00, 0x40, 0x19, 0x99, 0x01, 0x00, 0x00, 0x00, 0x42, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x43, 0xff, 0x85, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xde, 0x19, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x42, 0xff,</div><div class='add'>+	0x87, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x43, 0xff, 0xe1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x44, 0x49, 0xc1, 0x01, 0x00, 0x00, 0x00, 0x2f, 0xff,</div><div class='add'>+	0xe1, 0xb1, 0x01, 0x00, 0x08, 0x14, 0x00, 0xa4, 0x80, 0xcc, 0x01, 0x00,</div><div class='add'>+	0xaa, 0x01, 0x26, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x85, 0xc0, 0x01, 0x00, 0xa8, 0x01, 0xa2, 0x4c, 0x81, 0x50, 0x00, 0x00,</div><div class='add'>+	0xb4, 0x01, 0x22, 0xd2, 0x81, 0x32, 0x00, 0x00, 0xaf, 0x01, 0x22, 0x41,</div><div class='add'>+	0xa5, 0x6f, 0x00, 0x00, 0x50, 0x01, 0xa2, 0xe0, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xd2, 0xc1, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5c,</div><div class='add'>+	0x89, 0x90, 0x01, 0x00, 0x00, 0x00, 0x40, 0x42, 0x80, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x41, 0x43, 0x80, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0,</div><div class='add'>+	0x88, 0x94, 0x01, 0x00, 0x55, 0x01, 0x00, 0x44, 0xe0, 0xb1, 0x00, 0x00,</div><div class='add'>+	0xb1, 0x01, 0x00, 0x48, 0x49, 0xc1, 0x00, 0x00, 0xaf, 0x01, 0x00, 0x5b,</div><div class='add'>+	0x89, 0x90, 0x00, 0x00, 0xa8, 0x9f, 0x00, 0xa0, 0x9e, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x83, 0xb0, 0x01, 0x00, 0x00, 0x14, 0x00, 0x40,</div><div class='add'>+	0x49, 0x99, 0x01, 0x00, 0x00, 0x00, 0x23, 0x40, 0x81, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xbe, 0x01, 0x22, 0xde, 0xe1, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4c,</div><div class='add'>+	0x49, 0xc1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41, 0x81, 0xc0, 0x01, 0x00,</div><div class='add'>+	0xb9, 0x01, 0xa2, 0x44, 0x81, 0x6c, 0x00, 0x00, 0x50, 0x01, 0x00, 0x43,</div><div class='add'>+	0xbf, 0xb3, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x18, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x40, 0xf8, 0x80, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x41, 0xf0,</div><div class='add'>+	0x80, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0xf1, 0xb1, 0x01, 0x00, 0x55, 0x01, 0x00, 0x40,</div><div class='add'>+	0xe1, 0xb1, 0x00, 0x00, 0xc6, 0x01, 0x00, 0x40, 0x91, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x91, 0xb0, 0x01, 0x00, 0xd0, 0x14, 0x2e, 0x40,</div><div class='add'>+	0x49, 0xb1, 0x01, 0x00, 0x05, 0x00, 0x00, 0x40, 0xa3, 0x9b, 0x01, 0x00,</div><div class='add'>+	0x08, 0x00, 0x00, 0xdd, 0x81, 0xf4, 0x01, 0x00, 0xcb, 0x01, 0x00, 0x40,</div><div class='add'>+	0x80, 0xc8, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x10, 0xb1, 0x00, 0x00,</div><div class='add'>+	0xd1, 0x01, 0x00, 0x40, 0x81, 0xb0, 0x00, 0x00, 0x53, 0x01, 0x00, 0xde,</div><div class='add'>+	0xa1, 0xb3, 0x00, 0x00, 0xe3, 0x01, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xe5, 0x01, 0x00, 0x40, 0x81, 0xb0, 0x00, 0x00, 0xeb, 0x01, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x52, 0x01, 0x00, 0xdf, 0xe1, 0xb1, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xd0, 0xba, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xde,</div><div class='add'>+	0xa1, 0xb1, 0x01, 0x00, 0x02, 0x00, 0x00, 0xd2, 0xa5, 0xe7, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xd2, 0xc1, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0xdb, 0x01, 0x22, 0x44, 0xc1, 0x53, 0x00, 0x00,</div><div class='add'>+	0xda, 0x01, 0x84, 0x41, 0x81, 0x40, 0x00, 0x00, 0xde, 0x01, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x45, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xd5, 0x01, 0x00, 0x41, 0xa1, 0xc1, 0x00, 0x00, 0xda, 0x02, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0xf8, 0x02, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x55, 0x01, 0x00, 0xdd, 0xa1, 0xb1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb0, 0x01, 0x00, 0x40, 0x00, 0x00, 0x40, 0xa5, 0x9b, 0x01, 0x00,</div><div class='add'>+	0xda, 0x02, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x40, 0x00, 0x00, 0xd3,</div><div class='add'>+	0xa7, 0xcb, 0x01, 0x00, 0xf8, 0x02, 0x00, 0xe0, 0xa5, 0xb3, 0x00, 0x00,</div><div class='add'>+	0x03, 0x00, 0x00, 0x40, 0xa3, 0x9b, 0x01, 0x00, 0x53, 0x01, 0x00, 0xde,</div><div class='add'>+	0xa1, 0xb3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0xbf, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xde, 0x81, 0x90, 0x01, 0x00, 0x50, 0x01, 0xa2, 0xba,</div><div class='add'>+	0x80, 0x04, 0x00, 0x00, 0x60, 0x00, 0x00, 0xde, 0x61, 0x99, 0x01, 0x00,</div><div class='add'>+	0xe8, 0x01, 0xa8, 0xb1, 0x80, 0x30, 0x00, 0x00, 0x52, 0x01, 0x00, 0x40,</div><div class='add'>+	0xe0, 0xb1, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd0, 0xba, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x6b, 0x02, 0x00, 0x40, 0x81, 0x98, 0x01, 0x00, 0x60, 0x02, 0x00, 0x4d,</div><div class='add'>+	0x83, 0x30, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44, 0xe1, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x44, 0xe3, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0xe5, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44, 0xe9, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x44, 0xeb, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0xf5, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44, 0xf7, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x44, 0xf9, 0xb3, 0x01, 0x00, 0xf9, 0x01, 0x22, 0x40,</div><div class='add'>+	0x8f, 0x6f, 0x00, 0x00, 0x78, 0x02, 0x00, 0x40, 0x81, 0x98, 0x01, 0x00,</div><div class='add'>+	0x60, 0x02, 0x00, 0xc7, 0x83, 0x30, 0x01, 0x00, 0x80, 0x02, 0x00, 0x40,</div><div class='add'>+	0x81, 0x98, 0x01, 0x00, 0x60, 0x02, 0x00, 0x42, 0x83, 0x30, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xe8, 0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xe9,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xea, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xeb, 0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x85,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xec, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xed, 0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xb2,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xa9, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xac, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xab,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xb8, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xb9, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xba,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xbb, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x0c, 0x02, 0xb8, 0x40, 0x81, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0x90, 0x01, 0x00, 0x0e, 0x02, 0xb9, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x81, 0x90, 0x01, 0x00, 0x10, 0x02, 0xba, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x81, 0x90, 0x01, 0x00,</div><div class='add'>+	0x12, 0x02, 0xbb, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43,</div><div class='add'>+	0x81, 0x90, 0x01, 0x00, 0x14, 0x02, 0xbc, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x44, 0x81, 0x90, 0x01, 0x00, 0x16, 0x02, 0xbd, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x45, 0x81, 0x90, 0x01, 0x00,</div><div class='add'>+	0x18, 0x02, 0xbe, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46,</div><div class='add'>+	0x81, 0x90, 0x01, 0x00, 0x1a, 0x02, 0xbf, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x47, 0x81, 0x90, 0x01, 0x00, 0x1c, 0x02, 0xc8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x48, 0x81, 0x90, 0x01, 0x00,</div><div class='add'>+	0x1e, 0x02, 0xc9, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x49,</div><div class='add'>+	0x81, 0x90, 0x01, 0x00, 0x20, 0x02, 0xca, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4a, 0x81, 0x90, 0x01, 0x00, 0x22, 0x02, 0xcb, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4b, 0x81, 0x90, 0x01, 0x00,</div><div class='add'>+	0x24, 0x02, 0xcc, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4c,</div><div class='add'>+	0x81, 0x90, 0x01, 0x00, 0x26, 0x02, 0xcd, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4d, 0x81, 0x90, 0x01, 0x00, 0x28, 0x02, 0xce, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4e, 0x81, 0x90, 0x01, 0x00,</div><div class='add'>+	0x2a, 0x02, 0xcf, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4f,</div><div class='add'>+	0x81, 0x90, 0x01, 0x00, 0x2c, 0x02, 0xf0, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x50, 0x81, 0x90, 0x01, 0x00, 0x2e, 0x02, 0xf1, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x51, 0x81, 0x90, 0x01, 0x00,</div><div class='add'>+	0x30, 0x02, 0xf2, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x52,</div><div class='add'>+	0x81, 0x90, 0x01, 0x00, 0x32, 0x02, 0xf3, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x53, 0x81, 0x90, 0x01, 0x00, 0x34, 0x02, 0xf4, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x54, 0x81, 0x90, 0x01, 0x00,</div><div class='add'>+	0x36, 0x02, 0xf5, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55,</div><div class='add'>+	0x81, 0x90, 0x01, 0x00, 0x38, 0x02, 0xf6, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x56, 0x81, 0x90, 0x01, 0x00, 0x3a, 0x02, 0xf7, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x57, 0x81, 0x90, 0x01, 0x00,</div><div class='add'>+	0x3c, 0x02, 0xf8, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x58,</div><div class='add'>+	0x81, 0x90, 0x01, 0x00, 0x3e, 0x02, 0xf9, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x59, 0x81, 0x90, 0x01, 0x00, 0x40, 0x02, 0xfa, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5a, 0x81, 0x90, 0x01, 0x00,</div><div class='add'>+	0x42, 0x02, 0xfb, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5b,</div><div class='add'>+	0x81, 0x90, 0x01, 0x00, 0x44, 0x02, 0xfc, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x5c, 0x81, 0x90, 0x01, 0x00, 0x46, 0x02, 0xfd, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5d, 0x81, 0x90, 0x01, 0x00,</div><div class='add'>+	0x48, 0x02, 0xfe, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5e,</div><div class='add'>+	0x81, 0x90, 0x01, 0x00, 0x4a, 0x02, 0xff, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x5f, 0x81, 0x90, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x40, 0xa5, 0x9b, 0x01, 0x00,</div><div class='add'>+	0xd8, 0x02, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0xf8, 0x02, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0xd0, 0x14, 0x2e, 0x06, 0xa5, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0xd3, 0xa7, 0xcb, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf1, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf2, 0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf4,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf5, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xfa, 0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xfb,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xeb, 0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xee,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xef, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf3, 0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf6,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xfd, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xdb, 0x01, 0x00, 0xc7, 0xe1, 0xb1, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x66, 0x02, 0x00, 0x48, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x51, 0x40, 0x1a, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x4d, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x45, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x63, 0x02, 0xa2, 0x41, 0x83, 0x50, 0x00, 0x00, 0x5f, 0x02, 0x49, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x52, 0x40, 0x1c, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x4e, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x46, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x68, 0x02, 0xa2, 0x41, 0x83, 0x50, 0x00, 0x00,</div><div class='add'>+	0x5f, 0x02, 0x4a, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0,</div><div class='add'>+	0x9e, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x80, 0xd8, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xa1, 0xd0, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xa2,</div><div class='add'>+	0xd2, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xa4, 0xd4, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xd0, 0xd6, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd1,</div><div class='add'>+	0xdc, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd2, 0xde, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x88, 0xda, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd4,</div><div class='add'>+	0x8e, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd3, 0xe6, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xac, 0xec, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x99,</div><div class='add'>+	0xfa, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd5, 0xe0, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xd5, 0xe2, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd5,</div><div class='add'>+	0xe4, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd5, 0xe8, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xd5, 0xea, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd5,</div><div class='add'>+	0xf4, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd5, 0xf6, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xd5, 0xf8, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xc7,</div><div class='add'>+	0xa9, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4f, 0x40, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x84, 0x02, 0x00, 0x40, 0x91, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x91, 0xb0, 0x01, 0x00, 0x07, 0x00, 0x00, 0x40, 0xa3, 0x9b, 0x01, 0x00,</div><div class='add'>+	0x08, 0x00, 0x00, 0xdd, 0x81, 0xf4, 0x01, 0x00, 0x88, 0x02, 0x00, 0x40,</div><div class='add'>+	0x80, 0xc8, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x10, 0xb1, 0x00, 0x00,</div><div class='add'>+	0x8d, 0x02, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x98, 0x02, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x98, 0x02, 0x00, 0x46, 0xa3, 0xb3, 0x00, 0x00,</div><div class='add'>+	0x9b, 0x02, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xa1, 0x02, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x8f, 0x02, 0x23, 0x50, 0xa5, 0x6f, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x50, 0xa5, 0xb3, 0x01, 0x00, 0xe8, 0x02, 0x00, 0x42,</div><div class='add'>+	0xa5, 0x63, 0x01, 0x00, 0xf8, 0x02, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0xd0, 0x14, 0x2d, 0x40, 0x49, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd0,</div><div class='add'>+	0xba, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xde, 0xa1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf8, 0x00, 0xb0, 0x01, 0x00, 0x97, 0x02, 0x22, 0x44,</div><div class='add'>+	0xa5, 0x53, 0x00, 0x00, 0x94, 0x02, 0x00, 0x41, 0xa1, 0xc1, 0x00, 0x00,</div><div class='add'>+	0x55, 0x01, 0x00, 0xdd, 0xa1, 0xb1, 0x00, 0x00, 0xe8, 0x02, 0x00, 0xde,</div><div class='add'>+	0xa1, 0x33, 0x01, 0x00, 0xf8, 0x02, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x55, 0x01, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x45,</div><div class='add'>+	0xbf, 0xb3, 0x01, 0x00, 0x50, 0x01, 0xa2, 0xd2, 0x77, 0x7d, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xd2, 0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xde,</div><div class='add'>+	0x63, 0xb1, 0x01, 0x00, 0x9e, 0x02, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x55, 0x01, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xe8, 0x02, 0x00, 0x54,</div><div class='add'>+	0xa5, 0x33, 0x01, 0x00, 0xf8, 0x02, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0xd0, 0x14, 0x2d, 0x40, 0x49, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8,</div><div class='add'>+	0xd0, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xd2, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf8, 0xd4, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8,</div><div class='add'>+	0xd6, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x08, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xac, 0x02, 0x00, 0x40, 0x81, 0x98, 0x01, 0x00, 0x60, 0x02, 0x00, 0x46,</div><div class='add'>+	0x83, 0x30, 0x01, 0x00, 0x55, 0x01, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xa0, 0x9e, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xe8,</div><div class='add'>+	0x43, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xe9, 0x45, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xea, 0x49, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xeb,</div><div class='add'>+	0xa1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4f, 0x40, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xd0, 0x14, 0x2e, 0x40, 0x49, 0xb1, 0x01, 0x00, 0x05, 0x00, 0x00, 0x40,</div><div class='add'>+	0xa3, 0x9b, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0xc1, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x08, 0x00, 0x00, 0xdd, 0x81, 0xf4, 0x01, 0x00, 0xbd, 0x02, 0x00, 0x40,</div><div class='add'>+	0x10, 0xc9, 0x00, 0x00, 0xc3, 0x02, 0x00, 0x05, 0x81, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x50, 0x01, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xcb, 0x02, 0x00, 0x05,</div><div class='add'>+	0x81, 0xb0, 0x00, 0x00, 0x50, 0x01, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xd0, 0x02, 0x00, 0x44, 0xa5, 0xb3, 0x00, 0x00, 0xd2, 0x02, 0x00, 0x44,</div><div class='add'>+	0xa5, 0xb3, 0x00, 0x00, 0x02, 0x00, 0x00, 0x40, 0xa4, 0xe7, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xe0, 0x81, 0xb1, 0x01, 0x00, 0xff, 0xff, 0x00, 0xc1,</div><div class='add'>+	0xf0, 0x89, 0x01, 0x00, 0xc8, 0x02, 0x22, 0x41, 0x81, 0x50, 0x00, 0x00,</div><div class='add'>+	0xc4, 0x02, 0x00, 0x41, 0xc1, 0xc3, 0x00, 0x00, 0xda, 0x02, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0xf8, 0x02, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x55, 0x01, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x02, 0x00, 0x00, 0x40,</div><div class='add'>+	0xa4, 0xe7, 0x01, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x91, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xff, 0xff, 0x00, 0xc9, 0xf0, 0x89, 0x01, 0x00, 0xc8, 0x02, 0x22, 0x41,</div><div class='add'>+	0x81, 0x50, 0x00, 0x00, 0xcc, 0x02, 0x00, 0x41, 0xc1, 0xc3, 0x00, 0x00,</div><div class='add'>+	0xff, 0xff, 0x00, 0xde, 0x85, 0x89, 0x01, 0x00, 0xc8, 0x02, 0x00, 0xc2,</div><div class='add'>+	0xe0, 0xb1, 0x00, 0x00, 0xff, 0xff, 0x00, 0xde, 0x95, 0x89, 0x01, 0x00,</div><div class='add'>+	0xc8, 0x02, 0x00, 0xca, 0xe0, 0xb1, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe7, 0xa7, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xd8, 0xa9, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x49, 0xb1, 0x01, 0x00, 0xae, 0x03, 0x00, 0xcb, 0xa3, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x20, 0x46, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd2,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd3, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xd4, 0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd0,</div><div class='add'>+	0xe1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd1, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x20, 0x00, 0x00, 0x20, 0x62, 0xdd, 0x01, 0x00, 0xe2, 0x02, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x80, 0xcc, 0x85, 0x93, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xe7, 0xa7, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd8,</div><div class='add'>+	0xa9, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x49, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xae, 0x03, 0x00, 0xcb, 0xa3, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x20,</div><div class='add'>+	0x46, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd2, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xd0, 0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd3,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0xe1, 0x02, 0x00, 0xd4, 0xe1, 0xb1, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0xa2, 0xcc,</div><div class='add'>+	0x85, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x81, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xfa, 0x02, 0xa2, 0x41, 0x81, 0x50, 0x00, 0x00, 0xf9, 0x02, 0xa2, 0xf2,</div><div class='add'>+	0x80, 0x30, 0x00, 0x00, 0x00, 0x00, 0x80, 0xcc, 0x85, 0x83, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xb5, 0x03, 0x00, 0x40, 0xa1, 0x99, 0x01, 0x00, 0x00, 0x00, 0x2f, 0x41,</div><div class='add'>+	0x99, 0xb3, 0x01, 0x00, 0x0a, 0x03, 0x22, 0x44, 0x81, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x12, 0x03, 0x22, 0x48, 0x81, 0x6c, 0x00, 0x00, 0x0c, 0x03, 0x22, 0x4c,</div><div class='add'>+	0x81, 0x6c, 0x00, 0x00, 0x16, 0x03, 0x22, 0x50, 0x81, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x17, 0x03, 0x22, 0x54, 0x81, 0x6c, 0x00, 0x00, 0x19, 0x03, 0x22, 0x58,</div><div class='add'>+	0x81, 0x6c, 0x00, 0x00, 0x1e, 0x03, 0x22, 0x5c, 0x81, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x50, 0x01, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0xbc,</div><div class='add'>+	0x09, 0xb0, 0x01, 0x00, 0xdd, 0x9f, 0x00, 0xca, 0x01, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x03, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0xf3, 0x83, 0x01, 0x00, 0x10, 0x03, 0xa2, 0x42, 0x05, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x05, 0xb0, 0x01, 0x00, 0xdd, 0x9f, 0x22, 0xca,</div><div class='add'>+	0x07, 0x14, 0x00, 0x00, 0xdd, 0x9f, 0x00, 0x45, 0xf3, 0x93, 0x00, 0x00,</div><div class='add'>+	0xdd, 0x9f, 0x20, 0x43, 0x95, 0x6f, 0x00, 0x00, 0xdd, 0x9f, 0x80, 0xca,</div><div class='add'>+	0x05, 0x30, 0x00, 0x00, 0xdd, 0x9f, 0x22, 0x01, 0x80, 0x30, 0x00, 0x00,</div><div class='add'>+	0xdd, 0x9f, 0x00, 0xcb, 0xdb, 0x91, 0x00, 0x00, 0x57, 0x01, 0x00, 0xbc,</div><div class='add'>+	0xab, 0xb3, 0x00, 0x00, 0x00, 0x00, 0x00, 0xbc, 0xb1, 0xb3, 0x01, 0x00,</div><div class='add'>+	0xdd, 0x9f, 0x00, 0xca, 0xcf, 0xb3, 0x00, 0x00, 0xff, 0x00, 0x00, 0xca,</div><div class='add'>+	0x81, 0x88, 0x01, 0x00, 0xdd, 0x9f, 0xa2, 0x40, 0x74, 0x7d, 0x00, 0x00,</div><div class='add'>+	0x60, 0x00, 0x20, 0x40, 0x60, 0x99, 0x01, 0x00, 0x1b, 0x03, 0xa8, 0xb1,</div><div class='add'>+	0x82, 0x30, 0x00, 0x00, 0x1a, 0x03, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xdd, 0x9f, 0x00, 0xca, 0x79, 0xb3, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4e, 0x81, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x43, 0xcb, 0x83, 0x01, 0x00, 0x00, 0x00, 0x45, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x22, 0x03, 0xa2, 0x41, 0x81, 0x50, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x45, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x45, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x2d, 0x03, 0x91, 0x82, 0x82, 0x30, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x8a, 0x80, 0xb0, 0x01, 0x00, 0xae, 0x9f, 0x00, 0x40,</div><div class='add'>+	0x80, 0xce, 0x01, 0x00, 0x2b, 0x03, 0xa6, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x2d, 0x03, 0x56, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xb5, 0x03, 0x00, 0x40,</div><div class='add'>+	0xa1, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x53, 0x07, 0x90, 0x01, 0x00,</div><div class='add'>+	0xb5, 0x03, 0x00, 0x40, 0xa1, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x52,</div><div class='add'>+	0x07, 0x90, 0x01, 0x00, 0xd8, 0x9f, 0x00, 0x41, 0x8b, 0xb3, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4e, 0x81, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x42,</div><div class='add'>+	0xcd, 0x83, 0x01, 0x00, 0x00, 0x00, 0x46, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x32, 0x03, 0xa2, 0x41, 0x81, 0x50, 0x00, 0x00, 0x00, 0x00, 0x46, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x46, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x3d, 0x03, 0x91, 0x81, 0x82, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89,</div><div class='add'>+	0x80, 0xb0, 0x01, 0x00, 0xae, 0x9f, 0x00, 0x40, 0x80, 0xce, 0x01, 0x00,</div><div class='add'>+	0x3b, 0x03, 0xa6, 0x40, 0x81, 0x32, 0x00, 0x00, 0x3d, 0x03, 0x55, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0xb5, 0x03, 0x00, 0x40, 0xa1, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x52, 0x07, 0x90, 0x01, 0x00, 0xb5, 0x03, 0x00, 0x40,</div><div class='add'>+	0xa1, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x53, 0x07, 0x90, 0x01, 0x00,</div><div class='add'>+	0xd8, 0x9f, 0x00, 0x41, 0x8b, 0xb3, 0x00, 0x00, 0xb0, 0x03, 0x00, 0x40,</div><div class='add'>+	0xa1, 0x99, 0x01, 0x00, 0xc4, 0x14, 0x2f, 0x40, 0x99, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x57, 0x01, 0x00, 0x40, 0x49, 0xb1, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x30, 0x94, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00, 0x00, 0x90, 0x00, 0xf8,</div><div class='add'>+	0x80, 0x98, 0x01, 0x00, 0x10, 0x00, 0x00, 0xf2, 0x88, 0xe4, 0x01, 0x00,</div><div class='add'>+	0x20, 0x00, 0x00, 0x40, 0x20, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5f,</div><div class='add'>+	0x23, 0x91, 0x01, 0x00, 0x4d, 0x03, 0x1f, 0x91, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x30, 0x00, 0x00, 0x40, 0x20, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5f,</div><div class='add'>+	0x23, 0x91, 0x01, 0x00, 0x50, 0x03, 0x1f, 0x91, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x40, 0x20, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5f,</div><div class='add'>+	0x23, 0x91, 0x01, 0x00, 0x53, 0x03, 0x1f, 0x91, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x5f, 0x23, 0x91, 0x01, 0x00, 0x55, 0x03, 0x1f, 0x91,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x00, 0x08, 0x80, 0x40, 0x20, 0x99, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x47,</div><div class='add'>+	0x84, 0xb0, 0x01, 0x00, 0x00, 0x00, 0xa2, 0x48, 0x84, 0x84, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x5f, 0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5c,</div><div class='add'>+	0x8f, 0x90, 0x01, 0x00, 0x00, 0x00, 0x00, 0x47, 0x62, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x5a, 0x03, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x08, 0x00, 0x47,</div><div class='add'>+	0x8e, 0xc8, 0x01, 0x00, 0x58, 0x03, 0x00, 0x5c, 0x8f, 0x80, 0x00, 0x00,</div><div class='add'>+	0xe0, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00, 0x58, 0x15, 0x2d, 0x40,</div><div class='add'>+	0x8d, 0xb0, 0x01, 0x00, 0xd0, 0x14, 0x2d, 0xf0, 0x88, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xfa, 0x8a, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x45,</div><div class='add'>+	0x81, 0xb0, 0x01, 0x00, 0x07, 0x00, 0x00, 0x45, 0x82, 0x88, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x43, 0x8b, 0xf0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x48,</div><div class='add'>+	0x83, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x46, 0x82, 0x94, 0x01, 0x00,</div><div class='add'>+	0x20, 0x00, 0x00, 0x41, 0x60, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x8d, 0xc0, 0x01, 0x00, 0x74, 0x03, 0x22, 0x5f, 0x8d, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x65, 0x03, 0xa2, 0x41, 0x81, 0x50, 0x00, 0x00, 0x63, 0x03, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x08, 0x00, 0x00, 0x40, 0x85, 0x98, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x44, 0x82, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x86, 0xb0, 0x01, 0x00, 0x00, 0x1c, 0x00, 0x43, 0x86, 0xd8, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0xa6, 0x41, 0x85, 0x50, 0x01, 0x00, 0x70, 0x03, 0x00, 0x41,</div><div class='add'>+	0x83, 0xe0, 0x00, 0x00, 0x6e, 0x03, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x48, 0x85, 0xe0, 0x01, 0x00, 0xd0, 0x14, 0x2f, 0x46,</div><div class='add'>+	0x84, 0x94, 0x01, 0x00, 0x20, 0x00, 0x00, 0x42, 0x60, 0x99, 0x01, 0x00,</div><div class='add'>+	0xc0, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00, 0x00, 0x00, 0x80, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x07, 0x00, 0x00, 0x45, 0x80, 0x88, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x43, 0x8b, 0xf0, 0x01, 0x00, 0x00, 0x04, 0x00, 0x40,</div><div class='add'>+	0x83, 0x98, 0x01, 0x00, 0x85, 0x03, 0xa0, 0x41, 0x81, 0x50, 0x00, 0x00,</div><div class='add'>+	0x83, 0x03, 0x00, 0x41, 0x82, 0xe8, 0x00, 0x00, 0x00, 0x00, 0x80, 0x41,</div><div class='add'>+	0x8e, 0xc0, 0x01, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x49, 0xb1, 0x01, 0x00, 0x00, 0x02, 0x00, 0x40, 0x83, 0x98, 0x01, 0x00,</div><div class='add'>+	0x00, 0x39, 0x00, 0x40, 0x45, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0x8b, 0x03, 0xa2, 0x41, 0x83, 0x50, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x85, 0xb0, 0x01, 0x00, 0x0b, 0x00, 0x00, 0x44,</div><div class='add'>+	0x82, 0xf4, 0x01, 0x00, 0x1a, 0x15, 0x00, 0xa6, 0x86, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x70, 0x15, 0x00, 0x40, 0x45, 0x99, 0x01, 0x00, 0x00, 0x08, 0x00, 0x40,</div><div class='add'>+	0xf1, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x42, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x39, 0x00, 0x40, 0xe1, 0x99, 0x01, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x61, 0x99, 0x01, 0x00, 0x70, 0x15, 0x00, 0x43, 0x62, 0x99, 0x01, 0x00,</div><div class='add'>+	0x95, 0x03, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0x97, 0x03, 0x22, 0x5a,</div><div class='add'>+	0x73, 0x7d, 0x00, 0x00, 0x7a, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00,</div><div class='add'>+	0x98, 0x03, 0xa8, 0xb1, 0x7e, 0x31, 0x00, 0x00, 0x00, 0x08, 0x00, 0x42,</div><div class='add'>+	0x84, 0xc8, 0x01, 0x00, 0x90, 0x03, 0xa2, 0x41, 0x83, 0x50, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x58, 0x15, 0x2d, 0x40,</div><div class='add'>+	0x8d, 0xb0, 0x01, 0x00, 0xd0, 0x14, 0x2d, 0xf0, 0x88, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x8f, 0xb0, 0x01, 0x00, 0x01, 0x00, 0x00, 0xa6,</div><div class='add'>+	0x90, 0xb0, 0x01, 0x00, 0x00, 0xf8, 0x00, 0x48, 0x90, 0x98, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x45, 0x93, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xfa,</div><div class='add'>+	0x8a, 0xb0, 0x01, 0x00, 0x80, 0x03, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x02, 0x00, 0x00, 0xa6, 0x80, 0xb0, 0x01, 0x00, 0xac, 0x03, 0x22, 0x40,</div><div class='add'>+	0x82, 0x6c, 0x00, 0x00, 0xb0, 0x03, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x58, 0x03, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x8d, 0xc0, 0x01, 0x00, 0xb5, 0x03, 0x22, 0x5f, 0x8d, 0x6c, 0x00, 0x00,</div><div class='add'>+	0xa7, 0x03, 0xa2, 0x41, 0x93, 0x50, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0xff, 0x07, 0x00, 0x47, 0x84, 0x88, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0xa6, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xed, 0x9f, 0x00, 0x47,</div><div class='add'>+	0x80, 0x30, 0x01, 0x00, 0x00, 0x02, 0x00, 0x47, 0x8e, 0xc8, 0x01, 0x00,</div><div class='add'>+	0xb0, 0x03, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0x50, 0xb3, 0x01, 0x00, 0xbb, 0x03, 0x20, 0x18, 0x89, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0xa6, 0x84, 0xb0, 0x01, 0x00, 0x20, 0x00, 0x00, 0xa6,</div><div class='add'>+	0x86, 0xb0, 0x01, 0x00, 0x00, 0x10, 0x00, 0x40, 0x55, 0x9b, 0x01, 0x00,</div><div class='add'>+	0xbe, 0x03, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0xa6,</div><div class='add'>+	0x84, 0xb0, 0x01, 0x00, 0x20, 0x00, 0x00, 0xa6, 0x86, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x10, 0x00, 0x40, 0x55, 0x9b, 0x01, 0x00, 0x00, 0x00, 0x00, 0x42,</div><div class='add'>+	0x50, 0xd3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xa8, 0x4f, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x43, 0x4e, 0xd3, 0x01, 0x00, 0x6e, 0x03, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x82, 0x03, 0x00, 0x42, 0x80, 0x30, 0x01, 0x00,</div><div class='add'>+	0xb0, 0x03, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0xc7, 0x03, 0x22, 0xa7,</div><div class='add'>+	0x8f, 0x6c, 0x00, 0x00, 0x5a, 0x03, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0xc4, 0x03, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0xc8, 0x14, 0x2e, 0xbb, 0x85, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xee, 0x82, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0xe0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xa2, 0xa0, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x44, 0xa5, 0xb3, 0x01, 0x00, 0xe1, 0x9f, 0x00, 0xca,</div><div class='add'>+	0xa7, 0x33, 0x01, 0x00, 0xe0, 0x9f, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xd6, 0x03, 0x22, 0x42,</div><div class='add'>+	0x75, 0x6f, 0x00, 0x00, 0xd8, 0x03, 0x22, 0x41, 0x75, 0x6f, 0x00, 0x00,</div><div class='add'>+	0xda, 0x03, 0x1e, 0xca, 0x81, 0x32, 0x00, 0x00, 0xdc, 0x03, 0x1f, 0xca,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0xca, 0xc9, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xdd, 0x9f, 0x00, 0x42, 0x75, 0xb3, 0x00, 0x00, 0x00, 0x00, 0x00, 0xca,</div><div class='add'>+	0xcd, 0xb1, 0x01, 0x00, 0xdd, 0x9f, 0x00, 0x41, 0x75, 0xb3, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xca, 0xcf, 0xb1, 0x01, 0x00, 0xdd, 0x9f, 0x00, 0x40,</div><div class='add'>+	0x75, 0xb3, 0x00, 0x00, 0x00, 0x81, 0x00, 0xa6, 0xc6, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xdd, 0x9f, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x80, 0x00, 0xa6,</div><div class='add'>+	0xc6, 0xb1, 0x01, 0x00, 0xdd, 0x9f, 0x00, 0x40, 0x75, 0xb3, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x45, 0x01, 0x00, 0x4d, 0x93, 0x30, 0x01, 0x00,</div><div class='add'>+	0x45, 0x01, 0x00, 0x4e, 0x93, 0x30, 0x01, 0x00, 0x45, 0x01, 0x00, 0x4c,</div><div class='add'>+	0x93, 0x30, 0x01, 0x00, 0xec, 0x9f, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0xdd, 0x9f, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x54, 0x95, 0x00, 0x40,</div><div class='add'>+	0x45, 0x99, 0x01, 0x00, 0xdd, 0x9f, 0x00, 0xca, 0xe5, 0xb1, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xcc, 0x14, 0x2e, 0x40, 0x87, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xa2,</div><div class='add'>+	0xa0, 0xb3, 0x01, 0x00, 0x15, 0x04, 0x00, 0x43, 0xb2, 0x33, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x68, 0xda, 0x89, 0xb0, 0x01, 0x00, 0x7c, 0x00, 0x00, 0x40,</div><div class='add'>+	0x8b, 0x98, 0x01, 0x00, 0x00, 0x00, 0x00, 0x50, 0x89, 0xf0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x89, 0xd0, 0x01, 0x00, 0x03, 0x00, 0x00, 0x44,</div><div class='add'>+	0x88, 0x8c, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44, 0x87, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0xa5, 0xb3, 0x01, 0x00, 0x15, 0x04, 0x00, 0x43,</div><div class='add'>+	0xb2, 0x33, 0x01, 0x00, 0x00, 0x00, 0x00, 0xda, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x44, 0x87, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0xa5, 0xc3, 0x01, 0x00, 0x0b, 0x04, 0x22, 0x44, 0x89, 0x50, 0x00, 0x00,</div><div class='add'>+	0x0b, 0x04, 0x22, 0x44, 0x8b, 0x50, 0x00, 0x00, 0xfa, 0x03, 0xa2, 0x50,</div><div class='add'>+	0xa5, 0x6f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0xa5, 0xe3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xca, 0xa7, 0xb3, 0x01, 0x00, 0xe1, 0x9f, 0x00, 0xbb,</div><div class='add'>+	0x85, 0x30, 0x01, 0x00, 0xcc, 0x14, 0x2e, 0xd2, 0x95, 0xc3, 0x01, 0x00,</div><div class='add'>+	0xae, 0x03, 0x00, 0xcb, 0xa3, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x20,</div><div class='add'>+	0x42, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x50, 0x81, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x08, 0x04, 0xa2, 0x41, 0x81, 0x50, 0x00, 0x00, 0x07, 0x04, 0xa2, 0xf2,</div><div class='add'>+	0x80, 0x30, 0x00, 0x00, 0xfa, 0x03, 0x00, 0x40, 0xa5, 0xb3, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x42, 0xa5, 0xe3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xca,</div><div class='add'>+	0xa7, 0xb3, 0x01, 0x00, 0xe1, 0x9f, 0x00, 0xbb, 0x85, 0x30, 0x01, 0x00,</div><div class='add'>+	0xe0, 0x9f, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd9, 0x2b, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x10, 0x00, 0x40, 0x83, 0x98, 0x01, 0x00, 0xdb, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0xff, 0xff, 0x00, 0x94, 0xb4, 0x8b, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd9,</div><div class='add'>+	0x2b, 0xb1, 0x01, 0x00, 0x00, 0x10, 0x00, 0x40, 0x83, 0x98, 0x01, 0x00,</div><div class='add'>+	0xdd, 0x00, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x80, 0x94,</div><div class='add'>+	0xb4, 0xb3, 0x01, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xd9, 0x2b, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xda,</div><div class='add'>+	0x27, 0xb1, 0x01, 0x00, 0x06, 0xc0, 0x00, 0x40, 0x2d, 0x99, 0x01, 0x00,</div><div class='add'>+	0xde, 0x00, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x00, 0x10, 0x00, 0x40,</div><div class='add'>+	0x83, 0x98, 0x01, 0x00, 0x02, 0xc4, 0x00, 0x41, 0x2c, 0x99, 0x01, 0x00,</div><div class='add'>+	0xde, 0x00, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x00, 0x40, 0x00, 0x40,</div><div class='add'>+	0x83, 0x98, 0x01, 0x00, 0x05, 0x82, 0x00, 0x41, 0x2c, 0x99, 0x01, 0x00,</div><div class='add'>+	0xde, 0x00, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x2d, 0x04, 0x80, 0x94,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x0c, 0x01, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x28, 0x04, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x80, 0x00, 0x40,</div><div class='add'>+	0x2d, 0x99, 0x01, 0x00, 0xde, 0x00, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x31, 0x04, 0x00, 0x12,</div><div class='add'>+	0x10, 0xc9, 0x00, 0x00, 0x00, 0x48, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00,</div><div class='add'>+	0xc0, 0x49, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00, 0x80, 0x4b, 0x80, 0x40,</div><div class='add'>+	0x0b, 0x98, 0x01, 0x00, 0x40, 0x4d, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00,</div><div class='add'>+	0x00, 0x4f, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00, 0xc0, 0x50, 0x80, 0x40,</div><div class='add'>+	0x0b, 0x98, 0x01, 0x00, 0x80, 0x52, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00,</div><div class='add'>+	0x40, 0x54, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00, 0x00, 0x56, 0x80, 0x40,</div><div class='add'>+	0x0b, 0x98, 0x01, 0x00, 0xc0, 0x57, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00,</div><div class='add'>+	0x80, 0x59, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00, 0x40, 0x5b, 0x80, 0x40,</div><div class='add'>+	0x0b, 0x98, 0x01, 0x00, 0x00, 0x5d, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00,</div><div class='add'>+	0xc0, 0x5e, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00, 0x80, 0x60, 0x80, 0x40,</div><div class='add'>+	0x0b, 0x98, 0x01, 0x00, 0x40, 0x62, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00,</div><div class='add'>+	0x00, 0x64, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00, 0xc0, 0x65, 0x80, 0x40,</div><div class='add'>+	0x0b, 0x98, 0x01, 0x00, 0x80, 0x67, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00,</div><div class='add'>+	0x40, 0x69, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00, 0x00, 0x6b, 0x80, 0x40,</div><div class='add'>+	0x0b, 0x98, 0x01, 0x00, 0xc0, 0x6c, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00,</div><div class='add'>+	0x80, 0x6e, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00, 0x40, 0x70, 0x80, 0x40,</div><div class='add'>+	0x0b, 0x98, 0x01, 0x00, 0x00, 0x72, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00,</div><div class='add'>+	0xc0, 0x73, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00, 0x80, 0x75, 0x80, 0x40,</div><div class='add'>+	0x0b, 0x98, 0x01, 0x00, 0x40, 0x77, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00,</div><div class='add'>+	0x00, 0x79, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00, 0xc0, 0x7a, 0x80, 0x40,</div><div class='add'>+	0x0b, 0x98, 0x01, 0x00, 0x80, 0x7c, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00,</div><div class='add'>+	0x40, 0x7e, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x59, 0x04, 0x00, 0x12, 0x10, 0xc9, 0x00, 0x00,</div><div class='add'>+	0x00, 0x80, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00, 0x00, 0x82, 0x80, 0x40,</div><div class='add'>+	0x0b, 0x98, 0x01, 0x00, 0x00, 0x84, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00,</div><div class='add'>+	0x00, 0x86, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00, 0x00, 0x88, 0x80, 0x40,</div><div class='add'>+	0x0b, 0x98, 0x01, 0x00, 0x00, 0x8a, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00,</div><div class='add'>+	0x00, 0x8c, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00, 0x00, 0x8e, 0x80, 0x40,</div><div class='add'>+	0x0b, 0x98, 0x01, 0x00, 0x00, 0x90, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00,</div><div class='add'>+	0x00, 0x92, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00, 0x00, 0x94, 0x80, 0x40,</div><div class='add'>+	0x0b, 0x98, 0x01, 0x00, 0x00, 0x96, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00,</div><div class='add'>+	0x00, 0x98, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00, 0x00, 0x9a, 0x80, 0x40,</div><div class='add'>+	0x0b, 0x98, 0x01, 0x00, 0x00, 0x9c, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00,</div><div class='add'>+	0x00, 0x9e, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00, 0x00, 0xa0, 0x80, 0x40,</div><div class='add'>+	0x0b, 0x98, 0x01, 0x00, 0x00, 0xa2, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00,</div><div class='add'>+	0x00, 0xa4, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00, 0x00, 0xa6, 0x80, 0x40,</div><div class='add'>+	0x0b, 0x98, 0x01, 0x00, 0x00, 0xa8, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00,</div><div class='add'>+	0x00, 0xaa, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00, 0x00, 0xac, 0x80, 0x40,</div><div class='add'>+	0x0b, 0x98, 0x01, 0x00, 0x00, 0xae, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00,</div><div class='add'>+	0x00, 0xb0, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00, 0x00, 0xb2, 0x80, 0x40,</div><div class='add'>+	0x0b, 0x98, 0x01, 0x00, 0x00, 0xb4, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00,</div><div class='add'>+	0x00, 0xb6, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00, 0x00, 0xb8, 0x80, 0x40,</div><div class='add'>+	0x0b, 0x98, 0x01, 0x00, 0x00, 0xba, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00,</div><div class='add'>+	0x00, 0xbc, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00, 0x00, 0xbe, 0x80, 0x40,</div><div class='add'>+	0x0b, 0x98, 0x01, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x87, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x97, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4b, 0x80, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x01, 0x00, 0x00, 0xa6, 0x82, 0xb1, 0x01, 0x00, 0x82, 0x04, 0x85, 0x41,</div><div class='add'>+	0x97, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x97, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x97, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4b,</div><div class='add'>+	0x90, 0xb1, 0x01, 0x00, 0x01, 0x00, 0x00, 0xa6, 0x92, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x87, 0x04, 0x85, 0x41, 0x97, 0x40, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x90, 0x04, 0x60, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x80, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xff, 0xff, 0xf0, 0x4b, 0x82, 0x89, 0x01, 0x00, 0x93, 0x04, 0x60, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4a, 0x80, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x01, 0x00, 0xf0, 0xa6, 0x82, 0xb1, 0x01, 0x00, 0x96, 0x04, 0x60, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0xff, 0xff, 0x00, 0x4b, 0x84, 0x89, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0xf0, 0xc2, 0x24, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4a,</div><div class='add'>+	0x90, 0xb1, 0x01, 0x00, 0xff, 0xff, 0x80, 0x4b, 0x92, 0x89, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4a, 0x90, 0xb1, 0x01, 0x00, 0x01, 0x00, 0x80, 0xa6,</div><div class='add'>+	0x92, 0xb1, 0x01, 0x00, 0xff, 0xff, 0x00, 0x4b, 0x94, 0x89, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0xca, 0x94, 0xb0, 0x01, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x10, 0x00, 0x00, 0x4e, 0x98, 0xe4, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x07, 0x98, 0x94, 0x01, 0x00, 0x00, 0x00, 0x00, 0x43,</div><div class='add'>+	0x99, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x80, 0x98, 0x94, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x49, 0x99, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4c,</div><div class='add'>+	0x88, 0x94, 0x01, 0x00, 0xa6, 0x04, 0x47, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0xad, 0x04, 0x22, 0x20, 0x87, 0x6f, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0xa6, 0x04, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x1f, 0x80, 0x86, 0xb3, 0x01, 0x00, 0xb0, 0x04, 0x22, 0x4f,</div><div class='add'>+	0x77, 0x7d, 0x00, 0x00, 0xc0, 0x04, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4f, 0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0x62, 0xb1, 0x01, 0x00, 0xb1, 0x04, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0xb8, 0x04, 0x22, 0x4b, 0x89, 0x7c, 0x00, 0x00, 0xb6, 0x04, 0x22, 0x4f,</div><div class='add'>+	0x77, 0x7d, 0x00, 0x00, 0xc0, 0x04, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x45, 0x62, 0xb1, 0x01, 0x00, 0xb6, 0x04, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x80, 0x20, 0x87, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50,</div><div class='add'>+	0x99, 0xb0, 0x01, 0x00, 0x6f, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00,</div><div class='add'>+	0xc1, 0x04, 0xa8, 0xb1, 0x52, 0x33, 0x00, 0x00, 0xc6, 0x04, 0x22, 0x4b,</div><div class='add'>+	0x53, 0x7f, 0x00, 0x00, 0x6f, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00,</div><div class='add'>+	0xc4, 0x04, 0xa8, 0xb1, 0x7e, 0x31, 0x00, 0x00, 0xc1, 0x04, 0xa2, 0x41,</div><div class='add'>+	0x99, 0x50, 0x00, 0x00, 0x00, 0x00, 0xa2, 0x4f, 0x77, 0xfd, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x10, 0x00, 0x00, 0x4e, 0x98, 0xe4, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x07, 0x98, 0x94, 0x01, 0x00, 0x00, 0x00, 0x00, 0x43,</div><div class='add'>+	0x99, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x80, 0x98, 0x94, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x48, 0x99, 0xe0, 0x01, 0x00, 0xd6, 0x04, 0x00, 0x4c,</div><div class='add'>+	0x88, 0x94, 0x00, 0x00, 0xd6, 0x04, 0x47, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0xdd, 0x04, 0x22, 0x20, 0x87, 0x6f, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0xd6, 0x04, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x1f, 0x80, 0x86, 0xb3, 0x01, 0x00, 0xe0, 0x04, 0x22, 0x4f,</div><div class='add'>+	0x77, 0x7d, 0x00, 0x00, 0xf0, 0x04, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4f, 0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0x62, 0xb1, 0x01, 0x00, 0xe1, 0x04, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0xe8, 0x04, 0x22, 0x4a, 0x89, 0x7c, 0x00, 0x00, 0xe6, 0x04, 0x22, 0x4f,</div><div class='add'>+	0x77, 0x7d, 0x00, 0x00, 0xf0, 0x04, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x45, 0x62, 0xb1, 0x01, 0x00, 0xe6, 0x04, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x80, 0x20, 0x87, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50,</div><div class='add'>+	0x99, 0xb0, 0x01, 0x00, 0x6f, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00,</div><div class='add'>+	0xf1, 0x04, 0xa8, 0xb1, 0x52, 0x33, 0x00, 0x00, 0xf6, 0x04, 0x22, 0x4a,</div><div class='add'>+	0x53, 0x7f, 0x00, 0x00, 0x6f, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00,</div><div class='add'>+	0xf4, 0x04, 0xa8, 0xb1, 0x7e, 0x31, 0x00, 0x00, 0xf1, 0x04, 0xa2, 0x41,</div><div class='add'>+	0x99, 0x50, 0x00, 0x00, 0x00, 0x00, 0xa2, 0x4f, 0x77, 0xfd, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x7b, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x05, 0xa8, 0xb1, 0x80, 0x30, 0x00, 0x00, 0x12, 0x05, 0x1d, 0x40,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x40, 0x18, 0x00, 0x40, 0x49, 0x99, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0xa6, 0x86, 0xb0, 0x01, 0x00, 0x10, 0x05, 0xa2, 0x40,</div><div class='add'>+	0x86, 0x04, 0x00, 0x00, 0xde, 0x9f, 0x9c, 0x40, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0xff, 0xff, 0x00, 0x40, 0x88, 0x88, 0x01, 0x00, 0x30, 0x05, 0x00, 0x50,</div><div class='add'>+	0x47, 0x31, 0x01, 0x00, 0x36, 0x00, 0x00, 0x44, 0x88, 0xcc, 0x01, 0x00,</div><div class='add'>+	0x0c, 0x05, 0x52, 0x40, 0x81, 0x32, 0x00, 0x00, 0x30, 0x05, 0x00, 0x40,</div><div class='add'>+	0x47, 0x31, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41, 0x89, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x30, 0x05, 0x00, 0x48, 0x47, 0x31, 0x01, 0x00, 0x30, 0x05, 0x00, 0x05,</div><div class='add'>+	0x47, 0x31, 0x01, 0x00, 0xde, 0x9f, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x28, 0x00, 0x00, 0x40, 0x47, 0x99, 0x1b, 0x00, 0xde, 0x9f, 0x00, 0x41,</div><div class='add'>+	0xe1, 0xc1, 0x1a, 0x00, 0x78, 0x18, 0x00, 0x40, 0x49, 0x99, 0x1b, 0x00,</div><div class='add'>+	0x19, 0x05, 0x22, 0x54, 0x81, 0x7c, 0x1a, 0x00, 0x14, 0x05, 0x42, 0x40,</div><div class='add'>+	0x81, 0x32, 0x1a, 0x00, 0x00, 0x82, 0x00, 0xb3, 0x67, 0xdf, 0x1b, 0x00,</div><div class='add'>+	0x00, 0x00, 0x1a, 0x44, 0x93, 0x93, 0x1b, 0x00, 0x28, 0x00, 0x00, 0x40,</div><div class='add'>+	0x47, 0x99, 0x1b, 0x00, 0x30, 0x05, 0x00, 0x41, 0x89, 0x30, 0x01, 0x00,</div><div class='add'>+	0x27, 0x05, 0x0f, 0x40, 0x80, 0x32, 0x00, 0x00, 0xff, 0x7f, 0x00, 0x40,</div><div class='add'>+	0x88, 0x88, 0x01, 0x00, 0x30, 0x05, 0x00, 0x50, 0x47, 0x31, 0x01, 0x00,</div><div class='add'>+	0x36, 0x00, 0x00, 0x44, 0x88, 0xcc, 0x01, 0x00, 0x1f, 0x05, 0x99, 0x40,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x48, 0x89, 0xd0, 0x01, 0x00,</div><div class='add'>+	0x21, 0x05, 0x9b, 0x40, 0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4c,</div><div class='add'>+	0x89, 0xd0, 0x01, 0x00, 0x23, 0x05, 0x1f, 0x44, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x30, 0x05, 0x00, 0x40, 0x47, 0x31, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x89, 0xb0, 0x01, 0x00, 0x30, 0x05, 0x00, 0x48, 0x47, 0x31, 0x01, 0x00,</div><div class='add'>+	0x30, 0x05, 0x00, 0x58, 0x47, 0x31, 0x01, 0x00, 0xde, 0x9f, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x10, 0x00, 0x00, 0x40, 0x86, 0xf4, 0x01, 0x00,</div><div class='add'>+	0x6f, 0x00, 0x00, 0x43, 0x86, 0x88, 0x01, 0x00, 0xde, 0x9f, 0x26, 0x05,</div><div class='add'>+	0x47, 0x31, 0x00, 0x00, 0x30, 0x05, 0x00, 0x41, 0x89, 0x30, 0x01, 0x00,</div><div class='add'>+	0xde, 0x9f, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x44, 0xf0, 0x41, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x80, 0x41,</div><div class='add'>+	0xe1, 0xc1, 0x01, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x4c, 0x01, 0x00, 0x07,</div><div class='add'>+	0x91, 0x30, 0x01, 0x00, 0x00, 0x00, 0xa2, 0x40, 0x97, 0xec, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x05, 0x91, 0xc0, 0x01, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x4c, 0x01, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x44, 0x05, 0xa2, 0x40,</div><div class='add'>+	0x97, 0x6c, 0x00, 0x00, 0x3a, 0x00, 0x00, 0x40, 0xb3, 0x9b, 0x01, 0x00,</div><div class='add'>+	0x45, 0x05, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x40, 0x00, 0x00, 0x40,</div><div class='add'>+	0xb3, 0x9b, 0x01, 0x00, 0x10, 0x04, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xda, 0xf5, 0xb1, 0x01, 0x00, 0x10, 0x04, 0x00, 0x42,</div><div class='add'>+	0xb3, 0x43, 0x01, 0x00, 0x00, 0x00, 0x00, 0xda, 0xf5, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x10, 0x04, 0x00, 0x42, 0xb3, 0x43, 0x01, 0x00, 0x00, 0x00, 0x00, 0xda,</div><div class='add'>+	0xf5, 0xb1, 0x01, 0x00, 0x4e, 0x00, 0x00, 0x40, 0xb3, 0x9b, 0x01, 0x00,</div><div class='add'>+	0x10, 0x04, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x08, 0x00, 0x00, 0xda,</div><div class='add'>+	0xf7, 0xf5, 0x01, 0x00, 0x50, 0x00, 0x00, 0x40, 0x91, 0x98, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x47, 0x8f, 0xb0, 0x01, 0x00, 0x10, 0x04, 0x00, 0x48,</div><div class='add'>+	0xb2, 0x33, 0x01, 0x00, 0x00, 0x00, 0x00, 0xda, 0xf7, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x08, 0x00, 0x00, 0xda, 0xf7, 0xf5, 0x01, 0x00, 0x00, 0x00, 0x00, 0x42,</div><div class='add'>+	0x91, 0xc0, 0x01, 0x00, 0x50, 0x05, 0xa2, 0x41, 0x8f, 0x50, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x45, 0xd1, 0x01, 0x00, 0x08, 0x00, 0x00, 0x40,</div><div class='add'>+	0xb3, 0x9b, 0x01, 0x00, 0x10, 0x04, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xda, 0xfd, 0xb1, 0x01, 0x00, 0x0a, 0x00, 0x00, 0x40,</div><div class='add'>+	0xb3, 0x9b, 0x01, 0x00, 0x10, 0x04, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xda, 0xfd, 0xb1, 0x01, 0x00, 0x1a, 0x00, 0x00, 0x40,</div><div class='add'>+	0xb3, 0x9b, 0x01, 0x00, 0x10, 0x04, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xda, 0xfd, 0xb1, 0x01, 0x00, 0x18, 0x00, 0x00, 0x40,</div><div class='add'>+	0xb3, 0x9b, 0x01, 0x00, 0x10, 0x04, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xda, 0xfd, 0xb1, 0x01, 0x00, 0x38, 0x05, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x1e, 0x00, 0x00, 0x48, 0xb2, 0xcb, 0x01, 0x00,</div><div class='add'>+	0x10, 0x04, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0xda,</div><div class='add'>+	0x91, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x48, 0xb2, 0xcb, 0x01, 0x00,</div><div class='add'>+	0x10, 0x04, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x6e, 0xda,</div><div class='add'>+	0x8f, 0xb0, 0x01, 0x00, 0x02, 0x00, 0x00, 0x48, 0xb2, 0xcb, 0x01, 0x00,</div><div class='add'>+	0x10, 0x04, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0xda,</div><div class='add'>+	0xfd, 0xb1, 0x01, 0x00, 0x04, 0x00, 0x00, 0x48, 0xb2, 0xcb, 0x01, 0x00,</div><div class='add'>+	0x10, 0x04, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x80, 0xda,</div><div class='add'>+	0xfd, 0xb1, 0x01, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x7a, 0x05, 0x22, 0x45, 0xfd, 0x7f, 0x00, 0x00, 0x40, 0x16, 0x00, 0x40,</div><div class='add'>+	0x45, 0x99, 0x01, 0x00, 0xdb, 0x9f, 0x00, 0x40, 0x49, 0x31, 0x01, 0x00,</div><div class='add'>+	0x08, 0x00, 0x00, 0x48, 0xb2, 0xcb, 0x01, 0x00, 0x15, 0x04, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x78, 0x05, 0xa2, 0x40, 0x8f, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x7d, 0x05, 0x22, 0x20, 0xb5, 0x6f, 0x00, 0x00, 0x7a, 0x05, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0xda, 0x9f, 0x00, 0x40, 0x81, 0x32, 0x1f, 0x00,</div><div class='add'>+	0x7d, 0x05, 0x22, 0x40, 0x97, 0x6c, 0x1e, 0x00, 0x7a, 0x05, 0x42, 0x40,</div><div class='add'>+	0x81, 0x32, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x4f, 0x67, 0x93, 0x1f, 0x00,</div><div class='add'>+	0xdf, 0x9f, 0x00, 0x58, 0x67, 0x93, 0x1e, 0x00, 0x54, 0x16, 0x00, 0x40,</div><div class='add'>+	0x47, 0x99, 0x1f, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xf4, 0xb1, 0x1f, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x1f, 0x00, 0x00, 0x00, 0x00, 0xfe,</div><div class='add'>+	0xf4, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xfe, 0xf4, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xf4, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x00, 0xfe,</div><div class='add'>+	0xf4, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xfe, 0xf4, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xf4, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x46, 0x00, 0x00, 0x40, 0xb3, 0x9b, 0x01, 0x00, 0x10, 0x04, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x08, 0x00, 0x00, 0xda, 0xf7, 0xf5, 0x01, 0x00,</div><div class='add'>+	0x48, 0x00, 0x00, 0x40, 0x95, 0x98, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0x97, 0xb0, 0x01, 0x00, 0x10, 0x04, 0x00, 0x4a, 0xb2, 0x33, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xda, 0xf7, 0xb1, 0x01, 0x00, 0x08, 0x00, 0x00, 0xda,</div><div class='add'>+	0xf7, 0xf5, 0x01, 0x00, 0x00, 0x00, 0x00, 0x42, 0x95, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x90, 0x05, 0xa2, 0x41, 0x97, 0x50, 0x00, 0x00, 0x2a, 0x00, 0x00, 0x40,</div><div class='add'>+	0xa5, 0x9b, 0x01, 0x00, 0x40, 0x16, 0x00, 0x40, 0xa1, 0x9b, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xca, 0xa7, 0xb3, 0x01, 0x00, 0xe1, 0x9f, 0x00, 0xbb,</div><div class='add'>+	0x85, 0x30, 0x01, 0x00, 0xe0, 0x9f, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xb8, 0x05, 0x22, 0x45, 0xfd, 0x7f, 0x00, 0x00, 0xe0, 0x15, 0x00, 0x40,</div><div class='add'>+	0x47, 0x99, 0x01, 0x00, 0x1a, 0x00, 0x00, 0xa2, 0x80, 0xdc, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x50, 0xf1, 0xb1, 0x01, 0x00, 0xf0, 0x15, 0x00, 0x40,</div><div class='add'>+	0xf1, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0xca, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x07, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00, 0x20, 0x00, 0x00, 0x40,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0xa7, 0x05, 0xa8, 0xbb, 0xe1, 0x31, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x50, 0x83, 0xb0, 0x01, 0x00, 0xaa, 0x05, 0xa2, 0x41,</div><div class='add'>+	0x83, 0x50, 0x00, 0x00, 0xa9, 0x05, 0xa2, 0xf2, 0x82, 0x30, 0x00, 0x00,</div><div class='add'>+	0x4c, 0x01, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0xb0, 0x05, 0xa2, 0x40,</div><div class='add'>+	0x97, 0x6c, 0x00, 0x00, 0x3a, 0x00, 0x00, 0x40, 0xb3, 0x9b, 0x01, 0x00,</div><div class='add'>+	0xb1, 0x05, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x40, 0x00, 0x00, 0x40,</div><div class='add'>+	0xb3, 0x9b, 0x01, 0x00, 0xf0, 0x15, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00,</div><div class='add'>+	0x10, 0x04, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0xb8, 0x05, 0xa2, 0xfa,</div><div class='add'>+	0xb4, 0x6f, 0x00, 0x00, 0x10, 0x04, 0x00, 0x42, 0xb3, 0x43, 0x01, 0x00,</div><div class='add'>+	0xb8, 0x05, 0xa2, 0xfa, 0xb4, 0x6f, 0x00, 0x00, 0x10, 0x04, 0x00, 0x42,</div><div class='add'>+	0xb3, 0x43, 0x01, 0x00, 0xbb, 0x05, 0x22, 0xfa, 0xb4, 0x6f, 0x00, 0x00,</div><div class='add'>+	0xb8, 0x05, 0x42, 0x40, 0x81, 0x32, 0x20, 0x00, 0x00, 0x00, 0x00, 0x4e,</div><div class='add'>+	0x67, 0x93, 0x21, 0x00, 0xdf, 0x9f, 0x00, 0x58, 0x67, 0x93, 0x20, 0x00,</div><div class='add'>+	0x40, 0x16, 0x00, 0x40, 0x45, 0x99, 0x21, 0x00, 0xdb, 0x9f, 0x00, 0x40,</div><div class='add'>+	0x49, 0x31, 0x21, 0x00, 0xf6, 0x15, 0x00, 0x40, 0x43, 0x99, 0x21, 0x00,</div><div class='add'>+	0x5c, 0x16, 0x00, 0x40, 0x45, 0x99, 0x21, 0x00, 0x00, 0x00, 0x6e, 0xfa,</div><div class='add'>+	0x8e, 0xb0, 0x21, 0x00, 0x00, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xfe, 0xf4, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xf4, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0,</div><div class='add'>+	0xb4, 0xb3, 0x01, 0x00, 0xc9, 0x05, 0xa2, 0x40, 0x8f, 0x6c, 0x00, 0x00,</div><div class='add'>+	0xfc, 0x15, 0x20, 0x20, 0xe1, 0xb1, 0x01, 0x00, 0xce, 0x05, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x24, 0x00, 0xda, 0x9f, 0x00, 0x40, 0x81, 0x32, 0x25, 0x00,</div><div class='add'>+	0xce, 0x05, 0x22, 0x40, 0x97, 0x6c, 0x24, 0x00, 0xcb, 0x05, 0x42, 0x40,</div><div class='add'>+	0x81, 0x32, 0x24, 0x00, 0x00, 0x00, 0x00, 0x4f, 0x67, 0x93, 0x25, 0x00,</div><div class='add'>+	0xdf, 0x9f, 0x00, 0x58, 0x67, 0x93, 0x24, 0x00, 0x38, 0x05, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x25, 0x00, 0x1e, 0x00, 0x00, 0x48, 0xb2, 0xcb, 0x25, 0x00,</div><div class='add'>+	0x10, 0x04, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0xd3, 0x05, 0x22, 0x50,</div><div class='add'>+	0xb5, 0x6f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x91, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x48, 0xb2, 0xcb, 0x01, 0x00, 0xf6, 0x15, 0x00, 0x40,</div><div class='add'>+	0x43, 0x99, 0x01, 0x00, 0x20, 0x04, 0x00, 0xf2, 0xb4, 0x33, 0x01, 0x00,</div><div class='add'>+	0x02, 0x00, 0x00, 0x48, 0xb2, 0xcb, 0x01, 0x00, 0xf8, 0x15, 0x00, 0x40,</div><div class='add'>+	0x43, 0x99, 0x01, 0x00, 0x20, 0x04, 0x00, 0xf2, 0xb4, 0x33, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x48, 0xb2, 0xcb, 0x01, 0x00, 0xfa, 0x15, 0x00, 0x40,</div><div class='add'>+	0x43, 0x99, 0x01, 0x00, 0x20, 0x04, 0x00, 0xf2, 0xb4, 0x33, 0x01, 0x00,</div><div class='add'>+	0x08, 0x00, 0x00, 0x48, 0xb2, 0xcb, 0x01, 0x00, 0xfc, 0x15, 0x00, 0x40,</div><div class='add'>+	0x43, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x94, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xff, 0xff, 0x00, 0x4a, 0xb4, 0x8b, 0x01, 0x00, 0x20, 0x04, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x0a, 0x00, 0x00, 0x48, 0xb2, 0xcb, 0x01, 0x00,</div><div class='add'>+	0x10, 0x00, 0x00, 0x4a, 0xb4, 0xf7, 0x01, 0x00, 0x20, 0x04, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x38, 0x05, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x1e, 0x00, 0x00, 0x48, 0xb2, 0xcb, 0x01, 0x00, 0x10, 0x04, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0xe9, 0x05, 0x22, 0x50, 0xb5, 0x6f, 0x00, 0x00,</div><div class='add'>+	0xea, 0x05, 0x00, 0x50, 0xb5, 0xb3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0xb5, 0xb3, 0x01, 0x00, 0x20, 0x04, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0xe0, 0x9f, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x16, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00,</div><div class='add'>+	0x30, 0x31, 0x00, 0x40, 0xf5, 0x99, 0x01, 0x00, 0x32, 0x33, 0x00, 0x40,</div><div class='add'>+	0xf5, 0x99, 0x01, 0x00, 0x34, 0x35, 0x00, 0x40, 0xf5, 0x99, 0x01, 0x00,</div><div class='add'>+	0x36, 0x37, 0x00, 0x40, 0xf5, 0x99, 0x01, 0x00, 0x38, 0x39, 0x00, 0x40,</div><div class='add'>+	0xf5, 0x99, 0x01, 0x00, 0x41, 0x42, 0x00, 0x40, 0xf5, 0x99, 0x01, 0x00,</div><div class='add'>+	0x43, 0x44, 0x00, 0x40, 0xf5, 0x99, 0x01, 0x00, 0x45, 0x46, 0x00, 0x40,</div><div class='add'>+	0xf5, 0x99, 0x01, 0x00, 0x47, 0x48, 0x00, 0x40, 0xf5, 0x99, 0x01, 0x00,</div><div class='add'>+	0x49, 0x4a, 0x00, 0x40, 0xf5, 0x99, 0x01, 0x00, 0x2c, 0x00, 0x00, 0x40,</div><div class='add'>+	0x83, 0x98, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0xf7, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xfc, 0x05, 0xa2, 0x41, 0x83, 0x50, 0x00, 0x00, 0x80, 0x16, 0x2e, 0x06,</div><div class='add'>+	0x83, 0xb0, 0x01, 0x00, 0x36, 0x00, 0x00, 0xfb, 0xf6, 0xa9, 0x01, 0x00,</div><div class='add'>+	0xff, 0x05, 0xa2, 0x41, 0x83, 0x50, 0x00, 0x00, 0x22, 0x00, 0x00, 0x40,</div><div class='add'>+	0x83, 0x98, 0x01, 0x00, 0x00, 0x00, 0x00, 0xfb, 0xf6, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x02, 0x06, 0xa2, 0x41, 0x83, 0x50, 0x00, 0x00, 0x62, 0x00, 0x00, 0x40,</div><div class='add'>+	0x95, 0x98, 0x01, 0x00, 0xdc, 0x9f, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x00, 0x16, 0x2d, 0x06, 0x83, 0xb0, 0x01, 0x00, 0x80, 0x16, 0x00, 0x40,</div><div class='add'>+	0x45, 0x99, 0x01, 0x00, 0x5c, 0x00, 0x00, 0xfb, 0xf6, 0xa9, 0x01, 0x00,</div><div class='add'>+	0x08, 0x06, 0xa2, 0x41, 0x83, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70,</div><div class='add'>+	0xf9, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x71, 0xf9, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x72, 0xf9, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x73,</div><div class='add'>+	0xf9, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x74, 0xf9, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x54, 0x00, 0x00, 0x40, 0x95, 0x98, 0x01, 0x00, 0xdc, 0x9f, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0x70, 0x95, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x14, 0x06, 0x22, 0x70, 0xb5, 0x6f, 0x00, 0x00, 0x00, 0x00, 0x80, 0x41,</div><div class='add'>+	0x97, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x80, 0x40, 0x97, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x45, 0x67, 0x00, 0xa6, 0xe0, 0xb2, 0x01, 0x00, 0x01, 0x23, 0x00, 0x70,</div><div class='add'>+	0xe1, 0x9a, 0x01, 0x00, 0xcd, 0xef, 0x00, 0xa6, 0xe2, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x89, 0xab, 0x00, 0x71, 0xe3, 0x9a, 0x01, 0x00, 0xba, 0x98, 0x00, 0xa6,</div><div class='add'>+	0xe4, 0xb2, 0x01, 0x00, 0xfe, 0xdc, 0x00, 0x72, 0xe5, 0x9a, 0x01, 0x00,</div><div class='add'>+	0x32, 0x10, 0x00, 0xa6, 0xe6, 0xb2, 0x01, 0x00, 0x76, 0x54, 0x00, 0x73,</div><div class='add'>+	0xe7, 0x9a, 0x01, 0x00, 0xd2, 0xc3, 0x00, 0xa6, 0xe8, 0xb2, 0x01, 0x00,</div><div class='add'>+	0xf0, 0xe1, 0x00, 0x74, 0xe9, 0x9a, 0x01, 0x00, 0x80, 0x16, 0x00, 0x4a,</div><div class='add'>+	0x44, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x07, 0x81, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4a, 0x80, 0xd0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0xf7, 0xb1, 0x01, 0x00, 0x25, 0x06, 0xa2, 0x41, 0x81, 0x50, 0x00, 0x00,</div><div class='add'>+	0x80, 0x16, 0x00, 0x4a, 0x44, 0xc9, 0x01, 0x00, 0xfc, 0x16, 0x2a, 0x47,</div><div class='add'>+	0xe7, 0xb5, 0x01, 0x00, 0x03, 0x00, 0x00, 0x4a, 0xe8, 0xe5, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x8d, 0xb0, 0x01, 0x00, 0x50, 0x03, 0x00, 0x40,</div><div class='add'>+	0xa3, 0x99, 0x01, 0x00, 0x80, 0x16, 0x3d, 0x46, 0x8d, 0xe0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x50, 0x89, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xfc,</div><div class='add'>+	0x40, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41, 0xa3, 0xc1, 0x01, 0x00,</div><div class='add'>+	0x2e, 0x06, 0xa2, 0x41, 0x89, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70,</div><div class='add'>+	0xeb, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x00, 0x71, 0xed, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x72, 0xef, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x00, 0x73,</div><div class='add'>+	0xf1, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x00, 0x74, 0xf3, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x83, 0xb0, 0x01, 0x00, 0x0f, 0x00, 0x00, 0x41,</div><div class='add'>+	0x80, 0x88, 0x01, 0x00, 0x50, 0x03, 0x00, 0x40, 0xa2, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x4b, 0x06, 0xa0, 0x50, 0x83, 0x6c, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x40,</div><div class='add'>+	0x98, 0xc8, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4f, 0x99, 0x84, 0x01, 0x00,</div><div class='add'>+	0x50, 0x03, 0x00, 0x4c, 0xa2, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x20,</div><div class='add'>+	0x86, 0xb0, 0x01, 0x00, 0x08, 0x00, 0x00, 0x40, 0x98, 0xc8, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4f, 0x99, 0x84, 0x01, 0x00, 0x50, 0x03, 0x00, 0x4c,</div><div class='add'>+	0xa2, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x20, 0x86, 0xa4, 0x01, 0x00,</div><div class='add'>+	0x02, 0x00, 0x00, 0x40, 0x98, 0xc8, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4f,</div><div class='add'>+	0x99, 0x84, 0x01, 0x00, 0x50, 0x03, 0x00, 0x4c, 0xa2, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x20, 0x86, 0xa4, 0x01, 0x00, 0x50, 0x03, 0x00, 0x40,</div><div class='add'>+	0xa2, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x43, 0x40, 0xa4, 0x01, 0x00,</div><div class='add'>+	0x01, 0x00, 0x00, 0x20, 0x88, 0xe4, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5f,</div><div class='add'>+	0x41, 0xf0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44, 0x40, 0x94, 0x01, 0x00,</div><div class='add'>+	0x05, 0x00, 0x00, 0x75, 0x89, 0xe4, 0x01, 0x00, 0x1b, 0x00, 0x00, 0x75,</div><div class='add'>+	0x85, 0xf4, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44, 0x84, 0x94, 0x01, 0x00,</div><div class='add'>+	0x55, 0x06, 0xa3, 0x53, 0x83, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x76,</div><div class='add'>+	0x89, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x77, 0x89, 0x84, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x76, 0x8b, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8b, 0xa4, 0x01, 0x00, 0x00, 0x00, 0x00, 0x78, 0x8b, 0x84, 0x01, 0x00,</div><div class='add'>+	0x64, 0x06, 0x00, 0x45, 0x88, 0x94, 0x00, 0x00, 0x27, 0x00, 0x00, 0x41,</div><div class='add'>+	0x80, 0xce, 0x01, 0x00, 0x5a, 0x06, 0xaa, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x76, 0x89, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x77,</div><div class='add'>+	0x89, 0xa4, 0x01, 0x00, 0x64, 0x06, 0x00, 0x78, 0x89, 0xa4, 0x00, 0x00,</div><div class='add'>+	0x3b, 0x00, 0x00, 0x41, 0x80, 0xce, 0x01, 0x00, 0x57, 0x06, 0xaa, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x76, 0x89, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x77, 0x89, 0x84, 0x01, 0x00, 0x00, 0x00, 0x00, 0x76,</div><div class='add'>+	0x8b, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x78, 0x8b, 0x84, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x45, 0x88, 0x94, 0x01, 0x00, 0x00, 0x00, 0x00, 0x77,</div><div class='add'>+	0x8b, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x78, 0x8b, 0x84, 0x01, 0x00,</div><div class='add'>+	0x64, 0x06, 0x00, 0x45, 0x88, 0x94, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0x84, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x79, 0x85, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x20, 0x84, 0xc0, 0x01, 0x00, 0x6b, 0x06, 0xa3, 0x53,</div><div class='add'>+	0x83, 0x6c, 0x00, 0x00, 0x82, 0x5a, 0x00, 0xa6, 0x84, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x99, 0x79, 0x00, 0x42, 0x84, 0xc8, 0x01, 0x00, 0x78, 0x06, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x27, 0x00, 0x00, 0x41, 0x80, 0xce, 0x01, 0x00,</div><div class='add'>+	0x70, 0x06, 0xaa, 0x40, 0x81, 0x32, 0x00, 0x00, 0xd9, 0x6e, 0x00, 0xa6,</div><div class='add'>+	0x84, 0xc0, 0x01, 0x00, 0xa1, 0xeb, 0x00, 0x42, 0x84, 0xc8, 0x01, 0x00,</div><div class='add'>+	0x78, 0x06, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x3b, 0x00, 0x00, 0x41,</div><div class='add'>+	0x80, 0xce, 0x01, 0x00, 0x75, 0x06, 0xaa, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x1b, 0x8f, 0x00, 0xa6, 0x84, 0xc0, 0x01, 0x00, 0xdc, 0xbc, 0x00, 0x42,</div><div class='add'>+	0x84, 0xc8, 0x01, 0x00, 0x78, 0x06, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x62, 0xca, 0x00, 0xa6, 0x84, 0xc0, 0x01, 0x00, 0xd6, 0xc1, 0x00, 0x42,</div><div class='add'>+	0x84, 0xc8, 0x01, 0x00, 0x78, 0x06, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x78, 0xf3, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x00, 0x77,</div><div class='add'>+	0xf1, 0xb2, 0x01, 0x00, 0x1e, 0x00, 0x00, 0x76, 0x89, 0xe4, 0x01, 0x00,</div><div class='add'>+	0x02, 0x00, 0x00, 0x76, 0xef, 0xf6, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0xee, 0x96, 0x01, 0x00, 0x00, 0x00, 0x00, 0x75, 0xed, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x42, 0xea, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x83, 0xc0, 0x01, 0x00, 0x4f, 0x00, 0x00, 0x41, 0x80, 0xce, 0x01, 0x00,</div><div class='add'>+	0x37, 0x06, 0x2a, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x75,</div><div class='add'>+	0xe1, 0xc2, 0x01, 0x00, 0x00, 0x00, 0x00, 0x76, 0xe3, 0xc2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x77, 0xe5, 0xc2, 0x01, 0x00, 0x00, 0x00, 0x00, 0x78,</div><div class='add'>+	0xe7, 0xc2, 0x01, 0x00, 0x00, 0x00, 0x00, 0x79, 0xe9, 0xc2, 0x01, 0x00,</div><div class='add'>+	0x2b, 0x06, 0x81, 0x41, 0x8d, 0x40, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x50, 0xfd, 0x93, 0x01, 0x00, 0x40, 0x16, 0x00, 0x40,</div><div class='add'>+	0x45, 0x99, 0x01, 0x00, 0xdb, 0x9f, 0x00, 0x40, 0x49, 0x31, 0x01, 0x00,</div><div class='add'>+	0x08, 0x00, 0x00, 0x48, 0xb2, 0xcb, 0x01, 0x00, 0x15, 0x04, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0xb9, 0x06, 0x22, 0x40, 0x8f, 0x6c, 0x00, 0x00,</div><div class='add'>+	0xda, 0x9f, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0xb9, 0x06, 0xa2, 0x40,</div><div class='add'>+	0x97, 0x6c, 0x00, 0x00, 0x5e, 0x16, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00,</div><div class='add'>+	0x7c, 0x16, 0x20, 0xf6, 0xe0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x31, 0xb3, 0x01, 0x00, 0x9d, 0x06, 0x22, 0x4f, 0x8f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x51, 0xfd, 0x93, 0x01, 0x00, 0x9f, 0x06, 0x22, 0x40,</div><div class='add'>+	0x8f, 0x7c, 0x00, 0x00, 0xa3, 0x06, 0x00, 0x54, 0xfd, 0x93, 0x00, 0x00,</div><div class='add'>+	0xa1, 0x06, 0x22, 0x42, 0x8f, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x52,</div><div class='add'>+	0xfd, 0x93, 0x01, 0x00, 0xa3, 0x06, 0x22, 0x41, 0x8f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x53, 0xfd, 0x93, 0x01, 0x00, 0xb7, 0x06, 0x22, 0x51,</div><div class='add'>+	0xfd, 0x7f, 0x00, 0x00, 0x38, 0x05, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x0c, 0x00, 0x00, 0x48, 0xb2, 0xcb, 0x01, 0x00, 0x10, 0x04, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0xb2, 0x06, 0xa2, 0x40, 0xb5, 0x6f, 0x00, 0x00,</div><div class='add'>+	0x1e, 0x00, 0x00, 0x48, 0xb2, 0xcb, 0x01, 0x00, 0x10, 0x04, 0x00, 0x48,</div><div class='add'>+	0x96, 0x30, 0x01, 0x00, 0x00, 0x00, 0x00, 0xda, 0x97, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x4b, 0xb2, 0xcb, 0x01, 0x00, 0x10, 0x04, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x0e, 0x00, 0x00, 0x48, 0xb2, 0xcb, 0x01, 0x00,</div><div class='add'>+	0x20, 0x04, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x0c, 0x00, 0x00, 0x48,</div><div class='add'>+	0xb2, 0xcb, 0x01, 0x00, 0x00, 0x00, 0x00, 0x30, 0xb5, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x20, 0x04, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x0e, 0x00, 0x00, 0x48,</div><div class='add'>+	0xb2, 0xcb, 0x01, 0x00, 0x10, 0x04, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0xb6, 0x06, 0x22, 0x40, 0xb5, 0x6f, 0x00, 0x00, 0xba, 0x06, 0x00, 0x54,</div><div class='add'>+	0xfd, 0x93, 0x00, 0x00, 0x00, 0x00, 0x00, 0x51, 0xfd, 0x83, 0x01, 0x00,</div><div class='add'>+	0x1c, 0x00, 0x00, 0xfe, 0x7f, 0xd9, 0x01, 0x00, 0xba, 0x06, 0xa6, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0xfd, 0x93, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xe7, 0x9f, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0xc4, 0x06, 0x22, 0x5c,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0xe3, 0x9f, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xe9, 0x9f, 0x00, 0x5c, 0x1f, 0x00, 0x01, 0x00, 0x00, 0x00, 0x2e, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0xe1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x2d, 0x03, 0x48, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0,</div><div class='add'>+	0x3c, 0xb0, 0x01, 0x00, 0x28, 0x00, 0x00, 0x14, 0x02, 0xc8, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x01, 0x34, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x2d, 0x05,</div><div class='add'>+	0x32, 0xb0, 0x01, 0x00, 0x22, 0x00, 0x00, 0x05, 0x0a, 0xc8, 0x01, 0x00,</div><div class='add'>+	0x10, 0x00, 0x00, 0x03, 0x48, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8,</div><div class='add'>+	0x18, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x04, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf8, 0x0e, 0xb0, 0x01, 0x00, 0x0c, 0x00, 0x00, 0xa4,</div><div class='add'>+	0x0c, 0xc8, 0x01, 0x00, 0xea, 0x9f, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x23, 0xb0, 0x01, 0x00, 0x0a, 0x07, 0x22, 0x01,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x44, 0x23, 0xe0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x2e, 0xa4, 0x80, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x10,</div><div class='add'>+	0x48, 0xc1, 0x01, 0x00, 0xd9, 0x06, 0xa3, 0x07, 0x02, 0x6c, 0x00, 0x00,</div><div class='add'>+	0xda, 0x06, 0x68, 0x01, 0x1a, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x68, 0x07,</div><div class='add'>+	0x1a, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x0d, 0x02, 0xd0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x05, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x0c,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x02, 0xe0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x0d, 0x0a, 0xc0, 0x01, 0x00, 0xec, 0x06, 0x22, 0x40,</div><div class='add'>+	0x03, 0x6c, 0x00, 0x00, 0xe6, 0x06, 0x22, 0x42, 0x23, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x23, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x47,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x20, 0x00, 0x00, 0xa4, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0x23, 0x07, 0x28, 0x40, 0x81, 0x32, 0x00, 0x00, 0xe3, 0x06, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x80, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x47, 0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x62, 0xb1, 0x01, 0x00, 0xe8, 0x06, 0xa8, 0x40, 0x23, 0x30, 0x00, 0x00,</div><div class='add'>+	0xe3, 0x9f, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x23, 0x07, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x80, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x47, 0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x62, 0xb1, 0x01, 0x00, 0xee, 0x06, 0xa8, 0x40, 0x23, 0x30, 0x00, 0x00,</div><div class='add'>+	0xe3, 0x9f, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x22, 0x00, 0x00, 0x19,</div><div class='add'>+	0x48, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x2d, 0x14, 0x48, 0xc1, 0x01, 0x00,</div><div class='add'>+	0x0f, 0x00, 0x00, 0xf2, 0x3a, 0x88, 0x01, 0x00, 0x00, 0x00, 0x00, 0x42,</div><div class='add'>+	0x3b, 0xe0, 0x01, 0x00, 0x0e, 0x00, 0x00, 0x14, 0x02, 0xc8, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x1d, 0x02, 0xc0, 0x01, 0x00, 0xfa, 0x06, 0x23, 0x1a,</div><div class='add'>+	0x02, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46, 0x03, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x23, 0x07, 0x00, 0x01, 0x34, 0xc0, 0x00, 0x00, 0x0c, 0x00, 0x2d, 0x1d,</div><div class='add'>+	0x48, 0xc1, 0x01, 0x00, 0xf0, 0x00, 0x00, 0xf2, 0x30, 0x88, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x42, 0x31, 0xf0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x14,</div><div class='add'>+	0x02, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x1d, 0x02, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x18, 0x02, 0xc0, 0x01, 0x00, 0x02, 0x07, 0x22, 0x1a,</div><div class='add'>+	0x02, 0x50, 0x00, 0x00, 0x23, 0x07, 0x00, 0x01, 0x34, 0xc0, 0x00, 0x00,</div><div class='add'>+	0x22, 0x00, 0x00, 0x19, 0x48, 0xc9, 0x01, 0x00, 0x02, 0x00, 0x2d, 0x14,</div><div class='add'>+	0x48, 0xc1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf6, 0x14, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x1d, 0x14, 0xd0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x18,</div><div class='add'>+	0x14, 0xd0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x24, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x12, 0x00, 0x00, 0x17, 0x10, 0xc8, 0x01, 0x00, 0x23, 0x07, 0x00, 0x1a,</div><div class='add'>+	0x10, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x44, 0x23, 0xe0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xa4, 0x86, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x2e, 0x10,</div><div class='add'>+	0x48, 0xc1, 0x01, 0x00, 0x0f, 0x07, 0xa3, 0x12, 0x0e, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x10, 0x07, 0x60, 0x07, 0x1a, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x60, 0x12,</div><div class='add'>+	0x1a, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x68, 0x0d, 0x16, 0x94, 0x01, 0x00,</div><div class='add'>+	0xff, 0xff, 0x00, 0x0b, 0x16, 0xd8, 0x01, 0x00, 0x00, 0x00, 0x00, 0x08,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x0c, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x02, 0xe0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x10,</div><div class='add'>+	0x86, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x46, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x20, 0x00, 0x00, 0x43, 0x62, 0xdd, 0x01, 0x00, 0x17, 0x07, 0xa8, 0x5c,</div><div class='add'>+	0x1f, 0x10, 0x00, 0x00, 0x40, 0x07, 0x22, 0x0d, 0x14, 0x50, 0x00, 0x00,</div><div class='add'>+	0x40, 0x07, 0x22, 0x0d, 0x24, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0d,</div><div class='add'>+	0x10, 0xc0, 0x01, 0x00, 0x1e, 0x07, 0x22, 0x42, 0x23, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x23, 0x07, 0x00, 0x41, 0x23, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0x1f, 0x07, 0xa8, 0x5c, 0x1f, 0x00, 0x00, 0x00, 0xe3, 0x9f, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x23, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x3f, 0x07, 0xa2, 0x0d, 0x0e, 0x50, 0x00, 0x00, 0x2e, 0x07, 0x22, 0x46,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46, 0x1f, 0x80, 0x01, 0x00,</div><div class='add'>+	0x30, 0x80, 0x00, 0x10, 0x42, 0xc9, 0x01, 0x00, 0x2c, 0x07, 0x22, 0xf2,</div><div class='add'>+	0x64, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x47, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00, 0x29, 0x07, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0xe3, 0x9f, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x20, 0x80, 0x00, 0x03, 0x46, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5f,</div><div class='add'>+	0xe1, 0x91, 0x01, 0x00, 0x00, 0x00, 0x2d, 0x06, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf8, 0x18, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8,</div><div class='add'>+	0x04, 0xb0, 0x01, 0x00, 0x33, 0x07, 0x1f, 0xf0, 0x0e, 0x30, 0x00, 0x00,</div><div class='add'>+	0xd3, 0x06, 0x00, 0x4c, 0x0d, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x2e, 0x5f,</div><div class='add'>+	0x0f, 0x80, 0x01, 0x00, 0xd3, 0x06, 0x23, 0x07, 0x14, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x30, 0x00, 0x00, 0x10, 0x48, 0xc9, 0x01, 0x00, 0x24, 0x00, 0x00, 0x40,</div><div class='add'>+	0xf1, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x03, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x16,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x24, 0x00, 0x00, 0x00, 0x00, 0xc8, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x47, 0x61, 0xb1, 0x01, 0x00, 0x20, 0x00, 0x00, 0xa4,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x3c, 0x07, 0xa8, 0x46, 0x1f, 0x10, 0x00, 0x00,</div><div class='add'>+	0xd3, 0x06, 0x00, 0x03, 0x0c, 0xb0, 0x00, 0x00, 0xd3, 0x06, 0x00, 0x0d,</div><div class='add'>+	0x18, 0xc0, 0x00, 0x00, 0x5f, 0x07, 0xa2, 0x44, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x19, 0x0a, 0xb0, 0x01, 0x00, 0x22, 0x00, 0x00, 0x05,</div><div class='add'>+	0x48, 0xc9, 0x01, 0x00, 0x0a, 0x00, 0x2d, 0x14, 0x48, 0xc1, 0x01, 0x00,</div><div class='add'>+	0x02, 0x00, 0x20, 0x40, 0xe5, 0xb1, 0x01, 0x00, 0x04, 0x00, 0x20, 0x40,</div><div class='add'>+	0xe5, 0xb1, 0x01, 0x00, 0x0d, 0x00, 0x2d, 0x1d, 0x48, 0xc1, 0x01, 0x00,</div><div class='add'>+	0x09, 0x00, 0x00, 0xf3, 0x38, 0x88, 0x01, 0x00, 0x0d, 0x00, 0x20, 0x50,</div><div class='add'>+	0xe7, 0xb1, 0x01, 0x00, 0x04, 0x00, 0x2d, 0x40, 0x3f, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf4, 0x32, 0xb0, 0x01, 0x00, 0x04, 0x00, 0x20, 0x40,</div><div class='add'>+	0xe1, 0xb1, 0x01, 0x00, 0x22, 0x00, 0x00, 0x05, 0x48, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x2d, 0x14, 0x48, 0xc1, 0x01, 0x00, 0x02, 0x00, 0x00, 0x1d,</div><div class='add'>+	0x94, 0xf4, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x91, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x52, 0x07, 0xa0, 0xfc, 0x90, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x91, 0xc0, 0x01, 0x00, 0x50, 0x07, 0xa2, 0x41, 0x95, 0x50, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xa4, 0x96, 0xb0, 0x01, 0x00, 0x04, 0x00, 0x2e, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x48, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4b, 0x48, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x18,</div><div class='add'>+	0x48, 0xc1, 0x01, 0x00, 0x02, 0x00, 0x00, 0x18, 0x94, 0xf4, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x2d, 0x18, 0x90, 0xb0, 0x01, 0x00, 0x5c, 0x07, 0xa0, 0xfc,</div><div class='add'>+	0x90, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x91, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x5a, 0x07, 0xa2, 0x41, 0x95, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x48,</div><div class='add'>+	0xe0, 0xb1, 0x01, 0x00, 0x10, 0x00, 0x20, 0x40, 0xe5, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x2d, 0x05, 0x48, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8,</div><div class='add'>+	0x80, 0xb0, 0x2d, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x16, 0xb0, 0x2d, 0x00,</div><div class='add'>+	0x22, 0x00, 0x00, 0x05, 0x48, 0xc9, 0x2d, 0x00, 0x00, 0x00, 0x00, 0x14,</div><div class='add'>+	0x48, 0xc1, 0x2d, 0x00, 0x64, 0x07, 0x43, 0x30, 0x3d, 0x07, 0x2c, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x9e, 0x85, 0xb0, 0x2d, 0x00, 0x00, 0x00, 0x1b, 0x41,</div><div class='add'>+	0x3d, 0xc3, 0x2d, 0x00, 0x04, 0x00, 0x20, 0x42, 0xec, 0xb1, 0x2d, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x1e, 0x82, 0xb0, 0x01, 0x00, 0x02, 0x00, 0x2e, 0x1d,</div><div class='add'>+	0x82, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x66, 0x18, 0x82, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x42, 0x80, 0xc0, 0x01, 0x00, 0x6e, 0x07, 0xa0, 0x41,</div><div class='add'>+	0x80, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x81, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x10, 0x00, 0x00, 0x40, 0x92, 0xf4, 0x01, 0x00, 0x0a, 0x00, 0x2e, 0x30,</div><div class='add'>+	0x81, 0x84, 0x01, 0x00, 0x72, 0x07, 0x90, 0x40, 0x92, 0x40, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x93, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x66, 0x20,</div><div class='add'>+	0x93, 0xa4, 0x01, 0x00, 0x00, 0x00, 0x00, 0x1d, 0x48, 0xc1, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x20, 0x19, 0xe8, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x1e,</div><div class='add'>+	0x16, 0xc0, 0x01, 0x00, 0x78, 0x07, 0xa0, 0x19, 0x16, 0x44, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x17, 0xc0, 0x01, 0x00, 0x0d, 0x00, 0x2f, 0x1e,</div><div class='add'>+	0x32, 0xc0, 0x01, 0x00, 0x7d, 0x07, 0xa2, 0x40, 0x15, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x7c, 0x07, 0xa0, 0x1c, 0x16, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x17, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x63, 0xf3, 0x38, 0x94, 0x01, 0x00,</div><div class='add'>+	0x10, 0x00, 0x00, 0x05, 0x48, 0xc9, 0x01, 0x00, 0x04, 0x00, 0x2e, 0x1e,</div><div class='add'>+	0x98, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x60, 0x1a, 0x98, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x0c, 0x00, 0x20, 0x40, 0xe1, 0xb1, 0x01, 0x00, 0x8b, 0x07, 0x22, 0x46,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46, 0x1f, 0x80, 0x01, 0x00,</div><div class='add'>+	0x30, 0x80, 0x00, 0x10, 0x42, 0xc9, 0x01, 0x00, 0x89, 0x07, 0x22, 0xf2,</div><div class='add'>+	0x64, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x47, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00, 0x86, 0x07, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0xe3, 0x9f, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x20, 0x80, 0x00, 0x03, 0x46, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5f,</div><div class='add'>+	0xe1, 0x91, 0x01, 0x00, 0x30, 0x80, 0x00, 0x10, 0x44, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x12, 0x00, 0x00, 0x1a, 0xf0, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x17,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x10, 0x00, 0x00, 0x05, 0xe0, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x30, 0x00, 0x00, 0x10, 0x80, 0xc8, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x20, 0x00, 0x00, 0x40, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0x91, 0x07, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0x9b, 0x07, 0x22, 0x5c,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x44, 0x23, 0xe0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x2d, 0x10, 0x48, 0xc1, 0x01, 0x00, 0x9b, 0x07, 0x22, 0xf2,</div><div class='add'>+	0x64, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00, 0x98, 0x07, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0xe3, 0x9f, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xeb, 0x9f, 0x00, 0x5c, 0x1f, 0x00, 0x01, 0x00, 0x20, 0x00, 0x2f, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x0b, 0xe4, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x50, 0x17, 0xf0, 0x01, 0x00, 0xa1, 0x07, 0x90, 0xf2,</div><div class='add'>+	0x16, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x17, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x66, 0x20, 0x17, 0xa4, 0x01, 0x00, 0x10, 0x00, 0x00, 0x14,</div><div class='add'>+	0x2a, 0xc8, 0x01, 0x00, 0x00, 0x00, 0x00, 0x1d, 0x2a, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x50, 0x2b, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf2,</div><div class='add'>+	0x2a, 0x94, 0x01, 0x00, 0x30, 0x80, 0x00, 0x10, 0x42, 0xc9, 0x01, 0x00,</div><div class='add'>+	0xac, 0x07, 0x22, 0xf2, 0x64, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0xa9, 0x07, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0xe3, 0x9f, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x00, 0x80, 0x00, 0x17, 0x10, 0xdc, 0x01, 0x00,</div><div class='add'>+	0xc9, 0x07, 0x22, 0x40, 0x15, 0x6c, 0x00, 0x00, 0xb4, 0x07, 0xa2, 0x44,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x1f, 0x90, 0x01, 0x00,</div><div class='add'>+	0xb3, 0x07, 0x22, 0x9f, 0x13, 0x6c, 0x00, 0x00, 0x02, 0x00, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xcc, 0x01, 0x00, 0xe4, 0x9f, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x3f, 0xc3, 0x01, 0x00, 0xe6, 0x9f, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0xb7, 0x07, 0xa2, 0x41, 0x87, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x1e, 0x3e, 0xc0, 0x01, 0x00, 0xc9, 0x07, 0x22, 0x40,</div><div class='add'>+	0x15, 0x6c, 0x00, 0x00, 0xba, 0x07, 0x20, 0x1e, 0x14, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x0a, 0x3c, 0xb0, 0x01, 0x00, 0xe5, 0x9f, 0x00, 0x1e,</div><div class='add'>+	0x24, 0x30, 0x01, 0x00, 0xbf, 0x07, 0x22, 0x08, 0x2e, 0x30, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x52, 0x11, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x1a,</div><div class='add'>+	0x10, 0xc0, 0x01, 0x00, 0x23, 0x07, 0x00, 0x40, 0x17, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xe4, 0x9f, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0xe5, 0x9f, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0xbc, 0x07, 0xa2, 0x08, 0x2e, 0x30, 0x00, 0x00,</div><div class='add'>+	0x80, 0x80, 0x00, 0xa6, 0x04, 0xb0, 0x01, 0x00, 0x06, 0x00, 0x00, 0x40,</div><div class='add'>+	0x87, 0x98, 0x01, 0x00, 0x00, 0x80, 0x00, 0x03, 0x44, 0x99, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x22, 0x04, 0xe0, 0x31, 0x00, 0x00, 0xe8, 0x9f, 0x00, 0x1f,</div><div class='add'>+	0x8c, 0x30, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x0f, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xe2, 0x9f, 0x00, 0x5c, 0x1f, 0x90, 0x00, 0x00, 0x00, 0x80, 0x00, 0x03,</div><div class='add'>+	0x44, 0x99, 0x01, 0x00, 0x04, 0x00, 0x22, 0x04, 0xe0, 0x31, 0x00, 0x00,</div><div class='add'>+	0xe6, 0x9f, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0xce, 0x07, 0xa2, 0x41,</div><div class='add'>+	0x87, 0x7c, 0x00, 0x00, 0xcf, 0x07, 0x00, 0x1e, 0x3e, 0xc0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x1f, 0x8c, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x05, 0xb0, 0x01, 0x00, 0xe8, 0x9f, 0x00, 0x40, 0x0f, 0x30, 0x01, 0x00,</div><div class='add'>+	0xe2, 0x9f, 0x00, 0x5c, 0x1f, 0x90, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0xf7, 0x07, 0x00, 0xbc, 0x80, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x03, 0x80, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x03, 0x80, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x03, 0x80, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x03, 0x80, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x03, 0x80, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x03, 0x80, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x03, 0x80, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x03, 0x80, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+	0x31, 0x80, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x34, 0x80, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x35, 0x80, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x1b, 0x80, 0x81, 0x80,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0xe4, 0x87, 0xa2, 0x40, 0x91, 0x6f, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4c, 0x90, 0xb3, 0x01, 0x00, 0x5c, 0x95, 0x2e, 0xa2,</div><div class='add'>+	0x80, 0xb0, 0x01, 0x00, 0xff, 0x00, 0x00, 0x80, 0xf4, 0x89, 0x01, 0x00,</div><div class='add'>+	0x90, 0x95, 0x2a, 0xc8, 0xe5, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xa1,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xa4, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd0,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd1, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xd2, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4c,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd4, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xd3, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xee,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4e, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x44, 0xb1, 0x01, 0x00, 0x18, 0x80, 0x11, 0x81,</div><div class='add'>+	0x98, 0x30, 0x00, 0x00, 0x00, 0x00, 0x51, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x1a, 0x80, 0x11, 0x82, 0x98, 0x30, 0x00, 0x00, 0x00, 0x00, 0x52, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0xe4, 0x87, 0x00, 0x48, 0xfd, 0x93, 0x00, 0x00,</div><div class='add'>+	0xb6, 0x03, 0x00, 0x40, 0xa1, 0x99, 0x01, 0x00, 0x23, 0x80, 0xa2, 0x42,</div><div class='add'>+	0xfd, 0x7f, 0x00, 0x00, 0x20, 0x80, 0x00, 0x80, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x22, 0x80, 0x11, 0x81, 0x82, 0x30, 0x00, 0x00, 0x22, 0x80, 0x51, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x22, 0x80, 0x11, 0x82, 0x82, 0x30, 0x00, 0x00,</div><div class='add'>+	0x22, 0x80, 0x52, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x2c, 0x80, 0x00, 0x48,</div><div class='add'>+	0xfd, 0x93, 0x00, 0x00, 0x27, 0x80, 0x00, 0x80, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x26, 0x80, 0xa2, 0x53, 0x07, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x51, 0x53,</div><div class='add'>+	0x07, 0x90, 0x01, 0x00, 0x2a, 0x80, 0x00, 0x52, 0x07, 0x90, 0x00, 0x00,</div><div class='add'>+	0x29, 0x80, 0xa2, 0x52, 0x07, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x52, 0x52,</div><div class='add'>+	0x07, 0x90, 0x01, 0x00, 0x00, 0x00, 0x00, 0x53, 0x07, 0x90, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x48, 0xfd, 0x93, 0x01, 0x00, 0x00, 0x00, 0x00, 0x46,</div><div class='add'>+	0xf3, 0x93, 0x01, 0x00, 0x5c, 0x95, 0x2e, 0xa2, 0x52, 0xb3, 0x01, 0x00,</div><div class='add'>+	0xff, 0x00, 0x00, 0x80, 0xf4, 0x89, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4c,</div><div class='add'>+	0xe4, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xa9, 0x45, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x30, 0x80, 0x00, 0x4c, 0x80, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x45, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x55, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0xc6, 0x82, 0x05, 0x40, 0x49, 0xb1, 0x00, 0x00, 0xc6, 0x82, 0x05, 0x40,</div><div class='add'>+	0x49, 0xb1, 0x00, 0x00, 0x00, 0x00, 0x05, 0x40, 0x49, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x4c, 0x01, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4b,</div><div class='add'>+	0xde, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0xfd, 0x93, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x48, 0xfd, 0x83, 0x01, 0x00, 0x02, 0x00, 0x00, 0x40,</div><div class='add'>+	0x9b, 0x9b, 0x01, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x9c, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x48, 0x03, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x58, 0x95, 0x20, 0x44,</div><div class='add'>+	0xe0, 0xb1, 0x01, 0x00, 0x04, 0x94, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf2, 0x24, 0xb1, 0x01, 0x00, 0x00, 0x0c, 0x00, 0xee,</div><div class='add'>+	0x96, 0x88, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4a, 0x97, 0xf0, 0x01, 0x00,</div><div class='add'>+	0x44, 0x80, 0xa2, 0x43, 0x97, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42,</div><div class='add'>+	0xfd, 0x93, 0x01, 0x00, 0x00, 0xc0, 0x00, 0xa6, 0x36, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xd0, 0x14, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00, 0x05, 0x00, 0x00, 0x40,</div><div class='add'>+	0xf5, 0x99, 0x01, 0x00, 0x00, 0x38, 0x00, 0x40, 0xf5, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x06, 0x00, 0x40, 0xf5, 0x99, 0x01, 0x00, 0x03, 0x00, 0x00, 0x40,</div><div class='add'>+	0xf5, 0x99, 0x01, 0x00, 0x05, 0x10, 0x00, 0x40, 0xf5, 0x99, 0x01, 0x00,</div><div class='add'>+	0x02, 0x09, 0x00, 0x40, 0xf5, 0x99, 0x01, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0xf5, 0x99, 0x01, 0x00, 0x60, 0x03, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x88, 0x03, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0xa0, 0x03, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0xb9, 0x82, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0xb1, 0x82, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x60, 0x95, 0x20, 0x40,</div><div class='add'>+	0xe1, 0xb1, 0x01, 0x00, 0x70, 0x95, 0x20, 0x40, 0xe1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x49, 0xdd, 0x91, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x91, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x7b, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x99, 0x98, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x85, 0xb3, 0x01, 0x00, 0x5c, 0x95, 0x20, 0x40, 0xe1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x3c, 0x82, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x90, 0x06, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5f, 0x2f, 0x81, 0x01, 0x00,</div><div class='add'>+	0xa2, 0x81, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x9e, 0x98, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x45, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x55, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x01, 0x83, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x28, 0x00, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00,</div><div class='add'>+	0xc6, 0x82, 0x00, 0x41, 0xe1, 0xc1, 0x00, 0x00, 0x78, 0x18, 0x00, 0x40,</div><div class='add'>+	0x49, 0x99, 0x01, 0x00, 0x19, 0x05, 0x22, 0x54, 0x81, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x6c, 0x80, 0x42, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x82, 0x00, 0xb4,</div><div class='add'>+	0x69, 0xdf, 0x01, 0x00, 0x00, 0x00, 0x1a, 0x44, 0x93, 0x93, 0x01, 0x00,</div><div class='add'>+	0x28, 0x00, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00, 0x18, 0x05, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x55, 0x82, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x7d, 0x80, 0x22, 0x40,</div><div class='add'>+	0x97, 0x6c, 0x00, 0x00, 0x7a, 0x80, 0x42, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4f, 0x69, 0x93, 0x01, 0x00, 0x43, 0x81, 0x00, 0x58,</div><div class='add'>+	0x69, 0x93, 0x00, 0x00, 0x54, 0x16, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xfe, 0xf4, 0xb1, 0x01, 0x00, 0x80, 0x05, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x80, 0x80, 0x42, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4e, 0x69, 0x93, 0x01, 0x00, 0x43, 0x81, 0x00, 0x58,</div><div class='add'>+	0x69, 0x93, 0x00, 0x00, 0x40, 0x16, 0x00, 0x40, 0x45, 0x99, 0x01, 0x00,</div><div class='add'>+	0x40, 0x05, 0x00, 0x40, 0x49, 0x31, 0x01, 0x00, 0xf6, 0x15, 0x00, 0x40,</div><div class='add'>+	0x43, 0x99, 0x01, 0x00, 0x5c, 0x16, 0x00, 0x40, 0x45, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x6e, 0xfa, 0x8e, 0xb0, 0x01, 0x00, 0xc1, 0x05, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x96, 0x80, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x55, 0x82, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x96, 0x80, 0x22, 0x40, 0x97, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x93, 0x80, 0x42, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4f,</div><div class='add'>+	0x69, 0x93, 0x01, 0x00, 0x43, 0x81, 0x00, 0x58, 0x69, 0x93, 0x00, 0x00,</div><div class='add'>+	0x38, 0x05, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x1e, 0x00, 0x00, 0x48,</div><div class='add'>+	0xb2, 0xcb, 0x01, 0x00, 0xd0, 0x05, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x83, 0x02, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0xb8, 0x02, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xd4, 0x9f, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xd5, 0x9f, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0xd6, 0x9f, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xd7, 0x9f, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x72, 0x01, 0x00, 0x41,</div><div class='add'>+	0x81, 0xc0, 0x00, 0x00, 0x55, 0x01, 0x51, 0x49, 0xfd, 0x93, 0x00, 0x00,</div><div class='add'>+	0x55, 0x01, 0x52, 0x4a, 0xfd, 0x93, 0x00, 0x00, 0x55, 0x01, 0x55, 0x49,</div><div class='add'>+	0xfd, 0x83, 0x00, 0x00, 0x55, 0x01, 0x56, 0x4a, 0xfd, 0x83, 0x00, 0x00,</div><div class='add'>+	0x50, 0x01, 0x91, 0x81, 0x80, 0x30, 0x00, 0x00, 0x55, 0x01, 0x45, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x50, 0x01, 0x91, 0x82, 0x80, 0x30, 0x00, 0x00,</div><div class='add'>+	0x55, 0x01, 0x46, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x89, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x80, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf0, 0x16, 0xb0, 0x01, 0x00, 0x22, 0x00, 0x00, 0x05,</div><div class='add'>+	0x48, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x14, 0x48, 0xc1, 0x01, 0x00,</div><div class='add'>+	0xb4, 0x80, 0x43, 0x30, 0x3d, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9e,</div><div class='add'>+	0x85, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x1b, 0x41, 0x3d, 0xc3, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x20, 0x42, 0xec, 0xb1, 0x01, 0x00, 0x00, 0x00, 0xa2, 0x40,</div><div class='add'>+	0x91, 0x6f, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x49, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xae, 0x03, 0x00, 0xcb, 0xa3, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x20,</div><div class='add'>+	0x46, 0xb1, 0x01, 0x00, 0xc4, 0x80, 0xa2, 0x40, 0xe1, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xd2, 0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd3,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x42, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x45, 0x61, 0xb1, 0x01, 0x00, 0x20, 0x00, 0x00, 0x20,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x00, 0x00, 0xa8, 0xd0, 0xe1, 0xb1, 0x00, 0x00,</div><div class='add'>+	0xc1, 0x80, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa8,</div><div class='add'>+	0x98, 0xb0, 0x01, 0x00, 0x04, 0x80, 0x00, 0x40, 0x8b, 0xb3, 0x00, 0x00,</div><div class='add'>+	0xb1, 0x03, 0x00, 0x40, 0xa1, 0x99, 0x01, 0x00, 0xc9, 0x80, 0xa2, 0x42,</div><div class='add'>+	0x97, 0x6f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x45, 0xa1, 0xc1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x80, 0xb0, 0x01, 0x00, 0x00, 0x00, 0xa2, 0x04,</div><div class='add'>+	0x80, 0x94, 0x00, 0x00, 0x80, 0x15, 0x3f, 0x42, 0x97, 0xe3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x49, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x60, 0x03,</div><div class='add'>+	0x02, 0x94, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x07, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0xcb, 0x99, 0xcb, 0x01, 0x00, 0x00, 0x00, 0x00, 0xcc,</div><div class='add'>+	0xf3, 0x83, 0x01, 0x00, 0xd3, 0x80, 0xa2, 0x42, 0x97, 0x6f, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xcb, 0xf3, 0x93, 0x01, 0x00, 0xae, 0x03, 0x00, 0xcb,</div><div class='add'>+	0xa3, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x20, 0x44, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x44, 0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x04, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xa1, 0xe0, 0xb1, 0x01, 0x00, 0x05, 0x00, 0x00, 0x40,</div><div class='add'>+	0x61, 0x99, 0x01, 0x00, 0x20, 0x00, 0x00, 0x20, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0xda, 0x80, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0xf9, 0x02, 0x00, 0x20,</div><div class='add'>+	0x42, 0x31, 0x01, 0x00, 0x00, 0x00, 0xa2, 0x41, 0x05, 0x6c, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0xcb, 0xdb, 0x91, 0x01, 0x00, 0x00, 0x00, 0x19, 0x41,</div><div class='add'>+	0x8b, 0xb3, 0x01, 0x00, 0x60, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00,</div><div class='add'>+	0xe0, 0x80, 0xa8, 0xb1, 0x8c, 0x33, 0x00, 0x00, 0x60, 0x00, 0x00, 0x40,</div><div class='add'>+	0x61, 0x99, 0x01, 0x00, 0xe2, 0x80, 0xa8, 0xb1, 0x94, 0x33, 0x00, 0x00,</div><div class='add'>+	0xe8, 0x80, 0x14, 0xc6, 0x81, 0x32, 0x00, 0x00, 0x18, 0x00, 0x00, 0xc6,</div><div class='add'>+	0x83, 0xf4, 0x01, 0x00, 0x22, 0x83, 0x22, 0x4f, 0x83, 0x04, 0x00, 0x00,</div><div class='add'>+	0xc4, 0x80, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xff, 0x01, 0x00, 0xc6,</div><div class='add'>+	0x81, 0x88, 0x01, 0x00, 0x00, 0x00, 0x00, 0xc6, 0x97, 0xa3, 0x01, 0x00,</div><div class='add'>+	0xc4, 0x80, 0x1f, 0x5c, 0x97, 0x53, 0x00, 0x00, 0x6d, 0x82, 0x1e, 0xc6,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0xf2, 0x80, 0x22, 0x48, 0xfd, 0x7f, 0x00, 0x00,</div><div class='add'>+	0xf2, 0x80, 0x22, 0x58, 0x81, 0x6c, 0x00, 0x00, 0xf2, 0x80, 0x22, 0x48,</div><div class='add'>+	0x81, 0x6c, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x40, 0x84, 0xcc, 0x01, 0x00,</div><div class='add'>+	0xf2, 0x80, 0x9f, 0x42, 0x80, 0x32, 0x00, 0x00, 0x22, 0x83, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0xc4, 0x80, 0xa2, 0xc6, 0x8f, 0x06, 0x00, 0x00,</div><div class='add'>+	0xc4, 0x80, 0x1e, 0xc6, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x2f, 0x43,</div><div class='add'>+	0x81, 0xf0, 0x01, 0x00, 0xf6, 0x80, 0x00, 0x40, 0x10, 0xc9, 0x00, 0x00,</div><div class='add'>+	0x44, 0x81, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x7e, 0x81, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x39, 0x82, 0x00, 0xca, 0x63, 0xb3, 0x00, 0x00,</div><div class='add'>+	0x75, 0x81, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x55, 0x81, 0x00, 0x4d,</div><div class='add'>+	0x83, 0xb0, 0x00, 0x00, 0x60, 0x81, 0x00, 0x4e, 0x61, 0xb1, 0x00, 0x00,</div><div class='add'>+	0x4c, 0x81, 0x00, 0x40, 0x85, 0xb0, 0x00, 0x00, 0x55, 0x81, 0x00, 0x4c,</div><div class='add'>+	0x83, 0xb0, 0x00, 0x00, 0x2e, 0x81, 0x00, 0x40, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xf8, 0x81, 0x00, 0x40, 0x49, 0xb1, 0x00, 0x00, 0x86, 0x81, 0x00, 0x40,</div><div class='add'>+	0xc1, 0xb1, 0x00, 0x00, 0xf4, 0x81, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x4c, 0x81, 0x00, 0x40, 0x85, 0xb0, 0x00, 0x00, 0xf0, 0x03, 0x00, 0x40,</div><div class='add'>+	0x49, 0xb1, 0x00, 0x00, 0x22, 0x83, 0x00, 0xca, 0x9b, 0xb3, 0x00, 0x00,</div><div class='add'>+	0x90, 0x81, 0x00, 0x40, 0xc1, 0xb1, 0x00, 0x00, 0x94, 0x81, 0x00, 0x40,</div><div class='add'>+	0xc1, 0xb1, 0x00, 0x00, 0x9b, 0x81, 0x00, 0x40, 0xc1, 0xb1, 0x00, 0x00,</div><div class='add'>+	0x9c, 0x81, 0x00, 0x40, 0xc1, 0xb1, 0x00, 0x00, 0x9d, 0x81, 0x00, 0x40,</div><div class='add'>+	0xc1, 0xb1, 0x00, 0x00, 0x9e, 0x81, 0x00, 0x40, 0xc1, 0xb1, 0x00, 0x00,</div><div class='add'>+	0x9f, 0x81, 0x00, 0x40, 0x81, 0xb0, 0x00, 0x00, 0x9f, 0x81, 0x00, 0x41,</div><div class='add'>+	0x81, 0xb0, 0x00, 0x00, 0x2d, 0x82, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xae, 0x82, 0x00, 0xbb, 0xab, 0xb3, 0x00, 0x00, 0x3a, 0x82, 0x00, 0xca,</div><div class='add'>+	0xcf, 0xb3, 0x00, 0x00, 0xc8, 0x03, 0x00, 0x40, 0x49, 0xb1, 0x00, 0x00,</div><div class='add'>+	0xe8, 0x03, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xc4, 0x80, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x22, 0x83, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xe0, 0x03, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x22, 0x83, 0x00, 0xca,</div><div class='add'>+	0x77, 0xb3, 0x00, 0x00, 0x56, 0x81, 0x00, 0x4d, 0x83, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x5e, 0x81, 0x00, 0x4e, 0x61, 0xb1, 0x00, 0x00, 0x4c, 0x81, 0x00, 0xbb,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x56, 0x81, 0x00, 0x4c, 0x83, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x4c, 0x81, 0x00, 0xbb, 0x85, 0xb0, 0x00, 0x00, 0x2e, 0x81, 0x00, 0xbb,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x20, 0x81, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x22, 0x83, 0x00, 0xca, 0x4d, 0xb3, 0x00, 0x00, 0x70, 0x05, 0x00, 0x40,</div><div class='add'>+	0x49, 0xb1, 0x00, 0x00, 0xa0, 0x05, 0x00, 0x40, 0x49, 0xb1, 0x00, 0x00,</div><div class='add'>+	0x26, 0x81, 0x22, 0x42, 0x8f, 0x6f, 0x00, 0x00, 0x28, 0x81, 0x22, 0x41,</div><div class='add'>+	0x8f, 0x6f, 0x00, 0x00, 0x2a, 0x81, 0x1e, 0xca, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x2c, 0x81, 0x1f, 0xca, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0xca,</div><div class='add'>+	0xc9, 0xb1, 0x01, 0x00, 0x22, 0x83, 0x00, 0x42, 0x8f, 0xb3, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xca, 0xcd, 0xb1, 0x01, 0x00, 0x22, 0x83, 0x00, 0x41,</div><div class='add'>+	0x8f, 0xb3, 0x00, 0x00, 0x00, 0x00, 0x00, 0xca, 0xcf, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x22, 0x83, 0x00, 0x40, 0x8f, 0xb3, 0x00, 0x00, 0x00, 0x81, 0x00, 0xa6,</div><div class='add'>+	0xc6, 0xb1, 0x01, 0x00, 0x22, 0x83, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x00, 0x80, 0x00, 0xa6, 0xc6, 0xb1, 0x01, 0x00, 0x22, 0x83, 0x00, 0x40,</div><div class='add'>+	0x8f, 0xb3, 0x00, 0x00, 0x78, 0x18, 0x00, 0x40, 0x49, 0x99, 0x01, 0x00,</div><div class='add'>+	0x10, 0x00, 0x2f, 0x9c, 0x89, 0xb0, 0x01, 0x00, 0x46, 0x81, 0x00, 0x40,</div><div class='add'>+	0x39, 0x33, 0x01, 0x00, 0x18, 0x00, 0x2f, 0x9b, 0x89, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x46, 0x81, 0x00, 0x40, 0x37, 0x33, 0x01, 0x00, 0x00, 0x00, 0x2f, 0x9a,</div><div class='add'>+	0x89, 0xb0, 0x01, 0x00, 0x46, 0x81, 0x00, 0x40, 0x35, 0x33, 0x01, 0x00,</div><div class='add'>+	0x08, 0x00, 0x2f, 0x99, 0x89, 0xb0, 0x01, 0x00, 0x46, 0x81, 0x00, 0x40,</div><div class='add'>+	0x33, 0x33, 0x01, 0x00, 0x00, 0x80, 0x00, 0xae, 0x47, 0xc9, 0x01, 0x00,</div><div class='add'>+	0xc4, 0x80, 0xa2, 0x40, 0xe1, 0x6d, 0x00, 0x00, 0x80, 0x00, 0x00, 0x40,</div><div class='add'>+	0xf1, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0xca, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x42, 0xf0, 0xb1, 0x01, 0x00, 0x40, 0x18, 0x00, 0x40,</div><div class='add'>+	0xe1, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x45, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x20, 0x00, 0x00, 0xae, 0x63, 0xdd, 0x01, 0x00, 0x41, 0x81, 0x28, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x3e, 0x81, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x41, 0x81, 0x42, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5c,</div><div class='add'>+	0x69, 0x93, 0x01, 0x00, 0x22, 0x83, 0x1a, 0x44, 0x93, 0x93, 0x00, 0x00,</div><div class='add'>+	0x44, 0x81, 0x42, 0x40, 0x81, 0x32, 0x00, 0x00, 0x43, 0x81, 0x00, 0x58,</div><div class='add'>+	0x69, 0x93, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0xf0, 0xd1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0xa4, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x4b, 0x81, 0xa2, 0x40,</div><div class='add'>+	0xe1, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x45, 0xd1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x40, 0xe1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x80, 0x41,</div><div class='add'>+	0xe1, 0xd1, 0x01, 0x00, 0x4c, 0x81, 0x37, 0x5c, 0x61, 0x31, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x42, 0x62, 0xb1, 0x01, 0x00, 0x52, 0x81, 0x28, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x4d, 0x81, 0x22, 0x5c, 0x77, 0x7d, 0x00, 0x00,</div><div class='add'>+	0xc4, 0x80, 0x17, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x4d, 0x81, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0xca, 0x63, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x52, 0x81, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0x22, 0x83, 0x17, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x57, 0x81, 0x00, 0x40, 0x81, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x57, 0x81, 0x00, 0xbb, 0x81, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x60, 0xb1, 0x01, 0x00, 0xc4, 0x80, 0xa2, 0x41, 0x76, 0x7d, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x62, 0xb1, 0x01, 0x00, 0x59, 0x81, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0xca, 0x63, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x22, 0x83, 0x28, 0x40, 0x81, 0x32, 0x00, 0x00, 0x5b, 0x81, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x50, 0x95, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00,</div><div class='add'>+	0x61, 0x81, 0x00, 0xbb, 0x87, 0xb0, 0x00, 0x00, 0x50, 0x95, 0x2f, 0x40,</div><div class='add'>+	0x87, 0xb0, 0x01, 0x00, 0x65, 0x81, 0x22, 0x40, 0x95, 0x7f, 0x00, 0x00,</div><div class='add'>+	0xc4, 0x80, 0xa2, 0x40, 0xe1, 0x6d, 0x00, 0x00, 0xc4, 0x80, 0x22, 0x40,</div><div class='add'>+	0x95, 0x6f, 0x00, 0x00, 0x22, 0x83, 0x60, 0x40, 0x95, 0x83, 0x00, 0x00,</div><div class='add'>+	0x02, 0x00, 0x2d, 0xf0, 0x84, 0xb0, 0x01, 0x00, 0xc4, 0x80, 0x22, 0x40,</div><div class='add'>+	0x85, 0x6c, 0x00, 0x00, 0xc4, 0x80, 0xa2, 0x40, 0x85, 0x7c, 0x00, 0x00,</div><div class='add'>+	0xc4, 0x80, 0xa2, 0x4e, 0x77, 0x7d, 0x00, 0x00, 0x69, 0x81, 0x36, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x62, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x6a, 0x81, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43,</div><div class='add'>+	0x62, 0xb1, 0x01, 0x00, 0x6c, 0x81, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xca, 0x63, 0xb1, 0x01, 0x00, 0x6e, 0x81, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x16, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x74, 0x81, 0x22, 0x41, 0x43, 0x51, 0x00, 0x00, 0x00, 0x08, 0x00, 0xca,</div><div class='add'>+	0x95, 0xcb, 0x01, 0x00, 0x68, 0x81, 0x00, 0x41, 0x85, 0xc0, 0x00, 0x00,</div><div class='add'>+	0x22, 0x83, 0x00, 0x40, 0xe1, 0xb1, 0x00, 0x00, 0x77, 0x81, 0xa2, 0x42,</div><div class='add'>+	0x67, 0x6f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x67, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x77, 0x81, 0x42, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x65, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x93, 0x83, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x1a, 0xca, 0x69, 0x97, 0x01, 0x00, 0x22, 0x83, 0x26, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x7c, 0x81, 0x42, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x22, 0x83, 0x1a, 0x44, 0x93, 0x93, 0x00, 0x00, 0xc4, 0x80, 0x20, 0x43,</div><div class='add'>+	0x95, 0x6f, 0x00, 0x00, 0x22, 0x83, 0x80, 0xca, 0x67, 0x33, 0x00, 0x00,</div><div class='add'>+	0x22, 0x83, 0x22, 0x40, 0x65, 0x6f, 0x00, 0x00, 0xc4, 0x80, 0xa2, 0x48,</div><div class='add'>+	0xdb, 0x7d, 0x00, 0x00, 0x22, 0x83, 0x00, 0x6f, 0xdb, 0x91, 0x00, 0x00,</div><div class='add'>+	0x85, 0x00, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x35, 0x80, 0x22, 0x40,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x22, 0x83, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x58, 0x95, 0x93, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5f,</div><div class='add'>+	0x95, 0x93, 0x01, 0x00, 0x8c, 0x81, 0xa2, 0x44, 0x21, 0x6f, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x5f, 0x95, 0x83, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5e,</div><div class='add'>+	0x95, 0x93, 0x01, 0x00, 0x00, 0x00, 0x00, 0x57, 0x95, 0x93, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xca, 0xc3, 0xb1, 0x01, 0x00, 0x8f, 0x81, 0x22, 0x5b,</div><div class='add'>+	0x95, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4b, 0xfd, 0x93, 0x01, 0x00,</div><div class='add'>+	0x22, 0x83, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x1b, 0xfd, 0x00, 0xca,</div><div class='add'>+	0x95, 0x9b, 0x01, 0x00, 0x0d, 0x01, 0x00, 0xca, 0xc5, 0x31, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x5f, 0x95, 0x83, 0x01, 0x00, 0x22, 0x83, 0x00, 0xca,</div><div class='add'>+	0xc5, 0xb1, 0x00, 0x00, 0xdf, 0x6f, 0x00, 0xca, 0x95, 0x9b, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x55, 0x95, 0x93, 0x01, 0x00, 0x00, 0x00, 0x00, 0xca,</div><div class='add'>+	0xc7, 0xb1, 0x01, 0x00, 0x22, 0x83, 0x22, 0x5f, 0x95, 0x7f, 0x00, 0x00,</div><div class='add'>+	0x0d, 0x01, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5f,</div><div class='add'>+	0x95, 0x83, 0x01, 0x00, 0x22, 0x83, 0x00, 0xca, 0xc7, 0xb1, 0x00, 0x00,</div><div class='add'>+	0x22, 0x83, 0x00, 0xca, 0xc9, 0xb1, 0x00, 0x00, 0x22, 0x83, 0x00, 0xca,</div><div class='add'>+	0xcb, 0xb1, 0x00, 0x00, 0x22, 0x83, 0x00, 0xca, 0xcd, 0xb1, 0x00, 0x00,</div><div class='add'>+	0x22, 0x83, 0x00, 0xca, 0xcf, 0xb1, 0x00, 0x00, 0x00, 0x00, 0x2e, 0x42,</div><div class='add'>+	0x81, 0xe0, 0x01, 0x00, 0x98, 0x14, 0x00, 0x40, 0x48, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x22, 0x83, 0x00, 0xca, 0xe1, 0xb1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x09, 0xb1, 0x01, 0x00, 0x20, 0x00, 0x00, 0xa6, 0x82, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xa4, 0x81, 0xa2, 0x5e, 0x0b, 0x7d, 0x00, 0x00, 0x00, 0x80, 0x00, 0x41,</div><div class='add'>+	0x08, 0x99, 0x01, 0x00, 0xa6, 0x81, 0xa2, 0x5e, 0x0b, 0x7d, 0x00, 0x00,</div><div class='add'>+	0x20, 0x80, 0x00, 0xa6, 0x08, 0xb1, 0x01, 0x00, 0xa8, 0x81, 0x9f, 0x85,</div><div class='add'>+	0x82, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x83, 0x84, 0x01, 0x00,</div><div class='add'>+	0xdd, 0x81, 0x22, 0x30, 0x83, 0x6c, 0x00, 0x00, 0xa7, 0x81, 0xa2, 0x4f,</div><div class='add'>+	0x0b, 0x7d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x21, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x02, 0x80, 0x00, 0xa6, 0x82, 0xb0, 0x01, 0x00, 0x28, 0x82, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x10, 0x00, 0x00, 0x41, 0x84, 0xe4, 0x01, 0x00,</div><div class='add'>+	0x03, 0x80, 0x00, 0xa6, 0x82, 0xb0, 0x01, 0x00, 0x28, 0x82, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0xf0, 0xff, 0x00, 0x41, 0x86, 0x88, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x43, 0x84, 0x94, 0x01, 0x00, 0x0f, 0x00, 0x00, 0xa6,</div><div class='add'>+	0x86, 0xb0, 0x01, 0x00, 0x10, 0xc4, 0x00, 0x43, 0x86, 0x98, 0x01, 0x00,</div><div class='add'>+	0xbd, 0x81, 0xa2, 0x43, 0x84, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43,</div><div class='add'>+	0x21, 0xb3, 0x01, 0x00, 0x20, 0x00, 0x00, 0xa6, 0x82, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x1c, 0x00, 0x00, 0x41, 0x82, 0xdc, 0x01, 0x00, 0xba, 0x81, 0xa2, 0x5e,</div><div class='add'>+	0x0b, 0x7d, 0x00, 0x00, 0x04, 0x00, 0x00, 0x41, 0x08, 0x99, 0x01, 0x00,</div><div class='add'>+	0xcf, 0x81, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x41, 0x01, 0x00, 0xa6,</div><div class='add'>+	0x86, 0xb0, 0x01, 0x00, 0x50, 0x0c, 0x00, 0x43, 0x86, 0x98, 0x01, 0x00,</div><div class='add'>+	0xc2, 0x81, 0xa2, 0x43, 0x84, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x21, 0xb3, 0x01, 0x00, 0xcf, 0x81, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x41, 0x01, 0x00, 0xa6, 0x86, 0xb0, 0x01, 0x00, 0x60, 0x0c, 0x00, 0x43,</div><div class='add'>+	0x86, 0x98, 0x01, 0x00, 0xcf, 0x81, 0xa2, 0x43, 0x84, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x42, 0x21, 0xb3, 0x01, 0x00, 0x18, 0x80, 0x00, 0xa6,</div><div class='add'>+	0x82, 0xb0, 0x01, 0x00, 0x28, 0x82, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0xff, 0xff, 0x00, 0x41, 0x82, 0x88, 0x01, 0x00, 0x00, 0x77, 0x00, 0x41,</div><div class='add'>+	0x82, 0x8c, 0x01, 0x00, 0x01, 0x02, 0x00, 0x41, 0x82, 0x98, 0x01, 0x00,</div><div class='add'>+	0x20, 0x00, 0x00, 0x41, 0x82, 0xdc, 0x01, 0x00, 0x18, 0x00, 0x00, 0x41,</div><div class='add'>+	0x82, 0xdc, 0x01, 0x00, 0xcd, 0x81, 0xa2, 0x5e, 0x0b, 0x7d, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x08, 0xb1, 0x01, 0x00, 0x20, 0x00, 0x00, 0xa6,</div><div class='add'>+	0x82, 0xb0, 0x01, 0x00, 0xd0, 0x81, 0xa2, 0x5e, 0x0b, 0x7d, 0x00, 0x00,</div><div class='add'>+	0x40, 0x13, 0x00, 0x41, 0x08, 0x99, 0x01, 0x00, 0xd8, 0x81, 0x22, 0x43,</div><div class='add'>+	0x21, 0x6f, 0x00, 0x00, 0x20, 0x00, 0x00, 0xa6, 0x82, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x12, 0x00, 0x00, 0x41, 0x82, 0xdc, 0x01, 0x00, 0xd5, 0x81, 0xa2, 0x5e,</div><div class='add'>+	0x0b, 0x7d, 0x00, 0x00, 0x00, 0x04, 0x00, 0x41, 0x08, 0x99, 0x01, 0x00,</div><div class='add'>+	0xf3, 0x81, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x20, 0x00, 0x00, 0xa6,</div><div class='add'>+	0x82, 0xb0, 0x01, 0x00, 0x19, 0x00, 0x00, 0x41, 0x82, 0xdc, 0x01, 0x00,</div><div class='add'>+	0xda, 0x81, 0xa2, 0x5e, 0x0b, 0x7d, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x41,</div><div class='add'>+	0x08, 0x99, 0x01, 0x00, 0xf3, 0x81, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x44, 0x21, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x83, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5f, 0x83, 0x90, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x5e, 0x83, 0x90, 0x01, 0x00, 0x00, 0x00, 0x00, 0x57,</div><div class='add'>+	0x83, 0x90, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41, 0xc2, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x0c, 0x01, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5f,</div><div class='add'>+	0x83, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41, 0xc2, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x0c, 0x01, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x20, 0x00, 0x00, 0xa6,</div><div class='add'>+	0x82, 0xb0, 0x01, 0x00, 0x04, 0x00, 0x00, 0x41, 0x82, 0xdc, 0x01, 0x00,</div><div class='add'>+	0x20, 0x00, 0x00, 0x41, 0x08, 0x99, 0x01, 0x00, 0x20, 0x00, 0x00, 0xa6,</div><div class='add'>+	0x82, 0xb0, 0x01, 0x00, 0x11, 0x00, 0x00, 0x41, 0x82, 0xdc, 0x01, 0x00,</div><div class='add'>+	0xec, 0x81, 0xa2, 0x5e, 0x0b, 0x7d, 0x00, 0x00, 0x01, 0x00, 0x00, 0x41,</div><div class='add'>+	0x08, 0x99, 0x01, 0x00, 0x20, 0x00, 0x00, 0xa6, 0x82, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xef, 0x81, 0xa2, 0x5e, 0x0b, 0x7d, 0x00, 0x00, 0x40, 0x13, 0x00, 0x41,</div><div class='add'>+	0x08, 0x99, 0x01, 0x00, 0x01, 0x00, 0x00, 0xa6, 0x82, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x41, 0x2e, 0x99, 0x01, 0x00, 0x00, 0x00, 0x80, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x20, 0x00, 0x00, 0xa6, 0x80, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xca, 0x81, 0x94, 0x01, 0x00, 0xf6, 0x81, 0xa2, 0x5e,</div><div class='add'>+	0x0b, 0x7d, 0x00, 0x00, 0x22, 0x83, 0x00, 0x40, 0x08, 0xb1, 0x00, 0x00,</div><div class='add'>+	0xc8, 0x14, 0x2e, 0xbb, 0x85, 0xb0, 0x01, 0x00, 0xf9, 0x81, 0xa2, 0x5e,</div><div class='add'>+	0x0b, 0x7d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x87, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x08, 0x82, 0x22, 0x43, 0x21, 0x6f, 0x00, 0x00, 0x17, 0x82, 0x22, 0x44,</div><div class='add'>+	0x21, 0x6f, 0x00, 0x00, 0x11, 0x80, 0x00, 0xa6, 0x82, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x28, 0x82, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x1f, 0x82, 0x22, 0x4a,</div><div class='add'>+	0x83, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x87, 0x90, 0x01, 0x00,</div><div class='add'>+	0x03, 0x82, 0x22, 0x4d, 0x83, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x87, 0x90, 0x01, 0x00, 0x05, 0x82, 0x22, 0x4f, 0x83, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x43, 0x87, 0x90, 0x01, 0x00, 0x07, 0x82, 0x22, 0x4e,</div><div class='add'>+	0x83, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x87, 0x90, 0x01, 0x00,</div><div class='add'>+	0x1f, 0x82, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x01, 0x80, 0x00, 0xa6,</div><div class='add'>+	0x82, 0xb0, 0x01, 0x00, 0x28, 0x82, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x01, 0x80, 0x00, 0xa6, 0x82, 0xb0, 0x01, 0x00, 0x28, 0x82, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x1f, 0x82, 0x22, 0x42, 0x83, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x87, 0x90, 0x01, 0x00, 0x1c, 0x80, 0x00, 0xa6,</div><div class='add'>+	0x82, 0xb0, 0x01, 0x00, 0x28, 0x82, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x12, 0x82, 0x22, 0x45, 0x83, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x87, 0x90, 0x01, 0x00, 0x14, 0x82, 0x22, 0x44, 0x83, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x43, 0x87, 0x90, 0x01, 0x00, 0x16, 0x82, 0x22, 0x43,</div><div class='add'>+	0x83, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x87, 0x90, 0x01, 0x00,</div><div class='add'>+	0x1f, 0x82, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x01, 0x80, 0x00, 0xa6,</div><div class='add'>+	0x82, 0xb0, 0x01, 0x00, 0x28, 0x82, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x01, 0x80, 0x00, 0xa6, 0x82, 0xb0, 0x01, 0x00, 0x28, 0x82, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x1f, 0x82, 0x22, 0x42, 0x83, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x87, 0x90, 0x01, 0x00, 0x00, 0x00, 0x00, 0x43,</div><div class='add'>+	0x87, 0x90, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41, 0x87, 0x90, 0x01, 0x00,</div><div class='add'>+	0x00, 0x80, 0x00, 0xa6, 0x82, 0xb0, 0x01, 0x00, 0x28, 0x82, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x23, 0x82, 0x22, 0x4b, 0x83, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x87, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00, 0x43,</div><div class='add'>+	0xe0, 0xb1, 0x01, 0x00, 0xff, 0x7f, 0x00, 0xa2, 0xa0, 0x8b, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x44, 0xa5, 0xb3, 0x01, 0x00, 0xb8, 0x80, 0x00, 0xca,</div><div class='add'>+	0xa7, 0x33, 0x01, 0x00, 0x41, 0x81, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x20, 0x00, 0x00, 0x41, 0x82, 0xdc, 0x01, 0x00, 0x29, 0x82, 0xa2, 0x5e,</div><div class='add'>+	0x0b, 0x7d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x08, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x2b, 0x82, 0x9f, 0x85, 0x82, 0x30, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x30, 0x82, 0x14, 0xf7, 0x81, 0x30, 0x00, 0x00,</div><div class='add'>+	0x30, 0x82, 0xa2, 0x49, 0xfd, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x48,</div><div class='add'>+	0xfd, 0x93, 0x01, 0x00, 0x33, 0x82, 0x15, 0xf8, 0x81, 0x14, 0x00, 0x00,</div><div class='add'>+	0x33, 0x82, 0xa2, 0x4a, 0xfd, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x48,</div><div class='add'>+	0xfd, 0x93, 0x01, 0x00, 0x35, 0x82, 0xa2, 0xc8, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x40, 0x80, 0xdc, 0x01, 0x00, 0x00, 0x10, 0x00, 0x40,</div><div class='add'>+	0x80, 0xdc, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0xef, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x37, 0x82, 0x42, 0x40, 0xf1, 0x33, 0x00, 0x00, 0x43, 0x81, 0x00, 0x40,</div><div class='add'>+	0x68, 0x97, 0x00, 0x00, 0x22, 0x83, 0x00, 0xbb, 0x6b, 0xb3, 0x00, 0x00,</div><div class='add'>+	0x22, 0x83, 0x00, 0xbb, 0xb1, 0xb3, 0x00, 0x00, 0x22, 0x83, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x03, 0x00, 0x40, 0x81, 0x98, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x18, 0xb1, 0x01, 0x00, 0x80, 0x00, 0x00, 0x40,</div><div class='add'>+	0x83, 0x98, 0x01, 0x00, 0x00, 0x19, 0x00, 0x40, 0x45, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x42, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x43, 0xff,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xff, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x81, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x18, 0xb1, 0x01, 0x00, 0x40, 0x82, 0xa2, 0x41, 0x83, 0x50, 0x00, 0x00,</div><div class='add'>+	0x00, 0x16, 0x00, 0x40, 0x45, 0x99, 0x01, 0x00, 0x00, 0x19, 0x00, 0x40,</div><div class='add'>+	0x43, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x47, 0x43, 0xc1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x83, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf3,</div><div class='add'>+	0x80, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5b, 0x81, 0xd0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x80, 0xd0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0xf6, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5b, 0x43, 0xc1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x83, 0xc0, 0x01, 0x00, 0x4a, 0x82, 0xa2, 0x54,</div><div class='add'>+	0x83, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xf7, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x83, 0xc0, 0x01, 0x00, 0x51, 0x82, 0xa2, 0x06,</div><div class='add'>+	0x83, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x16, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00, 0x80, 0x16, 0x2e, 0x06,</div><div class='add'>+	0x83, 0xb0, 0x01, 0x00, 0x36, 0x00, 0x00, 0xfb, 0xf6, 0xa9, 0x01, 0x00,</div><div class='add'>+	0x57, 0x82, 0xa2, 0x41, 0x83, 0x50, 0x00, 0x00, 0x22, 0x00, 0x00, 0x40,</div><div class='add'>+	0x83, 0x98, 0x01, 0x00, 0x00, 0x00, 0x00, 0xfb, 0xf6, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x5a, 0x82, 0xa2, 0x41, 0x83, 0x50, 0x00, 0x00, 0x62, 0x00, 0x00, 0x40,</div><div class='add'>+	0x95, 0x98, 0x01, 0x00, 0xdc, 0x9f, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x00, 0x16, 0x2d, 0x06, 0x83, 0xb0, 0x01, 0x00, 0x80, 0x16, 0x00, 0x40,</div><div class='add'>+	0x45, 0x99, 0x01, 0x00, 0x5c, 0x00, 0x00, 0xfb, 0xf6, 0xa9, 0x01, 0x00,</div><div class='add'>+	0x60, 0x82, 0xa2, 0x41, 0x83, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70,</div><div class='add'>+	0xf9, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x71, 0xf9, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x72, 0xf9, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x73,</div><div class='add'>+	0xf9, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x74, 0xf9, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x54, 0x00, 0x00, 0x40, 0x95, 0x98, 0x01, 0x00, 0xdc, 0x9f, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0x70, 0x95, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x6c, 0x82, 0x22, 0x70, 0xb5, 0x6f, 0x00, 0x00, 0x00, 0x00, 0x80, 0x41,</div><div class='add'>+	0x97, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x80, 0x40, 0x97, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xc4, 0x80, 0xa2, 0x42, 0x97, 0x6f, 0x00, 0x00, 0xb6, 0x03, 0x00, 0x40,</div><div class='add'>+	0xa1, 0x99, 0x01, 0x00, 0x00, 0x00, 0x2f, 0x42, 0x99, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x78, 0x82, 0x22, 0x44, 0x81, 0x6c, 0x00, 0x00, 0x80, 0x82, 0x22, 0x48,</div><div class='add'>+	0x81, 0x6c, 0x00, 0x00, 0x7a, 0x82, 0x22, 0x4c, 0x81, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x85, 0x82, 0x22, 0x50, 0x81, 0x6c, 0x00, 0x00, 0x86, 0x82, 0x22, 0x54,</div><div class='add'>+	0x81, 0x6c, 0x00, 0x00, 0x88, 0x82, 0x22, 0x58, 0x81, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x8d, 0x82, 0x22, 0x5c, 0x81, 0x6c, 0x00, 0x00, 0x50, 0x01, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0xbc, 0x09, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x22, 0x83, 0x00, 0xca, 0x01, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x03, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41, 0xf3, 0x83, 0x01, 0x00,</div><div class='add'>+	0x7e, 0x82, 0xa2, 0x42, 0x05, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x05, 0xb0, 0x01, 0x00, 0x22, 0x83, 0x22, 0xca, 0x07, 0x14, 0x00, 0x00,</div><div class='add'>+	0x22, 0x83, 0x00, 0x46, 0xf3, 0x93, 0x00, 0x00, 0x22, 0x83, 0x20, 0x43,</div><div class='add'>+	0x95, 0x6f, 0x00, 0x00, 0x22, 0x83, 0x80, 0xca, 0x05, 0x30, 0x00, 0x00,</div><div class='add'>+	0x22, 0x83, 0x22, 0x01, 0x80, 0x30, 0x00, 0x00, 0xc4, 0x80, 0xa2, 0x48,</div><div class='add'>+	0xdb, 0x7d, 0x00, 0x00, 0x22, 0x83, 0x00, 0xcb, 0xdb, 0x91, 0x00, 0x00,</div><div class='add'>+	0x57, 0x01, 0x00, 0xbc, 0xab, 0xb3, 0x00, 0x00, 0x00, 0x00, 0x00, 0xbc,</div><div class='add'>+	0xb1, 0xb3, 0x01, 0x00, 0x22, 0x83, 0x00, 0xca, 0xcf, 0xb3, 0x00, 0x00,</div><div class='add'>+	0xff, 0x00, 0x00, 0xca, 0x81, 0x88, 0x01, 0x00, 0x22, 0x83, 0xa2, 0x40,</div><div class='add'>+	0x74, 0x7d, 0x00, 0x00, 0x60, 0x00, 0x20, 0x40, 0x60, 0x99, 0x01, 0x00,</div><div class='add'>+	0x8a, 0x82, 0xa8, 0xb1, 0x82, 0x30, 0x00, 0x00, 0x89, 0x82, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x22, 0x83, 0x00, 0xca, 0x79, 0xb3, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4e, 0x81, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x43,</div><div class='add'>+	0xcb, 0x83, 0x01, 0x00, 0x00, 0x00, 0x45, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x90, 0x82, 0xa2, 0x41, 0x81, 0x50, 0x00, 0x00, 0x00, 0x00, 0x45, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x45, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x9b, 0x82, 0x91, 0x82, 0x82, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8a,</div><div class='add'>+	0x80, 0xb0, 0x01, 0x00, 0xae, 0x9f, 0x00, 0x40, 0x80, 0xce, 0x01, 0x00,</div><div class='add'>+	0x99, 0x82, 0xa6, 0x40, 0x81, 0x32, 0x00, 0x00, 0x9b, 0x82, 0x56, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0xb6, 0x03, 0x00, 0x40, 0xa1, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x53, 0x07, 0x90, 0x01, 0x00, 0xb6, 0x03, 0x00, 0x40,</div><div class='add'>+	0xa1, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x52, 0x07, 0x90, 0x01, 0x00,</div><div class='add'>+	0xd8, 0x9f, 0x00, 0x41, 0x8b, 0xb3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4e,</div><div class='add'>+	0x81, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x42, 0xcd, 0x83, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x46, 0x40, 0x81, 0xb2, 0x01, 0x00, 0xa0, 0x82, 0xa2, 0x41,</div><div class='add'>+	0x81, 0x50, 0x00, 0x00, 0x00, 0x00, 0x46, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x46, 0x40, 0x81, 0xb2, 0x01, 0x00, 0xab, 0x82, 0x91, 0x81,</div><div class='add'>+	0x82, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x80, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xae, 0x9f, 0x00, 0x40, 0x80, 0xce, 0x01, 0x00, 0xa9, 0x82, 0xa6, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0xab, 0x82, 0x55, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xb6, 0x03, 0x00, 0x40, 0xa1, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x52,</div><div class='add'>+	0x07, 0x90, 0x01, 0x00, 0xb6, 0x03, 0x00, 0x40, 0xa1, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x53, 0x07, 0x90, 0x01, 0x00, 0xd8, 0x9f, 0x00, 0x41,</div><div class='add'>+	0x8b, 0xb3, 0x00, 0x00, 0xb1, 0x03, 0x00, 0x40, 0xa1, 0x99, 0x01, 0x00,</div><div class='add'>+	0xc4, 0x14, 0x2f, 0x40, 0x99, 0xb3, 0x01, 0x00, 0x57, 0x01, 0x00, 0x40,</div><div class='add'>+	0x49, 0xb1, 0x00, 0x00, 0xa0, 0x94, 0x2e, 0x43, 0x97, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0xf1, 0xb1, 0x01, 0x00, 0xb2, 0x82, 0xa2, 0x41,</div><div class='add'>+	0x97, 0x50, 0x00, 0x00, 0x50, 0x95, 0x20, 0x40, 0xe1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xac, 0x94, 0x2e, 0x43, 0x97, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0xb6, 0x82, 0xa2, 0x41, 0x97, 0x50, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x40, 0x81, 0xb2, 0x01, 0x00, 0xae, 0x03, 0x00, 0x40,</div><div class='add'>+	0xa3, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x81, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x60, 0x15, 0x00, 0x40, 0x85, 0x98, 0x01, 0x00, 0x08, 0x00, 0x00, 0x40,</div><div class='add'>+	0x40, 0xe4, 0x01, 0x00, 0x00, 0x00, 0x00, 0x59, 0x41, 0x94, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x50, 0x41, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x42,</div><div class='add'>+	0x40, 0x94, 0x01, 0x00, 0x00, 0x00, 0x00, 0x57, 0x41, 0x90, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x81, 0xc0, 0x01, 0x00, 0x00, 0x00, 0xa3, 0x42,</div><div class='add'>+	0x81, 0x6c, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41, 0xa3, 0xc1, 0x01, 0x00,</div><div class='add'>+	0xbc, 0x82, 0xa0, 0x42, 0x81, 0x6c, 0x00, 0x00, 0xbc, 0x82, 0x00, 0x50,</div><div class='add'>+	0x85, 0xc0, 0x00, 0x00, 0x01, 0x83, 0xa2, 0x41, 0x01, 0x7d, 0x00, 0x00,</div><div class='add'>+	0xcf, 0x82, 0x22, 0x58, 0x73, 0x7d, 0x00, 0x00, 0x78, 0x00, 0x00, 0x40,</div><div class='add'>+	0x61, 0x99, 0x01, 0x00, 0xc7, 0x82, 0xa8, 0xb1, 0x9c, 0x30, 0x00, 0x00,</div><div class='add'>+	0x30, 0x00, 0x38, 0x45, 0x9d, 0xe0, 0x01, 0x00, 0x04, 0x00, 0xa2, 0x5f,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x04, 0x00, 0x22, 0x5e, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x00, 0xc0, 0x00, 0xa6, 0x1e, 0xa4, 0x01, 0x00, 0x01, 0x00, 0x00, 0x0e,</div><div class='add'>+	0x10, 0xc9, 0x00, 0x00, 0xcf, 0x82, 0x33, 0xc4, 0x81, 0x30, 0x00, 0x00,</div><div class='add'>+	0xd2, 0x82, 0xa1, 0xad, 0x9d, 0x20, 0x00, 0x00, 0xc6, 0x82, 0x13, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x13, 0x4e, 0x5a, 0x83, 0x01, 0x00,</div><div class='add'>+	0x30, 0x00, 0x38, 0x45, 0x9d, 0xe0, 0x01, 0x00, 0x04, 0x00, 0xa2, 0x5f,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x04, 0x00, 0xa2, 0x5e, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa2, 0x40, 0x05, 0x6c, 0x00, 0x00, 0xdd, 0x82, 0x22, 0xab,</div><div class='add'>+	0x80, 0x04, 0x00, 0x00, 0xdb, 0x82, 0xa2, 0x40, 0x01, 0x7d, 0x00, 0x00,</div><div class='add'>+	0xdd, 0x82, 0x22, 0x5f, 0x57, 0x7d, 0x00, 0x00, 0x0f, 0x88, 0x00, 0x5f,</div><div class='add'>+	0x1f, 0xb4, 0x00, 0x00, 0xdd, 0x82, 0x22, 0x5e, 0x57, 0x7d, 0x00, 0x00,</div><div class='add'>+	0x7d, 0x88, 0x00, 0x5f, 0x1f, 0xb4, 0x00, 0x00, 0xe3, 0x82, 0x22, 0x54,</div><div class='add'>+	0x73, 0x7d, 0x00, 0x00, 0x74, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00,</div><div class='add'>+	0xdd, 0x82, 0xa8, 0xb1, 0x00, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5f,</div><div class='add'>+	0x1f, 0xb4, 0x01, 0x00, 0xf4, 0x84, 0xa2, 0x5f, 0x01, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x92, 0x87, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xe5, 0x82, 0xa2, 0x5f,</div><div class='add'>+	0x59, 0x27, 0x00, 0x00, 0xe7, 0x82, 0xa2, 0x5c, 0x73, 0x7d, 0x00, 0x00,</div><div class='add'>+	0xee, 0x82, 0xa2, 0x5e, 0x73, 0x7d, 0x00, 0x00, 0xfa, 0x82, 0x22, 0x5c,</div><div class='add'>+	0x73, 0x7d, 0x00, 0x00, 0xfb, 0x82, 0x37, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x7c, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00, 0xe8, 0x82, 0xa8, 0xb1,</div><div class='add'>+	0x36, 0x30, 0x00, 0x00, 0x7c, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00,</div><div class='add'>+	0xea, 0x82, 0xa8, 0xb1, 0x00, 0x30, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00,</div><div class='add'>+	0x02, 0x88, 0x01, 0x00, 0x34, 0x85, 0x17, 0x5f, 0x1f, 0xb4, 0x00, 0x00,</div><div class='add'>+	0xfb, 0x82, 0x34, 0x40, 0x81, 0x32, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x40,</div><div class='add'>+	0x61, 0x99, 0x01, 0x00, 0xef, 0x82, 0xa8, 0xb1, 0x12, 0x30, 0x00, 0x00,</div><div class='add'>+	0xf7, 0x82, 0x52, 0x21, 0x13, 0x04, 0x00, 0x00, 0x00, 0x00, 0x14, 0x41,</div><div class='add'>+	0x2f, 0xc3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5f, 0x1f, 0xb4, 0x01, 0x00,</div><div class='add'>+	0xff, 0x3f, 0x00, 0x09, 0x00, 0x8c, 0x01, 0x00, 0x00, 0x00, 0x00, 0x43,</div><div class='add'>+	0x01, 0xf0, 0x01, 0x00, 0x4f, 0x83, 0x00, 0x34, 0x13, 0x84, 0x00, 0x00,</div><div class='add'>+	0xff, 0x3f, 0x14, 0x09, 0x00, 0x8c, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5f,</div><div class='add'>+	0x1f, 0xb4, 0x01, 0x00, 0xc2, 0x83, 0x00, 0x43, 0x01, 0xf0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x01, 0x00, 0xfb, 0x82, 0x33, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x04, 0x00, 0xa2, 0x4e, 0x5a, 0x7f, 0x00, 0x00,</div><div class='add'>+	0x07, 0x00, 0x00, 0x4e, 0x80, 0xe4, 0x01, 0x00, 0x00, 0x39, 0x00, 0x40,</div><div class='add'>+	0x80, 0xc8, 0x01, 0x00, 0x04, 0x00, 0xa2, 0x40, 0x06, 0x6c, 0x00, 0x00,</div><div class='add'>+	0xc6, 0x82, 0x13, 0x4e, 0x5a, 0x93, 0x00, 0x00, 0xe4, 0x87, 0xa2, 0x48,</div><div class='add'>+	0xfd, 0x7f, 0x00, 0x00, 0x05, 0x83, 0x02, 0xe6, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x06, 0x83, 0x83, 0xe5, 0x81, 0x32, 0x00, 0x00, 0x8e, 0x82, 0x00, 0x42,</div><div class='add'>+	0x97, 0xb3, 0x00, 0x00, 0x9e, 0x82, 0x00, 0x42, 0x97, 0xb3, 0x00, 0x00,</div><div class='add'>+	0x09, 0x83, 0x22, 0x46, 0xf3, 0x7f, 0x00, 0x00, 0x0c, 0x83, 0xa2, 0x41,</div><div class='add'>+	0xf3, 0x7f, 0x00, 0x00, 0xc6, 0x80, 0x00, 0x42, 0x97, 0x33, 0x01, 0x00,</div><div class='add'>+	0x0c, 0x83, 0x22, 0x44, 0xf3, 0x7f, 0x00, 0x00, 0x0c, 0x83, 0xa2, 0x41,</div><div class='add'>+	0xf3, 0x7f, 0x00, 0x00, 0xc6, 0x80, 0x00, 0x6f, 0x97, 0x33, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa2, 0xac, 0x80, 0x32, 0x00, 0x00, 0x11, 0x83, 0x22, 0x5a,</div><div class='add'>+	0x73, 0x7d, 0x00, 0x00, 0x7a, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00,</div><div class='add'>+	0x0e, 0x83, 0xa8, 0xb1, 0x7e, 0x31, 0x00, 0x00, 0x01, 0x00, 0x00, 0xcf,</div><div class='add'>+	0x11, 0xc9, 0x00, 0x00, 0x17, 0x83, 0xa2, 0x40, 0x93, 0x7f, 0x00, 0x00,</div><div class='add'>+	0x17, 0x83, 0x22, 0x44, 0x93, 0x7f, 0x00, 0x00, 0x13, 0x83, 0x42, 0xa5,</div><div class='add'>+	0x80, 0x30, 0x00, 0x00, 0x16, 0x83, 0xa2, 0x40, 0x93, 0x7f, 0x00, 0x00,</div><div class='add'>+	0x38, 0x83, 0x1a, 0x40, 0x93, 0x93, 0x00, 0x00, 0x00, 0x00, 0x1a, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0xdf, 0x80, 0xa2, 0x40, 0x73, 0x7d, 0x00, 0x00,</div><div class='add'>+	0xdf, 0x87, 0x22, 0x44, 0x21, 0x6f, 0x00, 0x00, 0xd6, 0x87, 0x22, 0x40,</div><div class='add'>+	0x65, 0x7d, 0x00, 0x00, 0x00, 0x05, 0xa2, 0x5b, 0x73, 0x7d, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa2, 0x49, 0x33, 0x7d, 0x00, 0x00, 0x21, 0x83, 0x22, 0x48,</div><div class='add'>+	0x33, 0x7d, 0x00, 0x00, 0xff, 0x01, 0x00, 0x99, 0x80, 0xd8, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x50, 0x81, 0xe0, 0x01, 0x00, 0xa8, 0x98, 0x2f, 0x40,</div><div class='add'>+	0x33, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0xe0, 0xc1, 0x01, 0x00,</div><div class='add'>+	0x01, 0x83, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xc6, 0x82, 0x00, 0x40,</div><div class='add'>+	0x8b, 0xb3, 0x00, 0x00, 0x04, 0x00, 0xa2, 0x5e, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x22, 0x5f, 0x1f, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5e,</div><div class='add'>+	0x1f, 0x90, 0x01, 0x00, 0xc6, 0x82, 0x00, 0x5f, 0x1f, 0x80, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa2, 0x5e, 0x1f, 0x7c, 0x00, 0x00, 0x04, 0x00, 0x22, 0x5f,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5e, 0x1f, 0x90, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x5f, 0x1f, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00, 0x58,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4e, 0x62, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xc6, 0x82, 0x28, 0x40, 0x81, 0x32, 0x00, 0x00, 0x2c, 0x83, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x0f, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa2, 0x5e, 0x1f, 0x7c, 0x00, 0x00, 0x04, 0x00, 0x22, 0x5f,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x32, 0x83, 0x33, 0x40, 0x1f, 0x30, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa2, 0x4e, 0x5a, 0x7f, 0x00, 0x00, 0x07, 0x00, 0x00, 0x4e,</div><div class='add'>+	0x80, 0xe4, 0x01, 0x00, 0x00, 0x39, 0x00, 0x40, 0x80, 0xc8, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa2, 0x40, 0x06, 0x6c, 0x00, 0x00, 0xc6, 0x82, 0x13, 0x4e,</div><div class='add'>+	0x5a, 0x93, 0x00, 0x00, 0x3a, 0x83, 0xa0, 0xce, 0x81, 0x50, 0x00, 0x00,</div><div class='add'>+	0x4d, 0x83, 0xa0, 0xcd, 0x81, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5,</div><div class='add'>+	0x9c, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xb1, 0x81, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x4d, 0x83, 0x22, 0xb5, 0x81, 0x14, 0x00, 0x00, 0x80, 0x15, 0x2f, 0x40,</div><div class='add'>+	0x49, 0xb1, 0x01, 0x00, 0x3e, 0x83, 0x42, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x60, 0xb4, 0x65, 0x97, 0x01, 0x00, 0xd0, 0x15, 0x2e, 0x40,</div><div class='add'>+	0x69, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x1a, 0x44, 0x93, 0x83, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x22, 0x40, 0xe1, 0x6d, 0x00, 0x00, 0x1a, 0x00, 0x00, 0xa2,</div><div class='add'>+	0x80, 0xdc, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xb1, 0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xb5,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0x05, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00,</div><div class='add'>+	0x80, 0x00, 0x00, 0x40, 0x62, 0xdd, 0x01, 0x00, 0x48, 0x83, 0xa8, 0xa1,</div><div class='add'>+	0xe0, 0x31, 0x00, 0x00, 0x17, 0x83, 0x00, 0x88, 0x9e, 0xb3, 0x00, 0x00,</div><div class='add'>+	0x17, 0x83, 0xa2, 0x41, 0x67, 0x6f, 0x00, 0x00, 0x17, 0x83, 0x00, 0x6f,</div><div class='add'>+	0xdb, 0x91, 0x00, 0x00, 0x4d, 0x83, 0x42, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x17, 0x83, 0x1a, 0x40, 0x93, 0x83, 0x00, 0x00, 0x00, 0x04, 0x00, 0x40,</div><div class='add'>+	0x89, 0x98, 0x01, 0x00, 0x02, 0x99, 0x00, 0x00, 0x8a, 0x30, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa2, 0x5a, 0x01, 0x7c, 0x00, 0x00, 0x04, 0x00, 0x22, 0x40,</div><div class='add'>+	0x01, 0x6c, 0x00, 0x00, 0x00, 0x99, 0x00, 0x09, 0x46, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x3f, 0x00, 0x00, 0xf3, 0x0c, 0x88, 0x01, 0x00, 0x5c, 0x83, 0xa6, 0x42,</div><div class='add'>+	0x13, 0x60, 0x00, 0x00, 0x95, 0x96, 0x00, 0x95, 0x03, 0x30, 0x01, 0x00,</div><div class='add'>+	0x57, 0x83, 0x61, 0x40, 0x81, 0x32, 0x00, 0x00, 0x75, 0x00, 0x00, 0x40,</div><div class='add'>+	0x61, 0x99, 0x01, 0x00, 0x58, 0x83, 0xa8, 0xb1, 0x0c, 0x30, 0x00, 0x00,</div><div class='add'>+	0xa3, 0x96, 0x71, 0x10, 0x94, 0x30, 0x01, 0x00, 0x5d, 0x83, 0x00, 0x58,</div><div class='add'>+	0x1f, 0x90, 0x00, 0x00, 0x87, 0x96, 0x00, 0x95, 0x03, 0x30, 0x01, 0x00,</div><div class='add'>+	0x23, 0x83, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x2d, 0x03,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x04, 0x00, 0x2d, 0xf0, 0x2e, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x80, 0x04, 0x00, 0x17, 0x96, 0x88, 0x01, 0x00, 0x04, 0x00, 0xa6, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x4a, 0xc1, 0x00, 0x17, 0x96, 0xd8, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa6, 0x40, 0x81, 0x32, 0x00, 0x00, 0xee, 0x07, 0x00, 0x40,</div><div class='add'>+	0x97, 0x98, 0x01, 0x00, 0x68, 0x83, 0x23, 0x4b, 0xe4, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x68, 0x83, 0x22, 0x4b, 0xfd, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x1f, 0x90, 0x01, 0x00, 0x22, 0x00, 0x2f, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x6b, 0x83, 0x83, 0x17, 0x80, 0x32, 0x00, 0x00, 0x26, 0x00, 0x00, 0x40,</div><div class='add'>+	0x47, 0x99, 0x01, 0x00, 0x6d, 0x83, 0x85, 0x17, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x48, 0x47, 0xc1, 0x01, 0x00, 0x72, 0x83, 0x22, 0x55,</div><div class='add'>+	0x2f, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x43, 0xd1, 0x01, 0x00,</div><div class='add'>+	0x0f, 0x00, 0x00, 0xfa, 0x96, 0x88, 0x01, 0x00, 0x00, 0x00, 0x00, 0x42,</div><div class='add'>+	0x97, 0xe0, 0x01, 0x00, 0x73, 0x83, 0x00, 0x4b, 0x44, 0xc1, 0x00, 0x00,</div><div class='add'>+	0x12, 0x00, 0x00, 0xa2, 0x44, 0xc9, 0x01, 0x00, 0x28, 0x00, 0x00, 0xf6,</div><div class='add'>+	0x02, 0xcc, 0x01, 0x00, 0x0a, 0x00, 0x00, 0xa1, 0x42, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf8, 0x16, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x28, 0xf0,</div><div class='add'>+	0x10, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x1a, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xa2, 0x2a, 0xb0, 0x01, 0x00, 0xc0, 0x28, 0x3c, 0x46,</div><div class='add'>+	0x0d, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x2d, 0x44, 0x95, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x7f, 0x83, 0xa2, 0xf8, 0x0e, 0x30, 0x00, 0x00, 0x8f, 0x83, 0x22, 0x41,</div><div class='add'>+	0x95, 0x50, 0x00, 0x00, 0x00, 0x00, 0x2d, 0x50, 0x49, 0xc1, 0x01, 0x00,</div><div class='add'>+	0x7b, 0x83, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x7c, 0x83, 0xa2, 0xf8,</div><div class='add'>+	0x16, 0x6c, 0x00, 0x00, 0x7c, 0x83, 0xa2, 0xf8, 0x10, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x7c, 0x83, 0xa2, 0xf0, 0x1a, 0x6c, 0x00, 0x00, 0x8d, 0x83, 0x22, 0x58,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x00, 0x99, 0x3f, 0x42, 0x13, 0xf0, 0x01, 0x00,</div><div class='add'>+	0x84, 0x83, 0x65, 0x40, 0x81, 0x32, 0x00, 0x00, 0x88, 0x83, 0xa2, 0xf3,</div><div class='add'>+	0x74, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0xe6, 0x95, 0x01, 0x00,</div><div class='add'>+	0x8d, 0x83, 0x75, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06,</div><div class='add'>+	0x96, 0xb0, 0x01, 0x00, 0x3f, 0x00, 0x75, 0xf3, 0x0c, 0x88, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x55, 0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4b,</div><div class='add'>+	0x62, 0xb1, 0x01, 0x00, 0x8b, 0x83, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x8d, 0x83, 0x67, 0x40, 0x81, 0x32, 0x00, 0x00, 0x95, 0x83, 0x77, 0x41,</div><div class='add'>+	0x2d, 0xc3, 0x00, 0x00, 0x93, 0x83, 0x22, 0x58, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x55, 0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x06,</div><div class='add'>+	0x62, 0xb1, 0x01, 0x00, 0x91, 0x83, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x93, 0x83, 0x67, 0x40, 0x81, 0x32, 0x00, 0x00, 0xd3, 0x83, 0x77, 0x41,</div><div class='add'>+	0x2d, 0xc3, 0x00, 0x00, 0x03, 0x00, 0x00, 0x07, 0x1a, 0xf4, 0x01, 0x00,</div><div class='add'>+	0x12, 0x95, 0x00, 0x07, 0x16, 0x30, 0x01, 0x00, 0xa6, 0x83, 0x22, 0x41,</div><div class='add'>+	0x81, 0x6c, 0x00, 0x00, 0x9b, 0x83, 0x22, 0x42, 0x81, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x23, 0x83, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0xa5, 0x83, 0x22, 0x5f,</div><div class='add'>+	0x0f, 0x7c, 0x00, 0x00, 0x48, 0x96, 0x00, 0x5f, 0x01, 0x10, 0x01, 0x00,</div><div class='add'>+	0xa1, 0x83, 0x22, 0x40, 0x95, 0x6c, 0x00, 0x00, 0x04, 0x80, 0x00, 0x03,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf2, 0x02, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x9f, 0x95, 0x00, 0x52, 0x95, 0x30, 0x01, 0x00, 0xa6, 0x95, 0x00, 0x4b,</div><div class='add'>+	0x02, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5f, 0x0f, 0x80, 0x01, 0x00,</div><div class='add'>+	0x01, 0x04, 0x00, 0x40, 0x89, 0x98, 0x01, 0x00, 0x02, 0x99, 0x00, 0x00,</div><div class='add'>+	0x8a, 0x30, 0x01, 0x00, 0xed, 0x87, 0x00, 0x40, 0x0f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xb5, 0x83, 0xa2, 0x5a, 0x1f, 0x7c, 0x00, 0x00, 0x04, 0x00, 0xa2, 0x5a,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x00, 0xb5, 0x00, 0x0d, 0x42, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x22, 0x0b, 0xe6, 0x7d, 0x00, 0x00, 0x00, 0xb7, 0x00, 0x0d,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0x04, 0x00, 0x22, 0x0b, 0xe6, 0x7d, 0x00, 0x00,</div><div class='add'>+	0x6a, 0x94, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0xb5, 0x83, 0x22, 0x20,</div><div class='add'>+	0x85, 0x6c, 0x00, 0x00, 0xb0, 0x83, 0x9c, 0x0f, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x23, 0x83, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x87, 0x95, 0x00, 0x5c,</div><div class='add'>+	0x1f, 0x00, 0x01, 0x00, 0xc2, 0x97, 0x00, 0x42, 0x61, 0x31, 0x01, 0x00,</div><div class='add'>+	0x23, 0x83, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x90, 0x04, 0x00, 0x07,</div><div class='add'>+	0x96, 0x30, 0x01, 0x00, 0x00, 0x00, 0x2d, 0x05, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa2, 0x4b, 0xe1, 0x7d, 0x00, 0x00, 0x04, 0x00, 0xa2, 0x5c,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x2d, 0x05, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xb9, 0x83, 0x82, 0xf0, 0x18, 0x30, 0x00, 0x00, 0x69, 0x89, 0x00, 0x45,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x28, 0x20, 0x00, 0xa6, 0x96, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xbf, 0x83, 0x22, 0x17, 0x96, 0x04, 0x00, 0x00, 0x34, 0x04, 0x00, 0x40,</div><div class='add'>+	0x89, 0x98, 0x01, 0x00, 0x02, 0x99, 0x00, 0x00, 0x8a, 0x30, 0x01, 0x00,</div><div class='add'>+	0x55, 0x97, 0x00, 0x4b, 0x95, 0x30, 0x01, 0x00, 0x69, 0x89, 0x00, 0x4b,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x57, 0x96, 0x00, 0x03, 0x48, 0x31, 0x01, 0x00,</div><div class='add'>+	0xa9, 0x93, 0x00, 0x40, 0x81, 0x30, 0x01, 0x00, 0x69, 0x89, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x0f, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x04, 0x00, 0x40, 0x89, 0x98, 0x01, 0x00, 0x02, 0x99, 0x00, 0x00,</div><div class='add'>+	0x8a, 0x30, 0x01, 0x00, 0x04, 0x00, 0x22, 0x40, 0x01, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x2e, 0x10, 0x48, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x68, 0x50,</div><div class='add'>+	0x03, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x03, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x00, 0xe0, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x2e, 0x50,</div><div class='add'>+	0x49, 0xc1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x50, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x03, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x42,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x20, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0xce, 0x83, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0x10, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xc9, 0x01, 0x00, 0xd0, 0x83, 0xa8, 0x00, 0xe0, 0x31, 0x00, 0x00,</div><div class='add'>+	0x23, 0x83, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x2d, 0x03,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x0f, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf8, 0x2e, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf2,</div><div class='add'>+	0x02, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x17, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x41, 0x00, 0xa6, 0x96, 0xb0, 0x01, 0x00, 0xee, 0x07, 0x2e, 0x47,</div><div class='add'>+	0x97, 0x90, 0x01, 0x00, 0xe6, 0x83, 0x22, 0x17, 0x96, 0x04, 0x00, 0x00,</div><div class='add'>+	0xe4, 0x83, 0x22, 0x4b, 0xfd, 0x7f, 0x00, 0x00, 0xe4, 0x83, 0x23, 0xa2,</div><div class='add'>+	0x02, 0x6c, 0x00, 0x00, 0x9f, 0x95, 0x00, 0x52, 0x95, 0x30, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x22, 0x41, 0x97, 0x50, 0x00, 0x00, 0x0c, 0x00, 0x2d, 0x00,</div><div class='add'>+	0x12, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x5c, 0x01, 0x80, 0x01, 0x00, 0xa6, 0x95, 0x00, 0x4b,</div><div class='add'>+	0x02, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x50, 0x03, 0xb0, 0x01, 0x00, 0x03, 0x84, 0x00, 0x5c,</div><div class='add'>+	0x17, 0x90, 0x00, 0x00, 0xf8, 0x83, 0x22, 0x43, 0x2f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x45, 0x1f, 0x90, 0x01, 0x00, 0xf1, 0x83, 0x22, 0x5f,</div><div class='add'>+	0x2f, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x2e, 0x10, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x58, 0xf1, 0xb1, 0x01, 0x00, 0x10, 0x00, 0x00, 0x03,</div><div class='add'>+	0xf0, 0xc9, 0x01, 0x00, 0x10, 0x00, 0x00, 0x00, 0xe0, 0xc9, 0x01, 0x00,</div><div class='add'>+	0xed, 0x83, 0x62, 0x42, 0x61, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xb1, 0x01, 0x00, 0xee, 0x83, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x23, 0x83, 0x72, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x20, 0x00, 0x2d, 0x03,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0xff, 0x0f, 0x00, 0xf6, 0x80, 0x88, 0x01, 0x00,</div><div class='add'>+	0xf5, 0x83, 0xa2, 0xa6, 0x81, 0x6c, 0x00, 0x00, 0xf8, 0x83, 0x00, 0xf2,</div><div class='add'>+	0x3a, 0xb0, 0x00, 0x00, 0xf1, 0x84, 0xa2, 0x4b, 0xfd, 0x7f, 0x00, 0x00,</div><div class='add'>+	0xc3, 0x94, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x03, 0x88, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x03, 0x84, 0x22, 0x4a, 0x2f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x03, 0x84, 0x22, 0x48, 0x2f, 0x7c, 0x00, 0x00, 0x0a, 0x00, 0x2d, 0x03,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x3f, 0x00, 0x00, 0xf2, 0x86, 0x88, 0x01, 0x00,</div><div class='add'>+	0x1f, 0x00, 0x00, 0x43, 0x84, 0x88, 0x01, 0x00, 0x05, 0x00, 0x00, 0x43,</div><div class='add'>+	0x80, 0xf4, 0x01, 0x00, 0x98, 0x94, 0x3d, 0x42, 0x81, 0xe0, 0x01, 0x00,</div><div class='add'>+	0x03, 0x84, 0xa2, 0x42, 0xe0, 0x7d, 0x00, 0x00, 0xf1, 0x84, 0xa2, 0x4b,</div><div class='add'>+	0xfd, 0x7f, 0x00, 0x00, 0xc3, 0x94, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x03, 0x88, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x02, 0x04, 0x00, 0x40,</div><div class='add'>+	0x89, 0x98, 0x01, 0x00, 0x02, 0x99, 0x00, 0x00, 0x8a, 0x30, 0x01, 0x00,</div><div class='add'>+	0x05, 0x84, 0x69, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa3,</div><div class='add'>+	0x09, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x79, 0x41, 0x47, 0xc3, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa0, 0xa1, 0x09, 0x6c, 0x00, 0x00, 0x0c, 0x84, 0x22, 0xa1,</div><div class='add'>+	0x09, 0x6c, 0x00, 0x00, 0x27, 0x83, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x08, 0x84, 0x00, 0x03, 0x48, 0xb1, 0x00, 0x00, 0x46, 0x84, 0xa3, 0x92,</div><div class='add'>+	0x03, 0x6c, 0x00, 0x00, 0x25, 0x98, 0x00, 0x40, 0x95, 0x30, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x43, 0xc3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x16,</div><div class='add'>+	0x80, 0xb2, 0x01, 0x00, 0x03, 0x88, 0x27, 0x08, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x13, 0x84, 0x22, 0x5c, 0x17, 0x7c, 0x00, 0x00, 0x14, 0x84, 0x00, 0x00,</div><div class='add'>+	0x2a, 0xb0, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x2a, 0xc8, 0x01, 0x00,</div><div class='add'>+	0x02, 0x00, 0x00, 0x08, 0x80, 0xc8, 0x01, 0x00, 0x18, 0x84, 0xa2, 0x43,</div><div class='add'>+	0x2f, 0x7c, 0x00, 0x00, 0x58, 0x97, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x34, 0x84, 0x00, 0x5e, 0x17, 0x90, 0x00, 0x00, 0x04, 0x00, 0x00, 0x01,</div><div class='add'>+	0x8c, 0xcc, 0x01, 0x00, 0x58, 0x97, 0x00, 0x4c, 0x03, 0x30, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x2e, 0x46, 0x02, 0xb0, 0x01, 0x00, 0x10, 0x80, 0x00, 0x10,</div><div class='add'>+	0x48, 0xc9, 0x01, 0x00, 0x0c, 0x00, 0x00, 0x01, 0xf0, 0xcd, 0x01, 0x00,</div><div class='add'>+	0x2c, 0x00, 0x00, 0x40, 0xf0, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x16,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x10, 0x00, 0x00, 0x15, 0xe0, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x43, 0x61, 0xb1, 0x01, 0x00, 0xa0, 0x00, 0x00, 0xa4,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x21, 0x84, 0xa8, 0x54, 0x17, 0x10, 0x00, 0x00,</div><div class='add'>+	0x34, 0x84, 0x00, 0x5e, 0x17, 0x90, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00,</div><div class='add'>+	0x2a, 0xc8, 0x01, 0x00, 0x33, 0x84, 0x22, 0x43, 0x2f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x01, 0x8c, 0xcc, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4c,</div><div class='add'>+	0x03, 0xb0, 0x01, 0x00, 0x79, 0x97, 0x00, 0x43, 0x61, 0x31, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x2e, 0x46, 0x02, 0xb0, 0x01, 0x00, 0x10, 0x80, 0x00, 0x10,</div><div class='add'>+	0x48, 0xc9, 0x01, 0x00, 0x0c, 0x00, 0x00, 0x01, 0xf0, 0xcd, 0x01, 0x00,</div><div class='add'>+	0x0c, 0x00, 0x00, 0x09, 0xf0, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x18,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x10, 0x00, 0x00, 0x15, 0xe0, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x43, 0x61, 0xb1, 0x01, 0x00, 0xa0, 0x00, 0x00, 0xa4,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x34, 0x84, 0x28, 0x54, 0x17, 0x10, 0x00, 0x00,</div><div class='add'>+	0x30, 0x84, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x79, 0x97, 0x00, 0x43,</div><div class='add'>+	0x61, 0x31, 0x01, 0x00, 0x36, 0x84, 0x22, 0x50, 0x2f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x56, 0x17, 0x90, 0x01, 0x00, 0x07, 0x00, 0x00, 0x17,</div><div class='add'>+	0x98, 0x88, 0x01, 0x00, 0x39, 0x84, 0xa2, 0x41, 0x99, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x55, 0x17, 0x90, 0x01, 0x00, 0x00, 0x00, 0x00, 0x43,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0x3a, 0x84, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0x23, 0x83, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x60, 0x97, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x41, 0x84, 0x22, 0x43, 0x2f, 0x7c, 0x00, 0x00, 0x16, 0x80, 0x00, 0x03,</div><div class='add'>+	0x44, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x1d, 0xe4, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xfa, 0x96, 0x00, 0x5e, 0x05, 0x10, 0x01, 0x00, 0x44, 0x84, 0xa2, 0x5f,</div><div class='add'>+	0x2f, 0x7c, 0x00, 0x00, 0x80, 0x93, 0x00, 0x01, 0x38, 0x43, 0x01, 0x00,</div><div class='add'>+	0xc3, 0x94, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x03, 0x88, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x48, 0x84, 0xa2, 0x4b, 0xfd, 0x7f, 0x00, 0x00,</div><div class='add'>+	0xee, 0x84, 0x00, 0x41, 0x43, 0xc3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x27, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x2d, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x11, 0xb0, 0x01, 0x00, 0x4b, 0x84, 0x35, 0x01,</div><div class='add'>+	0x86, 0x30, 0x00, 0x00, 0x6d, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00,</div><div class='add'>+	0x54, 0x84, 0x28, 0xb1, 0x30, 0x30, 0x00, 0x00, 0x4c, 0x84, 0x22, 0x4d,</div><div class='add'>+	0x75, 0x7d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16, 0x80, 0xb2, 0x01, 0x00,</div><div class='add'>+	0xdb, 0x84, 0xa7, 0x40, 0x11, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x43, 0xc3, 0x01, 0x00, 0x04, 0x00, 0xa2, 0x40, 0x27, 0x6c, 0x00, 0x00,</div><div class='add'>+	0xed, 0x84, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x6d, 0x00, 0x00, 0x40,</div><div class='add'>+	0x61, 0x99, 0x01, 0x00, 0x54, 0x84, 0xa8, 0xb1, 0x12, 0x30, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x16, 0x80, 0xb2, 0x01, 0x00, 0x5e, 0x84, 0xa7, 0x40,</div><div class='add'>+	0x11, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x43, 0xc3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x09, 0x10, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x18,</div><div class='add'>+	0x2c, 0xb0, 0x01, 0x00, 0xde, 0x07, 0x00, 0x43, 0x80, 0xce, 0x01, 0x00,</div><div class='add'>+	0x4c, 0x84, 0xaa, 0x40, 0x81, 0x32, 0x00, 0x00, 0x63, 0x84, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x40, 0x00, 0x3e, 0x43, 0x27, 0xe0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x09, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x18,</div><div class='add'>+	0xe0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41, 0x27, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x4c, 0x84, 0xa3, 0x0b, 0x87, 0x50, 0x00, 0x00, 0x00, 0x00, 0x15, 0x40,</div><div class='add'>+	0x1b, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x23, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa2, 0x03, 0x48, 0x6d, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00,</div><div class='add'>+	0x2a, 0xc8, 0x01, 0x00, 0x40, 0x00, 0x2d, 0x40, 0x39, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x6d, 0x84, 0xa2, 0x40, 0x27, 0x6c, 0x00, 0x00, 0x22, 0x00, 0x00, 0x08,</div><div class='add'>+	0x12, 0xc8, 0x01, 0x00, 0x04, 0x00, 0xa2, 0x16, 0x30, 0x6c, 0x00, 0x00,</div><div class='add'>+	0xde, 0x07, 0x00, 0x40, 0x25, 0x98, 0x01, 0x00, 0x70, 0x84, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x12, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf0, 0x30, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x0b,</div><div class='add'>+	0x25, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x10, 0x32, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x14, 0x00, 0x20, 0x01, 0xe0, 0xb1, 0x01, 0x00, 0xee, 0x07, 0x00, 0x40,</div><div class='add'>+	0x37, 0x98, 0x01, 0x00, 0x75, 0x84, 0x23, 0x01, 0x36, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x01, 0x36, 0xb0, 0x01, 0x00, 0x80, 0x84, 0x82, 0x41,</div><div class='add'>+	0x23, 0x40, 0x00, 0x00, 0x20, 0x80, 0x00, 0x10, 0x42, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x7c, 0x84, 0x22, 0x40, 0xe3, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0x79, 0x84, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0x23, 0x83, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0xed, 0x94, 0x00, 0x43, 0x23, 0x30, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x10, 0x32, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x23, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x03, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x80, 0x00, 0x19, 0x44, 0xc9, 0x01, 0x00, 0x91, 0x84, 0x22, 0x45,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x04, 0x00, 0xa2, 0x41, 0x23, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa2, 0x0b, 0x25, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4c,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x09, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x18, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x43,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x20, 0x00, 0x00, 0x19, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0x88, 0x84, 0xa8, 0x15, 0xe0, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50,</div><div class='add'>+	0x03, 0xd0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x50, 0x33, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4c, 0x25, 0xd0, 0x01, 0x00, 0x0c, 0x00, 0x2d, 0x4c,</div><div class='add'>+	0x13, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x50, 0x37, 0xd0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x50, 0x2b, 0xc0, 0x01, 0x00, 0x75, 0x84, 0x00, 0x45,</div><div class='add'>+	0x1f, 0x80, 0x00, 0x00, 0x93, 0x84, 0xa3, 0x12, 0x36, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x94, 0x84, 0x68, 0x1b, 0x28, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x68, 0x12,</div><div class='add'>+	0x28, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x09, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x18, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x43,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x20, 0x00, 0x00, 0x19, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0x97, 0x84, 0xa8, 0x15, 0xe0, 0x31, 0x00, 0x00, 0xbf, 0x84, 0x22, 0x14,</div><div class='add'>+	0x02, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x33, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x14, 0x24, 0xd0, 0x01, 0x00, 0x0c, 0x00, 0x2d, 0x14,</div><div class='add'>+	0x12, 0xc0, 0x01, 0x00, 0xb7, 0x84, 0xa2, 0x14, 0x36, 0x50, 0x00, 0x00,</div><div class='add'>+	0xa7, 0x84, 0x22, 0x5c, 0x1f, 0x7c, 0x00, 0x00, 0x30, 0x80, 0x00, 0x10,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0xa5, 0x84, 0x22, 0x40, 0xe3, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x42, 0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0xa2, 0x84, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x23, 0x83, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x0c, 0x00, 0x2d, 0x5c, 0x1f, 0x80, 0x01, 0x00,</div><div class='add'>+	0x10, 0x00, 0x00, 0xf0, 0x2a, 0xc8, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5c,</div><div class='add'>+	0x2b, 0x80, 0x01, 0x00, 0x04, 0x00, 0x22, 0x50, 0x2b, 0x6c, 0x00, 0x00,</div><div class='add'>+	0xf0, 0x07, 0x00, 0x40, 0x37, 0x98, 0x01, 0x00, 0xad, 0x84, 0x23, 0x01,</div><div class='add'>+	0x36, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x36, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xb8, 0x84, 0x22, 0x1b, 0x02, 0x6c, 0x00, 0x00, 0x30, 0x00, 0x00, 0x10,</div><div class='add'>+	0x48, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x2e, 0x5c, 0x1f, 0x90, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x50, 0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x03,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0xff, 0x07, 0x00, 0x15, 0xe0, 0x8d, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x42, 0x61, 0xb1, 0x01, 0x00, 0xa0, 0x00, 0x00, 0xa4,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0xb4, 0x84, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0xb8, 0x84, 0x00, 0x03, 0x48, 0xb1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14,</div><div class='add'>+	0x2a, 0xc0, 0x01, 0x00, 0x75, 0x84, 0xa2, 0x40, 0x25, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x39, 0xc0, 0x01, 0x00, 0x04, 0x00, 0x20, 0x13,</div><div class='add'>+	0x38, 0x6c, 0x00, 0x00, 0x40, 0x00, 0x3d, 0x43, 0x39, 0xe0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x0b, 0x25, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8,</div><div class='add'>+	0x12, 0xb0, 0x01, 0x00, 0x75, 0x84, 0x00, 0xf0, 0x30, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa2, 0x5c, 0x1f, 0x7c, 0x00, 0x00, 0x00, 0x80, 0x00, 0x19,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0xc6, 0x84, 0x22, 0x40, 0xe3, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x43, 0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x19,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0xc3, 0x84, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x23, 0x83, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0xed, 0x94, 0x00, 0x40,</div><div class='add'>+	0x2b, 0x30, 0x01, 0x00, 0x18, 0x00, 0x2e, 0x03, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xca, 0x84, 0x22, 0x50, 0x2f, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x56,</div><div class='add'>+	0x17, 0x90, 0x01, 0x00, 0x07, 0x00, 0x00, 0x17, 0x98, 0x88, 0x01, 0x00,</div><div class='add'>+	0xcd, 0x84, 0xa2, 0x41, 0x99, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55,</div><div class='add'>+	0x17, 0x90, 0x01, 0x00, 0xd0, 0x84, 0x22, 0x43, 0x2f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x54, 0x17, 0x90, 0x01, 0x00, 0x16, 0x00, 0x20, 0x1d,</div><div class='add'>+	0xe4, 0xb1, 0x01, 0x00, 0xd2, 0x84, 0xa3, 0x40, 0x27, 0x6c, 0x00, 0x00,</div><div class='add'>+	0xd4, 0x84, 0x60, 0x5f, 0x17, 0x90, 0x00, 0x00, 0x00, 0x84, 0x00, 0x0b,</div><div class='add'>+	0x16, 0xdc, 0x01, 0x00, 0x00, 0x00, 0x60, 0x13, 0x16, 0x94, 0x01, 0x00,</div><div class='add'>+	0xfa, 0x96, 0x00, 0x5e, 0x05, 0x10, 0x01, 0x00, 0x04, 0x00, 0xa2, 0x40,</div><div class='add'>+	0x0f, 0x6c, 0x00, 0x00, 0x03, 0x88, 0xa2, 0x5f, 0x2f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x14, 0x80, 0x00, 0x03, 0x42, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf2,</div><div class='add'>+	0x02, 0xb0, 0x01, 0x00, 0x80, 0x93, 0x00, 0x01, 0x38, 0x43, 0x01, 0x00,</div><div class='add'>+	0x03, 0x88, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0xa2, 0x03,</div><div class='add'>+	0x48, 0x6d, 0x00, 0x00, 0x04, 0x00, 0x22, 0x4d, 0x75, 0x7d, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x83, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4d,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x04, 0x00, 0x22, 0x40, 0x11, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x16, 0x62, 0xb1, 0x01, 0x00, 0xe0, 0x84, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x62, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xe2, 0x84, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0xed, 0x84, 0x22, 0x13,</div><div class='add'>+	0x82, 0x6c, 0x00, 0x00, 0x40, 0x00, 0x3d, 0x43, 0x83, 0xe0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf8, 0x10, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0,</div><div class='add'>+	0x2c, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x16, 0x62, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xe8, 0x84, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08,</div><div class='add'>+	0x62, 0xb1, 0x01, 0x00, 0xea, 0x84, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0xe4, 0x84, 0x00, 0x41, 0x83, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x15, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x82, 0x00, 0xa6, 0x04, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xa0, 0x98, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00, 0x30, 0x05, 0x00, 0x41,</div><div class='add'>+	0x89, 0x30, 0x01, 0x00, 0x9f, 0x95, 0x00, 0x52, 0x95, 0x30, 0x01, 0x00,</div><div class='add'>+	0xa6, 0x95, 0x00, 0x4b, 0x02, 0xb0, 0x00, 0x00, 0x03, 0x88, 0x00, 0x40,</div><div class='add'>+	0x0f, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5f, 0x01, 0x80, 0x01, 0x00,</div><div class='add'>+	0x10, 0x00, 0x00, 0x00, 0x0e, 0xf4, 0x01, 0x00, 0x04, 0x00, 0x26, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x88, 0x01, 0x00,</div><div class='add'>+	0x05, 0x04, 0x00, 0x40, 0x89, 0x98, 0x01, 0x00, 0x02, 0x99, 0x00, 0x00,</div><div class='add'>+	0x8a, 0x30, 0x01, 0x00, 0x03, 0x00, 0x00, 0x07, 0x1a, 0xf4, 0x01, 0x00,</div><div class='add'>+	0x12, 0x95, 0x00, 0x07, 0x16, 0x30, 0x01, 0x00, 0x05, 0x85, 0x22, 0x41,</div><div class='add'>+	0x81, 0x6c, 0x00, 0x00, 0x00, 0x85, 0x22, 0x42, 0x81, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x23, 0x83, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x04, 0x85, 0x22, 0x5f,</div><div class='add'>+	0x0f, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5f, 0x0f, 0x80, 0x01, 0x00,</div><div class='add'>+	0x06, 0x04, 0x00, 0x40, 0x89, 0x98, 0x01, 0x00, 0x02, 0x99, 0x00, 0x00,</div><div class='add'>+	0x8a, 0x30, 0x01, 0x00, 0xed, 0x87, 0x00, 0x40, 0x0f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x14, 0x85, 0xa2, 0x5a, 0x1f, 0x7c, 0x00, 0x00, 0x04, 0x00, 0xa2, 0x5a,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x00, 0xb5, 0x00, 0x0d, 0x42, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x22, 0x0b, 0xe6, 0x7d, 0x00, 0x00, 0x00, 0xb7, 0x00, 0x0d,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0x04, 0x00, 0x22, 0x0b, 0xe6, 0x7d, 0x00, 0x00,</div><div class='add'>+	0x6a, 0x94, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x14, 0x85, 0x22, 0x20,</div><div class='add'>+	0x85, 0x6c, 0x00, 0x00, 0x0f, 0x85, 0x9c, 0x0f, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x23, 0x83, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x87, 0x95, 0x00, 0x5c,</div><div class='add'>+	0x1f, 0x00, 0x01, 0x00, 0xc2, 0x97, 0x00, 0x42, 0x61, 0x31, 0x01, 0x00,</div><div class='add'>+	0x23, 0x83, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x90, 0x04, 0x00, 0x07,</div><div class='add'>+	0x96, 0x30, 0x01, 0x00, 0x00, 0x00, 0x2d, 0x05, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa2, 0x4b, 0xe1, 0x7d, 0x00, 0x00, 0x00, 0x00, 0x2d, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x18, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x19, 0x85, 0x22, 0x3a, 0x01, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+	0x8e, 0xb0, 0x01, 0x00, 0x69, 0x89, 0x00, 0x40, 0x01, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x2e, 0x00, 0x2d, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x1e, 0x85, 0xa2, 0x40, 0xe7, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x0a, 0x00, 0x00, 0x40, 0x8f, 0x98, 0x01, 0x00, 0x69, 0x89, 0x00, 0x40,</div><div class='add'>+	0x01, 0xb0, 0x00, 0x00, 0x17, 0x94, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x22, 0x00, 0x80, 0x32, 0x00, 0x00, 0x35, 0x04, 0x00, 0x40,</div><div class='add'>+	0x89, 0x98, 0x01, 0x00, 0x02, 0x99, 0x00, 0x00, 0x8a, 0x30, 0x01, 0x00,</div><div class='add'>+	0x87, 0x96, 0x00, 0x95, 0x03, 0x30, 0x01, 0x00, 0x23, 0x83, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x2d, 0x03, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x22, 0x00, 0x2d, 0xf0, 0x2e, 0xb0, 0x01, 0x00, 0x04, 0x00, 0x1f, 0x17,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x28, 0x20, 0x00, 0xa6, 0x96, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x2b, 0x85, 0x22, 0x17, 0x96, 0x04, 0x00, 0x00, 0x55, 0x97, 0x00, 0x4b,</div><div class='add'>+	0x95, 0x30, 0x01, 0x00, 0x69, 0x89, 0x00, 0x4c, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x2d, 0x85, 0x83, 0x17, 0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0x43, 0xc1, 0x01, 0x00, 0x2f, 0x85, 0x85, 0x17, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x48, 0x43, 0xc1, 0x01, 0x00, 0x28, 0x00, 0x00, 0xf6,</div><div class='add'>+	0x02, 0xcc, 0x01, 0x00, 0x12, 0x00, 0x00, 0xa1, 0x2a, 0xc8, 0x01, 0x00,</div><div class='add'>+	0x57, 0x96, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0xa9, 0x93, 0x00, 0x41,</div><div class='add'>+	0x81, 0x30, 0x01, 0x00, 0x69, 0x89, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x01, 0x00, 0xd0, 0x01, 0x00, 0x00, 0x00, 0x2e, 0x10,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x28, 0x00, 0x00, 0x40, 0xf1, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x03, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x39, 0x85, 0x64, 0x47, 0x61, 0x31, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x10, 0x62, 0xb1, 0x01, 0x00, 0x3a, 0x85, 0xa8, 0x1b,</div><div class='add'>+	0xe0, 0x31, 0x00, 0x00, 0x23, 0x83, 0x74, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x45, 0x03, 0xe0, 0x01, 0x00, 0x04, 0x00, 0xa0, 0x05,</div><div class='add'>+	0x03, 0x6c, 0x00, 0x00, 0x04, 0x00, 0xa3, 0x09, 0x03, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x08, 0x00, 0x2d, 0x03, 0x48, 0xb1, 0x01, 0x00, 0x6b, 0x85, 0x01, 0xfb,</div><div class='add'>+	0x08, 0x30, 0x00, 0x00, 0xd5, 0x85, 0x87, 0xfb, 0x22, 0x30, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xfa, 0x0e, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8,</div><div class='add'>+	0x14, 0xb0, 0x01, 0x00, 0x03, 0x00, 0x00, 0x07, 0x1a, 0xf4, 0x01, 0x00,</div><div class='add'>+	0x12, 0x95, 0x00, 0x07, 0x16, 0x30, 0x01, 0x00, 0x5c, 0x85, 0x22, 0x41,</div><div class='add'>+	0x81, 0x6c, 0x00, 0x00, 0x4b, 0x85, 0x22, 0x42, 0x81, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x23, 0x83, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x5b, 0x85, 0x22, 0x5f,</div><div class='add'>+	0x0f, 0x7c, 0x00, 0x00, 0x38, 0x00, 0x00, 0x04, 0x7e, 0x89, 0x01, 0x00,</div><div class='add'>+	0x51, 0x85, 0xa6, 0x5f, 0x0f, 0x00, 0x00, 0x00, 0x2b, 0x94, 0x00, 0x40,</div><div class='add'>+	0x05, 0x30, 0x01, 0x00, 0x0a, 0x04, 0x00, 0x40, 0x89, 0x98, 0x01, 0x00,</div><div class='add'>+	0x02, 0x99, 0x00, 0x00, 0x8a, 0x30, 0x01, 0x00, 0x58, 0x85, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x13, 0x00, 0x00, 0x40, 0x87, 0x98, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x2d, 0x03, 0x48, 0xb1, 0x01, 0x00, 0x0c, 0x00, 0x2d, 0xf0,</div><div class='add'>+	0x82, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x84, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x26, 0x96, 0x00, 0x40, 0x05, 0x30, 0x01, 0x00, 0x08, 0x04, 0x00, 0x40,</div><div class='add'>+	0x89, 0x98, 0x01, 0x00, 0x02, 0x99, 0x00, 0x00, 0x8a, 0x30, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa2, 0x5c, 0x1f, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5c,</div><div class='add'>+	0x1f, 0x90, 0x01, 0x00, 0xed, 0x87, 0x00, 0x40, 0x0f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x69, 0x85, 0xa2, 0x5a, 0x1f, 0x7c, 0x00, 0x00, 0x04, 0x00, 0xa2, 0x5a,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x00, 0xb5, 0x00, 0x0d, 0x42, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x22, 0x0b, 0xe6, 0x7d, 0x00, 0x00, 0x00, 0xb7, 0x00, 0x0d,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0x04, 0x00, 0x22, 0x0b, 0xe6, 0x7d, 0x00, 0x00,</div><div class='add'>+	0x6a, 0x94, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x69, 0x85, 0x22, 0x20,</div><div class='add'>+	0x85, 0x6c, 0x00, 0x00, 0x66, 0x85, 0x9c, 0x0f, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x23, 0x83, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x87, 0x95, 0x00, 0x5c,</div><div class='add'>+	0x1f, 0x00, 0x01, 0x00, 0xc2, 0x97, 0x00, 0x42, 0x61, 0x31, 0x01, 0x00,</div><div class='add'>+	0x23, 0x83, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x90, 0x04, 0x00, 0x07,</div><div class='add'>+	0x96, 0x30, 0x01, 0x00, 0x00, 0x00, 0x2d, 0x05, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf0, 0x18, 0xb0, 0x01, 0x00, 0x6d, 0x85, 0x21, 0x04,</div><div class='add'>+	0x80, 0x20, 0x00, 0x00, 0x6e, 0x85, 0x00, 0x40, 0x10, 0xc9, 0x00, 0x00,</div><div class='add'>+	0xa1, 0x88, 0x00, 0x4b, 0x81, 0xb0, 0x00, 0x00, 0x9c, 0x85, 0x00, 0x43,</div><div class='add'>+	0x81, 0xb0, 0x00, 0x00, 0xa0, 0x85, 0x00, 0xfb, 0x22, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xa1, 0x88, 0x00, 0x41, 0x81, 0xb0, 0x00, 0x00, 0x69, 0x89, 0x00, 0x4e,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x91, 0x85, 0x00, 0x5a, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x76, 0x85, 0x00, 0x47, 0x8f, 0xb0, 0x00, 0x00, 0xa1, 0x88, 0x00, 0x53,</div><div class='add'>+	0x81, 0xb0, 0x00, 0x00, 0xa1, 0x88, 0x00, 0x56, 0x81, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x32, 0x00, 0x2d, 0x05, 0x48, 0xb1, 0x01, 0x00, 0x07, 0x04, 0x00, 0x40,</div><div class='add'>+	0x89, 0x98, 0x01, 0x00, 0x02, 0x99, 0x00, 0x00, 0x8a, 0x30, 0x01, 0x00,</div><div class='add'>+	0x3c, 0x04, 0x00, 0x40, 0x89, 0x98, 0x01, 0x00, 0x02, 0x99, 0x00, 0x0a,</div><div class='add'>+	0x8a, 0x30, 0x01, 0x00, 0x3d, 0x04, 0x00, 0x40, 0x89, 0x98, 0x01, 0x00,</div><div class='add'>+	0x18, 0x00, 0x00, 0x11, 0x8a, 0xe4, 0x01, 0x00, 0x02, 0x99, 0x00, 0xf2,</div><div class='add'>+	0x8a, 0x14, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x69, 0x89, 0xa0, 0x0a, 0xe4, 0x6d, 0x00, 0x00, 0x84, 0x85, 0xa2, 0x41,</div><div class='add'>+	0x19, 0x7c, 0x00, 0x00, 0x83, 0x85, 0x22, 0x0a, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x69, 0x89, 0x00, 0x53, 0x8f, 0xb0, 0x00, 0x00, 0x69, 0x89, 0x00, 0x54,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x8d, 0x85, 0x22, 0x0a, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x87, 0x85, 0xa2, 0x0a, 0xe4, 0x6d, 0x00, 0x00, 0x69, 0x89, 0x00, 0x5d,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf2, 0x80, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x0a, 0x80, 0xd0, 0x01, 0x00, 0x8b, 0x85, 0xa0, 0x91,</div><div class='add'>+	0x81, 0x6c, 0x00, 0x00, 0x69, 0x89, 0x00, 0x5e, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x25, 0x00, 0x00, 0x40, 0x8f, 0x98, 0x01, 0x00, 0x69, 0x89, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x8f, 0x85, 0x20, 0x91, 0xe5, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x69, 0x89, 0x00, 0x54, 0x8f, 0xb0, 0x00, 0x00, 0x21, 0x00, 0x00, 0x40,</div><div class='add'>+	0x8f, 0x98, 0x01, 0x00, 0x69, 0x89, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x32, 0x00, 0x2d, 0x05, 0x48, 0xb1, 0x01, 0x00, 0x07, 0x04, 0x00, 0x40,</div><div class='add'>+	0x89, 0x98, 0x01, 0x00, 0x02, 0x99, 0x00, 0x00, 0x8a, 0x30, 0x01, 0x00,</div><div class='add'>+	0x3c, 0x04, 0x00, 0x40, 0x89, 0x98, 0x01, 0x00, 0x02, 0x99, 0x00, 0x0a,</div><div class='add'>+	0x8a, 0x30, 0x01, 0x00, 0x3d, 0x04, 0x00, 0x40, 0x89, 0x98, 0x01, 0x00,</div><div class='add'>+	0x02, 0x99, 0x00, 0xf2, 0x8a, 0x30, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x69, 0x89, 0xa0, 0x0a, 0xe4, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x24, 0x00, 0x00, 0x40, 0x8f, 0x98, 0x01, 0x00, 0x69, 0x89, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x37, 0x00, 0x2d, 0x05, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0xf3, 0x82, 0xf4, 0x01, 0x00, 0xa1, 0x88, 0xa0, 0x42,</div><div class='add'>+	0x83, 0x6c, 0x00, 0x00, 0xa1, 0x88, 0x00, 0x54, 0x81, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf2, 0x0e, 0xb0, 0x01, 0x00, 0x04, 0x00, 0x23, 0x40,</div><div class='add'>+	0x0f, 0x6c, 0x00, 0x00, 0x04, 0x00, 0x20, 0xaa, 0x0f, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x09, 0x04, 0x00, 0x40, 0x89, 0x98, 0x01, 0x00, 0x02, 0x99, 0x00, 0x00,</div><div class='add'>+	0x8a, 0x30, 0x01, 0x00, 0x03, 0x00, 0x00, 0x07, 0x1a, 0xf4, 0x01, 0x00,</div><div class='add'>+	0x00, 0xb5, 0x00, 0x0d, 0x42, 0xc9, 0x01, 0x00, 0x07, 0x00, 0x00, 0x07,</div><div class='add'>+	0x16, 0x88, 0x01, 0x00, 0xae, 0x85, 0x22, 0x0b, 0xe6, 0x7d, 0x00, 0x00,</div><div class='add'>+	0x0a, 0x00, 0x00, 0x40, 0x87, 0x98, 0x01, 0x00, 0x78, 0x98, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x04, 0x00, 0x1c, 0x0f, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x0f, 0xb0, 0x01, 0x00, 0xed, 0x87, 0x00, 0x5c,</div><div class='add'>+	0x1f, 0x90, 0x00, 0x00, 0xc0, 0x85, 0x22, 0x50, 0xfd, 0x7f, 0x00, 0x00,</div><div class='add'>+	0xbb, 0x85, 0xa2, 0x54, 0xfd, 0x7f, 0x00, 0x00, 0xb3, 0x85, 0x22, 0x55,</div><div class='add'>+	0xfd, 0x7f, 0x00, 0x00, 0x82, 0x00, 0x00, 0x40, 0x87, 0x98, 0x01, 0x00,</div><div class='add'>+	0xaa, 0x85, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x22, 0x53,</div><div class='add'>+	0xfd, 0x7f, 0x00, 0x00, 0x14, 0x80, 0x00, 0x03, 0x42, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf0, 0x96, 0xb0, 0x01, 0x00, 0x10, 0x00, 0x00, 0x4b,</div><div class='add'>+	0x80, 0xf4, 0x01, 0x00, 0x0c, 0xbc, 0x00, 0x40, 0x87, 0x98, 0x01, 0x00,</div><div class='add'>+	0xbb, 0x85, 0x22, 0x43, 0x80, 0x6c, 0x00, 0x00, 0xff, 0xff, 0x00, 0x4b,</div><div class='add'>+	0x80, 0x88, 0x01, 0x00, 0xaa, 0x85, 0xa2, 0x43, 0x80, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x7c, 0x96, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00, 0xbc, 0x85, 0x46, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0xbf, 0x85, 0xa0, 0xf0, 0x30, 0x6f, 0x00, 0x00,</div><div class='add'>+	0xb1, 0x85, 0x1e, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x41,</div><div class='add'>+	0x31, 0xc3, 0x01, 0x00, 0x79, 0x94, 0x00, 0x40, 0x25, 0x30, 0x01, 0x00,</div><div class='add'>+	0xc4, 0x85, 0x9c, 0x0f, 0x80, 0x32, 0x00, 0x00, 0x23, 0x83, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x87, 0x95, 0x00, 0x5c, 0x1f, 0x00, 0x01, 0x00,</div><div class='add'>+	0x14, 0x80, 0x00, 0x03, 0x42, 0xc9, 0x01, 0x00, 0x04, 0x00, 0x22, 0x5a,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x96, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x2f, 0x05, 0x48, 0xb1, 0x01, 0x00, 0x10, 0x00, 0x00, 0x07,</div><div class='add'>+	0x18, 0xe4, 0x01, 0x00, 0x00, 0x08, 0x00, 0x0c, 0xe0, 0x99, 0x01, 0x00,</div><div class='add'>+	0x90, 0x04, 0x00, 0x07, 0x96, 0x30, 0x01, 0x00, 0x00, 0xb5, 0x00, 0x0d,</div><div class='add'>+	0x46, 0xc9, 0x01, 0x00, 0xcc, 0x85, 0x30, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa2, 0x0b, 0xe6, 0x7d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0b,</div><div class='add'>+	0xe6, 0x91, 0x01, 0x00, 0x00, 0x02, 0x00, 0xa1, 0x46, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa2, 0x0b, 0xe6, 0x7d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0b,</div><div class='add'>+	0xe6, 0x91, 0x01, 0x00, 0x04, 0x00, 0x2e, 0x05, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x10, 0x40, 0xe1, 0xb1, 0x01, 0x00, 0xa1, 0x88, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfb, 0x28, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xfb, 0x86, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8,</div><div class='add'>+	0x14, 0xb0, 0x01, 0x00, 0xe0, 0x85, 0x22, 0x46, 0x23, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x22, 0x40, 0x87, 0x6c, 0x00, 0x00, 0xdc, 0x85, 0x22, 0x40,</div><div class='add'>+	0x87, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x48, 0x1f, 0x90, 0x01, 0x00,</div><div class='add'>+	0xde, 0x85, 0x22, 0x41, 0x87, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x47,</div><div class='add'>+	0x1f, 0x90, 0x01, 0x00, 0xe0, 0x85, 0x22, 0x42, 0x87, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x45, 0x1f, 0x90, 0x01, 0x00, 0x04, 0x00, 0x22, 0x40,</div><div class='add'>+	0x09, 0x7c, 0x00, 0x00, 0xe1, 0x85, 0x66, 0x1b, 0x2c, 0x30, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xa0, 0x13, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x76, 0x41,</div><div class='add'>+	0x41, 0xc3, 0x01, 0x00, 0x13, 0x86, 0x23, 0x92, 0x15, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x13, 0x86, 0xa2, 0x45, 0x1f, 0x7c, 0x00, 0x00, 0x19, 0x86, 0x22, 0x4b,</div><div class='add'>+	0xfd, 0x7f, 0x00, 0x00, 0x17, 0x00, 0x00, 0xd0, 0xa2, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x27, 0xb0, 0x01, 0x00, 0x02, 0x00, 0x00, 0x0a,</div><div class='add'>+	0x24, 0xc8, 0x01, 0x00, 0xb9, 0x94, 0x00, 0x40, 0x0f, 0x30, 0x01, 0x00,</div><div class='add'>+	0x11, 0x86, 0x22, 0x08, 0x40, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0xa3, 0xc1, 0x01, 0x00, 0xf0, 0x07, 0x00, 0x12, 0x24, 0xcc, 0x01, 0x00,</div><div class='add'>+	0xea, 0x85, 0xaa, 0x41, 0x27, 0x40, 0x00, 0x00, 0x04, 0x00, 0xa3, 0x49,</div><div class='add'>+	0x27, 0x6c, 0x00, 0x00, 0x01, 0x00, 0x00, 0x13, 0x80, 0xcc, 0x01, 0x00,</div><div class='add'>+	0x0b, 0x86, 0x26, 0x40, 0x23, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x83, 0xb0, 0x01, 0x00, 0x60, 0x00, 0x00, 0x03, 0x84, 0xc8, 0x01, 0x00,</div><div class='add'>+	0x10, 0x00, 0x00, 0x10, 0x48, 0xcd, 0x01, 0x00, 0x17, 0x00, 0x00, 0xd0,</div><div class='add'>+	0xa2, 0xc9, 0x01, 0x00, 0xf8, 0x85, 0xa2, 0x40, 0x83, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x04, 0x86, 0x00, 0x41, 0x83, 0xb0, 0x00, 0x00, 0x00, 0x80, 0x00, 0x42,</div><div class='add'>+	0x44, 0x99, 0x01, 0x00, 0x00, 0x00, 0x68, 0x21, 0x38, 0x96, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x2e, 0x50, 0x49, 0xc1, 0x01, 0x00, 0xfd, 0x85, 0xa2, 0x44,</div><div class='add'>+	0x23, 0x6c, 0x00, 0x00, 0x30, 0x00, 0x00, 0x03, 0x48, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x44, 0xf1, 0xb1, 0x01, 0x00, 0x0c, 0x00, 0x00, 0x20,</div><div class='add'>+	0xf0, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xa0, 0x00, 0x00, 0xa4, 0x62, 0xdd, 0x01, 0x00, 0x00, 0x86, 0xa8, 0x42,</div><div class='add'>+	0xe0, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x85, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x23, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0xa3, 0xc1, 0x01, 0x00, 0xf6, 0x85, 0xa2, 0x41, 0x81, 0x50, 0x00, 0x00,</div><div class='add'>+	0x0b, 0x86, 0x22, 0x40, 0x23, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0x08, 0x86, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0x23, 0x83, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x0b, 0x04, 0x00, 0x40, 0x89, 0x98, 0x01, 0x00,</div><div class='add'>+	0x02, 0x99, 0x00, 0x00, 0x8a, 0x30, 0x01, 0x00, 0x00, 0x00, 0x00, 0x03,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0xee, 0x07, 0x00, 0x40, 0x25, 0x98, 0x01, 0x00,</div><div class='add'>+	0x17, 0x00, 0x00, 0xd0, 0x2a, 0xc8, 0x01, 0x00, 0x24, 0x86, 0x00, 0x17,</div><div class='add'>+	0x10, 0xb0, 0x00, 0x00, 0x04, 0x97, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x19, 0x86, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xb9, 0x94, 0x00, 0x92,</div><div class='add'>+	0x25, 0x30, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x31, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x0b, 0x04, 0x00, 0x40, 0x89, 0x98, 0x01, 0x00, 0x02, 0x99, 0x00, 0x00,</div><div class='add'>+	0x8a, 0x30, 0x01, 0x00, 0x19, 0x86, 0x22, 0x08, 0x2e, 0x30, 0x00, 0x00,</div><div class='add'>+	0x24, 0x86, 0x00, 0x41, 0x27, 0xb0, 0x00, 0x00, 0x80, 0x80, 0x00, 0xa6,</div><div class='add'>+	0x04, 0xb0, 0x01, 0x00, 0x06, 0x00, 0x00, 0x40, 0x87, 0x98, 0x01, 0x00,</div><div class='add'>+	0x78, 0x98, 0x00, 0x0a, 0x8c, 0x30, 0x01, 0x00, 0x04, 0x00, 0x1c, 0x0f,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x0f, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x5c, 0x1f, 0x90, 0x01, 0x00, 0x04, 0x00, 0xa0, 0x9f,</div><div class='add'>+	0x13, 0x6c, 0x00, 0x00, 0x23, 0x86, 0x22, 0x9f, 0x13, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x02, 0x00, 0x00, 0x88, 0x1c, 0xcc, 0x01, 0x00, 0x27, 0x83, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0xed, 0x87, 0x00, 0x41, 0x3f, 0xc3, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x0f, 0xb0, 0x01, 0x00, 0x28, 0x00, 0x00, 0x01,</div><div class='add'>+	0x80, 0xce, 0x01, 0x00, 0x38, 0x86, 0x2a, 0x40, 0x81, 0x30, 0x00, 0x00,</div><div class='add'>+	0x00, 0x80, 0x00, 0x10, 0x44, 0xc9, 0x01, 0x00, 0x40, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0x98, 0x01, 0x00, 0x2d, 0x86, 0xa2, 0x48, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x2d, 0x86, 0xa2, 0x47, 0x1f, 0x7c, 0x00, 0x00, 0x2d, 0x86, 0xa3, 0x07,</div><div class='add'>+	0x03, 0x6c, 0x00, 0x00, 0x80, 0x00, 0x00, 0x40, 0x81, 0x98, 0x01, 0x00,</div><div class='add'>+	0x30, 0x86, 0xa3, 0x40, 0x02, 0x6c, 0x00, 0x00, 0x28, 0x00, 0x00, 0x01,</div><div class='add'>+	0xf0, 0xcd, 0x01, 0x00, 0x32, 0x86, 0x00, 0x40, 0x0f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x28, 0x00, 0x00, 0x40, 0xf0, 0xcd, 0x01, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x0e, 0xcc, 0x01, 0x00, 0x28, 0x00, 0x00, 0x03, 0xf0, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x28, 0x00, 0x00, 0x00, 0xf0, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x16,</div><div class='add'>+	0xe0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x47, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x20, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00, 0x36, 0x86, 0xa8, 0x5c,</div><div class='add'>+	0x1f, 0x10, 0x00, 0x00, 0x04, 0x00, 0x22, 0x0a, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa2, 0x03, 0x48, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x43, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x08, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xa0, 0x01, 0x2d, 0x40, 0x00, 0xc0, 0x01, 0x00, 0x19, 0x87, 0x22, 0x0f,</div><div class='add'>+	0x42, 0x05, 0x00, 0x00, 0x4b, 0x86, 0x9c, 0x0f, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x5c, 0x1f, 0x80, 0x01, 0x00, 0x00, 0x80, 0x00, 0x10,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0x46, 0x86, 0x22, 0x40, 0xe3, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x47, 0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x43, 0x86, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x23, 0x83, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x4b, 0x86, 0x22, 0x07,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x42, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x07, 0x42, 0xc1, 0x01, 0x00, 0x00, 0x80, 0x00, 0xa1,</div><div class='add'>+	0x46, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5f, 0xe1, 0x91, 0x01, 0x00,</div><div class='add'>+	0xc0, 0x06, 0xa2, 0x45, 0x1f, 0x7c, 0x00, 0x00, 0x10, 0x00, 0x00, 0x03,</div><div class='add'>+	0x48, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x2d, 0x54, 0x29, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf8, 0x18, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8,</div><div class='add'>+	0x04, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x0e, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x26, 0x40, 0x81, 0x32, 0x00, 0x00, 0x04, 0x00, 0xa2, 0x5f,</div><div class='add'>+	0x0f, 0x7c, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x14, 0x80, 0xce, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0xaa, 0x40, 0x81, 0x32, 0x00, 0x00, 0x42, 0x00, 0x00, 0x03,</div><div class='add'>+	0x0a, 0xc8, 0x01, 0x00, 0x0c, 0x00, 0x00, 0xa4, 0x0c, 0xc8, 0x01, 0x00,</div><div class='add'>+	0x10, 0x95, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0x14,</div><div class='add'>+	0x02, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x14, 0x24, 0xd0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x14, 0x10, 0xc0, 0x01, 0x00, 0x12, 0x00, 0x00, 0x08,</div><div class='add'>+	0x10, 0xc8, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x23, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xfe, 0x7f, 0x00, 0x05, 0x44, 0xc9, 0x01, 0x00, 0x04, 0x00, 0xa2, 0xa2,</div><div class='add'>+	0x86, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0xe4, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x79, 0x86, 0x22, 0x01, 0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x44,</div><div class='add'>+	0x23, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x2e, 0xa4, 0x80, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x10, 0x48, 0xc1, 0x01, 0x00, 0x66, 0x86, 0xa3, 0x07,</div><div class='add'>+	0x02, 0x6c, 0x00, 0x00, 0x67, 0x86, 0x68, 0x01, 0x1a, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x68, 0x07, 0x1a, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x0d,</div><div class='add'>+	0x02, 0xd0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x05, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x0c, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x02,</div><div class='add'>+	0xe0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x0d, 0x0a, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x73, 0x86, 0x22, 0x40, 0x03, 0x6c, 0x00, 0x00, 0x73, 0x86, 0x22, 0x42,</div><div class='add'>+	0x23, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x23, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x47, 0x61, 0xb1, 0x01, 0x00, 0xa0, 0x00, 0x00, 0xa4,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x99, 0x86, 0x28, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x70, 0x86, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10,</div><div class='add'>+	0x80, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x47, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x62, 0xb1, 0x01, 0x00, 0x75, 0x86, 0xa8, 0x40,</div><div class='add'>+	0x23, 0x30, 0x00, 0x00, 0x23, 0x83, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x99, 0x86, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x44,</div><div class='add'>+	0x23, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xa4, 0x86, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x2e, 0x10, 0x48, 0xc1, 0x01, 0x00, 0x7e, 0x86, 0xa3, 0x12,</div><div class='add'>+	0x0e, 0x6c, 0x00, 0x00, 0x7f, 0x86, 0x60, 0x07, 0x1a, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x60, 0x12, 0x1a, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x68, 0x0d,</div><div class='add'>+	0x16, 0x94, 0x01, 0x00, 0xff, 0xff, 0x00, 0x0b, 0x16, 0xd8, 0x01, 0x00,</div><div class='add'>+	0x14, 0x99, 0x00, 0x08, 0x98, 0x30, 0x01, 0x00, 0x00, 0x00, 0x68, 0x08,</div><div class='add'>+	0x3e, 0x96, 0x01, 0x00, 0x00, 0x00, 0x00, 0x0c, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x02, 0xe0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x10,</div><div class='add'>+	0x86, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x46, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x20, 0x00, 0x00, 0x43, 0x62, 0xdd, 0x01, 0x00, 0x87, 0x86, 0xa8, 0x5c,</div><div class='add'>+	0x1f, 0x10, 0x00, 0x00, 0xb9, 0x86, 0x22, 0x0d, 0x14, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x8d, 0x86, 0x22, 0x0d, 0x24, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0d,</div><div class='add'>+	0x10, 0xc0, 0x01, 0x00, 0x92, 0x86, 0x00, 0x0d, 0x24, 0xd0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x22, 0x4b, 0xfd, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x2b, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x15, 0xa2, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x10, 0x00, 0x00, 0x20, 0x10, 0xc8, 0x01, 0x00, 0xf0, 0x07, 0x00, 0x40,</div><div class='add'>+	0x25, 0x98, 0x01, 0x00, 0x94, 0x86, 0x22, 0x42, 0x23, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x99, 0x86, 0x00, 0x41, 0x23, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0x95, 0x86, 0xa8, 0x5c, 0x1f, 0x00, 0x00, 0x00, 0x23, 0x83, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x23, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xb9, 0x86, 0x22, 0x0d, 0x14, 0x50, 0x00, 0x00, 0xb8, 0x86, 0xa2, 0x0d,</div><div class='add'>+	0x0e, 0x50, 0x00, 0x00, 0xa5, 0x86, 0x22, 0x46, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x46, 0x1f, 0x80, 0x01, 0x00, 0x30, 0x80, 0x00, 0x10,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0xa3, 0x86, 0x22, 0x40, 0xe3, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x47, 0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0xa0, 0x86, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x23, 0x83, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x20, 0x80, 0x00, 0x03,</div><div class='add'>+	0x46, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5f, 0xe1, 0x91, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x2d, 0x06, 0x48, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8,</div><div class='add'>+	0x18, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x04, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x22, 0xf0, 0x0e, 0x30, 0x00, 0x00, 0xab, 0x86, 0xa2, 0x5f,</div><div class='add'>+	0x0f, 0x7c, 0x00, 0x00, 0x60, 0x86, 0x00, 0x4c, 0x0d, 0xc0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x2e, 0x5f, 0x0f, 0x80, 0x01, 0x00, 0x60, 0x86, 0x23, 0x07,</div><div class='add'>+	0x14, 0x6c, 0x00, 0x00, 0x04, 0x00, 0xa2, 0x46, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x30, 0x00, 0x00, 0x10, 0x48, 0xc9, 0x01, 0x00, 0x24, 0x00, 0x00, 0x40,</div><div class='add'>+	0xf1, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x03, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x16,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x24, 0x00, 0x00, 0x00, 0x00, 0xc8, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x47, 0x61, 0xb1, 0x01, 0x00, 0xa0, 0x00, 0x00, 0xa4,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0xb5, 0x86, 0xa8, 0x46, 0x1f, 0x10, 0x00, 0x00,</div><div class='add'>+	0x60, 0x86, 0x00, 0x03, 0x0c, 0xb0, 0x00, 0x00, 0x60, 0x86, 0x00, 0x0d,</div><div class='add'>+	0x18, 0xc0, 0x00, 0x00, 0x04, 0x00, 0x2e, 0x14, 0x0a, 0xd0, 0x01, 0x00,</div><div class='add'>+	0x12, 0x00, 0x00, 0x05, 0x48, 0xcd, 0x01, 0x00, 0xfe, 0x7f, 0x00, 0x05,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0x04, 0x00, 0xa2, 0xa4, 0x86, 0x06, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa2, 0xa1, 0x86, 0x06, 0x00, 0x00, 0x0c, 0x00, 0x2a, 0xf2,</div><div class='add'>+	0xe0, 0xb1, 0x01, 0x00, 0xc1, 0x86, 0x22, 0x40, 0x31, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x60, 0x18, 0x38, 0x96, 0x01, 0x00, 0x1e, 0x00, 0x00, 0x40,</div><div class='add'>+	0x43, 0x99, 0x01, 0x00, 0x00, 0x81, 0x00, 0xf6, 0x80, 0xce, 0x01, 0x00,</div><div class='add'>+	0xc5, 0x86, 0xa6, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0x43, 0xc1, 0x01, 0x00, 0xc7, 0x86, 0x22, 0x0b, 0xed, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x08, 0x00, 0x00, 0xa1, 0x42, 0xc9, 0x01, 0x00, 0x02, 0x00, 0x00, 0xa1,</div><div class='add'>+	0x46, 0xc9, 0x01, 0x00, 0x04, 0x00, 0xa2, 0xa1, 0x86, 0x06, 0x00, 0x00,</div><div class='add'>+	0x0f, 0x00, 0x00, 0xfa, 0x94, 0x88, 0x01, 0x00, 0x04, 0x00, 0xa2, 0x45,</div><div class='add'>+	0x95, 0x6c, 0x00, 0x00, 0x02, 0x00, 0x00, 0x4a, 0x86, 0xe4, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf6, 0x0e, 0xb0, 0x01, 0x00, 0xd1, 0x86, 0x22, 0x47,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x04, 0x00, 0x1f, 0x43, 0x0e, 0x50, 0x00, 0x00,</div><div class='add'>+	0xd1, 0x86, 0xa0, 0x46, 0x0f, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x0f, 0xc0, 0x01, 0x00, 0xd5, 0x86, 0x22, 0x48, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x91, 0xb0, 0x01, 0x00, 0x04, 0x00, 0x0f, 0xa2,</div><div class='add'>+	0x42, 0x31, 0x00, 0x00, 0xd8, 0x86, 0x00, 0x40, 0x89, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x0c, 0x00, 0x00, 0xa2, 0x42, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x43,</div><div class='add'>+	0x89, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x43, 0x95, 0xd0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xfc, 0x82, 0xb0, 0x01, 0x00, 0xdb, 0x86, 0xa0, 0x41,</div><div class='add'>+	0x90, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x91, 0xc0, 0x01, 0x00,</div><div class='add'>+	0xe0, 0x86, 0x22, 0x47, 0x1f, 0x7c, 0x00, 0x00, 0xe0, 0x86, 0xa0, 0x43,</div><div class='add'>+	0x89, 0x6c, 0x00, 0x00, 0xe0, 0x86, 0x20, 0x45, 0x89, 0x6c, 0x00, 0x00,</div><div class='add'>+	0xe0, 0x86, 0xa0, 0x41, 0x0e, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x0f, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41, 0x89, 0xc0, 0x01, 0x00,</div><div class='add'>+	0xd8, 0x86, 0xa2, 0x41, 0x95, 0x50, 0x00, 0x00, 0xed, 0x86, 0x22, 0x48,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x10, 0x00, 0x00, 0x48, 0x92, 0xf4, 0x01, 0x00,</div><div class='add'>+	0xff, 0xff, 0x00, 0x48, 0x90, 0x88, 0x01, 0x00, 0xe7, 0x86, 0x90, 0x48,</div><div class='add'>+	0x92, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x93, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x0a, 0x00, 0x00, 0xa2, 0x44, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x66, 0x20,</div><div class='add'>+	0x93, 0xa4, 0x01, 0x00, 0x0a, 0x00, 0x00, 0x43, 0x80, 0xcc, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xa2, 0x80, 0xc0, 0x01, 0x00, 0x04, 0x00, 0xa2, 0x40,</div><div class='add'>+	0x42, 0x6d, 0x00, 0x00, 0x04, 0x00, 0xa2, 0xa1, 0x86, 0x06, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa2, 0x46, 0x1f, 0x7c, 0x00, 0x00, 0x14, 0x99, 0x00, 0x17,</div><div class='add'>+	0x98, 0x30, 0x01, 0x00, 0xff, 0x07, 0x00, 0x17, 0x7e, 0x89, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa6, 0x40, 0x81, 0x32, 0x00, 0x00, 0x30, 0x80, 0x00, 0x10,</div><div class='add'>+	0x44, 0xc9, 0x01, 0x00, 0x12, 0x00, 0x00, 0x14, 0xf0, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x17, 0xf0, 0xb1, 0x01, 0x00, 0x12, 0x00, 0x00, 0x05,</div><div class='add'>+	0xe0, 0xcd, 0x01, 0x00, 0x30, 0x00, 0x00, 0x10, 0x80, 0xc8, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x44, 0x61, 0xb1, 0x01, 0x00, 0x20, 0x00, 0x00, 0x40,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0xf7, 0x86, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x02, 0x87, 0x22, 0x5c, 0x1f, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x44,</div><div class='add'>+	0x23, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x2d, 0x10, 0x48, 0xc1, 0x01, 0x00,</div><div class='add'>+	0x01, 0x87, 0x22, 0x40, 0xe3, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0xfe, 0x86, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0x23, 0x83, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5c, 0x1f, 0x80, 0x01, 0x00,</div><div class='add'>+	0x05, 0x87, 0xa2, 0x47, 0x1f, 0x7c, 0x00, 0x00, 0x06, 0x95, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x85, 0x87, 0x00, 0x17, 0x10, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x0d, 0x95, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x2f, 0x03,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x09, 0x87, 0xa0, 0x07, 0x16, 0x40, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x17, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x0b,</div><div class='add'>+	0xe4, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x50, 0x17, 0xf0, 0x01, 0x00,</div><div class='add'>+	0x0d, 0x87, 0x90, 0xf2, 0x16, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x17, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x66, 0x20, 0x17, 0xa4, 0x01, 0x00,</div><div class='add'>+	0x10, 0x00, 0x00, 0x14, 0x2a, 0xc8, 0x01, 0x00, 0x00, 0x00, 0x00, 0x50,</div><div class='add'>+	0x2b, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf2, 0x2a, 0x94, 0x01, 0x00,</div><div class='add'>+	0x30, 0x80, 0x00, 0x10, 0x42, 0xc9, 0x01, 0x00, 0x17, 0x87, 0x22, 0x40,</div><div class='add'>+	0xe3, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00, 0x14, 0x87, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x23, 0x83, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x80, 0x00, 0x17, 0x10, 0xdc, 0x01, 0x00, 0x85, 0x87, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x21, 0x87, 0x9c, 0x0f, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x5c, 0x1f, 0x80, 0x01, 0x00, 0x00, 0x80, 0x00, 0x10,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0x21, 0x87, 0x22, 0x40, 0xe3, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x47, 0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x1e, 0x87, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x23, 0x83, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x26, 0x87, 0x22, 0x07,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x42, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x07, 0x42, 0xc1, 0x01, 0x00, 0x00, 0x80, 0x00, 0xa1,</div><div class='add'>+	0x46, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5f, 0xe1, 0x91, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x2e, 0x03, 0x48, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x0a,</div><div class='add'>+	0xe0, 0xb1, 0x01, 0x00, 0x2b, 0x87, 0x22, 0x40, 0x31, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x0c, 0x00, 0x00, 0x40, 0x45, 0x99, 0x01, 0x00, 0x00, 0x00, 0x60, 0x18,</div><div class='add'>+	0x38, 0x96, 0x01, 0x00, 0x00, 0x00, 0x2e, 0x10, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x50, 0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x08,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x03, 0xe0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x44, 0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xb1, 0x01, 0x00, 0x30, 0x87, 0xa8, 0x40, 0x23, 0x30, 0x00, 0x00,</div><div class='add'>+	0x23, 0x83, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x2d, 0x52,</div><div class='add'>+	0x11, 0xc0, 0x01, 0x00, 0x10, 0x00, 0x00, 0x03, 0x48, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf8, 0x18, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8,</div><div class='add'>+	0x04, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x0e, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x0c, 0x00, 0x00, 0xa4, 0x0c, 0xc8, 0x01, 0x00, 0x04, 0x00, 0x22, 0x40,</div><div class='add'>+	0x15, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x44, 0x23, 0xe0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xa4, 0x86, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x2e, 0x10,</div><div class='add'>+	0x48, 0xc1, 0x01, 0x00, 0x3f, 0x87, 0xa3, 0x12, 0x0e, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x40, 0x87, 0x68, 0x07, 0x1a, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x68, 0x12,</div><div class='add'>+	0x1a, 0xb0, 0x01, 0x00, 0x14, 0x99, 0x00, 0x08, 0x98, 0x30, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x00, 0x10,</div><div class='add'>+	0x86, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x68, 0x08, 0x3e, 0x96, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x0c, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x02,</div><div class='add'>+	0xe0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x46, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x20, 0x00, 0x00, 0x43, 0x62, 0xdd, 0x01, 0x00, 0x47, 0x87, 0xa8, 0x5c,</div><div class='add'>+	0x1f, 0x10, 0x00, 0x00, 0x79, 0x87, 0x22, 0x0d, 0x14, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x4d, 0x87, 0x22, 0x0d, 0x24, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0d,</div><div class='add'>+	0x10, 0xc0, 0x01, 0x00, 0x52, 0x87, 0x00, 0x0d, 0x24, 0xd0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x22, 0x4b, 0xfd, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x2b, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x15, 0xa2, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x10, 0x00, 0x00, 0x20, 0x10, 0xc8, 0x01, 0x00, 0xf0, 0x07, 0x00, 0x40,</div><div class='add'>+	0x25, 0x98, 0x01, 0x00, 0x54, 0x87, 0x22, 0x42, 0x23, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x59, 0x87, 0x00, 0x41, 0x23, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0x55, 0x87, 0xa8, 0x5c, 0x1f, 0x00, 0x00, 0x00, 0x23, 0x83, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x23, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x22, 0x0d, 0x14, 0x50, 0x00, 0x00, 0x78, 0x87, 0xa2, 0x0d,</div><div class='add'>+	0x0e, 0x50, 0x00, 0x00, 0x65, 0x87, 0x22, 0x46, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x46, 0x1f, 0x80, 0x01, 0x00, 0x30, 0x80, 0x00, 0x10,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0x63, 0x87, 0x22, 0x40, 0xe3, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x47, 0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x60, 0x87, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x23, 0x83, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x20, 0x80, 0x00, 0x03,</div><div class='add'>+	0x46, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5f, 0xe1, 0x91, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x2d, 0x06, 0x48, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8,</div><div class='add'>+	0x18, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x04, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x22, 0xf0, 0x0e, 0x30, 0x00, 0x00, 0x6b, 0x87, 0xa2, 0x5f,</div><div class='add'>+	0x0f, 0x7c, 0x00, 0x00, 0x39, 0x87, 0x00, 0x4c, 0x0d, 0xc0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x2e, 0x5f, 0x0f, 0x80, 0x01, 0x00, 0x39, 0x87, 0x23, 0x07,</div><div class='add'>+	0x14, 0x6c, 0x00, 0x00, 0x04, 0x00, 0xa2, 0x46, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x30, 0x00, 0x00, 0x10, 0x48, 0xc9, 0x01, 0x00, 0x24, 0x00, 0x00, 0x40,</div><div class='add'>+	0xf1, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x03, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x16,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x24, 0x00, 0x00, 0x00, 0x00, 0xc8, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x47, 0x61, 0xb1, 0x01, 0x00, 0xa0, 0x00, 0x00, 0xa4,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x75, 0x87, 0xa8, 0x46, 0x1f, 0x10, 0x00, 0x00,</div><div class='add'>+	0x39, 0x87, 0x00, 0x03, 0x0c, 0xb0, 0x00, 0x00, 0x39, 0x87, 0x00, 0x0d,</div><div class='add'>+	0x18, 0xc0, 0x00, 0x00, 0x04, 0x00, 0xa2, 0x46, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x83, 0x87, 0x22, 0x5c, 0x1f, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5c,</div><div class='add'>+	0x1f, 0x80, 0x01, 0x00, 0x00, 0x00, 0x3c, 0x44, 0x23, 0xe0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x2d, 0x10, 0x48, 0xc1, 0x01, 0x00, 0x83, 0x87, 0x22, 0x40,</div><div class='add'>+	0xe3, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00, 0x80, 0x87, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x23, 0x83, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x17, 0x10, 0xb0, 0x01, 0x00, 0x85, 0x87, 0x00, 0x40,</div><div class='add'>+	0x2b, 0xb0, 0x00, 0x00, 0x00, 0x80, 0x00, 0x03, 0x44, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x04, 0xe0, 0xb1, 0x01, 0x00, 0x04, 0x00, 0x26, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x04, 0x00, 0xa0, 0x9f, 0x13, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x8c, 0x87, 0x22, 0x9f, 0x13, 0x6c, 0x00, 0x00, 0x02, 0x00, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xcc, 0x01, 0x00, 0x27, 0x83, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x8d, 0x98, 0x00, 0x41, 0x3f, 0x43, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x8d, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x05, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x78, 0x98, 0x00, 0x40, 0x0f, 0x30, 0x01, 0x00, 0x04, 0x00, 0xa2, 0x5c,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x03, 0x88, 0x00, 0x5c, 0x1f, 0x90, 0x00, 0x00,</div><div class='add'>+	0x10, 0x00, 0x00, 0x00, 0x0e, 0xf4, 0x01, 0x00, 0x04, 0x00, 0x26, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3a, 0x01, 0x84, 0x01, 0x00,</div><div class='add'>+	0x98, 0x87, 0x22, 0x50, 0x01, 0x6c, 0x00, 0x00, 0x0d, 0x04, 0x00, 0x40,</div><div class='add'>+	0x89, 0x98, 0x01, 0x00, 0x02, 0x99, 0x00, 0x00, 0x8a, 0x30, 0x01, 0x00,</div><div class='add'>+	0x03, 0x00, 0x00, 0x07, 0x1a, 0xf4, 0x01, 0x00, 0x12, 0x95, 0x00, 0x07,</div><div class='add'>+	0x16, 0x30, 0x01, 0x00, 0xa3, 0x87, 0x22, 0x41, 0x81, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x9e, 0x87, 0x22, 0x42, 0x81, 0x6c, 0x00, 0x00, 0x23, 0x83, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0xa2, 0x87, 0x22, 0x5f, 0x0f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x5f, 0x0f, 0x80, 0x01, 0x00, 0x0e, 0x04, 0x00, 0x40,</div><div class='add'>+	0x89, 0x98, 0x01, 0x00, 0x02, 0x99, 0x00, 0x00, 0x8a, 0x30, 0x01, 0x00,</div><div class='add'>+	0xed, 0x87, 0x00, 0x40, 0x0f, 0xb0, 0x00, 0x00, 0xb0, 0x87, 0xa2, 0x5a,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x04, 0x00, 0xa2, 0x5a, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x00, 0xb5, 0x00, 0x0d, 0x42, 0xc9, 0x01, 0x00, 0x04, 0x00, 0x22, 0x0b,</div><div class='add'>+	0xe6, 0x7d, 0x00, 0x00, 0x00, 0xb7, 0x00, 0x0d, 0x42, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x22, 0x0b, 0xe6, 0x7d, 0x00, 0x00, 0x6a, 0x94, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0xb0, 0x87, 0x22, 0x20, 0x85, 0x6c, 0x00, 0x00,</div><div class='add'>+	0xad, 0x87, 0x9c, 0x0f, 0x80, 0x32, 0x00, 0x00, 0x23, 0x83, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x87, 0x95, 0x00, 0x5c, 0x1f, 0x00, 0x01, 0x00,</div><div class='add'>+	0xc2, 0x97, 0x00, 0x42, 0x61, 0x31, 0x01, 0x00, 0x23, 0x83, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x90, 0x04, 0x00, 0x07, 0x96, 0x30, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x2d, 0x05, 0x48, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0,</div><div class='add'>+	0x18, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xa1, 0x88, 0xa2, 0x5f, 0x81, 0x6c, 0x00, 0x00, 0xa8, 0x00, 0x2d, 0x43,</div><div class='add'>+	0x19, 0x80, 0x01, 0x00, 0x37, 0x00, 0x2d, 0xf0, 0x24, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0xf3, 0x8e, 0xf4, 0x01, 0x00, 0x0f, 0x00, 0x00, 0xf3,</div><div class='add'>+	0x90, 0x88, 0x01, 0x00, 0x04, 0x00, 0xa3, 0x43, 0x8f, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa3, 0x43, 0x91, 0x6c, 0x00, 0x00, 0xc1, 0x87, 0x22, 0x48,</div><div class='add'>+	0x8e, 0x6c, 0x00, 0x00, 0x36, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00,</div><div class='add'>+	0x58, 0x00, 0x3d, 0x43, 0xe7, 0xe1, 0x01, 0x00, 0xc1, 0x87, 0x1f, 0xf0,</div><div class='add'>+	0x24, 0x6c, 0x00, 0x00, 0xc0, 0x87, 0x23, 0x41, 0x8f, 0x6c, 0x00, 0x00,</div><div class='add'>+	0xa1, 0x88, 0x00, 0x47, 0x81, 0xb0, 0x00, 0x00, 0xa1, 0x88, 0x00, 0x48,</div><div class='add'>+	0x81, 0xb0, 0x00, 0x00, 0x40, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00,</div><div class='add'>+	0xb0, 0x00, 0x2d, 0xf0, 0x14, 0xb0, 0x01, 0x00, 0xc6, 0x87, 0x22, 0x0a,</div><div class='add'>+	0x90, 0x40, 0x00, 0x00, 0x58, 0x98, 0x00, 0x40, 0x91, 0x30, 0x01, 0x00,</div><div class='add'>+	0xa1, 0x88, 0xa2, 0x40, 0x80, 0x32, 0x00, 0x00, 0xb0, 0x00, 0x2d, 0x45,</div><div class='add'>+	0x81, 0xb0, 0x01, 0x00, 0xd2, 0x87, 0x22, 0xf0, 0x2c, 0x30, 0x00, 0x00,</div><div class='add'>+	0xa3, 0x00, 0x2d, 0x30, 0x83, 0xb0, 0x01, 0x00, 0xac, 0x00, 0x2d, 0xf3,</div><div class='add'>+	0x82, 0xe0, 0x01, 0x00, 0xcc, 0x87, 0xa3, 0x41, 0x2c, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x16, 0x82, 0xb0, 0x01, 0x00, 0x98, 0x00, 0x2d, 0xf0,</div><div class='add'>+	0x82, 0xc0, 0x01, 0x00, 0x88, 0x00, 0x2d, 0xf0, 0x82, 0xd0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf2, 0x98, 0xe8, 0x01, 0x00, 0xa1, 0x88, 0x20, 0x4c,</div><div class='add'>+	0x82, 0x6c, 0x00, 0x00, 0x7c, 0x00, 0x2d, 0x41, 0x98, 0xe8, 0x01, 0x00,</div><div class='add'>+	0xa1, 0x88, 0x20, 0xf0, 0x98, 0x6c, 0x00, 0x00, 0xed, 0x87, 0x22, 0x0a,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x40, 0x02, 0x00, 0x0c, 0x7e, 0x89, 0x01, 0x00,</div><div class='add'>+	0xed, 0x87, 0xa6, 0x40, 0x81, 0x32, 0x00, 0x00, 0xa1, 0x88, 0x00, 0x49,</div><div class='add'>+	0x81, 0xb0, 0x00, 0x00, 0x20, 0x00, 0x00, 0xa6, 0x80, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xda, 0x87, 0x22, 0x43, 0x21, 0x6f, 0x00, 0x00, 0x13, 0x80, 0x00, 0x40,</div><div class='add'>+	0x80, 0xdc, 0x01, 0x00, 0xdb, 0x87, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x1a, 0x80, 0x00, 0x40, 0x80, 0xdc, 0x01, 0x00, 0xdb, 0x87, 0xa2, 0x5e,</div><div class='add'>+	0x0b, 0x7d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x08, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xdd, 0x87, 0x9f, 0x85, 0x80, 0x32, 0x00, 0x00, 0xe1, 0x87, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x1a, 0x83, 0x22, 0x40, 0x57, 0x7d, 0x00, 0x00,</div><div class='add'>+	0x01, 0x00, 0x00, 0x40, 0x57, 0x99, 0x01, 0x00, 0xe1, 0x87, 0x42, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x93, 0x93, 0x01, 0x00,</div><div class='add'>+	0x01, 0x83, 0x1a, 0x5b, 0x69, 0x93, 0x00, 0x00, 0xe7, 0x87, 0x22, 0x46,</div><div class='add'>+	0xf3, 0x7f, 0x00, 0x00, 0xe7, 0x87, 0xa2, 0x41, 0xf3, 0x7f, 0x00, 0x00,</div><div class='add'>+	0xc6, 0x80, 0x00, 0x42, 0x97, 0x33, 0x01, 0x00, 0x04, 0x00, 0x00, 0xcb,</div><div class='add'>+	0x81, 0xc8, 0x01, 0x00, 0xea, 0x87, 0x22, 0x40, 0xf2, 0x7f, 0x00, 0x00,</div><div class='add'>+	0xc6, 0x80, 0x00, 0x6f, 0x97, 0x33, 0x01, 0x00, 0xec, 0x87, 0x22, 0x40,</div><div class='add'>+	0x73, 0x7d, 0x00, 0x00, 0xe0, 0x80, 0x00, 0x41, 0x8b, 0xb3, 0x00, 0x00,</div><div class='add'>+	0xe4, 0x87, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xf4, 0x87, 0x9c, 0x0f,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x00, 0x80, 0x00, 0x10, 0x42, 0xc9, 0x01, 0x00,</div><div class='add'>+	0xf4, 0x87, 0x22, 0x40, 0xe3, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x45,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0xf1, 0x87, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0x23, 0x83, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x2e, 0x94, 0x22, 0x02, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0xf5, 0x87, 0x42, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0x93, 0x93, 0x01, 0x00, 0x2e, 0x94, 0x1a, 0x02, 0x68, 0x97, 0x00, 0x00,</div><div class='add'>+	0xff, 0x87, 0x9c, 0x0f, 0x80, 0x32, 0x00, 0x00, 0x00, 0x80, 0x00, 0x10,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0xff, 0x87, 0x22, 0x40, 0xe3, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x45, 0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0xfc, 0x87, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x23, 0x83, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x3e, 0x94, 0x22, 0x02,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x00, 0x88, 0x42, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x44, 0x93, 0x93, 0x01, 0x00, 0x3e, 0x94, 0x1a, 0x02,</div><div class='add'>+	0x68, 0x97, 0x00, 0x00, 0x0a, 0x88, 0x9c, 0x0f, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x80, 0x00, 0x10, 0x42, 0xc9, 0x01, 0x00, 0x0a, 0x88, 0x22, 0x40,</div><div class='add'>+	0xe3, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x45, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00, 0x07, 0x88, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x23, 0x83, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x2f, 0x83, 0x22, 0x02, 0x80, 0x32, 0x00, 0x00, 0x0b, 0x88, 0x42, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x93, 0x93, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x1a, 0x02, 0x68, 0x97, 0x01, 0x00, 0x2f, 0x83, 0x00, 0x40,</div><div class='add'>+	0x05, 0xb0, 0x00, 0x00, 0x00, 0x80, 0x00, 0xa6, 0x56, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x56, 0x95, 0x2f, 0x40, 0x05, 0xb0, 0x01, 0x00, 0x04, 0x00, 0xa2, 0x40,</div><div class='add'>+	0xe7, 0x6d, 0x00, 0x00, 0xb8, 0x94, 0x29, 0x41, 0xe7, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x54, 0xef, 0x93, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf2,</div><div class='add'>+	0x0e, 0xb0, 0x01, 0x00, 0x04, 0x00, 0xa3, 0x0c, 0x55, 0x6f, 0x00, 0x00,</div><div class='add'>+	0x29, 0x00, 0x00, 0x40, 0x0d, 0x98, 0x01, 0x00, 0x09, 0x00, 0x00, 0x07,</div><div class='add'>+	0x12, 0xe4, 0x01, 0x00, 0x00, 0x00, 0x00, 0xa7, 0x13, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x03, 0x00, 0x00, 0x07, 0x1a, 0xf4, 0x01, 0x00, 0x07, 0x00, 0x00, 0x07,</div><div class='add'>+	0x16, 0x88, 0x01, 0x00, 0xff, 0xff, 0x00, 0x10, 0x34, 0xd8, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x03, 0x34, 0x94, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x23, 0xb0, 0x01, 0x00, 0x20, 0x18, 0x00, 0x40, 0x11, 0x98, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x20, 0xaa, 0x0f, 0x6c, 0x00, 0x00, 0x00, 0xb5, 0x00, 0x0d,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0x43, 0x88, 0x22, 0x0b, 0xe6, 0x7d, 0x00, 0x00,</div><div class='add'>+	0x22, 0x88, 0x60, 0x40, 0x81, 0x32, 0x00, 0x00, 0xff, 0xff, 0x00, 0x07,</div><div class='add'>+	0x84, 0x89, 0x01, 0x00, 0x2b, 0x88, 0x05, 0xc2, 0x24, 0x30, 0x00, 0x00,</div><div class='add'>+	0x58, 0x04, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x2d, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x60, 0x88, 0x70, 0xf0, 0x18, 0x30, 0x01, 0x00,</div><div class='add'>+	0x10, 0x00, 0x00, 0x0c, 0x82, 0xf4, 0x01, 0x00, 0x04, 0x00, 0xa2, 0x41,</div><div class='add'>+	0x0e, 0x6c, 0x00, 0x00, 0x43, 0x88, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x70, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x3a, 0x88, 0xa0, 0x48,</div><div class='add'>+	0x23, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x35, 0xd0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x80, 0x00, 0x1a, 0x42, 0xc9, 0x01, 0x00, 0x34, 0x88, 0x22, 0x40,</div><div class='add'>+	0xe3, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x1a, 0x62, 0xdd, 0x01, 0x00, 0x31, 0x88, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x23, 0x83, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x20, 0x98, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00, 0x60, 0x88, 0x00, 0xf8,</div><div class='add'>+	0x18, 0x30, 0x01, 0x00, 0x35, 0x88, 0xa2, 0x41, 0x23, 0x50, 0x00, 0x00,</div><div class='add'>+	0xff, 0xff, 0x00, 0x10, 0x34, 0xd8, 0x01, 0x00, 0x00, 0x00, 0x00, 0x03,</div><div class='add'>+	0x34, 0x94, 0x01, 0x00, 0x20, 0x18, 0x00, 0x40, 0x11, 0x98, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x2e, 0x1a, 0x48, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x08, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x42, 0x61, 0xb1, 0x01, 0x00, 0x20, 0x00, 0x00, 0x1a,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x3e, 0x88, 0xa8, 0x09, 0xe0, 0x31, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x23, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x50,</div><div class='add'>+	0x35, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44, 0x11, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x4f, 0x88, 0x22, 0x41, 0x0d, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x0f, 0xc0, 0x01, 0x00, 0x4b, 0x88, 0xa0, 0xaa, 0x0f, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x0f, 0xb0, 0x01, 0x00, 0x09, 0x00, 0x00, 0x07,</div><div class='add'>+	0x12, 0xe4, 0x01, 0x00, 0x00, 0x00, 0x00, 0xa7, 0x13, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x1b, 0xb0, 0x01, 0x00, 0x1f, 0x88, 0x00, 0x41,</div><div class='add'>+	0x17, 0xb0, 0x00, 0x00, 0x00, 0x02, 0x00, 0x09, 0x12, 0xc8, 0x01, 0x00,</div><div class='add'>+	0x1f, 0x88, 0x83, 0x41, 0x17, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x17, 0xb0, 0x01, 0x00, 0x1f, 0x88, 0x00, 0x41, 0x1b, 0xc0, 0x00, 0x00,</div><div class='add'>+	0x5a, 0x88, 0x23, 0x40, 0x23, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50,</div><div class='add'>+	0x35, 0xd0, 0x01, 0x00, 0x00, 0x80, 0x00, 0x1a, 0x42, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x57, 0x88, 0x22, 0x40, 0xe3, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x1a, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0x54, 0x88, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0x23, 0x83, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x20, 0x98, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00,</div><div class='add'>+	0x60, 0x88, 0x00, 0xf8, 0x18, 0x30, 0x01, 0x00, 0x58, 0x88, 0xa2, 0x41,</div><div class='add'>+	0x23, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x0f, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x5d, 0x88, 0xa0, 0xaa, 0x0f, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x0f, 0xb0, 0x01, 0x00, 0xb8, 0x94, 0x20, 0x07, 0xe4, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x56, 0x95, 0x20, 0x40, 0xe7, 0xb1, 0x01, 0x00, 0xed, 0x87, 0x00, 0x40,</div><div class='add'>+	0x0f, 0xb0, 0x00, 0x00, 0xff, 0xff, 0x00, 0x0c, 0x80, 0xd8, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x26, 0x40, 0x81, 0x32, 0x00, 0x00, 0xc0, 0x02, 0x00, 0x0c,</div><div class='add'>+	0x7e, 0x89, 0x01, 0x00, 0x79, 0x88, 0x26, 0x54, 0x61, 0x31, 0x00, 0x00,</div><div class='add'>+	0x6c, 0x88, 0x87, 0x0c, 0x80, 0x32, 0x00, 0x00, 0x1f, 0x04, 0x00, 0x40,</div><div class='add'>+	0x89, 0x98, 0x01, 0x00, 0x02, 0x99, 0x00, 0x0c, 0x8a, 0x30, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x54, 0x61, 0xb1, 0x01, 0x00, 0x0f, 0x00, 0x00, 0x40,</div><div class='add'>+	0x62, 0x99, 0x01, 0x00, 0x6c, 0x88, 0x28, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa2, 0x54, 0x77, 0x7d, 0x00, 0x00, 0x68, 0x88, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x74, 0x88, 0x22, 0x46, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x2a, 0x04, 0x00, 0x40, 0x89, 0x98, 0x01, 0x00, 0x02, 0x99, 0x00, 0x0c,</div><div class='add'>+	0x8a, 0x30, 0x01, 0x00, 0x00, 0x00, 0x00, 0x54, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x0d, 0x00, 0x00, 0x40, 0x62, 0x99, 0x01, 0x00, 0x00, 0x00, 0xa8, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0xa2, 0x54, 0x77, 0x7d, 0x00, 0x00,</div><div class='add'>+	0x6d, 0x88, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x79, 0x88, 0x22, 0x49,</div><div class='add'>+	0x19, 0x7c, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x40, 0x62, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0xa8, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0xa2, 0x54,</div><div class='add'>+	0x77, 0x7d, 0x00, 0x00, 0x74, 0x88, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x10, 0x00, 0x00, 0x40, 0x62, 0x99, 0x01, 0x00, 0x00, 0x00, 0xa8, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0xa2, 0x54, 0x77, 0x7d, 0x00, 0x00,</div><div class='add'>+	0x79, 0x88, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x30, 0x94, 0x2f, 0x55,</div><div class='add'>+	0xf1, 0x93, 0x01, 0x00, 0x00, 0x40, 0x00, 0xa6, 0x56, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x2f, 0x83, 0xa2, 0x41, 0xe5, 0x51, 0x00, 0x00, 0x64, 0x00, 0x00, 0x40,</div><div class='add'>+	0xe5, 0x99, 0x01, 0x00, 0x81, 0x88, 0x44, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x84, 0x88, 0xa2, 0x93, 0x57, 0x6f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x57, 0xc3, 0x01, 0x00, 0x00, 0x00, 0x1c, 0xab, 0x27, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x2f, 0x83, 0x22, 0x50, 0xfd, 0x7f, 0x00, 0x00, 0x2f, 0x83, 0x22, 0x51,</div><div class='add'>+	0xfd, 0x7f, 0x00, 0x00, 0x2f, 0x83, 0xa2, 0x41, 0x1d, 0x53, 0x00, 0x00,</div><div class='add'>+	0x50, 0x46, 0x00, 0x40, 0x1d, 0x9b, 0x01, 0x00, 0x38, 0x05, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x0e, 0x00, 0x00, 0x48, 0xb2, 0xcb, 0x01, 0x00,</div><div class='add'>+	0x10, 0x04, 0x00, 0x40, 0x49, 0x31, 0x01, 0x00, 0x90, 0x88, 0x22, 0x40,</div><div class='add'>+	0xb5, 0x6f, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x48, 0xb2, 0xcb, 0x01, 0x00,</div><div class='add'>+	0x20, 0x04, 0x00, 0x41, 0xb5, 0x53, 0x01, 0x00, 0x2f, 0x83, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x51, 0xfd, 0x83, 0x01, 0x00,</div><div class='add'>+	0x40, 0x16, 0x00, 0x40, 0x45, 0x99, 0x01, 0x00, 0x40, 0x05, 0x00, 0x40,</div><div class='add'>+	0x49, 0x31, 0x01, 0x00, 0x1e, 0x00, 0x00, 0x48, 0xb2, 0xcb, 0x01, 0x00,</div><div class='add'>+	0x10, 0x04, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0xda,</div><div class='add'>+	0x91, 0xc0, 0x01, 0x00, 0x04, 0x00, 0x00, 0x48, 0xb2, 0xcb, 0x01, 0x00,</div><div class='add'>+	0x20, 0x04, 0x00, 0x40, 0xb5, 0x33, 0x01, 0x00, 0x60, 0x16, 0x20, 0x40,</div><div class='add'>+	0xe5, 0xb1, 0x01, 0x00, 0x55, 0x82, 0x00, 0x40, 0xb5, 0x33, 0x01, 0x00,</div><div class='add'>+	0x08, 0x00, 0x00, 0x48, 0xb2, 0xcb, 0x01, 0x00, 0xff, 0xff, 0x00, 0x4a,</div><div class='add'>+	0xb4, 0x8b, 0x01, 0x00, 0x20, 0x04, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x0a, 0x00, 0x00, 0x48, 0xb2, 0xcb, 0x01, 0x00, 0x10, 0x00, 0x00, 0x4a,</div><div class='add'>+	0xb4, 0xf7, 0x01, 0x00, 0x20, 0x04, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x2f, 0x83, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0xa2, 0x05,</div><div class='add'>+	0x48, 0x6d, 0x00, 0x00, 0x02, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa2, 0xf2, 0x0e, 0x6c, 0x00, 0x00, 0x04, 0x00, 0xa2, 0x02,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x05, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf3, 0x08, 0xb0, 0x01, 0x00, 0xab, 0x88, 0x22, 0x50,</div><div class='add'>+	0x81, 0x6c, 0x00, 0x00, 0x0f, 0x04, 0x00, 0x40, 0x89, 0x98, 0x01, 0x00,</div><div class='add'>+	0x10, 0x00, 0x00, 0x40, 0x8a, 0xe4, 0x01, 0x00, 0x02, 0x99, 0x00, 0x04,</div><div class='add'>+	0x8a, 0x14, 0x01, 0x00, 0x04, 0x00, 0x20, 0x48, 0x09, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x20, 0x57, 0x81, 0x6c, 0x00, 0x00, 0x04, 0x00, 0x20, 0x40,</div><div class='add'>+	0xe6, 0xb1, 0x01, 0x00, 0x03, 0x00, 0x00, 0x40, 0x96, 0xe4, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x04, 0x96, 0xc0, 0x01, 0x00, 0xb1, 0x88, 0x00, 0x4b,</div><div class='add'>+	0x10, 0xc9, 0x00, 0x00, 0xe1, 0x8b, 0x00, 0x41, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x16, 0x8c, 0x00, 0x41, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x52, 0x8c, 0x00, 0x45, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x52, 0x8c, 0x00, 0x45, 0x09, 0xb0, 0x00, 0x00, 0x52, 0x8c, 0x00, 0x45,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x52, 0x8c, 0x00, 0x45, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x99, 0x8c, 0x00, 0x43,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0xc8, 0x8c, 0x00, 0x43, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xcc, 0x8c, 0x00, 0x44, 0x09, 0xb0, 0x00, 0x00, 0x3b, 0x8e, 0x00, 0x45,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0xdc, 0x8c, 0x00, 0x43,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0xda, 0x8c, 0x00, 0x43, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xdd, 0x8b, 0x00, 0x45, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x95, 0x8d, 0x00, 0x42, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x95, 0x8d, 0x00, 0x43, 0x09, 0xb0, 0x00, 0x00, 0x95, 0x8d, 0x00, 0x44,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0xdd, 0x8b, 0x00, 0x45, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0xb5, 0x8d, 0x00, 0x43, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0xdd, 0x8b, 0x00, 0x45,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0xdd, 0x8d, 0x00, 0x43,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0xdd, 0x8d, 0x00, 0x44, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xdd, 0x8b, 0x00, 0x45, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xdd, 0x8d, 0x00, 0x42, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0xdd, 0x8b, 0x00, 0x45, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x0c, 0x8e, 0x00, 0x44, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0xdd, 0x8b, 0x00, 0x45,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xdd, 0x8b, 0x00, 0x42, 0x09, 0xb0, 0x00, 0x00, 0x1f, 0x8e, 0x00, 0x45,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x1f, 0x8e, 0x00, 0x45, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xdd, 0x8b, 0x00, 0x45, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x21, 0x8e, 0x00, 0x42, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x21, 0x8e, 0x00, 0x43, 0x09, 0xb0, 0x00, 0x00, 0x21, 0x8e, 0x00, 0x44,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x21, 0x8e, 0x00, 0x45, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x2c, 0x8e, 0x00, 0x44, 0x09, 0xb0, 0x00, 0x00, 0xdd, 0x8b, 0x00, 0x45,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x3e, 0x8e, 0x00, 0x42, 0x09, 0xb0, 0x00, 0x00, 0x2d, 0x8e, 0x00, 0x43,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x3e, 0x8e, 0x00, 0x44, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xdd, 0x8b, 0x00, 0x45, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x40, 0x8e, 0x00, 0x43, 0x09, 0xb0, 0x00, 0x00, 0x34, 0x8e, 0x00, 0x44,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0xdd, 0x8b, 0x00, 0x45, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xdd, 0x8b, 0x00, 0x41, 0x09, 0xb0, 0x00, 0x00, 0x93, 0x8d, 0x00, 0x42,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x93, 0x8d, 0x00, 0x43, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x93, 0x8d, 0x00, 0x44, 0x09, 0xb0, 0x00, 0x00, 0xdd, 0x8b, 0x00, 0x45,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0xdd, 0x8b, 0x00, 0x41, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x42, 0x8e, 0x00, 0x42, 0x09, 0xb0, 0x00, 0x00, 0x42, 0x8e, 0x00, 0x43,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x42, 0x8e, 0x00, 0x44, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xdd, 0x8b, 0x00, 0x45, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x49, 0x8e, 0x00, 0x45, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x4b, 0x8e, 0x00, 0x42, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x58, 0x8e, 0x00, 0x43, 0x09, 0xb0, 0x00, 0x00, 0xbe, 0x8e, 0x00, 0x43,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0xcc, 0x8c, 0x00, 0x44, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x3b, 0x8e, 0x00, 0x45, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xc6, 0x8e, 0x00, 0x43, 0x09, 0xb0, 0x00, 0x00, 0xcc, 0x8c, 0x00, 0x44,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x3b, 0x8e, 0x00, 0x45, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0xda, 0x8e, 0x00, 0x43, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0xdd, 0x8b, 0x00, 0x45,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x93, 0x8c, 0x00, 0x43, 0x09, 0xb0, 0x00, 0x00, 0xc2, 0x8e, 0x00, 0x43,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0xcc, 0x8c, 0x00, 0x44, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x3b, 0x8e, 0x00, 0x45, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x02, 0x00, 0x2d, 0x05, 0x48, 0xb1, 0x01, 0x00, 0x04, 0x00, 0xa2, 0xf2,</div><div class='add'>+	0x0e, 0x6c, 0x00, 0x00, 0x04, 0x00, 0xa2, 0x02, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x07, 0x00, 0x2d, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf3,</div><div class='add'>+	0x08, 0xb0, 0x01, 0x00, 0x10, 0x04, 0x00, 0x40, 0x89, 0x98, 0x01, 0x00,</div><div class='add'>+	0x10, 0x00, 0x00, 0x47, 0x8a, 0xe4, 0x01, 0x00, 0x02, 0x99, 0x00, 0x04,</div><div class='add'>+	0x8a, 0x14, 0x01, 0x00, 0x04, 0x00, 0x20, 0x4e, 0x09, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x2a, 0x00, 0x00, 0x47, 0x80, 0xce, 0x01, 0x00, 0x04, 0x00, 0x24, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x06, 0x00, 0x20, 0x47, 0xe6, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x47, 0x96, 0xe4, 0x01, 0x00, 0x00, 0x00, 0x00, 0x47,</div><div class='add'>+	0x96, 0xd0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x47, 0x96, 0xd0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x04, 0x96, 0xc0, 0x01, 0x00, 0x7a, 0x89, 0x00, 0x4b,</div><div class='add'>+	0x10, 0xc9, 0x00, 0x00, 0xf6, 0x8e, 0x00, 0x49, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x2f, 0x8f, 0x00, 0x42, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x36, 0x8f, 0x00, 0x46,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x47, 0x8f, 0x00, 0x42,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x6a, 0x8f, 0x00, 0x42, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x64, 0x8f, 0x00, 0x4a,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x71, 0x8f, 0x00, 0x43, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0xdc, 0x8f, 0x00, 0x44, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xda, 0x8f, 0x00, 0x4b, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x3a, 0x8f, 0x00, 0x41,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x3a, 0x8f, 0x00, 0x43, 0x09, 0xb0, 0x00, 0x00, 0x3a, 0x8f, 0x00, 0x44,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x3a, 0x8f, 0x00, 0x45, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x3a, 0x8f, 0x00, 0x46, 0x09, 0xb0, 0x00, 0x00, 0x3a, 0x8f, 0x00, 0x47,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x3a, 0x8f, 0x00, 0x48, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x3a, 0x8f, 0x00, 0x49, 0x09, 0xb0, 0x00, 0x00, 0x3a, 0x8f, 0x00, 0x4a,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x3a, 0x8f, 0x00, 0x4b, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x3a, 0x8f, 0x00, 0x4c, 0x09, 0xb0, 0x00, 0x00, 0x3a, 0x8f, 0x00, 0x4d,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x45, 0x90, 0x00, 0x42,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x45, 0x90, 0x00, 0x44, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x45, 0x90, 0x00, 0x4b,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x62, 0x90, 0x00, 0x45,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x7a, 0x90, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x53, 0x90, 0x00, 0x45, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x0f, 0x93, 0x00, 0x46, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x6a, 0x8f, 0x00, 0x46, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x47, 0x8f, 0x00, 0x46, 0x09, 0xb0, 0x00, 0x00, 0x62, 0x8f, 0x00, 0x47,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x62, 0x8f, 0x00, 0x48, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x64, 0x8f, 0x00, 0x4a, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0xdc, 0x8f, 0x00, 0x45,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x71, 0x8f, 0x00, 0x43, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x62, 0x8f, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00, 0x62, 0x8f, 0x00, 0x48,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0xda, 0x8f, 0x00, 0x4c, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x81, 0x90, 0x00, 0x44, 0x09, 0xb0, 0x00, 0x00, 0x81, 0x90, 0x00, 0x42,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0xc6, 0x8b, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xc6, 0x8b, 0x00, 0x48, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x81, 0x90, 0x00, 0x4b,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x3a, 0x8f, 0x00, 0x41,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0xac, 0x90, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x8f, 0x90, 0x00, 0x47,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x8f, 0x90, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x8f, 0x90, 0x00, 0x47,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0xac, 0x90, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x62, 0x8f, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00, 0x62, 0x8f, 0x00, 0x48,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x8f, 0x90, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0xbb, 0x90, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xbb, 0x90, 0x00, 0x48, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x2c, 0x91, 0x00, 0x40,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x4e, 0x91, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x40, 0x91, 0x00, 0x48, 0x09, 0xb0, 0x00, 0x00, 0x87, 0x90, 0x00, 0x47,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x87, 0x90, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x4e, 0x91, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00, 0x57, 0x91, 0x00, 0x47,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x57, 0x91, 0x00, 0x48, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x40, 0x91, 0x00, 0x48,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x87, 0x90, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x87, 0x90, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00, 0x40, 0x91, 0x00, 0x48,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x45, 0x90, 0x00, 0x43, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x45, 0x90, 0x00, 0x45,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x45, 0x90, 0x00, 0x46, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x62, 0x8f, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00, 0x62, 0x8f, 0x00, 0x48,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x45, 0x90, 0x00, 0x4a, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x45, 0x90, 0x00, 0x4c, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xab, 0x90, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00, 0x9d, 0x90, 0x00, 0x48,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x8e, 0x90, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x8e, 0x90, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00, 0xab, 0x90, 0x00, 0x47,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0xc6, 0x8b, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xc6, 0x8b, 0x00, 0x48, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x9d, 0x90, 0x00, 0x48, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x8e, 0x90, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00, 0x8e, 0x90, 0x00, 0x47,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x9d, 0x90, 0x00, 0x48, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x5a, 0x91, 0x00, 0x42, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x5a, 0x91, 0x00, 0x44,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x5a, 0x91, 0x00, 0x4b, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x5a, 0x91, 0x00, 0x43, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x5a, 0x91, 0x00, 0x45,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x5a, 0x91, 0x00, 0x46, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x5a, 0x91, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00, 0x5a, 0x91, 0x00, 0x48,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x5a, 0x91, 0x00, 0x4a, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x5a, 0x91, 0x00, 0x4c, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x5a, 0x91, 0x00, 0x4c, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x77, 0x91, 0x00, 0x46,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x7a, 0x90, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x77, 0x91, 0x00, 0x46, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x96, 0x92, 0x00, 0x46, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x7a, 0x90, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x96, 0x92, 0x00, 0x46,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x96, 0x92, 0x00, 0x46,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xbf, 0x92, 0x00, 0x42, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0xbd, 0x92, 0x00, 0x4a,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xbf, 0x92, 0x00, 0x46, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x62, 0x8f, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x62, 0x8f, 0x00, 0x48, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0xbd, 0x92, 0x00, 0x4a,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x67, 0x91, 0x00, 0x41, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x74, 0x91, 0x00, 0x42,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x74, 0x91, 0x00, 0x44, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x74, 0x91, 0x00, 0x4b,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x74, 0x91, 0x00, 0x43,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x74, 0x91, 0x00, 0x45, 0x09, 0xb0, 0x00, 0x00, 0x74, 0x91, 0x00, 0x46,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x74, 0x91, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x74, 0x91, 0x00, 0x48, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x74, 0x91, 0x00, 0x4c,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x62, 0x90, 0x00, 0x4c, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x7a, 0x90, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x53, 0x90, 0x00, 0x4c,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x7d, 0x93, 0x00, 0x46,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x93, 0x00, 0x42,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x93, 0x00, 0x44, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x93, 0x00, 0x4b,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x93, 0x00, 0x45, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x93, 0x00, 0x46,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x62, 0x8f, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x62, 0x8f, 0x00, 0x48, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x93, 0x00, 0x4c,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x53, 0x90, 0x00, 0x42, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x0f, 0x93, 0x00, 0x46, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x53, 0x90, 0x00, 0x46, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x7a, 0x90, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x0f, 0x93, 0x00, 0x46,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x0f, 0x93, 0x00, 0x46,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x16, 0x93, 0x00, 0x43, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x7a, 0x90, 0x00, 0x47,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x6e, 0x93, 0x00, 0x4a, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x16, 0x93, 0x00, 0x4d, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x2c, 0x93, 0x00, 0x43, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xfd, 0x92, 0x00, 0x4a, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x2c, 0x93, 0x00, 0x43, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x62, 0x8f, 0x00, 0x47,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x62, 0x8f, 0x00, 0x48, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xfd, 0x92, 0x00, 0x4a, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x44, 0x93, 0x00, 0x43, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x7a, 0x90, 0x00, 0x47,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x44, 0x93, 0x00, 0x43, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x44, 0x93, 0x00, 0x4d, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x47, 0x8f, 0x00, 0x42, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x6a, 0x8f, 0x00, 0x42, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x67, 0x93, 0x00, 0x42, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x6a, 0x8f, 0x00, 0x46, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x47, 0x8f, 0x00, 0x46, 0x09, 0xb0, 0x00, 0x00, 0x62, 0x8f, 0x00, 0x47,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x62, 0x8f, 0x00, 0x48, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x67, 0x93, 0x00, 0x46, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x6e, 0x93, 0x00, 0x4a, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x7a, 0x90, 0x00, 0x47,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x6e, 0x93, 0x00, 0x4a, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x10, 0x93, 0x00, 0x46, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x10, 0x93, 0x00, 0x46,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x7a, 0x90, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x10, 0x93, 0x00, 0x46, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x10, 0x93, 0x00, 0x46, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x77, 0x93, 0x00, 0x42,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0xfd, 0x92, 0x00, 0x4a, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x77, 0x93, 0x00, 0x46,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x62, 0x8f, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00, 0x62, 0x8f, 0x00, 0x48,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0xfd, 0x92, 0x00, 0x4a, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x71, 0x8f, 0x00, 0x4d, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x71, 0x8f, 0x00, 0x4d, 0x09, 0xb0, 0x00, 0x00, 0x62, 0x8f, 0x00, 0x47,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x62, 0x8f, 0x00, 0x48, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0xa2, 0x05, 0x48, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x22, 0x07, 0x80, 0x32, 0x00, 0x00, 0x07, 0x00, 0x2e, 0x4b,</div><div class='add'>+	0x19, 0x90, 0x01, 0x00, 0xf8, 0x87, 0x00, 0x04, 0xe6, 0xb1, 0x00, 0x00,</div><div class='add'>+	0xc6, 0x8b, 0x22, 0x42, 0x19, 0x7c, 0x00, 0x00, 0x09, 0x97, 0x00, 0x3a,</div><div class='add'>+	0x81, 0x30, 0x01, 0x00, 0xc6, 0x8b, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xc6, 0x8b, 0x22, 0x42, 0x19, 0x7c, 0x00, 0x00, 0xff, 0x1f, 0x00, 0x0f,</div><div class='add'>+	0x1e, 0x8c, 0x01, 0x00, 0x6d, 0x96, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0xd8, 0x8b, 0x9c, 0x0f, 0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5c,</div><div class='add'>+	0x1f, 0x80, 0x01, 0x00, 0x00, 0x80, 0x00, 0x10, 0x42, 0xc9, 0x01, 0x00,</div><div class='add'>+	0xd8, 0x8b, 0x22, 0x40, 0xe3, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x45,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0xd5, 0x8b, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0x23, 0x83, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x1a, 0x85, 0x22, 0x02, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0xd9, 0x8b, 0x42, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0x93, 0x93, 0x01, 0x00, 0x00, 0x00, 0x1a, 0x02, 0x68, 0x97, 0x01, 0x00,</div><div class='add'>+	0x1a, 0x85, 0x00, 0x40, 0x05, 0xb0, 0x00, 0x00, 0x04, 0x00, 0xa2, 0x05,</div><div class='add'>+	0x48, 0x6d, 0x00, 0x00, 0x04, 0x00, 0x22, 0x07, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x05, 0x00, 0x2e, 0x4b, 0x19, 0x90, 0x01, 0x00, 0xf8, 0x87, 0x00, 0x04,</div><div class='add'>+	0xe6, 0xb1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x87, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x8d, 0xb0, 0x01, 0x00, 0x00, 0x80, 0x00, 0x03,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0x40, 0x00, 0x00, 0xa1, 0x44, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf0, 0xe0, 0xb1, 0x01, 0x00, 0x78, 0x98, 0x00, 0x06,</div><div class='add'>+	0x07, 0x40, 0x01, 0x00, 0x04, 0x00, 0xa2, 0x5c, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x06, 0x07, 0xd0, 0x01, 0x00, 0xd4, 0x00, 0x2e, 0x5c,</div><div class='add'>+	0x1f, 0x90, 0x01, 0x00, 0x00, 0x00, 0x00, 0x07, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x0c, 0x80, 0x00, 0x03, 0x42, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xfe, 0x96, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xfe,</div><div class='add'>+	0x96, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x00, 0xfe,</div><div class='add'>+	0x96, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x96, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf0, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x00, 0xfa, 0x96, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xfe, 0x96, 0xc0, 0x01, 0x00, 0x00, 0x30, 0x00, 0x4b,</div><div class='add'>+	0x94, 0x88, 0x01, 0x00, 0x00, 0x00, 0x00, 0x46, 0x95, 0xf0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4a, 0x96, 0xc0, 0x01, 0x00, 0x5e, 0x01, 0x2e, 0x34,</div><div class='add'>+	0x97, 0x84, 0x01, 0x00, 0x02, 0x00, 0x00, 0x4b, 0xe4, 0xe5, 0x01, 0x00,</div><div class='add'>+	0x64, 0x01, 0x20, 0x40, 0xe1, 0xb1, 0x01, 0x00, 0x09, 0x00, 0x00, 0x07,</div><div class='add'>+	0x86, 0xe4, 0x01, 0x00, 0x00, 0x00, 0x2e, 0xa7, 0x87, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x10, 0x00, 0x00, 0x10, 0x48, 0xc9, 0x01, 0x00, 0x10, 0x00, 0x00, 0x40,</div><div class='add'>+	0xf1, 0x99, 0x01, 0x00, 0x58, 0x01, 0x00, 0x43, 0xf0, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x58, 0x01, 0x00, 0x05, 0xe0, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0xa0, 0x00, 0x00, 0xa4, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0x05, 0x8c, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x1a, 0x00, 0x00, 0x40, 0x97, 0x98, 0x01, 0x00,</div><div class='add'>+	0x08, 0x00, 0x2e, 0x40, 0x95, 0xb0, 0x01, 0x00, 0x0d, 0x8c, 0x20, 0x4b,</div><div class='add'>+	0x94, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x0a, 0x8c, 0x00, 0x41, 0x95, 0xc0, 0x00, 0x00, 0x10, 0x80, 0x00, 0x10,</div><div class='add'>+	0x44, 0xc9, 0x01, 0x00, 0x14, 0x8c, 0x22, 0x40, 0xe3, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x44, 0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x10, 0x8c, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x23, 0x83, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x09, 0x97, 0x00, 0x40, 0x81, 0x30, 0x01, 0x00,</div><div class='add'>+	0xdd, 0x8b, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x0c, 0x80, 0x00, 0x03,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x86, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf8, 0x88, 0xb0, 0x01, 0x00, 0x14, 0x80, 0x00, 0x03,</div><div class='add'>+	0x98, 0xc8, 0x01, 0x00, 0x04, 0x00, 0xa2, 0xa1, 0x98, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x1b, 0x8c, 0x44, 0x40, 0x81, 0x32, 0x00, 0x00, 0x1e, 0x8c, 0xa2, 0x4c,</div><div class='add'>+	0xfd, 0x7f, 0x00, 0x00, 0x1f, 0x8c, 0x00, 0x4c, 0xfd, 0x93, 0x00, 0x00,</div><div class='add'>+	0x20, 0x8c, 0x20, 0xf0, 0x56, 0x6f, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0,</div><div class='add'>+	0x56, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x1c, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x64, 0x00, 0x00, 0x40, 0x81, 0x98, 0x01, 0x00, 0x64, 0x00, 0x00, 0x40,</div><div class='add'>+	0x80, 0xcc, 0x01, 0x00, 0x04, 0x00, 0xa6, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0xd8, 0x00, 0x00, 0x40, 0x81, 0x98, 0x01, 0x00, 0x04, 0x00, 0xa2, 0x43,</div><div class='add'>+	0x81, 0x04, 0x00, 0x00, 0x00, 0x80, 0x00, 0x10, 0x44, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x64, 0x00, 0x00, 0x40, 0xf1, 0x99, 0x01, 0x00, 0x70, 0x00, 0x00, 0x05,</div><div class='add'>+	0xf0, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x43, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x47, 0x61, 0xb1, 0x01, 0x00, 0x20, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x2b, 0x8c, 0xa8, 0x44, 0xe0, 0x31, 0x00, 0x00,</div><div class='add'>+	0x10, 0x00, 0x00, 0x10, 0x8c, 0xc8, 0x01, 0x00, 0x00, 0x80, 0x00, 0x46,</div><div class='add'>+	0x44, 0xc9, 0x01, 0x00, 0x40, 0x00, 0x00, 0x40, 0xf1, 0x99, 0x01, 0x00,</div><div class='add'>+	0x68, 0x01, 0x00, 0x05, 0xf0, 0xc9, 0x01, 0x00, 0x64, 0x00, 0x00, 0x43,</div><div class='add'>+	0xf0, 0xc9, 0x01, 0x00, 0x04, 0x00, 0x24, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x47, 0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x46,</div><div class='add'>+	0x62, 0xb1, 0x01, 0x00, 0x34, 0x8c, 0xa8, 0x44, 0xe0, 0x31, 0x00, 0x00,</div><div class='add'>+	0x23, 0x83, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x09, 0x00, 0x00, 0x07,</div><div class='add'>+	0x86, 0xe4, 0x01, 0x00, 0x38, 0x00, 0x2e, 0xa7, 0x87, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x8b, 0x00, 0x2d, 0x05, 0x48, 0xb1, 0x01, 0x00, 0x3c, 0x8c, 0x22, 0x43,</div><div class='add'>+	0xe7, 0x7d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x45, 0xc1, 0x01, 0x00,</div><div class='add'>+	0x3f, 0x8c, 0x22, 0x44, 0xe7, 0x7d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4c,</div><div class='add'>+	0x45, 0xc1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4a, 0x19, 0x90, 0x01, 0x00,</div><div class='add'>+	0x68, 0x01, 0x20, 0xa2, 0xe4, 0xb1, 0x01, 0x00, 0x88, 0x00, 0x00, 0x40,</div><div class='add'>+	0x43, 0x99, 0x01, 0x00, 0x43, 0x8c, 0x23, 0x0b, 0xe5, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x19, 0x90, 0x01, 0x00, 0x00, 0x80, 0x00, 0x10,</div><div class='add'>+	0x44, 0xc9, 0x01, 0x00, 0x50, 0x00, 0x00, 0x40, 0xf1, 0x99, 0x01, 0x00,</div><div class='add'>+	0x58, 0x01, 0x00, 0x43, 0xf0, 0xc9, 0x01, 0x00, 0x58, 0x01, 0x00, 0x05,</div><div class='add'>+	0xe0, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x10, 0x62, 0xb1, 0x01, 0x00, 0x48, 0x8c, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x23, 0x83, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x5c, 0x00, 0x2e, 0x05, 0x48, 0xb1, 0x01, 0x00, 0x00, 0x80, 0x00, 0x03,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x60, 0xf0, 0x96, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xa0, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00, 0x04, 0x00, 0xa2, 0xf2,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x09, 0x97, 0x00, 0x41, 0x81, 0x30, 0x01, 0x00,</div><div class='add'>+	0xdd, 0x8b, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x55, 0x8c, 0xa2, 0x49,</div><div class='add'>+	0x19, 0x7c, 0x00, 0x00, 0x86, 0x00, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00,</div><div class='add'>+	0x59, 0x8c, 0x00, 0x40, 0xe5, 0xb1, 0x00, 0x00, 0x86, 0x00, 0x2f, 0x49,</div><div class='add'>+	0x19, 0x80, 0x01, 0x00, 0x59, 0x8c, 0xa2, 0xf2, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x8b, 0x00, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x42,</div><div class='add'>+	0xe7, 0x91, 0x01, 0x00, 0x5c, 0x8c, 0xa2, 0x46, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0xa0, 0x00, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00, 0x60, 0x8c, 0x00, 0x40,</div><div class='add'>+	0xe5, 0xb1, 0x00, 0x00, 0xa0, 0x00, 0x2f, 0x46, 0x19, 0x80, 0x01, 0x00,</div><div class='add'>+	0x60, 0x8c, 0xa2, 0xf2, 0x80, 0x32, 0x00, 0x00, 0x8b, 0x00, 0x00, 0x40,</div><div class='add'>+	0x47, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41, 0xe7, 0x91, 0x01, 0x00,</div><div class='add'>+	0x07, 0x00, 0x00, 0x4e, 0x80, 0xe4, 0x01, 0x00, 0x00, 0x39, 0x00, 0x40,</div><div class='add'>+	0x80, 0xc8, 0x01, 0x00, 0x04, 0x00, 0xa2, 0x40, 0x06, 0x6c, 0x00, 0x00,</div><div class='add'>+	0xa8, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00, 0x34, 0x00, 0x2d, 0xf0,</div><div class='add'>+	0x24, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xfb, 0x0c, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xfb, 0x10, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xfb,</div><div class='add'>+	0x12, 0xb0, 0x01, 0x00, 0x0f, 0x00, 0x00, 0xf3, 0x16, 0x88, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0xf3, 0x14, 0xf4, 0x01, 0x00, 0x90, 0x8c, 0x26, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x76, 0x8c, 0x22, 0x0a, 0x16, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x58, 0x00, 0x3d, 0x43, 0x13, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8,</div><div class='add'>+	0x82, 0xb0, 0x01, 0x00, 0x04, 0x00, 0x22, 0xf0, 0x84, 0x30, 0x00, 0x00,</div><div class='add'>+	0x15, 0x98, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x23, 0x83, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x13, 0xc0, 0x01, 0x00, 0x75, 0x8c, 0xa0, 0x43,</div><div class='add'>+	0x13, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x13, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x6b, 0x8c, 0x00, 0x41, 0x15, 0xd0, 0x00, 0x00, 0x90, 0x8c, 0x22, 0x0a,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x04, 0x00, 0xa2, 0x08, 0x12, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x58, 0x00, 0x3d, 0x43, 0x13, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8,</div><div class='add'>+	0x82, 0xb0, 0x01, 0x00, 0x04, 0x00, 0x22, 0xf0, 0x84, 0x30, 0x00, 0x00,</div><div class='add'>+	0x15, 0x98, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x40, 0x00, 0x20, 0x40,</div><div class='add'>+	0xe1, 0xb1, 0x01, 0x00, 0x23, 0x83, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x05, 0x48, 0xb1, 0x01, 0x00, 0x90, 0x8c, 0x22, 0x41,</div><div class='add'>+	0x15, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x11, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x83, 0x8c, 0xa0, 0x43, 0x11, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x11, 0xb0, 0x01, 0x00, 0x04, 0x00, 0x22, 0x06, 0x10, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x58, 0x00, 0x3d, 0x43, 0x11, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8,</div><div class='add'>+	0x36, 0xb0, 0x01, 0x00, 0x04, 0x00, 0x22, 0xf0, 0x00, 0x30, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x50, 0x83, 0xb0, 0x01, 0x00, 0x4e, 0x97, 0x00, 0x47,</div><div class='add'>+	0x61, 0x31, 0x01, 0x00, 0x23, 0x83, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x2b, 0x94, 0x00, 0x05, 0x48, 0x31, 0x01, 0x00, 0x00, 0x00, 0x00, 0x45,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0x8c, 0x8c, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0x23, 0x83, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x7f, 0x8c, 0x00, 0x05, 0x48, 0xb1, 0x00, 0x00,</div><div class='add'>+	0x37, 0x00, 0x20, 0x40, 0xe7, 0xb1, 0x01, 0x00, 0x80, 0x97, 0x00, 0x51,</div><div class='add'>+	0x81, 0x30, 0x01, 0x00, 0xdd, 0x8b, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x37, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00, 0x04, 0x00, 0xa2, 0xf3,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x34, 0x00, 0x2e, 0x41, 0xf5, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x11, 0x00, 0x40, 0xe5, 0x99, 0x01, 0x00, 0x04, 0x00, 0xa2, 0x48,</div><div class='add'>+	0x19, 0x7c, 0x00, 0x00, 0x9d, 0x8c, 0x00, 0x48, 0x19, 0x90, 0x00, 0x00,</div><div class='add'>+	0x37, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00, 0x04, 0x00, 0xa2, 0xf3,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x34, 0x00, 0x2e, 0x41, 0xf5, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x11, 0x00, 0x40, 0xe5, 0x99, 0x01, 0x00, 0x00, 0x80, 0x00, 0x03,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x94, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xa4, 0x8c, 0x22, 0x45, 0x23, 0x7c, 0x00, 0x00, 0xb0, 0x00, 0x2f, 0xf0,</div><div class='add'>+	0x8c, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x60, 0xf0, 0x8c, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x7c, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00, 0x04, 0x00, 0xa3, 0xf0,</div><div class='add'>+	0x8c, 0x6c, 0x00, 0x00, 0x90, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00,</div><div class='add'>+	0x35, 0x00, 0x2d, 0xf0, 0x8c, 0xb0, 0x01, 0x00, 0x34, 0x00, 0x2d, 0xf3,</div><div class='add'>+	0x84, 0xb0, 0x01, 0x00, 0x04, 0x00, 0x22, 0xf3, 0x84, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x58, 0x00, 0x3e, 0x43, 0x85, 0xe0, 0x01, 0x00, 0xab, 0x8c, 0x22, 0x48,</div><div class='add'>+	0x19, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x8d, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x68, 0x0a, 0x8c, 0xc0, 0x01, 0x00, 0x38, 0x00, 0x2a, 0x4a,</div><div class='add'>+	0xe0, 0xb1, 0x01, 0x00, 0x28, 0x00, 0x00, 0x00, 0xe0, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x3c, 0x00, 0x20, 0x1b, 0xe0, 0xb1, 0x01, 0x00, 0x10, 0x80, 0x00, 0x03,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x38, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf8, 0x26, 0xb0, 0x01, 0x00, 0x04, 0x00, 0x22, 0xf8,</div><div class='add'>+	0x02, 0x30, 0x00, 0x00, 0xb9, 0x8c, 0x23, 0x01, 0x14, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf8, 0x80, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8,</div><div class='add'>+	0x82, 0xb0, 0x01, 0x00, 0x4c, 0x00, 0x20, 0xf0, 0xe4, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x44, 0x00, 0x20, 0x40, 0xe0, 0xb1, 0x01, 0x00, 0x48, 0x00, 0x20, 0x41,</div><div class='add'>+	0xe0, 0xb1, 0x01, 0x00, 0xa8, 0x00, 0x2d, 0x10, 0x32, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x58, 0x98, 0x00, 0xf0, 0x24, 0x30, 0x01, 0x00, 0xc2, 0x8c, 0xa2, 0x44,</div><div class='add'>+	0x81, 0x6c, 0x00, 0x00, 0xc0, 0x8c, 0x22, 0x41, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0xb6, 0x95, 0x00, 0x40, 0x3b, 0x30, 0x01, 0x00, 0xea, 0x8c, 0xa2, 0x08,</div><div class='add'>+	0x3c, 0x30, 0x00, 0x00, 0xc2, 0x8c, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xb9, 0x94, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0xea, 0x8c, 0xa2, 0x08,</div><div class='add'>+	0x3c, 0x30, 0x00, 0x00, 0x50, 0x00, 0x20, 0x1c, 0xe0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x54, 0x00, 0x20, 0x13, 0xe0, 0xb1, 0x01, 0x00, 0x4e, 0x00, 0x20, 0x01,</div><div class='add'>+	0xe4, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x20, 0x0a, 0xe0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x80, 0x97, 0x00, 0x5f, 0x81, 0x30, 0x01, 0x00, 0xdd, 0x8b, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x37, 0x00, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00,</div><div class='add'>+	0x8f, 0x95, 0x00, 0xf3, 0x94, 0x30, 0x01, 0x00, 0x9d, 0x8c, 0x22, 0x4a,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0xce, 0x8c, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x37, 0x00, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00, 0x8f, 0x95, 0x00, 0xf3,</div><div class='add'>+	0x94, 0x30, 0x01, 0x00, 0x04, 0x00, 0x20, 0x43, 0x97, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x58, 0x00, 0x3e, 0x43, 0x97, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x1b,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x1f, 0x00, 0x60, 0x00, 0x00, 0x8c, 0x01, 0x00,</div><div class='add'>+	0xdd, 0x8b, 0x85, 0x11, 0x80, 0x32, 0x00, 0x00, 0x04, 0x80, 0x00, 0x03,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0xb0, 0x00, 0x2f, 0xf0, 0x8c, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x60, 0xf0, 0x8c, 0xc0, 0x01, 0x00, 0x7c, 0x00, 0x00, 0x40,</div><div class='add'>+	0x43, 0x99, 0x01, 0x00, 0x04, 0x00, 0xa3, 0xf0, 0x8c, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x80, 0x97, 0x00, 0x5f, 0x81, 0x30, 0x01, 0x00, 0xdd, 0x8b, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x22, 0x49, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0xdc, 0x8c, 0x00, 0x49, 0x19, 0x80, 0x00, 0x00, 0xe1, 0x8c, 0x22, 0x41,</div><div class='add'>+	0x19, 0x7c, 0x00, 0x00, 0xb6, 0x95, 0x00, 0x40, 0x3b, 0x30, 0x01, 0x00,</div><div class='add'>+	0xe5, 0x8c, 0xa2, 0x08, 0x3c, 0x30, 0x00, 0x00, 0x80, 0x97, 0x00, 0x5f,</div><div class='add'>+	0x81, 0x30, 0x01, 0x00, 0xdd, 0x8b, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xb9, 0x94, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0xe5, 0x8c, 0xa2, 0x08,</div><div class='add'>+	0x3c, 0x30, 0x00, 0x00, 0x80, 0x97, 0x00, 0x5f, 0x81, 0x30, 0x01, 0x00,</div><div class='add'>+	0xdd, 0x8b, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x50, 0x00, 0x2d, 0x10,</div><div class='add'>+	0x32, 0xb0, 0x01, 0x00, 0x54, 0x00, 0x2d, 0xf0, 0x38, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x4e, 0x00, 0x2d, 0xf0, 0x26, 0xb0, 0x01, 0x00, 0x40, 0x00, 0x2d, 0xf2,</div><div class='add'>+	0x02, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x14, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x30, 0x00, 0x00, 0x10, 0x8c, 0xc8, 0x01, 0x00, 0x00, 0x80, 0x00, 0x46,</div><div class='add'>+	0x44, 0xc9, 0x01, 0x00, 0x68, 0x01, 0x2d, 0x44, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x10, 0x00, 0x68, 0xf2, 0x80, 0xc8, 0x01, 0x00, 0x00, 0x00, 0x00, 0x08,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x58, 0x01, 0x00, 0x05, 0xe0, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x0b, 0x37, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x36, 0xd0, 0x01, 0x00, 0x5c, 0x01, 0x2e, 0x40, 0x10, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x06, 0x80, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x52,</div><div class='add'>+	0x81, 0xd0, 0x01, 0x00, 0x12, 0x97, 0x00, 0x40, 0xe4, 0x31, 0x01, 0x00,</div><div class='add'>+	0x20, 0x00, 0x00, 0x46, 0x62, 0xdd, 0x01, 0x00, 0xf6, 0x8c, 0xa8, 0x40,</div><div class='add'>+	0x23, 0x30, 0x00, 0x00, 0x08, 0x95, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x10, 0x95, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x04, 0x8d, 0x82, 0x41,</div><div class='add'>+	0x23, 0x40, 0x00, 0x00, 0x20, 0x80, 0x00, 0x10, 0x42, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x01, 0x8d, 0x22, 0x40, 0xe3, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0xfe, 0x8c, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0x23, 0x83, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x10, 0x32, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x23, 0xb0, 0x01, 0x00, 0x00, 0x80, 0x00, 0x19, 0x44, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x0c, 0x8d, 0x22, 0x41, 0x19, 0x7c, 0x00, 0x00, 0x08, 0x8d, 0xa3, 0x01,</div><div class='add'>+	0x0c, 0x6c, 0x00, 0x00, 0x09, 0x8d, 0x00, 0x06, 0x04, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x01, 0x04, 0xb0, 0x01, 0x00, 0x0b, 0x8d, 0x20, 0x02,</div><div class='add'>+	0x36, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1b, 0x04, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x0f, 0x8d, 0x00, 0x02, 0xe0, 0xb1, 0x00, 0x00, 0x0e, 0x8d, 0xa3, 0x01,</div><div class='add'>+	0x0c, 0x6c, 0x00, 0x00, 0x0f, 0x8d, 0x00, 0x06, 0x04, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x01, 0x04, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x68, 0x02,</div><div class='add'>+	0x16, 0x94, 0x01, 0x00, 0xff, 0xff, 0x00, 0x0b, 0x16, 0xd8, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x68, 0x08, 0x3e, 0x96, 0x01, 0x00, 0x00, 0x00, 0x00, 0x1c,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x46, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x20, 0x00, 0x00, 0x19, 0x62, 0xdd, 0x01, 0x00, 0x14, 0x8d, 0xa8, 0x13,</div><div class='add'>+	0xe0, 0x31, 0x00, 0x00, 0x51, 0x8d, 0x22, 0x02, 0x14, 0x50, 0x00, 0x00,</div><div class='add'>+	0x44, 0x00, 0x2d, 0x02, 0x0c, 0xd0, 0x01, 0x00, 0x3c, 0x8d, 0xa2, 0x02,</div><div class='add'>+	0x02, 0x50, 0x00, 0x00, 0x22, 0x8d, 0x22, 0x5c, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x20, 0x80, 0x00, 0x03, 0x42, 0xc9, 0x01, 0x00, 0x21, 0x8d, 0x22, 0x40,</div><div class='add'>+	0xe3, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x47, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00, 0x1d, 0x8d, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x23, 0x83, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x05, 0x48, 0xb1, 0x01, 0x00, 0x44, 0x00, 0x2d, 0x5c,</div><div class='add'>+	0x1f, 0x80, 0x01, 0x00, 0x48, 0x00, 0x2d, 0xf0, 0x38, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x4c, 0x00, 0x2d, 0xf0, 0x26, 0xb0, 0x01, 0x00, 0x38, 0x00, 0x2f, 0xf2,</div><div class='add'>+	0x02, 0xb0, 0x01, 0x00, 0x3e, 0x8d, 0x22, 0x01, 0x14, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa4, 0x40, 0x81, 0x32, 0x00, 0x00, 0x30, 0x8d, 0x22, 0x46,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46, 0x1f, 0x80, 0x01, 0x00,</div><div class='add'>+	0x20, 0x00, 0x2d, 0x03, 0x48, 0xb1, 0x01, 0x00, 0x2f, 0x8d, 0x22, 0x40,</div><div class='add'>+	0xe3, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00, 0x2c, 0x8d, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x23, 0x83, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x38, 0x00, 0x2f, 0x05, 0x48, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8,</div><div class='add'>+	0x94, 0xb0, 0x01, 0x00, 0x38, 0x00, 0x2d, 0xf0, 0x96, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4c, 0xe1, 0xc1, 0x01, 0x00, 0x20, 0x00, 0x00, 0x03,</div><div class='add'>+	0x48, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x22, 0x4a, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x44, 0x00, 0x00, 0x05, 0xf0, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4a,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4b, 0xe0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x47, 0x61, 0xb1, 0x01, 0x00, 0xa0, 0x00, 0x00, 0xa4,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x39, 0x8d, 0xa8, 0x5c, 0x1f, 0x10, 0x00, 0x00,</div><div class='add'>+	0x3e, 0x8d, 0x00, 0x05, 0x48, 0xb1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,</div><div class='add'>+	0x38, 0xc0, 0x01, 0x00, 0x04, 0x00, 0x24, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x4c, 0x8d, 0x22, 0x06, 0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50,</div><div class='add'>+	0x33, 0xc0, 0x01, 0x00, 0x4a, 0x8d, 0xa2, 0x02, 0x36, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x22, 0x41, 0x19, 0x7c, 0x00, 0x00, 0x04, 0x00, 0x8f, 0x0d,</div><div class='add'>+	0x42, 0x31, 0x00, 0x00, 0x04, 0x00, 0x22, 0xf0, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x22, 0x5c, 0xe1, 0x7d, 0x00, 0x00, 0x04, 0x00, 0xa2, 0xf0,</div><div class='add'>+	0x6a, 0x06, 0x00, 0x00, 0x10, 0x00, 0x00, 0xf8, 0x10, 0xc8, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x5c, 0x11, 0x80, 0x01, 0x00, 0xf0, 0x07, 0x00, 0x40,</div><div class='add'>+	0x37, 0x98, 0x01, 0x00, 0xfa, 0x8c, 0x00, 0xa1, 0x1a, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x02, 0x10, 0xc0, 0x01, 0x00, 0xfa, 0x8c, 0x00, 0x02,</div><div class='add'>+	0x36, 0xd0, 0x00, 0x00, 0x50, 0x00, 0x20, 0x1c, 0xe0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x54, 0x00, 0x20, 0x13, 0xe0, 0xb1, 0x01, 0x00, 0x4e, 0x00, 0x20, 0x01,</div><div class='add'>+	0xe4, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x20, 0x0a, 0xe0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x58, 0x8d, 0x00, 0x5f, 0x01, 0xb0, 0x00, 0x00, 0x04, 0x00, 0xa2, 0x02,</div><div class='add'>+	0x02, 0x6c, 0x00, 0x00, 0x04, 0x00, 0xa2, 0x02, 0x0c, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x37, 0x00, 0x2d, 0x46, 0x01, 0xb0, 0x01, 0x00, 0x04, 0x00, 0x00, 0xf3,</div><div class='add'>+	0x80, 0xf4, 0x01, 0x00, 0x57, 0x8d, 0xa0, 0x43, 0x81, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x55, 0x01, 0xb0, 0x01, 0x00, 0x40, 0x00, 0x20, 0x40,</div><div class='add'>+	0xe1, 0xb1, 0x01, 0x00, 0x00, 0x80, 0x00, 0x19, 0x42, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x5e, 0x8d, 0x22, 0x40, 0xe3, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x19, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0x5b, 0x8d, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0x23, 0x83, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x0d, 0x95, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x30, 0x80, 0x00, 0x10, 0x42, 0xc9, 0x01, 0x00, 0x65, 0x8d, 0x22, 0x40,</div><div class='add'>+	0xe3, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00, 0x62, 0x8d, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x23, 0x83, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x60, 0x01, 0x2f, 0x05, 0x48, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x0b,</div><div class='add'>+	0xe4, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x50, 0x17, 0xf0, 0x01, 0x00,</div><div class='add'>+	0x6a, 0x8d, 0x90, 0xf2, 0x16, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x17, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x66, 0x20, 0x17, 0xa4, 0x01, 0x00,</div><div class='add'>+	0x32, 0x00, 0x00, 0xa6, 0x2a, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf2,</div><div class='add'>+	0x2a, 0x94, 0x01, 0x00, 0x6d, 0x8d, 0x45, 0x48, 0x61, 0x31, 0x00, 0x00,</div><div class='add'>+	0x00, 0xd0, 0x00, 0x1e, 0x62, 0xdd, 0x01, 0x00, 0x72, 0x8d, 0x28, 0x40,</div><div class='add'>+	0x05, 0x30, 0x00, 0x00, 0x6e, 0x8d, 0x22, 0x48, 0x77, 0x7d, 0x00, 0x00,</div><div class='add'>+	0x75, 0x8d, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15,</div><div class='add'>+	0x62, 0xb1, 0x01, 0x00, 0x80, 0x8d, 0x28, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x72, 0x8d, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x1d, 0x00,</div><div class='add'>+	0x92, 0xb0, 0x01, 0x00, 0x7d, 0x8d, 0x22, 0x41, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x22, 0x40, 0x3b, 0x6c, 0x00, 0x00, 0x04, 0x00, 0xa3, 0x48,</div><div class='add'>+	0x3b, 0x6c, 0x00, 0x00, 0x00, 0x80, 0x00, 0x03, 0x42, 0xc9, 0x01, 0x00,</div><div class='add'>+	0xc3, 0x94, 0x00, 0xf8, 0x00, 0x30, 0x01, 0x00, 0x7a, 0x8d, 0xa2, 0x41,</div><div class='add'>+	0x3b, 0x50, 0x00, 0x00, 0x81, 0x8d, 0x00, 0x49, 0x00, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xff, 0x07, 0x00, 0x1e, 0x00, 0x8c, 0x01, 0x00, 0xc3, 0x94, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x81, 0x8d, 0x00, 0x49, 0x00, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x1d, 0x47, 0x19, 0x80, 0x01, 0x00, 0x84, 0x8d, 0x22, 0x5f,</div><div class='add'>+	0x01, 0x6c, 0x00, 0x00, 0x87, 0x98, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0xa7, 0x88, 0x00, 0x00, 0x80, 0xb0, 0x00, 0x00, 0x8b, 0x8d, 0x22, 0x5c,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x20, 0x80, 0x00, 0x03, 0x42, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x8b, 0x8d, 0x22, 0x40, 0xe3, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x47,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0x88, 0x8d, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0x23, 0x83, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x8b, 0x8d, 0x40, 0x05, 0x48, 0x31, 0x00, 0x00,</div><div class='add'>+	0xff, 0xff, 0x00, 0x07, 0x94, 0x89, 0x01, 0x00, 0x91, 0x8d, 0x85, 0xca,</div><div class='add'>+	0x94, 0x30, 0x00, 0x00, 0x87, 0x98, 0x18, 0x5c, 0x1f, 0x00, 0x01, 0x00,</div><div class='add'>+	0x0e, 0x00, 0x00, 0x0f, 0x1e, 0x8c, 0x01, 0x00, 0xb4, 0x87, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x80, 0x97, 0x18, 0x00, 0x80, 0x30, 0x01, 0x00,</div><div class='add'>+	0xdd, 0x8b, 0x00, 0x47, 0x19, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x19, 0x80, 0x01, 0x00, 0xdd, 0x8b, 0x22, 0x47, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0xb9, 0x94, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x98, 0x8d, 0xa2, 0x08,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0xdd, 0x8b, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x12, 0x97, 0x00, 0x40, 0x0d, 0x30, 0x01, 0x00, 0x9c, 0x01, 0x00, 0x40,</div><div class='add'>+	0x45, 0x99, 0x01, 0x00, 0xff, 0xff, 0x00, 0x0b, 0x98, 0x88, 0x01, 0x00,</div><div class='add'>+	0x8b, 0x00, 0x2d, 0x50, 0x17, 0xf0, 0x01, 0x00, 0x9e, 0x8d, 0x90, 0x4c,</div><div class='add'>+	0x16, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x17, 0xc0, 0x01, 0x00,</div><div class='add'>+	0xa0, 0x8d, 0x22, 0x43, 0xe7, 0x7d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0x45, 0xc1, 0x01, 0x00, 0x00, 0x00, 0x66, 0x20, 0x17, 0xa4, 0x01, 0x00,</div><div class='add'>+	0x68, 0x01, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00, 0x5c, 0x01, 0x2e, 0xf2,</div><div class='add'>+	0x80, 0xb0, 0x01, 0x00, 0x02, 0x00, 0x62, 0x40, 0x7e, 0xcd, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x57, 0x81, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x2e, 0x10,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x03, 0x00, 0x00, 0x40, 0xf0, 0x8d, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x08, 0xf0, 0xb1, 0x01, 0x00, 0x58, 0x01, 0x00, 0x05,</div><div class='add'>+	0xe0, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x10, 0x62, 0xb1, 0x01, 0x00, 0xaa, 0x8d, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x23, 0x83, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x05, 0x48, 0xb1, 0x01, 0x00, 0xae, 0x8d, 0x45, 0x48,</div><div class='add'>+	0x61, 0x31, 0x00, 0x00, 0x00, 0x50, 0x00, 0x08, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0xb4, 0x8d, 0x28, 0x40, 0x05, 0x30, 0x00, 0x00, 0xaf, 0x8d, 0x22, 0x48,</div><div class='add'>+	0x77, 0x7d, 0x00, 0x00, 0xc3, 0x94, 0x1d, 0x08, 0x00, 0x30, 0x01, 0x00,</div><div class='add'>+	0xdd, 0x8b, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xdd, 0x8b, 0x1d, 0x47,</div><div class='add'>+	0x19, 0x80, 0x00, 0x00, 0x04, 0x00, 0xa2, 0x05, 0x48, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x35, 0x00, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00, 0x01, 0x00, 0x63, 0xf3,</div><div class='add'>+	0x84, 0xc8, 0x01, 0x00, 0xba, 0x8d, 0xa0, 0x43, 0x85, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x63, 0x40, 0x85, 0xb0, 0x01, 0x00, 0xa8, 0x00, 0x00, 0x40,</div><div class='add'>+	0x43, 0x99, 0x01, 0x00, 0x37, 0x00, 0x2f, 0xf0, 0x24, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x22, 0xf3, 0x9e, 0x06, 0x00, 0x00, 0x01, 0x00, 0x63, 0xf3,</div><div class='add'>+	0x82, 0xcc, 0x01, 0x00, 0xc8, 0x8d, 0xa2, 0x41, 0x9e, 0x06, 0x00, 0x00,</div><div class='add'>+	0xdd, 0x8b, 0x22, 0x44, 0x83, 0x70, 0x00, 0x00, 0xa8, 0x00, 0x00, 0x40,</div><div class='add'>+	0x43, 0x99, 0x01, 0x00, 0x04, 0x00, 0xa2, 0xf0, 0x24, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x36, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00, 0x58, 0x00, 0x3d, 0x43,</div><div class='add'>+	0xe7, 0xe1, 0x01, 0x00, 0xdd, 0x8b, 0x1f, 0xf0, 0x24, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x87, 0x98, 0x00, 0x48, 0x81, 0x30, 0x01, 0x00, 0xa7, 0x88, 0x23, 0x41,</div><div class='add'>+	0x83, 0x6c, 0x00, 0x00, 0xa7, 0x88, 0x00, 0x47, 0x81, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x34, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00, 0x04, 0x00, 0x22, 0x42,</div><div class='add'>+	0xe6, 0x6d, 0x00, 0x00, 0x58, 0x00, 0x3d, 0x43, 0x85, 0xe0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf8, 0x36, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0,</div><div class='add'>+	0x00, 0xb0, 0x01, 0x00, 0x04, 0x00, 0x22, 0x00, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa2, 0x00, 0xbe, 0x06, 0x00, 0x00, 0x28, 0x00, 0x00, 0x40,</div><div class='add'>+	0x83, 0x98, 0x01, 0x00, 0x4e, 0x97, 0x00, 0x47, 0x61, 0x31, 0x01, 0x00,</div><div class='add'>+	0x23, 0x83, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x2d, 0x03,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x08, 0x00, 0x2d, 0xf0, 0x94, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf8, 0x8e, 0xb0, 0x01, 0x00, 0x90, 0x00, 0x2d, 0xf0,</div><div class='add'>+	0x14, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x05, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xa5, 0x8c, 0xa2, 0x40, 0x8f, 0x7c, 0x00, 0x00, 0xdb, 0x8d, 0x22, 0x47,</div><div class='add'>+	0x8f, 0x7c, 0x00, 0x00, 0x04, 0x00, 0xa2, 0x48, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0xa5, 0x8c, 0x00, 0x48, 0x19, 0x90, 0x00, 0x00, 0x04, 0x00, 0x22, 0x46,</div><div class='add'>+	0x8f, 0x7c, 0x00, 0x00, 0x5d, 0x8e, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa2, 0x05, 0x48, 0x6d, 0x00, 0x00, 0x36, 0x00, 0x2d, 0x5d,</div><div class='add'>+	0x05, 0xb4, 0x01, 0x00, 0x37, 0x00, 0x2d, 0xf3, 0x80, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf3, 0x8e, 0xb0, 0x01, 0x00, 0xf0, 0x00, 0x00, 0x47,</div><div class='add'>+	0x7e, 0x89, 0x01, 0x00, 0x04, 0x00, 0x26, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x5c, 0x00, 0x3d, 0x43, 0x81, 0xe0, 0x01, 0x00, 0xa8, 0x00, 0x2d, 0xf0,</div><div class='add'>+	0x94, 0xb0, 0x01, 0x00, 0x04, 0x00, 0x22, 0x4a, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf0, 0x24, 0xb0, 0x01, 0x00, 0x20, 0x00, 0x00, 0x10,</div><div class='add'>+	0x86, 0xdc, 0x01, 0x00, 0x40, 0x80, 0x00, 0x03, 0x44, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x8c, 0x93, 0x00, 0x4a, 0xf0, 0x31, 0x01, 0x00, 0x04, 0x00, 0xa2, 0x5c,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x36, 0x00, 0x2f, 0x5c, 0x1f, 0x90, 0x01, 0x00,</div><div class='add'>+	0xef, 0x8d, 0xa2, 0x50, 0x8f, 0x50, 0x00, 0x00, 0x34, 0x00, 0x20, 0x40,</div><div class='add'>+	0xe1, 0xb1, 0x01, 0x00, 0xdd, 0x8b, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xf0, 0x00, 0x00, 0x47, 0x7e, 0x89, 0x01, 0x00, 0x04, 0x00, 0x26, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x63, 0x41, 0x81, 0xc0, 0x01, 0x00,</div><div class='add'>+	0xf4, 0x8d, 0xa0, 0x43, 0x81, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x63, 0x40,</div><div class='add'>+	0x81, 0xb0, 0x01, 0x00, 0x37, 0x00, 0x20, 0x47, 0xe6, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xdd, 0x8b, 0x22, 0x47, 0x80, 0x32, 0x00, 0x00, 0x04, 0x00, 0x00, 0x47,</div><div class='add'>+	0x0c, 0xf4, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4f, 0x8f, 0x84, 0x01, 0x00,</div><div class='add'>+	0x09, 0x8e, 0x22, 0x47, 0x0c, 0x6c, 0x00, 0x00, 0x58, 0x00, 0x3d, 0x43,</div><div class='add'>+	0x81, 0xe0, 0x01, 0x00, 0x09, 0x8e, 0x1f, 0xf0, 0x24, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x5c, 0x1f, 0x80, 0x01, 0x00, 0x00, 0x80, 0x00, 0x10,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0x02, 0x8e, 0x22, 0x40, 0xe3, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x45, 0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0xff, 0x8d, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x23, 0x83, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x02, 0x8e, 0x42, 0x40,</div><div class='add'>+	0x05, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x93, 0x93, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x1a, 0x5d, 0x69, 0x93, 0x01, 0x00, 0x07, 0x8e, 0x23, 0x41,</div><div class='add'>+	0x0d, 0x6c, 0x00, 0x00, 0xdd, 0x8d, 0x00, 0x05, 0x48, 0xb1, 0x00, 0x00,</div><div class='add'>+	0x87, 0x98, 0x00, 0x05, 0x48, 0x31, 0x01, 0x00, 0xa7, 0x88, 0x00, 0x48,</div><div class='add'>+	0x81, 0xb0, 0x00, 0x00, 0xdd, 0x8b, 0x22, 0x40, 0x8f, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x80, 0x97, 0x00, 0x5f, 0x81, 0x30, 0x01, 0x00, 0xdd, 0x8b, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x40, 0x02, 0x00, 0x0c, 0x7e, 0x89, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa6, 0x40, 0x81, 0x32, 0x00, 0x00, 0xa2, 0x00, 0x00, 0x40,</div><div class='add'>+	0x43, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf3, 0x84, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xa6, 0x00, 0x2d, 0x49, 0x19, 0x90, 0x01, 0x00, 0x02, 0x00, 0x00, 0xf2,</div><div class='add'>+	0x80, 0xf4, 0x01, 0x00, 0xb8, 0x00, 0x2d, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf2, 0x80, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x82, 0xf8, 0x01, 0x00, 0x19, 0x00, 0x00, 0x40, 0x81, 0x98, 0x01, 0x00,</div><div class='add'>+	0x1a, 0x8e, 0xa0, 0x40, 0x82, 0x6c, 0x00, 0x00, 0x2c, 0x01, 0x00, 0x40,</div><div class='add'>+	0x81, 0x98, 0x01, 0x00, 0x1a, 0x8e, 0xa3, 0x40, 0x82, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x80, 0xb0, 0x01, 0x00, 0x1c, 0x8e, 0x20, 0x4c,</div><div class='add'>+	0x85, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x85, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x86, 0x00, 0x20, 0x40, 0xe4, 0xb1, 0x01, 0x00, 0xa2, 0x00, 0x20, 0x42,</div><div class='add'>+	0xe6, 0xb1, 0x01, 0x00, 0xdd, 0x8b, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x09, 0x97, 0x00, 0x50, 0x81, 0x30, 0x01, 0x00, 0xdd, 0x8b, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x80, 0x00, 0x03, 0x42, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x22, 0xf0, 0x80, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x8d, 0xb0, 0x01, 0x00, 0x78, 0x98, 0x00, 0x40, 0x87, 0x30, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa2, 0x5c, 0x1f, 0x7c, 0x00, 0x00, 0xb0, 0x00, 0x2f, 0x5c,</div><div class='add'>+	0x1f, 0x90, 0x01, 0x00, 0x00, 0x00, 0x60, 0xf0, 0x80, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x7c, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00, 0x04, 0x00, 0xa3, 0xf0,</div><div class='add'>+	0x80, 0x6c, 0x00, 0x00, 0x80, 0x97, 0x00, 0x5f, 0x81, 0x30, 0x01, 0x00,</div><div class='add'>+	0xdd, 0x8b, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0xdd, 0x8b, 0x22, 0x46, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0xa0, 0x00, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00, 0x01, 0x00, 0x62, 0xf2,</div><div class='add'>+	0x96, 0xcc, 0x01, 0x00, 0xdd, 0x8b, 0xa6, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x80, 0x97, 0x00, 0x4a, 0x81, 0x30, 0x01, 0x00, 0x55, 0x97, 0x00, 0x46,</div><div class='add'>+	0x95, 0x30, 0x01, 0x00, 0xdd, 0x8b, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xdd, 0x8b, 0x22, 0x49, 0x19, 0x7c, 0x00, 0x00, 0x86, 0x00, 0x00, 0x40,</div><div class='add'>+	0x47, 0x99, 0x01, 0x00, 0x01, 0x00, 0x62, 0xf2, 0x80, 0xcc, 0x01, 0x00,</div><div class='add'>+	0xdd, 0x8b, 0xa6, 0x40, 0x81, 0x32, 0x00, 0x00, 0x80, 0x97, 0x00, 0x4a,</div><div class='add'>+	0x81, 0x30, 0x01, 0x00, 0x55, 0x97, 0x00, 0x47, 0x95, 0x30, 0x01, 0x00,</div><div class='add'>+	0xdd, 0x8b, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x2b, 0x94, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x04, 0x00, 0xa2, 0x5c, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0xdd, 0x8b, 0x00, 0x5c, 0x1f, 0x90, 0x00, 0x00, 0x04, 0x00, 0xa2, 0x46,</div><div class='add'>+	0x19, 0x7c, 0x00, 0x00, 0xdd, 0x8b, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa2, 0x49, 0x19, 0x7c, 0x00, 0x00, 0xdd, 0x8b, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0xba, 0x00, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00,</div><div class='add'>+	0x01, 0x00, 0x62, 0xf2, 0x80, 0xc8, 0x01, 0x00, 0x46, 0x8e, 0x90, 0x40,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0xff, 0xff, 0x62, 0x40, 0x81, 0x98, 0x01, 0x00,</div><div class='add'>+	0xa4, 0x00, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00, 0xdd, 0x8b, 0x22, 0x40,</div><div class='add'>+	0xe5, 0x6d, 0x00, 0x00, 0xdd, 0x8b, 0x00, 0x41, 0xe5, 0xc1, 0x00, 0x00,</div><div class='add'>+	0x09, 0x97, 0x00, 0x4d, 0x81, 0x30, 0x01, 0x00, 0xdd, 0x8b, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x5c, 0x00, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x22, 0xf0, 0x96, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0xe1, 0xb1, 0x01, 0x00, 0x00, 0x80, 0x00, 0x03, 0x44, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4b, 0xe0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x8d, 0xb0, 0x01, 0x00, 0x78, 0x98, 0x00, 0x40, 0x87, 0x30, 0x01, 0x00,</div><div class='add'>+	0x8b, 0x00, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00, 0x56, 0x8e, 0x80, 0xf3,</div><div class='add'>+	0x96, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xe7, 0x81, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x47, 0x19, 0x90, 0x01, 0x00, 0x04, 0x00, 0xa2, 0x5c,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0xdd, 0x8b, 0x00, 0x5c, 0x1f, 0x90, 0x00, 0x00,</div><div class='add'>+	0x37, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00, 0x04, 0x00, 0xa2, 0xf3,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x34, 0x00, 0x00, 0x40, 0x45, 0x99, 0x01, 0x00,</div><div class='add'>+	0x01, 0x00, 0x00, 0x40, 0xf5, 0x99, 0x01, 0x00, 0x00, 0x11, 0x00, 0x40,</div><div class='add'>+	0xe5, 0x99, 0x01, 0x00, 0xb9, 0x94, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x6e, 0x8e, 0xa2, 0x08, 0x80, 0x32, 0x00, 0x00, 0x37, 0x00, 0x00, 0x40,</div><div class='add'>+	0x47, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf3, 0x82, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x63, 0x51, 0x83, 0xd0, 0x01, 0x00, 0x34, 0x00, 0x00, 0x40,</div><div class='add'>+	0x47, 0x99, 0x01, 0x00, 0x01, 0x00, 0x63, 0xf3, 0x84, 0xcc, 0x01, 0x00,</div><div class='add'>+	0x66, 0x8e, 0x9f, 0x42, 0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x63, 0x42,</div><div class='add'>+	0x85, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x45, 0x03, 0xf0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x01, 0x00, 0xc0, 0x01, 0x00, 0x68, 0x8e, 0x37, 0x5c,</div><div class='add'>+	0x61, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1b, 0x62, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x69, 0x8e, 0xa8, 0x4b, 0x19, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+	0x62, 0xb1, 0x01, 0x00, 0x6b, 0x8e, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0xed, 0x87, 0x17, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x80, 0x00, 0x03,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0x90, 0x00, 0x2d, 0xf0, 0x94, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xac, 0x00, 0x2d, 0xf0, 0x30, 0xb0, 0x01, 0x00, 0x35, 0x00, 0x2d, 0xf0,</div><div class='add'>+	0x28, 0xb0, 0x01, 0x00, 0x34, 0x00, 0x2d, 0xf3, 0x84, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x22, 0xf3, 0x84, 0x6c, 0x00, 0x00, 0x58, 0x00, 0x3e, 0x43,</div><div class='add'>+	0x85, 0xe0, 0x01, 0x00, 0x01, 0x00, 0x00, 0x18, 0xf0, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4a, 0xe0, 0xb1, 0x01, 0x00, 0x38, 0x00, 0x20, 0x00,</div><div class='add'>+	0xe0, 0xb1, 0x01, 0x00, 0x3c, 0x00, 0x20, 0x1b, 0xe0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x20, 0x40, 0xe1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x2b, 0xb0, 0x01, 0x00, 0x64, 0x97, 0x00, 0x40, 0x0d, 0x30, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x18, 0x16, 0xc0, 0x01, 0x00, 0x7f, 0x8e, 0xa0, 0x14,</div><div class='add'>+	0x16, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x17, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x0e, 0x00, 0x00, 0xa2, 0x44, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x18,</div><div class='add'>+	0xf8, 0xb1, 0x01, 0x00, 0xb0, 0x00, 0x2d, 0x14, 0xf8, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x10, 0x50, 0x00, 0x40, 0x87, 0x98, 0x01, 0x00, 0x88, 0x8e, 0x22, 0x4a,</div><div class='add'>+	0x19, 0x7c, 0x00, 0x00, 0x00, 0x30, 0x00, 0x43, 0x86, 0xc8, 0x01, 0x00,</div><div class='add'>+	0x00, 0x30, 0x00, 0x0b, 0x16, 0xc8, 0x01, 0x00, 0x88, 0x8e, 0xa4, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x17, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x01, 0x00, 0x6e, 0x43, 0x86, 0x98, 0x01, 0x00, 0xa8, 0x97, 0x00, 0x30,</div><div class='add'>+	0x81, 0x30, 0x01, 0x00, 0x8c, 0x8e, 0xa0, 0x41, 0x17, 0x40, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x17, 0xc0, 0x01, 0x00, 0x93, 0x8e, 0x22, 0x4a,</div><div class='add'>+	0x19, 0x7c, 0x00, 0x00, 0x08, 0x00, 0x00, 0xa2, 0x44, 0xc9, 0x01, 0x00,</div><div class='add'>+	0xcc, 0x00, 0x2d, 0xab, 0xf9, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xab,</div><div class='add'>+	0x17, 0xc0, 0x01, 0x00, 0x92, 0x8e, 0xa0, 0xf0, 0x16, 0x44, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x17, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x64, 0xf0,</div><div class='add'>+	0x82, 0xb0, 0x01, 0x00, 0x90, 0x00, 0x00, 0x40, 0x45, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x60, 0x41, 0x31, 0xc0, 0x01, 0x00, 0xbc, 0x00, 0x00, 0x40,</div><div class='add'>+	0x43, 0x99, 0x01, 0x00, 0x99, 0x8e, 0x06, 0x0c, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0xa0, 0x00, 0x20, 0xf2, 0xe4, 0xb1, 0x01, 0x00, 0x04, 0x00, 0x09, 0x46,</div><div class='add'>+	0x19, 0x10, 0x00, 0x00, 0x9c, 0x01, 0x00, 0x40, 0x45, 0x99, 0x01, 0x00,</div><div class='add'>+	0xff, 0xff, 0x00, 0x0b, 0x98, 0x88, 0x01, 0x00, 0x8b, 0x00, 0x2d, 0x50,</div><div class='add'>+	0x17, 0xf0, 0x01, 0x00, 0x9e, 0x8e, 0x90, 0x4c, 0x16, 0x40, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x17, 0xc0, 0x01, 0x00, 0xa0, 0x8e, 0x22, 0x43,</div><div class='add'>+	0xe7, 0x7d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x45, 0xc1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x66, 0x20, 0x17, 0xa4, 0x01, 0x00, 0x68, 0x01, 0x00, 0x40,</div><div class='add'>+	0x43, 0x99, 0x01, 0x00, 0x5c, 0x01, 0x2e, 0xf2, 0x80, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x02, 0x00, 0x62, 0x40, 0x7e, 0xcd, 0x01, 0x00, 0x00, 0x00, 0x00, 0x57,</div><div class='add'>+	0x81, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x2e, 0x10, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x03, 0x00, 0x00, 0x40, 0xf0, 0x8d, 0x01, 0x00, 0x00, 0x00, 0x00, 0x08,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x58, 0x01, 0x00, 0x05, 0xe0, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x44, 0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xb1, 0x01, 0x00, 0xaa, 0x8e, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x23, 0x83, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0xae, 0x8e, 0x45, 0x48, 0x61, 0x31, 0x00, 0x00,</div><div class='add'>+	0x00, 0x50, 0x00, 0x08, 0x62, 0xdd, 0x01, 0x00, 0xaf, 0x8e, 0xa8, 0x40,</div><div class='add'>+	0x05, 0x30, 0x00, 0x00, 0x35, 0x00, 0x1d, 0x40, 0x47, 0x99, 0x01, 0x00,</div><div class='add'>+	0x01, 0x00, 0x63, 0xf3, 0x84, 0xc8, 0x01, 0x00, 0xb5, 0x8e, 0xa0, 0x43,</div><div class='add'>+	0x85, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x63, 0x40, 0x85, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x37, 0x00, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00, 0x04, 0x00, 0x22, 0xf3,</div><div class='add'>+	0x9e, 0x06, 0x00, 0x00, 0x01, 0x00, 0x63, 0xf3, 0x82, 0xcc, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa2, 0x41, 0x9e, 0x06, 0x00, 0x00, 0x8b, 0x00, 0x00, 0x40,</div><div class='add'>+	0x47, 0x99, 0x01, 0x00, 0x04, 0x00, 0xa2, 0x45, 0xe7, 0x7d, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x45, 0xe7, 0x91, 0x01, 0x00, 0x80, 0x97, 0x00, 0x5f,</div><div class='add'>+	0x81, 0x30, 0x01, 0x00, 0xdd, 0x8b, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x37, 0x00, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00, 0x8f, 0x95, 0x00, 0xf3,</div><div class='add'>+	0x94, 0x30, 0x01, 0x00, 0x5d, 0x8e, 0x22, 0x4a, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0xce, 0x8c, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x37, 0x00, 0x00, 0x40,</div><div class='add'>+	0x47, 0x99, 0x01, 0x00, 0x8f, 0x95, 0x00, 0xf3, 0x94, 0x30, 0x01, 0x00,</div><div class='add'>+	0x97, 0x8c, 0x22, 0x4a, 0x80, 0x32, 0x00, 0x00, 0xce, 0x8c, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x36, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xfb, 0x12, 0xb0, 0x01, 0x00, 0x0f, 0x00, 0x00, 0xf3,</div><div class='add'>+	0x90, 0x88, 0x01, 0x00, 0x04, 0x00, 0x00, 0xf3, 0x0c, 0xf4, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x26, 0x40, 0x81, 0x32, 0x00, 0x00, 0xc8, 0x8c, 0x22, 0x06,</div><div class='add'>+	0x90, 0x6c, 0x00, 0x00, 0x04, 0x00, 0xaa, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x5c, 0x00, 0x3d, 0x43, 0x13, 0xe0, 0x01, 0x00, 0xa8, 0x00, 0x2d, 0xf0,</div><div class='add'>+	0x94, 0xb0, 0x01, 0x00, 0x04, 0x00, 0x22, 0x40, 0x95, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x37, 0x00, 0x2f, 0xf0, 0x24, 0xb0, 0x01, 0x00, 0x36, 0x00, 0x2a, 0x50,</div><div class='add'>+	0xe7, 0xd1, 0x01, 0x00, 0x00, 0x00, 0x63, 0x41, 0x13, 0xc0, 0x01, 0x00,</div><div class='add'>+	0xd5, 0x8e, 0xa0, 0x43, 0x13, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0xe7, 0xb1, 0x01, 0x00, 0x89, 0x93, 0x00, 0x10, 0x86, 0x30, 0x01, 0x00,</div><div class='add'>+	0x23, 0x83, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0xd7, 0x8e, 0x42, 0x05,</div><div class='add'>+	0x48, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x93, 0x93, 0x01, 0x00,</div><div class='add'>+	0xc8, 0x8c, 0x1a, 0x5d, 0x69, 0x93, 0x00, 0x00, 0x04, 0x00, 0xa2, 0x05,</div><div class='add'>+	0x48, 0x6d, 0x00, 0x00, 0x36, 0x00, 0x2d, 0x10, 0x86, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x5c, 0x00, 0x3d, 0x43, 0xe7, 0xe1, 0x01, 0x00, 0xa8, 0x00, 0x2d, 0xf0,</div><div class='add'>+	0x94, 0xb0, 0x01, 0x00, 0x04, 0x00, 0x22, 0x4a, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x35, 0x00, 0x2f, 0xf0, 0x24, 0xb0, 0x01, 0x00, 0x01, 0x00, 0x6b, 0xfb,</div><div class='add'>+	0x84, 0xc8, 0x01, 0x00, 0xe4, 0x8e, 0xa0, 0x43, 0x85, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x35, 0x00, 0x20, 0x40, 0xe7, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x01, 0x00, 0x63, 0xf3, 0x12, 0xc8, 0x01, 0x00,</div><div class='add'>+	0xe7, 0x8e, 0xa0, 0x43, 0x13, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0xe7, 0xb1, 0x01, 0x00, 0x40, 0x80, 0x00, 0x03, 0x44, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x8c, 0x93, 0x00, 0x4a, 0xf0, 0x31, 0x01, 0x00, 0x23, 0x83, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0xea, 0x8e, 0x42, 0x05, 0x48, 0x31, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x44, 0x93, 0x93, 0x01, 0x00, 0x00, 0x00, 0x1a, 0x5d,</div><div class='add'>+	0x69, 0x93, 0x01, 0x00, 0x37, 0x00, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x22, 0xf3, 0x9e, 0x06, 0x00, 0x00, 0x11, 0x00, 0x63, 0xf3,</div><div class='add'>+	0x82, 0xcc, 0x01, 0x00, 0x04, 0x00, 0x1f, 0x41, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0xbf, 0x8d, 0x22, 0x41, 0x9e, 0x06, 0x00, 0x00, 0x35, 0x00, 0x00, 0x40,</div><div class='add'>+	0x43, 0x99, 0x01, 0x00, 0x58, 0x00, 0x3d, 0x43, 0xe7, 0xe1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf8, 0x36, 0xb0, 0x01, 0x00, 0xcd, 0x8d, 0x00, 0xf0,</div><div class='add'>+	0x00, 0xb0, 0x00, 0x00, 0x5e, 0x01, 0x2d, 0x05, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xf7, 0x8e, 0x65, 0xf2, 0x12, 0x30, 0x00, 0x00, 0x00, 0x99, 0x3f, 0x42,</div><div class='add'>+	0x13, 0xf0, 0x01, 0x00, 0xfc, 0x8e, 0x22, 0x47, 0xe7, 0x7d, 0x00, 0x00,</div><div class='add'>+	0x27, 0x83, 0x75, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0xf6, 0x8e, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x47, 0xe7, 0x91, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x75, 0x42, 0x19, 0x90, 0x01, 0x00, 0x75, 0x00, 0x00, 0x40,</div><div class='add'>+	0x61, 0x99, 0x01, 0x00, 0xfe, 0x8e, 0xa8, 0xb1, 0x0c, 0x30, 0x00, 0x00,</div><div class='add'>+	0xa3, 0x96, 0x00, 0x10, 0x94, 0x30, 0x01, 0x00, 0x23, 0x83, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x5e, 0x01, 0x2e, 0x05, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xc0, 0xa8, 0x3d, 0x46, 0x0d, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x97, 0xb0, 0x01, 0x00, 0x08, 0x8f, 0x22, 0x40, 0xe1, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x02, 0x41, 0x97, 0x40, 0x00, 0x00, 0x05, 0x8f, 0x00, 0x50,</div><div class='add'>+	0x43, 0xc1, 0x00, 0x00, 0x14, 0x8f, 0x22, 0x4b, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x62, 0x4b, 0x12, 0x94, 0x01, 0x00, 0x09, 0x00, 0x00, 0x07,</div><div class='add'>+	0x96, 0xe4, 0x01, 0x00, 0x00, 0x00, 0x00, 0xa7, 0x97, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x30, 0x00, 0x00, 0x10, 0x94, 0xc8, 0x01, 0x00, 0x00, 0x80, 0x00, 0x4a,</div><div class='add'>+	0x44, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x42, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x5e, 0x01, 0x00, 0x4b, 0xf0, 0xc9, 0x01, 0x00, 0x5e, 0x01, 0x00, 0x05,</div><div class='add'>+	0xe0, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x20, 0x00, 0x00, 0x4a, 0x62, 0xdd, 0x01, 0x00, 0x12, 0x8f, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x80, 0x00, 0x10, 0x44, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x50, 0xf1, 0xb1, 0x01, 0x00, 0x04, 0x00, 0x00, 0x09,</div><div class='add'>+	0x96, 0xe4, 0x01, 0x00, 0x00, 0x00, 0x68, 0xa8, 0x97, 0xc0, 0x01, 0x00,</div><div class='add'>+	0xd4, 0x00, 0x00, 0x05, 0xe0, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x10, 0x62, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x1a, 0x8f, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0x23, 0x83, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x00, 0x99, 0x3f, 0x42, 0x13, 0xf0, 0x01, 0x00,</div><div class='add'>+	0x1e, 0x8f, 0x65, 0x40, 0x81, 0x32, 0x00, 0x00, 0x3f, 0x00, 0x00, 0xf3,</div><div class='add'>+	0x96, 0x88, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0xe7, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x75, 0x55, 0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x06,</div><div class='add'>+	0x62, 0xb1, 0x01, 0x00, 0x22, 0x8f, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x27, 0x8f, 0x22, 0x4b, 0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4b,</div><div class='add'>+	0x62, 0xb1, 0x01, 0x00, 0x25, 0x8f, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x97, 0x13, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x96,</div><div class='add'>+	0x97, 0xb0, 0x01, 0x00, 0x2d, 0x8f, 0x20, 0x09, 0x96, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x2d, 0x8f, 0x1f, 0x09, 0x96, 0x24, 0x00, 0x00, 0x27, 0x83, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x28, 0x8f, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x09, 0x97, 0x00, 0x57, 0x81, 0x30, 0x01, 0x00, 0xc6, 0x8b, 0x00, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x00, 0x00, 0x04, 0x00, 0x22, 0x42, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x2e, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00, 0x34, 0x8f, 0x22, 0xf3,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x09, 0x97, 0x00, 0x42, 0x81, 0x30, 0x01, 0x00,</div><div class='add'>+	0xed, 0x87, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x80, 0x97, 0x00, 0x52,</div><div class='add'>+	0x81, 0x30, 0x01, 0x00, 0xc6, 0x8b, 0x00, 0x42, 0x19, 0x80, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x22, 0x42, 0x19, 0x7c, 0x00, 0x00, 0x09, 0x97, 0x00, 0x3a,</div><div class='add'>+	0x81, 0x30, 0x01, 0x00, 0x80, 0x97, 0x00, 0x52, 0x81, 0x30, 0x01, 0x00,</div><div class='add'>+	0xc6, 0x8b, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x05, 0xb0, 0x01, 0x00, 0xff, 0x95, 0x00, 0x40, 0x95, 0x30, 0x01, 0x00,</div><div class='add'>+	0xc6, 0x8b, 0x22, 0x40, 0x95, 0x6c, 0x00, 0x00, 0x24, 0x04, 0x00, 0x40,</div><div class='add'>+	0x89, 0x98, 0x01, 0x00, 0x02, 0x99, 0x00, 0x00, 0x8a, 0x30, 0x01, 0x00,</div><div class='add'>+	0x42, 0x8f, 0xa2, 0x40, 0x1f, 0x7c, 0x00, 0x00, 0xc3, 0x94, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0xed, 0x87, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x80, 0x00, 0x03, 0x42, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf2,</div><div class='add'>+	0x02, 0xb0, 0x01, 0x00, 0x9f, 0x95, 0x00, 0x52, 0x95, 0x30, 0x01, 0x00,</div><div class='add'>+	0xa6, 0x95, 0x00, 0x4b, 0x02, 0xb0, 0x00, 0x00, 0xed, 0x87, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x25, 0x98, 0x00, 0x40, 0x95, 0x30, 0x01, 0x00,</div><div class='add'>+	0x4e, 0x8f, 0xa2, 0x08, 0x80, 0x32, 0x00, 0x00, 0x4e, 0x8f, 0xa2, 0x16,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0xed, 0x87, 0x22, 0x42, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4b, 0x19, 0x90, 0x01, 0x00, 0x09, 0x97, 0x00, 0x3a,</div><div class='add'>+	0x81, 0x30, 0x01, 0x00, 0xed, 0x87, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x00, 0x23, 0x00, 0xa6, 0x16, 0xb0, 0x01, 0x00, 0x51, 0x8f, 0x83, 0x1e,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x00, 0x08, 0x00, 0x0b, 0x16, 0xdc, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x2a, 0xc0, 0x01, 0x00, 0x58, 0x97, 0x00, 0x08,</div><div class='add'>+	0x80, 0x30, 0x01, 0x00, 0x55, 0x8f, 0x00, 0x5e, 0x17, 0x90, 0x00, 0x00,</div><div class='add'>+	0x79, 0x97, 0x00, 0x43, 0x61, 0x31, 0x01, 0x00, 0x98, 0x93, 0x00, 0x40,</div><div class='add'>+	0x8d, 0x30, 0x01, 0x00, 0x60, 0x97, 0x00, 0x07, 0x16, 0x14, 0x01, 0x00,</div><div class='add'>+	0x00, 0x80, 0x00, 0x10, 0x42, 0xc9, 0x01, 0x00, 0x5d, 0x8f, 0x22, 0x40,</div><div class='add'>+	0xe3, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00, 0x5a, 0x8f, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x23, 0x83, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xfa, 0x96, 0x00, 0x5e, 0x05, 0x10, 0x01, 0x00, 0xc3, 0x94, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x61, 0x8f, 0x22, 0x09, 0x80, 0x30, 0x00, 0x00,</div><div class='add'>+	0x80, 0x97, 0x00, 0x40, 0x13, 0x30, 0x01, 0x00, 0xcd, 0x8b, 0x00, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x00, 0x00, 0x36, 0x96, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0xc6, 0x8b, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0xa2, 0x4a,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4a, 0x1f, 0x90, 0x01, 0x00,</div><div class='add'>+	0x69, 0x8f, 0x22, 0x43, 0x3d, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0x19, 0x90, 0x01, 0x00, 0x00, 0x00, 0x00, 0x43, 0x3d, 0x80, 0x01, 0x00,</div><div class='add'>+	0x6a, 0x8f, 0x00, 0x42, 0x19, 0x90, 0x00, 0x00, 0x04, 0x00, 0xa2, 0x4f,</div><div class='add'>+	0x2b, 0x7c, 0x00, 0x00, 0x04, 0x00, 0xa2, 0x45, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x14, 0x00, 0x2d, 0x45, 0x1f, 0x90, 0x01, 0x00, 0x04, 0x00, 0xa2, 0xf0,</div><div class='add'>+	0x14, 0x6c, 0x00, 0x00, 0x04, 0x00, 0xa0, 0x01, 0x14, 0x6c, 0x00, 0x00,</div><div class='add'>+	0xdc, 0x8f, 0x83, 0x1e, 0x80, 0x32, 0x00, 0x00, 0xdc, 0x8f, 0x00, 0x44,</div><div class='add'>+	0x19, 0x90, 0x00, 0x00, 0x2f, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa2, 0x47, 0xe7, 0x7d, 0x00, 0x00, 0xae, 0x94, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x84, 0x8f, 0xa2, 0x08, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x84, 0x8f, 0xa2, 0x16, 0x80, 0x32, 0x00, 0x00, 0x80, 0x8f, 0xa2, 0x42,</div><div class='add'>+	0x19, 0x7c, 0x00, 0x00, 0x00, 0x82, 0x00, 0x02, 0x04, 0xdc, 0x01, 0x00,</div><div class='add'>+	0xa0, 0x98, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00, 0x30, 0x05, 0x00, 0x41,</div><div class='add'>+	0x89, 0x30, 0x01, 0x00, 0x7d, 0x8f, 0xa2, 0x41, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0xc3, 0x94, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0xed, 0x87, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x9f, 0x95, 0x00, 0x15, 0x94, 0x30, 0x01, 0x00,</div><div class='add'>+	0xa6, 0x95, 0x00, 0x4b, 0x02, 0xb0, 0x00, 0x00, 0xed, 0x87, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x36, 0x96, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4b, 0x19, 0x90, 0x01, 0x00, 0x09, 0x97, 0x00, 0x3a,</div><div class='add'>+	0x81, 0x30, 0x01, 0x00, 0xed, 0x87, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x87, 0x8f, 0x22, 0x42, 0x19, 0x7c, 0x00, 0x00, 0x36, 0x96, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x88, 0x8f, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xff, 0x95, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0xc0, 0x8f, 0x22, 0x41,</div><div class='add'>+	0x19, 0x7c, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x15, 0x98, 0xc8, 0x01, 0x00,</div><div class='add'>+	0xc0, 0x8f, 0xa0, 0x0b, 0x99, 0x6c, 0x00, 0x00, 0x04, 0x00, 0x22, 0x44,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00, 0x7e, 0x89, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa6, 0x40, 0x81, 0x32, 0x00, 0x00, 0x30, 0x00, 0x00, 0x10,</div><div class='add'>+	0x80, 0xc8, 0x01, 0x00, 0x00, 0x80, 0x00, 0x40, 0x44, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x50, 0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x03,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x42, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x62, 0xb1, 0x01, 0x00, 0x93, 0x8f, 0xa8, 0x00,</div><div class='add'>+	0xe0, 0x31, 0x00, 0x00, 0x23, 0x83, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x05, 0x48, 0xb1, 0x01, 0x00, 0xc0, 0x00, 0x00, 0x15,</div><div class='add'>+	0x98, 0xc8, 0x01, 0x00, 0x30, 0x00, 0x2e, 0x0b, 0x99, 0xd0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x6a, 0x50, 0x99, 0xc0, 0x01, 0x00, 0x04, 0x00, 0x20, 0x0b,</div><div class='add'>+	0x99, 0x6c, 0x00, 0x00, 0xc0, 0x00, 0x62, 0x01, 0x80, 0xcc, 0x01, 0x00,</div><div class='add'>+	0x0c, 0x80, 0x00, 0x03, 0x42, 0xc9, 0x01, 0x00, 0x2d, 0x00, 0x2d, 0xf0,</div><div class='add'>+	0x22, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4c, 0x80, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x5c, 0x23, 0x80, 0x01, 0x00, 0xd4, 0x00, 0x3f, 0x41,</div><div class='add'>+	0xe7, 0xe1, 0x01, 0x00, 0x04, 0x00, 0x22, 0x42, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x0b, 0x00, 0x00, 0xf2, 0x98, 0xe4, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5a,</div><div class='add'>+	0x99, 0x80, 0x01, 0x00, 0x04, 0x00, 0xa2, 0x00, 0x98, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x20, 0x04, 0x00, 0x40, 0x89, 0x98, 0x01, 0x00, 0x02, 0x99, 0x00, 0x11,</div><div class='add'>+	0x8a, 0x30, 0x01, 0x00, 0x0b, 0x00, 0x00, 0x11, 0xe4, 0xf5, 0x01, 0x00,</div><div class='add'>+	0x2f, 0x00, 0x20, 0x47, 0xe7, 0xb5, 0x01, 0x00, 0xab, 0x8f, 0x23, 0x0b,</div><div class='add'>+	0x81, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4f, 0xe5, 0x91, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x08, 0x80, 0xb0, 0x01, 0x00, 0xc1, 0x00, 0x00, 0x01,</div><div class='add'>+	0x80, 0xce, 0x01, 0x00, 0x04, 0x00, 0xa4, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x0b, 0x03, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x15,</div><div class='add'>+	0x02, 0xd0, 0x01, 0x00, 0x58, 0x97, 0x00, 0x00, 0x2a, 0x40, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x43, 0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0xb2, 0x8f, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x23, 0x83, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0xc3, 0x94, 0x00, 0x05,</div><div class='add'>+	0x48, 0x31, 0x01, 0x00, 0xc0, 0x00, 0x00, 0x01, 0x80, 0xce, 0x01, 0x00,</div><div class='add'>+	0xbe, 0x8f, 0x26, 0x11, 0x00, 0x30, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,</div><div class='add'>+	0x2a, 0xc8, 0x01, 0x00, 0x00, 0x00, 0x00, 0x08, 0x80, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x01, 0x80, 0xc0, 0x01, 0x00, 0xc0, 0x00, 0x00, 0x40,</div><div class='add'>+	0x99, 0x98, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x98, 0xd0, 0x01, 0x00,</div><div class='add'>+	0x58, 0x97, 0x00, 0x4c, 0x02, 0x30, 0x01, 0x00, 0xc0, 0x00, 0x00, 0x40,</div><div class='add'>+	0x03, 0x98, 0x01, 0x00, 0xc8, 0x8f, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x30, 0x00, 0x2f, 0x08, 0x80, 0xb0, 0x01, 0x00, 0xc0, 0x00, 0x00, 0x15,</div><div class='add'>+	0xf4, 0xc9, 0x01, 0x00, 0xc0, 0x00, 0x00, 0x01, 0xe4, 0xcd, 0x01, 0x00,</div><div class='add'>+	0xc1, 0x00, 0x00, 0x01, 0x80, 0xce, 0x01, 0x00, 0x04, 0x00, 0xa4, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x04, 0x00, 0x20, 0x0b, 0xe5, 0x6d, 0x00, 0x00,</div><div class='add'>+	0xc0, 0x00, 0x00, 0x40, 0x03, 0x98, 0x01, 0x00, 0x58, 0x97, 0x00, 0x00,</div><div class='add'>+	0x2a, 0x40, 0x01, 0x00, 0xcd, 0x8f, 0x22, 0x44, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0xac, 0x00, 0x2f, 0x40, 0x13, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01,</div><div class='add'>+	0xe0, 0xc1, 0x01, 0x00, 0xb0, 0x00, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00,</div><div class='add'>+	0xce, 0x8f, 0x00, 0x01, 0xe0, 0xd1, 0x00, 0x00, 0x98, 0x93, 0x00, 0x40,</div><div class='add'>+	0x8d, 0x30, 0x01, 0x00, 0x80, 0x63, 0x00, 0xa6, 0x16, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x60, 0x97, 0x00, 0x07, 0x16, 0x14, 0x01, 0x00, 0x00, 0x80, 0x00, 0x10,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0xd6, 0x8f, 0x22, 0x40, 0xe3, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x43, 0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0xd3, 0x8f, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x23, 0x83, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0xfa, 0x96, 0x00, 0x5e,</div><div class='add'>+	0x05, 0x10, 0x01, 0x00, 0xd9, 0x8f, 0x22, 0x09, 0x80, 0x30, 0x00, 0x00,</div><div class='add'>+	0x80, 0x97, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0xc6, 0x8b, 0x00, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x00, 0x00, 0x04, 0x00, 0xa2, 0x4a, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0xdc, 0x8f, 0x00, 0x4a, 0x1f, 0x90, 0x00, 0x00, 0x04, 0x00, 0xa2, 0x4f,</div><div class='add'>+	0x2b, 0x7c, 0x00, 0x00, 0x04, 0x00, 0xa2, 0x5c, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa2, 0x44, 0x1f, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+	0x10, 0xb0, 0x01, 0x00, 0x24, 0x00, 0x2d, 0x15, 0x10, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x28, 0x00, 0x2d, 0xf0, 0x16, 0xb0, 0x01, 0x00, 0x22, 0x00, 0x2d, 0xf0,</div><div class='add'>+	0x26, 0xb0, 0x01, 0x00, 0x14, 0x00, 0x2f, 0xf2, 0x0c, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x01, 0xe0, 0xd1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x10,</div><div class='add'>+	0x32, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x0b, 0x1b, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x1f, 0x15, 0x1a, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x23, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x2a, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xb8, 0x96, 0x00, 0x40, 0x35, 0xb0, 0x00, 0x00, 0x2f, 0x00, 0x20, 0x40,</div><div class='add'>+	0xe7, 0xb1, 0x01, 0x00, 0x26, 0x90, 0xa2, 0x45, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa2, 0x05, 0x48, 0x6d, 0x00, 0x00, 0x24, 0x00, 0x20, 0x0b,</div><div class='add'>+	0xe0, 0xb1, 0x01, 0x00, 0x28, 0x00, 0x20, 0x13, 0xe0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x22, 0x00, 0x20, 0x06, 0xe4, 0xb1, 0x01, 0x00, 0xfa, 0x8f, 0x22, 0x5c,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5c, 0x1f, 0x80, 0x01, 0x00,</div><div class='add'>+	0x30, 0x80, 0x00, 0x10, 0x42, 0xc9, 0x01, 0x00, 0xfa, 0x8f, 0x22, 0x40,</div><div class='add'>+	0xe3, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x47, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00, 0xf6, 0x8f, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x23, 0x83, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x05, 0x48, 0xb1, 0x01, 0x00, 0x14, 0x00, 0x00, 0x40,</div><div class='add'>+	0x43, 0x99, 0x01, 0x00, 0x04, 0x00, 0xa2, 0xf0, 0x14, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x80, 0x00, 0x19, 0x42, 0xc9, 0x01, 0x00, 0x1f, 0x90, 0x22, 0x40,</div><div class='add'>+	0xe3, 0x6d, 0x00, 0x00, 0x0d, 0x90, 0x22, 0x42, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x6d, 0x96, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x54, 0x94, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x1a, 0x90, 0x22, 0x4b, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x43, 0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x03, 0x90, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x23, 0x83, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x09, 0x90, 0x22, 0x41,</div><div class='add'>+	0x19, 0x7c, 0x00, 0x00, 0xe1, 0x94, 0x00, 0x40, 0x11, 0x30, 0x01, 0x00,</div><div class='add'>+	0x0a, 0x90, 0x00, 0x05, 0x48, 0xb1, 0x00, 0x00, 0xc3, 0x94, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x0c, 0x90, 0x22, 0x09, 0x80, 0x30, 0x00, 0x00,</div><div class='add'>+	0x80, 0x97, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x2f, 0x83, 0x00, 0x40,</div><div class='add'>+	0x05, 0xb0, 0x00, 0x00, 0x6d, 0x96, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x49, 0x94, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0x43,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0x10, 0x90, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0x23, 0x83, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x16, 0x90, 0x22, 0x41, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0xe1, 0x94, 0x00, 0x40, 0x11, 0x30, 0x01, 0x00, 0x17, 0x90, 0x00, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x00, 0x00, 0xc3, 0x94, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x19, 0x90, 0x22, 0x09, 0x80, 0x30, 0x00, 0x00, 0x80, 0x97, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x2f, 0x83, 0x00, 0x40, 0x05, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x43, 0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x1b, 0x90, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x23, 0x83, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x22, 0x90, 0x22, 0x41, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0xe1, 0x94, 0x00, 0x40, 0x11, 0x30, 0x01, 0x00, 0x23, 0x90, 0x00, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x00, 0x00, 0xc3, 0x94, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x25, 0x90, 0x22, 0x09, 0x80, 0x30, 0x00, 0x00, 0x80, 0x97, 0x00, 0x40,</div><div class='add'>+	0x13, 0x30, 0x01, 0x00, 0xcd, 0x8b, 0x00, 0x40, 0x05, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x14, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00, 0x04, 0x00, 0xa2, 0xf0,</div><div class='add'>+	0x14, 0x6c, 0x00, 0x00, 0x00, 0x80, 0x00, 0x19, 0x42, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x2f, 0x90, 0x22, 0x40, 0xe3, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0x2b, 0x90, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0x23, 0x83, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x05, 0xb0, 0x01, 0x00, 0x33, 0x90, 0x22, 0x41,</div><div class='add'>+	0x19, 0x7c, 0x00, 0x00, 0xe1, 0x94, 0x00, 0x40, 0x11, 0x30, 0x01, 0x00,</div><div class='add'>+	0x34, 0x90, 0x00, 0x05, 0x48, 0xb1, 0x00, 0x00, 0xc3, 0x94, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x08, 0x00, 0x2d, 0x0a, 0x84, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf0, 0x82, 0xb0, 0x01, 0x00, 0x04, 0x00, 0x26, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x14, 0x00, 0x20, 0x40, 0xe1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x3a, 0x90, 0x03, 0x1e, 0x80, 0x32, 0x00, 0x00, 0x3b, 0x90, 0x00, 0x41,</div><div class='add'>+	0x87, 0xb0, 0x00, 0x00, 0x21, 0x00, 0x00, 0x40, 0x87, 0x98, 0x01, 0x00,</div><div class='add'>+	0x26, 0x96, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x04, 0x00, 0xa2, 0x5c,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5c, 0x1f, 0x90, 0x01, 0x00,</div><div class='add'>+	0x40, 0x90, 0x22, 0x09, 0x80, 0x30, 0x00, 0x00, 0x80, 0x97, 0x00, 0x40,</div><div class='add'>+	0x13, 0x30, 0x01, 0x00, 0x43, 0x90, 0x22, 0x44, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x80, 0x97, 0x00, 0x4f, 0x81, 0x30, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0x19, 0x80, 0x01, 0x00, 0xc6, 0x8b, 0xa2, 0x4a, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0xcd, 0x8b, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0xa2, 0x05,</div><div class='add'>+	0x48, 0x6d, 0x00, 0x00, 0xba, 0x00, 0x20, 0x40, 0xe5, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x4b, 0x90, 0x9c, 0x17, 0x80, 0x32, 0x00, 0x00, 0x04, 0x00, 0x22, 0x4a,</div><div class='add'>+	0x19, 0x7c, 0x00, 0x00, 0xcc, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00,</div><div class='add'>+	0x2f, 0x98, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0xce, 0x97, 0x00, 0x40,</div><div class='add'>+	0x13, 0x30, 0x01, 0x00, 0xc0, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00,</div><div class='add'>+	0xc4, 0x00, 0x2d, 0xf0, 0x82, 0xb0, 0x01, 0x00, 0x05, 0x98, 0x00, 0xf0,</div><div class='add'>+	0x84, 0x30, 0x01, 0x00, 0xc3, 0x94, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0xcd, 0x8b, 0x22, 0x09, 0x80, 0x30, 0x00, 0x00, 0x80, 0x97, 0x00, 0x40,</div><div class='add'>+	0x13, 0x30, 0x01, 0x00, 0xcd, 0x8b, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x2e, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00, 0x57, 0x90, 0x22, 0x40,</div><div class='add'>+	0xe7, 0x6d, 0x00, 0x00, 0x32, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00,</div><div class='add'>+	0x62, 0x90, 0xa2, 0x40, 0xe5, 0x6d, 0x00, 0x00, 0xec, 0x95, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x24, 0x00, 0x20, 0x0b, 0xe0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x28, 0x00, 0x20, 0x13, 0xe0, 0xb1, 0x01, 0x00, 0x22, 0x00, 0x20, 0x06,</div><div class='add'>+	0xe4, 0xb1, 0x01, 0x00, 0x04, 0x00, 0x22, 0x42, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x14, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00, 0x04, 0x00, 0xa2, 0xf0,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x14, 0x00, 0x20, 0x0a, 0xe0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xcd, 0x8b, 0x22, 0x09, 0x80, 0x30, 0x00, 0x00, 0x80, 0x97, 0x00, 0x40,</div><div class='add'>+	0x13, 0x30, 0x01, 0x00, 0xcd, 0x8b, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xec, 0x95, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x97, 0x95, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x70, 0x90, 0x22, 0x41, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x0b, 0x99, 0xb0, 0x01, 0x00, 0x04, 0x00, 0x1f, 0x15,</div><div class='add'>+	0x98, 0x50, 0x00, 0x00, 0x70, 0x90, 0x20, 0x01, 0x98, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x70, 0x00, 0x00, 0x03, 0x48, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x2e, 0x46,</div><div class='add'>+	0x1f, 0x90, 0x01, 0x00, 0x00, 0x00, 0x00, 0x50, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x03, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x42,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0xa0, 0x00, 0x00, 0xa4, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0x6d, 0x90, 0xa8, 0x00, 0xe0, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0xac, 0x00, 0x2f, 0x00, 0x10, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x01, 0xe0, 0xc1, 0x01, 0x00, 0x14, 0x00, 0x2f, 0x15,</div><div class='add'>+	0x10, 0xc0, 0x01, 0x00, 0x04, 0x00, 0xa2, 0xf0, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x0a, 0x80, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x60, 0x01,</div><div class='add'>+	0x80, 0xd0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x47, 0x19, 0x90, 0x01, 0x00,</div><div class='add'>+	0xe6, 0x8f, 0x22, 0x09, 0x80, 0x32, 0x00, 0x00, 0x80, 0x97, 0x00, 0x09,</div><div class='add'>+	0x80, 0x30, 0x01, 0x00, 0xe6, 0x8f, 0x00, 0x40, 0x13, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x80, 0x00, 0x03, 0x42, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0,</div><div class='add'>+	0x82, 0xb0, 0x01, 0x00, 0x13, 0x00, 0x00, 0x40, 0x87, 0x98, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4c, 0x43, 0xc1, 0x01, 0x00, 0x26, 0x96, 0x00, 0xf0,</div><div class='add'>+	0x84, 0x30, 0x01, 0x00, 0x04, 0x00, 0xa2, 0x5c, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0xc6, 0x8b, 0x00, 0x5c, 0x1f, 0x90, 0x00, 0x00, 0x2c, 0x00, 0x20, 0x40,</div><div class='add'>+	0xe7, 0xb1, 0x01, 0x00, 0x2d, 0x00, 0x20, 0x40, 0xe7, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x2e, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00, 0x04, 0x00, 0xa2, 0xf3,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x04, 0x00, 0x22, 0x42, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0xc6, 0x8b, 0x00, 0x42, 0x19, 0x80, 0x00, 0x00, 0x16, 0x96, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x55, 0x97, 0x00, 0x48, 0x95, 0x30, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x45, 0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x8a, 0x90, 0xa8, 0x40, 0x13, 0x30, 0x00, 0x00,</div><div class='add'>+	0x23, 0x83, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x90, 0x90, 0x00, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x00, 0x00, 0x8f, 0x90, 0x00, 0x40, 0x13, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x12, 0xb0, 0x01, 0x00, 0x08, 0x00, 0x00, 0x40,</div><div class='add'>+	0x43, 0x99, 0x01, 0x00, 0x14, 0x00, 0x2d, 0xf0, 0x82, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x26, 0x40, 0x81, 0x32, 0x00, 0x00, 0x04, 0x00, 0x22, 0xf0,</div><div class='add'>+	0x84, 0x30, 0x00, 0x00, 0x13, 0x00, 0x00, 0x40, 0x87, 0x98, 0x01, 0x00,</div><div class='add'>+	0x26, 0x96, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x04, 0x00, 0xa2, 0x5c,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5c, 0x1f, 0x90, 0x01, 0x00,</div><div class='add'>+	0xad, 0x90, 0x00, 0x09, 0x00, 0xb0, 0x00, 0x00, 0x04, 0x00, 0xa2, 0x05,</div><div class='add'>+	0x48, 0x6d, 0x00, 0x00, 0xc6, 0x8b, 0x87, 0x42, 0x19, 0x10, 0x00, 0x00,</div><div class='add'>+	0x8b, 0x00, 0x2f, 0x47, 0x19, 0x80, 0x01, 0x00, 0xc6, 0x8b, 0x00, 0x40,</div><div class='add'>+	0xe7, 0x91, 0x00, 0x00, 0x04, 0x00, 0xa2, 0x40, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x2f, 0x00, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00, 0xab, 0x90, 0x22, 0x47,</div><div class='add'>+	0xe7, 0x7d, 0x00, 0x00, 0x04, 0x00, 0x22, 0x41, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x17, 0x94, 0x00, 0x40, 0xe7, 0x31, 0x01, 0x00, 0xab, 0x90, 0x22, 0x00,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0xa6, 0x90, 0xa2, 0x40, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0xc3, 0x94, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0xab, 0x90, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x30, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00,</div><div class='add'>+	0x32, 0x00, 0x2d, 0xf2, 0x94, 0xb0, 0x01, 0x00, 0x9f, 0x95, 0x00, 0xf2,</div><div class='add'>+	0x02, 0x30, 0x01, 0x00, 0xa6, 0x95, 0x00, 0x4b, 0x02, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x05, 0x48, 0xb1, 0x01, 0x00, 0xac, 0x90, 0x00, 0x40,</div><div class='add'>+	0x01, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x05, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xb2, 0x90, 0x22, 0x00, 0x80, 0x32, 0x00, 0x00, 0xb1, 0x90, 0xa2, 0x42,</div><div class='add'>+	0x19, 0x7c, 0x00, 0x00, 0xff, 0x95, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0xb2, 0x90, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x36, 0x96, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x51, 0x91, 0x22, 0x5c, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x5c, 0x1f, 0x80, 0x01, 0x00, 0x00, 0x80, 0x00, 0x10,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0xba, 0x90, 0x22, 0x40, 0xe3, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x45, 0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0xb7, 0x90, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x23, 0x83, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x51, 0x91, 0x00, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x00, 0x00, 0xae, 0x94, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0xc1, 0x90, 0xa2, 0x08, 0x80, 0x32, 0x00, 0x00, 0xc1, 0x90, 0xa2, 0x16,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x09, 0x97, 0x00, 0x4d, 0x81, 0x30, 0x01, 0x00,</div><div class='add'>+	0x00, 0x82, 0x00, 0x02, 0x04, 0xdc, 0x01, 0x00, 0xed, 0x87, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x74, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf8, 0x82, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0,</div><div class='add'>+	0x84, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41, 0x96, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xd2, 0x90, 0x22, 0x42, 0x96, 0x14, 0x00, 0x00, 0x00, 0x80, 0x00, 0x10,</div><div class='add'>+	0x44, 0xc9, 0x01, 0x00, 0x64, 0x00, 0x68, 0x40, 0x97, 0x98, 0x01, 0x00,</div><div class='add'>+	0x64, 0x00, 0x00, 0x4b, 0x80, 0xce, 0x01, 0x00, 0x04, 0x00, 0xa6, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x42, 0xf0, 0xb1, 0x01, 0x00, 0x70, 0x00, 0x00, 0x05,</div><div class='add'>+	0xe0, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x45, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x20, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00, 0xce, 0x90, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x04, 0x00, 0xa2, 0x5c, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x5c, 0x1f, 0x90, 0x01, 0x00, 0x00, 0x00, 0x00, 0x45,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0xd3, 0x90, 0xa8, 0x5c, 0x1f, 0x00, 0x00, 0x00, 0x23, 0x83, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x5e, 0x01, 0x2d, 0x05, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xd7, 0x90, 0x65, 0xf2, 0x12, 0x30, 0x00, 0x00, 0x00, 0x99, 0x3f, 0x42,</div><div class='add'>+	0x13, 0xf0, 0x01, 0x00, 0xdc, 0x90, 0x22, 0x47, 0xe7, 0x7d, 0x00, 0x00,</div><div class='add'>+	0x27, 0x83, 0x75, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0xd6, 0x90, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x47, 0xe7, 0x91, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x75, 0x09, 0x96, 0xe4, 0x01, 0x00, 0x00, 0x80, 0x00, 0x10,</div><div class='add'>+	0x44, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x68, 0xa8, 0x97, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x03,</div><div class='add'>+	0xe0, 0xb1, 0x01, 0x00, 0x00, 0x80, 0x00, 0x03, 0x44, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x44, 0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xb1, 0x01, 0x00, 0xe4, 0x90, 0xa8, 0x40, 0xe1, 0x31, 0x00, 0x00,</div><div class='add'>+	0x23, 0x83, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x00, 0x99, 0x3f, 0x42,</div><div class='add'>+	0x13, 0xf0, 0x01, 0x00, 0xe8, 0x90, 0x65, 0x05, 0x48, 0x31, 0x00, 0x00,</div><div class='add'>+	0x3f, 0x00, 0x00, 0xf3, 0x96, 0x88, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0xe7, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x75, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0xf0, 0x90, 0x22, 0x4b, 0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4b, 0x62, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xee, 0x90, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07,</div><div class='add'>+	0x16, 0xb0, 0x01, 0x00, 0x00, 0x62, 0x00, 0x0b, 0x16, 0xdc, 0x01, 0x00,</div><div class='add'>+	0x2f, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00, 0x04, 0x00, 0xa2, 0x47,</div><div class='add'>+	0xe7, 0x7d, 0x00, 0x00, 0x17, 0x94, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x0d, 0x91, 0x22, 0x00, 0x80, 0x32, 0x00, 0x00, 0x48, 0x96, 0x00, 0x5f,</div><div class='add'>+	0x01, 0x10, 0x01, 0x00, 0xf4, 0x90, 0x22, 0x40, 0x95, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x22, 0x41, 0x19, 0x7c, 0x00, 0x00, 0x04, 0x00, 0x22, 0x40,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x00, 0x80, 0x00, 0x10, 0x44, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x50, 0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x03,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x42, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x10, 0x62, 0xb1, 0x01, 0x00, 0xfe, 0x90, 0xa8, 0x00,</div><div class='add'>+	0xe0, 0x31, 0x00, 0x00, 0x23, 0x83, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x05, 0x48, 0xb1, 0x01, 0x00, 0x04, 0x80, 0x00, 0x03,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf2, 0x02, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x20, 0x31, 0x03, 0x6c, 0x00, 0x00, 0x9f, 0x95, 0x00, 0x52,</div><div class='add'>+	0x95, 0x30, 0x01, 0x00, 0xc3, 0x94, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0xf4, 0x90, 0x22, 0x41, 0x97, 0x50, 0x00, 0x00, 0x0c, 0x80, 0x00, 0x03,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x5c, 0x01, 0x80, 0x01, 0x00, 0xa6, 0x95, 0x00, 0x4b,</div><div class='add'>+	0x02, 0xb0, 0x00, 0x00, 0xf4, 0x90, 0x00, 0x05, 0x48, 0xb1, 0x00, 0x00,</div><div class='add'>+	0x60, 0x97, 0x00, 0x40, 0x03, 0x30, 0x01, 0x00, 0x17, 0x80, 0x00, 0x03,</div><div class='add'>+	0x44, 0xc9, 0x01, 0x00, 0x00, 0xf0, 0x00, 0x0c, 0x96, 0x88, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x63, 0x4c, 0x97, 0xf0, 0x01, 0x00, 0x04, 0x00, 0x20, 0x4d,</div><div class='add'>+	0x97, 0x6c, 0x00, 0x00, 0x04, 0x00, 0x22, 0x40, 0x97, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x10, 0x80, 0x00, 0x03, 0x44, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0xab,</div><div class='add'>+	0xe1, 0xb1, 0x01, 0x00, 0xfa, 0x96, 0x00, 0x5e, 0x05, 0x10, 0x01, 0x00,</div><div class='add'>+	0x03, 0x00, 0x00, 0x07, 0x1a, 0xf4, 0x01, 0x00, 0x07, 0x00, 0x00, 0x07,</div><div class='add'>+	0x16, 0x88, 0x01, 0x00, 0x00, 0xb5, 0x00, 0x0d, 0x46, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x19, 0x91, 0x30, 0x40, 0x81, 0x32, 0x00, 0x00, 0x04, 0x00, 0x22, 0x0b,</div><div class='add'>+	0xe6, 0x7d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0b, 0xe6, 0x81, 0x01, 0x00,</div><div class='add'>+	0x00, 0xb7, 0x00, 0x0d, 0x46, 0xc9, 0x01, 0x00, 0x04, 0x00, 0x22, 0x0b,</div><div class='add'>+	0xe6, 0x7d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0b, 0xe6, 0x81, 0x01, 0x00,</div><div class='add'>+	0x10, 0x00, 0x10, 0x0f, 0x94, 0xf4, 0x01, 0x00, 0x93, 0x04, 0x00, 0x5f,</div><div class='add'>+	0x95, 0x04, 0x01, 0x00, 0x70, 0x95, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x27, 0x91, 0x22, 0x50, 0xfd, 0x7f, 0x00, 0x00, 0x23, 0x91, 0x46, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x26, 0x91, 0xa2, 0x40, 0x31, 0x6f, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x1e, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x41,</div><div class='add'>+	0x31, 0xd3, 0x01, 0x00, 0x00, 0x00, 0x2e, 0x05, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0xe1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x0f, 0xb0, 0x01, 0x00, 0xa5, 0x94, 0x00, 0x41, 0x81, 0x30, 0x01, 0x00,</div><div class='add'>+	0xed, 0x87, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xae, 0x94, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x3a, 0x91, 0xa2, 0x08, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x3a, 0x91, 0xa2, 0x16, 0x80, 0x32, 0x00, 0x00, 0x00, 0x82, 0x00, 0x02,</div><div class='add'>+	0x04, 0xdc, 0x01, 0x00, 0x00, 0x00, 0x00, 0x45, 0x03, 0xf0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x01, 0x00, 0xc0, 0x01, 0x00, 0x32, 0x91, 0x37, 0x5c,</div><div class='add'>+	0x61, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1b, 0x62, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x37, 0x91, 0x28, 0x40, 0x81, 0x32, 0x00, 0x00, 0x04, 0x00, 0xa2, 0x5c,</div><div class='add'>+	0x77, 0x7d, 0x00, 0x00, 0x33, 0x91, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x62, 0xb1, 0x01, 0x00, 0x37, 0x91, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0xed, 0x87, 0x17, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x74, 0x00, 0x22, 0x40, 0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0xe1, 0xb1, 0x01, 0x00, 0x55, 0x97, 0x00, 0x4a, 0x95, 0x30, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa2, 0x5c, 0x1f, 0x7c, 0x00, 0x00, 0x16, 0x96, 0x00, 0x5c,</div><div class='add'>+	0x1f, 0x10, 0x01, 0x00, 0xc1, 0x90, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa2, 0x40, 0x1f, 0x7c, 0x00, 0x00, 0x2f, 0x00, 0x00, 0x40,</div><div class='add'>+	0x47, 0x99, 0x01, 0x00, 0x4e, 0x91, 0x22, 0x47, 0xe7, 0x7d, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x22, 0x41, 0x19, 0x7c, 0x00, 0x00, 0x17, 0x94, 0x00, 0x40,</div><div class='add'>+	0xe7, 0x31, 0x01, 0x00, 0x4e, 0x91, 0x22, 0x00, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x49, 0x91, 0xa2, 0x40, 0x1f, 0x7c, 0x00, 0x00, 0xc3, 0x94, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x4e, 0x91, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x30, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00, 0x32, 0x00, 0x2d, 0xf2,</div><div class='add'>+	0x94, 0xb0, 0x01, 0x00, 0x9f, 0x95, 0x00, 0xf2, 0x02, 0x30, 0x01, 0x00,</div><div class='add'>+	0xa6, 0x95, 0x00, 0x4b, 0x02, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x55, 0x97, 0x00, 0x48, 0x95, 0x30, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa2, 0x5c, 0x1f, 0x7c, 0x00, 0x00, 0x16, 0x96, 0x00, 0x5c,</div><div class='add'>+	0x1f, 0x10, 0x01, 0x00, 0x04, 0x00, 0xa2, 0x05, 0x48, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x55, 0x91, 0x87, 0x42, 0x19, 0x10, 0x00, 0x00, 0x8b, 0x00, 0x2f, 0x47,</div><div class='add'>+	0x19, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0xe7, 0x91, 0x01, 0x00,</div><div class='add'>+	0x80, 0x97, 0x00, 0x42, 0x81, 0x30, 0x01, 0x00, 0xc6, 0x8b, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x16, 0x96, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa2, 0x5c, 0x1f, 0x7c, 0x00, 0x00, 0xc6, 0x8b, 0x00, 0x5c,</div><div class='add'>+	0x1f, 0x90, 0x00, 0x00, 0xb0, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa2, 0xf0, 0x80, 0x32, 0x00, 0x00, 0xba, 0x00, 0x20, 0x40,</div><div class='add'>+	0xe5, 0xb1, 0x01, 0x00, 0xce, 0x97, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0xc0, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00, 0xc4, 0x00, 0x2d, 0xf0,</div><div class='add'>+	0x82, 0xb0, 0x01, 0x00, 0x05, 0x98, 0x00, 0xf0, 0x84, 0x30, 0x01, 0x00,</div><div class='add'>+	0xc3, 0x94, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x80, 0x97, 0x00, 0x45,</div><div class='add'>+	0x81, 0x30, 0x01, 0x00, 0xc6, 0x8b, 0x22, 0x42, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x09, 0x97, 0x00, 0x3a, 0x81, 0x30, 0x01, 0x00, 0xc6, 0x8b, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xae, 0x94, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x6d, 0x91, 0xa2, 0x08,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x6d, 0x91, 0xa2, 0x16, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x09, 0x97, 0x00, 0x47, 0x80, 0x30, 0x01, 0x00, 0x00, 0x82, 0x00, 0x02,</div><div class='add'>+	0x04, 0xdc, 0x01, 0x00, 0xed, 0x87, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x10, 0x80, 0x00, 0x03, 0x44, 0xc9, 0x01, 0x00, 0x00, 0xe1, 0x00, 0xa6,</div><div class='add'>+	0x84, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x60, 0x07,</div><div class='add'>+	0x84, 0x94, 0x01, 0x00, 0xfa, 0x96, 0x00, 0x5e, 0x05, 0x10, 0x01, 0x00,</div><div class='add'>+	0xc6, 0x8b, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x8a, 0x00, 0x00, 0x40,</div><div class='add'>+	0x47, 0x99, 0x01, 0x00, 0xc3, 0x94, 0x00, 0x41, 0xe7, 0x41, 0x01, 0x00,</div><div class='add'>+	0xcd, 0x8b, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0xa2, 0x05,</div><div class='add'>+	0x48, 0x6d, 0x00, 0x00, 0x04, 0x00, 0xa2, 0x41, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa2, 0x48, 0x1f, 0x7c, 0x00, 0x00, 0xec, 0x95, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x04, 0x00, 0xa3, 0x0a, 0x0c, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x97, 0x95, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01,</div><div class='add'>+	0x2c, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x15, 0x10, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x10, 0xc0, 0x01, 0x00, 0x04, 0x00, 0x1f, 0x0a,</div><div class='add'>+	0x2c, 0x50, 0x00, 0x00, 0x14, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa2, 0xf0, 0x80, 0x32, 0x00, 0x00, 0x9b, 0x97, 0x00, 0x06,</div><div class='add'>+	0x04, 0x30, 0x01, 0x00, 0x8a, 0x91, 0xa2, 0x48, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x88, 0x91, 0x84, 0x48, 0x1f, 0x10, 0x00, 0x00, 0xac, 0x00, 0x00, 0x40,</div><div class='add'>+	0x47, 0x99, 0x01, 0x00, 0x8a, 0x91, 0x00, 0x0a, 0xe0, 0xc1, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x0a, 0x02, 0xb0, 0x01, 0x00, 0x98, 0x93, 0x00, 0x01,</div><div class='add'>+	0x8c, 0x30, 0x01, 0x00, 0x00, 0x00, 0x00, 0x43, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00, 0x8b, 0x91, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x23, 0x83, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x05, 0x48, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x02,</div><div class='add'>+	0x10, 0xc0, 0x01, 0x00, 0x98, 0x91, 0x22, 0x02, 0x14, 0x50, 0x00, 0x00,</div><div class='add'>+	0x73, 0x96, 0x00, 0x45, 0x1f, 0x00, 0x01, 0x00, 0x83, 0x91, 0x22, 0x5c,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x47, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00, 0x94, 0x91, 0xa8, 0x5c,</div><div class='add'>+	0x1f, 0x00, 0x00, 0x00, 0x23, 0x83, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x83, 0x91, 0x00, 0x05, 0x48, 0xb1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0b,</div><div class='add'>+	0x1b, 0xb0, 0x01, 0x00, 0x08, 0x00, 0x2d, 0x40, 0x85, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf0, 0x82, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x05, 0xb0, 0x01, 0x00, 0x26, 0x96, 0x00, 0x41, 0x87, 0x30, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x45, 0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x9e, 0x91, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x23, 0x83, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0xa4, 0x91, 0x22, 0x09, 0x80, 0x30, 0x00, 0x00,</div><div class='add'>+	0x80, 0x97, 0x00, 0x40, 0x13, 0x30, 0x01, 0x00, 0xa8, 0x91, 0x22, 0x44,</div><div class='add'>+	0x19, 0x7c, 0x00, 0x00, 0x80, 0x97, 0x00, 0x4f, 0x81, 0x30, 0x01, 0x00,</div><div class='add'>+	0xa8, 0x91, 0xa2, 0x47, 0x1f, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0x19, 0x80, 0x01, 0x00, 0xff, 0x07, 0x00, 0x08, 0x00, 0x8c, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x26, 0x40, 0x81, 0x32, 0x00, 0x00, 0xb7, 0x91, 0x22, 0x4a,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0xaf, 0x91, 0xa2, 0x16, 0x02, 0x30, 0x00, 0x00,</div><div class='add'>+	0xc3, 0x94, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x2f, 0x00, 0x20, 0x40,</div><div class='add'>+	0xe7, 0xb1, 0x01, 0x00, 0xc6, 0x8b, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x2d, 0x00, 0x2d, 0x08, 0x2a, 0xb0, 0x01, 0x00, 0xb3, 0x91, 0x22, 0x42,</div><div class='add'>+	0x19, 0x7c, 0x00, 0x00, 0x36, 0x96, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0xb4, 0x91, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xff, 0x95, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x30, 0x00, 0x2e, 0x00, 0x2a, 0xd0, 0x01, 0x00,</div><div class='add'>+	0x32, 0x00, 0x2a, 0x15, 0xe4, 0xb1, 0x01, 0x00, 0xc6, 0x8b, 0x00, 0x16,</div><div class='add'>+	0xe4, 0xb1, 0x00, 0x00, 0xcd, 0x91, 0x22, 0x16, 0x02, 0x30, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa2, 0x47, 0x1f, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08,</div><div class='add'>+	0x2a, 0xb0, 0x01, 0x00, 0x25, 0x98, 0x00, 0x40, 0x95, 0x30, 0x01, 0x00,</div><div class='add'>+	0xbd, 0x91, 0xa2, 0x40, 0x11, 0x6c, 0x00, 0x00, 0xce, 0x91, 0x22, 0x40,</div><div class='add'>+	0x2d, 0x6c, 0x00, 0x00, 0x04, 0x00, 0xa2, 0x05, 0x48, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x22, 0x44, 0x1f, 0x7c, 0x00, 0x00, 0xac, 0x00, 0x00, 0x40,</div><div class='add'>+	0x47, 0x99, 0x01, 0x00, 0xb0, 0x00, 0x2b, 0x01, 0xe0, 0xc1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x2b, 0x00, 0xa6, 0x16, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01,</div><div class='add'>+	0xe0, 0xd1, 0x01, 0x00, 0x58, 0x97, 0x00, 0x08, 0x80, 0x30, 0x01, 0x00,</div><div class='add'>+	0xc6, 0x91, 0x00, 0x5e, 0x17, 0x90, 0x00, 0x00, 0x79, 0x97, 0x00, 0x43,</div><div class='add'>+	0x61, 0x31, 0x01, 0x00, 0x00, 0x00, 0x00, 0x43, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00, 0xc7, 0x91, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x23, 0x83, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x05, 0x48, 0xb1, 0x01, 0x00, 0x60, 0x97, 0x00, 0x07,</div><div class='add'>+	0x16, 0x14, 0x01, 0x00, 0xfa, 0x96, 0x00, 0x5e, 0x05, 0x10, 0x01, 0x00,</div><div class='add'>+	0xc3, 0x94, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x2f, 0x00, 0x20, 0x40,</div><div class='add'>+	0xe7, 0xb1, 0x01, 0x00, 0xcd, 0x8b, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x0b, 0x1b, 0xb0, 0x01, 0x00, 0x04, 0x00, 0x1f, 0x15,</div><div class='add'>+	0x1a, 0x50, 0x00, 0x00, 0xdc, 0x91, 0x20, 0x16, 0x1a, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x22, 0x40, 0x1f, 0x7c, 0x00, 0x00, 0x70, 0x00, 0x00, 0x03,</div><div class='add'>+	0x48, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x22, 0x50, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x03, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+	0xe0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x42, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xa0, 0x00, 0x00, 0xa4, 0x62, 0xdd, 0x01, 0x00, 0xd9, 0x91, 0xa8, 0x46,</div><div class='add'>+	0x1f, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x10, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x15,</div><div class='add'>+	0x10, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x2a, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x0a, 0x2c, 0xd0, 0x01, 0x00, 0x04, 0x00, 0x1f, 0x16,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x14, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa2, 0xf0, 0x80, 0x32, 0x00, 0x00, 0xac, 0x00, 0x2f, 0x40,</div><div class='add'>+	0x23, 0xb0, 0x01, 0x00, 0xe6, 0x91, 0x84, 0x45, 0x1f, 0x10, 0x00, 0x00,</div><div class='add'>+	0xe7, 0x91, 0x00, 0x0a, 0xe0, 0xc1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a,</div><div class='add'>+	0x02, 0xb0, 0x01, 0x00, 0xb8, 0x96, 0x00, 0x40, 0x35, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa2, 0x5c, 0x1f, 0x7c, 0x00, 0x00, 0x00, 0x80, 0x00, 0x19,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0xf0, 0x91, 0x22, 0x40, 0xe3, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x43, 0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0xec, 0x91, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x23, 0x83, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x00, 0x92, 0xa2, 0x02, 0x1a, 0x50, 0x00, 0x00,</div><div class='add'>+	0x05, 0x92, 0x22, 0x40, 0x2d, 0x6c, 0x00, 0x00, 0x04, 0x00, 0x22, 0x40,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x00, 0x80, 0x00, 0x10, 0x44, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x50, 0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x03,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0xff, 0x07, 0x00, 0x08, 0xe0, 0x8d, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x42, 0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xb1, 0x01, 0x00, 0xf8, 0x91, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x23, 0x83, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x0c, 0x80, 0x00, 0x03, 0x42, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x10, 0x00, 0x00, 0xf0, 0x10, 0xc8, 0x01, 0x00, 0xf0, 0x07, 0x00, 0x40,</div><div class='add'>+	0x1b, 0x98, 0x01, 0x00, 0x05, 0x92, 0x00, 0x5c, 0x11, 0x80, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa2, 0x5f, 0x1b, 0x7c, 0x00, 0x00, 0xff, 0x07, 0x00, 0x08,</div><div class='add'>+	0x98, 0x88, 0x01, 0x00, 0x00, 0x00, 0x00, 0x02, 0x98, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x20, 0x0b, 0x99, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,</div><div class='add'>+	0x10, 0xc0, 0x01, 0x00, 0x04, 0x00, 0x22, 0x40, 0x23, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa3, 0x43, 0x23, 0x6c, 0x00, 0x00, 0xe1, 0x94, 0x00, 0x40,</div><div class='add'>+	0x1f, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x05, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x0b, 0x92, 0x23, 0x0d, 0x2c, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x1f, 0x90, 0x01, 0x00, 0x13, 0x92, 0x22, 0x46, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x70, 0x80, 0x00, 0x03, 0x42, 0xc9, 0x01, 0x00, 0x13, 0x92, 0x22, 0x40,</div><div class='add'>+	0xe3, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00, 0x0f, 0x92, 0xa8, 0x46,</div><div class='add'>+	0x1f, 0x00, 0x00, 0x00, 0x23, 0x83, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x05, 0x48, 0xb1, 0x01, 0x00, 0x08, 0x00, 0x2d, 0x40,</div><div class='add'>+	0x85, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x82, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x05, 0xb0, 0x01, 0x00, 0x26, 0x96, 0x00, 0x41,</div><div class='add'>+	0x87, 0x30, 0x01, 0x00, 0x00, 0x00, 0x00, 0x45, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00, 0x18, 0x92, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x23, 0x83, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x05, 0x48, 0xb1, 0x01, 0x00, 0x1e, 0x92, 0x22, 0x09,</div><div class='add'>+	0x80, 0x30, 0x00, 0x00, 0x80, 0x97, 0x00, 0x40, 0x13, 0x30, 0x01, 0x00,</div><div class='add'>+	0x22, 0x92, 0x22, 0x44, 0x19, 0x7c, 0x00, 0x00, 0x80, 0x97, 0x00, 0x4f,</div><div class='add'>+	0x81, 0x30, 0x01, 0x00, 0x22, 0x92, 0xa2, 0x47, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x44, 0x19, 0x80, 0x01, 0x00, 0xff, 0x07, 0x00, 0x08,</div><div class='add'>+	0x00, 0x8c, 0x01, 0x00, 0x04, 0x00, 0x26, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x38, 0x92, 0x22, 0x4a, 0x1f, 0x7c, 0x00, 0x00, 0x29, 0x92, 0xa2, 0x16,</div><div class='add'>+	0x02, 0x30, 0x00, 0x00, 0xc3, 0x94, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x2f, 0x00, 0x20, 0x40, 0xe7, 0xb1, 0x01, 0x00, 0xc6, 0x8b, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x2d, 0x00, 0x2d, 0x08, 0x2a, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x34, 0x92, 0x22, 0x42, 0x19, 0x7c, 0x00, 0x00, 0x2d, 0x92, 0xa2, 0xf3,</div><div class='add'>+	0x84, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x85, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x85, 0xd0, 0x01, 0x00, 0xd4, 0x00, 0x3e, 0x41,</div><div class='add'>+	0x85, 0xe0, 0x01, 0x00, 0x31, 0x92, 0x22, 0x40, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x5a, 0x11, 0x90, 0x01, 0x00, 0x0b, 0x00, 0x00, 0x08,</div><div class='add'>+	0xe4, 0xf5, 0x01, 0x00, 0x36, 0x96, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x35, 0x92, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xff, 0x95, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x30, 0x00, 0x2e, 0x00, 0x2a, 0xd0, 0x01, 0x00,</div><div class='add'>+	0x32, 0x00, 0x2a, 0x15, 0xe4, 0xb1, 0x01, 0x00, 0xc6, 0x8b, 0x00, 0x16,</div><div class='add'>+	0xe4, 0xb1, 0x00, 0x00, 0x3b, 0x92, 0xa2, 0x16, 0x02, 0x30, 0x00, 0x00,</div><div class='add'>+	0xc3, 0x94, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x94, 0x92, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x2d, 0x00, 0x2d, 0x08, 0x2a, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x4e, 0x92, 0x22, 0x47, 0x1f, 0x7c, 0x00, 0x00, 0x04, 0x00, 0xa0, 0x91,</div><div class='add'>+	0x03, 0x6c, 0x00, 0x00, 0x48, 0x92, 0x22, 0x42, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x41, 0x92, 0xa2, 0xf3, 0x84, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5,</div><div class='add'>+	0x85, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41, 0x85, 0xd0, 0x01, 0x00,</div><div class='add'>+	0xd4, 0x00, 0x3e, 0x41, 0x85, 0xe0, 0x01, 0x00, 0x45, 0x92, 0x22, 0x40,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5a, 0x11, 0x90, 0x01, 0x00,</div><div class='add'>+	0x0b, 0x00, 0x00, 0x08, 0xe4, 0xf5, 0x01, 0x00, 0x20, 0x04, 0x00, 0x40,</div><div class='add'>+	0x89, 0x98, 0x01, 0x00, 0x02, 0x99, 0x00, 0x08, 0x8a, 0x30, 0x01, 0x00,</div><div class='add'>+	0x58, 0x01, 0x2d, 0x00, 0x2a, 0xd0, 0x01, 0x00, 0x60, 0x01, 0x2d, 0xf0,</div><div class='add'>+	0x10, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x2c, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x16, 0x80, 0xb2, 0x01, 0x00, 0x04, 0x00, 0x27, 0x40,</div><div class='add'>+	0x11, 0x6c, 0x00, 0x00, 0x84, 0x8f, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa3, 0x91, 0x03, 0x6c, 0x00, 0x00, 0x25, 0x98, 0x00, 0x41,</div><div class='add'>+	0x95, 0x30, 0x01, 0x00, 0x57, 0x92, 0xa2, 0x08, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x57, 0x92, 0xa2, 0x16, 0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x97, 0xb0, 0x01, 0x00, 0x55, 0x92, 0x23, 0x0d, 0x02, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x97, 0xc0, 0x01, 0x00, 0xa6, 0x95, 0x00, 0x4b,</div><div class='add'>+	0x02, 0xb0, 0x00, 0x00, 0x94, 0x92, 0x00, 0x05, 0x48, 0xb1, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa2, 0x05, 0x48, 0x6d, 0x00, 0x00, 0x04, 0x00, 0x22, 0x44,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0xac, 0x00, 0x2f, 0x01, 0x14, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xb0, 0x00, 0x2b, 0x01, 0xe0, 0xc1, 0x01, 0x00, 0x00, 0x2b, 0x00, 0xa6,</div><div class='add'>+	0x16, 0xb0, 0x01, 0x00, 0x04, 0x00, 0x22, 0x41, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x01, 0xe0, 0xd1, 0x01, 0x00, 0x6a, 0x92, 0x23, 0x0d,</div><div class='add'>+	0x02, 0x6c, 0x00, 0x00, 0x00, 0x80, 0x00, 0x10, 0x44, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x50, 0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x03,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x42, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x10, 0x62, 0xb1, 0x01, 0x00, 0x63, 0x92, 0xa8, 0x00,</div><div class='add'>+	0xe0, 0x31, 0x00, 0x00, 0x23, 0x83, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x05, 0x48, 0xb1, 0x01, 0x00, 0x0c, 0x80, 0x00, 0x03,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0x10, 0x00, 0x00, 0xf0, 0x22, 0xc8, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x5c, 0x23, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01,</div><div class='add'>+	0x84, 0xb0, 0x01, 0x00, 0x6d, 0x92, 0x23, 0x0d, 0x02, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x0d, 0x02, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x08,</div><div class='add'>+	0x80, 0xb0, 0x01, 0x00, 0x72, 0x92, 0x22, 0x40, 0x1b, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x58, 0x97, 0x00, 0x01, 0x84, 0x50, 0x01, 0x00, 0x7b, 0x92, 0x22, 0x40,</div><div class='add'>+	0x85, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x80, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x10, 0x80, 0x00, 0x10, 0x46, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4f,</div><div class='add'>+	0x43, 0x81, 0x01, 0x00, 0x00, 0x00, 0x00, 0x42, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x20, 0x00, 0x00, 0x40, 0xf0, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x16,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x43, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xa0, 0x00, 0x00, 0xa1, 0x62, 0xdd, 0x01, 0x00, 0x78, 0x92, 0xa8, 0x11,</div><div class='add'>+	0xe0, 0x31, 0x00, 0x00, 0x04, 0x00, 0x22, 0x40, 0x23, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x8a, 0x92, 0x00, 0x5e, 0x17, 0x90, 0x00, 0x00, 0x7e, 0x92, 0x23, 0x0d,</div><div class='add'>+	0x02, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0d, 0x02, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x01, 0x84, 0xd0, 0x01, 0x00, 0x83, 0x92, 0x22, 0x40,</div><div class='add'>+	0x1b, 0x6c, 0x00, 0x00, 0x79, 0x97, 0x00, 0x43, 0x61, 0x31, 0x01, 0x00,</div><div class='add'>+	0x8a, 0x92, 0x22, 0x40, 0x85, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,</div><div class='add'>+	0x12, 0xc0, 0x01, 0x00, 0x10, 0x80, 0x00, 0x10, 0x46, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4f, 0x43, 0x81, 0x01, 0x00, 0x00, 0x00, 0x00, 0x42,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x09, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x18, 0xf0, 0xb1, 0x01, 0x00, 0xa0, 0x00, 0x00, 0xa1,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x88, 0x92, 0xa8, 0x11, 0xe0, 0x31, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x43, 0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x8b, 0x92, 0xa8, 0x0a, 0x02, 0x30, 0x00, 0x00,</div><div class='add'>+	0x23, 0x83, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0xc3, 0x94, 0x00, 0x05,</div><div class='add'>+	0x48, 0x31, 0x01, 0x00, 0x92, 0x92, 0x23, 0x0d, 0x02, 0x6c, 0x00, 0x00,</div><div class='add'>+	0xff, 0x07, 0x00, 0x11, 0x00, 0x8c, 0x01, 0x00, 0xc3, 0x94, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x60, 0x97, 0x00, 0x07, 0x16, 0x14, 0x01, 0x00,</div><div class='add'>+	0xfa, 0x96, 0x00, 0x5e, 0x05, 0x10, 0x01, 0x00, 0x2f, 0x00, 0x20, 0x40,</div><div class='add'>+	0xe7, 0xb1, 0x01, 0x00, 0xcd, 0x8b, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x00, 0x80, 0x00, 0x03, 0x42, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8,</div><div class='add'>+	0x82, 0xb0, 0x01, 0x00, 0x04, 0x00, 0x26, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf8, 0x8c, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0,</div><div class='add'>+	0x8e, 0xb0, 0x01, 0x00, 0xe6, 0x95, 0x00, 0x40, 0x13, 0x30, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x0c, 0x47, 0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x85, 0xb0, 0x01, 0x00, 0x26, 0x96, 0x00, 0x41, 0x87, 0x30, 0x01, 0x00,</div><div class='add'>+	0x97, 0x95, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x04, 0x00, 0x20, 0x91,</div><div class='add'>+	0x03, 0x6c, 0x00, 0x00, 0x00, 0x80, 0x00, 0x10, 0x42, 0xc9, 0x01, 0x00,</div><div class='add'>+	0xa8, 0x92, 0x22, 0x40, 0xe3, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x45,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0xa4, 0x92, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0x23, 0x83, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xaa, 0x92, 0x22, 0x09, 0x80, 0x30, 0x00, 0x00, 0x80, 0x97, 0x00, 0x40,</div><div class='add'>+	0x13, 0x30, 0x01, 0x00, 0x00, 0x00, 0x00, 0x0b, 0x1b, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x15, 0x1a, 0xd0, 0x01, 0x00, 0xb1, 0x92, 0xa2, 0x41,</div><div class='add'>+	0x19, 0x7c, 0x00, 0x00, 0x25, 0x98, 0x00, 0x40, 0x95, 0x30, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x16, 0x80, 0xb2, 0x01, 0x00, 0xba, 0x92, 0x27, 0x08,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0xbd, 0x91, 0x00, 0x00, 0x2a, 0xc0, 0x00, 0x00,</div><div class='add'>+	0x25, 0x98, 0x00, 0x41, 0x95, 0x30, 0x01, 0x00, 0x00, 0x00, 0x00, 0x16,</div><div class='add'>+	0x80, 0xb2, 0x01, 0x00, 0xb5, 0x92, 0x27, 0x08, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x57, 0x92, 0x00, 0x00, 0x2a, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x97, 0xb0, 0x01, 0x00, 0xb8, 0x92, 0x23, 0x0d, 0x02, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x97, 0xc0, 0x01, 0x00, 0xa6, 0x95, 0x00, 0x4b,</div><div class='add'>+	0x02, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xc6, 0x8b, 0x22, 0x42, 0x19, 0x7c, 0x00, 0x00, 0x09, 0x97, 0x00, 0x3a,</div><div class='add'>+	0x81, 0x30, 0x01, 0x00, 0xc6, 0x8b, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa2, 0x4a, 0x1f, 0x7c, 0x00, 0x00, 0xbf, 0x92, 0x00, 0x4a,</div><div class='add'>+	0x1f, 0x90, 0x00, 0x00, 0x04, 0x00, 0xa2, 0x41, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa2, 0x4f, 0x2b, 0x7c, 0x00, 0x00, 0x04, 0x00, 0xa2, 0x44,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x04, 0x00, 0xa2, 0x45, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0xf9, 0x94, 0x00, 0x00, 0x10, 0x30, 0x01, 0x00, 0x00, 0x00, 0x00, 0x15,</div><div class='add'>+	0x10, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x10, 0x32, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x9b, 0x97, 0x00, 0x06, 0x04, 0x30, 0x01, 0x00, 0xcc, 0x92, 0xa2, 0x44,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0b, 0x1b, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x0a, 0x2c, 0xd0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x0a,</div><div class='add'>+	0x02, 0xb0, 0x01, 0x00, 0x98, 0x93, 0x00, 0x01, 0x8c, 0x30, 0x01, 0x00,</div><div class='add'>+	0x00, 0x80, 0x00, 0x19, 0x42, 0xc9, 0x01, 0x00, 0xd3, 0x92, 0x22, 0x40,</div><div class='add'>+	0xe3, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00, 0xcf, 0x92, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x23, 0x83, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x05, 0x48, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x02,</div><div class='add'>+	0x10, 0xc0, 0x01, 0x00, 0xdc, 0x92, 0x22, 0x02, 0x14, 0x50, 0x00, 0x00,</div><div class='add'>+	0x73, 0x96, 0x00, 0x45, 0x1f, 0x00, 0x01, 0x00, 0xc5, 0x92, 0x22, 0x5c,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x47, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00, 0xd8, 0x92, 0xa8, 0x5c,</div><div class='add'>+	0x1f, 0x00, 0x00, 0x00, 0x23, 0x83, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xc5, 0x92, 0x00, 0x05, 0x48, 0xb1, 0x00, 0x00, 0x08, 0x00, 0x2d, 0x40,</div><div class='add'>+	0x85, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x82, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x05, 0xb0, 0x01, 0x00, 0x26, 0x96, 0x00, 0x41,</div><div class='add'>+	0x87, 0x30, 0x01, 0x00, 0x00, 0x00, 0x00, 0x45, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00, 0xe1, 0x92, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x23, 0x83, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x05, 0x48, 0xb1, 0x01, 0x00, 0xe7, 0x92, 0x22, 0x09,</div><div class='add'>+	0x80, 0x30, 0x00, 0x00, 0x80, 0x97, 0x00, 0x40, 0x13, 0x30, 0x01, 0x00,</div><div class='add'>+	0xea, 0x92, 0x22, 0x44, 0x19, 0x7c, 0x00, 0x00, 0x80, 0x97, 0x00, 0x4f,</div><div class='add'>+	0x81, 0x30, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44, 0x19, 0x80, 0x01, 0x00,</div><div class='add'>+	0xff, 0x07, 0x00, 0x08, 0x00, 0x8c, 0x01, 0x00, 0x04, 0x00, 0x26, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0xf9, 0x92, 0x22, 0x4a, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0xf1, 0x92, 0xa2, 0x16, 0x02, 0x30, 0x00, 0x00, 0xc3, 0x94, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x2f, 0x00, 0x20, 0x40, 0xe7, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xc6, 0x8b, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x2d, 0x00, 0x2d, 0x08,</div><div class='add'>+	0x2a, 0xb0, 0x01, 0x00, 0xf5, 0x92, 0x22, 0x42, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x36, 0x96, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0xf6, 0x92, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0xff, 0x95, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x30, 0x00, 0x2e, 0x00, 0x2a, 0xd0, 0x01, 0x00, 0x32, 0x00, 0x2a, 0x15,</div><div class='add'>+	0xe4, 0xb1, 0x01, 0x00, 0xc6, 0x8b, 0x00, 0x16, 0xe4, 0xb1, 0x00, 0x00,</div><div class='add'>+	0xb8, 0x91, 0xa2, 0x16, 0x02, 0x30, 0x00, 0x00, 0xc3, 0x94, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x2f, 0x00, 0x20, 0x40, 0xe7, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xcd, 0x8b, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x22, 0x41,</div><div class='add'>+	0x19, 0x7c, 0x00, 0x00, 0x04, 0x00, 0xa2, 0x4f, 0x2b, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa2, 0x44, 0x1f, 0x7c, 0x00, 0x00, 0x04, 0x00, 0xa2, 0x45,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x04, 0x00, 0xa2, 0x4a, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0xf9, 0x94, 0x00, 0x4a, 0x1f, 0x10, 0x01, 0x00, 0xd0, 0x91, 0x00, 0x10,</div><div class='add'>+	0x32, 0xb0, 0x00, 0x00, 0x8a, 0x00, 0x20, 0x40, 0xe7, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x08, 0x93, 0xa2, 0x41, 0x19, 0x7c, 0x00, 0x00, 0xc3, 0x94, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x0b, 0x93, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x9f, 0x95, 0x00, 0x15, 0x94, 0x30, 0x01, 0x00, 0xa6, 0x95, 0x00, 0x4b,</div><div class='add'>+	0x02, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x0d, 0x93, 0x22, 0x42, 0x19, 0x7c, 0x00, 0x00, 0x09, 0x97, 0x00, 0x3a,</div><div class='add'>+	0x81, 0x30, 0x01, 0x00, 0x80, 0x97, 0x00, 0x45, 0x81, 0x30, 0x01, 0x00,</div><div class='add'>+	0xc6, 0x8b, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x62, 0x90, 0x00, 0x45,</div><div class='add'>+	0x1f, 0x90, 0x00, 0x00, 0x04, 0x00, 0x22, 0x41, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa2, 0x47, 0x1f, 0x7c, 0x00, 0x00, 0xec, 0x95, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x04, 0x00, 0xa3, 0x0a, 0x0c, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x97, 0x95, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0xd0, 0x91, 0x00, 0x01,</div><div class='add'>+	0x2c, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x22, 0x41, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa2, 0x48, 0x1f, 0x7c, 0x00, 0x00, 0xae, 0x94, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x26, 0x93, 0xa2, 0x08, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x26, 0x93, 0xa2, 0x16, 0x80, 0x32, 0x00, 0x00, 0x00, 0x82, 0x00, 0x02,</div><div class='add'>+	0x04, 0xdc, 0x01, 0x00, 0x00, 0x00, 0x00, 0x45, 0x03, 0xf0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x01, 0x00, 0xc0, 0x01, 0x00, 0x1e, 0x93, 0x37, 0x5c,</div><div class='add'>+	0x61, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1b, 0x62, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x23, 0x93, 0x28, 0x40, 0x81, 0x32, 0x00, 0x00, 0x04, 0x00, 0xa2, 0x5c,</div><div class='add'>+	0x77, 0x7d, 0x00, 0x00, 0x1f, 0x93, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x62, 0xb1, 0x01, 0x00, 0x23, 0x93, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0xed, 0x87, 0x17, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x58, 0x01, 0x20, 0x08, 0xe0, 0xb1, 0x01, 0x00, 0x60, 0x01, 0x20, 0x16,</div><div class='add'>+	0xe0, 0xb1, 0x01, 0x00, 0xec, 0x95, 0x00, 0x47, 0x1f, 0x10, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa3, 0x0a, 0x0c, 0x6c, 0x00, 0x00, 0x97, 0x95, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0xd0, 0x91, 0x00, 0x01, 0x2c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x22, 0x41, 0x19, 0x7c, 0x00, 0x00, 0x04, 0x00, 0xa2, 0x47,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0xae, 0x94, 0x00, 0x47, 0x1f, 0x10, 0x01, 0x00,</div><div class='add'>+	0x3d, 0x93, 0xa2, 0x08, 0x80, 0x32, 0x00, 0x00, 0x3d, 0x93, 0xa2, 0x16,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x39, 0x93, 0xa2, 0x42, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x82, 0x00, 0x02, 0x04, 0xdc, 0x01, 0x00, 0xa0, 0x98, 0x00, 0x40,</div><div class='add'>+	0x47, 0x99, 0x01, 0x00, 0x30, 0x05, 0x00, 0x41, 0x89, 0x30, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x22, 0x41, 0x19, 0x7c, 0x00, 0x00, 0x9f, 0x95, 0x00, 0x15,</div><div class='add'>+	0x94, 0x30, 0x01, 0x00, 0xa6, 0x95, 0x00, 0x4b, 0x02, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xed, 0x87, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x36, 0x96, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4b, 0x19, 0x90, 0x01, 0x00,</div><div class='add'>+	0x09, 0x97, 0x00, 0x3a, 0x81, 0x30, 0x01, 0x00, 0xed, 0x87, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x58, 0x01, 0x20, 0x08, 0xe0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x60, 0x01, 0x20, 0x16, 0xe0, 0xb1, 0x01, 0x00, 0x04, 0x00, 0xa2, 0x4f,</div><div class='add'>+	0x2b, 0x7c, 0x00, 0x00, 0x04, 0x00, 0xa2, 0x44, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa2, 0x45, 0x1f, 0x7c, 0x00, 0x00, 0xf9, 0x94, 0x00, 0x10,</div><div class='add'>+	0x32, 0x30, 0x01, 0x00, 0xd0, 0x91, 0x00, 0x40, 0x13, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xae, 0x94, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x52, 0x93, 0xa2, 0x08,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x52, 0x93, 0xa2, 0x16, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x82, 0x00, 0x02, 0x04, 0xdc, 0x01, 0x00, 0x00, 0x00, 0x00, 0x45,</div><div class='add'>+	0x03, 0xf0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x4a, 0x93, 0x37, 0x5c, 0x61, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1b,</div><div class='add'>+	0x62, 0xb1, 0x01, 0x00, 0x4f, 0x93, 0x28, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa2, 0x5c, 0x77, 0x7d, 0x00, 0x00, 0x4b, 0x93, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x62, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x4f, 0x93, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0xed, 0x87, 0x17, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x80, 0x00, 0x03, 0x42, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf8, 0x82, 0xb0, 0x01, 0x00, 0x04, 0x00, 0x26, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x8c, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf0, 0x8e, 0xb0, 0x01, 0x00, 0xe6, 0x95, 0x00, 0x40,</div><div class='add'>+	0x13, 0x30, 0x01, 0x00, 0x04, 0x00, 0x0c, 0x47, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x85, 0xb0, 0x01, 0x00, 0x26, 0x96, 0x00, 0x41,</div><div class='add'>+	0x87, 0x30, 0x01, 0x00, 0x97, 0x95, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa0, 0x91, 0x03, 0x6c, 0x00, 0x00, 0x00, 0x80, 0x00, 0x10,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0x64, 0x93, 0x22, 0x40, 0xe3, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x45, 0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x60, 0x93, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x23, 0x83, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x84, 0x8f, 0x22, 0x09, 0x80, 0x30, 0x00, 0x00,</div><div class='add'>+	0x80, 0x97, 0x00, 0x40, 0x13, 0x30, 0x01, 0x00, 0x84, 0x8f, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x83, 0x1e, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa2, 0x4f, 0x2b, 0x7c, 0x00, 0x00, 0x04, 0x00, 0xa2, 0x45,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x14, 0x00, 0x2d, 0x45, 0x1f, 0x90, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa2, 0xf0, 0x14, 0x6c, 0x00, 0x00, 0x04, 0x00, 0xa0, 0x01,</div><div class='add'>+	0x14, 0x6c, 0x00, 0x00, 0xdc, 0x8f, 0x00, 0x44, 0x19, 0x90, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa2, 0x4a, 0x1f, 0x7c, 0x00, 0x00, 0x72, 0x93, 0xa2, 0x41,</div><div class='add'>+	0x19, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4a, 0x1f, 0x90, 0x01, 0x00,</div><div class='add'>+	0x77, 0x91, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0xa2, 0x48,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0xec, 0x95, 0x00, 0x4a, 0x1f, 0x10, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa3, 0x0a, 0x0c, 0x6c, 0x00, 0x00, 0x97, 0x95, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0xd0, 0x91, 0x00, 0x01, 0x2c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x22, 0x41, 0x19, 0x7c, 0x00, 0x00, 0x04, 0x00, 0xa2, 0x4f,</div><div class='add'>+	0x2b, 0x7c, 0x00, 0x00, 0x04, 0x00, 0xa2, 0x44, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa2, 0x45, 0x1f, 0x7c, 0x00, 0x00, 0xf9, 0x94, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0xd0, 0x91, 0x00, 0x10, 0x32, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x8b, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00, 0x04, 0x00, 0xa2, 0x46,</div><div class='add'>+	0xe7, 0x7d, 0x00, 0x00, 0x62, 0x90, 0x00, 0x45, 0x1f, 0x90, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x37, 0xc3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x33, 0xc3, 0x01, 0x00, 0x36, 0x00, 0x00, 0x01, 0x02, 0xcc, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0xd2, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x86, 0x93, 0x85, 0x17,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x9f, 0x48, 0x03, 0xd0, 0x00, 0x00,</div><div class='add'>+	0x88, 0x93, 0x9c, 0x17, 0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x9f, 0x4c,</div><div class='add'>+	0x03, 0xd0, 0x00, 0x00, 0x00, 0x00, 0x80, 0x01, 0x34, 0xc3, 0x01, 0x00,</div><div class='add'>+	0x40, 0x80, 0x00, 0x03, 0x44, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4a,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x04, 0x00, 0x26, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x12,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0xcb, 0x94, 0x00, 0x41, 0xe1, 0x31, 0x01, 0x00,</div><div class='add'>+	0x00, 0x80, 0x00, 0x43, 0x44, 0xc9, 0x01, 0x00, 0x10, 0x00, 0x00, 0x40,</div><div class='add'>+	0xf1, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x48, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x49, 0xf0, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x03,</div><div class='add'>+	0xe0, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x45, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x43, 0x62, 0xb1, 0x01, 0x00, 0x00, 0x00, 0xa8, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x95, 0x93, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x2d, 0x04, 0x00, 0x40, 0x89, 0x98, 0x01, 0x00, 0x02, 0x99, 0x00, 0xa5,</div><div class='add'>+	0x8a, 0x30, 0x01, 0x00, 0xba, 0x00, 0x20, 0x40, 0xe5, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xb0, 0x00, 0x2f, 0x01, 0x8c, 0xd0, 0x01, 0x00, 0x04, 0x00, 0x1f, 0xf0,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46, 0xe0, 0xc1, 0x01, 0x00,</div><div class='add'>+	0xac, 0x00, 0x2f, 0x40, 0x13, 0xb0, 0x01, 0x00, 0xcc, 0x00, 0x2d, 0x01,</div><div class='add'>+	0xe0, 0xc1, 0x01, 0x00, 0xa3, 0x93, 0x9c, 0x17, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x22, 0x4a, 0x19, 0x7c, 0x00, 0x00, 0x2f, 0x98, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0xa5, 0x93, 0x22, 0x47, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x5f, 0x13, 0x90, 0x01, 0x00, 0xce, 0x97, 0x00, 0x47,</div><div class='add'>+	0x19, 0x10, 0x01, 0x00, 0xc0, 0x00, 0x2d, 0x44, 0x1f, 0x90, 0x01, 0x00,</div><div class='add'>+	0xc4, 0x00, 0x2d, 0xf0, 0x82, 0xb0, 0x01, 0x00, 0x05, 0x98, 0x00, 0xf0,</div><div class='add'>+	0x84, 0xb0, 0x00, 0x00, 0x90, 0x00, 0x2d, 0x05, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xba, 0x93, 0xa2, 0x4b, 0x1f, 0x7c, 0x00, 0x00, 0x0f, 0x94, 0xa2, 0x4c,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0xba, 0x93, 0x1f, 0x1c, 0xe0, 0x6d, 0x00, 0x00,</div><div class='add'>+	0xbd, 0x93, 0xa2, 0x01, 0x80, 0x32, 0x00, 0x00, 0xa8, 0x00, 0x2d, 0x46,</div><div class='add'>+	0x8f, 0xb0, 0x01, 0x00, 0xb3, 0x93, 0x1f, 0x1c, 0xe0, 0x6d, 0x00, 0x00,</div><div class='add'>+	0xb4, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00, 0xb5, 0x93, 0x22, 0xf0,</div><div class='add'>+	0x3a, 0x6c, 0x00, 0x00, 0x0c, 0x94, 0x1f, 0xf0, 0x3a, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0xa2, 0x40, 0x80, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x80, 0x4f,</div><div class='add'>+	0x8f, 0xb0, 0x01, 0x00, 0x8a, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00,</div><div class='add'>+	0x0d, 0x94, 0x20, 0x42, 0xe7, 0x6d, 0x00, 0x00, 0xb9, 0x93, 0x22, 0x40,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x80, 0x59, 0x8f, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x58, 0x8f, 0xb0, 0x01, 0x00, 0xbc, 0x93, 0x22, 0x40,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x80, 0x5c, 0x8f, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x5b, 0x8f, 0xb0, 0x01, 0x00, 0xac, 0x00, 0x00, 0x40,</div><div class='add'>+	0x43, 0x99, 0x01, 0x00, 0xb0, 0x00, 0x2d, 0xf0, 0x84, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xc1, 0x93, 0xa2, 0x42, 0x24, 0x6c, 0x00, 0x00, 0xcc, 0x93, 0x23, 0xf0,</div><div class='add'>+	0x02, 0x6c, 0x00, 0x00, 0xb0, 0x00, 0x00, 0xa1, 0x80, 0xce, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa6, 0x40, 0x81, 0x32, 0x00, 0x00, 0xc9, 0x93, 0xa2, 0xf0,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x0e, 0x94, 0xa2, 0x42, 0x24, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x0e, 0x94, 0xa2, 0x41, 0x03, 0x6c, 0x00, 0x00, 0xc8, 0x93, 0xa2, 0x40,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x80, 0x51, 0x8f, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x52, 0x8f, 0xb0, 0x01, 0x00, 0x0e, 0x94, 0x1f, 0x12,</div><div class='add'>+	0x84, 0x50, 0x00, 0x00, 0x0e, 0x94, 0xa0, 0x01, 0x84, 0x6c, 0x00, 0x00,</div><div class='add'>+	0xba, 0x93, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x8b, 0x00, 0x00, 0x40,</div><div class='add'>+	0x43, 0x99, 0x01, 0x00, 0xf7, 0x93, 0xa2, 0x46, 0xe7, 0x7d, 0x00, 0x00,</div><div class='add'>+	0x14, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00, 0xe9, 0x93, 0x22, 0xf0,</div><div class='add'>+	0x14, 0x30, 0x00, 0x00, 0xd5, 0x93, 0x20, 0x0a, 0x02, 0x6c, 0x00, 0x00,</div><div class='add'>+	0xe6, 0x93, 0x03, 0x1e, 0x80, 0x32, 0x00, 0x00, 0xd4, 0x93, 0xa2, 0x40,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x80, 0x44, 0x8f, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x49, 0x8f, 0xb0, 0x01, 0x00, 0xda, 0x93, 0x22, 0x0a,</div><div class='add'>+	0x02, 0x6c, 0x00, 0x00, 0xdd, 0x93, 0xa2, 0x41, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0xd9, 0x93, 0xa2, 0x40, 0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x80, 0x55,</div><div class='add'>+	0x8f, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x80, 0x56, 0x8f, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xdc, 0x93, 0xa2, 0x40, 0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x80, 0x43,</div><div class='add'>+	0x8f, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x80, 0x48, 0x8f, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x01, 0x82, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x0a,</div><div class='add'>+	0x82, 0xd0, 0x01, 0x00, 0xe3, 0x93, 0x20, 0x91, 0x83, 0x6c, 0x00, 0x00,</div><div class='add'>+	0xe2, 0x93, 0xa2, 0x40, 0x80, 0x32, 0x00, 0x00, 0x26, 0x00, 0x80, 0x40,</div><div class='add'>+	0x8f, 0x98, 0x01, 0x00, 0x27, 0x00, 0x80, 0x40, 0x8f, 0x98, 0x01, 0x00,</div><div class='add'>+	0xe5, 0x93, 0xa2, 0x40, 0x80, 0x32, 0x00, 0x00, 0x1f, 0x00, 0x80, 0x40,</div><div class='add'>+	0x8f, 0x98, 0x01, 0x00, 0x20, 0x00, 0x80, 0x40, 0x8f, 0x98, 0x01, 0x00,</div><div class='add'>+	0xe8, 0x93, 0xa2, 0x40, 0x80, 0x32, 0x00, 0x00, 0x22, 0x00, 0x80, 0x40,</div><div class='add'>+	0x8f, 0x98, 0x01, 0x00, 0x23, 0x00, 0x80, 0x40, 0x8f, 0x98, 0x01, 0x00,</div><div class='add'>+	0x88, 0x00, 0x2d, 0x44, 0x8f, 0xb0, 0x01, 0x00, 0xf2, 0x93, 0xa2, 0x41,</div><div class='add'>+	0x19, 0x7c, 0x00, 0x00, 0xef, 0x93, 0xa2, 0x43, 0x3d, 0x7c, 0x00, 0x00,</div><div class='add'>+	0xef, 0x93, 0xa2, 0xf2, 0x02, 0x6c, 0x00, 0x00, 0x00, 0x00, 0xa2, 0x40,</div><div class='add'>+	0x80, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x80, 0x49, 0x8f, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xf1, 0x93, 0xa2, 0x40, 0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x80, 0x43,</div><div class='add'>+	0x8f, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x80, 0x48, 0x8f, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xef, 0x93, 0xa0, 0x91, 0x03, 0x6c, 0x00, 0x00, 0xed, 0x93, 0x22, 0x43,</div><div class='add'>+	0x3d, 0x7c, 0x00, 0x00, 0xf6, 0x93, 0xa2, 0x40, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x28, 0x00, 0x80, 0x40, 0x8f, 0x98, 0x01, 0x00, 0x29, 0x00, 0x80, 0x40,</div><div class='add'>+	0x8f, 0x98, 0x01, 0x00, 0x14, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x94, 0xa2, 0xf0, 0x14, 0x30, 0x00, 0x00, 0x88, 0x00, 0x2d, 0x44,</div><div class='add'>+	0x8f, 0xb0, 0x01, 0x00, 0xfd, 0x93, 0xa2, 0xf2, 0x02, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0xa2, 0x40, 0x80, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x80, 0x49,</div><div class='add'>+	0x8f, 0xb0, 0x01, 0x00, 0xef, 0x93, 0x22, 0x41, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0xed, 0x93, 0x20, 0x91, 0x03, 0x6c, 0x00, 0x00, 0xef, 0x93, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x94, 0x20, 0x0a, 0x02, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x03, 0x94, 0xa2, 0x40, 0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x80, 0x44,</div><div class='add'>+	0x8f, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x80, 0x49, 0x8f, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x09, 0x94, 0x22, 0x0a, 0x02, 0x6c, 0x00, 0x00, 0xdd, 0x93, 0xa2, 0x41,</div><div class='add'>+	0x19, 0x7c, 0x00, 0x00, 0x08, 0x94, 0xa2, 0x40, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x55, 0x8f, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x80, 0x56,</div><div class='add'>+	0x8f, 0xb0, 0x01, 0x00, 0x0b, 0x94, 0xa2, 0x40, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x43, 0x8f, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x80, 0x48,</div><div class='add'>+	0x8f, 0xb0, 0x01, 0x00, 0x11, 0x94, 0x00, 0x43, 0x95, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x11, 0x94, 0x00, 0x41, 0x95, 0xb0, 0x00, 0x00, 0x11, 0x94, 0x00, 0x42,</div><div class='add'>+	0x95, 0xb0, 0x00, 0x00, 0x11, 0x94, 0x00, 0x44, 0x95, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x11, 0x94, 0x00, 0x4c, 0x95, 0xb0, 0x00, 0x00, 0x30, 0x04, 0x00, 0x40,</div><div class='add'>+	0x89, 0x98, 0x01, 0x00, 0x02, 0x99, 0x00, 0x4a, 0x8a, 0x30, 0x01, 0x00,</div><div class='add'>+	0x55, 0x97, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x16, 0x94, 0xa2, 0x40,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x80, 0x4b, 0x8f, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x4c, 0x8f, 0xb0, 0x01, 0x00, 0x04, 0x00, 0xa2, 0x05,</div><div class='add'>+	0x48, 0x6d, 0x00, 0x00, 0x2d, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00,</div><div class='add'>+	0x2e, 0x00, 0x2f, 0xf3, 0x84, 0xb0, 0x01, 0x00, 0x1c, 0x94, 0xa2, 0xf3,</div><div class='add'>+	0x96, 0x30, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x01, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x2d, 0x00, 0x2a, 0x41, 0xe7, 0xd1, 0x01, 0x00, 0xd4, 0x00, 0x3d, 0x41,</div><div class='add'>+	0x85, 0xe0, 0x01, 0x00, 0x0b, 0x00, 0x00, 0xf2, 0x00, 0xe4, 0x01, 0x00,</div><div class='add'>+	0x22, 0x94, 0x22, 0x5a, 0x01, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x1f, 0x90, 0x01, 0x00, 0x23, 0x94, 0x00, 0x5a, 0x01, 0x80, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x1f, 0x80, 0x01, 0x00, 0x00, 0x00, 0x63, 0x41,</div><div class='add'>+	0x85, 0xc0, 0x01, 0x00, 0x26, 0x94, 0xa0, 0xa5, 0x85, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x63, 0x40, 0x85, 0xb0, 0x01, 0x00, 0x12, 0x04, 0x00, 0x40,</div><div class='add'>+	0x89, 0x98, 0x01, 0x00, 0x02, 0x99, 0x00, 0x00, 0x8a, 0x30, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0xa0, 0xa5,</div><div class='add'>+	0x85, 0x6c, 0x01, 0x00, 0x00, 0x00, 0xe3, 0x40, 0x85, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x0c, 0x80, 0x00, 0x03, 0x42, 0xc9, 0x01, 0x00, 0x12, 0x00, 0x00, 0x40,</div><div class='add'>+	0x87, 0x98, 0x01, 0x00, 0x78, 0x98, 0x00, 0xf0, 0x8c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x22, 0x5f, 0x1f, 0x7c, 0x00, 0x00, 0x3b, 0x94, 0x22, 0x40,</div><div class='add'>+	0x0f, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x2f, 0x05, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x22, 0x5a, 0x1f, 0x7c, 0x00, 0x00, 0x10, 0x00, 0x00, 0xf0,</div><div class='add'>+	0x98, 0xf4, 0x01, 0x00, 0x04, 0x00, 0xa2, 0x07, 0x98, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x10, 0x00, 0x00, 0x0c, 0x98, 0xf4, 0x01, 0x00, 0x04, 0x00, 0xa2, 0x07,</div><div class='add'>+	0x98, 0x6c, 0x00, 0x00, 0x38, 0x94, 0xa2, 0x4b, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x39, 0x94, 0x22, 0xf0, 0x18, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x60, 0x4b,</div><div class='add'>+	0x19, 0x90, 0x01, 0x00, 0x3d, 0x95, 0x00, 0x07, 0x10, 0x30, 0x01, 0x00,</div><div class='add'>+	0x2f, 0x83, 0x00, 0x40, 0x05, 0xb0, 0x00, 0x00, 0x3d, 0x94, 0x22, 0x5a,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0xa5, 0x94, 0x00, 0x40, 0x81, 0x30, 0x01, 0x00,</div><div class='add'>+	0x2f, 0x83, 0x00, 0x40, 0x05, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x22, 0x5f,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x2f, 0x05, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x60, 0x4b, 0x19, 0x90, 0x01, 0x00, 0x04, 0x00, 0x22, 0x5a,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x04, 0x00, 0x22, 0x40, 0x0f, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x10, 0x00, 0x00, 0xf0, 0x96, 0xf4, 0x01, 0x00, 0x04, 0x00, 0xa2, 0x07,</div><div class='add'>+	0x96, 0x6c, 0x00, 0x00, 0x10, 0x00, 0x00, 0x0c, 0x96, 0xf4, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa2, 0x07, 0x96, 0x6c, 0x00, 0x00, 0x3d, 0x95, 0x00, 0x07,</div><div class='add'>+	0x10, 0x30, 0x01, 0x00, 0x2f, 0x83, 0x00, 0x40, 0x05, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x22, 0x5f, 0x1f, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x2f, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x60, 0x4b, 0x19, 0x90, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x22, 0x5a, 0x1f, 0x7c, 0x00, 0x00, 0x04, 0x00, 0x22, 0x40,</div><div class='add'>+	0x0f, 0x6c, 0x00, 0x00, 0x10, 0x00, 0x00, 0xf0, 0x96, 0xf4, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa2, 0x07, 0x96, 0x6c, 0x00, 0x00, 0x10, 0x00, 0x00, 0x0c,</div><div class='add'>+	0x96, 0xf4, 0x01, 0x00, 0x04, 0x00, 0xa2, 0x07, 0x96, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x3d, 0x95, 0x00, 0x07, 0x10, 0x30, 0x01, 0x00, 0x00, 0x00, 0x80, 0x40,</div><div class='add'>+	0x05, 0xb0, 0x01, 0x00, 0x54, 0x94, 0x33, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x57, 0x94, 0xa1, 0xad, 0x95, 0x20, 0x00, 0x00, 0x69, 0x94, 0x13, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x13, 0x4a, 0x5a, 0x83, 0x01, 0x00,</div><div class='add'>+	0x30, 0x00, 0x39, 0x45, 0x95, 0xe0, 0x01, 0x00, 0x04, 0x00, 0xa2, 0x5f,</div><div class='add'>+	0x5f, 0x7c, 0x00, 0x00, 0x04, 0x00, 0xa2, 0x5e, 0x5f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x1f, 0x00, 0x00, 0x0f, 0x5e, 0xd8, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5a,</div><div class='add'>+	0x5f, 0x90, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5e, 0x5f, 0x90, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x45, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x04,</div><div class='add'>+	0x48, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x05, 0x4a, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x0c, 0x58, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x07,</div><div class='add'>+	0x4e, 0xb0, 0x01, 0x00, 0x19, 0x85, 0x00, 0x40, 0x5d, 0x98, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa2, 0x44, 0x5f, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x58,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4a, 0x62, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0xa8, 0x41, 0x97, 0xb0, 0x00, 0x00, 0x66, 0x94, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x97, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa2, 0x40, 0x05, 0x6c, 0x00, 0x00, 0x15, 0x99, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x6c, 0x94, 0x60, 0x07, 0x96, 0x30, 0x00, 0x00,</div><div class='add'>+	0xff, 0xff, 0x00, 0x4b, 0x84, 0x89, 0x01, 0x00, 0x00, 0x00, 0x70, 0xc2,</div><div class='add'>+	0x24, 0xb0, 0x01, 0x00, 0x79, 0x94, 0xa2, 0x45, 0x25, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x70, 0x94, 0x31, 0x20, 0x85, 0x30, 0x00, 0x00, 0x7a, 0x94, 0x22, 0x12,</div><div class='add'>+	0x48, 0x7f, 0x00, 0x00, 0x58, 0x04, 0x11, 0x12, 0x48, 0x03, 0x01, 0x00,</div><div class='add'>+	0x10, 0x00, 0x00, 0x12, 0x96, 0xe4, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4b,</div><div class='add'>+	0x1e, 0x94, 0x01, 0x00, 0x17, 0x04, 0x00, 0x40, 0x89, 0x98, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x12, 0x8a, 0xb0, 0x01, 0x00, 0x02, 0x99, 0x00, 0x5f,</div><div class='add'>+	0x8b, 0x10, 0x01, 0x00, 0x00, 0x00, 0x80, 0x5a, 0x1f, 0x90, 0x01, 0x00,</div><div class='add'>+	0x79, 0x94, 0x31, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb4,</div><div class='add'>+	0x24, 0xb0, 0x01, 0x00, 0x7a, 0x94, 0x22, 0x12, 0x48, 0x7f, 0x00, 0x00,</div><div class='add'>+	0x58, 0x04, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x17, 0x04, 0x00, 0x40,</div><div class='add'>+	0x89, 0x98, 0x01, 0x00, 0x02, 0x99, 0x00, 0x12, 0x8a, 0x30, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x2f, 0x05, 0x48, 0xb1, 0x01, 0x00, 0x89, 0x94, 0x0b, 0xf0,</div><div class='add'>+	0x84, 0x30, 0x00, 0x00, 0x00, 0x00, 0x11, 0x12, 0x48, 0x83, 0x01, 0x00,</div><div class='add'>+	0x86, 0x94, 0x22, 0x50, 0x85, 0x70, 0x00, 0x00, 0x5e, 0x01, 0x00, 0x40,</div><div class='add'>+	0x43, 0x99, 0x01, 0x00, 0xae, 0x96, 0x00, 0xf2, 0x96, 0x30, 0x01, 0x00,</div><div class='add'>+	0x93, 0x04, 0x00, 0x12, 0x94, 0x30, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5a,</div><div class='add'>+	0x1f, 0x90, 0x01, 0x00, 0x10, 0x00, 0x00, 0x12, 0x96, 0xe4, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x4b, 0x1e, 0x94, 0x01, 0x00, 0x10, 0x00, 0x00, 0x42,</div><div class='add'>+	0x10, 0xf4, 0x01, 0x00, 0x04, 0x00, 0x22, 0x08, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0xb7, 0x3f, 0x43, 0x11, 0xf0, 0x01, 0x00, 0x07, 0x00, 0x00, 0x08,</div><div class='add'>+	0x8a, 0x88, 0x01, 0x00, 0x8d, 0x94, 0x30, 0xa1, 0x0c, 0x30, 0x00, 0x00,</div><div class='add'>+	0x90, 0x94, 0x22, 0x45, 0xe6, 0x7d, 0x00, 0x00, 0x7a, 0x94, 0x10, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x2a, 0x45, 0xe6, 0x91, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x10, 0x12, 0x48, 0x83, 0x01, 0x00, 0x04, 0x00, 0xa2, 0x05,</div><div class='add'>+	0x48, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x11, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x60, 0x4b, 0x85, 0x80, 0x01, 0x00, 0x5e, 0x01, 0x00, 0x40,</div><div class='add'>+	0x43, 0x99, 0x01, 0x00, 0xae, 0x96, 0x00, 0xf2, 0x96, 0x30, 0x01, 0x00,</div><div class='add'>+	0x00, 0x80, 0x00, 0x10, 0x44, 0xc9, 0x01, 0x00, 0xd8, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0x98, 0x01, 0x00, 0x2e, 0x00, 0x2d, 0x05, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x9c, 0x94, 0x22, 0x40, 0xe7, 0x6d, 0x00, 0x00, 0x80, 0x00, 0x00, 0x40,</div><div class='add'>+	0x80, 0xc8, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x09, 0x00, 0x00, 0x08, 0x86, 0xe4, 0x01, 0x00, 0x00, 0x00, 0x68, 0xa7,</div><div class='add'>+	0x87, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x10, 0x62, 0xb1, 0x01, 0x00, 0xa0, 0x94, 0xa8, 0x05,</div><div class='add'>+	0xe0, 0x31, 0x00, 0x00, 0x10, 0x00, 0x00, 0x12, 0x96, 0xe4, 0x01, 0x00,</div><div class='add'>+	0x00, 0x14, 0x00, 0x4b, 0x96, 0xdc, 0x01, 0x00, 0x00, 0x00, 0x80, 0x4b,</div><div class='add'>+	0x1e, 0x94, 0x01, 0x00, 0x04, 0x00, 0x22, 0x5a, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x10, 0x00, 0x00, 0x0f, 0x84, 0xf4, 0x01, 0x00, 0x1f, 0x00, 0x00, 0x42,</div><div class='add'>+	0x84, 0x88, 0x01, 0x00, 0xaa, 0x94, 0x22, 0x40, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0xab, 0x94, 0x00, 0x42, 0x68, 0xb1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42,</div><div class='add'>+	0x6a, 0xb1, 0x01, 0x00, 0xab, 0x94, 0x31, 0x5a, 0x1f, 0x00, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa2, 0x42, 0x48, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x91, 0x42,</div><div class='add'>+	0x48, 0x93, 0x01, 0x00, 0xae, 0x94, 0x35, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x6d, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00, 0xb4, 0x94, 0x28, 0xb1,</div><div class='add'>+	0x2c, 0x30, 0x00, 0x00, 0xaf, 0x94, 0x22, 0x4d, 0x75, 0x7d, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x2d, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x95, 0x40,</div><div class='add'>+	0x11, 0xb0, 0x01, 0x00, 0x6d, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00,</div><div class='add'>+	0xb4, 0x94, 0xa8, 0xb1, 0x10, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16,</div><div class='add'>+	0x80, 0xb2, 0x01, 0x00, 0x04, 0x00, 0x27, 0x08, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x95, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x7f, 0x00, 0x00, 0x40,</div><div class='add'>+	0x61, 0x99, 0x01, 0x00, 0xbf, 0x94, 0x28, 0xb1, 0x10, 0x30, 0x00, 0x00,</div><div class='add'>+	0xb9, 0x94, 0x9f, 0xba, 0x80, 0x32, 0x00, 0x00, 0x15, 0x00, 0x00, 0x40,</div><div class='add'>+	0x89, 0x98, 0x01, 0x00, 0x02, 0x99, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x40, 0x11, 0xb0, 0x01, 0x00, 0x04, 0x00, 0x22, 0x5c,</div><div class='add'>+	0x11, 0x7c, 0x00, 0x00, 0x04, 0x00, 0xa2, 0x5a, 0x11, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x22, 0x08, 0x48, 0x06, 0x00, 0x00, 0x00, 0x00, 0x80, 0x24,</div><div class='add'>+	0x11, 0x84, 0x01, 0x00, 0x04, 0x00, 0xa2, 0x5c, 0x01, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa2, 0x5a, 0x01, 0x7c, 0x00, 0x00, 0x04, 0x00, 0x22, 0x00,</div><div class='add'>+	0x48, 0x06, 0x00, 0x00, 0x04, 0x00, 0x1f, 0xbb, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x5f, 0x61, 0xb1, 0x01, 0x00, 0x00, 0x10, 0x00, 0x00,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x00, 0x00, 0xa8, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xc8, 0x94, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xac, 0x94, 0x00, 0x40,</div><div class='add'>+	0x47, 0x99, 0x01, 0x00, 0xcc, 0x94, 0x32, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0xd4, 0x94, 0x22, 0xf8, 0x96, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8,</div><div class='add'>+	0x90, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x92, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x48, 0x80, 0xb2, 0x01, 0x00, 0x04, 0x00, 0x27, 0x49,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x01, 0x00, 0x00, 0x4b, 0xf0, 0xcd, 0x01, 0x00,</div><div class='add'>+	0x20, 0x00, 0x92, 0x48, 0xe0, 0xc9, 0x01, 0x00, 0x6c, 0x00, 0x00, 0x40,</div><div class='add'>+	0x61, 0x99, 0x01, 0x00, 0xd8, 0x94, 0x28, 0xb1, 0x92, 0x30, 0x00, 0x00,</div><div class='add'>+	0xd4, 0x94, 0x22, 0x4c, 0x75, 0x7d, 0x00, 0x00, 0x04, 0x00, 0x12, 0x40,</div><div class='add'>+	0x91, 0xb0, 0x00, 0x00, 0x6c, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00,</div><div class='add'>+	0xd8, 0x94, 0xa8, 0xb1, 0x90, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x49,</div><div class='add'>+	0x80, 0xb2, 0x01, 0x00, 0x04, 0x00, 0x27, 0x48, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0xff, 0x00, 0x00, 0x48, 0x96, 0x88, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4b,</div><div class='add'>+	0x90, 0xd0, 0x01, 0x00, 0x01, 0x00, 0x00, 0x4b, 0xf0, 0xcd, 0x01, 0x00,</div><div class='add'>+	0x20, 0x00, 0x00, 0x48, 0xf0, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x92, 0x49,</div><div class='add'>+	0xe0, 0xb1, 0x01, 0x00, 0x0c, 0x00, 0x2d, 0x10, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xff, 0x07, 0x00, 0x08, 0x82, 0x8c, 0x01, 0x00, 0x04, 0x00, 0xa2, 0x5c,</div><div class='add'>+	0x83, 0x7c, 0x00, 0x00, 0xff, 0x07, 0x00, 0xf0, 0x00, 0x8c, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa2, 0x5c, 0x01, 0x7c, 0x00, 0x00, 0x04, 0x00, 0x22, 0x40,</div><div class='add'>+	0x01, 0x6c, 0x00, 0x00, 0x00, 0x00, 0xa2, 0x41, 0x00, 0xec, 0x00, 0x00,</div><div class='add'>+	0xea, 0x94, 0x22, 0x1a, 0x00, 0x6c, 0x00, 0x00, 0xc3, 0x94, 0x00, 0x00,</div><div class='add'>+	0x34, 0x30, 0x01, 0x00, 0x00, 0x00, 0x00, 0x50, 0x49, 0xc1, 0x01, 0x00,</div><div class='add'>+	0xe4, 0x94, 0xa2, 0x41, 0x23, 0x50, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x0c, 0x00, 0x2d, 0x10, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xff, 0x07, 0x00, 0x15, 0x82, 0x8c, 0x01, 0x00, 0x04, 0x00, 0xa2, 0x5c,</div><div class='add'>+	0x83, 0x7c, 0x00, 0x00, 0xff, 0x07, 0x00, 0xf0, 0x00, 0x8c, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa2, 0x5c, 0x01, 0x7c, 0x00, 0x00, 0x04, 0x00, 0x22, 0x40,</div><div class='add'>+	0x01, 0x6c, 0x00, 0x00, 0x00, 0x00, 0xa2, 0x41, 0x00, 0xec, 0x00, 0x00,</div><div class='add'>+	0xf6, 0x94, 0x22, 0x0d, 0x00, 0x6c, 0x00, 0x00, 0xc3, 0x94, 0x00, 0x00,</div><div class='add'>+	0x1a, 0x30, 0x01, 0x00, 0x00, 0x00, 0x00, 0x50, 0x49, 0xc1, 0x01, 0x00,</div><div class='add'>+	0xf0, 0x94, 0xa2, 0x41, 0x23, 0x50, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0xfb, 0x94, 0x83, 0x1e, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x44, 0x19, 0x90, 0x01, 0x00, 0x24, 0x00, 0x2d, 0x01,</div><div class='add'>+	0x2c, 0xb0, 0x01, 0x00, 0x28, 0x00, 0x2d, 0xf0, 0x16, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x22, 0x00, 0x2d, 0xf0, 0x26, 0xb0, 0x01, 0x00, 0x14, 0x00, 0x2f, 0xf2,</div><div class='add'>+	0x0c, 0xb0, 0x01, 0x00, 0x04, 0x00, 0xa2, 0xf0, 0x14, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x20, 0x01, 0x14, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40,</div><div class='add'>+	0xe1, 0xb1, 0x01, 0x00, 0x30, 0x00, 0x00, 0x40, 0x97, 0x98, 0x01, 0x00,</div><div class='add'>+	0x60, 0x97, 0x2e, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0x04, 0x95, 0xa2, 0x41, 0x97, 0x50, 0x00, 0x00,</div><div class='add'>+	0x64, 0x97, 0x3e, 0x43, 0x9d, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x80, 0x40,</div><div class='add'>+	0xe1, 0xb1, 0x01, 0x00, 0x64, 0x97, 0x3e, 0x43, 0x9d, 0xe0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x0b, 0xe8, 0xb1, 0x01, 0x00, 0x64, 0x97, 0x3f, 0x43,</div><div class='add'>+	0x9d, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x16, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x40, 0xe1, 0xb1, 0x01, 0x00, 0x64, 0x97, 0x3f, 0x43,</div><div class='add'>+	0x9d, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf4, 0x16, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x40, 0xe1, 0xb1, 0x01, 0x00, 0x60, 0x17, 0x3d, 0x43,</div><div class='add'>+	0x9d, 0xe0, 0x01, 0x00, 0x10, 0x00, 0x80, 0xa1, 0x16, 0xe4, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa2, 0x07, 0x16, 0x6c, 0x00, 0x00, 0x1a, 0x04, 0x00, 0x40,</div><div class='add'>+	0x89, 0x98, 0x01, 0x00, 0x10, 0x00, 0x00, 0x0b, 0x8a, 0xe4, 0x01, 0x00,</div><div class='add'>+	0x02, 0x99, 0x00, 0x0d, 0x8a, 0x14, 0x01, 0x00, 0x00, 0xb5, 0x00, 0x0d,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0x17, 0x95, 0x30, 0x47, 0x17, 0x04, 0x00, 0x00,</div><div class='add'>+	0x1a, 0x95, 0xa2, 0x0b, 0xe6, 0x7d, 0x00, 0x00, 0x00, 0x00, 0x90, 0x42,</div><div class='add'>+	0x81, 0xb0, 0x01, 0x00, 0x00, 0xb7, 0x00, 0x0d, 0x46, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x1e, 0x95, 0xa2, 0x0b, 0xe6, 0x7d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0b,</div><div class='add'>+	0xe6, 0x91, 0x01, 0x00, 0x00, 0x00, 0x90, 0x41, 0x81, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x10, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x1f, 0x95, 0x40, 0x07,</div><div class='add'>+	0x96, 0x30, 0x00, 0x00, 0x9d, 0x04, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x29, 0x95, 0xa2, 0x45, 0x95, 0x7c, 0x00, 0x00, 0x01, 0x97, 0x3f, 0x41,</div><div class='add'>+	0x95, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf3, 0x96, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4e, 0xe6, 0xb1, 0x01, 0x00, 0x40, 0x97, 0x3e, 0x40,</div><div class='add'>+	0x97, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4e, 0xe6, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x40, 0x97, 0x3e, 0x40, 0x9d, 0xe0, 0x01, 0x00, 0x3c, 0x95, 0x00, 0x3b,</div><div class='add'>+	0xe7, 0xb1, 0x00, 0x00, 0x29, 0x95, 0x30, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x33, 0x95, 0xa2, 0x0b, 0xe6, 0x7d, 0x00, 0x00, 0x00, 0xb5, 0x00, 0x0d,</div><div class='add'>+	0x46, 0xc9, 0x01, 0x00, 0x2f, 0x95, 0xa2, 0x0b, 0xe6, 0x7d, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x10, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x98, 0x42,</div><div class='add'>+	0x81, 0xb0, 0x01, 0x00, 0x00, 0xb7, 0x00, 0x0d, 0x46, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x0b, 0xe6, 0x91, 0x01, 0x00, 0x00, 0x00, 0x10, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x98, 0x41, 0x81, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x21, 0xa2, 0x95, 0x20, 0x00, 0x00, 0x00, 0x00, 0x10, 0x4a,</div><div class='add'>+	0x44, 0x83, 0x01, 0x00, 0x00, 0x97, 0x3e, 0x41, 0x95, 0xe0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4e, 0xf6, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4e,</div><div class='add'>+	0xe6, 0xb1, 0x01, 0x00, 0x40, 0x97, 0x3e, 0x40, 0x9d, 0xe0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x3b, 0xe7, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4a,</div><div class='add'>+	0x90, 0xb1, 0x01, 0x00, 0xff, 0xff, 0x00, 0x07, 0x92, 0x89, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x98, 0x40, 0x81, 0xb0, 0x01, 0x00, 0x11, 0x04, 0x00, 0x40,</div><div class='add'>+	0x89, 0x98, 0x01, 0x00, 0x02, 0x99, 0x00, 0x08, 0x8a, 0x30, 0x01, 0x00,</div><div class='add'>+	0x03, 0x00, 0x00, 0x08, 0x86, 0xf4, 0x01, 0x00, 0x00, 0xb7, 0x00, 0x43,</div><div class='add'>+	0x46, 0xc9, 0x01, 0x00, 0x07, 0x00, 0x00, 0x08, 0x82, 0x88, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x22, 0x08, 0x80, 0x32, 0x00, 0x00, 0x04, 0x00, 0x22, 0x41,</div><div class='add'>+	0xe6, 0x7d, 0x00, 0x00, 0x44, 0x95, 0x40, 0x08, 0x96, 0x30, 0x00, 0x00,</div><div class='add'>+	0x9d, 0x04, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x52, 0x95, 0x22, 0x45,</div><div class='add'>+	0x95, 0x7c, 0x00, 0x00, 0x4d, 0x95, 0x22, 0x5a, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x10, 0x00, 0x00, 0x0f, 0x96, 0xf4, 0x01, 0x00, 0x49, 0x95, 0x31, 0x5f,</div><div class='add'>+	0x97, 0x04, 0x00, 0x00, 0x04, 0x00, 0xa2, 0x4b, 0x48, 0x7f, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x11, 0x4b, 0x48, 0x93, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4b,</div><div class='add'>+	0x6a, 0xb1, 0x01, 0x00, 0x4d, 0x95, 0x30, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x22, 0x41, 0xe6, 0x7d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0xe6, 0x81, 0x01, 0x00, 0x00, 0x00, 0x10, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x98, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x97, 0x3f, 0x41,</div><div class='add'>+	0x95, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf3, 0x96, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x40, 0x97, 0x3d, 0x40, 0x97, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x63, 0xf3,</div><div class='add'>+	0x88, 0xb0, 0x01, 0x00, 0x5b, 0x95, 0xa2, 0x3b, 0x89, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4a, 0x90, 0xb1, 0x01, 0x00, 0x01, 0x00, 0x00, 0xa6,</div><div class='add'>+	0x92, 0xb1, 0x01, 0x00, 0x04, 0x00, 0xa2, 0x4a, 0x44, 0x7f, 0x00, 0x00,</div><div class='add'>+	0x5c, 0x95, 0x18, 0x4a, 0x44, 0x93, 0x00, 0x00, 0x00, 0x00, 0x18, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x3f, 0x04, 0x00, 0x40, 0x89, 0x98, 0x01, 0x00,</div><div class='add'>+	0x16, 0x00, 0x00, 0x12, 0x8a, 0xe4, 0x01, 0x00, 0x02, 0x99, 0x00, 0x4b,</div><div class='add'>+	0x8a, 0x14, 0x01, 0x00, 0x30, 0x00, 0x39, 0x45, 0x97, 0xe0, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa2, 0x5f, 0x5f, 0x7c, 0x00, 0x00, 0x04, 0x00, 0x22, 0x5e,</div><div class='add'>+	0x5f, 0x7c, 0x00, 0x00, 0x1f, 0x04, 0x00, 0x2f, 0x7e, 0xd9, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa6, 0x40, 0x81, 0x32, 0x00, 0x00, 0x68, 0x95, 0x22, 0x5a,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x1f, 0x04, 0x00, 0x0f, 0x98, 0xd8, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4c, 0x5e, 0x94, 0x01, 0x00, 0x6a, 0x95, 0x00, 0x05,</div><div class='add'>+	0x4a, 0xb0, 0x00, 0x00, 0x1f, 0x04, 0x00, 0xa7, 0x5e, 0x84, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x4b, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5e,</div><div class='add'>+	0x5f, 0x90, 0x01, 0x00, 0x04, 0x00, 0xa2, 0x08, 0x4e, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x58, 0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4b,</div><div class='add'>+	0x62, 0xb1, 0x01, 0x00, 0x00, 0x00, 0xa8, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x6d, 0x95, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x33, 0x04, 0x00, 0x40,</div><div class='add'>+	0x89, 0x98, 0x01, 0x00, 0x02, 0x99, 0x00, 0x07, 0x8a, 0x30, 0x01, 0x00,</div><div class='add'>+	0x72, 0x95, 0x40, 0x07, 0x96, 0x30, 0x00, 0x00, 0x9d, 0x04, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x76, 0x95, 0x22, 0x45, 0x95, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x98, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x04, 0x00, 0xa2, 0x4a,</div><div class='add'>+	0x44, 0x7f, 0x00, 0x00, 0x9b, 0x04, 0x00, 0x4a, 0x44, 0x13, 0x01, 0x00,</div><div class='add'>+	0x00, 0x97, 0x3f, 0x41, 0x95, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf3,</div><div class='add'>+	0x96, 0xb0, 0x01, 0x00, 0x40, 0x97, 0x3d, 0x40, 0x97, 0xe0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x63, 0xf3, 0x88, 0xb0, 0x01, 0x00, 0x30, 0x00, 0x38, 0x45,</div><div class='add'>+	0x97, 0xe0, 0x01, 0x00, 0x04, 0x00, 0xa2, 0x5f, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x22, 0x5e, 0x1f, 0x7c, 0x00, 0x00, 0x04, 0x00, 0x20, 0xaa,</div><div class='add'>+	0x0f, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5f, 0x0f, 0x90, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x58, 0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4b,</div><div class='add'>+	0x62, 0xb1, 0x01, 0x00, 0x82, 0x95, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x78, 0x95, 0xa2, 0x3b, 0x89, 0x6c, 0x00, 0x00, 0x30, 0x00, 0x38, 0x45,</div><div class='add'>+	0x9d, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x98, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x22, 0x08, 0x80, 0x32, 0x00, 0x00, 0x03, 0x00, 0x00, 0x08,</div><div class='add'>+	0x94, 0xf4, 0x01, 0x00, 0x00, 0xb7, 0x00, 0x4a, 0x46, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x07, 0x00, 0x00, 0x08, 0x96, 0x88, 0x01, 0x00, 0x04, 0x00, 0x22, 0x4b,</div><div class='add'>+	0xe6, 0x7d, 0x00, 0x00, 0x93, 0x04, 0x00, 0x12, 0x94, 0x30, 0x01, 0x00,</div><div class='add'>+	0x3d, 0x95, 0x00, 0x5a, 0x1f, 0x00, 0x01, 0x00, 0x00, 0x00, 0x80, 0x5a,</div><div class='add'>+	0x1f, 0x90, 0x01, 0x00, 0x11, 0x00, 0x00, 0x4a, 0xe6, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x30, 0x00, 0x00, 0x4a, 0x80, 0xce, 0x01, 0x00, 0x04, 0x00, 0x24, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x34, 0x00, 0x2f, 0x4f, 0x95, 0x84, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf3, 0x96, 0xb0, 0x01, 0x00, 0x01, 0x00, 0x63, 0x4b,</div><div class='add'>+	0x84, 0xc8, 0x01, 0x00, 0x00, 0x00, 0xa0, 0x43, 0x85, 0x6c, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0xe3, 0x40, 0x85, 0xb0, 0x01, 0x00, 0x30, 0x00, 0x2d, 0x44,</div><div class='add'>+	0x1f, 0x90, 0x01, 0x00, 0x32, 0x00, 0x2d, 0xf2, 0x2a, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x26, 0x40, 0x81, 0x32, 0x00, 0x00, 0x04, 0x00, 0x22, 0xf2,</div><div class='add'>+	0x02, 0x30, 0x00, 0x00, 0x17, 0x94, 0x00, 0x10, 0x32, 0x30, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x22, 0x00, 0x80, 0x32, 0x00, 0x00, 0x04, 0x00, 0x22, 0x42,</div><div class='add'>+	0x19, 0x7c, 0x00, 0x00, 0x32, 0x00, 0xa0, 0x40, 0xe5, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x97, 0xb0, 0x01, 0x00, 0xf0, 0x07, 0x00, 0x40,</div><div class='add'>+	0x99, 0x98, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4a, 0x02, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x50, 0x03, 0xd0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x97, 0xc0, 0x01, 0x00, 0x00, 0x00, 0xa3, 0x4c, 0x02, 0xd0, 0x00, 0x00,</div><div class='add'>+	0xa3, 0x95, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa8,</div><div class='add'>+	0x36, 0xb0, 0x01, 0x00, 0xb4, 0x95, 0x22, 0x41, 0x03, 0x50, 0x00, 0x00,</div><div class='add'>+	0x00, 0x80, 0x00, 0x10, 0x44, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x50,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0x70, 0x00, 0x00, 0x03, 0xf0, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x42, 0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xb1, 0x01, 0x00, 0xac, 0x95, 0xa8, 0x00, 0xe0, 0x31, 0x00, 0x00,</div><div class='add'>+	0x23, 0x83, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0xc3, 0x94, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x7c, 0x80, 0x00, 0x03, 0x42, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x22, 0x40, 0xe1, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0,</div><div class='add'>+	0x00, 0xb0, 0x01, 0x00, 0xa7, 0x95, 0x00, 0x5c, 0x01, 0x80, 0x00, 0x00,</div><div class='add'>+	0xc3, 0x94, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0x1b,</div><div class='add'>+	0x10, 0xb1, 0x00, 0x00, 0x68, 0x01, 0x2d, 0x06, 0x82, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf2, 0x82, 0xc0, 0x01, 0x00, 0x00, 0x80, 0x00, 0x03,</div><div class='add'>+	0x46, 0xc9, 0x01, 0x00, 0xb9, 0x94, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0xe2, 0x95, 0x22, 0x40, 0x11, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x68, 0x08,</div><div class='add'>+	0x38, 0x96, 0x01, 0x00, 0x3a, 0x04, 0x00, 0x40, 0x89, 0x98, 0x01, 0x00,</div><div class='add'>+	0x02, 0x99, 0x00, 0x08, 0x8a, 0x30, 0x01, 0x00, 0xf0, 0x07, 0x00, 0x41,</div><div class='add'>+	0x82, 0xcc, 0x01, 0x00, 0xb9, 0x95, 0xaa, 0x41, 0x3b, 0x40, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf8, 0x10, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5c,</div><div class='add'>+	0x11, 0x80, 0x01, 0x00, 0x04, 0x00, 0xa3, 0x48, 0x3b, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x01, 0x00, 0x00, 0x1d, 0x04, 0xcc, 0x01, 0x00, 0xe0, 0x95, 0x26, 0x46,</div><div class='add'>+	0x23, 0x30, 0x00, 0x00, 0x08, 0x00, 0x00, 0x03, 0x12, 0xc8, 0x01, 0x00,</div><div class='add'>+	0x04, 0x80, 0x00, 0x03, 0x98, 0xc8, 0x01, 0x00, 0x04, 0x00, 0xa2, 0x4c,</div><div class='add'>+	0x42, 0x6d, 0x00, 0x00, 0x04, 0x00, 0xa2, 0x05, 0x48, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x64, 0x01, 0x20, 0xf0, 0xe0, 0xb1, 0x01, 0x00, 0xdf, 0x95, 0x22, 0x41,</div><div class='add'>+	0x05, 0x50, 0x00, 0x00, 0x20, 0x00, 0x00, 0x03, 0x48, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x0c, 0x00, 0x00, 0xf8, 0x86, 0xc8, 0x01, 0x00, 0x00, 0x00, 0x22, 0x44,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x43, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x09, 0xe0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0xa0, 0x00, 0x00, 0xa4, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0xd1, 0x95, 0xa8, 0x46, 0x1f, 0x10, 0x00, 0x00, 0xde, 0x95, 0x22, 0x41,</div><div class='add'>+	0x05, 0x50, 0x00, 0x00, 0xdc, 0x95, 0xa2, 0x41, 0x23, 0x50, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xa1, 0x1a, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0xd7, 0x95, 0xa8, 0x46, 0x23, 0x30, 0x00, 0x00, 0x23, 0x83, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x10, 0x00, 0x00, 0x03, 0x48, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x0d, 0x42, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0x13, 0xc0, 0x01, 0x00, 0xcc, 0x95, 0x00, 0x50, 0x49, 0xc1, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x05, 0x48, 0xb1, 0x01, 0x00, 0x04, 0x80, 0x00, 0x03,</div><div class='add'>+	0x1a, 0xc8, 0x01, 0x00, 0x04, 0x00, 0xa2, 0x05, 0x48, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x40, 0x81, 0xb2, 0x01, 0x00, 0xe0, 0x95, 0x22, 0x40,</div><div class='add'>+	0x3b, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x00, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xc3, 0x94, 0x00, 0x5c, 0x01, 0x00, 0x01, 0x00, 0xe2, 0x95, 0x00, 0x41,</div><div class='add'>+	0x3b, 0xd0, 0x00, 0x00, 0x00, 0x00, 0x8d, 0x47, 0x80, 0x32, 0x01, 0x00,</div><div class='add'>+	0xb0, 0x00, 0x2f, 0x5f, 0x13, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x60, 0xf0,</div><div class='add'>+	0x8c, 0xc0, 0x01, 0x00, 0x7c, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa3, 0xf0, 0x8c, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x80, 0x00, 0x03, 0x42, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf8, 0x94, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8,</div><div class='add'>+	0x8c, 0xb0, 0x01, 0x00, 0xf1, 0x95, 0x8c, 0xf8, 0x8e, 0x30, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x44, 0x19, 0x90, 0x01, 0x00, 0x04, 0x00, 0x22, 0xf8,</div><div class='add'>+	0x14, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x16, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf8, 0x26, 0xb0, 0x01, 0x00, 0x08, 0x00, 0x2e, 0xf8,</div><div class='add'>+	0x0c, 0xb0, 0x01, 0x00, 0x0c, 0x00, 0x2a, 0x4a, 0xe0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x28, 0x00, 0x00, 0x00, 0xe0, 0xc9, 0x01, 0x00, 0x10, 0x00, 0x20, 0x1b,</div><div class='add'>+	0xe0, 0xb1, 0x01, 0x00, 0xfe, 0x95, 0x20, 0x0a, 0x0c, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf8, 0x94, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8,</div><div class='add'>+	0x96, 0xb0, 0x01, 0x00, 0x20, 0x00, 0x20, 0xf0, 0xe4, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x18, 0x00, 0x20, 0x4a, 0xe0, 0xb1, 0x01, 0x00, 0x1c, 0x00, 0x20, 0x4b,</div><div class='add'>+	0xe0, 0xb1, 0x01, 0x00, 0xe6, 0x95, 0x00, 0x40, 0x13, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa2, 0x05, 0x48, 0x6d, 0x00, 0x00, 0x2c, 0x00, 0x2d, 0x42,</div><div class='add'>+	0x19, 0x90, 0x01, 0x00, 0x2e, 0x00, 0x2f, 0xf3, 0x82, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf3, 0x96, 0xb0, 0x01, 0x00, 0x05, 0x96, 0xa2, 0xa5,</div><div class='add'>+	0x97, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x80, 0x41, 0x95, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x08, 0x96, 0xa2, 0x40, 0x97, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x83, 0xb0, 0x01, 0x00, 0x2d, 0x00, 0x20, 0x40, 0xe7, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x63, 0x41, 0x97, 0xc0, 0x01, 0x00, 0xd4, 0x00, 0x3e, 0x41,</div><div class='add'>+	0x83, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41, 0x83, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x0d, 0x96, 0xa0, 0xa5, 0x83, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x83, 0xb0, 0x01, 0x00, 0x2c, 0x00, 0x20, 0x41, 0xe6, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x12, 0x96, 0x22, 0x40, 0x1f, 0x7c, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00,</div><div class='add'>+	0x98, 0xdc, 0x01, 0x00, 0x0b, 0x00, 0x00, 0x4c, 0xe4, 0xf5, 0x01, 0x00,</div><div class='add'>+	0x13, 0x96, 0x00, 0x40, 0x1f, 0x80, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00,</div><div class='add'>+	0xe4, 0xf5, 0x01, 0x00, 0x1e, 0x04, 0x00, 0x40, 0x89, 0x98, 0x01, 0x00,</div><div class='add'>+	0x02, 0x99, 0x00, 0x00, 0x8a, 0x30, 0x01, 0x00, 0x00, 0x00, 0x80, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0xcb, 0x94, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x00, 0x80, 0x00, 0x03, 0x42, 0xc9, 0x01, 0x00, 0x04, 0x00, 0x22, 0x40,</div><div class='add'>+	0xe1, 0x6d, 0x00, 0x00, 0x04, 0x80, 0x00, 0x03, 0x44, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x60, 0x41, 0x87, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x80, 0x00, 0x10, 0x44, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x50,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x48, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x49, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x03,</div><div class='add'>+	0xe0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x45, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x20, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00, 0x00, 0x00, 0xa8, 0x5d,</div><div class='add'>+	0x05, 0x90, 0x00, 0x00, 0x23, 0x96, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xcb, 0x94, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x00, 0x80, 0x00, 0x03,</div><div class='add'>+	0x44, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x26, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x43, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x80, 0x00, 0x10,</div><div class='add'>+	0x44, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x50, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x48, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x49,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x03, 0xe0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x45, 0x61, 0xb1, 0x01, 0x00, 0x20, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x00, 0x00, 0xa8, 0x5d, 0x05, 0x90, 0x00, 0x00,</div><div class='add'>+	0x33, 0x96, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0xa2, 0x05,</div><div class='add'>+	0x48, 0x6d, 0x00, 0x00, 0x04, 0x00, 0x82, 0x0c, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x2d, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00, 0x2e, 0x00, 0x2f, 0xf3,</div><div class='add'>+	0x84, 0xb0, 0x01, 0x00, 0x01, 0x00, 0x63, 0xf3, 0x96, 0xc8, 0x01, 0x00,</div><div class='add'>+	0x3d, 0x96, 0x9f, 0x41, 0x85, 0x50, 0x00, 0x00, 0x01, 0x00, 0x00, 0xa5,</div><div class='add'>+	0x85, 0xcc, 0x01, 0x00, 0x2d, 0x00, 0x20, 0x42, 0xe6, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa3, 0xa5, 0x97, 0x6c, 0x00, 0x00, 0xd4, 0x00, 0x3d, 0x41,</div><div class='add'>+	0x85, 0xe0, 0x01, 0x00, 0x0b, 0x00, 0x00, 0xf2, 0x98, 0xe4, 0x01, 0x00,</div><div class='add'>+	0x44, 0x96, 0x22, 0x40, 0x1f, 0x7c, 0x00, 0x00, 0x04, 0x00, 0x22, 0x5a,</div><div class='add'>+	0x99, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5a, 0x99, 0x80, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa2, 0x00, 0x98, 0x6c, 0x00, 0x00, 0x20, 0x04, 0x00, 0x40,</div><div class='add'>+	0x89, 0x98, 0x01, 0x00, 0x02, 0x99, 0x00, 0x00, 0x8a, 0x30, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x21, 0x04, 0x00, 0x40,</div><div class='add'>+	0x89, 0x98, 0x01, 0x00, 0x02, 0x99, 0x00, 0x00, 0x8a, 0x30, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa2, 0x00, 0x6a, 0x06, 0x00, 0x00, 0x5e, 0x01, 0x2d, 0x00,</div><div class='add'>+	0x80, 0xb0, 0x01, 0x00, 0x4f, 0x96, 0x52, 0x43, 0x81, 0x60, 0x00, 0x00,</div><div class='add'>+	0x02, 0x00, 0x00, 0xf2, 0x82, 0xf4, 0x01, 0x00, 0x50, 0x96, 0x00, 0x41,</div><div class='add'>+	0x80, 0x94, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5f, 0x81, 0x90, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x5e, 0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x62, 0xb1, 0x01, 0x00, 0x00, 0x00, 0xa8, 0x40, 0x95, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x51, 0x96, 0x9e, 0xbb, 0x80, 0x32, 0x00, 0x00, 0x56, 0x96, 0xa2, 0x40,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0xc3, 0x94, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x41, 0x95, 0xb0, 0x01, 0x00, 0x04, 0x00, 0x00, 0x15,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x54, 0x2b, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xfc, 0x24, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xfc,</div><div class='add'>+	0x38, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x3c, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xfe, 0x3a, 0xb0, 0x01, 0x00, 0x6b, 0x96, 0x9c, 0x17,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x60, 0x96, 0xa2, 0x4a, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x4c, 0x1f, 0x90, 0x01, 0x00, 0x0c, 0x00, 0x00, 0x1e,</div><div class='add'>+	0x98, 0xf4, 0x01, 0x00, 0x5f, 0x96, 0xa2, 0x48, 0x99, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x15, 0x42, 0xb1, 0x01, 0x00, 0x5f, 0x96, 0xa2, 0x8a,</div><div class='add'>+	0xf1, 0x6d, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x01, 0x02, 0xcc, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xfc, 0x3e, 0xb0, 0x01, 0x00, 0x01, 0x00, 0x00, 0xf4,</div><div class='add'>+	0x28, 0xcc, 0x01, 0x00, 0xcc, 0x00, 0x2d, 0x05, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x6a, 0x96, 0x20, 0xf0, 0x3e, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4b,</div><div class='add'>+	0x1f, 0x90, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4c, 0x2b, 0xc0, 0x01, 0x00,</div><div class='add'>+	0xbf, 0x00, 0x2d, 0x05, 0x48, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x80, 0xf3,</div><div class='add'>+	0x3a, 0xe0, 0x01, 0x00, 0x04, 0x00, 0xa2, 0x05, 0x48, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x10, 0x00, 0x00, 0x0c, 0x96, 0xf4, 0x01, 0x00, 0x04, 0x00, 0xa2, 0x07,</div><div class='add'>+	0x96, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x2e, 0x4b, 0x19, 0x90, 0x01, 0x00,</div><div class='add'>+	0x07, 0x00, 0x2a, 0x0c, 0xe4, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x80, 0x04,</div><div class='add'>+	0xe6, 0xb1, 0x01, 0x00, 0x18, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00,</div><div class='add'>+	0x1c, 0x00, 0x2d, 0xf0, 0x16, 0xb0, 0x01, 0x00, 0x20, 0x00, 0x2d, 0xf0,</div><div class='add'>+	0x26, 0xb0, 0x01, 0x00, 0x0c, 0x00, 0x2f, 0xf2, 0x0c, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0xa2, 0x06, 0x14, 0xec, 0x00, 0x00, 0x7a, 0x96, 0x22, 0x45,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x00, 0x00, 0xa3, 0x06, 0x2a, 0xec, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf8, 0x94, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0,</div><div class='add'>+	0x96, 0xb0, 0x01, 0x00, 0x0c, 0x00, 0x2d, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x2a, 0x4c, 0xe1, 0xc1, 0x01, 0x00, 0x30, 0x00, 0x00, 0x10,</div><div class='add'>+	0x48, 0xc9, 0x01, 0x00, 0x0a, 0x00, 0x00, 0x40, 0xf1, 0x99, 0x01, 0x00,</div><div class='add'>+	0x18, 0x00, 0x00, 0x05, 0xf0, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4a,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4b, 0xe0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x47, 0x61, 0xb1, 0x01, 0x00, 0xa0, 0x00, 0x00, 0xa4,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x84, 0x96, 0xa8, 0x5c, 0x1f, 0x10, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x05, 0x48, 0xb1, 0x01, 0x00, 0x04, 0x00, 0xa2, 0x95,</div><div class='add'>+	0x03, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x2e, 0x10, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x01, 0xf0, 0xcd, 0x01, 0x00, 0x40, 0x00, 0x00, 0x03,</div><div class='add'>+	0xf0, 0xc9, 0x01, 0x00, 0x40, 0x00, 0x00, 0x00, 0xe0, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x2e, 0x50, 0x49, 0xc1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x06,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x03, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x8f, 0x96, 0x62, 0x42, 0x61, 0x31, 0x00, 0x00, 0x20, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x90, 0x96, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x10, 0x00, 0x00, 0x10, 0x62, 0xc9, 0x01, 0x00, 0x92, 0x96, 0xa8, 0x00,</div><div class='add'>+	0xe0, 0x31, 0x00, 0x00, 0x00, 0x00, 0xf2, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa2, 0x95, 0x03, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x2e, 0x10,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x01, 0xf0, 0xcd, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x03, 0xf0, 0xc9, 0x01, 0x00, 0x40, 0x00, 0x00, 0x00,</div><div class='add'>+	0xe0, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x2e, 0x50, 0x49, 0xc1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x06, 0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x03,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x9d, 0x96, 0x62, 0x42, 0x61, 0x31, 0x00, 0x00,</div><div class='add'>+	0x20, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00, 0x9e, 0x96, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0xa0, 0x00, 0x00, 0xa4, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0xa0, 0x96, 0xa8, 0x00, 0xe0, 0x31, 0x00, 0x00, 0x00, 0x00, 0xf2, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x30, 0x80, 0x00, 0x4a, 0x44, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x06, 0xf1, 0xb1, 0x01, 0x00, 0xc0, 0xa8, 0x3d, 0x46,</div><div class='add'>+	0x0d, 0xe0, 0x01, 0x00, 0xff, 0x7f, 0x00, 0xa1, 0xf0, 0x89, 0x01, 0x00,</div><div class='add'>+	0x02, 0x00, 0x00, 0x09, 0x96, 0xf4, 0x01, 0x00, 0x00, 0x00, 0x00, 0x46,</div><div class='add'>+	0x97, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x60, 0xa8, 0x97, 0xc0, 0x01, 0x00,</div><div class='add'>+	0xaa, 0x96, 0x63, 0x42, 0x61, 0x31, 0x00, 0x00, 0x30, 0x00, 0x00, 0x4a,</div><div class='add'>+	0x62, 0xc9, 0x01, 0x00, 0xab, 0x96, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0xf3, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x99, 0x3f, 0x42,</div><div class='add'>+	0x97, 0xf0, 0x01, 0x00, 0xaf, 0x96, 0x65, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0xb7, 0x96, 0x22, 0xf3, 0x74, 0x06, 0x00, 0x00, 0x3f, 0x00, 0x00, 0xf3,</div><div class='add'>+	0x94, 0x88, 0x01, 0x00, 0x00, 0x00, 0x00, 0x07, 0xe7, 0x85, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x75, 0x55, 0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4a,</div><div class='add'>+	0x62, 0xb1, 0x01, 0x00, 0x00, 0x00, 0xa8, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xb4, 0x96, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0xf5, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x00, 0xa8, 0x36, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xc7, 0x96, 0x82, 0x41, 0x23, 0x40, 0x00, 0x00, 0xbc, 0x96, 0xa2, 0x44,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x98, 0x93, 0x00, 0x01, 0x8c, 0x30, 0x01, 0x00,</div><div class='add'>+	0x20, 0x80, 0x00, 0x10, 0x42, 0xc9, 0x01, 0x00, 0xc2, 0x96, 0x22, 0x40,</div><div class='add'>+	0xe3, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00, 0xbf, 0x96, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x23, 0x83, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x23, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x10,</div><div class='add'>+	0x32, 0xb0, 0x01, 0x00, 0xc7, 0x96, 0x22, 0x41, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0xe1, 0x94, 0x00, 0x43, 0x23, 0x30, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x23, 0xb0, 0x01, 0x00, 0xc9, 0x96, 0xa3, 0x15, 0x0c, 0x6c, 0x00, 0x00,</div><div class='add'>+	0xca, 0x96, 0x00, 0x06, 0x04, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15,</div><div class='add'>+	0x04, 0xb0, 0x01, 0x00, 0xcc, 0x96, 0x20, 0x02, 0x1a, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x0d, 0x04, 0xb0, 0x01, 0x00, 0x9b, 0x97, 0x00, 0x05,</div><div class='add'>+	0x48, 0x31, 0x01, 0x00, 0xf7, 0x96, 0x22, 0x02, 0x14, 0x50, 0x00, 0x00,</div><div class='add'>+	0xd0, 0x96, 0xa2, 0x02, 0x2a, 0x50, 0x00, 0x00, 0xf7, 0x96, 0xa2, 0x45,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0xd2, 0x96, 0x22, 0x02, 0x0c, 0x50, 0x00, 0x00,</div><div class='add'>+	0xdb, 0x96, 0x00, 0x02, 0x16, 0xc0, 0x00, 0x00, 0xda, 0x96, 0x22, 0x5c,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x30, 0x80, 0x00, 0x10, 0x42, 0xc9, 0x01, 0x00,</div><div class='add'>+	0xda, 0x96, 0x22, 0x40, 0xe3, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x47,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0xd6, 0x96, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0x23, 0x83, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x73, 0x96, 0x00, 0x5c, 0x1f, 0x00, 0x01, 0x00, 0xf7, 0x96, 0x22, 0x15,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x33, 0xc0, 0x01, 0x00,</div><div class='add'>+	0xf6, 0x96, 0xa2, 0x02, 0x1a, 0x50, 0x00, 0x00, 0xe7, 0x96, 0x22, 0x46,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x70, 0x80, 0x00, 0x03, 0x42, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x46, 0x1f, 0x80, 0x01, 0x00, 0xe7, 0x96, 0x22, 0x40,</div><div class='add'>+	0xe3, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00, 0xe3, 0x96, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x23, 0x83, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x05, 0x48, 0xb1, 0x01, 0x00, 0x0c, 0x80, 0x00, 0x03,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0x04, 0x00, 0x22, 0xf0, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x10, 0x00, 0x00, 0xf0, 0x10, 0xc8, 0x01, 0x00, 0x2f, 0x00, 0x2f, 0x5c,</div><div class='add'>+	0x11, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00, 0x47, 0xe7, 0x91, 0x01, 0x00,</div><div class='add'>+	0xf0, 0x07, 0x00, 0x40, 0x1b, 0x98, 0x01, 0x00, 0xb9, 0x96, 0x20, 0x15,</div><div class='add'>+	0x1a, 0x6c, 0x00, 0x00, 0x70, 0x00, 0x00, 0x03, 0x48, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x22, 0x50, 0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x03,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0xff, 0x07, 0x00, 0x08, 0xe0, 0x8d, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x42, 0x61, 0xb1, 0x01, 0x00, 0xa0, 0x00, 0x00, 0xa4,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0xf3, 0x96, 0xa8, 0x46, 0x1f, 0x10, 0x00, 0x00,</div><div class='add'>+	0xb9, 0x96, 0x00, 0x05, 0x48, 0xb1, 0x00, 0x00, 0xb9, 0x96, 0x00, 0x02,</div><div class='add'>+	0x10, 0xc0, 0x00, 0x00, 0xf9, 0x96, 0xa2, 0x44, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x98, 0x93, 0x00, 0x01, 0x8c, 0x30, 0x01, 0x00, 0x00, 0x00, 0x00, 0x1b,</div><div class='add'>+	0x10, 0xb1, 0x00, 0x00, 0x00, 0x80, 0x00, 0x10, 0x44, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x10, 0x00, 0x00, 0x40, 0xf1, 0x99, 0x01, 0x00, 0x10, 0x00, 0x00, 0x08,</div><div class='add'>+	0xf0, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x16, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x10, 0x00, 0x00, 0x03, 0xe0, 0xc9, 0x01, 0x00, 0x04, 0x00, 0xa2, 0x5c,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x45, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x20, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00, 0x00, 0x00, 0xa8, 0x5c,</div><div class='add'>+	0x1f, 0x90, 0x00, 0x00, 0x01, 0x97, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x17, 0x00, 0x00, 0xd0, 0xa2, 0xc9, 0x01, 0x00, 0x00, 0x00, 0xa2, 0x40,</div><div class='add'>+	0x27, 0xec, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xc3, 0x94, 0x00, 0x41, 0xa3, 0x41, 0x01, 0x00, 0x05, 0x97, 0x00, 0x41,</div><div class='add'>+	0x27, 0xd0, 0x00, 0x00, 0x36, 0x04, 0x00, 0x40, 0x89, 0x98, 0x01, 0x00,</div><div class='add'>+	0x02, 0x99, 0x00, 0x40, 0x8a, 0x30, 0x01, 0x00, 0x10, 0x00, 0x00, 0x07,</div><div class='add'>+	0x96, 0xe4, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4b, 0x80, 0x94, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x54, 0x61, 0xb1, 0x01, 0x00, 0x00, 0x80, 0x00, 0x40,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x00, 0x00, 0xa8, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x14, 0xbb, 0x80, 0x32, 0x00, 0x00, 0x0e, 0x97, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0xa2, 0x05, 0x48, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x64, 0x97, 0x00, 0x40, 0x2b, 0x30, 0x01, 0x00, 0xac, 0x00, 0x2d, 0x06,</div><div class='add'>+	0x16, 0xc0, 0x01, 0x00, 0x90, 0x00, 0x2d, 0xf0, 0x16, 0xc4, 0x01, 0x00,</div><div class='add'>+	0x18, 0x97, 0xa0, 0xf0, 0x16, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x17, 0xc0, 0x01, 0x00, 0x0e, 0x00, 0x00, 0xa2, 0x44, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x6c, 0xf0, 0x30, 0xb0, 0x01, 0x00, 0xac, 0x00, 0x2d, 0x40,</div><div class='add'>+	0x87, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x6c, 0xf0, 0x28, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x21, 0x97, 0x22, 0x4a, 0x19, 0x7c, 0x00, 0x00, 0x00, 0x30, 0x00, 0x43,</div><div class='add'>+	0x86, 0xc8, 0x01, 0x00, 0x00, 0x30, 0x00, 0x0b, 0x16, 0xc8, 0x01, 0x00,</div><div class='add'>+	0x21, 0x97, 0xa4, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x17, 0xc0, 0x01, 0x00, 0x44, 0x97, 0x22, 0x06, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x2f, 0x97, 0xa2, 0x06, 0x14, 0x6c, 0x00, 0x00, 0x2c, 0x97, 0x22, 0x48,</div><div class='add'>+	0x19, 0x7c, 0x00, 0x00, 0x26, 0x97, 0xa0, 0x41, 0x17, 0x40, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x17, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x31, 0xc0, 0x01, 0x00, 0x90, 0x00, 0x20, 0x18, 0xe0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x8b, 0x00, 0x2d, 0x48, 0x19, 0x80, 0x01, 0x00, 0x04, 0x00, 0xa2, 0x45,</div><div class='add'>+	0xe7, 0x7d, 0x00, 0x00, 0x8b, 0x00, 0x20, 0x45, 0xe7, 0x91, 0x01, 0x00,</div><div class='add'>+	0x2f, 0x97, 0x00, 0x40, 0x87, 0x90, 0x00, 0x00, 0x08, 0x00, 0x00, 0x43,</div><div class='add'>+	0x86, 0x98, 0x01, 0x00, 0x2f, 0x97, 0xa0, 0x48, 0x17, 0x40, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x17, 0xc0, 0x01, 0x00, 0xb0, 0x00, 0x00, 0x40,</div><div class='add'>+	0x43, 0x99, 0x01, 0x00, 0x10, 0x50, 0x00, 0x43, 0xfc, 0xc9, 0x01, 0x00,</div><div class='add'>+	0xa8, 0x97, 0x00, 0x30, 0x81, 0x30, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0xe5, 0xb1, 0x01, 0x00, 0x3a, 0x97, 0x22, 0x4a, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x08, 0x00, 0x00, 0xa2, 0x44, 0xc9, 0x01, 0x00, 0xcc, 0x00, 0x2d, 0xab,</div><div class='add'>+	0xf9, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xab, 0x17, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x39, 0x97, 0xa0, 0xf0, 0x16, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x17, 0xc0, 0x01, 0x00, 0x3e, 0x97, 0x64, 0xf0, 0x82, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xa4, 0x00, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00, 0x3e, 0x97, 0xa2, 0xf2,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0xe5, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x8c, 0x00, 0x20, 0x18, 0xe0, 0xb1, 0x01, 0x00, 0x90, 0x00, 0x00, 0x40,</div><div class='add'>+	0x45, 0x99, 0x01, 0x00, 0x00, 0x00, 0x60, 0x06, 0x30, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x86, 0x0c, 0x80, 0xb2, 0x00, 0x00, 0x04, 0x00, 0xa2, 0x49,</div><div class='add'>+	0x19, 0x7c, 0x00, 0x00, 0xbc, 0x00, 0x2d, 0x46, 0x19, 0x90, 0x01, 0x00,</div><div class='add'>+	0xa0, 0x00, 0xa0, 0xf2, 0xe4, 0xb1, 0x01, 0x00, 0xb0, 0x00, 0x00, 0x40,</div><div class='add'>+	0x43, 0x99, 0x01, 0x00, 0x10, 0x50, 0x00, 0x43, 0xfc, 0xc9, 0x01, 0x00,</div><div class='add'>+	0xa8, 0x97, 0x00, 0x30, 0x81, 0x30, 0x01, 0x00, 0x00, 0x00, 0xa2, 0x4a,</div><div class='add'>+	0x19, 0xfc, 0x00, 0x00, 0x08, 0x00, 0x00, 0xa2, 0x44, 0xc9, 0x01, 0x00,</div><div class='add'>+	0xcc, 0x00, 0x2d, 0xab, 0xf9, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xab,</div><div class='add'>+	0x17, 0xc0, 0x01, 0x00, 0x4d, 0x97, 0xa0, 0xf0, 0x16, 0x44, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x17, 0xc0, 0x01, 0x00, 0x00, 0x00, 0xe4, 0xf0,</div><div class='add'>+	0x82, 0xb0, 0x01, 0x00, 0x00, 0x80, 0x00, 0x10, 0x44, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x03,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x10, 0x62, 0xb1, 0x01, 0x00, 0x00, 0x00, 0xa8, 0x1b,</div><div class='add'>+	0xe0, 0xb1, 0x00, 0x00, 0x52, 0x97, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x00, 0xf0, 0x00, 0x0c, 0x7e, 0x89, 0x01, 0x00, 0x00, 0x00, 0xa6, 0x4c,</div><div class='add'>+	0x95, 0x60, 0x01, 0x00, 0x00, 0x00, 0x80, 0x4a, 0x18, 0x94, 0x01, 0x00,</div><div class='add'>+	0x00, 0x80, 0x00, 0x10, 0x44, 0xc9, 0x01, 0x00, 0x04, 0x00, 0x22, 0x01,</div><div class='add'>+	0xf0, 0x31, 0x00, 0x00, 0x20, 0x00, 0x00, 0x40, 0xf0, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x16, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x43,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x20, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0xa8, 0x15, 0xe0, 0xb1, 0x00, 0x00, 0x5d, 0x97, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x10, 0x80, 0x00, 0x03, 0x44, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x06, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0xe8, 0x5f, 0x17, 0x90, 0x01, 0x00,</div><div class='add'>+	0x70, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00, 0x7a, 0x01, 0x2e, 0xfe,</div><div class='add'>+	0x92, 0xb0, 0x01, 0x00, 0x8b, 0x00, 0x2d, 0xf6, 0x16, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x6a, 0x97, 0x22, 0x43, 0xe7, 0x7d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0x45, 0xc1, 0x01, 0x00, 0x04, 0x00, 0x00, 0xa6, 0x2a, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x28, 0x00, 0x6e, 0x06, 0x82, 0xc8, 0x01, 0x00, 0x6e, 0x97, 0x22, 0x4a,</div><div class='add'>+	0x19, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x45, 0xd1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x6e, 0x4c, 0x83, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x92, 0xc0, 0x01, 0x00, 0x6f, 0x97, 0x43, 0x30, 0x3d, 0x07, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x66, 0x9e, 0x83, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x1b, 0x41,</div><div class='add'>+	0x3d, 0xc3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41, 0x92, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x06, 0x00, 0x00, 0xa2, 0x44, 0xc9, 0x01, 0x00, 0x10, 0x00, 0x00, 0x49,</div><div class='add'>+	0x98, 0xf4, 0x01, 0x00, 0x78, 0x97, 0x26, 0x30, 0x93, 0x04, 0x00, 0x00,</div><div class='add'>+	0x78, 0x97, 0x90, 0x4c, 0x92, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x93, 0xc0, 0x01, 0x00, 0xff, 0xff, 0x80, 0x49, 0xec, 0xa9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x80, 0x00, 0x10, 0x44, 0xc9, 0x01, 0x00, 0x04, 0x00, 0x22, 0x01,</div><div class='add'>+	0xf0, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x18, 0xf0, 0xb1, 0x01, 0x00, 0x20, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x00, 0x00, 0xa8, 0x15, 0xe0, 0xb1, 0x00, 0x00,</div><div class='add'>+	0x7d, 0x97, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x22, 0x20,</div><div class='add'>+	0x81, 0x6c, 0x00, 0x00, 0x04, 0x00, 0x22, 0x40, 0x81, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x8f, 0x97, 0x22, 0x5f, 0x81, 0x7c, 0x00, 0x00, 0x8c, 0x97, 0xa2, 0x40,</div><div class='add'>+	0x19, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x19, 0x90, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x54, 0x61, 0xb1, 0x01, 0x00, 0x10, 0x00, 0x00, 0x07,</div><div class='add'>+	0x96, 0xe4, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4f, 0x97, 0x94, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4b, 0x62, 0xb1, 0x01, 0x00, 0x8c, 0x97, 0x28, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x04, 0x00, 0xa2, 0x54, 0x77, 0x7d, 0x00, 0x00,</div><div class='add'>+	0x88, 0x97, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x25, 0x04, 0x00, 0x40,</div><div class='add'>+	0x89, 0x98, 0x01, 0x00, 0x02, 0x99, 0x00, 0x40, 0x8a, 0x30, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0xa2, 0x21, 0x81, 0x84, 0x00, 0x00, 0x92, 0x97, 0xa2, 0x5f,</div><div class='add'>+	0x81, 0x6c, 0x00, 0x00, 0x00, 0x00, 0xa2, 0x43, 0x19, 0x7c, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x43, 0x19, 0x90, 0x01, 0x00, 0x25, 0x04, 0x00, 0x40,</div><div class='add'>+	0x89, 0x98, 0x01, 0x00, 0x02, 0x99, 0x00, 0x40, 0x8a, 0x30, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x54, 0x61, 0xb1, 0x01, 0x00, 0x10, 0x00, 0x00, 0x07,</div><div class='add'>+	0x96, 0xe4, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x96, 0x94, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4b, 0x62, 0xb1, 0x01, 0x00, 0x00, 0x00, 0xa8, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0xa2, 0x54, 0x77, 0x7d, 0x00, 0x00,</div><div class='add'>+	0x97, 0x97, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x22, 0x08,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x04, 0x00, 0x22, 0x02, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0xa0, 0x97, 0xa2, 0x4b, 0xfd, 0x7f, 0x00, 0x00, 0xb4, 0x05, 0x00, 0x02,</div><div class='add'>+	0x80, 0xce, 0x01, 0x00, 0x04, 0x00, 0xaa, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x80, 0x00, 0x19, 0x44, 0xc9, 0x01, 0x00, 0x04, 0x00, 0x22, 0x02,</div><div class='add'>+	0xf0, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0b, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x13, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x43,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x20, 0x00, 0x00, 0x19, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0xa8, 0x08, 0xe0, 0xb1, 0x00, 0x00, 0xa5, 0x97, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0xa2, 0x05, 0x48, 0x6d, 0x00, 0x00,</div><div class='add'>+	0xb0, 0x00, 0x00, 0xa1, 0x80, 0xce, 0x01, 0x00, 0x04, 0x00, 0xa6, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x7c, 0x00, 0x2d, 0xf0, 0x84, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x02, 0x00, 0x00, 0xf0, 0x98, 0xf4, 0x01, 0x00, 0xb1, 0x97, 0x20, 0x4c,</div><div class='add'>+	0x84, 0x6c, 0x00, 0x00, 0x88, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00,</div><div class='add'>+	0xb1, 0x97, 0x20, 0xf2, 0x84, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x85, 0xb0, 0x01, 0x00, 0x98, 0x00, 0x2d, 0x14, 0x82, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf0, 0x98, 0xb0, 0x01, 0x00, 0xa3, 0x00, 0x2d, 0x14,</div><div class='add'>+	0x98, 0xd0, 0x01, 0x00, 0xb6, 0x97, 0x20, 0x4c, 0x84, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4c, 0x84, 0xb0, 0x01, 0x00, 0x04, 0x00, 0xa2, 0x30,</div><div class='add'>+	0x81, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf3, 0x80, 0xe0, 0x01, 0x00,</div><div class='add'>+	0xba, 0x97, 0x23, 0x40, 0x84, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x84, 0xb0, 0x01, 0x00, 0xd0, 0x00, 0x20, 0x14, 0xe0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x98, 0x00, 0x25, 0x42, 0x80, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x6e, 0xf3,</div><div class='add'>+	0x80, 0xf0, 0x01, 0x00, 0x00, 0x00, 0xa6, 0x42, 0x82, 0xc0, 0x00, 0x00,</div><div class='add'>+	0xc0, 0x97, 0xa0, 0x40, 0x16, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x17, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x9f, 0xf0, 0x82, 0xec, 0x00, 0x00,</div><div class='add'>+	0x98, 0x00, 0xa0, 0x41, 0xe0, 0xb1, 0x01, 0x00, 0x04, 0x00, 0xa2, 0x5c,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x37, 0x04, 0x00, 0x40, 0x89, 0x98, 0x01, 0x00,</div><div class='add'>+	0x02, 0x99, 0x00, 0x05, 0x8a, 0x30, 0x01, 0x00, 0x00, 0x00, 0x00, 0x42,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x2e, 0x10, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xa8, 0x01, 0x00, 0x40, 0xf1, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x05,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x09, 0x00, 0x00, 0x07, 0x96, 0xe4, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x60, 0xa7, 0x97, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xb1, 0x01, 0x00, 0x00, 0x00, 0xa8, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xcb, 0x97, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xa8, 0x00, 0x2d, 0x1c,</div><div class='add'>+	0x8a, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x9f, 0xf0, 0x8a, 0xd0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0xa2, 0x40, 0x8b, 0xec, 0x00, 0x00, 0x8a, 0x00, 0x20, 0x40,</div><div class='add'>+	0xe7, 0xb1, 0x01, 0x00, 0xb4, 0x00, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00,</div><div class='add'>+	0xa4, 0x00, 0x2d, 0x45, 0xe0, 0xd1, 0x01, 0x00, 0xd9, 0x97, 0x9c, 0x17,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x04, 0x00, 0x22, 0x4a, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0xbe, 0x00, 0x2f, 0xab, 0x83, 0xb0, 0x01, 0x00, 0x35, 0x98, 0x00, 0x14,</div><div class='add'>+	0x82, 0x50, 0x01, 0x00, 0xde, 0x97, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xde, 0x97, 0x22, 0xf2, 0x82, 0x30, 0x00, 0x00, 0x8c, 0x00, 0x00, 0x40,</div><div class='add'>+	0x43, 0x99, 0x01, 0x00, 0xde, 0x97, 0x9f, 0x1c, 0xe0, 0x6d, 0x00, 0x00,</div><div class='add'>+	0xbe, 0x00, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00, 0x35, 0x98, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0xa8, 0x00, 0x20, 0x1c, 0xe0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x9c, 0x00, 0x2d, 0x30, 0x81, 0xb0, 0x01, 0x00, 0x88, 0x00, 0x2d, 0xf0,</div><div class='add'>+	0x84, 0xb0, 0x01, 0x00, 0x94, 0x00, 0x2d, 0xf2, 0x86, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xf2, 0x97, 0x23, 0xf0, 0x84, 0x6c, 0x00, 0x00, 0xe6, 0x97, 0x23, 0x92,</div><div class='add'>+	0x87, 0x6c, 0x00, 0x00, 0xc9, 0x04, 0x00, 0xa6, 0x94, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xe8, 0x97, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x20, 0x00, 0x00, 0xa6,</div><div class='add'>+	0x94, 0xb0, 0x01, 0x00, 0x60, 0x89, 0x00, 0x4a, 0x94, 0x98, 0x01, 0x00,</div><div class='add'>+	0xe8, 0x97, 0x68, 0x40, 0x81, 0x32, 0x00, 0x00, 0x04, 0x00, 0x22, 0x40,</div><div class='add'>+	0xbd, 0x7d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4a, 0xb0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xbf, 0x00, 0x2d, 0x42, 0xb2, 0xb1, 0x01, 0x00, 0x90, 0x00, 0x2d, 0xf3,</div><div class='add'>+	0x80, 0xe0, 0x01, 0x00, 0xed, 0x97, 0xd4, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x78, 0xda, 0x84, 0xc0, 0x01, 0x00, 0xf7, 0x97, 0x23, 0x40,</div><div class='add'>+	0x84, 0x6c, 0x00, 0x00, 0x94, 0x00, 0x20, 0x9d, 0xe1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xf7, 0x97, 0x00, 0x40, 0x84, 0xb0, 0x00, 0x00, 0xbf, 0x00, 0x2d, 0x43,</div><div class='add'>+	0x84, 0xc0, 0x01, 0x00, 0x90, 0x00, 0x2d, 0xf3, 0x80, 0xe0, 0x01, 0x00,</div><div class='add'>+	0xf7, 0x97, 0x23, 0x40, 0x84, 0x6c, 0x00, 0x00, 0x94, 0x00, 0x20, 0x9d,</div><div class='add'>+	0xe1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x84, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xfb, 0x97, 0xa2, 0xf0, 0x38, 0x6c, 0x00, 0x00, 0x9c, 0x00, 0x20, 0x42,</div><div class='add'>+	0xe0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5f, 0x13, 0x94, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x46, 0x19, 0x80, 0x01, 0x00, 0x9c, 0x00, 0x20, 0x42,</div><div class='add'>+	0xe0, 0xb1, 0x01, 0x00, 0x37, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0xf3, 0x80, 0xf4, 0x01, 0x00, 0x0f, 0x00, 0x00, 0xf3,</div><div class='add'>+	0x82, 0x88, 0x01, 0x00, 0x01, 0x98, 0x23, 0x41, 0x80, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x5f, 0x13, 0x94, 0x01, 0x00, 0x00, 0x00, 0x89, 0x0c,</div><div class='add'>+	0x80, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x86, 0x0c, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0xbc, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00, 0xa0, 0x00, 0xa0, 0xf2,</div><div class='add'>+	0xe4, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x9f, 0x41, 0x24, 0xec, 0x00, 0x00,</div><div class='add'>+	0x0d, 0x98, 0xa6, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x9f, 0x42,</div><div class='add'>+	0x38, 0xec, 0x00, 0x00, 0x0d, 0x98, 0xa6, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0xb4, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00, 0x0f, 0x98, 0xa3, 0xf0,</div><div class='add'>+	0x3a, 0x6c, 0x00, 0x00, 0x04, 0x00, 0xa4, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x40, 0x81, 0xb2, 0x01, 0x00, 0xb4, 0x00, 0x00, 0x40,</div><div class='add'>+	0x43, 0x99, 0x01, 0x00, 0x13, 0x98, 0x22, 0xf0, 0x3a, 0x6c, 0x00, 0x00,</div><div class='add'>+	0xb4, 0x00, 0x20, 0x1d, 0xe0, 0xb1, 0x01, 0x00, 0x80, 0x00, 0x2d, 0x5f,</div><div class='add'>+	0x13, 0x94, 0x01, 0x00, 0x13, 0x98, 0x23, 0xf0, 0x3a, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x80, 0x00, 0x20, 0x1d, 0xe0, 0xb1, 0x01, 0x00, 0xc0, 0x00, 0x20, 0x12,</div><div class='add'>+	0xe0, 0xb1, 0x01, 0x00, 0xc4, 0x00, 0xa0, 0x1c, 0xe0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x27, 0x04, 0x00, 0x40, 0x89, 0x98, 0x01, 0x00, 0x02, 0x99, 0x00, 0x42,</div><div class='add'>+	0x8a, 0x30, 0x01, 0x00, 0x04, 0x00, 0xa2, 0x05, 0x48, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x00, 0x80, 0x00, 0x03, 0x44, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x42,</div><div class='add'>+	0xe0, 0xb1, 0x01, 0x00, 0x12, 0x00, 0x00, 0x40, 0x87, 0x98, 0x01, 0x00,</div><div class='add'>+	0x1f, 0x98, 0x9f, 0x41, 0x24, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x8c, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x12, 0x8c, 0xd0, 0x01, 0x00,</div><div class='add'>+	0x20, 0x98, 0x00, 0x41, 0x24, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x8d, 0xb0, 0x01, 0x00, 0x78, 0x98, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x45, 0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x00, 0x00, 0xa8, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x22, 0x98, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xae, 0x94, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0x16, 0x80, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0xa7, 0x08, 0x80, 0x32, 0x01, 0x00, 0x32, 0x04, 0x00, 0x40,</div><div class='add'>+	0x89, 0x98, 0x01, 0x00, 0x02, 0x99, 0x00, 0x08, 0x8a, 0x30, 0x01, 0x00,</div><div class='add'>+	0x2c, 0x98, 0xa2, 0x40, 0x95, 0x6c, 0x00, 0x00, 0xc3, 0x94, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x00, 0x82, 0x00, 0xa6, 0x04, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xa0, 0x98, 0x2f, 0x40, 0x11, 0xb0, 0x01, 0x00, 0x30, 0x05, 0x00, 0x41,</div><div class='add'>+	0x89, 0xb0, 0x00, 0x00, 0xcc, 0x00, 0x00, 0xa1, 0x80, 0xce, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa6, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x9f, 0xf8,</div><div class='add'>+	0x3e, 0xec, 0x00, 0x00, 0x00, 0x00, 0x9f, 0x12, 0xe0, 0xed, 0x00, 0x00,</div><div class='add'>+	0xc8, 0x00, 0x20, 0xab, 0xe1, 0xb1, 0x01, 0x00, 0xcc, 0x00, 0xa0, 0x1f,</div><div class='add'>+	0xe0, 0xb1, 0x01, 0x00, 0x04, 0x00, 0xa2, 0x05, 0x48, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x38, 0x98, 0xa3, 0x5f, 0xe7, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0xe7, 0xc1, 0x01, 0x00, 0xa6, 0x00, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00,</div><div class='add'>+	0x4c, 0x98, 0x22, 0xf2, 0x86, 0x30, 0x00, 0x00, 0x03, 0x00, 0x00, 0x43,</div><div class='add'>+	0x84, 0xf4, 0x01, 0x00, 0x01, 0x00, 0x00, 0x41, 0x80, 0xcc, 0x01, 0x00,</div><div class='add'>+	0xb8, 0x00, 0x2d, 0x42, 0x80, 0xd0, 0x01, 0x00, 0x00, 0x00, 0x62, 0x40,</div><div class='add'>+	0x86, 0xc0, 0x01, 0x00, 0x40, 0x98, 0x1f, 0x43, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x41, 0x98, 0xa2, 0x40, 0x87, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x62, 0x41,</div><div class='add'>+	0x87, 0xb0, 0x01, 0x00, 0x45, 0x98, 0x9f, 0x40, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x85, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x84, 0xd0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x42, 0x80, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf2, 0x88, 0xb0, 0x01, 0x00, 0x02, 0x00, 0x00, 0x44,</div><div class='add'>+	0x84, 0xf4, 0x01, 0x00, 0xb8, 0x00, 0x2e, 0x42, 0x80, 0xd0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x62, 0x40, 0x88, 0xc0, 0x01, 0x00, 0x4b, 0x98, 0x1f, 0x44,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x4f, 0x98, 0xa2, 0x40, 0x89, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x4f, 0x98, 0x62, 0x41, 0x89, 0xb0, 0x00, 0x00, 0x03, 0x00, 0x62, 0x41,</div><div class='add'>+	0x86, 0xe4, 0x01, 0x00, 0xb8, 0x00, 0x00, 0x40, 0x45, 0x99, 0x01, 0x00,</div><div class='add'>+	0x01, 0x00, 0x62, 0x41, 0x88, 0xe4, 0x01, 0x00, 0xa4, 0x00, 0x20, 0x40,</div><div class='add'>+	0xe5, 0xb1, 0x01, 0x00, 0xa2, 0x00, 0x20, 0x40, 0xe7, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xbc, 0x00, 0x2e, 0x43, 0x87, 0xf0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0x86, 0xc0, 0x01, 0x00, 0x55, 0x98, 0x20, 0x43, 0x87, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x43, 0xe5, 0xb1, 0x01, 0x00, 0x40, 0x01, 0x00, 0x43,</div><div class='add'>+	0x80, 0xce, 0x01, 0x00, 0x00, 0x00, 0xa4, 0x43, 0xe4, 0x31, 0x01, 0x00,</div><div class='add'>+	0x40, 0x01, 0xe2, 0x40, 0x87, 0x98, 0x01, 0x00, 0x04, 0x00, 0xa2, 0x05,</div><div class='add'>+	0x48, 0x6d, 0x00, 0x00, 0x04, 0x00, 0x22, 0x0a, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x88, 0x00, 0x2d, 0x44, 0x81, 0xb0, 0x01, 0x00, 0x90, 0x00, 0x2d, 0xf2,</div><div class='add'>+	0x2e, 0xb0, 0x01, 0x00, 0x9c, 0x00, 0x2d, 0xf0, 0x86, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x90, 0x00, 0x2d, 0xf0, 0x82, 0xb0, 0x01, 0x00, 0xba, 0x00, 0x2d, 0xf0,</div><div class='add'>+	0x98, 0xb0, 0x01, 0x00, 0x64, 0x98, 0xa2, 0x12, 0x98, 0x6c, 0x00, 0x00,</div><div class='add'>+	0xbc, 0x00, 0x2d, 0xf2, 0x98, 0xb0, 0x01, 0x00, 0x64, 0x98, 0xa0, 0xf2,</div><div class='add'>+	0x98, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x17, 0x82, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x9c, 0x00, 0x20, 0x41, 0xe0, 0xb1, 0x01, 0x00, 0xb4, 0x00, 0x2d, 0x12,</div><div class='add'>+	0x86, 0xd0, 0x01, 0x00, 0x67, 0x98, 0xa3, 0x41, 0xe0, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x68, 0x98, 0x00, 0xf0, 0x84, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x84, 0xb0, 0x01, 0x00, 0x80, 0x00, 0x2d, 0x43, 0x84, 0xd0, 0x01, 0x00,</div><div class='add'>+	0x6b, 0x98, 0x9f, 0x42, 0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x85, 0xb0, 0x01, 0x00, 0x6d, 0x98, 0xa3, 0x42, 0x14, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x6e, 0x98, 0x00, 0x0a, 0x0c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42,</div><div class='add'>+	0x0c, 0xb0, 0x01, 0x00, 0x70, 0x98, 0xa0, 0x17, 0x0c, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x17, 0x0c, 0xb0, 0x01, 0x00, 0x75, 0x98, 0x22, 0x40,</div><div class='add'>+	0x0d, 0x6c, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x0a, 0x0c, 0xec, 0x00, 0x00,</div><div class='add'>+	0x01, 0x00, 0x00, 0xf0, 0x82, 0xf4, 0x01, 0x00, 0x75, 0x98, 0xa0, 0x41,</div><div class='add'>+	0x0c, 0x6c, 0x00, 0x00, 0x00, 0x00, 0xa2, 0xf0, 0x80, 0x32, 0x01, 0x00,</div><div class='add'>+	0x29, 0x00, 0x00, 0x40, 0x89, 0x98, 0x01, 0x00, 0x02, 0x99, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x80, 0x40, 0x81, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xcb, 0x94, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x04, 0x00, 0x22, 0x03,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x04, 0x80, 0x00, 0x03, 0x44, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x46, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x60, 0x41, 0x87, 0x94, 0x01, 0x00,</div><div class='add'>+	0x00, 0x80, 0x00, 0x10, 0x44, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x50,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x48, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x49, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x03,</div><div class='add'>+	0xe0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x45, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x20, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00, 0x00, 0x00, 0xa8, 0x5d,</div><div class='add'>+	0x05, 0x90, 0x00, 0x00, 0x84, 0x98, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa2, 0x05, 0x48, 0x6d, 0x00, 0x00, 0x10, 0x00, 0x00, 0x0c,</div><div class='add'>+	0x96, 0xf4, 0x01, 0x00, 0x04, 0x00, 0xa2, 0x07, 0x96, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x2e, 0x4b, 0x19, 0x90, 0x01, 0x00, 0x05, 0x00, 0x2a, 0x0c,</div><div class='add'>+	0xe4, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x80, 0x04, 0xe6, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x3e, 0x04, 0x00, 0x40, 0x89, 0x98, 0x01, 0x00, 0x02, 0x99, 0x00, 0x08,</div><div class='add'>+	0x8a, 0x30, 0x01, 0x00, 0x8f, 0x98, 0x45, 0x48, 0x61, 0x31, 0x00, 0x00,</div><div class='add'>+	0x00, 0x10, 0x00, 0x08, 0x62, 0xdd, 0x01, 0x00, 0x95, 0x98, 0x28, 0x40,</div><div class='add'>+	0x87, 0x30, 0x00, 0x00, 0x90, 0x98, 0x22, 0x48, 0x77, 0x7d, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x22, 0x40, 0x27, 0x6c, 0x00, 0x00, 0x04, 0x97, 0x1d, 0x46,</div><div class='add'>+	0x87, 0xb0, 0x00, 0x00, 0x98, 0x98, 0x22, 0x5f, 0x11, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x22, 0x15, 0x62, 0x31, 0x00, 0x00, 0x96, 0x98, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x9d, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x49, 0xb1, 0x01, 0x00, 0x00, 0x14, 0x2f, 0x4c,</div><div class='add'>+	0x83, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x9b, 0x98, 0xa2, 0x41, 0x83, 0x50, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x49, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x30, 0x00, 0x00, 0x40, 0xa1, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x93, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x1f, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xef, 0x98, 0x00, 0x49, 0x96, 0x30, 0x01, 0x00, 0x07, 0x00, 0x00, 0x49,</div><div class='add'>+	0x06, 0xe4, 0x01, 0x00, 0x00, 0x39, 0x00, 0x03, 0x06, 0xc8, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x05, 0xb0, 0x01, 0x00, 0x20, 0x00, 0x00, 0xd0,</div><div class='add'>+	0xa0, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41, 0x93, 0xc0, 0x01, 0x00,</div><div class='add'>+	0xa2, 0x98, 0xa0, 0x54, 0x93, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x2e, 0x05,</div><div class='add'>+	0x97, 0xb0, 0x01, 0x00, 0x00, 0x80, 0x00, 0x40, 0x49, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0xe1, 0xb1, 0x01, 0x00, 0x00, 0x02, 0x00, 0xa2,</div><div class='add'>+	0x44, 0xc9, 0x01, 0x00, 0xab, 0x98, 0xa2, 0x41, 0x97, 0x50, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x20, 0x49, 0xb3, 0x01, 0x00, 0xf5, 0x98, 0x00, 0x40,</div><div class='add'>+	0x49, 0x31, 0x01, 0x00, 0x02, 0x95, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x00, 0xb5, 0x2e, 0x08, 0x97, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0xb2, 0x98, 0xa2, 0x41, 0x97, 0x50, 0x00, 0x00,</div><div class='add'>+	0x18, 0x00, 0x00, 0x40, 0x97, 0x98, 0x01, 0x00, 0x00, 0x97, 0x2e, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xb6, 0x98, 0xa2, 0x41, 0x97, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x49, 0xb1, 0x01, 0x00, 0x40, 0x18, 0x2e, 0x05, 0x97, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0xf1, 0xb1, 0x01, 0x00, 0xba, 0x98, 0xa2, 0x41,</div><div class='add'>+	0x97, 0x50, 0x00, 0x00, 0x57, 0x95, 0x20, 0x40, 0xe7, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x30, 0x94, 0x00, 0x40, 0x45, 0x99, 0x01, 0x00, 0x64, 0x00, 0x00, 0x40,</div><div class='add'>+	0xe5, 0x99, 0x01, 0x00, 0x56, 0x95, 0x20, 0x40, 0xe7, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xb8, 0x94, 0x20, 0x41, 0xe5, 0xb1, 0x01, 0x00, 0xba, 0x94, 0x20, 0x41,</div><div class='add'>+	0xe5, 0xb1, 0x01, 0x00, 0x98, 0x94, 0x00, 0x40, 0x45, 0x99, 0x01, 0x00,</div><div class='add'>+	0x02, 0x00, 0x00, 0x40, 0x97, 0x98, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0xc4, 0x98, 0xa2, 0x41, 0x97, 0x50, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x97, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x6f, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4b, 0x68, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xc8, 0x98, 0x85, 0x41, 0x97, 0x40, 0x00, 0x00, 0x80, 0x04, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x39, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x37, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x35, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x33, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x41, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x3f, 0xb3, 0x01, 0x00, 0xee, 0x05, 0x00, 0x40, 0x25, 0x9b, 0x01, 0x00,</div><div class='add'>+	0x42, 0x00, 0x00, 0x40, 0x4b, 0x9b, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x2f, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x2d, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x47, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x43, 0xb3, 0x01, 0x00, 0x60, 0x00, 0x00, 0x40, 0x2b, 0x9b, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x54, 0xef, 0x93, 0x01, 0x00, 0x00, 0x00, 0x00, 0x55,</div><div class='add'>+	0xf1, 0x93, 0x01, 0x00, 0xff, 0xff, 0x00, 0xa5, 0x3c, 0x8b, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x2c, 0x5b, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x2c,</div><div class='add'>+	0x45, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x59, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x57, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x27, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x53, 0xb3, 0x01, 0x00,</div><div class='add'>+	0xe4, 0x98, 0xa2, 0x50, 0xfd, 0x7f, 0x00, 0x00, 0xe4, 0x98, 0xa2, 0x51,</div><div class='add'>+	0xfd, 0x7f, 0x00, 0x00, 0xe5, 0x98, 0x00, 0x40, 0x1d, 0xb3, 0x00, 0x00,</div><div class='add'>+	0x50, 0x46, 0x00, 0x40, 0x1d, 0x9b, 0x01, 0x00, 0x00, 0xc0, 0x00, 0xa6,</div><div class='add'>+	0x88, 0xb3, 0x01, 0x00, 0xff, 0x3f, 0x00, 0xa6, 0x3a, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0xc0, 0x00, 0x9d, 0x3b, 0x9b, 0x01, 0x00, 0xb4, 0x05, 0x00, 0x40,</div><div class='add'>+	0x23, 0x9b, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x4d, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x08, 0x0a, 0x00, 0xa6, 0x14, 0xb3, 0x01, 0x00, 0x01, 0x01, 0x00, 0x8a,</div><div class='add'>+	0x15, 0x9b, 0x01, 0x00, 0x00, 0x00, 0x00, 0x20, 0x87, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x80, 0x00, 0xa6, 0x56, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x80, 0x5e,</div><div class='add'>+	0x57, 0xb5, 0x01, 0x00, 0x18, 0x00, 0x00, 0x4b, 0x20, 0xe4, 0x01, 0x00,</div><div class='add'>+	0x06, 0x00, 0x00, 0x4b, 0x96, 0xe4, 0x01, 0x00, 0x00, 0x43, 0x00, 0x4b,</div><div class='add'>+	0x96, 0xc8, 0x01, 0x00, 0x18, 0x00, 0x00, 0x10, 0x20, 0xdc, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4b, 0x20, 0x94, 0x01, 0x00, 0x00, 0x00, 0x80, 0x57,</div><div class='add'>+	0x21, 0x90, 0x01, 0x00, 0x00, 0x99, 0x2e, 0x0a, 0x97, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0xf1, 0xb1, 0x01, 0x00, 0xf6, 0x98, 0xa2, 0x41,</div><div class='add'>+	0x97, 0x50, 0x00, 0x00, 0x00, 0x03, 0x00, 0x40, 0x97, 0x98, 0x01, 0x00,</div><div class='add'>+	0x00, 0xa9, 0x00, 0x40, 0x45, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0xfa, 0x98, 0xa2, 0x41, 0x97, 0x50, 0x00, 0x00,</div><div class='add'>+	0x30, 0x00, 0x00, 0x40, 0x97, 0x98, 0x01, 0x00, 0x00, 0x00, 0x00, 0x55,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4b, 0x62, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xfe, 0x98, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0xfe, 0x98, 0xa2, 0x41,</div><div class='add'>+	0x97, 0x50, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x10, 0x00, 0x00, 0x4e, 0x98, 0xe4, 0x01, 0x00, 0x00, 0x00, 0x00, 0x07,</div><div class='add'>+	0x98, 0x94, 0x01, 0x00, 0x00, 0x00, 0x00, 0x43, 0x99, 0xe0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x80, 0x98, 0x94, 0x01, 0x00, 0x00, 0x00, 0x00, 0x48,</div><div class='add'>+	0x99, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4c, 0x88, 0x94, 0x01, 0x00,</div><div class='add'>+	0x08, 0x99, 0x6a, 0x40, 0x81, 0x32, 0x00, 0x00, 0x0b, 0x99, 0x22, 0x4f,</div><div class='add'>+	0x77, 0x7d, 0x00, 0x00, 0xf0, 0x04, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4f, 0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0x62, 0xb1, 0x01, 0x00, 0x0c, 0x99, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x13, 0x99, 0x22, 0x4a, 0x89, 0x7c, 0x00, 0x00, 0x11, 0x99, 0x22, 0x4f,</div><div class='add'>+	0x77, 0x7d, 0x00, 0x00, 0xf0, 0x04, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x45, 0x62, 0xb1, 0x01, 0x00, 0x11, 0x99, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0xfa, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x04, 0x00, 0xa2, 0x5a,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x10, 0x00, 0x00, 0x0f, 0x98, 0xf4, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0xa2, 0x5f, 0x99, 0x04, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x80, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xae, 0x9f, 0x00, 0x88,</div><div class='add'>+	0x9a, 0xb0, 0x00, 0x00, 0xae, 0x9f, 0x00, 0x88, 0x9a, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xae, 0x9f, 0x00, 0x88, 0x9a, 0xb0, 0x00, 0x00, 0xae, 0x9f, 0x00, 0x88,</div><div class='add'>+	0x9a, 0xb0, 0x00, 0x00, 0xae, 0x9f, 0x00, 0x88, 0x9a, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x88, 0x9a, 0xb0, 0x01, 0x00, 0xae, 0x9f, 0x41, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0xb2, 0x9f, 0x22, 0x40, 0x7b, 0x6f, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x19, 0x40, 0x81, 0xb2, 0x01, 0x00, 0xae, 0x9f, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x19, 0x41, 0x7b, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xa4, 0xc4, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xa1,</div><div class='add'>+	0xc6, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x2f, 0xa2, 0xc8, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x08, 0x14, 0x00, 0x40, 0x49, 0x99, 0x01, 0x00, 0xa8, 0x9f, 0x00, 0x4d,</div><div class='add'>+	0x9a, 0xcc, 0x01, 0x00, 0xbb, 0x9f, 0x26, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4c, 0x49, 0xc1, 0x01, 0x00, 0xb9, 0x9f, 0xa2, 0x41,</div><div class='add'>+	0x9b, 0x50, 0x00, 0x00, 0xbf, 0x9f, 0x80, 0x80, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x52, 0x49, 0xfd, 0x93, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4a,</div><div class='add'>+	0xfd, 0x93, 0x01, 0x00, 0xc2, 0x9f, 0x00, 0x42, 0xcd, 0x93, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x51, 0x4a, 0xfd, 0x93, 0x01, 0x00, 0x00, 0x00, 0x00, 0x49,</div><div class='add'>+	0xfd, 0x93, 0x01, 0x00, 0xc2, 0x9f, 0x00, 0x43, 0xcb, 0x93, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x50, 0x40, 0x81, 0xb2, 0x01, 0x00, 0xd2, 0x9f, 0x00, 0x40,</div><div class='add'>+	0x19, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x9a, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x44, 0x49, 0xd1, 0x01, 0x00, 0x00, 0x00, 0x40, 0xf0,</div><div class='add'>+	0x80, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x41, 0x4d, 0x80, 0xb2, 0x01, 0x00,</div><div class='add'>+	0xca, 0x9f, 0x00, 0x40, 0x19, 0x99, 0x01, 0x00, 0x00, 0x00, 0x4c, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44, 0x49, 0xd1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf0, 0x9a, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4d,</div><div class='add'>+	0x10, 0xb1, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe2, 0x49, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xe3, 0x43, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xe4,</div><div class='add'>+	0x45, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x7b, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x48, 0x4f, 0x40, 0xb1, 0x01, 0x00, 0xd2, 0x9f, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0xcb,</div><div class='add'>+	0x81, 0xc8, 0x01, 0x00, 0x22, 0x83, 0x00, 0x40, 0xf2, 0x93, 0x00, 0x00,</div><div class='add'>+	0x55, 0x82, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x40, 0x05, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x18, 0x06, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x22, 0x83, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xc6, 0x82, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x43, 0x81, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x41, 0x81, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xb8, 0x80, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0xed, 0x87, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x23, 0x83, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x27, 0x83, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0xb9, 0x94, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x8d, 0x98, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x79, 0x94, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x78, 0x98, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x87, 0x95, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x10, 0x95, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x0a, 0x95, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xb1, 0x82, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x19, 0x99, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='head'>diff --git a/drivers/staging/slicoss/oasisdownload.h b/drivers/staging/slicoss/oasisdownload.h<br/>new file mode 100644<br/>index 000000000000..6438c23d7548<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/slicoss/oasisdownload.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/slicoss/oasisdownload.h</a></div><div class='hunk'>@@ -0,0 +1,6848 @@</div><div class='add'>+#define OASIS_UCODE_VERS_STRING	"1.2"</div><div class='add'>+#define OASIS_UCODE_VERS_DATE  	"2006/03/27 15:10:37"</div><div class='add'>+#define OASIS_UCODE_HOSTIF_ID  	3</div><div class='add'>+</div><div class='add'>+static s32 ONumSections = 0x2;</div><div class='add'>+static u32 OSectionSize[] = {</div><div class='add'>+	0x00004000, 0x00010000,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u32 OSectionStart[] = {</div><div class='add'>+	0x00000000, 0x00008000,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u8 OasisUCode[2][65536] =</div><div class='add'>+{</div><div class='add'>+	{</div><div class='add'>+	0x15, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x1b, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x21, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x03, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa8,</div><div class='add'>+	0x98, 0xb0, 0x01, 0x00, 0x04, 0x80, 0xa2, 0x40, 0xfd, 0x7f, 0x00, 0x00,</div><div class='add'>+	0x09, 0x00, 0xa2, 0x49, 0xdd, 0x7d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4c,</div><div class='add'>+	0x80, 0xb2, 0x01, 0x00, 0x07, 0x00, 0x00, 0x40, 0xd1, 0xb1, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4c, 0x80, 0xb2, 0x01, 0x00, 0x09, 0x00, 0xa2, 0x40,</div><div class='add'>+	0x75, 0x7d, 0x00, 0x00, 0x60, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00,</div><div class='add'>+	0x0b, 0x00, 0xa8, 0xb1, 0x7e, 0x31, 0x00, 0x00, 0x09, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x80, 0x8f, 0x98, 0x18, 0x31, 0x00, 0x00,</div><div class='add'>+	0x10, 0x00, 0x00, 0x98, 0x80, 0xe4, 0x01, 0x00, 0x00, 0x00, 0x41, 0x98,</div><div class='add'>+	0x80, 0x94, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x10, 0x00, 0x00, 0x98, 0x80, 0xe4, 0x01, 0x00, 0x0e, 0x00, 0x40, 0x98,</div><div class='add'>+	0x80, 0x94, 0x00, 0x00, 0x11, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0xa5, 0x99, 0x01, 0x00, 0x19, 0x00, 0x29, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x19, 0x00, 0x14, 0xbc, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x0e, 0x00, 0x93, 0xbc, 0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x50, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x80, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x10, 0x00, 0x00, 0x40, 0xa5, 0x99, 0x01, 0x00, 0x1f, 0x00, 0x29, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x1f, 0x00, 0x14, 0xbc, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x12, 0x00, 0x93, 0xbc, 0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x50, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x01, 0x80, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x20, 0x00, 0x00, 0x40, 0xa5, 0x99, 0x01, 0x00, 0x25, 0x00, 0x29, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x25, 0x00, 0x14, 0xbc, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x14, 0x00, 0x93, 0xbc, 0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x49,</div><div class='add'>+	0xdd, 0x81, 0x01, 0x00, 0x12, 0x01, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x33, 0x01, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x2a, 0x00, 0x14, 0xbc,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0xfe, 0x00, 0x13, 0xbc, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x54, 0x95, 0x00, 0x40, 0x45, 0x99, 0x01, 0x00, 0xff, 0xff, 0x00, 0x40,</div><div class='add'>+	0xe5, 0x99, 0x01, 0x00, 0x00, 0x00, 0x2f, 0x40, 0x49, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0xe1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0xfd, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0xff, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x33, 0x00, 0x18, 0xee, 0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50,</div><div class='add'>+	0x89, 0xb0, 0x01, 0x00, 0x32, 0x00, 0xa2, 0x41, 0x89, 0x50, 0x00, 0x00,</div><div class='add'>+	0x99, 0x00, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x30, 0x94, 0x00, 0x40,</div><div class='add'>+	0x43, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x20, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xfa, 0xe0, 0xb3, 0x01, 0x00, 0x39, 0x00, 0x98, 0xee,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfb, 0x80, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x3b, 0x00, 0x80, 0xf3, 0xde, 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x47,</div><div class='add'>+	0xfd, 0x93, 0x01, 0x00, 0x3e, 0x00, 0x83, 0xf3, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0xf0, 0x00, 0x00, 0xf3, 0x80, 0x88, 0x01, 0x00, 0x01, 0x80, 0x00, 0x40,</div><div class='add'>+	0x2e, 0xdd, 0x01, 0x00, 0x00, 0x94, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x46, 0x43, 0xc1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xfa,</div><div class='add'>+	0x24, 0xb1, 0x01, 0x00, 0x7c, 0x00, 0x18, 0xee, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x45, 0x00, 0x95, 0xe8, 0x80, 0x32, 0x00, 0x00, 0xff, 0xff, 0x00, 0xe8,</div><div class='add'>+	0x80, 0x88, 0x01, 0x00, 0x7c, 0x00, 0x26, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0xd5, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf2,</div><div class='add'>+	0xec, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xd6, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x08, 0x00, 0x00, 0x40, 0xd5, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0,</div><div class='add'>+	0xd6, 0xb1, 0x01, 0x00, 0xff, 0x00, 0x00, 0xf8, 0xee, 0x8b, 0x01, 0x00,</div><div class='add'>+	0x08, 0x01, 0x00, 0x40, 0xd5, 0x99, 0x01, 0x00, 0xff, 0x00, 0x00, 0xf0,</div><div class='add'>+	0x80, 0x8c, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf7, 0x81, 0x94, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0xd6, 0xb1, 0x01, 0x00, 0xff, 0x00, 0x00, 0xf8,</div><div class='add'>+	0x80, 0x88, 0x01, 0x00, 0x3c, 0x00, 0x00, 0x40, 0xd5, 0x99, 0x01, 0x00,</div><div class='add'>+	0xff, 0x00, 0x00, 0xf0, 0xd6, 0x8d, 0x01, 0x00, 0xff, 0xff, 0x00, 0xf0,</div><div class='add'>+	0xf0, 0xdb, 0x01, 0x00, 0x00, 0x00, 0x00, 0x48, 0x81, 0xe0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf8, 0x81, 0x94, 0x01, 0x00, 0x3c, 0x01, 0x00, 0x40,</div><div class='add'>+	0xd5, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0xd6, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xff, 0x00, 0x00, 0xf8, 0x80, 0x88, 0x01, 0x00, 0x00, 0x00, 0x00, 0x48,</div><div class='add'>+	0x81, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x81, 0x94, 0x01, 0x00,</div><div class='add'>+	0x3c, 0x02, 0x00, 0x40, 0xd5, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0xd6, 0xb1, 0x01, 0x00, 0x2c, 0x00, 0x00, 0x40, 0xd5, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf8, 0xd6, 0xb1, 0x01, 0x00, 0x1e, 0x00, 0x00, 0xf0,</div><div class='add'>+	0x82, 0xf4, 0x01, 0x00, 0xff, 0x3f, 0x00, 0xf8, 0x80, 0xd8, 0x01, 0x00,</div><div class='add'>+	0x64, 0x00, 0x26, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x81, 0xd0, 0x01, 0x00, 0xff, 0xff, 0x00, 0x40, 0x80, 0xd8, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x80, 0x94, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0xd8, 0xb1, 0x01, 0x00, 0x68, 0x00, 0x22, 0xfa, 0x80, 0x30, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4c, 0x81, 0xe0, 0x01, 0x00, 0x01, 0x00, 0x00, 0x40,</div><div class='add'>+	0x80, 0xcc, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0xde, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x01, 0x00, 0x40, 0xd5, 0x99, 0x01, 0x00, 0x10, 0x00, 0x00, 0xfa,</div><div class='add'>+	0x80, 0xe4, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf6, 0x81, 0x94, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0xd6, 0xb1, 0x01, 0x00, 0x00, 0x02, 0x00, 0x40,</div><div class='add'>+	0xd5, 0x99, 0x01, 0x00, 0x10, 0x00, 0x00, 0xfa, 0x80, 0xe4, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf6, 0x81, 0x94, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0xd6, 0xb1, 0x01, 0x00, 0x06, 0x00, 0x00, 0x40, 0xd5, 0x99, 0x01, 0x00,</div><div class='add'>+	0x10, 0x00, 0x00, 0xfb, 0xd6, 0xe5, 0x01, 0x00, 0x07, 0x00, 0x00, 0x40,</div><div class='add'>+	0xd5, 0x99, 0x01, 0x00, 0x18, 0x00, 0x00, 0xfb, 0xd6, 0xe5, 0x01, 0x00,</div><div class='add'>+	0x48, 0x00, 0x00, 0x40, 0xd5, 0x99, 0x01, 0x00, 0x10, 0x00, 0x00, 0xfa,</div><div class='add'>+	0xd6, 0xe5, 0x01, 0x00, 0x50, 0x00, 0x00, 0x40, 0xd5, 0x99, 0x01, 0x00,</div><div class='add'>+	0x10, 0x00, 0x00, 0xfb, 0xd6, 0xe5, 0x01, 0x00, 0x03, 0x00, 0x00, 0xfb,</div><div class='add'>+	0x7a, 0x89, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xdc, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x7c, 0x00, 0x00, 0x4c, 0xdd, 0x91, 0x00, 0x00, 0x7c, 0x00, 0x95, 0xe8,</div><div class='add'>+	0x84, 0x30, 0x00, 0x00, 0x00, 0x00, 0x2f, 0xe9, 0xfa, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0xd1, 0xb1, 0x01, 0x00, 0xff, 0x00, 0x00, 0x42,</div><div class='add'>+	0x80, 0x88, 0x01, 0x00, 0x34, 0x00, 0x00, 0x40, 0x80, 0xce, 0x01, 0x00,</div><div class='add'>+	0x7c, 0x00, 0xa6, 0x40, 0x81, 0x32, 0x00, 0x00, 0x85, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x02, 0x80, 0x22, 0x40, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x7c, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4f,</div><div class='add'>+	0x81, 0xb0, 0x01, 0x00, 0x8e, 0x00, 0x09, 0xf9, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x8c, 0x00, 0x08, 0xf9, 0x81, 0x32, 0x00, 0x00, 0x98, 0x00, 0x1f, 0xfd,</div><div class='add'>+	0xf9, 0x33, 0x00, 0x00, 0x8b, 0x00, 0x9e, 0xfd, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4a, 0xf3, 0x93, 0x01, 0x00, 0x00, 0x00, 0x80, 0x48,</div><div class='add'>+	0xf3, 0x93, 0x01, 0x00, 0x00, 0x00, 0x00, 0xfd, 0xf7, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x49, 0xf3, 0x93, 0x01, 0x00, 0x00, 0x00, 0x00, 0xfc,</div><div class='add'>+	0x19, 0xb1, 0x01, 0x00, 0x93, 0x00, 0x0a, 0xf9, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x40, 0xfb, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x41, 0xfd,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x07, 0x80, 0xf9, 0xf3, 0x8f, 0x01, 0x00,</div><div class='add'>+	0x00, 0x07, 0x42, 0xf9, 0xf3, 0x8f, 0x01, 0x00, 0x97, 0x00, 0xa2, 0xff,</div><div class='add'>+	0xf7, 0x6f, 0x00, 0x00, 0x00, 0x00, 0x43, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0xa2, 0xff, 0xfb, 0xef, 0x00, 0x00, 0x00, 0x00, 0x80, 0xfc,</div><div class='add'>+	0xe1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x80, 0x40, 0x81, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x94, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00, 0xbb, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0xa2, 0x46, 0xfd, 0x7f, 0x01, 0x00,</div><div class='add'>+	0x00, 0x94, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00, 0xce, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0xa2, 0x44, 0xfd, 0x7f, 0x01, 0x00,</div><div class='add'>+	0x00, 0x94, 0x00, 0x40, 0x45, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0xff, 0x7f, 0x00, 0x40, 0xf5, 0x99, 0x01, 0x00,</div><div class='add'>+	0xff, 0x7f, 0x00, 0x40, 0xf5, 0x99, 0x01, 0x00, 0x9a, 0x13, 0x00, 0x40,</div><div class='add'>+	0xf5, 0x99, 0x01, 0x00, 0x07, 0x00, 0x00, 0x40, 0xf5, 0x99, 0x01, 0x00,</div><div class='add'>+	0x01, 0x00, 0x00, 0x40, 0xf5, 0x99, 0x01, 0x00, 0x00, 0x02, 0x00, 0x40,</div><div class='add'>+	0xf5, 0x99, 0x01, 0x00, 0x02, 0x00, 0x00, 0x40, 0xf5, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x02, 0x00, 0x40, 0xf5, 0x99, 0x01, 0x00, 0x03, 0x01, 0x00, 0x40,</div><div class='add'>+	0xf5, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0xf5, 0x99, 0x01, 0x00,</div><div class='add'>+	0x9a, 0x13, 0x00, 0x40, 0xf5, 0x99, 0x01, 0x00, 0x0b, 0x00, 0x00, 0x40,</div><div class='add'>+	0xf5, 0x99, 0x01, 0x00, 0x80, 0x00, 0x00, 0x40, 0xf5, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0xf5, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0xf5, 0x99, 0x01, 0x00, 0x07, 0x00, 0x00, 0x40, 0xf5, 0x99, 0x01, 0x00,</div><div class='add'>+	0x08, 0x00, 0x00, 0x40, 0xf5, 0x99, 0x01, 0x00, 0xb0, 0x02, 0x00, 0x40,</div><div class='add'>+	0xf5, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0xf5, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0xf5, 0x99, 0x01, 0x00, 0x02, 0x29, 0x00, 0x40,</div><div class='add'>+	0xf5, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0xf5, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x67, 0x00, 0x40, 0xf5, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0xf5, 0x99, 0x01, 0x00, 0x80, 0x00, 0x00, 0x40, 0xf5, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x40, 0xf5, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x45,</div><div class='add'>+	0xfd, 0x83, 0x01, 0x00, 0x00, 0x00, 0x00, 0x46, 0xfd, 0x83, 0x01, 0x00,</div><div class='add'>+	0xff, 0x7f, 0x00, 0x40, 0x25, 0x99, 0x01, 0x00, 0xc4, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0xa2, 0x44, 0x80, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x45, 0xfd, 0x93, 0x01, 0x00, 0xe2, 0x00, 0x00, 0x40,</div><div class='add'>+	0x83, 0x30, 0x01, 0x00, 0x00, 0x00, 0xa2, 0x45, 0x80, 0x32, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x46, 0xfd, 0x93, 0x01, 0x00, 0x00, 0x10, 0x00, 0x40,</div><div class='add'>+	0x83, 0x98, 0x01, 0x00, 0xdd, 0x00, 0x00, 0x40, 0x2b, 0x31, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0xa2, 0x46, 0x88, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x89, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x94, 0x8c, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xff, 0xff, 0x00, 0x46, 0x80, 0x88, 0x01, 0x00, 0xa5, 0xa5, 0xa2, 0x40,</div><div class='add'>+	0x80, 0xce, 0x00, 0x00, 0x00, 0x00, 0x00, 0x48, 0x8d, 0xf0, 0x01, 0x00,</div><div class='add'>+	0xc9, 0x00, 0x82, 0x41, 0x89, 0x40, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40,</div><div class='add'>+	0x89, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44, 0xfd, 0x83, 0x01, 0x00,</div><div class='add'>+	0xd4, 0x00, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0xa2, 0x44,</div><div class='add'>+	0x80, 0xb2, 0x00, 0x00, 0xe2, 0x00, 0x00, 0x08, 0x83, 0x30, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0xa2, 0x45, 0x80, 0x32, 0x01, 0x00, 0x00, 0x00, 0x80, 0x44,</div><div class='add'>+	0xfd, 0x93, 0x01, 0x00, 0x00, 0x30, 0x00, 0x08, 0x83, 0x98, 0x01, 0x00,</div><div class='add'>+	0x80, 0x00, 0x00, 0x40, 0x2b, 0x99, 0x01, 0x00, 0xdb, 0x00, 0x00, 0x40,</div><div class='add'>+	0x89, 0x30, 0x01, 0x00, 0x00, 0x00, 0xa2, 0x46, 0x80, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xff, 0xff, 0x00, 0x94, 0x80, 0x88, 0x01, 0x00, 0xa5, 0xa5, 0xa2, 0x40,</div><div class='add'>+	0x80, 0x4e, 0x01, 0x00, 0x00, 0x00, 0x80, 0x43, 0x89, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x03, 0x84, 0x00, 0x41, 0x2c, 0x99, 0x01, 0x00, 0xde, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x03, 0x88, 0x00, 0x41, 0x2c, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x20, 0x8d, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x9f, 0x96,</div><div class='add'>+	0x80, 0xb2, 0x00, 0x00, 0xdf, 0x00, 0xa2, 0x41, 0x8d, 0x50, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x40, 0x81, 0xb2, 0x01, 0x00, 0xff, 0x7f, 0x00, 0x40,</div><div class='add'>+	0x25, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4c, 0x89, 0xe0, 0x01, 0x00,</div><div class='add'>+	0xdd, 0x00, 0x00, 0x44, 0x82, 0x14, 0x01, 0x00, 0x00, 0x00, 0x90, 0x94,</div><div class='add'>+	0x8a, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x45, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x10, 0x00, 0x00, 0x45, 0x88, 0xf4, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0x89, 0xd0, 0x01, 0x00, 0xdd, 0x00, 0x00, 0x44, 0x2b, 0x41, 0x01, 0x00,</div><div class='add'>+	0xec, 0x00, 0x08, 0x41, 0x80, 0x32, 0x00, 0x00, 0xed, 0x00, 0x00, 0x94,</div><div class='add'>+	0x24, 0xb1, 0x00, 0x00, 0x10, 0x00, 0x00, 0x94, 0x24, 0xf5, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x94, 0xf0, 0xb1, 0x01, 0x00, 0xf2, 0x00, 0xa0, 0x44,</div><div class='add'>+	0x89, 0x50, 0x00, 0x00, 0xdd, 0x00, 0x00, 0x44, 0x2b, 0x41, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x94, 0xf0, 0xb1, 0x01, 0x00, 0xef, 0x00, 0x20, 0x44,</div><div class='add'>+	0x89, 0x50, 0x00, 0x00, 0x10, 0x00, 0x00, 0x45, 0x88, 0xf4, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xfa, 0x8a, 0xb0, 0x01, 0x00, 0x00, 0x00, 0xa3, 0x42,</div><div class='add'>+	0x89, 0xd0, 0x00, 0x00, 0xf7, 0x00, 0xa0, 0xfa, 0x8a, 0x40, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x8b, 0xc0, 0x01, 0x00, 0xf5, 0x00, 0xa3, 0x42,</div><div class='add'>+	0x89, 0x50, 0x00, 0x00, 0xff, 0xff, 0x00, 0x45, 0x88, 0x88, 0x01, 0x00,</div><div class='add'>+	0x10, 0x00, 0x00, 0x45, 0x8a, 0xf4, 0x01, 0x00, 0xfc, 0x00, 0x90, 0x44,</div><div class='add'>+	0x8a, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x8b, 0xc0, 0x01, 0x00,</div><div class='add'>+	0xff, 0xff, 0x00, 0x45, 0x8a, 0xa8, 0x01, 0x00, 0x00, 0x00, 0x80, 0x50,</div><div class='add'>+	0x8b, 0xe0, 0x01, 0x00, 0xff, 0x7f, 0x00, 0x40, 0x25, 0x99, 0x01, 0x00,</div><div class='add'>+	0x7c, 0x00, 0x00, 0x40, 0x2b, 0x99, 0x01, 0x00, 0x00, 0x30, 0x00, 0x40,</div><div class='add'>+	0x83, 0x98, 0x01, 0x00, 0xdd, 0x00, 0x00, 0x08, 0x83, 0x14, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x94, 0x2a, 0xb1, 0x01, 0x00, 0x00, 0x80, 0x00, 0x40,</div><div class='add'>+	0xf9, 0x9b, 0x01, 0x00, 0xdd, 0x00, 0x00, 0xfc, 0x19, 0x31, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x40, 0x94, 0x80, 0xb2, 0x01, 0x00, 0xdd, 0x00, 0x00, 0x44,</div><div class='add'>+	0x2b, 0x41, 0x01, 0x00, 0x00, 0x00, 0x41, 0x94, 0x80, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0xf9, 0xc3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0x2b, 0xc1, 0x01, 0x00, 0x04, 0x01, 0x9f, 0x94, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x02, 0x80, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x10, 0x01, 0x00, 0x51,</div><div class='add'>+	0x93, 0xb0, 0x00, 0x00, 0x10, 0x01, 0x00, 0x4d, 0x93, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x10, 0x01, 0x00, 0x49, 0x93, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42,</div><div class='add'>+	0x93, 0xb0, 0x01, 0x00, 0x10, 0x01, 0xa2, 0x41, 0x93, 0x50, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x10, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x11, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x12, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x13, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x14, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x15, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x16, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x17, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x18, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x19, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x1a, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x1b, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x1c, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x1d, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x1e, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x1f, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x70, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x71, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x72, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x73, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x74, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x75, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x76, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x77, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x78, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x79, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x7a, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x7b, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x7c, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x7d, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x7e, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x7f, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x04, 0x00, 0x40,</div><div class='add'>+	0xa1, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x50, 0xa1, 0xd1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x1b, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x19, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x17, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x15, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x13, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x11, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x0f, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x0d, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x0b, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x09, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x07, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x05, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x03, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x01, 0xb0, 0x01, 0x00, 0x3b, 0x01, 0x20, 0x48, 0xa1, 0x51, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x47, 0x01, 0x22, 0x4b,</div><div class='add'>+	0x74, 0x7d, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x60, 0x00, 0x00, 0x4b, 0x60, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0xb1,</div><div class='add'>+	0x7e, 0xb1, 0x01, 0x00, 0x48, 0x01, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x45, 0x01, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x05, 0x00, 0x80, 0x40,</div><div class='add'>+	0x97, 0x98, 0x01, 0x00, 0x18, 0x00, 0x00, 0xaa, 0x96, 0x88, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x43, 0x97, 0xf0, 0x01, 0x00, 0x07, 0x00, 0x00, 0xaa,</div><div class='add'>+	0x96, 0x88, 0x01, 0x00, 0x00, 0x00, 0x80, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x58, 0x07, 0x90, 0x01, 0x00, 0xd8, 0x9f, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0xa5, 0xb3, 0x01, 0x00,</div><div class='add'>+	0xd8, 0x02, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0xf8, 0x02, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5c, 0x07, 0x90, 0x01, 0x00,</div><div class='add'>+	0xd8, 0x9f, 0x00, 0x40, 0xbf, 0xb3, 0x00, 0x00, 0x5a, 0x01, 0x22, 0xcc,</div><div class='add'>+	0x85, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x51, 0x07, 0x90, 0x01, 0x00,</div><div class='add'>+	0xd8, 0x9f, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x49, 0xb1, 0x01, 0x00, 0xae, 0x03, 0x00, 0xcb, 0xa3, 0xc9, 0x01, 0x00,</div><div class='add'>+	0xd0, 0x14, 0x00, 0x40, 0xa1, 0x9b, 0x01, 0x00, 0x00, 0x00, 0x00, 0x20,</div><div class='add'>+	0x46, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x48, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xd0, 0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xca,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd5, 0xe1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x07, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00, 0x20, 0x00, 0x00, 0x20,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x63, 0x01, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xcc, 0x85, 0x93, 0x01, 0x00, 0xf8, 0x02, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0xd0, 0x14, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xfa, 0xba, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xfa,</div><div class='add'>+	0xa4, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xbc, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x14, 0x2f, 0x40, 0x81, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xe7,</div><div class='add'>+	0xa7, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd8, 0xa9, 0xb3, 0x01, 0x00,</div><div class='add'>+	0xff, 0x00, 0x00, 0xdd, 0x81, 0x88, 0x01, 0x00, 0x02, 0x00, 0x00, 0x40,</div><div class='add'>+	0x80, 0xf4, 0x01, 0x00, 0x73, 0x01, 0x00, 0x40, 0x80, 0xc8, 0x01, 0x00,</div><div class='add'>+	0x86, 0x01, 0x00, 0xdd, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x10, 0xb1, 0x00, 0x00, 0x87, 0x01, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x88, 0x01, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x89, 0x01, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x8a, 0x01, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x8b, 0x01, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x8d, 0x01, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x8f, 0x01, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x50, 0x01, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xb6, 0x01, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x50, 0x01, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xc4, 0x01, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xc5, 0x01, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x82, 0x02, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x83, 0x02, 0x00, 0x40, 0x81, 0xb2, 0x28, 0x00, 0xb8, 0x02, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x28, 0x00, 0xd4, 0x9f, 0x00, 0x40, 0x81, 0xb2, 0x28, 0x00,</div><div class='add'>+	0xd5, 0x9f, 0x00, 0x40, 0x81, 0xb2, 0x28, 0x00, 0xd6, 0x9f, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x28, 0x00, 0xd7, 0x9f, 0x00, 0x40, 0x81, 0xb2, 0x28, 0x00,</div><div class='add'>+	0x72, 0x01, 0x00, 0x41, 0x81, 0xc0, 0x28, 0x00, 0x55, 0x01, 0x51, 0x49,</div><div class='add'>+	0xfd, 0x93, 0x28, 0x00, 0x55, 0x01, 0x52, 0x4a, 0xfd, 0x93, 0x2a, 0x00,</div><div class='add'>+	0x55, 0x01, 0x55, 0x49, 0xfd, 0x83, 0x2a, 0x00, 0x55, 0x01, 0x56, 0x4a,</div><div class='add'>+	0xfd, 0x83, 0x2a, 0x00, 0x50, 0x01, 0x91, 0x81, 0x80, 0x30, 0x2a, 0x00,</div><div class='add'>+	0x55, 0x01, 0x45, 0x40, 0x81, 0xb2, 0x2a, 0x00, 0x50, 0x01, 0x91, 0x82,</div><div class='add'>+	0x80, 0x30, 0x2a, 0x00, 0x55, 0x01, 0x46, 0x40, 0x81, 0xb2, 0x2a, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x89, 0xb0, 0x2b, 0x00, 0x00, 0x00, 0x2f, 0x40,</div><div class='add'>+	0x81, 0xb0, 0x01, 0x00, 0x00, 0x14, 0x00, 0x40, 0x49, 0x99, 0x01, 0x00,</div><div class='add'>+	0xb3, 0x01, 0x22, 0xde, 0xe1, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4c,</div><div class='add'>+	0x49, 0xc1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41, 0x81, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x92, 0x01, 0xa2, 0x44, 0x81, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4c,</div><div class='add'>+	0x49, 0xd1, 0x01, 0x00, 0x9a, 0x01, 0x22, 0x40, 0xe1, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x96, 0x01, 0xa2, 0x41, 0x81, 0x50, 0x00, 0x00, 0x50, 0x01, 0x00, 0x41,</div><div class='add'>+	0xbf, 0xb3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0xbf, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x50, 0x01, 0xa0, 0x0f, 0xbd, 0x6f, 0x00, 0x00, 0x00, 0x00, 0x00, 0xde,</div><div class='add'>+	0xe1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44, 0x49, 0xc1, 0x01, 0x00,</div><div class='add'>+	0xb5, 0x01, 0x00, 0x40, 0x19, 0x99, 0x01, 0x00, 0x00, 0x00, 0x42, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x43, 0xff, 0x85, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xde, 0x19, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x42, 0xff,</div><div class='add'>+	0x87, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x43, 0xff, 0xe1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x44, 0x49, 0xc1, 0x01, 0x00, 0x00, 0x00, 0x2f, 0xff,</div><div class='add'>+	0xe1, 0xb1, 0x01, 0x00, 0x08, 0x14, 0x00, 0xa4, 0x80, 0xcc, 0x01, 0x00,</div><div class='add'>+	0xaa, 0x01, 0x26, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x85, 0xc0, 0x01, 0x00, 0xa8, 0x01, 0xa2, 0x4c, 0x81, 0x50, 0x00, 0x00,</div><div class='add'>+	0xb4, 0x01, 0x22, 0xd2, 0x81, 0x32, 0x00, 0x00, 0xaf, 0x01, 0x22, 0x41,</div><div class='add'>+	0xa5, 0x6f, 0x00, 0x00, 0x50, 0x01, 0xa2, 0xe0, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xd2, 0xc1, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5c,</div><div class='add'>+	0x89, 0x90, 0x01, 0x00, 0x00, 0x00, 0x40, 0x42, 0x80, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x41, 0x43, 0x80, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0,</div><div class='add'>+	0x88, 0x94, 0x01, 0x00, 0x55, 0x01, 0x00, 0x44, 0xe0, 0xb1, 0x00, 0x00,</div><div class='add'>+	0xb1, 0x01, 0x00, 0x48, 0x49, 0xc1, 0x00, 0x00, 0xaf, 0x01, 0x00, 0x5b,</div><div class='add'>+	0x89, 0x90, 0x00, 0x00, 0xa8, 0x9f, 0x00, 0xa0, 0x9e, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x83, 0xb0, 0x01, 0x00, 0x00, 0x14, 0x00, 0x40,</div><div class='add'>+	0x49, 0x99, 0x01, 0x00, 0x00, 0x00, 0x23, 0x40, 0x81, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xbe, 0x01, 0x22, 0xde, 0xe1, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4c,</div><div class='add'>+	0x49, 0xc1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41, 0x81, 0xc0, 0x01, 0x00,</div><div class='add'>+	0xb9, 0x01, 0xa2, 0x44, 0x81, 0x6c, 0x00, 0x00, 0x50, 0x01, 0x00, 0x43,</div><div class='add'>+	0xbf, 0xb3, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x18, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x40, 0xf8, 0x80, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x41, 0xf0,</div><div class='add'>+	0x80, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0xf1, 0xb1, 0x01, 0x00, 0x55, 0x01, 0x00, 0x40,</div><div class='add'>+	0xe1, 0xb1, 0x00, 0x00, 0xc6, 0x01, 0x00, 0x40, 0x91, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x91, 0xb0, 0x01, 0x00, 0xd0, 0x14, 0x2e, 0x40,</div><div class='add'>+	0x49, 0xb1, 0x01, 0x00, 0x05, 0x00, 0x00, 0x40, 0xa3, 0x9b, 0x01, 0x00,</div><div class='add'>+	0x08, 0x00, 0x00, 0xdd, 0x81, 0xf4, 0x01, 0x00, 0xcb, 0x01, 0x00, 0x40,</div><div class='add'>+	0x80, 0xc8, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x10, 0xb1, 0x00, 0x00,</div><div class='add'>+	0xd1, 0x01, 0x00, 0x40, 0x81, 0xb0, 0x00, 0x00, 0x53, 0x01, 0x00, 0xde,</div><div class='add'>+	0xa1, 0xb3, 0x00, 0x00, 0xe3, 0x01, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xe5, 0x01, 0x00, 0x40, 0x81, 0xb0, 0x00, 0x00, 0xeb, 0x01, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x52, 0x01, 0x00, 0xdf, 0xe1, 0xb1, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xd0, 0xba, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xde,</div><div class='add'>+	0xa1, 0xb1, 0x01, 0x00, 0x02, 0x00, 0x00, 0xd2, 0xa5, 0xe7, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xd2, 0xc1, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0xdb, 0x01, 0x22, 0x44, 0xc1, 0x53, 0x00, 0x00,</div><div class='add'>+	0xda, 0x01, 0x84, 0x41, 0x81, 0x40, 0x00, 0x00, 0xde, 0x01, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x45, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xd5, 0x01, 0x00, 0x41, 0xa1, 0xc1, 0x00, 0x00, 0xda, 0x02, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0xf8, 0x02, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x55, 0x01, 0x00, 0xdd, 0xa1, 0xb1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb0, 0x01, 0x00, 0x40, 0x00, 0x00, 0x40, 0xa5, 0x9b, 0x01, 0x00,</div><div class='add'>+	0xda, 0x02, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x40, 0x00, 0x00, 0xd3,</div><div class='add'>+	0xa7, 0xcb, 0x01, 0x00, 0xf8, 0x02, 0x00, 0xe0, 0xa5, 0xb3, 0x00, 0x00,</div><div class='add'>+	0x03, 0x00, 0x00, 0x40, 0xa3, 0x9b, 0x01, 0x00, 0x53, 0x01, 0x00, 0xde,</div><div class='add'>+	0xa1, 0xb3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0xbf, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xde, 0x81, 0x90, 0x01, 0x00, 0x50, 0x01, 0xa2, 0xba,</div><div class='add'>+	0x80, 0x04, 0x00, 0x00, 0x60, 0x00, 0x00, 0xde, 0x61, 0x99, 0x01, 0x00,</div><div class='add'>+	0xe8, 0x01, 0xa8, 0xb1, 0x80, 0x30, 0x00, 0x00, 0x52, 0x01, 0x00, 0x40,</div><div class='add'>+	0xe0, 0xb1, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd0, 0xba, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x6b, 0x02, 0x00, 0x40, 0x81, 0x98, 0x01, 0x00, 0x60, 0x02, 0x00, 0x4d,</div><div class='add'>+	0x83, 0x30, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44, 0xe1, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x44, 0xe3, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0xe5, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44, 0xe9, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x44, 0xeb, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0xf5, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44, 0xf7, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x44, 0xf9, 0xb3, 0x01, 0x00, 0xf9, 0x01, 0x22, 0x40,</div><div class='add'>+	0x8f, 0x6f, 0x00, 0x00, 0x78, 0x02, 0x00, 0x40, 0x81, 0x98, 0x01, 0x00,</div><div class='add'>+	0x60, 0x02, 0x00, 0xc7, 0x83, 0x30, 0x01, 0x00, 0x80, 0x02, 0x00, 0x40,</div><div class='add'>+	0x81, 0x98, 0x01, 0x00, 0x60, 0x02, 0x00, 0x42, 0x83, 0x30, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xe8, 0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xe9,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xea, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xeb, 0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x85,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xec, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xed, 0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xb2,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xa9, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xac, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xab,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xb8, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xb9, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xba,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xbb, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x0c, 0x02, 0xb8, 0x40, 0x81, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0x90, 0x01, 0x00, 0x0e, 0x02, 0xb9, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x81, 0x90, 0x01, 0x00, 0x10, 0x02, 0xba, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x81, 0x90, 0x01, 0x00,</div><div class='add'>+	0x12, 0x02, 0xbb, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43,</div><div class='add'>+	0x81, 0x90, 0x01, 0x00, 0x14, 0x02, 0xbc, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x44, 0x81, 0x90, 0x01, 0x00, 0x16, 0x02, 0xbd, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x45, 0x81, 0x90, 0x01, 0x00,</div><div class='add'>+	0x18, 0x02, 0xbe, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46,</div><div class='add'>+	0x81, 0x90, 0x01, 0x00, 0x1a, 0x02, 0xbf, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x47, 0x81, 0x90, 0x01, 0x00, 0x1c, 0x02, 0xc8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x48, 0x81, 0x90, 0x01, 0x00,</div><div class='add'>+	0x1e, 0x02, 0xc9, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x49,</div><div class='add'>+	0x81, 0x90, 0x01, 0x00, 0x20, 0x02, 0xca, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4a, 0x81, 0x90, 0x01, 0x00, 0x22, 0x02, 0xcb, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4b, 0x81, 0x90, 0x01, 0x00,</div><div class='add'>+	0x24, 0x02, 0xcc, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4c,</div><div class='add'>+	0x81, 0x90, 0x01, 0x00, 0x26, 0x02, 0xcd, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4d, 0x81, 0x90, 0x01, 0x00, 0x28, 0x02, 0xce, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4e, 0x81, 0x90, 0x01, 0x00,</div><div class='add'>+	0x2a, 0x02, 0xcf, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4f,</div><div class='add'>+	0x81, 0x90, 0x01, 0x00, 0x2c, 0x02, 0xf0, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x50, 0x81, 0x90, 0x01, 0x00, 0x2e, 0x02, 0xf1, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x51, 0x81, 0x90, 0x01, 0x00,</div><div class='add'>+	0x30, 0x02, 0xf2, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x52,</div><div class='add'>+	0x81, 0x90, 0x01, 0x00, 0x32, 0x02, 0xf3, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x53, 0x81, 0x90, 0x01, 0x00, 0x34, 0x02, 0xf4, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x54, 0x81, 0x90, 0x01, 0x00,</div><div class='add'>+	0x36, 0x02, 0xf5, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55,</div><div class='add'>+	0x81, 0x90, 0x01, 0x00, 0x38, 0x02, 0xf6, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x56, 0x81, 0x90, 0x01, 0x00, 0x3a, 0x02, 0xf7, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x57, 0x81, 0x90, 0x01, 0x00,</div><div class='add'>+	0x3c, 0x02, 0xf8, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x58,</div><div class='add'>+	0x81, 0x90, 0x01, 0x00, 0x3e, 0x02, 0xf9, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x59, 0x81, 0x90, 0x01, 0x00, 0x40, 0x02, 0xfa, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5a, 0x81, 0x90, 0x01, 0x00,</div><div class='add'>+	0x42, 0x02, 0xfb, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5b,</div><div class='add'>+	0x81, 0x90, 0x01, 0x00, 0x44, 0x02, 0xfc, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x5c, 0x81, 0x90, 0x01, 0x00, 0x46, 0x02, 0xfd, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5d, 0x81, 0x90, 0x01, 0x00,</div><div class='add'>+	0x48, 0x02, 0xfe, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5e,</div><div class='add'>+	0x81, 0x90, 0x01, 0x00, 0x4a, 0x02, 0xff, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x5f, 0x81, 0x90, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x40, 0xa5, 0x9b, 0x01, 0x00,</div><div class='add'>+	0xd8, 0x02, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0xf8, 0x02, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0xd0, 0x14, 0x2e, 0x06, 0xa5, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0xd3, 0xa7, 0xcb, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf1, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf2, 0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf4,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf5, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xfa, 0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xfb,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xeb, 0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xee,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xef, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf3, 0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf6,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xfd, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xdb, 0x01, 0x00, 0xc7, 0xe1, 0xb1, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x66, 0x02, 0x00, 0x48, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x51, 0x40, 0x1a, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x4d, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x45, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x63, 0x02, 0xa2, 0x41, 0x83, 0x50, 0x00, 0x00, 0x5f, 0x02, 0x49, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x52, 0x40, 0x1c, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x4e, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x46, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x68, 0x02, 0xa2, 0x41, 0x83, 0x50, 0x00, 0x00,</div><div class='add'>+	0x5f, 0x02, 0x4a, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0,</div><div class='add'>+	0x9e, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x80, 0xd8, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xa1, 0xd0, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xa2,</div><div class='add'>+	0xd2, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xa4, 0xd4, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xd0, 0xd6, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd1,</div><div class='add'>+	0xdc, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd2, 0xde, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x88, 0xda, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd4,</div><div class='add'>+	0x8e, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd3, 0xe6, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xac, 0xec, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x99,</div><div class='add'>+	0xfa, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd5, 0xe0, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xd5, 0xe2, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd5,</div><div class='add'>+	0xe4, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd5, 0xe8, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xd5, 0xea, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd5,</div><div class='add'>+	0xf4, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd5, 0xf6, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xd5, 0xf8, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xc7,</div><div class='add'>+	0xa9, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4f, 0x40, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x84, 0x02, 0x00, 0x40, 0x91, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x91, 0xb0, 0x01, 0x00, 0x07, 0x00, 0x00, 0x40, 0xa3, 0x9b, 0x01, 0x00,</div><div class='add'>+	0x08, 0x00, 0x00, 0xdd, 0x81, 0xf4, 0x01, 0x00, 0x88, 0x02, 0x00, 0x40,</div><div class='add'>+	0x80, 0xc8, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x10, 0xb1, 0x00, 0x00,</div><div class='add'>+	0x8d, 0x02, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x98, 0x02, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x98, 0x02, 0x00, 0x46, 0xa3, 0xb3, 0x00, 0x00,</div><div class='add'>+	0x9b, 0x02, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xa1, 0x02, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x8f, 0x02, 0x23, 0x50, 0xa5, 0x6f, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x50, 0xa5, 0xb3, 0x01, 0x00, 0xe8, 0x02, 0x00, 0x42,</div><div class='add'>+	0xa5, 0x63, 0x01, 0x00, 0xf8, 0x02, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0xd0, 0x14, 0x2d, 0x40, 0x49, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd0,</div><div class='add'>+	0xba, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xde, 0xa1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf8, 0x00, 0xb0, 0x01, 0x00, 0x97, 0x02, 0x22, 0x44,</div><div class='add'>+	0xa5, 0x53, 0x00, 0x00, 0x94, 0x02, 0x00, 0x41, 0xa1, 0xc1, 0x00, 0x00,</div><div class='add'>+	0x55, 0x01, 0x00, 0xdd, 0xa1, 0xb1, 0x00, 0x00, 0xe8, 0x02, 0x00, 0xde,</div><div class='add'>+	0xa1, 0x33, 0x01, 0x00, 0xf8, 0x02, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x55, 0x01, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x45,</div><div class='add'>+	0xbf, 0xb3, 0x01, 0x00, 0x50, 0x01, 0xa2, 0xd2, 0x77, 0x7d, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xd2, 0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xde,</div><div class='add'>+	0x63, 0xb1, 0x01, 0x00, 0x9e, 0x02, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x55, 0x01, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xe8, 0x02, 0x00, 0x54,</div><div class='add'>+	0xa5, 0x33, 0x01, 0x00, 0xf8, 0x02, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0xd0, 0x14, 0x2d, 0x40, 0x49, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8,</div><div class='add'>+	0xd0, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xd2, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf8, 0xd4, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8,</div><div class='add'>+	0xd6, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x08, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xac, 0x02, 0x00, 0x40, 0x81, 0x98, 0x01, 0x00, 0x60, 0x02, 0x00, 0x46,</div><div class='add'>+	0x83, 0x30, 0x01, 0x00, 0x55, 0x01, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xa0, 0x9e, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xe8,</div><div class='add'>+	0x43, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xe9, 0x45, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xea, 0x49, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xeb,</div><div class='add'>+	0xa1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4f, 0x40, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xd0, 0x14, 0x2e, 0x40, 0x49, 0xb1, 0x01, 0x00, 0x05, 0x00, 0x00, 0x40,</div><div class='add'>+	0xa3, 0x9b, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0xc1, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x08, 0x00, 0x00, 0xdd, 0x81, 0xf4, 0x01, 0x00, 0xbd, 0x02, 0x00, 0x40,</div><div class='add'>+	0x10, 0xc9, 0x00, 0x00, 0xc3, 0x02, 0x00, 0x05, 0x81, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x50, 0x01, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xcb, 0x02, 0x00, 0x05,</div><div class='add'>+	0x81, 0xb0, 0x00, 0x00, 0x50, 0x01, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xd0, 0x02, 0x00, 0x44, 0xa5, 0xb3, 0x00, 0x00, 0xd2, 0x02, 0x00, 0x44,</div><div class='add'>+	0xa5, 0xb3, 0x00, 0x00, 0x02, 0x00, 0x00, 0x40, 0xa4, 0xe7, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xe0, 0x81, 0xb1, 0x01, 0x00, 0xff, 0xff, 0x00, 0xc1,</div><div class='add'>+	0xf0, 0x89, 0x01, 0x00, 0xc8, 0x02, 0x22, 0x41, 0x81, 0x50, 0x00, 0x00,</div><div class='add'>+	0xc4, 0x02, 0x00, 0x41, 0xc1, 0xc3, 0x00, 0x00, 0xda, 0x02, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0xf8, 0x02, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x55, 0x01, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x02, 0x00, 0x00, 0x40,</div><div class='add'>+	0xa4, 0xe7, 0x01, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x91, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xff, 0xff, 0x00, 0xc9, 0xf0, 0x89, 0x01, 0x00, 0xc8, 0x02, 0x22, 0x41,</div><div class='add'>+	0x81, 0x50, 0x00, 0x00, 0xcc, 0x02, 0x00, 0x41, 0xc1, 0xc3, 0x00, 0x00,</div><div class='add'>+	0xff, 0xff, 0x00, 0xde, 0x85, 0x89, 0x01, 0x00, 0xc8, 0x02, 0x00, 0xc2,</div><div class='add'>+	0xe0, 0xb1, 0x00, 0x00, 0xff, 0xff, 0x00, 0xde, 0x95, 0x89, 0x01, 0x00,</div><div class='add'>+	0xc8, 0x02, 0x00, 0xca, 0xe0, 0xb1, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe7, 0xa7, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xd8, 0xa9, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x49, 0xb1, 0x01, 0x00, 0xae, 0x03, 0x00, 0xcb, 0xa3, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x20, 0x46, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd2,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd3, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xd4, 0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd0,</div><div class='add'>+	0xe1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd1, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x20, 0x00, 0x00, 0x20, 0x62, 0xdd, 0x01, 0x00, 0xe2, 0x02, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x80, 0xcc, 0x85, 0x93, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xe7, 0xa7, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd8,</div><div class='add'>+	0xa9, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x49, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xae, 0x03, 0x00, 0xcb, 0xa3, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x20,</div><div class='add'>+	0x46, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd2, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xd0, 0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd3,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0xe1, 0x02, 0x00, 0xd4, 0xe1, 0xb1, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0xa2, 0xcc,</div><div class='add'>+	0x85, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x81, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xfa, 0x02, 0xa2, 0x41, 0x81, 0x50, 0x00, 0x00, 0xf9, 0x02, 0xa2, 0xf2,</div><div class='add'>+	0x80, 0x30, 0x00, 0x00, 0x00, 0x00, 0x80, 0xcc, 0x85, 0x83, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xb5, 0x03, 0x00, 0x40, 0xa1, 0x99, 0x01, 0x00, 0x00, 0x00, 0x2f, 0x41,</div><div class='add'>+	0x99, 0xb3, 0x01, 0x00, 0x0a, 0x03, 0x22, 0x44, 0x81, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x12, 0x03, 0x22, 0x48, 0x81, 0x6c, 0x00, 0x00, 0x0c, 0x03, 0x22, 0x4c,</div><div class='add'>+	0x81, 0x6c, 0x00, 0x00, 0x16, 0x03, 0x22, 0x50, 0x81, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x17, 0x03, 0x22, 0x54, 0x81, 0x6c, 0x00, 0x00, 0x19, 0x03, 0x22, 0x58,</div><div class='add'>+	0x81, 0x6c, 0x00, 0x00, 0x1e, 0x03, 0x22, 0x5c, 0x81, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x50, 0x01, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0xbc,</div><div class='add'>+	0x09, 0xb0, 0x01, 0x00, 0xdd, 0x9f, 0x00, 0xca, 0x01, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x03, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0xf3, 0x83, 0x01, 0x00, 0x10, 0x03, 0xa2, 0x42, 0x05, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x05, 0xb0, 0x01, 0x00, 0xdd, 0x9f, 0x22, 0xca,</div><div class='add'>+	0x07, 0x14, 0x00, 0x00, 0xdd, 0x9f, 0x00, 0x45, 0xf3, 0x93, 0x00, 0x00,</div><div class='add'>+	0xdd, 0x9f, 0x20, 0x43, 0x95, 0x6f, 0x00, 0x00, 0xdd, 0x9f, 0x80, 0xca,</div><div class='add'>+	0x05, 0x30, 0x00, 0x00, 0xdd, 0x9f, 0x22, 0x01, 0x80, 0x30, 0x00, 0x00,</div><div class='add'>+	0xdd, 0x9f, 0x00, 0xcb, 0xdb, 0x91, 0x00, 0x00, 0x57, 0x01, 0x00, 0xbc,</div><div class='add'>+	0xab, 0xb3, 0x00, 0x00, 0x00, 0x00, 0x00, 0xbc, 0xb1, 0xb3, 0x01, 0x00,</div><div class='add'>+	0xdd, 0x9f, 0x00, 0xca, 0xcf, 0xb3, 0x00, 0x00, 0xff, 0x00, 0x00, 0xca,</div><div class='add'>+	0x81, 0x88, 0x01, 0x00, 0xdd, 0x9f, 0xa2, 0x40, 0x74, 0x7d, 0x00, 0x00,</div><div class='add'>+	0x60, 0x00, 0x20, 0x40, 0x60, 0x99, 0x01, 0x00, 0x1b, 0x03, 0xa8, 0xb1,</div><div class='add'>+	0x82, 0x30, 0x00, 0x00, 0x1a, 0x03, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xdd, 0x9f, 0x00, 0xca, 0x79, 0xb3, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4e, 0x81, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x43, 0xcb, 0x83, 0x01, 0x00, 0x00, 0x00, 0x45, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x22, 0x03, 0xa2, 0x41, 0x81, 0x50, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x45, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x45, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x2d, 0x03, 0x91, 0x82, 0x82, 0x30, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x8a, 0x80, 0xb0, 0x01, 0x00, 0xae, 0x9f, 0x00, 0x40,</div><div class='add'>+	0x80, 0xce, 0x01, 0x00, 0x2b, 0x03, 0xa6, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x2d, 0x03, 0x56, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xb5, 0x03, 0x00, 0x40,</div><div class='add'>+	0xa1, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x53, 0x07, 0x90, 0x01, 0x00,</div><div class='add'>+	0xb5, 0x03, 0x00, 0x40, 0xa1, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x52,</div><div class='add'>+	0x07, 0x90, 0x01, 0x00, 0xd8, 0x9f, 0x00, 0x41, 0x8b, 0xb3, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4e, 0x81, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x42,</div><div class='add'>+	0xcd, 0x83, 0x01, 0x00, 0x00, 0x00, 0x46, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x32, 0x03, 0xa2, 0x41, 0x81, 0x50, 0x00, 0x00, 0x00, 0x00, 0x46, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x46, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x3d, 0x03, 0x91, 0x81, 0x82, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89,</div><div class='add'>+	0x80, 0xb0, 0x01, 0x00, 0xae, 0x9f, 0x00, 0x40, 0x80, 0xce, 0x01, 0x00,</div><div class='add'>+	0x3b, 0x03, 0xa6, 0x40, 0x81, 0x32, 0x00, 0x00, 0x3d, 0x03, 0x55, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0xb5, 0x03, 0x00, 0x40, 0xa1, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x52, 0x07, 0x90, 0x01, 0x00, 0xb5, 0x03, 0x00, 0x40,</div><div class='add'>+	0xa1, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x53, 0x07, 0x90, 0x01, 0x00,</div><div class='add'>+	0xd8, 0x9f, 0x00, 0x41, 0x8b, 0xb3, 0x00, 0x00, 0xb0, 0x03, 0x00, 0x40,</div><div class='add'>+	0xa1, 0x99, 0x01, 0x00, 0xc4, 0x14, 0x2f, 0x40, 0x99, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x57, 0x01, 0x00, 0x40, 0x49, 0xb1, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x30, 0x94, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00, 0x00, 0x90, 0x00, 0xf8,</div><div class='add'>+	0x80, 0x98, 0x01, 0x00, 0x10, 0x00, 0x00, 0xf2, 0x88, 0xe4, 0x01, 0x00,</div><div class='add'>+	0x20, 0x00, 0x00, 0x40, 0x20, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5f,</div><div class='add'>+	0x23, 0x91, 0x01, 0x00, 0x4d, 0x03, 0x1f, 0x91, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x30, 0x00, 0x00, 0x40, 0x20, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5f,</div><div class='add'>+	0x23, 0x91, 0x01, 0x00, 0x50, 0x03, 0x1f, 0x91, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x40, 0x20, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5f,</div><div class='add'>+	0x23, 0x91, 0x01, 0x00, 0x53, 0x03, 0x1f, 0x91, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x5f, 0x23, 0x91, 0x01, 0x00, 0x55, 0x03, 0x1f, 0x91,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x00, 0x08, 0x80, 0x40, 0x20, 0x99, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x47,</div><div class='add'>+	0x84, 0xb0, 0x01, 0x00, 0x00, 0x00, 0xa2, 0x48, 0x84, 0x84, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x5f, 0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5c,</div><div class='add'>+	0x8f, 0x90, 0x01, 0x00, 0x00, 0x00, 0x00, 0x47, 0x62, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x5a, 0x03, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x08, 0x00, 0x47,</div><div class='add'>+	0x8e, 0xc8, 0x01, 0x00, 0x58, 0x03, 0x00, 0x5c, 0x8f, 0x80, 0x00, 0x00,</div><div class='add'>+	0xe0, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00, 0x58, 0x15, 0x2d, 0x40,</div><div class='add'>+	0x8d, 0xb0, 0x01, 0x00, 0xd0, 0x14, 0x2d, 0xf0, 0x88, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xfa, 0x8a, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x45,</div><div class='add'>+	0x81, 0xb0, 0x01, 0x00, 0x07, 0x00, 0x00, 0x45, 0x82, 0x88, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x43, 0x8b, 0xf0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x48,</div><div class='add'>+	0x83, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x46, 0x82, 0x94, 0x01, 0x00,</div><div class='add'>+	0x20, 0x00, 0x00, 0x41, 0x60, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x8d, 0xc0, 0x01, 0x00, 0x74, 0x03, 0x22, 0x5f, 0x8d, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x65, 0x03, 0xa2, 0x41, 0x81, 0x50, 0x00, 0x00, 0x63, 0x03, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x08, 0x00, 0x00, 0x40, 0x85, 0x98, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x44, 0x82, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x86, 0xb0, 0x01, 0x00, 0x00, 0x1c, 0x00, 0x43, 0x86, 0xd8, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0xa6, 0x41, 0x85, 0x50, 0x01, 0x00, 0x70, 0x03, 0x00, 0x41,</div><div class='add'>+	0x83, 0xe0, 0x00, 0x00, 0x6e, 0x03, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x48, 0x85, 0xe0, 0x01, 0x00, 0xd0, 0x14, 0x2f, 0x46,</div><div class='add'>+	0x84, 0x94, 0x01, 0x00, 0x20, 0x00, 0x00, 0x42, 0x60, 0x99, 0x01, 0x00,</div><div class='add'>+	0xc0, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00, 0x00, 0x00, 0x80, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x07, 0x00, 0x00, 0x45, 0x80, 0x88, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x43, 0x8b, 0xf0, 0x01, 0x00, 0x00, 0x04, 0x00, 0x40,</div><div class='add'>+	0x83, 0x98, 0x01, 0x00, 0x85, 0x03, 0xa0, 0x41, 0x81, 0x50, 0x00, 0x00,</div><div class='add'>+	0x83, 0x03, 0x00, 0x41, 0x82, 0xe8, 0x00, 0x00, 0x00, 0x00, 0x80, 0x41,</div><div class='add'>+	0x8e, 0xc0, 0x01, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x49, 0xb1, 0x01, 0x00, 0x00, 0x02, 0x00, 0x40, 0x83, 0x98, 0x01, 0x00,</div><div class='add'>+	0x00, 0x39, 0x00, 0x40, 0x45, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0x8b, 0x03, 0xa2, 0x41, 0x83, 0x50, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x85, 0xb0, 0x01, 0x00, 0x0b, 0x00, 0x00, 0x44,</div><div class='add'>+	0x82, 0xf4, 0x01, 0x00, 0x1a, 0x15, 0x00, 0xa6, 0x86, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x70, 0x15, 0x00, 0x40, 0x45, 0x99, 0x01, 0x00, 0x00, 0x08, 0x00, 0x40,</div><div class='add'>+	0xf1, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x42, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x39, 0x00, 0x40, 0xe1, 0x99, 0x01, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x61, 0x99, 0x01, 0x00, 0x70, 0x15, 0x00, 0x43, 0x62, 0x99, 0x01, 0x00,</div><div class='add'>+	0x95, 0x03, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0x97, 0x03, 0x22, 0x5a,</div><div class='add'>+	0x73, 0x7d, 0x00, 0x00, 0x7a, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00,</div><div class='add'>+	0x98, 0x03, 0xa8, 0xb1, 0x7e, 0x31, 0x00, 0x00, 0x00, 0x08, 0x00, 0x42,</div><div class='add'>+	0x84, 0xc8, 0x01, 0x00, 0x90, 0x03, 0xa2, 0x41, 0x83, 0x50, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x58, 0x15, 0x2d, 0x40,</div><div class='add'>+	0x8d, 0xb0, 0x01, 0x00, 0xd0, 0x14, 0x2d, 0xf0, 0x88, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x8f, 0xb0, 0x01, 0x00, 0x01, 0x00, 0x00, 0xa6,</div><div class='add'>+	0x90, 0xb0, 0x01, 0x00, 0x00, 0xf8, 0x00, 0x48, 0x90, 0x98, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x45, 0x93, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xfa,</div><div class='add'>+	0x8a, 0xb0, 0x01, 0x00, 0x80, 0x03, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x02, 0x00, 0x00, 0xa6, 0x80, 0xb0, 0x01, 0x00, 0xac, 0x03, 0x22, 0x40,</div><div class='add'>+	0x82, 0x6c, 0x00, 0x00, 0xb0, 0x03, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x58, 0x03, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x8d, 0xc0, 0x01, 0x00, 0xb5, 0x03, 0x22, 0x5f, 0x8d, 0x6c, 0x00, 0x00,</div><div class='add'>+	0xa7, 0x03, 0xa2, 0x41, 0x93, 0x50, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0xff, 0x07, 0x00, 0x47, 0x84, 0x88, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0xa6, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xed, 0x9f, 0x00, 0x47,</div><div class='add'>+	0x80, 0x30, 0x01, 0x00, 0x00, 0x02, 0x00, 0x47, 0x8e, 0xc8, 0x01, 0x00,</div><div class='add'>+	0xb0, 0x03, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0x50, 0xb3, 0x01, 0x00, 0xbb, 0x03, 0x20, 0x18, 0x89, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0xa6, 0x84, 0xb0, 0x01, 0x00, 0x20, 0x00, 0x00, 0xa6,</div><div class='add'>+	0x86, 0xb0, 0x01, 0x00, 0x00, 0x10, 0x00, 0x40, 0x55, 0x9b, 0x01, 0x00,</div><div class='add'>+	0xbe, 0x03, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0xa6,</div><div class='add'>+	0x84, 0xb0, 0x01, 0x00, 0x20, 0x00, 0x00, 0xa6, 0x86, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x10, 0x00, 0x40, 0x55, 0x9b, 0x01, 0x00, 0x00, 0x00, 0x00, 0x42,</div><div class='add'>+	0x50, 0xd3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xa8, 0x4f, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x43, 0x4e, 0xd3, 0x01, 0x00, 0x6e, 0x03, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x82, 0x03, 0x00, 0x42, 0x80, 0x30, 0x01, 0x00,</div><div class='add'>+	0xb0, 0x03, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0xc7, 0x03, 0x22, 0xa7,</div><div class='add'>+	0x8f, 0x6c, 0x00, 0x00, 0x5a, 0x03, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0xc4, 0x03, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0xc8, 0x14, 0x2e, 0xbb, 0x85, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xee, 0x82, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0xe0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xa2, 0xa0, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x44, 0xa5, 0xb3, 0x01, 0x00, 0xe1, 0x9f, 0x00, 0xca,</div><div class='add'>+	0xa7, 0x33, 0x01, 0x00, 0xe0, 0x9f, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xd6, 0x03, 0x22, 0x42,</div><div class='add'>+	0x75, 0x6f, 0x00, 0x00, 0xd8, 0x03, 0x22, 0x41, 0x75, 0x6f, 0x00, 0x00,</div><div class='add'>+	0xda, 0x03, 0x1e, 0xca, 0x81, 0x32, 0x00, 0x00, 0xdc, 0x03, 0x1f, 0xca,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0xca, 0xc9, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xdd, 0x9f, 0x00, 0x42, 0x75, 0xb3, 0x00, 0x00, 0x00, 0x00, 0x00, 0xca,</div><div class='add'>+	0xcd, 0xb1, 0x01, 0x00, 0xdd, 0x9f, 0x00, 0x41, 0x75, 0xb3, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xca, 0xcf, 0xb1, 0x01, 0x00, 0xdd, 0x9f, 0x00, 0x40,</div><div class='add'>+	0x75, 0xb3, 0x00, 0x00, 0x00, 0x81, 0x00, 0xa6, 0xc6, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xdd, 0x9f, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x80, 0x00, 0xa6,</div><div class='add'>+	0xc6, 0xb1, 0x01, 0x00, 0xdd, 0x9f, 0x00, 0x40, 0x75, 0xb3, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x45, 0x01, 0x00, 0x4d, 0x93, 0x30, 0x01, 0x00,</div><div class='add'>+	0x45, 0x01, 0x00, 0x4e, 0x93, 0x30, 0x01, 0x00, 0x45, 0x01, 0x00, 0x4c,</div><div class='add'>+	0x93, 0x30, 0x01, 0x00, 0xec, 0x9f, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0xdd, 0x9f, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x54, 0x95, 0x00, 0x40,</div><div class='add'>+	0x45, 0x99, 0x01, 0x00, 0xdd, 0x9f, 0x00, 0xca, 0xe5, 0xb1, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xcc, 0x14, 0x2e, 0x40, 0x87, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xa2,</div><div class='add'>+	0xa0, 0xb3, 0x01, 0x00, 0x15, 0x04, 0x00, 0x43, 0xb2, 0x33, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x68, 0xda, 0x89, 0xb0, 0x01, 0x00, 0x7c, 0x00, 0x00, 0x40,</div><div class='add'>+	0x8b, 0x98, 0x01, 0x00, 0x00, 0x00, 0x00, 0x50, 0x89, 0xf0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x89, 0xd0, 0x01, 0x00, 0x03, 0x00, 0x00, 0x44,</div><div class='add'>+	0x88, 0x8c, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44, 0x87, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0xa5, 0xb3, 0x01, 0x00, 0x15, 0x04, 0x00, 0x43,</div><div class='add'>+	0xb2, 0x33, 0x01, 0x00, 0x00, 0x00, 0x00, 0xda, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x44, 0x87, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0xa5, 0xc3, 0x01, 0x00, 0x0b, 0x04, 0x22, 0x44, 0x89, 0x50, 0x00, 0x00,</div><div class='add'>+	0x0b, 0x04, 0x22, 0x44, 0x8b, 0x50, 0x00, 0x00, 0xfa, 0x03, 0xa2, 0x50,</div><div class='add'>+	0xa5, 0x6f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0xa5, 0xe3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xca, 0xa7, 0xb3, 0x01, 0x00, 0xe1, 0x9f, 0x00, 0xbb,</div><div class='add'>+	0x85, 0x30, 0x01, 0x00, 0xcc, 0x14, 0x2e, 0xd2, 0x95, 0xc3, 0x01, 0x00,</div><div class='add'>+	0xae, 0x03, 0x00, 0xcb, 0xa3, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x20,</div><div class='add'>+	0x42, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x50, 0x81, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x08, 0x04, 0xa2, 0x41, 0x81, 0x50, 0x00, 0x00, 0x07, 0x04, 0xa2, 0xf2,</div><div class='add'>+	0x80, 0x30, 0x00, 0x00, 0xfa, 0x03, 0x00, 0x40, 0xa5, 0xb3, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x42, 0xa5, 0xe3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xca,</div><div class='add'>+	0xa7, 0xb3, 0x01, 0x00, 0xe1, 0x9f, 0x00, 0xbb, 0x85, 0x30, 0x01, 0x00,</div><div class='add'>+	0xe0, 0x9f, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd9, 0x2b, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x10, 0x00, 0x40, 0x83, 0x98, 0x01, 0x00, 0xdb, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0xff, 0xff, 0x00, 0x94, 0xb4, 0x8b, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd9,</div><div class='add'>+	0x2b, 0xb1, 0x01, 0x00, 0x00, 0x10, 0x00, 0x40, 0x83, 0x98, 0x01, 0x00,</div><div class='add'>+	0xdd, 0x00, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x80, 0x94,</div><div class='add'>+	0xb4, 0xb3, 0x01, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xd9, 0x2b, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xda,</div><div class='add'>+	0x27, 0xb1, 0x01, 0x00, 0x06, 0xc0, 0x00, 0x40, 0x2d, 0x99, 0x01, 0x00,</div><div class='add'>+	0xde, 0x00, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x00, 0x10, 0x00, 0x40,</div><div class='add'>+	0x83, 0x98, 0x01, 0x00, 0x02, 0xc4, 0x00, 0x41, 0x2c, 0x99, 0x01, 0x00,</div><div class='add'>+	0xde, 0x00, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x00, 0x40, 0x00, 0x40,</div><div class='add'>+	0x83, 0x98, 0x01, 0x00, 0x05, 0x82, 0x00, 0x41, 0x2c, 0x99, 0x01, 0x00,</div><div class='add'>+	0xde, 0x00, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x2d, 0x04, 0x80, 0x94,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x0c, 0x01, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x28, 0x04, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x80, 0x00, 0x40,</div><div class='add'>+	0x2d, 0x99, 0x01, 0x00, 0xde, 0x00, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x31, 0x04, 0x00, 0x12,</div><div class='add'>+	0x10, 0xc9, 0x00, 0x00, 0x00, 0x48, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00,</div><div class='add'>+	0xc0, 0x49, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00, 0x80, 0x4b, 0x80, 0x40,</div><div class='add'>+	0x0b, 0x98, 0x01, 0x00, 0x40, 0x4d, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00,</div><div class='add'>+	0x00, 0x4f, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00, 0xc0, 0x50, 0x80, 0x40,</div><div class='add'>+	0x0b, 0x98, 0x01, 0x00, 0x80, 0x52, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00,</div><div class='add'>+	0x40, 0x54, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00, 0x00, 0x56, 0x80, 0x40,</div><div class='add'>+	0x0b, 0x98, 0x01, 0x00, 0xc0, 0x57, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00,</div><div class='add'>+	0x80, 0x59, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00, 0x40, 0x5b, 0x80, 0x40,</div><div class='add'>+	0x0b, 0x98, 0x01, 0x00, 0x00, 0x5d, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00,</div><div class='add'>+	0xc0, 0x5e, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00, 0x80, 0x60, 0x80, 0x40,</div><div class='add'>+	0x0b, 0x98, 0x01, 0x00, 0x40, 0x62, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00,</div><div class='add'>+	0x00, 0x64, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00, 0xc0, 0x65, 0x80, 0x40,</div><div class='add'>+	0x0b, 0x98, 0x01, 0x00, 0x80, 0x67, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00,</div><div class='add'>+	0x40, 0x69, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00, 0x00, 0x6b, 0x80, 0x40,</div><div class='add'>+	0x0b, 0x98, 0x01, 0x00, 0xc0, 0x6c, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00,</div><div class='add'>+	0x80, 0x6e, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00, 0x40, 0x70, 0x80, 0x40,</div><div class='add'>+	0x0b, 0x98, 0x01, 0x00, 0x00, 0x72, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00,</div><div class='add'>+	0xc0, 0x73, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00, 0x80, 0x75, 0x80, 0x40,</div><div class='add'>+	0x0b, 0x98, 0x01, 0x00, 0x40, 0x77, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00,</div><div class='add'>+	0x00, 0x79, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00, 0xc0, 0x7a, 0x80, 0x40,</div><div class='add'>+	0x0b, 0x98, 0x01, 0x00, 0x80, 0x7c, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00,</div><div class='add'>+	0x40, 0x7e, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x59, 0x04, 0x00, 0x12, 0x10, 0xc9, 0x00, 0x00,</div><div class='add'>+	0x00, 0x80, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00, 0x00, 0x82, 0x80, 0x40,</div><div class='add'>+	0x0b, 0x98, 0x01, 0x00, 0x00, 0x84, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00,</div><div class='add'>+	0x00, 0x86, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00, 0x00, 0x88, 0x80, 0x40,</div><div class='add'>+	0x0b, 0x98, 0x01, 0x00, 0x00, 0x8a, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00,</div><div class='add'>+	0x00, 0x8c, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00, 0x00, 0x8e, 0x80, 0x40,</div><div class='add'>+	0x0b, 0x98, 0x01, 0x00, 0x00, 0x90, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00,</div><div class='add'>+	0x00, 0x92, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00, 0x00, 0x94, 0x80, 0x40,</div><div class='add'>+	0x0b, 0x98, 0x01, 0x00, 0x00, 0x96, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00,</div><div class='add'>+	0x00, 0x98, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00, 0x00, 0x9a, 0x80, 0x40,</div><div class='add'>+	0x0b, 0x98, 0x01, 0x00, 0x00, 0x9c, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00,</div><div class='add'>+	0x00, 0x9e, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00, 0x00, 0xa0, 0x80, 0x40,</div><div class='add'>+	0x0b, 0x98, 0x01, 0x00, 0x00, 0xa2, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00,</div><div class='add'>+	0x00, 0xa4, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00, 0x00, 0xa6, 0x80, 0x40,</div><div class='add'>+	0x0b, 0x98, 0x01, 0x00, 0x00, 0xa8, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00,</div><div class='add'>+	0x00, 0xaa, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00, 0x00, 0xac, 0x80, 0x40,</div><div class='add'>+	0x0b, 0x98, 0x01, 0x00, 0x00, 0xae, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00,</div><div class='add'>+	0x00, 0xb0, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00, 0x00, 0xb2, 0x80, 0x40,</div><div class='add'>+	0x0b, 0x98, 0x01, 0x00, 0x00, 0xb4, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00,</div><div class='add'>+	0x00, 0xb6, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00, 0x00, 0xb8, 0x80, 0x40,</div><div class='add'>+	0x0b, 0x98, 0x01, 0x00, 0x00, 0xba, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00,</div><div class='add'>+	0x00, 0xbc, 0x80, 0x40, 0x0b, 0x98, 0x01, 0x00, 0x00, 0xbe, 0x80, 0x40,</div><div class='add'>+	0x0b, 0x98, 0x01, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x87, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x97, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4b, 0x80, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x01, 0x00, 0x00, 0xa6, 0x82, 0xb1, 0x01, 0x00, 0x82, 0x04, 0x85, 0x41,</div><div class='add'>+	0x97, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x97, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x97, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4b,</div><div class='add'>+	0x90, 0xb1, 0x01, 0x00, 0x01, 0x00, 0x00, 0xa6, 0x92, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x87, 0x04, 0x85, 0x41, 0x97, 0x40, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x90, 0x04, 0x60, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x80, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xff, 0xff, 0xf0, 0x4b, 0x82, 0x89, 0x01, 0x00, 0x93, 0x04, 0x60, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4a, 0x80, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x01, 0x00, 0xf0, 0xa6, 0x82, 0xb1, 0x01, 0x00, 0x96, 0x04, 0x60, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0xff, 0xff, 0x00, 0x4b, 0x84, 0x89, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0xf0, 0xc2, 0x24, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4a,</div><div class='add'>+	0x90, 0xb1, 0x01, 0x00, 0xff, 0xff, 0x80, 0x4b, 0x92, 0x89, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4a, 0x90, 0xb1, 0x01, 0x00, 0x01, 0x00, 0x80, 0xa6,</div><div class='add'>+	0x92, 0xb1, 0x01, 0x00, 0xff, 0xff, 0x00, 0x4b, 0x94, 0x89, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0xca, 0x94, 0xb0, 0x01, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x10, 0x00, 0x00, 0x4e, 0x98, 0xe4, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x07, 0x98, 0x94, 0x01, 0x00, 0x00, 0x00, 0x00, 0x43,</div><div class='add'>+	0x99, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x80, 0x98, 0x94, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x49, 0x99, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4c,</div><div class='add'>+	0x88, 0x94, 0x01, 0x00, 0xa6, 0x04, 0x47, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0xad, 0x04, 0x22, 0x20, 0x87, 0x6f, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0xa6, 0x04, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x1f, 0x80, 0x86, 0xb3, 0x01, 0x00, 0xb0, 0x04, 0x22, 0x4f,</div><div class='add'>+	0x77, 0x7d, 0x00, 0x00, 0xc0, 0x04, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4f, 0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0x62, 0xb1, 0x01, 0x00, 0xb1, 0x04, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0xb8, 0x04, 0x22, 0x4b, 0x89, 0x7c, 0x00, 0x00, 0xb6, 0x04, 0x22, 0x4f,</div><div class='add'>+	0x77, 0x7d, 0x00, 0x00, 0xc0, 0x04, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x45, 0x62, 0xb1, 0x01, 0x00, 0xb6, 0x04, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x80, 0x20, 0x87, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50,</div><div class='add'>+	0x99, 0xb0, 0x01, 0x00, 0x6f, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00,</div><div class='add'>+	0xc1, 0x04, 0xa8, 0xb1, 0x52, 0x33, 0x00, 0x00, 0xc6, 0x04, 0x22, 0x4b,</div><div class='add'>+	0x53, 0x7f, 0x00, 0x00, 0x6f, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00,</div><div class='add'>+	0xc4, 0x04, 0xa8, 0xb1, 0x7e, 0x31, 0x00, 0x00, 0xc1, 0x04, 0xa2, 0x41,</div><div class='add'>+	0x99, 0x50, 0x00, 0x00, 0x00, 0x00, 0xa2, 0x4f, 0x77, 0xfd, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x10, 0x00, 0x00, 0x4e, 0x98, 0xe4, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x07, 0x98, 0x94, 0x01, 0x00, 0x00, 0x00, 0x00, 0x43,</div><div class='add'>+	0x99, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x80, 0x98, 0x94, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x48, 0x99, 0xe0, 0x01, 0x00, 0xd6, 0x04, 0x00, 0x4c,</div><div class='add'>+	0x88, 0x94, 0x00, 0x00, 0xd6, 0x04, 0x47, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0xdd, 0x04, 0x22, 0x20, 0x87, 0x6f, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0xd6, 0x04, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x1f, 0x80, 0x86, 0xb3, 0x01, 0x00, 0xe0, 0x04, 0x22, 0x4f,</div><div class='add'>+	0x77, 0x7d, 0x00, 0x00, 0xf0, 0x04, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4f, 0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0x62, 0xb1, 0x01, 0x00, 0xe1, 0x04, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0xe8, 0x04, 0x22, 0x4a, 0x89, 0x7c, 0x00, 0x00, 0xe6, 0x04, 0x22, 0x4f,</div><div class='add'>+	0x77, 0x7d, 0x00, 0x00, 0xf0, 0x04, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x45, 0x62, 0xb1, 0x01, 0x00, 0xe6, 0x04, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x80, 0x20, 0x87, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50,</div><div class='add'>+	0x99, 0xb0, 0x01, 0x00, 0x6f, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00,</div><div class='add'>+	0xf1, 0x04, 0xa8, 0xb1, 0x52, 0x33, 0x00, 0x00, 0xf6, 0x04, 0x22, 0x4a,</div><div class='add'>+	0x53, 0x7f, 0x00, 0x00, 0x6f, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00,</div><div class='add'>+	0xf4, 0x04, 0xa8, 0xb1, 0x7e, 0x31, 0x00, 0x00, 0xf1, 0x04, 0xa2, 0x41,</div><div class='add'>+	0x99, 0x50, 0x00, 0x00, 0x00, 0x00, 0xa2, 0x4f, 0x77, 0xfd, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x7b, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x05, 0xa8, 0xb1, 0x80, 0x30, 0x00, 0x00, 0x12, 0x05, 0x1d, 0x40,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x40, 0x18, 0x00, 0x40, 0x49, 0x99, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0xa6, 0x86, 0xb0, 0x01, 0x00, 0x10, 0x05, 0xa2, 0x40,</div><div class='add'>+	0x86, 0x04, 0x00, 0x00, 0xde, 0x9f, 0x9c, 0x40, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0xff, 0xff, 0x00, 0x40, 0x88, 0x88, 0x01, 0x00, 0x30, 0x05, 0x00, 0x50,</div><div class='add'>+	0x47, 0x31, 0x01, 0x00, 0x36, 0x00, 0x00, 0x44, 0x88, 0xcc, 0x01, 0x00,</div><div class='add'>+	0x0c, 0x05, 0x52, 0x40, 0x81, 0x32, 0x00, 0x00, 0x30, 0x05, 0x00, 0x40,</div><div class='add'>+	0x47, 0x31, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41, 0x89, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x30, 0x05, 0x00, 0x48, 0x47, 0x31, 0x01, 0x00, 0x30, 0x05, 0x00, 0x05,</div><div class='add'>+	0x47, 0x31, 0x01, 0x00, 0xde, 0x9f, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x28, 0x00, 0x00, 0x40, 0x47, 0x99, 0x1b, 0x00, 0xde, 0x9f, 0x00, 0x41,</div><div class='add'>+	0xe1, 0xc1, 0x1a, 0x00, 0x78, 0x18, 0x00, 0x40, 0x49, 0x99, 0x1b, 0x00,</div><div class='add'>+	0x19, 0x05, 0x22, 0x54, 0x81, 0x7c, 0x1a, 0x00, 0x14, 0x05, 0x42, 0x40,</div><div class='add'>+	0x81, 0x32, 0x1a, 0x00, 0x00, 0x82, 0x00, 0xb3, 0x67, 0xdf, 0x1b, 0x00,</div><div class='add'>+	0x00, 0x00, 0x1a, 0x44, 0x93, 0x93, 0x1b, 0x00, 0x28, 0x00, 0x00, 0x40,</div><div class='add'>+	0x47, 0x99, 0x1b, 0x00, 0x30, 0x05, 0x00, 0x41, 0x89, 0x30, 0x01, 0x00,</div><div class='add'>+	0x27, 0x05, 0x0f, 0x40, 0x80, 0x32, 0x00, 0x00, 0xff, 0x7f, 0x00, 0x40,</div><div class='add'>+	0x88, 0x88, 0x01, 0x00, 0x30, 0x05, 0x00, 0x50, 0x47, 0x31, 0x01, 0x00,</div><div class='add'>+	0x36, 0x00, 0x00, 0x44, 0x88, 0xcc, 0x01, 0x00, 0x1f, 0x05, 0x99, 0x40,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x48, 0x89, 0xd0, 0x01, 0x00,</div><div class='add'>+	0x21, 0x05, 0x9b, 0x40, 0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4c,</div><div class='add'>+	0x89, 0xd0, 0x01, 0x00, 0x23, 0x05, 0x1f, 0x44, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x30, 0x05, 0x00, 0x40, 0x47, 0x31, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x89, 0xb0, 0x01, 0x00, 0x30, 0x05, 0x00, 0x48, 0x47, 0x31, 0x01, 0x00,</div><div class='add'>+	0x30, 0x05, 0x00, 0x58, 0x47, 0x31, 0x01, 0x00, 0xde, 0x9f, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x10, 0x00, 0x00, 0x40, 0x86, 0xf4, 0x01, 0x00,</div><div class='add'>+	0x6f, 0x00, 0x00, 0x43, 0x86, 0x88, 0x01, 0x00, 0xde, 0x9f, 0x26, 0x05,</div><div class='add'>+	0x47, 0x31, 0x00, 0x00, 0x30, 0x05, 0x00, 0x41, 0x89, 0x30, 0x01, 0x00,</div><div class='add'>+	0xde, 0x9f, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x44, 0xf0, 0x41, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x80, 0x41,</div><div class='add'>+	0xe1, 0xc1, 0x01, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x4c, 0x01, 0x00, 0x07,</div><div class='add'>+	0x91, 0x30, 0x01, 0x00, 0x00, 0x00, 0xa2, 0x40, 0x97, 0xec, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x05, 0x91, 0xc0, 0x01, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x4c, 0x01, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x44, 0x05, 0xa2, 0x40,</div><div class='add'>+	0x97, 0x6c, 0x00, 0x00, 0x3a, 0x00, 0x00, 0x40, 0xb3, 0x9b, 0x01, 0x00,</div><div class='add'>+	0x45, 0x05, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x40, 0x00, 0x00, 0x40,</div><div class='add'>+	0xb3, 0x9b, 0x01, 0x00, 0x10, 0x04, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xda, 0xf5, 0xb1, 0x01, 0x00, 0x10, 0x04, 0x00, 0x42,</div><div class='add'>+	0xb3, 0x43, 0x01, 0x00, 0x00, 0x00, 0x00, 0xda, 0xf5, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x10, 0x04, 0x00, 0x42, 0xb3, 0x43, 0x01, 0x00, 0x00, 0x00, 0x00, 0xda,</div><div class='add'>+	0xf5, 0xb1, 0x01, 0x00, 0x4e, 0x00, 0x00, 0x40, 0xb3, 0x9b, 0x01, 0x00,</div><div class='add'>+	0x10, 0x04, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x08, 0x00, 0x00, 0xda,</div><div class='add'>+	0xf7, 0xf5, 0x01, 0x00, 0x50, 0x00, 0x00, 0x40, 0x91, 0x98, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x47, 0x8f, 0xb0, 0x01, 0x00, 0x10, 0x04, 0x00, 0x48,</div><div class='add'>+	0xb2, 0x33, 0x01, 0x00, 0x00, 0x00, 0x00, 0xda, 0xf7, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x08, 0x00, 0x00, 0xda, 0xf7, 0xf5, 0x01, 0x00, 0x00, 0x00, 0x00, 0x42,</div><div class='add'>+	0x91, 0xc0, 0x01, 0x00, 0x50, 0x05, 0xa2, 0x41, 0x8f, 0x50, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x45, 0xd1, 0x01, 0x00, 0x08, 0x00, 0x00, 0x40,</div><div class='add'>+	0xb3, 0x9b, 0x01, 0x00, 0x10, 0x04, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xda, 0xfd, 0xb1, 0x01, 0x00, 0x0a, 0x00, 0x00, 0x40,</div><div class='add'>+	0xb3, 0x9b, 0x01, 0x00, 0x10, 0x04, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xda, 0xfd, 0xb1, 0x01, 0x00, 0x1a, 0x00, 0x00, 0x40,</div><div class='add'>+	0xb3, 0x9b, 0x01, 0x00, 0x10, 0x04, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xda, 0xfd, 0xb1, 0x01, 0x00, 0x18, 0x00, 0x00, 0x40,</div><div class='add'>+	0xb3, 0x9b, 0x01, 0x00, 0x10, 0x04, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xda, 0xfd, 0xb1, 0x01, 0x00, 0x38, 0x05, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x1e, 0x00, 0x00, 0x48, 0xb2, 0xcb, 0x01, 0x00,</div><div class='add'>+	0x10, 0x04, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0xda,</div><div class='add'>+	0x91, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x48, 0xb2, 0xcb, 0x01, 0x00,</div><div class='add'>+	0x10, 0x04, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x6e, 0xda,</div><div class='add'>+	0x8f, 0xb0, 0x01, 0x00, 0x02, 0x00, 0x00, 0x48, 0xb2, 0xcb, 0x01, 0x00,</div><div class='add'>+	0x10, 0x04, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0xda,</div><div class='add'>+	0xfd, 0xb1, 0x01, 0x00, 0x04, 0x00, 0x00, 0x48, 0xb2, 0xcb, 0x01, 0x00,</div><div class='add'>+	0x10, 0x04, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x80, 0xda,</div><div class='add'>+	0xfd, 0xb1, 0x01, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x7a, 0x05, 0x22, 0x45, 0xfd, 0x7f, 0x00, 0x00, 0x40, 0x16, 0x00, 0x40,</div><div class='add'>+	0x45, 0x99, 0x01, 0x00, 0xdb, 0x9f, 0x00, 0x40, 0x49, 0x31, 0x01, 0x00,</div><div class='add'>+	0x08, 0x00, 0x00, 0x48, 0xb2, 0xcb, 0x01, 0x00, 0x15, 0x04, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x78, 0x05, 0xa2, 0x40, 0x8f, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x7d, 0x05, 0x22, 0x20, 0xb5, 0x6f, 0x00, 0x00, 0x7a, 0x05, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0xda, 0x9f, 0x00, 0x40, 0x81, 0x32, 0x1f, 0x00,</div><div class='add'>+	0x7d, 0x05, 0x22, 0x40, 0x97, 0x6c, 0x1e, 0x00, 0x7a, 0x05, 0x42, 0x40,</div><div class='add'>+	0x81, 0x32, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x4f, 0x67, 0x93, 0x1f, 0x00,</div><div class='add'>+	0xdf, 0x9f, 0x00, 0x58, 0x67, 0x93, 0x1e, 0x00, 0x54, 0x16, 0x00, 0x40,</div><div class='add'>+	0x47, 0x99, 0x1f, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xf4, 0xb1, 0x1f, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x1f, 0x00, 0x00, 0x00, 0x00, 0xfe,</div><div class='add'>+	0xf4, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xfe, 0xf4, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xf4, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x00, 0xfe,</div><div class='add'>+	0xf4, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xfe, 0xf4, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xf4, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x46, 0x00, 0x00, 0x40, 0xb3, 0x9b, 0x01, 0x00, 0x10, 0x04, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x08, 0x00, 0x00, 0xda, 0xf7, 0xf5, 0x01, 0x00,</div><div class='add'>+	0x48, 0x00, 0x00, 0x40, 0x95, 0x98, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0x97, 0xb0, 0x01, 0x00, 0x10, 0x04, 0x00, 0x4a, 0xb2, 0x33, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xda, 0xf7, 0xb1, 0x01, 0x00, 0x08, 0x00, 0x00, 0xda,</div><div class='add'>+	0xf7, 0xf5, 0x01, 0x00, 0x00, 0x00, 0x00, 0x42, 0x95, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x90, 0x05, 0xa2, 0x41, 0x97, 0x50, 0x00, 0x00, 0x2a, 0x00, 0x00, 0x40,</div><div class='add'>+	0xa5, 0x9b, 0x01, 0x00, 0x40, 0x16, 0x00, 0x40, 0xa1, 0x9b, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xca, 0xa7, 0xb3, 0x01, 0x00, 0xe1, 0x9f, 0x00, 0xbb,</div><div class='add'>+	0x85, 0x30, 0x01, 0x00, 0xe0, 0x9f, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xb8, 0x05, 0x22, 0x45, 0xfd, 0x7f, 0x00, 0x00, 0xe0, 0x15, 0x00, 0x40,</div><div class='add'>+	0x47, 0x99, 0x01, 0x00, 0x1a, 0x00, 0x00, 0xa2, 0x80, 0xdc, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x50, 0xf1, 0xb1, 0x01, 0x00, 0xf0, 0x15, 0x00, 0x40,</div><div class='add'>+	0xf1, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0xca, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x07, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00, 0x20, 0x00, 0x00, 0x40,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0xa7, 0x05, 0xa8, 0xbb, 0xe1, 0x31, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x50, 0x83, 0xb0, 0x01, 0x00, 0xaa, 0x05, 0xa2, 0x41,</div><div class='add'>+	0x83, 0x50, 0x00, 0x00, 0xa9, 0x05, 0xa2, 0xf2, 0x82, 0x30, 0x00, 0x00,</div><div class='add'>+	0x4c, 0x01, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0xb0, 0x05, 0xa2, 0x40,</div><div class='add'>+	0x97, 0x6c, 0x00, 0x00, 0x3a, 0x00, 0x00, 0x40, 0xb3, 0x9b, 0x01, 0x00,</div><div class='add'>+	0xb1, 0x05, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x40, 0x00, 0x00, 0x40,</div><div class='add'>+	0xb3, 0x9b, 0x01, 0x00, 0xf0, 0x15, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00,</div><div class='add'>+	0x10, 0x04, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0xb8, 0x05, 0xa2, 0xfa,</div><div class='add'>+	0xb4, 0x6f, 0x00, 0x00, 0x10, 0x04, 0x00, 0x42, 0xb3, 0x43, 0x01, 0x00,</div><div class='add'>+	0xb8, 0x05, 0xa2, 0xfa, 0xb4, 0x6f, 0x00, 0x00, 0x10, 0x04, 0x00, 0x42,</div><div class='add'>+	0xb3, 0x43, 0x01, 0x00, 0xbb, 0x05, 0x22, 0xfa, 0xb4, 0x6f, 0x00, 0x00,</div><div class='add'>+	0xb8, 0x05, 0x42, 0x40, 0x81, 0x32, 0x20, 0x00, 0x00, 0x00, 0x00, 0x4e,</div><div class='add'>+	0x67, 0x93, 0x21, 0x00, 0xdf, 0x9f, 0x00, 0x58, 0x67, 0x93, 0x20, 0x00,</div><div class='add'>+	0x40, 0x16, 0x00, 0x40, 0x45, 0x99, 0x21, 0x00, 0xdb, 0x9f, 0x00, 0x40,</div><div class='add'>+	0x49, 0x31, 0x21, 0x00, 0xf6, 0x15, 0x00, 0x40, 0x43, 0x99, 0x21, 0x00,</div><div class='add'>+	0x5c, 0x16, 0x00, 0x40, 0x45, 0x99, 0x21, 0x00, 0x00, 0x00, 0x6e, 0xfa,</div><div class='add'>+	0x8e, 0xb0, 0x21, 0x00, 0x00, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xfe, 0xf4, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xf4, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0,</div><div class='add'>+	0xb4, 0xb3, 0x01, 0x00, 0xc9, 0x05, 0xa2, 0x40, 0x8f, 0x6c, 0x00, 0x00,</div><div class='add'>+	0xfc, 0x15, 0x20, 0x20, 0xe1, 0xb1, 0x01, 0x00, 0xce, 0x05, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x24, 0x00, 0xda, 0x9f, 0x00, 0x40, 0x81, 0x32, 0x25, 0x00,</div><div class='add'>+	0xce, 0x05, 0x22, 0x40, 0x97, 0x6c, 0x24, 0x00, 0xcb, 0x05, 0x42, 0x40,</div><div class='add'>+	0x81, 0x32, 0x24, 0x00, 0x00, 0x00, 0x00, 0x4f, 0x67, 0x93, 0x25, 0x00,</div><div class='add'>+	0xdf, 0x9f, 0x00, 0x58, 0x67, 0x93, 0x24, 0x00, 0x38, 0x05, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x25, 0x00, 0x1e, 0x00, 0x00, 0x48, 0xb2, 0xcb, 0x25, 0x00,</div><div class='add'>+	0x10, 0x04, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0xd3, 0x05, 0x22, 0x50,</div><div class='add'>+	0xb5, 0x6f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x91, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x48, 0xb2, 0xcb, 0x01, 0x00, 0xf6, 0x15, 0x00, 0x40,</div><div class='add'>+	0x43, 0x99, 0x01, 0x00, 0x20, 0x04, 0x00, 0xf2, 0xb4, 0x33, 0x01, 0x00,</div><div class='add'>+	0x02, 0x00, 0x00, 0x48, 0xb2, 0xcb, 0x01, 0x00, 0xf8, 0x15, 0x00, 0x40,</div><div class='add'>+	0x43, 0x99, 0x01, 0x00, 0x20, 0x04, 0x00, 0xf2, 0xb4, 0x33, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x48, 0xb2, 0xcb, 0x01, 0x00, 0xfa, 0x15, 0x00, 0x40,</div><div class='add'>+	0x43, 0x99, 0x01, 0x00, 0x20, 0x04, 0x00, 0xf2, 0xb4, 0x33, 0x01, 0x00,</div><div class='add'>+	0x08, 0x00, 0x00, 0x48, 0xb2, 0xcb, 0x01, 0x00, 0xfc, 0x15, 0x00, 0x40,</div><div class='add'>+	0x43, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x94, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xff, 0xff, 0x00, 0x4a, 0xb4, 0x8b, 0x01, 0x00, 0x20, 0x04, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x0a, 0x00, 0x00, 0x48, 0xb2, 0xcb, 0x01, 0x00,</div><div class='add'>+	0x10, 0x00, 0x00, 0x4a, 0xb4, 0xf7, 0x01, 0x00, 0x20, 0x04, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x38, 0x05, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x1e, 0x00, 0x00, 0x48, 0xb2, 0xcb, 0x01, 0x00, 0x10, 0x04, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0xe9, 0x05, 0x22, 0x50, 0xb5, 0x6f, 0x00, 0x00,</div><div class='add'>+	0xea, 0x05, 0x00, 0x50, 0xb5, 0xb3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0xb5, 0xb3, 0x01, 0x00, 0x20, 0x04, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0xe0, 0x9f, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x16, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00,</div><div class='add'>+	0x30, 0x31, 0x00, 0x40, 0xf5, 0x99, 0x01, 0x00, 0x32, 0x33, 0x00, 0x40,</div><div class='add'>+	0xf5, 0x99, 0x01, 0x00, 0x34, 0x35, 0x00, 0x40, 0xf5, 0x99, 0x01, 0x00,</div><div class='add'>+	0x36, 0x37, 0x00, 0x40, 0xf5, 0x99, 0x01, 0x00, 0x38, 0x39, 0x00, 0x40,</div><div class='add'>+	0xf5, 0x99, 0x01, 0x00, 0x41, 0x42, 0x00, 0x40, 0xf5, 0x99, 0x01, 0x00,</div><div class='add'>+	0x43, 0x44, 0x00, 0x40, 0xf5, 0x99, 0x01, 0x00, 0x45, 0x46, 0x00, 0x40,</div><div class='add'>+	0xf5, 0x99, 0x01, 0x00, 0x47, 0x48, 0x00, 0x40, 0xf5, 0x99, 0x01, 0x00,</div><div class='add'>+	0x49, 0x4a, 0x00, 0x40, 0xf5, 0x99, 0x01, 0x00, 0x2c, 0x00, 0x00, 0x40,</div><div class='add'>+	0x83, 0x98, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0xf7, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xfc, 0x05, 0xa2, 0x41, 0x83, 0x50, 0x00, 0x00, 0x80, 0x16, 0x2e, 0x06,</div><div class='add'>+	0x83, 0xb0, 0x01, 0x00, 0x36, 0x00, 0x00, 0xfb, 0xf6, 0xa9, 0x01, 0x00,</div><div class='add'>+	0xff, 0x05, 0xa2, 0x41, 0x83, 0x50, 0x00, 0x00, 0x22, 0x00, 0x00, 0x40,</div><div class='add'>+	0x83, 0x98, 0x01, 0x00, 0x00, 0x00, 0x00, 0xfb, 0xf6, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x02, 0x06, 0xa2, 0x41, 0x83, 0x50, 0x00, 0x00, 0x62, 0x00, 0x00, 0x40,</div><div class='add'>+	0x95, 0x98, 0x01, 0x00, 0xdc, 0x9f, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x00, 0x16, 0x2d, 0x06, 0x83, 0xb0, 0x01, 0x00, 0x80, 0x16, 0x00, 0x40,</div><div class='add'>+	0x45, 0x99, 0x01, 0x00, 0x5c, 0x00, 0x00, 0xfb, 0xf6, 0xa9, 0x01, 0x00,</div><div class='add'>+	0x08, 0x06, 0xa2, 0x41, 0x83, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70,</div><div class='add'>+	0xf9, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x71, 0xf9, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x72, 0xf9, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x73,</div><div class='add'>+	0xf9, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x74, 0xf9, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x54, 0x00, 0x00, 0x40, 0x95, 0x98, 0x01, 0x00, 0xdc, 0x9f, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0x70, 0x95, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x14, 0x06, 0x22, 0x70, 0xb5, 0x6f, 0x00, 0x00, 0x00, 0x00, 0x80, 0x41,</div><div class='add'>+	0x97, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x80, 0x40, 0x97, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x45, 0x67, 0x00, 0xa6, 0xe0, 0xb2, 0x01, 0x00, 0x01, 0x23, 0x00, 0x70,</div><div class='add'>+	0xe1, 0x9a, 0x01, 0x00, 0xcd, 0xef, 0x00, 0xa6, 0xe2, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x89, 0xab, 0x00, 0x71, 0xe3, 0x9a, 0x01, 0x00, 0xba, 0x98, 0x00, 0xa6,</div><div class='add'>+	0xe4, 0xb2, 0x01, 0x00, 0xfe, 0xdc, 0x00, 0x72, 0xe5, 0x9a, 0x01, 0x00,</div><div class='add'>+	0x32, 0x10, 0x00, 0xa6, 0xe6, 0xb2, 0x01, 0x00, 0x76, 0x54, 0x00, 0x73,</div><div class='add'>+	0xe7, 0x9a, 0x01, 0x00, 0xd2, 0xc3, 0x00, 0xa6, 0xe8, 0xb2, 0x01, 0x00,</div><div class='add'>+	0xf0, 0xe1, 0x00, 0x74, 0xe9, 0x9a, 0x01, 0x00, 0x80, 0x16, 0x00, 0x4a,</div><div class='add'>+	0x44, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x07, 0x81, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4a, 0x80, 0xd0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0xf7, 0xb1, 0x01, 0x00, 0x25, 0x06, 0xa2, 0x41, 0x81, 0x50, 0x00, 0x00,</div><div class='add'>+	0x80, 0x16, 0x00, 0x4a, 0x44, 0xc9, 0x01, 0x00, 0xfc, 0x16, 0x2a, 0x47,</div><div class='add'>+	0xe7, 0xb5, 0x01, 0x00, 0x03, 0x00, 0x00, 0x4a, 0xe8, 0xe5, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x8d, 0xb0, 0x01, 0x00, 0x50, 0x03, 0x00, 0x40,</div><div class='add'>+	0xa3, 0x99, 0x01, 0x00, 0x80, 0x16, 0x3d, 0x46, 0x8d, 0xe0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x50, 0x89, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xfc,</div><div class='add'>+	0x40, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41, 0xa3, 0xc1, 0x01, 0x00,</div><div class='add'>+	0x2e, 0x06, 0xa2, 0x41, 0x89, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70,</div><div class='add'>+	0xeb, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x00, 0x71, 0xed, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x72, 0xef, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x00, 0x73,</div><div class='add'>+	0xf1, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x00, 0x74, 0xf3, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x83, 0xb0, 0x01, 0x00, 0x0f, 0x00, 0x00, 0x41,</div><div class='add'>+	0x80, 0x88, 0x01, 0x00, 0x50, 0x03, 0x00, 0x40, 0xa2, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x4b, 0x06, 0xa0, 0x50, 0x83, 0x6c, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x40,</div><div class='add'>+	0x98, 0xc8, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4f, 0x99, 0x84, 0x01, 0x00,</div><div class='add'>+	0x50, 0x03, 0x00, 0x4c, 0xa2, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x20,</div><div class='add'>+	0x86, 0xb0, 0x01, 0x00, 0x08, 0x00, 0x00, 0x40, 0x98, 0xc8, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4f, 0x99, 0x84, 0x01, 0x00, 0x50, 0x03, 0x00, 0x4c,</div><div class='add'>+	0xa2, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x20, 0x86, 0xa4, 0x01, 0x00,</div><div class='add'>+	0x02, 0x00, 0x00, 0x40, 0x98, 0xc8, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4f,</div><div class='add'>+	0x99, 0x84, 0x01, 0x00, 0x50, 0x03, 0x00, 0x4c, 0xa2, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x20, 0x86, 0xa4, 0x01, 0x00, 0x50, 0x03, 0x00, 0x40,</div><div class='add'>+	0xa2, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x43, 0x40, 0xa4, 0x01, 0x00,</div><div class='add'>+	0x01, 0x00, 0x00, 0x20, 0x88, 0xe4, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5f,</div><div class='add'>+	0x41, 0xf0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44, 0x40, 0x94, 0x01, 0x00,</div><div class='add'>+	0x05, 0x00, 0x00, 0x75, 0x89, 0xe4, 0x01, 0x00, 0x1b, 0x00, 0x00, 0x75,</div><div class='add'>+	0x85, 0xf4, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44, 0x84, 0x94, 0x01, 0x00,</div><div class='add'>+	0x55, 0x06, 0xa3, 0x53, 0x83, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x76,</div><div class='add'>+	0x89, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x77, 0x89, 0x84, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x76, 0x8b, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8b, 0xa4, 0x01, 0x00, 0x00, 0x00, 0x00, 0x78, 0x8b, 0x84, 0x01, 0x00,</div><div class='add'>+	0x64, 0x06, 0x00, 0x45, 0x88, 0x94, 0x00, 0x00, 0x27, 0x00, 0x00, 0x41,</div><div class='add'>+	0x80, 0xce, 0x01, 0x00, 0x5a, 0x06, 0xaa, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x76, 0x89, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x77,</div><div class='add'>+	0x89, 0xa4, 0x01, 0x00, 0x64, 0x06, 0x00, 0x78, 0x89, 0xa4, 0x00, 0x00,</div><div class='add'>+	0x3b, 0x00, 0x00, 0x41, 0x80, 0xce, 0x01, 0x00, 0x57, 0x06, 0xaa, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x76, 0x89, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x77, 0x89, 0x84, 0x01, 0x00, 0x00, 0x00, 0x00, 0x76,</div><div class='add'>+	0x8b, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x78, 0x8b, 0x84, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x45, 0x88, 0x94, 0x01, 0x00, 0x00, 0x00, 0x00, 0x77,</div><div class='add'>+	0x8b, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x78, 0x8b, 0x84, 0x01, 0x00,</div><div class='add'>+	0x64, 0x06, 0x00, 0x45, 0x88, 0x94, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0x84, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x79, 0x85, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x20, 0x84, 0xc0, 0x01, 0x00, 0x6b, 0x06, 0xa3, 0x53,</div><div class='add'>+	0x83, 0x6c, 0x00, 0x00, 0x82, 0x5a, 0x00, 0xa6, 0x84, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x99, 0x79, 0x00, 0x42, 0x84, 0xc8, 0x01, 0x00, 0x78, 0x06, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x27, 0x00, 0x00, 0x41, 0x80, 0xce, 0x01, 0x00,</div><div class='add'>+	0x70, 0x06, 0xaa, 0x40, 0x81, 0x32, 0x00, 0x00, 0xd9, 0x6e, 0x00, 0xa6,</div><div class='add'>+	0x84, 0xc0, 0x01, 0x00, 0xa1, 0xeb, 0x00, 0x42, 0x84, 0xc8, 0x01, 0x00,</div><div class='add'>+	0x78, 0x06, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x3b, 0x00, 0x00, 0x41,</div><div class='add'>+	0x80, 0xce, 0x01, 0x00, 0x75, 0x06, 0xaa, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x1b, 0x8f, 0x00, 0xa6, 0x84, 0xc0, 0x01, 0x00, 0xdc, 0xbc, 0x00, 0x42,</div><div class='add'>+	0x84, 0xc8, 0x01, 0x00, 0x78, 0x06, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x62, 0xca, 0x00, 0xa6, 0x84, 0xc0, 0x01, 0x00, 0xd6, 0xc1, 0x00, 0x42,</div><div class='add'>+	0x84, 0xc8, 0x01, 0x00, 0x78, 0x06, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x78, 0xf3, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x00, 0x77,</div><div class='add'>+	0xf1, 0xb2, 0x01, 0x00, 0x1e, 0x00, 0x00, 0x76, 0x89, 0xe4, 0x01, 0x00,</div><div class='add'>+	0x02, 0x00, 0x00, 0x76, 0xef, 0xf6, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0xee, 0x96, 0x01, 0x00, 0x00, 0x00, 0x00, 0x75, 0xed, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x42, 0xea, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x83, 0xc0, 0x01, 0x00, 0x4f, 0x00, 0x00, 0x41, 0x80, 0xce, 0x01, 0x00,</div><div class='add'>+	0x37, 0x06, 0x2a, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x75,</div><div class='add'>+	0xe1, 0xc2, 0x01, 0x00, 0x00, 0x00, 0x00, 0x76, 0xe3, 0xc2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x77, 0xe5, 0xc2, 0x01, 0x00, 0x00, 0x00, 0x00, 0x78,</div><div class='add'>+	0xe7, 0xc2, 0x01, 0x00, 0x00, 0x00, 0x00, 0x79, 0xe9, 0xc2, 0x01, 0x00,</div><div class='add'>+	0x2b, 0x06, 0x81, 0x41, 0x8d, 0x40, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x50, 0xfd, 0x93, 0x01, 0x00, 0x40, 0x16, 0x00, 0x40,</div><div class='add'>+	0x45, 0x99, 0x01, 0x00, 0xdb, 0x9f, 0x00, 0x40, 0x49, 0x31, 0x01, 0x00,</div><div class='add'>+	0x08, 0x00, 0x00, 0x48, 0xb2, 0xcb, 0x01, 0x00, 0x15, 0x04, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0xb9, 0x06, 0x22, 0x40, 0x8f, 0x6c, 0x00, 0x00,</div><div class='add'>+	0xda, 0x9f, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0xb9, 0x06, 0xa2, 0x40,</div><div class='add'>+	0x97, 0x6c, 0x00, 0x00, 0x5e, 0x16, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00,</div><div class='add'>+	0x7c, 0x16, 0x20, 0xf6, 0xe0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x31, 0xb3, 0x01, 0x00, 0x9d, 0x06, 0x22, 0x4f, 0x8f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x51, 0xfd, 0x93, 0x01, 0x00, 0x9f, 0x06, 0x22, 0x40,</div><div class='add'>+	0x8f, 0x7c, 0x00, 0x00, 0xa3, 0x06, 0x00, 0x54, 0xfd, 0x93, 0x00, 0x00,</div><div class='add'>+	0xa1, 0x06, 0x22, 0x42, 0x8f, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x52,</div><div class='add'>+	0xfd, 0x93, 0x01, 0x00, 0xa3, 0x06, 0x22, 0x41, 0x8f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x53, 0xfd, 0x93, 0x01, 0x00, 0xb7, 0x06, 0x22, 0x51,</div><div class='add'>+	0xfd, 0x7f, 0x00, 0x00, 0x38, 0x05, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x0c, 0x00, 0x00, 0x48, 0xb2, 0xcb, 0x01, 0x00, 0x10, 0x04, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0xb2, 0x06, 0xa2, 0x40, 0xb5, 0x6f, 0x00, 0x00,</div><div class='add'>+	0x1e, 0x00, 0x00, 0x48, 0xb2, 0xcb, 0x01, 0x00, 0x10, 0x04, 0x00, 0x48,</div><div class='add'>+	0x96, 0x30, 0x01, 0x00, 0x00, 0x00, 0x00, 0xda, 0x97, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x4b, 0xb2, 0xcb, 0x01, 0x00, 0x10, 0x04, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x0e, 0x00, 0x00, 0x48, 0xb2, 0xcb, 0x01, 0x00,</div><div class='add'>+	0x20, 0x04, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x0c, 0x00, 0x00, 0x48,</div><div class='add'>+	0xb2, 0xcb, 0x01, 0x00, 0x00, 0x00, 0x00, 0x30, 0xb5, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x20, 0x04, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x0e, 0x00, 0x00, 0x48,</div><div class='add'>+	0xb2, 0xcb, 0x01, 0x00, 0x10, 0x04, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0xb6, 0x06, 0x22, 0x40, 0xb5, 0x6f, 0x00, 0x00, 0xba, 0x06, 0x00, 0x54,</div><div class='add'>+	0xfd, 0x93, 0x00, 0x00, 0x00, 0x00, 0x00, 0x51, 0xfd, 0x83, 0x01, 0x00,</div><div class='add'>+	0x1c, 0x00, 0x00, 0xfe, 0x7f, 0xd9, 0x01, 0x00, 0xba, 0x06, 0xa6, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0xfd, 0x93, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xe7, 0x9f, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0xc4, 0x06, 0x22, 0x5c,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0xe3, 0x9f, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xe9, 0x9f, 0x00, 0x5c, 0x1f, 0x00, 0x01, 0x00, 0x00, 0x00, 0x2e, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0xe1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x2d, 0x03, 0x48, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0,</div><div class='add'>+	0x3c, 0xb0, 0x01, 0x00, 0x28, 0x00, 0x00, 0x14, 0x02, 0xc8, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x01, 0x34, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x2d, 0x05,</div><div class='add'>+	0x32, 0xb0, 0x01, 0x00, 0x22, 0x00, 0x00, 0x05, 0x0a, 0xc8, 0x01, 0x00,</div><div class='add'>+	0x10, 0x00, 0x00, 0x03, 0x48, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8,</div><div class='add'>+	0x18, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x04, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf8, 0x0e, 0xb0, 0x01, 0x00, 0x0c, 0x00, 0x00, 0xa4,</div><div class='add'>+	0x0c, 0xc8, 0x01, 0x00, 0xea, 0x9f, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x23, 0xb0, 0x01, 0x00, 0x0a, 0x07, 0x22, 0x01,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x44, 0x23, 0xe0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x2e, 0xa4, 0x80, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x10,</div><div class='add'>+	0x48, 0xc1, 0x01, 0x00, 0xd9, 0x06, 0xa3, 0x07, 0x02, 0x6c, 0x00, 0x00,</div><div class='add'>+	0xda, 0x06, 0x68, 0x01, 0x1a, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x68, 0x07,</div><div class='add'>+	0x1a, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x0d, 0x02, 0xd0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x05, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x0c,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x02, 0xe0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x0d, 0x0a, 0xc0, 0x01, 0x00, 0xec, 0x06, 0x22, 0x40,</div><div class='add'>+	0x03, 0x6c, 0x00, 0x00, 0xe6, 0x06, 0x22, 0x42, 0x23, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x23, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x47,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x20, 0x00, 0x00, 0xa4, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0x23, 0x07, 0x28, 0x40, 0x81, 0x32, 0x00, 0x00, 0xe3, 0x06, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x80, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x47, 0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x62, 0xb1, 0x01, 0x00, 0xe8, 0x06, 0xa8, 0x40, 0x23, 0x30, 0x00, 0x00,</div><div class='add'>+	0xe3, 0x9f, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x23, 0x07, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x80, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x47, 0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x62, 0xb1, 0x01, 0x00, 0xee, 0x06, 0xa8, 0x40, 0x23, 0x30, 0x00, 0x00,</div><div class='add'>+	0xe3, 0x9f, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x22, 0x00, 0x00, 0x19,</div><div class='add'>+	0x48, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x2d, 0x14, 0x48, 0xc1, 0x01, 0x00,</div><div class='add'>+	0x0f, 0x00, 0x00, 0xf2, 0x3a, 0x88, 0x01, 0x00, 0x00, 0x00, 0x00, 0x42,</div><div class='add'>+	0x3b, 0xe0, 0x01, 0x00, 0x0e, 0x00, 0x00, 0x14, 0x02, 0xc8, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x1d, 0x02, 0xc0, 0x01, 0x00, 0xfa, 0x06, 0x23, 0x1a,</div><div class='add'>+	0x02, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46, 0x03, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x23, 0x07, 0x00, 0x01, 0x34, 0xc0, 0x00, 0x00, 0x0c, 0x00, 0x2d, 0x1d,</div><div class='add'>+	0x48, 0xc1, 0x01, 0x00, 0xf0, 0x00, 0x00, 0xf2, 0x30, 0x88, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x42, 0x31, 0xf0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x14,</div><div class='add'>+	0x02, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x1d, 0x02, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x18, 0x02, 0xc0, 0x01, 0x00, 0x02, 0x07, 0x22, 0x1a,</div><div class='add'>+	0x02, 0x50, 0x00, 0x00, 0x23, 0x07, 0x00, 0x01, 0x34, 0xc0, 0x00, 0x00,</div><div class='add'>+	0x22, 0x00, 0x00, 0x19, 0x48, 0xc9, 0x01, 0x00, 0x02, 0x00, 0x2d, 0x14,</div><div class='add'>+	0x48, 0xc1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf6, 0x14, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x1d, 0x14, 0xd0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x18,</div><div class='add'>+	0x14, 0xd0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x24, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x12, 0x00, 0x00, 0x17, 0x10, 0xc8, 0x01, 0x00, 0x23, 0x07, 0x00, 0x1a,</div><div class='add'>+	0x10, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x44, 0x23, 0xe0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xa4, 0x86, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x2e, 0x10,</div><div class='add'>+	0x48, 0xc1, 0x01, 0x00, 0x0f, 0x07, 0xa3, 0x12, 0x0e, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x10, 0x07, 0x60, 0x07, 0x1a, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x60, 0x12,</div><div class='add'>+	0x1a, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x68, 0x0d, 0x16, 0x94, 0x01, 0x00,</div><div class='add'>+	0xff, 0xff, 0x00, 0x0b, 0x16, 0xd8, 0x01, 0x00, 0x00, 0x00, 0x00, 0x08,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x0c, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x02, 0xe0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x10,</div><div class='add'>+	0x86, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x46, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x20, 0x00, 0x00, 0x43, 0x62, 0xdd, 0x01, 0x00, 0x17, 0x07, 0xa8, 0x5c,</div><div class='add'>+	0x1f, 0x10, 0x00, 0x00, 0x40, 0x07, 0x22, 0x0d, 0x14, 0x50, 0x00, 0x00,</div><div class='add'>+	0x40, 0x07, 0x22, 0x0d, 0x24, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0d,</div><div class='add'>+	0x10, 0xc0, 0x01, 0x00, 0x1e, 0x07, 0x22, 0x42, 0x23, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x23, 0x07, 0x00, 0x41, 0x23, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0x1f, 0x07, 0xa8, 0x5c, 0x1f, 0x00, 0x00, 0x00, 0xe3, 0x9f, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x23, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x3f, 0x07, 0xa2, 0x0d, 0x0e, 0x50, 0x00, 0x00, 0x2e, 0x07, 0x22, 0x46,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46, 0x1f, 0x80, 0x01, 0x00,</div><div class='add'>+	0x30, 0x80, 0x00, 0x10, 0x42, 0xc9, 0x01, 0x00, 0x2c, 0x07, 0x22, 0xf2,</div><div class='add'>+	0x64, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x47, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00, 0x29, 0x07, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0xe3, 0x9f, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x20, 0x80, 0x00, 0x03, 0x46, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5f,</div><div class='add'>+	0xe1, 0x91, 0x01, 0x00, 0x00, 0x00, 0x2d, 0x06, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf8, 0x18, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8,</div><div class='add'>+	0x04, 0xb0, 0x01, 0x00, 0x33, 0x07, 0x1f, 0xf0, 0x0e, 0x30, 0x00, 0x00,</div><div class='add'>+	0xd3, 0x06, 0x00, 0x4c, 0x0d, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x2e, 0x5f,</div><div class='add'>+	0x0f, 0x80, 0x01, 0x00, 0xd3, 0x06, 0x23, 0x07, 0x14, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x30, 0x00, 0x00, 0x10, 0x48, 0xc9, 0x01, 0x00, 0x24, 0x00, 0x00, 0x40,</div><div class='add'>+	0xf1, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x03, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x16,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x24, 0x00, 0x00, 0x00, 0x00, 0xc8, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x47, 0x61, 0xb1, 0x01, 0x00, 0x20, 0x00, 0x00, 0xa4,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x3c, 0x07, 0xa8, 0x46, 0x1f, 0x10, 0x00, 0x00,</div><div class='add'>+	0xd3, 0x06, 0x00, 0x03, 0x0c, 0xb0, 0x00, 0x00, 0xd3, 0x06, 0x00, 0x0d,</div><div class='add'>+	0x18, 0xc0, 0x00, 0x00, 0x5f, 0x07, 0xa2, 0x44, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x19, 0x0a, 0xb0, 0x01, 0x00, 0x22, 0x00, 0x00, 0x05,</div><div class='add'>+	0x48, 0xc9, 0x01, 0x00, 0x0a, 0x00, 0x2d, 0x14, 0x48, 0xc1, 0x01, 0x00,</div><div class='add'>+	0x02, 0x00, 0x20, 0x40, 0xe5, 0xb1, 0x01, 0x00, 0x04, 0x00, 0x20, 0x40,</div><div class='add'>+	0xe5, 0xb1, 0x01, 0x00, 0x0d, 0x00, 0x2d, 0x1d, 0x48, 0xc1, 0x01, 0x00,</div><div class='add'>+	0x09, 0x00, 0x00, 0xf3, 0x38, 0x88, 0x01, 0x00, 0x0d, 0x00, 0x20, 0x50,</div><div class='add'>+	0xe7, 0xb1, 0x01, 0x00, 0x04, 0x00, 0x2d, 0x40, 0x3f, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf4, 0x32, 0xb0, 0x01, 0x00, 0x04, 0x00, 0x20, 0x40,</div><div class='add'>+	0xe1, 0xb1, 0x01, 0x00, 0x22, 0x00, 0x00, 0x05, 0x48, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x2d, 0x14, 0x48, 0xc1, 0x01, 0x00, 0x02, 0x00, 0x00, 0x1d,</div><div class='add'>+	0x94, 0xf4, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x91, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x52, 0x07, 0xa0, 0xfc, 0x90, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x91, 0xc0, 0x01, 0x00, 0x50, 0x07, 0xa2, 0x41, 0x95, 0x50, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xa4, 0x96, 0xb0, 0x01, 0x00, 0x04, 0x00, 0x2e, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x48, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4b, 0x48, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x18,</div><div class='add'>+	0x48, 0xc1, 0x01, 0x00, 0x02, 0x00, 0x00, 0x18, 0x94, 0xf4, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x2d, 0x18, 0x90, 0xb0, 0x01, 0x00, 0x5c, 0x07, 0xa0, 0xfc,</div><div class='add'>+	0x90, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x91, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x5a, 0x07, 0xa2, 0x41, 0x95, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x48,</div><div class='add'>+	0xe0, 0xb1, 0x01, 0x00, 0x10, 0x00, 0x20, 0x40, 0xe5, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x2d, 0x05, 0x48, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8,</div><div class='add'>+	0x80, 0xb0, 0x2d, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x16, 0xb0, 0x2d, 0x00,</div><div class='add'>+	0x22, 0x00, 0x00, 0x05, 0x48, 0xc9, 0x2d, 0x00, 0x00, 0x00, 0x00, 0x14,</div><div class='add'>+	0x48, 0xc1, 0x2d, 0x00, 0x64, 0x07, 0x43, 0x30, 0x3d, 0x07, 0x2c, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x9e, 0x85, 0xb0, 0x2d, 0x00, 0x00, 0x00, 0x1b, 0x41,</div><div class='add'>+	0x3d, 0xc3, 0x2d, 0x00, 0x04, 0x00, 0x20, 0x42, 0xec, 0xb1, 0x2d, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x1e, 0x82, 0xb0, 0x01, 0x00, 0x02, 0x00, 0x2e, 0x1d,</div><div class='add'>+	0x82, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x66, 0x18, 0x82, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x42, 0x80, 0xc0, 0x01, 0x00, 0x6e, 0x07, 0xa0, 0x41,</div><div class='add'>+	0x80, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x81, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x10, 0x00, 0x00, 0x40, 0x92, 0xf4, 0x01, 0x00, 0x0a, 0x00, 0x2e, 0x30,</div><div class='add'>+	0x81, 0x84, 0x01, 0x00, 0x72, 0x07, 0x90, 0x40, 0x92, 0x40, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x93, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x66, 0x20,</div><div class='add'>+	0x93, 0xa4, 0x01, 0x00, 0x00, 0x00, 0x00, 0x1d, 0x48, 0xc1, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x20, 0x19, 0xe8, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x1e,</div><div class='add'>+	0x16, 0xc0, 0x01, 0x00, 0x78, 0x07, 0xa0, 0x19, 0x16, 0x44, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x17, 0xc0, 0x01, 0x00, 0x0d, 0x00, 0x2f, 0x1e,</div><div class='add'>+	0x32, 0xc0, 0x01, 0x00, 0x7d, 0x07, 0xa2, 0x40, 0x15, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x7c, 0x07, 0xa0, 0x1c, 0x16, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x17, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x63, 0xf3, 0x38, 0x94, 0x01, 0x00,</div><div class='add'>+	0x10, 0x00, 0x00, 0x05, 0x48, 0xc9, 0x01, 0x00, 0x04, 0x00, 0x2e, 0x1e,</div><div class='add'>+	0x98, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x60, 0x1a, 0x98, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x0c, 0x00, 0x20, 0x40, 0xe1, 0xb1, 0x01, 0x00, 0x8b, 0x07, 0x22, 0x46,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46, 0x1f, 0x80, 0x01, 0x00,</div><div class='add'>+	0x30, 0x80, 0x00, 0x10, 0x42, 0xc9, 0x01, 0x00, 0x89, 0x07, 0x22, 0xf2,</div><div class='add'>+	0x64, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x47, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00, 0x86, 0x07, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0xe3, 0x9f, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x20, 0x80, 0x00, 0x03, 0x46, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5f,</div><div class='add'>+	0xe1, 0x91, 0x01, 0x00, 0x30, 0x80, 0x00, 0x10, 0x44, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x12, 0x00, 0x00, 0x1a, 0xf0, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x17,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x10, 0x00, 0x00, 0x05, 0xe0, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x30, 0x00, 0x00, 0x10, 0x80, 0xc8, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x20, 0x00, 0x00, 0x40, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0x91, 0x07, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0x9b, 0x07, 0x22, 0x5c,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x44, 0x23, 0xe0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x2d, 0x10, 0x48, 0xc1, 0x01, 0x00, 0x9b, 0x07, 0x22, 0xf2,</div><div class='add'>+	0x64, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00, 0x98, 0x07, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0xe3, 0x9f, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xeb, 0x9f, 0x00, 0x5c, 0x1f, 0x00, 0x01, 0x00, 0x20, 0x00, 0x2f, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x0b, 0xe4, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x50, 0x17, 0xf0, 0x01, 0x00, 0xa1, 0x07, 0x90, 0xf2,</div><div class='add'>+	0x16, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x17, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x66, 0x20, 0x17, 0xa4, 0x01, 0x00, 0x10, 0x00, 0x00, 0x14,</div><div class='add'>+	0x2a, 0xc8, 0x01, 0x00, 0x00, 0x00, 0x00, 0x1d, 0x2a, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x50, 0x2b, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf2,</div><div class='add'>+	0x2a, 0x94, 0x01, 0x00, 0x30, 0x80, 0x00, 0x10, 0x42, 0xc9, 0x01, 0x00,</div><div class='add'>+	0xac, 0x07, 0x22, 0xf2, 0x64, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0xa9, 0x07, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0xe3, 0x9f, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x00, 0x80, 0x00, 0x17, 0x10, 0xdc, 0x01, 0x00,</div><div class='add'>+	0xc9, 0x07, 0x22, 0x40, 0x15, 0x6c, 0x00, 0x00, 0xb4, 0x07, 0xa2, 0x44,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x1f, 0x90, 0x01, 0x00,</div><div class='add'>+	0xb3, 0x07, 0x22, 0x9f, 0x13, 0x6c, 0x00, 0x00, 0x02, 0x00, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xcc, 0x01, 0x00, 0xe4, 0x9f, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x3f, 0xc3, 0x01, 0x00, 0xe6, 0x9f, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0xb7, 0x07, 0xa2, 0x41, 0x87, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x1e, 0x3e, 0xc0, 0x01, 0x00, 0xc9, 0x07, 0x22, 0x40,</div><div class='add'>+	0x15, 0x6c, 0x00, 0x00, 0xba, 0x07, 0x20, 0x1e, 0x14, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x0a, 0x3c, 0xb0, 0x01, 0x00, 0xe5, 0x9f, 0x00, 0x1e,</div><div class='add'>+	0x24, 0x30, 0x01, 0x00, 0xbf, 0x07, 0x22, 0x08, 0x2e, 0x30, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x52, 0x11, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x1a,</div><div class='add'>+	0x10, 0xc0, 0x01, 0x00, 0x23, 0x07, 0x00, 0x40, 0x17, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xe4, 0x9f, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0xe5, 0x9f, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0xbc, 0x07, 0xa2, 0x08, 0x2e, 0x30, 0x00, 0x00,</div><div class='add'>+	0x80, 0x80, 0x00, 0xa6, 0x04, 0xb0, 0x01, 0x00, 0x06, 0x00, 0x00, 0x40,</div><div class='add'>+	0x87, 0x98, 0x01, 0x00, 0x00, 0x80, 0x00, 0x03, 0x44, 0x99, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x22, 0x04, 0xe0, 0x31, 0x00, 0x00, 0xe8, 0x9f, 0x00, 0x1f,</div><div class='add'>+	0x8c, 0x30, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x0f, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xe2, 0x9f, 0x00, 0x5c, 0x1f, 0x90, 0x00, 0x00, 0x00, 0x80, 0x00, 0x03,</div><div class='add'>+	0x44, 0x99, 0x01, 0x00, 0x04, 0x00, 0x22, 0x04, 0xe0, 0x31, 0x00, 0x00,</div><div class='add'>+	0xe6, 0x9f, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0xce, 0x07, 0xa2, 0x41,</div><div class='add'>+	0x87, 0x7c, 0x00, 0x00, 0xcf, 0x07, 0x00, 0x1e, 0x3e, 0xc0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x1f, 0x8c, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x05, 0xb0, 0x01, 0x00, 0xe8, 0x9f, 0x00, 0x40, 0x0f, 0x30, 0x01, 0x00,</div><div class='add'>+	0xe2, 0x9f, 0x00, 0x5c, 0x1f, 0x90, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0xf7, 0x07, 0x00, 0xbc, 0x80, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x03, 0x80, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x03, 0x80, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x03, 0x80, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x03, 0x80, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x03, 0x80, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x03, 0x80, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x03, 0x80, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x03, 0x80, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+	0x31, 0x80, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x34, 0x80, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x35, 0x80, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x1b, 0x80, 0x81, 0x80,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x0e, 0x87, 0xa2, 0x40, 0x91, 0x6f, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4c, 0x90, 0xb3, 0x01, 0x00, 0x5c, 0x95, 0x2e, 0xa2,</div><div class='add'>+	0x80, 0xb0, 0x01, 0x00, 0xff, 0x00, 0x00, 0x80, 0xf4, 0x89, 0x01, 0x00,</div><div class='add'>+	0x90, 0x95, 0x2a, 0xc8, 0xe5, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xa1,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xa4, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd0,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd1, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xd2, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4c,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd4, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xd3, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xee,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4e, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x44, 0xb1, 0x01, 0x00, 0x18, 0x80, 0x11, 0x81,</div><div class='add'>+	0x98, 0x30, 0x00, 0x00, 0x00, 0x00, 0x51, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x1a, 0x80, 0x11, 0x82, 0x98, 0x30, 0x00, 0x00, 0x00, 0x00, 0x52, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x0e, 0x87, 0x00, 0x48, 0xfd, 0x93, 0x00, 0x00,</div><div class='add'>+	0xb6, 0x03, 0x00, 0x40, 0xa1, 0x99, 0x01, 0x00, 0x23, 0x80, 0xa2, 0x42,</div><div class='add'>+	0xfd, 0x7f, 0x00, 0x00, 0x20, 0x80, 0x00, 0x80, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x22, 0x80, 0x11, 0x81, 0x82, 0x30, 0x00, 0x00, 0x22, 0x80, 0x51, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x22, 0x80, 0x11, 0x82, 0x82, 0x30, 0x00, 0x00,</div><div class='add'>+	0x22, 0x80, 0x52, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x2c, 0x80, 0x00, 0x48,</div><div class='add'>+	0xfd, 0x93, 0x00, 0x00, 0x27, 0x80, 0x00, 0x80, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x26, 0x80, 0xa2, 0x53, 0x07, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x51, 0x53,</div><div class='add'>+	0x07, 0x90, 0x01, 0x00, 0x2a, 0x80, 0x00, 0x52, 0x07, 0x90, 0x00, 0x00,</div><div class='add'>+	0x29, 0x80, 0xa2, 0x52, 0x07, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x52, 0x52,</div><div class='add'>+	0x07, 0x90, 0x01, 0x00, 0x00, 0x00, 0x00, 0x53, 0x07, 0x90, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x48, 0xfd, 0x93, 0x01, 0x00, 0x00, 0x00, 0x00, 0x46,</div><div class='add'>+	0xf3, 0x93, 0x01, 0x00, 0x5c, 0x95, 0x2e, 0xa2, 0x52, 0xb3, 0x01, 0x00,</div><div class='add'>+	0xff, 0x00, 0x00, 0x80, 0xf4, 0x89, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4c,</div><div class='add'>+	0xe4, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xa9, 0x45, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x30, 0x80, 0x00, 0x4c, 0x80, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x45, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x55, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0xaf, 0x82, 0x05, 0x40, 0x49, 0xb1, 0x00, 0x00, 0xaf, 0x82, 0x05, 0x40,</div><div class='add'>+	0x49, 0xb1, 0x00, 0x00, 0x00, 0x00, 0x05, 0x40, 0x49, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x4c, 0x01, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4b,</div><div class='add'>+	0xde, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0xfd, 0x93, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x48, 0xfd, 0x83, 0x01, 0x00, 0x02, 0x00, 0x00, 0x40,</div><div class='add'>+	0x9b, 0x9b, 0x01, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x9c, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x48, 0x03, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x58, 0x95, 0x20, 0x44,</div><div class='add'>+	0xe0, 0xb1, 0x01, 0x00, 0x04, 0x94, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf2, 0x24, 0xb1, 0x01, 0x00, 0x00, 0x0c, 0x00, 0xee,</div><div class='add'>+	0x96, 0x88, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4a, 0x97, 0xf0, 0x01, 0x00,</div><div class='add'>+	0x44, 0x80, 0xa2, 0x43, 0x97, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42,</div><div class='add'>+	0xfd, 0x93, 0x01, 0x00, 0x00, 0xc0, 0x00, 0xa6, 0x36, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xd0, 0x14, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00, 0x05, 0x00, 0x00, 0x40,</div><div class='add'>+	0xf5, 0x99, 0x01, 0x00, 0x00, 0x38, 0x00, 0x40, 0xf5, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x06, 0x00, 0x40, 0xf5, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0xf5, 0x99, 0x01, 0x00, 0x05, 0x10, 0x00, 0x40, 0xf5, 0x99, 0x01, 0x00,</div><div class='add'>+	0x02, 0x09, 0x00, 0x40, 0xf5, 0x99, 0x01, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0xf5, 0x99, 0x01, 0x00, 0x60, 0x03, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x88, 0x03, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0xa0, 0x03, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0xa2, 0x82, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x9a, 0x82, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x60, 0x95, 0x20, 0x40,</div><div class='add'>+	0xe1, 0xb1, 0x01, 0x00, 0x70, 0x95, 0x20, 0x40, 0xe1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x49, 0xdd, 0x91, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x91, 0xb3, 0x01, 0x00, 0xe0, 0x95, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x85, 0xb3, 0x01, 0x00, 0x5c, 0x95, 0x20, 0x40,</div><div class='add'>+	0xe1, 0xb1, 0x01, 0x00, 0x27, 0x82, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x90, 0x06, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5f,</div><div class='add'>+	0x2f, 0x81, 0x01, 0x00, 0x8d, 0x81, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0xe5, 0x95, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x45, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x55, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0xdd, 0x82, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x28, 0x00, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00,</div><div class='add'>+	0xaf, 0x82, 0x00, 0x41, 0xe1, 0xc1, 0x00, 0x00, 0x78, 0x18, 0x00, 0x40,</div><div class='add'>+	0x49, 0x99, 0x01, 0x00, 0x19, 0x05, 0x22, 0x54, 0x81, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x6c, 0x80, 0x42, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x82, 0x00, 0xb4,</div><div class='add'>+	0x69, 0xdf, 0x01, 0x00, 0x00, 0x00, 0x1a, 0x44, 0x93, 0x93, 0x01, 0x00,</div><div class='add'>+	0x28, 0x00, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00, 0x18, 0x05, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x40, 0x82, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x7d, 0x80, 0x22, 0x40,</div><div class='add'>+	0x97, 0x6c, 0x00, 0x00, 0x7a, 0x80, 0x42, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4f, 0x69, 0x93, 0x01, 0x00, 0x38, 0x81, 0x00, 0x58,</div><div class='add'>+	0x69, 0x93, 0x00, 0x00, 0x54, 0x16, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xfe, 0xf4, 0xb1, 0x01, 0x00, 0x80, 0x05, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x80, 0x80, 0x42, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4e, 0x69, 0x93, 0x01, 0x00, 0x38, 0x81, 0x00, 0x58,</div><div class='add'>+	0x69, 0x93, 0x00, 0x00, 0x40, 0x16, 0x00, 0x40, 0x45, 0x99, 0x01, 0x00,</div><div class='add'>+	0x40, 0x05, 0x00, 0x40, 0x49, 0x31, 0x01, 0x00, 0xf6, 0x15, 0x00, 0x40,</div><div class='add'>+	0x43, 0x99, 0x01, 0x00, 0x5c, 0x16, 0x00, 0x40, 0x45, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x6e, 0xfa, 0x8e, 0xb0, 0x01, 0x00, 0xc1, 0x05, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x96, 0x80, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x40, 0x82, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x96, 0x80, 0x22, 0x40, 0x97, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x93, 0x80, 0x42, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4f,</div><div class='add'>+	0x69, 0x93, 0x01, 0x00, 0x38, 0x81, 0x00, 0x58, 0x69, 0x93, 0x00, 0x00,</div><div class='add'>+	0x38, 0x05, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x1e, 0x00, 0x00, 0x48,</div><div class='add'>+	0xb2, 0xcb, 0x01, 0x00, 0xd0, 0x05, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x83, 0x02, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0xb8, 0x02, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xd4, 0x9f, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xd5, 0x9f, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0xd6, 0x9f, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xd7, 0x9f, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x72, 0x01, 0x00, 0x41,</div><div class='add'>+	0x81, 0xc0, 0x00, 0x00, 0x55, 0x01, 0x51, 0x48, 0xfd, 0x93, 0x00, 0x00,</div><div class='add'>+	0x55, 0x01, 0x52, 0x48, 0xfd, 0x93, 0x00, 0x00, 0x55, 0x01, 0x55, 0x49,</div><div class='add'>+	0xfd, 0x83, 0x00, 0x00, 0x55, 0x01, 0x56, 0x4a, 0xfd, 0x83, 0x00, 0x00,</div><div class='add'>+	0x50, 0x01, 0x91, 0x81, 0x80, 0x30, 0x00, 0x00, 0x55, 0x01, 0x45, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x50, 0x01, 0x91, 0x82, 0x80, 0x30, 0x00, 0x00,</div><div class='add'>+	0x55, 0x01, 0x46, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x89, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x80, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf0, 0x16, 0xb0, 0x01, 0x00, 0x22, 0x00, 0x00, 0x05,</div><div class='add'>+	0x48, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x14, 0x48, 0xc1, 0x01, 0x00,</div><div class='add'>+	0xb4, 0x80, 0x43, 0x30, 0x3d, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9e,</div><div class='add'>+	0x85, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x1b, 0x41, 0x3d, 0xc3, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x20, 0x42, 0xec, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x49, 0xb1, 0x01, 0x00, 0xae, 0x03, 0x00, 0xcb, 0xa3, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x20, 0x46, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd2,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd3, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x42, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x45,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x20, 0x00, 0x00, 0x20, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0xa8, 0xd0, 0xe1, 0xb1, 0x00, 0x00, 0xbf, 0x80, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa8, 0x98, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x04, 0x80, 0x00, 0x40, 0x8b, 0xb3, 0x00, 0x00, 0xb1, 0x03, 0x00, 0x40,</div><div class='add'>+	0xa1, 0x99, 0x01, 0x00, 0xc7, 0x80, 0xa2, 0x42, 0x97, 0x6f, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x45, 0xa1, 0xc1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+	0x80, 0xb0, 0x01, 0x00, 0x00, 0x00, 0xa2, 0x04, 0x80, 0x94, 0x00, 0x00,</div><div class='add'>+	0x80, 0x15, 0x3f, 0x42, 0x97, 0xe3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x49, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x60, 0x03, 0x02, 0x94, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x07, 0xb0, 0x01, 0x00, 0x04, 0x00, 0x00, 0xcb,</div><div class='add'>+	0x99, 0xcb, 0x01, 0x00, 0x00, 0x00, 0x00, 0xcc, 0xf3, 0x83, 0x01, 0x00,</div><div class='add'>+	0xd1, 0x80, 0xa2, 0x42, 0x97, 0x6f, 0x00, 0x00, 0x00, 0x00, 0x00, 0xcb,</div><div class='add'>+	0xf3, 0x93, 0x01, 0x00, 0xae, 0x03, 0x00, 0xcb, 0xa3, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x20, 0x44, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x04, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xa1,</div><div class='add'>+	0xe0, 0xb1, 0x01, 0x00, 0x05, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00,</div><div class='add'>+	0x20, 0x00, 0x00, 0x20, 0x62, 0xdd, 0x01, 0x00, 0xd8, 0x80, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0xf9, 0x02, 0x00, 0x20, 0x42, 0x31, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0xa2, 0x41, 0x05, 0x6c, 0x01, 0x00, 0x00, 0x00, 0x80, 0xcb,</div><div class='add'>+	0xdb, 0x91, 0x01, 0x00, 0x00, 0x00, 0x19, 0x41, 0x8b, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x60, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00, 0xde, 0x80, 0xa8, 0xb1,</div><div class='add'>+	0x8c, 0x33, 0x00, 0x00, 0x60, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00,</div><div class='add'>+	0xe0, 0x80, 0xa8, 0xb1, 0x94, 0x33, 0x00, 0x00, 0xe6, 0x80, 0x14, 0xc6,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x18, 0x00, 0x00, 0xc6, 0x83, 0xf4, 0x01, 0x00,</div><div class='add'>+	0xf4, 0x82, 0x22, 0x4f, 0x83, 0x04, 0x00, 0x00, 0xc2, 0x80, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0xff, 0x01, 0x00, 0xc6, 0x81, 0x88, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xc6, 0x97, 0xa3, 0x01, 0x00, 0xc2, 0x80, 0x1f, 0x5c,</div><div class='add'>+	0x97, 0x53, 0x00, 0x00, 0x58, 0x82, 0x1e, 0xc6, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x2f, 0x43, 0x81, 0xf0, 0x01, 0x00, 0xec, 0x80, 0x00, 0x40,</div><div class='add'>+	0x10, 0xc9, 0x00, 0x00, 0x39, 0x81, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x6a, 0x81, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x24, 0x82, 0x00, 0xca,</div><div class='add'>+	0x63, 0xb3, 0x00, 0x00, 0x61, 0x81, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x48, 0x81, 0x00, 0x4d, 0x83, 0xb0, 0x00, 0x00, 0x52, 0x81, 0x00, 0x4e,</div><div class='add'>+	0x61, 0xb1, 0x00, 0x00, 0x41, 0x81, 0x00, 0x40, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x48, 0x81, 0x00, 0x4c, 0x83, 0xb0, 0x00, 0x00, 0x24, 0x81, 0x00, 0x40,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0xe3, 0x81, 0x00, 0x40, 0x49, 0xb1, 0x00, 0x00,</div><div class='add'>+	0x71, 0x81, 0x00, 0x40, 0xc1, 0xb1, 0x00, 0x00, 0xdf, 0x81, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x41, 0x81, 0x00, 0x40, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xf0, 0x03, 0x00, 0x40, 0x49, 0xb1, 0x00, 0x00, 0xf4, 0x82, 0x00, 0xca,</div><div class='add'>+	0x9b, 0xb3, 0x00, 0x00, 0x7b, 0x81, 0x00, 0x40, 0xc1, 0xb1, 0x00, 0x00,</div><div class='add'>+	0x7f, 0x81, 0x00, 0x40, 0xc1, 0xb1, 0x00, 0x00, 0x86, 0x81, 0x00, 0x40,</div><div class='add'>+	0xc1, 0xb1, 0x00, 0x00, 0x87, 0x81, 0x00, 0x40, 0xc1, 0xb1, 0x00, 0x00,</div><div class='add'>+	0x88, 0x81, 0x00, 0x40, 0xc1, 0xb1, 0x00, 0x00, 0x89, 0x81, 0x00, 0x40,</div><div class='add'>+	0xc1, 0xb1, 0x00, 0x00, 0x8a, 0x81, 0x00, 0x40, 0x81, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x8a, 0x81, 0x00, 0x41, 0x81, 0xb0, 0x00, 0x00, 0x18, 0x82, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x97, 0x82, 0x00, 0xbb, 0xab, 0xb3, 0x00, 0x00,</div><div class='add'>+	0x25, 0x82, 0x00, 0xca, 0xcf, 0xb3, 0x00, 0x00, 0xc8, 0x03, 0x00, 0x40,</div><div class='add'>+	0x49, 0xb1, 0x00, 0x00, 0xe8, 0x03, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x26, 0x82, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xf4, 0x82, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0xe0, 0x03, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xf4, 0x82, 0x00, 0xca, 0x77, 0xb3, 0x00, 0x00, 0x49, 0x81, 0x00, 0x4d,</div><div class='add'>+	0x83, 0xb0, 0x00, 0x00, 0x50, 0x81, 0x00, 0x4e, 0x61, 0xb1, 0x00, 0x00,</div><div class='add'>+	0x41, 0x81, 0x00, 0xbb, 0x85, 0xb0, 0x00, 0x00, 0x49, 0x81, 0x00, 0x4c,</div><div class='add'>+	0x83, 0xb0, 0x00, 0x00, 0x41, 0x81, 0x00, 0xbb, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x24, 0x81, 0x00, 0xbb, 0x85, 0xb0, 0x00, 0x00, 0x16, 0x81, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0xf4, 0x82, 0x00, 0xca, 0x4d, 0xb3, 0x00, 0x00,</div><div class='add'>+	0x70, 0x05, 0x00, 0x40, 0x49, 0xb1, 0x00, 0x00, 0xa0, 0x05, 0x00, 0x40,</div><div class='add'>+	0x49, 0xb1, 0x00, 0x00, 0x1c, 0x81, 0x22, 0x42, 0x8f, 0x6f, 0x00, 0x00,</div><div class='add'>+	0x1e, 0x81, 0x22, 0x41, 0x8f, 0x6f, 0x00, 0x00, 0x20, 0x81, 0x1e, 0xca,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x22, 0x81, 0x1f, 0xca, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xca, 0xc9, 0xb1, 0x01, 0x00, 0xf4, 0x82, 0x00, 0x42,</div><div class='add'>+	0x8f, 0xb3, 0x00, 0x00, 0x00, 0x00, 0x00, 0xca, 0xcd, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xf4, 0x82, 0x00, 0x41, 0x8f, 0xb3, 0x00, 0x00, 0x00, 0x00, 0x00, 0xca,</div><div class='add'>+	0xcf, 0xb1, 0x01, 0x00, 0xf4, 0x82, 0x00, 0x40, 0x8f, 0xb3, 0x00, 0x00,</div><div class='add'>+	0x00, 0x81, 0x00, 0xa6, 0xc6, 0xb1, 0x01, 0x00, 0xf4, 0x82, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x80, 0x00, 0xa6, 0xc6, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xf4, 0x82, 0x00, 0x40, 0x8f, 0xb3, 0x00, 0x00, 0x78, 0x18, 0x00, 0x40,</div><div class='add'>+	0x49, 0x99, 0x01, 0x00, 0x10, 0x00, 0x2f, 0x9c, 0x89, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x3b, 0x81, 0x00, 0x40, 0x39, 0x33, 0x01, 0x00, 0x18, 0x00, 0x2f, 0x9b,</div><div class='add'>+	0x89, 0xb0, 0x01, 0x00, 0x3b, 0x81, 0x00, 0x40, 0x37, 0x33, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x2f, 0x9a, 0x89, 0xb0, 0x01, 0x00, 0x3b, 0x81, 0x00, 0x40,</div><div class='add'>+	0x35, 0x33, 0x01, 0x00, 0x08, 0x00, 0x2f, 0x99, 0x89, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x3b, 0x81, 0x00, 0x40, 0x33, 0x33, 0x01, 0x00, 0x00, 0x80, 0x00, 0xae,</div><div class='add'>+	0x47, 0xc9, 0x01, 0x00, 0x80, 0x00, 0x00, 0x40, 0xf1, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xca, 0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x42,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x40, 0x18, 0x00, 0x40, 0xe1, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x45, 0x61, 0xb1, 0x01, 0x00, 0x20, 0x00, 0x00, 0xae,</div><div class='add'>+	0x63, 0xdd, 0x01, 0x00, 0x36, 0x81, 0x28, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x33, 0x81, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x36, 0x81, 0x42, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5c, 0x69, 0x93, 0x01, 0x00,</div><div class='add'>+	0xf4, 0x82, 0x1a, 0x44, 0x93, 0x93, 0x00, 0x00, 0x39, 0x81, 0x42, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x38, 0x81, 0x00, 0x58, 0x69, 0x93, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x44, 0xf0, 0xd1, 0x01, 0x00, 0x00, 0x00, 0xa4, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x40, 0x81, 0xa2, 0x40, 0xe1, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x44, 0x45, 0xd1, 0x01, 0x00, 0x00, 0x00, 0x80, 0x40,</div><div class='add'>+	0xe1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x80, 0x41, 0xe1, 0xd1, 0x01, 0x00,</div><div class='add'>+	0x41, 0x81, 0x37, 0x5c, 0x61, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42,</div><div class='add'>+	0x62, 0xb1, 0x01, 0x00, 0x45, 0x81, 0x28, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x42, 0x81, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0xca,</div><div class='add'>+	0x63, 0xb1, 0x01, 0x00, 0x45, 0x81, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0xf4, 0x82, 0x17, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x4a, 0x81, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb0, 0x00, 0x00, 0x4a, 0x81, 0x00, 0xbb, 0x81, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x60, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x62, 0xb1, 0x01, 0x00, 0x4b, 0x81, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xca, 0x63, 0xb1, 0x01, 0x00, 0xf4, 0x82, 0x28, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x4d, 0x81, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x50, 0x95, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00, 0x53, 0x81, 0x00, 0xbb,</div><div class='add'>+	0x87, 0xb0, 0x00, 0x00, 0x50, 0x95, 0x2f, 0x40, 0x87, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x55, 0x81, 0x22, 0x40, 0x95, 0x7f, 0x00, 0x00, 0xf4, 0x82, 0x60, 0x40,</div><div class='add'>+	0x95, 0x83, 0x00, 0x00, 0x02, 0x00, 0x2d, 0xf0, 0x84, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x56, 0x81, 0x36, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42,</div><div class='add'>+	0x62, 0xb1, 0x01, 0x00, 0x57, 0x81, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x43, 0x62, 0xb1, 0x01, 0x00, 0x59, 0x81, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0xca, 0x63, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x5b, 0x81, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x16, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0xf4, 0x82, 0x22, 0x41, 0x43, 0x51, 0x00, 0x00,</div><div class='add'>+	0x00, 0x08, 0x00, 0xca, 0x95, 0xcb, 0x01, 0x00, 0x56, 0x81, 0x00, 0x41,</div><div class='add'>+	0x85, 0xc0, 0x00, 0x00, 0x63, 0x81, 0xa2, 0x42, 0x67, 0x6f, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x67, 0xb3, 0x01, 0x00, 0x63, 0x81, 0x42, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x65, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x93, 0x83, 0x01, 0x00, 0x00, 0x00, 0x1a, 0xca,</div><div class='add'>+	0x69, 0x97, 0x01, 0x00, 0xf4, 0x82, 0x26, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x68, 0x81, 0x42, 0x40, 0x81, 0x32, 0x00, 0x00, 0xf4, 0x82, 0x1a, 0x44,</div><div class='add'>+	0x93, 0x93, 0x00, 0x00, 0xf4, 0x82, 0x20, 0x43, 0x95, 0x6f, 0x00, 0x00,</div><div class='add'>+	0xf4, 0x82, 0x80, 0xca, 0x67, 0x33, 0x00, 0x00, 0xf4, 0x82, 0x22, 0x40,</div><div class='add'>+	0x65, 0x6f, 0x00, 0x00, 0xf4, 0x82, 0x00, 0x6f, 0xdb, 0x91, 0x00, 0x00,</div><div class='add'>+	0x85, 0x00, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x35, 0x80, 0x22, 0x40,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0xf4, 0x82, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x58, 0x95, 0x93, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5f,</div><div class='add'>+	0x95, 0x93, 0x01, 0x00, 0x77, 0x81, 0xa2, 0x44, 0x21, 0x6f, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x5f, 0x95, 0x83, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5e,</div><div class='add'>+	0x95, 0x93, 0x01, 0x00, 0x00, 0x00, 0x00, 0x57, 0x95, 0x93, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xca, 0xc3, 0xb1, 0x01, 0x00, 0x7a, 0x81, 0x22, 0x5b,</div><div class='add'>+	0x95, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4b, 0xfd, 0x93, 0x01, 0x00,</div><div class='add'>+	0xf4, 0x82, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x1b, 0xfd, 0x00, 0xca,</div><div class='add'>+	0x95, 0x9b, 0x01, 0x00, 0x0d, 0x01, 0x00, 0xca, 0xc5, 0x31, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x5f, 0x95, 0x83, 0x01, 0x00, 0xf4, 0x82, 0x00, 0xca,</div><div class='add'>+	0xc5, 0xb1, 0x00, 0x00, 0xdf, 0x6f, 0x00, 0xca, 0x95, 0x9b, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x55, 0x95, 0x93, 0x01, 0x00, 0x00, 0x00, 0x00, 0xca,</div><div class='add'>+	0xc7, 0xb1, 0x01, 0x00, 0xf4, 0x82, 0x22, 0x5f, 0x95, 0x7f, 0x00, 0x00,</div><div class='add'>+	0x0d, 0x01, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5f,</div><div class='add'>+	0x95, 0x83, 0x01, 0x00, 0xf4, 0x82, 0x00, 0xca, 0xc7, 0xb1, 0x00, 0x00,</div><div class='add'>+	0xf4, 0x82, 0x00, 0xca, 0xc9, 0xb1, 0x00, 0x00, 0xf4, 0x82, 0x00, 0xca,</div><div class='add'>+	0xcb, 0xb1, 0x00, 0x00, 0xf4, 0x82, 0x00, 0xca, 0xcd, 0xb1, 0x00, 0x00,</div><div class='add'>+	0xf4, 0x82, 0x00, 0xca, 0xcf, 0xb1, 0x00, 0x00, 0x00, 0x00, 0x2e, 0x42,</div><div class='add'>+	0x81, 0xe0, 0x01, 0x00, 0x98, 0x14, 0x00, 0x40, 0x48, 0xc9, 0x01, 0x00,</div><div class='add'>+	0xf4, 0x82, 0x00, 0xca, 0xe1, 0xb1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x09, 0xb1, 0x01, 0x00, 0x20, 0x00, 0x00, 0xa6, 0x82, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x8f, 0x81, 0xa2, 0x5e, 0x0b, 0x7d, 0x00, 0x00, 0x00, 0x80, 0x00, 0x41,</div><div class='add'>+	0x08, 0x99, 0x01, 0x00, 0x91, 0x81, 0xa2, 0x5e, 0x0b, 0x7d, 0x00, 0x00,</div><div class='add'>+	0x20, 0x80, 0x00, 0xa6, 0x08, 0xb1, 0x01, 0x00, 0x93, 0x81, 0x9f, 0x85,</div><div class='add'>+	0x82, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x83, 0x84, 0x01, 0x00,</div><div class='add'>+	0xc8, 0x81, 0x22, 0x30, 0x83, 0x6c, 0x00, 0x00, 0x92, 0x81, 0xa2, 0x4f,</div><div class='add'>+	0x0b, 0x7d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x21, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x02, 0x80, 0x00, 0xa6, 0x82, 0xb0, 0x01, 0x00, 0x13, 0x82, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x10, 0x00, 0x00, 0x41, 0x84, 0xe4, 0x01, 0x00,</div><div class='add'>+	0x03, 0x80, 0x00, 0xa6, 0x82, 0xb0, 0x01, 0x00, 0x13, 0x82, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0xf0, 0xff, 0x00, 0x41, 0x86, 0x88, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x43, 0x84, 0x94, 0x01, 0x00, 0x0f, 0x00, 0x00, 0xa6,</div><div class='add'>+	0x86, 0xb0, 0x01, 0x00, 0x10, 0xc4, 0x00, 0x43, 0x86, 0x98, 0x01, 0x00,</div><div class='add'>+	0xa8, 0x81, 0xa2, 0x43, 0x84, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43,</div><div class='add'>+	0x21, 0xb3, 0x01, 0x00, 0x20, 0x00, 0x00, 0xa6, 0x82, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x1c, 0x00, 0x00, 0x41, 0x82, 0xdc, 0x01, 0x00, 0xa5, 0x81, 0xa2, 0x5e,</div><div class='add'>+	0x0b, 0x7d, 0x00, 0x00, 0x04, 0x00, 0x00, 0x41, 0x08, 0x99, 0x01, 0x00,</div><div class='add'>+	0xba, 0x81, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x41, 0x01, 0x00, 0xa6,</div><div class='add'>+	0x86, 0xb0, 0x01, 0x00, 0x50, 0x0c, 0x00, 0x43, 0x86, 0x98, 0x01, 0x00,</div><div class='add'>+	0xad, 0x81, 0xa2, 0x43, 0x84, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x21, 0xb3, 0x01, 0x00, 0xba, 0x81, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x41, 0x01, 0x00, 0xa6, 0x86, 0xb0, 0x01, 0x00, 0x60, 0x0c, 0x00, 0x43,</div><div class='add'>+	0x86, 0x98, 0x01, 0x00, 0xba, 0x81, 0xa2, 0x43, 0x84, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x42, 0x21, 0xb3, 0x01, 0x00, 0x18, 0x80, 0x00, 0xa6,</div><div class='add'>+	0x82, 0xb0, 0x01, 0x00, 0x13, 0x82, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0xff, 0xff, 0x00, 0x41, 0x82, 0x88, 0x01, 0x00, 0x00, 0x77, 0x00, 0x41,</div><div class='add'>+	0x82, 0x8c, 0x01, 0x00, 0x01, 0x02, 0x00, 0x41, 0x82, 0x98, 0x01, 0x00,</div><div class='add'>+	0x20, 0x00, 0x00, 0x41, 0x82, 0xdc, 0x01, 0x00, 0x18, 0x00, 0x00, 0x41,</div><div class='add'>+	0x82, 0xdc, 0x01, 0x00, 0xb8, 0x81, 0xa2, 0x5e, 0x0b, 0x7d, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x08, 0xb1, 0x01, 0x00, 0x20, 0x00, 0x00, 0xa6,</div><div class='add'>+	0x82, 0xb0, 0x01, 0x00, 0xbb, 0x81, 0xa2, 0x5e, 0x0b, 0x7d, 0x00, 0x00,</div><div class='add'>+	0x40, 0x13, 0x00, 0x41, 0x08, 0x99, 0x01, 0x00, 0xc3, 0x81, 0x22, 0x43,</div><div class='add'>+	0x21, 0x6f, 0x00, 0x00, 0x20, 0x00, 0x00, 0xa6, 0x82, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x12, 0x00, 0x00, 0x41, 0x82, 0xdc, 0x01, 0x00, 0xc0, 0x81, 0xa2, 0x5e,</div><div class='add'>+	0x0b, 0x7d, 0x00, 0x00, 0x00, 0x04, 0x00, 0x41, 0x08, 0x99, 0x01, 0x00,</div><div class='add'>+	0xde, 0x81, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x20, 0x00, 0x00, 0xa6,</div><div class='add'>+	0x82, 0xb0, 0x01, 0x00, 0x19, 0x00, 0x00, 0x41, 0x82, 0xdc, 0x01, 0x00,</div><div class='add'>+	0xc5, 0x81, 0xa2, 0x5e, 0x0b, 0x7d, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x41,</div><div class='add'>+	0x08, 0x99, 0x01, 0x00, 0xde, 0x81, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x44, 0x21, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x83, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5f, 0x83, 0x90, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x5e, 0x83, 0x90, 0x01, 0x00, 0x00, 0x00, 0x00, 0x57,</div><div class='add'>+	0x83, 0x90, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41, 0xc2, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x0c, 0x01, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5f,</div><div class='add'>+	0x83, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41, 0xc2, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x0c, 0x01, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x20, 0x00, 0x00, 0xa6,</div><div class='add'>+	0x82, 0xb0, 0x01, 0x00, 0x04, 0x00, 0x00, 0x41, 0x82, 0xdc, 0x01, 0x00,</div><div class='add'>+	0x20, 0x00, 0x00, 0x41, 0x08, 0x99, 0x01, 0x00, 0x20, 0x00, 0x00, 0xa6,</div><div class='add'>+	0x82, 0xb0, 0x01, 0x00, 0x11, 0x00, 0x00, 0x41, 0x82, 0xdc, 0x01, 0x00,</div><div class='add'>+	0xd7, 0x81, 0xa2, 0x5e, 0x0b, 0x7d, 0x00, 0x00, 0x01, 0x00, 0x00, 0x41,</div><div class='add'>+	0x08, 0x99, 0x01, 0x00, 0x20, 0x00, 0x00, 0xa6, 0x82, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xda, 0x81, 0xa2, 0x5e, 0x0b, 0x7d, 0x00, 0x00, 0x40, 0x13, 0x00, 0x41,</div><div class='add'>+	0x08, 0x99, 0x01, 0x00, 0x01, 0x00, 0x00, 0xa6, 0x82, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x41, 0x2e, 0x99, 0x01, 0x00, 0x00, 0x00, 0x80, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x20, 0x00, 0x00, 0xa6, 0x80, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xca, 0x81, 0x94, 0x01, 0x00, 0xe1, 0x81, 0xa2, 0x5e,</div><div class='add'>+	0x0b, 0x7d, 0x00, 0x00, 0xf4, 0x82, 0x00, 0x40, 0x08, 0xb1, 0x00, 0x00,</div><div class='add'>+	0xc8, 0x14, 0x2e, 0xbb, 0x85, 0xb0, 0x01, 0x00, 0xe4, 0x81, 0xa2, 0x5e,</div><div class='add'>+	0x0b, 0x7d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x87, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xf3, 0x81, 0x22, 0x43, 0x21, 0x6f, 0x00, 0x00, 0x02, 0x82, 0x22, 0x44,</div><div class='add'>+	0x21, 0x6f, 0x00, 0x00, 0x11, 0x80, 0x00, 0xa6, 0x82, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x13, 0x82, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x0a, 0x82, 0x22, 0x4a,</div><div class='add'>+	0x83, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x87, 0x90, 0x01, 0x00,</div><div class='add'>+	0xee, 0x81, 0x22, 0x4d, 0x83, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x87, 0x90, 0x01, 0x00, 0xf0, 0x81, 0x22, 0x4f, 0x83, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x43, 0x87, 0x90, 0x01, 0x00, 0xf2, 0x81, 0x22, 0x4e,</div><div class='add'>+	0x83, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x87, 0x90, 0x01, 0x00,</div><div class='add'>+	0x0a, 0x82, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x01, 0x80, 0x00, 0xa6,</div><div class='add'>+	0x82, 0xb0, 0x01, 0x00, 0x13, 0x82, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x01, 0x80, 0x00, 0xa6, 0x82, 0xb0, 0x01, 0x00, 0x13, 0x82, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x0a, 0x82, 0x22, 0x42, 0x83, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x87, 0x90, 0x01, 0x00, 0x1c, 0x80, 0x00, 0xa6,</div><div class='add'>+	0x82, 0xb0, 0x01, 0x00, 0x13, 0x82, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0xfd, 0x81, 0x22, 0x45, 0x83, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x87, 0x90, 0x01, 0x00, 0xff, 0x81, 0x22, 0x44, 0x83, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x43, 0x87, 0x90, 0x01, 0x00, 0x01, 0x82, 0x22, 0x43,</div><div class='add'>+	0x83, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x87, 0x90, 0x01, 0x00,</div><div class='add'>+	0x0a, 0x82, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x01, 0x80, 0x00, 0xa6,</div><div class='add'>+	0x82, 0xb0, 0x01, 0x00, 0x13, 0x82, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x01, 0x80, 0x00, 0xa6, 0x82, 0xb0, 0x01, 0x00, 0x13, 0x82, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x0a, 0x82, 0x22, 0x42, 0x83, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x87, 0x90, 0x01, 0x00, 0x00, 0x00, 0x00, 0x43,</div><div class='add'>+	0x87, 0x90, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41, 0x87, 0x90, 0x01, 0x00,</div><div class='add'>+	0x00, 0x80, 0x00, 0xa6, 0x82, 0xb0, 0x01, 0x00, 0x13, 0x82, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x0e, 0x82, 0x22, 0x4b, 0x83, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x87, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00, 0x43,</div><div class='add'>+	0xe0, 0xb1, 0x01, 0x00, 0xff, 0x7f, 0x00, 0xa2, 0xa0, 0x8b, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x44, 0xa5, 0xb3, 0x01, 0x00, 0xb8, 0x80, 0x00, 0xca,</div><div class='add'>+	0xa7, 0x33, 0x01, 0x00, 0x36, 0x81, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x20, 0x00, 0x00, 0x41, 0x82, 0xdc, 0x01, 0x00, 0x14, 0x82, 0xa2, 0x5e,</div><div class='add'>+	0x0b, 0x7d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x08, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x16, 0x82, 0x9f, 0x85, 0x82, 0x30, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x1b, 0x82, 0x14, 0xf7, 0x81, 0x30, 0x00, 0x00,</div><div class='add'>+	0x1b, 0x82, 0xa2, 0x49, 0xfd, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x48,</div><div class='add'>+	0xfd, 0x93, 0x01, 0x00, 0x1e, 0x82, 0x15, 0xf8, 0x81, 0x14, 0x00, 0x00,</div><div class='add'>+	0x1e, 0x82, 0xa2, 0x4a, 0xfd, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x48,</div><div class='add'>+	0xfd, 0x93, 0x01, 0x00, 0x20, 0x82, 0xa2, 0xc8, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x40, 0x80, 0xdc, 0x01, 0x00, 0x00, 0x10, 0x00, 0x40,</div><div class='add'>+	0x80, 0xdc, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0xef, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x22, 0x82, 0x42, 0x40, 0xf1, 0x33, 0x00, 0x00, 0x38, 0x81, 0x00, 0x40,</div><div class='add'>+	0x68, 0x97, 0x00, 0x00, 0xf4, 0x82, 0x00, 0xbb, 0x6b, 0xb3, 0x00, 0x00,</div><div class='add'>+	0xf4, 0x82, 0x00, 0xbb, 0xb1, 0xb3, 0x00, 0x00, 0xf4, 0x82, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x03, 0x00, 0x40, 0x81, 0x98, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x18, 0xb1, 0x01, 0x00, 0x80, 0x00, 0x00, 0x40,</div><div class='add'>+	0x83, 0x98, 0x01, 0x00, 0x00, 0x19, 0x00, 0x40, 0x45, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x42, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x43, 0xff,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xff, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x81, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x18, 0xb1, 0x01, 0x00, 0x2b, 0x82, 0xa2, 0x41, 0x83, 0x50, 0x00, 0x00,</div><div class='add'>+	0x00, 0x16, 0x00, 0x40, 0x45, 0x99, 0x01, 0x00, 0x00, 0x19, 0x00, 0x40,</div><div class='add'>+	0x43, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x47, 0x43, 0xc1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x83, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf3,</div><div class='add'>+	0x80, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5b, 0x81, 0xd0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x80, 0xd0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0xf6, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5b, 0x43, 0xc1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x83, 0xc0, 0x01, 0x00, 0x35, 0x82, 0xa2, 0x54,</div><div class='add'>+	0x83, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xf7, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x83, 0xc0, 0x01, 0x00, 0x3c, 0x82, 0xa2, 0x06,</div><div class='add'>+	0x83, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x16, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00, 0x80, 0x16, 0x2e, 0x06,</div><div class='add'>+	0x83, 0xb0, 0x01, 0x00, 0x36, 0x00, 0x00, 0xfb, 0xf6, 0xa9, 0x01, 0x00,</div><div class='add'>+	0x42, 0x82, 0xa2, 0x41, 0x83, 0x50, 0x00, 0x00, 0x22, 0x00, 0x00, 0x40,</div><div class='add'>+	0x83, 0x98, 0x01, 0x00, 0x00, 0x00, 0x00, 0xfb, 0xf6, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x45, 0x82, 0xa2, 0x41, 0x83, 0x50, 0x00, 0x00, 0x62, 0x00, 0x00, 0x40,</div><div class='add'>+	0x95, 0x98, 0x01, 0x00, 0xdc, 0x9f, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x00, 0x16, 0x2d, 0x06, 0x83, 0xb0, 0x01, 0x00, 0x80, 0x16, 0x00, 0x40,</div><div class='add'>+	0x45, 0x99, 0x01, 0x00, 0x5c, 0x00, 0x00, 0xfb, 0xf6, 0xa9, 0x01, 0x00,</div><div class='add'>+	0x4b, 0x82, 0xa2, 0x41, 0x83, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70,</div><div class='add'>+	0xf9, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x71, 0xf9, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x72, 0xf9, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x73,</div><div class='add'>+	0xf9, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x74, 0xf9, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x54, 0x00, 0x00, 0x40, 0x95, 0x98, 0x01, 0x00, 0xdc, 0x9f, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0x70, 0x95, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x57, 0x82, 0x22, 0x70, 0xb5, 0x6f, 0x00, 0x00, 0x00, 0x00, 0x80, 0x41,</div><div class='add'>+	0x97, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x80, 0x40, 0x97, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xb6, 0x03, 0x00, 0x40, 0xa1, 0x99, 0x01, 0x00, 0x00, 0x00, 0x2f, 0x42,</div><div class='add'>+	0x99, 0xb3, 0x01, 0x00, 0x62, 0x82, 0x22, 0x44, 0x81, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x6a, 0x82, 0x22, 0x48, 0x81, 0x6c, 0x00, 0x00, 0x64, 0x82, 0x22, 0x4c,</div><div class='add'>+	0x81, 0x6c, 0x00, 0x00, 0x6e, 0x82, 0x22, 0x50, 0x81, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x6f, 0x82, 0x22, 0x54, 0x81, 0x6c, 0x00, 0x00, 0x71, 0x82, 0x22, 0x58,</div><div class='add'>+	0x81, 0x6c, 0x00, 0x00, 0x76, 0x82, 0x22, 0x5c, 0x81, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x50, 0x01, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0xbc,</div><div class='add'>+	0x09, 0xb0, 0x01, 0x00, 0xf4, 0x82, 0x00, 0xca, 0x01, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x03, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0xf3, 0x83, 0x01, 0x00, 0x68, 0x82, 0xa2, 0x42, 0x05, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x05, 0xb0, 0x01, 0x00, 0xf4, 0x82, 0x22, 0xca,</div><div class='add'>+	0x07, 0x14, 0x00, 0x00, 0xf4, 0x82, 0x00, 0x46, 0xf3, 0x93, 0x00, 0x00,</div><div class='add'>+	0xf4, 0x82, 0x20, 0x43, 0x95, 0x6f, 0x00, 0x00, 0xf4, 0x82, 0x80, 0xca,</div><div class='add'>+	0x05, 0x30, 0x00, 0x00, 0xf4, 0x82, 0x22, 0x01, 0x80, 0x30, 0x00, 0x00,</div><div class='add'>+	0xf4, 0x82, 0x00, 0xcb, 0xdb, 0x91, 0x00, 0x00, 0x57, 0x01, 0x00, 0xbc,</div><div class='add'>+	0xab, 0xb3, 0x00, 0x00, 0x00, 0x00, 0x00, 0xbc, 0xb1, 0xb3, 0x01, 0x00,</div><div class='add'>+	0xf4, 0x82, 0x00, 0xca, 0xcf, 0xb3, 0x00, 0x00, 0xff, 0x00, 0x00, 0xca,</div><div class='add'>+	0x81, 0x88, 0x01, 0x00, 0xf4, 0x82, 0xa2, 0x40, 0x74, 0x7d, 0x00, 0x00,</div><div class='add'>+	0x60, 0x00, 0x20, 0x40, 0x60, 0x99, 0x01, 0x00, 0x73, 0x82, 0xa8, 0xb1,</div><div class='add'>+	0x82, 0x30, 0x00, 0x00, 0x72, 0x82, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xf4, 0x82, 0x00, 0xca, 0x79, 0xb3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4e,</div><div class='add'>+	0x81, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x43, 0xcb, 0x83, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x45, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x79, 0x82, 0xa2, 0x41,</div><div class='add'>+	0x81, 0x50, 0x00, 0x00, 0x00, 0x00, 0x45, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x45, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x84, 0x82, 0x91, 0x82,</div><div class='add'>+	0x82, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8a, 0x80, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xae, 0x9f, 0x00, 0x40, 0x80, 0xce, 0x01, 0x00, 0x82, 0x82, 0xa6, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x84, 0x82, 0x56, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xb6, 0x03, 0x00, 0x40, 0xa1, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x53,</div><div class='add'>+	0x07, 0x90, 0x01, 0x00, 0xb6, 0x03, 0x00, 0x40, 0xa1, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x52, 0x07, 0x90, 0x01, 0x00, 0xd8, 0x9f, 0x00, 0x41,</div><div class='add'>+	0x8b, 0xb3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4e, 0x81, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x42, 0xcd, 0x83, 0x01, 0x00, 0x00, 0x00, 0x46, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x89, 0x82, 0xa2, 0x41, 0x81, 0x50, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x46, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x46, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x94, 0x82, 0x91, 0x81, 0x82, 0x30, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x89, 0x80, 0xb0, 0x01, 0x00, 0xae, 0x9f, 0x00, 0x40,</div><div class='add'>+	0x80, 0xce, 0x01, 0x00, 0x92, 0x82, 0xa6, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x94, 0x82, 0x55, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xb6, 0x03, 0x00, 0x40,</div><div class='add'>+	0xa1, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x52, 0x07, 0x90, 0x01, 0x00,</div><div class='add'>+	0xb6, 0x03, 0x00, 0x40, 0xa1, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x53,</div><div class='add'>+	0x07, 0x90, 0x01, 0x00, 0xd8, 0x9f, 0x00, 0x41, 0x8b, 0xb3, 0x00, 0x00,</div><div class='add'>+	0xb1, 0x03, 0x00, 0x40, 0xa1, 0x99, 0x01, 0x00, 0xc4, 0x14, 0x2f, 0x40,</div><div class='add'>+	0x99, 0xb3, 0x01, 0x00, 0x57, 0x01, 0x00, 0x40, 0x49, 0xb1, 0x00, 0x00,</div><div class='add'>+	0xa0, 0x94, 0x2e, 0x43, 0x97, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0x9b, 0x82, 0xa2, 0x41, 0x97, 0x50, 0x00, 0x00,</div><div class='add'>+	0x50, 0x95, 0x20, 0x40, 0xe1, 0xb1, 0x01, 0x00, 0xac, 0x94, 0x2e, 0x43,</div><div class='add'>+	0x97, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x9f, 0x82, 0xa2, 0x41, 0x97, 0x50, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0xae, 0x03, 0x00, 0x40, 0xa3, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x81, 0xb0, 0x01, 0x00, 0x60, 0x15, 0x00, 0x40,</div><div class='add'>+	0x85, 0x98, 0x01, 0x00, 0x08, 0x00, 0x00, 0x40, 0x40, 0xe4, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x59, 0x41, 0x94, 0x01, 0x00, 0x00, 0x00, 0x00, 0x50,</div><div class='add'>+	0x41, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x42, 0x40, 0x94, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x57, 0x41, 0x90, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x81, 0xc0, 0x01, 0x00, 0x00, 0x00, 0xa3, 0x42, 0x81, 0x6c, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0xa3, 0xc1, 0x01, 0x00, 0xa5, 0x82, 0xa0, 0x42,</div><div class='add'>+	0x81, 0x6c, 0x00, 0x00, 0xa5, 0x82, 0x00, 0x50, 0x85, 0xc0, 0x00, 0x00,</div><div class='add'>+	0xdd, 0x82, 0xa2, 0x41, 0x01, 0x7d, 0x00, 0x00, 0xb5, 0x82, 0x22, 0x58,</div><div class='add'>+	0x73, 0x7d, 0x00, 0x00, 0x78, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00,</div><div class='add'>+	0xb0, 0x82, 0xa8, 0xb1, 0x9c, 0x30, 0x00, 0x00, 0x30, 0x00, 0x38, 0x45,</div><div class='add'>+	0x9d, 0xe0, 0x01, 0x00, 0x01, 0x00, 0x00, 0x0e, 0x10, 0xc9, 0x00, 0x00,</div><div class='add'>+	0xb5, 0x82, 0x33, 0xc4, 0x81, 0x30, 0x00, 0x00, 0xb8, 0x82, 0xa1, 0xad,</div><div class='add'>+	0x9d, 0x20, 0x00, 0x00, 0xaf, 0x82, 0x13, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x13, 0x4e, 0x5a, 0x83, 0x01, 0x00, 0x30, 0x00, 0x38, 0x45,</div><div class='add'>+	0x9d, 0xe0, 0x01, 0x00, 0xc0, 0x82, 0x22, 0xab, 0x80, 0x04, 0x00, 0x00,</div><div class='add'>+	0xbe, 0x82, 0xa2, 0x40, 0x01, 0x7d, 0x00, 0x00, 0xc0, 0x82, 0x22, 0x5f,</div><div class='add'>+	0x57, 0x7d, 0x00, 0x00, 0x36, 0x87, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xc0, 0x82, 0x22, 0x5e, 0x57, 0x7d, 0x00, 0x00, 0x99, 0x87, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0xc5, 0x82, 0x22, 0x54, 0x73, 0x7d, 0x00, 0x00,</div><div class='add'>+	0x74, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00, 0xc0, 0x82, 0xa8, 0xb1,</div><div class='add'>+	0x00, 0x30, 0x00, 0x00, 0x8a, 0x84, 0xa2, 0x5f, 0x01, 0x7c, 0x00, 0x00,</div><div class='add'>+	0xca, 0x86, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xc7, 0x82, 0xa2, 0x5f,</div><div class='add'>+	0x59, 0x27, 0x00, 0x00, 0xc9, 0x82, 0xa2, 0x5c, 0x73, 0x7d, 0x00, 0x00,</div><div class='add'>+	0xd0, 0x82, 0xa2, 0x5e, 0x73, 0x7d, 0x00, 0x00, 0xda, 0x82, 0x22, 0x5c,</div><div class='add'>+	0x73, 0x7d, 0x00, 0x00, 0xdb, 0x82, 0x37, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x7c, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00, 0xca, 0x82, 0xa8, 0xb1,</div><div class='add'>+	0x36, 0x30, 0x00, 0x00, 0x7c, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00,</div><div class='add'>+	0xcc, 0x82, 0xa8, 0xb1, 0x00, 0x30, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00,</div><div class='add'>+	0x02, 0x88, 0x01, 0x00, 0xb9, 0x84, 0x17, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xdb, 0x82, 0x34, 0x40, 0x81, 0x32, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x40,</div><div class='add'>+	0x61, 0x99, 0x01, 0x00, 0xd1, 0x82, 0xa8, 0xb1, 0x12, 0x30, 0x00, 0x00,</div><div class='add'>+	0xd8, 0x82, 0x52, 0x21, 0x13, 0x04, 0x00, 0x00, 0x00, 0x00, 0x14, 0x41,</div><div class='add'>+	0x2f, 0xc3, 0x01, 0x00, 0xff, 0x3f, 0x00, 0x09, 0x00, 0x8c, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x43, 0x01, 0xf0, 0x01, 0x00, 0x11, 0x83, 0x00, 0x34,</div><div class='add'>+	0x13, 0x84, 0x00, 0x00, 0xff, 0x3f, 0x14, 0x09, 0x00, 0x8c, 0x01, 0x00,</div><div class='add'>+	0x6f, 0x83, 0x00, 0x43, 0x01, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0xdb, 0x82, 0x33, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0xaf, 0x82, 0x13, 0x4e, 0x5a, 0x93, 0x00, 0x00, 0x0e, 0x87, 0xa2, 0x48,</div><div class='add'>+	0xfd, 0x7f, 0x00, 0x00, 0x04, 0x00, 0xa2, 0xac, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0xe3, 0x82, 0x22, 0x5a, 0x73, 0x7d, 0x00, 0x00, 0x7a, 0x00, 0x00, 0x40,</div><div class='add'>+	0x61, 0x99, 0x01, 0x00, 0xe0, 0x82, 0xa8, 0xb1, 0x7e, 0x31, 0x00, 0x00,</div><div class='add'>+	0x01, 0x00, 0x00, 0xcf, 0x11, 0xc9, 0x00, 0x00, 0xe9, 0x82, 0xa2, 0x40,</div><div class='add'>+	0x93, 0x7f, 0x00, 0x00, 0xe9, 0x82, 0x22, 0x44, 0x93, 0x7f, 0x00, 0x00,</div><div class='add'>+	0xe5, 0x82, 0x42, 0xa5, 0x80, 0x30, 0x00, 0x00, 0xe8, 0x82, 0xa2, 0x40,</div><div class='add'>+	0x93, 0x7f, 0x00, 0x00, 0xfb, 0x82, 0x1a, 0x40, 0x93, 0x93, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x1a, 0x40, 0x81, 0xb2, 0x01, 0x00, 0xdd, 0x80, 0xa2, 0x40,</div><div class='add'>+	0x73, 0x7d, 0x00, 0x00, 0x09, 0x87, 0x22, 0x44, 0x21, 0x6f, 0x00, 0x00,</div><div class='add'>+	0x00, 0x87, 0x22, 0x40, 0x65, 0x7d, 0x00, 0x00, 0x00, 0x05, 0xa2, 0x5b,</div><div class='add'>+	0x73, 0x7d, 0x00, 0x00, 0x04, 0x00, 0xa2, 0x49, 0x33, 0x7d, 0x00, 0x00,</div><div class='add'>+	0xf3, 0x82, 0x22, 0x48, 0x33, 0x7d, 0x00, 0x00, 0xff, 0x01, 0x00, 0x99,</div><div class='add'>+	0x80, 0xd8, 0x01, 0x00, 0x00, 0x00, 0x00, 0x50, 0x81, 0xe0, 0x01, 0x00,</div><div class='add'>+	0xa8, 0x98, 0x2f, 0x40, 0x33, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0xe0, 0xc1, 0x01, 0x00, 0xdd, 0x82, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xaf, 0x82, 0x00, 0x40, 0x8b, 0xb3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x58,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4e, 0x62, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xaf, 0x82, 0x28, 0x40, 0x81, 0x32, 0x00, 0x00, 0xf6, 0x82, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0xf9, 0x82, 0x33, 0x40, 0x1f, 0x30, 0x00, 0x00,</div><div class='add'>+	0xaf, 0x82, 0x13, 0x4e, 0x5a, 0x93, 0x00, 0x00, 0xfd, 0x82, 0xa0, 0xce,</div><div class='add'>+	0x81, 0x50, 0x00, 0x00, 0x0f, 0x83, 0xa0, 0xcd, 0x81, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xa5, 0x9c, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xb1,</div><div class='add'>+	0x81, 0xb0, 0x01, 0x00, 0x0f, 0x83, 0x22, 0xb5, 0x81, 0x14, 0x00, 0x00,</div><div class='add'>+	0x80, 0x15, 0x2f, 0x40, 0x49, 0xb1, 0x01, 0x00, 0x01, 0x83, 0x42, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x60, 0xb4, 0x65, 0x97, 0x01, 0x00,</div><div class='add'>+	0xd0, 0x15, 0x2e, 0x40, 0x69, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x1a, 0x44,</div><div class='add'>+	0x93, 0x83, 0x01, 0x00, 0x1a, 0x00, 0x00, 0xa2, 0x80, 0xdc, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x44, 0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xb1,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xb5, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x05, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00, 0x80, 0x00, 0x00, 0x40,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x0a, 0x83, 0xa8, 0xa1, 0xe0, 0x31, 0x00, 0x00,</div><div class='add'>+	0xe9, 0x82, 0x00, 0x88, 0x9e, 0xb3, 0x00, 0x00, 0xe9, 0x82, 0xa2, 0x41,</div><div class='add'>+	0x67, 0x6f, 0x00, 0x00, 0xe9, 0x82, 0x00, 0x6f, 0xdb, 0x91, 0x00, 0x00,</div><div class='add'>+	0x0f, 0x83, 0x42, 0x40, 0x81, 0x32, 0x00, 0x00, 0xe9, 0x82, 0x1a, 0x40,</div><div class='add'>+	0x93, 0x83, 0x00, 0x00, 0x00, 0x99, 0x00, 0x09, 0x46, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x3f, 0x00, 0x00, 0xf3, 0x0c, 0x88, 0x01, 0x00, 0x1a, 0x83, 0xa6, 0x42,</div><div class='add'>+	0x13, 0x60, 0x00, 0x00, 0x12, 0x94, 0x00, 0x95, 0x03, 0x30, 0x01, 0x00,</div><div class='add'>+	0x15, 0x83, 0x61, 0x40, 0x81, 0x32, 0x00, 0x00, 0x75, 0x00, 0x00, 0x40,</div><div class='add'>+	0x61, 0x99, 0x01, 0x00, 0x16, 0x83, 0xa8, 0xb1, 0x0c, 0x30, 0x00, 0x00,</div><div class='add'>+	0x1f, 0x94, 0x71, 0x10, 0x94, 0x30, 0x01, 0x00, 0x1b, 0x83, 0x00, 0x58,</div><div class='add'>+	0x1f, 0x90, 0x00, 0x00, 0x05, 0x94, 0x00, 0x95, 0x03, 0x30, 0x01, 0x00,</div><div class='add'>+	0xaf, 0x82, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x2d, 0x03,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x04, 0x00, 0x2d, 0xf0, 0x2e, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xee, 0x07, 0x00, 0x40, 0x97, 0x98, 0x01, 0x00, 0x22, 0x83, 0x23, 0x4b,</div><div class='add'>+	0xe4, 0x6d, 0x00, 0x00, 0x22, 0x83, 0x22, 0x4b, 0xfd, 0x7f, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x1f, 0x90, 0x01, 0x00, 0x22, 0x00, 0x2f, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x25, 0x83, 0x83, 0x17, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x26, 0x00, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00, 0x27, 0x83, 0x85, 0x17,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x48, 0x47, 0xc1, 0x01, 0x00,</div><div class='add'>+	0x2c, 0x83, 0x22, 0x55, 0x2f, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42,</div><div class='add'>+	0x43, 0xd1, 0x01, 0x00, 0x0f, 0x00, 0x00, 0xfa, 0x96, 0x88, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x42, 0x97, 0xe0, 0x01, 0x00, 0x2d, 0x83, 0x00, 0x4b,</div><div class='add'>+	0x44, 0xc1, 0x00, 0x00, 0x12, 0x00, 0x00, 0xa2, 0x44, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x28, 0x00, 0x00, 0xf6, 0x02, 0xcc, 0x01, 0x00, 0x0a, 0x00, 0x00, 0xa1,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x16, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x28, 0xf0, 0x10, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0,</div><div class='add'>+	0x1a, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xa2, 0x2a, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xc0, 0x28, 0x3c, 0x46, 0x0d, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x2d, 0x44,</div><div class='add'>+	0x95, 0xb0, 0x01, 0x00, 0x39, 0x83, 0xa2, 0xf8, 0x0e, 0x30, 0x00, 0x00,</div><div class='add'>+	0x49, 0x83, 0x22, 0x41, 0x95, 0x50, 0x00, 0x00, 0x00, 0x00, 0x2d, 0x50,</div><div class='add'>+	0x49, 0xc1, 0x01, 0x00, 0x35, 0x83, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x36, 0x83, 0xa2, 0xf8, 0x16, 0x6c, 0x00, 0x00, 0x36, 0x83, 0xa2, 0xf8,</div><div class='add'>+	0x10, 0x6c, 0x00, 0x00, 0x36, 0x83, 0xa2, 0xf0, 0x1a, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x47, 0x83, 0x22, 0x58, 0x1f, 0x7c, 0x00, 0x00, 0x00, 0x99, 0x3f, 0x42,</div><div class='add'>+	0x13, 0xf0, 0x01, 0x00, 0x3e, 0x83, 0x65, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x42, 0x83, 0xa2, 0xf3, 0x74, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06,</div><div class='add'>+	0xe6, 0x95, 0x01, 0x00, 0x47, 0x83, 0x75, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x06, 0x96, 0xb0, 0x01, 0x00, 0x3f, 0x00, 0x75, 0xf3,</div><div class='add'>+	0x0c, 0x88, 0x01, 0x00, 0x00, 0x00, 0x00, 0x55, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4b, 0x62, 0xb1, 0x01, 0x00, 0x45, 0x83, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x47, 0x83, 0x67, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x4f, 0x83, 0x77, 0x41, 0x2d, 0xc3, 0x00, 0x00, 0x4d, 0x83, 0x22, 0x58,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x06, 0x62, 0xb1, 0x01, 0x00, 0x4b, 0x83, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x4d, 0x83, 0x67, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x7c, 0x83, 0x77, 0x41, 0x2d, 0xc3, 0x00, 0x00, 0x03, 0x00, 0x00, 0x07,</div><div class='add'>+	0x1a, 0xf4, 0x01, 0x00, 0xd8, 0x92, 0x00, 0x07, 0x16, 0x30, 0x01, 0x00,</div><div class='add'>+	0x5d, 0x83, 0x22, 0x41, 0x81, 0x6c, 0x00, 0x00, 0x55, 0x83, 0x22, 0x42,</div><div class='add'>+	0x81, 0x6c, 0x00, 0x00, 0xaf, 0x82, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x5c, 0x83, 0x22, 0x5f, 0x0f, 0x7c, 0x00, 0x00, 0xcc, 0x93, 0x00, 0x5f,</div><div class='add'>+	0x01, 0x10, 0x01, 0x00, 0x5b, 0x83, 0x22, 0x40, 0x95, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x04, 0x80, 0x00, 0x03, 0x42, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf2,</div><div class='add'>+	0x02, 0xb0, 0x01, 0x00, 0x41, 0x93, 0x00, 0x52, 0x95, 0x30, 0x01, 0x00,</div><div class='add'>+	0x48, 0x93, 0x00, 0x4b, 0x02, 0xb0, 0x00, 0x00, 0x14, 0x87, 0x00, 0x40,</div><div class='add'>+	0x0f, 0xb0, 0x00, 0x00, 0x65, 0x83, 0xa2, 0x5a, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x53, 0x92, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x65, 0x83, 0x22, 0x20,</div><div class='add'>+	0x85, 0x6c, 0x00, 0x00, 0x62, 0x83, 0x9c, 0x0f, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0xaf, 0x82, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x33, 0x93, 0x00, 0x5c,</div><div class='add'>+	0x1f, 0x00, 0x01, 0x00, 0x25, 0x95, 0x00, 0x42, 0x61, 0x31, 0x01, 0x00,</div><div class='add'>+	0xaf, 0x82, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x90, 0x04, 0x00, 0x07,</div><div class='add'>+	0x96, 0x30, 0x01, 0x00, 0x00, 0x00, 0x2d, 0x05, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x68, 0x83, 0x82, 0xf0, 0x18, 0x30, 0x00, 0x00, 0x7b, 0x88, 0x00, 0x45,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x28, 0x20, 0x00, 0xa6, 0x96, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x6c, 0x83, 0x22, 0x17, 0x96, 0x04, 0x00, 0x00, 0xc9, 0x94, 0x00, 0x4b,</div><div class='add'>+	0x95, 0x30, 0x01, 0x00, 0x7b, 0x88, 0x00, 0x4b, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xd8, 0x93, 0x00, 0x03, 0x48, 0x31, 0x01, 0x00, 0xb4, 0x91, 0x00, 0x40,</div><div class='add'>+	0x81, 0x30, 0x01, 0x00, 0x7b, 0x88, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x2e, 0x10, 0x48, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x68, 0x50,</div><div class='add'>+	0x03, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x03, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x00, 0xe0, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x2e, 0x50,</div><div class='add'>+	0x49, 0xc1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x50, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x03, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x42,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x20, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0x77, 0x83, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0x10, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xc9, 0x01, 0x00, 0x79, 0x83, 0xa8, 0x00, 0xe0, 0x31, 0x00, 0x00,</div><div class='add'>+	0xaf, 0x82, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x2d, 0x03,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x0f, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf8, 0x2e, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf2,</div><div class='add'>+	0x02, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x17, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x41, 0x00, 0xa6, 0x96, 0xb0, 0x01, 0x00, 0xee, 0x07, 0x2e, 0x47,</div><div class='add'>+	0x97, 0x90, 0x01, 0x00, 0x8f, 0x83, 0x22, 0x17, 0x96, 0x04, 0x00, 0x00,</div><div class='add'>+	0x8d, 0x83, 0x22, 0x4b, 0xfd, 0x7f, 0x00, 0x00, 0x8d, 0x83, 0x23, 0xa2,</div><div class='add'>+	0x02, 0x6c, 0x00, 0x00, 0x41, 0x93, 0x00, 0x52, 0x95, 0x30, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x22, 0x41, 0x97, 0x50, 0x00, 0x00, 0x0c, 0x00, 0x2d, 0x00,</div><div class='add'>+	0x12, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x5c, 0x01, 0x80, 0x01, 0x00, 0x48, 0x93, 0x00, 0x4b,</div><div class='add'>+	0x02, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x50, 0x03, 0xb0, 0x01, 0x00, 0xac, 0x83, 0x00, 0x5c,</div><div class='add'>+	0x17, 0x90, 0x00, 0x00, 0xa1, 0x83, 0x22, 0x43, 0x2f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x45, 0x1f, 0x90, 0x01, 0x00, 0x9a, 0x83, 0x22, 0x5f,</div><div class='add'>+	0x2f, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x2e, 0x10, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x58, 0xf1, 0xb1, 0x01, 0x00, 0x10, 0x00, 0x00, 0x03,</div><div class='add'>+	0xf0, 0xc9, 0x01, 0x00, 0x10, 0x00, 0x00, 0x00, 0xe0, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x96, 0x83, 0x62, 0x42, 0x61, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xb1, 0x01, 0x00, 0x97, 0x83, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0xaf, 0x82, 0x72, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x20, 0x00, 0x2d, 0x03,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0xff, 0x0f, 0x00, 0xf6, 0x80, 0x88, 0x01, 0x00,</div><div class='add'>+	0x9e, 0x83, 0xa2, 0xa6, 0x81, 0x6c, 0x00, 0x00, 0xa1, 0x83, 0x00, 0xf2,</div><div class='add'>+	0x3a, 0xb0, 0x00, 0x00, 0x87, 0x84, 0xa2, 0x4b, 0xfd, 0x7f, 0x00, 0x00,</div><div class='add'>+	0x99, 0x92, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x2a, 0x87, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0xac, 0x83, 0x22, 0x4a, 0x2f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0xac, 0x83, 0x22, 0x48, 0x2f, 0x7c, 0x00, 0x00, 0x0a, 0x00, 0x2d, 0x03,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x3f, 0x00, 0x00, 0xf2, 0x86, 0x88, 0x01, 0x00,</div><div class='add'>+	0x1f, 0x00, 0x00, 0x43, 0x84, 0x88, 0x01, 0x00, 0x05, 0x00, 0x00, 0x43,</div><div class='add'>+	0x80, 0xf4, 0x01, 0x00, 0x98, 0x94, 0x3d, 0x42, 0x81, 0xe0, 0x01, 0x00,</div><div class='add'>+	0xac, 0x83, 0xa2, 0x42, 0xe0, 0x7d, 0x00, 0x00, 0x87, 0x84, 0xa2, 0x4b,</div><div class='add'>+	0xfd, 0x7f, 0x00, 0x00, 0x99, 0x92, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x2a, 0x87, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xac, 0x83, 0x69, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa3, 0x09, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x79, 0x41, 0x47, 0xc3, 0x01, 0x00, 0xb2, 0x83, 0x22, 0xa1,</div><div class='add'>+	0x09, 0x6c, 0x00, 0x00, 0xf5, 0x82, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xaf, 0x83, 0x00, 0x03, 0x48, 0xb1, 0x00, 0x00, 0xeb, 0x83, 0xa3, 0x92,</div><div class='add'>+	0x03, 0x6c, 0x00, 0x00, 0x7d, 0x95, 0x00, 0x40, 0x95, 0x30, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x43, 0xc3, 0x01, 0x00, 0x2a, 0x87, 0x22, 0x08,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0xb8, 0x83, 0x22, 0x5c, 0x17, 0x7c, 0x00, 0x00,</div><div class='add'>+	0xb9, 0x83, 0x00, 0x00, 0x2a, 0xb0, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00,</div><div class='add'>+	0x2a, 0xc8, 0x01, 0x00, 0x02, 0x00, 0x00, 0x08, 0x80, 0xc8, 0x01, 0x00,</div><div class='add'>+	0xbd, 0x83, 0xa2, 0x43, 0x2f, 0x7c, 0x00, 0x00, 0xcc, 0x94, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0xd9, 0x83, 0x00, 0x5e, 0x17, 0x90, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x01, 0x8c, 0xcc, 0x01, 0x00, 0xcc, 0x94, 0x00, 0x4c,</div><div class='add'>+	0x03, 0x30, 0x01, 0x00, 0x00, 0x00, 0x2e, 0x46, 0x02, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x10, 0x80, 0x00, 0x10, 0x48, 0xc9, 0x01, 0x00, 0x0c, 0x00, 0x00, 0x01,</div><div class='add'>+	0xf0, 0xcd, 0x01, 0x00, 0x2c, 0x00, 0x00, 0x40, 0xf0, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x16, 0xf0, 0xb1, 0x01, 0x00, 0x10, 0x00, 0x00, 0x15,</div><div class='add'>+	0xe0, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x43, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xa0, 0x00, 0x00, 0xa4, 0x62, 0xdd, 0x01, 0x00, 0xc6, 0x83, 0xa8, 0x54,</div><div class='add'>+	0x17, 0x10, 0x00, 0x00, 0xd9, 0x83, 0x00, 0x5e, 0x17, 0x90, 0x00, 0x00,</div><div class='add'>+	0x12, 0x00, 0x00, 0x00, 0x2a, 0xc8, 0x01, 0x00, 0xd8, 0x83, 0x22, 0x43,</div><div class='add'>+	0x2f, 0x7c, 0x00, 0x00, 0x04, 0x00, 0x00, 0x01, 0x8c, 0xcc, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4c, 0x03, 0xb0, 0x01, 0x00, 0xed, 0x94, 0x00, 0x43,</div><div class='add'>+	0x61, 0x31, 0x01, 0x00, 0x00, 0x00, 0x2e, 0x46, 0x02, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x10, 0x80, 0x00, 0x10, 0x48, 0xc9, 0x01, 0x00, 0x0c, 0x00, 0x00, 0x01,</div><div class='add'>+	0xf0, 0xcd, 0x01, 0x00, 0x0c, 0x00, 0x00, 0x09, 0xf0, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x18, 0xf0, 0xb1, 0x01, 0x00, 0x10, 0x00, 0x00, 0x15,</div><div class='add'>+	0xe0, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x43, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xa0, 0x00, 0x00, 0xa4, 0x62, 0xdd, 0x01, 0x00, 0xd9, 0x83, 0x28, 0x54,</div><div class='add'>+	0x17, 0x10, 0x00, 0x00, 0xd5, 0x83, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xed, 0x94, 0x00, 0x43, 0x61, 0x31, 0x01, 0x00, 0xdb, 0x83, 0x22, 0x50,</div><div class='add'>+	0x2f, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x56, 0x17, 0x90, 0x01, 0x00,</div><div class='add'>+	0x07, 0x00, 0x00, 0x17, 0x98, 0x88, 0x01, 0x00, 0xde, 0x83, 0xa2, 0x41,</div><div class='add'>+	0x99, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x17, 0x90, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x43, 0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0xdf, 0x83, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0xaf, 0x82, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0xd4, 0x94, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0xe6, 0x83, 0x22, 0x43, 0x2f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x16, 0x80, 0x00, 0x03, 0x44, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x1d,</div><div class='add'>+	0xe4, 0xb1, 0x01, 0x00, 0x75, 0x94, 0x00, 0x5e, 0x05, 0x10, 0x01, 0x00,</div><div class='add'>+	0xe9, 0x83, 0xa2, 0x5f, 0x2f, 0x7c, 0x00, 0x00, 0x90, 0x91, 0x00, 0x01,</div><div class='add'>+	0x38, 0x43, 0x01, 0x00, 0x99, 0x92, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x2a, 0x87, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xed, 0x83, 0xa2, 0x4b,</div><div class='add'>+	0xfd, 0x7f, 0x00, 0x00, 0x84, 0x84, 0x00, 0x41, 0x43, 0xc3, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x27, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x11, 0xb0, 0x01, 0x00, 0xef, 0x83, 0x35, 0x01, 0x86, 0x30, 0x00, 0x00,</div><div class='add'>+	0x6d, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00, 0xf6, 0x83, 0x28, 0xb1,</div><div class='add'>+	0x30, 0x30, 0x00, 0x00, 0xf0, 0x83, 0x22, 0x4d, 0x75, 0x7d, 0x00, 0x00,</div><div class='add'>+	0x74, 0x84, 0xa2, 0x40, 0x11, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x43, 0xc3, 0x01, 0x00, 0x83, 0x84, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x6d, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00, 0xf6, 0x83, 0xa8, 0xb1,</div><div class='add'>+	0x12, 0x30, 0x00, 0x00, 0xff, 0x83, 0xa2, 0x40, 0x11, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x43, 0xc3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x09,</div><div class='add'>+	0x10, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x18, 0x2c, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xde, 0x07, 0x00, 0x43, 0x80, 0xce, 0x01, 0x00, 0xf0, 0x83, 0xaa, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x04, 0x84, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x40, 0x00, 0x3e, 0x43, 0x27, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x09,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x18, 0xe0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x27, 0xc0, 0x01, 0x00, 0xf0, 0x83, 0xa3, 0x0b,</div><div class='add'>+	0x87, 0x50, 0x00, 0x00, 0x00, 0x00, 0x15, 0x40, 0x1b, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x23, 0xb0, 0x01, 0x00, 0x12, 0x00, 0x00, 0x00,</div><div class='add'>+	0x2a, 0xc8, 0x01, 0x00, 0x40, 0x00, 0x2d, 0x40, 0x39, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x0c, 0x84, 0xa2, 0x40, 0x27, 0x6c, 0x00, 0x00, 0x22, 0x00, 0x00, 0x08,</div><div class='add'>+	0x12, 0xc8, 0x01, 0x00, 0xde, 0x07, 0x00, 0x40, 0x25, 0x98, 0x01, 0x00,</div><div class='add'>+	0x0f, 0x84, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8,</div><div class='add'>+	0x12, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x30, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x0b, 0x25, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x10,</div><div class='add'>+	0x32, 0xb0, 0x01, 0x00, 0x14, 0x00, 0x20, 0x01, 0xe0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xee, 0x07, 0x00, 0x40, 0x37, 0x98, 0x01, 0x00, 0x14, 0x84, 0x23, 0x01,</div><div class='add'>+	0x36, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x36, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x1f, 0x84, 0x82, 0x41, 0x23, 0x40, 0x00, 0x00, 0x20, 0x80, 0x00, 0x10,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0x1b, 0x84, 0x22, 0x40, 0xe3, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x43, 0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x18, 0x84, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0xaf, 0x82, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0xb8, 0x92, 0x00, 0x43,</div><div class='add'>+	0x23, 0x30, 0x01, 0x00, 0x00, 0x00, 0x00, 0x10, 0x32, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x23, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x03,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x00, 0x80, 0x00, 0x19, 0x44, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x2e, 0x84, 0x22, 0x45, 0x1f, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4c,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x09, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x18, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x43,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x20, 0x00, 0x00, 0x19, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0x25, 0x84, 0xa8, 0x15, 0xe0, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50,</div><div class='add'>+	0x03, 0xd0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x50, 0x33, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4c, 0x25, 0xd0, 0x01, 0x00, 0x0c, 0x00, 0x2d, 0x4c,</div><div class='add'>+	0x13, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x50, 0x37, 0xd0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x50, 0x2b, 0xc0, 0x01, 0x00, 0x14, 0x84, 0x00, 0x45,</div><div class='add'>+	0x1f, 0x80, 0x00, 0x00, 0x30, 0x84, 0xa3, 0x12, 0x36, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x31, 0x84, 0x68, 0x1b, 0x28, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x68, 0x12,</div><div class='add'>+	0x28, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x09, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x18, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x43,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x20, 0x00, 0x00, 0x19, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0x34, 0x84, 0xa8, 0x15, 0xe0, 0x31, 0x00, 0x00, 0x5a, 0x84, 0x22, 0x14,</div><div class='add'>+	0x02, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x33, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x14, 0x24, 0xd0, 0x01, 0x00, 0x0c, 0x00, 0x2d, 0x14,</div><div class='add'>+	0x12, 0xc0, 0x01, 0x00, 0x53, 0x84, 0xa2, 0x14, 0x36, 0x50, 0x00, 0x00,</div><div class='add'>+	0x44, 0x84, 0x22, 0x5c, 0x1f, 0x7c, 0x00, 0x00, 0x30, 0x80, 0x00, 0x10,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0x42, 0x84, 0x22, 0x40, 0xe3, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x42, 0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x3f, 0x84, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0xaf, 0x82, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x0c, 0x00, 0x2d, 0x5c, 0x1f, 0x80, 0x01, 0x00,</div><div class='add'>+	0x10, 0x00, 0x00, 0xf0, 0x2a, 0xc8, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5c,</div><div class='add'>+	0x2b, 0x80, 0x01, 0x00, 0xf0, 0x07, 0x00, 0x40, 0x37, 0x98, 0x01, 0x00,</div><div class='add'>+	0x49, 0x84, 0x23, 0x01, 0x36, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,</div><div class='add'>+	0x36, 0xb0, 0x01, 0x00, 0x54, 0x84, 0x22, 0x1b, 0x02, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x30, 0x00, 0x00, 0x10, 0x48, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x2e, 0x5c,</div><div class='add'>+	0x1f, 0x90, 0x01, 0x00, 0x00, 0x00, 0x00, 0x50, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x03, 0xf0, 0xb1, 0x01, 0x00, 0xff, 0x07, 0x00, 0x15,</div><div class='add'>+	0xe0, 0x8d, 0x01, 0x00, 0x00, 0x00, 0x00, 0x42, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xa0, 0x00, 0x00, 0xa4, 0x62, 0xdd, 0x01, 0x00, 0x50, 0x84, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x54, 0x84, 0x00, 0x03, 0x48, 0xb1, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x14, 0x2a, 0xc0, 0x01, 0x00, 0x14, 0x84, 0xa2, 0x40,</div><div class='add'>+	0x25, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x39, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x3d, 0x43, 0x39, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x0b,</div><div class='add'>+	0x25, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x12, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x14, 0x84, 0x00, 0xf0, 0x30, 0xb0, 0x00, 0x00, 0x00, 0x80, 0x00, 0x19,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0x60, 0x84, 0x22, 0x40, 0xe3, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x43, 0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x19,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x5d, 0x84, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0xaf, 0x82, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0xb8, 0x92, 0x00, 0x40,</div><div class='add'>+	0x2b, 0x30, 0x01, 0x00, 0x18, 0x00, 0x2e, 0x03, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x64, 0x84, 0x22, 0x50, 0x2f, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x56,</div><div class='add'>+	0x17, 0x90, 0x01, 0x00, 0x07, 0x00, 0x00, 0x17, 0x98, 0x88, 0x01, 0x00,</div><div class='add'>+	0x67, 0x84, 0xa2, 0x41, 0x99, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55,</div><div class='add'>+	0x17, 0x90, 0x01, 0x00, 0x6a, 0x84, 0x22, 0x43, 0x2f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x54, 0x17, 0x90, 0x01, 0x00, 0x16, 0x00, 0x20, 0x1d,</div><div class='add'>+	0xe4, 0xb1, 0x01, 0x00, 0x6c, 0x84, 0xa3, 0x40, 0x27, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x6e, 0x84, 0x60, 0x5f, 0x17, 0x90, 0x00, 0x00, 0x00, 0x84, 0x00, 0x0b,</div><div class='add'>+	0x16, 0xdc, 0x01, 0x00, 0x00, 0x00, 0x60, 0x13, 0x16, 0x94, 0x01, 0x00,</div><div class='add'>+	0x75, 0x94, 0x00, 0x5e, 0x05, 0x10, 0x01, 0x00, 0x2a, 0x87, 0xa2, 0x5f,</div><div class='add'>+	0x2f, 0x7c, 0x00, 0x00, 0x14, 0x80, 0x00, 0x03, 0x42, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf2, 0x02, 0xb0, 0x01, 0x00, 0x90, 0x91, 0x00, 0x01,</div><div class='add'>+	0x38, 0x43, 0x01, 0x00, 0x2a, 0x87, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x83, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4d,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x16, 0x62, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x76, 0x84, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08,</div><div class='add'>+	0x62, 0xb1, 0x01, 0x00, 0x78, 0x84, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x83, 0x84, 0x22, 0x13, 0x82, 0x6c, 0x00, 0x00, 0x40, 0x00, 0x3d, 0x43,</div><div class='add'>+	0x83, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x10, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf0, 0x2c, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x16,</div><div class='add'>+	0x62, 0xb1, 0x01, 0x00, 0x7e, 0x84, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x08, 0x62, 0xb1, 0x01, 0x00, 0x80, 0x84, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x7a, 0x84, 0x00, 0x41, 0x83, 0xc0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x15, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x82, 0x00, 0xa6,</div><div class='add'>+	0x04, 0xb0, 0x01, 0x00, 0xa0, 0x98, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00,</div><div class='add'>+	0x30, 0x05, 0x00, 0x41, 0x89, 0x30, 0x01, 0x00, 0x41, 0x93, 0x00, 0x52,</div><div class='add'>+	0x95, 0x30, 0x01, 0x00, 0x48, 0x93, 0x00, 0x4b, 0x02, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x2a, 0x87, 0x00, 0x40, 0x0f, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5f,</div><div class='add'>+	0x01, 0x80, 0x01, 0x00, 0x10, 0x00, 0x00, 0x00, 0x0e, 0xf4, 0x01, 0x00,</div><div class='add'>+	0x3f, 0x00, 0x00, 0x00, 0x00, 0x88, 0x01, 0x00, 0x03, 0x00, 0x00, 0x07,</div><div class='add'>+	0x1a, 0xf4, 0x01, 0x00, 0xd8, 0x92, 0x00, 0x07, 0x16, 0x30, 0x01, 0x00,</div><div class='add'>+	0x95, 0x84, 0x22, 0x41, 0x81, 0x6c, 0x00, 0x00, 0x93, 0x84, 0x22, 0x42,</div><div class='add'>+	0x81, 0x6c, 0x00, 0x00, 0xaf, 0x82, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x94, 0x84, 0x22, 0x5f, 0x0f, 0x7c, 0x00, 0x00, 0x14, 0x87, 0x00, 0x40,</div><div class='add'>+	0x0f, 0xb0, 0x00, 0x00, 0x9d, 0x84, 0xa2, 0x5a, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x53, 0x92, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x9d, 0x84, 0x22, 0x20,</div><div class='add'>+	0x85, 0x6c, 0x00, 0x00, 0x9a, 0x84, 0x9c, 0x0f, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0xaf, 0x82, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x33, 0x93, 0x00, 0x5c,</div><div class='add'>+	0x1f, 0x00, 0x01, 0x00, 0x25, 0x95, 0x00, 0x42, 0x61, 0x31, 0x01, 0x00,</div><div class='add'>+	0xaf, 0x82, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x90, 0x04, 0x00, 0x07,</div><div class='add'>+	0x96, 0x30, 0x01, 0x00, 0x00, 0x00, 0x2d, 0x05, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf0, 0x18, 0xb0, 0x01, 0x00, 0xa3, 0x84, 0x22, 0x3a,</div><div class='add'>+	0x01, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8e, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x7b, 0x88, 0x00, 0x40, 0x01, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x2e, 0x00, 0x2d, 0x05, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xa7, 0x84, 0xa2, 0x40, 0xe7, 0x6d, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x40,</div><div class='add'>+	0x8f, 0x98, 0x01, 0x00, 0x7b, 0x88, 0x00, 0x40, 0x01, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x1e, 0x92, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x05, 0x94, 0x00, 0x95,</div><div class='add'>+	0x03, 0x30, 0x01, 0x00, 0xaf, 0x82, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x2d, 0x03, 0x48, 0xb1, 0x01, 0x00, 0x22, 0x00, 0x2d, 0xf0,</div><div class='add'>+	0x2e, 0xb0, 0x01, 0x00, 0x28, 0x20, 0x00, 0xa6, 0x96, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xb0, 0x84, 0x22, 0x17, 0x96, 0x04, 0x00, 0x00, 0xc9, 0x94, 0x00, 0x4b,</div><div class='add'>+	0x95, 0x30, 0x01, 0x00, 0x7b, 0x88, 0x00, 0x4c, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xb2, 0x84, 0x83, 0x17, 0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0x43, 0xc1, 0x01, 0x00, 0xb4, 0x84, 0x85, 0x17, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x48, 0x43, 0xc1, 0x01, 0x00, 0x28, 0x00, 0x00, 0xf6,</div><div class='add'>+	0x02, 0xcc, 0x01, 0x00, 0x12, 0x00, 0x00, 0xa1, 0x2a, 0xc8, 0x01, 0x00,</div><div class='add'>+	0xd8, 0x93, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0xb4, 0x91, 0x00, 0x41,</div><div class='add'>+	0x81, 0x30, 0x01, 0x00, 0x7b, 0x88, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x01, 0x00, 0xd0, 0x01, 0x00, 0x00, 0x00, 0x2e, 0x10,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x28, 0x00, 0x00, 0x40, 0xf1, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x03, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0xbe, 0x84, 0x64, 0x47, 0x61, 0x31, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x10, 0x62, 0xb1, 0x01, 0x00, 0xbf, 0x84, 0xa8, 0x1b,</div><div class='add'>+	0xe0, 0x31, 0x00, 0x00, 0xaf, 0x82, 0x74, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x45, 0x03, 0xe0, 0x01, 0x00, 0x08, 0x00, 0x2d, 0x03,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0xe4, 0x84, 0x01, 0xfb, 0x08, 0x30, 0x00, 0x00,</div><div class='add'>+	0x37, 0x85, 0x87, 0xfb, 0x22, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfa,</div><div class='add'>+	0x0e, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x14, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x03, 0x00, 0x00, 0x07, 0x1a, 0xf4, 0x01, 0x00, 0xd8, 0x92, 0x00, 0x07,</div><div class='add'>+	0x16, 0x30, 0x01, 0x00, 0xda, 0x84, 0x22, 0x41, 0x81, 0x6c, 0x00, 0x00,</div><div class='add'>+	0xce, 0x84, 0x22, 0x42, 0x81, 0x6c, 0x00, 0x00, 0xaf, 0x82, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0xd9, 0x84, 0x22, 0x5f, 0x0f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x38, 0x00, 0x00, 0x04, 0x7e, 0x89, 0x01, 0x00, 0xd2, 0x84, 0xa6, 0x5f,</div><div class='add'>+	0x0f, 0x00, 0x00, 0x00, 0x2c, 0x92, 0x00, 0x40, 0x05, 0x30, 0x01, 0x00,</div><div class='add'>+	0xd7, 0x84, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x13, 0x00, 0x00, 0x40,</div><div class='add'>+	0x87, 0x98, 0x01, 0x00, 0x00, 0x00, 0x2d, 0x03, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x0c, 0x00, 0x2d, 0xf0, 0x82, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0,</div><div class='add'>+	0x84, 0xb0, 0x01, 0x00, 0xb7, 0x93, 0x00, 0x40, 0x05, 0x30, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x5c, 0x1f, 0x90, 0x01, 0x00, 0x14, 0x87, 0x00, 0x40,</div><div class='add'>+	0x0f, 0xb0, 0x00, 0x00, 0xe2, 0x84, 0xa2, 0x5a, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x53, 0x92, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0xe2, 0x84, 0x22, 0x20,</div><div class='add'>+	0x85, 0x6c, 0x00, 0x00, 0xdf, 0x84, 0x9c, 0x0f, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0xaf, 0x82, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x33, 0x93, 0x00, 0x5c,</div><div class='add'>+	0x1f, 0x00, 0x01, 0x00, 0x25, 0x95, 0x00, 0x42, 0x61, 0x31, 0x01, 0x00,</div><div class='add'>+	0xaf, 0x82, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x90, 0x04, 0x00, 0x07,</div><div class='add'>+	0x96, 0x30, 0x01, 0x00, 0x00, 0x00, 0x2d, 0x05, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf0, 0x18, 0xb0, 0x01, 0x00, 0xe6, 0x84, 0x21, 0x04,</div><div class='add'>+	0x80, 0x20, 0x00, 0x00, 0xe7, 0x84, 0x00, 0x40, 0x10, 0xc9, 0x00, 0x00,</div><div class='add'>+	0xbd, 0x87, 0x00, 0x4b, 0x81, 0xb0, 0x00, 0x00, 0x06, 0x85, 0x00, 0x43,</div><div class='add'>+	0x81, 0xb0, 0x00, 0x00, 0x0a, 0x85, 0x00, 0xfb, 0x22, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xbd, 0x87, 0x00, 0x41, 0x81, 0xb0, 0x00, 0x00, 0x7b, 0x88, 0x00, 0x4e,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x02, 0x85, 0x00, 0x5a, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xef, 0x84, 0x00, 0x47, 0x8f, 0xb0, 0x00, 0x00, 0xbd, 0x87, 0x00, 0x53,</div><div class='add'>+	0x81, 0xb0, 0x00, 0x00, 0xbd, 0x87, 0x00, 0x56, 0x81, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x32, 0x00, 0x2d, 0x05, 0x48, 0xb1, 0x01, 0x00, 0x7b, 0x88, 0xa0, 0x0a,</div><div class='add'>+	0xe4, 0x6d, 0x00, 0x00, 0xf5, 0x84, 0xa2, 0x41, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0xf4, 0x84, 0x22, 0x0a, 0x80, 0x32, 0x00, 0x00, 0x7b, 0x88, 0x00, 0x53,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x7b, 0x88, 0x00, 0x54, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xfe, 0x84, 0x22, 0x0a, 0x80, 0x32, 0x00, 0x00, 0xf8, 0x84, 0xa2, 0x0a,</div><div class='add'>+	0xe4, 0x6d, 0x00, 0x00, 0x7b, 0x88, 0x00, 0x5d, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf2, 0x80, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x0a,</div><div class='add'>+	0x80, 0xd0, 0x01, 0x00, 0xfc, 0x84, 0xa0, 0x91, 0x81, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x7b, 0x88, 0x00, 0x5e, 0x8f, 0xb0, 0x00, 0x00, 0x25, 0x00, 0x00, 0x40,</div><div class='add'>+	0x8f, 0x98, 0x01, 0x00, 0x7b, 0x88, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x00, 0x85, 0x20, 0x91, 0xe5, 0x6d, 0x00, 0x00, 0x7b, 0x88, 0x00, 0x54,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x21, 0x00, 0x00, 0x40, 0x8f, 0x98, 0x01, 0x00,</div><div class='add'>+	0x7b, 0x88, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x32, 0x00, 0x2d, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x7b, 0x88, 0xa0, 0x0a, 0xe4, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x24, 0x00, 0x00, 0x40, 0x8f, 0x98, 0x01, 0x00, 0x7b, 0x88, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x37, 0x00, 0x2d, 0x05, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0xf3, 0x82, 0xf4, 0x01, 0x00, 0xbd, 0x87, 0xa0, 0x42,</div><div class='add'>+	0x83, 0x6c, 0x00, 0x00, 0xbd, 0x87, 0x00, 0x54, 0x81, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf2, 0x0e, 0xb0, 0x01, 0x00, 0x03, 0x00, 0x00, 0x07,</div><div class='add'>+	0x1a, 0xf4, 0x01, 0x00, 0x00, 0xb5, 0x00, 0x0d, 0x42, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x07, 0x00, 0x00, 0x07, 0x16, 0x88, 0x01, 0x00, 0x13, 0x85, 0x22, 0x0b,</div><div class='add'>+	0xe6, 0x7d, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x40, 0x87, 0x98, 0x01, 0x00,</div><div class='add'>+	0xc6, 0x95, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x0f, 0xb0, 0x01, 0x00, 0x14, 0x87, 0x00, 0x5c, 0x1f, 0x90, 0x00, 0x00,</div><div class='add'>+	0x25, 0x85, 0x22, 0x50, 0xfd, 0x7f, 0x00, 0x00, 0x20, 0x85, 0xa2, 0x54,</div><div class='add'>+	0xfd, 0x7f, 0x00, 0x00, 0x18, 0x85, 0x22, 0x55, 0xfd, 0x7f, 0x00, 0x00,</div><div class='add'>+	0x82, 0x00, 0x00, 0x40, 0x87, 0x98, 0x01, 0x00, 0x10, 0x85, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x10, 0x85, 0x22, 0x53, 0xfd, 0x7f, 0x00, 0x00,</div><div class='add'>+	0x14, 0x80, 0x00, 0x03, 0x42, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0,</div><div class='add'>+	0x96, 0xb0, 0x01, 0x00, 0x10, 0x00, 0x00, 0x4b, 0x80, 0xf4, 0x01, 0x00,</div><div class='add'>+	0x0c, 0xbc, 0x00, 0x40, 0x87, 0x98, 0x01, 0x00, 0x20, 0x85, 0x22, 0x43,</div><div class='add'>+	0x80, 0x6c, 0x00, 0x00, 0xff, 0xff, 0x00, 0x4b, 0x80, 0x88, 0x01, 0x00,</div><div class='add'>+	0x10, 0x85, 0xa2, 0x43, 0x80, 0x6c, 0x00, 0x00, 0x7c, 0x96, 0x00, 0x40,</div><div class='add'>+	0x47, 0x99, 0x01, 0x00, 0x21, 0x85, 0x46, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x24, 0x85, 0xa0, 0xf0, 0x30, 0x6f, 0x00, 0x00, 0x16, 0x85, 0x1e, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x41, 0x31, 0xc3, 0x01, 0x00,</div><div class='add'>+	0x5d, 0x92, 0x00, 0x40, 0x25, 0x30, 0x01, 0x00, 0x29, 0x85, 0x9c, 0x0f,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0xaf, 0x82, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x33, 0x93, 0x00, 0x5c, 0x1f, 0x00, 0x01, 0x00, 0x14, 0x80, 0x00, 0x03,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x96, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x2f, 0x05, 0x48, 0xb1, 0x01, 0x00, 0x10, 0x00, 0x00, 0x07,</div><div class='add'>+	0x18, 0xe4, 0x01, 0x00, 0x00, 0x08, 0x00, 0x0c, 0xe0, 0x99, 0x01, 0x00,</div><div class='add'>+	0x90, 0x04, 0x00, 0x07, 0x96, 0x30, 0x01, 0x00, 0x00, 0xb5, 0x00, 0x0d,</div><div class='add'>+	0x46, 0xc9, 0x01, 0x00, 0x30, 0x85, 0x30, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x0b, 0xe6, 0x91, 0x01, 0x00, 0x00, 0x02, 0x00, 0xa1,</div><div class='add'>+	0x46, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x0b, 0xe6, 0x91, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x2e, 0x05, 0x48, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x10, 0x40,</div><div class='add'>+	0xe1, 0xb1, 0x01, 0x00, 0xbd, 0x87, 0x00, 0x40, 0x81, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xfb, 0x28, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xfb,</div><div class='add'>+	0x86, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x14, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x41, 0x85, 0x22, 0x46, 0x23, 0x7c, 0x00, 0x00, 0x3d, 0x85, 0x22, 0x40,</div><div class='add'>+	0x87, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x48, 0x1f, 0x90, 0x01, 0x00,</div><div class='add'>+	0x3f, 0x85, 0x22, 0x41, 0x87, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x47,</div><div class='add'>+	0x1f, 0x90, 0x01, 0x00, 0x41, 0x85, 0x22, 0x42, 0x87, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x45, 0x1f, 0x90, 0x01, 0x00, 0x41, 0x85, 0x66, 0x1b,</div><div class='add'>+	0x2c, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x13, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x76, 0x41, 0x41, 0xc3, 0x01, 0x00, 0x70, 0x85, 0x23, 0x92,</div><div class='add'>+	0x15, 0x6c, 0x00, 0x00, 0x70, 0x85, 0xa2, 0x45, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x74, 0x85, 0x22, 0x4b, 0xfd, 0x7f, 0x00, 0x00, 0x17, 0x00, 0x00, 0xd0,</div><div class='add'>+	0xa2, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x27, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x02, 0x00, 0x00, 0x0a, 0x24, 0xc8, 0x01, 0x00, 0x94, 0x92, 0x00, 0x40,</div><div class='add'>+	0x0f, 0x30, 0x01, 0x00, 0x6e, 0x85, 0x22, 0x08, 0x40, 0x30, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0xa3, 0xc1, 0x01, 0x00, 0xf0, 0x07, 0x00, 0x12,</div><div class='add'>+	0x24, 0xcc, 0x01, 0x00, 0x4a, 0x85, 0xaa, 0x41, 0x27, 0x40, 0x00, 0x00,</div><div class='add'>+	0x01, 0x00, 0x00, 0x13, 0x80, 0xcc, 0x01, 0x00, 0x6a, 0x85, 0x26, 0x40,</div><div class='add'>+	0x23, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x83, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x60, 0x00, 0x00, 0x03, 0x84, 0xc8, 0x01, 0x00, 0x10, 0x00, 0x00, 0x10,</div><div class='add'>+	0x48, 0xcd, 0x01, 0x00, 0x17, 0x00, 0x00, 0xd0, 0xa2, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x57, 0x85, 0xa2, 0x40, 0x83, 0x6c, 0x00, 0x00, 0x63, 0x85, 0x00, 0x41,</div><div class='add'>+	0x83, 0xb0, 0x00, 0x00, 0x00, 0x80, 0x00, 0x42, 0x44, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x68, 0x21, 0x38, 0x96, 0x01, 0x00, 0x00, 0x00, 0x2e, 0x50,</div><div class='add'>+	0x49, 0xc1, 0x01, 0x00, 0x5c, 0x85, 0xa2, 0x44, 0x23, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x30, 0x00, 0x00, 0x03, 0x48, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0x0c, 0x00, 0x00, 0x20, 0xf0, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x44, 0x61, 0xb1, 0x01, 0x00, 0xa0, 0x00, 0x00, 0xa4,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x5f, 0x85, 0xa8, 0x42, 0xe0, 0x31, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x44, 0x85, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x23, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41, 0xa3, 0xc1, 0x01, 0x00,</div><div class='add'>+	0x55, 0x85, 0xa2, 0x41, 0x81, 0x50, 0x00, 0x00, 0x6a, 0x85, 0x22, 0x40,</div><div class='add'>+	0x23, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00, 0x67, 0x85, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0xaf, 0x82, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x03, 0x48, 0xb1, 0x01, 0x00, 0xee, 0x07, 0x00, 0x40,</div><div class='add'>+	0x25, 0x98, 0x01, 0x00, 0x17, 0x00, 0x00, 0xd0, 0x2a, 0xc8, 0x01, 0x00,</div><div class='add'>+	0x7d, 0x85, 0x00, 0x17, 0x10, 0xb0, 0x00, 0x00, 0x7e, 0x94, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x74, 0x85, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x94, 0x92, 0x00, 0x92, 0x25, 0x30, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x31, 0xb0, 0x01, 0x00, 0x74, 0x85, 0x22, 0x08, 0x2e, 0x30, 0x00, 0x00,</div><div class='add'>+	0x7d, 0x85, 0x00, 0x41, 0x27, 0xb0, 0x00, 0x00, 0x80, 0x80, 0x00, 0xa6,</div><div class='add'>+	0x04, 0xb0, 0x01, 0x00, 0x06, 0x00, 0x00, 0x40, 0x87, 0x98, 0x01, 0x00,</div><div class='add'>+	0xc6, 0x95, 0x00, 0x0a, 0x8c, 0x30, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x0f, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5c, 0x1f, 0x90, 0x01, 0x00,</div><div class='add'>+	0x7c, 0x85, 0x22, 0x9f, 0x13, 0x6c, 0x00, 0x00, 0x02, 0x00, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xcc, 0x01, 0x00, 0xf5, 0x82, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x14, 0x87, 0x00, 0x41, 0x3f, 0xc3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x0f, 0xb0, 0x01, 0x00, 0x28, 0x00, 0x00, 0x01, 0x80, 0xce, 0x01, 0x00,</div><div class='add'>+	0x91, 0x85, 0x2a, 0x40, 0x81, 0x30, 0x00, 0x00, 0x00, 0x80, 0x00, 0x10,</div><div class='add'>+	0x44, 0xc9, 0x01, 0x00, 0x40, 0x00, 0x00, 0x40, 0x81, 0x98, 0x01, 0x00,</div><div class='add'>+	0x86, 0x85, 0xa2, 0x48, 0x1f, 0x7c, 0x00, 0x00, 0x86, 0x85, 0xa2, 0x47,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x86, 0x85, 0xa3, 0x07, 0x03, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x80, 0x00, 0x00, 0x40, 0x81, 0x98, 0x01, 0x00, 0x89, 0x85, 0xa3, 0x40,</div><div class='add'>+	0x02, 0x6c, 0x00, 0x00, 0x28, 0x00, 0x00, 0x01, 0xf0, 0xcd, 0x01, 0x00,</div><div class='add'>+	0x8b, 0x85, 0x00, 0x40, 0x0f, 0xb0, 0x00, 0x00, 0x28, 0x00, 0x00, 0x40,</div><div class='add'>+	0xf0, 0xcd, 0x01, 0x00, 0x04, 0x00, 0x00, 0x40, 0x0e, 0xcc, 0x01, 0x00,</div><div class='add'>+	0x28, 0x00, 0x00, 0x03, 0xf0, 0xc9, 0x01, 0x00, 0x28, 0x00, 0x00, 0x00,</div><div class='add'>+	0xf0, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x16, 0xe0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x47, 0x61, 0xb1, 0x01, 0x00, 0x20, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x8f, 0x85, 0xa8, 0x5c, 0x1f, 0x10, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0,</div><div class='add'>+	0x08, 0xb0, 0x01, 0x00, 0xa0, 0x01, 0x2d, 0x40, 0x00, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x5b, 0x86, 0x22, 0x0f, 0x42, 0x05, 0x00, 0x00, 0xa2, 0x85, 0x9c, 0x0f,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5c, 0x1f, 0x80, 0x01, 0x00,</div><div class='add'>+	0x00, 0x80, 0x00, 0x10, 0x42, 0xc9, 0x01, 0x00, 0x9d, 0x85, 0x22, 0x40,</div><div class='add'>+	0xe3, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x47, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00, 0x9a, 0x85, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0xaf, 0x82, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xa2, 0x85, 0x22, 0x07, 0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03,</div><div class='add'>+	0x42, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x07, 0x42, 0xc1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x80, 0x00, 0xa1, 0x46, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5f,</div><div class='add'>+	0xe1, 0x91, 0x01, 0x00, 0xc0, 0x06, 0xa2, 0x45, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x10, 0x00, 0x00, 0x03, 0x48, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x2d, 0x54,</div><div class='add'>+	0x29, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x18, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf8, 0x04, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8,</div><div class='add'>+	0x0e, 0xb0, 0x01, 0x00, 0x42, 0x00, 0x00, 0x03, 0x0a, 0xc8, 0x01, 0x00,</div><div class='add'>+	0x0c, 0x00, 0x00, 0xa4, 0x0c, 0xc8, 0x01, 0x00, 0xd6, 0x92, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0x14, 0x02, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x14, 0x24, 0xd0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x14,</div><div class='add'>+	0x10, 0xc0, 0x01, 0x00, 0x12, 0x00, 0x00, 0x08, 0x10, 0xc8, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x23, 0xb0, 0x01, 0x00, 0xfe, 0x7f, 0x00, 0x05,</div><div class='add'>+	0x44, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x0a, 0xe4, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xcb, 0x85, 0x22, 0x01, 0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x44,</div><div class='add'>+	0x23, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x2e, 0xa4, 0x80, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x10, 0x48, 0xc1, 0x01, 0x00, 0xb8, 0x85, 0xa3, 0x07,</div><div class='add'>+	0x02, 0x6c, 0x00, 0x00, 0xb9, 0x85, 0x68, 0x01, 0x1a, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x68, 0x07, 0x1a, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x0d,</div><div class='add'>+	0x02, 0xd0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x05, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x0c, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x02,</div><div class='add'>+	0xe0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x0d, 0x0a, 0xc0, 0x01, 0x00,</div><div class='add'>+	0xc5, 0x85, 0x22, 0x40, 0x03, 0x6c, 0x00, 0x00, 0xc5, 0x85, 0x22, 0x42,</div><div class='add'>+	0x23, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x23, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x47, 0x61, 0xb1, 0x01, 0x00, 0xa0, 0x00, 0x00, 0xa4,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0xe9, 0x85, 0x28, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0xc2, 0x85, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10,</div><div class='add'>+	0x80, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x47, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x62, 0xb1, 0x01, 0x00, 0xc7, 0x85, 0xa8, 0x40,</div><div class='add'>+	0x23, 0x30, 0x00, 0x00, 0xaf, 0x82, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xe9, 0x85, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x44,</div><div class='add'>+	0x23, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xa4, 0x86, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x2e, 0x10, 0x48, 0xc1, 0x01, 0x00, 0xd0, 0x85, 0xa3, 0x12,</div><div class='add'>+	0x0e, 0x6c, 0x00, 0x00, 0xd1, 0x85, 0x60, 0x07, 0x1a, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x60, 0x12, 0x1a, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x68, 0x0d,</div><div class='add'>+	0x16, 0x94, 0x01, 0x00, 0xff, 0xff, 0x00, 0x0b, 0x16, 0xd8, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x68, 0x08, 0x3e, 0x96, 0x01, 0x00, 0x00, 0x00, 0x00, 0x0c,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x02, 0xe0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x10, 0x86, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x46,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x20, 0x00, 0x00, 0x43, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0xd8, 0x85, 0xa8, 0x5c, 0x1f, 0x10, 0x00, 0x00, 0x07, 0x86, 0x22, 0x0d,</div><div class='add'>+	0x14, 0x6c, 0x00, 0x00, 0xde, 0x85, 0x22, 0x0d, 0x24, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x0d, 0x10, 0xc0, 0x01, 0x00, 0xe2, 0x85, 0x00, 0x0d,</div><div class='add'>+	0x24, 0xd0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x2b, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x15, 0xa2, 0xb1, 0x01, 0x00, 0x10, 0x00, 0x00, 0x20,</div><div class='add'>+	0x10, 0xc8, 0x01, 0x00, 0xf0, 0x07, 0x00, 0x40, 0x25, 0x98, 0x01, 0x00,</div><div class='add'>+	0xe4, 0x85, 0x22, 0x42, 0x23, 0x6c, 0x00, 0x00, 0xe9, 0x85, 0x00, 0x41,</div><div class='add'>+	0x23, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00, 0xe5, 0x85, 0xa8, 0x5c,</div><div class='add'>+	0x1f, 0x00, 0x00, 0x00, 0xaf, 0x82, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x23, 0xb0, 0x01, 0x00, 0x07, 0x86, 0x22, 0x0d,</div><div class='add'>+	0x14, 0x50, 0x00, 0x00, 0x06, 0x86, 0xa2, 0x0d, 0x0e, 0x50, 0x00, 0x00,</div><div class='add'>+	0xf5, 0x85, 0x22, 0x46, 0x1f, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46,</div><div class='add'>+	0x1f, 0x80, 0x01, 0x00, 0x30, 0x80, 0x00, 0x10, 0x42, 0xc9, 0x01, 0x00,</div><div class='add'>+	0xf3, 0x85, 0x22, 0x40, 0xe3, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x47,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0xf0, 0x85, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0xaf, 0x82, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x20, 0x80, 0x00, 0x03, 0x46, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x5f, 0xe1, 0x91, 0x01, 0x00, 0x00, 0x00, 0x2d, 0x06,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x18, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf8, 0x04, 0xb0, 0x01, 0x00, 0xfa, 0x85, 0x1f, 0xf0,</div><div class='add'>+	0x0e, 0x30, 0x00, 0x00, 0xb2, 0x85, 0x00, 0x4c, 0x0d, 0xc0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x2e, 0x5f, 0x0f, 0x80, 0x01, 0x00, 0xb2, 0x85, 0x23, 0x07,</div><div class='add'>+	0x14, 0x6c, 0x00, 0x00, 0x30, 0x00, 0x00, 0x10, 0x48, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x24, 0x00, 0x00, 0x40, 0xf1, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x03,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x16, 0xf0, 0xb1, 0x01, 0x00, 0x24, 0x00, 0x00, 0x00,</div><div class='add'>+	0x00, 0xc8, 0x01, 0x00, 0x00, 0x00, 0x00, 0x47, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xa0, 0x00, 0x00, 0xa4, 0x62, 0xdd, 0x01, 0x00, 0x03, 0x86, 0xa8, 0x46,</div><div class='add'>+	0x1f, 0x10, 0x00, 0x00, 0xb2, 0x85, 0x00, 0x03, 0x0c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xb2, 0x85, 0x00, 0x0d, 0x18, 0xc0, 0x00, 0x00, 0x04, 0x00, 0x2e, 0x14,</div><div class='add'>+	0x0a, 0xd0, 0x01, 0x00, 0x12, 0x00, 0x00, 0x05, 0x48, 0xcd, 0x01, 0x00,</div><div class='add'>+	0xfe, 0x7f, 0x00, 0x05, 0x42, 0xc9, 0x01, 0x00, 0x0c, 0x00, 0x2a, 0xf2,</div><div class='add'>+	0xe0, 0xb1, 0x01, 0x00, 0x0d, 0x86, 0x22, 0x40, 0x31, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x60, 0x18, 0x38, 0x96, 0x01, 0x00, 0x1e, 0x00, 0x00, 0x40,</div><div class='add'>+	0x43, 0x99, 0x01, 0x00, 0x00, 0x81, 0x00, 0xf6, 0x80, 0xce, 0x01, 0x00,</div><div class='add'>+	0x11, 0x86, 0xa6, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0x43, 0xc1, 0x01, 0x00, 0x13, 0x86, 0x22, 0x0b, 0xed, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x08, 0x00, 0x00, 0xa1, 0x42, 0xc9, 0x01, 0x00, 0x02, 0x00, 0x00, 0xa1,</div><div class='add'>+	0x46, 0xc9, 0x01, 0x00, 0x0f, 0x00, 0x00, 0xfa, 0x94, 0x88, 0x01, 0x00,</div><div class='add'>+	0x02, 0x00, 0x00, 0x4a, 0x86, 0xe4, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf6,</div><div class='add'>+	0x0e, 0xb0, 0x01, 0x00, 0x1b, 0x86, 0x22, 0x47, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x1f, 0x43, 0x0e, 0x50, 0x00, 0x00, 0x1b, 0x86, 0xa0, 0x46,</div><div class='add'>+	0x0f, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x0f, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x1f, 0x86, 0x22, 0x48, 0x1f, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x91, 0xb0, 0x01, 0x00, 0x04, 0x00, 0x0f, 0xa2, 0x42, 0x31, 0x00, 0x00,</div><div class='add'>+	0x22, 0x86, 0x00, 0x40, 0x89, 0xb0, 0x00, 0x00, 0x0c, 0x00, 0x00, 0xa2,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x43, 0x89, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x43, 0x95, 0xd0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xfc,</div><div class='add'>+	0x82, 0xb0, 0x01, 0x00, 0x25, 0x86, 0xa0, 0x41, 0x90, 0x40, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x91, 0xc0, 0x01, 0x00, 0x2a, 0x86, 0x22, 0x47,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x2a, 0x86, 0xa0, 0x43, 0x89, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x2a, 0x86, 0x20, 0x45, 0x89, 0x6c, 0x00, 0x00, 0x2a, 0x86, 0xa0, 0x41,</div><div class='add'>+	0x0e, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x0f, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x89, 0xc0, 0x01, 0x00, 0x22, 0x86, 0xa2, 0x41,</div><div class='add'>+	0x95, 0x50, 0x00, 0x00, 0x33, 0x86, 0x22, 0x48, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x10, 0x00, 0x00, 0x48, 0x92, 0xf4, 0x01, 0x00, 0xff, 0xff, 0x00, 0x48,</div><div class='add'>+	0x90, 0x88, 0x01, 0x00, 0x31, 0x86, 0x90, 0x48, 0x92, 0x40, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x93, 0xc0, 0x01, 0x00, 0x0a, 0x00, 0x00, 0xa2,</div><div class='add'>+	0x44, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x66, 0x20, 0x93, 0xa4, 0x01, 0x00,</div><div class='add'>+	0x30, 0x80, 0x00, 0x10, 0x44, 0xc9, 0x01, 0x00, 0x12, 0x00, 0x00, 0x14,</div><div class='add'>+	0xf0, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x17, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x12, 0x00, 0x00, 0x05, 0xe0, 0xcd, 0x01, 0x00, 0x30, 0x00, 0x00, 0x10,</div><div class='add'>+	0x80, 0xc8, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x20, 0x00, 0x00, 0x40, 0x62, 0xdd, 0x01, 0x00, 0x39, 0x86, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x44, 0x86, 0x22, 0x5c, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x3c, 0x44, 0x23, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x2d, 0x10,</div><div class='add'>+	0x48, 0xc1, 0x01, 0x00, 0x43, 0x86, 0x22, 0x40, 0xe3, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x46, 0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x40, 0x86, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0xaf, 0x82, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5c,</div><div class='add'>+	0x1f, 0x80, 0x01, 0x00, 0x47, 0x86, 0xa2, 0x47, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0xcc, 0x92, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0xc0, 0x86, 0x00, 0x17,</div><div class='add'>+	0x10, 0xb0, 0x00, 0x00, 0xd3, 0x92, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x2f, 0x03, 0x48, 0xb1, 0x01, 0x00, 0x4b, 0x86, 0xa0, 0x07,</div><div class='add'>+	0x16, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x17, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x0b, 0xe4, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x50,</div><div class='add'>+	0x17, 0xf0, 0x01, 0x00, 0x4f, 0x86, 0x90, 0xf2, 0x16, 0x40, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x17, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x66, 0x20,</div><div class='add'>+	0x17, 0xa4, 0x01, 0x00, 0x10, 0x00, 0x00, 0x14, 0x2a, 0xc8, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x50, 0x2b, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf2,</div><div class='add'>+	0x2a, 0x94, 0x01, 0x00, 0x30, 0x80, 0x00, 0x10, 0x42, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x59, 0x86, 0x22, 0x40, 0xe3, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0x56, 0x86, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0xaf, 0x82, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x00, 0x80, 0x00, 0x17, 0x10, 0xdc, 0x01, 0x00,</div><div class='add'>+	0xc0, 0x86, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x63, 0x86, 0x9c, 0x0f,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5c, 0x1f, 0x80, 0x01, 0x00,</div><div class='add'>+	0x00, 0x80, 0x00, 0x10, 0x42, 0xc9, 0x01, 0x00, 0x63, 0x86, 0x22, 0x40,</div><div class='add'>+	0xe3, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x47, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00, 0x60, 0x86, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0xaf, 0x82, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x68, 0x86, 0x22, 0x07, 0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03,</div><div class='add'>+	0x42, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x07, 0x42, 0xc1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x80, 0x00, 0xa1, 0x46, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5f,</div><div class='add'>+	0xe1, 0x91, 0x01, 0x00, 0x04, 0x00, 0x2e, 0x03, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x0a, 0xe0, 0xb1, 0x01, 0x00, 0x6d, 0x86, 0x22, 0x40,</div><div class='add'>+	0x31, 0x6c, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x40, 0x45, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x60, 0x18, 0x38, 0x96, 0x01, 0x00, 0x00, 0x00, 0x2e, 0x10,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x50, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x08, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x03,</div><div class='add'>+	0xe0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x10, 0x62, 0xb1, 0x01, 0x00, 0x72, 0x86, 0xa8, 0x40,</div><div class='add'>+	0x23, 0x30, 0x00, 0x00, 0xaf, 0x82, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x2d, 0x52, 0x11, 0xc0, 0x01, 0x00, 0x10, 0x00, 0x00, 0x03,</div><div class='add'>+	0x48, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x18, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf8, 0x04, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8,</div><div class='add'>+	0x0e, 0xb0, 0x01, 0x00, 0x0c, 0x00, 0x00, 0xa4, 0x0c, 0xc8, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x3c, 0x44, 0x23, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xa4,</div><div class='add'>+	0x86, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x2e, 0x10, 0x48, 0xc1, 0x01, 0x00,</div><div class='add'>+	0x80, 0x86, 0xa3, 0x12, 0x0e, 0x6c, 0x00, 0x00, 0x81, 0x86, 0x68, 0x07,</div><div class='add'>+	0x1a, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x68, 0x12, 0x1a, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x10, 0x86, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x68, 0x08,</div><div class='add'>+	0x3e, 0x96, 0x01, 0x00, 0x00, 0x00, 0x00, 0x0c, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x02, 0xe0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x46,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x20, 0x00, 0x00, 0x43, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0x86, 0x86, 0xa8, 0x5c, 0x1f, 0x10, 0x00, 0x00, 0xb5, 0x86, 0x22, 0x0d,</div><div class='add'>+	0x14, 0x6c, 0x00, 0x00, 0x8c, 0x86, 0x22, 0x0d, 0x24, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x0d, 0x10, 0xc0, 0x01, 0x00, 0x90, 0x86, 0x00, 0x0d,</div><div class='add'>+	0x24, 0xd0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x2b, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x15, 0xa2, 0xb1, 0x01, 0x00, 0x10, 0x00, 0x00, 0x20,</div><div class='add'>+	0x10, 0xc8, 0x01, 0x00, 0xf0, 0x07, 0x00, 0x40, 0x25, 0x98, 0x01, 0x00,</div><div class='add'>+	0x92, 0x86, 0x22, 0x42, 0x23, 0x6c, 0x00, 0x00, 0x97, 0x86, 0x00, 0x41,</div><div class='add'>+	0x23, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00, 0x93, 0x86, 0xa8, 0x5c,</div><div class='add'>+	0x1f, 0x00, 0x00, 0x00, 0xaf, 0x82, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x23, 0xb0, 0x01, 0x00, 0x04, 0x00, 0x22, 0x0d,</div><div class='add'>+	0x14, 0x50, 0x00, 0x00, 0xb4, 0x86, 0xa2, 0x0d, 0x0e, 0x50, 0x00, 0x00,</div><div class='add'>+	0xa3, 0x86, 0x22, 0x46, 0x1f, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46,</div><div class='add'>+	0x1f, 0x80, 0x01, 0x00, 0x30, 0x80, 0x00, 0x10, 0x42, 0xc9, 0x01, 0x00,</div><div class='add'>+	0xa1, 0x86, 0x22, 0x40, 0xe3, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x47,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0x9e, 0x86, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0xaf, 0x82, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x20, 0x80, 0x00, 0x03, 0x46, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x5f, 0xe1, 0x91, 0x01, 0x00, 0x00, 0x00, 0x2d, 0x06,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x18, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf8, 0x04, 0xb0, 0x01, 0x00, 0xa8, 0x86, 0x1f, 0xf0,</div><div class='add'>+	0x0e, 0x30, 0x00, 0x00, 0x7b, 0x86, 0x00, 0x4c, 0x0d, 0xc0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x2e, 0x5f, 0x0f, 0x80, 0x01, 0x00, 0x7b, 0x86, 0x23, 0x07,</div><div class='add'>+	0x14, 0x6c, 0x00, 0x00, 0x30, 0x00, 0x00, 0x10, 0x48, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x24, 0x00, 0x00, 0x40, 0xf1, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x03,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x16, 0xf0, 0xb1, 0x01, 0x00, 0x24, 0x00, 0x00, 0x00,</div><div class='add'>+	0x00, 0xc8, 0x01, 0x00, 0x00, 0x00, 0x00, 0x47, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xa0, 0x00, 0x00, 0xa4, 0x62, 0xdd, 0x01, 0x00, 0xb1, 0x86, 0xa8, 0x46,</div><div class='add'>+	0x1f, 0x10, 0x00, 0x00, 0x7b, 0x86, 0x00, 0x03, 0x0c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x7b, 0x86, 0x00, 0x0d, 0x18, 0xc0, 0x00, 0x00, 0xbe, 0x86, 0x22, 0x5c,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5c, 0x1f, 0x80, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x3c, 0x44, 0x23, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x2d, 0x10,</div><div class='add'>+	0x48, 0xc1, 0x01, 0x00, 0xbe, 0x86, 0x22, 0x40, 0xe3, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x46, 0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0xbb, 0x86, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0xaf, 0x82, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x17,</div><div class='add'>+	0x10, 0xb0, 0x01, 0x00, 0xc0, 0x86, 0x00, 0x40, 0x2b, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x80, 0x00, 0x03, 0x44, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x04,</div><div class='add'>+	0xe0, 0xb1, 0x01, 0x00, 0xc5, 0x86, 0x22, 0x9f, 0x13, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x02, 0x00, 0x00, 0x88, 0x1c, 0xcc, 0x01, 0x00, 0xf5, 0x82, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0xd7, 0x95, 0x00, 0x41, 0x3f, 0x43, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x8d, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x05, 0xb0, 0x01, 0x00, 0xc6, 0x95, 0x00, 0x40, 0x0f, 0x30, 0x01, 0x00,</div><div class='add'>+	0x2a, 0x87, 0x00, 0x5c, 0x1f, 0x90, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,</div><div class='add'>+	0x0e, 0xf4, 0x01, 0x00, 0x00, 0x00, 0x00, 0x3a, 0x01, 0x84, 0x01, 0x00,</div><div class='add'>+	0x03, 0x00, 0x00, 0x07, 0x1a, 0xf4, 0x01, 0x00, 0xd8, 0x92, 0x00, 0x07,</div><div class='add'>+	0x16, 0x30, 0x01, 0x00, 0xd4, 0x86, 0x22, 0x41, 0x81, 0x6c, 0x00, 0x00,</div><div class='add'>+	0xd2, 0x86, 0x22, 0x42, 0x81, 0x6c, 0x00, 0x00, 0xaf, 0x82, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0xd3, 0x86, 0x22, 0x5f, 0x0f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x14, 0x87, 0x00, 0x40, 0x0f, 0xb0, 0x00, 0x00, 0xdc, 0x86, 0xa2, 0x5a,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x53, 0x92, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0xdc, 0x86, 0x22, 0x20, 0x85, 0x6c, 0x00, 0x00, 0xd9, 0x86, 0x9c, 0x0f,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0xaf, 0x82, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x33, 0x93, 0x00, 0x5c, 0x1f, 0x00, 0x01, 0x00, 0x25, 0x95, 0x00, 0x42,</div><div class='add'>+	0x61, 0x31, 0x01, 0x00, 0xaf, 0x82, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x90, 0x04, 0x00, 0x07, 0x96, 0x30, 0x01, 0x00, 0x00, 0x00, 0x2d, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x18, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x80, 0xb0, 0x01, 0x00, 0xbd, 0x87, 0xa2, 0x5f,</div><div class='add'>+	0x81, 0x6c, 0x00, 0x00, 0xa8, 0x00, 0x2d, 0x43, 0x19, 0x80, 0x01, 0x00,</div><div class='add'>+	0x37, 0x00, 0x2d, 0xf0, 0x24, 0xb0, 0x01, 0x00, 0x04, 0x00, 0x00, 0xf3,</div><div class='add'>+	0x8e, 0xf4, 0x01, 0x00, 0x0f, 0x00, 0x00, 0xf3, 0x90, 0x88, 0x01, 0x00,</div><div class='add'>+	0xeb, 0x86, 0x22, 0x48, 0x8e, 0x6c, 0x00, 0x00, 0x36, 0x00, 0x00, 0x40,</div><div class='add'>+	0x43, 0x99, 0x01, 0x00, 0x58, 0x00, 0x3d, 0x43, 0xe7, 0xe1, 0x01, 0x00,</div><div class='add'>+	0xeb, 0x86, 0x1f, 0xf0, 0x24, 0x6c, 0x00, 0x00, 0xea, 0x86, 0x23, 0x41,</div><div class='add'>+	0x8f, 0x6c, 0x00, 0x00, 0xbd, 0x87, 0x00, 0x47, 0x81, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xbd, 0x87, 0x00, 0x48, 0x81, 0xb0, 0x00, 0x00, 0x40, 0x00, 0x00, 0x40,</div><div class='add'>+	0x43, 0x99, 0x01, 0x00, 0xb0, 0x00, 0x2d, 0xf0, 0x14, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xf0, 0x86, 0x22, 0x0a, 0x90, 0x40, 0x00, 0x00, 0xaa, 0x95, 0x00, 0x40,</div><div class='add'>+	0x91, 0x30, 0x01, 0x00, 0xbd, 0x87, 0xa2, 0x40, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0xb0, 0x00, 0x2d, 0x45, 0x81, 0xb0, 0x01, 0x00, 0xfc, 0x86, 0x22, 0xf0,</div><div class='add'>+	0x2c, 0x30, 0x00, 0x00, 0xa3, 0x00, 0x2d, 0x30, 0x83, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xac, 0x00, 0x2d, 0xf3, 0x82, 0xe0, 0x01, 0x00, 0xf6, 0x86, 0xa3, 0x41,</div><div class='add'>+	0x2c, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16, 0x82, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x98, 0x00, 0x2d, 0xf0, 0x82, 0xc0, 0x01, 0x00, 0x88, 0x00, 0x2d, 0xf0,</div><div class='add'>+	0x82, 0xd0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf2, 0x98, 0xe8, 0x01, 0x00,</div><div class='add'>+	0xbd, 0x87, 0x20, 0x4c, 0x82, 0x6c, 0x00, 0x00, 0x7c, 0x00, 0x2d, 0x41,</div><div class='add'>+	0x98, 0xe8, 0x01, 0x00, 0xbd, 0x87, 0x20, 0xf0, 0x98, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x14, 0x87, 0x22, 0x0a, 0x80, 0x32, 0x00, 0x00, 0x40, 0x02, 0x00, 0x0c,</div><div class='add'>+	0x7e, 0x89, 0x01, 0x00, 0x14, 0x87, 0xa6, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0xbd, 0x87, 0x00, 0x49, 0x81, 0xb0, 0x00, 0x00, 0x20, 0x00, 0x00, 0xa6,</div><div class='add'>+	0x80, 0xb0, 0x01, 0x00, 0x04, 0x87, 0x22, 0x43, 0x21, 0x6f, 0x00, 0x00,</div><div class='add'>+	0x13, 0x80, 0x00, 0x40, 0x80, 0xdc, 0x01, 0x00, 0x05, 0x87, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x1a, 0x80, 0x00, 0x40, 0x80, 0xdc, 0x01, 0x00,</div><div class='add'>+	0x05, 0x87, 0xa2, 0x5e, 0x0b, 0x7d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x08, 0xb1, 0x01, 0x00, 0x07, 0x87, 0x9f, 0x85, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x0b, 0x87, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xec, 0x82, 0x22, 0x40,</div><div class='add'>+	0x57, 0x7d, 0x00, 0x00, 0x01, 0x00, 0x00, 0x40, 0x57, 0x99, 0x01, 0x00,</div><div class='add'>+	0x0b, 0x87, 0x42, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0x93, 0x93, 0x01, 0x00, 0xdd, 0x82, 0x1a, 0x5b, 0x69, 0x93, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0xcb, 0x81, 0xc8, 0x01, 0x00, 0x11, 0x87, 0x22, 0x40,</div><div class='add'>+	0xf2, 0x7f, 0x00, 0x00, 0xc4, 0x80, 0x00, 0x6f, 0x97, 0x33, 0x01, 0x00,</div><div class='add'>+	0x13, 0x87, 0x22, 0x40, 0x73, 0x7d, 0x00, 0x00, 0xde, 0x80, 0x00, 0x41,</div><div class='add'>+	0x8b, 0xb3, 0x00, 0x00, 0x0e, 0x87, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x1b, 0x87, 0x9c, 0x0f, 0x80, 0x32, 0x00, 0x00, 0x00, 0x80, 0x00, 0x10,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0x1b, 0x87, 0x22, 0x40, 0xe3, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x45, 0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x18, 0x87, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0xaf, 0x82, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x2f, 0x92, 0x22, 0x02,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x1c, 0x87, 0x42, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x44, 0x93, 0x93, 0x01, 0x00, 0x2f, 0x92, 0x1a, 0x02,</div><div class='add'>+	0x68, 0x97, 0x00, 0x00, 0x26, 0x87, 0x9c, 0x0f, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x80, 0x00, 0x10, 0x42, 0xc9, 0x01, 0x00, 0x26, 0x87, 0x22, 0x40,</div><div class='add'>+	0xe3, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x45, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00, 0x23, 0x87, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0xaf, 0x82, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x39, 0x92, 0x22, 0x02, 0x80, 0x32, 0x00, 0x00, 0x27, 0x87, 0x42, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x93, 0x93, 0x01, 0x00,</div><div class='add'>+	0x39, 0x92, 0x1a, 0x02, 0x68, 0x97, 0x00, 0x00, 0x31, 0x87, 0x9c, 0x0f,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x00, 0x80, 0x00, 0x10, 0x42, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x31, 0x87, 0x22, 0x40, 0xe3, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x45,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0x2e, 0x87, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0xaf, 0x82, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0xf9, 0x82, 0x22, 0x02, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x32, 0x87, 0x42, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0x93, 0x93, 0x01, 0x00, 0x00, 0x00, 0x1a, 0x02, 0x68, 0x97, 0x01, 0x00,</div><div class='add'>+	0xf9, 0x82, 0x00, 0x40, 0x05, 0xb0, 0x00, 0x00, 0x00, 0x80, 0x00, 0xa6,</div><div class='add'>+	0x56, 0xb1, 0x01, 0x00, 0x56, 0x95, 0x2f, 0x40, 0x05, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x82, 0x87, 0xa2, 0x40, 0xe7, 0x6d, 0x00, 0x00, 0xb8, 0x94, 0x29, 0x41,</div><div class='add'>+	0xe7, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x54, 0xef, 0x93, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf2, 0x0e, 0xb0, 0x01, 0x00, 0x29, 0x00, 0x00, 0x40,</div><div class='add'>+	0x0d, 0x98, 0x01, 0x00, 0x09, 0x00, 0x00, 0x07, 0x12, 0xe4, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xa7, 0x13, 0xc0, 0x01, 0x00, 0x03, 0x00, 0x00, 0x07,</div><div class='add'>+	0x1a, 0xf4, 0x01, 0x00, 0x07, 0x00, 0x00, 0x07, 0x16, 0x88, 0x01, 0x00,</div><div class='add'>+	0xff, 0xff, 0x00, 0x10, 0x34, 0xd8, 0x01, 0x00, 0x00, 0x00, 0x00, 0x03,</div><div class='add'>+	0x34, 0x94, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x23, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x20, 0x18, 0x00, 0x40, 0x11, 0x98, 0x01, 0x00, 0x00, 0xb5, 0x00, 0x0d,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0x66, 0x87, 0x22, 0x0b, 0xe6, 0x7d, 0x00, 0x00,</div><div class='add'>+	0x47, 0x87, 0x60, 0x40, 0x81, 0x32, 0x00, 0x00, 0xff, 0xff, 0x00, 0x07,</div><div class='add'>+	0x84, 0x89, 0x01, 0x00, 0x4e, 0x87, 0x05, 0xc2, 0x24, 0x30, 0x00, 0x00,</div><div class='add'>+	0x58, 0x04, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x2d, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x83, 0x87, 0x70, 0xf0, 0x18, 0x30, 0x01, 0x00,</div><div class='add'>+	0x66, 0x87, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x70, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x5d, 0x87, 0xa0, 0x48, 0x23, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x50, 0x35, 0xd0, 0x01, 0x00, 0x00, 0x80, 0x00, 0x1a,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0x57, 0x87, 0x22, 0x40, 0xe3, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x42, 0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x1a,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x54, 0x87, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0xaf, 0x82, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x20, 0x98, 0x00, 0x40,</div><div class='add'>+	0x43, 0x99, 0x01, 0x00, 0x83, 0x87, 0x00, 0xf8, 0x18, 0x30, 0x01, 0x00,</div><div class='add'>+	0x58, 0x87, 0xa2, 0x41, 0x23, 0x50, 0x00, 0x00, 0xff, 0xff, 0x00, 0x10,</div><div class='add'>+	0x34, 0xd8, 0x01, 0x00, 0x00, 0x00, 0x00, 0x03, 0x34, 0x94, 0x01, 0x00,</div><div class='add'>+	0x20, 0x18, 0x00, 0x40, 0x11, 0x98, 0x01, 0x00, 0x00, 0x00, 0x2e, 0x1a,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x08, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x42,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x20, 0x00, 0x00, 0x1a, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0x61, 0x87, 0xa8, 0x09, 0xe0, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x23, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x50, 0x35, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x44, 0x11, 0xc0, 0x01, 0x00, 0x72, 0x87, 0x22, 0x41,</div><div class='add'>+	0x0d, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x0f, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x6e, 0x87, 0xa0, 0xaa, 0x0f, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x0f, 0xb0, 0x01, 0x00, 0x09, 0x00, 0x00, 0x07, 0x12, 0xe4, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xa7, 0x13, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x1b, 0xb0, 0x01, 0x00, 0x45, 0x87, 0x00, 0x41, 0x17, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x02, 0x00, 0x09, 0x12, 0xc8, 0x01, 0x00, 0x45, 0x87, 0x83, 0x41,</div><div class='add'>+	0x17, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x17, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x45, 0x87, 0x00, 0x41, 0x1b, 0xc0, 0x00, 0x00, 0x7d, 0x87, 0x23, 0x40,</div><div class='add'>+	0x23, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x35, 0xd0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x80, 0x00, 0x1a, 0x42, 0xc9, 0x01, 0x00, 0x7a, 0x87, 0x22, 0x40,</div><div class='add'>+	0xe3, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x1a, 0x62, 0xdd, 0x01, 0x00, 0x77, 0x87, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0xaf, 0x82, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x20, 0x98, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00, 0x83, 0x87, 0x00, 0xf8,</div><div class='add'>+	0x18, 0x30, 0x01, 0x00, 0x7b, 0x87, 0xa2, 0x41, 0x23, 0x50, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x0f, 0xc0, 0x01, 0x00, 0x80, 0x87, 0xa0, 0xaa,</div><div class='add'>+	0x0f, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x0f, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xb8, 0x94, 0x20, 0x07, 0xe4, 0xb1, 0x01, 0x00, 0x56, 0x95, 0x20, 0x40,</div><div class='add'>+	0xe7, 0xb1, 0x01, 0x00, 0x14, 0x87, 0x00, 0x40, 0x0f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xff, 0xff, 0x00, 0x0c, 0x80, 0xd8, 0x01, 0x00, 0xc0, 0x02, 0x00, 0x0c,</div><div class='add'>+	0x7e, 0x89, 0x01, 0x00, 0x95, 0x87, 0x26, 0x54, 0x61, 0x31, 0x00, 0x00,</div><div class='add'>+	0x8b, 0x87, 0x87, 0x0c, 0x80, 0x32, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x40,</div><div class='add'>+	0x62, 0x99, 0x01, 0x00, 0x8b, 0x87, 0x28, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x8b, 0x87, 0xa2, 0x54, 0x77, 0x7d, 0x00, 0x00, 0x87, 0x87, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x90, 0x87, 0x22, 0x46, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x0d, 0x00, 0x00, 0x40, 0x62, 0x99, 0x01, 0x00, 0x00, 0x00, 0xa8, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0xa2, 0x54, 0x77, 0x7d, 0x01, 0x00,</div><div class='add'>+	0x8c, 0x87, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x95, 0x87, 0x22, 0x49,</div><div class='add'>+	0x19, 0x7c, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x40, 0x62, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0xa8, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0xa2, 0x54,</div><div class='add'>+	0x77, 0x7d, 0x01, 0x00, 0x90, 0x87, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x10, 0x00, 0x00, 0x40, 0x62, 0x99, 0x01, 0x00, 0x00, 0x00, 0xa8, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0xa2, 0x54, 0x77, 0x7d, 0x01, 0x00,</div><div class='add'>+	0x95, 0x87, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x30, 0x94, 0x2f, 0x55,</div><div class='add'>+	0xf1, 0x93, 0x01, 0x00, 0x00, 0x40, 0x00, 0xa6, 0x56, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xf9, 0x82, 0xa2, 0x41, 0xe5, 0x51, 0x00, 0x00, 0x64, 0x00, 0x00, 0x40,</div><div class='add'>+	0xe5, 0x99, 0x01, 0x00, 0x9d, 0x87, 0x44, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0xa0, 0x87, 0xa2, 0x93, 0x57, 0x6f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x57, 0xc3, 0x01, 0x00, 0x00, 0x00, 0x1c, 0xab, 0x27, 0xb3, 0x01, 0x00,</div><div class='add'>+	0xf9, 0x82, 0x22, 0x50, 0xfd, 0x7f, 0x00, 0x00, 0xf9, 0x82, 0x22, 0x51,</div><div class='add'>+	0xfd, 0x7f, 0x00, 0x00, 0xf9, 0x82, 0xa2, 0x41, 0x1d, 0x53, 0x00, 0x00,</div><div class='add'>+	0x50, 0x46, 0x00, 0x40, 0x1d, 0x9b, 0x01, 0x00, 0x38, 0x05, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x0e, 0x00, 0x00, 0x48, 0xb2, 0xcb, 0x01, 0x00,</div><div class='add'>+	0x10, 0x04, 0x00, 0x40, 0x49, 0x31, 0x01, 0x00, 0xac, 0x87, 0x22, 0x40,</div><div class='add'>+	0xb5, 0x6f, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x48, 0xb2, 0xcb, 0x01, 0x00,</div><div class='add'>+	0x20, 0x04, 0x00, 0x41, 0xb5, 0x53, 0x01, 0x00, 0xf9, 0x82, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x51, 0xfd, 0x83, 0x01, 0x00,</div><div class='add'>+	0x40, 0x16, 0x00, 0x40, 0x45, 0x99, 0x01, 0x00, 0x40, 0x05, 0x00, 0x40,</div><div class='add'>+	0x49, 0x31, 0x01, 0x00, 0x1e, 0x00, 0x00, 0x48, 0xb2, 0xcb, 0x01, 0x00,</div><div class='add'>+	0x10, 0x04, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0xda,</div><div class='add'>+	0x91, 0xc0, 0x01, 0x00, 0x04, 0x00, 0x00, 0x48, 0xb2, 0xcb, 0x01, 0x00,</div><div class='add'>+	0x20, 0x04, 0x00, 0x40, 0xb5, 0x33, 0x01, 0x00, 0x60, 0x16, 0x20, 0x40,</div><div class='add'>+	0xe5, 0xb1, 0x01, 0x00, 0x40, 0x82, 0x00, 0x40, 0xb5, 0x33, 0x01, 0x00,</div><div class='add'>+	0x08, 0x00, 0x00, 0x48, 0xb2, 0xcb, 0x01, 0x00, 0xff, 0xff, 0x00, 0x4a,</div><div class='add'>+	0xb4, 0x8b, 0x01, 0x00, 0x20, 0x04, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x0a, 0x00, 0x00, 0x48, 0xb2, 0xcb, 0x01, 0x00, 0x10, 0x00, 0x00, 0x4a,</div><div class='add'>+	0xb4, 0xf7, 0x01, 0x00, 0x20, 0x04, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0xf9, 0x82, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x05, 0x00, 0x00, 0x40,</div><div class='add'>+	0x43, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf3, 0x08, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x20, 0x40, 0xe6, 0xb1, 0x01, 0x00, 0x03, 0x00, 0x00, 0x40,</div><div class='add'>+	0x96, 0xe4, 0x01, 0x00, 0x00, 0x00, 0x00, 0x04, 0x96, 0xc0, 0x01, 0x00,</div><div class='add'>+	0xc3, 0x87, 0x00, 0x4b, 0x10, 0xc9, 0x00, 0x00, 0xe6, 0x8a, 0x00, 0x41,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x1a, 0x8b, 0x00, 0x41,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x4c, 0x8b, 0x00, 0x45,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x4c, 0x8b, 0x00, 0x45, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x4c, 0x8b, 0x00, 0x45, 0x09, 0xb0, 0x00, 0x00, 0x4c, 0x8b, 0x00, 0x45,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x8b, 0x8b, 0x00, 0x43, 0x09, 0xb0, 0x00, 0x00, 0xb4, 0x8b, 0x00, 0x43,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0xb8, 0x8b, 0x00, 0x44, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x03, 0x8d, 0x00, 0x45, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xc4, 0x8b, 0x00, 0x43, 0x09, 0xb0, 0x00, 0x00, 0xc3, 0x8b, 0x00, 0x43,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0xe4, 0x8a, 0x00, 0x45, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x73, 0x8c, 0x00, 0x42,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x73, 0x8c, 0x00, 0x43, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x73, 0x8c, 0x00, 0x44, 0x09, 0xb0, 0x00, 0x00, 0xe4, 0x8a, 0x00, 0x45,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x93, 0x8c, 0x00, 0x43,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xe4, 0x8a, 0x00, 0x45, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xb1, 0x8c, 0x00, 0x43, 0x09, 0xb0, 0x00, 0x00, 0xb1, 0x8c, 0x00, 0x44,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0xe4, 0x8a, 0x00, 0x45, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0xb1, 0x8c, 0x00, 0x42, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0xe4, 0x8a, 0x00, 0x45,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0xd9, 0x8c, 0x00, 0x44,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xe4, 0x8a, 0x00, 0x45, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0xe4, 0x8a, 0x00, 0x42, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xea, 0x8c, 0x00, 0x45, 0x09, 0xb0, 0x00, 0x00, 0xea, 0x8c, 0x00, 0x45,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0xe4, 0x8a, 0x00, 0x45, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0xec, 0x8c, 0x00, 0x42,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0xec, 0x8c, 0x00, 0x43, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xec, 0x8c, 0x00, 0x44, 0x09, 0xb0, 0x00, 0x00, 0xec, 0x8c, 0x00, 0x45,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0xf4, 0x8c, 0x00, 0x44, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xe4, 0x8a, 0x00, 0x45, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x05, 0x8d, 0x00, 0x42, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xf5, 0x8c, 0x00, 0x43, 0x09, 0xb0, 0x00, 0x00, 0x05, 0x8d, 0x00, 0x44,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0xe4, 0x8a, 0x00, 0x45, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x06, 0x8d, 0x00, 0x43, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xfc, 0x8c, 0x00, 0x44, 0x09, 0xb0, 0x00, 0x00, 0xe4, 0x8a, 0x00, 0x45,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0xe4, 0x8a, 0x00, 0x41, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x71, 0x8c, 0x00, 0x42, 0x09, 0xb0, 0x00, 0x00, 0x71, 0x8c, 0x00, 0x43,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x71, 0x8c, 0x00, 0x44, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xe4, 0x8a, 0x00, 0x45, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0xe4, 0x8a, 0x00, 0x41,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x07, 0x8d, 0x00, 0x42, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x07, 0x8d, 0x00, 0x43, 0x09, 0xb0, 0x00, 0x00, 0x07, 0x8d, 0x00, 0x44,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0xe4, 0x8a, 0x00, 0x45, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x0e, 0x8d, 0x00, 0x45,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x10, 0x8d, 0x00, 0x42, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x1c, 0x8d, 0x00, 0x43, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x7b, 0x8d, 0x00, 0x43, 0x09, 0xb0, 0x00, 0x00, 0xb8, 0x8b, 0x00, 0x44,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x03, 0x8d, 0x00, 0x45, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x83, 0x8d, 0x00, 0x43, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xb8, 0x8b, 0x00, 0x44, 0x09, 0xb0, 0x00, 0x00, 0x03, 0x8d, 0x00, 0x45,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x94, 0x8d, 0x00, 0x43,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xe4, 0x8a, 0x00, 0x45, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x88, 0x8b, 0x00, 0x43, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x7f, 0x8d, 0x00, 0x43, 0x09, 0xb0, 0x00, 0x00, 0xb8, 0x8b, 0x00, 0x44,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x03, 0x8d, 0x00, 0x45, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x8f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x8f, 0xb0, 0x00, 0x00, 0x07, 0x00, 0x2d, 0x05, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf3, 0x08, 0xb0, 0x01, 0x00, 0x06, 0x00, 0x20, 0x47,</div><div class='add'>+	0xe6, 0xb1, 0x01, 0x00, 0x04, 0x00, 0x00, 0x47, 0x96, 0xe4, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x47, 0x96, 0xd0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x47,</div><div class='add'>+	0x96, 0xd0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x04, 0x96, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x83, 0x88, 0x00, 0x4b, 0x10, 0xc9, 0x00, 0x00, 0xac, 0x8d, 0x00, 0x49,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0xe5, 0x8d, 0x00, 0x42,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xeb, 0x8d, 0x00, 0x46, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xf9, 0x8d, 0x00, 0x42, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x1a, 0x8e, 0x00, 0x42, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x15, 0x8e, 0x00, 0x4a, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x1d, 0x8e, 0x00, 0x43, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x75, 0x8e, 0x00, 0x44,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x74, 0x8e, 0x00, 0x4b, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xee, 0x8d, 0x00, 0x41, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0xee, 0x8d, 0x00, 0x43, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xee, 0x8d, 0x00, 0x44, 0x09, 0xb0, 0x00, 0x00, 0xee, 0x8d, 0x00, 0x45,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0xee, 0x8d, 0x00, 0x46, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xee, 0x8d, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00, 0xee, 0x8d, 0x00, 0x48,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0xee, 0x8d, 0x00, 0x49, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xee, 0x8d, 0x00, 0x4a, 0x09, 0xb0, 0x00, 0x00, 0xee, 0x8d, 0x00, 0x4b,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0xee, 0x8d, 0x00, 0x4c, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xee, 0x8d, 0x00, 0x4d, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xd4, 0x8e, 0x00, 0x42, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0xd4, 0x8e, 0x00, 0x44, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xd4, 0x8e, 0x00, 0x4b, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xec, 0x8e, 0x00, 0x45, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x03, 0x8f, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0xe0, 0x8e, 0x00, 0x45,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x41, 0x91, 0x00, 0x46,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x1a, 0x8e, 0x00, 0x46,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0xf9, 0x8d, 0x00, 0x46, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x13, 0x8e, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00, 0x13, 0x8e, 0x00, 0x48,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x15, 0x8e, 0x00, 0x4a, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x75, 0x8e, 0x00, 0x45, 0x09, 0xb0, 0x00, 0x00, 0x1d, 0x8e, 0x00, 0x43,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x13, 0x8e, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x13, 0x8e, 0x00, 0x48, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x74, 0x8e, 0x00, 0x4c,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x09, 0x8f, 0x00, 0x44, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x09, 0x8f, 0x00, 0x42, 0x09, 0xb0, 0x00, 0x00, 0xcf, 0x8a, 0x00, 0x47,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0xcf, 0x8a, 0x00, 0x48, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x09, 0x8f, 0x00, 0x4b, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xee, 0x8d, 0x00, 0x41, 0x09, 0xb0, 0x00, 0x00, 0x2c, 0x8f, 0x00, 0x47,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x14, 0x8f, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x14, 0x8f, 0x00, 0x47,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x14, 0x8f, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00, 0x2c, 0x8f, 0x00, 0x47,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x13, 0x8e, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x13, 0x8e, 0x00, 0x48, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x14, 0x8f, 0x00, 0x47,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x3b, 0x8f, 0x00, 0x47,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x3b, 0x8f, 0x00, 0x48, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x9d, 0x8f, 0x00, 0x40, 0x09, 0xb0, 0x00, 0x00, 0xba, 0x8f, 0x00, 0x47,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0xae, 0x8f, 0x00, 0x48, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x0c, 0x8f, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00, 0x0c, 0x8f, 0x00, 0x47,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0xba, 0x8f, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xc1, 0x8f, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00, 0xc1, 0x8f, 0x00, 0x48,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xae, 0x8f, 0x00, 0x48, 0x09, 0xb0, 0x00, 0x00, 0x0c, 0x8f, 0x00, 0x47,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x0c, 0x8f, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xae, 0x8f, 0x00, 0x48, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0xd4, 0x8e, 0x00, 0x43,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xd4, 0x8e, 0x00, 0x45, 0x09, 0xb0, 0x00, 0x00, 0xd4, 0x8e, 0x00, 0x46,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x13, 0x8e, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x13, 0x8e, 0x00, 0x48, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0xd4, 0x8e, 0x00, 0x4a, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0xd4, 0x8e, 0x00, 0x4c,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x2b, 0x8f, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x1f, 0x8f, 0x00, 0x48, 0x09, 0xb0, 0x00, 0x00, 0x13, 0x8f, 0x00, 0x47,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x13, 0x8f, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x2b, 0x8f, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00, 0xcf, 0x8a, 0x00, 0x47,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0xcf, 0x8a, 0x00, 0x48, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x1f, 0x8f, 0x00, 0x48,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x13, 0x8f, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x13, 0x8f, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00, 0x1f, 0x8f, 0x00, 0x48,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0xc3, 0x8f, 0x00, 0x42,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xc3, 0x8f, 0x00, 0x44, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0xc3, 0x8f, 0x00, 0x4b,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0xc3, 0x8f, 0x00, 0x43,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xc3, 0x8f, 0x00, 0x45, 0x09, 0xb0, 0x00, 0x00, 0xc3, 0x8f, 0x00, 0x46,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0xc3, 0x8f, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xc3, 0x8f, 0x00, 0x48, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0xc3, 0x8f, 0x00, 0x4a, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0xc3, 0x8f, 0x00, 0x4c,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0xc3, 0x8f, 0x00, 0x4c, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xdd, 0x8f, 0x00, 0x46, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x03, 0x8f, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0xdd, 0x8f, 0x00, 0x46,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0xd8, 0x90, 0x00, 0x46, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x03, 0x8f, 0x00, 0x47,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xd8, 0x90, 0x00, 0x46, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xd8, 0x90, 0x00, 0x46, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0xfb, 0x90, 0x00, 0x42, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xfa, 0x90, 0x00, 0x4a, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0xfb, 0x90, 0x00, 0x46, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x13, 0x8e, 0x00, 0x47,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x13, 0x8e, 0x00, 0x48, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xfa, 0x90, 0x00, 0x4a, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0xce, 0x8f, 0x00, 0x41, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xda, 0x8f, 0x00, 0x42, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0xda, 0x8f, 0x00, 0x44, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xda, 0x8f, 0x00, 0x4b, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xda, 0x8f, 0x00, 0x43, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0xda, 0x8f, 0x00, 0x45, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xda, 0x8f, 0x00, 0x46, 0x09, 0xb0, 0x00, 0x00, 0xda, 0x8f, 0x00, 0x47,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0xda, 0x8f, 0x00, 0x48, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xda, 0x8f, 0x00, 0x4c, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0xec, 0x8e, 0x00, 0x4c, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x03, 0x8f, 0x00, 0x47,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xe0, 0x8e, 0x00, 0x4c, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x8f, 0x91, 0x00, 0x46, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x36, 0x91, 0x00, 0x42, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x36, 0x91, 0x00, 0x44, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x36, 0x91, 0x00, 0x4b, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x36, 0x91, 0x00, 0x45, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x36, 0x91, 0x00, 0x46, 0x09, 0xb0, 0x00, 0x00, 0x13, 0x8e, 0x00, 0x47,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x13, 0x8e, 0x00, 0x48, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x36, 0x91, 0x00, 0x4c, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0xe0, 0x8e, 0x00, 0x42,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x41, 0x91, 0x00, 0x46, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0xe0, 0x8e, 0x00, 0x46, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x03, 0x8f, 0x00, 0x47,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x41, 0x91, 0x00, 0x46, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x41, 0x91, 0x00, 0x46, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x45, 0x91, 0x00, 0x43,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x03, 0x8f, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x87, 0x91, 0x00, 0x4a, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x45, 0x91, 0x00, 0x4d, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x56, 0x91, 0x00, 0x43,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x34, 0x91, 0x00, 0x4a, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x56, 0x91, 0x00, 0x43,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x13, 0x8e, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00, 0x13, 0x8e, 0x00, 0x48,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x34, 0x91, 0x00, 0x4a, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x67, 0x91, 0x00, 0x43,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x03, 0x8f, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x67, 0x91, 0x00, 0x43, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x67, 0x91, 0x00, 0x4d, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0xf9, 0x8d, 0x00, 0x42, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x1a, 0x8e, 0x00, 0x42,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x85, 0x91, 0x00, 0x42, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x1a, 0x8e, 0x00, 0x46,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0xf9, 0x8d, 0x00, 0x46, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x13, 0x8e, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00, 0x13, 0x8e, 0x00, 0x48,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x85, 0x91, 0x00, 0x46, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x87, 0x91, 0x00, 0x4a,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x03, 0x8f, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x87, 0x91, 0x00, 0x4a, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x42, 0x91, 0x00, 0x46, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x42, 0x91, 0x00, 0x46, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x03, 0x8f, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x42, 0x91, 0x00, 0x46,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x42, 0x91, 0x00, 0x46,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x8d, 0x91, 0x00, 0x42, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x34, 0x91, 0x00, 0x4a,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x8d, 0x91, 0x00, 0x46, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x13, 0x8e, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x13, 0x8e, 0x00, 0x48, 0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x34, 0x91, 0x00, 0x4a,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x1d, 0x8e, 0x00, 0x4d, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x1d, 0x8e, 0x00, 0x4d, 0x09, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x13, 0x8e, 0x00, 0x47, 0x09, 0xb0, 0x00, 0x00, 0x13, 0x8e, 0x00, 0x48,</div><div class='add'>+	0x09, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20,</div><div class='add'>+	0x85, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x20, 0x85, 0xb0, 0x00, 0x00, 0x07, 0x00, 0x2e, 0x4b,</div><div class='add'>+	0x19, 0x90, 0x01, 0x00, 0x1f, 0x87, 0x00, 0x04, 0xe6, 0xb1, 0x00, 0x00,</div><div class='add'>+	0xcf, 0x8a, 0x22, 0x42, 0x19, 0x7c, 0x00, 0x00, 0x83, 0x94, 0x00, 0x3a,</div><div class='add'>+	0x81, 0x30, 0x01, 0x00, 0xcf, 0x8a, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xcf, 0x8a, 0x22, 0x42, 0x19, 0x7c, 0x00, 0x00, 0xff, 0x1f, 0x00, 0x0f,</div><div class='add'>+	0x1e, 0x8c, 0x01, 0x00, 0xee, 0x93, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0xdf, 0x8a, 0x9c, 0x0f, 0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5c,</div><div class='add'>+	0x1f, 0x80, 0x01, 0x00, 0x00, 0x80, 0x00, 0x10, 0x42, 0xc9, 0x01, 0x00,</div><div class='add'>+	0xdf, 0x8a, 0x22, 0x40, 0xe3, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x45,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0xdc, 0x8a, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0xaf, 0x82, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0xa3, 0x84, 0x22, 0x02, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0xe0, 0x8a, 0x42, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0x93, 0x93, 0x01, 0x00, 0x00, 0x00, 0x1a, 0x02, 0x68, 0x97, 0x01, 0x00,</div><div class='add'>+	0xa3, 0x84, 0x00, 0x40, 0x05, 0xb0, 0x00, 0x00, 0x05, 0x00, 0x2e, 0x4b,</div><div class='add'>+	0x19, 0x90, 0x01, 0x00, 0x1f, 0x87, 0x00, 0x04, 0xe6, 0xb1, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x87, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x8d, 0xb0, 0x01, 0x00, 0x00, 0x80, 0x00, 0x03, 0x42, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0xa1, 0x44, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0,</div><div class='add'>+	0xe0, 0xb1, 0x01, 0x00, 0xc6, 0x95, 0x00, 0x06, 0x07, 0x40, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x06, 0x07, 0xd0, 0x01, 0x00, 0xd4, 0x00, 0x2e, 0x5c,</div><div class='add'>+	0x1f, 0x90, 0x01, 0x00, 0x00, 0x00, 0x00, 0x07, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x0c, 0x80, 0x00, 0x03, 0x42, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xfe, 0x96, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xfe,</div><div class='add'>+	0x96, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x00, 0xfe,</div><div class='add'>+	0x96, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x96, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf0, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x00, 0xfa, 0x96, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xfe, 0x96, 0xc0, 0x01, 0x00, 0x00, 0x30, 0x00, 0x4b,</div><div class='add'>+	0x94, 0x88, 0x01, 0x00, 0x00, 0x00, 0x00, 0x46, 0x95, 0xf0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4a, 0x96, 0xc0, 0x01, 0x00, 0x5e, 0x01, 0x2e, 0x34,</div><div class='add'>+	0x97, 0x84, 0x01, 0x00, 0x02, 0x00, 0x00, 0x4b, 0xe4, 0xe5, 0x01, 0x00,</div><div class='add'>+	0x64, 0x01, 0x20, 0x40, 0xe1, 0xb1, 0x01, 0x00, 0x09, 0x00, 0x00, 0x07,</div><div class='add'>+	0x86, 0xe4, 0x01, 0x00, 0x00, 0x00, 0x2e, 0xa7, 0x87, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x10, 0x00, 0x00, 0x10, 0x48, 0xc9, 0x01, 0x00, 0x10, 0x00, 0x00, 0x40,</div><div class='add'>+	0xf1, 0x99, 0x01, 0x00, 0x58, 0x01, 0x00, 0x43, 0xf0, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x58, 0x01, 0x00, 0x05, 0xe0, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0xa0, 0x00, 0x00, 0xa4, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0x09, 0x8b, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x1a, 0x00, 0x00, 0x40, 0x97, 0x98, 0x01, 0x00,</div><div class='add'>+	0x08, 0x00, 0x2e, 0x40, 0x95, 0xb0, 0x01, 0x00, 0x11, 0x8b, 0x20, 0x4b,</div><div class='add'>+	0x94, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x0e, 0x8b, 0x00, 0x41, 0x95, 0xc0, 0x00, 0x00, 0x10, 0x80, 0x00, 0x10,</div><div class='add'>+	0x44, 0xc9, 0x01, 0x00, 0x18, 0x8b, 0x22, 0x40, 0xe3, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x44, 0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x14, 0x8b, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0xaf, 0x82, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x83, 0x94, 0x00, 0x40, 0x81, 0x30, 0x01, 0x00,</div><div class='add'>+	0xe4, 0x8a, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x0c, 0x80, 0x00, 0x03,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x86, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf8, 0x88, 0xb0, 0x01, 0x00, 0x1d, 0x8b, 0x44, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x20, 0x8b, 0xa2, 0x4c, 0xfd, 0x7f, 0x00, 0x00,</div><div class='add'>+	0x21, 0x8b, 0x00, 0x4c, 0xfd, 0x93, 0x00, 0x00, 0x22, 0x8b, 0x20, 0xf0,</div><div class='add'>+	0x56, 0x6f, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x56, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x1c, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x80, 0x00, 0x10,</div><div class='add'>+	0x44, 0xc9, 0x01, 0x00, 0x64, 0x00, 0x00, 0x40, 0xf1, 0x99, 0x01, 0x00,</div><div class='add'>+	0x70, 0x00, 0x00, 0x05, 0xf0, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x43,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x47, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x20, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00, 0x28, 0x8b, 0xa8, 0x44,</div><div class='add'>+	0xe0, 0x31, 0x00, 0x00, 0x10, 0x00, 0x00, 0x10, 0x8c, 0xc8, 0x01, 0x00,</div><div class='add'>+	0x00, 0x80, 0x00, 0x46, 0x44, 0xc9, 0x01, 0x00, 0x40, 0x00, 0x00, 0x40,</div><div class='add'>+	0xf1, 0x99, 0x01, 0x00, 0x68, 0x01, 0x00, 0x05, 0xf0, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x64, 0x00, 0x00, 0x43, 0xf0, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x47,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x46, 0x62, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x30, 0x8b, 0xa8, 0x44, 0xe0, 0x31, 0x00, 0x00, 0xaf, 0x82, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x09, 0x00, 0x00, 0x07, 0x86, 0xe4, 0x01, 0x00,</div><div class='add'>+	0x38, 0x00, 0x2e, 0xa7, 0x87, 0xc0, 0x01, 0x00, 0x8b, 0x00, 0x2d, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x38, 0x8b, 0x22, 0x43, 0xe7, 0x7d, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x44, 0x45, 0xc1, 0x01, 0x00, 0x3b, 0x8b, 0x22, 0x44,</div><div class='add'>+	0xe7, 0x7d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4c, 0x45, 0xc1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4a, 0x19, 0x90, 0x01, 0x00, 0x68, 0x01, 0x20, 0xa2,</div><div class='add'>+	0xe4, 0xb1, 0x01, 0x00, 0x88, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00,</div><div class='add'>+	0x3f, 0x8b, 0x23, 0x0b, 0xe5, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x19, 0x90, 0x01, 0x00, 0x00, 0x80, 0x00, 0x10, 0x44, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x50, 0x00, 0x00, 0x40, 0xf1, 0x99, 0x01, 0x00, 0x58, 0x01, 0x00, 0x43,</div><div class='add'>+	0xf0, 0xc9, 0x01, 0x00, 0x58, 0x01, 0x00, 0x05, 0xe0, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x44, 0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xb1, 0x01, 0x00, 0x44, 0x8b, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0xaf, 0x82, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x5c, 0x00, 0x2e, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x00, 0x80, 0x00, 0x03, 0x42, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x60, 0xf0, 0x96, 0xb0, 0x01, 0x00, 0x83, 0x94, 0x00, 0x41,</div><div class='add'>+	0x81, 0x30, 0x01, 0x00, 0xe4, 0x8a, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x4f, 0x8b, 0xa2, 0x49, 0x19, 0x7c, 0x00, 0x00, 0x86, 0x00, 0x00, 0x40,</div><div class='add'>+	0x47, 0x99, 0x01, 0x00, 0x53, 0x8b, 0x00, 0x40, 0xe5, 0xb1, 0x00, 0x00,</div><div class='add'>+	0x86, 0x00, 0x2f, 0x49, 0x19, 0x80, 0x01, 0x00, 0x53, 0x8b, 0xa2, 0xf2,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x8b, 0x00, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x42, 0xe7, 0x91, 0x01, 0x00, 0x56, 0x8b, 0xa2, 0x46,</div><div class='add'>+	0x19, 0x7c, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00,</div><div class='add'>+	0x5a, 0x8b, 0x00, 0x40, 0xe5, 0xb1, 0x00, 0x00, 0xa0, 0x00, 0x2f, 0x46,</div><div class='add'>+	0x19, 0x80, 0x01, 0x00, 0x5a, 0x8b, 0xa2, 0xf2, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x8b, 0x00, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0xe7, 0x91, 0x01, 0x00, 0xa8, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00,</div><div class='add'>+	0x34, 0x00, 0x2d, 0xf0, 0x24, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xfb,</div><div class='add'>+	0x0c, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xfb, 0x10, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xfb, 0x12, 0xb0, 0x01, 0x00, 0x0f, 0x00, 0x00, 0xf3,</div><div class='add'>+	0x16, 0x88, 0x01, 0x00, 0x04, 0x00, 0x00, 0xf3, 0x14, 0xf4, 0x01, 0x00,</div><div class='add'>+	0x85, 0x8b, 0x26, 0x40, 0x81, 0x32, 0x00, 0x00, 0x6d, 0x8b, 0x22, 0x0a,</div><div class='add'>+	0x16, 0x6c, 0x00, 0x00, 0x58, 0x00, 0x3d, 0x43, 0x13, 0xe0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf8, 0x82, 0xb0, 0x01, 0x00, 0x04, 0x00, 0x22, 0xf0,</div><div class='add'>+	0x84, 0x30, 0x00, 0x00, 0x70, 0x95, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0xaf, 0x82, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41, 0x13, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x6c, 0x8b, 0xa0, 0x43, 0x13, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x13, 0xb0, 0x01, 0x00, 0x62, 0x8b, 0x00, 0x41, 0x15, 0xd0, 0x00, 0x00,</div><div class='add'>+	0x85, 0x8b, 0x22, 0x0a, 0x80, 0x32, 0x00, 0x00, 0x58, 0x00, 0x3d, 0x43,</div><div class='add'>+	0x13, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x82, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x22, 0xf0, 0x84, 0x30, 0x00, 0x00, 0x70, 0x95, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x40, 0x00, 0x20, 0x40, 0xe1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xaf, 0x82, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x85, 0x8b, 0x22, 0x41, 0x15, 0x50, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x11, 0xc0, 0x01, 0x00, 0x79, 0x8b, 0xa0, 0x43,</div><div class='add'>+	0x11, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x11, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x58, 0x00, 0x3d, 0x43, 0x11, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8,</div><div class='add'>+	0x36, 0xb0, 0x01, 0x00, 0x04, 0x00, 0x22, 0xf0, 0x00, 0x30, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x50, 0x83, 0xb0, 0x01, 0x00, 0xc2, 0x94, 0x00, 0x47,</div><div class='add'>+	0x61, 0x31, 0x01, 0x00, 0xaf, 0x82, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x2c, 0x92, 0x00, 0x05, 0x48, 0x31, 0x01, 0x00, 0x00, 0x00, 0x00, 0x45,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0x81, 0x8b, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0xaf, 0x82, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x75, 0x8b, 0x00, 0x05, 0x48, 0xb1, 0x00, 0x00,</div><div class='add'>+	0x37, 0x00, 0x20, 0x40, 0xe7, 0xb1, 0x01, 0x00, 0xf4, 0x94, 0x00, 0x51,</div><div class='add'>+	0x81, 0x30, 0x01, 0x00, 0xe4, 0x8a, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x34, 0x00, 0x2e, 0x41, 0xf5, 0xb1, 0x01, 0x00, 0x00, 0x11, 0x00, 0x40,</div><div class='add'>+	0xe5, 0x99, 0x01, 0x00, 0x8d, 0x8b, 0x00, 0x48, 0x19, 0x90, 0x00, 0x00,</div><div class='add'>+	0x34, 0x00, 0x2e, 0x41, 0xf5, 0xb1, 0x01, 0x00, 0x00, 0x11, 0x00, 0x40,</div><div class='add'>+	0xe5, 0x99, 0x01, 0x00, 0x00, 0x80, 0x00, 0x03, 0x42, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf8, 0x94, 0xb0, 0x01, 0x00, 0x92, 0x8b, 0x22, 0x45,</div><div class='add'>+	0x23, 0x7c, 0x00, 0x00, 0xb0, 0x00, 0x2f, 0xf0, 0x8c, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x60, 0xf0, 0x8c, 0xc0, 0x01, 0x00, 0x90, 0x00, 0x00, 0x40,</div><div class='add'>+	0x43, 0x99, 0x01, 0x00, 0x35, 0x00, 0x2d, 0xf0, 0x8c, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x58, 0x00, 0x3e, 0x43, 0xe7, 0xe1, 0x01, 0x00, 0x97, 0x8b, 0x22, 0x48,</div><div class='add'>+	0x19, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x8d, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x68, 0x0a, 0x8c, 0xc0, 0x01, 0x00, 0x38, 0x00, 0x2a, 0x4a,</div><div class='add'>+	0xe0, 0xb1, 0x01, 0x00, 0x28, 0x00, 0x00, 0x00, 0xe0, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x3c, 0x00, 0x20, 0x1b, 0xe0, 0xb1, 0x01, 0x00, 0x10, 0x80, 0x00, 0x03,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x38, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf8, 0x26, 0xb0, 0x01, 0x00, 0x04, 0x00, 0x22, 0xf8,</div><div class='add'>+	0x02, 0x30, 0x00, 0x00, 0xa5, 0x8b, 0x23, 0x01, 0x14, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf8, 0x80, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8,</div><div class='add'>+	0x82, 0xb0, 0x01, 0x00, 0x4c, 0x00, 0x20, 0xf0, 0xe4, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x44, 0x00, 0x20, 0x40, 0xe0, 0xb1, 0x01, 0x00, 0x48, 0x00, 0x20, 0x41,</div><div class='add'>+	0xe0, 0xb1, 0x01, 0x00, 0xa8, 0x00, 0x2d, 0x10, 0x32, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xaa, 0x95, 0x00, 0xf0, 0x24, 0x30, 0x01, 0x00, 0xae, 0x8b, 0xa2, 0x44,</div><div class='add'>+	0x81, 0x6c, 0x00, 0x00, 0xac, 0x8b, 0x22, 0x41, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x57, 0x93, 0x00, 0x40, 0x3b, 0x30, 0x01, 0x00, 0xd2, 0x8b, 0xa2, 0x08,</div><div class='add'>+	0x3c, 0x30, 0x00, 0x00, 0xae, 0x8b, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x94, 0x92, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0xd2, 0x8b, 0xa2, 0x08,</div><div class='add'>+	0x3c, 0x30, 0x00, 0x00, 0x50, 0x00, 0x20, 0x1c, 0xe0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x54, 0x00, 0x20, 0x13, 0xe0, 0xb1, 0x01, 0x00, 0x4e, 0x00, 0x20, 0x01,</div><div class='add'>+	0xe4, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x20, 0x0a, 0xe0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xf4, 0x94, 0x00, 0x5f, 0x81, 0x30, 0x01, 0x00, 0xe4, 0x8a, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x37, 0x00, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00,</div><div class='add'>+	0x36, 0x93, 0x00, 0xf3, 0x94, 0x30, 0x01, 0x00, 0x8d, 0x8b, 0x22, 0x4a,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0xba, 0x8b, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x37, 0x00, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00, 0x36, 0x93, 0x00, 0xf3,</div><div class='add'>+	0x94, 0x30, 0x01, 0x00, 0x58, 0x00, 0x3e, 0x43, 0x97, 0xe0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x1b, 0xf0, 0xb1, 0x01, 0x00, 0x1f, 0x00, 0x60, 0x00,</div><div class='add'>+	0x00, 0x8c, 0x01, 0x00, 0xe4, 0x8a, 0x85, 0x11, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x04, 0x80, 0x00, 0x03, 0x42, 0xc9, 0x01, 0x00, 0xb0, 0x00, 0x2f, 0xf0,</div><div class='add'>+	0x8c, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x60, 0xf0, 0x8c, 0xc0, 0x01, 0x00,</div><div class='add'>+	0xf4, 0x94, 0x00, 0x5f, 0x81, 0x30, 0x01, 0x00, 0xe4, 0x8a, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0xc4, 0x8b, 0x00, 0x49, 0x19, 0x80, 0x00, 0x00,</div><div class='add'>+	0xc9, 0x8b, 0x22, 0x41, 0x19, 0x7c, 0x00, 0x00, 0x57, 0x93, 0x00, 0x40,</div><div class='add'>+	0x3b, 0x30, 0x01, 0x00, 0xcd, 0x8b, 0xa2, 0x08, 0x3c, 0x30, 0x00, 0x00,</div><div class='add'>+	0xf4, 0x94, 0x00, 0x5f, 0x81, 0x30, 0x01, 0x00, 0xe4, 0x8a, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x94, 0x92, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0xcd, 0x8b, 0xa2, 0x08, 0x3c, 0x30, 0x00, 0x00, 0xf4, 0x94, 0x00, 0x5f,</div><div class='add'>+	0x81, 0x30, 0x01, 0x00, 0xe4, 0x8a, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x50, 0x00, 0x2d, 0x10, 0x32, 0xb0, 0x01, 0x00, 0x54, 0x00, 0x2d, 0xf0,</div><div class='add'>+	0x38, 0xb0, 0x01, 0x00, 0x4e, 0x00, 0x2d, 0xf0, 0x26, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x2d, 0xf2, 0x02, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0,</div><div class='add'>+	0x14, 0xb0, 0x01, 0x00, 0x30, 0x00, 0x00, 0x10, 0x8c, 0xc8, 0x01, 0x00,</div><div class='add'>+	0x00, 0x80, 0x00, 0x46, 0x44, 0xc9, 0x01, 0x00, 0x68, 0x01, 0x2d, 0x44,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x10, 0x00, 0x68, 0xf2, 0x80, 0xc8, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x08, 0xf0, 0xb1, 0x01, 0x00, 0x58, 0x01, 0x00, 0x05,</div><div class='add'>+	0xe0, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x0b, 0x37, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x36, 0xd0, 0x01, 0x00, 0x5c, 0x01, 0x2e, 0x40,</div><div class='add'>+	0x10, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x06, 0x80, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x52, 0x81, 0xd0, 0x01, 0x00, 0x89, 0x94, 0x00, 0x40,</div><div class='add'>+	0xe4, 0x31, 0x01, 0x00, 0x20, 0x00, 0x00, 0x46, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0xde, 0x8b, 0xa8, 0x40, 0x23, 0x30, 0x00, 0x00, 0xce, 0x92, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0xd6, 0x92, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0xec, 0x8b, 0x82, 0x41, 0x23, 0x40, 0x00, 0x00, 0x20, 0x80, 0x00, 0x10,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0xe9, 0x8b, 0x22, 0x40, 0xe3, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x46, 0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0xe6, 0x8b, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0xaf, 0x82, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x10, 0x32, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x23, 0xb0, 0x01, 0x00, 0x00, 0x80, 0x00, 0x19,</div><div class='add'>+	0x44, 0xc9, 0x01, 0x00, 0xf4, 0x8b, 0x22, 0x41, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0xf0, 0x8b, 0xa3, 0x01, 0x0c, 0x6c, 0x00, 0x00, 0xf1, 0x8b, 0x00, 0x06,</div><div class='add'>+	0x04, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x04, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xf3, 0x8b, 0x20, 0x02, 0x36, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1b,</div><div class='add'>+	0x04, 0xb0, 0x01, 0x00, 0xf7, 0x8b, 0x00, 0x02, 0xe0, 0xb1, 0x00, 0x00,</div><div class='add'>+	0xf6, 0x8b, 0xa3, 0x01, 0x0c, 0x6c, 0x00, 0x00, 0xf7, 0x8b, 0x00, 0x06,</div><div class='add'>+	0x04, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x04, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x68, 0x02, 0x16, 0x94, 0x01, 0x00, 0xff, 0xff, 0x00, 0x0b,</div><div class='add'>+	0x16, 0xd8, 0x01, 0x00, 0x00, 0x00, 0x68, 0x08, 0x3e, 0x96, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x1c, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x46,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x20, 0x00, 0x00, 0x19, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0xfc, 0x8b, 0xa8, 0x13, 0xe0, 0x31, 0x00, 0x00, 0x33, 0x8c, 0x22, 0x02,</div><div class='add'>+	0x14, 0x50, 0x00, 0x00, 0x44, 0x00, 0x2d, 0x02, 0x0c, 0xd0, 0x01, 0x00,</div><div class='add'>+	0x23, 0x8c, 0xa2, 0x02, 0x02, 0x50, 0x00, 0x00, 0x0a, 0x8c, 0x22, 0x5c,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x20, 0x80, 0x00, 0x03, 0x42, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x09, 0x8c, 0x22, 0x40, 0xe3, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x47,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0x05, 0x8c, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0xaf, 0x82, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x44, 0x00, 0x2d, 0x5c, 0x1f, 0x80, 0x01, 0x00, 0x48, 0x00, 0x2d, 0xf0,</div><div class='add'>+	0x38, 0xb0, 0x01, 0x00, 0x4c, 0x00, 0x2d, 0xf0, 0x26, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x38, 0x00, 0x2f, 0xf2, 0x02, 0xb0, 0x01, 0x00, 0x24, 0x8c, 0x22, 0x01,</div><div class='add'>+	0x14, 0x6c, 0x00, 0x00, 0x17, 0x8c, 0x22, 0x46, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x46, 0x1f, 0x80, 0x01, 0x00, 0x20, 0x00, 0x2d, 0x03,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x16, 0x8c, 0x22, 0x40, 0xe3, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x44, 0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x13, 0x8c, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0xaf, 0x82, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x38, 0x00, 0x2f, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x94, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x38, 0x00, 0x2d, 0xf0, 0x96, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4c,</div><div class='add'>+	0xe1, 0xc1, 0x01, 0x00, 0x20, 0x00, 0x00, 0x03, 0x48, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x22, 0x4a, 0xf1, 0xb1, 0x01, 0x00, 0x44, 0x00, 0x00, 0x05,</div><div class='add'>+	0xf0, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4a, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4b, 0xe0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x47,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0xa0, 0x00, 0x00, 0xa4, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0x20, 0x8c, 0xa8, 0x5c, 0x1f, 0x10, 0x00, 0x00, 0x24, 0x8c, 0x00, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x38, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x2e, 0x8c, 0x22, 0x06, 0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50,</div><div class='add'>+	0x33, 0xc0, 0x01, 0x00, 0x2c, 0x8c, 0xa2, 0x02, 0x36, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x8f, 0x0d, 0x42, 0x31, 0x00, 0x00, 0x10, 0x00, 0x00, 0xf8,</div><div class='add'>+	0x10, 0xc8, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5c, 0x11, 0x80, 0x01, 0x00,</div><div class='add'>+	0xf0, 0x07, 0x00, 0x40, 0x37, 0x98, 0x01, 0x00, 0xe2, 0x8b, 0x00, 0xa1,</div><div class='add'>+	0x1a, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x10, 0xc0, 0x01, 0x00,</div><div class='add'>+	0xe2, 0x8b, 0x00, 0x02, 0x36, 0xd0, 0x00, 0x00, 0x50, 0x00, 0x20, 0x1c,</div><div class='add'>+	0xe0, 0xb1, 0x01, 0x00, 0x54, 0x00, 0x20, 0x13, 0xe0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x4e, 0x00, 0x20, 0x01, 0xe4, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x20, 0x0a,</div><div class='add'>+	0xe0, 0xb1, 0x01, 0x00, 0x38, 0x8c, 0x00, 0x5f, 0x01, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x37, 0x00, 0x2d, 0x46, 0x01, 0xb0, 0x01, 0x00, 0x04, 0x00, 0x00, 0xf3,</div><div class='add'>+	0x80, 0xf4, 0x01, 0x00, 0x37, 0x8c, 0xa0, 0x43, 0x81, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x55, 0x01, 0xb0, 0x01, 0x00, 0x40, 0x00, 0x20, 0x40,</div><div class='add'>+	0xe1, 0xb1, 0x01, 0x00, 0x00, 0x80, 0x00, 0x19, 0x42, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x3e, 0x8c, 0x22, 0x40, 0xe3, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x19, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0x3b, 0x8c, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0xaf, 0x82, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0xd3, 0x92, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x30, 0x80, 0x00, 0x10, 0x42, 0xc9, 0x01, 0x00, 0x45, 0x8c, 0x22, 0x40,</div><div class='add'>+	0xe3, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00, 0x42, 0x8c, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0xaf, 0x82, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x60, 0x01, 0x2f, 0x05, 0x48, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x0b,</div><div class='add'>+	0xe4, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x50, 0x17, 0xf0, 0x01, 0x00,</div><div class='add'>+	0x4a, 0x8c, 0x90, 0xf2, 0x16, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x17, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x66, 0x20, 0x17, 0xa4, 0x01, 0x00,</div><div class='add'>+	0x32, 0x00, 0x00, 0xa6, 0x2a, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf2,</div><div class='add'>+	0x2a, 0x94, 0x01, 0x00, 0x4d, 0x8c, 0x45, 0x48, 0x61, 0x31, 0x00, 0x00,</div><div class='add'>+	0x00, 0xd0, 0x00, 0x1e, 0x62, 0xdd, 0x01, 0x00, 0x52, 0x8c, 0x28, 0x40,</div><div class='add'>+	0x05, 0x30, 0x00, 0x00, 0x4e, 0x8c, 0x22, 0x48, 0x77, 0x7d, 0x00, 0x00,</div><div class='add'>+	0x55, 0x8c, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15,</div><div class='add'>+	0x62, 0xb1, 0x01, 0x00, 0x5e, 0x8c, 0x28, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x52, 0x8c, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x1d, 0x00,</div><div class='add'>+	0x92, 0xb0, 0x01, 0x00, 0x5b, 0x8c, 0x22, 0x41, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x80, 0x00, 0x03, 0x42, 0xc9, 0x01, 0x00, 0x99, 0x92, 0x00, 0xf8,</div><div class='add'>+	0x00, 0x30, 0x01, 0x00, 0x58, 0x8c, 0xa2, 0x41, 0x3b, 0x50, 0x00, 0x00,</div><div class='add'>+	0x5f, 0x8c, 0x00, 0x49, 0x00, 0xb0, 0x00, 0x00, 0xff, 0x07, 0x00, 0x1e,</div><div class='add'>+	0x00, 0x8c, 0x01, 0x00, 0x99, 0x92, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x5f, 0x8c, 0x00, 0x49, 0x00, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x1d, 0x47,</div><div class='add'>+	0x19, 0x80, 0x01, 0x00, 0x62, 0x8c, 0x22, 0x5f, 0x01, 0x6c, 0x00, 0x00,</div><div class='add'>+	0xd4, 0x95, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0xbf, 0x87, 0x00, 0x00,</div><div class='add'>+	0x80, 0xb0, 0x00, 0x00, 0x69, 0x8c, 0x22, 0x5c, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x20, 0x80, 0x00, 0x03, 0x42, 0xc9, 0x01, 0x00, 0x69, 0x8c, 0x22, 0x40,</div><div class='add'>+	0xe3, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x47, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00, 0x66, 0x8c, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0xaf, 0x82, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x69, 0x8c, 0x40, 0x05, 0x48, 0x31, 0x00, 0x00, 0xff, 0xff, 0x00, 0x07,</div><div class='add'>+	0x94, 0x89, 0x01, 0x00, 0x6f, 0x8c, 0x85, 0xca, 0x94, 0x30, 0x00, 0x00,</div><div class='add'>+	0xd4, 0x95, 0x18, 0x5c, 0x1f, 0x00, 0x01, 0x00, 0x0e, 0x00, 0x00, 0x0f,</div><div class='add'>+	0x1e, 0x8c, 0x01, 0x00, 0xe0, 0x86, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xf4, 0x94, 0x18, 0x00, 0x80, 0x30, 0x01, 0x00, 0xe4, 0x8a, 0x00, 0x47,</div><div class='add'>+	0x19, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x19, 0x80, 0x01, 0x00,</div><div class='add'>+	0xe4, 0x8a, 0x22, 0x47, 0x19, 0x7c, 0x00, 0x00, 0x94, 0x92, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x76, 0x8c, 0xa2, 0x08, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0xe4, 0x8a, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x89, 0x94, 0x00, 0x40,</div><div class='add'>+	0x0d, 0x30, 0x01, 0x00, 0x9c, 0x01, 0x00, 0x40, 0x45, 0x99, 0x01, 0x00,</div><div class='add'>+	0xff, 0xff, 0x00, 0x0b, 0x98, 0x88, 0x01, 0x00, 0x8b, 0x00, 0x2d, 0x50,</div><div class='add'>+	0x17, 0xf0, 0x01, 0x00, 0x7c, 0x8c, 0x90, 0x4c, 0x16, 0x40, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x17, 0xc0, 0x01, 0x00, 0x7e, 0x8c, 0x22, 0x43,</div><div class='add'>+	0xe7, 0x7d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x45, 0xc1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x66, 0x20, 0x17, 0xa4, 0x01, 0x00, 0x68, 0x01, 0x00, 0x40,</div><div class='add'>+	0x43, 0x99, 0x01, 0x00, 0x5c, 0x01, 0x2e, 0xf2, 0x80, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x02, 0x00, 0x62, 0x40, 0x7e, 0xcd, 0x01, 0x00, 0x00, 0x00, 0x00, 0x57,</div><div class='add'>+	0x81, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x2e, 0x10, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x03, 0x00, 0x00, 0x40, 0xf0, 0x8d, 0x01, 0x00, 0x00, 0x00, 0x00, 0x08,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x58, 0x01, 0x00, 0x05, 0xe0, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x44, 0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xb1, 0x01, 0x00, 0x88, 0x8c, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0xaf, 0x82, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x8c, 0x8c, 0x45, 0x48, 0x61, 0x31, 0x00, 0x00,</div><div class='add'>+	0x00, 0x50, 0x00, 0x08, 0x62, 0xdd, 0x01, 0x00, 0x92, 0x8c, 0x28, 0x40,</div><div class='add'>+	0x05, 0x30, 0x00, 0x00, 0x8d, 0x8c, 0x22, 0x48, 0x77, 0x7d, 0x00, 0x00,</div><div class='add'>+	0x99, 0x92, 0x1d, 0x08, 0x00, 0x30, 0x01, 0x00, 0xe4, 0x8a, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0xe4, 0x8a, 0x1d, 0x47, 0x19, 0x80, 0x00, 0x00,</div><div class='add'>+	0x35, 0x00, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00, 0x01, 0x00, 0x63, 0xf3,</div><div class='add'>+	0x84, 0xc8, 0x01, 0x00, 0x97, 0x8c, 0xa0, 0x43, 0x85, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x63, 0x40, 0x85, 0xb0, 0x01, 0x00, 0xa8, 0x00, 0x00, 0x40,</div><div class='add'>+	0x43, 0x99, 0x01, 0x00, 0x37, 0x00, 0x2f, 0xf0, 0x24, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x01, 0x00, 0x63, 0xf3, 0x82, 0xcc, 0x01, 0x00, 0xa2, 0x8c, 0xa2, 0x41,</div><div class='add'>+	0x9e, 0x06, 0x00, 0x00, 0xe4, 0x8a, 0x22, 0x44, 0x83, 0x70, 0x00, 0x00,</div><div class='add'>+	0x36, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00, 0x58, 0x00, 0x3d, 0x43,</div><div class='add'>+	0xe7, 0xe1, 0x01, 0x00, 0xe4, 0x8a, 0x1f, 0xf0, 0x24, 0x6c, 0x00, 0x00,</div><div class='add'>+	0xd4, 0x95, 0x00, 0x48, 0x81, 0x30, 0x01, 0x00, 0xbf, 0x87, 0x23, 0x41,</div><div class='add'>+	0x83, 0x6c, 0x00, 0x00, 0xbf, 0x87, 0x00, 0x47, 0x81, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x58, 0x00, 0x3d, 0x43, 0x85, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8,</div><div class='add'>+	0x36, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x28, 0x00, 0x00, 0x40, 0x83, 0x98, 0x01, 0x00, 0xc2, 0x94, 0x00, 0x47,</div><div class='add'>+	0x61, 0x31, 0x01, 0x00, 0xaf, 0x82, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x2d, 0x03, 0x48, 0xb1, 0x01, 0x00, 0x08, 0x00, 0x2d, 0xf0,</div><div class='add'>+	0x94, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x8e, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x90, 0x00, 0x2d, 0xf0, 0x14, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x93, 0x8b, 0xa2, 0x40, 0x8f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0xb0, 0x8c, 0x22, 0x47, 0x8f, 0x7c, 0x00, 0x00, 0x93, 0x8b, 0x00, 0x48,</div><div class='add'>+	0x19, 0x90, 0x00, 0x00, 0x1f, 0x8d, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x36, 0x00, 0x2d, 0x5d, 0x05, 0xb4, 0x01, 0x00, 0x37, 0x00, 0x2d, 0xf3,</div><div class='add'>+	0x80, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf3, 0x8e, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x5c, 0x00, 0x3d, 0x43, 0x81, 0xe0, 0x01, 0x00, 0xa8, 0x00, 0x2d, 0xf0,</div><div class='add'>+	0x94, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x24, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x20, 0x00, 0x00, 0x10, 0x86, 0xdc, 0x01, 0x00, 0x40, 0x80, 0x00, 0x03,</div><div class='add'>+	0x44, 0xc9, 0x01, 0x00, 0x9b, 0x91, 0x00, 0x4a, 0xf0, 0x31, 0x01, 0x00,</div><div class='add'>+	0x36, 0x00, 0x2f, 0x5c, 0x1f, 0x90, 0x01, 0x00, 0xbe, 0x8c, 0xa2, 0x50,</div><div class='add'>+	0x8f, 0x50, 0x00, 0x00, 0x34, 0x00, 0x20, 0x40, 0xe1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xe4, 0x8a, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x63, 0x41,</div><div class='add'>+	0x81, 0xc0, 0x01, 0x00, 0xc1, 0x8c, 0xa0, 0x43, 0x81, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x63, 0x40, 0x81, 0xb0, 0x01, 0x00, 0x37, 0x00, 0x20, 0x47,</div><div class='add'>+	0xe6, 0xb1, 0x01, 0x00, 0xe4, 0x8a, 0x22, 0x47, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x47, 0x0c, 0xf4, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4f,</div><div class='add'>+	0x8f, 0x84, 0x01, 0x00, 0xd6, 0x8c, 0x22, 0x47, 0x0c, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x58, 0x00, 0x3d, 0x43, 0x81, 0xe0, 0x01, 0x00, 0xd6, 0x8c, 0x1f, 0xf0,</div><div class='add'>+	0x24, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5c, 0x1f, 0x80, 0x01, 0x00,</div><div class='add'>+	0x00, 0x80, 0x00, 0x10, 0x42, 0xc9, 0x01, 0x00, 0xcf, 0x8c, 0x22, 0x40,</div><div class='add'>+	0xe3, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x45, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00, 0xcc, 0x8c, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0xaf, 0x82, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xcf, 0x8c, 0x42, 0x40, 0x05, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0x93, 0x93, 0x01, 0x00, 0x00, 0x00, 0x1a, 0x5d, 0x69, 0x93, 0x01, 0x00,</div><div class='add'>+	0xd4, 0x8c, 0x23, 0x41, 0x0d, 0x6c, 0x00, 0x00, 0xb1, 0x8c, 0x00, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x00, 0x00, 0xd4, 0x95, 0x00, 0x05, 0x48, 0x31, 0x01, 0x00,</div><div class='add'>+	0xbf, 0x87, 0x00, 0x48, 0x81, 0xb0, 0x00, 0x00, 0xe4, 0x8a, 0x22, 0x40,</div><div class='add'>+	0x8f, 0x6c, 0x00, 0x00, 0xf4, 0x94, 0x00, 0x5f, 0x81, 0x30, 0x01, 0x00,</div><div class='add'>+	0xe4, 0x8a, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xa2, 0x00, 0x00, 0x40,</div><div class='add'>+	0x43, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf3, 0x84, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xa6, 0x00, 0x2d, 0x49, 0x19, 0x90, 0x01, 0x00, 0x02, 0x00, 0x00, 0xf2,</div><div class='add'>+	0x80, 0xf4, 0x01, 0x00, 0xb8, 0x00, 0x2d, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf2, 0x80, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x82, 0xf8, 0x01, 0x00, 0x19, 0x00, 0x00, 0x40, 0x81, 0x98, 0x01, 0x00,</div><div class='add'>+	0xe5, 0x8c, 0xa0, 0x40, 0x82, 0x6c, 0x00, 0x00, 0x2c, 0x01, 0x00, 0x40,</div><div class='add'>+	0x81, 0x98, 0x01, 0x00, 0xe5, 0x8c, 0xa3, 0x40, 0x82, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x80, 0xb0, 0x01, 0x00, 0xe7, 0x8c, 0x20, 0x4c,</div><div class='add'>+	0x85, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x85, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x86, 0x00, 0x20, 0x40, 0xe4, 0xb1, 0x01, 0x00, 0xa2, 0x00, 0x20, 0x42,</div><div class='add'>+	0xe6, 0xb1, 0x01, 0x00, 0xe4, 0x8a, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x83, 0x94, 0x00, 0x50, 0x81, 0x30, 0x01, 0x00, 0xe4, 0x8a, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x80, 0x00, 0x03, 0x42, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x22, 0xf0, 0x80, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x8d, 0xb0, 0x01, 0x00, 0xc6, 0x95, 0x00, 0x40, 0x87, 0x30, 0x01, 0x00,</div><div class='add'>+	0xb0, 0x00, 0x2f, 0x5c, 0x1f, 0x90, 0x01, 0x00, 0x00, 0x00, 0x60, 0xf0,</div><div class='add'>+	0x80, 0xc0, 0x01, 0x00, 0xf4, 0x94, 0x00, 0x5f, 0x81, 0x30, 0x01, 0x00,</div><div class='add'>+	0xe4, 0x8a, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0xe4, 0x8a, 0x22, 0x46, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0xa0, 0x00, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00, 0x01, 0x00, 0x62, 0xf2,</div><div class='add'>+	0x96, 0xcc, 0x01, 0x00, 0xe4, 0x8a, 0xa6, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0xf4, 0x94, 0x00, 0x4a, 0x81, 0x30, 0x01, 0x00, 0xc9, 0x94, 0x00, 0x46,</div><div class='add'>+	0x95, 0x30, 0x01, 0x00, 0xe4, 0x8a, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xe4, 0x8a, 0x22, 0x49, 0x19, 0x7c, 0x00, 0x00, 0x86, 0x00, 0x00, 0x40,</div><div class='add'>+	0x47, 0x99, 0x01, 0x00, 0x01, 0x00, 0x62, 0xf2, 0x80, 0xcc, 0x01, 0x00,</div><div class='add'>+	0xe4, 0x8a, 0xa6, 0x40, 0x81, 0x32, 0x00, 0x00, 0xf4, 0x94, 0x00, 0x4a,</div><div class='add'>+	0x81, 0x30, 0x01, 0x00, 0xc9, 0x94, 0x00, 0x47, 0x95, 0x30, 0x01, 0x00,</div><div class='add'>+	0xe4, 0x8a, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x2c, 0x92, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0xe4, 0x8a, 0x00, 0x5c, 0x1f, 0x90, 0x00, 0x00,</div><div class='add'>+	0xe4, 0x8a, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xe4, 0x8a, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0xba, 0x00, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00,</div><div class='add'>+	0x01, 0x00, 0x62, 0xf2, 0x80, 0xc8, 0x01, 0x00, 0x0b, 0x8d, 0x90, 0x40,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0xff, 0xff, 0x62, 0x40, 0x81, 0x98, 0x01, 0x00,</div><div class='add'>+	0xa4, 0x00, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00, 0xe4, 0x8a, 0x22, 0x40,</div><div class='add'>+	0xe5, 0x6d, 0x00, 0x00, 0xe4, 0x8a, 0x00, 0x41, 0xe5, 0xc1, 0x00, 0x00,</div><div class='add'>+	0x83, 0x94, 0x00, 0x4d, 0x81, 0x30, 0x01, 0x00, 0xe4, 0x8a, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x5c, 0x00, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x22, 0xf0, 0x96, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0xe1, 0xb1, 0x01, 0x00, 0x00, 0x80, 0x00, 0x03, 0x44, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4b, 0xe0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x8d, 0xb0, 0x01, 0x00, 0xc6, 0x95, 0x00, 0x40, 0x87, 0x30, 0x01, 0x00,</div><div class='add'>+	0x8b, 0x00, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00, 0x1b, 0x8d, 0x80, 0xf3,</div><div class='add'>+	0x96, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xe7, 0x81, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x47, 0x19, 0x90, 0x01, 0x00, 0xe4, 0x8a, 0x00, 0x5c,</div><div class='add'>+	0x1f, 0x90, 0x00, 0x00, 0x34, 0x00, 0x00, 0x40, 0x45, 0x99, 0x01, 0x00,</div><div class='add'>+	0x01, 0x00, 0x00, 0x40, 0xf5, 0x99, 0x01, 0x00, 0x00, 0x11, 0x00, 0x40,</div><div class='add'>+	0xe5, 0x99, 0x01, 0x00, 0x94, 0x92, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x30, 0x8d, 0xa2, 0x08, 0x80, 0x32, 0x00, 0x00, 0x37, 0x00, 0x00, 0x40,</div><div class='add'>+	0x47, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf3, 0x82, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x63, 0x51, 0x83, 0xd0, 0x01, 0x00, 0x34, 0x00, 0x00, 0x40,</div><div class='add'>+	0x47, 0x99, 0x01, 0x00, 0x01, 0x00, 0x63, 0xf3, 0x84, 0xcc, 0x01, 0x00,</div><div class='add'>+	0x28, 0x8d, 0x9f, 0x42, 0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x63, 0x42,</div><div class='add'>+	0x85, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x45, 0x03, 0xf0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x01, 0x00, 0xc0, 0x01, 0x00, 0x2a, 0x8d, 0x37, 0x5c,</div><div class='add'>+	0x61, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1b, 0x62, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x2b, 0x8d, 0xa8, 0x4b, 0x19, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+	0x62, 0xb1, 0x01, 0x00, 0x2d, 0x8d, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x14, 0x87, 0x17, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x80, 0x00, 0x03,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0x90, 0x00, 0x2d, 0xf0, 0x94, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xac, 0x00, 0x2d, 0xf0, 0x30, 0xb0, 0x01, 0x00, 0x35, 0x00, 0x2d, 0xf0,</div><div class='add'>+	0x28, 0xb0, 0x01, 0x00, 0x58, 0x00, 0x3e, 0x43, 0xe7, 0xe1, 0x01, 0x00,</div><div class='add'>+	0x01, 0x00, 0x00, 0x18, 0xf0, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4a,</div><div class='add'>+	0xe0, 0xb1, 0x01, 0x00, 0x38, 0x00, 0x20, 0x00, 0xe0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x3c, 0x00, 0x20, 0x1b, 0xe0, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x20, 0x40,</div><div class='add'>+	0xe1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x2b, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xd8, 0x94, 0x00, 0x40, 0x0d, 0x30, 0x01, 0x00, 0x00, 0x00, 0x00, 0x18,</div><div class='add'>+	0x16, 0xc0, 0x01, 0x00, 0x3f, 0x8d, 0xa0, 0x14, 0x16, 0x44, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x17, 0xc0, 0x01, 0x00, 0x0e, 0x00, 0x00, 0xa2,</div><div class='add'>+	0x44, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x18, 0xf8, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xb0, 0x00, 0x2d, 0x14, 0xf8, 0xb1, 0x01, 0x00, 0x10, 0x50, 0x00, 0x40,</div><div class='add'>+	0x87, 0x98, 0x01, 0x00, 0x48, 0x8d, 0x22, 0x4a, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x30, 0x00, 0x43, 0x86, 0xc8, 0x01, 0x00, 0x00, 0x30, 0x00, 0x0b,</div><div class='add'>+	0x16, 0xc8, 0x01, 0x00, 0x48, 0x8d, 0xa4, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x17, 0xc0, 0x01, 0x00, 0x01, 0x00, 0x6e, 0x43,</div><div class='add'>+	0x86, 0x98, 0x01, 0x00, 0x0f, 0x95, 0x00, 0x30, 0x81, 0x30, 0x01, 0x00,</div><div class='add'>+	0x4c, 0x8d, 0xa0, 0x41, 0x17, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x17, 0xc0, 0x01, 0x00, 0x53, 0x8d, 0x22, 0x4a, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x08, 0x00, 0x00, 0xa2, 0x44, 0xc9, 0x01, 0x00, 0xcc, 0x00, 0x2d, 0xab,</div><div class='add'>+	0xf9, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xab, 0x17, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x52, 0x8d, 0xa0, 0xf0, 0x16, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x17, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x64, 0xf0, 0x82, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x90, 0x00, 0x00, 0x40, 0x45, 0x99, 0x01, 0x00, 0x00, 0x00, 0x60, 0x41,</div><div class='add'>+	0x31, 0xc0, 0x01, 0x00, 0xbc, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00,</div><div class='add'>+	0x59, 0x8d, 0x06, 0x0c, 0x80, 0x32, 0x00, 0x00, 0xa0, 0x00, 0x20, 0xf2,</div><div class='add'>+	0xe4, 0xb1, 0x01, 0x00, 0x04, 0x00, 0x09, 0x46, 0x19, 0x10, 0x00, 0x00,</div><div class='add'>+	0x9c, 0x01, 0x00, 0x40, 0x45, 0x99, 0x01, 0x00, 0xff, 0xff, 0x00, 0x0b,</div><div class='add'>+	0x98, 0x88, 0x01, 0x00, 0x8b, 0x00, 0x2d, 0x50, 0x17, 0xf0, 0x01, 0x00,</div><div class='add'>+	0x5e, 0x8d, 0x90, 0x4c, 0x16, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x17, 0xc0, 0x01, 0x00, 0x60, 0x8d, 0x22, 0x43, 0xe7, 0x7d, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x44, 0x45, 0xc1, 0x01, 0x00, 0x00, 0x00, 0x66, 0x20,</div><div class='add'>+	0x17, 0xa4, 0x01, 0x00, 0x68, 0x01, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00,</div><div class='add'>+	0x5c, 0x01, 0x2e, 0xf2, 0x80, 0xb0, 0x01, 0x00, 0x02, 0x00, 0x62, 0x40,</div><div class='add'>+	0x7e, 0xcd, 0x01, 0x00, 0x00, 0x00, 0x00, 0x57, 0x81, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x2e, 0x10, 0x48, 0xb1, 0x01, 0x00, 0x03, 0x00, 0x00, 0x40,</div><div class='add'>+	0xf0, 0x8d, 0x01, 0x00, 0x00, 0x00, 0x00, 0x08, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x58, 0x01, 0x00, 0x05, 0xe0, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x10, 0x62, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x6a, 0x8d, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0xaf, 0x82, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x6e, 0x8d, 0x45, 0x48, 0x61, 0x31, 0x00, 0x00, 0x00, 0x50, 0x00, 0x08,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x6f, 0x8d, 0xa8, 0x40, 0x05, 0x30, 0x00, 0x00,</div><div class='add'>+	0x35, 0x00, 0x1d, 0x40, 0x47, 0x99, 0x01, 0x00, 0x01, 0x00, 0x63, 0xf3,</div><div class='add'>+	0x84, 0xc8, 0x01, 0x00, 0x75, 0x8d, 0xa0, 0x43, 0x85, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x63, 0x40, 0x85, 0xb0, 0x01, 0x00, 0x37, 0x00, 0x00, 0x40,</div><div class='add'>+	0x47, 0x99, 0x01, 0x00, 0x01, 0x00, 0x63, 0xf3, 0x82, 0xcc, 0x01, 0x00,</div><div class='add'>+	0x8b, 0x00, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x45,</div><div class='add'>+	0xe7, 0x91, 0x01, 0x00, 0xf4, 0x94, 0x00, 0x5f, 0x81, 0x30, 0x01, 0x00,</div><div class='add'>+	0xe4, 0x8a, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x37, 0x00, 0x00, 0x40,</div><div class='add'>+	0x47, 0x99, 0x01, 0x00, 0x36, 0x93, 0x00, 0xf3, 0x94, 0x30, 0x01, 0x00,</div><div class='add'>+	0x1f, 0x8d, 0x22, 0x4a, 0x80, 0x32, 0x00, 0x00, 0xba, 0x8b, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x37, 0x00, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00,</div><div class='add'>+	0x36, 0x93, 0x00, 0xf3, 0x94, 0x30, 0x01, 0x00, 0x8a, 0x8b, 0x22, 0x4a,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0xba, 0x8b, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x36, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0xfb,</div><div class='add'>+	0x12, 0xb0, 0x01, 0x00, 0x0f, 0x00, 0x00, 0xf3, 0x90, 0x88, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0xf3, 0x0c, 0xf4, 0x01, 0x00, 0xb4, 0x8b, 0x22, 0x06,</div><div class='add'>+	0x90, 0x6c, 0x00, 0x00, 0x5c, 0x00, 0x3d, 0x43, 0x13, 0xe0, 0x01, 0x00,</div><div class='add'>+	0xa8, 0x00, 0x2d, 0xf0, 0x94, 0xb0, 0x01, 0x00, 0x37, 0x00, 0x2f, 0xf0,</div><div class='add'>+	0x24, 0xb0, 0x01, 0x00, 0x36, 0x00, 0x2a, 0x50, 0xe7, 0xd1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x63, 0x41, 0x13, 0xc0, 0x01, 0x00, 0x8f, 0x8d, 0xa0, 0x43,</div><div class='add'>+	0x13, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xe7, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x99, 0x91, 0x00, 0x10, 0x86, 0x30, 0x01, 0x00, 0xaf, 0x82, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x91, 0x8d, 0x42, 0x05, 0x48, 0x31, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x44, 0x93, 0x93, 0x01, 0x00, 0xb4, 0x8b, 0x1a, 0x5d,</div><div class='add'>+	0x69, 0x93, 0x00, 0x00, 0x36, 0x00, 0x2d, 0x10, 0x86, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x5c, 0x00, 0x3d, 0x43, 0xe7, 0xe1, 0x01, 0x00, 0xa8, 0x00, 0x2d, 0xf0,</div><div class='add'>+	0x94, 0xb0, 0x01, 0x00, 0x35, 0x00, 0x2f, 0xf0, 0x24, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x01, 0x00, 0x6b, 0xfb, 0x84, 0xc8, 0x01, 0x00, 0x9c, 0x8d, 0xa0, 0x43,</div><div class='add'>+	0x85, 0x6c, 0x00, 0x00, 0x35, 0x00, 0x20, 0x40, 0xe7, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x01, 0x00, 0x63, 0xf3,</div><div class='add'>+	0x12, 0xc8, 0x01, 0x00, 0x9f, 0x8d, 0xa0, 0x43, 0x13, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0xe7, 0xb1, 0x01, 0x00, 0x40, 0x80, 0x00, 0x03,</div><div class='add'>+	0x44, 0xc9, 0x01, 0x00, 0x9b, 0x91, 0x00, 0x4a, 0xf0, 0x31, 0x01, 0x00,</div><div class='add'>+	0xaf, 0x82, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0xa2, 0x8d, 0x42, 0x05,</div><div class='add'>+	0x48, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x93, 0x93, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x1a, 0x5d, 0x69, 0x93, 0x01, 0x00, 0x37, 0x00, 0x00, 0x40,</div><div class='add'>+	0x47, 0x99, 0x01, 0x00, 0x11, 0x00, 0x63, 0xf3, 0x82, 0xcc, 0x01, 0x00,</div><div class='add'>+	0x9b, 0x8c, 0x22, 0x41, 0x9e, 0x06, 0x00, 0x00, 0x35, 0x00, 0x00, 0x40,</div><div class='add'>+	0x43, 0x99, 0x01, 0x00, 0x58, 0x00, 0x3d, 0x43, 0xe7, 0xe1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf8, 0x36, 0xb0, 0x01, 0x00, 0xa5, 0x8c, 0x00, 0xf0,</div><div class='add'>+	0x00, 0xb0, 0x00, 0x00, 0x5e, 0x01, 0x2d, 0x05, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xad, 0x8d, 0x65, 0xf2, 0x12, 0x30, 0x00, 0x00, 0x00, 0x99, 0x3f, 0x42,</div><div class='add'>+	0x13, 0xf0, 0x01, 0x00, 0xb2, 0x8d, 0x22, 0x47, 0xe7, 0x7d, 0x00, 0x00,</div><div class='add'>+	0xf5, 0x82, 0x75, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0xac, 0x8d, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x47, 0xe7, 0x91, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x75, 0x42, 0x19, 0x90, 0x01, 0x00, 0x75, 0x00, 0x00, 0x40,</div><div class='add'>+	0x61, 0x99, 0x01, 0x00, 0xb4, 0x8d, 0xa8, 0xb1, 0x0c, 0x30, 0x00, 0x00,</div><div class='add'>+	0x1f, 0x94, 0x00, 0x10, 0x94, 0x30, 0x01, 0x00, 0xaf, 0x82, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x5e, 0x01, 0x2e, 0x05, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xc0, 0xa8, 0x3d, 0x46, 0x0d, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x97, 0xb0, 0x01, 0x00, 0xbe, 0x8d, 0x22, 0x40, 0xe1, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x02, 0x41, 0x97, 0x40, 0x00, 0x00, 0xbb, 0x8d, 0x00, 0x50,</div><div class='add'>+	0x43, 0xc1, 0x00, 0x00, 0xca, 0x8d, 0x22, 0x4b, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x62, 0x4b, 0x12, 0x94, 0x01, 0x00, 0x09, 0x00, 0x00, 0x07,</div><div class='add'>+	0x96, 0xe4, 0x01, 0x00, 0x00, 0x00, 0x00, 0xa7, 0x97, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x30, 0x00, 0x00, 0x10, 0x94, 0xc8, 0x01, 0x00, 0x00, 0x80, 0x00, 0x4a,</div><div class='add'>+	0x44, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x42, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x5e, 0x01, 0x00, 0x4b, 0xf0, 0xc9, 0x01, 0x00, 0x5e, 0x01, 0x00, 0x05,</div><div class='add'>+	0xe0, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x20, 0x00, 0x00, 0x4a, 0x62, 0xdd, 0x01, 0x00, 0xc8, 0x8d, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x80, 0x00, 0x10, 0x44, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x50, 0xf1, 0xb1, 0x01, 0x00, 0x04, 0x00, 0x00, 0x09,</div><div class='add'>+	0x96, 0xe4, 0x01, 0x00, 0x00, 0x00, 0x68, 0xa8, 0x97, 0xc0, 0x01, 0x00,</div><div class='add'>+	0xd4, 0x00, 0x00, 0x05, 0xe0, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x10, 0x62, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xd0, 0x8d, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0xaf, 0x82, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x00, 0x99, 0x3f, 0x42, 0x13, 0xf0, 0x01, 0x00,</div><div class='add'>+	0xd4, 0x8d, 0x65, 0x40, 0x81, 0x32, 0x00, 0x00, 0x3f, 0x00, 0x00, 0xf3,</div><div class='add'>+	0x96, 0x88, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0xe7, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x75, 0x55, 0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x06,</div><div class='add'>+	0x62, 0xb1, 0x01, 0x00, 0xd8, 0x8d, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0xdd, 0x8d, 0x22, 0x4b, 0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4b,</div><div class='add'>+	0x62, 0xb1, 0x01, 0x00, 0xdb, 0x8d, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x97, 0x13, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x96,</div><div class='add'>+	0x97, 0xb0, 0x01, 0x00, 0xe3, 0x8d, 0x20, 0x09, 0x96, 0x6c, 0x00, 0x00,</div><div class='add'>+	0xe3, 0x8d, 0x1f, 0x09, 0x96, 0x24, 0x00, 0x00, 0xf5, 0x82, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0xde, 0x8d, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x83, 0x94, 0x00, 0x57, 0x81, 0x30, 0x01, 0x00, 0xcf, 0x8a, 0x00, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x00, 0x00, 0x2e, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00,</div><div class='add'>+	0xe9, 0x8d, 0x22, 0xf3, 0x80, 0x32, 0x00, 0x00, 0x83, 0x94, 0x00, 0x42,</div><div class='add'>+	0x81, 0x30, 0x01, 0x00, 0x14, 0x87, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xf4, 0x94, 0x00, 0x52, 0x81, 0x30, 0x01, 0x00, 0xcf, 0x8a, 0x00, 0x42,</div><div class='add'>+	0x19, 0x80, 0x00, 0x00, 0x83, 0x94, 0x00, 0x3a, 0x81, 0x30, 0x01, 0x00,</div><div class='add'>+	0xf4, 0x94, 0x00, 0x52, 0x81, 0x30, 0x01, 0x00, 0xcf, 0x8a, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x05, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x96, 0x93, 0x00, 0x40, 0x95, 0x30, 0x01, 0x00, 0xcf, 0x8a, 0x22, 0x40,</div><div class='add'>+	0x95, 0x6c, 0x00, 0x00, 0xf4, 0x8d, 0xa2, 0x40, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x99, 0x92, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x14, 0x87, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x80, 0x00, 0x03, 0x42, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf2, 0x02, 0xb0, 0x01, 0x00, 0x41, 0x93, 0x00, 0x52,</div><div class='add'>+	0x95, 0x30, 0x01, 0x00, 0x48, 0x93, 0x00, 0x4b, 0x02, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x14, 0x87, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x7d, 0x95, 0x00, 0x40,</div><div class='add'>+	0x95, 0x30, 0x01, 0x00, 0xff, 0x8d, 0xa2, 0x08, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x14, 0x87, 0x22, 0x42, 0x19, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4b,</div><div class='add'>+	0x19, 0x90, 0x01, 0x00, 0x83, 0x94, 0x00, 0x3a, 0x81, 0x30, 0x01, 0x00,</div><div class='add'>+	0x14, 0x87, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x23, 0x00, 0xa6,</div><div class='add'>+	0x16, 0xb0, 0x01, 0x00, 0x02, 0x8e, 0x83, 0x1e, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x08, 0x00, 0x0b, 0x16, 0xdc, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+	0x2a, 0xc0, 0x01, 0x00, 0xcc, 0x94, 0x00, 0x08, 0x80, 0x30, 0x01, 0x00,</div><div class='add'>+	0x06, 0x8e, 0x00, 0x5e, 0x17, 0x90, 0x00, 0x00, 0xed, 0x94, 0x00, 0x43,</div><div class='add'>+	0x61, 0x31, 0x01, 0x00, 0xa7, 0x91, 0x00, 0x40, 0x8d, 0x30, 0x01, 0x00,</div><div class='add'>+	0xd4, 0x94, 0x00, 0x07, 0x16, 0x14, 0x01, 0x00, 0x00, 0x80, 0x00, 0x10,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0x0e, 0x8e, 0x22, 0x40, 0xe3, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x43, 0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x0b, 0x8e, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0xaf, 0x82, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x75, 0x94, 0x00, 0x5e,</div><div class='add'>+	0x05, 0x10, 0x01, 0x00, 0x99, 0x92, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x12, 0x8e, 0x22, 0x09, 0x80, 0x30, 0x00, 0x00, 0xf4, 0x94, 0x00, 0x40,</div><div class='add'>+	0x13, 0x30, 0x01, 0x00, 0xd4, 0x8a, 0x00, 0x05, 0x48, 0xb1, 0x00, 0x00,</div><div class='add'>+	0xc6, 0x93, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0xcf, 0x8a, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4a, 0x1f, 0x90, 0x01, 0x00,</div><div class='add'>+	0x19, 0x8e, 0x22, 0x43, 0x3d, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0x19, 0x90, 0x01, 0x00, 0x00, 0x00, 0x00, 0x43, 0x3d, 0x80, 0x01, 0x00,</div><div class='add'>+	0x1a, 0x8e, 0x00, 0x42, 0x19, 0x90, 0x00, 0x00, 0x14, 0x00, 0x2d, 0x45,</div><div class='add'>+	0x1f, 0x90, 0x01, 0x00, 0x75, 0x8e, 0x83, 0x1e, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x75, 0x8e, 0x00, 0x44, 0x19, 0x90, 0x00, 0x00, 0x8c, 0x92, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x2d, 0x8e, 0xa2, 0x08, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x29, 0x8e, 0xa2, 0x42, 0x19, 0x7c, 0x00, 0x00, 0x00, 0x82, 0x00, 0x02,</div><div class='add'>+	0x04, 0xdc, 0x01, 0x00, 0xa0, 0x98, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00,</div><div class='add'>+	0x30, 0x05, 0x00, 0x41, 0x89, 0x30, 0x01, 0x00, 0x26, 0x8e, 0xa2, 0x41,</div><div class='add'>+	0x19, 0x7c, 0x00, 0x00, 0x99, 0x92, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x14, 0x87, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x41, 0x93, 0x00, 0x15,</div><div class='add'>+	0x94, 0x30, 0x01, 0x00, 0x48, 0x93, 0x00, 0x4b, 0x02, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x14, 0x87, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xc6, 0x93, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4b, 0x19, 0x90, 0x01, 0x00,</div><div class='add'>+	0x83, 0x94, 0x00, 0x3a, 0x81, 0x30, 0x01, 0x00, 0x14, 0x87, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x30, 0x8e, 0x22, 0x42, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0xc6, 0x93, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x31, 0x8e, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x96, 0x93, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x5d, 0x8e, 0x22, 0x41, 0x19, 0x7c, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x15,</div><div class='add'>+	0x98, 0xc8, 0x01, 0x00, 0x5d, 0x8e, 0xa0, 0x0b, 0x99, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x30, 0x00, 0x00, 0x10, 0x80, 0xc8, 0x01, 0x00, 0x00, 0x80, 0x00, 0x40,</div><div class='add'>+	0x44, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x50, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x03, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x42,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x62, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x39, 0x8e, 0xa8, 0x00, 0xe0, 0x31, 0x00, 0x00, 0xaf, 0x82, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xc0, 0x00, 0x00, 0x15, 0x98, 0xc8, 0x01, 0x00, 0x30, 0x00, 0x2e, 0x0b,</div><div class='add'>+	0x99, 0xd0, 0x01, 0x00, 0x00, 0x00, 0x6a, 0x50, 0x99, 0xc0, 0x01, 0x00,</div><div class='add'>+	0xc0, 0x00, 0x62, 0x01, 0x80, 0xcc, 0x01, 0x00, 0x0c, 0x80, 0x00, 0x03,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0x2d, 0x00, 0x2d, 0xf0, 0x22, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4c, 0x80, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5c,</div><div class='add'>+	0x23, 0x80, 0x01, 0x00, 0xd4, 0x00, 0x3f, 0x41, 0xe7, 0xe1, 0x01, 0x00,</div><div class='add'>+	0x0b, 0x00, 0x00, 0x11, 0xe4, 0xf5, 0x01, 0x00, 0x2f, 0x00, 0x20, 0x47,</div><div class='add'>+	0xe7, 0xb5, 0x01, 0x00, 0x4a, 0x8e, 0x23, 0x0b, 0x81, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4f, 0xe5, 0x91, 0x01, 0x00, 0x00, 0x00, 0x00, 0x08,</div><div class='add'>+	0x80, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x0b, 0x03, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x15, 0x02, 0xd0, 0x01, 0x00, 0xcc, 0x94, 0x00, 0x00,</div><div class='add'>+	0x2a, 0x40, 0x01, 0x00, 0x00, 0x00, 0x00, 0x43, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00, 0x4f, 0x8e, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0xaf, 0x82, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x99, 0x92, 0x00, 0x05, 0x48, 0x31, 0x01, 0x00, 0xc0, 0x00, 0x00, 0x01,</div><div class='add'>+	0x80, 0xce, 0x01, 0x00, 0x5b, 0x8e, 0x26, 0x11, 0x00, 0x30, 0x00, 0x00,</div><div class='add'>+	0x10, 0x00, 0x00, 0x00, 0x2a, 0xc8, 0x01, 0x00, 0x00, 0x00, 0x00, 0x08,</div><div class='add'>+	0x80, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x80, 0xc0, 0x01, 0x00,</div><div class='add'>+	0xc0, 0x00, 0x00, 0x40, 0x99, 0x98, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01,</div><div class='add'>+	0x98, 0xd0, 0x01, 0x00, 0xcc, 0x94, 0x00, 0x4c, 0x02, 0x30, 0x01, 0x00,</div><div class='add'>+	0xc0, 0x00, 0x00, 0x40, 0x03, 0x98, 0x01, 0x00, 0x62, 0x8e, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x30, 0x00, 0x2f, 0x08, 0x80, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xc0, 0x00, 0x00, 0x15, 0xf4, 0xc9, 0x01, 0x00, 0xc0, 0x00, 0x00, 0x01,</div><div class='add'>+	0xe4, 0xcd, 0x01, 0x00, 0xc0, 0x00, 0x00, 0x40, 0x03, 0x98, 0x01, 0x00,</div><div class='add'>+	0xcc, 0x94, 0x00, 0x00, 0x2a, 0x40, 0x01, 0x00, 0x67, 0x8e, 0x22, 0x44,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0xac, 0x00, 0x2f, 0x40, 0x13, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x01, 0xe0, 0xc1, 0x01, 0x00, 0xb0, 0x00, 0x00, 0x40,</div><div class='add'>+	0x47, 0x99, 0x01, 0x00, 0x68, 0x8e, 0x00, 0x01, 0xe0, 0xd1, 0x00, 0x00,</div><div class='add'>+	0xa7, 0x91, 0x00, 0x40, 0x8d, 0x30, 0x01, 0x00, 0x80, 0x63, 0x00, 0xa6,</div><div class='add'>+	0x16, 0xb0, 0x01, 0x00, 0xd4, 0x94, 0x00, 0x07, 0x16, 0x14, 0x01, 0x00,</div><div class='add'>+	0x00, 0x80, 0x00, 0x10, 0x42, 0xc9, 0x01, 0x00, 0x70, 0x8e, 0x22, 0x40,</div><div class='add'>+	0xe3, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00, 0x6d, 0x8e, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0xaf, 0x82, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x75, 0x94, 0x00, 0x5e, 0x05, 0x10, 0x01, 0x00, 0x73, 0x8e, 0x22, 0x09,</div><div class='add'>+	0x80, 0x30, 0x00, 0x00, 0xf4, 0x94, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0xcf, 0x8a, 0x00, 0x05, 0x48, 0xb1, 0x00, 0x00, 0x75, 0x8e, 0x00, 0x4a,</div><div class='add'>+	0x1f, 0x90, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x24, 0x00, 0x2d, 0x15, 0x10, 0xc0, 0x01, 0x00, 0x28, 0x00, 0x2d, 0xf0,</div><div class='add'>+	0x16, 0xb0, 0x01, 0x00, 0x22, 0x00, 0x2d, 0xf0, 0x26, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x14, 0x00, 0x2f, 0xf2, 0x0c, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01,</div><div class='add'>+	0xe0, 0xd1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x10, 0x32, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x0b, 0x1b, 0xb0, 0x01, 0x00, 0x04, 0x00, 0x1f, 0x15,</div><div class='add'>+	0x1a, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x23, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x01, 0x2a, 0xb0, 0x01, 0x00, 0x34, 0x94, 0x00, 0x40,</div><div class='add'>+	0x35, 0xb0, 0x00, 0x00, 0x2f, 0x00, 0x20, 0x40, 0xe7, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xb9, 0x8e, 0xa2, 0x45, 0x1f, 0x7c, 0x00, 0x00, 0x24, 0x00, 0x20, 0x0b,</div><div class='add'>+	0xe0, 0xb1, 0x01, 0x00, 0x28, 0x00, 0x20, 0x13, 0xe0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x22, 0x00, 0x20, 0x06, 0xe4, 0xb1, 0x01, 0x00, 0x8f, 0x8e, 0x22, 0x5c,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5c, 0x1f, 0x80, 0x01, 0x00,</div><div class='add'>+	0x30, 0x80, 0x00, 0x10, 0x42, 0xc9, 0x01, 0x00, 0x8f, 0x8e, 0x22, 0x40,</div><div class='add'>+	0xe3, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x47, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00, 0x8b, 0x8e, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0xaf, 0x82, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x05, 0x48, 0xb1, 0x01, 0x00, 0x00, 0x80, 0x00, 0x19,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0xb2, 0x8e, 0x22, 0x40, 0xe3, 0x6d, 0x00, 0x00,</div><div class='add'>+	0xa0, 0x8e, 0x22, 0x42, 0x19, 0x7c, 0x00, 0x00, 0xee, 0x93, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x41, 0x92, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0xad, 0x8e, 0x22, 0x4b, 0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0x96, 0x8e, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0xaf, 0x82, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x9c, 0x8e, 0x22, 0x41, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0xaf, 0x92, 0x00, 0x40, 0x11, 0x30, 0x01, 0x00, 0x9d, 0x8e, 0x00, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x00, 0x00, 0x99, 0x92, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x9f, 0x8e, 0x22, 0x09, 0x80, 0x30, 0x00, 0x00, 0xf4, 0x94, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0xf9, 0x82, 0x00, 0x40, 0x05, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xee, 0x93, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x3d, 0x92, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0x43, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00, 0xa3, 0x8e, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0xaf, 0x82, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xa9, 0x8e, 0x22, 0x41, 0x19, 0x7c, 0x00, 0x00, 0xaf, 0x92, 0x00, 0x40,</div><div class='add'>+	0x11, 0x30, 0x01, 0x00, 0xaa, 0x8e, 0x00, 0x05, 0x48, 0xb1, 0x00, 0x00,</div><div class='add'>+	0x99, 0x92, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0xac, 0x8e, 0x22, 0x09,</div><div class='add'>+	0x80, 0x30, 0x00, 0x00, 0xf4, 0x94, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0xf9, 0x82, 0x00, 0x40, 0x05, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0xae, 0x8e, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0xaf, 0x82, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xb5, 0x8e, 0x22, 0x41, 0x19, 0x7c, 0x00, 0x00, 0xaf, 0x92, 0x00, 0x40,</div><div class='add'>+	0x11, 0x30, 0x01, 0x00, 0xb6, 0x8e, 0x00, 0x05, 0x48, 0xb1, 0x00, 0x00,</div><div class='add'>+	0x99, 0x92, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0xb8, 0x8e, 0x22, 0x09,</div><div class='add'>+	0x80, 0x30, 0x00, 0x00, 0xf4, 0x94, 0x00, 0x40, 0x13, 0x30, 0x01, 0x00,</div><div class='add'>+	0xd4, 0x8a, 0x00, 0x40, 0x05, 0xb0, 0x00, 0x00, 0x00, 0x80, 0x00, 0x19,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0xc0, 0x8e, 0x22, 0x40, 0xe3, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x43, 0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0xbc, 0x8e, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0xaf, 0x82, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x05, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xc4, 0x8e, 0x22, 0x41, 0x19, 0x7c, 0x00, 0x00, 0xaf, 0x92, 0x00, 0x40,</div><div class='add'>+	0x11, 0x30, 0x01, 0x00, 0xc5, 0x8e, 0x00, 0x05, 0x48, 0xb1, 0x00, 0x00,</div><div class='add'>+	0x99, 0x92, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x08, 0x00, 0x2d, 0x0a,</div><div class='add'>+	0x84, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x82, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x14, 0x00, 0x20, 0x40, 0xe1, 0xb1, 0x01, 0x00, 0xca, 0x8e, 0x03, 0x1e,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0xcb, 0x8e, 0x00, 0x41, 0x87, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x21, 0x00, 0x00, 0x40, 0x87, 0x98, 0x01, 0x00, 0xb7, 0x93, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5c, 0x1f, 0x90, 0x01, 0x00,</div><div class='add'>+	0xcf, 0x8e, 0x22, 0x09, 0x80, 0x30, 0x00, 0x00, 0xf4, 0x94, 0x00, 0x40,</div><div class='add'>+	0x13, 0x30, 0x01, 0x00, 0xd2, 0x8e, 0x22, 0x44, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0xf4, 0x94, 0x00, 0x4f, 0x81, 0x30, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0x19, 0x80, 0x01, 0x00, 0xcf, 0x8a, 0xa2, 0x4a, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0xd4, 0x8a, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xba, 0x00, 0x20, 0x40,</div><div class='add'>+	0xe5, 0xb1, 0x01, 0x00, 0xd8, 0x8e, 0x9c, 0x17, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0xcc, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00, 0x84, 0x95, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x2d, 0x95, 0x00, 0x40, 0x13, 0x30, 0x01, 0x00,</div><div class='add'>+	0xc0, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00, 0xc4, 0x00, 0x2d, 0xf0,</div><div class='add'>+	0x82, 0xb0, 0x01, 0x00, 0x61, 0x95, 0x00, 0xf0, 0x84, 0x30, 0x01, 0x00,</div><div class='add'>+	0x99, 0x92, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0xd4, 0x8a, 0x22, 0x09,</div><div class='add'>+	0x80, 0x30, 0x00, 0x00, 0xf4, 0x94, 0x00, 0x40, 0x13, 0x30, 0x01, 0x00,</div><div class='add'>+	0xd4, 0x8a, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x2e, 0x00, 0x00, 0x40,</div><div class='add'>+	0x43, 0x99, 0x01, 0x00, 0xe4, 0x8e, 0x22, 0x40, 0xe7, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x32, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00, 0xec, 0x8e, 0xa2, 0x40,</div><div class='add'>+	0xe5, 0x6d, 0x00, 0x00, 0x83, 0x93, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x24, 0x00, 0x20, 0x0b, 0xe0, 0xb1, 0x01, 0x00, 0x28, 0x00, 0x20, 0x13,</div><div class='add'>+	0xe0, 0xb1, 0x01, 0x00, 0x22, 0x00, 0x20, 0x06, 0xe4, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x14, 0x00, 0x20, 0x0a, 0xe0, 0xb1, 0x01, 0x00, 0xd4, 0x8a, 0x22, 0x09,</div><div class='add'>+	0x80, 0x30, 0x00, 0x00, 0xf4, 0x94, 0x00, 0x40, 0x13, 0x30, 0x01, 0x00,</div><div class='add'>+	0xd4, 0x8a, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x83, 0x93, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x3c, 0x93, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0xfa, 0x8e, 0x22, 0x41, 0x19, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0b,</div><div class='add'>+	0x99, 0xb0, 0x01, 0x00, 0x04, 0x00, 0x1f, 0x15, 0x98, 0x50, 0x00, 0x00,</div><div class='add'>+	0xfa, 0x8e, 0x20, 0x01, 0x98, 0x6c, 0x00, 0x00, 0x70, 0x00, 0x00, 0x03,</div><div class='add'>+	0x48, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x2e, 0x46, 0x1f, 0x90, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x50, 0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x03,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x42, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xa0, 0x00, 0x00, 0xa4, 0x62, 0xdd, 0x01, 0x00, 0xf7, 0x8e, 0xa8, 0x00,</div><div class='add'>+	0xe0, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xac, 0x00, 0x2f, 0x00, 0x10, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01,</div><div class='add'>+	0xe0, 0xc1, 0x01, 0x00, 0x14, 0x00, 0x2f, 0x15, 0x10, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x0a, 0x80, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x60, 0x01,</div><div class='add'>+	0x80, 0xd0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x47, 0x19, 0x90, 0x01, 0x00,</div><div class='add'>+	0x7c, 0x8e, 0x22, 0x09, 0x80, 0x32, 0x00, 0x00, 0xf4, 0x94, 0x00, 0x09,</div><div class='add'>+	0x80, 0x30, 0x01, 0x00, 0x7c, 0x8e, 0x00, 0x40, 0x13, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x80, 0x00, 0x03, 0x42, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0,</div><div class='add'>+	0x82, 0xb0, 0x01, 0x00, 0x13, 0x00, 0x00, 0x40, 0x87, 0x98, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4c, 0x43, 0xc1, 0x01, 0x00, 0xb7, 0x93, 0x00, 0xf0,</div><div class='add'>+	0x84, 0x30, 0x01, 0x00, 0xcf, 0x8a, 0x00, 0x5c, 0x1f, 0x90, 0x00, 0x00,</div><div class='add'>+	0x2c, 0x00, 0x20, 0x40, 0xe7, 0xb1, 0x01, 0x00, 0x2d, 0x00, 0x20, 0x40,</div><div class='add'>+	0xe7, 0xb1, 0x01, 0x00, 0xcf, 0x8a, 0x00, 0x42, 0x19, 0x80, 0x00, 0x00,</div><div class='add'>+	0xa9, 0x93, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0xc9, 0x94, 0x00, 0x48,</div><div class='add'>+	0x95, 0x30, 0x01, 0x00, 0x00, 0x00, 0x00, 0x45, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00, 0x0f, 0x8f, 0xa8, 0x40,</div><div class='add'>+	0x13, 0x30, 0x00, 0x00, 0xaf, 0x82, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x15, 0x8f, 0x00, 0x05, 0x48, 0xb1, 0x00, 0x00, 0x14, 0x8f, 0x00, 0x40,</div><div class='add'>+	0x13, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x08, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00, 0x14, 0x00, 0x2d, 0xf0,</div><div class='add'>+	0x82, 0xb0, 0x01, 0x00, 0x04, 0x00, 0x22, 0xf0, 0x84, 0x30, 0x00, 0x00,</div><div class='add'>+	0x13, 0x00, 0x00, 0x40, 0x87, 0x98, 0x01, 0x00, 0xb7, 0x93, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5c, 0x1f, 0x90, 0x01, 0x00,</div><div class='add'>+	0x2d, 0x8f, 0x00, 0x09, 0x00, 0xb0, 0x00, 0x00, 0xcf, 0x8a, 0x87, 0x42,</div><div class='add'>+	0x19, 0x10, 0x00, 0x00, 0x8b, 0x00, 0x2f, 0x47, 0x19, 0x80, 0x01, 0x00,</div><div class='add'>+	0xcf, 0x8a, 0x00, 0x40, 0xe7, 0x91, 0x00, 0x00, 0x2f, 0x00, 0x00, 0x40,</div><div class='add'>+	0x47, 0x99, 0x01, 0x00, 0x2b, 0x8f, 0x22, 0x47, 0xe7, 0x7d, 0x00, 0x00,</div><div class='add'>+	0x1e, 0x92, 0x00, 0x40, 0xe7, 0x31, 0x01, 0x00, 0x2b, 0x8f, 0x22, 0x00,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x26, 0x8f, 0xa2, 0x40, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x99, 0x92, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x2b, 0x8f, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x30, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00,</div><div class='add'>+	0x32, 0x00, 0x2d, 0xf2, 0x94, 0xb0, 0x01, 0x00, 0x41, 0x93, 0x00, 0xf2,</div><div class='add'>+	0x02, 0x30, 0x01, 0x00, 0x48, 0x93, 0x00, 0x4b, 0x02, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x05, 0x48, 0xb1, 0x01, 0x00, 0x2c, 0x8f, 0x00, 0x40,</div><div class='add'>+	0x01, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x05, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x32, 0x8f, 0x22, 0x00, 0x80, 0x32, 0x00, 0x00, 0x31, 0x8f, 0xa2, 0x42,</div><div class='add'>+	0x19, 0x7c, 0x00, 0x00, 0x96, 0x93, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x32, 0x8f, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xc6, 0x93, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0xbc, 0x8f, 0x22, 0x5c, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x5c, 0x1f, 0x80, 0x01, 0x00, 0x00, 0x80, 0x00, 0x10,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0x3a, 0x8f, 0x22, 0x40, 0xe3, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x45, 0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x37, 0x8f, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0xaf, 0x82, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0xbc, 0x8f, 0x00, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x00, 0x00, 0x8c, 0x92, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x40, 0x8f, 0xa2, 0x08, 0x80, 0x32, 0x00, 0x00, 0x83, 0x94, 0x00, 0x4d,</div><div class='add'>+	0x81, 0x30, 0x01, 0x00, 0x00, 0x82, 0x00, 0x02, 0x04, 0xdc, 0x01, 0x00,</div><div class='add'>+	0x14, 0x87, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x74, 0x00, 0x00, 0x40,</div><div class='add'>+	0x43, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x82, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf0, 0x84, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x96, 0xb0, 0x01, 0x00, 0x4e, 0x8f, 0x22, 0x42, 0x96, 0x14, 0x00, 0x00,</div><div class='add'>+	0x00, 0x80, 0x00, 0x10, 0x44, 0xc9, 0x01, 0x00, 0x64, 0x00, 0x68, 0x40,</div><div class='add'>+	0x97, 0x98, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x42, 0xf0, 0xb1, 0x01, 0x00, 0x70, 0x00, 0x00, 0x05,</div><div class='add'>+	0xe0, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x45, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x20, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00, 0x4b, 0x8f, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5c, 0x1f, 0x90, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x45, 0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x4f, 0x8f, 0xa8, 0x5c, 0x1f, 0x00, 0x00, 0x00,</div><div class='add'>+	0xaf, 0x82, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x5e, 0x01, 0x2d, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x53, 0x8f, 0x65, 0xf2, 0x12, 0x30, 0x00, 0x00,</div><div class='add'>+	0x00, 0x99, 0x3f, 0x42, 0x13, 0xf0, 0x01, 0x00, 0x58, 0x8f, 0x22, 0x47,</div><div class='add'>+	0xe7, 0x7d, 0x00, 0x00, 0xf5, 0x82, 0x75, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x52, 0x8f, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x47,</div><div class='add'>+	0xe7, 0x91, 0x01, 0x00, 0x04, 0x00, 0x75, 0x09, 0x96, 0xe4, 0x01, 0x00,</div><div class='add'>+	0x00, 0x80, 0x00, 0x10, 0x44, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x68, 0xa8, 0x97, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x03, 0xe0, 0xb1, 0x01, 0x00, 0x00, 0x80, 0x00, 0x03,</div><div class='add'>+	0x44, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x10, 0x62, 0xb1, 0x01, 0x00, 0x60, 0x8f, 0xa8, 0x40,</div><div class='add'>+	0xe1, 0x31, 0x00, 0x00, 0xaf, 0x82, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x99, 0x3f, 0x42, 0x13, 0xf0, 0x01, 0x00, 0x64, 0x8f, 0x65, 0x05,</div><div class='add'>+	0x48, 0x31, 0x00, 0x00, 0x3f, 0x00, 0x00, 0xf3, 0x96, 0x88, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0xe7, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x75, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x6c, 0x8f, 0x22, 0x4b, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x55, 0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4b,</div><div class='add'>+	0x62, 0xb1, 0x01, 0x00, 0x6a, 0x8f, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x07, 0x16, 0xb0, 0x01, 0x00, 0x00, 0x62, 0x00, 0x0b,</div><div class='add'>+	0x16, 0xdc, 0x01, 0x00, 0x1e, 0x92, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x84, 0x8f, 0x22, 0x00, 0x80, 0x32, 0x00, 0x00, 0xcc, 0x93, 0x00, 0x5f,</div><div class='add'>+	0x01, 0x10, 0x01, 0x00, 0x6e, 0x8f, 0x22, 0x40, 0x95, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x80, 0x00, 0x10, 0x44, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x50,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x03, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x42, 0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xb1, 0x01, 0x00, 0x76, 0x8f, 0xa8, 0x00, 0xe0, 0x31, 0x00, 0x00,</div><div class='add'>+	0xaf, 0x82, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x04, 0x80, 0x00, 0x03, 0x42, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf2, 0x02, 0xb0, 0x01, 0x00, 0x41, 0x93, 0x00, 0x52,</div><div class='add'>+	0x95, 0x30, 0x01, 0x00, 0x99, 0x92, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x6e, 0x8f, 0x22, 0x41, 0x97, 0x50, 0x00, 0x00, 0x0c, 0x80, 0x00, 0x03,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x5c, 0x01, 0x80, 0x01, 0x00, 0x48, 0x93, 0x00, 0x4b,</div><div class='add'>+	0x02, 0xb0, 0x00, 0x00, 0x6e, 0x8f, 0x00, 0x05, 0x48, 0xb1, 0x00, 0x00,</div><div class='add'>+	0xd4, 0x94, 0x00, 0x40, 0x03, 0x30, 0x01, 0x00, 0x17, 0x80, 0x00, 0x03,</div><div class='add'>+	0x44, 0xc9, 0x01, 0x00, 0x00, 0xf0, 0x00, 0x0c, 0x96, 0x88, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x63, 0x4c, 0x97, 0xf0, 0x01, 0x00, 0x10, 0x80, 0x00, 0x03,</div><div class='add'>+	0x44, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0xab, 0xe1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x75, 0x94, 0x00, 0x5e, 0x05, 0x10, 0x01, 0x00, 0x03, 0x00, 0x00, 0x07,</div><div class='add'>+	0x1a, 0xf4, 0x01, 0x00, 0x07, 0x00, 0x00, 0x07, 0x16, 0x88, 0x01, 0x00,</div><div class='add'>+	0x00, 0xb5, 0x00, 0x0d, 0x46, 0xc9, 0x01, 0x00, 0x8e, 0x8f, 0x30, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0b, 0xe6, 0x81, 0x01, 0x00,</div><div class='add'>+	0x00, 0xb7, 0x00, 0x0d, 0x46, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x0b,</div><div class='add'>+	0xe6, 0x81, 0x01, 0x00, 0x10, 0x00, 0x10, 0x0f, 0x94, 0xf4, 0x01, 0x00,</div><div class='add'>+	0x93, 0x04, 0x00, 0x5f, 0x95, 0x04, 0x01, 0x00, 0x22, 0x93, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x98, 0x8f, 0x22, 0x50, 0xfd, 0x7f, 0x00, 0x00,</div><div class='add'>+	0x96, 0x8f, 0x46, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x41,</div><div class='add'>+	0x31, 0xd3, 0x01, 0x00, 0x00, 0x00, 0x2e, 0x05, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0xe1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x0f, 0xb0, 0x01, 0x00, 0x85, 0x92, 0x00, 0x41, 0x81, 0x30, 0x01, 0x00,</div><div class='add'>+	0x14, 0x87, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x8c, 0x92, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0xa9, 0x8f, 0xa2, 0x08, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x82, 0x00, 0x02, 0x04, 0xdc, 0x01, 0x00, 0x00, 0x00, 0x00, 0x45,</div><div class='add'>+	0x03, 0xf0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0xc0, 0x01, 0x00,</div><div class='add'>+	0xa2, 0x8f, 0x37, 0x5c, 0x61, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1b,</div><div class='add'>+	0x62, 0xb1, 0x01, 0x00, 0xa6, 0x8f, 0x28, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0xa3, 0x8f, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+	0x62, 0xb1, 0x01, 0x00, 0xa6, 0x8f, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x14, 0x87, 0x17, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x74, 0x00, 0x22, 0x40,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0xe1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xc9, 0x94, 0x00, 0x4a, 0x95, 0x30, 0x01, 0x00, 0xa9, 0x93, 0x00, 0x5c,</div><div class='add'>+	0x1f, 0x10, 0x01, 0x00, 0x40, 0x8f, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x2f, 0x00, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00, 0xba, 0x8f, 0x22, 0x47,</div><div class='add'>+	0xe7, 0x7d, 0x00, 0x00, 0x1e, 0x92, 0x00, 0x40, 0xe7, 0x31, 0x01, 0x00,</div><div class='add'>+	0xba, 0x8f, 0x22, 0x00, 0x80, 0x32, 0x00, 0x00, 0xb5, 0x8f, 0xa2, 0x40,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x99, 0x92, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0xba, 0x8f, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x30, 0x00, 0x00, 0x40,</div><div class='add'>+	0x43, 0x99, 0x01, 0x00, 0x32, 0x00, 0x2d, 0xf2, 0x94, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x41, 0x93, 0x00, 0xf2, 0x02, 0x30, 0x01, 0x00, 0x48, 0x93, 0x00, 0x4b,</div><div class='add'>+	0x02, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xc9, 0x94, 0x00, 0x48, 0x95, 0x30, 0x01, 0x00, 0xa9, 0x93, 0x00, 0x5c,</div><div class='add'>+	0x1f, 0x10, 0x01, 0x00, 0xbf, 0x8f, 0x87, 0x42, 0x19, 0x10, 0x00, 0x00,</div><div class='add'>+	0x8b, 0x00, 0x2f, 0x47, 0x19, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0xe7, 0x91, 0x01, 0x00, 0xf4, 0x94, 0x00, 0x42, 0x81, 0x30, 0x01, 0x00,</div><div class='add'>+	0xcf, 0x8a, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xa9, 0x93, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0xcf, 0x8a, 0x00, 0x5c, 0x1f, 0x90, 0x00, 0x00,</div><div class='add'>+	0xba, 0x00, 0x20, 0x40, 0xe5, 0xb1, 0x01, 0x00, 0x2d, 0x95, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0xc0, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00,</div><div class='add'>+	0xc4, 0x00, 0x2d, 0xf0, 0x82, 0xb0, 0x01, 0x00, 0x61, 0x95, 0x00, 0xf0,</div><div class='add'>+	0x84, 0x30, 0x01, 0x00, 0x99, 0x92, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0xf4, 0x94, 0x00, 0x45, 0x81, 0x30, 0x01, 0x00, 0xcf, 0x8a, 0x22, 0x42,</div><div class='add'>+	0x19, 0x7c, 0x00, 0x00, 0x83, 0x94, 0x00, 0x3a, 0x81, 0x30, 0x01, 0x00,</div><div class='add'>+	0xcf, 0x8a, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x8c, 0x92, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0xd3, 0x8f, 0xa2, 0x08, 0x80, 0x32, 0x00, 0x00, 0x83, 0x94, 0x00, 0x47,</div><div class='add'>+	0x80, 0x30, 0x01, 0x00, 0x00, 0x82, 0x00, 0x02, 0x04, 0xdc, 0x01, 0x00,</div><div class='add'>+	0x14, 0x87, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x10, 0x80, 0x00, 0x03,</div><div class='add'>+	0x44, 0xc9, 0x01, 0x00, 0x00, 0xe1, 0x00, 0xa6, 0x84, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x60, 0x07, 0x84, 0x94, 0x01, 0x00,</div><div class='add'>+	0x75, 0x94, 0x00, 0x5e, 0x05, 0x10, 0x01, 0x00, 0xcf, 0x8a, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x8a, 0x00, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00,</div><div class='add'>+	0x99, 0x92, 0x00, 0x41, 0xe7, 0x41, 0x01, 0x00, 0xd4, 0x8a, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x83, 0x93, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x3c, 0x93, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01,</div><div class='add'>+	0x2c, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x15, 0x10, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x10, 0xc0, 0x01, 0x00, 0x04, 0x00, 0x1f, 0x0a,</div><div class='add'>+	0x2c, 0x50, 0x00, 0x00, 0x07, 0x95, 0x00, 0x06, 0x04, 0x30, 0x01, 0x00,</div><div class='add'>+	0xea, 0x8f, 0xa2, 0x48, 0x1f, 0x7c, 0x00, 0x00, 0xe8, 0x8f, 0x84, 0x48,</div><div class='add'>+	0x1f, 0x10, 0x00, 0x00, 0xac, 0x00, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00,</div><div class='add'>+	0xea, 0x8f, 0x00, 0x0a, 0xe0, 0xc1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a,</div><div class='add'>+	0x02, 0xb0, 0x01, 0x00, 0xa7, 0x91, 0x00, 0x01, 0x8c, 0x30, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x43, 0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0xeb, 0x8f, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0xaf, 0x82, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x02, 0x10, 0xc0, 0x01, 0x00,</div><div class='add'>+	0xf8, 0x8f, 0x22, 0x02, 0x14, 0x50, 0x00, 0x00, 0xf1, 0x93, 0x00, 0x45,</div><div class='add'>+	0x1f, 0x00, 0x01, 0x00, 0xe3, 0x8f, 0x22, 0x5c, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x47, 0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0xf4, 0x8f, 0xa8, 0x5c, 0x1f, 0x00, 0x00, 0x00,</div><div class='add'>+	0xaf, 0x82, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0xe3, 0x8f, 0x00, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0b, 0x1b, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x08, 0x00, 0x2d, 0x40, 0x85, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0,</div><div class='add'>+	0x82, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x05, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xb7, 0x93, 0x00, 0x41, 0x87, 0x30, 0x01, 0x00, 0x00, 0x00, 0x00, 0x45,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0xfe, 0x8f, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0xaf, 0x82, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x04, 0x90, 0x22, 0x09, 0x80, 0x30, 0x00, 0x00, 0xf4, 0x94, 0x00, 0x40,</div><div class='add'>+	0x13, 0x30, 0x01, 0x00, 0x08, 0x90, 0x22, 0x44, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0xf4, 0x94, 0x00, 0x4f, 0x81, 0x30, 0x01, 0x00, 0x08, 0x90, 0xa2, 0x47,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x19, 0x80, 0x01, 0x00,</div><div class='add'>+	0xff, 0x07, 0x00, 0x08, 0x00, 0x8c, 0x01, 0x00, 0x16, 0x90, 0x22, 0x4a,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x0e, 0x90, 0xa2, 0x16, 0x02, 0x30, 0x00, 0x00,</div><div class='add'>+	0x99, 0x92, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x2f, 0x00, 0x20, 0x40,</div><div class='add'>+	0xe7, 0xb1, 0x01, 0x00, 0xcf, 0x8a, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x2d, 0x00, 0x2d, 0x08, 0x2a, 0xb0, 0x01, 0x00, 0x12, 0x90, 0x22, 0x42,</div><div class='add'>+	0x19, 0x7c, 0x00, 0x00, 0xc6, 0x93, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x13, 0x90, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x96, 0x93, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x30, 0x00, 0x2e, 0x00, 0x2a, 0xd0, 0x01, 0x00,</div><div class='add'>+	0x32, 0x00, 0x2a, 0x15, 0xe4, 0xb1, 0x01, 0x00, 0xcf, 0x8a, 0x00, 0x16,</div><div class='add'>+	0xe4, 0xb1, 0x00, 0x00, 0x28, 0x90, 0x22, 0x16, 0x02, 0x30, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x08, 0x2a, 0xb0, 0x01, 0x00, 0x7d, 0x95, 0x00, 0x40,</div><div class='add'>+	0x95, 0x30, 0x01, 0x00, 0x29, 0x90, 0x22, 0x40, 0x11, 0x6c, 0x00, 0x00,</div><div class='add'>+	0xac, 0x00, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00, 0xb0, 0x00, 0x2b, 0x01,</div><div class='add'>+	0xe0, 0xc1, 0x01, 0x00, 0x00, 0x2b, 0x00, 0xa6, 0x16, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x01, 0xe0, 0xd1, 0x01, 0x00, 0xcc, 0x94, 0x00, 0x08,</div><div class='add'>+	0x80, 0x30, 0x01, 0x00, 0x21, 0x90, 0x00, 0x5e, 0x17, 0x90, 0x00, 0x00,</div><div class='add'>+	0xed, 0x94, 0x00, 0x43, 0x61, 0x31, 0x01, 0x00, 0x00, 0x00, 0x00, 0x43,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0x22, 0x90, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0xaf, 0x82, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xd4, 0x94, 0x00, 0x07, 0x16, 0x14, 0x01, 0x00, 0x75, 0x94, 0x00, 0x5e,</div><div class='add'>+	0x05, 0x10, 0x01, 0x00, 0x99, 0x92, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x2f, 0x00, 0x20, 0x40, 0xe7, 0xb1, 0x01, 0x00, 0xd4, 0x8a, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0b, 0x1b, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x1f, 0x15, 0x1a, 0x50, 0x00, 0x00, 0x36, 0x90, 0x20, 0x16,</div><div class='add'>+	0x1a, 0x6c, 0x00, 0x00, 0x70, 0x00, 0x00, 0x03, 0x48, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x22, 0x50, 0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x03,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x42, 0x61, 0xb1, 0x01, 0x00, 0xa0, 0x00, 0x00, 0xa4,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x33, 0x90, 0xa8, 0x46, 0x1f, 0x10, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x05, 0x48, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+	0x10, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x15, 0x10, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x0a, 0x2a, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x0a,</div><div class='add'>+	0x2c, 0xd0, 0x01, 0x00, 0xac, 0x00, 0x2f, 0x40, 0x23, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x3d, 0x90, 0x84, 0x45, 0x1f, 0x10, 0x00, 0x00, 0x3e, 0x90, 0x00, 0x0a,</div><div class='add'>+	0xe0, 0xc1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x02, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x34, 0x94, 0x00, 0x40, 0x35, 0xb0, 0x00, 0x00, 0x00, 0x80, 0x00, 0x19,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0x46, 0x90, 0x22, 0x40, 0xe3, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x43, 0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x42, 0x90, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0xaf, 0x82, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x55, 0x90, 0xa2, 0x02, 0x1a, 0x50, 0x00, 0x00,</div><div class='add'>+	0x56, 0x90, 0x22, 0x40, 0x2d, 0x6c, 0x00, 0x00, 0x00, 0x80, 0x00, 0x10,</div><div class='add'>+	0x44, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x50, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x03, 0xf0, 0xb1, 0x01, 0x00, 0xff, 0x07, 0x00, 0x08,</div><div class='add'>+	0xe0, 0x8d, 0x01, 0x00, 0x00, 0x00, 0x00, 0x42, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x10, 0x62, 0xb1, 0x01, 0x00, 0x4d, 0x90, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0xaf, 0x82, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x05, 0x48, 0xb1, 0x01, 0x00, 0x0c, 0x80, 0x00, 0x03,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0x10, 0x00, 0x00, 0xf0, 0x10, 0xc8, 0x01, 0x00,</div><div class='add'>+	0xf0, 0x07, 0x00, 0x40, 0x1b, 0x98, 0x01, 0x00, 0x56, 0x90, 0x00, 0x5c,</div><div class='add'>+	0x11, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x10, 0xc0, 0x01, 0x00,</div><div class='add'>+	0xaf, 0x92, 0x00, 0x40, 0x1f, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x5a, 0x90, 0x23, 0x0d, 0x2c, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x1f, 0x90, 0x01, 0x00, 0x62, 0x90, 0x22, 0x46,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x70, 0x80, 0x00, 0x03, 0x42, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x62, 0x90, 0x22, 0x40, 0xe3, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0x5e, 0x90, 0xa8, 0x46, 0x1f, 0x00, 0x00, 0x00, 0xaf, 0x82, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x08, 0x00, 0x2d, 0x40, 0x85, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0,</div><div class='add'>+	0x82, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x05, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xb7, 0x93, 0x00, 0x41, 0x87, 0x30, 0x01, 0x00, 0x00, 0x00, 0x00, 0x45,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0x67, 0x90, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0xaf, 0x82, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x6d, 0x90, 0x22, 0x09, 0x80, 0x30, 0x00, 0x00, 0xf4, 0x94, 0x00, 0x40,</div><div class='add'>+	0x13, 0x30, 0x01, 0x00, 0x71, 0x90, 0x22, 0x44, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0xf4, 0x94, 0x00, 0x4f, 0x81, 0x30, 0x01, 0x00, 0x71, 0x90, 0xa2, 0x47,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x19, 0x80, 0x01, 0x00,</div><div class='add'>+	0xff, 0x07, 0x00, 0x08, 0x00, 0x8c, 0x01, 0x00, 0x86, 0x90, 0x22, 0x4a,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x77, 0x90, 0xa2, 0x16, 0x02, 0x30, 0x00, 0x00,</div><div class='add'>+	0x99, 0x92, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x2f, 0x00, 0x20, 0x40,</div><div class='add'>+	0xe7, 0xb1, 0x01, 0x00, 0xcf, 0x8a, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x2d, 0x00, 0x2d, 0x08, 0x2a, 0xb0, 0x01, 0x00, 0x82, 0x90, 0x22, 0x42,</div><div class='add'>+	0x19, 0x7c, 0x00, 0x00, 0x7b, 0x90, 0xa2, 0xf3, 0x84, 0x30, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xa5, 0x85, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x85, 0xd0, 0x01, 0x00, 0xd4, 0x00, 0x3e, 0x41, 0x85, 0xe0, 0x01, 0x00,</div><div class='add'>+	0x7f, 0x90, 0x22, 0x40, 0x1f, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5a,</div><div class='add'>+	0x11, 0x90, 0x01, 0x00, 0x0b, 0x00, 0x00, 0x08, 0xe4, 0xf5, 0x01, 0x00,</div><div class='add'>+	0xc6, 0x93, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x83, 0x90, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x96, 0x93, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x30, 0x00, 0x2e, 0x00, 0x2a, 0xd0, 0x01, 0x00, 0x32, 0x00, 0x2a, 0x15,</div><div class='add'>+	0xe4, 0xb1, 0x01, 0x00, 0xcf, 0x8a, 0x00, 0x16, 0xe4, 0xb1, 0x00, 0x00,</div><div class='add'>+	0x89, 0x90, 0xa2, 0x16, 0x02, 0x30, 0x00, 0x00, 0x99, 0x92, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0xd6, 0x90, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x2d, 0x00, 0x2d, 0x08, 0x2a, 0xb0, 0x01, 0x00, 0x96, 0x90, 0x22, 0x47,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x93, 0x90, 0x22, 0x42, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x8e, 0x90, 0xa2, 0xf3, 0x84, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5,</div><div class='add'>+	0x85, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41, 0x85, 0xd0, 0x01, 0x00,</div><div class='add'>+	0xd4, 0x00, 0x3e, 0x41, 0x85, 0xe0, 0x01, 0x00, 0x92, 0x90, 0x22, 0x40,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5a, 0x11, 0x90, 0x01, 0x00,</div><div class='add'>+	0x0b, 0x00, 0x00, 0x08, 0xe4, 0xf5, 0x01, 0x00, 0x58, 0x01, 0x2d, 0x00,</div><div class='add'>+	0x2a, 0xd0, 0x01, 0x00, 0x60, 0x01, 0x2d, 0xf0, 0x10, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x2d, 0x8e, 0x00, 0xf0, 0x2c, 0xb0, 0x00, 0x00, 0x7d, 0x95, 0x00, 0x41,</div><div class='add'>+	0x95, 0x30, 0x01, 0x00, 0x9d, 0x90, 0xa2, 0x08, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x97, 0xb0, 0x01, 0x00, 0x9b, 0x90, 0x23, 0x0d,</div><div class='add'>+	0x02, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x97, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x48, 0x93, 0x00, 0x4b, 0x02, 0xb0, 0x00, 0x00, 0xd6, 0x90, 0x00, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x00, 0x00, 0xac, 0x00, 0x2f, 0x01, 0x14, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xb0, 0x00, 0x2b, 0x01, 0xe0, 0xc1, 0x01, 0x00, 0x00, 0x2b, 0x00, 0xa6,</div><div class='add'>+	0x16, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0xe0, 0xd1, 0x01, 0x00,</div><div class='add'>+	0xad, 0x90, 0x23, 0x0d, 0x02, 0x6c, 0x00, 0x00, 0x00, 0x80, 0x00, 0x10,</div><div class='add'>+	0x44, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x50, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x03, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x42,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x10, 0x62, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xa6, 0x90, 0xa8, 0x00, 0xe0, 0x31, 0x00, 0x00, 0xaf, 0x82, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x0c, 0x80, 0x00, 0x03, 0x42, 0xc9, 0x01, 0x00, 0x10, 0x00, 0x00, 0xf0,</div><div class='add'>+	0x22, 0xc8, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5c, 0x23, 0x80, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x01, 0x84, 0xb0, 0x01, 0x00, 0xb0, 0x90, 0x23, 0x0d,</div><div class='add'>+	0x02, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0d, 0x02, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x08, 0x80, 0xb0, 0x01, 0x00, 0xb5, 0x90, 0x22, 0x40,</div><div class='add'>+	0x1b, 0x6c, 0x00, 0x00, 0xcc, 0x94, 0x00, 0x01, 0x84, 0x50, 0x01, 0x00,</div><div class='add'>+	0xbd, 0x90, 0x22, 0x40, 0x85, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,</div><div class='add'>+	0x80, 0xc0, 0x01, 0x00, 0x10, 0x80, 0x00, 0x10, 0x46, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4f, 0x43, 0x81, 0x01, 0x00, 0x00, 0x00, 0x00, 0x42,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x20, 0x00, 0x00, 0x40, 0xf0, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x16, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x43,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0xa0, 0x00, 0x00, 0xa1, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0xbb, 0x90, 0xa8, 0x11, 0xe0, 0x31, 0x00, 0x00, 0xcc, 0x90, 0x00, 0x5e,</div><div class='add'>+	0x17, 0x90, 0x00, 0x00, 0xc0, 0x90, 0x23, 0x0d, 0x02, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x0d, 0x02, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01,</div><div class='add'>+	0x84, 0xd0, 0x01, 0x00, 0xc5, 0x90, 0x22, 0x40, 0x1b, 0x6c, 0x00, 0x00,</div><div class='add'>+	0xed, 0x94, 0x00, 0x43, 0x61, 0x31, 0x01, 0x00, 0xcc, 0x90, 0x22, 0x40,</div><div class='add'>+	0x85, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x12, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x10, 0x80, 0x00, 0x10, 0x46, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4f,</div><div class='add'>+	0x43, 0x81, 0x01, 0x00, 0x00, 0x00, 0x00, 0x42, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x09, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x18,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0xa0, 0x00, 0x00, 0xa1, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0xca, 0x90, 0xa8, 0x11, 0xe0, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0xcd, 0x90, 0xa8, 0x0a, 0x02, 0x30, 0x00, 0x00, 0xaf, 0x82, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x99, 0x92, 0x00, 0x05, 0x48, 0x31, 0x01, 0x00,</div><div class='add'>+	0xd4, 0x90, 0x23, 0x0d, 0x02, 0x6c, 0x00, 0x00, 0xff, 0x07, 0x00, 0x11,</div><div class='add'>+	0x00, 0x8c, 0x01, 0x00, 0x99, 0x92, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0xd4, 0x94, 0x00, 0x07, 0x16, 0x14, 0x01, 0x00, 0x75, 0x94, 0x00, 0x5e,</div><div class='add'>+	0x05, 0x10, 0x01, 0x00, 0x2f, 0x00, 0x20, 0x40, 0xe7, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xd4, 0x8a, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x80, 0x00, 0x03,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x82, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf8, 0x8c, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0,</div><div class='add'>+	0x8e, 0xb0, 0x01, 0x00, 0x80, 0x93, 0x00, 0x40, 0x13, 0x30, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x85, 0xb0, 0x01, 0x00, 0xb7, 0x93, 0x00, 0x41,</div><div class='add'>+	0x87, 0x30, 0x01, 0x00, 0x3c, 0x93, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x00, 0x80, 0x00, 0x10, 0x42, 0xc9, 0x01, 0x00, 0xe7, 0x90, 0x22, 0x40,</div><div class='add'>+	0xe3, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x45, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00, 0xe3, 0x90, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0xaf, 0x82, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x05, 0x48, 0xb1, 0x01, 0x00, 0xe9, 0x90, 0x22, 0x09,</div><div class='add'>+	0x80, 0x30, 0x00, 0x00, 0xf4, 0x94, 0x00, 0x40, 0x13, 0x30, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x0b, 0x1b, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x15,</div><div class='add'>+	0x1a, 0xd0, 0x01, 0x00, 0xef, 0x90, 0xa2, 0x41, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x7d, 0x95, 0x00, 0x40, 0x95, 0x30, 0x01, 0x00, 0xf7, 0x90, 0x22, 0x08,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x1a, 0x90, 0x00, 0x00, 0x2a, 0xc0, 0x00, 0x00,</div><div class='add'>+	0x7d, 0x95, 0x00, 0x41, 0x95, 0x30, 0x01, 0x00, 0xf2, 0x90, 0x22, 0x08,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x9d, 0x90, 0x00, 0x00, 0x2a, 0xc0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x97, 0xb0, 0x01, 0x00, 0xf5, 0x90, 0x23, 0x0d,</div><div class='add'>+	0x02, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x97, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x48, 0x93, 0x00, 0x4b, 0x02, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0xcf, 0x8a, 0x22, 0x42, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x83, 0x94, 0x00, 0x3a, 0x81, 0x30, 0x01, 0x00, 0xcf, 0x8a, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0xfb, 0x90, 0x00, 0x4a, 0x1f, 0x90, 0x00, 0x00,</div><div class='add'>+	0xc1, 0x92, 0x00, 0x00, 0x10, 0x30, 0x01, 0x00, 0x00, 0x00, 0x00, 0x15,</div><div class='add'>+	0x10, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x10, 0x32, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x07, 0x95, 0x00, 0x06, 0x04, 0x30, 0x01, 0x00, 0x04, 0x91, 0xa2, 0x44,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0b, 0x1b, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x0a, 0x2c, 0xd0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x0a,</div><div class='add'>+	0x02, 0xb0, 0x01, 0x00, 0xa7, 0x91, 0x00, 0x01, 0x8c, 0x30, 0x01, 0x00,</div><div class='add'>+	0x00, 0x80, 0x00, 0x19, 0x42, 0xc9, 0x01, 0x00, 0x0b, 0x91, 0x22, 0x40,</div><div class='add'>+	0xe3, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00, 0x07, 0x91, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0xaf, 0x82, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x05, 0x48, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x02,</div><div class='add'>+	0x10, 0xc0, 0x01, 0x00, 0x14, 0x91, 0x22, 0x02, 0x14, 0x50, 0x00, 0x00,</div><div class='add'>+	0xf1, 0x93, 0x00, 0x45, 0x1f, 0x00, 0x01, 0x00, 0xfd, 0x90, 0x22, 0x5c,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x47, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00, 0x10, 0x91, 0xa8, 0x5c,</div><div class='add'>+	0x1f, 0x00, 0x00, 0x00, 0xaf, 0x82, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xfd, 0x90, 0x00, 0x05, 0x48, 0xb1, 0x00, 0x00, 0x08, 0x00, 0x2d, 0x40,</div><div class='add'>+	0x85, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x82, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x05, 0xb0, 0x01, 0x00, 0xb7, 0x93, 0x00, 0x41,</div><div class='add'>+	0x87, 0x30, 0x01, 0x00, 0x00, 0x00, 0x00, 0x45, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00, 0x19, 0x91, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0xaf, 0x82, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x05, 0x48, 0xb1, 0x01, 0x00, 0x1f, 0x91, 0x22, 0x09,</div><div class='add'>+	0x80, 0x30, 0x00, 0x00, 0xf4, 0x94, 0x00, 0x40, 0x13, 0x30, 0x01, 0x00,</div><div class='add'>+	0x22, 0x91, 0x22, 0x44, 0x19, 0x7c, 0x00, 0x00, 0xf4, 0x94, 0x00, 0x4f,</div><div class='add'>+	0x81, 0x30, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44, 0x19, 0x80, 0x01, 0x00,</div><div class='add'>+	0xff, 0x07, 0x00, 0x08, 0x00, 0x8c, 0x01, 0x00, 0x30, 0x91, 0x22, 0x4a,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x28, 0x91, 0xa2, 0x16, 0x02, 0x30, 0x00, 0x00,</div><div class='add'>+	0x99, 0x92, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x2f, 0x00, 0x20, 0x40,</div><div class='add'>+	0xe7, 0xb1, 0x01, 0x00, 0xcf, 0x8a, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x2d, 0x00, 0x2d, 0x08, 0x2a, 0xb0, 0x01, 0x00, 0x2c, 0x91, 0x22, 0x42,</div><div class='add'>+	0x19, 0x7c, 0x00, 0x00, 0xc6, 0x93, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x2d, 0x91, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x96, 0x93, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x30, 0x00, 0x2e, 0x00, 0x2a, 0xd0, 0x01, 0x00,</div><div class='add'>+	0x32, 0x00, 0x2a, 0x15, 0xe4, 0xb1, 0x01, 0x00, 0xcf, 0x8a, 0x00, 0x16,</div><div class='add'>+	0xe4, 0xb1, 0x00, 0x00, 0x17, 0x90, 0xa2, 0x16, 0x02, 0x30, 0x00, 0x00,</div><div class='add'>+	0x99, 0x92, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x2f, 0x00, 0x20, 0x40,</div><div class='add'>+	0xe7, 0xb1, 0x01, 0x00, 0xd4, 0x8a, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xc1, 0x92, 0x00, 0x4a, 0x1f, 0x10, 0x01, 0x00, 0x2b, 0x90, 0x00, 0x10,</div><div class='add'>+	0x32, 0xb0, 0x00, 0x00, 0x8a, 0x00, 0x20, 0x40, 0xe7, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x3a, 0x91, 0xa2, 0x41, 0x19, 0x7c, 0x00, 0x00, 0x99, 0x92, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x3d, 0x91, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x41, 0x93, 0x00, 0x15, 0x94, 0x30, 0x01, 0x00, 0x48, 0x93, 0x00, 0x4b,</div><div class='add'>+	0x02, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x3f, 0x91, 0x22, 0x42, 0x19, 0x7c, 0x00, 0x00, 0x83, 0x94, 0x00, 0x3a,</div><div class='add'>+	0x81, 0x30, 0x01, 0x00, 0xf4, 0x94, 0x00, 0x45, 0x81, 0x30, 0x01, 0x00,</div><div class='add'>+	0xcf, 0x8a, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xec, 0x8e, 0x00, 0x45,</div><div class='add'>+	0x1f, 0x90, 0x00, 0x00, 0x83, 0x93, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x3c, 0x93, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x2b, 0x90, 0x00, 0x01,</div><div class='add'>+	0x2c, 0xb0, 0x00, 0x00, 0x8c, 0x92, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x51, 0x91, 0xa2, 0x08, 0x80, 0x32, 0x00, 0x00, 0x00, 0x82, 0x00, 0x02,</div><div class='add'>+	0x04, 0xdc, 0x01, 0x00, 0x00, 0x00, 0x00, 0x45, 0x03, 0xf0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x01, 0x00, 0xc0, 0x01, 0x00, 0x4a, 0x91, 0x37, 0x5c,</div><div class='add'>+	0x61, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1b, 0x62, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x4e, 0x91, 0x28, 0x40, 0x81, 0x32, 0x00, 0x00, 0x4b, 0x91, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x62, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x4e, 0x91, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0x14, 0x87, 0x17, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x58, 0x01, 0x20, 0x08, 0xe0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x60, 0x01, 0x20, 0x16, 0xe0, 0xb1, 0x01, 0x00, 0x83, 0x93, 0x00, 0x47,</div><div class='add'>+	0x1f, 0x10, 0x01, 0x00, 0x3c, 0x93, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x2b, 0x90, 0x00, 0x01, 0x2c, 0xb0, 0x00, 0x00, 0x8c, 0x92, 0x00, 0x47,</div><div class='add'>+	0x1f, 0x10, 0x01, 0x00, 0x63, 0x91, 0xa2, 0x08, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x5f, 0x91, 0xa2, 0x42, 0x19, 0x7c, 0x00, 0x00, 0x00, 0x82, 0x00, 0x02,</div><div class='add'>+	0x04, 0xdc, 0x01, 0x00, 0xa0, 0x98, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00,</div><div class='add'>+	0x30, 0x05, 0x00, 0x41, 0x89, 0x30, 0x01, 0x00, 0x41, 0x93, 0x00, 0x15,</div><div class='add'>+	0x94, 0x30, 0x01, 0x00, 0x48, 0x93, 0x00, 0x4b, 0x02, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x14, 0x87, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xc6, 0x93, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4b, 0x19, 0x90, 0x01, 0x00,</div><div class='add'>+	0x83, 0x94, 0x00, 0x3a, 0x81, 0x30, 0x01, 0x00, 0x14, 0x87, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x58, 0x01, 0x20, 0x08, 0xe0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x60, 0x01, 0x20, 0x16, 0xe0, 0xb1, 0x01, 0x00, 0xc1, 0x92, 0x00, 0x10,</div><div class='add'>+	0x32, 0x30, 0x01, 0x00, 0x2b, 0x90, 0x00, 0x40, 0x13, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x8c, 0x92, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x73, 0x91, 0xa2, 0x08,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x00, 0x82, 0x00, 0x02, 0x04, 0xdc, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x45, 0x03, 0xf0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01,</div><div class='add'>+	0x00, 0xc0, 0x01, 0x00, 0x6c, 0x91, 0x37, 0x5c, 0x61, 0x31, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x1b, 0x62, 0xb1, 0x01, 0x00, 0x70, 0x91, 0x28, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x6d, 0x91, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x62, 0xb1, 0x01, 0x00, 0x70, 0x91, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x14, 0x87, 0x17, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x00, 0x80, 0x00, 0x03, 0x42, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8,</div><div class='add'>+	0x82, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x8c, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf0, 0x8e, 0xb0, 0x01, 0x00, 0x80, 0x93, 0x00, 0x40,</div><div class='add'>+	0x13, 0x30, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x85, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xb7, 0x93, 0x00, 0x41, 0x87, 0x30, 0x01, 0x00, 0x3c, 0x93, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x00, 0x80, 0x00, 0x10, 0x42, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x82, 0x91, 0x22, 0x40, 0xe3, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x45,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0x7e, 0x91, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0xaf, 0x82, 0x00, 0x88,</div><div class='add'>+	0x1c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x2d, 0x8e, 0x22, 0x09, 0x80, 0x30, 0x00, 0x00, 0xf4, 0x94, 0x00, 0x40,</div><div class='add'>+	0x13, 0x30, 0x01, 0x00, 0x2d, 0x8e, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x14, 0x00, 0x2d, 0x45, 0x1f, 0x90, 0x01, 0x00, 0x75, 0x8e, 0x00, 0x44,</div><div class='add'>+	0x19, 0x90, 0x00, 0x00, 0x8a, 0x91, 0xa2, 0x41, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4a, 0x1f, 0x90, 0x01, 0x00, 0xdd, 0x8f, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x83, 0x93, 0x00, 0x4a, 0x1f, 0x10, 0x01, 0x00,</div><div class='add'>+	0x3c, 0x93, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x2b, 0x90, 0x00, 0x01,</div><div class='add'>+	0x2c, 0xb0, 0x00, 0x00, 0xc1, 0x92, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x2b, 0x90, 0x00, 0x10, 0x32, 0xb0, 0x00, 0x00, 0xec, 0x8e, 0x00, 0x45,</div><div class='add'>+	0x1f, 0x90, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x37, 0xc3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x33, 0xc3, 0x01, 0x00, 0x36, 0x00, 0x00, 0x01,</div><div class='add'>+	0x02, 0xcc, 0x01, 0x00, 0x00, 0x00, 0xd2, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x96, 0x91, 0x85, 0x17, 0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x9f, 0x48,</div><div class='add'>+	0x03, 0xd0, 0x00, 0x00, 0x98, 0x91, 0x9c, 0x17, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x9f, 0x4c, 0x03, 0xd0, 0x00, 0x00, 0x00, 0x00, 0x80, 0x01,</div><div class='add'>+	0x34, 0xc3, 0x01, 0x00, 0x40, 0x80, 0x00, 0x03, 0x44, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4a, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x12, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x9d, 0x92, 0x00, 0x41, 0xe1, 0x31, 0x01, 0x00, 0x00, 0x80, 0x00, 0x43,</div><div class='add'>+	0x44, 0xc9, 0x01, 0x00, 0x10, 0x00, 0x00, 0x40, 0xf1, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x48, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x49,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x03, 0xe0, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x45, 0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x43,</div><div class='add'>+	0x62, 0xb1, 0x01, 0x00, 0x00, 0x00, 0xa8, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xa4, 0x91, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xba, 0x00, 0x20, 0x40,</div><div class='add'>+	0xe5, 0xb1, 0x01, 0x00, 0xb0, 0x00, 0x2f, 0x01, 0x8c, 0xd0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x46, 0xe0, 0xc1, 0x01, 0x00, 0xac, 0x00, 0x2f, 0x40,</div><div class='add'>+	0x13, 0xb0, 0x01, 0x00, 0xcc, 0x00, 0x2d, 0x01, 0xe0, 0xc1, 0x01, 0x00,</div><div class='add'>+	0xae, 0x91, 0x9c, 0x17, 0x80, 0x32, 0x00, 0x00, 0x84, 0x95, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0xb0, 0x91, 0x22, 0x47, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x5f, 0x13, 0x90, 0x01, 0x00, 0x2d, 0x95, 0x00, 0x47,</div><div class='add'>+	0x19, 0x10, 0x01, 0x00, 0xc0, 0x00, 0x2d, 0x44, 0x1f, 0x90, 0x01, 0x00,</div><div class='add'>+	0xc4, 0x00, 0x2d, 0xf0, 0x82, 0xb0, 0x01, 0x00, 0x61, 0x95, 0x00, 0xf0,</div><div class='add'>+	0x84, 0xb0, 0x00, 0x00, 0x90, 0x00, 0x2d, 0x05, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xc5, 0x91, 0xa2, 0x4b, 0x1f, 0x7c, 0x00, 0x00, 0x18, 0x92, 0xa2, 0x4c,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0xc5, 0x91, 0x1f, 0x1c, 0xe0, 0x6d, 0x00, 0x00,</div><div class='add'>+	0xc8, 0x91, 0xa2, 0x01, 0x80, 0x32, 0x00, 0x00, 0xa8, 0x00, 0x2d, 0x46,</div><div class='add'>+	0x8f, 0xb0, 0x01, 0x00, 0xbe, 0x91, 0x1f, 0x1c, 0xe0, 0x6d, 0x00, 0x00,</div><div class='add'>+	0xb4, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00, 0xc0, 0x91, 0x22, 0xf0,</div><div class='add'>+	0x3a, 0x6c, 0x00, 0x00, 0x15, 0x92, 0x1f, 0xf0, 0x3a, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0xa2, 0x40, 0x80, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x80, 0x4f,</div><div class='add'>+	0x8f, 0xb0, 0x01, 0x00, 0x8a, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00,</div><div class='add'>+	0x16, 0x92, 0x20, 0x42, 0xe7, 0x6d, 0x00, 0x00, 0xc4, 0x91, 0x22, 0x40,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x80, 0x59, 0x8f, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x58, 0x8f, 0xb0, 0x01, 0x00, 0xc7, 0x91, 0x22, 0x40,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x80, 0x5c, 0x8f, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x5b, 0x8f, 0xb0, 0x01, 0x00, 0xac, 0x00, 0x00, 0x40,</div><div class='add'>+	0x43, 0x99, 0x01, 0x00, 0xb0, 0x00, 0x2d, 0xf0, 0x84, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xcc, 0x91, 0xa2, 0x42, 0x24, 0x6c, 0x00, 0x00, 0xd5, 0x91, 0x23, 0xf0,</div><div class='add'>+	0x02, 0x6c, 0x00, 0x00, 0xd2, 0x91, 0xa2, 0xf0, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x17, 0x92, 0xa2, 0x42, 0x24, 0x6c, 0x00, 0x00, 0x17, 0x92, 0xa2, 0x41,</div><div class='add'>+	0x03, 0x6c, 0x00, 0x00, 0xd1, 0x91, 0xa2, 0x40, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x51, 0x8f, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x80, 0x52,</div><div class='add'>+	0x8f, 0xb0, 0x01, 0x00, 0x17, 0x92, 0x1f, 0x12, 0x84, 0x50, 0x00, 0x00,</div><div class='add'>+	0x17, 0x92, 0xa0, 0x01, 0x84, 0x6c, 0x00, 0x00, 0xc5, 0x91, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x8b, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x92, 0xa2, 0x46, 0xe7, 0x7d, 0x00, 0x00, 0x14, 0x00, 0x00, 0x40,</div><div class='add'>+	0x43, 0x99, 0x01, 0x00, 0xf2, 0x91, 0x22, 0xf0, 0x14, 0x30, 0x00, 0x00,</div><div class='add'>+	0xde, 0x91, 0x20, 0x0a, 0x02, 0x6c, 0x00, 0x00, 0xef, 0x91, 0x03, 0x1e,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0xdd, 0x91, 0xa2, 0x40, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x44, 0x8f, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x80, 0x49,</div><div class='add'>+	0x8f, 0xb0, 0x01, 0x00, 0xe3, 0x91, 0x22, 0x0a, 0x02, 0x6c, 0x00, 0x00,</div><div class='add'>+	0xe6, 0x91, 0xa2, 0x41, 0x19, 0x7c, 0x00, 0x00, 0xe2, 0x91, 0xa2, 0x40,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x80, 0x55, 0x8f, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x56, 0x8f, 0xb0, 0x01, 0x00, 0xe5, 0x91, 0xa2, 0x40,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x80, 0x43, 0x8f, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x48, 0x8f, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01,</div><div class='add'>+	0x82, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x82, 0xd0, 0x01, 0x00,</div><div class='add'>+	0xec, 0x91, 0x20, 0x91, 0x83, 0x6c, 0x00, 0x00, 0xeb, 0x91, 0xa2, 0x40,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x26, 0x00, 0x80, 0x40, 0x8f, 0x98, 0x01, 0x00,</div><div class='add'>+	0x27, 0x00, 0x80, 0x40, 0x8f, 0x98, 0x01, 0x00, 0xee, 0x91, 0xa2, 0x40,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x1f, 0x00, 0x80, 0x40, 0x8f, 0x98, 0x01, 0x00,</div><div class='add'>+	0x20, 0x00, 0x80, 0x40, 0x8f, 0x98, 0x01, 0x00, 0xf1, 0x91, 0xa2, 0x40,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x22, 0x00, 0x80, 0x40, 0x8f, 0x98, 0x01, 0x00,</div><div class='add'>+	0x23, 0x00, 0x80, 0x40, 0x8f, 0x98, 0x01, 0x00, 0x88, 0x00, 0x2d, 0x44,</div><div class='add'>+	0x8f, 0xb0, 0x01, 0x00, 0xfb, 0x91, 0xa2, 0x41, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0xf8, 0x91, 0xa2, 0x43, 0x3d, 0x7c, 0x00, 0x00, 0xf8, 0x91, 0xa2, 0xf2,</div><div class='add'>+	0x02, 0x6c, 0x00, 0x00, 0x00, 0x00, 0xa2, 0x40, 0x80, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x49, 0x8f, 0xb0, 0x01, 0x00, 0xfa, 0x91, 0xa2, 0x40,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x80, 0x43, 0x8f, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x48, 0x8f, 0xb0, 0x01, 0x00, 0xf8, 0x91, 0xa0, 0x91,</div><div class='add'>+	0x03, 0x6c, 0x00, 0x00, 0xf6, 0x91, 0x22, 0x43, 0x3d, 0x7c, 0x00, 0x00,</div><div class='add'>+	0xff, 0x91, 0xa2, 0x40, 0x80, 0x32, 0x00, 0x00, 0x28, 0x00, 0x80, 0x40,</div><div class='add'>+	0x8f, 0x98, 0x01, 0x00, 0x29, 0x00, 0x80, 0x40, 0x8f, 0x98, 0x01, 0x00,</div><div class='add'>+	0x14, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00, 0x09, 0x92, 0xa2, 0xf0,</div><div class='add'>+	0x14, 0x30, 0x00, 0x00, 0x88, 0x00, 0x2d, 0x44, 0x8f, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x06, 0x92, 0xa2, 0xf2, 0x02, 0x6c, 0x00, 0x00, 0x00, 0x00, 0xa2, 0x40,</div><div class='add'>+	0x80, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x80, 0x49, 0x8f, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xf8, 0x91, 0x22, 0x41, 0x19, 0x7c, 0x00, 0x00, 0xf6, 0x91, 0x20, 0x91,</div><div class='add'>+	0x03, 0x6c, 0x00, 0x00, 0xf8, 0x91, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x0d, 0x92, 0x20, 0x0a, 0x02, 0x6c, 0x00, 0x00, 0x0c, 0x92, 0xa2, 0x40,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x80, 0x44, 0x8f, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x49, 0x8f, 0xb0, 0x01, 0x00, 0x12, 0x92, 0x22, 0x0a,</div><div class='add'>+	0x02, 0x6c, 0x00, 0x00, 0xe6, 0x91, 0xa2, 0x41, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x11, 0x92, 0xa2, 0x40, 0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x80, 0x55,</div><div class='add'>+	0x8f, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x80, 0x56, 0x8f, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x14, 0x92, 0xa2, 0x40, 0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x80, 0x43,</div><div class='add'>+	0x8f, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x80, 0x48, 0x8f, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x1a, 0x92, 0x00, 0x43, 0x95, 0xb0, 0x00, 0x00, 0x1a, 0x92, 0x00, 0x41,</div><div class='add'>+	0x95, 0xb0, 0x00, 0x00, 0x1a, 0x92, 0x00, 0x42, 0x95, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x1a, 0x92, 0x00, 0x44, 0x95, 0xb0, 0x00, 0x00, 0x1a, 0x92, 0x00, 0x4c,</div><div class='add'>+	0x95, 0xb0, 0x00, 0x00, 0xc9, 0x94, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x1d, 0x92, 0xa2, 0x40, 0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x80, 0x4b,</div><div class='add'>+	0x8f, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x80, 0x4c, 0x8f, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x2d, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00, 0x2e, 0x00, 0x2f, 0xf3,</div><div class='add'>+	0x84, 0xb0, 0x01, 0x00, 0x22, 0x92, 0xa2, 0xf3, 0x96, 0x30, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x40, 0x01, 0xb0, 0x01, 0x00, 0x2d, 0x00, 0x2a, 0x41,</div><div class='add'>+	0xe7, 0xd1, 0x01, 0x00, 0xd4, 0x00, 0x3d, 0x41, 0x85, 0xe0, 0x01, 0x00,</div><div class='add'>+	0x0b, 0x00, 0x00, 0xf2, 0x00, 0xe4, 0x01, 0x00, 0x28, 0x92, 0x22, 0x5a,</div><div class='add'>+	0x01, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x1f, 0x90, 0x01, 0x00,</div><div class='add'>+	0x29, 0x92, 0x00, 0x5a, 0x01, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x1f, 0x80, 0x01, 0x00, 0x00, 0x00, 0x63, 0x41, 0x85, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0xa0, 0xa5, 0x85, 0x6c, 0x01, 0x00, 0x00, 0x00, 0xe3, 0x40,</div><div class='add'>+	0x85, 0xb0, 0x01, 0x00, 0x0c, 0x80, 0x00, 0x03, 0x42, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x12, 0x00, 0x00, 0x40, 0x87, 0x98, 0x01, 0x00, 0xc6, 0x95, 0x00, 0xf0,</div><div class='add'>+	0x8c, 0xb0, 0x00, 0x00, 0x36, 0x92, 0x22, 0x40, 0x0f, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x2f, 0x05, 0x48, 0xb1, 0x01, 0x00, 0x33, 0x92, 0xa2, 0x4b,</div><div class='add'>+	0x19, 0x7c, 0x00, 0x00, 0x34, 0x92, 0x22, 0xf0, 0x18, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x60, 0x4b, 0x19, 0x90, 0x01, 0x00, 0xff, 0x92, 0x00, 0x07,</div><div class='add'>+	0x10, 0x30, 0x01, 0x00, 0xf9, 0x82, 0x00, 0x40, 0x05, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x38, 0x92, 0x22, 0x5a, 0x1f, 0x7c, 0x00, 0x00, 0x85, 0x92, 0x00, 0x40,</div><div class='add'>+	0x81, 0x30, 0x01, 0x00, 0xf9, 0x82, 0x00, 0x40, 0x05, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x2f, 0x05, 0x48, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x60, 0x4b,</div><div class='add'>+	0x19, 0x90, 0x01, 0x00, 0xff, 0x92, 0x00, 0x07, 0x10, 0x30, 0x01, 0x00,</div><div class='add'>+	0xf9, 0x82, 0x00, 0x40, 0x05, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x2f, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x60, 0x4b, 0x19, 0x90, 0x01, 0x00,</div><div class='add'>+	0xff, 0x92, 0x00, 0x07, 0x10, 0x30, 0x01, 0x00, 0x00, 0x00, 0x80, 0x40,</div><div class='add'>+	0x05, 0xb0, 0x01, 0x00, 0x41, 0x92, 0x33, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x44, 0x92, 0xa1, 0xad, 0x95, 0x20, 0x00, 0x00, 0x52, 0x92, 0x13, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x13, 0x4a, 0x5a, 0x83, 0x01, 0x00,</div><div class='add'>+	0x30, 0x00, 0x39, 0x45, 0x95, 0xe0, 0x01, 0x00, 0x1f, 0x00, 0x00, 0x0f,</div><div class='add'>+	0x5e, 0xd8, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5a, 0x5f, 0x90, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x45, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x04,</div><div class='add'>+	0x48, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x05, 0x4a, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x0c, 0x58, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x07,</div><div class='add'>+	0x4e, 0xb0, 0x01, 0x00, 0xa2, 0x84, 0x00, 0x40, 0x5d, 0x98, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x58, 0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4a,</div><div class='add'>+	0x62, 0xb1, 0x01, 0x00, 0x00, 0x00, 0xa8, 0x41, 0x97, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x4f, 0x92, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40,</div><div class='add'>+	0x97, 0xb0, 0x01, 0x00, 0x53, 0x92, 0x60, 0x07, 0x96, 0x30, 0x00, 0x00,</div><div class='add'>+	0xff, 0xff, 0x00, 0x4b, 0x84, 0x89, 0x01, 0x00, 0x00, 0x00, 0x70, 0xc2,</div><div class='add'>+	0x24, 0xb0, 0x01, 0x00, 0x5d, 0x92, 0xa2, 0x45, 0x25, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x57, 0x92, 0x31, 0x20, 0x85, 0x30, 0x00, 0x00, 0x5e, 0x92, 0x22, 0x12,</div><div class='add'>+	0x48, 0x7f, 0x00, 0x00, 0x58, 0x04, 0x11, 0x12, 0x48, 0x03, 0x01, 0x00,</div><div class='add'>+	0x10, 0x00, 0x00, 0x12, 0x96, 0xe4, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4b,</div><div class='add'>+	0x1e, 0x94, 0x01, 0x00, 0x00, 0x00, 0x80, 0x5a, 0x1f, 0x90, 0x01, 0x00,</div><div class='add'>+	0x5d, 0x92, 0x31, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb4,</div><div class='add'>+	0x24, 0xb0, 0x01, 0x00, 0x5e, 0x92, 0x22, 0x12, 0x48, 0x7f, 0x00, 0x00,</div><div class='add'>+	0x58, 0x04, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x2f, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x6b, 0x92, 0x0b, 0xf0, 0x84, 0x30, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x11, 0x12, 0x48, 0x83, 0x01, 0x00, 0x68, 0x92, 0x22, 0x50,</div><div class='add'>+	0x85, 0x70, 0x00, 0x00, 0x5e, 0x01, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00,</div><div class='add'>+	0x2a, 0x94, 0x00, 0xf2, 0x96, 0x30, 0x01, 0x00, 0x93, 0x04, 0x00, 0x12,</div><div class='add'>+	0x94, 0x30, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5a, 0x1f, 0x90, 0x01, 0x00,</div><div class='add'>+	0x10, 0x00, 0x00, 0x12, 0x96, 0xe4, 0x01, 0x00, 0x00, 0x00, 0x80, 0x4b,</div><div class='add'>+	0x1e, 0x94, 0x01, 0x00, 0x10, 0x00, 0x00, 0x42, 0x10, 0xf4, 0x01, 0x00,</div><div class='add'>+	0x00, 0xb7, 0x3f, 0x43, 0x11, 0xf0, 0x01, 0x00, 0x07, 0x00, 0x00, 0x08,</div><div class='add'>+	0x8a, 0x88, 0x01, 0x00, 0x6e, 0x92, 0x30, 0xa1, 0x0c, 0x30, 0x00, 0x00,</div><div class='add'>+	0x71, 0x92, 0x22, 0x45, 0xe6, 0x7d, 0x00, 0x00, 0x5e, 0x92, 0x10, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x2a, 0x45, 0xe6, 0x91, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x10, 0x12, 0x48, 0x83, 0x01, 0x00, 0x00, 0x00, 0x11, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x60, 0x4b, 0x85, 0x80, 0x01, 0x00,</div><div class='add'>+	0x5e, 0x01, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00, 0x2a, 0x94, 0x00, 0xf2,</div><div class='add'>+	0x96, 0x30, 0x01, 0x00, 0x00, 0x80, 0x00, 0x10, 0x44, 0xc9, 0x01, 0x00,</div><div class='add'>+	0xd8, 0x00, 0x00, 0x40, 0x81, 0x98, 0x01, 0x00, 0x2e, 0x00, 0x2d, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x7c, 0x92, 0x22, 0x40, 0xe7, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x80, 0x00, 0x00, 0x40, 0x80, 0xc8, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x09, 0x00, 0x00, 0x08, 0x86, 0xe4, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x68, 0xa7, 0x87, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x10, 0x62, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x80, 0x92, 0xa8, 0x05, 0xe0, 0x31, 0x00, 0x00, 0x10, 0x00, 0x00, 0x12,</div><div class='add'>+	0x96, 0xe4, 0x01, 0x00, 0x00, 0x14, 0x00, 0x4b, 0x96, 0xdc, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x4b, 0x1e, 0x94, 0x01, 0x00, 0x10, 0x00, 0x00, 0x0f,</div><div class='add'>+	0x84, 0xf4, 0x01, 0x00, 0x1f, 0x00, 0x00, 0x42, 0x84, 0x88, 0x01, 0x00,</div><div class='add'>+	0x89, 0x92, 0x22, 0x40, 0x80, 0x32, 0x00, 0x00, 0x8a, 0x92, 0x00, 0x42,</div><div class='add'>+	0x68, 0xb1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x6a, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x8a, 0x92, 0x31, 0x5a, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x91, 0x42,</div><div class='add'>+	0x48, 0x93, 0x01, 0x00, 0x8c, 0x92, 0x35, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x6d, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00, 0x91, 0x92, 0x28, 0xb1,</div><div class='add'>+	0x2c, 0x30, 0x00, 0x00, 0x8d, 0x92, 0x22, 0x4d, 0x75, 0x7d, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x95, 0x40, 0x11, 0xb0, 0x01, 0x00, 0x6d, 0x00, 0x00, 0x40,</div><div class='add'>+	0x61, 0x99, 0x01, 0x00, 0x91, 0x92, 0xa8, 0xb1, 0x10, 0x30, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x95, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x7f, 0x00, 0x00, 0x40,</div><div class='add'>+	0x61, 0x99, 0x01, 0x00, 0x98, 0x92, 0x28, 0xb1, 0x10, 0x30, 0x00, 0x00,</div><div class='add'>+	0x94, 0x92, 0x9f, 0xba, 0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40,</div><div class='add'>+	0x11, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x80, 0x24, 0x11, 0x84, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x5f, 0x61, 0xb1, 0x01, 0x00, 0x00, 0x10, 0x00, 0x00,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x00, 0x00, 0xa8, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x9a, 0x92, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xac, 0x94, 0x00, 0x40,</div><div class='add'>+	0x47, 0x99, 0x01, 0x00, 0x9e, 0x92, 0x32, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0xa4, 0x92, 0x22, 0xf8, 0x96, 0x30, 0x00, 0x00, 0x04, 0x00, 0x22, 0xf8,</div><div class='add'>+	0x90, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x92, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x01, 0x00, 0x00, 0x4b, 0xf0, 0xcd, 0x01, 0x00, 0x20, 0x00, 0x92, 0x48,</div><div class='add'>+	0xe0, 0xc9, 0x01, 0x00, 0x6c, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00,</div><div class='add'>+	0xa8, 0x92, 0x28, 0xb1, 0x92, 0x30, 0x00, 0x00, 0xa4, 0x92, 0x22, 0x4c,</div><div class='add'>+	0x75, 0x7d, 0x00, 0x00, 0x04, 0x00, 0x12, 0x40, 0x91, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x6c, 0x00, 0x00, 0x40, 0x61, 0x99, 0x01, 0x00, 0xa8, 0x92, 0xa8, 0xb1,</div><div class='add'>+	0x90, 0x30, 0x00, 0x00, 0xff, 0x00, 0x00, 0x48, 0x96, 0x88, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4b, 0x90, 0xd0, 0x01, 0x00, 0x01, 0x00, 0x00, 0x4b,</div><div class='add'>+	0xf0, 0xcd, 0x01, 0x00, 0x20, 0x00, 0x00, 0x48, 0xf0, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x92, 0x49, 0xe0, 0xb1, 0x01, 0x00, 0x0c, 0x00, 0x2d, 0x10,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0xff, 0x07, 0x00, 0x08, 0x82, 0x8c, 0x01, 0x00,</div><div class='add'>+	0xff, 0x07, 0x00, 0xf0, 0x00, 0x8c, 0x01, 0x00, 0x00, 0x00, 0xa2, 0x41,</div><div class='add'>+	0x00, 0xec, 0x00, 0x00, 0xb5, 0x92, 0x22, 0x1a, 0x00, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x99, 0x92, 0x00, 0x00, 0x34, 0x30, 0x01, 0x00, 0x00, 0x00, 0x00, 0x50,</div><div class='add'>+	0x49, 0xc1, 0x01, 0x00, 0xb1, 0x92, 0xa2, 0x41, 0x23, 0x50, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x0c, 0x00, 0x2d, 0x10,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0xff, 0x07, 0x00, 0x15, 0x82, 0x8c, 0x01, 0x00,</div><div class='add'>+	0xff, 0x07, 0x00, 0xf0, 0x00, 0x8c, 0x01, 0x00, 0x00, 0x00, 0xa2, 0x41,</div><div class='add'>+	0x00, 0xec, 0x00, 0x00, 0xbe, 0x92, 0x22, 0x0d, 0x00, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x99, 0x92, 0x00, 0x00, 0x1a, 0x30, 0x01, 0x00, 0x00, 0x00, 0x00, 0x50,</div><div class='add'>+	0x49, 0xc1, 0x01, 0x00, 0xba, 0x92, 0xa2, 0x41, 0x23, 0x50, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x40, 0x81, 0xb2, 0x01, 0x00, 0xc3, 0x92, 0x83, 0x1e,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x19, 0x90, 0x01, 0x00,</div><div class='add'>+	0x24, 0x00, 0x2d, 0x01, 0x2c, 0xb0, 0x01, 0x00, 0x28, 0x00, 0x2d, 0xf0,</div><div class='add'>+	0x16, 0xb0, 0x01, 0x00, 0x22, 0x00, 0x2d, 0xf0, 0x26, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x14, 0x00, 0x2f, 0xf2, 0x0c, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x80, 0x40,</div><div class='add'>+	0xe1, 0xb1, 0x01, 0x00, 0x30, 0x00, 0x00, 0x40, 0x97, 0x98, 0x01, 0x00,</div><div class='add'>+	0x60, 0x97, 0x2e, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0xca, 0x92, 0xa2, 0x41, 0x97, 0x50, 0x00, 0x00,</div><div class='add'>+	0x64, 0x97, 0x3e, 0x43, 0x9d, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x80, 0x40,</div><div class='add'>+	0xe1, 0xb1, 0x01, 0x00, 0x64, 0x97, 0x3e, 0x43, 0x9d, 0xe0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x0b, 0xe8, 0xb1, 0x01, 0x00, 0x64, 0x97, 0x3f, 0x43,</div><div class='add'>+	0x9d, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x16, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x40, 0xe1, 0xb1, 0x01, 0x00, 0x64, 0x97, 0x3f, 0x43,</div><div class='add'>+	0x9d, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf4, 0x16, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x40, 0xe1, 0xb1, 0x01, 0x00, 0x60, 0x17, 0x3d, 0x43,</div><div class='add'>+	0x9d, 0xe0, 0x01, 0x00, 0x10, 0x00, 0x80, 0xa1, 0x16, 0xe4, 0x01, 0x00,</div><div class='add'>+	0x00, 0xb5, 0x00, 0x0d, 0x42, 0xc9, 0x01, 0x00, 0xd9, 0x92, 0x30, 0x47,</div><div class='add'>+	0x17, 0x04, 0x00, 0x00, 0xdc, 0x92, 0xa2, 0x0b, 0xe6, 0x7d, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x90, 0x42, 0x81, 0xb0, 0x01, 0x00, 0x00, 0xb7, 0x00, 0x0d,</div><div class='add'>+	0x46, 0xc9, 0x01, 0x00, 0xe0, 0x92, 0xa2, 0x0b, 0xe6, 0x7d, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x0b, 0xe6, 0x91, 0x01, 0x00, 0x00, 0x00, 0x90, 0x41,</div><div class='add'>+	0x81, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x10, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0xe1, 0x92, 0x40, 0x07, 0x96, 0x30, 0x00, 0x00, 0x9d, 0x04, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0xeb, 0x92, 0xa2, 0x45, 0x95, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x01, 0x97, 0x3f, 0x41, 0x95, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf3,</div><div class='add'>+	0x96, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4e, 0xe6, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x40, 0x97, 0x3e, 0x40, 0x97, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4e,</div><div class='add'>+	0xe6, 0xb1, 0x01, 0x00, 0x40, 0x97, 0x3e, 0x40, 0x9d, 0xe0, 0x01, 0x00,</div><div class='add'>+	0xfe, 0x92, 0x00, 0x3b, 0xe7, 0xb1, 0x00, 0x00, 0xeb, 0x92, 0x30, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0xf5, 0x92, 0xa2, 0x0b, 0xe6, 0x7d, 0x00, 0x00,</div><div class='add'>+	0x00, 0xb5, 0x00, 0x0d, 0x46, 0xc9, 0x01, 0x00, 0xf1, 0x92, 0xa2, 0x0b,</div><div class='add'>+	0xe6, 0x7d, 0x00, 0x00, 0x00, 0x00, 0x10, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x98, 0x42, 0x81, 0xb0, 0x01, 0x00, 0x00, 0xb7, 0x00, 0x0d,</div><div class='add'>+	0x46, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x0b, 0xe6, 0x91, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x10, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x98, 0x41,</div><div class='add'>+	0x81, 0xb0, 0x01, 0x00, 0x04, 0x00, 0x21, 0xa2, 0x95, 0x20, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x10, 0x4a, 0x44, 0x83, 0x01, 0x00, 0x00, 0x97, 0x3e, 0x41,</div><div class='add'>+	0x95, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4e, 0xf6, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4e, 0xe6, 0xb1, 0x01, 0x00, 0x40, 0x97, 0x3e, 0x40,</div><div class='add'>+	0x9d, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x3b, 0xe7, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4a, 0x90, 0xb1, 0x01, 0x00, 0xff, 0xff, 0x00, 0x07,</div><div class='add'>+	0x92, 0x89, 0x01, 0x00, 0x00, 0x00, 0x98, 0x40, 0x81, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x03, 0x00, 0x00, 0x08, 0x86, 0xf4, 0x01, 0x00, 0x00, 0xb7, 0x00, 0x43,</div><div class='add'>+	0x46, 0xc9, 0x01, 0x00, 0x07, 0x00, 0x00, 0x08, 0x82, 0x88, 0x01, 0x00,</div><div class='add'>+	0x02, 0x93, 0x40, 0x08, 0x96, 0x30, 0x00, 0x00, 0x9d, 0x04, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x0e, 0x93, 0x22, 0x45, 0x95, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x0a, 0x93, 0x22, 0x5a, 0x1f, 0x7c, 0x00, 0x00, 0x10, 0x00, 0x00, 0x0f,</div><div class='add'>+	0x96, 0xf4, 0x01, 0x00, 0x07, 0x93, 0x31, 0x5f, 0x97, 0x04, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x11, 0x4b, 0x48, 0x93, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4b,</div><div class='add'>+	0x6a, 0xb1, 0x01, 0x00, 0x0a, 0x93, 0x30, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0xe6, 0x81, 0x01, 0x00, 0x00, 0x00, 0x10, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x98, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x97, 0x3f, 0x41, 0x95, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf3,</div><div class='add'>+	0x96, 0xb0, 0x01, 0x00, 0x40, 0x97, 0x3d, 0x40, 0x97, 0xe0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x63, 0xf3, 0x88, 0xb0, 0x01, 0x00, 0x16, 0x93, 0xa2, 0x3b,</div><div class='add'>+	0x89, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4a, 0x90, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x01, 0x00, 0x00, 0xa6, 0x92, 0xb1, 0x01, 0x00, 0x17, 0x93, 0x18, 0x4a,</div><div class='add'>+	0x44, 0x93, 0x00, 0x00, 0x00, 0x00, 0x18, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x30, 0x00, 0x39, 0x45, 0x97, 0xe0, 0x01, 0x00, 0x1c, 0x93, 0x22, 0x5a,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x1f, 0x04, 0x00, 0x0f, 0x98, 0xd8, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4c, 0x5e, 0x94, 0x01, 0x00, 0x1e, 0x93, 0x00, 0x05,</div><div class='add'>+	0x4a, 0xb0, 0x00, 0x00, 0x1f, 0x04, 0x00, 0xa7, 0x5e, 0x84, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x4b, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x58,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4b, 0x62, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0xa8, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x1f, 0x93, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x22, 0x93, 0x40, 0x07, 0x96, 0x30, 0x00, 0x00,</div><div class='add'>+	0x9d, 0x04, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x26, 0x93, 0x22, 0x45,</div><div class='add'>+	0x95, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x98, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x9b, 0x04, 0x00, 0x4a, 0x44, 0x13, 0x01, 0x00, 0x00, 0x97, 0x3f, 0x41,</div><div class='add'>+	0x95, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf3, 0x96, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x40, 0x97, 0x3d, 0x40, 0x97, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x63, 0xf3,</div><div class='add'>+	0x88, 0xb0, 0x01, 0x00, 0x30, 0x00, 0x38, 0x45, 0x97, 0xe0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x5f, 0x0f, 0x90, 0x01, 0x00, 0x00, 0x00, 0x00, 0x58,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4b, 0x62, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x2e, 0x93, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0x27, 0x93, 0xa2, 0x3b,</div><div class='add'>+	0x89, 0x6c, 0x00, 0x00, 0x30, 0x00, 0x38, 0x45, 0x9d, 0xe0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x98, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x93, 0x04, 0x00, 0x12,</div><div class='add'>+	0x94, 0x30, 0x01, 0x00, 0xff, 0x92, 0x00, 0x5a, 0x1f, 0x00, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x5a, 0x1f, 0x90, 0x01, 0x00, 0x11, 0x00, 0x00, 0x4a,</div><div class='add'>+	0xe6, 0xc9, 0x01, 0x00, 0x34, 0x00, 0x2f, 0x4f, 0x95, 0x84, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf3, 0x96, 0xb0, 0x01, 0x00, 0x01, 0x00, 0x63, 0x4b,</div><div class='add'>+	0x84, 0xc8, 0x01, 0x00, 0x00, 0x00, 0xa0, 0x43, 0x85, 0x6c, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0xe3, 0x40, 0x85, 0xb0, 0x01, 0x00, 0x30, 0x00, 0x2d, 0x44,</div><div class='add'>+	0x1f, 0x90, 0x01, 0x00, 0x32, 0x00, 0x2d, 0xf2, 0x2a, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x22, 0xf2, 0x02, 0x30, 0x00, 0x00, 0x1e, 0x92, 0x00, 0x10,</div><div class='add'>+	0x32, 0x30, 0x01, 0x00, 0x32, 0x00, 0xa0, 0x40, 0xe5, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x97, 0xb0, 0x01, 0x00, 0xf0, 0x07, 0x00, 0x40,</div><div class='add'>+	0x99, 0x98, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4a, 0x02, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x50, 0x03, 0xd0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x97, 0xc0, 0x01, 0x00, 0x00, 0x00, 0xa3, 0x4c, 0x02, 0xd0, 0x00, 0x00,</div><div class='add'>+	0x45, 0x93, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa8,</div><div class='add'>+	0x36, 0xb0, 0x01, 0x00, 0x55, 0x93, 0x22, 0x41, 0x03, 0x50, 0x00, 0x00,</div><div class='add'>+	0x00, 0x80, 0x00, 0x10, 0x44, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x50,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0x70, 0x00, 0x00, 0x03, 0xf0, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x42, 0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xb1, 0x01, 0x00, 0x4e, 0x93, 0xa8, 0x00, 0xe0, 0x31, 0x00, 0x00,</div><div class='add'>+	0xaf, 0x82, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x99, 0x92, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x7c, 0x80, 0x00, 0x03, 0x42, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf0, 0x00, 0xb0, 0x01, 0x00, 0x49, 0x93, 0x00, 0x5c,</div><div class='add'>+	0x01, 0x80, 0x00, 0x00, 0x99, 0x92, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x1b, 0x10, 0xb1, 0x00, 0x00, 0x68, 0x01, 0x2d, 0x06,</div><div class='add'>+	0x82, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf2, 0x82, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x80, 0x00, 0x03, 0x46, 0xc9, 0x01, 0x00, 0x94, 0x92, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x7c, 0x93, 0x22, 0x40, 0x11, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x68, 0x08, 0x38, 0x96, 0x01, 0x00, 0xf0, 0x07, 0x00, 0x41,</div><div class='add'>+	0x82, 0xcc, 0x01, 0x00, 0x5a, 0x93, 0xaa, 0x41, 0x3b, 0x40, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf8, 0x10, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5c,</div><div class='add'>+	0x11, 0x80, 0x01, 0x00, 0x01, 0x00, 0x00, 0x1d, 0x04, 0xcc, 0x01, 0x00,</div><div class='add'>+	0x7b, 0x93, 0x26, 0x46, 0x23, 0x30, 0x00, 0x00, 0x08, 0x00, 0x00, 0x03,</div><div class='add'>+	0x12, 0xc8, 0x01, 0x00, 0x64, 0x01, 0x20, 0xf0, 0xe0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x7a, 0x93, 0x22, 0x41, 0x05, 0x50, 0x00, 0x00, 0x20, 0x00, 0x00, 0x03,</div><div class='add'>+	0x48, 0xc9, 0x01, 0x00, 0x0c, 0x00, 0x00, 0xf8, 0x86, 0xc8, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x22, 0x44, 0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x43,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x09, 0xe0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x44, 0x61, 0xb1, 0x01, 0x00, 0xa0, 0x00, 0x00, 0xa4,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x6c, 0x93, 0xa8, 0x46, 0x1f, 0x10, 0x00, 0x00,</div><div class='add'>+	0x79, 0x93, 0x22, 0x41, 0x05, 0x50, 0x00, 0x00, 0x77, 0x93, 0xa2, 0x41,</div><div class='add'>+	0x23, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa1, 0x1a, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x44, 0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x72, 0x93, 0xa8, 0x46, 0x23, 0x30, 0x00, 0x00,</div><div class='add'>+	0xaf, 0x82, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x10, 0x00, 0x00, 0x03,</div><div class='add'>+	0x48, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x0d, 0x42, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x44, 0x13, 0xc0, 0x01, 0x00, 0x67, 0x93, 0x00, 0x50,</div><div class='add'>+	0x49, 0xc1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x04, 0x80, 0x00, 0x03, 0x1a, 0xc8, 0x01, 0x00, 0x00, 0x00, 0x80, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x7b, 0x93, 0x22, 0x40, 0x3b, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf8, 0x00, 0xb0, 0x01, 0x00, 0x99, 0x92, 0x00, 0x5c,</div><div class='add'>+	0x01, 0x00, 0x01, 0x00, 0x7c, 0x93, 0x00, 0x41, 0x3b, 0xd0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x8d, 0x47, 0x80, 0x32, 0x01, 0x00, 0xb0, 0x00, 0x2f, 0x5f,</div><div class='add'>+	0x13, 0xb0, 0x01, 0x00, 0x00, 0x00, 0xe0, 0xf0, 0x8c, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x80, 0x00, 0x03, 0x42, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8,</div><div class='add'>+	0x94, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x8c, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x88, 0x93, 0x8c, 0xf8, 0x8e, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44,</div><div class='add'>+	0x19, 0x90, 0x01, 0x00, 0x04, 0x00, 0x22, 0xf8, 0x14, 0x30, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf8, 0x16, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8,</div><div class='add'>+	0x26, 0xb0, 0x01, 0x00, 0x08, 0x00, 0x2e, 0xf8, 0x0c, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x0c, 0x00, 0x2a, 0x4a, 0xe0, 0xb1, 0x01, 0x00, 0x28, 0x00, 0x00, 0x00,</div><div class='add'>+	0xe0, 0xc9, 0x01, 0x00, 0x10, 0x00, 0x20, 0x1b, 0xe0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x95, 0x93, 0x20, 0x0a, 0x0c, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8,</div><div class='add'>+	0x94, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x96, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x20, 0x00, 0x20, 0xf0, 0xe4, 0xb1, 0x01, 0x00, 0x18, 0x00, 0x20, 0x4a,</div><div class='add'>+	0xe0, 0xb1, 0x01, 0x00, 0x1c, 0x00, 0x20, 0x4b, 0xe0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x80, 0x93, 0x00, 0x40, 0x13, 0xb0, 0x00, 0x00, 0x2c, 0x00, 0x2d, 0x42,</div><div class='add'>+	0x19, 0x90, 0x01, 0x00, 0x2e, 0x00, 0x2f, 0xf3, 0x82, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf3, 0x96, 0xb0, 0x01, 0x00, 0x9b, 0x93, 0xa2, 0xa5,</div><div class='add'>+	0x97, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x80, 0x41, 0x95, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x9e, 0x93, 0xa2, 0x40, 0x97, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x83, 0xb0, 0x01, 0x00, 0x2d, 0x00, 0x20, 0x40, 0xe7, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x63, 0x41, 0x97, 0xc0, 0x01, 0x00, 0xd4, 0x00, 0x3e, 0x41,</div><div class='add'>+	0x83, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41, 0x83, 0xc0, 0x01, 0x00,</div><div class='add'>+	0xa3, 0x93, 0xa0, 0xa5, 0x83, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x83, 0xb0, 0x01, 0x00, 0x2c, 0x00, 0x20, 0x41, 0xe6, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xa8, 0x93, 0x22, 0x40, 0x1f, 0x7c, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00,</div><div class='add'>+	0x98, 0xdc, 0x01, 0x00, 0x0b, 0x00, 0x00, 0x4c, 0xe4, 0xf5, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x40, 0x1f, 0x80, 0x01, 0x00, 0x0b, 0x00, 0x80, 0x00,</div><div class='add'>+	0xe4, 0xf5, 0x01, 0x00, 0x9d, 0x92, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x04, 0x80, 0x00, 0x03, 0x44, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x60, 0x41, 0x87, 0xb0, 0x01, 0x00, 0x00, 0x80, 0x00, 0x10,</div><div class='add'>+	0x44, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x50, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x48, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x49,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x03, 0xe0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x45, 0x61, 0xb1, 0x01, 0x00, 0x20, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x00, 0x00, 0xa8, 0x5d, 0x05, 0x90, 0x00, 0x00,</div><div class='add'>+	0xb4, 0x93, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x9d, 0x92, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x00, 0x80, 0x00, 0x03, 0x44, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x42,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x43, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x80, 0x00, 0x10,</div><div class='add'>+	0x44, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x50, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x48, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x49,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x03, 0xe0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x45, 0x61, 0xb1, 0x01, 0x00, 0x20, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x00, 0x00, 0xa8, 0x5d, 0x05, 0x90, 0x00, 0x00,</div><div class='add'>+	0xc3, 0x93, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x2d, 0x00, 0x00, 0x40,</div><div class='add'>+	0x43, 0x99, 0x01, 0x00, 0x2e, 0x00, 0x2f, 0xf3, 0x84, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x01, 0x00, 0x63, 0xf3, 0x96, 0xc8, 0x01, 0x00, 0xcb, 0x93, 0x9f, 0x41,</div><div class='add'>+	0x85, 0x50, 0x00, 0x00, 0x01, 0x00, 0x00, 0xa5, 0x85, 0xcc, 0x01, 0x00,</div><div class='add'>+	0x2d, 0x00, 0xa0, 0x42, 0xe6, 0xb1, 0x01, 0x00, 0x5e, 0x01, 0x2d, 0x00,</div><div class='add'>+	0x80, 0xb0, 0x01, 0x00, 0xd0, 0x93, 0x52, 0x43, 0x81, 0x60, 0x00, 0x00,</div><div class='add'>+	0x02, 0x00, 0x00, 0xf2, 0x82, 0xf4, 0x01, 0x00, 0xd1, 0x93, 0x00, 0x41,</div><div class='add'>+	0x80, 0x94, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5f, 0x81, 0x90, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x5e, 0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x62, 0xb1, 0x01, 0x00, 0x00, 0x00, 0xa8, 0x40, 0x95, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xd2, 0x93, 0x9e, 0xbb, 0x80, 0x32, 0x00, 0x00, 0xd7, 0x93, 0xa2, 0x40,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x99, 0x92, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x41, 0x95, 0xb0, 0x01, 0x00, 0x04, 0x00, 0x00, 0x15,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x54, 0x2b, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xfc, 0x24, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xfc,</div><div class='add'>+	0x38, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x3c, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xfe, 0x3a, 0xb0, 0x01, 0x00, 0xec, 0x93, 0x9c, 0x17,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0xe1, 0x93, 0xa2, 0x4a, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x4c, 0x1f, 0x90, 0x01, 0x00, 0x0c, 0x00, 0x00, 0x1e,</div><div class='add'>+	0x98, 0xf4, 0x01, 0x00, 0xe0, 0x93, 0xa2, 0x48, 0x99, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x15, 0x42, 0xb1, 0x01, 0x00, 0xe0, 0x93, 0xa2, 0x8a,</div><div class='add'>+	0xf1, 0x6d, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x01, 0x02, 0xcc, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xfc, 0x3e, 0xb0, 0x01, 0x00, 0x01, 0x00, 0x00, 0xf4,</div><div class='add'>+	0x28, 0xcc, 0x01, 0x00, 0xcc, 0x00, 0x2d, 0x05, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xeb, 0x93, 0x20, 0xf0, 0x3e, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4b,</div><div class='add'>+	0x1f, 0x90, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4c, 0x2b, 0xc0, 0x01, 0x00,</div><div class='add'>+	0xbf, 0x00, 0x2d, 0x05, 0x48, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x80, 0xf3,</div><div class='add'>+	0x3a, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x2e, 0x4b, 0x19, 0x90, 0x01, 0x00,</div><div class='add'>+	0x07, 0x00, 0x2a, 0x0c, 0xe4, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x80, 0x04,</div><div class='add'>+	0xe6, 0xb1, 0x01, 0x00, 0x18, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00,</div><div class='add'>+	0x1c, 0x00, 0x2d, 0xf0, 0x16, 0xb0, 0x01, 0x00, 0x20, 0x00, 0x2d, 0xf0,</div><div class='add'>+	0x26, 0xb0, 0x01, 0x00, 0x0c, 0x00, 0x2f, 0xf2, 0x0c, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0xa2, 0x06, 0x14, 0xec, 0x00, 0x00, 0xf8, 0x93, 0x22, 0x45,</div><div class='add'>+	0x1f, 0x7c, 0x00, 0x00, 0x00, 0x00, 0xa3, 0x06, 0x2a, 0xec, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf8, 0x94, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0,</div><div class='add'>+	0x96, 0xb0, 0x01, 0x00, 0x0c, 0x00, 0x2d, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x2a, 0x4c, 0xe1, 0xc1, 0x01, 0x00, 0x30, 0x00, 0x00, 0x10,</div><div class='add'>+	0x48, 0xc9, 0x01, 0x00, 0x0a, 0x00, 0x00, 0x40, 0xf1, 0x99, 0x01, 0x00,</div><div class='add'>+	0x18, 0x00, 0x00, 0x05, 0xf0, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4a,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4b, 0xe0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x47, 0x61, 0xb1, 0x01, 0x00, 0xa0, 0x00, 0x00, 0xa4,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x02, 0x94, 0xa8, 0x5c, 0x1f, 0x10, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x05, 0x48, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x2e, 0x10,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x01, 0xf0, 0xcd, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x03, 0xf0, 0xc9, 0x01, 0x00, 0x40, 0x00, 0x00, 0x00,</div><div class='add'>+	0xe0, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x2e, 0x50, 0x49, 0xc1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x06, 0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x03,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x0c, 0x94, 0x62, 0x42, 0x61, 0x31, 0x00, 0x00,</div><div class='add'>+	0x20, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00, 0x0d, 0x94, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x10, 0x00, 0x00, 0x10, 0x62, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x0f, 0x94, 0xa8, 0x00, 0xe0, 0x31, 0x00, 0x00, 0x00, 0x00, 0xf2, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x2e, 0x10, 0x48, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x01, 0xf0, 0xcd, 0x01, 0x00, 0x40, 0x00, 0x00, 0x03,</div><div class='add'>+	0xf0, 0xc9, 0x01, 0x00, 0x40, 0x00, 0x00, 0x00, 0xe0, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x2e, 0x50, 0x49, 0xc1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x06,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x03, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x19, 0x94, 0x62, 0x42, 0x61, 0x31, 0x00, 0x00, 0x20, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x1a, 0x94, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0xa0, 0x00, 0x00, 0xa4, 0x62, 0xdd, 0x01, 0x00, 0x1c, 0x94, 0xa8, 0x00,</div><div class='add'>+	0xe0, 0x31, 0x00, 0x00, 0x00, 0x00, 0xf2, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x30, 0x80, 0x00, 0x4a, 0x44, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x06,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0xc0, 0xa8, 0x3d, 0x46, 0x0d, 0xe0, 0x01, 0x00,</div><div class='add'>+	0xff, 0x7f, 0x00, 0xa1, 0xf0, 0x89, 0x01, 0x00, 0x02, 0x00, 0x00, 0x09,</div><div class='add'>+	0x96, 0xf4, 0x01, 0x00, 0x00, 0x00, 0x00, 0x46, 0x97, 0xe0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x60, 0xa8, 0x97, 0xc0, 0x01, 0x00, 0x26, 0x94, 0x63, 0x42,</div><div class='add'>+	0x61, 0x31, 0x00, 0x00, 0x30, 0x00, 0x00, 0x4a, 0x62, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x27, 0x94, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0xf3, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x99, 0x3f, 0x42, 0x97, 0xf0, 0x01, 0x00,</div><div class='add'>+	0x2b, 0x94, 0x65, 0x40, 0x81, 0x32, 0x00, 0x00, 0x33, 0x94, 0x22, 0xf3,</div><div class='add'>+	0x74, 0x06, 0x00, 0x00, 0x3f, 0x00, 0x00, 0xf3, 0x94, 0x88, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x07, 0xe7, 0x85, 0x01, 0x00, 0x00, 0x00, 0x75, 0x55,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4a, 0x62, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0xa8, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x30, 0x94, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0xf5, 0x40, 0x81, 0xb2, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xa8, 0x36, 0xb0, 0x01, 0x00, 0x43, 0x94, 0x82, 0x41,</div><div class='add'>+	0x23, 0x40, 0x00, 0x00, 0x38, 0x94, 0xa2, 0x44, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0xa7, 0x91, 0x00, 0x01, 0x8c, 0x30, 0x01, 0x00, 0x20, 0x80, 0x00, 0x10,</div><div class='add'>+	0x42, 0xc9, 0x01, 0x00, 0x3e, 0x94, 0x22, 0x40, 0xe3, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x43, 0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x3b, 0x94, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0xaf, 0x82, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x23, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x10, 0x32, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x43, 0x94, 0x22, 0x41, 0x19, 0x7c, 0x00, 0x00, 0xaf, 0x92, 0x00, 0x43,</div><div class='add'>+	0x23, 0x30, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41, 0x23, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x45, 0x94, 0xa3, 0x15, 0x0c, 0x6c, 0x00, 0x00, 0x46, 0x94, 0x00, 0x06,</div><div class='add'>+	0x04, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x04, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x48, 0x94, 0x20, 0x02, 0x1a, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0d,</div><div class='add'>+	0x04, 0xb0, 0x01, 0x00, 0x07, 0x95, 0x00, 0x05, 0x48, 0x31, 0x01, 0x00,</div><div class='add'>+	0x72, 0x94, 0x22, 0x02, 0x14, 0x50, 0x00, 0x00, 0x4c, 0x94, 0xa2, 0x02,</div><div class='add'>+	0x2a, 0x50, 0x00, 0x00, 0x72, 0x94, 0xa2, 0x45, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x4e, 0x94, 0x22, 0x02, 0x0c, 0x50, 0x00, 0x00, 0x57, 0x94, 0x00, 0x02,</div><div class='add'>+	0x16, 0xc0, 0x00, 0x00, 0x56, 0x94, 0x22, 0x5c, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x30, 0x80, 0x00, 0x10, 0x42, 0xc9, 0x01, 0x00, 0x56, 0x94, 0x22, 0x40,</div><div class='add'>+	0xe3, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x47, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00, 0x52, 0x94, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0xaf, 0x82, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x05, 0x48, 0xb1, 0x01, 0x00, 0xf1, 0x93, 0x00, 0x5c,</div><div class='add'>+	0x1f, 0x00, 0x01, 0x00, 0x72, 0x94, 0x22, 0x15, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x50, 0x33, 0xc0, 0x01, 0x00, 0x71, 0x94, 0xa2, 0x02,</div><div class='add'>+	0x1a, 0x50, 0x00, 0x00, 0x63, 0x94, 0x22, 0x46, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x70, 0x80, 0x00, 0x03, 0x42, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x46,</div><div class='add'>+	0x1f, 0x80, 0x01, 0x00, 0x63, 0x94, 0x22, 0x40, 0xe3, 0x6d, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x42, 0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x5f, 0x94, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0xaf, 0x82, 0x00, 0x88, 0x1c, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0x0c, 0x80, 0x00, 0x03, 0x42, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x10, 0x00, 0x00, 0xf0, 0x10, 0xc8, 0x01, 0x00, 0x2f, 0x00, 0x2f, 0x5c,</div><div class='add'>+	0x11, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00, 0x47, 0xe7, 0x91, 0x01, 0x00,</div><div class='add'>+	0xf0, 0x07, 0x00, 0x40, 0x1b, 0x98, 0x01, 0x00, 0x35, 0x94, 0x20, 0x15,</div><div class='add'>+	0x1a, 0x6c, 0x00, 0x00, 0x70, 0x00, 0x00, 0x03, 0x48, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x22, 0x50, 0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x03,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0xff, 0x07, 0x00, 0x08, 0xe0, 0x8d, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x42, 0x61, 0xb1, 0x01, 0x00, 0xa0, 0x00, 0x00, 0xa4,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x6e, 0x94, 0xa8, 0x46, 0x1f, 0x10, 0x00, 0x00,</div><div class='add'>+	0x35, 0x94, 0x00, 0x05, 0x48, 0xb1, 0x00, 0x00, 0x35, 0x94, 0x00, 0x02,</div><div class='add'>+	0x10, 0xc0, 0x00, 0x00, 0x74, 0x94, 0xa2, 0x44, 0x1f, 0x7c, 0x00, 0x00,</div><div class='add'>+	0xa7, 0x91, 0x00, 0x01, 0x8c, 0x30, 0x01, 0x00, 0x00, 0x00, 0x00, 0x1b,</div><div class='add'>+	0x10, 0xb1, 0x00, 0x00, 0x00, 0x80, 0x00, 0x10, 0x44, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x10, 0x00, 0x00, 0x40, 0xf1, 0x99, 0x01, 0x00, 0x10, 0x00, 0x00, 0x08,</div><div class='add'>+	0xf0, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x16, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x10, 0x00, 0x00, 0x03, 0xe0, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x45,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x20, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0xa8, 0x5c, 0x1f, 0x90, 0x00, 0x00, 0x7b, 0x94, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x17, 0x00, 0x00, 0xd0, 0xa2, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0xa2, 0x40, 0x27, 0xec, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20,</div><div class='add'>+	0x00, 0xb0, 0x01, 0x00, 0x99, 0x92, 0x00, 0x41, 0xa3, 0x41, 0x01, 0x00,</div><div class='add'>+	0x7f, 0x94, 0x00, 0x41, 0x27, 0xd0, 0x00, 0x00, 0x10, 0x00, 0x00, 0x07,</div><div class='add'>+	0x96, 0xe4, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4b, 0x80, 0x94, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x54, 0x61, 0xb1, 0x01, 0x00, 0x00, 0x80, 0x00, 0x40,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x00, 0x00, 0xa8, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x86, 0x94, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xd8, 0x94, 0x00, 0x40,</div><div class='add'>+	0x2b, 0x30, 0x01, 0x00, 0xac, 0x00, 0x2d, 0x06, 0x16, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x90, 0x00, 0x2d, 0xf0, 0x16, 0xc4, 0x01, 0x00, 0x8e, 0x94, 0xa0, 0xf0,</div><div class='add'>+	0x16, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x17, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x0e, 0x00, 0x00, 0xa2, 0x44, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x6c, 0xf0,</div><div class='add'>+	0x30, 0xb0, 0x01, 0x00, 0xac, 0x00, 0x2d, 0x40, 0x87, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x6c, 0xf0, 0x28, 0xb0, 0x01, 0x00, 0x97, 0x94, 0x22, 0x4a,</div><div class='add'>+	0x19, 0x7c, 0x00, 0x00, 0x00, 0x30, 0x00, 0x43, 0x86, 0xc8, 0x01, 0x00,</div><div class='add'>+	0x00, 0x30, 0x00, 0x0b, 0x16, 0xc8, 0x01, 0x00, 0x97, 0x94, 0xa4, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x17, 0xc0, 0x01, 0x00,</div><div class='add'>+	0xb8, 0x94, 0x22, 0x06, 0x80, 0x32, 0x00, 0x00, 0xa4, 0x94, 0xa2, 0x06,</div><div class='add'>+	0x14, 0x6c, 0x00, 0x00, 0xa1, 0x94, 0x22, 0x48, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x9c, 0x94, 0xa0, 0x41, 0x17, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x17, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41, 0x31, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x90, 0x00, 0x20, 0x18, 0xe0, 0xb1, 0x01, 0x00, 0x8b, 0x00, 0x2d, 0x48,</div><div class='add'>+	0x19, 0x80, 0x01, 0x00, 0x8b, 0x00, 0x20, 0x45, 0xe7, 0x91, 0x01, 0x00,</div><div class='add'>+	0xa4, 0x94, 0x00, 0x40, 0x87, 0x90, 0x00, 0x00, 0x08, 0x00, 0x00, 0x43,</div><div class='add'>+	0x86, 0x98, 0x01, 0x00, 0xa4, 0x94, 0xa0, 0x48, 0x17, 0x40, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x17, 0xc0, 0x01, 0x00, 0xb0, 0x00, 0x00, 0x40,</div><div class='add'>+	0x43, 0x99, 0x01, 0x00, 0x10, 0x50, 0x00, 0x43, 0xfc, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x0f, 0x95, 0x00, 0x30, 0x81, 0x30, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0xe5, 0xb1, 0x01, 0x00, 0xaf, 0x94, 0x22, 0x4a, 0x19, 0x7c, 0x00, 0x00,</div><div class='add'>+	0x08, 0x00, 0x00, 0xa2, 0x44, 0xc9, 0x01, 0x00, 0xcc, 0x00, 0x2d, 0xab,</div><div class='add'>+	0xf9, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xab, 0x17, 0xc0, 0x01, 0x00,</div><div class='add'>+	0xae, 0x94, 0xa0, 0xf0, 0x16, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x17, 0xc0, 0x01, 0x00, 0xb3, 0x94, 0x64, 0xf0, 0x82, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xa4, 0x00, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00, 0xb3, 0x94, 0xa2, 0xf2,</div><div class='add'>+	0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0xe5, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x8c, 0x00, 0x20, 0x18, 0xe0, 0xb1, 0x01, 0x00, 0x90, 0x00, 0x00, 0x40,</div><div class='add'>+	0x45, 0x99, 0x01, 0x00, 0x00, 0x00, 0x60, 0x06, 0x30, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x86, 0x0c, 0x80, 0xb2, 0x00, 0x00, 0xbc, 0x00, 0x2d, 0x46,</div><div class='add'>+	0x19, 0x90, 0x01, 0x00, 0xa0, 0x00, 0xa0, 0xf2, 0xe4, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xb0, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00, 0x10, 0x50, 0x00, 0x43,</div><div class='add'>+	0xfc, 0xc9, 0x01, 0x00, 0x0f, 0x95, 0x00, 0x30, 0x81, 0x30, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0xa2, 0x4a, 0x19, 0xfc, 0x00, 0x00, 0x08, 0x00, 0x00, 0xa2,</div><div class='add'>+	0x44, 0xc9, 0x01, 0x00, 0xcc, 0x00, 0x2d, 0xab, 0xf9, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xab, 0x17, 0xc0, 0x01, 0x00, 0xc1, 0x94, 0xa0, 0xf0,</div><div class='add'>+	0x16, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x17, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0xe4, 0xf0, 0x82, 0xb0, 0x01, 0x00, 0x00, 0x80, 0x00, 0x10,</div><div class='add'>+	0x44, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x03, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x10, 0x62, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0xa8, 0x1b, 0xe0, 0xb1, 0x00, 0x00, 0xc6, 0x94, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x0c, 0x7e, 0x89, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0xa6, 0x4c, 0x95, 0x60, 0x01, 0x00, 0x00, 0x00, 0x80, 0x4a,</div><div class='add'>+	0x18, 0x94, 0x01, 0x00, 0x00, 0x80, 0x00, 0x10, 0x44, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x22, 0x01, 0xf0, 0x31, 0x00, 0x00, 0x20, 0x00, 0x00, 0x40,</div><div class='add'>+	0xf0, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x16, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x43, 0x61, 0xb1, 0x01, 0x00, 0x20, 0x00, 0x00, 0x10,</div><div class='add'>+	0x62, 0xdd, 0x01, 0x00, 0x00, 0x00, 0xa8, 0x15, 0xe0, 0xb1, 0x00, 0x00,</div><div class='add'>+	0xd1, 0x94, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x10, 0x80, 0x00, 0x03,</div><div class='add'>+	0x44, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x06, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x01, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0xe8, 0x5f,</div><div class='add'>+	0x17, 0x90, 0x01, 0x00, 0x70, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00,</div><div class='add'>+	0x7a, 0x01, 0x2e, 0xfe, 0x92, 0xb0, 0x01, 0x00, 0x8b, 0x00, 0x2d, 0xf6,</div><div class='add'>+	0x16, 0xb0, 0x01, 0x00, 0xde, 0x94, 0x22, 0x43, 0xe7, 0x7d, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x44, 0x45, 0xc1, 0x01, 0x00, 0x04, 0x00, 0x00, 0xa6,</div><div class='add'>+	0x2a, 0xb0, 0x01, 0x00, 0x28, 0x00, 0x6e, 0x06, 0x82, 0xc8, 0x01, 0x00,</div><div class='add'>+	0xe2, 0x94, 0x22, 0x4a, 0x19, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42,</div><div class='add'>+	0x45, 0xd1, 0x01, 0x00, 0x00, 0x00, 0x6e, 0x4c, 0x83, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x92, 0xc0, 0x01, 0x00, 0xe3, 0x94, 0x43, 0x30,</div><div class='add'>+	0x3d, 0x07, 0x00, 0x00, 0x00, 0x00, 0x66, 0x9e, 0x83, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x1b, 0x41, 0x3d, 0xc3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x92, 0xc0, 0x01, 0x00, 0x06, 0x00, 0x00, 0xa2, 0x44, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x10, 0x00, 0x00, 0x49, 0x98, 0xf4, 0x01, 0x00, 0xec, 0x94, 0x26, 0x30,</div><div class='add'>+	0x93, 0x04, 0x00, 0x00, 0xec, 0x94, 0x90, 0x4c, 0x92, 0x40, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x93, 0xc0, 0x01, 0x00, 0xff, 0xff, 0x80, 0x49,</div><div class='add'>+	0xec, 0xa9, 0x01, 0x00, 0x00, 0x80, 0x00, 0x10, 0x44, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x22, 0x01, 0xf0, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x18, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x20, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00, 0x00, 0x00, 0xa8, 0x15,</div><div class='add'>+	0xe0, 0xb1, 0x00, 0x00, 0xf1, 0x94, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xfe, 0x94, 0x22, 0x5f, 0x81, 0x7c, 0x00, 0x00, 0xfd, 0x94, 0xa2, 0x40,</div><div class='add'>+	0x19, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x19, 0x90, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x54, 0x61, 0xb1, 0x01, 0x00, 0x10, 0x00, 0x00, 0x07,</div><div class='add'>+	0x96, 0xe4, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4f, 0x97, 0x94, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4b, 0x62, 0xb1, 0x01, 0x00, 0xfd, 0x94, 0x28, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0xfa, 0x94, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0xa2, 0x21, 0x81, 0x84, 0x00, 0x00, 0x01, 0x95, 0xa2, 0x5f,</div><div class='add'>+	0x81, 0x6c, 0x00, 0x00, 0x00, 0x00, 0xa2, 0x43, 0x19, 0x7c, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x43, 0x19, 0x90, 0x01, 0x00, 0x00, 0x00, 0x00, 0x54,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x10, 0x00, 0x00, 0x07, 0x96, 0xe4, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x96, 0x94, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4b,</div><div class='add'>+	0x62, 0xb1, 0x01, 0x00, 0x00, 0x00, 0xa8, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x95, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x80, 0x00, 0x19,</div><div class='add'>+	0x44, 0xc9, 0x01, 0x00, 0x04, 0x00, 0x22, 0x02, 0xf0, 0x31, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x0b, 0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x13,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x43, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x20, 0x00, 0x00, 0x19, 0x62, 0xdd, 0x01, 0x00, 0x00, 0x00, 0xa8, 0x08,</div><div class='add'>+	0xe0, 0xb1, 0x00, 0x00, 0x0c, 0x95, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x7c, 0x00, 0x2d, 0xf0, 0x84, 0xb0, 0x01, 0x00, 0x02, 0x00, 0x00, 0xf0,</div><div class='add'>+	0x98, 0xf4, 0x01, 0x00, 0x15, 0x95, 0x20, 0x4c, 0x84, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x88, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00, 0x15, 0x95, 0x20, 0xf2,</div><div class='add'>+	0x84, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x85, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x98, 0x00, 0x2d, 0x14, 0x82, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0,</div><div class='add'>+	0x98, 0xb0, 0x01, 0x00, 0xa3, 0x00, 0x2d, 0x14, 0x98, 0xd0, 0x01, 0x00,</div><div class='add'>+	0x1a, 0x95, 0x20, 0x4c, 0x84, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4c,</div><div class='add'>+	0x84, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf3, 0x80, 0xe0, 0x01, 0x00,</div><div class='add'>+	0x1d, 0x95, 0x23, 0x40, 0x84, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x84, 0xb0, 0x01, 0x00, 0xd0, 0x00, 0x20, 0x14, 0xe0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x98, 0x00, 0x25, 0x42, 0x80, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x6e, 0xf3,</div><div class='add'>+	0x80, 0xf0, 0x01, 0x00, 0x00, 0x00, 0xa6, 0x42, 0x82, 0xc0, 0x00, 0x00,</div><div class='add'>+	0x23, 0x95, 0xa0, 0x40, 0x16, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x17, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x9f, 0xf0, 0x82, 0xec, 0x00, 0x00,</div><div class='add'>+	0x98, 0x00, 0xa0, 0x41, 0xe0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x2e, 0x10,</div><div class='add'>+	0x48, 0xb1, 0x01, 0x00, 0xa8, 0x01, 0x00, 0x40, 0xf1, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x05, 0xf0, 0xb1, 0x01, 0x00, 0x09, 0x00, 0x00, 0x07,</div><div class='add'>+	0x96, 0xe4, 0x01, 0x00, 0x00, 0x00, 0x60, 0xa7, 0x97, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x10, 0x62, 0xb1, 0x01, 0x00, 0x00, 0x00, 0xa8, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x2a, 0x95, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xa8, 0x00, 0x2d, 0x1c, 0x8a, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x9f, 0xf0,</div><div class='add'>+	0x8a, 0xd0, 0x00, 0x00, 0x00, 0x00, 0xa2, 0x40, 0x8b, 0xec, 0x00, 0x00,</div><div class='add'>+	0x8a, 0x00, 0x20, 0x40, 0xe7, 0xb1, 0x01, 0x00, 0xb4, 0x00, 0x00, 0x40,</div><div class='add'>+	0x47, 0x99, 0x01, 0x00, 0xa4, 0x00, 0x2d, 0x45, 0xe0, 0xd1, 0x01, 0x00,</div><div class='add'>+	0x37, 0x95, 0x9c, 0x17, 0x80, 0x32, 0x00, 0x00, 0xbe, 0x00, 0x2f, 0xab,</div><div class='add'>+	0x83, 0xb0, 0x01, 0x00, 0x88, 0x95, 0x00, 0x14, 0x82, 0x50, 0x01, 0x00,</div><div class='add'>+	0x3c, 0x95, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x3c, 0x95, 0x22, 0xf2,</div><div class='add'>+	0x82, 0x30, 0x00, 0x00, 0x8c, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00,</div><div class='add'>+	0x3c, 0x95, 0x9f, 0x1c, 0xe0, 0x6d, 0x00, 0x00, 0xbe, 0x00, 0x00, 0x40,</div><div class='add'>+	0x47, 0x99, 0x01, 0x00, 0x88, 0x95, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0xa8, 0x00, 0x20, 0x1c, 0xe0, 0xb1, 0x01, 0x00, 0x9c, 0x00, 0x2d, 0x30,</div><div class='add'>+	0x81, 0xb0, 0x01, 0x00, 0x88, 0x00, 0x2d, 0xf0, 0x84, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x94, 0x00, 0x2d, 0xf2, 0x86, 0xb0, 0x01, 0x00, 0x4f, 0x95, 0x23, 0xf0,</div><div class='add'>+	0x84, 0x6c, 0x00, 0x00, 0x44, 0x95, 0x23, 0x92, 0x87, 0x6c, 0x00, 0x00,</div><div class='add'>+	0xc9, 0x04, 0x00, 0xa6, 0x94, 0xb0, 0x01, 0x00, 0x46, 0x95, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x20, 0x00, 0x00, 0xa6, 0x94, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x60, 0x89, 0x00, 0x4a, 0x94, 0x98, 0x01, 0x00, 0x46, 0x95, 0x68, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4a, 0xb0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xbf, 0x00, 0x2d, 0x42, 0xb2, 0xb1, 0x01, 0x00, 0x90, 0x00, 0x2d, 0xf3,</div><div class='add'>+	0x80, 0xe0, 0x01, 0x00, 0x4a, 0x95, 0xd4, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x78, 0xda, 0x84, 0xc0, 0x01, 0x00, 0x54, 0x95, 0x23, 0x40,</div><div class='add'>+	0x84, 0x6c, 0x00, 0x00, 0x94, 0x00, 0x20, 0x9d, 0xe1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x54, 0x95, 0x00, 0x40, 0x84, 0xb0, 0x00, 0x00, 0xbf, 0x00, 0x2d, 0x43,</div><div class='add'>+	0x84, 0xc0, 0x01, 0x00, 0x90, 0x00, 0x2d, 0xf3, 0x80, 0xe0, 0x01, 0x00,</div><div class='add'>+	0x54, 0x95, 0x23, 0x40, 0x84, 0x6c, 0x00, 0x00, 0x94, 0x00, 0x20, 0x9d,</div><div class='add'>+	0xe1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x84, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x58, 0x95, 0xa2, 0xf0, 0x38, 0x6c, 0x00, 0x00, 0x9c, 0x00, 0x20, 0x42,</div><div class='add'>+	0xe0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x5f, 0x13, 0x94, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x46, 0x19, 0x80, 0x01, 0x00, 0x9c, 0x00, 0x20, 0x42,</div><div class='add'>+	0xe0, 0xb1, 0x01, 0x00, 0x37, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0xf3, 0x80, 0xf4, 0x01, 0x00, 0x0f, 0x00, 0x00, 0xf3,</div><div class='add'>+	0x82, 0x88, 0x01, 0x00, 0x5e, 0x95, 0x23, 0x41, 0x80, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x5f, 0x13, 0x94, 0x01, 0x00, 0x00, 0x00, 0x89, 0x0c,</div><div class='add'>+	0x80, 0xb2, 0x00, 0x00, 0xbc, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00,</div><div class='add'>+	0xa0, 0x00, 0xa0, 0xf2, 0xe4, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x9f, 0x41,</div><div class='add'>+	0x24, 0xec, 0x00, 0x00, 0x68, 0x95, 0xa6, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x9f, 0x42, 0x38, 0xec, 0x00, 0x00, 0x68, 0x95, 0xa6, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0xb4, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00,</div><div class='add'>+	0x6a, 0x95, 0xa3, 0xf0, 0x3a, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0xb4, 0x00, 0x00, 0x40, 0x43, 0x99, 0x01, 0x00,</div><div class='add'>+	0x6e, 0x95, 0x22, 0xf0, 0x3a, 0x6c, 0x00, 0x00, 0xb4, 0x00, 0x20, 0x1d,</div><div class='add'>+	0xe0, 0xb1, 0x01, 0x00, 0x80, 0x00, 0x2d, 0x5f, 0x13, 0x94, 0x01, 0x00,</div><div class='add'>+	0x6e, 0x95, 0x23, 0xf0, 0x3a, 0x6c, 0x00, 0x00, 0x80, 0x00, 0x20, 0x1d,</div><div class='add'>+	0xe0, 0xb1, 0x01, 0x00, 0xc0, 0x00, 0x20, 0x12, 0xe0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xc4, 0x00, 0xa0, 0x1c, 0xe0, 0xb1, 0x01, 0x00, 0x00, 0x80, 0x00, 0x03,</div><div class='add'>+	0x44, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x42, 0xe0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x12, 0x00, 0x00, 0x40, 0x87, 0x98, 0x01, 0x00, 0x77, 0x95, 0x9f, 0x41,</div><div class='add'>+	0x24, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x8c, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x12, 0x8c, 0xd0, 0x01, 0x00, 0x78, 0x95, 0x00, 0x41,</div><div class='add'>+	0x24, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x8d, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xc6, 0x95, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0x45,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x40, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0xa8, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x7a, 0x95, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x8c, 0x92, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0xa2, 0x08, 0x80, 0x32, 0x01, 0x00, 0x81, 0x95, 0xa2, 0x40,</div><div class='add'>+	0x95, 0x6c, 0x00, 0x00, 0x99, 0x92, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00,</div><div class='add'>+	0x00, 0x82, 0x00, 0xa6, 0x04, 0xb0, 0x01, 0x00, 0xa0, 0x98, 0x2f, 0x40,</div><div class='add'>+	0x11, 0xb0, 0x01, 0x00, 0x30, 0x05, 0x00, 0x41, 0x89, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x9f, 0xf8, 0x3e, 0xec, 0x00, 0x00, 0x00, 0x00, 0x9f, 0x12,</div><div class='add'>+	0xe0, 0xed, 0x00, 0x00, 0xc8, 0x00, 0x20, 0xab, 0xe1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xcc, 0x00, 0xa0, 0x1f, 0xe0, 0xb1, 0x01, 0x00, 0x8a, 0x95, 0xa3, 0x5f,</div><div class='add'>+	0xe7, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0xe7, 0xc1, 0x01, 0x00,</div><div class='add'>+	0xa6, 0x00, 0x00, 0x40, 0x47, 0x99, 0x01, 0x00, 0x9e, 0x95, 0x22, 0xf2,</div><div class='add'>+	0x86, 0x30, 0x00, 0x00, 0x03, 0x00, 0x00, 0x43, 0x84, 0xf4, 0x01, 0x00,</div><div class='add'>+	0x01, 0x00, 0x00, 0x41, 0x80, 0xcc, 0x01, 0x00, 0xb8, 0x00, 0x2d, 0x42,</div><div class='add'>+	0x80, 0xd0, 0x01, 0x00, 0x00, 0x00, 0x62, 0x40, 0x86, 0xc0, 0x01, 0x00,</div><div class='add'>+	0x92, 0x95, 0x1f, 0x43, 0x80, 0x32, 0x00, 0x00, 0x93, 0x95, 0xa2, 0x40,</div><div class='add'>+	0x87, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x62, 0x41, 0x87, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x97, 0x95, 0x9f, 0x40, 0x80, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x85, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x84, 0xd0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x42, 0x80, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf2,</div><div class='add'>+	0x88, 0xb0, 0x01, 0x00, 0x02, 0x00, 0x00, 0x44, 0x84, 0xf4, 0x01, 0x00,</div><div class='add'>+	0xb8, 0x00, 0x2e, 0x42, 0x80, 0xd0, 0x01, 0x00, 0x00, 0x00, 0x62, 0x40,</div><div class='add'>+	0x88, 0xc0, 0x01, 0x00, 0x9d, 0x95, 0x1f, 0x44, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0xa1, 0x95, 0xa2, 0x40, 0x89, 0x6c, 0x00, 0x00, 0xa1, 0x95, 0x62, 0x41,</div><div class='add'>+	0x89, 0xb0, 0x00, 0x00, 0x03, 0x00, 0x62, 0x41, 0x86, 0xe4, 0x01, 0x00,</div><div class='add'>+	0xb8, 0x00, 0x00, 0x40, 0x45, 0x99, 0x01, 0x00, 0x01, 0x00, 0x62, 0x41,</div><div class='add'>+	0x88, 0xe4, 0x01, 0x00, 0xa4, 0x00, 0x20, 0x40, 0xe5, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xa2, 0x00, 0x20, 0x40, 0xe7, 0xb1, 0x01, 0x00, 0xbc, 0x00, 0x2e, 0x43,</div><div class='add'>+	0x87, 0xf0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44, 0x86, 0xc0, 0x01, 0x00,</div><div class='add'>+	0xa7, 0x95, 0x20, 0x43, 0x87, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x80, 0x43,</div><div class='add'>+	0xe5, 0xb1, 0x01, 0x00, 0x40, 0x01, 0x00, 0x43, 0x80, 0xce, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0xa4, 0x43, 0xe4, 0x31, 0x01, 0x00, 0x40, 0x01, 0xe2, 0x40,</div><div class='add'>+	0x87, 0x98, 0x01, 0x00, 0x88, 0x00, 0x2d, 0x44, 0x81, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x90, 0x00, 0x2d, 0xf2, 0x2e, 0xb0, 0x01, 0x00, 0x9c, 0x00, 0x2d, 0xf0,</div><div class='add'>+	0x86, 0xb0, 0x01, 0x00, 0x90, 0x00, 0x2d, 0xf0, 0x82, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xba, 0x00, 0x2d, 0xf0, 0x98, 0xb0, 0x01, 0x00, 0xb4, 0x95, 0xa2, 0x12,</div><div class='add'>+	0x98, 0x6c, 0x00, 0x00, 0xbc, 0x00, 0x2d, 0xf2, 0x98, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xb4, 0x95, 0xa0, 0xf2, 0x98, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x17,</div><div class='add'>+	0x82, 0xb0, 0x01, 0x00, 0x9c, 0x00, 0x20, 0x41, 0xe0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xb4, 0x00, 0x2d, 0x12, 0x86, 0xd0, 0x01, 0x00, 0xb7, 0x95, 0xa3, 0x41,</div><div class='add'>+	0xe0, 0x6d, 0x00, 0x00, 0xb8, 0x95, 0x00, 0xf0, 0x84, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x41, 0x84, 0xb0, 0x01, 0x00, 0x80, 0x00, 0x2d, 0x43,</div><div class='add'>+	0x84, 0xd0, 0x01, 0x00, 0xbb, 0x95, 0x9f, 0x42, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x85, 0xb0, 0x01, 0x00, 0xbd, 0x95, 0xa3, 0x42,</div><div class='add'>+	0x14, 0x6c, 0x00, 0x00, 0xbe, 0x95, 0x00, 0x0a, 0x0c, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x42, 0x0c, 0xb0, 0x01, 0x00, 0xc0, 0x95, 0xa0, 0x17,</div><div class='add'>+	0x0c, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x80, 0x17, 0x0c, 0xb0, 0x01, 0x00,</div><div class='add'>+	0xc5, 0x95, 0x22, 0x40, 0x0d, 0x6c, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x0a,</div><div class='add'>+	0x0c, 0xec, 0x00, 0x00, 0x01, 0x00, 0x00, 0xf0, 0x82, 0xf4, 0x01, 0x00,</div><div class='add'>+	0xc5, 0x95, 0xa0, 0x41, 0x0c, 0x6c, 0x00, 0x00, 0x00, 0x00, 0xa2, 0xf0,</div><div class='add'>+	0x80, 0x32, 0x01, 0x00, 0x00, 0x00, 0x80, 0x40, 0x81, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x9d, 0x92, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x04, 0x80, 0x00, 0x03,</div><div class='add'>+	0x44, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x46, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x60, 0x41,</div><div class='add'>+	0x87, 0x94, 0x01, 0x00, 0x00, 0x80, 0x00, 0x10, 0x44, 0xc9, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x50, 0xf1, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x48,</div><div class='add'>+	0xf0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x49, 0xf0, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x03, 0xe0, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x45,</div><div class='add'>+	0x61, 0xb1, 0x01, 0x00, 0x20, 0x00, 0x00, 0x10, 0x62, 0xdd, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0xa8, 0x5d, 0x05, 0x90, 0x00, 0x00, 0xd1, 0x95, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x2e, 0x4b, 0x19, 0x90, 0x01, 0x00,</div><div class='add'>+	0x05, 0x00, 0x2a, 0x0c, 0xe4, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x80, 0x04,</div><div class='add'>+	0xe6, 0xb1, 0x01, 0x00, 0xd7, 0x95, 0x45, 0x48, 0x61, 0x31, 0x00, 0x00,</div><div class='add'>+	0x00, 0x10, 0x00, 0x08, 0x62, 0xdd, 0x01, 0x00, 0xdc, 0x95, 0x28, 0x40,</div><div class='add'>+	0x87, 0x30, 0x00, 0x00, 0xd8, 0x95, 0x22, 0x48, 0x77, 0x7d, 0x00, 0x00,</div><div class='add'>+	0x7e, 0x94, 0x1d, 0x46, 0x87, 0xb0, 0x00, 0x00, 0xdf, 0x95, 0x22, 0x5f,</div><div class='add'>+	0x11, 0x7c, 0x00, 0x00, 0x04, 0x00, 0x22, 0x15, 0x62, 0x31, 0x00, 0x00,</div><div class='add'>+	0xdd, 0x95, 0xa8, 0x40, 0x81, 0x32, 0x00, 0x00, 0x00, 0x00, 0x9d, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x49, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x14, 0x2f, 0x4c, 0x83, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0xe2, 0x95, 0xa2, 0x41, 0x83, 0x50, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x49, 0xb1, 0x01, 0x00, 0x30, 0x00, 0x00, 0x40, 0xa1, 0x99, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x93, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x1f, 0xb0, 0x01, 0x00, 0x35, 0x96, 0x00, 0x49, 0x96, 0x30, 0x01, 0x00,</div><div class='add'>+	0x07, 0x00, 0x00, 0x49, 0x06, 0xe4, 0x01, 0x00, 0x00, 0x39, 0x00, 0x03,</div><div class='add'>+	0x06, 0xc8, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x05, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x20, 0x00, 0x00, 0xd0, 0xa0, 0xc9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41,</div><div class='add'>+	0x93, 0xc0, 0x01, 0x00, 0xe9, 0x95, 0xa0, 0x54, 0x93, 0x6c, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x2e, 0x05, 0x97, 0xb0, 0x01, 0x00, 0x00, 0x80, 0x00, 0x40,</div><div class='add'>+	0x49, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0xe1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x02, 0x00, 0xa2, 0x44, 0xc9, 0x01, 0x00, 0xf2, 0x95, 0xa2, 0x41,</div><div class='add'>+	0x97, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x49, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x3b, 0x96, 0x00, 0x40, 0x49, 0x31, 0x01, 0x00, 0xc8, 0x92, 0x00, 0x40,</div><div class='add'>+	0x81, 0x32, 0x01, 0x00, 0x00, 0xb5, 0x2e, 0x08, 0x97, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0xf1, 0xb1, 0x01, 0x00, 0xf9, 0x95, 0xa2, 0x41,</div><div class='add'>+	0x97, 0x50, 0x00, 0x00, 0x18, 0x00, 0x00, 0x40, 0x97, 0x98, 0x01, 0x00,</div><div class='add'>+	0x00, 0x97, 0x2e, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0xfd, 0x95, 0xa2, 0x41, 0x97, 0x50, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x49, 0xb1, 0x01, 0x00, 0x40, 0x18, 0x2e, 0x05,</div><div class='add'>+	0x97, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x01, 0x96, 0xa2, 0x41, 0x97, 0x50, 0x00, 0x00, 0x57, 0x95, 0x20, 0x40,</div><div class='add'>+	0xe7, 0xb1, 0x01, 0x00, 0x30, 0x94, 0x00, 0x40, 0x45, 0x99, 0x01, 0x00,</div><div class='add'>+	0x64, 0x00, 0x00, 0x40, 0xe5, 0x99, 0x01, 0x00, 0x56, 0x95, 0x20, 0x40,</div><div class='add'>+	0xe7, 0xb1, 0x01, 0x00, 0xb8, 0x94, 0x20, 0x41, 0xe5, 0xb1, 0x01, 0x00,</div><div class='add'>+	0xba, 0x94, 0x20, 0x41, 0xe5, 0xb1, 0x01, 0x00, 0x98, 0x94, 0x00, 0x40,</div><div class='add'>+	0x45, 0x99, 0x01, 0x00, 0x02, 0x00, 0x00, 0x40, 0x97, 0x98, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0xf1, 0xb1, 0x01, 0x00, 0x0b, 0x96, 0xa2, 0x41,</div><div class='add'>+	0x97, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x97, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x6f, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4b,</div><div class='add'>+	0x68, 0xb1, 0x01, 0x00, 0x0f, 0x96, 0x85, 0x41, 0x97, 0x40, 0x00, 0x00,</div><div class='add'>+	0x80, 0x04, 0x00, 0x40, 0x81, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x39, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x37, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x35, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x33, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x41, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x3f, 0xb3, 0x01, 0x00, 0xee, 0x05, 0x00, 0x40,</div><div class='add'>+	0x25, 0x9b, 0x01, 0x00, 0x42, 0x00, 0x00, 0x40, 0x4b, 0x9b, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x2f, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x2d, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x47, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x43, 0xb3, 0x01, 0x00, 0x60, 0x00, 0x00, 0x40,</div><div class='add'>+	0x2b, 0x9b, 0x01, 0x00, 0x00, 0x00, 0x00, 0x54, 0xef, 0x93, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x55, 0xf1, 0x93, 0x01, 0x00, 0xff, 0xff, 0x00, 0xa5,</div><div class='add'>+	0x3c, 0x8b, 0x01, 0x00, 0x00, 0x00, 0x00, 0x2c, 0x5b, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x2c, 0x45, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x59, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x57, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x40, 0x27, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x53, 0xb3, 0x01, 0x00, 0x2b, 0x96, 0xa2, 0x50, 0xfd, 0x7f, 0x00, 0x00,</div><div class='add'>+	0x2b, 0x96, 0xa2, 0x51, 0xfd, 0x7f, 0x00, 0x00, 0x2c, 0x96, 0x00, 0x40,</div><div class='add'>+	0x1d, 0xb3, 0x00, 0x00, 0x50, 0x46, 0x00, 0x40, 0x1d, 0x9b, 0x01, 0x00,</div><div class='add'>+	0x00, 0xc0, 0x00, 0xa6, 0x88, 0xb3, 0x01, 0x00, 0xff, 0x3f, 0x00, 0xa6,</div><div class='add'>+	0x3a, 0xb3, 0x01, 0x00, 0x00, 0xc0, 0x00, 0x9d, 0x3b, 0x9b, 0x01, 0x00,</div><div class='add'>+	0xb4, 0x05, 0x00, 0x40, 0x23, 0x9b, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0x4d, 0xb3, 0x01, 0x00, 0x08, 0x0a, 0x00, 0xa6, 0x14, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x01, 0x01, 0x00, 0x8a, 0x15, 0x9b, 0x01, 0x00, 0x00, 0x80, 0x00, 0xa6,</div><div class='add'>+	0x56, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x80, 0x5e, 0x57, 0xb5, 0x01, 0x00,</div><div class='add'>+	0x18, 0x00, 0x00, 0x4b, 0x20, 0xe4, 0x01, 0x00, 0x06, 0x00, 0x00, 0x4b,</div><div class='add'>+	0x96, 0xe4, 0x01, 0x00, 0x00, 0x43, 0x00, 0x4b, 0x96, 0xc8, 0x01, 0x00,</div><div class='add'>+	0x18, 0x00, 0x00, 0x10, 0x20, 0xdc, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4b,</div><div class='add'>+	0x20, 0x94, 0x01, 0x00, 0x00, 0x00, 0x80, 0x57, 0x21, 0x90, 0x01, 0x00,</div><div class='add'>+	0x00, 0x99, 0x2e, 0x0a, 0x97, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40,</div><div class='add'>+	0xf1, 0xb1, 0x01, 0x00, 0x3c, 0x96, 0xa2, 0x41, 0x97, 0x50, 0x00, 0x00,</div><div class='add'>+	0x00, 0x03, 0x00, 0x40, 0x97, 0x98, 0x01, 0x00, 0x00, 0xa9, 0x00, 0x40,</div><div class='add'>+	0x45, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0xf1, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x40, 0x96, 0xa2, 0x41, 0x97, 0x50, 0x00, 0x00, 0x30, 0x00, 0x00, 0x40,</div><div class='add'>+	0x97, 0x98, 0x01, 0x00, 0x00, 0x00, 0x00, 0x55, 0x61, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4b, 0x62, 0xb1, 0x01, 0x00, 0x44, 0x96, 0xa8, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0x44, 0x96, 0xa2, 0x41, 0x97, 0x50, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x80, 0x40, 0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x80, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xae, 0x9f, 0x00, 0x88,</div><div class='add'>+	0x9a, 0xb0, 0x00, 0x00, 0xae, 0x9f, 0x00, 0x88, 0x9a, 0xb0, 0x00, 0x00,</div><div class='add'>+	0xae, 0x9f, 0x00, 0x88, 0x9a, 0xb0, 0x00, 0x00, 0xae, 0x9f, 0x00, 0x88,</div><div class='add'>+	0x9a, 0xb0, 0x00, 0x00, 0xae, 0x9f, 0x00, 0x88, 0x9a, 0xb0, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x88, 0x9a, 0xb0, 0x01, 0x00, 0xae, 0x9f, 0x41, 0x40,</div><div class='add'>+	0x81, 0x32, 0x00, 0x00, 0xb2, 0x9f, 0x22, 0x40, 0x7b, 0x6f, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x19, 0x40, 0x81, 0xb2, 0x01, 0x00, 0xae, 0x9f, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x19, 0x41, 0x7b, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xa4, 0xc4, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xa1,</div><div class='add'>+	0xc6, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x2f, 0xa2, 0xc8, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x08, 0x14, 0x00, 0x40, 0x49, 0x99, 0x01, 0x00, 0xa8, 0x9f, 0x00, 0x4d,</div><div class='add'>+	0x9a, 0xcc, 0x01, 0x00, 0xbb, 0x9f, 0x26, 0x40, 0x81, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x4c, 0x49, 0xc1, 0x01, 0x00, 0xb9, 0x9f, 0xa2, 0x41,</div><div class='add'>+	0x9b, 0x50, 0x00, 0x00, 0xbf, 0x9f, 0x80, 0x80, 0x80, 0x32, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x52, 0x49, 0xfd, 0x93, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4a,</div><div class='add'>+	0xfd, 0x93, 0x01, 0x00, 0xc2, 0x9f, 0x00, 0x42, 0xcd, 0x93, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x51, 0x4a, 0xfd, 0x93, 0x01, 0x00, 0x00, 0x00, 0x00, 0x49,</div><div class='add'>+	0xfd, 0x93, 0x01, 0x00, 0xc2, 0x9f, 0x00, 0x43, 0xcb, 0x93, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x50, 0x40, 0x81, 0xb2, 0x01, 0x00, 0xd2, 0x9f, 0x00, 0x40,</div><div class='add'>+	0x19, 0x99, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x9a, 0xb0, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x44, 0x49, 0xd1, 0x01, 0x00, 0x00, 0x00, 0x40, 0xf0,</div><div class='add'>+	0x80, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x41, 0x4d, 0x80, 0xb2, 0x01, 0x00,</div><div class='add'>+	0xca, 0x9f, 0x00, 0x40, 0x19, 0x99, 0x01, 0x00, 0x00, 0x00, 0x4c, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44, 0x49, 0xd1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xf0, 0x9a, 0xb0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4d,</div><div class='add'>+	0x10, 0xb1, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe2, 0x49, 0xb1, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xe3, 0x43, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0xe4,</div><div class='add'>+	0x45, 0xb1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x7b, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x00, 0x48, 0x4f, 0x40, 0xb1, 0x01, 0x00, 0xd2, 0x9f, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0xcb,</div><div class='add'>+	0x81, 0xc8, 0x01, 0x00, 0xf4, 0x82, 0x00, 0x40, 0xf2, 0x93, 0x00, 0x00,</div><div class='add'>+	0x40, 0x82, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x40, 0x05, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x18, 0x06, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xf4, 0x82, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xaf, 0x82, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x38, 0x81, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x36, 0x81, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xb8, 0x80, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x14, 0x87, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xaf, 0x82, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xf5, 0x82, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x94, 0x92, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0xd7, 0x95, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x5d, 0x92, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0xc6, 0x95, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x33, 0x93, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0xd6, 0x92, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0xd0, 0x92, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x9a, 0x82, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x01, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	0x04, 0x00, 0x00, 0x40, 0x81, 0xb2, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,</div><div class='add'>+	0x81, 0xb2, 0x00, 0x00,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='head'>diff --git a/drivers/staging/slicoss/oasisrcvucode.h b/drivers/staging/slicoss/oasisrcvucode.h<br/>new file mode 100644<br/>index 000000000000..5b3531f04cb9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/slicoss/oasisrcvucode.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/slicoss/oasisrcvucode.h</a></div><div class='hunk'>@@ -0,0 +1,205 @@</div><div class='add'>+#define OASIS_RCVUCODE_VERS_STRING	"1.2"</div><div class='add'>+#define OASIS_RCVUCODE_VERS_DATE  	"2006/03/27 15:10:28"</div><div class='add'>+</div><div class='add'>+static u32 OasisRcvUCodeLen = 512;</div><div class='add'>+</div><div class='add'>+static u8 OasisRcvUCode[2560] =</div><div class='add'>+{</div><div class='add'>+0x47, 0x75, 0x01, 0x00, 0x04, 0xa0, 0x13, 0x01, 0x00, 0x1c, 0xb7, 0x5b, 0x09,</div><div class='add'>+0x30, 0x00, 0xb6, 0x5f, 0x01, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x20, 0x18, 0x3b,</div><div class='add'>+0x78, 0x3a, 0x00, 0x1c, 0xa2, 0x77, 0x01, 0x00, 0x1c, 0x07, 0x1d, 0x01, 0x70,</div><div class='add'>+0x18, 0xad, 0x7b, 0xf1, 0xff, 0x1c, 0xb3, 0x7b, 0xa9, 0xaa, 0x1e, 0xb4, 0x7b,</div><div class='add'>+0x01, 0x0c, 0x1c, 0xb5, 0x7b, 0x0d, 0x06, 0x1c, 0x00, 0x00, 0x30, 0x64, 0x08,</div><div class='add'>+0x0c, 0x31, 0x5a, 0x70, 0x04, 0x0c, 0x31, 0x5a, 0x80, 0x04, 0x0c, 0x31, 0x4e,</div><div class='add'>+0x90, 0x04, 0x0c, 0x31, 0x4a, 0xa0, 0x00, 0x09, 0x25, 0x55, 0xc0, 0x04, 0x0c,</div><div class='add'>+0x31, 0x52, 0xb0, 0x00, 0xe9, 0x24, 0x55, 0xc0, 0x04, 0xcc, 0xb3, 0x00, 0x1c,</div><div class='add'>+0x1c, 0xeb, 0x2d, 0x01, 0x00, 0x1c, 0x06, 0x56, 0x32, 0xd4, 0x08, 0x07, 0x9d,</div><div class='add'>+0x00, 0x00, 0x1c, 0x7b, 0xb7, 0x02, 0x00, 0x10, 0xa0, 0x0f, 0x31, 0x54, 0x09,</div><div class='add'>+0x06, 0x56, 0x5e, 0xc0, 0x04, 0xa0, 0x30, 0x54, 0x03, 0x00, 0xac, 0x30, 0x55,</div><div class='add'>+0x03, 0x00, 0xcd, 0x03, 0x3a, 0x00, 0x1c, 0x7b, 0xb7, 0x02, 0x00, 0x1c, 0x60,</div><div class='add'>+0x8e, 0x31, 0x54, 0x09, 0x29, 0x25, 0x55, 0x03, 0x00, 0x80, 0x8e, 0x31, 0x54,</div><div class='add'>+0x09, 0x8c, 0x30, 0x91, 0x00, 0x04, 0x47, 0x1c, 0x01, 0x00, 0x1c, 0xa0, 0x0f,</div><div class='add'>+0x31, 0x54, 0x09, 0x00, 0x00, 0x64, 0x00, 0x04, 0x47, 0x1c, 0x65, 0xc0, 0x04,</div><div class='add'>+0x47, 0x1c, 0x55, 0x03, 0x00, 0x6c, 0x30, 0x01, 0x00, 0x1c, 0x4d, 0x34, 0x02,</div><div class='add'>+0x00, 0x1c, 0x7b, 0xb7, 0x02, 0x00, 0x1c, 0xa0, 0x0f, 0x31, 0x54, 0x09, 0xc8,</div><div class='add'>+0x83, 0x37, 0x00, 0x1c, 0x80, 0x01, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x64, 0x00,</div><div class='add'>+0x04, 0xa0, 0x0f, 0x30, 0x54, 0x09, 0x00, 0x00, 0x54, 0xc3, 0x04, 0x7b, 0xfb,</div><div class='add'>+0xf2, 0x00, 0x1c, 0xcc, 0x33, 0x0d, 0x00, 0x1c, 0xb4, 0x7b, 0xfd, 0x03, 0x1c,</div><div class='add'>+0x80, 0x0e, 0x30, 0x54, 0x09, 0xe0, 0xfb, 0x05, 0x00, 0x1c, 0x00, 0x00, 0x8c,</div><div class='add'>+0x03, 0x00, 0xb3, 0x0f, 0x31, 0x54, 0x09, 0x00, 0x00, 0xec, 0x70, 0x04, 0x00,</div><div class='add'>+0x00, 0xec, 0x80, 0x04, 0x00, 0x00, 0x8c, 0x93, 0x00, 0x61, 0x76, 0x8d, 0xc3,</div><div class='add'>+0x04, 0xc0, 0x8d, 0x31, 0x54, 0x09, 0xe0, 0x7b, 0x00, 0xc0, 0x1f, 0xa0, 0xfd,</div><div class='add'>+0xc5, 0x01, 0x00, 0xcc, 0x33, 0x05, 0x00, 0x1c, 0xd4, 0x03, 0x00, 0x3c, 0x1c,</div><div class='add'>+0xd4, 0xd3, 0x1b, 0x00, 0x1c, 0xc0, 0xd3, 0x52, 0x00, 0x1c, 0x00, 0x00, 0x5c,</div><div class='add'>+0x13, 0x04, 0x8e, 0x8e, 0x32, 0x54, 0x09, 0x5b, 0x80, 0x5e, 0x13, 0x04, 0x00,</div><div class='add'>+0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x94, 0x01, 0x00, 0xa0, 0x0f, 0x31, 0x54,</div><div class='add'>+0x09, 0xa0, 0x0f, 0x31, 0x54, 0x09, 0xc0, 0x03, 0xfc, 0x7f, 0x1c, 0xa0, 0x01,</div><div class='add'>+0xa0, 0x01, 0x00, 0x00, 0x00, 0xa4, 0x01, 0x00, 0xa0, 0x0f, 0x31, 0x54, 0x09,</div><div class='add'>+0xc0, 0x03, 0xfc, 0x03, 0x1c, 0xf5, 0x77, 0x01, 0x00, 0x1c, 0x26, 0x7a, 0xe6,</div><div class='add'>+0x05, 0x1c, 0xa0, 0x0f, 0x31, 0x54, 0x09, 0xb3, 0x0f, 0x31, 0x54, 0x09, 0xb5,</div><div class='add'>+0x02, 0x02, 0x00, 0x1c, 0xa0, 0x0f, 0x31, 0x54, 0x09, 0x7a, 0x7e, 0x02, 0x00,</div><div class='add'>+0x1c, 0xb5, 0x02, 0x02, 0x00, 0x1c, 0x53, 0x0f, 0x32, 0x54, 0x09, 0xaf, 0x03,</div><div class='add'>+0x01, 0x00, 0x1c, 0x7a, 0x0e, 0x32, 0x54, 0x09, 0xb5, 0x02, 0x02, 0x00, 0x1c,</div><div class='add'>+0x00, 0x00, 0x02, 0x00, 0x1c, 0xa0, 0x3d, 0xaa, 0x11, 0x04, 0x00, 0x00, 0xac,</div><div class='add'>+0x11, 0x04, 0xd4, 0xd3, 0x52, 0x00, 0x1c, 0xb5, 0x3e, 0xb2, 0x01, 0x00, 0x20,</div><div class='add'>+0xfb, 0xfd, 0xff, 0x1f, 0x80, 0x2c, 0x6c, 0x03, 0x00, 0xb9, 0x3a, 0x9e, 0x01,</div><div class='add'>+0x00, 0x75, 0x3b, 0x02, 0x00, 0x1c, 0xa7, 0x1c, 0x01, 0x00, 0x10, 0xdb, 0x83,</div><div class='add'>+0x16, 0x00, 0x1c, 0xc7, 0x1d, 0x21, 0xc1, 0x04, 0xb9, 0x3b, 0x8d, 0xc1, 0x04,</div><div class='add'>+0x8b, 0x2c, 0x01, 0x00, 0x1c, 0x6b, 0x2c, 0x35, 0xc1, 0x04, 0x00, 0x00, 0x78,</div><div class='add'>+0x11, 0x00, 0xcb, 0x2c, 0x79, 0xc1, 0x04, 0xa0, 0x0f, 0x31, 0x54, 0x09, 0xa0,</div><div class='add'>+0x0f, 0x31, 0x54, 0x09, 0x54, 0xd0, 0x02, 0x00, 0x1c, 0x49, 0x25, 0xb1, 0x01,</div><div class='add'>+0x00, 0xab, 0x2c, 0x81, 0xc1, 0x04, 0xa7, 0x1d, 0x55, 0x03, 0x00, 0xcc, 0x33,</div><div class='add'>+0x09, 0x00, 0x1c, 0xeb, 0x2d, 0x01, 0x00, 0x1c, 0xea, 0x29, 0x01, 0x00, 0x1c,</div><div class='add'>+0xa0, 0x0f, 0x31, 0x54, 0x09, 0xae, 0x0f, 0x31, 0x54, 0x09, 0xa0, 0x0f, 0x31,</div><div class='add'>+0x54, 0x09, 0xd4, 0x07, 0xfc, 0x03, 0x1c, 0x99, 0x3a, 0x02, 0x00, 0x1c, 0xbb,</div><div class='add'>+0x38, 0x02, 0x00, 0x1c, 0x00, 0x38, 0x00, 0x00, 0x1c, 0x00, 0x00, 0xfc, 0x01,</div><div class='add'>+0x04, 0xdb, 0x3b, 0x7e, 0x00, 0x1c, 0xc7, 0x1d, 0x01, 0x00, 0x1c, 0x26, 0x7a,</div><div class='add'>+0xfa, 0x05, 0x1c, 0x27, 0x1d, 0x01, 0x00, 0x1c, 0xb3, 0x0f, 0x31, 0x54, 0x09,</div><div class='add'>+0x7a, 0x0e, 0x32, 0x54, 0x09, 0x53, 0x0f, 0x32, 0x54, 0x09, 0x7a, 0x0e, 0x32,</div><div class='add'>+0x54, 0x09, 0x53, 0x0f, 0x32, 0x54, 0x09, 0x7a, 0x0e, 0x32, 0x54, 0x09, 0x53,</div><div class='add'>+0x0f, 0x32, 0x54, 0x09, 0xa0, 0x0f, 0x31, 0x54, 0x09, 0x7a, 0x06, 0x02, 0x00,</div><div class='add'>+0x1c, 0x53, 0x0f, 0x32, 0x54, 0x09, 0xaf, 0x03, 0x01, 0x00, 0x1c, 0x7a, 0x0e,</div><div class='add'>+0x32, 0x54, 0x09, 0x53, 0x0f, 0x32, 0x54, 0x09, 0x7a, 0x0e, 0x32, 0x54, 0x09,</div><div class='add'>+0x53, 0x0f, 0x32, 0x54, 0x09, 0x7a, 0x0e, 0x32, 0x54, 0x09, 0x53, 0x0f, 0x32,</div><div class='add'>+0x54, 0x09, 0x7a, 0x0e, 0x32, 0x54, 0x09, 0x00, 0x3d, 0x02, 0x00, 0x1c, 0x00,</div><div class='add'>+0x00, 0x58, 0x12, 0x00, 0xcb, 0x2c, 0x01, 0x00, 0x1c, 0x75, 0x3b, 0x02, 0x00,</div><div class='add'>+0x1c, 0xa7, 0x1c, 0x01, 0x00, 0x10, 0xcb, 0x2f, 0x05, 0x00, 0x1c, 0x60, 0x2c,</div><div class='add'>+0x00, 0x00, 0x1c, 0xc7, 0x1c, 0xc9, 0x02, 0x00, 0xa0, 0x0f, 0x31, 0x54, 0x09,</div><div class='add'>+0x53, 0x07, 0x02, 0x00, 0x1c, 0x46, 0x7a, 0xca, 0x05, 0x1c, 0x7a, 0x0e, 0x32,</div><div class='add'>+0x54, 0x09, 0x40, 0xfa, 0x19, 0x00, 0x1c, 0x00, 0x00, 0x88, 0x02, 0x04, 0x46,</div><div class='add'>+0x7a, 0xca, 0x05, 0x1c, 0xa0, 0x0f, 0x31, 0x54, 0x09, 0xa0, 0x0f, 0x31, 0x54,</div><div class='add'>+0x09, 0xa0, 0x0f, 0x31, 0x54, 0x09, 0xa0, 0x0f, 0x31, 0x54, 0x09, 0xb3, 0x7b,</div><div class='add'>+0x01, 0xc0, 0x1f, 0x74, 0x0e, 0x30, 0x54, 0x09, 0xc0, 0x03, 0x9c, 0x00, 0x1c,</div><div class='add'>+0x80, 0x00, 0xd8, 0x02, 0x00, 0x00, 0x00, 0xd8, 0x02, 0x04, 0x00, 0x00, 0xac,</div><div class='add'>+0x12, 0x05, 0x07, 0x1d, 0x01, 0x00, 0x1c, 0xd4, 0xd3, 0x2b, 0x00, 0x1c, 0xd4,</div><div class='add'>+0xd3, 0x52, 0x00, 0x1c, 0x80, 0x76, 0x7d, 0x13, 0x04, 0x00, 0x00, 0xe0, 0x02,</div><div class='add'>+0x00, 0xa6, 0x7b, 0x95, 0x03, 0x10, 0xc7, 0x9c, 0x00, 0x00, 0x1c, 0x80, 0x2c,</div><div class='add'>+0x00, 0x00, 0x1c, 0x00, 0x00, 0x6c, 0x02, 0x04, 0x00, 0x00, 0x54, 0xc3, 0x04,</div><div class='add'>+0xab, 0x2d, 0xd9, 0x12, 0x05, 0x07, 0x1d, 0xb5, 0xc2, 0x04, 0x8b, 0x2d, 0x01,</div><div class='add'>+0x00, 0x1c, 0x69, 0x25, 0x01, 0x00, 0x1c, 0xa6, 0x7b, 0x95, 0x03, 0x10, 0xcb,</div><div class='add'>+0x2f, 0x09, 0x00, 0x1c, 0x60, 0x2c, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x48, 0x03,</div><div class='add'>+0x00, 0x53, 0x0f, 0x32, 0x54, 0x09, 0x46, 0x7a, 0xca, 0x05, 0x1c, 0x7a, 0x0e,</div><div class='add'>+0x32, 0x54, 0x09, 0x40, 0xfa, 0x19, 0x00, 0x1c, 0x00, 0x00, 0x10, 0x03, 0x04,</div><div class='add'>+0x46, 0x7a, 0xca, 0x05, 0x1c, 0xb5, 0x0f, 0x31, 0x54, 0x09, 0xa0, 0x0f, 0x31,</div><div class='add'>+0x54, 0x09, 0x73, 0xec, 0x2a, 0x03, 0x04, 0x60, 0x2c, 0x00, 0x00, 0x1c, 0x00,</div><div class='add'>+0x00, 0x28, 0x03, 0x00, 0xc7, 0x1c, 0x01, 0x00, 0x1c, 0x00, 0x00, 0x28, 0x13,</div><div class='add'>+0x05, 0x07, 0x1d, 0x01, 0x00, 0x1c, 0xc0, 0xd7, 0x22, 0x00, 0x1c, 0x75, 0x56,</div><div class='add'>+0x7e, 0x13, 0x04, 0x60, 0x2c, 0x00, 0x00, 0x1c, 0xe7, 0x1c, 0x45, 0x03, 0x04,</div><div class='add'>+0xe7, 0x9c, 0x00, 0x00, 0x1c, 0xa6, 0x7b, 0x95, 0x03, 0x10, 0x80, 0x2c, 0x00,</div><div class='add'>+0x00, 0x1c, 0x00, 0x00, 0xf8, 0x02, 0x04, 0x00, 0x00, 0x54, 0xc3, 0x04, 0xb9,</div><div class='add'>+0x7b, 0x01, 0x00, 0x1c, 0x00, 0x00, 0x8c, 0xc3, 0x04, 0xcb, 0xaf, 0xfc, 0x07,</div><div class='add'>+0x1c, 0xcb, 0x2f, 0x01, 0x04, 0x1c, 0xc7, 0x9f, 0x80, 0x03, 0x1c, 0x00, 0x00,</div><div class='add'>+0x8c, 0xc3, 0x04, 0xcb, 0xaf, 0xfc, 0x07, 0x1c, 0xcb, 0x2f, 0x0d, 0x04, 0x1c,</div><div class='add'>+0xc7, 0x9f, 0x80, 0x03, 0x1c, 0x00, 0x00, 0x8c, 0xc3, 0x04, 0xcb, 0xaf, 0x00,</div><div class='add'>+0xf8, 0x1d, 0xcb, 0x2f, 0x01, 0x00, 0x1d, 0xa6, 0x7b, 0x95, 0x03, 0x1c, 0xc7,</div><div class='add'>+0x9c, 0x8c, 0xc3, 0x04, 0x00, 0x00, 0x8c, 0x13, 0x05, 0x07, 0x1d, 0x01, 0x00,</div><div class='add'>+0x1c, 0xc0, 0x1d, 0xdc, 0xd3, 0x08, 0x27, 0x9d, 0xe4, 0x03, 0x00, 0xa0, 0xee,</div><div class='add'>+0x46, 0xd4, 0x00, 0xfb, 0x75, 0x09, 0x14, 0x04, 0x20, 0x7b, 0x06, 0x00, 0x1c,</div><div class='add'>+0xc0, 0x1c, 0x1c, 0x04, 0x00, 0x00, 0x00, 0xb0, 0xd3, 0x08, 0x00, 0x00, 0x00,</div><div class='add'>+0xf4, 0x00, 0xc0, 0xef, 0xf2, 0x00, 0x1c, 0x20, 0x25, 0x5c, 0x14, 0x04, 0x60,</div><div class='add'>+0xb7, 0xd2, 0x03, 0x00, 0x00, 0x00, 0x0c, 0x15, 0x00, 0xcc, 0xb3, 0xfc, 0x03,</div><div class='add'>+0x1c, 0xcc, 0x33, 0x05, 0x02, 0x1c, 0x00, 0x00, 0x0c, 0xc5, 0x04, 0x60, 0xb7,</div><div class='add'>+0x0e, 0x05, 0x04, 0x00, 0x00, 0x0c, 0x15, 0x04, 0x00, 0x00, 0x5c, 0xc4, 0x04,</div><div class='add'>+0xc0, 0x1d, 0x98, 0xf3, 0x04, 0x00, 0x00, 0x68, 0xc4, 0x04, 0x07, 0x9d, 0x00,</div><div class='add'>+0x00, 0x1c, 0x1b, 0x74, 0xfd, 0xf3, 0x04, 0xa6, 0x7b, 0xf1, 0x03, 0x1c, 0xa0,</div><div class='add'>+0x0f, 0x69, 0x54, 0x09, 0xe0, 0x7b, 0x00, 0xfc, 0x1f, 0x39, 0x7f, 0x02, 0x00,</div><div class='add'>+0x1c, 0x07, 0x1d, 0x9d, 0xc3, 0x04, 0xa6, 0x7b, 0xad, 0x03, 0x1c, 0x00, 0x00,</div><div class='add'>+0x68, 0xc4, 0x04, 0xe0, 0x1c, 0x00, 0x00, 0x1c, 0x00, 0x00, 0xa4, 0x03, 0x04,</div><div class='add'>+0xcb, 0xaf, 0x00, 0xf8, 0x1d, 0xcb, 0x2f, 0x01, 0x10, 0x1d, 0x00, 0x00, 0xac,</div><div class='add'>+0xc3, 0x04, 0x00, 0x00, 0xac, 0x03, 0x04, 0xcb, 0xaf, 0x00, 0xf8, 0x1d, 0xcb,</div><div class='add'>+0x2f, 0x01, 0x18, 0x1d, 0xc7, 0x9f, 0x00, 0x0b, 0x1c, 0x00, 0x00, 0xac, 0xc3,</div><div class='add'>+0x04, 0xfb, 0x75, 0x01, 0x00, 0x1c, 0x07, 0x1d, 0x01, 0x00, 0x1c, 0xcc, 0xb3,</div><div class='add'>+0xfc, 0x03, 0x1c, 0xcc, 0x33, 0x01, 0x02, 0x1c, 0x00, 0x00, 0xac, 0xc3, 0x04,</div><div class='add'>+0xa0, 0x1c, 0x00, 0x00, 0x1c, 0xa0, 0xee, 0xa2, 0x03, 0x04, 0xcb, 0xaf, 0xfc,</div><div class='add'>+0x07, 0x1c, 0xcb, 0x2f, 0x09, 0x04, 0x1c, 0xfb, 0x75, 0x01, 0x00, 0x1c, 0x00,</div><div class='add'>+0x00, 0xac, 0xc3, 0x04, 0xcc, 0xb3, 0xfc, 0x03, 0x1c, 0xcc, 0x33, 0x01, 0x02,</div><div class='add'>+0x1c, 0x00, 0x00, 0x0c, 0xc5, 0x04, 0x00, 0x00, 0x78, 0x34, 0x05, 0xcc, 0xb3,</div><div class='add'>+0xfc, 0x03, 0x1c, 0xcc, 0x33, 0x15, 0x02, 0x1c, 0x47, 0x9d, 0x54, 0xc4, 0x04,</div><div class='add'>+0x00, 0x00, 0x78, 0x44, 0x00, 0x80, 0x1d, 0x7c, 0x54, 0x04, 0x87, 0x1d, 0x8d,</div><div class='add'>+0x04, 0x00, 0xce, 0x76, 0x01, 0x00, 0x1c, 0xef, 0x76, 0x9d, 0xc4, 0x04, 0xa4,</div><div class='add'>+0x77, 0x8d, 0x24, 0x09, 0xe4, 0x76, 0x01, 0x00, 0x1c, 0xc4, 0x76, 0x01, 0x00,</div><div class='add'>+0x1c, 0x00, 0x00, 0x98, 0x54, 0x04, 0xd7, 0x76, 0x01, 0x50, 0x18, 0xf6, 0x76,</div><div class='add'>+0x01, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x30, 0x18, 0x00, 0x00, 0x00, 0x00, 0x10,</div><div class='add'>+0xcc, 0x30, 0x45, 0xc5, 0x04, 0xeb, 0x2d, 0x01, 0x00, 0x1c, 0xea, 0x29, 0x01,</div><div class='add'>+0x00, 0x1c, 0xc0, 0x59, 0x01, 0x00, 0x1c, 0xf5, 0x77, 0x29, 0xc5, 0x04, 0xe0,</div><div class='add'>+0x30, 0xdc, 0x04, 0x00, 0x00, 0x4c, 0xb0, 0x04, 0x00, 0x20, 0x4c, 0xf4, 0x04,</div><div class='add'>+0x00, 0x00, 0x00, 0xe8, 0x04, 0x00, 0xcc, 0xb3, 0xfc, 0x03, 0x1c, 0xcc, 0x33,</div><div class='add'>+0x09, 0x02, 0x1c, 0xeb, 0x2d, 0xb5, 0xc4, 0x04, 0xcc, 0xb3, 0xfc, 0x03, 0x1c,</div><div class='add'>+0xcc, 0x33, 0x19, 0x02, 0x1c, 0xeb, 0x2d, 0xb5, 0xc4, 0x04, 0xcc, 0xb3, 0xfc,</div><div class='add'>+0x03, 0x1c, 0xcc, 0x33, 0x0d, 0x02, 0x1c, 0xeb, 0x2d, 0xb5, 0xc4, 0x04, 0xcc,</div><div class='add'>+0xb3, 0xfc, 0x03, 0x1c, 0xcc, 0x33, 0x11, 0x02, 0x1c, 0xeb, 0x2d, 0xb5, 0xc4,</div><div class='add'>+0x04, 0x00, 0x7b, 0x00, 0x80, 0x1c, 0xae, 0x77, 0x45, 0x05, 0x00, 0x00, 0x00,</div><div class='add'>+0x04, 0xc0, 0x04, 0xd3, 0x8b, 0x00, 0xfc, 0x1f, 0x60, 0x7a, 0x3c, 0x00, 0x1c,</div><div class='add'>+0x60, 0x4c, 0xc0, 0x04, 0x00, 0xc0, 0x2f, 0x20, 0x05, 0x1f, 0xe0, 0x30, 0xb0,</div><div class='add'>+0x04, 0x00, 0x80, 0x25, 0xb0, 0x04, 0x00, 0xb5, 0x5b, 0xb1, 0x04, 0x04, 0x69,</div><div class='add'>+0x26, 0x01, 0x00, 0x1c, 0x6a, 0x2b, 0x01, 0x00, 0x1c, 0x80, 0x1d, 0x00, 0x00,</div><div class='add'>+0x1c, 0xa9, 0x25, 0x45, 0x05, 0x00, 0xee, 0x30, 0x00, 0x00, 0x1c, 0xaf, 0x77,</div><div class='add'>+0x01, 0x05, 0x00, 0x00, 0x00, 0xac, 0x24, 0x04, 0xb4, 0x5f, 0x01, 0x40, 0x18,</div><div class='add'>+0x07, 0x9d, 0x48, 0x55, 0x04, 0xb7, 0x76, 0x01, 0x00, 0x1c, 0x96, 0x76, 0x01,</div><div class='add'>+0x00, 0x1c, 0x47, 0x1d, 0x01, 0x00, 0x1c, 0xa4, 0x33, 0x01, 0x60, 0x18, 0xa4,</div><div class='add'>+0x2f, 0x01, 0x60, 0x18, 0x64, 0x77, 0x01, 0x60, 0x18, 0x24, 0x77, 0x01, 0x60,</div><div class='add'>+0x18, 0x44, 0x77, 0x01, 0x00, 0x1c, 0x64, 0x88, 0x03, 0x00, 0x1c, 0xa4, 0x3f,</div><div class='add'>+0x01, 0x00, 0x1c, 0xa4, 0x3b, 0x01, 0x00, 0x1c, 0x53, 0x7b, 0x00, 0xc0, 0x1c,</div><div class='add'>+0xd3, 0xcf, 0x1b, 0x00, 0x1c, 0x53, 0x4f, 0x02, 0x00, 0x1c, 0xda, 0xcf, 0x00,</div><div class='add'>+0xc0, 0x1f, 0xd5, 0x57, 0x0f, 0x00, 0x1c, 0xd3, 0xd3, 0x37, 0x00, 0x1c, 0xd4,</div><div class='add'>+0x53, 0x0f, 0x00, 0x1c, 0xe0, 0x29, 0x00, 0x00, 0x1c, 0xf5, 0xd5, 0xb0, 0x05,</div><div class='add'>+0x00, 0x00, 0x00, 0x9c, 0x55, 0x04, 0x77, 0x56, 0x01, 0x00, 0x1c, 0x56, 0x53,</div><div class='add'>+0x01, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x10, 0x18, 0x00, 0x00, 0x04, 0xc0, 0x04,</div><div class='add'>+0xf5, 0x55, 0x01, 0x00, 0x1c, 0x00, 0x00, 0xb4, 0x55, 0x04, 0x77, 0x56, 0x01,</div><div class='add'>+0x00, 0x1c, 0x56, 0x53, 0x01, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x10, 0x18, 0x00,</div><div class='add'>+0x00, 0x04, 0xc0, 0x04, 0xcb, 0x2f, 0x01, 0x18, 0x10, 0xcb, 0x2f, 0x01, 0x10,</div><div class='add'>+0x10, 0xcb, 0x2f, 0x01, 0x08, 0x10, 0xcb, 0x2f, 0x01, 0x08, 0x10, 0xcb, 0x2f,</div><div class='add'>+0x01, 0x20, 0x10, 0xcb, 0x2f, 0x01, 0x28, 0x10, 0xcb, 0x2f, 0x01, 0x00, 0x10,</div><div class='add'>+0x89, 0x25, 0x61, 0xc2, 0x04, 0x00, 0x00, 0xec, 0xc2, 0x04, 0x00, 0x00, 0x54,</div><div class='add'>+0xc3, 0x04, 0x00, 0x00, 0x54, 0xc3, 0x04, 0x00, 0x00, 0x54, 0xc3, 0x04, 0x00,</div><div class='add'>+0x00, 0x60, 0xc2, 0x04, 0x00, 0x00, 0xec, 0xc2, 0x04, 0x00, 0x00, 0x54, 0xc3,</div><div class='add'>+0x04, 0x00, 0x00, 0x54, 0xc3, 0x04, 0x00, 0x00, 0x54, 0xc3, 0x04, 0x40, 0x1c,</div><div class='add'>+0x6c, 0xc0, 0x04, 0x40, 0x1c, 0x9c, 0xc0, 0x04, 0xa7, 0x77, 0x55, 0xc3, 0x04,</div><div class='add'>+0x00, 0x00, 0xc4, 0xc0, 0x04, 0x27, 0x1d, 0xf1, 0xc0, 0x04, 0x00, 0x00, 0x54,</div><div class='add'>+0xc3, 0x04, 0x00, 0x00, 0x54, 0xc3, 0x04, 0x00, 0x00, 0x54, 0xc3, 0x04, 0x00,</div><div class='add'>+0x00, 0x2c, 0xc6, 0x04, 0x00, 0x00, 0x2c, 0xc6, 0x04, 0x00, 0x00, 0x2c, 0xc6,</div><div class='add'>+0x04, 0x00, 0x00, 0x2c, 0xc6, 0x04, 0x00, 0x00, 0x2c, 0xc6, 0x04, 0x00, 0x00,</div><div class='add'>+0x2c, 0xc6, 0x04, 0x00, 0x00, 0x2c, 0xc6, 0x04, 0x00, 0x00, 0x2c, 0xc6, 0x04,</div><div class='add'>+0x00, 0x00, 0x2c, 0xc6, 0x04, 0x00, 0x00, 0x2c, 0xc6, 0x04, 0x00, 0x00, 0x2c,</div><div class='add'>+0xc6, 0x04, 0x00, 0x00, 0x2c, 0xc6, 0x04, 0x00, 0x00, 0x2c, 0xc6, 0x04, 0x00,</div><div class='add'>+0x00, 0x2c, 0xc6, 0x04, 0x00, 0x00, 0x2c, 0xc6, 0x04, 0x00, 0x00, 0x2c, 0xc6,</div><div class='add'>+0x04, 0x00, 0x00, 0x2c, 0xc6, 0x04, 0x00, 0x00, 0x2c, 0xc6, 0x04, 0x00, 0x00,</div><div class='add'>+0x2c, 0xc6, 0x04, 0x00, 0x00, 0x2c, 0xc6, 0x04, 0x00, 0x00, 0x2c, 0xc6, 0x04,</div><div class='add'>+0x00, 0x00, 0x2c, 0xc6, 0x04, 0x00, 0x00, 0x2c, 0xc6, 0x04, 0x00, 0x00, 0x2c,</div><div class='add'>+0xc6, 0x04, 0x00, 0x00, 0x2c, 0xc6, 0x04, 0x00, 0x00, 0x2c, 0xc6, 0x04, 0x00,</div><div class='add'>+0x00, 0x2c, 0xc6, 0x04, 0x00, 0x00, 0x2c, 0xc6, 0x04, 0x00, 0x00, 0x2c, 0xc6,</div><div class='add'>+0x04, 0x00, 0x00, 0x2c, 0xc6, 0x04, 0x00, 0x00, 0x2c, 0xc6, 0x04, 0x00, 0x00,</div><div class='add'>+0x2c, 0xc6, 0x04, 0x00, 0x00, 0x2c, 0xc6, 0x04, 0x00, 0x00, 0x2c, 0xc6, 0x04,</div><div class='add'>+0x00, 0x00, 0x2c, 0xc6, 0x04, 0x00, 0x00, 0x2c, 0xc6, 0x04, 0x00, 0x00, 0x2c,</div><div class='add'>+0xc6, 0x04, 0x00, 0x00, 0x2c, 0xc6, 0x04, 0x00, 0x00, 0x2c, 0xc6, 0x04, 0x00,</div><div class='add'>+0x00, 0x2c, 0xc6, 0x04, 0x00, 0x00, 0x2c, 0xc6, 0x04, 0x00, 0x00, 0x2c, 0xc6,</div><div class='add'>+0x04, 0x00, 0x00, 0x2c, 0xc6, 0x04, 0x00, 0x00, 0x2c, 0xc6, 0x04, 0x00, 0x00,</div><div class='add'>+0x2c, 0xc6, 0x04, 0x00, 0x00, 0x2c, 0xc6, 0x04, 0x00, 0x00, 0x2c, 0xc6, 0x04,</div><div class='add'>+0x00, 0x00, 0x2c, 0xc6, 0x04, 0x00, 0x00, 0x2c, 0xc6, 0x04, 0x00, 0x00, 0x2c,</div><div class='add'>+0xc6, 0x04, 0x00, 0x00, 0x2c, 0xc6, 0x04, 0x00, 0x00, 0x2c, 0xc6, 0x04, 0x00,</div><div class='add'>+0x00, 0x2c, 0xc6, 0x04, 0x00, 0x00, 0x2c, 0xc6, 0x04, 0x00, 0x00, 0x2c, 0xc6,</div><div class='add'>+0x04, 0x00, 0x00, 0x2c, 0xc6, 0x04, 0x00, 0x00, 0x2c, 0xc6, 0x04, 0x00, 0x00,</div><div class='add'>+0x2c, 0xc6, 0x04, 0x00, 0x00, 0x2c, 0xc6, 0x04, 0x00, 0x00, 0x2c, 0xc6, 0x04,</div><div class='add'>+0x00, 0x00, 0x2c, 0xc6, 0x04, 0x00, 0x00, 0x2c, 0xc6, 0x04, 0x00, 0x00, 0x2c,</div><div class='add'>+0xc6, 0x04, 0x00, 0x00, 0x2c, 0xc6, 0x04, 0x00, 0x00, 0x2c, 0xc6, 0x04, 0x00,</div><div class='add'>+0x00, 0x2c, 0xc6, 0x04, 0x00, 0x00, 0x2c, 0xc6, 0x04, 0x00, 0x00, 0x2c, 0xc6,</div><div class='add'>+0x04, 0x00, 0x00, 0x2c, 0xc6, 0x04, 0x00, 0x00, 0x2c, 0xc6, 0x04, 0x00, 0x00,</div><div class='add'>+0x2c, 0xc6, 0x04, 0x00, 0x00, 0x2c, 0xc6, 0x04, 0x00, 0x00, 0x2c, 0xc6, 0x04,</div><div class='add'>+0x00, 0x00, 0x2c, 0xc6, 0x04, 0x00, 0x00, 0x2c, 0xc6, 0x04, 0x00, 0x00, 0x2c,</div><div class='add'>+0xc6, 0x04, 0x00, 0x00, 0x2c, 0xc6, 0x04, 0x00, 0x00, 0x2c, 0xc6, 0x04, 0x00,</div><div class='add'>+0x00, 0x2c, 0xc6, 0x04, 0x00, 0x00, 0x2c, 0xc6, 0x04, 0x00, 0x00, 0x2c, 0xc6,</div><div class='add'>+0x04, 0x00, 0x00, 0x2c, 0xc6, 0x04, 0x00, 0x00, 0x2c, 0xc6, 0x04, 0x00, 0x00,</div><div class='add'>+0x2c, 0xc6, 0x04, 0x00, 0x00, 0x2c, 0xc6, 0x04, 0x00, 0x00, 0x2c, 0xc6, 0x04,</div><div class='add'>+0x00, 0x00, 0x2c, 0xc6, 0x04, 0x00, 0x00, 0x2c, 0xc6, 0x04, 0x00, 0x00, 0x2c,</div><div class='add'>+0xc6, 0x04, 0x00, 0x00, 0x2c, 0xc6, 0x04, 0x00, 0x00, 0x2c, 0xc6, 0x04, 0x00,</div><div class='add'>+0x00, 0x2c, 0xc6, 0x04, 0x00, 0x00, 0x2c, 0xc6, 0x04, 0x00, 0x00, 0x2c, 0xc6,</div><div class='add'>+0x04, 0x00, 0x00, 0x2c, 0xc6, 0x04, 0x00, 0x00, 0x2c, 0xc6, 0x04, 0x00, 0x00,</div><div class='add'>+0x2c, 0xc6, 0x04, 0x00, 0x00, 0x2c, 0xc6, 0x04, 0x00, 0x00, 0x2c, 0xc6, 0x04,</div><div class='add'>+0x00, 0x00, 0x2c, 0xc6, 0x04, 0x00, 0x00, 0x2c, 0xc6, 0x04, 0x00, 0x00, 0x2c,</div><div class='add'>+0xc6, 0x04, 0x00, 0x00, 0x2c, 0xc6, 0x04, 0x00, 0x00, 0x2c, 0xc6, 0x04, 0x00,</div><div class='add'>+0x00, 0x2c, 0xc6, 0x04, 0x00, 0x00, 0x2c, 0xc6, 0x04, 0x00, 0x00, 0x2c, 0xc6,</div><div class='add'>+0x04, 0x00, 0x00, 0x2c, 0xc6, 0x04, 0x00, 0x00, 0x2c, 0xc6, 0x04, 0x00, 0x00,</div><div class='add'>+0x2c, 0xc6, 0x04, 0x00, 0x00, 0x2c, 0xc6, 0x04, 0x00, 0x00, 0x2c, 0xc6, 0x04,</div><div class='add'>+0x00, 0x00, 0x2c, 0xc6, 0x04, 0x00, 0x00, 0x2c, 0xc6, 0x04, 0x00, 0x00, 0x2c,</div><div class='add'>+0xc6, 0x04, 0x00, 0x00, 0x2c, 0xc6, 0x04, 0x00, 0x00, 0x2c, 0xc6, 0x04,</div><div class='add'>+};</div><div class='head'>diff --git a/drivers/staging/slicoss/slic.h b/drivers/staging/slicoss/slic.h<br/>new file mode 100644<br/>index 000000000000..0d5dc24c0b7d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/slicoss/slic.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/slicoss/slic.h</a></div><div class='hunk'>@@ -0,0 +1,598 @@</div><div class='add'>+/**************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2000-2002 Alacritech, Inc.  All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions</div><div class='add'>+ * are met:</div><div class='add'>+ *</div><div class='add'>+ * 1. Redistributions of source code must retain the above copyright</div><div class='add'>+ *    notice, this list of conditions and the following disclaimer.</div><div class='add'>+ * 2. Redistributions in binary form must reproduce the above</div><div class='add'>+ *    copyright notice, this list of conditions and the following</div><div class='add'>+ *    disclaimer in the documentation and/or other materials provided</div><div class='add'>+ *    with the distribution.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY ALACRITECH, INC. ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE</div><div class='add'>+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR</div><div class='add'>+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL ALACRITECH, INC. OR</div><div class='add'>+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,</div><div class='add'>+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT</div><div class='add'>+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF</div><div class='add'>+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,</div><div class='add'>+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT</div><div class='add'>+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF</div><div class='add'>+ * SUCH DAMAGE.</div><div class='add'>+ *</div><div class='add'>+ * The views and conclusions contained in the software and documentation</div><div class='add'>+ * are those of the authors and should not be interpreted as representing</div><div class='add'>+ * official policies, either expressed or implied, of Alacritech, Inc.</div><div class='add'>+ *</div><div class='add'>+ **************************************************************************/</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * FILENAME: slic.h</div><div class='add'>+ *</div><div class='add'>+ * This is the base set of header definitions for the SLICOSS driver.</div><div class='add'>+ */</div><div class='add'>+#ifndef __SLIC_DRIVER_H__</div><div class='add'>+#define __SLIC_DRIVER_H__</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+struct slic_spinlock {</div><div class='add'>+	spinlock_t	lock;</div><div class='add'>+	unsigned long	flags;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define SLIC_RSPQ_PAGES_GB        10</div><div class='add'>+#define SLIC_RSPQ_BUFSINPAGE      (PAGE_SIZE / SLIC_RSPBUF_SIZE)</div><div class='add'>+</div><div class='add'>+struct slic_rspqueue {</div><div class='add'>+    u32             offset;</div><div class='add'>+    u32             pageindex;</div><div class='add'>+    u32             num_pages;</div><div class='add'>+    struct slic_rspbuf *rspbuf;</div><div class='add'>+    u32 *vaddr[SLIC_RSPQ_PAGES_GB];</div><div class='add'>+    dma_addr_t          paddr[SLIC_RSPQ_PAGES_GB];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define SLIC_RCVQ_EXPANSION         1</div><div class='add'>+#define SLIC_RCVQ_ENTRIES           (256 * SLIC_RCVQ_EXPANSION)</div><div class='add'>+#define SLIC_RCVQ_MINENTRIES        (SLIC_RCVQ_ENTRIES / 2)</div><div class='add'>+#define SLIC_RCVQ_MAX_PROCESS_ISR   ((SLIC_RCVQ_ENTRIES * 4))</div><div class='add'>+#define SLIC_RCVQ_RCVBUFSIZE        2048</div><div class='add'>+#define SLIC_RCVQ_FILLENTRIES       (16 * SLIC_RCVQ_EXPANSION)</div><div class='add'>+#define SLIC_RCVQ_FILLTHRESH        (SLIC_RCVQ_ENTRIES - SLIC_RCVQ_FILLENTRIES)</div><div class='add'>+</div><div class='add'>+struct slic_rcvqueue {</div><div class='add'>+    struct sk_buff    *head;</div><div class='add'>+    struct sk_buff    *tail;</div><div class='add'>+    u32            count;</div><div class='add'>+    u32            size;</div><div class='add'>+    u32            errors;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct slic_rcvbuf_info {</div><div class='add'>+    u32     id;</div><div class='add'>+    u32     starttime;</div><div class='add'>+    u32     stoptime;</div><div class='add'>+    u32     slicworld;</div><div class='add'>+    u32     lasttime;</div><div class='add'>+    u32     lastid;</div><div class='add'>+};</div><div class='add'>+/*</div><div class='add'>+ SLIC Handle structure.  Used to restrict handle values to</div><div class='add'>+ 32 bits by using an index rather than an address.</div><div class='add'>+ Simplifies ucode in 64-bit systems</div><div class='add'>+*/</div><div class='add'>+struct slic_handle_word {</div><div class='add'>+	union {</div><div class='add'>+		struct {</div><div class='add'>+			ushort      index;</div><div class='add'>+			ushort      bottombits; /* to denote num bufs to card */</div><div class='add'>+		}  parts;</div><div class='add'>+		u32         whole;</div><div class='add'>+	}  handle;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct slic_handle {</div><div class='add'>+    struct slic_handle_word  token;  /* token passed between host and card*/</div><div class='add'>+    ushort                      type;</div><div class='add'>+    void *address;    /* actual address of the object*/</div><div class='add'>+    ushort                      offset;</div><div class='add'>+    struct slic_handle       *other_handle;</div><div class='add'>+    struct slic_handle       *next;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define SLIC_HANDLE_FREE        0x0000</div><div class='add'>+#define SLIC_HANDLE_DATA        0x0001</div><div class='add'>+#define SLIC_HANDLE_CMD         0x0002</div><div class='add'>+#define SLIC_HANDLE_CONTEXT     0x0003</div><div class='add'>+#define SLIC_HANDLE_TEAM        0x0004</div><div class='add'>+</div><div class='add'>+#define handle_index        handle.parts.index</div><div class='add'>+#define handle_bottom       handle.parts.bottombits</div><div class='add'>+#define handle_token        handle.whole</div><div class='add'>+</div><div class='add'>+#define SLIC_HOSTCMD_SIZE    512</div><div class='add'>+</div><div class='add'>+struct slic_hostcmd {</div><div class='add'>+    struct slic_host64_cmd  cmd64;</div><div class='add'>+    u32                    type;</div><div class='add'>+    struct sk_buff            *skb;</div><div class='add'>+    u32                    paddrl;</div><div class='add'>+    u32                    paddrh;</div><div class='add'>+    u32                    busy;</div><div class='add'>+    u32                    cmdsize;</div><div class='add'>+    ushort                     numbufs;</div><div class='add'>+    struct slic_handle    *pslic_handle;/* handle associated with command */</div><div class='add'>+    struct slic_hostcmd    *next;</div><div class='add'>+    struct slic_hostcmd    *next_all;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define SLIC_CMDQ_CMDSINPAGE    (PAGE_SIZE / SLIC_HOSTCMD_SIZE)</div><div class='add'>+#define SLIC_CMD_DUMB            3</div><div class='add'>+#define SLIC_CMDQ_INITCMDS       256</div><div class='add'>+#define SLIC_CMDQ_MAXCMDS        256</div><div class='add'>+#define SLIC_CMDQ_MAXOUTSTAND    SLIC_CMDQ_MAXCMDS</div><div class='add'>+#define SLIC_CMDQ_MAXPAGES       (SLIC_CMDQ_MAXCMDS / SLIC_CMDQ_CMDSINPAGE)</div><div class='add'>+#define SLIC_CMDQ_INITPAGES      (SLIC_CMDQ_INITCMDS / SLIC_CMDQ_CMDSINPAGE)</div><div class='add'>+</div><div class='add'>+struct slic_cmdqmem {</div><div class='add'>+	int pagecnt;</div><div class='add'>+	u32 *pages[SLIC_CMDQ_MAXPAGES];</div><div class='add'>+	dma_addr_t dma_pages[SLIC_CMDQ_MAXPAGES];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct slic_cmdqueue {</div><div class='add'>+	struct slic_hostcmd *head;</div><div class='add'>+	struct slic_hostcmd *tail;</div><div class='add'>+	int count;</div><div class='add'>+	struct slic_spinlock lock;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#ifdef STATUS_SUCCESS</div><div class='add'>+#undef STATUS_SUCCESS</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define STATUS_SUCCESS              0</div><div class='add'>+#define STATUS_PENDING              0</div><div class='add'>+#define STATUS_FAILURE             -1</div><div class='add'>+#define STATUS_ERROR               -2</div><div class='add'>+#define STATUS_NOT_SUPPORTED       -3</div><div class='add'>+#define STATUS_BUFFER_TOO_SHORT    -4</div><div class='add'>+</div><div class='add'>+#define SLIC_MAX_CARDS              32</div><div class='add'>+#define SLIC_MAX_PORTS              4        /* Max # of ports per card   */</div><div class='add'>+#if SLIC_DUMP_ENABLED</div><div class='add'>+/*</div><div class='add'>+Dump buffer size</div><div class='add'>+</div><div class='add'>+This cannot be bigger than the max DMA size the card supports,</div><div class='add'>+given the current code structure in the host and ucode.</div><div class='add'>+Mojave supports 16K, Oasis supports 16K-1, so</div><div class='add'>+just set this at 15K, shouldnt make that much of a diff.</div><div class='add'>+*/</div><div class='add'>+#define DUMP_BUF_SIZE               0x3C00</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+struct mcast_address {</div><div class='add'>+	unsigned char address[6];</div><div class='add'>+	struct mcast_address *next;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define CARD_DOWN        0x00000000</div><div class='add'>+#define CARD_UP          0x00000001</div><div class='add'>+#define CARD_FAIL        0x00000002</div><div class='add'>+#define CARD_DIAG        0x00000003</div><div class='add'>+#define CARD_SLEEP       0x00000004</div><div class='add'>+</div><div class='add'>+#define ADAPT_DOWN             0x00</div><div class='add'>+#define ADAPT_UP               0x01</div><div class='add'>+#define ADAPT_FAIL             0x02</div><div class='add'>+#define ADAPT_RESET            0x03</div><div class='add'>+#define ADAPT_SLEEP            0x04</div><div class='add'>+</div><div class='add'>+#define ADAPT_FLAGS_BOOTTIME            0x0001</div><div class='add'>+#define ADAPT_FLAGS_IS64BIT             0x0002</div><div class='add'>+#define ADAPT_FLAGS_PENDINGLINKDOWN     0x0004</div><div class='add'>+#define ADAPT_FLAGS_FIBERMEDIA          0x0008</div><div class='add'>+#define ADAPT_FLAGS_LOCKS_ALLOCED       0x0010</div><div class='add'>+#define ADAPT_FLAGS_INT_REGISTERED      0x0020</div><div class='add'>+#define ADAPT_FLAGS_LOAD_TIMER_SET      0x0040</div><div class='add'>+#define ADAPT_FLAGS_STATS_TIMER_SET     0x0080</div><div class='add'>+#define ADAPT_FLAGS_RESET_TIMER_SET     0x0100</div><div class='add'>+</div><div class='add'>+#define LINK_DOWN              0x00</div><div class='add'>+#define LINK_CONFIG            0x01</div><div class='add'>+#define LINK_UP                0x02</div><div class='add'>+</div><div class='add'>+#define LINK_10MB              0x00</div><div class='add'>+#define LINK_100MB             0x01</div><div class='add'>+#define LINK_AUTOSPEED         0x02</div><div class='add'>+#define LINK_1000MB            0x03</div><div class='add'>+#define LINK_10000MB           0x04</div><div class='add'>+</div><div class='add'>+#define LINK_HALFD             0x00</div><div class='add'>+#define LINK_FULLD             0x01</div><div class='add'>+#define LINK_AUTOD             0x02</div><div class='add'>+</div><div class='add'>+#define MAC_DIRECTED     0x00000001</div><div class='add'>+#define MAC_BCAST        0x00000002</div><div class='add'>+#define MAC_MCAST        0x00000004</div><div class='add'>+#define MAC_PROMISC      0x00000008</div><div class='add'>+#define MAC_LOOPBACK     0x00000010</div><div class='add'>+#define MAC_ALLMCAST     0x00000020</div><div class='add'>+</div><div class='add'>+#define SLIC_DUPLEX(x)    ((x == LINK_FULLD) ? "FDX" : "HDX")</div><div class='add'>+#define SLIC_SPEED(x)     ((x == LINK_100MB) ? "100Mb" : ((x == LINK_1000MB) ?\</div><div class='add'>+				"1000Mb" : " 10Mb"))</div><div class='add'>+#define SLIC_LINKSTATE(x) ((x == LINK_DOWN) ? "Down" : "Up  ")</div><div class='add'>+#define SLIC_ADAPTER_STATE(x) ((x == ADAPT_UP) ? "UP" : "Down")</div><div class='add'>+#define SLIC_CARD_STATE(x)    ((x == CARD_UP) ? "UP" : "Down")</div><div class='add'>+</div><div class='add'>+struct slic_iface_stats {</div><div class='add'>+    /*</div><div class='add'>+     * Stats</div><div class='add'>+     */</div><div class='add'>+    u64        xmt_bytes;</div><div class='add'>+    u64        xmt_ucast;</div><div class='add'>+    u64        xmt_mcast;</div><div class='add'>+    u64        xmt_bcast;</div><div class='add'>+    u64        xmt_errors;</div><div class='add'>+    u64        xmt_discards;</div><div class='add'>+    u64        xmit_collisions;</div><div class='add'>+    u64        xmit_excess_xmit_collisions;</div><div class='add'>+    u64        rcv_bytes;</div><div class='add'>+    u64        rcv_ucast;</div><div class='add'>+    u64        rcv_mcast;</div><div class='add'>+    u64        rcv_bcast;</div><div class='add'>+    u64        rcv_errors;</div><div class='add'>+    u64        rcv_discards;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct sliccp_stats {</div><div class='add'>+    u64        xmit_tcp_segs;</div><div class='add'>+    u64        xmit_tcp_bytes;</div><div class='add'>+    u64        rcv_tcp_segs;</div><div class='add'>+    u64        rcv_tcp_bytes;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct slicnet_stats {</div><div class='add'>+    struct sliccp_stats        tcp;</div><div class='add'>+    struct slic_iface_stats      iface;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define SLIC_LOADTIMER_PERIOD     1</div><div class='add'>+#define SLIC_INTAGG_DEFAULT       200</div><div class='add'>+#define SLIC_LOAD_0               0</div><div class='add'>+#define SLIC_INTAGG_0             0</div><div class='add'>+#define SLIC_LOAD_1               8000</div><div class='add'>+#define SLIC_LOAD_2               10000</div><div class='add'>+#define SLIC_LOAD_3               12000</div><div class='add'>+#define SLIC_LOAD_4               14000</div><div class='add'>+#define SLIC_LOAD_5               16000</div><div class='add'>+#define SLIC_INTAGG_1             50</div><div class='add'>+#define SLIC_INTAGG_2             100</div><div class='add'>+#define SLIC_INTAGG_3             150</div><div class='add'>+#define SLIC_INTAGG_4             200</div><div class='add'>+#define SLIC_INTAGG_5             250</div><div class='add'>+#define SLIC_LOAD_1GB             3000</div><div class='add'>+#define SLIC_LOAD_2GB             6000</div><div class='add'>+#define SLIC_LOAD_3GB             12000</div><div class='add'>+#define SLIC_LOAD_4GB             24000</div><div class='add'>+#define SLIC_LOAD_5GB             48000</div><div class='add'>+#define SLIC_INTAGG_1GB           50</div><div class='add'>+#define SLIC_INTAGG_2GB           75</div><div class='add'>+#define SLIC_INTAGG_3GB           100</div><div class='add'>+#define SLIC_INTAGG_4GB           100</div><div class='add'>+#define SLIC_INTAGG_5GB           100</div><div class='add'>+</div><div class='add'>+struct ether_header {</div><div class='add'>+    unsigned char    ether_dhost[6];</div><div class='add'>+    unsigned char    ether_shost[6];</div><div class='add'>+    ushort   ether_type;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct sliccard {</div><div class='add'>+    uint              busnumber;</div><div class='add'>+    uint              slotnumber;</div><div class='add'>+    uint              state;</div><div class='add'>+    uint              cardnum;</div><div class='add'>+    uint              card_size;</div><div class='add'>+    uint              adapters_activated;</div><div class='add'>+    uint              adapters_allocated;</div><div class='add'>+    uint              adapters_sleeping;</div><div class='add'>+    uint              gennumber;</div><div class='add'>+    u32           events;</div><div class='add'>+    u32           loadlevel_current;</div><div class='add'>+    u32           load;</div><div class='add'>+    uint              reset_in_progress;</div><div class='add'>+    u32           pingstatus;</div><div class='add'>+    u32           bad_pingstatus;</div><div class='add'>+    struct timer_list loadtimer;</div><div class='add'>+    u32           loadtimerset;</div><div class='add'>+    uint              config_set;</div><div class='add'>+    struct slic_config  config;</div><div class='add'>+    struct dentry      *debugfs_dir;</div><div class='add'>+    struct dentry      *debugfs_cardinfo;</div><div class='add'>+    struct adapter  *master;</div><div class='add'>+    struct adapter  *adapter[SLIC_MAX_PORTS];</div><div class='add'>+    struct sliccard *next;</div><div class='add'>+    u32             error_interrupts;</div><div class='add'>+    u32             error_rmiss_interrupts;</div><div class='add'>+    u32             rcv_interrupts;</div><div class='add'>+    u32             xmit_interrupts;</div><div class='add'>+    u32             num_isrs;</div><div class='add'>+    u32             false_interrupts;</div><div class='add'>+    u32             max_isr_rcvs;</div><div class='add'>+    u32             max_isr_xmits;</div><div class='add'>+    u32             rcv_interrupt_yields;</div><div class='add'>+    u32             tx_packets;</div><div class='add'>+#if SLIC_DUMP_ENABLED</div><div class='add'>+    u32             dumpstatus;           /* Result of dump UPR */</div><div class='add'>+    void *cmdbuffer;</div><div class='add'>+</div><div class='add'>+    ulong               cmdbuffer_phys;</div><div class='add'>+    u32             cmdbuffer_physl;</div><div class='add'>+    u32             cmdbuffer_physh;</div><div class='add'>+</div><div class='add'>+    u32             dump_count;</div><div class='add'>+    struct task_struct *dump_task_id;</div><div class='add'>+    u32             dump_wait_count;</div><div class='add'>+    uint                dumpthread_running; /* has a dump thread been init'd  */</div><div class='add'>+    uint                dump_requested;     /* 0 no, 1 = reqstd 2=curr 3=done */</div><div class='add'>+    u32             dumptime_start;</div><div class='add'>+    u32             dumptime_complete;</div><div class='add'>+    u32             dumptime_delta;</div><div class='add'>+    void *dumpbuffer;</div><div class='add'>+    ulong               dumpbuffer_phys;</div><div class='add'>+    u32             dumpbuffer_physl;</div><div class='add'>+    u32             dumpbuffer_physh;</div><div class='add'>+    wait_queue_head_t   dump_wq;</div><div class='add'>+    struct file        *dumphandle;</div><div class='add'>+    mm_segment_t        dumpfile_fs;</div><div class='add'>+#endif</div><div class='add'>+    u32             debug_ix;</div><div class='add'>+    ushort              reg_type[32];</div><div class='add'>+    ushort              reg_offset[32];</div><div class='add'>+    u32             reg_value[32];</div><div class='add'>+    u32             reg_valueh[32];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define NUM_CFG_SPACES      2</div><div class='add'>+#define NUM_CFG_REGS        64</div><div class='add'>+#define NUM_CFG_REG_ULONGS  (NUM_CFG_REGS / sizeof(u32))</div><div class='add'>+</div><div class='add'>+struct physcard {</div><div class='add'>+    struct adapter  *adapter[SLIC_MAX_PORTS];</div><div class='add'>+    struct physcard *next;</div><div class='add'>+    uint                adapters_allocd;</div><div class='add'>+</div><div class='add'>+ /*  the following is not currently needed</div><div class='add'>+    u32               bridge_busnum;</div><div class='add'>+    u32               bridge_cfg[NUM_CFG_SPACES][NUM_CFG_REG_ULONGS];</div><div class='add'>+ */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct base_driver {</div><div class='add'>+    struct slic_spinlock driver_lock;</div><div class='add'>+    u32              num_slic_cards;</div><div class='add'>+    u32              num_slic_ports;</div><div class='add'>+    u32              num_slic_ports_active;</div><div class='add'>+    u32              dynamic_intagg;</div><div class='add'>+    struct sliccard  *slic_card;</div><div class='add'>+    struct physcard  *phys_card;</div><div class='add'>+    uint                 cardnuminuse[SLIC_MAX_CARDS];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct slic_shmem {</div><div class='add'>+    volatile u32          isr;</div><div class='add'>+    volatile u32          linkstatus;</div><div class='add'>+    volatile struct slic_stats     inicstats;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct slic_reg_params {</div><div class='add'>+    u32       linkspeed;</div><div class='add'>+    u32       linkduplex;</div><div class='add'>+    u32       fail_on_bad_eeprom;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct slic_upr {</div><div class='add'>+    uint               adapter;</div><div class='add'>+    u32            upr_request;</div><div class='add'>+    u32            upr_data;</div><div class='add'>+    u32            upr_data_h;</div><div class='add'>+    u32            upr_buffer;</div><div class='add'>+    u32            upr_buffer_h;</div><div class='add'>+    struct slic_upr *next;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct slic_ifevents {</div><div class='add'>+    uint        oflow802;</div><div class='add'>+    uint        uflow802;</div><div class='add'>+    uint        Tprtoflow;</div><div class='add'>+    uint        rcvearly;</div><div class='add'>+    uint        Bufov;</div><div class='add'>+    uint        Carre;</div><div class='add'>+    uint        Longe;</div><div class='add'>+    uint        Invp;</div><div class='add'>+    uint        Crc;</div><div class='add'>+    uint        Drbl;</div><div class='add'>+    uint        Code;</div><div class='add'>+    uint        IpHlen;</div><div class='add'>+    uint        IpLen;</div><div class='add'>+    uint        IpCsum;</div><div class='add'>+    uint        TpCsum;</div><div class='add'>+    uint        TpHlen;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct adapter {</div><div class='add'>+    void *ifp;</div><div class='add'>+    struct sliccard *card;</div><div class='add'>+    uint                port;</div><div class='add'>+    struct physcard *physcard;</div><div class='add'>+    uint                physport;</div><div class='add'>+    uint                cardindex;</div><div class='add'>+    uint                card_size;</div><div class='add'>+    uint                chipid;</div><div class='add'>+    struct net_device  *netdev;</div><div class='add'>+    struct net_device  *next_netdevice;</div><div class='add'>+    struct slic_spinlock     adapter_lock;</div><div class='add'>+    struct slic_spinlock     reset_lock;</div><div class='add'>+    struct pci_dev     *pcidev;</div><div class='add'>+    uint                busnumber;</div><div class='add'>+    uint                slotnumber;</div><div class='add'>+    uint                functionnumber;</div><div class='add'>+    ushort              vendid;</div><div class='add'>+    ushort              devid;</div><div class='add'>+    ushort              subsysid;</div><div class='add'>+    u32             irq;</div><div class='add'>+    void __iomem *memorybase;</div><div class='add'>+    u32             memorylength;</div><div class='add'>+    u32             drambase;</div><div class='add'>+    u32             dramlength;</div><div class='add'>+    uint                queues_initialized;</div><div class='add'>+    uint                allocated;</div><div class='add'>+    uint                activated;</div><div class='add'>+    u32             intrregistered;</div><div class='add'>+    uint                isp_initialized;</div><div class='add'>+    uint                gennumber;</div><div class='add'>+    u32             curaddrupper;</div><div class='add'>+    struct slic_shmem      *pshmem;</div><div class='add'>+    dma_addr_t          phys_shmem;</div><div class='add'>+    u32             isrcopy;</div><div class='add'>+    __iomem struct slic_regs       *slic_regs;</div><div class='add'>+    unsigned char               state;</div><div class='add'>+    unsigned char               linkstate;</div><div class='add'>+    unsigned char               linkspeed;</div><div class='add'>+    unsigned char               linkduplex;</div><div class='add'>+    uint                flags;</div><div class='add'>+    unsigned char               macaddr[6];</div><div class='add'>+    unsigned char               currmacaddr[6];</div><div class='add'>+    u32             macopts;</div><div class='add'>+    ushort              devflags_prev;</div><div class='add'>+    u64             mcastmask;</div><div class='add'>+    struct mcast_address   *mcastaddrs;</div><div class='add'>+    struct slic_upr   *upr_list;</div><div class='add'>+    uint                upr_busy;</div><div class='add'>+    struct timer_list   pingtimer;</div><div class='add'>+    u32             pingtimerset;</div><div class='add'>+    struct timer_list   statstimer;</div><div class='add'>+    u32             statstimerset;</div><div class='add'>+    struct timer_list   loadtimer;</div><div class='add'>+    u32             loadtimerset;</div><div class='add'>+    struct dentry      *debugfs_entry;</div><div class='add'>+    struct slic_spinlock     upr_lock;</div><div class='add'>+    struct slic_spinlock     bit64reglock;</div><div class='add'>+    struct slic_rspqueue     rspqueue;</div><div class='add'>+    struct slic_rcvqueue     rcvqueue;</div><div class='add'>+    struct slic_cmdqueue     cmdq_free;</div><div class='add'>+    struct slic_cmdqueue     cmdq_done;</div><div class='add'>+    struct slic_cmdqueue     cmdq_all;</div><div class='add'>+    struct slic_cmdqmem      cmdqmem;</div><div class='add'>+    /*</div><div class='add'>+     *  SLIC Handles</div><div class='add'>+    */</div><div class='add'>+    struct slic_handle slic_handles[SLIC_CMDQ_MAXCMDS+1]; /* Object handles*/</div><div class='add'>+    struct slic_handle *pfree_slic_handles;          /* Free object handles*/</div><div class='add'>+    struct slic_spinlock     handle_lock;           /* Object handle list lock*/</div><div class='add'>+    ushort              slic_handle_ix;</div><div class='add'>+</div><div class='add'>+    u32             xmitq_full;</div><div class='add'>+    u32             all_reg_writes;</div><div class='add'>+    u32             icr_reg_writes;</div><div class='add'>+    u32             isr_reg_writes;</div><div class='add'>+    u32             error_interrupts;</div><div class='add'>+    u32             error_rmiss_interrupts;</div><div class='add'>+    u32             rx_errors;</div><div class='add'>+    u32             rcv_drops;</div><div class='add'>+    u32             rcv_interrupts;</div><div class='add'>+    u32             xmit_interrupts;</div><div class='add'>+    u32             linkevent_interrupts;</div><div class='add'>+    u32             upr_interrupts;</div><div class='add'>+    u32             num_isrs;</div><div class='add'>+    u32             false_interrupts;</div><div class='add'>+    u32             tx_packets;</div><div class='add'>+    u32             xmit_completes;</div><div class='add'>+    u32             tx_drops;</div><div class='add'>+    u32             rcv_broadcasts;</div><div class='add'>+    u32             rcv_multicasts;</div><div class='add'>+    u32             rcv_unicasts;</div><div class='add'>+    u32             max_isr_rcvs;</div><div class='add'>+    u32             max_isr_xmits;</div><div class='add'>+    u32             rcv_interrupt_yields;</div><div class='add'>+    u32             intagg_period;</div><div class='add'>+    struct inicpm_state    *inicpm_info;</div><div class='add'>+    void *pinicpm_info;</div><div class='add'>+    struct slic_reg_params   reg_params;</div><div class='add'>+    struct slic_ifevents  if_events;</div><div class='add'>+    struct slic_stats        inicstats_prev;</div><div class='add'>+    struct slicnet_stats     slic_stats;</div><div class='add'>+    struct net_device_stats stats;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#if SLIC_DUMP_ENABLED</div><div class='add'>+#define SLIC_DUMP_REQUESTED      1</div><div class='add'>+#define SLIC_DUMP_IN_PROGRESS    2</div><div class='add'>+#define SLIC_DUMP_DONE           3</div><div class='add'>+</div><div class='add'>+/****************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * Microcode crash information structure.  This</div><div class='add'>+ * structure is written out to the card's SRAM when the microcode panic's.</div><div class='add'>+ *</div><div class='add'>+ ****************************************************************************/</div><div class='add'>+struct slic_crash_info {</div><div class='add'>+    ushort  cpu_id;</div><div class='add'>+    ushort  crash_pc;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define CRASH_INFO_OFFSET   0x155C</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define UPDATE_STATS(largestat, newstat, oldstat)                        \</div><div class='add'>+{                                                                        \</div><div class='add'>+    if ((newstat) &lt; (oldstat))                                           \</div><div class='add'>+	(largestat) += ((newstat) + (0xFFFFFFFF - oldstat + 1));         \</div><div class='add'>+    else                                                                 \</div><div class='add'>+	(largestat) += ((newstat) - (oldstat));                          \</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define UPDATE_STATS_GB(largestat, newstat, oldstat)                     \</div><div class='add'>+{                                                                        \</div><div class='add'>+    (largestat) += ((newstat) - (oldstat));                              \</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define ETHER_EQ_ADDR(_AddrA, _AddrB, _Result)                           \</div><div class='add'>+{                                                                        \</div><div class='add'>+    _Result = TRUE;                                                      \</div><div class='add'>+    if (*(u32 *)(_AddrA) != *(u32 *)(_AddrB))                          \</div><div class='add'>+	_Result = FALSE;                                                 \</div><div class='add'>+    if (*(u16 *)(&amp;((_AddrA)[4])) != *(u16 *)(&amp;((_AddrB)[4])))        \</div><div class='add'>+	_Result = FALSE;                                                 \</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_X86_64) || defined(CONFIG_IA64)</div><div class='add'>+#define   SLIC_GET_ADDR_LOW(_addr)  (u32)((u64)(_addr) &amp; \</div><div class='add'>+	0x00000000FFFFFFFF)</div><div class='add'>+#define   SLIC_GET_ADDR_HIGH(_addr)  (u32)(((u64)(_addr) &gt;&gt; 32) &amp; \</div><div class='add'>+	0x00000000FFFFFFFF)</div><div class='add'>+#else</div><div class='add'>+#define   SLIC_GET_ADDR_LOW(_addr)   (u32)_addr</div><div class='add'>+#define   SLIC_GET_ADDR_HIGH(_addr)  (u32)0</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define FLUSH       TRUE</div><div class='add'>+#define DONT_FLUSH  FALSE</div><div class='add'>+</div><div class='add'>+#define SIOCSLICDUMPCARD         (SIOCDEVPRIVATE+9)</div><div class='add'>+#define SIOCSLICSETINTAGG        (SIOCDEVPRIVATE+10)</div><div class='add'>+#define SIOCSLICTRACEDUMP        (SIOCDEVPRIVATE+11)</div><div class='add'>+</div><div class='add'>+#endif /*  __SLIC_DRIVER_H__ */</div><div class='head'>diff --git a/drivers/staging/slicoss/slic_os.h b/drivers/staging/slicoss/slic_os.h<br/>new file mode 100644<br/>index 000000000000..46c678440d28<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/slicoss/slic_os.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/slicoss/slic_os.h</a></div><div class='hunk'>@@ -0,0 +1,84 @@</div><div class='add'>+/**************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c)2000-2002 Alacritech, Inc.  All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions</div><div class='add'>+ * are met:</div><div class='add'>+ *</div><div class='add'>+ * 1. Redistributions of source code must retain the above copyright</div><div class='add'>+ *    notice, this list of conditions and the following disclaimer.</div><div class='add'>+ * 2. Redistributions in binary form must reproduce the above</div><div class='add'>+ *    copyright notice, this list of conditions and the following</div><div class='add'>+ *    disclaimer in the documentation and/or other materials provided</div><div class='add'>+ *    with the distribution.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY ALACRITECH, INC. ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE</div><div class='add'>+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR</div><div class='add'>+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL ALACRITECH, INC. OR</div><div class='add'>+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,</div><div class='add'>+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT</div><div class='add'>+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF</div><div class='add'>+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,</div><div class='add'>+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT</div><div class='add'>+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF</div><div class='add'>+ * SUCH DAMAGE.</div><div class='add'>+ *</div><div class='add'>+ * The views and conclusions contained in the software and documentation</div><div class='add'>+ * are those of the authors and should not be interpreted as representing</div><div class='add'>+ * official policies, either expressed or implied, of Alacritech, Inc.</div><div class='add'>+ *</div><div class='add'>+ **************************************************************************/</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * FILENAME: slic_os.h</div><div class='add'>+ *</div><div class='add'>+ * These are the Linux-specific definitions required for the SLICOSS</div><div class='add'>+ * driver, which should allow for greater portability to other OSes.</div><div class='add'>+ */</div><div class='add'>+#ifndef _SLIC_OS_SPECIFIC_H_</div><div class='add'>+#define _SLIC_OS_SPECIFIC_H_</div><div class='add'>+</div><div class='add'>+#define FALSE               (0)</div><div class='add'>+#define TRUE                (1)</div><div class='add'>+</div><div class='add'>+#define SLIC_SECS_TO_JIFFS(x)  ((x) * HZ)</div><div class='add'>+#define SLIC_MS_TO_JIFFIES(x)  (SLIC_SECS_TO_JIFFS((x)) / 1000)</div><div class='add'>+</div><div class='add'>+#ifdef DEBUG_REGISTER_TRACE</div><div class='add'>+#define WRITE_REG(reg, value, flush)                                      \</div><div class='add'>+	{                                                           \</div><div class='add'>+		adapter-&gt;card-&gt;reg_type[adapter-&gt;card-&gt;debug_ix] = 0;   \</div><div class='add'>+		adapter-&gt;card-&gt;reg_offset[adapter-&gt;card-&gt;debug_ix] = \</div><div class='add'>+		((unsigned char *)(&amp;reg)) - \</div><div class='add'>+		((unsigned char *)adapter-&gt;slic_regs); \</div><div class='add'>+		adapter-&gt;card-&gt;reg_value[adapter-&gt;card-&gt;debug_ix++] = value;  \</div><div class='add'>+		if (adapter-&gt;card-&gt;debug_ix == 32) \</div><div class='add'>+			adapter-&gt;card-&gt;debug_ix = 0;                      \</div><div class='add'>+		slic_reg32_write((&amp;reg), (value), (flush));            \</div><div class='add'>+	}</div><div class='add'>+#define WRITE_REG64(a, reg, value, regh, valh, flush)                        \</div><div class='add'>+	{                                                           \</div><div class='add'>+		adapter-&gt;card-&gt;reg_type[adapter-&gt;card-&gt;debug_ix] = 1;        \</div><div class='add'>+		adapter-&gt;card-&gt;reg_offset[adapter-&gt;card-&gt;debug_ix] = \</div><div class='add'>+		((unsigned char *)(&amp;reg)) - \</div><div class='add'>+		((unsigned char *)adapter-&gt;slic_regs); \</div><div class='add'>+		adapter-&gt;card-&gt;reg_value[adapter-&gt;card-&gt;debug_ix] = value;   \</div><div class='add'>+		adapter-&gt;card-&gt;reg_valueh[adapter-&gt;card-&gt;debug_ix++] = valh;  \</div><div class='add'>+		if (adapter-&gt;card-&gt;debug_ix == 32) \</div><div class='add'>+			adapter-&gt;card-&gt;debug_ix = 0;                      \</div><div class='add'>+		slic_reg64_write((a), (&amp;reg), (value), (&amp;regh), (valh), \</div><div class='add'>+				(flush));\</div><div class='add'>+	}</div><div class='add'>+#else</div><div class='add'>+#define WRITE_REG(reg, value, flush) \</div><div class='add'>+	slic_reg32_write((&amp;reg), (value), (flush))</div><div class='add'>+#define WRITE_REG64(a, reg, value, regh, valh, flush) \</div><div class='add'>+	slic_reg64_write((a), (&amp;reg), (value), (&amp;regh), (valh), (flush))</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif  /* _SLIC_OS_SPECIFIC_H_  */</div><div class='add'>+</div><div class='head'>diff --git a/drivers/staging/slicoss/slicbuild.h b/drivers/staging/slicoss/slicbuild.h<br/>new file mode 100644<br/>index 000000000000..ae05e043d07e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/slicoss/slicbuild.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/slicoss/slicbuild.h</a></div><div class='hunk'>@@ -0,0 +1,96 @@</div><div class='add'>+/**************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2000-2002 Alacritech, Inc.  All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions</div><div class='add'>+ * are met:</div><div class='add'>+ *</div><div class='add'>+ * 1. Redistributions of source code must retain the above copyright</div><div class='add'>+ *    notice, this list of conditions and the following disclaimer.</div><div class='add'>+ * 2. Redistributions in binary form must reproduce the above</div><div class='add'>+ *    copyright notice, this list of conditions and the following</div><div class='add'>+ *    disclaimer in the documentation and/or other materials provided</div><div class='add'>+ *    with the distribution.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY ALACRITECH, INC. ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE</div><div class='add'>+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR</div><div class='add'>+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL ALACRITECH, INC. OR</div><div class='add'>+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,</div><div class='add'>+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT</div><div class='add'>+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF</div><div class='add'>+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,</div><div class='add'>+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT</div><div class='add'>+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF</div><div class='add'>+ * SUCH DAMAGE.</div><div class='add'>+ *</div><div class='add'>+ * The views and conclusions contained in the software and documentation</div><div class='add'>+ * are those of the authors and should not be interpreted as representing</div><div class='add'>+ * official policies, either expressed or implied, of Alacritech, Inc.</div><div class='add'>+ *</div><div class='add'>+ **************************************************************************/</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * FILENAME: slicbuild.h</div><div class='add'>+ *</div><div class='add'>+ * The following contains the compiler directive switches used for</div><div class='add'>+ * different SLIC build options.  They can all be set in the Makefile</div><div class='add'>+ * but the defaults are defined here.</div><div class='add'>+ */</div><div class='add'>+#ifndef _SLIC_BUILD_H_</div><div class='add'>+#define _SLIC_BUILD_H_</div><div class='add'>+</div><div class='add'>+#ifndef SLIC_PRODUCTION_BUILD</div><div class='add'>+#define SLIC_PRODUCTION_BUILD			1</div><div class='add'>+#endif</div><div class='add'>+#ifndef SLIC_FAILURE_RESET</div><div class='add'>+#define SLIC_FAILURE_RESET			1</div><div class='add'>+#endif</div><div class='add'>+#define DBG                         1</div><div class='add'>+#ifndef SLIC_ASSERT_ENABLED</div><div class='add'>+#define SLIC_ASSERT_ENABLED			1</div><div class='add'>+#endif</div><div class='add'>+#ifndef SLIC_MCAST_ENABLED</div><div class='add'>+#define SLIC_MCAST_ENABLED			1</div><div class='add'>+#endif</div><div class='add'>+#ifndef SLIC_GET_STATS_ENABLED</div><div class='add'>+#define SLIC_GET_STATS_ENABLED			1</div><div class='add'>+#endif</div><div class='add'>+#ifndef SLIC_GET_STATS_TIMER_ENABLED</div><div class='add'>+#define SLIC_GET_STATS_TIMER_ENABLED		0</div><div class='add'>+#endif</div><div class='add'>+#ifndef SLIC_PING_TIMER_ENABLED</div><div class='add'>+#define SLIC_PING_TIMER_ENABLED		1</div><div class='add'>+#endif</div><div class='add'>+#ifndef SLIC_IOCTL_SUPPORT_ENABLED</div><div class='add'>+#define SLIC_IOCTL_SUPPORT_ENABLED		1</div><div class='add'>+#endif</div><div class='add'>+#ifndef ATK_DEBUG</div><div class='add'>+#define ATK_DEBUG				1</div><div class='add'>+#endif</div><div class='add'>+#ifndef SLIC_POWER_MANAGEMENT_ENABLED</div><div class='add'>+#define SLIC_POWER_MANAGEMENT_ENABLED		0</div><div class='add'>+#endif</div><div class='add'>+#ifndef SLIC_INTERRUPT_PROCESS_LIMIT</div><div class='add'>+#define SLIC_INTERRUPT_PROCESS_LIMIT		1</div><div class='add'>+#endif</div><div class='add'>+#ifndef LINUX_FREES_ADAPTER_RESOURCES</div><div class='add'>+#define LINUX_FREES_ADAPTER_RESOURCES		1</div><div class='add'>+#endif</div><div class='add'>+#ifndef SLIC_OFFLOAD_IP_CHECKSUM</div><div class='add'>+#define SLIC_OFFLOAD_IP_CHECKSUM		1</div><div class='add'>+#endif</div><div class='add'>+#ifndef SLIC_POWER_MANAGEMENT_ENABLED</div><div class='add'>+#define SLIC_POWER_MANAGEMENT_ENABLED		0</div><div class='add'>+#endif</div><div class='add'>+#ifndef STATS_TIMER_INTERVAL</div><div class='add'>+#define STATS_TIMER_INTERVAL			2</div><div class='add'>+#endif</div><div class='add'>+#ifndef PING_TIMER_INTERVAL</div><div class='add'>+#define PING_TIMER_INTERVAL			1</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif   /* _SLIC_BUILD_H_  */</div><div class='head'>diff --git a/drivers/staging/slicoss/slicdbg.h b/drivers/staging/slicoss/slicdbg.h<br/>new file mode 100644<br/>index 000000000000..c54e44fb1f63<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/slicoss/slicdbg.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/slicoss/slicdbg.h</a></div><div class='hunk'>@@ -0,0 +1,100 @@</div><div class='add'>+/**************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2000-2002 Alacritech, Inc.  All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions</div><div class='add'>+ * are met:</div><div class='add'>+ *</div><div class='add'>+ * 1. Redistributions of source code must retain the above copyright</div><div class='add'>+ *    notice, this list of conditions and the following disclaimer.</div><div class='add'>+ * 2. Redistributions in binary form must reproduce the above</div><div class='add'>+ *    copyright notice, this list of conditions and the following</div><div class='add'>+ *    disclaimer in the documentation and/or other materials provided</div><div class='add'>+ *    with the distribution.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY ALACRITECH, INC. ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE</div><div class='add'>+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR</div><div class='add'>+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL ALACRITECH, INC. OR</div><div class='add'>+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,</div><div class='add'>+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT</div><div class='add'>+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF</div><div class='add'>+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,</div><div class='add'>+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT</div><div class='add'>+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF</div><div class='add'>+ * SUCH DAMAGE.</div><div class='add'>+ *</div><div class='add'>+ * The views and conclusions contained in the software and documentation</div><div class='add'>+ * are those of the authors and should not be interpreted as representing</div><div class='add'>+ * official policies, either expressed or implied, of Alacritech, Inc.</div><div class='add'>+ *</div><div class='add'>+ **************************************************************************/</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * FILENAME: slicdbg.h</div><div class='add'>+ *</div><div class='add'>+ * All debug and assertion-based definitions and macros are included</div><div class='add'>+ * in this file for the SLICOSS driver.</div><div class='add'>+ */</div><div class='add'>+#ifndef _SLIC_DEBUG_H_</div><div class='add'>+#define _SLIC_DEBUG_H_</div><div class='add'>+</div><div class='add'>+#ifdef SLIC_DEFAULT_LOG_LEVEL</div><div class='add'>+#else</div><div class='add'>+#define SLICLEVEL   KERN_DEBUG</div><div class='add'>+#endif</div><div class='add'>+#define SLIC_DISPLAY              printk</div><div class='add'>+#define DBG_ERROR(n, args...)   SLIC_DISPLAY(KERN_EMERG n, ##args)</div><div class='add'>+</div><div class='add'>+#define SLIC_DEBUG_MESSAGE 1</div><div class='add'>+#if SLIC_DEBUG_MESSAGE</div><div class='add'>+/*#define DBG_MSG(n, args...)      SLIC_DISPLAY(SLICLEVEL n, ##args)*/</div><div class='add'>+#define DBG_MSG(n, args...)</div><div class='add'>+#else</div><div class='add'>+#define DBG_MSG(n, args...)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef ASSERT</div><div class='add'>+#undef ASSERT</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if SLIC_ASSERT_ENABLED</div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='add'>+#define VALID_ADDRESS(p)  (1)</div><div class='add'>+#else</div><div class='add'>+#define VALID_ADDRESS(p)  (((u32)(p) &amp; 0x80000000) || ((u32)(p) == 0))</div><div class='add'>+#endif</div><div class='add'>+#ifndef ASSERT</div><div class='add'>+#define ASSERT(a)                                                             \</div><div class='add'>+    {                                                                         \</div><div class='add'>+	if (!(a)) {                                                           \</div><div class='add'>+		DBG_ERROR("ASSERT() Failure: file %s, function %s  line %d\n",\</div><div class='add'>+		__FILE__, __func__, __LINE__);                          \</div><div class='add'>+		slic_assert_fail();                                       \</div><div class='add'>+	}                                                                 \</div><div class='add'>+    }</div><div class='add'>+#endif</div><div class='add'>+#ifndef ASSERTMSG</div><div class='add'>+#define ASSERTMSG(a,msg)                                                  \</div><div class='add'>+    {                                                                     \</div><div class='add'>+	if (!(a)) {                                                       \</div><div class='add'>+		DBG_ERROR("ASSERT() Failure: file %s, function %s"\</div><div class='add'>+			"line %d: %s\n",\</div><div class='add'>+			__FILE__, __func__, __LINE__, (msg));            \</div><div class='add'>+		slic_assert_fail();                                      \</div><div class='add'>+	}                                                                \</div><div class='add'>+    }</div><div class='add'>+#endif</div><div class='add'>+#else</div><div class='add'>+#ifndef ASSERT</div><div class='add'>+#define ASSERT(a)</div><div class='add'>+#endif</div><div class='add'>+#ifndef ASSERTMSG</div><div class='add'>+#define ASSERTMSG(a, msg)</div><div class='add'>+#endif</div><div class='add'>+#endif /* SLIC_ASSERT_ENABLED  */</div><div class='add'>+</div><div class='add'>+#endif  /*  _SLIC_DEBUG_H_  */</div><div class='head'>diff --git a/drivers/staging/slicoss/slicdump.h b/drivers/staging/slicoss/slicdump.h<br/>new file mode 100644<br/>index 000000000000..92a9b44bcade<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/slicoss/slicdump.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/slicoss/slicdump.h</a></div><div class='hunk'>@@ -0,0 +1,278 @@</div><div class='add'>+/*</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2000-2002 Alacritech, Inc.  All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions</div><div class='add'>+ * are met:</div><div class='add'>+ *</div><div class='add'>+ * 1. Redistributions of source code must retain the above copyright</div><div class='add'>+ *    notice, this list of conditions and the following disclaimer.</div><div class='add'>+ * 2. Redistributions in binary form must reproduce the above</div><div class='add'>+ *    copyright notice, this list of conditions and the following</div><div class='add'>+ *    disclaimer in the documentation and/or other materials provided</div><div class='add'>+ *    with the distribution.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY ALACRITECH, INC. ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE</div><div class='add'>+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR</div><div class='add'>+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL ALACRITECH, INC. OR</div><div class='add'>+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,</div><div class='add'>+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT</div><div class='add'>+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF</div><div class='add'>+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,</div><div class='add'>+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT</div><div class='add'>+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF</div><div class='add'>+ * SUCH DAMAGE.</div><div class='add'>+ *</div><div class='add'>+ * NO LICENSE TO ANY ALACRITECH PATENT CLAIM IS GRANTED BY ANY COPYRIGHT</div><div class='add'>+ * LICENSE TO THIS OR OTHER SOFTWARE. THIS SOFTWARE MAY BE COVERED BY</div><div class='add'>+ * ALACRITECH PATENTS INCLUDING BUT NOT LIMITED TO U.S. PATENT NOS. 6,226,680,</div><div class='add'>+ * 6,247,060, 6,334,153, 6,389,479, 6,393,487, 6,427,171, 6,427,173</div><div class='add'>+ * and 6,434,620.</div><div class='add'>+ * THIS SOFTWARE IS NOT SUBJECT TO THE GNU GENERAL PUBLIC LICENSE (GPL).</div><div class='add'>+ *</div><div class='add'>+ * The views and conclusions contained in the software and</div><div class='add'>+ * documentation are those of the authors and should not be</div><div class='add'>+ * interpreted as representing official policies, either</div><div class='add'>+ * expressed or implied, of Alacritech, Inc.</div><div class='add'>+ */</div><div class='add'>+#ifndef _SLIC_DUMP_H_</div><div class='add'>+#define _SLIC_DUMP_H_</div><div class='add'>+</div><div class='add'>+#define DEBUG_SUCCESS   0</div><div class='add'>+</div><div class='add'>+/***********************************************************************</div><div class='add'>+ *</div><div class='add'>+ * Utility processor register locations</div><div class='add'>+ *</div><div class='add'>+ **********************************************************************/</div><div class='add'>+#define UTILITY_RESET       0x0</div><div class='add'>+#define UTILITY_ISP_ADDR    0x4     /* Interrupt status Pointer */</div><div class='add'>+#define UTILITY_ISR_ADDR    0x8     /* Interrupt status Register */</div><div class='add'>+#define UTILITY_ICR_ADDR    0xc     /* Interrupt Control Register */</div><div class='add'>+#define UTILITY_CPR_ADDR    0x10    /* Command Pointer Register */</div><div class='add'>+#define UTILITY_DPR_ADDR    0x14    /* Data Pointer Register */</div><div class='add'>+#define UTILITY_DMP_TRQ     0x18    /* Dump queue onto ALU for analyser */</div><div class='add'>+#define UTILITY_UPP_ADDR    0x1c    /* Bits 63-32 of cmd/data pointer */</div><div class='add'>+</div><div class='add'>+/***********************************************************************</div><div class='add'>+ *</div><div class='add'>+ * INIC status register bits</div><div class='add'>+ *</div><div class='add'>+ ***********************************************************************/</div><div class='add'>+#define SLIC_ISR_CC         0x10000000  /* Command complete - synchronous */</div><div class='add'>+#define SLIC_ISR_ERR        0x01000000  /* Command Error - synchronous */</div><div class='add'>+#define SLIC_ISR_CMD_MASK   0x11000000  /* Command status mask */</div><div class='add'>+#define SLIC_ISR_TPH        0x00080000  /* Transmit processor halted - async */</div><div class='add'>+#define SLIC_ISR_RPH        0x00040000  /* Receive processor halted - async */</div><div class='add'>+</div><div class='add'>+/***********************************************************************</div><div class='add'>+ *</div><div class='add'>+ * INIC Control register values</div><div class='add'>+ *</div><div class='add'>+ ***********************************************************************/</div><div class='add'>+#define SLIC_ICR_OFF        0           /* Interrupts disabled */</div><div class='add'>+#define SLIC_ICR_ON         1           /* Interrupts enabled */</div><div class='add'>+#define SLIC_ICR_MASK       2           /* Interrupts masked */</div><div class='add'>+</div><div class='add'>+#define WRITE_DREG(reg, value, flush)                           \</div><div class='add'>+{                                                               \</div><div class='add'>+    writel((value), (reg));                                     \</div><div class='add'>+    if ((flush)) {                                               \</div><div class='add'>+	mb();                                                   \</div><div class='add'>+    }                                                           \</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * Command Format</div><div class='add'>+ *</div><div class='add'>+ * Each command contains a command byte which is defined as follows:</div><div class='add'>+ *</div><div class='add'>+ *  bits:   7-3     2       1-0</div><div class='add'>+ *      ----------------------------------------------</div><div class='add'>+ *      command     Alt. Proc   Processor</div><div class='add'>+ *</div><div class='add'>+ ************************************************************************/</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Macro to create the command byte given the command, Alt. Proc, and</div><div class='add'>+ * Processor values.  Note that the macro assumes that the values are</div><div class='add'>+ * preshifted.  That is, the values for alt. proc are 0 for transmit and</div><div class='add'>+ * 4 for receive.</div><div class='add'>+ */</div><div class='add'>+#define COMMAND_BYTE(command, alt_proc, proc) ((command) | (alt_proc) | (proc))</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Command values</div><div class='add'>+ */</div><div class='add'>+#define CMD_HALT        0x0     /* Send a halt to the INIC */</div><div class='add'>+#define CMD_RUN         0x8     /* Start the halted INIC */</div><div class='add'>+#define CMD_STEP        0x10    /* Single step the inic */</div><div class='add'>+#define CMD_BREAK       0x18    /* Set a breakpoint - 8 byte command */</div><div class='add'>+#define CMD_RESET_BREAK 0x20    /* Reset a breakpoint - 8 byte cmd */</div><div class='add'>+#define CMD_DUMP        0x28    /* Dump INIC memory - 8 byte command */</div><div class='add'>+#define CMD_LOAD        0x30    /* Load INIC memory - 8 byte command */</div><div class='add'>+#define CMD_MAP         0x38    /* Map out a ROM instruction - 8 BC */</div><div class='add'>+#define CMD_CAM_OPS     0x38    /* perform ops on specific CAM */</div><div class='add'>+#define CMD_XMT         0x40    /* Transmit frame */</div><div class='add'>+#define CMD_RCV         0x48    /* Receive frame */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Alt. Proc values</div><div class='add'>+ *</div><div class='add'>+ * When the proc value is set to the utility processor, the Alt. Proc</div><div class='add'>+ * specifies which processor handles the debugging.</div><div class='add'>+ */</div><div class='add'>+#define ALT_PROC_TRANSMIT   0x0</div><div class='add'>+#define ALT_PROC_RECEIVE    0x4</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Proc values</div><div class='add'>+ */</div><div class='add'>+#define PROC_INVALID        0x0</div><div class='add'>+#define PROC_NONE           0x0  /* Gigabit use */</div><div class='add'>+#define PROC_TRANSMIT       0x1</div><div class='add'>+#define PROC_RECEIVE        0x2</div><div class='add'>+#define PROC_UTILITY        0x3</div><div class='add'>+</div><div class='add'>+/******************************************************************</div><div class='add'>+ *</div><div class='add'>+ * 8 byte command structure definitions</div><div class='add'>+ *</div><div class='add'>+ ******************************************************************/</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Break and Reset Break command structure</div><div class='add'>+ */</div><div class='add'>+struct BREAK {</div><div class='add'>+    unsigned char     command;    /* Command word defined above */</div><div class='add'>+    unsigned char     resvd;</div><div class='add'>+    ushort    count;      /* Number of executions before break */</div><div class='add'>+    u32   addr;       /* Address of break point */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Dump and Load command structure</div><div class='add'>+ */</div><div class='add'>+struct dump_cmd {</div><div class='add'>+    unsigned char     cmd;        /* Command word defined above */</div><div class='add'>+    unsigned char     desc;       /* Descriptor values - defined below */</div><div class='add'>+    ushort    count;      /* number of 4 byte words to be transferred */</div><div class='add'>+    u32   addr;       /* start address of dump or load */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Receive or Transmit a frame.</div><div class='add'>+ */</div><div class='add'>+struct RCV_OR_XMT_FRAME {</div><div class='add'>+    unsigned char     command;    /* Command word defined above */</div><div class='add'>+    unsigned char     MacId;      /* Mac ID of interface - transmit only */</div><div class='add'>+    ushort    count;      /* Length of frame in bytes */</div><div class='add'>+    u32   pad;        /* not used */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Values of desc field in DUMP_OR_LOAD structure</div><div class='add'>+ */</div><div class='add'>+#define DESC_RFILE          0x0     /* Register file */</div><div class='add'>+#define DESC_SRAM           0x1     /* SRAM */</div><div class='add'>+#define DESC_DRAM           0x2     /* DRAM */</div><div class='add'>+#define DESC_QUEUE          0x3     /* queues */</div><div class='add'>+#define DESC_REG            0x4     /* General registers (pc, status, etc) */</div><div class='add'>+#define DESC_SENSE          0x5     /* Sense register */</div><div class='add'>+</div><div class='add'>+/* Descriptor field definitions for CMD_DUMP_CAM */</div><div class='add'>+#define DUMP_CAM_A              0</div><div class='add'>+#define DUMP_CAM_B              1               /* unused at present */</div><div class='add'>+#define DUMP_CAM_C              2</div><div class='add'>+#define DUMP_CAM_D              3</div><div class='add'>+#define SEARCH_CAM_A            4</div><div class='add'>+#define SEARCH_CAM_C            5</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Map command to replace a command in ROM with a command in WCS</div><div class='add'>+ */</div><div class='add'>+struct MAP {</div><div class='add'>+    unsigned char   command;    /* Command word defined above */</div><div class='add'>+    unsigned char   not_used[3];</div><div class='add'>+    ushort  map_to;     /* Instruction address in WCS */</div><div class='add'>+    ushort  map_out;    /* Instruction address in ROM */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Misc definitions</div><div class='add'>+ */</div><div class='add'>+#define SLIC_MAX_QUEUE       32 /* Total # of queues on the INIC (0-31)*/</div><div class='add'>+#define SLIC_4MAX_REG       512 /* Total # of 4-port file-registers    */</div><div class='add'>+#define SLIC_1MAX_REG       384 /* Total # of file-registers           */</div><div class='add'>+#define SLIC_GBMAX_REG     1024 /* Total # of Gbit file-registers      */</div><div class='add'>+#define SLIC_NUM_REG         32 /* non-file-registers = NUM_REG in tm-simba.h */</div><div class='add'>+#define SLIC_GB_CAMA_SZE     32</div><div class='add'>+#define SLIC_GB_CAMB_SZE     16</div><div class='add'>+#define SLIC_GB_CAMAB_SZE    32</div><div class='add'>+#define SLIC_GB_CAMC_SZE     16</div><div class='add'>+#define SLIC_GB_CAMD_SZE     16</div><div class='add'>+#define SLIC_GB_CAMCD_SZE    32</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Coredump header structure</div><div class='add'>+ */</div><div class='add'>+struct CORE_Q {</div><div class='add'>+    u32   queueOff;           /* Offset of queue */</div><div class='add'>+    u32   queuesize;          /* size of queue */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define DRIVER_NAME_SIZE    32</div><div class='add'>+</div><div class='add'>+struct sliccore_hdr {</div><div class='add'>+    unsigned char driver_version[DRIVER_NAME_SIZE]; /* Driver version string */</div><div class='add'>+    u32   RcvRegOff;          /* Offset of receive registers */</div><div class='add'>+    u32   RcvRegsize;         /* size of receive registers */</div><div class='add'>+    u32   XmtRegOff;          /* Offset of transmit registers */</div><div class='add'>+    u32   XmtRegsize;         /* size of transmit registers */</div><div class='add'>+    u32   FileRegOff;         /* Offset of register file */</div><div class='add'>+    u32   FileRegsize;        /* size of register file */</div><div class='add'>+    u32   SramOff;            /* Offset of Sram */</div><div class='add'>+    u32   Sramsize;           /* size of Sram */</div><div class='add'>+    u32   DramOff;            /* Offset of Dram */</div><div class='add'>+    u32   Dramsize;           /* size of Dram */</div><div class='add'>+    CORE_Q    queues[SLIC_MAX_QUEUE]; /* size and offsets of queues */</div><div class='add'>+    u32   CamAMOff;           /* Offset of CAM A contents */</div><div class='add'>+    u32   CamASize;           /* Size of Cam A */</div><div class='add'>+    u32   CamBMOff;           /* Offset of CAM B contents */</div><div class='add'>+    u32   CamBSize;           /* Size of Cam B */</div><div class='add'>+    u32   CamCMOff;           /* Offset of CAM C contents */</div><div class='add'>+    u32   CamCSize;           /* Size of Cam C */</div><div class='add'>+    u32   CamDMOff;           /* Offset of CAM D contents */</div><div class='add'>+    u32   CamDSize;           /* Size of Cam D */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * definitions needed for our kernel-mode gdb stub.</div><div class='add'>+ */</div><div class='add'>+/***********************************************************************</div><div class='add'>+ *</div><div class='add'>+ * Definitions &amp; Typedefs</div><div class='add'>+ *</div><div class='add'>+ **********************************************************************/</div><div class='add'>+#define BUFMAX      0x20000 /* 128k - size of input/output buffer */</div><div class='add'>+#define BUFMAXP2    5       /* 2**5 (32) 4K pages */</div><div class='add'>+</div><div class='add'>+#define IOCTL_SIMBA_BREAK           _IOW('s', 0, unsigned long)</div><div class='add'>+/* #define IOCTL_SIMBA_INIT            _IOW('s', 1, unsigned long) */</div><div class='add'>+#define IOCTL_SIMBA_KILL_TGT_PROC   _IOW('s', 2, unsigned long)</div><div class='add'>+</div><div class='add'>+/***********************************************************************</div><div class='add'>+ *</div><div class='add'>+ * Global variables</div><div class='add'>+ *</div><div class='add'>+ ***********************************************************************/</div><div class='add'>+</div><div class='add'>+#define THREADRECEIVE   1   /* bit 0 of StoppedThreads */</div><div class='add'>+#define THREADTRANSMIT  2   /* bit 1 of StoppedThreads */</div><div class='add'>+#define THREADBOTH      3   /* bit 0 and 1.. */</div><div class='add'>+</div><div class='add'>+#endif  /*  _SLIC_DUMP_H  */</div><div class='head'>diff --git a/drivers/staging/slicoss/slichw.h b/drivers/staging/slicoss/slichw.h<br/>new file mode 100644<br/>index 000000000000..d03e90b06753<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/slicoss/slichw.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/slicoss/slichw.h</a></div><div class='hunk'>@@ -0,0 +1,845 @@</div><div class='add'>+/**************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2000-2002 Alacritech, Inc.  All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions</div><div class='add'>+ * are met:</div><div class='add'>+ *</div><div class='add'>+ * 1. Redistributions of source code must retain the above copyright</div><div class='add'>+ *    notice, this list of conditions and the following disclaimer.</div><div class='add'>+ * 2. Redistributions in binary form must reproduce the above</div><div class='add'>+ *    copyright notice, this list of conditions and the following</div><div class='add'>+ *    disclaimer in the documentation and/or other materials provided</div><div class='add'>+ *    with the distribution.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY ALACRITECH, INC. ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE</div><div class='add'>+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR</div><div class='add'>+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL ALACRITECH, INC. OR</div><div class='add'>+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,</div><div class='add'>+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT</div><div class='add'>+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF</div><div class='add'>+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,</div><div class='add'>+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT</div><div class='add'>+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF</div><div class='add'>+ * SUCH DAMAGE.</div><div class='add'>+ *</div><div class='add'>+ * The views and conclusions contained in the software and documentation</div><div class='add'>+ * are those of the authors and should not be interpreted as representing</div><div class='add'>+ * official policies, either expressed or implied, of Alacritech, Inc.</div><div class='add'>+ *</div><div class='add'>+ **************************************************************************/</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * FILENAME: slichw.h</div><div class='add'>+ *</div><div class='add'>+ * This header file contains definitions that are common to our hardware.</div><div class='add'>+ */</div><div class='add'>+#ifndef __SLICHW_H__</div><div class='add'>+#define __SLICHW_H__</div><div class='add'>+</div><div class='add'>+#define PCI_VENDOR_ID_ALACRITECH    0x139A</div><div class='add'>+#define SLIC_1GB_DEVICE_ID          0x0005</div><div class='add'>+#define SLIC_2GB_DEVICE_ID          0x0007  /*Oasis Device ID */</div><div class='add'>+</div><div class='add'>+#define SLIC_1GB_CICADA_SUBSYS_ID   0x0008</div><div class='add'>+</div><div class='add'>+#define SLIC_NBR_MACS      4</div><div class='add'>+</div><div class='add'>+#define SLIC_RCVBUF_SIZE        2048</div><div class='add'>+#define SLIC_RCVBUF_HEADSIZE    34</div><div class='add'>+#define SLIC_RCVBUF_TAILSIZE    0</div><div class='add'>+#define SLIC_RCVBUF_DATASIZE    (SLIC_RCVBUF_SIZE - (SLIC_RCVBUF_HEADSIZE +\</div><div class='add'>+					SLIC_RCVBUF_TAILSIZE))</div><div class='add'>+</div><div class='add'>+#define VGBSTAT_XPERR           0x40000000</div><div class='add'>+#define VGBSTAT_XERRSHFT        25</div><div class='add'>+#define VGBSTAT_XCSERR          0x23</div><div class='add'>+#define VGBSTAT_XUFLOW          0x22</div><div class='add'>+#define VGBSTAT_XHLEN           0x20</div><div class='add'>+#define VGBSTAT_NETERR          0x01000000</div><div class='add'>+#define VGBSTAT_NERRSHFT        16</div><div class='add'>+#define VGBSTAT_NERRMSK         0x1ff</div><div class='add'>+#define VGBSTAT_NCSERR          0x103</div><div class='add'>+#define VGBSTAT_NUFLOW          0x102</div><div class='add'>+#define VGBSTAT_NHLEN           0x100</div><div class='add'>+#define VGBSTAT_LNKERR          0x00000080</div><div class='add'>+#define VGBSTAT_LERRMSK         0xff</div><div class='add'>+#define VGBSTAT_LDEARLY         0x86</div><div class='add'>+#define VGBSTAT_LBOFLO          0x85</div><div class='add'>+#define VGBSTAT_LCODERR         0x84</div><div class='add'>+#define VGBSTAT_LDBLNBL         0x83</div><div class='add'>+#define VGBSTAT_LCRCERR         0x82</div><div class='add'>+#define VGBSTAT_LOFLO           0x81</div><div class='add'>+#define VGBSTAT_LUFLO           0x80</div><div class='add'>+#define IRHDDR_FLEN_MSK         0x0000ffff</div><div class='add'>+#define IRHDDR_SVALID           0x80000000</div><div class='add'>+#define IRHDDR_ERR              0x10000000</div><div class='add'>+#define VRHSTAT_802OE           0x80000000</div><div class='add'>+#define VRHSTAT_TPOFLO          0x10000000</div><div class='add'>+#define VRHSTATB_802UE          0x80000000</div><div class='add'>+#define VRHSTATB_RCVE           0x40000000</div><div class='add'>+#define VRHSTATB_BUFF           0x20000000</div><div class='add'>+#define VRHSTATB_CARRE          0x08000000</div><div class='add'>+#define VRHSTATB_LONGE          0x02000000</div><div class='add'>+#define VRHSTATB_PREA           0x01000000</div><div class='add'>+#define VRHSTATB_CRC            0x00800000</div><div class='add'>+#define VRHSTATB_DRBL           0x00400000</div><div class='add'>+#define VRHSTATB_CODE           0x00200000</div><div class='add'>+#define VRHSTATB_TPCSUM         0x00100000</div><div class='add'>+#define VRHSTATB_TPHLEN         0x00080000</div><div class='add'>+#define VRHSTATB_IPCSUM         0x00040000</div><div class='add'>+#define VRHSTATB_IPLERR         0x00020000</div><div class='add'>+#define VRHSTATB_IPHERR         0x00010000</div><div class='add'>+#define SLIC_MAX64_BCNT         23</div><div class='add'>+#define SLIC_MAX32_BCNT         26</div><div class='add'>+#define IHCMD_XMT_REQ           0x01</div><div class='add'>+#define IHFLG_IFSHFT            2</div><div class='add'>+#define SLIC_RSPBUF_SIZE        32</div><div class='add'>+</div><div class='add'>+#define SLIC_RESET_MAGIC        0xDEAD</div><div class='add'>+#define ICR_INT_OFF             0</div><div class='add'>+#define ICR_INT_ON              1</div><div class='add'>+#define ICR_INT_MASK            2</div><div class='add'>+</div><div class='add'>+#define ISR_ERR                 0x80000000</div><div class='add'>+#define ISR_RCV                 0x40000000</div><div class='add'>+#define ISR_CMD                 0x20000000</div><div class='add'>+#define ISR_IO                  0x60000000</div><div class='add'>+#define ISR_UPC                 0x10000000</div><div class='add'>+#define ISR_LEVENT              0x08000000</div><div class='add'>+#define ISR_RMISS               0x02000000</div><div class='add'>+#define ISR_UPCERR              0x01000000</div><div class='add'>+#define ISR_XDROP               0x00800000</div><div class='add'>+#define ISR_UPCBSY              0x00020000</div><div class='add'>+#define ISR_EVMSK               0xffff0000</div><div class='add'>+#define ISR_PINGMASK            0x00700000</div><div class='add'>+#define ISR_PINGDSMASK          0x00710000</div><div class='add'>+#define ISR_UPCMASK             0x11000000</div><div class='add'>+#define SLIC_WCS_START          0x80000000</div><div class='add'>+#define SLIC_WCS_COMPARE        0x40000000</div><div class='add'>+#define SLIC_RCVWCS_BEGIN       0x40000000</div><div class='add'>+#define SLIC_RCVWCS_FINISH      0x80000000</div><div class='add'>+#define SLIC_PM_MAXPATTERNS     6</div><div class='add'>+#define SLIC_PM_PATTERNSIZE     128</div><div class='add'>+#define SLIC_PMCAPS_WAKEONLAN   0x00000001</div><div class='add'>+#define MIICR_REG_PCR           0x00000000</div><div class='add'>+#define MIICR_REG_4             0x00040000</div><div class='add'>+#define MIICR_REG_9             0x00090000</div><div class='add'>+#define MIICR_REG_16            0x00100000</div><div class='add'>+#define PCR_RESET               0x8000</div><div class='add'>+#define PCR_POWERDOWN           0x0800</div><div class='add'>+#define PCR_SPEED_100           0x2000</div><div class='add'>+#define PCR_SPEED_1000          0x0040</div><div class='add'>+#define PCR_AUTONEG             0x1000</div><div class='add'>+#define PCR_AUTONEG_RST         0x0200</div><div class='add'>+#define PCR_DUPLEX_FULL         0x0100</div><div class='add'>+#define PSR_LINKUP              0x0004</div><div class='add'>+</div><div class='add'>+#define PAR_ADV100FD            0x0100</div><div class='add'>+#define PAR_ADV100HD            0x0080</div><div class='add'>+#define PAR_ADV10FD             0x0040</div><div class='add'>+#define PAR_ADV10HD             0x0020</div><div class='add'>+#define PAR_ASYMPAUSE           0x0C00</div><div class='add'>+#define PAR_802_3               0x0001</div><div class='add'>+</div><div class='add'>+#define PAR_ADV1000XFD          0x0020</div><div class='add'>+#define PAR_ADV1000XHD          0x0040</div><div class='add'>+#define PAR_ASYMPAUSE_FIBER     0x0180</div><div class='add'>+</div><div class='add'>+#define PGC_ADV1000FD           0x0200</div><div class='add'>+#define PGC_ADV1000HD           0x0100</div><div class='add'>+#define SEEQ_LINKFAIL           0x4000</div><div class='add'>+#define SEEQ_SPEED              0x0080</div><div class='add'>+#define SEEQ_DUPLEX             0x0040</div><div class='add'>+#define TDK_DUPLEX              0x0800</div><div class='add'>+#define TDK_SPEED               0x0400</div><div class='add'>+#define MRV_REG16_XOVERON       0x0068</div><div class='add'>+#define MRV_REG16_XOVEROFF      0x0008</div><div class='add'>+#define MRV_SPEED_1000          0x8000</div><div class='add'>+#define MRV_SPEED_100           0x4000</div><div class='add'>+#define MRV_SPEED_10            0x0000</div><div class='add'>+#define MRV_FULLDUPLEX          0x2000</div><div class='add'>+#define MRV_LINKUP              0x0400</div><div class='add'>+</div><div class='add'>+#define GIG_LINKUP              0x0001</div><div class='add'>+#define GIG_FULLDUPLEX          0x0002</div><div class='add'>+#define GIG_SPEED_MASK          0x000C</div><div class='add'>+#define GIG_SPEED_1000          0x0008</div><div class='add'>+#define GIG_SPEED_100           0x0004</div><div class='add'>+#define GIG_SPEED_10            0x0000</div><div class='add'>+</div><div class='add'>+#define MCR_RESET               0x80000000</div><div class='add'>+#define MCR_CRCEN               0x40000000</div><div class='add'>+#define MCR_FULLD               0x10000000</div><div class='add'>+#define MCR_PAD                 0x02000000</div><div class='add'>+#define MCR_RETRYLATE           0x01000000</div><div class='add'>+#define MCR_BOL_SHIFT           21</div><div class='add'>+#define MCR_IPG1_SHIFT          14</div><div class='add'>+#define MCR_IPG2_SHIFT          7</div><div class='add'>+#define MCR_IPG3_SHIFT          0</div><div class='add'>+#define GMCR_RESET              0x80000000</div><div class='add'>+#define GMCR_GBIT               0x20000000</div><div class='add'>+#define GMCR_FULLD              0x10000000</div><div class='add'>+#define GMCR_GAPBB_SHIFT        14</div><div class='add'>+#define GMCR_GAPR1_SHIFT        7</div><div class='add'>+#define GMCR_GAPR2_SHIFT        0</div><div class='add'>+#define GMCR_GAPBB_1000         0x60</div><div class='add'>+#define GMCR_GAPR1_1000         0x2C</div><div class='add'>+#define GMCR_GAPR2_1000         0x40</div><div class='add'>+#define GMCR_GAPBB_100          0x70</div><div class='add'>+#define GMCR_GAPR1_100          0x2C</div><div class='add'>+#define GMCR_GAPR2_100          0x40</div><div class='add'>+#define XCR_RESET               0x80000000</div><div class='add'>+#define XCR_XMTEN               0x40000000</div><div class='add'>+#define XCR_PAUSEEN             0x20000000</div><div class='add'>+#define XCR_LOADRNG             0x10000000</div><div class='add'>+#define RCR_RESET               0x80000000</div><div class='add'>+#define RCR_RCVEN               0x40000000</div><div class='add'>+#define RCR_RCVALL              0x20000000</div><div class='add'>+#define RCR_RCVBAD              0x10000000</div><div class='add'>+#define RCR_CTLEN               0x08000000</div><div class='add'>+#define RCR_ADDRAEN             0x02000000</div><div class='add'>+#define GXCR_RESET              0x80000000</div><div class='add'>+#define GXCR_XMTEN              0x40000000</div><div class='add'>+#define GXCR_PAUSEEN            0x20000000</div><div class='add'>+#define GRCR_RESET              0x80000000</div><div class='add'>+#define GRCR_RCVEN              0x40000000</div><div class='add'>+#define GRCR_RCVALL             0x20000000</div><div class='add'>+#define GRCR_RCVBAD             0x10000000</div><div class='add'>+#define GRCR_CTLEN              0x08000000</div><div class='add'>+#define GRCR_ADDRAEN            0x02000000</div><div class='add'>+#define GRCR_HASHSIZE_SHIFT     17</div><div class='add'>+#define GRCR_HASHSIZE           14</div><div class='add'>+</div><div class='add'>+#define SLIC_EEPROM_ID        0xA5A5</div><div class='add'>+#define SLIC_SRAM_SIZE2GB     (64 * 1024)</div><div class='add'>+#define SLIC_SRAM_SIZE1GB     (32 * 1024)</div><div class='add'>+#define SLIC_HOSTID_DEFAULT   0xFFFF      /* uninitialized hostid */</div><div class='add'>+#define SLIC_NBR_MACS         4</div><div class='add'>+</div><div class='add'>+#ifndef FALSE</div><div class='add'>+#define FALSE  0</div><div class='add'>+#else</div><div class='add'>+#undef  FALSE</div><div class='add'>+#define FALSE  0</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef TRUE</div><div class='add'>+#define TRUE   1</div><div class='add'>+#else</div><div class='add'>+#undef  TRUE</div><div class='add'>+#define TRUE   1</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+struct slic_rcvbuf {</div><div class='add'>+    unsigned char     pad1[6];</div><div class='add'>+    ushort    pad2;</div><div class='add'>+    u32   pad3;</div><div class='add'>+    u32   pad4;</div><div class='add'>+    u32   buffer;</div><div class='add'>+    u32   length;</div><div class='add'>+    u32   status;</div><div class='add'>+    u32   pad5;</div><div class='add'>+    ushort    pad6;</div><div class='add'>+    unsigned char     data[SLIC_RCVBUF_DATASIZE];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+ struct slic_hddr_wds {</div><div class='add'>+  union {</div><div class='add'>+    struct {</div><div class='add'>+	u32    frame_status;</div><div class='add'>+	u32    frame_status_b;</div><div class='add'>+	u32    time_stamp;</div><div class='add'>+	u32    checksum;</div><div class='add'>+    } hdrs_14port;</div><div class='add'>+    struct {</div><div class='add'>+	u32    frame_status;</div><div class='add'>+	ushort     ByteCnt;</div><div class='add'>+	ushort     TpChksum;</div><div class='add'>+	ushort     CtxHash;</div><div class='add'>+	ushort     MacHash;</div><div class='add'>+	u32    BufLnk;</div><div class='add'>+    } hdrs_gbit;</div><div class='add'>+  } u0;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define frame_status14        u0.hdrs_14port.frame_status</div><div class='add'>+#define frame_status_b14      u0.hdrs_14port.frame_status_b</div><div class='add'>+#define frame_statusGB        u0.hdrs_gbit.frame_status</div><div class='add'>+</div><div class='add'>+struct slic_host64sg {</div><div class='add'>+	u32        paddrl;</div><div class='add'>+	u32        paddrh;</div><div class='add'>+	u32        length;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct slic_host64_cmd {</div><div class='add'>+    u32       hosthandle;</div><div class='add'>+    u32       RSVD;</div><div class='add'>+    unsigned char         command;</div><div class='add'>+    unsigned char         flags;</div><div class='add'>+    union {</div><div class='add'>+	ushort          rsv1;</div><div class='add'>+	ushort          rsv2;</div><div class='add'>+    } u0;</div><div class='add'>+    union {</div><div class='add'>+	struct {</div><div class='add'>+		u32            totlen;</div><div class='add'>+		struct slic_host64sg    bufs[SLIC_MAX64_BCNT];</div><div class='add'>+	} slic_buffers;</div><div class='add'>+    } u;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct slic_rspbuf {</div><div class='add'>+    u32   hosthandle;</div><div class='add'>+    u32   pad0;</div><div class='add'>+    u32   pad1;</div><div class='add'>+    u32   status;</div><div class='add'>+    u32   pad2[4];</div><div class='add'>+</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct slic_regs {</div><div class='add'>+	u32	slic_reset;		/* Reset Register */</div><div class='add'>+	u32	pad0;</div><div class='add'>+</div><div class='add'>+	u32	slic_icr;		/* Interrupt Control Register */</div><div class='add'>+	u32	pad2;</div><div class='add'>+#define SLIC_ICR		0x0008</div><div class='add'>+</div><div class='add'>+	u32	slic_isp;		/* Interrupt status pointer */</div><div class='add'>+	u32	pad1;</div><div class='add'>+#define SLIC_ISP		0x0010</div><div class='add'>+</div><div class='add'>+    u32	slic_isr;		/* Interrupt status */</div><div class='add'>+	u32	pad3;</div><div class='add'>+#define SLIC_ISR		0x0018</div><div class='add'>+</div><div class='add'>+    u32	slic_hbar;		/* Header buffer address reg */</div><div class='add'>+	u32		pad4;</div><div class='add'>+	/* 31-8 - phy addr of set of contiguous hdr buffers</div><div class='add'>+	    7-0 - number of buffers passed</div><div class='add'>+	   Buffers are 256 bytes long on 256-byte boundaries. */</div><div class='add'>+#define SLIC_HBAR		0x0020</div><div class='add'>+#define SLIC_HBAR_CNT_MSK	0x000000FF</div><div class='add'>+</div><div class='add'>+    u32	slic_dbar;	/* Data buffer handle &amp; address reg */</div><div class='add'>+	u32		pad5;</div><div class='add'>+</div><div class='add'>+	/* 4 sets of registers; Buffers are 2K bytes long 2 per 4K page. */</div><div class='add'>+#define SLIC_DBAR		0x0028</div><div class='add'>+#define SLIC_DBAR_SIZE		2048</div><div class='add'>+</div><div class='add'>+    u32	slic_cbar;		 	/* Xmt Cmd buf addr regs.*/</div><div class='add'>+	/* 1 per XMT interface</div><div class='add'>+	   31-5 - phy addr of host command buffer</div><div class='add'>+	    4-0 - length of cmd in multiples of 32 bytes</div><div class='add'>+	   Buffers are 32 bytes up to 512 bytes long */</div><div class='add'>+#define SLIC_CBAR		0x0030</div><div class='add'>+#define SLIC_CBAR_LEN_MSK	0x0000001F</div><div class='add'>+#define SLIC_CBAR_ALIGN		0x00000020</div><div class='add'>+</div><div class='add'>+	u32	slic_wcs;		/* write control store*/</div><div class='add'>+#define	SLIC_WCS		0x0034</div><div class='add'>+#define SLIC_WCS_START		0x80000000	/*Start the SLIC (Jump to WCS)*/</div><div class='add'>+#define SLIC_WCS_COMPARE	0x40000000	/* Compare with value in WCS*/</div><div class='add'>+</div><div class='add'>+    u32	slic_rbar;		/* Response buffer address reg.*/</div><div class='add'>+	u32		pad7;</div><div class='add'>+	 /*31-8 - phy addr of set of contiguous response buffers</div><div class='add'>+	  7-0 - number of buffers passed</div><div class='add'>+	 Buffers are 32 bytes long on 32-byte boundaries.*/</div><div class='add'>+#define SLIC_RBAR		0x0038</div><div class='add'>+#define SLIC_RBAR_CNT_MSK	0x000000FF</div><div class='add'>+#define SLIC_RBAR_SIZE		32</div><div class='add'>+</div><div class='add'>+	u32	slic_stats;		/* read statistics (UPR) */</div><div class='add'>+	u32		pad8;</div><div class='add'>+#define	SLIC_RSTAT		0x0040</div><div class='add'>+</div><div class='add'>+	u32	slic_rlsr;			/* read link status */</div><div class='add'>+	u32		pad9;</div><div class='add'>+#define SLIC_LSTAT		0x0048</div><div class='add'>+</div><div class='add'>+	u32	slic_wmcfg;			/* Write Mac Config */</div><div class='add'>+	u32		pad10;</div><div class='add'>+#define	SLIC_WMCFG		0x0050</div><div class='add'>+</div><div class='add'>+	u32	slic_wphy;			/* Write phy register */</div><div class='add'>+	u32		pad11;</div><div class='add'>+#define SLIC_WPHY		0x0058</div><div class='add'>+</div><div class='add'>+	u32	slic_rcbar;			/*Rcv Cmd buf addr reg*/</div><div class='add'>+	u32		pad12;</div><div class='add'>+#define	SLIC_RCBAR		0x0060</div><div class='add'>+</div><div class='add'>+	u32	slic_rconfig;		/* Read SLIC Config*/</div><div class='add'>+	u32		pad13;</div><div class='add'>+#define SLIC_RCONFIG	0x0068</div><div class='add'>+</div><div class='add'>+	u32	slic_intagg;		/* Interrupt aggregation time*/</div><div class='add'>+	u32		pad14;</div><div class='add'>+#define SLIC_INTAGG		0x0070</div><div class='add'>+</div><div class='add'>+	u32	slic_wxcfg;		/* Write XMIT config reg*/</div><div class='add'>+	u32		pad16;</div><div class='add'>+#define	SLIC_WXCFG		0x0078</div><div class='add'>+</div><div class='add'>+	u32	slic_wrcfg;		/* Write RCV config reg*/</div><div class='add'>+	u32		pad17;</div><div class='add'>+#define	SLIC_WRCFG		0x0080</div><div class='add'>+</div><div class='add'>+	u32	slic_wraddral;		/* Write rcv addr a low*/</div><div class='add'>+	u32		pad18;</div><div class='add'>+#define	SLIC_WRADDRAL	0x0088</div><div class='add'>+</div><div class='add'>+	u32	slic_wraddrah;		/* Write rcv addr a high*/</div><div class='add'>+	u32		pad19;</div><div class='add'>+#define	SLIC_WRADDRAH	0x0090</div><div class='add'>+</div><div class='add'>+	u32	slic_wraddrbl;		/* Write rcv addr b low*/</div><div class='add'>+	u32		pad20;</div><div class='add'>+#define	SLIC_WRADDRBL	0x0098</div><div class='add'>+</div><div class='add'>+	u32	slic_wraddrbh;		/* Write rcv addr b high*/</div><div class='add'>+	u32		pad21;</div><div class='add'>+#define	SLIC_WRADDRBH	0x00a0</div><div class='add'>+</div><div class='add'>+	u32	slic_mcastlow;		/* Low bits of mcast mask*/</div><div class='add'>+	u32		pad22;</div><div class='add'>+#define	SLIC_MCASTLOW	0x00a8</div><div class='add'>+</div><div class='add'>+	u32	slic_mcasthigh;		/* High bits of mcast mask*/</div><div class='add'>+	u32		pad23;</div><div class='add'>+#define	SLIC_MCASTHIGH	0x00b0</div><div class='add'>+</div><div class='add'>+	u32	slic_ping;			/* Ping the card*/</div><div class='add'>+	u32		pad24;</div><div class='add'>+#define SLIC_PING		0x00b8</div><div class='add'>+</div><div class='add'>+	u32	slic_dump_cmd;		/* Dump command */</div><div class='add'>+	u32		pad25;</div><div class='add'>+#define SLIC_DUMP_CMD	0x00c0</div><div class='add'>+</div><div class='add'>+	u32	slic_dump_data;		/* Dump data pointer */</div><div class='add'>+	u32		pad26;</div><div class='add'>+#define SLIC_DUMP_DATA	0x00c8</div><div class='add'>+</div><div class='add'>+	u32	slic_pcistatus;	/* Read card's pci_status register */</div><div class='add'>+	u32		pad27;</div><div class='add'>+#define	SLIC_PCISTATUS	0x00d0</div><div class='add'>+</div><div class='add'>+	u32	slic_wrhostid;		/* Write hostid field */</div><div class='add'>+	u32		pad28;</div><div class='add'>+#define SLIC_WRHOSTID		 0x00d8</div><div class='add'>+#define SLIC_RDHOSTID_1GB	 0x1554</div><div class='add'>+#define SLIC_RDHOSTID_2GB	 0x1554</div><div class='add'>+</div><div class='add'>+	u32	slic_low_power;	/* Put card in a low power state */</div><div class='add'>+	u32		pad29;</div><div class='add'>+#define SLIC_LOW_POWER	0x00e0</div><div class='add'>+</div><div class='add'>+	u32	slic_quiesce;	/* force slic into quiescent state</div><div class='add'>+					 before soft reset */</div><div class='add'>+	u32		pad30;</div><div class='add'>+#define SLIC_QUIESCE	0x00e8</div><div class='add'>+</div><div class='add'>+	u32	slic_reset_iface;	/* reset interface queues */</div><div class='add'>+	u32		pad31;</div><div class='add'>+#define SLIC_RESET_IFACE 0x00f0</div><div class='add'>+</div><div class='add'>+    u32	slic_addr_upper;	/* Bits 63-32 for host i/f addrs */</div><div class='add'>+	u32		pad32;</div><div class='add'>+#define SLIC_ADDR_UPPER	0x00f8 /*Register is only written when it has changed*/</div><div class='add'>+</div><div class='add'>+    u32	slic_hbar64;		/* 64 bit Header buffer address reg */</div><div class='add'>+	u32		pad33;</div><div class='add'>+#define SLIC_HBAR64		0x0100</div><div class='add'>+</div><div class='add'>+    u32	slic_dbar64;	/* 64 bit Data buffer handle &amp; address reg */</div><div class='add'>+	u32		pad34;</div><div class='add'>+#define SLIC_DBAR64		0x0108</div><div class='add'>+</div><div class='add'>+    u32	slic_cbar64;	 	/* 64 bit Xmt Cmd buf addr regs. */</div><div class='add'>+	u32		pad35;</div><div class='add'>+#define SLIC_CBAR64		0x0110</div><div class='add'>+</div><div class='add'>+    u32	slic_rbar64;		/* 64 bit Response buffer address reg.*/</div><div class='add'>+	u32		pad36;</div><div class='add'>+#define SLIC_RBAR64		0x0118</div><div class='add'>+</div><div class='add'>+	u32	slic_rcbar64;		/* 64 bit Rcv Cmd buf addr reg*/</div><div class='add'>+	u32		pad37;</div><div class='add'>+#define	SLIC_RCBAR64	0x0120</div><div class='add'>+</div><div class='add'>+	u32	slic_stats64;		/*read statistics (64 bit UPR)*/</div><div class='add'>+	u32		pad38;</div><div class='add'>+#define	SLIC_RSTAT64	0x0128</div><div class='add'>+</div><div class='add'>+	u32	slic_rcv_wcs;	/*Download Gigabit RCV sequencer ucode*/</div><div class='add'>+	u32		pad39;</div><div class='add'>+#define SLIC_RCV_WCS	0x0130</div><div class='add'>+#define SLIC_RCVWCS_BEGIN	0x40000000</div><div class='add'>+#define SLIC_RCVWCS_FINISH	0x80000000</div><div class='add'>+</div><div class='add'>+	u32	slic_wrvlanid;		/* Write VlanId field */</div><div class='add'>+	u32		pad40;</div><div class='add'>+#define SLIC_WRVLANID	0x0138</div><div class='add'>+</div><div class='add'>+	u32	slic_read_xf_info;  /* Read Transformer info */</div><div class='add'>+	u32		pad41;</div><div class='add'>+#define SLIC_READ_XF_INFO 	0x0140</div><div class='add'>+</div><div class='add'>+	u32	slic_write_xf_info; /* Write Transformer info */</div><div class='add'>+	u32		pad42;</div><div class='add'>+#define SLIC_WRITE_XF_INFO 	0x0148</div><div class='add'>+</div><div class='add'>+	u32	RSVD1;              /* TOE Only */</div><div class='add'>+	u32		pad43;</div><div class='add'>+</div><div class='add'>+	u32	RSVD2; 	            /* TOE Only */</div><div class='add'>+	u32		pad44;</div><div class='add'>+</div><div class='add'>+	u32	RSVD3;              /* TOE Only */</div><div class='add'>+	u32		pad45;</div><div class='add'>+</div><div class='add'>+	u32	RSVD4;              /* TOE Only */</div><div class='add'>+	u32		pad46;</div><div class='add'>+</div><div class='add'>+	u32	slic_ticks_per_sec; /* Write card ticks per second */</div><div class='add'>+	u32		pad47;</div><div class='add'>+#define SLIC_TICKS_PER_SEC	0x0170</div><div class='add'>+</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum UPR_REQUEST {</div><div class='add'>+    SLIC_UPR_STATS,</div><div class='add'>+    SLIC_UPR_RLSR,</div><div class='add'>+    SLIC_UPR_WCFG,</div><div class='add'>+    SLIC_UPR_RCONFIG,</div><div class='add'>+    SLIC_UPR_RPHY,</div><div class='add'>+    SLIC_UPR_ENLB,</div><div class='add'>+    SLIC_UPR_ENCT,</div><div class='add'>+    SLIC_UPR_PDWN,</div><div class='add'>+    SLIC_UPR_PING,</div><div class='add'>+    SLIC_UPR_DUMP,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct inicpm_wakepattern {</div><div class='add'>+    u32    patternlength;</div><div class='add'>+    unsigned char      pattern[SLIC_PM_PATTERNSIZE];</div><div class='add'>+    unsigned char      mask[SLIC_PM_PATTERNSIZE];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct inicpm_state {</div><div class='add'>+    u32                 powercaps;</div><div class='add'>+    u32                 powerstate;</div><div class='add'>+    u32                 wake_linkstatus;</div><div class='add'>+    u32                 wake_magicpacket;</div><div class='add'>+    u32                 wake_framepattern;</div><div class='add'>+    struct inicpm_wakepattern    wakepattern[SLIC_PM_MAXPATTERNS];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct slicpm_packet_pattern {</div><div class='add'>+    u32     priority;</div><div class='add'>+    u32     reserved;</div><div class='add'>+    u32     masksize;</div><div class='add'>+    u32     patternoffset;</div><div class='add'>+    u32     patternsize;</div><div class='add'>+    u32     patternflags;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum slicpm_power_state {</div><div class='add'>+    slicpm_state_unspecified = 0,</div><div class='add'>+    slicpm_state_d0,</div><div class='add'>+    slicpm_state_d1,</div><div class='add'>+    slicpm_state_d2,</div><div class='add'>+    slicpm_state_d3,</div><div class='add'>+    slicpm_state_maximum</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct slicpm_wakeup_capabilities {</div><div class='add'>+    enum slicpm_power_state  min_magic_packet_wakeup;</div><div class='add'>+    enum slicpm_power_state  min_pattern_wakeup;</div><div class='add'>+    enum slicpm_power_state  min_link_change_wakeup;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct slic_pnp_capabilities {</div><div class='add'>+	u32 flags;</div><div class='add'>+	struct slicpm_wakeup_capabilities wakeup_capabilities;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct xmt_stats {</div><div class='add'>+	u32 xmit_tcp_bytes;</div><div class='add'>+	u32 xmit_tcp_segs;</div><div class='add'>+	u32 xmit_bytes;</div><div class='add'>+	u32 xmit_collisions;</div><div class='add'>+	u32 xmit_unicasts;</div><div class='add'>+	u32 xmit_other_error;</div><div class='add'>+	u32 xmit_excess_collisions;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rcv_stats {</div><div class='add'>+	u32 rcv_tcp_bytes;</div><div class='add'>+	u32 rcv_tcp_segs;</div><div class='add'>+	u32 rcv_bytes;</div><div class='add'>+	u32 rcv_unicasts;</div><div class='add'>+	u32 rcv_other_error;</div><div class='add'>+	u32 rcv_drops;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct xmt_statsgb {</div><div class='add'>+	u64 xmit_tcp_bytes;</div><div class='add'>+	u64 xmit_tcp_segs;</div><div class='add'>+	u64 xmit_bytes;</div><div class='add'>+	u64 xmit_collisions;</div><div class='add'>+	u64 xmit_unicasts;</div><div class='add'>+	u64 xmit_other_error;</div><div class='add'>+	u64 xmit_excess_collisions;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rcv_statsgb {</div><div class='add'>+	u64 rcv_tcp_bytes;</div><div class='add'>+	u64 rcv_tcp_segs;</div><div class='add'>+	u64 rcv_bytes;</div><div class='add'>+	u64 rcv_unicasts;</div><div class='add'>+	u64 rcv_other_error;</div><div class='add'>+	u64 rcv_drops;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct slic_stats {</div><div class='add'>+    union {</div><div class='add'>+	struct {</div><div class='add'>+		struct xmt_stats  xmt100;</div><div class='add'>+		struct rcv_stats  rcv100;</div><div class='add'>+	} stats_100;</div><div class='add'>+	struct {</div><div class='add'>+		struct xmt_statsgb     xmtGB;</div><div class='add'>+		struct rcv_statsgb     rcvGB;</div><div class='add'>+	} stats_GB;</div><div class='add'>+    } u;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define xmit_tcp_segs100           u.stats_100.xmt100.xmit_tcp_segs</div><div class='add'>+#define xmit_tcp_bytes100          u.stats_100.xmt100.xmit_tcp_bytes</div><div class='add'>+#define xmit_bytes100              u.stats_100.xmt100.xmit_bytes</div><div class='add'>+#define xmit_collisions100         u.stats_100.xmt100.xmit_collisions</div><div class='add'>+#define xmit_unicasts100           u.stats_100.xmt100.xmit_unicasts</div><div class='add'>+#define xmit_other_error100        u.stats_100.xmt100.xmit_other_error</div><div class='add'>+#define xmit_excess_collisions100  u.stats_100.xmt100.xmit_excess_collisions</div><div class='add'>+#define rcv_tcp_segs100            u.stats_100.rcv100.rcv_tcp_segs</div><div class='add'>+#define rcv_tcp_bytes100           u.stats_100.rcv100.rcv_tcp_bytes</div><div class='add'>+#define rcv_bytes100               u.stats_100.rcv100.rcv_bytes</div><div class='add'>+#define rcv_unicasts100            u.stats_100.rcv100.rcv_unicasts</div><div class='add'>+#define rcv_other_error100         u.stats_100.rcv100.rcv_other_error</div><div class='add'>+#define rcv_drops100               u.stats_100.rcv100.rcv_drops</div><div class='add'>+#define xmit_tcp_segs_gb           u.stats_GB.xmtGB.xmit_tcp_segs</div><div class='add'>+#define xmit_tcp_bytes_gb          u.stats_GB.xmtGB.xmit_tcp_bytes</div><div class='add'>+#define xmit_bytes_gb              u.stats_GB.xmtGB.xmit_bytes</div><div class='add'>+#define xmit_collisions_gb         u.stats_GB.xmtGB.xmit_collisions</div><div class='add'>+#define xmit_unicasts_gb           u.stats_GB.xmtGB.xmit_unicasts</div><div class='add'>+#define xmit_other_error_gb        u.stats_GB.xmtGB.xmit_other_error</div><div class='add'>+#define xmit_excess_collisions_gb  u.stats_GB.xmtGB.xmit_excess_collisions</div><div class='add'>+</div><div class='add'>+#define rcv_tcp_segs_gb            u.stats_GB.rcvGB.rcv_tcp_segs</div><div class='add'>+#define rcv_tcp_bytes_gb           u.stats_GB.rcvGB.rcv_tcp_bytes</div><div class='add'>+#define rcv_bytes_gb               u.stats_GB.rcvGB.rcv_bytes</div><div class='add'>+#define rcv_unicasts_gb            u.stats_GB.rcvGB.rcv_unicasts</div><div class='add'>+#define rcv_other_error_gb         u.stats_GB.rcvGB.rcv_other_error</div><div class='add'>+#define rcv_drops_gb               u.stats_GB.rcvGB.rcv_drops</div><div class='add'>+</div><div class='add'>+struct slic_config_mac {</div><div class='add'>+    unsigned char        macaddrA[6];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define ATK_FRU_FORMAT        0x00</div><div class='add'>+#define VENDOR1_FRU_FORMAT    0x01</div><div class='add'>+#define VENDOR2_FRU_FORMAT    0x02</div><div class='add'>+#define VENDOR3_FRU_FORMAT    0x03</div><div class='add'>+#define VENDOR4_FRU_FORMAT    0x04</div><div class='add'>+#define NO_FRU_FORMAT         0xFF</div><div class='add'>+</div><div class='add'>+struct atk_fru {</div><div class='add'>+    unsigned char        assembly[6];</div><div class='add'>+    unsigned char        revision[2];</div><div class='add'>+    unsigned char        serial[14];</div><div class='add'>+    unsigned char        pad[3];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct vendor1_fru {</div><div class='add'>+    unsigned char        commodity;</div><div class='add'>+    unsigned char        assembly[4];</div><div class='add'>+    unsigned char        revision[2];</div><div class='add'>+    unsigned char        supplier[2];</div><div class='add'>+    unsigned char        date[2];</div><div class='add'>+    unsigned char        sequence[3];</div><div class='add'>+    unsigned char        pad[13];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct vendor2_fru {</div><div class='add'>+    unsigned char        part[8];</div><div class='add'>+    unsigned char        supplier[5];</div><div class='add'>+    unsigned char        date[3];</div><div class='add'>+    unsigned char        sequence[4];</div><div class='add'>+    unsigned char        pad[7];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct vendor3_fru {</div><div class='add'>+    unsigned char        assembly[6];</div><div class='add'>+    unsigned char        revision[2];</div><div class='add'>+    unsigned char        serial[14];</div><div class='add'>+    unsigned char        pad[3];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct vendor4_fru {</div><div class='add'>+    unsigned char        number[8];</div><div class='add'>+    unsigned char        part[8];</div><div class='add'>+    unsigned char        version[8];</div><div class='add'>+    unsigned char        pad[3];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union oemfru {</div><div class='add'>+    struct vendor1_fru   vendor1_fru;</div><div class='add'>+    struct vendor2_fru   vendor2_fru;</div><div class='add'>+    struct vendor3_fru   vendor3_fru;</div><div class='add'>+    struct vendor4_fru   vendor4_fru;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+   SLIC EEPROM structure for Mojave</div><div class='add'>+*/</div><div class='add'>+struct slic_eeprom {</div><div class='add'>+	ushort		Id;		/* 00 EEPROM/FLASH Magic code 'A5A5'*/</div><div class='add'>+	ushort		EecodeSize;	/* 01 Size of EEPROM Codes (bytes * 4)*/</div><div class='add'>+	ushort		FlashSize;	/* 02 Flash size */</div><div class='add'>+	ushort		EepromSize;	/* 03 EEPROM Size */</div><div class='add'>+	ushort		VendorId;	/* 04 Vendor ID */</div><div class='add'>+	ushort		DeviceId;	/* 05 Device ID */</div><div class='add'>+	unsigned char		RevisionId;	/* 06 Revision ID */</div><div class='add'>+	unsigned char		ClassCode[3];	/* 07 Class Code */</div><div class='add'>+	unsigned char		DbgIntPin;	/* 08 Debug Interrupt pin */</div><div class='add'>+	unsigned char		NetIntPin0;	/*    Network Interrupt Pin */</div><div class='add'>+	unsigned char		MinGrant;	/* 09 Minimum grant */</div><div class='add'>+	unsigned char		MaxLat;		/*    Maximum Latency */</div><div class='add'>+	ushort		PciStatus;	/* 10 PCI Status */</div><div class='add'>+	ushort		SubSysVId;	/* 11 Subsystem Vendor Id */</div><div class='add'>+	ushort		SubSysId;	/* 12 Subsystem ID */</div><div class='add'>+	ushort		DbgDevId;	/* 13 Debug Device Id */</div><div class='add'>+	ushort		DramRomFn;	/* 14 Dram/Rom function */</div><div class='add'>+	ushort		DSize2Pci;	/* 15 DRAM size to PCI (bytes * 64K) */</div><div class='add'>+	ushort	RSize2Pci;	/* 16 ROM extension size to PCI (bytes * 4k) */</div><div class='add'>+	unsigned char NetIntPin1;/* 17 Network Interface Pin 1</div><div class='add'>+				    (simba/leone only) */</div><div class='add'>+	unsigned char NetIntPin2; /*Network Interface Pin 2 (simba/leone only)*/</div><div class='add'>+	union {</div><div class='add'>+		unsigned char NetIntPin3;/*18 Network Interface Pin 3</div><div class='add'>+					   (simba only)*/</div><div class='add'>+		unsigned char FreeTime;/*FreeTime setting (leone/mojave only) */</div><div class='add'>+	} u1;</div><div class='add'>+	unsigned char	TBIctl;	/*    10-bit interface control (Mojave only) */</div><div class='add'>+	ushort		DramSize;	/* 19 DRAM size (bytes * 64k) */</div><div class='add'>+	union {</div><div class='add'>+		struct {</div><div class='add'>+			/* Mac Interface Specific portions */</div><div class='add'>+			struct slic_config_mac	MacInfo[SLIC_NBR_MACS];</div><div class='add'>+		} mac;				/* MAC access for all boards */</div><div class='add'>+		struct {</div><div class='add'>+			/* use above struct for MAC access */</div><div class='add'>+			struct slic_config_mac	pad[SLIC_NBR_MACS - 1];</div><div class='add'>+			ushort		DeviceId2;	/* Device ID for 2nd</div><div class='add'>+								PCI function */</div><div class='add'>+			unsigned char	IntPin2;	/* Interrupt pin for</div><div class='add'>+							   2nd PCI function */</div><div class='add'>+			unsigned char	ClassCode2[3];	/* Class Code for 2nd</div><div class='add'>+								PCI function */</div><div class='add'>+		} mojave;	/* 2nd function access for gigabit board */</div><div class='add'>+	} u2;</div><div class='add'>+	ushort		CfgByte6;	/* Config Byte 6 */</div><div class='add'>+	ushort		PMECapab;	/* Power Mgment capabilities */</div><div class='add'>+	ushort		NwClkCtrls;	/* NetworkClockControls */</div><div class='add'>+	unsigned char	FruFormat;	/* Alacritech FRU format type */</div><div class='add'>+	struct atk_fru   AtkFru;	/* Alacritech FRU information */</div><div class='add'>+	unsigned char	OemFruFormat;	/* optional OEM FRU format type */</div><div class='add'>+	union oemfru    OemFru;         /* optional OEM FRU information */</div><div class='add'>+	unsigned char	Pad[4];	/* Pad to 128 bytes - includes 2 cksum bytes</div><div class='add'>+				 *(if OEM FRU info exists) and two unusable</div><div class='add'>+				 * bytes at the end */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* SLIC EEPROM structure for Oasis */</div><div class='add'>+struct oslic_eeprom {</div><div class='add'>+	ushort		Id;		/* 00 EEPROM/FLASH Magic code 'A5A5' */</div><div class='add'>+	ushort		EecodeSize;	/* 01 Size of EEPROM Codes (bytes * 4)*/</div><div class='add'>+	ushort		FlashConfig0;	/* 02 Flash Config for SPI device 0 */</div><div class='add'>+	ushort		FlashConfig1;	/* 03 Flash Config for SPI device 1 */</div><div class='add'>+	ushort		VendorId;	/* 04 Vendor ID */</div><div class='add'>+	ushort		DeviceId;	/* 05 Device ID (function 0) */</div><div class='add'>+	unsigned char	RevisionId;	/* 06 Revision ID */</div><div class='add'>+	unsigned char	ClassCode[3];	/* 07 Class Code for PCI function 0 */</div><div class='add'>+	unsigned char	IntPin1;	/* 08 Interrupt pin for PCI function 1*/</div><div class='add'>+	unsigned char	ClassCode2[3];	/* 09 Class Code for PCI function 1 */</div><div class='add'>+	unsigned char	IntPin2;	/* 10 Interrupt pin for PCI function 2*/</div><div class='add'>+	unsigned char	IntPin0;	/*    Interrupt pin for PCI function 0*/</div><div class='add'>+	unsigned char		MinGrant;	/* 11 Minimum grant */</div><div class='add'>+	unsigned char		MaxLat;		/*    Maximum Latency */</div><div class='add'>+	ushort		SubSysVId;	/* 12 Subsystem Vendor Id */</div><div class='add'>+	ushort		SubSysId;	/* 13 Subsystem ID */</div><div class='add'>+	ushort		FlashSize;	/* 14 Flash size (bytes / 4K) */</div><div class='add'>+	ushort		DSize2Pci;	/* 15 DRAM size to PCI (bytes / 64K) */</div><div class='add'>+	ushort		RSize2Pci;	/* 16 Flash (ROM extension) size to</div><div class='add'>+						PCI (bytes / 4K) */</div><div class='add'>+	ushort		DeviceId1;	/* 17 Device Id (function 1) */</div><div class='add'>+	ushort		DeviceId2;	/* 18 Device Id (function 2) */</div><div class='add'>+	ushort		CfgByte6;	/* 19 Device Status Config Bytes 6-7 */</div><div class='add'>+	ushort		PMECapab;	/* 20 Power Mgment capabilities */</div><div class='add'>+	unsigned char		MSICapab;	/* 21 MSI capabilities */</div><div class='add'>+	unsigned char		ClockDivider;	/*    Clock divider */</div><div class='add'>+	ushort		PciStatusLow;	/* 22 PCI Status bits 15:0 */</div><div class='add'>+	ushort		PciStatusHigh;	/* 23 PCI Status bits 31:16 */</div><div class='add'>+	ushort		DramConfigLow;	/* 24 DRAM Configuration bits 15:0 */</div><div class='add'>+	ushort		DramConfigHigh;	/* 25 DRAM Configuration bits 31:16 */</div><div class='add'>+	ushort		DramSize;	/* 26 DRAM size (bytes / 64K) */</div><div class='add'>+	ushort		GpioTbiCtl;/* 27 GPIO/TBI controls for functions 1/0 */</div><div class='add'>+	ushort		EepromSize;		/* 28 EEPROM Size */</div><div class='add'>+	struct slic_config_mac MacInfo[2];	/* 29 MAC addresses (2 ports) */</div><div class='add'>+	unsigned char	FruFormat;	/* 35 Alacritech FRU format type */</div><div class='add'>+	struct atk_fru	AtkFru;	/* Alacritech FRU information */</div><div class='add'>+	unsigned char	OemFruFormat;	/* optional OEM FRU format type */</div><div class='add'>+	union oemfru    OemFru;         /* optional OEM FRU information */</div><div class='add'>+	unsigned char	Pad[4];	/* Pad to 128 bytes - includes 2 checksum bytes</div><div class='add'>+				 * (if OEM FRU info exists) and two unusable</div><div class='add'>+				 * bytes at the end</div><div class='add'>+				 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define	MAX_EECODE_SIZE	sizeof(struct slic_eeprom)</div><div class='add'>+#define MIN_EECODE_SIZE	0x62	/* code size without optional OEM FRU stuff */</div><div class='add'>+</div><div class='add'>+/* SLIC CONFIG structure</div><div class='add'>+</div><div class='add'>+ This structure lives in the CARD structure and is valid for all</div><div class='add'>+ board types.  It is filled in from the appropriate EEPROM structure</div><div class='add'>+ by SlicGetConfigData().</div><div class='add'>+*/</div><div class='add'>+struct slic_config {</div><div class='add'>+	bool EepromValid;	/* Valid EEPROM flag (checksum good?) */</div><div class='add'>+	ushort		DramSize;	/* DRAM size (bytes / 64K) */</div><div class='add'>+	struct slic_config_mac MacInfo[SLIC_NBR_MACS]; /* MAC addresses */</div><div class='add'>+	unsigned char		FruFormat;	/* Alacritech FRU format type */</div><div class='add'>+	struct atk_fru	AtkFru;	/* Alacritech FRU information */</div><div class='add'>+	unsigned char	OemFruFormat;	/* optional OEM FRU format type */</div><div class='add'>+	union {</div><div class='add'>+		struct vendor1_fru   vendor1_fru;</div><div class='add'>+		struct vendor2_fru   vendor2_fru;</div><div class='add'>+		struct vendor3_fru   vendor3_fru;</div><div class='add'>+		struct vendor4_fru   vendor4_fru;</div><div class='add'>+	} OemFru;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#pragma pack()</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/staging/slicoss/slicinc.h b/drivers/staging/slicoss/slicinc.h<br/>new file mode 100644<br/>index 000000000000..71288c4f7be3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/slicoss/slicinc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/slicoss/slicinc.h</a></div><div class='hunk'>@@ -0,0 +1,185 @@</div><div class='add'>+/**************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2000-2002 Alacritech, Inc.  All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions</div><div class='add'>+ * are met:</div><div class='add'>+ *</div><div class='add'>+ * 1. Redistributions of source code must retain the above copyright</div><div class='add'>+ *    notice, this list of conditions and the following disclaimer.</div><div class='add'>+ * 2. Redistributions in binary form must reproduce the above</div><div class='add'>+ *    copyright notice, this list of conditions and the following</div><div class='add'>+ *    disclaimer in the documentation and/or other materials provided</div><div class='add'>+ *    with the distribution.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY ALACRITECH, INC. ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE</div><div class='add'>+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR</div><div class='add'>+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL ALACRITECH, INC. OR</div><div class='add'>+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,</div><div class='add'>+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT</div><div class='add'>+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF</div><div class='add'>+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,</div><div class='add'>+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT</div><div class='add'>+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF</div><div class='add'>+ * SUCH DAMAGE.</div><div class='add'>+ *</div><div class='add'>+ * The views and conclusions contained in the software and documentation</div><div class='add'>+ * are those of the authors and should not be interpreted as representing</div><div class='add'>+ * official policies, either expressed or implied, of Alacritech, Inc.</div><div class='add'>+ *</div><div class='add'>+ **************************************************************************/</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * FILENAME: slicinc.h</div><div class='add'>+ *</div><div class='add'>+ * This file contains all other include files and prototype definitions</div><div class='add'>+ * for the SLICOSS driver.</div><div class='add'>+ */</div><div class='add'>+#ifndef _SLIC_INCLUDE_H_</div><div class='add'>+#define _SLIC_INCLUDE_H_</div><div class='add'>+</div><div class='add'>+#include "slic_os.h"</div><div class='add'>+#include "slicdbg.h"</div><div class='add'>+#include "slichw.h"</div><div class='add'>+#include "slic.h"</div><div class='add'>+</div><div class='add'>+static int slic_entry_probe(struct pci_dev              *pcidev,</div><div class='add'>+			const struct pci_device_id  *ent);</div><div class='add'>+static void slic_entry_remove(struct pci_dev *pcidev);</div><div class='add'>+</div><div class='add'>+static void slic_init_driver(void);</div><div class='add'>+static int  slic_entry_open(struct net_device *dev);</div><div class='add'>+static int  slic_entry_halt(struct net_device *dev);</div><div class='add'>+static int  slic_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);</div><div class='add'>+static int  slic_xmit_start(struct sk_buff *skb, struct net_device *dev);</div><div class='add'>+static void slic_xmit_fail(struct adapter    *adapter,</div><div class='add'>+			struct sk_buff   *skb,</div><div class='add'>+			void *cmd,</div><div class='add'>+			u32           skbtype,</div><div class='add'>+			u32           status);</div><div class='add'>+static void slic_config_pci(struct pci_dev *pcidev);</div><div class='add'>+static struct sk_buff *slic_rcvqueue_getnext(struct adapter *adapter);</div><div class='add'>+</div><div class='add'>+static inline void slic_reg32_write(void __iomem *reg, u32 value, uint flush);</div><div class='add'>+static inline void slic_reg64_write(struct adapter *adapter, void __iomem *reg,</div><div class='add'>+	u32 value, void __iomem *regh, u32 paddrh, uint flush);</div><div class='add'>+</div><div class='add'>+#if SLIC_GET_STATS_ENABLED</div><div class='add'>+static struct net_device_stats *slic_get_stats(struct net_device *dev);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static int slic_mac_set_address(struct net_device *dev, void *ptr);</div><div class='add'>+static void slic_rcv_handler(struct adapter *adapter);</div><div class='add'>+static void slic_link_event_handler(struct adapter *adapter);</div><div class='add'>+static void slic_xmit_complete(struct adapter *adapter);</div><div class='add'>+static void slic_upr_request_complete(struct adapter *adapter, u32 isr);</div><div class='add'>+static int   slic_rspqueue_init(struct adapter *adapter);</div><div class='add'>+static int   slic_rspqueue_reset(struct adapter *adapter);</div><div class='add'>+static void  slic_rspqueue_free(struct adapter *adapter);</div><div class='add'>+static struct slic_rspbuf *slic_rspqueue_getnext(struct adapter *adapter);</div><div class='add'>+static void  slic_cmdqmem_init(struct adapter *adapter);</div><div class='add'>+static void  slic_cmdqmem_free(struct adapter *adapter);</div><div class='add'>+static u32 *slic_cmdqmem_addpage(struct adapter *adapter);</div><div class='add'>+static int   slic_cmdq_init(struct adapter *adapter);</div><div class='add'>+static void  slic_cmdq_free(struct adapter *adapter);</div><div class='add'>+static void  slic_cmdq_reset(struct adapter *adapter);</div><div class='add'>+static void  slic_cmdq_addcmdpage(struct adapter *adapter, u32 *page);</div><div class='add'>+static void  slic_cmdq_getdone(struct adapter *adapter);</div><div class='add'>+static void  slic_cmdq_putdone_irq(struct adapter *adapter,</div><div class='add'>+						struct slic_hostcmd *cmd);</div><div class='add'>+static struct slic_hostcmd *slic_cmdq_getfree(struct adapter *adapter);</div><div class='add'>+static int   slic_rcvqueue_init(struct adapter *adapter);</div><div class='add'>+static int   slic_rcvqueue_reset(struct adapter *adapter);</div><div class='add'>+static int   slic_rcvqueue_fill(struct adapter *adapter);</div><div class='add'>+static u32 slic_rcvqueue_reinsert(struct adapter *adapter, struct sk_buff *skb);</div><div class='add'>+static void  slic_rcvqueue_free(struct adapter *adapter);</div><div class='add'>+static void slic_rcv_handle_error(struct adapter *adapter,</div><div class='add'>+					struct slic_rcvbuf *rcvbuf);</div><div class='add'>+static void slic_adapter_set_hwaddr(struct adapter *adapter);</div><div class='add'>+static int slic_card_init(struct sliccard *card, struct adapter *adapter);</div><div class='add'>+static void slic_intagg_set(struct adapter *adapter, u32 value);</div><div class='add'>+static int  slic_card_download(struct adapter *adapter);</div><div class='add'>+static u32 slic_card_locate(struct adapter *adapter);</div><div class='add'>+</div><div class='add'>+static void slic_if_stop_queue(struct adapter *adapter);</div><div class='add'>+static void slic_if_start_queue(struct adapter *adapter);</div><div class='add'>+static int  slic_if_init(struct adapter *adapter);</div><div class='add'>+static int  slic_adapter_allocresources(struct adapter *adapter);</div><div class='add'>+static void slic_adapter_freeresources(struct adapter *adapter);</div><div class='add'>+static void slic_link_config(struct adapter *adapter, u32 linkspeed,</div><div class='add'>+			u32 linkduplex);</div><div class='add'>+static void slic_unmap_mmio_space(struct adapter *adapter);</div><div class='add'>+static void slic_card_cleanup(struct sliccard *card);</div><div class='add'>+static void slic_init_cleanup(struct adapter *adapter);</div><div class='add'>+static void slic_soft_reset(struct adapter *adapter);</div><div class='add'>+static bool slic_mac_filter(struct adapter *adapter,</div><div class='add'>+			struct ether_header *ether_frame);</div><div class='add'>+static void slic_mac_address_config(struct adapter *adapter);</div><div class='add'>+static void slic_mac_config(struct adapter *adapter);</div><div class='add'>+static void slic_mcast_set_mask(struct adapter *adapter);</div><div class='add'>+static int slic_mcast_add_list(struct adapter *adapter, char *address);</div><div class='add'>+static unsigned char slic_mcast_get_mac_hash(char *macaddr);</div><div class='add'>+static void  slic_mcast_set_bit(struct adapter *adapter, char *address);</div><div class='add'>+static void slic_config_set(struct adapter *adapter, bool linkchange);</div><div class='add'>+static void slic_config_clear(struct adapter *adapter);</div><div class='add'>+static void slic_config_get(struct adapter *adapter, u32 config,</div><div class='add'>+			u32 configh);</div><div class='add'>+static void slic_timer_load_check(ulong context);</div><div class='add'>+static void slic_timer_ping(ulong dev);</div><div class='add'>+static void slic_assert_fail(void);</div><div class='add'>+static ushort slic_eeprom_cksum(char *m, int len);</div><div class='add'>+/* upr */</div><div class='add'>+static void slic_upr_start(struct adapter *adapter);</div><div class='add'>+static void slic_link_upr_complete(struct adapter *adapter, u32 Isr);</div><div class='add'>+static int  slic_upr_request(struct adapter    *adapter,</div><div class='add'>+			u32            upr_request,</div><div class='add'>+			u32            upr_data,</div><div class='add'>+			u32            upr_data_h,</div><div class='add'>+			u32            upr_buffer,</div><div class='add'>+			u32            upr_buffer_h);</div><div class='add'>+static int  slic_upr_queue_request(struct adapter      *adapter,</div><div class='add'>+				u32            upr_request,</div><div class='add'>+				u32            upr_data,</div><div class='add'>+				u32            upr_data_h,</div><div class='add'>+				u32            upr_buffer,</div><div class='add'>+				u32            upr_buffer_h);</div><div class='add'>+static void slic_mcast_set_list(struct net_device *dev);</div><div class='add'>+static void slic_mcast_init_crc32(void);</div><div class='add'>+</div><div class='add'>+#if SLIC_DUMP_ENABLED</div><div class='add'>+static int   slic_dump_thread(void *context);</div><div class='add'>+static uint  slic_init_dump_thread(struct sliccard *card);</div><div class='add'>+static unsigned char slic_get_dump_index(char *path);</div><div class='add'>+static u32 slic_dump_card(struct sliccard *card, bool resume);</div><div class='add'>+static u32 slic_dump_halt(struct sliccard *card, unsigned char proc);</div><div class='add'>+static u32 slic_dump_reg(struct sliccard *card, unsigned char proc);</div><div class='add'>+static u32 slic_dump_data(struct sliccard *card, u32 addr,</div><div class='add'>+			ushort count, unsigned char desc);</div><div class='add'>+static u32 slic_dump_queue(struct sliccard *card, u32 buf_phys,</div><div class='add'>+			u32 buf_physh, u32 queue);</div><div class='add'>+static u32 slic_dump_load_queue(struct sliccard *card, u32 data,</div><div class='add'>+				u32 queue);</div><div class='add'>+static u32 slic_dump_cam(struct sliccard *card, u32 addr,</div><div class='add'>+			u32 count, unsigned char desc);</div><div class='add'>+</div><div class='add'>+static u32 slic_dump_resume(struct sliccard *card, unsigned char proc);</div><div class='add'>+static u32 slic_dump_send_cmd(struct sliccard *card, u32 cmd_phys,</div><div class='add'>+				u32 cmd_physh, u32 buf_phys,</div><div class='add'>+				u32 buf_physh);</div><div class='add'>+</div><div class='add'>+#define create_file(x)         STATUS_SUCCESS</div><div class='add'>+#define write_file(w, x, y, z) STATUS_SUCCESS</div><div class='add'>+#define close_file(x)          STATUS_SUCCESS</div><div class='add'>+#define read_file(w, x, y, z)  STATUS_SUCCESS</div><div class='add'>+#define open_file(x)           STATUS_SUCCESS</div><div class='add'>+</div><div class='add'>+/* PAGE_SIZE * 16 */</div><div class='add'>+#define DUMP_PAGE_SIZE         0xFFFF</div><div class='add'>+#define DUMP_PAGE_SIZE_HALF    0x7FFE</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif /* _SLIC_INCLUDE_H_ */</div><div class='head'>diff --git a/drivers/staging/slicoss/slicoss.c b/drivers/staging/slicoss/slicoss.c<br/>new file mode 100644<br/>index 000000000000..b61ac4b2db9e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/slicoss/slicoss.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/slicoss/slicoss.c</a></div><div class='hunk'>@@ -0,0 +1,5936 @@</div><div class='add'>+/**************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * Copyright  2000-2006 Alacritech, Inc.  All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions</div><div class='add'>+ * are met:</div><div class='add'>+ *</div><div class='add'>+ * 1. Redistributions of source code must retain the above copyright</div><div class='add'>+ *    notice, this list of conditions and the following disclaimer.</div><div class='add'>+ * 2. Redistributions in binary form must reproduce the above</div><div class='add'>+ *    copyright notice, this list of conditions and the following</div><div class='add'>+ *    disclaimer in the documentation and/or other materials provided</div><div class='add'>+ *    with the distribution.</div><div class='add'>+ *</div><div class='add'>+ * Alternatively, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") version 2 as published by the Free</div><div class='add'>+ * Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY ALACRITECH, INC. ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE</div><div class='add'>+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR</div><div class='add'>+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL ALACRITECH, INC. OR</div><div class='add'>+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,</div><div class='add'>+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT</div><div class='add'>+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF</div><div class='add'>+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,</div><div class='add'>+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT</div><div class='add'>+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF</div><div class='add'>+ * SUCH DAMAGE.</div><div class='add'>+ *</div><div class='add'>+ * The views and conclusions contained in the software and documentation</div><div class='add'>+ * are those of the authors and should not be interpreted as representing</div><div class='add'>+ * official policies, either expressed or implied, of Alacritech, Inc.</div><div class='add'>+ *</div><div class='add'>+ **************************************************************************/</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * FILENAME: slicoss.c</div><div class='add'>+ *</div><div class='add'>+ * The SLICOSS driver for Alacritech's IS-NIC products.</div><div class='add'>+ *</div><div class='add'>+ * This driver is supposed to support:</div><div class='add'>+ *</div><div class='add'>+ *      Mojave cards (single port PCI Gigabit) both copper and fiber</div><div class='add'>+ *      Oasis cards (single and dual port PCI-x Gigabit) copper and fiber</div><div class='add'>+ *      Kalahari cards (dual and quad port PCI-e Gigabit) copper and fiber</div><div class='add'>+ *</div><div class='add'>+ * The driver was acutally tested on Oasis and Kalahari cards.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * NOTE: This is the standard, non-accelerated version of Alacritech's</div><div class='add'>+ *       IS-NIC driver.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/version.h&gt;</div><div class='add'>+</div><div class='add'>+#define SLIC_DUMP_ENABLED               0</div><div class='add'>+#define KLUDGE_FOR_4GB_BOUNDARY         1</div><div class='add'>+#define DEBUG_MICROCODE                 1</div><div class='add'>+#define SLIC_PRODUCTION_BUILD	        1</div><div class='add'>+#define SLIC_FAILURE_RESET	            1</div><div class='add'>+#define DBG                             1</div><div class='add'>+#define SLIC_ASSERT_ENABLED		        1</div><div class='add'>+#define SLIC_GET_STATS_ENABLED			1</div><div class='add'>+#define SLIC_GET_STATS_TIMER_ENABLED	0</div><div class='add'>+#define SLIC_PING_TIMER_ENABLED		    1</div><div class='add'>+#define SLIC_POWER_MANAGEMENT_ENABLED	0</div><div class='add'>+#define SLIC_INTERRUPT_PROCESS_LIMIT	1</div><div class='add'>+#define LINUX_FREES_ADAPTER_RESOURCES	1</div><div class='add'>+#define SLIC_OFFLOAD_IP_CHECKSUM		1</div><div class='add'>+#define STATS_TIMER_INTERVAL			2</div><div class='add'>+#define PING_TIMER_INTERVAL			    1</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/ioport.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/timer.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/bitops.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/debugfs.h&gt;</div><div class='add'>+#include &lt;linux/seq_file.h&gt;</div><div class='add'>+#include &lt;linux/kthread.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/mii.h&gt;</div><div class='add'>+#include &lt;linux/if_vlan.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;asm/unaligned.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='add'>+#define SLIC_ETHTOOL_SUPPORT     1</div><div class='add'>+</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='add'>+#include "slicinc.h"</div><div class='add'>+#include "gbdownload.h"</div><div class='add'>+#include "gbrcvucode.h"</div><div class='add'>+#include "oasisrcvucode.h"</div><div class='add'>+</div><div class='add'>+#ifdef DEBUG_MICROCODE</div><div class='add'>+#include "oasisdbgdownload.h"</div><div class='add'>+#else</div><div class='add'>+#include "oasisdownload.h"</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if SLIC_DUMP_ENABLED</div><div class='add'>+#include "slicdump.h"</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define SLIC_POWER_MANAGEMENT  0</div><div class='add'>+</div><div class='add'>+static uint slic_first_init = 1;</div><div class='add'>+static char *slic_banner = "Alacritech SLIC Technology(tm) Server "\</div><div class='add'>+		"and Storage Accelerator (Non-Accelerated)\n";</div><div class='add'>+</div><div class='add'>+static char *slic_proc_version = "2.0.351  2006/07/14 12:26:00";</div><div class='add'>+static char *slic_product_name = "SLIC Technology(tm) Server "\</div><div class='add'>+		"and Storage Accelerator (Non-Accelerated)";</div><div class='add'>+static char *slic_vendor = "Alacritech, Inc.";</div><div class='add'>+</div><div class='add'>+static int slic_debug = 1;</div><div class='add'>+static int debug = -1;</div><div class='add'>+static struct net_device *head_netdevice;</div><div class='add'>+</div><div class='add'>+static struct base_driver slic_global = { {}, 0, 0, 0, 1, NULL, NULL };</div><div class='add'>+static int intagg_delay = 100;</div><div class='add'>+static u32 dynamic_intagg;</div><div class='add'>+static int errormsg;</div><div class='add'>+static int goodmsg;</div><div class='add'>+static unsigned int rcv_count;</div><div class='add'>+static struct dentry *slic_debugfs;</div><div class='add'>+</div><div class='add'>+#define DRV_NAME          "slicoss"</div><div class='add'>+#define DRV_VERSION       "2.0.1"</div><div class='add'>+#define DRV_AUTHOR        "Alacritech, Inc. Engineering"</div><div class='add'>+#define DRV_DESCRIPTION   "Alacritech SLIC Techonology(tm) "\</div><div class='add'>+		"Non-Accelerated Driver"</div><div class='add'>+#define DRV_COPYRIGHT     "Copyright  2000-2006 Alacritech, Inc. "\</div><div class='add'>+		"All rights reserved."</div><div class='add'>+#define PFX		   DRV_NAME " "</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR(DRV_AUTHOR);</div><div class='add'>+MODULE_DESCRIPTION(DRV_DESCRIPTION);</div><div class='add'>+MODULE_LICENSE("Dual BSD/GPL");</div><div class='add'>+</div><div class='add'>+module_param(dynamic_intagg, int, 0);</div><div class='add'>+MODULE_PARM_DESC(dynamic_intagg, "Dynamic Interrupt Aggregation Setting");</div><div class='add'>+module_param(intagg_delay, int, 0);</div><div class='add'>+MODULE_PARM_DESC(intagg_delay, "uSec Interrupt Aggregation Delay");</div><div class='add'>+</div><div class='add'>+static struct pci_device_id slic_pci_tbl[] __devinitdata = {</div><div class='add'>+	{PCI_VENDOR_ID_ALACRITECH,</div><div class='add'>+	 SLIC_1GB_DEVICE_ID,</div><div class='add'>+	 PCI_ANY_ID, PCI_ANY_ID,},</div><div class='add'>+	{PCI_VENDOR_ID_ALACRITECH,</div><div class='add'>+	 SLIC_2GB_DEVICE_ID,</div><div class='add'>+	 PCI_ANY_ID, PCI_ANY_ID,},</div><div class='add'>+	{0,}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_DEVICE_TABLE(pci, slic_pci_tbl);</div><div class='add'>+</div><div class='add'>+#define SLIC_GET_SLIC_HANDLE(_adapter, _pslic_handle)                   \</div><div class='add'>+{                                                                       \</div><div class='add'>+    spin_lock_irqsave(&amp;_adapter-&gt;handle_lock.lock,                      \</div><div class='add'>+			_adapter-&gt;handle_lock.flags);                   \</div><div class='add'>+    _pslic_handle  =  _adapter-&gt;pfree_slic_handles;                     \</div><div class='add'>+    if (_pslic_handle) {                                                \</div><div class='add'>+	ASSERT(_pslic_handle-&gt;type == SLIC_HANDLE_FREE);                \</div><div class='add'>+	_adapter-&gt;pfree_slic_handles = _pslic_handle-&gt;next;             \</div><div class='add'>+    }                                                                   \</div><div class='add'>+    spin_unlock_irqrestore(&amp;_adapter-&gt;handle_lock.lock,                 \</div><div class='add'>+			_adapter-&gt;handle_lock.flags);                   \</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define SLIC_FREE_SLIC_HANDLE(_adapter, _pslic_handle)                  \</div><div class='add'>+{                                                                       \</div><div class='add'>+    _pslic_handle-&gt;type = SLIC_HANDLE_FREE;                             \</div><div class='add'>+    spin_lock_irqsave(&amp;_adapter-&gt;handle_lock.lock,                      \</div><div class='add'>+			_adapter-&gt;handle_lock.flags);                   \</div><div class='add'>+    _pslic_handle-&gt;next = _adapter-&gt;pfree_slic_handles;                 \</div><div class='add'>+    _adapter-&gt;pfree_slic_handles = _pslic_handle;                       \</div><div class='add'>+    spin_unlock_irqrestore(&amp;_adapter-&gt;handle_lock.lock,                 \</div><div class='add'>+			_adapter-&gt;handle_lock.flags);                   \</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void slic_debug_init(void);</div><div class='add'>+static void slic_debug_cleanup(void);</div><div class='add'>+static void slic_debug_adapter_create(struct adapter *adapter);</div><div class='add'>+static void slic_debug_adapter_destroy(struct adapter *adapter);</div><div class='add'>+static void slic_debug_card_create(struct sliccard *card);</div><div class='add'>+static void slic_debug_card_destroy(struct sliccard *card);</div><div class='add'>+</div><div class='add'>+static inline void slic_reg32_write(void __iomem *reg, u32 value, uint flush)</div><div class='add'>+{</div><div class='add'>+	writel(value, reg);</div><div class='add'>+	if (flush)</div><div class='add'>+		mb();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void slic_reg64_write(struct adapter *adapter,</div><div class='add'>+			       void __iomem *reg,</div><div class='add'>+			       u32 value,</div><div class='add'>+			       void __iomem *regh, u32 paddrh, uint flush)</div><div class='add'>+{</div><div class='add'>+	spin_lock_irqsave(&amp;adapter-&gt;bit64reglock.lock,</div><div class='add'>+				adapter-&gt;bit64reglock.flags);</div><div class='add'>+	if (paddrh != adapter-&gt;curaddrupper) {</div><div class='add'>+		adapter-&gt;curaddrupper = paddrh;</div><div class='add'>+		writel(paddrh, regh);</div><div class='add'>+	}</div><div class='add'>+	writel(value, reg);</div><div class='add'>+	if (flush)</div><div class='add'>+		mb();</div><div class='add'>+	spin_unlock_irqrestore(&amp;adapter-&gt;bit64reglock.lock,</div><div class='add'>+				adapter-&gt;bit64reglock.flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void slic_init_driver(void)</div><div class='add'>+{</div><div class='add'>+	if (slic_first_init) {</div><div class='add'>+		DBG_MSG("slicoss: %s slic_first_init set jiffies[%lx]\n",</div><div class='add'>+			__func__, jiffies);</div><div class='add'>+		slic_first_init = 0;</div><div class='add'>+		spin_lock_init(&amp;slic_global.driver_lock.lock);</div><div class='add'>+		slic_debug_init();</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void slic_dbg_macaddrs(struct adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	DBG_MSG("  (%s) curr %2.2X:%2.2X:%2.2X:%2.2X:%2.2X:%2.2X\n",</div><div class='add'>+		adapter-&gt;netdev-&gt;name, adapter-&gt;currmacaddr[0],</div><div class='add'>+		adapter-&gt;currmacaddr[1], adapter-&gt;currmacaddr[2],</div><div class='add'>+		adapter-&gt;currmacaddr[3], adapter-&gt;currmacaddr[4],</div><div class='add'>+		adapter-&gt;currmacaddr[5]);</div><div class='add'>+	DBG_MSG("  (%s) mac  %2.2X:%2.2X:%2.2X:%2.2X:%2.2X:%2.2X\n",</div><div class='add'>+		adapter-&gt;netdev-&gt;name, adapter-&gt;macaddr[0],</div><div class='add'>+		adapter-&gt;macaddr[1], adapter-&gt;macaddr[2],</div><div class='add'>+		adapter-&gt;macaddr[3], adapter-&gt;macaddr[4], adapter-&gt;macaddr[5]);</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef DEBUG_REGISTER_TRACE</div><div class='add'>+static void slic_dbg_register_trace(struct adapter *adapter,</div><div class='add'>+					struct sliccard *card)</div><div class='add'>+{</div><div class='add'>+	uint i;</div><div class='add'>+</div><div class='add'>+	DBG_ERROR("Dump Register Write Trace: curr_ix == %d\n", card-&gt;debug_ix);</div><div class='add'>+	for (i = 0; i &lt; 32; i++) {</div><div class='add'>+		DBG_ERROR("%2d %d %4x %x %x\n",</div><div class='add'>+			  i, card-&gt;reg_type[i], card-&gt;reg_offset[i],</div><div class='add'>+			  card-&gt;reg_value[i], card-&gt;reg_valueh[i]);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static void slic_init_adapter(struct net_device *netdev,</div><div class='add'>+			      struct pci_dev *pcidev,</div><div class='add'>+			      const struct pci_device_id *pci_tbl_entry,</div><div class='add'>+			      void __iomem *memaddr, int chip_idx)</div><div class='add'>+{</div><div class='add'>+	ushort index;</div><div class='add'>+	struct slic_handle *pslic_handle;</div><div class='add'>+	struct adapter *adapter = (struct adapter *)netdev_priv(netdev);</div><div class='add'>+/*</div><div class='add'>+    DBG_MSG("slicoss: %s (%s)\n    netdev [%p]\n    adapter[%p]\n    "</div><div class='add'>+	    "pcidev [%p]\n", __func__, netdev-&gt;name, netdev, adapter, pcidev);*/</div><div class='add'>+/*	adapter-&gt;pcidev = pcidev;*/</div><div class='add'>+	adapter-&gt;vendid = pci_tbl_entry-&gt;vendor;</div><div class='add'>+	adapter-&gt;devid = pci_tbl_entry-&gt;device;</div><div class='add'>+	adapter-&gt;subsysid = pci_tbl_entry-&gt;subdevice;</div><div class='add'>+	adapter-&gt;busnumber = pcidev-&gt;bus-&gt;number;</div><div class='add'>+	adapter-&gt;slotnumber = ((pcidev-&gt;devfn &gt;&gt; 3) &amp; 0x1F);</div><div class='add'>+	adapter-&gt;functionnumber = (pcidev-&gt;devfn &amp; 0x7);</div><div class='add'>+	adapter-&gt;memorylength = pci_resource_len(pcidev, 0);</div><div class='add'>+	adapter-&gt;slic_regs = (__iomem struct slic_regs *)memaddr;</div><div class='add'>+	adapter-&gt;irq = pcidev-&gt;irq;</div><div class='add'>+/*	adapter-&gt;netdev = netdev;*/</div><div class='add'>+	adapter-&gt;next_netdevice = head_netdevice;</div><div class='add'>+	head_netdevice = netdev;</div><div class='add'>+	adapter-&gt;chipid = chip_idx;</div><div class='add'>+	adapter-&gt;port = 0;	/*adapter-&gt;functionnumber;*/</div><div class='add'>+	adapter-&gt;cardindex = adapter-&gt;port;</div><div class='add'>+	adapter-&gt;memorybase = memaddr;</div><div class='add'>+	spin_lock_init(&amp;adapter-&gt;upr_lock.lock);</div><div class='add'>+	spin_lock_init(&amp;adapter-&gt;bit64reglock.lock);</div><div class='add'>+	spin_lock_init(&amp;adapter-&gt;adapter_lock.lock);</div><div class='add'>+	spin_lock_init(&amp;adapter-&gt;reset_lock.lock);</div><div class='add'>+	spin_lock_init(&amp;adapter-&gt;handle_lock.lock);</div><div class='add'>+</div><div class='add'>+	adapter-&gt;card_size = 1;</div><div class='add'>+	/*</div><div class='add'>+	  Initialize slic_handle array</div><div class='add'>+	*/</div><div class='add'>+	ASSERT(SLIC_CMDQ_MAXCMDS &lt;= 0xFFFF);</div><div class='add'>+	/*</div><div class='add'>+	 Start with 1.  0 is an invalid host handle.</div><div class='add'>+	*/</div><div class='add'>+	for (index = 1, pslic_handle = &amp;adapter-&gt;slic_handles[1];</div><div class='add'>+	     index &lt; SLIC_CMDQ_MAXCMDS; index++, pslic_handle++) {</div><div class='add'>+</div><div class='add'>+		pslic_handle-&gt;token.handle_index = index;</div><div class='add'>+		pslic_handle-&gt;type = SLIC_HANDLE_FREE;</div><div class='add'>+		pslic_handle-&gt;next = adapter-&gt;pfree_slic_handles;</div><div class='add'>+		adapter-&gt;pfree_slic_handles = pslic_handle;</div><div class='add'>+	}</div><div class='add'>+/*</div><div class='add'>+    DBG_MSG(".........\nix[%d] phandle[%p] pfree[%p] next[%p]\n",</div><div class='add'>+	index, pslic_handle, adapter-&gt;pfree_slic_handles, pslic_handle-&gt;next);*/</div><div class='add'>+	adapter-&gt;pshmem = (struct slic_shmem *)</div><div class='add'>+					pci_alloc_consistent(adapter-&gt;pcidev,</div><div class='add'>+					sizeof(struct slic_shmem *),</div><div class='add'>+					&amp;adapter-&gt;</div><div class='add'>+					phys_shmem);</div><div class='add'>+/*</div><div class='add'>+      DBG_MSG("slicoss: %s (%s)\n   pshmem    [%p]\n   phys_shmem[%p]\n"\</div><div class='add'>+		"slic_regs [%p]\n", __func__, netdev-&gt;name, adapter-&gt;pshmem,</div><div class='add'>+		(void *)adapter-&gt;phys_shmem, adapter-&gt;slic_regs);</div><div class='add'>+*/</div><div class='add'>+	ASSERT(adapter-&gt;pshmem);</div><div class='add'>+</div><div class='add'>+	memset(adapter-&gt;pshmem, 0, sizeof(struct slic_shmem));</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devinit slic_entry_probe(struct pci_dev *pcidev,</div><div class='add'>+			       const struct pci_device_id *pci_tbl_entry)</div><div class='add'>+{</div><div class='add'>+	static int cards_found;</div><div class='add'>+	static int did_version;</div><div class='add'>+	int err;</div><div class='add'>+	struct net_device *netdev;</div><div class='add'>+	struct adapter *adapter;</div><div class='add'>+	void __iomem *memmapped_ioaddr = NULL;</div><div class='add'>+	u32 status = 0;</div><div class='add'>+	ulong mmio_start = 0;</div><div class='add'>+	ulong mmio_len = 0;</div><div class='add'>+	struct sliccard *card = NULL;</div><div class='add'>+</div><div class='add'>+	DBG_MSG("slicoss: %s 2.6 VERSION ENTER jiffies[%lx] cpu %d\n",</div><div class='add'>+		__func__, jiffies, smp_processor_id());</div><div class='add'>+</div><div class='add'>+	slic_global.dynamic_intagg = dynamic_intagg;</div><div class='add'>+</div><div class='add'>+	err = pci_enable_device(pcidev);</div><div class='add'>+</div><div class='add'>+	DBG_MSG("Call pci_enable_device(%p)  status[%x]\n", pcidev, err);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (slic_debug &gt; 0 &amp;&amp; did_version++ == 0) {</div><div class='add'>+		printk(slic_banner);</div><div class='add'>+		printk(slic_proc_version);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = pci_set_dma_mask(pcidev, DMA_64BIT_MASK);</div><div class='add'>+	if (!err) {</div><div class='add'>+		DBG_MSG("pci_set_dma_mask(DMA_64BIT_MASK) successful\n");</div><div class='add'>+	} else {</div><div class='add'>+		err = pci_set_dma_mask(pcidev, DMA_32BIT_MASK);</div><div class='add'>+		if (err) {</div><div class='add'>+			DBG_MSG</div><div class='add'>+			    ("No usable DMA configuration, aborting  err[%x]\n",</div><div class='add'>+			     err);</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+		DBG_MSG("pci_set_dma_mask(DMA_32BIT_MASK) successful\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBG_MSG("Call pci_request_regions\n");</div><div class='add'>+</div><div class='add'>+	err = pci_request_regions(pcidev, DRV_NAME);</div><div class='add'>+	if (err) {</div><div class='add'>+		DBG_MSG("pci_request_regions FAILED err[%x]\n", err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBG_MSG("call pci_set_master\n");</div><div class='add'>+	pci_set_master(pcidev);</div><div class='add'>+</div><div class='add'>+	DBG_MSG("call alloc_etherdev\n");</div><div class='add'>+	netdev = alloc_etherdev(sizeof(struct adapter));</div><div class='add'>+	if (!netdev) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto err_out_exit_slic_probe;</div><div class='add'>+	}</div><div class='add'>+	DBG_MSG("alloc_etherdev for slic netdev[%p]\n", netdev);</div><div class='add'>+</div><div class='add'>+	SET_NETDEV_DEV(netdev, &amp;pcidev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	pci_set_drvdata(pcidev, netdev);</div><div class='add'>+	adapter = netdev_priv(netdev);</div><div class='add'>+	adapter-&gt;netdev = netdev;</div><div class='add'>+	adapter-&gt;pcidev = pcidev;</div><div class='add'>+</div><div class='add'>+	mmio_start = pci_resource_start(pcidev, 0);</div><div class='add'>+	mmio_len = pci_resource_len(pcidev, 0);</div><div class='add'>+</div><div class='add'>+	DBG_MSG("slicoss: call ioremap(mmio_start[%lx], mmio_len[%lx])\n",</div><div class='add'>+		mmio_start, mmio_len);</div><div class='add'>+</div><div class='add'>+/*  memmapped_ioaddr =  (u32)ioremap_nocache(mmio_start, mmio_len);*/</div><div class='add'>+	memmapped_ioaddr = ioremap(mmio_start, mmio_len);</div><div class='add'>+	DBG_MSG("slicoss: %s MEMMAPPED_IOADDR [%p]\n", __func__,</div><div class='add'>+		memmapped_ioaddr);</div><div class='add'>+	if (!memmapped_ioaddr) {</div><div class='add'>+		DBG_ERROR("%s cannot remap MMIO region %lx @ %lx\n",</div><div class='add'>+			  __func__, mmio_len, mmio_start);</div><div class='add'>+		goto err_out_free_mmio_region;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBG_MSG</div><div class='add'>+	    ("slicoss: %s found Alacritech SLICOSS PCI, MMIO at %p, "\</div><div class='add'>+	    "start[%lx] len[%lx], IRQ %d.\n",</div><div class='add'>+	     __func__, memmapped_ioaddr, mmio_start, mmio_len, pcidev-&gt;irq);</div><div class='add'>+</div><div class='add'>+	slic_config_pci(pcidev);</div><div class='add'>+</div><div class='add'>+	slic_init_driver();</div><div class='add'>+</div><div class='add'>+	slic_init_adapter(netdev,</div><div class='add'>+			  pcidev, pci_tbl_entry, memmapped_ioaddr, cards_found);</div><div class='add'>+</div><div class='add'>+	status = slic_card_locate(adapter);</div><div class='add'>+	if (status) {</div><div class='add'>+		DBG_ERROR("%s cannot locate card\n", __func__);</div><div class='add'>+		goto err_out_free_mmio_region;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	card = adapter-&gt;card;</div><div class='add'>+</div><div class='add'>+	if (!adapter-&gt;allocated) {</div><div class='add'>+		card-&gt;adapters_allocated++;</div><div class='add'>+		adapter-&gt;allocated = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBG_MSG("slicoss: %s    card:             %p\n", __func__,</div><div class='add'>+		adapter-&gt;card);</div><div class='add'>+	DBG_MSG("slicoss: %s    card-&gt;adapter[%d] == [%p]\n", __func__,</div><div class='add'>+		(uint) adapter-&gt;port, adapter);</div><div class='add'>+	DBG_MSG("slicoss: %s    card-&gt;adapters_allocated [%d]\n", __func__,</div><div class='add'>+		card-&gt;adapters_allocated);</div><div class='add'>+	DBG_MSG("slicoss: %s    card-&gt;adapters_activated [%d]\n", __func__,</div><div class='add'>+		card-&gt;adapters_activated);</div><div class='add'>+</div><div class='add'>+	status = slic_card_init(card, adapter);</div><div class='add'>+</div><div class='add'>+	if (status != STATUS_SUCCESS) {</div><div class='add'>+		card-&gt;state = CARD_FAIL;</div><div class='add'>+		adapter-&gt;state = ADAPT_FAIL;</div><div class='add'>+		adapter-&gt;linkstate = LINK_DOWN;</div><div class='add'>+		DBG_ERROR("slic_card_init FAILED status[%x]\n", status);</div><div class='add'>+	} else {</div><div class='add'>+		slic_adapter_set_hwaddr(adapter);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netdev-&gt;base_addr = (unsigned long)adapter-&gt;memorybase;</div><div class='add'>+	netdev-&gt;irq = adapter-&gt;irq;</div><div class='add'>+	netdev-&gt;open = slic_entry_open;</div><div class='add'>+	netdev-&gt;stop = slic_entry_halt;</div><div class='add'>+	netdev-&gt;hard_start_xmit = slic_xmit_start;</div><div class='add'>+	netdev-&gt;do_ioctl = slic_ioctl;</div><div class='add'>+	netdev-&gt;set_mac_address = slic_mac_set_address;</div><div class='add'>+#if SLIC_GET_STATS_ENABLED</div><div class='add'>+	netdev-&gt;get_stats = slic_get_stats;</div><div class='add'>+#endif</div><div class='add'>+	netdev-&gt;set_multicast_list = slic_mcast_set_list;</div><div class='add'>+</div><div class='add'>+	slic_debug_adapter_create(adapter);</div><div class='add'>+</div><div class='add'>+	strcpy(netdev-&gt;name, "eth%d");</div><div class='add'>+	err = register_netdev(netdev);</div><div class='add'>+	if (err) {</div><div class='add'>+		DBG_ERROR("Cannot register net device, aborting.\n");</div><div class='add'>+		goto err_out_unmap;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBG_MSG</div><div class='add'>+	    ("slicoss: addr 0x%lx, irq %d, MAC addr "\</div><div class='add'>+	     "%02X:%02X:%02X:%02X:%02X:%02X\n",</div><div class='add'>+	     mmio_start, /*pci_resource_start(pcidev, 0), */ pcidev-&gt;irq,</div><div class='add'>+	     netdev-&gt;dev_addr[0], netdev-&gt;dev_addr[1], netdev-&gt;dev_addr[2],</div><div class='add'>+	     netdev-&gt;dev_addr[3], netdev-&gt;dev_addr[4], netdev-&gt;dev_addr[5]);</div><div class='add'>+</div><div class='add'>+	cards_found++;</div><div class='add'>+	DBG_MSG("slicoss: %s EXIT status[%x] jiffies[%lx] cpu %d\n",</div><div class='add'>+		__func__, status, jiffies, smp_processor_id());</div><div class='add'>+</div><div class='add'>+	return status;</div><div class='add'>+</div><div class='add'>+err_out_unmap:</div><div class='add'>+	iounmap(memmapped_ioaddr);</div><div class='add'>+</div><div class='add'>+err_out_free_mmio_region:</div><div class='add'>+	release_mem_region(mmio_start, mmio_len);</div><div class='add'>+</div><div class='add'>+err_out_exit_slic_probe:</div><div class='add'>+	pci_release_regions(pcidev);</div><div class='add'>+	DBG_ERROR("%s EXIT jiffies[%lx] cpu %d\n", __func__, jiffies,</div><div class='add'>+		  smp_processor_id());</div><div class='add'>+</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int slic_entry_open(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct adapter *adapter = (struct adapter *) netdev_priv(dev);</div><div class='add'>+	struct sliccard *card = adapter-&gt;card;</div><div class='add'>+	u32 locked = 0;</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	ASSERT(adapter);</div><div class='add'>+	ASSERT(card);</div><div class='add'>+	DBG_MSG</div><div class='add'>+	    ("slicoss: %s adapter-&gt;activated[%d] card-&gt;adapters[%x] "\</div><div class='add'>+	     "allocd[%x]\n", __func__, adapter-&gt;activated,</div><div class='add'>+	     card-&gt;adapters_activated,</div><div class='add'>+	     card-&gt;adapters_allocated);</div><div class='add'>+	DBG_MSG</div><div class='add'>+	    ("slicoss: %s (%s): [jiffies[%lx] cpu %d] dev[%p] adapt[%p] "\</div><div class='add'>+	     "port[%d] card[%p]\n",</div><div class='add'>+	     __func__, adapter-&gt;netdev-&gt;name, jiffies, smp_processor_id(),</div><div class='add'>+	     adapter-&gt;netdev, adapter, adapter-&gt;port, card);</div><div class='add'>+</div><div class='add'>+	netif_stop_queue(adapter-&gt;netdev);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;slic_global.driver_lock.lock,</div><div class='add'>+				slic_global.driver_lock.flags);</div><div class='add'>+	locked = 1;</div><div class='add'>+	if (!adapter-&gt;activated) {</div><div class='add'>+		card-&gt;adapters_activated++;</div><div class='add'>+		slic_global.num_slic_ports_active++;</div><div class='add'>+		adapter-&gt;activated = 1;</div><div class='add'>+	}</div><div class='add'>+	status = slic_if_init(adapter);</div><div class='add'>+</div><div class='add'>+	if (status != STATUS_SUCCESS) {</div><div class='add'>+		if (adapter-&gt;activated) {</div><div class='add'>+			card-&gt;adapters_activated--;</div><div class='add'>+			slic_global.num_slic_ports_active--;</div><div class='add'>+			adapter-&gt;activated = 0;</div><div class='add'>+		}</div><div class='add'>+		if (locked) {</div><div class='add'>+			spin_unlock_irqrestore(&amp;slic_global.driver_lock.lock,</div><div class='add'>+						slic_global.driver_lock.flags);</div><div class='add'>+			locked = 0;</div><div class='add'>+		}</div><div class='add'>+		return status;</div><div class='add'>+	}</div><div class='add'>+	DBG_MSG("slicoss: %s set card-&gt;master[%p] adapter[%p]\n", __func__,</div><div class='add'>+		card-&gt;master, adapter);</div><div class='add'>+	if (!card-&gt;master)</div><div class='add'>+		card-&gt;master = adapter;</div><div class='add'>+#if SLIC_DUMP_ENABLED</div><div class='add'>+	if (!(card-&gt;dumpthread_running))</div><div class='add'>+		init_waitqueue_head(&amp;card-&gt;dump_wq);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	if (locked) {</div><div class='add'>+		spin_unlock_irqrestore(&amp;slic_global.driver_lock.lock,</div><div class='add'>+					slic_global.driver_lock.flags);</div><div class='add'>+		locked = 0;</div><div class='add'>+	}</div><div class='add'>+#if SLIC_DUMP_ENABLED</div><div class='add'>+	if (!(card-&gt;dumpthread_running)) {</div><div class='add'>+		DBG_MSG("attempt to initialize dump thread\n");</div><div class='add'>+		status = slic_init_dump_thread(card);</div><div class='add'>+		/*</div><div class='add'>+		Even if the dump thread fails, we will continue at this point</div><div class='add'>+		*/</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	return STATUS_SUCCESS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __devexit slic_entry_remove(struct pci_dev *pcidev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = pci_get_drvdata(pcidev);</div><div class='add'>+	u32 mmio_start = 0;</div><div class='add'>+	uint mmio_len = 0;</div><div class='add'>+	struct adapter *adapter = (struct adapter *) netdev_priv(dev);</div><div class='add'>+	struct sliccard *card;</div><div class='add'>+</div><div class='add'>+	ASSERT(adapter);</div><div class='add'>+	DBG_MSG("slicoss: %s ENTER dev[%p] adapter[%p]\n", __func__, dev,</div><div class='add'>+		adapter);</div><div class='add'>+	slic_adapter_freeresources(adapter);</div><div class='add'>+	slic_unmap_mmio_space(adapter);</div><div class='add'>+	DBG_MSG("slicoss: %s unregister_netdev\n", __func__);</div><div class='add'>+	unregister_netdev(dev);</div><div class='add'>+</div><div class='add'>+	mmio_start = pci_resource_start(pcidev, 0);</div><div class='add'>+	mmio_len = pci_resource_len(pcidev, 0);</div><div class='add'>+</div><div class='add'>+	DBG_MSG("slicoss: %s rel_region(0) start[%x] len[%x]\n", __func__,</div><div class='add'>+		mmio_start, mmio_len);</div><div class='add'>+	release_mem_region(mmio_start, mmio_len);</div><div class='add'>+</div><div class='add'>+	DBG_MSG("slicoss: %s iounmap dev-&gt;base_addr[%x]\n", __func__,</div><div class='add'>+		(uint) dev-&gt;base_addr);</div><div class='add'>+	iounmap((void __iomem *)dev-&gt;base_addr);</div><div class='add'>+	ASSERT(adapter-&gt;card);</div><div class='add'>+	card = adapter-&gt;card;</div><div class='add'>+	ASSERT(card-&gt;adapters_allocated);</div><div class='add'>+	card-&gt;adapters_allocated--;</div><div class='add'>+	adapter-&gt;allocated = 0;</div><div class='add'>+	DBG_MSG</div><div class='add'>+	    ("slicoss: %s init[%x] alloc[%x] card[%p] adapter[%p]\n",</div><div class='add'>+	     __func__, card-&gt;adapters_activated, card-&gt;adapters_allocated,</div><div class='add'>+	     card, adapter);</div><div class='add'>+	if (!card-&gt;adapters_allocated) {</div><div class='add'>+		struct sliccard *curr_card = slic_global.slic_card;</div><div class='add'>+		if (curr_card == card) {</div><div class='add'>+			slic_global.slic_card = card-&gt;next;</div><div class='add'>+		} else {</div><div class='add'>+			while (curr_card-&gt;next != card)</div><div class='add'>+				curr_card = curr_card-&gt;next;</div><div class='add'>+			ASSERT(curr_card);</div><div class='add'>+			curr_card-&gt;next = card-&gt;next;</div><div class='add'>+		}</div><div class='add'>+		ASSERT(slic_global.num_slic_cards);</div><div class='add'>+		slic_global.num_slic_cards--;</div><div class='add'>+		slic_card_cleanup(card);</div><div class='add'>+	}</div><div class='add'>+	DBG_MSG("slicoss: %s deallocate device\n", __func__);</div><div class='add'>+	kfree(dev);</div><div class='add'>+	pci_release_regions(pcidev);</div><div class='add'>+	DBG_MSG("slicoss: %s EXIT\n", __func__);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int slic_entry_halt(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct adapter *adapter = (struct adapter *)netdev_priv(dev);</div><div class='add'>+	struct sliccard *card = adapter-&gt;card;</div><div class='add'>+	__iomem struct slic_regs *slic_regs = adapter-&gt;slic_regs;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;slic_global.driver_lock.lock,</div><div class='add'>+				slic_global.driver_lock.flags);</div><div class='add'>+	ASSERT(card);</div><div class='add'>+	DBG_MSG("slicoss: %s (%s) ENTER\n", __func__, dev-&gt;name);</div><div class='add'>+	DBG_MSG("slicoss: %s (%s) actvtd[%d] alloc[%d] state[%x] adapt[%p]\n",</div><div class='add'>+		__func__, dev-&gt;name, card-&gt;adapters_activated,</div><div class='add'>+		card-&gt;adapters_allocated, card-&gt;state, adapter);</div><div class='add'>+	slic_if_stop_queue(adapter);</div><div class='add'>+	adapter-&gt;state = ADAPT_DOWN;</div><div class='add'>+	adapter-&gt;linkstate = LINK_DOWN;</div><div class='add'>+	adapter-&gt;upr_list = NULL;</div><div class='add'>+	adapter-&gt;upr_busy = 0;</div><div class='add'>+	adapter-&gt;devflags_prev = 0;</div><div class='add'>+	DBG_MSG("slicoss: %s (%s) set adapter[%p] state to ADAPT_DOWN(%d)\n",</div><div class='add'>+		__func__, dev-&gt;name, adapter, adapter-&gt;state);</div><div class='add'>+	ASSERT(card-&gt;adapter[adapter-&gt;cardindex] == adapter);</div><div class='add'>+	WRITE_REG(slic_regs-&gt;slic_icr, ICR_INT_OFF, FLUSH);</div><div class='add'>+	adapter-&gt;all_reg_writes++;</div><div class='add'>+	adapter-&gt;icr_reg_writes++;</div><div class='add'>+	slic_config_clear(adapter);</div><div class='add'>+	DBG_MSG("slicoss: %s (%s) dev[%p] adapt[%p] card[%p]\n",</div><div class='add'>+		__func__, dev-&gt;name, dev, adapter, card);</div><div class='add'>+	if (adapter-&gt;activated) {</div><div class='add'>+		card-&gt;adapters_activated--;</div><div class='add'>+		slic_global.num_slic_ports_active--;</div><div class='add'>+		adapter-&gt;activated = 0;</div><div class='add'>+	}</div><div class='add'>+#ifdef AUTOMATIC_RESET</div><div class='add'>+	WRITE_REG(slic_regs-&gt;slic_reset_iface, 0, FLUSH);</div><div class='add'>+#endif</div><div class='add'>+	/*</div><div class='add'>+	 *  Reset the adapter's rsp, cmd, and rcv queues</div><div class='add'>+	 */</div><div class='add'>+	slic_cmdq_reset(adapter);</div><div class='add'>+	slic_rspqueue_reset(adapter);</div><div class='add'>+	slic_rcvqueue_reset(adapter);</div><div class='add'>+</div><div class='add'>+#ifdef AUTOMATIC_RESET</div><div class='add'>+	if (!card-&gt;adapters_activated) {</div><div class='add'>+</div><div class='add'>+#if SLIC_DUMP_ENABLED</div><div class='add'>+		if (card-&gt;dumpthread_running) {</div><div class='add'>+			uint status;</div><div class='add'>+			DBG_MSG("attempt to terminate dump thread pid[%x]\n",</div><div class='add'>+				card-&gt;dump_task_id);</div><div class='add'>+			status = kill_proc(card-&gt;dump_task_id-&gt;pid, SIGKILL, 1);</div><div class='add'>+</div><div class='add'>+			if (!status) {</div><div class='add'>+				int count = 10 * 100;</div><div class='add'>+				while (card-&gt;dumpthread_running &amp;&amp; --count) {</div><div class='add'>+					current-&gt;state = TASK_INTERRUPTIBLE;</div><div class='add'>+					schedule_timeout(1);</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+				if (!count) {</div><div class='add'>+					DBG_MSG</div><div class='add'>+					    ("slicmon thread cleanup FAILED \</div><div class='add'>+					     pid[%x]\n",</div><div class='add'>+					     card-&gt;dump_task_id-&gt;pid);</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+#endif</div><div class='add'>+		DBG_MSG("slicoss: %s (%s) initiate CARD_HALT\n", __func__,</div><div class='add'>+			dev-&gt;name);</div><div class='add'>+</div><div class='add'>+		slic_card_init(card, adapter);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	DBG_MSG("slicoss: %s (%s) EXIT\n", __func__, dev-&gt;name);</div><div class='add'>+	DBG_MSG("slicoss: %s EXIT\n", __func__);</div><div class='add'>+	spin_unlock_irqrestore(&amp;slic_global.driver_lock.lock,</div><div class='add'>+				slic_global.driver_lock.flags);</div><div class='add'>+	return STATUS_SUCCESS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int slic_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)</div><div class='add'>+{</div><div class='add'>+	ASSERT(rq);</div><div class='add'>+/*</div><div class='add'>+      DBG_MSG("slicoss: %s cmd[%x] rq[%p] dev[%p]\n", __func__, cmd, rq, dev);</div><div class='add'>+*/</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case SIOCSLICSETINTAGG:</div><div class='add'>+		{</div><div class='add'>+			struct adapter *adapter = (struct adapter *)</div><div class='add'>+							netdev_priv(dev);</div><div class='add'>+			u32 data[7];</div><div class='add'>+			u32 intagg;</div><div class='add'>+</div><div class='add'>+			if (copy_from_user(data, rq-&gt;ifr_data, 28)) {</div><div class='add'>+				DBG_ERROR</div><div class='add'>+				    ("copy_from_user FAILED getting initial \</div><div class='add'>+				     params\n");</div><div class='add'>+				return -EFAULT;</div><div class='add'>+			}</div><div class='add'>+			intagg = data[0];</div><div class='add'>+			printk(KERN_EMERG</div><div class='add'>+			       "%s: set interrupt aggregation to %d\n",</div><div class='add'>+			       __func__, intagg);</div><div class='add'>+			slic_intagg_set(adapter, intagg);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+#ifdef SLIC_USER_REQUEST_DUMP_ENABLED</div><div class='add'>+	case SIOCSLICDUMPCARD:</div><div class='add'>+		{</div><div class='add'>+			struct adapter *adapter = (struct adapter *)</div><div class='add'>+							dev-&gt;priv;</div><div class='add'>+			struct sliccard *card;</div><div class='add'>+</div><div class='add'>+			ASSERT(adapter);</div><div class='add'>+			ASSERT(adapter-&gt;card)</div><div class='add'>+			card = adapter-&gt;card;</div><div class='add'>+</div><div class='add'>+			DBG_IOCTL("slic_ioctl  SIOCSLIC_DUMP_CARD\n");</div><div class='add'>+</div><div class='add'>+			if (card-&gt;dump_requested == SLIC_DUMP_DONE) {</div><div class='add'>+				printk(SLICLEVEL</div><div class='add'>+				       "SLIC Card dump to be overwritten\n");</div><div class='add'>+				card-&gt;dump_requested = SLIC_DUMP_REQUESTED;</div><div class='add'>+			} else if ((card-&gt;dump_requested == SLIC_DUMP_REQUESTED)</div><div class='add'>+				   || (card-&gt;dump_requested ==</div><div class='add'>+				       SLIC_DUMP_IN_PROGRESS)) {</div><div class='add'>+				printk(SLICLEVEL</div><div class='add'>+				       "SLIC Card dump Requested but already \</div><div class='add'>+					in progress... ignore\n");</div><div class='add'>+			} else {</div><div class='add'>+				printk(SLICLEVEL</div><div class='add'>+				       "SLIC Card #%d Dump Requested\n",</div><div class='add'>+				       card-&gt;cardnum);</div><div class='add'>+				card-&gt;dump_requested = SLIC_DUMP_REQUESTED;</div><div class='add'>+			}</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef SLIC_TRACE_DUMP_ENABLED</div><div class='add'>+	case SIOCSLICTRACEDUMP:</div><div class='add'>+		{</div><div class='add'>+			ulong data[7];</div><div class='add'>+			ulong value;</div><div class='add'>+</div><div class='add'>+			DBG_IOCTL("slic_ioctl  SIOCSLIC_TRACE_DUMP\n");</div><div class='add'>+</div><div class='add'>+			if (copy_from_user(data, rq-&gt;ifr_data, 28)) {</div><div class='add'>+				PRINT_ERROR</div><div class='add'>+				    ("slic: copy_from_user FAILED getting \</div><div class='add'>+				     initial simba param\n");</div><div class='add'>+				return -EFAULT;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			value = data[0];</div><div class='add'>+			if (tracemon_request == SLIC_DUMP_DONE) {</div><div class='add'>+				PRINT_ERROR</div><div class='add'>+				    ("ATK Diagnostic Trace Dump Requested\n");</div><div class='add'>+				tracemon_request = SLIC_DUMP_REQUESTED;</div><div class='add'>+				tracemon_request_type = value;</div><div class='add'>+				tracemon_timestamp = jiffies;</div><div class='add'>+			} else if ((tracemon_request == SLIC_DUMP_REQUESTED) ||</div><div class='add'>+				   (tracemon_request ==</div><div class='add'>+				    SLIC_DUMP_IN_PROGRESS)) {</div><div class='add'>+				PRINT_ERROR</div><div class='add'>+				    ("ATK Diagnostic Trace Dump Requested but \</div><div class='add'>+				     already in progress... ignore\n");</div><div class='add'>+			} else {</div><div class='add'>+				PRINT_ERROR</div><div class='add'>+				    ("ATK Diagnostic Trace Dump Requested\n");</div><div class='add'>+				tracemon_request = SLIC_DUMP_REQUESTED;</div><div class='add'>+				tracemon_request_type = value;</div><div class='add'>+				tracemon_timestamp = jiffies;</div><div class='add'>+			}</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+#endif</div><div class='add'>+#if SLIC_ETHTOOL_SUPPORT</div><div class='add'>+	case SIOCETHTOOL:</div><div class='add'>+		{</div><div class='add'>+			struct adapter *adapter = (struct adapter *)</div><div class='add'>+							netdev_priv(dev);</div><div class='add'>+			struct ethtool_cmd data;</div><div class='add'>+			struct ethtool_cmd ecmd;</div><div class='add'>+</div><div class='add'>+			ASSERT(adapter);</div><div class='add'>+/*                      DBG_MSG("slicoss: %s SIOCETHTOOL\n", __func__); */</div><div class='add'>+			if (copy_from_user(&amp;ecmd, rq-&gt;ifr_data, sizeof(ecmd)))</div><div class='add'>+				return -EFAULT;</div><div class='add'>+</div><div class='add'>+			if (ecmd.cmd == ETHTOOL_GSET) {</div><div class='add'>+				data.supported =</div><div class='add'>+				    (SUPPORTED_10baseT_Half |</div><div class='add'>+				     SUPPORTED_10baseT_Full |</div><div class='add'>+				     SUPPORTED_100baseT_Half |</div><div class='add'>+				     SUPPORTED_100baseT_Full |</div><div class='add'>+				     SUPPORTED_Autoneg | SUPPORTED_MII);</div><div class='add'>+				data.port = PORT_MII;</div><div class='add'>+				data.transceiver = XCVR_INTERNAL;</div><div class='add'>+				data.phy_address = 0;</div><div class='add'>+				if (adapter-&gt;linkspeed == LINK_100MB)</div><div class='add'>+					data.speed = SPEED_100;</div><div class='add'>+				else if (adapter-&gt;linkspeed == LINK_10MB)</div><div class='add'>+					data.speed = SPEED_10;</div><div class='add'>+				else</div><div class='add'>+					data.speed = 0;</div><div class='add'>+</div><div class='add'>+				if (adapter-&gt;linkduplex == LINK_FULLD)</div><div class='add'>+					data.duplex = DUPLEX_FULL;</div><div class='add'>+				else</div><div class='add'>+					data.duplex = DUPLEX_HALF;</div><div class='add'>+</div><div class='add'>+				data.autoneg = AUTONEG_ENABLE;</div><div class='add'>+				data.maxtxpkt = 1;</div><div class='add'>+				data.maxrxpkt = 1;</div><div class='add'>+				if (copy_to_user</div><div class='add'>+				    (rq-&gt;ifr_data, &amp;data, sizeof(data)))</div><div class='add'>+					return -EFAULT;</div><div class='add'>+</div><div class='add'>+			} else if (ecmd.cmd == ETHTOOL_SSET) {</div><div class='add'>+				if (!capable(CAP_NET_ADMIN))</div><div class='add'>+					return -EPERM;</div><div class='add'>+</div><div class='add'>+				if (adapter-&gt;linkspeed == LINK_100MB)</div><div class='add'>+					data.speed = SPEED_100;</div><div class='add'>+				else if (adapter-&gt;linkspeed == LINK_10MB)</div><div class='add'>+					data.speed = SPEED_10;</div><div class='add'>+				else</div><div class='add'>+					data.speed = 0;</div><div class='add'>+</div><div class='add'>+				if (adapter-&gt;linkduplex == LINK_FULLD)</div><div class='add'>+					data.duplex = DUPLEX_FULL;</div><div class='add'>+				else</div><div class='add'>+					data.duplex = DUPLEX_HALF;</div><div class='add'>+</div><div class='add'>+				data.autoneg = AUTONEG_ENABLE;</div><div class='add'>+				data.maxtxpkt = 1;</div><div class='add'>+				data.maxrxpkt = 1;</div><div class='add'>+				if ((ecmd.speed != data.speed) ||</div><div class='add'>+				    (ecmd.duplex != data.duplex)) {</div><div class='add'>+					u32 speed;</div><div class='add'>+					u32 duplex;</div><div class='add'>+</div><div class='add'>+					if (ecmd.speed == SPEED_10) {</div><div class='add'>+						speed = 0;</div><div class='add'>+						SLIC_DISPLAY</div><div class='add'>+						    ("%s: slic ETHTOOL set \</div><div class='add'>+						     link speed==10MB",</div><div class='add'>+						     dev-&gt;name);</div><div class='add'>+					} else {</div><div class='add'>+						speed = PCR_SPEED_100;</div><div class='add'>+						SLIC_DISPLAY</div><div class='add'>+						    ("%s: slic ETHTOOL set \</div><div class='add'>+						    link speed==100MB",</div><div class='add'>+						     dev-&gt;name);</div><div class='add'>+					}</div><div class='add'>+					if (ecmd.duplex == DUPLEX_FULL) {</div><div class='add'>+						duplex = PCR_DUPLEX_FULL;</div><div class='add'>+						SLIC_DISPLAY</div><div class='add'>+						    (": duplex==FULL\n");</div><div class='add'>+					} else {</div><div class='add'>+						duplex = 0;</div><div class='add'>+						SLIC_DISPLAY</div><div class='add'>+						    (": duplex==HALF\n");</div><div class='add'>+					}</div><div class='add'>+					slic_link_config(adapter,</div><div class='add'>+							 speed, duplex);</div><div class='add'>+					slic_link_event_handler(adapter);</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+#endif</div><div class='add'>+	default:</div><div class='add'>+/*              DBG_MSG("slicoss: %s UNSUPPORTED[%x]\n", __func__, cmd); */</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define  XMIT_FAIL_LINK_STATE               1</div><div class='add'>+#define  XMIT_FAIL_ZERO_LENGTH              2</div><div class='add'>+#define  XMIT_FAIL_HOSTCMD_FAIL             3</div><div class='add'>+</div><div class='add'>+static void slic_xmit_build_request(struct adapter *adapter,</div><div class='add'>+			     struct slic_hostcmd *hcmd, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct slic_host64_cmd *ihcmd;</div><div class='add'>+	ulong phys_addr;</div><div class='add'>+</div><div class='add'>+	ihcmd = &amp;hcmd-&gt;cmd64;</div><div class='add'>+</div><div class='add'>+	ihcmd-&gt;flags = (adapter-&gt;port &lt;&lt; IHFLG_IFSHFT);</div><div class='add'>+	ihcmd-&gt;command = IHCMD_XMT_REQ;</div><div class='add'>+	ihcmd-&gt;u.slic_buffers.totlen = skb-&gt;len;</div><div class='add'>+	phys_addr = pci_map_single(adapter-&gt;pcidev, skb-&gt;data, skb-&gt;len,</div><div class='add'>+			PCI_DMA_TODEVICE);</div><div class='add'>+	ihcmd-&gt;u.slic_buffers.bufs[0].paddrl = SLIC_GET_ADDR_LOW(phys_addr);</div><div class='add'>+	ihcmd-&gt;u.slic_buffers.bufs[0].paddrh = SLIC_GET_ADDR_HIGH(phys_addr);</div><div class='add'>+	ihcmd-&gt;u.slic_buffers.bufs[0].length = skb-&gt;len;</div><div class='add'>+#if defined(CONFIG_X86_64)</div><div class='add'>+	hcmd-&gt;cmdsize = (u32) ((((u64)&amp;ihcmd-&gt;u.slic_buffers.bufs[1] -</div><div class='add'>+				     (u64) hcmd) + 31) &gt;&gt; 5);</div><div class='add'>+#elif defined(CONFIG_X86)</div><div class='add'>+	hcmd-&gt;cmdsize = ((((u32) &amp;ihcmd-&gt;u.slic_buffers.bufs[1] -</div><div class='add'>+			   (u32) hcmd) + 31) &gt;&gt; 5);</div><div class='add'>+#else</div><div class='add'>+	Stop Compilation;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define NORMAL_ETHFRAME     0</div><div class='add'>+</div><div class='add'>+static int slic_xmit_start(struct sk_buff *skb, struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct sliccard *card;</div><div class='add'>+	struct adapter *adapter = (struct adapter *)netdev_priv(dev);</div><div class='add'>+	struct slic_hostcmd *hcmd = NULL;</div><div class='add'>+	u32 status = 0;</div><div class='add'>+	u32 skbtype = NORMAL_ETHFRAME;</div><div class='add'>+	void *offloadcmd = NULL;</div><div class='add'>+</div><div class='add'>+	card = adapter-&gt;card;</div><div class='add'>+	ASSERT(card);</div><div class='add'>+/*</div><div class='add'>+    DBG_ERROR("xmit_start (%s) ENTER skb[%p] len[%d] linkstate[%x] state[%x]\n",</div><div class='add'>+	adapter-&gt;netdev-&gt;name, skb, skb-&gt;len, adapter-&gt;linkstate,</div><div class='add'>+	 adapter-&gt;state);</div><div class='add'>+*/</div><div class='add'>+	if ((adapter-&gt;linkstate != LINK_UP) ||</div><div class='add'>+	    (adapter-&gt;state != ADAPT_UP) || (card-&gt;state != CARD_UP)) {</div><div class='add'>+		status = XMIT_FAIL_LINK_STATE;</div><div class='add'>+		goto xmit_fail;</div><div class='add'>+</div><div class='add'>+	} else if (skb-&gt;len == 0) {</div><div class='add'>+		status = XMIT_FAIL_ZERO_LENGTH;</div><div class='add'>+		goto xmit_fail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (skbtype == NORMAL_ETHFRAME) {</div><div class='add'>+		hcmd = slic_cmdq_getfree(adapter);</div><div class='add'>+		if (!hcmd) {</div><div class='add'>+			adapter-&gt;xmitq_full = 1;</div><div class='add'>+			status = XMIT_FAIL_HOSTCMD_FAIL;</div><div class='add'>+			goto xmit_fail;</div><div class='add'>+		}</div><div class='add'>+		ASSERT(hcmd-&gt;pslic_handle);</div><div class='add'>+		ASSERT(hcmd-&gt;cmd64.hosthandle ==</div><div class='add'>+		       hcmd-&gt;pslic_handle-&gt;token.handle_token);</div><div class='add'>+		hcmd-&gt;skb = skb;</div><div class='add'>+		hcmd-&gt;busy = 1;</div><div class='add'>+		hcmd-&gt;type = SLIC_CMD_DUMB;</div><div class='add'>+		if (skbtype == NORMAL_ETHFRAME)</div><div class='add'>+			slic_xmit_build_request(adapter, hcmd, skb);</div><div class='add'>+	}</div><div class='add'>+	adapter-&gt;stats.tx_packets++;</div><div class='add'>+	adapter-&gt;stats.tx_bytes += skb-&gt;len;</div><div class='add'>+</div><div class='add'>+#ifdef DEBUG_DUMP</div><div class='add'>+	if (adapter-&gt;kill_card) {</div><div class='add'>+		struct slic_host64_cmd ihcmd;</div><div class='add'>+</div><div class='add'>+		ihcmd = &amp;hcmd-&gt;cmd64;</div><div class='add'>+</div><div class='add'>+		ihcmd-&gt;flags |= 0x40;</div><div class='add'>+		adapter-&gt;kill_card = 0;	/* only do this once */</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	if (hcmd-&gt;paddrh == 0) {</div><div class='add'>+		WRITE_REG(adapter-&gt;slic_regs-&gt;slic_cbar,</div><div class='add'>+			  (hcmd-&gt;paddrl | hcmd-&gt;cmdsize), DONT_FLUSH);</div><div class='add'>+	} else {</div><div class='add'>+		WRITE_REG64(adapter,</div><div class='add'>+			    adapter-&gt;slic_regs-&gt;slic_cbar64,</div><div class='add'>+			    (hcmd-&gt;paddrl | hcmd-&gt;cmdsize),</div><div class='add'>+			    adapter-&gt;slic_regs-&gt;slic_addr_upper,</div><div class='add'>+			    hcmd-&gt;paddrh, DONT_FLUSH);</div><div class='add'>+	}</div><div class='add'>+xmit_done:</div><div class='add'>+	return 0;</div><div class='add'>+xmit_fail:</div><div class='add'>+	slic_xmit_fail(adapter, skb, offloadcmd, skbtype, status);</div><div class='add'>+	goto xmit_done;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void slic_xmit_fail(struct adapter *adapter,</div><div class='add'>+		    struct sk_buff *skb,</div><div class='add'>+		    void *cmd, u32 skbtype, u32 status)</div><div class='add'>+{</div><div class='add'>+	if (adapter-&gt;xmitq_full)</div><div class='add'>+		slic_if_stop_queue(adapter);</div><div class='add'>+	if ((cmd == NULL) &amp;&amp; (status &lt;= XMIT_FAIL_HOSTCMD_FAIL)) {</div><div class='add'>+		switch (status) {</div><div class='add'>+		case XMIT_FAIL_LINK_STATE:</div><div class='add'>+			DBG_ERROR</div><div class='add'>+			    ("(%s) reject xmit skb[%p: %x] linkstate[%s] \</div><div class='add'>+			     adapter[%s:%d] card[%s:%d]\n",</div><div class='add'>+			     adapter-&gt;netdev-&gt;name, skb, skb-&gt;pkt_type,</div><div class='add'>+			     SLIC_LINKSTATE(adapter-&gt;linkstate),</div><div class='add'>+			     SLIC_ADAPTER_STATE(adapter-&gt;state), adapter-&gt;state,</div><div class='add'>+			     SLIC_CARD_STATE(adapter-&gt;card-&gt;state),</div><div class='add'>+			     adapter-&gt;card-&gt;state);</div><div class='add'>+			break;</div><div class='add'>+		case XMIT_FAIL_ZERO_LENGTH:</div><div class='add'>+			DBG_ERROR</div><div class='add'>+			    ("xmit_start skb-&gt;len == 0 skb[%p] type[%x]!!!! \n",</div><div class='add'>+			     skb, skb-&gt;pkt_type);</div><div class='add'>+			break;</div><div class='add'>+		case XMIT_FAIL_HOSTCMD_FAIL:</div><div class='add'>+			DBG_ERROR</div><div class='add'>+			    ("xmit_start skb[%p] type[%x] No host commands \</div><div class='add'>+			     available !!!! \n",</div><div class='add'>+			     skb, skb-&gt;pkt_type);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			ASSERT(0);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	dev_kfree_skb(skb);</div><div class='add'>+	adapter-&gt;stats.tx_dropped++;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void slic_rcv_handle_error(struct adapter *adapter,</div><div class='add'>+					struct slic_rcvbuf *rcvbuf)</div><div class='add'>+{</div><div class='add'>+	struct slic_hddr_wds *hdr = (struct slic_hddr_wds *)rcvbuf-&gt;data;</div><div class='add'>+</div><div class='add'>+	if (adapter-&gt;devid != SLIC_1GB_DEVICE_ID) {</div><div class='add'>+		if (hdr-&gt;frame_status14 &amp; VRHSTAT_802OE)</div><div class='add'>+			adapter-&gt;if_events.oflow802++;</div><div class='add'>+		if (hdr-&gt;frame_status14 &amp; VRHSTAT_TPOFLO)</div><div class='add'>+			adapter-&gt;if_events.Tprtoflow++;</div><div class='add'>+		if (hdr-&gt;frame_status_b14 &amp; VRHSTATB_802UE)</div><div class='add'>+			adapter-&gt;if_events.uflow802++;</div><div class='add'>+		if (hdr-&gt;frame_status_b14 &amp; VRHSTATB_RCVE) {</div><div class='add'>+			adapter-&gt;if_events.rcvearly++;</div><div class='add'>+			adapter-&gt;stats.rx_fifo_errors++;</div><div class='add'>+		}</div><div class='add'>+		if (hdr-&gt;frame_status_b14 &amp; VRHSTATB_BUFF) {</div><div class='add'>+			adapter-&gt;if_events.Bufov++;</div><div class='add'>+			adapter-&gt;stats.rx_over_errors++;</div><div class='add'>+		}</div><div class='add'>+		if (hdr-&gt;frame_status_b14 &amp; VRHSTATB_CARRE) {</div><div class='add'>+			adapter-&gt;if_events.Carre++;</div><div class='add'>+			adapter-&gt;stats.tx_carrier_errors++;</div><div class='add'>+		}</div><div class='add'>+		if (hdr-&gt;frame_status_b14 &amp; VRHSTATB_LONGE)</div><div class='add'>+			adapter-&gt;if_events.Longe++;</div><div class='add'>+		if (hdr-&gt;frame_status_b14 &amp; VRHSTATB_PREA)</div><div class='add'>+			adapter-&gt;if_events.Invp++;</div><div class='add'>+		if (hdr-&gt;frame_status_b14 &amp; VRHSTATB_CRC) {</div><div class='add'>+			adapter-&gt;if_events.Crc++;</div><div class='add'>+			adapter-&gt;stats.rx_crc_errors++;</div><div class='add'>+		}</div><div class='add'>+		if (hdr-&gt;frame_status_b14 &amp; VRHSTATB_DRBL)</div><div class='add'>+			adapter-&gt;if_events.Drbl++;</div><div class='add'>+		if (hdr-&gt;frame_status_b14 &amp; VRHSTATB_CODE)</div><div class='add'>+			adapter-&gt;if_events.Code++;</div><div class='add'>+		if (hdr-&gt;frame_status_b14 &amp; VRHSTATB_TPCSUM)</div><div class='add'>+			adapter-&gt;if_events.TpCsum++;</div><div class='add'>+		if (hdr-&gt;frame_status_b14 &amp; VRHSTATB_TPHLEN)</div><div class='add'>+			adapter-&gt;if_events.TpHlen++;</div><div class='add'>+		if (hdr-&gt;frame_status_b14 &amp; VRHSTATB_IPCSUM)</div><div class='add'>+			adapter-&gt;if_events.IpCsum++;</div><div class='add'>+		if (hdr-&gt;frame_status_b14 &amp; VRHSTATB_IPLERR)</div><div class='add'>+			adapter-&gt;if_events.IpLen++;</div><div class='add'>+		if (hdr-&gt;frame_status_b14 &amp; VRHSTATB_IPHERR)</div><div class='add'>+			adapter-&gt;if_events.IpHlen++;</div><div class='add'>+	} else {</div><div class='add'>+		if (hdr-&gt;frame_statusGB &amp; VGBSTAT_XPERR) {</div><div class='add'>+			u32 xerr = hdr-&gt;frame_statusGB &gt;&gt; VGBSTAT_XERRSHFT;</div><div class='add'>+</div><div class='add'>+			if (xerr == VGBSTAT_XCSERR)</div><div class='add'>+				adapter-&gt;if_events.TpCsum++;</div><div class='add'>+			if (xerr == VGBSTAT_XUFLOW)</div><div class='add'>+				adapter-&gt;if_events.Tprtoflow++;</div><div class='add'>+			if (xerr == VGBSTAT_XHLEN)</div><div class='add'>+				adapter-&gt;if_events.TpHlen++;</div><div class='add'>+		}</div><div class='add'>+		if (hdr-&gt;frame_statusGB &amp; VGBSTAT_NETERR) {</div><div class='add'>+			u32 nerr =</div><div class='add'>+			    (hdr-&gt;</div><div class='add'>+			     frame_statusGB &gt;&gt; VGBSTAT_NERRSHFT) &amp;</div><div class='add'>+			    VGBSTAT_NERRMSK;</div><div class='add'>+			if (nerr == VGBSTAT_NCSERR)</div><div class='add'>+				adapter-&gt;if_events.IpCsum++;</div><div class='add'>+			if (nerr == VGBSTAT_NUFLOW)</div><div class='add'>+				adapter-&gt;if_events.IpLen++;</div><div class='add'>+			if (nerr == VGBSTAT_NHLEN)</div><div class='add'>+				adapter-&gt;if_events.IpHlen++;</div><div class='add'>+		}</div><div class='add'>+		if (hdr-&gt;frame_statusGB &amp; VGBSTAT_LNKERR) {</div><div class='add'>+			u32 lerr = hdr-&gt;frame_statusGB &amp; VGBSTAT_LERRMSK;</div><div class='add'>+</div><div class='add'>+			if (lerr == VGBSTAT_LDEARLY)</div><div class='add'>+				adapter-&gt;if_events.rcvearly++;</div><div class='add'>+			if (lerr == VGBSTAT_LBOFLO)</div><div class='add'>+				adapter-&gt;if_events.Bufov++;</div><div class='add'>+			if (lerr == VGBSTAT_LCODERR)</div><div class='add'>+				adapter-&gt;if_events.Code++;</div><div class='add'>+			if (lerr == VGBSTAT_LDBLNBL)</div><div class='add'>+				adapter-&gt;if_events.Drbl++;</div><div class='add'>+			if (lerr == VGBSTAT_LCRCERR)</div><div class='add'>+				adapter-&gt;if_events.Crc++;</div><div class='add'>+			if (lerr == VGBSTAT_LOFLO)</div><div class='add'>+				adapter-&gt;if_events.oflow802++;</div><div class='add'>+			if (lerr == VGBSTAT_LUFLO)</div><div class='add'>+				adapter-&gt;if_events.uflow802++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define TCP_OFFLOAD_FRAME_PUSHFLAG  0x10000000</div><div class='add'>+#define M_FAST_PATH                 0x0040</div><div class='add'>+</div><div class='add'>+static void slic_rcv_handler(struct adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct slic_rcvbuf *rcvbuf;</div><div class='add'>+	u32 frames = 0;</div><div class='add'>+</div><div class='add'>+	while ((skb = slic_rcvqueue_getnext(adapter))) {</div><div class='add'>+		u32 rx_bytes;</div><div class='add'>+</div><div class='add'>+		ASSERT(skb-&gt;head);</div><div class='add'>+		rcvbuf = (struct slic_rcvbuf *)skb-&gt;head;</div><div class='add'>+		adapter-&gt;card-&gt;events++;</div><div class='add'>+		if (rcvbuf-&gt;status &amp; IRHDDR_ERR) {</div><div class='add'>+			adapter-&gt;rx_errors++;</div><div class='add'>+			slic_rcv_handle_error(adapter, rcvbuf);</div><div class='add'>+			slic_rcvqueue_reinsert(adapter, skb);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!slic_mac_filter(adapter, (struct ether_header *)</div><div class='add'>+					rcvbuf-&gt;data)) {</div><div class='add'>+#if 0</div><div class='add'>+			DBG_MSG</div><div class='add'>+			    ("slicoss: %s (%s) drop frame due to mac filter\n",</div><div class='add'>+			     __func__, adapter-&gt;netdev-&gt;name);</div><div class='add'>+#endif</div><div class='add'>+			slic_rcvqueue_reinsert(adapter, skb);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		skb_pull(skb, SLIC_RCVBUF_HEADSIZE);</div><div class='add'>+		rx_bytes = (rcvbuf-&gt;length &amp; IRHDDR_FLEN_MSK);</div><div class='add'>+		skb_put(skb, rx_bytes);</div><div class='add'>+		adapter-&gt;stats.rx_packets++;</div><div class='add'>+		adapter-&gt;stats.rx_bytes += rx_bytes;</div><div class='add'>+#if SLIC_OFFLOAD_IP_CHECKSUM</div><div class='add'>+		skb-&gt;ip_summed = CHECKSUM_UNNECESSARY;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+		skb-&gt;dev = adapter-&gt;netdev;</div><div class='add'>+		skb-&gt;protocol = eth_type_trans(skb, skb-&gt;dev);</div><div class='add'>+		netif_rx(skb);</div><div class='add'>+</div><div class='add'>+		++frames;</div><div class='add'>+#if SLIC_INTERRUPT_PROCESS_LIMIT</div><div class='add'>+		if (frames &gt;= SLIC_RCVQ_MAX_PROCESS_ISR) {</div><div class='add'>+			adapter-&gt;rcv_interrupt_yields++;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+#endif</div><div class='add'>+	}</div><div class='add'>+	adapter-&gt;max_isr_rcvs = max(adapter-&gt;max_isr_rcvs, frames);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void slic_xmit_complete(struct adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	struct slic_hostcmd *hcmd;</div><div class='add'>+	struct slic_rspbuf *rspbuf;</div><div class='add'>+	u32 frames = 0;</div><div class='add'>+	struct slic_handle_word slic_handle_word;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		rspbuf = slic_rspqueue_getnext(adapter);</div><div class='add'>+		if (!rspbuf)</div><div class='add'>+			break;</div><div class='add'>+		adapter-&gt;xmit_completes++;</div><div class='add'>+		adapter-&gt;card-&gt;events++;</div><div class='add'>+		/*</div><div class='add'>+		 Get the complete host command buffer</div><div class='add'>+		*/</div><div class='add'>+		slic_handle_word.handle_token = rspbuf-&gt;hosthandle;</div><div class='add'>+		ASSERT(slic_handle_word.handle_index);</div><div class='add'>+		ASSERT(slic_handle_word.handle_index &lt;= SLIC_CMDQ_MAXCMDS);</div><div class='add'>+		hcmd =</div><div class='add'>+		    (struct slic_hostcmd *)</div><div class='add'>+			adapter-&gt;slic_handles[slic_handle_word.handle_index].</div><div class='add'>+									address;</div><div class='add'>+/*      hcmd = (struct slic_hostcmd *) rspbuf-&gt;hosthandle; */</div><div class='add'>+		ASSERT(hcmd);</div><div class='add'>+		ASSERT(hcmd-&gt;pslic_handle ==</div><div class='add'>+		       &amp;adapter-&gt;slic_handles[slic_handle_word.handle_index]);</div><div class='add'>+/*</div><div class='add'>+      DBG_ERROR("xmit_complete (%s)   hcmd[%p]  hosthandle[%x]\n",</div><div class='add'>+		adapter-&gt;netdev-&gt;name, hcmd, hcmd-&gt;cmd64.hosthandle);</div><div class='add'>+      DBG_ERROR("    skb[%p] len %d  hcmdtype[%x]\n", hcmd-&gt;skb,</div><div class='add'>+		hcmd-&gt;skb-&gt;len, hcmd-&gt;type);</div><div class='add'>+*/</div><div class='add'>+		if (hcmd-&gt;type == SLIC_CMD_DUMB) {</div><div class='add'>+			if (hcmd-&gt;skb)</div><div class='add'>+				dev_kfree_skb_irq(hcmd-&gt;skb);</div><div class='add'>+			slic_cmdq_putdone_irq(adapter, hcmd);</div><div class='add'>+		}</div><div class='add'>+		rspbuf-&gt;status = 0;</div><div class='add'>+		rspbuf-&gt;hosthandle = 0;</div><div class='add'>+		frames++;</div><div class='add'>+	} while (1);</div><div class='add'>+	adapter-&gt;max_isr_xmits = max(adapter-&gt;max_isr_xmits, frames);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t slic_interrupt(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = (struct net_device *)dev_id;</div><div class='add'>+	struct adapter *adapter = (struct adapter *)netdev_priv(dev);</div><div class='add'>+	u32 isr;</div><div class='add'>+</div><div class='add'>+	if ((adapter-&gt;pshmem) &amp;&amp; (adapter-&gt;pshmem-&gt;isr)) {</div><div class='add'>+		WRITE_REG(adapter-&gt;slic_regs-&gt;slic_icr, ICR_INT_MASK, FLUSH);</div><div class='add'>+		isr = adapter-&gt;isrcopy = adapter-&gt;pshmem-&gt;isr;</div><div class='add'>+		adapter-&gt;pshmem-&gt;isr = 0;</div><div class='add'>+		adapter-&gt;num_isrs++;</div><div class='add'>+		switch (adapter-&gt;card-&gt;state) {</div><div class='add'>+		case CARD_UP:</div><div class='add'>+			if (isr &amp; ~ISR_IO) {</div><div class='add'>+				if (isr &amp; ISR_ERR) {</div><div class='add'>+					adapter-&gt;error_interrupts++;</div><div class='add'>+					if (isr &amp; ISR_RMISS) {</div><div class='add'>+						int count;</div><div class='add'>+						int pre_count;</div><div class='add'>+						int errors;</div><div class='add'>+</div><div class='add'>+						struct slic_rcvqueue *rcvq =</div><div class='add'>+						    &amp;adapter-&gt;rcvqueue;</div><div class='add'>+</div><div class='add'>+						adapter-&gt;</div><div class='add'>+						    error_rmiss_interrupts++;</div><div class='add'>+						if (!rcvq-&gt;errors)</div><div class='add'>+							rcv_count = rcvq-&gt;count;</div><div class='add'>+						pre_count = rcvq-&gt;count;</div><div class='add'>+						errors = rcvq-&gt;errors;</div><div class='add'>+</div><div class='add'>+						while (rcvq-&gt;count &lt;</div><div class='add'>+						       SLIC_RCVQ_FILLTHRESH) {</div><div class='add'>+							count =</div><div class='add'>+							    slic_rcvqueue_fill</div><div class='add'>+							    (adapter);</div><div class='add'>+							if (!count)</div><div class='add'>+								break;</div><div class='add'>+						}</div><div class='add'>+						DBG_MSG</div><div class='add'>+						    ("(%s): [%x] ISR_RMISS \</div><div class='add'>+						     initial[%x] pre[%x] \</div><div class='add'>+						     errors[%x] \</div><div class='add'>+						     post_count[%x]\n",</div><div class='add'>+						     adapter-&gt;netdev-&gt;name,</div><div class='add'>+						     isr, rcv_count, pre_count,</div><div class='add'>+						     errors, rcvq-&gt;count);</div><div class='add'>+					} else if (isr &amp; ISR_XDROP) {</div><div class='add'>+						DBG_ERROR</div><div class='add'>+						    ("isr &amp; ISR_ERR [%x] \</div><div class='add'>+						     ISR_XDROP \n",</div><div class='add'>+						     isr);</div><div class='add'>+					} else {</div><div class='add'>+						DBG_ERROR</div><div class='add'>+						    ("isr &amp; ISR_ERR [%x]\n",</div><div class='add'>+						     isr);</div><div class='add'>+					}</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+				if (isr &amp; ISR_LEVENT) {</div><div class='add'>+					/*DBG_MSG("%s (%s)  ISR_LEVENT \n",</div><div class='add'>+					   __func__, adapter-&gt;netdev-&gt;name);*/</div><div class='add'>+					adapter-&gt;linkevent_interrupts++;</div><div class='add'>+					slic_link_event_handler(adapter);</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+				if ((isr &amp; ISR_UPC) ||</div><div class='add'>+				    (isr &amp; ISR_UPCERR) || (isr &amp; ISR_UPCBSY)) {</div><div class='add'>+					adapter-&gt;upr_interrupts++;</div><div class='add'>+					slic_upr_request_complete(adapter, isr);</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (isr &amp; ISR_RCV) {</div><div class='add'>+				adapter-&gt;rcv_interrupts++;</div><div class='add'>+				slic_rcv_handler(adapter);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (isr &amp; ISR_CMD) {</div><div class='add'>+				adapter-&gt;xmit_interrupts++;</div><div class='add'>+				slic_xmit_complete(adapter);</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case CARD_DOWN:</div><div class='add'>+			if ((isr &amp; ISR_UPC) ||</div><div class='add'>+			    (isr &amp; ISR_UPCERR) || (isr &amp; ISR_UPCBSY)) {</div><div class='add'>+				adapter-&gt;upr_interrupts++;</div><div class='add'>+				slic_upr_request_complete(adapter, isr);</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		default:</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		adapter-&gt;isrcopy = 0;</div><div class='add'>+		adapter-&gt;all_reg_writes += 2;</div><div class='add'>+		adapter-&gt;isr_reg_writes++;</div><div class='add'>+		WRITE_REG(adapter-&gt;slic_regs-&gt;slic_isr, 0, FLUSH);</div><div class='add'>+	} else {</div><div class='add'>+		adapter-&gt;false_interrupts++;</div><div class='add'>+	}</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * slic_link_event_handler -</div><div class='add'>+ *</div><div class='add'>+ * Initiate a link configuration sequence.  The link configuration begins</div><div class='add'>+ * by issuing a READ_LINK_STATUS command to the Utility Processor on the</div><div class='add'>+ * SLIC.  Since the command finishes asynchronously, the slic_upr_comlete</div><div class='add'>+ * routine will follow it up witha UP configuration write command, which</div><div class='add'>+ * will also complete asynchronously.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+static void slic_link_event_handler(struct adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	int status;</div><div class='add'>+	struct slic_shmem *pshmem;</div><div class='add'>+</div><div class='add'>+	if (adapter-&gt;state != ADAPT_UP) {</div><div class='add'>+		/* Adapter is not operational.  Ignore.  */</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pshmem = (struct slic_shmem *)adapter-&gt;phys_shmem;</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_X86_64)</div><div class='add'>+/*</div><div class='add'>+    DBG_MSG("slic_event_handler  pshmem-&gt;linkstatus[%x]  pshmem[%p]\n   \</div><div class='add'>+	&amp;linkstatus[%p] &amp;isr[%p]\n", adapter-&gt;pshmem-&gt;linkstatus, pshmem,</div><div class='add'>+	&amp;pshmem-&gt;linkstatus, &amp;pshmem-&gt;isr);</div><div class='add'>+*/</div><div class='add'>+	status = slic_upr_request(adapter,</div><div class='add'>+				  SLIC_UPR_RLSR,</div><div class='add'>+				  SLIC_GET_ADDR_LOW(&amp;pshmem-&gt;linkstatus),</div><div class='add'>+				  SLIC_GET_ADDR_HIGH(&amp;pshmem-&gt;linkstatus),</div><div class='add'>+				  0, 0);</div><div class='add'>+#elif defined(CONFIG_X86)</div><div class='add'>+	status = slic_upr_request(adapter, SLIC_UPR_RLSR,</div><div class='add'>+		(u32) &amp;pshmem-&gt;linkstatus,	/* no 4GB wrap guaranteed */</div><div class='add'>+				  0, 0, 0);</div><div class='add'>+#else</div><div class='add'>+	Stop compilation;</div><div class='add'>+#endif</div><div class='add'>+	ASSERT((status == STATUS_SUCCESS) || (status == STATUS_PENDING));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void slic_init_cleanup(struct adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	DBG_MSG("slicoss: %s ENTER adapter[%p] ", __func__, adapter);</div><div class='add'>+	if (adapter-&gt;intrregistered) {</div><div class='add'>+		DBG_MSG("FREE_IRQ ");</div><div class='add'>+		adapter-&gt;intrregistered = 0;</div><div class='add'>+		free_irq(adapter-&gt;netdev-&gt;irq, adapter-&gt;netdev);</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+	if (adapter-&gt;pshmem) {</div><div class='add'>+		DBG_MSG("FREE_SHMEM ");</div><div class='add'>+		DBG_MSG("adapter[%p] port %d pshmem[%p] FreeShmem ",</div><div class='add'>+			adapter, adapter-&gt;port, (void *) adapter-&gt;pshmem);</div><div class='add'>+		pci_free_consistent(adapter-&gt;pcidev,</div><div class='add'>+				    sizeof(struct slic_shmem *),</div><div class='add'>+				    adapter-&gt;pshmem, adapter-&gt;phys_shmem);</div><div class='add'>+		adapter-&gt;pshmem = NULL;</div><div class='add'>+		adapter-&gt;phys_shmem = (dma_addr_t) NULL;</div><div class='add'>+	}</div><div class='add'>+#if SLIC_GET_STATS_TIMER_ENABLED</div><div class='add'>+	if (adapter-&gt;statstimerset) {</div><div class='add'>+		DBG_MSG("statstimer ");</div><div class='add'>+		adapter-&gt;statstimerset = 0;</div><div class='add'>+		del_timer(&amp;adapter-&gt;statstimer);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+#if !SLIC_DUMP_ENABLED &amp;&amp; SLIC_PING_TIMER_ENABLED</div><div class='add'>+/*#if SLIC_DUMP_ENABLED &amp;&amp; SLIC_PING_TIMER_ENABLED*/</div><div class='add'>+	if (adapter-&gt;pingtimerset) {</div><div class='add'>+		DBG_MSG("pingtimer ");</div><div class='add'>+		adapter-&gt;pingtimerset = 0;</div><div class='add'>+		del_timer(&amp;adapter-&gt;pingtimer);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	slic_rspqueue_free(adapter);</div><div class='add'>+	slic_cmdq_free(adapter);</div><div class='add'>+	slic_rcvqueue_free(adapter);</div><div class='add'>+</div><div class='add'>+	DBG_MSG("\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#if SLIC_GET_STATS_ENABLED</div><div class='add'>+static struct net_device_stats *slic_get_stats(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct adapter *adapter = (struct adapter *)netdev_priv(dev);</div><div class='add'>+	struct net_device_stats *stats;</div><div class='add'>+</div><div class='add'>+	ASSERT(adapter);</div><div class='add'>+	stats = &amp;adapter-&gt;stats;</div><div class='add'>+	stats-&gt;collisions = adapter-&gt;slic_stats.iface.xmit_collisions;</div><div class='add'>+	stats-&gt;rx_errors = adapter-&gt;slic_stats.iface.rcv_errors;</div><div class='add'>+	stats-&gt;tx_errors = adapter-&gt;slic_stats.iface.xmt_errors;</div><div class='add'>+	stats-&gt;rx_missed_errors = adapter-&gt;slic_stats.iface.rcv_discards;</div><div class='add'>+	stats-&gt;tx_heartbeat_errors = 0;</div><div class='add'>+	stats-&gt;tx_aborted_errors = 0;</div><div class='add'>+	stats-&gt;tx_window_errors = 0;</div><div class='add'>+	stats-&gt;tx_fifo_errors = 0;</div><div class='add'>+	stats-&gt;rx_frame_errors = 0;</div><div class='add'>+	stats-&gt;rx_length_errors = 0;</div><div class='add'>+	return &amp;adapter-&gt;stats;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  Allocate a mcast_address structure to hold the multicast address.</div><div class='add'>+ *  Link it in.</div><div class='add'>+ */</div><div class='add'>+static int slic_mcast_add_list(struct adapter *adapter, char *address)</div><div class='add'>+{</div><div class='add'>+	struct mcast_address *mcaddr, *mlist;</div><div class='add'>+	bool equaladdr;</div><div class='add'>+</div><div class='add'>+	/* Check to see if it already exists */</div><div class='add'>+	mlist = adapter-&gt;mcastaddrs;</div><div class='add'>+	while (mlist) {</div><div class='add'>+		ETHER_EQ_ADDR(mlist-&gt;address, address, equaladdr);</div><div class='add'>+		if (equaladdr)</div><div class='add'>+			return STATUS_SUCCESS;</div><div class='add'>+		mlist = mlist-&gt;next;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Doesn't already exist.  Allocate a structure to hold it */</div><div class='add'>+	mcaddr = kmalloc(sizeof(struct mcast_address), GFP_ATOMIC);</div><div class='add'>+	if (mcaddr == NULL)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	memcpy(mcaddr-&gt;address, address, 6);</div><div class='add'>+</div><div class='add'>+	mcaddr-&gt;next = adapter-&gt;mcastaddrs;</div><div class='add'>+	adapter-&gt;mcastaddrs = mcaddr;</div><div class='add'>+</div><div class='add'>+	return STATUS_SUCCESS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Functions to obtain the CRC corresponding to the destination mac address.</div><div class='add'>+ * This is a standard ethernet CRC in that it is a 32-bit, reflected CRC using</div><div class='add'>+ * the polynomial:</div><div class='add'>+ *   x^32 + x^26 + x^23 + x^22 + x^16 + x^12 + x^11 + x^10 + x^8 + x^7 + x^5 +</div><div class='add'>+ *   x^4 + x^2 + x^1.</div><div class='add'>+ *</div><div class='add'>+ * After the CRC for the 6 bytes is generated (but before the value is</div><div class='add'>+ * complemented),</div><div class='add'>+ * we must then transpose the value and return bits 30-23.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+static u32 slic_crc_table[256];	/* Table of CRCs for all possible byte values */</div><div class='add'>+static u32 slic_crc_init;	/* Is table initialized */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  Contruct the CRC32 table</div><div class='add'>+ */</div><div class='add'>+static void slic_mcast_init_crc32(void)</div><div class='add'>+{</div><div class='add'>+	u32 c;		/*  CRC shit reg                 */</div><div class='add'>+	u32 e = 0;		/*  Poly X-or pattern            */</div><div class='add'>+	int i;			/*  counter                      */</div><div class='add'>+	int k;			/*  byte being shifted into crc  */</div><div class='add'>+</div><div class='add'>+	static int p[] = { 0, 1, 2, 4, 5, 7, 8, 10, 11, 12, 16, 22, 23, 26 };</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; sizeof(p) / sizeof(int); i++)</div><div class='add'>+		e |= 1L &lt;&lt; (31 - p[i]);</div><div class='add'>+</div><div class='add'>+	for (i = 1; i &lt; 256; i++) {</div><div class='add'>+		c = i;</div><div class='add'>+		for (k = 8; k; k--)</div><div class='add'>+			c = c &amp; 1 ? (c &gt;&gt; 1) ^ e : c &gt;&gt; 1;</div><div class='add'>+		slic_crc_table[i] = c;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  Return the MAC hast as described above.</div><div class='add'>+ */</div><div class='add'>+static unsigned char slic_mcast_get_mac_hash(char *macaddr)</div><div class='add'>+{</div><div class='add'>+	u32 crc;</div><div class='add'>+	char *p;</div><div class='add'>+	int i;</div><div class='add'>+	unsigned char machash = 0;</div><div class='add'>+</div><div class='add'>+	if (!slic_crc_init) {</div><div class='add'>+		slic_mcast_init_crc32();</div><div class='add'>+		slic_crc_init = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	crc = 0xFFFFFFFF;	/* Preload shift register, per crc-32 spec */</div><div class='add'>+	for (i = 0, p = macaddr; i &lt; 6; ++p, ++i)</div><div class='add'>+		crc = (crc &gt;&gt; 8) ^ slic_crc_table[(crc ^ *p) &amp; 0xFF];</div><div class='add'>+</div><div class='add'>+	/* Return bits 1-8, transposed */</div><div class='add'>+	for (i = 1; i &lt; 9; i++)</div><div class='add'>+		machash |= (((crc &gt;&gt; i) &amp; 1) &lt;&lt; (8 - i));</div><div class='add'>+</div><div class='add'>+	return machash;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void slic_mcast_set_bit(struct adapter *adapter, char *address)</div><div class='add'>+{</div><div class='add'>+	unsigned char crcpoly;</div><div class='add'>+</div><div class='add'>+	/* Get the CRC polynomial for the mac address */</div><div class='add'>+	crcpoly = slic_mcast_get_mac_hash(address);</div><div class='add'>+</div><div class='add'>+	/* We only have space on the SLIC for 64 entries.  Lop</div><div class='add'>+	 * off the top two bits. (2^6 = 64)</div><div class='add'>+	 */</div><div class='add'>+	crcpoly &amp;= 0x3F;</div><div class='add'>+</div><div class='add'>+	/* OR in the new bit into our 64 bit mask. */</div><div class='add'>+	adapter-&gt;mcastmask |= (u64) 1 &lt;&lt; crcpoly;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void slic_mcast_set_list(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct adapter *adapter = (struct adapter *)netdev_priv(dev);</div><div class='add'>+	int status = STATUS_SUCCESS;</div><div class='add'>+	int i;</div><div class='add'>+	char *addresses;</div><div class='add'>+	struct dev_mc_list *mc_list = dev-&gt;mc_list;</div><div class='add'>+	int mc_count = dev-&gt;mc_count;</div><div class='add'>+</div><div class='add'>+	ASSERT(adapter);</div><div class='add'>+</div><div class='add'>+	for (i = 1; i &lt;= mc_count; i++) {</div><div class='add'>+		addresses = (char *) &amp;mc_list-&gt;dmi_addr;</div><div class='add'>+		if (mc_list-&gt;dmi_addrlen == 6) {</div><div class='add'>+			status = slic_mcast_add_list(adapter, addresses);</div><div class='add'>+			if (status != STATUS_SUCCESS)</div><div class='add'>+				break;</div><div class='add'>+		} else {</div><div class='add'>+			status = -EINVAL;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		slic_mcast_set_bit(adapter, addresses);</div><div class='add'>+		mc_list = mc_list-&gt;next;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBG_MSG("%s a-&gt;devflags_prev[%x] dev-&gt;flags[%x] status[%x]\n",</div><div class='add'>+		__func__, adapter-&gt;devflags_prev, dev-&gt;flags, status);</div><div class='add'>+	if (adapter-&gt;devflags_prev != dev-&gt;flags) {</div><div class='add'>+		adapter-&gt;macopts = MAC_DIRECTED;</div><div class='add'>+		if (dev-&gt;flags) {</div><div class='add'>+			if (dev-&gt;flags &amp; IFF_BROADCAST)</div><div class='add'>+				adapter-&gt;macopts |= MAC_BCAST;</div><div class='add'>+			if (dev-&gt;flags &amp; IFF_PROMISC)</div><div class='add'>+				adapter-&gt;macopts |= MAC_PROMISC;</div><div class='add'>+			if (dev-&gt;flags &amp; IFF_ALLMULTI)</div><div class='add'>+				adapter-&gt;macopts |= MAC_ALLMCAST;</div><div class='add'>+			if (dev-&gt;flags &amp; IFF_MULTICAST)</div><div class='add'>+				adapter-&gt;macopts |= MAC_MCAST;</div><div class='add'>+		}</div><div class='add'>+		adapter-&gt;devflags_prev = dev-&gt;flags;</div><div class='add'>+		DBG_MSG("%s call slic_config_set adapter-&gt;macopts[%x]\n",</div><div class='add'>+			__func__, adapter-&gt;macopts);</div><div class='add'>+		slic_config_set(adapter, TRUE);</div><div class='add'>+	} else {</div><div class='add'>+		if (status == STATUS_SUCCESS)</div><div class='add'>+			slic_mcast_set_mask(adapter);</div><div class='add'>+	}</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void slic_mcast_set_mask(struct adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	__iomem struct slic_regs *slic_regs = adapter-&gt;slic_regs;</div><div class='add'>+</div><div class='add'>+	DBG_MSG("%s ENTER (%s) macopts[%x] mask[%llx]\n", __func__,</div><div class='add'>+		adapter-&gt;netdev-&gt;name, (uint) adapter-&gt;macopts,</div><div class='add'>+		adapter-&gt;mcastmask);</div><div class='add'>+</div><div class='add'>+	if (adapter-&gt;macopts &amp; (MAC_ALLMCAST | MAC_PROMISC)) {</div><div class='add'>+		/* Turn on all multicast addresses. We have to do this for</div><div class='add'>+		 * promiscuous mode as well as ALLMCAST mode.  It saves the</div><div class='add'>+		 * Microcode from having to keep state about the MAC</div><div class='add'>+		 * configuration.</div><div class='add'>+		 */</div><div class='add'>+/*              DBG_MSG("slicoss: %s macopts = MAC_ALLMCAST | MAC_PROMISC\n\</div><div class='add'>+		SLUT MODE!!!\n",__func__); */</div><div class='add'>+		WRITE_REG(slic_regs-&gt;slic_mcastlow, 0xFFFFFFFF, FLUSH);</div><div class='add'>+		WRITE_REG(slic_regs-&gt;slic_mcasthigh, 0xFFFFFFFF, FLUSH);</div><div class='add'>+/*        DBG_MSG("%s (%s) WRITE to slic_regs slic_mcastlow&amp;high 0xFFFFFFFF\n",</div><div class='add'>+		_func__, adapter-&gt;netdev-&gt;name); */</div><div class='add'>+	} else {</div><div class='add'>+		/* Commit our multicast mast to the SLIC by writing to the</div><div class='add'>+		 * multicast address mask registers</div><div class='add'>+		 */</div><div class='add'>+		DBG_MSG("%s (%s) WRITE mcastlow[%x] mcasthigh[%x]\n",</div><div class='add'>+			__func__, adapter-&gt;netdev-&gt;name,</div><div class='add'>+			((ulong) (adapter-&gt;mcastmask &amp; 0xFFFFFFFF)),</div><div class='add'>+			((ulong) ((adapter-&gt;mcastmask &gt;&gt; 32) &amp; 0xFFFFFFFF)));</div><div class='add'>+</div><div class='add'>+		WRITE_REG(slic_regs-&gt;slic_mcastlow,</div><div class='add'>+			  (u32) (adapter-&gt;mcastmask &amp; 0xFFFFFFFF), FLUSH);</div><div class='add'>+		WRITE_REG(slic_regs-&gt;slic_mcasthigh,</div><div class='add'>+			  (u32) ((adapter-&gt;mcastmask &gt;&gt; 32) &amp; 0xFFFFFFFF),</div><div class='add'>+			  FLUSH);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void slic_timer_ping(ulong dev)</div><div class='add'>+{</div><div class='add'>+	struct adapter *adapter;</div><div class='add'>+	struct sliccard *card;</div><div class='add'>+</div><div class='add'>+	ASSERT(dev);</div><div class='add'>+	adapter = (struct adapter *)((struct net_device *) dev)-&gt;priv;</div><div class='add'>+	ASSERT(adapter);</div><div class='add'>+	card = adapter-&gt;card;</div><div class='add'>+	ASSERT(card);</div><div class='add'>+#if !SLIC_DUMP_ENABLED</div><div class='add'>+/*#if SLIC_DUMP_ENABLED*/</div><div class='add'>+	if ((adapter-&gt;state == ADAPT_UP) &amp;&amp; (card-&gt;state == CARD_UP)) {</div><div class='add'>+		int status;</div><div class='add'>+</div><div class='add'>+		if (card-&gt;pingstatus != ISR_PINGMASK) {</div><div class='add'>+			if (errormsg++ &lt; 5) {</div><div class='add'>+				DBG_MSG</div><div class='add'>+				    ("%s (%s) CARD HAS CRASHED  PING_status == \</div><div class='add'>+				     %x ERRORMSG# %d\n",</div><div class='add'>+				     __func__, adapter-&gt;netdev-&gt;name,</div><div class='add'>+				     card-&gt;pingstatus, errormsg);</div><div class='add'>+			}</div><div class='add'>+			/*   ASSERT(card-&gt;pingstatus == ISR_PINGMASK); */</div><div class='add'>+		} else {</div><div class='add'>+			if (goodmsg++ &lt; 5) {</div><div class='add'>+				DBG_MSG</div><div class='add'>+				    ("slicoss: %s (%s) PING_status == %x \</div><div class='add'>+				     GOOD!!!!!!!! msg# %d\n",</div><div class='add'>+				     __func__, adapter-&gt;netdev-&gt;name,</div><div class='add'>+				     card-&gt;pingstatus, errormsg);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		card-&gt;pingstatus = 0;</div><div class='add'>+		status = slic_upr_request(adapter, SLIC_UPR_PING, 0, 0, 0, 0);</div><div class='add'>+</div><div class='add'>+		ASSERT(status == 0);</div><div class='add'>+	} else {</div><div class='add'>+		DBG_MSG("slicoss %s (%s) adapter[%p] NOT UP!!!!\n",</div><div class='add'>+			__func__, adapter-&gt;netdev-&gt;name, adapter);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	adapter-&gt;pingtimer.expires =</div><div class='add'>+	    jiffies + SLIC_SECS_TO_JIFFS(PING_TIMER_INTERVAL);</div><div class='add'>+	add_timer(&amp;adapter-&gt;pingtimer);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void slic_if_stop_queue(struct adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	netif_stop_queue(adapter-&gt;netdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void slic_if_start_queue(struct adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	netif_start_queue(adapter-&gt;netdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  slic_if_init</div><div class='add'>+ *</div><div class='add'>+ *  Perform initialization of our slic interface.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+static int slic_if_init(struct adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	struct sliccard *card = adapter-&gt;card;</div><div class='add'>+	struct net_device *dev = adapter-&gt;netdev;</div><div class='add'>+	__iomem struct slic_regs *slic_regs = adapter-&gt;slic_regs;</div><div class='add'>+	struct slic_shmem *pshmem;</div><div class='add'>+	int status = 0;</div><div class='add'>+</div><div class='add'>+	ASSERT(card);</div><div class='add'>+	DBG_MSG("slicoss: %s (%s) ENTER states[%d:%d:%d:%d] flags[%x]\n",</div><div class='add'>+		__func__, adapter-&gt;netdev-&gt;name,</div><div class='add'>+		adapter-&gt;queues_initialized, adapter-&gt;state, adapter-&gt;linkstate,</div><div class='add'>+		card-&gt;state, dev-&gt;flags);</div><div class='add'>+</div><div class='add'>+	/* adapter should be down at this point */</div><div class='add'>+	if (adapter-&gt;state != ADAPT_DOWN) {</div><div class='add'>+		DBG_ERROR("slic_if_init adapter-&gt;state != ADAPT_DOWN\n");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+	ASSERT(adapter-&gt;linkstate == LINK_DOWN);</div><div class='add'>+</div><div class='add'>+	adapter-&gt;devflags_prev = dev-&gt;flags;</div><div class='add'>+	adapter-&gt;macopts = MAC_DIRECTED;</div><div class='add'>+	if (dev-&gt;flags) {</div><div class='add'>+		DBG_MSG("slicoss: %s (%s) Set MAC options: ", __func__,</div><div class='add'>+			adapter-&gt;netdev-&gt;name);</div><div class='add'>+		if (dev-&gt;flags &amp; IFF_BROADCAST) {</div><div class='add'>+			adapter-&gt;macopts |= MAC_BCAST;</div><div class='add'>+			DBG_MSG("BCAST ");</div><div class='add'>+		}</div><div class='add'>+		if (dev-&gt;flags &amp; IFF_PROMISC) {</div><div class='add'>+			adapter-&gt;macopts |= MAC_PROMISC;</div><div class='add'>+			DBG_MSG("PROMISC ");</div><div class='add'>+		}</div><div class='add'>+		if (dev-&gt;flags &amp; IFF_ALLMULTI) {</div><div class='add'>+			adapter-&gt;macopts |= MAC_ALLMCAST;</div><div class='add'>+			DBG_MSG("ALL_MCAST ");</div><div class='add'>+		}</div><div class='add'>+		if (dev-&gt;flags &amp; IFF_MULTICAST) {</div><div class='add'>+			adapter-&gt;macopts |= MAC_MCAST;</div><div class='add'>+			DBG_MSG("MCAST ");</div><div class='add'>+		}</div><div class='add'>+		DBG_MSG("\n");</div><div class='add'>+	}</div><div class='add'>+	status = slic_adapter_allocresources(adapter);</div><div class='add'>+	if (status != STATUS_SUCCESS) {</div><div class='add'>+		DBG_ERROR</div><div class='add'>+		    ("slic_if_init: slic_adapter_allocresources FAILED %x\n",</div><div class='add'>+		     status);</div><div class='add'>+		slic_adapter_freeresources(adapter);</div><div class='add'>+		return status;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!adapter-&gt;queues_initialized) {</div><div class='add'>+		DBG_MSG("slicoss: %s call slic_rspqueue_init\n", __func__);</div><div class='add'>+		if (slic_rspqueue_init(adapter))</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		DBG_MSG</div><div class='add'>+		    ("slicoss: %s call slic_cmdq_init adapter[%p] port %d \n",</div><div class='add'>+		     __func__, adapter, adapter-&gt;port);</div><div class='add'>+		if (slic_cmdq_init(adapter))</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		DBG_MSG</div><div class='add'>+		    ("slicoss: %s call slic_rcvqueue_init adapter[%p] \</div><div class='add'>+		     port %d \n", __func__, adapter, adapter-&gt;port);</div><div class='add'>+		if (slic_rcvqueue_init(adapter))</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		adapter-&gt;queues_initialized = 1;</div><div class='add'>+	}</div><div class='add'>+	DBG_MSG("slicoss: %s disable interrupts(slic)\n", __func__);</div><div class='add'>+</div><div class='add'>+	WRITE_REG(slic_regs-&gt;slic_icr, ICR_INT_OFF, FLUSH);</div><div class='add'>+	mdelay(1);</div><div class='add'>+</div><div class='add'>+	if (!adapter-&gt;isp_initialized) {</div><div class='add'>+		pshmem = (struct slic_shmem *)adapter-&gt;phys_shmem;</div><div class='add'>+</div><div class='add'>+		spin_lock_irqsave(&amp;adapter-&gt;bit64reglock.lock,</div><div class='add'>+					adapter-&gt;bit64reglock.flags);</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_X86_64)</div><div class='add'>+		WRITE_REG(slic_regs-&gt;slic_addr_upper,</div><div class='add'>+			  SLIC_GET_ADDR_HIGH(&amp;pshmem-&gt;isr), DONT_FLUSH);</div><div class='add'>+		WRITE_REG(slic_regs-&gt;slic_isp,</div><div class='add'>+			  SLIC_GET_ADDR_LOW(&amp;pshmem-&gt;isr), FLUSH);</div><div class='add'>+#elif defined(CONFIG_X86)</div><div class='add'>+		WRITE_REG(slic_regs-&gt;slic_addr_upper, (u32) 0, DONT_FLUSH);</div><div class='add'>+		WRITE_REG(slic_regs-&gt;slic_isp, (u32) &amp;pshmem-&gt;isr, FLUSH);</div><div class='add'>+#else</div><div class='add'>+		Stop Compilations</div><div class='add'>+#endif</div><div class='add'>+		spin_unlock_irqrestore(&amp;adapter-&gt;bit64reglock.lock,</div><div class='add'>+					adapter-&gt;bit64reglock.flags);</div><div class='add'>+		adapter-&gt;isp_initialized = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	adapter-&gt;state = ADAPT_UP;</div><div class='add'>+	if (!card-&gt;loadtimerset) {</div><div class='add'>+		init_timer(&amp;card-&gt;loadtimer);</div><div class='add'>+		card-&gt;loadtimer.expires =</div><div class='add'>+		    jiffies + SLIC_SECS_TO_JIFFS(SLIC_LOADTIMER_PERIOD);</div><div class='add'>+		card-&gt;loadtimer.data = (ulong) card;</div><div class='add'>+		card-&gt;loadtimer.function = &amp;slic_timer_load_check;</div><div class='add'>+		add_timer(&amp;card-&gt;loadtimer);</div><div class='add'>+</div><div class='add'>+		card-&gt;loadtimerset = 1;</div><div class='add'>+	}</div><div class='add'>+#if SLIC_GET_STATS_TIMER_ENABLED</div><div class='add'>+	if (!adapter-&gt;statstimerset) {</div><div class='add'>+		DBG_MSG("slicoss: %s start getstats_timer(slic)\n",</div><div class='add'>+			__func__);</div><div class='add'>+		init_timer(&amp;adapter-&gt;statstimer);</div><div class='add'>+		adapter-&gt;statstimer.expires =</div><div class='add'>+		    jiffies + SLIC_SECS_TO_JIFFS(STATS_TIMER_INTERVAL);</div><div class='add'>+		adapter-&gt;statstimer.data = (ulong) adapter-&gt;netdev;</div><div class='add'>+		adapter-&gt;statstimer.function = &amp;slic_timer_get_stats;</div><div class='add'>+		add_timer(&amp;adapter-&gt;statstimer);</div><div class='add'>+		adapter-&gt;statstimerset = 1;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+#if !SLIC_DUMP_ENABLED &amp;&amp; SLIC_PING_TIMER_ENABLED</div><div class='add'>+/*#if SLIC_DUMP_ENABLED &amp;&amp; SLIC_PING_TIMER_ENABLED*/</div><div class='add'>+	if (!adapter-&gt;pingtimerset) {</div><div class='add'>+		DBG_MSG("slicoss: %s start card_ping_timer(slic)\n",</div><div class='add'>+			__func__);</div><div class='add'>+		init_timer(&amp;adapter-&gt;pingtimer);</div><div class='add'>+		adapter-&gt;pingtimer.expires =</div><div class='add'>+		    jiffies + SLIC_SECS_TO_JIFFS(PING_TIMER_INTERVAL);</div><div class='add'>+		adapter-&gt;pingtimer.data = (ulong) dev;</div><div class='add'>+		adapter-&gt;pingtimer.function = &amp;slic_timer_ping;</div><div class='add'>+		add_timer(&amp;adapter-&gt;pingtimer);</div><div class='add'>+		adapter-&gt;pingtimerset = 1;</div><div class='add'>+		adapter-&gt;card-&gt;pingstatus = ISR_PINGMASK;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 *    clear any pending events, then enable interrupts</div><div class='add'>+	 */</div><div class='add'>+	DBG_MSG("slicoss: %s ENABLE interrupts(slic)\n", __func__);</div><div class='add'>+	adapter-&gt;isrcopy = 0;</div><div class='add'>+	adapter-&gt;pshmem-&gt;isr = 0;</div><div class='add'>+	WRITE_REG(slic_regs-&gt;slic_isr, 0, FLUSH);</div><div class='add'>+	WRITE_REG(slic_regs-&gt;slic_icr, ICR_INT_ON, FLUSH);</div><div class='add'>+</div><div class='add'>+	DBG_MSG("slicoss: %s call slic_link_config(slic)\n", __func__);</div><div class='add'>+	slic_link_config(adapter, LINK_AUTOSPEED, LINK_AUTOD);</div><div class='add'>+	slic_link_event_handler(adapter);</div><div class='add'>+</div><div class='add'>+	DBG_MSG("slicoss: %s EXIT\n", __func__);</div><div class='add'>+	return STATUS_SUCCESS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void slic_unmap_mmio_space(struct adapter *adapter)</div><div class='add'>+{</div><div class='add'>+#if LINUX_FREES_ADAPTER_RESOURCES</div><div class='add'>+	if (adapter-&gt;slic_regs)</div><div class='add'>+		iounmap(adapter-&gt;slic_regs);</div><div class='add'>+	adapter-&gt;slic_regs = NULL;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int slic_adapter_allocresources(struct adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	if (!adapter-&gt;intrregistered) {</div><div class='add'>+		int retval;</div><div class='add'>+</div><div class='add'>+		DBG_MSG</div><div class='add'>+		    ("slicoss: %s AllocAdaptRsrcs adapter[%p] shmem[%p] \</div><div class='add'>+		     phys_shmem[%p] dev-&gt;irq[%x] %x\n",</div><div class='add'>+		     __func__, adapter, adapter-&gt;pshmem,</div><div class='add'>+		     (void *)adapter-&gt;phys_shmem, adapter-&gt;netdev-&gt;irq,</div><div class='add'>+		     NR_IRQS);</div><div class='add'>+</div><div class='add'>+		spin_unlock_irqrestore(&amp;slic_global.driver_lock.lock,</div><div class='add'>+					slic_global.driver_lock.flags);</div><div class='add'>+</div><div class='add'>+		retval = request_irq(adapter-&gt;netdev-&gt;irq,</div><div class='add'>+				     &amp;slic_interrupt,</div><div class='add'>+				     IRQF_SHARED,</div><div class='add'>+				     adapter-&gt;netdev-&gt;name, adapter-&gt;netdev);</div><div class='add'>+</div><div class='add'>+		spin_lock_irqsave(&amp;slic_global.driver_lock.lock,</div><div class='add'>+					slic_global.driver_lock.flags);</div><div class='add'>+</div><div class='add'>+		if (retval) {</div><div class='add'>+			DBG_ERROR("slicoss: request_irq (%s) FAILED [%x]\n",</div><div class='add'>+				  adapter-&gt;netdev-&gt;name, retval);</div><div class='add'>+			return retval;</div><div class='add'>+		}</div><div class='add'>+		adapter-&gt;intrregistered = 1;</div><div class='add'>+		DBG_MSG</div><div class='add'>+		    ("slicoss: %s AllocAdaptRsrcs adapter[%p] shmem[%p] \</div><div class='add'>+		     pshmem[%p] dev-&gt;irq[%x]\n",</div><div class='add'>+		     __func__, adapter, adapter-&gt;pshmem,</div><div class='add'>+		     (void *)adapter-&gt;pshmem, adapter-&gt;netdev-&gt;irq);</div><div class='add'>+	}</div><div class='add'>+	return STATUS_SUCCESS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void slic_config_pci(struct pci_dev *pcidev)</div><div class='add'>+{</div><div class='add'>+	u16 pci_command;</div><div class='add'>+	u16 new_command;</div><div class='add'>+</div><div class='add'>+	pci_read_config_word(pcidev, PCI_COMMAND, &amp;pci_command);</div><div class='add'>+	DBG_MSG("slicoss: %s  PCI command[%4.4x]\n", __func__, pci_command);</div><div class='add'>+</div><div class='add'>+	new_command = pci_command | PCI_COMMAND_MASTER</div><div class='add'>+	    | PCI_COMMAND_MEMORY</div><div class='add'>+	    | PCI_COMMAND_INVALIDATE</div><div class='add'>+	    | PCI_COMMAND_PARITY | PCI_COMMAND_SERR | PCI_COMMAND_FAST_BACK;</div><div class='add'>+	if (pci_command != new_command) {</div><div class='add'>+		DBG_MSG("%s -- Updating PCI COMMAND register %4.4x-&gt;%4.4x.\n",</div><div class='add'>+			__func__, pci_command, new_command);</div><div class='add'>+		pci_write_config_word(pcidev, PCI_COMMAND, new_command);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void slic_adapter_freeresources(struct adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	DBG_MSG("slicoss: %s ENTER adapter[%p]\n", __func__, adapter);</div><div class='add'>+	slic_init_cleanup(adapter);</div><div class='add'>+	memset(&amp;adapter-&gt;stats, 0, sizeof(struct net_device_stats));</div><div class='add'>+	adapter-&gt;error_interrupts = 0;</div><div class='add'>+	adapter-&gt;rcv_interrupts = 0;</div><div class='add'>+	adapter-&gt;xmit_interrupts = 0;</div><div class='add'>+	adapter-&gt;linkevent_interrupts = 0;</div><div class='add'>+	adapter-&gt;upr_interrupts = 0;</div><div class='add'>+	adapter-&gt;num_isrs = 0;</div><div class='add'>+	adapter-&gt;xmit_completes = 0;</div><div class='add'>+	adapter-&gt;rcv_broadcasts = 0;</div><div class='add'>+	adapter-&gt;rcv_multicasts = 0;</div><div class='add'>+	adapter-&gt;rcv_unicasts = 0;</div><div class='add'>+	DBG_MSG("slicoss: %s EXIT\n", __func__);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  slic_link_config</div><div class='add'>+ *</div><div class='add'>+ *  Write phy control to configure link duplex/speed</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+static void slic_link_config(struct adapter *adapter,</div><div class='add'>+		      u32 linkspeed, u32 linkduplex)</div><div class='add'>+{</div><div class='add'>+	u32 speed;</div><div class='add'>+	u32 duplex;</div><div class='add'>+	u32 phy_config;</div><div class='add'>+	u32 phy_advreg;</div><div class='add'>+	u32 phy_gctlreg;</div><div class='add'>+</div><div class='add'>+	if (adapter-&gt;state != ADAPT_UP) {</div><div class='add'>+		DBG_MSG</div><div class='add'>+		    ("%s (%s) ADAPT Not up yet, Return! speed[%x] duplex[%x]\n",</div><div class='add'>+		     __func__, adapter-&gt;netdev-&gt;name, linkspeed,</div><div class='add'>+		     linkduplex);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	DBG_MSG("slicoss: %s (%s) slic_link_config: speed[%x] duplex[%x]\n",</div><div class='add'>+		__func__, adapter-&gt;netdev-&gt;name, linkspeed, linkduplex);</div><div class='add'>+</div><div class='add'>+	ASSERT((adapter-&gt;devid == SLIC_1GB_DEVICE_ID)</div><div class='add'>+	       || (adapter-&gt;devid == SLIC_2GB_DEVICE_ID));</div><div class='add'>+</div><div class='add'>+	if (linkspeed &gt; LINK_1000MB)</div><div class='add'>+		linkspeed = LINK_AUTOSPEED;</div><div class='add'>+	if (linkduplex &gt; LINK_AUTOD)</div><div class='add'>+		linkduplex = LINK_AUTOD;</div><div class='add'>+</div><div class='add'>+	if ((linkspeed == LINK_AUTOSPEED) || (linkspeed == LINK_1000MB)) {</div><div class='add'>+		if (adapter-&gt;flags &amp; ADAPT_FLAGS_FIBERMEDIA) {</div><div class='add'>+			/*  We've got a fiber gigabit interface, and register</div><div class='add'>+			 *  4 is different in fiber mode than in copper mode</div><div class='add'>+			 */</div><div class='add'>+</div><div class='add'>+			/* advertise FD only @1000 Mb */</div><div class='add'>+			phy_advreg = (MIICR_REG_4 | (PAR_ADV1000XFD));</div><div class='add'>+			/* enable PAUSE frames        */</div><div class='add'>+			phy_advreg |= PAR_ASYMPAUSE_FIBER;</div><div class='add'>+			WRITE_REG(adapter-&gt;slic_regs-&gt;slic_wphy, phy_advreg,</div><div class='add'>+				  FLUSH);</div><div class='add'>+</div><div class='add'>+			if (linkspeed == LINK_AUTOSPEED) {</div><div class='add'>+				/* reset phy, enable auto-neg  */</div><div class='add'>+				phy_config =</div><div class='add'>+				    (MIICR_REG_PCR |</div><div class='add'>+				     (PCR_RESET | PCR_AUTONEG |</div><div class='add'>+				      PCR_AUTONEG_RST));</div><div class='add'>+				WRITE_REG(adapter-&gt;slic_regs-&gt;slic_wphy,</div><div class='add'>+					  phy_config, FLUSH);</div><div class='add'>+			} else {	/* forced 1000 Mb FD*/</div><div class='add'>+				/* power down phy to break link</div><div class='add'>+				   this may not work) */</div><div class='add'>+				phy_config = (MIICR_REG_PCR | PCR_POWERDOWN);</div><div class='add'>+				WRITE_REG(adapter-&gt;slic_regs-&gt;slic_wphy,</div><div class='add'>+					  phy_config, FLUSH);</div><div class='add'>+				/* wait, Marvell says 1 sec,</div><div class='add'>+				   try to get away with 10 ms  */</div><div class='add'>+				mdelay(10);</div><div class='add'>+</div><div class='add'>+				/* disable auto-neg, set speed/duplex,</div><div class='add'>+				   soft reset phy, powerup */</div><div class='add'>+				phy_config =</div><div class='add'>+				    (MIICR_REG_PCR |</div><div class='add'>+				     (PCR_RESET | PCR_SPEED_1000 |</div><div class='add'>+				      PCR_DUPLEX_FULL));</div><div class='add'>+				WRITE_REG(adapter-&gt;slic_regs-&gt;slic_wphy,</div><div class='add'>+					  phy_config, FLUSH);</div><div class='add'>+			}</div><div class='add'>+		} else {	/* copper gigabit */</div><div class='add'>+</div><div class='add'>+			/* Auto-Negotiate or 1000 Mb must be auto negotiated</div><div class='add'>+			 * We've got a copper gigabit interface, and</div><div class='add'>+			 * register 4 is different in copper mode than</div><div class='add'>+			 * in fiber mode</div><div class='add'>+			 */</div><div class='add'>+			if (linkspeed == LINK_AUTOSPEED) {</div><div class='add'>+				/* advertise 10/100 Mb modes   */</div><div class='add'>+				phy_advreg =</div><div class='add'>+				    (MIICR_REG_4 |</div><div class='add'>+				     (PAR_ADV100FD | PAR_ADV100HD | PAR_ADV10FD</div><div class='add'>+				      | PAR_ADV10HD));</div><div class='add'>+			} else {</div><div class='add'>+			/* linkspeed == LINK_1000MB -</div><div class='add'>+			   don't advertise 10/100 Mb modes  */</div><div class='add'>+				phy_advreg = MIICR_REG_4;</div><div class='add'>+			}</div><div class='add'>+			/* enable PAUSE frames  */</div><div class='add'>+			phy_advreg |= PAR_ASYMPAUSE;</div><div class='add'>+			/* required by the Cicada PHY  */</div><div class='add'>+			phy_advreg |= PAR_802_3;</div><div class='add'>+			WRITE_REG(adapter-&gt;slic_regs-&gt;slic_wphy, phy_advreg,</div><div class='add'>+				  FLUSH);</div><div class='add'>+			/* advertise FD only @1000 Mb  */</div><div class='add'>+			phy_gctlreg = (MIICR_REG_9 | (PGC_ADV1000FD));</div><div class='add'>+			WRITE_REG(adapter-&gt;slic_regs-&gt;slic_wphy, phy_gctlreg,</div><div class='add'>+				  FLUSH);</div><div class='add'>+</div><div class='add'>+			if (adapter-&gt;subsysid != SLIC_1GB_CICADA_SUBSYS_ID) {</div><div class='add'>+				/* if a Marvell PHY</div><div class='add'>+				   enable auto crossover */</div><div class='add'>+				phy_config =</div><div class='add'>+				    (MIICR_REG_16 | (MRV_REG16_XOVERON));</div><div class='add'>+				WRITE_REG(adapter-&gt;slic_regs-&gt;slic_wphy,</div><div class='add'>+					  phy_config, FLUSH);</div><div class='add'>+</div><div class='add'>+				/* reset phy, enable auto-neg  */</div><div class='add'>+				phy_config =</div><div class='add'>+				    (MIICR_REG_PCR |</div><div class='add'>+				     (PCR_RESET | PCR_AUTONEG |</div><div class='add'>+				      PCR_AUTONEG_RST));</div><div class='add'>+				WRITE_REG(adapter-&gt;slic_regs-&gt;slic_wphy,</div><div class='add'>+					  phy_config, FLUSH);</div><div class='add'>+			} else {	/* it's a Cicada PHY  */</div><div class='add'>+				/* enable and restart auto-neg (don't reset)  */</div><div class='add'>+				phy_config =</div><div class='add'>+				    (MIICR_REG_PCR |</div><div class='add'>+				     (PCR_AUTONEG | PCR_AUTONEG_RST));</div><div class='add'>+				WRITE_REG(adapter-&gt;slic_regs-&gt;slic_wphy,</div><div class='add'>+					  phy_config, FLUSH);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		/* Forced 10/100  */</div><div class='add'>+		if (linkspeed == LINK_10MB)</div><div class='add'>+			speed = 0;</div><div class='add'>+		else</div><div class='add'>+			speed = PCR_SPEED_100;</div><div class='add'>+		if (linkduplex == LINK_HALFD)</div><div class='add'>+			duplex = 0;</div><div class='add'>+		else</div><div class='add'>+			duplex = PCR_DUPLEX_FULL;</div><div class='add'>+</div><div class='add'>+		if (adapter-&gt;subsysid != SLIC_1GB_CICADA_SUBSYS_ID) {</div><div class='add'>+			/* if a Marvell PHY</div><div class='add'>+			   disable auto crossover  */</div><div class='add'>+			phy_config = (MIICR_REG_16 | (MRV_REG16_XOVEROFF));</div><div class='add'>+			WRITE_REG(adapter-&gt;slic_regs-&gt;slic_wphy, phy_config,</div><div class='add'>+				  FLUSH);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* power down phy to break link (this may not work)  */</div><div class='add'>+		phy_config = (MIICR_REG_PCR | (PCR_POWERDOWN | speed | duplex));</div><div class='add'>+		WRITE_REG(adapter-&gt;slic_regs-&gt;slic_wphy, phy_config, FLUSH);</div><div class='add'>+</div><div class='add'>+		/* wait, Marvell says 1 sec, try to get away with 10 ms */</div><div class='add'>+		mdelay(10);</div><div class='add'>+</div><div class='add'>+		if (adapter-&gt;subsysid != SLIC_1GB_CICADA_SUBSYS_ID) {</div><div class='add'>+			/* if a Marvell PHY</div><div class='add'>+			   disable auto-neg, set speed,</div><div class='add'>+			   soft reset phy, powerup */</div><div class='add'>+			phy_config =</div><div class='add'>+			    (MIICR_REG_PCR | (PCR_RESET | speed | duplex));</div><div class='add'>+			WRITE_REG(adapter-&gt;slic_regs-&gt;slic_wphy, phy_config,</div><div class='add'>+				  FLUSH);</div><div class='add'>+		} else {	/* it's a Cicada PHY  */</div><div class='add'>+			/* disable auto-neg, set speed, powerup  */</div><div class='add'>+			phy_config = (MIICR_REG_PCR | (speed | duplex));</div><div class='add'>+			WRITE_REG(adapter-&gt;slic_regs-&gt;slic_wphy, phy_config,</div><div class='add'>+				  FLUSH);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBG_MSG</div><div class='add'>+	    ("slicoss: %s (%s) EXIT slic_link_config : state[%d] \</div><div class='add'>+	    phy_config[%x]\n", __func__, adapter-&gt;netdev-&gt;name, adapter-&gt;state,</div><div class='add'>+	    phy_config);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void slic_card_cleanup(struct sliccard *card)</div><div class='add'>+{</div><div class='add'>+	DBG_MSG("slicoss: %s ENTER\n", __func__);</div><div class='add'>+</div><div class='add'>+#if SLIC_DUMP_ENABLED</div><div class='add'>+	if (card-&gt;dumpbuffer) {</div><div class='add'>+		card-&gt;dumpbuffer_phys = 0;</div><div class='add'>+		card-&gt;dumpbuffer_physl = 0;</div><div class='add'>+		card-&gt;dumpbuffer_physh = 0;</div><div class='add'>+		kfree(card-&gt;dumpbuffer);</div><div class='add'>+		card-&gt;dumpbuffer = NULL;</div><div class='add'>+	}</div><div class='add'>+	if (card-&gt;cmdbuffer) {</div><div class='add'>+		card-&gt;cmdbuffer_phys = 0;</div><div class='add'>+		card-&gt;cmdbuffer_physl = 0;</div><div class='add'>+		card-&gt;cmdbuffer_physh = 0;</div><div class='add'>+		kfree(card-&gt;cmdbuffer);</div><div class='add'>+		card-&gt;cmdbuffer = NULL;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	if (card-&gt;loadtimerset) {</div><div class='add'>+		card-&gt;loadtimerset = 0;</div><div class='add'>+		del_timer(&amp;card-&gt;loadtimer);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	slic_debug_card_destroy(card);</div><div class='add'>+</div><div class='add'>+	kfree(card);</div><div class='add'>+	DBG_MSG("slicoss: %s EXIT\n", __func__);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int slic_card_download_gbrcv(struct adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	__iomem struct slic_regs *slic_regs = adapter-&gt;slic_regs;</div><div class='add'>+	u32 codeaddr;</div><div class='add'>+	unsigned char *instruction = NULL;</div><div class='add'>+	u32 rcvucodelen = 0;</div><div class='add'>+</div><div class='add'>+	switch (adapter-&gt;devid) {</div><div class='add'>+	case SLIC_2GB_DEVICE_ID:</div><div class='add'>+		instruction = (unsigned char *)&amp;OasisRcvUCode[0];</div><div class='add'>+		rcvucodelen = OasisRcvUCodeLen;</div><div class='add'>+		break;</div><div class='add'>+	case SLIC_1GB_DEVICE_ID:</div><div class='add'>+		instruction = (unsigned char *)&amp;GBRcvUCode[0];</div><div class='add'>+		rcvucodelen = GBRcvUCodeLen;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ASSERT(0);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* start download */</div><div class='add'>+	WRITE_REG(slic_regs-&gt;slic_rcv_wcs, SLIC_RCVWCS_BEGIN, FLUSH);</div><div class='add'>+</div><div class='add'>+	/* download the rcv sequencer ucode */</div><div class='add'>+	for (codeaddr = 0; codeaddr &lt; rcvucodelen; codeaddr++) {</div><div class='add'>+		/* write out instruction address */</div><div class='add'>+		WRITE_REG(slic_regs-&gt;slic_rcv_wcs, codeaddr, FLUSH);</div><div class='add'>+</div><div class='add'>+		/* write out the instruction data low addr */</div><div class='add'>+		WRITE_REG(slic_regs-&gt;slic_rcv_wcs,</div><div class='add'>+			  (u32) *(u32 *) instruction, FLUSH);</div><div class='add'>+		instruction += 4;</div><div class='add'>+</div><div class='add'>+		/* write out the instruction data high addr */</div><div class='add'>+		WRITE_REG(slic_regs-&gt;slic_rcv_wcs, (u32) *instruction,</div><div class='add'>+			  FLUSH);</div><div class='add'>+		instruction += 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* download finished */</div><div class='add'>+	WRITE_REG(slic_regs-&gt;slic_rcv_wcs, SLIC_RCVWCS_FINISH, FLUSH);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int slic_card_download(struct adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	u32 section;</div><div class='add'>+	int thissectionsize;</div><div class='add'>+	int codeaddr;</div><div class='add'>+	__iomem struct slic_regs *slic_regs = adapter-&gt;slic_regs;</div><div class='add'>+	u32 *instruction = NULL;</div><div class='add'>+	u32 *lastinstruct = NULL;</div><div class='add'>+	u32 *startinstruct = NULL;</div><div class='add'>+	unsigned char *nextinstruct;</div><div class='add'>+	u32 baseaddress;</div><div class='add'>+	u32 failure;</div><div class='add'>+	u32 i;</div><div class='add'>+	u32 numsects = 0;</div><div class='add'>+	u32 sectsize[3];</div><div class='add'>+	u32 sectstart[3];</div><div class='add'>+</div><div class='add'>+/*      DBG_MSG ("slicoss: %s (%s) adapter[%p] card[%p] devid[%x] \</div><div class='add'>+	jiffies[%lx] cpu %d\n", __func__, adapter-&gt;netdev-&gt;name, adapter,</div><div class='add'>+	    adapter-&gt;card, adapter-&gt;devid,jiffies, smp_processor_id()); */</div><div class='add'>+</div><div class='add'>+	switch (adapter-&gt;devid) {</div><div class='add'>+	case SLIC_2GB_DEVICE_ID:</div><div class='add'>+/*      DBG_MSG ("slicoss: %s devid==SLIC_2GB_DEVICE_ID sections[%x]\n",</div><div class='add'>+	__func__, (uint) ONumSections); */</div><div class='add'>+		numsects = ONumSections;</div><div class='add'>+		for (i = 0; i &lt; numsects; i++) {</div><div class='add'>+			sectsize[i] = OSectionSize[i];</div><div class='add'>+			sectstart[i] = OSectionStart[i];</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case SLIC_1GB_DEVICE_ID:</div><div class='add'>+/*              DBG_MSG ("slicoss: %s devid==SLIC_1GB_DEVICE_ID sections[%x]\n",</div><div class='add'>+		__func__, (uint) MNumSections); */</div><div class='add'>+		numsects = MNumSections;</div><div class='add'>+		for (i = 0; i &lt; numsects; i++) {</div><div class='add'>+			sectsize[i] = MSectionSize[i];</div><div class='add'>+			sectstart[i] = MSectionStart[i];</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ASSERT(0);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ASSERT(numsects &lt;= 3);</div><div class='add'>+</div><div class='add'>+	for (section = 0; section &lt; numsects; section++) {</div><div class='add'>+		switch (adapter-&gt;devid) {</div><div class='add'>+		case SLIC_2GB_DEVICE_ID:</div><div class='add'>+			instruction = (u32 *) &amp;OasisUCode[section][0];</div><div class='add'>+			baseaddress = sectstart[section];</div><div class='add'>+			thissectionsize = sectsize[section] &gt;&gt; 3;</div><div class='add'>+			lastinstruct =</div><div class='add'>+			    (u32 *) &amp;OasisUCode[section][sectsize[section] -</div><div class='add'>+							     8];</div><div class='add'>+			break;</div><div class='add'>+		case SLIC_1GB_DEVICE_ID:</div><div class='add'>+			instruction = (u32 *) &amp;MojaveUCode[section][0];</div><div class='add'>+			baseaddress = sectstart[section];</div><div class='add'>+			thissectionsize = sectsize[section] &gt;&gt; 3;</div><div class='add'>+			lastinstruct =</div><div class='add'>+			    (u32 *) &amp;MojaveUCode[section][sectsize[section]</div><div class='add'>+							      - 8];</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			ASSERT(0);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		baseaddress = sectstart[section];</div><div class='add'>+		thissectionsize = sectsize[section] &gt;&gt; 3;</div><div class='add'>+</div><div class='add'>+		for (codeaddr = 0; codeaddr &lt; thissectionsize; codeaddr++) {</div><div class='add'>+			startinstruct = instruction;</div><div class='add'>+			nextinstruct = ((unsigned char *)instruction) + 8;</div><div class='add'>+			/* Write out instruction address */</div><div class='add'>+			WRITE_REG(slic_regs-&gt;slic_wcs, baseaddress + codeaddr,</div><div class='add'>+				  FLUSH);</div><div class='add'>+			/* Write out instruction to low addr */</div><div class='add'>+			WRITE_REG(slic_regs-&gt;slic_wcs, *instruction, FLUSH);</div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='add'>+			instruction = (u32 *)((unsigned char *)instruction + 4);</div><div class='add'>+#else</div><div class='add'>+			instruction++;</div><div class='add'>+#endif</div><div class='add'>+			/* Write out instruction to high addr */</div><div class='add'>+			WRITE_REG(slic_regs-&gt;slic_wcs, *instruction, FLUSH);</div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='add'>+			instruction = (u32 *)((unsigned char *)instruction + 4);</div><div class='add'>+#else</div><div class='add'>+			instruction++;</div><div class='add'>+#endif</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (section = 0; section &lt; numsects; section++) {</div><div class='add'>+		switch (adapter-&gt;devid) {</div><div class='add'>+		case SLIC_2GB_DEVICE_ID:</div><div class='add'>+			instruction = (u32 *)&amp;OasisUCode[section][0];</div><div class='add'>+			break;</div><div class='add'>+		case SLIC_1GB_DEVICE_ID:</div><div class='add'>+			instruction = (u32 *)&amp;MojaveUCode[section][0];</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			ASSERT(0);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		baseaddress = sectstart[section];</div><div class='add'>+		if (baseaddress &lt; 0x8000)</div><div class='add'>+			continue;</div><div class='add'>+		thissectionsize = sectsize[section] &gt;&gt; 3;</div><div class='add'>+</div><div class='add'>+/*        DBG_MSG ("slicoss: COMPARE secton[%x] baseaddr[%x] sectnsize[%x]\n",</div><div class='add'>+		(uint)section,baseaddress,thissectionsize);*/</div><div class='add'>+</div><div class='add'>+		for (codeaddr = 0; codeaddr &lt; thissectionsize; codeaddr++) {</div><div class='add'>+			/* Write out instruction address */</div><div class='add'>+			WRITE_REG(slic_regs-&gt;slic_wcs,</div><div class='add'>+				  SLIC_WCS_COMPARE | (baseaddress + codeaddr),</div><div class='add'>+				  FLUSH);</div><div class='add'>+			/* Write out instruction to low addr */</div><div class='add'>+			WRITE_REG(slic_regs-&gt;slic_wcs, *instruction, FLUSH);</div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='add'>+			instruction = (u32 *)((unsigned char *)instruction + 4);</div><div class='add'>+#else</div><div class='add'>+			instruction++;</div><div class='add'>+#endif</div><div class='add'>+			/* Write out instruction to high addr */</div><div class='add'>+			WRITE_REG(slic_regs-&gt;slic_wcs, *instruction, FLUSH);</div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='add'>+			instruction = (u32 *)((unsigned char *)instruction + 4);</div><div class='add'>+#else</div><div class='add'>+			instruction++;</div><div class='add'>+#endif</div><div class='add'>+			/* Check SRAM location zero. If it is non-zero. Abort.*/</div><div class='add'>+			failure = readl((u32 __iomem *)&amp;slic_regs-&gt;slic_reset);</div><div class='add'>+			if (failure) {</div><div class='add'>+				DBG_MSG</div><div class='add'>+				    ("slicoss: %s FAILURE EXIT codeaddr[%x] \</div><div class='add'>+				    thissectionsize[%x] failure[%x]\n",</div><div class='add'>+				     __func__, codeaddr, thissectionsize,</div><div class='add'>+				     failure);</div><div class='add'>+</div><div class='add'>+				return -EIO;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+/*    DBG_MSG ("slicoss: Compare done\n");*/</div><div class='add'>+</div><div class='add'>+	/* Everything OK, kick off the card */</div><div class='add'>+	mdelay(10);</div><div class='add'>+	WRITE_REG(slic_regs-&gt;slic_wcs, SLIC_WCS_START, FLUSH);</div><div class='add'>+</div><div class='add'>+	/* stall for 20 ms, long enough for ucode to init card</div><div class='add'>+	   and reach mainloop */</div><div class='add'>+	mdelay(20);</div><div class='add'>+</div><div class='add'>+	DBG_MSG("slicoss: %s (%s) EXIT adapter[%p] card[%p]\n",</div><div class='add'>+		__func__, adapter-&gt;netdev-&gt;name, adapter, adapter-&gt;card);</div><div class='add'>+</div><div class='add'>+	return STATUS_SUCCESS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void slic_adapter_set_hwaddr(struct adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	struct sliccard *card = adapter-&gt;card;</div><div class='add'>+</div><div class='add'>+/*  DBG_MSG ("%s ENTER card-&gt;config_set[%x] port[%d] physport[%d] funct#[%d]\n",</div><div class='add'>+    __func__, card-&gt;config_set, adapter-&gt;port, adapter-&gt;physport,</div><div class='add'>+    adapter-&gt;functionnumber);</div><div class='add'>+</div><div class='add'>+    slic_dbg_macaddrs(adapter); */</div><div class='add'>+</div><div class='add'>+	if ((adapter-&gt;card) &amp;&amp; (card-&gt;config_set)) {</div><div class='add'>+		memcpy(adapter-&gt;macaddr,</div><div class='add'>+		       card-&gt;config.MacInfo[adapter-&gt;functionnumber].macaddrA,</div><div class='add'>+		       sizeof(struct slic_config_mac));</div><div class='add'>+/*      DBG_MSG ("%s AFTER copying from config.macinfo into currmacaddr\n",</div><div class='add'>+	__func__);</div><div class='add'>+	slic_dbg_macaddrs(adapter);*/</div><div class='add'>+		if (!(adapter-&gt;currmacaddr[0] || adapter-&gt;currmacaddr[1] ||</div><div class='add'>+		      adapter-&gt;currmacaddr[2] || adapter-&gt;currmacaddr[3] ||</div><div class='add'>+		      adapter-&gt;currmacaddr[4] || adapter-&gt;currmacaddr[5])) {</div><div class='add'>+			memcpy(adapter-&gt;currmacaddr, adapter-&gt;macaddr, 6);</div><div class='add'>+		}</div><div class='add'>+		if (adapter-&gt;netdev) {</div><div class='add'>+			memcpy(adapter-&gt;netdev-&gt;dev_addr, adapter-&gt;currmacaddr,</div><div class='add'>+			       6);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+/*  DBG_MSG ("%s EXIT port %d\n", __func__, adapter-&gt;port);</div><div class='add'>+    slic_dbg_macaddrs(adapter); */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void slic_intagg_set(struct adapter *adapter, u32 value)</div><div class='add'>+{</div><div class='add'>+	__iomem struct slic_regs *slic_regs = adapter-&gt;slic_regs;</div><div class='add'>+</div><div class='add'>+	WRITE_REG(slic_regs-&gt;slic_intagg, value, FLUSH);</div><div class='add'>+	adapter-&gt;card-&gt;loadlevel_current = value;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int slic_card_init(struct sliccard *card, struct adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	__iomem struct slic_regs *slic_regs = adapter-&gt;slic_regs;</div><div class='add'>+	struct slic_eeprom *peeprom;</div><div class='add'>+	struct oslic_eeprom *pOeeprom;</div><div class='add'>+	dma_addr_t phys_config;</div><div class='add'>+	u32 phys_configh;</div><div class='add'>+	u32 phys_configl;</div><div class='add'>+	u32 i = 0;</div><div class='add'>+	struct slic_shmem *pshmem;</div><div class='add'>+	int status;</div><div class='add'>+	uint macaddrs = card-&gt;card_size;</div><div class='add'>+	ushort eecodesize;</div><div class='add'>+	ushort dramsize;</div><div class='add'>+	ushort ee_chksum;</div><div class='add'>+	ushort calc_chksum;</div><div class='add'>+	struct slic_config_mac *pmac;</div><div class='add'>+	unsigned char fruformat;</div><div class='add'>+	unsigned char oemfruformat;</div><div class='add'>+	struct atk_fru *patkfru;</div><div class='add'>+	union oemfru *poemfru;</div><div class='add'>+</div><div class='add'>+	DBG_MSG</div><div class='add'>+	    ("slicoss: %s ENTER card[%p] adapter[%p] card-&gt;state[%x] \</div><div class='add'>+	    size[%d]\n", __func__, card, adapter, card-&gt;state, card-&gt;card_size);</div><div class='add'>+</div><div class='add'>+	/* Reset everything except PCI configuration space */</div><div class='add'>+	slic_soft_reset(adapter);</div><div class='add'>+</div><div class='add'>+	/* Download the microcode */</div><div class='add'>+	status = slic_card_download(adapter);</div><div class='add'>+</div><div class='add'>+	if (status != STATUS_SUCCESS) {</div><div class='add'>+		DBG_ERROR("SLIC download failed bus %d slot %d\n",</div><div class='add'>+			  (uint) adapter-&gt;busnumber,</div><div class='add'>+			  (uint) adapter-&gt;slotnumber);</div><div class='add'>+		return status;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!card-&gt;config_set) {</div><div class='add'>+		peeprom = pci_alloc_consistent(adapter-&gt;pcidev,</div><div class='add'>+					       sizeof(struct slic_eeprom),</div><div class='add'>+					       &amp;phys_config);</div><div class='add'>+</div><div class='add'>+		phys_configl = SLIC_GET_ADDR_LOW(phys_config);</div><div class='add'>+		phys_configh = SLIC_GET_ADDR_HIGH(phys_config);</div><div class='add'>+</div><div class='add'>+		DBG_MSG("slicoss: %s Eeprom info  adapter [%p]\n    "</div><div class='add'>+			"size        [%x]\n    peeprom     [%p]\n    "</div><div class='add'>+			"phys_config [%p]\n    phys_configl[%x]\n    "</div><div class='add'>+			"phys_configh[%x]\n",</div><div class='add'>+			__func__, adapter,</div><div class='add'>+			(u32)sizeof(struct slic_eeprom),</div><div class='add'>+			peeprom, (void *) phys_config, phys_configl,</div><div class='add'>+			phys_configh);</div><div class='add'>+		if (!peeprom) {</div><div class='add'>+			DBG_ERROR</div><div class='add'>+			    ("SLIC eeprom read failed to get memory bus %d \</div><div class='add'>+			    slot %d\n",</div><div class='add'>+			     (uint) adapter-&gt;busnumber,</div><div class='add'>+			     (uint) adapter-&gt;slotnumber);</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		} else {</div><div class='add'>+			memset(peeprom, 0, sizeof(struct slic_eeprom));</div><div class='add'>+		}</div><div class='add'>+		WRITE_REG(slic_regs-&gt;slic_icr, ICR_INT_OFF, FLUSH);</div><div class='add'>+		mdelay(1);</div><div class='add'>+		pshmem = (struct slic_shmem *)adapter-&gt;phys_shmem;</div><div class='add'>+</div><div class='add'>+		spin_lock_irqsave(&amp;adapter-&gt;bit64reglock.lock,</div><div class='add'>+					adapter-&gt;bit64reglock.flags);</div><div class='add'>+		WRITE_REG(slic_regs-&gt;slic_addr_upper, 0, DONT_FLUSH);</div><div class='add'>+		WRITE_REG(slic_regs-&gt;slic_isp,</div><div class='add'>+			  SLIC_GET_ADDR_LOW(&amp;pshmem-&gt;isr), FLUSH);</div><div class='add'>+		spin_unlock_irqrestore(&amp;adapter-&gt;bit64reglock.lock,</div><div class='add'>+					adapter-&gt;bit64reglock.flags);</div><div class='add'>+</div><div class='add'>+		slic_config_get(adapter, phys_configl, phys_configh);</div><div class='add'>+</div><div class='add'>+		for (;;) {</div><div class='add'>+			if (adapter-&gt;pshmem-&gt;isr) {</div><div class='add'>+				DBG_MSG("%s shmem[%p] shmem-&gt;isr[%x]\n",</div><div class='add'>+					__func__, adapter-&gt;pshmem,</div><div class='add'>+					adapter-&gt;pshmem-&gt;isr);</div><div class='add'>+</div><div class='add'>+				if (adapter-&gt;pshmem-&gt;isr &amp; ISR_UPC) {</div><div class='add'>+					adapter-&gt;pshmem-&gt;isr = 0;</div><div class='add'>+					WRITE_REG64(adapter,</div><div class='add'>+						    slic_regs-&gt;slic_isp,</div><div class='add'>+						    0,</div><div class='add'>+						    slic_regs-&gt;slic_addr_upper,</div><div class='add'>+						    0, FLUSH);</div><div class='add'>+					WRITE_REG(slic_regs-&gt;slic_isr, 0,</div><div class='add'>+						  FLUSH);</div><div class='add'>+</div><div class='add'>+					slic_upr_request_complete(adapter, 0);</div><div class='add'>+					break;</div><div class='add'>+				} else {</div><div class='add'>+					adapter-&gt;pshmem-&gt;isr = 0;</div><div class='add'>+					WRITE_REG(slic_regs-&gt;slic_isr, 0,</div><div class='add'>+						  FLUSH);</div><div class='add'>+				}</div><div class='add'>+			} else {</div><div class='add'>+				mdelay(1);</div><div class='add'>+				i++;</div><div class='add'>+				if (i &gt; 5000) {</div><div class='add'>+					DBG_ERROR</div><div class='add'>+					    ("SLIC: %d config data fetch timed\</div><div class='add'>+					      out!\n", adapter-&gt;port);</div><div class='add'>+					DBG_MSG("%s shmem[%p] shmem-&gt;isr[%x]\n",</div><div class='add'>+						__func__, adapter-&gt;pshmem,</div><div class='add'>+						adapter-&gt;pshmem-&gt;isr);</div><div class='add'>+					WRITE_REG64(adapter,</div><div class='add'>+						    slic_regs-&gt;slic_isp, 0,</div><div class='add'>+						    slic_regs-&gt;slic_addr_upper,</div><div class='add'>+						    0, FLUSH);</div><div class='add'>+					return -EINVAL;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		switch (adapter-&gt;devid) {</div><div class='add'>+		/* Oasis card */</div><div class='add'>+		case SLIC_2GB_DEVICE_ID:</div><div class='add'>+			/* extract EEPROM data and pointers to EEPROM data */</div><div class='add'>+			pOeeprom = (struct oslic_eeprom *) peeprom;</div><div class='add'>+			eecodesize = pOeeprom-&gt;EecodeSize;</div><div class='add'>+			dramsize = pOeeprom-&gt;DramSize;</div><div class='add'>+			pmac = pOeeprom-&gt;MacInfo;</div><div class='add'>+			fruformat = pOeeprom-&gt;FruFormat;</div><div class='add'>+			patkfru = &amp;pOeeprom-&gt;AtkFru;</div><div class='add'>+			oemfruformat = pOeeprom-&gt;OemFruFormat;</div><div class='add'>+			poemfru = &amp;pOeeprom-&gt;OemFru;</div><div class='add'>+			macaddrs = 2;</div><div class='add'>+			/* Minor kludge for Oasis card</div><div class='add'>+			     get 2 MAC addresses from the</div><div class='add'>+			     EEPROM to ensure that function 1</div><div class='add'>+			     gets the Port 1 MAC address */</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			/* extract EEPROM data and pointers to EEPROM data */</div><div class='add'>+			eecodesize = peeprom-&gt;EecodeSize;</div><div class='add'>+			dramsize = peeprom-&gt;DramSize;</div><div class='add'>+			pmac = peeprom-&gt;u2.mac.MacInfo;</div><div class='add'>+			fruformat = peeprom-&gt;FruFormat;</div><div class='add'>+			patkfru = &amp;peeprom-&gt;AtkFru;</div><div class='add'>+			oemfruformat = peeprom-&gt;OemFruFormat;</div><div class='add'>+			poemfru = &amp;peeprom-&gt;OemFru;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		card-&gt;config.EepromValid = FALSE;</div><div class='add'>+</div><div class='add'>+		/*  see if the EEPROM is valid by checking it's checksum */</div><div class='add'>+		if ((eecodesize &lt;= MAX_EECODE_SIZE) &amp;&amp;</div><div class='add'>+		    (eecodesize &gt;= MIN_EECODE_SIZE)) {</div><div class='add'>+</div><div class='add'>+			ee_chksum =</div><div class='add'>+			    *(u16 *) ((char *) peeprom + (eecodesize - 2));</div><div class='add'>+			/*</div><div class='add'>+			    calculate the EEPROM checksum</div><div class='add'>+			*/</div><div class='add'>+			calc_chksum =</div><div class='add'>+			    ~slic_eeprom_cksum((char *) peeprom,</div><div class='add'>+					       (eecodesize - 2));</div><div class='add'>+			/*</div><div class='add'>+			    if the ucdoe chksum flag bit worked,</div><div class='add'>+			    we wouldn't need this shit</div><div class='add'>+			*/</div><div class='add'>+			if (ee_chksum == calc_chksum)</div><div class='add'>+				card-&gt;config.EepromValid = TRUE;</div><div class='add'>+		}</div><div class='add'>+		/*  copy in the DRAM size */</div><div class='add'>+		card-&gt;config.DramSize = dramsize;</div><div class='add'>+</div><div class='add'>+		/*  copy in the MAC address(es) */</div><div class='add'>+		for (i = 0; i &lt; macaddrs; i++) {</div><div class='add'>+			memcpy(&amp;card-&gt;config.MacInfo[i],</div><div class='add'>+			       &amp;pmac[i], sizeof(struct slic_config_mac));</div><div class='add'>+		}</div><div class='add'>+/*      DBG_MSG ("%s EEPROM Checksum Good? %d  MacAddress\n",__func__,</div><div class='add'>+		card-&gt;config.EepromValid); */</div><div class='add'>+</div><div class='add'>+		/*  copy the Alacritech FRU information */</div><div class='add'>+		card-&gt;config.FruFormat = fruformat;</div><div class='add'>+		memcpy(&amp;card-&gt;config.AtkFru, patkfru,</div><div class='add'>+						sizeof(struct atk_fru));</div><div class='add'>+</div><div class='add'>+		pci_free_consistent(adapter-&gt;pcidev,</div><div class='add'>+				    sizeof(struct slic_eeprom),</div><div class='add'>+				    peeprom, phys_config);</div><div class='add'>+		DBG_MSG</div><div class='add'>+		    ("slicoss: %s adapter%d [%p] size[%x] FREE peeprom[%p] \</div><div class='add'>+		     phys_config[%p]\n",</div><div class='add'>+		     __func__, adapter-&gt;port, adapter,</div><div class='add'>+		     (u32) sizeof(struct slic_eeprom), peeprom,</div><div class='add'>+		     (void *) phys_config);</div><div class='add'>+</div><div class='add'>+		if ((!card-&gt;config.EepromValid) &amp;&amp;</div><div class='add'>+		    (adapter-&gt;reg_params.fail_on_bad_eeprom)) {</div><div class='add'>+			WRITE_REG64(adapter,</div><div class='add'>+				    slic_regs-&gt;slic_isp,</div><div class='add'>+				    0, slic_regs-&gt;slic_addr_upper, 0, FLUSH);</div><div class='add'>+			DBG_ERROR</div><div class='add'>+			    ("unsupported CONFIGURATION  EEPROM invalid\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		card-&gt;config_set = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (slic_card_download_gbrcv(adapter)) {</div><div class='add'>+		DBG_ERROR("%s unable to download GB receive microcode\n",</div><div class='add'>+			  __func__);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (slic_global.dynamic_intagg) {</div><div class='add'>+		DBG_MSG</div><div class='add'>+		    ("Dynamic Interrupt Aggregation[ENABLED]: slic%d \</div><div class='add'>+		     SET intagg to %d\n",</div><div class='add'>+		     card-&gt;cardnum, 0);</div><div class='add'>+		slic_intagg_set(adapter, 0);</div><div class='add'>+	} else {</div><div class='add'>+		slic_intagg_set(adapter, intagg_delay);</div><div class='add'>+		DBG_MSG</div><div class='add'>+		    ("Dynamic Interrupt Aggregation[DISABLED]: slic%d \</div><div class='add'>+		     SET intagg to %d\n",</div><div class='add'>+		     card-&gt;cardnum, intagg_delay);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 *  Initialize ping status to "ok"</div><div class='add'>+	 */</div><div class='add'>+	card-&gt;pingstatus = ISR_PINGMASK;</div><div class='add'>+</div><div class='add'>+#if SLIC_DUMP_ENABLED</div><div class='add'>+	if (!card-&gt;dumpbuffer) {</div><div class='add'>+		card-&gt;dumpbuffer = kmalloc(DUMP_PAGE_SIZE, GFP_ATOMIC);</div><div class='add'>+</div><div class='add'>+		ASSERT(card-&gt;dumpbuffer);</div><div class='add'>+		if (card-&gt;dumpbuffer == NULL)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	/*</div><div class='add'>+	 *  Smear the shared memory structure and then obtain</div><div class='add'>+	 *  the PHYSICAL address of this structure</div><div class='add'>+	 */</div><div class='add'>+	memset(card-&gt;dumpbuffer, 0, DUMP_PAGE_SIZE);</div><div class='add'>+	card-&gt;dumpbuffer_phys = virt_to_bus(card-&gt;dumpbuffer);</div><div class='add'>+	card-&gt;dumpbuffer_physh = SLIC_GET_ADDR_HIGH(card-&gt;dumpbuffer_phys);</div><div class='add'>+	card-&gt;dumpbuffer_physl = SLIC_GET_ADDR_LOW(card-&gt;dumpbuffer_phys);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 *  Allocate COMMAND BUFFER</div><div class='add'>+	 */</div><div class='add'>+	if (!card-&gt;cmdbuffer) {</div><div class='add'>+		card-&gt;cmdbuffer = kmalloc(sizeof(struct dump_cmd), GFP_ATOMIC);</div><div class='add'>+</div><div class='add'>+		ASSERT(card-&gt;cmdbuffer);</div><div class='add'>+		if (card-&gt;cmdbuffer == NULL)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	/*</div><div class='add'>+	 *  Smear the shared memory structure and then obtain</div><div class='add'>+	 *  the PHYSICAL address of this structure</div><div class='add'>+	 */</div><div class='add'>+	memset(card-&gt;cmdbuffer, 0, sizeof(struct dump_cmd));</div><div class='add'>+	card-&gt;cmdbuffer_phys = virt_to_bus(card-&gt;cmdbuffer);</div><div class='add'>+	card-&gt;cmdbuffer_physh = SLIC_GET_ADDR_HIGH(card-&gt;cmdbuffer_phys);</div><div class='add'>+	card-&gt;cmdbuffer_physl = SLIC_GET_ADDR_LOW(card-&gt;cmdbuffer_phys);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Lastly, mark our card state as up and return success</div><div class='add'>+	 */</div><div class='add'>+	card-&gt;state = CARD_UP;</div><div class='add'>+	card-&gt;reset_in_progress = 0;</div><div class='add'>+	DBG_MSG("slicoss: %s EXIT card[%p] adapter[%p] card-&gt;state[%x]\n",</div><div class='add'>+		__func__, card, adapter, card-&gt;state);</div><div class='add'>+</div><div class='add'>+	return STATUS_SUCCESS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 slic_card_locate(struct adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	struct sliccard *card = slic_global.slic_card;</div><div class='add'>+	struct physcard *physcard = slic_global.phys_card;</div><div class='add'>+	ushort card_hostid;</div><div class='add'>+	u16 __iomem *hostid_reg;</div><div class='add'>+	uint i;</div><div class='add'>+	uint rdhostid_offset = 0;</div><div class='add'>+</div><div class='add'>+	DBG_MSG("slicoss: %s adapter[%p] slot[%x] bus[%x] port[%x]\n",</div><div class='add'>+		__func__, adapter, adapter-&gt;slotnumber, adapter-&gt;busnumber,</div><div class='add'>+		adapter-&gt;port);</div><div class='add'>+</div><div class='add'>+	switch (adapter-&gt;devid) {</div><div class='add'>+	case SLIC_2GB_DEVICE_ID:</div><div class='add'>+		rdhostid_offset = SLIC_RDHOSTID_2GB;</div><div class='add'>+		break;</div><div class='add'>+	case SLIC_1GB_DEVICE_ID:</div><div class='add'>+		rdhostid_offset = SLIC_RDHOSTID_1GB;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ASSERT(0);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hostid_reg =</div><div class='add'>+	    (u16 __iomem *) (((u8 __iomem *) (adapter-&gt;slic_regs)) +</div><div class='add'>+	    rdhostid_offset);</div><div class='add'>+	DBG_MSG("slicoss: %s *hostid_reg[%p] == ", __func__, hostid_reg);</div><div class='add'>+</div><div class='add'>+	/* read the 16 bit hostid from SRAM */</div><div class='add'>+	card_hostid = (ushort) readw(hostid_reg);</div><div class='add'>+	DBG_MSG(" card_hostid[%x]\n", card_hostid);</div><div class='add'>+</div><div class='add'>+	/* Initialize a new card structure if need be */</div><div class='add'>+	if (card_hostid == SLIC_HOSTID_DEFAULT) {</div><div class='add'>+		card = kzalloc(sizeof(struct sliccard), GFP_KERNEL);</div><div class='add'>+		if (card == NULL)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		card-&gt;next = slic_global.slic_card;</div><div class='add'>+		slic_global.slic_card = card;</div><div class='add'>+#if DBG</div><div class='add'>+		if (adapter-&gt;devid == SLIC_2GB_DEVICE_ID) {</div><div class='add'>+			DBG_MSG</div><div class='add'>+			    ("SLICOSS ==&gt; Initialize 2 Port Gigabit Server \</div><div class='add'>+			     and Storage Accelerator\n");</div><div class='add'>+		} else {</div><div class='add'>+			DBG_MSG</div><div class='add'>+			    ("SLICOSS ==&gt; Initialize 1 Port Gigabit Server \</div><div class='add'>+			     and Storage Accelerator\n");</div><div class='add'>+		}</div><div class='add'>+#endif</div><div class='add'>+		card-&gt;busnumber = adapter-&gt;busnumber;</div><div class='add'>+		card-&gt;slotnumber = adapter-&gt;slotnumber;</div><div class='add'>+</div><div class='add'>+		/* Find an available cardnum */</div><div class='add'>+		for (i = 0; i &lt; SLIC_MAX_CARDS; i++) {</div><div class='add'>+			if (slic_global.cardnuminuse[i] == 0) {</div><div class='add'>+				slic_global.cardnuminuse[i] = 1;</div><div class='add'>+				card-&gt;cardnum = i;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		slic_global.num_slic_cards++;</div><div class='add'>+		DBG_MSG("\nCARDNUM == %d  Total %d  Card[%p]\n\n",</div><div class='add'>+			card-&gt;cardnum, slic_global.num_slic_cards, card);</div><div class='add'>+</div><div class='add'>+		slic_debug_card_create(card);</div><div class='add'>+	} else {</div><div class='add'>+		DBG_MSG</div><div class='add'>+		    ("slicoss: %s CARD already allocated, find the \</div><div class='add'>+		     correct card\n", __func__);</div><div class='add'>+		/* Card exists, find the card this adapter belongs to */</div><div class='add'>+		while (card) {</div><div class='add'>+			DBG_MSG</div><div class='add'>+			    ("slicoss: %s card[%p] slot[%x] bus[%x] \</div><div class='add'>+			      adaptport[%p] hostid[%x] cardnum[%x]\n",</div><div class='add'>+			     __func__, card, card-&gt;slotnumber,</div><div class='add'>+			     card-&gt;busnumber, card-&gt;adapter[adapter-&gt;port],</div><div class='add'>+			     card_hostid, card-&gt;cardnum);</div><div class='add'>+</div><div class='add'>+			if (card-&gt;cardnum == card_hostid)</div><div class='add'>+				break;</div><div class='add'>+			card = card-&gt;next;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ASSERT(card);</div><div class='add'>+	if (!card)</div><div class='add'>+		return STATUS_FAILURE;</div><div class='add'>+	/* Put the adapter in the card's adapter list */</div><div class='add'>+	ASSERT(card-&gt;adapter[adapter-&gt;port] == NULL);</div><div class='add'>+	if (!card-&gt;adapter[adapter-&gt;port]) {</div><div class='add'>+		card-&gt;adapter[adapter-&gt;port] = adapter;</div><div class='add'>+		adapter-&gt;card = card;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	card-&gt;card_size = 1;	/* one port per *logical* card */</div><div class='add'>+</div><div class='add'>+	while (physcard) {</div><div class='add'>+		for (i = 0; i &lt; SLIC_MAX_PORTS; i++) {</div><div class='add'>+			if (!physcard-&gt;adapter[i])</div><div class='add'>+				continue;</div><div class='add'>+			else</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+		ASSERT(i != SLIC_MAX_PORTS);</div><div class='add'>+		if (physcard-&gt;adapter[i]-&gt;slotnumber == adapter-&gt;slotnumber)</div><div class='add'>+			break;</div><div class='add'>+		physcard = physcard-&gt;next;</div><div class='add'>+	}</div><div class='add'>+	if (!physcard) {</div><div class='add'>+		/* no structure allocated for this physical card yet */</div><div class='add'>+		physcard = kmalloc(sizeof(struct physcard *), GFP_ATOMIC);</div><div class='add'>+		ASSERT(physcard);</div><div class='add'>+		memset(physcard, 0, sizeof(struct physcard *));</div><div class='add'>+</div><div class='add'>+		DBG_MSG</div><div class='add'>+		    ("\n%s Allocate a PHYSICALcard:\n    PHYSICAL_Card[%p]\n\</div><div class='add'>+		     LogicalCard  [%p]\n    adapter      [%p]\n",</div><div class='add'>+		     __func__, physcard, card, adapter);</div><div class='add'>+</div><div class='add'>+		physcard-&gt;next = slic_global.phys_card;</div><div class='add'>+		slic_global.phys_card = physcard;</div><div class='add'>+		physcard-&gt;adapters_allocd = 1;</div><div class='add'>+	} else {</div><div class='add'>+		physcard-&gt;adapters_allocd++;</div><div class='add'>+	}</div><div class='add'>+	/* Note - this is ZERO relative */</div><div class='add'>+	adapter-&gt;physport = physcard-&gt;adapters_allocd - 1;</div><div class='add'>+</div><div class='add'>+	ASSERT(physcard-&gt;adapter[adapter-&gt;physport] == NULL);</div><div class='add'>+	physcard-&gt;adapter[adapter-&gt;physport] = adapter;</div><div class='add'>+	adapter-&gt;physcard = physcard;</div><div class='add'>+	DBG_MSG("    PHYSICAL_Port %d    Logical_Port  %d\n", adapter-&gt;physport,</div><div class='add'>+		adapter-&gt;port);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void slic_soft_reset(struct adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	if (adapter-&gt;card-&gt;state == CARD_UP) {</div><div class='add'>+		DBG_MSG("slicoss: %s QUIESCE adapter[%p] card[%p] devid[%x]\n",</div><div class='add'>+			__func__, adapter, adapter-&gt;card, adapter-&gt;devid);</div><div class='add'>+		WRITE_REG(adapter-&gt;slic_regs-&gt;slic_quiesce, 0, FLUSH);</div><div class='add'>+		mdelay(1);</div><div class='add'>+	}</div><div class='add'>+/*      DBG_MSG ("slicoss: %s (%s) adapter[%p] card[%p] devid[%x]\n",</div><div class='add'>+	__func__, adapter-&gt;netdev-&gt;name, adapter, adapter-&gt;card,</div><div class='add'>+	   adapter-&gt;devid); */</div><div class='add'>+</div><div class='add'>+	WRITE_REG(adapter-&gt;slic_regs-&gt;slic_reset, SLIC_RESET_MAGIC, FLUSH);</div><div class='add'>+	mdelay(1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void slic_config_set(struct adapter *adapter, bool linkchange)</div><div class='add'>+{</div><div class='add'>+	u32 value;</div><div class='add'>+	u32 RcrReset;</div><div class='add'>+	__iomem struct slic_regs *slic_regs = adapter-&gt;slic_regs;</div><div class='add'>+</div><div class='add'>+	DBG_MSG("slicoss: %s (%s) slic_interface_enable[%p](%d)\n",</div><div class='add'>+		__func__, adapter-&gt;netdev-&gt;name, adapter,</div><div class='add'>+		adapter-&gt;cardindex);</div><div class='add'>+</div><div class='add'>+	if (linkchange) {</div><div class='add'>+		/* Setup MAC */</div><div class='add'>+		slic_mac_config(adapter);</div><div class='add'>+		RcrReset = GRCR_RESET;</div><div class='add'>+	} else {</div><div class='add'>+		slic_mac_address_config(adapter);</div><div class='add'>+		RcrReset = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (adapter-&gt;linkduplex == LINK_FULLD) {</div><div class='add'>+		/* setup xmtcfg */</div><div class='add'>+		value = (GXCR_RESET |	/* Always reset     */</div><div class='add'>+			 GXCR_XMTEN |	/* Enable transmit  */</div><div class='add'>+			 GXCR_PAUSEEN);	/* Enable pause     */</div><div class='add'>+</div><div class='add'>+		DBG_MSG("slicoss: FDX adapt[%p] set xmtcfg to [%x]\n", adapter,</div><div class='add'>+			value);</div><div class='add'>+		WRITE_REG(slic_regs-&gt;slic_wxcfg, value, FLUSH);</div><div class='add'>+</div><div class='add'>+		/* Setup rcvcfg last */</div><div class='add'>+		value = (RcrReset |	/* Reset, if linkchange */</div><div class='add'>+			 GRCR_CTLEN |	/* Enable CTL frames    */</div><div class='add'>+			 GRCR_ADDRAEN |	/* Address A enable     */</div><div class='add'>+			 GRCR_RCVBAD |	/* Rcv bad frames       */</div><div class='add'>+			 (GRCR_HASHSIZE &lt;&lt; GRCR_HASHSIZE_SHIFT));</div><div class='add'>+	} else {</div><div class='add'>+		/* setup xmtcfg */</div><div class='add'>+		value = (GXCR_RESET |	/* Always reset     */</div><div class='add'>+			 GXCR_XMTEN);	/* Enable transmit  */</div><div class='add'>+</div><div class='add'>+		DBG_MSG("slicoss: HDX adapt[%p] set xmtcfg to [%x]\n", adapter,</div><div class='add'>+			value);</div><div class='add'>+		WRITE_REG(slic_regs-&gt;slic_wxcfg, value, FLUSH);</div><div class='add'>+</div><div class='add'>+		/* Setup rcvcfg last */</div><div class='add'>+		value = (RcrReset |	/* Reset, if linkchange */</div><div class='add'>+			 GRCR_ADDRAEN |	/* Address A enable     */</div><div class='add'>+			 GRCR_RCVBAD |	/* Rcv bad frames       */</div><div class='add'>+			 (GRCR_HASHSIZE &lt;&lt; GRCR_HASHSIZE_SHIFT));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (adapter-&gt;state != ADAPT_DOWN) {</div><div class='add'>+		/* Only enable receive if we are restarting or running */</div><div class='add'>+		value |= GRCR_RCVEN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (adapter-&gt;macopts &amp; MAC_PROMISC)</div><div class='add'>+		value |= GRCR_RCVALL;</div><div class='add'>+</div><div class='add'>+	DBG_MSG("slicoss: adapt[%p] set rcvcfg to [%x]\n", adapter, value);</div><div class='add'>+	WRITE_REG(slic_regs-&gt;slic_wrcfg, value, FLUSH);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  Turn off RCV and XMT, power down PHY</div><div class='add'>+ */</div><div class='add'>+static void slic_config_clear(struct adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	u32 value;</div><div class='add'>+	u32 phy_config;</div><div class='add'>+	__iomem struct slic_regs *slic_regs = adapter-&gt;slic_regs;</div><div class='add'>+</div><div class='add'>+	/* Setup xmtcfg */</div><div class='add'>+	value = (GXCR_RESET |	/* Always reset */</div><div class='add'>+		 GXCR_PAUSEEN);	/* Enable pause */</div><div class='add'>+</div><div class='add'>+	WRITE_REG(slic_regs-&gt;slic_wxcfg, value, FLUSH);</div><div class='add'>+</div><div class='add'>+	value = (GRCR_RESET |	/* Always reset      */</div><div class='add'>+		 GRCR_CTLEN |	/* Enable CTL frames */</div><div class='add'>+		 GRCR_ADDRAEN |	/* Address A enable  */</div><div class='add'>+		 (GRCR_HASHSIZE &lt;&lt; GRCR_HASHSIZE_SHIFT));</div><div class='add'>+</div><div class='add'>+	WRITE_REG(slic_regs-&gt;slic_wrcfg, value, FLUSH);</div><div class='add'>+</div><div class='add'>+	/* power down phy */</div><div class='add'>+	phy_config = (MIICR_REG_PCR | (PCR_POWERDOWN));</div><div class='add'>+	WRITE_REG(slic_regs-&gt;slic_wphy, phy_config, FLUSH);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void slic_config_get(struct adapter *adapter, u32 config,</div><div class='add'>+							u32 config_h)</div><div class='add'>+{</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	status = slic_upr_request(adapter,</div><div class='add'>+				  SLIC_UPR_RCONFIG,</div><div class='add'>+				  (u32) config, (u32) config_h, 0, 0);</div><div class='add'>+	ASSERT(status == 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void slic_mac_address_config(struct adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	u32 value;</div><div class='add'>+	u32 value2;</div><div class='add'>+	__iomem struct slic_regs *slic_regs = adapter-&gt;slic_regs;</div><div class='add'>+</div><div class='add'>+	value = *(u32 *) &amp;adapter-&gt;currmacaddr[2];</div><div class='add'>+	value = ntohl(value);</div><div class='add'>+	WRITE_REG(slic_regs-&gt;slic_wraddral, value, FLUSH);</div><div class='add'>+	WRITE_REG(slic_regs-&gt;slic_wraddrbl, value, FLUSH);</div><div class='add'>+</div><div class='add'>+	value2 = (u32) ((adapter-&gt;currmacaddr[0] &lt;&lt; 8 |</div><div class='add'>+			     adapter-&gt;currmacaddr[1]) &amp; 0xFFFF);</div><div class='add'>+</div><div class='add'>+	WRITE_REG(slic_regs-&gt;slic_wraddrah, value2, FLUSH);</div><div class='add'>+	WRITE_REG(slic_regs-&gt;slic_wraddrbh, value2, FLUSH);</div><div class='add'>+</div><div class='add'>+	DBG_MSG("%s value1[%x] value2[%x] Call slic_mcast_set_mask\n",</div><div class='add'>+		__func__, value, value2);</div><div class='add'>+	slic_dbg_macaddrs(adapter);</div><div class='add'>+</div><div class='add'>+	/* Write our multicast mask out to the card.  This is done */</div><div class='add'>+	/* here in addition to the slic_mcast_addr_set routine     */</div><div class='add'>+	/* because ALL_MCAST may have been enabled or disabled     */</div><div class='add'>+	slic_mcast_set_mask(adapter);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void slic_mac_config(struct adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	u32 value;</div><div class='add'>+	__iomem struct slic_regs *slic_regs = adapter-&gt;slic_regs;</div><div class='add'>+</div><div class='add'>+	/* Setup GMAC gaps */</div><div class='add'>+	if (adapter-&gt;linkspeed == LINK_1000MB) {</div><div class='add'>+		value = ((GMCR_GAPBB_1000 &lt;&lt; GMCR_GAPBB_SHIFT) |</div><div class='add'>+			 (GMCR_GAPR1_1000 &lt;&lt; GMCR_GAPR1_SHIFT) |</div><div class='add'>+			 (GMCR_GAPR2_1000 &lt;&lt; GMCR_GAPR2_SHIFT));</div><div class='add'>+	} else {</div><div class='add'>+		value = ((GMCR_GAPBB_100 &lt;&lt; GMCR_GAPBB_SHIFT) |</div><div class='add'>+			 (GMCR_GAPR1_100 &lt;&lt; GMCR_GAPR1_SHIFT) |</div><div class='add'>+			 (GMCR_GAPR2_100 &lt;&lt; GMCR_GAPR2_SHIFT));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* enable GMII */</div><div class='add'>+	if (adapter-&gt;linkspeed == LINK_1000MB)</div><div class='add'>+		value |= GMCR_GBIT;</div><div class='add'>+</div><div class='add'>+	/* enable fullduplex */</div><div class='add'>+	if ((adapter-&gt;linkduplex == LINK_FULLD)</div><div class='add'>+	    || (adapter-&gt;macopts &amp; MAC_LOOPBACK)) {</div><div class='add'>+		value |= GMCR_FULLD;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* write mac config */</div><div class='add'>+	WRITE_REG(slic_regs-&gt;slic_wmcfg, value, FLUSH);</div><div class='add'>+</div><div class='add'>+	/* setup mac addresses */</div><div class='add'>+	slic_mac_address_config(adapter);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool slic_mac_filter(struct adapter *adapter,</div><div class='add'>+			struct ether_header *ether_frame)</div><div class='add'>+{</div><div class='add'>+	u32 opts = adapter-&gt;macopts;</div><div class='add'>+	u32 *dhost4 = (u32 *)&amp;ether_frame-&gt;ether_dhost[0];</div><div class='add'>+	u16 *dhost2 = (u16 *)&amp;ether_frame-&gt;ether_dhost[4];</div><div class='add'>+	bool equaladdr;</div><div class='add'>+</div><div class='add'>+	if (opts &amp; MAC_PROMISC) {</div><div class='add'>+		DBG_MSG("slicoss: %s (%s) PROMISCUOUS. Accept frame\n",</div><div class='add'>+			__func__, adapter-&gt;netdev-&gt;name);</div><div class='add'>+		return TRUE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((*dhost4 == 0xFFFFFFFF) &amp;&amp; (*dhost2 == 0xFFFF)) {</div><div class='add'>+		if (opts &amp; MAC_BCAST) {</div><div class='add'>+			adapter-&gt;rcv_broadcasts++;</div><div class='add'>+			return TRUE;</div><div class='add'>+		} else {</div><div class='add'>+			return FALSE;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ether_frame-&gt;ether_dhost[0] &amp; 0x01) {</div><div class='add'>+		if (opts &amp; MAC_ALLMCAST) {</div><div class='add'>+			adapter-&gt;rcv_multicasts++;</div><div class='add'>+			adapter-&gt;stats.multicast++;</div><div class='add'>+			return TRUE;</div><div class='add'>+		}</div><div class='add'>+		if (opts &amp; MAC_MCAST) {</div><div class='add'>+			struct mcast_address *mcaddr = adapter-&gt;mcastaddrs;</div><div class='add'>+</div><div class='add'>+			while (mcaddr) {</div><div class='add'>+				ETHER_EQ_ADDR(mcaddr-&gt;address,</div><div class='add'>+					      ether_frame-&gt;ether_dhost,</div><div class='add'>+					      equaladdr);</div><div class='add'>+				if (equaladdr) {</div><div class='add'>+					adapter-&gt;rcv_multicasts++;</div><div class='add'>+					adapter-&gt;stats.multicast++;</div><div class='add'>+					return TRUE;</div><div class='add'>+				}</div><div class='add'>+				mcaddr = mcaddr-&gt;next;</div><div class='add'>+			}</div><div class='add'>+			return FALSE;</div><div class='add'>+		} else {</div><div class='add'>+			return FALSE;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (opts &amp; MAC_DIRECTED) {</div><div class='add'>+		adapter-&gt;rcv_unicasts++;</div><div class='add'>+		return TRUE;</div><div class='add'>+	}</div><div class='add'>+	return FALSE;</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int slic_mac_set_address(struct net_device *dev, void *ptr)</div><div class='add'>+{</div><div class='add'>+	struct adapter *adapter = (struct adapter *)netdev_priv(dev);</div><div class='add'>+	struct sockaddr *addr = ptr;</div><div class='add'>+</div><div class='add'>+	DBG_MSG("%s ENTER (%s)\n", __func__, adapter-&gt;netdev-&gt;name);</div><div class='add'>+</div><div class='add'>+	if (netif_running(dev))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	if (!adapter)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	DBG_MSG("slicoss: %s (%s) curr %2.2X:%2.2X:%2.2X:%2.2X:%2.2X:%2.2X\n",</div><div class='add'>+		__func__, adapter-&gt;netdev-&gt;name, adapter-&gt;currmacaddr[0],</div><div class='add'>+		adapter-&gt;currmacaddr[1], adapter-&gt;currmacaddr[2],</div><div class='add'>+		adapter-&gt;currmacaddr[3], adapter-&gt;currmacaddr[4],</div><div class='add'>+		adapter-&gt;currmacaddr[5]);</div><div class='add'>+	memcpy(dev-&gt;dev_addr, addr-&gt;sa_data, dev-&gt;addr_len);</div><div class='add'>+	memcpy(adapter-&gt;currmacaddr, addr-&gt;sa_data, dev-&gt;addr_len);</div><div class='add'>+	DBG_MSG("slicoss: %s (%s) new %2.2X:%2.2X:%2.2X:%2.2X:%2.2X:%2.2X\n",</div><div class='add'>+		__func__, adapter-&gt;netdev-&gt;name, adapter-&gt;currmacaddr[0],</div><div class='add'>+		adapter-&gt;currmacaddr[1], adapter-&gt;currmacaddr[2],</div><div class='add'>+		adapter-&gt;currmacaddr[3], adapter-&gt;currmacaddr[4],</div><div class='add'>+		adapter-&gt;currmacaddr[5]);</div><div class='add'>+</div><div class='add'>+	slic_config_set(adapter, TRUE);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  slic_timer_get_stats</div><div class='add'>+ *</div><div class='add'>+ * Timer function used to suck the statistics out of the card every</div><div class='add'>+ * 50 seconds or whatever STATS_TIMER_INTERVAL is set to.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+#if SLIC_GET_STATS_TIMER_ENABLED</div><div class='add'>+static void slic_timer_get_stats(ulong dev)</div><div class='add'>+{</div><div class='add'>+	struct adapter *adapter;</div><div class='add'>+	struct sliccard *card;</div><div class='add'>+	struct slic_shmem *pshmem;</div><div class='add'>+</div><div class='add'>+	ASSERT(dev);</div><div class='add'>+	adapter = (struct adapter *)((struct net_device *)dev)-&gt;priv;</div><div class='add'>+	ASSERT(adapter);</div><div class='add'>+	card = adapter-&gt;card;</div><div class='add'>+	ASSERT(card);</div><div class='add'>+</div><div class='add'>+	if ((card-&gt;state == CARD_UP) &amp;&amp;</div><div class='add'>+	    (adapter-&gt;state == ADAPT_UP) &amp;&amp; (adapter-&gt;linkstate == LINK_UP)) {</div><div class='add'>+		pshmem = (struct slic_shmem *)adapter-&gt;phys_shmem;</div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='add'>+		slic_upr_request(adapter,</div><div class='add'>+				 SLIC_UPR_STATS,</div><div class='add'>+				 SLIC_GET_ADDR_LOW(&amp;pshmem-&gt;inicstats),</div><div class='add'>+				 SLIC_GET_ADDR_HIGH(&amp;pshmem-&gt;inicstats), 0, 0);</div><div class='add'>+#elif defined(CONFIG_X86)</div><div class='add'>+		slic_upr_request(adapter,</div><div class='add'>+				 SLIC_UPR_STATS,</div><div class='add'>+				 (u32) &amp;pshmem-&gt;inicstats, 0, 0, 0);</div><div class='add'>+#else</div><div class='add'>+		Stop compilation;</div><div class='add'>+#endif</div><div class='add'>+	} else {</div><div class='add'>+/*		DBG_MSG ("slicoss: %s adapter[%p] linkstate[%x] NOT UP!\n",</div><div class='add'>+			__func__, adapter, adapter-&gt;linkstate); */</div><div class='add'>+	}</div><div class='add'>+	adapter-&gt;statstimer.expires = jiffies +</div><div class='add'>+	    SLIC_SECS_TO_JIFFS(STATS_TIMER_INTERVAL);</div><div class='add'>+	add_timer(&amp;adapter-&gt;statstimer);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+static void slic_timer_load_check(ulong cardaddr)</div><div class='add'>+{</div><div class='add'>+	struct sliccard *card = (struct sliccard *)cardaddr;</div><div class='add'>+	struct adapter *adapter = card-&gt;master;</div><div class='add'>+	u32 load = card-&gt;events;</div><div class='add'>+	u32 level = 0;</div><div class='add'>+</div><div class='add'>+	if ((adapter) &amp;&amp; (adapter-&gt;state == ADAPT_UP) &amp;&amp;</div><div class='add'>+	    (card-&gt;state == CARD_UP) &amp;&amp; (slic_global.dynamic_intagg)) {</div><div class='add'>+		if (adapter-&gt;devid == SLIC_1GB_DEVICE_ID) {</div><div class='add'>+			if (adapter-&gt;linkspeed == LINK_1000MB)</div><div class='add'>+				level = 100;</div><div class='add'>+			else {</div><div class='add'>+				if (load &gt; SLIC_LOAD_5)</div><div class='add'>+					level = SLIC_INTAGG_5;</div><div class='add'>+				else if (load &gt; SLIC_LOAD_4)</div><div class='add'>+					level = SLIC_INTAGG_4;</div><div class='add'>+				else if (load &gt; SLIC_LOAD_3)</div><div class='add'>+					level = SLIC_INTAGG_3;</div><div class='add'>+				else if (load &gt; SLIC_LOAD_2)</div><div class='add'>+					level = SLIC_INTAGG_2;</div><div class='add'>+				else if (load &gt; SLIC_LOAD_1)</div><div class='add'>+					level = SLIC_INTAGG_1;</div><div class='add'>+				else</div><div class='add'>+					level = SLIC_INTAGG_0;</div><div class='add'>+			}</div><div class='add'>+			if (card-&gt;loadlevel_current != level) {</div><div class='add'>+				card-&gt;loadlevel_current = level;</div><div class='add'>+				WRITE_REG(adapter-&gt;slic_regs-&gt;slic_intagg,</div><div class='add'>+					  level, FLUSH);</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			if (load &gt; SLIC_LOAD_5)</div><div class='add'>+				level = SLIC_INTAGG_5;</div><div class='add'>+			else if (load &gt; SLIC_LOAD_4)</div><div class='add'>+				level = SLIC_INTAGG_4;</div><div class='add'>+			else if (load &gt; SLIC_LOAD_3)</div><div class='add'>+				level = SLIC_INTAGG_3;</div><div class='add'>+			else if (load &gt; SLIC_LOAD_2)</div><div class='add'>+				level = SLIC_INTAGG_2;</div><div class='add'>+			else if (load &gt; SLIC_LOAD_1)</div><div class='add'>+				level = SLIC_INTAGG_1;</div><div class='add'>+			else</div><div class='add'>+				level = SLIC_INTAGG_0;</div><div class='add'>+			if (card-&gt;loadlevel_current != level) {</div><div class='add'>+				card-&gt;loadlevel_current = level;</div><div class='add'>+				WRITE_REG(adapter-&gt;slic_regs-&gt;slic_intagg,</div><div class='add'>+					  level, FLUSH);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	card-&gt;events = 0;</div><div class='add'>+	card-&gt;loadtimer.expires =</div><div class='add'>+	    jiffies + SLIC_SECS_TO_JIFFS(SLIC_LOADTIMER_PERIOD);</div><div class='add'>+	add_timer(&amp;card-&gt;loadtimer);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void slic_assert_fail(void)</div><div class='add'>+{</div><div class='add'>+	u32 cpuid;</div><div class='add'>+	u32 curr_pid;</div><div class='add'>+	cpuid = smp_processor_id();</div><div class='add'>+	curr_pid = current-&gt;pid;</div><div class='add'>+</div><div class='add'>+	DBG_ERROR("%s CPU # %d ---- PID # %d\n", __func__, cpuid, curr_pid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int slic_upr_queue_request(struct adapter *adapter,</div><div class='add'>+			   u32 upr_request,</div><div class='add'>+			   u32 upr_data,</div><div class='add'>+			   u32 upr_data_h,</div><div class='add'>+			   u32 upr_buffer, u32 upr_buffer_h)</div><div class='add'>+{</div><div class='add'>+	struct slic_upr *upr;</div><div class='add'>+	struct slic_upr *uprqueue;</div><div class='add'>+</div><div class='add'>+	upr = kmalloc(sizeof(struct slic_upr), GFP_ATOMIC);</div><div class='add'>+	if (!upr) {</div><div class='add'>+		DBG_MSG("%s COULD NOT ALLOCATE UPR MEM\n", __func__);</div><div class='add'>+</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	upr-&gt;adapter = adapter-&gt;port;</div><div class='add'>+	upr-&gt;upr_request = upr_request;</div><div class='add'>+	upr-&gt;upr_data = upr_data;</div><div class='add'>+	upr-&gt;upr_buffer = upr_buffer;</div><div class='add'>+	upr-&gt;upr_data_h = upr_data_h;</div><div class='add'>+	upr-&gt;upr_buffer_h = upr_buffer_h;</div><div class='add'>+	upr-&gt;next = NULL;</div><div class='add'>+	if (adapter-&gt;upr_list) {</div><div class='add'>+		uprqueue = adapter-&gt;upr_list;</div><div class='add'>+</div><div class='add'>+		while (uprqueue-&gt;next)</div><div class='add'>+			uprqueue = uprqueue-&gt;next;</div><div class='add'>+		uprqueue-&gt;next = upr;</div><div class='add'>+	} else {</div><div class='add'>+		adapter-&gt;upr_list = upr;</div><div class='add'>+	}</div><div class='add'>+	return STATUS_SUCCESS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int slic_upr_request(struct adapter *adapter,</div><div class='add'>+		     u32 upr_request,</div><div class='add'>+		     u32 upr_data,</div><div class='add'>+		     u32 upr_data_h,</div><div class='add'>+		     u32 upr_buffer, u32 upr_buffer_h)</div><div class='add'>+{</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;adapter-&gt;upr_lock.lock, adapter-&gt;upr_lock.flags);</div><div class='add'>+	status = slic_upr_queue_request(adapter,</div><div class='add'>+					upr_request,</div><div class='add'>+					upr_data,</div><div class='add'>+					upr_data_h, upr_buffer, upr_buffer_h);</div><div class='add'>+	if (status != STATUS_SUCCESS) {</div><div class='add'>+		spin_unlock_irqrestore(&amp;adapter-&gt;upr_lock.lock,</div><div class='add'>+					adapter-&gt;upr_lock.flags);</div><div class='add'>+		return status;</div><div class='add'>+	}</div><div class='add'>+	slic_upr_start(adapter);</div><div class='add'>+	spin_unlock_irqrestore(&amp;adapter-&gt;upr_lock.lock,</div><div class='add'>+				adapter-&gt;upr_lock.flags);</div><div class='add'>+	return STATUS_PENDING;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void slic_upr_request_complete(struct adapter *adapter, u32 isr)</div><div class='add'>+{</div><div class='add'>+	struct sliccard *card = adapter-&gt;card;</div><div class='add'>+	struct slic_upr *upr;</div><div class='add'>+</div><div class='add'>+/*    if (card-&gt;dump_requested) {</div><div class='add'>+	DBG_MSG("ENTER slic_upr_request_complete Dump in progress ISR[%x]\n",</div><div class='add'>+		isr);</div><div class='add'>+      } */</div><div class='add'>+	spin_lock_irqsave(&amp;adapter-&gt;upr_lock.lock, adapter-&gt;upr_lock.flags);</div><div class='add'>+	upr = adapter-&gt;upr_list;</div><div class='add'>+	if (!upr) {</div><div class='add'>+		ASSERT(0);</div><div class='add'>+		spin_unlock_irqrestore(&amp;adapter-&gt;upr_lock.lock,</div><div class='add'>+					adapter-&gt;upr_lock.flags);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	adapter-&gt;upr_list = upr-&gt;next;</div><div class='add'>+	upr-&gt;next = NULL;</div><div class='add'>+	adapter-&gt;upr_busy = 0;</div><div class='add'>+	ASSERT(adapter-&gt;port == upr-&gt;adapter);</div><div class='add'>+	switch (upr-&gt;upr_request) {</div><div class='add'>+	case SLIC_UPR_STATS:</div><div class='add'>+		{</div><div class='add'>+#if SLIC_GET_STATS_ENABLED</div><div class='add'>+			struct slic_stats *slicstats =</div><div class='add'>+			    (struct slic_stats *) &amp;adapter-&gt;pshmem-&gt;inicstats;</div><div class='add'>+			struct slic_stats *newstats = slicstats;</div><div class='add'>+			struct slic_stats  *old = &amp;adapter-&gt;inicstats_prev;</div><div class='add'>+			struct slicnet_stats *stst = &amp;adapter-&gt;slic_stats;</div><div class='add'>+#endif</div><div class='add'>+			if (isr &amp; ISR_UPCERR) {</div><div class='add'>+				DBG_ERROR</div><div class='add'>+				    ("SLIC_UPR_STATS command failed isr[%x]\n",</div><div class='add'>+				     isr);</div><div class='add'>+</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+#if SLIC_GET_STATS_ENABLED</div><div class='add'>+/*			DBG_MSG ("slicoss: %s rcv %lx:%lx:%lx:%lx:%lx %lx %lx "</div><div class='add'>+				"xmt %lx:%lx:%lx:%lx:%lx %lx %lx\n",</div><div class='add'>+				 __func__,</div><div class='add'>+			     slicstats-&gt;rcv_unicasts100,</div><div class='add'>+			     slicstats-&gt;rcv_bytes100,</div><div class='add'>+			     slicstats-&gt;rcv_bytes100,</div><div class='add'>+			     slicstats-&gt;rcv_tcp_bytes100,</div><div class='add'>+			     slicstats-&gt;rcv_tcp_segs100,</div><div class='add'>+			     slicstats-&gt;rcv_other_error100,</div><div class='add'>+			     slicstats-&gt;rcv_drops100,</div><div class='add'>+			     slicstats-&gt;xmit_unicasts100,</div><div class='add'>+			     slicstats-&gt;xmit_bytes100,</div><div class='add'>+			     slicstats-&gt;xmit_bytes100,</div><div class='add'>+			     slicstats-&gt;xmit_tcp_bytes100,</div><div class='add'>+			     slicstats-&gt;xmit_tcp_segs100,</div><div class='add'>+			     slicstats-&gt;xmit_other_error100,</div><div class='add'>+			     slicstats-&gt;xmit_collisions100);*/</div><div class='add'>+			UPDATE_STATS_GB(stst-&gt;tcp.xmit_tcp_segs,</div><div class='add'>+					newstats-&gt;xmit_tcp_segs_gb,</div><div class='add'>+					old-&gt;xmit_tcp_segs_gb);</div><div class='add'>+</div><div class='add'>+			UPDATE_STATS_GB(stst-&gt;tcp.xmit_tcp_bytes,</div><div class='add'>+					newstats-&gt;xmit_tcp_bytes_gb,</div><div class='add'>+					old-&gt;xmit_tcp_bytes_gb);</div><div class='add'>+</div><div class='add'>+			UPDATE_STATS_GB(stst-&gt;tcp.rcv_tcp_segs,</div><div class='add'>+					newstats-&gt;rcv_tcp_segs_gb,</div><div class='add'>+					old-&gt;rcv_tcp_segs_gb);</div><div class='add'>+</div><div class='add'>+			UPDATE_STATS_GB(stst-&gt;tcp.rcv_tcp_bytes,</div><div class='add'>+					newstats-&gt;rcv_tcp_bytes_gb,</div><div class='add'>+					old-&gt;rcv_tcp_bytes_gb);</div><div class='add'>+</div><div class='add'>+			UPDATE_STATS_GB(stst-&gt;iface.xmt_bytes,</div><div class='add'>+					newstats-&gt;xmit_bytes_gb,</div><div class='add'>+					old-&gt;xmit_bytes_gb);</div><div class='add'>+</div><div class='add'>+			UPDATE_STATS_GB(stst-&gt;iface.xmt_ucast,</div><div class='add'>+					newstats-&gt;xmit_unicasts_gb,</div><div class='add'>+					old-&gt;xmit_unicasts_gb);</div><div class='add'>+</div><div class='add'>+			UPDATE_STATS_GB(stst-&gt;iface.rcv_bytes,</div><div class='add'>+					newstats-&gt;rcv_bytes_gb,</div><div class='add'>+					old-&gt;rcv_bytes_gb);</div><div class='add'>+</div><div class='add'>+			UPDATE_STATS_GB(stst-&gt;iface.rcv_ucast,</div><div class='add'>+					newstats-&gt;rcv_unicasts_gb,</div><div class='add'>+					old-&gt;rcv_unicasts_gb);</div><div class='add'>+</div><div class='add'>+			UPDATE_STATS_GB(stst-&gt;iface.xmt_errors,</div><div class='add'>+					newstats-&gt;xmit_collisions_gb,</div><div class='add'>+					old-&gt;xmit_collisions_gb);</div><div class='add'>+</div><div class='add'>+			UPDATE_STATS_GB(stst-&gt;iface.xmt_errors,</div><div class='add'>+					newstats-&gt;xmit_excess_collisions_gb,</div><div class='add'>+					old-&gt;xmit_excess_collisions_gb);</div><div class='add'>+</div><div class='add'>+			UPDATE_STATS_GB(stst-&gt;iface.xmt_errors,</div><div class='add'>+					newstats-&gt;xmit_other_error_gb,</div><div class='add'>+					old-&gt;xmit_other_error_gb);</div><div class='add'>+</div><div class='add'>+			UPDATE_STATS_GB(stst-&gt;iface.rcv_errors,</div><div class='add'>+					newstats-&gt;rcv_other_error_gb,</div><div class='add'>+					old-&gt;rcv_other_error_gb);</div><div class='add'>+</div><div class='add'>+			UPDATE_STATS_GB(stst-&gt;iface.rcv_discards,</div><div class='add'>+					newstats-&gt;rcv_drops_gb,</div><div class='add'>+					old-&gt;rcv_drops_gb);</div><div class='add'>+</div><div class='add'>+			if (newstats-&gt;rcv_drops_gb &gt; old-&gt;rcv_drops_gb) {</div><div class='add'>+				adapter-&gt;rcv_drops +=</div><div class='add'>+				    (newstats-&gt;rcv_drops_gb -</div><div class='add'>+				     old-&gt;rcv_drops_gb);</div><div class='add'>+			}</div><div class='add'>+			memcpy(old, newstats, sizeof(struct slic_stats));</div><div class='add'>+#endif</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	case SLIC_UPR_RLSR:</div><div class='add'>+		slic_link_upr_complete(adapter, isr);</div><div class='add'>+		break;</div><div class='add'>+	case SLIC_UPR_RCONFIG:</div><div class='add'>+		break;</div><div class='add'>+	case SLIC_UPR_RPHY:</div><div class='add'>+		ASSERT(0);</div><div class='add'>+		break;</div><div class='add'>+	case SLIC_UPR_ENLB:</div><div class='add'>+		ASSERT(0);</div><div class='add'>+		break;</div><div class='add'>+	case SLIC_UPR_ENCT:</div><div class='add'>+		ASSERT(0);</div><div class='add'>+		break;</div><div class='add'>+	case SLIC_UPR_PDWN:</div><div class='add'>+		ASSERT(0);</div><div class='add'>+		break;</div><div class='add'>+	case SLIC_UPR_PING:</div><div class='add'>+		card-&gt;pingstatus |= (isr &amp; ISR_PINGDSMASK);</div><div class='add'>+		break;</div><div class='add'>+#if SLIC_DUMP_ENABLED</div><div class='add'>+	case SLIC_UPR_DUMP:</div><div class='add'>+		card-&gt;dumpstatus |= (isr &amp; ISR_UPCMASK);</div><div class='add'>+		break;</div><div class='add'>+#endif</div><div class='add'>+	default:</div><div class='add'>+		ASSERT(0);</div><div class='add'>+	}</div><div class='add'>+	kfree(upr);</div><div class='add'>+	slic_upr_start(adapter);</div><div class='add'>+	spin_unlock_irqrestore(&amp;adapter-&gt;upr_lock.lock,</div><div class='add'>+				adapter-&gt;upr_lock.flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void slic_upr_start(struct adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	struct slic_upr *upr;</div><div class='add'>+	__iomem struct slic_regs *slic_regs = adapter-&gt;slic_regs;</div><div class='add'>+/*</div><div class='add'>+    char * ptr1;</div><div class='add'>+    char * ptr2;</div><div class='add'>+    uint cmdoffset;</div><div class='add'>+*/</div><div class='add'>+	upr = adapter-&gt;upr_list;</div><div class='add'>+	if (!upr)</div><div class='add'>+		return;</div><div class='add'>+	if (adapter-&gt;upr_busy)</div><div class='add'>+		return;</div><div class='add'>+	adapter-&gt;upr_busy = 1;</div><div class='add'>+</div><div class='add'>+	switch (upr-&gt;upr_request) {</div><div class='add'>+	case SLIC_UPR_STATS:</div><div class='add'>+		if (upr-&gt;upr_data_h == 0) {</div><div class='add'>+			WRITE_REG(slic_regs-&gt;slic_stats, upr-&gt;upr_data, FLUSH);</div><div class='add'>+		} else {</div><div class='add'>+			WRITE_REG64(adapter,</div><div class='add'>+				    slic_regs-&gt;slic_stats64,</div><div class='add'>+				    upr-&gt;upr_data,</div><div class='add'>+				    slic_regs-&gt;slic_addr_upper,</div><div class='add'>+				    upr-&gt;upr_data_h, FLUSH);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case SLIC_UPR_RLSR:</div><div class='add'>+		WRITE_REG64(adapter,</div><div class='add'>+			    slic_regs-&gt;slic_rlsr,</div><div class='add'>+			    upr-&gt;upr_data,</div><div class='add'>+			    slic_regs-&gt;slic_addr_upper, upr-&gt;upr_data_h, FLUSH);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case SLIC_UPR_RCONFIG:</div><div class='add'>+		DBG_MSG("%s SLIC_UPR_RCONFIG!!!!\n", __func__);</div><div class='add'>+		DBG_MSG("WRITE_REG64 adapter[%p]\n"</div><div class='add'>+			"    a-&gt;slic_regs[%p] slic_regs[%p]\n"</div><div class='add'>+			"    &amp;slic_rconfig[%p] &amp;slic_addr_upper[%p]\n"</div><div class='add'>+			"    upr[%p]\n"</div><div class='add'>+			"    uprdata[%x] uprdatah[%x]\n",</div><div class='add'>+			adapter, adapter-&gt;slic_regs, slic_regs,</div><div class='add'>+			&amp;slic_regs-&gt;slic_rconfig, &amp;slic_regs-&gt;slic_addr_upper,</div><div class='add'>+			upr, upr-&gt;upr_data, upr-&gt;upr_data_h);</div><div class='add'>+		WRITE_REG64(adapter,</div><div class='add'>+			    slic_regs-&gt;slic_rconfig,</div><div class='add'>+			    upr-&gt;upr_data,</div><div class='add'>+			    slic_regs-&gt;slic_addr_upper, upr-&gt;upr_data_h, FLUSH);</div><div class='add'>+		break;</div><div class='add'>+#if SLIC_DUMP_ENABLED</div><div class='add'>+	case SLIC_UPR_DUMP:</div><div class='add'>+#if 0</div><div class='add'>+		DBG_MSG("%s SLIC_UPR_DUMP!!!!\n", __func__);</div><div class='add'>+		DBG_MSG("WRITE_REG64 adapter[%p]\n"</div><div class='add'>+			 "    upr_buffer[%x]   upr_bufferh[%x]\n"</div><div class='add'>+			 "    upr_data[%x]     upr_datah[%x]\n"</div><div class='add'>+			 "    cmdbuff[%p] cmdbuffP[%p]\n"</div><div class='add'>+			 "    dumpbuff[%p] dumpbuffP[%p]\n",</div><div class='add'>+			 adapter, upr-&gt;upr_buffer, upr-&gt;upr_buffer_h,</div><div class='add'>+			 upr-&gt;upr_data, upr-&gt;upr_data_h,</div><div class='add'>+			 adapter-&gt;card-&gt;cmdbuffer,</div><div class='add'>+			 (void *)adapter-&gt;card-&gt;cmdbuffer_phys,</div><div class='add'>+			 adapter-&gt;card-&gt;dumpbuffer, (</div><div class='add'>+			 void *)adapter-&gt;card-&gt;dumpbuffer_phys);</div><div class='add'>+</div><div class='add'>+		ptr1 = (char *)slic_regs;</div><div class='add'>+		ptr2 = (char *)(&amp;slic_regs-&gt;slic_dump_cmd);</div><div class='add'>+		cmdoffset = ptr2 - ptr1;</div><div class='add'>+		DBG_MSG("slic_dump_cmd register offset [%x]\n", cmdoffset);</div><div class='add'>+#endif</div><div class='add'>+		if (upr-&gt;upr_buffer || upr-&gt;upr_buffer_h) {</div><div class='add'>+			WRITE_REG64(adapter,</div><div class='add'>+				    slic_regs-&gt;slic_dump_data,</div><div class='add'>+				    upr-&gt;upr_buffer,</div><div class='add'>+				    slic_regs-&gt;slic_addr_upper,</div><div class='add'>+				    upr-&gt;upr_buffer_h, FLUSH);</div><div class='add'>+		}</div><div class='add'>+		WRITE_REG64(adapter,</div><div class='add'>+			    slic_regs-&gt;slic_dump_cmd,</div><div class='add'>+			    upr-&gt;upr_data,</div><div class='add'>+			    slic_regs-&gt;slic_addr_upper, upr-&gt;upr_data_h, FLUSH);</div><div class='add'>+		break;</div><div class='add'>+#endif</div><div class='add'>+	case SLIC_UPR_PING:</div><div class='add'>+		WRITE_REG(slic_regs-&gt;slic_ping, 1, FLUSH);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ASSERT(0);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void slic_link_upr_complete(struct adapter *adapter, u32 isr)</div><div class='add'>+{</div><div class='add'>+	u32 linkstatus = adapter-&gt;pshmem-&gt;linkstatus;</div><div class='add'>+	uint linkup;</div><div class='add'>+	unsigned char linkspeed;</div><div class='add'>+	unsigned char linkduplex;</div><div class='add'>+</div><div class='add'>+	DBG_MSG("%s: %s ISR[%x] linkstatus[%x]\n   adapter[%p](%d)\n",</div><div class='add'>+		__func__, adapter-&gt;netdev-&gt;name, isr, linkstatus, adapter,</div><div class='add'>+		adapter-&gt;cardindex);</div><div class='add'>+</div><div class='add'>+	if ((isr &amp; ISR_UPCERR) || (isr &amp; ISR_UPCBSY)) {</div><div class='add'>+		struct slic_shmem *pshmem;</div><div class='add'>+</div><div class='add'>+		pshmem = (struct slic_shmem *)adapter-&gt;phys_shmem;</div><div class='add'>+#if defined(CONFIG_X86_64)</div><div class='add'>+		slic_upr_queue_request(adapter,</div><div class='add'>+				       SLIC_UPR_RLSR,</div><div class='add'>+				       SLIC_GET_ADDR_LOW(&amp;pshmem-&gt;linkstatus),</div><div class='add'>+				       SLIC_GET_ADDR_HIGH(&amp;pshmem-&gt;linkstatus),</div><div class='add'>+				       0, 0);</div><div class='add'>+#elif defined(CONFIG_X86)</div><div class='add'>+		slic_upr_queue_request(adapter,</div><div class='add'>+				       SLIC_UPR_RLSR,</div><div class='add'>+				       (u32) &amp;pshmem-&gt;linkstatus,</div><div class='add'>+				       SLIC_GET_ADDR_HIGH(pshmem), 0, 0);</div><div class='add'>+#else</div><div class='add'>+		Stop Compilation;</div><div class='add'>+#endif</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	if (adapter-&gt;state != ADAPT_UP)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ASSERT((adapter-&gt;devid == SLIC_1GB_DEVICE_ID)</div><div class='add'>+	       || (adapter-&gt;devid == SLIC_2GB_DEVICE_ID));</div><div class='add'>+</div><div class='add'>+	linkup = linkstatus &amp; GIG_LINKUP ? LINK_UP : LINK_DOWN;</div><div class='add'>+	if (linkstatus &amp; GIG_SPEED_1000) {</div><div class='add'>+		linkspeed = LINK_1000MB;</div><div class='add'>+		DBG_MSG("slicoss: %s (%s) GIGABIT Speed==1000MB  ",</div><div class='add'>+			__func__, adapter-&gt;netdev-&gt;name);</div><div class='add'>+	} else if (linkstatus &amp; GIG_SPEED_100) {</div><div class='add'>+		linkspeed = LINK_100MB;</div><div class='add'>+		DBG_MSG("slicoss: %s (%s) GIGABIT Speed==100MB  ", __func__,</div><div class='add'>+			adapter-&gt;netdev-&gt;name);</div><div class='add'>+	} else {</div><div class='add'>+		linkspeed = LINK_10MB;</div><div class='add'>+		DBG_MSG("slicoss: %s (%s) GIGABIT Speed==10MB  ", __func__,</div><div class='add'>+			adapter-&gt;netdev-&gt;name);</div><div class='add'>+	}</div><div class='add'>+	if (linkstatus &amp; GIG_FULLDUPLEX) {</div><div class='add'>+		linkduplex = LINK_FULLD;</div><div class='add'>+		DBG_MSG(" Duplex == FULL\n");</div><div class='add'>+	} else {</div><div class='add'>+		linkduplex = LINK_HALFD;</div><div class='add'>+		DBG_MSG(" Duplex == HALF\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((adapter-&gt;linkstate == LINK_DOWN) &amp;&amp; (linkup == LINK_DOWN)) {</div><div class='add'>+		DBG_MSG("slicoss: %s (%s) physport(%d) link still down\n",</div><div class='add'>+			__func__, adapter-&gt;netdev-&gt;name, adapter-&gt;physport);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* link up event, but nothing has changed */</div><div class='add'>+	if ((adapter-&gt;linkstate == LINK_UP) &amp;&amp;</div><div class='add'>+	    (linkup == LINK_UP) &amp;&amp;</div><div class='add'>+	    (adapter-&gt;linkspeed == linkspeed) &amp;&amp;</div><div class='add'>+	    (adapter-&gt;linkduplex == linkduplex)) {</div><div class='add'>+		DBG_MSG("slicoss: %s (%s) port(%d) link still up\n",</div><div class='add'>+			__func__, adapter-&gt;netdev-&gt;name, adapter-&gt;physport);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* link has changed at this point */</div><div class='add'>+</div><div class='add'>+	/* link has gone from up to down */</div><div class='add'>+	if (linkup == LINK_DOWN) {</div><div class='add'>+		adapter-&gt;linkstate = LINK_DOWN;</div><div class='add'>+		DBG_MSG("slicoss: %s %d LinkDown!\n", __func__,</div><div class='add'>+			adapter-&gt;physport);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* link has gone from down to up */</div><div class='add'>+	adapter-&gt;linkspeed = linkspeed;</div><div class='add'>+	adapter-&gt;linkduplex = linkduplex;</div><div class='add'>+</div><div class='add'>+	if (adapter-&gt;linkstate != LINK_UP) {</div><div class='add'>+		/* setup the mac */</div><div class='add'>+		DBG_MSG("%s call slic_config_set\n", __func__);</div><div class='add'>+		slic_config_set(adapter, TRUE);</div><div class='add'>+		adapter-&gt;linkstate = LINK_UP;</div><div class='add'>+		DBG_MSG("\n(%s) Link UP: CALL slic_if_start_queue",</div><div class='add'>+			adapter-&gt;netdev-&gt;name);</div><div class='add'>+		slic_if_start_queue(adapter);</div><div class='add'>+	}</div><div class='add'>+#if 1</div><div class='add'>+	switch (linkspeed) {</div><div class='add'>+	case LINK_1000MB:</div><div class='add'>+		DBG_MSG</div><div class='add'>+		    ("\n(%s) LINK UP!: GIGABIT SPEED == 1000MB  duplex[%x]\n",</div><div class='add'>+		     adapter-&gt;netdev-&gt;name, adapter-&gt;linkduplex);</div><div class='add'>+		break;</div><div class='add'>+	case LINK_100MB:</div><div class='add'>+		DBG_MSG("\n(%s) LINK UP!: SPEED == 100MB  duplex[%x]\n",</div><div class='add'>+			adapter-&gt;netdev-&gt;name, adapter-&gt;linkduplex);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		DBG_MSG("\n(%s) LINK UP!: SPEED == 10MB  duplex[%x]\n",</div><div class='add'>+			adapter-&gt;netdev-&gt;name, adapter-&gt;linkduplex);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  this is here to checksum the eeprom, there is some ucode bug</div><div class='add'>+ *  which prevens us from using the ucode result.</div><div class='add'>+ *  remove this once ucode is fixed.</div><div class='add'>+ */</div><div class='add'>+static ushort slic_eeprom_cksum(char *m, int len)</div><div class='add'>+{</div><div class='add'>+#define ADDCARRY(x)  (x &gt; 65535 ? x -= 65535 : x)</div><div class='add'>+#define REDUCE {l_util.l = sum; sum = l_util.s[0] + l_util.s[1]; ADDCARRY(sum);\</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	u16 *w;</div><div class='add'>+	u32 sum = 0;</div><div class='add'>+	u32 byte_swapped = 0;</div><div class='add'>+	u32 w_int;</div><div class='add'>+</div><div class='add'>+	union {</div><div class='add'>+		char c[2];</div><div class='add'>+		ushort s;</div><div class='add'>+	} s_util;</div><div class='add'>+</div><div class='add'>+	union {</div><div class='add'>+		ushort s[2];</div><div class='add'>+		int l;</div><div class='add'>+	} l_util;</div><div class='add'>+</div><div class='add'>+	l_util.l = 0;</div><div class='add'>+	s_util.s = 0;</div><div class='add'>+</div><div class='add'>+	w = (u16 *)m;</div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='add'>+	w_int = (u32) ((ulong) w &amp; 0x00000000FFFFFFFF);</div><div class='add'>+#else</div><div class='add'>+	w_int = (u32) (w);</div><div class='add'>+#endif</div><div class='add'>+	if ((1 &amp; w_int) &amp;&amp; (len &gt; 0)) {</div><div class='add'>+		REDUCE;</div><div class='add'>+		sum &lt;&lt;= 8;</div><div class='add'>+		s_util.c[0] = *(unsigned char *)w;</div><div class='add'>+		w = (u16 *)((char *)w + 1);</div><div class='add'>+		len--;</div><div class='add'>+		byte_swapped = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Unroll the loop to make overhead from branches &amp;c small. */</div><div class='add'>+	while ((len -= 32) &gt;= 0) {</div><div class='add'>+		sum += w[0];</div><div class='add'>+		sum += w[1];</div><div class='add'>+		sum += w[2];</div><div class='add'>+		sum += w[3];</div><div class='add'>+		sum += w[4];</div><div class='add'>+		sum += w[5];</div><div class='add'>+		sum += w[6];</div><div class='add'>+		sum += w[7];</div><div class='add'>+		sum += w[8];</div><div class='add'>+		sum += w[9];</div><div class='add'>+		sum += w[10];</div><div class='add'>+		sum += w[11];</div><div class='add'>+		sum += w[12];</div><div class='add'>+		sum += w[13];</div><div class='add'>+		sum += w[14];</div><div class='add'>+		sum += w[15];</div><div class='add'>+		w = (u16 *)((ulong) w + 16);	/* verify */</div><div class='add'>+	}</div><div class='add'>+	len += 32;</div><div class='add'>+	while ((len -= 8) &gt;= 0) {</div><div class='add'>+		sum += w[0];</div><div class='add'>+		sum += w[1];</div><div class='add'>+		sum += w[2];</div><div class='add'>+		sum += w[3];</div><div class='add'>+		w = (u16 *)((ulong) w + 4);	/* verify */</div><div class='add'>+	}</div><div class='add'>+	len += 8;</div><div class='add'>+	if (len != 0 || byte_swapped != 0) {</div><div class='add'>+		REDUCE;</div><div class='add'>+		while ((len -= 2) &gt;= 0)</div><div class='add'>+			sum += *w++;	/* verify */</div><div class='add'>+		if (byte_swapped) {</div><div class='add'>+			REDUCE;</div><div class='add'>+			sum &lt;&lt;= 8;</div><div class='add'>+			byte_swapped = 0;</div><div class='add'>+			if (len == -1) {</div><div class='add'>+				s_util.c[1] = *(char *) w;</div><div class='add'>+				sum += s_util.s;</div><div class='add'>+				len = 0;</div><div class='add'>+			} else {</div><div class='add'>+				len = -1;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+		} else if (len == -1) {</div><div class='add'>+			s_util.c[0] = *(char *) w;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (len == -1) {</div><div class='add'>+			s_util.c[1] = 0;</div><div class='add'>+			sum += s_util.s;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	REDUCE;</div><div class='add'>+	return (ushort) sum;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int slic_rspqueue_init(struct adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	struct slic_rspqueue *rspq = &amp;adapter-&gt;rspqueue;</div><div class='add'>+	__iomem struct slic_regs *slic_regs = adapter-&gt;slic_regs;</div><div class='add'>+	u32 paddrh = 0;</div><div class='add'>+</div><div class='add'>+	DBG_MSG("slicoss: %s (%s) ENTER adapter[%p]\n", __func__,</div><div class='add'>+		adapter-&gt;netdev-&gt;name, adapter);</div><div class='add'>+	ASSERT(adapter-&gt;state == ADAPT_DOWN);</div><div class='add'>+	memset(rspq, 0, sizeof(struct slic_rspqueue));</div><div class='add'>+</div><div class='add'>+	rspq-&gt;num_pages = SLIC_RSPQ_PAGES_GB;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; rspq-&gt;num_pages; i++) {</div><div class='add'>+		rspq-&gt;vaddr[i] =</div><div class='add'>+		    pci_alloc_consistent(adapter-&gt;pcidev, PAGE_SIZE,</div><div class='add'>+					 &amp;rspq-&gt;paddr[i]);</div><div class='add'>+		if (!rspq-&gt;vaddr[i]) {</div><div class='add'>+			DBG_ERROR</div><div class='add'>+			    ("rspqueue_init_failed  pci_alloc_consistent\n");</div><div class='add'>+			slic_rspqueue_free(adapter);</div><div class='add'>+			return STATUS_FAILURE;</div><div class='add'>+		}</div><div class='add'>+#ifndef CONFIG_X86_64</div><div class='add'>+		ASSERT(((u32) rspq-&gt;vaddr[i] &amp; 0xFFFFF000) ==</div><div class='add'>+		       (u32) rspq-&gt;vaddr[i]);</div><div class='add'>+		ASSERT(((u32) rspq-&gt;paddr[i] &amp; 0xFFFFF000) ==</div><div class='add'>+		       (u32) rspq-&gt;paddr[i]);</div><div class='add'>+#endif</div><div class='add'>+		memset(rspq-&gt;vaddr[i], 0, PAGE_SIZE);</div><div class='add'>+/*              DBG_MSG("slicoss: %s UPLOAD RSPBUFF Page pageix[%x] paddr[%p] "</div><div class='add'>+			"vaddr[%p]\n",</div><div class='add'>+			__func__, i, (void *)rspq-&gt;paddr[i], rspq-&gt;vaddr[i]); */</div><div class='add'>+</div><div class='add'>+		if (paddrh == 0) {</div><div class='add'>+			WRITE_REG(slic_regs-&gt;slic_rbar,</div><div class='add'>+				  (rspq-&gt;paddr[i] | SLIC_RSPQ_BUFSINPAGE),</div><div class='add'>+				  DONT_FLUSH);</div><div class='add'>+		} else {</div><div class='add'>+			WRITE_REG64(adapter,</div><div class='add'>+				    slic_regs-&gt;slic_rbar64,</div><div class='add'>+				    (rspq-&gt;paddr[i] | SLIC_RSPQ_BUFSINPAGE),</div><div class='add'>+				    slic_regs-&gt;slic_addr_upper,</div><div class='add'>+				    paddrh, DONT_FLUSH);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	rspq-&gt;offset = 0;</div><div class='add'>+	rspq-&gt;pageindex = 0;</div><div class='add'>+	rspq-&gt;rspbuf = (struct slic_rspbuf *)rspq-&gt;vaddr[0];</div><div class='add'>+	DBG_MSG("slicoss: %s (%s) EXIT adapter[%p]\n", __func__,</div><div class='add'>+		adapter-&gt;netdev-&gt;name, adapter);</div><div class='add'>+	return STATUS_SUCCESS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int slic_rspqueue_reset(struct adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	struct slic_rspqueue *rspq = &amp;adapter-&gt;rspqueue;</div><div class='add'>+</div><div class='add'>+	DBG_MSG("slicoss: %s (%s) ENTER adapter[%p]\n", __func__,</div><div class='add'>+		adapter-&gt;netdev-&gt;name, adapter);</div><div class='add'>+	ASSERT(adapter-&gt;state == ADAPT_DOWN);</div><div class='add'>+	ASSERT(rspq);</div><div class='add'>+</div><div class='add'>+	DBG_MSG("slicoss: Nothing to do. rspq[%p]\n"</div><div class='add'>+		"                             offset[%x]\n"</div><div class='add'>+		"                             pageix[%x]\n"</div><div class='add'>+		"                             rspbuf[%p]\n",</div><div class='add'>+		rspq, rspq-&gt;offset, rspq-&gt;pageindex, rspq-&gt;rspbuf);</div><div class='add'>+</div><div class='add'>+	DBG_MSG("slicoss: %s (%s) EXIT adapter[%p]\n", __func__,</div><div class='add'>+		adapter-&gt;netdev-&gt;name, adapter);</div><div class='add'>+	return STATUS_SUCCESS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void slic_rspqueue_free(struct adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	struct slic_rspqueue *rspq = &amp;adapter-&gt;rspqueue;</div><div class='add'>+</div><div class='add'>+	DBG_MSG("slicoss: %s adapter[%p] port %d rspq[%p] FreeRSPQ\n",</div><div class='add'>+		__func__, adapter, adapter-&gt;physport, rspq);</div><div class='add'>+	for (i = 0; i &lt; rspq-&gt;num_pages; i++) {</div><div class='add'>+		if (rspq-&gt;vaddr[i]) {</div><div class='add'>+			DBG_MSG</div><div class='add'>+			    ("slicoss:  pci_free_consistent rspq-&gt;vaddr[%p] \</div><div class='add'>+			    paddr[%p]\n",</div><div class='add'>+			     rspq-&gt;vaddr[i], (void *) rspq-&gt;paddr[i]);</div><div class='add'>+			pci_free_consistent(adapter-&gt;pcidev, PAGE_SIZE,</div><div class='add'>+					    rspq-&gt;vaddr[i], rspq-&gt;paddr[i]);</div><div class='add'>+		}</div><div class='add'>+		rspq-&gt;vaddr[i] = NULL;</div><div class='add'>+		rspq-&gt;paddr[i] = 0;</div><div class='add'>+	}</div><div class='add'>+	rspq-&gt;offset = 0;</div><div class='add'>+	rspq-&gt;pageindex = 0;</div><div class='add'>+	rspq-&gt;rspbuf = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct slic_rspbuf *slic_rspqueue_getnext(struct adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	struct slic_rspqueue *rspq = &amp;adapter-&gt;rspqueue;</div><div class='add'>+	struct slic_rspbuf *buf;</div><div class='add'>+</div><div class='add'>+	if (!(rspq-&gt;rspbuf-&gt;status))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	buf = rspq-&gt;rspbuf;</div><div class='add'>+#ifndef CONFIG_X86_64</div><div class='add'>+	ASSERT((buf-&gt;status &amp; 0xFFFFFFE0) == 0);</div><div class='add'>+#endif</div><div class='add'>+	ASSERT(buf-&gt;hosthandle);</div><div class='add'>+	if (++rspq-&gt;offset &lt; SLIC_RSPQ_BUFSINPAGE) {</div><div class='add'>+		rspq-&gt;rspbuf++;</div><div class='add'>+#ifndef CONFIG_X86_64</div><div class='add'>+		ASSERT(((u32) rspq-&gt;rspbuf &amp; 0xFFFFFFE0) ==</div><div class='add'>+		       (u32) rspq-&gt;rspbuf);</div><div class='add'>+#endif</div><div class='add'>+	} else {</div><div class='add'>+		ASSERT(rspq-&gt;offset == SLIC_RSPQ_BUFSINPAGE);</div><div class='add'>+		WRITE_REG64(adapter,</div><div class='add'>+			    adapter-&gt;slic_regs-&gt;slic_rbar64,</div><div class='add'>+			    (rspq-&gt;</div><div class='add'>+			     paddr[rspq-&gt;pageindex] | SLIC_RSPQ_BUFSINPAGE),</div><div class='add'>+			    adapter-&gt;slic_regs-&gt;slic_addr_upper, 0, DONT_FLUSH);</div><div class='add'>+		rspq-&gt;pageindex = (++rspq-&gt;pageindex) % rspq-&gt;num_pages;</div><div class='add'>+		rspq-&gt;offset = 0;</div><div class='add'>+		rspq-&gt;rspbuf = (struct slic_rspbuf *)</div><div class='add'>+						rspq-&gt;vaddr[rspq-&gt;pageindex];</div><div class='add'>+#ifndef CONFIG_X86_64</div><div class='add'>+		ASSERT(((u32) rspq-&gt;rspbuf &amp; 0xFFFFF000) ==</div><div class='add'>+		       (u32) rspq-&gt;rspbuf);</div><div class='add'>+#endif</div><div class='add'>+	}</div><div class='add'>+#ifndef CONFIG_X86_64</div><div class='add'>+	ASSERT(((u32) buf &amp; 0xFFFFFFE0) == (u32) buf);</div><div class='add'>+#endif</div><div class='add'>+	return buf;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void slic_cmdqmem_init(struct adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	struct slic_cmdqmem *cmdqmem = &amp;adapter-&gt;cmdqmem;</div><div class='add'>+</div><div class='add'>+	memset(cmdqmem, 0, sizeof(struct slic_cmdqmem));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void slic_cmdqmem_free(struct adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	struct slic_cmdqmem *cmdqmem = &amp;adapter-&gt;cmdqmem;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	DBG_MSG("slicoss: (%s) adapter[%p] port %d rspq[%p] Free CMDQ Memory\n",</div><div class='add'>+		__func__, adapter, adapter-&gt;physport, cmdqmem);</div><div class='add'>+	for (i = 0; i &lt; SLIC_CMDQ_MAXPAGES; i++) {</div><div class='add'>+		if (cmdqmem-&gt;pages[i]) {</div><div class='add'>+			DBG_MSG("slicoss: %s Deallocate page  CmdQPage[%p]\n",</div><div class='add'>+				__func__, (void *) cmdqmem-&gt;pages[i]);</div><div class='add'>+			pci_free_consistent(adapter-&gt;pcidev,</div><div class='add'>+					    PAGE_SIZE,</div><div class='add'>+					    (void *) cmdqmem-&gt;pages[i],</div><div class='add'>+					    cmdqmem-&gt;dma_pages[i]);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	memset(cmdqmem, 0, sizeof(struct slic_cmdqmem));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 *slic_cmdqmem_addpage(struct adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	struct slic_cmdqmem *cmdqmem = &amp;adapter-&gt;cmdqmem;</div><div class='add'>+	u32 *pageaddr;</div><div class='add'>+</div><div class='add'>+	if (cmdqmem-&gt;pagecnt &gt;= SLIC_CMDQ_MAXPAGES)</div><div class='add'>+		return NULL;</div><div class='add'>+	pageaddr = pci_alloc_consistent(adapter-&gt;pcidev,</div><div class='add'>+					PAGE_SIZE,</div><div class='add'>+					&amp;cmdqmem-&gt;dma_pages[cmdqmem-&gt;pagecnt]);</div><div class='add'>+	if (!pageaddr)</div><div class='add'>+		return NULL;</div><div class='add'>+#ifndef CONFIG_X86_64</div><div class='add'>+	ASSERT(((u32) pageaddr &amp; 0xFFFFF000) == (u32) pageaddr);</div><div class='add'>+#endif</div><div class='add'>+	cmdqmem-&gt;pages[cmdqmem-&gt;pagecnt] = pageaddr;</div><div class='add'>+	cmdqmem-&gt;pagecnt++;</div><div class='add'>+	return pageaddr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int slic_cmdq_init(struct adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	u32 *pageaddr;</div><div class='add'>+</div><div class='add'>+	DBG_MSG("slicoss: %s ENTER adapter[%p]\n", __func__, adapter);</div><div class='add'>+	ASSERT(adapter-&gt;state == ADAPT_DOWN);</div><div class='add'>+	memset(&amp;adapter-&gt;cmdq_all, 0, sizeof(struct slic_cmdqueue));</div><div class='add'>+	memset(&amp;adapter-&gt;cmdq_free, 0, sizeof(struct slic_cmdqueue));</div><div class='add'>+	memset(&amp;adapter-&gt;cmdq_done, 0, sizeof(struct slic_cmdqueue));</div><div class='add'>+	spin_lock_init(&amp;adapter-&gt;cmdq_all.lock.lock);</div><div class='add'>+	spin_lock_init(&amp;adapter-&gt;cmdq_free.lock.lock);</div><div class='add'>+	spin_lock_init(&amp;adapter-&gt;cmdq_done.lock.lock);</div><div class='add'>+	slic_cmdqmem_init(adapter);</div><div class='add'>+	adapter-&gt;slic_handle_ix = 1;</div><div class='add'>+	for (i = 0; i &lt; SLIC_CMDQ_INITPAGES; i++) {</div><div class='add'>+		pageaddr = slic_cmdqmem_addpage(adapter);</div><div class='add'>+#ifndef CONFIG_X86_64</div><div class='add'>+		ASSERT(((u32) pageaddr &amp; 0xFFFFF000) == (u32) pageaddr);</div><div class='add'>+#endif</div><div class='add'>+		if (!pageaddr) {</div><div class='add'>+			slic_cmdq_free(adapter);</div><div class='add'>+			return STATUS_FAILURE;</div><div class='add'>+		}</div><div class='add'>+		slic_cmdq_addcmdpage(adapter, pageaddr);</div><div class='add'>+	}</div><div class='add'>+	adapter-&gt;slic_handle_ix = 1;</div><div class='add'>+	DBG_MSG("slicoss: %s reset slic_handle_ix to ONE\n", __func__);</div><div class='add'>+</div><div class='add'>+	return STATUS_SUCCESS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void slic_cmdq_free(struct adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	struct slic_hostcmd *cmd;</div><div class='add'>+</div><div class='add'>+	DBG_MSG("slicoss: %s adapter[%p] port %d FreeCommandsFrom CMDQ\n",</div><div class='add'>+		__func__, adapter, adapter-&gt;physport);</div><div class='add'>+	cmd = adapter-&gt;cmdq_all.head;</div><div class='add'>+	while (cmd) {</div><div class='add'>+		if (cmd-&gt;busy) {</div><div class='add'>+			struct sk_buff *tempskb;</div><div class='add'>+</div><div class='add'>+			tempskb = cmd-&gt;skb;</div><div class='add'>+			if (tempskb) {</div><div class='add'>+				cmd-&gt;skb = NULL;</div><div class='add'>+				dev_kfree_skb_irq(tempskb);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		cmd = cmd-&gt;next_all;</div><div class='add'>+	}</div><div class='add'>+	memset(&amp;adapter-&gt;cmdq_all, 0, sizeof(struct slic_cmdqueue));</div><div class='add'>+	memset(&amp;adapter-&gt;cmdq_free, 0, sizeof(struct slic_cmdqueue));</div><div class='add'>+	memset(&amp;adapter-&gt;cmdq_done, 0, sizeof(struct slic_cmdqueue));</div><div class='add'>+	slic_cmdqmem_free(adapter);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void slic_cmdq_reset(struct adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	struct slic_hostcmd *hcmd;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	u32 outstanding;</div><div class='add'>+</div><div class='add'>+	DBG_MSG("%s ENTER adapter[%p]\n", __func__, adapter);</div><div class='add'>+	spin_lock_irqsave(&amp;adapter-&gt;cmdq_free.lock.lock,</div><div class='add'>+			adapter-&gt;cmdq_free.lock.flags);</div><div class='add'>+	spin_lock_irqsave(&amp;adapter-&gt;cmdq_done.lock.lock,</div><div class='add'>+			adapter-&gt;cmdq_done.lock.flags);</div><div class='add'>+	outstanding = adapter-&gt;cmdq_all.count - adapter-&gt;cmdq_done.count;</div><div class='add'>+	outstanding -= adapter-&gt;cmdq_free.count;</div><div class='add'>+	hcmd = adapter-&gt;cmdq_all.head;</div><div class='add'>+	while (hcmd) {</div><div class='add'>+		if (hcmd-&gt;busy) {</div><div class='add'>+			skb = hcmd-&gt;skb;</div><div class='add'>+			ASSERT(skb);</div><div class='add'>+			DBG_MSG("slicoss: %s hcmd[%p] skb[%p] ", __func__,</div><div class='add'>+				hcmd, skb);</div><div class='add'>+			hcmd-&gt;busy = 0;</div><div class='add'>+			hcmd-&gt;skb = NULL;</div><div class='add'>+			DBG_MSG(" Free SKB\n");</div><div class='add'>+			dev_kfree_skb_irq(skb);</div><div class='add'>+		}</div><div class='add'>+		hcmd = hcmd-&gt;next_all;</div><div class='add'>+	}</div><div class='add'>+	adapter-&gt;cmdq_free.count = 0;</div><div class='add'>+	adapter-&gt;cmdq_free.head = NULL;</div><div class='add'>+	adapter-&gt;cmdq_free.tail = NULL;</div><div class='add'>+	adapter-&gt;cmdq_done.count = 0;</div><div class='add'>+	adapter-&gt;cmdq_done.head = NULL;</div><div class='add'>+	adapter-&gt;cmdq_done.tail = NULL;</div><div class='add'>+	adapter-&gt;cmdq_free.head = adapter-&gt;cmdq_all.head;</div><div class='add'>+	hcmd = adapter-&gt;cmdq_all.head;</div><div class='add'>+	while (hcmd) {</div><div class='add'>+		adapter-&gt;cmdq_free.count++;</div><div class='add'>+		hcmd-&gt;next = hcmd-&gt;next_all;</div><div class='add'>+		hcmd = hcmd-&gt;next_all;</div><div class='add'>+	}</div><div class='add'>+	if (adapter-&gt;cmdq_free.count != adapter-&gt;cmdq_all.count) {</div><div class='add'>+		DBG_ERROR("%s free_count %d != all count %d\n", __func__,</div><div class='add'>+			  adapter-&gt;cmdq_free.count, adapter-&gt;cmdq_all.count);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;adapter-&gt;cmdq_done.lock.lock,</div><div class='add'>+				adapter-&gt;cmdq_done.lock.flags);</div><div class='add'>+	spin_unlock_irqrestore(&amp;adapter-&gt;cmdq_free.lock.lock,</div><div class='add'>+				adapter-&gt;cmdq_free.lock.flags);</div><div class='add'>+	DBG_MSG("%s EXIT adapter[%p]\n", __func__, adapter);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void slic_cmdq_addcmdpage(struct adapter *adapter, u32 *page)</div><div class='add'>+{</div><div class='add'>+	struct slic_hostcmd *cmd;</div><div class='add'>+	struct slic_hostcmd *prev;</div><div class='add'>+	struct slic_hostcmd *tail;</div><div class='add'>+	struct slic_cmdqueue *cmdq;</div><div class='add'>+	int cmdcnt;</div><div class='add'>+	void *cmdaddr;</div><div class='add'>+	ulong phys_addr;</div><div class='add'>+	u32 phys_addrl;</div><div class='add'>+	u32 phys_addrh;</div><div class='add'>+	struct slic_handle *pslic_handle;</div><div class='add'>+</div><div class='add'>+	cmdaddr = page;</div><div class='add'>+	cmd = (struct slic_hostcmd *)cmdaddr;</div><div class='add'>+/*  DBG_MSG("CMDQ Page addr[%p] ix[%d] pfree[%p]\n", cmdaddr, slic_handle_ix,</div><div class='add'>+    adapter-&gt;pfree_slic_handles); */</div><div class='add'>+	cmdcnt = 0;</div><div class='add'>+</div><div class='add'>+	phys_addr = virt_to_bus((void *)page);</div><div class='add'>+	phys_addrl = SLIC_GET_ADDR_LOW(phys_addr);</div><div class='add'>+	phys_addrh = SLIC_GET_ADDR_HIGH(phys_addr);</div><div class='add'>+</div><div class='add'>+	prev = NULL;</div><div class='add'>+	tail = cmd;</div><div class='add'>+	while ((cmdcnt &lt; SLIC_CMDQ_CMDSINPAGE) &amp;&amp;</div><div class='add'>+	       (adapter-&gt;slic_handle_ix &lt; 256)) {</div><div class='add'>+		/* Allocate and initialize a SLIC_HANDLE for this command */</div><div class='add'>+		SLIC_GET_SLIC_HANDLE(adapter, pslic_handle);</div><div class='add'>+		if (pslic_handle == NULL)</div><div class='add'>+			ASSERT(0);</div><div class='add'>+		ASSERT(pslic_handle ==</div><div class='add'>+		       &amp;adapter-&gt;slic_handles[pslic_handle-&gt;token.</div><div class='add'>+					      handle_index]);</div><div class='add'>+		pslic_handle-&gt;type = SLIC_HANDLE_CMD;</div><div class='add'>+		pslic_handle-&gt;address = (void *) cmd;</div><div class='add'>+		pslic_handle-&gt;offset = (ushort) adapter-&gt;slic_handle_ix++;</div><div class='add'>+		pslic_handle-&gt;other_handle = NULL;</div><div class='add'>+		pslic_handle-&gt;next = NULL;</div><div class='add'>+</div><div class='add'>+		cmd-&gt;pslic_handle = pslic_handle;</div><div class='add'>+		cmd-&gt;cmd64.hosthandle = pslic_handle-&gt;token.handle_token;</div><div class='add'>+		cmd-&gt;busy = FALSE;</div><div class='add'>+		cmd-&gt;paddrl = phys_addrl;</div><div class='add'>+		cmd-&gt;paddrh = phys_addrh;</div><div class='add'>+		cmd-&gt;next_all = prev;</div><div class='add'>+		cmd-&gt;next = prev;</div><div class='add'>+		prev = cmd;</div><div class='add'>+		phys_addrl += SLIC_HOSTCMD_SIZE;</div><div class='add'>+		cmdaddr += SLIC_HOSTCMD_SIZE;</div><div class='add'>+</div><div class='add'>+		cmd = (struct slic_hostcmd *)cmdaddr;</div><div class='add'>+		cmdcnt++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cmdq = &amp;adapter-&gt;cmdq_all;</div><div class='add'>+	cmdq-&gt;count += cmdcnt;	/*  SLIC_CMDQ_CMDSINPAGE;   mooktodo */</div><div class='add'>+	tail-&gt;next_all = cmdq-&gt;head;</div><div class='add'>+	ASSERT(VALID_ADDRESS(prev));</div><div class='add'>+	cmdq-&gt;head = prev;</div><div class='add'>+	cmdq = &amp;adapter-&gt;cmdq_free;</div><div class='add'>+	spin_lock_irqsave(&amp;cmdq-&gt;lock.lock, cmdq-&gt;lock.flags);</div><div class='add'>+	cmdq-&gt;count += cmdcnt;	/*  SLIC_CMDQ_CMDSINPAGE;   mooktodo */</div><div class='add'>+	tail-&gt;next = cmdq-&gt;head;</div><div class='add'>+	ASSERT(VALID_ADDRESS(prev));</div><div class='add'>+	cmdq-&gt;head = prev;</div><div class='add'>+	spin_unlock_irqrestore(&amp;cmdq-&gt;lock.lock, cmdq-&gt;lock.flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct slic_hostcmd *slic_cmdq_getfree(struct adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	struct slic_cmdqueue *cmdq = &amp;adapter-&gt;cmdq_free;</div><div class='add'>+	struct slic_hostcmd *cmd = NULL;</div><div class='add'>+</div><div class='add'>+lock_and_retry:</div><div class='add'>+	spin_lock_irqsave(&amp;cmdq-&gt;lock.lock, cmdq-&gt;lock.flags);</div><div class='add'>+retry:</div><div class='add'>+	cmd = cmdq-&gt;head;</div><div class='add'>+	if (cmd) {</div><div class='add'>+		cmdq-&gt;head = cmd-&gt;next;</div><div class='add'>+		cmdq-&gt;count--;</div><div class='add'>+		spin_unlock_irqrestore(&amp;cmdq-&gt;lock.lock, cmdq-&gt;lock.flags);</div><div class='add'>+	} else {</div><div class='add'>+		slic_cmdq_getdone(adapter);</div><div class='add'>+		cmd = cmdq-&gt;head;</div><div class='add'>+		if (cmd) {</div><div class='add'>+			goto retry;</div><div class='add'>+		} else {</div><div class='add'>+			u32 *pageaddr;</div><div class='add'>+</div><div class='add'>+			spin_unlock_irqrestore(&amp;cmdq-&gt;lock.lock,</div><div class='add'>+						cmdq-&gt;lock.flags);</div><div class='add'>+			pageaddr = slic_cmdqmem_addpage(adapter);</div><div class='add'>+			if (pageaddr) {</div><div class='add'>+				slic_cmdq_addcmdpage(adapter, pageaddr);</div><div class='add'>+				goto lock_and_retry;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return cmd;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void slic_cmdq_getdone(struct adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	struct slic_cmdqueue *done_cmdq = &amp;adapter-&gt;cmdq_done;</div><div class='add'>+	struct slic_cmdqueue *free_cmdq = &amp;adapter-&gt;cmdq_free;</div><div class='add'>+</div><div class='add'>+	ASSERT(free_cmdq-&gt;head == NULL);</div><div class='add'>+	spin_lock_irqsave(&amp;done_cmdq-&gt;lock.lock, done_cmdq-&gt;lock.flags);</div><div class='add'>+	ASSERT(VALID_ADDRESS(done_cmdq-&gt;head));</div><div class='add'>+</div><div class='add'>+	free_cmdq-&gt;head = done_cmdq-&gt;head;</div><div class='add'>+	free_cmdq-&gt;count = done_cmdq-&gt;count;</div><div class='add'>+	done_cmdq-&gt;head = NULL;</div><div class='add'>+	done_cmdq-&gt;tail = NULL;</div><div class='add'>+	done_cmdq-&gt;count = 0;</div><div class='add'>+	spin_unlock_irqrestore(&amp;done_cmdq-&gt;lock.lock, done_cmdq-&gt;lock.flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void slic_cmdq_putdone_irq(struct adapter *adapter,</div><div class='add'>+				struct slic_hostcmd *cmd)</div><div class='add'>+{</div><div class='add'>+	struct slic_cmdqueue *cmdq = &amp;adapter-&gt;cmdq_done;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;cmdq-&gt;lock.lock);</div><div class='add'>+	cmd-&gt;busy = 0;</div><div class='add'>+	ASSERT(VALID_ADDRESS(cmdq-&gt;head));</div><div class='add'>+	cmd-&gt;next = cmdq-&gt;head;</div><div class='add'>+	ASSERT(VALID_ADDRESS(cmd));</div><div class='add'>+	cmdq-&gt;head = cmd;</div><div class='add'>+	cmdq-&gt;count++;</div><div class='add'>+	if ((adapter-&gt;xmitq_full) &amp;&amp; (cmdq-&gt;count &gt; 10))</div><div class='add'>+		netif_wake_queue(adapter-&gt;netdev);</div><div class='add'>+	spin_unlock(&amp;cmdq-&gt;lock.lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int slic_rcvqueue_init(struct adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	int i, count;</div><div class='add'>+	struct slic_rcvqueue *rcvq = &amp;adapter-&gt;rcvqueue;</div><div class='add'>+</div><div class='add'>+	DBG_MSG("slicoss: %s ENTER adapter[%p]\n", __func__, adapter);</div><div class='add'>+	ASSERT(adapter-&gt;state == ADAPT_DOWN);</div><div class='add'>+	rcvq-&gt;tail = NULL;</div><div class='add'>+	rcvq-&gt;head = NULL;</div><div class='add'>+	rcvq-&gt;size = SLIC_RCVQ_ENTRIES;</div><div class='add'>+	rcvq-&gt;errors = 0;</div><div class='add'>+	rcvq-&gt;count = 0;</div><div class='add'>+	i = (SLIC_RCVQ_ENTRIES / SLIC_RCVQ_FILLENTRIES);</div><div class='add'>+	count = 0;</div><div class='add'>+	while (i) {</div><div class='add'>+		count += slic_rcvqueue_fill(adapter);</div><div class='add'>+		i--;</div><div class='add'>+	}</div><div class='add'>+	if (rcvq-&gt;count &lt; SLIC_RCVQ_MINENTRIES) {</div><div class='add'>+		slic_rcvqueue_free(adapter);</div><div class='add'>+		return STATUS_FAILURE;</div><div class='add'>+	}</div><div class='add'>+	DBG_MSG("slicoss: %s EXIT adapter[%p]\n", __func__, adapter);</div><div class='add'>+	return STATUS_SUCCESS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int slic_rcvqueue_reset(struct adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	struct slic_rcvqueue *rcvq = &amp;adapter-&gt;rcvqueue;</div><div class='add'>+</div><div class='add'>+	DBG_MSG("slicoss: %s ENTER adapter[%p]\n", __func__, adapter);</div><div class='add'>+	ASSERT(adapter-&gt;state == ADAPT_DOWN);</div><div class='add'>+	ASSERT(rcvq);</div><div class='add'>+</div><div class='add'>+	DBG_MSG("slicoss: Nothing to do. rcvq[%p]\n"</div><div class='add'>+		"                             count[%x]\n"</div><div class='add'>+		"                             head[%p]\n"</div><div class='add'>+		"                             tail[%p]\n",</div><div class='add'>+		rcvq, rcvq-&gt;count, rcvq-&gt;head, rcvq-&gt;tail);</div><div class='add'>+</div><div class='add'>+	DBG_MSG("slicoss: %s EXIT adapter[%p]\n", __func__, adapter);</div><div class='add'>+	return STATUS_SUCCESS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void slic_rcvqueue_free(struct adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	struct slic_rcvqueue *rcvq = &amp;adapter-&gt;rcvqueue;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	while (rcvq-&gt;head) {</div><div class='add'>+		skb = rcvq-&gt;head;</div><div class='add'>+		rcvq-&gt;head = rcvq-&gt;head-&gt;next;</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+	}</div><div class='add'>+	rcvq-&gt;tail = NULL;</div><div class='add'>+	rcvq-&gt;head = NULL;</div><div class='add'>+	rcvq-&gt;count = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *slic_rcvqueue_getnext(struct adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	struct slic_rcvqueue *rcvq = &amp;adapter-&gt;rcvqueue;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct slic_rcvbuf *rcvbuf;</div><div class='add'>+	int count;</div><div class='add'>+</div><div class='add'>+	if (rcvq-&gt;count) {</div><div class='add'>+		skb = rcvq-&gt;head;</div><div class='add'>+		rcvbuf = (struct slic_rcvbuf *)skb-&gt;head;</div><div class='add'>+		ASSERT(rcvbuf);</div><div class='add'>+</div><div class='add'>+		if (rcvbuf-&gt;status &amp; IRHDDR_SVALID) {</div><div class='add'>+			rcvq-&gt;head = rcvq-&gt;head-&gt;next;</div><div class='add'>+			skb-&gt;next = NULL;</div><div class='add'>+			rcvq-&gt;count--;</div><div class='add'>+		} else {</div><div class='add'>+			skb = NULL;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		DBG_ERROR("RcvQ Empty!! adapter[%p] rcvq[%p] count[%x]\n",</div><div class='add'>+			  adapter, rcvq, rcvq-&gt;count);</div><div class='add'>+		skb = NULL;</div><div class='add'>+	}</div><div class='add'>+	while (rcvq-&gt;count &lt; SLIC_RCVQ_FILLTHRESH) {</div><div class='add'>+		count = slic_rcvqueue_fill(adapter);</div><div class='add'>+		if (!count)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	if (skb)</div><div class='add'>+		rcvq-&gt;errors = 0;</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int slic_rcvqueue_fill(struct adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	void *paddr;</div><div class='add'>+	u32 paddrl;</div><div class='add'>+	u32 paddrh;</div><div class='add'>+	struct slic_rcvqueue *rcvq = &amp;adapter-&gt;rcvqueue;</div><div class='add'>+	int i = 0;</div><div class='add'>+</div><div class='add'>+	while (i &lt; SLIC_RCVQ_FILLENTRIES) {</div><div class='add'>+		struct slic_rcvbuf *rcvbuf;</div><div class='add'>+		struct sk_buff *skb;</div><div class='add'>+#ifdef KLUDGE_FOR_4GB_BOUNDARY</div><div class='add'>+retry_rcvqfill:</div><div class='add'>+#endif</div><div class='add'>+		skb = alloc_skb(SLIC_RCVQ_RCVBUFSIZE, GFP_ATOMIC);</div><div class='add'>+		if (skb) {</div><div class='add'>+			paddr = (void *)pci_map_single(adapter-&gt;pcidev,</div><div class='add'>+							  skb-&gt;data,</div><div class='add'>+							  SLIC_RCVQ_RCVBUFSIZE,</div><div class='add'>+							  PCI_DMA_FROMDEVICE);</div><div class='add'>+			paddrl = SLIC_GET_ADDR_LOW(paddr);</div><div class='add'>+			paddrh = SLIC_GET_ADDR_HIGH(paddr);</div><div class='add'>+</div><div class='add'>+			skb-&gt;len = SLIC_RCVBUF_HEADSIZE;</div><div class='add'>+			rcvbuf = (struct slic_rcvbuf *)skb-&gt;head;</div><div class='add'>+			rcvbuf-&gt;status = 0;</div><div class='add'>+			skb-&gt;next = NULL;</div><div class='add'>+#ifdef KLUDGE_FOR_4GB_BOUNDARY</div><div class='add'>+			if (paddrl == 0) {</div><div class='add'>+				DBG_ERROR</div><div class='add'>+				    ("%s: LOW 32bits PHYSICAL ADDRESS == 0 "</div><div class='add'>+				     "skb[%p]   PROBLEM\n"</div><div class='add'>+				     "         skbdata[%p]\n"</div><div class='add'>+				     "         skblen[%x]\n"</div><div class='add'>+				     "         paddr[%p]\n"</div><div class='add'>+				     "         paddrl[%x]\n"</div><div class='add'>+				     "         paddrh[%x]\n", __func__, skb,</div><div class='add'>+				     skb-&gt;data, skb-&gt;len, paddr, paddrl,</div><div class='add'>+				     paddrh);</div><div class='add'>+				DBG_ERROR("         rcvq-&gt;head[%p]\n"</div><div class='add'>+					  "         rcvq-&gt;tail[%p]\n"</div><div class='add'>+					  "         rcvq-&gt;count[%x]\n",</div><div class='add'>+					  rcvq-&gt;head, rcvq-&gt;tail, rcvq-&gt;count);</div><div class='add'>+				DBG_ERROR("SKIP THIS SKB!!!!!!!!\n");</div><div class='add'>+				goto retry_rcvqfill;</div><div class='add'>+			}</div><div class='add'>+#else</div><div class='add'>+			if (paddrl == 0) {</div><div class='add'>+				DBG_ERROR</div><div class='add'>+				    ("\n\n%s: LOW 32bits PHYSICAL ADDRESS == 0 "</div><div class='add'>+				     "skb[%p]  GIVE TO CARD ANYWAY\n"</div><div class='add'>+				     "         skbdata[%p]\n"</div><div class='add'>+				     "         paddr[%p]\n"</div><div class='add'>+				     "         paddrl[%x]\n"</div><div class='add'>+				     "         paddrh[%x]\n", __func__, skb,</div><div class='add'>+				     skb-&gt;data, paddr, paddrl, paddrh);</div><div class='add'>+			}</div><div class='add'>+#endif</div><div class='add'>+			if (paddrh == 0) {</div><div class='add'>+				WRITE_REG(adapter-&gt;slic_regs-&gt;slic_hbar,</div><div class='add'>+					  (u32) paddrl, DONT_FLUSH);</div><div class='add'>+			} else {</div><div class='add'>+				WRITE_REG64(adapter,</div><div class='add'>+					    adapter-&gt;slic_regs-&gt;slic_hbar64,</div><div class='add'>+					    (u32) paddrl,</div><div class='add'>+					    adapter-&gt;slic_regs-&gt;slic_addr_upper,</div><div class='add'>+					    (u32) paddrh, DONT_FLUSH);</div><div class='add'>+			}</div><div class='add'>+			if (rcvq-&gt;head)</div><div class='add'>+				rcvq-&gt;tail-&gt;next = skb;</div><div class='add'>+			else</div><div class='add'>+				rcvq-&gt;head = skb;</div><div class='add'>+			rcvq-&gt;tail = skb;</div><div class='add'>+			rcvq-&gt;count++;</div><div class='add'>+			i++;</div><div class='add'>+		} else {</div><div class='add'>+			DBG_ERROR</div><div class='add'>+			    ("%s slic_rcvqueue_fill could only get [%d] "</div><div class='add'>+			     "skbuffs\n",</div><div class='add'>+			     adapter-&gt;netdev-&gt;name, i);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return i;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 slic_rcvqueue_reinsert(struct adapter *adapter, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct slic_rcvqueue *rcvq = &amp;adapter-&gt;rcvqueue;</div><div class='add'>+	void *paddr;</div><div class='add'>+	u32 paddrl;</div><div class='add'>+	u32 paddrh;</div><div class='add'>+	struct slic_rcvbuf *rcvbuf = (struct slic_rcvbuf *)skb-&gt;head;</div><div class='add'>+</div><div class='add'>+	ASSERT(skb-&gt;len == SLIC_RCVBUF_HEADSIZE);</div><div class='add'>+</div><div class='add'>+	paddr = (void *)pci_map_single(adapter-&gt;pcidev, skb-&gt;head,</div><div class='add'>+				  SLIC_RCVQ_RCVBUFSIZE, PCI_DMA_FROMDEVICE);</div><div class='add'>+	rcvbuf-&gt;status = 0;</div><div class='add'>+	skb-&gt;next = NULL;</div><div class='add'>+</div><div class='add'>+	paddrl = SLIC_GET_ADDR_LOW(paddr);</div><div class='add'>+	paddrh = SLIC_GET_ADDR_HIGH(paddr);</div><div class='add'>+</div><div class='add'>+	if (paddrl == 0) {</div><div class='add'>+		DBG_ERROR</div><div class='add'>+		    ("%s: LOW 32bits PHYSICAL ADDRESS == 0 skb[%p]   PROBLEM\n"</div><div class='add'>+		     "         skbdata[%p]\n" "         skblen[%x]\n"</div><div class='add'>+		     "         paddr[%p]\n" "         paddrl[%x]\n"</div><div class='add'>+		     "         paddrh[%x]\n", __func__, skb, skb-&gt;data,</div><div class='add'>+		     skb-&gt;len, paddr, paddrl, paddrh);</div><div class='add'>+		DBG_ERROR("         rcvq-&gt;head[%p]\n"</div><div class='add'>+			  "         rcvq-&gt;tail[%p]\n"</div><div class='add'>+			  "         rcvq-&gt;count[%x]\n", rcvq-&gt;head, rcvq-&gt;tail,</div><div class='add'>+			  rcvq-&gt;count);</div><div class='add'>+	}</div><div class='add'>+	if (paddrh == 0) {</div><div class='add'>+		WRITE_REG(adapter-&gt;slic_regs-&gt;slic_hbar, (u32) paddrl,</div><div class='add'>+			  DONT_FLUSH);</div><div class='add'>+	} else {</div><div class='add'>+		WRITE_REG64(adapter,</div><div class='add'>+			    adapter-&gt;slic_regs-&gt;slic_hbar64,</div><div class='add'>+			    paddrl,</div><div class='add'>+			    adapter-&gt;slic_regs-&gt;slic_addr_upper,</div><div class='add'>+			    paddrh, DONT_FLUSH);</div><div class='add'>+	}</div><div class='add'>+	if (rcvq-&gt;head)</div><div class='add'>+		rcvq-&gt;tail-&gt;next = skb;</div><div class='add'>+	else</div><div class='add'>+		rcvq-&gt;head = skb;</div><div class='add'>+	rcvq-&gt;tail = skb;</div><div class='add'>+	rcvq-&gt;count++;</div><div class='add'>+	return rcvq-&gt;count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int slic_debug_card_show(struct seq_file *seq, void *v)</div><div class='add'>+{</div><div class='add'>+#ifdef MOOKTODO</div><div class='add'>+	int i;</div><div class='add'>+	struct sliccard *card = seq-&gt;private;</div><div class='add'>+	struct slic_config *config = &amp;card-&gt;config;</div><div class='add'>+	unsigned char *fru = (unsigned char *)(&amp;card-&gt;config.atk_fru);</div><div class='add'>+	unsigned char *oemfru = (unsigned char *)(&amp;card-&gt;config.OemFru);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	seq_printf(seq, "driver_version           : %s", slic_proc_version);</div><div class='add'>+	seq_printf(seq, "Microcode versions:           \n");</div><div class='add'>+	seq_printf(seq, "    Gigabit (gb)         : %s %s\n",</div><div class='add'>+		    MOJAVE_UCODE_VERS_STRING, MOJAVE_UCODE_VERS_DATE);</div><div class='add'>+	seq_printf(seq, "    Gigabit Receiver     : %s %s\n",</div><div class='add'>+		    GB_RCVUCODE_VERS_STRING, GB_RCVUCODE_VERS_DATE);</div><div class='add'>+	seq_printf(seq, "Vendor                   : %s\n", slic_vendor);</div><div class='add'>+	seq_printf(seq, "Product Name             : %s\n", slic_product_name);</div><div class='add'>+#ifdef MOOKTODO</div><div class='add'>+	seq_printf(seq, "VendorId                 : %4.4X\n",</div><div class='add'>+		    config-&gt;VendorId);</div><div class='add'>+	seq_printf(seq, "DeviceId                 : %4.4X\n",</div><div class='add'>+		    config-&gt;DeviceId);</div><div class='add'>+	seq_printf(seq, "RevisionId               : %2.2x\n",</div><div class='add'>+		    config-&gt;RevisionId);</div><div class='add'>+	seq_printf(seq, "Bus    #                 : %d\n", card-&gt;busnumber);</div><div class='add'>+	seq_printf(seq, "Device #                 : %d\n", card-&gt;slotnumber);</div><div class='add'>+	seq_printf(seq, "Interfaces               : %d\n", card-&gt;card_size);</div><div class='add'>+	seq_printf(seq, "     Initialized         : %d\n",</div><div class='add'>+		    card-&gt;adapters_activated);</div><div class='add'>+	seq_printf(seq, "     Allocated           : %d\n",</div><div class='add'>+		    card-&gt;adapters_allocated);</div><div class='add'>+	ASSERT(card-&gt;card_size &lt;= SLIC_NBR_MACS);</div><div class='add'>+	for (i = 0; i &lt; card-&gt;card_size; i++) {</div><div class='add'>+		seq_printf(seq,</div><div class='add'>+			   "     MAC%d : %2.2X %2.2X %2.2X %2.2X %2.2X %2.2X\n",</div><div class='add'>+			   i, config-&gt;macinfo[i].macaddrA[0],</div><div class='add'>+			   config-&gt;macinfo[i].macaddrA[1],</div><div class='add'>+			   config-&gt;macinfo[i].macaddrA[2],</div><div class='add'>+			   config-&gt;macinfo[i].macaddrA[3],</div><div class='add'>+			   config-&gt;macinfo[i].macaddrA[4],</div><div class='add'>+			   config-&gt;macinfo[i].macaddrA[5]);</div><div class='add'>+	}</div><div class='add'>+	seq_printf(seq, "     IF  Init State Duplex/Speed irq\n");</div><div class='add'>+	seq_printf(seq, "     -------------------------------\n");</div><div class='add'>+	for (i = 0; i &lt; card-&gt;adapters_allocated; i++) {</div><div class='add'>+		struct adapter *adapter;</div><div class='add'>+</div><div class='add'>+		adapter = card-&gt;adapter[i];</div><div class='add'>+		if (adapter) {</div><div class='add'>+			seq_printf(seq,</div><div class='add'>+				    "     %d   %d   %s  %s  %s    0x%X\n",</div><div class='add'>+				    adapter-&gt;physport, adapter-&gt;state,</div><div class='add'>+				    SLIC_LINKSTATE(adapter-&gt;linkstate),</div><div class='add'>+				    SLIC_DUPLEX(adapter-&gt;linkduplex),</div><div class='add'>+				    SLIC_SPEED(adapter-&gt;linkspeed),</div><div class='add'>+				    (uint) adapter-&gt;irq);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	seq_printf(seq, "Generation #             : %4.4X\n", card-&gt;gennumber);</div><div class='add'>+	seq_printf(seq, "RcvQ max entries         : %4.4X\n",</div><div class='add'>+		    SLIC_RCVQ_ENTRIES);</div><div class='add'>+	seq_printf(seq, "Ping Status              : %8.8X\n",</div><div class='add'>+		    card-&gt;pingstatus);</div><div class='add'>+	seq_printf(seq, "Minimum grant            : %2.2x\n",</div><div class='add'>+		    config-&gt;MinGrant);</div><div class='add'>+	seq_printf(seq, "Maximum Latency          : %2.2x\n", config-&gt;MaxLat);</div><div class='add'>+	seq_printf(seq, "PciStatus                : %4.4x\n",</div><div class='add'>+		    config-&gt;Pcistatus);</div><div class='add'>+	seq_printf(seq, "Debug Device Id          : %4.4x\n",</div><div class='add'>+		    config-&gt;DbgDevId);</div><div class='add'>+	seq_printf(seq, "DRAM ROM Function        : %4.4x\n",</div><div class='add'>+		    config-&gt;DramRomFn);</div><div class='add'>+	seq_printf(seq, "Network interface Pin 1  : %2.2x\n",</div><div class='add'>+		    config-&gt;NetIntPin1);</div><div class='add'>+	seq_printf(seq, "Network interface Pin 2  : %2.2x\n",</div><div class='add'>+		    config-&gt;NetIntPin1);</div><div class='add'>+	seq_printf(seq, "Network interface Pin 3  : %2.2x\n",</div><div class='add'>+		    config-&gt;NetIntPin1);</div><div class='add'>+	seq_printf(seq, "PM capabilities          : %4.4X\n",</div><div class='add'>+		    config-&gt;PMECapab);</div><div class='add'>+	seq_printf(seq, "Network Clock Controls   : %4.4X\n",</div><div class='add'>+		    config-&gt;NwClkCtrls);</div><div class='add'>+</div><div class='add'>+	switch (config-&gt;FruFormat) {</div><div class='add'>+	case ATK_FRU_FORMAT:</div><div class='add'>+		{</div><div class='add'>+			seq_printf(seq,</div><div class='add'>+			    "Vendor                   : Alacritech, Inc.\n");</div><div class='add'>+			seq_printf(seq,</div><div class='add'>+			    "Assembly #               : %c%c%c%c%c%c\n",</div><div class='add'>+				    fru[0], fru[1], fru[2], fru[3], fru[4],</div><div class='add'>+				    fru[5]);</div><div class='add'>+			seq_printf(seq,</div><div class='add'>+				    "Revision #               : %c%c\n",</div><div class='add'>+				    fru[6], fru[7]);</div><div class='add'>+</div><div class='add'>+			if (config-&gt;OEMFruFormat == VENDOR4_FRU_FORMAT) {</div><div class='add'>+				seq_printf(seq,</div><div class='add'>+					    "Serial   #               : "</div><div class='add'>+					    "%c%c%c%c%c%c%c%c%c%c%c%c\n",</div><div class='add'>+					    fru[8], fru[9], fru[10],</div><div class='add'>+					    fru[11], fru[12], fru[13],</div><div class='add'>+					    fru[16], fru[17], fru[18],</div><div class='add'>+					    fru[19], fru[20], fru[21]);</div><div class='add'>+			} else {</div><div class='add'>+				seq_printf(seq,</div><div class='add'>+					    "Serial   #               : "</div><div class='add'>+					    "%c%c%c%c%c%c%c%c%c%c%c%c%c%c\n",</div><div class='add'>+					    fru[8], fru[9], fru[10],</div><div class='add'>+					    fru[11], fru[12], fru[13],</div><div class='add'>+					    fru[14], fru[15], fru[16],</div><div class='add'>+					    fru[17], fru[18], fru[19],</div><div class='add'>+					    fru[20], fru[21]);</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		{</div><div class='add'>+			seq_printf(seq,</div><div class='add'>+			    "Vendor                   : Alacritech, Inc.\n");</div><div class='add'>+			seq_printf(seq,</div><div class='add'>+			    "Serial   #               : Empty FRU\n");</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (config-&gt;OEMFruFormat) {</div><div class='add'>+	case VENDOR1_FRU_FORMAT:</div><div class='add'>+		{</div><div class='add'>+			seq_printf(seq, "FRU Information:\n");</div><div class='add'>+			seq_printf(seq, "    Commodity #          : %c\n",</div><div class='add'>+				    oemfru[0]);</div><div class='add'>+			seq_printf(seq,</div><div class='add'>+				    "    Assembly #           : %c%c%c%c\n",</div><div class='add'>+				    oemfru[1], oemfru[2], oemfru[3], oemfru[4]);</div><div class='add'>+			seq_printf(seq,</div><div class='add'>+				    "    Revision #           : %c%c\n",</div><div class='add'>+				    oemfru[5], oemfru[6]);</div><div class='add'>+			seq_printf(seq,</div><div class='add'>+				    "    Supplier #           : %c%c\n",</div><div class='add'>+				    oemfru[7], oemfru[8]);</div><div class='add'>+			seq_printf(seq,</div><div class='add'>+				    "    Date                 : %c%c\n",</div><div class='add'>+				    oemfru[9], oemfru[10]);</div><div class='add'>+			seq_sprintf(seq,</div><div class='add'>+				    "    Sequence #           : %c%c%c\n",</div><div class='add'>+				    oemfru[11], oemfru[12], oemfru[13]);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	case VENDOR2_FRU_FORMAT:</div><div class='add'>+		{</div><div class='add'>+			seq_printf(seq, "FRU Information:\n");</div><div class='add'>+			seq_printf(seq,</div><div class='add'>+				    "    Part     #           : "</div><div class='add'>+				    "%c%c%c%c%c%c%c%c\n",</div><div class='add'>+				    oemfru[0], oemfru[1], oemfru[2],</div><div class='add'>+				    oemfru[3], oemfru[4], oemfru[5],</div><div class='add'>+				    oemfru[6], oemfru[7]);</div><div class='add'>+			seq_printf(seq,</div><div class='add'>+				    "    Supplier #           : %c%c%c%c%c\n",</div><div class='add'>+				    oemfru[8], oemfru[9], oemfru[10],</div><div class='add'>+				    oemfru[11], oemfru[12]);</div><div class='add'>+			seq_printf(seq,</div><div class='add'>+				    "    Date                 : %c%c%c\n",</div><div class='add'>+				    oemfru[13], oemfru[14], oemfru[15]);</div><div class='add'>+			seq_sprintf(seq,</div><div class='add'>+				    "    Sequence #           : %c%c%c%c\n",</div><div class='add'>+				    oemfru[16], oemfru[17], oemfru[18],</div><div class='add'>+				    oemfru[19]);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	case VENDOR3_FRU_FORMAT:</div><div class='add'>+		{</div><div class='add'>+			seq_printf(seq, "FRU Information:\n");</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	case VENDOR4_FRU_FORMAT:</div><div class='add'>+		{</div><div class='add'>+			seq_printf(seq, "FRU Information:\n");</div><div class='add'>+			seq_printf(seq,</div><div class='add'>+				    "    FRU Number           : "</div><div class='add'>+				    "%c%c%c%c%c%c%c%c\n",</div><div class='add'>+				    oemfru[0], oemfru[1], oemfru[2],</div><div class='add'>+				    oemfru[3], oemfru[4], oemfru[5],</div><div class='add'>+				    oemfru[6], oemfru[7]);</div><div class='add'>+			seq_sprintf(seq,</div><div class='add'>+				    "    Part Number          : "</div><div class='add'>+				    "%c%c%c%c%c%c%c%c\n",</div><div class='add'>+				    oemfru[8], oemfru[9], oemfru[10],</div><div class='add'>+				    oemfru[11], oemfru[12], oemfru[13],</div><div class='add'>+				    oemfru[14], oemfru[15]);</div><div class='add'>+			seq_printf(seq,</div><div class='add'>+				    "    EC Level             : "</div><div class='add'>+				    "%c%c%c%c%c%c%c%c\n",</div><div class='add'>+				    oemfru[16], oemfru[17], oemfru[18],</div><div class='add'>+				    oemfru[19], oemfru[20], oemfru[21],</div><div class='add'>+				    oemfru[22], oemfru[23]);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int slic_debug_adapter_show(struct seq_file *seq, void *v)</div><div class='add'>+{</div><div class='add'>+	struct adapter *adapter = seq-&gt;private;</div><div class='add'>+</div><div class='add'>+	if ((adapter-&gt;netdev) &amp;&amp; (adapter-&gt;netdev-&gt;name)) {</div><div class='add'>+		seq_printf(seq, "info: interface          : %s\n",</div><div class='add'>+			    adapter-&gt;netdev-&gt;name);</div><div class='add'>+	}</div><div class='add'>+	seq_printf(seq, "info: status             : %s\n",</div><div class='add'>+		SLIC_LINKSTATE(adapter-&gt;linkstate));</div><div class='add'>+	seq_printf(seq, "info: port               : %d\n",</div><div class='add'>+		adapter-&gt;physport);</div><div class='add'>+	seq_printf(seq, "info: speed              : %s\n",</div><div class='add'>+		SLIC_SPEED(adapter-&gt;linkspeed));</div><div class='add'>+	seq_printf(seq, "info: duplex             : %s\n",</div><div class='add'>+		SLIC_DUPLEX(adapter-&gt;linkduplex));</div><div class='add'>+	seq_printf(seq, "info: irq                : 0x%X\n",</div><div class='add'>+		(uint) adapter-&gt;irq);</div><div class='add'>+	seq_printf(seq, "info: Interrupt Agg Delay: %d usec\n",</div><div class='add'>+		adapter-&gt;card-&gt;loadlevel_current);</div><div class='add'>+	seq_printf(seq, "info: RcvQ max entries   : %4.4X\n",</div><div class='add'>+		SLIC_RCVQ_ENTRIES);</div><div class='add'>+	seq_printf(seq, "info: RcvQ current       : %4.4X\n",</div><div class='add'>+		    adapter-&gt;rcvqueue.count);</div><div class='add'>+	seq_printf(seq, "rx stats: packets                  : %8.8lX\n",</div><div class='add'>+		    adapter-&gt;stats.rx_packets);</div><div class='add'>+	seq_printf(seq, "rx stats: bytes                    : %8.8lX\n",</div><div class='add'>+		    adapter-&gt;stats.rx_bytes);</div><div class='add'>+	seq_printf(seq, "rx stats: broadcasts               : %8.8X\n",</div><div class='add'>+		    adapter-&gt;rcv_broadcasts);</div><div class='add'>+	seq_printf(seq, "rx stats: multicasts               : %8.8X\n",</div><div class='add'>+		    adapter-&gt;rcv_multicasts);</div><div class='add'>+	seq_printf(seq, "rx stats: unicasts                 : %8.8X\n",</div><div class='add'>+		    adapter-&gt;rcv_unicasts);</div><div class='add'>+	seq_printf(seq, "rx stats: errors                   : %8.8X\n",</div><div class='add'>+		    (u32) adapter-&gt;slic_stats.iface.rcv_errors);</div><div class='add'>+	seq_printf(seq, "rx stats: Missed errors            : %8.8X\n",</div><div class='add'>+		    (u32) adapter-&gt;slic_stats.iface.rcv_discards);</div><div class='add'>+	seq_printf(seq, "rx stats: drops                    : %8.8X\n",</div><div class='add'>+			(u32) adapter-&gt;rcv_drops);</div><div class='add'>+	seq_printf(seq, "tx stats: packets                  : %8.8lX\n",</div><div class='add'>+			adapter-&gt;stats.tx_packets);</div><div class='add'>+	seq_printf(seq, "tx stats: bytes                    : %8.8lX\n",</div><div class='add'>+			adapter-&gt;stats.tx_bytes);</div><div class='add'>+	seq_printf(seq, "tx stats: errors                   : %8.8X\n",</div><div class='add'>+			(u32) adapter-&gt;slic_stats.iface.xmt_errors);</div><div class='add'>+	seq_printf(seq, "rx stats: multicasts               : %8.8lX\n",</div><div class='add'>+			adapter-&gt;stats.multicast);</div><div class='add'>+	seq_printf(seq, "tx stats: collision errors         : %8.8X\n",</div><div class='add'>+			(u32) adapter-&gt;slic_stats.iface.xmit_collisions);</div><div class='add'>+	seq_printf(seq, "perf: Max rcv frames/isr           : %8.8X\n",</div><div class='add'>+			adapter-&gt;max_isr_rcvs);</div><div class='add'>+	seq_printf(seq, "perf: Rcv interrupt yields         : %8.8X\n",</div><div class='add'>+			adapter-&gt;rcv_interrupt_yields);</div><div class='add'>+	seq_printf(seq, "perf: Max xmit complete/isr        : %8.8X\n",</div><div class='add'>+			adapter-&gt;max_isr_xmits);</div><div class='add'>+	seq_printf(seq, "perf: error interrupts             : %8.8X\n",</div><div class='add'>+			adapter-&gt;error_interrupts);</div><div class='add'>+	seq_printf(seq, "perf: error rmiss interrupts       : %8.8X\n",</div><div class='add'>+			adapter-&gt;error_rmiss_interrupts);</div><div class='add'>+	seq_printf(seq, "perf: rcv interrupts               : %8.8X\n",</div><div class='add'>+			adapter-&gt;rcv_interrupts);</div><div class='add'>+	seq_printf(seq, "perf: xmit interrupts              : %8.8X\n",</div><div class='add'>+			adapter-&gt;xmit_interrupts);</div><div class='add'>+	seq_printf(seq, "perf: link event interrupts        : %8.8X\n",</div><div class='add'>+			adapter-&gt;linkevent_interrupts);</div><div class='add'>+	seq_printf(seq, "perf: UPR interrupts               : %8.8X\n",</div><div class='add'>+			adapter-&gt;upr_interrupts);</div><div class='add'>+	seq_printf(seq, "perf: interrupt count              : %8.8X\n",</div><div class='add'>+			adapter-&gt;num_isrs);</div><div class='add'>+	seq_printf(seq, "perf: false interrupts             : %8.8X\n",</div><div class='add'>+			adapter-&gt;false_interrupts);</div><div class='add'>+	seq_printf(seq, "perf: All register writes          : %8.8X\n",</div><div class='add'>+			adapter-&gt;all_reg_writes);</div><div class='add'>+	seq_printf(seq, "perf: ICR register writes          : %8.8X\n",</div><div class='add'>+			adapter-&gt;icr_reg_writes);</div><div class='add'>+	seq_printf(seq, "perf: ISR register writes          : %8.8X\n",</div><div class='add'>+			adapter-&gt;isr_reg_writes);</div><div class='add'>+	seq_printf(seq, "ifevents: overflow 802 errors      : %8.8X\n",</div><div class='add'>+			adapter-&gt;if_events.oflow802);</div><div class='add'>+	seq_printf(seq, "ifevents: transport overflow errors: %8.8X\n",</div><div class='add'>+			adapter-&gt;if_events.Tprtoflow);</div><div class='add'>+	seq_printf(seq, "ifevents: underflow errors         : %8.8X\n",</div><div class='add'>+			adapter-&gt;if_events.uflow802);</div><div class='add'>+	seq_printf(seq, "ifevents: receive early            : %8.8X\n",</div><div class='add'>+			adapter-&gt;if_events.rcvearly);</div><div class='add'>+	seq_printf(seq, "ifevents: buffer overflows         : %8.8X\n",</div><div class='add'>+			adapter-&gt;if_events.Bufov);</div><div class='add'>+	seq_printf(seq, "ifevents: carrier errors           : %8.8X\n",</div><div class='add'>+			adapter-&gt;if_events.Carre);</div><div class='add'>+	seq_printf(seq, "ifevents: Long                     : %8.8X\n",</div><div class='add'>+			adapter-&gt;if_events.Longe);</div><div class='add'>+	seq_printf(seq, "ifevents: invalid preambles        : %8.8X\n",</div><div class='add'>+			adapter-&gt;if_events.Invp);</div><div class='add'>+	seq_printf(seq, "ifevents: CRC errors               : %8.8X\n",</div><div class='add'>+			adapter-&gt;if_events.Crc);</div><div class='add'>+	seq_printf(seq, "ifevents: dribble nibbles          : %8.8X\n",</div><div class='add'>+			adapter-&gt;if_events.Drbl);</div><div class='add'>+	seq_printf(seq, "ifevents: Code violations          : %8.8X\n",</div><div class='add'>+			adapter-&gt;if_events.Code);</div><div class='add'>+	seq_printf(seq, "ifevents: TCP checksum errors      : %8.8X\n",</div><div class='add'>+			adapter-&gt;if_events.TpCsum);</div><div class='add'>+	seq_printf(seq, "ifevents: TCP header short errors  : %8.8X\n",</div><div class='add'>+			adapter-&gt;if_events.TpHlen);</div><div class='add'>+	seq_printf(seq, "ifevents: IP checksum errors       : %8.8X\n",</div><div class='add'>+			adapter-&gt;if_events.IpCsum);</div><div class='add'>+	seq_printf(seq, "ifevents: IP frame incompletes     : %8.8X\n",</div><div class='add'>+			adapter-&gt;if_events.IpLen);</div><div class='add'>+	seq_printf(seq, "ifevents: IP headers shorts        : %8.8X\n",</div><div class='add'>+			adapter-&gt;if_events.IpHlen);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+static int slic_debug_adapter_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	return single_open(file, slic_debug_adapter_show, inode-&gt;i_private);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int slic_debug_card_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	return single_open(file, slic_debug_card_show, inode-&gt;i_private);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations slic_debug_adapter_fops = {</div><div class='add'>+	.owner		= THIS_MODULE,</div><div class='add'>+	.open		= slic_debug_adapter_open,</div><div class='add'>+	.read		= seq_read,</div><div class='add'>+	.llseek		= seq_lseek,</div><div class='add'>+	.release	= single_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct file_operations slic_debug_card_fops = {</div><div class='add'>+	.owner		= THIS_MODULE,</div><div class='add'>+	.open		= slic_debug_card_open,</div><div class='add'>+	.read		= seq_read,</div><div class='add'>+	.llseek		= seq_lseek,</div><div class='add'>+	.release	= single_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void slic_debug_adapter_create(struct adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	struct dentry *d;</div><div class='add'>+	char    name[7];</div><div class='add'>+	struct sliccard *card = adapter-&gt;card;</div><div class='add'>+</div><div class='add'>+	if (!card-&gt;debugfs_dir)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	sprintf(name, "port%d", adapter-&gt;port);</div><div class='add'>+	d = debugfs_create_file(name, S_IRUGO,</div><div class='add'>+				card-&gt;debugfs_dir, adapter,</div><div class='add'>+				&amp;slic_debug_adapter_fops);</div><div class='add'>+	if (!d || IS_ERR(d))</div><div class='add'>+		pr_info(PFX "%s: debugfs create failed\n", name);</div><div class='add'>+	else</div><div class='add'>+		adapter-&gt;debugfs_entry = d;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void slic_debug_adapter_destroy(struct adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	if (adapter-&gt;debugfs_entry) {</div><div class='add'>+		debugfs_remove(adapter-&gt;debugfs_entry);</div><div class='add'>+		adapter-&gt;debugfs_entry = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void slic_debug_card_create(struct sliccard *card)</div><div class='add'>+{</div><div class='add'>+	struct dentry *d;</div><div class='add'>+	char    name[IFNAMSIZ];</div><div class='add'>+</div><div class='add'>+	snprintf(name, sizeof(name), "slic%d", card-&gt;cardnum);</div><div class='add'>+	d = debugfs_create_dir(name, slic_debugfs);</div><div class='add'>+	if (!d || IS_ERR(d))</div><div class='add'>+		pr_info(PFX "%s: debugfs create dir failed\n",</div><div class='add'>+				name);</div><div class='add'>+	else {</div><div class='add'>+		card-&gt;debugfs_dir = d;</div><div class='add'>+		d = debugfs_create_file("cardinfo", S_IRUGO,</div><div class='add'>+				slic_debugfs, card,</div><div class='add'>+				&amp;slic_debug_card_fops);</div><div class='add'>+		if (!d || IS_ERR(d))</div><div class='add'>+			pr_info(PFX "%s: debugfs create failed\n",</div><div class='add'>+					name);</div><div class='add'>+		else</div><div class='add'>+			card-&gt;debugfs_cardinfo = d;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void slic_debug_card_destroy(struct sliccard *card)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; card-&gt;card_size; i++) {</div><div class='add'>+		struct adapter *adapter;</div><div class='add'>+</div><div class='add'>+		adapter = card-&gt;adapter[i];</div><div class='add'>+		if (adapter)</div><div class='add'>+			slic_debug_adapter_destroy(adapter);</div><div class='add'>+	}</div><div class='add'>+	if (card-&gt;debugfs_cardinfo) {</div><div class='add'>+		debugfs_remove(card-&gt;debugfs_cardinfo);</div><div class='add'>+		card-&gt;debugfs_cardinfo = NULL;</div><div class='add'>+	}</div><div class='add'>+	if (card-&gt;debugfs_dir) {</div><div class='add'>+		debugfs_remove(card-&gt;debugfs_dir);</div><div class='add'>+		card-&gt;debugfs_dir = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void slic_debug_init(void)</div><div class='add'>+{</div><div class='add'>+	struct dentry *ent;</div><div class='add'>+</div><div class='add'>+	ent = debugfs_create_dir("slic", NULL);</div><div class='add'>+	if (!ent || IS_ERR(ent)) {</div><div class='add'>+		pr_info(PFX "debugfs create directory failed\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	slic_debugfs = ent;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void slic_debug_cleanup(void)</div><div class='add'>+{</div><div class='add'>+	if (slic_debugfs) {</div><div class='add'>+		debugfs_remove(slic_debugfs);</div><div class='add'>+		slic_debugfs = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*=============================================================================</div><div class='add'>+  =============================================================================</div><div class='add'>+  ===                                                                       ===</div><div class='add'>+  ===       SLIC  DUMP  MANAGEMENT        SECTION                           ===</div><div class='add'>+  ===                                                                       ===</div><div class='add'>+  ===                                                                       ===</div><div class='add'>+  === Dump routines                                                         ===</div><div class='add'>+  ===                                                                       ===</div><div class='add'>+  ===                                                                       ===</div><div class='add'>+  =============================================================================</div><div class='add'>+  ============================================================================*/</div><div class='add'>+</div><div class='add'>+#if SLIC_DUMP_ENABLED</div><div class='add'>+</div><div class='add'>+#include &lt;stdarg.h&gt;</div><div class='add'>+</div><div class='add'>+void *slic_dump_handle;		/* thread handle */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * These are the only things you should do on a core-file: use only these</div><div class='add'>+ * functions to write out all the necessary info.</div><div class='add'>+ */</div><div class='add'>+static int slic_dump_seek(struct file *SLIChandle, u32 file_offset)</div><div class='add'>+{</div><div class='add'>+	if (SLIChandle-&gt;f_pos != file_offset) {</div><div class='add'>+		/*DBG_MSG("slic_dump_seek  now needed [%x : %x]\n",</div><div class='add'>+			(u32)SLIChandle-&gt;f_pos, (u32)file_offset); */</div><div class='add'>+		if (SLIChandle-&gt;f_op-&gt;llseek) {</div><div class='add'>+			if (SLIChandle-&gt;f_op-&gt;</div><div class='add'>+			    llseek(SLIChandle, file_offset, 0) != file_offset)</div><div class='add'>+				return 0;</div><div class='add'>+		} else {</div><div class='add'>+			SLIChandle-&gt;f_pos = file_offset;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int slic_dump_write(struct sliccard *card,</div><div class='add'>+			   const void *addr, int size, u32 file_offset)</div><div class='add'>+{</div><div class='add'>+	int r = 1;</div><div class='add'>+	u32 result = 0;</div><div class='add'>+	struct file *SLIChandle = card-&gt;dumphandle;</div><div class='add'>+</div><div class='add'>+#ifdef HISTORICAL		/* legacy */</div><div class='add'>+	down(&amp;SLIChandle-&gt;f_dentry-&gt;d_inode-&gt;i_sem);</div><div class='add'>+#endif</div><div class='add'>+	if (size) {</div><div class='add'>+		slic_dump_seek(SLIChandle, file_offset);</div><div class='add'>+</div><div class='add'>+		result =</div><div class='add'>+		    SLIChandle-&gt;f_op-&gt;write(SLIChandle, addr, size,</div><div class='add'>+					    &amp;SLIChandle-&gt;f_pos);</div><div class='add'>+</div><div class='add'>+		r = result == size;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	card-&gt;dumptime_complete = jiffies;</div><div class='add'>+	card-&gt;dumptime_delta = card-&gt;dumptime_complete - card-&gt;dumptime_start;</div><div class='add'>+	card-&gt;dumptime_start = jiffies;</div><div class='add'>+</div><div class='add'>+#ifdef HISTORICAL</div><div class='add'>+	up(&amp;SLIChandle-&gt;f_dentry-&gt;d_inode-&gt;i_sem);</div><div class='add'>+#endif</div><div class='add'>+	if (!r) {</div><div class='add'>+		DBG_ERROR("%s: addr[%p] size[%x] result[%x] file_offset[%x]\n",</div><div class='add'>+			  __func__, addr, size, result, file_offset);</div><div class='add'>+	}</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static uint slic_init_dump_thread(struct sliccard *card)</div><div class='add'>+{</div><div class='add'>+	card-&gt;dump_task_id = kthread_run(slic_dump_thread, (void *)card, 0);</div><div class='add'>+</div><div class='add'>+/*  DBG_MSG("create slic_dump_thread dump_pid[%x]\n", card-&gt;dump_pid); */</div><div class='add'>+	if (IS_ERR(card-&gt;dump_task_id)) {</div><div class='add'>+		DBG_MSG("create slic_dump_thread FAILED \n");</div><div class='add'>+		return STATUS_FAILURE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return STATUS_SUCCESS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int slic_dump_thread(void *context)</div><div class='add'>+{</div><div class='add'>+	struct sliccard *card = (struct sliccard *)context;</div><div class='add'>+	struct adapter *adapter;</div><div class='add'>+	struct adapter *dump_adapter = NULL;</div><div class='add'>+	u32 dump_complete = 0;</div><div class='add'>+	u32 delay = SLIC_SECS_TO_JIFFS(PING_TIMER_INTERVAL);</div><div class='add'>+	struct slic_regs *pregs;</div><div class='add'>+	u32 i;</div><div class='add'>+	struct slic_upr *upr, *uprnext;</div><div class='add'>+	u32 dump_card;</div><div class='add'>+</div><div class='add'>+	ASSERT(card);</div><div class='add'>+</div><div class='add'>+	card-&gt;dumpthread_running = 1;</div><div class='add'>+</div><div class='add'>+#ifdef HISTORICAL</div><div class='add'>+	lock_kernel();</div><div class='add'>+	/*</div><div class='add'>+	 * This thread doesn't need any user-level access,</div><div class='add'>+	 * so get rid of all our resources</div><div class='add'>+	 */</div><div class='add'>+	exit_files(current);	/* daemonize doesn't do exit_files */</div><div class='add'>+	current-&gt;files = init_task.files;</div><div class='add'>+	atomic_inc(&amp;current-&gt;files-&gt;count);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	daemonize("%s", "slicmon");</div><div class='add'>+</div><div class='add'>+	/* Setup a nice name */</div><div class='add'>+	strcpy(current-&gt;comm, "slicmon");</div><div class='add'>+	DBG_ERROR</div><div class='add'>+	    ("slic_dump_thread[slicmon] daemon is alive card[%p] pid[%x]\n",</div><div class='add'>+	     card, card-&gt;dump_task_id-&gt;pid);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 *    Send me a signal to get me to die (for debugging)</div><div class='add'>+	 */</div><div class='add'>+	do {</div><div class='add'>+		/*</div><div class='add'>+		 * If card state is not set to up, skip</div><div class='add'>+		 */</div><div class='add'>+		if (card-&gt;state != CARD_UP) {</div><div class='add'>+			if (card-&gt;adapters_activated)</div><div class='add'>+				goto wait;</div><div class='add'>+			else</div><div class='add'>+				goto end_thread;</div><div class='add'>+		}</div><div class='add'>+		/*</div><div class='add'>+		 *    Check the results of our last ping.</div><div class='add'>+		 */</div><div class='add'>+		dump_card = 0;</div><div class='add'>+#ifdef SLIC_FAILURE_DUMP</div><div class='add'>+		if (card-&gt;pingstatus != ISR_PINGMASK) {</div><div class='add'>+			DBG_MSG</div><div class='add'>+			    ("\n[slicmon]  CARD #%d TIMED OUT - status "</div><div class='add'>+			     "%x: DUMP THE CARD!\n",</div><div class='add'>+			     card-&gt;cardnum, card-&gt;pingstatus);</div><div class='add'>+			dump_card = 1;</div><div class='add'>+		}</div><div class='add'>+#else</div><div class='add'>+		/*</div><div class='add'>+		 *  Cause a card RESET instead?</div><div class='add'>+		 */</div><div class='add'>+		if (card-&gt;pingstatus != ISR_PINGMASK) {</div><div class='add'>+			/* todo. do we want to reset the card in production */</div><div class='add'>+			/* DBG_MSG("\n[slicmon]  CARD #%d TIMED OUT - "</div><div class='add'>+			   status %x: RESET THE CARD!\n", card-&gt;cardnum,</div><div class='add'>+			   card-&gt;pingstatus); */</div><div class='add'>+			DBG_ERROR</div><div class='add'>+			    ("\n[slicmon]  CARD #%d TIMED OUT - status %x: "</div><div class='add'>+			     "DUMP THE CARD!\n",</div><div class='add'>+			     card-&gt;cardnum, card-&gt;pingstatus);</div><div class='add'>+			dump_card = 1;</div><div class='add'>+		}</div><div class='add'>+#endif</div><div class='add'>+		if ((dump_card)</div><div class='add'>+		    || (card-&gt;dump_requested == SLIC_DUMP_REQUESTED)) {</div><div class='add'>+			if (card-&gt;dump_requested == SLIC_DUMP_REQUESTED) {</div><div class='add'>+				DBG_ERROR</div><div class='add'>+			    ("[slicmon]: Dump card Requested: Card %x\n",</div><div class='add'>+				     card-&gt;cardnum);</div><div class='add'>+			}</div><div class='add'>+			if (card-&gt;pingstatus != ISR_PINGMASK) {</div><div class='add'>+				ushort cpuid = 0;</div><div class='add'>+				ushort crashpc = 0;</div><div class='add'>+</div><div class='add'>+				if (card-&gt;adapter[0]) {</div><div class='add'>+					if ((card-&gt;adapter[0])-&gt;memorylength &gt;=</div><div class='add'>+					    CRASH_INFO_OFFSET +</div><div class='add'>+					    sizeof(slic_crash_info)) {</div><div class='add'>+						char *crashptr;</div><div class='add'>+						p_slic_crash_info crashinfo;</div><div class='add'>+</div><div class='add'>+						crashptr =</div><div class='add'>+						    ((char *)card-&gt;adapter[0]-&gt;</div><div class='add'>+						     slic_regs) +</div><div class='add'>+						    CRASH_INFO_OFFSET;</div><div class='add'>+						crashinfo =</div><div class='add'>+						    (p_slic_crash_info)</div><div class='add'>+						    crashptr;</div><div class='add'>+						cpuid = crashinfo-&gt;cpu_id;</div><div class='add'>+						crashpc = crashinfo-&gt;crash_pc;</div><div class='add'>+					}</div><div class='add'>+				}</div><div class='add'>+				DBG_ERROR</div><div class='add'>+				    ("[slicmon]: Dump card: Card %x crashed "</div><div class='add'>+				     "and failed to answer PING. "</div><div class='add'>+				     "CPUID[%x] PC[%x]\n ",</div><div class='add'>+				     card-&gt;cardnum, cpuid, crashpc);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			card-&gt;dump_requested = SLIC_DUMP_IN_PROGRESS;</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * Set the card state to DOWN and the adapter states</div><div class='add'>+			 * to RESET.They will check this in SimbaCheckForHang</div><div class='add'>+			 * and initiate interface reset (which in turn will</div><div class='add'>+			 * reinitialize the card).</div><div class='add'>+			 */</div><div class='add'>+			card-&gt;state = CARD_DOWN;</div><div class='add'>+</div><div class='add'>+			for (i = 0; i &lt; card-&gt;card_size; i++) {</div><div class='add'>+				adapter = card-&gt;adapter[i];</div><div class='add'>+				if (adapter) {</div><div class='add'>+					slic_if_stop_queue(adapter);</div><div class='add'>+</div><div class='add'>+					if (adapter-&gt;state == ADAPT_UP) {</div><div class='add'>+						adapter-&gt;state = ADAPT_RESET;</div><div class='add'>+						adapter-&gt;linkstate = LINK_DOWN;</div><div class='add'>+						DBG_ERROR</div><div class='add'>+						    ("[slicmon]: SLIC Card[%d] "</div><div class='add'>+						     "Port[%d] adapter[%p] "</div><div class='add'>+						     "down\n",</div><div class='add'>+						     (uint) card-&gt;cardnum,</div><div class='add'>+						     (uint) i, adapter);</div><div class='add'>+					}</div><div class='add'>+#if SLIC_GET_STATS_TIMER_ENABLED</div><div class='add'>+					/* free stats timer */</div><div class='add'>+					if (adapter-&gt;statstimerset) {</div><div class='add'>+						adapter-&gt;statstimerset = 0;</div><div class='add'>+						del_timer(&amp;adapter-&gt;statstimer);</div><div class='add'>+					}</div><div class='add'>+#endif</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			for (i = 0; i &lt; card-&gt;card_size; i++) {</div><div class='add'>+				adapter = card-&gt;adapter[i];</div><div class='add'>+				if ((adapter) &amp;&amp; (adapter-&gt;activated)) {</div><div class='add'>+					pregs = adapter-&gt;slic_regs;</div><div class='add'>+					dump_adapter = adapter;</div><div class='add'>+</div><div class='add'>+					/*</div><div class='add'>+					 * If the dump status is zero, then</div><div class='add'>+					 * the utility processor has crashed.</div><div class='add'>+					 * If this is the case, any pending</div><div class='add'>+					 * utilityprocessor requests will not</div><div class='add'>+					 * complete and our dump commands will</div><div class='add'>+					 * not be issued.</div><div class='add'>+					 *</div><div class='add'>+					 * To avoid this we will clear any</div><div class='add'>+					 * pending utility processor requests</div><div class='add'>+					 * now.</div><div class='add'>+					 */</div><div class='add'>+					if (!card-&gt;pingstatus) {</div><div class='add'>+						spin_lock_irqsave(</div><div class='add'>+						    &amp;adapter-&gt;upr_lock.lock,</div><div class='add'>+						    adapter-&gt;upr_lock.flags);</div><div class='add'>+						upr = adapter-&gt;upr_list;</div><div class='add'>+						while (upr) {</div><div class='add'>+							uprnext = upr-&gt;next;</div><div class='add'>+							kfree(upr);</div><div class='add'>+							upr = uprnext;</div><div class='add'>+						}</div><div class='add'>+						adapter-&gt;upr_list = 0;</div><div class='add'>+						adapter-&gt;upr_busy = 0;</div><div class='add'>+						spin_unlock_irqrestore(</div><div class='add'>+						    &amp;adapter-&gt;upr_lock.lock,</div><div class='add'>+						    adapter-&gt;upr_lock.flags);</div><div class='add'>+					}</div><div class='add'>+</div><div class='add'>+					slic_dump_card(card, FALSE);</div><div class='add'>+					dump_complete = 1;</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+				if (dump_complete) {</div><div class='add'>+					DBG_ERROR("SLIC Dump Complete\n");</div><div class='add'>+					/*  Only dump the card one time */</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (dump_adapter) {</div><div class='add'>+				DBG_ERROR</div><div class='add'>+				    ("slic dump completed. "</div><div class='add'>+				     "Reenable interfaces\n");</div><div class='add'>+				slic_card_init(card, dump_adapter);</div><div class='add'>+</div><div class='add'>+				/*</div><div class='add'>+				 *  Reenable the adapters that were reset</div><div class='add'>+				 */</div><div class='add'>+				for (i = 0; i &lt; card-&gt;card_size; i++) {</div><div class='add'>+					adapter = card-&gt;adapter[i];</div><div class='add'>+					if (adapter) {</div><div class='add'>+						if (adapter-&gt;state ==</div><div class='add'>+						    ADAPT_RESET) {</div><div class='add'>+							DBG_ERROR</div><div class='add'>+							    ("slicdump: SLIC "</div><div class='add'>+					   "Card[%d] Port[%d] adapter[%p] "</div><div class='add'>+					   "bring UP\n",</div><div class='add'>+							     (uint) card-&gt;</div><div class='add'>+							     cardnum, (uint) i,</div><div class='add'>+							     adapter);</div><div class='add'>+							adapter-&gt;state =</div><div class='add'>+							    ADAPT_DOWN;</div><div class='add'>+							adapter-&gt;linkstate =</div><div class='add'>+							    LINK_DOWN;</div><div class='add'>+							slic_entry_open</div><div class='add'>+							    (adapter-&gt;netdev);</div><div class='add'>+						}</div><div class='add'>+					}</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+				card-&gt;dump_requested = SLIC_DUMP_DONE;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+		/* if pingstatus != ISR_PINGMASK) || dump_requested...ELSE</div><div class='add'>+		 *    We received a valid ping response.</div><div class='add'>+		 *    Clear the Pingstatus field, find a valid adapter</div><div class='add'>+		 *    structure and send another ping.</div><div class='add'>+		 */</div><div class='add'>+			for (i = 0; i &lt; card-&gt;card_size; i++) {</div><div class='add'>+				adapter = card-&gt;adapter[i];</div><div class='add'>+				if (adapter &amp;&amp; (adapter-&gt;state == ADAPT_UP)) {</div><div class='add'>+					card-&gt;pingstatus = 0;</div><div class='add'>+					slic_upr_request(adapter, SLIC_UPR_PING,</div><div class='add'>+							 0, 0, 0, 0);</div><div class='add'>+					break;	/* Only issue one per card */</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+wait:</div><div class='add'>+		SLIC_INTERRUPTIBLE_SLEEP_ON_TIMEOUT(card-&gt;dump_wq, delay);</div><div class='add'>+	} while (!signal_pending(current));</div><div class='add'>+</div><div class='add'>+end_thread:</div><div class='add'>+/*  DBG_MSG("[slicmon] slic_dump_thread card[%p] pid[%x] ENDING\n",</div><div class='add'>+    card, card-&gt;dump_pid); */</div><div class='add'>+	card-&gt;dumpthread_running = 0;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Read a single byte from our dump index file.  This</div><div class='add'>+ * value is used as our suffix for our dump path.  The</div><div class='add'>+ * value is incremented and written back to the file</div><div class='add'>+ */</div><div class='add'>+static unsigned char slic_get_dump_index(char *path)</div><div class='add'>+{</div><div class='add'>+	unsigned char index = 0;</div><div class='add'>+#ifdef SLIC_DUMP_INDEX_SUPPORT</div><div class='add'>+	u32 status;</div><div class='add'>+	void *FileHandle;</div><div class='add'>+	u32 offset;</div><div class='add'>+</div><div class='add'>+	offset = 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Open the index file.  If one doesn't exist, create it</div><div class='add'>+	 */</div><div class='add'>+	status = create_file(&amp;FileHandle);</div><div class='add'>+</div><div class='add'>+	if (status != STATUS_SUCCESS)</div><div class='add'>+		return (unsigned char) 0;</div><div class='add'>+</div><div class='add'>+	status = read_file(FileHandle, &amp;index, 1, &amp;offset);</div><div class='add'>+</div><div class='add'>+	index++;</div><div class='add'>+</div><div class='add'>+	status = write_file(FileHandle, &amp;index, 1, &amp;offset);</div><div class='add'>+</div><div class='add'>+	close_file(FileHandle);</div><div class='add'>+#else</div><div class='add'>+	index = 0;</div><div class='add'>+#endif</div><div class='add'>+	return index;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct file *slic_dump_open_file(struct sliccard *card)</div><div class='add'>+{</div><div class='add'>+	struct file *SLIChandle = NULL;</div><div class='add'>+	struct dentry *dentry = NULL;</div><div class='add'>+	struct inode *inode = NULL;</div><div class='add'>+	char SLICfile[50];</div><div class='add'>+</div><div class='add'>+	card-&gt;dumpfile_fs = get_fs();</div><div class='add'>+</div><div class='add'>+	set_fs(KERNEL_DS);</div><div class='add'>+</div><div class='add'>+	memset(SLICfile, 0, sizeof(SLICfile));</div><div class='add'>+	sprintf(SLICfile, "/var/tmp/slic%d-dump-%d", card-&gt;cardnum,</div><div class='add'>+		(uint) card-&gt;dump_count);</div><div class='add'>+	card-&gt;dump_count++;</div><div class='add'>+</div><div class='add'>+	SLIChandle =</div><div class='add'>+	    filp_open(SLICfile, O_CREAT | O_RDWR | O_SYNC | O_LARGEFILE, 0666);</div><div class='add'>+</div><div class='add'>+	DBG_MSG("[slicmon]: Dump Card #%d to file: %s \n", card-&gt;cardnum,</div><div class='add'>+		SLICfile);</div><div class='add'>+</div><div class='add'>+/*  DBG_MSG("[slicmon] filp_open %s SLIChandle[%p]\n", SLICfile, SLIChandle);*/</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(SLIChandle))</div><div class='add'>+		goto end_slicdump;</div><div class='add'>+</div><div class='add'>+	dentry = SLIChandle-&gt;f_dentry;</div><div class='add'>+	inode = dentry-&gt;d_inode;</div><div class='add'>+</div><div class='add'>+/*  DBG_MSG("[slicmon] inode[%p] i_nlink[%x] i_mode[%x] i_op[%p] i_fop[%p]\n"</div><div class='add'>+		"f_op-&gt;write[%p]\n",</div><div class='add'>+		inode, inode-&gt;i_nlink, inode-&gt;i_mode, inode-&gt;i_op,</div><div class='add'>+		inode-&gt;i_fop, SLIChandle-&gt;f_op-&gt;write); */</div><div class='add'>+	if (inode-&gt;i_nlink &gt; 1)</div><div class='add'>+		goto close_slicdump;	/* multiple links - don't dump */</div><div class='add'>+#ifdef HISTORICAL</div><div class='add'>+	if (!S_ISREG(inode-&gt;i_mode))</div><div class='add'>+		goto close_slicdump;</div><div class='add'>+#endif</div><div class='add'>+	if (!inode-&gt;i_op || !inode-&gt;i_fop)</div><div class='add'>+		goto close_slicdump;</div><div class='add'>+</div><div class='add'>+	if (!SLIChandle-&gt;f_op-&gt;write)</div><div class='add'>+		goto close_slicdump;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 *  If we got here we have SUCCESSFULLY OPENED the dump file</div><div class='add'>+	 */</div><div class='add'>+/*  DBG_MSG("opened %s SLIChandle[%p]\n", SLICfile, SLIChandle); */</div><div class='add'>+	return SLIChandle;</div><div class='add'>+</div><div class='add'>+close_slicdump:</div><div class='add'>+	DBG_MSG("[slicmon] slic_dump_open_file failed close SLIChandle[%p]\n",</div><div class='add'>+		SLIChandle);</div><div class='add'>+	filp_close(SLIChandle, NULL);</div><div class='add'>+</div><div class='add'>+end_slicdump:</div><div class='add'>+	set_fs(card-&gt;dumpfile_fs);</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void slic_dump_close_file(struct sliccard *card)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+/*  DBG_MSG("[slicmon] slic_dump_CLOSE_file close SLIChandle[%p]\n",</div><div class='add'>+   card-&gt;dumphandle); */</div><div class='add'>+</div><div class='add'>+	filp_close(card-&gt;dumphandle, NULL);</div><div class='add'>+</div><div class='add'>+	set_fs(card-&gt;dumpfile_fs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 slic_dump_card(struct sliccard *card, bool resume)</div><div class='add'>+{</div><div class='add'>+	struct adapter *adapter = card-&gt;master;</div><div class='add'>+	u32 status;</div><div class='add'>+	u32 queue;</div><div class='add'>+	u32 len, offset;</div><div class='add'>+	u32 sram_size, dram_size, regs;</div><div class='add'>+	struct sliccore_hdr corehdr;</div><div class='add'>+	u32 file_offset;</div><div class='add'>+	char *namestr;</div><div class='add'>+	u32 i;</div><div class='add'>+	u32 max_queues = 0;</div><div class='add'>+	u32 result;</div><div class='add'>+</div><div class='add'>+	card-&gt;dumphandle = slic_dump_open_file(card);</div><div class='add'>+</div><div class='add'>+	if (card-&gt;dumphandle == NULL) {</div><div class='add'>+		DBG_MSG("[slicmon] Cant create Dump file - dump failed\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	if (!card-&gt;dumpbuffer) {</div><div class='add'>+		DBG_MSG("[slicmon] Insufficient memory for dump\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	if (!card-&gt;cmdbuffer) {</div><div class='add'>+		DBG_MSG("[slicmon] Insufficient cmd memory for dump\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Write the file version to the core header.</div><div class='add'>+	 */</div><div class='add'>+	namestr = slic_proc_version;</div><div class='add'>+	for (i = 0; i &lt; (DRIVER_NAME_SIZE - 1); i++, namestr++) {</div><div class='add'>+		if (!namestr)</div><div class='add'>+			break;</div><div class='add'>+		corehdr.driver_version[i] = *namestr;</div><div class='add'>+	}</div><div class='add'>+	corehdr.driver_version[i] = 0;</div><div class='add'>+</div><div class='add'>+	file_offset = sizeof(struct sliccore_hdr);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Issue the following debug commands to the SLIC:</div><div class='add'>+	 *        - Halt both receive and transmit</div><div class='add'>+	 *        - Dump receive registers</div><div class='add'>+	 *        - Dump transmit registers</div><div class='add'>+	 *        - Dump sram</div><div class='add'>+	 *        - Dump dram</div><div class='add'>+	 *        - Dump queues</div><div class='add'>+	 */</div><div class='add'>+	DBG_MSG("slicDump HALT Receive Processor\n");</div><div class='add'>+	card-&gt;dumptime_start = jiffies;</div><div class='add'>+</div><div class='add'>+	status = slic_dump_halt(card, PROC_RECEIVE);</div><div class='add'>+	if (status != STATUS_SUCCESS) {</div><div class='add'>+		DBG_ERROR</div><div class='add'>+		    ("Cant halt receive sequencer - dump failed status[%x]\n",</div><div class='add'>+		     status);</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBG_MSG("slicDump HALT Transmit Processor\n");</div><div class='add'>+	status = slic_dump_halt(card, PROC_TRANSMIT);</div><div class='add'>+	if (status != STATUS_SUCCESS) {</div><div class='add'>+		DBG_ERROR("Cant halt transmit sequencer - dump failed\n");</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Dump receive regs */</div><div class='add'>+	status = slic_dump_reg(card, PROC_RECEIVE);</div><div class='add'>+	if (status != STATUS_SUCCESS) {</div><div class='add'>+		DBG_ERROR("Cant dump receive registers - dump failed\n");</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBG_MSG("slicDump Write Receive REGS len[%x] offset[%x]\n",</div><div class='add'>+		(SLIC_NUM_REG * 4), file_offset);</div><div class='add'>+</div><div class='add'>+	result =</div><div class='add'>+	    slic_dump_write(card, card-&gt;dumpbuffer, SLIC_NUM_REG * 4,</div><div class='add'>+			    file_offset);</div><div class='add'>+	if (!result) {</div><div class='add'>+		DBG_ERROR</div><div class='add'>+		    ("Cant write rcv registers to dump file - dump failed\n");</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	corehdr.RcvRegOff = file_offset;</div><div class='add'>+	corehdr.RcvRegsize = SLIC_NUM_REG * 4;</div><div class='add'>+	file_offset += SLIC_NUM_REG * 4;</div><div class='add'>+</div><div class='add'>+	/* Dump transmit regs */</div><div class='add'>+	status = slic_dump_reg(card, PROC_TRANSMIT);</div><div class='add'>+	if (status != STATUS_SUCCESS) {</div><div class='add'>+		DBG_ERROR("Cant dump transmit registers - dump failed\n");</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBG_MSG("slicDump Write XMIT REGS len[%x] offset[%x]\n",</div><div class='add'>+		(SLIC_NUM_REG * 4), file_offset);</div><div class='add'>+</div><div class='add'>+	result =</div><div class='add'>+	    slic_dump_write(card, card-&gt;dumpbuffer, SLIC_NUM_REG * 4,</div><div class='add'>+			    file_offset);</div><div class='add'>+	if (!result) {</div><div class='add'>+		DBG_ERROR</div><div class='add'>+		    ("Cant write xmt registers to dump file - dump failed\n");</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	corehdr.XmtRegOff = file_offset;</div><div class='add'>+	corehdr.XmtRegsize = SLIC_NUM_REG * 4;</div><div class='add'>+	file_offset += SLIC_NUM_REG * 4;</div><div class='add'>+</div><div class='add'>+	regs = SLIC_GBMAX_REG;</div><div class='add'>+</div><div class='add'>+	corehdr.FileRegOff = file_offset;</div><div class='add'>+	corehdr.FileRegsize = regs * 4;</div><div class='add'>+</div><div class='add'>+	for (offset = 0; regs;) {</div><div class='add'>+		len = MIN(regs, 16);	/* Can only xfr 16 regs at a time */</div><div class='add'>+</div><div class='add'>+		status = slic_dump_data(card, offset, (ushort) len, DESC_RFILE);</div><div class='add'>+</div><div class='add'>+		if (status != STATUS_SUCCESS) {</div><div class='add'>+			DBG_ERROR("Cant dump register file - dump failed\n");</div><div class='add'>+			goto done;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		DBG_MSG("slicDump Write RegisterFile len[%x] offset[%x]\n",</div><div class='add'>+			(len * 4), file_offset);</div><div class='add'>+</div><div class='add'>+		result =</div><div class='add'>+		    slic_dump_write(card, card-&gt;dumpbuffer, len * 4,</div><div class='add'>+				    file_offset);</div><div class='add'>+		if (!result) {</div><div class='add'>+			DBG_ERROR</div><div class='add'>+			    ("Cant write register file to dump file - "</div><div class='add'>+			     "dump failed\n");</div><div class='add'>+			goto done;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		file_offset += len * 4;</div><div class='add'>+		offset += len;</div><div class='add'>+		regs -= len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dram_size = card-&gt;config.DramSize * 0x10000;</div><div class='add'>+</div><div class='add'>+	switch (adapter-&gt;devid) {</div><div class='add'>+	case SLIC_2GB_DEVICE_ID:</div><div class='add'>+		sram_size = SLIC_SRAM_SIZE2GB;</div><div class='add'>+		break;</div><div class='add'>+	case SLIC_1GB_DEVICE_ID:</div><div class='add'>+		sram_size = SLIC_SRAM_SIZE1GB;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		sram_size = 0;</div><div class='add'>+		ASSERT(0);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	corehdr.SramOff = file_offset;</div><div class='add'>+	corehdr.Sramsize = sram_size;</div><div class='add'>+</div><div class='add'>+	for (offset = 0; sram_size;) {</div><div class='add'>+		len = MIN(sram_size, DUMP_BUF_SIZE);</div><div class='add'>+		status = slic_dump_data(card, offset, (ushort) len, DESC_SRAM);</div><div class='add'>+		if (status != STATUS_SUCCESS) {</div><div class='add'>+			DBG_ERROR</div><div class='add'>+			    ("[slicmon] Cant dump SRAM at offset %x - "</div><div class='add'>+			     "dump failed\n", (uint) offset);</div><div class='add'>+			goto done;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		DBG_MSG("[slicmon] slicDump Write SRAM  len[%x] offset[%x]\n",</div><div class='add'>+			len, file_offset);</div><div class='add'>+</div><div class='add'>+		result =</div><div class='add'>+		    slic_dump_write(card, card-&gt;dumpbuffer, len, file_offset);</div><div class='add'>+		if (!result) {</div><div class='add'>+			DBG_ERROR</div><div class='add'>+			    ("[slicmon] Cant write SRAM to dump file - "</div><div class='add'>+			     "dump failed\n");</div><div class='add'>+			goto done;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		file_offset += len;</div><div class='add'>+		offset += len;</div><div class='add'>+		sram_size -= len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	corehdr.DramOff = file_offset;</div><div class='add'>+	corehdr.Dramsize = dram_size;</div><div class='add'>+</div><div class='add'>+	for (offset = 0; dram_size;) {</div><div class='add'>+		len = MIN(dram_size, DUMP_BUF_SIZE);</div><div class='add'>+</div><div class='add'>+		status = slic_dump_data(card, offset, (ushort) len, DESC_DRAM);</div><div class='add'>+		if (status != STATUS_SUCCESS) {</div><div class='add'>+			DBG_ERROR</div><div class='add'>+			    ("[slicmon] Cant dump dram at offset %x - "</div><div class='add'>+			     "dump failed\n", (uint) offset);</div><div class='add'>+			goto done;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		DBG_MSG("slicDump Write DRAM  len[%x] offset[%x]\n", len,</div><div class='add'>+			file_offset);</div><div class='add'>+</div><div class='add'>+		result =</div><div class='add'>+		    slic_dump_write(card, card-&gt;dumpbuffer, len, file_offset);</div><div class='add'>+		if (!result) {</div><div class='add'>+			DBG_ERROR</div><div class='add'>+			    ("[slicmon] Cant write DRAM to dump file - "</div><div class='add'>+			     "dump failed\n");</div><div class='add'>+			goto done;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		file_offset += len;</div><div class='add'>+		offset += len;</div><div class='add'>+		dram_size -= len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	max_queues = SLIC_MAX_QUEUE;</div><div class='add'>+</div><div class='add'>+	for (queue = 0; queue &lt; max_queues; queue++) {</div><div class='add'>+		u32 *qarray = (u32 *) card-&gt;dumpbuffer;</div><div class='add'>+		u32 qarray_physl = card-&gt;dumpbuffer_physl;</div><div class='add'>+		u32 qarray_physh = card-&gt;dumpbuffer_physh;</div><div class='add'>+		u32 qstart;</div><div class='add'>+		u32 qdelta;</div><div class='add'>+		u32 qtotal = 0;</div><div class='add'>+</div><div class='add'>+		DBG_MSG("[slicmon] Start Dump of QUEUE #0x%x\n", (uint) queue);</div><div class='add'>+</div><div class='add'>+		for (offset = 0; offset &lt; (DUMP_BUF_SIZE &gt;&gt; 2); offset++) {</div><div class='add'>+			qstart = jiffies;</div><div class='add'>+			qdelta = 0;</div><div class='add'>+</div><div class='add'>+			status = slic_dump_queue(card,</div><div class='add'>+						 qarray_physl,</div><div class='add'>+						 qarray_physh, queue);</div><div class='add'>+			qarray_physl += 4;</div><div class='add'>+</div><div class='add'>+			if (status != STATUS_SUCCESS)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			if (jiffies &gt; qstart) {</div><div class='add'>+				qdelta = jiffies - qstart;</div><div class='add'>+				qtotal += qdelta;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (offset)</div><div class='add'>+			qdelta = qtotal / offset;</div><div class='add'>+		else</div><div class='add'>+			qdelta = 0;</div><div class='add'>+</div><div class='add'>+/*        DBG_MSG("   slicDump Write QUEUE #0x%x len[%x] offset[%x] "</div><div class='add'>+		"avgjiffs[%x]\n", queue, (offset*4), file_offset, qdelta); */</div><div class='add'>+</div><div class='add'>+		result =</div><div class='add'>+		    slic_dump_write(card, card-&gt;dumpbuffer, offset * 4,</div><div class='add'>+				    file_offset);</div><div class='add'>+</div><div class='add'>+		if (!result) {</div><div class='add'>+			DBG_ERROR</div><div class='add'>+			    ("[slicmon] Cant write QUEUES to dump file - "</div><div class='add'>+			     "dump failed\n");</div><div class='add'>+			goto done;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		corehdr.queues[queue].queueOff = file_offset;</div><div class='add'>+		corehdr.queues[queue].queuesize = offset * 4;</div><div class='add'>+		file_offset += offset * 4;</div><div class='add'>+</div><div class='add'>+/*      DBG_MSG("    Reload QUEUE #0x%x elements[%x]\n", (uint)queue, offset);*/</div><div class='add'>+		/*</div><div class='add'>+		 * Fill the queue back up</div><div class='add'>+		 */</div><div class='add'>+		for (i = 0; i &lt; offset; i++) {</div><div class='add'>+			qstart = jiffies;</div><div class='add'>+			qdelta = 0;</div><div class='add'>+</div><div class='add'>+			status = slic_dump_load_queue(card, qarray[i], queue);</div><div class='add'>+			if (status != STATUS_SUCCESS)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			if (jiffies &gt; qstart) {</div><div class='add'>+				qdelta = jiffies - qstart;</div><div class='add'>+				qtotal += qdelta;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (offset)</div><div class='add'>+			qdelta = qtotal / offset;</div><div class='add'>+		else</div><div class='add'>+			qdelta = 0;</div><div class='add'>+</div><div class='add'>+/*      DBG_MSG("   Reload DONE avgjiffs[%x]\n", qdelta); */</div><div class='add'>+</div><div class='add'>+		resume = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	len = SLIC_GB_CAMAB_SZE * 4;</div><div class='add'>+	status = slic_dump_cam(card, 0, len, DUMP_CAM_A);</div><div class='add'>+	if (status != STATUS_SUCCESS) {</div><div class='add'>+		DBG_ERROR("[slicmon] Can't dump CAM_A - dump failed\n");</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	result = slic_dump_write(card, card-&gt;dumpbuffer, len, file_offset);</div><div class='add'>+	if (result) {</div><div class='add'>+		DBG_ERROR</div><div class='add'>+		    ("[slicmon] Can't write CAM_A data to dump file - "</div><div class='add'>+		     "dump failed\n");</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+	corehdr.CamAMOff = file_offset;</div><div class='add'>+	corehdr.CamASize = len;</div><div class='add'>+	file_offset += len;</div><div class='add'>+</div><div class='add'>+	len = SLIC_GB_CAMCD_SZE * 4;</div><div class='add'>+	status = slic_dump_cam(card, 0, len, DUMP_CAM_C);</div><div class='add'>+	if (status) {</div><div class='add'>+		DBG_ERROR("[slicmon] Can't dump CAM_C - dump failed\n");</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	result = slic_dump_write(card, card-&gt;dumpbuffer, len, file_offset);</div><div class='add'>+	if (result) {</div><div class='add'>+		DBG_ERROR</div><div class='add'>+		    ("[slicmon] Can't write CAM_C data to dump file - "</div><div class='add'>+		     "dump failed\n");</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+	corehdr.CamCMOff = file_offset;</div><div class='add'>+	corehdr.CamCSize = len;</div><div class='add'>+	file_offset += len;</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	/*</div><div class='add'>+	 * Write out the core header</div><div class='add'>+	 */</div><div class='add'>+	file_offset = 0;</div><div class='add'>+	DBG_MSG("[slicmon] Write CoreHeader len[%x] offset[%x]\n",</div><div class='add'>+		(uint) sizeof(struct sliccore_hdr), file_offset);</div><div class='add'>+</div><div class='add'>+	result =</div><div class='add'>+	    slic_dump_write(card, &amp;corehdr, sizeof(struct sliccore_hdr),</div><div class='add'>+			    file_offset);</div><div class='add'>+	DBG_MSG("[slicmon] corehdr  xoff[%x] xsz[%x]\n"</div><div class='add'>+		"    roff[%x] rsz[%x] fileoff[%x] filesz[%x]\n"</div><div class='add'>+		"    sramoff[%x] sramsz[%x], dramoff[%x] dramsz[%x]\n"</div><div class='add'>+		"    corehdr_offset[%x]\n", corehdr.XmtRegOff,</div><div class='add'>+		corehdr.XmtRegsize, corehdr.RcvRegOff, corehdr.RcvRegsize,</div><div class='add'>+		corehdr.FileRegOff, corehdr.FileRegsize, corehdr.SramOff,</div><div class='add'>+		corehdr.Sramsize, corehdr.DramOff, corehdr.Dramsize,</div><div class='add'>+		(uint) sizeof(struct sliccore_hdr));</div><div class='add'>+	for (i = 0; i &lt; max_queues; i++) {</div><div class='add'>+		DBG_MSG("[slicmon]  QUEUE 0x%x  offset[%x] size[%x]\n",</div><div class='add'>+			(uint) i, corehdr.queues[i].queueOff,</div><div class='add'>+			corehdr.queues[i].queuesize);</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	slic_dump_close_file(card);</div><div class='add'>+</div><div class='add'>+	if (resume) {</div><div class='add'>+		DBG_MSG("slicDump RESTART RECEIVE and XMIT PROCESSORS\n\n");</div><div class='add'>+		slic_dump_resume(card, PROC_RECEIVE);</div><div class='add'>+		slic_dump_resume(card, PROC_TRANSMIT);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 slic_dump_halt(struct sliccard *card, unsigned char proc)</div><div class='add'>+{</div><div class='add'>+	unsigned char *cmd = card-&gt;cmdbuffer;</div><div class='add'>+</div><div class='add'>+	*cmd = COMMAND_BYTE(CMD_HALT, 0, proc);</div><div class='add'>+</div><div class='add'>+	return slic_dump_send_cmd(card,</div><div class='add'>+				   card-&gt;cmdbuffer_physl,</div><div class='add'>+				   card-&gt;cmdbuffer_physh, 0, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 slic_dump_resume(struct sliccard *card, unsigned char proc)</div><div class='add'>+{</div><div class='add'>+	unsigned char *cmd = card-&gt;cmdbuffer;</div><div class='add'>+</div><div class='add'>+	*cmd = COMMAND_BYTE(CMD_RUN, 0, proc);</div><div class='add'>+</div><div class='add'>+	return slic_dump_send_cmd(card,</div><div class='add'>+				   card-&gt;cmdbuffer_physl,</div><div class='add'>+				   card-&gt;cmdbuffer_physh, 0, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 slic_dump_reg(struct sliccard *card, unsigned char proc)</div><div class='add'>+{</div><div class='add'>+	struct dump_cmd *dump = (struct dump_cmd *)card-&gt;cmdbuffer;</div><div class='add'>+</div><div class='add'>+	dump-&gt;cmd = COMMAND_BYTE(CMD_DUMP, 0, proc);</div><div class='add'>+	dump-&gt;desc = DESC_REG;</div><div class='add'>+	dump-&gt;count = 0;</div><div class='add'>+	dump-&gt;addr = 0;</div><div class='add'>+</div><div class='add'>+	return slic_dump_send_cmd(card,</div><div class='add'>+				   card-&gt;cmdbuffer_physl,</div><div class='add'>+				   card-&gt;cmdbuffer_physh,</div><div class='add'>+				   card-&gt;dumpbuffer_physl,</div><div class='add'>+				   card-&gt;dumpbuffer_physh);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 slic_dump_data(struct sliccard *card,</div><div class='add'>+		       u32 addr, ushort count, unsigned char desc)</div><div class='add'>+{</div><div class='add'>+	struct dump_cmd *dump = (struct dump_cmd *)card-&gt;cmdbuffer;</div><div class='add'>+</div><div class='add'>+	dump-&gt;cmd = COMMAND_BYTE(CMD_DUMP, 0, PROC_RECEIVE);</div><div class='add'>+	dump-&gt;desc = desc;</div><div class='add'>+	dump-&gt;count = count;</div><div class='add'>+	dump-&gt;addr = addr;</div><div class='add'>+</div><div class='add'>+	return slic_dump_send_cmd(card,</div><div class='add'>+				   card-&gt;cmdbuffer_physl,</div><div class='add'>+				   card-&gt;cmdbuffer_physh,</div><div class='add'>+				   card-&gt;dumpbuffer_physl,</div><div class='add'>+				   card-&gt;dumpbuffer_physh);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 slic_dump_queue(struct sliccard *card,</div><div class='add'>+			u32 addr, u32 buf_physh, u32 queue)</div><div class='add'>+{</div><div class='add'>+	struct dump_cmd *dump = (struct dump_cmd *)card-&gt;cmdbuffer;</div><div class='add'>+</div><div class='add'>+	dump-&gt;cmd = COMMAND_BYTE(CMD_DUMP, 0, PROC_RECEIVE);</div><div class='add'>+	dump-&gt;desc = DESC_QUEUE;</div><div class='add'>+	dump-&gt;count = 1;</div><div class='add'>+	dump-&gt;addr = queue;</div><div class='add'>+</div><div class='add'>+	return slic_dump_send_cmd(card,</div><div class='add'>+				   card-&gt;cmdbuffer_physl,</div><div class='add'>+				   card-&gt;cmdbuffer_physh,</div><div class='add'>+				   addr, card-&gt;dumpbuffer_physh);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 slic_dump_load_queue(struct sliccard *card, u32 data,</div><div class='add'>+				u32 queue)</div><div class='add'>+{</div><div class='add'>+	struct dump_cmd *load = (struct dump_cmd *) card-&gt;cmdbuffer;</div><div class='add'>+</div><div class='add'>+	load-&gt;cmd = COMMAND_BYTE(CMD_LOAD, 0, PROC_RECEIVE);</div><div class='add'>+	load-&gt;desc = DESC_QUEUE;</div><div class='add'>+	load-&gt;count = (ushort) queue;</div><div class='add'>+	load-&gt;addr = data;</div><div class='add'>+</div><div class='add'>+	return slic_dump_send_cmd(card,</div><div class='add'>+				   card-&gt;cmdbuffer_physl,</div><div class='add'>+				   card-&gt;cmdbuffer_physh, 0, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 slic_dump_cam(struct sliccard *card,</div><div class='add'>+		      u32 addr, u32 count, unsigned char desc)</div><div class='add'>+{</div><div class='add'>+	struct dump_cmd *dump = (struct dump_cmd *)card-&gt;cmdbuffer;</div><div class='add'>+</div><div class='add'>+	dump-&gt;cmd = COMMAND_BYTE(CMD_CAM_OPS, 0, PROC_NONE);</div><div class='add'>+	dump-&gt;desc = desc;</div><div class='add'>+	dump-&gt;count = count;</div><div class='add'>+	dump-&gt;addr = 0;</div><div class='add'>+</div><div class='add'>+	return slic_dump_send_cmd(card,</div><div class='add'>+				   card-&gt;cmdbuffer_physl,</div><div class='add'>+				   card-&gt;cmdbuffer_physh,</div><div class='add'>+				   addr, card-&gt;dumpbuffer_physh);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 slic_dump_send_cmd(struct sliccard *card,</div><div class='add'>+			   u32 cmd_physl,</div><div class='add'>+			   u32 cmd_physh,</div><div class='add'>+			   u32 buf_physl, u32 buf_physh)</div><div class='add'>+{</div><div class='add'>+	ulong timeout = SLIC_MS_TO_JIFFIES(500);	/* 500 msec */</div><div class='add'>+	u32 attempts = 5;</div><div class='add'>+	u32 delay = SLIC_MS_TO_JIFFIES(10);	/* 10 msec */</div><div class='add'>+	struct adapter *adapter = card-&gt;master;</div><div class='add'>+</div><div class='add'>+	ASSERT(adapter);</div><div class='add'>+	do {</div><div class='add'>+		/*</div><div class='add'>+		 * Zero the Dumpstatus field of the adapter structure</div><div class='add'>+		 */</div><div class='add'>+		card-&gt;dumpstatus = 0;</div><div class='add'>+		/*</div><div class='add'>+		 * Issue the dump command via a utility processor request.</div><div class='add'>+		 *</div><div class='add'>+		 * Kludge: We use the Informationbuffer parameter to hold</div><div class='add'>+		 * the buffer address</div><div class='add'>+		 */</div><div class='add'>+		slic_upr_request(adapter, SLIC_UPR_DUMP, cmd_physl, cmd_physh,</div><div class='add'>+				 buf_physl, buf_physh);</div><div class='add'>+</div><div class='add'>+		timeout += jiffies;</div><div class='add'>+		/*</div><div class='add'>+		 * Spin until completion or timeout.</div><div class='add'>+		 */</div><div class='add'>+		while (!card-&gt;dumpstatus) {</div><div class='add'>+			int num_sleeps = 0;</div><div class='add'>+</div><div class='add'>+			if (jiffies &gt; timeout) {</div><div class='add'>+				/*</div><div class='add'>+				 *  Complete the timed-out DUMP UPR request.</div><div class='add'>+				 */</div><div class='add'>+				slic_upr_request_complete(adapter, 0);</div><div class='add'>+				DBG_ERROR</div><div class='add'>+				    ("%s: TIMED OUT num_sleeps[%x] "</div><div class='add'>+				     "status[%x]\n",</div><div class='add'>+				     __func__, num_sleeps, STATUS_FAILURE);</div><div class='add'>+</div><div class='add'>+				return STATUS_FAILURE;</div><div class='add'>+			}</div><div class='add'>+			num_sleeps++;</div><div class='add'>+			SLIC_INTERRUPTIBLE_SLEEP_ON_TIMEOUT(card-&gt;dump_wq,</div><div class='add'>+							    delay);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (card-&gt;dumpstatus &amp; ISR_UPCERR) {</div><div class='add'>+			/*</div><div class='add'>+			 * Error (or queue empty)</div><div class='add'>+			 */</div><div class='add'>+/*          DBG_ERROR("[slicmon] %s: DUMP_STATUS &amp; ISR_UPCERR status[%x]\n",</div><div class='add'>+		__func__, STATUS_FAILURE); */</div><div class='add'>+</div><div class='add'>+			return STATUS_FAILURE;</div><div class='add'>+		} else if (card-&gt;dumpstatus &amp; ISR_UPCBSY) {</div><div class='add'>+			/*</div><div class='add'>+			 * Retry</div><div class='add'>+			 */</div><div class='add'>+			DBG_ERROR("%s: ISR_UPCBUSY attempt[%x]\n", __func__,</div><div class='add'>+				  attempts);</div><div class='add'>+</div><div class='add'>+			attempts--;</div><div class='add'>+		} else {</div><div class='add'>+			/*</div><div class='add'>+			 * success</div><div class='add'>+			 */</div><div class='add'>+			return STATUS_SUCCESS;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	} while (attempts);</div><div class='add'>+</div><div class='add'>+	DBG_ERROR("%s: GAVE UP AFTER SEVERAL ATTEMPTS status[%x]\n",</div><div class='add'>+		  __func__, STATUS_FAILURE);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Gave up after several attempts</div><div class='add'>+	 */</div><div class='add'>+	return STATUS_FAILURE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+/*=============================================================================</div><div class='add'>+  =============================================================================</div><div class='add'>+  ===                                                                       ===</div><div class='add'>+  ===      *** END **** END **** END **** END ***                           ===</div><div class='add'>+  ===       SLIC  DUMP  MANAGEMENT        SECTION                           ===</div><div class='add'>+  ===                                                                       ===</div><div class='add'>+  ===                                                                       ===</div><div class='add'>+  ===                                                                       ===</div><div class='add'>+  =============================================================================</div><div class='add'>+  ============================================================================*/</div><div class='add'>+</div><div class='add'>+/******************************************************************************/</div><div class='add'>+/****************   MODULE INITIATION / TERMINATION FUNCTIONS   ***************/</div><div class='add'>+/******************************************************************************/</div><div class='add'>+</div><div class='add'>+static struct pci_driver slic_driver = {</div><div class='add'>+	.name = DRV_NAME,</div><div class='add'>+	.id_table = slic_pci_tbl,</div><div class='add'>+	.probe = slic_entry_probe,</div><div class='add'>+	.remove = slic_entry_remove,</div><div class='add'>+#if SLIC_POWER_MANAGEMENT_ENABLED</div><div class='add'>+	.suspend = slicpm_suspend,</div><div class='add'>+	.resume = slicpm_resume,</div><div class='add'>+#endif</div><div class='add'>+/*    .shutdown   =     slic_shutdown,  MOOK_INVESTIGATE */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init slic_module_init(void)</div><div class='add'>+{</div><div class='add'>+	struct pci_device_id *pcidev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+/*      DBG_MSG("slicoss: %s ENTER cpu %d\n", __func__, smp_processor_id()); */</div><div class='add'>+</div><div class='add'>+	slic_init_driver();</div><div class='add'>+</div><div class='add'>+	if (debug &gt;= 0 &amp;&amp; slic_debug != debug)</div><div class='add'>+		printk(SLICLEVEL "slicoss: debug level is %d.\n", debug);</div><div class='add'>+	if (debug &gt;= 0)</div><div class='add'>+		slic_debug = debug;</div><div class='add'>+</div><div class='add'>+	pcidev = (struct pci_device_id *)slic_driver.id_table;</div><div class='add'>+/*      DBG_MSG("slicoss: %s call pci_module_init jiffies[%lx] cpu #%d\n",</div><div class='add'>+	__func__, jiffies, smp_processor_id()); */</div><div class='add'>+</div><div class='add'>+	ret = pci_register_driver(&amp;slic_driver);</div><div class='add'>+</div><div class='add'>+/*  DBG_MSG("slicoss: %s EXIT after call pci_module_init jiffies[%lx] "</div><div class='add'>+	    "cpu #%d status[%x]\n",__func__, jiffies,</div><div class='add'>+	    smp_processor_id(), ret); */</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit slic_module_cleanup(void)</div><div class='add'>+{</div><div class='add'>+/*      DBG_MSG("slicoss: %s ENTER\n", __func__); */</div><div class='add'>+	pci_unregister_driver(&amp;slic_driver);</div><div class='add'>+	slic_debug_cleanup();</div><div class='add'>+/*      DBG_MSG("slicoss: %s EXIT\n", __func__); */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(slic_module_init);</div><div class='add'>+module_exit(slic_module_cleanup);</div><div class='head'>diff --git a/drivers/staging/staging.c b/drivers/staging/staging.c<br/>new file mode 100644<br/>index 000000000000..233e589c0932<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/staging.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/staging.c</a></div><div class='hunk'>@@ -0,0 +1,19 @@</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+</div><div class='add'>+static int __init staging_init(void)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit staging_exit(void)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(staging_init);</div><div class='add'>+module_exit(staging_exit);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Greg Kroah-Hartman");</div><div class='add'>+MODULE_DESCRIPTION("Staging Core");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/staging/sxg/Kconfig b/drivers/staging/sxg/Kconfig<br/>new file mode 100644<br/>index 000000000000..1ae350806600<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/sxg/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/sxg/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,10 @@</div><div class='add'>+config SXG</div><div class='add'>+	tristate "Alacritech SLIC Technology Non-Accelerated 10Gbe support"</div><div class='add'>+	depends on PCI &amp;&amp; NETDEV_10000</div><div class='add'>+	default n</div><div class='add'>+	help</div><div class='add'>+	  This driver supports the Alacritech SLIC Technology Non-Accelerated</div><div class='add'>+	  10Gbe network cards.</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose</div><div class='add'>+	  M here: the module will be called sxg.</div><div class='head'>diff --git a/drivers/staging/sxg/Makefile b/drivers/staging/sxg/Makefile<br/>new file mode 100644<br/>index 000000000000..ec48faa7b3e3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/sxg/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/sxg/Makefile</a></div><div class='hunk'>@@ -0,0 +1 @@</div><div class='add'>+obj-$(CONFIG_SXG)	+= sxg.o</div><div class='head'>diff --git a/drivers/staging/sxg/README b/drivers/staging/sxg/README<br/>new file mode 100644<br/>index 000000000000..4d1ddbe4c335<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/sxg/README?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/sxg/README</a></div><div class='hunk'>@@ -0,0 +1,13 @@</div><div class='add'>+This is the rough cut at a driver for the Alacritech SLIC Technology</div><div class='add'>+Non-Accelerated 10Gbe network driver.</div><div class='add'>+</div><div class='add'>+TODO:</div><div class='add'>+	- lindent the code</div><div class='add'>+	- remove typedefs</div><div class='add'>+	- remove wrappers</div><div class='add'>+	- checkpatch.pl cleanups</div><div class='add'>+	- new functionality that the card needs</div><div class='add'>+</div><div class='add'>+Please send patches to:</div><div class='add'>+        Greg Kroah-Hartman &lt;gregkh@suse.de&gt;</div><div class='add'>+for any cleanups that you do to this driver.</div><div class='head'>diff --git a/drivers/staging/sxg/saharadbgdownload.h b/drivers/staging/sxg/saharadbgdownload.h<br/>new file mode 100644<br/>index 000000000000..d8865ba05047<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/sxg/saharadbgdownload.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/sxg/saharadbgdownload.h</a></div><div class='hunk'>@@ -0,0 +1,4854 @@</div><div class='add'>+#define SAHARA_UCODE_VERS_STRING	"$Revision: 1.1 $"</div><div class='add'>+#define SAHARA_UCODE_VERS_DATE  	"$Date: 2008/06/27 12:58:27 $"</div><div class='add'>+#define SAHARA_UCODE_HOSTIF_ID  	3</div><div class='add'>+</div><div class='add'>+static u32 SNumSections = 0x2;</div><div class='add'>+static u32 SSectionSize[] =</div><div class='add'>+{</div><div class='add'>+	0x0000e274, 0x0000000c,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u32 SSectionStart[] =</div><div class='add'>+{</div><div class='add'>+	0x00000000, 0x00001fff,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static unsigned char SaharaUCode[2][57972] =</div><div class='add'>+{</div><div class='add'>+{</div><div class='add'>+	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, 0x82, 0x4d, 0x29, 0x3a,</div><div class='add'>+	0x00, 0x00, 0xb2, 0x03, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0xfe, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0xac, 0x02, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0xa8, 0x02, 0x00, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x0f, 0x80, 0x28, 0x92,</div><div class='add'>+	0x00, 0x00, 0x21, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x0f, 0x80, 0x28, 0x92,</div><div class='add'>+	0x00, 0x00, 0x22, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x0f, 0x80, 0x28, 0x92,</div><div class='add'>+	0x00, 0x00, 0x23, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x0f, 0x40, 0x2b, 0x92,</div><div class='add'>+	0x00, 0x00, 0x24, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x0f, 0x80, 0x28, 0x92,</div><div class='add'>+	0x00, 0x00, 0x25, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x0f, 0x80, 0x28, 0x92,</div><div class='add'>+	0x00, 0x00, 0x26, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x0f, 0x80, 0x28, 0x92,</div><div class='add'>+	0x00, 0x00, 0x27, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x0f, 0x80, 0x28, 0x92,</div><div class='add'>+	0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x0f, 0x80, 0x28, 0x92,</div><div class='add'>+	0x00, 0x00, 0x29, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x0f, 0x80, 0x28, 0x92,</div><div class='add'>+	0x00, 0x00, 0x2a, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x0f, 0x80, 0x28, 0x92,</div><div class='add'>+	0x00, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0x98, 0x1e, 0x80, 0xe9, 0x9a,</div><div class='add'>+	0x00, 0x00, 0x2c, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x0f, 0x80, 0x28, 0x92,</div><div class='add'>+	0x00, 0x00, 0x2d, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x0f, 0x80, 0x28, 0x92,</div><div class='add'>+	0x00, 0x00, 0x2e, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x0f, 0x80, 0x28, 0x92,</div><div class='add'>+	0x00, 0x00, 0x2f, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x0f, 0x80, 0x28, 0x92,</div><div class='add'>+	0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x00, 0xd4, 0x0f, 0x00, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x00, 0xd4, 0x0f, 0x40, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x00, 0xd4, 0x0f, 0x80, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x34, 0x00, 0x00, 0x00, 0x00, 0xd4, 0x0f, 0xc0, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x00, 0xd4, 0x0f, 0x00, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x00, 0xd4, 0x0f, 0x40, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x00, 0xd4, 0x0f, 0x80, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x00, 0xd4, 0x0f, 0xc0, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x00, 0xd4, 0x0f, 0x00, 0x02, 0x92,</div><div class='add'>+	0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x00, 0xd4, 0x0f, 0x40, 0x02, 0x92,</div><div class='add'>+	0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x00, 0xd4, 0x0f, 0x80, 0x02, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x00, 0xd4, 0x0f, 0x00, 0x03, 0x92,</div><div class='add'>+	0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x00, 0xd4, 0x0f, 0x40, 0x03, 0x92,</div><div class='add'>+	0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x00, 0xd4, 0x0f, 0x80, 0x03, 0x92,</div><div class='add'>+	0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x00, 0xd4, 0x0f, 0xc0, 0x03, 0x92,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x5f, 0x3f, 0x00, 0x34,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x00, 0x00, 0x80, 0x42, 0xff, 0xfc, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, 0x12, 0x80, 0xfd, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x8a, 0x11, 0x8a, 0x11, 0x02, 0x01, 0x00, 0x80, 0x82, 0x8d, 0xfd, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, 0x12, 0x80, 0xfd, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x03, 0xc0, 0x01, 0x32,</div><div class='add'>+	0x38, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x84, 0x82, 0x4d, 0x28, 0x1a,</div><div class='add'>+	0x00, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0x60, 0x5f, 0x0a, 0xf6, 0x94,</div><div class='add'>+	0x00, 0x00, 0x4b, 0x00, 0x00, 0x00, 0x00, 0xb0, 0x02, 0x00, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x62, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x02, 0x00, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x49, 0x00, 0x00, 0x00, 0x00, 0x90, 0x0e, 0x80, 0x18, 0x92,</div><div class='add'>+	0x00, 0x00, 0xd2, 0x02, 0x00, 0x00, 0x00, 0x00, 0x08, 0xc0, 0x20, 0x92,</div><div class='add'>+	0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x21, 0x92,</div><div class='add'>+	0x00, 0x00, 0xd0, 0x02, 0x00, 0x00, 0x00, 0x00, 0x08, 0x40, 0x21, 0x92,</div><div class='add'>+	0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x85, 0x21, 0x90,</div><div class='add'>+	0x00, 0x00, 0x4b, 0x03, 0x00, 0x00, 0x00, 0xec, 0x02, 0xc0, 0x22, 0x92,</div><div class='add'>+	0x00, 0x00, 0x43, 0x04, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x51, 0x00, 0x00, 0x00, 0x00, 0xb0, 0x02, 0x40, 0x18, 0x9d,</div><div class='add'>+	0x00, 0x00, 0x4d, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x02, 0x00, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8b, 0x03, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0x70,</div><div class='add'>+	0x00, 0x00, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0xc0, 0x21, 0x92,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0xe8, 0x02, 0x00, 0x90, 0x72,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x01, 0x00, 0x80, 0xb2, 0x00, 0xe9, 0xb6,</div><div class='add'>+	0x00, 0x00, 0xb0, 0x03, 0x00, 0x00, 0x00, 0x7c, 0x1e, 0xc0, 0xe7, 0x9a,</div><div class='add'>+	0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x13, 0x40, 0x01, 0x39,</div><div class='add'>+	0x00, 0x00, 0xa4, 0x03, 0x00, 0x00, 0x00, 0x08, 0xb8, 0x01, 0x00, 0x94,</div><div class='add'>+	0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xb3, 0x40, 0x01, 0x39,</div><div class='add'>+	0x00, 0x00, 0xb0, 0x03, 0xb2, 0x00, 0x00, 0xd8, 0x02, 0x00, 0x00, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x17, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x69, 0x05, 0x00, 0x10, 0x01, 0xf8, 0x02, 0x00, 0x6e, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x0a, 0x00, 0x00, 0xcc, 0x02, 0x00, 0x00, 0xb2,</div><div class='add'>+	0x26, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x09, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0xe2, 0x10, 0x00, 0x00, 0x00, 0x14, 0x09, 0x40, 0x18, 0xd2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x84, 0x01, 0x00, 0x2b, 0x32,</div><div class='add'>+	0x00, 0x00, 0x57, 0x00, 0x80, 0x01, 0x00, 0x80, 0x12, 0x81, 0xfc, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x02, 0x00, 0x2b, 0xbc,</div><div class='add'>+	0x02, 0x00, 0x57, 0x00, 0xb0, 0x00, 0x00, 0xa0, 0xc2, 0x0a, 0x00, 0xb9,</div><div class='add'>+	0x00, 0x00, 0x5a, 0x00, 0x04, 0x01, 0x00, 0x80, 0x02, 0xc0, 0xb0, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x60, 0x00, 0xa0, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x5c, 0x00, 0x80, 0x01, 0x00, 0x80, 0xc2, 0x4a, 0xd0, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x60, 0x00, 0xa0, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x04, 0xcd, 0x4a, 0xd0, 0x34,</div><div class='add'>+	0x00, 0x00, 0xfa, 0x0f, 0x00, 0x00, 0x00, 0xd8, 0x02, 0x00, 0x00, 0xd2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x00, 0x00, 0x80, 0x02, 0x80, 0x92, 0xbc,</div><div class='add'>+	0x18, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0xf9,</div><div class='add'>+	0x00, 0x00, 0x54, 0x00, 0x03, 0x01, 0x00, 0xb0, 0x02, 0x40, 0x18, 0xbd,</div><div class='add'>+	0x08, 0x00, 0xb0, 0x03, 0x00, 0x00, 0x00, 0xf8, 0xa3, 0x40, 0x01, 0x99,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x00, 0x16, 0x32,</div><div class='add'>+	0x00, 0x00, 0x67, 0x00, 0x03, 0x01, 0x00, 0xd8, 0x02, 0x80, 0x80, 0xbd,</div><div class='add'>+	0x00, 0x00, 0x76, 0x00, 0x12, 0x01, 0x00, 0xe8, 0x02, 0xc0, 0x21, 0xb2,</div><div class='add'>+	0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0x39,</div><div class='add'>+	0x76, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x02, 0x00, 0x36, 0x92,</div><div class='add'>+	0x00, 0x00, 0x6b, 0x00, 0x12, 0x01, 0x00, 0x5c, 0x08, 0x80, 0x22, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x65, 0x00, 0x04, 0x01, 0x00, 0x80, 0x82, 0x85, 0x80, 0xbc,</div><div class='add'>+	0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x8a, 0x03, 0x39,</div><div class='add'>+	0x63, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x02, 0x00, 0x36, 0x92,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x68, 0x8b, 0x80, 0x35,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0xb8, 0xff, 0x85, 0x30,</div><div class='add'>+	0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x21, 0xff, 0x38,</div><div class='add'>+	0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x87, 0x4d, 0x80, 0x3a,</div><div class='add'>+	0x2c, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x87, 0x0d, 0x80, 0x3a,</div><div class='add'>+	0x00, 0xc4, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x07, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x54, 0xf2, 0xc1, 0x38, 0xb4,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc8, 0x12, 0x80, 0x2d, 0x37,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2c, 0x48, 0x41, 0x80, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x98, 0x86, 0x98, 0x67, 0xc0, 0x82, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x63, 0x00, 0x12, 0x00, 0x00, 0xe8, 0x02, 0xc0, 0x21, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x00, 0x00, 0x80, 0x62, 0x8b, 0x80, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc8, 0x12, 0x80, 0x2d, 0x37,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2c, 0x08, 0x80, 0x70, 0x32,</div><div class='add'>+	0x00, 0x00, 0x7c, 0x00, 0x90, 0x99, 0x86, 0x2c, 0x28, 0xde, 0x82, 0xba,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2c, 0x18, 0xc0, 0x82, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2c, 0x08, 0xc5, 0x82, 0x30,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x02, 0xc5, 0x82, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x63, 0x00, 0x00, 0x00, 0x00, 0x08, 0x68, 0x8b, 0x80, 0x94,</div><div class='add'>+	0x08, 0x00, 0x81, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x40, 0x01, 0x99,</div><div class='add'>+	0x08, 0x00, 0x38, 0x03, 0x0c, 0x00, 0x00, 0xf8, 0x53, 0x40, 0x01, 0xb9,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x05, 0x80, 0x30,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0x02, 0x00, 0x02, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x08, 0x80, 0x3d, 0x32,</div><div class='add'>+	0x00, 0x00, 0x7e, 0x11, 0x00, 0x00, 0x00, 0x14, 0x09, 0x00, 0x80, 0xd2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xcc, 0x02, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x09, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0xe2, 0x10, 0x00, 0x00, 0x00, 0x14, 0x59, 0x00, 0x80, 0xd7,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x00, 0x00, 0x80, 0x62, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x02, 0x01, 0x00, 0x80, 0x82, 0x3a, 0x80, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x06, 0x01, 0x00, 0x80, 0x92, 0x3a, 0x80, 0xbc,</div><div class='add'>+	0x00, 0x90, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0xa2, 0x0d, 0x80, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x01, 0x00, 0x78, 0x09, 0xc0, 0x21, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd4, 0x02, 0x00, 0x00, 0x32,</div><div class='add'>+	0x02, 0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa9, 0x0d, 0x80, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x54, 0x02, 0xa4, 0x38, 0xb2,</div><div class='add'>+	0x00, 0x02, 0x00, 0x80, 0x00, 0x00, 0x00, 0x2c, 0x08, 0x00, 0x37, 0x32,</div><div class='add'>+	0x18, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0xf9,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x04, 0x08, 0x80, 0x72, 0x32,</div><div class='add'>+	0x00, 0x00, 0x96, 0x00, 0x9f, 0x00, 0x00, 0x5c, 0x08, 0x00, 0x72, 0xb2,</div><div class='add'>+	0x87, 0x00, 0x95, 0x00, 0x80, 0x01, 0x00, 0x80, 0x82, 0xcd, 0x85, 0xb0,</div><div class='add'>+	0x00, 0x00, 0xa7, 0x00, 0x00, 0x00, 0x00, 0x2c, 0xd8, 0xc1, 0x82, 0x94,</div><div class='add'>+	0x00, 0x00, 0xa7, 0x00, 0x00, 0x00, 0x00, 0x2c, 0x88, 0xc1, 0x82, 0x94,</div><div class='add'>+	0x00, 0x00, 0x9e, 0x00, 0x06, 0x00, 0x00, 0x80, 0x52, 0x7d, 0x80, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x73, 0x11, 0x00, 0x00, 0x00, 0x14, 0x09, 0x05, 0x80, 0xd0,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x68, 0x02, 0x05, 0x80, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5c, 0x1f, 0xc0, 0xf5, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0x02, 0x00, 0x02, 0x32,</div><div class='add'>+	0x00, 0x00, 0xa4, 0x03, 0x04, 0x00, 0x00, 0xdc, 0x43, 0x60, 0x3d, 0xb3,</div><div class='add'>+	0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x8a, 0x03, 0x39,</div><div class='add'>+	0x9a, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x02, 0x00, 0x36, 0x92,</div><div class='add'>+	0x00, 0x0f, 0x97, 0x00, 0x04, 0x00, 0x00, 0x80, 0x82, 0xcd, 0x85, 0xb0,</div><div class='add'>+	0x10, 0x00, 0xa5, 0x00, 0x87, 0x00, 0x00, 0x78, 0x79, 0x21, 0x16, 0xb8,</div><div class='add'>+	0x01, 0x00, 0xa5, 0x00, 0x04, 0x01, 0x00, 0x80, 0x82, 0x8d, 0x97, 0xbc,</div><div class='add'>+	0x87, 0x00, 0xaf, 0x00, 0x87, 0x00, 0x00, 0x78, 0x89, 0xcd, 0x85, 0xb0,</div><div class='add'>+	0x00, 0x00, 0xa4, 0x00, 0x04, 0x01, 0x00, 0x80, 0x12, 0x80, 0x97, 0xbc,</div><div class='add'>+	0x00, 0x00, 0xa7, 0x00, 0x00, 0x00, 0x00, 0x2c, 0xd8, 0xc1, 0x82, 0x94,</div><div class='add'>+	0x00, 0x00, 0xa7, 0x00, 0x00, 0x00, 0x00, 0x2c, 0x88, 0xc1, 0x82, 0x94,</div><div class='add'>+	0x00, 0x00, 0xaf, 0x00, 0x80, 0x01, 0x00, 0x80, 0xf2, 0xc0, 0x85, 0xb6,</div><div class='add'>+	0x00, 0x00, 0xaf, 0x00, 0x00, 0x00, 0x00, 0x2c, 0x98, 0xc1, 0x82, 0x94,</div><div class='add'>+	0x00, 0x00, 0xad, 0x00, 0x80, 0x01, 0x00, 0x80, 0xd2, 0xc1, 0x82, 0xb6,</div><div class='add'>+	0x00, 0x00, 0xaf, 0x00, 0x80, 0x01, 0x00, 0x80, 0x72, 0x80, 0xfc, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0xa8, 0x42, 0x3d, 0x72, 0x30,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x54, 0x18, 0x99, 0xb1, 0xf2, 0xc0, 0x7c, 0x30,</div><div class='add'>+	0x00, 0x00, 0xd6, 0x00, 0x80, 0x01, 0x00, 0x80, 0xf2, 0xc1, 0x85, 0xb6,</div><div class='add'>+	0x00, 0x00, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x01, 0x00, 0x80, 0x82, 0xc1, 0x82, 0xb6,</div><div class='add'>+	0x00, 0x00, 0xa9, 0x00, 0x80, 0x00, 0x00, 0x80, 0x82, 0x80, 0xfc, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x54, 0x00, 0x00, 0xb0, 0x02, 0x00, 0x00, 0x32,</div><div class='add'>+	0x80, 0x00, 0x80, 0x20, 0x00, 0x00, 0x00, 0x80, 0xc2, 0xcd, 0x85, 0x30,</div><div class='add'>+	0x00, 0x00, 0xc6, 0x00, 0x0b, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x89, 0xcd, 0x85, 0x30,</div><div class='add'>+	0x80, 0x00, 0xc6, 0x00, 0x04, 0x00, 0x00, 0x80, 0x82, 0x8d, 0x97, 0xbc,</div><div class='add'>+	0xa0, 0x00, 0xc6, 0x00, 0x04, 0x00, 0x00, 0x80, 0x82, 0x8d, 0x97, 0xbc,</div><div class='add'>+	0x00, 0x00, 0xbd, 0x00, 0x80, 0x01, 0x00, 0x80, 0x62, 0x80, 0xfc, 0xb6,</div><div class='add'>+	0x87, 0x00, 0xbd, 0x00, 0x87, 0x00, 0x00, 0x78, 0x89, 0xcd, 0x85, 0xb0,</div><div class='add'>+	0x00, 0x00, 0xb9, 0x00, 0x04, 0x00, 0x00, 0x80, 0x12, 0x80, 0x97, 0xbc,</div><div class='add'>+	0x00, 0x00, 0xbd, 0x00, 0x04, 0x01, 0x00, 0x80, 0x22, 0x80, 0x97, 0xbc,</div><div class='add'>+	0x00, 0x00, 0xbd, 0x00, 0x80, 0x01, 0x00, 0x80, 0x72, 0xc1, 0x85, 0xb6,</div><div class='add'>+	0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x79, 0x61, 0x16, 0x38,</div><div class='add'>+	0x00, 0x00, 0xc4, 0x00, 0x04, 0x01, 0x00, 0x80, 0x32, 0x80, 0x97, 0xbc,</div><div class='add'>+	0x00, 0x00, 0xd6, 0x00, 0x00, 0x00, 0x00, 0x2c, 0xb8, 0xc1, 0x82, 0x94,</div><div class='add'>+	0x00, 0x00, 0xc4, 0x00, 0x80, 0x01, 0x00, 0x80, 0x52, 0x80, 0xfc, 0xb6,</div><div class='add'>+	0x00, 0x00, 0xc4, 0x00, 0x80, 0x00, 0x00, 0x80, 0x72, 0xc1, 0x85, 0xb6,</div><div class='add'>+	0x00, 0x00, 0xc4, 0x00, 0x80, 0x01, 0x00, 0x80, 0x02, 0xc1, 0x85, 0xb6,</div><div class='add'>+	0x00, 0x00, 0xc4, 0x00, 0x80, 0x01, 0x00, 0x80, 0xd2, 0xc1, 0x85, 0xb6,</div><div class='add'>+	0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x79, 0xe1, 0x16, 0x38,</div><div class='add'>+	0x00, 0x00, 0xc4, 0x00, 0x04, 0x01, 0x00, 0x80, 0x32, 0x80, 0x97, 0xbc,</div><div class='add'>+	0x00, 0x00, 0xd6, 0x00, 0x00, 0x00, 0x00, 0x2c, 0xc8, 0xc1, 0x82, 0x94,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x08, 0x00, 0x04, 0x32,</div><div class='add'>+	0x00, 0x00, 0xd6, 0x00, 0x00, 0x00, 0x00, 0x2c, 0xa8, 0xc1, 0x82, 0x94,</div><div class='add'>+	0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x79, 0x21, 0x17, 0x38,</div><div class='add'>+	0x00, 0x00, 0xd6, 0x00, 0x04, 0x00, 0x00, 0x80, 0x32, 0x80, 0x97, 0xbc,</div><div class='add'>+	0x00, 0x00, 0xd6, 0x00, 0x04, 0x01, 0x00, 0x80, 0x22, 0x80, 0x97, 0xbc,</div><div class='add'>+	0x1f, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x08, 0x89, 0x8d, 0x72, 0x30,</div><div class='add'>+	0x05, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0xa9, 0xdc, 0x17, 0x38,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa8, 0x22, 0x00, 0x90, 0x37,</div><div class='add'>+	0x00, 0x00, 0xd6, 0x00, 0x80, 0x00, 0x86, 0x80, 0x22, 0x24, 0x7c, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x09, 0x05, 0x80, 0x30,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x02, 0x01, 0x00, 0x80, 0x82, 0xba, 0x97, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x06, 0x01, 0x00, 0x80, 0x92, 0xba, 0x97, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x73, 0x11, 0x00, 0x00, 0x00, 0x14, 0x09, 0x05, 0x80, 0xd0,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x68, 0x02, 0x05, 0x80, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0x02, 0x00, 0x02, 0x32,</div><div class='add'>+	0x00, 0x00, 0xa4, 0x03, 0x04, 0x00, 0x00, 0xdc, 0x43, 0x60, 0x3d, 0xb3,</div><div class='add'>+	0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x8a, 0x03, 0x39,</div><div class='add'>+	0xd2, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x02, 0x00, 0x36, 0x92,</div><div class='add'>+	0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x09, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0xe2, 0x10, 0x00, 0x00, 0x00, 0x14, 0x59, 0x00, 0x80, 0xd7,</div><div class='add'>+	0x00, 0x00, 0xdd, 0x00, 0x12, 0x01, 0x00, 0x60, 0x08, 0x40, 0x23, 0xb2,</div><div class='add'>+	0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x09, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0xe2, 0x10, 0x00, 0x00, 0x00, 0x14, 0x09, 0x00, 0x80, 0xd2,</div><div class='add'>+	0x00, 0x82, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x80, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0xcd, 0x00, 0x00, 0x00, 0x00, 0x5c, 0x1f, 0xc0, 0xf5, 0x9a,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x24, 0x08, 0x00, 0x23, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x20, 0x08, 0xc0, 0x23, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x18, 0x08, 0x80, 0x23, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0x02, 0x00, 0x02, 0x32,</div><div class='add'>+	0x00, 0x00, 0xe4, 0x00, 0x04, 0x00, 0x00, 0xdc, 0x43, 0x60, 0x3d, 0xb3,</div><div class='add'>+	0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x8a, 0x03, 0x39,</div><div class='add'>+	0xe0, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x02, 0x00, 0x36, 0x92,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0x02, 0x00, 0x85, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x02, 0x80, 0x01, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x02, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0xc0, 0xf4, 0x00, 0x18, 0x01, 0x00, 0x0c, 0xa8, 0xcd, 0x3e, 0xb2,</div><div class='add'>+	0x20, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x80, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5c, 0x1f, 0xc0, 0xf5, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x38, 0x02, 0x80, 0x81, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x02, 0x00, 0x82, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x02, 0x40, 0x82, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x34, 0x02, 0x00, 0x86, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x09, 0x05, 0x80, 0x30,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x02, 0x01, 0x00, 0x80, 0x82, 0xba, 0x97, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x06, 0x01, 0x00, 0x80, 0x92, 0xba, 0x97, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x73, 0x11, 0x00, 0x00, 0x00, 0x14, 0x09, 0x05, 0x80, 0xd0,</div><div class='add'>+	0x00, 0x00, 0xa4, 0x03, 0x12, 0x01, 0x00, 0x68, 0x02, 0x05, 0x80, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x78, 0x09, 0x00, 0x72, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x29, 0xc1, 0x72, 0x3c,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x07, 0x80, 0x81, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x07, 0x00, 0x82, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x07, 0x80, 0x97, 0x32,</div><div class='add'>+	0x10, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x17, 0x20, 0x90, 0x39,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x07, 0xc0, 0x82, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x02, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x40, 0x80, 0x32,</div><div class='add'>+	0x00, 0x00, 0xff, 0x00, 0x80, 0x01, 0x00, 0x80, 0xa2, 0xc1, 0x82, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x00, 0x01, 0x00, 0x08, 0x00, 0x00, 0x57, 0x00, 0x80, 0x97,</div><div class='add'>+	0x05, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x07, 0xa0, 0x04, 0x39,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x10, 0x00, 0x00, 0x07, 0x40, 0x82, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x07, 0x00, 0x86, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x50, 0xf2, 0xc1, 0x38, 0xb4,</div><div class='add'>+	0x18, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0xf9,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x68, 0x02, 0x05, 0x80, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x73, 0x11, 0x00, 0x00, 0x00, 0x14, 0x09, 0x05, 0x80, 0xd0,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x09, 0x05, 0x80, 0x30,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x02, 0x01, 0x00, 0x80, 0x82, 0xba, 0x97, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x06, 0x01, 0x00, 0x80, 0x92, 0xba, 0x97, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x48, 0x02, 0xc0, 0x80, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xca, 0x01, 0x00, 0x08, 0xe8, 0x81, 0x80, 0x34,</div><div class='add'>+	0x00, 0x00, 0xa4, 0x03, 0x00, 0x00, 0x00, 0xb0, 0x02, 0x00, 0x85, 0x92,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x02, 0x45, 0x90, 0x30,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x12, 0x00, 0x28, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x01, 0x00, 0x78, 0x09, 0xc0, 0x21, 0xb2,</div><div class='add'>+	0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x93, 0x40, 0x01, 0x39,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x54, 0x00, 0x00, 0xb0, 0x02, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x11, 0x01, 0xf0, 0x01, 0x00, 0xd8, 0x02, 0x00, 0x00, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x01, 0x00, 0x59, 0xc0, 0x6e, 0x37,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x01, 0x78, 0x19, 0xc0, 0x6e, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x4e, 0x04, 0x01, 0xec, 0x06, 0xbd, 0x97, 0x30,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, 0xf4, 0x1e, 0x40, 0xef, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x40, 0x09, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x02, 0x00, 0x36, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x77, 0xc0, 0x29, 0x37,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x10, 0x00, 0x00, 0x17, 0x3d, 0x90, 0xba,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x07, 0x80, 0xf4, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x40, 0xf2, 0xc1, 0x38, 0xb4,</div><div class='add'>+	0x0b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x09, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0xe2, 0x10, 0x00, 0x00, 0x00, 0x14, 0x09, 0x80, 0x83, 0xd2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0x72, 0x00, 0x2b, 0x30,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x08, 0x80, 0x3d, 0x32,</div><div class='add'>+	0x18, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0xf9,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd4, 0x02, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x02, 0x80, 0x2d, 0xbc,</div><div class='add'>+	0x00, 0x00, 0xa4, 0x01, 0x80, 0x38, 0x00, 0x80, 0x22, 0xc0, 0x72, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x27, 0x01, 0x12, 0x00, 0x00, 0xc8, 0x02, 0x00, 0x20, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x2c, 0x01, 0x12, 0x01, 0x00, 0x5c, 0x08, 0x80, 0x20, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x5c, 0x02, 0x80, 0x2c, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x1f, 0x80, 0xff, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0x72, 0x00, 0x85, 0x30,</div><div class='add'>+	0x00, 0x00, 0x89, 0x01, 0x04, 0x00, 0x00, 0xdc, 0x43, 0x60, 0x3d, 0xb3,</div><div class='add'>+	0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x8a, 0x03, 0x39,</div><div class='add'>+	0x28, 0x01, 0x36, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x02, 0x00, 0x36, 0x92,</div><div class='add'>+	0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, 0xcd, 0x85, 0x37,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x08, 0x00, 0x72, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x24, 0x08, 0x00, 0x72, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x10, 0x00, 0x6c, 0x08, 0x00, 0x72, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x4c, 0x08, 0x00, 0x72, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x20, 0x00, 0x18, 0x08, 0x00, 0x72, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x28, 0x08, 0x00, 0x72, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x02, 0x00, 0x00, 0x80, 0x52, 0xbd, 0x82, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x00, 0x30, 0x08, 0x00, 0x72, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x08, 0x80, 0x82, 0x32,</div><div class='add'>+	0x00, 0x00, 0x3d, 0x01, 0x06, 0x00, 0x00, 0x80, 0x62, 0xa0, 0x82, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x9f, 0x3c, 0x00, 0x14, 0x28, 0x80, 0x72, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x06, 0x32,</div><div class='add'>+	0x07, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x77, 0x4a, 0x09, 0x39,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x10, 0x00, 0x00, 0x07, 0x00, 0x82, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xca, 0x19, 0x00, 0x00, 0x07, 0x40, 0x82, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x40, 0xf2, 0xc1, 0x38, 0xb4,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x02, 0x40, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x64, 0x01, 0x04, 0x38, 0x00, 0x78, 0xd9, 0xc5, 0x72, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x41, 0x01, 0x80, 0x01, 0x00, 0x80, 0x02, 0x80, 0x97, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x82, 0x80, 0x2f, 0x34,</div><div class='add'>+	0x00, 0x00, 0x43, 0x01, 0x80, 0x01, 0x00, 0x80, 0x12, 0x80, 0x97, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x92, 0x80, 0x2f, 0x34,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x02, 0x40, 0x2d, 0xbc,</div><div class='add'>+	0x04, 0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x3c, 0xb8, 0x1c, 0x17, 0x38,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x28, 0xc0, 0x83, 0x37,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x3a, 0x00, 0x2c, 0x08, 0xc0, 0x72, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0xb8, 0xe0, 0x83, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xcb, 0x29, 0x00, 0x20, 0x07, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x63, 0x01, 0x04, 0x00, 0x00, 0x80, 0x02, 0xc0, 0x81, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x34, 0x78, 0xa0, 0x81, 0x3e,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0xd8, 0xe0, 0x81, 0x3c,</div><div class='add'>+	0x00, 0x00, 0x51, 0x01, 0x06, 0x3a, 0x00, 0x80, 0xb2, 0x5c, 0x83, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x3a, 0x00, 0x00, 0x89, 0xc1, 0x72, 0x37,</div><div class='add'>+	0x07, 0x00, 0x50, 0x01, 0x2b, 0x01, 0x00, 0x04, 0x79, 0x0a, 0x04, 0xb9,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xcb, 0x00, 0x00, 0x04, 0x19, 0x41, 0x90, 0x34,</div><div class='add'>+	0x00, 0x00, 0x54, 0x01, 0x00, 0x3a, 0x00, 0x2c, 0x07, 0x00, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x3a, 0x00, 0x2c, 0xd7, 0xe0, 0x72, 0x3c,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x09, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x64, 0x83, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x07, 0x00, 0x80, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x10, 0x00, 0x00, 0x07, 0xc0, 0x86, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x07, 0xc0, 0x84, 0x32,</div><div class='add'>+	0x00, 0x00, 0x73, 0x01, 0x04, 0x00, 0x00, 0x28, 0xd8, 0xa0, 0x82, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x09, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x20, 0x80, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x5e, 0x01, 0x04, 0x00, 0x00, 0x80, 0x72, 0x80, 0x2d, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x44, 0x12, 0xe4, 0x38, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x5f, 0x01, 0x00, 0x00, 0x00, 0xd8, 0x12, 0x80, 0x2d, 0x9a,</div><div class='add'>+	0x00, 0x00, 0xd7, 0x10, 0x00, 0x00, 0x00, 0x04, 0xf9, 0x41, 0x90, 0xf4,</div><div class='add'>+	0x00, 0x00, 0x61, 0x01, 0x04, 0x00, 0x00, 0x18, 0xd8, 0xa0, 0x81, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x49, 0x01, 0x00, 0x00, 0x00, 0x6c, 0xd8, 0xe0, 0x86, 0x9a,</div><div class='add'>+	0x00, 0x00, 0x84, 0x10, 0x00, 0x00, 0x00, 0x44, 0x08, 0x80, 0x2d, 0xf2,</div><div class='add'>+	0x00, 0x00, 0x49, 0x01, 0x00, 0x00, 0x00, 0x30, 0x08, 0x00, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xcb, 0x19, 0x00, 0x20, 0x07, 0x00, 0x00, 0x32,</div><div class='add'>+	0x07, 0x00, 0x66, 0x01, 0x2b, 0x01, 0x00, 0x04, 0x79, 0x0a, 0x02, 0xb9,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xcb, 0x00, 0x00, 0x04, 0x19, 0x41, 0x90, 0x34,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x4d, 0x00, 0x00, 0x00, 0xa7, 0xa0, 0x81, 0x3e,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x07, 0x00, 0x80, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x10, 0x00, 0x00, 0x07, 0xc0, 0x86, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x07, 0xc0, 0x84, 0x32,</div><div class='add'>+	0x00, 0x00, 0x73, 0x01, 0x04, 0x00, 0x00, 0x28, 0xd8, 0xa0, 0x82, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x62, 0x60, 0x83, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x20, 0x80, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x70, 0x01, 0x04, 0x00, 0x00, 0x80, 0x72, 0x80, 0x2d, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x44, 0x12, 0xe4, 0x38, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x71, 0x01, 0x00, 0x00, 0x00, 0xd8, 0x12, 0x80, 0x2d, 0x9a,</div><div class='add'>+	0x00, 0x00, 0xd7, 0x10, 0x00, 0x00, 0x00, 0x04, 0xf9, 0x41, 0x90, 0xf4,</div><div class='add'>+	0x00, 0x00, 0x84, 0x10, 0x00, 0x00, 0x00, 0x44, 0x08, 0x80, 0x2d, 0xf2,</div><div class='add'>+	0x00, 0x00, 0x64, 0x01, 0x00, 0x00, 0x00, 0x30, 0x08, 0x00, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x00, 0x00, 0x80, 0xa2, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0xf9, 0x41, 0x90, 0x34,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x44, 0x12, 0xe4, 0x38, 0xb2,</div><div class='add'>+	0x18, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0xf9,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x00, 0x00, 0x80, 0x02, 0x80, 0x2d, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x04, 0x09, 0x80, 0x73, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x00, 0x08, 0x89, 0x80, 0x73, 0x37,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x07, 0x00, 0x86, 0x32,</div><div class='add'>+	0x41, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x8c, 0x07, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0x7f, 0x01, 0x29, 0x08, 0x00, 0x80, 0x07, 0xc0, 0x85, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x82, 0x01, 0x28, 0x10, 0x00, 0x8c, 0x07, 0x00, 0x00, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x83, 0x01, 0x00, 0x12, 0x00, 0x84, 0x07, 0x00, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x8c, 0xf7, 0xe0, 0x82, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x82, 0x01, 0x28, 0x18, 0x00, 0x80, 0x07, 0x40, 0x90, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x83, 0x01, 0x00, 0x12, 0x00, 0x84, 0x07, 0x00, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x84, 0x27, 0xe4, 0x82, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0x72, 0x00, 0x85, 0x30,</div><div class='add'>+	0x00, 0x00, 0x87, 0x01, 0x04, 0x00, 0x00, 0xdc, 0x43, 0x60, 0x3d, 0xb3,</div><div class='add'>+	0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x8a, 0x03, 0x39,</div><div class='add'>+	0x83, 0x01, 0x36, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x02, 0x00, 0x36, 0x92,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0x02, 0x00, 0x85, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x5c, 0x52, 0x81, 0x2c, 0xb4,</div><div class='add'>+	0x00, 0x00, 0x89, 0x01, 0xf2, 0x01, 0x00, 0x08, 0xe8, 0x01, 0x00, 0xb4,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x01, 0xf0, 0x01, 0x00, 0x08, 0x38, 0x81, 0x80, 0xb4,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, 0xf4, 0x1e, 0x40, 0xef, 0x3c,</div><div class='add'>+	0x00, 0x00, 0x93, 0x01, 0x0b, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x3b, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8e, 0x01, 0xb9, 0x00, 0x00, 0x78, 0xc9, 0x3b, 0x3a, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x92, 0x01, 0x02, 0x00, 0x00, 0x80, 0x82, 0x80, 0x97, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xa9, 0x00, 0x00, 0x08, 0x08, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0xa4, 0x03, 0xe2, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xa9, 0x00, 0x00, 0xf0, 0x0e, 0x00, 0x3a, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xe2, 0x00, 0x00, 0xd8, 0x02, 0x80, 0x01, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x09, 0xba, 0x83, 0x3c,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x09, 0xbd, 0x97, 0x30,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x03, 0x00, 0x00, 0x00, 0x09, 0x00, 0xf4, 0xbd,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x00, 0x00, 0x80, 0x02, 0xa4, 0x97, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x0e, 0x80, 0x83, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x00, 0x00, 0x80, 0x22, 0x7a, 0xe8, 0xba,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0xe8, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x79, 0xc0, 0x29, 0x37,</div><div class='add'>+	0x60, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x0d, 0x90, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xca, 0x01, 0x00, 0xd8, 0x12, 0x80, 0x2d, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x01, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x07, 0x00, 0x90, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x07, 0x40, 0xe8, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x07, 0x80, 0xe8, 0x32,</div><div class='add'>+	0x00, 0x00, 0xa4, 0x03, 0x12, 0x01, 0x00, 0x48, 0xf2, 0xc1, 0x38, 0xb4,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x02, 0x40, 0x2d, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x02, 0x80, 0x2d, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x00, 0x00, 0x80, 0x72, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x78, 0x08, 0x80, 0x72, 0x32,</div><div class='add'>+	0x04, 0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x54, 0xa8, 0x5c, 0x16, 0x38,</div><div class='add'>+	0x0b, 0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x2c, 0xa8, 0xdc, 0x16, 0x38,</div><div class='add'>+	0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x88, 0x4d, 0x85, 0x3a,</div><div class='add'>+	0x22, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x09, 0x00, 0x36, 0x32,</div><div class='add'>+	0x10, 0x00, 0xe2, 0x10, 0x00, 0x38, 0x00, 0x14, 0xa9, 0x9c, 0x87, 0xd9,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x08, 0x00, 0x72, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x24, 0x08, 0x00, 0x72, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x6c, 0x08, 0x00, 0x72, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x4c, 0x08, 0x00, 0x72, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x20, 0x00, 0x18, 0x08, 0x00, 0x72, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x00, 0x30, 0x08, 0x00, 0x72, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x9f, 0x3c, 0x00, 0x14, 0x18, 0x80, 0x72, 0xbc,</div><div class='add'>+	0x00, 0x00, 0xbb, 0x01, 0x04, 0x00, 0x00, 0x80, 0x02, 0x40, 0x81, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x18, 0x40, 0x81, 0x3c,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x06, 0x32,</div><div class='add'>+	0x07, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x77, 0x4a, 0x09, 0x39,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x10, 0x00, 0x00, 0x07, 0x00, 0x82, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xca, 0x19, 0x00, 0x00, 0x07, 0x40, 0x82, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x40, 0xf2, 0xc1, 0x38, 0xb4,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x02, 0x40, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x64, 0x78, 0xc0, 0x29, 0x37,</div><div class='add'>+	0x02, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x64, 0x88, 0x4d, 0x86, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x08, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x08, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x4d, 0x00, 0x00, 0x00, 0x77, 0xa0, 0x81, 0x3e,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x07, 0x40, 0x86, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x10, 0x00, 0x00, 0x07, 0xc0, 0x86, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x07, 0xc0, 0x84, 0x32,</div><div class='add'>+	0x00, 0x00, 0xd6, 0x01, 0x04, 0x00, 0x00, 0x1c, 0xd8, 0xe0, 0x81, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x09, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x64, 0xd8, 0x60, 0x86, 0x3a,</div><div class='add'>+	0x00, 0x00, 0xca, 0x01, 0x04, 0x00, 0x00, 0x80, 0x72, 0x80, 0x2d, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x40, 0x02, 0xc0, 0x38, 0xb2,</div><div class='add'>+	0x00, 0x00, 0xd2, 0x01, 0x00, 0x00, 0x00, 0xd8, 0x12, 0x80, 0x2d, 0x9a,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x40, 0xf2, 0xc1, 0x38, 0xb4,</div><div class='add'>+	0x18, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0xf9,</div><div class='add'>+	0x00, 0x00, 0xd0, 0x01, 0x04, 0x01, 0x00, 0x80, 0x02, 0x80, 0x2d, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x01, 0x00, 0x80, 0xa2, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0xcb, 0x01, 0x67, 0x00, 0x00, 0xf8, 0xa2, 0x80, 0x2f, 0xb5,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0xe8, 0x02, 0xc0, 0x21, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x72, 0x80, 0x2d, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x02, 0x40, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0xd4, 0x01, 0x04, 0x00, 0x00, 0x18, 0xd8, 0xa0, 0x81, 0xbc,</div><div class='add'>+	0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x6c, 0xd8, 0xe0, 0x86, 0x9a,</div><div class='add'>+	0x00, 0x00, 0x32, 0x0f, 0x00, 0x00, 0x00, 0x44, 0x08, 0x80, 0x2d, 0xf2,</div><div class='add'>+	0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x30, 0x08, 0x00, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x40, 0xf2, 0xc1, 0x38, 0xb4,</div><div class='add'>+	0x18, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0xf9,</div><div class='add'>+	0x00, 0x00, 0xdc, 0x01, 0x04, 0x01, 0x00, 0x80, 0x02, 0x80, 0x2d, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x01, 0x00, 0x80, 0xa2, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0xd7, 0x01, 0x67, 0x00, 0x00, 0xf8, 0xa2, 0x80, 0x2f, 0xb5,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0xe8, 0x02, 0xc0, 0x21, 0xb2,</div><div class='add'>+	0x00, 0x00, 0xe8, 0x01, 0x04, 0x01, 0x00, 0x80, 0x02, 0x00, 0x84, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd4, 0x02, 0x40, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa4, 0x22, 0x40, 0x85, 0x3a,</div><div class='add'>+	0x04, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x40, 0x88, 0xcd, 0x74, 0x36,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x28, 0x00, 0x84, 0x37,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd4, 0x02, 0x00, 0x00, 0x32,</div><div class='add'>+	0x14, 0x00, 0xe8, 0x01, 0x04, 0x00, 0x00, 0x1c, 0x88, 0x0d, 0x84, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x09, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x09, 0x61, 0x85, 0x3a,</div><div class='add'>+	0x80, 0x00, 0x8a, 0x11, 0x06, 0x01, 0x00, 0x80, 0x82, 0x8d, 0x97, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x64, 0xd8, 0x60, 0x86, 0x3a,</div><div class='add'>+	0x00, 0x00, 0xd2, 0x01, 0x00, 0x00, 0x00, 0xd8, 0x02, 0x40, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0xea, 0x01, 0x04, 0x00, 0x00, 0x18, 0xd8, 0xa0, 0x81, 0xbc,</div><div class='add'>+	0x00, 0x00, 0xec, 0x01, 0x00, 0x00, 0x00, 0x6c, 0xd8, 0xe0, 0x86, 0x9a,</div><div class='add'>+	0x00, 0x00, 0x32, 0x0f, 0x00, 0x00, 0x00, 0x44, 0x08, 0x80, 0x2d, 0xf2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x08, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd4, 0x02, 0x40, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa4, 0x22, 0xc0, 0x82, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0xb8, 0x60, 0x85, 0x3c,</div><div class='add'>+	0x04, 0x00, 0xf2, 0x01, 0x81, 0x00, 0x00, 0x60, 0x88, 0xcd, 0x74, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x28, 0xf8, 0xa0, 0x75, 0x3c,</div><div class='add'>+	0x00, 0x00, 0xf3, 0x01, 0x00, 0x08, 0x00, 0x74, 0x08, 0x80, 0x75, 0x92,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x28, 0xf8, 0xa0, 0x75, 0x3c,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x08, 0xa1, 0x82, 0x3c,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa4, 0xf2, 0x60, 0x2a, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x48, 0x08, 0x00, 0x75, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x7c, 0x08, 0x80, 0x75, 0x32,</div><div class='add'>+	0x09, 0x00, 0xf9, 0x01, 0x04, 0x1a, 0x00, 0x70, 0x88, 0xcd, 0x74, 0xb0,</div><div class='add'>+	0x09, 0x00, 0x00, 0x00, 0x00, 0x1a, 0x00, 0x4c, 0x87, 0xcd, 0x74, 0x31,</div><div class='add'>+	0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x64, 0x88, 0x4d, 0x86, 0x31,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x64, 0x28, 0x40, 0x86, 0x3a,</div><div class='add'>+	0x23, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x09, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0xe2, 0x10, 0x00, 0x00, 0x00, 0x14, 0x09, 0x80, 0x82, 0xd2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x02, 0x12, 0x00, 0x00, 0xc8, 0x02, 0x00, 0x20, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x01, 0x02, 0x12, 0x01, 0x00, 0x5c, 0x08, 0x80, 0x20, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x5c, 0x02, 0x80, 0x2c, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x27, 0x01, 0x00, 0x00, 0x00, 0xd4, 0x02, 0x00, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd4, 0x02, 0x40, 0x00, 0x32,</div><div class='add'>+	0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, 0xcd, 0x85, 0x37,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0xe8, 0xa1, 0x82, 0x3e,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa4, 0x22, 0xc0, 0x82, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x68, 0x08, 0xe1, 0x81, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x0b, 0x02, 0x04, 0x01, 0x00, 0x80, 0x42, 0x00, 0x86, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x58, 0x07, 0x40, 0x87, 0x32,</div><div class='add'>+	0x00, 0x00, 0x0a, 0x02, 0x8f, 0x01, 0x00, 0x74, 0x18, 0x40, 0x87, 0xba,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x74, 0x08, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x0d, 0x02, 0x00, 0x04, 0x00, 0x58, 0xf7, 0xa0, 0x86, 0x9a,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0xf9, 0xa0, 0x86, 0x3a,</div><div class='add'>+	0x28, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x58, 0x87, 0x8d, 0x97, 0x3c,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa4, 0x22, 0x40, 0x85, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x50, 0x07, 0x80, 0x84, 0x32,</div><div class='add'>+	0x00, 0x00, 0x11, 0x02, 0x04, 0x01, 0x00, 0x80, 0x72, 0xa0, 0x82, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x1a, 0x00, 0x4c, 0xc7, 0xe1, 0x74, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x48, 0x78, 0xa0, 0x84, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x14, 0x02, 0x90, 0x01, 0x00, 0x78, 0xf9, 0xa1, 0x86, 0xba,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x19, 0x80, 0x97, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x58, 0x07, 0x80, 0x97, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x68, 0x58, 0xa1, 0x86, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x02, 0x40, 0x00, 0x32,</div><div class='add'>+	0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb7, 0x60, 0x85, 0x39,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x07, 0x00, 0x80, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x07, 0x40, 0x86, 0x32,</div><div class='add'>+	0x00, 0x00, 0x1a, 0x02, 0x12, 0x00, 0x00, 0x4c, 0x02, 0xc0, 0x38, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x02, 0x80, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x84, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x40, 0x08, 0x00, 0x00, 0x57, 0x21, 0x80, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x57, 0x61, 0x86, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x1f, 0x02, 0x12, 0x00, 0x00, 0x4c, 0xf2, 0xc1, 0x38, 0xb4,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x08, 0x80, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x02, 0xc0, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd4, 0x02, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xcb, 0x19, 0x00, 0x20, 0x07, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x21, 0x80, 0x3a,</div><div class='add'>+	0x07, 0x00, 0x27, 0x02, 0x2b, 0x01, 0x00, 0x04, 0x79, 0x0a, 0x02, 0xb9,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xcb, 0x00, 0x00, 0x04, 0x19, 0x41, 0x90, 0x34,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x4d, 0x00, 0x00, 0x00, 0x77, 0xa0, 0x81, 0x3e,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x07, 0x00, 0x80, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x10, 0x00, 0x00, 0x07, 0xc0, 0x86, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x07, 0xc0, 0x84, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0xd8, 0xa0, 0x82, 0x3c,</div><div class='add'>+	0x00, 0x00, 0x41, 0x02, 0x04, 0x00, 0x00, 0x1c, 0xd8, 0xe0, 0x81, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x62, 0x60, 0x83, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x20, 0x80, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x32, 0x02, 0x04, 0x00, 0x00, 0x80, 0x72, 0x80, 0x2d, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x44, 0x12, 0xe4, 0x38, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x3f, 0x02, 0x00, 0x00, 0x00, 0xd8, 0x12, 0x80, 0x2d, 0x9a,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0xf9, 0x41, 0x90, 0x34,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x44, 0x12, 0xe4, 0x38, 0xb2,</div><div class='add'>+	0x18, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0xf9,</div><div class='add'>+	0x00, 0x00, 0x3d, 0x02, 0x06, 0x01, 0x00, 0x80, 0x22, 0x80, 0x2d, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x3a, 0x02, 0x04, 0x01, 0x00, 0x80, 0x02, 0x80, 0x2d, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x01, 0x00, 0x80, 0xa2, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x34, 0x02, 0x67, 0x00, 0x00, 0xf8, 0xa2, 0x80, 0x2f, 0xb5,</div><div class='add'>+	0x00, 0x00, 0x35, 0x02, 0x00, 0x00, 0x00, 0xe8, 0x02, 0xc0, 0x21, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x22, 0x80, 0x2d, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x34, 0x02, 0x67, 0x00, 0x00, 0x80, 0x18, 0x00, 0x88, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x35, 0x02, 0x00, 0x00, 0x00, 0xe8, 0x02, 0xc0, 0x21, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x72, 0x80, 0x2d, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x02, 0xc0, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x32, 0x0f, 0x00, 0x00, 0x00, 0x44, 0x08, 0x80, 0x2d, 0xf2,</div><div class='add'>+	0x00, 0x00, 0x25, 0x02, 0x00, 0x00, 0x00, 0x30, 0x08, 0x00, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0xf9, 0x41, 0x90, 0x34,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x44, 0x12, 0xe4, 0x38, 0xb2,</div><div class='add'>+	0x18, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0xf9,</div><div class='add'>+	0x00, 0x00, 0x48, 0x02, 0x04, 0x01, 0x00, 0x80, 0x02, 0x80, 0x2d, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x01, 0x00, 0x80, 0xa2, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x43, 0x02, 0x67, 0x00, 0x00, 0xf8, 0xa2, 0x80, 0x2f, 0xb5,</div><div class='add'>+	0x00, 0x00, 0x44, 0x02, 0x00, 0x00, 0x00, 0xe8, 0x02, 0xc0, 0x21, 0x92,</div><div class='add'>+	0x00, 0x00, 0x4b, 0x02, 0x04, 0x00, 0x00, 0x80, 0x18, 0x00, 0x88, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x43, 0x02, 0x12, 0x00, 0x00, 0xe8, 0x02, 0xc0, 0x21, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x44, 0x02, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x02, 0x40, 0x2d, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x4f, 0x02, 0x04, 0x01, 0x00, 0x80, 0x42, 0x00, 0x86, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x02, 0x40, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x89, 0x80, 0x71, 0x37,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x02, 0x80, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x09, 0x80, 0x71, 0x32,</div><div class='add'>+	0x00, 0x00, 0x53, 0x02, 0x90, 0x19, 0x00, 0x04, 0xe9, 0x5c, 0x90, 0xba,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x19, 0x40, 0x90, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x07, 0x80, 0x86, 0x32,</div><div class='add'>+	0x41, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x8c, 0x07, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x80, 0x07, 0xc0, 0x85, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x8c, 0x07, 0x40, 0x85, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x80, 0x07, 0x45, 0x90, 0x30,</div><div class='add'>+	0x00, 0x00, 0x5a, 0x02, 0x04, 0x01, 0x00, 0x80, 0x42, 0x00, 0x86, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x5b, 0x02, 0x00, 0x12, 0x00, 0x84, 0x27, 0xe4, 0x82, 0x92,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x84, 0x07, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x5f, 0x02, 0x27, 0x00, 0x00, 0xb0, 0x02, 0x00, 0x85, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x5f, 0x02, 0x04, 0x00, 0x00, 0x80, 0x42, 0x60, 0x3d, 0xb3,</div><div class='add'>+	0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x8a, 0x03, 0x39,</div><div class='add'>+	0x5b, 0x02, 0x36, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x02, 0x00, 0x36, 0x92,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x72, 0x80, 0x2f, 0x34,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x5c, 0x52, 0x81, 0x2c, 0xb4,</div><div class='add'>+	0x00, 0x00, 0x64, 0x02, 0x04, 0x01, 0x00, 0x80, 0x02, 0x80, 0x82, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xdc, 0x03, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x89, 0x01, 0x00, 0x00, 0x00, 0xd4, 0x02, 0x00, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x67, 0x02, 0x04, 0x01, 0x00, 0x18, 0xd8, 0xa0, 0x81, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x32, 0x0f, 0x00, 0x00, 0x00, 0x44, 0x08, 0x80, 0x2d, 0xf2,</div><div class='add'>+	0x00, 0x00, 0xfd, 0x01, 0x00, 0x00, 0x00, 0x30, 0x08, 0x00, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0xfd, 0x01, 0x00, 0x00, 0x00, 0x6c, 0xd8, 0xe0, 0x86, 0x9a,</div><div class='add'>+	0x08, 0x00, 0x00, 0x00, 0xc6, 0x01, 0x00, 0xf8, 0x93, 0x40, 0x01, 0x39,</div><div class='add'>+	0x19, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x09, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0xe2, 0x10, 0x00, 0x00, 0x00, 0x14, 0x09, 0x40, 0x81, 0xd2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x08, 0x45, 0x81, 0x30,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x01, 0x00, 0x78, 0x09, 0xc0, 0x21, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x00, 0x00, 0x80, 0xa2, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0xa4, 0x03, 0x80, 0x01, 0x80, 0x80, 0x32, 0x0b, 0x6a, 0xb6,</div><div class='add'>+	0x00, 0x00, 0xdc, 0x0e, 0x00, 0x00, 0x00, 0x3c, 0x03, 0x00, 0x38, 0xf2,</div><div class='add'>+	0x00, 0x00, 0x72, 0x02, 0x04, 0x06, 0x01, 0x80, 0x02, 0xc0, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0x00, 0xa1, 0x03, 0x00, 0x06, 0x01, 0xec, 0x56, 0xe0, 0x6e, 0x9a,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xc4, 0x07, 0x01, 0xec, 0x56, 0xe0, 0x6e, 0x3a,</div><div class='add'>+	0x08, 0xc0, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x40, 0xa2, 0xcd, 0x39, 0xb2,</div><div class='add'>+	0x18, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0xf9,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x03, 0xb8, 0x00, 0x00, 0x09, 0xc0, 0x6e, 0xbd,</div><div class='add'>+	0x77, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, 0x82, 0x0d, 0x90, 0x3a,</div><div class='add'>+	0x2e, 0x00, 0x93, 0x05, 0x00, 0x00, 0x00, 0x1c, 0x08, 0x00, 0x36, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x2b, 0x00, 0x93, 0x05, 0x00, 0x00, 0x00, 0x1c, 0x08, 0x00, 0x36, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x37, 0x00, 0x93, 0x05, 0x00, 0x00, 0x00, 0x1c, 0x08, 0x00, 0x36, 0x92,</div><div class='add'>+	0x38, 0x00, 0x93, 0x05, 0x00, 0x00, 0x00, 0x1c, 0x08, 0x00, 0x36, 0x92,</div><div class='add'>+	0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x93, 0x40, 0x01, 0x39,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x01, 0x00, 0x78, 0x09, 0xc0, 0x21, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x00, 0x00, 0x80, 0xa2, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x00, 0x80, 0x80, 0x32, 0x0b, 0x6a, 0xb6,</div><div class='add'>+	0x00, 0x00, 0xdc, 0x0e, 0x00, 0x00, 0x00, 0x3c, 0x03, 0x00, 0x38, 0xf2,</div><div class='add'>+	0x00, 0x00, 0x86, 0x02, 0x04, 0x00, 0x00, 0x80, 0x52, 0x40, 0x82, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x62, 0x40, 0x82, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x05, 0x01, 0x80, 0x02, 0xc0, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x42, 0x80, 0x2f, 0x34,</div><div class='add'>+	0x08, 0xc0, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x40, 0xa2, 0xcd, 0x39, 0xb2,</div><div class='add'>+	0x18, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0xf9,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x02, 0x80, 0x01, 0x32,</div><div class='add'>+	0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x09, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0xe2, 0x10, 0x00, 0x04, 0x01, 0x14, 0x59, 0xc0, 0x6e, 0xd7,</div><div class='add'>+	0x02, 0x00, 0x8f, 0x02, 0x04, 0xb8, 0x00, 0x80, 0x82, 0xcd, 0x6e, 0xbc,</div><div class='add'>+	0x08, 0x00, 0x8a, 0x11, 0x04, 0xb9, 0x00, 0x80, 0x82, 0xcd, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x01, 0x38, 0x08, 0xc0, 0x6e, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x01, 0xec, 0x06, 0x40, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x91, 0x02, 0xb5, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xa5, 0x00, 0x80, 0xa0, 0x36, 0x0b, 0x6a, 0x34,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x64, 0x01, 0xe8, 0x06, 0xc0, 0x2c, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x01, 0xe0, 0x06, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x82, 0x85, 0x2f, 0x30,</div><div class='add'>+	0x00, 0x00, 0x9d, 0x05, 0x00, 0x00, 0x00, 0x1c, 0x08, 0x00, 0x36, 0x92,</div><div class='add'>+	0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x93, 0x40, 0x01, 0x39,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x01, 0x00, 0x78, 0x09, 0xc0, 0x21, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x00, 0x00, 0x80, 0xa2, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x60, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0xf8, 0x82, 0x8d, 0x2f, 0xb0,</div><div class='add'>+	0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x09, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0xe2, 0x10, 0x00, 0x00, 0x00, 0x14, 0x09, 0x40, 0x81, 0xd2,</div><div class='add'>+	0x00, 0x00, 0xa1, 0x02, 0x80, 0x00, 0x80, 0x80, 0x32, 0x0b, 0x6a, 0xb6,</div><div class='add'>+	0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x09, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0xe2, 0x10, 0x00, 0xb8, 0x00, 0x14, 0x09, 0xc0, 0x6e, 0xd2,</div><div class='add'>+	0x00, 0x00, 0xa4, 0x03, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xdc, 0x0e, 0x00, 0x00, 0x00, 0x38, 0x03, 0x00, 0x38, 0xf2,</div><div class='add'>+	0x00, 0x00, 0xa4, 0x02, 0x04, 0x02, 0x01, 0x80, 0x02, 0xc0, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0x00, 0xa1, 0x03, 0x00, 0x02, 0x01, 0xec, 0x56, 0xe0, 0x6e, 0x9a,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xc0, 0x03, 0x01, 0xec, 0x56, 0xe0, 0x6e, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x01, 0x00, 0x80, 0x02, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0xc0, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x40, 0xa2, 0x8d, 0x39, 0xb2,</div><div class='add'>+	0x18, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0xf9,</div><div class='add'>+	0x20, 0x00, 0x8a, 0x11, 0x04, 0x39, 0x00, 0x80, 0x82, 0xcd, 0x6e, 0xbc,</div><div class='add'>+	0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x09, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0xe2, 0x10, 0x00, 0x30, 0x00, 0x14, 0x09, 0x00, 0x6e, 0xd2,</div><div class='add'>+	0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x09, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0xe2, 0x10, 0x00, 0x20, 0x01, 0x14, 0x09, 0x00, 0x6e, 0xd2,</div><div class='add'>+	0x1b, 0x00, 0xaf, 0x02, 0x38, 0x01, 0x00, 0x10, 0x09, 0x00, 0x36, 0xb2,</div><div class='add'>+	0x00, 0x00, 0xe2, 0x10, 0x00, 0x30, 0x01, 0x14, 0x09, 0x00, 0x6e, 0xd2,</div><div class='add'>+	0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x09, 0x00, 0x36, 0x32,</div><div class='add'>+	0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x79, 0x0b, 0x14, 0x38,</div><div class='add'>+	0x10, 0x00, 0xe2, 0x10, 0x00, 0x50, 0x01, 0x14, 0xa9, 0x5b, 0x91, 0xd9,</div><div class='add'>+	0x00, 0x00, 0xbe, 0x02, 0x38, 0x28, 0x00, 0x18, 0x09, 0x00, 0x6e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0xb6, 0x02, 0x04, 0x21, 0x01, 0x08, 0x69, 0x24, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x09, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x03, 0x00, 0x9d, 0x05, 0x00, 0x00, 0x00, 0x1c, 0x08, 0x00, 0x36, 0x92,</div><div class='add'>+	0x00, 0x00, 0xba, 0x02, 0x02, 0x30, 0x00, 0x80, 0x82, 0x9b, 0x90, 0xbc,</div><div class='add'>+	0x00, 0x00, 0xb9, 0x02, 0x06, 0x03, 0x01, 0x80, 0x12, 0xc0, 0x6e, 0xbc,</div><div class='add'>+	0x04, 0x00, 0x9d, 0x05, 0x00, 0x00, 0x00, 0x1c, 0x08, 0x00, 0x36, 0x92,</div><div class='add'>+	0x05, 0x00, 0x9d, 0x05, 0x00, 0x00, 0x00, 0x1c, 0x08, 0x00, 0x36, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x30, 0x00, 0x80, 0x02, 0x00, 0x6e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0xbd, 0x02, 0x06, 0x03, 0x01, 0x80, 0x12, 0xc0, 0x6e, 0xbc,</div><div class='add'>+	0x0a, 0x00, 0x9d, 0x05, 0x00, 0x00, 0x00, 0x1c, 0x08, 0x00, 0x36, 0x92,</div><div class='add'>+	0x0b, 0x00, 0x9d, 0x05, 0x00, 0x00, 0x00, 0x1c, 0x08, 0x00, 0x36, 0x92,</div><div class='add'>+	0x00, 0x00, 0xc1, 0x02, 0x04, 0x21, 0x01, 0x08, 0x69, 0x24, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x09, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x03, 0x00, 0x9d, 0x05, 0x00, 0x00, 0x00, 0x1c, 0x08, 0x00, 0x36, 0x92,</div><div class='add'>+	0x00, 0x00, 0xc3, 0x02, 0x02, 0x30, 0x00, 0x80, 0x82, 0x9b, 0x90, 0xbc,</div><div class='add'>+	0x04, 0x00, 0x9d, 0x05, 0x00, 0x00, 0x00, 0x1c, 0x08, 0x00, 0x36, 0x92,</div><div class='add'>+	0x00, 0x00, 0xc5, 0x02, 0x9f, 0x31, 0x01, 0x0c, 0x69, 0x24, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x09, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0xc9, 0x02, 0x04, 0x31, 0x00, 0x80, 0x82, 0x9b, 0x90, 0xbc,</div><div class='add'>+	0x00, 0x00, 0xc8, 0x02, 0x06, 0x03, 0x01, 0x80, 0x12, 0xc0, 0x6e, 0xbc,</div><div class='add'>+	0x20, 0x00, 0x9d, 0x05, 0x00, 0x00, 0x00, 0x1c, 0x08, 0x00, 0x36, 0x92,</div><div class='add'>+	0x21, 0x00, 0x9d, 0x05, 0x00, 0x00, 0x00, 0x1c, 0x08, 0x00, 0x36, 0x92,</div><div class='add'>+	0x00, 0x00, 0xcd, 0x02, 0x04, 0x00, 0x00, 0x80, 0x32, 0xa4, 0x90, 0xbc,</div><div class='add'>+	0x00, 0x00, 0xcc, 0x02, 0x06, 0x03, 0x01, 0x80, 0x12, 0xc0, 0x6e, 0xbc,</div><div class='add'>+	0x22, 0x00, 0x9d, 0x05, 0x00, 0x00, 0x00, 0x1c, 0x08, 0x00, 0x36, 0x92,</div><div class='add'>+	0x23, 0x00, 0x9d, 0x05, 0x00, 0x00, 0x00, 0x1c, 0x08, 0x00, 0x36, 0x92,</div><div class='add'>+	0x00, 0x00, 0xcf, 0x02, 0x06, 0x03, 0x01, 0x80, 0x12, 0xc0, 0x6e, 0xbc,</div><div class='add'>+	0x20, 0x00, 0x9d, 0x05, 0x00, 0x00, 0x00, 0x1c, 0x08, 0x00, 0x36, 0x92,</div><div class='add'>+	0x21, 0x00, 0x9d, 0x05, 0x00, 0x00, 0x00, 0x1c, 0x08, 0x00, 0x36, 0x92,</div><div class='add'>+	0x08, 0x00, 0x8a, 0x11, 0x0c, 0x00, 0x00, 0xf8, 0x63, 0x40, 0x01, 0xb9,</div><div class='add'>+	0x10, 0x00, 0xd4, 0x02, 0xc5, 0x01, 0x00, 0xcc, 0x02, 0x20, 0x15, 0x98,</div><div class='add'>+	0x08, 0x00, 0x38, 0x03, 0x0c, 0x00, 0x00, 0xf8, 0x43, 0x40, 0x01, 0xb9,</div><div class='add'>+	0x10, 0x00, 0x00, 0x00, 0xc5, 0x01, 0x00, 0xcc, 0x02, 0x20, 0x15, 0x38,</div><div class='add'>+	0x00, 0x00, 0x7e, 0x11, 0x00, 0x00, 0x00, 0x14, 0x09, 0x05, 0x80, 0xd0,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x09, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0xe2, 0x10, 0x00, 0x00, 0x00, 0x14, 0x59, 0x00, 0x80, 0xd7,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x01, 0x00, 0x78, 0x09, 0xc0, 0x21, 0xb2,</div><div class='add'>+	0x00, 0x00, 0xdc, 0x0e, 0x00, 0x00, 0x00, 0x3c, 0x03, 0x00, 0x38, 0xf2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5c, 0x08, 0x05, 0x80, 0x30,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x02, 0x40, 0x2d, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x02, 0x01, 0x00, 0x80, 0x82, 0xfa, 0x85, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x06, 0x01, 0x00, 0x80, 0x92, 0xfa, 0x85, 0xbc,</div><div class='add'>+	0x00, 0x00, 0xdf, 0x02, 0x36, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x0e, 0x00, 0x9d, 0x05, 0x00, 0x00, 0x00, 0x1c, 0x08, 0x00, 0x36, 0x92,</div><div class='add'>+	0x10, 0x00, 0x00, 0x00, 0x00, 0x2c, 0x02, 0x00, 0xa9, 0xdb, 0x85, 0x39,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x54, 0x02, 0xa4, 0x38, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x02, 0x8c, 0x08, 0xc0, 0x6e, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x5c, 0x01, 0x94, 0x08, 0xc0, 0x6e, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x02, 0x98, 0x28, 0x80, 0x6e, 0x37,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9c, 0x38, 0x22, 0x14, 0x37,</div><div class='add'>+	0x00, 0x00, 0xeb, 0x02, 0x04, 0x30, 0x00, 0x28, 0x08, 0x00, 0x6e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x10, 0x00, 0x6c, 0x08, 0x00, 0x6e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x4c, 0x08, 0x00, 0x6e, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x20, 0x00, 0x18, 0x08, 0x00, 0x6e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x14, 0x08, 0x80, 0x6e, 0x32,</div><div class='add'>+	0x05, 0x00, 0xee, 0x02, 0x00, 0x30, 0x02, 0x00, 0x78, 0xe1, 0x6e, 0x99,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x51, 0x00, 0x00, 0xd8, 0x02, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x02, 0x78, 0x09, 0xc0, 0x6e, 0x32,</div><div class='add'>+	0x05, 0x00, 0x00, 0x00, 0x68, 0x08, 0x00, 0x00, 0x77, 0xa1, 0x97, 0x39,</div><div class='add'>+	0x00, 0x00, 0xf0, 0x02, 0x12, 0x01, 0x00, 0x00, 0x09, 0xc0, 0x21, 0xb2,</div><div class='add'>+	0x18, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0xf9,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x54, 0x54, 0x01, 0xb0, 0x02, 0xc0, 0x6e, 0x32,</div><div class='add'>+	0x14, 0x10, 0xf4, 0x02, 0x04, 0x00, 0x00, 0x80, 0xa2, 0x0d, 0x72, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x58, 0x10, 0x00, 0x00, 0x00, 0x28, 0x09, 0xc0, 0x02, 0xf2,</div><div class='add'>+	0x0d, 0x00, 0x9d, 0x05, 0x00, 0x00, 0x00, 0x1c, 0x08, 0x00, 0x36, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x06, 0x09, 0x00, 0x80, 0x52, 0xbd, 0x72, 0xbc,</div><div class='add'>+	0x00, 0x00, 0xfb, 0x02, 0x33, 0x15, 0x00, 0xa4, 0x02, 0xc0, 0x72, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x33, 0x03, 0x80, 0x01, 0x00, 0x80, 0xb2, 0x01, 0x72, 0xb6,</div><div class='add'>+	0x01, 0x01, 0x08, 0x0a, 0x00, 0x28, 0x00, 0x80, 0xc2, 0x0d, 0x74, 0x3c,</div><div class='add'>+	0x00, 0x00, 0x33, 0x03, 0x0b, 0x31, 0x00, 0x7c, 0x08, 0x00, 0x75, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x33, 0x03, 0x9f, 0xf0, 0x01, 0x80, 0x82, 0xdb, 0x87, 0xbc,</div><div class='add'>+	0x00, 0x00, 0xfc, 0x02, 0x00, 0x38, 0x00, 0x88, 0x18, 0x00, 0x75, 0x9c,</div><div class='add'>+	0x00, 0x00, 0x33, 0x03, 0x80, 0x00, 0x00, 0x80, 0xb2, 0x01, 0x72, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x48, 0x08, 0x00, 0x75, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x70, 0x08, 0x00, 0x75, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x74, 0x38, 0xa2, 0x75, 0x37,</div><div class='add'>+	0x00, 0x00, 0x01, 0x03, 0x83, 0x1b, 0x00, 0x78, 0x08, 0xc0, 0x74, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xc2, 0x80, 0x2f, 0x34,</div><div class='add'>+	0x00, 0x00, 0xf2, 0x02, 0x80, 0x01, 0x00, 0x80, 0x42, 0x80, 0x87, 0xb6,</div><div class='add'>+	0x2f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x09, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0xe2, 0x10, 0x00, 0x00, 0x00, 0x14, 0x09, 0x80, 0x84, 0xd2,</div><div class='add'>+	0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x09, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0xe2, 0x10, 0x00, 0x00, 0x00, 0x14, 0x09, 0x00, 0x87, 0xd2,</div><div class='add'>+	0x00, 0x00, 0x15, 0x03, 0x9f, 0x78, 0x01, 0x80, 0xc2, 0x21, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x0a, 0x03, 0x9f, 0x99, 0x01, 0x64, 0x88, 0x1b, 0x87, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x16, 0x03, 0x9f, 0x68, 0x01, 0x64, 0x88, 0x5b, 0x86, 0xba,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x64, 0x08, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x16, 0x00, 0xa4, 0x02, 0xc0, 0x72, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x34, 0x02, 0xa4, 0xb2, 0x5b, 0x2a, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x32, 0x02, 0x78, 0x09, 0xc0, 0x6e, 0x32,</div><div class='add'>+	0x00, 0x00, 0x17, 0x03, 0x08, 0x01, 0x00, 0x04, 0xe8, 0xa5, 0x75, 0xbc,</div><div class='add'>+	0x0f, 0x00, 0x33, 0x03, 0x0b, 0x01, 0x00, 0x1c, 0x08, 0x00, 0x36, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x15, 0x03, 0x04, 0xa1, 0x01, 0x80, 0x82, 0x9b, 0x84, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x9d, 0x05, 0x9f, 0x98, 0x01, 0x80, 0xc2, 0x21, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x9d, 0x05, 0x06, 0xb1, 0x01, 0x80, 0x82, 0x5b, 0x87, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x32, 0x03, 0x0b, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x30, 0x03, 0x02, 0xd4, 0x01, 0x80, 0x92, 0xfb, 0x6e, 0xbc,</div><div class='add'>+	0x15, 0x00, 0x9d, 0x05, 0x00, 0x00, 0x00, 0x1c, 0x08, 0x00, 0x36, 0x92,</div><div class='add'>+	0x16, 0x00, 0x9d, 0x05, 0x00, 0x00, 0x00, 0x1c, 0x08, 0x00, 0x36, 0x92,</div><div class='add'>+	0x1c, 0x00, 0x9d, 0x05, 0x00, 0x00, 0x00, 0x1c, 0x08, 0x00, 0x36, 0x92,</div><div class='add'>+	0x08, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x28, 0x72, 0x61, 0x80, 0xb9,</div><div class='add'>+	0x00, 0x00, 0x1a, 0x03, 0x04, 0xa1, 0x01, 0x80, 0x82, 0x9b, 0x84, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x21, 0x03, 0x06, 0xa8, 0x01, 0x80, 0x82, 0x5b, 0x80, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x1e, 0x03, 0x04, 0xa9, 0x01, 0x80, 0x02, 0x00, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x31, 0x03, 0x04, 0xa9, 0x01, 0x80, 0x82, 0x9b, 0x84, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x31, 0x03, 0x04, 0x01, 0x00, 0x80, 0x12, 0x40, 0x80, 0xbc,</div><div class='add'>+	0x13, 0x00, 0x9d, 0x05, 0x00, 0x00, 0x00, 0x1c, 0x08, 0x00, 0x36, 0x92,</div><div class='add'>+	0x00, 0x00, 0x31, 0x03, 0x9f, 0xa0, 0x01, 0x78, 0x29, 0x21, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x31, 0x03, 0x02, 0x01, 0x00, 0x80, 0x12, 0xa0, 0x97, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x15, 0x03, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x2c, 0x03, 0x04, 0x00, 0x00, 0x80, 0x02, 0x80, 0x82, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x02, 0x01, 0x80, 0x02, 0xc0, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x27, 0x03, 0x02, 0x00, 0x00, 0x80, 0xa2, 0x60, 0x80, 0xbc,</div><div class='add'>+	0x06, 0x00, 0x9d, 0x05, 0x2c, 0x01, 0x00, 0x1c, 0x08, 0x00, 0x36, 0xb2,</div><div class='add'>+	0x00, 0xc0, 0x29, 0x03, 0x04, 0x01, 0x00, 0x80, 0xa2, 0x8d, 0x2f, 0xb0,</div><div class='add'>+	0x06, 0x00, 0x9d, 0x05, 0x00, 0x00, 0x00, 0x1c, 0x08, 0x00, 0x36, 0x92,</div><div class='add'>+	0x00, 0x00, 0x29, 0x03, 0x04, 0x00, 0x00, 0x80, 0xa2, 0x60, 0x80, 0xbc,</div><div class='add'>+	0x09, 0x00, 0x9d, 0x05, 0x00, 0x00, 0x00, 0x1c, 0x08, 0x00, 0x36, 0x92,</div><div class='add'>+	0x00, 0x00, 0x2b, 0x03, 0x06, 0x03, 0x01, 0x80, 0x12, 0xc0, 0x6e, 0xbc,</div><div class='add'>+	0x07, 0x00, 0x9d, 0x05, 0x00, 0x00, 0x00, 0x1c, 0x08, 0x00, 0x36, 0x92,</div><div class='add'>+	0x08, 0x00, 0x9d, 0x05, 0x00, 0x00, 0x00, 0x1c, 0x08, 0x00, 0x36, 0x92,</div><div class='add'>+	0x02, 0x00, 0x9d, 0x05, 0x38, 0x01, 0x00, 0x1c, 0x08, 0x00, 0x36, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x2f, 0x03, 0x02, 0x0c, 0x02, 0x80, 0xa2, 0x5b, 0x80, 0xbc,</div><div class='add'>+	0x1f, 0x00, 0x9d, 0x05, 0x00, 0x00, 0x00, 0x1c, 0x08, 0x00, 0x36, 0x92,</div><div class='add'>+	0x1e, 0x00, 0x9d, 0x05, 0x00, 0x00, 0x00, 0x1c, 0x08, 0x00, 0x36, 0x92,</div><div class='add'>+	0x00, 0x00, 0x34, 0x03, 0x00, 0x00, 0x00, 0x28, 0x09, 0x40, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x34, 0x03, 0x00, 0x00, 0x00, 0x28, 0x09, 0x80, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x34, 0x03, 0x00, 0x00, 0x00, 0x28, 0x09, 0xc0, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x34, 0x03, 0x00, 0x00, 0x00, 0x28, 0x09, 0x00, 0x01, 0x92,</div><div class='add'>+	0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x09, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0xe2, 0x10, 0x00, 0x00, 0x00, 0x14, 0x09, 0x80, 0x92, 0xd2,</div><div class='add'>+	0x0d, 0x00, 0x58, 0x10, 0x00, 0x00, 0x00, 0x1c, 0x08, 0x00, 0x36, 0xf2,</div><div class='add'>+	0x00, 0x00, 0x9d, 0x05, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x10, 0x00, 0x8a, 0x11, 0x2a, 0x00, 0x00, 0xcc, 0x02, 0x20, 0x15, 0xb8,</div><div class='add'>+	0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x09, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0xe2, 0x10, 0x00, 0x00, 0x00, 0x14, 0x09, 0x00, 0x80, 0xd2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x30,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x30,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x30,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x30,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x30,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x30,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x30,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x30,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x30,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x01, 0x00, 0x78, 0x09, 0xc0, 0x21, 0xb2,</div><div class='add'>+	0x00, 0x00, 0xdc, 0x0e, 0x00, 0x00, 0x00, 0x3c, 0x03, 0x00, 0x38, 0xf2,</div><div class='add'>+	0x1d, 0x00, 0x49, 0x03, 0x80, 0x01, 0x00, 0x78, 0x09, 0xe0, 0x00, 0xb8,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x32, 0x80, 0x97, 0xbc,</div><div class='add'>+	0x1d, 0x00, 0x9d, 0x05, 0x00, 0x00, 0x00, 0x1c, 0x08, 0x00, 0x36, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x22, 0x80, 0x97, 0xbc,</div><div class='add'>+	0x14, 0x00, 0x9d, 0x05, 0x00, 0x00, 0x00, 0x1c, 0x08, 0x00, 0x36, 0x92,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0xa8, 0x05, 0x28, 0x30,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x00, 0x00, 0x80, 0x02, 0xc0, 0x2c, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x01, 0x00, 0x78, 0x09, 0xc0, 0x21, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x00, 0x00, 0x80, 0xa2, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x60, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0xf8, 0x82, 0x8d, 0x2f, 0xb0,</div><div class='add'>+	0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x83, 0x40, 0x01, 0x39,</div><div class='add'>+	0x35, 0x00, 0x54, 0x03, 0x04, 0x00, 0x00, 0x80, 0x82, 0xcd, 0x81, 0xbc,</div><div class='add'>+	0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x09, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0xe2, 0x10, 0x00, 0x00, 0x00, 0x14, 0x09, 0xc0, 0x81, 0xd2,</div><div class='add'>+	0x00, 0x00, 0xdc, 0x0e, 0x00, 0x00, 0x00, 0x38, 0x03, 0x00, 0x38, 0xf2,</div><div class='add'>+	0x2b, 0x00, 0x9d, 0x05, 0x02, 0x01, 0x00, 0x80, 0x82, 0xcd, 0x81, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x93, 0x05, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x01, 0x00, 0x78, 0x09, 0xc0, 0x21, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x5a, 0x03, 0x1d, 0x41, 0x02, 0x5c, 0xf8, 0x01, 0x68, 0xb4,</div><div class='add'>+	0x41, 0x00, 0xa1, 0x03, 0x00, 0x00, 0x00, 0xf8, 0xa2, 0x8d, 0x2f, 0x91,</div><div class='add'>+	0x35, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x09, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0xe2, 0x10, 0x00, 0x00, 0x00, 0x14, 0x59, 0xc0, 0x85, 0xd7,</div><div class='add'>+	0x10, 0x00, 0x00, 0x00, 0xd0, 0x2c, 0x02, 0x00, 0xa9, 0xdb, 0x85, 0x39,</div><div class='add'>+	0x00, 0x00, 0xe1, 0x02, 0x12, 0x01, 0x00, 0x54, 0x02, 0xa4, 0x38, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x64, 0x03, 0x04, 0xb0, 0x00, 0x80, 0x02, 0x00, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x60, 0x11, 0x00, 0x78, 0x01, 0x60, 0x08, 0x00, 0x6e, 0xf2,</div><div class='add'>+	0x2f, 0x00, 0x93, 0x05, 0xd7, 0x00, 0x00, 0x1c, 0x08, 0x00, 0x36, 0x92,</div><div class='add'>+	0x00, 0x00, 0x65, 0x03, 0x06, 0xa9, 0x01, 0x08, 0x09, 0x00, 0x6e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x6d, 0x03, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x70, 0x03, 0x04, 0xa8, 0x01, 0x08, 0x09, 0x00, 0x6e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x02, 0x08, 0x89, 0x9b, 0x90, 0x3e,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x01, 0x08, 0x89, 0x9b, 0x90, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x70, 0x03, 0x9f, 0x88, 0x01, 0x08, 0x89, 0x9b, 0x90, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x02, 0x04, 0xf9, 0xba, 0x6e, 0x37,</div><div class='add'>+	0x00, 0x00, 0x6c, 0x03, 0x02, 0x00, 0x00, 0x80, 0x12, 0xa4, 0x90, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x19, 0x80, 0x90, 0x37,</div><div class='add'>+	0x00, 0x00, 0x70, 0x03, 0x02, 0x01, 0x02, 0x80, 0x82, 0x9b, 0x90, 0xbc,</div><div class='add'>+	0x30, 0x00, 0x93, 0x05, 0xd7, 0x00, 0x00, 0x1c, 0x08, 0x00, 0x36, 0x92,</div><div class='add'>+	0x00, 0x00, 0x70, 0x03, 0x04, 0xb0, 0x00, 0x80, 0x02, 0x00, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0x12, 0x70, 0x03, 0x04, 0x01, 0x00, 0x80, 0xa2, 0x8d, 0x2f, 0xb0,</div><div class='add'>+	0x31, 0x00, 0x93, 0x05, 0xd7, 0x00, 0x00, 0x1c, 0x08, 0x00, 0x36, 0x92,</div><div class='add'>+	0x00, 0x00, 0xa1, 0x03, 0x00, 0x00, 0x00, 0xf8, 0x72, 0x81, 0x2f, 0x95,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x42, 0x80, 0x2f, 0x34,</div><div class='add'>+	0x08, 0xc0, 0x74, 0x02, 0x12, 0x01, 0x00, 0x40, 0xa2, 0xcd, 0x39, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x93, 0x40, 0x01, 0x39,</div><div class='add'>+	0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x09, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0xe2, 0x10, 0x00, 0x00, 0x00, 0x14, 0x09, 0xc0, 0x81, 0xd2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x00, 0x00, 0x80, 0x02, 0xc0, 0x2c, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x00, 0x00, 0x80, 0xa2, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x60, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0xf8, 0x82, 0x8d, 0x2f, 0xb0,</div><div class='add'>+	0x00, 0x00, 0xb0, 0x03, 0x80, 0x01, 0x80, 0x80, 0x32, 0x0b, 0x6a, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x08, 0x40, 0x90, 0x32,</div><div class='add'>+	0x00, 0x00, 0xdc, 0x0e, 0x00, 0x00, 0x00, 0x38, 0x03, 0x00, 0x38, 0xf2,</div><div class='add'>+	0x2b, 0x00, 0x9d, 0x05, 0x02, 0x01, 0x00, 0x80, 0x82, 0xcd, 0x81, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x93, 0x05, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x93, 0x40, 0x01, 0x39,</div><div class='add'>+	0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x09, 0x00, 0x36, 0x32,</div><div class='add'>+	0x10, 0x00, 0xe2, 0x10, 0x00, 0x00, 0x00, 0x14, 0x89, 0x4d, 0x81, 0xd7,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x00, 0x00, 0x80, 0x02, 0xc0, 0x2c, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x00, 0x00, 0x80, 0xa2, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x60, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0xf8, 0x82, 0x8d, 0x2f, 0xb0,</div><div class='add'>+	0x00, 0x00, 0xb0, 0x03, 0x80, 0x01, 0x80, 0x80, 0x32, 0x0b, 0x6a, 0xb6,</div><div class='add'>+	0x00, 0x00, 0xdc, 0x0e, 0x00, 0x00, 0x00, 0x38, 0x03, 0x00, 0x38, 0xf2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x03, 0x04, 0x20, 0x01, 0x80, 0x52, 0x20, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x09, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x25, 0x00, 0x9d, 0x05, 0x00, 0x00, 0x00, 0x1c, 0x08, 0x00, 0x36, 0x92,</div><div class='add'>+	0x24, 0x00, 0x9d, 0x05, 0x00, 0x00, 0x00, 0x1c, 0x08, 0x00, 0x36, 0x92,</div><div class='add'>+	0x00, 0x00, 0x93, 0x03, 0x04, 0x01, 0x00, 0xd8, 0x1e, 0x80, 0xed, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8c, 0x03, 0xb7, 0x00, 0x00, 0xd8, 0x0e, 0xc0, 0xed, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8f, 0x03, 0x04, 0x01, 0x00, 0x80, 0x42, 0x3b, 0xee, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x1e, 0x00, 0xee, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xa7, 0x00, 0x00, 0xd0, 0x0e, 0x00, 0xee, 0x32,</div><div class='add'>+	0x00, 0x00, 0x93, 0x03, 0x80, 0x01, 0x00, 0x80, 0x92, 0x80, 0xfc, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x93, 0x03, 0x80, 0x01, 0x00, 0x80, 0xa2, 0x80, 0xfc, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x93, 0x03, 0x04, 0x01, 0x00, 0xb0, 0x1e, 0x00, 0xeb, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x74, 0x86, 0xcc, 0x02, 0x80, 0x6c, 0x32,</div><div class='add'>+	0x28, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0x97, 0x03, 0x80, 0x01, 0x80, 0x80, 0x32, 0x0b, 0x6a, 0xb6,</div><div class='add'>+	0x35, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x2c, 0x82, 0xcd, 0x2e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x99, 0x03, 0x04, 0x01, 0x00, 0x80, 0x42, 0xc5, 0x2c, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x9a, 0x03, 0x00, 0x00, 0x00, 0xcc, 0x02, 0x00, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xcc, 0x12, 0xc0, 0x2c, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x95, 0x03, 0x04, 0x01, 0x00, 0x00, 0x19, 0x00, 0x90, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x74, 0x86, 0xc8, 0x06, 0xc0, 0x2c, 0x32,</div><div class='add'>+	0x08, 0x00, 0xb0, 0x03, 0x00, 0x00, 0x00, 0xf8, 0xc3, 0x40, 0x01, 0x99,</div><div class='add'>+	0x00, 0x00, 0x9f, 0x03, 0x04, 0x00, 0x00, 0x80, 0x02, 0x80, 0x80, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x55, 0x01, 0x80, 0xb2, 0x1b, 0x2b, 0xbc,</div><div class='add'>+	0x00, 0x00, 0xc6, 0x0e, 0x00, 0x00, 0x00, 0x2c, 0x09, 0x00, 0x00, 0xf2,</div><div class='add'>+	0x00, 0x00, 0xa4, 0x03, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xa3, 0x03, 0x04, 0x00, 0x00, 0x80, 0x02, 0x80, 0x80, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x55, 0x01, 0x80, 0xb2, 0x1b, 0x2b, 0xbc,</div><div class='add'>+	0x00, 0x00, 0xc6, 0x0e, 0x00, 0x00, 0x00, 0x2c, 0xf9, 0x01, 0x00, 0xf4,</div><div class='add'>+	0x00, 0x00, 0xad, 0x03, 0x04, 0x00, 0x00, 0x28, 0x09, 0x80, 0x80, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x02, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0xef, 0x0f, 0x00, 0x00, 0x00, 0x08, 0x08, 0x00, 0x00, 0xd2,</div><div class='add'>+	0x00, 0x00, 0xad, 0x03, 0x04, 0x00, 0x00, 0x80, 0x02, 0x80, 0x92, 0xbc,</div><div class='add'>+	0x18, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0xf9,</div><div class='add'>+	0x00, 0x00, 0xb0, 0x03, 0x80, 0x01, 0x00, 0x80, 0xa2, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0xb0, 0x03, 0x12, 0x01, 0x00, 0x00, 0x09, 0xc0, 0x21, 0xb2,</div><div class='add'>+	0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0x39,</div><div class='add'>+	0xb0, 0x03, 0x36, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x02, 0x00, 0x36, 0x92,</div><div class='add'>+	0x00, 0x00, 0xb0, 0x03, 0x80, 0x01, 0x00, 0x80, 0xa2, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0xb0, 0x03, 0x12, 0x01, 0x00, 0x00, 0x09, 0xc0, 0x21, 0xb2,</div><div class='add'>+	0x18, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0xf9,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x02, 0x00, 0x00, 0x32,</div><div class='add'>+	0x18, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x8a, 0x02, 0x99,</div><div class='add'>+	0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe4, 0x03, 0x00, 0x36, 0x32,</div><div class='add'>+	0x02, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xe0, 0x03, 0x00, 0x37, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe4, 0x03, 0x00, 0x36, 0x32,</div><div class='add'>+	0x04, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xe0, 0x03, 0x00, 0x37, 0x32,</div><div class='add'>+	0xaa, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe4, 0x03, 0x00, 0x36, 0x32,</div><div class='add'>+	0x09, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xe0, 0x03, 0x00, 0x37, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xcc, 0x0f, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe4, 0x03, 0x00, 0x36, 0x32,</div><div class='add'>+	0x06, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xe0, 0x03, 0x00, 0x37, 0x32,</div><div class='add'>+	0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe4, 0x03, 0x00, 0x36, 0x32,</div><div class='add'>+	0x08, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xe0, 0x03, 0x00, 0x37, 0x32,</div><div class='add'>+	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe4, 0x03, 0x00, 0x36, 0x32,</div><div class='add'>+	0x05, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xe0, 0x03, 0x00, 0x37, 0x32,</div><div class='add'>+	0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe4, 0x03, 0x00, 0x36, 0x32,</div><div class='add'>+	0x07, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xe0, 0x03, 0x00, 0x37, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x02, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0xc2, 0x03, 0x8b, 0x01, 0x00, 0xa0, 0x12, 0x00, 0x2a, 0xba,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa8, 0x02, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x07, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0xc5, 0x03, 0x06, 0x01, 0x00, 0x80, 0x02, 0x80, 0x2a, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9c, 0x02, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd4, 0x02, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xcc, 0x02, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x02, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x02, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xdc, 0x02, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x02, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc8, 0x02, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc4, 0x02, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0xc8, 0x03, 0x85, 0x01, 0x00, 0x9c, 0x12, 0xc0, 0x29, 0xba,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe4, 0x03, 0x00, 0x36, 0x32,</div><div class='add'>+	0x0b, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xe0, 0x03, 0x00, 0x37, 0x32,</div><div class='add'>+	0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe4, 0x03, 0x00, 0x36, 0x32,</div><div class='add'>+	0x13, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xe0, 0x03, 0x00, 0x37, 0x32,</div><div class='add'>+	0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe4, 0x03, 0x00, 0x36, 0x32,</div><div class='add'>+	0x0c, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xe0, 0x03, 0x00, 0x37, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe4, 0x03, 0x00, 0x06, 0x32,</div><div class='add'>+	0x0f, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xe0, 0x03, 0x00, 0x37, 0x32,</div><div class='add'>+	0x00, 0xcc, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe4, 0x03, 0x00, 0x36, 0x32,</div><div class='add'>+	0x0d, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xe0, 0x03, 0x00, 0x37, 0x32,</div><div class='add'>+	0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe4, 0x03, 0x00, 0x36, 0x32,</div><div class='add'>+	0x14, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xe0, 0x03, 0x00, 0x37, 0x32,</div><div class='add'>+	0xb7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe4, 0x03, 0x00, 0x36, 0x32,</div><div class='add'>+	0x15, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xe0, 0x03, 0x00, 0x37, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe4, 0x03, 0x00, 0x36, 0x32,</div><div class='add'>+	0x18, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xe0, 0x03, 0x00, 0x37, 0x32,</div><div class='add'>+	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe4, 0x03, 0x00, 0x36, 0x32,</div><div class='add'>+	0x1d, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xe0, 0x03, 0x00, 0x37, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe4, 0x03, 0x00, 0x04, 0x32,</div><div class='add'>+	0x1e, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xe0, 0x03, 0x00, 0x37, 0x32,</div><div class='add'>+	0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe4, 0x03, 0x00, 0x36, 0x32,</div><div class='add'>+	0x1f, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xe0, 0x03, 0x00, 0x37, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe4, 0x03, 0x00, 0x00, 0x32,</div><div class='add'>+	0x20, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xe0, 0x03, 0x00, 0x37, 0x32,</div><div class='add'>+	0xe0, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe4, 0x03, 0x00, 0x36, 0x32,</div><div class='add'>+	0x17, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xe0, 0x03, 0x00, 0x37, 0x32,</div><div class='add'>+	0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe4, 0x03, 0x00, 0x36, 0x32,</div><div class='add'>+	0x1b, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xe0, 0x03, 0x00, 0x37, 0x32,</div><div class='add'>+	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe4, 0x03, 0x00, 0x36, 0x32,</div><div class='add'>+	0x1c, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xe0, 0x03, 0x00, 0x37, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe4, 0x03, 0x40, 0x00, 0x32,</div><div class='add'>+	0x16, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xe0, 0x03, 0x00, 0x37, 0x32,</div><div class='add'>+	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe4, 0x03, 0x00, 0x36, 0x32,</div><div class='add'>+	0x1a, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xe0, 0x03, 0x00, 0x37, 0x32,</div><div class='add'>+	0x20, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe4, 0x03, 0x00, 0x36, 0x32,</div><div class='add'>+	0x19, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xe0, 0x03, 0x00, 0x37, 0x32,</div><div class='add'>+	0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe4, 0x03, 0x00, 0x36, 0x32,</div><div class='add'>+	0x0b, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xe0, 0x03, 0x00, 0x37, 0x32,</div><div class='add'>+	0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe4, 0x03, 0x00, 0x36, 0x32,</div><div class='add'>+	0x0c, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xe0, 0x03, 0x00, 0x37, 0x32,</div><div class='add'>+	0xfe, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0xac, 0x02, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x32,</div><div class='add'>+	0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x03, 0x64, 0x02, 0x39,</div><div class='add'>+	0x00, 0x00, 0xfb, 0x03, 0x85, 0x01, 0x00, 0x00, 0x19, 0x00, 0x90, 0xba,</div><div class='add'>+	0x25, 0x26, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe4, 0x03, 0x00, 0x36, 0x32,</div><div class='add'>+	0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xe0, 0x03, 0x00, 0x37, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x0f, 0x00, 0x00, 0x32,</div><div class='add'>+	0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xf3, 0x40, 0x01, 0x39,</div><div class='add'>+	0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xe3, 0x40, 0x01, 0x39,</div><div class='add'>+	0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xc3, 0x40, 0x01, 0x39,</div><div class='add'>+	0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xb3, 0x40, 0x01, 0x39,</div><div class='add'>+	0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xa3, 0x40, 0x01, 0x39,</div><div class='add'>+	0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x93, 0x40, 0x01, 0x39,</div><div class='add'>+	0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x83, 0x40, 0x01, 0x39,</div><div class='add'>+	0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x40, 0x01, 0x39,</div><div class='add'>+	0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x63, 0x40, 0x01, 0x39,</div><div class='add'>+	0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x53, 0x40, 0x01, 0x39,</div><div class='add'>+	0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x43, 0x40, 0x01, 0x39,</div><div class='add'>+	0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x33, 0x40, 0x01, 0x39,</div><div class='add'>+	0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x13, 0x40, 0x01, 0x39,</div><div class='add'>+	0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x23, 0x40, 0x01, 0x39,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x03, 0x80, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc8, 0x3f, 0x80, 0xfc, 0x35,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9c, 0x02, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x32,</div><div class='add'>+	0x4c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x02, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x03, 0x40, 0x38, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0xd2, 0x01, 0x30, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x13, 0x04, 0x04, 0x01, 0x00, 0xd0, 0x12, 0x00, 0x2d, 0xbc,</div><div class='add'>+	0x50, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe4, 0x03, 0x00, 0x36, 0x32,</div><div class='add'>+	0x03, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xe0, 0x03, 0x00, 0x37, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x17, 0x00, 0x00, 0xd0, 0x02, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xe0, 0x06, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x01, 0xe4, 0x06, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x01, 0xec, 0x06, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x01, 0xe0, 0x06, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x12, 0x00, 0x2d, 0x3a,</div><div class='add'>+	0x4c, 0x00, 0x1a, 0x04, 0x02, 0x01, 0x00, 0x80, 0x82, 0x0d, 0x2d, 0xbc,</div><div class='add'>+	0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9c, 0xae, 0x0d, 0x02, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa8, 0x02, 0x00, 0x00, 0x32,</div><div class='add'>+	0x20, 0x00, 0x00, 0x00, 0x00, 0x88, 0x86, 0xcc, 0x07, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x8a, 0x86, 0xcc, 0x07, 0x80, 0x00, 0x3a,</div><div class='add'>+	0x00, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x09, 0x80, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x64, 0x02, 0x40, 0x90, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x29, 0x40, 0x90, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x26, 0x04, 0x12, 0x00, 0x00, 0x78, 0x09, 0xc0, 0x20, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x01, 0x00, 0x80, 0xf2, 0x81, 0x97, 0xb6,</div><div class='add'>+	0x1d, 0x00, 0x8a, 0x11, 0x80, 0x01, 0x00, 0x78, 0xe9, 0xe5, 0x00, 0xb8,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x09, 0x45, 0x90, 0x30,</div><div class='add'>+	0x00, 0x00, 0x24, 0x04, 0x02, 0x01, 0x00, 0x80, 0xc2, 0x82, 0x97, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x84, 0x02, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xcc, 0x03, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x2c, 0x04, 0x8e, 0x01, 0x00, 0x80, 0x02, 0x40, 0x28, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x26, 0x0f, 0x00, 0x00, 0x00, 0xd8, 0x02, 0x00, 0x00, 0xd2,</div><div class='add'>+	0x0e, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8c, 0x0e, 0x00, 0x36, 0x32,</div><div class='add'>+	0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0xb9, 0x05, 0x36, 0x30,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe4, 0x73, 0x80, 0x97, 0x34,</div><div class='add'>+	0x09, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0xe0, 0x03, 0x00, 0x37, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe4, 0x03, 0x00, 0x00, 0x32,</div><div class='add'>+	0x0a, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0xe0, 0x03, 0x00, 0x37, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe4, 0x73, 0x80, 0x97, 0x34,</div><div class='add'>+	0x09, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0xe0, 0x03, 0x00, 0x37, 0x32,</div><div class='add'>+	0xfe, 0xca, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe4, 0x03, 0x00, 0x36, 0x32,</div><div class='add'>+	0x0a, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0xe0, 0x03, 0x00, 0x37, 0x32,</div><div class='add'>+	0x00, 0x00, 0x3b, 0x04, 0x12, 0x01, 0x00, 0x00, 0x09, 0x40, 0x20, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x39, 0x04, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x3b, 0x04, 0x12, 0x00, 0x00, 0x04, 0x09, 0x40, 0x20, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x3e, 0x04, 0x9f, 0x01, 0x00, 0x80, 0x02, 0x00, 0x90, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x3d, 0x04, 0x12, 0x00, 0x00, 0x08, 0x09, 0x40, 0x20, 0xb2,</div><div class='add'>+	0x02, 0x00, 0x39, 0x04, 0x04, 0x01, 0x00, 0x78, 0x09, 0x24, 0x17, 0xb8,</div><div class='add'>+	0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x09, 0x64, 0x16, 0x38,</div><div class='add'>+	0x00, 0x00, 0x39, 0x04, 0x04, 0x01, 0x00, 0x80, 0x02, 0x81, 0x97, 0xbc,</div><div class='add'>+	0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x03, 0x00, 0x36, 0x32,</div><div class='add'>+	0xfe, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0x48, 0x03, 0x00, 0x36, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x00, 0x09, 0x40, 0x20, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x44, 0x04, 0x12, 0x00, 0x00, 0x04, 0x09, 0x40, 0x20, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x47, 0x04, 0x9f, 0x01, 0x00, 0x80, 0x02, 0x00, 0x90, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x46, 0x04, 0x12, 0x00, 0x00, 0x08, 0x09, 0x40, 0x20, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb4, 0x02, 0x00, 0x90, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x06, 0x00, 0x59, 0x04, 0x00, 0x00, 0x00, 0x0c, 0x09, 0x64, 0x16, 0x98,</div><div class='add'>+	0x00, 0x00, 0x68, 0x02, 0x00, 0x00, 0x00, 0x14, 0x08, 0x40, 0x90, 0x92,</div><div class='add'>+	0x00, 0x00, 0x97, 0x02, 0x00, 0x00, 0x00, 0x14, 0x08, 0x40, 0x90, 0x92,</div><div class='add'>+	0x33, 0x00, 0x74, 0x03, 0x00, 0x00, 0x00, 0x1c, 0x08, 0x00, 0x36, 0x92,</div><div class='add'>+	0x11, 0x00, 0x74, 0x03, 0x00, 0x00, 0x00, 0x1c, 0x08, 0x00, 0x36, 0x92,</div><div class='add'>+	0x39, 0x00, 0x74, 0x03, 0x00, 0x00, 0x00, 0x1c, 0x08, 0x00, 0x36, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x7f, 0x02, 0x00, 0x00, 0x00, 0x14, 0x08, 0x40, 0x90, 0x92,</div><div class='add'>+	0x00, 0x00, 0x7f, 0x03, 0x00, 0x00, 0x00, 0x14, 0x08, 0x40, 0x90, 0x92,</div><div class='add'>+	0x5a, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, 0x82, 0xcd, 0x90, 0x3a,</div><div class='add'>+	0x0d, 0x00, 0x7c, 0x04, 0x00, 0x00, 0x00, 0xb0, 0x02, 0xe4, 0x16, 0x98,</div><div class='add'>+	0x0d, 0x00, 0x8e, 0x04, 0x00, 0x00, 0x00, 0xb0, 0x02, 0xe4, 0x16, 0x98,</div><div class='add'>+	0x0d, 0x00, 0x97, 0x04, 0x00, 0x00, 0x00, 0xb0, 0x02, 0xe4, 0x16, 0x98,</div><div class='add'>+	0x00, 0x00, 0xa3, 0x04, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xad, 0x04, 0x00, 0x00, 0x00, 0x00, 0x09, 0x40, 0x90, 0x9d,</div><div class='add'>+	0x00, 0x00, 0xb3, 0x04, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xbd, 0x04, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xc7, 0x04, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xd1, 0x04, 0x00, 0x00, 0x00, 0x00, 0x09, 0x40, 0x90, 0x9d,</div><div class='add'>+	0x00, 0x00, 0xd8, 0x04, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xe1, 0x04, 0x00, 0x00, 0x00, 0x00, 0x09, 0x40, 0x90, 0x9d,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xf3, 0x04, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0xf3, 0x04, 0x00, 0x00, 0x00, 0x00, 0x09, 0x40, 0x00, 0x92,</div><div class='add'>+	0xd8, 0x00, 0xf5, 0x04, 0x00, 0x00, 0x00, 0xa0, 0x02, 0x00, 0x36, 0x92,</div><div class='add'>+	0x00, 0x00, 0xff, 0x04, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8d, 0x04, 0x00, 0x00, 0x00, 0xdc, 0x0f, 0x40, 0x90, 0x92,</div><div class='add'>+	0x00, 0x00, 0xe8, 0x04, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xed, 0x04, 0x00, 0x00, 0x00, 0x78, 0x39, 0x40, 0x90, 0x97,</div><div class='add'>+	0x00, 0x00, 0x8d, 0x04, 0x00, 0x00, 0x00, 0xec, 0x0e, 0x40, 0x90, 0x92,</div><div class='add'>+	0x00, 0x00, 0xef, 0x04, 0x00, 0x00, 0x00, 0xe8, 0x0e, 0x40, 0x90, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8d, 0x04, 0x00, 0x00, 0x00, 0xd4, 0x0e, 0x40, 0x90, 0x92,</div><div class='add'>+	0x00, 0x00, 0xf0, 0x04, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x85, 0x05, 0x00, 0x00, 0x00, 0xdc, 0x0e, 0x40, 0x90, 0x92,</div><div class='add'>+	0x00, 0x00, 0x10, 0x05, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x08, 0x00, 0x15, 0x05, 0x00, 0x00, 0x00, 0x50, 0x1f, 0x24, 0x16, 0x98,</div><div class='add'>+	0x00, 0x00, 0x27, 0x05, 0x00, 0x00, 0x00, 0xd8, 0x02, 0x00, 0x00, 0x92,</div><div class='add'>+	0x0d, 0x00, 0x32, 0x05, 0x00, 0x00, 0x00, 0xb0, 0x02, 0xe4, 0x16, 0x98,</div><div class='add'>+	0x00, 0x00, 0x33, 0x05, 0x00, 0x00, 0x00, 0xd0, 0x02, 0x00, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x0c, 0x01, 0x00, 0x00, 0x00, 0xd0, 0x02, 0x00, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x89, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x93, 0x40, 0x01, 0x39,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x09, 0x45, 0x90, 0x30,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x06, 0x01, 0x00, 0x80, 0x22, 0x80, 0x97, 0xbc,</div><div class='add'>+	0x3f, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x82, 0x0d, 0x00, 0xb0,</div><div class='add'>+	0x02, 0x00, 0x80, 0x04, 0xb0, 0x00, 0x00, 0xa0, 0xc2, 0x0a, 0x00, 0xb9,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x04, 0x6b, 0x41, 0x90, 0x34,</div><div class='add'>+	0x00, 0x00, 0xb0, 0x03, 0x80, 0x01, 0x00, 0x80, 0x02, 0x40, 0xb0, 0xb6,</div><div class='add'>+	0x00, 0x00, 0xb0, 0x03, 0x04, 0x00, 0x00, 0x80, 0x02, 0x80, 0xb0, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x02, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa8, 0x22, 0x00, 0x2b, 0x37,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x67, 0x01, 0x00, 0x34,</div><div class='add'>+	0x00, 0x42, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x87, 0x8d, 0x2a, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x10, 0x00, 0x00, 0x07, 0x00, 0xb0, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x07, 0x00, 0xd0, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x48, 0xf2, 0xc1, 0x38, 0xb4,</div><div class='add'>+	0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0x39,</div><div class='add'>+	0xb0, 0x03, 0x36, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x02, 0x00, 0x36, 0x92,</div><div class='add'>+	0x08, 0x00, 0xb0, 0x03, 0x00, 0x00, 0x00, 0xf8, 0x93, 0x40, 0x01, 0x99,</div><div class='add'>+	0x00, 0x00, 0x91, 0x04, 0x9f, 0x00, 0x00, 0x80, 0x02, 0x00, 0x90, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x09, 0x40, 0x90, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x09, 0xc0, 0xfd, 0x32,</div><div class='add'>+	0x02, 0x00, 0x91, 0x04, 0xb0, 0x00, 0x00, 0xa0, 0xc2, 0x0a, 0x00, 0xb9,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0b, 0x80, 0x90, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0d, 0x40, 0x90, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x04, 0x3b, 0x40, 0xb0, 0x31,</div><div class='add'>+	0x00, 0x00, 0x8d, 0x04, 0x04, 0x00, 0x00, 0x80, 0x02, 0x00, 0x2b, 0xbc,</div><div class='add'>+	0xf1, 0x0f, 0x8d, 0x04, 0x00, 0x00, 0x00, 0x8c, 0x0e, 0x00, 0x36, 0x92,</div><div class='add'>+	0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x93, 0x40, 0x01, 0x39,</div><div class='add'>+	0x02, 0x00, 0x98, 0x04, 0xb0, 0x00, 0x00, 0xa0, 0xc2, 0x0a, 0x00, 0xb9,</div><div class='add'>+	0x00, 0x00, 0x9b, 0x04, 0x80, 0x01, 0x00, 0x80, 0x12, 0x40, 0xb0, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x3b, 0x40, 0xb0, 0x33,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0xcd, 0x4a, 0xd0, 0x35,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x0b, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x0c, 0x1b, 0xe4, 0xb0, 0x32,</div><div class='add'>+	0x00, 0x00, 0xb0, 0x03, 0x0b, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x00, 0x00, 0xa1, 0x04, 0x04, 0x00, 0x00, 0x80, 0x02, 0x40, 0x90, 0xb2,</div><div class='add'>+	0x1f, 0x00, 0xb0, 0x03, 0x00, 0x00, 0x00, 0x80, 0x11, 0x40, 0x00, 0x99,</div><div class='add'>+	0x00, 0x00, 0xa0, 0x04, 0x04, 0x00, 0x00, 0x80, 0x02, 0x00, 0xf8, 0xbc,</div><div class='add'>+	0x00, 0x00, 0xb0, 0x03, 0x00, 0x00, 0x00, 0x80, 0x01, 0x00, 0xf8, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x00, 0x00, 0x80, 0x02, 0x81, 0xfc, 0xb6,</div><div class='add'>+	0x00, 0x00, 0xa7, 0x04, 0x9f, 0x00, 0x00, 0x80, 0x02, 0x00, 0x90, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x09, 0x40, 0x90, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x09, 0xc0, 0xfd, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x42, 0x85, 0x90, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe4, 0x03, 0x80, 0x90, 0x32,</div><div class='add'>+	0x09, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xe0, 0x03, 0x00, 0x37, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe4, 0x03, 0x40, 0x90, 0x32,</div><div class='add'>+	0x0a, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xe0, 0x03, 0x00, 0x37, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8d, 0x04, 0x00, 0x00, 0x00, 0xc8, 0x0f, 0x81, 0xfc, 0x94,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x02, 0x01, 0x00, 0x80, 0x72, 0x42, 0x90, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x06, 0x01, 0x00, 0x80, 0xe2, 0x42, 0x90, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x78, 0x09, 0x64, 0x90, 0xb5,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe4, 0x73, 0x00, 0x90, 0x3c,</div><div class='add'>+	0x10, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xe0, 0x03, 0x00, 0x37, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8d, 0x04, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xb6, 0x04, 0x9f, 0x00, 0x00, 0x80, 0x02, 0x00, 0x90, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x09, 0x40, 0x90, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x09, 0xc0, 0xfd, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x42, 0x85, 0x90, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe4, 0x03, 0x80, 0x90, 0x32,</div><div class='add'>+	0x01, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xe0, 0x03, 0x00, 0x37, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x0f, 0x80, 0x90, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe4, 0x03, 0x40, 0x90, 0x32,</div><div class='add'>+	0x02, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xe0, 0x03, 0x00, 0x37, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8d, 0x04, 0x00, 0x00, 0x00, 0xe4, 0x0f, 0x40, 0x90, 0x92,</div><div class='add'>+	0x00, 0x00, 0xc0, 0x04, 0x9f, 0x00, 0x00, 0x80, 0x02, 0x00, 0x90, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x09, 0x40, 0x90, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x09, 0xc0, 0xfd, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x42, 0x85, 0x90, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe4, 0x03, 0x80, 0x90, 0x32,</div><div class='add'>+	0x03, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xe0, 0x03, 0x00, 0x37, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa8, 0x0e, 0x80, 0x90, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe4, 0x03, 0x40, 0x90, 0x32,</div><div class='add'>+	0x04, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xe0, 0x03, 0x00, 0x37, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8d, 0x04, 0x00, 0x00, 0x00, 0xac, 0x0e, 0x40, 0x90, 0x92,</div><div class='add'>+	0x00, 0x00, 0xca, 0x04, 0x9f, 0x00, 0x00, 0x80, 0x02, 0x00, 0x90, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x09, 0x40, 0x90, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x09, 0xc0, 0xfd, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x42, 0x85, 0x90, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe4, 0x03, 0x80, 0x90, 0x32,</div><div class='add'>+	0x05, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xe0, 0x03, 0x00, 0x37, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe4, 0x03, 0x40, 0x90, 0x32,</div><div class='add'>+	0x06, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xe0, 0x03, 0x00, 0x37, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x0f, 0x80, 0x90, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8d, 0x04, 0x00, 0x00, 0x00, 0x48, 0x0f, 0x40, 0x90, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x06, 0x01, 0x00, 0x80, 0x82, 0x42, 0x90, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x78, 0x09, 0x64, 0x90, 0xb5,</div><div class='add'>+	0x00, 0x00, 0xd5, 0x04, 0x04, 0x01, 0x00, 0x80, 0x82, 0x42, 0x90, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe4, 0x03, 0x00, 0x90, 0x32,</div><div class='add'>+	0x12, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xe0, 0x03, 0x00, 0x37, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8d, 0x04, 0x00, 0x00, 0x00, 0x40, 0x1f, 0x40, 0x90, 0x9c,</div><div class='add'>+	0x00, 0x00, 0xdb, 0x04, 0x9f, 0x00, 0x00, 0x80, 0x02, 0x00, 0x90, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x09, 0x40, 0x90, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x09, 0xc0, 0xfd, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x42, 0x85, 0x90, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe4, 0x03, 0x80, 0x90, 0x32,</div><div class='add'>+	0x07, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xe0, 0x03, 0x00, 0x37, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe4, 0x03, 0x40, 0x90, 0x32,</div><div class='add'>+	0x08, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xe0, 0x03, 0x00, 0x37, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8d, 0x04, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x06, 0x01, 0x00, 0x80, 0x82, 0x42, 0x90, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x78, 0x09, 0x64, 0x90, 0xb5,</div><div class='add'>+	0x00, 0x00, 0xe5, 0x04, 0x04, 0x01, 0x00, 0x80, 0x82, 0x42, 0x90, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe4, 0x03, 0x00, 0x90, 0x32,</div><div class='add'>+	0x11, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xe0, 0x03, 0x00, 0x37, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8d, 0x04, 0x00, 0x00, 0x00, 0xfc, 0x1f, 0x40, 0x90, 0x9c,</div><div class='add'>+	0x00, 0x00, 0xeb, 0x04, 0x9f, 0x00, 0x00, 0x80, 0x02, 0x00, 0x90, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x09, 0x40, 0x90, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x09, 0xc0, 0xfd, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x84, 0x0e, 0x80, 0x90, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8d, 0x04, 0x00, 0x00, 0x00, 0x88, 0x0e, 0x40, 0x90, 0x92,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x19, 0x40, 0x90, 0x37,</div><div class='add'>+	0x00, 0x00, 0x8d, 0x04, 0x00, 0x00, 0x00, 0x80, 0x0f, 0xa4, 0x97, 0x9a,</div><div class='add'>+	0x00, 0x00, 0x8d, 0x04, 0x00, 0x00, 0x00, 0xbc, 0x0e, 0x80, 0xee, 0x9d,</div><div class='add'>+	0x00, 0x00, 0xf2, 0x04, 0x04, 0x01, 0x00, 0x80, 0x02, 0x40, 0x90, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x09, 0xc0, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8d, 0x04, 0x00, 0x00, 0x00, 0xe4, 0x1e, 0x40, 0x90, 0x9c,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa8, 0x22, 0x00, 0x90, 0x37,</div><div class='add'>+	0x00, 0x00, 0x8d, 0x04, 0x00, 0x00, 0x86, 0xc0, 0x07, 0x40, 0x90, 0x92,</div><div class='add'>+	0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0x02, 0xe4, 0x16, 0x38,</div><div class='add'>+	0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0xfa, 0x04, 0x04, 0x00, 0x00, 0x80, 0x02, 0x24, 0xf6, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc8, 0x3f, 0x80, 0xfc, 0x34,</div><div class='add'>+	0x40, 0x80, 0xfc, 0x04, 0x00, 0x00, 0x00, 0x28, 0x09, 0x80, 0x36, 0x92,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x0f, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x79, 0x01, 0x00, 0x34,</div><div class='add'>+	0x02, 0x00, 0xfc, 0x04, 0xb0, 0x00, 0x00, 0xa0, 0xc2, 0x0a, 0x00, 0xb9,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x0c, 0xab, 0xe4, 0xb0, 0x32,</div><div class='add'>+	0x1f, 0x00, 0x8d, 0x04, 0x00, 0x00, 0x00, 0x80, 0x11, 0x40, 0x00, 0x99,</div><div class='add'>+	0xea, 0x05, 0x05, 0x05, 0x04, 0x01, 0x00, 0x80, 0x82, 0x4d, 0x90, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xec, 0x0f, 0x00, 0x15, 0x32,</div><div class='add'>+	0x00, 0xfe, 0x1f, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x0f, 0x00, 0x37, 0x32,</div><div class='add'>+	0xf0, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe8, 0x0f, 0x00, 0x36, 0x32,</div><div class='add'>+	0x98, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf4, 0x0f, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0x0b, 0x05, 0x00, 0x00, 0x00, 0xc8, 0x4f, 0x80, 0xfc, 0x95,</div><div class='add'>+	0x36, 0x23, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x82, 0x4d, 0x90, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xec, 0x0f, 0x80, 0x14, 0x32,</div><div class='add'>+	0x00, 0xf8, 0x1f, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x0f, 0x00, 0x37, 0x32,</div><div class='add'>+	0xc0, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe8, 0x0f, 0x00, 0x36, 0x32,</div><div class='add'>+	0x98, 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf4, 0x0f, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc8, 0x4f, 0x80, 0xfc, 0x34,</div><div class='add'>+	0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x54, 0x8f, 0x4d, 0x90, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x60, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x7a, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x00, 0x00, 0xa9, 0x0f, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xd0,</div><div class='add'>+	0x00, 0x00, 0x8d, 0x04, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x12, 0x05, 0x80, 0x01, 0x00, 0x80, 0x02, 0x40, 0x90, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc8, 0x6f, 0x80, 0xfc, 0x34,</div><div class='add'>+	0x00, 0x00, 0x14, 0x05, 0x80, 0x01, 0x00, 0x80, 0x12, 0x40, 0x90, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc8, 0x5f, 0x80, 0xfc, 0x34,</div><div class='add'>+	0x00, 0x00, 0x8d, 0x04, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x17, 0x05, 0x04, 0x01, 0x00, 0x80, 0x32, 0x40, 0x90, 0xb0,</div><div class='add'>+	0x80, 0x01, 0x8d, 0x04, 0x00, 0x00, 0x00, 0xc8, 0x8f, 0x8d, 0xfc, 0x91,</div><div class='add'>+	0x00, 0x00, 0x19, 0x05, 0x80, 0x00, 0x00, 0x80, 0x12, 0x40, 0x90, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x1a, 0x05, 0x00, 0x00, 0x00, 0xc8, 0x7f, 0x80, 0xfc, 0x95,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc8, 0x7f, 0x80, 0xfc, 0x34,</div><div class='add'>+	0x00, 0x00, 0x1c, 0x05, 0x80, 0x00, 0x00, 0x80, 0x02, 0x40, 0x90, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x1d, 0x05, 0x00, 0x00, 0x00, 0xc8, 0x8f, 0x80, 0xfc, 0x95,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc8, 0x8f, 0x80, 0xfc, 0x34,</div><div class='add'>+	0x00, 0x00, 0x20, 0x05, 0x80, 0x00, 0x00, 0x80, 0x22, 0x40, 0x90, 0xb6,</div><div class='add'>+	0xf1, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8c, 0x0e, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0x22, 0x05, 0x00, 0x00, 0x00, 0xc8, 0x1f, 0x81, 0xfc, 0x95,</div><div class='add'>+	0x0e, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8c, 0x0e, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc8, 0x1f, 0x81, 0xfc, 0x34,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x06, 0x01, 0x00, 0x80, 0x82, 0x02, 0xf5, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x03, 0x00, 0x00, 0x78, 0x09, 0x00, 0xf5, 0xbd,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0xe2, 0x25, 0xf5, 0xb5,</div><div class='add'>+	0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4c, 0x1f, 0x24, 0x16, 0x38,</div><div class='add'>+	0x00, 0x00, 0x8d, 0x04, 0x00, 0x00, 0x00, 0x50, 0x1f, 0x00, 0xf5, 0x9c,</div><div class='add'>+	0x80, 0x01, 0x8a, 0x11, 0x04, 0x00, 0x00, 0x80, 0x82, 0x8d, 0xfc, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x2b, 0x05, 0x9f, 0x00, 0x00, 0x80, 0x02, 0x00, 0x90, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x09, 0x40, 0x90, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x09, 0xc0, 0xfd, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x17, 0x00, 0xf5, 0x3a,</div><div class='add'>+	0x8c, 0xcc, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x07, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x10, 0x00, 0x00, 0x07, 0x80, 0x90, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x07, 0x40, 0x90, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x40, 0xf2, 0xc1, 0x38, 0xb4,</div><div class='add'>+	0x18, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0xf9,</div><div class='add'>+	0x00, 0x00, 0x8d, 0x04, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8d, 0x04, 0x00, 0x00, 0x00, 0xec, 0x03, 0x40, 0x90, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x00, 0x00, 0x80, 0x02, 0x40, 0x90, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x34, 0x05, 0xb2, 0x00, 0x00, 0xd8, 0x02, 0x00, 0x00, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x01, 0xec, 0x16, 0xe4, 0x6e, 0x3a,</div><div class='add'>+	0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x93, 0x40, 0x01, 0x39,</div><div class='add'>+	0x00, 0x00, 0x69, 0x05, 0x17, 0x10, 0x01, 0xf8, 0x02, 0x00, 0x6e, 0xb2,</div><div class='add'>+	0x06, 0x00, 0x3f, 0x05, 0x04, 0x01, 0x00, 0x80, 0x82, 0x8d, 0x2f, 0xb0,</div><div class='add'>+	0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x82, 0x8d, 0x2f, 0x32,</div><div class='add'>+	0x00, 0xc0, 0xd3, 0x0e, 0x00, 0x00, 0x00, 0x28, 0x09, 0x80, 0x36, 0xd2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x01, 0xec, 0x16, 0xc0, 0x6e, 0x3c,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x86, 0xc8, 0x06, 0x00, 0x00, 0x32,</div><div class='add'>+	0x18, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0xf9,</div><div class='add'>+	0x00, 0x00, 0x40, 0x05, 0x00, 0x00, 0x00, 0xd0, 0x02, 0x00, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x46, 0x05, 0x04, 0x19, 0x86, 0x80, 0x02, 0x80, 0x6c, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x01, 0x00, 0x80, 0x12, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x6e, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xc1, 0x08, 0x00, 0x04, 0x09, 0x00, 0x6e, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xc0, 0x15, 0x86, 0x2c, 0x09, 0xc0, 0x6c, 0x32,</div><div class='add'>+	0x00, 0x00, 0x4c, 0x05, 0x22, 0x1d, 0x86, 0xc8, 0x06, 0xc0, 0x92, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x4c, 0x05, 0x00, 0x18, 0x86, 0xc8, 0x06, 0x40, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x01, 0x00, 0x80, 0x22, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x09, 0x00, 0x6e, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xc2, 0x48, 0x00, 0x04, 0x09, 0x00, 0x6e, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xc0, 0x16, 0x86, 0x2c, 0x09, 0xc0, 0x6c, 0x32,</div><div class='add'>+	0x00, 0x00, 0x4c, 0x05, 0x21, 0x1d, 0x86, 0xc8, 0x06, 0xc0, 0x92, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x86, 0xc8, 0x06, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x09, 0x80, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0x54, 0x05, 0x04, 0x02, 0x01, 0x80, 0x02, 0xc0, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0x00, 0xd3, 0x0e, 0x00, 0x02, 0x01, 0xec, 0x16, 0xc0, 0x6e, 0xdc,</div><div class='add'>+	0x00, 0x00, 0x52, 0x05, 0x80, 0x00, 0x00, 0x80, 0x02, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x54, 0x05, 0x81, 0x00, 0x00, 0xf8, 0x22, 0x80, 0x2f, 0xb4,</div><div class='add'>+	0x00, 0x00, 0x54, 0x05, 0x00, 0x18, 0x86, 0xc8, 0x06, 0x40, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x54, 0x05, 0x82, 0x00, 0x00, 0xf8, 0x12, 0x80, 0x2f, 0xb4,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x86, 0xc8, 0x06, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x02, 0x00, 0x2d, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x02, 0x80, 0x2d, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x86, 0xc8, 0x06, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xc0, 0x0a, 0x32,</div><div class='add'>+	0x00, 0x38, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x07, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x10, 0x00, 0x00, 0x07, 0x00, 0x90, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x07, 0x40, 0x90, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x40, 0xf2, 0xc1, 0x38, 0xb4,</div><div class='add'>+	0x18, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0xf9,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x02, 0x80, 0x2d, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x17, 0x01, 0x00, 0xb0, 0x02, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x02, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0xc0, 0x69, 0x05, 0x18, 0x00, 0x00, 0x00, 0xa9, 0xcd, 0x3e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x86, 0x04, 0x19, 0x80, 0x6c, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x07, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x07, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x01, 0x00, 0x80, 0x00, 0x38, 0x00, 0x00, 0x07, 0x00, 0x37, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x0c, 0xf7, 0x7f, 0x90, 0x30,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x48, 0x02, 0x00, 0x90, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0xe8, 0x01, 0x00, 0x34,</div><div class='add'>+	0x18, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0xf9,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x02, 0x10, 0x86, 0x80, 0x72, 0x82, 0x6c, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x86, 0xa8, 0x42, 0x80, 0x6c, 0x37,</div><div class='add'>+	0x00, 0x00, 0x78, 0x05, 0x12, 0x00, 0x70, 0x38, 0x02, 0x00, 0x7c, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x0b, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0xe0, 0x07, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x30,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x3c, 0x02, 0x00, 0x7e, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x30, 0x02, 0x00, 0x7e, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x34, 0x02, 0x00, 0x7e, 0x32,</div><div class='add'>+	0x00, 0x00, 0x6b, 0x05, 0x02, 0x01, 0x00, 0x80, 0xb2, 0x82, 0x2a, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x17, 0x00, 0x00, 0xd0, 0x02, 0x00, 0x00, 0x32,</div><div class='add'>+	0x06, 0x00, 0x3f, 0x05, 0x04, 0x01, 0x00, 0x80, 0x82, 0x8d, 0x2f, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x39, 0x05, 0x04, 0x03, 0x01, 0x80, 0x02, 0xc0, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x01, 0xe0, 0x06, 0x80, 0x2f, 0x32,</div><div class='add'>+	0x00, 0x00, 0xa4, 0x03, 0xa2, 0x00, 0x00, 0xb0, 0x02, 0x00, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x7a, 0x05, 0x04, 0x03, 0x01, 0x80, 0x02, 0xc0, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x83, 0x05, 0x00, 0x10, 0x86, 0xc8, 0x46, 0x80, 0x2a, 0x96,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x86, 0xc8, 0x46, 0x80, 0x2a, 0x36,</div><div class='add'>+	0x00, 0x00, 0x7e, 0x05, 0x80, 0x00, 0x00, 0x80, 0x12, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x03, 0x00, 0x80, 0x05, 0x22, 0x00, 0x00, 0xf8, 0x82, 0x8d, 0x2f, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x80, 0x05, 0x00, 0x18, 0x86, 0xc8, 0x06, 0x00, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x83, 0x05, 0x80, 0x00, 0x00, 0x80, 0x22, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xc2, 0x01, 0x00, 0xf8, 0x02, 0x80, 0x2f, 0x35,</div><div class='add'>+	0x00, 0xc0, 0xd3, 0x0e, 0x00, 0x00, 0x00, 0x28, 0x09, 0x80, 0x36, 0xd2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x01, 0xec, 0x16, 0xc0, 0x6e, 0x3c,</div><div class='add'>+	0x18, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0xf9,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x01, 0xe0, 0x06, 0x80, 0x2f, 0x32,</div><div class='add'>+	0x00, 0x00, 0xa4, 0x03, 0xa2, 0x00, 0x00, 0xb0, 0x02, 0x00, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x05, 0x04, 0x01, 0x00, 0x80, 0xa2, 0xc0, 0xed, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x0e, 0x80, 0x02, 0x32,</div><div class='add'>+	0x40, 0x7e, 0x05, 0x00, 0x00, 0x00, 0x00, 0xb4, 0x0e, 0x00, 0x37, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc4, 0x0e, 0x80, 0x07, 0x32,</div><div class='add'>+	0x64, 0x00, 0x8f, 0x05, 0x00, 0x00, 0x00, 0xcc, 0x0e, 0x00, 0x36, 0x92,</div><div class='add'>+	0x64, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x82, 0xcd, 0xed, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x0e, 0x40, 0x00, 0x32,</div><div class='add'>+	0xa0, 0x8c, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb4, 0x0e, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc4, 0x0e, 0xc0, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xcc, 0x0e, 0x80, 0x02, 0x32,</div><div class='add'>+	0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe4, 0x33, 0x7b, 0xec, 0x39,</div><div class='add'>+	0x1e, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xe0, 0x03, 0x00, 0x37, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc8, 0x6e, 0xc0, 0xec, 0x37,</div><div class='add'>+	0x00, 0x00, 0x8d, 0x04, 0x00, 0x00, 0x00, 0xd8, 0x0e, 0xc0, 0xed, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x65, 0x01, 0x80, 0xa2, 0xdb, 0x2c, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x02, 0x80, 0x80, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x02, 0x1c, 0x01, 0x80, 0x52, 0xc0, 0x6e, 0xbc,</div><div class='add'>+	0x2b, 0x00, 0x8a, 0x11, 0x02, 0x01, 0x00, 0x80, 0x82, 0xcd, 0x81, 0xbc,</div><div class='add'>+	0x3d, 0x00, 0x8a, 0x11, 0x02, 0x00, 0x00, 0x80, 0x82, 0xcd, 0x81, 0xbc,</div><div class='add'>+	0x35, 0x00, 0x9c, 0x05, 0x04, 0x00, 0x00, 0x80, 0x82, 0xcd, 0x81, 0xbc,</div><div class='add'>+	0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x09, 0x00, 0x36, 0x32,</div><div class='add'>+	0x2b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x89, 0xcd, 0x81, 0x3c,</div><div class='add'>+	0x10, 0x00, 0xe2, 0x10, 0x00, 0x1c, 0x01, 0x14, 0x59, 0xe4, 0x6e, 0xd9,</div><div class='add'>+	0xa4, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, 0x82, 0xcd, 0x81, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x02, 0x80, 0x80, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x65, 0x01, 0x80, 0xa2, 0xdb, 0x2c, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x02, 0x18, 0x01, 0x80, 0x92, 0xc0, 0x6e, 0xbc,</div><div class='add'>+	0x2b, 0x00, 0x8a, 0x11, 0x02, 0x00, 0x00, 0x80, 0x82, 0xcd, 0x81, 0xbc,</div><div class='add'>+	0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x09, 0x00, 0x36, 0x32,</div><div class='add'>+	0x10, 0x00, 0xe2, 0x10, 0x00, 0x18, 0x01, 0x14, 0x79, 0xe0, 0x6e, 0xd9,</div><div class='add'>+	0xa4, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, 0x82, 0xcd, 0x81, 0x3a,</div><div class='add'>+	0xe1, 0x05, 0x00, 0x00, 0x00, 0x18, 0x01, 0x88, 0x82, 0xcd, 0x6e, 0x3a,</div><div class='add'>+	0xea, 0x05, 0x00, 0x00, 0x00, 0x18, 0x01, 0x88, 0x82, 0xcd, 0x6e, 0x3a,</div><div class='add'>+	0xf3, 0x05, 0x00, 0x00, 0x00, 0x18, 0x01, 0x88, 0x82, 0xcd, 0x6e, 0x3a,</div><div class='add'>+	0xfc, 0x05, 0x00, 0x00, 0x00, 0x18, 0x01, 0x88, 0x82, 0xcd, 0x6e, 0x3a,</div><div class='add'>+	0x05, 0x06, 0x00, 0x00, 0x00, 0x18, 0x01, 0x88, 0x82, 0xcd, 0x6e, 0x3a,</div><div class='add'>+	0x0e, 0x06, 0x00, 0x00, 0x00, 0x18, 0x01, 0x88, 0x82, 0xcd, 0x6e, 0x3a,</div><div class='add'>+	0x17, 0x06, 0x00, 0x00, 0x00, 0x18, 0x01, 0x88, 0x82, 0xcd, 0x6e, 0x3a,</div><div class='add'>+	0x20, 0x06, 0x00, 0x00, 0x00, 0x18, 0x01, 0x88, 0x82, 0xcd, 0x6e, 0x3a,</div><div class='add'>+	0x29, 0x06, 0x00, 0x00, 0x00, 0x18, 0x01, 0x88, 0x82, 0xcd, 0x6e, 0x3a,</div><div class='add'>+	0x32, 0x06, 0x00, 0x00, 0x00, 0x18, 0x01, 0x88, 0x82, 0xcd, 0x6e, 0x3a,</div><div class='add'>+	0x3b, 0x06, 0x00, 0x00, 0x00, 0x18, 0x01, 0x88, 0x82, 0xcd, 0x6e, 0x3a,</div><div class='add'>+	0x44, 0x06, 0x00, 0x00, 0x00, 0x18, 0x01, 0x88, 0x82, 0xcd, 0x6e, 0x3a,</div><div class='add'>+	0x4d, 0x06, 0x00, 0x00, 0x00, 0x18, 0x01, 0x88, 0x82, 0xcd, 0x6e, 0x3a,</div><div class='add'>+	0x56, 0x06, 0x00, 0x00, 0x00, 0x18, 0x01, 0x88, 0x82, 0xcd, 0x6e, 0x3a,</div><div class='add'>+	0x5f, 0x06, 0x00, 0x00, 0x00, 0x18, 0x01, 0x88, 0x82, 0xcd, 0x6e, 0x3a,</div><div class='add'>+	0x68, 0x06, 0x00, 0x00, 0x00, 0x18, 0x01, 0x88, 0x82, 0xcd, 0x6e, 0x3a,</div><div class='add'>+	0x71, 0x06, 0x00, 0x00, 0x00, 0x18, 0x01, 0x88, 0x82, 0xcd, 0x6e, 0x3a,</div><div class='add'>+	0x7a, 0x06, 0x00, 0x00, 0x00, 0x18, 0x01, 0x88, 0x82, 0xcd, 0x6e, 0x3a,</div><div class='add'>+	0x83, 0x06, 0x00, 0x00, 0x00, 0x18, 0x01, 0x88, 0x82, 0xcd, 0x6e, 0x3a,</div><div class='add'>+	0x8c, 0x06, 0x00, 0x00, 0x00, 0x18, 0x01, 0x88, 0x82, 0xcd, 0x6e, 0x3a,</div><div class='add'>+	0x95, 0x06, 0x00, 0x00, 0x00, 0x18, 0x01, 0x88, 0x82, 0xcd, 0x6e, 0x3a,</div><div class='add'>+	0x9e, 0x06, 0x00, 0x00, 0x00, 0x18, 0x01, 0x88, 0x82, 0xcd, 0x6e, 0x3a,</div><div class='add'>+	0xa7, 0x06, 0x00, 0x00, 0x00, 0x18, 0x01, 0x88, 0x82, 0xcd, 0x6e, 0x3a,</div><div class='add'>+	0xb0, 0x06, 0x00, 0x00, 0x00, 0x18, 0x01, 0x88, 0x82, 0xcd, 0x6e, 0x3a,</div><div class='add'>+	0xb9, 0x06, 0x00, 0x00, 0x00, 0x18, 0x01, 0x88, 0x82, 0xcd, 0x6e, 0x3a,</div><div class='add'>+	0xc2, 0x06, 0x00, 0x00, 0x00, 0x18, 0x01, 0x88, 0x82, 0xcd, 0x6e, 0x3a,</div><div class='add'>+	0xcb, 0x06, 0x00, 0x00, 0x00, 0x18, 0x01, 0x88, 0x82, 0xcd, 0x6e, 0x3a,</div><div class='add'>+	0xd4, 0x06, 0x00, 0x00, 0x00, 0x18, 0x01, 0x88, 0x82, 0xcd, 0x6e, 0x3a,</div><div class='add'>+	0xdd, 0x06, 0x00, 0x00, 0x00, 0x18, 0x01, 0x88, 0x82, 0xcd, 0x6e, 0x3a,</div><div class='add'>+	0xe6, 0x06, 0x00, 0x00, 0x00, 0x18, 0x01, 0x88, 0x82, 0xcd, 0x6e, 0x3a,</div><div class='add'>+	0xef, 0x06, 0x00, 0x00, 0x00, 0x18, 0x01, 0x88, 0x82, 0xcd, 0x6e, 0x3a,</div><div class='add'>+	0xf8, 0x06, 0x00, 0x00, 0x00, 0x18, 0x01, 0x88, 0x82, 0xcd, 0x6e, 0x3a,</div><div class='add'>+	0x01, 0x07, 0x00, 0x00, 0x00, 0x18, 0x01, 0x88, 0x82, 0xcd, 0x6e, 0x3a,</div><div class='add'>+	0x0a, 0x07, 0x00, 0x00, 0x00, 0x18, 0x01, 0x88, 0x82, 0xcd, 0x6e, 0x3a,</div><div class='add'>+	0x13, 0x07, 0x00, 0x00, 0x00, 0x18, 0x01, 0x88, 0x82, 0xcd, 0x6e, 0x3a,</div><div class='add'>+	0x1c, 0x07, 0x00, 0x00, 0x00, 0x18, 0x01, 0x88, 0x82, 0xcd, 0x6e, 0x3a,</div><div class='add'>+	0x25, 0x07, 0x00, 0x00, 0x00, 0x18, 0x01, 0x88, 0x82, 0xcd, 0x6e, 0x3a,</div><div class='add'>+	0x2e, 0x07, 0x00, 0x00, 0x00, 0x18, 0x01, 0x88, 0x82, 0xcd, 0x6e, 0x3a,</div><div class='add'>+	0x37, 0x07, 0x00, 0x00, 0x00, 0x18, 0x01, 0x88, 0x82, 0xcd, 0x6e, 0x3a,</div><div class='add'>+	0x40, 0x07, 0x00, 0x00, 0x00, 0x18, 0x01, 0x88, 0x82, 0xcd, 0x6e, 0x3a,</div><div class='add'>+	0x49, 0x07, 0x00, 0x00, 0x00, 0x18, 0x01, 0x88, 0x82, 0xcd, 0x6e, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x57, 0x03, 0x00, 0x00, 0x00, 0xd4, 0x02, 0x00, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0xa8, 0x02, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x52, 0x07, 0x00, 0x00, 0x00, 0x1c, 0x01, 0x88, 0x82, 0xcd, 0x6e, 0x3a,</div><div class='add'>+	0x57, 0x07, 0x00, 0x00, 0x00, 0x1c, 0x01, 0x88, 0x82, 0xcd, 0x6e, 0x3a,</div><div class='add'>+	0x5c, 0x07, 0x00, 0x00, 0x00, 0x1c, 0x01, 0x88, 0x82, 0xcd, 0x6e, 0x3a,</div><div class='add'>+	0x61, 0x07, 0x00, 0x00, 0x00, 0x1c, 0x01, 0x88, 0x82, 0xcd, 0x6e, 0x3a,</div><div class='add'>+	0x66, 0x07, 0x00, 0x00, 0x00, 0x1c, 0x01, 0x88, 0x82, 0xcd, 0x6e, 0x3a,</div><div class='add'>+	0x6b, 0x07, 0x00, 0x00, 0x00, 0x1c, 0x01, 0x88, 0x82, 0xcd, 0x6e, 0x3a,</div><div class='add'>+	0x70, 0x07, 0x00, 0x00, 0x00, 0x1c, 0x01, 0x88, 0x82, 0xcd, 0x6e, 0x3a,</div><div class='add'>+	0x75, 0x07, 0x00, 0x00, 0x00, 0x1c, 0x01, 0x88, 0x82, 0xcd, 0x6e, 0x3a,</div><div class='add'>+	0x7a, 0x07, 0x00, 0x00, 0x00, 0x1c, 0x01, 0x88, 0x82, 0xcd, 0x6e, 0x3a,</div><div class='add'>+	0x7f, 0x07, 0x00, 0x00, 0x00, 0x1c, 0x01, 0x88, 0x82, 0xcd, 0x6e, 0x3a,</div><div class='add'>+	0x84, 0x07, 0x00, 0x00, 0x00, 0x1c, 0x01, 0x88, 0x82, 0xcd, 0x6e, 0x3a,</div><div class='add'>+	0x89, 0x07, 0x00, 0x00, 0x00, 0x1c, 0x01, 0x88, 0x82, 0xcd, 0x6e, 0x3a,</div><div class='add'>+	0x8e, 0x07, 0x00, 0x00, 0x00, 0x1c, 0x01, 0x88, 0x82, 0xcd, 0x6e, 0x3a,</div><div class='add'>+	0x93, 0x07, 0x00, 0x00, 0x00, 0x1c, 0x01, 0x88, 0x82, 0xcd, 0x6e, 0x3a,</div><div class='add'>+	0x98, 0x07, 0x00, 0x00, 0x00, 0x1c, 0x01, 0x88, 0x82, 0xcd, 0x6e, 0x3a,</div><div class='add'>+	0x9d, 0x07, 0x00, 0x00, 0x00, 0x1c, 0x01, 0x88, 0x82, 0xcd, 0x6e, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x5f, 0x03, 0x00, 0x00, 0x00, 0xd4, 0x02, 0x00, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x71, 0x03, 0x00, 0x00, 0x00, 0xd4, 0x02, 0x00, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x3b, 0x09, 0x00, 0x00, 0x00, 0x10, 0x08, 0x80, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x79, 0x09, 0x00, 0x00, 0x00, 0x10, 0x08, 0x80, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x88, 0x09, 0x00, 0x00, 0x00, 0x10, 0x08, 0x80, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xd4, 0x09, 0x00, 0x00, 0x00, 0x10, 0x08, 0x40, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xda, 0x09, 0x00, 0x00, 0x00, 0x10, 0x08, 0xc0, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xda, 0x09, 0x00, 0x00, 0x00, 0x10, 0x08, 0xc0, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0xa2, 0x0c, 0x00, 0x00, 0x00, 0x10, 0x08, 0x40, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xda, 0x09, 0x00, 0x00, 0x00, 0x10, 0x08, 0xc0, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xea, 0x09, 0x00, 0x00, 0x00, 0x10, 0x08, 0xc0, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xea, 0x09, 0x00, 0x00, 0x00, 0x10, 0x08, 0xc0, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0xa2, 0x0c, 0x00, 0x00, 0x00, 0x10, 0x08, 0x40, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xea, 0x09, 0x00, 0x00, 0x00, 0x10, 0x08, 0xc0, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xe8, 0x09, 0x00, 0x00, 0x00, 0x10, 0x08, 0xc0, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xe8, 0x09, 0x00, 0x00, 0x00, 0x10, 0x08, 0xc0, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0xa2, 0x0c, 0x00, 0x00, 0x00, 0x10, 0x08, 0x40, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xe8, 0x09, 0x00, 0x00, 0x00, 0x10, 0x08, 0xc0, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x86, 0x0a, 0x00, 0x00, 0x00, 0x10, 0x08, 0xc0, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0xd7, 0x09, 0x00, 0x00, 0x00, 0x10, 0x08, 0x00, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0xd4, 0x09, 0x00, 0x00, 0x00, 0x10, 0x08, 0x40, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x7d, 0x0a, 0x00, 0x00, 0x00, 0x10, 0x08, 0x80, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0xd7, 0x09, 0x00, 0x00, 0x00, 0x10, 0x08, 0x00, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0xd4, 0x09, 0x00, 0x00, 0x00, 0x10, 0x08, 0x40, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x7d, 0x0a, 0x00, 0x00, 0x00, 0x10, 0x08, 0x00, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0xd7, 0x09, 0x00, 0x00, 0x00, 0x10, 0x08, 0x00, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0xd4, 0x09, 0x00, 0x00, 0x00, 0x10, 0x08, 0x40, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x0c, 0x0b, 0x00, 0x00, 0x00, 0x10, 0x08, 0x80, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xd4, 0x09, 0x00, 0x00, 0x00, 0x10, 0x08, 0x40, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xe9, 0x09, 0x00, 0x00, 0x00, 0x10, 0x08, 0x80, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xe9, 0x09, 0x00, 0x00, 0x00, 0x10, 0x08, 0x80, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0xa2, 0x0c, 0x00, 0x00, 0x00, 0x10, 0x08, 0x40, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xe9, 0x09, 0x00, 0x00, 0x00, 0x10, 0x08, 0x00, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xe9, 0x09, 0x00, 0x00, 0x00, 0x10, 0x08, 0x00, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0xa2, 0x0c, 0x00, 0x00, 0x00, 0x10, 0x08, 0x40, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xa2, 0x07, 0x00, 0x00, 0x00, 0x10, 0x08, 0x00, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xa2, 0x07, 0x00, 0x00, 0x00, 0x10, 0x08, 0x40, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xc1, 0x0c, 0x00, 0x00, 0x00, 0x10, 0x08, 0x40, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0xb8, 0x0c, 0x00, 0x00, 0x00, 0x10, 0x08, 0x40, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0xc1, 0x0c, 0x00, 0x00, 0x00, 0x10, 0x08, 0x40, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0xd4, 0x09, 0x00, 0x00, 0x00, 0x10, 0x08, 0x40, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xc1, 0x0c, 0x00, 0x00, 0x00, 0x10, 0x08, 0x40, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x81, 0x09, 0x00, 0x00, 0x00, 0x10, 0x08, 0x40, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x81, 0x09, 0x00, 0x00, 0x00, 0x10, 0x08, 0x80, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x81, 0x09, 0x00, 0x00, 0x00, 0x10, 0x08, 0xc0, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x81, 0x09, 0x00, 0x00, 0x00, 0x10, 0x08, 0x00, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x86, 0x09, 0x00, 0x00, 0x00, 0x10, 0x08, 0x40, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x81, 0x09, 0x00, 0x00, 0x00, 0x10, 0x08, 0x80, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x81, 0x09, 0x00, 0x00, 0x00, 0x10, 0x08, 0xc0, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x76, 0x0b, 0x00, 0x00, 0x00, 0x10, 0x08, 0x80, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x76, 0x0b, 0x00, 0x00, 0x00, 0x10, 0x08, 0xc0, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x76, 0x0b, 0x00, 0x00, 0x00, 0x10, 0x08, 0x00, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0xd4, 0x09, 0x00, 0x00, 0x00, 0x10, 0x08, 0x40, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x76, 0x0b, 0x00, 0x00, 0x00, 0x10, 0x08, 0xc0, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xc9, 0x0c, 0x00, 0x00, 0x00, 0x10, 0x08, 0x40, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x47, 0x0d, 0x00, 0x00, 0x00, 0x10, 0x08, 0x40, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x4b, 0x0d, 0x00, 0x00, 0x00, 0x10, 0x08, 0x40, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0xb0, 0x0c, 0x00, 0x00, 0x00, 0x10, 0x08, 0x40, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x4b, 0x0d, 0x00, 0x00, 0x00, 0x10, 0x08, 0x40, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0xa2, 0x07, 0x00, 0x00, 0x00, 0x10, 0x08, 0x40, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x4b, 0x0d, 0x00, 0x00, 0x00, 0x10, 0x08, 0x40, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0xa3, 0x07, 0x00, 0x00, 0x00, 0x10, 0x08, 0x00, 0x02, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x4c, 0x0d, 0x00, 0x00, 0x00, 0x10, 0x08, 0x40, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0xb0, 0x0c, 0x00, 0x00, 0x00, 0x10, 0x08, 0x40, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x4c, 0x0d, 0x00, 0x00, 0x00, 0x10, 0x08, 0x40, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0xa2, 0x07, 0x00, 0x00, 0x00, 0x10, 0x08, 0x40, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x4c, 0x0d, 0x00, 0x00, 0x00, 0x10, 0x08, 0x40, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x51, 0x0d, 0x00, 0x00, 0x00, 0x10, 0x08, 0x80, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x51, 0x0d, 0x00, 0x00, 0x00, 0x10, 0x08, 0xc0, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x51, 0x0d, 0x00, 0x00, 0x00, 0x10, 0x08, 0x00, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0xd4, 0x09, 0x00, 0x00, 0x00, 0x10, 0x08, 0x40, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x51, 0x0d, 0x00, 0x00, 0x00, 0x10, 0x08, 0xc0, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x68, 0x09, 0x00, 0x00, 0x00, 0x10, 0x08, 0x40, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x64, 0x0d, 0x00, 0x00, 0x00, 0x10, 0x08, 0x80, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x64, 0x0d, 0x00, 0x00, 0x00, 0x10, 0x08, 0xc0, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x64, 0x0d, 0x00, 0x00, 0x00, 0x10, 0x08, 0x00, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0xd4, 0x09, 0x00, 0x00, 0x00, 0x10, 0x08, 0x40, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x64, 0x0d, 0x00, 0x00, 0x00, 0x10, 0x08, 0xc0, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x7e, 0x0d, 0x00, 0x00, 0x00, 0x10, 0x08, 0x80, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x7e, 0x0d, 0x00, 0x00, 0x00, 0x10, 0x08, 0xc0, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x7e, 0x0d, 0x00, 0x00, 0x00, 0x10, 0x08, 0x00, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0xd4, 0x09, 0x00, 0x00, 0x00, 0x10, 0x08, 0x40, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x7e, 0x0d, 0x00, 0x00, 0x00, 0x10, 0x08, 0xc0, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xa2, 0x07, 0x00, 0x00, 0x00, 0x10, 0x08, 0x00, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xa2, 0x07, 0x00, 0x00, 0x00, 0x10, 0x08, 0x80, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8f, 0x0d, 0x00, 0x00, 0x00, 0x10, 0x08, 0xc0, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0xa2, 0x07, 0x00, 0x00, 0x00, 0x10, 0x08, 0x00, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0xa2, 0x07, 0x00, 0x00, 0x00, 0x10, 0x08, 0x40, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xa2, 0x07, 0x00, 0x00, 0x00, 0x10, 0x08, 0x80, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0xa0, 0x0d, 0x00, 0x00, 0x00, 0x10, 0x08, 0x80, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0xa2, 0x07, 0x00, 0x00, 0x00, 0x10, 0x08, 0x00, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0xa2, 0x07, 0x00, 0x00, 0x00, 0x10, 0x08, 0x40, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xa2, 0x07, 0x00, 0x00, 0x00, 0x10, 0x08, 0x80, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0xa0, 0x0d, 0x00, 0x00, 0x00, 0x10, 0x08, 0x00, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0xa2, 0x07, 0x00, 0x00, 0x00, 0x10, 0x08, 0x00, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0xa2, 0x07, 0x00, 0x00, 0x00, 0x10, 0x08, 0x40, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xa2, 0x07, 0x00, 0x00, 0x00, 0x10, 0x08, 0x80, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xa2, 0x07, 0x00, 0x00, 0x00, 0x10, 0x08, 0x40, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xb5, 0x0d, 0x00, 0x00, 0x00, 0x10, 0x08, 0x80, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0xb5, 0x0d, 0x00, 0x00, 0x00, 0x10, 0x08, 0x80, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0xb5, 0x0d, 0x00, 0x00, 0x00, 0x10, 0x08, 0x00, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0xa2, 0x0c, 0x00, 0x00, 0x00, 0x10, 0x08, 0x40, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x75, 0x0d, 0x00, 0x00, 0x00, 0x10, 0x08, 0x80, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x75, 0x0d, 0x00, 0x00, 0x00, 0x10, 0x08, 0xc0, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x75, 0x0d, 0x00, 0x00, 0x00, 0x10, 0x08, 0x00, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0xd4, 0x09, 0x00, 0x00, 0x00, 0x10, 0x08, 0x40, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x75, 0x0d, 0x00, 0x00, 0x00, 0x10, 0x08, 0xc0, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xcc, 0x0d, 0x00, 0x00, 0x00, 0x10, 0x08, 0x00, 0x02, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x88, 0x09, 0x00, 0x00, 0x00, 0x10, 0x08, 0xc0, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xd4, 0x09, 0x00, 0x00, 0x00, 0x10, 0x08, 0x40, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xc4, 0x09, 0x00, 0x00, 0x00, 0x10, 0x08, 0xc0, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x88, 0x09, 0x00, 0x00, 0x00, 0x10, 0x08, 0x80, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xd4, 0x09, 0x00, 0x00, 0x00, 0x10, 0x08, 0x40, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xc4, 0x09, 0x00, 0x00, 0x00, 0x10, 0x08, 0xc0, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xa8, 0x0b, 0x00, 0x00, 0x00, 0x10, 0x08, 0x80, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xa8, 0x0b, 0x00, 0x00, 0x00, 0x10, 0x08, 0x80, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0xa2, 0x0c, 0x00, 0x00, 0x00, 0x10, 0x08, 0x40, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xa8, 0x0b, 0x00, 0x00, 0x00, 0x10, 0x08, 0x80, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xa8, 0x0b, 0x00, 0x00, 0x00, 0x10, 0x08, 0x00, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xa8, 0x0b, 0x00, 0x00, 0x00, 0x10, 0x08, 0x00, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0xa2, 0x0c, 0x00, 0x00, 0x00, 0x10, 0x08, 0x40, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xa8, 0x0b, 0x00, 0x00, 0x00, 0x10, 0x08, 0x00, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xa8, 0x0b, 0x00, 0x00, 0x00, 0x10, 0x08, 0xc0, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0xa2, 0x0c, 0x00, 0x00, 0x00, 0x10, 0x08, 0x40, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xa8, 0x0b, 0x00, 0x00, 0x00, 0x10, 0x08, 0xc0, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xa8, 0x0b, 0x00, 0x00, 0x00, 0x10, 0x08, 0x00, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0xa2, 0x0c, 0x00, 0x00, 0x00, 0x10, 0x08, 0x40, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xa8, 0x0b, 0x00, 0x00, 0x00, 0x10, 0x08, 0x00, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xa2, 0x07, 0x00, 0x00, 0x00, 0x10, 0x08, 0x40, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x2a, 0x0c, 0x00, 0x00, 0x00, 0x10, 0x08, 0x80, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xa2, 0x07, 0x00, 0x00, 0x00, 0x10, 0x08, 0x40, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x2a, 0x0c, 0x00, 0x00, 0x00, 0x10, 0x08, 0xc0, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xa2, 0x07, 0x00, 0x00, 0x00, 0x10, 0x08, 0x80, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xa2, 0x07, 0x00, 0x00, 0x00, 0x10, 0x08, 0x40, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x34, 0x0c, 0x00, 0x00, 0x00, 0x10, 0x08, 0xc0, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xa2, 0x07, 0x00, 0x00, 0x00, 0x10, 0x08, 0x80, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xa2, 0x07, 0x00, 0x00, 0x00, 0x10, 0x08, 0x40, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x34, 0x0c, 0x00, 0x00, 0x00, 0x10, 0x08, 0x80, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x31, 0x0d, 0x00, 0x00, 0x00, 0x10, 0x08, 0x40, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xab, 0x07, 0x00, 0x00, 0x00, 0x10, 0x08, 0x40, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xf3, 0x07, 0x00, 0x00, 0x00, 0x10, 0x08, 0x80, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xb6, 0x08, 0x00, 0x00, 0x00, 0x10, 0x08, 0x00, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0xb6, 0x08, 0x00, 0x00, 0x00, 0x10, 0x08, 0x00, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0xb6, 0x08, 0x00, 0x00, 0x00, 0x10, 0x08, 0x00, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x0a, 0x08, 0x00, 0x00, 0x00, 0x10, 0x08, 0x80, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xaa, 0x07, 0x00, 0x00, 0x00, 0x10, 0x08, 0x00, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x1a, 0x08, 0x00, 0x00, 0x00, 0x10, 0x08, 0x80, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0xb4, 0x08, 0x00, 0x00, 0x00, 0x10, 0x08, 0x80, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0xaa, 0x07, 0x00, 0x00, 0x00, 0x10, 0x08, 0x00, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xc3, 0x08, 0x00, 0x00, 0x00, 0x10, 0x08, 0x80, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0xc3, 0x08, 0x00, 0x00, 0x00, 0x10, 0x08, 0xc0, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0xaa, 0x07, 0x00, 0x00, 0x00, 0x10, 0x08, 0x00, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xe5, 0x08, 0x00, 0x00, 0x00, 0x10, 0x08, 0xc0, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xaa, 0x07, 0x00, 0x00, 0x00, 0x10, 0x08, 0x00, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xe8, 0x08, 0x00, 0x00, 0x00, 0x10, 0x08, 0x00, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0xe8, 0x08, 0x00, 0x00, 0x00, 0x10, 0x08, 0x00, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0xaa, 0x07, 0x00, 0x00, 0x00, 0x10, 0x08, 0x00, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xea, 0x08, 0x00, 0x00, 0x00, 0x10, 0x08, 0x80, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0xea, 0x08, 0x00, 0x00, 0x00, 0x10, 0x08, 0xc0, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0xea, 0x08, 0x00, 0x00, 0x00, 0x10, 0x08, 0x00, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xaa, 0x07, 0x00, 0x00, 0x00, 0x10, 0x08, 0x40, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0xc2, 0x08, 0x00, 0x00, 0x00, 0x10, 0x08, 0x80, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0xc2, 0x08, 0x00, 0x00, 0x00, 0x10, 0x08, 0xc0, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0xaa, 0x07, 0x00, 0x00, 0x00, 0x10, 0x08, 0x00, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0xaa, 0x07, 0x00, 0x00, 0x00, 0x10, 0x08, 0x00, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0xaa, 0x07, 0x00, 0x00, 0x00, 0x10, 0x08, 0x40, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0xf8, 0x08, 0x00, 0x00, 0x00, 0x10, 0x08, 0x80, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0xf8, 0x08, 0x00, 0x00, 0x00, 0x10, 0x08, 0xc0, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0xaa, 0x07, 0x00, 0x00, 0x00, 0x10, 0x08, 0x00, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x2e, 0x09, 0x00, 0x00, 0x00, 0x10, 0x08, 0x80, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0xaa, 0x07, 0x00, 0x00, 0x00, 0x10, 0x08, 0xc0, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0xaa, 0x07, 0x00, 0x00, 0x00, 0x10, 0x08, 0x00, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x0f, 0x09, 0x00, 0x00, 0x00, 0x10, 0x08, 0x80, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xaa, 0x07, 0x00, 0x00, 0x00, 0x10, 0x08, 0x00, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x07, 0x08, 0x00, 0x00, 0x00, 0x10, 0x08, 0x80, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xaa, 0x07, 0x00, 0x00, 0x00, 0x10, 0x08, 0x00, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x22, 0x09, 0x00, 0x00, 0x00, 0x10, 0x08, 0x80, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x22, 0x09, 0x00, 0x00, 0x00, 0x10, 0x08, 0xc0, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0xaa, 0x07, 0x00, 0x00, 0x00, 0x10, 0x08, 0x00, 0x01, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xef, 0x08, 0x00, 0x00, 0x00, 0x10, 0x08, 0x80, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0xef, 0x08, 0x00, 0x00, 0x00, 0x10, 0x08, 0xc0, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0xaa, 0x07, 0x00, 0x00, 0x00, 0x10, 0x08, 0x00, 0x01, 0x92,</div><div class='add'>+	0x08, 0x00, 0xa1, 0x03, 0x00, 0x18, 0x01, 0xe8, 0x76, 0x20, 0x81, 0x99,</div><div class='add'>+	0x08, 0x00, 0x9d, 0x03, 0x00, 0x18, 0x01, 0xe8, 0x76, 0x20, 0x81, 0x99,</div><div class='add'>+	0x00, 0x00, 0xb0, 0x10, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xf0,</div><div class='add'>+	0x08, 0x00, 0xa7, 0x07, 0x1d, 0x19, 0x01, 0xe8, 0x76, 0x20, 0x81, 0xb9,</div><div class='add'>+	0x00, 0x00, 0xa1, 0x03, 0x00, 0x00, 0x00, 0xf8, 0x62, 0x81, 0x2f, 0x95,</div><div class='add'>+	0x00, 0x00, 0xa1, 0x03, 0x80, 0x00, 0x00, 0x80, 0x02, 0x81, 0x2f, 0xb6,</div><div class='add'>+	0x29, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x2c, 0x82, 0xcd, 0x2e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0xa1, 0x03, 0x00, 0x00, 0x00, 0xf8, 0x02, 0x81, 0x2f, 0x94,</div><div class='add'>+	0x08, 0x00, 0xa1, 0x03, 0x00, 0x1c, 0x01, 0xe8, 0x76, 0x20, 0x81, 0x99,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x0f, 0x01, 0x80, 0x02, 0xc0, 0x6e, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x02, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x01, 0xec, 0x06, 0xc0, 0x6e, 0x35,</div><div class='add'>+	0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0xa9, 0x00, 0x2d, 0x37,</div><div class='add'>+	0xb4, 0xcc, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x87, 0x8d, 0x97, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x99, 0xc0, 0x2c, 0x37,</div><div class='add'>+	0xb4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x89, 0x8d, 0x97, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x02, 0x10, 0x00, 0x00, 0x87, 0xbf, 0x97, 0xba,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x07, 0x40, 0xfe, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x40, 0xf2, 0xc1, 0x38, 0xb4,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x00, 0x78, 0x09, 0x00, 0x6e, 0x32,</div><div class='add'>+	0x00, 0x00, 0xb7, 0x07, 0xb7, 0x10, 0x02, 0xe0, 0x06, 0x80, 0x97, 0xb2,</div><div class='add'>+	0x00, 0x00, 0xba, 0x07, 0x80, 0x00, 0x00, 0x80, 0xf2, 0x80, 0xfc, 0xb6,</div><div class='add'>+	0x00, 0x00, 0xbb, 0x07, 0x00, 0x00, 0x00, 0xc8, 0xff, 0x80, 0xfc, 0x94,</div><div class='add'>+	0x00, 0x00, 0xbc, 0x07, 0x9f, 0x99, 0x00, 0x80, 0x82, 0x1b, 0xee, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x98, 0x00, 0xe0, 0x0e, 0x00, 0x6e, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xa7, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x30,</div><div class='add'>+	0x18, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0xf9,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x02, 0x1c, 0x09, 0x00, 0x6e, 0x32,</div><div class='add'>+	0x40, 0x00, 0xc1, 0x07, 0x06, 0x01, 0x00, 0x80, 0x82, 0xcd, 0x91, 0xbc,</div><div class='add'>+	0x00, 0x40, 0xc2, 0x07, 0x00, 0x18, 0x02, 0xe0, 0xa6, 0xcd, 0x2c, 0x92,</div><div class='add'>+	0x00, 0x60, 0x00, 0x00, 0x00, 0x18, 0x02, 0xe0, 0xa6, 0xcd, 0x2c, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x09, 0x80, 0x03, 0x32,</div><div class='add'>+	0x00, 0x00, 0xc5, 0x07, 0x80, 0xd7, 0x01, 0x80, 0x32, 0xc0, 0x6e, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x49, 0x00, 0x92, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x98, 0x01, 0x18, 0x09, 0x00, 0x6e, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x02, 0x24, 0x09, 0xc0, 0x6e, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x01, 0x28, 0x09, 0x80, 0x6e, 0x32,</div><div class='add'>+	0x00, 0x00, 0xd3, 0x07, 0x80, 0x0e, 0x01, 0x80, 0x12, 0xc0, 0x6e, 0xb6,</div><div class='add'>+	0x02, 0x00, 0x00, 0x00, 0x00, 0x34, 0x02, 0xec, 0x06, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x49, 0x01, 0x92, 0x3a,</div><div class='add'>+	0x00, 0x00, 0xcf, 0x07, 0x80, 0xd6, 0x01, 0x80, 0x42, 0xc0, 0x6e, 0xb6,</div><div class='add'>+	0x00, 0x82, 0x00, 0x00, 0x00, 0x10, 0x02, 0xe0, 0xa6, 0xcd, 0x91, 0x32,</div><div class='add'>+	0x00, 0xa0, 0x00, 0x00, 0x00, 0x2c, 0x02, 0xe8, 0x06, 0x00, 0x36, 0x32,</div><div class='add'>+	0x28, 0x00, 0xdd, 0x07, 0x00, 0x32, 0x02, 0xec, 0x06, 0x00, 0x36, 0x92,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xd3, 0x01, 0x00, 0x1c, 0xd9, 0xc1, 0x91, 0x34,</div><div class='add'>+	0x00, 0x82, 0x00, 0x00, 0x00, 0x10, 0x02, 0xe0, 0xa6, 0xcd, 0x91, 0x32,</div><div class='add'>+	0x00, 0xa0, 0x00, 0x00, 0x00, 0x2c, 0x02, 0xe8, 0x06, 0x00, 0x36, 0x32,</div><div class='add'>+	0x34, 0x00, 0xdd, 0x07, 0x00, 0x32, 0x02, 0xec, 0x06, 0x00, 0x36, 0x92,</div><div class='add'>+	0x04, 0x00, 0x00, 0x00, 0x00, 0x34, 0x02, 0xec, 0x06, 0x00, 0x36, 0x32,</div><div class='add'>+	0x28, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x0d, 0x92, 0x3a,</div><div class='add'>+	0x00, 0x00, 0xd9, 0x07, 0x80, 0xd6, 0x01, 0x80, 0x42, 0xc0, 0x6e, 0xb6,</div><div class='add'>+	0x00, 0x86, 0x00, 0x00, 0x00, 0x10, 0x02, 0xe0, 0xa6, 0xcd, 0x91, 0x32,</div><div class='add'>+	0x04, 0xa0, 0x00, 0x00, 0x00, 0x2c, 0x02, 0xe8, 0x06, 0x00, 0x36, 0x32,</div><div class='add'>+	0x14, 0x00, 0xdd, 0x07, 0x00, 0x32, 0x02, 0xec, 0x06, 0x00, 0x36, 0x92,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xd3, 0x01, 0x00, 0x1c, 0xd9, 0xc1, 0x91, 0x34,</div><div class='add'>+	0x00, 0x86, 0x00, 0x00, 0x00, 0x10, 0x02, 0xe0, 0xa6, 0xcd, 0x91, 0x32,</div><div class='add'>+	0x04, 0xa0, 0x00, 0x00, 0x00, 0x2c, 0x02, 0xe8, 0x06, 0x00, 0x36, 0x32,</div><div class='add'>+	0x20, 0x00, 0xdd, 0x07, 0x00, 0x32, 0x02, 0xec, 0x06, 0x00, 0x36, 0x92,</div><div class='add'>+	0x12, 0x00, 0x00, 0x00, 0x00, 0x30, 0x02, 0xec, 0x86, 0xcd, 0x91, 0x3a,</div><div class='add'>+	0x08, 0x00, 0x00, 0x00, 0x00, 0x28, 0x02, 0xe8, 0x86, 0x24, 0x90, 0x39,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x02, 0xe0, 0x96, 0x24, 0x14, 0x37,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x01, 0xe0, 0x06, 0x80, 0x91, 0x32,</div><div class='add'>+	0x00, 0x00, 0xe3, 0x07, 0x04, 0x01, 0x00, 0x80, 0x02, 0x80, 0x92, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x01, 0xe0, 0x06, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0xe0, 0x06, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0x00, 0xe0, 0x06, 0x00, 0x00, 0x32,</div><div class='add'>+	0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0xa9, 0x00, 0x2d, 0x37,</div><div class='add'>+	0x00, 0xcd, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x87, 0x8d, 0x97, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x99, 0xc0, 0x2c, 0x37,</div><div class='add'>+	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x89, 0x8d, 0x97, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x02, 0x10, 0x00, 0x00, 0x87, 0xbf, 0x97, 0xba,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x07, 0x40, 0xfe, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x48, 0xf2, 0xc1, 0x38, 0xb4,</div><div class='add'>+	0x18, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0xf9,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x01, 0x38, 0x08, 0xc0, 0x6e, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0xc9, 0x01, 0x80, 0x02, 0x80, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x01, 0xec, 0x06, 0x80, 0x83, 0x32,</div><div class='add'>+	0x01, 0x00, 0xaa, 0x07, 0x12, 0x01, 0x00, 0x2c, 0x82, 0xcd, 0x2e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x54, 0x01, 0xb0, 0x02, 0xc0, 0x6e, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x02, 0x80, 0x01, 0x32,</div><div class='add'>+	0x00, 0xc0, 0xf9, 0x07, 0x18, 0x01, 0x00, 0x0c, 0xa8, 0xcd, 0x3e, 0xb2,</div><div class='add'>+	0x20, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x80, 0x36, 0x32,</div><div class='add'>+	0x2c, 0x00, 0x9d, 0x03, 0x12, 0x01, 0x00, 0x2c, 0x82, 0xcd, 0x2e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x01, 0x38, 0x08, 0xc0, 0x6e, 0x32,</div><div class='add'>+	0x00, 0x08, 0x00, 0x80, 0x00, 0x00, 0x00, 0x28, 0x09, 0x00, 0x37, 0x32,</div><div class='add'>+	0x00, 0x00, 0x50, 0x10, 0x00, 0x00, 0x00, 0x08, 0xe8, 0x01, 0x00, 0xf4,</div><div class='add'>+	0x00, 0x00, 0xff, 0x07, 0x80, 0xd7, 0x01, 0x2c, 0x09, 0xc0, 0x6e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xda, 0xd7, 0x01, 0xec, 0x06, 0xc0, 0x6e, 0x35,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x5a, 0x01, 0xec, 0x06, 0x40, 0xed, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x5c, 0x01, 0xec, 0x06, 0x80, 0xee, 0x32,</div><div class='add'>+	0x00, 0x00, 0x02, 0x08, 0x80, 0x01, 0x00, 0x80, 0x62, 0xc0, 0x92, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x82, 0x81, 0x2f, 0x34,</div><div class='add'>+	0x00, 0x00, 0xaa, 0x07, 0x04, 0x06, 0x01, 0xec, 0x16, 0xc0, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0x00, 0xaa, 0x07, 0x80, 0x00, 0x00, 0x80, 0x72, 0x81, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x72, 0x81, 0x2f, 0x34,</div><div class='add'>+	0x3b, 0x00, 0xaa, 0x07, 0x12, 0x01, 0x00, 0x2c, 0x82, 0xcd, 0x2e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x07, 0x01, 0x80, 0x12, 0xc0, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x00, 0x00, 0x80, 0xb2, 0x81, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x0a, 0x08, 0x00, 0x00, 0x00, 0xf8, 0xb2, 0x81, 0x2f, 0x94,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0xa0, 0x00, 0x18, 0x08, 0x00, 0x6e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x01, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xf0,</div><div class='add'>+	0x00, 0x00, 0x60, 0x11, 0x00, 0x78, 0x01, 0x60, 0x08, 0x00, 0x6e, 0xf2,</div><div class='add'>+	0x00, 0x00, 0x0f, 0x08, 0x12, 0x01, 0x00, 0xc8, 0x02, 0x00, 0x20, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x12, 0x08, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x1e, 0x08, 0x12, 0x01, 0x00, 0x5c, 0x08, 0x80, 0x20, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x12, 0x08, 0x12, 0x01, 0x00, 0x60, 0x02, 0x80, 0x2c, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x14, 0x08, 0x04, 0x00, 0x00, 0x80, 0x02, 0x40, 0x80, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x1f, 0x80, 0xff, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x17, 0x08, 0x80, 0x01, 0x00, 0x80, 0xa2, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x18, 0x00, 0x36, 0x00, 0xca, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0xf9,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x02, 0x80, 0x2d, 0xbc,</div><div class='add'>+	0x00, 0x00, 0xaa, 0x07, 0x80, 0x00, 0x00, 0x80, 0x72, 0x81, 0x2f, 0xb6,</div><div class='add'>+	0x3b, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x2c, 0x82, 0xcd, 0x2e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0xaa, 0x07, 0x00, 0x00, 0x00, 0xf8, 0x72, 0x81, 0x2f, 0x94,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0xbc, 0x00, 0x14, 0x08, 0x80, 0x6e, 0x32,</div><div class='add'>+	0x00, 0x00, 0x12, 0x08, 0x12, 0x00, 0x00, 0xc8, 0x02, 0x00, 0x20, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x10, 0x08, 0x12, 0x00, 0x00, 0x5c, 0x08, 0x80, 0x20, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0xa0, 0x00, 0x18, 0x08, 0x00, 0x6e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x02, 0x40, 0x2d, 0xbc,</div><div class='add'>+	0x08, 0x00, 0x00, 0x00, 0x00, 0x10, 0x02, 0x00, 0x78, 0xe1, 0x6e, 0x39,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x20, 0x07, 0x00, 0x00, 0x32,</div><div class='add'>+	0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x78, 0xca, 0xe9, 0x39,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x08, 0x40, 0x80, 0x32,</div><div class='add'>+	0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x79, 0x21, 0x2f, 0x39,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x02, 0x44, 0xe2, 0x25, 0x6e, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x90, 0x00, 0x6c, 0x08, 0x00, 0x6e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x98, 0x00, 0x4c, 0x08, 0x00, 0x6e, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x02, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x4d, 0x00, 0x00, 0x00, 0x67, 0xe0, 0x83, 0x3e,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x07, 0x00, 0x80, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x07, 0xc0, 0x86, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x07, 0xc0, 0x84, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0xd8, 0xa0, 0x81, 0x3c,</div><div class='add'>+	0x00, 0x00, 0x82, 0x08, 0x04, 0xb0, 0x00, 0xe0, 0xd6, 0x20, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x09, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x50, 0x08, 0x04, 0x00, 0x00, 0x3c, 0xd8, 0xe0, 0x83, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x02, 0x80, 0x81, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x34, 0x08, 0x04, 0x00, 0x00, 0x80, 0x72, 0x80, 0x2d, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x44, 0xe2, 0xe0, 0x38, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x41, 0x08, 0x51, 0x00, 0x00, 0xd8, 0x12, 0x80, 0x2d, 0x9a,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0xf9, 0x81, 0x83, 0x34,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x44, 0xe2, 0xe5, 0x38, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x39, 0x08, 0x80, 0x00, 0x00, 0x80, 0x82, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x5c, 0x10, 0x00, 0xa0, 0x01, 0x50, 0x08, 0x00, 0x6e, 0xf2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x01, 0xe0, 0x06, 0x00, 0x85, 0x32,</div><div class='add'>+	0x00, 0x00, 0x3b, 0x08, 0x12, 0x01, 0x00, 0xe8, 0x02, 0xc0, 0x21, 0xb2,</div><div class='add'>+	0x18, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0xf9,</div><div class='add'>+	0x00, 0x00, 0x3f, 0x08, 0x04, 0x01, 0x00, 0x80, 0x02, 0x80, 0x2d, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x01, 0x00, 0x80, 0xa2, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x3a, 0x08, 0x67, 0x00, 0x00, 0xf8, 0xa2, 0x80, 0x2f, 0xb5,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0xe8, 0x02, 0xc0, 0x21, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x72, 0x80, 0x2d, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x51, 0x00, 0x00, 0xd8, 0x02, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x46, 0x08, 0x2a, 0x01, 0x00, 0x00, 0xd8, 0x20, 0x80, 0xba,</div><div class='add'>+	0x00, 0x00, 0x45, 0x08, 0x12, 0x01, 0x00, 0x00, 0x09, 0xc0, 0x21, 0xb2,</div><div class='add'>+	0x18, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0xf9,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x02, 0x40, 0x84, 0x32,</div><div class='add'>+	0x1d, 0x00, 0x8a, 0x11, 0x04, 0x00, 0x00, 0x80, 0x02, 0xa4, 0x17, 0xb8,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xca, 0xe0, 0x00, 0x6c, 0x08, 0x00, 0x6e, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0xe8, 0x00, 0x4c, 0x08, 0x00, 0x6e, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0xf0, 0x00, 0x18, 0x08, 0x00, 0x6e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x18, 0x81, 0x83, 0x35,</div><div class='add'>+	0x00, 0x00, 0x28, 0x08, 0x04, 0xb0, 0x00, 0x80, 0x82, 0x9b, 0x81, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x0d, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x9f, 0x00, 0x00, 0x14, 0x18, 0x40, 0x81, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xca, 0x01, 0x00, 0xf8, 0x42, 0x80, 0x2f, 0x35,</div><div class='add'>+	0x08, 0xa0, 0x28, 0x08, 0x12, 0x01, 0x00, 0x40, 0xa2, 0xcd, 0x39, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0xf9, 0x81, 0x83, 0x34,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x44, 0xe2, 0xe5, 0x38, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x58, 0x08, 0x28, 0x00, 0x00, 0x6c, 0xd8, 0xe0, 0x86, 0xba,</div><div class='add'>+	0x00, 0x00, 0x5b, 0x10, 0x00, 0xa0, 0x01, 0x50, 0x08, 0x00, 0x6e, 0xf2,</div><div class='add'>+	0x00, 0x00, 0x58, 0x08, 0x1d, 0xf8, 0x01, 0xe0, 0x06, 0x00, 0x85, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x58, 0x08, 0x80, 0x00, 0x00, 0x80, 0x02, 0x81, 0x2f, 0xb6,</div><div class='add'>+	0x29, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x2c, 0x82, 0xcd, 0x2e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x02, 0x81, 0x2f, 0x34,</div><div class='add'>+	0x00, 0x00, 0x5c, 0x08, 0x04, 0xa0, 0x00, 0xe0, 0x06, 0x80, 0x81, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0xbc, 0x00, 0xe8, 0x06, 0x40, 0x81, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x90, 0x00, 0xe0, 0x06, 0xc0, 0x86, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x6e, 0x08, 0x00, 0x98, 0x00, 0xe0, 0x06, 0xc0, 0x84, 0x92,</div><div class='add'>+	0x00, 0x00, 0x62, 0x08, 0x80, 0x01, 0x00, 0x80, 0xa2, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x5f, 0x08, 0x12, 0x01, 0x00, 0x00, 0x09, 0xc0, 0x21, 0xb2,</div><div class='add'>+	0x18, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0xf9,</div><div class='add'>+	0x1d, 0x00, 0x62, 0x08, 0x04, 0x01, 0x00, 0x80, 0x02, 0xa4, 0x17, 0xb8,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x00, 0x00, 0x80, 0xe2, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x5e, 0x08, 0x00, 0x00, 0x00, 0xf8, 0xe2, 0x80, 0x2f, 0x94,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0xe0, 0x00, 0x6c, 0x08, 0x00, 0x6e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xca, 0xe8, 0x00, 0x4c, 0x08, 0x00, 0x6e, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0xf0, 0x00, 0x18, 0x08, 0x00, 0x6e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x6a, 0x08, 0x04, 0xb0, 0x00, 0x80, 0x82, 0x9b, 0x81, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x0d, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x9f, 0x00, 0x00, 0x14, 0x18, 0x40, 0x81, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xca, 0x01, 0x00, 0xf8, 0x42, 0x80, 0x2f, 0x35,</div><div class='add'>+	0x08, 0xa0, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x40, 0xa2, 0xcd, 0x39, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x00, 0xe0, 0x06, 0x80, 0x81, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x98, 0x00, 0xe0, 0x06, 0xc0, 0x84, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x90, 0x00, 0xe0, 0x06, 0xc0, 0x86, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0xbc, 0x00, 0xe8, 0x06, 0x40, 0x81, 0x32,</div><div class='add'>+	0x00, 0x00, 0x74, 0x08, 0x2a, 0x5d, 0x01, 0xec, 0x06, 0x80, 0xee, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x71, 0x08, 0x12, 0x01, 0x00, 0x00, 0x09, 0xc0, 0x21, 0xb2,</div><div class='add'>+	0x18, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0xf9,</div><div class='add'>+	0x1d, 0x00, 0x74, 0x08, 0x04, 0x01, 0x00, 0x80, 0x02, 0xa4, 0x17, 0xb8,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x00, 0x00, 0x80, 0xe2, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x70, 0x08, 0x00, 0x00, 0x00, 0xf8, 0xe2, 0x80, 0x2f, 0x94,</div><div class='add'>+	0x10, 0x04, 0x77, 0x08, 0x37, 0x00, 0x00, 0xf8, 0xa2, 0x8d, 0x2f, 0xb1,</div><div class='add'>+	0x3b, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x2c, 0x82, 0xcd, 0x2e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x72, 0x81, 0x2f, 0x34,</div><div class='add'>+	0x08, 0x00, 0x00, 0x00, 0xca, 0x1c, 0x01, 0xe8, 0x76, 0x20, 0x81, 0x39,</div><div class='add'>+	0x00, 0x00, 0xc6, 0x0e, 0x00, 0x00, 0x00, 0x2c, 0xf9, 0x01, 0x00, 0xf4,</div><div class='add'>+	0x00, 0x00, 0x7d, 0x08, 0x80, 0x00, 0x00, 0x80, 0xe2, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x7c, 0x08, 0x12, 0x01, 0x00, 0x00, 0x09, 0xc0, 0x21, 0xb2,</div><div class='add'>+	0x18, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0xf9,</div><div class='add'>+	0x1d, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x02, 0xa4, 0x17, 0xb8,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x01, 0x00, 0x80, 0x82, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0xc2, 0x00, 0x03, 0xbc,</div><div class='add'>+	0x10, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x80, 0x67, 0xa1, 0x73, 0x39,</div><div class='add'>+	0x30, 0x00, 0xa4, 0x03, 0x12, 0x01, 0x00, 0x5c, 0xa2, 0x8d, 0x2c, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0xd2, 0xe0, 0x83, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x2a, 0x00, 0x00, 0x78, 0xf9, 0x81, 0x83, 0xb4,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x44, 0xe2, 0xe5, 0x38, 0xb2,</div><div class='add'>+	0x00, 0x00, 0xd1, 0x0f, 0x00, 0x00, 0x00, 0x30, 0x03, 0x00, 0x38, 0xf2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x08, 0x1d, 0x00, 0x00, 0x38, 0x18, 0x81, 0x83, 0xb5,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x08, 0x80, 0x00, 0x00, 0x80, 0x02, 0x81, 0x2f, 0xb6,</div><div class='add'>+	0x29, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x2c, 0x82, 0xcd, 0x2e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x02, 0x81, 0x2f, 0x34,</div><div class='add'>+	0x00, 0x00, 0x8d, 0x08, 0x04, 0x06, 0x01, 0xec, 0x16, 0xc0, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xca, 0x01, 0x00, 0xf8, 0x42, 0x80, 0x2f, 0x34,</div><div class='add'>+	0x08, 0xc0, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x40, 0xa2, 0xcd, 0x39, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x90, 0x08, 0x80, 0x00, 0x00, 0x80, 0x82, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x5c, 0x10, 0x00, 0xa0, 0x01, 0x50, 0x08, 0x00, 0x6e, 0xf2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x01, 0xe0, 0x06, 0x00, 0x85, 0x32,</div><div class='add'>+	0x00, 0x00, 0x92, 0x08, 0x12, 0x01, 0x00, 0x00, 0x09, 0xc0, 0x21, 0xb2,</div><div class='add'>+	0x18, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0xf9,</div><div class='add'>+	0x00, 0x00, 0xae, 0x08, 0x80, 0x01, 0x00, 0x80, 0xa2, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x95, 0x08, 0x12, 0x01, 0x00, 0x00, 0x09, 0xc0, 0x21, 0xb2,</div><div class='add'>+	0x18, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0xf9,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xa2, 0x80, 0x2f, 0x35,</div><div class='add'>+	0x00, 0x00, 0xac, 0x08, 0x04, 0x00, 0x00, 0x80, 0x02, 0x61, 0x80, 0xbc,</div><div class='add'>+	0x00, 0x00, 0xa4, 0x08, 0x80, 0xb8, 0x00, 0x00, 0x09, 0xc0, 0x6e, 0xb2,</div><div class='add'>+	0x40, 0x00, 0x9c, 0x08, 0x04, 0x00, 0x00, 0x80, 0x82, 0x0d, 0x90, 0xbc,</div><div class='add'>+	0x80, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x82, 0x0d, 0x90, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x9c, 0x08, 0x02, 0xb0, 0x00, 0x80, 0x82, 0x1b, 0x84, 0xbc,</div><div class='add'>+	0x00, 0x00, 0xa4, 0x08, 0x00, 0x00, 0x00, 0xf8, 0xb2, 0x81, 0x2f, 0x94,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x07, 0x01, 0x80, 0x12, 0xc0, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x00, 0x00, 0x80, 0xb2, 0x81, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0xd6, 0x01, 0x80, 0x52, 0xc0, 0x6e, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0xd6, 0x01, 0xec, 0x56, 0xc0, 0x6e, 0x34,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x18, 0x00, 0x86, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xb7, 0x01, 0x78, 0x34,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x01, 0xe0, 0x06, 0x00, 0x86, 0x32,</div><div class='add'>+	0x40, 0x00, 0xae, 0x08, 0x04, 0x00, 0x00, 0x80, 0x82, 0x0d, 0x90, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0xa0, 0x00, 0x18, 0x08, 0x00, 0x6e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x01, 0x11, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x20, 0x80, 0xfa,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x06, 0x00, 0x00, 0x3c, 0x18, 0x20, 0x84, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0xb0, 0x00, 0x3c, 0x88, 0xdb, 0x83, 0xbe,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x01, 0x00, 0x80, 0xc2, 0x01, 0x78, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xf7, 0x20, 0x78, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x58, 0x78, 0x01, 0xe0, 0xf6, 0x20, 0x86, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x25, 0x08, 0x00, 0x00, 0x00, 0x04, 0xf8, 0x60, 0x80, 0x9a,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x00, 0x00, 0x80, 0x72, 0x81, 0x2f, 0xb6,</div><div class='add'>+	0x2e, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x2c, 0x82, 0xcd, 0x2e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x01, 0x00, 0x80, 0x82, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0xc2, 0x00, 0x03, 0xbc,</div><div class='add'>+	0x10, 0x00, 0x00, 0x00, 0xd4, 0x18, 0x00, 0x80, 0x67, 0xa1, 0x73, 0x39,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xda, 0x5c, 0x01, 0xec, 0x06, 0x80, 0xee, 0x32,</div><div class='add'>+	0x30, 0x00, 0xaa, 0x07, 0x12, 0x01, 0x00, 0x5c, 0xa2, 0x8d, 0x2c, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x01, 0x00, 0x80, 0xc2, 0x81, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x1a, 0x08, 0x00, 0x00, 0x00, 0xf8, 0xc2, 0x81, 0x2f, 0x95,</div><div class='add'>+	0x00, 0x00, 0xb8, 0x08, 0x80, 0x00, 0x00, 0x80, 0xc2, 0x81, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0xbb, 0x08, 0x00, 0xd0, 0x01, 0xe8, 0x06, 0x00, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xc2, 0x81, 0x2f, 0x35,</div><div class='add'>+	0x00, 0x00, 0xbb, 0x08, 0x04, 0xd1, 0x01, 0x80, 0x02, 0x80, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0xd6, 0x01, 0xec, 0x26, 0xc0, 0x6e, 0x34,</div><div class='add'>+	0x00, 0x00, 0xbd, 0x08, 0x80, 0x00, 0x00, 0x80, 0x92, 0x81, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0xc0, 0x08, 0x00, 0xc8, 0x01, 0xe8, 0x06, 0x00, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x92, 0x81, 0x2f, 0x35,</div><div class='add'>+	0x00, 0x00, 0xc0, 0x08, 0x04, 0xc9, 0x01, 0x80, 0x02, 0x80, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0xd6, 0x01, 0xec, 0x16, 0xc0, 0x6e, 0x34,</div><div class='add'>+	0x10, 0x00, 0xaa, 0x07, 0x12, 0x01, 0x00, 0x2c, 0x82, 0xcd, 0x2e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xaa, 0x07, 0x9a, 0x01, 0x00, 0xf8, 0x42, 0x81, 0x2f, 0xb5,</div><div class='add'>+	0x00, 0x00, 0xaa, 0x07, 0x12, 0x00, 0x00, 0xc8, 0x02, 0x00, 0x20, 0xb2,</div><div class='add'>+	0x00, 0x00, 0xc7, 0x08, 0x12, 0x01, 0x00, 0x5c, 0x08, 0x80, 0x20, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x5c, 0x02, 0x80, 0x2c, 0xb2,</div><div class='add'>+	0x00, 0x00, 0xaa, 0x07, 0x00, 0x00, 0x00, 0xf8, 0x1f, 0x80, 0xff, 0x9a,</div><div class='add'>+	0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x79, 0x21, 0x2f, 0x39,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0xf9, 0x81, 0x97, 0x34,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x02, 0x44, 0xe2, 0x25, 0x6e, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x01, 0x50, 0x08, 0x00, 0x6e, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x01, 0x60, 0x08, 0x00, 0x6e, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x02, 0x0c, 0x09, 0x00, 0x6e, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x01, 0x1c, 0x09, 0x00, 0x6e, 0x32,</div><div class='add'>+	0x00, 0x00, 0x77, 0x10, 0x00, 0xa8, 0x01, 0x08, 0x09, 0x00, 0x6e, 0xf2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xd4, 0xf8, 0x01, 0xe0, 0x06, 0x00, 0x85, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xda, 0x5c, 0x01, 0xec, 0x06, 0x80, 0xee, 0x32,</div><div class='add'>+	0x00, 0x00, 0xd1, 0x0f, 0x00, 0x00, 0x00, 0x30, 0x03, 0x00, 0x38, 0xf2,</div><div class='add'>+	0x00, 0x00, 0xd4, 0x08, 0x23, 0x29, 0x02, 0x04, 0x09, 0x80, 0x6e, 0xb2,</div><div class='add'>+	0x3c, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x2c, 0x82, 0xcd, 0x2e, 0xb2,</div><div class='add'>+	0x08, 0x00, 0xd8, 0x08, 0x1d, 0x1c, 0x01, 0xe8, 0x76, 0x20, 0x81, 0xb9,</div><div class='add'>+	0x00, 0x00, 0xd8, 0x08, 0x80, 0x00, 0x00, 0x80, 0x02, 0x81, 0x2f, 0xb6,</div><div class='add'>+	0x29, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x2c, 0x82, 0xcd, 0x2e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x02, 0x81, 0x2f, 0x34,</div><div class='add'>+	0x00, 0x00, 0xc6, 0x0e, 0x00, 0x00, 0x00, 0x2c, 0xf9, 0x01, 0x00, 0xf4,</div><div class='add'>+	0x00, 0x00, 0xdc, 0x08, 0x9d, 0x01, 0x00, 0x80, 0x07, 0xc0, 0x90, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x80, 0x07, 0xc0, 0x91, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x80, 0x07, 0x00, 0xee, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x80, 0x07, 0xc0, 0x85, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x80, 0x07, 0x40, 0x90, 0x32,</div><div class='add'>+	0x10, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x80, 0x87, 0x8d, 0x85, 0x37,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x80, 0x07, 0x00, 0x86, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x00, 0x80, 0x07, 0x00, 0x85, 0x32,</div><div class='add'>+	0x00, 0x00, 0xe3, 0x08, 0x12, 0x01, 0x00, 0x00, 0x09, 0xc0, 0x21, 0xb2,</div><div class='add'>+	0x18, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0xf9,</div><div class='add'>+	0x30, 0x00, 0xa4, 0x03, 0x12, 0x01, 0x00, 0x5c, 0xa2, 0x8d, 0x2c, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x12, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0xa2, 0x8d, 0x2f, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0xcc, 0x01, 0x78, 0x09, 0x80, 0x6e, 0x32,</div><div class='add'>+	0x00, 0x00, 0xaa, 0x07, 0xdc, 0xd1, 0x01, 0xe8, 0x06, 0x80, 0x97, 0x92,</div><div class='add'>+	0x12, 0x00, 0xaa, 0x07, 0x12, 0x01, 0x00, 0x2c, 0x82, 0xcd, 0x2e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x4f, 0x0e, 0x00, 0x00, 0x00, 0x18, 0x09, 0x40, 0x81, 0xf2,</div><div class='add'>+	0x00, 0x00, 0x2f, 0x0e, 0x00, 0xa8, 0x01, 0x20, 0x09, 0x00, 0x6e, 0xf2,</div><div class='add'>+	0x00, 0x00, 0xaa, 0x07, 0x80, 0x01, 0x00, 0x80, 0xf2, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x30, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x2c, 0x82, 0xcd, 0x2e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0xaa, 0x07, 0x00, 0x00, 0x00, 0xf8, 0x42, 0x81, 0x2f, 0x94,</div><div class='add'>+	0x00, 0x00, 0xaa, 0x07, 0x35, 0x01, 0x00, 0xf8, 0x12, 0x81, 0x2f, 0xb5,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x02, 0x80, 0x01, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x54, 0x01, 0xb0, 0x02, 0xc0, 0x6e, 0x32,</div><div class='add'>+	0x00, 0xc0, 0xf6, 0x08, 0x18, 0x01, 0x00, 0x0c, 0xa8, 0xcd, 0x3e, 0xb2,</div><div class='add'>+	0x20, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x80, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0x9d, 0x03, 0x12, 0x01, 0x00, 0x2c, 0x72, 0xe0, 0x2e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x47, 0x10, 0x00, 0x98, 0x01, 0x28, 0x09, 0x00, 0x6e, 0xf2,</div><div class='add'>+	0x00, 0x00, 0xaa, 0x07, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xff, 0x08, 0x80, 0x01, 0x00, 0x80, 0xa2, 0x81, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0xff, 0x08, 0x80, 0x00, 0x00, 0x80, 0x42, 0x81, 0x2f, 0xb6,</div><div class='add'>+	0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x09, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0xe2, 0x10, 0x00, 0x00, 0x00, 0x14, 0x09, 0x80, 0x2f, 0xd2,</div><div class='add'>+	0x00, 0x00, 0xff, 0x08, 0x08, 0x5b, 0x01, 0xec, 0x06, 0xfb, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x5a, 0x01, 0xec, 0x06, 0x00, 0x00, 0x32,</div><div class='add'>+	0x34, 0x00, 0x00, 0x00, 0xd4, 0x01, 0x00, 0x2c, 0x82, 0xcd, 0x2e, 0x32,</div><div class='add'>+	0x00, 0x00, 0x06, 0x09, 0x80, 0x01, 0x00, 0x80, 0x92, 0x81, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x00, 0x00, 0x80, 0xc2, 0x81, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x0d, 0x09, 0x08, 0xc9, 0x01, 0xe8, 0x06, 0xbb, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0xc8, 0x01, 0xe8, 0x06, 0x00, 0x00, 0x32,</div><div class='add'>+	0x32, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x2c, 0x82, 0xcd, 0x2e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x58, 0x10, 0x00, 0x00, 0x00, 0x28, 0x09, 0x80, 0x01, 0xf2,</div><div class='add'>+	0x00, 0x00, 0xaa, 0x07, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x0d, 0x09, 0x80, 0x01, 0x00, 0x80, 0xc2, 0x81, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x00, 0x00, 0x80, 0x92, 0x81, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x0d, 0x09, 0x08, 0xd1, 0x01, 0xe8, 0x06, 0xbb, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x01, 0xe8, 0x06, 0x00, 0x00, 0x32,</div><div class='add'>+	0x32, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x2c, 0x82, 0xcd, 0x2e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x58, 0x10, 0x00, 0x00, 0x00, 0x28, 0x09, 0xc0, 0x01, 0xf2,</div><div class='add'>+	0x00, 0x00, 0xaa, 0x07, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xaa, 0x07, 0x80, 0x01, 0x00, 0x80, 0xf2, 0x81, 0x2f, 0xb6,</div><div class='add'>+	0x17, 0x00, 0xaa, 0x07, 0x00, 0x00, 0x00, 0x2c, 0x82, 0xcd, 0x2e, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x07, 0x01, 0x80, 0x12, 0xc0, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x13, 0x09, 0x12, 0x00, 0x00, 0xc8, 0x02, 0x00, 0x20, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x16, 0x09, 0x12, 0x01, 0x00, 0x5c, 0x08, 0x80, 0x20, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x5c, 0x02, 0x80, 0x2c, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x1f, 0x80, 0xff, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x9d, 0x03, 0x12, 0x01, 0x00, 0x2c, 0x72, 0xe0, 0x2e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x79, 0x21, 0x2f, 0x39,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0xf9, 0x81, 0x97, 0x34,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x02, 0x44, 0xe2, 0x25, 0x6e, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xd4, 0xa0, 0x01, 0x50, 0x08, 0x00, 0x6e, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xdb, 0x79, 0x01, 0x60, 0x08, 0x00, 0x6e, 0x32,</div><div class='add'>+	0x00, 0x00, 0x5c, 0x10, 0x00, 0x00, 0x00, 0x04, 0x08, 0x00, 0x00, 0xf2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x01, 0xe0, 0x06, 0x00, 0x85, 0x32,</div><div class='add'>+	0x00, 0x00, 0x1f, 0x09, 0x12, 0x01, 0x00, 0x00, 0x09, 0xc0, 0x21, 0xb2,</div><div class='add'>+	0x18, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0xf9,</div><div class='add'>+	0x30, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x5c, 0xa2, 0x8d, 0x2c, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x07, 0x01, 0xec, 0x16, 0xc0, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0x00, 0xaa, 0x07, 0xda, 0x5c, 0x01, 0xec, 0x06, 0x80, 0xee, 0x92,</div><div class='add'>+	0x00, 0x00, 0xaa, 0x07, 0x9f, 0x41, 0x01, 0x80, 0x52, 0x20, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x2d, 0x09, 0x9f, 0x98, 0x01, 0x80, 0x52, 0x20, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x02, 0x80, 0x01, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x54, 0x01, 0xb0, 0x02, 0xc0, 0x6e, 0x32,</div><div class='add'>+	0x00, 0xc0, 0x2b, 0x09, 0x18, 0x01, 0x00, 0x0c, 0xa8, 0xcd, 0x3e, 0xb2,</div><div class='add'>+	0x20, 0x80, 0xaa, 0x07, 0x31, 0x00, 0x00, 0x08, 0x08, 0x80, 0x36, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x12, 0x81, 0x2f, 0x34,</div><div class='add'>+	0x3a, 0x00, 0xaa, 0x07, 0x12, 0x01, 0x00, 0x2c, 0x82, 0xcd, 0x2e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x47, 0x10, 0x00, 0x98, 0x01, 0x28, 0x09, 0x00, 0x6e, 0xf2,</div><div class='add'>+	0x00, 0x00, 0xaa, 0x07, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xaa, 0x07, 0xd5, 0x41, 0x01, 0xe0, 0x06, 0x40, 0x81, 0x92,</div><div class='add'>+	0x00, 0x00, 0xaa, 0x07, 0x04, 0xb0, 0x00, 0x80, 0x02, 0x00, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x01, 0x00, 0x08, 0x00, 0x6e, 0x32,</div><div class='add'>+	0x00, 0x00, 0x60, 0x11, 0x00, 0x78, 0x01, 0x60, 0x08, 0x00, 0x6e, 0xf2,</div><div class='add'>+	0x00, 0x00, 0xaa, 0x07, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x02, 0x78, 0x09, 0x80, 0x6e, 0x32,</div><div class='add'>+	0x00, 0x00, 0x35, 0x09, 0x04, 0xd4, 0x01, 0x80, 0x12, 0xc0, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x19, 0x80, 0x97, 0x37,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x01, 0xe0, 0xe6, 0x25, 0x6e, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x60, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xf0,</div><div class='add'>+	0x00, 0x00, 0x39, 0x09, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xaa, 0x07, 0x00, 0x90, 0x01, 0xe0, 0x06, 0x00, 0x80, 0x92,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x01, 0xe0, 0x06, 0x00, 0x80, 0x32,</div><div class='add'>+	0x00, 0x00, 0x1a, 0x08, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x09, 0x00, 0x6e, 0x32,</div><div class='add'>+	0x02, 0x00, 0x3f, 0x09, 0x04, 0xb9, 0x00, 0x80, 0x82, 0xcd, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x41, 0x09, 0x80, 0x00, 0x00, 0x80, 0x72, 0x80, 0xfc, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x44, 0x09, 0x00, 0x00, 0x00, 0xb0, 0x02, 0x00, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x41, 0x09, 0x80, 0x00, 0x00, 0x80, 0x82, 0x80, 0xfc, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x44, 0x09, 0x00, 0x00, 0x00, 0xb0, 0x02, 0x00, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x00, 0x00, 0x80, 0x02, 0x00, 0xf5, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa8, 0x42, 0xbd, 0x97, 0x30,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x99, 0xb1, 0xf2, 0xc0, 0x7c, 0x30,</div><div class='add'>+	0x00, 0xc0, 0x48, 0x09, 0x18, 0x01, 0x00, 0x0c, 0xa8, 0xcd, 0x3e, 0xb2,</div><div class='add'>+	0x20, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x80, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0xa1, 0x03, 0x12, 0x01, 0x00, 0x2c, 0x82, 0xcd, 0x2e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x08, 0x00, 0x80, 0x00, 0x00, 0x00, 0x28, 0x09, 0x00, 0x37, 0x32,</div><div class='add'>+	0x00, 0x00, 0x50, 0x10, 0x00, 0x00, 0x00, 0x08, 0xe8, 0x01, 0x00, 0xf4,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x07, 0x01, 0xec, 0x16, 0xc0, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa8, 0xa2, 0x00, 0x2d, 0x37,</div><div class='add'>+	0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x09, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x99, 0xe1, 0x07, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x4d, 0x09, 0x04, 0x01, 0x00, 0x78, 0x19, 0x80, 0x97, 0xbc,</div><div class='add'>+	0x02, 0x00, 0x59, 0x09, 0x04, 0xb9, 0x00, 0x80, 0x82, 0xcd, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x48, 0xd6, 0x01, 0x00, 0x78, 0xc9, 0xcd, 0x2c, 0x32,</div><div class='add'>+	0x00, 0x00, 0x51, 0x09, 0xb6, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x64, 0x02, 0x80, 0x97, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x53, 0x09, 0x12, 0x08, 0x00, 0x64, 0x02, 0x00, 0x6e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x54, 0x09, 0x12, 0x18, 0x00, 0x64, 0x02, 0x00, 0x6e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x55, 0x09, 0x12, 0x10, 0x00, 0x64, 0x02, 0x00, 0x6e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xa6, 0x54, 0x01, 0xec, 0x06, 0x00, 0x2b, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x64, 0x01, 0xe8, 0x06, 0xc0, 0x2c, 0x32,</div><div class='add'>+	0x00, 0x00, 0xa2, 0x07, 0x00, 0x0e, 0x01, 0xec, 0x06, 0x00, 0x00, 0x94,</div><div class='add'>+	0x00, 0x20, 0x00, 0x4c, 0xd6, 0x01, 0x00, 0x78, 0xc9, 0xcd, 0x2c, 0x32,</div><div class='add'>+	0x00, 0x00, 0x5a, 0x09, 0xb6, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x64, 0x02, 0x80, 0x97, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x5c, 0x09, 0x12, 0x08, 0x00, 0x64, 0x02, 0x00, 0x6e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x5d, 0x09, 0x12, 0x30, 0x00, 0x64, 0x02, 0x00, 0x6e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x5e, 0x09, 0x12, 0x38, 0x00, 0x64, 0x02, 0x00, 0x6e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x5f, 0x09, 0x12, 0x40, 0x00, 0x64, 0x02, 0x00, 0x6e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x60, 0x09, 0x12, 0x48, 0x00, 0x64, 0x02, 0x00, 0x6e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x61, 0x09, 0x12, 0x10, 0x00, 0x64, 0x02, 0x00, 0x6e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x62, 0x09, 0x12, 0x18, 0x00, 0x64, 0x02, 0x00, 0x6e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x63, 0x09, 0x12, 0x20, 0x00, 0x64, 0x02, 0x00, 0x6e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x64, 0x09, 0x12, 0x28, 0x00, 0x64, 0x02, 0x00, 0x6e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xa6, 0x54, 0x01, 0xec, 0x06, 0x00, 0x2b, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x64, 0x01, 0xe8, 0x06, 0xc0, 0x2c, 0x32,</div><div class='add'>+	0x03, 0x00, 0xa2, 0x07, 0x00, 0x0e, 0x01, 0xec, 0x06, 0x00, 0x36, 0x92,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0x02, 0x00, 0x02, 0x32,</div><div class='add'>+	0x00, 0x00, 0x6b, 0x09, 0x00, 0x00, 0x00, 0x14, 0x08, 0x80, 0x3d, 0x92,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0x02, 0x00, 0x02, 0x32,</div><div class='add'>+	0x00, 0x00, 0x6e, 0x09, 0x04, 0x00, 0x00, 0xdc, 0x53, 0x60, 0x3d, 0xb3,</div><div class='add'>+	0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x8a, 0x03, 0x39,</div><div class='add'>+	0x6a, 0x09, 0x36, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x02, 0x00, 0x36, 0x92,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x54, 0x01, 0xb0, 0x02, 0xc0, 0x6e, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x02, 0x80, 0x01, 0x32,</div><div class='add'>+	0x00, 0xc0, 0x74, 0x09, 0x18, 0x01, 0x00, 0x0c, 0xa8, 0xcd, 0x3e, 0xb2,</div><div class='add'>+	0x20, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x80, 0x36, 0x32,</div><div class='add'>+	0x14, 0x00, 0x9d, 0x03, 0x12, 0x01, 0x00, 0x2c, 0x82, 0xcd, 0x2e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x07, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x07, 0xc0, 0x2c, 0x32,</div><div class='add'>+	0x00, 0x10, 0x00, 0x82, 0x00, 0x38, 0x00, 0x00, 0x07, 0x00, 0x37, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x48, 0x02, 0xc0, 0x80, 0xb2,</div><div class='add'>+	0x00, 0x00, 0xa2, 0x07, 0xca, 0x01, 0x00, 0x08, 0xe8, 0x01, 0x00, 0x94,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x01, 0x00, 0x80, 0x62, 0x81, 0x2f, 0xb6,</div><div class='add'>+	0x2c, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x2c, 0x82, 0xcd, 0x2e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x7d, 0x09, 0x1d, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x00, 0x00, 0xa2, 0x07, 0x00, 0x00, 0x00, 0xf8, 0x62, 0x81, 0x2f, 0x95,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x00, 0x00, 0x80, 0x02, 0x81, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x02, 0x81, 0x2f, 0x34,</div><div class='add'>+	0x29, 0x00, 0xa2, 0x07, 0x12, 0x01, 0x00, 0x2c, 0x82, 0xcd, 0x2e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x2c, 0x10, 0x00, 0x00, 0x00, 0x2c, 0x09, 0xc0, 0x85, 0xd2,</div><div class='add'>+	0x00, 0x00, 0xd1, 0x0f, 0x00, 0x00, 0x00, 0x30, 0x03, 0x00, 0x38, 0xf2,</div><div class='add'>+	0x00, 0x00, 0xa1, 0x03, 0x23, 0x01, 0x00, 0xf8, 0x22, 0x81, 0x2f, 0xb4,</div><div class='add'>+	0x3c, 0x00, 0xa1, 0x03, 0x12, 0x01, 0x00, 0x2c, 0x82, 0xcd, 0x2e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x2c, 0x10, 0x00, 0x00, 0x00, 0x2c, 0x09, 0xc0, 0x85, 0xd2,</div><div class='add'>+	0x00, 0x00, 0xa1, 0x03, 0x00, 0x00, 0x00, 0xf8, 0x22, 0x81, 0x2f, 0x94,</div><div class='add'>+	0x00, 0x00, 0x8c, 0x09, 0x38, 0x01, 0x00, 0xd8, 0x02, 0x80, 0x01, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8c, 0x09, 0x1e, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x9c, 0x10, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xf0,</div><div class='add'>+	0x00, 0x00, 0xa1, 0x03, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8f, 0x09, 0x12, 0x01, 0x00, 0x60, 0x08, 0x40, 0x23, 0xb2,</div><div class='add'>+	0x00, 0x82, 0x9c, 0x10, 0x00, 0x00, 0x00, 0x08, 0x08, 0x80, 0x36, 0xf2,</div><div class='add'>+	0x00, 0x00, 0xa1, 0x03, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x24, 0x08, 0x00, 0x23, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x20, 0x08, 0xc0, 0x23, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x18, 0x08, 0x80, 0x23, 0xb2,</div><div class='add'>+	0x00, 0xc0, 0x99, 0x09, 0x18, 0x01, 0x00, 0x0c, 0xa8, 0xcd, 0x3e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x38, 0x02, 0x80, 0x81, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x3c, 0x02, 0x00, 0x82, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x30, 0x02, 0x40, 0x82, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x34, 0x02, 0x00, 0x86, 0xb2,</div><div class='add'>+	0x20, 0x80, 0x9c, 0x10, 0x00, 0x00, 0x00, 0x08, 0x08, 0x80, 0x36, 0xf2,</div><div class='add'>+	0x00, 0x00, 0xa1, 0x03, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x45, 0x00, 0x00, 0xd8, 0x02, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x40, 0x80, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x07, 0x40, 0x82, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x07, 0x00, 0x86, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x50, 0xf2, 0xc1, 0x38, 0xb4,</div><div class='add'>+	0x00, 0x00, 0x01, 0x0e, 0x00, 0x30, 0x01, 0xe0, 0x16, 0x20, 0x6e, 0xfa,</div><div class='add'>+	0x00, 0x00, 0xa2, 0x09, 0x38, 0x01, 0x00, 0x2c, 0xf8, 0x01, 0x0b, 0xb4,</div><div class='add'>+	0x00, 0x00, 0xa2, 0x09, 0x02, 0x0d, 0x02, 0x80, 0xa2, 0x5b, 0x80, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2c, 0xc8, 0xc1, 0x82, 0x34,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x9f, 0xa8, 0x01, 0xe0, 0x16, 0x20, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x3b, 0x0e, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xf0,</div><div class='add'>+	0x00, 0x00, 0xa7, 0x09, 0x27, 0x01, 0x00, 0xd8, 0x02, 0x80, 0x01, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xc7, 0x00, 0x00, 0x2c, 0xe8, 0xc0, 0x82, 0x34,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xd5, 0x40, 0x01, 0xe0, 0x06, 0x00, 0x87, 0x32,</div><div class='add'>+	0x08, 0x00, 0xb0, 0x10, 0x00, 0x18, 0x01, 0xe8, 0x76, 0x20, 0x81, 0xf9,</div><div class='add'>+	0x00, 0x00, 0xd1, 0x0f, 0x00, 0x00, 0x00, 0x30, 0x03, 0x00, 0x38, 0xf2,</div><div class='add'>+	0x00, 0x00, 0xab, 0x09, 0x23, 0x19, 0x00, 0x00, 0x07, 0x80, 0x81, 0xb2,</div><div class='add'>+	0x3c, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x2c, 0x82, 0xcd, 0x2e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0xad, 0x09, 0x1d, 0x21, 0x00, 0x00, 0x07, 0x00, 0x82, 0xb2,</div><div class='add'>+	0x00, 0x00, 0xb0, 0x09, 0x00, 0x00, 0x00, 0xf8, 0x62, 0x81, 0x2f, 0x95,</div><div class='add'>+	0x00, 0x00, 0xb0, 0x09, 0x80, 0x00, 0x00, 0x80, 0x02, 0x81, 0x2f, 0xb6,</div><div class='add'>+	0x29, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x2c, 0x82, 0xcd, 0x2e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x02, 0x81, 0x2f, 0x34,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x00, 0x00, 0x80, 0xa2, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0xc6, 0x0e, 0x00, 0x00, 0x00, 0x2c, 0xf9, 0x01, 0x00, 0xf4,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x62, 0x80, 0x2d, 0xbc,</div><div class='add'>+	0x10, 0x00, 0xb6, 0x09, 0x2c, 0x30, 0x00, 0x00, 0x17, 0xe0, 0x2c, 0xb9,</div><div class='add'>+	0x00, 0x00, 0xb8, 0x09, 0x8e, 0x39, 0x00, 0x00, 0x07, 0xc0, 0x82, 0xb2,</div><div class='add'>+	0x00, 0x00, 0xb8, 0x09, 0x00, 0x08, 0x00, 0x00, 0x07, 0x00, 0x87, 0x92,</div><div class='add'>+	0x00, 0x00, 0xb8, 0x09, 0x8e, 0x39, 0x00, 0x00, 0xb7, 0xc1, 0x82, 0xb4,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x07, 0x00, 0x87, 0x32,</div><div class='add'>+	0x00, 0x00, 0xba, 0x09, 0x12, 0x01, 0x00, 0xe8, 0x02, 0xc0, 0x21, 0xb2,</div><div class='add'>+	0x18, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0xf9,</div><div class='add'>+	0x00, 0x00, 0xc0, 0x09, 0x04, 0x01, 0x00, 0x80, 0x12, 0x80, 0x2d, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x73, 0x11, 0x00, 0x00, 0x00, 0x14, 0x09, 0xc5, 0x85, 0xd0,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x68, 0x02, 0xc5, 0x85, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x09, 0xc5, 0x85, 0x30,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x02, 0x01, 0x00, 0x80, 0x82, 0xba, 0x97, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x06, 0x01, 0x00, 0x80, 0x92, 0xba, 0x97, 0xbc,</div><div class='add'>+	0x00, 0x00, 0xb8, 0x09, 0x9f, 0x01, 0x00, 0x14, 0x18, 0x40, 0x81, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x48, 0x02, 0xc0, 0x80, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xca, 0x01, 0x00, 0x08, 0xe8, 0x01, 0x00, 0x34,</div><div class='add'>+	0x00, 0x00, 0xa4, 0x03, 0x00, 0x00, 0x00, 0xb0, 0x02, 0x00, 0x85, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x01, 0x00, 0x80, 0x82, 0x81, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0xc8, 0x09, 0x1e, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x9c, 0x10, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xf0,</div><div class='add'>+	0x00, 0x00, 0xa1, 0x03, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x9f, 0xa8, 0x01, 0xe0, 0x16, 0x20, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x01, 0x0e, 0x00, 0x00, 0x00, 0x14, 0x08, 0x00, 0x00, 0xf2,</div><div class='add'>+	0x00, 0x00, 0x3b, 0x0e, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xf0,</div><div class='add'>+	0x00, 0x00, 0xa4, 0x07, 0x04, 0x00, 0x00, 0x80, 0x02, 0x40, 0x81, 0xbc,</div><div class='add'>+	0x00, 0x00, 0xce, 0x09, 0x12, 0x01, 0x00, 0xe8, 0x02, 0xc0, 0x21, 0xb2,</div><div class='add'>+	0x18, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0xf9,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x09, 0xc5, 0x85, 0x30,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x02, 0x01, 0x00, 0x80, 0x82, 0xba, 0x97, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x06, 0x01, 0x00, 0x80, 0x92, 0xba, 0x97, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x73, 0x11, 0x00, 0x00, 0x00, 0x14, 0x09, 0xc5, 0x85, 0xd0,</div><div class='add'>+	0x00, 0x00, 0xa4, 0x07, 0x12, 0x01, 0x00, 0x68, 0x02, 0xc5, 0x85, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xa2, 0x07, 0x80, 0x00, 0x00, 0x80, 0xf2, 0xc1, 0x85, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x1c, 0x40, 0x02, 0x80, 0x06, 0xc0, 0x85, 0xb2,</div><div class='add'>+	0x00, 0x00, 0xa2, 0x07, 0x00, 0x00, 0x00, 0xf8, 0x22, 0x81, 0x2f, 0x94,</div><div class='add'>+	0x00, 0x00, 0xa2, 0x07, 0x80, 0x00, 0x00, 0x80, 0xf2, 0xc1, 0x85, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x2c, 0x10, 0xd6, 0x01, 0x00, 0x2c, 0x09, 0xc0, 0x85, 0xd2,</div><div class='add'>+	0x00, 0x00, 0xa1, 0x03, 0xd2, 0x01, 0x00, 0x94, 0x1e, 0x40, 0xe9, 0x9a,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x20, 0x00, 0x18, 0x08, 0x00, 0x6e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x00, 0x00, 0x80, 0xf2, 0x81, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0xee, 0x10, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xf0,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x02, 0x80, 0x80, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x51, 0x01, 0x80, 0x02, 0x80, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x21, 0x01, 0x80, 0x02, 0x00, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x00, 0xe8, 0x06, 0x40, 0x81, 0x32,</div><div class='add'>+	0x00, 0x00, 0xe4, 0x09, 0x1f, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x00, 0x00, 0xe1, 0x09, 0x9e, 0x40, 0x02, 0x80, 0x02, 0x40, 0x68, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xa4, 0x07, 0x2a, 0x31, 0x01, 0xe0, 0x06, 0x00, 0x00, 0xb2,</div><div class='add'>+	0x18, 0x00, 0x00, 0x00, 0xca, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0x39,</div><div class='add'>+	0xa4, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x02, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x0c, 0x00, 0xeb, 0x09, 0x00, 0x00, 0x00, 0x58, 0x08, 0x00, 0x36, 0x92,</div><div class='add'>+	0x00, 0x00, 0xeb, 0x09, 0x00, 0x00, 0x00, 0x58, 0x08, 0x00, 0x00, 0x92,</div><div class='add'>+	0x1a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x58, 0x08, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x20, 0x00, 0x18, 0x08, 0x00, 0x6e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x00, 0x00, 0x80, 0xf2, 0x81, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0xee, 0x10, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xf0,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x1f, 0x30, 0x00, 0x28, 0x08, 0x00, 0x6e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x54, 0x54, 0x01, 0xb0, 0x02, 0xc0, 0x6e, 0x32,</div><div class='add'>+	0x00, 0x00, 0x25, 0x0a, 0x38, 0x00, 0x00, 0xa4, 0x08, 0x80, 0x82, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x25, 0x0a, 0x04, 0x28, 0x01, 0x04, 0x08, 0x00, 0x6e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x08, 0x50, 0x01, 0x04, 0xa8, 0x5b, 0x80, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x08, 0x20, 0x01, 0xe0, 0x16, 0x20, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x01, 0xe8, 0x06, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x0a, 0x0a, 0x08, 0x01, 0x00, 0x28, 0x18, 0xa0, 0x82, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x01, 0xe0, 0xa6, 0x20, 0x00, 0x3c,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x02, 0x80, 0x01, 0x32,</div><div class='add'>+	0x00, 0xc0, 0xfb, 0x09, 0x18, 0x01, 0x00, 0x0c, 0xa8, 0xcd, 0x3e, 0xb2,</div><div class='add'>+	0x20, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x80, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x00, 0x00, 0x80, 0xa2, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0xe8, 0x01, 0x00, 0x34,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x78, 0x09, 0x00, 0x6e, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x38, 0x08, 0xc0, 0x6e, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x07, 0x80, 0x97, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x07, 0x80, 0x97, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x07, 0xc0, 0x2c, 0x32,</div><div class='add'>+	0x00, 0x20, 0x00, 0x80, 0x00, 0x38, 0x00, 0x00, 0x07, 0x00, 0x37, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xca, 0x3d, 0x00, 0x0c, 0x07, 0x80, 0x83, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x08, 0x40, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x08, 0x0a, 0x04, 0x02, 0x01, 0xec, 0x16, 0xc0, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x14, 0x18, 0x40, 0x81, 0x3a,</div><div class='add'>+	0x00, 0xc0, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x40, 0xa2, 0x8d, 0x39, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x66, 0x0a, 0x12, 0x01, 0x00, 0x48, 0x02, 0xc0, 0x80, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x6c, 0x18, 0x20, 0x6e, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x4c, 0x08, 0x00, 0x6e, 0x32,</div><div class='add'>+	0x00, 0x00, 0x0f, 0x0a, 0x00, 0x38, 0x01, 0xe0, 0x06, 0x40, 0x80, 0x92,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x6c, 0x18, 0x20, 0x6e, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x68, 0x00, 0x4c, 0x08, 0x00, 0x6e, 0x32,</div><div class='add'>+	0x00, 0x00, 0x11, 0x0a, 0x9f, 0x01, 0x00, 0x04, 0x68, 0x60, 0x80, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x18, 0x18, 0x20, 0x00, 0x9c,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x01, 0x00, 0x80, 0xa2, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x14, 0x0a, 0x12, 0x01, 0x00, 0xe8, 0x02, 0xc0, 0x21, 0xb2,</div><div class='add'>+	0x18, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0xf9,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xca, 0x70, 0x00, 0x18, 0x08, 0x00, 0x6e, 0x32,</div><div class='add'>+	0x00, 0x00, 0x0d, 0x0a, 0x02, 0x01, 0x00, 0x80, 0x62, 0x60, 0x80, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x9f, 0x00, 0x00, 0x14, 0x18, 0x40, 0x81, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xca, 0x01, 0x00, 0xf8, 0x02, 0x80, 0x2f, 0x35,</div><div class='add'>+	0x00, 0xa0, 0x0d, 0x0a, 0x12, 0x01, 0x00, 0x40, 0xa2, 0x8d, 0x39, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x1f, 0x0a, 0x80, 0x00, 0x00, 0x80, 0xa2, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x1f, 0x0a, 0x04, 0x00, 0x00, 0x80, 0xa2, 0xa0, 0x81, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x9f, 0x00, 0x00, 0x14, 0x18, 0x40, 0x81, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xca, 0x01, 0x00, 0xf8, 0x02, 0x80, 0x2f, 0x35,</div><div class='add'>+	0x00, 0xa0, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x40, 0xa2, 0x8d, 0x39, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x01, 0xe0, 0x06, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x00, 0xe8, 0x06, 0x40, 0x81, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0xe0, 0x06, 0x80, 0x82, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0xe0, 0x06, 0x80, 0x81, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x10, 0x00, 0xe0, 0x06, 0xc0, 0x86, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x27, 0x0a, 0x00, 0x18, 0x00, 0xe0, 0x06, 0xc0, 0x84, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x10, 0x00, 0x6c, 0x08, 0x00, 0x6e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x4c, 0x08, 0x00, 0x6e, 0x32,</div><div class='add'>+	0x00, 0x00, 0xa3, 0x0e, 0x51, 0x00, 0x00, 0xd8, 0x02, 0x00, 0x00, 0xf2,</div><div class='add'>+	0x00, 0x00, 0x2a, 0x0a, 0x00, 0x50, 0x01, 0x3c, 0xa8, 0x5b, 0x80, 0x9c,</div><div class='add'>+	0x00, 0x00, 0xa4, 0x07, 0x00, 0x30, 0x01, 0xe0, 0x06, 0x00, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x2f, 0x0a, 0x3e, 0x51, 0x01, 0x00, 0xa8, 0x1b, 0x80, 0xba,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xde, 0x00, 0x00, 0xf8, 0xf2, 0x81, 0x2f, 0x34,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x58, 0x01, 0xec, 0x06, 0xc0, 0xee, 0x32,</div><div class='add'>+	0x00, 0x00, 0x2f, 0x0a, 0x80, 0x01, 0x00, 0x80, 0x32, 0x80, 0x87, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xe2, 0x80, 0x2f, 0x34,</div><div class='add'>+	0x00, 0x00, 0x4c, 0x0f, 0x60, 0x30, 0x01, 0xe0, 0x06, 0x00, 0x00, 0xf2,</div><div class='add'>+	0x00, 0x00, 0x7b, 0x0a, 0x00, 0x00, 0x00, 0xb0, 0x02, 0x00, 0x85, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x00, 0x00, 0x80, 0x82, 0x81, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x08, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x3a, 0x0a, 0x04, 0x02, 0x01, 0xec, 0x16, 0xc0, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xc9, 0x01, 0x00, 0x14, 0x18, 0x40, 0x81, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xc0, 0x01, 0x01, 0x38, 0x08, 0xc0, 0x6e, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xdf, 0x00, 0x00, 0xa4, 0xa8, 0x60, 0x8a, 0x3c,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x0f, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x00, 0xc0, 0x3e, 0x0a, 0x12, 0x01, 0x00, 0x40, 0xa2, 0x8d, 0x39, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0xe0, 0x06, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xdf, 0x00, 0x00, 0xa4, 0xa8, 0x60, 0x8a, 0x3c,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x0f, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x38, 0x08, 0xc0, 0x6e, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xde, 0xa8, 0x01, 0x20, 0x99, 0x22, 0x6e, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x06, 0x01, 0x02, 0x80, 0x82, 0x1b, 0x92, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x42, 0x0a, 0x2f, 0x20, 0x01, 0xe0, 0x96, 0x22, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x2f, 0x0e, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xf0,</div><div class='add'>+	0x00, 0x00, 0x4a, 0x0a, 0x1f, 0x50, 0x01, 0xe8, 0x06, 0x00, 0x00, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x45, 0x0a, 0x04, 0x00, 0x00, 0x80, 0x02, 0xc0, 0x83, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x4a, 0x0a, 0x00, 0x50, 0x01, 0xe8, 0xf6, 0x60, 0x80, 0x9c,</div><div class='add'>+	0x08, 0x00, 0x00, 0x00, 0x00, 0x40, 0x02, 0x78, 0x39, 0x9a, 0xfe, 0x38,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x02, 0x01, 0x00, 0x80, 0x82, 0xba, 0x97, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x06, 0x01, 0x00, 0x80, 0x92, 0xba, 0x97, 0xbc,</div><div class='add'>+	0x08, 0x00, 0x73, 0x11, 0x00, 0x40, 0x02, 0x14, 0x39, 0x9a, 0xfe, 0xd8,</div><div class='add'>+	0x08, 0x00, 0x00, 0x00, 0x00, 0x40, 0x02, 0x68, 0x12, 0x9a, 0xfe, 0x38,</div><div class='add'>+	0x00, 0x00, 0x4f, 0x0a, 0x2a, 0xa9, 0x01, 0xe0, 0x06, 0x00, 0x92, 0xb2,</div><div class='add'>+	0x18, 0x00, 0x36, 0x00, 0xca, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0xf9,</div><div class='add'>+	0x1d, 0x00, 0x4f, 0x0a, 0x04, 0x00, 0x00, 0x80, 0x02, 0xa4, 0x17, 0xb8,</div><div class='add'>+	0x00, 0x00, 0x4b, 0x0a, 0x04, 0x00, 0x00, 0x14, 0x18, 0x40, 0x81, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xd1, 0x0f, 0x00, 0x00, 0x00, 0x30, 0x03, 0x00, 0x38, 0xf2,</div><div class='add'>+	0x00, 0x00, 0x52, 0x0a, 0x80, 0x01, 0x00, 0x80, 0x32, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x3c, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x2c, 0x82, 0xcd, 0x2e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x02, 0x80, 0x01, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0x02, 0x00, 0x85, 0x32,</div><div class='add'>+	0x00, 0xc0, 0x61, 0x0a, 0x18, 0x01, 0x00, 0x0c, 0xa8, 0xcd, 0x3e, 0xb2,</div><div class='add'>+	0x18, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x82, 0x8d, 0x82, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x58, 0x0a, 0x04, 0x00, 0x00, 0x80, 0x02, 0x40, 0x81, 0xbc,</div><div class='add'>+	0x18, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0xf9,</div><div class='add'>+	0x18, 0x00, 0x5a, 0x0a, 0x2e, 0x49, 0x01, 0xe0, 0xe6, 0xa0, 0x82, 0xb9,</div><div class='add'>+	0x00, 0x00, 0x5b, 0x0a, 0x00, 0x5e, 0x01, 0xec, 0x76, 0x00, 0x00, 0x94,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x5e, 0x01, 0xec, 0x06, 0x00, 0x00, 0x32,</div><div class='add'>+	0x20, 0x80, 0xb0, 0x10, 0x00, 0x00, 0x00, 0x08, 0x08, 0x80, 0x36, 0xf2,</div><div class='add'>+	0x1b, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x2c, 0x82, 0xcd, 0x2e, 0xb2,</div><div class='add'>+	0x0c, 0x00, 0xa1, 0x03, 0x04, 0x01, 0x00, 0x80, 0x82, 0x8d, 0x85, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x30, 0x00, 0x80, 0x02, 0x00, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0x00, 0xc2, 0x10, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xf0,</div><div class='add'>+	0x00, 0x00, 0x9e, 0x05, 0x00, 0x00, 0x00, 0x1c, 0x08, 0x80, 0x85, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x00, 0x00, 0x80, 0x72, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x20, 0x00, 0x80, 0x00, 0x00, 0x00, 0x28, 0x09, 0x00, 0x37, 0x32,</div><div class='add'>+	0x00, 0x00, 0xcb, 0x10, 0x00, 0x00, 0x00, 0x08, 0xe8, 0x01, 0x00, 0xf4,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x48, 0x02, 0xc0, 0x80, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x18, 0x40, 0x81, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x01, 0x00, 0x80, 0xa2, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x18, 0x00, 0x36, 0x00, 0xca, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0xf9,</div><div class='add'>+	0x1d, 0x00, 0x8a, 0x11, 0x04, 0x00, 0x00, 0x80, 0x02, 0xa4, 0x17, 0xb8,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x9f, 0x00, 0x00, 0x14, 0x18, 0x40, 0x81, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x67, 0x0a, 0x0b, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x6e, 0x0a, 0x3d, 0x01, 0x00, 0xb0, 0x02, 0x00, 0x85, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x6e, 0x0a, 0x34, 0x00, 0x00, 0xf8, 0xd2, 0x81, 0x2f, 0xb5,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xb2, 0x80, 0x2f, 0x34,</div><div class='add'>+	0x00, 0x00, 0xb0, 0x10, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xf0,</div><div class='add'>+	0x00, 0x00, 0x72, 0x0a, 0x80, 0x01, 0x00, 0x80, 0x92, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x2a, 0x00, 0x78, 0x0a, 0x12, 0x01, 0x00, 0x2c, 0x82, 0xcd, 0x2e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x75, 0x0a, 0x1d, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x78, 0x0a, 0x80, 0x01, 0x00, 0x80, 0x62, 0x81, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x78, 0x0a, 0x80, 0x00, 0x00, 0x80, 0x02, 0x81, 0x2f, 0xb6,</div><div class='add'>+	0x29, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x2c, 0x82, 0xcd, 0x2e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x02, 0x81, 0x2f, 0x34,</div><div class='add'>+	0x00, 0x00, 0xa2, 0x07, 0x04, 0x00, 0x00, 0x80, 0x02, 0x80, 0x85, 0xbc,</div><div class='add'>+	0x00, 0x00, 0xc2, 0x10, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xf0,</div><div class='add'>+	0x00, 0x00, 0x9e, 0x05, 0x00, 0x00, 0x00, 0x1c, 0x08, 0x80, 0x85, 0x92,</div><div class='add'>+	0x00, 0x00, 0xa4, 0x07, 0x80, 0x01, 0x00, 0x80, 0xa2, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x00, 0x00, 0x80, 0xe2, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x80, 0x0a, 0x80, 0x01, 0x00, 0x80, 0x82, 0x81, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x31, 0x01, 0x80, 0x02, 0x00, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x31, 0x00, 0x80, 0x82, 0x9b, 0x82, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x02, 0x01, 0x00, 0x80, 0x12, 0xa0, 0x82, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xce, 0x01, 0x00, 0xd8, 0x02, 0x80, 0x01, 0x32,</div><div class='add'>+	0x00, 0xc0, 0x86, 0x0a, 0x18, 0x01, 0x00, 0x0c, 0xa8, 0xcd, 0x3e, 0xb2,</div><div class='add'>+	0x20, 0x80, 0x9c, 0x10, 0x00, 0x00, 0x00, 0x08, 0x08, 0x80, 0x36, 0xf2,</div><div class='add'>+	0x00, 0x00, 0xa1, 0x03, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x00, 0x00, 0x80, 0xa2, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x00, 0x00, 0x80, 0x82, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x00, 0x00, 0x80, 0x02, 0x80, 0x82, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x1f, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0xd8, 0x02, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8f, 0x0a, 0x3f, 0x00, 0x00, 0x3c, 0x08, 0x40, 0x80, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8f, 0x0a, 0x80, 0x01, 0x00, 0x80, 0xe2, 0x81, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xde, 0x00, 0x00, 0xf8, 0xf2, 0x81, 0x2f, 0x34,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x58, 0x01, 0xec, 0x06, 0xc0, 0xee, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x4d, 0x00, 0x00, 0x00, 0x67, 0xe0, 0x83, 0x3e,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x07, 0x00, 0x80, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x07, 0xc0, 0x86, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x07, 0xc0, 0x84, 0x32,</div><div class='add'>+	0x00, 0x00, 0xda, 0x0a, 0x04, 0x00, 0x00, 0x28, 0xd8, 0xa0, 0x82, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x09, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0xd8, 0xa0, 0x81, 0x3c,</div><div class='add'>+	0x00, 0x00, 0xb0, 0x0a, 0x04, 0x00, 0x00, 0x3c, 0xd8, 0xe0, 0x83, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x02, 0x80, 0x81, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x9b, 0x0a, 0x04, 0x00, 0x00, 0x80, 0x72, 0x80, 0x2d, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x50, 0x02, 0xc0, 0x38, 0xb2,</div><div class='add'>+	0x00, 0x00, 0xae, 0x0a, 0x51, 0x00, 0x00, 0xd8, 0x12, 0x80, 0x2d, 0x9a,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x50, 0xf2, 0xc1, 0x38, 0xb4,</div><div class='add'>+	0x00, 0x00, 0xa7, 0x0a, 0x28, 0x00, 0x00, 0xd8, 0x02, 0x00, 0x00, 0xb2,</div><div class='add'>+	0x00, 0x00, 0xa5, 0x0a, 0x80, 0x01, 0x00, 0x80, 0xf2, 0xc1, 0x85, 0xb6,</div><div class='add'>+	0x00, 0x00, 0xa1, 0x0a, 0x1f, 0x40, 0x02, 0x84, 0xe6, 0x01, 0x00, 0xb4,</div><div class='add'>+	0x00, 0x00, 0xa5, 0x0a, 0x1d, 0x01, 0x00, 0xf8, 0x22, 0x81, 0x2f, 0xb4,</div><div class='add'>+	0x00, 0x00, 0xa5, 0x0a, 0x00, 0x00, 0x00, 0xf8, 0x62, 0x81, 0x2f, 0x95,</div><div class='add'>+	0x00, 0x00, 0xa3, 0x0a, 0x1d, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x62, 0x81, 0x2f, 0x35,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x02, 0x80, 0x02, 0x40, 0x68, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x1f, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0xe0, 0x16, 0x20, 0x6e, 0x3c,</div><div class='add'>+	0x00, 0x00, 0x3c, 0x0e, 0xda, 0x5b, 0x01, 0xec, 0x06, 0x40, 0xed, 0xf2,</div><div class='add'>+	0x18, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0xf9,</div><div class='add'>+	0x00, 0x00, 0xac, 0x0a, 0x04, 0x00, 0x00, 0x80, 0x72, 0x80, 0x2d, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x01, 0x00, 0x80, 0xa2, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0xa7, 0x0a, 0x67, 0x00, 0x00, 0xf8, 0xa2, 0x80, 0x2f, 0xb5,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0xe8, 0x02, 0xc0, 0x21, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x72, 0x80, 0x2d, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x51, 0x00, 0x00, 0xd8, 0x02, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0xaf, 0x0e, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x20, 0x80, 0xfa,</div><div class='add'>+	0x00, 0x00, 0x90, 0x0a, 0x4d, 0x00, 0x00, 0x00, 0x67, 0xe0, 0x83, 0x9e,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x50, 0xf2, 0xc1, 0x38, 0xb4,</div><div class='add'>+	0x00, 0x00, 0xbc, 0x0a, 0x28, 0x00, 0x00, 0x80, 0x08, 0x40, 0x00, 0xb2,</div><div class='add'>+	0x00, 0x00, 0xba, 0x0a, 0x80, 0x01, 0x00, 0x80, 0xf2, 0xc1, 0x85, 0xb6,</div><div class='add'>+	0x00, 0x00, 0xb6, 0x0a, 0x1f, 0x40, 0x02, 0x84, 0xe6, 0x01, 0x00, 0xb4,</div><div class='add'>+	0x00, 0x00, 0xba, 0x0a, 0x1d, 0x01, 0x00, 0xf8, 0x22, 0x81, 0x2f, 0xb4,</div><div class='add'>+	0x00, 0x00, 0xba, 0x0a, 0x00, 0x00, 0x00, 0xf8, 0x62, 0x81, 0x2f, 0x95,</div><div class='add'>+	0x00, 0x00, 0xb8, 0x0a, 0x1d, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x62, 0x81, 0x2f, 0x35,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x02, 0x80, 0x02, 0x40, 0x68, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x1f, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0xe0, 0x16, 0x20, 0x6e, 0x3c,</div><div class='add'>+	0x00, 0x00, 0x3c, 0x0e, 0xda, 0x5b, 0x01, 0xec, 0x06, 0x40, 0xed, 0xf2,</div><div class='add'>+	0x00, 0x00, 0xe0, 0x0a, 0x80, 0x00, 0x00, 0x80, 0xe2, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0xc0, 0x0a, 0x04, 0x21, 0x00, 0xe0, 0x06, 0x80, 0x81, 0xb2,</div><div class='add'>+	0x00, 0x00, 0xaf, 0x0e, 0x00, 0x00, 0x00, 0x34, 0x08, 0x00, 0x00, 0xf2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0xe0, 0x06, 0x80, 0x81, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x00, 0xe8, 0x06, 0x40, 0x81, 0x32,</div><div class='add'>+	0x00, 0x00, 0xc6, 0x0a, 0x2a, 0x11, 0x00, 0xe0, 0xd6, 0xe0, 0x86, 0xba,</div><div class='add'>+	0x18, 0x00, 0x36, 0x00, 0xca, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0xf9,</div><div class='add'>+	0x1d, 0x00, 0xc6, 0x0a, 0x04, 0x01, 0x00, 0x80, 0x02, 0xa4, 0x17, 0xb8,</div><div class='add'>+	0x00, 0x00, 0xc2, 0x0a, 0x9f, 0x01, 0x00, 0x80, 0x18, 0x00, 0x88, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xb0, 0x10, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xf0,</div><div class='add'>+	0x00, 0x00, 0xd1, 0x0f, 0x00, 0x00, 0x00, 0x30, 0x03, 0x00, 0x38, 0xf2,</div><div class='add'>+	0x08, 0x00, 0xca, 0x0a, 0x23, 0x19, 0x01, 0xe8, 0x76, 0x20, 0x81, 0xb9,</div><div class='add'>+	0x3c, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x2c, 0x82, 0xcd, 0x2e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0xce, 0x0a, 0x1d, 0x18, 0x00, 0xe0, 0x06, 0xc0, 0x84, 0xb2,</div><div class='add'>+	0x00, 0x00, 0xce, 0x0a, 0x80, 0x00, 0x00, 0x80, 0x02, 0x81, 0x2f, 0xb6,</div><div class='add'>+	0x29, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x2c, 0x82, 0xcd, 0x2e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x02, 0x81, 0x2f, 0x34,</div><div class='add'>+	0x00, 0x00, 0xc6, 0x0e, 0x00, 0x00, 0x00, 0x2c, 0xf9, 0x01, 0x00, 0xf4,</div><div class='add'>+	0x00, 0x00, 0xd3, 0x0a, 0x04, 0x00, 0x00, 0x80, 0x02, 0x00, 0x88, 0xbc,</div><div class='add'>+	0x00, 0x00, 0xd2, 0x0a, 0x12, 0x01, 0x00, 0x00, 0x09, 0xc0, 0x21, 0xb2,</div><div class='add'>+	0x18, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0xf9,</div><div class='add'>+	0x1d, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x02, 0xa4, 0x17, 0xb8,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x02, 0x80, 0x80, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x09, 0xc5, 0x85, 0x30,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x02, 0x01, 0x00, 0x80, 0x82, 0xba, 0x97, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x06, 0x01, 0x00, 0x80, 0x92, 0xba, 0x97, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x73, 0x11, 0x00, 0x00, 0x00, 0x14, 0x09, 0xc5, 0x85, 0xd0,</div><div class='add'>+	0x00, 0x00, 0xa4, 0x03, 0x12, 0x01, 0x00, 0x68, 0x02, 0xc5, 0x85, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x78, 0x19, 0x20, 0x6e, 0x3c,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0xe2, 0xa5, 0x82, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x00, 0x00, 0x80, 0xa2, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x02, 0x00, 0x88, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x02, 0x80, 0x80, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x50, 0xf2, 0xc1, 0x38, 0xb4,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xc0, 0x01, 0x01, 0x38, 0x08, 0xc0, 0x6e, 0x32,</div><div class='add'>+	0x00, 0x00, 0xe4, 0x0a, 0x04, 0x02, 0x01, 0xec, 0x16, 0xc0, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0xc0, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x40, 0xa2, 0x8d, 0x39, 0xb2,</div><div class='add'>+	0x00, 0x00, 0xe5, 0x0a, 0xc9, 0x01, 0x00, 0x14, 0x08, 0x00, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x45, 0x30, 0x00, 0xe0, 0x06, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0xef, 0x0a, 0x28, 0x00, 0x00, 0x08, 0xe8, 0x01, 0x00, 0xb4,</div><div class='add'>+	0x00, 0x00, 0xee, 0x0a, 0x80, 0x01, 0x00, 0x80, 0xf2, 0xc1, 0x85, 0xb6,</div><div class='add'>+	0x00, 0x00, 0xea, 0x0a, 0x1f, 0x40, 0x02, 0x84, 0xe6, 0x01, 0x00, 0xb4,</div><div class='add'>+	0x00, 0x00, 0xee, 0x0a, 0x1d, 0x01, 0x00, 0xf8, 0x22, 0x81, 0x2f, 0xb4,</div><div class='add'>+	0x00, 0x00, 0xee, 0x0a, 0x00, 0x00, 0x00, 0xf8, 0x62, 0x81, 0x2f, 0x95,</div><div class='add'>+	0x00, 0x00, 0xec, 0x0a, 0x1d, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x62, 0x81, 0x2f, 0x35,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x02, 0x80, 0x02, 0x40, 0x68, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x1f, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x3c, 0x0e, 0xda, 0x5b, 0x01, 0xec, 0x06, 0x40, 0xed, 0xf2,</div><div class='add'>+	0x00, 0x20, 0x00, 0x80, 0xdf, 0x00, 0x00, 0x28, 0x09, 0x00, 0x37, 0x32,</div><div class='add'>+	0x00, 0x00, 0xf3, 0x0a, 0x3d, 0x01, 0x00, 0xd8, 0x02, 0x80, 0x01, 0xb2,</div><div class='add'>+	0x00, 0x00, 0xf3, 0x0a, 0x34, 0x00, 0x00, 0xf8, 0xd2, 0x81, 0x2f, 0xb5,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xb2, 0x80, 0x2f, 0x34,</div><div class='add'>+	0x00, 0x00, 0xcb, 0x10, 0x00, 0x00, 0x00, 0xf8, 0xe2, 0x81, 0x2f, 0xf5,</div><div class='add'>+	0x08, 0x00, 0xb0, 0x10, 0x00, 0x18, 0x01, 0xe8, 0x76, 0x20, 0x81, 0xf9,</div><div class='add'>+	0x00, 0x00, 0xd1, 0x0f, 0x00, 0x00, 0x00, 0x30, 0x03, 0x00, 0x38, 0xf2,</div><div class='add'>+	0x00, 0x00, 0xf8, 0x0a, 0x80, 0x01, 0x00, 0x80, 0x32, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x3c, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x2c, 0x82, 0xcd, 0x2e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0xfd, 0x0a, 0x29, 0x08, 0x01, 0xe4, 0x06, 0xc0, 0x2d, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x02, 0x0b, 0x1d, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x02, 0x0b, 0x80, 0x00, 0x00, 0x80, 0x02, 0x81, 0x2f, 0xb6,</div><div class='add'>+	0x29, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x2c, 0x82, 0xcd, 0x2e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x02, 0x0b, 0x00, 0x00, 0x00, 0xf8, 0x02, 0x81, 0x2f, 0x94,</div><div class='add'>+	0x00, 0x00, 0xff, 0x0a, 0x12, 0x01, 0x00, 0x00, 0x09, 0xc0, 0x21, 0xb2,</div><div class='add'>+	0x18, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0xf9,</div><div class='add'>+	0x1d, 0x00, 0x01, 0x0b, 0x04, 0x01, 0x00, 0x80, 0x02, 0xa4, 0x17, 0xb8,</div><div class='add'>+	0x00, 0x00, 0xfe, 0x0a, 0x00, 0x00, 0x00, 0x14, 0x18, 0x40, 0x81, 0x9c,</div><div class='add'>+	0x2a, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x2c, 0x82, 0xcd, 0x2e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0xc7, 0x0e, 0x00, 0x00, 0x00, 0x2c, 0xf9, 0x01, 0x00, 0xf4,</div><div class='add'>+	0x00, 0x00, 0x05, 0x0b, 0x04, 0x01, 0x00, 0x80, 0x02, 0x40, 0x81, 0xbc,</div><div class='add'>+	0x18, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0xf9,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x48, 0x02, 0xc0, 0x80, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x09, 0xc5, 0x85, 0x30,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x02, 0x01, 0x00, 0x80, 0x82, 0xba, 0x97, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x06, 0x01, 0x00, 0x80, 0x92, 0xba, 0x97, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x73, 0x11, 0x00, 0x00, 0x00, 0x14, 0x09, 0xc5, 0x85, 0xd0,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x68, 0x02, 0xc5, 0x85, 0xb0,</div><div class='add'>+	0x00, 0x00, 0xa4, 0x03, 0x00, 0x00, 0x00, 0xb0, 0x02, 0x00, 0x85, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x00, 0x00, 0x80, 0x82, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x31, 0x00, 0x80, 0x82, 0x9b, 0x82, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x02, 0x00, 0x00, 0x80, 0x12, 0xa0, 0x82, 0xbc,</div><div class='add'>+	0x25, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x09, 0x00, 0x36, 0x32,</div><div class='add'>+	0x10, 0x00, 0xe2, 0x10, 0x00, 0x00, 0x00, 0x14, 0xa9, 0x60, 0x80, 0xd9,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x02, 0x80, 0x01, 0x32,</div><div class='add'>+	0x00, 0xc0, 0x15, 0x0b, 0x18, 0x01, 0x00, 0x0c, 0xa8, 0xcd, 0x3e, 0xb2,</div><div class='add'>+	0x20, 0x80, 0x9c, 0x10, 0x00, 0x00, 0x00, 0x08, 0x08, 0x80, 0x36, 0xf2,</div><div class='add'>+	0x00, 0x00, 0xa1, 0x03, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xa2, 0x8d, 0x2f, 0x31,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x80, 0x81, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x07, 0x00, 0x80, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x07, 0xc0, 0x86, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x07, 0xc0, 0x84, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x50, 0xf2, 0xc1, 0x38, 0xb4,</div><div class='add'>+	0x00, 0x00, 0x20, 0x0b, 0x80, 0x00, 0x00, 0x80, 0x82, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x68, 0xa8, 0x60, 0x80, 0x3c,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x08, 0x40, 0x80, 0x32,</div><div class='add'>+	0x00, 0x00, 0x3b, 0x0e, 0x00, 0x00, 0x00, 0x04, 0x08, 0x80, 0x82, 0xf2,</div><div class='add'>+	0x00, 0x00, 0x21, 0x0b, 0x12, 0x01, 0x00, 0x00, 0x09, 0xc0, 0x21, 0xb2,</div><div class='add'>+	0x18, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0xf9,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x68, 0x20, 0x80, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x26, 0x0b, 0x04, 0x00, 0x00, 0x28, 0x68, 0xa0, 0x82, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x00, 0x00, 0x80, 0xe2, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0xaf, 0x0e, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xf0,</div><div class='add'>+	0x00, 0x00, 0x17, 0x0b, 0x00, 0x00, 0x00, 0x00, 0x07, 0x80, 0x81, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x00, 0x00, 0x80, 0xa2, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x02, 0x80, 0x01, 0x32,</div><div class='add'>+	0x00, 0x20, 0x00, 0x80, 0x00, 0x00, 0x00, 0x28, 0x09, 0x00, 0x37, 0x32,</div><div class='add'>+	0x00, 0x00, 0xc7, 0x10, 0x00, 0x00, 0x00, 0x08, 0xe8, 0x01, 0x00, 0xf4,</div><div class='add'>+	0x18, 0x00, 0x36, 0x00, 0xca, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0xf9,</div><div class='add'>+	0x00, 0x00, 0x2e, 0x0b, 0x3d, 0x01, 0x00, 0xb0, 0x02, 0x00, 0x85, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x2e, 0x0b, 0x34, 0x00, 0x00, 0xf8, 0xd2, 0x81, 0x2f, 0xb5,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xb2, 0x80, 0x2f, 0x34,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x00, 0x00, 0x04, 0x08, 0x80, 0x86, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x3c, 0x0b, 0x04, 0x02, 0x01, 0xec, 0x16, 0xc0, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x00, 0x00, 0x28, 0x09, 0x80, 0x80, 0xb2,</div><div class='add'>+	0x00, 0x00, 0xef, 0x0f, 0x00, 0x00, 0x00, 0xd8, 0x02, 0x00, 0x00, 0xd2,</div><div class='add'>+	0x00, 0x00, 0x34, 0x0b, 0x04, 0x00, 0x00, 0x80, 0x02, 0x80, 0x92, 0xbc,</div><div class='add'>+	0x18, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0xf9,</div><div class='add'>+	0x00, 0x00, 0x3a, 0x10, 0x00, 0x00, 0x00, 0x78, 0x38, 0x80, 0x87, 0xf5,</div><div class='add'>+	0x00, 0x00, 0xb0, 0x10, 0x00, 0x00, 0x00, 0x08, 0x08, 0x00, 0x00, 0xf2,</div><div class='add'>+	0x00, 0x00, 0xc2, 0x10, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xf0,</div><div class='add'>+	0x00, 0x00, 0xd1, 0x0f, 0x00, 0x00, 0x00, 0x30, 0x03, 0x00, 0x38, 0xf2,</div><div class='add'>+	0x00, 0x00, 0xa5, 0x02, 0x23, 0x01, 0x00, 0xf8, 0x02, 0x80, 0x2f, 0xb4,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x32, 0x80, 0x2f, 0x35,</div><div class='add'>+	0x3c, 0x00, 0xa5, 0x02, 0x12, 0x01, 0x00, 0x2c, 0x82, 0xcd, 0x2e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x1f, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x3f, 0x0b, 0x80, 0x01, 0x00, 0x80, 0x82, 0x81, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x31, 0x01, 0x80, 0x02, 0x00, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x41, 0x0b, 0x12, 0x01, 0x00, 0x60, 0x08, 0x40, 0x23, 0xb2,</div><div class='add'>+	0x00, 0x82, 0x4b, 0x0b, 0x00, 0x00, 0x00, 0x08, 0xa8, 0x8d, 0x80, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x24, 0x08, 0x00, 0x23, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x20, 0x08, 0xc0, 0x23, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x18, 0x08, 0x80, 0x23, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x02, 0x80, 0x01, 0x32,</div><div class='add'>+	0x00, 0xc0, 0x5c, 0x0b, 0x18, 0x01, 0x00, 0x0c, 0xa8, 0xcd, 0x3e, 0xb2,</div><div class='add'>+	0x20, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0xa8, 0x8d, 0x80, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x38, 0x02, 0x80, 0x81, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x3c, 0x02, 0x00, 0x82, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x30, 0x02, 0x40, 0x82, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x34, 0x02, 0x00, 0x86, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x53, 0x0b, 0x80, 0x01, 0x00, 0x80, 0xf2, 0xc1, 0x85, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x4f, 0x0b, 0x1f, 0x40, 0x02, 0x84, 0xe6, 0x01, 0x00, 0xb4,</div><div class='add'>+	0x00, 0x00, 0x53, 0x0b, 0x1d, 0x01, 0x00, 0xf8, 0x22, 0x81, 0x2f, 0xb4,</div><div class='add'>+	0x00, 0x00, 0x53, 0x0b, 0x00, 0x00, 0x00, 0xf8, 0x62, 0x81, 0x2f, 0x95,</div><div class='add'>+	0x00, 0x00, 0x51, 0x0b, 0x1d, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x62, 0x81, 0x2f, 0x35,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x02, 0x80, 0x02, 0x40, 0x68, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x1f, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x09, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0xe2, 0x10, 0x00, 0x00, 0x00, 0x14, 0x09, 0x00, 0x80, 0xd2,</div><div class='add'>+	0x00, 0x00, 0x73, 0x11, 0x00, 0x00, 0x00, 0x14, 0x09, 0xc5, 0x85, 0xd0,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x68, 0x02, 0xc5, 0x85, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x09, 0xc5, 0x85, 0x30,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x02, 0x01, 0x00, 0x80, 0x82, 0xba, 0x97, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x06, 0x01, 0x00, 0x80, 0x92, 0xba, 0x97, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5c, 0x1f, 0xc0, 0xf5, 0x3a,</div><div class='add'>+	0x00, 0x00, 0xa4, 0x07, 0x00, 0x30, 0x00, 0xe0, 0x06, 0x00, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x02, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x40, 0x80, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x07, 0x00, 0x80, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x07, 0x40, 0x82, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x07, 0x00, 0x86, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x50, 0xf2, 0xc1, 0x38, 0xb4,</div><div class='add'>+	0x00, 0x00, 0x39, 0x10, 0x00, 0x00, 0x00, 0xd8, 0x02, 0x80, 0x01, 0xf2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x07, 0x80, 0x81, 0x32,</div><div class='add'>+	0x10, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x17, 0xe0, 0x2c, 0x39,</div><div class='add'>+	0x00, 0x10, 0x00, 0x80, 0x00, 0x38, 0x00, 0x00, 0x07, 0x00, 0x37, 0x32,</div><div class='add'>+	0x00, 0x00, 0xb0, 0x10, 0x00, 0x30, 0x00, 0xe0, 0x06, 0x00, 0x00, 0xf2,</div><div class='add'>+	0x00, 0x00, 0xd1, 0x0f, 0x00, 0x00, 0x00, 0x30, 0x03, 0x00, 0x38, 0xf2,</div><div class='add'>+	0x00, 0x00, 0x6a, 0x0b, 0x80, 0x01, 0x00, 0x80, 0x32, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x3c, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x2c, 0x82, 0xcd, 0x2e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0xc3, 0x10, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xf0,</div><div class='add'>+	0x00, 0x00, 0x6e, 0x0b, 0x1d, 0x21, 0x00, 0x00, 0x07, 0x00, 0x82, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x71, 0x0b, 0x80, 0x01, 0x00, 0x80, 0x62, 0x81, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x71, 0x0b, 0x80, 0x00, 0x00, 0x80, 0x02, 0x81, 0x2f, 0xb6,</div><div class='add'>+	0x29, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x2c, 0x82, 0xcd, 0x2e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x02, 0x81, 0x2f, 0x34,</div><div class='add'>+	0x00, 0x00, 0xc6, 0x0e, 0x00, 0x00, 0x00, 0x2c, 0xf9, 0x01, 0x00, 0xf4,</div><div class='add'>+	0x00, 0x00, 0x74, 0x0b, 0x12, 0x01, 0x00, 0xe8, 0x02, 0xc0, 0x21, 0xb2,</div><div class='add'>+	0x18, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0xf9,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x48, 0x02, 0xc0, 0x80, 0xb2,</div><div class='add'>+	0x00, 0x00, 0xa4, 0x03, 0xca, 0x01, 0x00, 0xb0, 0x02, 0x00, 0x85, 0x92,</div><div class='add'>+	0x00, 0x00, 0x7e, 0x0b, 0x80, 0x01, 0x00, 0x80, 0xf2, 0xc1, 0x85, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x7a, 0x0b, 0x1f, 0x40, 0x02, 0x84, 0xe6, 0x01, 0x00, 0xb4,</div><div class='add'>+	0x00, 0x00, 0x7e, 0x0b, 0x1d, 0x01, 0x00, 0xf8, 0x22, 0x81, 0x2f, 0xb4,</div><div class='add'>+	0x00, 0x00, 0x7e, 0x0b, 0x00, 0x00, 0x00, 0xf8, 0x62, 0x81, 0x2f, 0x95,</div><div class='add'>+	0x00, 0x00, 0x7c, 0x0b, 0x1d, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x62, 0x81, 0x2f, 0x35,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x02, 0x80, 0x02, 0x40, 0x68, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x1f, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x80, 0x0b, 0x04, 0x00, 0x00, 0x80, 0x02, 0x40, 0x86, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x0a, 0x11, 0x00, 0x90, 0x01, 0x08, 0x09, 0x00, 0x6e, 0xf2,</div><div class='add'>+	0x00, 0x00, 0x3f, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xf0,</div><div class='add'>+	0x00, 0x00, 0x87, 0x0b, 0x33, 0x01, 0x00, 0xd8, 0x02, 0x80, 0x01, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x87, 0x0b, 0x80, 0x01, 0x00, 0x80, 0xb2, 0x01, 0x72, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x87, 0x0b, 0x9f, 0xf0, 0x01, 0x80, 0x82, 0xdb, 0x87, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x87, 0x0b, 0x9f, 0xf8, 0x01, 0x80, 0x22, 0x21, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0xe8, 0x01, 0xe0, 0x06, 0x00, 0xee, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x01, 0xe0, 0x06, 0xc0, 0x87, 0x32,</div><div class='add'>+	0x08, 0x00, 0x00, 0x00, 0x00, 0x18, 0x01, 0xe8, 0x76, 0x20, 0x81, 0x39,</div><div class='add'>+	0x00, 0x00, 0x8d, 0x0b, 0x80, 0x01, 0x00, 0x80, 0xd2, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x8d, 0x0b, 0x04, 0xb0, 0x00, 0x80, 0x02, 0x00, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xcd, 0x00, 0x00, 0xf8, 0x72, 0x81, 0x2f, 0x34,</div><div class='add'>+	0x3b, 0x00, 0x8d, 0x0b, 0x12, 0x01, 0x00, 0x2c, 0x82, 0xcd, 0x2e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x9d, 0x0b, 0x27, 0x09, 0x01, 0xe4, 0x06, 0xc0, 0x2d, 0xb2,</div><div class='add'>+	0x00, 0xc0, 0x95, 0x0b, 0x18, 0x01, 0x00, 0x0c, 0xa8, 0xcd, 0x3e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x09, 0xc5, 0x85, 0x30,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x02, 0x01, 0x00, 0x80, 0x82, 0xba, 0x97, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x06, 0x01, 0x00, 0x80, 0x92, 0xba, 0x97, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x73, 0x11, 0x00, 0x00, 0x00, 0x14, 0x09, 0xc5, 0x85, 0xd0,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x68, 0x02, 0xc5, 0x85, 0xb0,</div><div class='add'>+	0x20, 0x80, 0xa4, 0x07, 0x00, 0x00, 0x00, 0x08, 0x08, 0x80, 0x36, 0x92,</div><div class='add'>+	0x2c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x09, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0xe2, 0x10, 0x00, 0x98, 0x01, 0x14, 0x09, 0x00, 0x6e, 0xd2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x01, 0xe0, 0x06, 0x40, 0x88, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xd5, 0x08, 0x00, 0x00, 0x07, 0x40, 0x88, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x07, 0xc0, 0x2c, 0x32,</div><div class='add'>+	0x00, 0x40, 0x00, 0x80, 0xca, 0x39, 0x00, 0x00, 0x07, 0x00, 0x37, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x48, 0x02, 0xc0, 0x80, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0xe8, 0x01, 0x00, 0x34,</div><div class='add'>+	0x00, 0x00, 0xa1, 0x0b, 0x1d, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x00, 0x00, 0xa1, 0x0b, 0x80, 0x00, 0x00, 0x80, 0x02, 0x81, 0x2f, 0xb6,</div><div class='add'>+	0x29, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x2c, 0x82, 0xcd, 0x2e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x02, 0x81, 0x2f, 0x34,</div><div class='add'>+	0x00, 0x00, 0xc7, 0x0e, 0x00, 0x00, 0x00, 0x2c, 0xf9, 0x01, 0x00, 0xf4,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x09, 0xc5, 0x85, 0x30,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x02, 0x01, 0x00, 0x80, 0x82, 0xba, 0x97, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x06, 0x01, 0x00, 0x80, 0x92, 0xba, 0x97, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x73, 0x11, 0x00, 0x00, 0x00, 0x14, 0x09, 0xc5, 0x85, 0xd0,</div><div class='add'>+	0x00, 0x00, 0xa4, 0x03, 0x12, 0x01, 0x00, 0x68, 0x02, 0xc5, 0x85, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x54, 0x54, 0x01, 0xb0, 0x02, 0xc0, 0x6e, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x02, 0x80, 0x01, 0x32,</div><div class='add'>+	0x00, 0xc0, 0xae, 0x0b, 0x18, 0x01, 0x00, 0x0c, 0xa8, 0xcd, 0x3e, 0xb2,</div><div class='add'>+	0x20, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x80, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0xa1, 0x03, 0x12, 0x01, 0x00, 0x2c, 0x72, 0xe0, 0x2e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x01, 0x00, 0x80, 0x82, 0x81, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0xee, 0x10, 0x00, 0x20, 0x00, 0x18, 0x08, 0x00, 0x6e, 0xf2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x1f, 0x30, 0x00, 0x28, 0x08, 0x00, 0x6e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa4, 0x08, 0x80, 0x82, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x10, 0x00, 0x6c, 0x08, 0x00, 0x6e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0xa3, 0x0e, 0x00, 0x18, 0x00, 0x4c, 0x08, 0x00, 0x6e, 0xf2,</div><div class='add'>+	0x00, 0x00, 0xb6, 0x0b, 0x00, 0x50, 0x01, 0x3c, 0xa8, 0x5b, 0x80, 0x9c,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x01, 0x00, 0xa8, 0x1b, 0x80, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x08, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x51, 0x00, 0x00, 0xd8, 0x02, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x4d, 0x00, 0x00, 0x00, 0x67, 0xe0, 0x83, 0x3e,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x07, 0x00, 0x80, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x07, 0xc0, 0x86, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x07, 0xc0, 0x84, 0x32,</div><div class='add'>+	0x00, 0x00, 0xee, 0x0b, 0x04, 0x00, 0x00, 0x28, 0xd8, 0xa0, 0x82, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x09, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0xd8, 0xa0, 0x81, 0x3c,</div><div class='add'>+	0x00, 0x00, 0xd4, 0x0b, 0x04, 0x00, 0x00, 0x3c, 0xd8, 0xe0, 0x83, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x02, 0x80, 0x81, 0xbc,</div><div class='add'>+	0x00, 0x00, 0xc5, 0x0b, 0x04, 0x00, 0x00, 0x80, 0x72, 0x80, 0x2d, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x50, 0x02, 0xc0, 0x38, 0xb2,</div><div class='add'>+	0x00, 0x00, 0xcd, 0x0b, 0x51, 0x00, 0x00, 0xd8, 0x12, 0x80, 0x2d, 0x9a,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x50, 0xf2, 0xc1, 0x38, 0xb4,</div><div class='add'>+	0x18, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0xf9,</div><div class='add'>+	0x00, 0x00, 0xcb, 0x0b, 0x04, 0x00, 0x00, 0x80, 0x72, 0x80, 0x2d, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x01, 0x00, 0x80, 0xa2, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0xc6, 0x0b, 0x67, 0x00, 0x00, 0xf8, 0xa2, 0x80, 0x2f, 0xb5,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0xe8, 0x02, 0xc0, 0x21, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x72, 0x80, 0x2d, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x51, 0x00, 0x00, 0xd8, 0x02, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0xd2, 0x0b, 0x2a, 0x01, 0x00, 0x00, 0xd8, 0x20, 0x80, 0xba,</div><div class='add'>+	0x00, 0x00, 0xd1, 0x0b, 0x12, 0x01, 0x00, 0x00, 0x09, 0xc0, 0x21, 0xb2,</div><div class='add'>+	0x18, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0xf9,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x02, 0x40, 0x84, 0x32,</div><div class='add'>+	0x1d, 0x00, 0x8a, 0x11, 0x04, 0x00, 0x00, 0x80, 0x02, 0xa4, 0x17, 0xb8,</div><div class='add'>+	0x00, 0x00, 0xb7, 0x0e, 0x00, 0x60, 0x00, 0x6c, 0x08, 0x00, 0x6e, 0xf2,</div><div class='add'>+	0x00, 0x00, 0xba, 0x0b, 0x4d, 0x00, 0x00, 0x00, 0x67, 0xe0, 0x83, 0x9e,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x50, 0xf2, 0xc1, 0x38, 0xb4,</div><div class='add'>+	0x18, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0xf9,</div><div class='add'>+	0x1d, 0x00, 0xdb, 0x0b, 0x04, 0x00, 0x00, 0x80, 0x02, 0xa4, 0x17, 0xb8,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x01, 0x00, 0x80, 0xa2, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0xd5, 0x0b, 0x67, 0x00, 0x00, 0xf8, 0xa2, 0x80, 0x2f, 0xb5,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x00, 0x09, 0xc0, 0x21, 0xb2,</div><div class='add'>+	0x1d, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x02, 0xa4, 0x17, 0xb8,</div><div class='add'>+	0x08, 0x00, 0x00, 0x00, 0x00, 0x40, 0x02, 0x78, 0x39, 0x9a, 0xfe, 0x38,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x02, 0x01, 0x00, 0x80, 0x82, 0xba, 0x97, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x06, 0x01, 0x00, 0x80, 0x92, 0xba, 0x97, 0xbc,</div><div class='add'>+	0x08, 0x00, 0x73, 0x11, 0x00, 0x40, 0x02, 0x14, 0x39, 0x9a, 0xfe, 0xd8,</div><div class='add'>+	0x08, 0x00, 0x8a, 0x11, 0x12, 0x40, 0x02, 0x68, 0x12, 0x9a, 0xfe, 0xb8,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x0b, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x00, 0x00, 0xd1, 0x0f, 0x00, 0x00, 0x00, 0x30, 0x03, 0x00, 0x38, 0xf2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x1f, 0x00, 0x00, 0x6c, 0xd8, 0xe0, 0x86, 0xba,</div><div class='add'>+	0x00, 0x00, 0xa3, 0x0e, 0x51, 0x00, 0x00, 0xd8, 0x02, 0x00, 0x00, 0xf2,</div><div class='add'>+	0x00, 0x00, 0xe6, 0x0b, 0x00, 0x00, 0x00, 0x3c, 0x08, 0x40, 0x80, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xb9, 0x0b, 0x04, 0x01, 0x00, 0x80, 0x02, 0x80, 0x81, 0xbc,</div><div class='add'>+	0x00, 0x00, 0xec, 0x0b, 0x80, 0x01, 0x00, 0x80, 0xa2, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0xeb, 0x0b, 0x12, 0x01, 0x00, 0x00, 0x09, 0xc0, 0x21, 0xb2,</div><div class='add'>+	0x18, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0xf9,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x02, 0x40, 0x84, 0x32,</div><div class='add'>+	0x1d, 0x00, 0x8a, 0x11, 0x04, 0x00, 0x00, 0x80, 0x02, 0xa4, 0x17, 0xb8,</div><div class='add'>+	0x00, 0x00, 0xb7, 0x0e, 0x00, 0x60, 0x00, 0x6c, 0x08, 0x00, 0x6e, 0xf2,</div><div class='add'>+	0x00, 0x00, 0xba, 0x0b, 0x4d, 0x00, 0x00, 0x00, 0x67, 0xe0, 0x83, 0x9e,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x00, 0x00, 0x80, 0xa2, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xc0, 0x01, 0x01, 0x38, 0x08, 0xc0, 0x6e, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x45, 0x30, 0x00, 0xe0, 0x06, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x50, 0xf2, 0xc1, 0x38, 0xb4,</div><div class='add'>+	0x00, 0x00, 0xf6, 0x0b, 0x04, 0x02, 0x01, 0xec, 0x16, 0xc0, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xc9, 0x01, 0x00, 0x14, 0x18, 0x40, 0x81, 0x3a,</div><div class='add'>+	0x00, 0xc0, 0xf7, 0x0b, 0x12, 0x01, 0x00, 0x40, 0xa2, 0x8d, 0x39, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x30,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0xa8, 0x01, 0x20, 0x99, 0x22, 0x6e, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x06, 0x01, 0x02, 0x80, 0x82, 0x1b, 0x92, 0xbc,</div><div class='add'>+	0x00, 0x00, 0xfb, 0x0b, 0x2f, 0x20, 0x01, 0xe0, 0x96, 0x22, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x2f, 0x0e, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xf0,</div><div class='add'>+	0x00, 0x00, 0xff, 0x0b, 0x04, 0x00, 0x00, 0x3c, 0xd8, 0xe0, 0x83, 0xbc,</div><div class='add'>+	0x00, 0x00, 0xfe, 0x0b, 0x9f, 0x31, 0x01, 0xe0, 0x96, 0x22, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x01, 0xe0, 0x06, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x07, 0x0c, 0x00, 0x50, 0x01, 0xe8, 0xf6, 0x60, 0x80, 0x9c,</div><div class='add'>+	0x08, 0x00, 0x00, 0x00, 0x00, 0x40, 0x02, 0x78, 0x39, 0x9a, 0xfe, 0x38,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x02, 0x01, 0x00, 0x80, 0x82, 0xba, 0x97, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x06, 0x01, 0x00, 0x80, 0x92, 0xba, 0x97, 0xbc,</div><div class='add'>+	0x08, 0x00, 0x73, 0x11, 0x00, 0x40, 0x02, 0x14, 0x39, 0x9a, 0xfe, 0xd8,</div><div class='add'>+	0x08, 0x00, 0x00, 0x00, 0x00, 0x40, 0x02, 0x68, 0x12, 0x9a, 0xfe, 0x38,</div><div class='add'>+	0x00, 0x00, 0x06, 0x0c, 0x9f, 0x31, 0x01, 0xe0, 0x96, 0x22, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x01, 0xe0, 0x06, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x01, 0xe8, 0x06, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0xa8, 0x01, 0xe0, 0x06, 0x00, 0x92, 0x32,</div><div class='add'>+	0x18, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0xf9,</div><div class='add'>+	0x1d, 0x00, 0x0c, 0x0c, 0x04, 0x00, 0x00, 0x80, 0x02, 0xa4, 0x17, 0xb8,</div><div class='add'>+	0x00, 0x00, 0x08, 0x0c, 0x04, 0x00, 0x00, 0x14, 0x18, 0x40, 0x81, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x00, 0x00, 0x80, 0x72, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x02, 0x80, 0x01, 0x32,</div><div class='add'>+	0x00, 0x20, 0x00, 0x80, 0x00, 0x00, 0x00, 0x28, 0x09, 0x00, 0x37, 0x32,</div><div class='add'>+	0x00, 0x00, 0xcb, 0x10, 0x00, 0x00, 0x00, 0x08, 0xe8, 0x01, 0x00, 0xf4,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x48, 0x02, 0xc0, 0x80, 0xb2,</div><div class='add'>+	0x00, 0x00, 0xd1, 0x0f, 0x00, 0x00, 0x00, 0x30, 0x03, 0x00, 0x38, 0xf2,</div><div class='add'>+	0x00, 0x00, 0x14, 0x0c, 0x23, 0x01, 0x00, 0x14, 0x18, 0x40, 0x81, 0xba,</div><div class='add'>+	0x3c, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x2c, 0x82, 0xcd, 0x2e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x01, 0x00, 0x80, 0xa2, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x18, 0x00, 0x36, 0x00, 0xca, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0xf9,</div><div class='add'>+	0x1d, 0x00, 0x8a, 0x11, 0x04, 0x00, 0x00, 0x80, 0x02, 0xa4, 0x17, 0xb8,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x9f, 0x00, 0x00, 0x14, 0x18, 0x40, 0x81, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x15, 0x0c, 0x0b, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x1c, 0x0c, 0x3d, 0x01, 0x00, 0xb0, 0x02, 0x00, 0x85, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x1c, 0x0c, 0x34, 0x00, 0x00, 0xf8, 0xd2, 0x81, 0x2f, 0xb5,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xb2, 0x80, 0x2f, 0x34,</div><div class='add'>+	0x00, 0x00, 0xb0, 0x10, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xf0,</div><div class='add'>+	0x00, 0x00, 0x20, 0x0c, 0x29, 0x31, 0x01, 0x0c, 0x09, 0x00, 0x6e, 0xb2,</div><div class='add'>+	0x2a, 0x00, 0xa2, 0x07, 0x12, 0x01, 0x00, 0x2c, 0x82, 0xcd, 0x2e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x27, 0x0e, 0x00, 0x0c, 0x02, 0x00, 0x09, 0x80, 0x6e, 0xf2,</div><div class='add'>+	0x00, 0x00, 0x24, 0x0c, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xa2, 0x07, 0x12, 0x01, 0x00, 0x2c, 0x02, 0xe4, 0x2e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x27, 0x0c, 0x1d, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x00, 0x00, 0xa2, 0x07, 0x80, 0x01, 0x00, 0x80, 0x62, 0x81, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xa2, 0x07, 0x80, 0x00, 0x00, 0x80, 0x02, 0x81, 0x2f, 0xb6,</div><div class='add'>+	0x29, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x2c, 0x82, 0xcd, 0x2e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0xa2, 0x07, 0x00, 0x00, 0x00, 0xf8, 0x02, 0x81, 0x2f, 0x94,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x01, 0x00, 0x80, 0x82, 0x81, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x00, 0x00, 0x18, 0x09, 0x40, 0x81, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x4f, 0x0e, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xf0,</div><div class='add'>+	0x00, 0x00, 0x2f, 0x0e, 0x00, 0xa8, 0x01, 0x20, 0x09, 0x00, 0x6e, 0xf2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x01, 0x0c, 0x09, 0x00, 0x6e, 0x32,</div><div class='add'>+	0x00, 0x00, 0x27, 0x0e, 0x00, 0x0c, 0x02, 0x00, 0x09, 0x80, 0x6e, 0xf2,</div><div class='add'>+	0x00, 0x00, 0xa4, 0x07, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xb0, 0x10, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xf0,</div><div class='add'>+	0x00, 0x00, 0xc2, 0x10, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xf0,</div><div class='add'>+	0x00, 0x00, 0x9d, 0x05, 0x00, 0x00, 0x00, 0x1c, 0x08, 0x00, 0x90, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x01, 0x00, 0x80, 0x82, 0x81, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x1f, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa8, 0x78, 0x0b, 0x16, 0x38,</div><div class='add'>+	0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xac, 0x78, 0x0b, 0x16, 0x38,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0xa8, 0x00, 0x2d, 0x37,</div><div class='add'>+	0x00, 0xcc, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0x88, 0x0d, 0x8b, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x01, 0xb4, 0x08, 0x80, 0x6e, 0x32,</div><div class='add'>+	0x00, 0x00, 0x45, 0x0c, 0x04, 0x31, 0x01, 0x90, 0x08, 0x00, 0x6e, 0xb2,</div><div class='add'>+	0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc8, 0x82, 0x8d, 0x8a, 0x37,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc8, 0xc2, 0xa2, 0x2c, 0x3a,</div><div class='add'>+	0x18, 0x00, 0x43, 0x0c, 0x86, 0x41, 0x02, 0x78, 0x88, 0x0d, 0x78, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x00, 0x00, 0x80, 0xa2, 0xe2, 0x8a, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x41, 0x02, 0x80, 0xb2, 0x3f, 0x78, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x3c, 0x0c, 0x9f, 0x01, 0x00, 0xa8, 0x18, 0x80, 0x8a, 0xbc,</div><div class='add'>+	0xb7, 0x00, 0x3c, 0x0c, 0x00, 0x00, 0x00, 0xa8, 0x08, 0x00, 0x36, 0x92,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x02, 0x04, 0xb8, 0x3f, 0x78, 0x30,</div><div class='add'>+	0x00, 0x00, 0x58, 0x0c, 0x00, 0x00, 0x00, 0x04, 0xd8, 0x62, 0x80, 0x9c,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x02, 0x0c, 0x02, 0x80, 0xa2, 0x1b, 0x89, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x00, 0x00, 0x80, 0x82, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc8, 0x82, 0x8d, 0x8a, 0x37,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc8, 0xc2, 0xa2, 0x2c, 0x3a,</div><div class='add'>+	0x18, 0x00, 0x4e, 0x0c, 0x86, 0x41, 0x02, 0x78, 0x88, 0x0d, 0x78, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x00, 0x00, 0x80, 0xa2, 0xe2, 0x8a, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x41, 0x02, 0x80, 0xb2, 0x3f, 0x78, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x47, 0x0c, 0x9f, 0x01, 0x00, 0xa8, 0x18, 0x80, 0x8a, 0xbc,</div><div class='add'>+	0xb7, 0x00, 0x47, 0x0c, 0x00, 0x00, 0x00, 0xa8, 0x08, 0x00, 0x36, 0x92,</div><div class='add'>+	0x00, 0x00, 0x51, 0x0c, 0x28, 0x40, 0x02, 0x04, 0xb8, 0x3f, 0x78, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xc8, 0x01, 0x00, 0x04, 0xd8, 0x62, 0x80, 0x3c,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x9f, 0x00, 0x00, 0x80, 0x02, 0x40, 0x80, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x55, 0x0c, 0x02, 0x01, 0x00, 0x90, 0x18, 0x20, 0x89, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb4, 0x08, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x47, 0x0c, 0x9f, 0x01, 0x00, 0xa8, 0x18, 0x80, 0x8a, 0xbc,</div><div class='add'>+	0xb7, 0x00, 0x47, 0x0c, 0x00, 0x00, 0x00, 0xa8, 0x08, 0x00, 0x36, 0x92,</div><div class='add'>+	0x00, 0x00, 0x58, 0x0c, 0x04, 0x00, 0x00, 0x90, 0x18, 0x20, 0x89, 0xba,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x9f, 0x00, 0x00, 0x04, 0x48, 0x62, 0x80, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x90, 0x00, 0x00, 0xb4, 0x48, 0x62, 0x8b, 0xba,</div><div class='add'>+	0x03, 0x00, 0x8a, 0x11, 0x04, 0x40, 0x02, 0x00, 0x08, 0x1e, 0xff, 0xb8,</div><div class='add'>+	0x00, 0x00, 0x60, 0x0c, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x22, 0x80, 0x9a,</div><div class='add'>+	0x00, 0x00, 0x89, 0x0c, 0x04, 0x00, 0x00, 0x80, 0xa2, 0xe2, 0x8a, 0xbc,</div><div class='add'>+	0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc8, 0x82, 0x8d, 0x8a, 0x37,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc8, 0xc2, 0xa2, 0x2c, 0x3a,</div><div class='add'>+	0x18, 0x00, 0x87, 0x0c, 0x86, 0x40, 0x02, 0x78, 0x88, 0x0d, 0x78, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x40, 0x02, 0x04, 0xb8, 0x3f, 0x78, 0xb0,</div><div class='add'>+	0x03, 0x00, 0x8a, 0x11, 0x04, 0x40, 0x02, 0x00, 0x08, 0x1e, 0xff, 0xb8,</div><div class='add'>+	0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x09, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0xe2, 0x10, 0x00, 0x00, 0x00, 0x14, 0x09, 0x00, 0x80, 0xd2,</div><div class='add'>+	0x00, 0x00, 0x67, 0x0c, 0x12, 0x01, 0x00, 0x60, 0x08, 0x40, 0x23, 0xb2,</div><div class='add'>+	0x00, 0x82, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x80, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x54, 0x01, 0xb0, 0x02, 0xc0, 0x6e, 0x32,</div><div class='add'>+	0x00, 0x00, 0xa1, 0x03, 0x12, 0x01, 0x00, 0x2c, 0x72, 0xe0, 0x2e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x24, 0x08, 0x00, 0x23, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x20, 0x08, 0xc0, 0x23, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x18, 0x08, 0x80, 0x23, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x54, 0x54, 0x01, 0xb0, 0x02, 0xc0, 0x6e, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x02, 0x80, 0x01, 0x32,</div><div class='add'>+	0x00, 0xc0, 0x72, 0x0c, 0x18, 0x01, 0x00, 0x0c, 0xa8, 0xcd, 0x3e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x38, 0x02, 0x80, 0x81, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x3c, 0x02, 0x00, 0x82, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x30, 0x02, 0x40, 0x82, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x34, 0x02, 0x00, 0x86, 0xb2,</div><div class='add'>+	0x20, 0x80, 0x64, 0x0c, 0x00, 0x00, 0x00, 0x08, 0x08, 0x80, 0x36, 0x92,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x02, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x02, 0x00, 0xb8, 0x1b, 0x80, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x64, 0x30, 0x01, 0xe0, 0x16, 0x20, 0x6e, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x40, 0x80, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x07, 0x00, 0x80, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x07, 0x40, 0x82, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x07, 0x00, 0x86, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x50, 0xf2, 0xc1, 0x38, 0xb4,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x02, 0x80, 0x01, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x07, 0x80, 0x81, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x07, 0x00, 0x82, 0x32,</div><div class='add'>+	0x10, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x17, 0xe0, 0x2c, 0x39,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0xf7, 0x01, 0x0b, 0x34,</div><div class='add'>+	0x00, 0x00, 0x81, 0x0c, 0x80, 0x01, 0x00, 0x80, 0x32, 0x80, 0x87, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0xb7, 0x01, 0x70, 0x34,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0xe8, 0x01, 0x00, 0x34,</div><div class='add'>+	0x00, 0x00, 0x93, 0x0c, 0x02, 0x0c, 0x02, 0x80, 0xa2, 0x1b, 0x89, 0xbc,</div><div class='add'>+	0x18, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0xf9,</div><div class='add'>+	0x00, 0x00, 0xd1, 0x0f, 0x00, 0x00, 0x00, 0x30, 0x03, 0x00, 0x38, 0xf2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x48, 0x02, 0xc0, 0x80, 0xb2,</div><div class='add'>+	0x18, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0xf9,</div><div class='add'>+	0x00, 0x00, 0x5a, 0x0c, 0x9f, 0x01, 0x00, 0xa8, 0x18, 0x80, 0x8a, 0xbc,</div><div class='add'>+	0xb7, 0x00, 0x5a, 0x0c, 0x00, 0x00, 0x00, 0xa8, 0x08, 0x00, 0x36, 0x92,</div><div class='add'>+	0x27, 0x00, 0x8c, 0x0c, 0x04, 0x01, 0x00, 0x80, 0x82, 0xcd, 0x81, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x01, 0x78, 0x09, 0x00, 0x6e, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x42, 0xa2, 0x97, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8e, 0x0c, 0x23, 0x55, 0x01, 0xb0, 0x02, 0xc0, 0x6e, 0xb2,</div><div class='add'>+	0x3c, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x2c, 0x82, 0xcd, 0x2e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x90, 0x0c, 0x1d, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x00, 0x00, 0xa2, 0x07, 0x00, 0x00, 0x00, 0xf8, 0x62, 0x81, 0x2f, 0x95,</div><div class='add'>+	0x00, 0x00, 0xa2, 0x07, 0x80, 0x00, 0x00, 0x80, 0x02, 0x81, 0x2f, 0xb6,</div><div class='add'>+	0x29, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x2c, 0x82, 0xcd, 0x2e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0xa2, 0x07, 0x00, 0x00, 0x00, 0xf8, 0x02, 0x81, 0x2f, 0x94,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0xc7, 0x01, 0x70, 0x34,</div><div class='add'>+	0x00, 0x00, 0xd1, 0x0f, 0x00, 0x00, 0x00, 0x30, 0x03, 0x00, 0x38, 0xf2,</div><div class='add'>+	0x08, 0x00, 0x97, 0x0c, 0x23, 0x19, 0x01, 0xe8, 0x76, 0x20, 0x81, 0xb9,</div><div class='add'>+	0x3c, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x2c, 0x82, 0xcd, 0x2e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x99, 0x0c, 0x1d, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x9c, 0x0c, 0x00, 0x00, 0x00, 0xf8, 0x62, 0x81, 0x2f, 0x95,</div><div class='add'>+	0x00, 0x00, 0x9c, 0x0c, 0x80, 0x00, 0x00, 0x80, 0x02, 0x81, 0x2f, 0xb6,</div><div class='add'>+	0x29, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x2c, 0x82, 0xcd, 0x2e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x02, 0x81, 0x2f, 0x34,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x00, 0x00, 0x80, 0xa2, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0xc6, 0x0e, 0x00, 0x00, 0x00, 0x2c, 0xf9, 0x01, 0x00, 0xf4,</div><div class='add'>+	0x00, 0x00, 0xa0, 0x0c, 0x12, 0x01, 0x00, 0xe8, 0x02, 0xc0, 0x21, 0xb2,</div><div class='add'>+	0x18, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0xf9,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x48, 0x02, 0xc0, 0x80, 0xb2,</div><div class='add'>+	0x00, 0x00, 0xa4, 0x03, 0xca, 0x01, 0x00, 0xb0, 0x02, 0x00, 0x85, 0x92,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x02, 0x80, 0x01, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x28, 0x08, 0x00, 0x6e, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x54, 0x54, 0x01, 0xb0, 0x02, 0xc0, 0x6e, 0x32,</div><div class='add'>+	0x00, 0xc0, 0xad, 0x0c, 0x18, 0x01, 0x00, 0x0c, 0xa8, 0xcd, 0x3e, 0xb2,</div><div class='add'>+	0x18, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x82, 0x8d, 0x82, 0xb6,</div><div class='add'>+	0x20, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x80, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x38, 0x08, 0xc0, 0x6e, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x5e, 0x01, 0xec, 0x66, 0x00, 0x00, 0x34,</div><div class='add'>+	0x18, 0x00, 0x00, 0x00, 0x00, 0x48, 0x01, 0xe0, 0xe6, 0xa0, 0x82, 0x39,</div><div class='add'>+	0x1b, 0x00, 0xa1, 0x03, 0x12, 0x01, 0x00, 0x2c, 0x82, 0xcd, 0x2e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x20, 0x00, 0x84, 0x00, 0x00, 0x00, 0x28, 0x09, 0x00, 0x37, 0x32,</div><div class='add'>+	0x00, 0x00, 0xc7, 0x10, 0x00, 0x00, 0x00, 0x08, 0xe8, 0x01, 0x00, 0xf4,</div><div class='add'>+	0x00, 0x00, 0xa2, 0x07, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x02, 0x80, 0x01, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x54, 0x54, 0x01, 0xb0, 0x02, 0xc0, 0x6e, 0x32,</div><div class='add'>+	0x00, 0xc0, 0xb6, 0x0c, 0x18, 0x01, 0x00, 0x0c, 0xa8, 0xcd, 0x3e, 0xb2,</div><div class='add'>+	0x20, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x80, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0x9d, 0x03, 0x12, 0x01, 0x00, 0x2c, 0x72, 0xe0, 0x2e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x58, 0x10, 0x00, 0x00, 0x00, 0x28, 0x09, 0x00, 0x02, 0xf2,</div><div class='add'>+	0x00, 0x00, 0xbd, 0x0c, 0x00, 0x00, 0x00, 0x5c, 0x08, 0x00, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x02, 0x80, 0x01, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x54, 0x54, 0x01, 0xb0, 0x02, 0xc0, 0x6e, 0x32,</div><div class='add'>+	0x00, 0xc0, 0xbd, 0x0c, 0x18, 0x01, 0x00, 0x0c, 0xa8, 0xcd, 0x3e, 0xb2,</div><div class='add'>+	0x20, 0x80, 0x9c, 0x10, 0x00, 0x00, 0x00, 0x08, 0x08, 0x80, 0x36, 0xf2,</div><div class='add'>+	0x00, 0x00, 0xa1, 0x03, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x28, 0x08, 0x00, 0x6e, 0x32,</div><div class='add'>+	0x00, 0x20, 0x00, 0x84, 0x00, 0x00, 0x00, 0x28, 0x09, 0x00, 0x37, 0x32,</div><div class='add'>+	0x00, 0x00, 0xc7, 0x10, 0x00, 0x00, 0x00, 0x08, 0xe8, 0x01, 0x00, 0xf4,</div><div class='add'>+	0x00, 0x00, 0xc2, 0x0c, 0x00, 0x00, 0x00, 0xb0, 0x02, 0x00, 0x85, 0x92,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0xc6, 0x0c, 0x04, 0x00, 0x00, 0x80, 0x02, 0xc0, 0x85, 0xb2,</div><div class='add'>+	0x00, 0x00, 0xc6, 0x0c, 0x80, 0x00, 0x00, 0x80, 0xf2, 0xc1, 0x85, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xd2, 0x41, 0x02, 0x80, 0x06, 0xc0, 0x85, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x1c, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x4c, 0x0d, 0x80, 0x01, 0x00, 0x80, 0xa2, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x18, 0x00, 0x36, 0x00, 0xca, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0xf9,</div><div class='add'>+	0x00, 0x00, 0x4c, 0x0d, 0x00, 0x00, 0x00, 0xb0, 0x02, 0x00, 0x85, 0x92,</div><div class='add'>+	0x00, 0x00, 0x1a, 0x0d, 0x80, 0x01, 0x00, 0x80, 0x82, 0x81, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x22, 0x0d, 0x1f, 0x20, 0x01, 0x08, 0x09, 0x00, 0x6e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x1a, 0x0d, 0x04, 0x30, 0x01, 0x08, 0x89, 0x9b, 0x90, 0xbc,</div><div class='add'>+	0x00, 0x00, 0xd2, 0x0c, 0x04, 0x31, 0x01, 0x80, 0x02, 0x00, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0x00, 0xa3, 0x0e, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xf0,</div><div class='add'>+	0x00, 0x00, 0xd0, 0x0c, 0x00, 0x50, 0x01, 0x48, 0x08, 0x80, 0x6e, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x28, 0x61, 0x80, 0x3c,</div><div class='add'>+	0x00, 0x00, 0xeb, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x28, 0x21, 0x80, 0x9a,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x9f, 0x00, 0x00, 0x80, 0x02, 0x80, 0x90, 0xb2,</div><div class='add'>+	0x00, 0x00, 0xa3, 0x0e, 0x00, 0x30, 0x01, 0x48, 0x08, 0x00, 0x6e, 0xf2,</div><div class='add'>+	0x00, 0x00, 0xd6, 0x0c, 0x00, 0x50, 0x01, 0x04, 0xa8, 0x5b, 0x80, 0x9c,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x01, 0x00, 0xa8, 0x1b, 0x80, 0x3a,</div><div class='add'>+	0x00, 0x00, 0xe8, 0x0c, 0x07, 0x00, 0x00, 0x48, 0x18, 0xa0, 0x84, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x02, 0x80, 0x02, 0x40, 0x68, 0x32,</div><div class='add'>+	0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x09, 0xa0, 0xfe, 0x38,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x02, 0x01, 0x00, 0x80, 0x82, 0xba, 0x97, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x06, 0x01, 0x00, 0x80, 0x92, 0xba, 0x97, 0xbc,</div><div class='add'>+	0x05, 0x00, 0x73, 0x11, 0x00, 0x00, 0x00, 0x14, 0x09, 0xa0, 0xfe, 0xd8,</div><div class='add'>+	0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x68, 0x02, 0xa0, 0xfe, 0x38,</div><div class='add'>+	0x00, 0x00, 0xa3, 0x0e, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xf0,</div><div class='add'>+	0x00, 0x00, 0xe1, 0x0c, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xe8, 0x0c, 0x07, 0x00, 0x00, 0x48, 0x18, 0xa0, 0x84, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x02, 0x80, 0x02, 0x40, 0x68, 0x32,</div><div class='add'>+	0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x09, 0xa0, 0xfe, 0x38,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x02, 0x01, 0x00, 0x80, 0x82, 0xba, 0x97, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x06, 0x01, 0x00, 0x80, 0x92, 0xba, 0x97, 0xbc,</div><div class='add'>+	0x05, 0x00, 0x73, 0x11, 0x00, 0x00, 0x00, 0x14, 0x09, 0xa0, 0xfe, 0xd8,</div><div class='add'>+	0x05, 0x00, 0xde, 0x0c, 0x00, 0x00, 0x00, 0x68, 0x02, 0xa0, 0xfe, 0x98,</div><div class='add'>+	0x00, 0x00, 0xeb, 0x0c, 0x04, 0x00, 0x00, 0x48, 0x18, 0xa0, 0x84, 0xba,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x9f, 0x00, 0x00, 0x04, 0x28, 0x61, 0x80, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x21, 0x80, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x54, 0x01, 0xb0, 0x02, 0xc0, 0x6e, 0x32,</div><div class='add'>+	0x00, 0x00, 0xf4, 0x0c, 0x12, 0x01, 0x00, 0x60, 0x08, 0x40, 0x23, 0xb2,</div><div class='add'>+	0x03, 0x00, 0x8a, 0x11, 0x04, 0x40, 0x02, 0x00, 0x38, 0x1a, 0xff, 0xb8,</div><div class='add'>+	0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x09, 0x60, 0x80, 0x39,</div><div class='add'>+	0x18, 0x00, 0x00, 0x00, 0xd2, 0x41, 0x02, 0x8c, 0xe6, 0xa1, 0x97, 0x39,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x01, 0xe8, 0x06, 0x80, 0x84, 0x32,</div><div class='add'>+	0x00, 0x82, 0x00, 0x00, 0xd6, 0x01, 0x00, 0x08, 0x08, 0x80, 0x36, 0x32,</div><div class='add'>+	0x28, 0x00, 0xa1, 0x03, 0x12, 0x01, 0x00, 0x2c, 0x82, 0xcd, 0x2e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x24, 0x08, 0x00, 0x23, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x20, 0x08, 0xc0, 0x23, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x18, 0x08, 0x80, 0x23, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x02, 0x80, 0x01, 0x32,</div><div class='add'>+	0x00, 0xc0, 0xfe, 0x0c, 0x18, 0x01, 0x00, 0x0c, 0xa8, 0xcd, 0x3e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x38, 0x02, 0x80, 0x81, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x3c, 0x02, 0x00, 0x82, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x30, 0x02, 0x40, 0x82, 0xb2,</div><div class='add'>+	0x00, 0x00, 0xed, 0x0c, 0x12, 0x01, 0x00, 0x34, 0x02, 0x00, 0x86, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x02, 0x80, 0x02, 0x40, 0x68, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x48, 0x08, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x02, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x40, 0x80, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x07, 0x00, 0x80, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x07, 0x40, 0x82, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x07, 0x00, 0x86, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x50, 0xf2, 0xc1, 0x38, 0xb4,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xd6, 0x01, 0x00, 0xd8, 0x02, 0x80, 0x01, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x07, 0x80, 0x81, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x07, 0x00, 0x82, 0x32,</div><div class='add'>+	0x10, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x17, 0xe0, 0x2c, 0x39,</div><div class='add'>+	0x00, 0x00, 0x0d, 0x0d, 0x80, 0x00, 0x00, 0x80, 0x32, 0x80, 0x87, 0xb6,</div><div class='add'>+	0x00, 0x10, 0x00, 0x80, 0x00, 0x38, 0x00, 0x00, 0x07, 0x00, 0x37, 0x32,</div><div class='add'>+	0x00, 0x00, 0x0e, 0x0d, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x10, 0x00, 0x88, 0x00, 0x38, 0x00, 0x00, 0x07, 0x00, 0x37, 0x32,</div><div class='add'>+	0x18, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0xf9,</div><div class='add'>+	0x05, 0x00, 0x73, 0x11, 0x00, 0x00, 0x00, 0x14, 0x09, 0xa0, 0xfe, 0xd8,</div><div class='add'>+	0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x68, 0x02, 0xa0, 0xfe, 0x38,</div><div class='add'>+	0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x09, 0xa0, 0xfe, 0x38,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x02, 0x01, 0x00, 0x80, 0x82, 0xba, 0x97, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x06, 0x01, 0x00, 0x80, 0x92, 0xba, 0x97, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0xe8, 0x01, 0x00, 0x34,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x48, 0x02, 0xc0, 0x80, 0xb2,</div><div class='add'>+	0x18, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0xf9,</div><div class='add'>+	0x00, 0x00, 0xa3, 0x0e, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xf0,</div><div class='add'>+	0x00, 0x00, 0xeb, 0x0c, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x22, 0x0d, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xa3, 0x0e, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xf0,</div><div class='add'>+	0x05, 0x00, 0x1d, 0x0d, 0x00, 0x00, 0x00, 0x68, 0x02, 0xa0, 0xfe, 0x98,</div><div class='add'>+	0x00, 0x00, 0x22, 0x0d, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x05, 0x00, 0x73, 0x11, 0x00, 0x00, 0x00, 0x14, 0x09, 0xa0, 0xfe, 0xd8,</div><div class='add'>+	0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x09, 0xa0, 0xfe, 0x38,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x02, 0x01, 0x00, 0x80, 0x82, 0xba, 0x97, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x06, 0x01, 0x00, 0x80, 0x92, 0xba, 0x97, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x1a, 0x0d, 0x00, 0x40, 0x02, 0x80, 0x02, 0x40, 0x68, 0x92,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xca, 0x01, 0x00, 0xd8, 0x02, 0x00, 0x00, 0x32,</div><div class='add'>+	0x4c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0xa9, 0x00, 0x2d, 0x37,</div><div class='add'>+	0xb4, 0xcc, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x87, 0x8d, 0x97, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x99, 0xc0, 0x2c, 0x37,</div><div class='add'>+	0xb4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x89, 0x8d, 0x97, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x02, 0x10, 0x00, 0x00, 0x87, 0xbf, 0x97, 0xba,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x07, 0x40, 0xfe, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x48, 0xf2, 0xc1, 0x38, 0xb4,</div><div class='add'>+	0x00, 0x00, 0x2b, 0x0d, 0xb6, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x00, 0x20, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x64, 0xa2, 0xcd, 0x2c, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xa6, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x30,</div><div class='add'>+	0x00, 0x00, 0x30, 0x0d, 0x80, 0x01, 0x00, 0x80, 0xa2, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x18, 0x00, 0x36, 0x00, 0xca, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0xf9,</div><div class='add'>+	0x00, 0x00, 0xa2, 0x07, 0x00, 0x54, 0x01, 0xb0, 0x02, 0xc0, 0x6e, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x01, 0x00, 0x80, 0x62, 0x81, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x01, 0x00, 0x80, 0x82, 0x81, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x1f, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x54, 0x01, 0xb0, 0x02, 0xc0, 0x6e, 0x32,</div><div class='add'>+	0x00, 0x00, 0x39, 0x0d, 0x12, 0x01, 0x00, 0x60, 0x08, 0x40, 0x23, 0xb2,</div><div class='add'>+	0x00, 0x82, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x80, 0x36, 0x32,</div><div class='add'>+	0x28, 0x00, 0xa1, 0x03, 0x12, 0x01, 0x00, 0x2c, 0x82, 0xcd, 0x2e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x24, 0x08, 0x00, 0x23, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x20, 0x08, 0xc0, 0x23, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x18, 0x08, 0x80, 0x23, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x02, 0x80, 0x01, 0x32,</div><div class='add'>+	0x00, 0xc0, 0x43, 0x0d, 0x18, 0x01, 0x00, 0x0c, 0xa8, 0xcd, 0x3e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x38, 0x02, 0x80, 0x81, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x3c, 0x02, 0x00, 0x82, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x30, 0x02, 0x40, 0x82, 0xb2,</div><div class='add'>+	0x00, 0x00, 0xed, 0x0c, 0x12, 0x01, 0x00, 0x34, 0x02, 0x00, 0x86, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xa3, 0x0e, 0x00, 0x00, 0x00, 0x48, 0x08, 0x00, 0x00, 0xf2,</div><div class='add'>+	0x00, 0x00, 0x46, 0x0d, 0x00, 0x40, 0x02, 0x80, 0x02, 0x40, 0x68, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x00, 0x0d, 0x00, 0x50, 0x01, 0x00, 0xa8, 0x1b, 0x80, 0x9a,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x1f, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x54, 0x01, 0xb0, 0x02, 0xc0, 0x6e, 0x32,</div><div class='add'>+	0x00, 0x00, 0x58, 0x10, 0x00, 0x00, 0x00, 0x28, 0x09, 0x80, 0x02, 0xf2,</div><div class='add'>+	0x00, 0x00, 0x2b, 0x0d, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x58, 0x10, 0x00, 0x00, 0x00, 0x28, 0x09, 0x00, 0x02, 0xf2,</div><div class='add'>+	0x00, 0x00, 0x4f, 0x0d, 0x9a, 0x01, 0x00, 0xf8, 0x62, 0x81, 0x2f, 0xb4,</div><div class='add'>+	0x10, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xa2, 0x8d, 0x2f, 0x31,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0xd6, 0x01, 0xec, 0x06, 0xc0, 0x6e, 0x34,</div><div class='add'>+	0x2d, 0x00, 0xa2, 0x07, 0x12, 0x01, 0x00, 0x2c, 0x82, 0xcd, 0x2e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0xa9, 0x01, 0x80, 0x02, 0x00, 0x6e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x5a, 0x0d, 0x80, 0x01, 0x00, 0x80, 0xf2, 0xc1, 0x85, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x56, 0x0d, 0x1f, 0x40, 0x02, 0x84, 0xe6, 0x01, 0x00, 0xb4,</div><div class='add'>+	0x00, 0x00, 0x5a, 0x0d, 0x1d, 0x01, 0x00, 0xf8, 0x22, 0x81, 0x2f, 0xb4,</div><div class='add'>+	0x00, 0x00, 0x5a, 0x0d, 0x00, 0x00, 0x00, 0xf8, 0x62, 0x81, 0x2f, 0x95,</div><div class='add'>+	0x00, 0x00, 0x58, 0x0d, 0x1d, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x62, 0x81, 0x2f, 0x35,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x02, 0x80, 0x02, 0x40, 0x68, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x1f, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x5c, 0x0d, 0x04, 0x98, 0x01, 0x64, 0x88, 0x1b, 0x87, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x0a, 0x11, 0x00, 0x90, 0x01, 0x08, 0x09, 0x80, 0x6e, 0xf2,</div><div class='add'>+	0x00, 0x00, 0x3f, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xf0,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x09, 0xc5, 0x85, 0x30,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x02, 0x01, 0x00, 0x80, 0x82, 0xba, 0x97, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x06, 0x01, 0x00, 0x80, 0x92, 0xba, 0x97, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x73, 0x11, 0x00, 0x00, 0x00, 0x14, 0x09, 0xc5, 0x85, 0xd0,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x68, 0x02, 0xc5, 0x85, 0xb0,</div><div class='add'>+	0x30, 0x00, 0xa4, 0x07, 0x12, 0x01, 0x00, 0x2c, 0x82, 0xcd, 0x2e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x6c, 0x0d, 0x80, 0x01, 0x00, 0x80, 0xf2, 0xc1, 0x85, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x68, 0x0d, 0x1f, 0x40, 0x02, 0x84, 0xe6, 0x01, 0x00, 0xb4,</div><div class='add'>+	0x00, 0x00, 0x6c, 0x0d, 0x1d, 0x01, 0x00, 0xf8, 0x22, 0x81, 0x2f, 0xb4,</div><div class='add'>+	0x00, 0x00, 0x6c, 0x0d, 0x00, 0x00, 0x00, 0xf8, 0x62, 0x81, 0x2f, 0x95,</div><div class='add'>+	0x00, 0x00, 0x6a, 0x0d, 0x1d, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x62, 0x81, 0x2f, 0x35,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x02, 0x80, 0x02, 0x40, 0x68, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x1f, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0xd4, 0x01, 0xec, 0x16, 0xc0, 0x6e, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x09, 0xc5, 0x85, 0x30,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x02, 0x01, 0x00, 0x80, 0x82, 0xba, 0x97, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x06, 0x01, 0x00, 0x80, 0x92, 0xba, 0x97, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x73, 0x11, 0x00, 0x00, 0x00, 0x14, 0x09, 0xc5, 0x85, 0xd0,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x68, 0x02, 0xc5, 0x85, 0xb0,</div><div class='add'>+	0x00, 0x00, 0xa4, 0x07, 0x04, 0xb0, 0x00, 0x80, 0x02, 0x00, 0x6e, 0xbc,</div><div class='add'>+	0x36, 0x00, 0xa4, 0x07, 0x12, 0x01, 0x00, 0x2c, 0x82, 0xcd, 0x2e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x7d, 0x0d, 0x80, 0x01, 0x00, 0x80, 0xf2, 0xc1, 0x85, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x79, 0x0d, 0x1f, 0x40, 0x02, 0x84, 0xe6, 0x01, 0x00, 0xb4,</div><div class='add'>+	0x00, 0x00, 0x7d, 0x0d, 0x1d, 0x01, 0x00, 0xf8, 0x22, 0x81, 0x2f, 0xb4,</div><div class='add'>+	0x00, 0x00, 0x7d, 0x0d, 0x00, 0x00, 0x00, 0xf8, 0x62, 0x81, 0x2f, 0x95,</div><div class='add'>+	0x00, 0x00, 0x7b, 0x0d, 0x1d, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x62, 0x81, 0x2f, 0x35,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x02, 0x80, 0x02, 0x40, 0x68, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x1f, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x88, 0x0d, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x86, 0x0d, 0x80, 0x01, 0x00, 0x80, 0xf2, 0xc1, 0x85, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x82, 0x0d, 0x1f, 0x40, 0x02, 0x84, 0xe6, 0x01, 0x00, 0xb4,</div><div class='add'>+	0x00, 0x00, 0x86, 0x0d, 0x1d, 0x01, 0x00, 0xf8, 0x22, 0x81, 0x2f, 0xb4,</div><div class='add'>+	0x00, 0x00, 0x86, 0x0d, 0x00, 0x00, 0x00, 0xf8, 0x62, 0x81, 0x2f, 0x95,</div><div class='add'>+	0x00, 0x00, 0x84, 0x0d, 0x1d, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x62, 0x81, 0x2f, 0x35,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x02, 0x80, 0x02, 0x40, 0x68, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x1f, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x30, 0x00, 0x88, 0x0d, 0x12, 0x01, 0x00, 0x2c, 0x82, 0xcd, 0x2e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xd4, 0xd5, 0x01, 0xec, 0x06, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x09, 0xc5, 0x85, 0x30,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x02, 0x01, 0x00, 0x80, 0x82, 0xba, 0x97, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x06, 0x01, 0x00, 0x80, 0x92, 0xba, 0x97, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x73, 0x11, 0x00, 0x00, 0x00, 0x14, 0x09, 0xc5, 0x85, 0xd0,</div><div class='add'>+	0x00, 0x00, 0xa4, 0x07, 0x12, 0x01, 0x00, 0x68, 0x02, 0xc5, 0x85, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xa2, 0x07, 0x80, 0x01, 0x00, 0x80, 0xf2, 0x81, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0xa2, 0x07, 0x80, 0x00, 0x00, 0x80, 0xe2, 0x81, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x93, 0x0d, 0x80, 0x00, 0x00, 0x80, 0x02, 0x81, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x1d, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x58, 0x01, 0x80, 0x02, 0xc0, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0x00, 0xa2, 0x07, 0x08, 0x59, 0x01, 0xec, 0x06, 0xfb, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x02, 0x80, 0x01, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x54, 0x54, 0x01, 0xb0, 0x02, 0xc0, 0x6e, 0x32,</div><div class='add'>+	0x00, 0xc0, 0x9c, 0x0d, 0x18, 0x01, 0x00, 0x0c, 0xa8, 0xcd, 0x3e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x58, 0x01, 0xec, 0x06, 0xfb, 0x6e, 0x3a,</div><div class='add'>+	0x20, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x80, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0x9d, 0x03, 0x12, 0x01, 0x00, 0x2c, 0x72, 0xe0, 0x2e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xc2, 0x10, 0x00, 0x00, 0x00, 0xf8, 0xe2, 0x81, 0x2f, 0xf4,</div><div class='add'>+	0x00, 0x00, 0x9f, 0x0d, 0x06, 0x03, 0x01, 0x80, 0x12, 0xc0, 0x6e, 0xbc,</div><div class='add'>+	0x18, 0x00, 0x9d, 0x05, 0x00, 0x00, 0x00, 0x1c, 0x08, 0x00, 0x36, 0x92,</div><div class='add'>+	0x19, 0x00, 0x9d, 0x05, 0x00, 0x00, 0x00, 0x1c, 0x08, 0x00, 0x36, 0x92,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x01, 0x00, 0x80, 0xf2, 0x81, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x01, 0x00, 0x80, 0xe2, 0x81, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xa2, 0x8d, 0x2f, 0x31,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x02, 0x80, 0x01, 0x32,</div><div class='add'>+	0x00, 0x20, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x28, 0x09, 0x00, 0x37, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x28, 0x08, 0x00, 0x6e, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x45, 0x30, 0x00, 0xe0, 0x06, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0xc7, 0x10, 0x00, 0x00, 0x00, 0x08, 0xe8, 0x01, 0x00, 0xf4,</div><div class='add'>+	0x00, 0x00, 0xad, 0x0d, 0x04, 0x02, 0x01, 0xec, 0x16, 0xc0, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xc9, 0x01, 0x00, 0x14, 0x18, 0x40, 0x81, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x02, 0x80, 0x2f, 0x34,</div><div class='add'>+	0x00, 0xc0, 0xad, 0x0d, 0x12, 0x01, 0x00, 0x40, 0xa2, 0x8d, 0x39, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x18, 0x00, 0x36, 0x00, 0xca, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0xf9,</div><div class='add'>+	0x00, 0x00, 0xad, 0x0d, 0x9f, 0x01, 0x00, 0x14, 0x18, 0x40, 0x81, 0xbc,</div><div class='add'>+	0x00, 0x00, 0xb2, 0x0d, 0x3d, 0x01, 0x00, 0xb0, 0x02, 0x00, 0x85, 0xb2,</div><div class='add'>+	0x00, 0x00, 0xb2, 0x0d, 0x34, 0x00, 0x00, 0xf8, 0xd2, 0x81, 0x2f, 0xb5,</div><div class='add'>+	0x34, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x2c, 0x82, 0xcd, 0x2e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0xa4, 0x07, 0x80, 0x01, 0x00, 0x80, 0x92, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x2a, 0x00, 0xa4, 0x07, 0x12, 0x01, 0x00, 0x2c, 0x82, 0xcd, 0x2e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x00, 0x00, 0x80, 0x72, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x54, 0x54, 0x01, 0xb0, 0x02, 0xc0, 0x6e, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x02, 0x80, 0x01, 0x32,</div><div class='add'>+	0x00, 0xc0, 0xbc, 0x0d, 0x18, 0x01, 0x00, 0x0c, 0xa8, 0xcd, 0x3e, 0xb2,</div><div class='add'>+	0x20, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x80, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0x9d, 0x03, 0x12, 0x01, 0x00, 0x2c, 0x72, 0xe0, 0x2e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x20, 0x00, 0x80, 0xdf, 0x00, 0x00, 0x28, 0x09, 0x00, 0x37, 0x32,</div><div class='add'>+	0x18, 0x00, 0x00, 0x00, 0x00, 0x48, 0x01, 0x38, 0x88, 0x1b, 0x16, 0x38,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xde, 0x48, 0x01, 0x28, 0x88, 0x04, 0x6e, 0x30,</div><div class='add'>+	0x00, 0x00, 0xc1, 0x0d, 0x80, 0x5f, 0x01, 0x80, 0x72, 0xc0, 0x6e, 0xb6,</div><div class='add'>+	0x00, 0x00, 0xc3, 0x0d, 0x00, 0x00, 0x00, 0xf8, 0xe2, 0x80, 0x2f, 0x94,</div><div class='add'>+	0x00, 0x00, 0xc3, 0x0d, 0x80, 0x5f, 0x01, 0x80, 0x62, 0xc0, 0x6e, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0xa9, 0x81, 0x92, 0x34,</div><div class='add'>+	0x00, 0x00, 0xcb, 0x10, 0x00, 0x00, 0x00, 0x08, 0xe8, 0x01, 0x00, 0xf4,</div><div class='add'>+	0x00, 0x00, 0xc6, 0x0d, 0x12, 0x01, 0x00, 0x48, 0x02, 0xc0, 0x80, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xc9, 0x0d, 0x80, 0x01, 0x00, 0x80, 0xd2, 0x81, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0xc9, 0x0d, 0x34, 0x00, 0x00, 0xf8, 0xd2, 0x81, 0x2f, 0xb5,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xb2, 0x80, 0x2f, 0x34,</div><div class='add'>+	0x00, 0x00, 0xa4, 0x07, 0x04, 0x30, 0x00, 0x80, 0x02, 0x00, 0x6e, 0xbc,</div><div class='add'>+	0x2a, 0x00, 0xa4, 0x07, 0x12, 0x01, 0x00, 0x2c, 0x82, 0xcd, 0x2e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x1f, 0x01, 0x00, 0xd8, 0x02, 0x80, 0x01, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x54, 0x01, 0xb0, 0x02, 0xc0, 0x6e, 0x32,</div><div class='add'>+	0x00, 0xc0, 0xd2, 0x0d, 0x18, 0x01, 0x00, 0x0c, 0xa8, 0xcd, 0x3e, 0xb2,</div><div class='add'>+	0x00, 0x82, 0x00, 0x00, 0xd6, 0x01, 0x00, 0x08, 0x08, 0x80, 0x36, 0x32,</div><div class='add'>+	0x1d, 0x00, 0xa1, 0x03, 0x12, 0x01, 0x00, 0x2c, 0x82, 0xcd, 0x2e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xc2, 0x10, 0x00, 0x00, 0x00, 0xd8, 0x02, 0x40, 0x00, 0xf2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x02, 0x80, 0x01, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x56, 0x01, 0x78, 0x09, 0xc0, 0x6e, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x07, 0xc0, 0x2c, 0x32,</div><div class='add'>+	0x00, 0x10, 0x00, 0xa0, 0x00, 0x38, 0x00, 0x00, 0x07, 0x00, 0x37, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x07, 0x00, 0xee, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x0c, 0x07, 0x80, 0x97, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x48, 0x02, 0xc0, 0x80, 0xb2,</div><div class='add'>+	0x00, 0xf0, 0xe1, 0x0d, 0x1d, 0x40, 0x02, 0x00, 0xa8, 0x0d, 0x68, 0xb1,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x0b, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x1e, 0x40, 0x02, 0x84, 0x06, 0x00, 0x00, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x73, 0x11, 0x00, 0x00, 0x00, 0x14, 0x09, 0x05, 0x80, 0xd0,</div><div class='add'>+	0x00, 0x00, 0xde, 0x0d, 0xb6, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x00, 0xc0, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x64, 0xa2, 0x0d, 0x80, 0xb2,</div><div class='add'>+	0x00, 0x00, 0xda, 0x0d, 0xa6, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xe1, 0x0d, 0xb5, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xa5, 0x00, 0x80, 0xa0, 0x36, 0x0b, 0x6a, 0x35,</div><div class='add'>+	0x00, 0x00, 0xe6, 0x0d, 0x12, 0x01, 0x00, 0x00, 0x09, 0xc0, 0x21, 0xb2,</div><div class='add'>+	0x18, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0xf9,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x54, 0x01, 0xb0, 0x02, 0xc0, 0x6e, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x02, 0x80, 0x80, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0xe9, 0x01, 0x00, 0x34,</div><div class='add'>+	0x00, 0x00, 0xef, 0x0f, 0x00, 0x00, 0x00, 0xd8, 0x02, 0x00, 0x00, 0xd2,</div><div class='add'>+	0x00, 0x00, 0xeb, 0x0d, 0x04, 0x00, 0x00, 0x80, 0x02, 0x80, 0x92, 0xbc,</div><div class='add'>+	0x18, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0xf9,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x39, 0x0b, 0x2e, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0xf3, 0x81, 0x97, 0x34,</div><div class='add'>+	0x00, 0x00, 0xf1, 0x0d, 0x04, 0x00, 0x00, 0x78, 0xd9, 0x01, 0x30, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x32, 0x80, 0x97, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb9, 0x05, 0x30, 0x30,</div><div class='add'>+	0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x03, 0xa4, 0x03, 0x39,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x34, 0x33, 0x0b, 0x2f, 0x32,</div><div class='add'>+	0x00, 0x00, 0xa4, 0x03, 0x04, 0x00, 0x00, 0x78, 0xd9, 0x01, 0x30, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x32, 0x80, 0x97, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0xb9, 0x05, 0x30, 0x30,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x02, 0x00, 0x00, 0x32,</div><div class='add'>+	0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x8a, 0x02, 0x39,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9c, 0x02, 0x80, 0x97, 0x32,</div><div class='add'>+	0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x09, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0xe2, 0x10, 0x00, 0x00, 0x00, 0x14, 0x09, 0xc0, 0x29, 0xd2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0xff, 0x0d, 0x04, 0x00, 0x00, 0x80, 0x02, 0x40, 0x2f, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x09, 0x00, 0x2c, 0x32,</div><div class='add'>+	0xd9, 0x02, 0x8a, 0x11, 0x04, 0x00, 0x00, 0x80, 0x82, 0x8d, 0x97, 0xbc,</div><div class='add'>+	0x46, 0x03, 0x8a, 0x11, 0x04, 0x00, 0x00, 0x80, 0x82, 0x8d, 0x97, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x00, 0x00, 0x80, 0xa2, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0xf1, 0x0d, 0x00, 0x00, 0x00, 0xf4, 0x02, 0x00, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x18, 0x0e, 0x02, 0x00, 0x00, 0x80, 0xa2, 0x42, 0x80, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x18, 0x0e, 0x80, 0x00, 0x00, 0x80, 0xf2, 0xc1, 0x85, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x18, 0x0e, 0x1f, 0x40, 0x02, 0x08, 0xb9, 0xbf, 0x68, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x08, 0x0e, 0x80, 0x41, 0x02, 0x80, 0xe2, 0x81, 0x68, 0xb6,</div><div class='add'>+	0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x79, 0x61, 0x80, 0x39,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xd2, 0x21, 0x01, 0xe0, 0x16, 0x20, 0x6e, 0x3a,</div><div class='add'>+	0x18, 0x00, 0x00, 0x00, 0x00, 0x41, 0x02, 0x88, 0xe6, 0x21, 0x91, 0x79,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x19, 0xa0, 0x90, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x18, 0x0e, 0x06, 0x01, 0x00, 0x80, 0xd2, 0xff, 0x90, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x0c, 0x0e, 0x2c, 0x41, 0x02, 0x78, 0xf9, 0x81, 0x68, 0xb4,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0xb9, 0x81, 0x97, 0x34,</div><div class='add'>+	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x09, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0xe2, 0x10, 0x00, 0x00, 0x00, 0x14, 0x59, 0xc0, 0x85, 0xd7,</div><div class='add'>+	0x03, 0x00, 0x00, 0x00, 0x00, 0x40, 0x02, 0x00, 0x29, 0x1a, 0xff, 0x38,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x02, 0x00, 0xb9, 0x1b, 0x90, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xd2, 0x41, 0x02, 0x88, 0x16, 0xa0, 0x97, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x45, 0x00, 0x00, 0xd8, 0x02, 0x40, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x01, 0xe0, 0x16, 0x20, 0x6e, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x40, 0x80, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x27, 0x24, 0x90, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x07, 0x00, 0x8a, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x12, 0x01, 0x00, 0x58, 0xf2, 0xc1, 0x38, 0x74,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x08, 0x00, 0x23, 0x0e, 0x1e, 0x01, 0x00, 0x34, 0x79, 0x61, 0x80, 0xb9,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x38, 0x00, 0x00, 0x54, 0x1f, 0x40, 0xf5, 0xba,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x1f, 0x40, 0x02, 0x00, 0x09, 0x40, 0x68, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0xb9, 0x3f, 0x90, 0x30,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x01, 0xe0, 0x26, 0x24, 0x6e, 0x3a,</div><div class='add'>+	0x08, 0x00, 0x8a, 0x11, 0x1e, 0x00, 0x00, 0x00, 0x09, 0xa4, 0xfe, 0xb8,</div><div class='add'>+	0x00, 0x00, 0x73, 0x11, 0x00, 0x00, 0x00, 0x14, 0x09, 0x05, 0x90, 0xd0,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x68, 0x02, 0x05, 0x90, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x09, 0x05, 0x90, 0x30,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x02, 0x01, 0x00, 0x80, 0x82, 0xba, 0x97, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x06, 0x01, 0x00, 0x80, 0x92, 0xba, 0x97, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xd2, 0x21, 0x01, 0xe0, 0x16, 0x20, 0x6e, 0x3a,</div><div class='add'>+	0x18, 0x00, 0x00, 0x00, 0x1e, 0x41, 0x02, 0x84, 0xe6, 0x61, 0x93, 0x79,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x04, 0x20, 0x01, 0x80, 0x82, 0xdb, 0x90, 0x7c,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x20, 0x01, 0x80, 0x02, 0x00, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x1f, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x02, 0x0c, 0x02, 0x80, 0xa2, 0xdb, 0x90, 0x7c,</div><div class='add'>+	0x00, 0x00, 0x2d, 0x0e, 0x06, 0x21, 0x01, 0x80, 0x82, 0x1b, 0x90, 0xbc,</div><div class='add'>+	0x26, 0x00, 0x2e, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x36, 0x92,</div><div class='add'>+	0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, 0x12, 0x00, 0x2c, 0x3a,</div><div class='add'>+	0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x09, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0xe2, 0x10, 0x00, 0x00, 0x00, 0x14, 0x09, 0x00, 0x92, 0xd2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x00, 0x00, 0x80, 0x02, 0x00, 0x92, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x2f, 0xa0, 0x01, 0x78, 0x89, 0x1b, 0x92, 0x7a,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x88, 0x01, 0x78, 0x89, 0x9b, 0x97, 0x3c,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x02, 0x00, 0xf9, 0xba, 0x6e, 0x37,</div><div class='add'>+	0x00, 0x00, 0x39, 0x0e, 0x02, 0x00, 0x00, 0x80, 0x02, 0xa4, 0x97, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x39, 0x0e, 0x02, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x89, 0x8d, 0x97, 0x37,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x02, 0x01, 0x02, 0x80, 0x82, 0x9b, 0x97, 0x7c,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0xf8, 0xf2, 0x80, 0x2f, 0x74,</div><div class='add'>+	0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xda, 0x5b, 0x01, 0xec, 0x06, 0x40, 0xed, 0x32,</div><div class='add'>+	0x2d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x09, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0xe2, 0x10, 0x00, 0x00, 0x00, 0x14, 0x09, 0x40, 0x89, 0xd2,</div><div class='add'>+	0x00, 0x00, 0x42, 0x0e, 0x08, 0x5d, 0x01, 0xec, 0x16, 0x40, 0x89, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x42, 0x0e, 0x0b, 0x5d, 0x01, 0xec, 0x06, 0x00, 0x00, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x42, 0x0e, 0x80, 0x00, 0x00, 0x80, 0x42, 0x81, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xb2, 0x80, 0x2f, 0x34,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x30,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x98, 0x01, 0x78, 0x89, 0x1b, 0x87, 0x3c,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x92, 0xa1, 0x97, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x47, 0x0e, 0x04, 0x00, 0x00, 0x80, 0x02, 0x40, 0x86, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x0a, 0x11, 0x00, 0x90, 0x01, 0x08, 0x09, 0x00, 0x6e, 0xf2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x01, 0xe0, 0x16, 0x20, 0x6e, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x3f, 0x11, 0x33, 0x01, 0x00, 0xf8, 0x82, 0x80, 0x2f, 0xb4,</div><div class='add'>+	0x00, 0x00, 0x3f, 0x11, 0x9f, 0xf0, 0x01, 0x80, 0x82, 0xdb, 0x87, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x3f, 0x11, 0x9f, 0xf8, 0x01, 0x80, 0x22, 0x21, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0xe8, 0x01, 0xe0, 0x06, 0x00, 0xee, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x01, 0xe0, 0x06, 0xc0, 0x87, 0x32,</div><div class='add'>+	0x00, 0x00, 0x3f, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x08, 0x00, 0x00, 0x80, 0x02, 0x80, 0x91, 0xbc,</div><div class='add'>+	0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x09, 0x00, 0x36, 0x32,</div><div class='add'>+	0x10, 0x00, 0xe2, 0x10, 0x00, 0x50, 0x01, 0x14, 0xa9, 0x9b, 0x91, 0xd9,</div><div class='add'>+	0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x09, 0x00, 0x36, 0x32,</div><div class='add'>+	0x10, 0x00, 0x00, 0x00, 0x00, 0x20, 0x01, 0x14, 0x89, 0x0d, 0x6e, 0x37,</div><div class='add'>+	0x00, 0x00, 0xe2, 0x10, 0x00, 0x30, 0x01, 0x14, 0x89, 0x5b, 0x91, 0xd2,</div><div class='add'>+	0x1a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x09, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0xe2, 0x10, 0x00, 0x00, 0x00, 0x14, 0x09, 0xc0, 0x2d, 0xd2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x06, 0x21, 0x01, 0x80, 0x82, 0x9b, 0x91, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0xa8, 0x01, 0x78, 0x09, 0x00, 0x6e, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x06, 0x01, 0x02, 0x80, 0x82, 0x9b, 0x97, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x71, 0x0e, 0x04, 0x21, 0x01, 0x30, 0x69, 0x24, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x01, 0x00, 0xa9, 0x9b, 0x91, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x66, 0x0e, 0x1f, 0x40, 0x02, 0x24, 0x09, 0x40, 0x68, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x5c, 0x0e, 0x80, 0x00, 0x00, 0x80, 0xe2, 0x41, 0x92, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0xb9, 0x7f, 0x92, 0x30,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x29, 0x24, 0x90, 0x3c,</div><div class='add'>+	0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x99, 0xa4, 0xfe, 0x38,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x02, 0x01, 0x00, 0x80, 0x82, 0xba, 0x97, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x06, 0x01, 0x00, 0x80, 0x92, 0xba, 0x97, 0xbc,</div><div class='add'>+	0x08, 0x00, 0x73, 0x11, 0x00, 0x00, 0x00, 0x14, 0x99, 0xa4, 0xfe, 0xd8,</div><div class='add'>+	0x08, 0x00, 0x5c, 0x0e, 0x12, 0x01, 0x00, 0x68, 0x92, 0xa4, 0xfe, 0xb8,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x02, 0x00, 0x90, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x6b, 0x0e, 0x38, 0x50, 0x01, 0x78, 0x09, 0x80, 0x6e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x6b, 0x0e, 0x04, 0x28, 0x01, 0x80, 0x02, 0x00, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x9f, 0x28, 0x01, 0x78, 0xe9, 0x25, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x08, 0x01, 0x00, 0x78, 0x69, 0xa4, 0x97, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0xa8, 0x01, 0xe0, 0x66, 0x24, 0x6e, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x6e, 0x0e, 0x38, 0x20, 0x01, 0xe0, 0x06, 0x00, 0x93, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x6f, 0x0e, 0x00, 0x28, 0x01, 0xe0, 0x06, 0x00, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x01, 0xe0, 0x06, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x01, 0xe8, 0x06, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0x70,</div><div class='add'>+	0x00, 0x00, 0x77, 0x0e, 0x38, 0x51, 0x01, 0x00, 0xa9, 0x9b, 0x91, 0xba,</div><div class='add'>+	0x00, 0x00, 0x75, 0x0e, 0x04, 0x41, 0x02, 0x08, 0xb9, 0xff, 0x68, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x41, 0x02, 0x80, 0xe2, 0xc1, 0x68, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x72, 0x0e, 0x00, 0x40, 0x02, 0x80, 0x02, 0x40, 0x68, 0x92,</div><div class='add'>+	0x00, 0x00, 0x84, 0x0e, 0x9f, 0x31, 0x01, 0xe0, 0x66, 0x24, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x84, 0x0e, 0x00, 0x30, 0x01, 0xe0, 0x06, 0x00, 0x00, 0x92,</div><div class='add'>+	0x00, 0x00, 0x81, 0x0e, 0x04, 0x28, 0x01, 0x04, 0x09, 0x00, 0x6e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x06, 0x50, 0x01, 0x80, 0xa2, 0x5b, 0x90, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x7f, 0x0e, 0x9f, 0x01, 0x00, 0x00, 0x19, 0x24, 0x90, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0xa8, 0x01, 0xe0, 0x66, 0x24, 0x6e, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x01, 0xe0, 0x06, 0x24, 0x00, 0x3c,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x01, 0xe8, 0x06, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x01, 0xe0, 0x06, 0x00, 0x93, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0x70,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x01, 0xe0, 0x06, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8e, 0x0e, 0x04, 0x00, 0x00, 0x80, 0x02, 0x00, 0x90, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x84, 0x0e, 0x04, 0x41, 0x02, 0x08, 0xb9, 0xff, 0x68, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x41, 0x02, 0x80, 0xe2, 0xc1, 0x68, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x81, 0x0e, 0x00, 0x40, 0x02, 0x80, 0x02, 0x40, 0x68, 0x92,</div><div class='add'>+	0x00, 0x00, 0x88, 0x0e, 0x02, 0x00, 0x00, 0x80, 0x22, 0x24, 0x90, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8e, 0x0e, 0x80, 0x40, 0x02, 0x80, 0xf2, 0xc1, 0x68, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x02, 0x8c, 0xb6, 0xc1, 0x68, 0x35,</div><div class='add'>+	0x00, 0x00, 0x8e, 0x0e, 0x00, 0x00, 0x00, 0xf8, 0x22, 0x81, 0x2f, 0x94,</div><div class='add'>+	0x08, 0x00, 0x00, 0x00, 0x00, 0x40, 0x02, 0x78, 0x39, 0x9a, 0xfe, 0x38,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x02, 0x01, 0x00, 0x80, 0x82, 0xba, 0x97, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x06, 0x01, 0x00, 0x80, 0x92, 0xba, 0x97, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x73, 0x11, 0x00, 0x00, 0x00, 0x14, 0x09, 0x80, 0x97, 0xd2,</div><div class='add'>+	0x08, 0x00, 0x8a, 0x11, 0x12, 0x40, 0x02, 0x68, 0x12, 0x9a, 0xfe, 0xb8,</div><div class='add'>+	0x00, 0x00, 0x81, 0x0e, 0x04, 0x01, 0x00, 0x00, 0x29, 0x24, 0x90, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x09, 0x00, 0x00, 0x32,</div><div class='add'>+	0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x79, 0x0b, 0x16, 0x38,</div><div class='add'>+	0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x79, 0x0b, 0x16, 0x38,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x00, 0x00, 0x80, 0x42, 0xe4, 0x90, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0xa9, 0x00, 0x2d, 0x37,</div><div class='add'>+	0x00, 0xcc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x89, 0x4d, 0x90, 0x3a,</div><div class='add'>+	0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa8, 0x82, 0x0d, 0x91, 0x37,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa8, 0x12, 0xa4, 0x2a, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x99, 0x0e, 0x80, 0x40, 0x02, 0x80, 0xe2, 0x01, 0x7c, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x40, 0x02, 0x78, 0xb9, 0x3f, 0x7c, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0xe9, 0xa5, 0x90, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x9b, 0x0e, 0x9f, 0x01, 0x00, 0x10, 0x19, 0x00, 0x91, 0xbc,</div><div class='add'>+	0xb7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x09, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0x94, 0x0e, 0x04, 0x01, 0x00, 0x80, 0x42, 0xe4, 0x90, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0xc9, 0x24, 0x90, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x22, 0xa4, 0x97, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0xa8, 0x01, 0xe0, 0x66, 0x24, 0x6e, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x01, 0xe8, 0x06, 0x00, 0x90, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x01, 0xe0, 0x06, 0x00, 0x93, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0x70,</div><div class='add'>+	0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x18, 0x00, 0xa5, 0x0e, 0x1f, 0x41, 0x02, 0x78, 0x88, 0xcd, 0x68, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, 0x12, 0x00, 0x2c, 0x3a,</div><div class='add'>+	0x00, 0x00, 0xa8, 0x0e, 0x80, 0x01, 0x00, 0x80, 0x62, 0x80, 0x87, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x41, 0x02, 0x80, 0xb2, 0xff, 0x68, 0xb0,</div><div class='add'>+	0x00, 0x00, 0xa3, 0x0e, 0x00, 0x40, 0x02, 0x80, 0x02, 0x40, 0x68, 0x92,</div><div class='add'>+	0x03, 0x00, 0x8a, 0x11, 0x04, 0x40, 0x02, 0x00, 0x38, 0x1a, 0xff, 0xb8,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x1f, 0x40, 0x02, 0x04, 0xb8, 0xff, 0x68, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x02, 0x00, 0xb8, 0x1b, 0x80, 0x3a,</div><div class='add'>+	0x2e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x09, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0xe2, 0x10, 0x00, 0x00, 0x00, 0x14, 0x09, 0x00, 0x80, 0xd2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0x70,</div><div class='add'>+	0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xb6, 0x0e, 0x80, 0x01, 0x00, 0x80, 0xa2, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0xb3, 0x0e, 0x12, 0x01, 0x00, 0x00, 0x09, 0xc0, 0x21, 0xb2,</div><div class='add'>+	0x18, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0xf9,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x02, 0x40, 0x84, 0x32,</div><div class='add'>+	0x1d, 0x00, 0xb6, 0x0e, 0x04, 0x01, 0x00, 0x80, 0x02, 0xa4, 0x17, 0xb8,</div><div class='add'>+	0x00, 0x00, 0xb0, 0x0e, 0x9f, 0x01, 0x00, 0x80, 0x18, 0x00, 0x88, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x6c, 0x08, 0x00, 0x6e, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xca, 0x68, 0x00, 0x4c, 0x08, 0x00, 0x6e, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x70, 0x00, 0x18, 0x08, 0x00, 0x6e, 0xb2,</div><div class='add'>+	0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x09, 0x00, 0x36, 0x32,</div><div class='add'>+	0x10, 0x00, 0xe2, 0x10, 0x00, 0x00, 0x00, 0x14, 0xa9, 0x60, 0x81, 0xd9,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x80, 0xa2, 0xa0, 0x81, 0x7c,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x0d, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x00, 0x00, 0xc1, 0x0e, 0x80, 0x01, 0x00, 0x80, 0xe2, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x00, 0x00, 0x80, 0x82, 0x81, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0xc1, 0x0e, 0x1b, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x80, 0x62, 0xe0, 0x83, 0x7c,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x9f, 0x00, 0x00, 0x14, 0x18, 0x40, 0x81, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xca, 0x01, 0x00, 0xf8, 0x02, 0x80, 0x2f, 0x35,</div><div class='add'>+	0x00, 0xa0, 0x00, 0x00, 0x12, 0x01, 0x00, 0x40, 0xa2, 0x8d, 0x39, 0x72,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x01, 0xe4, 0x06, 0xc0, 0x2d, 0x32,</div><div class='add'>+	0xee, 0xff, 0x00, 0x00, 0x00, 0x10, 0x01, 0xe0, 0x86, 0x8d, 0x2f, 0x31,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0xb3, 0xe4, 0x39, 0x32,</div><div class='add'>+	0x00, 0x00, 0xcd, 0x0e, 0x04, 0x00, 0x00, 0x78, 0xd9, 0x01, 0x30, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x32, 0x80, 0x97, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0xb9, 0x05, 0x30, 0x30,</div><div class='add'>+	0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xe3, 0xa5, 0x03, 0x39,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x34, 0x33, 0x0b, 0x2f, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x78, 0xd9, 0x01, 0x30, 0x76,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x32, 0x80, 0x97, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0xb9, 0x05, 0x30, 0x30,</div><div class='add'>+	0x18, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0xf8, 0xe3, 0xa5, 0x03, 0x79,</div><div class='add'>+	0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x02, 0x00, 0x2d, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x02, 0x80, 0x2d, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xcc, 0x02, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0xd8, 0x0e, 0x20, 0x00, 0x01, 0x2c, 0x09, 0xc0, 0x6e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0xd9, 0x0e, 0x00, 0x16, 0x86, 0xcc, 0x06, 0xc0, 0x92, 0x92,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x86, 0xcc, 0x06, 0xc0, 0x92, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x12, 0x01, 0x00, 0x40, 0x62, 0x8e, 0x92, 0x52,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xdf, 0x0e, 0x04, 0x00, 0x00, 0x78, 0xd9, 0x01, 0x30, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x42, 0x80, 0x97, 0xbc,</div><div class='add'>+	0xdf, 0x0e, 0x36, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x02, 0x00, 0x36, 0x92,</div><div class='add'>+	0x60, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x82, 0x8d, 0x2f, 0xb1,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x03, 0x00, 0x38, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x02, 0x00, 0x30, 0x32,</div><div class='add'>+	0x00, 0x00, 0x22, 0x0f, 0x04, 0x00, 0x00, 0x24, 0xd8, 0x01, 0x30, 0xb6,</div><div class='add'>+	0xe4, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, 0x82, 0x4d, 0x82, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0xdf, 0x0e, 0x36, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x02, 0x00, 0x36, 0x92,</div><div class='add'>+	0x00, 0x00, 0x0f, 0x0f, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xec, 0x0e, 0x00, 0x00, 0x00, 0x20, 0x48, 0x05, 0x30, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xf7, 0x0e, 0x32, 0x0f, 0x01, 0xbc, 0x08, 0xc0, 0x6e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x01, 0xdc, 0x02, 0x40, 0x6e, 0x32,</div><div class='add'>+	0x00, 0x00, 0xf0, 0x0e, 0x1f, 0x01, 0x00, 0xd8, 0x02, 0x00, 0x00, 0xb2,</div><div class='add'>+	0x00, 0x00, 0xf6, 0x0e, 0x1d, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0xe0, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0xa9, 0x00, 0x2d, 0x37,</div><div class='add'>+	0x20, 0xcd, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x87, 0x8d, 0x97, 0x3a,</div><div class='add'>+	0x0a, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x87, 0xa0, 0xea, 0x39,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x07, 0xc0, 0xea, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x48, 0x02, 0xc0, 0x38, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x01, 0xe0, 0x26, 0x01, 0x6e, 0x35,</div><div class='add'>+	0x00, 0x00, 0xfb, 0x0e, 0x80, 0x00, 0x00, 0x80, 0x02, 0xc0, 0x8b, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x19, 0x0e, 0x82, 0x32,</div><div class='add'>+	0x00, 0xe0, 0x03, 0x0f, 0x12, 0x01, 0x00, 0x48, 0xa2, 0x0d, 0x90, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x02, 0x40, 0x00, 0x32,</div><div class='add'>+	0xb4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0xa9, 0x00, 0x2d, 0x37,</div><div class='add'>+	0x00, 0xcc, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x87, 0x8d, 0x97, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x99, 0x00, 0x82, 0x37,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x02, 0x10, 0x00, 0x00, 0x87, 0xbf, 0x97, 0xba,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x07, 0x40, 0xfe, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x48, 0xf2, 0xc1, 0x38, 0xb4,</div><div class='add'>+	0x18, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0xf9,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x89, 0x60, 0x38, 0x32,</div><div class='add'>+	0x1d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x09, 0xa4, 0x17, 0x38,</div><div class='add'>+	0x00, 0x00, 0x09, 0x0f, 0x80, 0x00, 0x00, 0x80, 0x02, 0xc0, 0x8b, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x0a, 0x0f, 0x04, 0x00, 0x00, 0x80, 0x32, 0x80, 0x97, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x02, 0x80, 0x97, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0xf3, 0x41, 0x90, 0x34,</div><div class='add'>+	0x00, 0x00, 0x0f, 0x0f, 0x04, 0x00, 0x00, 0x78, 0xd9, 0x01, 0x30, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x32, 0x80, 0x97, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb9, 0x05, 0x30, 0x30,</div><div class='add'>+	0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x03, 0xa4, 0x03, 0x39,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x19, 0xce, 0x2c, 0x32,</div><div class='add'>+	0x00, 0xe0, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x40, 0xa2, 0x0d, 0x90, 0xb2,</div><div class='add'>+	0x18, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0xf9,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x01, 0xdc, 0x02, 0x40, 0x6e, 0x32,</div><div class='add'>+	0x1d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x09, 0xa4, 0x17, 0x38,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x32, 0x80, 0x97, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x10, 0x01, 0x80, 0x22, 0x01, 0x6e, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x18, 0x0f, 0x1f, 0x01, 0x00, 0xd8, 0x02, 0x00, 0x00, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x20, 0x0f, 0x1d, 0x10, 0x01, 0xf8, 0x02, 0x00, 0x6e, 0xb2,</div><div class='add'>+	0xe0, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0xa9, 0x00, 0x2d, 0x37,</div><div class='add'>+	0x20, 0xcd, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x87, 0x8d, 0x97, 0x3a,</div><div class='add'>+	0x0a, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x37, 0x8b, 0xea, 0x39,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x07, 0xc0, 0xea, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x40, 0xf2, 0xc1, 0x38, 0xb4,</div><div class='add'>+	0x18, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0xf9,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x01, 0xf8, 0x02, 0x00, 0x6e, 0x32,</div><div class='add'>+	0xee, 0xff, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x82, 0x8d, 0x2f, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0x70,</div><div class='add'>+	0xee, 0xff, 0x8a, 0x11, 0x04, 0x11, 0x01, 0x80, 0x82, 0x0d, 0x6e, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x01, 0xf8, 0x02, 0x00, 0x6e, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x01, 0xdc, 0x02, 0x40, 0x6e, 0x72,</div><div class='add'>+	0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x32,</div><div class='add'>+	0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x89, 0x4d, 0x0d, 0x36,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x80, 0x0b, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x07, 0x00, 0x90, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x07, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0x2b, 0x0f, 0x12, 0x00, 0x00, 0x4c, 0xf2, 0xc1, 0x38, 0xb4,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x30,</div><div class='add'>+	0x00, 0x00, 0x2c, 0x0f, 0x12, 0x00, 0x00, 0x80, 0x02, 0xc0, 0x21, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe9, 0x02, 0x90, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x28, 0x0f, 0x04, 0x01, 0x00, 0x04, 0x19, 0x40, 0x90, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0x50,</div><div class='add'>+	0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x3b, 0x0f, 0x80, 0x01, 0x00, 0x80, 0xa2, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x35, 0x0f, 0x12, 0x01, 0x00, 0xe8, 0x02, 0xc0, 0x21, 0xb2,</div><div class='add'>+	0x18, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0xf9,</div><div class='add'>+	0x00, 0x00, 0x3a, 0x0f, 0x04, 0x00, 0x00, 0x80, 0x02, 0x80, 0x2d, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x22, 0x80, 0x2d, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x9f, 0x00, 0x00, 0x80, 0x18, 0x00, 0x88, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x35, 0x0f, 0x12, 0x01, 0x00, 0xe8, 0x02, 0xc0, 0x21, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x34, 0x0f, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xca, 0x00, 0x00, 0xd8, 0x02, 0x40, 0x84, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x02, 0x40, 0x2d, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x00, 0x00, 0x80, 0x02, 0x80, 0x2d, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x6c, 0x88, 0x1c, 0x83, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x48, 0x00, 0x4c, 0x08, 0x00, 0x72, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x08, 0x50, 0x00, 0x18, 0xc8, 0x20, 0x72, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x80, 0x02, 0x40, 0x81, 0x7c,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x18, 0x40, 0x81, 0x3c,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x02, 0x00, 0x00, 0x20, 0x88, 0x01, 0x82, 0xba,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x02, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x06, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x02, 0x00, 0x36, 0xbc,</div><div class='add'>+	0x07, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x77, 0x4a, 0x09, 0x39,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x07, 0x00, 0x82, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xca, 0x19, 0x00, 0x00, 0x07, 0x40, 0x82, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x40, 0xf2, 0xc1, 0x38, 0xb4,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0xd8, 0x02, 0x40, 0x84, 0x72,</div><div class='add'>+	0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x4d, 0x00, 0x00, 0x00, 0x67, 0xe0, 0x83, 0x3e,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x07, 0x00, 0x80, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x07, 0xc0, 0x86, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x07, 0xc0, 0x84, 0x32,</div><div class='add'>+	0x00, 0x00, 0xa3, 0x0f, 0x04, 0x00, 0x00, 0x28, 0xd8, 0xa0, 0x82, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x09, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0xd8, 0xa0, 0x81, 0x3c,</div><div class='add'>+	0x00, 0x00, 0x67, 0x0f, 0x04, 0x00, 0x00, 0x3c, 0xd8, 0xe0, 0x83, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x02, 0x80, 0x81, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x58, 0x0f, 0x04, 0x00, 0x00, 0x80, 0x72, 0x80, 0x2d, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x50, 0x02, 0xc0, 0x38, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x60, 0x0f, 0x51, 0x00, 0x00, 0xd8, 0x12, 0x80, 0x2d, 0x9a,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x50, 0xf2, 0xc1, 0x38, 0xb4,</div><div class='add'>+	0x18, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0xf9,</div><div class='add'>+	0x00, 0x00, 0x5e, 0x0f, 0x04, 0x00, 0x00, 0x80, 0x72, 0x80, 0x2d, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x01, 0x00, 0x80, 0xa2, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x59, 0x0f, 0x67, 0x00, 0x00, 0xf8, 0xa2, 0x80, 0x2f, 0xb5,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0xe8, 0x02, 0xc0, 0x21, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x72, 0x80, 0x2d, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x51, 0x00, 0x00, 0xd8, 0x02, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x65, 0x0f, 0x2a, 0x01, 0x00, 0x00, 0xd8, 0x20, 0x80, 0xba,</div><div class='add'>+	0x00, 0x00, 0x64, 0x0f, 0x12, 0x01, 0x00, 0x00, 0x09, 0xc0, 0x21, 0xb2,</div><div class='add'>+	0x18, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0xf9,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x02, 0x40, 0x84, 0x32,</div><div class='add'>+	0x1d, 0x00, 0x8a, 0x11, 0x04, 0x00, 0x00, 0x80, 0x02, 0xa4, 0x17, 0xb8,</div><div class='add'>+	0x00, 0x00, 0xb7, 0x0e, 0x00, 0x60, 0x00, 0x6c, 0x08, 0x00, 0x6e, 0xf2,</div><div class='add'>+	0x00, 0x00, 0x4d, 0x0f, 0x4d, 0x00, 0x00, 0x00, 0x67, 0xe0, 0x83, 0x9e,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x50, 0xf2, 0xc1, 0x38, 0xb4,</div><div class='add'>+	0x18, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0xf9,</div><div class='add'>+	0x1d, 0x00, 0x6e, 0x0f, 0x04, 0x00, 0x00, 0x80, 0x02, 0xa4, 0x17, 0xb8,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x01, 0x00, 0x80, 0xa2, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x68, 0x0f, 0x67, 0x00, 0x00, 0xf8, 0xa2, 0x80, 0x2f, 0xb5,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x00, 0x09, 0xc0, 0x21, 0xb2,</div><div class='add'>+	0x1d, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x02, 0xa4, 0x17, 0xb8,</div><div class='add'>+	0x08, 0x00, 0x00, 0x00, 0x00, 0x40, 0x02, 0x78, 0x39, 0x9a, 0xfe, 0x38,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x02, 0x01, 0x00, 0x80, 0x82, 0xba, 0x97, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x06, 0x01, 0x00, 0x80, 0x92, 0xba, 0x97, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x73, 0x11, 0x00, 0x00, 0x00, 0x14, 0x09, 0x80, 0x97, 0xd2,</div><div class='add'>+	0x08, 0x00, 0x8a, 0x11, 0x12, 0x40, 0x02, 0x68, 0x12, 0x9a, 0xfe, 0xb8,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x0b, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x00, 0x00, 0xd1, 0x0f, 0x00, 0x00, 0x00, 0x30, 0x03, 0x00, 0x38, 0xf2,</div><div class='add'>+	0x00, 0x00, 0x86, 0x0f, 0x1f, 0x00, 0x00, 0x6c, 0xd8, 0xe0, 0x86, 0xba,</div><div class='add'>+	0x00, 0x00, 0xa3, 0x0e, 0x51, 0x00, 0x00, 0xd8, 0x02, 0x00, 0x00, 0xf2,</div><div class='add'>+	0x00, 0x00, 0x79, 0x0f, 0x00, 0x00, 0x00, 0x3c, 0x08, 0x40, 0x80, 0x92,</div><div class='add'>+	0x00, 0x00, 0x86, 0x0f, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x7e, 0x0f, 0x80, 0x01, 0x00, 0x80, 0xf2, 0x81, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x00, 0x00, 0x80, 0x82, 0x81, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x7e, 0x0f, 0x80, 0x00, 0x00, 0x80, 0xe2, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x7e, 0x0f, 0x80, 0x01, 0x00, 0x80, 0x32, 0x80, 0x87, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xe2, 0x80, 0x2f, 0x34,</div><div class='add'>+	0x00, 0x00, 0x4c, 0x0f, 0x04, 0x01, 0x00, 0x80, 0x02, 0x80, 0x81, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x84, 0x0f, 0x80, 0x01, 0x00, 0x80, 0xa2, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x83, 0x0f, 0x12, 0x01, 0x00, 0x00, 0x09, 0xc0, 0x21, 0xb2,</div><div class='add'>+	0x18, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0xf9,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x02, 0x40, 0x84, 0x32,</div><div class='add'>+	0x1d, 0x00, 0x8a, 0x11, 0x04, 0x00, 0x00, 0x80, 0x02, 0xa4, 0x17, 0xb8,</div><div class='add'>+	0x00, 0x00, 0xb7, 0x0e, 0x00, 0x60, 0x00, 0x6c, 0x08, 0x00, 0x6e, 0xf2,</div><div class='add'>+	0x00, 0x00, 0x4d, 0x0f, 0x4d, 0x00, 0x00, 0x00, 0x67, 0xe0, 0x83, 0x9e,</div><div class='add'>+	0x00, 0x00, 0x89, 0x0f, 0x80, 0x01, 0x00, 0x80, 0xe2, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0xa7, 0x0f, 0x80, 0x01, 0x00, 0x80, 0xa2, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa4, 0xa8, 0x60, 0x8a, 0x3c,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x21, 0x01, 0x80, 0x82, 0x5b, 0x8a, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8d, 0x0f, 0x2f, 0xa8, 0x01, 0x20, 0x99, 0x22, 0x6e, 0xba,</div><div class='add'>+	0x00, 0x00, 0x2f, 0x0e, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xf0,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x06, 0x01, 0x02, 0x80, 0x82, 0x1b, 0x92, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0xa8, 0x01, 0xe0, 0x06, 0x00, 0x92, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x01, 0xe8, 0x06, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x92, 0x0f, 0x23, 0x21, 0x01, 0xe0, 0x06, 0x00, 0x00, 0xb2,</div><div class='add'>+	0x3c, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x2c, 0x82, 0xcd, 0x2e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x30, 0x00, 0xe0, 0x06, 0x80, 0x82, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x9c, 0x0f, 0x04, 0x21, 0x00, 0xe0, 0x06, 0x80, 0x81, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x00, 0x00, 0x80, 0xe2, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x9a, 0x0f, 0x80, 0x01, 0x00, 0x80, 0xa2, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x99, 0x0f, 0x12, 0x01, 0x00, 0x00, 0x09, 0xc0, 0x21, 0xb2,</div><div class='add'>+	0x18, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0xf9,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x02, 0x40, 0x84, 0x32,</div><div class='add'>+	0x1d, 0x00, 0x8a, 0x11, 0x04, 0x00, 0x00, 0x80, 0x02, 0xa4, 0x17, 0xb8,</div><div class='add'>+	0x00, 0x00, 0xb7, 0x0e, 0x00, 0x60, 0x00, 0x6c, 0x08, 0x00, 0x6e, 0xf2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0xe0, 0x06, 0x80, 0x81, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x00, 0xe8, 0x06, 0x40, 0x81, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x10, 0x00, 0xe0, 0x06, 0xc0, 0x86, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x2a, 0x19, 0x00, 0xe0, 0x06, 0xc0, 0x84, 0x72,</div><div class='add'>+	0x00, 0x00, 0xa1, 0x0f, 0x12, 0x01, 0x00, 0x00, 0x09, 0xc0, 0x21, 0xb2,</div><div class='add'>+	0x18, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0xf9,</div><div class='add'>+	0x1d, 0x00, 0x8a, 0x11, 0x04, 0x00, 0x00, 0x80, 0x02, 0xa4, 0x17, 0xb8,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0xf8, 0xa2, 0x80, 0x2f, 0x75,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0xd8, 0xe0, 0x83, 0x3c,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x50, 0xf2, 0xc1, 0x38, 0xb4,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x00, 0x00, 0x80, 0xa2, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xa2, 0x80, 0x2f, 0x34,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, 0x12, 0x00, 0x2c, 0x3a,</div><div class='add'>+	0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x09, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa8, 0x02, 0x00, 0x00, 0x32,</div><div class='add'>+	0xee, 0x05, 0xaf, 0x0f, 0x04, 0x01, 0x00, 0x80, 0x82, 0x4d, 0xf5, 0xbc,</div><div class='add'>+	0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x09, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0xb1, 0x0f, 0x00, 0x00, 0x00, 0x04, 0x09, 0xc0, 0x09, 0x92,</div><div class='add'>+	0x00, 0x28, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x09, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x09, 0x80, 0x09, 0x32,</div><div class='add'>+	0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0xc0, 0x87, 0xcd, 0x00, 0x37,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x60, 0xc0, 0x07, 0x80, 0x97, 0x32,</div><div class='add'>+	0x00, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x89, 0x8d, 0x2a, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x5c, 0x52, 0x81, 0x97, 0xb4,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x29, 0x24, 0x90, 0x3a,</div><div class='add'>+	0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x89, 0x0d, 0x90, 0x36,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x19, 0x40, 0x90, 0x3c,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa8, 0x52, 0x82, 0x2a, 0x3a,</div><div class='add'>+	0x00, 0x08, 0xb1, 0x0f, 0x02, 0x01, 0x00, 0x80, 0x82, 0x8d, 0x2a, 0xbc,</div><div class='add'>+	0x00, 0x00, 0xc2, 0x0f, 0x06, 0x00, 0x00, 0x80, 0x02, 0x40, 0x90, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0xa8, 0x02, 0x00, 0x20, 0xb2,</div><div class='add'>+	0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x87, 0xcd, 0x00, 0x37,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0xc0, 0x07, 0x80, 0x97, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x5c, 0x52, 0x81, 0x2a, 0xb4,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x29, 0x24, 0x90, 0x3a,</div><div class='add'>+	0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x89, 0x0d, 0x90, 0x36,</div><div class='add'>+	0x00, 0x00, 0xbb, 0x0f, 0x04, 0x01, 0x00, 0x04, 0x19, 0x40, 0x90, 0xbc,</div><div class='add'>+	0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x89, 0x0d, 0x90, 0x36,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x0e, 0x80, 0x97, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x68, 0x02, 0x80, 0x97, 0xb2,</div><div class='add'>+	0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x89, 0x0d, 0x90, 0x36,</div><div class='add'>+	0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x89, 0x4d, 0x92, 0x3c,</div><div class='add'>+	0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc8, 0x82, 0x4d, 0x92, 0x36,</div><div class='add'>+	0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2c, 0x89, 0x4d, 0x92, 0x30,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x18, 0x9b, 0x81, 0xb2, 0xe4, 0x78, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x9b, 0x8d, 0xb7, 0xe4, 0x78, 0x34,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa4, 0x0e, 0x80, 0x97, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x29, 0x24, 0x90, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x59, 0x00, 0x90, 0x36,</div><div class='add'>+	0x00, 0x00, 0xc4, 0x0f, 0x95, 0x01, 0x00, 0x80, 0x22, 0x24, 0x90, 0xba,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0x50,</div><div class='add'>+	0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xec, 0x0f, 0x04, 0x01, 0x00, 0x78, 0xd9, 0x01, 0x30, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x09, 0xc0, 0x29, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9c, 0xb2, 0x45, 0x28, 0x30,</div><div class='add'>+	0x00, 0x00, 0xdd, 0x0f, 0x86, 0x01, 0x00, 0x08, 0x09, 0x80, 0x2f, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2c, 0x09, 0x40, 0x81, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x02, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf4, 0x02, 0x00, 0x00, 0x32,</div><div class='add'>+	0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x8a, 0x02, 0x39,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9c, 0x02, 0x80, 0x92, 0x32,</div><div class='add'>+	0x00, 0x00, 0xdc, 0x0f, 0x04, 0x07, 0x01, 0x80, 0x02, 0xc0, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0x00, 0xe7, 0x0f, 0xc3, 0x07, 0x01, 0xec, 0xb6, 0xe4, 0x6e, 0x9a,</div><div class='add'>+	0x00, 0x00, 0xe7, 0x0f, 0x00, 0x06, 0x01, 0xec, 0xb6, 0xe4, 0x6e, 0x9a,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x01, 0x00, 0x80, 0x52, 0x80, 0x90, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2c, 0x09, 0x05, 0x80, 0x30,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x02, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf4, 0x02, 0x00, 0x00, 0x32,</div><div class='add'>+	0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x8a, 0x02, 0x39,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9c, 0x02, 0x80, 0x92, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x00, 0x00, 0x80, 0xf2, 0xc1, 0x92, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x02, 0x01, 0x00, 0x80, 0x82, 0xfa, 0x92, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x06, 0x01, 0x00, 0x80, 0x92, 0xfa, 0x92, 0xbc,</div><div class='add'>+	0x44, 0x00, 0x2c, 0x10, 0x00, 0x00, 0x00, 0xf8, 0xa2, 0x8d, 0x2f, 0xd2,</div><div class='add'>+	0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x09, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0xe2, 0x10, 0x00, 0x00, 0x00, 0x14, 0x09, 0xc0, 0x92, 0xd2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x03, 0x00, 0x38, 0x32,</div><div class='add'>+	0x00, 0x00, 0xec, 0x0f, 0x04, 0x01, 0x00, 0x78, 0xd9, 0x01, 0x30, 0xb6,</div><div class='add'>+	0x00, 0x00, 0xd4, 0x0f, 0x00, 0x00, 0x00, 0x9c, 0xb2, 0x45, 0x28, 0x90,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x80, 0x22, 0x80, 0x97, 0x7c,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x00, 0x00, 0x80, 0x02, 0xc0, 0xe8, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, 0x02, 0xc0, 0xe8, 0x32,</div><div class='add'>+	0x02, 0x00, 0xf1, 0x0f, 0xb0, 0x00, 0x00, 0xa0, 0xc2, 0x0a, 0x00, 0xb9,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0xab, 0xe4, 0xb0, 0x32,</div><div class='add'>+	0x00, 0x00, 0xf6, 0x0f, 0x80, 0x01, 0x00, 0x80, 0xc2, 0x4a, 0xd0, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x28, 0x09, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0x50,</div><div class='add'>+	0x00, 0x00, 0xf9, 0x0f, 0x04, 0x00, 0x00, 0x80, 0x02, 0x00, 0xf8, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x80, 0x01, 0x00, 0xf8, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x28, 0x09, 0x00, 0x00, 0x52,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x04, 0xcd, 0x4a, 0xd0, 0x34,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x01, 0x00, 0x80, 0xc2, 0x4a, 0xd0, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x00, 0x10, 0x04, 0x01, 0x00, 0x28, 0x09, 0x34, 0xb0, 0xba,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x01, 0x00, 0x80, 0xc2, 0x4a, 0xd0, 0xb6,</div><div class='add'>+	0x00, 0x00, 0xfd, 0x0f, 0xb0, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x04, 0xcd, 0x4a, 0xd0, 0x35,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x28, 0x09, 0x00, 0x00, 0x52,</div><div class='add'>+	0x00, 0x00, 0x00, 0x10, 0xb0, 0x00, 0x00, 0xa8, 0x22, 0x00, 0x2b, 0xb7,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x00, 0x84, 0xc0, 0x37, 0xac, 0xb0, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x0c, 0x0b, 0x00, 0x00, 0x32,</div><div class='add'>+	0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0xa9, 0x4d, 0xb0, 0x30,</div><div class='add'>+	0x00, 0x00, 0x08, 0x10, 0x80, 0x00, 0x00, 0x80, 0x02, 0x40, 0xb0, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x00, 0x00, 0x80, 0x12, 0x40, 0xb0, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x69, 0x81, 0x97, 0x35,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x84, 0x08, 0x0b, 0x00, 0x7c, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe7, 0x25, 0x01, 0x32,</div><div class='add'>+	0x00, 0x42, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x87, 0x8d, 0x2a, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x07, 0x00, 0xb0, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x07, 0x00, 0xd0, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x12, 0x01, 0x00, 0x48, 0xf2, 0xc1, 0x38, 0x54,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x0e, 0x10, 0xb0, 0x00, 0x00, 0xa0, 0x02, 0x00, 0x00, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0xab, 0xe4, 0xb0, 0x32,</div><div class='add'>+	0x00, 0x00, 0x13, 0x10, 0x80, 0x01, 0x00, 0x80, 0x02, 0x40, 0xd0, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x28, 0x09, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0x50,</div><div class='add'>+	0x00, 0x00, 0x16, 0x10, 0x04, 0x00, 0x00, 0x80, 0x02, 0x00, 0xf8, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x80, 0x01, 0x00, 0xf8, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x28, 0x09, 0x00, 0x00, 0x52,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x04, 0x0d, 0x40, 0xd0, 0x34,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x01, 0x00, 0x80, 0x02, 0x40, 0xd0, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x1d, 0x10, 0x04, 0x01, 0x00, 0x28, 0x09, 0x34, 0xb0, 0xba,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x01, 0x00, 0x80, 0x02, 0x40, 0xd0, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x1a, 0x10, 0xb0, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x04, 0x0d, 0x40, 0xd0, 0x35,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x28, 0x09, 0x00, 0x00, 0x52,</div><div class='add'>+	0x00, 0x00, 0x1d, 0x10, 0xb0, 0x00, 0x00, 0xa8, 0x02, 0x00, 0x00, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x00, 0x84, 0xc0, 0x37, 0xac, 0xb0, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x0c, 0x0b, 0x00, 0x00, 0x32,</div><div class='add'>+	0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0xa9, 0x4d, 0xb0, 0x30,</div><div class='add'>+	0x00, 0x00, 0x25, 0x10, 0x80, 0x00, 0x00, 0x80, 0x02, 0x40, 0xb0, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x00, 0x00, 0x80, 0x12, 0x40, 0xb0, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x69, 0x81, 0x97, 0x35,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x84, 0x08, 0x0b, 0x00, 0x7c, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe7, 0x25, 0x01, 0x32,</div><div class='add'>+	0x00, 0x42, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x87, 0x8d, 0x2a, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x07, 0x00, 0xb0, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x07, 0x00, 0xd0, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x12, 0x01, 0x00, 0x48, 0xf2, 0xc1, 0x38, 0x54,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x1c, 0x41, 0x02, 0x80, 0x06, 0xc0, 0x92, 0x52,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x09, 0xc5, 0x92, 0x30,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x02, 0x01, 0x00, 0x80, 0x82, 0xba, 0x97, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x06, 0x01, 0x00, 0x80, 0x92, 0xba, 0x97, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x73, 0x11, 0x00, 0x00, 0x00, 0x14, 0x09, 0x80, 0x97, 0xd2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x68, 0x02, 0xc5, 0x92, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x0b, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5c, 0x1f, 0xc0, 0xf5, 0x3a,</div><div class='add'>+	0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x09, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0xe2, 0x10, 0x00, 0x00, 0x00, 0x14, 0x09, 0xc0, 0x92, 0xd2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x54, 0x01, 0xb0, 0x02, 0xc0, 0x6e, 0x32,</div><div class='add'>+	0x00, 0x82, 0x00, 0x00, 0x00, 0x01, 0x00, 0x08, 0x08, 0x80, 0x36, 0x52,</div><div class='add'>+	0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x38, 0x80, 0x87, 0x35,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x00, 0x00, 0x80, 0x72, 0x80, 0x87, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x01, 0xe0, 0x16, 0x20, 0x6e, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x09, 0xc5, 0x85, 0x30,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0xa8, 0x01, 0xe0, 0x16, 0x20, 0x6e, 0x3c,</div><div class='add'>+	0x08, 0x00, 0x00, 0x00, 0xd2, 0x01, 0x00, 0x78, 0xe9, 0xe5, 0x83, 0x39,</div><div class='add'>+	0x18, 0x00, 0x8a, 0x11, 0x1f, 0x41, 0x02, 0x84, 0xe6, 0xa1, 0x97, 0xb9,</div><div class='add'>+	0x00, 0x00, 0x43, 0x10, 0x36, 0x51, 0x01, 0xe8, 0x16, 0xe0, 0x83, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x43, 0x10, 0x1d, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x62, 0x81, 0x2f, 0x35,</div><div class='add'>+	0x00, 0x00, 0x45, 0x10, 0x38, 0x21, 0x01, 0xe0, 0x06, 0x40, 0x80, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x01, 0xe0, 0x06, 0x40, 0x80, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x31, 0x00, 0xe0, 0x06, 0x00, 0x00, 0x72,</div><div class='add'>+	0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x2c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x09, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0xe2, 0x10, 0x00, 0x00, 0x00, 0x14, 0x09, 0x80, 0x92, 0xd2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xd5, 0x08, 0x00, 0x00, 0x07, 0x80, 0x92, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x07, 0xc0, 0x2c, 0x32,</div><div class='add'>+	0x00, 0x40, 0x00, 0x80, 0x00, 0x38, 0x00, 0x00, 0x07, 0x00, 0x37, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xca, 0x41, 0x01, 0xe0, 0x06, 0x80, 0x92, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x48, 0x02, 0xc0, 0x80, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x08, 0xe8, 0x01, 0x00, 0x74,</div><div class='add'>+	0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x00, 0x00, 0x80, 0xa2, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x62, 0x80, 0x2d, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x07, 0x80, 0x92, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x07, 0xc0, 0x2c, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xca, 0x3d, 0x00, 0x0c, 0x07, 0x80, 0x83, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x12, 0x01, 0x00, 0x48, 0x02, 0xc0, 0x80, 0x72,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x04, 0x57, 0x01, 0x80, 0x02, 0xc0, 0x6e, 0x7c,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x57, 0x01, 0xec, 0x06, 0x80, 0x92, 0x72,</div><div class='add'>+	0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xd1, 0x0f, 0x00, 0x00, 0x00, 0x30, 0x03, 0x00, 0x38, 0xf2,</div><div class='add'>+	0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x09, 0x00, 0x36, 0x32,</div><div class='add'>+	0x10, 0x00, 0xe2, 0x10, 0x00, 0x00, 0x00, 0x14, 0x19, 0xa0, 0x2c, 0xd9,</div><div class='add'>+	0x00, 0x00, 0x60, 0x10, 0x9d, 0x11, 0x02, 0x0c, 0x09, 0x00, 0x6e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x61, 0x10, 0x00, 0xf0, 0x01, 0x1c, 0x09, 0x00, 0x6e, 0x92,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0xb8, 0x01, 0x1c, 0x09, 0x00, 0x6e, 0x32,</div><div class='add'>+	0x00, 0x00, 0x63, 0x10, 0x2c, 0xcd, 0x01, 0x18, 0x09, 0x80, 0x6e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0xc9, 0xc1, 0x90, 0x34,</div><div class='add'>+	0x00, 0x00, 0x67, 0x10, 0x3b, 0x29, 0x02, 0x04, 0x09, 0x80, 0x6e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0xd6, 0x01, 0x80, 0x52, 0xc0, 0x6e, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0xd6, 0x01, 0xec, 0x56, 0xc0, 0x6e, 0x34,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0xb9, 0xc1, 0x90, 0x34,</div><div class='add'>+	0x00, 0x00, 0x77, 0x10, 0x00, 0xa8, 0x01, 0x08, 0x09, 0x00, 0x6e, 0xf2,</div><div class='add'>+	0x00, 0x00, 0x6b, 0x10, 0x9d, 0x01, 0x00, 0x80, 0x17, 0xe0, 0x90, 0xba,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x80, 0x07, 0xc0, 0x91, 0x32,</div><div class='add'>+	0x00, 0x00, 0x6e, 0x10, 0x00, 0x38, 0x00, 0x80, 0x07, 0x00, 0xee, 0x92,</div><div class='add'>+	0x00, 0x00, 0x6e, 0x10, 0x04, 0x01, 0x00, 0x80, 0x02, 0xc0, 0x91, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0xb8, 0x01, 0xe0, 0x06, 0x00, 0xee, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x01, 0xe0, 0x06, 0x00, 0x86, 0x32,</div><div class='add'>+	0x00, 0x00, 0x71, 0x10, 0x39, 0x08, 0x00, 0x80, 0x07, 0xc0, 0x85, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x00, 0x00, 0x80, 0xc2, 0x81, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xd9, 0xc9, 0x01, 0xe8, 0x06, 0x80, 0x91, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xc8, 0x11, 0x00, 0x80, 0x07, 0x40, 0x90, 0x32,</div><div class='add'>+	0x00, 0x00, 0x74, 0x10, 0x3b, 0x21, 0x00, 0x80, 0x07, 0x00, 0x86, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xdb, 0x00, 0x00, 0x60, 0x18, 0x00, 0x86, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x58, 0x78, 0x01, 0xe0, 0x16, 0x20, 0x86, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x29, 0x00, 0x80, 0x07, 0x00, 0x85, 0x72,</div><div class='add'>+	0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x7b, 0x10, 0x02, 0x0c, 0x02, 0x80, 0xa2, 0x9b, 0x90, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x78, 0x29, 0x00, 0x6e, 0x36,</div><div class='add'>+	0x00, 0x00, 0x7b, 0x10, 0x02, 0x00, 0x00, 0x80, 0xe2, 0xa5, 0x90, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x09, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x88, 0x01, 0x78, 0x49, 0x21, 0x6e, 0x3c,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0xe9, 0xa5, 0x90, 0x3f,</div><div class='add'>+	0x00, 0x00, 0x82, 0x10, 0x04, 0x20, 0x02, 0x08, 0x89, 0x9b, 0x90, 0xbe,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x02, 0x58, 0xb8, 0x9b, 0x90, 0x36,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x49, 0xa1, 0x90, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x9f, 0x88, 0x01, 0x80, 0x82, 0x9b, 0x97, 0x7c,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x01, 0xe0, 0x06, 0x80, 0x97, 0x72,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x0b, 0x02, 0x58, 0xb8, 0x9b, 0x90, 0x76,</div><div class='add'>+	0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8b, 0x10, 0x80, 0x01, 0x00, 0x80, 0xa2, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x89, 0x10, 0x12, 0x01, 0x00, 0x78, 0x09, 0xc0, 0x21, 0xb2,</div><div class='add'>+	0x18, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0xf9,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x02, 0x80, 0x2d, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8b, 0x10, 0xca, 0x00, 0x00, 0xd8, 0x02, 0x40, 0x84, 0x92,</div><div class='add'>+	0x15, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x78, 0xe9, 0x65, 0x17, 0xb8,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xa2, 0x80, 0x2f, 0x35,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x02, 0x40, 0x2d, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x00, 0x00, 0x80, 0x02, 0x80, 0x2d, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x6c, 0x88, 0x1c, 0x83, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x48, 0x00, 0x4c, 0x08, 0x00, 0x72, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x08, 0x50, 0x00, 0x18, 0xc8, 0x20, 0x72, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x80, 0x62, 0xa0, 0x82, 0x7c,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x9f, 0x00, 0x00, 0x14, 0x18, 0x40, 0x81, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x02, 0x00, 0x00, 0x20, 0x88, 0x01, 0x82, 0xba,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x02, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x06, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x02, 0x00, 0x36, 0xbc,</div><div class='add'>+	0x07, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x77, 0x4a, 0x09, 0x39,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x07, 0x00, 0x82, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xca, 0x19, 0x00, 0x00, 0x07, 0x40, 0x82, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x40, 0xf2, 0xc1, 0x38, 0xb4,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0xd8, 0x02, 0x40, 0x84, 0x72,</div><div class='add'>+	0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x2b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x09, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0xe2, 0x10, 0x00, 0x00, 0x00, 0x14, 0x09, 0xc0, 0x85, 0xd2,</div><div class='add'>+	0x00, 0x00, 0xa6, 0x10, 0x80, 0x01, 0x00, 0x80, 0xf2, 0xc1, 0x85, 0xb6,</div><div class='add'>+	0x00, 0x00, 0xa2, 0x10, 0x1f, 0x40, 0x02, 0x84, 0xe6, 0x01, 0x00, 0xb4,</div><div class='add'>+	0x00, 0x00, 0xa6, 0x10, 0x1d, 0x01, 0x00, 0xf8, 0x22, 0x81, 0x2f, 0xb4,</div><div class='add'>+	0x00, 0x00, 0xa6, 0x10, 0x00, 0x00, 0x00, 0xf8, 0x62, 0x81, 0x2f, 0x95,</div><div class='add'>+	0x00, 0x00, 0xa4, 0x10, 0x1d, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x62, 0x81, 0x2f, 0x35,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x02, 0x80, 0x02, 0x40, 0x68, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x1f, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x73, 0x11, 0x00, 0x00, 0x00, 0x14, 0x09, 0xc5, 0x85, 0xd0,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x68, 0x02, 0xc5, 0x85, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x09, 0xc5, 0x85, 0x30,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x02, 0x01, 0x00, 0x80, 0x82, 0xba, 0x97, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x06, 0x01, 0x00, 0x80, 0x92, 0xba, 0x97, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x1d, 0x00, 0x00, 0x5c, 0x1f, 0xc0, 0xf5, 0x7a,</div><div class='add'>+	0x01, 0x00, 0x00, 0x00, 0x04, 0x01, 0x00, 0x80, 0xa2, 0x8d, 0x2f, 0x70,</div><div class='add'>+	0x29, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x2c, 0x82, 0xcd, 0x2e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0xf8, 0x02, 0x81, 0x2f, 0x74,</div><div class='add'>+	0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x80, 0xa8, 0x00, 0x00, 0x04, 0x00, 0x00, 0x80, 0x82, 0x8d, 0x2f, 0x70,</div><div class='add'>+	0x00, 0x00, 0xb7, 0x10, 0x80, 0x01, 0x00, 0x80, 0xd2, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x00, 0x00, 0x80, 0x72, 0x81, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0xba, 0x10, 0x04, 0xb0, 0x00, 0x80, 0x02, 0x00, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x72, 0x81, 0x2f, 0x34,</div><div class='add'>+	0x3b, 0x00, 0xba, 0x10, 0x12, 0x01, 0x00, 0x2c, 0x82, 0xcd, 0x2e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xba, 0x10, 0x80, 0x01, 0x00, 0x80, 0xf2, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x30, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x2c, 0x82, 0xcd, 0x2e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0xbd, 0x10, 0x00, 0x00, 0x00, 0xf8, 0x42, 0x81, 0x2f, 0x94,</div><div class='add'>+	0x00, 0x00, 0xbd, 0x10, 0x80, 0x01, 0x00, 0x80, 0xb2, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x34, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x2c, 0x82, 0xcd, 0x2e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x42, 0x81, 0x2f, 0x34,</div><div class='add'>+	0x80, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x80, 0x82, 0x8d, 0x2f, 0x70,</div><div class='add'>+	0x02, 0x00, 0x00, 0x00, 0x04, 0x01, 0x00, 0x80, 0xa2, 0x8d, 0x2f, 0x70,</div><div class='add'>+	0x3a, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x2c, 0x82, 0xcd, 0x2e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0xf8, 0x12, 0x81, 0x2f, 0x74,</div><div class='add'>+	0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x00, 0x00, 0x80, 0xa2, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x65, 0x01, 0x80, 0xa2, 0xdb, 0x2c, 0xbc,</div><div class='add'>+	0x08, 0x00, 0x00, 0x00, 0x00, 0x18, 0x01, 0xe8, 0x76, 0x20, 0x81, 0x39,</div><div class='add'>+	0xee, 0xff, 0x00, 0x00, 0x00, 0x01, 0x00, 0xf8, 0x82, 0x8d, 0x2f, 0x71,</div><div class='add'>+	0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xcb, 0x10, 0x00, 0x00, 0x01, 0x38, 0x08, 0xc0, 0x6e, 0xf2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x12, 0x01, 0x00, 0x48, 0x02, 0xc0, 0x80, 0x72,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xcd, 0x10, 0x04, 0x38, 0x01, 0x78, 0x09, 0x00, 0x6e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x01, 0xe0, 0x06, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x00, 0x00, 0x80, 0xa2, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xca, 0x11, 0x00, 0x00, 0x07, 0x80, 0x82, 0x32,</div><div class='add'>+	0x00, 0x00, 0xd1, 0x10, 0x2e, 0x19, 0x00, 0x00, 0x07, 0x80, 0x97, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0xe9, 0x81, 0x92, 0x34,</div><div class='add'>+	0x00, 0x00, 0xd5, 0x10, 0x27, 0x31, 0x00, 0x00, 0x07, 0xc0, 0x2c, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xd5, 0x08, 0x00, 0x00, 0x07, 0x00, 0x87, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xc7, 0x00, 0x00, 0x28, 0xe9, 0x80, 0x92, 0x34,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x01, 0xe0, 0x06, 0x00, 0x87, 0x32,</div><div class='add'>+	0x10, 0x00, 0x00, 0x00, 0x00, 0x39, 0x00, 0x00, 0xe7, 0xa0, 0x92, 0x79,</div><div class='add'>+	0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x09, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0xe2, 0x10, 0x00, 0x00, 0x00, 0x14, 0x09, 0x40, 0x90, 0xd2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x44, 0x12, 0xe4, 0x38, 0xb2,</div><div class='add'>+	0x18, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x03, 0xf9,</div><div class='add'>+	0x00, 0x00, 0xdf, 0x10, 0x04, 0x01, 0x00, 0x80, 0x02, 0x80, 0x2d, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x01, 0x00, 0x80, 0xa2, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0xda, 0x10, 0x67, 0x00, 0x00, 0xf8, 0xa2, 0x80, 0x2f, 0xb5,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x12, 0x00, 0x00, 0xe8, 0x02, 0xc0, 0x21, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0x72, 0x80, 0x2d, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0xd8, 0x02, 0x40, 0x00, 0x72,</div><div class='add'>+	0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x1b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x79, 0x0a, 0x91, 0x39,</div><div class='add'>+	0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x39, 0x0b, 0x91, 0x39,</div><div class='add'>+	0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x59, 0x0a, 0x91, 0x39,</div><div class='add'>+	0x09, 0x00, 0xe5, 0x10, 0xf1, 0x01, 0x00, 0x10, 0x69, 0x0b, 0x91, 0xb9,</div><div class='add'>+	0x03, 0x00, 0x00, 0x00, 0x00, 0x24, 0x86, 0xa8, 0x82, 0x8d, 0x6c, 0x37,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, 0xe0, 0x07, 0x00, 0x91, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, 0xe0, 0x07, 0x40, 0x91, 0x32,</div><div class='add'>+	0x00, 0x80, 0xeb, 0x10, 0x02, 0x01, 0x00, 0x80, 0x82, 0x8d, 0x2a, 0xbc,</div><div class='add'>+	0x00, 0x00, 0xec, 0x10, 0xe1, 0x24, 0x86, 0xc8, 0x06, 0x00, 0x00, 0x92,</div><div class='add'>+	0x03, 0x00, 0x00, 0x00, 0xe1, 0x24, 0x86, 0xc8, 0x86, 0x8d, 0x2a, 0x36,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0x50,</div><div class='add'>+	0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xf4, 0x10, 0x04, 0x30, 0x00, 0x80, 0x82, 0x9b, 0x81, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x0d, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x9f, 0x3c, 0x00, 0x14, 0x28, 0x80, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x00, 0x00, 0x80, 0xa2, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xca, 0x01, 0x00, 0xf8, 0x02, 0x80, 0x2f, 0x35,</div><div class='add'>+	0x00, 0xa0, 0x8a, 0x11, 0x12, 0x00, 0x00, 0x40, 0xa2, 0x8d, 0x39, 0xb2,</div><div class='add'>+	0x00, 0x00, 0xf6, 0x10, 0x80, 0x39, 0x00, 0x80, 0xe2, 0x80, 0x6e, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x38, 0x00, 0x80, 0xf2, 0x80, 0x6e, 0xb6,</div><div class='add'>+	0x00, 0xe0, 0x8a, 0x11, 0x04, 0x01, 0x00, 0x80, 0xa2, 0x8d, 0x2f, 0xb0,</div><div class='add'>+	0x00, 0xe0, 0xfd, 0x10, 0x04, 0x38, 0x00, 0x78, 0x89, 0x8d, 0x6e, 0xb0,</div><div class='add'>+	0x10, 0x00, 0xfd, 0x10, 0x9f, 0x01, 0x00, 0xf8, 0xe2, 0xa5, 0x2f, 0xb9,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x00, 0x00, 0x80, 0x02, 0xc0, 0xee, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x00, 0x00, 0x80, 0x82, 0x81, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x58, 0x01, 0xec, 0x06, 0xc0, 0xee, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x30,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x04, 0x28, 0x00, 0x18, 0x09, 0x00, 0x6e, 0x72,</div><div class='add'>+	0x00, 0x00, 0x4f, 0x0e, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xf0,</div><div class='add'>+	0x00, 0x00, 0x2f, 0x0e, 0x00, 0xa8, 0x01, 0x20, 0x09, 0x00, 0x6e, 0x92,</div><div class='add'>+	0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0xa9, 0x00, 0x80, 0x02, 0x00, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x04, 0xb0, 0x00, 0x80, 0x82, 0x9b, 0x81, 0x7c,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x0d, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x9f, 0xbc, 0x00, 0x14, 0x28, 0x80, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x00, 0x00, 0x80, 0xa2, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xca, 0x01, 0x00, 0xf8, 0x42, 0x80, 0x2f, 0x35,</div><div class='add'>+	0x08, 0xa0, 0x00, 0x00, 0x12, 0x01, 0x00, 0x40, 0xa2, 0xcd, 0x39, 0x72,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x28, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x09, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0xe2, 0x10, 0x00, 0x00, 0x00, 0x14, 0x09, 0x80, 0x90, 0xd2,</div><div class='add'>+	0x00, 0x00, 0x0f, 0x11, 0x33, 0xcd, 0x01, 0xbc, 0x08, 0x80, 0x6e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x4e, 0x11, 0x00, 0x00, 0x00, 0x28, 0x29, 0x22, 0xee, 0xdc,</div><div class='add'>+	0x00, 0x00, 0x14, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x14, 0x11, 0x04, 0xb8, 0x01, 0x28, 0x09, 0x00, 0x6e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x14, 0x11, 0x9f, 0x71, 0x01, 0x80, 0xc2, 0x21, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0xa9, 0x24, 0xee, 0x3c,</div><div class='add'>+	0x00, 0x00, 0x4e, 0x11, 0x00, 0x00, 0x00, 0x28, 0x19, 0x80, 0x92, 0xdf,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x30,</div><div class='add'>+	0x00, 0x00, 0x28, 0x11, 0x06, 0x80, 0x01, 0x80, 0x82, 0x9b, 0x90, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x00, 0x00, 0x80, 0x02, 0x80, 0x90, 0xbc,</div><div class='add'>+	0xee, 0x05, 0x20, 0x11, 0x06, 0x0c, 0x02, 0x80, 0x82, 0x8d, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0x90, 0x4c, 0x00, 0x00, 0x00, 0x00, 0x84, 0x02, 0x00, 0x37, 0x32,</div><div class='add'>+	0x00, 0x00, 0x1a, 0x11, 0xb8, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x18, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc4, 0x03, 0x80, 0x90, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0x01, 0xe0, 0x96, 0x21, 0x6e, 0x3c,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x61, 0x98, 0x01, 0xe0, 0x06, 0x00, 0x87, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0xd4, 0x01, 0xec, 0x06, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xa8, 0x00, 0x00, 0x78, 0x49, 0x40, 0x3c, 0x37,</div><div class='add'>+	0x00, 0x00, 0x2d, 0x11, 0x00, 0x00, 0x00, 0x08, 0xe9, 0xa5, 0x90, 0x9a,</div><div class='add'>+	0x60, 0x89, 0x20, 0x00, 0x00, 0x00, 0x00, 0x84, 0x02, 0x00, 0x37, 0x32,</div><div class='add'>+	0x00, 0x00, 0x23, 0x11, 0xb8, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x21, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc4, 0x03, 0x80, 0x90, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0x01, 0xe0, 0x96, 0x21, 0x6e, 0x3c,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x61, 0x98, 0x01, 0xe0, 0x06, 0x00, 0x87, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0xd4, 0x01, 0xec, 0x06, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x2d, 0x11, 0xa8, 0x00, 0x00, 0x08, 0x19, 0x8f, 0x90, 0x9a,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x99, 0xa1, 0x89, 0x3e,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0xe9, 0xa5, 0x90, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0x01, 0xe0, 0x96, 0x21, 0x6e, 0x3c,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x61, 0x98, 0x01, 0xe0, 0x06, 0x00, 0x87, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0xd4, 0x01, 0xec, 0x06, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x30, 0x11, 0x06, 0x00, 0x00, 0x80, 0x72, 0xa2, 0x90, 0xbc,</div><div class='add'>+	0x00, 0xc0, 0xff, 0x3f, 0x00, 0x80, 0x01, 0xe0, 0x06, 0x00, 0x37, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x09, 0xc0, 0x89, 0x32,</div><div class='add'>+	0x00, 0x00, 0x36, 0x11, 0x04, 0x79, 0x01, 0x80, 0x82, 0x1b, 0x87, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x34, 0x11, 0x04, 0xb0, 0x00, 0x80, 0x02, 0x00, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x01, 0xe0, 0x06, 0x80, 0x90, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0xf8, 0x92, 0x81, 0x2f, 0x75,</div><div class='add'>+	0x00, 0x00, 0x3c, 0x11, 0x80, 0x00, 0x00, 0x80, 0x52, 0x81, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x3c, 0x11, 0xd5, 0x41, 0x01, 0xe0, 0x06, 0x00, 0x87, 0x92,</div><div class='add'>+	0x00, 0x00, 0x39, 0x11, 0x3c, 0x90, 0x01, 0xe0, 0x06, 0x80, 0x90, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x01, 0x00, 0x80, 0x92, 0x81, 0x2f, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0xc8, 0x01, 0xe8, 0x06, 0xc0, 0x8b, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x95, 0x01, 0x00, 0x80, 0x02, 0x80, 0x2f, 0x72,</div><div class='add'>+	0x00, 0x00, 0x3d, 0x11, 0x9f, 0x41, 0x01, 0x80, 0x82, 0x1b, 0x87, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0x70,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xd9, 0x90, 0x01, 0xe0, 0x06, 0x80, 0x90, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0xf8, 0x72, 0x80, 0x2f, 0x74,</div><div class='add'>+	0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x09, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0xe2, 0x10, 0x00, 0x00, 0x00, 0x14, 0x09, 0x40, 0x87, 0xd2,</div><div class='add'>+	0x00, 0x00, 0x47, 0x11, 0x9f, 0xd8, 0x01, 0x80, 0x22, 0x21, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x0b, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0x70,</div><div class='add'>+	0x00, 0x00, 0x47, 0x11, 0x9f, 0xe0, 0x01, 0x80, 0xc2, 0x21, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x0b, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0x70,</div><div class='add'>+	0x00, 0x00, 0x47, 0x11, 0x9f, 0xb0, 0x01, 0x80, 0xd2, 0x21, 0x6e, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0x70,</div><div class='add'>+	0x00, 0x00, 0x49, 0x11, 0x06, 0x68, 0x01, 0x80, 0x82, 0x5b, 0x87, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x68, 0x01, 0xe0, 0x06, 0x40, 0x87, 0x32,</div><div class='add'>+	0x00, 0x00, 0x4b, 0x11, 0x37, 0xb0, 0x01, 0xe0, 0x06, 0x40, 0x87, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xd2, 0x80, 0x2f, 0x34,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x01, 0xe0, 0x06, 0x80, 0x84, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0xe1, 0x01, 0xe0, 0x06, 0x00, 0x87, 0x72,</div><div class='add'>+	0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x08, 0x00, 0x00, 0x80, 0x02, 0x80, 0x92, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x5b, 0x11, 0x04, 0xc1, 0x01, 0x84, 0x02, 0x00, 0x6e, 0xb2,</div><div class='add'>+	0x05, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x01, 0xe8, 0x86, 0x8d, 0x92, 0x37,</div><div class='add'>+	0x03, 0x00, 0x00, 0x00, 0x00, 0xc4, 0x01, 0xe8, 0x86, 0x8d, 0x92, 0x37,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x30,</div><div class='add'>+	0x03, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x01, 0x2c, 0x89, 0x8d, 0x6e, 0x36,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0xc4, 0x01, 0x2c, 0xa9, 0xdb, 0x92, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2c, 0x29, 0xc0, 0x92, 0x36,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2c, 0x19, 0xfb, 0x92, 0x3f,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x29, 0x80, 0x92, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2c, 0xa9, 0xe4, 0x92, 0x3f,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x6f, 0xcc, 0x01, 0xe8, 0x26, 0xfb, 0x92, 0x3e,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0xb9, 0x01, 0xe0, 0x06, 0x00, 0x00, 0x52,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x94, 0x02, 0x80, 0x92, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x01, 0xe0, 0x06, 0x40, 0x28, 0x32,</div><div class='add'>+	0x10, 0x00, 0x00, 0x00, 0x6f, 0xcc, 0x01, 0xe8, 0x86, 0xcd, 0x2a, 0x36,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0xb9, 0x01, 0xe0, 0x06, 0x00, 0x00, 0x52,</div><div class='add'>+	0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0xb0, 0x00, 0x80, 0x02, 0x00, 0x6e, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x01, 0xbc, 0x08, 0x00, 0x6e, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0x01, 0xbc, 0x88, 0xdb, 0x8b, 0x3e,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x98, 0x01, 0xbc, 0x88, 0xdb, 0x8b, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x6a, 0x11, 0x9f, 0x00, 0x00, 0xbc, 0x88, 0xe1, 0x8b, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x6a, 0x11, 0x04, 0x0c, 0x02, 0x40, 0xa8, 0xdb, 0x8b, 0xbe,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0x00, 0x04, 0x88, 0x1b, 0x84, 0x3e,</div><div class='add'>+	0x00, 0x00, 0x69, 0x11, 0x04, 0xb1, 0x00, 0x80, 0x82, 0x5b, 0x80, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0xf8, 0xc2, 0x80, 0x2f, 0x74,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x04, 0x0c, 0x02, 0x80, 0xa2, 0x5b, 0x80, 0x7c,</div><div class='add'>+	0x29, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x09, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0xe2, 0x10, 0x00, 0x00, 0x00, 0x14, 0x09, 0xc0, 0x8b, 0xd2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, 0x12, 0x00, 0x2c, 0x3a,</div><div class='add'>+	0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x04, 0x65, 0x01, 0x80, 0xa2, 0xdb, 0x2c, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x00, 0x00, 0x80, 0xa2, 0x80, 0x2f, 0xb6,</div><div class='add'>+	0x08, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x01, 0xe8, 0x76, 0x20, 0x81, 0x39,</div><div class='add'>+	0xee, 0xff, 0x00, 0x00, 0x00, 0x01, 0x00, 0xf8, 0x82, 0x8d, 0x2f, 0x71,</div><div class='add'>+	0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0xd9, 0x4a, 0x91, 0x39,</div><div class='add'>+	0x39, 0x00, 0xe2, 0x10, 0x00, 0x00, 0x00, 0x10, 0x09, 0x00, 0x36, 0xd2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x09, 0x45, 0x91, 0x30,</div><div class='add'>+	0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x89, 0x4d, 0x91, 0x36,</div><div class='add'>+	0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x89, 0xcd, 0x93, 0x3c,</div><div class='add'>+	0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc8, 0x82, 0xcd, 0x93, 0x36,</div><div class='add'>+	0x07, 0x00, 0x79, 0x11, 0xf3, 0x01, 0x00, 0x40, 0x89, 0xcd, 0x93, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x18, 0x9b, 0x81, 0x02, 0xe5, 0x78, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xe3, 0x18, 0x9b, 0x8d, 0x07, 0xe5, 0x78, 0x34,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0x50,</div><div class='add'>+	0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0xd9, 0x4a, 0x91, 0x39,</div><div class='add'>+	0x3a, 0x00, 0xe2, 0x10, 0x00, 0x00, 0x00, 0x10, 0x09, 0x00, 0x36, 0xd2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x09, 0x45, 0x91, 0x30,</div><div class='add'>+	0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x89, 0x4d, 0x91, 0x36,</div><div class='add'>+	0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x89, 0xcd, 0x93, 0x3c,</div><div class='add'>+	0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc8, 0x82, 0xcd, 0x93, 0x36,</div><div class='add'>+	0x07, 0x00, 0x84, 0x11, 0xf3, 0x01, 0x00, 0x40, 0x89, 0xcd, 0x93, 0xb0,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x80, 0x19, 0x9b, 0x81, 0x02, 0xe5, 0x78, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0xe3, 0x18, 0x9b, 0x8d, 0x07, 0xe5, 0x78, 0x35,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0x50,</div><div class='add'>+	0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x11, 0x00, 0x00, 0x00, 0xb4, 0x0f, 0x40, 0xfb, 0x94,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, 0x0f, 0x40, 0x2b, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x0f, 0x00, 0x28, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x94, 0x0f, 0x00, 0x29, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb8, 0x0f, 0x40, 0x18, 0x32,</div><div class='add'>+	0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9c, 0x0f, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9c, 0x5f, 0xca, 0xf9, 0x35,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x03, 0xc0, 0xf9, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe4, 0x03, 0x00, 0x00, 0x32,</div><div class='add'>+	0x41, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0xe0, 0x03, 0x00, 0x37, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe4, 0x03, 0x00, 0x00, 0x32,</div><div class='add'>+	0x40, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0xe0, 0x03, 0x00, 0x37, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x98, 0x0f, 0x80, 0x2a, 0x32,</div><div class='add'>+	0x4c, 0x42, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa8, 0x02, 0x00, 0x36, 0x32,</div><div class='add'>+	0x98, 0x11, 0x97, 0x12, 0x00, 0x00, 0x00, 0xb0, 0x0f, 0x00, 0x36, 0x92,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9c, 0x02, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x01, 0x84, 0x12, 0x00, 0x00, 0x00, 0xac, 0x0f, 0x00, 0x36, 0xd2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xac, 0x0f, 0x80, 0x2a, 0x32,</div><div class='add'>+	0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa8, 0x02, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9c, 0x0f, 0x00, 0x7e, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x0f, 0x00, 0x7e, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa4, 0x0f, 0x00, 0x7e, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa8, 0x0f, 0x00, 0x7e, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa8, 0x02, 0xc0, 0xfa, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x07, 0xc0, 0xf9, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x07, 0x00, 0xfa, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x07, 0x40, 0xfa, 0x32,</div><div class='add'>+	0x00, 0x00, 0xac, 0x11, 0x00, 0x00, 0x00, 0xe0, 0x07, 0x80, 0xfa, 0xd2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x07, 0x80, 0xfb, 0x32,</div><div class='add'>+	0x01, 0x00, 0xcf, 0x11, 0x04, 0x01, 0x00, 0xb4, 0x8f, 0x4d, 0xfb, 0xb0,</div><div class='add'>+	0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0xab, 0xcd, 0xb0, 0x32,</div><div class='add'>+	0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x5b, 0xca, 0xb0, 0x39,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x2b, 0xfe, 0xb0, 0x32,</div><div class='add'>+	0x00, 0x00, 0xaa, 0x11, 0x12, 0x01, 0x00, 0x80, 0x02, 0x40, 0x20, 0xb2,</div><div class='add'>+	0x00, 0x00, 0xbe, 0x12, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x03, 0x00, 0x01, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0xe0, 0x07, 0x80, 0x3f, 0x52,</div><div class='add'>+	0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x8a, 0x02, 0x39,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x53, 0x0a, 0x16, 0x35,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9c, 0x0f, 0x00, 0x90, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x0f, 0x40, 0x90, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa4, 0x0f, 0x80, 0x90, 0x32,</div><div class='add'>+	0xa2, 0x60, 0x03, 0x00, 0x00, 0x00, 0x00, 0x58, 0x03, 0x00, 0x37, 0x32,</div><div class='add'>+	0xb9, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5c, 0x03, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x83, 0x0d, 0x00, 0x34,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x48, 0x83, 0x0d, 0x00, 0x34,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x53, 0x0a, 0x00, 0x34,</div><div class='add'>+	0x00, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0xc0, 0xf9, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x09, 0x00, 0xfa, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x09, 0x40, 0xfa, 0x32,</div><div class='add'>+	0x00, 0x00, 0xc9, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0xc2, 0x0a, 0x00, 0x39,</div><div class='add'>+	0x00, 0x00, 0xc0, 0x11, 0x80, 0x01, 0x00, 0x80, 0x12, 0x40, 0xb0, 0xb6,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x3b, 0x40, 0xb0, 0x33,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0xcd, 0x4a, 0xd0, 0x35,</div><div class='add'>+	0x00, 0x00, 0xc4, 0x11, 0x00, 0x00, 0x00, 0x0c, 0x0b, 0x40, 0x90, 0x92,</div><div class='add'>+	0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0xc2, 0x0a, 0x00, 0x39,</div><div class='add'>+	0x00, 0x00, 0xc4, 0x11, 0x00, 0x00, 0x00, 0x04, 0x6b, 0x41, 0x90, 0x94,</div><div class='add'>+	0x00, 0x00, 0xc4, 0x11, 0x12, 0x00, 0x00, 0x00, 0x09, 0x40, 0x20, 0xb2,</div><div class='add'>+	0x00, 0x00, 0xc5, 0x11, 0x12, 0x00, 0x00, 0x04, 0x09, 0x40, 0x20, 0xb2,</div><div class='add'>+	0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0x02, 0xe4, 0x16, 0x38,</div><div class='add'>+	0x00, 0x00, 0xc9, 0x11, 0x9f, 0x01, 0x00, 0x80, 0x02, 0x00, 0x90, 0xb2,</div><div class='add'>+	0x00, 0x00, 0xc8, 0x11, 0x12, 0x00, 0x00, 0x08, 0x09, 0x40, 0x20, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9c, 0x02, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x02, 0x00, 0x00, 0x32,</div><div class='add'>+	0x02, 0x00, 0xc4, 0x11, 0x04, 0x01, 0x00, 0xbc, 0x0f, 0x24, 0x17, 0xb8,</div><div class='add'>+	0x06, 0x00, 0xc2, 0x11, 0x04, 0x00, 0x00, 0xbc, 0x0f, 0x64, 0x16, 0xb8,</div><div class='add'>+	0x00, 0x00, 0xbd, 0x11, 0x04, 0x00, 0x00, 0x80, 0x22, 0xc0, 0xfb, 0xbc,</div><div class='add'>+	0x20, 0x00, 0xc4, 0x11, 0x04, 0x01, 0x00, 0x80, 0x82, 0xcd, 0xfb, 0xbc,</div><div class='add'>+	0x00, 0x00, 0xd7, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xd0,</div><div class='add'>+	0xd1, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, 0x82, 0xcd, 0xf9, 0x3a,</div><div class='add'>+	0x00, 0x00, 0xb7, 0x12, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xf7, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xf8, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xfc, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x04, 0x12, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x5d, 0x12, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x03, 0x32,</div><div class='add'>+	0x40, 0x42, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa8, 0x02, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x07, 0x80, 0x2a, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x07, 0x40, 0x90, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x07, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0xde, 0x11, 0x9f, 0x01, 0x00, 0x80, 0x02, 0x00, 0x90, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x07, 0x80, 0x90, 0x32,</div><div class='add'>+	0x00, 0x00, 0xde, 0x11, 0x12, 0x00, 0x00, 0x40, 0xf2, 0x01, 0x00, 0xb4,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x90, 0x32,</div><div class='add'>+	0x00, 0x00, 0xe0, 0x11, 0x12, 0x00, 0x00, 0x9c, 0x0f, 0xc0, 0x21, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9c, 0x0f, 0x00, 0x7e, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x0f, 0x00, 0x7e, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa4, 0x0f, 0x00, 0x7e, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x07, 0x00, 0xfa, 0x52,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9c, 0x02, 0x00, 0x00, 0x32,</div><div class='add'>+	0x4c, 0x42, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa8, 0x02, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x07, 0x80, 0x2a, 0x32,</div><div class='add'>+	0x00, 0x00, 0xad, 0x12, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xd0,</div><div class='add'>+	0x00, 0x00, 0xb3, 0x12, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xd0,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0xcb, 0xc1, 0xb0, 0x34,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9c, 0x02, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x02, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0xef, 0x0f, 0x00, 0x00, 0x00, 0x28, 0x09, 0xc0, 0xb0, 0xd2,</div><div class='add'>+	0x00, 0x00, 0xeb, 0x11, 0x04, 0x00, 0x00, 0x80, 0x02, 0x80, 0x92, 0xb2,</div><div class='add'>+	0x00, 0x00, 0xef, 0x11, 0x12, 0x00, 0x00, 0x9c, 0x0f, 0xc0, 0x21, 0xb2,</div><div class='add'>+	0x02, 0x00, 0xf2, 0x11, 0x04, 0x01, 0x00, 0xb4, 0x8f, 0x4d, 0xfb, 0xb0,</div><div class='add'>+	0x00, 0x00, 0xc4, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x93, 0x40, 0x01, 0x39,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb4, 0x1f, 0x40, 0xfb, 0x35,</div><div class='add'>+	0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x48, 0x03, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x03, 0x00, 0x00, 0x34,</div><div class='add'>+	0x00, 0x00, 0xeb, 0x11, 0x00, 0x00, 0x00, 0x0c, 0x8b, 0xc1, 0xb0, 0x94,</div><div class='add'>+	0x00, 0x00, 0xbb, 0x12, 0x00, 0x08, 0x00, 0x00, 0x07, 0x40, 0xfa, 0x92,</div><div class='add'>+	0x00, 0x00, 0xad, 0x12, 0x00, 0x08, 0x00, 0x00, 0x07, 0x40, 0xfa, 0xd2,</div><div class='add'>+	0x00, 0x00, 0xf9, 0x11, 0x12, 0x00, 0x00, 0x50, 0xf2, 0x01, 0x00, 0xb4,</div><div class='add'>+	0x00, 0x00, 0xb4, 0x12, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xd0,</div><div class='add'>+	0x00, 0x00, 0xbd, 0x12, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9c, 0x0f, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0xcc, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa8, 0x02, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x02, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x07, 0x00, 0xb0, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x12, 0x00, 0x2a, 0x3a,</div><div class='add'>+	0x00, 0x00, 0xff, 0x11, 0x04, 0x01, 0x00, 0x9c, 0x1f, 0xc0, 0xf9, 0xbc,</div><div class='add'>+	0x00, 0xcc, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa8, 0x02, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0xba, 0x12, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x0c, 0x12, 0x04, 0x01, 0x00, 0x80, 0x02, 0x40, 0xfa, 0xb2,</div><div class='add'>+	0x00, 0xcc, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa8, 0x02, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0x0e, 0x12, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xd0,</div><div class='add'>+	0x00, 0x00, 0x1b, 0x12, 0x00, 0x00, 0x00, 0x84, 0x02, 0x00, 0x00, 0xd2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x07, 0xc0, 0x3c, 0x32,</div><div class='add'>+	0x00, 0x00, 0x08, 0x12, 0x8e, 0x01, 0x00, 0x80, 0x02, 0x40, 0x28, 0xb2,</div><div class='add'>+	0x00, 0xcc, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa4, 0x0f, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0xf7, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0xcc, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa4, 0x8f, 0x4d, 0xfa, 0x3a,</div><div class='add'>+	0x00, 0x00, 0xf7, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9c, 0x0f, 0x00, 0x00, 0x32,</div><div class='add'>+	0x10, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xac, 0x0f, 0x00, 0x37, 0x32,</div><div class='add'>+	0x00, 0x00, 0x20, 0x12, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xd0,</div><div class='add'>+	0x08, 0x00, 0x10, 0x12, 0x04, 0x01, 0x00, 0x80, 0x82, 0xcd, 0xf9, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9c, 0x0f, 0x00, 0x00, 0x32,</div><div class='add'>+	0x0e, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xac, 0x0f, 0x00, 0x37, 0x32,</div><div class='add'>+	0x00, 0x00, 0x20, 0x12, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xd0,</div><div class='add'>+	0x0b, 0x00, 0x14, 0x12, 0x04, 0x01, 0x00, 0x80, 0x82, 0xcd, 0xf9, 0xbc,</div><div class='add'>+	0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9c, 0x0f, 0x00, 0x36, 0x32,</div><div class='add'>+	0x0f, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xac, 0x0f, 0x00, 0x37, 0x32,</div><div class='add'>+	0x00, 0x00, 0x20, 0x12, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xd0,</div><div class='add'>+	0x27, 0x00, 0x18, 0x12, 0x04, 0x01, 0x00, 0x80, 0x82, 0xcd, 0xf9, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0x50,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9c, 0x0f, 0x00, 0x00, 0x32,</div><div class='add'>+	0x0f, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xac, 0x0f, 0x00, 0x37, 0x32,</div><div class='add'>+	0x00, 0x00, 0x20, 0x12, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xd0,</div><div class='add'>+	0x20, 0x00, 0x1d, 0x12, 0x04, 0x01, 0x00, 0x80, 0x82, 0xcd, 0xf9, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0x50,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe4, 0x03, 0xc0, 0xf9, 0x32,</div><div class='add'>+	0x0d, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xe0, 0x03, 0x00, 0x37, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x03, 0xc0, 0xfa, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x07, 0x40, 0x3e, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x9c, 0x1f, 0xc0, 0xf9, 0x5a,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x03, 0xc0, 0xf9, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x07, 0x40, 0x3e, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9c, 0x1f, 0xc0, 0xf9, 0x3a,</div><div class='add'>+	0xff, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0xac, 0x8f, 0xcd, 0xf9, 0x50,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9c, 0x0f, 0x00, 0x2b, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0x02, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x07, 0x80, 0x3e, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0x12, 0x00, 0x2b, 0x3a,</div><div class='add'>+	0x0f, 0x00, 0x2b, 0x12, 0x04, 0x01, 0x00, 0x80, 0x82, 0x0d, 0x2b, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x07, 0x80, 0x3e, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0xb0, 0x02, 0xc0, 0xf9, 0x52,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x07, 0x00, 0x3a, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x07, 0x40, 0x3a, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x07, 0x80, 0x3a, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x07, 0xc0, 0x3a, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9c, 0x0f, 0x00, 0x2b, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0x02, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x07, 0x00, 0x3d, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x07, 0x40, 0x3d, 0x32,</div><div class='add'>+	0x00, 0x00, 0x36, 0x12, 0x84, 0x01, 0x00, 0xb0, 0x12, 0x00, 0x2b, 0xba,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0xb0, 0x02, 0xc0, 0xf9, 0x52,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9c, 0x0f, 0x00, 0x00, 0x32,</div><div class='add'>+	0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x73, 0x3e, 0x00, 0x39,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x07, 0x00, 0x30, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9c, 0x1f, 0xc0, 0xf9, 0x3a,</div><div class='add'>+	0x70, 0x00, 0x3b, 0x12, 0x04, 0x01, 0x00, 0x80, 0x82, 0xcd, 0xf9, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x03, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x07, 0x00, 0x30, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x03, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x07, 0x00, 0x30, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9c, 0x0f, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x0f, 0xc0, 0x29, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9c, 0x02, 0xc0, 0xf9, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa4, 0x0f, 0xc0, 0x2c, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9c, 0x02, 0x00, 0xfa, 0x32,</div><div class='add'>+	0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2c, 0x73, 0x7e, 0xfa, 0x39,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x07, 0x00, 0x30, 0x32,</div><div class='add'>+	0x00, 0x00, 0x44, 0x12, 0x85, 0x01, 0x00, 0x9c, 0x1f, 0xc0, 0xf9, 0xba,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0x50,</div><div class='add'>+	0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x9c, 0x0f, 0x00, 0x37, 0x32,</div><div class='add'>+	0x00, 0x00, 0x25, 0x12, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xd0,</div><div class='add'>+	0x0e, 0x00, 0x53, 0x12, 0x04, 0x01, 0x00, 0x80, 0x82, 0xcd, 0xfa, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x07, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x07, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x07, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x4d, 0x12, 0x00, 0x00, 0x00, 0x9c, 0x3f, 0xc0, 0xf9, 0x9a,</div><div class='add'>+	0x1c, 0x00, 0x4d, 0x12, 0x04, 0x01, 0x00, 0x80, 0x82, 0xcd, 0xfa, 0xbc,</div><div class='add'>+	0x02, 0x00, 0x25, 0x12, 0x00, 0x00, 0x00, 0x9c, 0x8f, 0xcd, 0xf9, 0xda,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0x50,</div><div class='add'>+	0x01, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x9c, 0x0f, 0x00, 0x37, 0x32,</div><div class='add'>+	0x00, 0x00, 0x25, 0x12, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xd0,</div><div class='add'>+	0x0e, 0x00, 0x5b, 0x12, 0x04, 0x01, 0x00, 0x80, 0x82, 0xcd, 0xfa, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x07, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x57, 0x12, 0x00, 0x00, 0x00, 0x9c, 0x1f, 0xc0, 0xf9, 0x9a,</div><div class='add'>+	0x26, 0x00, 0x57, 0x12, 0x04, 0x01, 0x00, 0x80, 0x82, 0xcd, 0xfa, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0x50,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa8, 0x0f, 0x40, 0x29, 0x32,</div><div class='add'>+	0x00, 0xcc, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa8, 0x02, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0x4c, 0x12, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xd0,</div><div class='add'>+	0x00, 0x00, 0x56, 0x12, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xd0,</div><div class='add'>+	0x00, 0x00, 0x29, 0x12, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xd0,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x07, 0x80, 0x18, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x0f, 0x00, 0x00, 0x32,</div><div class='add'>+	0xa2, 0x60, 0x03, 0x00, 0x00, 0x00, 0x00, 0x58, 0x03, 0x00, 0x37, 0x32,</div><div class='add'>+	0x6b, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5c, 0x03, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9c, 0x0f, 0x80, 0x2a, 0x32,</div><div class='add'>+	0x00, 0x00, 0x6b, 0x12, 0x04, 0x00, 0x00, 0x80, 0x02, 0x40, 0x29, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x83, 0x3e, 0x00, 0x34,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x48, 0x83, 0x3e, 0x00, 0x34,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x53, 0x0a, 0x00, 0x34,</div><div class='add'>+	0x00, 0x00, 0x6c, 0x12, 0x00, 0x00, 0x00, 0x88, 0x0f, 0x40, 0x2b, 0x92,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x0f, 0x00, 0x28, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x94, 0x0f, 0x00, 0x29, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x98, 0x0f, 0x80, 0x2a, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa8, 0x02, 0xc0, 0xf9, 0x32,</div><div class='add'>+	0x71, 0x12, 0x97, 0x12, 0x00, 0x00, 0x00, 0xb0, 0x0f, 0x00, 0x36, 0x92,</div><div class='add'>+	0x07, 0x00, 0x74, 0x12, 0x04, 0x00, 0x00, 0x80, 0x82, 0x4d, 0x29, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x1f, 0x00, 0xfa, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x68, 0x12, 0x00, 0x00, 0x00, 0x9c, 0x0f, 0x80, 0x2a, 0x92,</div><div class='add'>+	0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0xac, 0x0f, 0x00, 0x36, 0x32,</div><div class='add'>+	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9c, 0x02, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0x84, 0x12, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xd0,</div><div class='add'>+	0x1f, 0x00, 0x7a, 0x12, 0x04, 0x00, 0x00, 0x80, 0x82, 0xcd, 0x29, 0xbc,</div><div class='add'>+	0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xac, 0x8f, 0xcd, 0xfa, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x76, 0x12, 0x00, 0x00, 0x00, 0x9c, 0x12, 0xc0, 0x29, 0x9a,</div><div class='add'>+	0x00, 0x00, 0x3a, 0x12, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xd0,</div><div class='add'>+	0x00, 0x00, 0x30, 0x12, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xd0,</div><div class='add'>+	0x00, 0x00, 0x82, 0x12, 0x04, 0x00, 0x00, 0x80, 0x52, 0x8a, 0xfa, 0xbc,</div><div class='add'>+	0xa2, 0x60, 0x03, 0x00, 0x00, 0x00, 0x00, 0x58, 0x03, 0x00, 0x37, 0x32,</div><div class='add'>+	0x82, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5c, 0x03, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0xa3, 0x3e, 0x00, 0x34,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x48, 0xa3, 0x3e, 0x00, 0x34,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x53, 0x0a, 0x00, 0x34,</div><div class='add'>+	0x00, 0xcc, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa4, 0x0f, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0xf7, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc4, 0x02, 0xc0, 0xfa, 0x32,</div><div class='add'>+	0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9c, 0x0f, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xbc, 0x0f, 0x40, 0x2f, 0x32,</div><div class='add'>+	0x00, 0x00, 0x8b, 0x12, 0x04, 0x00, 0x00, 0x9c, 0x1f, 0xc0, 0xf9, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x8a, 0x12, 0x04, 0x00, 0x00, 0x80, 0x02, 0x40, 0x2f, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x87, 0x12, 0x00, 0x00, 0x00, 0xe0, 0x07, 0x00, 0x2c, 0x92,</div><div class='add'>+	0x00, 0x00, 0x87, 0x12, 0x00, 0x00, 0x00, 0xe0, 0x07, 0x00, 0x36, 0x92,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x07, 0x40, 0x2c, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x07, 0x80, 0x2c, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x07, 0xc0, 0x2c, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x07, 0x00, 0x2d, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x07, 0x40, 0x2d, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x07, 0x80, 0x2d, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x07, 0xc0, 0x2d, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x07, 0xc0, 0xfb, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x07, 0x80, 0x2f, 0x32,</div><div class='add'>+	0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x73, 0x0a, 0x02, 0x39,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0xe0, 0x07, 0x80, 0x3f, 0x52,</div><div class='add'>+	0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x03, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x07, 0x00, 0xf9, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x07, 0x40, 0x28, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x07, 0x80, 0xf8, 0x32,</div><div class='add'>+	0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9c, 0x0f, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xbc, 0x0f, 0xc0, 0x2b, 0x32,</div><div class='add'>+	0x00, 0x00, 0xa0, 0x12, 0x04, 0x00, 0x00, 0x9c, 0x1f, 0xc0, 0xf9, 0xbc,</div><div class='add'>+	0x00, 0x00, 0x9f, 0x12, 0x04, 0x00, 0x00, 0x80, 0x02, 0xc0, 0x2b, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x9c, 0x12, 0x00, 0x00, 0x00, 0xe0, 0x07, 0xc0, 0x28, 0x92,</div><div class='add'>+	0x00, 0x00, 0x9c, 0x12, 0x00, 0x00, 0x00, 0xe0, 0x07, 0x00, 0x36, 0x92,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x07, 0x40, 0xf9, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x07, 0x40, 0x29, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x07, 0x80, 0x29, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x07, 0xc0, 0x29, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x07, 0x00, 0x2a, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x07, 0x40, 0x2a, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x07, 0x80, 0xf9, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x07, 0xc0, 0x2a, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x07, 0x00, 0x2b, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x07, 0x40, 0x2b, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x07, 0x80, 0x2b, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x07, 0xc0, 0xfb, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, 0x02, 0x00, 0xfb, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9c, 0x02, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x02, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0xb1, 0x12, 0x9f, 0x00, 0x00, 0x80, 0x02, 0x00, 0x90, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x07, 0x40, 0x90, 0x52,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x07, 0x80, 0x90, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x19, 0x00, 0x00, 0x07, 0x40, 0x90, 0x52,</div><div class='add'>+	0x00, 0x00, 0xb3, 0x12, 0x12, 0x00, 0x00, 0x48, 0xf2, 0x01, 0x00, 0xb4,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x90, 0x32,</div><div class='add'>+	0x00, 0x00, 0xb5, 0x12, 0x12, 0x00, 0x00, 0x9c, 0x0f, 0xc0, 0x21, 0xb2,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x80, 0x02, 0x00, 0x00, 0x50,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb4, 0x0f, 0x40, 0xfb, 0x35,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9c, 0x02, 0x00, 0x00, 0x32,</div><div class='add'>+	0x4c, 0x42, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa8, 0x02, 0x00, 0x36, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x07, 0x80, 0x2a, 0x32,</div><div class='add'>+	0x00, 0x00, 0xad, 0x12, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xd0,</div><div class='add'>+	0x00, 0x00, 0xb3, 0x12, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xd0,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0xcb, 0xc1, 0xb0, 0x34,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9c, 0x02, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x02, 0x00, 0x00, 0x32,</div><div class='add'>+	0x00, 0x00, 0xc4, 0x12, 0x00, 0x00, 0x00, 0x28, 0x09, 0xc0, 0xb0, 0xd2,</div><div class='add'>+	0x00, 0x00, 0xbe, 0x12, 0x04, 0x00, 0x00, 0x80, 0x02, 0x80, 0x92, 0xb2,</div><div class='add'>+	0x00, 0x00, 0xc2, 0x12, 0x12, 0x00, 0x00, 0x9c, 0x0f, 0xc0, 0x21, 0xb2,</div><div class='add'>+	0x00, 0x00, 0xc4, 0x11, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0x02, 0x00, 0x00, 0x32,</div><div class='add'>+	0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0xc2, 0x0a, 0x00, 0x39,</div><div class='add'>+	0x00, 0x00, 0xc8, 0x12, 0x04, 0x01, 0x00, 0x28, 0x09, 0x34, 0xb0, 0xba,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x28, 0x09, 0x00, 0x00, 0x52,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa8, 0x22, 0x00, 0x2b, 0x37,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x84, 0xc0, 0x37, 0xac, 0xb0, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x0b, 0x00, 0x00, 0x32,</div><div class='add'>+	0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0xa9, 0x4d, 0xb0, 0x30,</div><div class='add'>+	0x00, 0x00, 0xd8, 0x12, 0x80, 0x00, 0x00, 0x80, 0x02, 0x40, 0xb0, 0xb6,</div><div class='add'>+	0x00, 0x00, 0xcd, 0x12, 0x12, 0x00, 0x00, 0x00, 0x09, 0x40, 0x20, 0xb2,</div><div class='add'>+	0x00, 0x00, 0xce, 0x12, 0x12, 0x00, 0x00, 0x04, 0x09, 0x40, 0x20, 0xb2,</div><div class='add'>+	0x00, 0x00, 0xd1, 0x12, 0x9f, 0x01, 0x00, 0x80, 0x02, 0x00, 0x90, 0xb2,</div><div class='add'>+	0x00, 0x00, 0xd0, 0x12, 0x12, 0x00, 0x00, 0x08, 0x09, 0x40, 0x20, 0xb2,</div><div class='add'>+	0x0d, 0x00, 0xcd, 0x12, 0x04, 0x01, 0x00, 0x80, 0x02, 0xe4, 0x16, 0xb8,</div><div class='add'>+	0x02, 0x00, 0xcd, 0x12, 0x04, 0x01, 0x00, 0xbc, 0x0f, 0x24, 0x17, 0xb8,</div><div class='add'>+	0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xbc, 0x0f, 0x64, 0x16, 0x38,</div><div class='add'>+	0x00, 0x00, 0xcd, 0x12, 0x04, 0x01, 0x00, 0x80, 0x22, 0xc0, 0xfb, 0xbc,</div><div class='add'>+	0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0xc2, 0x0a, 0x00, 0x39,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x3b, 0x40, 0xb0, 0x33,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0xcd, 0x4a, 0xd0, 0x35,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe7, 0x25, 0x01, 0x32,</div><div class='add'>+	0x00, 0x42, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x87, 0x8d, 0x2a, 0x3a,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x07, 0x00, 0xb0, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x07, 0x00, 0xd0, 0x32,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x12, 0x01, 0x00, 0x48, 0xf2, 0xc1, 0x38, 0x54,</div><div class='add'>+	0x00, 0x00, 0xdc, 0x12, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+	0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+},</div><div class='add'>+{</div><div class='add'>+	0x00, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x90,</div><div class='add'>+},</div><div class='add'>+};</div><div class='head'>diff --git a/drivers/staging/sxg/sxg.c b/drivers/staging/sxg/sxg.c<br/>new file mode 100644<br/>index 000000000000..6ccbee875ab3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/sxg/sxg.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/sxg/sxg.c</a></div><div class='hunk'>@@ -0,0 +1,3624 @@</div><div class='add'>+/**************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2000-2008 Alacritech, Inc.  All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions</div><div class='add'>+ * are met:</div><div class='add'>+ *</div><div class='add'>+ * 1. Redistributions of source code must retain the above copyright</div><div class='add'>+ *    notice, this list of conditions and the following disclaimer.</div><div class='add'>+ * 2. Redistributions in binary form must reproduce the above</div><div class='add'>+ *    copyright notice, this list of conditions and the following</div><div class='add'>+ *    disclaimer in the documentation and/or other materials provided</div><div class='add'>+ *    with the distribution.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY ALACRITECH, INC. ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE</div><div class='add'>+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR</div><div class='add'>+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL ALACRITECH, INC. OR</div><div class='add'>+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,</div><div class='add'>+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT</div><div class='add'>+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF</div><div class='add'>+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,</div><div class='add'>+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT</div><div class='add'>+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF</div><div class='add'>+ * SUCH DAMAGE.</div><div class='add'>+ *</div><div class='add'>+ * The views and conclusions contained in the software and documentation</div><div class='add'>+ * are those of the authors and should not be interpreted as representing</div><div class='add'>+ * official policies, either expressed or implied, of Alacritech, Inc.</div><div class='add'>+ *</div><div class='add'>+ **************************************************************************/</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * FILENAME: sxg.c</div><div class='add'>+ *</div><div class='add'>+ * The SXG driver for Alacritech's 10Gbe products.</div><div class='add'>+ *</div><div class='add'>+ * NOTE: This is the standard, non-accelerated version of Alacritech's</div><div class='add'>+ *       IS-NIC driver.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/ioport.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/timer.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/mii.h&gt;</div><div class='add'>+</div><div class='add'>+#define SLIC_DUMP_ENABLED		0</div><div class='add'>+#define SLIC_GET_STATS_ENABLED		0</div><div class='add'>+#define LINUX_FREES_ADAPTER_RESOURCES	1</div><div class='add'>+#define SXG_OFFLOAD_IP_CHECKSUM		0</div><div class='add'>+#define SXG_POWER_MANAGEMENT_ENABLED	0</div><div class='add'>+#define VPCI				0</div><div class='add'>+#define DBG				1</div><div class='add'>+#define ATK_DEBUG			1</div><div class='add'>+</div><div class='add'>+#include "sxg_os.h"</div><div class='add'>+#include "sxghw.h"</div><div class='add'>+#include "sxghif.h"</div><div class='add'>+#include "sxg.h"</div><div class='add'>+#include "sxgdbg.h"</div><div class='add'>+</div><div class='add'>+#include "sxgphycode.h"</div><div class='add'>+#include "saharadbgdownload.h"</div><div class='add'>+</div><div class='add'>+static int sxg_allocate_buffer_memory(p_adapter_t adapter, u32 Size,</div><div class='add'>+				      SXG_BUFFER_TYPE BufferType);</div><div class='add'>+static void sxg_allocate_rcvblock_complete(p_adapter_t adapter, void *RcvBlock,</div><div class='add'>+					   dma_addr_t PhysicalAddress,</div><div class='add'>+					   u32 Length);</div><div class='add'>+static void sxg_allocate_sgl_buffer_complete(p_adapter_t adapter,</div><div class='add'>+					     PSXG_SCATTER_GATHER SxgSgl,</div><div class='add'>+					     dma_addr_t PhysicalAddress,</div><div class='add'>+					     u32 Length);</div><div class='add'>+</div><div class='add'>+static void sxg_mcast_init_crc32(void);</div><div class='add'>+</div><div class='add'>+static int sxg_entry_open(p_net_device dev);</div><div class='add'>+static int sxg_entry_halt(p_net_device dev);</div><div class='add'>+static int sxg_ioctl(p_net_device dev, struct ifreq *rq, int cmd);</div><div class='add'>+static int sxg_send_packets(struct sk_buff *skb, p_net_device dev);</div><div class='add'>+static int sxg_transmit_packet(p_adapter_t adapter, struct sk_buff *skb);</div><div class='add'>+static void sxg_dumb_sgl(PSCATTER_GATHER_LIST pSgl, PSXG_SCATTER_GATHER SxgSgl);</div><div class='add'>+</div><div class='add'>+static void sxg_handle_interrupt(p_adapter_t adapter);</div><div class='add'>+static int sxg_process_isr(p_adapter_t adapter, u32 MessageId);</div><div class='add'>+static u32 sxg_process_event_queue(p_adapter_t adapter, u32 RssId);</div><div class='add'>+static void sxg_complete_slow_send(p_adapter_t adapter);</div><div class='add'>+static struct sk_buff *sxg_slow_receive(p_adapter_t adapter, PSXG_EVENT Event);</div><div class='add'>+static void sxg_process_rcv_error(p_adapter_t adapter, u32 ErrorStatus);</div><div class='add'>+static bool sxg_mac_filter(p_adapter_t adapter,</div><div class='add'>+			   p_ether_header EtherHdr, ushort length);</div><div class='add'>+</div><div class='add'>+#if SLIC_GET_STATS_ENABLED</div><div class='add'>+static struct net_device_stats *sxg_get_stats(p_net_device dev);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static int sxg_mac_set_address(p_net_device dev, void *ptr);</div><div class='add'>+</div><div class='add'>+static void sxg_adapter_set_hwaddr(p_adapter_t adapter);</div><div class='add'>+</div><div class='add'>+static void sxg_unmap_mmio_space(p_adapter_t adapter);</div><div class='add'>+static void sxg_mcast_set_mask(p_adapter_t adapter);</div><div class='add'>+</div><div class='add'>+static int sxg_initialize_adapter(p_adapter_t adapter);</div><div class='add'>+static void sxg_stock_rcv_buffers(p_adapter_t adapter);</div><div class='add'>+static void sxg_complete_descriptor_blocks(p_adapter_t adapter,</div><div class='add'>+					   unsigned char Index);</div><div class='add'>+static int sxg_initialize_link(p_adapter_t adapter);</div><div class='add'>+static int sxg_phy_init(p_adapter_t adapter);</div><div class='add'>+static void sxg_link_event(p_adapter_t adapter);</div><div class='add'>+static SXG_LINK_STATE sxg_get_link_state(p_adapter_t adapter);</div><div class='add'>+static void sxg_link_state(p_adapter_t adapter, SXG_LINK_STATE LinkState);</div><div class='add'>+static int sxg_write_mdio_reg(p_adapter_t adapter,</div><div class='add'>+			      u32 DevAddr, u32 RegAddr, u32 Value);</div><div class='add'>+static int sxg_read_mdio_reg(p_adapter_t adapter,</div><div class='add'>+			     u32 DevAddr, u32 RegAddr, u32 *pValue);</div><div class='add'>+static void sxg_mcast_set_list(p_net_device dev);</div><div class='add'>+</div><div class='add'>+#define XXXTODO 0</div><div class='add'>+</div><div class='add'>+static unsigned int sxg_first_init = 1;</div><div class='add'>+static char *sxg_banner =</div><div class='add'>+    "Alacritech SLIC Technology(tm) Server and Storage 10Gbe Accelerator (Non-Accelerated)\n";</div><div class='add'>+</div><div class='add'>+static int sxg_debug = 1;</div><div class='add'>+static int debug = -1;</div><div class='add'>+static p_net_device head_netdevice = NULL;</div><div class='add'>+</div><div class='add'>+static sxgbase_driver_t sxg_global = {</div><div class='add'>+	.dynamic_intagg = 1,</div><div class='add'>+};</div><div class='add'>+static int intagg_delay = 100;</div><div class='add'>+static u32 dynamic_intagg = 0;</div><div class='add'>+</div><div class='add'>+#define DRV_NAME	"sxg"</div><div class='add'>+#define DRV_VERSION	"1.0.1"</div><div class='add'>+#define DRV_AUTHOR	"Alacritech, Inc. Engineering"</div><div class='add'>+#define DRV_DESCRIPTION	"Alacritech SLIC Techonology(tm) Non-Accelerated 10Gbe Driver"</div><div class='add'>+#define DRV_COPYRIGHT	"Copyright 2000-2008 Alacritech, Inc.  All rights reserved."</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR(DRV_AUTHOR);</div><div class='add'>+MODULE_DESCRIPTION(DRV_DESCRIPTION);</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='add'>+module_param(dynamic_intagg, int, 0);</div><div class='add'>+MODULE_PARM_DESC(dynamic_intagg, "Dynamic Interrupt Aggregation Setting");</div><div class='add'>+module_param(intagg_delay, int, 0);</div><div class='add'>+MODULE_PARM_DESC(intagg_delay, "uSec Interrupt Aggregation Delay");</div><div class='add'>+</div><div class='add'>+static struct pci_device_id sxg_pci_tbl[] __devinitdata = {</div><div class='add'>+	{PCI_DEVICE(SXG_VENDOR_ID, SXG_DEVICE_ID)},</div><div class='add'>+	{0,}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_DEVICE_TABLE(pci, sxg_pci_tbl);</div><div class='add'>+</div><div class='add'>+/***********************************************************************</div><div class='add'>+************************************************************************</div><div class='add'>+************************************************************************</div><div class='add'>+************************************************************************</div><div class='add'>+************************************************************************/</div><div class='add'>+</div><div class='add'>+static inline void sxg_reg32_write(void __iomem *reg, u32 value, bool flush)</div><div class='add'>+{</div><div class='add'>+	writel(value, reg);</div><div class='add'>+	if (flush)</div><div class='add'>+		mb();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void sxg_reg64_write(p_adapter_t adapter, void __iomem *reg,</div><div class='add'>+				   u64 value, u32 cpu)</div><div class='add'>+{</div><div class='add'>+	u32 value_high = (u32) (value &gt;&gt; 32);</div><div class='add'>+	u32 value_low = (u32) (value &amp; 0x00000000FFFFFFFF);</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;adapter-&gt;Bit64RegLock, flags);</div><div class='add'>+	writel(value_high, (void __iomem *)(&amp;adapter-&gt;UcodeRegs[cpu].Upper));</div><div class='add'>+	writel(value_low, reg);</div><div class='add'>+	spin_unlock_irqrestore(&amp;adapter-&gt;Bit64RegLock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sxg_init_driver(void)</div><div class='add'>+{</div><div class='add'>+	if (sxg_first_init) {</div><div class='add'>+		DBG_ERROR("sxg: %s sxg_first_init set jiffies[%lx]\n",</div><div class='add'>+			  __FUNCTION__, jiffies);</div><div class='add'>+		sxg_first_init = 0;</div><div class='add'>+		spin_lock_init(&amp;sxg_global.driver_lock);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sxg_dbg_macaddrs(p_adapter_t adapter)</div><div class='add'>+{</div><div class='add'>+	DBG_ERROR("  (%s) curr %2.2X:%2.2X:%2.2X:%2.2X:%2.2X:%2.2X\n",</div><div class='add'>+		  adapter-&gt;netdev-&gt;name, adapter-&gt;currmacaddr[0],</div><div class='add'>+		  adapter-&gt;currmacaddr[1], adapter-&gt;currmacaddr[2],</div><div class='add'>+		  adapter-&gt;currmacaddr[3], adapter-&gt;currmacaddr[4],</div><div class='add'>+		  adapter-&gt;currmacaddr[5]);</div><div class='add'>+	DBG_ERROR("  (%s) mac  %2.2X:%2.2X:%2.2X:%2.2X:%2.2X:%2.2X\n",</div><div class='add'>+		  adapter-&gt;netdev-&gt;name, adapter-&gt;macaddr[0],</div><div class='add'>+		  adapter-&gt;macaddr[1], adapter-&gt;macaddr[2],</div><div class='add'>+		  adapter-&gt;macaddr[3], adapter-&gt;macaddr[4],</div><div class='add'>+		  adapter-&gt;macaddr[5]);</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+// SXG Globals</div><div class='add'>+static SXG_DRIVER SxgDriver;</div><div class='add'>+</div><div class='add'>+#ifdef  ATKDBG</div><div class='add'>+static sxg_trace_buffer_t LSxgTraceBuffer;</div><div class='add'>+#endif /* ATKDBG */</div><div class='add'>+static sxg_trace_buffer_t *SxgTraceBuffer = NULL;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * sxg_download_microcode</div><div class='add'>+ *</div><div class='add'>+ * Download Microcode to Sahara adapter</div><div class='add'>+ *</div><div class='add'>+ * Arguments -</div><div class='add'>+ *		adapter		- A pointer to our adapter structure</div><div class='add'>+ *		UcodeSel	- microcode file selection</div><div class='add'>+ *</div><div class='add'>+ * Return</div><div class='add'>+ *	int</div><div class='add'>+ */</div><div class='add'>+static bool sxg_download_microcode(p_adapter_t adapter, SXG_UCODE_SEL UcodeSel)</div><div class='add'>+{</div><div class='add'>+	PSXG_HW_REGS HwRegs = adapter-&gt;HwRegs;</div><div class='add'>+	u32 Section;</div><div class='add'>+	u32 ThisSectionSize;</div><div class='add'>+	u32 *Instruction = NULL;</div><div class='add'>+	u32 BaseAddress, AddressOffset, Address;</div><div class='add'>+//      u32                         Failure;</div><div class='add'>+	u32 ValueRead;</div><div class='add'>+	u32 i;</div><div class='add'>+	u32 numSections = 0;</div><div class='add'>+	u32 sectionSize[16];</div><div class='add'>+	u32 sectionStart[16];</div><div class='add'>+</div><div class='add'>+	SXG_TRACE(TRACE_SXG, SxgTraceBuffer, TRACE_NOISY, "DnldUcod",</div><div class='add'>+		  adapter, 0, 0, 0);</div><div class='add'>+	DBG_ERROR("sxg: %s ENTER\n", __FUNCTION__);</div><div class='add'>+</div><div class='add'>+	switch (UcodeSel) {</div><div class='add'>+	case SXG_UCODE_SAHARA:	// Sahara operational ucode</div><div class='add'>+		numSections = SNumSections;</div><div class='add'>+		for (i = 0; i &lt; numSections; i++) {</div><div class='add'>+			sectionSize[i] = SSectionSize[i];</div><div class='add'>+			sectionStart[i] = SSectionStart[i];</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		printk(KERN_ERR KBUILD_MODNAME</div><div class='add'>+		       ": Woah, big error with the microcode!\n");</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBG_ERROR("sxg: RESET THE CARD\n");</div><div class='add'>+	// First, reset the card</div><div class='add'>+	WRITE_REG(HwRegs-&gt;Reset, 0xDEAD, FLUSH);</div><div class='add'>+</div><div class='add'>+	// Download each section of the microcode as specified in</div><div class='add'>+	// its download file.  The *download.c file is generated using</div><div class='add'>+	// the saharaobjtoc facility which converts the metastep .obj</div><div class='add'>+	// file to a .c file which contains a two dimentional array.</div><div class='add'>+	for (Section = 0; Section &lt; numSections; Section++) {</div><div class='add'>+		DBG_ERROR("sxg: SECTION # %d\n", Section);</div><div class='add'>+		switch (UcodeSel) {</div><div class='add'>+		case SXG_UCODE_SAHARA:</div><div class='add'>+			Instruction = (u32 *) &amp; SaharaUCode[Section][0];</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			ASSERT(0);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		BaseAddress = sectionStart[Section];</div><div class='add'>+		ThisSectionSize = sectionSize[Section] / 12;	// Size in instructions</div><div class='add'>+		for (AddressOffset = 0; AddressOffset &lt; ThisSectionSize;</div><div class='add'>+		     AddressOffset++) {</div><div class='add'>+			Address = BaseAddress + AddressOffset;</div><div class='add'>+			ASSERT((Address &amp; ~MICROCODE_ADDRESS_MASK) == 0);</div><div class='add'>+			// Write instruction bits 31 - 0</div><div class='add'>+			WRITE_REG(HwRegs-&gt;UcodeDataLow, *Instruction, FLUSH);</div><div class='add'>+			// Write instruction bits 63-32</div><div class='add'>+			WRITE_REG(HwRegs-&gt;UcodeDataMiddle, *(Instruction + 1),</div><div class='add'>+				  FLUSH);</div><div class='add'>+			// Write instruction bits 95-64</div><div class='add'>+			WRITE_REG(HwRegs-&gt;UcodeDataHigh, *(Instruction + 2),</div><div class='add'>+				  FLUSH);</div><div class='add'>+			// Write instruction address with the WRITE bit set</div><div class='add'>+			WRITE_REG(HwRegs-&gt;UcodeAddr,</div><div class='add'>+				  (Address | MICROCODE_ADDRESS_WRITE), FLUSH);</div><div class='add'>+			// Sahara bug in the ucode download logic - the write to DataLow</div><div class='add'>+			// for the next instruction could get corrupted.  To avoid this,</div><div class='add'>+			// write to DataLow again for this instruction (which may get</div><div class='add'>+			// corrupted, but it doesn't matter), then increment the address</div><div class='add'>+			// and write the data for the next instruction to DataLow.  That</div><div class='add'>+			// write should succeed.</div><div class='add'>+			WRITE_REG(HwRegs-&gt;UcodeDataLow, *Instruction, TRUE);</div><div class='add'>+			// Advance 3 u32S to start of next instruction</div><div class='add'>+			Instruction += 3;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	// Now repeat the entire operation reading the instruction back and</div><div class='add'>+	// checking for parity errors</div><div class='add'>+	for (Section = 0; Section &lt; numSections; Section++) {</div><div class='add'>+		DBG_ERROR("sxg: check SECTION # %d\n", Section);</div><div class='add'>+		switch (UcodeSel) {</div><div class='add'>+		case SXG_UCODE_SAHARA:</div><div class='add'>+			Instruction = (u32 *) &amp; SaharaUCode[Section][0];</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			ASSERT(0);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		BaseAddress = sectionStart[Section];</div><div class='add'>+		ThisSectionSize = sectionSize[Section] / 12;	// Size in instructions</div><div class='add'>+		for (AddressOffset = 0; AddressOffset &lt; ThisSectionSize;</div><div class='add'>+		     AddressOffset++) {</div><div class='add'>+			Address = BaseAddress + AddressOffset;</div><div class='add'>+			// Write the address with the READ bit set</div><div class='add'>+			WRITE_REG(HwRegs-&gt;UcodeAddr,</div><div class='add'>+				  (Address | MICROCODE_ADDRESS_READ), FLUSH);</div><div class='add'>+			// Read it back and check parity bit.</div><div class='add'>+			READ_REG(HwRegs-&gt;UcodeAddr, ValueRead);</div><div class='add'>+			if (ValueRead &amp; MICROCODE_ADDRESS_PARITY) {</div><div class='add'>+				DBG_ERROR("sxg: %s PARITY ERROR\n",</div><div class='add'>+					  __FUNCTION__);</div><div class='add'>+</div><div class='add'>+				return (FALSE);	// Parity error</div><div class='add'>+			}</div><div class='add'>+			ASSERT((ValueRead &amp; MICROCODE_ADDRESS_MASK) == Address);</div><div class='add'>+			// Read the instruction back and compare</div><div class='add'>+			READ_REG(HwRegs-&gt;UcodeDataLow, ValueRead);</div><div class='add'>+			if (ValueRead != *Instruction) {</div><div class='add'>+				DBG_ERROR("sxg: %s MISCOMPARE LOW\n",</div><div class='add'>+					  __FUNCTION__);</div><div class='add'>+				return (FALSE);	// Miscompare</div><div class='add'>+			}</div><div class='add'>+			READ_REG(HwRegs-&gt;UcodeDataMiddle, ValueRead);</div><div class='add'>+			if (ValueRead != *(Instruction + 1)) {</div><div class='add'>+				DBG_ERROR("sxg: %s MISCOMPARE MIDDLE\n",</div><div class='add'>+					  __FUNCTION__);</div><div class='add'>+				return (FALSE);	// Miscompare</div><div class='add'>+			}</div><div class='add'>+			READ_REG(HwRegs-&gt;UcodeDataHigh, ValueRead);</div><div class='add'>+			if (ValueRead != *(Instruction + 2)) {</div><div class='add'>+				DBG_ERROR("sxg: %s MISCOMPARE HIGH\n",</div><div class='add'>+					  __FUNCTION__);</div><div class='add'>+				return (FALSE);	// Miscompare</div><div class='add'>+			}</div><div class='add'>+			// Advance 3 u32S to start of next instruction</div><div class='add'>+			Instruction += 3;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	// Everything OK, Go.</div><div class='add'>+	WRITE_REG(HwRegs-&gt;UcodeAddr, MICROCODE_ADDRESS_GO, FLUSH);</div><div class='add'>+</div><div class='add'>+	// Poll the CardUp register to wait for microcode to initialize</div><div class='add'>+	// Give up after 10,000 attemps (500ms).</div><div class='add'>+	for (i = 0; i &lt; 10000; i++) {</div><div class='add'>+		udelay(50);</div><div class='add'>+		READ_REG(adapter-&gt;UcodeRegs[0].CardUp, ValueRead);</div><div class='add'>+		if (ValueRead == 0xCAFE) {</div><div class='add'>+			DBG_ERROR("sxg: %s BOO YA 0xCAFE\n", __FUNCTION__);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (i == 10000) {</div><div class='add'>+		DBG_ERROR("sxg: %s TIMEOUT\n", __FUNCTION__);</div><div class='add'>+</div><div class='add'>+		return (FALSE);	// Timeout</div><div class='add'>+	}</div><div class='add'>+	// Now write the LoadSync register.  This is used to</div><div class='add'>+	// synchronize with the card so it can scribble on the memory</div><div class='add'>+	// that contained 0xCAFE from the "CardUp" step above</div><div class='add'>+	if (UcodeSel == SXG_UCODE_SAHARA) {</div><div class='add'>+		WRITE_REG(adapter-&gt;UcodeRegs[0].LoadSync, 0, FLUSH);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	SXG_TRACE(TRACE_SXG, SxgTraceBuffer, TRACE_NOISY, "XDnldUcd",</div><div class='add'>+		  adapter, 0, 0, 0);</div><div class='add'>+	DBG_ERROR("sxg: %s EXIT\n", __FUNCTION__);</div><div class='add'>+</div><div class='add'>+	return (TRUE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * sxg_allocate_resources - Allocate memory and locks</div><div class='add'>+ *</div><div class='add'>+ * Arguments -</div><div class='add'>+ *	adapter		- A pointer to our adapter structure</div><div class='add'>+ *</div><div class='add'>+ * Return</div><div class='add'>+ *	int</div><div class='add'>+ */</div><div class='add'>+static int sxg_allocate_resources(p_adapter_t adapter)</div><div class='add'>+{</div><div class='add'>+	int status;</div><div class='add'>+	u32 i;</div><div class='add'>+	u32 RssIds, IsrCount;</div><div class='add'>+//      PSXG_XMT_RING                                   XmtRing;</div><div class='add'>+//      PSXG_RCV_RING                                   RcvRing;</div><div class='add'>+</div><div class='add'>+	DBG_ERROR("%s ENTER\n", __FUNCTION__);</div><div class='add'>+</div><div class='add'>+	SXG_TRACE(TRACE_SXG, SxgTraceBuffer, TRACE_NOISY, "AllocRes",</div><div class='add'>+		  adapter, 0, 0, 0);</div><div class='add'>+</div><div class='add'>+	// Windows tells us how many CPUs it plans to use for</div><div class='add'>+	// RSS</div><div class='add'>+	RssIds = SXG_RSS_CPU_COUNT(adapter);</div><div class='add'>+	IsrCount = adapter-&gt;MsiEnabled ? RssIds : 1;</div><div class='add'>+</div><div class='add'>+	DBG_ERROR("%s Setup the spinlocks\n", __FUNCTION__);</div><div class='add'>+</div><div class='add'>+	// Allocate spinlocks and initialize listheads first.</div><div class='add'>+	spin_lock_init(&amp;adapter-&gt;RcvQLock);</div><div class='add'>+	spin_lock_init(&amp;adapter-&gt;SglQLock);</div><div class='add'>+	spin_lock_init(&amp;adapter-&gt;XmtZeroLock);</div><div class='add'>+	spin_lock_init(&amp;adapter-&gt;Bit64RegLock);</div><div class='add'>+	spin_lock_init(&amp;adapter-&gt;AdapterLock);</div><div class='add'>+</div><div class='add'>+	DBG_ERROR("%s Setup the lists\n", __FUNCTION__);</div><div class='add'>+</div><div class='add'>+	InitializeListHead(&amp;adapter-&gt;FreeRcvBuffers);</div><div class='add'>+	InitializeListHead(&amp;adapter-&gt;FreeRcvBlocks);</div><div class='add'>+	InitializeListHead(&amp;adapter-&gt;AllRcvBlocks);</div><div class='add'>+	InitializeListHead(&amp;adapter-&gt;FreeSglBuffers);</div><div class='add'>+	InitializeListHead(&amp;adapter-&gt;AllSglBuffers);</div><div class='add'>+</div><div class='add'>+	// Mark these basic allocations done.  This flags essentially</div><div class='add'>+	// tells the SxgFreeResources routine that it can grab spinlocks</div><div class='add'>+	// and reference listheads.</div><div class='add'>+	adapter-&gt;BasicAllocations = TRUE;</div><div class='add'>+	// Main allocation loop.  Start with the maximum supported by</div><div class='add'>+	// the microcode and back off if memory allocation</div><div class='add'>+	// fails.  If we hit a minimum, fail.</div><div class='add'>+</div><div class='add'>+	for (;;) {</div><div class='add'>+		DBG_ERROR("%s Allocate XmtRings size[%lx]\n", __FUNCTION__,</div><div class='add'>+			  (sizeof(SXG_XMT_RING) * 1));</div><div class='add'>+</div><div class='add'>+		// Start with big items first - receive and transmit rings.  At the moment</div><div class='add'>+		// I'm going to keep the ring size fixed and adjust the number of</div><div class='add'>+		// TCBs if we fail.  Later we might consider reducing the ring size as well..</div><div class='add'>+		adapter-&gt;XmtRings = pci_alloc_consistent(adapter-&gt;pcidev,</div><div class='add'>+							 sizeof(SXG_XMT_RING) *</div><div class='add'>+							 1,</div><div class='add'>+							 &amp;adapter-&gt;PXmtRings);</div><div class='add'>+		DBG_ERROR("%s XmtRings[%p]\n", __FUNCTION__, adapter-&gt;XmtRings);</div><div class='add'>+</div><div class='add'>+		if (!adapter-&gt;XmtRings) {</div><div class='add'>+			goto per_tcb_allocation_failed;</div><div class='add'>+		}</div><div class='add'>+		memset(adapter-&gt;XmtRings, 0, sizeof(SXG_XMT_RING) * 1);</div><div class='add'>+</div><div class='add'>+		DBG_ERROR("%s Allocate RcvRings size[%lx]\n", __FUNCTION__,</div><div class='add'>+			  (sizeof(SXG_RCV_RING) * 1));</div><div class='add'>+		adapter-&gt;RcvRings =</div><div class='add'>+		    pci_alloc_consistent(adapter-&gt;pcidev,</div><div class='add'>+					 sizeof(SXG_RCV_RING) * 1,</div><div class='add'>+					 &amp;adapter-&gt;PRcvRings);</div><div class='add'>+		DBG_ERROR("%s RcvRings[%p]\n", __FUNCTION__, adapter-&gt;RcvRings);</div><div class='add'>+		if (!adapter-&gt;RcvRings) {</div><div class='add'>+			goto per_tcb_allocation_failed;</div><div class='add'>+		}</div><div class='add'>+		memset(adapter-&gt;RcvRings, 0, sizeof(SXG_RCV_RING) * 1);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	      per_tcb_allocation_failed:</div><div class='add'>+		// an allocation failed.  Free any successful allocations.</div><div class='add'>+		if (adapter-&gt;XmtRings) {</div><div class='add'>+			pci_free_consistent(adapter-&gt;pcidev,</div><div class='add'>+					    sizeof(SXG_XMT_RING) * 4096,</div><div class='add'>+					    adapter-&gt;XmtRings,</div><div class='add'>+					    adapter-&gt;PXmtRings);</div><div class='add'>+			adapter-&gt;XmtRings = NULL;</div><div class='add'>+		}</div><div class='add'>+		if (adapter-&gt;RcvRings) {</div><div class='add'>+			pci_free_consistent(adapter-&gt;pcidev,</div><div class='add'>+					    sizeof(SXG_RCV_RING) * 4096,</div><div class='add'>+					    adapter-&gt;RcvRings,</div><div class='add'>+					    adapter-&gt;PRcvRings);</div><div class='add'>+			adapter-&gt;RcvRings = NULL;</div><div class='add'>+		}</div><div class='add'>+		// Loop around and try again....</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBG_ERROR("%s Initialize RCV ZERO and XMT ZERO rings\n", __FUNCTION__);</div><div class='add'>+	// Initialize rcv zero and xmt zero rings</div><div class='add'>+	SXG_INITIALIZE_RING(adapter-&gt;RcvRingZeroInfo, SXG_RCV_RING_SIZE);</div><div class='add'>+	SXG_INITIALIZE_RING(adapter-&gt;XmtRingZeroInfo, SXG_XMT_RING_SIZE);</div><div class='add'>+</div><div class='add'>+	// Sanity check receive data structure format</div><div class='add'>+	ASSERT((adapter-&gt;ReceiveBufferSize == SXG_RCV_DATA_BUFFER_SIZE) ||</div><div class='add'>+	       (adapter-&gt;ReceiveBufferSize == SXG_RCV_JUMBO_BUFFER_SIZE));</div><div class='add'>+	ASSERT(sizeof(SXG_RCV_DESCRIPTOR_BLOCK) ==</div><div class='add'>+	       SXG_RCV_DESCRIPTOR_BLOCK_SIZE);</div><div class='add'>+</div><div class='add'>+	// Allocate receive data buffers.  We allocate a block of buffers and</div><div class='add'>+	// a corresponding descriptor block at once.  See sxghw.h:SXG_RCV_BLOCK</div><div class='add'>+	for (i = 0; i &lt; SXG_INITIAL_RCV_DATA_BUFFERS;</div><div class='add'>+	     i += SXG_RCV_DESCRIPTORS_PER_BLOCK) {</div><div class='add'>+		sxg_allocate_buffer_memory(adapter,</div><div class='add'>+					   SXG_RCV_BLOCK_SIZE(adapter-&gt;</div><div class='add'>+							      ReceiveBufferSize),</div><div class='add'>+					   SXG_BUFFER_TYPE_RCV);</div><div class='add'>+	}</div><div class='add'>+	// NBL resource allocation can fail in the 'AllocateComplete' routine, which</div><div class='add'>+	// doesn't return status.  Make sure we got the number of buffers we requested</div><div class='add'>+	if (adapter-&gt;FreeRcvBufferCount &lt; SXG_INITIAL_RCV_DATA_BUFFERS) {</div><div class='add'>+		SXG_TRACE(TRACE_SXG, SxgTraceBuffer, TRACE_NOISY, "XAResF6",</div><div class='add'>+			  adapter, adapter-&gt;FreeRcvBufferCount, SXG_MAX_ENTRIES,</div><div class='add'>+			  0);</div><div class='add'>+		return (STATUS_RESOURCES);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBG_ERROR("%s Allocate EventRings size[%lx]\n", __FUNCTION__,</div><div class='add'>+		  (sizeof(SXG_EVENT_RING) * RssIds));</div><div class='add'>+</div><div class='add'>+	// Allocate event queues.</div><div class='add'>+	adapter-&gt;EventRings = pci_alloc_consistent(adapter-&gt;pcidev,</div><div class='add'>+						   sizeof(SXG_EVENT_RING) *</div><div class='add'>+						   RssIds,</div><div class='add'>+						   &amp;adapter-&gt;PEventRings);</div><div class='add'>+</div><div class='add'>+	if (!adapter-&gt;EventRings) {</div><div class='add'>+		// Caller will call SxgFreeAdapter to clean up above allocations</div><div class='add'>+		SXG_TRACE(TRACE_SXG, SxgTraceBuffer, TRACE_NOISY, "XAResF8",</div><div class='add'>+			  adapter, SXG_MAX_ENTRIES, 0, 0);</div><div class='add'>+		status = STATUS_RESOURCES;</div><div class='add'>+		goto per_tcb_allocation_failed;</div><div class='add'>+	}</div><div class='add'>+	memset(adapter-&gt;EventRings, 0, sizeof(SXG_EVENT_RING) * RssIds);</div><div class='add'>+</div><div class='add'>+	DBG_ERROR("%s Allocate ISR size[%x]\n", __FUNCTION__, IsrCount);</div><div class='add'>+	// Allocate ISR</div><div class='add'>+	adapter-&gt;Isr = pci_alloc_consistent(adapter-&gt;pcidev,</div><div class='add'>+					    IsrCount, &amp;adapter-&gt;PIsr);</div><div class='add'>+	if (!adapter-&gt;Isr) {</div><div class='add'>+		// Caller will call SxgFreeAdapter to clean up above allocations</div><div class='add'>+		SXG_TRACE(TRACE_SXG, SxgTraceBuffer, TRACE_NOISY, "XAResF9",</div><div class='add'>+			  adapter, SXG_MAX_ENTRIES, 0, 0);</div><div class='add'>+		status = STATUS_RESOURCES;</div><div class='add'>+		goto per_tcb_allocation_failed;</div><div class='add'>+	}</div><div class='add'>+	memset(adapter-&gt;Isr, 0, sizeof(u32) * IsrCount);</div><div class='add'>+</div><div class='add'>+	DBG_ERROR("%s Allocate shared XMT ring zero index location size[%lx]\n",</div><div class='add'>+		  __FUNCTION__, sizeof(u32));</div><div class='add'>+</div><div class='add'>+	// Allocate shared XMT ring zero index location</div><div class='add'>+	adapter-&gt;XmtRingZeroIndex = pci_alloc_consistent(adapter-&gt;pcidev,</div><div class='add'>+							 sizeof(u32),</div><div class='add'>+							 &amp;adapter-&gt;</div><div class='add'>+							 PXmtRingZeroIndex);</div><div class='add'>+	if (!adapter-&gt;XmtRingZeroIndex) {</div><div class='add'>+		SXG_TRACE(TRACE_SXG, SxgTraceBuffer, TRACE_NOISY, "XAResF10",</div><div class='add'>+			  adapter, SXG_MAX_ENTRIES, 0, 0);</div><div class='add'>+		status = STATUS_RESOURCES;</div><div class='add'>+		goto per_tcb_allocation_failed;</div><div class='add'>+	}</div><div class='add'>+	memset(adapter-&gt;XmtRingZeroIndex, 0, sizeof(u32));</div><div class='add'>+</div><div class='add'>+	SXG_TRACE(TRACE_SXG, SxgTraceBuffer, TRACE_NOISY, "XAlcResS",</div><div class='add'>+		  adapter, SXG_MAX_ENTRIES, 0, 0);</div><div class='add'>+</div><div class='add'>+	DBG_ERROR("%s EXIT\n", __FUNCTION__);</div><div class='add'>+	return (STATUS_SUCCESS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * sxg_config_pci -</div><div class='add'>+ *</div><div class='add'>+ * Set up PCI Configuration space</div><div class='add'>+ *</div><div class='add'>+ * Arguments -</div><div class='add'>+ *		pcidev			- A pointer to our adapter structure</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+static void sxg_config_pci(struct pci_dev *pcidev)</div><div class='add'>+{</div><div class='add'>+	u16 pci_command;</div><div class='add'>+	u16 new_command;</div><div class='add'>+</div><div class='add'>+	pci_read_config_word(pcidev, PCI_COMMAND, &amp;pci_command);</div><div class='add'>+	DBG_ERROR("sxg: %s  PCI command[%4.4x]\n", __FUNCTION__, pci_command);</div><div class='add'>+	// Set the command register</div><div class='add'>+	new_command = pci_command | (PCI_COMMAND_MEMORY |	// Memory Space Enable</div><div class='add'>+				     PCI_COMMAND_MASTER |	// Bus master enable</div><div class='add'>+				     PCI_COMMAND_INVALIDATE |	// Memory write and invalidate</div><div class='add'>+				     PCI_COMMAND_PARITY |	// Parity error response</div><div class='add'>+				     PCI_COMMAND_SERR |	// System ERR</div><div class='add'>+				     PCI_COMMAND_FAST_BACK);	// Fast back-to-back</div><div class='add'>+	if (pci_command != new_command) {</div><div class='add'>+		DBG_ERROR("%s -- Updating PCI COMMAND register %4.4x-&gt;%4.4x.\n",</div><div class='add'>+			  __FUNCTION__, pci_command, new_command);</div><div class='add'>+		pci_write_config_word(pcidev, PCI_COMMAND, new_command);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sxg_entry_probe(struct pci_dev *pcidev,</div><div class='add'>+			   const struct pci_device_id *pci_tbl_entry)</div><div class='add'>+{</div><div class='add'>+	static int did_version = 0;</div><div class='add'>+	int err;</div><div class='add'>+	struct net_device *netdev;</div><div class='add'>+	p_adapter_t adapter;</div><div class='add'>+	void __iomem *memmapped_ioaddr;</div><div class='add'>+	u32 status = 0;</div><div class='add'>+	ulong mmio_start = 0;</div><div class='add'>+	ulong mmio_len = 0;</div><div class='add'>+</div><div class='add'>+	DBG_ERROR("sxg: %s 2.6 VERSION ENTER jiffies[%lx] cpu %d\n",</div><div class='add'>+		  __FUNCTION__, jiffies, smp_processor_id());</div><div class='add'>+</div><div class='add'>+	// Initialize trace buffer</div><div class='add'>+#ifdef ATKDBG</div><div class='add'>+	SxgTraceBuffer = &amp;LSxgTraceBuffer;</div><div class='add'>+	SXG_TRACE_INIT(SxgTraceBuffer, TRACE_NOISY);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	sxg_global.dynamic_intagg = dynamic_intagg;</div><div class='add'>+</div><div class='add'>+	err = pci_enable_device(pcidev);</div><div class='add'>+</div><div class='add'>+	DBG_ERROR("Call pci_enable_device(%p)  status[%x]\n", pcidev, err);</div><div class='add'>+	if (err) {</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (sxg_debug &gt; 0 &amp;&amp; did_version++ == 0) {</div><div class='add'>+		printk(KERN_INFO "%s\n", sxg_banner);</div><div class='add'>+		printk(KERN_INFO "%s\n", DRV_VERSION);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!(err = pci_set_dma_mask(pcidev, DMA_64BIT_MASK))) {</div><div class='add'>+		DBG_ERROR("pci_set_dma_mask(DMA_64BIT_MASK) successful\n");</div><div class='add'>+	} else {</div><div class='add'>+		if ((err = pci_set_dma_mask(pcidev, DMA_32BIT_MASK))) {</div><div class='add'>+			DBG_ERROR</div><div class='add'>+			    ("No usable DMA configuration, aborting  err[%x]\n",</div><div class='add'>+			     err);</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+		DBG_ERROR("pci_set_dma_mask(DMA_32BIT_MASK) successful\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBG_ERROR("Call pci_request_regions\n");</div><div class='add'>+</div><div class='add'>+	err = pci_request_regions(pcidev, DRV_NAME);</div><div class='add'>+	if (err) {</div><div class='add'>+		DBG_ERROR("pci_request_regions FAILED err[%x]\n", err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBG_ERROR("call pci_set_master\n");</div><div class='add'>+	pci_set_master(pcidev);</div><div class='add'>+</div><div class='add'>+	DBG_ERROR("call alloc_etherdev\n");</div><div class='add'>+	netdev = alloc_etherdev(sizeof(adapter_t));</div><div class='add'>+	if (!netdev) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto err_out_exit_sxg_probe;</div><div class='add'>+	}</div><div class='add'>+	DBG_ERROR("alloc_etherdev for slic netdev[%p]\n", netdev);</div><div class='add'>+</div><div class='add'>+	SET_NETDEV_DEV(netdev, &amp;pcidev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	pci_set_drvdata(pcidev, netdev);</div><div class='add'>+	adapter = netdev_priv(netdev);</div><div class='add'>+	adapter-&gt;netdev = netdev;</div><div class='add'>+	adapter-&gt;pcidev = pcidev;</div><div class='add'>+</div><div class='add'>+	mmio_start = pci_resource_start(pcidev, 0);</div><div class='add'>+	mmio_len = pci_resource_len(pcidev, 0);</div><div class='add'>+</div><div class='add'>+	DBG_ERROR("sxg: call ioremap(mmio_start[%lx], mmio_len[%lx])\n",</div><div class='add'>+		  mmio_start, mmio_len);</div><div class='add'>+</div><div class='add'>+	memmapped_ioaddr = ioremap(mmio_start, mmio_len);</div><div class='add'>+	DBG_ERROR("sxg: %s MEMMAPPED_IOADDR [%p]\n", __FUNCTION__,</div><div class='add'>+		  memmapped_ioaddr);</div><div class='add'>+	if (!memmapped_ioaddr) {</div><div class='add'>+		DBG_ERROR("%s cannot remap MMIO region %lx @ %lx\n",</div><div class='add'>+			  __FUNCTION__, mmio_len, mmio_start);</div><div class='add'>+		goto err_out_free_mmio_region;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBG_ERROR</div><div class='add'>+	    ("sxg: %s found Alacritech SXG PCI, MMIO at %p, start[%lx] len[%lx], IRQ %d.\n",</div><div class='add'>+	     __func__, memmapped_ioaddr, mmio_start, mmio_len, pcidev-&gt;irq);</div><div class='add'>+</div><div class='add'>+	adapter-&gt;HwRegs = (void *)memmapped_ioaddr;</div><div class='add'>+	adapter-&gt;base_addr = memmapped_ioaddr;</div><div class='add'>+</div><div class='add'>+	mmio_start = pci_resource_start(pcidev, 2);</div><div class='add'>+	mmio_len = pci_resource_len(pcidev, 2);</div><div class='add'>+</div><div class='add'>+	DBG_ERROR("sxg: call ioremap(mmio_start[%lx], mmio_len[%lx])\n",</div><div class='add'>+		  mmio_start, mmio_len);</div><div class='add'>+</div><div class='add'>+	memmapped_ioaddr = ioremap(mmio_start, mmio_len);</div><div class='add'>+	DBG_ERROR("sxg: %s MEMMAPPED_IOADDR [%p]\n", __func__,</div><div class='add'>+		  memmapped_ioaddr);</div><div class='add'>+	if (!memmapped_ioaddr) {</div><div class='add'>+		DBG_ERROR("%s cannot remap MMIO region %lx @ %lx\n",</div><div class='add'>+			  __FUNCTION__, mmio_len, mmio_start);</div><div class='add'>+		goto err_out_free_mmio_region;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBG_ERROR("sxg: %s found Alacritech SXG PCI, MMIO at %p, "</div><div class='add'>+		  "start[%lx] len[%lx], IRQ %d.\n", __func__,</div><div class='add'>+		  memmapped_ioaddr, mmio_start, mmio_len, pcidev-&gt;irq);</div><div class='add'>+</div><div class='add'>+	adapter-&gt;UcodeRegs = (void *)memmapped_ioaddr;</div><div class='add'>+</div><div class='add'>+	adapter-&gt;State = SXG_STATE_INITIALIZING;</div><div class='add'>+	// Maintain a list of all adapters anchored by</div><div class='add'>+	// the global SxgDriver structure.</div><div class='add'>+	adapter-&gt;Next = SxgDriver.Adapters;</div><div class='add'>+	SxgDriver.Adapters = adapter;</div><div class='add'>+	adapter-&gt;AdapterID = ++SxgDriver.AdapterID;</div><div class='add'>+</div><div class='add'>+	// Initialize CRC table used to determine multicast hash</div><div class='add'>+	sxg_mcast_init_crc32();</div><div class='add'>+</div><div class='add'>+	adapter-&gt;JumboEnabled = FALSE;</div><div class='add'>+	adapter-&gt;RssEnabled = FALSE;</div><div class='add'>+	if (adapter-&gt;JumboEnabled) {</div><div class='add'>+		adapter-&gt;FrameSize = JUMBOMAXFRAME;</div><div class='add'>+		adapter-&gt;ReceiveBufferSize = SXG_RCV_JUMBO_BUFFER_SIZE;</div><div class='add'>+	} else {</div><div class='add'>+		adapter-&gt;FrameSize = ETHERMAXFRAME;</div><div class='add'>+		adapter-&gt;ReceiveBufferSize = SXG_RCV_DATA_BUFFER_SIZE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+//    status = SXG_READ_EEPROM(adapter);</div><div class='add'>+//    if (!status) {</div><div class='add'>+//        goto sxg_init_bad;</div><div class='add'>+//    }</div><div class='add'>+</div><div class='add'>+	DBG_ERROR("sxg: %s ENTER sxg_config_pci\n", __FUNCTION__);</div><div class='add'>+	sxg_config_pci(pcidev);</div><div class='add'>+	DBG_ERROR("sxg: %s EXIT sxg_config_pci\n", __FUNCTION__);</div><div class='add'>+</div><div class='add'>+	DBG_ERROR("sxg: %s ENTER sxg_init_driver\n", __FUNCTION__);</div><div class='add'>+	sxg_init_driver();</div><div class='add'>+	DBG_ERROR("sxg: %s EXIT sxg_init_driver\n", __FUNCTION__);</div><div class='add'>+</div><div class='add'>+	adapter-&gt;vendid = pci_tbl_entry-&gt;vendor;</div><div class='add'>+	adapter-&gt;devid = pci_tbl_entry-&gt;device;</div><div class='add'>+	adapter-&gt;subsysid = pci_tbl_entry-&gt;subdevice;</div><div class='add'>+	adapter-&gt;busnumber = pcidev-&gt;bus-&gt;number;</div><div class='add'>+	adapter-&gt;slotnumber = ((pcidev-&gt;devfn &gt;&gt; 3) &amp; 0x1F);</div><div class='add'>+	adapter-&gt;functionnumber = (pcidev-&gt;devfn &amp; 0x7);</div><div class='add'>+	adapter-&gt;memorylength = pci_resource_len(pcidev, 0);</div><div class='add'>+	adapter-&gt;irq = pcidev-&gt;irq;</div><div class='add'>+	adapter-&gt;next_netdevice = head_netdevice;</div><div class='add'>+	head_netdevice = netdev;</div><div class='add'>+//      adapter-&gt;chipid = chip_idx;</div><div class='add'>+	adapter-&gt;port = 0;	//adapter-&gt;functionnumber;</div><div class='add'>+	adapter-&gt;cardindex = adapter-&gt;port;</div><div class='add'>+</div><div class='add'>+	// Allocate memory and other resources</div><div class='add'>+	DBG_ERROR("sxg: %s ENTER sxg_allocate_resources\n", __FUNCTION__);</div><div class='add'>+	status = sxg_allocate_resources(adapter);</div><div class='add'>+	DBG_ERROR("sxg: %s EXIT sxg_allocate_resources status %x\n",</div><div class='add'>+		  __FUNCTION__, status);</div><div class='add'>+	if (status != STATUS_SUCCESS) {</div><div class='add'>+		goto err_out_unmap;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBG_ERROR("sxg: %s ENTER sxg_download_microcode\n", __FUNCTION__);</div><div class='add'>+	if (sxg_download_microcode(adapter, SXG_UCODE_SAHARA)) {</div><div class='add'>+		DBG_ERROR("sxg: %s ENTER sxg_adapter_set_hwaddr\n",</div><div class='add'>+			  __FUNCTION__);</div><div class='add'>+		sxg_adapter_set_hwaddr(adapter);</div><div class='add'>+	} else {</div><div class='add'>+		adapter-&gt;state = ADAPT_FAIL;</div><div class='add'>+		adapter-&gt;linkstate = LINK_DOWN;</div><div class='add'>+		DBG_ERROR("sxg_download_microcode FAILED status[%x]\n", status);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netdev-&gt;base_addr = (unsigned long)adapter-&gt;base_addr;</div><div class='add'>+	netdev-&gt;irq = adapter-&gt;irq;</div><div class='add'>+	netdev-&gt;open = sxg_entry_open;</div><div class='add'>+	netdev-&gt;stop = sxg_entry_halt;</div><div class='add'>+	netdev-&gt;hard_start_xmit = sxg_send_packets;</div><div class='add'>+	netdev-&gt;do_ioctl = sxg_ioctl;</div><div class='add'>+#if XXXTODO</div><div class='add'>+	netdev-&gt;set_mac_address = sxg_mac_set_address;</div><div class='add'>+#if SLIC_GET_STATS_ENABLED</div><div class='add'>+	netdev-&gt;get_stats = sxg_get_stats;</div><div class='add'>+#endif</div><div class='add'>+	netdev-&gt;set_multicast_list = sxg_mcast_set_list;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	strcpy(netdev-&gt;name, "eth%d");</div><div class='add'>+//  strcpy(netdev-&gt;name, pci_name(pcidev));</div><div class='add'>+	if ((err = register_netdev(netdev))) {</div><div class='add'>+		DBG_ERROR("Cannot register net device, aborting. %s\n",</div><div class='add'>+			  netdev-&gt;name);</div><div class='add'>+		goto err_out_unmap;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBG_ERROR</div><div class='add'>+	    ("sxg: %s addr 0x%lx, irq %d, MAC addr %02X:%02X:%02X:%02X:%02X:%02X\n",</div><div class='add'>+	     netdev-&gt;name, netdev-&gt;base_addr, pcidev-&gt;irq, netdev-&gt;dev_addr[0],</div><div class='add'>+	     netdev-&gt;dev_addr[1], netdev-&gt;dev_addr[2], netdev-&gt;dev_addr[3],</div><div class='add'>+	     netdev-&gt;dev_addr[4], netdev-&gt;dev_addr[5]);</div><div class='add'>+</div><div class='add'>+//sxg_init_bad:</div><div class='add'>+	ASSERT(status == FALSE);</div><div class='add'>+//      sxg_free_adapter(adapter);</div><div class='add'>+</div><div class='add'>+	DBG_ERROR("sxg: %s EXIT status[%x] jiffies[%lx] cpu %d\n", __FUNCTION__,</div><div class='add'>+		  status, jiffies, smp_processor_id());</div><div class='add'>+	return status;</div><div class='add'>+</div><div class='add'>+      err_out_unmap:</div><div class='add'>+	iounmap((void *)memmapped_ioaddr);</div><div class='add'>+</div><div class='add'>+      err_out_free_mmio_region:</div><div class='add'>+	release_mem_region(mmio_start, mmio_len);</div><div class='add'>+</div><div class='add'>+      err_out_exit_sxg_probe:</div><div class='add'>+</div><div class='add'>+	DBG_ERROR("%s EXIT jiffies[%lx] cpu %d\n", __FUNCTION__, jiffies,</div><div class='add'>+		  smp_processor_id());</div><div class='add'>+</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/***********************************************************************</div><div class='add'>+ * LINE BASE Interrupt routines..</div><div class='add'>+ ***********************************************************************/</div><div class='add'>+/*</div><div class='add'>+ *</div><div class='add'>+ * sxg_disable_interrupt</div><div class='add'>+ *</div><div class='add'>+ * DisableInterrupt Handler</div><div class='add'>+ *</div><div class='add'>+ * Arguments:</div><div class='add'>+ *</div><div class='add'>+ *   adapter:	Our adapter structure</div><div class='add'>+ *</div><div class='add'>+ * Return Value:</div><div class='add'>+ * 	None.</div><div class='add'>+ */</div><div class='add'>+static void sxg_disable_interrupt(p_adapter_t adapter)</div><div class='add'>+{</div><div class='add'>+	SXG_TRACE(TRACE_SXG, SxgTraceBuffer, TRACE_NOISY, "DisIntr",</div><div class='add'>+		  adapter, adapter-&gt;InterruptsEnabled, 0, 0);</div><div class='add'>+	// For now, RSS is disabled with line based interrupts</div><div class='add'>+	ASSERT(adapter-&gt;RssEnabled == FALSE);</div><div class='add'>+	ASSERT(adapter-&gt;MsiEnabled == FALSE);</div><div class='add'>+	//</div><div class='add'>+	// Turn off interrupts by writing to the icr register.</div><div class='add'>+	//</div><div class='add'>+	WRITE_REG(adapter-&gt;UcodeRegs[0].Icr, SXG_ICR(0, SXG_ICR_DISABLE), TRUE);</div><div class='add'>+</div><div class='add'>+	adapter-&gt;InterruptsEnabled = 0;</div><div class='add'>+</div><div class='add'>+	SXG_TRACE(TRACE_SXG, SxgTraceBuffer, TRACE_NOISY, "XDisIntr",</div><div class='add'>+		  adapter, adapter-&gt;InterruptsEnabled, 0, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *</div><div class='add'>+ * sxg_enable_interrupt</div><div class='add'>+ *</div><div class='add'>+ * EnableInterrupt Handler</div><div class='add'>+ *</div><div class='add'>+ * Arguments:</div><div class='add'>+ *</div><div class='add'>+ *   adapter:	Our adapter structure</div><div class='add'>+ *</div><div class='add'>+ * Return Value:</div><div class='add'>+ * 	None.</div><div class='add'>+ */</div><div class='add'>+static void sxg_enable_interrupt(p_adapter_t adapter)</div><div class='add'>+{</div><div class='add'>+	SXG_TRACE(TRACE_SXG, SxgTraceBuffer, TRACE_NOISY, "EnIntr",</div><div class='add'>+		  adapter, adapter-&gt;InterruptsEnabled, 0, 0);</div><div class='add'>+	// For now, RSS is disabled with line based interrupts</div><div class='add'>+	ASSERT(adapter-&gt;RssEnabled == FALSE);</div><div class='add'>+	ASSERT(adapter-&gt;MsiEnabled == FALSE);</div><div class='add'>+	//</div><div class='add'>+	// Turn on interrupts by writing to the icr register.</div><div class='add'>+	//</div><div class='add'>+	WRITE_REG(adapter-&gt;UcodeRegs[0].Icr, SXG_ICR(0, SXG_ICR_ENABLE), TRUE);</div><div class='add'>+</div><div class='add'>+	adapter-&gt;InterruptsEnabled = 1;</div><div class='add'>+</div><div class='add'>+	SXG_TRACE(TRACE_SXG, SxgTraceBuffer, TRACE_NOISY, "XEnIntr",</div><div class='add'>+		  adapter, 0, 0, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *</div><div class='add'>+ * sxg_isr - Process an line-based interrupt</div><div class='add'>+ *</div><div class='add'>+ * Arguments:</div><div class='add'>+ * 		Context			- Our adapter structure</div><div class='add'>+ *		QueueDefault 	- Output parameter to queue to default CPU</div><div class='add'>+ *		TargetCpus		- Output bitmap to schedule DPC's</div><div class='add'>+ *</div><div class='add'>+ * Return Value:</div><div class='add'>+ * 	TRUE if our interrupt</div><div class='add'>+ */</div><div class='add'>+static irqreturn_t sxg_isr(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	p_net_device dev = (p_net_device) dev_id;</div><div class='add'>+	p_adapter_t adapter = (p_adapter_t) netdev_priv(dev);</div><div class='add'>+//      u32                 CpuMask = 0, i;</div><div class='add'>+</div><div class='add'>+	adapter-&gt;Stats.NumInts++;</div><div class='add'>+	if (adapter-&gt;Isr[0] == 0) {</div><div class='add'>+		// The SLIC driver used to experience a number of spurious interrupts</div><div class='add'>+		// due to the delay associated with the masking of the interrupt</div><div class='add'>+		// (we'd bounce back in here).  If we see that again with Sahara,</div><div class='add'>+		// add a READ_REG of the Icr register after the WRITE_REG below.</div><div class='add'>+		adapter-&gt;Stats.FalseInts++;</div><div class='add'>+		return IRQ_NONE;</div><div class='add'>+	}</div><div class='add'>+	//</div><div class='add'>+	// Move the Isr contents and clear the value in</div><div class='add'>+	// shared memory, and mask interrupts</div><div class='add'>+	//</div><div class='add'>+	adapter-&gt;IsrCopy[0] = adapter-&gt;Isr[0];</div><div class='add'>+	adapter-&gt;Isr[0] = 0;</div><div class='add'>+	WRITE_REG(adapter-&gt;UcodeRegs[0].Icr, SXG_ICR(0, SXG_ICR_MASK), TRUE);</div><div class='add'>+//      ASSERT(adapter-&gt;IsrDpcsPending == 0);</div><div class='add'>+#if XXXTODO			// RSS Stuff</div><div class='add'>+	// If RSS is enabled and the ISR specifies</div><div class='add'>+	// SXG_ISR_EVENT, then schedule DPC's</div><div class='add'>+	// based on event queues.</div><div class='add'>+	if (adapter-&gt;RssEnabled &amp;&amp; (adapter-&gt;IsrCopy[0] &amp; SXG_ISR_EVENT)) {</div><div class='add'>+		for (i = 0;</div><div class='add'>+		     i &lt; adapter-&gt;RssSystemInfo-&gt;ProcessorInfo.RssCpuCount;</div><div class='add'>+		     i++) {</div><div class='add'>+			PSXG_EVENT_RING EventRing = &amp;adapter-&gt;EventRings[i];</div><div class='add'>+			PSXG_EVENT Event =</div><div class='add'>+			    &amp;EventRing-&gt;Ring[adapter-&gt;NextEvent[i]];</div><div class='add'>+			unsigned char Cpu =</div><div class='add'>+			    adapter-&gt;RssSystemInfo-&gt;RssIdToCpu[i];</div><div class='add'>+			if (Event-&gt;Status &amp; EVENT_STATUS_VALID) {</div><div class='add'>+				adapter-&gt;IsrDpcsPending++;</div><div class='add'>+				CpuMask |= (1 &lt;&lt; Cpu);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	// Now, either schedule the CPUs specified by the CpuMask,</div><div class='add'>+	// or queue default</div><div class='add'>+	if (CpuMask) {</div><div class='add'>+		*QueueDefault = FALSE;</div><div class='add'>+	} else {</div><div class='add'>+		adapter-&gt;IsrDpcsPending = 1;</div><div class='add'>+		*QueueDefault = TRUE;</div><div class='add'>+	}</div><div class='add'>+	*TargetCpus = CpuMask;</div><div class='add'>+#endif</div><div class='add'>+	//</div><div class='add'>+	//  There are no DPCs in Linux, so call the handler now</div><div class='add'>+	//</div><div class='add'>+	sxg_handle_interrupt(adapter);</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sxg_handle_interrupt(p_adapter_t adapter)</div><div class='add'>+{</div><div class='add'>+//    unsigned char           RssId   = 0;</div><div class='add'>+	u32 NewIsr;</div><div class='add'>+</div><div class='add'>+	if (adapter-&gt;Stats.RcvNoBuffer &lt; 5) {</div><div class='add'>+		DBG_ERROR("Enter sxg_handle_interrupt ISR[%x]\n",</div><div class='add'>+			  adapter-&gt;IsrCopy[0]);</div><div class='add'>+	}</div><div class='add'>+	SXG_TRACE(TRACE_SXG, SxgTraceBuffer, TRACE_NOISY, "HndlIntr",</div><div class='add'>+		  adapter, adapter-&gt;IsrCopy[0], 0, 0);</div><div class='add'>+	// For now, RSS is disabled with line based interrupts</div><div class='add'>+	ASSERT(adapter-&gt;RssEnabled == FALSE);</div><div class='add'>+	ASSERT(adapter-&gt;MsiEnabled == FALSE);</div><div class='add'>+	ASSERT(adapter-&gt;IsrCopy[0]);</div><div class='add'>+/////////////////////////////</div><div class='add'>+</div><div class='add'>+	// Always process the event queue.</div><div class='add'>+	sxg_process_event_queue(adapter,</div><div class='add'>+				(adapter-&gt;RssEnabled ? /*RssId */ 0 : 0));</div><div class='add'>+</div><div class='add'>+#if XXXTODO			// RSS stuff</div><div class='add'>+	if (--adapter-&gt;IsrDpcsPending) {</div><div class='add'>+		// We're done.</div><div class='add'>+		ASSERT(adapter-&gt;RssEnabled);</div><div class='add'>+		SXG_TRACE(TRACE_SXG, SxgTraceBuffer, TRACE_NOISY, "DPCsPend",</div><div class='add'>+			  adapter, 0, 0, 0);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	//</div><div class='add'>+	// Last (or only) DPC processes the ISR and clears the interrupt.</div><div class='add'>+	//</div><div class='add'>+	NewIsr = sxg_process_isr(adapter, 0);</div><div class='add'>+	//</div><div class='add'>+	// Reenable interrupts</div><div class='add'>+	//</div><div class='add'>+	adapter-&gt;IsrCopy[0] = 0;</div><div class='add'>+	SXG_TRACE(TRACE_SXG, SxgTraceBuffer, TRACE_NOISY, "ClearIsr",</div><div class='add'>+		  adapter, NewIsr, 0, 0);</div><div class='add'>+</div><div class='add'>+	if (adapter-&gt;Stats.RcvNoBuffer &lt; 5) {</div><div class='add'>+		DBG_ERROR</div><div class='add'>+		    ("Exit sxg_handle_interrupt2 after enabling interrupt\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	WRITE_REG(adapter-&gt;UcodeRegs[0].Isr, NewIsr, TRUE);</div><div class='add'>+</div><div class='add'>+	SXG_TRACE(TRACE_SXG, SxgTraceBuffer, TRACE_NOISY, "XHndlInt",</div><div class='add'>+		  adapter, 0, 0, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *</div><div class='add'>+ * sxg_process_isr - Process an interrupt.  Called from the line-based and</div><div class='add'>+ *			message based interrupt DPC routines</div><div class='add'>+ *</div><div class='add'>+ * Arguments:</div><div class='add'>+ * 		adapter			- Our adapter structure</div><div class='add'>+ *		Queue			- The ISR that needs processing</div><div class='add'>+ *</div><div class='add'>+ * Return Value:</div><div class='add'>+ * 	None</div><div class='add'>+ */</div><div class='add'>+static int sxg_process_isr(p_adapter_t adapter, u32 MessageId)</div><div class='add'>+{</div><div class='add'>+	u32 Isr = adapter-&gt;IsrCopy[MessageId];</div><div class='add'>+	u32 NewIsr = 0;</div><div class='add'>+</div><div class='add'>+	SXG_TRACE(TRACE_SXG, SxgTraceBuffer, TRACE_NOISY, "ProcIsr",</div><div class='add'>+		  adapter, Isr, 0, 0);</div><div class='add'>+</div><div class='add'>+	// Error</div><div class='add'>+	if (Isr &amp; SXG_ISR_ERR) {</div><div class='add'>+		if (Isr &amp; SXG_ISR_PDQF) {</div><div class='add'>+			adapter-&gt;Stats.PdqFull++;</div><div class='add'>+			DBG_ERROR("%s: SXG_ISR_ERR  PDQF!!\n", __FUNCTION__);</div><div class='add'>+		}</div><div class='add'>+		// No host buffer</div><div class='add'>+		if (Isr &amp; SXG_ISR_RMISS) {</div><div class='add'>+			// There is a bunch of code in the SLIC driver which</div><div class='add'>+			// attempts to process more receive events per DPC</div><div class='add'>+			// if we start to fall behind.  We'll probably</div><div class='add'>+			// need to do something similar here, but hold</div><div class='add'>+			// off for now.  I don't want to make the code more</div><div class='add'>+			// complicated than strictly needed.</div><div class='add'>+			adapter-&gt;Stats.RcvNoBuffer++;</div><div class='add'>+			if (adapter-&gt;Stats.RcvNoBuffer &lt; 5) {</div><div class='add'>+				DBG_ERROR("%s: SXG_ISR_ERR  RMISS!!\n",</div><div class='add'>+					  __FUNCTION__);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		// Card crash</div><div class='add'>+		if (Isr &amp; SXG_ISR_DEAD) {</div><div class='add'>+			// Set aside the crash info and set the adapter state to RESET</div><div class='add'>+			adapter-&gt;CrashCpu =</div><div class='add'>+			    (unsigned char)((Isr &amp; SXG_ISR_CPU) &gt;&gt;</div><div class='add'>+					    SXG_ISR_CPU_SHIFT);</div><div class='add'>+			adapter-&gt;CrashLocation = (ushort) (Isr &amp; SXG_ISR_CRASH);</div><div class='add'>+			adapter-&gt;Dead = TRUE;</div><div class='add'>+			DBG_ERROR("%s: ISR_DEAD %x, CPU: %d\n", __FUNCTION__,</div><div class='add'>+				  adapter-&gt;CrashLocation, adapter-&gt;CrashCpu);</div><div class='add'>+		}</div><div class='add'>+		// Event ring full</div><div class='add'>+		if (Isr &amp; SXG_ISR_ERFULL) {</div><div class='add'>+			// Same issue as RMISS, really.  This means the</div><div class='add'>+			// host is falling behind the card.  Need to increase</div><div class='add'>+			// event ring size, process more events per interrupt,</div><div class='add'>+			// and/or reduce/remove interrupt aggregation.</div><div class='add'>+			adapter-&gt;Stats.EventRingFull++;</div><div class='add'>+			DBG_ERROR("%s: SXG_ISR_ERR  EVENT RING FULL!!\n",</div><div class='add'>+				  __FUNCTION__);</div><div class='add'>+		}</div><div class='add'>+		// Transmit drop - no DRAM buffers or XMT error</div><div class='add'>+		if (Isr &amp; SXG_ISR_XDROP) {</div><div class='add'>+			adapter-&gt;Stats.XmtDrops++;</div><div class='add'>+			adapter-&gt;Stats.XmtErrors++;</div><div class='add'>+			DBG_ERROR("%s: SXG_ISR_ERR  XDROP!!\n", __FUNCTION__);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	// Slowpath send completions</div><div class='add'>+	if (Isr &amp; SXG_ISR_SPSEND) {</div><div class='add'>+		sxg_complete_slow_send(adapter);</div><div class='add'>+	}</div><div class='add'>+	// Dump</div><div class='add'>+	if (Isr &amp; SXG_ISR_UPC) {</div><div class='add'>+		ASSERT(adapter-&gt;DumpCmdRunning);	// Maybe change when debug is added..</div><div class='add'>+		adapter-&gt;DumpCmdRunning = FALSE;</div><div class='add'>+	}</div><div class='add'>+	// Link event</div><div class='add'>+	if (Isr &amp; SXG_ISR_LINK) {</div><div class='add'>+		sxg_link_event(adapter);</div><div class='add'>+	}</div><div class='add'>+	// Debug - breakpoint hit</div><div class='add'>+	if (Isr &amp; SXG_ISR_BREAK) {</div><div class='add'>+		// At the moment AGDB isn't written to support interactive</div><div class='add'>+		// debug sessions.  When it is, this interrupt will be used</div><div class='add'>+		// to signal AGDB that it has hit a breakpoint.  For now, ASSERT.</div><div class='add'>+		ASSERT(0);</div><div class='add'>+	}</div><div class='add'>+	// Heartbeat response</div><div class='add'>+	if (Isr &amp; SXG_ISR_PING) {</div><div class='add'>+		adapter-&gt;PingOutstanding = FALSE;</div><div class='add'>+	}</div><div class='add'>+	SXG_TRACE(TRACE_SXG, SxgTraceBuffer, TRACE_NOISY, "XProcIsr",</div><div class='add'>+		  adapter, Isr, NewIsr, 0);</div><div class='add'>+</div><div class='add'>+	return (NewIsr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *</div><div class='add'>+ * sxg_process_event_queue - Process our event queue</div><div class='add'>+ *</div><div class='add'>+ * Arguments:</div><div class='add'>+ * 		- adapter	- Adapter structure</div><div class='add'>+ *		- RssId		- The event queue requiring processing</div><div class='add'>+ *</div><div class='add'>+ * Return Value:</div><div class='add'>+ * 	None.</div><div class='add'>+ */</div><div class='add'>+static u32 sxg_process_event_queue(p_adapter_t adapter, u32 RssId)</div><div class='add'>+{</div><div class='add'>+	PSXG_EVENT_RING EventRing = &amp;adapter-&gt;EventRings[RssId];</div><div class='add'>+	PSXG_EVENT Event = &amp;EventRing-&gt;Ring[adapter-&gt;NextEvent[RssId]];</div><div class='add'>+	u32 EventsProcessed = 0, Batches = 0;</div><div class='add'>+	u32 num_skbs = 0;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+#ifdef LINUX_HANDLES_RCV_INDICATION_LISTS</div><div class='add'>+	struct sk_buff *prev_skb = NULL;</div><div class='add'>+	struct sk_buff *IndicationList[SXG_RCV_ARRAYSIZE];</div><div class='add'>+	u32 Index;</div><div class='add'>+	PSXG_RCV_DATA_BUFFER_HDR RcvDataBufferHdr;</div><div class='add'>+#endif</div><div class='add'>+	u32 ReturnStatus = 0;</div><div class='add'>+</div><div class='add'>+	ASSERT((adapter-&gt;State == SXG_STATE_RUNNING) ||</div><div class='add'>+	       (adapter-&gt;State == SXG_STATE_PAUSING) ||</div><div class='add'>+	       (adapter-&gt;State == SXG_STATE_PAUSED) ||</div><div class='add'>+	       (adapter-&gt;State == SXG_STATE_HALTING));</div><div class='add'>+	// We may still have unprocessed events on the queue if</div><div class='add'>+	// the card crashed.  Don't process them.</div><div class='add'>+	if (adapter-&gt;Dead) {</div><div class='add'>+		return (0);</div><div class='add'>+	}</div><div class='add'>+	// In theory there should only be a single processor that</div><div class='add'>+	// accesses this queue, and only at interrupt-DPC time.  So</div><div class='add'>+	// we shouldn't need a lock for any of this.</div><div class='add'>+	while (Event-&gt;Status &amp; EVENT_STATUS_VALID) {</div><div class='add'>+		SXG_TRACE(TRACE_SXG, SxgTraceBuffer, TRACE_NOISY, "Event",</div><div class='add'>+			  Event, Event-&gt;Code, Event-&gt;Status,</div><div class='add'>+			  adapter-&gt;NextEvent);</div><div class='add'>+		switch (Event-&gt;Code) {</div><div class='add'>+		case EVENT_CODE_BUFFERS:</div><div class='add'>+			ASSERT(!(Event-&gt;CommandIndex &amp; 0xFF00));	// SXG_RING_INFO Head &amp; Tail == unsigned char</div><div class='add'>+			//</div><div class='add'>+			sxg_complete_descriptor_blocks(adapter,</div><div class='add'>+						       Event-&gt;CommandIndex);</div><div class='add'>+			//</div><div class='add'>+			break;</div><div class='add'>+		case EVENT_CODE_SLOWRCV:</div><div class='add'>+			--adapter-&gt;RcvBuffersOnCard;</div><div class='add'>+			if ((skb = sxg_slow_receive(adapter, Event))) {</div><div class='add'>+				u32 rx_bytes;</div><div class='add'>+#ifdef LINUX_HANDLES_RCV_INDICATION_LISTS</div><div class='add'>+				// Add it to our indication list</div><div class='add'>+				SXG_ADD_RCV_PACKET(adapter, skb, prev_skb,</div><div class='add'>+						   IndicationList, num_skbs);</div><div class='add'>+				//  In Linux, we just pass up each skb to the protocol above at this point,</div><div class='add'>+				//  there is no capability of an indication list.</div><div class='add'>+#else</div><div class='add'>+// CHECK            skb_pull(skb, INIC_RCVBUF_HEADSIZE);</div><div class='add'>+				rx_bytes = Event-&gt;Length;	// (rcvbuf-&gt;length &amp; IRHDDR_FLEN_MSK);</div><div class='add'>+				skb_put(skb, rx_bytes);</div><div class='add'>+				adapter-&gt;stats.rx_packets++;</div><div class='add'>+				adapter-&gt;stats.rx_bytes += rx_bytes;</div><div class='add'>+#if SXG_OFFLOAD_IP_CHECKSUM</div><div class='add'>+				skb-&gt;ip_summed = CHECKSUM_UNNECESSARY;</div><div class='add'>+#endif</div><div class='add'>+				skb-&gt;dev = adapter-&gt;netdev;</div><div class='add'>+				skb-&gt;protocol = eth_type_trans(skb, skb-&gt;dev);</div><div class='add'>+				netif_rx(skb);</div><div class='add'>+#endif</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			DBG_ERROR("%s: ERROR  Invalid EventCode %d\n",</div><div class='add'>+				  __FUNCTION__, Event-&gt;Code);</div><div class='add'>+//                      ASSERT(0);</div><div class='add'>+		}</div><div class='add'>+		// See if we need to restock card receive buffers.</div><div class='add'>+		// There are two things to note here:</div><div class='add'>+		//      First - This test is not SMP safe.  The</div><div class='add'>+		//              adapter-&gt;BuffersOnCard field is protected via atomic interlocked calls, but</div><div class='add'>+		//              we do not protect it with respect to these tests.  The only way to do that</div><div class='add'>+		//      is with a lock, and I don't want to grab a lock every time we adjust the</div><div class='add'>+		//      BuffersOnCard count.  Instead, we allow the buffer replenishment to be off</div><div class='add'>+		//      once in a while.  The worst that can happen is the card is given one</div><div class='add'>+		//      more-or-less descriptor block than the arbitrary value we've chosen.</div><div class='add'>+		//      No big deal</div><div class='add'>+		//      In short DO NOT ADD A LOCK HERE, OR WHERE RcvBuffersOnCard is adjusted.</div><div class='add'>+		//      Second - We expect this test to rarely evaluate to true.  We attempt to</div><div class='add'>+		//      refill descriptor blocks as they are returned to us</div><div class='add'>+		//      (sxg_complete_descriptor_blocks), so The only time this should evaluate</div><div class='add'>+		//      to true is when sxg_complete_descriptor_blocks failed to allocate</div><div class='add'>+		//              receive buffers.</div><div class='add'>+		if (adapter-&gt;RcvBuffersOnCard &lt; SXG_RCV_DATA_BUFFERS) {</div><div class='add'>+			sxg_stock_rcv_buffers(adapter);</div><div class='add'>+		}</div><div class='add'>+		// It's more efficient to just set this to zero.</div><div class='add'>+		// But clearing the top bit saves potential debug info...</div><div class='add'>+		Event-&gt;Status &amp;= ~EVENT_STATUS_VALID;</div><div class='add'>+		// Advanct to the next event</div><div class='add'>+		SXG_ADVANCE_INDEX(adapter-&gt;NextEvent[RssId], EVENT_RING_SIZE);</div><div class='add'>+		Event = &amp;EventRing-&gt;Ring[adapter-&gt;NextEvent[RssId]];</div><div class='add'>+		EventsProcessed++;</div><div class='add'>+		if (EventsProcessed == EVENT_RING_BATCH) {</div><div class='add'>+			// Release a batch of events back to the card</div><div class='add'>+			WRITE_REG(adapter-&gt;UcodeRegs[RssId].EventRelease,</div><div class='add'>+				  EVENT_RING_BATCH, FALSE);</div><div class='add'>+			EventsProcessed = 0;</div><div class='add'>+			// If we've processed our batch limit, break out of the</div><div class='add'>+			// loop and return SXG_ISR_EVENT to arrange for us to</div><div class='add'>+			// be called again</div><div class='add'>+			if (Batches++ == EVENT_BATCH_LIMIT) {</div><div class='add'>+				SXG_TRACE(TRACE_SXG, SxgTraceBuffer,</div><div class='add'>+					  TRACE_NOISY, "EvtLimit", Batches,</div><div class='add'>+					  adapter-&gt;NextEvent, 0, 0);</div><div class='add'>+				ReturnStatus = SXG_ISR_EVENT;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+#ifdef LINUX_HANDLES_RCV_INDICATION_LISTS</div><div class='add'>+	//</div><div class='add'>+	// Indicate any received dumb-nic frames</div><div class='add'>+	//</div><div class='add'>+	SXG_INDICATE_PACKETS(adapter, IndicationList, num_skbs);</div><div class='add'>+#endif</div><div class='add'>+	//</div><div class='add'>+	// Release events back to the card.</div><div class='add'>+	//</div><div class='add'>+	if (EventsProcessed) {</div><div class='add'>+		WRITE_REG(adapter-&gt;UcodeRegs[RssId].EventRelease,</div><div class='add'>+			  EventsProcessed, FALSE);</div><div class='add'>+	}</div><div class='add'>+	SXG_TRACE(TRACE_SXG, SxgTraceBuffer, TRACE_NOISY, "XPrcEvnt",</div><div class='add'>+		  Batches, EventsProcessed, adapter-&gt;NextEvent, num_skbs);</div><div class='add'>+</div><div class='add'>+	return (ReturnStatus);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * sxg_complete_slow_send - Complete slowpath or dumb-nic sends</div><div class='add'>+ *</div><div class='add'>+ * Arguments -</div><div class='add'>+ *	adapter		- A pointer to our adapter structure</div><div class='add'>+</div><div class='add'>+ * Return</div><div class='add'>+ *	None</div><div class='add'>+ */</div><div class='add'>+static void sxg_complete_slow_send(p_adapter_t adapter)</div><div class='add'>+{</div><div class='add'>+	PSXG_XMT_RING XmtRing = &amp;adapter-&gt;XmtRings[0];</div><div class='add'>+	PSXG_RING_INFO XmtRingInfo = &amp;adapter-&gt;XmtRingZeroInfo;</div><div class='add'>+	u32 *ContextType;</div><div class='add'>+	PSXG_CMD XmtCmd;</div><div class='add'>+</div><div class='add'>+	// NOTE - This lock is dropped and regrabbed in this loop.</div><div class='add'>+	// This means two different processors can both be running</div><div class='add'>+	// through this loop. Be *very* careful.</div><div class='add'>+	spin_lock(&amp;adapter-&gt;XmtZeroLock);</div><div class='add'>+	SXG_TRACE(TRACE_SXG, SxgTraceBuffer, TRACE_NOISY, "CmpSnds",</div><div class='add'>+		  adapter, XmtRingInfo-&gt;Head, XmtRingInfo-&gt;Tail, 0);</div><div class='add'>+</div><div class='add'>+	while (XmtRingInfo-&gt;Tail != *adapter-&gt;XmtRingZeroIndex) {</div><div class='add'>+		// Locate the current Cmd (ring descriptor entry), and</div><div class='add'>+		// associated SGL, and advance the tail</div><div class='add'>+		SXG_RETURN_CMD(XmtRing, XmtRingInfo, XmtCmd, ContextType);</div><div class='add'>+		ASSERT(ContextType);</div><div class='add'>+		SXG_TRACE(TRACE_SXG, SxgTraceBuffer, TRACE_NOISY, "CmpSnd",</div><div class='add'>+			  XmtRingInfo-&gt;Head, XmtRingInfo-&gt;Tail, XmtCmd, 0);</div><div class='add'>+		// Clear the SGL field.</div><div class='add'>+		XmtCmd-&gt;Sgl = 0;</div><div class='add'>+</div><div class='add'>+		switch (*ContextType) {</div><div class='add'>+		case SXG_SGL_DUMB:</div><div class='add'>+			{</div><div class='add'>+				struct sk_buff *skb;</div><div class='add'>+				// Dumb-nic send.  Command context is the dumb-nic SGL</div><div class='add'>+				skb = (struct sk_buff *)ContextType;</div><div class='add'>+				// Complete the send</div><div class='add'>+				SXG_TRACE(TRACE_SXG, SxgTraceBuffer,</div><div class='add'>+					  TRACE_IMPORTANT, "DmSndCmp", skb, 0,</div><div class='add'>+					  0, 0);</div><div class='add'>+				ASSERT(adapter-&gt;Stats.XmtQLen);</div><div class='add'>+				adapter-&gt;Stats.XmtQLen--;	// within XmtZeroLock</div><div class='add'>+				adapter-&gt;Stats.XmtOk++;</div><div class='add'>+				// Now drop the lock and complete the send back to</div><div class='add'>+				// Microsoft.  We need to drop the lock because</div><div class='add'>+				// Microsoft can come back with a chimney send, which</div><div class='add'>+				// results in a double trip in SxgTcpOuput</div><div class='add'>+				spin_unlock(&amp;adapter-&gt;XmtZeroLock);</div><div class='add'>+				SXG_COMPLETE_DUMB_SEND(adapter, skb);</div><div class='add'>+				// and reacquire..</div><div class='add'>+				spin_lock(&amp;adapter-&gt;XmtZeroLock);</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			ASSERT(0);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;adapter-&gt;XmtZeroLock);</div><div class='add'>+	SXG_TRACE(TRACE_SXG, SxgTraceBuffer, TRACE_NOISY, "CmpSnd",</div><div class='add'>+		  adapter, XmtRingInfo-&gt;Head, XmtRingInfo-&gt;Tail, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * sxg_slow_receive</div><div class='add'>+ *</div><div class='add'>+ * Arguments -</div><div class='add'>+ *	adapter		- A pointer to our adapter structure</div><div class='add'>+ *	Event		- Receive event</div><div class='add'>+ *</div><div class='add'>+ * Return</div><div class='add'>+ *	 skb</div><div class='add'>+ */</div><div class='add'>+static struct sk_buff *sxg_slow_receive(p_adapter_t adapter, PSXG_EVENT Event)</div><div class='add'>+{</div><div class='add'>+	PSXG_RCV_DATA_BUFFER_HDR RcvDataBufferHdr;</div><div class='add'>+	struct sk_buff *Packet;</div><div class='add'>+</div><div class='add'>+	RcvDataBufferHdr = (PSXG_RCV_DATA_BUFFER_HDR) Event-&gt;HostHandle;</div><div class='add'>+	ASSERT(RcvDataBufferHdr);</div><div class='add'>+	ASSERT(RcvDataBufferHdr-&gt;State == SXG_BUFFER_ONCARD);</div><div class='add'>+	ASSERT(SXG_RECEIVE_DATA_LOCATION(RcvDataBufferHdr) ==</div><div class='add'>+	       RcvDataBufferHdr-&gt;VirtualAddress);</div><div class='add'>+	SXG_TRACE(TRACE_SXG, SxgTraceBuffer, TRACE_IMPORTANT, "SlowRcv", Event,</div><div class='add'>+		  RcvDataBufferHdr, RcvDataBufferHdr-&gt;State,</div><div class='add'>+		  RcvDataBufferHdr-&gt;VirtualAddress);</div><div class='add'>+	// Drop rcv frames in non-running state</div><div class='add'>+	switch (adapter-&gt;State) {</div><div class='add'>+	case SXG_STATE_RUNNING:</div><div class='add'>+		break;</div><div class='add'>+	case SXG_STATE_PAUSING:</div><div class='add'>+	case SXG_STATE_PAUSED:</div><div class='add'>+	case SXG_STATE_HALTING:</div><div class='add'>+		goto drop;</div><div class='add'>+	default:</div><div class='add'>+		ASSERT(0);</div><div class='add'>+		goto drop;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	// Change buffer state to UPSTREAM</div><div class='add'>+	RcvDataBufferHdr-&gt;State = SXG_BUFFER_UPSTREAM;</div><div class='add'>+	if (Event-&gt;Status &amp; EVENT_STATUS_RCVERR) {</div><div class='add'>+		SXG_TRACE(TRACE_SXG, SxgTraceBuffer, TRACE_NOISY, "RcvError",</div><div class='add'>+			  Event, Event-&gt;Status, Event-&gt;HostHandle, 0);</div><div class='add'>+		// XXXTODO - Remove this print later</div><div class='add'>+		DBG_ERROR("SXG: Receive error %x\n", *(u32 *)</div><div class='add'>+			  SXG_RECEIVE_DATA_LOCATION(RcvDataBufferHdr));</div><div class='add'>+		sxg_process_rcv_error(adapter, *(u32 *)</div><div class='add'>+				      SXG_RECEIVE_DATA_LOCATION</div><div class='add'>+				      (RcvDataBufferHdr));</div><div class='add'>+		goto drop;</div><div class='add'>+	}</div><div class='add'>+#if XXXTODO			// VLAN stuff</div><div class='add'>+	// If there's a VLAN tag, extract it and validate it</div><div class='add'>+	if (((p_ether_header) (SXG_RECEIVE_DATA_LOCATION(RcvDataBufferHdr)))-&gt;</div><div class='add'>+	    EtherType == ETHERTYPE_VLAN) {</div><div class='add'>+		if (SxgExtractVlanHeader(adapter, RcvDataBufferHdr, Event) !=</div><div class='add'>+		    STATUS_SUCCESS) {</div><div class='add'>+			SXG_TRACE(TRACE_SXG, SxgTraceBuffer, TRACE_NOISY,</div><div class='add'>+				  "BadVlan", Event,</div><div class='add'>+				  SXG_RECEIVE_DATA_LOCATION(RcvDataBufferHdr),</div><div class='add'>+				  Event-&gt;Length, 0);</div><div class='add'>+			goto drop;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	//</div><div class='add'>+	// Dumb-nic frame.  See if it passes our mac filter and update stats</div><div class='add'>+	//</div><div class='add'>+	if (!sxg_mac_filter(adapter, (p_ether_header)</div><div class='add'>+			    SXG_RECEIVE_DATA_LOCATION(RcvDataBufferHdr),</div><div class='add'>+			    Event-&gt;Length)) {</div><div class='add'>+		SXG_TRACE(TRACE_SXG, SxgTraceBuffer, TRACE_NOISY, "RcvFiltr",</div><div class='add'>+			  Event, SXG_RECEIVE_DATA_LOCATION(RcvDataBufferHdr),</div><div class='add'>+			  Event-&gt;Length, 0);</div><div class='add'>+		goto drop;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	Packet = RcvDataBufferHdr-&gt;SxgDumbRcvPacket;</div><div class='add'>+</div><div class='add'>+	SXG_TRACE(TRACE_SXG, SxgTraceBuffer, TRACE_IMPORTANT, "DumbRcv",</div><div class='add'>+		  RcvDataBufferHdr, Packet, Event-&gt;Length, 0);</div><div class='add'>+	//</div><div class='add'>+	// Lastly adjust the receive packet length.</div><div class='add'>+	//</div><div class='add'>+	SXG_ADJUST_RCV_PACKET(Packet, RcvDataBufferHdr, Event);</div><div class='add'>+</div><div class='add'>+	return (Packet);</div><div class='add'>+</div><div class='add'>+      drop:</div><div class='add'>+	SXG_TRACE(TRACE_SXG, SxgTraceBuffer, TRACE_NOISY, "DropRcv",</div><div class='add'>+		  RcvDataBufferHdr, Event-&gt;Length, 0, 0);</div><div class='add'>+	adapter-&gt;Stats.RcvDiscards++;</div><div class='add'>+	spin_lock(&amp;adapter-&gt;RcvQLock);</div><div class='add'>+	SXG_FREE_RCV_DATA_BUFFER(adapter, RcvDataBufferHdr);</div><div class='add'>+	spin_unlock(&amp;adapter-&gt;RcvQLock);</div><div class='add'>+	return (NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * sxg_process_rcv_error - process receive error and update</div><div class='add'>+ * stats</div><div class='add'>+ *</div><div class='add'>+ * Arguments:</div><div class='add'>+ *		adapter		- Adapter structure</div><div class='add'>+ *		ErrorStatus	- 4-byte receive error status</div><div class='add'>+ *</div><div class='add'>+ * Return Value:</div><div class='add'>+ * 	None</div><div class='add'>+ */</div><div class='add'>+static void sxg_process_rcv_error(p_adapter_t adapter, u32 ErrorStatus)</div><div class='add'>+{</div><div class='add'>+	u32 Error;</div><div class='add'>+</div><div class='add'>+	adapter-&gt;Stats.RcvErrors++;</div><div class='add'>+</div><div class='add'>+	if (ErrorStatus &amp; SXG_RCV_STATUS_TRANSPORT_ERROR) {</div><div class='add'>+		Error = ErrorStatus &amp; SXG_RCV_STATUS_TRANSPORT_MASK;</div><div class='add'>+		switch (Error) {</div><div class='add'>+		case SXG_RCV_STATUS_TRANSPORT_CSUM:</div><div class='add'>+			adapter-&gt;Stats.TransportCsum++;</div><div class='add'>+			break;</div><div class='add'>+		case SXG_RCV_STATUS_TRANSPORT_UFLOW:</div><div class='add'>+			adapter-&gt;Stats.TransportUflow++;</div><div class='add'>+			break;</div><div class='add'>+		case SXG_RCV_STATUS_TRANSPORT_HDRLEN:</div><div class='add'>+			adapter-&gt;Stats.TransportHdrLen++;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (ErrorStatus &amp; SXG_RCV_STATUS_NETWORK_ERROR) {</div><div class='add'>+		Error = ErrorStatus &amp; SXG_RCV_STATUS_NETWORK_MASK;</div><div class='add'>+		switch (Error) {</div><div class='add'>+		case SXG_RCV_STATUS_NETWORK_CSUM:</div><div class='add'>+			adapter-&gt;Stats.NetworkCsum++;</div><div class='add'>+			break;</div><div class='add'>+		case SXG_RCV_STATUS_NETWORK_UFLOW:</div><div class='add'>+			adapter-&gt;Stats.NetworkUflow++;</div><div class='add'>+			break;</div><div class='add'>+		case SXG_RCV_STATUS_NETWORK_HDRLEN:</div><div class='add'>+			adapter-&gt;Stats.NetworkHdrLen++;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (ErrorStatus &amp; SXG_RCV_STATUS_PARITY) {</div><div class='add'>+		adapter-&gt;Stats.Parity++;</div><div class='add'>+	}</div><div class='add'>+	if (ErrorStatus &amp; SXG_RCV_STATUS_LINK_ERROR) {</div><div class='add'>+		Error = ErrorStatus &amp; SXG_RCV_STATUS_LINK_MASK;</div><div class='add'>+		switch (Error) {</div><div class='add'>+		case SXG_RCV_STATUS_LINK_PARITY:</div><div class='add'>+			adapter-&gt;Stats.LinkParity++;</div><div class='add'>+			break;</div><div class='add'>+		case SXG_RCV_STATUS_LINK_EARLY:</div><div class='add'>+			adapter-&gt;Stats.LinkEarly++;</div><div class='add'>+			break;</div><div class='add'>+		case SXG_RCV_STATUS_LINK_BUFOFLOW:</div><div class='add'>+			adapter-&gt;Stats.LinkBufOflow++;</div><div class='add'>+			break;</div><div class='add'>+		case SXG_RCV_STATUS_LINK_CODE:</div><div class='add'>+			adapter-&gt;Stats.LinkCode++;</div><div class='add'>+			break;</div><div class='add'>+		case SXG_RCV_STATUS_LINK_DRIBBLE:</div><div class='add'>+			adapter-&gt;Stats.LinkDribble++;</div><div class='add'>+			break;</div><div class='add'>+		case SXG_RCV_STATUS_LINK_CRC:</div><div class='add'>+			adapter-&gt;Stats.LinkCrc++;</div><div class='add'>+			break;</div><div class='add'>+		case SXG_RCV_STATUS_LINK_OFLOW:</div><div class='add'>+			adapter-&gt;Stats.LinkOflow++;</div><div class='add'>+			break;</div><div class='add'>+		case SXG_RCV_STATUS_LINK_UFLOW:</div><div class='add'>+			adapter-&gt;Stats.LinkUflow++;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * sxg_mac_filter</div><div class='add'>+ *</div><div class='add'>+ * Arguments:</div><div class='add'>+ *		adapter		- Adapter structure</div><div class='add'>+ *		pether		- Ethernet header</div><div class='add'>+ *		length		- Frame length</div><div class='add'>+ *</div><div class='add'>+ * Return Value:</div><div class='add'>+ * 	TRUE if the frame is to be allowed</div><div class='add'>+ */</div><div class='add'>+static bool sxg_mac_filter(p_adapter_t adapter, p_ether_header EtherHdr,</div><div class='add'>+			   ushort length)</div><div class='add'>+{</div><div class='add'>+	bool EqualAddr;</div><div class='add'>+</div><div class='add'>+	if (SXG_MULTICAST_PACKET(EtherHdr)) {</div><div class='add'>+		if (SXG_BROADCAST_PACKET(EtherHdr)) {</div><div class='add'>+			// broadcast</div><div class='add'>+			if (adapter-&gt;MacFilter &amp; MAC_BCAST) {</div><div class='add'>+				adapter-&gt;Stats.DumbRcvBcastPkts++;</div><div class='add'>+				adapter-&gt;Stats.DumbRcvBcastBytes += length;</div><div class='add'>+				adapter-&gt;Stats.DumbRcvPkts++;</div><div class='add'>+				adapter-&gt;Stats.DumbRcvBytes += length;</div><div class='add'>+				return (TRUE);</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			// multicast</div><div class='add'>+			if (adapter-&gt;MacFilter &amp; MAC_ALLMCAST) {</div><div class='add'>+				adapter-&gt;Stats.DumbRcvMcastPkts++;</div><div class='add'>+				adapter-&gt;Stats.DumbRcvMcastBytes += length;</div><div class='add'>+				adapter-&gt;Stats.DumbRcvPkts++;</div><div class='add'>+				adapter-&gt;Stats.DumbRcvBytes += length;</div><div class='add'>+				return (TRUE);</div><div class='add'>+			}</div><div class='add'>+			if (adapter-&gt;MacFilter &amp; MAC_MCAST) {</div><div class='add'>+				PSXG_MULTICAST_ADDRESS MulticastAddrs =</div><div class='add'>+				    adapter-&gt;MulticastAddrs;</div><div class='add'>+				while (MulticastAddrs) {</div><div class='add'>+					ETHER_EQ_ADDR(MulticastAddrs-&gt;Address,</div><div class='add'>+						      EtherHdr-&gt;ether_dhost,</div><div class='add'>+						      EqualAddr);</div><div class='add'>+					if (EqualAddr) {</div><div class='add'>+						adapter-&gt;Stats.</div><div class='add'>+						    DumbRcvMcastPkts++;</div><div class='add'>+						adapter-&gt;Stats.</div><div class='add'>+						    DumbRcvMcastBytes += length;</div><div class='add'>+						adapter-&gt;Stats.DumbRcvPkts++;</div><div class='add'>+						adapter-&gt;Stats.DumbRcvBytes +=</div><div class='add'>+						    length;</div><div class='add'>+						return (TRUE);</div><div class='add'>+					}</div><div class='add'>+					MulticastAddrs = MulticastAddrs-&gt;Next;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	} else if (adapter-&gt;MacFilter &amp; MAC_DIRECTED) {</div><div class='add'>+		// Not broadcast or multicast.  Must be directed at us or</div><div class='add'>+		// the card is in promiscuous mode.  Either way, consider it</div><div class='add'>+		// ours if MAC_DIRECTED is set</div><div class='add'>+		adapter-&gt;Stats.DumbRcvUcastPkts++;</div><div class='add'>+		adapter-&gt;Stats.DumbRcvUcastBytes += length;</div><div class='add'>+		adapter-&gt;Stats.DumbRcvPkts++;</div><div class='add'>+		adapter-&gt;Stats.DumbRcvBytes += length;</div><div class='add'>+		return (TRUE);</div><div class='add'>+	}</div><div class='add'>+	if (adapter-&gt;MacFilter &amp; MAC_PROMISC) {</div><div class='add'>+		// Whatever it is, keep it.</div><div class='add'>+		adapter-&gt;Stats.DumbRcvPkts++;</div><div class='add'>+		adapter-&gt;Stats.DumbRcvBytes += length;</div><div class='add'>+		return (TRUE);</div><div class='add'>+	}</div><div class='add'>+	adapter-&gt;Stats.RcvDiscards++;</div><div class='add'>+	return (FALSE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sxg_register_interrupt(p_adapter_t adapter)</div><div class='add'>+{</div><div class='add'>+	if (!adapter-&gt;intrregistered) {</div><div class='add'>+		int retval;</div><div class='add'>+</div><div class='add'>+		DBG_ERROR</div><div class='add'>+		    ("sxg: %s AllocAdaptRsrcs adapter[%p] dev-&gt;irq[%x] %x\n",</div><div class='add'>+		     __FUNCTION__, adapter, adapter-&gt;netdev-&gt;irq, NR_IRQS);</div><div class='add'>+</div><div class='add'>+		spin_unlock_irqrestore(&amp;sxg_global.driver_lock,</div><div class='add'>+				       sxg_global.flags);</div><div class='add'>+</div><div class='add'>+		retval = request_irq(adapter-&gt;netdev-&gt;irq,</div><div class='add'>+				     &amp;sxg_isr,</div><div class='add'>+				     IRQF_SHARED,</div><div class='add'>+				     adapter-&gt;netdev-&gt;name, adapter-&gt;netdev);</div><div class='add'>+</div><div class='add'>+		spin_lock_irqsave(&amp;sxg_global.driver_lock, sxg_global.flags);</div><div class='add'>+</div><div class='add'>+		if (retval) {</div><div class='add'>+			DBG_ERROR("sxg: request_irq (%s) FAILED [%x]\n",</div><div class='add'>+				  adapter-&gt;netdev-&gt;name, retval);</div><div class='add'>+			return (retval);</div><div class='add'>+		}</div><div class='add'>+		adapter-&gt;intrregistered = 1;</div><div class='add'>+		adapter-&gt;IntRegistered = TRUE;</div><div class='add'>+		// Disable RSS with line-based interrupts</div><div class='add'>+		adapter-&gt;MsiEnabled = FALSE;</div><div class='add'>+		adapter-&gt;RssEnabled = FALSE;</div><div class='add'>+		DBG_ERROR("sxg: %s AllocAdaptRsrcs adapter[%p] dev-&gt;irq[%x]\n",</div><div class='add'>+			  __FUNCTION__, adapter, adapter-&gt;netdev-&gt;irq);</div><div class='add'>+	}</div><div class='add'>+	return (STATUS_SUCCESS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sxg_deregister_interrupt(p_adapter_t adapter)</div><div class='add'>+{</div><div class='add'>+	DBG_ERROR("sxg: %s ENTER adapter[%p]\n", __FUNCTION__, adapter);</div><div class='add'>+#if XXXTODO</div><div class='add'>+	slic_init_cleanup(adapter);</div><div class='add'>+#endif</div><div class='add'>+	memset(&amp;adapter-&gt;stats, 0, sizeof(struct net_device_stats));</div><div class='add'>+	adapter-&gt;error_interrupts = 0;</div><div class='add'>+	adapter-&gt;rcv_interrupts = 0;</div><div class='add'>+	adapter-&gt;xmit_interrupts = 0;</div><div class='add'>+	adapter-&gt;linkevent_interrupts = 0;</div><div class='add'>+	adapter-&gt;upr_interrupts = 0;</div><div class='add'>+	adapter-&gt;num_isrs = 0;</div><div class='add'>+	adapter-&gt;xmit_completes = 0;</div><div class='add'>+	adapter-&gt;rcv_broadcasts = 0;</div><div class='add'>+	adapter-&gt;rcv_multicasts = 0;</div><div class='add'>+	adapter-&gt;rcv_unicasts = 0;</div><div class='add'>+	DBG_ERROR("sxg: %s EXIT\n", __FUNCTION__);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  sxg_if_init</div><div class='add'>+ *</div><div class='add'>+ *  Perform initialization of our slic interface.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+static int sxg_if_init(p_adapter_t adapter)</div><div class='add'>+{</div><div class='add'>+	p_net_device dev = adapter-&gt;netdev;</div><div class='add'>+	int status = 0;</div><div class='add'>+</div><div class='add'>+	DBG_ERROR("sxg: %s (%s) ENTER states[%d:%d:%d] flags[%x]\n",</div><div class='add'>+		  __FUNCTION__, adapter-&gt;netdev-&gt;name,</div><div class='add'>+		  adapter-&gt;queues_initialized, adapter-&gt;state,</div><div class='add'>+		  adapter-&gt;linkstate, dev-&gt;flags);</div><div class='add'>+</div><div class='add'>+	/* adapter should be down at this point */</div><div class='add'>+	if (adapter-&gt;state != ADAPT_DOWN) {</div><div class='add'>+		DBG_ERROR("sxg_if_init adapter-&gt;state != ADAPT_DOWN\n");</div><div class='add'>+		return (-EIO);</div><div class='add'>+	}</div><div class='add'>+	ASSERT(adapter-&gt;linkstate == LINK_DOWN);</div><div class='add'>+</div><div class='add'>+	adapter-&gt;devflags_prev = dev-&gt;flags;</div><div class='add'>+	adapter-&gt;macopts = MAC_DIRECTED;</div><div class='add'>+	if (dev-&gt;flags) {</div><div class='add'>+		DBG_ERROR("sxg: %s (%s) Set MAC options: ", __FUNCTION__,</div><div class='add'>+			  adapter-&gt;netdev-&gt;name);</div><div class='add'>+		if (dev-&gt;flags &amp; IFF_BROADCAST) {</div><div class='add'>+			adapter-&gt;macopts |= MAC_BCAST;</div><div class='add'>+			DBG_ERROR("BCAST ");</div><div class='add'>+		}</div><div class='add'>+		if (dev-&gt;flags &amp; IFF_PROMISC) {</div><div class='add'>+			adapter-&gt;macopts |= MAC_PROMISC;</div><div class='add'>+			DBG_ERROR("PROMISC ");</div><div class='add'>+		}</div><div class='add'>+		if (dev-&gt;flags &amp; IFF_ALLMULTI) {</div><div class='add'>+			adapter-&gt;macopts |= MAC_ALLMCAST;</div><div class='add'>+			DBG_ERROR("ALL_MCAST ");</div><div class='add'>+		}</div><div class='add'>+		if (dev-&gt;flags &amp; IFF_MULTICAST) {</div><div class='add'>+			adapter-&gt;macopts |= MAC_MCAST;</div><div class='add'>+			DBG_ERROR("MCAST ");</div><div class='add'>+		}</div><div class='add'>+		DBG_ERROR("\n");</div><div class='add'>+	}</div><div class='add'>+	status = sxg_register_interrupt(adapter);</div><div class='add'>+	if (status != STATUS_SUCCESS) {</div><div class='add'>+		DBG_ERROR("sxg_if_init: sxg_register_interrupt FAILED %x\n",</div><div class='add'>+			  status);</div><div class='add'>+		sxg_deregister_interrupt(adapter);</div><div class='add'>+		return (status);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	adapter-&gt;state = ADAPT_UP;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 *    clear any pending events, then enable interrupts</div><div class='add'>+	 */</div><div class='add'>+	DBG_ERROR("sxg: %s ENABLE interrupts(slic)\n", __FUNCTION__);</div><div class='add'>+</div><div class='add'>+	return (STATUS_SUCCESS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sxg_entry_open(p_net_device dev)</div><div class='add'>+{</div><div class='add'>+	p_adapter_t adapter = (p_adapter_t) netdev_priv(dev);</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	ASSERT(adapter);</div><div class='add'>+	DBG_ERROR("sxg: %s adapter-&gt;activated[%d]\n", __FUNCTION__,</div><div class='add'>+		  adapter-&gt;activated);</div><div class='add'>+	DBG_ERROR</div><div class='add'>+	    ("sxg: %s (%s): [jiffies[%lx] cpu %d] dev[%p] adapt[%p] port[%d]\n",</div><div class='add'>+	     __FUNCTION__, adapter-&gt;netdev-&gt;name, jiffies, smp_processor_id(),</div><div class='add'>+	     adapter-&gt;netdev, adapter, adapter-&gt;port);</div><div class='add'>+</div><div class='add'>+	netif_stop_queue(adapter-&gt;netdev);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;sxg_global.driver_lock, sxg_global.flags);</div><div class='add'>+	if (!adapter-&gt;activated) {</div><div class='add'>+		sxg_global.num_sxg_ports_active++;</div><div class='add'>+		adapter-&gt;activated = 1;</div><div class='add'>+	}</div><div class='add'>+	// Initialize the adapter</div><div class='add'>+	DBG_ERROR("sxg: %s ENTER sxg_initialize_adapter\n", __FUNCTION__);</div><div class='add'>+	status = sxg_initialize_adapter(adapter);</div><div class='add'>+	DBG_ERROR("sxg: %s EXIT sxg_initialize_adapter status[%x]\n",</div><div class='add'>+		  __FUNCTION__, status);</div><div class='add'>+</div><div class='add'>+	if (status == STATUS_SUCCESS) {</div><div class='add'>+		DBG_ERROR("sxg: %s ENTER sxg_if_init\n", __FUNCTION__);</div><div class='add'>+		status = sxg_if_init(adapter);</div><div class='add'>+		DBG_ERROR("sxg: %s EXIT sxg_if_init status[%x]\n", __FUNCTION__,</div><div class='add'>+			  status);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (status != STATUS_SUCCESS) {</div><div class='add'>+		if (adapter-&gt;activated) {</div><div class='add'>+			sxg_global.num_sxg_ports_active--;</div><div class='add'>+			adapter-&gt;activated = 0;</div><div class='add'>+		}</div><div class='add'>+		spin_unlock_irqrestore(&amp;sxg_global.driver_lock,</div><div class='add'>+				       sxg_global.flags);</div><div class='add'>+		return (status);</div><div class='add'>+	}</div><div class='add'>+	DBG_ERROR("sxg: %s ENABLE ALL INTERRUPTS\n", __FUNCTION__);</div><div class='add'>+</div><div class='add'>+	// Enable interrupts</div><div class='add'>+	SXG_ENABLE_ALL_INTERRUPTS(adapter);</div><div class='add'>+</div><div class='add'>+	DBG_ERROR("sxg: %s EXIT\n", __FUNCTION__);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;sxg_global.driver_lock, sxg_global.flags);</div><div class='add'>+	return STATUS_SUCCESS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __devexit sxg_entry_remove(struct pci_dev *pcidev)</div><div class='add'>+{</div><div class='add'>+	p_net_device dev = pci_get_drvdata(pcidev);</div><div class='add'>+	u32 mmio_start = 0;</div><div class='add'>+	unsigned int mmio_len = 0;</div><div class='add'>+	p_adapter_t adapter = (p_adapter_t) netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	ASSERT(adapter);</div><div class='add'>+	DBG_ERROR("sxg: %s ENTER dev[%p] adapter[%p]\n", __FUNCTION__, dev,</div><div class='add'>+		  adapter);</div><div class='add'>+	sxg_deregister_interrupt(adapter);</div><div class='add'>+	sxg_unmap_mmio_space(adapter);</div><div class='add'>+	DBG_ERROR("sxg: %s unregister_netdev\n", __FUNCTION__);</div><div class='add'>+	unregister_netdev(dev);</div><div class='add'>+</div><div class='add'>+	mmio_start = pci_resource_start(pcidev, 0);</div><div class='add'>+	mmio_len = pci_resource_len(pcidev, 0);</div><div class='add'>+</div><div class='add'>+	DBG_ERROR("sxg: %s rel_region(0) start[%x] len[%x]\n", __FUNCTION__,</div><div class='add'>+		  mmio_start, mmio_len);</div><div class='add'>+	release_mem_region(mmio_start, mmio_len);</div><div class='add'>+</div><div class='add'>+	DBG_ERROR("sxg: %s iounmap dev-&gt;base_addr[%x]\n", __FUNCTION__,</div><div class='add'>+		  (unsigned int)dev-&gt;base_addr);</div><div class='add'>+	iounmap((char *)dev-&gt;base_addr);</div><div class='add'>+</div><div class='add'>+	DBG_ERROR("sxg: %s deallocate device\n", __FUNCTION__);</div><div class='add'>+	kfree(dev);</div><div class='add'>+	DBG_ERROR("sxg: %s EXIT\n", __FUNCTION__);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sxg_entry_halt(p_net_device dev)</div><div class='add'>+{</div><div class='add'>+	p_adapter_t adapter = (p_adapter_t) netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;sxg_global.driver_lock, sxg_global.flags);</div><div class='add'>+	DBG_ERROR("sxg: %s (%s) ENTER\n", __FUNCTION__, dev-&gt;name);</div><div class='add'>+</div><div class='add'>+	netif_stop_queue(adapter-&gt;netdev);</div><div class='add'>+	adapter-&gt;state = ADAPT_DOWN;</div><div class='add'>+	adapter-&gt;linkstate = LINK_DOWN;</div><div class='add'>+	adapter-&gt;devflags_prev = 0;</div><div class='add'>+	DBG_ERROR("sxg: %s (%s) set adapter[%p] state to ADAPT_DOWN(%d)\n",</div><div class='add'>+		  __FUNCTION__, dev-&gt;name, adapter, adapter-&gt;state);</div><div class='add'>+</div><div class='add'>+	DBG_ERROR("sxg: %s (%s) EXIT\n", __FUNCTION__, dev-&gt;name);</div><div class='add'>+	DBG_ERROR("sxg: %s EXIT\n", __FUNCTION__);</div><div class='add'>+	spin_unlock_irqrestore(&amp;sxg_global.driver_lock, sxg_global.flags);</div><div class='add'>+	return (STATUS_SUCCESS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sxg_ioctl(p_net_device dev, struct ifreq *rq, int cmd)</div><div class='add'>+{</div><div class='add'>+	ASSERT(rq);</div><div class='add'>+//      DBG_ERROR("sxg: %s cmd[%x] rq[%p] dev[%p]\n", __FUNCTION__, cmd, rq, dev);</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case SIOCSLICSETINTAGG:</div><div class='add'>+		{</div><div class='add'>+//                      p_adapter_t adapter = (p_adapter_t) netdev_priv(dev);</div><div class='add'>+			u32 data[7];</div><div class='add'>+			u32 intagg;</div><div class='add'>+</div><div class='add'>+			if (copy_from_user(data, rq-&gt;ifr_data, 28)) {</div><div class='add'>+				DBG_ERROR</div><div class='add'>+				    ("copy_from_user FAILED  getting initial params\n");</div><div class='add'>+				return -EFAULT;</div><div class='add'>+			}</div><div class='add'>+			intagg = data[0];</div><div class='add'>+			printk(KERN_EMERG</div><div class='add'>+			       "%s: set interrupt aggregation to %d\n",</div><div class='add'>+			       __FUNCTION__, intagg);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+//              DBG_ERROR("sxg: %s UNSUPPORTED[%x]\n", __FUNCTION__, cmd);</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define NORMAL_ETHFRAME     0</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *</div><div class='add'>+ * sxg_send_packets - Send a skb packet</div><div class='add'>+ *</div><div class='add'>+ * Arguments:</div><div class='add'>+ *			skb                     - The packet to send</div><div class='add'>+ *			dev                     - Our linux net device that refs our adapter</div><div class='add'>+ *</div><div class='add'>+ * Return:</div><div class='add'>+ *		0   regardless of outcome    XXXTODO refer to e1000 driver</div><div class='add'>+ */</div><div class='add'>+static int sxg_send_packets(struct sk_buff *skb, p_net_device dev)</div><div class='add'>+{</div><div class='add'>+	p_adapter_t adapter = (p_adapter_t) netdev_priv(dev);</div><div class='add'>+	u32 status = STATUS_SUCCESS;</div><div class='add'>+</div><div class='add'>+	DBG_ERROR("sxg: %s ENTER sxg_send_packets skb[%p]\n", __FUNCTION__,</div><div class='add'>+		  skb);</div><div class='add'>+	// Check the adapter state</div><div class='add'>+	switch (adapter-&gt;State) {</div><div class='add'>+	case SXG_STATE_INITIALIZING:</div><div class='add'>+	case SXG_STATE_HALTED:</div><div class='add'>+	case SXG_STATE_SHUTDOWN:</div><div class='add'>+		ASSERT(0);	// unexpected</div><div class='add'>+		// fall through</div><div class='add'>+	case SXG_STATE_RESETTING:</div><div class='add'>+	case SXG_STATE_SLEEP:</div><div class='add'>+	case SXG_STATE_BOOTDIAG:</div><div class='add'>+	case SXG_STATE_DIAG:</div><div class='add'>+	case SXG_STATE_HALTING:</div><div class='add'>+		status = STATUS_FAILURE;</div><div class='add'>+		break;</div><div class='add'>+	case SXG_STATE_RUNNING:</div><div class='add'>+		if (adapter-&gt;LinkState != SXG_LINK_UP) {</div><div class='add'>+			status = STATUS_FAILURE;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ASSERT(0);</div><div class='add'>+		status = STATUS_FAILURE;</div><div class='add'>+	}</div><div class='add'>+	if (status != STATUS_SUCCESS) {</div><div class='add'>+		goto xmit_fail;</div><div class='add'>+	}</div><div class='add'>+	// send a packet</div><div class='add'>+	status = sxg_transmit_packet(adapter, skb);</div><div class='add'>+	if (status == STATUS_SUCCESS) {</div><div class='add'>+		goto xmit_done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+      xmit_fail:</div><div class='add'>+	// reject &amp; complete all the packets if they cant be sent</div><div class='add'>+	if (status != STATUS_SUCCESS) {</div><div class='add'>+#if XXXTODO</div><div class='add'>+//      sxg_send_packets_fail(adapter, skb, status);</div><div class='add'>+#else</div><div class='add'>+		SXG_DROP_DUMB_SEND(adapter, skb);</div><div class='add'>+		adapter-&gt;stats.tx_dropped++;</div><div class='add'>+#endif</div><div class='add'>+	}</div><div class='add'>+	DBG_ERROR("sxg: %s EXIT sxg_send_packets status[%x]\n", __FUNCTION__,</div><div class='add'>+		  status);</div><div class='add'>+</div><div class='add'>+      xmit_done:</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * sxg_transmit_packet</div><div class='add'>+ *</div><div class='add'>+ * This function transmits a single packet.</div><div class='add'>+ *</div><div class='add'>+ * Arguments -</div><div class='add'>+ *		adapter			- Pointer to our adapter structure</div><div class='add'>+ *      skb             - The packet to be sent</div><div class='add'>+ *</div><div class='add'>+ * Return -</div><div class='add'>+ * 		STATUS of send</div><div class='add'>+ */</div><div class='add'>+static int sxg_transmit_packet(p_adapter_t adapter, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	PSCATTER_GATHER_LIST pSgl;</div><div class='add'>+	PSXG_SCATTER_GATHER SxgSgl;</div><div class='add'>+	void *SglBuffer;</div><div class='add'>+	u32 SglBufferLength;</div><div class='add'>+</div><div class='add'>+	// The vast majority of work is done in the shared</div><div class='add'>+	// sxg_dumb_sgl routine.</div><div class='add'>+	SXG_TRACE(TRACE_SXG, SxgTraceBuffer, TRACE_NOISY, "DumbSend",</div><div class='add'>+		  adapter, skb, 0, 0);</div><div class='add'>+</div><div class='add'>+	// Allocate a SGL buffer</div><div class='add'>+	SXG_GET_SGL_BUFFER(adapter, SxgSgl);</div><div class='add'>+	if (!SxgSgl) {</div><div class='add'>+		adapter-&gt;Stats.NoSglBuf++;</div><div class='add'>+		adapter-&gt;Stats.XmtErrors++;</div><div class='add'>+		SXG_TRACE(TRACE_SXG, SxgTraceBuffer, TRACE_NOISY, "SndPktF1",</div><div class='add'>+			  adapter, skb, 0, 0);</div><div class='add'>+		return (STATUS_RESOURCES);</div><div class='add'>+	}</div><div class='add'>+	ASSERT(SxgSgl-&gt;adapter == adapter);</div><div class='add'>+	SglBuffer = SXG_SGL_BUFFER(SxgSgl);</div><div class='add'>+	SglBufferLength = SXG_SGL_BUF_SIZE;</div><div class='add'>+	SxgSgl-&gt;VlanTag.VlanTci = 0;</div><div class='add'>+	SxgSgl-&gt;VlanTag.VlanTpid = 0;</div><div class='add'>+	SxgSgl-&gt;Type = SXG_SGL_DUMB;</div><div class='add'>+	SxgSgl-&gt;DumbPacket = skb;</div><div class='add'>+	pSgl = NULL;</div><div class='add'>+</div><div class='add'>+	// Call the common sxg_dumb_sgl routine to complete the send.</div><div class='add'>+	sxg_dumb_sgl(pSgl, SxgSgl);</div><div class='add'>+	// Return success   sxg_dumb_sgl (or something later) will complete it.</div><div class='add'>+	return (STATUS_SUCCESS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * sxg_dumb_sgl</div><div class='add'>+ *</div><div class='add'>+ * Arguments:</div><div class='add'>+ *		pSgl     -</div><div class='add'>+ *		SxgSgl   - SXG_SCATTER_GATHER</div><div class='add'>+ *</div><div class='add'>+ * Return Value:</div><div class='add'>+ * 	None.</div><div class='add'>+ */</div><div class='add'>+static void sxg_dumb_sgl(PSCATTER_GATHER_LIST pSgl, PSXG_SCATTER_GATHER SxgSgl)</div><div class='add'>+{</div><div class='add'>+	p_adapter_t adapter = SxgSgl-&gt;adapter;</div><div class='add'>+	struct sk_buff *skb = SxgSgl-&gt;DumbPacket;</div><div class='add'>+	// For now, all dumb-nic sends go on RSS queue zero</div><div class='add'>+	PSXG_XMT_RING XmtRing = &amp;adapter-&gt;XmtRings[0];</div><div class='add'>+	PSXG_RING_INFO XmtRingInfo = &amp;adapter-&gt;XmtRingZeroInfo;</div><div class='add'>+	PSXG_CMD XmtCmd = NULL;</div><div class='add'>+//      u32                         Index = 0;</div><div class='add'>+	u32 DataLength = skb-&gt;len;</div><div class='add'>+//  unsigned int                                BufLen;</div><div class='add'>+//      u32                         SglOffset;</div><div class='add'>+	u64 phys_addr;</div><div class='add'>+</div><div class='add'>+	SXG_TRACE(TRACE_SXG, SxgTraceBuffer, TRACE_NOISY, "DumbSgl",</div><div class='add'>+		  pSgl, SxgSgl, 0, 0);</div><div class='add'>+</div><div class='add'>+	// Set aside a pointer to the sgl</div><div class='add'>+	SxgSgl-&gt;pSgl = pSgl;</div><div class='add'>+</div><div class='add'>+	// Sanity check that our SGL format is as we expect.</div><div class='add'>+	ASSERT(sizeof(SXG_X64_SGE) == sizeof(SCATTER_GATHER_ELEMENT));</div><div class='add'>+	// Shouldn't be a vlan tag on this frame</div><div class='add'>+	ASSERT(SxgSgl-&gt;VlanTag.VlanTci == 0);</div><div class='add'>+	ASSERT(SxgSgl-&gt;VlanTag.VlanTpid == 0);</div><div class='add'>+</div><div class='add'>+	// From here below we work with the SGL placed in our</div><div class='add'>+	// buffer.</div><div class='add'>+</div><div class='add'>+	SxgSgl-&gt;Sgl.NumberOfElements = 1;</div><div class='add'>+</div><div class='add'>+	// Grab the spinlock and acquire a command</div><div class='add'>+	spin_lock(&amp;adapter-&gt;XmtZeroLock);</div><div class='add'>+	SXG_GET_CMD(XmtRing, XmtRingInfo, XmtCmd, SxgSgl);</div><div class='add'>+	if (XmtCmd == NULL) {</div><div class='add'>+		// Call sxg_complete_slow_send to see if we can</div><div class='add'>+		// free up any XmtRingZero entries and then try again</div><div class='add'>+		spin_unlock(&amp;adapter-&gt;XmtZeroLock);</div><div class='add'>+		sxg_complete_slow_send(adapter);</div><div class='add'>+		spin_lock(&amp;adapter-&gt;XmtZeroLock);</div><div class='add'>+		SXG_GET_CMD(XmtRing, XmtRingInfo, XmtCmd, SxgSgl);</div><div class='add'>+		if (XmtCmd == NULL) {</div><div class='add'>+			adapter-&gt;Stats.XmtZeroFull++;</div><div class='add'>+			goto abortcmd;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	SXG_TRACE(TRACE_SXG, SxgTraceBuffer, TRACE_NOISY, "DumbCmd",</div><div class='add'>+		  XmtCmd, XmtRingInfo-&gt;Head, XmtRingInfo-&gt;Tail, 0);</div><div class='add'>+	// Update stats</div><div class='add'>+	adapter-&gt;Stats.DumbXmtPkts++;</div><div class='add'>+	adapter-&gt;Stats.DumbXmtBytes += DataLength;</div><div class='add'>+#if XXXTODO			// Stats stuff</div><div class='add'>+	if (SXG_MULTICAST_PACKET(EtherHdr)) {</div><div class='add'>+		if (SXG_BROADCAST_PACKET(EtherHdr)) {</div><div class='add'>+			adapter-&gt;Stats.DumbXmtBcastPkts++;</div><div class='add'>+			adapter-&gt;Stats.DumbXmtBcastBytes += DataLength;</div><div class='add'>+		} else {</div><div class='add'>+			adapter-&gt;Stats.DumbXmtMcastPkts++;</div><div class='add'>+			adapter-&gt;Stats.DumbXmtMcastBytes += DataLength;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		adapter-&gt;Stats.DumbXmtUcastPkts++;</div><div class='add'>+		adapter-&gt;Stats.DumbXmtUcastBytes += DataLength;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	// Fill in the command</div><div class='add'>+	// Copy out the first SGE to the command and adjust for offset</div><div class='add'>+	phys_addr =</div><div class='add'>+	    pci_map_single(adapter-&gt;pcidev, skb-&gt;data, skb-&gt;len,</div><div class='add'>+			   PCI_DMA_TODEVICE);</div><div class='add'>+	XmtCmd-&gt;Buffer.FirstSgeAddress = SXG_GET_ADDR_HIGH(phys_addr);</div><div class='add'>+	XmtCmd-&gt;Buffer.FirstSgeAddress = XmtCmd-&gt;Buffer.FirstSgeAddress &lt;&lt; 32;</div><div class='add'>+	XmtCmd-&gt;Buffer.FirstSgeAddress =</div><div class='add'>+	    XmtCmd-&gt;Buffer.FirstSgeAddress | SXG_GET_ADDR_LOW(phys_addr);</div><div class='add'>+//      XmtCmd-&gt;Buffer.FirstSgeAddress = SxgSgl-&gt;Sgl.Elements[Index].Address;</div><div class='add'>+//      XmtCmd-&gt;Buffer.FirstSgeAddress.LowPart += MdlOffset;</div><div class='add'>+	XmtCmd-&gt;Buffer.FirstSgeLength = DataLength;</div><div class='add'>+	// Set a pointer to the remaining SGL entries</div><div class='add'>+//      XmtCmd-&gt;Sgl = SxgSgl-&gt;PhysicalAddress;</div><div class='add'>+	// Advance the physical address of the SxgSgl structure to</div><div class='add'>+	// the second SGE</div><div class='add'>+//      SglOffset = (u32)((u32 *)(&amp;SxgSgl-&gt;Sgl.Elements[Index+1]) -</div><div class='add'>+//                                              (u32 *)SxgSgl);</div><div class='add'>+//      XmtCmd-&gt;Sgl.LowPart += SglOffset;</div><div class='add'>+	XmtCmd-&gt;Buffer.SgeOffset = 0;</div><div class='add'>+	// Note - TotalLength might be overwritten with MSS below..</div><div class='add'>+	XmtCmd-&gt;Buffer.TotalLength = DataLength;</div><div class='add'>+	XmtCmd-&gt;SgEntries = 1;	//(ushort)(SxgSgl-&gt;Sgl.NumberOfElements - Index);</div><div class='add'>+	XmtCmd-&gt;Flags = 0;</div><div class='add'>+	//</div><div class='add'>+	// Advance transmit cmd descripter by 1.</div><div class='add'>+	// NOTE - See comments in SxgTcpOutput where we write</div><div class='add'>+	// to the XmtCmd register regarding CPU ID values and/or</div><div class='add'>+	// multiple commands.</div><div class='add'>+	//</div><div class='add'>+	//</div><div class='add'>+	WRITE_REG(adapter-&gt;UcodeRegs[0].XmtCmd, 1, TRUE);</div><div class='add'>+	//</div><div class='add'>+	//</div><div class='add'>+	adapter-&gt;Stats.XmtQLen++;	// Stats within lock</div><div class='add'>+	spin_unlock(&amp;adapter-&gt;XmtZeroLock);</div><div class='add'>+	SXG_TRACE(TRACE_SXG, SxgTraceBuffer, TRACE_NOISY, "XDumSgl2",</div><div class='add'>+		  XmtCmd, pSgl, SxgSgl, 0);</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+      abortcmd:</div><div class='add'>+	// NOTE - Only jump to this label AFTER grabbing the</div><div class='add'>+	// XmtZeroLock, and DO NOT DROP IT between the</div><div class='add'>+	// command allocation and the following abort.</div><div class='add'>+	if (XmtCmd) {</div><div class='add'>+		SXG_ABORT_CMD(XmtRingInfo);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;adapter-&gt;XmtZeroLock);</div><div class='add'>+</div><div class='add'>+// failsgl:</div><div class='add'>+	// Jump to this label if failure occurs before the</div><div class='add'>+	// XmtZeroLock is grabbed</div><div class='add'>+	adapter-&gt;Stats.XmtErrors++;</div><div class='add'>+	SXG_TRACE(TRACE_SXG, SxgTraceBuffer, TRACE_IMPORTANT, "DumSGFal",</div><div class='add'>+		  pSgl, SxgSgl, XmtRingInfo-&gt;Head, XmtRingInfo-&gt;Tail);</div><div class='add'>+</div><div class='add'>+	SXG_COMPLETE_DUMB_SEND(adapter, SxgSgl-&gt;DumbPacket);	// SxgSgl-&gt;DumbPacket is the skb</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/***************************************************************</div><div class='add'>+ * Link management functions</div><div class='add'>+ ***************************************************************/</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * sxg_initialize_link - Initialize the link stuff</div><div class='add'>+ *</div><div class='add'>+ * Arguments -</div><div class='add'>+ *	adapter		- A pointer to our adapter structure</div><div class='add'>+ *</div><div class='add'>+ * Return</div><div class='add'>+ *	status</div><div class='add'>+ */</div><div class='add'>+static int sxg_initialize_link(p_adapter_t adapter)</div><div class='add'>+{</div><div class='add'>+	PSXG_HW_REGS HwRegs = adapter-&gt;HwRegs;</div><div class='add'>+	u32 Value;</div><div class='add'>+	u32 ConfigData;</div><div class='add'>+	u32 MaxFrame;</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	SXG_TRACE(TRACE_SXG, SxgTraceBuffer, TRACE_NOISY, "InitLink",</div><div class='add'>+		  adapter, 0, 0, 0);</div><div class='add'>+</div><div class='add'>+	// Reset PHY and XGXS module</div><div class='add'>+	WRITE_REG(HwRegs-&gt;LinkStatus, LS_SERDES_POWER_DOWN, TRUE);</div><div class='add'>+</div><div class='add'>+	// Reset transmit configuration register</div><div class='add'>+	WRITE_REG(HwRegs-&gt;XmtConfig, XMT_CONFIG_RESET, TRUE);</div><div class='add'>+</div><div class='add'>+	// Reset receive configuration register</div><div class='add'>+	WRITE_REG(HwRegs-&gt;RcvConfig, RCV_CONFIG_RESET, TRUE);</div><div class='add'>+</div><div class='add'>+	// Reset all MAC modules</div><div class='add'>+	WRITE_REG(HwRegs-&gt;MacConfig0, AXGMAC_CFG0_SUB_RESET, TRUE);</div><div class='add'>+</div><div class='add'>+	// Link address 0</div><div class='add'>+	// XXXTODO - This assumes the MAC address (0a:0b:0c:0d:0e:0f)</div><div class='add'>+	// is stored with the first nibble (0a) in the byte 0</div><div class='add'>+	// of the Mac address.  Possibly reverse?</div><div class='add'>+	Value = *(u32 *) adapter-&gt;MacAddr;</div><div class='add'>+	WRITE_REG(HwRegs-&gt;LinkAddress0Low, Value, TRUE);</div><div class='add'>+	// also write the MAC address to the MAC.  Endian is reversed.</div><div class='add'>+	WRITE_REG(HwRegs-&gt;MacAddressLow, ntohl(Value), TRUE);</div><div class='add'>+	Value = (*(u16 *) &amp; adapter-&gt;MacAddr[4] &amp; 0x0000FFFF);</div><div class='add'>+	WRITE_REG(HwRegs-&gt;LinkAddress0High, Value | LINK_ADDRESS_ENABLE, TRUE);</div><div class='add'>+	// endian swap for the MAC (put high bytes in bits [31:16], swapped)</div><div class='add'>+	Value = ntohl(Value);</div><div class='add'>+	WRITE_REG(HwRegs-&gt;MacAddressHigh, Value, TRUE);</div><div class='add'>+	// Link address 1</div><div class='add'>+	WRITE_REG(HwRegs-&gt;LinkAddress1Low, 0, TRUE);</div><div class='add'>+	WRITE_REG(HwRegs-&gt;LinkAddress1High, 0, TRUE);</div><div class='add'>+	// Link address 2</div><div class='add'>+	WRITE_REG(HwRegs-&gt;LinkAddress2Low, 0, TRUE);</div><div class='add'>+	WRITE_REG(HwRegs-&gt;LinkAddress2High, 0, TRUE);</div><div class='add'>+	// Link address 3</div><div class='add'>+	WRITE_REG(HwRegs-&gt;LinkAddress3Low, 0, TRUE);</div><div class='add'>+	WRITE_REG(HwRegs-&gt;LinkAddress3High, 0, TRUE);</div><div class='add'>+</div><div class='add'>+	// Enable MAC modules</div><div class='add'>+	WRITE_REG(HwRegs-&gt;MacConfig0, 0, TRUE);</div><div class='add'>+</div><div class='add'>+	// Configure MAC</div><div class='add'>+	WRITE_REG(HwRegs-&gt;MacConfig1, (AXGMAC_CFG1_XMT_PAUSE |	// Allow sending of pause</div><div class='add'>+				       AXGMAC_CFG1_XMT_EN |	// Enable XMT</div><div class='add'>+				       AXGMAC_CFG1_RCV_PAUSE |	// Enable detection of pause</div><div class='add'>+				       AXGMAC_CFG1_RCV_EN |	// Enable receive</div><div class='add'>+				       AXGMAC_CFG1_SHORT_ASSERT |	// short frame detection</div><div class='add'>+				       AXGMAC_CFG1_CHECK_LEN |	// Verify frame length</div><div class='add'>+				       AXGMAC_CFG1_GEN_FCS |	// Generate FCS</div><div class='add'>+				       AXGMAC_CFG1_PAD_64),	// Pad frames to 64 bytes</div><div class='add'>+		  TRUE);</div><div class='add'>+</div><div class='add'>+	// Set AXGMAC max frame length if jumbo.  Not needed for standard MTU</div><div class='add'>+	if (adapter-&gt;JumboEnabled) {</div><div class='add'>+		WRITE_REG(HwRegs-&gt;MacMaxFrameLen, AXGMAC_MAXFRAME_JUMBO, TRUE);</div><div class='add'>+	}</div><div class='add'>+	// AMIIM Configuration Register -</div><div class='add'>+	// The value placed in the AXGMAC_AMIIM_CFG_HALF_CLOCK portion</div><div class='add'>+	// (bottom bits) of this register is used to determine the</div><div class='add'>+	// MDC frequency as specified in the A-XGMAC Design Document.</div><div class='add'>+	// This value must not be zero.  The following value (62 or 0x3E)</div><div class='add'>+	// is based on our MAC transmit clock frequency (MTCLK) of 312.5 MHz.</div><div class='add'>+	// Given a maximum MDIO clock frequency of 2.5 MHz (see the PHY spec),</div><div class='add'>+	// we get:  312.5/(2*(X+1)) &lt; 2.5  ==&gt; X = 62.</div><div class='add'>+	// This value happens to be the default value for this register,</div><div class='add'>+	// so we really don't have to do this.</div><div class='add'>+	WRITE_REG(HwRegs-&gt;MacAmiimConfig, 0x0000003E, TRUE);</div><div class='add'>+</div><div class='add'>+	// Power up and enable PHY and XAUI/XGXS/Serdes logic</div><div class='add'>+	WRITE_REG(HwRegs-&gt;LinkStatus,</div><div class='add'>+		  (LS_PHY_CLR_RESET |</div><div class='add'>+		   LS_XGXS_ENABLE |</div><div class='add'>+		   LS_XGXS_CTL | LS_PHY_CLK_EN | LS_ATTN_ALARM), TRUE);</div><div class='add'>+	DBG_ERROR("After Power Up and enable PHY in sxg_initialize_link\n");</div><div class='add'>+</div><div class='add'>+	// Per information given by Aeluros, wait 100 ms after removing reset.</div><div class='add'>+	// It's not enough to wait for the self-clearing reset bit in reg 0 to clear.</div><div class='add'>+	mdelay(100);</div><div class='add'>+</div><div class='add'>+	// Verify the PHY has come up by checking that the Reset bit has cleared.</div><div class='add'>+	status = sxg_read_mdio_reg(adapter, MIIM_DEV_PHY_PMA,	// PHY PMA/PMD module</div><div class='add'>+				   PHY_PMA_CONTROL1,	// PMA/PMD control register</div><div class='add'>+				   &amp;Value);</div><div class='add'>+	if (status != STATUS_SUCCESS)</div><div class='add'>+		return (STATUS_FAILURE);</div><div class='add'>+	if (Value &amp; PMA_CONTROL1_RESET)	// reset complete if bit is 0</div><div class='add'>+		return (STATUS_FAILURE);</div><div class='add'>+</div><div class='add'>+	// The SERDES should be initialized by now - confirm</div><div class='add'>+	READ_REG(HwRegs-&gt;LinkStatus, Value);</div><div class='add'>+	if (Value &amp; LS_SERDES_DOWN)	// verify SERDES is initialized</div><div class='add'>+		return (STATUS_FAILURE);</div><div class='add'>+</div><div class='add'>+	// The XAUI link should also be up - confirm</div><div class='add'>+	if (!(Value &amp; LS_XAUI_LINK_UP))	// verify XAUI link is up</div><div class='add'>+		return (STATUS_FAILURE);</div><div class='add'>+</div><div class='add'>+	// Initialize the PHY</div><div class='add'>+	status = sxg_phy_init(adapter);</div><div class='add'>+	if (status != STATUS_SUCCESS)</div><div class='add'>+		return (STATUS_FAILURE);</div><div class='add'>+</div><div class='add'>+	// Enable the Link Alarm</div><div class='add'>+	status = sxg_write_mdio_reg(adapter, MIIM_DEV_PHY_PMA,	// PHY PMA/PMD module</div><div class='add'>+				    LASI_CONTROL,	// LASI control register</div><div class='add'>+				    LASI_CTL_LS_ALARM_ENABLE);	// enable link alarm bit</div><div class='add'>+	if (status != STATUS_SUCCESS)</div><div class='add'>+		return (STATUS_FAILURE);</div><div class='add'>+</div><div class='add'>+	// XXXTODO - temporary - verify bit is set</div><div class='add'>+	status = sxg_read_mdio_reg(adapter, MIIM_DEV_PHY_PMA,	// PHY PMA/PMD module</div><div class='add'>+				   LASI_CONTROL,	// LASI control register</div><div class='add'>+				   &amp;Value);</div><div class='add'>+	if (status != STATUS_SUCCESS)</div><div class='add'>+		return (STATUS_FAILURE);</div><div class='add'>+	if (!(Value &amp; LASI_CTL_LS_ALARM_ENABLE)) {</div><div class='add'>+		DBG_ERROR("Error!  LASI Control Alarm Enable bit not set!\n");</div><div class='add'>+	}</div><div class='add'>+	// Enable receive</div><div class='add'>+	MaxFrame = adapter-&gt;JumboEnabled ? JUMBOMAXFRAME : ETHERMAXFRAME;</div><div class='add'>+	ConfigData = (RCV_CONFIG_ENABLE |</div><div class='add'>+		      RCV_CONFIG_ENPARSE |</div><div class='add'>+		      RCV_CONFIG_RCVBAD |</div><div class='add'>+		      RCV_CONFIG_RCVPAUSE |</div><div class='add'>+		      RCV_CONFIG_TZIPV6 |</div><div class='add'>+		      RCV_CONFIG_TZIPV4 |</div><div class='add'>+		      RCV_CONFIG_HASH_16 |</div><div class='add'>+		      RCV_CONFIG_SOCKET | RCV_CONFIG_BUFSIZE(MaxFrame));</div><div class='add'>+	WRITE_REG(HwRegs-&gt;RcvConfig, ConfigData, TRUE);</div><div class='add'>+</div><div class='add'>+	WRITE_REG(HwRegs-&gt;XmtConfig, XMT_CONFIG_ENABLE, TRUE);</div><div class='add'>+</div><div class='add'>+	// Mark the link as down.  We'll get a link event when it comes up.</div><div class='add'>+	sxg_link_state(adapter, SXG_LINK_DOWN);</div><div class='add'>+</div><div class='add'>+	SXG_TRACE(TRACE_SXG, SxgTraceBuffer, TRACE_NOISY, "XInitLnk",</div><div class='add'>+		  adapter, 0, 0, 0);</div><div class='add'>+	return (STATUS_SUCCESS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * sxg_phy_init - Initialize the PHY</div><div class='add'>+ *</div><div class='add'>+ * Arguments -</div><div class='add'>+ *	adapter		- A pointer to our adapter structure</div><div class='add'>+ *</div><div class='add'>+ * Return</div><div class='add'>+ *	status</div><div class='add'>+ */</div><div class='add'>+static int sxg_phy_init(p_adapter_t adapter)</div><div class='add'>+{</div><div class='add'>+	u32 Value;</div><div class='add'>+	PPHY_UCODE p;</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	DBG_ERROR("ENTER %s\n", __FUNCTION__);</div><div class='add'>+</div><div class='add'>+	// Read a register to identify the PHY type</div><div class='add'>+	status = sxg_read_mdio_reg(adapter, MIIM_DEV_PHY_PMA,	// PHY PMA/PMD module</div><div class='add'>+				   0xC205,	// PHY ID register (?)</div><div class='add'>+				   &amp;Value);	//    XXXTODO - add def</div><div class='add'>+	if (status != STATUS_SUCCESS)</div><div class='add'>+		return (STATUS_FAILURE);</div><div class='add'>+</div><div class='add'>+	if (Value == 0x0012) {	// 0x0012 == AEL2005C PHY(?) - XXXTODO - add def</div><div class='add'>+		DBG_ERROR</div><div class='add'>+		    ("AEL2005C PHY detected.  Downloading PHY microcode.\n");</div><div class='add'>+</div><div class='add'>+		// Initialize AEL2005C PHY and download PHY microcode</div><div class='add'>+		for (p = PhyUcode; p-&gt;Addr != 0xFFFF; p++) {</div><div class='add'>+			if (p-&gt;Addr == 0) {</div><div class='add'>+				// if address == 0, data == sleep time in ms</div><div class='add'>+				mdelay(p-&gt;Data);</div><div class='add'>+			} else {</div><div class='add'>+				// write the given data to the specified address</div><div class='add'>+				status = sxg_write_mdio_reg(adapter, MIIM_DEV_PHY_PMA,	// PHY PMA/PMD module</div><div class='add'>+							    p-&gt;Addr,	// PHY address</div><div class='add'>+							    p-&gt;Data);	// PHY data</div><div class='add'>+				if (status != STATUS_SUCCESS)</div><div class='add'>+					return (STATUS_FAILURE);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	DBG_ERROR("EXIT %s\n", __FUNCTION__);</div><div class='add'>+</div><div class='add'>+	return (STATUS_SUCCESS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * sxg_link_event - Process a link event notification from the card</div><div class='add'>+ *</div><div class='add'>+ * Arguments -</div><div class='add'>+ *	adapter		- A pointer to our adapter structure</div><div class='add'>+ *</div><div class='add'>+ * Return</div><div class='add'>+ *	None</div><div class='add'>+ */</div><div class='add'>+static void sxg_link_event(p_adapter_t adapter)</div><div class='add'>+{</div><div class='add'>+	PSXG_HW_REGS HwRegs = adapter-&gt;HwRegs;</div><div class='add'>+	SXG_LINK_STATE LinkState;</div><div class='add'>+	int status;</div><div class='add'>+	u32 Value;</div><div class='add'>+</div><div class='add'>+	SXG_TRACE(TRACE_SXG, SxgTraceBuffer, TRACE_NOISY, "LinkEvnt",</div><div class='add'>+		  adapter, 0, 0, 0);</div><div class='add'>+	DBG_ERROR("ENTER %s\n", __FUNCTION__);</div><div class='add'>+</div><div class='add'>+	// Check the Link Status register.  We should have a Link Alarm.</div><div class='add'>+	READ_REG(HwRegs-&gt;LinkStatus, Value);</div><div class='add'>+	if (Value &amp; LS_LINK_ALARM) {</div><div class='add'>+		// We got a Link Status alarm.  First, pause to let the</div><div class='add'>+		// link state settle (it can bounce a number of times)</div><div class='add'>+		mdelay(10);</div><div class='add'>+</div><div class='add'>+		// Now clear the alarm by reading the LASI status register.</div><div class='add'>+		status = sxg_read_mdio_reg(adapter, MIIM_DEV_PHY_PMA,	// PHY PMA/PMD module</div><div class='add'>+					   LASI_STATUS,	// LASI status register</div><div class='add'>+					   &amp;Value);</div><div class='add'>+		if (status != STATUS_SUCCESS) {</div><div class='add'>+			DBG_ERROR("Error reading LASI Status MDIO register!\n");</div><div class='add'>+			sxg_link_state(adapter, SXG_LINK_DOWN);</div><div class='add'>+//                      ASSERT(0);</div><div class='add'>+		}</div><div class='add'>+		ASSERT(Value &amp; LASI_STATUS_LS_ALARM);</div><div class='add'>+</div><div class='add'>+		// Now get and set the link state</div><div class='add'>+		LinkState = sxg_get_link_state(adapter);</div><div class='add'>+		sxg_link_state(adapter, LinkState);</div><div class='add'>+		DBG_ERROR("SXG: Link Alarm occurred.  Link is %s\n",</div><div class='add'>+			  ((LinkState == SXG_LINK_UP) ? "UP" : "DOWN"));</div><div class='add'>+	} else {</div><div class='add'>+		// XXXTODO - Assuming Link Attention is only being generated for the</div><div class='add'>+		// Link Alarm pin (and not for a XAUI Link Status change), then it's</div><div class='add'>+		// impossible to get here.  Yet we've gotten here twice (under extreme</div><div class='add'>+		// conditions - bouncing the link up and down many times a second).</div><div class='add'>+		// Needs further investigation.</div><div class='add'>+		DBG_ERROR("SXG: sxg_link_event: Can't get here!\n");</div><div class='add'>+		DBG_ERROR("SXG: Link Status == 0x%08X.\n", Value);</div><div class='add'>+//              ASSERT(0);</div><div class='add'>+	}</div><div class='add'>+	DBG_ERROR("EXIT %s\n", __FUNCTION__);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * sxg_get_link_state - Determine if the link is up or down</div><div class='add'>+ *</div><div class='add'>+ * Arguments -</div><div class='add'>+ *	adapter		- A pointer to our adapter structure</div><div class='add'>+ *</div><div class='add'>+ * Return</div><div class='add'>+ *	Link State</div><div class='add'>+ */</div><div class='add'>+static SXG_LINK_STATE sxg_get_link_state(p_adapter_t adapter)</div><div class='add'>+{</div><div class='add'>+	int status;</div><div class='add'>+	u32 Value;</div><div class='add'>+</div><div class='add'>+	DBG_ERROR("ENTER %s\n", __FUNCTION__);</div><div class='add'>+</div><div class='add'>+	SXG_TRACE(TRACE_SXG, SxgTraceBuffer, TRACE_NOISY, "GetLink",</div><div class='add'>+		  adapter, 0, 0, 0);</div><div class='add'>+</div><div class='add'>+	// Per the Xenpak spec (and the IEEE 10Gb spec?), the link is up if</div><div class='add'>+	// the following 3 bits (from 3 different MDIO registers) are all true.</div><div class='add'>+	status = sxg_read_mdio_reg(adapter, MIIM_DEV_PHY_PMA,	// PHY PMA/PMD module</div><div class='add'>+				   PHY_PMA_RCV_DET,	// PMA/PMD Receive Signal Detect register</div><div class='add'>+				   &amp;Value);</div><div class='add'>+	if (status != STATUS_SUCCESS)</div><div class='add'>+		goto bad;</div><div class='add'>+</div><div class='add'>+	// If PMA/PMD receive signal detect is 0, then the link is down</div><div class='add'>+	if (!(Value &amp; PMA_RCV_DETECT))</div><div class='add'>+		return (SXG_LINK_DOWN);</div><div class='add'>+</div><div class='add'>+	status = sxg_read_mdio_reg(adapter, MIIM_DEV_PHY_PCS,	// PHY PCS module</div><div class='add'>+				   PHY_PCS_10G_STATUS1,	// PCS 10GBASE-R Status 1 register</div><div class='add'>+				   &amp;Value);</div><div class='add'>+	if (status != STATUS_SUCCESS)</div><div class='add'>+		goto bad;</div><div class='add'>+</div><div class='add'>+	// If PCS is not locked to receive blocks, then the link is down</div><div class='add'>+	if (!(Value &amp; PCS_10B_BLOCK_LOCK))</div><div class='add'>+		return (SXG_LINK_DOWN);</div><div class='add'>+</div><div class='add'>+	status = sxg_read_mdio_reg(adapter, MIIM_DEV_PHY_XS,	// PHY XS module</div><div class='add'>+				   PHY_XS_LANE_STATUS,	// XS Lane Status register</div><div class='add'>+				   &amp;Value);</div><div class='add'>+	if (status != STATUS_SUCCESS)</div><div class='add'>+		goto bad;</div><div class='add'>+</div><div class='add'>+	// If XS transmit lanes are not aligned, then the link is down</div><div class='add'>+	if (!(Value &amp; XS_LANE_ALIGN))</div><div class='add'>+		return (SXG_LINK_DOWN);</div><div class='add'>+</div><div class='add'>+	// All 3 bits are true, so the link is up</div><div class='add'>+	DBG_ERROR("EXIT %s\n", __FUNCTION__);</div><div class='add'>+</div><div class='add'>+	return (SXG_LINK_UP);</div><div class='add'>+</div><div class='add'>+      bad:</div><div class='add'>+	// An error occurred reading an MDIO register.  This shouldn't happen.</div><div class='add'>+	DBG_ERROR("Error reading an MDIO register!\n");</div><div class='add'>+	ASSERT(0);</div><div class='add'>+	return (SXG_LINK_DOWN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sxg_indicate_link_state(p_adapter_t adapter,</div><div class='add'>+				    SXG_LINK_STATE LinkState)</div><div class='add'>+{</div><div class='add'>+	if (adapter-&gt;LinkState == SXG_LINK_UP) {</div><div class='add'>+		DBG_ERROR("%s: LINK now UP, call netif_start_queue\n",</div><div class='add'>+			  __FUNCTION__);</div><div class='add'>+		netif_start_queue(adapter-&gt;netdev);</div><div class='add'>+	} else {</div><div class='add'>+		DBG_ERROR("%s: LINK now DOWN, call netif_stop_queue\n",</div><div class='add'>+			  __FUNCTION__);</div><div class='add'>+		netif_stop_queue(adapter-&gt;netdev);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * sxg_link_state - Set the link state and if necessary, indicate.</div><div class='add'>+ *	This routine the central point of processing for all link state changes.</div><div class='add'>+ *	Nothing else in the driver should alter the link state or perform</div><div class='add'>+ *	link state indications</div><div class='add'>+ *</div><div class='add'>+ * Arguments -</div><div class='add'>+ *	adapter		- A pointer to our adapter structure</div><div class='add'>+ *	LinkState 	- The link state</div><div class='add'>+ *</div><div class='add'>+ * Return</div><div class='add'>+ *	None</div><div class='add'>+ */</div><div class='add'>+static void sxg_link_state(p_adapter_t adapter, SXG_LINK_STATE LinkState)</div><div class='add'>+{</div><div class='add'>+	SXG_TRACE(TRACE_SXG, SxgTraceBuffer, TRACE_IMPORTANT, "LnkINDCT",</div><div class='add'>+		  adapter, LinkState, adapter-&gt;LinkState, adapter-&gt;State);</div><div class='add'>+</div><div class='add'>+	DBG_ERROR("ENTER %s\n", __FUNCTION__);</div><div class='add'>+</div><div class='add'>+	// Hold the adapter lock during this routine.  Maybe move</div><div class='add'>+	// the lock to the caller.</div><div class='add'>+	spin_lock(&amp;adapter-&gt;AdapterLock);</div><div class='add'>+	if (LinkState == adapter-&gt;LinkState) {</div><div class='add'>+		// Nothing changed..</div><div class='add'>+		spin_unlock(&amp;adapter-&gt;AdapterLock);</div><div class='add'>+		DBG_ERROR("EXIT #0 %s\n", __FUNCTION__);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	// Save the adapter state</div><div class='add'>+	adapter-&gt;LinkState = LinkState;</div><div class='add'>+</div><div class='add'>+	// Drop the lock and indicate link state</div><div class='add'>+	spin_unlock(&amp;adapter-&gt;AdapterLock);</div><div class='add'>+	DBG_ERROR("EXIT #1 %s\n", __FUNCTION__);</div><div class='add'>+</div><div class='add'>+	sxg_indicate_link_state(adapter, LinkState);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * sxg_write_mdio_reg - Write to a register on the MDIO bus</div><div class='add'>+ *</div><div class='add'>+ * Arguments -</div><div class='add'>+ *	adapter		- A pointer to our adapter structure</div><div class='add'>+ *  DevAddr     - MDIO device number being addressed</div><div class='add'>+ *  RegAddr     - register address for the specified MDIO device</div><div class='add'>+ *  Value		- value to write to the MDIO register</div><div class='add'>+ *</div><div class='add'>+ * Return</div><div class='add'>+ *	status</div><div class='add'>+ */</div><div class='add'>+static int sxg_write_mdio_reg(p_adapter_t adapter,</div><div class='add'>+			      u32 DevAddr, u32 RegAddr, u32 Value)</div><div class='add'>+{</div><div class='add'>+	PSXG_HW_REGS HwRegs = adapter-&gt;HwRegs;</div><div class='add'>+	u32 AddrOp;		// Address operation (written to MIIM field reg)</div><div class='add'>+	u32 WriteOp;		// Write operation (written to MIIM field reg)</div><div class='add'>+	u32 Cmd;		// Command (written to MIIM command reg)</div><div class='add'>+	u32 ValueRead;</div><div class='add'>+	u32 Timeout;</div><div class='add'>+</div><div class='add'>+//  DBG_ERROR("ENTER %s\n", __FUNCTION__);</div><div class='add'>+</div><div class='add'>+	SXG_TRACE(TRACE_SXG, SxgTraceBuffer, TRACE_NOISY, "WrtMDIO",</div><div class='add'>+		  adapter, 0, 0, 0);</div><div class='add'>+</div><div class='add'>+	// Ensure values don't exceed field width</div><div class='add'>+	DevAddr &amp;= 0x001F;	// 5-bit field</div><div class='add'>+	RegAddr &amp;= 0xFFFF;	// 16-bit field</div><div class='add'>+	Value &amp;= 0xFFFF;	// 16-bit field</div><div class='add'>+</div><div class='add'>+	// Set MIIM field register bits for an MIIM address operation</div><div class='add'>+	AddrOp = (MIIM_PORT_NUM &lt;&lt; AXGMAC_AMIIM_FIELD_PORT_SHIFT) |</div><div class='add'>+	    (DevAddr &lt;&lt; AXGMAC_AMIIM_FIELD_DEV_SHIFT) |</div><div class='add'>+	    (MIIM_TA_10GB &lt;&lt; AXGMAC_AMIIM_FIELD_TA_SHIFT) |</div><div class='add'>+	    (MIIM_OP_ADDR &lt;&lt; AXGMAC_AMIIM_FIELD_OP_SHIFT) | RegAddr;</div><div class='add'>+</div><div class='add'>+	// Set MIIM field register bits for an MIIM write operation</div><div class='add'>+	WriteOp = (MIIM_PORT_NUM &lt;&lt; AXGMAC_AMIIM_FIELD_PORT_SHIFT) |</div><div class='add'>+	    (DevAddr &lt;&lt; AXGMAC_AMIIM_FIELD_DEV_SHIFT) |</div><div class='add'>+	    (MIIM_TA_10GB &lt;&lt; AXGMAC_AMIIM_FIELD_TA_SHIFT) |</div><div class='add'>+	    (MIIM_OP_WRITE &lt;&lt; AXGMAC_AMIIM_FIELD_OP_SHIFT) | Value;</div><div class='add'>+</div><div class='add'>+	// Set MIIM command register bits to execute an MIIM command</div><div class='add'>+	Cmd = AXGMAC_AMIIM_CMD_START | AXGMAC_AMIIM_CMD_10G_OPERATION;</div><div class='add'>+</div><div class='add'>+	// Reset the command register command bit (in case it's not 0)</div><div class='add'>+	WRITE_REG(HwRegs-&gt;MacAmiimCmd, 0, TRUE);</div><div class='add'>+</div><div class='add'>+	// MIIM write to set the address of the specified MDIO register</div><div class='add'>+	WRITE_REG(HwRegs-&gt;MacAmiimField, AddrOp, TRUE);</div><div class='add'>+</div><div class='add'>+	// Write to MIIM Command Register to execute to address operation</div><div class='add'>+	WRITE_REG(HwRegs-&gt;MacAmiimCmd, Cmd, TRUE);</div><div class='add'>+</div><div class='add'>+	// Poll AMIIM Indicator register to wait for completion</div><div class='add'>+	Timeout = SXG_LINK_TIMEOUT;</div><div class='add'>+	do {</div><div class='add'>+		udelay(100);	// Timeout in 100us units</div><div class='add'>+		READ_REG(HwRegs-&gt;MacAmiimIndicator, ValueRead);</div><div class='add'>+		if (--Timeout == 0) {</div><div class='add'>+			return (STATUS_FAILURE);</div><div class='add'>+		}</div><div class='add'>+	} while (ValueRead &amp; AXGMAC_AMIIM_INDC_BUSY);</div><div class='add'>+</div><div class='add'>+	// Reset the command register command bit</div><div class='add'>+	WRITE_REG(HwRegs-&gt;MacAmiimCmd, 0, TRUE);</div><div class='add'>+</div><div class='add'>+	// MIIM write to set up an MDIO write operation</div><div class='add'>+	WRITE_REG(HwRegs-&gt;MacAmiimField, WriteOp, TRUE);</div><div class='add'>+</div><div class='add'>+	// Write to MIIM Command Register to execute the write operation</div><div class='add'>+	WRITE_REG(HwRegs-&gt;MacAmiimCmd, Cmd, TRUE);</div><div class='add'>+</div><div class='add'>+	// Poll AMIIM Indicator register to wait for completion</div><div class='add'>+	Timeout = SXG_LINK_TIMEOUT;</div><div class='add'>+	do {</div><div class='add'>+		udelay(100);	// Timeout in 100us units</div><div class='add'>+		READ_REG(HwRegs-&gt;MacAmiimIndicator, ValueRead);</div><div class='add'>+		if (--Timeout == 0) {</div><div class='add'>+			return (STATUS_FAILURE);</div><div class='add'>+		}</div><div class='add'>+	} while (ValueRead &amp; AXGMAC_AMIIM_INDC_BUSY);</div><div class='add'>+</div><div class='add'>+//  DBG_ERROR("EXIT %s\n", __FUNCTION__);</div><div class='add'>+</div><div class='add'>+	return (STATUS_SUCCESS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * sxg_read_mdio_reg - Read a register on the MDIO bus</div><div class='add'>+ *</div><div class='add'>+ * Arguments -</div><div class='add'>+ *	adapter		- A pointer to our adapter structure</div><div class='add'>+ *  DevAddr     - MDIO device number being addressed</div><div class='add'>+ *  RegAddr     - register address for the specified MDIO device</div><div class='add'>+ *  pValue		- pointer to where to put data read from the MDIO register</div><div class='add'>+ *</div><div class='add'>+ * Return</div><div class='add'>+ *	status</div><div class='add'>+ */</div><div class='add'>+static int sxg_read_mdio_reg(p_adapter_t adapter,</div><div class='add'>+			     u32 DevAddr, u32 RegAddr, u32 *pValue)</div><div class='add'>+{</div><div class='add'>+	PSXG_HW_REGS HwRegs = adapter-&gt;HwRegs;</div><div class='add'>+	u32 AddrOp;		// Address operation (written to MIIM field reg)</div><div class='add'>+	u32 ReadOp;		// Read operation (written to MIIM field reg)</div><div class='add'>+	u32 Cmd;		// Command (written to MIIM command reg)</div><div class='add'>+	u32 ValueRead;</div><div class='add'>+	u32 Timeout;</div><div class='add'>+</div><div class='add'>+	SXG_TRACE(TRACE_SXG, SxgTraceBuffer, TRACE_NOISY, "WrtMDIO",</div><div class='add'>+		  adapter, 0, 0, 0);</div><div class='add'>+//  DBG_ERROR("ENTER %s\n", __FUNCTION__);</div><div class='add'>+</div><div class='add'>+	// Ensure values don't exceed field width</div><div class='add'>+	DevAddr &amp;= 0x001F;	// 5-bit field</div><div class='add'>+	RegAddr &amp;= 0xFFFF;	// 16-bit field</div><div class='add'>+</div><div class='add'>+	// Set MIIM field register bits for an MIIM address operation</div><div class='add'>+	AddrOp = (MIIM_PORT_NUM &lt;&lt; AXGMAC_AMIIM_FIELD_PORT_SHIFT) |</div><div class='add'>+	    (DevAddr &lt;&lt; AXGMAC_AMIIM_FIELD_DEV_SHIFT) |</div><div class='add'>+	    (MIIM_TA_10GB &lt;&lt; AXGMAC_AMIIM_FIELD_TA_SHIFT) |</div><div class='add'>+	    (MIIM_OP_ADDR &lt;&lt; AXGMAC_AMIIM_FIELD_OP_SHIFT) | RegAddr;</div><div class='add'>+</div><div class='add'>+	// Set MIIM field register bits for an MIIM read operation</div><div class='add'>+	ReadOp = (MIIM_PORT_NUM &lt;&lt; AXGMAC_AMIIM_FIELD_PORT_SHIFT) |</div><div class='add'>+	    (DevAddr &lt;&lt; AXGMAC_AMIIM_FIELD_DEV_SHIFT) |</div><div class='add'>+	    (MIIM_TA_10GB &lt;&lt; AXGMAC_AMIIM_FIELD_TA_SHIFT) |</div><div class='add'>+	    (MIIM_OP_READ &lt;&lt; AXGMAC_AMIIM_FIELD_OP_SHIFT);</div><div class='add'>+</div><div class='add'>+	// Set MIIM command register bits to execute an MIIM command</div><div class='add'>+	Cmd = AXGMAC_AMIIM_CMD_START | AXGMAC_AMIIM_CMD_10G_OPERATION;</div><div class='add'>+</div><div class='add'>+	// Reset the command register command bit (in case it's not 0)</div><div class='add'>+	WRITE_REG(HwRegs-&gt;MacAmiimCmd, 0, TRUE);</div><div class='add'>+</div><div class='add'>+	// MIIM write to set the address of the specified MDIO register</div><div class='add'>+	WRITE_REG(HwRegs-&gt;MacAmiimField, AddrOp, TRUE);</div><div class='add'>+</div><div class='add'>+	// Write to MIIM Command Register to execute to address operation</div><div class='add'>+	WRITE_REG(HwRegs-&gt;MacAmiimCmd, Cmd, TRUE);</div><div class='add'>+</div><div class='add'>+	// Poll AMIIM Indicator register to wait for completion</div><div class='add'>+	Timeout = SXG_LINK_TIMEOUT;</div><div class='add'>+	do {</div><div class='add'>+		udelay(100);	// Timeout in 100us units</div><div class='add'>+		READ_REG(HwRegs-&gt;MacAmiimIndicator, ValueRead);</div><div class='add'>+		if (--Timeout == 0) {</div><div class='add'>+			return (STATUS_FAILURE);</div><div class='add'>+		}</div><div class='add'>+	} while (ValueRead &amp; AXGMAC_AMIIM_INDC_BUSY);</div><div class='add'>+</div><div class='add'>+	// Reset the command register command bit</div><div class='add'>+	WRITE_REG(HwRegs-&gt;MacAmiimCmd, 0, TRUE);</div><div class='add'>+</div><div class='add'>+	// MIIM write to set up an MDIO register read operation</div><div class='add'>+	WRITE_REG(HwRegs-&gt;MacAmiimField, ReadOp, TRUE);</div><div class='add'>+</div><div class='add'>+	// Write to MIIM Command Register to execute the read operation</div><div class='add'>+	WRITE_REG(HwRegs-&gt;MacAmiimCmd, Cmd, TRUE);</div><div class='add'>+</div><div class='add'>+	// Poll AMIIM Indicator register to wait for completion</div><div class='add'>+	Timeout = SXG_LINK_TIMEOUT;</div><div class='add'>+	do {</div><div class='add'>+		udelay(100);	// Timeout in 100us units</div><div class='add'>+		READ_REG(HwRegs-&gt;MacAmiimIndicator, ValueRead);</div><div class='add'>+		if (--Timeout == 0) {</div><div class='add'>+			return (STATUS_FAILURE);</div><div class='add'>+		}</div><div class='add'>+	} while (ValueRead &amp; AXGMAC_AMIIM_INDC_BUSY);</div><div class='add'>+</div><div class='add'>+	// Read the MDIO register data back from the field register</div><div class='add'>+	READ_REG(HwRegs-&gt;MacAmiimField, *pValue);</div><div class='add'>+	*pValue &amp;= 0xFFFF;	// data is in the lower 16 bits</div><div class='add'>+</div><div class='add'>+//  DBG_ERROR("EXIT %s\n", __FUNCTION__);</div><div class='add'>+</div><div class='add'>+	return (STATUS_SUCCESS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  Allocate a mcast_address structure to hold the multicast address.</div><div class='add'>+ *  Link it in.</div><div class='add'>+ */</div><div class='add'>+static int sxg_mcast_add_list(p_adapter_t adapter, char *address)</div><div class='add'>+{</div><div class='add'>+	p_mcast_address_t mcaddr, mlist;</div><div class='add'>+	bool equaladdr;</div><div class='add'>+</div><div class='add'>+	/* Check to see if it already exists */</div><div class='add'>+	mlist = adapter-&gt;mcastaddrs;</div><div class='add'>+	while (mlist) {</div><div class='add'>+		ETHER_EQ_ADDR(mlist-&gt;address, address, equaladdr);</div><div class='add'>+		if (equaladdr) {</div><div class='add'>+			return (STATUS_SUCCESS);</div><div class='add'>+		}</div><div class='add'>+		mlist = mlist-&gt;next;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Doesn't already exist.  Allocate a structure to hold it */</div><div class='add'>+	mcaddr = kmalloc(sizeof(mcast_address_t), GFP_ATOMIC);</div><div class='add'>+	if (mcaddr == NULL)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	memcpy(mcaddr-&gt;address, address, 6);</div><div class='add'>+</div><div class='add'>+	mcaddr-&gt;next = adapter-&gt;mcastaddrs;</div><div class='add'>+	adapter-&gt;mcastaddrs = mcaddr;</div><div class='add'>+</div><div class='add'>+	return (STATUS_SUCCESS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Functions to obtain the CRC corresponding to the destination mac address.</div><div class='add'>+ * This is a standard ethernet CRC in that it is a 32-bit, reflected CRC using</div><div class='add'>+ * the polynomial:</div><div class='add'>+ *   x^32 + x^26 + x^23 + x^22 + x^16 + x^12 + x^11 + x^10 + x^8 + x^7 + x^5 + x^4 + x^2 + x^1.</div><div class='add'>+ *</div><div class='add'>+ * After the CRC for the 6 bytes is generated (but before the value is complemented),</div><div class='add'>+ * we must then transpose the value and return bits 30-23.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+static u32 sxg_crc_table[256];	/* Table of CRC's for all possible byte values */</div><div class='add'>+static u32 sxg_crc_init;	/* Is table initialized                        */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  Contruct the CRC32 table</div><div class='add'>+ */</div><div class='add'>+static void sxg_mcast_init_crc32(void)</div><div class='add'>+{</div><div class='add'>+	u32 c;			/*  CRC shit reg                 */</div><div class='add'>+	u32 e = 0;		/*  Poly X-or pattern            */</div><div class='add'>+	int i;			/*  counter                      */</div><div class='add'>+	int k;			/*  byte being shifted into crc  */</div><div class='add'>+</div><div class='add'>+	static int p[] = { 0, 1, 2, 4, 5, 7, 8, 10, 11, 12, 16, 22, 23, 26 };</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; sizeof(p) / sizeof(int); i++) {</div><div class='add'>+		e |= 1L &lt;&lt; (31 - p[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 1; i &lt; 256; i++) {</div><div class='add'>+		c = i;</div><div class='add'>+		for (k = 8; k; k--) {</div><div class='add'>+			c = c &amp; 1 ? (c &gt;&gt; 1) ^ e : c &gt;&gt; 1;</div><div class='add'>+		}</div><div class='add'>+		sxg_crc_table[i] = c;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  Return the MAC hast as described above.</div><div class='add'>+ */</div><div class='add'>+static unsigned char sxg_mcast_get_mac_hash(char *macaddr)</div><div class='add'>+{</div><div class='add'>+	u32 crc;</div><div class='add'>+	char *p;</div><div class='add'>+	int i;</div><div class='add'>+	unsigned char machash = 0;</div><div class='add'>+</div><div class='add'>+	if (!sxg_crc_init) {</div><div class='add'>+		sxg_mcast_init_crc32();</div><div class='add'>+		sxg_crc_init = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	crc = 0xFFFFFFFF;	/* Preload shift register, per crc-32 spec */</div><div class='add'>+	for (i = 0, p = macaddr; i &lt; 6; ++p, ++i) {</div><div class='add'>+		crc = (crc &gt;&gt; 8) ^ sxg_crc_table[(crc ^ *p) &amp; 0xFF];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Return bits 1-8, transposed */</div><div class='add'>+	for (i = 1; i &lt; 9; i++) {</div><div class='add'>+		machash |= (((crc &gt;&gt; i) &amp; 1) &lt;&lt; (8 - i));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return (machash);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sxg_mcast_set_bit(p_adapter_t adapter, char *address)</div><div class='add'>+{</div><div class='add'>+	unsigned char crcpoly;</div><div class='add'>+</div><div class='add'>+	/* Get the CRC polynomial for the mac address */</div><div class='add'>+	crcpoly = sxg_mcast_get_mac_hash(address);</div><div class='add'>+</div><div class='add'>+	/* We only have space on the SLIC for 64 entries.  Lop</div><div class='add'>+	 * off the top two bits. (2^6 = 64)</div><div class='add'>+	 */</div><div class='add'>+	crcpoly &amp;= 0x3F;</div><div class='add'>+</div><div class='add'>+	/* OR in the new bit into our 64 bit mask. */</div><div class='add'>+	adapter-&gt;MulticastMask |= (u64) 1 &lt;&lt; crcpoly;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sxg_mcast_set_list(p_net_device dev)</div><div class='add'>+{</div><div class='add'>+#if XXXTODO</div><div class='add'>+	p_adapter_t adapter = (p_adapter_t) netdev_priv(dev);</div><div class='add'>+	int status = STATUS_SUCCESS;</div><div class='add'>+	int i;</div><div class='add'>+	char *addresses;</div><div class='add'>+	struct dev_mc_list *mc_list = dev-&gt;mc_list;</div><div class='add'>+	int mc_count = dev-&gt;mc_count;</div><div class='add'>+</div><div class='add'>+	ASSERT(adapter);</div><div class='add'>+</div><div class='add'>+	for (i = 1; i &lt;= mc_count; i++) {</div><div class='add'>+		addresses = (char *)&amp;mc_list-&gt;dmi_addr;</div><div class='add'>+		if (mc_list-&gt;dmi_addrlen == 6) {</div><div class='add'>+			status = sxg_mcast_add_list(adapter, addresses);</div><div class='add'>+			if (status != STATUS_SUCCESS) {</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			status = -EINVAL;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		sxg_mcast_set_bit(adapter, addresses);</div><div class='add'>+		mc_list = mc_list-&gt;next;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBG_ERROR("%s a-&gt;devflags_prev[%x] dev-&gt;flags[%x] status[%x]\n",</div><div class='add'>+		  __FUNCTION__, adapter-&gt;devflags_prev, dev-&gt;flags, status);</div><div class='add'>+	if (adapter-&gt;devflags_prev != dev-&gt;flags) {</div><div class='add'>+		adapter-&gt;macopts = MAC_DIRECTED;</div><div class='add'>+		if (dev-&gt;flags) {</div><div class='add'>+			if (dev-&gt;flags &amp; IFF_BROADCAST) {</div><div class='add'>+				adapter-&gt;macopts |= MAC_BCAST;</div><div class='add'>+			}</div><div class='add'>+			if (dev-&gt;flags &amp; IFF_PROMISC) {</div><div class='add'>+				adapter-&gt;macopts |= MAC_PROMISC;</div><div class='add'>+			}</div><div class='add'>+			if (dev-&gt;flags &amp; IFF_ALLMULTI) {</div><div class='add'>+				adapter-&gt;macopts |= MAC_ALLMCAST;</div><div class='add'>+			}</div><div class='add'>+			if (dev-&gt;flags &amp; IFF_MULTICAST) {</div><div class='add'>+				adapter-&gt;macopts |= MAC_MCAST;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		adapter-&gt;devflags_prev = dev-&gt;flags;</div><div class='add'>+		DBG_ERROR("%s call sxg_config_set adapter-&gt;macopts[%x]\n",</div><div class='add'>+			  __FUNCTION__, adapter-&gt;macopts);</div><div class='add'>+		sxg_config_set(adapter, TRUE);</div><div class='add'>+	} else {</div><div class='add'>+		if (status == STATUS_SUCCESS) {</div><div class='add'>+			sxg_mcast_set_mask(adapter);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sxg_mcast_set_mask(p_adapter_t adapter)</div><div class='add'>+{</div><div class='add'>+	PSXG_UCODE_REGS sxg_regs = adapter-&gt;UcodeRegs;</div><div class='add'>+</div><div class='add'>+	DBG_ERROR("%s ENTER (%s) macopts[%x] mask[%llx]\n", __FUNCTION__,</div><div class='add'>+		  adapter-&gt;netdev-&gt;name, (unsigned int)adapter-&gt;MacFilter,</div><div class='add'>+		  adapter-&gt;MulticastMask);</div><div class='add'>+</div><div class='add'>+	if (adapter-&gt;MacFilter &amp; (MAC_ALLMCAST | MAC_PROMISC)) {</div><div class='add'>+		/* Turn on all multicast addresses. We have to do this for promiscuous</div><div class='add'>+		 * mode as well as ALLMCAST mode.  It saves the Microcode from having</div><div class='add'>+		 * to keep state about the MAC configuration.</div><div class='add'>+		 */</div><div class='add'>+//              DBG_ERROR("sxg: %s macopts = MAC_ALLMCAST | MAC_PROMISC\n      SLUT MODE!!!\n",__FUNCTION__);</div><div class='add'>+		WRITE_REG(sxg_regs-&gt;McastLow, 0xFFFFFFFF, FLUSH);</div><div class='add'>+		WRITE_REG(sxg_regs-&gt;McastHigh, 0xFFFFFFFF, FLUSH);</div><div class='add'>+//        DBG_ERROR("%s (%s) WRITE to slic_regs slic_mcastlow&amp;high 0xFFFFFFFF\n",__FUNCTION__, adapter-&gt;netdev-&gt;name);</div><div class='add'>+</div><div class='add'>+	} else {</div><div class='add'>+		/* Commit our multicast mast to the SLIC by writing to the multicast</div><div class='add'>+		 * address mask registers</div><div class='add'>+		 */</div><div class='add'>+		DBG_ERROR("%s (%s) WRITE mcastlow[%lx] mcasthigh[%lx]\n",</div><div class='add'>+			  __FUNCTION__, adapter-&gt;netdev-&gt;name,</div><div class='add'>+			  ((ulong) (adapter-&gt;MulticastMask &amp; 0xFFFFFFFF)),</div><div class='add'>+			  ((ulong)</div><div class='add'>+			   ((adapter-&gt;MulticastMask &gt;&gt; 32) &amp; 0xFFFFFFFF)));</div><div class='add'>+</div><div class='add'>+		WRITE_REG(sxg_regs-&gt;McastLow,</div><div class='add'>+			  (u32) (adapter-&gt;MulticastMask &amp; 0xFFFFFFFF), FLUSH);</div><div class='add'>+		WRITE_REG(sxg_regs-&gt;McastHigh,</div><div class='add'>+			  (u32) ((adapter-&gt;</div><div class='add'>+				  MulticastMask &gt;&gt; 32) &amp; 0xFFFFFFFF), FLUSH);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sxg_unmap_mmio_space(p_adapter_t adapter)</div><div class='add'>+{</div><div class='add'>+#if LINUX_FREES_ADAPTER_RESOURCES</div><div class='add'>+//      if (adapter-&gt;Regs) {</div><div class='add'>+//              iounmap(adapter-&gt;Regs);</div><div class='add'>+//      }</div><div class='add'>+//      adapter-&gt;slic_regs = NULL;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#if XXXTODO</div><div class='add'>+/*</div><div class='add'>+ * SxgFreeResources - Free everything allocated in SxgAllocateResources</div><div class='add'>+ *</div><div class='add'>+ * Arguments -</div><div class='add'>+ *	adapter		- A pointer to our adapter structure</div><div class='add'>+ *</div><div class='add'>+ * Return</div><div class='add'>+ *	none</div><div class='add'>+ */</div><div class='add'>+void SxgFreeResources(p_adapter_t adapter)</div><div class='add'>+{</div><div class='add'>+	u32 RssIds, IsrCount;</div><div class='add'>+	PTCP_OBJECT TcpObject;</div><div class='add'>+	u32 i;</div><div class='add'>+	BOOLEAN TimerCancelled;</div><div class='add'>+</div><div class='add'>+	SXG_TRACE(TRACE_SXG, SxgTraceBuffer, TRACE_NOISY, "FreeRes",</div><div class='add'>+		  adapter, adapter-&gt;MaxTcbs, 0, 0);</div><div class='add'>+</div><div class='add'>+	RssIds = SXG_RSS_CPU_COUNT(adapter);</div><div class='add'>+	IsrCount = adapter-&gt;MsiEnabled ? RssIds : 1;</div><div class='add'>+</div><div class='add'>+	if (adapter-&gt;BasicAllocations == FALSE) {</div><div class='add'>+		// No allocations have been made, including spinlocks,</div><div class='add'>+		// or listhead initializations.  Return.</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!(IsListEmpty(&amp;adapter-&gt;AllRcvBlocks))) {</div><div class='add'>+		SxgFreeRcvBlocks(adapter);</div><div class='add'>+	}</div><div class='add'>+	if (!(IsListEmpty(&amp;adapter-&gt;AllSglBuffers))) {</div><div class='add'>+		SxgFreeSglBuffers(adapter);</div><div class='add'>+	}</div><div class='add'>+	// Free event queues.</div><div class='add'>+	if (adapter-&gt;EventRings) {</div><div class='add'>+		pci_free_consistent(adapter-&gt;pcidev,</div><div class='add'>+				    sizeof(SXG_EVENT_RING) * RssIds,</div><div class='add'>+				    adapter-&gt;EventRings, adapter-&gt;PEventRings);</div><div class='add'>+	}</div><div class='add'>+	if (adapter-&gt;Isr) {</div><div class='add'>+		pci_free_consistent(adapter-&gt;pcidev,</div><div class='add'>+				    sizeof(u32) * IsrCount,</div><div class='add'>+				    adapter-&gt;Isr, adapter-&gt;PIsr);</div><div class='add'>+	}</div><div class='add'>+	if (adapter-&gt;XmtRingZeroIndex) {</div><div class='add'>+		pci_free_consistent(adapter-&gt;pcidev,</div><div class='add'>+				    sizeof(u32),</div><div class='add'>+				    adapter-&gt;XmtRingZeroIndex,</div><div class='add'>+				    adapter-&gt;PXmtRingZeroIndex);</div><div class='add'>+	}</div><div class='add'>+	if (adapter-&gt;IndirectionTable) {</div><div class='add'>+		pci_free_consistent(adapter-&gt;pcidev,</div><div class='add'>+				    SXG_MAX_RSS_TABLE_SIZE,</div><div class='add'>+				    adapter-&gt;IndirectionTable,</div><div class='add'>+				    adapter-&gt;PIndirectionTable);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	SXG_FREE_PACKET_POOL(adapter-&gt;PacketPoolHandle);</div><div class='add'>+	SXG_FREE_BUFFER_POOL(adapter-&gt;BufferPoolHandle);</div><div class='add'>+</div><div class='add'>+	// Unmap register spaces</div><div class='add'>+	SxgUnmapResources(adapter);</div><div class='add'>+</div><div class='add'>+	// Deregister DMA</div><div class='add'>+	if (adapter-&gt;DmaHandle) {</div><div class='add'>+		SXG_DEREGISTER_DMA(adapter-&gt;DmaHandle);</div><div class='add'>+	}</div><div class='add'>+	// Deregister interrupt</div><div class='add'>+	SxgDeregisterInterrupt(adapter);</div><div class='add'>+</div><div class='add'>+	// Possibly free system info (5.2 only)</div><div class='add'>+	SXG_RELEASE_SYSTEM_INFO(adapter);</div><div class='add'>+</div><div class='add'>+	SxgDiagFreeResources(adapter);</div><div class='add'>+</div><div class='add'>+	SxgFreeMCastAddrs(adapter);</div><div class='add'>+</div><div class='add'>+	if (SXG_TIMER_ALLOCATED(adapter-&gt;ResetTimer)) {</div><div class='add'>+		SXG_CANCEL_TIMER(adapter-&gt;ResetTimer, TimerCancelled);</div><div class='add'>+		SXG_FREE_TIMER(adapter-&gt;ResetTimer);</div><div class='add'>+	}</div><div class='add'>+	if (SXG_TIMER_ALLOCATED(adapter-&gt;RssTimer)) {</div><div class='add'>+		SXG_CANCEL_TIMER(adapter-&gt;RssTimer, TimerCancelled);</div><div class='add'>+		SXG_FREE_TIMER(adapter-&gt;RssTimer);</div><div class='add'>+	}</div><div class='add'>+	if (SXG_TIMER_ALLOCATED(adapter-&gt;OffloadTimer)) {</div><div class='add'>+		SXG_CANCEL_TIMER(adapter-&gt;OffloadTimer, TimerCancelled);</div><div class='add'>+		SXG_FREE_TIMER(adapter-&gt;OffloadTimer);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	adapter-&gt;BasicAllocations = FALSE;</div><div class='add'>+</div><div class='add'>+	SXG_TRACE(TRACE_SXG, SxgTraceBuffer, TRACE_NOISY, "XFreeRes",</div><div class='add'>+		  adapter, adapter-&gt;MaxTcbs, 0, 0);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * sxg_allocate_complete -</div><div class='add'>+ *</div><div class='add'>+ * This routine is called when a memory allocation has completed.</div><div class='add'>+ *</div><div class='add'>+ * Arguments -</div><div class='add'>+ *	p_adapter_t    	- Our adapter structure</div><div class='add'>+ *	VirtualAddress	- Memory virtual address</div><div class='add'>+ *	PhysicalAddress	- Memory physical address</div><div class='add'>+ *	Length		- Length of memory allocated (or 0)</div><div class='add'>+ *	Context		- The type of buffer allocated</div><div class='add'>+ *</div><div class='add'>+ * Return</div><div class='add'>+ *	None.</div><div class='add'>+ */</div><div class='add'>+static void sxg_allocate_complete(p_adapter_t adapter,</div><div class='add'>+				  void *VirtualAddress,</div><div class='add'>+				  dma_addr_t PhysicalAddress,</div><div class='add'>+				  u32 Length, SXG_BUFFER_TYPE Context)</div><div class='add'>+{</div><div class='add'>+	SXG_TRACE(TRACE_SXG, SxgTraceBuffer, TRACE_NOISY, "AllocCmp",</div><div class='add'>+		  adapter, VirtualAddress, Length, Context);</div><div class='add'>+	ASSERT(adapter-&gt;AllocationsPending);</div><div class='add'>+	--adapter-&gt;AllocationsPending;</div><div class='add'>+</div><div class='add'>+	switch (Context) {</div><div class='add'>+</div><div class='add'>+	case SXG_BUFFER_TYPE_RCV:</div><div class='add'>+		sxg_allocate_rcvblock_complete(adapter,</div><div class='add'>+					       VirtualAddress,</div><div class='add'>+					       PhysicalAddress, Length);</div><div class='add'>+		break;</div><div class='add'>+	case SXG_BUFFER_TYPE_SGL:</div><div class='add'>+		sxg_allocate_sgl_buffer_complete(adapter, (PSXG_SCATTER_GATHER)</div><div class='add'>+						 VirtualAddress,</div><div class='add'>+						 PhysicalAddress, Length);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	SXG_TRACE(TRACE_SXG, SxgTraceBuffer, TRACE_NOISY, "XAlocCmp",</div><div class='add'>+		  adapter, VirtualAddress, Length, Context);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * sxg_allocate_buffer_memory - Shared memory allocation routine used for</div><div class='add'>+ *		synchronous and asynchronous buffer allocations</div><div class='add'>+ *</div><div class='add'>+ * Arguments -</div><div class='add'>+ *	adapter		- A pointer to our adapter structure</div><div class='add'>+ *	Size		- block size to allocate</div><div class='add'>+ *	BufferType	- Type of buffer to allocate</div><div class='add'>+ *</div><div class='add'>+ * Return</div><div class='add'>+ *	int</div><div class='add'>+ */</div><div class='add'>+static int sxg_allocate_buffer_memory(p_adapter_t adapter,</div><div class='add'>+				      u32 Size, SXG_BUFFER_TYPE BufferType)</div><div class='add'>+{</div><div class='add'>+	int status;</div><div class='add'>+	void *Buffer;</div><div class='add'>+	dma_addr_t pBuffer;</div><div class='add'>+</div><div class='add'>+	SXG_TRACE(TRACE_SXG, SxgTraceBuffer, TRACE_NOISY, "AllocMem",</div><div class='add'>+		  adapter, Size, BufferType, 0);</div><div class='add'>+	// Grab the adapter lock and check the state.</div><div class='add'>+	// If we're in anything other than INITIALIZING or</div><div class='add'>+	// RUNNING state, fail.  This is to prevent</div><div class='add'>+	// allocations in an improper driver state</div><div class='add'>+	spin_lock(&amp;adapter-&gt;AdapterLock);</div><div class='add'>+</div><div class='add'>+	// Increment the AllocationsPending count while holding</div><div class='add'>+	// the lock.  Pause processing relies on this</div><div class='add'>+	++adapter-&gt;AllocationsPending;</div><div class='add'>+	spin_unlock(&amp;adapter-&gt;AdapterLock);</div><div class='add'>+</div><div class='add'>+	// At initialization time allocate resources synchronously.</div><div class='add'>+	Buffer = pci_alloc_consistent(adapter-&gt;pcidev, Size, &amp;pBuffer);</div><div class='add'>+	if (Buffer == NULL) {</div><div class='add'>+		spin_lock(&amp;adapter-&gt;AdapterLock);</div><div class='add'>+		// Decrement the AllocationsPending count while holding</div><div class='add'>+		// the lock.  Pause processing relies on this</div><div class='add'>+		--adapter-&gt;AllocationsPending;</div><div class='add'>+		spin_unlock(&amp;adapter-&gt;AdapterLock);</div><div class='add'>+		SXG_TRACE(TRACE_SXG, SxgTraceBuffer, TRACE_NOISY, "AlcMemF1",</div><div class='add'>+			  adapter, Size, BufferType, 0);</div><div class='add'>+		return (STATUS_RESOURCES);</div><div class='add'>+	}</div><div class='add'>+	sxg_allocate_complete(adapter, Buffer, pBuffer, Size, BufferType);</div><div class='add'>+	status = STATUS_SUCCESS;</div><div class='add'>+</div><div class='add'>+	SXG_TRACE(TRACE_SXG, SxgTraceBuffer, TRACE_NOISY, "XAlocMem",</div><div class='add'>+		  adapter, Size, BufferType, status);</div><div class='add'>+	return (status);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * sxg_allocate_rcvblock_complete - Complete a receive descriptor block allocation</div><div class='add'>+ *</div><div class='add'>+ * Arguments -</div><div class='add'>+ *	adapter				- A pointer to our adapter structure</div><div class='add'>+ *	RcvBlock			- receive block virtual address</div><div class='add'>+ *	PhysicalAddress		- Physical address</div><div class='add'>+ *	Length				- Memory length</div><div class='add'>+ *</div><div class='add'>+ * Return</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+static void sxg_allocate_rcvblock_complete(p_adapter_t adapter,</div><div class='add'>+					   void *RcvBlock,</div><div class='add'>+					   dma_addr_t PhysicalAddress,</div><div class='add'>+					   u32 Length)</div><div class='add'>+{</div><div class='add'>+	u32 i;</div><div class='add'>+	u32 BufferSize = adapter-&gt;ReceiveBufferSize;</div><div class='add'>+	u64 Paddr;</div><div class='add'>+	PSXG_RCV_BLOCK_HDR RcvBlockHdr;</div><div class='add'>+	unsigned char *RcvDataBuffer;</div><div class='add'>+	PSXG_RCV_DATA_BUFFER_HDR RcvDataBufferHdr;</div><div class='add'>+	PSXG_RCV_DESCRIPTOR_BLOCK RcvDescriptorBlock;</div><div class='add'>+	PSXG_RCV_DESCRIPTOR_BLOCK_HDR RcvDescriptorBlockHdr;</div><div class='add'>+</div><div class='add'>+	SXG_TRACE(TRACE_SXG, SxgTraceBuffer, TRACE_NOISY, "AlRcvBlk",</div><div class='add'>+		  adapter, RcvBlock, Length, 0);</div><div class='add'>+	if (RcvBlock == NULL) {</div><div class='add'>+		goto fail;</div><div class='add'>+	}</div><div class='add'>+	memset(RcvBlock, 0, Length);</div><div class='add'>+	ASSERT((BufferSize == SXG_RCV_DATA_BUFFER_SIZE) ||</div><div class='add'>+	       (BufferSize == SXG_RCV_JUMBO_BUFFER_SIZE));</div><div class='add'>+	ASSERT(Length == SXG_RCV_BLOCK_SIZE(BufferSize));</div><div class='add'>+	// First, initialize the contained pool of receive data</div><div class='add'>+	// buffers.  This initialization requires NBL/NB/MDL allocations,</div><div class='add'>+	// If any of them fail, free the block and return without</div><div class='add'>+	// queueing the shared memory</div><div class='add'>+	RcvDataBuffer = RcvBlock;</div><div class='add'>+#if 0</div><div class='add'>+	for (i = 0, Paddr = *PhysicalAddress;</div><div class='add'>+	     i &lt; SXG_RCV_DESCRIPTORS_PER_BLOCK;</div><div class='add'>+	     i++, Paddr.LowPart += BufferSize, RcvDataBuffer += BufferSize)</div><div class='add'>+#endif</div><div class='add'>+		for (i = 0, Paddr = PhysicalAddress;</div><div class='add'>+		     i &lt; SXG_RCV_DESCRIPTORS_PER_BLOCK;</div><div class='add'>+		     i++, Paddr += BufferSize, RcvDataBuffer += BufferSize) {</div><div class='add'>+			//</div><div class='add'>+			RcvDataBufferHdr =</div><div class='add'>+			    (PSXG_RCV_DATA_BUFFER_HDR) (RcvDataBuffer +</div><div class='add'>+							SXG_RCV_DATA_BUFFER_HDR_OFFSET</div><div class='add'>+							(BufferSize));</div><div class='add'>+			RcvDataBufferHdr-&gt;VirtualAddress = RcvDataBuffer;</div><div class='add'>+			RcvDataBufferHdr-&gt;PhysicalAddress = Paddr;</div><div class='add'>+			RcvDataBufferHdr-&gt;State = SXG_BUFFER_UPSTREAM;	// For FREE macro assertion</div><div class='add'>+			RcvDataBufferHdr-&gt;Size =</div><div class='add'>+			    SXG_RCV_BUFFER_DATA_SIZE(BufferSize);</div><div class='add'>+</div><div class='add'>+			SXG_ALLOCATE_RCV_PACKET(adapter, RcvDataBufferHdr);</div><div class='add'>+			if (RcvDataBufferHdr-&gt;SxgDumbRcvPacket == NULL)</div><div class='add'>+				goto fail;</div><div class='add'>+</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	// Place this entire block of memory on the AllRcvBlocks queue so it can be</div><div class='add'>+	// free later</div><div class='add'>+	RcvBlockHdr =</div><div class='add'>+	    (PSXG_RCV_BLOCK_HDR) ((unsigned char *)RcvBlock +</div><div class='add'>+				  SXG_RCV_BLOCK_HDR_OFFSET(BufferSize));</div><div class='add'>+	RcvBlockHdr-&gt;VirtualAddress = RcvBlock;</div><div class='add'>+	RcvBlockHdr-&gt;PhysicalAddress = PhysicalAddress;</div><div class='add'>+	spin_lock(&amp;adapter-&gt;RcvQLock);</div><div class='add'>+	adapter-&gt;AllRcvBlockCount++;</div><div class='add'>+	InsertTailList(&amp;adapter-&gt;AllRcvBlocks, &amp;RcvBlockHdr-&gt;AllList);</div><div class='add'>+	spin_unlock(&amp;adapter-&gt;RcvQLock);</div><div class='add'>+</div><div class='add'>+	// Now free the contained receive data buffers that we initialized above</div><div class='add'>+	RcvDataBuffer = RcvBlock;</div><div class='add'>+	for (i = 0, Paddr = PhysicalAddress;</div><div class='add'>+	     i &lt; SXG_RCV_DESCRIPTORS_PER_BLOCK;</div><div class='add'>+	     i++, Paddr += BufferSize, RcvDataBuffer += BufferSize) {</div><div class='add'>+		RcvDataBufferHdr = (PSXG_RCV_DATA_BUFFER_HDR) (RcvDataBuffer +</div><div class='add'>+							       SXG_RCV_DATA_BUFFER_HDR_OFFSET</div><div class='add'>+							       (BufferSize));</div><div class='add'>+		spin_lock(&amp;adapter-&gt;RcvQLock);</div><div class='add'>+		SXG_FREE_RCV_DATA_BUFFER(adapter, RcvDataBufferHdr);</div><div class='add'>+		spin_unlock(&amp;adapter-&gt;RcvQLock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	// Locate the descriptor block and put it on a separate free queue</div><div class='add'>+	RcvDescriptorBlock =</div><div class='add'>+	    (PSXG_RCV_DESCRIPTOR_BLOCK) ((unsigned char *)RcvBlock +</div><div class='add'>+					 SXG_RCV_DESCRIPTOR_BLOCK_OFFSET</div><div class='add'>+					 (BufferSize));</div><div class='add'>+	RcvDescriptorBlockHdr =</div><div class='add'>+	    (PSXG_RCV_DESCRIPTOR_BLOCK_HDR) ((unsigned char *)RcvBlock +</div><div class='add'>+					     SXG_RCV_DESCRIPTOR_BLOCK_HDR_OFFSET</div><div class='add'>+					     (BufferSize));</div><div class='add'>+	RcvDescriptorBlockHdr-&gt;VirtualAddress = RcvDescriptorBlock;</div><div class='add'>+	RcvDescriptorBlockHdr-&gt;PhysicalAddress = Paddr;</div><div class='add'>+	spin_lock(&amp;adapter-&gt;RcvQLock);</div><div class='add'>+	SXG_FREE_RCV_DESCRIPTOR_BLOCK(adapter, RcvDescriptorBlockHdr);</div><div class='add'>+	spin_unlock(&amp;adapter-&gt;RcvQLock);</div><div class='add'>+	SXG_TRACE(TRACE_SXG, SxgTraceBuffer, TRACE_NOISY, "XAlRBlk",</div><div class='add'>+		  adapter, RcvBlock, Length, 0);</div><div class='add'>+	return;</div><div class='add'>+      fail:</div><div class='add'>+	// Free any allocated resources</div><div class='add'>+	if (RcvBlock) {</div><div class='add'>+		RcvDataBuffer = RcvBlock;</div><div class='add'>+		for (i = 0; i &lt; SXG_RCV_DESCRIPTORS_PER_BLOCK;</div><div class='add'>+		     i++, RcvDataBuffer += BufferSize) {</div><div class='add'>+			RcvDataBufferHdr =</div><div class='add'>+			    (PSXG_RCV_DATA_BUFFER_HDR) (RcvDataBuffer +</div><div class='add'>+							SXG_RCV_DATA_BUFFER_HDR_OFFSET</div><div class='add'>+							(BufferSize));</div><div class='add'>+			SXG_FREE_RCV_PACKET(RcvDataBufferHdr);</div><div class='add'>+		}</div><div class='add'>+		pci_free_consistent(adapter-&gt;pcidev,</div><div class='add'>+				    Length, RcvBlock, PhysicalAddress);</div><div class='add'>+	}</div><div class='add'>+	DBG_ERROR("%s: OUT OF RESOURCES\n", __FUNCTION__);</div><div class='add'>+	SXG_TRACE(TRACE_SXG, SxgTraceBuffer, TRACE_IMPORTANT, "RcvAFail",</div><div class='add'>+		  adapter, adapter-&gt;FreeRcvBufferCount,</div><div class='add'>+		  adapter-&gt;FreeRcvBlockCount, adapter-&gt;AllRcvBlockCount);</div><div class='add'>+	adapter-&gt;Stats.NoMem++;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * sxg_allocate_sgl_buffer_complete - Complete a SGL buffer allocation</div><div class='add'>+ *</div><div class='add'>+ * Arguments -</div><div class='add'>+ *	adapter				- A pointer to our adapter structure</div><div class='add'>+ *	SxgSgl				- SXG_SCATTER_GATHER buffer</div><div class='add'>+ *	PhysicalAddress		- Physical address</div><div class='add'>+ *	Length				- Memory length</div><div class='add'>+ *</div><div class='add'>+ * Return</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+static void sxg_allocate_sgl_buffer_complete(p_adapter_t adapter,</div><div class='add'>+					     PSXG_SCATTER_GATHER SxgSgl,</div><div class='add'>+					     dma_addr_t PhysicalAddress,</div><div class='add'>+					     u32 Length)</div><div class='add'>+{</div><div class='add'>+	SXG_TRACE(TRACE_SXG, SxgTraceBuffer, TRACE_NOISY, "AlSglCmp",</div><div class='add'>+		  adapter, SxgSgl, Length, 0);</div><div class='add'>+	spin_lock(&amp;adapter-&gt;SglQLock);</div><div class='add'>+	adapter-&gt;AllSglBufferCount++;</div><div class='add'>+	memset(SxgSgl, 0, sizeof(SXG_SCATTER_GATHER));</div><div class='add'>+	SxgSgl-&gt;PhysicalAddress = PhysicalAddress;	/* *PhysicalAddress; */</div><div class='add'>+	SxgSgl-&gt;adapter = adapter;	// Initialize backpointer once</div><div class='add'>+	InsertTailList(&amp;adapter-&gt;AllSglBuffers, &amp;SxgSgl-&gt;AllList);</div><div class='add'>+	spin_unlock(&amp;adapter-&gt;SglQLock);</div><div class='add'>+	SxgSgl-&gt;State = SXG_BUFFER_BUSY;</div><div class='add'>+	SXG_FREE_SGL_BUFFER(adapter, SxgSgl, NULL);</div><div class='add'>+	SXG_TRACE(TRACE_SXG, SxgTraceBuffer, TRACE_NOISY, "XAlSgl",</div><div class='add'>+		  adapter, SxgSgl, Length, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned char temp_mac_address[6] =</div><div class='add'>+    { 0x00, 0xab, 0xcd, 0xef, 0x12, 0x69 };</div><div class='add'>+</div><div class='add'>+static void sxg_adapter_set_hwaddr(p_adapter_t adapter)</div><div class='add'>+{</div><div class='add'>+//  DBG_ERROR ("%s ENTER card-&gt;config_set[%x] port[%d] physport[%d] funct#[%d]\n", __FUNCTION__,</div><div class='add'>+//             card-&gt;config_set, adapter-&gt;port, adapter-&gt;physport, adapter-&gt;functionnumber);</div><div class='add'>+//</div><div class='add'>+//  sxg_dbg_macaddrs(adapter);</div><div class='add'>+</div><div class='add'>+	memcpy(adapter-&gt;macaddr, temp_mac_address, sizeof(SXG_CONFIG_MAC));</div><div class='add'>+//      DBG_ERROR ("%s AFTER copying from config.macinfo into currmacaddr\n", __FUNCTION__);</div><div class='add'>+//      sxg_dbg_macaddrs(adapter);</div><div class='add'>+	if (!(adapter-&gt;currmacaddr[0] ||</div><div class='add'>+	      adapter-&gt;currmacaddr[1] ||</div><div class='add'>+	      adapter-&gt;currmacaddr[2] ||</div><div class='add'>+	      adapter-&gt;currmacaddr[3] ||</div><div class='add'>+	      adapter-&gt;currmacaddr[4] || adapter-&gt;currmacaddr[5])) {</div><div class='add'>+		memcpy(adapter-&gt;currmacaddr, adapter-&gt;macaddr, 6);</div><div class='add'>+	}</div><div class='add'>+	if (adapter-&gt;netdev) {</div><div class='add'>+		memcpy(adapter-&gt;netdev-&gt;dev_addr, adapter-&gt;currmacaddr, 6);</div><div class='add'>+	}</div><div class='add'>+//  DBG_ERROR ("%s EXIT port %d\n", __FUNCTION__, adapter-&gt;port);</div><div class='add'>+	sxg_dbg_macaddrs(adapter);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sxg_mac_set_address(p_net_device dev, void *ptr)</div><div class='add'>+{</div><div class='add'>+#if XXXTODO</div><div class='add'>+	p_adapter_t adapter = (p_adapter_t) netdev_priv(dev);</div><div class='add'>+	struct sockaddr *addr = ptr;</div><div class='add'>+</div><div class='add'>+	DBG_ERROR("%s ENTER (%s)\n", __FUNCTION__, adapter-&gt;netdev-&gt;name);</div><div class='add'>+</div><div class='add'>+	if (netif_running(dev)) {</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+	if (!adapter) {</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+	DBG_ERROR("sxg: %s (%s) curr %2.2X:%2.2X:%2.2X:%2.2X:%2.2X:%2.2X\n",</div><div class='add'>+		  __FUNCTION__, adapter-&gt;netdev-&gt;name, adapter-&gt;currmacaddr[0],</div><div class='add'>+		  adapter-&gt;currmacaddr[1], adapter-&gt;currmacaddr[2],</div><div class='add'>+		  adapter-&gt;currmacaddr[3], adapter-&gt;currmacaddr[4],</div><div class='add'>+		  adapter-&gt;currmacaddr[5]);</div><div class='add'>+	memcpy(dev-&gt;dev_addr, addr-&gt;sa_data, dev-&gt;addr_len);</div><div class='add'>+	memcpy(adapter-&gt;currmacaddr, addr-&gt;sa_data, dev-&gt;addr_len);</div><div class='add'>+	DBG_ERROR("sxg: %s (%s) new %2.2X:%2.2X:%2.2X:%2.2X:%2.2X:%2.2X\n",</div><div class='add'>+		  __FUNCTION__, adapter-&gt;netdev-&gt;name, adapter-&gt;currmacaddr[0],</div><div class='add'>+		  adapter-&gt;currmacaddr[1], adapter-&gt;currmacaddr[2],</div><div class='add'>+		  adapter-&gt;currmacaddr[3], adapter-&gt;currmacaddr[4],</div><div class='add'>+		  adapter-&gt;currmacaddr[5]);</div><div class='add'>+</div><div class='add'>+	sxg_config_set(adapter, TRUE);</div><div class='add'>+#endif</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*****************************************************************************/</div><div class='add'>+/*************  SXG DRIVER FUNCTIONS  (below) ********************************/</div><div class='add'>+/*****************************************************************************/</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * sxg_initialize_adapter - Initialize adapter</div><div class='add'>+ *</div><div class='add'>+ * Arguments -</div><div class='add'>+ *	adapter		- A pointer to our adapter structure</div><div class='add'>+ *</div><div class='add'>+ * Return</div><div class='add'>+ *	int</div><div class='add'>+ */</div><div class='add'>+static int sxg_initialize_adapter(p_adapter_t adapter)</div><div class='add'>+{</div><div class='add'>+	u32 RssIds, IsrCount;</div><div class='add'>+	u32 i;</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	SXG_TRACE(TRACE_SXG, SxgTraceBuffer, TRACE_NOISY, "InitAdpt",</div><div class='add'>+		  adapter, 0, 0, 0);</div><div class='add'>+</div><div class='add'>+	RssIds = 1;		//  XXXTODO  SXG_RSS_CPU_COUNT(adapter);</div><div class='add'>+	IsrCount = adapter-&gt;MsiEnabled ? RssIds : 1;</div><div class='add'>+</div><div class='add'>+	// Sanity check SXG_UCODE_REGS structure definition to</div><div class='add'>+	// make sure the length is correct</div><div class='add'>+	ASSERT(sizeof(SXG_UCODE_REGS) == SXG_REGISTER_SIZE_PER_CPU);</div><div class='add'>+</div><div class='add'>+	// Disable interrupts</div><div class='add'>+	SXG_DISABLE_ALL_INTERRUPTS(adapter);</div><div class='add'>+</div><div class='add'>+	// Set MTU</div><div class='add'>+	ASSERT((adapter-&gt;FrameSize == ETHERMAXFRAME) ||</div><div class='add'>+	       (adapter-&gt;FrameSize == JUMBOMAXFRAME));</div><div class='add'>+	WRITE_REG(adapter-&gt;UcodeRegs[0].LinkMtu, adapter-&gt;FrameSize, TRUE);</div><div class='add'>+</div><div class='add'>+	// Set event ring base address and size</div><div class='add'>+	WRITE_REG64(adapter,</div><div class='add'>+		    adapter-&gt;UcodeRegs[0].EventBase, adapter-&gt;PEventRings, 0);</div><div class='add'>+	WRITE_REG(adapter-&gt;UcodeRegs[0].EventSize, EVENT_RING_SIZE, TRUE);</div><div class='add'>+</div><div class='add'>+	// Per-ISR initialization</div><div class='add'>+	for (i = 0; i &lt; IsrCount; i++) {</div><div class='add'>+		u64 Addr;</div><div class='add'>+		// Set interrupt status pointer</div><div class='add'>+		Addr = adapter-&gt;PIsr + (i * sizeof(u32));</div><div class='add'>+		WRITE_REG64(adapter, adapter-&gt;UcodeRegs[i].Isp, Addr, i);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	// XMT ring zero index</div><div class='add'>+	WRITE_REG64(adapter,</div><div class='add'>+		    adapter-&gt;UcodeRegs[0].SPSendIndex,</div><div class='add'>+		    adapter-&gt;PXmtRingZeroIndex, 0);</div><div class='add'>+</div><div class='add'>+	// Per-RSS initialization</div><div class='add'>+	for (i = 0; i &lt; RssIds; i++) {</div><div class='add'>+		// Release all event ring entries to the Microcode</div><div class='add'>+		WRITE_REG(adapter-&gt;UcodeRegs[i].EventRelease, EVENT_RING_SIZE,</div><div class='add'>+			  TRUE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	// Transmit ring base and size</div><div class='add'>+	WRITE_REG64(adapter,</div><div class='add'>+		    adapter-&gt;UcodeRegs[0].XmtBase, adapter-&gt;PXmtRings, 0);</div><div class='add'>+	WRITE_REG(adapter-&gt;UcodeRegs[0].XmtSize, SXG_XMT_RING_SIZE, TRUE);</div><div class='add'>+</div><div class='add'>+	// Receive ring base and size</div><div class='add'>+	WRITE_REG64(adapter,</div><div class='add'>+		    adapter-&gt;UcodeRegs[0].RcvBase, adapter-&gt;PRcvRings, 0);</div><div class='add'>+	WRITE_REG(adapter-&gt;UcodeRegs[0].RcvSize, SXG_RCV_RING_SIZE, TRUE);</div><div class='add'>+</div><div class='add'>+	// Populate the card with receive buffers</div><div class='add'>+	sxg_stock_rcv_buffers(adapter);</div><div class='add'>+</div><div class='add'>+	// Initialize checksum offload capabilities.  At the moment</div><div class='add'>+	// we always enable IP and TCP receive checksums on the card.</div><div class='add'>+	// Depending on the checksum configuration specified by the</div><div class='add'>+	// user, we can choose to report or ignore the checksum</div><div class='add'>+	// information provided by the card.</div><div class='add'>+	WRITE_REG(adapter-&gt;UcodeRegs[0].ReceiveChecksum,</div><div class='add'>+		  SXG_RCV_TCP_CSUM_ENABLED | SXG_RCV_IP_CSUM_ENABLED, TRUE);</div><div class='add'>+</div><div class='add'>+	// Initialize the MAC, XAUI</div><div class='add'>+	DBG_ERROR("sxg: %s ENTER sxg_initialize_link\n", __FUNCTION__);</div><div class='add'>+	status = sxg_initialize_link(adapter);</div><div class='add'>+	DBG_ERROR("sxg: %s EXIT sxg_initialize_link status[%x]\n", __FUNCTION__,</div><div class='add'>+		  status);</div><div class='add'>+	if (status != STATUS_SUCCESS) {</div><div class='add'>+		return (status);</div><div class='add'>+	}</div><div class='add'>+	// Initialize Dead to FALSE.</div><div class='add'>+	// SlicCheckForHang or SlicDumpThread will take it from here.</div><div class='add'>+	adapter-&gt;Dead = FALSE;</div><div class='add'>+	adapter-&gt;PingOutstanding = FALSE;</div><div class='add'>+</div><div class='add'>+	SXG_TRACE(TRACE_SXG, SxgTraceBuffer, TRACE_NOISY, "XInit",</div><div class='add'>+		  adapter, 0, 0, 0);</div><div class='add'>+	return (STATUS_SUCCESS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * sxg_fill_descriptor_block - Populate a descriptor block and give it to</div><div class='add'>+ * the card.  The caller should hold the RcvQLock</div><div class='add'>+ *</div><div class='add'>+ * Arguments -</div><div class='add'>+ *	adapter		- A pointer to our adapter structure</div><div class='add'>+ *  RcvDescriptorBlockHdr	- Descriptor block to fill</div><div class='add'>+ *</div><div class='add'>+ * Return</div><div class='add'>+ *	status</div><div class='add'>+ */</div><div class='add'>+static int sxg_fill_descriptor_block(p_adapter_t adapter,</div><div class='add'>+				     PSXG_RCV_DESCRIPTOR_BLOCK_HDR</div><div class='add'>+				     RcvDescriptorBlockHdr)</div><div class='add'>+{</div><div class='add'>+	u32 i;</div><div class='add'>+	PSXG_RING_INFO RcvRingInfo = &amp;adapter-&gt;RcvRingZeroInfo;</div><div class='add'>+	PSXG_RCV_DATA_BUFFER_HDR RcvDataBufferHdr;</div><div class='add'>+	PSXG_RCV_DESCRIPTOR_BLOCK RcvDescriptorBlock;</div><div class='add'>+	PSXG_CMD RingDescriptorCmd;</div><div class='add'>+	PSXG_RCV_RING RingZero = &amp;adapter-&gt;RcvRings[0];</div><div class='add'>+</div><div class='add'>+	SXG_TRACE(TRACE_SXG, SxgTraceBuffer, TRACE_NOISY, "FilBlk",</div><div class='add'>+		  adapter, adapter-&gt;RcvBuffersOnCard,</div><div class='add'>+		  adapter-&gt;FreeRcvBufferCount, adapter-&gt;AllRcvBlockCount);</div><div class='add'>+</div><div class='add'>+	ASSERT(RcvDescriptorBlockHdr);</div><div class='add'>+</div><div class='add'>+	// If we don't have the resources to fill the descriptor block,</div><div class='add'>+	// return failure</div><div class='add'>+	if ((adapter-&gt;FreeRcvBufferCount &lt; SXG_RCV_DESCRIPTORS_PER_BLOCK) ||</div><div class='add'>+	    SXG_RING_FULL(RcvRingInfo)) {</div><div class='add'>+		adapter-&gt;Stats.NoMem++;</div><div class='add'>+		return (STATUS_FAILURE);</div><div class='add'>+	}</div><div class='add'>+	// Get a ring descriptor command</div><div class='add'>+	SXG_GET_CMD(RingZero,</div><div class='add'>+		    RcvRingInfo, RingDescriptorCmd, RcvDescriptorBlockHdr);</div><div class='add'>+	ASSERT(RingDescriptorCmd);</div><div class='add'>+	RcvDescriptorBlockHdr-&gt;State = SXG_BUFFER_ONCARD;</div><div class='add'>+	RcvDescriptorBlock =</div><div class='add'>+	    (PSXG_RCV_DESCRIPTOR_BLOCK) RcvDescriptorBlockHdr-&gt;VirtualAddress;</div><div class='add'>+</div><div class='add'>+	// Fill in the descriptor block</div><div class='add'>+	for (i = 0; i &lt; SXG_RCV_DESCRIPTORS_PER_BLOCK; i++) {</div><div class='add'>+		SXG_GET_RCV_DATA_BUFFER(adapter, RcvDataBufferHdr);</div><div class='add'>+		ASSERT(RcvDataBufferHdr);</div><div class='add'>+		SXG_REINIATIALIZE_PACKET(RcvDataBufferHdr-&gt;SxgDumbRcvPacket);</div><div class='add'>+		RcvDataBufferHdr-&gt;State = SXG_BUFFER_ONCARD;</div><div class='add'>+		RcvDescriptorBlock-&gt;Descriptors[i].VirtualAddress =</div><div class='add'>+		    (void *)RcvDataBufferHdr;</div><div class='add'>+		RcvDescriptorBlock-&gt;Descriptors[i].PhysicalAddress =</div><div class='add'>+		    RcvDataBufferHdr-&gt;PhysicalAddress;</div><div class='add'>+	}</div><div class='add'>+	// Add the descriptor block to receive descriptor ring 0</div><div class='add'>+	RingDescriptorCmd-&gt;Sgl = RcvDescriptorBlockHdr-&gt;PhysicalAddress;</div><div class='add'>+</div><div class='add'>+	// RcvBuffersOnCard is not protected via the receive lock (see</div><div class='add'>+	// sxg_process_event_queue) We don't want to grap a lock every time a</div><div class='add'>+	// buffer is returned to us, so we use atomic interlocked functions</div><div class='add'>+	// instead.</div><div class='add'>+	adapter-&gt;RcvBuffersOnCard += SXG_RCV_DESCRIPTORS_PER_BLOCK;</div><div class='add'>+</div><div class='add'>+	SXG_TRACE(TRACE_SXG, SxgTraceBuffer, TRACE_NOISY, "DscBlk",</div><div class='add'>+		  RcvDescriptorBlockHdr,</div><div class='add'>+		  RingDescriptorCmd, RcvRingInfo-&gt;Head, RcvRingInfo-&gt;Tail);</div><div class='add'>+</div><div class='add'>+	WRITE_REG(adapter-&gt;UcodeRegs[0].RcvCmd, 1, true);</div><div class='add'>+	SXG_TRACE(TRACE_SXG, SxgTraceBuffer, TRACE_NOISY, "XFilBlk",</div><div class='add'>+		  adapter, adapter-&gt;RcvBuffersOnCard,</div><div class='add'>+		  adapter-&gt;FreeRcvBufferCount, adapter-&gt;AllRcvBlockCount);</div><div class='add'>+	return (STATUS_SUCCESS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * sxg_stock_rcv_buffers - Stock the card with receive buffers</div><div class='add'>+ *</div><div class='add'>+ * Arguments -</div><div class='add'>+ *	adapter		- A pointer to our adapter structure</div><div class='add'>+ *</div><div class='add'>+ * Return</div><div class='add'>+ *	None</div><div class='add'>+ */</div><div class='add'>+static void sxg_stock_rcv_buffers(p_adapter_t adapter)</div><div class='add'>+{</div><div class='add'>+	PSXG_RCV_DESCRIPTOR_BLOCK_HDR RcvDescriptorBlockHdr;</div><div class='add'>+</div><div class='add'>+	SXG_TRACE(TRACE_SXG, SxgTraceBuffer, TRACE_NOISY, "StockBuf",</div><div class='add'>+		  adapter, adapter-&gt;RcvBuffersOnCard,</div><div class='add'>+		  adapter-&gt;FreeRcvBufferCount, adapter-&gt;AllRcvBlockCount);</div><div class='add'>+	// First, see if we've got less than our minimum threshold of</div><div class='add'>+	// receive buffers, there isn't an allocation in progress, and</div><div class='add'>+	// we haven't exceeded our maximum.. get another block of buffers</div><div class='add'>+	// None of this needs to be SMP safe.  It's round numbers.</div><div class='add'>+	if ((adapter-&gt;FreeRcvBufferCount &lt; SXG_MIN_RCV_DATA_BUFFERS) &amp;&amp;</div><div class='add'>+	    (adapter-&gt;AllRcvBlockCount &lt; SXG_MAX_RCV_BLOCKS) &amp;&amp;</div><div class='add'>+	    (adapter-&gt;AllocationsPending == 0)) {</div><div class='add'>+		sxg_allocate_buffer_memory(adapter,</div><div class='add'>+					   SXG_RCV_BLOCK_SIZE(adapter-&gt;</div><div class='add'>+							      ReceiveBufferSize),</div><div class='add'>+					   SXG_BUFFER_TYPE_RCV);</div><div class='add'>+	}</div><div class='add'>+	// Now grab the RcvQLock lock and proceed</div><div class='add'>+	spin_lock(&amp;adapter-&gt;RcvQLock);</div><div class='add'>+	while (adapter-&gt;RcvBuffersOnCard &lt; SXG_RCV_DATA_BUFFERS) {</div><div class='add'>+		PLIST_ENTRY _ple;</div><div class='add'>+</div><div class='add'>+		// Get a descriptor block</div><div class='add'>+		RcvDescriptorBlockHdr = NULL;</div><div class='add'>+		if (adapter-&gt;FreeRcvBlockCount) {</div><div class='add'>+			_ple = RemoveHeadList(&amp;adapter-&gt;FreeRcvBlocks);</div><div class='add'>+			RcvDescriptorBlockHdr =</div><div class='add'>+			    container_of(_ple, SXG_RCV_DESCRIPTOR_BLOCK_HDR,</div><div class='add'>+					 FreeList);</div><div class='add'>+			adapter-&gt;FreeRcvBlockCount--;</div><div class='add'>+			RcvDescriptorBlockHdr-&gt;State = SXG_BUFFER_BUSY;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (RcvDescriptorBlockHdr == NULL) {</div><div class='add'>+			// Bail out..</div><div class='add'>+			adapter-&gt;Stats.NoMem++;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		// Fill in the descriptor block and give it to the card</div><div class='add'>+		if (sxg_fill_descriptor_block(adapter, RcvDescriptorBlockHdr) ==</div><div class='add'>+		    STATUS_FAILURE) {</div><div class='add'>+			// Free the descriptor block</div><div class='add'>+			SXG_FREE_RCV_DESCRIPTOR_BLOCK(adapter,</div><div class='add'>+						      RcvDescriptorBlockHdr);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;adapter-&gt;RcvQLock);</div><div class='add'>+	SXG_TRACE(TRACE_SXG, SxgTraceBuffer, TRACE_NOISY, "XFilBlks",</div><div class='add'>+		  adapter, adapter-&gt;RcvBuffersOnCard,</div><div class='add'>+		  adapter-&gt;FreeRcvBufferCount, adapter-&gt;AllRcvBlockCount);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * sxg_complete_descriptor_blocks - Return descriptor blocks that have been</div><div class='add'>+ * completed by the microcode</div><div class='add'>+ *</div><div class='add'>+ * Arguments -</div><div class='add'>+ *	adapter		- A pointer to our adapter structure</div><div class='add'>+ *	Index		- Where the microcode is up to</div><div class='add'>+ *</div><div class='add'>+ * Return</div><div class='add'>+ *	None</div><div class='add'>+ */</div><div class='add'>+static void sxg_complete_descriptor_blocks(p_adapter_t adapter,</div><div class='add'>+					   unsigned char Index)</div><div class='add'>+{</div><div class='add'>+	PSXG_RCV_RING RingZero = &amp;adapter-&gt;RcvRings[0];</div><div class='add'>+	PSXG_RING_INFO RcvRingInfo = &amp;adapter-&gt;RcvRingZeroInfo;</div><div class='add'>+	PSXG_RCV_DESCRIPTOR_BLOCK_HDR RcvDescriptorBlockHdr;</div><div class='add'>+	PSXG_CMD RingDescriptorCmd;</div><div class='add'>+</div><div class='add'>+	SXG_TRACE(TRACE_SXG, SxgTraceBuffer, TRACE_NOISY, "CmpRBlks",</div><div class='add'>+		  adapter, Index, RcvRingInfo-&gt;Head, RcvRingInfo-&gt;Tail);</div><div class='add'>+</div><div class='add'>+	// Now grab the RcvQLock lock and proceed</div><div class='add'>+	spin_lock(&amp;adapter-&gt;RcvQLock);</div><div class='add'>+	ASSERT(Index != RcvRingInfo-&gt;Tail);</div><div class='add'>+	while (RcvRingInfo-&gt;Tail != Index) {</div><div class='add'>+		//</div><div class='add'>+		// Locate the current Cmd (ring descriptor entry), and</div><div class='add'>+		// associated receive descriptor block, and advance</div><div class='add'>+		// the tail</div><div class='add'>+		//</div><div class='add'>+		SXG_RETURN_CMD(RingZero,</div><div class='add'>+			       RcvRingInfo,</div><div class='add'>+			       RingDescriptorCmd, RcvDescriptorBlockHdr);</div><div class='add'>+		SXG_TRACE(TRACE_SXG, SxgTraceBuffer, TRACE_NOISY, "CmpRBlk",</div><div class='add'>+			  RcvRingInfo-&gt;Head, RcvRingInfo-&gt;Tail,</div><div class='add'>+			  RingDescriptorCmd, RcvDescriptorBlockHdr);</div><div class='add'>+</div><div class='add'>+		// Clear the SGL field</div><div class='add'>+		RingDescriptorCmd-&gt;Sgl = 0;</div><div class='add'>+		// Attempt to refill it and hand it right back to the</div><div class='add'>+		// card.  If we fail to refill it, free the descriptor block</div><div class='add'>+		// header.  The card will be restocked later via the</div><div class='add'>+		// RcvBuffersOnCard test</div><div class='add'>+		if (sxg_fill_descriptor_block(adapter, RcvDescriptorBlockHdr) ==</div><div class='add'>+		    STATUS_FAILURE) {</div><div class='add'>+			SXG_FREE_RCV_DESCRIPTOR_BLOCK(adapter,</div><div class='add'>+						      RcvDescriptorBlockHdr);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;adapter-&gt;RcvQLock);</div><div class='add'>+	SXG_TRACE(TRACE_SXG, SxgTraceBuffer, TRACE_NOISY, "XCRBlks",</div><div class='add'>+		  adapter, Index, RcvRingInfo-&gt;Head, RcvRingInfo-&gt;Tail);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct pci_driver sxg_driver = {</div><div class='add'>+	.name = DRV_NAME,</div><div class='add'>+	.id_table = sxg_pci_tbl,</div><div class='add'>+	.probe = sxg_entry_probe,</div><div class='add'>+	.remove = sxg_entry_remove,</div><div class='add'>+#if SXG_POWER_MANAGEMENT_ENABLED</div><div class='add'>+	.suspend = sxgpm_suspend,</div><div class='add'>+	.resume = sxgpm_resume,</div><div class='add'>+#endif</div><div class='add'>+/*    .shutdown   =     slic_shutdown,  MOOK_INVESTIGATE */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init sxg_module_init(void)</div><div class='add'>+{</div><div class='add'>+	sxg_init_driver();</div><div class='add'>+</div><div class='add'>+	if (debug &gt;= 0)</div><div class='add'>+		sxg_debug = debug;</div><div class='add'>+</div><div class='add'>+	return pci_register_driver(&amp;sxg_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit sxg_module_cleanup(void)</div><div class='add'>+{</div><div class='add'>+	pci_unregister_driver(&amp;sxg_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(sxg_module_init);</div><div class='add'>+module_exit(sxg_module_cleanup);</div><div class='head'>diff --git a/drivers/staging/sxg/sxg.h b/drivers/staging/sxg/sxg.h<br/>new file mode 100644<br/>index 000000000000..844ca56f2800<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/sxg/sxg.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/sxg/sxg.h</a></div><div class='hunk'>@@ -0,0 +1,773 @@</div><div class='add'>+/**************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * Copyright © 2000-2008 Alacritech, Inc.  All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * $Id: sxg.h,v 1.3 2008/07/24 17:25:08 chris Exp $</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions</div><div class='add'>+ * are met:</div><div class='add'>+ *</div><div class='add'>+ * 1. Redistributions of source code must retain the above copyright</div><div class='add'>+ *    notice, this list of conditions and the following disclaimer.</div><div class='add'>+ * 2. Redistributions in binary form must reproduce the above</div><div class='add'>+ *    copyright notice, this list of conditions and the following</div><div class='add'>+ *    disclaimer in the documentation and/or other materials provided</div><div class='add'>+ *    with the distribution.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY ALACRITECH, INC. ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE</div><div class='add'>+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR</div><div class='add'>+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL ALACRITECH, INC. OR</div><div class='add'>+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,</div><div class='add'>+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT</div><div class='add'>+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF</div><div class='add'>+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,</div><div class='add'>+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT</div><div class='add'>+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF</div><div class='add'>+ * SUCH DAMAGE.</div><div class='add'>+ *</div><div class='add'>+ * The views and conclusions contained in the software and documentation</div><div class='add'>+ * are those of the authors and should not be interpreted as representing</div><div class='add'>+ * official policies, either expressed or implied, of Alacritech, Inc.</div><div class='add'>+ *</div><div class='add'>+ **************************************************************************/</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * FILENAME: sxg.h</div><div class='add'>+ *</div><div class='add'>+ * This is the base set of header definitions for the SXG driver.</div><div class='add'>+ */</div><div class='add'>+#ifndef __SXG_DRIVER_H__</div><div class='add'>+#define __SXG_DRIVER_H__</div><div class='add'>+</div><div class='add'>+#define p_net_device struct net_device *</div><div class='add'>+// SXG_STATS - Probably move these to someplace where</div><div class='add'>+// the slicstat (sxgstat?) program can get them.</div><div class='add'>+typedef struct _SXG_STATS {</div><div class='add'>+	// Xmt</div><div class='add'>+	u32				XmtNBL;				// Offload send NBL count</div><div class='add'>+	u64				DumbXmtBytes;		// Dumbnic send bytes</div><div class='add'>+	u64				SlowXmtBytes;		// Slowpath send bytes</div><div class='add'>+	u64				FastXmtBytes;		// Fastpath send bytes</div><div class='add'>+	u64				DumbXmtPkts;		// Dumbnic send packets</div><div class='add'>+	u64				SlowXmtPkts;		// Slowpath send packets</div><div class='add'>+	u64				FastXmtPkts;		// Fastpath send packets</div><div class='add'>+    u64				DumbXmtUcastPkts;	// directed packets</div><div class='add'>+    u64				DumbXmtMcastPkts;	// Multicast packets</div><div class='add'>+    u64				DumbXmtBcastPkts;	// OID_GEN_BROADCAST_FRAMES_RCV</div><div class='add'>+    u64				DumbXmtUcastBytes;	// OID_GEN_DIRECTED_BYTES_XMIT</div><div class='add'>+    u64				DumbXmtMcastBytes;	// OID_GEN_MULTICAST_BYTES_XMIT</div><div class='add'>+    u64				DumbXmtBcastBytes;	// OID_GEN_BROADCAST_BYTES_XMIT</div><div class='add'>+    u64				XmtErrors;			// OID_GEN_XMIT_ERROR</div><div class='add'>+    u64				XmtDiscards;		// OID_GEN_XMIT_DISCARDS</div><div class='add'>+	u64				XmtOk;				// OID_GEN_XMIT_OK</div><div class='add'>+	u64				XmtQLen;			// OID_GEN_TRANSMIT_QUEUE_LENGTH</div><div class='add'>+	u64				XmtZeroFull;		// Transmit ring zero full</div><div class='add'>+	// Rcv</div><div class='add'>+	u32				RcvNBL;				// Offload recieve NBL count</div><div class='add'>+	u64				DumbRcvBytes;		// dumbnic recv bytes</div><div class='add'>+    u64             DumbRcvUcastBytes;	// OID_GEN_DIRECTED_BYTES_RCV</div><div class='add'>+    u64             DumbRcvMcastBytes;	// OID_GEN_MULTICAST_BYTES_RCV</div><div class='add'>+    u64             DumbRcvBcastBytes;	// OID_GEN_BROADCAST_BYTES_RCV</div><div class='add'>+	u64				SlowRcvBytes;		// Slowpath recv bytes</div><div class='add'>+	u64				FastRcvBytes;		// Fastpath recv bytes</div><div class='add'>+    u64				DumbRcvPkts;		// OID_GEN_DIRECTED_FRAMES_RCV</div><div class='add'>+	u64				DumbRcvTcpPkts;		// See SxgCollectStats</div><div class='add'>+    u64				DumbRcvUcastPkts;	// directed packets</div><div class='add'>+    u64				DumbRcvMcastPkts;	// Multicast packets</div><div class='add'>+    u64				DumbRcvBcastPkts;	// OID_GEN_BROADCAST_FRAMES_RCV</div><div class='add'>+	u64				SlowRcvPkts;		// OID_GEN_DIRECTED_FRAMES_RCV</div><div class='add'>+    u64				RcvErrors;			// OID_GEN_RCV_ERROR</div><div class='add'>+    u64				RcvDiscards;		// OID_GEN_RCV_DISCARDS</div><div class='add'>+	u64				RcvNoBuffer;		// OID_GEN_RCV_NO_BUFFER</div><div class='add'>+    u64 			PdqFull;			// Processed Data Queue Full</div><div class='add'>+	u64				EventRingFull;		// Event ring full</div><div class='add'>+	// Verbose stats</div><div class='add'>+	u64				MaxSends;			// Max sends outstanding</div><div class='add'>+	u64				NoSglBuf;			// SGL buffer allocation failure</div><div class='add'>+	u64				SglFail;			// NDIS SGL failure</div><div class='add'>+	u64				SglAsync;			// NDIS SGL failure</div><div class='add'>+	u64				NoMem;				// Memory allocation failure</div><div class='add'>+	u64				NumInts;			// Interrupts</div><div class='add'>+	u64				FalseInts;			// Interrupt with ISR == 0</div><div class='add'>+	u64				XmtDrops;			// No sahara DRAM buffer for xmt</div><div class='add'>+	// Sahara receive status</div><div class='add'>+	u64				TransportCsum;		// SXG_RCV_STATUS_TRANSPORT_CSUM</div><div class='add'>+	u64				TransportUflow;		// SXG_RCV_STATUS_TRANSPORT_UFLOW</div><div class='add'>+	u64				TransportHdrLen;	// SXG_RCV_STATUS_TRANSPORT_HDRLEN</div><div class='add'>+	u64				NetworkCsum;		// SXG_RCV_STATUS_NETWORK_CSUM:</div><div class='add'>+	u64				NetworkUflow;		// SXG_RCV_STATUS_NETWORK_UFLOW:</div><div class='add'>+	u64				NetworkHdrLen;		// SXG_RCV_STATUS_NETWORK_HDRLEN:</div><div class='add'>+	u64				Parity;				// SXG_RCV_STATUS_PARITY</div><div class='add'>+	u64				LinkParity;			// SXG_RCV_STATUS_LINK_PARITY:</div><div class='add'>+	u64				LinkEarly;			// SXG_RCV_STATUS_LINK_EARLY:</div><div class='add'>+	u64				LinkBufOflow;		// SXG_RCV_STATUS_LINK_BUFOFLOW:</div><div class='add'>+	u64				LinkCode;			// SXG_RCV_STATUS_LINK_CODE:</div><div class='add'>+	u64				LinkDribble;		// SXG_RCV_STATUS_LINK_DRIBBLE:</div><div class='add'>+	u64				LinkCrc;			// SXG_RCV_STATUS_LINK_CRC:</div><div class='add'>+	u64				LinkOflow;			// SXG_RCV_STATUS_LINK_OFLOW:</div><div class='add'>+	u64				LinkUflow;			// SXG_RCV_STATUS_LINK_UFLOW:</div><div class='add'>+} SXG_STATS, *PSXG_STATS;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/****************************************************************************</div><div class='add'>+ * DUMB-NIC Send path definitions</div><div class='add'>+ ****************************************************************************/</div><div class='add'>+</div><div class='add'>+#define SXG_COMPLETE_DUMB_SEND(_pAdapt, _skb) {                     		    	\</div><div class='add'>+	ASSERT(_skb);													    			\</div><div class='add'>+    dev_kfree_skb_irq(_skb);                                                        \</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define SXG_DROP_DUMB_SEND(_pAdapt, _skb) {                           		    	\</div><div class='add'>+	ASSERT(_skb);													    			\</div><div class='add'>+    dev_kfree_skb(_skb);                                                            \</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+// Locate current receive header buffer location.  Use this</div><div class='add'>+// instead of RcvDataHdr-&gt;VirtualAddress since the data</div><div class='add'>+// may have been offset by SXG_ADVANCE_MDL_OFFSET</div><div class='add'>+#define SXG_RECEIVE_DATA_LOCATION(_RcvDataHdr)        (_RcvDataHdr)-&gt;skb-&gt;data</div><div class='add'>+</div><div class='add'>+/************************************************************************</div><div class='add'>+ * Dumb-NIC receive processing</div><div class='add'>+ ************************************************************************/</div><div class='add'>+// Define an SXG_PACKET as an NDIS_PACKET</div><div class='add'>+#define PSXG_PACKET       struct sk_buff *</div><div class='add'>+// Indications array size</div><div class='add'>+#define SXG_RCV_ARRAYSIZE	64</div><div class='add'>+</div><div class='add'>+#define SXG_ALLOCATE_RCV_PACKET(_pAdapt, _RcvDataBufferHdr) {				\</div><div class='add'>+	struct sk_buff * skb;												    \</div><div class='add'>+    skb = alloc_skb(2048, GFP_ATOMIC);                                      \</div><div class='add'>+    if (skb) {                                                              \</div><div class='add'>+    	(_RcvDataBufferHdr)-&gt;skb = skb;                                     \</div><div class='add'>+        skb-&gt;next = NULL;                                                   \</div><div class='add'>+    } else {                                                                \</div><div class='add'>+    	(_RcvDataBufferHdr)-&gt;skb = NULL;                                    \</div><div class='add'>+    }                                                                       \</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define SXG_FREE_RCV_PACKET(_RcvDataBufferHdr) {							\</div><div class='add'>+	if((_RcvDataBufferHdr)-&gt;skb) {											\</div><div class='add'>+		dev_kfree_skb((_RcvDataBufferHdr)-&gt;skb);						    \</div><div class='add'>+    }                                                                       \</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+// Macro to add a NDIS_PACKET to an indication array</div><div class='add'>+// If we fill up our array of packet pointers, then indicate this</div><div class='add'>+// block up now and start on a new one.</div><div class='add'>+#define	SXG_ADD_RCV_PACKET(_pAdapt, _Packet, _PrevPacket, _IndicationList, _NumPackets) { \</div><div class='add'>+	(_IndicationList)[_NumPackets] = (_Packet);										\</div><div class='add'>+	(_NumPackets)++;																\</div><div class='add'>+	if((_NumPackets) == SXG_RCV_ARRAYSIZE) {										\</div><div class='add'>+		SXG_TRACE(TRACE_SXG, SxgTraceBuffer, TRACE_NOISY, "IndicRcv",				\</div><div class='add'>+				   (_NumPackets), 0, 0, 0);											\</div><div class='add'>+        netif_rx((_IndicationList),(_NumPackets));                                  \</div><div class='add'>+		(_NumPackets) = 0;															\</div><div class='add'>+	}																				\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define SXG_INDICATE_PACKETS(_pAdapt, _IndicationList, _NumPackets) {			\</div><div class='add'>+	if(_NumPackets) {															\</div><div class='add'>+		SXG_TRACE(TRACE_SXG, SxgTraceBuffer, TRACE_NOISY, "IndicRcv",			\</div><div class='add'>+				   (_NumPackets), 0, 0, 0);										\</div><div class='add'>+        netif_rx((_IndicationList),(_NumPackets));                              \</div><div class='add'>+		(_NumPackets) = 0;														\</div><div class='add'>+	}																			\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define SXG_REINIATIALIZE_PACKET(_Packet)										\</div><div class='add'>+	{}  /*_NdisReinitializePacket(_Packet)*/  /*  this is not necessary with an skb */</div><div class='add'>+</div><div class='add'>+// Definitions to initialize Dumb-nic Receive NBLs</div><div class='add'>+#define SXG_RCV_PACKET_BUFFER_HDR(_Packet) (((PSXG_RCV_NBL_RESERVED)((_Packet)-&gt;MiniportReservedEx))-&gt;RcvDataBufferHdr)</div><div class='add'>+</div><div class='add'>+#define SXG_RCV_SET_CHECKSUM_INFO(_Packet, _Cpi)	\</div><div class='add'>+	NDIS_PER_PACKET_INFO_FROM_PACKET((_Packet), TcpIpChecksumPacketInfo) = (PVOID)(_Cpi)</div><div class='add'>+</div><div class='add'>+#define SXG_RCV_SET_TOEPLITZ(_Packet, _Toeplitz, _Type, _Function) {		\</div><div class='add'>+	NDIS_PACKET_SET_HASH_VALUE((_Packet), (_Toeplitz));						\</div><div class='add'>+	NDIS_PACKET_SET_HASH_TYPE((_Packet), (_Type));							\</div><div class='add'>+	NDIS_PACKET_SET_HASH_FUNCTION((_Packet), (_Function));					\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define SXG_RCV_SET_VLAN_INFO(_Packet, _VlanId, _Priority) {					\</div><div class='add'>+	NDIS_PACKET_8021Q_INFO	_Packet8021qInfo;									\</div><div class='add'>+	_Packet8021qInfo.TagHeader.VlanId = (_VlanId);								\</div><div class='add'>+	_Packet8021qInfo.TagHeader.UserPriority = (_Priority);						\</div><div class='add'>+	NDIS_PER_PACKET_INFO_FROM_PACKET((_Packet), Ieee8021QNetBufferListInfo) = 	\</div><div class='add'>+		_Packet8021qInfo.Value;													\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define SXG_ADJUST_RCV_PACKET(_Packet, _RcvDataBufferHdr, _Event) {			\</div><div class='add'>+	SXG_TRACE(TRACE_SXG, SxgTraceBuffer, TRACE_NOISY, "DumbRcv",			\</div><div class='add'>+			   (_RcvDataBufferHdr), (_Packet),								\</div><div class='add'>+			   (_Event)-&gt;Status, 0);	                    				\</div><div class='add'>+	ASSERT((_Event)-&gt;Length &lt;= (_RcvDataBufferHdr)-&gt;Size);					\</div><div class='add'>+    Packet-&gt;len = (_Event)-&gt;Length;                                         \</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+///////////////////////////////////////////////////////////////////////////////</div><div class='add'>+// Macros to free a receive data buffer and receive data descriptor block</div><div class='add'>+///////////////////////////////////////////////////////////////////////////////</div><div class='add'>+// NOTE - Lock must be held with RCV macros</div><div class='add'>+#define SXG_GET_RCV_DATA_BUFFER(_pAdapt, _Hdr) {								\</div><div class='add'>+	PLIST_ENTRY     				_ple;										\</div><div class='add'>+	_Hdr = NULL;																\</div><div class='add'>+	if((_pAdapt)-&gt;FreeRcvBufferCount) {											\</div><div class='add'>+		ASSERT(!(IsListEmpty(&amp;(_pAdapt)-&gt;FreeRcvBuffers)));						\</div><div class='add'>+		_ple = RemoveHeadList(&amp;(_pAdapt)-&gt;FreeRcvBuffers);	    				\</div><div class='add'>+		(_Hdr) = container_of(_ple, SXG_RCV_DATA_BUFFER_HDR, FreeList);	        \</div><div class='add'>+		(_pAdapt)-&gt;FreeRcvBufferCount--;										\</div><div class='add'>+		ASSERT((_Hdr)-&gt;State == SXG_BUFFER_FREE);								\</div><div class='add'>+	}																			\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define SXG_FREE_RCV_DATA_BUFFER(_pAdapt, _Hdr) {							\</div><div class='add'>+	SXG_TRACE(TRACE_SXG, SxgTraceBuffer, TRACE_NOISY, "RtnDHdr",			\</div><div class='add'>+			   (_Hdr), (_pAdapt)-&gt;FreeRcvBufferCount,						\</div><div class='add'>+			   (_Hdr)-&gt;State, (_Hdr)-&gt;VirtualAddress);						\</div><div class='add'>+/*	SXG_RESTORE_MDL_OFFSET(_Hdr);	*/										\</div><div class='add'>+	(_pAdapt)-&gt;FreeRcvBufferCount++;										\</div><div class='add'>+	ASSERT(((_pAdapt)-&gt;AllRcvBlockCount * SXG_RCV_DESCRIPTORS_PER_BLOCK) &gt;= (_pAdapt)-&gt;FreeRcvBufferCount); \</div><div class='add'>+	ASSERT((_Hdr)-&gt;State != SXG_BUFFER_FREE);								\</div><div class='add'>+	(_Hdr)-&gt;State = SXG_BUFFER_FREE;										\</div><div class='add'>+	InsertTailList(&amp;(_pAdapt)-&gt;FreeRcvBuffers, &amp;((_Hdr)-&gt;FreeList));		\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define SXG_FREE_RCV_DESCRIPTOR_BLOCK(_pAdapt, _Hdr) {						\</div><div class='add'>+	ASSERT((_Hdr)-&gt;State != SXG_BUFFER_FREE);								\</div><div class='add'>+	(_Hdr)-&gt;State = SXG_BUFFER_FREE;										\</div><div class='add'>+	(_pAdapt)-&gt;FreeRcvBlockCount++;											\</div><div class='add'>+	ASSERT((_pAdapt)-&gt;AllRcvBlockCount &gt;= (_pAdapt)-&gt;FreeRcvBlockCount);	\</div><div class='add'>+	InsertTailList(&amp;(_pAdapt)-&gt;FreeRcvBlocks, &amp;(_Hdr)-&gt;FreeList);			\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+// SGL macros</div><div class='add'>+#define SXG_FREE_SGL_BUFFER(_pAdapt, _Sgl, _NB) {	\</div><div class='add'>+	spin_lock(&amp;(_pAdapt)-&gt;SglQLock);		\</div><div class='add'>+	(_pAdapt)-&gt;FreeSglBufferCount++;		\</div><div class='add'>+	ASSERT((_pAdapt)-&gt;AllSglBufferCount &gt;= (_pAdapt)-&gt;FreeSglBufferCount);\</div><div class='add'>+	ASSERT(!((_Sgl)-&gt;State &amp; SXG_BUFFER_FREE));	\</div><div class='add'>+	(_Sgl)-&gt;State = SXG_BUFFER_FREE;		\</div><div class='add'>+	InsertTailList(&amp;(_pAdapt)-&gt;FreeSglBuffers, &amp;(_Sgl)-&gt;FreeList);	\</div><div class='add'>+	spin_unlock(&amp;(_pAdapt)-&gt;SglQLock);		\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+// Get an SGL buffer from the free queue.  The first part of this macro</div><div class='add'>+// attempts to keep ahead of buffer depletion by allocating more when</div><div class='add'>+// we hit a minimum threshold.  Note that we don't grab the lock</div><div class='add'>+// until after that.  We're dealing with round numbers here, so we don't need to,</div><div class='add'>+// and not grabbing it avoids a possible double-trip.</div><div class='add'>+#define SXG_GET_SGL_BUFFER(_pAdapt, _Sgl) {				\</div><div class='add'>+	PLIST_ENTRY _ple;						\</div><div class='add'>+	if ((_pAdapt-&gt;FreeSglBufferCount &lt; SXG_MIN_SGL_BUFFERS) &amp;&amp;	\</div><div class='add'>+	   (_pAdapt-&gt;AllSglBufferCount &lt; SXG_MAX_SGL_BUFFERS) &amp;&amp;	\</div><div class='add'>+	   (_pAdapt-&gt;AllocationsPending == 0)) {			\</div><div class='add'>+		sxg_allocate_buffer_memory(_pAdapt,			\</div><div class='add'>+			(sizeof(SXG_SCATTER_GATHER) + SXG_SGL_BUF_SIZE),\</div><div class='add'>+			SXG_BUFFER_TYPE_SGL);				\</div><div class='add'>+	}								\</div><div class='add'>+	_Sgl = NULL;							\</div><div class='add'>+	spin_lock(&amp;(_pAdapt)-&gt;SglQLock);				\</div><div class='add'>+	if((_pAdapt)-&gt;FreeSglBufferCount) {				\</div><div class='add'>+		ASSERT(!(IsListEmpty(&amp;(_pAdapt)-&gt;FreeSglBuffers)));	\</div><div class='add'>+		_ple = RemoveHeadList(&amp;(_pAdapt)-&gt;FreeSglBuffers);	\</div><div class='add'>+		(_Sgl) = container_of(_ple, SXG_SCATTER_GATHER, FreeList); \</div><div class='add'>+            (_pAdapt)-&gt;FreeSglBufferCount--;				\</div><div class='add'>+		ASSERT((_Sgl)-&gt;State == SXG_BUFFER_FREE);		\</div><div class='add'>+		(_Sgl)-&gt;State = SXG_BUFFER_BUSY;			\</div><div class='add'>+		(_Sgl)-&gt;pSgl = NULL;					\</div><div class='add'>+	}								\</div><div class='add'>+	spin_unlock(&amp;(_pAdapt)-&gt;SglQLock);				\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+//</div><div class='add'>+// SXG_MULTICAST_ADDRESS</div><div class='add'>+//</div><div class='add'>+// Linked list of multicast addresses.</div><div class='add'>+typedef struct _SXG_MULTICAST_ADDRESS {</div><div class='add'>+	unsigned char							Address[6];</div><div class='add'>+	struct _SXG_MULTICAST_ADDRESS	*Next;</div><div class='add'>+} SXG_MULTICAST_ADDRESS, *PSXG_MULTICAST_ADDRESS;</div><div class='add'>+</div><div class='add'>+// Structure to maintain chimney send and receive buffer queues.</div><div class='add'>+// This structure maintains NET_BUFFER_LIST queues that are</div><div class='add'>+// given to us via the Chimney MiniportTcpOffloadSend and</div><div class='add'>+// MiniportTcpOffloadReceive routines.  This structure DOES NOT</div><div class='add'>+// manage our data buffer queue</div><div class='add'>+typedef struct _SXG_BUFFER_QUEUE {</div><div class='add'>+	u32						Type;			// Slow or fast - See below</div><div class='add'>+	u32						Direction;		// Xmt or Rcv</div><div class='add'>+	u32						Bytes;			// Byte count</div><div class='add'>+	u32 *        			Head;			// Send queue head</div><div class='add'>+	u32 *        			Tail;			// Send queue tail</div><div class='add'>+//	PNET_BUFFER_LIST			NextNBL;		// Short cut - next NBL</div><div class='add'>+//	PNET_BUFFER					NextNB;			// Short cut - next NB</div><div class='add'>+} SXG_BUFFER_QUEUE, *PSXG_BUFFER_QUEUE;</div><div class='add'>+</div><div class='add'>+#define		SXG_SLOW_SEND_BUFFER	0</div><div class='add'>+#define		SXG_FAST_SEND_BUFFER	1</div><div class='add'>+#define 	SXG_RECEIVE_BUFFER		2</div><div class='add'>+</div><div class='add'>+#define SXG_INIT_BUFFER(_Buffer, _Type) { 						\</div><div class='add'>+	(_Buffer)-&gt;Type = (_Type);									\</div><div class='add'>+	if((_Type) == SXG_RECEIVE_BUFFER) {							\</div><div class='add'>+		(_Buffer)-&gt;Direction = 0;								\</div><div class='add'>+	} else {													\</div><div class='add'>+		(_Buffer)-&gt;Direction = NDIS_SG_LIST_WRITE_TO_DEVICE;	\</div><div class='add'>+	}															\</div><div class='add'>+	(_Buffer)-&gt;Bytes = 0;										\</div><div class='add'>+	(_Buffer)-&gt;Head = NULL;										\</div><div class='add'>+	(_Buffer)-&gt;Tail = NULL;										\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define SXG_RSS_CPU_COUNT(_pAdapt) 								\</div><div class='add'>+	((_pAdapt)-&gt;RssEnabled 	?  NR_CPUS : 1)</div><div class='add'>+</div><div class='add'>+/****************************************************************************</div><div class='add'>+ * DRIVER and ADAPTER structures</div><div class='add'>+ ****************************************************************************/</div><div class='add'>+</div><div class='add'>+// Adapter states - These states closely match the adapter states</div><div class='add'>+// documented in the DDK (with a few exceptions).</div><div class='add'>+typedef enum _SXG_STATE {</div><div class='add'>+	SXG_STATE_INITIALIZING,			// Initializing</div><div class='add'>+	SXG_STATE_BOOTDIAG,				// Boot-Diagnostic mode</div><div class='add'>+	SXG_STATE_PAUSING,				// Pausing</div><div class='add'>+	SXG_STATE_PAUSED,				// Paused</div><div class='add'>+	SXG_STATE_RUNNING,				// Running</div><div class='add'>+	SXG_STATE_RESETTING,			// Reset in progress</div><div class='add'>+	SXG_STATE_SLEEP,				// Sleeping</div><div class='add'>+	SXG_STATE_DIAG,					// Diagnostic mode</div><div class='add'>+	SXG_STATE_HALTING,				// Halting</div><div class='add'>+	SXG_STATE_HALTED,				// Down or not-initialized</div><div class='add'>+	SXG_STATE_SHUTDOWN				// shutdown</div><div class='add'>+} SXG_STATE, *PSXG_STATE;</div><div class='add'>+</div><div class='add'>+// Link state</div><div class='add'>+typedef enum _SXG_LINK_STATE {</div><div class='add'>+	SXG_LINK_DOWN,</div><div class='add'>+	SXG_LINK_UP</div><div class='add'>+} SXG_LINK_STATE, *PSXG_LINK_STATE;</div><div class='add'>+</div><div class='add'>+// Link initialization timeout in 100us units</div><div class='add'>+#define SXG_LINK_TIMEOUT	100000		// 10 Seconds - REDUCE!</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+// Microcode file selection codes</div><div class='add'>+typedef enum _SXG_UCODE_SEL {</div><div class='add'>+	SXG_UCODE_SAHARA,				// Sahara ucode</div><div class='add'>+	SXG_UCODE_SDIAGCPU,				// Sahara CPU diagnostic ucode</div><div class='add'>+	SXG_UCODE_SDIAGSYS				// Sahara system diagnostic ucode</div><div class='add'>+} SXG_UCODE_SEL;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define SXG_DISABLE_ALL_INTERRUPTS(_padapt) sxg_disable_interrupt(_padapt)</div><div class='add'>+#define SXG_ENABLE_ALL_INTERRUPTS(_padapt) sxg_enable_interrupt(_padapt)</div><div class='add'>+</div><div class='add'>+// This probably lives in a proto.h file.  Move later</div><div class='add'>+#define SXG_MULTICAST_PACKET(_pether) ((_pether)-&gt;ether_dhost[0] &amp; 0x01)</div><div class='add'>+#define SXG_BROADCAST_PACKET(_pether) ((*(u32 *)(_pether)-&gt;ether_dhost == 0xFFFFFFFF) &amp;&amp; \</div><div class='add'>+				(*(u16 *)&amp;(_pether)-&gt;ether_dhost[4] == 0xFFFF))</div><div class='add'>+</div><div class='add'>+// For DbgPrints</div><div class='add'>+#define SXG_ID      DPFLTR_IHVNETWORK_ID</div><div class='add'>+#define SXG_ERROR   DPFLTR_ERROR_LEVEL</div><div class='add'>+</div><div class='add'>+//</div><div class='add'>+// SXG_DRIVER structure -</div><div class='add'>+//</div><div class='add'>+// contains information about the sxg driver.  There is only</div><div class='add'>+// one of these, and it is defined as a global.</div><div class='add'>+typedef struct _SXG_DRIVER {</div><div class='add'>+	struct _adapter_t	*Adapters;		// Linked list of adapters</div><div class='add'>+	ushort				AdapterID;		// Maintain unique adapter ID</div><div class='add'>+} SXG_DRIVER, *PSXG_DRIVER;</div><div class='add'>+</div><div class='add'>+#ifdef STATUS_SUCCESS</div><div class='add'>+#undef STATUS_SUCCESS</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define STATUS_SUCCESS              0</div><div class='add'>+#define STATUS_PENDING              0</div><div class='add'>+#define STATUS_FAILURE             -1</div><div class='add'>+#define STATUS_ERROR               -2</div><div class='add'>+#define STATUS_NOT_SUPPORTED       -3</div><div class='add'>+#define STATUS_BUFFER_TOO_SHORT    -4</div><div class='add'>+#define STATUS_RESOURCES           -5</div><div class='add'>+</div><div class='add'>+#define SLIC_MAX_CARDS              32</div><div class='add'>+#define SLIC_MAX_PORTS              4        /* Max # of ports per card   */</div><div class='add'>+#if SLIC_DUMP_ENABLED</div><div class='add'>+// Dump buffer size</div><div class='add'>+//</div><div class='add'>+// This cannot be bigger than the max DMA size the card supports,</div><div class='add'>+// given the current code structure in the host and ucode.</div><div class='add'>+// Mojave supports 16K, Oasis supports 16K-1, so</div><div class='add'>+// just set this at 15K, shouldnt make that much of a diff.</div><div class='add'>+#define DUMP_BUF_SIZE               0x3C00</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define MIN(a, b) ((u32)(a) &lt; (u32)(b) ? (a) : (b))</div><div class='add'>+#define MAX(a, b) ((u32)(a) &gt; (u32)(b) ? (a) : (b))</div><div class='add'>+</div><div class='add'>+typedef struct _mcast_address_t</div><div class='add'>+{</div><div class='add'>+    unsigned char                     address[6];</div><div class='add'>+    struct _mcast_address_t   *next;</div><div class='add'>+}  mcast_address_t, *p_mcast_address_t;</div><div class='add'>+</div><div class='add'>+#define CARD_DOWN        0x00000000</div><div class='add'>+#define CARD_UP          0x00000001</div><div class='add'>+#define CARD_FAIL        0x00000002</div><div class='add'>+#define CARD_DIAG        0x00000003</div><div class='add'>+#define CARD_SLEEP       0x00000004</div><div class='add'>+</div><div class='add'>+#define ADAPT_DOWN             0x00</div><div class='add'>+#define ADAPT_UP               0x01</div><div class='add'>+#define ADAPT_FAIL             0x02</div><div class='add'>+#define ADAPT_RESET            0x03</div><div class='add'>+#define ADAPT_SLEEP            0x04</div><div class='add'>+</div><div class='add'>+#define ADAPT_FLAGS_BOOTTIME            0x0001</div><div class='add'>+#define ADAPT_FLAGS_IS64BIT             0x0002</div><div class='add'>+#define ADAPT_FLAGS_PENDINGLINKDOWN     0x0004</div><div class='add'>+#define ADAPT_FLAGS_FIBERMEDIA          0x0008</div><div class='add'>+#define ADAPT_FLAGS_LOCKS_ALLOCED       0x0010</div><div class='add'>+#define ADAPT_FLAGS_INT_REGISTERED      0x0020</div><div class='add'>+#define ADAPT_FLAGS_LOAD_TIMER_SET      0x0040</div><div class='add'>+#define ADAPT_FLAGS_STATS_TIMER_SET     0x0080</div><div class='add'>+#define ADAPT_FLAGS_RESET_TIMER_SET     0x0100</div><div class='add'>+</div><div class='add'>+#define LINK_DOWN              0x00</div><div class='add'>+#define LINK_CONFIG            0x01</div><div class='add'>+#define LINK_UP                0x02</div><div class='add'>+</div><div class='add'>+#define LINK_10MB              0x00</div><div class='add'>+#define LINK_100MB             0x01</div><div class='add'>+#define LINK_AUTOSPEED         0x02</div><div class='add'>+#define LINK_1000MB            0x03</div><div class='add'>+#define LINK_10000MB           0x04</div><div class='add'>+</div><div class='add'>+#define LINK_HALFD             0x00</div><div class='add'>+#define LINK_FULLD             0x01</div><div class='add'>+#define LINK_AUTOD             0x02</div><div class='add'>+</div><div class='add'>+#define MAC_DIRECTED     0x00000001</div><div class='add'>+#define MAC_BCAST        0x00000002</div><div class='add'>+#define MAC_MCAST        0x00000004</div><div class='add'>+#define MAC_PROMISC      0x00000008</div><div class='add'>+#define MAC_LOOPBACK     0x00000010</div><div class='add'>+#define MAC_ALLMCAST     0x00000020</div><div class='add'>+</div><div class='add'>+#define SLIC_DUPLEX(x)    ((x==LINK_FULLD) ? "FDX" : "HDX")</div><div class='add'>+#define SLIC_SPEED(x)     ((x==LINK_100MB) ? "100Mb" : ((x==LINK_1000MB) ? "1000Mb" : " 10Mb"))</div><div class='add'>+#define SLIC_LINKSTATE(x) ((x==LINK_DOWN) ? "Down" : "Up  ")</div><div class='add'>+#define SLIC_ADAPTER_STATE(x) ((x==ADAPT_UP) ? "UP" : "Down")</div><div class='add'>+#define SLIC_CARD_STATE(x)    ((x==CARD_UP) ? "UP" : "Down")</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+typedef struct _ether_header</div><div class='add'>+{</div><div class='add'>+    unsigned char    ether_dhost[6];</div><div class='add'>+    unsigned char    ether_shost[6];</div><div class='add'>+    ushort   ether_type;</div><div class='add'>+} ether_header, *p_ether_header;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define NUM_CFG_SPACES      2</div><div class='add'>+#define NUM_CFG_REGS        64</div><div class='add'>+</div><div class='add'>+typedef struct _physcard_t</div><div class='add'>+{</div><div class='add'>+    struct _adapter_t  *adapter[SLIC_MAX_PORTS];</div><div class='add'>+    struct _physcard_t *next;</div><div class='add'>+    unsigned int                adapters_allocd;</div><div class='add'>+} physcard_t, *p_physcard_t;</div><div class='add'>+</div><div class='add'>+typedef struct _sxgbase_driver</div><div class='add'>+{</div><div class='add'>+	spinlock_t	driver_lock;</div><div class='add'>+	unsigned long	flags;	/* irqsave for spinlock */</div><div class='add'>+	u32		num_sxg_cards;</div><div class='add'>+	u32		num_sxg_ports;</div><div class='add'>+	u32		num_sxg_ports_active;</div><div class='add'>+	u32		dynamic_intagg;</div><div class='add'>+	p_physcard_t	phys_card;</div><div class='add'>+} sxgbase_driver_t;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+typedef struct _adapter_t</div><div class='add'>+{</div><div class='add'>+	void *               ifp;</div><div class='add'>+	unsigned int                port;</div><div class='add'>+	p_physcard_t        physcard;</div><div class='add'>+	unsigned int                physport;</div><div class='add'>+	unsigned int                cardindex;</div><div class='add'>+	unsigned int                card_size;</div><div class='add'>+	unsigned int                chipid;</div><div class='add'>+	unsigned int                busnumber;</div><div class='add'>+	unsigned int                slotnumber;</div><div class='add'>+	unsigned int                functionnumber;</div><div class='add'>+	ushort              vendid;</div><div class='add'>+	ushort              devid;</div><div class='add'>+	ushort              subsysid;</div><div class='add'>+	u32             irq;</div><div class='add'>+</div><div class='add'>+	void *               sxg_adapter;</div><div class='add'>+	u32             nBusySend;</div><div class='add'>+</div><div class='add'>+	void __iomem *	base_addr;</div><div class='add'>+	u32             memorylength;</div><div class='add'>+	u32             drambase;</div><div class='add'>+	u32             dramlength;</div><div class='add'>+	unsigned int                queues_initialized;</div><div class='add'>+	unsigned int                allocated;</div><div class='add'>+	unsigned int                activated;</div><div class='add'>+	u32             intrregistered;</div><div class='add'>+	unsigned int                isp_initialized;</div><div class='add'>+	unsigned int                gennumber;</div><div class='add'>+	u32             curaddrupper;</div><div class='add'>+	u32             isrcopy;</div><div class='add'>+	unsigned char               state;</div><div class='add'>+	unsigned char               linkstate;</div><div class='add'>+	unsigned char               linkspeed;</div><div class='add'>+	unsigned char               linkduplex;</div><div class='add'>+	unsigned int                flags;</div><div class='add'>+	unsigned char               macaddr[6];</div><div class='add'>+	unsigned char               currmacaddr[6];</div><div class='add'>+	u32             macopts;</div><div class='add'>+	ushort              devflags_prev;</div><div class='add'>+	u64             mcastmask;</div><div class='add'>+	p_mcast_address_t   mcastaddrs;</div><div class='add'>+	struct timer_list   pingtimer;</div><div class='add'>+	u32             pingtimerset;</div><div class='add'>+	struct timer_list   statstimer;</div><div class='add'>+	u32             statstimerset;</div><div class='add'>+	struct timer_list   vpci_timer;</div><div class='add'>+	u32             vpci_timerset;</div><div class='add'>+	struct timer_list   loadtimer;</div><div class='add'>+	u32             loadtimerset;</div><div class='add'>+</div><div class='add'>+	u32             xmitq_full;</div><div class='add'>+	u32             all_reg_writes;</div><div class='add'>+	u32             icr_reg_writes;</div><div class='add'>+	u32             isr_reg_writes;</div><div class='add'>+	u32             error_interrupts;</div><div class='add'>+	u32             error_rmiss_interrupts;</div><div class='add'>+	u32             rx_errors;</div><div class='add'>+	u32             rcv_drops;</div><div class='add'>+	u32             rcv_interrupts;</div><div class='add'>+	u32             xmit_interrupts;</div><div class='add'>+	u32             linkevent_interrupts;</div><div class='add'>+	u32             upr_interrupts;</div><div class='add'>+	u32             num_isrs;</div><div class='add'>+	u32             false_interrupts;</div><div class='add'>+	u32             tx_packets;</div><div class='add'>+	u32             xmit_completes;</div><div class='add'>+	u32             tx_drops;</div><div class='add'>+	u32             rcv_broadcasts;</div><div class='add'>+	u32             rcv_multicasts;</div><div class='add'>+	u32             rcv_unicasts;</div><div class='add'>+	u32             max_isr_rcvs;</div><div class='add'>+	u32             max_isr_xmits;</div><div class='add'>+	u32             rcv_interrupt_yields;</div><div class='add'>+	u32             intagg_period;</div><div class='add'>+	struct net_device_stats stats;</div><div class='add'>+	u32 *					MiniportHandle;		// Our miniport handle</div><div class='add'>+	SXG_STATE					State;				// Adapter state</div><div class='add'>+	SXG_LINK_STATE				LinkState;			// Link state</div><div class='add'>+	u64						LinkSpeed;			// Link Speed</div><div class='add'>+	u32						PowerState;			// NDIS power state</div><div class='add'>+	struct _adapter_t   		*Next;				// Linked list</div><div class='add'>+	ushort						AdapterID;			// 1..n</div><div class='add'>+	unsigned char						MacAddr[6];			// Our permanent HW mac address</div><div class='add'>+	unsigned char						CurrMacAddr[6];		// Our Current mac address</div><div class='add'>+	p_net_device                netdev;</div><div class='add'>+	p_net_device                next_netdevice;</div><div class='add'>+	struct pci_dev            * pcidev;</div><div class='add'>+</div><div class='add'>+	PSXG_MULTICAST_ADDRESS		MulticastAddrs;		// Multicast list</div><div class='add'>+	u64     				MulticastMask;		// Multicast mask</div><div class='add'>+	u32 *					InterruptHandle;	// Register Interrupt handle</div><div class='add'>+	u32						InterruptLevel;		// From Resource list</div><div class='add'>+	u32						InterruptVector;	// From Resource list</div><div class='add'>+	spinlock_t	AdapterLock;	/* Serialize access adapter routines */</div><div class='add'>+	spinlock_t	Bit64RegLock;	/* For writing 64-bit addresses */</div><div class='add'>+	PSXG_HW_REGS				HwRegs;				// Sahara HW Register Memory (BAR0/1)</div><div class='add'>+	PSXG_UCODE_REGS				UcodeRegs;			// Microcode Register Memory (BAR2/3)</div><div class='add'>+	PSXG_TCB_REGS				TcbRegs;			// Same as Ucode regs - See sxghw.h</div><div class='add'>+	ushort						ResetDpcCount;		// For timeout</div><div class='add'>+	ushort						RssDpcCount;		// For timeout</div><div class='add'>+	ushort						VendorID;			// Vendor ID</div><div class='add'>+	ushort						DeviceID;			// Device ID</div><div class='add'>+	ushort						SubSystemID;		// Sub-System ID</div><div class='add'>+	ushort						FrameSize;			// Maximum frame size</div><div class='add'>+	u32 *					DmaHandle;			// NDIS DMA handle</div><div class='add'>+	u32 *					PacketPoolHandle;	// Used with NDIS 5.2 only.  Don't ifdef out</div><div class='add'>+	u32 *					BufferPoolHandle;	// Used with NDIS 5.2 only.  Don't ifdef out</div><div class='add'>+	u32						MacFilter;			// NDIS MAC Filter</div><div class='add'>+	ushort						IpId;				// For slowpath</div><div class='add'>+	PSXG_EVENT_RING				EventRings;			// Host event rings.  1/CPU to 16 max</div><div class='add'>+	dma_addr_t              	PEventRings;		// Physical address</div><div class='add'>+	u32						NextEvent[SXG_MAX_RSS];	// Current location in ring</div><div class='add'>+	dma_addr_t          		PTcbBuffers;		// TCB Buffers - physical address</div><div class='add'>+	dma_addr_t	            	PTcbCompBuffers;	// TCB Composite Buffers - phys addr</div><div class='add'>+	PSXG_XMT_RING				XmtRings;			// Transmit rings</div><div class='add'>+	dma_addr_t		            PXmtRings;			// Transmit rings - physical address</div><div class='add'>+	SXG_RING_INFO				XmtRingZeroInfo;	// Transmit ring 0 info</div><div class='add'>+	spinlock_t	XmtZeroLock;	/* Transmit ring 0 lock */</div><div class='add'>+	u32 *					XmtRingZeroIndex;	// Shared XMT ring 0 index</div><div class='add'>+	dma_addr_t          		PXmtRingZeroIndex;	// Shared XMT ring 0 index - physical</div><div class='add'>+	LIST_ENTRY					FreeProtocolHeaders;// Free protocol headers</div><div class='add'>+	u32						FreeProtoHdrCount;	// Count</div><div class='add'>+	void *						ProtocolHeaders;	// Block of protocol header</div><div class='add'>+	dma_addr_t	            	PProtocolHeaders;	// Block of protocol headers - phys</div><div class='add'>+</div><div class='add'>+	PSXG_RCV_RING				RcvRings;			// Receive rings</div><div class='add'>+	dma_addr_t	            	PRcvRings;			// Receive rings - physical address</div><div class='add'>+	SXG_RING_INFO				RcvRingZeroInfo;	// Receive ring 0 info</div><div class='add'>+</div><div class='add'>+	u32 *					Isr;				// Interrupt status register</div><div class='add'>+	dma_addr_t	            	PIsr;				// ISR - physical address</div><div class='add'>+	u32						IsrCopy[SXG_MAX_RSS];	// Copy of ISR</div><div class='add'>+	ushort						InterruptsEnabled;	// Bitmask of enabled vectors</div><div class='add'>+	unsigned char *						IndirectionTable;	// RSS indirection table</div><div class='add'>+	dma_addr_t	            	PIndirectionTable;	// Physical address</div><div class='add'>+	ushort						RssTableSize;		// From NDIS_RECEIVE_SCALE_PARAMETERS</div><div class='add'>+	ushort						HashKeySize;		// From NDIS_RECEIVE_SCALE_PARAMETERS</div><div class='add'>+	unsigned char						HashSecretKey[40];	// rss key</div><div class='add'>+	u32						HashInformation;</div><div class='add'>+	// Receive buffer queues</div><div class='add'>+	spinlock_t	RcvQLock;	/* Receive Queue Lock */</div><div class='add'>+	LIST_ENTRY					FreeRcvBuffers;		// Free SXG_DATA_BUFFER queue</div><div class='add'>+	LIST_ENTRY					FreeRcvBlocks;		// Free SXG_RCV_DESCRIPTOR_BLOCK Q</div><div class='add'>+	LIST_ENTRY					AllRcvBlocks;		// All SXG_RCV_BLOCKs</div><div class='add'>+	ushort						FreeRcvBufferCount;	// Number of free rcv data buffers</div><div class='add'>+	ushort						FreeRcvBlockCount;	// # of free rcv descriptor blocks</div><div class='add'>+	ushort						AllRcvBlockCount;	// Number of total receive blocks</div><div class='add'>+	ushort						ReceiveBufferSize;	// SXG_RCV_DATA/JUMBO_BUFFER_SIZE only</div><div class='add'>+	u32						AllocationsPending;	// Receive allocation pending</div><div class='add'>+	u32						RcvBuffersOnCard;	// SXG_DATA_BUFFERS owned by card</div><div class='add'>+	// SGL buffers</div><div class='add'>+	spinlock_t	SglQLock;	/* SGL Queue Lock */</div><div class='add'>+	LIST_ENTRY					FreeSglBuffers;		// Free SXG_SCATTER_GATHER</div><div class='add'>+	LIST_ENTRY					AllSglBuffers;		// All SXG_SCATTER_GATHER</div><div class='add'>+	ushort						FreeSglBufferCount;	// Number of free SGL buffers</div><div class='add'>+	ushort						AllSglBufferCount;	// Number of total SGL buffers</div><div class='add'>+	u32						CurrentTime;		// Tick count</div><div class='add'>+	u32						FastpathConnections;// # of fastpath connections</div><div class='add'>+	// Various single-bit flags:</div><div class='add'>+	u32						BasicAllocations:1;	// Locks and listheads</div><div class='add'>+	u32						IntRegistered:1;	// Interrupt registered</div><div class='add'>+	u32						PingOutstanding:1;	// Ping outstanding to card</div><div class='add'>+	u32						Dead:1;				// Card dead</div><div class='add'>+	u32						DumpDriver:1;		// OID_SLIC_DRIVER_DUMP request</div><div class='add'>+	u32						DumpCard:1;			// OID_SLIC_CARD_DUMP request</div><div class='add'>+	u32						DumpCmdRunning:1;	// Dump command in progress</div><div class='add'>+	u32						DebugRunning:1;		// AGDB debug in progress</div><div class='add'>+	u32						JumboEnabled:1;		// Jumbo frames enabled</div><div class='add'>+	u32						MsiEnabled:1;		// MSI interrupt enabled</div><div class='add'>+	u32						RssEnabled:1;		// RSS Enabled</div><div class='add'>+	u32						FailOnBadEeprom:1;	// Fail on Bad Eeprom</div><div class='add'>+	u32						DiagStart:1;		// Init adapter for diagnostic start</div><div class='add'>+	// Stats</div><div class='add'>+	u32						PendingRcvCount;	// Outstanding rcv indications</div><div class='add'>+	u32						PendingXmtCount;	// Outstanding send requests</div><div class='add'>+	SXG_STATS					Stats;				// Statistics</div><div class='add'>+	u32						ReassBufs;			// Number of reassembly buffers</div><div class='add'>+	// Card Crash Info</div><div class='add'>+	ushort						CrashLocation;		// Microcode crash location</div><div class='add'>+	unsigned char						CrashCpu;			// Sahara CPU ID</div><div class='add'>+	// Diagnostics</div><div class='add'>+	//	PDIAG_CMD					DiagCmds;			// List of free diagnostic commands</div><div class='add'>+	//	PDIAG_BUFFER				DiagBuffers;		// List of free diagnostic buffers</div><div class='add'>+	//	PDIAG_REQ					DiagReqQ;			// List of outstanding (asynchronous) diag requests</div><div class='add'>+	//	u32						DiagCmdTimeout;		// Time out for diag cmds (seconds) XXXTODO - replace with SXG_PARAM var?</div><div class='add'>+	//	unsigned char						DiagDmaDesc[DMA_CPU_CTXS];		// Free DMA descriptors bit field (32 CPU ctx * 8 DMA ctx)</div><div class='add'>+</div><div class='add'>+	/////////////////////////////////////////////////////////////////////</div><div class='add'>+	// Put preprocessor-conditional fields at the end so we don't</div><div class='add'>+	// have to recompile sxgdbg everytime we reconfigure the driver</div><div class='add'>+	/////////////////////////////////////////////////////////////////////</div><div class='add'>+	void *						PendingSetRss;		// Pending RSS parameter change</div><div class='add'>+	u32						IPv4HdrSize;		// Shared 5.2/6.0 encap param</div><div class='add'>+	unsigned char *          			InterruptInfo;		// Allocated by us during AddDevice</div><div class='add'>+#if defined(CONFIG_X86)</div><div class='add'>+	u32						AddrUpper;			// Upper 32 bits of 64-bit register</div><div class='add'>+#endif</div><div class='add'>+	//#if SXG_FAILURE_DUMP</div><div class='add'>+	//	NDIS_EVENT					DumpThreadEvent;	// syncronize dump thread</div><div class='add'>+	//	BOOLEAN						DumpThreadRunning;	// termination flag</div><div class='add'>+	//	PSXG_DUMP_CMD				DumpBuffer;			// 68k - Cmd and Buffer</div><div class='add'>+	//	dma_addr_t		PDumpBuffer;		// Physical address</div><div class='add'>+	//#endif // SXG_FAILURE_DUMP</div><div class='add'>+</div><div class='add'>+} adapter_t, *p_adapter_t;</div><div class='add'>+</div><div class='add'>+#if SLIC_DUMP_ENABLED</div><div class='add'>+#define SLIC_DUMP_REQUESTED      1</div><div class='add'>+#define SLIC_DUMP_IN_PROGRESS    2</div><div class='add'>+#define SLIC_DUMP_DONE           3</div><div class='add'>+</div><div class='add'>+/****************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * Microcode crash information structure.  This</div><div class='add'>+ * structure is written out to the card's SRAM when the microcode panic's.</div><div class='add'>+ *</div><div class='add'>+ ****************************************************************************/</div><div class='add'>+typedef struct _slic_crash_info {</div><div class='add'>+    ushort  cpu_id;</div><div class='add'>+    ushort  crash_pc;</div><div class='add'>+} slic_crash_info, *p_slic_crash_info;</div><div class='add'>+</div><div class='add'>+#define CRASH_INFO_OFFSET   0x155C</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define UPDATE_STATS(largestat, newstat, oldstat)                        \</div><div class='add'>+{                                                                        \</div><div class='add'>+    if ((newstat) &lt; (oldstat))                                           \</div><div class='add'>+        (largestat) += ((newstat) + (0xFFFFFFFF - oldstat + 1));         \</div><div class='add'>+    else                                                                 \</div><div class='add'>+        (largestat) += ((newstat) - (oldstat));                          \</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define UPDATE_STATS_GB(largestat, newstat, oldstat)                     \</div><div class='add'>+{                                                                        \</div><div class='add'>+    (largestat) += ((newstat) - (oldstat));                              \</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define ETHER_EQ_ADDR(_AddrA, _AddrB, _Result)                           \</div><div class='add'>+{                                                                        \</div><div class='add'>+    _Result = TRUE;                                                      \</div><div class='add'>+    if (*(u32 *)(_AddrA) != *(u32 *)(_AddrB))                      \</div><div class='add'>+        _Result = FALSE;                                                 \</div><div class='add'>+    if (*(u16 *)(&amp;((_AddrA)[4])) != *(u16 *)(&amp;((_AddrB)[4])))        \</div><div class='add'>+        _Result = FALSE;                                                 \</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define ETHERMAXFRAME   1514</div><div class='add'>+#define JUMBOMAXFRAME   9014</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_X86_64) || defined(CONFIG_IA64)</div><div class='add'>+#define   SXG_GET_ADDR_LOW(_addr)  (u32)((u64)(_addr) &amp; 0x00000000FFFFFFFF)</div><div class='add'>+#define   SXG_GET_ADDR_HIGH(_addr)  (u32)(((u64)(_addr) &gt;&gt; 32) &amp; 0x00000000FFFFFFFF)</div><div class='add'>+#else</div><div class='add'>+#define   SXG_GET_ADDR_LOW(_addr)   (u32)_addr</div><div class='add'>+#define   SXG_GET_ADDR_HIGH(_addr)  (u32)0</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define FLUSH       TRUE</div><div class='add'>+#define DONT_FLUSH  FALSE</div><div class='add'>+</div><div class='add'>+#define SIOCSLICDUMPCARD         SIOCDEVPRIVATE+9</div><div class='add'>+#define SIOCSLICSETINTAGG        SIOCDEVPRIVATE+10</div><div class='add'>+#define SIOCSLICTRACEDUMP        SIOCDEVPRIVATE+11</div><div class='add'>+</div><div class='add'>+#endif /*  __SXG_DRIVER_H__ */</div><div class='head'>diff --git a/drivers/staging/sxg/sxg_os.h b/drivers/staging/sxg/sxg_os.h<br/>new file mode 100644<br/>index 000000000000..26fb0ffafa5c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/sxg/sxg_os.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/sxg/sxg_os.h</a></div><div class='hunk'>@@ -0,0 +1,154 @@</div><div class='add'>+/**************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2000-2008 Alacritech, Inc.  All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions</div><div class='add'>+ * are met:</div><div class='add'>+ *</div><div class='add'>+ * 1. Redistributions of source code must retain the above copyright</div><div class='add'>+ *    notice, this list of conditions and the following disclaimer.</div><div class='add'>+ * 2. Redistributions in binary form must reproduce the above</div><div class='add'>+ *    copyright notice, this list of conditions and the following</div><div class='add'>+ *    disclaimer in the documentation and/or other materials provided</div><div class='add'>+ *    with the distribution.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY ALACRITECH, INC. ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE</div><div class='add'>+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR</div><div class='add'>+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL ALACRITECH, INC. OR</div><div class='add'>+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,</div><div class='add'>+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT</div><div class='add'>+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF</div><div class='add'>+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,</div><div class='add'>+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT</div><div class='add'>+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF</div><div class='add'>+ * SUCH DAMAGE.</div><div class='add'>+ *</div><div class='add'>+ * The views and conclusions contained in the software and documentation</div><div class='add'>+ * are those of the authors and should not be interpreted as representing</div><div class='add'>+ * official policies, either expressed or implied, of Alacritech, Inc.</div><div class='add'>+ *</div><div class='add'>+ **************************************************************************/</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * FILENAME: sxg_os.h</div><div class='add'>+ *</div><div class='add'>+ * These are the Linux-specific definitions required for the SLICOSS</div><div class='add'>+ * driver, which should allow for greater portability to other OSes.</div><div class='add'>+ */</div><div class='add'>+#ifndef _SLIC_OS_SPECIFIC_H_</div><div class='add'>+#define _SLIC_OS_SPECIFIC_H_</div><div class='add'>+</div><div class='add'>+#define FALSE	(0)</div><div class='add'>+#define TRUE	(1)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+typedef struct _LIST_ENTRY {</div><div class='add'>+	struct _LIST_ENTRY *nle_flink;</div><div class='add'>+	struct _LIST_ENTRY *nle_blink;</div><div class='add'>+} list_entry, LIST_ENTRY, *PLIST_ENTRY;</div><div class='add'>+</div><div class='add'>+#define InitializeListHead(l)                   \</div><div class='add'>+        (l)-&gt;nle_flink = (l)-&gt;nle_blink = (l)</div><div class='add'>+</div><div class='add'>+#define IsListEmpty(h)                          \</div><div class='add'>+        ((h)-&gt;nle_flink == (h))</div><div class='add'>+</div><div class='add'>+#define RemoveEntryList(e)                      \</div><div class='add'>+        do {                                    \</div><div class='add'>+                list_entry              *b;     \</div><div class='add'>+                list_entry              *f;     \</div><div class='add'>+                                                \</div><div class='add'>+                f = (e)-&gt;nle_flink;             \</div><div class='add'>+                b = (e)-&gt;nle_blink;             \</div><div class='add'>+                b-&gt;nle_flink = f;               \</div><div class='add'>+                f-&gt;nle_blink = b;               \</div><div class='add'>+        } while (0)</div><div class='add'>+</div><div class='add'>+/* These two have to be inlined since they return things. */</div><div class='add'>+</div><div class='add'>+static __inline PLIST_ENTRY</div><div class='add'>+RemoveHeadList(list_entry *l)</div><div class='add'>+{</div><div class='add'>+        list_entry              *f;</div><div class='add'>+        list_entry              *e;</div><div class='add'>+</div><div class='add'>+        e = l-&gt;nle_flink;</div><div class='add'>+        f = e-&gt;nle_flink;</div><div class='add'>+        l-&gt;nle_flink = f;</div><div class='add'>+        f-&gt;nle_blink = l;</div><div class='add'>+</div><div class='add'>+        return (e);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __inline PLIST_ENTRY</div><div class='add'>+RemoveTailList(list_entry *l)</div><div class='add'>+{</div><div class='add'>+        list_entry              *b;</div><div class='add'>+        list_entry              *e;</div><div class='add'>+</div><div class='add'>+        e = l-&gt;nle_blink;</div><div class='add'>+        b = e-&gt;nle_blink;</div><div class='add'>+        l-&gt;nle_blink = b;</div><div class='add'>+        b-&gt;nle_flink = l;</div><div class='add'>+</div><div class='add'>+        return (e);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define InsertTailList(l, e)                    \</div><div class='add'>+        do {                                    \</div><div class='add'>+                list_entry              *b;     \</div><div class='add'>+                                                \</div><div class='add'>+                b = (l)-&gt;nle_blink;             \</div><div class='add'>+                (e)-&gt;nle_flink = (l);           \</div><div class='add'>+                (e)-&gt;nle_blink = b;             \</div><div class='add'>+                b-&gt;nle_flink = (e);             \</div><div class='add'>+                (l)-&gt;nle_blink = (e);           \</div><div class='add'>+        } while (0)</div><div class='add'>+</div><div class='add'>+#define InsertHeadList(l, e)                    \</div><div class='add'>+        do {                                    \</div><div class='add'>+                list_entry              *f;     \</div><div class='add'>+                                                \</div><div class='add'>+                f = (l)-&gt;nle_flink;             \</div><div class='add'>+                (e)-&gt;nle_flink = f;             \</div><div class='add'>+                (e)-&gt;nle_blink = l;             \</div><div class='add'>+                f-&gt;nle_blink = (e);             \</div><div class='add'>+                (l)-&gt;nle_flink = (e);           \</div><div class='add'>+        } while (0)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define ATK_DEBUG  1</div><div class='add'>+</div><div class='add'>+#if ATK_DEBUG</div><div class='add'>+#define SLIC_TIMESTAMP(value) {                                             \</div><div class='add'>+        struct timeval  timev;                                              \</div><div class='add'>+        do_gettimeofday(&amp;timev);                                            \</div><div class='add'>+        value = timev.tv_sec*1000000 + timev.tv_usec;                       \</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+#define SLIC_TIMESTAMP(value)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/******************  SXG DEFINES  *****************************************/</div><div class='add'>+</div><div class='add'>+#ifdef  ATKDBG</div><div class='add'>+#define SXG_TIMESTAMP(value) {                                             \</div><div class='add'>+        struct timeval  timev;                                              \</div><div class='add'>+        do_gettimeofday(&amp;timev);                                            \</div><div class='add'>+        value = timev.tv_sec*1000000 + timev.tv_usec;                       \</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+#define SXG_TIMESTAMP(value)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define WRITE_REG(reg,value,flush)                  sxg_reg32_write((&amp;reg), (value), (flush))</div><div class='add'>+#define WRITE_REG64(a,reg,value,cpu)                sxg_reg64_write((a),(&amp;reg),(value),(cpu))</div><div class='add'>+#define READ_REG(reg,value)   (value) = readl((void __iomem *)(&amp;reg))</div><div class='add'>+</div><div class='add'>+#endif  /* _SLIC_OS_SPECIFIC_H_  */</div><div class='add'>+</div><div class='head'>diff --git a/drivers/staging/sxg/sxgdbg.h b/drivers/staging/sxg/sxgdbg.h<br/>new file mode 100644<br/>index 000000000000..cfb6c7c77a9e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/sxg/sxgdbg.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/sxg/sxgdbg.h</a></div><div class='hunk'>@@ -0,0 +1,190 @@</div><div class='add'>+/**************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * Copyright © 2000-2008 Alacritech, Inc.  All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * $Id: sxgdbg.h,v 1.1 2008/06/27 12:49:28 mook Exp $</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions</div><div class='add'>+ * are met:</div><div class='add'>+ *</div><div class='add'>+ * 1. Redistributions of source code must retain the above copyright</div><div class='add'>+ *    notice, this list of conditions and the following disclaimer.</div><div class='add'>+ * 2. Redistributions in binary form must reproduce the above</div><div class='add'>+ *    copyright notice, this list of conditions and the following</div><div class='add'>+ *    disclaimer in the documentation and/or other materials provided</div><div class='add'>+ *    with the distribution.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY ALACRITECH, INC. ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE</div><div class='add'>+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR</div><div class='add'>+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL ALACRITECH, INC. OR</div><div class='add'>+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,</div><div class='add'>+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT</div><div class='add'>+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF</div><div class='add'>+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,</div><div class='add'>+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT</div><div class='add'>+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF</div><div class='add'>+ * SUCH DAMAGE.</div><div class='add'>+ *</div><div class='add'>+ * The views and conclusions contained in the software and documentation</div><div class='add'>+ * are those of the authors and should not be interpreted as representing</div><div class='add'>+ * official policies, either expressed or implied, of Alacritech, Inc.</div><div class='add'>+ *</div><div class='add'>+ **************************************************************************/</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * FILENAME: sxgdbg.h</div><div class='add'>+ *</div><div class='add'>+ * All debug and assertion-based definitions and macros are included</div><div class='add'>+ * in this file for the SXGOSS driver.</div><div class='add'>+ */</div><div class='add'>+#ifndef _SXG_DEBUG_H_</div><div class='add'>+#define _SXG_DEBUG_H_</div><div class='add'>+</div><div class='add'>+#define ATKDBG  1</div><div class='add'>+#define ATK_TRACE_ENABLED 1</div><div class='add'>+</div><div class='add'>+#define DBG_ERROR(n, args...)	printk(KERN_EMERG n, ##args)</div><div class='add'>+</div><div class='add'>+#ifdef ASSERT</div><div class='add'>+#undef ASSERT</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef SXG_ASSERT_ENABLED</div><div class='add'>+#ifndef ASSERT</div><div class='add'>+#define ASSERT(a)                                                                 \</div><div class='add'>+    {                                                                             \</div><div class='add'>+        if (!(a)) {                                                               \</div><div class='add'>+            DBG_ERROR("ASSERT() Failure: file %s, function %s  line %d\n",\</div><div class='add'>+                __FILE__, __FUNCTION__, __LINE__);                                \</div><div class='add'>+        }                                                                         \</div><div class='add'>+    }</div><div class='add'>+#endif</div><div class='add'>+#else</div><div class='add'>+#ifndef ASSERT</div><div class='add'>+#define ASSERT(a)</div><div class='add'>+#endif</div><div class='add'>+#endif /* SXG_ASSERT_ENABLED  */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#ifdef ATKDBG</div><div class='add'>+/*</div><div class='add'>+ *  Global for timer granularity; every driver must have an instance</div><div class='add'>+ *  of this initialized to 0</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+extern ulong ATKTimerDiv;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * trace_entry_t -</div><div class='add'>+ *</div><div class='add'>+ * This structure defines an entry in the trace buffer.  The</div><div class='add'>+ * first few fields mean the same from entry to entry, while</div><div class='add'>+ * the meaning of last several fields change to suit the</div><div class='add'>+ * needs of the trace entry.  Typically they are function call</div><div class='add'>+ * parameters.</div><div class='add'>+ */</div><div class='add'>+typedef struct _trace_entry_s {</div><div class='add'>+        char      name[8];        /* 8 character name - like 's'i'm'b'a'r'c'v' */</div><div class='add'>+        u32   time;           /* Current clock tic */</div><div class='add'>+        unsigned char     cpu;            /* Current CPU */</div><div class='add'>+        unsigned char     irql;           /* Current IRQL */</div><div class='add'>+        unsigned char     driver;         /* The driver which added the trace call */</div><div class='add'>+        unsigned char     pad2;           /* pad to 4 byte boundary - will probably get used */</div><div class='add'>+        u32   arg1;           /* Caller arg1 */</div><div class='add'>+        u32   arg2;           /* Caller arg2 */</div><div class='add'>+        u32   arg3;           /* Caller arg3 */</div><div class='add'>+        u32   arg4;           /* Caller arg4 */</div><div class='add'>+} trace_entry_t, *ptrace_entry_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Driver types for driver field in trace_entry_t</div><div class='add'>+ */</div><div class='add'>+#define TRACE_SXG             1</div><div class='add'>+#define TRACE_VPCI            2</div><div class='add'>+#define TRACE_SLIC            3</div><div class='add'>+</div><div class='add'>+#define TRACE_ENTRIES   1024</div><div class='add'>+</div><div class='add'>+typedef struct _sxg_trace_buffer_t</div><div class='add'>+{</div><div class='add'>+        unsigned int                    size;                  /* aid for windbg extension */</div><div class='add'>+        unsigned int                    in;                    /* Where to add */</div><div class='add'>+        unsigned int                    level;                 /* Current Trace level */</div><div class='add'>+	spinlock_t	lock;                  /* For MP tracing */</div><div class='add'>+        trace_entry_t           entries[TRACE_ENTRIES];/* The circular buffer */</div><div class='add'>+} sxg_trace_buffer_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The trace levels</div><div class='add'>+ *</div><div class='add'>+ * XXX At the moment I am only defining critical, important, and noisy.</div><div class='add'>+ * I am leaving room for more if anyone wants them.</div><div class='add'>+ */</div><div class='add'>+#define TRACE_NONE              0   /* For trace level - if no tracing wanted */</div><div class='add'>+#define TRACE_CRITICAL          1   /* minimal tracing - only critical stuff */</div><div class='add'>+#define TRACE_IMPORTANT         5   /* more tracing - anything important */</div><div class='add'>+#define TRACE_NOISY             10  /* Everything in the world */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/**********************************************************************</div><div class='add'>+ *</div><div class='add'>+ * The macros themselves -</div><div class='add'>+ *</div><div class='add'>+ *********************************************************************/</div><div class='add'>+#if ATK_TRACE_ENABLED</div><div class='add'>+#define SXG_TRACE_INIT(buffer, tlevel)				\</div><div class='add'>+{								\</div><div class='add'>+	memset((buffer), 0, sizeof(sxg_trace_buffer_t));	\</div><div class='add'>+	(buffer)-&gt;level = (tlevel);				\</div><div class='add'>+	(buffer)-&gt;size = TRACE_ENTRIES;				\</div><div class='add'>+	spin_lock_init(&amp;(buffer)-&gt;lock);			\</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+#define SXG_TRACE_INIT(buffer, tlevel)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The trace macro.  This is active only if ATK_TRACE_ENABLED is set.</div><div class='add'>+ */</div><div class='add'>+#if ATK_TRACE_ENABLED</div><div class='add'>+#define SXG_TRACE(tdriver, buffer, tlevel, tname, a1, a2, a3, a4) {        \</div><div class='add'>+        if ((buffer) &amp;&amp; ((buffer)-&gt;level &gt;= (tlevel))) {                      \</div><div class='add'>+                unsigned int            trace_irql = 0;    /* ?????? FIX THIS  */    \</div><div class='add'>+                unsigned int            trace_len;                                   \</div><div class='add'>+                ptrace_entry_t  trace_entry;                                 \</div><div class='add'>+                struct timeval  timev;                                       \</div><div class='add'>+                                                                             \</div><div class='add'>+                spin_lock(&amp;(buffer)-&gt;lock);                       \</div><div class='add'>+                trace_entry = &amp;(buffer)-&gt;entries[(buffer)-&gt;in];              \</div><div class='add'>+                do_gettimeofday(&amp;timev);                                     \</div><div class='add'>+                                                                             \</div><div class='add'>+                memset(trace_entry-&gt;name, 0, 8);                             \</div><div class='add'>+                trace_len = strlen(tname);                                   \</div><div class='add'>+                trace_len = trace_len &gt; 8 ? 8 : trace_len;                   \</div><div class='add'>+                memcpy(trace_entry-&gt;name, (tname), trace_len);               \</div><div class='add'>+                trace_entry-&gt;time = timev.tv_usec;                           \</div><div class='add'>+                trace_entry-&gt;cpu = (unsigned char)(smp_processor_id() &amp; 0xFF);       \</div><div class='add'>+                trace_entry-&gt;driver = (tdriver);                             \</div><div class='add'>+                trace_entry-&gt;irql = trace_irql;                              \</div><div class='add'>+                trace_entry-&gt;arg1 = (ulong)(a1);                             \</div><div class='add'>+                trace_entry-&gt;arg2 = (ulong)(a2);                             \</div><div class='add'>+                trace_entry-&gt;arg3 = (ulong)(a3);                             \</div><div class='add'>+                trace_entry-&gt;arg4 = (ulong)(a4);                             \</div><div class='add'>+                                                                             \</div><div class='add'>+                (buffer)-&gt;in++;                                              \</div><div class='add'>+                if ((buffer)-&gt;in == TRACE_ENTRIES)                           \</div><div class='add'>+                        (buffer)-&gt;in = 0;                                    \</div><div class='add'>+                                                                             \</div><div class='add'>+                spin_unlock(&amp;(buffer)-&gt;lock);                       \</div><div class='add'>+        }                                                                    \</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+#define SXG_TRACE(tdriver, buffer, tlevel, tname, a1, a2, a3, a4)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif  /*  _SXG_DEBUG_H_  */</div><div class='head'>diff --git a/drivers/staging/sxg/sxghif.h b/drivers/staging/sxg/sxghif.h<br/>new file mode 100644<br/>index 000000000000..ed26ceaa1315<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/sxg/sxghif.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/sxg/sxghif.h</a></div><div class='hunk'>@@ -0,0 +1,861 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright © 1997-2007 Alacritech, Inc. All rights reserved</div><div class='add'>+ *</div><div class='add'>+ * $Id: sxghif.h,v 1.5 2008/07/24 19:18:22 chris Exp $</div><div class='add'>+ *</div><div class='add'>+ * sxghif.h:</div><div class='add'>+ *</div><div class='add'>+ * This file contains structures and definitions for the</div><div class='add'>+ * Alacritech Sahara host interface</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*******************************************************************************</div><div class='add'>+ * UCODE Registers</div><div class='add'>+ *******************************************************************************/</div><div class='add'>+typedef struct _SXG_UCODE_REGS {</div><div class='add'>+	// Address 0 - 0x3F = Command codes 0-15 for TCB 0.  Excode 0</div><div class='add'>+	u32		Icr;			// Code = 0 (extended), ExCode = 0 - Int control</div><div class='add'>+	u32		RsvdReg1;		// Code = 1 - TOE -NA</div><div class='add'>+	u32		RsvdReg2;		// Code = 2 - TOE -NA</div><div class='add'>+	u32		RsvdReg3;		// Code = 3 - TOE -NA</div><div class='add'>+	u32		RsvdReg4;		// Code = 4 - TOE -NA</div><div class='add'>+	u32		RsvdReg5;		// Code = 5 - TOE -NA</div><div class='add'>+	u32		CardUp;			// Code = 6 - Microcode initialized when 1</div><div class='add'>+	u32		RsvdReg7;		// Code = 7 - TOE -NA</div><div class='add'>+	u32		CodeNotUsed[8];		// Codes 8-15 not used.  ExCode = 0</div><div class='add'>+	// This brings us to ExCode 1 at address 0x40 = Interrupt status pointer</div><div class='add'>+	u32		Isp;			// Code = 0 (extended), ExCode = 1</div><div class='add'>+	u32		PadEx1[15];		// Codes 1-15 not used with extended codes</div><div class='add'>+	// ExCode 2 = Interrupt Status Register</div><div class='add'>+	u32		Isr;			// Code = 0 (extended), ExCode = 2</div><div class='add'>+	u32		PadEx2[15];</div><div class='add'>+	// ExCode 3 = Event base register.  Location of event rings</div><div class='add'>+	u32		EventBase;		// Code = 0 (extended), ExCode = 3</div><div class='add'>+	u32		PadEx3[15];</div><div class='add'>+	// ExCode 4 = Event ring size</div><div class='add'>+	u32		EventSize;		// Code = 0 (extended), ExCode = 4</div><div class='add'>+	u32		PadEx4[15];</div><div class='add'>+	// ExCode 5 = TCB Buffers base address</div><div class='add'>+	u32		TcbBase;		// Code = 0 (extended), ExCode = 5</div><div class='add'>+	u32		PadEx5[15];</div><div class='add'>+	// ExCode 6 = TCB Composite Buffers base address</div><div class='add'>+	u32		TcbCompBase;		// Code = 0 (extended), ExCode = 6</div><div class='add'>+	u32		PadEx6[15];</div><div class='add'>+	// ExCode 7 = Transmit ring base address</div><div class='add'>+	u32		XmtBase;		// Code = 0 (extended), ExCode = 7</div><div class='add'>+	u32		PadEx7[15];</div><div class='add'>+	// ExCode 8 = Transmit ring size</div><div class='add'>+	u32		XmtSize;		// Code = 0 (extended), ExCode = 8</div><div class='add'>+	u32		PadEx8[15];</div><div class='add'>+	// ExCode 9 = Receive ring base address</div><div class='add'>+	u32		RcvBase;		// Code = 0 (extended), ExCode = 9</div><div class='add'>+	u32		PadEx9[15];</div><div class='add'>+	// ExCode 10 = Receive ring size</div><div class='add'>+	u32		RcvSize;		// Code = 0 (extended), ExCode = 10</div><div class='add'>+	u32		PadEx10[15];</div><div class='add'>+	// ExCode 11 = Read EEPROM Config</div><div class='add'>+	u32		Config;			// Code = 0 (extended), ExCode = 11</div><div class='add'>+	u32		PadEx11[15];</div><div class='add'>+	// ExCode 12 = Multicast bits 31:0</div><div class='add'>+	u32		McastLow;		// Code = 0 (extended), ExCode = 12</div><div class='add'>+	u32		PadEx12[15];</div><div class='add'>+	// ExCode 13 = Multicast bits 63:32</div><div class='add'>+	u32		McastHigh;		// Code = 0 (extended), ExCode = 13</div><div class='add'>+	u32		PadEx13[15];</div><div class='add'>+	// ExCode 14 = Ping</div><div class='add'>+	u32		Ping;			// Code = 0 (extended), ExCode = 14</div><div class='add'>+	u32		PadEx14[15];</div><div class='add'>+	// ExCode 15 = Link MTU</div><div class='add'>+	u32		LinkMtu;		// Code = 0 (extended), ExCode = 15</div><div class='add'>+	u32		PadEx15[15];</div><div class='add'>+	// ExCode 16 = Download synchronization</div><div class='add'>+	u32		LoadSync;		// Code = 0 (extended), ExCode = 16</div><div class='add'>+	u32		PadEx16[15];</div><div class='add'>+	// ExCode 17 = Upper DRAM address bits on 32-bit systems</div><div class='add'>+	u32		Upper;			// Code = 0 (extended), ExCode = 17</div><div class='add'>+	u32		PadEx17[15];</div><div class='add'>+	// ExCode 18 = Slowpath Send Index Address</div><div class='add'>+	u32		SPSendIndex;		// Code = 0 (extended), ExCode = 18</div><div class='add'>+	u32		PadEx18[15];</div><div class='add'>+	u32		RsvdXF;			// Code = 0 (extended), ExCode = 19</div><div class='add'>+	u32		PadEx19[15];</div><div class='add'>+	// ExCode 20 = Aggregation</div><div class='add'>+	u32		Aggregation;		// Code = 0 (extended), ExCode = 20</div><div class='add'>+	u32		PadEx20[15];</div><div class='add'>+	// ExCode 21 = Receive MDL push timer</div><div class='add'>+	u32		PushTicks;		// Code = 0 (extended), ExCode = 21</div><div class='add'>+	u32		PadEx21[15];</div><div class='add'>+	// ExCode 22 = TOE NA</div><div class='add'>+	u32		AckFrequency;		// Code = 0 (extended), ExCode = 22</div><div class='add'>+	u32		PadEx22[15];</div><div class='add'>+	// ExCode 23 = TOE NA</div><div class='add'>+	u32		RsvdReg23;</div><div class='add'>+	u32		PadEx23[15];</div><div class='add'>+	// ExCode 24 = TOE NA</div><div class='add'>+	u32		RsvdReg24;</div><div class='add'>+	u32		PadEx24[15];</div><div class='add'>+	// ExCode 25 = TOE NA</div><div class='add'>+	u32		RsvdReg25;		// Code = 0 (extended), ExCode = 25</div><div class='add'>+	u32		PadEx25[15];</div><div class='add'>+	// ExCode 26 = Receive checksum requirements</div><div class='add'>+	u32		ReceiveChecksum;	// Code = 0 (extended), ExCode = 26</div><div class='add'>+	u32		PadEx26[15];</div><div class='add'>+	// ExCode 27 = RSS Requirements</div><div class='add'>+	u32		Rss;			// Code = 0 (extended), ExCode = 27</div><div class='add'>+	u32		PadEx27[15];</div><div class='add'>+	// ExCode 28 = RSS Table</div><div class='add'>+	u32		RssTable;		// Code = 0 (extended), ExCode = 28</div><div class='add'>+	u32		PadEx28[15];</div><div class='add'>+	// ExCode 29 = Event ring release entries</div><div class='add'>+	u32		EventRelease;		// Code = 0 (extended), ExCode = 29</div><div class='add'>+	u32		PadEx29[15];</div><div class='add'>+	// ExCode 30 = Number of receive bufferlist commands on ring 0</div><div class='add'>+	u32		RcvCmd;			// Code = 0 (extended), ExCode = 30</div><div class='add'>+	u32		PadEx30[15];</div><div class='add'>+	// ExCode 31 = slowpath transmit command - Data[31:0] = 1</div><div class='add'>+	u32		XmtCmd;			// Code = 0 (extended), ExCode = 31</div><div class='add'>+	u32		PadEx31[15];</div><div class='add'>+	// ExCode 32 = Dump command</div><div class='add'>+	u32		DumpCmd;		// Code = 0 (extended), ExCode = 32</div><div class='add'>+	u32		PadEx32[15];</div><div class='add'>+	// ExCode 33 = Debug command</div><div class='add'>+	u32		DebugCmd;		// Code = 0 (extended), ExCode = 33</div><div class='add'>+	u32		PadEx33[15];</div><div class='add'>+	// There are 128 possible extended commands - each of account for 16</div><div class='add'>+	// words (including the non-relevent base command codes 1-15).</div><div class='add'>+	// Pad for the remainder of these here to bring us to the next CPU</div><div class='add'>+	// base.  As extended codes are added, reduce the first array value in</div><div class='add'>+	// the following field</div><div class='add'>+	u32		PadToNextCpu[94][16];	// 94 = 128 - 34 (34 = Excodes 0 - 33)</div><div class='add'>+} SXG_UCODE_REGS, *PSXG_UCODE_REGS;</div><div class='add'>+</div><div class='add'>+// Interrupt control register (0) values</div><div class='add'>+#define SXG_ICR_DISABLE					0x00000000</div><div class='add'>+#define SXG_ICR_ENABLE					0x00000001</div><div class='add'>+#define SXG_ICR_MASK					0x00000002</div><div class='add'>+#define SXG_ICR_MSGID_MASK				0xFFFF0000</div><div class='add'>+#define SXG_ICR_MSGID_SHIFT			16</div><div class='add'>+#define SXG_ICR(_MessageId, _Data)	\</div><div class='add'>+	((((_MessageId) &lt;&lt; SXG_ICR_MSGID_SHIFT) &amp;	\</div><div class='add'>+	  SXG_ICR_MSGID_MASK) | (_Data))</div><div class='add'>+</div><div class='add'>+// The Microcode supports up to 16 RSS queues</div><div class='add'>+#define SXG_MAX_RSS				16</div><div class='add'>+#define SXG_MAX_RSS_TABLE_SIZE	256		// 256-byte max</div><div class='add'>+</div><div class='add'>+#define SXG_RSS_TCP6				0x00000001	// RSS TCP over IPv6</div><div class='add'>+#define SXG_RSS_TCP4				0x00000002	// RSS TCP over IPv4</div><div class='add'>+#define SXG_RSS_LEGACY				0x00000004	// Line-base interrupts</div><div class='add'>+#define SXG_RSS_TABLE_SIZE			0x0000FF00	// Table size mask</div><div class='add'>+#define SXG_RSS_TABLE_SHIFT			8</div><div class='add'>+#define	SXG_RSS_BASE_CPU			0x00FF0000	// Base CPU (not used)</div><div class='add'>+#define SXG_RSS_BASE_SHIFT			16</div><div class='add'>+</div><div class='add'>+#define SXG_RCV_IP_CSUM_ENABLED		0x00000001	// ExCode 26 (ReceiveChecksum)</div><div class='add'>+#define SXG_RCV_TCP_CSUM_ENABLED	0x00000002	// ExCode 26 (ReceiveChecksum)</div><div class='add'>+</div><div class='add'>+#define SXG_XMT_CPUID_SHIFT			16</div><div class='add'>+</div><div class='add'>+#if VPCI</div><div class='add'>+#define SXG_CHECK_FOR_HANG_TIME		3000</div><div class='add'>+#else</div><div class='add'>+#define SXG_CHECK_FOR_HANG_TIME		5</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * TCB registers - This is really the same register memory area as UCODE_REGS</div><div class='add'>+ * above, but defined differently.  Bits 17:06 of the address define the TCB,</div><div class='add'>+ * which means each TCB area occupies 0x40 (64) bytes, or 16 u32S.  What really</div><div class='add'>+ * is happening is that these registers occupy the "PadEx[15]" areas in the</div><div class='add'>+ * SXG_UCODE_REGS definition above</div><div class='add'>+ */</div><div class='add'>+typedef struct _SXG_TCB_REGS {</div><div class='add'>+	u32		ExCode;		/* Extended codes - see SXG_UCODE_REGS */</div><div class='add'>+	u32		Xmt;		/* Code = 1 - # of Xmt descriptors added to ring */</div><div class='add'>+	u32		Rcv;		/* Code = 2 - # of Rcv descriptors added to ring */</div><div class='add'>+	u32		Rsvd1;		/* Code = 3 - TOE NA */</div><div class='add'>+	u32		Rsvd2;		/* Code = 4 - TOE NA */</div><div class='add'>+	u32		Rsvd3;		/* Code = 5 - TOE NA */</div><div class='add'>+	u32		Invalid;	/* Code = 6 - Reserved for "CardUp" see above */</div><div class='add'>+	u32		Rsvd4;		/* Code = 7 - TOE NA */</div><div class='add'>+	u32		Rsvd5;		/* Code = 8 - TOE NA */</div><div class='add'>+	u32		Pad[7];		/* Codes 8-15 - Not used. */</div><div class='add'>+} SXG_TCB_REGS, *PSXG_TCB_REGS;</div><div class='add'>+</div><div class='add'>+/***************************************************************************</div><div class='add'>+ * ISR Format</div><div class='add'>+ *                31                                      0</div><div class='add'>+ *                 _______________________________________</div><div class='add'>+ *                |    |    |    |    |    |    |    |    |</div><div class='add'>+ *                |____|____|____|____|____|____|____|____|</div><div class='add'>+ *                 ^^^^ ^^^^ ^^^^ ^^^^ \                 /</div><div class='add'>+ *           ERR --|||| |||| |||| ||||  -----------------</div><div class='add'>+ *         EVENT ---||| |||| |||| ||||          |</div><div class='add'>+ *               ----|| |||| |||| ||||          |-- Crash Address</div><div class='add'>+ *           UPC -----| |||| |||| ||||</div><div class='add'>+ *        LEVENT -------|||| |||| ||||</div><div class='add'>+ *          PDQF --------||| |||| ||||</div><div class='add'>+ *         RMISS ---------|| |||| ||||</div><div class='add'>+ *         BREAK ----------| |||| ||||</div><div class='add'>+ *       HBEATOK ------------|||| ||||</div><div class='add'>+ *       NOHBEAT -------------||| ||||</div><div class='add'>+ *        ERFULL --------------|| ||||</div><div class='add'>+ *         XDROP ---------------| ||||</div><div class='add'>+ *               -----------------||||</div><div class='add'>+ *               -----------------||||--\</div><div class='add'>+ *                                 ||---|-CpuId of crash</div><div class='add'>+ *                                 |----/</div><div class='add'>+ ***************************************************************************/</div><div class='add'>+#define SXG_ISR_ERR		0x80000000	// Error</div><div class='add'>+#define SXG_ISR_EVENT		0x40000000	// Event ring event</div><div class='add'>+#define SXG_ISR_NONE1		0x20000000	// Not used</div><div class='add'>+#define SXG_ISR_UPC		0x10000000	// Dump/debug command complete</div><div class='add'>+#define SXG_ISR_LINK		0x08000000	// Link event</div><div class='add'>+#define SXG_ISR_PDQF		0x04000000	// Processed data queue full</div><div class='add'>+#define SXG_ISR_RMISS		0x02000000	// Drop - no host buf</div><div class='add'>+#define SXG_ISR_BREAK		0x01000000	// Breakpoint hit</div><div class='add'>+#define SXG_ISR_PING		0x00800000	// Heartbeat response</div><div class='add'>+#define SXG_ISR_DEAD		0x00400000	// Card crash</div><div class='add'>+#define SXG_ISR_ERFULL		0x00200000	// Event ring full</div><div class='add'>+#define SXG_ISR_XDROP		0x00100000	// XMT Drop - no DRAM bufs or XMT err</div><div class='add'>+#define SXG_ISR_SPSEND		0x00080000	// Slow send complete</div><div class='add'>+#define SXG_ISR_CPU		0x00070000	// Dead CPU mask</div><div class='add'>+#define SXG_ISR_CPU_SHIFT		16	// Dead CPU shift</div><div class='add'>+#define SXG_ISR_CRASH		0x0000FFFF	// Crash address mask</div><div class='add'>+</div><div class='add'>+/***************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * Event Ring entry</div><div class='add'>+ *</div><div class='add'>+ ***************************************************************************/</div><div class='add'>+/*</div><div class='add'>+ *  31                  15                 0</div><div class='add'>+ *  .___________________.___________________.</div><div class='add'>+ *  |&lt;------------    Pad 0    ------------&gt;|</div><div class='add'>+ *  |_________|_________|_________|_________|0		0x00</div><div class='add'>+ *  |&lt;------------    Pad 1    ------------&gt;|</div><div class='add'>+ *  |_________|_________|_________|_________|4		0x04</div><div class='add'>+ *  |&lt;------------    Pad 2    ------------&gt;|</div><div class='add'>+ *  |_________|_________|_________|_________|8 		0x08</div><div class='add'>+ *  |&lt;----------- Event Word 0 ------------&gt;|</div><div class='add'>+ *  |_________|_________|_________|_________|12		0x0c</div><div class='add'>+ *  |&lt;----------- Event Word 1 ------------&gt;|</div><div class='add'>+ *  |_________|_________|_________|_________|16		0x10</div><div class='add'>+ *  |&lt;------------- Toeplitz   ------------&gt;|</div><div class='add'>+ *  |_________|_________|_________|_________|20		0x14</div><div class='add'>+ *  |&lt;----- Length ----&gt;|&lt;------ TCB Id ---&gt;|</div><div class='add'>+ *  |_________|_________|_________|_________|24		0x18</div><div class='add'>+ *  |&lt;----- Status ----&gt;|Evnt Code|Flsh Code|</div><div class='add'>+ *  |_________|_________|_________|_________|28		0x1c</div><div class='add'>+ *   ^                   ^^^^ ^^^^</div><div class='add'>+ *   |- VALID            |||| ||||- RBUFC</div><div class='add'>+ *                       |||| |||-- SLOWR</div><div class='add'>+ *                       |||| ||--- UNUSED</div><div class='add'>+ *                       |||| |---- FASTC</div><div class='add'>+ *                       ||||------ FASTR</div><div class='add'>+ *                       |||-------</div><div class='add'>+ *                       ||--------</div><div class='add'>+ *                       |---------</div><div class='add'>+ *</div><div class='add'>+ * Slowpath status:</div><div class='add'>+ *   _______________________________________</div><div class='add'>+ *  |&lt;----- Status ----&gt;|Evnt Code|Flsh Code|</div><div class='add'>+ *  |_________|Cmd Index|_________|_________|28		0x1c</div><div class='add'>+ *    ^^^ ^^^^</div><div class='add'>+ *    ||| ||||- ISTCPIP6</div><div class='add'>+ *    ||| |||-- IPONLY</div><div class='add'>+ *    ||| ||--- RCVERR</div><div class='add'>+ *    ||| |---- IPCBAD</div><div class='add'>+ *    |||------ TCPCBAD</div><div class='add'>+ *    ||------- ISTCPIP</div><div class='add'>+ *    |-------- SCERR</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+#pragma pack(push, 1)</div><div class='add'>+typedef struct _SXG_EVENT {</div><div class='add'>+	u32			Pad[1];		// not used</div><div class='add'>+	u32			SndUna;		// SndUna value</div><div class='add'>+	u32			Resid;		// receive MDL resid</div><div class='add'>+	union {</div><div class='add'>+		void *		HostHandle;	// Receive host handle</div><div class='add'>+		u32		Rsvd1;		// TOE NA</div><div class='add'>+		struct {</div><div class='add'>+			u32	NotUsed;</div><div class='add'>+			u32	Rsvd2;		// TOE NA</div><div class='add'>+		} Flush;</div><div class='add'>+	};</div><div class='add'>+	u32			Toeplitz;	// RSS Toeplitz hash</div><div class='add'>+	union {</div><div class='add'>+		ushort		Rsvd3;		// TOE NA</div><div class='add'>+		ushort		HdrOffset;	// Slowpath</div><div class='add'>+	};</div><div class='add'>+	ushort			Length;		//</div><div class='add'>+	unsigned char 		Rsvd4;		// TOE NA</div><div class='add'>+	unsigned char 		Code;		// Event code</div><div class='add'>+	unsigned char		CommandIndex;	// New ring index</div><div class='add'>+	unsigned char		Status;		// Event status</div><div class='add'>+} SXG_EVENT, *PSXG_EVENT;</div><div class='add'>+#pragma pack(pop)</div><div class='add'>+</div><div class='add'>+// Event code definitions</div><div class='add'>+#define EVENT_CODE_BUFFERS	0x01	// Receive buffer list command (ring 0)</div><div class='add'>+#define EVENT_CODE_SLOWRCV	0x02	// Slowpath receive</div><div class='add'>+#define EVENT_CODE_UNUSED	0x04	// Was slowpath commands complete</div><div class='add'>+</div><div class='add'>+// Status values</div><div class='add'>+#define EVENT_STATUS_VALID	0x80	// Entry valid</div><div class='add'>+</div><div class='add'>+// Slowpath status</div><div class='add'>+#define EVENT_STATUS_ERROR	0x40	// Completed with error. Index in next byte</div><div class='add'>+#define EVENT_STATUS_TCPIP4	0x20	// TCPIPv4 frame</div><div class='add'>+#define EVENT_STATUS_TCPBAD	0x10	// Bad TCP checksum</div><div class='add'>+#define EVENT_STATUS_IPBAD	0x08	// Bad IP checksum</div><div class='add'>+#define EVENT_STATUS_RCVERR	0x04	// Slowpath receive error</div><div class='add'>+#define EVENT_STATUS_IPONLY	0x02	// IP frame</div><div class='add'>+#define EVENT_STATUS_TCPIP6	0x01	// TCPIPv6 frame</div><div class='add'>+#define EVENT_STATUS_TCPIP	0x21	// Combination of v4 and v6</div><div class='add'>+</div><div class='add'>+// Event ring</div><div class='add'>+// Size must be power of 2, between 128 and 16k</div><div class='add'>+#define EVENT_RING_SIZE		4096	// ??</div><div class='add'>+#define EVENT_RING_BATCH	16		// Hand entries back 16 at a time.</div><div class='add'>+#define EVENT_BATCH_LIMIT	256	    // Stop processing events after 256 (16 * 16)</div><div class='add'>+</div><div class='add'>+typedef struct _SXG_EVENT_RING {</div><div class='add'>+	SXG_EVENT	Ring[EVENT_RING_SIZE];</div><div class='add'>+}SXG_EVENT_RING, *PSXG_EVENT_RING;</div><div class='add'>+</div><div class='add'>+/***************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * TCB Buffers</div><div class='add'>+ *</div><div class='add'>+ ***************************************************************************/</div><div class='add'>+// Maximum number of TCBS supported by hardware/microcode</div><div class='add'>+#define SXG_MAX_TCB		4096</div><div class='add'>+// Minimum TCBs before we fail initialization</div><div class='add'>+#define SXG_MIN_TCB		512</div><div class='add'>+// TCB Hash</div><div class='add'>+// The bucket is determined by bits 11:4 of the toeplitz if we support 4k</div><div class='add'>+// offloaded connections, 10:4 if we support 2k and so on.</div><div class='add'>+#define SXG_TCB_BUCKET_SHIFT	4</div><div class='add'>+#define SXG_TCB_PER_BUCKET		16</div><div class='add'>+#define SXG_TCB_BUCKET_MASK		0xFF0	// Bucket portion of TCB ID</div><div class='add'>+#define SXG_TCB_ELEMENT_MASK	0x00F	// Element within bucket</div><div class='add'>+#define SXG_TCB_BUCKETS			256		// 256 * 16 = 4k</div><div class='add'>+</div><div class='add'>+#define SXG_TCB_BUFFER_SIZE	512	// ASSERT format is correct</div><div class='add'>+</div><div class='add'>+#define SXG_TCB_RCVQ_SIZE		736</div><div class='add'>+</div><div class='add'>+#define SXG_TCB_COMPOSITE_BUFFER_SIZE	1024</div><div class='add'>+</div><div class='add'>+#define SXG_LOCATE_TCP_FRAME_HDR(_TcpObject, _IPv6)							\</div><div class='add'>+	(((_TcpObject)-&gt;VlanId) ?												\</div><div class='add'>+	 ((_IPv6) ?		/* Vlan frame header = yes */							\</div><div class='add'>+	  &amp;(_TcpObject)-&gt;CompBuffer-&gt;Frame.HasVlan.TcpIp6.SxgTcp			:	\</div><div class='add'>+	  &amp;(_TcpObject)-&gt;CompBuffer-&gt;Frame.HasVlan.TcpIp.SxgTcp)			: 	\</div><div class='add'>+	 ((_IPv6) ?		/* Vlan frame header = No */							\</div><div class='add'>+	  &amp;(_TcpObject)-&gt;CompBuffer-&gt;Frame.NoVlan.TcpIp6.SxgTcp				: 	\</div><div class='add'>+	  &amp;(_TcpObject)-&gt;CompBuffer-&gt;Frame.NoVlan.TcpIp.SxgTcp))</div><div class='add'>+</div><div class='add'>+#define SXG_LOCATE_IP_FRAME_HDR(_TcpObject)									\</div><div class='add'>+	(_TcpObject)-&gt;VlanId ?													\</div><div class='add'>+	&amp;(_TcpObject)-&gt;CompBuffer-&gt;Frame.HasVlan.TcpIp.Ip				: 		\</div><div class='add'>+	&amp;(_TcpObject)-&gt;CompBuffer-&gt;Frame.NoVlan.TcpIp.Ip</div><div class='add'>+</div><div class='add'>+#define SXG_LOCATE_IP6_FRAME_HDR(_TcpObject)								\</div><div class='add'>+	(_TcpObject)-&gt;VlanId ?													\</div><div class='add'>+	&amp;(_TcpObject)-&gt;CompBuffer-&gt;Frame.HasVlan.TcpIp6.Ip				:		\</div><div class='add'>+	&amp;(_TcpObject)-&gt;CompBuffer-&gt;Frame.NoVlan.TcpIp6.Ip</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#if DBG</div><div class='add'>+// Horrible kludge to distinguish dumb-nic, slowpath, and</div><div class='add'>+// fastpath traffic.  Decrement the HopLimit by one</div><div class='add'>+// for slowpath, two for fastpath.  This assumes the limit is measurably</div><div class='add'>+// greater than two, which I think is reasonable.</div><div class='add'>+// Obviously this is DBG only.  Maybe remove later, or #if 0 so we</div><div class='add'>+// can set it when needed</div><div class='add'>+#define SXG_DBG_HOP_LIMIT(_TcpObject, _FastPath) {								\</div><div class='add'>+	PIPV6_HDR		_Ip6FrameHdr;												\</div><div class='add'>+	if((_TcpObject)-&gt;IPv6) {													\</div><div class='add'>+		_Ip6FrameHdr = SXG_LOCATE_IP6_FRAME_HDR((_TcpObject));					\</div><div class='add'>+		if(_FastPath) {															\</div><div class='add'>+			_Ip6FrameHdr-&gt;HopLimit = (_TcpObject)-&gt;Cached.TtlOrHopLimit - 2;	\</div><div class='add'>+		} else {																\</div><div class='add'>+			_Ip6FrameHdr-&gt;HopLimit = (_TcpObject)-&gt;Cached.TtlOrHopLimit - 1;	\</div><div class='add'>+		}																		\</div><div class='add'>+	}																			\</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+// Do nothing with free build</div><div class='add'>+#define SXG_DBG_HOP_LIMIT(_TcpObject, _FastPath)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/***************************************************************************</div><div class='add'>+ * Receive and transmit rings</div><div class='add'>+ ***************************************************************************/</div><div class='add'>+#define SXG_MAX_RING_SIZE	256</div><div class='add'>+#define SXG_XMT_RING_SIZE	128		// Start with 128</div><div class='add'>+#define SXG_RCV_RING_SIZE	128		// Start with 128</div><div class='add'>+#define SXG_MAX_ENTRIES     4096</div><div class='add'>+</div><div class='add'>+// Structure and macros to manage a ring</div><div class='add'>+typedef struct _SXG_RING_INFO {</div><div class='add'>+	unsigned char			Head;		// Where we add entries - Note unsigned char:RING_SIZE</div><div class='add'>+	unsigned char			Tail;		// Where we pull off completed entries</div><div class='add'>+	ushort			Size;		// Ring size - Must be multiple of 2</div><div class='add'>+	void *			Context[SXG_MAX_RING_SIZE];	// Shadow ring</div><div class='add'>+} SXG_RING_INFO, *PSXG_RING_INFO;</div><div class='add'>+</div><div class='add'>+#define SXG_INITIALIZE_RING(_ring, _size) {							\</div><div class='add'>+	(_ring).Head = 0;												\</div><div class='add'>+	(_ring).Tail = 0;												\</div><div class='add'>+	(_ring).Size = (_size);											\</div><div class='add'>+}</div><div class='add'>+#define SXG_ADVANCE_INDEX(_index, _size) ((_index) = ((_index) + 1) &amp; ((_size) - 1))</div><div class='add'>+#define SXG_PREVIOUS_INDEX(_index, _size) (((_index) - 1) &amp;((_size) - 1))</div><div class='add'>+#define SXG_RING_EMPTY(_ring) ((_ring)-&gt;Head == (_ring)-&gt;Tail)</div><div class='add'>+#define SXG_RING_FULL(_ring) ((((_ring)-&gt;Head + 1) &amp; ((_ring)-&gt;Size - 1)) == (_ring)-&gt;Tail)</div><div class='add'>+#define SXG_RING_ADVANCE_HEAD(_ring) SXG_ADVANCE_INDEX((_ring)-&gt;Head, ((_ring)-&gt;Size))</div><div class='add'>+#define SXG_RING_RETREAT_HEAD(_ring) ((_ring)-&gt;Head =				\</div><div class='add'>+									  SXG_PREVIOUS_INDEX((_ring)-&gt;Head, (_ring)-&gt;Size))</div><div class='add'>+#define SXG_RING_ADVANCE_TAIL(_ring) {								\</div><div class='add'>+	ASSERT((_ring)-&gt;Tail != (_ring)-&gt;Head);							\</div><div class='add'>+	SXG_ADVANCE_INDEX((_ring)-&gt;Tail, ((_ring)-&gt;Size));				\</div><div class='add'>+}</div><div class='add'>+// Set cmd to the next available ring entry, set the shadow context</div><div class='add'>+// entry and advance the ring.</div><div class='add'>+// The appropriate lock must be held when calling this macro</div><div class='add'>+#define SXG_GET_CMD(_ring, _ringinfo, _cmd, _context) {				\</div><div class='add'>+	if(SXG_RING_FULL(_ringinfo)) {									\</div><div class='add'>+		(_cmd) = NULL;												\</div><div class='add'>+	} else {														\</div><div class='add'>+		(_cmd) = &amp;(_ring)-&gt;Descriptors[(_ringinfo)-&gt;Head];			\</div><div class='add'>+		(_ringinfo)-&gt;Context[(_ringinfo)-&gt;Head] = (void *)(_context);\</div><div class='add'>+		SXG_RING_ADVANCE_HEAD(_ringinfo);							\</div><div class='add'>+	}																\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+// Abort the previously allocated command by retreating the head.</div><div class='add'>+// NOTE - The appopriate lock MUST NOT BE DROPPED between the SXG_GET_CMD</div><div class='add'>+// and SXG_ABORT_CMD calls.</div><div class='add'>+#define SXG_ABORT_CMD(_ringinfo) {									\</div><div class='add'>+	ASSERT(!(SXG_RING_EMPTY(_ringinfo)));							\</div><div class='add'>+	SXG_RING_RETREAT_HEAD(_ringinfo);								\</div><div class='add'>+	(_ringinfo)-&gt;Context[(_ringinfo)-&gt;Head] = NULL;					\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+// For the given ring, return a pointer to the tail cmd and context,</div><div class='add'>+// clear the context and advance the tail</div><div class='add'>+#define SXG_RETURN_CMD(_ring, _ringinfo, _cmd, _context) {			\</div><div class='add'>+	(_cmd) = &amp;(_ring)-&gt;Descriptors[(_ringinfo)-&gt;Tail];				\</div><div class='add'>+	(_context) = (_ringinfo)-&gt;Context[(_ringinfo)-&gt;Tail];       	\</div><div class='add'>+	(_ringinfo)-&gt;Context[(_ringinfo)-&gt;Tail] = NULL;					\</div><div class='add'>+	SXG_RING_ADVANCE_TAIL(_ringinfo);								\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/***************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * Host Command Buffer - commands to INIC via the Cmd Rings</div><div class='add'>+ *</div><div class='add'>+ ***************************************************************************/</div><div class='add'>+/*</div><div class='add'>+ *  31                  15                 0</div><div class='add'>+ *  .___________________.___________________.</div><div class='add'>+ *  |&lt;-------------- Sgl Low --------------&gt;|</div><div class='add'>+ *  |_________|_________|_________|_________|0		0x00</div><div class='add'>+ *  |&lt;-------------- Sgl High -------------&gt;|</div><div class='add'>+ *  |_________|_________|_________|_________|4		0x04</div><div class='add'>+ *  |&lt;-------------  Sge 0 Low  -----------&gt;|</div><div class='add'>+ *  |_________|_________|_________|_________|8 		0x08</div><div class='add'>+ *  |&lt;-------------  Sge 0 High -----------&gt;|</div><div class='add'>+ *  |_________|_________|_________|_________|12		0x0c</div><div class='add'>+ *  |&lt;------------  Sge 0 Length ----------&gt;|</div><div class='add'>+ *  |_________|_________|_________|_________|16		0x10</div><div class='add'>+ *  |&lt;----------- Window Update -----------&gt;|</div><div class='add'>+ *  |&lt;-------- SP 1st SGE offset ----------&gt;|</div><div class='add'>+ *  |_________|_________|_________|_________|20		0x14</div><div class='add'>+ *  |&lt;----------- Total Length ------------&gt;|</div><div class='add'>+ *  |_________|_________|_________|_________|24		0x18</div><div class='add'>+ *  |&lt;----- LCnt ------&gt;|&lt;----- Flags -----&gt;|</div><div class='add'>+ *  |_________|_________|_________|_________|28		0x1c</div><div class='add'>+ */</div><div class='add'>+#pragma pack(push, 1)</div><div class='add'>+typedef struct _SXG_CMD {</div><div class='add'>+	dma_addr_t             			Sgl;			// Physical address of SGL</div><div class='add'>+	union {</div><div class='add'>+		struct {</div><div class='add'>+			dma64_addr_t          	FirstSgeAddress;// Address of first SGE</div><div class='add'>+			u32					FirstSgeLength;	// Length of first SGE</div><div class='add'>+			union {</div><div class='add'>+				u32				Rsvd1;	        // TOE NA</div><div class='add'>+				u32				SgeOffset;		// Slowpath - 2nd SGE offset</div><div class='add'>+				u32				Resid;			// MDL completion - clobbers update</div><div class='add'>+			};</div><div class='add'>+			union {</div><div class='add'>+				u32				TotalLength;	// Total transfer length</div><div class='add'>+				u32				Mss;			// LSO MSS</div><div class='add'>+			};</div><div class='add'>+		} Buffer;</div><div class='add'>+	};</div><div class='add'>+	union {</div><div class='add'>+		struct {</div><div class='add'>+			unsigned char					Flags:4;		// slowpath flags</div><div class='add'>+			unsigned char					IpHl:4;			// Ip header length (&gt;&gt;2)</div><div class='add'>+			unsigned char					MacLen;			// Mac header len</div><div class='add'>+		} CsumFlags;</div><div class='add'>+		struct {</div><div class='add'>+			ushort					Flags:4;		// slowpath flags</div><div class='add'>+			ushort					TcpHdrOff:7;	// TCP</div><div class='add'>+			ushort					MacLen:5;		// Mac header len</div><div class='add'>+		} LsoFlags;</div><div class='add'>+		ushort						Flags;			// flags</div><div class='add'>+	};</div><div class='add'>+	union {</div><div class='add'>+		ushort						SgEntries;		// SG entry count including first sge</div><div class='add'>+		struct {</div><div class='add'>+			unsigned char					Status;		    // Copied from event status</div><div class='add'>+			unsigned char					NotUsed;</div><div class='add'>+		} Status;</div><div class='add'>+	};</div><div class='add'>+} SXG_CMD, *PSXG_CMD;</div><div class='add'>+#pragma pack(pop)</div><div class='add'>+</div><div class='add'>+#pragma pack(push, 1)</div><div class='add'>+typedef struct _VLAN_HDR {</div><div class='add'>+	ushort	VlanTci;</div><div class='add'>+	ushort	VlanTpid;</div><div class='add'>+} VLAN_HDR, *PVLAN_HDR;</div><div class='add'>+#pragma pack(pop)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Slowpath Flags:</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * LSS Flags:</div><div class='add'>+ *                                        .---</div><div class='add'>+ *                                       /.--- TCP Large segment send</div><div class='add'>+ *                                      //.---</div><div class='add'>+ *                                     ///.---</div><div class='add'>+ *  3                   1     1       ////</div><div class='add'>+ *  1                   5     0      ||||</div><div class='add'>+ *  .___________________.____________vvvv.</div><div class='add'>+ *  |                   |MAC |  TCP |    |</div><div class='add'>+ *  |      LCnt         |hlen|hdroff|Flgs|</div><div class='add'>+ *  |___________________|||||||||||||____|</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * Checksum Flags</div><div class='add'>+ *</div><div class='add'>+ *                                           .---</div><div class='add'>+ *                                          /.---</div><div class='add'>+ *                                         //.--- Checksum TCP</div><div class='add'>+ *                                        ///.--- Checksum IP</div><div class='add'>+ *  3                   1                //// No bits - normal send</div><div class='add'>+ *  1                   5          7    ||||</div><div class='add'>+ *  .___________________._______________vvvv.</div><div class='add'>+ *  |                   | Offload | IP |    |</div><div class='add'>+ *  |      LCnt         |MAC hlen |Hlen|Flgs|</div><div class='add'>+ *  |___________________|____|____|____|____|</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+// Slowpath CMD flags</div><div class='add'>+#define SXG_SLOWCMD_CSUM_IP			0x01		// Checksum IP</div><div class='add'>+#define SXG_SLOWCMD_CSUM_TCP		0x02		// Checksum TCP</div><div class='add'>+#define SXG_SLOWCMD_LSO				0x04		// Large segment send</div><div class='add'>+</div><div class='add'>+typedef struct _SXG_XMT_RING {</div><div class='add'>+	SXG_CMD		Descriptors[SXG_XMT_RING_SIZE];</div><div class='add'>+} SXG_XMT_RING, *PSXG_XMT_RING;</div><div class='add'>+</div><div class='add'>+typedef struct _SXG_RCV_RING {</div><div class='add'>+	SXG_CMD		Descriptors[SXG_RCV_RING_SIZE];</div><div class='add'>+} SXG_RCV_RING, *PSXG_RCV_RING;</div><div class='add'>+</div><div class='add'>+/***************************************************************************</div><div class='add'>+ * Share memory buffer types - Used to identify asynchronous</div><div class='add'>+ * shared memory allocation</div><div class='add'>+ ***************************************************************************/</div><div class='add'>+typedef enum {</div><div class='add'>+	SXG_BUFFER_TYPE_RCV,		// Receive buffer</div><div class='add'>+	SXG_BUFFER_TYPE_SGL			// SGL buffer</div><div class='add'>+} SXG_BUFFER_TYPE;</div><div class='add'>+</div><div class='add'>+// State for SXG buffers</div><div class='add'>+#define SXG_BUFFER_FREE		0x01</div><div class='add'>+#define SXG_BUFFER_BUSY		0x02</div><div class='add'>+#define SXG_BUFFER_ONCARD	0x04</div><div class='add'>+#define SXG_BUFFER_UPSTREAM	0x08</div><div class='add'>+</div><div class='add'>+/***************************************************************************</div><div class='add'>+ * Receive data buffers</div><div class='add'>+ *</div><div class='add'>+ * Receive data buffers are given to the Sahara card 128 at a time.</div><div class='add'>+ * This is accomplished by filling in a "receive descriptor block"</div><div class='add'>+ * with 128 "receive descriptors".  Each descriptor consists of</div><div class='add'>+ * a physical address, which the card uses as the address to</div><div class='add'>+ * DMA data into, and a virtual address, which is given back</div><div class='add'>+ * to the host in the "HostHandle" portion of an event.</div><div class='add'>+ * The receive descriptor data structure is defined below</div><div class='add'>+ * as SXG_RCV_DATA_DESCRIPTOR, and the corresponding block</div><div class='add'>+ * is defined as SXG_RCV_DESCRIPTOR_BLOCK.</div><div class='add'>+ *</div><div class='add'>+ * This receive descriptor block is given to the card by filling</div><div class='add'>+ * in the Sgl field of a SXG_CMD entry from pAdapt-&gt;RcvRings[0]</div><div class='add'>+ * with the physical address of the receive descriptor block.</div><div class='add'>+ *</div><div class='add'>+ * Both the receive buffers and the receive descriptor blocks</div><div class='add'>+ * require additional data structures to maintain them</div><div class='add'>+ * on a free queue and contain other information associated with them.</div><div class='add'>+ * Those data structures are defined as the SXG_RCV_DATA_BUFFER_HDR</div><div class='add'>+ * and SXG_RCV_DESCRIPTOR_BLOCK_HDR respectively.</div><div class='add'>+ *</div><div class='add'>+ * Since both the receive buffers and the receive descriptor block</div><div class='add'>+ * must be accessible by the card, both must be allocated out of</div><div class='add'>+ * shared memory.  To ensure that we always have a descriptor</div><div class='add'>+ * block available for every 128 buffers, we allocate all of</div><div class='add'>+ * these resources together in a single block.  This entire</div><div class='add'>+ * block is managed by a SXG_RCV_BLOCK_HDR, who's sole purpose</div><div class='add'>+ * is to maintain address information so that the entire block</div><div class='add'>+ * can be free later.</div><div class='add'>+ *</div><div class='add'>+ * Further complicating matters is the fact that the receive</div><div class='add'>+ * buffers must be variable in length in order to accomodate</div><div class='add'>+ * jumbo frame configurations.  We configure the buffer</div><div class='add'>+ * length so that the buffer and it's corresponding SXG_RCV_DATA_BUFFER_HDR</div><div class='add'>+ * structure add up to an even boundary.  Then we place the</div><div class='add'>+ * remaining data structures after 128 of them as shown in</div><div class='add'>+ * the following diagram:</div><div class='add'>+ *</div><div class='add'>+ *  _________________________________________</div><div class='add'>+ * |                                         |</div><div class='add'>+ * |    Variable length receive buffer #1    |</div><div class='add'>+ * |_________________________________________|</div><div class='add'>+ * |                                         |</div><div class='add'>+ * |       SXG_RCV_DATA_BUFFER_HDR #1        |</div><div class='add'>+ * |_________________________________________| &lt;== Even 2k or 10k boundary</div><div class='add'>+ * |                                         |</div><div class='add'>+ * |         ... repeat 2-128 ..             |</div><div class='add'>+ * |_________________________________________|</div><div class='add'>+ * |                                         |</div><div class='add'>+ * |      SXG_RCV_DESCRIPTOR_BLOCK           |</div><div class='add'>+ * |  Contains SXG_RCV_DATA_DESCRIPTOR * 128 |</div><div class='add'>+ * |_________________________________________|</div><div class='add'>+ * |                                         |</div><div class='add'>+ * |      SXG_RCV_DESCRIPTOR_BLOCK_HDR       |</div><div class='add'>+ * |_________________________________________|</div><div class='add'>+ * |                                         |</div><div class='add'>+ * |          SXG_RCV_BLOCK_HDR              |</div><div class='add'>+ * |_________________________________________|</div><div class='add'>+ *</div><div class='add'>+ * Memory consumption:</div><div class='add'>+ *	  Non-jumbo:</div><div class='add'>+ *      Buffers and SXG_RCV_DATA_BUFFER_HDR = 2k * 128 = 256k</div><div class='add'>+ *    + SXG_RCV_DESCRIPTOR_BLOCK = 2k</div><div class='add'>+ *    + SXG_RCV_DESCRIPTOR_BLOCK_HDR = ~32</div><div class='add'>+ *    + SXG_RCV_BLOCK_HDR = ~32</div><div class='add'>+ *    =&gt; Total = ~258k/block</div><div class='add'>+ *</div><div class='add'>+ *	  Jumbo:</div><div class='add'>+ *      Buffers and SXG_RCV_DATA_BUFFER_HDR = 10k * 128 = 1280k</div><div class='add'>+ *    + SXG_RCV_DESCRIPTOR_BLOCK = 2k</div><div class='add'>+ *    + SXG_RCV_DESCRIPTOR_BLOCK_HDR = ~32</div><div class='add'>+ *    + SXG_RCV_BLOCK_HDR = ~32</div><div class='add'>+ *    =&gt; Total = ~1282k/block</div><div class='add'>+ *</div><div class='add'>+ ***************************************************************************/</div><div class='add'>+#define SXG_RCV_DATA_BUFFERS			4096	// Amount to give to the card</div><div class='add'>+#define SXG_INITIAL_RCV_DATA_BUFFERS	8192	// Initial pool of buffers</div><div class='add'>+#define SXG_MIN_RCV_DATA_BUFFERS		2048	// Minimum amount and when to get more</div><div class='add'>+#define SXG_MAX_RCV_BLOCKS				128		// = 16384 receive buffers</div><div class='add'>+</div><div class='add'>+// Receive buffer header</div><div class='add'>+typedef struct _SXG_RCV_DATA_BUFFER_HDR {</div><div class='add'>+	dma_addr_t          			PhysicalAddress;	// Buffer physical address</div><div class='add'>+	// Note - DO NOT USE the VirtualAddress field to locate data.</div><div class='add'>+	// Use the sxg.h:SXG_RECEIVE_DATA_LOCATION macro instead.</div><div class='add'>+	void *VirtualAddress;		// Start of buffer</div><div class='add'>+	LIST_ENTRY						FreeList;			// Free queue of buffers</div><div class='add'>+	struct _SXG_RCV_DATA_BUFFER_HDR	*Next;				// Fastpath data buffer queue</div><div class='add'>+	u32							Size;				// Buffer size</div><div class='add'>+	u32							ByteOffset;			// See SXG_RESTORE_MDL_OFFSET</div><div class='add'>+	unsigned char							State;				// See SXG_BUFFER state above</div><div class='add'>+	unsigned char							Status;				// Event status (to log PUSH)</div><div class='add'>+	struct sk_buff                * skb;				// Double mapped (nbl and pkt)</div><div class='add'>+} SXG_RCV_DATA_BUFFER_HDR, *PSXG_RCV_DATA_BUFFER_HDR;</div><div class='add'>+</div><div class='add'>+// SxgSlowReceive uses the PACKET (skb) contained</div><div class='add'>+// in the SXG_RCV_DATA_BUFFER_HDR when indicating dumb-nic data</div><div class='add'>+#define SxgDumbRcvPacket	        skb</div><div class='add'>+</div><div class='add'>+#define SXG_RCV_DATA_HDR_SIZE			256		// Space for SXG_RCV_DATA_BUFFER_HDR</div><div class='add'>+#define SXG_RCV_DATA_BUFFER_SIZE		2048	// Non jumbo = 2k including HDR</div><div class='add'>+#define SXG_RCV_JUMBO_BUFFER_SIZE		10240	// jumbo = 10k including HDR</div><div class='add'>+</div><div class='add'>+// Receive data descriptor</div><div class='add'>+typedef struct _SXG_RCV_DATA_DESCRIPTOR {</div><div class='add'>+	union {</div><div class='add'>+		struct sk_buff    *	VirtualAddress;			// Host handle</div><div class='add'>+		u64 			ForceTo8Bytes;			// Force x86 to 8-byte boundary</div><div class='add'>+	};</div><div class='add'>+	dma_addr_t             	PhysicalAddress;</div><div class='add'>+} SXG_RCV_DATA_DESCRIPTOR, *PSXG_RCV_DATA_DESCRIPTOR;</div><div class='add'>+</div><div class='add'>+// Receive descriptor block</div><div class='add'>+#define SXG_RCV_DESCRIPTORS_PER_BLOCK		128</div><div class='add'>+#define SXG_RCV_DESCRIPTOR_BLOCK_SIZE		2048	// For sanity check</div><div class='add'>+typedef struct _SXG_RCV_DESCRIPTOR_BLOCK {</div><div class='add'>+	SXG_RCV_DATA_DESCRIPTOR		Descriptors[SXG_RCV_DESCRIPTORS_PER_BLOCK];</div><div class='add'>+} SXG_RCV_DESCRIPTOR_BLOCK, *PSXG_RCV_DESCRIPTOR_BLOCK;</div><div class='add'>+</div><div class='add'>+// Receive descriptor block header</div><div class='add'>+typedef struct _SXG_RCV_DESCRIPTOR_BLOCK_HDR {</div><div class='add'>+	void *					VirtualAddress;			// Start of 2k buffer</div><div class='add'>+	dma_addr_t	            PhysicalAddress;		// ..and it's physical address</div><div class='add'>+	LIST_ENTRY				FreeList;				// Free queue of descriptor blocks</div><div class='add'>+	unsigned char					State;					// See SXG_BUFFER state above</div><div class='add'>+} SXG_RCV_DESCRIPTOR_BLOCK_HDR, *PSXG_RCV_DESCRIPTOR_BLOCK_HDR;</div><div class='add'>+</div><div class='add'>+// Receive block header</div><div class='add'>+typedef struct _SXG_RCV_BLOCK_HDR {</div><div class='add'>+	void *					VirtualAddress;			// Start of virtual memory</div><div class='add'>+	dma_addr_t	            PhysicalAddress;		// ..and it's physical address</div><div class='add'>+	LIST_ENTRY				AllList;				// Queue of all SXG_RCV_BLOCKS</div><div class='add'>+} SXG_RCV_BLOCK_HDR, *PSXG_RCV_BLOCK_HDR;</div><div class='add'>+</div><div class='add'>+// Macros to determine data structure offsets into receive block</div><div class='add'>+#define SXG_RCV_BLOCK_SIZE(_Buffersize) 					\</div><div class='add'>+	(((_Buffersize) * SXG_RCV_DESCRIPTORS_PER_BLOCK) +		\</div><div class='add'>+	 (sizeof(SXG_RCV_DESCRIPTOR_BLOCK))              +		\</div><div class='add'>+	 (sizeof(SXG_RCV_DESCRIPTOR_BLOCK_HDR))          +		\</div><div class='add'>+	 (sizeof(SXG_RCV_BLOCK_HDR)))</div><div class='add'>+#define SXG_RCV_BUFFER_DATA_SIZE(_Buffersize)				\</div><div class='add'>+	((_Buffersize) - SXG_RCV_DATA_HDR_SIZE)</div><div class='add'>+#define SXG_RCV_DATA_BUFFER_HDR_OFFSET(_Buffersize)			\</div><div class='add'>+	((_Buffersize) - SXG_RCV_DATA_HDR_SIZE)</div><div class='add'>+#define SXG_RCV_DESCRIPTOR_BLOCK_OFFSET(_Buffersize)		\</div><div class='add'>+	((_Buffersize) * SXG_RCV_DESCRIPTORS_PER_BLOCK)</div><div class='add'>+#define SXG_RCV_DESCRIPTOR_BLOCK_HDR_OFFSET(_Buffersize)	\</div><div class='add'>+	(((_Buffersize) * SXG_RCV_DESCRIPTORS_PER_BLOCK) +		\</div><div class='add'>+	 (sizeof(SXG_RCV_DESCRIPTOR_BLOCK)))</div><div class='add'>+#define SXG_RCV_BLOCK_HDR_OFFSET(_Buffersize)				\</div><div class='add'>+	(((_Buffersize) * SXG_RCV_DESCRIPTORS_PER_BLOCK) +		\</div><div class='add'>+	 (sizeof(SXG_RCV_DESCRIPTOR_BLOCK))              +		\</div><div class='add'>+	 (sizeof(SXG_RCV_DESCRIPTOR_BLOCK_HDR)))</div><div class='add'>+</div><div class='add'>+// Use the miniport reserved portion of the NBL to locate</div><div class='add'>+// our SXG_RCV_DATA_BUFFER_HDR structure.</div><div class='add'>+typedef struct _SXG_RCV_NBL_RESERVED {</div><div class='add'>+	PSXG_RCV_DATA_BUFFER_HDR	RcvDataBufferHdr;</div><div class='add'>+	void *						Available;</div><div class='add'>+} SXG_RCV_NBL_RESERVED, *PSXG_RCV_NBL_RESERVED;</div><div class='add'>+</div><div class='add'>+#define SXG_RCV_NBL_BUFFER_HDR(_NBL) (((PSXG_RCV_NBL_RESERVED)NET_BUFFER_LIST_MINIPORT_RESERVED(_NBL))-&gt;RcvDataBufferHdr)</div><div class='add'>+</div><div class='add'>+/***************************************************************************</div><div class='add'>+ * Scatter gather list buffer</div><div class='add'>+ ***************************************************************************/</div><div class='add'>+#define SXG_INITIAL_SGL_BUFFERS		8192	// Initial pool of SGL buffers</div><div class='add'>+#define SXG_MIN_SGL_BUFFERS			2048	// Minimum amount and when to get more</div><div class='add'>+#define SXG_MAX_SGL_BUFFERS			16384	// Maximum to allocate (note ADAPT:ushort)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+// Self identifying structure type</div><div class='add'>+typedef enum _SXG_SGL_TYPE {</div><div class='add'>+	SXG_SGL_DUMB,				// Dumb NIC SGL</div><div class='add'>+	SXG_SGL_SLOW,				// Slowpath protocol header - see below</div><div class='add'>+	SXG_SGL_CHIMNEY				// Chimney offload SGL</div><div class='add'>+} SXG_SGL_TYPE, PSXG_SGL_TYPE;</div><div class='add'>+</div><div class='add'>+// Note - the description below is Microsoft specific</div><div class='add'>+//</div><div class='add'>+// The following definition specifies the amount of shared memory to allocate</div><div class='add'>+// for the SCATTER_GATHER_LIST portion of the SXG_SCATTER_GATHER data structure.</div><div class='add'>+// The following considerations apply when setting this value:</div><div class='add'>+// - First, the Sahara card is designed to read the Microsoft SGL structure</div><div class='add'>+// 	 straight out of host memory.  This means that the SGL must reside in</div><div class='add'>+//	 shared memory.  If the length here is smaller than the SGL for the</div><div class='add'>+//	 NET_BUFFER, then NDIS will allocate its own buffer.  The buffer</div><div class='add'>+//	 that NDIS allocates is not in shared memory, so when this happens,</div><div class='add'>+//	 the SGL will need to be copied to a set of SXG_SCATTER_GATHER buffers.</div><div class='add'>+//	 In other words.. we don't want this value to be too small.</div><div class='add'>+// - On the other hand.. we're allocating up to 16k of these things.  If</div><div class='add'>+//	 we make this too big, we start to consume a ton of memory..</div><div class='add'>+// At the moment, I'm going to limit the number of SG entries to 150.</div><div class='add'>+// If each entry maps roughly 4k, then this should cover roughly 600kB</div><div class='add'>+// NET_BUFFERs.  Furthermore, since each entry is 24 bytes, the total</div><div class='add'>+// SGE portion of the structure consumes 3600 bytes, which should allow</div><div class='add'>+// the entire SXG_SCATTER_GATHER structure to reside comfortably within</div><div class='add'>+// a 4k block, providing the remaining fields stay under 500 bytes.</div><div class='add'>+//</div><div class='add'>+// So with 150 entries, the SXG_SCATTER_GATHER structure becomes roughly</div><div class='add'>+// 4k.  At 16k of them, that amounts to 64M of shared memory.  A ton, but</div><div class='add'>+// manageable.</div><div class='add'>+#define SXG_SGL_ENTRIES		150</div><div class='add'>+</div><div class='add'>+// The ucode expects an NDIS SGL structure that</div><div class='add'>+// is formatted for an x64 system.  When running</div><div class='add'>+// on an x64 system, we can simply hand the NDIS SGL</div><div class='add'>+// to the card directly.  For x86 systems we must reconstruct</div><div class='add'>+// the SGL.  The following structure defines an x64</div><div class='add'>+// formatted SGL entry</div><div class='add'>+typedef struct _SXG_X64_SGE {</div><div class='add'>+    dma64_addr_t      	Address;	// same as wdm.h</div><div class='add'>+    u32				Length;		// same as wdm.h</div><div class='add'>+	u32				CompilerPad;// The compiler pads to 8-bytes</div><div class='add'>+    u64 			Reserved;	// u32 * in wdm.h.  Force to 8 bytes</div><div class='add'>+} SXG_X64_SGE, *PSXG_X64_SGE;</div><div class='add'>+</div><div class='add'>+typedef struct _SCATTER_GATHER_ELEMENT {</div><div class='add'>+    dma64_addr_t      	Address;	// same as wdm.h</div><div class='add'>+    u32				Length;		// same as wdm.h</div><div class='add'>+	u32				CompilerPad;// The compiler pads to 8-bytes</div><div class='add'>+    u64 			Reserved;	// u32 * in wdm.h.  Force to 8 bytes</div><div class='add'>+} SCATTER_GATHER_ELEMENT, *PSCATTER_GATHER_ELEMENT;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+typedef struct _SCATTER_GATHER_LIST {</div><div class='add'>+    u32					NumberOfElements;</div><div class='add'>+    u32 *				Reserved;</div><div class='add'>+    SCATTER_GATHER_ELEMENT	Elements[];</div><div class='add'>+} SCATTER_GATHER_LIST, *PSCATTER_GATHER_LIST;</div><div class='add'>+</div><div class='add'>+// The card doesn't care about anything except elements, so</div><div class='add'>+// we can leave the u32 * reserved field alone in the following</div><div class='add'>+// SGL structure.  But redefine from wdm.h:SCATTER_GATHER_LIST so</div><div class='add'>+// we can specify SXG_X64_SGE and define a fixed number of elements</div><div class='add'>+typedef struct _SXG_X64_SGL {</div><div class='add'>+    u32					NumberOfElements;</div><div class='add'>+    u32 *				Reserved;</div><div class='add'>+    SXG_X64_SGE				Elements[SXG_SGL_ENTRIES];</div><div class='add'>+} SXG_X64_SGL, *PSXG_X64_SGL;</div><div class='add'>+</div><div class='add'>+typedef struct _SXG_SCATTER_GATHER {</div><div class='add'>+	SXG_SGL_TYPE						Type;			// FIRST! Dumb-nic or offload</div><div class='add'>+	void *   							adapter;		// Back pointer to adapter</div><div class='add'>+	LIST_ENTRY							FreeList;		// Free SXG_SCATTER_GATHER blocks</div><div class='add'>+	LIST_ENTRY							AllList;		// All SXG_SCATTER_GATHER blocks</div><div class='add'>+	dma_addr_t				            PhysicalAddress;// physical address</div><div class='add'>+	unsigned char								State;			// See SXG_BUFFER state above</div><div class='add'>+	unsigned char								CmdIndex;		// Command ring index</div><div class='add'>+	struct sk_buff                    *	DumbPacket;		// Associated Packet</div><div class='add'>+	u32								Direction;		// For asynchronous completions</div><div class='add'>+	u32								CurOffset;		// Current SGL offset</div><div class='add'>+	u32								SglRef;			// SGL reference count</div><div class='add'>+	VLAN_HDR							VlanTag;		// VLAN tag to be inserted into SGL</div><div class='add'>+	PSCATTER_GATHER_LIST   				pSgl;			// SGL Addr. Possibly &amp;Sgl</div><div class='add'>+	SXG_X64_SGL							Sgl;			// SGL handed to card</div><div class='add'>+} SXG_SCATTER_GATHER, *PSXG_SCATTER_GATHER;</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_X86_64)</div><div class='add'>+#define SXG_SGL_BUFFER(_SxgSgl)		(&amp;_SxgSgl-&gt;Sgl)</div><div class='add'>+#define SXG_SGL_BUF_SIZE			sizeof(SXG_X64_SGL)</div><div class='add'>+#elif defined(CONFIG_X86)</div><div class='add'>+// Force NDIS to give us it's own buffer so we can reformat to our own</div><div class='add'>+#define SXG_SGL_BUFFER(_SxgSgl)		NULL</div><div class='add'>+#define SXG_SGL_BUF_SIZE			0</div><div class='add'>+#else</div><div class='add'>+    Stop Compilation;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='head'>diff --git a/drivers/staging/sxg/sxghw.h b/drivers/staging/sxg/sxghw.h<br/>new file mode 100644<br/>index 000000000000..8f4f6effdd98<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/sxg/sxghw.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/sxg/sxghw.h</a></div><div class='hunk'>@@ -0,0 +1,734 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright © 1997-2007 Alacritech, Inc. All rights reserved</div><div class='add'>+ *</div><div class='add'>+ * $Id: sxghw.h,v 1.2 2008/07/24 17:24:23 chris Exp $</div><div class='add'>+ *</div><div class='add'>+ * sxghw.h:</div><div class='add'>+ *</div><div class='add'>+ * This file contains structures and definitions for the</div><div class='add'>+ * Alacritech Sahara hardware</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*******************************************************************************</div><div class='add'>+ * Configuration space</div><div class='add'>+ *******************************************************************************/</div><div class='add'>+//  PCI Vendor ID</div><div class='add'>+#define SXG_VENDOR_ID			0x139A	// Alacritech's Vendor ID</div><div class='add'>+</div><div class='add'>+//  PCI Device ID</div><div class='add'>+#define SXG_DEVICE_ID			0x0009	// Sahara Device ID</div><div class='add'>+</div><div class='add'>+//</div><div class='add'>+// Subsystem IDs.</div><div class='add'>+//</div><div class='add'>+// The subsystem ID value is broken into bit fields as follows:</div><div class='add'>+//		Bits [15:12] - Function</div><div class='add'>+//		Bits [11:8]  - OEM and/or operating system.</div><div class='add'>+//		Bits [7:0]   - Base SID.</div><div class='add'>+//</div><div class='add'>+// SSID field (bit) masks</div><div class='add'>+#define SSID_BASE_MASK					0x00FF	// Base subsystem ID mask</div><div class='add'>+#define SSID_OEM_MASK					0x0F00	// Subsystem OEM mask</div><div class='add'>+#define SSID_FUNC_MASK					0xF000	// Subsystem function mask</div><div class='add'>+</div><div class='add'>+// Base SSID's</div><div class='add'>+#define SSID_SAHARA_PROTO				0x0018	// 100022 Sahara prototype (XenPak) board</div><div class='add'>+#define SSID_SAHARA_FIBER				0x0019	// 100023 Sahara 1-port fiber board</div><div class='add'>+#define SSID_SAHARA_COPPER				0x001A	// 100024 Sahara 1-port copper board</div><div class='add'>+</div><div class='add'>+// Useful SSID macros</div><div class='add'>+#define	SSID_BASE(ssid)			((ssid) &amp; SSID_BASE_MASK)		// isolate base SSID bits</div><div class='add'>+#define	SSID_OEM(ssid)			((ssid) &amp; SSID_OEM_MASK)		// isolate SSID OEM bits</div><div class='add'>+#define	SSID_FUNC(ssid)			((ssid) &amp; SSID_FUNC_MASK)		// isolate SSID function bits</div><div class='add'>+</div><div class='add'>+/*******************************************************************************</div><div class='add'>+ * HW Register Space</div><div class='add'>+ *******************************************************************************/</div><div class='add'>+#define SXG_HWREG_MEMSIZE	0x4000		// 16k</div><div class='add'>+</div><div class='add'>+#pragma pack(push, 1)</div><div class='add'>+typedef struct _SXG_HW_REGS {</div><div class='add'>+	u32		Reset;				// Write 0xdead to invoke soft reset</div><div class='add'>+	u32		Pad1;				// No register defined at offset 4</div><div class='add'>+	u32		InterruptMask0;		// Deassert legacy interrupt on function 0</div><div class='add'>+	u32		InterruptMask1;		// Deassert legacy interrupt on function 1</div><div class='add'>+	u32		UcodeDataLow;		// Store microcode instruction bits 31-0</div><div class='add'>+	u32		UcodeDataMiddle;	// Store microcode instruction bits 63-32</div><div class='add'>+	u32		UcodeDataHigh;		// Store microcode instruction bits 95-64</div><div class='add'>+	u32		UcodeAddr;			// Store microcode address - See flags below</div><div class='add'>+	u32		PadTo0x80[24];		// Pad to Xcv configuration registers</div><div class='add'>+	u32		MacConfig0;			// 0x80 - AXGMAC Configuration Register 0</div><div class='add'>+	u32		MacConfig1;			// 0x84 - AXGMAC Configuration Register 1</div><div class='add'>+	u32		MacConfig2;			// 0x88 - AXGMAC Configuration Register 2</div><div class='add'>+	u32		MacConfig3;			// 0x8C - AXGMAC Configuration Register 3</div><div class='add'>+	u32		MacAddressLow;		// 0x90 - AXGMAC MAC Station Address - octets 1-4</div><div class='add'>+	u32		MacAddressHigh;		// 0x94 - AXGMAC MAC Station Address - octets 5-6</div><div class='add'>+	u32		MacReserved1[2];	// 0x98 - AXGMAC Reserved</div><div class='add'>+	u32		MacMaxFrameLen;		// 0xA0 - AXGMAC Maximum Frame Length</div><div class='add'>+	u32		MacReserved2[2];	// 0xA4 - AXGMAC Reserved</div><div class='add'>+	u32		MacRevision;		// 0xAC - AXGMAC Revision Level Register</div><div class='add'>+	u32		MacReserved3[4];	// 0xB0 - AXGMAC Reserved</div><div class='add'>+	u32		MacAmiimCmd;		// 0xC0 - AXGMAC AMIIM Command Register</div><div class='add'>+	u32		MacAmiimField;		// 0xC4 - AXGMAC AMIIM Field Register</div><div class='add'>+	u32		MacAmiimConfig;		// 0xC8 - AXGMAC AMIIM Configuration Register</div><div class='add'>+	u32		MacAmiimLink;		// 0xCC - AXGMAC AMIIM Link Fail Vector Register</div><div class='add'>+	u32		MacAmiimIndicator;	// 0xD0 - AXGMAC AMIIM Indicator Registor</div><div class='add'>+	u32		PadTo0x100[11];		// 0xD4 - 0x100 - Pad</div><div class='add'>+	u32		XmtConfig;			// 0x100 - Transmit Configuration Register</div><div class='add'>+	u32		RcvConfig;			// 0x104 - Receive Configuration Register 1</div><div class='add'>+	u32		LinkAddress0Low;	// 0x108 - Link address 0</div><div class='add'>+	u32		LinkAddress0High;	// 0x10C - Link address 0</div><div class='add'>+	u32		LinkAddress1Low;	// 0x110 - Link address 1</div><div class='add'>+	u32		LinkAddress1High;	// 0x114 - Link address 1</div><div class='add'>+	u32		LinkAddress2Low;	// 0x118 - Link address 2</div><div class='add'>+	u32		LinkAddress2High;	// 0x11C - Link address 2</div><div class='add'>+	u32		LinkAddress3Low;	// 0x120 - Link address 3</div><div class='add'>+	u32		LinkAddress3High;	// 0x124 - Link address 3</div><div class='add'>+	u32		ToeplitzKey[10];	// 0x128 - 0x150 - Toeplitz key</div><div class='add'>+	u32		SocketKey[10];		// 0x150 - 0x178 - Socket Key</div><div class='add'>+	u32		LinkStatus;			// 0x178 - Link status</div><div class='add'>+	u32		ClearStats;			// 0x17C - Clear Stats</div><div class='add'>+	u32		XmtErrorsLow;		// 0x180 - Transmit stats - errors</div><div class='add'>+	u32		XmtErrorsHigh;		// 0x184 - Transmit stats - errors</div><div class='add'>+	u32		XmtFramesLow;		// 0x188 - Transmit stats - frame count</div><div class='add'>+	u32		XmtFramesHigh;		// 0x18C - Transmit stats - frame count</div><div class='add'>+	u32		XmtBytesLow;		// 0x190 - Transmit stats - byte count</div><div class='add'>+	u32		XmtBytesHigh;		// 0x194 - Transmit stats - byte count</div><div class='add'>+	u32		XmtTcpSegmentsLow;	// 0x198 - Transmit stats - TCP segments</div><div class='add'>+	u32		XmtTcpSegmentsHigh;	// 0x19C - Transmit stats - TCP segments</div><div class='add'>+	u32		XmtTcpBytesLow;		// 0x1A0 - Transmit stats - TCP bytes</div><div class='add'>+	u32		XmtTcpBytesHigh;	// 0x1A4 - Transmit stats - TCP bytes</div><div class='add'>+	u32		RcvErrorsLow;		// 0x1A8 - Receive stats - errors</div><div class='add'>+	u32		RcvErrorsHigh;		// 0x1AC - Receive stats - errors</div><div class='add'>+	u32		RcvFramesLow;		// 0x1B0 - Receive stats - frame count</div><div class='add'>+	u32		RcvFramesHigh;		// 0x1B4 - Receive stats - frame count</div><div class='add'>+	u32		RcvBytesLow;		// 0x1B8 - Receive stats - byte count</div><div class='add'>+	u32		RcvBytesHigh;		// 0x1BC - Receive stats - byte count</div><div class='add'>+	u32		RcvTcpSegmentsLow;	// 0x1C0 - Receive stats - TCP segments</div><div class='add'>+	u32		RcvTcpSegmentsHigh;	// 0x1C4 - Receive stats - TCP segments</div><div class='add'>+	u32		RcvTcpBytesLow;		// 0x1C8 - Receive stats - TCP bytes</div><div class='add'>+	u32		RcvTcpBytesHigh;	// 0x1CC - Receive stats - TCP bytes</div><div class='add'>+	u32		PadTo0x200[12];		// 0x1D0 - 0x200 - Pad</div><div class='add'>+	u32		Software[1920];		// 0x200 - 0x2000 - Software defined (not used)</div><div class='add'>+	u32		MsixTable[1024];	// 0x2000 - 0x3000 - MSIX Table</div><div class='add'>+	u32		MsixBitArray[1024];	// 0x3000 - 0x4000 - MSIX Pending Bit Array</div><div class='add'>+} SXG_HW_REGS, *PSXG_HW_REGS;</div><div class='add'>+#pragma pack(pop)</div><div class='add'>+</div><div class='add'>+// Microcode Address Flags</div><div class='add'>+#define	MICROCODE_ADDRESS_GO		0x80000000	// Start microcode</div><div class='add'>+#define	MICROCODE_ADDRESS_WRITE		0x40000000	// Store microcode</div><div class='add'>+#define	MICROCODE_ADDRESS_READ		0x20000000	// Read microcode</div><div class='add'>+#define	MICROCODE_ADDRESS_PARITY	0x10000000	// Parity error detected</div><div class='add'>+#define	MICROCODE_ADDRESS_MASK		0x00001FFF	// Address bits</div><div class='add'>+</div><div class='add'>+// Link Address Registers</div><div class='add'>+#define LINK_ADDRESS_ENABLE			0x80000000	// Applied to link address high</div><div class='add'>+</div><div class='add'>+// Microsoft register space size</div><div class='add'>+#define SXG_UCODEREG_MEMSIZE	0x40000		// 256k</div><div class='add'>+</div><div class='add'>+// Sahara microcode register address format.  The command code,</div><div class='add'>+// extended command code, and associated processor are encoded in</div><div class='add'>+// the address bits as follows</div><div class='add'>+#define SXG_ADDRESS_CODE_SHIFT		2			// Base command code</div><div class='add'>+#define SXG_ADDRESS_CODE_MASK		0x0000003C</div><div class='add'>+#define SXG_ADDRESS_EXCODE_SHIFT	6			// Extended (or sub) command code</div><div class='add'>+#define SXG_ADDRESS_EXCODE_MASK		0x00001FC0</div><div class='add'>+#define	SXG_ADDRESS_CPUID_SHIFT		13			// CPU</div><div class='add'>+#define SXG_ADDRESS_CPUID_MASK		0x0003E000</div><div class='add'>+#define SXG_REGISTER_SIZE_PER_CPU	0x00002000	// Used to sanity check UCODE_REGS structure</div><div class='add'>+</div><div class='add'>+// Sahara receive sequencer status values</div><div class='add'>+#define SXG_RCV_STATUS_ATTN					0x80000000	// Attention</div><div class='add'>+#define SXG_RCV_STATUS_TRANSPORT_MASK		0x3F000000	// Transport mask</div><div class='add'>+#define SXG_RCV_STATUS_TRANSPORT_ERROR		0x20000000	// Transport error</div><div class='add'>+#define SXG_RCV_STATUS_TRANSPORT_CSUM		0x23000000	// Transport cksum error</div><div class='add'>+#define SXG_RCV_STATUS_TRANSPORT_UFLOW		0x22000000	// Transport underflow</div><div class='add'>+#define SXG_RCV_STATUS_TRANSPORT_HDRLEN		0x20000000	// Transport header length</div><div class='add'>+#define SXG_RCV_STATUS_TRANSPORT_FLAGS		0x10000000	// Transport flags detected</div><div class='add'>+#define SXG_RCV_STATUS_TRANSPORT_OPTS		0x08000000	// Transport options detected</div><div class='add'>+#define SXG_RCV_STATUS_TRANSPORT_SESS_MASK	0x07000000	// Transport DDP</div><div class='add'>+#define SXG_RCV_STATUS_TRANSPORT_DDP		0x06000000	// Transport DDP</div><div class='add'>+#define SXG_RCV_STATUS_TRANSPORT_iSCSI		0x05000000	// Transport iSCSI</div><div class='add'>+#define SXG_RCV_STATUS_TRANSPORT_NFS		0x04000000	// Transport NFS</div><div class='add'>+#define SXG_RCV_STATUS_TRANSPORT_FTP		0x03000000	// Transport FTP</div><div class='add'>+#define SXG_RCV_STATUS_TRANSPORT_HTTP		0x02000000	// Transport HTTP</div><div class='add'>+#define SXG_RCV_STATUS_TRANSPORT_SMB		0x01000000	// Transport SMB</div><div class='add'>+#define SXG_RCV_STATUS_NETWORK_MASK			0x00FF0000	// Network mask</div><div class='add'>+#define SXG_RCV_STATUS_NETWORK_ERROR		0x00800000	// Network error</div><div class='add'>+#define SXG_RCV_STATUS_NETWORK_CSUM			0x00830000	// Network cksum error</div><div class='add'>+#define SXG_RCV_STATUS_NETWORK_UFLOW		0x00820000	// Network underflow error</div><div class='add'>+#define SXG_RCV_STATUS_NETWORK_HDRLEN		0x00800000	// Network header length</div><div class='add'>+#define SXG_RCV_STATUS_NETWORK_OFLOW		0x00400000	// Network overflow detected</div><div class='add'>+#define SXG_RCV_STATUS_NETWORK_MCAST		0x00200000	// Network multicast detected</div><div class='add'>+#define SXG_RCV_STATUS_NETWORK_OPTIONS		0x00100000	// Network options detected</div><div class='add'>+#define SXG_RCV_STATUS_NETWORK_OFFSET		0x00080000	// Network offset detected</div><div class='add'>+#define SXG_RCV_STATUS_NETWORK_FRAGMENT		0x00040000	// Network fragment detected</div><div class='add'>+#define SXG_RCV_STATUS_NETWORK_TRANS_MASK	0x00030000	// Network transport type mask</div><div class='add'>+#define SXG_RCV_STATUS_NETWORK_UDP			0x00020000	// UDP</div><div class='add'>+#define SXG_RCV_STATUS_NETWORK_TCP			0x00010000	// TCP</div><div class='add'>+#define SXG_RCV_STATUS_IPONLY				0x00008000	// IP-only not TCP</div><div class='add'>+#define SXG_RCV_STATUS_PKT_PRI				0x00006000	// Receive priority</div><div class='add'>+#define SXG_RCV_STATUS_PKT_PRI_SHFT					13	// Receive priority shift</div><div class='add'>+#define SXG_RCV_STATUS_PARITY				0x00001000	// MAC Receive RAM parity error</div><div class='add'>+#define SXG_RCV_STATUS_ADDRESS_MASK			0x00000F00	// Link address detection mask</div><div class='add'>+#define SXG_RCV_STATUS_ADDRESS_D			0x00000B00	// Link address D</div><div class='add'>+#define SXG_RCV_STATUS_ADDRESS_C			0x00000A00	// Link address C</div><div class='add'>+#define SXG_RCV_STATUS_ADDRESS_B			0x00000900	// Link address B</div><div class='add'>+#define SXG_RCV_STATUS_ADDRESS_A			0x00000800	// Link address A</div><div class='add'>+#define SXG_RCV_STATUS_ADDRESS_BCAST		0x00000300	// Link address broadcast</div><div class='add'>+#define SXG_RCV_STATUS_ADDRESS_MCAST		0x00000200	// Link address multicast</div><div class='add'>+#define SXG_RCV_STATUS_ADDRESS_CMCAST		0x00000100	// Link control multicast</div><div class='add'>+#define SXG_RCV_STATUS_LINK_MASK			0x000000FF	// Link status mask</div><div class='add'>+#define SXG_RCV_STATUS_LINK_ERROR			0x00000080	// Link error</div><div class='add'>+#define SXG_RCV_STATUS_LINK_MASK			0x000000FF	// Link status mask</div><div class='add'>+#define SXG_RCV_STATUS_LINK_PARITY			0x00000087	// RcvMacQ parity error</div><div class='add'>+#define SXG_RCV_STATUS_LINK_EARLY			0x00000086	// Data early</div><div class='add'>+#define SXG_RCV_STATUS_LINK_BUFOFLOW		0x00000085	// Buffer overflow</div><div class='add'>+#define SXG_RCV_STATUS_LINK_CODE			0x00000084	// Link code error</div><div class='add'>+#define SXG_RCV_STATUS_LINK_DRIBBLE			0x00000083	// Dribble nibble</div><div class='add'>+#define SXG_RCV_STATUS_LINK_CRC				0x00000082	// CRC error</div><div class='add'>+#define SXG_RCV_STATUS_LINK_OFLOW			0x00000081	// Link overflow</div><div class='add'>+#define SXG_RCV_STATUS_LINK_UFLOW			0x00000080	// Link underflow</div><div class='add'>+#define SXG_RCV_STATUS_LINK_8023			0x00000020	// 802.3</div><div class='add'>+#define SXG_RCV_STATUS_LINK_SNAP			0x00000010	// Snap</div><div class='add'>+#define SXG_RCV_STATUS_LINK_VLAN			0x00000008	// VLAN</div><div class='add'>+#define SXG_RCV_STATUS_LINK_TYPE_MASK		0x00000007	// Network type mask</div><div class='add'>+#define SXG_RCV_STATUS_LINK_CONTROL			0x00000003	// Control packet</div><div class='add'>+#define SXG_RCV_STATUS_LINK_IPV6			0x00000002	// IPv6 packet</div><div class='add'>+#define SXG_RCV_STATUS_LINK_IPV4			0x00000001	// IPv4 packet</div><div class='add'>+</div><div class='add'>+/***************************************************************************</div><div class='add'>+ * Sahara receive and transmit configuration registers</div><div class='add'>+ ***************************************************************************/</div><div class='add'>+#define	RCV_CONFIG_RESET			0x80000000	// RcvConfig register reset</div><div class='add'>+#define	RCV_CONFIG_ENABLE			0x40000000	// Enable the receive logic</div><div class='add'>+#define	RCV_CONFIG_ENPARSE			0x20000000	// Enable the receive parser</div><div class='add'>+#define	RCV_CONFIG_SOCKET			0x10000000	// Enable the socket detector</div><div class='add'>+#define	RCV_CONFIG_RCVBAD			0x08000000	// Receive all bad frames</div><div class='add'>+#define	RCV_CONFIG_CONTROL			0x04000000	// Receive all control frames</div><div class='add'>+#define	RCV_CONFIG_RCVPAUSE			0x02000000	// Enable pause transmit when attn</div><div class='add'>+#define	RCV_CONFIG_TZIPV6			0x01000000	// Include TCP port w/ IPv6 toeplitz</div><div class='add'>+#define	RCV_CONFIG_TZIPV4			0x00800000	// Include TCP port w/ IPv4 toeplitz</div><div class='add'>+#define	RCV_CONFIG_FLUSH			0x00400000	// Flush buffers</div><div class='add'>+#define	RCV_CONFIG_PRIORITY_MASK	0x00300000	// Priority level</div><div class='add'>+#define	RCV_CONFIG_HASH_MASK		0x00030000	// Hash depth</div><div class='add'>+#define	RCV_CONFIG_HASH_8			0x00000000	// Hash depth 8</div><div class='add'>+#define	RCV_CONFIG_HASH_16			0x00010000	// Hash depth 16</div><div class='add'>+#define	RCV_CONFIG_HASH_4			0x00020000	// Hash depth 4</div><div class='add'>+#define	RCV_CONFIG_HASH_2			0x00030000	// Hash depth 2</div><div class='add'>+#define	RCV_CONFIG_BUFLEN_MASK		0x0000FFF0	// Buffer length bits 15:4. ie multiple of 16.</div><div class='add'>+#define RCV_CONFIG_SKT_DIS			0x00000008	// Disable socket detection on attn</div><div class='add'>+// Macro to determine RCV_CONFIG_BUFLEN based on maximum frame size.</div><div class='add'>+// We add 18 bytes for Sahara receive status and padding, plus 4 bytes for CRC,</div><div class='add'>+// and round up to nearest 16 byte boundary</div><div class='add'>+#define RCV_CONFIG_BUFSIZE(_MaxFrame) ((((_MaxFrame) + 22) + 15) &amp; RCV_CONFIG_BUFLEN_MASK)</div><div class='add'>+</div><div class='add'>+#define	XMT_CONFIG_RESET			0x80000000	// XmtConfig register reset</div><div class='add'>+#define	XMT_CONFIG_ENABLE			0x40000000	// Enable transmit logic</div><div class='add'>+#define	XMT_CONFIG_MAC_PARITY		0x20000000	// Inhibit MAC RAM parity error</div><div class='add'>+#define	XMT_CONFIG_BUF_PARITY		0x10000000	// Inhibit D2F buffer parity error</div><div class='add'>+#define	XMT_CONFIG_MEM_PARITY		0x08000000	// Inhibit 1T SRAM parity error</div><div class='add'>+#define	XMT_CONFIG_INVERT_PARITY	0x04000000	// Invert MAC RAM parity</div><div class='add'>+#define	XMT_CONFIG_INITIAL_IPID		0x0000FFFF	// Initial IPID</div><div class='add'>+</div><div class='add'>+/***************************************************************************</div><div class='add'>+ * A-XGMAC Registers - Occupy 0x80 - 0xD4 of the SXG_HW_REGS</div><div class='add'>+ *</div><div class='add'>+ * Full register descriptions can be found in axgmac.pdf</div><div class='add'>+ ***************************************************************************/</div><div class='add'>+// A-XGMAC Configuration Register 0</div><div class='add'>+#define AXGMAC_CFG0_SUB_RESET		0x80000000		// Sub module reset</div><div class='add'>+#define AXGMAC_CFG0_RCNTRL_RESET	0x00400000		// Receive control reset</div><div class='add'>+#define AXGMAC_CFG0_RFUNC_RESET		0x00200000		// Receive function reset</div><div class='add'>+#define AXGMAC_CFG0_TCNTRL_RESET	0x00040000		// Transmit control reset</div><div class='add'>+#define AXGMAC_CFG0_TFUNC_RESET		0x00020000		// Transmit function reset</div><div class='add'>+#define AXGMAC_CFG0_MII_RESET		0x00010000		// MII Management reset</div><div class='add'>+</div><div class='add'>+// A-XGMAC Configuration Register 1</div><div class='add'>+#define AXGMAC_CFG1_XMT_PAUSE		0x80000000		// Allow the sending of Pause frames</div><div class='add'>+#define AXGMAC_CFG1_XMT_EN			0x40000000		// Enable transmit</div><div class='add'>+#define AXGMAC_CFG1_RCV_PAUSE		0x20000000		// Allow the detection of Pause frames</div><div class='add'>+#define AXGMAC_CFG1_RCV_EN			0x10000000		// Enable receive</div><div class='add'>+#define AXGMAC_CFG1_XMT_STATE		0x04000000		// Current transmit state - READ ONLY</div><div class='add'>+#define AXGMAC_CFG1_RCV_STATE		0x01000000		// Current receive state - READ ONLY</div><div class='add'>+#define AXGMAC_CFG1_XOFF_SHORT		0x00001000		// Only pause for 64 slot on XOFF</div><div class='add'>+#define AXGMAC_CFG1_XMG_FCS1		0x00000400		// Delay transmit FCS 1 4-byte word</div><div class='add'>+#define AXGMAC_CFG1_XMG_FCS2		0x00000800		// Delay transmit FCS 2 4-byte words</div><div class='add'>+#define AXGMAC_CFG1_XMG_FCS3		0x00000C00		// Delay transmit FCS 3 4-byte words</div><div class='add'>+#define AXGMAC_CFG1_RCV_FCS1		0x00000100		// Delay receive FCS 1 4-byte word</div><div class='add'>+#define AXGMAC_CFG1_RCV_FCS2		0x00000200		// Delay receive FCS 2 4-byte words</div><div class='add'>+#define AXGMAC_CFG1_RCV_FCS3		0x00000300		// Delay receive FCS 3 4-byte words</div><div class='add'>+#define AXGMAC_CFG1_PKT_OVERRIDE	0x00000080		// Per-packet override enable</div><div class='add'>+#define AXGMAC_CFG1_SWAP			0x00000040		// Byte swap enable</div><div class='add'>+#define AXGMAC_CFG1_SHORT_ASSERT	0x00000020		// ASSERT srdrpfrm on short frame (&lt;64)</div><div class='add'>+#define AXGMAC_CFG1_RCV_STRICT		0x00000010		// RCV only 802.3AE when CLEAR</div><div class='add'>+#define AXGMAC_CFG1_CHECK_LEN		0x00000008		// Verify frame length</div><div class='add'>+#define AXGMAC_CFG1_GEN_FCS			0x00000004		// Generate FCS</div><div class='add'>+#define AXGMAC_CFG1_PAD_MASK		0x00000003		// Mask for pad bits</div><div class='add'>+#define AXGMAC_CFG1_PAD_64			0x00000001		// Pad frames to 64 bytes</div><div class='add'>+#define AXGMAC_CFG1_PAD_VLAN		0x00000002		// Detect VLAN and pad to 68 bytes</div><div class='add'>+#define AXGMAC_CFG1_PAD_68			0x00000003		// Pad to 68 bytes</div><div class='add'>+</div><div class='add'>+// A-XGMAC Configuration Register 2</div><div class='add'>+#define AXGMAC_CFG2_GEN_PAUSE		0x80000000		// Generate single pause frame (test)</div><div class='add'>+#define AXGMAC_CFG2_LF_MANUAL		0x08000000		// Manual link fault sequence</div><div class='add'>+#define AXGMAC_CFG2_LF_AUTO			0x04000000		// Auto link fault sequence</div><div class='add'>+#define AXGMAC_CFG2_LF_REMOTE		0x02000000		// Remote link fault (READ ONLY)</div><div class='add'>+#define AXGMAC_CFG2_LF_LOCAL		0x01000000		// Local link fault (READ ONLY)</div><div class='add'>+#define AXGMAC_CFG2_IPG_MASK		0x001F0000		// Inter packet gap</div><div class='add'>+#define AXGMAC_CFG2_IPG_SHIFT		16</div><div class='add'>+#define AXGMAC_CFG2_PAUSE_XMT		0x00008000		// Pause transmit module</div><div class='add'>+#define AXGMAC_CFG2_IPG_EXTEN		0x00000020		// Enable IPG extension algorithm</div><div class='add'>+#define AXGMAC_CFG2_IPGEX_MASK		0x0000001F		// IPG extension</div><div class='add'>+</div><div class='add'>+// A-XGMAC Configuration Register 3</div><div class='add'>+#define AXGMAC_CFG3_RCV_DROP		0xFFFF0000		// Receive frame drop filter</div><div class='add'>+#define AXGMAC_CFG3_RCV_DONT_CARE	0x0000FFFF		// Receive frame don't care filter</div><div class='add'>+</div><div class='add'>+// A-XGMAC Station Address Register - Octets 1-4</div><div class='add'>+#define AXGMAC_SARLOW_OCTET_ONE		0xFF000000		// First octet</div><div class='add'>+#define AXGMAC_SARLOW_OCTET_TWO		0x00FF0000		// Second octet</div><div class='add'>+#define AXGMAC_SARLOW_OCTET_THREE	0x0000FF00		// Third octet</div><div class='add'>+#define AXGMAC_SARLOW_OCTET_FOUR	0x000000FF		// Fourth octet</div><div class='add'>+</div><div class='add'>+// A-XGMAC Station Address Register - Octets 5-6</div><div class='add'>+#define AXGMAC_SARHIGH_OCTET_FIVE	0xFF000000		// Fifth octet</div><div class='add'>+#define AXGMAC_SARHIGH_OCTET_SIX	0x00FF0000		// Sixth octet</div><div class='add'>+</div><div class='add'>+// A-XGMAC Maximum frame length register</div><div class='add'>+#define AXGMAC_MAXFRAME_XMT			0x3FFF0000		// Maximum transmit frame length</div><div class='add'>+#define AXGMAC_MAXFRAME_XMT_SHIFT	16</div><div class='add'>+#define AXGMAC_MAXFRAME_RCV			0x0000FFFF		// Maximum receive frame length</div><div class='add'>+// This register doesn't need to be written for standard MTU.</div><div class='add'>+// For jumbo, I'll just statically define the value here.  This</div><div class='add'>+// value sets the receive byte count to 9036 (0x234C) and the</div><div class='add'>+// transmit WORD count to 2259 (0x8D3).  These values include 22</div><div class='add'>+// bytes of padding beyond the jumbo MTU of 9014</div><div class='add'>+#define AXGMAC_MAXFRAME_JUMBO		0x08D3234C</div><div class='add'>+</div><div class='add'>+// A-XGMAC Revision level</div><div class='add'>+#define AXGMAC_REVISION_MASK		0x0000FFFF		// Revision level</div><div class='add'>+</div><div class='add'>+// A-XGMAC AMIIM Command Register</div><div class='add'>+#define AXGMAC_AMIIM_CMD_START		0x00000008		// Command start</div><div class='add'>+#define AXGMAC_AMIIM_CMD_MASK		0x00000007		// Command</div><div class='add'>+#define AXGMAC_AMIIM_CMD_LEGACY_WRITE		1		// 10/100/1000 Mbps Phy Write</div><div class='add'>+#define AXGMAC_AMIIM_CMD_LEGACY_READ		2		// 10/100/1000 Mbps Phy Read</div><div class='add'>+#define AXGMAC_AMIIM_CMD_MONITOR_SINGLE		3		// Monitor single PHY</div><div class='add'>+#define AXGMAC_AMIIM_CMD_MONITOR_MULTIPLE	4		// Monitor multiple contiguous PHYs</div><div class='add'>+#define AXGMAC_AMIIM_CMD_10G_OPERATION		5		// Present AMIIM Field Reg</div><div class='add'>+#define AXGMAC_AMIIM_CMD_CLEAR_LINK_FAIL	6		// Clear Link Fail Bit in MIIM</div><div class='add'>+</div><div class='add'>+// A-XGMAC AMIIM Field Register</div><div class='add'>+#define AXGMAC_AMIIM_FIELD_ST		0xC0000000		// 2-bit ST field</div><div class='add'>+#define AXGMAC_AMIIM_FIELD_ST_SHIFT			30</div><div class='add'>+#define AXGMAC_AMIIM_FIELD_OP		0x30000000		// 2-bit OP field</div><div class='add'>+#define AXGMAC_AMIIM_FIELD_OP_SHIFT			28</div><div class='add'>+#define AXGMAC_AMIIM_FIELD_PORT_ADDR 0x0F800000		// Port address field (hstphyadx in spec)</div><div class='add'>+#define AXGMAC_AMIIM_FIELD_PORT_SHIFT		23</div><div class='add'>+#define AXGMAC_AMIIM_FIELD_DEV_ADDR	0x007C0000		// Device address field (hstregadx in spec)</div><div class='add'>+#define AXGMAC_AMIIM_FIELD_DEV_SHIFT		18</div><div class='add'>+#define AXGMAC_AMIIM_FIELD_TA		0x00030000		// 2-bit TA field</div><div class='add'>+#define AXGMAC_AMIIM_FIELD_TA_SHIFT			16</div><div class='add'>+#define AXGMAC_AMIIM_FIELD_DATA		0x0000FFFF		// Data field</div><div class='add'>+</div><div class='add'>+// Values for the AXGMAC_AMIIM_FIELD_OP field in the A-XGMAC AMIIM Field Register</div><div class='add'>+#define	MIIM_OP_ADDR						0		// MIIM Address set operation</div><div class='add'>+#define	MIIM_OP_WRITE						1		// MIIM Write register operation</div><div class='add'>+#define	MIIM_OP_READ						2		// MIIM Read register operation</div><div class='add'>+#define	MIIM_OP_ADDR_SHIFT	(MIIM_OP_ADDR &lt;&lt; AXGMAC_AMIIM_FIELD_OP_SHIFT)</div><div class='add'>+</div><div class='add'>+// Values for the AXGMAC_AMIIM_FIELD_PORT_ADDR field in the A-XGMAC AMIIM Field Register</div><div class='add'>+#define	MIIM_PORT_NUM						1		// All Sahara MIIM modules use port 1</div><div class='add'>+</div><div class='add'>+// Values for the AXGMAC_AMIIM_FIELD_DEV_ADDR field in the A-XGMAC AMIIM Field Register</div><div class='add'>+#define	MIIM_DEV_PHY_PMA					1		// PHY PMA/PMD module MIIM device number</div><div class='add'>+#define	MIIM_DEV_PHY_PCS					3		// PHY PCS module MIIM device number</div><div class='add'>+#define	MIIM_DEV_PHY_XS						4		// PHY XS module MIIM device number</div><div class='add'>+#define	MIIM_DEV_XGXS						5		// XGXS MIIM device number</div><div class='add'>+</div><div class='add'>+// Values for the AXGMAC_AMIIM_FIELD_TA field in the A-XGMAC AMIIM Field Register</div><div class='add'>+#define	MIIM_TA_10GB						2		// set to 2 for 10 GB operation</div><div class='add'>+</div><div class='add'>+// A-XGMAC AMIIM Configuration Register</div><div class='add'>+#define AXGMAC_AMIIM_CFG_NOPREAM	0x00000080		// Bypass preamble of mngmt frame</div><div class='add'>+#define AXGMAC_AMIIM_CFG_HALF_CLOCK	0x0000007F		// half-clock duration of MDC output</div><div class='add'>+</div><div class='add'>+// A-XGMAC AMIIM Indicator Register</div><div class='add'>+#define AXGMAC_AMIIM_INDC_LINK		0x00000010		// Link status from legacy PHY or MMD</div><div class='add'>+#define AXGMAC_AMIIM_INDC_MPHY		0x00000008		// Multiple phy operation in progress</div><div class='add'>+#define AXGMAC_AMIIM_INDC_SPHY		0x00000004		// Single phy operation in progress</div><div class='add'>+#define AXGMAC_AMIIM_INDC_MON		0x00000002		// Single or multiple monitor cmd</div><div class='add'>+#define AXGMAC_AMIIM_INDC_BUSY		0x00000001		// Set until cmd operation complete</div><div class='add'>+</div><div class='add'>+// Link Status and Control Register</div><div class='add'>+#define	LS_PHY_CLR_RESET			0x80000000		// Clear reset signal to PHY</div><div class='add'>+#define	LS_SERDES_POWER_DOWN		0x40000000		// Power down the Sahara Serdes</div><div class='add'>+#define	LS_XGXS_ENABLE				0x20000000		// Enable the XAUI XGXS logic</div><div class='add'>+#define	LS_XGXS_CTL					0x10000000		// Hold XAUI XGXS logic reset until Serdes is up</div><div class='add'>+#define	LS_SERDES_DOWN				0x08000000		// When 0, XAUI Serdes is up and initialization is complete</div><div class='add'>+#define	LS_TRACE_DOWN				0x04000000		// When 0, Trace Serdes is up and initialization is complete</div><div class='add'>+#define	LS_PHY_CLK_25MHZ			0x02000000		// Set PHY clock to 25 MHz (else 156.125 MHz)</div><div class='add'>+#define	LS_PHY_CLK_EN				0x01000000		// Enable clock to PHY</div><div class='add'>+#define	LS_XAUI_LINK_UP				0x00000010		// XAUI link is up</div><div class='add'>+#define	LS_XAUI_LINK_CHNG			0x00000008		// XAUI link status has changed</div><div class='add'>+#define	LS_LINK_ALARM				0x00000004		// Link alarm pin</div><div class='add'>+#define	LS_ATTN_CTRL_MASK			0x00000003		// Mask link attention control bits</div><div class='add'>+#define	LS_ATTN_ALARM				0x00000000		// 00 =&gt; Attn on link alarm</div><div class='add'>+#define	LS_ATTN_ALARM_OR_STAT_CHNG	0x00000001		// 01 =&gt; Attn on link alarm or status change</div><div class='add'>+#define	LS_ATTN_STAT_CHNG			0x00000002		// 10 =&gt; Attn on link status change</div><div class='add'>+#define	LS_ATTN_NONE				0x00000003		// 11 =&gt; no Attn</div><div class='add'>+</div><div class='add'>+// Link Address High Registers</div><div class='add'>+#define	LINK_ADDR_ENABLE			0x80000000		// Enable this link address</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/***************************************************************************</div><div class='add'>+ * XGXS XAUI XGMII Extender registers</div><div class='add'>+ *</div><div class='add'>+ * Full register descriptions can be found in mxgxs.pdf</div><div class='add'>+ ***************************************************************************/</div><div class='add'>+// XGXS Register Map</div><div class='add'>+#define XGXS_ADDRESS_CONTROL1		0x0000			// XS Control 1</div><div class='add'>+#define XGXS_ADDRESS_STATUS1		0x0001			// XS Status 1</div><div class='add'>+#define XGXS_ADDRESS_DEVID_LOW		0x0002			// XS Device ID (low)</div><div class='add'>+#define XGXS_ADDRESS_DEVID_HIGH		0x0003			// XS Device ID (high)</div><div class='add'>+#define XGXS_ADDRESS_SPEED			0x0004			// XS Speed ability</div><div class='add'>+#define XGXS_ADDRESS_DEV_LOW		0x0005			// XS Devices in package</div><div class='add'>+#define XGXS_ADDRESS_DEV_HIGH		0x0006			// XS Devices in package</div><div class='add'>+#define XGXS_ADDRESS_STATUS2		0x0008			// XS Status 2</div><div class='add'>+#define XGXS_ADDRESS_PKGID_lOW		0x000E			// XS Package Identifier</div><div class='add'>+#define XGXS_ADDRESS_PKGID_HIGH		0x000F			// XS Package Identifier</div><div class='add'>+#define XGXS_ADDRESS_LANE_STATUS	0x0018			// 10G XGXS Lane Status</div><div class='add'>+#define XGXS_ADDRESS_TEST_CTRL		0x0019			// 10G XGXS Test Control</div><div class='add'>+#define XGXS_ADDRESS_RESET_LO1		0x8000			// Vendor-Specific Reset Lo 1</div><div class='add'>+#define XGXS_ADDRESS_RESET_LO2		0x8001			// Vendor-Specific Reset Lo 2</div><div class='add'>+#define XGXS_ADDRESS_RESET_HI1		0x8002			// Vendor-Specific Reset Hi 1</div><div class='add'>+#define XGXS_ADDRESS_RESET_HI2		0x8003			// Vendor-Specific Reset Hi 2</div><div class='add'>+</div><div class='add'>+// XS Control 1 register bit definitions</div><div class='add'>+#define XGXS_CONTROL1_RESET			0x8000			// Reset - self clearing</div><div class='add'>+#define XGXS_CONTROL1_LOOPBACK		0x4000			// Enable loopback</div><div class='add'>+#define XGXS_CONTROL1_SPEED1		0x2000			// 0 = unspecified, 1 = 10Gb+</div><div class='add'>+#define XGXS_CONTROL1_LOWPOWER		0x0400			// 1 = Low power mode</div><div class='add'>+#define XGXS_CONTROL1_SPEED2		0x0040			// Same as SPEED1 (?)</div><div class='add'>+#define XGXS_CONTROL1_SPEED			0x003C			// Everything reserved except zero (?)</div><div class='add'>+</div><div class='add'>+// XS Status 1 register bit definitions</div><div class='add'>+#define XGXS_STATUS1_FAULT			0x0080			// Fault detected</div><div class='add'>+#define XGXS_STATUS1_LINK			0x0004			// 1 = Link up</div><div class='add'>+#define XGXS_STATUS1_LOWPOWER		0x0002			// 1 = Low power supported</div><div class='add'>+</div><div class='add'>+// XS Speed register bit definitions</div><div class='add'>+#define XGXS_SPEED_10G				0x0001			// 1 = 10G capable</div><div class='add'>+</div><div class='add'>+// XS Devices register bit definitions</div><div class='add'>+#define XGXS_DEVICES_DTE			0x0020			// DTE XS Present</div><div class='add'>+#define XGXS_DEVICES_PHY			0x0010			// PHY XS Present</div><div class='add'>+#define XGXS_DEVICES_PCS			0x0008			// PCS Present</div><div class='add'>+#define XGXS_DEVICES_WIS			0x0004			// WIS Present</div><div class='add'>+#define XGXS_DEVICES_PMD			0x0002			// PMD/PMA Present</div><div class='add'>+#define XGXS_DEVICES_CLAUSE22		0x0001			// Clause 22 registers present</div><div class='add'>+</div><div class='add'>+// XS Devices High register bit definitions</div><div class='add'>+#define XGXS_DEVICES_VENDOR2		0x8000			// Vendor specific device 2</div><div class='add'>+#define XGXS_DEVICES_VENDOR1		0x4000			// Vendor specific device 1</div><div class='add'>+</div><div class='add'>+// XS Status 2 register bit definitions</div><div class='add'>+#define XGXS_STATUS2_DEV_MASK		0xC000			// Device present mask</div><div class='add'>+#define XGXS_STATUS2_DEV_RESPOND	0x8000			// Device responding</div><div class='add'>+#define XGXS_STATUS2_XMT_FAULT		0x0800			// Transmit fault</div><div class='add'>+#define XGXS_STATUS2_RCV_FAULT		0x0400			// Receive fault</div><div class='add'>+</div><div class='add'>+// XS Package ID High register bit definitions</div><div class='add'>+#define XGXS_PKGID_HIGH_ORG			0xFC00			// Organizationally Unique</div><div class='add'>+#define XGXS_PKGID_HIGH_MFG			0x03F0			// Manufacturer Model</div><div class='add'>+#define XGXS_PKGID_HIGH_REV			0x000F			// Revision Number</div><div class='add'>+</div><div class='add'>+// XS Lane Status register bit definitions</div><div class='add'>+#define XGXS_LANE_PHY				0x1000			// PHY/DTE lane alignment status</div><div class='add'>+#define XGXS_LANE_PATTERN			0x0800			// Pattern testing ability</div><div class='add'>+#define XGXS_LANE_LOOPBACK			0x0400			// PHY loopback ability</div><div class='add'>+#define XGXS_LANE_SYNC3				0x0008			// Lane 3 sync</div><div class='add'>+#define XGXS_LANE_SYNC2				0x0004			// Lane 2 sync</div><div class='add'>+#define XGXS_LANE_SYNC1				0x0002			// Lane 1 sync</div><div class='add'>+#define XGXS_LANE_SYNC0				0x0001			// Lane 0 sync</div><div class='add'>+</div><div class='add'>+// XS Test Control register bit definitions</div><div class='add'>+#define XGXS_TEST_PATTERN_ENABLE	0x0004			// Test pattern enabled</div><div class='add'>+#define XGXS_TEST_PATTERN_MASK		0x0003			// Test patterns</div><div class='add'>+#define XGXS_TEST_PATTERN_RSVD		0x0003			// Test pattern - reserved</div><div class='add'>+#define XGXS_TEST_PATTERN_MIX		0x0002			// Test pattern - mixed</div><div class='add'>+#define XGXS_TEST_PATTERN_LOW		0x0001			// Test pattern - low</div><div class='add'>+#define XGXS_TEST_PATTERN_HIGH		0x0001			// Test pattern - high</div><div class='add'>+</div><div class='add'>+/***************************************************************************</div><div class='add'>+ * External MDIO Bus Registers</div><div class='add'>+ *</div><div class='add'>+ * Full register descriptions can be found in PHY/XENPAK/IEEE specs</div><div class='add'>+ ***************************************************************************/</div><div class='add'>+// LASI (Link Alarm Status Interrupt) Registers (located in MIIM_DEV_PHY_PMA device)</div><div class='add'>+#define LASI_RX_ALARM_CONTROL		0x9000			// LASI RX_ALARM Control</div><div class='add'>+#define LASI_TX_ALARM_CONTROL		0x9001			// LASI TX_ALARM Control</div><div class='add'>+#define LASI_CONTROL				0x9002			// LASI Control</div><div class='add'>+#define LASI_RX_ALARM_STATUS		0x9003			// LASI RX_ALARM Status</div><div class='add'>+#define LASI_TX_ALARM_STATUS		0x9004			// LASI TX_ALARM Status</div><div class='add'>+#define LASI_STATUS					0x9005			// LASI Status</div><div class='add'>+</div><div class='add'>+// LASI_CONTROL bit definitions</div><div class='add'>+#define	LASI_CTL_RX_ALARM_ENABLE	0x0004			// Enable RX_ALARM interrupts</div><div class='add'>+#define	LASI_CTL_TX_ALARM_ENABLE	0x0002			// Enable TX_ALARM interrupts</div><div class='add'>+#define	LASI_CTL_LS_ALARM_ENABLE	0x0001			// Enable Link Status interrupts</div><div class='add'>+</div><div class='add'>+// LASI_STATUS bit definitions</div><div class='add'>+#define	LASI_STATUS_RX_ALARM		0x0004			// RX_ALARM status</div><div class='add'>+#define	LASI_STATUS_TX_ALARM		0x0002			// TX_ALARM status</div><div class='add'>+#define	LASI_STATUS_LS_ALARM		0x0001			// Link Status</div><div class='add'>+</div><div class='add'>+// PHY registers - PMA/PMD (device 1)</div><div class='add'>+#define	PHY_PMA_CONTROL1			0x0000			// PMA/PMD Control 1</div><div class='add'>+#define	PHY_PMA_STATUS1				0x0001			// PMA/PMD Status 1</div><div class='add'>+#define	PHY_PMA_RCV_DET				0x000A			// PMA/PMD Receive Signal Detect</div><div class='add'>+		// other PMA/PMD registers exist and can be defined as needed</div><div class='add'>+</div><div class='add'>+// PHY registers - PCS (device 3)</div><div class='add'>+#define	PHY_PCS_CONTROL1			0x0000			// PCS Control 1</div><div class='add'>+#define	PHY_PCS_STATUS1				0x0001			// PCS Status 1</div><div class='add'>+#define	PHY_PCS_10G_STATUS1			0x0020			// PCS 10GBASE-R Status 1</div><div class='add'>+		// other PCS registers exist and can be defined as needed</div><div class='add'>+</div><div class='add'>+// PHY registers - XS (device 4)</div><div class='add'>+#define	PHY_XS_CONTROL1				0x0000			// XS Control 1</div><div class='add'>+#define	PHY_XS_STATUS1				0x0001			// XS Status 1</div><div class='add'>+#define	PHY_XS_LANE_STATUS			0x0018			// XS Lane Status</div><div class='add'>+		// other XS registers exist and can be defined as needed</div><div class='add'>+</div><div class='add'>+// PHY_PMA_CONTROL1 register bit definitions</div><div class='add'>+#define	PMA_CONTROL1_RESET			0x8000			// PMA/PMD reset</div><div class='add'>+</div><div class='add'>+// PHY_PMA_RCV_DET register bit definitions</div><div class='add'>+#define	PMA_RCV_DETECT				0x0001			// PMA/PMD receive signal detect</div><div class='add'>+</div><div class='add'>+// PHY_PCS_10G_STATUS1 register bit definitions</div><div class='add'>+#define	PCS_10B_BLOCK_LOCK			0x0001			// PCS 10GBASE-R locked to receive blocks</div><div class='add'>+</div><div class='add'>+// PHY_XS_LANE_STATUS register bit definitions</div><div class='add'>+#define	XS_LANE_ALIGN				0x1000			// XS transmit lanes aligned</div><div class='add'>+</div><div class='add'>+// PHY Microcode download data structure</div><div class='add'>+typedef struct _PHY_UCODE {</div><div class='add'>+	ushort	Addr;</div><div class='add'>+	ushort	Data;</div><div class='add'>+} PHY_UCODE, *PPHY_UCODE;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*****************************************************************************</div><div class='add'>+ * Transmit Sequencer Command Descriptor definitions</div><div class='add'>+ *****************************************************************************/</div><div class='add'>+</div><div class='add'>+// This descriptor must be placed in GRAM.  The address of this descriptor</div><div class='add'>+// (along with a couple of control bits) is pushed onto the PxhCmdQ or PxlCmdQ</div><div class='add'>+// (Proxy high or low command queue).  This data is read by the Proxy Sequencer,</div><div class='add'>+// which pushes it onto the XmtCmdQ, which is (eventually) read by the Transmit</div><div class='add'>+// Sequencer, causing a packet to be transmitted.  Not all fields are valid for</div><div class='add'>+// all commands - see the Sahara spec for details.  Note that this structure is</div><div class='add'>+// only valid when compiled on a little endian machine.</div><div class='add'>+#pragma pack(push, 1)</div><div class='add'>+typedef struct _XMT_DESC {</div><div class='add'>+	ushort	XmtLen;			// word 0, bits [15:0] -  transmit length</div><div class='add'>+	unsigned char	XmtCtl;			// word 0, bits [23:16] - transmit control byte</div><div class='add'>+	unsigned char	Cmd;			// word 0, bits [31:24] - transmit command plus misc.</div><div class='add'>+	u32	XmtBufId;		// word 1, bits [31:0] -  transmit buffer ID</div><div class='add'>+	unsigned char	TcpStrt;		// word 2, bits [7:0] -   byte address of TCP header</div><div class='add'>+	unsigned char	IpStrt;			// word 2, bits [15:8] -  byte address of IP header</div><div class='add'>+	ushort	IpCkSum;		// word 2, bits [31:16] - partial IP checksum</div><div class='add'>+	ushort	TcpCkSum;		// word 3, bits [15:0] -  partial TCP checksum</div><div class='add'>+	ushort	Rsvd1;			// word 3, bits [31:16] - PAD</div><div class='add'>+	u32	Rsvd2;			// word 4, bits [31:0] -  PAD</div><div class='add'>+	u32	Rsvd3;			// word 5, bits [31:0] -  PAD</div><div class='add'>+	u32	Rsvd4;		    // word 6, bits [31:0] -  PAD</div><div class='add'>+	u32	Rsvd5;		    // word 7, bits [31:0] -  PAD</div><div class='add'>+} XMT_DESC, *PXMT_DESC;</div><div class='add'>+#pragma pack(pop)</div><div class='add'>+</div><div class='add'>+// XMT_DESC Cmd byte definitions</div><div class='add'>+		// command codes</div><div class='add'>+#define XMT_DESC_CMD_RAW_SEND		0		// raw send descriptor</div><div class='add'>+#define XMT_DESC_CMD_CSUM_INSERT	1		// checksum insert descriptor</div><div class='add'>+#define XMT_DESC_CMD_FORMAT			2		// format descriptor</div><div class='add'>+#define XMT_DESC_CMD_PRIME			3		// prime descriptor</div><div class='add'>+#define XMT_DESC_CMD_CODE_SHFT		6		// comand code shift (shift to bits [31:30] in word 0)</div><div class='add'>+		// shifted command codes</div><div class='add'>+#define XMT_RAW_SEND		(XMT_DESC_CMD_RAW_SEND    &lt;&lt; XMT_DESC_CMD_CODE_SHFT)</div><div class='add'>+#define XMT_CSUM_INSERT		(XMT_DESC_CMD_CSUM_INSERT &lt;&lt; XMT_DESC_CMD_CODE_SHFT)</div><div class='add'>+#define XMT_FORMAT			(XMT_DESC_CMD_FORMAT      &lt;&lt; XMT_DESC_CMD_CODE_SHFT)</div><div class='add'>+#define XMT_PRIME			(XMT_DESC_CMD_PRIME       &lt;&lt; XMT_DESC_CMD_CODE_SHFT)</div><div class='add'>+</div><div class='add'>+// XMT_DESC Control Byte (XmtCtl) definitions</div><div class='add'>+// NOTE:  These bits do not work on Sahara (Rev A)!</div><div class='add'>+#define	XMT_CTL_PAUSE_FRAME			0x80	// current frame is a pause control frame (for statistics)</div><div class='add'>+#define	XMT_CTL_CONTROL_FRAME		0x40	// current frame is a control frame (for statistics)</div><div class='add'>+#define	XMT_CTL_PER_PKT_QUAL		0x20	// per packet qualifier</div><div class='add'>+#define	XMT_CTL_PAD_MODE_NONE		0x00	// do not pad frame</div><div class='add'>+#define	XMT_CTL_PAD_MODE_64			0x08	// pad frame to 64 bytes</div><div class='add'>+#define	XMT_CTL_PAD_MODE_VLAN_68	0x10	// pad frame to 64 bytes, and VLAN frames to 68 bytes</div><div class='add'>+#define	XMT_CTL_PAD_MODE_68			0x18	// pad frame to 68 bytes</div><div class='add'>+#define	XMT_CTL_GEN_FCS				0x04	// generate FCS (CRC) for this frame</div><div class='add'>+#define	XMT_CTL_DELAY_FCS_0			0x00	// do not delay FCS calcution</div><div class='add'>+#define	XMT_CTL_DELAY_FCS_1			0x01	// delay FCS calculation by 1 (4-byte) word</div><div class='add'>+#define	XMT_CTL_DELAY_FCS_2			0x02	// delay FCS calculation by 2 (4-byte) words</div><div class='add'>+#define	XMT_CTL_DELAY_FCS_3			0x03	// delay FCS calculation by 3 (4-byte) words</div><div class='add'>+</div><div class='add'>+// XMT_DESC XmtBufId definition</div><div class='add'>+#define XMT_BUF_ID_SHFT		8			// The Xmt buffer ID is formed by dividing</div><div class='add'>+										// the buffer (DRAM) address by 256 (or &lt;&lt; 8)</div><div class='add'>+</div><div class='add'>+/*****************************************************************************</div><div class='add'>+ * Receiver Sequencer Definitions</div><div class='add'>+ *****************************************************************************/</div><div class='add'>+</div><div class='add'>+// Receive Event Queue (queues 3 - 6) bit definitions</div><div class='add'>+#define	RCV_EVTQ_RBFID_MASK		0x0000FFFF	// bit mask for the Receive Buffer ID</div><div class='add'>+</div><div class='add'>+// Receive Buffer ID definition</div><div class='add'>+#define RCV_BUF_ID_SHFT		5			// The Rcv buffer ID is formed by dividing</div><div class='add'>+										// the buffer (DRAM) address by 32 (or &lt;&lt; 5)</div><div class='add'>+</div><div class='add'>+// Format of the 18 byte Receive Buffer returned by the</div><div class='add'>+// Receive Sequencer for received packets</div><div class='add'>+#pragma pack(push, 1)</div><div class='add'>+typedef struct _RCV_BUF_HDR {</div><div class='add'>+	u32	Status;				// Status word from Rcv Seq Parser</div><div class='add'>+	ushort	Length;				// Rcv packet byte count</div><div class='add'>+	union {</div><div class='add'>+		ushort		TcpCsum;	// TCP checksum</div><div class='add'>+		struct {</div><div class='add'>+			unsigned char	TcpCsumL;	// lower 8 bits of the TCP checksum</div><div class='add'>+			unsigned char	LinkHash;	// Link hash (multicast frames only)</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+	ushort	SktHash;			// Socket hash</div><div class='add'>+	unsigned char	TcpHdrOffset;		// TCP header offset into packet</div><div class='add'>+	unsigned char	IpHdrOffset;		// IP header offset into packet</div><div class='add'>+	u32	TpzHash;			// Toeplitz hash</div><div class='add'>+	ushort	Reserved;			// Reserved</div><div class='add'>+} RCV_BUF_HDR, *PRCV_BUF_HDR;</div><div class='add'>+#pragma pack(pop)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*****************************************************************************</div><div class='add'>+ * Queue definitions</div><div class='add'>+ *****************************************************************************/</div><div class='add'>+</div><div class='add'>+// Ingress (read only) queue numbers</div><div class='add'>+#define PXY_BUF_Q		0		// Proxy Buffer Queue</div><div class='add'>+#define HST_EVT_Q		1		// Host Event Queue</div><div class='add'>+#define XMT_BUF_Q		2		// Transmit Buffer Queue</div><div class='add'>+#define SKT_EVL_Q		3		// RcvSqr Socket Event Low Priority Queue</div><div class='add'>+#define RCV_EVL_Q		4		// RcvSqr Rcv Event Low Priority Queue</div><div class='add'>+#define SKT_EVH_Q		5		// RcvSqr Socket Event High Priority Queue</div><div class='add'>+#define RCV_EVH_Q		6		// RcvSqr Rcv Event High Priority Queue</div><div class='add'>+#define DMA_RSP_Q		7		// Dma Response Queue - one per CPU context</div><div class='add'>+// Local (read/write) queue numbers</div><div class='add'>+#define LOCAL_A_Q		8		// Spare local Queue</div><div class='add'>+#define LOCAL_B_Q		9		// Spare local Queue</div><div class='add'>+#define LOCAL_C_Q		10		// Spare local Queue</div><div class='add'>+#define FSM_EVT_Q		11		// Finite-State-Machine Event Queue</div><div class='add'>+#define SBF_PAL_Q		12		// System Buffer Physical Address (low) Queue</div><div class='add'>+#define SBF_PAH_Q		13		// System Buffer Physical Address (high) Queue</div><div class='add'>+#define SBF_VAL_Q		14		// System Buffer Virtual Address (low) Queue</div><div class='add'>+#define SBF_VAH_Q		15		// System Buffer Virtual Address (high) Queue</div><div class='add'>+// Egress (write only) queue numbers</div><div class='add'>+#define H2G_CMD_Q		16		// Host to GlbRam DMA Command Queue</div><div class='add'>+#define H2D_CMD_Q		17		// Host to DRAM DMA Command Queue</div><div class='add'>+#define G2H_CMD_Q		18		// GlbRam to Host DMA Command Queue</div><div class='add'>+#define G2D_CMD_Q		19		// GlbRam to DRAM DMA Command Queue</div><div class='add'>+#define D2H_CMD_Q		20		// DRAM to Host DMA Command Queue</div><div class='add'>+#define D2G_CMD_Q		21		// DRAM to GlbRam DMA Command Queue</div><div class='add'>+#define D2D_CMD_Q		22		// DRAM to DRAM DMA Command Queue</div><div class='add'>+#define PXL_CMD_Q		23		// Low Priority Proxy Command Queue</div><div class='add'>+#define PXH_CMD_Q		24		// High Priority Proxy Command Queue</div><div class='add'>+#define RSQ_CMD_Q		25		// Receive Sequencer Command Queue</div><div class='add'>+#define RCV_BUF_Q		26		// Receive Buffer Queue</div><div class='add'>+</div><div class='add'>+// Bit definitions for the Proxy Command queues (PXL_CMD_Q and PXH_CMD_Q)</div><div class='add'>+#define PXY_COPY_EN		0x00200000		// enable copy of xmt descriptor to xmt command queue</div><div class='add'>+#define PXY_SIZE_16		0x00000000		// copy 16 bytes</div><div class='add'>+#define PXY_SIZE_32		0x00100000		// copy 32 bytes</div><div class='add'>+</div><div class='add'>+/*****************************************************************************</div><div class='add'>+ * SXG EEPROM/Flash Configuration Definitions</div><div class='add'>+ *****************************************************************************/</div><div class='add'>+#pragma pack(push, 1)</div><div class='add'>+</div><div class='add'>+//</div><div class='add'>+typedef struct _HW_CFG_DATA {</div><div class='add'>+	ushort		Addr;</div><div class='add'>+	union {</div><div class='add'>+		ushort	Data;</div><div class='add'>+		ushort	Checksum;</div><div class='add'>+	};</div><div class='add'>+} HW_CFG_DATA, *PHW_CFG_DATA;</div><div class='add'>+</div><div class='add'>+//</div><div class='add'>+#define	NUM_HW_CFG_ENTRIES	((128/sizeof(HW_CFG_DATA)) - 4)</div><div class='add'>+</div><div class='add'>+// MAC address</div><div class='add'>+typedef struct _SXG_CONFIG_MAC {</div><div class='add'>+	unsigned char		MacAddr[6];			// MAC Address</div><div class='add'>+} SXG_CONFIG_MAC, *PSXG_CONFIG_MAC;</div><div class='add'>+</div><div class='add'>+//</div><div class='add'>+typedef struct _ATK_FRU {</div><div class='add'>+	unsigned char		PartNum[6];</div><div class='add'>+	unsigned char		Revision[2];</div><div class='add'>+	unsigned char		Serial[14];</div><div class='add'>+} ATK_FRU, *PATK_FRU;</div><div class='add'>+</div><div class='add'>+// OEM FRU Format types</div><div class='add'>+#define	ATK_FRU_FORMAT		0x0000</div><div class='add'>+#define CPQ_FRU_FORMAT		0x0001</div><div class='add'>+#define DELL_FRU_FORMAT		0x0002</div><div class='add'>+#define HP_FRU_FORMAT		0x0003</div><div class='add'>+#define IBM_FRU_FORMAT		0x0004</div><div class='add'>+#define EMC_FRU_FORMAT		0x0005</div><div class='add'>+#define NO_FRU_FORMAT		0xFFFF</div><div class='add'>+</div><div class='add'>+// EEPROM/Flash Format</div><div class='add'>+typedef struct _SXG_CONFIG {</div><div class='add'>+	//</div><div class='add'>+	// Section 1 (128 bytes)</div><div class='add'>+	//</div><div class='add'>+	ushort			MagicWord;			// EEPROM/FLASH Magic code 'A5A5'</div><div class='add'>+	ushort			SpiClks;			// SPI bus clock dividers</div><div class='add'>+	HW_CFG_DATA		HwCfg[NUM_HW_CFG_ENTRIES];</div><div class='add'>+	//</div><div class='add'>+	//</div><div class='add'>+	//</div><div class='add'>+	ushort			Version;			// EEPROM format version</div><div class='add'>+	SXG_CONFIG_MAC	MacAddr[4];			// space for 4 MAC addresses</div><div class='add'>+	ATK_FRU			AtkFru;				// FRU information</div><div class='add'>+	ushort			OemFruFormat;		// OEM FRU format type</div><div class='add'>+	unsigned char			OemFru[76];			// OEM FRU information (optional)</div><div class='add'>+	ushort			Checksum;			// Checksum of section 2</div><div class='add'>+	// CS info XXXTODO</div><div class='add'>+} SXG_CONFIG, *PSXG_CONFIG;</div><div class='add'>+#pragma pack(pop)</div><div class='add'>+</div><div class='add'>+/*****************************************************************************</div><div class='add'>+ * Miscellaneous Hardware definitions</div><div class='add'>+ *****************************************************************************/</div><div class='add'>+</div><div class='add'>+// Sahara (ASIC level) defines</div><div class='add'>+#define SAHARA_GRAM_SIZE			0x020000		// GRAM size - 128 KB</div><div class='add'>+#define SAHARA_DRAM_SIZE			0x200000		// DRAM size - 2 MB</div><div class='add'>+#define SAHARA_QRAM_SIZE			0x004000		// QRAM size - 16K entries (64 KB)</div><div class='add'>+#define SAHARA_WCS_SIZE				0x002000		// WCS - 8K instructions (x 108 bits)</div><div class='add'>+</div><div class='add'>+// Arabia (board level) defines</div><div class='add'>+#define	FLASH_SIZE				0x080000		// 512 KB (4 Mb)</div><div class='add'>+#define	EEPROM_SIZE_XFMR		512				// true EEPROM size (bytes), including xfmr area</div><div class='add'>+#define	EEPROM_SIZE_NO_XFMR		256				// EEPROM size excluding xfmr area</div><div class='head'>diff --git a/drivers/staging/sxg/sxgphycode.h b/drivers/staging/sxg/sxgphycode.h<br/>new file mode 100644<br/>index 000000000000..26b36c81eb1a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/sxg/sxgphycode.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/sxg/sxgphycode.h</a></div><div class='hunk'>@@ -0,0 +1,349 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 1997-2008 Alacritech, Inc. All rights reserved</div><div class='add'>+ *</div><div class='add'>+ * sxgphycode.h:</div><div class='add'>+ *</div><div class='add'>+ * This file PHY microcode and register initialization data.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/**********************************************************************</div><div class='add'>+ * PHY Microcode</div><div class='add'>+ *</div><div class='add'>+ * The following contains both PHY microcode and PHY register</div><div class='add'>+ * initialization data.  It is specific to both the PHY and the</div><div class='add'>+ * type of transceiver.</div><div class='add'>+ *</div><div class='add'>+ **********************************************************************/</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Download for AEL2005C PHY with SR/LR transceiver (10GBASE-SR or 10GBASE-LR)</div><div class='add'>+ */</div><div class='add'>+static PHY_UCODE PhyUcode[] = {</div><div class='add'>+	/*</div><div class='add'>+	 * NOTE:  An address of 0 is a special case.  When the download routine</div><div class='add'>+	 * sees an address of 0, it does not write to the PHY.  Instead, it</div><div class='add'>+	 * delays the download.  The length of the delay (in ms) is given in</div><div class='add'>+	 * the data field.</div><div class='add'>+	 *</div><div class='add'>+	 * Delays are required at certain points.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Platform-specific MDIO Patches:</div><div class='add'>+	 * (include patches for 10G RX polarity flip, 50Mhz Synth, etc)</div><div class='add'>+	 */</div><div class='add'>+	/* Addr, Data */</div><div class='add'>+	{0xc017, 0xfeb0},	/* flip RX_LOS polarity (mandatory */</div><div class='add'>+				/*  patch for SFP+ applications) */</div><div class='add'>+	{0xC001, 0x0428},	/* flip RX serial polarity */</div><div class='add'>+</div><div class='add'>+	{0xc013, 0xf341},	/* invert lxmit clock (mandatory patch) */</div><div class='add'>+	{0xc210, 0x8000},	/* reset datapath (mandatory patch) */</div><div class='add'>+	{0xc210, 0x8100},	/* reset datapath (mandatory patch) */</div><div class='add'>+	{0xc210, 0x8000},	/* reset datapath (mandatory patch) */</div><div class='add'>+	{0xc210, 0x0000},	/* reset datapath (mandatory patch) */</div><div class='add'>+	{0x0000, 0x0032},	/* wait for 50ms for datapath reset to */</div><div class='add'>+				/* complete. (mandatory patch) */</div><div class='add'>+</div><div class='add'>+	/* Configure the LED's */</div><div class='add'>+	{0xc214, 0x0099},	/* configure the LED drivers */</div><div class='add'>+	{0xc216, 0x5f5f},	/* configure the Activity LED */</div><div class='add'>+	{0xc217, 0x33ff},	/* configure the Link LED */</div><div class='add'>+</div><div class='add'>+	/* Transceiver-specific MDIO Patches: */</div><div class='add'>+	{0xc010, 0x448a},	/* (bit 14) mask out high BER input from the */</div><div class='add'>+				/* LOS signal in 1.000A */</div><div class='add'>+				/* (mandatory patch for SR code)*/</div><div class='add'>+	{0xc003, 0x0181},	/* (bit 7) enable the CDR inc setting in */</div><div class='add'>+				/* 1.C005 (mandatory patch for SR code) */</div><div class='add'>+</div><div class='add'>+	/* Transceiver-specific Microcontroller Initialization: */</div><div class='add'>+	{0xc04a, 0x5200},	/* activate microcontroller and pause */</div><div class='add'>+	{0x0000, 0x0032},	/* wait 50ms for microcontroller before */</div><div class='add'>+				/* writing in code. */</div><div class='add'>+</div><div class='add'>+	/* code block starts here: */</div><div class='add'>+	{0xcc00, 0x2009},</div><div class='add'>+	{0xcc01, 0x3009},</div><div class='add'>+	{0xcc02, 0x27ff},</div><div class='add'>+	{0xcc03, 0x300f},</div><div class='add'>+	{0xcc04, 0x200c},</div><div class='add'>+	{0xcc05, 0x300c},</div><div class='add'>+	{0xcc06, 0x20c4},</div><div class='add'>+	{0xcc07, 0x3c04},</div><div class='add'>+	{0xcc08, 0x6437},</div><div class='add'>+	{0xcc09, 0x20c4},</div><div class='add'>+	{0xcc0a, 0x3c04},</div><div class='add'>+	{0xcc0b, 0x6437},</div><div class='add'>+	{0xcc0c, 0x25c4},</div><div class='add'>+	{0xcc0d, 0x3c54},</div><div class='add'>+	{0xcc0e, 0x6724},</div><div class='add'>+	{0xcc0f, 0x25c4},</div><div class='add'>+	{0xcc10, 0x3c54},</div><div class='add'>+	{0xcc11, 0x6724},</div><div class='add'>+	{0xcc12, 0x2042},</div><div class='add'>+	{0xcc13, 0x3012},</div><div class='add'>+	{0xcc14, 0x1002},</div><div class='add'>+	{0xcc15, 0x2482},</div><div class='add'>+	{0xcc16, 0x3012},</div><div class='add'>+	{0xcc17, 0x1002},</div><div class='add'>+	{0xcc18, 0x2a32},</div><div class='add'>+	{0xcc19, 0x3002},</div><div class='add'>+	{0xcc1a, 0x1002},</div><div class='add'>+	{0xcc1b, 0x200d},</div><div class='add'>+	{0xcc1c, 0x304d},</div><div class='add'>+	{0xcc1d, 0x2862},</div><div class='add'>+	{0xcc1e, 0x3012},</div><div class='add'>+	{0xcc1f, 0x1002},</div><div class='add'>+	{0xcc20, 0x2982},</div><div class='add'>+	{0xcc21, 0x3002},</div><div class='add'>+	{0xcc22, 0x1002},</div><div class='add'>+	{0xcc23, 0x628f},</div><div class='add'>+	{0xcc24, 0x20a4},</div><div class='add'>+	{0xcc25, 0x3004},</div><div class='add'>+	{0xcc26, 0x6438},</div><div class='add'>+	{0xcc27, 0x20a4},</div><div class='add'>+	{0xcc28, 0x3004},</div><div class='add'>+	{0xcc29, 0x6438},</div><div class='add'>+	{0xcc2a, 0x2015},</div><div class='add'>+	{0xcc2b, 0x3005},</div><div class='add'>+	{0xcc2c, 0x5853},</div><div class='add'>+	{0xcc2d, 0x2bd2},</div><div class='add'>+	{0xcc2e, 0x3002},</div><div class='add'>+	{0xcc2f, 0x1342},</div><div class='add'>+	{0xcc30, 0x200c},</div><div class='add'>+	{0xcc31, 0x300c},</div><div class='add'>+	{0xcc32, 0x2ff7},</div><div class='add'>+	{0xcc33, 0x30f7},</div><div class='add'>+	{0xcc34, 0x20c4},</div><div class='add'>+	{0xcc35, 0x3c04},</div><div class='add'>+	{0xcc36, 0x6724},</div><div class='add'>+	{0xcc37, 0x20c4},</div><div class='add'>+	{0xcc38, 0x3c04},</div><div class='add'>+	{0xcc39, 0x6724},</div><div class='add'>+	{0xcc3a, 0x2d32},</div><div class='add'>+	{0xcc3b, 0x3002},</div><div class='add'>+	{0xcc3c, 0x1002},</div><div class='add'>+	{0xcc3d, 0x2008},</div><div class='add'>+	{0xcc3e, 0x3008},</div><div class='add'>+	{0xcc3f, 0x5c83},</div><div class='add'>+	{0xcc40, 0x2d52},</div><div class='add'>+	{0xcc41, 0x3002},</div><div class='add'>+	{0xcc42, 0x1352},</div><div class='add'>+	{0xcc43, 0x2008},</div><div class='add'>+	{0xcc44, 0x3008},</div><div class='add'>+	{0xcc45, 0x5c83},</div><div class='add'>+	{0xcc46, 0x2d32},</div><div class='add'>+	{0xcc47, 0x3002},</div><div class='add'>+	{0xcc48, 0x1352},</div><div class='add'>+	{0xcc49, 0x201c},</div><div class='add'>+	{0xcc4a, 0x300c},</div><div class='add'>+	{0xcc4b, 0x200d},</div><div class='add'>+	{0xcc4c, 0x310d},</div><div class='add'>+	{0xcc4d, 0x2862},</div><div class='add'>+	{0xcc4e, 0x3012},</div><div class='add'>+	{0xcc4f, 0x1002},</div><div class='add'>+	{0xcc50, 0x2ed2},</div><div class='add'>+	{0xcc51, 0x3002},</div><div class='add'>+	{0xcc52, 0x1342},</div><div class='add'>+	{0xcc53, 0x6f72},</div><div class='add'>+	{0xcc54, 0x1002},</div><div class='add'>+	{0xcc55, 0x628f},</div><div class='add'>+	{0xcc56, 0x2514},</div><div class='add'>+	{0xcc57, 0x3c64},</div><div class='add'>+	{0xcc58, 0x6436},</div><div class='add'>+	{0xcc59, 0x2514},</div><div class='add'>+	{0xcc5a, 0x3c64},</div><div class='add'>+	{0xcc5b, 0x6436},</div><div class='add'>+	{0xcc5c, 0x2fa4},</div><div class='add'>+	{0xcc5d, 0x3cd4},</div><div class='add'>+	{0xcc5e, 0x6624},</div><div class='add'>+	{0xcc5f, 0x2fa4},</div><div class='add'>+	{0xcc60, 0x3cd4},</div><div class='add'>+	{0xcc61, 0x6624},</div><div class='add'>+	{0xcc62, 0x2f45},</div><div class='add'>+	{0xcc63, 0x3015},</div><div class='add'>+	{0xcc64, 0x5653},</div><div class='add'>+	{0xcc65, 0x2eb2},</div><div class='add'>+	{0xcc66, 0x3002},</div><div class='add'>+	{0xcc67, 0x13d2},</div><div class='add'>+	{0xcc68, 0x2ed2},</div><div class='add'>+	{0xcc69, 0x3002},</div><div class='add'>+	{0xcc6a, 0x1002},</div><div class='add'>+	{0xcc6b, 0x6f72},</div><div class='add'>+	{0xcc6c, 0x1002},</div><div class='add'>+	{0xcc6d, 0x628f},</div><div class='add'>+	{0xcc6e, 0x2602},</div><div class='add'>+	{0xcc6f, 0x3012},</div><div class='add'>+	{0xcc70, 0x1002},</div><div class='add'>+	{0xcc71, 0x200d},</div><div class='add'>+	{0xcc72, 0x320d},</div><div class='add'>+	{0xcc73, 0x2862},</div><div class='add'>+	{0xcc74, 0x3012},</div><div class='add'>+	{0xcc75, 0x1002},</div><div class='add'>+	{0xcc76, 0x25c4},</div><div class='add'>+	{0xcc77, 0x3c54},</div><div class='add'>+	{0xcc78, 0x6437},</div><div class='add'>+	{0xcc79, 0x25c4},</div><div class='add'>+	{0xcc7a, 0x3c54},</div><div class='add'>+	{0xcc7b, 0x6437},</div><div class='add'>+	{0xcc7c, 0x20c4},</div><div class='add'>+	{0xcc7d, 0x3c04},</div><div class='add'>+	{0xcc7e, 0x6724},</div><div class='add'>+	{0xcc7f, 0x20c4},</div><div class='add'>+	{0xcc80, 0x3c04},</div><div class='add'>+	{0xcc81, 0x6724},</div><div class='add'>+	{0xcc82, 0x6f72},</div><div class='add'>+	{0xcc83, 0x1002},</div><div class='add'>+	{0xcc84, 0x628f},</div><div class='add'>+	{0xcc85, 0x26f2},</div><div class='add'>+	{0xcc86, 0x3012},</div><div class='add'>+	{0xcc87, 0x1002},</div><div class='add'>+	{0xcc88, 0xc503},</div><div class='add'>+	{0xcc89, 0xd5d5},</div><div class='add'>+	{0xcc8a, 0xc600},</div><div class='add'>+	{0xcc8b, 0x2a6d},</div><div class='add'>+	{0xcc8c, 0xc601},</div><div class='add'>+	{0xcc8d, 0x2a4c},</div><div class='add'>+	{0xcc8e, 0xc602},</div><div class='add'>+	{0xcc8f, 0x0111},</div><div class='add'>+	{0xcc90, 0xc60c},</div><div class='add'>+	{0xcc91, 0x5900},</div><div class='add'>+	{0xcc92, 0xc710},</div><div class='add'>+	{0xcc93, 0x0700},</div><div class='add'>+	{0xcc94, 0xc718},</div><div class='add'>+	{0xcc95, 0x0700},</div><div class='add'>+	{0xcc96, 0xc720},</div><div class='add'>+	{0xcc97, 0x4700},</div><div class='add'>+	{0xcc98, 0xc801},</div><div class='add'>+	{0xcc99, 0x7f50},</div><div class='add'>+	{0xcc9a, 0xc802},</div><div class='add'>+	{0xcc9b, 0x7760},</div><div class='add'>+	{0xcc9c, 0xc803},</div><div class='add'>+	{0xcc9d, 0x7fce},</div><div class='add'>+	{0xcc9e, 0xc804},</div><div class='add'>+	{0xcc9f, 0x5700},</div><div class='add'>+	{0xcca0, 0xc805},</div><div class='add'>+	{0xcca1, 0x5f11},</div><div class='add'>+	{0xcca2, 0xc806},</div><div class='add'>+	{0xcca3, 0x4751},</div><div class='add'>+	{0xcca4, 0xc807},</div><div class='add'>+	{0xcca5, 0x57e1},</div><div class='add'>+	{0xcca6, 0xc808},</div><div class='add'>+	{0xcca7, 0x2700},</div><div class='add'>+	{0xcca8, 0xc809},</div><div class='add'>+	{0xcca9, 0x0000},</div><div class='add'>+	{0xccaa, 0xc821},</div><div class='add'>+	{0xccab, 0x0002},</div><div class='add'>+	{0xccac, 0xc822},</div><div class='add'>+	{0xccad, 0x0014},</div><div class='add'>+	{0xccae, 0xc832},</div><div class='add'>+	{0xccaf, 0x1186},</div><div class='add'>+	{0xccb0, 0xc847},</div><div class='add'>+	{0xccb1, 0x1e02},</div><div class='add'>+	{0xccb2, 0xc013},</div><div class='add'>+	{0xccb3, 0xf341},</div><div class='add'>+	{0xccb4, 0xc01a},</div><div class='add'>+	{0xccb5, 0x0446},</div><div class='add'>+	{0xccb6, 0xc024},</div><div class='add'>+	{0xccb7, 0x1000},</div><div class='add'>+	{0xccb8, 0xc025},</div><div class='add'>+	{0xccb9, 0x0a00},</div><div class='add'>+	{0xccba, 0xc026},</div><div class='add'>+	{0xccbb, 0x0c0c},</div><div class='add'>+	{0xccbc, 0xc027},</div><div class='add'>+	{0xccbd, 0x0c0c},</div><div class='add'>+	{0xccbe, 0xc029},</div><div class='add'>+	{0xccbf, 0x00a0},</div><div class='add'>+	{0xccc0, 0xc030},</div><div class='add'>+	{0xccc1, 0x0a00},</div><div class='add'>+	{0xccc2, 0xc03c},</div><div class='add'>+	{0xccc3, 0x001c},</div><div class='add'>+	{0xccc4, 0xc005},</div><div class='add'>+	{0xccc5, 0x7a06},</div><div class='add'>+	{0xccc6, 0x0000},</div><div class='add'>+	{0xccc7, 0x0000},</div><div class='add'>+	{0xccc8, 0x628f},</div><div class='add'>+	{0xccc9, 0x26f2},</div><div class='add'>+	{0xccca, 0x3012},</div><div class='add'>+	{0xcccb, 0x1002},</div><div class='add'>+	{0xcccc, 0xc620},</div><div class='add'>+	{0xcccd, 0x0000},</div><div class='add'>+	{0xccce, 0xc621},</div><div class='add'>+	{0xcccf, 0x003f},</div><div class='add'>+	{0xccd0, 0xc622},</div><div class='add'>+	{0xccd1, 0x0000},</div><div class='add'>+	{0xccd2, 0xc623},</div><div class='add'>+	{0xccd3, 0x0000},</div><div class='add'>+	{0xccd4, 0xc624},</div><div class='add'>+	{0xccd5, 0x0000},</div><div class='add'>+	{0xccd6, 0xc625},</div><div class='add'>+	{0xccd7, 0x0000},</div><div class='add'>+	{0xccd8, 0xc627},</div><div class='add'>+	{0xccd9, 0x0000},</div><div class='add'>+	{0xccda, 0xc628},</div><div class='add'>+	{0xccdb, 0x0000},</div><div class='add'>+	{0xccdc, 0xc62c},</div><div class='add'>+	{0xccdd, 0x0000},</div><div class='add'>+	{0xccde, 0x0000},</div><div class='add'>+	{0xccdf, 0x0000},</div><div class='add'>+	{0xcce0, 0x628f},</div><div class='add'>+	{0xcce1, 0xd019},</div><div class='add'>+	{0xcce2, 0x26f2},</div><div class='add'>+	{0xcce3, 0x3012},</div><div class='add'>+	{0xcce4, 0x1002},</div><div class='add'>+	{0xcce5, 0xc210},</div><div class='add'>+	{0xcce6, 0x8000},</div><div class='add'>+	{0xcce7, 0xc210},</div><div class='add'>+	{0xcce8, 0x8010},</div><div class='add'>+	{0xcce9, 0xc210},</div><div class='add'>+	{0xccea, 0x8000},</div><div class='add'>+	{0xcceb, 0xc210},</div><div class='add'>+	{0xccec, 0x0000},</div><div class='add'>+	{0xcced, 0x0000},</div><div class='add'>+	{0xccee, 0x0000},</div><div class='add'>+	{0xccef, 0x8221},</div><div class='add'>+	{0xccf0, 0x2752},</div><div class='add'>+	{0xccf1, 0x3012},</div><div class='add'>+	{0xccf2, 0x1002},</div><div class='add'>+	{0xccf3, 0x6f72},</div><div class='add'>+	{0xccf4, 0x1002},</div><div class='add'>+	{0xccf5, 0x2806},</div><div class='add'>+	{0xccf6, 0x3006},</div><div class='add'>+	{0xccf7, 0x2007},</div><div class='add'>+	{0xccf8, 0x3cc7},</div><div class='add'>+	{0xccf9, 0xe161},</div><div class='add'>+	{0xccfa, 0xc171},</div><div class='add'>+	{0xccfb, 0x6134},</div><div class='add'>+	{0xccfc, 0x6135},</div><div class='add'>+	{0xccfd, 0x5453},</div><div class='add'>+	{0xccfe, 0x2858},</div><div class='add'>+	{0xccff, 0x3018},</div><div class='add'>+	{0xcd00, 0x1348},</div><div class='add'>+	{0xcd01, 0x6524},</div><div class='add'>+	{0xcd02, 0x27b8},</div><div class='add'>+	{0xcd03, 0x3018},</div><div class='add'>+	{0xcd04, 0x1008},</div><div class='add'>+	{0xcd05, 0x1002},</div><div class='add'>+	{0xcd06, 0x628f},</div><div class='add'>+	{0xcd07, 0x5dd3},</div><div class='add'>+	{0xcd08, 0x2906},</div><div class='add'>+	{0xcd09, 0x3016},</div><div class='add'>+	{0xcd0a, 0x1306},</div><div class='add'>+	{0xcd0b, 0x2ff7},</div><div class='add'>+	{0xcd0c, 0x30f7},</div><div class='add'>+	{0xcd0d, 0x60b7},</div><div class='add'>+	{0xcd0e, 0xdffd},</div><div class='add'>+	{0xcd0f, 0x0008},</div><div class='add'>+	{0xcd10, 0x6f72},</div><div class='add'>+	{0xcd11, 0x1002},</div><div class='add'>+	{0xcd12, 0x0000},</div><div class='add'>+	{0xcdff, 0x0a01},</div><div class='add'>+	/* end of code block */</div><div class='add'>+</div><div class='add'>+	/* Unpause the microcontroller to start program */</div><div class='add'>+	{0xca00, 0x0080},</div><div class='add'>+	{0xca12, 0x0000},</div><div class='add'>+	{0x0000, 0x000A},	/* wait 10ms just to be safe */</div><div class='add'>+	{0xffff, 0xffff}	/* table terminator */</div><div class='add'>+};</div><div class='head'>diff --git a/drivers/staging/usbip/Kconfig b/drivers/staging/usbip/Kconfig<br/>new file mode 100644<br/>index 000000000000..7426235ccc44<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/usbip/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/usbip/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,36 @@</div><div class='add'>+config USB_IP_COMMON</div><div class='add'>+	tristate "USB IP support (EXPERIMENTAL)"</div><div class='add'>+	depends on USB &amp;&amp; EXPERIMENTAL</div><div class='add'>+	default N</div><div class='add'>+	---help---</div><div class='add'>+	  This enables pushing USB packets over IP to allow remote</div><div class='add'>+	  machines access to USB devices directly.  For more details,</div><div class='add'>+	  and links to the userspace utility programs to let this work</div><div class='add'>+	  properly, see http://usbip.naist.jp/</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here: the</div><div class='add'>+	  module will be called usbip_common_mod.</div><div class='add'>+</div><div class='add'>+	  If unsure, say N.</div><div class='add'>+</div><div class='add'>+config USB_IP_VHCI_HCD</div><div class='add'>+	tristate "USB IP client driver"</div><div class='add'>+	depends on USB_IP_COMMON</div><div class='add'>+	default N</div><div class='add'>+	---help---</div><div class='add'>+	 This enables the USB IP host controller driver which will</div><div class='add'>+	 run on the client machine.</div><div class='add'>+</div><div class='add'>+	 To compile this driver as a module, choose M here: the</div><div class='add'>+	 module will be called vhci_hcd.</div><div class='add'>+</div><div class='add'>+config USB_IP_HOST</div><div class='add'>+	tristate "USB IP host driver"</div><div class='add'>+	depends on USB_IP_COMMON</div><div class='add'>+	default N</div><div class='add'>+	---help---</div><div class='add'>+	 This enables the USB IP device driver which will run on the</div><div class='add'>+	 host machine.</div><div class='add'>+</div><div class='add'>+	 To compile this driver as a module, choose M here: the</div><div class='add'>+	 module will be called usbip.</div><div class='head'>diff --git a/drivers/staging/usbip/Makefile b/drivers/staging/usbip/Makefile<br/>new file mode 100644<br/>index 000000000000..179f4211f96b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/usbip/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/usbip/Makefile</a></div><div class='hunk'>@@ -0,0 +1,12 @@</div><div class='add'>+obj-$(CONFIG_USB_IP_COMMON) += usbip_common_mod.o</div><div class='add'>+usbip_common_mod-objs := usbip_common.o usbip_event.o</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_USB_IP_VHCI_HCD) += vhci-hcd.o</div><div class='add'>+vhci-hcd-objs := vhci_sysfs.o vhci_tx.o vhci_rx.o vhci_hcd.o</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_USB_IP_HOST) += usbip.o</div><div class='add'>+usbip-objs := stub_dev.o stub_main.o stub_rx.o stub_tx.o</div><div class='add'>+</div><div class='add'>+ifeq ($(CONFIG_USB_DEBUG),y)</div><div class='add'>+	EXTRA_CFLAGS += -DDEBUG</div><div class='add'>+endif</div><div class='head'>diff --git a/drivers/staging/usbip/README b/drivers/staging/usbip/README<br/>new file mode 100644<br/>index 000000000000..c11be5735485<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/usbip/README?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/usbip/README</a></div><div class='hunk'>@@ -0,0 +1,6 @@</div><div class='add'>+TODO:</div><div class='add'>+	- more discussion about the protocol</div><div class='add'>+	- testing</div><div class='add'>+	- review of the userspace interface</div><div class='add'>+</div><div class='add'>+Please send patches for this code to Greg Kroah-Hartman &lt;greg@kroah.com&gt;</div><div class='head'>diff --git a/drivers/staging/usbip/stub.h b/drivers/staging/usbip/stub.h<br/>new file mode 100644<br/>index 000000000000..f541a3a83bd3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/usbip/stub.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/usbip/stub.h</a></div><div class='hunk'>@@ -0,0 +1,95 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2003-2008 Takahiro Hirofuchi</div><div class='add'>+ *</div><div class='add'>+ * This is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,</div><div class='add'>+ * USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/net.h&gt;</div><div class='add'>+</div><div class='add'>+struct stub_device {</div><div class='add'>+	struct usb_interface *interface;</div><div class='add'>+	struct list_head list;</div><div class='add'>+</div><div class='add'>+	struct usbip_device ud;</div><div class='add'>+	__u32 devid;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * stub_priv preserves private data of each urb.</div><div class='add'>+	 * It is allocated as stub_priv_cache and assigned to urb-&gt;context.</div><div class='add'>+	 *</div><div class='add'>+	 * stub_priv is always linked to any one of 3 lists;</div><div class='add'>+	 *	priv_init: linked to this until the comletion of a urb.</div><div class='add'>+	 *	priv_tx  : linked to this after the completion of a urb.</div><div class='add'>+	 *	priv_free: linked to this after the sending of the result.</div><div class='add'>+	 *</div><div class='add'>+	 * Any of these list operations should be locked by priv_lock.</div><div class='add'>+	 */</div><div class='add'>+	spinlock_t priv_lock;</div><div class='add'>+	struct list_head priv_init;</div><div class='add'>+	struct list_head priv_tx;</div><div class='add'>+	struct list_head priv_free;</div><div class='add'>+</div><div class='add'>+	/* see comments for unlinking in stub_rx.c */</div><div class='add'>+	struct list_head unlink_tx;</div><div class='add'>+	struct list_head unlink_free;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	wait_queue_head_t tx_waitq;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* private data into urb-&gt;priv */</div><div class='add'>+struct stub_priv {</div><div class='add'>+	unsigned long seqnum;</div><div class='add'>+	struct list_head list;</div><div class='add'>+	struct stub_device *sdev;</div><div class='add'>+	struct urb *urb;</div><div class='add'>+</div><div class='add'>+	int unlinking;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct stub_unlink {</div><div class='add'>+	unsigned long seqnum;</div><div class='add'>+	struct list_head list;</div><div class='add'>+	__u32 status;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+extern struct kmem_cache *stub_priv_cache;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*-------------------------------------------------------------------------*/</div><div class='add'>+/* prototype declarations */</div><div class='add'>+</div><div class='add'>+/* stub_tx.c */</div><div class='add'>+void stub_complete(struct urb *);</div><div class='add'>+void stub_tx_loop(struct usbip_task *);</div><div class='add'>+</div><div class='add'>+/* stub_dev.c */</div><div class='add'>+extern struct usb_driver stub_driver;</div><div class='add'>+</div><div class='add'>+/* stub_rx.c */</div><div class='add'>+void stub_rx_loop(struct usbip_task *);</div><div class='add'>+void stub_enqueue_ret_unlink(struct stub_device *, __u32, __u32);</div><div class='add'>+</div><div class='add'>+/* stub_main.c */</div><div class='add'>+int match_busid(char *busid);</div><div class='add'>+void stub_device_cleanup_urbs(struct stub_device *sdev);</div><div class='head'>diff --git a/drivers/staging/usbip/stub_dev.c b/drivers/staging/usbip/stub_dev.c<br/>new file mode 100644<br/>index 000000000000..ee455a087eaf<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/usbip/stub_dev.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/usbip/stub_dev.c</a></div><div class='hunk'>@@ -0,0 +1,483 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2003-2008 Takahiro Hirofuchi</div><div class='add'>+ *</div><div class='add'>+ * This is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,</div><div class='add'>+ * USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "usbip_common.h"</div><div class='add'>+#include "stub.h"</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int stub_probe(struct usb_interface *interface,</div><div class='add'>+				const struct usb_device_id *id);</div><div class='add'>+static void stub_disconnect(struct usb_interface *interface);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Define device IDs here if you want to explicitly limit exportable devices.</div><div class='add'>+ * In the most cases, wild card matching will be ok because driver binding can</div><div class='add'>+ * be changed dynamically by a userland program.</div><div class='add'>+ */</div><div class='add'>+static struct usb_device_id stub_table[] = {</div><div class='add'>+#if 0</div><div class='add'>+	/* just an example */</div><div class='add'>+	{ USB_DEVICE(0x05ac, 0x0301) },   /* Mac 1 button mouse */</div><div class='add'>+	{ USB_DEVICE(0x0430, 0x0009) },   /* Plat Home Keyboard */</div><div class='add'>+	{ USB_DEVICE(0x059b, 0x0001) },   /* Iomega USB Zip 100 */</div><div class='add'>+	{ USB_DEVICE(0x04b3, 0x4427) },   /* IBM USB CD-ROM */</div><div class='add'>+	{ USB_DEVICE(0x05a9, 0xa511) },   /* LifeView USB cam */</div><div class='add'>+	{ USB_DEVICE(0x55aa, 0x0201) },   /* Imation card reader */</div><div class='add'>+	{ USB_DEVICE(0x046d, 0x0870) },   /* Qcam Express(QV-30) */</div><div class='add'>+	{ USB_DEVICE(0x04bb, 0x0101) },   /* IO-DATA HD 120GB */</div><div class='add'>+	{ USB_DEVICE(0x04bb, 0x0904) },   /* IO-DATA USB-ET/TX */</div><div class='add'>+	{ USB_DEVICE(0x04bb, 0x0201) },   /* IO-DATA USB-ET/TX */</div><div class='add'>+	{ USB_DEVICE(0x08bb, 0x2702) },   /* ONKYO USB Speaker */</div><div class='add'>+	{ USB_DEVICE(0x046d, 0x08b2) },   /* Logicool Qcam 4000 Pro */</div><div class='add'>+#endif</div><div class='add'>+	/* magic for wild card */</div><div class='add'>+	{ .driver_info = 1 },</div><div class='add'>+	{ 0, }                                     /* Terminating entry */</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(usb, stub_table);</div><div class='add'>+</div><div class='add'>+struct usb_driver stub_driver = {</div><div class='add'>+	.name		= "usbip",</div><div class='add'>+	.probe		= stub_probe,</div><div class='add'>+	.disconnect	= stub_disconnect,</div><div class='add'>+	.id_table	= stub_table,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*-------------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+/* Define sysfs entries for a usbip-bound device */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * usbip_status shows status of usbip as long as this driver is bound to the</div><div class='add'>+ * target device.</div><div class='add'>+ */</div><div class='add'>+static ssize_t show_status(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			   char *buf)</div><div class='add'>+{</div><div class='add'>+	struct stub_device *sdev = dev_get_drvdata(dev);</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	if (!sdev) {</div><div class='add'>+		dev_err(dev, "sdev is null\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;sdev-&gt;ud.lock);</div><div class='add'>+	status = sdev-&gt;ud.status;</div><div class='add'>+	spin_unlock(&amp;sdev-&gt;ud.lock);</div><div class='add'>+</div><div class='add'>+	return snprintf(buf, PAGE_SIZE, "%d\n", status);</div><div class='add'>+}</div><div class='add'>+static DEVICE_ATTR(usbip_status, S_IRUGO, show_status, NULL);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * usbip_sockfd gets a socket descriptor of an established TCP connection that</div><div class='add'>+ * is used to transfer usbip requests by kernel threads. -1 is a magic number</div><div class='add'>+ * by which usbip connection is finished.</div><div class='add'>+ */</div><div class='add'>+static ssize_t store_sockfd(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			    const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct stub_device *sdev = dev_get_drvdata(dev);</div><div class='add'>+	int sockfd = 0;</div><div class='add'>+	struct socket *socket;</div><div class='add'>+</div><div class='add'>+	if (!sdev) {</div><div class='add'>+		dev_err(dev, "sdev is null\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sscanf(buf, "%d", &amp;sockfd);</div><div class='add'>+</div><div class='add'>+	if (sockfd != -1) {</div><div class='add'>+		dev_info(dev, "stub up\n");</div><div class='add'>+</div><div class='add'>+		spin_lock(&amp;sdev-&gt;ud.lock);</div><div class='add'>+</div><div class='add'>+		if (sdev-&gt;ud.status != SDEV_ST_AVAILABLE) {</div><div class='add'>+			dev_err(dev, "not ready\n");</div><div class='add'>+			spin_unlock(&amp;sdev-&gt;ud.lock);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		socket = sockfd_to_socket(sockfd);</div><div class='add'>+		if (!socket) {</div><div class='add'>+			spin_unlock(&amp;sdev-&gt;ud.lock);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+#if 0</div><div class='add'>+		setnodelay(socket);</div><div class='add'>+		setkeepalive(socket);</div><div class='add'>+		setreuse(socket);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+		sdev-&gt;ud.tcp_socket = socket;</div><div class='add'>+</div><div class='add'>+		spin_unlock(&amp;sdev-&gt;ud.lock);</div><div class='add'>+</div><div class='add'>+		usbip_start_threads(&amp;sdev-&gt;ud);</div><div class='add'>+</div><div class='add'>+		spin_lock(&amp;sdev-&gt;ud.lock);</div><div class='add'>+		sdev-&gt;ud.status = SDEV_ST_USED;</div><div class='add'>+		spin_unlock(&amp;sdev-&gt;ud.lock);</div><div class='add'>+</div><div class='add'>+	} else {</div><div class='add'>+		dev_info(dev, "stub down\n");</div><div class='add'>+</div><div class='add'>+		spin_lock(&amp;sdev-&gt;ud.lock);</div><div class='add'>+		if (sdev-&gt;ud.status != SDEV_ST_USED) {</div><div class='add'>+			spin_unlock(&amp;sdev-&gt;ud.lock);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		spin_unlock(&amp;sdev-&gt;ud.lock);</div><div class='add'>+</div><div class='add'>+		usbip_event_add(&amp;sdev-&gt;ud, SDEV_EVENT_DOWN);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+static DEVICE_ATTR(usbip_sockfd, S_IWUSR, NULL, store_sockfd);</div><div class='add'>+</div><div class='add'>+static int stub_add_files(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	err = device_create_file(dev, &amp;dev_attr_usbip_status);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_status;</div><div class='add'>+</div><div class='add'>+	err = device_create_file(dev, &amp;dev_attr_usbip_sockfd);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_sockfd;</div><div class='add'>+</div><div class='add'>+	err = device_create_file(dev, &amp;dev_attr_usbip_debug);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_debug;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_debug:</div><div class='add'>+	device_remove_file(dev, &amp;dev_attr_usbip_sockfd);</div><div class='add'>+</div><div class='add'>+err_sockfd:</div><div class='add'>+	device_remove_file(dev, &amp;dev_attr_usbip_status);</div><div class='add'>+</div><div class='add'>+err_status:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void stub_remove_files(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	device_remove_file(dev, &amp;dev_attr_usbip_status);</div><div class='add'>+	device_remove_file(dev, &amp;dev_attr_usbip_sockfd);</div><div class='add'>+	device_remove_file(dev, &amp;dev_attr_usbip_debug);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*-------------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+/* Event handler functions called by an event handler thread */</div><div class='add'>+</div><div class='add'>+static void stub_shutdown_connection(struct usbip_device *ud)</div><div class='add'>+{</div><div class='add'>+	struct stub_device *sdev = container_of(ud, struct stub_device, ud);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * When removing an exported device, kernel panic sometimes occurred</div><div class='add'>+	 * and then EIP was sk_wait_data of stub_rx thread. Is this because</div><div class='add'>+	 * sk_wait_data returned though stub_rx thread was already finished by</div><div class='add'>+	 * step 1?</div><div class='add'>+	 */</div><div class='add'>+	if (ud-&gt;tcp_socket) {</div><div class='add'>+		udbg("shutdown tcp_socket %p\n", ud-&gt;tcp_socket);</div><div class='add'>+		kernel_sock_shutdown(ud-&gt;tcp_socket, SHUT_RDWR);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* 1. stop threads */</div><div class='add'>+	usbip_stop_threads(ud);</div><div class='add'>+</div><div class='add'>+	/* 2. close the socket */</div><div class='add'>+	/*</div><div class='add'>+	 * tcp_socket is freed after threads are killed.</div><div class='add'>+	 * So usbip_xmit do not touch NULL socket.</div><div class='add'>+	 */</div><div class='add'>+	if (ud-&gt;tcp_socket) {</div><div class='add'>+		sock_release(ud-&gt;tcp_socket);</div><div class='add'>+		ud-&gt;tcp_socket = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* 3. free used data */</div><div class='add'>+	stub_device_cleanup_urbs(sdev);</div><div class='add'>+</div><div class='add'>+	/* 4. free stub_unlink */</div><div class='add'>+	{</div><div class='add'>+		unsigned long flags;</div><div class='add'>+		struct stub_unlink *unlink, *tmp;</div><div class='add'>+</div><div class='add'>+		spin_lock_irqsave(&amp;sdev-&gt;priv_lock, flags);</div><div class='add'>+</div><div class='add'>+		list_for_each_entry_safe(unlink, tmp, &amp;sdev-&gt;unlink_tx, list) {</div><div class='add'>+			list_del(&amp;unlink-&gt;list);</div><div class='add'>+			kfree(unlink);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		list_for_each_entry_safe(unlink, tmp,</div><div class='add'>+						 &amp;sdev-&gt;unlink_free, list) {</div><div class='add'>+			list_del(&amp;unlink-&gt;list);</div><div class='add'>+			kfree(unlink);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		spin_unlock_irqrestore(&amp;sdev-&gt;priv_lock, flags);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void stub_device_reset(struct usbip_device *ud)</div><div class='add'>+{</div><div class='add'>+	struct stub_device *sdev = container_of(ud, struct stub_device, ud);</div><div class='add'>+	struct usb_device *udev = interface_to_usbdev(sdev-&gt;interface);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	udbg("device reset");</div><div class='add'>+	ret = usb_lock_device_for_reset(udev, sdev-&gt;interface);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(&amp;udev-&gt;dev, "lock for reset\n");</div><div class='add'>+</div><div class='add'>+		spin_lock(&amp;ud-&gt;lock);</div><div class='add'>+		ud-&gt;status = SDEV_ST_ERROR;</div><div class='add'>+		spin_unlock(&amp;ud-&gt;lock);</div><div class='add'>+</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* try to reset the device */</div><div class='add'>+	ret = usb_reset_device(udev);</div><div class='add'>+</div><div class='add'>+	usb_unlock_device(udev);</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;ud-&gt;lock);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;udev-&gt;dev, "device reset\n");</div><div class='add'>+		ud-&gt;status = SDEV_ST_ERROR;</div><div class='add'>+</div><div class='add'>+	} else {</div><div class='add'>+		dev_info(&amp;udev-&gt;dev, "device reset\n");</div><div class='add'>+		ud-&gt;status = SDEV_ST_AVAILABLE;</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;ud-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void stub_device_unusable(struct usbip_device *ud)</div><div class='add'>+{</div><div class='add'>+	spin_lock(&amp;ud-&gt;lock);</div><div class='add'>+	ud-&gt;status = SDEV_ST_ERROR;</div><div class='add'>+	spin_unlock(&amp;ud-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*-------------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * stub_device_alloc - allocate a new stub_device struct</div><div class='add'>+ * @interface: usb_interface of a new device</div><div class='add'>+ *</div><div class='add'>+ * Allocates and initializes a new stub_device struct.</div><div class='add'>+ */</div><div class='add'>+static struct stub_device *stub_device_alloc(struct usb_interface *interface)</div><div class='add'>+{</div><div class='add'>+	struct stub_device *sdev;</div><div class='add'>+	int busnum = interface_to_busnum(interface);</div><div class='add'>+	int devnum = interface_to_devnum(interface);</div><div class='add'>+</div><div class='add'>+	dev_dbg(&amp;interface-&gt;dev, "allocating stub device");</div><div class='add'>+</div><div class='add'>+	/* yes, it's a new device */</div><div class='add'>+	sdev = kzalloc(sizeof(struct stub_device), GFP_KERNEL);</div><div class='add'>+	if (!sdev) {</div><div class='add'>+		dev_err(&amp;interface-&gt;dev, "no memory for stub_device\n");</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sdev-&gt;interface = interface;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * devid is defined with devnum when this driver is first allocated.</div><div class='add'>+	 * devnum may change later if a device is reset. However, devid never</div><div class='add'>+	 * changes during a usbip connection.</div><div class='add'>+	 */</div><div class='add'>+	sdev-&gt;devid     = (busnum &lt;&lt; 16) | devnum;</div><div class='add'>+</div><div class='add'>+	usbip_task_init(&amp;sdev-&gt;ud.tcp_rx, "stub_rx", stub_rx_loop);</div><div class='add'>+	usbip_task_init(&amp;sdev-&gt;ud.tcp_tx, "stub_tx", stub_tx_loop);</div><div class='add'>+</div><div class='add'>+	sdev-&gt;ud.side = USBIP_STUB;</div><div class='add'>+	sdev-&gt;ud.status = SDEV_ST_AVAILABLE;</div><div class='add'>+	/* sdev-&gt;ud.lock = SPIN_LOCK_UNLOCKED; */</div><div class='add'>+	spin_lock_init(&amp;sdev-&gt;ud.lock);</div><div class='add'>+	sdev-&gt;ud.tcp_socket = NULL;</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;sdev-&gt;priv_init);</div><div class='add'>+	INIT_LIST_HEAD(&amp;sdev-&gt;priv_tx);</div><div class='add'>+	INIT_LIST_HEAD(&amp;sdev-&gt;priv_free);</div><div class='add'>+	INIT_LIST_HEAD(&amp;sdev-&gt;unlink_free);</div><div class='add'>+	INIT_LIST_HEAD(&amp;sdev-&gt;unlink_tx);</div><div class='add'>+	/* sdev-&gt;priv_lock = SPIN_LOCK_UNLOCKED; */</div><div class='add'>+	spin_lock_init(&amp;sdev-&gt;priv_lock);</div><div class='add'>+</div><div class='add'>+	init_waitqueue_head(&amp;sdev-&gt;tx_waitq);</div><div class='add'>+</div><div class='add'>+	sdev-&gt;ud.eh_ops.shutdown = stub_shutdown_connection;</div><div class='add'>+	sdev-&gt;ud.eh_ops.reset    = stub_device_reset;</div><div class='add'>+	sdev-&gt;ud.eh_ops.unusable = stub_device_unusable;</div><div class='add'>+</div><div class='add'>+	usbip_start_eh(&amp;sdev-&gt;ud);</div><div class='add'>+</div><div class='add'>+	udbg("register new interface\n");</div><div class='add'>+	return sdev;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int stub_device_free(struct stub_device *sdev)</div><div class='add'>+{</div><div class='add'>+	if (!sdev)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	kfree(sdev);</div><div class='add'>+	udbg("kfree udev ok\n");</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*-------------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * If a usb device has multiple active interfaces, this driver is bound to all</div><div class='add'>+ * the active interfaces. However, usbip exports *a* usb device (i.e., not *an*</div><div class='add'>+ * active interface). Currently, a userland program must ensure that it</div><div class='add'>+ * looks at the usbip's sysfs entries of only the first active interface.</div><div class='add'>+ *</div><div class='add'>+ * TODO: use "struct usb_device_driver" to bind a usb device.</div><div class='add'>+ * However, it seems it is not fully supported in mainline kernel yet</div><div class='add'>+ * (2.6.19.2).</div><div class='add'>+ */</div><div class='add'>+static int stub_probe(struct usb_interface *interface,</div><div class='add'>+		      const struct usb_device_id *id)</div><div class='add'>+{</div><div class='add'>+	struct usb_device *udev = interface_to_usbdev(interface);</div><div class='add'>+	struct stub_device *sdev = NULL;</div><div class='add'>+	char *udev_busid = interface-&gt;dev.parent-&gt;bus_id;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	dev_dbg(&amp;interface-&gt;dev, "Enter\n");</div><div class='add'>+</div><div class='add'>+	/* check we should claim or not by busid_table */</div><div class='add'>+	if (match_busid(udev_busid)) {</div><div class='add'>+		dev_info(&amp;interface-&gt;dev,</div><div class='add'>+			 "this device %s is not in match_busid table. skip!\n",</div><div class='add'>+			 udev_busid);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Return value should be ENODEV or ENOXIO to continue trying</div><div class='add'>+		 * other matched drivers by the driver core.</div><div class='add'>+		 * See driver_probe_device() in driver/base/dd.c</div><div class='add'>+		 */</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (udev-&gt;descriptor.bDeviceClass ==  USB_CLASS_HUB) {</div><div class='add'>+		udbg("this device %s is a usb hub device. skip!\n",</div><div class='add'>+								udev_busid);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!strcmp(udev-&gt;bus-&gt;bus_name, "vhci_hcd")) {</div><div class='add'>+		udbg("this device %s is attached on vhci_hcd. skip!\n",</div><div class='add'>+								udev_busid);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* ok. this is my device. */</div><div class='add'>+	sdev = stub_device_alloc(interface);</div><div class='add'>+	if (!sdev)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	dev_info(&amp;interface-&gt;dev, "USB/IP Stub: register a new interface "</div><div class='add'>+		 "(bus %u dev %u ifn %u)\n", udev-&gt;bus-&gt;busnum, udev-&gt;devnum,</div><div class='add'>+		 interface-&gt;cur_altsetting-&gt;desc.bInterfaceNumber);</div><div class='add'>+</div><div class='add'>+	/* set private data to usb_interface */</div><div class='add'>+	usb_set_intfdata(interface, sdev);</div><div class='add'>+</div><div class='add'>+	err = stub_add_files(&amp;interface-&gt;dev);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(&amp;interface-&gt;dev, "create sysfs files for %s\n",</div><div class='add'>+			udev_busid);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * called in usb_disconnect() or usb_deregister()</div><div class='add'>+ * but only if actconfig(active configuration) exists</div><div class='add'>+ */</div><div class='add'>+static void stub_disconnect(struct usb_interface *interface)</div><div class='add'>+{</div><div class='add'>+	struct stub_device *sdev = usb_get_intfdata(interface);</div><div class='add'>+</div><div class='add'>+	udbg("Enter\n");</div><div class='add'>+</div><div class='add'>+	/* get stub_device */</div><div class='add'>+	if (!sdev) {</div><div class='add'>+		err(" could not get device from inteface data");</div><div class='add'>+		/* BUG(); */</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	usb_set_intfdata(interface, NULL);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * NOTE:</div><div class='add'>+	 * rx/tx threads are invoked for each usb_device.</div><div class='add'>+	 */</div><div class='add'>+	stub_remove_files(&amp;interface-&gt;dev);</div><div class='add'>+</div><div class='add'>+	/* 1. shutdown the current connection */</div><div class='add'>+	usbip_event_add(&amp;sdev-&gt;ud, SDEV_EVENT_REMOVED);</div><div class='add'>+</div><div class='add'>+	/* 2. wait for the stop of the event handler */</div><div class='add'>+	usbip_stop_eh(&amp;sdev-&gt;ud);</div><div class='add'>+</div><div class='add'>+	/* 3. free sdev */</div><div class='add'>+	stub_device_free(sdev);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	udbg("bye\n");</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/staging/usbip/stub_main.c b/drivers/staging/usbip/stub_main.c<br/>new file mode 100644<br/>index 000000000000..c665d7f1ca9a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/usbip/stub_main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/usbip/stub_main.c</a></div><div class='hunk'>@@ -0,0 +1,300 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2003-2008 Takahiro Hirofuchi</div><div class='add'>+ *</div><div class='add'>+ * This is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,</div><div class='add'>+ * USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#include "usbip_common.h"</div><div class='add'>+#include "stub.h"</div><div class='add'>+</div><div class='add'>+/* Version Information */</div><div class='add'>+#define DRIVER_VERSION "1.0"</div><div class='add'>+#define DRIVER_AUTHOR "Takahiro Hirofuchi"</div><div class='add'>+#define DRIVER_DESC "Stub Driver for USB/IP"</div><div class='add'>+</div><div class='add'>+/* stub_priv is allocated from stub_priv_cache */</div><div class='add'>+struct kmem_cache *stub_priv_cache;</div><div class='add'>+</div><div class='add'>+/*-------------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+/* Define sysfs entries for the usbip driver */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * busid_tables defines matching busids that usbip can grab. A user can change</div><div class='add'>+ * dynamically what device is locally used and what device is exported to a</div><div class='add'>+ * remote host.</div><div class='add'>+ */</div><div class='add'>+#define MAX_BUSID 16</div><div class='add'>+static char busid_table[MAX_BUSID][BUS_ID_SIZE];</div><div class='add'>+static spinlock_t busid_table_lock;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+int match_busid(char *busid)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;busid_table_lock);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MAX_BUSID; i++)</div><div class='add'>+		if (busid_table[i][0])</div><div class='add'>+			if (!strncmp(busid_table[i], busid, BUS_ID_SIZE)) {</div><div class='add'>+				/* already registerd */</div><div class='add'>+				spin_unlock(&amp;busid_table_lock);</div><div class='add'>+				return 0;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;busid_table_lock);</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t show_match_busid(struct device_driver *drv, char *buf)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	char *out = buf;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;busid_table_lock);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MAX_BUSID; i++)</div><div class='add'>+		if (busid_table[i][0])</div><div class='add'>+			out += sprintf(out, "%s ", busid_table[i]);</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;busid_table_lock);</div><div class='add'>+</div><div class='add'>+	out += sprintf(out, "\n");</div><div class='add'>+</div><div class='add'>+	return out - buf;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int add_match_busid(char *busid)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!match_busid(busid))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;busid_table_lock);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MAX_BUSID; i++)</div><div class='add'>+		if (!busid_table[i][0]) {</div><div class='add'>+			strncpy(busid_table[i], busid, BUS_ID_SIZE);</div><div class='add'>+			spin_unlock(&amp;busid_table_lock);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;busid_table_lock);</div><div class='add'>+</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int del_match_busid(char *busid)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;busid_table_lock);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MAX_BUSID; i++)</div><div class='add'>+		if (!strncmp(busid_table[i], busid, BUS_ID_SIZE)) {</div><div class='add'>+			/* found */</div><div class='add'>+			memset(busid_table[i], 0, BUS_ID_SIZE);</div><div class='add'>+			spin_unlock(&amp;busid_table_lock);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;busid_table_lock);</div><div class='add'>+</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t store_match_busid(struct device_driver *dev, const char *buf,</div><div class='add'>+		size_t count)</div><div class='add'>+{</div><div class='add'>+	int len;</div><div class='add'>+	char busid[BUS_ID_SIZE];</div><div class='add'>+</div><div class='add'>+	if (count &lt; 5)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* strnlen() does not include \0 */</div><div class='add'>+	len = strnlen(buf + 4, BUS_ID_SIZE);</div><div class='add'>+</div><div class='add'>+	/* busid needs to include \0 termination */</div><div class='add'>+	if (!(len &lt; BUS_ID_SIZE))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	strncpy(busid, buf + 4, BUS_ID_SIZE);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	if (!strncmp(buf, "add ", 4)) {</div><div class='add'>+		if (add_match_busid(busid) &lt; 0)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		else {</div><div class='add'>+			udbg("add busid %s\n", busid);</div><div class='add'>+			return count;</div><div class='add'>+		}</div><div class='add'>+	} else if (!strncmp(buf, "del ", 4)) {</div><div class='add'>+		if (del_match_busid(busid) &lt; 0)</div><div class='add'>+			return -ENODEV;</div><div class='add'>+		else {</div><div class='add'>+			udbg("del busid %s\n", busid);</div><div class='add'>+			return count;</div><div class='add'>+		}</div><div class='add'>+	} else</div><div class='add'>+		return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static DRIVER_ATTR(match_busid, S_IRUSR|S_IWUSR, show_match_busid,</div><div class='add'>+							store_match_busid);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*-------------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+/* Cleanup functions used to free private data */</div><div class='add'>+</div><div class='add'>+static struct stub_priv *stub_priv_pop_from_listhead(struct list_head *listhead)</div><div class='add'>+{</div><div class='add'>+	struct stub_priv *priv, *tmp;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(priv, tmp, listhead, list) {</div><div class='add'>+		list_del(&amp;priv-&gt;list);</div><div class='add'>+		return priv;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct stub_priv *stub_priv_pop(struct stub_device *sdev)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	struct stub_priv *priv;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;sdev-&gt;priv_lock, flags);</div><div class='add'>+</div><div class='add'>+	priv = stub_priv_pop_from_listhead(&amp;sdev-&gt;priv_init);</div><div class='add'>+	if (priv) {</div><div class='add'>+		spin_unlock_irqrestore(&amp;sdev-&gt;priv_lock, flags);</div><div class='add'>+		return priv;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv = stub_priv_pop_from_listhead(&amp;sdev-&gt;priv_tx);</div><div class='add'>+	if (priv) {</div><div class='add'>+		spin_unlock_irqrestore(&amp;sdev-&gt;priv_lock, flags);</div><div class='add'>+		return priv;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv = stub_priv_pop_from_listhead(&amp;sdev-&gt;priv_free);</div><div class='add'>+	if (priv) {</div><div class='add'>+		spin_unlock_irqrestore(&amp;sdev-&gt;priv_lock, flags);</div><div class='add'>+		return priv;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;sdev-&gt;priv_lock, flags);</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void stub_device_cleanup_urbs(struct stub_device *sdev)</div><div class='add'>+{</div><div class='add'>+	struct stub_priv *priv;</div><div class='add'>+</div><div class='add'>+	udbg("free sdev %p\n", sdev);</div><div class='add'>+</div><div class='add'>+	while ((priv = stub_priv_pop(sdev))) {</div><div class='add'>+		struct urb *urb = priv-&gt;urb;</div><div class='add'>+</div><div class='add'>+		udbg("   free urb %p\n", urb);</div><div class='add'>+		usb_kill_urb(urb);</div><div class='add'>+</div><div class='add'>+		kmem_cache_free(stub_priv_cache, priv);</div><div class='add'>+</div><div class='add'>+		if (urb-&gt;transfer_buffer != NULL)</div><div class='add'>+			kfree(urb-&gt;transfer_buffer);</div><div class='add'>+</div><div class='add'>+		if (urb-&gt;setup_packet != NULL)</div><div class='add'>+			kfree(urb-&gt;setup_packet);</div><div class='add'>+</div><div class='add'>+		usb_free_urb(urb);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*-------------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+static int __init usb_stub_init(void)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	stub_priv_cache = kmem_cache_create("stub_priv",</div><div class='add'>+					    sizeof(struct stub_priv), 0,</div><div class='add'>+					    SLAB_HWCACHE_ALIGN, NULL);</div><div class='add'>+</div><div class='add'>+	if (!stub_priv_cache) {</div><div class='add'>+		printk(KERN_ERR KBUILD_MODNAME</div><div class='add'>+		       ": create stub_priv_cache error\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = usb_register(&amp;stub_driver);</div><div class='add'>+	if (ret) {</div><div class='add'>+		printk(KERN_ERR KBUILD_MODNAME ": usb_register failed %d\n",</div><div class='add'>+		       ret);</div><div class='add'>+		goto error_usb_register;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO KBUILD_MODNAME ":"</div><div class='add'>+	       DRIVER_DESC ":" DRIVER_VERSION "\n");</div><div class='add'>+</div><div class='add'>+	memset(busid_table, 0, sizeof(busid_table));</div><div class='add'>+	spin_lock_init(&amp;busid_table_lock);</div><div class='add'>+</div><div class='add'>+	ret = driver_create_file(&amp;stub_driver.drvwrap.driver,</div><div class='add'>+				 &amp;driver_attr_match_busid);</div><div class='add'>+</div><div class='add'>+	if (ret) {</div><div class='add'>+		printk(KERN_ERR KBUILD_MODNAME ": create driver sysfs\n");</div><div class='add'>+		goto error_create_file;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+error_create_file:</div><div class='add'>+	usb_deregister(&amp;stub_driver);</div><div class='add'>+error_usb_register:</div><div class='add'>+	kmem_cache_destroy(stub_priv_cache);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit usb_stub_exit(void)</div><div class='add'>+{</div><div class='add'>+	driver_remove_file(&amp;stub_driver.drvwrap.driver,</div><div class='add'>+			   &amp;driver_attr_match_busid);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * deregister() calls stub_disconnect() for all devices. Device</div><div class='add'>+	 * specific data is cleared in stub_disconnect().</div><div class='add'>+	 */</div><div class='add'>+	usb_deregister(&amp;stub_driver);</div><div class='add'>+</div><div class='add'>+	kmem_cache_destroy(stub_priv_cache);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(usb_stub_init);</div><div class='add'>+module_exit(usb_stub_exit);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR(DRIVER_AUTHOR);</div><div class='add'>+MODULE_DESCRIPTION(DRIVER_DESC);</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/staging/usbip/stub_rx.c b/drivers/staging/usbip/stub_rx.c<br/>new file mode 100644<br/>index 000000000000..36ce898fced5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/usbip/stub_rx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/usbip/stub_rx.c</a></div><div class='hunk'>@@ -0,0 +1,615 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2003-2008 Takahiro Hirofuchi</div><div class='add'>+ *</div><div class='add'>+ * This is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,</div><div class='add'>+ * USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "usbip_common.h"</div><div class='add'>+#include "stub.h"</div><div class='add'>+#include "../../usb/core/hcd.h"</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int is_clear_halt_cmd(struct urb *urb)</div><div class='add'>+{</div><div class='add'>+	struct usb_ctrlrequest *req;</div><div class='add'>+</div><div class='add'>+	req = (struct usb_ctrlrequest *) urb-&gt;setup_packet;</div><div class='add'>+</div><div class='add'>+	 return (req-&gt;bRequest == USB_REQ_CLEAR_FEATURE) &amp;&amp;</div><div class='add'>+		 (req-&gt;bRequestType == USB_RECIP_ENDPOINT) &amp;&amp;</div><div class='add'>+		 (req-&gt;wValue == USB_ENDPOINT_HALT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int is_set_interface_cmd(struct urb *urb)</div><div class='add'>+{</div><div class='add'>+	struct usb_ctrlrequest *req;</div><div class='add'>+</div><div class='add'>+	req = (struct usb_ctrlrequest *) urb-&gt;setup_packet;</div><div class='add'>+</div><div class='add'>+	return (req-&gt;bRequest == USB_REQ_SET_INTERFACE) &amp;&amp;</div><div class='add'>+		   (req-&gt;bRequestType == USB_RECIP_INTERFACE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int is_set_configuration_cmd(struct urb *urb)</div><div class='add'>+{</div><div class='add'>+	struct usb_ctrlrequest *req;</div><div class='add'>+</div><div class='add'>+	req = (struct usb_ctrlrequest *) urb-&gt;setup_packet;</div><div class='add'>+</div><div class='add'>+	return (req-&gt;bRequest == USB_REQ_SET_CONFIGURATION) &amp;&amp;</div><div class='add'>+		   (req-&gt;bRequestType == USB_RECIP_DEVICE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int is_reset_device_cmd(struct urb *urb)</div><div class='add'>+{</div><div class='add'>+	struct usb_ctrlrequest *req;</div><div class='add'>+	__u16 value;</div><div class='add'>+	__u16 index;</div><div class='add'>+</div><div class='add'>+	req = (struct usb_ctrlrequest *) urb-&gt;setup_packet;</div><div class='add'>+	value = le16_to_cpu(req-&gt;wValue);</div><div class='add'>+	index = le16_to_cpu(req-&gt;wIndex);</div><div class='add'>+</div><div class='add'>+	if ((req-&gt;bRequest == USB_REQ_SET_FEATURE) &amp;&amp;</div><div class='add'>+			(req-&gt;bRequestType == USB_RT_PORT) &amp;&amp;</div><div class='add'>+			(value = USB_PORT_FEAT_RESET)) {</div><div class='add'>+		dbg_stub_rx("reset_device_cmd, port %u\n", index);</div><div class='add'>+		return 1;</div><div class='add'>+	} else</div><div class='add'>+		return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tweak_clear_halt_cmd(struct urb *urb)</div><div class='add'>+{</div><div class='add'>+	struct usb_ctrlrequest *req;</div><div class='add'>+	int target_endp;</div><div class='add'>+	int target_dir;</div><div class='add'>+	int target_pipe;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	req = (struct usb_ctrlrequest *) urb-&gt;setup_packet;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The stalled endpoint is specified in the wIndex value. The endpoint</div><div class='add'>+	 * of the urb is the target of this clear_halt request (i.e., control</div><div class='add'>+	 * endpoint).</div><div class='add'>+	 */</div><div class='add'>+	target_endp = le16_to_cpu(req-&gt;wIndex) &amp; 0x000f;</div><div class='add'>+</div><div class='add'>+	/* the stalled endpoint direction is IN or OUT?. USB_DIR_IN is 0x80.  */</div><div class='add'>+	target_dir = le16_to_cpu(req-&gt;wIndex) &amp; 0x0080;</div><div class='add'>+</div><div class='add'>+	if (target_dir)</div><div class='add'>+		target_pipe = usb_rcvctrlpipe(urb-&gt;dev, target_endp);</div><div class='add'>+	else</div><div class='add'>+		target_pipe = usb_sndctrlpipe(urb-&gt;dev, target_endp);</div><div class='add'>+</div><div class='add'>+	ret = usb_clear_halt(urb-&gt;dev, target_pipe);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		uinfo("clear_halt error: devnum %d endp %d, %d\n",</div><div class='add'>+				urb-&gt;dev-&gt;devnum, target_endp, ret);</div><div class='add'>+	else</div><div class='add'>+		uinfo("clear_halt done: devnum %d endp %d\n",</div><div class='add'>+				urb-&gt;dev-&gt;devnum, target_endp);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tweak_set_interface_cmd(struct urb *urb)</div><div class='add'>+{</div><div class='add'>+	struct usb_ctrlrequest *req;</div><div class='add'>+	__u16 alternate;</div><div class='add'>+	__u16 interface;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	req = (struct usb_ctrlrequest *) urb-&gt;setup_packet;</div><div class='add'>+	alternate = le16_to_cpu(req-&gt;wValue);</div><div class='add'>+	interface = le16_to_cpu(req-&gt;wIndex);</div><div class='add'>+</div><div class='add'>+	dbg_stub_rx("set_interface: inf %u alt %u\n", interface, alternate);</div><div class='add'>+</div><div class='add'>+	ret = usb_set_interface(urb-&gt;dev, interface, alternate);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		uinfo("set_interface error: inf %u alt %u, %d\n",</div><div class='add'>+				interface, alternate, ret);</div><div class='add'>+	else</div><div class='add'>+		uinfo("set_interface done: inf %u alt %u\n",</div><div class='add'>+							interface,</div><div class='add'>+							alternate);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tweak_set_configuration_cmd(struct urb *urb)</div><div class='add'>+{</div><div class='add'>+	struct usb_ctrlrequest *req;</div><div class='add'>+	__u16 config;</div><div class='add'>+</div><div class='add'>+	req = (struct usb_ctrlrequest *) urb-&gt;setup_packet;</div><div class='add'>+	config = le16_to_cpu(req-&gt;wValue);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * I have never seen a multi-config device. Very rare.</div><div class='add'>+	 * For most devices, this will be called to choose a default</div><div class='add'>+	 * configuration only once in an initialization phase.</div><div class='add'>+	 *</div><div class='add'>+	 * set_configuration may change a device configuration and its device</div><div class='add'>+	 * drivers will be unbound and assigned for a new device configuration.</div><div class='add'>+	 * This means this usbip driver will be also unbound when called, then</div><div class='add'>+	 * eventually reassigned to the device as far as driver matching</div><div class='add'>+	 * condition is kept.</div><div class='add'>+	 *</div><div class='add'>+	 * Unfortunatelly, an existing usbip connection will be dropped</div><div class='add'>+	 * due to this driver unbinding. So, skip here.</div><div class='add'>+	 * A user may need to set a special configuration value before</div><div class='add'>+	 * exporting the device.</div><div class='add'>+	 */</div><div class='add'>+	uinfo("set_configuration (%d) to %s\n", config, urb-&gt;dev-&gt;dev.bus_id);</div><div class='add'>+	uinfo("but, skip!\n");</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+	/* return usb_driver_set_configuration(urb-&gt;dev, config); */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tweak_reset_device_cmd(struct urb *urb)</div><div class='add'>+{</div><div class='add'>+	struct usb_ctrlrequest *req;</div><div class='add'>+	__u16 value;</div><div class='add'>+	__u16 index;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	req = (struct usb_ctrlrequest *) urb-&gt;setup_packet;</div><div class='add'>+	value = le16_to_cpu(req-&gt;wValue);</div><div class='add'>+	index = le16_to_cpu(req-&gt;wIndex);</div><div class='add'>+</div><div class='add'>+	uinfo("reset_device (port %d) to %s\n", index, urb-&gt;dev-&gt;dev.bus_id);</div><div class='add'>+</div><div class='add'>+	/* all interfaces should be owned by usbip driver, so just reset it.  */</div><div class='add'>+	ret = usb_lock_device_for_reset(urb-&gt;dev, NULL);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(&amp;urb-&gt;dev-&gt;dev, "lock for reset\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* try to reset the device */</div><div class='add'>+	ret = usb_reset_device(urb-&gt;dev);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		dev_err(&amp;urb-&gt;dev-&gt;dev, "device reset\n");</div><div class='add'>+</div><div class='add'>+	usb_unlock_device(urb-&gt;dev);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * clear_halt, set_interface, and set_configuration require special tricks.</div><div class='add'>+ */</div><div class='add'>+static void tweak_special_requests(struct urb *urb)</div><div class='add'>+{</div><div class='add'>+	if (!urb || !urb-&gt;setup_packet)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (usb_pipetype(urb-&gt;pipe) != PIPE_CONTROL)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (is_clear_halt_cmd(urb))</div><div class='add'>+		/* tweak clear_halt */</div><div class='add'>+		 tweak_clear_halt_cmd(urb);</div><div class='add'>+</div><div class='add'>+	else if (is_set_interface_cmd(urb))</div><div class='add'>+		/* tweak set_interface */</div><div class='add'>+		tweak_set_interface_cmd(urb);</div><div class='add'>+</div><div class='add'>+	else if (is_set_configuration_cmd(urb))</div><div class='add'>+		/* tweak set_configuration */</div><div class='add'>+		tweak_set_configuration_cmd(urb);</div><div class='add'>+</div><div class='add'>+	else if (is_reset_device_cmd(urb))</div><div class='add'>+		tweak_reset_device_cmd(urb);</div><div class='add'>+	else</div><div class='add'>+		dbg_stub_rx("no need to tweak\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * stub_recv_unlink() unlinks the URB by a call to usb_unlink_urb().</div><div class='add'>+ * By unlinking the urb asynchronously, stub_rx can continuously</div><div class='add'>+ * process coming urbs.  Even if the urb is unlinked, its completion</div><div class='add'>+ * handler will be called and stub_tx will send a return pdu.</div><div class='add'>+ *</div><div class='add'>+ * See also comments about unlinking strategy in vhci_hcd.c.</div><div class='add'>+ */</div><div class='add'>+static int stub_recv_cmd_unlink(struct stub_device *sdev,</div><div class='add'>+						struct usbip_header *pdu)</div><div class='add'>+{</div><div class='add'>+	struct list_head *listhead = &amp;sdev-&gt;priv_init;</div><div class='add'>+	struct list_head *ptr;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	struct stub_priv *priv;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;sdev-&gt;priv_lock, flags);</div><div class='add'>+</div><div class='add'>+	for (ptr = listhead-&gt;next; ptr != listhead; ptr = ptr-&gt;next) {</div><div class='add'>+		priv = list_entry(ptr, struct stub_priv, list);</div><div class='add'>+		if (priv-&gt;seqnum == pdu-&gt;u.cmd_unlink.seqnum) {</div><div class='add'>+			int ret;</div><div class='add'>+</div><div class='add'>+			dev_info(&amp;priv-&gt;urb-&gt;dev-&gt;dev, "unlink urb %p\n",</div><div class='add'>+				 priv-&gt;urb);</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * This matched urb is not completed yet (i.e., be in</div><div class='add'>+			 * flight in usb hcd hardware/driver). Now we are</div><div class='add'>+			 * cancelling it. The unlinking flag means that we are</div><div class='add'>+			 * now not going to return the normal result pdu of a</div><div class='add'>+			 * submission request, but going to return a result pdu</div><div class='add'>+			 * of the unlink request.</div><div class='add'>+			 */</div><div class='add'>+			priv-&gt;unlinking = 1;</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * In the case that unlinking flag is on, prev-&gt;seqnum</div><div class='add'>+			 * is changed from the seqnum of the cancelling urb to</div><div class='add'>+			 * the seqnum of the unlink request. This will be used</div><div class='add'>+			 * to make the result pdu of the unlink request.</div><div class='add'>+			 */</div><div class='add'>+			priv-&gt;seqnum = pdu-&gt;base.seqnum;</div><div class='add'>+</div><div class='add'>+			spin_unlock_irqrestore(&amp;sdev-&gt;priv_lock, flags);</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * usb_unlink_urb() is now out of spinlocking to avoid</div><div class='add'>+			 * spinlock recursion since stub_complete() is</div><div class='add'>+			 * sometimes called in this context but not in the</div><div class='add'>+			 * interrupt context.  If stub_complete() is executed</div><div class='add'>+			 * before we call usb_unlink_urb(), usb_unlink_urb()</div><div class='add'>+			 * will return an error value. In this case, stub_tx</div><div class='add'>+			 * will return the result pdu of this unlink request</div><div class='add'>+			 * though submission is completed and actual unlinking</div><div class='add'>+			 * is not executed. OK?</div><div class='add'>+			 */</div><div class='add'>+			/* In the above case, urb-&gt;status is not -ECONNRESET,</div><div class='add'>+			 * so a driver in a client host will know the failure</div><div class='add'>+			 * of the unlink request ?</div><div class='add'>+			 */</div><div class='add'>+			ret = usb_unlink_urb(priv-&gt;urb);</div><div class='add'>+			if (ret != -EINPROGRESS)</div><div class='add'>+				dev_err(&amp;priv-&gt;urb-&gt;dev-&gt;dev,</div><div class='add'>+					"failed to unlink a urb %p, ret %d\n",</div><div class='add'>+					priv-&gt;urb, ret);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dbg_stub_rx("seqnum %d is not pending\n", pdu-&gt;u.cmd_unlink.seqnum);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The urb of the unlink target is not found in priv_init queue. It was</div><div class='add'>+	 * already completed and its results is/was going to be sent by a</div><div class='add'>+	 * CMD_RET pdu. In this case, usb_unlink_urb() is not needed. We only</div><div class='add'>+	 * return the completeness of this unlink request to vhci_hcd.</div><div class='add'>+	 */</div><div class='add'>+	stub_enqueue_ret_unlink(sdev, pdu-&gt;base.seqnum, 0);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;sdev-&gt;priv_lock, flags);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int valid_request(struct stub_device *sdev, struct usbip_header *pdu)</div><div class='add'>+{</div><div class='add'>+	struct usbip_device *ud = &amp;sdev-&gt;ud;</div><div class='add'>+</div><div class='add'>+	if (pdu-&gt;base.devid == sdev-&gt;devid) {</div><div class='add'>+		spin_lock(&amp;ud-&gt;lock);</div><div class='add'>+		if (ud-&gt;status == SDEV_ST_USED) {</div><div class='add'>+			/* A request is valid. */</div><div class='add'>+			spin_unlock(&amp;ud-&gt;lock);</div><div class='add'>+			return 1;</div><div class='add'>+		}</div><div class='add'>+		spin_unlock(&amp;ud-&gt;lock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct stub_priv *stub_priv_alloc(struct stub_device *sdev,</div><div class='add'>+					 struct usbip_header *pdu)</div><div class='add'>+{</div><div class='add'>+	struct stub_priv *priv;</div><div class='add'>+	struct usbip_device *ud = &amp;sdev-&gt;ud;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;sdev-&gt;priv_lock, flags);</div><div class='add'>+</div><div class='add'>+	priv = kmem_cache_alloc(stub_priv_cache, GFP_ATOMIC);</div><div class='add'>+	if (!priv) {</div><div class='add'>+		dev_err(&amp;sdev-&gt;interface-&gt;dev, "alloc stub_priv\n");</div><div class='add'>+		spin_unlock_irqrestore(&amp;sdev-&gt;priv_lock, flags);</div><div class='add'>+		usbip_event_add(ud, SDEV_EVENT_ERROR_MALLOC);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(priv, 0, sizeof(struct stub_priv));</div><div class='add'>+</div><div class='add'>+	priv-&gt;seqnum = pdu-&gt;base.seqnum;</div><div class='add'>+	priv-&gt;sdev = sdev;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * After a stub_priv is linked to a list_head,</div><div class='add'>+	 * our error handler can free allocated data.</div><div class='add'>+	 */</div><div class='add'>+	list_add_tail(&amp;priv-&gt;list, &amp;sdev-&gt;priv_init);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;sdev-&gt;priv_lock, flags);</div><div class='add'>+</div><div class='add'>+	return priv;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static struct usb_host_endpoint *get_ep_from_epnum(struct usb_device *udev,</div><div class='add'>+		int epnum0)</div><div class='add'>+{</div><div class='add'>+	struct usb_host_config *config;</div><div class='add'>+	int i = 0, j = 0;</div><div class='add'>+	struct usb_host_endpoint *ep = NULL;</div><div class='add'>+	int epnum;</div><div class='add'>+	int found = 0;</div><div class='add'>+</div><div class='add'>+	if (epnum0 == 0)</div><div class='add'>+		return &amp;udev-&gt;ep0;</div><div class='add'>+</div><div class='add'>+	config = udev-&gt;actconfig;</div><div class='add'>+	if (!config)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; config-&gt;desc.bNumInterfaces; i++) {</div><div class='add'>+		struct usb_host_interface *setting;</div><div class='add'>+</div><div class='add'>+		setting = config-&gt;interface[i]-&gt;cur_altsetting;</div><div class='add'>+</div><div class='add'>+		for (j = 0; j &lt; setting-&gt;desc.bNumEndpoints; j++) {</div><div class='add'>+			ep = &amp;setting-&gt;endpoint[j];</div><div class='add'>+			epnum = (ep-&gt;desc.bEndpointAddress &amp; 0x7f);</div><div class='add'>+</div><div class='add'>+			if (epnum == epnum0) {</div><div class='add'>+				/* uinfo("found epnum %d\n", epnum0); */</div><div class='add'>+				found = 1;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (found)</div><div class='add'>+		return ep;</div><div class='add'>+	else</div><div class='add'>+		return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int get_pipe(struct stub_device *sdev, int epnum, int dir)</div><div class='add'>+{</div><div class='add'>+	struct usb_device *udev = interface_to_usbdev(sdev-&gt;interface);</div><div class='add'>+	struct usb_host_endpoint *ep;</div><div class='add'>+	struct usb_endpoint_descriptor *epd = NULL;</div><div class='add'>+</div><div class='add'>+	ep = get_ep_from_epnum(udev, epnum);</div><div class='add'>+	if (!ep) {</div><div class='add'>+		dev_err(&amp;sdev-&gt;interface-&gt;dev, "no such endpoint?, %d\n",</div><div class='add'>+			epnum);</div><div class='add'>+		BUG();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	epd = &amp;ep-&gt;desc;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#if 0</div><div class='add'>+	/* epnum 0 is always control */</div><div class='add'>+	if (epnum == 0) {</div><div class='add'>+		if (dir == USBIP_DIR_OUT)</div><div class='add'>+			return usb_sndctrlpipe(udev, 0);</div><div class='add'>+		else</div><div class='add'>+			return usb_rcvctrlpipe(udev, 0);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	if (usb_endpoint_xfer_control(epd)) {</div><div class='add'>+		if (dir == USBIP_DIR_OUT)</div><div class='add'>+			return usb_sndctrlpipe(udev, epnum);</div><div class='add'>+		else</div><div class='add'>+			return usb_rcvctrlpipe(udev, epnum);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (usb_endpoint_xfer_bulk(epd)) {</div><div class='add'>+		if (dir == USBIP_DIR_OUT)</div><div class='add'>+			return usb_sndbulkpipe(udev, epnum);</div><div class='add'>+		else</div><div class='add'>+			return usb_rcvbulkpipe(udev, epnum);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (usb_endpoint_xfer_int(epd)) {</div><div class='add'>+		if (dir == USBIP_DIR_OUT)</div><div class='add'>+			return usb_sndintpipe(udev, epnum);</div><div class='add'>+		else</div><div class='add'>+			return usb_rcvintpipe(udev, epnum);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (usb_endpoint_xfer_isoc(epd)) {</div><div class='add'>+		if (dir == USBIP_DIR_OUT)</div><div class='add'>+			return usb_sndisocpipe(udev, epnum);</div><div class='add'>+		else</div><div class='add'>+			return usb_rcvisocpipe(udev, epnum);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* NOT REACHED */</div><div class='add'>+	dev_err(&amp;sdev-&gt;interface-&gt;dev, "get pipe, epnum %d\n", epnum);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void stub_recv_cmd_submit(struct stub_device *sdev,</div><div class='add'>+				 struct usbip_header *pdu)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct stub_priv *priv;</div><div class='add'>+	struct usbip_device *ud = &amp;sdev-&gt;ud;</div><div class='add'>+	struct usb_device *udev = interface_to_usbdev(sdev-&gt;interface);</div><div class='add'>+	int pipe = get_pipe(sdev, pdu-&gt;base.ep, pdu-&gt;base.direction);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	priv = stub_priv_alloc(sdev, pdu);</div><div class='add'>+	if (!priv)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* setup a urb */</div><div class='add'>+	if (usb_pipeisoc(pipe))</div><div class='add'>+		priv-&gt;urb = usb_alloc_urb(pdu-&gt;u.cmd_submit.number_of_packets,</div><div class='add'>+								GFP_KERNEL);</div><div class='add'>+	else</div><div class='add'>+		priv-&gt;urb = usb_alloc_urb(0, GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (!priv-&gt;urb) {</div><div class='add'>+		dev_err(&amp;sdev-&gt;interface-&gt;dev, "malloc urb\n");</div><div class='add'>+		usbip_event_add(ud, SDEV_EVENT_ERROR_MALLOC);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* set priv-&gt;urb-&gt;transfer_buffer */</div><div class='add'>+	if (pdu-&gt;u.cmd_submit.transfer_buffer_length &gt; 0) {</div><div class='add'>+		priv-&gt;urb-&gt;transfer_buffer =</div><div class='add'>+			kzalloc(pdu-&gt;u.cmd_submit.transfer_buffer_length,</div><div class='add'>+								GFP_KERNEL);</div><div class='add'>+		if (!priv-&gt;urb-&gt;transfer_buffer) {</div><div class='add'>+			dev_err(&amp;sdev-&gt;interface-&gt;dev, "malloc x_buff\n");</div><div class='add'>+			usbip_event_add(ud, SDEV_EVENT_ERROR_MALLOC);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* set priv-&gt;urb-&gt;setup_packet */</div><div class='add'>+	priv-&gt;urb-&gt;setup_packet = kzalloc(8, GFP_KERNEL);</div><div class='add'>+	if (!priv-&gt;urb-&gt;setup_packet) {</div><div class='add'>+		dev_err(&amp;sdev-&gt;interface-&gt;dev, "allocate setup_packet\n");</div><div class='add'>+		usbip_event_add(ud, SDEV_EVENT_ERROR_MALLOC);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	memcpy(priv-&gt;urb-&gt;setup_packet, &amp;pdu-&gt;u.cmd_submit.setup, 8);</div><div class='add'>+</div><div class='add'>+	/* set other members from the base header of pdu */</div><div class='add'>+	priv-&gt;urb-&gt;context                = (void *) priv;</div><div class='add'>+	priv-&gt;urb-&gt;dev                    = udev;</div><div class='add'>+	priv-&gt;urb-&gt;pipe                   = pipe;</div><div class='add'>+	priv-&gt;urb-&gt;complete               = stub_complete;</div><div class='add'>+</div><div class='add'>+	usbip_pack_pdu(pdu, priv-&gt;urb, USBIP_CMD_SUBMIT, 0);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	if (usbip_recv_xbuff(ud, priv-&gt;urb) &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (usbip_recv_iso(ud, priv-&gt;urb) &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* no need to submit an intercepted request, but harmless? */</div><div class='add'>+	tweak_special_requests(priv-&gt;urb);</div><div class='add'>+</div><div class='add'>+	/* urb is now ready to submit */</div><div class='add'>+	ret = usb_submit_urb(priv-&gt;urb, GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (ret == 0)</div><div class='add'>+		dbg_stub_rx("submit urb ok, seqnum %u\n", pdu-&gt;base.seqnum);</div><div class='add'>+	else {</div><div class='add'>+		dev_err(&amp;sdev-&gt;interface-&gt;dev, "submit_urb error, %d\n", ret);</div><div class='add'>+		usbip_dump_header(pdu);</div><div class='add'>+		usbip_dump_urb(priv-&gt;urb);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Pessimistic.</div><div class='add'>+		 * This connection will be discarded.</div><div class='add'>+		 */</div><div class='add'>+		usbip_event_add(ud, SDEV_EVENT_ERROR_SUBMIT);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dbg_stub_rx("Leave\n");</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* recv a pdu */</div><div class='add'>+static void stub_rx_pdu(struct usbip_device *ud)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct usbip_header pdu;</div><div class='add'>+	struct stub_device *sdev = container_of(ud, struct stub_device, ud);</div><div class='add'>+	struct device *dev = &amp;sdev-&gt;interface-&gt;dev;</div><div class='add'>+</div><div class='add'>+	dbg_stub_rx("Enter\n");</div><div class='add'>+</div><div class='add'>+	memset(&amp;pdu, 0, sizeof(pdu));</div><div class='add'>+</div><div class='add'>+	/* 1. receive a pdu header */</div><div class='add'>+	ret = usbip_xmit(0, ud-&gt;tcp_socket, (char *) &amp;pdu, sizeof(pdu), 0);</div><div class='add'>+	if (ret != sizeof(pdu)) {</div><div class='add'>+		dev_err(dev, "recv a header, %d\n", ret);</div><div class='add'>+		usbip_event_add(ud, SDEV_EVENT_ERROR_TCP);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	usbip_header_correct_endian(&amp;pdu, 0);</div><div class='add'>+</div><div class='add'>+	if (dbg_flag_stub_rx)</div><div class='add'>+		usbip_dump_header(&amp;pdu);</div><div class='add'>+</div><div class='add'>+	if (!valid_request(sdev, &amp;pdu)) {</div><div class='add'>+		dev_err(dev, "recv invalid request\n");</div><div class='add'>+		usbip_event_add(ud, SDEV_EVENT_ERROR_TCP);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (pdu.base.command) {</div><div class='add'>+	case USBIP_CMD_UNLINK:</div><div class='add'>+		stub_recv_cmd_unlink(sdev, &amp;pdu);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case USBIP_CMD_SUBMIT:</div><div class='add'>+		stub_recv_cmd_submit(sdev, &amp;pdu);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		/* NOTREACHED */</div><div class='add'>+		dev_err(dev, "unknown pdu\n");</div><div class='add'>+		usbip_event_add(ud, SDEV_EVENT_ERROR_TCP);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void stub_rx_loop(struct usbip_task *ut)</div><div class='add'>+{</div><div class='add'>+	struct usbip_device *ud = container_of(ut, struct usbip_device, tcp_rx);</div><div class='add'>+</div><div class='add'>+	while (1) {</div><div class='add'>+		if (signal_pending(current)) {</div><div class='add'>+			dbg_stub_rx("signal caught!\n");</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (usbip_event_happend(ud))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		stub_rx_pdu(ud);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/staging/usbip/stub_tx.c b/drivers/staging/usbip/stub_tx.c<br/>new file mode 100644<br/>index 000000000000..d5563cd980be<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/usbip/stub_tx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/usbip/stub_tx.c</a></div><div class='hunk'>@@ -0,0 +1,371 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2003-2008 Takahiro Hirofuchi</div><div class='add'>+ *</div><div class='add'>+ * This is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,</div><div class='add'>+ * USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "usbip_common.h"</div><div class='add'>+#include "stub.h"</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void stub_free_priv_and_urb(struct stub_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct urb *urb = priv-&gt;urb;</div><div class='add'>+</div><div class='add'>+	kfree(urb-&gt;setup_packet);</div><div class='add'>+	kfree(urb-&gt;transfer_buffer);</div><div class='add'>+	list_del(&amp;priv-&gt;list);</div><div class='add'>+	kmem_cache_free(stub_priv_cache, priv);</div><div class='add'>+	usb_free_urb(urb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* be in spin_lock_irqsave(&amp;sdev-&gt;priv_lock, flags) */</div><div class='add'>+void stub_enqueue_ret_unlink(struct stub_device *sdev, __u32 seqnum,</div><div class='add'>+			     __u32 status)</div><div class='add'>+{</div><div class='add'>+	struct stub_unlink *unlink;</div><div class='add'>+</div><div class='add'>+	unlink = kzalloc(sizeof(struct stub_unlink), GFP_ATOMIC);</div><div class='add'>+	if (!unlink) {</div><div class='add'>+		dev_err(&amp;sdev-&gt;interface-&gt;dev, "alloc stub_unlink\n");</div><div class='add'>+		usbip_event_add(&amp;sdev-&gt;ud, VDEV_EVENT_ERROR_MALLOC);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	unlink-&gt;seqnum = seqnum;</div><div class='add'>+	unlink-&gt;status = status;</div><div class='add'>+</div><div class='add'>+	list_add_tail(&amp;unlink-&gt;list, &amp;sdev-&gt;unlink_tx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * stub_complete - completion handler of a usbip urb</div><div class='add'>+ * @urb: pointer to the urb completed</div><div class='add'>+ * @regs:</div><div class='add'>+ *</div><div class='add'>+ * When a urb has completed, the USB core driver calls this function mostly in</div><div class='add'>+ * the interrupt context. To return the result of a urb, the completed urb is</div><div class='add'>+ * linked to the pending list of returning.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+void stub_complete(struct urb *urb)</div><div class='add'>+{</div><div class='add'>+	struct stub_priv *priv = (struct stub_priv *) urb-&gt;context;</div><div class='add'>+	struct stub_device *sdev = priv-&gt;sdev;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	dbg_stub_tx("complete! status %d\n", urb-&gt;status);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	switch (urb-&gt;status) {</div><div class='add'>+	case 0:</div><div class='add'>+		/* OK */</div><div class='add'>+		break;</div><div class='add'>+	case -ENOENT:</div><div class='add'>+		uinfo("stopped by a call of usb_kill_urb() because of"</div><div class='add'>+					"cleaning up a virtual connection\n");</div><div class='add'>+		return;</div><div class='add'>+	case -ECONNRESET:</div><div class='add'>+		uinfo("unlinked by a call of usb_unlink_urb()\n");</div><div class='add'>+		break;</div><div class='add'>+	case -EPIPE:</div><div class='add'>+		uinfo("endpoint %d is stalled\n", usb_pipeendpoint(urb-&gt;pipe));</div><div class='add'>+		break;</div><div class='add'>+	case -ESHUTDOWN:</div><div class='add'>+		uinfo("device removed?\n");</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		uinfo("urb completion with non-zero status %d\n", urb-&gt;status);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* link a urb to the queue of tx. */</div><div class='add'>+	spin_lock_irqsave(&amp;sdev-&gt;priv_lock, flags);</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;unlinking) {</div><div class='add'>+		stub_enqueue_ret_unlink(sdev, priv-&gt;seqnum, urb-&gt;status);</div><div class='add'>+		stub_free_priv_and_urb(priv);</div><div class='add'>+	} else</div><div class='add'>+		list_move_tail(&amp;priv-&gt;list, &amp;sdev-&gt;priv_tx);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;sdev-&gt;priv_lock, flags);</div><div class='add'>+</div><div class='add'>+	/* wake up tx_thread */</div><div class='add'>+	wake_up(&amp;sdev-&gt;tx_waitq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*-------------------------------------------------------------------------*/</div><div class='add'>+/* fill PDU */</div><div class='add'>+</div><div class='add'>+static inline void setup_base_pdu(struct usbip_header_basic *base,</div><div class='add'>+		__u32 command, __u32 seqnum)</div><div class='add'>+{</div><div class='add'>+	base-&gt;command = command;</div><div class='add'>+	base-&gt;seqnum  = seqnum;</div><div class='add'>+	base-&gt;devid   = 0;</div><div class='add'>+	base-&gt;ep      = 0;</div><div class='add'>+	base-&gt;direction   = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void setup_ret_submit_pdu(struct usbip_header *rpdu, struct urb *urb)</div><div class='add'>+{</div><div class='add'>+	struct stub_priv *priv = (struct stub_priv *) urb-&gt;context;</div><div class='add'>+</div><div class='add'>+	setup_base_pdu(&amp;rpdu-&gt;base, USBIP_RET_SUBMIT, priv-&gt;seqnum);</div><div class='add'>+</div><div class='add'>+	usbip_pack_pdu(rpdu, urb, USBIP_RET_SUBMIT, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void setup_ret_unlink_pdu(struct usbip_header *rpdu,</div><div class='add'>+		struct stub_unlink *unlink)</div><div class='add'>+{</div><div class='add'>+	setup_base_pdu(&amp;rpdu-&gt;base, USBIP_RET_UNLINK, unlink-&gt;seqnum);</div><div class='add'>+</div><div class='add'>+	rpdu-&gt;u.ret_unlink.status = unlink-&gt;status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*-------------------------------------------------------------------------*/</div><div class='add'>+/* send RET_SUBMIT */</div><div class='add'>+</div><div class='add'>+static struct stub_priv *dequeue_from_priv_tx(struct stub_device *sdev)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	struct stub_priv *priv, *tmp;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;sdev-&gt;priv_lock, flags);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(priv, tmp, &amp;sdev-&gt;priv_tx, list) {</div><div class='add'>+		list_move_tail(&amp;priv-&gt;list, &amp;sdev-&gt;priv_free);</div><div class='add'>+		spin_unlock_irqrestore(&amp;sdev-&gt;priv_lock, flags);</div><div class='add'>+		return priv;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;sdev-&gt;priv_lock, flags);</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int stub_send_ret_submit(struct stub_device *sdev)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	struct stub_priv *priv, *tmp;</div><div class='add'>+</div><div class='add'>+	struct msghdr msg;</div><div class='add'>+	struct kvec iov[3];</div><div class='add'>+	size_t txsize;</div><div class='add'>+</div><div class='add'>+	size_t total_size = 0;</div><div class='add'>+</div><div class='add'>+	while ((priv = dequeue_from_priv_tx(sdev)) != NULL) {</div><div class='add'>+		int ret;</div><div class='add'>+		struct urb *urb = priv-&gt;urb;</div><div class='add'>+		struct usbip_header pdu_header;</div><div class='add'>+		void *iso_buffer = NULL;</div><div class='add'>+</div><div class='add'>+		txsize = 0;</div><div class='add'>+		memset(&amp;pdu_header, 0, sizeof(pdu_header));</div><div class='add'>+		memset(&amp;msg, 0, sizeof(msg));</div><div class='add'>+		memset(&amp;iov, 0, sizeof(iov));</div><div class='add'>+</div><div class='add'>+		dbg_stub_tx("setup txdata urb %p\n", urb);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+		/* 1. setup usbip_header */</div><div class='add'>+		setup_ret_submit_pdu(&amp;pdu_header, urb);</div><div class='add'>+		usbip_header_correct_endian(&amp;pdu_header, 1);</div><div class='add'>+</div><div class='add'>+		iov[0].iov_base = &amp;pdu_header;</div><div class='add'>+		iov[0].iov_len  = sizeof(pdu_header);</div><div class='add'>+		txsize += sizeof(pdu_header);</div><div class='add'>+</div><div class='add'>+		/* 2. setup transfer buffer */</div><div class='add'>+		if (usb_pipein(urb-&gt;pipe) &amp;&amp; urb-&gt;actual_length &gt; 0) {</div><div class='add'>+			iov[1].iov_base = urb-&gt;transfer_buffer;</div><div class='add'>+			iov[1].iov_len  = urb-&gt;actual_length;</div><div class='add'>+			txsize += urb-&gt;actual_length;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* 3. setup iso_packet_descriptor */</div><div class='add'>+		if (usb_pipetype(urb-&gt;pipe) == PIPE_ISOCHRONOUS) {</div><div class='add'>+			ssize_t len = 0;</div><div class='add'>+</div><div class='add'>+			iso_buffer = usbip_alloc_iso_desc_pdu(urb, &amp;len);</div><div class='add'>+			if (!iso_buffer) {</div><div class='add'>+				usbip_event_add(&amp;sdev-&gt;ud,</div><div class='add'>+						SDEV_EVENT_ERROR_MALLOC);</div><div class='add'>+				return -1;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			iov[2].iov_base = iso_buffer;</div><div class='add'>+			iov[2].iov_len  = len;</div><div class='add'>+			txsize += len;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = kernel_sendmsg(sdev-&gt;ud.tcp_socket, &amp;msg, iov,</div><div class='add'>+				     3, txsize);</div><div class='add'>+		if (ret != txsize) {</div><div class='add'>+			dev_err(&amp;sdev-&gt;interface-&gt;dev,</div><div class='add'>+				"sendmsg failed!, retval %d for %zd\n",</div><div class='add'>+				ret, txsize);</div><div class='add'>+			kfree(iso_buffer);</div><div class='add'>+			usbip_event_add(&amp;sdev-&gt;ud, SDEV_EVENT_ERROR_TCP);</div><div class='add'>+			return -1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		kfree(iso_buffer);</div><div class='add'>+		dbg_stub_tx("send txdata\n");</div><div class='add'>+</div><div class='add'>+		total_size += txsize;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;sdev-&gt;priv_lock, flags);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(priv, tmp, &amp;sdev-&gt;priv_free, list) {</div><div class='add'>+		stub_free_priv_and_urb(priv);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;sdev-&gt;priv_lock, flags);</div><div class='add'>+</div><div class='add'>+	return total_size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*-------------------------------------------------------------------------*/</div><div class='add'>+/* send RET_UNLINK */</div><div class='add'>+</div><div class='add'>+static struct stub_unlink *dequeue_from_unlink_tx(struct stub_device *sdev)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	struct stub_unlink *unlink, *tmp;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;sdev-&gt;priv_lock, flags);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(unlink, tmp, &amp;sdev-&gt;unlink_tx, list) {</div><div class='add'>+		list_move_tail(&amp;unlink-&gt;list, &amp;sdev-&gt;unlink_free);</div><div class='add'>+		spin_unlock_irqrestore(&amp;sdev-&gt;priv_lock, flags);</div><div class='add'>+		return unlink;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;sdev-&gt;priv_lock, flags);</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int stub_send_ret_unlink(struct stub_device *sdev)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	struct stub_unlink *unlink, *tmp;</div><div class='add'>+</div><div class='add'>+	struct msghdr msg;</div><div class='add'>+	struct kvec iov[1];</div><div class='add'>+	size_t txsize;</div><div class='add'>+</div><div class='add'>+	size_t total_size = 0;</div><div class='add'>+</div><div class='add'>+	while ((unlink = dequeue_from_unlink_tx(sdev)) != NULL) {</div><div class='add'>+		int ret;</div><div class='add'>+		struct usbip_header pdu_header;</div><div class='add'>+</div><div class='add'>+		txsize = 0;</div><div class='add'>+		memset(&amp;pdu_header, 0, sizeof(pdu_header));</div><div class='add'>+		memset(&amp;msg, 0, sizeof(msg));</div><div class='add'>+		memset(&amp;iov, 0, sizeof(iov));</div><div class='add'>+</div><div class='add'>+		dbg_stub_tx("setup ret unlink %lu\n", unlink-&gt;seqnum);</div><div class='add'>+</div><div class='add'>+		/* 1. setup usbip_header */</div><div class='add'>+		setup_ret_unlink_pdu(&amp;pdu_header, unlink);</div><div class='add'>+		usbip_header_correct_endian(&amp;pdu_header, 1);</div><div class='add'>+</div><div class='add'>+		iov[0].iov_base = &amp;pdu_header;</div><div class='add'>+		iov[0].iov_len  = sizeof(pdu_header);</div><div class='add'>+		txsize += sizeof(pdu_header);</div><div class='add'>+</div><div class='add'>+		ret = kernel_sendmsg(sdev-&gt;ud.tcp_socket, &amp;msg, iov,</div><div class='add'>+				     1, txsize);</div><div class='add'>+		if (ret != txsize) {</div><div class='add'>+			dev_err(&amp;sdev-&gt;interface-&gt;dev,</div><div class='add'>+				"sendmsg failed!, retval %d for %zd\n",</div><div class='add'>+				ret, txsize);</div><div class='add'>+			usbip_event_add(&amp;sdev-&gt;ud, SDEV_EVENT_ERROR_TCP);</div><div class='add'>+			return -1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+		dbg_stub_tx("send txdata\n");</div><div class='add'>+</div><div class='add'>+		total_size += txsize;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;sdev-&gt;priv_lock, flags);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(unlink, tmp, &amp;sdev-&gt;unlink_free, list) {</div><div class='add'>+		list_del(&amp;unlink-&gt;list);</div><div class='add'>+		kfree(unlink);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;sdev-&gt;priv_lock, flags);</div><div class='add'>+</div><div class='add'>+	return total_size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*-------------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+void stub_tx_loop(struct usbip_task *ut)</div><div class='add'>+{</div><div class='add'>+	struct usbip_device *ud = container_of(ut, struct usbip_device, tcp_tx);</div><div class='add'>+	struct stub_device *sdev = container_of(ud, struct stub_device, ud);</div><div class='add'>+</div><div class='add'>+	while (1) {</div><div class='add'>+		if (signal_pending(current)) {</div><div class='add'>+			dbg_stub_tx("signal catched\n");</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (usbip_event_happend(ud))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * send_ret_submit comes earlier than send_ret_unlink.  stub_rx</div><div class='add'>+		 * looks at only priv_init queue. If the completion of a URB is</div><div class='add'>+		 * earlier than the receive of CMD_UNLINK, priv is moved to</div><div class='add'>+		 * priv_tx queue and stub_rx does not find the target priv. In</div><div class='add'>+		 * this case, vhci_rx receives the result of the submit request</div><div class='add'>+		 * and then receives the result of the unlink request. The</div><div class='add'>+		 * result of the submit is given back to the usbcore as the</div><div class='add'>+		 * completion of the unlink request. The request of the</div><div class='add'>+		 * unlink is ignored. This is ok because a driver who calls</div><div class='add'>+		 * usb_unlink_urb() understands the unlink was too late by</div><div class='add'>+		 * getting the status of the given-backed URB which has the</div><div class='add'>+		 * status of usb_submit_urb().</div><div class='add'>+		 */</div><div class='add'>+		if (stub_send_ret_submit(sdev) &lt; 0)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (stub_send_ret_unlink(sdev) &lt; 0)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		wait_event_interruptible(sdev-&gt;tx_waitq,</div><div class='add'>+				(!list_empty(&amp;sdev-&gt;priv_tx) ||</div><div class='add'>+				 !list_empty(&amp;sdev-&gt;unlink_tx)));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/staging/usbip/usbip_common.c b/drivers/staging/usbip/usbip_common.c<br/>new file mode 100644<br/>index 000000000000..e64918f42ff7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/usbip/usbip_common.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/usbip/usbip_common.c</a></div><div class='hunk'>@@ -0,0 +1,997 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2003-2008 Takahiro Hirofuchi</div><div class='add'>+ *</div><div class='add'>+ * This is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,</div><div class='add'>+ * USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/file.h&gt;</div><div class='add'>+#include &lt;linux/tcp.h&gt;</div><div class='add'>+#include &lt;linux/in.h&gt;</div><div class='add'>+#include "usbip_common.h"</div><div class='add'>+</div><div class='add'>+/* version information */</div><div class='add'>+#define DRIVER_VERSION "1.0"</div><div class='add'>+#define DRIVER_AUTHOR "Takahiro Hirofuchi &lt;hirofuchi _at_ users.sourceforge.net&gt;"</div><div class='add'>+#define DRIVER_DESC "usbip common driver"</div><div class='add'>+</div><div class='add'>+/*-------------------------------------------------------------------------*/</div><div class='add'>+/* debug routines */</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_USB_DEBUG</div><div class='add'>+unsigned long usbip_debug_flag = 0xffffffff;</div><div class='add'>+#else</div><div class='add'>+unsigned long usbip_debug_flag;</div><div class='add'>+#endif</div><div class='add'>+EXPORT_SYMBOL_GPL(usbip_debug_flag);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* FIXME */</div><div class='add'>+struct device_attribute dev_attr_usbip_debug;</div><div class='add'>+EXPORT_SYMBOL_GPL(dev_attr_usbip_debug);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static ssize_t show_flag(struct device *dev, struct device_attribute *attr,</div><div class='add'>+								char *buf)</div><div class='add'>+{</div><div class='add'>+	return sprintf(buf, "%lx\n", usbip_debug_flag);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t store_flag(struct device *dev, struct device_attribute *attr,</div><div class='add'>+		const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	unsigned long flag;</div><div class='add'>+</div><div class='add'>+	sscanf(buf, "%lx", &amp;flag);</div><div class='add'>+	usbip_debug_flag = flag;</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+DEVICE_ATTR(usbip_debug, (S_IRUGO | S_IWUSR), show_flag, store_flag);</div><div class='add'>+</div><div class='add'>+static void usbip_dump_buffer(char *buff, int bufflen)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (bufflen &gt; 128) {</div><div class='add'>+		for (i = 0; i &lt; 128; i++) {</div><div class='add'>+			if (i%24 == 0)</div><div class='add'>+				printk("   ");</div><div class='add'>+			printk("%02x ", (unsigned char) buff[i]);</div><div class='add'>+			if (i%4 == 3)</div><div class='add'>+				printk("| ");</div><div class='add'>+			if (i%24 == 23)</div><div class='add'>+				printk("\n");</div><div class='add'>+		}</div><div class='add'>+		printk("... (%d byte)\n", bufflen);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; bufflen; i++) {</div><div class='add'>+		if (i%24 == 0)</div><div class='add'>+			printk("   ");</div><div class='add'>+		printk("%02x ", (unsigned char) buff[i]);</div><div class='add'>+		if (i%4 == 3)</div><div class='add'>+			printk("| ");</div><div class='add'>+		if (i%24 == 23)</div><div class='add'>+			printk("\n");</div><div class='add'>+	}</div><div class='add'>+	printk("\n");</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void usbip_dump_pipe(unsigned int p)</div><div class='add'>+{</div><div class='add'>+	unsigned char type = usb_pipetype(p);</div><div class='add'>+	unsigned char ep = usb_pipeendpoint(p);</div><div class='add'>+	unsigned char dev = usb_pipedevice(p);</div><div class='add'>+	unsigned char dir = usb_pipein(p);</div><div class='add'>+</div><div class='add'>+	printk("dev(%d) ", dev);</div><div class='add'>+	printk("ep(%d) ",  ep);</div><div class='add'>+	printk("%s ", dir ? "IN" : "OUT");</div><div class='add'>+</div><div class='add'>+	switch (type) {</div><div class='add'>+	case PIPE_ISOCHRONOUS:</div><div class='add'>+		printk("%s ", "ISO");</div><div class='add'>+		break;</div><div class='add'>+	case PIPE_INTERRUPT:</div><div class='add'>+		printk("%s ", "INT");</div><div class='add'>+		break;</div><div class='add'>+	case PIPE_CONTROL:</div><div class='add'>+		printk("%s ", "CTL");</div><div class='add'>+		break;</div><div class='add'>+	case PIPE_BULK:</div><div class='add'>+		printk("%s ", "BLK");</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		printk("ERR");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	printk("\n");</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void usbip_dump_usb_device(struct usb_device *udev)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = &amp;udev-&gt;dev;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev, "       devnum(%d) devpath(%s)",</div><div class='add'>+		udev-&gt;devnum, udev-&gt;devpath);</div><div class='add'>+</div><div class='add'>+	switch (udev-&gt;speed) {</div><div class='add'>+	case USB_SPEED_HIGH:</div><div class='add'>+		printk(" SPD_HIGH");</div><div class='add'>+		break;</div><div class='add'>+	case USB_SPEED_FULL:</div><div class='add'>+		printk(" SPD_FULL");</div><div class='add'>+		break;</div><div class='add'>+	case USB_SPEED_LOW:</div><div class='add'>+		printk(" SPD_LOW");</div><div class='add'>+		break;</div><div class='add'>+	case USB_SPEED_UNKNOWN:</div><div class='add'>+		printk(" SPD_UNKNOWN");</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		printk(" SPD_ERROR");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	printk(" tt %p, ttport %d", udev-&gt;tt, udev-&gt;ttport);</div><div class='add'>+	printk("\n");</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev, "                    ");</div><div class='add'>+	for (i = 0; i &lt; 16; i++)</div><div class='add'>+		printk(" %2u", i);</div><div class='add'>+	printk("\n");</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev, "       toggle0(IN) :");</div><div class='add'>+	for (i = 0; i &lt; 16; i++)</div><div class='add'>+		printk(" %2u", (udev-&gt;toggle[0] &amp; (1 &lt;&lt; i)) ? 1 : 0);</div><div class='add'>+	printk("\n");</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev, "       toggle1(OUT):");</div><div class='add'>+	for (i = 0; i &lt; 16; i++)</div><div class='add'>+		printk(" %2u", (udev-&gt;toggle[1] &amp; (1 &lt;&lt; i)) ? 1 : 0);</div><div class='add'>+	printk("\n");</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev, "       epmaxp_in   :");</div><div class='add'>+	for (i = 0; i &lt; 16; i++) {</div><div class='add'>+		if (udev-&gt;ep_in[i])</div><div class='add'>+			printk(" %2u",</div><div class='add'>+			     le16_to_cpu(udev-&gt;ep_in[i]-&gt;desc.wMaxPacketSize));</div><div class='add'>+	}</div><div class='add'>+	printk("\n");</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev, "       epmaxp_out  :");</div><div class='add'>+	for (i = 0; i &lt; 16; i++) {</div><div class='add'>+		if (udev-&gt;ep_out[i])</div><div class='add'>+			printk(" %2u",</div><div class='add'>+			     le16_to_cpu(udev-&gt;ep_out[i]-&gt;desc.wMaxPacketSize));</div><div class='add'>+	}</div><div class='add'>+	printk("\n");</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev, "parent %p, bus %p\n", udev-&gt;parent, udev-&gt;bus);</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev, "descriptor %p, config %p, actconfig %p, "</div><div class='add'>+		"rawdescriptors %p\n", &amp;udev-&gt;descriptor, udev-&gt;config,</div><div class='add'>+		udev-&gt;actconfig, udev-&gt;rawdescriptors);</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev, "have_langid %d, string_langid %d\n",</div><div class='add'>+		udev-&gt;have_langid, udev-&gt;string_langid);</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev, "maxchild %d, children %p\n",</div><div class='add'>+		udev-&gt;maxchild, udev-&gt;children);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void usbip_dump_request_type(__u8 rt)</div><div class='add'>+{</div><div class='add'>+	switch (rt &amp; USB_RECIP_MASK) {</div><div class='add'>+	case USB_RECIP_DEVICE:</div><div class='add'>+		printk("DEVICE");</div><div class='add'>+		break;</div><div class='add'>+	case USB_RECIP_INTERFACE:</div><div class='add'>+		printk("INTERF");</div><div class='add'>+		break;</div><div class='add'>+	case USB_RECIP_ENDPOINT:</div><div class='add'>+		printk("ENDPOI");</div><div class='add'>+		break;</div><div class='add'>+	case USB_RECIP_OTHER:</div><div class='add'>+		printk("OTHER ");</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		printk("------");</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void usbip_dump_usb_ctrlrequest(struct usb_ctrlrequest *cmd)</div><div class='add'>+{</div><div class='add'>+	if (!cmd) {</div><div class='add'>+		printk("      %s : null pointer\n", __FUNCTION__);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	printk("       ");</div><div class='add'>+	printk("bRequestType(%02X) ", cmd-&gt;bRequestType);</div><div class='add'>+	printk("bRequest(%02X) " , cmd-&gt;bRequest);</div><div class='add'>+	printk("wValue(%04X) ", cmd-&gt;wValue);</div><div class='add'>+	printk("wIndex(%04X) ", cmd-&gt;wIndex);</div><div class='add'>+	printk("wLength(%04X) ", cmd-&gt;wLength);</div><div class='add'>+</div><div class='add'>+	printk("\n       ");</div><div class='add'>+</div><div class='add'>+	if ((cmd-&gt;bRequestType &amp; USB_TYPE_MASK) == USB_TYPE_STANDARD) {</div><div class='add'>+		printk("STANDARD ");</div><div class='add'>+		switch (cmd-&gt;bRequest) {</div><div class='add'>+		case USB_REQ_GET_STATUS:</div><div class='add'>+			printk("GET_STATUS");</div><div class='add'>+			break;</div><div class='add'>+		case USB_REQ_CLEAR_FEATURE:</div><div class='add'>+			printk("CLEAR_FEAT");</div><div class='add'>+			break;</div><div class='add'>+		case USB_REQ_SET_FEATURE:</div><div class='add'>+			printk("SET_FEAT  ");</div><div class='add'>+			break;</div><div class='add'>+		case USB_REQ_SET_ADDRESS:</div><div class='add'>+			printk("SET_ADDRRS");</div><div class='add'>+			break;</div><div class='add'>+		case USB_REQ_GET_DESCRIPTOR:</div><div class='add'>+			printk("GET_DESCRI");</div><div class='add'>+			break;</div><div class='add'>+		case USB_REQ_SET_DESCRIPTOR:</div><div class='add'>+			printk("SET_DESCRI");</div><div class='add'>+			break;</div><div class='add'>+		case USB_REQ_GET_CONFIGURATION:</div><div class='add'>+			printk("GET_CONFIG");</div><div class='add'>+			break;</div><div class='add'>+		case USB_REQ_SET_CONFIGURATION:</div><div class='add'>+			printk("SET_CONFIG");</div><div class='add'>+			break;</div><div class='add'>+		case USB_REQ_GET_INTERFACE:</div><div class='add'>+			printk("GET_INTERF");</div><div class='add'>+			break;</div><div class='add'>+		case USB_REQ_SET_INTERFACE:</div><div class='add'>+			printk("SET_INTERF");</div><div class='add'>+			break;</div><div class='add'>+		case USB_REQ_SYNCH_FRAME:</div><div class='add'>+			printk("SYNC_FRAME");</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			printk("REQ(%02X) ", cmd-&gt;bRequest);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		printk(" ");</div><div class='add'>+		usbip_dump_request_type(cmd-&gt;bRequestType);</div><div class='add'>+</div><div class='add'>+	} else if ((cmd-&gt;bRequestType &amp; USB_TYPE_MASK) == USB_TYPE_CLASS)</div><div class='add'>+		printk("CLASS   ");</div><div class='add'>+</div><div class='add'>+	else if ((cmd-&gt;bRequestType &amp; USB_TYPE_MASK) == USB_TYPE_VENDOR)</div><div class='add'>+		printk("VENDOR  ");</div><div class='add'>+</div><div class='add'>+	else if ((cmd-&gt;bRequestType &amp; USB_TYPE_MASK) == USB_TYPE_RESERVED)</div><div class='add'>+		printk("RESERVED");</div><div class='add'>+</div><div class='add'>+	printk("\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void usbip_dump_urb(struct urb *urb)</div><div class='add'>+{</div><div class='add'>+	struct device *dev;</div><div class='add'>+</div><div class='add'>+	if (!urb) {</div><div class='add'>+		printk(KERN_DEBUG KBUILD_MODNAME</div><div class='add'>+		       ":%s: urb: null pointer!!\n", __func__);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!urb-&gt;dev) {</div><div class='add'>+		printk(KERN_DEBUG KBUILD_MODNAME</div><div class='add'>+		       ":%s: urb-&gt;dev: null pointer!!\n", __func__);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	dev = &amp;urb-&gt;dev-&gt;dev;</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev, "   urb                   :%p\n", urb);</div><div class='add'>+	dev_dbg(dev, "   dev                   :%p\n", urb-&gt;dev);</div><div class='add'>+</div><div class='add'>+	usbip_dump_usb_device(urb-&gt;dev);</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev, "   pipe                  :%08x ", urb-&gt;pipe);</div><div class='add'>+</div><div class='add'>+	usbip_dump_pipe(urb-&gt;pipe);</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev, "   status                :%d\n", urb-&gt;status);</div><div class='add'>+	dev_dbg(dev, "   transfer_flags        :%08X\n", urb-&gt;transfer_flags);</div><div class='add'>+	dev_dbg(dev, "   transfer_buffer       :%p\n", urb-&gt;transfer_buffer);</div><div class='add'>+	dev_dbg(dev, "   transfer_buffer_length:%d\n", urb-&gt;transfer_buffer_length);</div><div class='add'>+	dev_dbg(dev, "   actual_length         :%d\n", urb-&gt;actual_length);</div><div class='add'>+	dev_dbg(dev, "   setup_packet          :%p\n", urb-&gt;setup_packet);</div><div class='add'>+</div><div class='add'>+	if (urb-&gt;setup_packet &amp;&amp; usb_pipetype(urb-&gt;pipe) == PIPE_CONTROL)</div><div class='add'>+			usbip_dump_usb_ctrlrequest(</div><div class='add'>+			(struct usb_ctrlrequest *)urb-&gt;setup_packet);</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev, "   start_frame           :%d\n", urb-&gt;start_frame);</div><div class='add'>+	dev_dbg(dev, "   number_of_packets     :%d\n", urb-&gt;number_of_packets);</div><div class='add'>+	dev_dbg(dev, "   interval              :%d\n", urb-&gt;interval);</div><div class='add'>+	dev_dbg(dev, "   error_count           :%d\n", urb-&gt;error_count);</div><div class='add'>+	dev_dbg(dev, "   context               :%p\n", urb-&gt;context);</div><div class='add'>+	dev_dbg(dev, "   complete              :%p\n", urb-&gt;complete);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(usbip_dump_urb);</div><div class='add'>+</div><div class='add'>+void usbip_dump_header(struct usbip_header *pdu)</div><div class='add'>+{</div><div class='add'>+	udbg("BASE: cmd %u seq %u devid %u dir %u ep %u\n",</div><div class='add'>+			pdu-&gt;base.command,</div><div class='add'>+			pdu-&gt;base.seqnum,</div><div class='add'>+			pdu-&gt;base.devid,</div><div class='add'>+			pdu-&gt;base.direction,</div><div class='add'>+			pdu-&gt;base.ep);</div><div class='add'>+</div><div class='add'>+	switch (pdu-&gt;base.command) {</div><div class='add'>+	case USBIP_CMD_SUBMIT:</div><div class='add'>+		udbg("CMD_SUBMIT: x_flags %u x_len %u sf %u #p %u iv %u\n",</div><div class='add'>+				pdu-&gt;u.cmd_submit.transfer_flags,</div><div class='add'>+				pdu-&gt;u.cmd_submit.transfer_buffer_length,</div><div class='add'>+				pdu-&gt;u.cmd_submit.start_frame,</div><div class='add'>+				pdu-&gt;u.cmd_submit.number_of_packets,</div><div class='add'>+				pdu-&gt;u.cmd_submit.interval);</div><div class='add'>+				break;</div><div class='add'>+	case USBIP_CMD_UNLINK:</div><div class='add'>+		udbg("CMD_UNLINK: seq %u\n", pdu-&gt;u.cmd_unlink.seqnum);</div><div class='add'>+		break;</div><div class='add'>+	case USBIP_RET_SUBMIT:</div><div class='add'>+		udbg("RET_SUBMIT: st %d al %u sf %d ec %d\n",</div><div class='add'>+				pdu-&gt;u.ret_submit.status,</div><div class='add'>+				pdu-&gt;u.ret_submit.actual_length,</div><div class='add'>+				pdu-&gt;u.ret_submit.start_frame,</div><div class='add'>+				pdu-&gt;u.ret_submit.error_count);</div><div class='add'>+	case USBIP_RET_UNLINK:</div><div class='add'>+		udbg("RET_UNLINK: status %d\n", pdu-&gt;u.ret_unlink.status);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		/* NOT REACHED */</div><div class='add'>+		udbg("UNKNOWN\n");</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(usbip_dump_header);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*-------------------------------------------------------------------------*/</div><div class='add'>+/* thread routines */</div><div class='add'>+</div><div class='add'>+int usbip_thread(void *param)</div><div class='add'>+{</div><div class='add'>+	struct usbip_task *ut = param;</div><div class='add'>+</div><div class='add'>+	if (!ut)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	lock_kernel();</div><div class='add'>+	daemonize(ut-&gt;name);</div><div class='add'>+	allow_signal(SIGKILL);</div><div class='add'>+	ut-&gt;thread = current;</div><div class='add'>+	unlock_kernel();</div><div class='add'>+</div><div class='add'>+	/* srv.rb must wait for rx_thread starting */</div><div class='add'>+	complete(&amp;ut-&gt;thread_done);</div><div class='add'>+</div><div class='add'>+	/* start of while loop */</div><div class='add'>+	ut-&gt;loop_ops(ut);</div><div class='add'>+</div><div class='add'>+	/* end of loop */</div><div class='add'>+	ut-&gt;thread = NULL;</div><div class='add'>+</div><div class='add'>+	complete_and_exit(&amp;ut-&gt;thread_done, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void usbip_start_threads(struct usbip_device *ud)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * threads are invoked per one device (per one connection).</div><div class='add'>+	 */</div><div class='add'>+	kernel_thread(usbip_thread, (void *)&amp;ud-&gt;tcp_rx, 0);</div><div class='add'>+	kernel_thread(usbip_thread, (void *)&amp;ud-&gt;tcp_tx, 0);</div><div class='add'>+</div><div class='add'>+	/* confirm threads are starting */</div><div class='add'>+	wait_for_completion(&amp;ud-&gt;tcp_rx.thread_done);</div><div class='add'>+	wait_for_completion(&amp;ud-&gt;tcp_tx.thread_done);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(usbip_start_threads);</div><div class='add'>+</div><div class='add'>+void usbip_stop_threads(struct usbip_device *ud)</div><div class='add'>+{</div><div class='add'>+	/* kill threads related to this sdev, if v.c. exists */</div><div class='add'>+	if (ud-&gt;tcp_rx.thread != NULL) {</div><div class='add'>+		send_sig(SIGKILL, ud-&gt;tcp_rx.thread, 1);</div><div class='add'>+		wait_for_completion(&amp;ud-&gt;tcp_rx.thread_done);</div><div class='add'>+		udbg("rx_thread for ud %p has finished\n", ud);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ud-&gt;tcp_tx.thread != NULL) {</div><div class='add'>+		send_sig(SIGKILL, ud-&gt;tcp_tx.thread, 1);</div><div class='add'>+		wait_for_completion(&amp;ud-&gt;tcp_tx.thread_done);</div><div class='add'>+		udbg("tx_thread for ud %p has finished\n", ud);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(usbip_stop_threads);</div><div class='add'>+</div><div class='add'>+void usbip_task_init(struct usbip_task *ut, char *name,</div><div class='add'>+		void (*loop_ops)(struct usbip_task *))</div><div class='add'>+{</div><div class='add'>+	ut-&gt;thread = NULL;</div><div class='add'>+	init_completion(&amp;ut-&gt;thread_done);</div><div class='add'>+	ut-&gt;name = name;</div><div class='add'>+	ut-&gt;loop_ops = loop_ops;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(usbip_task_init);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*-------------------------------------------------------------------------*/</div><div class='add'>+/* socket routines */</div><div class='add'>+</div><div class='add'>+ /*  Send/receive messages over TCP/IP. I refer drivers/block/nbd.c */</div><div class='add'>+int usbip_xmit(int send, struct socket *sock, char *buf,</div><div class='add'>+	       int size, int msg_flags)</div><div class='add'>+{</div><div class='add'>+	int result;</div><div class='add'>+	struct msghdr msg;</div><div class='add'>+	struct kvec iov;</div><div class='add'>+	int total = 0;</div><div class='add'>+</div><div class='add'>+	/* for blocks of if (dbg_flag_xmit) */</div><div class='add'>+	char *bp = buf;</div><div class='add'>+	int osize = size;</div><div class='add'>+</div><div class='add'>+	dbg_xmit("enter\n");</div><div class='add'>+</div><div class='add'>+	if (!sock || !buf || !size) {</div><div class='add'>+		printk(KERN_ERR "%s: invalid arg, sock %p buff %p size %d\n",</div><div class='add'>+		       __func__, sock, buf, size);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	if (dbg_flag_xmit) {</div><div class='add'>+		if (send) {</div><div class='add'>+			if (!in_interrupt())</div><div class='add'>+				printk(KERN_DEBUG "%-10s:", current-&gt;comm);</div><div class='add'>+			else</div><div class='add'>+				printk(KERN_DEBUG "interupt  :");</div><div class='add'>+</div><div class='add'>+			printk("%s: sending... , sock %p, buf %p, "</div><div class='add'>+			       "size %d, msg_flags %d\n", __func__,</div><div class='add'>+			       sock, buf, size, msg_flags);</div><div class='add'>+			usbip_dump_buffer(buf, size);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		sock-&gt;sk-&gt;sk_allocation = GFP_NOIO;</div><div class='add'>+		iov.iov_base    = buf;</div><div class='add'>+		iov.iov_len     = size;</div><div class='add'>+		msg.msg_name    = NULL;</div><div class='add'>+		msg.msg_namelen = 0;</div><div class='add'>+		msg.msg_control = NULL;</div><div class='add'>+		msg.msg_controllen = 0;</div><div class='add'>+		msg.msg_namelen    = 0;</div><div class='add'>+		msg.msg_flags      = msg_flags | MSG_NOSIGNAL;</div><div class='add'>+</div><div class='add'>+		if (send)</div><div class='add'>+			result = kernel_sendmsg(sock, &amp;msg, &amp;iov, 1, size);</div><div class='add'>+		else</div><div class='add'>+			result = kernel_recvmsg(sock, &amp;msg, &amp;iov, 1, size,</div><div class='add'>+								MSG_WAITALL);</div><div class='add'>+</div><div class='add'>+		if (result &lt;= 0) {</div><div class='add'>+			udbg("usbip_xmit: %s sock %p buf %p size %u ret %d"</div><div class='add'>+					" total %d\n",</div><div class='add'>+					send ? "send" : "receive", sock, buf,</div><div class='add'>+					size, result, total);</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		size -= result;</div><div class='add'>+		buf += result;</div><div class='add'>+		total += result;</div><div class='add'>+</div><div class='add'>+	} while (size &gt; 0);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	if (dbg_flag_xmit) {</div><div class='add'>+		if (!send) {</div><div class='add'>+			if (!in_interrupt())</div><div class='add'>+				printk(KERN_DEBUG "%-10s:", current-&gt;comm);</div><div class='add'>+			else</div><div class='add'>+				printk(KERN_DEBUG "interupt  :");</div><div class='add'>+</div><div class='add'>+			printk("usbip_xmit: receiving....\n");</div><div class='add'>+			usbip_dump_buffer(bp, osize);</div><div class='add'>+			printk("usbip_xmit: received, osize %d ret %d size %d "</div><div class='add'>+					"total %d\n", osize, result, size,</div><div class='add'>+					total);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (send)</div><div class='add'>+			printk("usbip_xmit: send, total %d\n", total);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return total;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(usbip_xmit);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* now a usrland utility should set options. */</div><div class='add'>+#if 0</div><div class='add'>+int setquickack(struct socket *socket)</div><div class='add'>+{</div><div class='add'>+	mm_segment_t oldfs;</div><div class='add'>+	int val = 1;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	oldfs = get_fs();</div><div class='add'>+	set_fs(get_ds());</div><div class='add'>+	ret = socket-&gt;ops-&gt;setsockopt(socket, SOL_TCP, TCP_QUICKACK,</div><div class='add'>+			(char __user *) &amp;val, sizeof(ret));</div><div class='add'>+	set_fs(oldfs);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int setnodelay(struct socket *socket)</div><div class='add'>+{</div><div class='add'>+	mm_segment_t oldfs;</div><div class='add'>+	int val = 1;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	oldfs = get_fs();</div><div class='add'>+	set_fs(get_ds());</div><div class='add'>+	ret = socket-&gt;ops-&gt;setsockopt(socket, SOL_TCP, TCP_NODELAY,</div><div class='add'>+			(char __user *) &amp;val, sizeof(ret));</div><div class='add'>+	set_fs(oldfs);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int setkeepalive(struct socket *socket)</div><div class='add'>+{</div><div class='add'>+	mm_segment_t oldfs;</div><div class='add'>+	int val = 1;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	oldfs = get_fs();</div><div class='add'>+	set_fs(get_ds());</div><div class='add'>+	ret = socket-&gt;ops-&gt;setsockopt(socket, SOL_SOCKET, SO_KEEPALIVE,</div><div class='add'>+			(char __user *) &amp;val, sizeof(ret));</div><div class='add'>+	set_fs(oldfs);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void setreuse(struct socket *socket)</div><div class='add'>+{</div><div class='add'>+	socket-&gt;sk-&gt;sk_reuse = 1;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+struct socket *sockfd_to_socket(unsigned int sockfd)</div><div class='add'>+{</div><div class='add'>+	struct socket *socket;</div><div class='add'>+	struct file *file;</div><div class='add'>+	struct inode *inode;</div><div class='add'>+</div><div class='add'>+	file = fget(sockfd);</div><div class='add'>+	if (!file) {</div><div class='add'>+		printk(KERN_ERR "%s: invalid sockfd\n", __func__);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	inode = file-&gt;f_dentry-&gt;d_inode;</div><div class='add'>+</div><div class='add'>+	if (!inode || !S_ISSOCK(inode-&gt;i_mode))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	socket = SOCKET_I(inode);</div><div class='add'>+</div><div class='add'>+	return socket;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(sockfd_to_socket);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*-------------------------------------------------------------------------*/</div><div class='add'>+/* pdu routines */</div><div class='add'>+</div><div class='add'>+/* there may be more cases to tweak the flags. */</div><div class='add'>+static unsigned int tweak_transfer_flags(unsigned int flags)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	if (flags &amp; URB_NO_TRANSFER_DMA_MAP)</div><div class='add'>+		/*</div><div class='add'>+		 * vhci_hcd does not provide DMA-mapped I/O. The upper</div><div class='add'>+		 * driver does not need to set this flag. The remote</div><div class='add'>+		 * usbip.ko does not still perform DMA-mapped I/O for</div><div class='add'>+		 * DMA-caplable host controllers. So, clear this flag.</div><div class='add'>+		 */</div><div class='add'>+		flags &amp;= ~URB_NO_TRANSFER_DMA_MAP;</div><div class='add'>+</div><div class='add'>+	if (flags &amp; URB_NO_SETUP_DMA_MAP)</div><div class='add'>+		flags &amp;= ~URB_NO_SETUP_DMA_MAP;</div><div class='add'>+</div><div class='add'>+	return flags;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void usbip_pack_cmd_submit(struct usbip_header *pdu, struct urb *urb,</div><div class='add'>+								int pack)</div><div class='add'>+{</div><div class='add'>+	struct usbip_header_cmd_submit *spdu = &amp;pdu-&gt;u.cmd_submit;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Some members are not still implemented in usbip. I hope this issue</div><div class='add'>+	 * will be discussed when usbip is ported to other operating systems.</div><div class='add'>+	 */</div><div class='add'>+	if (pack) {</div><div class='add'>+		/* vhci_tx.c */</div><div class='add'>+		spdu-&gt;transfer_flags =</div><div class='add'>+				tweak_transfer_flags(urb-&gt;transfer_flags);</div><div class='add'>+		spdu-&gt;transfer_buffer_length	= urb-&gt;transfer_buffer_length;</div><div class='add'>+		spdu-&gt;start_frame		= urb-&gt;start_frame;</div><div class='add'>+		spdu-&gt;number_of_packets		= urb-&gt;number_of_packets;</div><div class='add'>+		spdu-&gt;interval			= urb-&gt;interval;</div><div class='add'>+	} else  {</div><div class='add'>+		/* stub_rx.c */</div><div class='add'>+		urb-&gt;transfer_flags         = spdu-&gt;transfer_flags;</div><div class='add'>+</div><div class='add'>+		urb-&gt;transfer_buffer_length = spdu-&gt;transfer_buffer_length;</div><div class='add'>+		urb-&gt;start_frame            = spdu-&gt;start_frame;</div><div class='add'>+		urb-&gt;number_of_packets      = spdu-&gt;number_of_packets;</div><div class='add'>+		urb-&gt;interval               = spdu-&gt;interval;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void usbip_pack_ret_submit(struct usbip_header *pdu, struct urb *urb,</div><div class='add'>+								int pack)</div><div class='add'>+{</div><div class='add'>+	struct usbip_header_ret_submit *rpdu = &amp;pdu-&gt;u.ret_submit;</div><div class='add'>+</div><div class='add'>+	if (pack) {</div><div class='add'>+		/* stub_tx.c */</div><div class='add'>+</div><div class='add'>+		rpdu-&gt;status		= urb-&gt;status;</div><div class='add'>+		rpdu-&gt;actual_length	= urb-&gt;actual_length;</div><div class='add'>+		rpdu-&gt;start_frame	= urb-&gt;start_frame;</div><div class='add'>+		rpdu-&gt;error_count	= urb-&gt;error_count;</div><div class='add'>+	} else {</div><div class='add'>+		/* vhci_rx.c */</div><div class='add'>+</div><div class='add'>+		urb-&gt;status		= rpdu-&gt;status;</div><div class='add'>+		urb-&gt;actual_length	= rpdu-&gt;actual_length;</div><div class='add'>+		urb-&gt;start_frame	= rpdu-&gt;start_frame;</div><div class='add'>+		urb-&gt;error_count	= rpdu-&gt;error_count;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+void usbip_pack_pdu(struct usbip_header *pdu, struct urb *urb, int cmd,</div><div class='add'>+								int pack)</div><div class='add'>+{</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case USBIP_CMD_SUBMIT:</div><div class='add'>+		usbip_pack_cmd_submit(pdu, urb, pack);</div><div class='add'>+		break;</div><div class='add'>+	case USBIP_RET_SUBMIT:</div><div class='add'>+		usbip_pack_ret_submit(pdu, urb, pack);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		err("unknown command");</div><div class='add'>+		/* NOTREACHED */</div><div class='add'>+		/* BUG(); */</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(usbip_pack_pdu);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void correct_endian_basic(struct usbip_header_basic *base, int send)</div><div class='add'>+{</div><div class='add'>+	if (send) {</div><div class='add'>+		base-&gt;command	= cpu_to_be32(base-&gt;command);</div><div class='add'>+		base-&gt;seqnum	= cpu_to_be32(base-&gt;seqnum);</div><div class='add'>+		base-&gt;devid	= cpu_to_be32(base-&gt;devid);</div><div class='add'>+		base-&gt;direction	= cpu_to_be32(base-&gt;direction);</div><div class='add'>+		base-&gt;ep	= cpu_to_be32(base-&gt;ep);</div><div class='add'>+	} else {</div><div class='add'>+		base-&gt;command	= be32_to_cpu(base-&gt;command);</div><div class='add'>+		base-&gt;seqnum	= be32_to_cpu(base-&gt;seqnum);</div><div class='add'>+		base-&gt;devid	= be32_to_cpu(base-&gt;devid);</div><div class='add'>+		base-&gt;direction	= be32_to_cpu(base-&gt;direction);</div><div class='add'>+		base-&gt;ep	= be32_to_cpu(base-&gt;ep);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void correct_endian_cmd_submit(struct usbip_header_cmd_submit *pdu,</div><div class='add'>+								int send)</div><div class='add'>+{</div><div class='add'>+	if (send) {</div><div class='add'>+		pdu-&gt;transfer_flags = cpu_to_be32(pdu-&gt;transfer_flags);</div><div class='add'>+</div><div class='add'>+		cpu_to_be32s(&amp;pdu-&gt;transfer_buffer_length);</div><div class='add'>+		cpu_to_be32s(&amp;pdu-&gt;start_frame);</div><div class='add'>+		cpu_to_be32s(&amp;pdu-&gt;number_of_packets);</div><div class='add'>+		cpu_to_be32s(&amp;pdu-&gt;interval);</div><div class='add'>+	} else {</div><div class='add'>+		pdu-&gt;transfer_flags = be32_to_cpu(pdu-&gt;transfer_flags);</div><div class='add'>+</div><div class='add'>+		be32_to_cpus(&amp;pdu-&gt;transfer_buffer_length);</div><div class='add'>+		be32_to_cpus(&amp;pdu-&gt;start_frame);</div><div class='add'>+		be32_to_cpus(&amp;pdu-&gt;number_of_packets);</div><div class='add'>+		be32_to_cpus(&amp;pdu-&gt;interval);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void correct_endian_ret_submit(struct usbip_header_ret_submit *pdu,</div><div class='add'>+								int send)</div><div class='add'>+{</div><div class='add'>+	if (send) {</div><div class='add'>+		cpu_to_be32s(&amp;pdu-&gt;status);</div><div class='add'>+		cpu_to_be32s(&amp;pdu-&gt;actual_length);</div><div class='add'>+		cpu_to_be32s(&amp;pdu-&gt;start_frame);</div><div class='add'>+		cpu_to_be32s(&amp;pdu-&gt;error_count);</div><div class='add'>+	} else {</div><div class='add'>+		be32_to_cpus(&amp;pdu-&gt;status);</div><div class='add'>+		be32_to_cpus(&amp;pdu-&gt;actual_length);</div><div class='add'>+		be32_to_cpus(&amp;pdu-&gt;start_frame);</div><div class='add'>+		be32_to_cpus(&amp;pdu-&gt;error_count);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void correct_endian_cmd_unlink(struct usbip_header_cmd_unlink *pdu,</div><div class='add'>+								int send)</div><div class='add'>+{</div><div class='add'>+	if (send)</div><div class='add'>+		pdu-&gt;seqnum = cpu_to_be32(pdu-&gt;seqnum);</div><div class='add'>+	else</div><div class='add'>+		pdu-&gt;seqnum = be32_to_cpu(pdu-&gt;seqnum);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void correct_endian_ret_unlink(struct usbip_header_ret_unlink *pdu,</div><div class='add'>+								int send)</div><div class='add'>+{</div><div class='add'>+	if (send)</div><div class='add'>+		cpu_to_be32s(&amp;pdu-&gt;status);</div><div class='add'>+	else</div><div class='add'>+		be32_to_cpus(&amp;pdu-&gt;status);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void usbip_header_correct_endian(struct usbip_header *pdu, int send)</div><div class='add'>+{</div><div class='add'>+	__u32 cmd = 0;</div><div class='add'>+</div><div class='add'>+	if (send)</div><div class='add'>+		cmd = pdu-&gt;base.command;</div><div class='add'>+</div><div class='add'>+	correct_endian_basic(&amp;pdu-&gt;base, send);</div><div class='add'>+</div><div class='add'>+	if (!send)</div><div class='add'>+		cmd = pdu-&gt;base.command;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case USBIP_CMD_SUBMIT:</div><div class='add'>+		correct_endian_cmd_submit(&amp;pdu-&gt;u.cmd_submit, send);</div><div class='add'>+		break;</div><div class='add'>+	case USBIP_RET_SUBMIT:</div><div class='add'>+		correct_endian_ret_submit(&amp;pdu-&gt;u.ret_submit, send);</div><div class='add'>+		break;</div><div class='add'>+	case USBIP_CMD_UNLINK:</div><div class='add'>+		correct_endian_cmd_unlink(&amp;pdu-&gt;u.cmd_unlink, send);</div><div class='add'>+		break;</div><div class='add'>+	case USBIP_RET_UNLINK:</div><div class='add'>+		correct_endian_ret_unlink(&amp;pdu-&gt;u.ret_unlink, send);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		/* NOTREACHED */</div><div class='add'>+		err("unknown command in pdu header: %d", cmd);</div><div class='add'>+		/* BUG(); */</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(usbip_header_correct_endian);</div><div class='add'>+</div><div class='add'>+static void usbip_iso_pakcet_correct_endian(</div><div class='add'>+				struct usbip_iso_packet_descriptor *iso,</div><div class='add'>+				int send)</div><div class='add'>+{</div><div class='add'>+	/* does not need all members. but copy all simply. */</div><div class='add'>+	if (send) {</div><div class='add'>+		iso-&gt;offset	= cpu_to_be32(iso-&gt;offset);</div><div class='add'>+		iso-&gt;length	= cpu_to_be32(iso-&gt;length);</div><div class='add'>+		iso-&gt;status	= cpu_to_be32(iso-&gt;status);</div><div class='add'>+		iso-&gt;actual_length = cpu_to_be32(iso-&gt;actual_length);</div><div class='add'>+	} else {</div><div class='add'>+		iso-&gt;offset	= be32_to_cpu(iso-&gt;offset);</div><div class='add'>+		iso-&gt;length	= be32_to_cpu(iso-&gt;length);</div><div class='add'>+		iso-&gt;status	= be32_to_cpu(iso-&gt;status);</div><div class='add'>+		iso-&gt;actual_length = be32_to_cpu(iso-&gt;actual_length);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void usbip_pack_iso(struct usbip_iso_packet_descriptor *iso,</div><div class='add'>+		struct usb_iso_packet_descriptor *uiso, int pack)</div><div class='add'>+{</div><div class='add'>+	if (pack) {</div><div class='add'>+		iso-&gt;offset		= uiso-&gt;offset;</div><div class='add'>+		iso-&gt;length		= uiso-&gt;length;</div><div class='add'>+		iso-&gt;status		= uiso-&gt;status;</div><div class='add'>+		iso-&gt;actual_length	= uiso-&gt;actual_length;</div><div class='add'>+	} else {</div><div class='add'>+		uiso-&gt;offset		= iso-&gt;offset;</div><div class='add'>+		uiso-&gt;length		= iso-&gt;length;</div><div class='add'>+		uiso-&gt;status		= iso-&gt;status;</div><div class='add'>+		uiso-&gt;actual_length	= iso-&gt;actual_length;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* must free buffer */</div><div class='add'>+void *usbip_alloc_iso_desc_pdu(struct urb *urb, ssize_t *bufflen)</div><div class='add'>+{</div><div class='add'>+	void *buff;</div><div class='add'>+	struct usbip_iso_packet_descriptor *iso;</div><div class='add'>+	int np = urb-&gt;number_of_packets;</div><div class='add'>+	ssize_t size = np * sizeof(*iso);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	buff = kzalloc(size, GFP_KERNEL);</div><div class='add'>+	if (!buff)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; np; i++) {</div><div class='add'>+		iso = buff + (i * sizeof(*iso));</div><div class='add'>+</div><div class='add'>+		usbip_pack_iso(iso, &amp;urb-&gt;iso_frame_desc[i], 1);</div><div class='add'>+		usbip_iso_pakcet_correct_endian(iso, 1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*bufflen = size;</div><div class='add'>+</div><div class='add'>+	return buff;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(usbip_alloc_iso_desc_pdu);</div><div class='add'>+</div><div class='add'>+/* some members of urb must be substituted before. */</div><div class='add'>+int usbip_recv_iso(struct usbip_device *ud, struct urb *urb)</div><div class='add'>+{</div><div class='add'>+	void *buff;</div><div class='add'>+	struct usbip_iso_packet_descriptor *iso;</div><div class='add'>+	int np = urb-&gt;number_of_packets;</div><div class='add'>+	int size = np * sizeof(*iso);</div><div class='add'>+	int i;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!usb_pipeisoc(urb-&gt;pipe))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* my Bluetooth dongle gets ISO URBs which are np = 0 */</div><div class='add'>+	if (np == 0) {</div><div class='add'>+		/* uinfo("iso np == 0\n"); */</div><div class='add'>+		/* usbip_dump_urb(urb); */</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	buff = kzalloc(size, GFP_KERNEL);</div><div class='add'>+	if (!buff)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ret = usbip_xmit(0, ud-&gt;tcp_socket, buff, size, 0);</div><div class='add'>+	if (ret != size) {</div><div class='add'>+		dev_err(&amp;urb-&gt;dev-&gt;dev, "recv iso_frame_descriptor, %d\n",</div><div class='add'>+			ret);</div><div class='add'>+		kfree(buff);</div><div class='add'>+</div><div class='add'>+		if (ud-&gt;side == USBIP_STUB)</div><div class='add'>+			usbip_event_add(ud, SDEV_EVENT_ERROR_TCP);</div><div class='add'>+		else</div><div class='add'>+			usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);</div><div class='add'>+</div><div class='add'>+		return -EPIPE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; np; i++) {</div><div class='add'>+		iso = buff + (i * sizeof(*iso));</div><div class='add'>+</div><div class='add'>+		usbip_iso_pakcet_correct_endian(iso, 0);</div><div class='add'>+		usbip_pack_iso(iso, &amp;urb-&gt;iso_frame_desc[i], 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	kfree(buff);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(usbip_recv_iso);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* some members of urb must be substituted before. */</div><div class='add'>+int usbip_recv_xbuff(struct usbip_device *ud, struct urb *urb)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	int size;</div><div class='add'>+</div><div class='add'>+	if (ud-&gt;side == USBIP_STUB) {</div><div class='add'>+		/* stub_rx.c */</div><div class='add'>+		/* the direction of urb must be OUT. */</div><div class='add'>+		if (usb_pipein(urb-&gt;pipe))</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		size = urb-&gt;transfer_buffer_length;</div><div class='add'>+	} else {</div><div class='add'>+		/* vhci_rx.c */</div><div class='add'>+		/* the direction of urb must be IN. */</div><div class='add'>+		if (usb_pipeout(urb-&gt;pipe))</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		size = urb-&gt;actual_length;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* no need to recv xbuff */</div><div class='add'>+	if (!(size &gt; 0))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ret = usbip_xmit(0, ud-&gt;tcp_socket, (char *)urb-&gt;transfer_buffer,</div><div class='add'>+			 size, 0);</div><div class='add'>+	if (ret != size) {</div><div class='add'>+		dev_err(&amp;urb-&gt;dev-&gt;dev, "recv xbuf, %d\n", ret);</div><div class='add'>+		if (ud-&gt;side == USBIP_STUB) {</div><div class='add'>+			usbip_event_add(ud, SDEV_EVENT_ERROR_TCP);</div><div class='add'>+		} else {</div><div class='add'>+			usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);</div><div class='add'>+			return -EPIPE;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(usbip_recv_xbuff);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*-------------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+static int __init usbip_common_init(void)</div><div class='add'>+{</div><div class='add'>+	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_DESC "" DRIVER_VERSION);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit usbip_common_exit(void)</div><div class='add'>+{</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+module_init(usbip_common_init);</div><div class='add'>+module_exit(usbip_common_exit);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR(DRIVER_AUTHOR);</div><div class='add'>+MODULE_DESCRIPTION(DRIVER_DESC);</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/staging/usbip/usbip_common.h b/drivers/staging/usbip/usbip_common.h<br/>new file mode 100644<br/>index 000000000000..b0186b766375<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/usbip/usbip_common.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/usbip/usbip_common.h</a></div><div class='hunk'>@@ -0,0 +1,406 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2003-2008 Takahiro Hirofuchi</div><div class='add'>+ *</div><div class='add'>+ * This is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,</div><div class='add'>+ * USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __VHCI_COMMON_H</div><div class='add'>+#define __VHCI_COMMON_H</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#include &lt;linux/version.h&gt;</div><div class='add'>+#include &lt;linux/usb.h&gt;</div><div class='add'>+#include &lt;asm/byteorder.h&gt;</div><div class='add'>+#include &lt;net/sock.h&gt;</div><div class='add'>+</div><div class='add'>+/*-------------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * define macros to print messages</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * udbg - print debug messages if CONFIG_USB_DEBUG is defined</div><div class='add'>+ * @fmt:</div><div class='add'>+ * @args:</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_USB_DEBUG</div><div class='add'>+</div><div class='add'>+#define udbg(fmt, args...)						\</div><div class='add'>+	do {								\</div><div class='add'>+		printk(KERN_DEBUG "%-10s:(%s,%d) %s: " fmt,		\</div><div class='add'>+			(in_interrupt() ? "interrupt" : (current)-&gt;comm),\</div><div class='add'>+			__FILE__, __LINE__, __func__, ##args);	\</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+#else  /* CONFIG_USB_DEBUG */</div><div class='add'>+</div><div class='add'>+#define udbg(fmt, args...)		do { } while (0)</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_USB_DEBUG */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	usbip_debug_xmit	= (1 &lt;&lt; 0),</div><div class='add'>+	usbip_debug_sysfs	= (1 &lt;&lt; 1),</div><div class='add'>+	usbip_debug_urb		= (1 &lt;&lt; 2),</div><div class='add'>+	usbip_debug_eh		= (1 &lt;&lt; 3),</div><div class='add'>+</div><div class='add'>+	usbip_debug_stub_cmp	= (1 &lt;&lt; 8),</div><div class='add'>+	usbip_debug_stub_dev	= (1 &lt;&lt; 9),</div><div class='add'>+	usbip_debug_stub_rx	= (1 &lt;&lt; 10),</div><div class='add'>+	usbip_debug_stub_tx	= (1 &lt;&lt; 11),</div><div class='add'>+</div><div class='add'>+	usbip_debug_vhci_rh	= (1 &lt;&lt; 8),</div><div class='add'>+	usbip_debug_vhci_hc	= (1 &lt;&lt; 9),</div><div class='add'>+	usbip_debug_vhci_rx	= (1 &lt;&lt; 10),</div><div class='add'>+	usbip_debug_vhci_tx	= (1 &lt;&lt; 11),</div><div class='add'>+	usbip_debug_vhci_sysfs  = (1 &lt;&lt; 12)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define dbg_flag_xmit		(usbip_debug_flag &amp; usbip_debug_xmit)</div><div class='add'>+#define dbg_flag_vhci_rh	(usbip_debug_flag &amp; usbip_debug_vhci_rh)</div><div class='add'>+#define dbg_flag_vhci_hc	(usbip_debug_flag &amp; usbip_debug_vhci_hc)</div><div class='add'>+#define dbg_flag_vhci_rx	(usbip_debug_flag &amp; usbip_debug_vhci_rx)</div><div class='add'>+#define dbg_flag_vhci_tx	(usbip_debug_flag &amp; usbip_debug_vhci_tx)</div><div class='add'>+#define dbg_flag_vhci_sysfs	(usbip_debug_flag &amp; usbip_debug_vhci_sysfs)</div><div class='add'>+#define dbg_flag_stub_rx	(usbip_debug_flag &amp; usbip_debug_stub_rx)</div><div class='add'>+#define dbg_flag_stub_tx	(usbip_debug_flag &amp; usbip_debug_stub_tx)</div><div class='add'>+</div><div class='add'>+extern unsigned long usbip_debug_flag;</div><div class='add'>+extern struct device_attribute dev_attr_usbip_debug;</div><div class='add'>+</div><div class='add'>+#define dbg_with_flag(flag, fmt, args...)		\</div><div class='add'>+	do {						\</div><div class='add'>+		if (flag &amp; usbip_debug_flag)		\</div><div class='add'>+			udbg(fmt , ##args);		\</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+#define dbg_sysfs(fmt, args...)		\</div><div class='add'>+	dbg_with_flag(usbip_debug_sysfs, fmt , ##args)</div><div class='add'>+#define dbg_xmit(fmt, args...)		\</div><div class='add'>+	dbg_with_flag(usbip_debug_xmit, fmt , ##args)</div><div class='add'>+#define dbg_urb(fmt, args...)		\</div><div class='add'>+	dbg_with_flag(usbip_debug_urb, fmt , ##args)</div><div class='add'>+#define dbg_eh(fmt, args...)		\</div><div class='add'>+	dbg_with_flag(usbip_debug_eh, fmt , ##args)</div><div class='add'>+</div><div class='add'>+#define dbg_vhci_rh(fmt, args...)	\</div><div class='add'>+	dbg_with_flag(usbip_debug_vhci_rh, fmt , ##args)</div><div class='add'>+#define dbg_vhci_hc(fmt, args...)	\</div><div class='add'>+	dbg_with_flag(usbip_debug_vhci_hc, fmt , ##args)</div><div class='add'>+#define dbg_vhci_rx(fmt, args...)	\</div><div class='add'>+	dbg_with_flag(usbip_debug_vhci_rx, fmt , ##args)</div><div class='add'>+#define dbg_vhci_tx(fmt, args...)	\</div><div class='add'>+	dbg_with_flag(usbip_debug_vhci_tx, fmt , ##args)</div><div class='add'>+#define dbg_vhci_sysfs(fmt, args...)	\</div><div class='add'>+	dbg_with_flag(usbip_debug_vhci_sysfs, fmt , ##args)</div><div class='add'>+</div><div class='add'>+#define dbg_stub_cmp(fmt, args...)	\</div><div class='add'>+	dbg_with_flag(usbip_debug_stub_cmp, fmt , ##args)</div><div class='add'>+#define dbg_stub_rx(fmt, args...)	\</div><div class='add'>+	dbg_with_flag(usbip_debug_stub_rx, fmt , ##args)</div><div class='add'>+#define dbg_stub_tx(fmt, args...)	\</div><div class='add'>+	dbg_with_flag(usbip_debug_stub_tx, fmt , ##args)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * uerr - print error messages</div><div class='add'>+ * @fmt:</div><div class='add'>+ * @args:</div><div class='add'>+ */</div><div class='add'>+#define uerr(fmt, args...)						\</div><div class='add'>+	do {								\</div><div class='add'>+		printk(KERN_ERR "%-10s: ***ERROR*** (%s,%d) %s: " fmt,	\</div><div class='add'>+			(in_interrupt() ? "interrupt" : (current)-&gt;comm),\</div><div class='add'>+			__FILE__, __LINE__, __func__, ##args);	\</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * uinfo - print information messages</div><div class='add'>+ * @fmt:</div><div class='add'>+ * @args:</div><div class='add'>+ */</div><div class='add'>+#define uinfo(fmt, args...)					\</div><div class='add'>+	do {							\</div><div class='add'>+		printk(KERN_INFO "usbip: " fmt , ## args);	\</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*-------------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * USB/IP request headers.</div><div class='add'>+ * Currently, we define 4 request types:</div><div class='add'>+ *</div><div class='add'>+ *  - CMD_SUBMIT transfers a USB request, corresponding to usb_submit_urb().</div><div class='add'>+ *    (client to server)</div><div class='add'>+ *  - RET_RETURN transfers the result of CMD_SUBMIT.</div><div class='add'>+ *    (server to client)</div><div class='add'>+ *  - CMD_UNLINK transfers an unlink request of a pending USB request.</div><div class='add'>+ *    (client to server)</div><div class='add'>+ *  - RET_UNLINK transfers the result of CMD_UNLINK.</div><div class='add'>+ *    (server to client)</div><div class='add'>+ *</div><div class='add'>+ * Note: The below request formats are based on the USB subsystem of Linux. Its</div><div class='add'>+ * details will be defined when other implementations come.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * A basic header followed by other additional headers.</div><div class='add'>+ */</div><div class='add'>+struct usbip_header_basic {</div><div class='add'>+#define USBIP_CMD_SUBMIT	0x0001</div><div class='add'>+#define USBIP_CMD_UNLINK	0x0002</div><div class='add'>+#define USBIP_RET_SUBMIT	0x0003</div><div class='add'>+#define USBIP_RET_UNLINK	0x0004</div><div class='add'>+	__u32 command;</div><div class='add'>+</div><div class='add'>+	 /* sequencial number which identifies requests.</div><div class='add'>+	  * incremented per connections */</div><div class='add'>+	__u32 seqnum;</div><div class='add'>+</div><div class='add'>+	/* devid is used to specify a remote USB device uniquely instead</div><div class='add'>+	 * of busnum and devnum in Linux. In the case of Linux stub_driver,</div><div class='add'>+	 * this value is ((busnum &lt;&lt; 16) | devnum) */</div><div class='add'>+	__u32 devid;</div><div class='add'>+</div><div class='add'>+#define USBIP_DIR_OUT	0</div><div class='add'>+#define USBIP_DIR_IN 	1</div><div class='add'>+	__u32 direction;</div><div class='add'>+	__u32 ep;     /* endpoint number */</div><div class='add'>+} __attribute__ ((packed));</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * An additional header for a CMD_SUBMIT packet.</div><div class='add'>+ */</div><div class='add'>+struct usbip_header_cmd_submit {</div><div class='add'>+	/* these values are basically the same as in a URB. */</div><div class='add'>+</div><div class='add'>+	/* the same in a URB. */</div><div class='add'>+	__u32 transfer_flags;</div><div class='add'>+</div><div class='add'>+	/* set the following data size (out),</div><div class='add'>+	 * or expected reading data size (in) */</div><div class='add'>+	__s32 transfer_buffer_length;</div><div class='add'>+</div><div class='add'>+	/* it is difficult for usbip to sync frames (reserved only?) */</div><div class='add'>+	__s32 start_frame;</div><div class='add'>+</div><div class='add'>+	/* the number of iso descriptors that follows this header */</div><div class='add'>+	__s32 number_of_packets;</div><div class='add'>+</div><div class='add'>+	/* the maximum time within which this request works in a host</div><div class='add'>+	 * controller of a server side */</div><div class='add'>+	__s32 interval;</div><div class='add'>+</div><div class='add'>+	/* set setup packet data for a CTRL request */</div><div class='add'>+	unsigned char setup[8];</div><div class='add'>+} __attribute__ ((packed));</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * An additional header for a RET_SUBMIT packet.</div><div class='add'>+ */</div><div class='add'>+struct usbip_header_ret_submit {</div><div class='add'>+	__s32 status;</div><div class='add'>+	__s32 actual_length; /* returned data length */</div><div class='add'>+	__s32 start_frame; /* ISO and INT */</div><div class='add'>+	__s32 number_of_packets;  /* ISO only */</div><div class='add'>+	__s32 error_count; /* ISO only */</div><div class='add'>+} __attribute__ ((packed));</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * An additional header for a CMD_UNLINK packet.</div><div class='add'>+ */</div><div class='add'>+struct usbip_header_cmd_unlink {</div><div class='add'>+	__u32 seqnum; /* URB's seqnum which will be unlinked */</div><div class='add'>+} __attribute__ ((packed));</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * An additional header for a RET_UNLINK packet.</div><div class='add'>+ */</div><div class='add'>+struct usbip_header_ret_unlink {</div><div class='add'>+	__s32 status;</div><div class='add'>+} __attribute__ ((packed));</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* the same as usb_iso_packet_descriptor but packed for pdu */</div><div class='add'>+struct usbip_iso_packet_descriptor {</div><div class='add'>+	__u32 offset;</div><div class='add'>+	__u32 length;            /* expected length */</div><div class='add'>+	__u32 actual_length;</div><div class='add'>+	__u32 status;</div><div class='add'>+} __attribute__ ((packed));</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * All usbip packets use a common header to keep code simple.</div><div class='add'>+ */</div><div class='add'>+struct usbip_header {</div><div class='add'>+	struct usbip_header_basic base;</div><div class='add'>+</div><div class='add'>+	union {</div><div class='add'>+		struct usbip_header_cmd_submit	cmd_submit;</div><div class='add'>+		struct usbip_header_ret_submit	ret_submit;</div><div class='add'>+		struct usbip_header_cmd_unlink	cmd_unlink;</div><div class='add'>+		struct usbip_header_ret_unlink	ret_unlink;</div><div class='add'>+	} u;</div><div class='add'>+} __attribute__ ((packed));</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*-------------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+int usbip_xmit(int, struct socket *, char *, int, int);</div><div class='add'>+int usbip_sendmsg(struct socket *, struct msghdr *, int);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static inline int interface_to_busnum(struct usb_interface *interface)</div><div class='add'>+{</div><div class='add'>+	struct usb_device *udev = interface_to_usbdev(interface);</div><div class='add'>+	return udev-&gt;bus-&gt;busnum;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int interface_to_devnum(struct usb_interface *interface)</div><div class='add'>+{</div><div class='add'>+	struct usb_device *udev = interface_to_usbdev(interface);</div><div class='add'>+	return udev-&gt;devnum;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int interface_to_infnum(struct usb_interface *interface)</div><div class='add'>+{</div><div class='add'>+	return interface-&gt;cur_altsetting-&gt;desc.bInterfaceNumber;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#if 0</div><div class='add'>+int setnodelay(struct socket *);</div><div class='add'>+int setquickack(struct socket *);</div><div class='add'>+int setkeepalive(struct socket *socket);</div><div class='add'>+void setreuse(struct socket *);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+struct socket *sockfd_to_socket(unsigned int);</div><div class='add'>+int set_sockaddr(struct socket *socket, struct sockaddr_storage *ss);</div><div class='add'>+</div><div class='add'>+void usbip_dump_urb(struct urb *purb);</div><div class='add'>+void usbip_dump_header(struct usbip_header *pdu);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+struct usbip_device;</div><div class='add'>+</div><div class='add'>+struct usbip_task {</div><div class='add'>+	struct task_struct *thread;</div><div class='add'>+	struct completion thread_done;</div><div class='add'>+	char *name;</div><div class='add'>+	void (*loop_ops)(struct usbip_task *);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum usbip_side {</div><div class='add'>+	USBIP_VHCI,</div><div class='add'>+	USBIP_STUB,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum usbip_status {</div><div class='add'>+	/* sdev is available. */</div><div class='add'>+	SDEV_ST_AVAILABLE = 0x01,</div><div class='add'>+	/* sdev is now used. */</div><div class='add'>+	SDEV_ST_USED,</div><div class='add'>+	/* sdev is unusable because of a fatal error. */</div><div class='add'>+	SDEV_ST_ERROR,</div><div class='add'>+</div><div class='add'>+	/* vdev does not connect a remote device. */</div><div class='add'>+	VDEV_ST_NULL,</div><div class='add'>+	/* vdev is used, but the USB address is not assigned yet */</div><div class='add'>+	VDEV_ST_NOTASSIGNED,</div><div class='add'>+	VDEV_ST_USED,</div><div class='add'>+	VDEV_ST_ERROR</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* a common structure for stub_device and vhci_device */</div><div class='add'>+struct usbip_device {</div><div class='add'>+	enum usbip_side side;</div><div class='add'>+</div><div class='add'>+	enum usbip_status status;</div><div class='add'>+</div><div class='add'>+	/* lock for status */</div><div class='add'>+	spinlock_t lock;</div><div class='add'>+</div><div class='add'>+	struct socket *tcp_socket;</div><div class='add'>+</div><div class='add'>+	struct usbip_task tcp_rx;</div><div class='add'>+	struct usbip_task tcp_tx;</div><div class='add'>+</div><div class='add'>+	/* event handler */</div><div class='add'>+#define USBIP_EH_SHUTDOWN	(1 &lt;&lt; 0)</div><div class='add'>+#define USBIP_EH_BYE		(1 &lt;&lt; 1)</div><div class='add'>+#define USBIP_EH_RESET		(1 &lt;&lt; 2)</div><div class='add'>+#define USBIP_EH_UNUSABLE	(1 &lt;&lt; 3)</div><div class='add'>+</div><div class='add'>+#define SDEV_EVENT_REMOVED	(USBIP_EH_SHUTDOWN | USBIP_EH_RESET | USBIP_EH_BYE)</div><div class='add'>+#define	SDEV_EVENT_DOWN		(USBIP_EH_SHUTDOWN | USBIP_EH_RESET)</div><div class='add'>+#define	SDEV_EVENT_ERROR_TCP	(USBIP_EH_SHUTDOWN | USBIP_EH_RESET)</div><div class='add'>+#define	SDEV_EVENT_ERROR_SUBMIT	(USBIP_EH_SHUTDOWN | USBIP_EH_RESET)</div><div class='add'>+#define	SDEV_EVENT_ERROR_MALLOC	(USBIP_EH_SHUTDOWN | USBIP_EH_UNUSABLE)</div><div class='add'>+</div><div class='add'>+#define	VDEV_EVENT_REMOVED	(USBIP_EH_SHUTDOWN | USBIP_EH_BYE)</div><div class='add'>+#define	VDEV_EVENT_DOWN		(USBIP_EH_SHUTDOWN | USBIP_EH_RESET)</div><div class='add'>+#define	VDEV_EVENT_ERROR_TCP	(USBIP_EH_SHUTDOWN | USBIP_EH_RESET)</div><div class='add'>+#define	VDEV_EVENT_ERROR_MALLOC	(USBIP_EH_SHUTDOWN | USBIP_EH_UNUSABLE)</div><div class='add'>+</div><div class='add'>+	unsigned long event;</div><div class='add'>+	struct usbip_task eh;</div><div class='add'>+	wait_queue_head_t eh_waitq;</div><div class='add'>+</div><div class='add'>+	struct eh_ops {</div><div class='add'>+		void (*shutdown)(struct usbip_device *);</div><div class='add'>+		void (*reset)(struct usbip_device *);</div><div class='add'>+		void (*unusable)(struct usbip_device *);</div><div class='add'>+	} eh_ops;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+void usbip_task_init(struct usbip_task *ut, char *,</div><div class='add'>+				void (*loop_ops)(struct usbip_task *));</div><div class='add'>+</div><div class='add'>+void usbip_start_threads(struct usbip_device *ud);</div><div class='add'>+void usbip_stop_threads(struct usbip_device *ud);</div><div class='add'>+int usbip_thread(void *param);</div><div class='add'>+</div><div class='add'>+void usbip_pack_pdu(struct usbip_header *pdu, struct urb *urb, int cmd,</div><div class='add'>+								int pack);</div><div class='add'>+</div><div class='add'>+void usbip_header_correct_endian(struct usbip_header *pdu, int send);</div><div class='add'>+/* some members of urb must be substituted before. */</div><div class='add'>+int usbip_recv_xbuff(struct usbip_device *ud, struct urb *urb);</div><div class='add'>+/* some members of urb must be substituted before. */</div><div class='add'>+int usbip_recv_iso(struct usbip_device *ud, struct urb *urb);</div><div class='add'>+void *usbip_alloc_iso_desc_pdu(struct urb *urb, ssize_t *bufflen);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* usbip_event.c */</div><div class='add'>+void usbip_start_eh(struct usbip_device *ud);</div><div class='add'>+void usbip_stop_eh(struct usbip_device *ud);</div><div class='add'>+void usbip_event_add(struct usbip_device *ud, unsigned long event);</div><div class='add'>+int usbip_event_happend(struct usbip_device *ud);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/staging/usbip/usbip_event.c b/drivers/staging/usbip/usbip_event.c<br/>new file mode 100644<br/>index 000000000000..4318553ab20c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/usbip/usbip_event.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/usbip/usbip_event.c</a></div><div class='hunk'>@@ -0,0 +1,141 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2003-2008 Takahiro Hirofuchi</div><div class='add'>+ *</div><div class='add'>+ * This is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,</div><div class='add'>+ * USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "usbip_common.h"</div><div class='add'>+</div><div class='add'>+static int event_handler(struct usbip_device *ud)</div><div class='add'>+{</div><div class='add'>+	dbg_eh("enter\n");</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Events are handled by only this thread.</div><div class='add'>+	 */</div><div class='add'>+	while (usbip_event_happend(ud)) {</div><div class='add'>+		dbg_eh("pending event %lx\n", ud-&gt;event);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * NOTE: shutdown must come first.</div><div class='add'>+		 * Shutdown the device.</div><div class='add'>+		 */</div><div class='add'>+		if (ud-&gt;event &amp; USBIP_EH_SHUTDOWN) {</div><div class='add'>+			ud-&gt;eh_ops.shutdown(ud);</div><div class='add'>+</div><div class='add'>+			ud-&gt;event &amp;= ~USBIP_EH_SHUTDOWN;</div><div class='add'>+</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Stop the error handler. */</div><div class='add'>+		if (ud-&gt;event &amp; USBIP_EH_BYE)</div><div class='add'>+			return -1;</div><div class='add'>+</div><div class='add'>+		/* Reset the device. */</div><div class='add'>+		if (ud-&gt;event &amp; USBIP_EH_RESET) {</div><div class='add'>+			ud-&gt;eh_ops.reset(ud);</div><div class='add'>+</div><div class='add'>+			ud-&gt;event &amp;= ~USBIP_EH_RESET;</div><div class='add'>+</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Mark the device as unusable. */</div><div class='add'>+		if (ud-&gt;event &amp; USBIP_EH_UNUSABLE) {</div><div class='add'>+			ud-&gt;eh_ops.unusable(ud);</div><div class='add'>+</div><div class='add'>+			ud-&gt;event &amp;= ~USBIP_EH_UNUSABLE;</div><div class='add'>+</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* NOTREACHED */</div><div class='add'>+		printk(KERN_ERR "%s: unknown event\n", __func__);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void event_handler_loop(struct usbip_task *ut)</div><div class='add'>+{</div><div class='add'>+	struct usbip_device *ud = container_of(ut, struct usbip_device, eh);</div><div class='add'>+</div><div class='add'>+	while (1) {</div><div class='add'>+		if (signal_pending(current)) {</div><div class='add'>+			dbg_eh("signal catched!\n");</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (event_handler(ud) &lt; 0)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		wait_event_interruptible(ud-&gt;eh_waitq, usbip_event_happend(ud));</div><div class='add'>+		dbg_eh("wakeup\n");</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void usbip_start_eh(struct usbip_device *ud)</div><div class='add'>+{</div><div class='add'>+	struct usbip_task *eh = &amp;ud-&gt;eh;</div><div class='add'>+</div><div class='add'>+	init_waitqueue_head(&amp;ud-&gt;eh_waitq);</div><div class='add'>+	ud-&gt;event = 0;</div><div class='add'>+</div><div class='add'>+	usbip_task_init(eh, "usbip_eh", event_handler_loop);</div><div class='add'>+</div><div class='add'>+	kernel_thread(usbip_thread, (void *)eh, 0);</div><div class='add'>+</div><div class='add'>+	wait_for_completion(&amp;eh-&gt;thread_done);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(usbip_start_eh);</div><div class='add'>+</div><div class='add'>+void usbip_stop_eh(struct usbip_device *ud)</div><div class='add'>+{</div><div class='add'>+	struct usbip_task *eh = &amp;ud-&gt;eh;</div><div class='add'>+</div><div class='add'>+	wait_for_completion(&amp;eh-&gt;thread_done);</div><div class='add'>+	dbg_eh("usbip_eh has finished\n");</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(usbip_stop_eh);</div><div class='add'>+</div><div class='add'>+void usbip_event_add(struct usbip_device *ud, unsigned long event)</div><div class='add'>+{</div><div class='add'>+	spin_lock(&amp;ud-&gt;lock);</div><div class='add'>+</div><div class='add'>+	ud-&gt;event |= event;</div><div class='add'>+</div><div class='add'>+	wake_up(&amp;ud-&gt;eh_waitq);</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;ud-&gt;lock);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(usbip_event_add);</div><div class='add'>+</div><div class='add'>+int usbip_event_happend(struct usbip_device *ud)</div><div class='add'>+{</div><div class='add'>+	int happend = 0;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;ud-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (ud-&gt;event != 0)</div><div class='add'>+		happend = 1;</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;ud-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return happend;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(usbip_event_happend);</div><div class='head'>diff --git a/drivers/staging/usbip/vhci.h b/drivers/staging/usbip/vhci.h<br/>new file mode 100644<br/>index 000000000000..5e375173bbce<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/usbip/vhci.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/usbip/vhci.h</a></div><div class='hunk'>@@ -0,0 +1,142 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2003-2008 Takahiro Hirofuchi</div><div class='add'>+ *</div><div class='add'>+ * This is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,</div><div class='add'>+ * USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include "../../usb/core/hcd.h"</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+struct vhci_device {</div><div class='add'>+	struct usb_device *udev;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * devid specifies a remote usb device uniquely instead</div><div class='add'>+	 * of combination of busnum and devnum.</div><div class='add'>+	 */</div><div class='add'>+	__u32 devid;</div><div class='add'>+</div><div class='add'>+	/* speed of a remote device */</div><div class='add'>+	enum usb_device_speed speed;</div><div class='add'>+</div><div class='add'>+	/*  vhci root-hub port to which this device is attached  */</div><div class='add'>+	__u32 rhport;</div><div class='add'>+</div><div class='add'>+	struct usbip_device ud;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	/* lock for the below link lists */</div><div class='add'>+	spinlock_t priv_lock;</div><div class='add'>+</div><div class='add'>+	/* vhci_priv is linked to one of them. */</div><div class='add'>+	struct list_head priv_tx;</div><div class='add'>+	struct list_head priv_rx;</div><div class='add'>+</div><div class='add'>+	/* vhci_unlink is linked to one of them */</div><div class='add'>+	struct list_head unlink_tx;</div><div class='add'>+	struct list_head unlink_rx;</div><div class='add'>+</div><div class='add'>+	/* vhci_tx thread sleeps for this queue */</div><div class='add'>+	wait_queue_head_t waitq_tx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* urb-&gt;hcpriv, use container_of() */</div><div class='add'>+struct vhci_priv {</div><div class='add'>+	unsigned long seqnum;</div><div class='add'>+	struct list_head list;</div><div class='add'>+</div><div class='add'>+	struct vhci_device *vdev;</div><div class='add'>+	struct urb *urb;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+struct vhci_unlink {</div><div class='add'>+	/* seqnum of this request */</div><div class='add'>+	unsigned long seqnum;</div><div class='add'>+</div><div class='add'>+	struct list_head list;</div><div class='add'>+</div><div class='add'>+	/* seqnum of the unlink target */</div><div class='add'>+	unsigned long unlink_seqnum;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The number of ports is less than 16 ?</div><div class='add'>+ * USB_MAXCHILDREN is statically defined to 16 in usb.h.  Its maximum value</div><div class='add'>+ * would be 31 because the event_bits[1] of struct usb_hub is defined as</div><div class='add'>+ * unsigned long in hub.h</div><div class='add'>+ */</div><div class='add'>+#define VHCI_NPORTS 8</div><div class='add'>+</div><div class='add'>+/* for usb_bus.hcpriv */</div><div class='add'>+struct vhci_hcd {</div><div class='add'>+	spinlock_t	lock;</div><div class='add'>+</div><div class='add'>+	u32	port_status[VHCI_NPORTS];</div><div class='add'>+</div><div class='add'>+	unsigned	resuming:1;</div><div class='add'>+	unsigned long	re_timeout;</div><div class='add'>+</div><div class='add'>+	atomic_t seqnum;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * NOTE:</div><div class='add'>+	 * wIndex shows the port number and begins from 1.</div><div class='add'>+	 * But, the index of this array begins from 0.</div><div class='add'>+	 */</div><div class='add'>+	struct vhci_device vdev[VHCI_NPORTS];</div><div class='add'>+</div><div class='add'>+	/* vhci_device which has not been assiged its address yet */</div><div class='add'>+	int pending_port;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+extern struct vhci_hcd *the_controller;</div><div class='add'>+extern struct attribute_group dev_attr_group;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*-------------------------------------------------------------------------*/</div><div class='add'>+/* prototype declaration */</div><div class='add'>+</div><div class='add'>+/* vhci_hcd.c */</div><div class='add'>+void rh_port_connect(int rhport, enum usb_device_speed speed);</div><div class='add'>+void rh_port_disconnect(int rhport);</div><div class='add'>+void vhci_rx_loop(struct usbip_task *ut);</div><div class='add'>+void vhci_tx_loop(struct usbip_task *ut);</div><div class='add'>+</div><div class='add'>+#define hardware		(&amp;the_controller-&gt;pdev.dev)</div><div class='add'>+</div><div class='add'>+static inline struct vhci_device *port_to_vdev(__u32 port)</div><div class='add'>+{</div><div class='add'>+	return &amp;the_controller-&gt;vdev[port];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct vhci_hcd *hcd_to_vhci(struct usb_hcd *hcd)</div><div class='add'>+{</div><div class='add'>+	return (struct vhci_hcd *) (hcd-&gt;hcd_priv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct usb_hcd *vhci_to_hcd(struct vhci_hcd *vhci)</div><div class='add'>+{</div><div class='add'>+	return container_of((void *) vhci, struct usb_hcd, hcd_priv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct device *vhci_dev(struct vhci_hcd *vhci)</div><div class='add'>+{</div><div class='add'>+	return vhci_to_hcd(vhci)-&gt;self.controller;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/staging/usbip/vhci_hcd.c b/drivers/staging/usbip/vhci_hcd.c<br/>new file mode 100644<br/>index 000000000000..5b5a2e348ecb<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/usbip/vhci_hcd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/usbip/vhci_hcd.c</a></div><div class='hunk'>@@ -0,0 +1,1275 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2003-2008 Takahiro Hirofuchi</div><div class='add'>+ *</div><div class='add'>+ * This is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,</div><div class='add'>+ * USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#include "usbip_common.h"</div><div class='add'>+#include "vhci.h"</div><div class='add'>+</div><div class='add'>+#define DRIVER_VERSION "1.0"</div><div class='add'>+#define DRIVER_AUTHOR "Takahiro Hirofuchi"</div><div class='add'>+#define DRIVER_DESC "Virtual Host Controller Interface Driver for USB/IP"</div><div class='add'>+#define DRIVER_LICENCE "GPL"</div><div class='add'>+MODULE_AUTHOR(DRIVER_AUTHOR);</div><div class='add'>+MODULE_DESCRIPTION(DRIVER_DESC);</div><div class='add'>+MODULE_LICENSE(DRIVER_LICENCE);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * TODO</div><div class='add'>+ *	- update root hub emulation</div><div class='add'>+ *	- move the emulation code to userland ?</div><div class='add'>+ *		porting to other operating systems</div><div class='add'>+ *		minimize kernel code</div><div class='add'>+ *	- add suspend/resume code</div><div class='add'>+ *	- clean up everything</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* See usb gadget dummy hcd */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int vhci_hub_status(struct usb_hcd *hcd, char *buff);</div><div class='add'>+static int vhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,</div><div class='add'>+		u16 wIndex, char *buff, u16 wLength);</div><div class='add'>+static int vhci_urb_enqueue(struct usb_hcd *hcd, struct urb *urb,</div><div class='add'>+							gfp_t mem_flags);</div><div class='add'>+static int vhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status);</div><div class='add'>+static int vhci_start(struct usb_hcd *vhci_hcd);</div><div class='add'>+static void vhci_stop(struct usb_hcd *hcd);</div><div class='add'>+static int vhci_get_frame_number(struct usb_hcd *hcd);</div><div class='add'>+</div><div class='add'>+static const char driver_name[] = "vhci_hcd";</div><div class='add'>+static const char driver_desc[] = "USB/IP Virtual Host Contoroller";</div><div class='add'>+</div><div class='add'>+struct vhci_hcd *the_controller;</div><div class='add'>+</div><div class='add'>+static const char *bit_desc[] = {</div><div class='add'>+	"CONNECTION",		/*0*/</div><div class='add'>+	"ENABLE",		/*1*/</div><div class='add'>+	"SUSPEND",		/*2*/</div><div class='add'>+	"OVER_CURRENT",		/*3*/</div><div class='add'>+	"RESET",		/*4*/</div><div class='add'>+	"R5",		/*5*/</div><div class='add'>+	"R6",		/*6*/</div><div class='add'>+	"R7",		/*7*/</div><div class='add'>+	"POWER",		/*8*/</div><div class='add'>+	"LOWSPEED",		/*9*/</div><div class='add'>+	"HIGHSPEED",		/*10*/</div><div class='add'>+	"PORT_TEST",		/*11*/</div><div class='add'>+	"INDICATOR",		/*12*/</div><div class='add'>+	"R13",		/*13*/</div><div class='add'>+	"R14",		/*14*/</div><div class='add'>+	"R15",		/*15*/</div><div class='add'>+	"C_CONNECTION",		/*16*/</div><div class='add'>+	"C_ENABLE",		/*17*/</div><div class='add'>+	"C_SUSPEND",		/*18*/</div><div class='add'>+	"C_OVER_CURRENT",	/*19*/</div><div class='add'>+	"C_RESET",		/*20*/</div><div class='add'>+	"R21",		/*21*/</div><div class='add'>+	"R22",		/*22*/</div><div class='add'>+	"R23",		/*23*/</div><div class='add'>+	"R24",		/*24*/</div><div class='add'>+	"R25",		/*25*/</div><div class='add'>+	"R26",		/*26*/</div><div class='add'>+	"R27",		/*27*/</div><div class='add'>+	"R28",		/*28*/</div><div class='add'>+	"R29",		/*29*/</div><div class='add'>+	"R30",		/*30*/</div><div class='add'>+	"R31",		/*31*/</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void dump_port_status(u32 status)</div><div class='add'>+{</div><div class='add'>+	int i = 0;</div><div class='add'>+</div><div class='add'>+	printk(KERN_DEBUG "status %08x:", status);</div><div class='add'>+	for (i = 0; i &lt; 32; i++) {</div><div class='add'>+		if (status &amp; (1 &lt;&lt; i))</div><div class='add'>+			printk(" %s", bit_desc[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	printk("\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+void rh_port_connect(int rhport, enum usb_device_speed speed)</div><div class='add'>+{</div><div class='add'>+	unsigned long	flags;</div><div class='add'>+</div><div class='add'>+	dbg_vhci_rh("rh_port_connect %d\n", rhport);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;the_controller-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	the_controller-&gt;port_status[rhport] |= USB_PORT_STAT_CONNECTION</div><div class='add'>+		| (1 &lt;&lt; USB_PORT_FEAT_C_CONNECTION);</div><div class='add'>+</div><div class='add'>+	switch (speed) {</div><div class='add'>+	case USB_SPEED_HIGH:</div><div class='add'>+		the_controller-&gt;port_status[rhport] |= USB_PORT_STAT_HIGH_SPEED;</div><div class='add'>+		break;</div><div class='add'>+	case USB_SPEED_LOW:</div><div class='add'>+		the_controller-&gt;port_status[rhport] |= USB_PORT_STAT_LOW_SPEED;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* spin_lock(&amp;the_controller-&gt;vdev[rhport].ud.lock);</div><div class='add'>+	 * the_controller-&gt;vdev[rhport].ud.status = VDEV_CONNECT;</div><div class='add'>+	 * spin_unlock(&amp;the_controller-&gt;vdev[rhport].ud.lock); */</div><div class='add'>+</div><div class='add'>+	the_controller-&gt;pending_port = rhport;</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;the_controller-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	usb_hcd_poll_rh_status(vhci_to_hcd(the_controller));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void rh_port_disconnect(int rhport)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	dbg_vhci_rh("rh_port_disconnect %d\n", rhport);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;the_controller-&gt;lock, flags);</div><div class='add'>+	/* stop_activity(dum, driver); */</div><div class='add'>+	the_controller-&gt;port_status[rhport] &amp;= ~USB_PORT_STAT_CONNECTION;</div><div class='add'>+	the_controller-&gt;port_status[rhport] |=</div><div class='add'>+					(1 &lt;&lt; USB_PORT_FEAT_C_CONNECTION);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	/* not yet complete the disconnection</div><div class='add'>+	 * spin_lock(&amp;vdev-&gt;ud.lock);</div><div class='add'>+	 * vdev-&gt;ud.status = VHC_ST_DISCONNECT;</div><div class='add'>+	 * spin_unlock(&amp;vdev-&gt;ud.lock); */</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;the_controller-&gt;lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+#define PORT_C_MASK \</div><div class='add'>+	((USB_PORT_STAT_C_CONNECTION \</div><div class='add'>+	  | USB_PORT_STAT_C_ENABLE \</div><div class='add'>+	  | USB_PORT_STAT_C_SUSPEND \</div><div class='add'>+	  | USB_PORT_STAT_C_OVERCURRENT \</div><div class='add'>+	  | USB_PORT_STAT_C_RESET) &lt;&lt; 16)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This function is almostly the same as dummy_hcd.c:dummy_hub_status() without</div><div class='add'>+ * suspend/resume support. But, it is modified to provide multiple ports.</div><div class='add'>+ *</div><div class='add'>+ * @buf: a bitmap to show which port status has been changed.</div><div class='add'>+ *  bit  0: reserved or used for another purpose?</div><div class='add'>+ *  bit  1: the status of port 0 has been changed.</div><div class='add'>+ *  bit  2: the status of port 1 has been changed.</div><div class='add'>+ *  ...</div><div class='add'>+ *  bit  7: the status of port 6 has been changed.</div><div class='add'>+ *  bit  8: the status of port 7 has been changed.</div><div class='add'>+ *  ...</div><div class='add'>+ *  bit 15: the status of port 14 has been changed.</div><div class='add'>+ *</div><div class='add'>+ * So, the maximum number of ports is 31 ( port 0 to port 30) ?</div><div class='add'>+ *</div><div class='add'>+ * The return value is the actual transfered length in byte. If nothing has</div><div class='add'>+ * been changed, return 0. In the case that the number of ports is less than or</div><div class='add'>+ * equal to 6 (VHCI_NPORTS==7), return 1.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+static int vhci_hub_status(struct usb_hcd *hcd, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct vhci_hcd	*vhci;</div><div class='add'>+	unsigned long	flags;</div><div class='add'>+	int		retval = 0;</div><div class='add'>+</div><div class='add'>+	/* the enough buffer is allocated according to USB_MAXCHILDREN */</div><div class='add'>+	unsigned long	*event_bits = (unsigned long *) buf;</div><div class='add'>+	int		rhport;</div><div class='add'>+	int		changed = 0;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	*event_bits = 0;</div><div class='add'>+</div><div class='add'>+	vhci = hcd_to_vhci(hcd);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;vhci-&gt;lock, flags);</div><div class='add'>+	if (!test_bit(HCD_FLAG_HW_ACCESSIBLE, &amp;hcd-&gt;flags)) {</div><div class='add'>+		dbg_vhci_rh("hw accessible flag in on?\n");</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* check pseudo status register for each port */</div><div class='add'>+	for (rhport = 0; rhport &lt; VHCI_NPORTS; rhport++) {</div><div class='add'>+		if ((vhci-&gt;port_status[rhport] &amp; PORT_C_MASK)) {</div><div class='add'>+			/* The status of a port has been changed, */</div><div class='add'>+			dbg_vhci_rh("port %d is changed\n", rhport);</div><div class='add'>+</div><div class='add'>+			*event_bits |= 1 &lt;&lt; (rhport + 1);</div><div class='add'>+			changed = 1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	uinfo("changed %d\n", changed);</div><div class='add'>+</div><div class='add'>+	if (hcd-&gt;state == HC_STATE_SUSPENDED)</div><div class='add'>+		usb_hcd_resume_root_hub(hcd);</div><div class='add'>+</div><div class='add'>+	if (changed)</div><div class='add'>+		retval = 1 + (VHCI_NPORTS / 8);</div><div class='add'>+	else</div><div class='add'>+		retval = 0;</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	spin_unlock_irqrestore(&amp;vhci-&gt;lock, flags);</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* See hub_configure in hub.c */</div><div class='add'>+static inline void hub_descriptor(struct usb_hub_descriptor *desc)</div><div class='add'>+{</div><div class='add'>+	memset(desc, 0, sizeof(*desc));</div><div class='add'>+	desc-&gt;bDescriptorType = 0x29;</div><div class='add'>+	desc-&gt;bDescLength = 9;</div><div class='add'>+	desc-&gt;wHubCharacteristics = (__force __u16)</div><div class='add'>+		(__constant_cpu_to_le16(0x0001));</div><div class='add'>+	desc-&gt;bNbrPorts = VHCI_NPORTS;</div><div class='add'>+	desc-&gt;bitmap[0] = 0xff;</div><div class='add'>+	desc-&gt;bitmap[1] = 0xff;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,</div><div class='add'>+			    u16 wIndex, char *buf, u16 wLength)</div><div class='add'>+{</div><div class='add'>+	struct vhci_hcd	*dum;</div><div class='add'>+	int             retval = 0;</div><div class='add'>+	unsigned long   flags;</div><div class='add'>+	int		rhport;</div><div class='add'>+</div><div class='add'>+	u32 prev_port_status[VHCI_NPORTS];</div><div class='add'>+</div><div class='add'>+	if (!test_bit(HCD_FLAG_HW_ACCESSIBLE, &amp;hcd-&gt;flags))</div><div class='add'>+		return -ETIMEDOUT;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * NOTE:</div><div class='add'>+	 * wIndex shows the port number and begins from 1.</div><div class='add'>+	 */</div><div class='add'>+	dbg_vhci_rh("typeReq %x wValue %x wIndex %x\n", typeReq, wValue,</div><div class='add'>+								wIndex);</div><div class='add'>+	if (wIndex &gt; VHCI_NPORTS)</div><div class='add'>+		printk(KERN_ERR "%s: invalid port number %d\n", __func__, wIndex);</div><div class='add'>+	rhport = ((__u8)(wIndex &amp; 0x00ff)) - 1;</div><div class='add'>+</div><div class='add'>+	dum = hcd_to_vhci(hcd);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;dum-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	/* store old status and compare now and old later */</div><div class='add'>+	if (dbg_flag_vhci_rh) {</div><div class='add'>+		int i = 0;</div><div class='add'>+		for (i = 0; i &lt; VHCI_NPORTS; i++)</div><div class='add'>+			prev_port_status[i] = dum-&gt;port_status[i];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (typeReq) {</div><div class='add'>+	case ClearHubFeature:</div><div class='add'>+		dbg_vhci_rh(" ClearHubFeature\n");</div><div class='add'>+		break;</div><div class='add'>+	case ClearPortFeature:</div><div class='add'>+		switch (wValue) {</div><div class='add'>+		case USB_PORT_FEAT_SUSPEND:</div><div class='add'>+			if (dum-&gt;port_status[rhport] &amp; USB_PORT_STAT_SUSPEND) {</div><div class='add'>+				/* 20msec signaling */</div><div class='add'>+				dum-&gt;resuming = 1;</div><div class='add'>+				dum-&gt;re_timeout =</div><div class='add'>+					jiffies + msecs_to_jiffies(20);</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		case USB_PORT_FEAT_POWER:</div><div class='add'>+			dbg_vhci_rh(" ClearPortFeature: USB_PORT_FEAT_POWER\n");</div><div class='add'>+			dum-&gt;port_status[rhport] = 0;</div><div class='add'>+			/* dum-&gt;address = 0; */</div><div class='add'>+			/* dum-&gt;hdev = 0; */</div><div class='add'>+			dum-&gt;resuming = 0;</div><div class='add'>+			break;</div><div class='add'>+		case USB_PORT_FEAT_C_RESET:</div><div class='add'>+			dbg_vhci_rh(" ClearPortFeature: "</div><div class='add'>+					"USB_PORT_FEAT_C_RESET\n");</div><div class='add'>+			switch (dum-&gt;vdev[rhport].speed) {</div><div class='add'>+			case USB_SPEED_HIGH:</div><div class='add'>+				dum-&gt;port_status[rhport] |=</div><div class='add'>+						USB_PORT_STAT_HIGH_SPEED;</div><div class='add'>+				break;</div><div class='add'>+			case USB_SPEED_LOW:</div><div class='add'>+				dum-&gt;port_status[rhport] |=</div><div class='add'>+						USB_PORT_STAT_LOW_SPEED;</div><div class='add'>+				break;</div><div class='add'>+			default:</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		default:</div><div class='add'>+			dbg_vhci_rh(" ClearPortFeature: default %x\n", wValue);</div><div class='add'>+			dum-&gt;port_status[rhport] &amp;= ~(1 &lt;&lt; wValue);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case GetHubDescriptor:</div><div class='add'>+		dbg_vhci_rh(" GetHubDescriptor\n");</div><div class='add'>+		hub_descriptor((struct usb_hub_descriptor *) buf);</div><div class='add'>+		break;</div><div class='add'>+	case GetHubStatus:</div><div class='add'>+		dbg_vhci_rh(" GetHubStatus\n");</div><div class='add'>+		*(__le32 *) buf = __constant_cpu_to_le32(0);</div><div class='add'>+		break;</div><div class='add'>+	case GetPortStatus:</div><div class='add'>+		dbg_vhci_rh(" GetPortStatus port %x\n", wIndex);</div><div class='add'>+		if (wIndex &gt; VHCI_NPORTS || wIndex &lt; 1) {</div><div class='add'>+			printk(KERN_ERR "%s: invalid port number %d\n",</div><div class='add'>+			       __func__, wIndex);</div><div class='add'>+			retval = -EPIPE;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* we do no care of resume. */</div><div class='add'>+</div><div class='add'>+		/* whoever resets or resumes must GetPortStatus to</div><div class='add'>+		 * complete it!!</div><div class='add'>+		 *                                   */</div><div class='add'>+		if (dum-&gt;resuming &amp;&amp; time_after(jiffies, dum-&gt;re_timeout)) {</div><div class='add'>+			printk(KERN_ERR "%s: not yet\n", __func__);</div><div class='add'>+			dum-&gt;port_status[rhport] |=</div><div class='add'>+					(1 &lt;&lt; USB_PORT_FEAT_C_SUSPEND);</div><div class='add'>+			dum-&gt;port_status[rhport] &amp;=</div><div class='add'>+					~(1 &lt;&lt; USB_PORT_FEAT_SUSPEND);</div><div class='add'>+			dum-&gt;resuming = 0;</div><div class='add'>+			dum-&gt;re_timeout = 0;</div><div class='add'>+			/* if (dum-&gt;driver &amp;&amp; dum-&gt;driver-&gt;resume) {</div><div class='add'>+			 *	spin_unlock (&amp;dum-&gt;lock);</div><div class='add'>+			 *	dum-&gt;driver-&gt;resume (&amp;dum-&gt;gadget);</div><div class='add'>+			 *	spin_lock (&amp;dum-&gt;lock);</div><div class='add'>+			 * } */</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if ((dum-&gt;port_status[rhport] &amp; (1 &lt;&lt; USB_PORT_FEAT_RESET)) !=</div><div class='add'>+				0 &amp;&amp; time_after(jiffies, dum-&gt;re_timeout)) {</div><div class='add'>+			dum-&gt;port_status[rhport] |=</div><div class='add'>+						(1 &lt;&lt; USB_PORT_FEAT_C_RESET);</div><div class='add'>+			dum-&gt;port_status[rhport] &amp;=</div><div class='add'>+						~(1 &lt;&lt; USB_PORT_FEAT_RESET);</div><div class='add'>+			dum-&gt;re_timeout = 0;</div><div class='add'>+</div><div class='add'>+			if (dum-&gt;vdev[rhport].ud.status ==</div><div class='add'>+							VDEV_ST_NOTASSIGNED) {</div><div class='add'>+				dbg_vhci_rh(" enable rhport %d (status %u)\n",</div><div class='add'>+						rhport,</div><div class='add'>+						dum-&gt;vdev[rhport].ud.status);</div><div class='add'>+				dum-&gt;port_status[rhport] |=</div><div class='add'>+							USB_PORT_STAT_ENABLE;</div><div class='add'>+			}</div><div class='add'>+#if 0</div><div class='add'>+			if (dum-&gt;driver) {</div><div class='add'>+</div><div class='add'>+				dum-&gt;port_status[rhport] |=</div><div class='add'>+							USB_PORT_STAT_ENABLE;</div><div class='add'>+				/* give it the best speed we agree on */</div><div class='add'>+				dum-&gt;gadget.speed = dum-&gt;driver-&gt;speed;</div><div class='add'>+				dum-&gt;gadget.ep0-&gt;maxpacket = 64;</div><div class='add'>+				switch (dum-&gt;gadget.speed) {</div><div class='add'>+				case USB_SPEED_HIGH:</div><div class='add'>+					dum-&gt;port_status[rhport] |=</div><div class='add'>+					USB_PORT_STAT_HIGH_SPEED;</div><div class='add'>+					break;</div><div class='add'>+				case USB_SPEED_LOW:</div><div class='add'>+					dum-&gt;gadget.ep0-&gt;maxpacket = 8;</div><div class='add'>+					dum-&gt;port_status[rhport] |=</div><div class='add'>+					USB_PORT_STAT_LOW_SPEED;</div><div class='add'>+					break;</div><div class='add'>+				default:</div><div class='add'>+					dum-&gt;gadget.speed = USB_SPEED_FULL;</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+		}</div><div class='add'>+		((u16 *) buf)[0] = cpu_to_le16(dum-&gt;port_status[rhport]);</div><div class='add'>+		((u16 *) buf)[1] =</div><div class='add'>+				cpu_to_le16(dum-&gt;port_status[rhport] &gt;&gt; 16);</div><div class='add'>+</div><div class='add'>+		dbg_vhci_rh(" GetPortStatus bye %x %x\n", ((u16 *)buf)[0],</div><div class='add'>+							((u16 *)buf)[1]);</div><div class='add'>+		break;</div><div class='add'>+	case SetHubFeature:</div><div class='add'>+		dbg_vhci_rh(" SetHubFeature\n");</div><div class='add'>+		retval = -EPIPE;</div><div class='add'>+		break;</div><div class='add'>+	case SetPortFeature:</div><div class='add'>+		switch (wValue) {</div><div class='add'>+		case USB_PORT_FEAT_SUSPEND:</div><div class='add'>+			dbg_vhci_rh(" SetPortFeature: "</div><div class='add'>+					"USB_PORT_FEAT_SUSPEND\n");</div><div class='add'>+			printk(KERN_ERR "%s: not yet\n", __func__);</div><div class='add'>+#if 0</div><div class='add'>+			dum-&gt;port_status[rhport] |=</div><div class='add'>+						(1 &lt;&lt; USB_PORT_FEAT_SUSPEND);</div><div class='add'>+			if (dum-&gt;driver-&gt;suspend) {</div><div class='add'>+				spin_unlock(&amp;dum-&gt;lock);</div><div class='add'>+				dum-&gt;driver-&gt;suspend(&amp;dum-&gt;gadget);</div><div class='add'>+				spin_lock(&amp;dum-&gt;lock);</div><div class='add'>+			}</div><div class='add'>+#endif</div><div class='add'>+			break;</div><div class='add'>+		case USB_PORT_FEAT_RESET:</div><div class='add'>+			dbg_vhci_rh(" SetPortFeature: USB_PORT_FEAT_RESET\n");</div><div class='add'>+			/* if it's already running, disconnect first */</div><div class='add'>+			if (dum-&gt;port_status[rhport] &amp; USB_PORT_STAT_ENABLE) {</div><div class='add'>+				dum-&gt;port_status[rhport] &amp;=</div><div class='add'>+						~(USB_PORT_STAT_ENABLE |</div><div class='add'>+						  USB_PORT_STAT_LOW_SPEED |</div><div class='add'>+						  USB_PORT_STAT_HIGH_SPEED);</div><div class='add'>+#if 0</div><div class='add'>+				if (dum-&gt;driver) {</div><div class='add'>+					dev_dbg(hardware, "disconnect\n");</div><div class='add'>+					stop_activity(dum, dum-&gt;driver);</div><div class='add'>+				}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+				/* FIXME test that code path! */</div><div class='add'>+			}</div><div class='add'>+			/* 50msec reset signaling */</div><div class='add'>+			dum-&gt;re_timeout = jiffies + msecs_to_jiffies(50);</div><div class='add'>+</div><div class='add'>+			/* FALLTHROUGH */</div><div class='add'>+		default:</div><div class='add'>+			dbg_vhci_rh(" SetPortFeature: default %d\n", wValue);</div><div class='add'>+			dum-&gt;port_status[rhport] |= (1 &lt;&lt; wValue);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		printk(KERN_ERR "%s: default: no such request\n", __func__);</div><div class='add'>+		/* dev_dbg (hardware,</div><div class='add'>+		 *		"hub control req%04x v%04x i%04x l%d\n",</div><div class='add'>+		 *		typeReq, wValue, wIndex, wLength); */</div><div class='add'>+</div><div class='add'>+		/* "protocol stall" on error */</div><div class='add'>+		retval = -EPIPE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dbg_flag_vhci_rh) {</div><div class='add'>+		printk(KERN_DEBUG "port %d\n", rhport);</div><div class='add'>+		dump_port_status(prev_port_status[rhport]);</div><div class='add'>+		dump_port_status(dum-&gt;port_status[rhport]);</div><div class='add'>+	}</div><div class='add'>+	dbg_vhci_rh(" bye\n");</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;dum-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+static struct vhci_device *get_vdev(struct usb_device *udev)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!udev)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; VHCI_NPORTS; i++)</div><div class='add'>+		if (the_controller-&gt;vdev[i].udev == udev)</div><div class='add'>+			return port_to_vdev(i);</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void vhci_tx_urb(struct urb *urb)</div><div class='add'>+{</div><div class='add'>+	struct vhci_device *vdev = get_vdev(urb-&gt;dev);</div><div class='add'>+	struct vhci_priv *priv;</div><div class='add'>+	unsigned long flag;</div><div class='add'>+</div><div class='add'>+	if (!vdev) {</div><div class='add'>+		err("could not get virtual device");</div><div class='add'>+		/* BUG(); */</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;vdev-&gt;priv_lock, flag);</div><div class='add'>+</div><div class='add'>+	priv = kzalloc(sizeof(struct vhci_priv), GFP_ATOMIC);</div><div class='add'>+	if (!priv) {</div><div class='add'>+		dev_err(&amp;urb-&gt;dev-&gt;dev, "malloc vhci_priv\n");</div><div class='add'>+		spin_unlock_irqrestore(&amp;vdev-&gt;priv_lock, flag);</div><div class='add'>+		usbip_event_add(&amp;vdev-&gt;ud, VDEV_EVENT_ERROR_MALLOC);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;seqnum = atomic_inc_return(&amp;the_controller-&gt;seqnum);</div><div class='add'>+	if (priv-&gt;seqnum == 0xffff)</div><div class='add'>+		uinfo("seqnum max\n");</div><div class='add'>+</div><div class='add'>+	priv-&gt;vdev = vdev;</div><div class='add'>+	priv-&gt;urb = urb;</div><div class='add'>+</div><div class='add'>+	urb-&gt;hcpriv = (void *) priv;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	list_add_tail(&amp;priv-&gt;list, &amp;vdev-&gt;priv_tx);</div><div class='add'>+</div><div class='add'>+	wake_up(&amp;vdev-&gt;waitq_tx);</div><div class='add'>+	spin_unlock_irqrestore(&amp;vdev-&gt;priv_lock, flag);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vhci_urb_enqueue(struct usb_hcd *hcd, struct urb *urb,</div><div class='add'>+			    gfp_t mem_flags)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = &amp;urb-&gt;dev-&gt;dev;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	dbg_vhci_hc("enter, usb_hcd %p urb %p mem_flags %d\n",</div><div class='add'>+		    hcd, urb, mem_flags);</div><div class='add'>+</div><div class='add'>+	/* patch to usb_sg_init() is in 2.5.60 */</div><div class='add'>+	BUG_ON(!urb-&gt;transfer_buffer &amp;&amp; urb-&gt;transfer_buffer_length);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;the_controller-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	/* check HC is active or not */</div><div class='add'>+	if (!HC_IS_RUNNING(hcd-&gt;state)) {</div><div class='add'>+		dev_err(dev, "HC is not running\n");</div><div class='add'>+		spin_unlock_irqrestore(&amp;the_controller-&gt;lock, flags);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (urb-&gt;status != -EINPROGRESS) {</div><div class='add'>+		dev_err(dev, "URB already unlinked!, status %d\n", urb-&gt;status);</div><div class='add'>+		spin_unlock_irqrestore(&amp;the_controller-&gt;lock, flags);</div><div class='add'>+		return urb-&gt;status;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = usb_hcd_link_urb_to_ep(hcd, urb);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto no_need_unlink;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The enumelation process is as follows;</div><div class='add'>+	 *</div><div class='add'>+	 *  1. Get_Descriptor request to DevAddrs(0) EndPoint(0)</div><div class='add'>+	 *     to get max packet length of default pipe</div><div class='add'>+	 *</div><div class='add'>+	 *  2. Set_Address request to DevAddr(0) EndPoint(0)</div><div class='add'>+	 *</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	if (usb_pipedevice(urb-&gt;pipe) == 0) {</div><div class='add'>+		__u8 type = usb_pipetype(urb-&gt;pipe);</div><div class='add'>+		struct usb_ctrlrequest *ctrlreq =</div><div class='add'>+				(struct usb_ctrlrequest *) urb-&gt;setup_packet;</div><div class='add'>+		struct vhci_device *vdev =</div><div class='add'>+				port_to_vdev(the_controller-&gt;pending_port);</div><div class='add'>+</div><div class='add'>+		if (type != PIPE_CONTROL || !ctrlreq) {</div><div class='add'>+			dev_err(dev, "invalid request to devnum 0\n");</div><div class='add'>+			ret = EINVAL;</div><div class='add'>+			goto no_need_xmit;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		switch (ctrlreq-&gt;bRequest) {</div><div class='add'>+		case USB_REQ_SET_ADDRESS:</div><div class='add'>+			/* set_address may come when a device is reset */</div><div class='add'>+			dev_info(dev, "SetAddress Request (%d) to port %d\n",</div><div class='add'>+				 ctrlreq-&gt;wValue, vdev-&gt;rhport);</div><div class='add'>+</div><div class='add'>+			vdev-&gt;udev = urb-&gt;dev;</div><div class='add'>+</div><div class='add'>+			spin_lock(&amp;vdev-&gt;ud.lock);</div><div class='add'>+			vdev-&gt;ud.status = VDEV_ST_USED;</div><div class='add'>+			spin_unlock(&amp;vdev-&gt;ud.lock);</div><div class='add'>+</div><div class='add'>+			if (urb-&gt;status == -EINPROGRESS) {</div><div class='add'>+				/* This request is successfully completed. */</div><div class='add'>+				/* If not -EINPROGRESS, possibly unlinked. */</div><div class='add'>+				urb-&gt;status = 0;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			goto no_need_xmit;</div><div class='add'>+</div><div class='add'>+		case USB_REQ_GET_DESCRIPTOR:</div><div class='add'>+			if (ctrlreq-&gt;wValue == (USB_DT_DEVICE &lt;&lt; 8))</div><div class='add'>+				dbg_vhci_hc("Not yet?: "</div><div class='add'>+						"Get_Descriptor to device 0 "</div><div class='add'>+						"(get max pipe size)\n");</div><div class='add'>+</div><div class='add'>+			/* FIXME: reference count? (usb_get_dev()) */</div><div class='add'>+			vdev-&gt;udev = urb-&gt;dev;</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		default:</div><div class='add'>+			/* NOT REACHED */</div><div class='add'>+			dev_err(dev, "invalid request to devnum 0 bRequest %u, "</div><div class='add'>+				"wValue %u\n", ctrlreq-&gt;bRequest,</div><div class='add'>+				ctrlreq-&gt;wValue);</div><div class='add'>+			ret =  -EINVAL;</div><div class='add'>+			goto no_need_xmit;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	vhci_tx_urb(urb);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;the_controller-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+no_need_xmit:</div><div class='add'>+	usb_hcd_unlink_urb_from_ep(hcd, urb);</div><div class='add'>+no_need_unlink:</div><div class='add'>+	spin_unlock_irqrestore(&amp;the_controller-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	usb_hcd_giveback_urb(vhci_to_hcd(the_controller), urb, urb-&gt;status);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * vhci_rx gives back the urb after receiving the reply of the urb.  If an</div><div class='add'>+ * unlink pdu is sent or not, vhci_rx receives a normal return pdu and gives</div><div class='add'>+ * back its urb. For the driver unlinking the urb, the content of the urb is</div><div class='add'>+ * not important, but the calling to its completion handler is important; the</div><div class='add'>+ * completion of unlinking is notified by the completion handler.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * CLIENT SIDE</div><div class='add'>+ *</div><div class='add'>+ * - When vhci_hcd receives RET_SUBMIT,</div><div class='add'>+ *</div><div class='add'>+ *	- case 1a). the urb of the pdu is not unlinking.</div><div class='add'>+ *		- normal case</div><div class='add'>+ *		=&gt; just give back the urb</div><div class='add'>+ *</div><div class='add'>+ *	- case 1b). the urb of the pdu is unlinking.</div><div class='add'>+ *		- usbip.ko will return a reply of the unlinking request.</div><div class='add'>+ *		=&gt; give back the urb now and go to case 2b).</div><div class='add'>+ *</div><div class='add'>+ * - When vhci_hcd receives RET_UNLINK,</div><div class='add'>+ *</div><div class='add'>+ *	- case 2a). a submit request is still pending in vhci_hcd.</div><div class='add'>+ *		- urb was really pending in usbip.ko and urb_unlink_urb() was</div><div class='add'>+ *		  completed there.</div><div class='add'>+ *		=&gt; free a pending submit request</div><div class='add'>+ *		=&gt; notify unlink completeness by giving back the urb</div><div class='add'>+ *</div><div class='add'>+ *	- case 2b). a submit request is *not* pending in vhci_hcd.</div><div class='add'>+ *		- urb was already given back to the core driver.</div><div class='add'>+ *		=&gt; do not give back the urb</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * SERVER SIDE</div><div class='add'>+ *</div><div class='add'>+ * - When usbip receives CMD_UNLINK,</div><div class='add'>+ *</div><div class='add'>+ *	- case 3a). the urb of the unlink request is now in submission.</div><div class='add'>+ *		=&gt; do usb_unlink_urb().</div><div class='add'>+ *		=&gt; after the unlink is completed, send RET_UNLINK.</div><div class='add'>+ *</div><div class='add'>+ *	- case 3b). the urb of the unlink request is not in submission.</div><div class='add'>+ *		- may be already completed or never be received</div><div class='add'>+ *		=&gt; send RET_UNLINK</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+static int vhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	struct vhci_priv *priv;</div><div class='add'>+	struct vhci_device *vdev;</div><div class='add'>+</div><div class='add'>+	uinfo("vhci_hcd: dequeue a urb %p\n", urb);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;the_controller-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	priv = urb-&gt;hcpriv;</div><div class='add'>+	if (!priv) {</div><div class='add'>+		/* URB was never linked! or will be soon given back by</div><div class='add'>+		 * vhci_rx. */</div><div class='add'>+		spin_unlock_irqrestore(&amp;the_controller-&gt;lock, flags);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	{</div><div class='add'>+		int ret = 0;</div><div class='add'>+		ret = usb_hcd_check_unlink_urb(hcd, urb, status);</div><div class='add'>+		if (ret) {</div><div class='add'>+			spin_unlock_irqrestore(&amp;the_controller-&gt;lock, flags);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	 /* send unlink request here? */</div><div class='add'>+	vdev = priv-&gt;vdev;</div><div class='add'>+</div><div class='add'>+	if (!vdev-&gt;ud.tcp_socket) {</div><div class='add'>+		/* tcp connection is closed */</div><div class='add'>+		unsigned long flags2;</div><div class='add'>+</div><div class='add'>+		spin_lock_irqsave(&amp;vdev-&gt;priv_lock, flags2);</div><div class='add'>+</div><div class='add'>+		uinfo("vhci_hcd: device %p seems to be disconnected\n", vdev);</div><div class='add'>+		list_del(&amp;priv-&gt;list);</div><div class='add'>+		kfree(priv);</div><div class='add'>+		urb-&gt;hcpriv = NULL;</div><div class='add'>+</div><div class='add'>+		spin_unlock_irqrestore(&amp;vdev-&gt;priv_lock, flags2);</div><div class='add'>+</div><div class='add'>+	} else {</div><div class='add'>+		/* tcp connection is alive */</div><div class='add'>+		unsigned long flags2;</div><div class='add'>+		struct vhci_unlink *unlink;</div><div class='add'>+</div><div class='add'>+		spin_lock_irqsave(&amp;vdev-&gt;priv_lock, flags2);</div><div class='add'>+</div><div class='add'>+		/* setup CMD_UNLINK pdu */</div><div class='add'>+		unlink = kzalloc(sizeof(struct vhci_unlink), GFP_ATOMIC);</div><div class='add'>+		if (!unlink) {</div><div class='add'>+			uerr("malloc vhci_unlink\n");</div><div class='add'>+			spin_unlock_irqrestore(&amp;vdev-&gt;priv_lock, flags2);</div><div class='add'>+			spin_unlock_irqrestore(&amp;the_controller-&gt;lock, flags);</div><div class='add'>+			usbip_event_add(&amp;vdev-&gt;ud, VDEV_EVENT_ERROR_MALLOC);</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		unlink-&gt;seqnum = atomic_inc_return(&amp;the_controller-&gt;seqnum);</div><div class='add'>+		if (unlink-&gt;seqnum == 0xffff)</div><div class='add'>+			uinfo("seqnum max\n");</div><div class='add'>+</div><div class='add'>+		unlink-&gt;unlink_seqnum = priv-&gt;seqnum;</div><div class='add'>+</div><div class='add'>+		uinfo("vhci_hcd: device %p seems to be still connected\n",</div><div class='add'>+									vdev);</div><div class='add'>+</div><div class='add'>+		/* send cmd_unlink and try to cancel the pending URB in the</div><div class='add'>+		 * peer */</div><div class='add'>+		list_add_tail(&amp;unlink-&gt;list, &amp;vdev-&gt;unlink_tx);</div><div class='add'>+		wake_up(&amp;vdev-&gt;waitq_tx);</div><div class='add'>+</div><div class='add'>+		spin_unlock_irqrestore(&amp;vdev-&gt;priv_lock, flags2);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If tcp connection is alive, we have sent CMD_UNLINK.</div><div class='add'>+	 * vhci_rx will receive RET_UNLINK and give back the URB.</div><div class='add'>+	 * Otherwise, we give back it here.</div><div class='add'>+	 */</div><div class='add'>+	if (!vdev-&gt;ud.tcp_socket) {</div><div class='add'>+		/* tcp connection is closed */</div><div class='add'>+		uinfo("vhci_hcd: vhci_urb_dequeue() gives back urb %p\n", urb);</div><div class='add'>+</div><div class='add'>+		usb_hcd_unlink_urb_from_ep(hcd, urb);</div><div class='add'>+</div><div class='add'>+		spin_unlock_irqrestore(&amp;the_controller-&gt;lock, flags);</div><div class='add'>+		usb_hcd_giveback_urb(vhci_to_hcd(the_controller), urb,</div><div class='add'>+								urb-&gt;status);</div><div class='add'>+		spin_lock_irqsave(&amp;the_controller-&gt;lock, flags);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;the_controller-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	dbg_vhci_hc("leave\n");</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void vhci_device_unlink_cleanup(struct vhci_device *vdev)</div><div class='add'>+{</div><div class='add'>+	struct vhci_unlink *unlink, *tmp;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;vdev-&gt;priv_lock);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(unlink, tmp, &amp;vdev-&gt;unlink_tx, list) {</div><div class='add'>+		list_del(&amp;unlink-&gt;list);</div><div class='add'>+		kfree(unlink);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(unlink, tmp, &amp;vdev-&gt;unlink_rx, list) {</div><div class='add'>+		list_del(&amp;unlink-&gt;list);</div><div class='add'>+		kfree(unlink);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;vdev-&gt;priv_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The important thing is that only one context begins cleanup.</div><div class='add'>+ * This is why error handling and cleanup become simple.</div><div class='add'>+ * We do not want to consider race condition as possible.</div><div class='add'>+ */</div><div class='add'>+static void vhci_shutdown_connection(struct usbip_device *ud)</div><div class='add'>+{</div><div class='add'>+	struct vhci_device *vdev = container_of(ud, struct vhci_device, ud);</div><div class='add'>+</div><div class='add'>+	/* need this? see stub_dev.c */</div><div class='add'>+	if (ud-&gt;tcp_socket) {</div><div class='add'>+		udbg("shutdown tcp_socket %p\n", ud-&gt;tcp_socket);</div><div class='add'>+		kernel_sock_shutdown(ud-&gt;tcp_socket, SHUT_RDWR);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	usbip_stop_threads(&amp;vdev-&gt;ud);</div><div class='add'>+	uinfo("stop threads\n");</div><div class='add'>+</div><div class='add'>+	/* active connection is closed */</div><div class='add'>+	if (vdev-&gt;ud.tcp_socket != NULL) {</div><div class='add'>+		sock_release(vdev-&gt;ud.tcp_socket);</div><div class='add'>+		vdev-&gt;ud.tcp_socket = NULL;</div><div class='add'>+	}</div><div class='add'>+	uinfo("release socket\n");</div><div class='add'>+</div><div class='add'>+	vhci_device_unlink_cleanup(vdev);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * rh_port_disconnect() is a trigger of ...</div><div class='add'>+	 *   usb_disable_device():</div><div class='add'>+	 *	disable all the endpoints for a USB device.</div><div class='add'>+	 *   usb_disable_endpoint():</div><div class='add'>+	 *	disable endpoints. pending urbs are unlinked(dequeued).</div><div class='add'>+	 *</div><div class='add'>+	 * NOTE: After calling rh_port_disconnect(), the USB device drivers of a</div><div class='add'>+	 * deteched device should release used urbs in a cleanup function(i.e.</div><div class='add'>+	 * xxx_disconnect()). Therefore, vhci_hcd does not need to release</div><div class='add'>+	 * pushed urbs and their private data in this function.</div><div class='add'>+	 *</div><div class='add'>+	 * NOTE: vhci_dequeue() must be considered carefully. When shutdowning</div><div class='add'>+	 * a connection, vhci_shutdown_connection() expects vhci_dequeue()</div><div class='add'>+	 * gives back pushed urbs and frees their private data by request of</div><div class='add'>+	 * the cleanup function of a USB driver. When unlinking a urb with an</div><div class='add'>+	 * active connection, vhci_dequeue() does not give back the urb which</div><div class='add'>+	 * is actually given back by vhci_rx after receiving its return pdu.</div><div class='add'>+	 *</div><div class='add'>+	 */</div><div class='add'>+	rh_port_disconnect(vdev-&gt;rhport);</div><div class='add'>+</div><div class='add'>+	uinfo("disconnect device\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void vhci_device_reset(struct usbip_device *ud)</div><div class='add'>+{</div><div class='add'>+	struct vhci_device *vdev = container_of(ud, struct vhci_device, ud);</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;ud-&gt;lock);</div><div class='add'>+</div><div class='add'>+	vdev-&gt;speed  = 0;</div><div class='add'>+	vdev-&gt;devid  = 0;</div><div class='add'>+</div><div class='add'>+	ud-&gt;tcp_socket = NULL;</div><div class='add'>+</div><div class='add'>+	ud-&gt;status = VDEV_ST_NULL;</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;ud-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void vhci_device_unusable(struct usbip_device *ud)</div><div class='add'>+{</div><div class='add'>+	spin_lock(&amp;ud-&gt;lock);</div><div class='add'>+</div><div class='add'>+	ud-&gt;status = VDEV_ST_ERROR;</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;ud-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void vhci_device_init(struct vhci_device *vdev)</div><div class='add'>+{</div><div class='add'>+	memset(vdev, 0, sizeof(*vdev));</div><div class='add'>+</div><div class='add'>+	usbip_task_init(&amp;vdev-&gt;ud.tcp_rx, "vhci_rx", vhci_rx_loop);</div><div class='add'>+	usbip_task_init(&amp;vdev-&gt;ud.tcp_tx, "vhci_tx", vhci_tx_loop);</div><div class='add'>+</div><div class='add'>+	vdev-&gt;ud.side   = USBIP_VHCI;</div><div class='add'>+	vdev-&gt;ud.status = VDEV_ST_NULL;</div><div class='add'>+	/* vdev-&gt;ud.lock   = SPIN_LOCK_UNLOCKED; */</div><div class='add'>+	spin_lock_init(&amp;vdev-&gt;ud.lock);</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;vdev-&gt;priv_rx);</div><div class='add'>+	INIT_LIST_HEAD(&amp;vdev-&gt;priv_tx);</div><div class='add'>+	INIT_LIST_HEAD(&amp;vdev-&gt;unlink_tx);</div><div class='add'>+	INIT_LIST_HEAD(&amp;vdev-&gt;unlink_rx);</div><div class='add'>+	/* vdev-&gt;priv_lock = SPIN_LOCK_UNLOCKED; */</div><div class='add'>+	spin_lock_init(&amp;vdev-&gt;priv_lock);</div><div class='add'>+</div><div class='add'>+	init_waitqueue_head(&amp;vdev-&gt;waitq_tx);</div><div class='add'>+</div><div class='add'>+	vdev-&gt;ud.eh_ops.shutdown = vhci_shutdown_connection;</div><div class='add'>+	vdev-&gt;ud.eh_ops.reset = vhci_device_reset;</div><div class='add'>+	vdev-&gt;ud.eh_ops.unusable = vhci_device_unusable;</div><div class='add'>+</div><div class='add'>+	usbip_start_eh(&amp;vdev-&gt;ud);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+static int vhci_start(struct usb_hcd *hcd)</div><div class='add'>+{</div><div class='add'>+	struct vhci_hcd *vhci = hcd_to_vhci(hcd);</div><div class='add'>+	int rhport;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	dbg_vhci_hc("enter vhci_start\n");</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	/* initialize private data of usb_hcd */</div><div class='add'>+</div><div class='add'>+	for (rhport = 0; rhport &lt; VHCI_NPORTS; rhport++) {</div><div class='add'>+		struct vhci_device *vdev = &amp;vhci-&gt;vdev[rhport];</div><div class='add'>+		vhci_device_init(vdev);</div><div class='add'>+		vdev-&gt;rhport = rhport;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	atomic_set(&amp;vhci-&gt;seqnum, 0);</div><div class='add'>+	spin_lock_init(&amp;vhci-&gt;lock);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	hcd-&gt;power_budget = 0; /* no limit */</div><div class='add'>+	hcd-&gt;state  = HC_STATE_RUNNING;</div><div class='add'>+	hcd-&gt;uses_new_polling = 1;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	/* vhci_hcd is now ready to be controlled through sysfs */</div><div class='add'>+	err = sysfs_create_group(&amp;vhci_dev(vhci)-&gt;kobj, &amp;dev_attr_group);</div><div class='add'>+	if (err) {</div><div class='add'>+		uerr("create sysfs files\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void vhci_stop(struct usb_hcd *hcd)</div><div class='add'>+{</div><div class='add'>+	struct vhci_hcd *vhci = hcd_to_vhci(hcd);</div><div class='add'>+	int rhport = 0;</div><div class='add'>+</div><div class='add'>+	dbg_vhci_hc("stop VHCI controller\n");</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	/* 1. remove the userland interface of vhci_hcd */</div><div class='add'>+	sysfs_remove_group(&amp;vhci_dev(vhci)-&gt;kobj, &amp;dev_attr_group);</div><div class='add'>+</div><div class='add'>+	/* 2. shutdown all the ports of vhci_hcd */</div><div class='add'>+	for (rhport = 0 ; rhport &lt; VHCI_NPORTS; rhport++) {</div><div class='add'>+		struct vhci_device *vdev = &amp;vhci-&gt;vdev[rhport];</div><div class='add'>+</div><div class='add'>+		usbip_event_add(&amp;vdev-&gt;ud, VDEV_EVENT_REMOVED);</div><div class='add'>+		usbip_stop_eh(&amp;vdev-&gt;ud);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	uinfo("vhci_stop done\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+static int vhci_get_frame_number(struct usb_hcd *hcd)</div><div class='add'>+{</div><div class='add'>+	uerr("Not yet implemented\n");</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+</div><div class='add'>+/* FIXME: suspend/resume */</div><div class='add'>+static int vhci_bus_suspend(struct usb_hcd *hcd)</div><div class='add'>+{</div><div class='add'>+	struct vhci_hcd *vhci = hcd_to_vhci(hcd);</div><div class='add'>+</div><div class='add'>+	dev_dbg(&amp;hcd-&gt;self.root_hub-&gt;dev, "%s\n", __func__);</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(&amp;vhci-&gt;lock);</div><div class='add'>+	/* vhci-&gt;rh_state = DUMMY_RH_SUSPENDED;</div><div class='add'>+	 * set_link_state(vhci); */</div><div class='add'>+	hcd-&gt;state = HC_STATE_SUSPENDED;</div><div class='add'>+	spin_unlock_irq(&amp;vhci-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vhci_bus_resume(struct usb_hcd *hcd)</div><div class='add'>+{</div><div class='add'>+	struct vhci_hcd *vhci = hcd_to_vhci(hcd);</div><div class='add'>+	int rc = 0;</div><div class='add'>+</div><div class='add'>+	dev_dbg(&amp;hcd-&gt;self.root_hub-&gt;dev, "%s\n", __func__);</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(&amp;vhci-&gt;lock);</div><div class='add'>+	if (!test_bit(HCD_FLAG_HW_ACCESSIBLE, &amp;hcd-&gt;flags)) {</div><div class='add'>+		rc = -ESHUTDOWN;</div><div class='add'>+	} else {</div><div class='add'>+		/* vhci-&gt;rh_state = DUMMY_RH_RUNNING;</div><div class='add'>+		 * set_link_state(vhci);</div><div class='add'>+		 * if (!list_empty(&amp;vhci-&gt;urbp_list))</div><div class='add'>+		 *	mod_timer(&amp;vhci-&gt;timer, jiffies); */</div><div class='add'>+		hcd-&gt;state = HC_STATE_RUNNING;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irq(&amp;vhci-&gt;lock);</div><div class='add'>+	return rc;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+#define vhci_bus_suspend      NULL</div><div class='add'>+#define vhci_bus_resume       NULL</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static struct hc_driver vhci_hc_driver = {</div><div class='add'>+	.description	= driver_name,</div><div class='add'>+	.product_desc	= driver_desc,</div><div class='add'>+	.hcd_priv_size	= sizeof(struct vhci_hcd),</div><div class='add'>+</div><div class='add'>+	.flags		= HCD_USB2,</div><div class='add'>+</div><div class='add'>+	.start		= vhci_start,</div><div class='add'>+	.stop 		= vhci_stop,</div><div class='add'>+</div><div class='add'>+	.urb_enqueue	= vhci_urb_enqueue,</div><div class='add'>+	.urb_dequeue	= vhci_urb_dequeue,</div><div class='add'>+</div><div class='add'>+	.get_frame_number = vhci_get_frame_number,</div><div class='add'>+</div><div class='add'>+	.hub_status_data = vhci_hub_status,</div><div class='add'>+	.hub_control    = vhci_hub_control,</div><div class='add'>+	.bus_suspend	= vhci_bus_suspend,</div><div class='add'>+	.bus_resume	= vhci_bus_resume,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int vhci_hcd_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct usb_hcd		*hcd;</div><div class='add'>+	int			ret;</div><div class='add'>+</div><div class='add'>+	uinfo("proving...\n");</div><div class='add'>+</div><div class='add'>+	dbg_vhci_hc("name %s id %d\n", pdev-&gt;name, pdev-&gt;id);</div><div class='add'>+</div><div class='add'>+	/* will be removed */</div><div class='add'>+	if (pdev-&gt;dev.dma_mask) {</div><div class='add'>+		dev_info(&amp;pdev-&gt;dev, "vhci_hcd DMA not supported\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Allocate and initialize hcd.</div><div class='add'>+	 * Our private data is also allocated automatically.</div><div class='add'>+	 */</div><div class='add'>+	hcd = usb_create_hcd(&amp;vhci_hc_driver, &amp;pdev-&gt;dev, pdev-&gt;dev.bus_id);</div><div class='add'>+	if (!hcd) {</div><div class='add'>+		uerr("create hcd failed\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	/* this is private data for vhci_hcd */</div><div class='add'>+	the_controller = hcd_to_vhci(hcd);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Finish generic HCD structure initialization and register.</div><div class='add'>+	 * Call the driver's reset() and start() routines.</div><div class='add'>+	 */</div><div class='add'>+	ret = usb_add_hcd(hcd, 0, 0);</div><div class='add'>+	if (ret != 0) {</div><div class='add'>+		uerr("usb_add_hcd failed %d\n", ret);</div><div class='add'>+		usb_put_hcd(hcd);</div><div class='add'>+		the_controller = NULL;</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	dbg_vhci_hc("bye\n");</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int vhci_hcd_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct usb_hcd	*hcd;</div><div class='add'>+</div><div class='add'>+	hcd = platform_get_drvdata(pdev);</div><div class='add'>+	if (!hcd)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Disconnects the root hub,</div><div class='add'>+	 * then reverses the effects of usb_add_hcd(),</div><div class='add'>+	 * invoking the HCD's stop() methods.</div><div class='add'>+	 */</div><div class='add'>+	usb_remove_hcd(hcd);</div><div class='add'>+	usb_put_hcd(hcd);</div><div class='add'>+	the_controller = NULL;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+</div><div class='add'>+/* what should happen for USB/IP under suspend/resume? */</div><div class='add'>+static int vhci_hcd_suspend(struct platform_device *pdev, pm_message_t state)</div><div class='add'>+{</div><div class='add'>+	struct usb_hcd *hcd;</div><div class='add'>+	int rhport = 0;</div><div class='add'>+	int connected = 0;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	dev_dbg(&amp;pdev-&gt;dev, "%s\n", __func__);</div><div class='add'>+</div><div class='add'>+	hcd = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;the_controller-&gt;lock);</div><div class='add'>+</div><div class='add'>+	for (rhport = 0; rhport &lt; VHCI_NPORTS; rhport++)</div><div class='add'>+		if (the_controller-&gt;port_status[rhport] &amp;</div><div class='add'>+						USB_PORT_STAT_CONNECTION)</div><div class='add'>+			connected += 1;</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;the_controller-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (connected &gt; 0) {</div><div class='add'>+		uinfo("We have %d active connection%s. Do not suspend.\n",</div><div class='add'>+				connected, (connected == 1 ? "" : "s"));</div><div class='add'>+		ret =  -EBUSY;</div><div class='add'>+	} else {</div><div class='add'>+		uinfo("suspend vhci_hcd");</div><div class='add'>+		clear_bit(HCD_FLAG_HW_ACCESSIBLE, &amp;hcd-&gt;flags);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vhci_hcd_resume(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct usb_hcd *hcd;</div><div class='add'>+</div><div class='add'>+	dev_dbg(&amp;pdev-&gt;dev, "%s\n", __func__);</div><div class='add'>+</div><div class='add'>+	hcd = platform_get_drvdata(pdev);</div><div class='add'>+	set_bit(HCD_FLAG_HW_ACCESSIBLE, &amp;hcd-&gt;flags);</div><div class='add'>+	usb_hcd_poll_rh_status(hcd);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+#define vhci_hcd_suspend	NULL</div><div class='add'>+#define vhci_hcd_resume		NULL</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static struct platform_driver vhci_driver = {</div><div class='add'>+	.probe	= vhci_hcd_probe,</div><div class='add'>+	.remove	= __devexit_p(vhci_hcd_remove),</div><div class='add'>+	.suspend = vhci_hcd_suspend,</div><div class='add'>+	.resume	= vhci_hcd_resume,</div><div class='add'>+	.driver	= {</div><div class='add'>+		.name = (char *) driver_name,</div><div class='add'>+		.owner = THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The VHCI 'device' is 'virtual'; not a real plug&amp;play hardware.</div><div class='add'>+ * We need to add this virtual device as a platform device arbitrarily:</div><div class='add'>+ *	1. platform_device_register()</div><div class='add'>+ */</div><div class='add'>+static void the_pdev_release(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct platform_device the_pdev = {</div><div class='add'>+	/* should be the same name as driver_name */</div><div class='add'>+	.name = (char *) driver_name,</div><div class='add'>+	.id = -1,</div><div class='add'>+	.dev = {</div><div class='add'>+		/* .driver = &amp;vhci_driver, */</div><div class='add'>+		.release = the_pdev_release,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init vhci_init(void)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	dbg_vhci_hc("enter\n");</div><div class='add'>+	if (usb_disabled())</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO KBUILD_MODNAME ": %s, %s\n", driver_name,</div><div class='add'>+	       DRIVER_VERSION);</div><div class='add'>+</div><div class='add'>+	ret = platform_driver_register(&amp;vhci_driver);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err_driver_register;</div><div class='add'>+</div><div class='add'>+	ret = platform_device_register(&amp;the_pdev);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err_platform_device_register;</div><div class='add'>+</div><div class='add'>+	dbg_vhci_hc("bye\n");</div><div class='add'>+	return ret;</div><div class='add'>+</div><div class='add'>+	/* error occurred */</div><div class='add'>+err_platform_device_register:</div><div class='add'>+	platform_driver_unregister(&amp;vhci_driver);</div><div class='add'>+</div><div class='add'>+err_driver_register:</div><div class='add'>+	dbg_vhci_hc("bye\n");</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+module_init(vhci_init);</div><div class='add'>+</div><div class='add'>+static void __exit vhci_cleanup(void)</div><div class='add'>+{</div><div class='add'>+	dbg_vhci_hc("enter\n");</div><div class='add'>+</div><div class='add'>+	platform_device_unregister(&amp;the_pdev);</div><div class='add'>+	platform_driver_unregister(&amp;vhci_driver);</div><div class='add'>+</div><div class='add'>+	dbg_vhci_hc("bye\n");</div><div class='add'>+}</div><div class='add'>+module_exit(vhci_cleanup);</div><div class='head'>diff --git a/drivers/staging/usbip/vhci_rx.c b/drivers/staging/usbip/vhci_rx.c<br/>new file mode 100644<br/>index 000000000000..933ccaf50afb<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/usbip/vhci_rx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/usbip/vhci_rx.c</a></div><div class='hunk'>@@ -0,0 +1,251 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2003-2008 Takahiro Hirofuchi</div><div class='add'>+ *</div><div class='add'>+ * This is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,</div><div class='add'>+ * USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "usbip_common.h"</div><div class='add'>+#include "vhci.h"</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* get URB from transmitted urb queue */</div><div class='add'>+static struct urb *pickup_urb_and_free_priv(struct vhci_device *vdev,</div><div class='add'>+					    __u32 seqnum)</div><div class='add'>+{</div><div class='add'>+	struct vhci_priv *priv, *tmp;</div><div class='add'>+	struct urb *urb = NULL;</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;vdev-&gt;priv_lock);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(priv, tmp, &amp;vdev-&gt;priv_rx, list) {</div><div class='add'>+		if (priv-&gt;seqnum == seqnum) {</div><div class='add'>+			urb = priv-&gt;urb;</div><div class='add'>+			status = urb-&gt;status;</div><div class='add'>+</div><div class='add'>+			dbg_vhci_rx("find urb %p vurb %p seqnum %u\n",</div><div class='add'>+				    urb, priv, seqnum);</div><div class='add'>+</div><div class='add'>+			/* TODO: fix logic here to improve indent situtation */</div><div class='add'>+			if (status != -EINPROGRESS) {</div><div class='add'>+				if (status == -ENOENT ||</div><div class='add'>+				     status == -ECONNRESET)</div><div class='add'>+					dev_info(&amp;urb-&gt;dev-&gt;dev,</div><div class='add'>+						 "urb %p was unlinked "</div><div class='add'>+						 "%ssynchronuously.\n", urb,</div><div class='add'>+						 status == -ENOENT ? "" : "a");</div><div class='add'>+				else</div><div class='add'>+					dev_info(&amp;urb-&gt;dev-&gt;dev,</div><div class='add'>+						 "urb %p may be in a error, "</div><div class='add'>+						 "status %d\n", urb, status);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			list_del(&amp;priv-&gt;list);</div><div class='add'>+			kfree(priv);</div><div class='add'>+			urb-&gt;hcpriv = NULL;</div><div class='add'>+</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;vdev-&gt;priv_lock);</div><div class='add'>+</div><div class='add'>+	return urb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void vhci_recv_ret_submit(struct vhci_device *vdev,</div><div class='add'>+						struct usbip_header *pdu)</div><div class='add'>+{</div><div class='add'>+	struct usbip_device *ud = &amp;vdev-&gt;ud;</div><div class='add'>+	struct urb *urb;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	urb = pickup_urb_and_free_priv(vdev, pdu-&gt;base.seqnum);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	if (!urb) {</div><div class='add'>+		uerr("cannot find a urb of seqnum %u\n", pdu-&gt;base.seqnum);</div><div class='add'>+		uinfo("max seqnum %d\n", atomic_read(&amp;the_controller-&gt;seqnum));</div><div class='add'>+		usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	/* unpack the pdu to a urb */</div><div class='add'>+	usbip_pack_pdu(pdu, urb, USBIP_RET_SUBMIT, 0);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	/* recv transfer buffer */</div><div class='add'>+	if (usbip_recv_xbuff(ud, urb) &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	/* recv iso_packet_descriptor */</div><div class='add'>+	if (usbip_recv_iso(ud, urb) &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	if (dbg_flag_vhci_rx)</div><div class='add'>+		usbip_dump_urb(urb);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	dbg_vhci_rx("now giveback urb %p\n", urb);</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;the_controller-&gt;lock);</div><div class='add'>+	usb_hcd_unlink_urb_from_ep(vhci_to_hcd(the_controller), urb);</div><div class='add'>+	spin_unlock(&amp;the_controller-&gt;lock);</div><div class='add'>+</div><div class='add'>+	usb_hcd_giveback_urb(vhci_to_hcd(the_controller), urb, urb-&gt;status);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	dbg_vhci_rx("Leave\n");</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static struct vhci_unlink *dequeue_pending_unlink(struct vhci_device *vdev,</div><div class='add'>+		struct usbip_header *pdu)</div><div class='add'>+{</div><div class='add'>+	struct vhci_unlink *unlink, *tmp;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;vdev-&gt;priv_lock);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(unlink, tmp, &amp;vdev-&gt;unlink_rx, list) {</div><div class='add'>+		uinfo("unlink-&gt;seqnum %lu\n", unlink-&gt;seqnum);</div><div class='add'>+		if (unlink-&gt;seqnum == pdu-&gt;base.seqnum) {</div><div class='add'>+			dbg_vhci_rx("found pending unlink, %lu\n",</div><div class='add'>+							unlink-&gt;seqnum);</div><div class='add'>+			list_del(&amp;unlink-&gt;list);</div><div class='add'>+</div><div class='add'>+			spin_unlock(&amp;vdev-&gt;priv_lock);</div><div class='add'>+			return unlink;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;vdev-&gt;priv_lock);</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void vhci_recv_ret_unlink(struct vhci_device *vdev,</div><div class='add'>+						struct usbip_header *pdu)</div><div class='add'>+{</div><div class='add'>+	struct vhci_unlink *unlink;</div><div class='add'>+	struct urb *urb;</div><div class='add'>+</div><div class='add'>+	usbip_dump_header(pdu);</div><div class='add'>+</div><div class='add'>+	unlink = dequeue_pending_unlink(vdev, pdu);</div><div class='add'>+	if (!unlink) {</div><div class='add'>+		uinfo("cannot find the pending unlink %u\n", pdu-&gt;base.seqnum);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	urb = pickup_urb_and_free_priv(vdev, unlink-&gt;unlink_seqnum);</div><div class='add'>+	if (!urb) {</div><div class='add'>+		/*</div><div class='add'>+		 * I get the result of a unlink request. But, it seems that I</div><div class='add'>+		 * already received the result of its submit result and gave</div><div class='add'>+		 * back the URB.</div><div class='add'>+		 */</div><div class='add'>+		uinfo("the urb (seqnum %d) was already given backed\n",</div><div class='add'>+							pdu-&gt;base.seqnum);</div><div class='add'>+	} else {</div><div class='add'>+		dbg_vhci_rx("now giveback urb %p\n", urb);</div><div class='add'>+</div><div class='add'>+		/* If unlink is succeed, status is -ECONNRESET */</div><div class='add'>+		urb-&gt;status = pdu-&gt;u.ret_unlink.status;</div><div class='add'>+		uinfo("%d\n", urb-&gt;status);</div><div class='add'>+</div><div class='add'>+		spin_lock(&amp;the_controller-&gt;lock);</div><div class='add'>+		usb_hcd_unlink_urb_from_ep(vhci_to_hcd(the_controller), urb);</div><div class='add'>+		spin_unlock(&amp;the_controller-&gt;lock);</div><div class='add'>+</div><div class='add'>+		usb_hcd_giveback_urb(vhci_to_hcd(the_controller), urb,</div><div class='add'>+								urb-&gt;status);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kfree(unlink);</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* recv a pdu */</div><div class='add'>+static void vhci_rx_pdu(struct usbip_device *ud)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct usbip_header pdu;</div><div class='add'>+	struct vhci_device *vdev = container_of(ud, struct vhci_device, ud);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	dbg_vhci_rx("Enter\n");</div><div class='add'>+</div><div class='add'>+	memset(&amp;pdu, 0, sizeof(pdu));</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	/* 1. receive a pdu header */</div><div class='add'>+	ret = usbip_xmit(0, ud-&gt;tcp_socket, (char *) &amp;pdu, sizeof(pdu), 0);</div><div class='add'>+	if (ret != sizeof(pdu)) {</div><div class='add'>+		uerr("receiving pdu failed! size is %d, should be %d\n",</div><div class='add'>+				ret, sizeof(pdu));</div><div class='add'>+		usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	usbip_header_correct_endian(&amp;pdu, 0);</div><div class='add'>+</div><div class='add'>+	if (dbg_flag_vhci_rx)</div><div class='add'>+		usbip_dump_header(&amp;pdu);</div><div class='add'>+</div><div class='add'>+	switch (pdu.base.command) {</div><div class='add'>+	case USBIP_RET_SUBMIT:</div><div class='add'>+		vhci_recv_ret_submit(vdev, &amp;pdu);</div><div class='add'>+		break;</div><div class='add'>+	case USBIP_RET_UNLINK:</div><div class='add'>+		vhci_recv_ret_unlink(vdev, &amp;pdu);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		/* NOTREACHED */</div><div class='add'>+		uerr("unknown pdu %u\n", pdu.base.command);</div><div class='add'>+		usbip_dump_header(&amp;pdu);</div><div class='add'>+		usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*-------------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+void vhci_rx_loop(struct usbip_task *ut)</div><div class='add'>+{</div><div class='add'>+	struct usbip_device *ud = container_of(ut, struct usbip_device, tcp_rx);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	while (1) {</div><div class='add'>+		if (signal_pending(current)) {</div><div class='add'>+			dbg_vhci_rx("signal catched!\n");</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+		if (usbip_event_happend(ud))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		vhci_rx_pdu(ud);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='head'>diff --git a/drivers/staging/usbip/vhci_sysfs.c b/drivers/staging/usbip/vhci_sysfs.c<br/>new file mode 100644<br/>index 000000000000..24c2851a8f84<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/usbip/vhci_sysfs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/usbip/vhci_sysfs.c</a></div><div class='hunk'>@@ -0,0 +1,250 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2003-2008 Takahiro Hirofuchi</div><div class='add'>+ *</div><div class='add'>+ * This is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,</div><div class='add'>+ * USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "usbip_common.h"</div><div class='add'>+#include "vhci.h"</div><div class='add'>+</div><div class='add'>+#include &lt;linux/in.h&gt;</div><div class='add'>+</div><div class='add'>+/* TODO: refine locking ?*/</div><div class='add'>+</div><div class='add'>+/* Sysfs entry to show port status */</div><div class='add'>+static ssize_t show_status(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			   char *out)</div><div class='add'>+{</div><div class='add'>+	char *s = out;</div><div class='add'>+	int i = 0;</div><div class='add'>+</div><div class='add'>+	if (!the_controller || !out)</div><div class='add'>+		BUG();</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;the_controller-&gt;lock);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * output example:</div><div class='add'>+	 * prt sta spd dev socket           local_busid</div><div class='add'>+	 * 000 004 000 000         c5a7bb80 1-2.3</div><div class='add'>+	 * 001 004 000 000         d8cee980 2-3.4</div><div class='add'>+	 *</div><div class='add'>+	 * IP address can be retrieved from a socket pointer address by looking</div><div class='add'>+	 * up /proc/net/{tcp,tcp6}. Also, a userland program may remember a</div><div class='add'>+	 * port number and its peer IP address.</div><div class='add'>+	 */</div><div class='add'>+	out += sprintf(out, "prt sta spd bus dev socket           "</div><div class='add'>+		       "local_busid\n");</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; VHCI_NPORTS; i++) {</div><div class='add'>+		struct vhci_device *vdev = port_to_vdev(i);</div><div class='add'>+</div><div class='add'>+		spin_lock(&amp;vdev-&gt;ud.lock);</div><div class='add'>+</div><div class='add'>+		out += sprintf(out, "%03u %03u ", i, vdev-&gt;ud.status);</div><div class='add'>+</div><div class='add'>+		if (vdev-&gt;ud.status == VDEV_ST_USED) {</div><div class='add'>+			out += sprintf(out, "%03u %08x ",</div><div class='add'>+					vdev-&gt;speed, vdev-&gt;devid);</div><div class='add'>+			out += sprintf(out, "%16p ", vdev-&gt;ud.tcp_socket);</div><div class='add'>+			out += sprintf(out, "%s", vdev-&gt;udev-&gt;dev.bus_id);</div><div class='add'>+</div><div class='add'>+		} else</div><div class='add'>+			out += sprintf(out, "000 000 000 0000000000000000 0-0");</div><div class='add'>+</div><div class='add'>+		out += sprintf(out, "\n");</div><div class='add'>+</div><div class='add'>+		spin_unlock(&amp;vdev-&gt;ud.lock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;the_controller-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return out - s;</div><div class='add'>+}</div><div class='add'>+static DEVICE_ATTR(status, S_IRUGO, show_status, NULL);</div><div class='add'>+</div><div class='add'>+/* Sysfs entry to shutdown a virtual connection */</div><div class='add'>+static int vhci_port_disconnect(__u32 rhport)</div><div class='add'>+{</div><div class='add'>+	struct vhci_device *vdev;</div><div class='add'>+</div><div class='add'>+	dbg_vhci_sysfs("enter\n");</div><div class='add'>+</div><div class='add'>+	/* lock */</div><div class='add'>+	spin_lock(&amp;the_controller-&gt;lock);</div><div class='add'>+</div><div class='add'>+	vdev = port_to_vdev(rhport);</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;vdev-&gt;ud.lock);</div><div class='add'>+	if (vdev-&gt;ud.status == VDEV_ST_NULL) {</div><div class='add'>+		uerr("not connected %d\n", vdev-&gt;ud.status);</div><div class='add'>+</div><div class='add'>+		/* unlock */</div><div class='add'>+		spin_unlock(&amp;vdev-&gt;ud.lock);</div><div class='add'>+		spin_unlock(&amp;the_controller-&gt;lock);</div><div class='add'>+</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* unlock */</div><div class='add'>+	spin_unlock(&amp;vdev-&gt;ud.lock);</div><div class='add'>+	spin_unlock(&amp;the_controller-&gt;lock);</div><div class='add'>+</div><div class='add'>+	usbip_event_add(&amp;vdev-&gt;ud, VDEV_EVENT_DOWN);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t store_detach(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			    const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	__u32 rhport = 0;</div><div class='add'>+</div><div class='add'>+	sscanf(buf, "%u", &amp;rhport);</div><div class='add'>+</div><div class='add'>+	/* check rhport */</div><div class='add'>+	if (rhport &gt;= VHCI_NPORTS) {</div><div class='add'>+		uerr("invalid port %u\n", rhport);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = vhci_port_disconnect(rhport);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	dbg_vhci_sysfs("Leave\n");</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+static DEVICE_ATTR(detach, S_IWUSR, NULL, store_detach);</div><div class='add'>+</div><div class='add'>+/* Sysfs entry to establish a virtual connection */</div><div class='add'>+static int valid_args(__u32 rhport, enum usb_device_speed speed)</div><div class='add'>+{</div><div class='add'>+	/* check rhport */</div><div class='add'>+	if ((rhport &lt; 0) || (rhport &gt;= VHCI_NPORTS)) {</div><div class='add'>+		uerr("port %u\n", rhport);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* check speed */</div><div class='add'>+	switch (speed) {</div><div class='add'>+	case USB_SPEED_LOW:</div><div class='add'>+	case USB_SPEED_FULL:</div><div class='add'>+	case USB_SPEED_HIGH:</div><div class='add'>+	case USB_SPEED_VARIABLE:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		uerr("speed %d\n", speed);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * To start a new USB/IP attachment, a userland program needs to setup a TCP</div><div class='add'>+ * connection and then write its socket descriptor with remote device</div><div class='add'>+ * information into this sysfs file.</div><div class='add'>+ *</div><div class='add'>+ * A remote device is virtually attached to the root-hub port of @rhport with</div><div class='add'>+ * @speed. @devid is embedded into a request to specify the remote device in a</div><div class='add'>+ * server host.</div><div class='add'>+ *</div><div class='add'>+ * write() returns 0 on success, else negative errno.</div><div class='add'>+ */</div><div class='add'>+static ssize_t store_attach(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			    const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct vhci_device *vdev;</div><div class='add'>+	struct socket *socket;</div><div class='add'>+	int sockfd = 0;</div><div class='add'>+	__u32 rhport = 0, devid = 0, speed = 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * @rhport: port number of vhci_hcd</div><div class='add'>+	 * @sockfd: socket descriptor of an established TCP connection</div><div class='add'>+	 * @devid: unique device identifier in a remote host</div><div class='add'>+	 * @speed: usb device speed in a remote host</div><div class='add'>+	 */</div><div class='add'>+	sscanf(buf, "%u %u %u %u", &amp;rhport, &amp;sockfd, &amp;devid, &amp;speed);</div><div class='add'>+</div><div class='add'>+	dbg_vhci_sysfs("rhport(%u) sockfd(%u) devid(%u) speed(%u)\n",</div><div class='add'>+			rhport, sockfd, devid, speed);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	/* check received parameters */</div><div class='add'>+	if (valid_args(rhport, speed) &lt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* check sockfd */</div><div class='add'>+	socket = sockfd_to_socket(sockfd);</div><div class='add'>+	if (!socket)</div><div class='add'>+		return  -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* now need lock until setting vdev status as used */</div><div class='add'>+</div><div class='add'>+	/* begin a lock */</div><div class='add'>+	spin_lock(&amp;the_controller-&gt;lock);</div><div class='add'>+</div><div class='add'>+	vdev = port_to_vdev(rhport);</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;vdev-&gt;ud.lock);</div><div class='add'>+</div><div class='add'>+	if (vdev-&gt;ud.status != VDEV_ST_NULL) {</div><div class='add'>+		/* end of the lock */</div><div class='add'>+		spin_unlock(&amp;vdev-&gt;ud.lock);</div><div class='add'>+		spin_unlock(&amp;the_controller-&gt;lock);</div><div class='add'>+</div><div class='add'>+		uerr("port %d already used\n", rhport);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	uinfo("rhport(%u) sockfd(%d) devid(%u) speed(%u)\n",</div><div class='add'>+			rhport, sockfd, devid, speed);</div><div class='add'>+</div><div class='add'>+	vdev-&gt;devid         = devid;</div><div class='add'>+	vdev-&gt;speed         = speed;</div><div class='add'>+	vdev-&gt;ud.tcp_socket = socket;</div><div class='add'>+	vdev-&gt;ud.status     = VDEV_ST_NOTASSIGNED;</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;vdev-&gt;ud.lock);</div><div class='add'>+	spin_unlock(&amp;the_controller-&gt;lock);</div><div class='add'>+	/* end the lock */</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * this function will sleep, so should be out of the lock. but, it's ok</div><div class='add'>+	 * because we already marked vdev as being used. really?</div><div class='add'>+	 */</div><div class='add'>+	usbip_start_threads(&amp;vdev-&gt;ud);</div><div class='add'>+</div><div class='add'>+	rh_port_connect(rhport, speed);</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+static DEVICE_ATTR(attach, S_IWUSR, NULL, store_attach);</div><div class='add'>+</div><div class='add'>+static struct attribute *dev_attrs[] = {</div><div class='add'>+	&amp;dev_attr_status.attr,</div><div class='add'>+	&amp;dev_attr_detach.attr,</div><div class='add'>+	&amp;dev_attr_attach.attr,</div><div class='add'>+	&amp;dev_attr_usbip_debug.attr,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct attribute_group dev_attr_group = {</div><div class='add'>+	.attrs = dev_attrs,</div><div class='add'>+};</div><div class='head'>diff --git a/drivers/staging/usbip/vhci_tx.c b/drivers/staging/usbip/vhci_tx.c<br/>new file mode 100644<br/>index 000000000000..1f552a95f486<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/usbip/vhci_tx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/usbip/vhci_tx.c</a></div><div class='hunk'>@@ -0,0 +1,239 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2003-2008 Takahiro Hirofuchi</div><div class='add'>+ *</div><div class='add'>+ * This is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,</div><div class='add'>+ * USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "usbip_common.h"</div><div class='add'>+#include "vhci.h"</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void setup_cmd_submit_pdu(struct usbip_header *pdup,  struct urb *urb)</div><div class='add'>+{</div><div class='add'>+	struct vhci_priv *priv = ((struct vhci_priv *)urb-&gt;hcpriv);</div><div class='add'>+	struct vhci_device *vdev = priv-&gt;vdev;</div><div class='add'>+</div><div class='add'>+	dbg_vhci_tx("URB, local devnum %u, remote devid %u\n",</div><div class='add'>+				usb_pipedevice(urb-&gt;pipe), vdev-&gt;devid);</div><div class='add'>+</div><div class='add'>+	pdup-&gt;base.command = USBIP_CMD_SUBMIT;</div><div class='add'>+	pdup-&gt;base.seqnum  = priv-&gt;seqnum;</div><div class='add'>+	pdup-&gt;base.devid   = vdev-&gt;devid;</div><div class='add'>+	if (usb_pipein(urb-&gt;pipe))</div><div class='add'>+		pdup-&gt;base.direction = USBIP_DIR_IN;</div><div class='add'>+	else</div><div class='add'>+		pdup-&gt;base.direction = USBIP_DIR_OUT;</div><div class='add'>+	pdup-&gt;base.ep      = usb_pipeendpoint(urb-&gt;pipe);</div><div class='add'>+</div><div class='add'>+	usbip_pack_pdu(pdup, urb, USBIP_CMD_SUBMIT, 1);</div><div class='add'>+</div><div class='add'>+	if (urb-&gt;setup_packet)</div><div class='add'>+		memcpy(pdup-&gt;u.cmd_submit.setup, urb-&gt;setup_packet, 8);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct vhci_priv *dequeue_from_priv_tx(struct vhci_device *vdev)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	struct vhci_priv *priv, *tmp;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;vdev-&gt;priv_lock, flags);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(priv, tmp, &amp;vdev-&gt;priv_tx, list) {</div><div class='add'>+		list_move_tail(&amp;priv-&gt;list, &amp;vdev-&gt;priv_rx);</div><div class='add'>+		spin_unlock_irqrestore(&amp;vdev-&gt;priv_lock, flags);</div><div class='add'>+		return priv;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;vdev-&gt;priv_lock, flags);</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int vhci_send_cmd_submit(struct vhci_device *vdev)</div><div class='add'>+{</div><div class='add'>+	struct vhci_priv *priv = NULL;</div><div class='add'>+</div><div class='add'>+	struct msghdr msg;</div><div class='add'>+	struct kvec iov[3];</div><div class='add'>+	size_t txsize;</div><div class='add'>+</div><div class='add'>+	size_t total_size = 0;</div><div class='add'>+</div><div class='add'>+	while ((priv = dequeue_from_priv_tx(vdev)) != NULL) {</div><div class='add'>+		int ret;</div><div class='add'>+		struct urb *urb = priv-&gt;urb;</div><div class='add'>+		struct usbip_header pdu_header;</div><div class='add'>+		void *iso_buffer = NULL;</div><div class='add'>+</div><div class='add'>+		txsize = 0;</div><div class='add'>+		memset(&amp;pdu_header, 0, sizeof(pdu_header));</div><div class='add'>+		memset(&amp;msg, 0, sizeof(msg));</div><div class='add'>+		memset(&amp;iov, 0, sizeof(iov));</div><div class='add'>+</div><div class='add'>+		dbg_vhci_tx("setup txdata urb %p\n", urb);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+		/* 1. setup usbip_header */</div><div class='add'>+		setup_cmd_submit_pdu(&amp;pdu_header, urb);</div><div class='add'>+		usbip_header_correct_endian(&amp;pdu_header, 1);</div><div class='add'>+</div><div class='add'>+		iov[0].iov_base = &amp;pdu_header;</div><div class='add'>+		iov[0].iov_len  = sizeof(pdu_header);</div><div class='add'>+		txsize += sizeof(pdu_header);</div><div class='add'>+</div><div class='add'>+		/* 2. setup transfer buffer */</div><div class='add'>+		if (!usb_pipein(urb-&gt;pipe) &amp;&amp; urb-&gt;transfer_buffer_length &gt; 0) {</div><div class='add'>+			iov[1].iov_base = urb-&gt;transfer_buffer;</div><div class='add'>+			iov[1].iov_len  = urb-&gt;transfer_buffer_length;</div><div class='add'>+			txsize += urb-&gt;transfer_buffer_length;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* 3. setup iso_packet_descriptor */</div><div class='add'>+		if (usb_pipetype(urb-&gt;pipe) == PIPE_ISOCHRONOUS) {</div><div class='add'>+			ssize_t len = 0;</div><div class='add'>+</div><div class='add'>+			iso_buffer = usbip_alloc_iso_desc_pdu(urb, &amp;len);</div><div class='add'>+			if (!iso_buffer) {</div><div class='add'>+				usbip_event_add(&amp;vdev-&gt;ud,</div><div class='add'>+						SDEV_EVENT_ERROR_MALLOC);</div><div class='add'>+				return -1;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			iov[2].iov_base = iso_buffer;</div><div class='add'>+			iov[2].iov_len  = len;</div><div class='add'>+			txsize += len;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = kernel_sendmsg(vdev-&gt;ud.tcp_socket, &amp;msg, iov, 3, txsize);</div><div class='add'>+		if (ret != txsize) {</div><div class='add'>+			uerr("sendmsg failed!, retval %d for %zd\n", ret,</div><div class='add'>+								txsize);</div><div class='add'>+			kfree(iso_buffer);</div><div class='add'>+			usbip_event_add(&amp;vdev-&gt;ud, VDEV_EVENT_ERROR_TCP);</div><div class='add'>+			return -1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		kfree(iso_buffer);</div><div class='add'>+		dbg_vhci_tx("send txdata\n");</div><div class='add'>+</div><div class='add'>+		total_size += txsize;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return total_size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*-------------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+static struct vhci_unlink *dequeue_from_unlink_tx(struct vhci_device *vdev)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	struct vhci_unlink *unlink, *tmp;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;vdev-&gt;priv_lock, flags);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(unlink, tmp, &amp;vdev-&gt;unlink_tx, list) {</div><div class='add'>+		list_move_tail(&amp;unlink-&gt;list, &amp;vdev-&gt;unlink_rx);</div><div class='add'>+		spin_unlock_irqrestore(&amp;vdev-&gt;priv_lock, flags);</div><div class='add'>+		return unlink;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;vdev-&gt;priv_lock, flags);</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vhci_send_cmd_unlink(struct vhci_device *vdev)</div><div class='add'>+{</div><div class='add'>+	struct vhci_unlink *unlink = NULL;</div><div class='add'>+</div><div class='add'>+	struct msghdr msg;</div><div class='add'>+	struct kvec iov[3];</div><div class='add'>+	size_t txsize;</div><div class='add'>+</div><div class='add'>+	size_t total_size = 0;</div><div class='add'>+</div><div class='add'>+	while ((unlink = dequeue_from_unlink_tx(vdev)) != NULL) {</div><div class='add'>+		int ret;</div><div class='add'>+		struct usbip_header pdu_header;</div><div class='add'>+</div><div class='add'>+		txsize = 0;</div><div class='add'>+		memset(&amp;pdu_header, 0, sizeof(pdu_header));</div><div class='add'>+		memset(&amp;msg, 0, sizeof(msg));</div><div class='add'>+		memset(&amp;iov, 0, sizeof(iov));</div><div class='add'>+</div><div class='add'>+		dbg_vhci_tx("setup cmd unlink, %lu \n", unlink-&gt;seqnum);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+		/* 1. setup usbip_header */</div><div class='add'>+		pdu_header.base.command = USBIP_CMD_UNLINK;</div><div class='add'>+		pdu_header.base.seqnum  = unlink-&gt;seqnum;</div><div class='add'>+		pdu_header.base.devid	= vdev-&gt;devid;</div><div class='add'>+		pdu_header.base.ep	= 0;</div><div class='add'>+		pdu_header.u.cmd_unlink.seqnum = unlink-&gt;unlink_seqnum;</div><div class='add'>+</div><div class='add'>+		usbip_header_correct_endian(&amp;pdu_header, 1);</div><div class='add'>+</div><div class='add'>+		iov[0].iov_base = &amp;pdu_header;</div><div class='add'>+		iov[0].iov_len  = sizeof(pdu_header);</div><div class='add'>+		txsize += sizeof(pdu_header);</div><div class='add'>+</div><div class='add'>+		ret = kernel_sendmsg(vdev-&gt;ud.tcp_socket, &amp;msg, iov, 1, txsize);</div><div class='add'>+		if (ret != txsize) {</div><div class='add'>+			uerr("sendmsg failed!, retval %d for %zd\n", ret,</div><div class='add'>+								txsize);</div><div class='add'>+			usbip_event_add(&amp;vdev-&gt;ud, VDEV_EVENT_ERROR_TCP);</div><div class='add'>+			return -1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+		dbg_vhci_tx("send txdata\n");</div><div class='add'>+</div><div class='add'>+		total_size += txsize;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return total_size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*-------------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+void vhci_tx_loop(struct usbip_task *ut)</div><div class='add'>+{</div><div class='add'>+	struct usbip_device *ud = container_of(ut, struct usbip_device, tcp_tx);</div><div class='add'>+	struct vhci_device *vdev = container_of(ud, struct vhci_device, ud);</div><div class='add'>+</div><div class='add'>+	while (1) {</div><div class='add'>+		if (signal_pending(current)) {</div><div class='add'>+			uinfo("vhci_tx signal catched\n");</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (vhci_send_cmd_submit(vdev) &lt; 0)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (vhci_send_cmd_unlink(vdev) &lt; 0)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		wait_event_interruptible(vdev-&gt;waitq_tx,</div><div class='add'>+				(!list_empty(&amp;vdev-&gt;priv_tx) ||</div><div class='add'>+				 !list_empty(&amp;vdev-&gt;unlink_tx)));</div><div class='add'>+</div><div class='add'>+		dbg_vhci_tx("pending urbs ?, now wake up\n");</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/staging/winbond/Kconfig b/drivers/staging/winbond/Kconfig<br/>new file mode 100644<br/>index 000000000000..10d72bec88a9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/winbond/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,7 @@</div><div class='add'>+config W35UND</div><div class='add'>+	tristate "Winbond driver"</div><div class='add'>+	depends on MAC80211 &amp;&amp; WLAN_80211 &amp;&amp; EXPERIMENTAL &amp;&amp; !4KSTACKS</div><div class='add'>+	default n</div><div class='add'>+	---help---</div><div class='add'>+	  This is highly experimental driver for winbond wifi card on some Kohjinsha notebooks</div><div class='add'>+	  Check http://code.google.com/p/winbondport/ for new version</div><div class='head'>diff --git a/drivers/staging/winbond/Makefile b/drivers/staging/winbond/Makefile<br/>new file mode 100644<br/>index 000000000000..29c98bf1bc98<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/winbond/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/Makefile</a></div><div class='hunk'>@@ -0,0 +1,18 @@</div><div class='add'>+	DRIVER_DIR=./linux</div><div class='add'>+</div><div class='add'>+w35und-objs := $(DRIVER_DIR)/wbusb.o $(DRIVER_DIR)/wb35reg.o $(DRIVER_DIR)/wb35rx.o $(DRIVER_DIR)/wb35tx.o \</div><div class='add'>+	mds.o \</div><div class='add'>+	mlmetxrx.o \</div><div class='add'>+	mto.o	\</div><div class='add'>+	phy_calibration.o	\</div><div class='add'>+	reg.o			\</div><div class='add'>+	rxisr.o			\</div><div class='add'>+	sme_api.o		\</div><div class='add'>+	wbhal.o			\</div><div class='add'>+	wblinux.o		\</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_W35UND) += w35und.o</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='head'>diff --git a/drivers/staging/winbond/README b/drivers/staging/winbond/README<br/>new file mode 100644<br/>index 000000000000..707b6b354dc5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/winbond/README?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/README</a></div><div class='hunk'>@@ -0,0 +1,10 @@</div><div class='add'>+TODO:</div><div class='add'>+	- sparse cleanups</div><div class='add'>+	- checkpatch cleanups</div><div class='add'>+	- kerneldoc cleanups</div><div class='add'>+	- remove typedefs</div><div class='add'>+	- remove unused ioctls</div><div class='add'>+	- use cfg80211 for regulatory stuff</div><div class='add'>+</div><div class='add'>+Please send patches to Greg Kroah-Hartman &lt;greg@kroah.com&gt; and</div><div class='add'>+Pavel Machek &lt;pavel@suse.cz&gt;</div><div class='head'>diff --git a/drivers/staging/winbond/adapter.h b/drivers/staging/winbond/adapter.h<br/>new file mode 100644<br/>index 000000000000..609701d21cf0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/winbond/adapter.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/adapter.h</a></div><div class='hunk'>@@ -0,0 +1,23 @@</div><div class='add'>+//</div><div class='add'>+// ADAPTER.H -</div><div class='add'>+// Windows NDIS global variable 'Adapter' typedef</div><div class='add'>+//</div><div class='add'>+#define MAX_ANSI_STRING		40</div><div class='add'>+typedef struct WB32_ADAPTER</div><div class='add'>+{</div><div class='add'>+	u32 AdapterIndex; // 20060703.4 Add for using pAdapterContext global Adapter point</div><div class='add'>+</div><div class='add'>+	WB_LOCALDESCRIPT	sLocalPara;		// Myself connected parameters</div><div class='add'>+	PWB_BSSDESCRIPTION	asBSSDescriptElement;</div><div class='add'>+</div><div class='add'>+	MLME_FRAME		sMlmeFrame;		// connect to peerSTA parameters</div><div class='add'>+</div><div class='add'>+	MTO_PARAMETERS		sMtoPara; // MTO_struct ...</div><div class='add'>+	hw_data_t			sHwData; //For HAL</div><div class='add'>+	MDS					Mds;</div><div class='add'>+</div><div class='add'>+	WBLINUX		WbLinux;</div><div class='add'>+        struct iw_statistics iw_stats;</div><div class='add'>+</div><div class='add'>+	u8	LinkName[MAX_ANSI_STRING];</div><div class='add'>+} WB32_ADAPTER, ADAPTER, *PWB32_ADAPTER, *PADAPTER;</div><div class='head'>diff --git a/drivers/staging/winbond/bss_f.h b/drivers/staging/winbond/bss_f.h<br/>new file mode 100644<br/>index 000000000000..c957bc94f08d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/winbond/bss_f.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/bss_f.h</a></div><div class='hunk'>@@ -0,0 +1,59 @@</div><div class='add'>+//</div><div class='add'>+// BSS descriptor DataBase management global function</div><div class='add'>+//</div><div class='add'>+</div><div class='add'>+void vBSSdescriptionInit(PWB32_ADAPTER Adapter);</div><div class='add'>+void vBSSfoundList(PWB32_ADAPTER Adapter);</div><div class='add'>+u8 boChanFilter(PWB32_ADAPTER Adapter, u8 ChanNo);</div><div class='add'>+u16 wBSSallocateEntry(PWB32_ADAPTER Adapter);</div><div class='add'>+u16 wBSSGetEntry(PWB32_ADAPTER Adapter);</div><div class='add'>+void vSimpleHouseKeeping(PWB32_ADAPTER Adapter);</div><div class='add'>+u16 wBSShouseKeeping(PWB32_ADAPTER Adapter);</div><div class='add'>+void ClearBSSdescpt(PWB32_ADAPTER Adapter, u16 i);</div><div class='add'>+u16 wBSSfindBssID(PWB32_ADAPTER Adapter, u8 *pbBssid);</div><div class='add'>+u16 wBSSfindDedicateCandidate(PWB32_ADAPTER Adapter, struct SSID_Element *psSsid, u8 *pbBssid);</div><div class='add'>+u16 wBSSfindMACaddr(PWB32_ADAPTER Adapter, u8 *pbMacAddr);</div><div class='add'>+u16 wBSSsearchMACaddr(PWB32_ADAPTER Adapter, u8 *pbMacAddr, u8 band);</div><div class='add'>+u16 wBSSaddScanData(PWB32_ADAPTER, u16, psRXDATA);</div><div class='add'>+u16 wBSSUpdateScanData(PWB32_ADAPTER Adapter, u16 wBssIdx, psRXDATA psRcvData);</div><div class='add'>+u16 wBSScreateIBSSdata(PWB32_ADAPTER Adapter, PWB_BSSDESCRIPTION psDesData);</div><div class='add'>+void DesiredRate2BSSdescriptor(PWB32_ADAPTER Adapter, PWB_BSSDESCRIPTION psDesData,</div><div class='add'>+							 u8 *pBasicRateSet, u8 BasicRateCount,</div><div class='add'>+							 u8 *pOperationRateSet, u8 OperationRateCount);</div><div class='add'>+void DesiredRate2InfoElement(PWB32_ADAPTER Adapter, u8	*addr, u16 *iFildOffset,</div><div class='add'>+							 u8 *pBasicRateSet, u8 BasicRateCount,</div><div class='add'>+							 u8 *pOperationRateSet, u8 OperationRateCount);</div><div class='add'>+void BSSAddIBSSdata(PWB32_ADAPTER Adapter, PWB_BSSDESCRIPTION psDesData);</div><div class='add'>+unsigned char boCmpMacAddr( PUCHAR, PUCHAR );</div><div class='add'>+unsigned char boCmpSSID(struct SSID_Element *psSSID1, struct SSID_Element *psSSID2);</div><div class='add'>+u16 wBSSfindSSID(PWB32_ADAPTER Adapter, struct SSID_Element *psSsid);</div><div class='add'>+u16 wRoamingQuery(PWB32_ADAPTER Adapter);</div><div class='add'>+void vRateToBitmap(PWB32_ADAPTER Adapter, u16 index);</div><div class='add'>+u8 bRateToBitmapIndex(PWB32_ADAPTER Adapter, u8 bRate);</div><div class='add'>+u8 bBitmapToRate(u8 i);</div><div class='add'>+unsigned char boIsERPsta(PWB32_ADAPTER Adapter, u16 i);</div><div class='add'>+unsigned char boCheckConnect(PWB32_ADAPTER Adapter);</div><div class='add'>+unsigned char boCheckSignal(PWB32_ADAPTER Adapter);</div><div class='add'>+void AddIBSSIe(PWB32_ADAPTER Adapter,PWB_BSSDESCRIPTION psDesData );//added by ws for WPA_None06/01/04</div><div class='add'>+void BssScanUpToDate(PWB32_ADAPTER Adapter);</div><div class='add'>+void BssUpToDate(PWB32_ADAPTER Adapter);</div><div class='add'>+void RateSort(u8 *RateArray, u8 num, u8 mode);</div><div class='add'>+void RateReSortForSRate(PWB32_ADAPTER Adapter, u8 *RateArray, u8 num);</div><div class='add'>+void Assemble_IE(PWB32_ADAPTER Adapter, u16 wBssIdx);</div><div class='add'>+void SetMaxTxRate(PWB32_ADAPTER Adapter);</div><div class='add'>+</div><div class='add'>+void CreateWpaIE(PWB32_ADAPTER Adapter, u16* iFildOffset, PUCHAR msg, struct  Management_Frame* msgHeader,</div><div class='add'>+				 struct Association_Request_Frame_Body* msgBody, u16 iMSindex); //added by WS 05/14/05</div><div class='add'>+</div><div class='add'>+#ifdef _WPA2_</div><div class='add'>+void CreateRsnIE(PWB32_ADAPTER Adapter, u16* iFildOffset, PUCHAR msg, struct  Management_Frame* msgHeader,</div><div class='add'>+				 struct Association_Request_Frame_Body* msgBody, u16 iMSindex);//added by WS 05/14/05</div><div class='add'>+</div><div class='add'>+u16 SearchPmkid(PWB32_ADAPTER Adapter, struct  Management_Frame* msgHeader,</div><div class='add'>+				   struct PMKID_Information_Element * AssoReq_PMKID );</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='head'>diff --git a/drivers/staging/winbond/bssdscpt.h b/drivers/staging/winbond/bssdscpt.h<br/>new file mode 100644<br/>index 000000000000..97150a2655fb<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/winbond/bssdscpt.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/bssdscpt.h</a></div><div class='hunk'>@@ -0,0 +1,156 @@</div><div class='add'>+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++</div><div class='add'>+//	bssdscpt.c</div><div class='add'>+//		BSS descriptor data base</div><div class='add'>+//	history :</div><div class='add'>+//</div><div class='add'>+//	Description:</div><div class='add'>+//		BSS descriptor data base will store the information of the stations at the</div><div class='add'>+//		surrounding environment. The first entry( psBSS(0) ) will not be used and the</div><div class='add'>+//		second one( psBSS(1) ) will be used for the broadcast address.</div><div class='add'>+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++</div><div class='add'>+</div><div class='add'>+//#define MAX_ACC_RSSI_COUNT		10</div><div class='add'>+#define MAX_ACC_RSSI_COUNT		6</div><div class='add'>+</div><div class='add'>+///////////////////////////////////////////////////////////////////////////</div><div class='add'>+//</div><div class='add'>+// BSS Description set Element , to store scan received Beacon information</div><div class='add'>+//</div><div class='add'>+// Our's differs slightly from the specs. The specify a PHY_Parameter_Set.</div><div class='add'>+// Since we're only doing a DS design right now, we just have a DS structure.</div><div class='add'>+//////////////////////////////////////////////////////////////////////////////</div><div class='add'>+typedef struct BSSDescriptionElement</div><div class='add'>+{</div><div class='add'>+	u32		SlotValid;</div><div class='add'>+	u32		PowerSaveMode;</div><div class='add'>+	RXLAYER1	RxLayer1;</div><div class='add'>+</div><div class='add'>+    u8		abPeerAddress[ MAC_ADDR_LENGTH + 2 ]; // peer MAC Address associated with this session. 6-OCTET value</div><div class='add'>+    u32		dwBgScanStamp;		// BgScan Sequence Counter stamp, record psROAM-&gt;dwScanCounter.</div><div class='add'>+</div><div class='add'>+	u16		Beacon_Period;</div><div class='add'>+	u16		wATIM_Window;</div><div class='add'>+</div><div class='add'>+    u8		abBssID[ MAC_ADDR_LENGTH + 2 ];				// 6B</div><div class='add'>+</div><div class='add'>+    u8		bBssType;</div><div class='add'>+    u8		DTIM_Period;        // 1 octet usually from TIM element, if present</div><div class='add'>+	u8		boInTimerHandler;</div><div class='add'>+	u8		boERP;			// analysis ERP or (extended) supported rate element</div><div class='add'>+</div><div class='add'>+	u8		Timestamp[8];</div><div class='add'>+	u8		BasicRate[32];</div><div class='add'>+	u8		OperationalRate[32];</div><div class='add'>+	u32		dwBasicRateBitmap;			//bit map, retrieve from SupportedRateSet</div><div class='add'>+	u32		dwOperationalRateBitmap;	//bit map, retrieve from SupportedRateSet and</div><div class='add'>+										// ExtendedSupportedRateSet</div><div class='add'>+	// For RSSI calculating</div><div class='add'>+	u32		HalRssi[MAX_ACC_RSSI_COUNT]; // Encode. It must use MACRO of HAL to get the LNA and AGC data</div><div class='add'>+	u32		HalRssiIndex;</div><div class='add'>+</div><div class='add'>+	////From beacon/probe response</div><div class='add'>+    struct SSID_Element SSID;				// 34B</div><div class='add'>+	u8	reserved_1[ 2 ];</div><div class='add'>+</div><div class='add'>+    struct Capability_Information_Element   CapabilityInformation;  // 2B</div><div class='add'>+	u8	reserved_2[ 2 ];</div><div class='add'>+</div><div class='add'>+    struct CF_Parameter_Set_Element    CF_Parameter_Set;		// 8B</div><div class='add'>+    struct IBSS_Parameter_Set_Element  IBSS_Parameter_Set;		// 4B</div><div class='add'>+    struct TIM_Element                 TIM_Element_Set; 			// 256B</div><div class='add'>+</div><div class='add'>+    struct DS_Parameter_Set_Element    DS_Parameter_Set;		// 3B</div><div class='add'>+	u8	reserved_3;</div><div class='add'>+</div><div class='add'>+	struct ERP_Information_Element		ERP_Information_Set;	// 3B</div><div class='add'>+	u8	reserved_4;</div><div class='add'>+</div><div class='add'>+    struct Supported_Rates_Element     SupportedRateSet;			// 10B</div><div class='add'>+	u8	reserved_5[2];</div><div class='add'>+</div><div class='add'>+	struct Extended_Supported_Rates_Element	ExtendedSupportedRateSet;	// 257B</div><div class='add'>+	u8	reserved_6[3];</div><div class='add'>+</div><div class='add'>+	u8	band;</div><div class='add'>+	u8	reserved_7[3];</div><div class='add'>+</div><div class='add'>+	// for MLME module</div><div class='add'>+    u16		wState;			// the current state of the system</div><div class='add'>+	u16		wIndex;			// THIS BSS element entry index</div><div class='add'>+</div><div class='add'>+	void*	psAdapter;		// pointer to THIS Adapter</div><div class='add'>+	OS_TIMER	nTimer;  // MLME timer</div><div class='add'>+</div><div class='add'>+    // Authentication</div><div class='add'>+    u16		wAuthAlgo;      // peer MAC MLME use Auth algorithm, default OPEN_AUTH</div><div class='add'>+    u16		wAuthSeqNum;    // current local MAC sendout AuthReq sequence number</div><div class='add'>+</div><div class='add'>+	u8		auth_challengeText[128];</div><div class='add'>+</div><div class='add'>+	////For XP:</div><div class='add'>+    u32		ies_len;		// information element length</div><div class='add'>+    u8		ies[256];		// information element</div><div class='add'>+</div><div class='add'>+	////For WPA</div><div class='add'>+	u8	RsnIe_Type[2];		//added by ws for distinguish WPA and WPA2 05/14/04</div><div class='add'>+	u8	RsnIe_len;</div><div class='add'>+    u8	Rsn_Num;</div><div class='add'>+</div><div class='add'>+    // to record the rsn cipher suites,addded by ws 09/05/04</div><div class='add'>+	SUITE_SELECTOR			group_cipher; // 4B</div><div class='add'>+	SUITE_SELECTOR			pairwise_key_cipher_suites[WLAN_MAX_PAIRWISE_CIPHER_SUITE_COUNT];</div><div class='add'>+	SUITE_SELECTOR			auth_key_mgt_suites[WLAN_MAX_AUTH_KEY_MGT_SUITE_LIST_COUNT];</div><div class='add'>+</div><div class='add'>+	u16					pairwise_key_cipher_suite_count;</div><div class='add'>+	u16					auth_key_mgt_suite_count;</div><div class='add'>+</div><div class='add'>+	u8					pairwise_key_cipher_suite_selected;</div><div class='add'>+	u8					auth_key_mgt_suite_selected;</div><div class='add'>+	u8					reserved_8[2];</div><div class='add'>+</div><div class='add'>+	struct RSN_Capability_Element  rsn_capabilities; // 2B</div><div class='add'>+	u8					reserved_9[2];</div><div class='add'>+</div><div class='add'>+    //to record the rsn cipher suites for WPA2</div><div class='add'>+    #ifdef _WPA2_</div><div class='add'>+	u32					pre_auth;		//added by WS for distinguish for 05/04/04</div><div class='add'>+    SUITE_SELECTOR			wpa2_group_cipher; // 4B</div><div class='add'>+	SUITE_SELECTOR			wpa2_pairwise_key_cipher_suites[WLAN_MAX_PAIRWISE_CIPHER_SUITE_COUNT];</div><div class='add'>+	SUITE_SELECTOR			wpa2_auth_key_mgt_suites[WLAN_MAX_AUTH_KEY_MGT_SUITE_LIST_COUNT];</div><div class='add'>+</div><div class='add'>+	u16					wpa2_pairwise_key_cipher_suite_count;</div><div class='add'>+	u16					wpa2_auth_key_mgt_suite_count;</div><div class='add'>+</div><div class='add'>+	u8					wpa2_pairwise_key_cipher_suite_selected;</div><div class='add'>+	u8					wpa2_auth_key_mgt_suite_selected;</div><div class='add'>+	u8					reserved_10[2];</div><div class='add'>+</div><div class='add'>+	struct RSN_Capability_Element  wpa2_rsn_capabilities; // 2B</div><div class='add'>+	u8					reserved_11[2];</div><div class='add'>+    #endif //endif _WPA2_</div><div class='add'>+</div><div class='add'>+	//For Replay protection</div><div class='add'>+//	u8		PairwiseTSC[6];</div><div class='add'>+//	u8		GroupTSC[6];</div><div class='add'>+</div><div class='add'>+	////For up-to-date</div><div class='add'>+	u32		ScanTimeStamp;	//for the decision whether the station/AP(may exist at</div><div class='add'>+							//different channels) has left. It must be detected by</div><div class='add'>+							//scanning. Local device may connected or disconnected.</div><div class='add'>+	u32		BssTimeStamp;	//Only for the decision whether the station/AP(exist in</div><div class='add'>+							//the same channel, and no scanning) if local device has</div><div class='add'>+							//connected successfully.</div><div class='add'>+</div><div class='add'>+	// 20061108 Add for storing WPS_IE. [E id][Length][OUI][Data]</div><div class='add'>+	u8		WPS_IE_Data[MAX_IE_APPEND_SIZE];</div><div class='add'>+	u16		WPS_IE_length;</div><div class='add'>+	u16		WPS_IE_length_tmp; // For verify there is an WPS_IE in Beacon or probe response</div><div class='add'>+</div><div class='add'>+} WB_BSSDESCRIPTION, *PWB_BSSDESCRIPTION;</div><div class='add'>+</div><div class='add'>+#define wBSSConnectedSTA(Adapter)             \</div><div class='add'>+    ((u16)(Adapter)-&gt;sLocalPara.wConnectedSTAindex)</div><div class='add'>+</div><div class='add'>+#define psBSS(i)			(&amp;(Adapter-&gt;asBSSDescriptElement[(i)]))</div><div class='add'>+</div><div class='add'>+</div><div class='head'>diff --git a/drivers/staging/winbond/ds_tkip.h b/drivers/staging/winbond/ds_tkip.h<br/>new file mode 100644<br/>index 000000000000..29e5055b45a1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/winbond/ds_tkip.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/ds_tkip.h</a></div><div class='hunk'>@@ -0,0 +1,33 @@</div><div class='add'>+// Rotation functions on 32 bit values</div><div class='add'>+#define ROL32( A, n ) \</div><div class='add'>+    ( ((A) &lt;&lt; (n)) | ( ((A)&gt;&gt;(32-(n)))  &amp; ( (1UL &lt;&lt; (n)) - 1 ) ) )</div><div class='add'>+</div><div class='add'>+#define ROR32( A, n )   ROL32( (A), 32-(n) )</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+typedef struct tkip</div><div class='add'>+{</div><div class='add'>+    u32	K0, K1;		// Key</div><div class='add'>+	union</div><div class='add'>+	{</div><div class='add'>+		struct // Current state</div><div class='add'>+		{</div><div class='add'>+			u32	L;</div><div class='add'>+			u32	R;</div><div class='add'>+		};</div><div class='add'>+		u8	LR[8];</div><div class='add'>+	};</div><div class='add'>+	union</div><div class='add'>+	{</div><div class='add'>+		u32	M;		// Message accumulator (single word)</div><div class='add'>+		u8	Mb[4];</div><div class='add'>+	};</div><div class='add'>+	s32		bytes_in_M;	// # bytes in M</div><div class='add'>+} tkip_t;</div><div class='add'>+</div><div class='add'>+//void _append_data( PUCHAR pData, u16 size, tkip_t *p );</div><div class='add'>+void Mds_MicGet(  void* Adapter,  void* pRxLayer1,  PUCHAR pKey,  PUCHAR pMic );</div><div class='add'>+void Mds_MicFill(  void* Adapter,  void* pDes,  PUCHAR XmitBufAddress );</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='head'>diff --git a/drivers/staging/winbond/gl_80211.h b/drivers/staging/winbond/gl_80211.h<br/>new file mode 100644<br/>index 000000000000..1806d817496e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/winbond/gl_80211.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/gl_80211.h</a></div><div class='hunk'>@@ -0,0 +1,125 @@</div><div class='add'>+</div><div class='add'>+#ifndef __GL_80211_H__</div><div class='add'>+#define __GL_80211_H__</div><div class='add'>+</div><div class='add'>+/****************** CONSTANT AND MACRO SECTION ******************************/</div><div class='add'>+</div><div class='add'>+/* BSS Type */</div><div class='add'>+enum {</div><div class='add'>+    WLAN_BSSTYPE_INFRASTRUCTURE         = 0,</div><div class='add'>+    WLAN_BSSTYPE_INDEPENDENT,</div><div class='add'>+    WLAN_BSSTYPE_ANY_BSS,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Preamble_Type, see &lt;SFS-802.11G-MIB-203&gt; */</div><div class='add'>+typedef enum preamble_type {</div><div class='add'>+    WLAN_PREAMBLE_TYPE_SHORT,</div><div class='add'>+    WLAN_PREAMBLE_TYPE_LONG,</div><div class='add'>+}    preamble_type_e;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Slot_Time_Type, see &lt;SFS-802.11G-MIB-208&gt; */</div><div class='add'>+typedef enum slot_time_type {</div><div class='add'>+    WLAN_SLOT_TIME_TYPE_LONG,</div><div class='add'>+    WLAN_SLOT_TIME_TYPE_SHORT,</div><div class='add'>+}    slot_time_type_e;</div><div class='add'>+</div><div class='add'>+/*--------------------------------------------------------------------------*/</div><div class='add'>+/* Encryption Mode */</div><div class='add'>+typedef enum {</div><div class='add'>+    WEP_DISABLE                                         = 0,</div><div class='add'>+    WEP_64,</div><div class='add'>+    WEP_128,</div><div class='add'>+</div><div class='add'>+    ENCRYPT_DISABLE,</div><div class='add'>+    ENCRYPT_WEP,</div><div class='add'>+    ENCRYPT_WEP_NOKEY,</div><div class='add'>+    ENCRYPT_TKIP,</div><div class='add'>+    ENCRYPT_TKIP_NOKEY,</div><div class='add'>+    ENCRYPT_CCMP,</div><div class='add'>+    ENCRYPT_CCMP_NOKEY,</div><div class='add'>+}    encryption_mode_e;</div><div class='add'>+</div><div class='add'>+typedef enum _WLAN_RADIO {</div><div class='add'>+    WLAN_RADIO_ON,</div><div class='add'>+    WLAN_RADIO_OFF,</div><div class='add'>+    WLAN_RADIO_MAX, // not a real type, defined as an upper bound</div><div class='add'>+} WLAN_RADIO;</div><div class='add'>+</div><div class='add'>+typedef struct _WLAN_RADIO_STATUS {</div><div class='add'>+	WLAN_RADIO HWStatus;</div><div class='add'>+	WLAN_RADIO SWStatus;</div><div class='add'>+} WLAN_RADIO_STATUS;</div><div class='add'>+</div><div class='add'>+//----------------------------------------------------------------------------</div><div class='add'>+// 20041021 1.1.81.1000 ybjiang</div><div class='add'>+// add for radio notification</div><div class='add'>+typedef</div><div class='add'>+void (*RADIO_NOTIFICATION_HANDLER)(</div><div class='add'>+	void *Data,</div><div class='add'>+	void *RadioStatusBuffer,</div><div class='add'>+	u32 RadioStatusBufferLen</div><div class='add'>+	);</div><div class='add'>+</div><div class='add'>+typedef struct _WLAN_RADIO_NOTIFICATION</div><div class='add'>+{</div><div class='add'>+    RADIO_NOTIFICATION_HANDLER RadioChangeHandler;</div><div class='add'>+    void *Data;</div><div class='add'>+} WLAN_RADIO_NOTIFICATION;</div><div class='add'>+</div><div class='add'>+//----------------------------------------------------------------------------</div><div class='add'>+// 20041102 1.1.91.1000 ybjiang</div><div class='add'>+// add for OID_802_11_CUST_REGION_CAPABILITIES and OID_802_11_OID_REGION</div><div class='add'>+typedef enum _WLAN_REGION_CODE</div><div class='add'>+{</div><div class='add'>+	WLAN_REGION_UNKNOWN,</div><div class='add'>+	WLAN_REGION_EUROPE,</div><div class='add'>+	WLAN_REGION_JAPAN,</div><div class='add'>+	WLAN_REGION_USA,</div><div class='add'>+	WLAN_REGION_FRANCE,</div><div class='add'>+	WLAN_REGION_SPAIN,</div><div class='add'>+	WLAN_REGION_ISRAEL,</div><div class='add'>+	WLAN_REGION_MAX, // not a real type, defined as an upper bound</div><div class='add'>+} WLAN_REGION_CODE;</div><div class='add'>+</div><div class='add'>+#define REGION_NAME_MAX_LENGTH   256</div><div class='add'>+</div><div class='add'>+typedef struct _WLAN_REGION_CHANNELS</div><div class='add'>+{</div><div class='add'>+	u32 Length;</div><div class='add'>+	u32 NameLength;</div><div class='add'>+	u8 Name[REGION_NAME_MAX_LENGTH];</div><div class='add'>+	WLAN_REGION_CODE Code;</div><div class='add'>+	u32 Frequency[1];</div><div class='add'>+} WLAN_REGION_CHANNELS;</div><div class='add'>+</div><div class='add'>+typedef struct _WLAN_REGION_CAPABILITIES</div><div class='add'>+{</div><div class='add'>+	u32 NumberOfItems;</div><div class='add'>+	WLAN_REGION_CHANNELS Region[1];</div><div class='add'>+} WLAN_REGION_CAPABILITIES;</div><div class='add'>+</div><div class='add'>+typedef struct _region_name_map {</div><div class='add'>+	WLAN_REGION_CODE region;</div><div class='add'>+	u8 *name;</div><div class='add'>+	u32 *channels;</div><div class='add'>+} region_name_map;</div><div class='add'>+</div><div class='add'>+/*--------------------------------------------------------------------------*/</div><div class='add'>+#define MAC2STR(a) (a)[0], (a)[1], (a)[2], (a)[3], (a)[4], (a)[5]</div><div class='add'>+#define MACSTR "%02X:%02X:%02X:%02X:%02X:%02X"</div><div class='add'>+</div><div class='add'>+// TODO: 0627 kevin</div><div class='add'>+#define MIC2STR(a) (a)[0], (a)[1], (a)[2], (a)[3], (a)[4], (a)[5], (a)[6], (a)[7]</div><div class='add'>+#define MICSTR "%02X %02X %02X %02X %02X %02X %02X %02X"</div><div class='add'>+</div><div class='add'>+#define MICKEY2STR(a)   MIC2STR(a)</div><div class='add'>+#define MICKEYSTR       MICSTR</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#endif /* __GL_80211_H__ */</div><div class='add'>+/*** end of file ***/</div><div class='add'>+</div><div class='add'>+</div><div class='head'>diff --git a/drivers/staging/winbond/ioctls.h b/drivers/staging/winbond/ioctls.h<br/>new file mode 100644<br/>index 000000000000..e8b35dc7e321<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/winbond/ioctls.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/ioctls.h</a></div><div class='hunk'>@@ -0,0 +1,678 @@</div><div class='add'>+//============================================================================</div><div class='add'>+//  IOCTLS.H -</div><div class='add'>+//</div><div class='add'>+//  Description:</div><div class='add'>+//    Define the IOCTL codes.</div><div class='add'>+//</div><div class='add'>+//  Revision history:</div><div class='add'>+//  --------------------------------------------------------------------------</div><div class='add'>+//</div><div class='add'>+//  Copyright (c) 2002-2004 Winbond Electronics Corp. All rights reserved.</div><div class='add'>+//=============================================================================</div><div class='add'>+</div><div class='add'>+#ifndef _IOCTLS_H</div><div class='add'>+#define _IOCTLS_H</div><div class='add'>+</div><div class='add'>+// PD43 Keep it - Used with the Win33 application</div><div class='add'>+// #include &lt;winioctl.h&gt;</div><div class='add'>+</div><div class='add'>+//========================================================</div><div class='add'>+// 20040108 ADD the follow for test</div><div class='add'>+//========================================================</div><div class='add'>+#define INFORMATION_LENGTH sizeof(unsigned int)</div><div class='add'>+</div><div class='add'>+#define WB32_IOCTL_INDEX  0x0900 //­×§�ĽHŤKŹŰŽe//</div><div class='add'>+</div><div class='add'>+#define Wb32_RegisterRead			CTL_CODE(	\</div><div class='add'>+			FILE_DEVICE_UNKNOWN,				\</div><div class='add'>+            WB32_IOCTL_INDEX + 0,				\</div><div class='add'>+            METHOD_BUFFERED,					\</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+</div><div class='add'>+#define Wb32_RegisterWrite			CTL_CODE(	\</div><div class='add'>+            FILE_DEVICE_UNKNOWN,				\</div><div class='add'>+            WB32_IOCTL_INDEX + 1,				\</div><div class='add'>+            METHOD_BUFFERED,					\</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+</div><div class='add'>+#define Wb32_SendPacket				CTL_CODE(	\</div><div class='add'>+            FILE_DEVICE_UNKNOWN,				\</div><div class='add'>+            WB32_IOCTL_INDEX + 2,				\</div><div class='add'>+            METHOD_BUFFERED,					\</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+</div><div class='add'>+#define Wb32_QuerySendResult		CTL_CODE(	\</div><div class='add'>+            FILE_DEVICE_UNKNOWN,				\</div><div class='add'>+            WB32_IOCTL_INDEX + 3,				\</div><div class='add'>+            METHOD_BUFFERED,					\</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+</div><div class='add'>+#define Wb32_SetFragmentThreshold	CTL_CODE(	\</div><div class='add'>+            FILE_DEVICE_UNKNOWN,				\</div><div class='add'>+            WB32_IOCTL_INDEX + 4,				\</div><div class='add'>+            METHOD_BUFFERED,					\</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+</div><div class='add'>+#define Wb32_SetLinkStatus		CTL_CODE(	\</div><div class='add'>+            FILE_DEVICE_UNKNOWN,				\</div><div class='add'>+            WB32_IOCTL_INDEX + 5,				\</div><div class='add'>+            METHOD_BUFFERED,					\</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+</div><div class='add'>+#define Wb32_SetBulkIn			CTL_CODE(	\</div><div class='add'>+            FILE_DEVICE_UNKNOWN,				\</div><div class='add'>+            WB32_IOCTL_INDEX + 6,				\</div><div class='add'>+            METHOD_BUFFERED,					\</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+</div><div class='add'>+#define Wb32_LoopbackTest			CTL_CODE(	\</div><div class='add'>+            FILE_DEVICE_UNKNOWN,				\</div><div class='add'>+            WB32_IOCTL_INDEX + 7,				\</div><div class='add'>+            METHOD_BUFFERED,					\</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+</div><div class='add'>+#define Wb35_EEPromRead				CTL_CODE(	\</div><div class='add'>+            FILE_DEVICE_UNKNOWN,				\</div><div class='add'>+            WB32_IOCTL_INDEX + 8,				\</div><div class='add'>+            METHOD_BUFFERED,					\</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+</div><div class='add'>+#define Wb35_EEPromWrite			CTL_CODE(	\</div><div class='add'>+            FILE_DEVICE_UNKNOWN,				\</div><div class='add'>+            WB32_IOCTL_INDEX + 9,				\</div><div class='add'>+            METHOD_BUFFERED,					\</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+</div><div class='add'>+#define Wb35_FlashReadData			CTL_CODE(	\</div><div class='add'>+            FILE_DEVICE_UNKNOWN,				\</div><div class='add'>+            WB32_IOCTL_INDEX + 10,				\</div><div class='add'>+            METHOD_BUFFERED,					\</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+</div><div class='add'>+#define Wb35_FlashWrite				CTL_CODE(	\</div><div class='add'>+            FILE_DEVICE_UNKNOWN,				\</div><div class='add'>+            WB32_IOCTL_INDEX + 11,				\</div><div class='add'>+            METHOD_BUFFERED,					\</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+</div><div class='add'>+#define Wb35_FlashWriteBurst		CTL_CODE(	\</div><div class='add'>+            FILE_DEVICE_UNKNOWN,				\</div><div class='add'>+            WB32_IOCTL_INDEX + 12,				\</div><div class='add'>+            METHOD_BUFFERED,					\</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+</div><div class='add'>+#define Wb35_TxBurstStart			CTL_CODE(	\</div><div class='add'>+            FILE_DEVICE_UNKNOWN,				\</div><div class='add'>+            WB32_IOCTL_INDEX + 13,				\</div><div class='add'>+            METHOD_BUFFERED,					\</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+</div><div class='add'>+#define Wb35_TxBurstStop			CTL_CODE(	\</div><div class='add'>+            FILE_DEVICE_UNKNOWN,				\</div><div class='add'>+            WB32_IOCTL_INDEX + 14,				\</div><div class='add'>+            METHOD_BUFFERED,					\</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+</div><div class='add'>+#define Wb35_TxBurstStatus			CTL_CODE(	\</div><div class='add'>+            FILE_DEVICE_UNKNOWN,				\</div><div class='add'>+            WB32_IOCTL_INDEX + 15,				\</div><div class='add'>+            METHOD_BUFFERED,					\</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+</div><div class='add'>+// For IOCTL interface</div><div class='add'>+//================================================</div><div class='add'>+#define LINKNAME_STRING     "\\DosDevices\\W35UND"</div><div class='add'>+#define NTDEVICE_STRING     "\\Device\\W35UND"</div><div class='add'>+#define APPLICATION_LINK	"\\\\.\\W35UND"</div><div class='add'>+</div><div class='add'>+#define WB_IOCTL_INDEX      0x0800</div><div class='add'>+#define WB_IOCTL_TS_INDEX   WB_IOCTL_INDEX + 60</div><div class='add'>+#define WB_IOCTL_DUT_INDEX  WB_IOCTL_TS_INDEX + 40</div><div class='add'>+</div><div class='add'>+//=============================================================================</div><div class='add'>+// IOCTLS defined for DUT (Device Under Test)</div><div class='add'>+</div><div class='add'>+// IOCTL_WB_802_11_DUT_MAC_ADDRESS</div><div class='add'>+// Query: Return the dot11StationID</div><div class='add'>+// Set  : Set the dot11StationID. Demo only.</div><div class='add'>+//</div><div class='add'>+#define IOCTL_WB_802_11_DUT_MAC_ADDRESS     CTL_CODE(  \</div><div class='add'>+            FILE_DEVICE_UNKNOWN,                        \</div><div class='add'>+            WB_IOCTL_DUT_INDEX + 1,                     \</div><div class='add'>+            METHOD_BUFFERED,                            \</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+</div><div class='add'>+// IOCTL_WB_802_11_DUT_BSS_DESCRIPTION</div><div class='add'>+// Query: Return the info. of the current connected BSS.</div><div class='add'>+// Set  : None.</div><div class='add'>+//</div><div class='add'>+#define IOCTL_WB_802_11_DUT_BSS_DESCRIPTION   CTL_CODE(  \</div><div class='add'>+            FILE_DEVICE_UNKNOWN,                          \</div><div class='add'>+            WB_IOCTL_DUT_INDEX + 2,                       \</div><div class='add'>+            METHOD_BUFFERED,                              \</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+</div><div class='add'>+// IOCTL_WB_802_11_DUT_TX_RATE</div><div class='add'>+// Query: Return the current transmission rate.</div><div class='add'>+// Set  : Set the transmission rate of the Tx packets.</div><div class='add'>+//</div><div class='add'>+#define IOCTL_WB_802_11_DUT_TX_RATE             CTL_CODE(  \</div><div class='add'>+            FILE_DEVICE_UNKNOWN,                            \</div><div class='add'>+            WB_IOCTL_DUT_INDEX + 3,                         \</div><div class='add'>+            METHOD_BUFFERED,                                \</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+</div><div class='add'>+// IOCTL_WB_802_11_DUT_CURRENT_STA_STATE</div><div class='add'>+// Query: Return the current STA state. (WB_STASTATE type)</div><div class='add'>+// Set  : None.</div><div class='add'>+//</div><div class='add'>+#define IOCTL_WB_802_11_DUT_CURRENT_STA_STATE   CTL_CODE(  \</div><div class='add'>+            FILE_DEVICE_UNKNOWN,                            \</div><div class='add'>+            WB_IOCTL_DUT_INDEX + 4,                         \</div><div class='add'>+            METHOD_BUFFERED,                                \</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+</div><div class='add'>+/////////// 10/31/02' Added /////////////////////</div><div class='add'>+</div><div class='add'>+// IOCTL_WB_802_11_DUT_START_IBSS_REQUEST</div><div class='add'>+// Query: None.</div><div class='add'>+// Set  : Start a new IBSS</div><div class='add'>+//</div><div class='add'>+#define IOCTL_WB_802_11_DUT_START_IBSS_REQUEST  CTL_CODE(  \</div><div class='add'>+            FILE_DEVICE_UNKNOWN,                            \</div><div class='add'>+            WB_IOCTL_DUT_INDEX + 5,                         \</div><div class='add'>+            METHOD_BUFFERED,                                \</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+</div><div class='add'>+// IOCTL_WB_802_11_DUT_JOIN_REQUEST</div><div class='add'>+// Query: None.</div><div class='add'>+// Set  : Synchronize with the selected BSS</div><div class='add'>+//</div><div class='add'>+#define IOCTL_WB_802_11_DUT_JOIN_REQUEST        CTL_CODE(  \</div><div class='add'>+            FILE_DEVICE_UNKNOWN,                            \</div><div class='add'>+            WB_IOCTL_DUT_INDEX + 6,                         \</div><div class='add'>+            METHOD_BUFFERED,                                \</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+</div><div class='add'>+// IOCTL_WB_802_11_DUT_AUTHEN_REQUEST</div><div class='add'>+// Query: None.</div><div class='add'>+// Set  : Authenticate with the BSS</div><div class='add'>+//</div><div class='add'>+#define IOCTL_WB_802_11_DUT_AUTHEN_REQUEST      CTL_CODE(  \</div><div class='add'>+            FILE_DEVICE_UNKNOWN,                            \</div><div class='add'>+            WB_IOCTL_DUT_INDEX + 7,                         \</div><div class='add'>+            METHOD_BUFFERED,                                \</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+</div><div class='add'>+// IOCTL_WB_802_11_DUT_DEAUTHEN_REQUEST</div><div class='add'>+// Query: None.</div><div class='add'>+// Set  : DeAuthenticate withe the BSS</div><div class='add'>+//</div><div class='add'>+#define IOCTL_WB_802_11_DUT_DEAUTHEN_REQUEST    CTL_CODE(  \</div><div class='add'>+            FILE_DEVICE_UNKNOWN,                            \</div><div class='add'>+            WB_IOCTL_DUT_INDEX + 8,                         \</div><div class='add'>+            METHOD_BUFFERED,                                \</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+</div><div class='add'>+// IOCTL_WB_802_11_DUT_ASSOC_REQUEST</div><div class='add'>+// Query: None.</div><div class='add'>+// Set  : Associate withe the BSS</div><div class='add'>+//</div><div class='add'>+#define IOCTL_WB_802_11_DUT_ASSOC_REQUEST       CTL_CODE(  \</div><div class='add'>+            FILE_DEVICE_UNKNOWN,                            \</div><div class='add'>+            WB_IOCTL_DUT_INDEX + 9,                         \</div><div class='add'>+            METHOD_BUFFERED,                                \</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+</div><div class='add'>+// IOCTL_WB_802_11_DUT_REASSOC_REQUEST</div><div class='add'>+// Query: None.</div><div class='add'>+// Set  : ReAssociate withe the BSS</div><div class='add'>+//</div><div class='add'>+#define IOCTL_WB_802_11_DUT_REASSOC_REQUEST     CTL_CODE(  \</div><div class='add'>+            FILE_DEVICE_UNKNOWN,                            \</div><div class='add'>+            WB_IOCTL_DUT_INDEX + 10,                        \</div><div class='add'>+            METHOD_BUFFERED,                                \</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+// IOCTL_WB_802_11_DUT_DISASSOC_REQUEST</div><div class='add'>+// Query: None.</div><div class='add'>+// Set  : DisAssociate withe the BSS</div><div class='add'>+//</div><div class='add'>+#define IOCTL_WB_802_11_DUT_DISASSOC_REQUEST    CTL_CODE(  \</div><div class='add'>+            FILE_DEVICE_UNKNOWN,                            \</div><div class='add'>+            WB_IOCTL_DUT_INDEX + 11,                        \</div><div class='add'>+            METHOD_BUFFERED,                                \</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+</div><div class='add'>+// IOCTL_WB_802_11_DUT_FRAG_THRESHOLD</div><div class='add'>+// Query: Return the dot11FragmentThreshold</div><div class='add'>+// Set  : Set the dot11FragmentThreshold</div><div class='add'>+//</div><div class='add'>+#define IOCTL_WB_802_11_DUT_FRAG_THRESHOLD      CTL_CODE(  \</div><div class='add'>+            FILE_DEVICE_UNKNOWN,                            \</div><div class='add'>+            WB_IOCTL_DUT_INDEX + 12,                        \</div><div class='add'>+            METHOD_BUFFERED,                                \</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+</div><div class='add'>+// IOCTL_WB_802_11_DUT_RTS_THRESHOLD</div><div class='add'>+// Query: Return the dot11RTSThreshold</div><div class='add'>+// Set  : Set the dot11RTSThresold</div><div class='add'>+//</div><div class='add'>+#define IOCTL_WB_802_11_DUT_RTS_THRESHOLD       CTL_CODE(  \</div><div class='add'>+            FILE_DEVICE_UNKNOWN,                            \</div><div class='add'>+            WB_IOCTL_DUT_INDEX + 13,                        \</div><div class='add'>+            METHOD_BUFFERED,                                \</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+</div><div class='add'>+// IOCTL_WB_802_11_DUT_WEP_KEYMODE</div><div class='add'>+// Query: Get the WEP key mode.</div><div class='add'>+// Set  : Set the WEP key mode: disable/64 bits/128 bits</div><div class='add'>+//</div><div class='add'>+#define IOCTL_WB_802_11_DUT_WEP_KEYMODE         CTL_CODE(  \</div><div class='add'>+            FILE_DEVICE_UNKNOWN,                            \</div><div class='add'>+            WB_IOCTL_DUT_INDEX + 14,                        \</div><div class='add'>+            METHOD_BUFFERED,                                \</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+</div><div class='add'>+// IOCTL_WB_802_11_DUT_WEP_KEYVALUE</div><div class='add'>+// Query: None.</div><div class='add'>+// Set  : fill in the WEP key value</div><div class='add'>+//</div><div class='add'>+#define IOCTL_WB_802_11_DUT_WEP_KEYVALUE        CTL_CODE(  \</div><div class='add'>+            FILE_DEVICE_UNKNOWN,                            \</div><div class='add'>+            WB_IOCTL_DUT_INDEX + 15,                        \</div><div class='add'>+            METHOD_BUFFERED,                                \</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+</div><div class='add'>+// IOCTL_WB_802_11_DUT_RESET</div><div class='add'>+// Query: None.</div><div class='add'>+// Set  : Reset S/W and H/W</div><div class='add'>+//</div><div class='add'>+#define IOCTL_WB_802_11_DUT_RESET          CTL_CODE(       \</div><div class='add'>+            FILE_DEVICE_UNKNOWN,                            \</div><div class='add'>+            WB_IOCTL_DUT_INDEX + 16,                        \</div><div class='add'>+            METHOD_BUFFERED,                                \</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+</div><div class='add'>+// IOCTL_WB_802_11_DUT_POWER_SAVE</div><div class='add'>+// Query: None.</div><div class='add'>+// Set  : Set Power Save Mode</div><div class='add'>+//</div><div class='add'>+#define IOCTL_WB_802_11_DUT_POWER_SAVE    CTL_CODE(        \</div><div class='add'>+            FILE_DEVICE_UNKNOWN,                            \</div><div class='add'>+            WB_IOCTL_DUT_INDEX + 17,                        \</div><div class='add'>+            METHOD_BUFFERED,                                \</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+</div><div class='add'>+// IOCTL_WB_802_11_DUT_BSSID_LIST_SCAN</div><div class='add'>+// Query: None.</div><div class='add'>+// Set  :</div><div class='add'>+//</div><div class='add'>+#define IOCTL_WB_802_11_DUT_BSSID_LIST_SCAN CTL_CODE(      \</div><div class='add'>+            FILE_DEVICE_UNKNOWN,                            \</div><div class='add'>+            WB_IOCTL_DUT_INDEX + 18,                        \</div><div class='add'>+            METHOD_BUFFERED,                                \</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+</div><div class='add'>+// IOCTL_WB_802_11_DUT_BSSID_LIST</div><div class='add'>+// Query: Return the BSS info of BSSs in the last scanning process</div><div class='add'>+// Set  : None.</div><div class='add'>+//</div><div class='add'>+#define IOCTL_WB_802_11_DUT_BSSID_LIST    CTL_CODE(        \</div><div class='add'>+            FILE_DEVICE_UNKNOWN,                            \</div><div class='add'>+            WB_IOCTL_DUT_INDEX + 19,                        \</div><div class='add'>+            METHOD_BUFFERED,                                \</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+</div><div class='add'>+// IOCTL_WB_802_11_DUT_STATISTICS</div><div class='add'>+// Query: Return the statistics of Tx/Rx.</div><div class='add'>+// Set  : None.</div><div class='add'>+//</div><div class='add'>+#define IOCTL_WB_802_11_DUT_STATISTICS    CTL_CODE(        \</div><div class='add'>+            FILE_DEVICE_UNKNOWN,                            \</div><div class='add'>+            WB_IOCTL_DUT_INDEX + 20,                        \</div><div class='add'>+            METHOD_BUFFERED,                                \</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+</div><div class='add'>+// IOCTL_WB_802_11_DUT_ACCEPT_BEACON</div><div class='add'>+// Query: Return the current mode to accept beacon or not.</div><div class='add'>+// Set  : Enable or disable allowing the HW-MAC to pass the beacon to the SW-MAC</div><div class='add'>+// Arguments: unsigned char</div><div class='add'>+//</div><div class='add'>+#define IOCTL_WB_802_11_DUT_ACCEPT_BEACON  CTL_CODE(       \</div><div class='add'>+            FILE_DEVICE_UNKNOWN,                            \</div><div class='add'>+            WB_IOCTL_DUT_INDEX + 21,                        \</div><div class='add'>+            METHOD_BUFFERED,                                \</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+</div><div class='add'>+// IOCTL_WB_802_11_DUT_ROAMING</div><div class='add'>+// Query: Return the roaming function status</div><div class='add'>+// Set  : Enable/Disable the roaming function.</div><div class='add'>+#define IOCTL_WB_802_11_DUT_ROAMING        CTL_CODE(       \</div><div class='add'>+            FILE_DEVICE_UNKNOWN,                            \</div><div class='add'>+            WB_IOCTL_DUT_INDEX + 22,                        \</div><div class='add'>+            METHOD_BUFFERED,                                \</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+</div><div class='add'>+// IOCTL_WB_802_11_DUT_DTO</div><div class='add'>+// Query: Return the DTO(Data Throughput Optimization)</div><div class='add'>+//        function status (TRUE or FALSE)</div><div class='add'>+// Set  : Enable/Disable the DTO function.</div><div class='add'>+//</div><div class='add'>+#define IOCTL_WB_802_11_DUT_DTO            CTL_CODE(       \</div><div class='add'>+            FILE_DEVICE_UNKNOWN,                            \</div><div class='add'>+            WB_IOCTL_DUT_INDEX + 23,                        \</div><div class='add'>+            METHOD_BUFFERED,                                \</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+</div><div class='add'>+// IOCTL_WB_802_11_DUT_ANTENNA_DIVERSITY</div><div class='add'>+// Query: Return the antenna diversity status. (TRUE/ON or FALSE/OFF)</div><div class='add'>+// Set  : Enable/Disable the antenna diversity.</div><div class='add'>+//</div><div class='add'>+#define IOCTL_WB_802_11_DUT_ANTENNA_DIVERSITY CTL_CODE(    \</div><div class='add'>+            FILE_DEVICE_UNKNOWN,                            \</div><div class='add'>+            WB_IOCTL_DUT_INDEX + 24,                        \</div><div class='add'>+            METHOD_BUFFERED,                                \</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+</div><div class='add'>+//-------------- new added for a+b+g ---------------------</div><div class='add'>+// IOCTL_WB_802_11_DUT_MAC_OPERATION_MODE</div><div class='add'>+// Query: Return the MAC operation mode. (MODE_802_11_BG, MODE_802_11_A,</div><div class='add'>+//			 MODE_802_11_ABG, MODE_802_11_BG_IBSS)</div><div class='add'>+// Set  : Set the MAC operation mode.</div><div class='add'>+//</div><div class='add'>+#define IOCTL_WB_802_11_DUT_MAC_OPERATION_MODE CTL_CODE(    \</div><div class='add'>+            FILE_DEVICE_UNKNOWN,                            \</div><div class='add'>+            WB_IOCTL_DUT_INDEX + 25,                        \</div><div class='add'>+            METHOD_BUFFERED,                                \</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+</div><div class='add'>+// IOCTL_WB_802_11_DUT_TX_RATE_REDEFINED</div><div class='add'>+// Query: Return the current tx rate which follows the definition in spec. (for</div><div class='add'>+//			example, 5.5M =&gt; 0x0b)</div><div class='add'>+// Set  : None</div><div class='add'>+//</div><div class='add'>+#define IOCTL_WB_802_11_DUT_TX_RATE_REDEFINED CTL_CODE(    \</div><div class='add'>+            FILE_DEVICE_UNKNOWN,                            \</div><div class='add'>+            WB_IOCTL_DUT_INDEX + 26,                        \</div><div class='add'>+            METHOD_BUFFERED,                                \</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+</div><div class='add'>+// IOCTL_WB_802_11_DUT_PREAMBLE_MODE</div><div class='add'>+// Query: Return the preamble mode. (auto or long)</div><div class='add'>+// Set  : Set the preamble mode.</div><div class='add'>+//</div><div class='add'>+#define IOCTL_WB_802_11_DUT_PREAMBLE_MODE CTL_CODE(    \</div><div class='add'>+            FILE_DEVICE_UNKNOWN,                            \</div><div class='add'>+            WB_IOCTL_DUT_INDEX + 27,                        \</div><div class='add'>+            METHOD_BUFFERED,                                \</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+</div><div class='add'>+// IOCTL_WB_802_11_DUT_SLOT_TIME_MODE</div><div class='add'>+// Query: Return the slot time mode. (auto or long)</div><div class='add'>+// Set  : Set the slot time mode.</div><div class='add'>+//</div><div class='add'>+#define IOCTL_WB_802_11_DUT_SLOT_TIME_MODE CTL_CODE(    \</div><div class='add'>+            FILE_DEVICE_UNKNOWN,                            \</div><div class='add'>+            WB_IOCTL_DUT_INDEX + 28,                        \</div><div class='add'>+            METHOD_BUFFERED,                                \</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+//------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+// IOCTL_WB_802_11_DUT_ADVANCE_STATUS</div><div class='add'>+// Query:</div><div class='add'>+// Set  : NONE</div><div class='add'>+//</div><div class='add'>+#define IOCTL_WB_802_11_DUT_ADVANCE_STATUS CTL_CODE(    \</div><div class='add'>+            FILE_DEVICE_UNKNOWN,                            \</div><div class='add'>+            WB_IOCTL_DUT_INDEX + 29,                        \</div><div class='add'>+            METHOD_BUFFERED,                                \</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+</div><div class='add'>+// IOCTL_WB_802_11_DUT_TX_RATE_MODE</div><div class='add'>+// Query: Return the tx rate mode. (RATE_AUTO, RATE_1M, .., RATE_54M, RATE_MAX)</div><div class='add'>+// Set  : Set the tx rate mode.  (RATE_AUTO, RATE_1M, .., RATE_54M, RATE_MAX)</div><div class='add'>+//</div><div class='add'>+#define IOCTL_WB_802_11_DUT_TX_RATE_MODE CTL_CODE(    \</div><div class='add'>+            FILE_DEVICE_UNKNOWN,                            \</div><div class='add'>+            WB_IOCTL_DUT_INDEX + 30,                        \</div><div class='add'>+            METHOD_BUFFERED,                                \</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+</div><div class='add'>+// IOCTL_WB_802_11_DUT_DTO_PARA</div><div class='add'>+// Query: Return the DTO parameters</div><div class='add'>+// Set  : Set the DTO parameters</div><div class='add'>+//</div><div class='add'>+#define IOCTL_WB_802_11_DUT_DTO_PARA CTL_CODE(    \</div><div class='add'>+            FILE_DEVICE_UNKNOWN,                            \</div><div class='add'>+            WB_IOCTL_DUT_INDEX + 31,                        \</div><div class='add'>+            METHOD_BUFFERED,                                \</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+</div><div class='add'>+// IOCTL_WB_802_11_DUT_EVENT_LOG</div><div class='add'>+// Query: Return event log</div><div class='add'>+// Set  : Reset event log</div><div class='add'>+//</div><div class='add'>+#define IOCTL_WB_802_11_DUT_EVENT_LOG CTL_CODE(    \</div><div class='add'>+            FILE_DEVICE_UNKNOWN,                            \</div><div class='add'>+            WB_IOCTL_DUT_INDEX + 32,                        \</div><div class='add'>+            METHOD_BUFFERED,                                \</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+</div><div class='add'>+// IOCTL_WB_802_11_DUT_CWMIN</div><div class='add'>+// Query: NONE(It will be obtained by IOCTL_WB_802_11_DUT_ADVANCE_STATUS)</div><div class='add'>+// Set  : Set CWMin value</div><div class='add'>+//</div><div class='add'>+#define IOCTL_WB_802_11_DUT_CWMIN CTL_CODE(    \</div><div class='add'>+            FILE_DEVICE_UNKNOWN,                            \</div><div class='add'>+            WB_IOCTL_DUT_INDEX + 33,                        \</div><div class='add'>+            METHOD_BUFFERED,                                \</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+</div><div class='add'>+// IOCTL_WB_802_11_DUT_CWMAX</div><div class='add'>+// Query: NONE(It will be obtained by IOCTL_WB_802_11_DUT_ADVANCE_STATUS)</div><div class='add'>+// Set  : Set CWMax value</div><div class='add'>+//</div><div class='add'>+#define IOCTL_WB_802_11_DUT_CWMAX CTL_CODE(    \</div><div class='add'>+            FILE_DEVICE_UNKNOWN,                            \</div><div class='add'>+            WB_IOCTL_DUT_INDEX + 34,                        \</div><div class='add'>+            METHOD_BUFFERED,                                \</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+//==========================================================</div><div class='add'>+// IOCTLs for Testing</div><div class='add'>+</div><div class='add'>+// IOCTL_WB_802_11_TS_SET_CXX_REG</div><div class='add'>+// Query: None</div><div class='add'>+// Set  : Write the value to one of Cxx register.</div><div class='add'>+//</div><div class='add'>+#define IOCTL_WB_802_11_TS_SET_CXX_REG  CTL_CODE(          \</div><div class='add'>+            FILE_DEVICE_UNKNOWN,                            \</div><div class='add'>+            WB_IOCTL_TS_INDEX + 0,                          \</div><div class='add'>+            METHOD_BUFFERED,                                \</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+</div><div class='add'>+// IOCTL_WB_802_11_TS_GET_CXX_REG</div><div class='add'>+// Query: Return the value of the Cxx register.</div><div class='add'>+// Set  : Write the reg no. (0x00, 0x04, 0x08 etc)</div><div class='add'>+//</div><div class='add'>+#define IOCTL_WB_802_11_TS_GET_CXX_REG  CTL_CODE(          \</div><div class='add'>+            FILE_DEVICE_UNKNOWN,                            \</div><div class='add'>+            WB_IOCTL_TS_INDEX + 1,                          \</div><div class='add'>+            METHOD_BUFFERED,                                \</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+</div><div class='add'>+// IOCTL_WB_802_11_TS_SET_DXX_REG</div><div class='add'>+// Query: None</div><div class='add'>+// Set  : Write the value to one of Dxx register.</div><div class='add'>+//</div><div class='add'>+#define IOCTL_WB_802_11_TS_SET_DXX_REG  CTL_CODE(          \</div><div class='add'>+            FILE_DEVICE_UNKNOWN,                            \</div><div class='add'>+            WB_IOCTL_TS_INDEX + 2,                          \</div><div class='add'>+            METHOD_BUFFERED,                                \</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+</div><div class='add'>+// IOCTL_WB_802_11_TS_GET_DXX_REG</div><div class='add'>+// Query: Return the value of the Dxx register.</div><div class='add'>+// Set  : Write the reg no. (0x00, 0x04, 0x08 etc)</div><div class='add'>+//</div><div class='add'>+#define IOCTL_WB_802_11_TS_GET_DXX_REG  CTL_CODE(          \</div><div class='add'>+            FILE_DEVICE_UNKNOWN,                            \</div><div class='add'>+            WB_IOCTL_TS_INDEX + 3,                          \</div><div class='add'>+            METHOD_BUFFERED,                                \</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+</div><div class='add'>+//============================================================</div><div class='add'>+// [TS]</div><div class='add'>+</div><div class='add'>+#define IOCTL_WB_802_11_TS_TX_RATE              CTL_CODE(   \</div><div class='add'>+            FILE_DEVICE_UNKNOWN,                            \</div><div class='add'>+            WB_IOCTL_TS_INDEX + 4,                          \</div><div class='add'>+            METHOD_BUFFERED,                                \</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+</div><div class='add'>+#define IOCTL_WB_802_11_TS_CURRENT_CHANNEL      CTL_CODE(   \</div><div class='add'>+            FILE_DEVICE_UNKNOWN,                            \</div><div class='add'>+            WB_IOCTL_TS_INDEX + 5,                          \</div><div class='add'>+            METHOD_BUFFERED,                                \</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+</div><div class='add'>+#define IOCTL_WB_802_11_TS_ENABLE_SEQNO         CTL_CODE(   \</div><div class='add'>+            FILE_DEVICE_UNKNOWN,                            \</div><div class='add'>+            WB_IOCTL_TS_INDEX + 6,                          \</div><div class='add'>+            METHOD_BUFFERED,                                \</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+</div><div class='add'>+#define IOCTL_WB_802_11_TS_ENALBE_ACKEDPACKET   CTL_CODE(   \</div><div class='add'>+            FILE_DEVICE_UNKNOWN,                            \</div><div class='add'>+            WB_IOCTL_TS_INDEX + 7,                          \</div><div class='add'>+            METHOD_BUFFERED,                                \</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+</div><div class='add'>+#define IOCTL_WB_802_11_TS_INHIBIT_CRC          CTL_CODE(   \</div><div class='add'>+            FILE_DEVICE_UNKNOWN,                            \</div><div class='add'>+            WB_IOCTL_TS_INDEX + 8,                          \</div><div class='add'>+            METHOD_BUFFERED,                                \</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+</div><div class='add'>+#define IOCTL_WB_802_11_TS_RESET_RCV_COUNTER    CTL_CODE(   \</div><div class='add'>+            FILE_DEVICE_UNKNOWN,                            \</div><div class='add'>+            WB_IOCTL_TS_INDEX + 9,                          \</div><div class='add'>+            METHOD_BUFFERED,                                \</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+</div><div class='add'>+#define IOCTL_WB_802_11_TS_SET_TX_TRIGGER       CTL_CODE(   \</div><div class='add'>+            FILE_DEVICE_UNKNOWN,                            \</div><div class='add'>+            WB_IOCTL_TS_INDEX + 10,                         \</div><div class='add'>+            METHOD_BUFFERED,                                \</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+</div><div class='add'>+#define IOCTL_WB_802_11_TS_FAILED_TX_COUNT       CTL_CODE(  \</div><div class='add'>+            FILE_DEVICE_UNKNOWN,                            \</div><div class='add'>+            WB_IOCTL_TS_INDEX + 11,                         \</div><div class='add'>+            METHOD_BUFFERED,                                \</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+</div><div class='add'>+// [TS1]</div><div class='add'>+#define IOCTL_WB_802_11_TS_TX_POWER             CTL_CODE(   \</div><div class='add'>+            FILE_DEVICE_UNKNOWN,                            \</div><div class='add'>+            WB_IOCTL_TS_INDEX + 12,                         \</div><div class='add'>+            METHOD_BUFFERED,                                \</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+</div><div class='add'>+#define IOCTL_WB_802_11_TS_MODE_ENABLE			 CTL_CODE(  \</div><div class='add'>+            FILE_DEVICE_UNKNOWN,                            \</div><div class='add'>+            WB_IOCTL_TS_INDEX + 13,                         \</div><div class='add'>+            METHOD_BUFFERED,                                \</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+</div><div class='add'>+#define IOCTL_WB_802_11_TS_MODE_DISABLE			 CTL_CODE(  \</div><div class='add'>+            FILE_DEVICE_UNKNOWN,                            \</div><div class='add'>+            WB_IOCTL_TS_INDEX + 14,                         \</div><div class='add'>+            METHOD_BUFFERED,                                \</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+</div><div class='add'>+#define IOCTL_WB_802_11_TS_ANTENNA				 CTL_CODE(  \</div><div class='add'>+            FILE_DEVICE_UNKNOWN,                            \</div><div class='add'>+            WB_IOCTL_TS_INDEX + 15,                         \</div><div class='add'>+            METHOD_BUFFERED,                                \</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+</div><div class='add'>+#define IOCTL_WB_802_11_TS_ADAPTER_INFO			 CTL_CODE(  \</div><div class='add'>+            FILE_DEVICE_UNKNOWN,                            \</div><div class='add'>+            WB_IOCTL_TS_INDEX + 16,                         \</div><div class='add'>+            METHOD_BUFFERED,                                \</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+</div><div class='add'>+#define IOCTL_WB_802_11_TS_MAC_ADDRESS			 CTL_CODE(  \</div><div class='add'>+            FILE_DEVICE_UNKNOWN,                            \</div><div class='add'>+            WB_IOCTL_TS_INDEX + 17,                         \</div><div class='add'>+            METHOD_BUFFERED,                                \</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+</div><div class='add'>+#define IOCTL_WB_802_11_TS_BSSID				 CTL_CODE(  \</div><div class='add'>+            FILE_DEVICE_UNKNOWN,                            \</div><div class='add'>+            WB_IOCTL_TS_INDEX + 18,                         \</div><div class='add'>+            METHOD_BUFFERED,                                \</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+</div><div class='add'>+#define IOCTL_WB_802_11_TS_RF_PARAMETER			 CTL_CODE(  \</div><div class='add'>+            FILE_DEVICE_UNKNOWN,                            \</div><div class='add'>+            WB_IOCTL_TS_INDEX + 19,                         \</div><div class='add'>+            METHOD_BUFFERED,                                \</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+</div><div class='add'>+#define IOCTL_WB_802_11_TS_FILTER				 CTL_CODE(  \</div><div class='add'>+            FILE_DEVICE_UNKNOWN,                            \</div><div class='add'>+            WB_IOCTL_TS_INDEX + 20,                         \</div><div class='add'>+            METHOD_BUFFERED,                                \</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+</div><div class='add'>+#define IOCTL_WB_802_11_TS_CALIBRATION			 CTL_CODE(  \</div><div class='add'>+            FILE_DEVICE_UNKNOWN,                            \</div><div class='add'>+            WB_IOCTL_TS_INDEX + 21,                         \</div><div class='add'>+            METHOD_BUFFERED,                                \</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+</div><div class='add'>+#define IOCTL_WB_802_11_TS_BSS_MODE				 CTL_CODE(  \</div><div class='add'>+            FILE_DEVICE_UNKNOWN,                            \</div><div class='add'>+            WB_IOCTL_TS_INDEX + 22,                         \</div><div class='add'>+            METHOD_BUFFERED,                                \</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+</div><div class='add'>+#define IOCTL_WB_802_11_TS_SET_SSID				 CTL_CODE(  \</div><div class='add'>+            FILE_DEVICE_UNKNOWN,                            \</div><div class='add'>+            WB_IOCTL_TS_INDEX + 23,                         \</div><div class='add'>+            METHOD_BUFFERED,                                \</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+</div><div class='add'>+#define IOCTL_WB_802_11_TS_IBSS_CHANNEL			 CTL_CODE(  \</div><div class='add'>+            FILE_DEVICE_UNKNOWN,                            \</div><div class='add'>+            WB_IOCTL_TS_INDEX + 24,                         \</div><div class='add'>+            METHOD_BUFFERED,                                \</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+</div><div class='add'>+// set/query the slot time value(short or long slot time)</div><div class='add'>+#define IOCTL_WB_802_11_TS_SLOT_TIME			 CTL_CODE(  \</div><div class='add'>+            FILE_DEVICE_UNKNOWN,                            \</div><div class='add'>+            WB_IOCTL_TS_INDEX + 25,                         \</div><div class='add'>+            METHOD_BUFFERED,                                \</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+</div><div class='add'>+#define IOCTL_WB_802_11_TS_SLOT_TIME			 CTL_CODE(  \</div><div class='add'>+            FILE_DEVICE_UNKNOWN,                            \</div><div class='add'>+            WB_IOCTL_TS_INDEX + 25,                         \</div><div class='add'>+            METHOD_BUFFERED,                                \</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+</div><div class='add'>+#define IOCTL_WB_802_11_TS_RX_STATISTICS		 CTL_CODE(  \</div><div class='add'>+            FILE_DEVICE_UNKNOWN,                            \</div><div class='add'>+            WB_IOCTL_TS_INDEX + 26,                         \</div><div class='add'>+            METHOD_BUFFERED,                                \</div><div class='add'>+            FILE_ANY_ACCESS)</div><div class='add'>+</div><div class='add'>+#endif  // #ifndef _IOCTLS_H</div><div class='add'>+</div><div class='add'>+</div><div class='head'>diff --git a/drivers/staging/winbond/linux/common.h b/drivers/staging/winbond/linux/common.h<br/>new file mode 100644<br/>index 000000000000..6b00bad74f78<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/winbond/linux/common.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/linux/common.h</a></div><div class='hunk'>@@ -0,0 +1,143 @@</div><div class='add'>+//</div><div class='add'>+// common.h</div><div class='add'>+//</div><div class='add'>+// This file contains the OS dependant definition and function.</div><div class='add'>+// Every OS has this file individual.</div><div class='add'>+//</div><div class='add'>+</div><div class='add'>+#define DebugUsbdStatusInformation( _A )</div><div class='add'>+</div><div class='add'>+#ifndef COMMON_DEF</div><div class='add'>+#define COMMON_DEF</div><div class='add'>+</div><div class='add'>+#include &lt;linux/version.h&gt;</div><div class='add'>+#include &lt;linux/usb.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt; //need for kernel alert</div><div class='add'>+#include &lt;linux/autoconf.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/signal.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt; //memory allocate</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;//need for init and exit modules marco</div><div class='add'>+#include &lt;linux/ctype.h&gt;</div><div class='add'>+#include &lt;linux/wait.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/wireless.h&gt;</div><div class='add'>+#include &lt;linux/if_arp.h&gt;</div><div class='add'>+#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;net/iw_handler.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+//#define DEBUG_ENABLED  1</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+//===============================================================</div><div class='add'>+// Common type definition</div><div class='add'>+//===============================================================</div><div class='add'>+</div><div class='add'>+typedef u8*            PUCHAR;</div><div class='add'>+typedef s8*            PCHAR;</div><div class='add'>+typedef u8*            PBOOLEAN;</div><div class='add'>+typedef u16*           PUSHORT;</div><div class='add'>+typedef u32*           PULONG;</div><div class='add'>+typedef s16*   PSHORT;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+//===========================================</div><div class='add'>+#define IGNORE      2</div><div class='add'>+#define	SUCCESS     1</div><div class='add'>+#define	FAILURE     0</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#ifndef true</div><div class='add'>+#define true        1</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef false</div><div class='add'>+#define false       0</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+// PD43 20021108</div><div class='add'>+#ifndef TRUE</div><div class='add'>+#define TRUE        1</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef FALSE</div><div class='add'>+#define FALSE       0</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define STATUS_MEDIA_CONNECT 1</div><div class='add'>+#define STATUS_MEDIA_DISCONNECT 0</div><div class='add'>+</div><div class='add'>+#ifndef BIT</div><div class='add'>+#define BIT(x)                  (1 &lt;&lt; (x))</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+typedef struct urb * PURB;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+//==================================================================================================</div><div class='add'>+// Common function definition</div><div class='add'>+//==================================================================================================</div><div class='add'>+#ifndef abs</div><div class='add'>+#define abs(_T)							((_T) &lt; 0 ? -_T : _T)</div><div class='add'>+#endif</div><div class='add'>+#define DEBUG_ENABLED</div><div class='add'>+#define ETH_LENGTH_OF_ADDRESS	6</div><div class='add'>+#ifdef DEBUG_ENABLED</div><div class='add'>+#define WBDEBUG( _M )	printk _M</div><div class='add'>+#else</div><div class='add'>+#define WBDEBUG( _M )	0</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define OS_DISCONNECTED	0</div><div class='add'>+#define OS_CONNECTED	1</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define OS_EVENT_INDICATE( _A, _B, _F )</div><div class='add'>+#define OS_PMKID_STATUS_EVENT( _A )</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Uff, no, longs are not atomic on all architectures Linux</div><div class='add'>+ * supports. This should really use atomic_t */</div><div class='add'>+</div><div class='add'>+#define OS_ATOMIC			u32</div><div class='add'>+#define OS_ATOMIC_READ( _A, _V )	_V</div><div class='add'>+#define OS_ATOMIC_INC( _A, _V )		EncapAtomicInc( _A, (void*)_V )</div><div class='add'>+#define OS_ATOMIC_DEC( _A, _V )		EncapAtomicDec( _A, (void*)_V )</div><div class='add'>+#define OS_MEMORY_CLEAR( _A, _S )	memset( (PUCHAR)_A,0,_S)</div><div class='add'>+#define OS_MEMORY_COMPARE( _A, _B, _S )	(memcmp(_A,_B,_S)? 0 : 1) // Definition is reverse with Ndis 1: the same 0: different</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define OS_SPIN_LOCK				spinlock_t</div><div class='add'>+#define OS_SPIN_LOCK_ALLOCATE( _S )		spin_lock_init( _S );</div><div class='add'>+#define OS_SPIN_LOCK_FREE( _S )</div><div class='add'>+#define OS_SPIN_LOCK_ACQUIRED( _S )		spin_lock_irq( _S )</div><div class='add'>+#define OS_SPIN_LOCK_RELEASED( _S )		spin_unlock_irq( _S );</div><div class='add'>+</div><div class='add'>+#define OS_TIMER	struct timer_list</div><div class='add'>+#define OS_TIMER_INITIAL( _T, _F, _P )			\</div><div class='add'>+{							\</div><div class='add'>+	init_timer( _T );				\</div><div class='add'>+	(_T)-&gt;function = (void *)_F##_1a;		\</div><div class='add'>+	(_T)-&gt;data = (unsigned long)_P;			\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+// _S : Millisecond</div><div class='add'>+// 20060420 At least 1 large than jiffies</div><div class='add'>+#define OS_TIMER_SET( _T, _S )					\</div><div class='add'>+{								\</div><div class='add'>+	(_T)-&gt;expires = jiffies + ((_S*HZ+999)/1000);\</div><div class='add'>+	add_timer( _T );					\</div><div class='add'>+}</div><div class='add'>+#define OS_TIMER_CANCEL( _T, _B )		del_timer_sync( _T )</div><div class='add'>+#define OS_TIMER_GET_SYS_TIME( _T )		(*_T=jiffies)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#endif // COMMON_DEF</div><div class='add'>+</div><div class='head'>diff --git a/drivers/staging/winbond/linux/sysdef.h b/drivers/staging/winbond/linux/sysdef.h<br/>new file mode 100644<br/>index 000000000000..d46d63e5c673<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/winbond/linux/sysdef.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/linux/sysdef.h</a></div><div class='hunk'>@@ -0,0 +1,73 @@</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+//</div><div class='add'>+// Winbond WLAN System Configuration defines</div><div class='add'>+//</div><div class='add'>+</div><div class='add'>+//=====================================================================</div><div class='add'>+// Current directory is Linux</div><div class='add'>+// The definition WB_LINUX is a keyword for this OS</div><div class='add'>+//=====================================================================</div><div class='add'>+#ifndef SYS_DEF_H</div><div class='add'>+#define SYS_DEF_H</div><div class='add'>+#define WB_LINUX</div><div class='add'>+#define WB_LINUX_WPA_PSK</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+//#define _IBSS_BEACON_SEQ_STICK_</div><div class='add'>+#define _USE_FALLBACK_RATE_</div><div class='add'>+//#define ANTDIV_DEFAULT_ON</div><div class='add'>+</div><div class='add'>+#define _WPA2_	// 20061122 It's needed for current Linux driver</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#ifndef _WPA_PSK_DEBUG</div><div class='add'>+#undef  _WPA_PSK_DEBUG</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+// debug print options, mark what debug you don't need</div><div class='add'>+</div><div class='add'>+#ifdef FULL_DEBUG</div><div class='add'>+#define _PE_STATE_DUMP_</div><div class='add'>+#define _PE_TX_DUMP_</div><div class='add'>+#define _PE_RX_DUMP_</div><div class='add'>+#define _PE_OID_DUMP_</div><div class='add'>+#define _PE_DTO_DUMP_</div><div class='add'>+#define _PE_REG_DUMP_</div><div class='add'>+#define _PE_USB_INI_DUMP_</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#include "common.h"	// Individual file depends on OS</div><div class='add'>+</div><div class='add'>+#include "../wb35_ver.h"</div><div class='add'>+#include "../mac_structures.h"</div><div class='add'>+#include "../ds_tkip.h"</div><div class='add'>+#include "../localpara.h"</div><div class='add'>+#include "../sme_s.h"</div><div class='add'>+#include "../scan_s.h"</div><div class='add'>+#include "../mds_s.h"</div><div class='add'>+#include "../mlme_s.h"</div><div class='add'>+#include "../bssdscpt.h"</div><div class='add'>+#include "../sme_api.h"</div><div class='add'>+#include "../gl_80211.h"</div><div class='add'>+#include "../mto.h"</div><div class='add'>+#include "../wblinux_s.h"</div><div class='add'>+#include "../wbhal_s.h"</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#include "../adapter.h"</div><div class='add'>+</div><div class='add'>+#include "../mlme_mib.h"</div><div class='add'>+#include "../mds_f.h"</div><div class='add'>+#include "../bss_f.h"</div><div class='add'>+#include "../mlmetxrx_f.h"</div><div class='add'>+#include "../mto_f.h"</div><div class='add'>+#include "../wbhal_f.h"</div><div class='add'>+#include "../wblinux_f.h"</div><div class='add'>+// Kernel Timer resolution, NDIS is 10ms, 10000us</div><div class='add'>+#define MIN_TIMEOUT_VAL	(10) //ms</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/staging/winbond/linux/wb35reg.c b/drivers/staging/winbond/linux/wb35reg.c<br/>new file mode 100644<br/>index 000000000000..2c0b454e8cad<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/winbond/linux/wb35reg.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/linux/wb35reg.c</a></div><div class='hunk'>@@ -0,0 +1,747 @@</div><div class='add'>+#include "sysdef.h"</div><div class='add'>+</div><div class='add'>+extern void phy_calibration_winbond(hw_data_t *phw_data, u32 frequency);</div><div class='add'>+</div><div class='add'>+// TRUE  : read command process successfully</div><div class='add'>+// FALSE : register not support</div><div class='add'>+// RegisterNo : start base</div><div class='add'>+// pRegisterData : data point</div><div class='add'>+// NumberOfData : number of register data</div><div class='add'>+// Flag : AUTO_INCREMENT - RegisterNo will auto increment 4</div><div class='add'>+//		  NO_INCREMENT - Function will write data into the same register</div><div class='add'>+unsigned char</div><div class='add'>+Wb35Reg_BurstWrite(phw_data_t pHwData, u16 RegisterNo, PULONG pRegisterData, u8 NumberOfData, u8 Flag)</div><div class='add'>+{</div><div class='add'>+	PWB35REG pWb35Reg = &amp;pHwData-&gt;Wb35Reg;</div><div class='add'>+	PURB		pUrb = NULL;</div><div class='add'>+	PREG_QUEUE	pRegQueue = NULL;</div><div class='add'>+	u16		UrbSize;</div><div class='add'>+	struct      usb_ctrlrequest *dr;</div><div class='add'>+	u16		i, DataSize = NumberOfData*4;</div><div class='add'>+</div><div class='add'>+	// Module shutdown</div><div class='add'>+	if (pHwData-&gt;SurpriseRemove)</div><div class='add'>+		return FALSE;</div><div class='add'>+</div><div class='add'>+	// Trying to use burst write function if use new hardware</div><div class='add'>+	UrbSize = sizeof(REG_QUEUE) + DataSize + sizeof(struct usb_ctrlrequest);</div><div class='add'>+	OS_MEMORY_ALLOC( (void* *)&amp;pRegQueue, UrbSize );</div><div class='add'>+	pUrb = wb_usb_alloc_urb(0);</div><div class='add'>+	if( pUrb &amp;&amp; pRegQueue ) {</div><div class='add'>+		pRegQueue-&gt;DIRECT = 2;// burst write register</div><div class='add'>+		pRegQueue-&gt;INDEX = RegisterNo;</div><div class='add'>+		pRegQueue-&gt;pBuffer = (PULONG)((PUCHAR)pRegQueue + sizeof(REG_QUEUE));</div><div class='add'>+		memcpy( pRegQueue-&gt;pBuffer, pRegisterData, DataSize );</div><div class='add'>+		//the function for reversing register data from little endian to big endian</div><div class='add'>+		for( i=0; i&lt;NumberOfData ; i++ )</div><div class='add'>+			pRegQueue-&gt;pBuffer[i] = cpu_to_le32( pRegQueue-&gt;pBuffer[i] );</div><div class='add'>+</div><div class='add'>+		dr = (struct usb_ctrlrequest *)((PUCHAR)pRegQueue + sizeof(REG_QUEUE) + DataSize);</div><div class='add'>+		dr-&gt;bRequestType = USB_TYPE_VENDOR | USB_DIR_OUT | USB_RECIP_DEVICE;</div><div class='add'>+		dr-&gt;bRequest = 0x04; // USB or vendor-defined request code, burst mode</div><div class='add'>+		dr-&gt;wValue = cpu_to_le16( Flag ); // 0: Register number auto-increment, 1: No auto increment</div><div class='add'>+		dr-&gt;wIndex = cpu_to_le16( RegisterNo );</div><div class='add'>+		dr-&gt;wLength = cpu_to_le16( DataSize );</div><div class='add'>+		pRegQueue-&gt;Next = NULL;</div><div class='add'>+		pRegQueue-&gt;pUsbReq = dr;</div><div class='add'>+		pRegQueue-&gt;pUrb = pUrb;</div><div class='add'>+</div><div class='add'>+		OS_SPIN_LOCK_ACQUIRED( &amp;pWb35Reg-&gt;EP0VM_spin_lock );</div><div class='add'>+		if (pWb35Reg-&gt;pRegFirst == NULL)</div><div class='add'>+			pWb35Reg-&gt;pRegFirst = pRegQueue;</div><div class='add'>+		else</div><div class='add'>+			pWb35Reg-&gt;pRegLast-&gt;Next = pRegQueue;</div><div class='add'>+		pWb35Reg-&gt;pRegLast = pRegQueue;</div><div class='add'>+</div><div class='add'>+		OS_SPIN_LOCK_RELEASED( &amp;pWb35Reg-&gt;EP0VM_spin_lock );</div><div class='add'>+</div><div class='add'>+		// Start EP0VM</div><div class='add'>+		Wb35Reg_EP0VM_start(pHwData);</div><div class='add'>+</div><div class='add'>+		return TRUE;</div><div class='add'>+	} else {</div><div class='add'>+		if (pUrb)</div><div class='add'>+			usb_free_urb(pUrb);</div><div class='add'>+		if (pRegQueue)</div><div class='add'>+			kfree(pRegQueue);</div><div class='add'>+		return FALSE;</div><div class='add'>+	}</div><div class='add'>+   return FALSE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+Wb35Reg_Update(phw_data_t pHwData,  u16 RegisterNo,  u32 RegisterValue)</div><div class='add'>+{</div><div class='add'>+	PWB35REG	pWb35Reg = &amp;pHwData-&gt;Wb35Reg;</div><div class='add'>+	switch (RegisterNo) {</div><div class='add'>+	case 0x3b0: pWb35Reg-&gt;U1B0 = RegisterValue; break;</div><div class='add'>+	case 0x3bc: pWb35Reg-&gt;U1BC_LEDConfigure = RegisterValue; break;</div><div class='add'>+	case 0x400: pWb35Reg-&gt;D00_DmaControl = RegisterValue; break;</div><div class='add'>+	case 0x800: pWb35Reg-&gt;M00_MacControl = RegisterValue; break;</div><div class='add'>+	case 0x804: pWb35Reg-&gt;M04_MulticastAddress1 = RegisterValue; break;</div><div class='add'>+	case 0x808: pWb35Reg-&gt;M08_MulticastAddress2 = RegisterValue; break;</div><div class='add'>+	case 0x824: pWb35Reg-&gt;M24_MacControl = RegisterValue; break;</div><div class='add'>+	case 0x828: pWb35Reg-&gt;M28_MacControl = RegisterValue; break;</div><div class='add'>+	case 0x82c: pWb35Reg-&gt;M2C_MacControl = RegisterValue; break;</div><div class='add'>+	case 0x838: pWb35Reg-&gt;M38_MacControl = RegisterValue; break;</div><div class='add'>+	case 0x840: pWb35Reg-&gt;M40_MacControl = RegisterValue; break;</div><div class='add'>+	case 0x844: pWb35Reg-&gt;M44_MacControl = RegisterValue; break;</div><div class='add'>+	case 0x848: pWb35Reg-&gt;M48_MacControl = RegisterValue; break;</div><div class='add'>+	case 0x84c: pWb35Reg-&gt;M4C_MacStatus = RegisterValue; break;</div><div class='add'>+	case 0x860: pWb35Reg-&gt;M60_MacControl = RegisterValue; break;</div><div class='add'>+	case 0x868: pWb35Reg-&gt;M68_MacControl = RegisterValue; break;</div><div class='add'>+	case 0x870: pWb35Reg-&gt;M70_MacControl = RegisterValue; break;</div><div class='add'>+	case 0x874: pWb35Reg-&gt;M74_MacControl = RegisterValue; break;</div><div class='add'>+	case 0x878: pWb35Reg-&gt;M78_ERPInformation = RegisterValue; break;</div><div class='add'>+	case 0x87C: pWb35Reg-&gt;M7C_MacControl = RegisterValue; break;</div><div class='add'>+	case 0x880: pWb35Reg-&gt;M80_MacControl = RegisterValue; break;</div><div class='add'>+	case 0x884: pWb35Reg-&gt;M84_MacControl = RegisterValue; break;</div><div class='add'>+	case 0x888: pWb35Reg-&gt;M88_MacControl = RegisterValue; break;</div><div class='add'>+	case 0x898: pWb35Reg-&gt;M98_MacControl = RegisterValue; break;</div><div class='add'>+	case 0x100c: pWb35Reg-&gt;BB0C = RegisterValue; break;</div><div class='add'>+	case 0x102c: pWb35Reg-&gt;BB2C = RegisterValue; break;</div><div class='add'>+	case 0x1030: pWb35Reg-&gt;BB30 = RegisterValue; break;</div><div class='add'>+	case 0x103c: pWb35Reg-&gt;BB3C = RegisterValue; break;</div><div class='add'>+	case 0x1048: pWb35Reg-&gt;BB48 = RegisterValue; break;</div><div class='add'>+	case 0x104c: pWb35Reg-&gt;BB4C = RegisterValue; break;</div><div class='add'>+	case 0x1050: pWb35Reg-&gt;BB50 = RegisterValue; break;</div><div class='add'>+	case 0x1054: pWb35Reg-&gt;BB54 = RegisterValue; break;</div><div class='add'>+	case 0x1058: pWb35Reg-&gt;BB58 = RegisterValue; break;</div><div class='add'>+	case 0x105c: pWb35Reg-&gt;BB5C = RegisterValue; break;</div><div class='add'>+	case 0x1060: pWb35Reg-&gt;BB60 = RegisterValue; break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+// TRUE  : read command process successfully</div><div class='add'>+// FALSE : register not support</div><div class='add'>+unsigned char</div><div class='add'>+Wb35Reg_WriteSync(  phw_data_t pHwData,  u16 RegisterNo,  u32 RegisterValue )</div><div class='add'>+{</div><div class='add'>+	PWB35REG pWb35Reg = &amp;pHwData-&gt;Wb35Reg;</div><div class='add'>+	int ret = -1;</div><div class='add'>+</div><div class='add'>+	// Module shutdown</div><div class='add'>+	if (pHwData-&gt;SurpriseRemove)</div><div class='add'>+		return FALSE;</div><div class='add'>+</div><div class='add'>+	RegisterValue = cpu_to_le32(RegisterValue);</div><div class='add'>+</div><div class='add'>+	// update the register by send usb message------------------------------------</div><div class='add'>+	pWb35Reg-&gt;SyncIoPause = 1;</div><div class='add'>+</div><div class='add'>+	// 20060717.5 Wait until EP0VM stop</div><div class='add'>+	while (pWb35Reg-&gt;EP0vm_state != VM_STOP)</div><div class='add'>+		OS_SLEEP(10000);</div><div class='add'>+</div><div class='add'>+	// Sync IoCallDriver</div><div class='add'>+	pWb35Reg-&gt;EP0vm_state = VM_RUNNING;</div><div class='add'>+	ret = usb_control_msg( pHwData-&gt;WbUsb.udev,</div><div class='add'>+			       usb_sndctrlpipe( pHwData-&gt;WbUsb.udev, 0 ),</div><div class='add'>+			       0x03, USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_OUT,</div><div class='add'>+			       0x0,RegisterNo, &amp;RegisterValue, 4, HZ*100 );</div><div class='add'>+	pWb35Reg-&gt;EP0vm_state = VM_STOP;</div><div class='add'>+	pWb35Reg-&gt;SyncIoPause = 0;</div><div class='add'>+</div><div class='add'>+	Wb35Reg_EP0VM_start(pHwData);</div><div class='add'>+</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		#ifdef _PE_REG_DUMP_</div><div class='add'>+		WBDEBUG(("EP0 Write register usb message sending error\n"));</div><div class='add'>+		#endif</div><div class='add'>+</div><div class='add'>+		pHwData-&gt;SurpriseRemove = 1; // 20060704.2</div><div class='add'>+		return FALSE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return TRUE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+// TRUE  : read command process successfully</div><div class='add'>+// FALSE : register not support</div><div class='add'>+unsigned char</div><div class='add'>+Wb35Reg_Write(  phw_data_t pHwData,  u16 RegisterNo,  u32 RegisterValue )</div><div class='add'>+{</div><div class='add'>+	PWB35REG	pWb35Reg = &amp;pHwData-&gt;Wb35Reg;</div><div class='add'>+	struct usb_ctrlrequest *dr;</div><div class='add'>+	PURB		pUrb = NULL;</div><div class='add'>+	PREG_QUEUE	pRegQueue = NULL;</div><div class='add'>+	u16		UrbSize;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	// Module shutdown</div><div class='add'>+	if (pHwData-&gt;SurpriseRemove)</div><div class='add'>+		return FALSE;</div><div class='add'>+</div><div class='add'>+	// update the register by send urb request------------------------------------</div><div class='add'>+	UrbSize = sizeof(REG_QUEUE) + sizeof(struct usb_ctrlrequest);</div><div class='add'>+	OS_MEMORY_ALLOC( (void* *)&amp;pRegQueue, UrbSize );</div><div class='add'>+	pUrb = wb_usb_alloc_urb(0);</div><div class='add'>+	if (pUrb &amp;&amp; pRegQueue) {</div><div class='add'>+		pRegQueue-&gt;DIRECT = 1;// burst write register</div><div class='add'>+		pRegQueue-&gt;INDEX = RegisterNo;</div><div class='add'>+		pRegQueue-&gt;VALUE = cpu_to_le32(RegisterValue);</div><div class='add'>+		pRegQueue-&gt;RESERVED_VALID = FALSE;</div><div class='add'>+		dr = (struct usb_ctrlrequest *)((PUCHAR)pRegQueue + sizeof(REG_QUEUE));</div><div class='add'>+		dr-&gt;bRequestType = USB_TYPE_VENDOR|USB_DIR_OUT |USB_RECIP_DEVICE;</div><div class='add'>+		dr-&gt;bRequest = 0x03; // USB or vendor-defined request code, burst mode</div><div class='add'>+		dr-&gt;wValue = cpu_to_le16(0x0);</div><div class='add'>+		dr-&gt;wIndex = cpu_to_le16(RegisterNo);</div><div class='add'>+		dr-&gt;wLength = cpu_to_le16(4);</div><div class='add'>+</div><div class='add'>+		// Enter the sending queue</div><div class='add'>+		pRegQueue-&gt;Next = NULL;</div><div class='add'>+		pRegQueue-&gt;pUsbReq = dr;</div><div class='add'>+		pRegQueue-&gt;pUrb = pUrb;</div><div class='add'>+</div><div class='add'>+		OS_SPIN_LOCK_ACQUIRED(&amp;pWb35Reg-&gt;EP0VM_spin_lock );</div><div class='add'>+		if (pWb35Reg-&gt;pRegFirst == NULL)</div><div class='add'>+			pWb35Reg-&gt;pRegFirst = pRegQueue;</div><div class='add'>+		else</div><div class='add'>+			pWb35Reg-&gt;pRegLast-&gt;Next = pRegQueue;</div><div class='add'>+		pWb35Reg-&gt;pRegLast = pRegQueue;</div><div class='add'>+</div><div class='add'>+		OS_SPIN_LOCK_RELEASED( &amp;pWb35Reg-&gt;EP0VM_spin_lock );</div><div class='add'>+</div><div class='add'>+		// Start EP0VM</div><div class='add'>+		Wb35Reg_EP0VM_start(pHwData);</div><div class='add'>+</div><div class='add'>+		return TRUE;</div><div class='add'>+	} else {</div><div class='add'>+		if (pUrb)</div><div class='add'>+			usb_free_urb(pUrb);</div><div class='add'>+		kfree(pRegQueue);</div><div class='add'>+		return FALSE;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+//This command will be executed with a user defined value. When it completes,</div><div class='add'>+//this value is useful. For example, hal_set_current_channel will use it.</div><div class='add'>+// TRUE  : read command process successfully</div><div class='add'>+// FALSE : register not support</div><div class='add'>+unsigned char</div><div class='add'>+Wb35Reg_WriteWithCallbackValue( phw_data_t pHwData, u16 RegisterNo, u32 RegisterValue,</div><div class='add'>+				PCHAR pValue, s8 Len)</div><div class='add'>+{</div><div class='add'>+	PWB35REG	pWb35Reg = &amp;pHwData-&gt;Wb35Reg;</div><div class='add'>+	struct usb_ctrlrequest *dr;</div><div class='add'>+	PURB		pUrb = NULL;</div><div class='add'>+	PREG_QUEUE	pRegQueue = NULL;</div><div class='add'>+	u16		UrbSize;</div><div class='add'>+</div><div class='add'>+	// Module shutdown</div><div class='add'>+	if (pHwData-&gt;SurpriseRemove)</div><div class='add'>+		return FALSE;</div><div class='add'>+</div><div class='add'>+	// update the register by send urb request------------------------------------</div><div class='add'>+	UrbSize = sizeof(REG_QUEUE) + sizeof(struct usb_ctrlrequest);</div><div class='add'>+	OS_MEMORY_ALLOC((void* *) &amp;pRegQueue, UrbSize );</div><div class='add'>+	pUrb = wb_usb_alloc_urb(0);</div><div class='add'>+	if (pUrb &amp;&amp; pRegQueue) {</div><div class='add'>+		pRegQueue-&gt;DIRECT = 1;// burst write register</div><div class='add'>+		pRegQueue-&gt;INDEX = RegisterNo;</div><div class='add'>+		pRegQueue-&gt;VALUE = cpu_to_le32(RegisterValue);</div><div class='add'>+		//NOTE : Users must guarantee the size of value will not exceed the buffer size.</div><div class='add'>+		memcpy(pRegQueue-&gt;RESERVED, pValue, Len);</div><div class='add'>+		pRegQueue-&gt;RESERVED_VALID = TRUE;</div><div class='add'>+		dr = (struct usb_ctrlrequest *)((PUCHAR)pRegQueue + sizeof(REG_QUEUE));</div><div class='add'>+		dr-&gt;bRequestType = USB_TYPE_VENDOR|USB_DIR_OUT |USB_RECIP_DEVICE;</div><div class='add'>+		dr-&gt;bRequest = 0x03; // USB or vendor-defined request code, burst mode</div><div class='add'>+		dr-&gt;wValue = cpu_to_le16(0x0);</div><div class='add'>+		dr-&gt;wIndex = cpu_to_le16(RegisterNo);</div><div class='add'>+		dr-&gt;wLength = cpu_to_le16(4);</div><div class='add'>+</div><div class='add'>+		// Enter the sending queue</div><div class='add'>+		pRegQueue-&gt;Next = NULL;</div><div class='add'>+		pRegQueue-&gt;pUsbReq = dr;</div><div class='add'>+		pRegQueue-&gt;pUrb = pUrb;</div><div class='add'>+		OS_SPIN_LOCK_ACQUIRED (&amp;pWb35Reg-&gt;EP0VM_spin_lock );</div><div class='add'>+		if( pWb35Reg-&gt;pRegFirst == NULL )</div><div class='add'>+			pWb35Reg-&gt;pRegFirst = pRegQueue;</div><div class='add'>+		else</div><div class='add'>+			pWb35Reg-&gt;pRegLast-&gt;Next = pRegQueue;</div><div class='add'>+		pWb35Reg-&gt;pRegLast = pRegQueue;</div><div class='add'>+</div><div class='add'>+		OS_SPIN_LOCK_RELEASED ( &amp;pWb35Reg-&gt;EP0VM_spin_lock );</div><div class='add'>+</div><div class='add'>+		// Start EP0VM</div><div class='add'>+		Wb35Reg_EP0VM_start(pHwData);</div><div class='add'>+		return TRUE;</div><div class='add'>+	} else {</div><div class='add'>+		if (pUrb)</div><div class='add'>+			usb_free_urb(pUrb);</div><div class='add'>+		kfree(pRegQueue);</div><div class='add'>+		return FALSE;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+// TRUE  : read command process successfully</div><div class='add'>+// FALSE : register not support</div><div class='add'>+// pRegisterValue : It must be a resident buffer due to asynchronous read register.</div><div class='add'>+unsigned char</div><div class='add'>+Wb35Reg_ReadSync(  phw_data_t pHwData,  u16 RegisterNo,   PULONG pRegisterValue )</div><div class='add'>+{</div><div class='add'>+	PWB35REG pWb35Reg = &amp;pHwData-&gt;Wb35Reg;</div><div class='add'>+	PULONG	pltmp = pRegisterValue;</div><div class='add'>+	int ret = -1;</div><div class='add'>+</div><div class='add'>+	// Module shutdown</div><div class='add'>+	if (pHwData-&gt;SurpriseRemove)</div><div class='add'>+		return FALSE;</div><div class='add'>+</div><div class='add'>+	// Read the register by send usb message------------------------------------</div><div class='add'>+</div><div class='add'>+	pWb35Reg-&gt;SyncIoPause = 1;</div><div class='add'>+</div><div class='add'>+	// 20060717.5 Wait until EP0VM stop</div><div class='add'>+	while (pWb35Reg-&gt;EP0vm_state != VM_STOP)</div><div class='add'>+		OS_SLEEP(10000);</div><div class='add'>+</div><div class='add'>+	pWb35Reg-&gt;EP0vm_state = VM_RUNNING;</div><div class='add'>+	ret = usb_control_msg( pHwData-&gt;WbUsb.udev,</div><div class='add'>+			       usb_rcvctrlpipe(pHwData-&gt;WbUsb.udev, 0),</div><div class='add'>+			       0x01, USB_TYPE_VENDOR|USB_RECIP_DEVICE|USB_DIR_IN,</div><div class='add'>+			       0x0, RegisterNo, pltmp, 4, HZ*100 );</div><div class='add'>+</div><div class='add'>+	*pRegisterValue = cpu_to_le32(*pltmp);</div><div class='add'>+</div><div class='add'>+	pWb35Reg-&gt;EP0vm_state = VM_STOP;</div><div class='add'>+</div><div class='add'>+	Wb35Reg_Update( pHwData, RegisterNo, *pRegisterValue );</div><div class='add'>+	pWb35Reg-&gt;SyncIoPause = 0;</div><div class='add'>+</div><div class='add'>+	Wb35Reg_EP0VM_start( pHwData );</div><div class='add'>+</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		#ifdef _PE_REG_DUMP_</div><div class='add'>+		WBDEBUG(("EP0 Read register usb message sending error\n"));</div><div class='add'>+		#endif</div><div class='add'>+</div><div class='add'>+		pHwData-&gt;SurpriseRemove = 1; // 20060704.2</div><div class='add'>+		return FALSE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return TRUE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+// TRUE  : read command process successfully</div><div class='add'>+// FALSE : register not support</div><div class='add'>+// pRegisterValue : It must be a resident buffer due to asynchronous read register.</div><div class='add'>+unsigned char</div><div class='add'>+Wb35Reg_Read(phw_data_t pHwData, u16 RegisterNo,  PULONG pRegisterValue )</div><div class='add'>+{</div><div class='add'>+	PWB35REG	pWb35Reg = &amp;pHwData-&gt;Wb35Reg;</div><div class='add'>+	struct usb_ctrlrequest * dr;</div><div class='add'>+	PURB		pUrb;</div><div class='add'>+	PREG_QUEUE	pRegQueue;</div><div class='add'>+	u16		UrbSize;</div><div class='add'>+</div><div class='add'>+	// Module shutdown</div><div class='add'>+	if (pHwData-&gt;SurpriseRemove)</div><div class='add'>+		return FALSE;</div><div class='add'>+</div><div class='add'>+	// update the variable by send Urb to read register ------------------------------------</div><div class='add'>+	UrbSize = sizeof(REG_QUEUE) + sizeof(struct usb_ctrlrequest);</div><div class='add'>+	OS_MEMORY_ALLOC( (void* *)&amp;pRegQueue, UrbSize );</div><div class='add'>+	pUrb = wb_usb_alloc_urb(0);</div><div class='add'>+	if( pUrb &amp;&amp; pRegQueue )</div><div class='add'>+	{</div><div class='add'>+		pRegQueue-&gt;DIRECT = 0;// read register</div><div class='add'>+		pRegQueue-&gt;INDEX = RegisterNo;</div><div class='add'>+		pRegQueue-&gt;pBuffer = pRegisterValue;</div><div class='add'>+		dr = (struct usb_ctrlrequest *)((PUCHAR)pRegQueue + sizeof(REG_QUEUE));</div><div class='add'>+		dr-&gt;bRequestType = USB_TYPE_VENDOR|USB_RECIP_DEVICE|USB_DIR_IN;</div><div class='add'>+		dr-&gt;bRequest = 0x01; // USB or vendor-defined request code, burst mode</div><div class='add'>+		dr-&gt;wValue = cpu_to_le16(0x0);</div><div class='add'>+		dr-&gt;wIndex = cpu_to_le16 (RegisterNo);</div><div class='add'>+		dr-&gt;wLength = cpu_to_le16 (4);</div><div class='add'>+</div><div class='add'>+		// Enter the sending queue</div><div class='add'>+		pRegQueue-&gt;Next = NULL;</div><div class='add'>+		pRegQueue-&gt;pUsbReq = dr;</div><div class='add'>+		pRegQueue-&gt;pUrb = pUrb;</div><div class='add'>+		OS_SPIN_LOCK_ACQUIRED ( &amp;pWb35Reg-&gt;EP0VM_spin_lock );</div><div class='add'>+		if( pWb35Reg-&gt;pRegFirst == NULL )</div><div class='add'>+			pWb35Reg-&gt;pRegFirst = pRegQueue;</div><div class='add'>+		else</div><div class='add'>+			pWb35Reg-&gt;pRegLast-&gt;Next = pRegQueue;</div><div class='add'>+		pWb35Reg-&gt;pRegLast = pRegQueue;</div><div class='add'>+</div><div class='add'>+		OS_SPIN_LOCK_RELEASED( &amp;pWb35Reg-&gt;EP0VM_spin_lock );</div><div class='add'>+</div><div class='add'>+		// Start EP0VM</div><div class='add'>+		Wb35Reg_EP0VM_start( pHwData );</div><div class='add'>+</div><div class='add'>+		return TRUE;</div><div class='add'>+	} else {</div><div class='add'>+		if (pUrb)</div><div class='add'>+			usb_free_urb( pUrb );</div><div class='add'>+		kfree(pRegQueue);</div><div class='add'>+		return FALSE;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+Wb35Reg_EP0VM_start(  phw_data_t pHwData )</div><div class='add'>+{</div><div class='add'>+	PWB35REG pWb35Reg = &amp;pHwData-&gt;Wb35Reg;</div><div class='add'>+</div><div class='add'>+	if (OS_ATOMIC_INC( pHwData-&gt;Adapter, &amp;pWb35Reg-&gt;RegFireCount) == 1) {</div><div class='add'>+		pWb35Reg-&gt;EP0vm_state = VM_RUNNING;</div><div class='add'>+		Wb35Reg_EP0VM(pHwData);</div><div class='add'>+	} else</div><div class='add'>+		OS_ATOMIC_DEC( pHwData-&gt;Adapter, &amp;pWb35Reg-&gt;RegFireCount );</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+Wb35Reg_EP0VM(phw_data_t pHwData )</div><div class='add'>+{</div><div class='add'>+	PWB35REG	pWb35Reg = &amp;pHwData-&gt;Wb35Reg;</div><div class='add'>+	PURB		pUrb;</div><div class='add'>+	struct usb_ctrlrequest *dr;</div><div class='add'>+	PULONG		pBuffer;</div><div class='add'>+	int			ret = -1;</div><div class='add'>+	PREG_QUEUE	pRegQueue;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	if (pWb35Reg-&gt;SyncIoPause)</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	if (pHwData-&gt;SurpriseRemove)</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	// Get the register data and send to USB through Irp</div><div class='add'>+	OS_SPIN_LOCK_ACQUIRED( &amp;pWb35Reg-&gt;EP0VM_spin_lock );</div><div class='add'>+	pRegQueue = pWb35Reg-&gt;pRegFirst;</div><div class='add'>+	OS_SPIN_LOCK_RELEASED( &amp;pWb35Reg-&gt;EP0VM_spin_lock );</div><div class='add'>+</div><div class='add'>+	if (!pRegQueue)</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	// Get an Urb, send it</div><div class='add'>+	pUrb = (PURB)pRegQueue-&gt;pUrb;</div><div class='add'>+</div><div class='add'>+	dr = pRegQueue-&gt;pUsbReq;</div><div class='add'>+	pUrb = pRegQueue-&gt;pUrb;</div><div class='add'>+	pBuffer = pRegQueue-&gt;pBuffer;</div><div class='add'>+	if (pRegQueue-&gt;DIRECT == 1) // output</div><div class='add'>+		pBuffer = &amp;pRegQueue-&gt;VALUE;</div><div class='add'>+</div><div class='add'>+	usb_fill_control_urb( pUrb, pHwData-&gt;WbUsb.udev,</div><div class='add'>+			      REG_DIRECTION(pHwData-&gt;WbUsb.udev,pRegQueue),</div><div class='add'>+			      (PUCHAR)dr,pBuffer,cpu_to_le16(dr-&gt;wLength),</div><div class='add'>+			      Wb35Reg_EP0VM_complete, (void*)pHwData);</div><div class='add'>+</div><div class='add'>+	pWb35Reg-&gt;EP0vm_state = VM_RUNNING;</div><div class='add'>+</div><div class='add'>+	ret = wb_usb_submit_urb( pUrb );</div><div class='add'>+</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+#ifdef _PE_REG_DUMP_</div><div class='add'>+		WBDEBUG(("EP0 Irp sending error\n"));</div><div class='add'>+#endif</div><div class='add'>+		goto cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+ cleanup:</div><div class='add'>+	pWb35Reg-&gt;EP0vm_state = VM_STOP;</div><div class='add'>+	OS_ATOMIC_DEC( pHwData-&gt;Adapter, &amp;pWb35Reg-&gt;RegFireCount );</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+Wb35Reg_EP0VM_complete(PURB pUrb)</div><div class='add'>+{</div><div class='add'>+	phw_data_t  pHwData = (phw_data_t)pUrb-&gt;context;</div><div class='add'>+	PWB35REG	pWb35Reg = &amp;pHwData-&gt;Wb35Reg;</div><div class='add'>+	PREG_QUEUE	pRegQueue;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	// Variable setting</div><div class='add'>+	pWb35Reg-&gt;EP0vm_state = VM_COMPLETED;</div><div class='add'>+	pWb35Reg-&gt;EP0VM_status = pUrb-&gt;status;</div><div class='add'>+</div><div class='add'>+	if (pHwData-&gt;SurpriseRemove) { // Let WbWlanHalt to handle surprise remove</div><div class='add'>+		pWb35Reg-&gt;EP0vm_state = VM_STOP;</div><div class='add'>+		OS_ATOMIC_DEC( pHwData-&gt;Adapter, &amp;pWb35Reg-&gt;RegFireCount );</div><div class='add'>+	} else {</div><div class='add'>+		// Complete to send, remove the URB from the first</div><div class='add'>+		OS_SPIN_LOCK_ACQUIRED( &amp;pWb35Reg-&gt;EP0VM_spin_lock );</div><div class='add'>+		pRegQueue = pWb35Reg-&gt;pRegFirst;</div><div class='add'>+		if (pRegQueue == pWb35Reg-&gt;pRegLast)</div><div class='add'>+			pWb35Reg-&gt;pRegLast = NULL;</div><div class='add'>+		pWb35Reg-&gt;pRegFirst = pWb35Reg-&gt;pRegFirst-&gt;Next;</div><div class='add'>+		OS_SPIN_LOCK_RELEASED( &amp;pWb35Reg-&gt;EP0VM_spin_lock );</div><div class='add'>+</div><div class='add'>+		if (pWb35Reg-&gt;EP0VM_status) {</div><div class='add'>+#ifdef _PE_REG_DUMP_</div><div class='add'>+			WBDEBUG(("EP0 IoCompleteRoutine return error\n"));</div><div class='add'>+			DebugUsbdStatusInformation( pWb35Reg-&gt;EP0VM_status );</div><div class='add'>+#endif</div><div class='add'>+			pWb35Reg-&gt;EP0vm_state = VM_STOP;</div><div class='add'>+			pHwData-&gt;SurpriseRemove = 1;</div><div class='add'>+		} else {</div><div class='add'>+			// Success. Update the result</div><div class='add'>+</div><div class='add'>+			// Start the next send</div><div class='add'>+			Wb35Reg_EP0VM(pHwData);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+   		kfree(pRegQueue);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	usb_free_urb(pUrb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+Wb35Reg_destroy(phw_data_t pHwData)</div><div class='add'>+{</div><div class='add'>+	PWB35REG	pWb35Reg = &amp;pHwData-&gt;Wb35Reg;</div><div class='add'>+	PURB		pUrb;</div><div class='add'>+	PREG_QUEUE	pRegQueue;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	Uxx_power_off_procedure(pHwData);</div><div class='add'>+</div><div class='add'>+	// Wait for Reg operation completed</div><div class='add'>+	do {</div><div class='add'>+		OS_SLEEP(10000); // Delay for waiting function enter 940623.1.a</div><div class='add'>+	} while (pWb35Reg-&gt;EP0vm_state != VM_STOP);</div><div class='add'>+	OS_SLEEP(10000);  // Delay for waiting function enter 940623.1.b</div><div class='add'>+</div><div class='add'>+	// Release all the data in RegQueue</div><div class='add'>+	OS_SPIN_LOCK_ACQUIRED( &amp;pWb35Reg-&gt;EP0VM_spin_lock );</div><div class='add'>+	pRegQueue = pWb35Reg-&gt;pRegFirst;</div><div class='add'>+	while (pRegQueue) {</div><div class='add'>+		if (pRegQueue == pWb35Reg-&gt;pRegLast)</div><div class='add'>+			pWb35Reg-&gt;pRegLast = NULL;</div><div class='add'>+		pWb35Reg-&gt;pRegFirst = pWb35Reg-&gt;pRegFirst-&gt;Next;</div><div class='add'>+</div><div class='add'>+		pUrb = pRegQueue-&gt;pUrb;</div><div class='add'>+		OS_SPIN_LOCK_RELEASED( &amp;pWb35Reg-&gt;EP0VM_spin_lock );</div><div class='add'>+		if (pUrb) {</div><div class='add'>+			usb_free_urb(pUrb);</div><div class='add'>+			kfree(pRegQueue);</div><div class='add'>+		} else {</div><div class='add'>+			#ifdef _PE_REG_DUMP_</div><div class='add'>+			WBDEBUG(("EP0 queue release error\n"));</div><div class='add'>+			#endif</div><div class='add'>+		}</div><div class='add'>+		OS_SPIN_LOCK_ACQUIRED( &amp;pWb35Reg-&gt;EP0VM_spin_lock );</div><div class='add'>+</div><div class='add'>+		pRegQueue = pWb35Reg-&gt;pRegFirst;</div><div class='add'>+	}</div><div class='add'>+	OS_SPIN_LOCK_RELEASED( &amp;pWb35Reg-&gt;EP0VM_spin_lock );</div><div class='add'>+</div><div class='add'>+	// Free resource</div><div class='add'>+	OS_SPIN_LOCK_FREE(  &amp;pWb35Reg-&gt;EP0VM_spin_lock );</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+//====================================================================================</div><div class='add'>+// The function can be run in passive-level only.</div><div class='add'>+//====================================================================================</div><div class='add'>+unsigned char Wb35Reg_initial(phw_data_t pHwData)</div><div class='add'>+{</div><div class='add'>+	PWB35REG pWb35Reg=&amp;pHwData-&gt;Wb35Reg;</div><div class='add'>+	u32 ltmp;</div><div class='add'>+	u32 SoftwareSet, VCO_trim, TxVga, Region_ScanInterval;</div><div class='add'>+</div><div class='add'>+	// Spin lock is acquired for read and write IRP command</div><div class='add'>+	OS_SPIN_LOCK_ALLOCATE( &amp;pWb35Reg-&gt;EP0VM_spin_lock );</div><div class='add'>+</div><div class='add'>+	// Getting RF module type from EEPROM ------------------------------------</div><div class='add'>+	Wb35Reg_WriteSync( pHwData, 0x03b4, 0x080d0000 ); // Start EEPROM access + Read + address(0x0d)</div><div class='add'>+	Wb35Reg_ReadSync( pHwData, 0x03b4, &amp;ltmp );</div><div class='add'>+</div><div class='add'>+	//Update RF module type and determine the PHY type by inf or EEPROM</div><div class='add'>+	pWb35Reg-&gt;EEPROMPhyType = (u8)( ltmp &amp; 0xff );</div><div class='add'>+	// 0 V MAX2825, 1 V MAX2827, 2 V MAX2828, 3 V MAX2829</div><div class='add'>+	// 16V AL2230, 17 - AL7230, 18 - AL2230S</div><div class='add'>+	// 32 Reserved</div><div class='add'>+	// 33 - W89RF242(TxVGA 0~19), 34 - W89RF242(TxVGA 0~34)</div><div class='add'>+	if (pWb35Reg-&gt;EEPROMPhyType != RF_DECIDE_BY_INF) {</div><div class='add'>+		if( (pWb35Reg-&gt;EEPROMPhyType == RF_MAXIM_2825)	||</div><div class='add'>+			(pWb35Reg-&gt;EEPROMPhyType == RF_MAXIM_2827)	||</div><div class='add'>+			(pWb35Reg-&gt;EEPROMPhyType == RF_MAXIM_2828)	||</div><div class='add'>+			(pWb35Reg-&gt;EEPROMPhyType == RF_MAXIM_2829)	||</div><div class='add'>+			(pWb35Reg-&gt;EEPROMPhyType == RF_MAXIM_V1)	||</div><div class='add'>+			(pWb35Reg-&gt;EEPROMPhyType == RF_AIROHA_2230)	||</div><div class='add'>+			(pWb35Reg-&gt;EEPROMPhyType == RF_AIROHA_2230S)    ||</div><div class='add'>+			(pWb35Reg-&gt;EEPROMPhyType == RF_AIROHA_7230)	||</div><div class='add'>+			(pWb35Reg-&gt;EEPROMPhyType == RF_WB_242)		||</div><div class='add'>+			(pWb35Reg-&gt;EEPROMPhyType == RF_WB_242_1))</div><div class='add'>+			pHwData-&gt;phy_type = pWb35Reg-&gt;EEPROMPhyType;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	// Power On procedure running. The relative parameter will be set according to phy_type</div><div class='add'>+	Uxx_power_on_procedure( pHwData );</div><div class='add'>+</div><div class='add'>+	// Reading MAC address</div><div class='add'>+	Uxx_ReadEthernetAddress( pHwData );</div><div class='add'>+</div><div class='add'>+	// Read VCO trim for RF parameter</div><div class='add'>+	Wb35Reg_WriteSync( pHwData, 0x03b4, 0x08200000 );</div><div class='add'>+	Wb35Reg_ReadSync( pHwData, 0x03b4, &amp;VCO_trim );</div><div class='add'>+</div><div class='add'>+	// Read Antenna On/Off of software flag</div><div class='add'>+	Wb35Reg_WriteSync( pHwData, 0x03b4, 0x08210000 );</div><div class='add'>+	Wb35Reg_ReadSync( pHwData, 0x03b4, &amp;SoftwareSet );</div><div class='add'>+</div><div class='add'>+	// Read TXVGA</div><div class='add'>+	Wb35Reg_WriteSync( pHwData, 0x03b4, 0x08100000 );</div><div class='add'>+	Wb35Reg_ReadSync( pHwData, 0x03b4, &amp;TxVga );</div><div class='add'>+</div><div class='add'>+	// Get Scan interval setting from EEPROM offset 0x1c</div><div class='add'>+	Wb35Reg_WriteSync( pHwData, 0x03b4, 0x081d0000 );</div><div class='add'>+	Wb35Reg_ReadSync( pHwData, 0x03b4, &amp;Region_ScanInterval );</div><div class='add'>+</div><div class='add'>+	// Update Ethernet address</div><div class='add'>+	memcpy( pHwData-&gt;CurrentMacAddress, pHwData-&gt;PermanentMacAddress, ETH_LENGTH_OF_ADDRESS );</div><div class='add'>+</div><div class='add'>+	// Update software variable</div><div class='add'>+	pHwData-&gt;SoftwareSet = (u16)(SoftwareSet &amp; 0xffff);</div><div class='add'>+	TxVga &amp;= 0x000000ff;</div><div class='add'>+	pHwData-&gt;PowerIndexFromEEPROM = (u8)TxVga;</div><div class='add'>+	pHwData-&gt;VCO_trim = (u8)VCO_trim &amp; 0xff;</div><div class='add'>+	if (pHwData-&gt;VCO_trim == 0xff)</div><div class='add'>+		pHwData-&gt;VCO_trim = 0x28;</div><div class='add'>+</div><div class='add'>+	pWb35Reg-&gt;EEPROMRegion = (u8)(Region_ScanInterval&gt;&gt;8); // 20060720</div><div class='add'>+	if( pWb35Reg-&gt;EEPROMRegion&lt;1 || pWb35Reg-&gt;EEPROMRegion&gt;6 )</div><div class='add'>+		pWb35Reg-&gt;EEPROMRegion = REGION_AUTO;</div><div class='add'>+</div><div class='add'>+	//For Get Tx VGA from EEPROM 20060315.5 move here</div><div class='add'>+	GetTxVgaFromEEPROM( pHwData );</div><div class='add'>+</div><div class='add'>+	// Set Scan Interval</div><div class='add'>+	pHwData-&gt;Scan_Interval = (u8)(Region_ScanInterval &amp; 0xff) * 10;</div><div class='add'>+	if ((pHwData-&gt;Scan_Interval == 2550) || (pHwData-&gt;Scan_Interval &lt; 10)) // Is default setting 0xff * 10</div><div class='add'>+		pHwData-&gt;Scan_Interval = SCAN_MAX_CHNL_TIME;</div><div class='add'>+</div><div class='add'>+	// Initial register</div><div class='add'>+	RFSynthesizer_initial(pHwData);</div><div class='add'>+</div><div class='add'>+	BBProcessor_initial(pHwData); // Async write, must wait until complete</div><div class='add'>+</div><div class='add'>+	Wb35Reg_phy_calibration(pHwData);</div><div class='add'>+</div><div class='add'>+	Mxx_initial(pHwData);</div><div class='add'>+	Dxx_initial(pHwData);</div><div class='add'>+</div><div class='add'>+	if (pHwData-&gt;SurpriseRemove)</div><div class='add'>+		return FALSE;</div><div class='add'>+	else</div><div class='add'>+		return TRUE; // Initial fail</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+//===================================================================================</div><div class='add'>+//  CardComputeCrc --</div><div class='add'>+//</div><div class='add'>+//  Description:</div><div class='add'>+//    Runs the AUTODIN II CRC algorithm on buffer Buffer of length, Length.</div><div class='add'>+//</div><div class='add'>+//  Arguments:</div><div class='add'>+//    Buffer - the input buffer</div><div class='add'>+//    Length - the length of Buffer</div><div class='add'>+//</div><div class='add'>+//  Return Value:</div><div class='add'>+//    The 32-bit CRC value.</div><div class='add'>+//</div><div class='add'>+//  Note:</div><div class='add'>+//    This is adapted from the comments in the assembly language</div><div class='add'>+//    version in _GENREQ.ASM of the DWB NE1000/2000 driver.</div><div class='add'>+//==================================================================================</div><div class='add'>+u32</div><div class='add'>+CardComputeCrc(PUCHAR Buffer, u32 Length)</div><div class='add'>+{</div><div class='add'>+    u32 Crc, Carry;</div><div class='add'>+    u32  i, j;</div><div class='add'>+    u8 CurByte;</div><div class='add'>+</div><div class='add'>+    Crc = 0xffffffff;</div><div class='add'>+</div><div class='add'>+    for (i = 0; i &lt; Length; i++) {</div><div class='add'>+</div><div class='add'>+        CurByte = Buffer[i];</div><div class='add'>+</div><div class='add'>+        for (j = 0; j &lt; 8; j++) {</div><div class='add'>+</div><div class='add'>+            Carry     = ((Crc &amp; 0x80000000) ? 1 : 0) ^ (CurByte &amp; 0x01);</div><div class='add'>+            Crc     &lt;&lt;= 1;</div><div class='add'>+            CurByte &gt;&gt;= 1;</div><div class='add'>+</div><div class='add'>+            if (Carry) {</div><div class='add'>+                Crc =(Crc ^ 0x04c11db6) | Carry;</div><div class='add'>+            }</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    return Crc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+//==================================================================</div><div class='add'>+// BitReverse --</div><div class='add'>+//   Reverse the bits in the input argument, dwData, which is</div><div class='add'>+//   regarded as a string of bits with the length, DataLength.</div><div class='add'>+//</div><div class='add'>+// Arguments:</div><div class='add'>+//   dwData     :</div><div class='add'>+//   DataLength :</div><div class='add'>+//</div><div class='add'>+// Return:</div><div class='add'>+//   The converted value.</div><div class='add'>+//==================================================================</div><div class='add'>+u32 BitReverse( u32 dwData, u32 DataLength)</div><div class='add'>+{</div><div class='add'>+	u32   HalfLength, i, j;</div><div class='add'>+	u32   BitA, BitB;</div><div class='add'>+</div><div class='add'>+	if ( DataLength &lt;= 0)       return 0;   // No conversion is done.</div><div class='add'>+	dwData = dwData &amp; (0xffffffff &gt;&gt; (32 - DataLength));</div><div class='add'>+</div><div class='add'>+	HalfLength = DataLength / 2;</div><div class='add'>+	for ( i = 0, j = DataLength-1 ; i &lt; HalfLength; i++, j--)</div><div class='add'>+	{</div><div class='add'>+		BitA = GetBit( dwData, i);</div><div class='add'>+		BitB = GetBit( dwData, j);</div><div class='add'>+		if (BitA &amp;&amp; !BitB) {</div><div class='add'>+			dwData = ClearBit( dwData, i);</div><div class='add'>+			dwData = SetBit( dwData, j);</div><div class='add'>+		} else if (!BitA &amp;&amp; BitB) {</div><div class='add'>+			dwData = SetBit( dwData, i);</div><div class='add'>+			dwData = ClearBit( dwData, j);</div><div class='add'>+		} else</div><div class='add'>+		{</div><div class='add'>+			// Do nothing since these two bits are of the save values.</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return dwData;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void Wb35Reg_phy_calibration(  phw_data_t pHwData )</div><div class='add'>+{</div><div class='add'>+	u32 BB3c, BB54;</div><div class='add'>+</div><div class='add'>+	if ((pHwData-&gt;phy_type == RF_WB_242) ||</div><div class='add'>+		(pHwData-&gt;phy_type == RF_WB_242_1)) {</div><div class='add'>+		phy_calibration_winbond ( pHwData, 2412 ); // Sync operation</div><div class='add'>+		Wb35Reg_ReadSync( pHwData, 0x103c, &amp;BB3c );</div><div class='add'>+		Wb35Reg_ReadSync( pHwData, 0x1054, &amp;BB54 );</div><div class='add'>+</div><div class='add'>+		pHwData-&gt;BB3c_cal = BB3c;</div><div class='add'>+		pHwData-&gt;BB54_cal = BB54;</div><div class='add'>+</div><div class='add'>+		RFSynthesizer_initial(pHwData);</div><div class='add'>+		BBProcessor_initial(pHwData); // Async operation</div><div class='add'>+</div><div class='add'>+		Wb35Reg_WriteSync( pHwData, 0x103c, BB3c );</div><div class='add'>+		Wb35Reg_WriteSync( pHwData, 0x1054, BB54 );</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='head'>diff --git a/drivers/staging/winbond/linux/wb35reg_f.h b/drivers/staging/winbond/linux/wb35reg_f.h<br/>new file mode 100644<br/>index 000000000000..38e2906b51a7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/winbond/linux/wb35reg_f.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/linux/wb35reg_f.h</a></div><div class='hunk'>@@ -0,0 +1,56 @@</div><div class='add'>+//====================================</div><div class='add'>+// Interface function declare</div><div class='add'>+//====================================</div><div class='add'>+unsigned char Wb35Reg_initial(  phw_data_t pHwData );</div><div class='add'>+void Uxx_power_on_procedure(  phw_data_t pHwData );</div><div class='add'>+void Uxx_power_off_procedure(  phw_data_t pHwData );</div><div class='add'>+void Uxx_ReadEthernetAddress(  phw_data_t pHwData );</div><div class='add'>+void Dxx_initial(  phw_data_t pHwData );</div><div class='add'>+void Mxx_initial(  phw_data_t pHwData );</div><div class='add'>+void RFSynthesizer_initial(  phw_data_t pHwData );</div><div class='add'>+//void RFSynthesizer_SwitchingChannel(  phw_data_t pHwData,  s8 Channel );</div><div class='add'>+void RFSynthesizer_SwitchingChannel(  phw_data_t pHwData,  ChanInfo Channel );</div><div class='add'>+void BBProcessor_initial(  phw_data_t pHwData );</div><div class='add'>+void BBProcessor_RateChanging(  phw_data_t pHwData,  u8 rate ); // 20060613.1</div><div class='add'>+//void RF_RateChanging(  phw_data_t pHwData,  u8 rate ); // 20060626.5.c Add</div><div class='add'>+u8 RFSynthesizer_SetPowerIndex(  phw_data_t pHwData,  u8 PowerIndex );</div><div class='add'>+u8 RFSynthesizer_SetMaxim2828_24Power(  phw_data_t,  u8 index );</div><div class='add'>+u8 RFSynthesizer_SetMaxim2828_50Power(  phw_data_t,  u8 index );</div><div class='add'>+u8 RFSynthesizer_SetMaxim2827_24Power(  phw_data_t,  u8 index );</div><div class='add'>+u8 RFSynthesizer_SetMaxim2827_50Power(  phw_data_t,  u8 index );</div><div class='add'>+u8 RFSynthesizer_SetMaxim2825Power(  phw_data_t,  u8 index );</div><div class='add'>+u8 RFSynthesizer_SetAiroha2230Power(  phw_data_t,  u8 index );</div><div class='add'>+u8 RFSynthesizer_SetAiroha7230Power(  phw_data_t,  u8 index );</div><div class='add'>+u8 RFSynthesizer_SetWinbond242Power(  phw_data_t,  u8 index );</div><div class='add'>+void GetTxVgaFromEEPROM(  phw_data_t pHwData );</div><div class='add'>+void EEPROMTxVgaAdjust(  phw_data_t pHwData ); // 20060619.5 Add</div><div class='add'>+</div><div class='add'>+#define RFWriteControlData( _A, _V ) Wb35Reg_Write( _A, 0x0864, _V )</div><div class='add'>+</div><div class='add'>+void Wb35Reg_destroy(  phw_data_t pHwData );</div><div class='add'>+</div><div class='add'>+unsigned char Wb35Reg_Read(  phw_data_t pHwData,  u16 RegisterNo,   PULONG pRegisterValue );</div><div class='add'>+unsigned char Wb35Reg_ReadSync(  phw_data_t pHwData,  u16 RegisterNo,   PULONG pRegisterValue );</div><div class='add'>+unsigned char Wb35Reg_Write(  phw_data_t pHwData,  u16 RegisterNo,  u32 RegisterValue );</div><div class='add'>+unsigned char Wb35Reg_WriteSync(  phw_data_t pHwData,  u16 RegisterNo,  u32 RegisterValue );</div><div class='add'>+unsigned char Wb35Reg_WriteWithCallbackValue(  phw_data_t pHwData,</div><div class='add'>+								 u16 RegisterNo,</div><div class='add'>+								 u32 RegisterValue,</div><div class='add'>+								 PCHAR pValue,</div><div class='add'>+								 s8	Len);</div><div class='add'>+unsigned char Wb35Reg_BurstWrite(  phw_data_t pHwData,  u16 RegisterNo,  PULONG pRegisterData,  u8 NumberOfData,  u8 Flag );</div><div class='add'>+</div><div class='add'>+void Wb35Reg_EP0VM(  phw_data_t pHwData );</div><div class='add'>+void Wb35Reg_EP0VM_start(  phw_data_t pHwData );</div><div class='add'>+void Wb35Reg_EP0VM_complete(  PURB pUrb );</div><div class='add'>+</div><div class='add'>+u32 BitReverse( u32 dwData, u32 DataLength);</div><div class='add'>+</div><div class='add'>+void CardGetMulticastBit(   u8 Address[MAC_ADDR_LENGTH],  u8 *Byte,  u8 *Value );</div><div class='add'>+u32 CardComputeCrc(  PUCHAR Buffer,  u32 Length );</div><div class='add'>+</div><div class='add'>+void Wb35Reg_phy_calibration(  phw_data_t pHwData );</div><div class='add'>+void Wb35Reg_Update(  phw_data_t pHwData,  u16 RegisterNo,  u32 RegisterValue );</div><div class='add'>+unsigned char adjust_TXVGA_for_iq_mag(  phw_data_t pHwData );</div><div class='add'>+</div><div class='add'>+</div><div class='head'>diff --git a/drivers/staging/winbond/linux/wb35reg_s.h b/drivers/staging/winbond/linux/wb35reg_s.h<br/>new file mode 100644<br/>index 000000000000..a7595b1e7336<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/winbond/linux/wb35reg_s.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/linux/wb35reg_s.h</a></div><div class='hunk'>@@ -0,0 +1,170 @@</div><div class='add'>+//=======================================================================================</div><div class='add'>+/*</div><div class='add'>+				HAL setting function</div><div class='add'>+</div><div class='add'>+		========================================</div><div class='add'>+		|Uxx| 	|Dxx|	|Mxx|	|BB|	|RF|</div><div class='add'>+		========================================</div><div class='add'>+			|					|</div><div class='add'>+		Wb35Reg_Read		Wb35Reg_Write</div><div class='add'>+</div><div class='add'>+		----------------------------------------</div><div class='add'>+				WbUsb_CallUSBDASync					supplied By WbUsb module</div><div class='add'>+*/</div><div class='add'>+//=======================================================================================</div><div class='add'>+</div><div class='add'>+#define     GetBit( dwData, i)      ( dwData &amp; (0x00000001 &lt;&lt; i))</div><div class='add'>+#define     SetBit( dwData, i)      ( dwData | (0x00000001 &lt;&lt; i))</div><div class='add'>+#define     ClearBit( dwData, i)    ( dwData &amp; ~(0x00000001 &lt;&lt; i))</div><div class='add'>+</div><div class='add'>+#define		IGNORE_INCREMENT	0</div><div class='add'>+#define		AUTO_INCREMENT		0</div><div class='add'>+#define		NO_INCREMENT		1</div><div class='add'>+#define REG_DIRECTION(_x,_y)   ((_y)-&gt;DIRECT ==0 ? usb_rcvctrlpipe(_x,0) : usb_sndctrlpipe(_x,0))</div><div class='add'>+#define REG_BUF_SIZE(_x)       ((_x)-&gt;bRequest== 0x04 ? cpu_to_le16((_x)-&gt;wLength) : 4)</div><div class='add'>+</div><div class='add'>+// 20060613.2 Add the follow definition</div><div class='add'>+#define BB48_DEFAULT_AL2230_11B		0x0033447c</div><div class='add'>+#define BB4C_DEFAULT_AL2230_11B		0x0A00FEFF</div><div class='add'>+#define BB48_DEFAULT_AL2230_11G		0x00332C1B</div><div class='add'>+#define BB4C_DEFAULT_AL2230_11G		0x0A00FEFF</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define BB48_DEFAULT_WB242_11B		0x00292315	//backoff  2dB</div><div class='add'>+#define BB4C_DEFAULT_WB242_11B		0x0800FEFF	//backoff  2dB</div><div class='add'>+//#define BB48_DEFAULT_WB242_11B		0x00201B11	//backoff  4dB</div><div class='add'>+//#define BB4C_DEFAULT_WB242_11B		0x0600FF00	//backoff  4dB</div><div class='add'>+#define BB48_DEFAULT_WB242_11G		0x00453B24</div><div class='add'>+#define BB4C_DEFAULT_WB242_11G		0x0E00FEFF</div><div class='add'>+</div><div class='add'>+//====================================</div><div class='add'>+// Default setting for Mxx</div><div class='add'>+//====================================</div><div class='add'>+#define DEFAULT_CWMIN					31		//(M2C) CWmin. Its value is in the range 0-31.</div><div class='add'>+#define DEFAULT_CWMAX					1023	//(M2C) CWmax. Its value is in the range 0-1023.</div><div class='add'>+#define DEFAULT_AID						1		//(M34) AID. Its value is in the range 1-2007.</div><div class='add'>+</div><div class='add'>+#ifdef _USE_FALLBACK_RATE_</div><div class='add'>+#define DEFAULT_RATE_RETRY_LIMIT		2		//(M38) as named</div><div class='add'>+#else</div><div class='add'>+#define DEFAULT_RATE_RETRY_LIMIT		7		//(M38) as named</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define DEFAULT_LONG_RETRY_LIMIT		7		//(M38) LongRetryLimit. Its value is in the range 0-15.</div><div class='add'>+#define DEFAULT_SHORT_RETRY_LIMIT		7		//(M38) ShortRetryLimit. Its value is in the range 0-15.</div><div class='add'>+#define DEFAULT_PIFST					25		//(M3C) PIFS Time. Its value is in the range 0-65535.</div><div class='add'>+#define DEFAULT_EIFST					354		//(M3C) EIFS Time. Its value is in the range 0-1048575.</div><div class='add'>+#define DEFAULT_DIFST					45		//(M3C) DIFS Time. Its value is in the range 0-65535.</div><div class='add'>+#define DEFAULT_SIFST					5		//(M3C) SIFS Time. Its value is in the range 0-65535.</div><div class='add'>+#define DEFAULT_OSIFST					10		//(M3C) Original SIFS Time. Its value is in the range 0-15.</div><div class='add'>+#define DEFAULT_ATIMWD					0		//(M40) ATIM Window. Its value is in the range 0-65535.</div><div class='add'>+#define DEFAULT_SLOT_TIME				20		//(M40) ($) SlotTime. Its value is in the range 0-255.</div><div class='add'>+#define DEFAULT_MAX_TX_MSDU_LIFE_TIME	512	//(M44) MaxTxMSDULifeTime. Its value is in the range 0-4294967295.</div><div class='add'>+#define DEFAULT_BEACON_INTERVAL			500		//(M48) Beacon Interval. Its value is in the range 0-65535.</div><div class='add'>+#define DEFAULT_PROBE_DELAY_TIME		200		//(M48) Probe Delay Time. Its value is in the range 0-65535.</div><div class='add'>+#define DEFAULT_PROTOCOL_VERSION		0		//(M4C)</div><div class='add'>+#define DEFAULT_MAC_POWER_STATE			2		//(M4C) 2: MAC at power active</div><div class='add'>+#define DEFAULT_DTIM_ALERT_TIME			0</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+typedef struct _REG_QUEUE</div><div class='add'>+{</div><div class='add'>+    struct  urb *pUrb;</div><div class='add'>+	void*	pUsbReq;</div><div class='add'>+	void*	Next;</div><div class='add'>+	union</div><div class='add'>+	{</div><div class='add'>+		u32	VALUE;</div><div class='add'>+		PULONG	pBuffer;</div><div class='add'>+	};</div><div class='add'>+	u8	RESERVED[4];// space reserved for communication</div><div class='add'>+</div><div class='add'>+    u16	INDEX; // For storing the register index</div><div class='add'>+    u8	RESERVED_VALID;	//Indicate whether the RESERVED space is valid at this command.</div><div class='add'>+	u8	DIRECT; // 0:In   1:Out</div><div class='add'>+</div><div class='add'>+} REG_QUEUE, *PREG_QUEUE;</div><div class='add'>+</div><div class='add'>+//====================================</div><div class='add'>+// Internal variable for module</div><div class='add'>+//====================================</div><div class='add'>+#define MAX_SQ3_FILTER_SIZE		5</div><div class='add'>+typedef struct _WB35REG</div><div class='add'>+{</div><div class='add'>+	//============================</div><div class='add'>+	// Register Bank backup</div><div class='add'>+	//============================</div><div class='add'>+	u32	U1B0;			//bit16 record the h/w radio on/off status</div><div class='add'>+	u32	U1BC_LEDConfigure;</div><div class='add'>+	u32	D00_DmaControl;</div><div class='add'>+	u32	M00_MacControl;</div><div class='add'>+	union {</div><div class='add'>+		struct {</div><div class='add'>+			u32	M04_MulticastAddress1;</div><div class='add'>+			u32	M08_MulticastAddress2;</div><div class='add'>+		};</div><div class='add'>+		u8		Multicast[8];	// contents of card multicast registers</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	u32	M24_MacControl;</div><div class='add'>+	u32	M28_MacControl;</div><div class='add'>+	u32	M2C_MacControl;</div><div class='add'>+	u32	M38_MacControl;</div><div class='add'>+	u32	M3C_MacControl; // 20060214 backup only</div><div class='add'>+	u32	M40_MacControl;</div><div class='add'>+	u32	M44_MacControl; // 20060214 backup only</div><div class='add'>+	u32	M48_MacControl; // 20060214 backup only</div><div class='add'>+	u32	M4C_MacStatus;</div><div class='add'>+	u32	M60_MacControl; // 20060214 backup only</div><div class='add'>+	u32	M68_MacControl; // 20060214 backup only</div><div class='add'>+	u32	M70_MacControl; // 20060214 backup only</div><div class='add'>+	u32	M74_MacControl; // 20060214 backup only</div><div class='add'>+	u32	M78_ERPInformation;//930206.2.b</div><div class='add'>+	u32	M7C_MacControl; // 20060214 backup only</div><div class='add'>+	u32	M80_MacControl; // 20060214 backup only</div><div class='add'>+	u32	M84_MacControl; // 20060214 backup only</div><div class='add'>+	u32	M88_MacControl; // 20060214 backup only</div><div class='add'>+	u32	M98_MacControl; // 20060214 backup only</div><div class='add'>+</div><div class='add'>+	//[20040722 WK]</div><div class='add'>+	//Baseband register</div><div class='add'>+	u32	BB0C;	// Used for LNA calculation</div><div class='add'>+	u32	BB2C;	//</div><div class='add'>+	u32	BB30;	//11b acquisition control register</div><div class='add'>+	u32	BB3C;</div><div class='add'>+	u32	BB48;	// 20051221.1.a 20060613.1 Fix OBW issue of 11b/11g rate</div><div class='add'>+	u32	BB4C;	// 20060613.1  Fix OBW issue of 11b/11g rate</div><div class='add'>+	u32	BB50;	//mode control register</div><div class='add'>+	u32	BB54;</div><div class='add'>+	u32 	BB58;	//IQ_ALPHA</div><div class='add'>+	u32	BB5C;	// For test</div><div class='add'>+	u32	BB60;	// for WTO read value</div><div class='add'>+</div><div class='add'>+	//-------------------</div><div class='add'>+	// VM</div><div class='add'>+	//-------------------</div><div class='add'>+	OS_SPIN_LOCK	EP0VM_spin_lock; // 4B</div><div class='add'>+	u32	        EP0VM_status;//$$</div><div class='add'>+	PREG_QUEUE	    pRegFirst;</div><div class='add'>+	PREG_QUEUE	    pRegLast;</div><div class='add'>+	OS_ATOMIC       RegFireCount;</div><div class='add'>+</div><div class='add'>+	// Hardware status</div><div class='add'>+	u8	EP0vm_state;</div><div class='add'>+	u8	mac_power_save;</div><div class='add'>+	u8	EEPROMPhyType; // 0 ~ 15 for Maxim (0 ĄV MAX2825, 1 ĄV MAX2827, 2 ĄV MAX2828, 3 ĄV MAX2829),</div><div class='add'>+						   // 16 ~ 31 for Airoha (16 ĄV AL2230, 11 - AL7230)</div><div class='add'>+						   // 32 ~ Reserved</div><div class='add'>+						   // 33 ~ 47 For WB242 ( 33 - WB242, 34 - WB242 with new Txvga 0.5 db step)</div><div class='add'>+						   // 48 ~ 255 ARE RESERVED.</div><div class='add'>+	u8	EEPROMRegion;	//Region setting in EEPROM</div><div class='add'>+</div><div class='add'>+	u32	SyncIoPause; // If user use the Sync Io to access Hw, then pause the async access</div><div class='add'>+</div><div class='add'>+	u8	LNAValue[4]; //Table for speed up running</div><div class='add'>+	u32	SQ3_filter[MAX_SQ3_FILTER_SIZE];</div><div class='add'>+	u32	SQ3_index;</div><div class='add'>+</div><div class='add'>+} WB35REG, *PWB35REG;</div><div class='add'>+</div><div class='add'>+</div><div class='head'>diff --git a/drivers/staging/winbond/linux/wb35rx.c b/drivers/staging/winbond/linux/wb35rx.c<br/>new file mode 100644<br/>index 000000000000..26157eb3d5a2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/winbond/linux/wb35rx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/linux/wb35rx.c</a></div><div class='hunk'>@@ -0,0 +1,337 @@</div><div class='add'>+//============================================================================</div><div class='add'>+//  Copyright (c) 1996-2002 Winbond Electronic Corporation</div><div class='add'>+//</div><div class='add'>+//  Module Name:</div><div class='add'>+//    Wb35Rx.c</div><div class='add'>+//</div><div class='add'>+//  Abstract:</div><div class='add'>+//    Processing the Rx message from down layer</div><div class='add'>+//</div><div class='add'>+//============================================================================</div><div class='add'>+#include "sysdef.h"</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+void Wb35Rx_start(phw_data_t pHwData)</div><div class='add'>+{</div><div class='add'>+	PWB35RX pWb35Rx = &amp;pHwData-&gt;Wb35Rx;</div><div class='add'>+</div><div class='add'>+	// Allow only one thread to run into the Wb35Rx() function</div><div class='add'>+	if (OS_ATOMIC_INC(pHwData-&gt;Adapter, &amp;pWb35Rx-&gt;RxFireCounter) == 1) {</div><div class='add'>+		pWb35Rx-&gt;EP3vm_state = VM_RUNNING;</div><div class='add'>+		Wb35Rx(pHwData);</div><div class='add'>+	} else</div><div class='add'>+		OS_ATOMIC_DEC(pHwData-&gt;Adapter, &amp;pWb35Rx-&gt;RxFireCounter);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+// This function cannot reentrain</div><div class='add'>+void Wb35Rx(  phw_data_t pHwData )</div><div class='add'>+{</div><div class='add'>+	PWB35RX	pWb35Rx = &amp;pHwData-&gt;Wb35Rx;</div><div class='add'>+	PUCHAR	pRxBufferAddress;</div><div class='add'>+	PURB	pUrb = (PURB)pWb35Rx-&gt;RxUrb;</div><div class='add'>+	int	retv;</div><div class='add'>+	u32	RxBufferId;</div><div class='add'>+</div><div class='add'>+	//</div><div class='add'>+	// Issuing URB</div><div class='add'>+	//</div><div class='add'>+	do {</div><div class='add'>+		if (pHwData-&gt;SurpriseRemove || pHwData-&gt;HwStop)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (pWb35Rx-&gt;rx_halt)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		// Get RxBuffer's ID</div><div class='add'>+		RxBufferId = pWb35Rx-&gt;RxBufferId;</div><div class='add'>+		if (!pWb35Rx-&gt;RxOwner[RxBufferId]) {</div><div class='add'>+			// It's impossible to run here.</div><div class='add'>+			#ifdef _PE_RX_DUMP_</div><div class='add'>+			WBDEBUG(("Rx driver fifo unavailable\n"));</div><div class='add'>+			#endif</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		// Update buffer point, then start to bulkin the data from USB</div><div class='add'>+		pWb35Rx-&gt;RxBufferId++;</div><div class='add'>+		pWb35Rx-&gt;RxBufferId %= MAX_USB_RX_BUFFER_NUMBER;</div><div class='add'>+</div><div class='add'>+		pWb35Rx-&gt;CurrentRxBufferId = RxBufferId;</div><div class='add'>+</div><div class='add'>+		if (1 != OS_MEMORY_ALLOC((void* *)&amp;pWb35Rx-&gt;pDRx, MAX_USB_RX_BUFFER)) {</div><div class='add'>+			printk("w35und: Rx memory alloc failed\n");</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		pRxBufferAddress = pWb35Rx-&gt;pDRx;</div><div class='add'>+</div><div class='add'>+		usb_fill_bulk_urb(pUrb, pHwData-&gt;WbUsb.udev,</div><div class='add'>+				  usb_rcvbulkpipe(pHwData-&gt;WbUsb.udev, 3),</div><div class='add'>+				  pRxBufferAddress, MAX_USB_RX_BUFFER,</div><div class='add'>+				  Wb35Rx_Complete, pHwData);</div><div class='add'>+</div><div class='add'>+		pWb35Rx-&gt;EP3vm_state = VM_RUNNING;</div><div class='add'>+</div><div class='add'>+		retv = wb_usb_submit_urb(pUrb);</div><div class='add'>+</div><div class='add'>+		if (retv != 0) {</div><div class='add'>+			printk("Rx URB sending error\n");</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		return;</div><div class='add'>+	} while(FALSE);</div><div class='add'>+</div><div class='add'>+	// VM stop</div><div class='add'>+	pWb35Rx-&gt;EP3vm_state = VM_STOP;</div><div class='add'>+	OS_ATOMIC_DEC( pHwData-&gt;Adapter, &amp;pWb35Rx-&gt;RxFireCounter );</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void Wb35Rx_Complete(PURB pUrb)</div><div class='add'>+{</div><div class='add'>+	phw_data_t	pHwData = pUrb-&gt;context;</div><div class='add'>+	PWB35RX		pWb35Rx = &amp;pHwData-&gt;Wb35Rx;</div><div class='add'>+	PUCHAR		pRxBufferAddress;</div><div class='add'>+	u32		SizeCheck;</div><div class='add'>+	u16		BulkLength;</div><div class='add'>+	u32		RxBufferId;</div><div class='add'>+	R00_DESCRIPTOR 	R00;</div><div class='add'>+</div><div class='add'>+	// Variable setting</div><div class='add'>+	pWb35Rx-&gt;EP3vm_state = VM_COMPLETED;</div><div class='add'>+	pWb35Rx-&gt;EP3VM_status = pUrb-&gt;status;//Store the last result of Irp</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		RxBufferId = pWb35Rx-&gt;CurrentRxBufferId;</div><div class='add'>+</div><div class='add'>+		pRxBufferAddress = pWb35Rx-&gt;pDRx;</div><div class='add'>+		BulkLength = (u16)pUrb-&gt;actual_length;</div><div class='add'>+</div><div class='add'>+		// The IRP is completed</div><div class='add'>+		pWb35Rx-&gt;EP3vm_state = VM_COMPLETED;</div><div class='add'>+</div><div class='add'>+		if (pHwData-&gt;SurpriseRemove || pHwData-&gt;HwStop) // Must be here, or RxBufferId is invalid</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (pWb35Rx-&gt;rx_halt)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		// Start to process the data only in successful condition</div><div class='add'>+		pWb35Rx-&gt;RxOwner[ RxBufferId ] = 0; // Set the owner to driver</div><div class='add'>+		R00.value = le32_to_cpu(*(PULONG)pRxBufferAddress);</div><div class='add'>+</div><div class='add'>+		// The URB is completed, check the result</div><div class='add'>+		if (pWb35Rx-&gt;EP3VM_status != 0) {</div><div class='add'>+			#ifdef _PE_USB_STATE_DUMP_</div><div class='add'>+			WBDEBUG(("EP3 IoCompleteRoutine return error\n"));</div><div class='add'>+			DebugUsbdStatusInformation( pWb35Rx-&gt;EP3VM_status );</div><div class='add'>+			#endif</div><div class='add'>+			pWb35Rx-&gt;EP3vm_state = VM_STOP;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		// 20060220 For recovering. check if operating in single USB mode</div><div class='add'>+		if (!HAL_USB_MODE_BURST(pHwData)) {</div><div class='add'>+			SizeCheck = R00.R00_receive_byte_count;  //20060926 anson's endian</div><div class='add'>+			if ((SizeCheck &amp; 0x03) &gt; 0)</div><div class='add'>+				SizeCheck -= 4;</div><div class='add'>+			SizeCheck = (SizeCheck + 3) &amp; ~0x03;</div><div class='add'>+			SizeCheck += 12; // 8 + 4 badbeef</div><div class='add'>+			if ((BulkLength &gt; 1600) ||</div><div class='add'>+				(SizeCheck &gt; 1600) ||</div><div class='add'>+				(BulkLength != SizeCheck) ||</div><div class='add'>+				(BulkLength == 0)) { // Add for fail Urb</div><div class='add'>+				pWb35Rx-&gt;EP3vm_state = VM_STOP;</div><div class='add'>+				pWb35Rx-&gt;Ep3ErrorCount2++;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		// Indicating the receiving data</div><div class='add'>+		pWb35Rx-&gt;ByteReceived += BulkLength;</div><div class='add'>+		pWb35Rx-&gt;RxBufferSize[ RxBufferId ] = BulkLength;</div><div class='add'>+</div><div class='add'>+		if (!pWb35Rx-&gt;RxOwner[ RxBufferId ])</div><div class='add'>+			Wb35Rx_indicate(pHwData);</div><div class='add'>+</div><div class='add'>+		kfree(pWb35Rx-&gt;pDRx);</div><div class='add'>+		// Do the next receive</div><div class='add'>+		Wb35Rx(pHwData);</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	} while(FALSE);</div><div class='add'>+</div><div class='add'>+	pWb35Rx-&gt;RxOwner[ RxBufferId ] = 1; // Set the owner to hardware</div><div class='add'>+	OS_ATOMIC_DEC( pHwData-&gt;Adapter, &amp;pWb35Rx-&gt;RxFireCounter );</div><div class='add'>+	pWb35Rx-&gt;EP3vm_state = VM_STOP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+//=====================================================================================</div><div class='add'>+unsigned char Wb35Rx_initial(phw_data_t pHwData)</div><div class='add'>+{</div><div class='add'>+	PWB35RX pWb35Rx = &amp;pHwData-&gt;Wb35Rx;</div><div class='add'>+</div><div class='add'>+	// Initial the Buffer Queue</div><div class='add'>+	Wb35Rx_reset_descriptor( pHwData );</div><div class='add'>+</div><div class='add'>+	pWb35Rx-&gt;RxUrb = wb_usb_alloc_urb(0);</div><div class='add'>+	return (!!pWb35Rx-&gt;RxUrb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void Wb35Rx_stop(phw_data_t pHwData)</div><div class='add'>+{</div><div class='add'>+	PWB35RX pWb35Rx = &amp;pHwData-&gt;Wb35Rx;</div><div class='add'>+</div><div class='add'>+	// Canceling the Irp if already sends it out.</div><div class='add'>+	if (pWb35Rx-&gt;EP3vm_state == VM_RUNNING) {</div><div class='add'>+		usb_unlink_urb( pWb35Rx-&gt;RxUrb ); // Only use unlink, let Wb35Rx_destroy to free them</div><div class='add'>+		#ifdef _PE_RX_DUMP_</div><div class='add'>+		WBDEBUG(("EP3 Rx stop\n"));</div><div class='add'>+		#endif</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+// Needs process context</div><div class='add'>+void Wb35Rx_destroy(phw_data_t pHwData)</div><div class='add'>+{</div><div class='add'>+	PWB35RX pWb35Rx = &amp;pHwData-&gt;Wb35Rx;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		OS_SLEEP(10000); // Delay for waiting function enter 940623.1.a</div><div class='add'>+	} while (pWb35Rx-&gt;EP3vm_state != VM_STOP);</div><div class='add'>+	OS_SLEEP(10000); // Delay for waiting function exit 940623.1.b</div><div class='add'>+</div><div class='add'>+	if (pWb35Rx-&gt;RxUrb)</div><div class='add'>+		usb_free_urb( pWb35Rx-&gt;RxUrb );</div><div class='add'>+	#ifdef _PE_RX_DUMP_</div><div class='add'>+	WBDEBUG(("Wb35Rx_destroy OK\n"));</div><div class='add'>+	#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void Wb35Rx_reset_descriptor(  phw_data_t pHwData )</div><div class='add'>+{</div><div class='add'>+	PWB35RX pWb35Rx = &amp;pHwData-&gt;Wb35Rx;</div><div class='add'>+	u32	i;</div><div class='add'>+</div><div class='add'>+	pWb35Rx-&gt;ByteReceived = 0;</div><div class='add'>+	pWb35Rx-&gt;RxProcessIndex = 0;</div><div class='add'>+	pWb35Rx-&gt;RxBufferId = 0;</div><div class='add'>+	pWb35Rx-&gt;EP3vm_state = VM_STOP;</div><div class='add'>+	pWb35Rx-&gt;rx_halt = 0;</div><div class='add'>+</div><div class='add'>+	// Initial the Queue. The last buffer is reserved for used if the Rx resource is unavailable.</div><div class='add'>+	for( i=0; i&lt;MAX_USB_RX_BUFFER_NUMBER; i++ )</div><div class='add'>+		pWb35Rx-&gt;RxOwner[i] = 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void Wb35Rx_adjust(PDESCRIPTOR pRxDes)</div><div class='add'>+{</div><div class='add'>+	PULONG	pRxBufferAddress;</div><div class='add'>+	u32	DecryptionMethod;</div><div class='add'>+	u32	i;</div><div class='add'>+	u16	BufferSize;</div><div class='add'>+</div><div class='add'>+	DecryptionMethod = pRxDes-&gt;R01.R01_decryption_method;</div><div class='add'>+	pRxBufferAddress = pRxDes-&gt;buffer_address[0];</div><div class='add'>+	BufferSize = pRxDes-&gt;buffer_size[0];</div><div class='add'>+</div><div class='add'>+	// Adjust the last part of data. Only data left</div><div class='add'>+	BufferSize -= 4; // For CRC-32</div><div class='add'>+	if (DecryptionMethod)</div><div class='add'>+		BufferSize -= 4;</div><div class='add'>+	if (DecryptionMethod == 3) // For CCMP</div><div class='add'>+		BufferSize -= 4;</div><div class='add'>+</div><div class='add'>+	// Adjust the IV field which after 802.11 header and ICV field.</div><div class='add'>+	if (DecryptionMethod == 1) // For WEP</div><div class='add'>+	{</div><div class='add'>+		for( i=6; i&gt;0; i-- )</div><div class='add'>+			pRxBufferAddress[i] = pRxBufferAddress[i-1];</div><div class='add'>+		pRxDes-&gt;buffer_address[0] = pRxBufferAddress + 1;</div><div class='add'>+		BufferSize -= 4; // 4 byte for IV</div><div class='add'>+	}</div><div class='add'>+	else if( DecryptionMethod ) // For TKIP and CCMP</div><div class='add'>+	{</div><div class='add'>+		for (i=7; i&gt;1; i--)</div><div class='add'>+			pRxBufferAddress[i] = pRxBufferAddress[i-2];</div><div class='add'>+		pRxDes-&gt;buffer_address[0] = pRxBufferAddress + 2;//Update the descriptor, shift 8 byte</div><div class='add'>+		BufferSize -= 8; // 8 byte for IV + ICV</div><div class='add'>+	}</div><div class='add'>+	pRxDes-&gt;buffer_size[0] = BufferSize;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+extern void packet_came(char *pRxBufferAddress, int PacketSize);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+u16 Wb35Rx_indicate(phw_data_t pHwData)</div><div class='add'>+{</div><div class='add'>+	DESCRIPTOR	RxDes;</div><div class='add'>+	PWB35RX	pWb35Rx = &amp;pHwData-&gt;Wb35Rx;</div><div class='add'>+	PUCHAR		pRxBufferAddress;</div><div class='add'>+	u16		PacketSize;</div><div class='add'>+	u16		stmp, BufferSize, stmp2 = 0;</div><div class='add'>+	u32		RxBufferId;</div><div class='add'>+</div><div class='add'>+	// Only one thread be allowed to run into the following</div><div class='add'>+	do {</div><div class='add'>+		RxBufferId = pWb35Rx-&gt;RxProcessIndex;</div><div class='add'>+		if (pWb35Rx-&gt;RxOwner[ RxBufferId ]) //Owner by VM</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		pWb35Rx-&gt;RxProcessIndex++;</div><div class='add'>+		pWb35Rx-&gt;RxProcessIndex %= MAX_USB_RX_BUFFER_NUMBER;</div><div class='add'>+</div><div class='add'>+		pRxBufferAddress = pWb35Rx-&gt;pDRx;</div><div class='add'>+		BufferSize = pWb35Rx-&gt;RxBufferSize[ RxBufferId ];</div><div class='add'>+</div><div class='add'>+		// Parse the bulkin buffer</div><div class='add'>+		while (BufferSize &gt;= 4) {</div><div class='add'>+			if ((cpu_to_le32(*(PULONG)pRxBufferAddress) &amp; 0x0fffffff) == RX_END_TAG) //Is ending? 921002.9.a</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			// Get the R00 R01 first</div><div class='add'>+			RxDes.R00.value = le32_to_cpu(*(PULONG)pRxBufferAddress);</div><div class='add'>+			PacketSize = (u16)RxDes.R00.R00_receive_byte_count;</div><div class='add'>+			RxDes.R01.value = le32_to_cpu(*((PULONG)(pRxBufferAddress+4)));</div><div class='add'>+			// For new DMA 4k</div><div class='add'>+			if ((PacketSize &amp; 0x03) &gt; 0)</div><div class='add'>+				PacketSize -= 4;</div><div class='add'>+</div><div class='add'>+			// Basic check for Rx length. Is length valid?</div><div class='add'>+			if (PacketSize &gt; MAX_PACKET_SIZE) {</div><div class='add'>+				#ifdef _PE_RX_DUMP_</div><div class='add'>+				WBDEBUG(("Serious ERROR : Rx data size too long, size =%d\n", PacketSize));</div><div class='add'>+				#endif</div><div class='add'>+</div><div class='add'>+				pWb35Rx-&gt;EP3vm_state = VM_STOP;</div><div class='add'>+				pWb35Rx-&gt;Ep3ErrorCount2++;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			// Start to process Rx buffer</div><div class='add'>+//			RxDes.Descriptor_ID = RxBufferId; // Due to synchronous indicate, the field doesn't necessary to use.</div><div class='add'>+			BufferSize -= 8; //subtract 8 byte for 35's USB header length</div><div class='add'>+			pRxBufferAddress += 8;</div><div class='add'>+</div><div class='add'>+			RxDes.buffer_address[0] = pRxBufferAddress;</div><div class='add'>+			RxDes.buffer_size[0] = PacketSize;</div><div class='add'>+			RxDes.buffer_number = 1;</div><div class='add'>+			RxDes.buffer_start_index = 0;</div><div class='add'>+			RxDes.buffer_total_size = RxDes.buffer_size[0];</div><div class='add'>+			Wb35Rx_adjust(&amp;RxDes);</div><div class='add'>+</div><div class='add'>+			packet_came(pRxBufferAddress, PacketSize);</div><div class='add'>+</div><div class='add'>+			// Move RxBuffer point to the next</div><div class='add'>+			stmp = PacketSize + 3;</div><div class='add'>+			stmp &amp;= ~0x03; // 4n alignment</div><div class='add'>+			pRxBufferAddress += stmp;</div><div class='add'>+			BufferSize -= stmp;</div><div class='add'>+			stmp2 += stmp;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		// Reclaim resource</div><div class='add'>+		pWb35Rx-&gt;RxOwner[ RxBufferId ] = 1;</div><div class='add'>+	} while(TRUE);</div><div class='add'>+</div><div class='add'>+	return stmp2;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='head'>diff --git a/drivers/staging/winbond/linux/wb35rx_f.h b/drivers/staging/winbond/linux/wb35rx_f.h<br/>new file mode 100644<br/>index 000000000000..daa3e73042bd<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/winbond/linux/wb35rx_f.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/linux/wb35rx_f.h</a></div><div class='hunk'>@@ -0,0 +1,17 @@</div><div class='add'>+//====================================</div><div class='add'>+// Interface function declare</div><div class='add'>+//====================================</div><div class='add'>+void		Wb35Rx_reset_descriptor(  phw_data_t pHwData );</div><div class='add'>+unsigned char		Wb35Rx_initial(  phw_data_t pHwData );</div><div class='add'>+void		Wb35Rx_destroy(  phw_data_t pHwData );</div><div class='add'>+void		Wb35Rx_stop(  phw_data_t pHwData );</div><div class='add'>+u16		Wb35Rx_indicate(  phw_data_t pHwData );</div><div class='add'>+void		Wb35Rx_adjust(  PDESCRIPTOR pRxDes );</div><div class='add'>+void		Wb35Rx_start(  phw_data_t pHwData );</div><div class='add'>+</div><div class='add'>+void		Wb35Rx(  phw_data_t pHwData );</div><div class='add'>+void		Wb35Rx_Complete(  PURB pUrb );</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='head'>diff --git a/drivers/staging/winbond/linux/wb35rx_s.h b/drivers/staging/winbond/linux/wb35rx_s.h<br/>new file mode 100644<br/>index 000000000000..53b831fdeb78<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/winbond/linux/wb35rx_s.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/linux/wb35rx_s.h</a></div><div class='hunk'>@@ -0,0 +1,48 @@</div><div class='add'>+//============================================================================</div><div class='add'>+// wb35rx.h --</div><div class='add'>+//============================================================================</div><div class='add'>+</div><div class='add'>+// Definition for this module used</div><div class='add'>+#define MAX_USB_RX_BUFFER	4096	// This parameter must be 4096 931130.4.f</div><div class='add'>+</div><div class='add'>+#define MAX_USB_RX_BUFFER_NUMBER	ETHERNET_RX_DESCRIPTORS		// Maximum 254, 255 is RESERVED ID</div><div class='add'>+#define RX_INTERFACE				0	// Interface 1</div><div class='add'>+#define RX_PIPE						2	// Pipe 3</div><div class='add'>+#define MAX_PACKET_SIZE				1600 //1568	// 8 + 1532 + 4 + 24(IV EIV MIC ICV CRC) for check DMA data 931130.4.g</div><div class='add'>+#define RX_END_TAG					0x0badbeef</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+//====================================</div><div class='add'>+// Internal variable for module</div><div class='add'>+//====================================</div><div class='add'>+typedef struct _WB35RX</div><div class='add'>+{</div><div class='add'>+	u32			ByteReceived;// For calculating throughput of BulkIn</div><div class='add'>+	OS_ATOMIC		RxFireCounter;// Does Wb35Rx module fire?</div><div class='add'>+</div><div class='add'>+	u8	RxBuffer[ MAX_USB_RX_BUFFER_NUMBER ][ ((MAX_USB_RX_BUFFER+3) &amp; ~0x03 ) ];</div><div class='add'>+	u16	RxBufferSize[ ((MAX_USB_RX_BUFFER_NUMBER+1) &amp; ~0x01) ];</div><div class='add'>+	u8	RxOwner[ ((MAX_USB_RX_BUFFER_NUMBER+3) &amp; ~0x03 ) ];//Ownership of buffer  0: SW 1:HW</div><div class='add'>+</div><div class='add'>+	u32	RxProcessIndex;//The next index to process</div><div class='add'>+	u32	RxBufferId;</div><div class='add'>+	u32	EP3vm_state;</div><div class='add'>+</div><div class='add'>+	u32	rx_halt; // For VM stopping</div><div class='add'>+</div><div class='add'>+	u16	MoreDataSize;</div><div class='add'>+	u16	PacketSize;</div><div class='add'>+</div><div class='add'>+	u32	CurrentRxBufferId; // For complete routine usage</div><div class='add'>+	u32	Rx3UrbCancel;</div><div class='add'>+</div><div class='add'>+	u32	LastR1; // For RSSI reporting</div><div class='add'>+	struct urb *				RxUrb;</div><div class='add'>+	u32		Ep3ErrorCount2; // 20060625.1 Usbd for Rx DMA error count</div><div class='add'>+</div><div class='add'>+	int		EP3VM_status;</div><div class='add'>+	PUCHAR	pDRx;</div><div class='add'>+</div><div class='add'>+} WB35RX, *PWB35RX;</div><div class='add'>+</div><div class='add'>+</div><div class='head'>diff --git a/drivers/staging/winbond/linux/wb35tx.c b/drivers/staging/winbond/linux/wb35tx.c<br/>new file mode 100644<br/>index 000000000000..cf19c3bc524a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/winbond/linux/wb35tx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/linux/wb35tx.c</a></div><div class='hunk'>@@ -0,0 +1,313 @@</div><div class='add'>+//============================================================================</div><div class='add'>+//  Copyright (c) 1996-2002 Winbond Electronic Corporation</div><div class='add'>+//</div><div class='add'>+//  Module Name:</div><div class='add'>+//    Wb35Tx.c</div><div class='add'>+//</div><div class='add'>+//  Abstract:</div><div class='add'>+//    Processing the Tx message and put into down layer</div><div class='add'>+//</div><div class='add'>+//============================================================================</div><div class='add'>+#include "sysdef.h"</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+unsigned char</div><div class='add'>+Wb35Tx_get_tx_buffer(phw_data_t pHwData, PUCHAR *pBuffer )</div><div class='add'>+{</div><div class='add'>+	PWB35TX pWb35Tx = &amp;pHwData-&gt;Wb35Tx;</div><div class='add'>+</div><div class='add'>+	*pBuffer = pWb35Tx-&gt;TxBuffer[0];</div><div class='add'>+	return TRUE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void Wb35Tx_start(phw_data_t pHwData)</div><div class='add'>+{</div><div class='add'>+	PWB35TX pWb35Tx = &amp;pHwData-&gt;Wb35Tx;</div><div class='add'>+</div><div class='add'>+	// Allow only one thread to run into function</div><div class='add'>+	if (OS_ATOMIC_INC(pHwData-&gt;Adapter, &amp;pWb35Tx-&gt;TxFireCounter) == 1) {</div><div class='add'>+		pWb35Tx-&gt;EP4vm_state = VM_RUNNING;</div><div class='add'>+		Wb35Tx(pHwData);</div><div class='add'>+	} else</div><div class='add'>+		OS_ATOMIC_DEC( pHwData-&gt;Adapter, &amp;pWb35Tx-&gt;TxFireCounter );</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+void Wb35Tx(phw_data_t pHwData)</div><div class='add'>+{</div><div class='add'>+	PWB35TX		pWb35Tx = &amp;pHwData-&gt;Wb35Tx;</div><div class='add'>+	PADAPTER	Adapter = pHwData-&gt;Adapter;</div><div class='add'>+	PUCHAR		pTxBufferAddress;</div><div class='add'>+	PMDS		pMds = &amp;Adapter-&gt;Mds;</div><div class='add'>+	struct urb *	pUrb = (struct urb *)pWb35Tx-&gt;Tx4Urb;</div><div class='add'>+	int         	retv;</div><div class='add'>+	u32		SendIndex;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	if (pHwData-&gt;SurpriseRemove || pHwData-&gt;HwStop)</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	if (pWb35Tx-&gt;tx_halt)</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	// Ownership checking</div><div class='add'>+	SendIndex = pWb35Tx-&gt;TxSendIndex;</div><div class='add'>+	if (!pMds-&gt;TxOwner[SendIndex]) //No more data need to be sent, return immediately</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	pTxBufferAddress = pWb35Tx-&gt;TxBuffer[SendIndex];</div><div class='add'>+	//</div><div class='add'>+	// Issuing URB</div><div class='add'>+	//</div><div class='add'>+	usb_fill_bulk_urb(pUrb, pHwData-&gt;WbUsb.udev,</div><div class='add'>+			  usb_sndbulkpipe(pHwData-&gt;WbUsb.udev, 4),</div><div class='add'>+			  pTxBufferAddress, pMds-&gt;TxBufferSize[ SendIndex ],</div><div class='add'>+			  Wb35Tx_complete, pHwData);</div><div class='add'>+</div><div class='add'>+	pWb35Tx-&gt;EP4vm_state = VM_RUNNING;</div><div class='add'>+	retv = wb_usb_submit_urb( pUrb );</div><div class='add'>+	if (retv&lt;0) {</div><div class='add'>+		printk("EP4 Tx Irp sending error\n");</div><div class='add'>+		goto cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	// Check if driver needs issue Irp for EP2</div><div class='add'>+	pWb35Tx-&gt;TxFillCount += pMds-&gt;TxCountInBuffer[SendIndex];</div><div class='add'>+	if (pWb35Tx-&gt;TxFillCount &gt; 12)</div><div class='add'>+		Wb35Tx_EP2VM_start( pHwData );</div><div class='add'>+</div><div class='add'>+	pWb35Tx-&gt;ByteTransfer += pMds-&gt;TxBufferSize[SendIndex];</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+ cleanup:</div><div class='add'>+	pWb35Tx-&gt;EP4vm_state = VM_STOP;</div><div class='add'>+	OS_ATOMIC_DEC( pHwData-&gt;Adapter, &amp;pWb35Tx-&gt;TxFireCounter );</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+void Wb35Tx_complete(struct urb * pUrb)</div><div class='add'>+{</div><div class='add'>+	phw_data_t	pHwData = pUrb-&gt;context;</div><div class='add'>+	PADAPTER	Adapter = (PADAPTER)pHwData-&gt;Adapter;</div><div class='add'>+	PWB35TX		pWb35Tx = &amp;pHwData-&gt;Wb35Tx;</div><div class='add'>+	PMDS		pMds = &amp;Adapter-&gt;Mds;</div><div class='add'>+</div><div class='add'>+	printk("wb35: tx complete\n");</div><div class='add'>+	// Variable setting</div><div class='add'>+	pWb35Tx-&gt;EP4vm_state = VM_COMPLETED;</div><div class='add'>+	pWb35Tx-&gt;EP4VM_status = pUrb-&gt;status; //Store the last result of Irp</div><div class='add'>+	pMds-&gt;TxOwner[ pWb35Tx-&gt;TxSendIndex ] = 0;// Set the owner. Free the owner bit always.</div><div class='add'>+	pWb35Tx-&gt;TxSendIndex++;</div><div class='add'>+	pWb35Tx-&gt;TxSendIndex %= MAX_USB_TX_BUFFER_NUMBER;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		if (pHwData-&gt;SurpriseRemove || pHwData-&gt;HwStop) // Let WbWlanHalt to handle surprise remove</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (pWb35Tx-&gt;tx_halt)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		// The URB is completed, check the result</div><div class='add'>+		if (pWb35Tx-&gt;EP4VM_status != 0) {</div><div class='add'>+			printk("URB submission failed\n");</div><div class='add'>+			pWb35Tx-&gt;EP4vm_state = VM_STOP;</div><div class='add'>+			break; // Exit while(FALSE);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		Mds_Tx(Adapter);</div><div class='add'>+		Wb35Tx(pHwData);</div><div class='add'>+		return;</div><div class='add'>+	} while(FALSE);</div><div class='add'>+</div><div class='add'>+	OS_ATOMIC_DEC( pHwData-&gt;Adapter, &amp;pWb35Tx-&gt;TxFireCounter );</div><div class='add'>+	pWb35Tx-&gt;EP4vm_state = VM_STOP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void Wb35Tx_reset_descriptor(  phw_data_t pHwData )</div><div class='add'>+{</div><div class='add'>+	PWB35TX pWb35Tx = &amp;pHwData-&gt;Wb35Tx;</div><div class='add'>+</div><div class='add'>+	pWb35Tx-&gt;TxSendIndex = 0;</div><div class='add'>+	pWb35Tx-&gt;tx_halt = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+unsigned char Wb35Tx_initial(phw_data_t pHwData)</div><div class='add'>+{</div><div class='add'>+	PWB35TX pWb35Tx = &amp;pHwData-&gt;Wb35Tx;</div><div class='add'>+</div><div class='add'>+	pWb35Tx-&gt;Tx4Urb = wb_usb_alloc_urb(0);</div><div class='add'>+	if (!pWb35Tx-&gt;Tx4Urb)</div><div class='add'>+		return FALSE;</div><div class='add'>+</div><div class='add'>+	pWb35Tx-&gt;Tx2Urb = wb_usb_alloc_urb(0);</div><div class='add'>+	if (!pWb35Tx-&gt;Tx2Urb)</div><div class='add'>+	{</div><div class='add'>+		usb_free_urb( pWb35Tx-&gt;Tx4Urb );</div><div class='add'>+		return FALSE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return TRUE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+//======================================================</div><div class='add'>+void Wb35Tx_stop(phw_data_t pHwData)</div><div class='add'>+{</div><div class='add'>+	PWB35TX pWb35Tx = &amp;pHwData-&gt;Wb35Tx;</div><div class='add'>+</div><div class='add'>+	// Trying to canceling the Trp of EP2</div><div class='add'>+	if (pWb35Tx-&gt;EP2vm_state == VM_RUNNING)</div><div class='add'>+		usb_unlink_urb( pWb35Tx-&gt;Tx2Urb ); // Only use unlink, let Wb35Tx_destrot to free them</div><div class='add'>+	#ifdef _PE_TX_DUMP_</div><div class='add'>+	WBDEBUG(("EP2 Tx stop\n"));</div><div class='add'>+	#endif</div><div class='add'>+</div><div class='add'>+	// Trying to canceling the Irp of EP4</div><div class='add'>+	if (pWb35Tx-&gt;EP4vm_state == VM_RUNNING)</div><div class='add'>+		usb_unlink_urb( pWb35Tx-&gt;Tx4Urb ); // Only use unlink, let Wb35Tx_destrot to free them</div><div class='add'>+	#ifdef _PE_TX_DUMP_</div><div class='add'>+	WBDEBUG(("EP4 Tx stop\n"));</div><div class='add'>+	#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+//======================================================</div><div class='add'>+void Wb35Tx_destroy(phw_data_t pHwData)</div><div class='add'>+{</div><div class='add'>+	PWB35TX pWb35Tx = &amp;pHwData-&gt;Wb35Tx;</div><div class='add'>+</div><div class='add'>+	// Wait for VM stop</div><div class='add'>+	do {</div><div class='add'>+		OS_SLEEP(10000);  // Delay for waiting function enter 940623.1.a</div><div class='add'>+	} while( (pWb35Tx-&gt;EP2vm_state != VM_STOP) &amp;&amp; (pWb35Tx-&gt;EP4vm_state != VM_STOP) );</div><div class='add'>+	OS_SLEEP(10000);  // Delay for waiting function enter 940623.1.b</div><div class='add'>+</div><div class='add'>+	if (pWb35Tx-&gt;Tx4Urb)</div><div class='add'>+		usb_free_urb( pWb35Tx-&gt;Tx4Urb );</div><div class='add'>+</div><div class='add'>+	if (pWb35Tx-&gt;Tx2Urb)</div><div class='add'>+		usb_free_urb( pWb35Tx-&gt;Tx2Urb );</div><div class='add'>+</div><div class='add'>+	#ifdef _PE_TX_DUMP_</div><div class='add'>+	WBDEBUG(("Wb35Tx_destroy OK\n"));</div><div class='add'>+	#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void Wb35Tx_CurrentTime(phw_data_t pHwData, u32 TimeCount)</div><div class='add'>+{</div><div class='add'>+	PWB35TX pWb35Tx = &amp;pHwData-&gt;Wb35Tx;</div><div class='add'>+	unsigned char Trigger = FALSE;</div><div class='add'>+</div><div class='add'>+	if (pWb35Tx-&gt;TxTimer &gt; TimeCount)</div><div class='add'>+		Trigger = TRUE;</div><div class='add'>+	else if (TimeCount &gt; (pWb35Tx-&gt;TxTimer+500))</div><div class='add'>+		Trigger = TRUE;</div><div class='add'>+</div><div class='add'>+	if (Trigger) {</div><div class='add'>+		pWb35Tx-&gt;TxTimer = TimeCount;</div><div class='add'>+		Wb35Tx_EP2VM_start( pHwData );</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void Wb35Tx_EP2VM_start(phw_data_t pHwData)</div><div class='add'>+{</div><div class='add'>+	PWB35TX pWb35Tx = &amp;pHwData-&gt;Wb35Tx;</div><div class='add'>+</div><div class='add'>+	// Allow only one thread to run into function</div><div class='add'>+	if (OS_ATOMIC_INC( pHwData-&gt;Adapter, &amp;pWb35Tx-&gt;TxResultCount ) == 1) {</div><div class='add'>+		pWb35Tx-&gt;EP2vm_state = VM_RUNNING;</div><div class='add'>+		Wb35Tx_EP2VM( pHwData );</div><div class='add'>+	}</div><div class='add'>+	else</div><div class='add'>+		OS_ATOMIC_DEC( pHwData-&gt;Adapter, &amp;pWb35Tx-&gt;TxResultCount );</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+void Wb35Tx_EP2VM(phw_data_t pHwData)</div><div class='add'>+{</div><div class='add'>+	PWB35TX pWb35Tx = &amp;pHwData-&gt;Wb35Tx;</div><div class='add'>+	struct urb *	pUrb = (struct urb *)pWb35Tx-&gt;Tx2Urb;</div><div class='add'>+	PULONG	pltmp = (PULONG)pWb35Tx-&gt;EP2_buf;</div><div class='add'>+	int		retv;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		if (pHwData-&gt;SurpriseRemove || pHwData-&gt;HwStop)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (pWb35Tx-&gt;tx_halt)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		//</div><div class='add'>+		// Issuing URB</div><div class='add'>+		//</div><div class='add'>+		usb_fill_int_urb( pUrb, pHwData-&gt;WbUsb.udev, usb_rcvintpipe(pHwData-&gt;WbUsb.udev,2),</div><div class='add'>+				  pltmp, MAX_INTERRUPT_LENGTH, Wb35Tx_EP2VM_complete, pHwData, 32);</div><div class='add'>+</div><div class='add'>+		pWb35Tx-&gt;EP2vm_state = VM_RUNNING;</div><div class='add'>+		retv = wb_usb_submit_urb( pUrb );</div><div class='add'>+</div><div class='add'>+		if(retv &lt; 0) {</div><div class='add'>+			#ifdef _PE_TX_DUMP_</div><div class='add'>+			WBDEBUG(("EP2 Tx Irp sending error\n"));</div><div class='add'>+			#endif</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	} while(FALSE);</div><div class='add'>+</div><div class='add'>+	pWb35Tx-&gt;EP2vm_state = VM_STOP;</div><div class='add'>+	OS_ATOMIC_DEC( pHwData-&gt;Adapter, &amp;pWb35Tx-&gt;TxResultCount );</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+void Wb35Tx_EP2VM_complete(struct urb * pUrb)</div><div class='add'>+{</div><div class='add'>+	phw_data_t	pHwData = pUrb-&gt;context;</div><div class='add'>+	T02_DESCRIPTOR	T02, TSTATUS;</div><div class='add'>+	PADAPTER	Adapter = (PADAPTER)pHwData-&gt;Adapter;</div><div class='add'>+	PWB35TX		pWb35Tx = &amp;pHwData-&gt;Wb35Tx;</div><div class='add'>+	PULONG		pltmp = (PULONG)pWb35Tx-&gt;EP2_buf;</div><div class='add'>+	u32		i;</div><div class='add'>+	u16		InterruptInLength;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	// Variable setting</div><div class='add'>+	pWb35Tx-&gt;EP2vm_state = VM_COMPLETED;</div><div class='add'>+	pWb35Tx-&gt;EP2VM_status = pUrb-&gt;status;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		// For Linux 2.4. Interrupt will always trigger</div><div class='add'>+		if( pHwData-&gt;SurpriseRemove || pHwData-&gt;HwStop ) // Let WbWlanHalt to handle surprise remove</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if( pWb35Tx-&gt;tx_halt )</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		//The Urb is completed, check the result</div><div class='add'>+		if (pWb35Tx-&gt;EP2VM_status != 0) {</div><div class='add'>+			WBDEBUG(("EP2 IoCompleteRoutine return error\n"));</div><div class='add'>+			pWb35Tx-&gt;EP2vm_state= VM_STOP;</div><div class='add'>+			break; // Exit while(FALSE);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		// Update the Tx result</div><div class='add'>+		InterruptInLength = pUrb-&gt;actual_length;</div><div class='add'>+		// Modify for minimum memory access and DWORD alignment.</div><div class='add'>+		T02.value = cpu_to_le32(pltmp[0]) &gt;&gt; 8; // [31:8] -&gt; [24:0]</div><div class='add'>+		InterruptInLength -= 1;// 20051221.1.c Modify the follow for more stable</div><div class='add'>+		InterruptInLength &gt;&gt;= 2; // InterruptInLength/4</div><div class='add'>+		for (i=1; i&lt;=InterruptInLength; i++) {</div><div class='add'>+			T02.value |= ((cpu_to_le32(pltmp[i]) &amp; 0xff) &lt;&lt; 24);</div><div class='add'>+</div><div class='add'>+			TSTATUS.value = T02.value;  //20061009 anson's endian</div><div class='add'>+			Mds_SendComplete( Adapter, &amp;TSTATUS );</div><div class='add'>+			T02.value = cpu_to_le32(pltmp[i]) &gt;&gt; 8;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		return;</div><div class='add'>+	} while(FALSE);</div><div class='add'>+</div><div class='add'>+	OS_ATOMIC_DEC( pHwData-&gt;Adapter, &amp;pWb35Tx-&gt;TxResultCount );</div><div class='add'>+	pWb35Tx-&gt;EP2vm_state = VM_STOP;</div><div class='add'>+}</div><div class='add'>+</div><div class='head'>diff --git a/drivers/staging/winbond/linux/wb35tx_f.h b/drivers/staging/winbond/linux/wb35tx_f.h<br/>new file mode 100644<br/>index 000000000000..7705a8454dcb<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/winbond/linux/wb35tx_f.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/linux/wb35tx_f.h</a></div><div class='hunk'>@@ -0,0 +1,20 @@</div><div class='add'>+//====================================</div><div class='add'>+// Interface function declare</div><div class='add'>+//====================================</div><div class='add'>+unsigned char Wb35Tx_initial(	 phw_data_t pHwData );</div><div class='add'>+void Wb35Tx_destroy(  phw_data_t pHwData );</div><div class='add'>+unsigned char Wb35Tx_get_tx_buffer(  phw_data_t pHwData,  PUCHAR *pBuffer );</div><div class='add'>+</div><div class='add'>+void Wb35Tx_EP2VM(  phw_data_t pHwData );</div><div class='add'>+void Wb35Tx_EP2VM_start(  phw_data_t pHwData );</div><div class='add'>+void Wb35Tx_EP2VM_complete(  PURB purb );</div><div class='add'>+</div><div class='add'>+void Wb35Tx_start(  phw_data_t pHwData );</div><div class='add'>+void Wb35Tx_stop(  phw_data_t pHwData );</div><div class='add'>+void Wb35Tx(  phw_data_t pHwData );</div><div class='add'>+void Wb35Tx_complete(  PURB purb );</div><div class='add'>+void Wb35Tx_reset_descriptor(  phw_data_t pHwData );</div><div class='add'>+</div><div class='add'>+void Wb35Tx_CurrentTime(  phw_data_t pHwData,  u32 TimeCount );</div><div class='add'>+</div><div class='add'>+</div><div class='head'>diff --git a/drivers/staging/winbond/linux/wb35tx_s.h b/drivers/staging/winbond/linux/wb35tx_s.h<br/>new file mode 100644<br/>index 000000000000..ac4325736760<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/winbond/linux/wb35tx_s.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/linux/wb35tx_s.h</a></div><div class='hunk'>@@ -0,0 +1,47 @@</div><div class='add'>+//====================================</div><div class='add'>+// IS89C35 Tx related definition</div><div class='add'>+//====================================</div><div class='add'>+#define TX_INTERFACE			0	// Interface 1</div><div class='add'>+#define TX_PIPE					3	// endpoint 4</div><div class='add'>+#define TX_INTERRUPT			1	// endpoint 2</div><div class='add'>+#define MAX_INTERRUPT_LENGTH	64	// It must be 64 for EP2 hardware</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+//====================================</div><div class='add'>+// Internal variable for module</div><div class='add'>+//====================================</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+typedef struct _WB35TX</div><div class='add'>+{</div><div class='add'>+	// For Tx buffer</div><div class='add'>+	u8	TxBuffer[ MAX_USB_TX_BUFFER_NUMBER ][ MAX_USB_TX_BUFFER ];</div><div class='add'>+</div><div class='add'>+	// For Interrupt pipe</div><div class='add'>+	u8	EP2_buf[MAX_INTERRUPT_LENGTH];</div><div class='add'>+</div><div class='add'>+	OS_ATOMIC	TxResultCount;// For thread control of EP2 931130.4.m</div><div class='add'>+	OS_ATOMIC	TxFireCounter;// For thread control of EP4 931130.4.n</div><div class='add'>+	u32			ByteTransfer;</div><div class='add'>+</div><div class='add'>+	u32	    TxSendIndex;// The next index of Mds array to be sent</div><div class='add'>+	u32	    EP2vm_state; // for EP2vm state</div><div class='add'>+	u32	    EP4vm_state; // for EP4vm state</div><div class='add'>+	u32	    tx_halt; // Stopping VM</div><div class='add'>+</div><div class='add'>+	struct urb *				Tx4Urb;</div><div class='add'>+	struct urb *				Tx2Urb;</div><div class='add'>+</div><div class='add'>+	int		EP2VM_status;</div><div class='add'>+	int		EP4VM_status;</div><div class='add'>+</div><div class='add'>+	u32	TxFillCount; // 20060928</div><div class='add'>+	u32	TxTimer; // 20060928 Add if sending packet not great than 13</div><div class='add'>+</div><div class='add'>+} WB35TX, *PWB35TX;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='head'>diff --git a/drivers/staging/winbond/linux/wbusb.c b/drivers/staging/winbond/linux/wbusb.c<br/>new file mode 100644<br/>index 000000000000..cbad5fb05959<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/winbond/linux/wbusb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/linux/wbusb.c</a></div><div class='hunk'>@@ -0,0 +1,404 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2008 Pavel Machek &lt;pavel@suse.cz&gt;</div><div class='add'>+ *</div><div class='add'>+ * Distribute under GPLv2.</div><div class='add'>+ */</div><div class='add'>+#include "sysdef.h"</div><div class='add'>+#include &lt;net/mac80211.h&gt;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR( DRIVER_AUTHOR );</div><div class='add'>+MODULE_DESCRIPTION( DRIVER_DESC );</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_VERSION("0.1");</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+//============================================================</div><div class='add'>+// vendor ID and product ID can into here for others</div><div class='add'>+//============================================================</div><div class='add'>+static struct usb_device_id Id_Table[] =</div><div class='add'>+{</div><div class='add'>+  {USB_DEVICE( 0x0416, 0x0035 )},</div><div class='add'>+  {USB_DEVICE( 0x18E8, 0x6201 )},</div><div class='add'>+  {USB_DEVICE( 0x18E8, 0x6206 )},</div><div class='add'>+  {USB_DEVICE( 0x18E8, 0x6217 )},</div><div class='add'>+  {USB_DEVICE( 0x18E8, 0x6230 )},</div><div class='add'>+  {USB_DEVICE( 0x18E8, 0x6233 )},</div><div class='add'>+  {USB_DEVICE( 0x1131, 0x2035 )},</div><div class='add'>+  {  }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_DEVICE_TABLE(usb, Id_Table);</div><div class='add'>+</div><div class='add'>+static struct usb_driver wb35_driver = {</div><div class='add'>+	.name =		"w35und",</div><div class='add'>+	.probe =	wb35_probe,</div><div class='add'>+	.disconnect = wb35_disconnect,</div><div class='add'>+	.id_table = Id_Table,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ieee80211_rate wbsoft_rates[] = {</div><div class='add'>+	{ .bitrate = 10, .flags = IEEE80211_RATE_SHORT_PREAMBLE },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ieee80211_channel wbsoft_channels[] = {</div><div class='add'>+	{ .center_freq = 2412},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int wbsoft_enabled;</div><div class='add'>+struct ieee80211_hw *my_dev;</div><div class='add'>+PADAPTER my_adapter;</div><div class='add'>+</div><div class='add'>+static int wbsoft_add_interface(struct ieee80211_hw *dev,</div><div class='add'>+				 struct ieee80211_if_init_conf *conf)</div><div class='add'>+{</div><div class='add'>+	printk("wbsoft_add interface called\n");</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void wbsoft_remove_interface(struct ieee80211_hw *dev,</div><div class='add'>+				     struct ieee80211_if_init_conf *conf)</div><div class='add'>+{</div><div class='add'>+	printk("wbsoft_remove interface called\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wbsoft_nop(void)</div><div class='add'>+{</div><div class='add'>+	printk("wbsoft_nop called\n");</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void wbsoft_configure_filter(struct ieee80211_hw *dev,</div><div class='add'>+				     unsigned int changed_flags,</div><div class='add'>+				     unsigned int *total_flags,</div><div class='add'>+				     int mc_count, struct dev_mc_list *mclist)</div><div class='add'>+{</div><div class='add'>+	unsigned int bit_nr, new_flags;</div><div class='add'>+	u32 mc_filter[2];</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	new_flags = 0;</div><div class='add'>+</div><div class='add'>+	if (*total_flags &amp; FIF_PROMISC_IN_BSS) {</div><div class='add'>+		new_flags |= FIF_PROMISC_IN_BSS;</div><div class='add'>+		mc_filter[1] = mc_filter[0] = ~0;</div><div class='add'>+	} else if ((*total_flags &amp; FIF_ALLMULTI) || (mc_count &gt; 32)) {</div><div class='add'>+		new_flags |= FIF_ALLMULTI;</div><div class='add'>+		mc_filter[1] = mc_filter[0] = ~0;</div><div class='add'>+	} else {</div><div class='add'>+		mc_filter[1] = mc_filter[0] = 0;</div><div class='add'>+		for (i = 0; i &lt; mc_count; i++) {</div><div class='add'>+			if (!mclist)</div><div class='add'>+				break;</div><div class='add'>+			printk("Should call ether_crc here\n");</div><div class='add'>+			//bit_nr = ether_crc(ETH_ALEN, mclist-&gt;dmi_addr) &gt;&gt; 26;</div><div class='add'>+			bit_nr = 0;</div><div class='add'>+</div><div class='add'>+			bit_nr &amp;= 0x3F;</div><div class='add'>+			mc_filter[bit_nr &gt;&gt; 5] |= 1 &lt;&lt; (bit_nr &amp; 31);</div><div class='add'>+			mclist = mclist-&gt;next;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev-&gt;flags &amp;= ~IEEE80211_HW_RX_INCLUDES_FCS;</div><div class='add'>+</div><div class='add'>+	*total_flags = new_flags;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wbsoft_tx(struct ieee80211_hw *dev, struct sk_buff *skb,</div><div class='add'>+		      struct ieee80211_tx_control *control)</div><div class='add'>+{</div><div class='add'>+	char *buffer = kmalloc(skb-&gt;len, GFP_ATOMIC);</div><div class='add'>+	printk("Sending frame %d bytes\n", skb-&gt;len);</div><div class='add'>+	memcpy(buffer, skb-&gt;data, skb-&gt;len);</div><div class='add'>+	if (1 == MLMESendFrame(my_adapter, buffer, skb-&gt;len, FRAME_TYPE_802_11_MANAGEMENT))</div><div class='add'>+		printk("frame sent ok (%d bytes)?\n", skb-&gt;len);</div><div class='add'>+	return NETDEV_TX_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int wbsoft_start(struct ieee80211_hw *dev)</div><div class='add'>+{</div><div class='add'>+	wbsoft_enabled = 1;</div><div class='add'>+	printk("wbsoft_start called\n");</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wbsoft_config(struct ieee80211_hw *dev, struct ieee80211_conf *conf)</div><div class='add'>+{</div><div class='add'>+	ChanInfo ch;</div><div class='add'>+	printk("wbsoft_config called\n");</div><div class='add'>+</div><div class='add'>+	ch.band = 1;</div><div class='add'>+	ch.ChanNo = 1;	/* Should use channel_num, or something, as that is already pre-translated */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	hal_set_current_channel(&amp;my_adapter-&gt;sHwData, ch);</div><div class='add'>+	hal_set_beacon_period(&amp;my_adapter-&gt;sHwData, conf-&gt;beacon_int);</div><div class='add'>+//	hal_set_cap_info(&amp;my_adapter-&gt;sHwData, ?? );</div><div class='add'>+// hal_set_ssid(phw_data_t pHwData,  PUCHAR pssid,  u8 ssid_len); ??</div><div class='add'>+	hal_set_accept_broadcast(&amp;my_adapter-&gt;sHwData, 1);</div><div class='add'>+	hal_set_accept_promiscuous(&amp;my_adapter-&gt;sHwData,  1);</div><div class='add'>+	hal_set_accept_multicast(&amp;my_adapter-&gt;sHwData,  1);</div><div class='add'>+	hal_set_accept_beacon(&amp;my_adapter-&gt;sHwData,  1);</div><div class='add'>+	hal_set_radio_mode(&amp;my_adapter-&gt;sHwData,  0);</div><div class='add'>+	//hal_set_antenna_number(  phw_data_t pHwData, u8 number )</div><div class='add'>+	//hal_set_rf_power(phw_data_t pHwData, u8 PowerIndex)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+//	hal_start_bss(&amp;my_adapter-&gt;sHwData, WLAN_BSSTYPE_INFRASTRUCTURE);	??</div><div class='add'>+</div><div class='add'>+//void hal_set_rates(phw_data_t pHwData, PUCHAR pbss_rates,</div><div class='add'>+//		   u8 length, unsigned char basic_rate_set)</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wbsoft_config_interface(struct ieee80211_hw *dev,</div><div class='add'>+				    struct ieee80211_vif *vif,</div><div class='add'>+				    struct ieee80211_if_conf *conf)</div><div class='add'>+{</div><div class='add'>+	printk("wbsoft_config_interface called\n");</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u64 wbsoft_get_tsf(struct ieee80211_hw *dev)</div><div class='add'>+{</div><div class='add'>+	printk("wbsoft_get_tsf called\n");</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct ieee80211_ops wbsoft_ops = {</div><div class='add'>+	.tx			= wbsoft_tx,</div><div class='add'>+	.start			= wbsoft_start,		/* Start can be pretty much empty as we do WbWLanInitialize() during probe? */</div><div class='add'>+	.stop			= wbsoft_nop,</div><div class='add'>+	.add_interface		= wbsoft_add_interface,</div><div class='add'>+	.remove_interface	= wbsoft_remove_interface,</div><div class='add'>+	.config			= wbsoft_config,</div><div class='add'>+	.config_interface	= wbsoft_config_interface,</div><div class='add'>+	.configure_filter	= wbsoft_configure_filter,</div><div class='add'>+	.get_stats		= wbsoft_nop,</div><div class='add'>+	.get_tx_stats		= wbsoft_nop,</div><div class='add'>+	.get_tsf		= wbsoft_get_tsf,</div><div class='add'>+// conf_tx: hal_set_cwmin()/hal_set_cwmax;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct wbsoft_priv {</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+int __init wb35_init(void)</div><div class='add'>+{</div><div class='add'>+	printk("[w35und]driver init\n");</div><div class='add'>+	return usb_register(&amp;wb35_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __exit wb35_exit(void)</div><div class='add'>+{</div><div class='add'>+	printk("[w35und]driver exit\n");</div><div class='add'>+	usb_deregister( &amp;wb35_driver );</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(wb35_init);</div><div class='add'>+module_exit(wb35_exit);</div><div class='add'>+</div><div class='add'>+// Usb kernel subsystem will call this function when a new device is plugged into.</div><div class='add'>+int wb35_probe(struct usb_interface *intf, const struct usb_device_id *id_table)</div><div class='add'>+{</div><div class='add'>+	PADAPTER	Adapter;</div><div class='add'>+	PWBLINUX	pWbLinux;</div><div class='add'>+	PWBUSB		pWbUsb;</div><div class='add'>+        struct usb_host_interface *interface;</div><div class='add'>+	struct usb_endpoint_descriptor *endpoint;</div><div class='add'>+	int	i, ret = -1;</div><div class='add'>+	u32	ltmp;</div><div class='add'>+	struct usb_device *udev = interface_to_usbdev(intf);</div><div class='add'>+</div><div class='add'>+	usb_get_dev(udev);</div><div class='add'>+</div><div class='add'>+	printk("[w35und]wb35_probe -&gt;\n");</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		for (i=0; i&lt;(sizeof(Id_Table)/sizeof(struct usb_device_id)); i++ ) {</div><div class='add'>+			if ((udev-&gt;descriptor.idVendor == Id_Table[i].idVendor) &amp;&amp;</div><div class='add'>+				(udev-&gt;descriptor.idProduct == Id_Table[i].idProduct)) {</div><div class='add'>+				printk("[w35und]Found supported hardware\n");</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if ((i == (sizeof(Id_Table)/sizeof(struct usb_device_id)))) {</div><div class='add'>+			#ifdef _PE_USB_INI_DUMP_</div><div class='add'>+			WBDEBUG(("[w35und] This is not the one we are interested about\n"));</div><div class='add'>+			#endif</div><div class='add'>+			return -ENODEV;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		// 20060630.2 Check the device if it already be opened</div><div class='add'>+		ret = usb_control_msg(udev, usb_rcvctrlpipe( udev, 0 ),</div><div class='add'>+				      0x01, USB_TYPE_VENDOR|USB_RECIP_DEVICE|USB_DIR_IN,</div><div class='add'>+				      0x0, 0x400, &amp;ltmp, 4, HZ*100 );</div><div class='add'>+		if( ret &lt; 0 )</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		ltmp = cpu_to_le32(ltmp);</div><div class='add'>+		if (ltmp)  // Is already initialized?</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+		Adapter = kzalloc(sizeof(ADAPTER), GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+		my_adapter = Adapter;</div><div class='add'>+		pWbLinux = &amp;Adapter-&gt;WbLinux;</div><div class='add'>+		pWbUsb = &amp;Adapter-&gt;sHwData.WbUsb;</div><div class='add'>+		pWbUsb-&gt;udev = udev;</div><div class='add'>+</div><div class='add'>+	        interface = intf-&gt;cur_altsetting;</div><div class='add'>+	        endpoint = &amp;interface-&gt;endpoint[0].desc;</div><div class='add'>+</div><div class='add'>+		if (endpoint[2].wMaxPacketSize == 512) {</div><div class='add'>+			printk("[w35und] Working on USB 2.0\n");</div><div class='add'>+			pWbUsb-&gt;IsUsb20 = 1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!WbWLanInitialize(Adapter)) {</div><div class='add'>+			printk("[w35und]WbWLanInitialize fail\n");</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		{</div><div class='add'>+			struct wbsoft_priv *priv;</div><div class='add'>+			struct ieee80211_hw *dev;</div><div class='add'>+			int res;</div><div class='add'>+</div><div class='add'>+			dev = ieee80211_alloc_hw(sizeof(*priv), &amp;wbsoft_ops);</div><div class='add'>+</div><div class='add'>+			if (!dev) {</div><div class='add'>+				printk("w35und: ieee80211 alloc failed\n" );</div><div class='add'>+				BUG();</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			my_dev = dev;</div><div class='add'>+</div><div class='add'>+			SET_IEEE80211_DEV(dev, &amp;udev-&gt;dev);</div><div class='add'>+			{</div><div class='add'>+				phw_data_t pHwData = &amp;Adapter-&gt;sHwData;</div><div class='add'>+				unsigned char		dev_addr[MAX_ADDR_LEN];</div><div class='add'>+				hal_get_permanent_address(pHwData, dev_addr);</div><div class='add'>+				SET_IEEE80211_PERM_ADDR(dev, dev_addr);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+			dev-&gt;extra_tx_headroom = 12;	/* FIXME */</div><div class='add'>+			dev-&gt;flags = 0;</div><div class='add'>+</div><div class='add'>+			dev-&gt;channel_change_time = 1000;</div><div class='add'>+//			dev-&gt;max_rssi = 100;</div><div class='add'>+</div><div class='add'>+			dev-&gt;queues = 1;</div><div class='add'>+</div><div class='add'>+			static struct ieee80211_supported_band band;</div><div class='add'>+</div><div class='add'>+			band.channels = wbsoft_channels;</div><div class='add'>+			band.n_channels = ARRAY_SIZE(wbsoft_channels);</div><div class='add'>+			band.bitrates = wbsoft_rates;</div><div class='add'>+			band.n_bitrates = ARRAY_SIZE(wbsoft_rates);</div><div class='add'>+</div><div class='add'>+			dev-&gt;wiphy-&gt;bands[IEEE80211_BAND_2GHZ] = &amp;band;</div><div class='add'>+#if 0</div><div class='add'>+			wbsoft_modes[0].num_channels = 1;</div><div class='add'>+			wbsoft_modes[0].channels = wbsoft_channels;</div><div class='add'>+			wbsoft_modes[0].mode = MODE_IEEE80211B;</div><div class='add'>+			wbsoft_modes[0].num_rates = ARRAY_SIZE(wbsoft_rates);</div><div class='add'>+			wbsoft_modes[0].rates = wbsoft_rates;</div><div class='add'>+</div><div class='add'>+			res = ieee80211_register_hwmode(dev, &amp;wbsoft_modes[0]);</div><div class='add'>+			BUG_ON(res);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+			res = ieee80211_register_hw(dev);</div><div class='add'>+			BUG_ON(res);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		usb_set_intfdata( intf, Adapter );</div><div class='add'>+</div><div class='add'>+		printk("[w35und] _probe OK\n");</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	} while(FALSE);</div><div class='add'>+</div><div class='add'>+	return -ENOMEM;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void packet_came(char *pRxBufferAddress, int PacketSize)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct ieee80211_rx_status rx_status = {0};</div><div class='add'>+</div><div class='add'>+	if (!wbsoft_enabled)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	skb = dev_alloc_skb(PacketSize);</div><div class='add'>+	if (!skb) {</div><div class='add'>+		printk("Not enough memory for packet, FIXME\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(skb_put(skb, PacketSize),</div><div class='add'>+	       pRxBufferAddress,</div><div class='add'>+	       PacketSize);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+	rx_status.rate = 10;</div><div class='add'>+	rx_status.channel = 1;</div><div class='add'>+	rx_status.freq = 12345;</div><div class='add'>+	rx_status.phymode = MODE_IEEE80211B;</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+	ieee80211_rx_irqsafe(my_dev, skb, &amp;rx_status);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+unsigned char</div><div class='add'>+WbUsb_initial(phw_data_t pHwData)</div><div class='add'>+{</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+WbUsb_destroy(phw_data_t pHwData)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int wb35_open(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	PADAPTER Adapter = (PADAPTER)netdev-&gt;priv;</div><div class='add'>+	phw_data_t pHwData = &amp;Adapter-&gt;sHwData;</div><div class='add'>+</div><div class='add'>+        netif_start_queue(netdev);</div><div class='add'>+</div><div class='add'>+	//TODO : put here temporarily</div><div class='add'>+	hal_set_accept_broadcast(pHwData, 1); // open accept broadcast</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int wb35_close(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	netif_stop_queue(netdev);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void wb35_disconnect(struct usb_interface *intf)</div><div class='add'>+{</div><div class='add'>+	PWBLINUX pWbLinux;</div><div class='add'>+	PADAPTER Adapter = usb_get_intfdata(intf);</div><div class='add'>+	usb_set_intfdata(intf, NULL);</div><div class='add'>+</div><div class='add'>+        pWbLinux = &amp;Adapter-&gt;WbLinux;</div><div class='add'>+</div><div class='add'>+	// Card remove</div><div class='add'>+	WbWlanHalt(Adapter);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='head'>diff --git a/drivers/staging/winbond/linux/wbusb_f.h b/drivers/staging/winbond/linux/wbusb_f.h<br/>new file mode 100644<br/>index 000000000000..cae29e107e11<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/winbond/linux/wbusb_f.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/linux/wbusb_f.h</a></div><div class='hunk'>@@ -0,0 +1,34 @@</div><div class='add'>+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++</div><div class='add'>+// Copyright (c) 1996-2004 Winbond Electronic Corporation</div><div class='add'>+//</div><div class='add'>+//  Module Name:</div><div class='add'>+//    wbusb_f.h</div><div class='add'>+//</div><div class='add'>+//  Abstract:</div><div class='add'>+//    Linux driver.</div><div class='add'>+//</div><div class='add'>+//  Author:</div><div class='add'>+//</div><div class='add'>+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++</div><div class='add'>+</div><div class='add'>+int wb35_open(struct net_device *netdev);</div><div class='add'>+int wb35_close(struct net_device *netdev);</div><div class='add'>+unsigned char WbUsb_initial(phw_data_t pHwData);</div><div class='add'>+void WbUsb_destroy(phw_data_t pHwData);</div><div class='add'>+unsigned char WbWLanInitialize(PADAPTER Adapter);</div><div class='add'>+#define	WbUsb_Stop( _A )</div><div class='add'>+</div><div class='add'>+int wb35_probe(struct usb_interface *intf,const struct usb_device_id *id_table);</div><div class='add'>+void wb35_disconnect(struct usb_interface *intf);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define wb_usb_submit_urb(_A) usb_submit_urb(_A, GFP_ATOMIC)</div><div class='add'>+#define wb_usb_alloc_urb(_A) usb_alloc_urb(_A, GFP_ATOMIC)</div><div class='add'>+</div><div class='add'>+#define WbUsb_CheckForHang( _P )</div><div class='add'>+#define WbUsb_DetectStart( _P, _I )</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='head'>diff --git a/drivers/staging/winbond/linux/wbusb_s.h b/drivers/staging/winbond/linux/wbusb_s.h<br/>new file mode 100644<br/>index 000000000000..d5c1d53de70b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/winbond/linux/wbusb_s.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/linux/wbusb_s.h</a></div><div class='hunk'>@@ -0,0 +1,42 @@</div><div class='add'>+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++</div><div class='add'>+// Copyright (c) 1996-2004 Winbond Electronic Corporation</div><div class='add'>+//</div><div class='add'>+//  Module Name:</div><div class='add'>+//    wbusb_s.h</div><div class='add'>+//</div><div class='add'>+//  Abstract:</div><div class='add'>+//    Linux driver.</div><div class='add'>+//</div><div class='add'>+//  Author:</div><div class='add'>+//</div><div class='add'>+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++</div><div class='add'>+</div><div class='add'>+#define OS_SLEEP( _MT )	{ set_current_state(TASK_INTERRUPTIBLE); \</div><div class='add'>+			  schedule_timeout( _MT*HZ/1000000 ); }</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+//---------------------------------------------------------------------------</div><div class='add'>+//  RW_CONTEXT --</div><div class='add'>+//</div><div class='add'>+//  Used to track driver-generated io irps</div><div class='add'>+//---------------------------------------------------------------------------</div><div class='add'>+typedef struct _RW_CONTEXT</div><div class='add'>+{</div><div class='add'>+	void*			pHwData;</div><div class='add'>+	PURB			pUrb;</div><div class='add'>+	void*			pCallBackFunctionParameter;</div><div class='add'>+} RW_CONTEXT, *PRW_CONTEXT;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define DRIVER_AUTHOR "Original by: Jeff Lee&lt;YY_Lee@issc.com.tw&gt; Adapted to 2.6.x by Costantino Leandro (Rxart Desktop) &lt;le_costantino@pixartargentina.com.ar&gt;"</div><div class='add'>+#define DRIVER_DESC   "IS89C35 802.11bg WLAN USB Driver"</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+typedef struct _WBUSB {</div><div class='add'>+	u32	IsUsb20;</div><div class='add'>+	struct usb_device *udev;</div><div class='add'>+	u32	DetectCount;</div><div class='add'>+} WBUSB, *PWBUSB;</div><div class='head'>diff --git a/drivers/staging/winbond/localpara.h b/drivers/staging/winbond/localpara.h<br/>new file mode 100644<br/>index 000000000000..268cf916ab48<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/winbond/localpara.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/localpara.h</a></div><div class='hunk'>@@ -0,0 +1,275 @@</div><div class='add'>+//=============================================================</div><div class='add'>+// LocalPara.h -</div><div class='add'>+//=============================================================</div><div class='add'>+//Define the local ability</div><div class='add'>+</div><div class='add'>+#define LOCAL_DEFAULT_BEACON_PERIOD			100		//ms</div><div class='add'>+#define LOCAL_DEFAULT_ATIM_WINDOW			0</div><div class='add'>+#define LOCAL_DEFAULT_ERP_CAPABILITY		0x0431	//0x0001:	ESS</div><div class='add'>+													//0x0010:	Privacy</div><div class='add'>+													//0x0020:	short preamble</div><div class='add'>+													//0x0400:	short slot time</div><div class='add'>+#define LOCAL_DEFAULT_LISTEN_INTERVAL		5</div><div class='add'>+</div><div class='add'>+//#define LOCAL_DEFAULT_24_CHANNEL_NUM		11		// channel 1..11</div><div class='add'>+#define LOCAL_DEFAULT_24_CHANNEL_NUM		13		// channel 1..13</div><div class='add'>+#define LOCAL_DEFAULT_5_CHANNEL_NUM			8		// channel 36..64</div><div class='add'>+</div><div class='add'>+#define LOCAL_USA_24_CHANNEL_NUM			11</div><div class='add'>+#define LOCAL_USA_5_CHANNEL_NUM				12</div><div class='add'>+#define LOCAL_EUROPE_24_CHANNEL_NUM			13</div><div class='add'>+#define LOCAL_EUROPE_5_CHANNEL_NUM			19</div><div class='add'>+#define LOCAL_JAPAN_24_CHANNEL_NUM			14</div><div class='add'>+#define LOCAL_JAPAN_5_CHANNEL_NUM			11</div><div class='add'>+#define LOCAL_UNKNOWN_24_CHANNEL_NUM		14</div><div class='add'>+#define LOCAL_UNKNOWN_5_CHANNEL_NUM			34	//not include 165</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define psLOCAL			(&amp;(Adapter-&gt;sLocalPara))</div><div class='add'>+</div><div class='add'>+#define MODE_802_11_BG			0</div><div class='add'>+#define MODE_802_11_A			1</div><div class='add'>+#define MODE_802_11_ABG			2</div><div class='add'>+#define MODE_802_11_BG_IBSS		3</div><div class='add'>+#define MODE_802_11_B			4</div><div class='add'>+#define MODE_AUTO				255</div><div class='add'>+</div><div class='add'>+#define BAND_TYPE_DSSS			0</div><div class='add'>+#define BAND_TYPE_OFDM_24		1</div><div class='add'>+#define BAND_TYPE_OFDM_5		2</div><div class='add'>+</div><div class='add'>+//refer Bitmap2RateValue table</div><div class='add'>+#define LOCAL_ALL_SUPPORTED_RATES_BITMAP		0x130c1a66	//the bitmap value of all the H/W supported rates</div><div class='add'>+															//1, 2, 5.5, 11, 6, 9, 12, 18, 24, 36, 48, 54</div><div class='add'>+#define LOCAL_OFDM_SUPPORTED_RATES_BITMAP		0x130c1240	//the bitmap value of all the H/W supported rates</div><div class='add'>+															//except to non-OFDM rates</div><div class='add'>+															//6, 9, 12, 18, 24, 36, 48, 54</div><div class='add'>+</div><div class='add'>+#define LOCAL_11B_SUPPORTED_RATE_BITMAP			0x826</div><div class='add'>+#define LOCAL_11B_BASIC_RATE_BITMAP				0x826</div><div class='add'>+#define LOCAL_11B_OPERATION_RATE_BITMAP			0x826</div><div class='add'>+#define LOCAL_11G_BASIC_RATE_BITMAP				0x826		//1, 2, 5.5, 11</div><div class='add'>+#define LOCAL_11G_OPERATION_RATE_BITMAP			0x130c1240	//6, 9, 12, 18, 24, 36, 48, 54</div><div class='add'>+#define LOCAL_11A_BASIC_RATE_BITMAP				0x01001040	//6, 12, 24</div><div class='add'>+#define LOCAL_11A_OPERATION_RATE_BITMAP			0x120c0200	//9, 18, 36, 48, 54</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define PWR_ACTIVE		0</div><div class='add'>+#define PWR_SAVE		1</div><div class='add'>+#define PWR_TX_IDLE_CYCLE			6</div><div class='add'>+</div><div class='add'>+//bPreambleMode and bSlotTimeMode</div><div class='add'>+#define AUTO_MODE			0</div><div class='add'>+#define LONG_MODE			1</div><div class='add'>+</div><div class='add'>+//Region definition</div><div class='add'>+#define REGION_AUTO			0xff</div><div class='add'>+#define REGION_UNKNOWN		0</div><div class='add'>+#define REGION_EUROPE		1	//ETSI</div><div class='add'>+#define REGION_JAPAN		2	//MKK</div><div class='add'>+#define REGION_USA			3	//FCC</div><div class='add'>+#define	REGION_FRANCE		4	//FRANCE</div><div class='add'>+#define REGION_SPAIN		5	//SPAIN</div><div class='add'>+#define REGION_ISRAEL		6	//ISRAEL</div><div class='add'>+//#define REGION_CANADA		7	//IC</div><div class='add'>+</div><div class='add'>+#define MAX_BSS_DESCRIPT_ELEMENT		32</div><div class='add'>+#define MAX_PMKID_CandidateList         16</div><div class='add'>+</div><div class='add'>+//High byte : Event number,  low byte : reason</div><div class='add'>+//Event definition</div><div class='add'>+//-- SME/MLME event</div><div class='add'>+#define EVENT_RCV_DEAUTH					0x0100</div><div class='add'>+#define EVENT_JOIN_FAIL						0x0200</div><div class='add'>+#define EVENT_AUTH_FAIL						0x0300</div><div class='add'>+#define EVENT_ASSOC_FAIL					0x0400</div><div class='add'>+#define EVENT_LOST_SIGNAL					0x0500</div><div class='add'>+#define EVENT_BSS_DESCRIPT_LACK				0x0600</div><div class='add'>+#define EVENT_COUNTERMEASURE				0x0700</div><div class='add'>+#define EVENT_JOIN_FILTER					0x0800</div><div class='add'>+//-- TX/RX event</div><div class='add'>+#define EVENT_RX_BUFF_UNAVAILABLE			0x4100</div><div class='add'>+</div><div class='add'>+#define EVENT_CONNECT						0x8100</div><div class='add'>+#define EVENT_DISCONNECT					0x8200</div><div class='add'>+#define EVENT_SCAN_REQ						0x8300</div><div class='add'>+</div><div class='add'>+//Reason of Event</div><div class='add'>+#define EVENT_REASON_FILTER_BASIC_RATE		0x0001</div><div class='add'>+#define EVENT_REASON_FILTER_PRIVACY			0x0002</div><div class='add'>+#define EVENT_REASON_FILTER_AUTH_MODE		0x0003</div><div class='add'>+#define EVENT_REASON_TIMEOUT				0x00ff</div><div class='add'>+</div><div class='add'>+// 20061108 WPS IE buffer</div><div class='add'>+#define MAX_IE_APPEND_SIZE					256 + 4 // Due to [E id][Length][OUI][Data] may 257 bytes</div><div class='add'>+</div><div class='add'>+typedef struct _EVENTLOG</div><div class='add'>+{</div><div class='add'>+	u16		Count;			//Total count from start</div><div class='add'>+	u16		index;			//Buffer index, 0 ~ 63</div><div class='add'>+	u32		EventValue[64];	//BYTE 3~2 : count, BYTE 1 : Event, BYTE 0 : reason</div><div class='add'>+} Event_Log, *pEvent_Log;</div><div class='add'>+</div><div class='add'>+typedef struct _ChanInfo</div><div class='add'>+{</div><div class='add'>+	u8		band;</div><div class='add'>+	u8		ChanNo;</div><div class='add'>+} ChanInfo, *pChanInfo;</div><div class='add'>+</div><div class='add'>+typedef struct _CHAN_LIST</div><div class='add'>+{</div><div class='add'>+	u16				Count;</div><div class='add'>+	ChanInfo		Channel[50]; // 100B</div><div class='add'>+} CHAN_LIST, *psCHAN_LIST;</div><div class='add'>+</div><div class='add'>+typedef struct _RadioOff</div><div class='add'>+{</div><div class='add'>+	u8			boHwRadioOff;</div><div class='add'>+	u8			boSwRadioOff;</div><div class='add'>+} RadioOff, *psRadioOff;</div><div class='add'>+</div><div class='add'>+//===========================================================================</div><div class='add'>+typedef struct LOCAL_PARA</div><div class='add'>+{</div><div class='add'>+	u8			PermanentAddress[ MAC_ADDR_LENGTH + 2 ]; 	// read from EPROM, manufacture set for each NetCard</div><div class='add'>+    u8    		ThisMacAddress[ MAC_ADDR_LENGTH + 2 ];			// the driver will use actually.</div><div class='add'>+</div><div class='add'>+	u32			MTUsize;				// Ind to Uplayer, Max transmission unit size</div><div class='add'>+</div><div class='add'>+	u8			region_INF;	//region setting from INF</div><div class='add'>+	u8			region;		//real region setting of the device</div><div class='add'>+	u8			Reserved_1[2];</div><div class='add'>+</div><div class='add'>+    //// power-save variables</div><div class='add'>+    u8  		  	iPowerSaveMode;     // 0 indicates it is on, 1 indicates it is off</div><div class='add'>+	u8			ShutDowned;</div><div class='add'>+	u8			ATIMmode;</div><div class='add'>+	u8			ExcludeUnencrypted;</div><div class='add'>+</div><div class='add'>+	u16			CheckCountForPS;	//Unit ime count for the decision to enter PS mode</div><div class='add'>+	u8			boHasTxActivity;	//tx activity has occurred</div><div class='add'>+	u8			boMacPsValid;		//Power save mode obtained from H/W is valid or not</div><div class='add'>+</div><div class='add'>+	//// Rate</div><div class='add'>+	u8			TxRateMode;				// Initial, input from Registry, may be updated by GUI</div><div class='add'>+											//Tx Rate Mode: auto(DTO on), max, 1M, 2M, ..</div><div class='add'>+	u8			CurrentTxRate;			// The current Tx rate</div><div class='add'>+	u8			CurrentTxRateForMng;	// The current Tx rate for management frames</div><div class='add'>+										// It will be decided before connection succeeds.</div><div class='add'>+	u8			CurrentTxFallbackRate;</div><div class='add'>+</div><div class='add'>+	//for Rate handler</div><div class='add'>+	u8			BRateSet[32];			//basic rate set</div><div class='add'>+	u8			SRateSet[32];			//support rate set</div><div class='add'>+</div><div class='add'>+	u8			NumOfBRate;</div><div class='add'>+	u8			NumOfSRate;</div><div class='add'>+	u8			NumOfDsssRateInSRate;	//number of DSSS rates in supported rate set</div><div class='add'>+	u8			reserved1;</div><div class='add'>+</div><div class='add'>+	u32			dwBasicRateBitmap;		//bit map of basic rates</div><div class='add'>+	u32			dwSupportRateBitmap;	//bit map of all support rates including</div><div class='add'>+										//basic and operational rates</div><div class='add'>+</div><div class='add'>+	////For SME/MLME handler</div><div class='add'>+	u16			wOldSTAindex;			// valid when boHandover=TRUE, store old connected STA index</div><div class='add'>+	u16			wConnectedSTAindex;		// Index of peerly connected AP or IBSS in</div><div class='add'>+										// the descriptionset.</div><div class='add'>+    u16			Association_ID;     	// The Association ID in the (Re)Association</div><div class='add'>+            	                    	// Response frame.</div><div class='add'>+    u16			ListenInterval;     	// The listen interval when SME invoking MLME_</div><div class='add'>+            	                    	// (Re)Associate_Request().</div><div class='add'>+</div><div class='add'>+	RadioOff		RadioOffStatus;</div><div class='add'>+	u8			Reserved0[2];</div><div class='add'>+</div><div class='add'>+	u8			boMsRadioOff;			// Ndis demands to be true when set Disassoc. OID and be false when set SSID OID.</div><div class='add'>+	u8			boAntennaDiversity;		//TRUE/ON or FALSE/OFF</div><div class='add'>+	u8			bAntennaNo;				//which antenna</div><div class='add'>+	u8			bConnectFlag;			//the connect status flag for roaming task</div><div class='add'>+</div><div class='add'>+	u8			RoamStatus;</div><div class='add'>+	u8			reserved7[3];</div><div class='add'>+</div><div class='add'>+	ChanInfo	CurrentChan;			//Current channel no. and channel band. It may be changed by scanning.</div><div class='add'>+	u8			boHandover;				// Roaming, Hnadover to other AP.</div><div class='add'>+	u8			boCCAbusy;</div><div class='add'>+</div><div class='add'>+	u16			CWMax;					// It may not be the real value that H/W used</div><div class='add'>+	u8			CWMin;					// 255: set according to 802.11 spec.</div><div class='add'>+	u8			reserved2;</div><div class='add'>+</div><div class='add'>+	//11G:</div><div class='add'>+	u8			bMacOperationMode;		// operation in 802.11b or 802.11g</div><div class='add'>+	u8			bSlotTimeMode;			//AUTO, s32</div><div class='add'>+	u8			bPreambleMode;			//AUTO, s32</div><div class='add'>+	u8			boNonERPpresent;</div><div class='add'>+</div><div class='add'>+	u8			boProtectMechanism;	// H/W will take the necessary action based on this variable</div><div class='add'>+	u8			boShortPreamble;	// H/W will take the necessary action based on this variable</div><div class='add'>+	u8			boShortSlotTime;	// H/W will take the necessary action based on this variable</div><div class='add'>+	u8			reserved_3;</div><div class='add'>+</div><div class='add'>+	u32       	RSN_IE_Bitmap;		//added by WS</div><div class='add'>+	u32      		RSN_OUI_Type;		//added by WS</div><div class='add'>+</div><div class='add'>+	//For the BSSID</div><div class='add'>+	u8			HwBssid[MAC_ADDR_LENGTH + 2];</div><div class='add'>+	u32			HwBssidValid;</div><div class='add'>+</div><div class='add'>+	//For scan list</div><div class='add'>+	u8			BssListCount;							//Total count of valid descriptor indexes</div><div class='add'>+	u8			boReceiveUncorrectInfo;	//important settings in beacon/probe resp. have been changed</div><div class='add'>+	u8			NoOfJoinerInIbss;</div><div class='add'>+	u8			reserved_4;</div><div class='add'>+</div><div class='add'>+	u8			BssListIndex[ (MAX_BSS_DESCRIPT_ELEMENT+3) &amp; ~0x03 ];	//Store the valid descriptor indexes obtained from scannings</div><div class='add'>+	u8			JoinerInIbss[ (MAX_BSS_DESCRIPT_ELEMENT+3) &amp; ~0x03 ];	//save the BssDescriptor index in this</div><div class='add'>+														//IBSS. The index 0 is local descriptor</div><div class='add'>+														//(psLOCAL-&gt;wConnectedSTAindex).</div><div class='add'>+														//If CONNECTED : NoOfJoinerInIbss &gt;=2</div><div class='add'>+														//		else   : NoOfJoinerInIbss &lt;=1</div><div class='add'>+</div><div class='add'>+	//// General Statistics, count at Rx_handler or Tx_callback interrupt handler</div><div class='add'>+    u64 	GS_XMIT_OK;				// Good Frames Transmitted</div><div class='add'>+    u64 	GS_RCV_OK;				// Good Frames Received</div><div class='add'>+	u32		GS_RCV_ERROR;			// Frames received with crc error</div><div class='add'>+	u32		GS_XMIT_ERROR;			// Bad Frames Transmitted</div><div class='add'>+	u32		GS_RCV_NO_BUFFER;		// Receive Buffer underrun</div><div class='add'>+	u32		GS_XMIT_ONE_COLLISION;	// one collision</div><div class='add'>+	u32		GS_XMIT_MORE_COLLISIONS;// more collisions</div><div class='add'>+</div><div class='add'>+    //================================================================</div><div class='add'>+    // Statistics (no matter whether it had done successfully) -wkchen</div><div class='add'>+    //================================================================</div><div class='add'>+    u32		   	_NumRxMSDU;</div><div class='add'>+    u32	   		_NumTxMSDU;</div><div class='add'>+    u32	   		_dot11WEPExcludedCount;</div><div class='add'>+    u32	   		_dot11WEPUndecryptableCount;</div><div class='add'>+    u32	   		_dot11FrameDuplicateCount;</div><div class='add'>+</div><div class='add'>+	ChanInfo	IbssChanSetting;	// 2B. Start IBSS Channel setting by registry or WWU.</div><div class='add'>+	u8		reserved_5[2];		//It may not be used after considering RF type,</div><div class='add'>+									//region and modulation type.</div><div class='add'>+</div><div class='add'>+	CHAN_LIST	sSupportChanList;	// 86B. It will be obtained according to RF type and region</div><div class='add'>+	u8		reserved_6[2];		//two variables are for wep key error detection added by ws 02/02/04</div><div class='add'>+</div><div class='add'>+    u32	      bWepKeyError;</div><div class='add'>+    u32         bToSelfPacketReceived;</div><div class='add'>+    u32         WepKeyDetectTimerCount;</div><div class='add'>+</div><div class='add'>+	Event_Log	EventLog;</div><div class='add'>+</div><div class='add'>+	u16		SignalLostTh;</div><div class='add'>+	u16		SignalRoamTh;</div><div class='add'>+</div><div class='add'>+	// 20061108 WPS IE Append</div><div class='add'>+	u8		IE_Append_data[MAX_IE_APPEND_SIZE];</div><div class='add'>+	u16		IE_Append_size;</div><div class='add'>+	u16		reserved_7;</div><div class='add'>+</div><div class='add'>+} WB_LOCALDESCRIPT, *PWB_LOCALDESCRIPT;</div><div class='add'>+</div><div class='add'>+</div><div class='head'>diff --git a/drivers/staging/winbond/mac_structures.h b/drivers/staging/winbond/mac_structures.h<br/>new file mode 100644<br/>index 000000000000..031d2cb6cd63<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/winbond/mac_structures.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/mac_structures.h</a></div><div class='hunk'>@@ -0,0 +1,670 @@</div><div class='add'>+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++</div><div class='add'>+// MAC_Structures.h</div><div class='add'>+//</div><div class='add'>+// This file contains the definitions and data structures used by SW-MAC.</div><div class='add'>+//</div><div class='add'>+// Revision Histoy</div><div class='add'>+//=================</div><div class='add'>+// 0.1      2002        UN00</div><div class='add'>+// 0.2      20021004    PD43 CCLiu6</div><div class='add'>+//          20021018    PD43 CCLiu6</div><div class='add'>+//                      Add enum_TxRate type</div><div class='add'>+//                      Modify enum_STAState type</div><div class='add'>+// 0.3      20021023    PE23 CYLiu update MAC session struct</div><div class='add'>+//          20021108</div><div class='add'>+//          20021122    PD43 Austin</div><div class='add'>+//                      Deleted some unused.</div><div class='add'>+//          20021129    PD43 Austin</div><div class='add'>+//			20030617	increase the 802.11g definition</div><div class='add'>+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++</div><div class='add'>+</div><div class='add'>+#ifndef _MAC_Structures_H_</div><div class='add'>+#define _MAC_Structures_H_</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+//=========================================================</div><div class='add'>+// Some miscellaneous definitions</div><div class='add'>+//-----</div><div class='add'>+#define MAX_CHANNELS                        30</div><div class='add'>+#define MAC_ADDR_LENGTH                     6</div><div class='add'>+#define MAX_WEP_KEY_SIZE                    16  // 128 bits</div><div class='add'>+#define	MAX_802_11_FRAGMENT_NUMBER		10 // By spec</div><div class='add'>+</div><div class='add'>+//========================================================</div><div class='add'>+// 802.11 Frame define</div><div class='add'>+//-----</div><div class='add'>+#define MASK_PROTOCOL_VERSION_TYPE	0x0F</div><div class='add'>+#define MASK_FRAGMENT_NUMBER		0x000F</div><div class='add'>+#define SEQUENCE_NUMBER_SHIFT		4</div><div class='add'>+#define DIFFER_11_TO_3				18</div><div class='add'>+#define DOT_11_MAC_HEADER_SIZE		24</div><div class='add'>+#define DOT_11_SNAP_SIZE			6</div><div class='add'>+#define DOT_11_DURATION_OFFSET		2</div><div class='add'>+#define DOT_11_SEQUENCE_OFFSET		22 //Sequence control offset</div><div class='add'>+#define DOT_11_TYPE_OFFSET			30 //The start offset of 802.11 Frame//</div><div class='add'>+#define DOT_11_DATA_OFFSET          24</div><div class='add'>+#define DOT_11_DA_OFFSET			4</div><div class='add'>+#define DOT_3_TYPE_ARP				0x80F3</div><div class='add'>+#define DOT_3_TYPE_IPX				0x8137</div><div class='add'>+#define DOT_3_TYPE_OFFSET			12</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define ETHERNET_HEADER_SIZE			14</div><div class='add'>+#define MAX_ETHERNET_PACKET_SIZE		1514</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+//-----  management : Type of Bits (2, 3) and Subtype of Bits (4, 5, 6, 7)</div><div class='add'>+#define MAC_SUBTYPE_MNGMNT_ASSOC_REQUEST    0x00</div><div class='add'>+#define MAC_SUBTYPE_MNGMNT_ASSOC_RESPONSE   0x10</div><div class='add'>+#define MAC_SUBTYPE_MNGMNT_REASSOC_REQUEST  0x20</div><div class='add'>+#define MAC_SUBTYPE_MNGMNT_REASSOC_RESPONSE 0x30</div><div class='add'>+#define MAC_SUBTYPE_MNGMNT_PROBE_REQUEST    0x40</div><div class='add'>+#define MAC_SUBTYPE_MNGMNT_PROBE_RESPONSE   0x50</div><div class='add'>+#define MAC_SUBTYPE_MNGMNT_BEACON           0x80</div><div class='add'>+#define MAC_SUBTYPE_MNGMNT_ATIM             0x90</div><div class='add'>+#define MAC_SUBTYPE_MNGMNT_DISASSOCIATION   0xA0</div><div class='add'>+#define MAC_SUBTYPE_MNGMNT_AUTHENTICATION   0xB0</div><div class='add'>+#define MAC_SUBTYPE_MNGMNT_DEAUTHENTICATION 0xC0</div><div class='add'>+</div><div class='add'>+//-----  control : Type of Bits (2, 3) and Subtype of Bits (4, 5, 6, 7)</div><div class='add'>+#define MAC_SUBTYPE_CONTROL_PSPOLL          0xA4</div><div class='add'>+#define MAC_SUBTYPE_CONTROL_RTS             0xB4</div><div class='add'>+#define MAC_SUBTYPE_CONTROL_CTS             0xC4</div><div class='add'>+#define MAC_SUBTYPE_CONTROL_ACK             0xD4</div><div class='add'>+#define MAC_SUBTYPE_CONTROL_CFEND           0xE4</div><div class='add'>+#define MAC_SUBTYPE_CONTROL_CFEND_CFACK     0xF4</div><div class='add'>+</div><div class='add'>+//-----  data : Type of Bits (2, 3) and Subtype of Bits (4, 5, 6, 7)</div><div class='add'>+#define MAC_SUBTYPE_DATA                    0x08</div><div class='add'>+#define MAC_SUBTYPE_DATA_CFACK              0x18</div><div class='add'>+#define MAC_SUBTYPE_DATA_CFPOLL             0x28</div><div class='add'>+#define MAC_SUBTYPE_DATA_CFACK_CFPOLL       0x38</div><div class='add'>+#define MAC_SUBTYPE_DATA_NULL               0x48</div><div class='add'>+#define MAC_SUBTYPE_DATA_CFACK_NULL         0x58</div><div class='add'>+#define MAC_SUBTYPE_DATA_CFPOLL_NULL        0x68</div><div class='add'>+#define MAC_SUBTYPE_DATA_CFACK_CFPOLL_NULL  0x78</div><div class='add'>+</div><div class='add'>+//-----  Frame Type of Bits (2, 3)</div><div class='add'>+#define MAC_TYPE_MANAGEMENT                 0x00</div><div class='add'>+#define MAC_TYPE_CONTROL                    0x04</div><div class='add'>+#define MAC_TYPE_DATA                       0x08</div><div class='add'>+</div><div class='add'>+//----- definitions for Management Frame Element ID (1 BYTE)</div><div class='add'>+#define ELEMENT_ID_SSID                     0</div><div class='add'>+#define ELEMENT_ID_SUPPORTED_RATES          1</div><div class='add'>+#define ELEMENT_ID_FH_PARAMETER_SET         2</div><div class='add'>+#define ELEMENT_ID_DS_PARAMETER_SET         3</div><div class='add'>+#define ELEMENT_ID_CF_PARAMETER_SET         4</div><div class='add'>+#define ELEMENT_ID_TIM                      5</div><div class='add'>+#define ELEMENT_ID_IBSS_PARAMETER_SET       6</div><div class='add'>+// 7~15 reserverd</div><div class='add'>+#define ELEMENT_ID_CHALLENGE_TEXT           16</div><div class='add'>+// 17~31 reserved for challenge text extension</div><div class='add'>+// 32~255 reserved</div><div class='add'>+//--  11G  --</div><div class='add'>+#define ELEMENT_ID_ERP_INFORMATION			42</div><div class='add'>+#define ELEMENT_ID_EXTENDED_SUPPORTED_RATES 50</div><div class='add'>+</div><div class='add'>+//--  WPA  --</div><div class='add'>+</div><div class='add'>+#define ELEMENT_ID_RSN_WPA					221</div><div class='add'>+#ifdef _WPA2_</div><div class='add'>+#define ELEMENT_ID_RSN_WPA2				    48</div><div class='add'>+#endif //endif WPA2</div><div class='add'>+</div><div class='add'>+#define WLAN_MAX_PAIRWISE_CIPHER_SUITE_COUNT    ((u16) 6)</div><div class='add'>+#define WLAN_MAX_AUTH_KEY_MGT_SUITE_LIST_COUNT  ((u16) 2)</div><div class='add'>+</div><div class='add'>+#ifdef WB_LINUX</div><div class='add'>+#define UNALIGNED</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+//========================================================</div><div class='add'>+typedef enum enum_PowerManagementMode</div><div class='add'>+{</div><div class='add'>+    ACTIVE = 0,</div><div class='add'>+    POWER_SAVE</div><div class='add'>+} WB_PM_Mode, *PWB_PM_MODE;</div><div class='add'>+</div><div class='add'>+//===================================================================</div><div class='add'>+//  Reason Code (Table 18): indicate the reason of DisAssoc, DeAuthen</div><div class='add'>+//  length of ReasonCode is 2 Octs.</div><div class='add'>+//===================================================================</div><div class='add'>+#define REASON_REASERED             0</div><div class='add'>+#define REASON_UNSPECIDIED          1</div><div class='add'>+#define REASON_PREAUTH_INVALID      2</div><div class='add'>+#define DEAUTH_REASON_LEFT_BSS      3</div><div class='add'>+#define DISASS_REASON_AP_INACTIVE   4</div><div class='add'>+#define DISASS_REASON_AP_BUSY       5</div><div class='add'>+#define REASON_CLASS2_FRAME_FROM_NONAUTH_STA    6</div><div class='add'>+#define REASON_CLASS3_FRAME_FROM_NONASSO_STA    7</div><div class='add'>+#define DISASS_REASON_LEFT_BSS      8</div><div class='add'>+#define REASON_NOT_AUTH_YET         9</div><div class='add'>+//802.11i define</div><div class='add'>+#define REASON_INVALID_IE						13</div><div class='add'>+#define REASON_MIC_ERROR						14</div><div class='add'>+#define REASON_4WAY_HANDSHAKE_TIMEOUT			15</div><div class='add'>+#define REASON_GROUPKEY_UPDATE_TIMEOUT			16</div><div class='add'>+#define REASON_IE_DIFF_4WAY_ASSOC				17</div><div class='add'>+#define REASON_INVALID_MULTICAST_CIPHER			18</div><div class='add'>+#define REASON_INVALID_UNICAST_CIPHER			19</div><div class='add'>+#define REASON_INVALID_AKMP						20</div><div class='add'>+#define REASON_UNSUPPORTED_RSNIE_VERSION		21</div><div class='add'>+#define REASON_INVALID_RSNIE_CAPABILITY			22</div><div class='add'>+#define REASON_802_1X_AUTH_FAIL					23</div><div class='add'>+#define	REASON_CIPHER_REJECT_PER_SEC_POLICY		14</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+//===========================================================</div><div class='add'>+// enum_MMPDUResultCode --</div><div class='add'>+//   Status code (2 Octs) in the MMPDU's frame body. Table.19</div><div class='add'>+//</div><div class='add'>+//===========================================================</div><div class='add'>+enum enum_MMPDUResultCode</div><div class='add'>+{</div><div class='add'>+//    SUCCESS   = 0,      // Redefined</div><div class='add'>+    UNSPECIFIED_FAILURE                         = 1,</div><div class='add'>+</div><div class='add'>+    // 2 - 9 Reserved</div><div class='add'>+</div><div class='add'>+    NOT_SUPPROT_CAPABILITIES                    = 10,</div><div class='add'>+</div><div class='add'>+    //REASSOCIATION_DENIED</div><div class='add'>+    //</div><div class='add'>+    REASSOC_DENIED_UNABLE_CFM_ASSOC_EXIST       = 11,</div><div class='add'>+</div><div class='add'>+    //ASSOCIATION_DENIED_NOT_IN_STANDARD</div><div class='add'>+    //</div><div class='add'>+    ASSOC_DENIED_REASON_NOT_IN_STANDARD         = 12,</div><div class='add'>+    PEER_NOT_SUPPORT_AUTH_ALGORITHM             = 13,</div><div class='add'>+    AUTH_SEQNUM_OUT_OF_EXPECT                   = 14,</div><div class='add'>+    AUTH_REJECT_REASON_CHALLENGE_FAIL           = 15,</div><div class='add'>+    AUTH_REJECT_REASON_WAIT_TIMEOUT             = 16,</div><div class='add'>+    ASSOC_DENIED_REASON_AP_BUSY                 = 17,</div><div class='add'>+    ASSOC_DENIED_REASON_NOT_SUPPORT_BASIC_RATE  = 18</div><div class='add'>+} WB_MMPDURESULTCODE, *PWB_MMPDURESULTCODE;</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+//===========================================================</div><div class='add'>+// enum_TxRate --</div><div class='add'>+//   Define the transmission constants based on W89C32 MAC</div><div class='add'>+//   target specification.</div><div class='add'>+//===========================================================</div><div class='add'>+typedef enum enum_TxRate</div><div class='add'>+{</div><div class='add'>+    TXRATE_1M               = 0,</div><div class='add'>+    TXRATE_2MLONG           = 2,</div><div class='add'>+    TXRATE_2MSHORT          = 3,</div><div class='add'>+    TXRATE_55MLONG          = 4,</div><div class='add'>+    TXRATE_55MSHORT         = 5,</div><div class='add'>+    TXRATE_11MLONG          = 6,</div><div class='add'>+    TXRATE_11MSHORT         = 7,</div><div class='add'>+    TXRATE_AUTO             = 255           // PD43 20021108</div><div class='add'>+} WB_TXRATE, *PWB_TXRATE;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define	RATE_BITMAP_1M				1</div><div class='add'>+#define	RATE_BITMAP_2M				2</div><div class='add'>+#define	RATE_BITMAP_5dot5M			5</div><div class='add'>+#define RATE_BITMAP_6M				6</div><div class='add'>+#define RATE_BITMAP_9M				9</div><div class='add'>+#define RATE_BITMAP_11M				11</div><div class='add'>+#define RATE_BITMAP_12M				12</div><div class='add'>+#define RATE_BITMAP_18M				18</div><div class='add'>+#define RATE_BITMAP_22M				22</div><div class='add'>+#define RATE_BITMAP_24M				24</div><div class='add'>+#define RATE_BITMAP_33M				17</div><div class='add'>+#define RATE_BITMAP_36M				19</div><div class='add'>+#define RATE_BITMAP_48M				25</div><div class='add'>+#define RATE_BITMAP_54M				28</div><div class='add'>+</div><div class='add'>+#define RATE_AUTO					0</div><div class='add'>+#define RATE_1M						2</div><div class='add'>+#define RATE_2M						4</div><div class='add'>+#define RATE_5dot5M					11</div><div class='add'>+#define RATE_6M						12</div><div class='add'>+#define RATE_9M						18</div><div class='add'>+#define RATE_11M					22</div><div class='add'>+#define RATE_12M					24</div><div class='add'>+#define RATE_18M					36</div><div class='add'>+#define RATE_22M					44</div><div class='add'>+#define RATE_24M					48</div><div class='add'>+#define RATE_33M					66</div><div class='add'>+#define RATE_36M					72</div><div class='add'>+#define RATE_48M					96</div><div class='add'>+#define RATE_54M					108</div><div class='add'>+#define RATE_MAX					255</div><div class='add'>+</div><div class='add'>+//CAPABILITY</div><div class='add'>+#define CAPABILITY_ESS_BIT				0x0001</div><div class='add'>+#define CAPABILITY_IBSS_BIT				0x0002</div><div class='add'>+#define CAPABILITY_CF_POLL_BIT			0x0004</div><div class='add'>+#define CAPABILITY_CF_POLL_REQ_BIT		0x0008</div><div class='add'>+#define CAPABILITY_PRIVACY_BIT			0x0010</div><div class='add'>+#define CAPABILITY_SHORT_PREAMBLE_BIT	0x0020</div><div class='add'>+#define CAPABILITY_PBCC_BIT				0x0040</div><div class='add'>+#define CAPABILITY_CHAN_AGILITY_BIT		0x0080</div><div class='add'>+#define CAPABILITY_SHORT_SLOT_TIME_BIT	0x0400</div><div class='add'>+#define CAPABILITY_DSSS_OFDM_BIT		0x2000</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+struct Capability_Information_Element</div><div class='add'>+{</div><div class='add'>+  union</div><div class='add'>+  {</div><div class='add'>+  	u16 __attribute__ ((packed)) wValue;</div><div class='add'>+    #ifdef _BIG_ENDIAN_  //20060926 add by anson's endian</div><div class='add'>+    struct _Capability</div><div class='add'>+    {</div><div class='add'>+        //--  11G  --</div><div class='add'>+	u8	Reserved3 : 2;</div><div class='add'>+	u8	DSSS_OFDM : 1;</div><div class='add'>+	u8	Reserved2 : 2;</div><div class='add'>+	u8	Short_Slot_Time : 1;</div><div class='add'>+	u8    Reserved1 : 2;</div><div class='add'>+	u8    Channel_Agility : 1;</div><div class='add'>+	u8    PBCC : 1;</div><div class='add'>+	u8    ShortPreamble : 1;</div><div class='add'>+	u8    CF_Privacy : 1;</div><div class='add'>+	u8    CF_Poll_Request : 1;</div><div class='add'>+	u8    CF_Pollable : 1;</div><div class='add'>+	u8    IBSS : 1;</div><div class='add'>+	u8    ESS : 1;</div><div class='add'>+    } __attribute__ ((packed)) Capability;</div><div class='add'>+    #else</div><div class='add'>+    struct _Capability</div><div class='add'>+    {</div><div class='add'>+        u8    ESS : 1;</div><div class='add'>+        u8    IBSS : 1;</div><div class='add'>+        u8    CF_Pollable : 1;</div><div class='add'>+        u8    CF_Poll_Request : 1;</div><div class='add'>+        u8    CF_Privacy : 1;</div><div class='add'>+        u8    ShortPreamble : 1;</div><div class='add'>+        u8    PBCC : 1;</div><div class='add'>+        u8    Channel_Agility : 1;</div><div class='add'>+        u8    Reserved1 : 2;</div><div class='add'>+		//--  11G  --</div><div class='add'>+		u8	Short_Slot_Time : 1;</div><div class='add'>+		u8	Reserved2 : 2;</div><div class='add'>+		u8	DSSS_OFDM : 1;</div><div class='add'>+		u8	Reserved3 : 2;</div><div class='add'>+    } __attribute__ ((packed)) Capability;</div><div class='add'>+    #endif</div><div class='add'>+  }__attribute__ ((packed)) ;</div><div class='add'>+}__attribute__ ((packed));</div><div class='add'>+</div><div class='add'>+struct FH_Parameter_Set_Element</div><div class='add'>+{</div><div class='add'>+    u8    Element_ID;</div><div class='add'>+    u8    Length;</div><div class='add'>+    u8    Dwell_Time[2];</div><div class='add'>+    u8    Hop_Set;</div><div class='add'>+    u8    Hop_Pattern;</div><div class='add'>+    u8    Hop_Index;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct DS_Parameter_Set_Element</div><div class='add'>+{</div><div class='add'>+    u8    Element_ID;</div><div class='add'>+    u8    Length;</div><div class='add'>+    u8    Current_Channel;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct Supported_Rates_Element</div><div class='add'>+{</div><div class='add'>+    u8    Element_ID;</div><div class='add'>+    u8    Length;</div><div class='add'>+    u8    SupportedRates[8];</div><div class='add'>+}__attribute__ ((packed));</div><div class='add'>+</div><div class='add'>+struct SSID_Element</div><div class='add'>+{</div><div class='add'>+    u8    Element_ID;</div><div class='add'>+    u8    Length;</div><div class='add'>+    u8    SSID[32];</div><div class='add'>+}__attribute__ ((packed)) ;</div><div class='add'>+</div><div class='add'>+struct CF_Parameter_Set_Element</div><div class='add'>+{</div><div class='add'>+    u8    Element_ID;</div><div class='add'>+    u8    Length;</div><div class='add'>+    u8    CFP_Count;</div><div class='add'>+    u8    CFP_Period;</div><div class='add'>+    u8    CFP_MaxDuration[2];     // in Time Units</div><div class='add'>+    u8    CFP_DurRemaining[2];    // in time units</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct TIM_Element</div><div class='add'>+{</div><div class='add'>+    u8    Element_ID;</div><div class='add'>+    u8    Length;</div><div class='add'>+    u8    DTIM_Count;</div><div class='add'>+    u8    DTIM_Period;</div><div class='add'>+    u8    Bitmap_Control;</div><div class='add'>+    u8    Partial_Virtual_Bitmap[251];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct IBSS_Parameter_Set_Element</div><div class='add'>+{</div><div class='add'>+    u8    Element_ID;</div><div class='add'>+    u8    Length;</div><div class='add'>+    u8    ATIM_Window[2];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct Challenge_Text_Element</div><div class='add'>+{</div><div class='add'>+    u8    Element_ID;</div><div class='add'>+    u8    Length;</div><div class='add'>+    u8    Challenge_Text[253];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct PHY_Parameter_Set_Element</div><div class='add'>+{</div><div class='add'>+//  int     aSlotTime;</div><div class='add'>+//  int     aSifsTime;</div><div class='add'>+    s32     aCCATime;</div><div class='add'>+    s32     aRxTxTurnaroundTime;</div><div class='add'>+    s32     aTxPLCPDelay;</div><div class='add'>+    s32     RxPLCPDelay;</div><div class='add'>+    s32     aRxTxSwitchTime;</div><div class='add'>+    s32     aTxRampOntime;</div><div class='add'>+    s32     aTxRampOffTime;</div><div class='add'>+    s32     aTxRFDelay;</div><div class='add'>+    s32     aRxRFDelay;</div><div class='add'>+    s32     aAirPropagationTime;</div><div class='add'>+    s32     aMACProcessingDelay;</div><div class='add'>+    s32     aPreambleLength;</div><div class='add'>+    s32     aPLCPHeaderLength;</div><div class='add'>+    s32     aMPDUDurationFactor;</div><div class='add'>+    s32     aMPDUMaxLength;</div><div class='add'>+//  int     aCWmin;</div><div class='add'>+//  int     aCWmax;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+//--  11G  --</div><div class='add'>+struct ERP_Information_Element</div><div class='add'>+{</div><div class='add'>+    u8	Element_ID;</div><div class='add'>+    u8	Length;</div><div class='add'>+    #ifdef _BIG_ENDIAN_ //20060926 add by anson's endian</div><div class='add'>+    	u8	Reserved:5;   //20060926 add by anson</div><div class='add'>+       u8	Barker_Preamble_Mode:1;</div><div class='add'>+	u8	Use_Protection:1;</div><div class='add'>+       u8	NonERP_Present:1;</div><div class='add'>+    #else</div><div class='add'>+	u8	NonERP_Present:1;</div><div class='add'>+	u8	Use_Protection:1;</div><div class='add'>+	u8	Barker_Preamble_Mode:1;</div><div class='add'>+	u8	Reserved:5;</div><div class='add'>+    #endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct Extended_Supported_Rates_Element</div><div class='add'>+{</div><div class='add'>+    u8	Element_ID;</div><div class='add'>+    u8	Length;</div><div class='add'>+    u8	ExtendedSupportedRates[255];</div><div class='add'>+}__attribute__ ((packed));</div><div class='add'>+</div><div class='add'>+//WPA(802.11i draft 3.0)</div><div class='add'>+#define VERSION_WPA				1</div><div class='add'>+#ifdef _WPA2_</div><div class='add'>+#define VERSION_WPA2            1</div><div class='add'>+#endif //end def  _WPA2_</div><div class='add'>+#define OUI_WPA					0x00F25000	//WPA2.0 OUI=00:50:F2, the MSB is reserved for suite type</div><div class='add'>+#ifdef _WPA2_</div><div class='add'>+#define OUI_WPA2				0x00AC0F00	// for wpa2 change to 0x00ACOF04 by Ws 26/04/04</div><div class='add'>+#endif //end def _WPA2_</div><div class='add'>+</div><div class='add'>+#define OUI_WPA_ADDITIONAL		0x01</div><div class='add'>+#define WLAN_MIN_RSN_WPA_LENGTH                 6 //added by ws 09/10/04</div><div class='add'>+#ifdef _WPA2_</div><div class='add'>+#define WLAN_MIN_RSN_WPA2_LENGTH                2 // Fix to 2 09/14/05</div><div class='add'>+#endif //end def _WPA2_</div><div class='add'>+</div><div class='add'>+#define oui_wpa                  (u32)(OUI_WPA|OUI_WPA_ADDITIONAL)</div><div class='add'>+</div><div class='add'>+#define WPA_OUI_BIG    ((u32) 0x01F25000)//added by ws 09/23/04</div><div class='add'>+#define WPA_OUI_LITTLE  ((u32) 0x01F25001)//added by ws 09/23/04</div><div class='add'>+</div><div class='add'>+#define WPA_WPS_OUI				cpu_to_le32(0x04F25000) // 20061108 For WPS. It's little endian. Big endian is 0x0050F204</div><div class='add'>+</div><div class='add'>+//-----WPA2-----</div><div class='add'>+#ifdef _WPA2_</div><div class='add'>+#define WPA2_OUI_BIG    ((u32)0x01AC0F00)</div><div class='add'>+#define WPA2_OUI_LITTLE ((u32)0x01AC0F01)</div><div class='add'>+#endif //end def _WPA2_</div><div class='add'>+</div><div class='add'>+//Authentication suite</div><div class='add'>+#define OUI_AUTH_WPA_NONE           0x00 //for WPA_NONE</div><div class='add'>+#define OUI_AUTH_8021X				0x01</div><div class='add'>+#define OUI_AUTH_PSK				0x02</div><div class='add'>+//Cipher suite</div><div class='add'>+#define OUI_CIPHER_GROUP_KEY        0x00  //added by ws 05/21/04</div><div class='add'>+#define OUI_CIPHER_WEP_40			0x01</div><div class='add'>+#define OUI_CIPHER_TKIP				0x02</div><div class='add'>+#define OUI_CIPHER_CCMP				0x04</div><div class='add'>+#define OUI_CIPHER_WEP_104			0x05</div><div class='add'>+</div><div class='add'>+typedef struct _SUITE_SELECTOR_</div><div class='add'>+{</div><div class='add'>+	union</div><div class='add'>+	{</div><div class='add'>+		u8	Value[4];</div><div class='add'>+		struct _SUIT_</div><div class='add'>+		{</div><div class='add'>+			u8	OUI[3];</div><div class='add'>+			u8	Type;</div><div class='add'>+		}SuitSelector;</div><div class='add'>+	};</div><div class='add'>+}SUITE_SELECTOR;</div><div class='add'>+</div><div class='add'>+//--  WPA  --</div><div class='add'>+struct	RSN_Information_Element</div><div class='add'>+{</div><div class='add'>+	u8					Element_ID;</div><div class='add'>+	u8					Length;</div><div class='add'>+	UNALIGNED SUITE_SELECTOR	OuiWPAAdditional;//WPA version 2.0 additional field, and should be 00:50:F2:01</div><div class='add'>+	u16					Version;</div><div class='add'>+	SUITE_SELECTOR		GroupKeySuite;</div><div class='add'>+	u16					PairwiseKeySuiteCount;</div><div class='add'>+	SUITE_SELECTOR		PairwiseKeySuite[1];</div><div class='add'>+}__attribute__ ((packed));</div><div class='add'>+struct RSN_Auth_Sub_Information_Element</div><div class='add'>+{</div><div class='add'>+	u16				AuthKeyMngtSuiteCount;</div><div class='add'>+	SUITE_SELECTOR	AuthKeyMngtSuite[1];</div><div class='add'>+}__attribute__ ((packed));</div><div class='add'>+</div><div class='add'>+//--  WPA2  --</div><div class='add'>+struct RSN_Capability_Element</div><div class='add'>+{</div><div class='add'>+  union</div><div class='add'>+  {</div><div class='add'>+	u16	__attribute__ ((packed))	wValue;</div><div class='add'>+    #ifdef _BIG_ENDIAN_	 //20060927 add by anson's endian</div><div class='add'>+    struct _RSN_Capability</div><div class='add'>+    {</div><div class='add'>+    	u16   __attribute__ ((packed))  Reserved2 : 8; // 20051201</div><div class='add'>+	u16   __attribute__ ((packed))  Reserved1 : 2;</div><div class='add'>+	u16   __attribute__ ((packed))  GTK_Replay_Counter : 2;</div><div class='add'>+	u16   __attribute__ ((packed))  PTK_Replay_Counter : 2;</div><div class='add'>+	u16   __attribute__ ((packed))  No_Pairwise : 1;</div><div class='add'>+        u16   __attribute__ ((packed))  Pre_Auth : 1;</div><div class='add'>+    }__attribute__ ((packed))  RSN_Capability;</div><div class='add'>+    #else</div><div class='add'>+    struct _RSN_Capability</div><div class='add'>+    {</div><div class='add'>+        u16   __attribute__ ((packed))  Pre_Auth : 1;</div><div class='add'>+        u16   __attribute__ ((packed))  No_Pairwise : 1;</div><div class='add'>+        u16   __attribute__ ((packed))  PTK_Replay_Counter : 2;</div><div class='add'>+	    u16   __attribute__ ((packed))  GTK_Replay_Counter : 2;</div><div class='add'>+	    u16   __attribute__ ((packed))  Reserved1 : 2;</div><div class='add'>+	    u16   __attribute__ ((packed))  Reserved2 : 8; // 20051201</div><div class='add'>+    }__attribute__ ((packed))  RSN_Capability;</div><div class='add'>+    #endif</div><div class='add'>+</div><div class='add'>+  }__attribute__ ((packed)) ;</div><div class='add'>+}__attribute__ ((packed)) ;</div><div class='add'>+</div><div class='add'>+#ifdef _WPA2_</div><div class='add'>+typedef struct _PMKID</div><div class='add'>+{</div><div class='add'>+  u8 pValue[16];</div><div class='add'>+}PMKID;</div><div class='add'>+</div><div class='add'>+struct	WPA2_RSN_Information_Element</div><div class='add'>+{</div><div class='add'>+	u8					Element_ID;</div><div class='add'>+	u8					Length;</div><div class='add'>+	u16					Version;</div><div class='add'>+	SUITE_SELECTOR		GroupKeySuite;</div><div class='add'>+	u16					PairwiseKeySuiteCount;</div><div class='add'>+	SUITE_SELECTOR		PairwiseKeySuite[1];</div><div class='add'>+</div><div class='add'>+}__attribute__ ((packed));</div><div class='add'>+</div><div class='add'>+struct WPA2_RSN_Auth_Sub_Information_Element</div><div class='add'>+{</div><div class='add'>+	u16				AuthKeyMngtSuiteCount;</div><div class='add'>+	SUITE_SELECTOR	AuthKeyMngtSuite[1];</div><div class='add'>+}__attribute__ ((packed));</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+struct PMKID_Information_Element</div><div class='add'>+{</div><div class='add'>+	u16				PMKID_Count;</div><div class='add'>+	PMKID pmkid [16] ;</div><div class='add'>+}__attribute__ ((packed));</div><div class='add'>+</div><div class='add'>+#endif //enddef _WPA2_</div><div class='add'>+//============================================================</div><div class='add'>+// MAC Frame structure (different type) and subfield structure</div><div class='add'>+//============================================================</div><div class='add'>+struct MAC_frame_control</div><div class='add'>+{</div><div class='add'>+    u8    mac_frame_info; // a combination of the [Protocol Version, Control Type, Control Subtype]</div><div class='add'>+    #ifdef _BIG_ENDIAN_ //20060927 add by anson's endian</div><div class='add'>+    u8    order:1;</div><div class='add'>+    u8    WEP:1;</div><div class='add'>+    u8    more_data:1;</div><div class='add'>+    u8    pwr_mgt:1;</div><div class='add'>+    u8    retry:1;</div><div class='add'>+    u8    more_frag:1;</div><div class='add'>+    u8    from_ds:1;</div><div class='add'>+    u8    to_ds:1;</div><div class='add'>+    #else</div><div class='add'>+    u8    to_ds:1;</div><div class='add'>+    u8    from_ds:1;</div><div class='add'>+    u8    more_frag:1;</div><div class='add'>+    u8    retry:1;</div><div class='add'>+    u8    pwr_mgt:1;</div><div class='add'>+    u8    more_data:1;</div><div class='add'>+    u8    WEP:1;</div><div class='add'>+    u8    order:1;</div><div class='add'>+    #endif</div><div class='add'>+} __attribute__ ((packed));</div><div class='add'>+</div><div class='add'>+struct Management_Frame {</div><div class='add'>+    struct MAC_frame_control frame_control; // 2B, ToDS,FromDS,MoreFrag,MoreData,Order=0</div><div class='add'>+    u16		duration;</div><div class='add'>+    u8		DA[MAC_ADDR_LENGTH];			// Addr1</div><div class='add'>+    u8		SA[MAC_ADDR_LENGTH];			// Addr2</div><div class='add'>+    u8		BSSID[MAC_ADDR_LENGTH];			// Addr3</div><div class='add'>+    u16		Sequence_Control;</div><div class='add'>+    // Management Frame Body &lt;= 325 bytes</div><div class='add'>+    // FCS 4 bytes</div><div class='add'>+}__attribute__ ((packed));</div><div class='add'>+</div><div class='add'>+// SW-MAC don't Tx/Rx Control-Frame, HW-MAC do it.</div><div class='add'>+struct Control_Frame {</div><div class='add'>+    struct MAC_frame_control frame_control; // ToDS,FromDS,MoreFrag,Retry,MoreData,WEP,Order=0</div><div class='add'>+    u16		duration;</div><div class='add'>+    u8		RA[MAC_ADDR_LENGTH];</div><div class='add'>+    u8		TA[MAC_ADDR_LENGTH];</div><div class='add'>+    u16		FCS;</div><div class='add'>+}__attribute__ ((packed));</div><div class='add'>+</div><div class='add'>+struct Data_Frame {</div><div class='add'>+    struct MAC_frame_control frame_control;</div><div class='add'>+    u16		duration;</div><div class='add'>+    u8		Addr1[MAC_ADDR_LENGTH];</div><div class='add'>+    u8		Addr2[MAC_ADDR_LENGTH];</div><div class='add'>+    u8		Addr3[MAC_ADDR_LENGTH];</div><div class='add'>+    u16		Sequence_Control;</div><div class='add'>+    u8		Addr4[MAC_ADDR_LENGTH]; // only exist when ToDS=FromDS=1</div><div class='add'>+    // Data Frame Body &lt;= 2312</div><div class='add'>+    // FCS</div><div class='add'>+}__attribute__ ((packed));</div><div class='add'>+</div><div class='add'>+struct Disassociation_Frame_Body</div><div class='add'>+{</div><div class='add'>+    u16    reasonCode;</div><div class='add'>+}__attribute__ ((packed));</div><div class='add'>+</div><div class='add'>+struct Association_Request_Frame_Body</div><div class='add'>+{</div><div class='add'>+    u16    capability_information;</div><div class='add'>+    u16    listenInterval;</div><div class='add'>+    u8     Current_AP_Address[MAC_ADDR_LENGTH];//for reassociation only</div><div class='add'>+    // SSID (2+32 bytes)</div><div class='add'>+    // Supported_Rates (2+8 bytes)</div><div class='add'>+}__attribute__ ((packed));</div><div class='add'>+</div><div class='add'>+struct Association_Response_Frame_Body</div><div class='add'>+{</div><div class='add'>+    u16    capability_information;</div><div class='add'>+    u16    statusCode;</div><div class='add'>+    u16    Association_ID;</div><div class='add'>+    struct Supported_Rates_Element supportedRates;</div><div class='add'>+}__attribute__ ((packed));</div><div class='add'>+</div><div class='add'>+/*struct Reassociation_Request_Frame_Body</div><div class='add'>+{</div><div class='add'>+    u16    capability_information;</div><div class='add'>+    u16    listenInterval;</div><div class='add'>+    u8     Current_AP_Address[MAC_ADDR_LENGTH];</div><div class='add'>+    // SSID (2+32 bytes)</div><div class='add'>+    // Supported_Rates (2+8 bytes)</div><div class='add'>+};*/</div><div class='add'>+// eliminated by WS 07/22/04 comboined with associateion request frame.</div><div class='add'>+</div><div class='add'>+struct Reassociation_Response_Frame_Body</div><div class='add'>+{</div><div class='add'>+    u16    capability_information;</div><div class='add'>+    u16    statusCode;</div><div class='add'>+    u16    Association_ID;</div><div class='add'>+    struct Supported_Rates_Element supportedRates;</div><div class='add'>+}__attribute__ ((packed));</div><div class='add'>+</div><div class='add'>+struct Deauthentication_Frame_Body</div><div class='add'>+{</div><div class='add'>+    u16    reasonCode;</div><div class='add'>+}__attribute__ ((packed));</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+struct Probe_Response_Frame_Body</div><div class='add'>+{</div><div class='add'>+    u16    Timestamp;</div><div class='add'>+    u16    Beacon_Interval;</div><div class='add'>+    u16    Capability_Information;</div><div class='add'>+    // SSID</div><div class='add'>+    // Supported_Rates</div><div class='add'>+    // PHY parameter Set (DS Parameters)</div><div class='add'>+    // CF parameter Set</div><div class='add'>+    // IBSS parameter Set</div><div class='add'>+}__attribute__ ((packed));</div><div class='add'>+</div><div class='add'>+struct Authentication_Frame_Body</div><div class='add'>+{</div><div class='add'>+    u16    algorithmNumber;</div><div class='add'>+    u16    sequenceNumber;</div><div class='add'>+    u16    statusCode;</div><div class='add'>+    // NB: don't include ChallengeText in this structure</div><div class='add'>+	// struct Challenge_Text_Element sChallengeTextElement; // wkchen added</div><div class='add'>+}__attribute__ ((packed));</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#endif // _MAC_Structure_H_</div><div class='add'>+</div><div class='add'>+</div><div class='head'>diff --git a/drivers/staging/winbond/mds.c b/drivers/staging/winbond/mds.c<br/>new file mode 100644<br/>index 000000000000..8ce6389c4135<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/winbond/mds.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/mds.c</a></div><div class='hunk'>@@ -0,0 +1,630 @@</div><div class='add'>+#include "os_common.h"</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+Mds_reset_descriptor(PADAPTER Adapter)</div><div class='add'>+{</div><div class='add'>+	PMDS pMds = &amp;Adapter-&gt;Mds;</div><div class='add'>+</div><div class='add'>+	pMds-&gt;TxPause = 0;</div><div class='add'>+	pMds-&gt;TxThreadCount = 0;</div><div class='add'>+	pMds-&gt;TxFillIndex = 0;</div><div class='add'>+	pMds-&gt;TxDesIndex = 0;</div><div class='add'>+	pMds-&gt;ScanTxPause = 0;</div><div class='add'>+	memset(pMds-&gt;TxOwner, 0, ((MAX_USB_TX_BUFFER_NUMBER + 3) &amp; ~0x03));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+unsigned char</div><div class='add'>+Mds_initial(PADAPTER Adapter)</div><div class='add'>+{</div><div class='add'>+	PMDS pMds = &amp;Adapter-&gt;Mds;</div><div class='add'>+</div><div class='add'>+	pMds-&gt;TxPause = FALSE;</div><div class='add'>+	pMds-&gt;TxRTSThreshold = DEFAULT_RTSThreshold;</div><div class='add'>+	pMds-&gt;TxFragmentThreshold = DEFAULT_FRAGMENT_THRESHOLD;</div><div class='add'>+</div><div class='add'>+	vRxTimerInit(Adapter);//for WPA countermeasure</div><div class='add'>+</div><div class='add'>+	return hal_get_tx_buffer( &amp;Adapter-&gt;sHwData, &amp;pMds-&gt;pTxBuffer );</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+Mds_Destroy(PADAPTER Adapter)</div><div class='add'>+{</div><div class='add'>+	vRxTimerStop(Adapter);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+Mds_Tx(PADAPTER Adapter)</div><div class='add'>+{</div><div class='add'>+	phw_data_t	pHwData = &amp;Adapter-&gt;sHwData;</div><div class='add'>+	PMDS		pMds = &amp;Adapter-&gt;Mds;</div><div class='add'>+	DESCRIPTOR	TxDes;</div><div class='add'>+	PDESCRIPTOR	pTxDes = &amp;TxDes;</div><div class='add'>+	PUCHAR		XmitBufAddress;</div><div class='add'>+	u16		XmitBufSize, PacketSize, stmp, CurrentSize, FragmentThreshold;</div><div class='add'>+	u8		FillIndex, TxDesIndex, FragmentCount, FillCount;</div><div class='add'>+	unsigned char	BufferFilled = FALSE, MICAdd = 0;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	if (pMds-&gt;TxPause)</div><div class='add'>+		return;</div><div class='add'>+	if (!hal_driver_init_OK(pHwData))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	//Only one thread can be run here</div><div class='add'>+	if (!OS_ATOMIC_INC( Adapter, &amp;pMds-&gt;TxThreadCount) == 1)</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	// Start to fill the data</div><div class='add'>+	do {</div><div class='add'>+		FillIndex = pMds-&gt;TxFillIndex;</div><div class='add'>+		if (pMds-&gt;TxOwner[FillIndex]) { // Is owned by software 0:Yes 1:No</div><div class='add'>+#ifdef _PE_TX_DUMP_</div><div class='add'>+			WBDEBUG(("[Mds_Tx] Tx Owner is H/W.\n"));</div><div class='add'>+#endif</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		XmitBufAddress = pMds-&gt;pTxBuffer + (MAX_USB_TX_BUFFER * FillIndex); //Get buffer</div><div class='add'>+		XmitBufSize = 0;</div><div class='add'>+		FillCount = 0;</div><div class='add'>+		do {</div><div class='add'>+			PacketSize = Adapter-&gt;sMlmeFrame.len;</div><div class='add'>+			if (!PacketSize)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			//For Check the buffer resource</div><div class='add'>+			FragmentThreshold = CURRENT_FRAGMENT_THRESHOLD;</div><div class='add'>+			//931130.5.b</div><div class='add'>+			FragmentCount = PacketSize/FragmentThreshold + 1;</div><div class='add'>+			stmp = PacketSize + FragmentCount*32 + 8;//931130.5.c 8:MIC</div><div class='add'>+			if ((XmitBufSize + stmp) &gt;= MAX_USB_TX_BUFFER) {</div><div class='add'>+				printk("[Mds_Tx] Excess max tx buffer.\n");</div><div class='add'>+				break; // buffer is not enough</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+			//</div><div class='add'>+			// Start transmitting</div><div class='add'>+			//</div><div class='add'>+			BufferFilled = TRUE;</div><div class='add'>+</div><div class='add'>+			/* Leaves first u8 intact */</div><div class='add'>+			memset((PUCHAR)pTxDes + 1, 0, sizeof(DESCRIPTOR) - 1);</div><div class='add'>+</div><div class='add'>+			TxDesIndex = pMds-&gt;TxDesIndex;//Get the current ID</div><div class='add'>+			pTxDes-&gt;Descriptor_ID = TxDesIndex;</div><div class='add'>+			pMds-&gt;TxDesFrom[ TxDesIndex ] = 2;//Storing the information of source comming from</div><div class='add'>+			pMds-&gt;TxDesIndex++;</div><div class='add'>+			pMds-&gt;TxDesIndex %= MAX_USB_TX_DESCRIPTOR;</div><div class='add'>+</div><div class='add'>+			MLME_GetNextPacket( Adapter, pTxDes );</div><div class='add'>+</div><div class='add'>+			// Copy header. 8byte USB + 24byte 802.11Hdr. Set TxRate, Preamble type</div><div class='add'>+			Mds_HeaderCopy( Adapter, pTxDes, XmitBufAddress );</div><div class='add'>+</div><div class='add'>+			// For speed up Key setting</div><div class='add'>+			if (pTxDes-&gt;EapFix) {</div><div class='add'>+#ifdef _PE_TX_DUMP_</div><div class='add'>+				WBDEBUG(("35: EPA 4th frame detected. Size = %d\n", PacketSize));</div><div class='add'>+#endif</div><div class='add'>+				pHwData-&gt;IsKeyPreSet = 1;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			// Copy (fragment) frame body, and set USB, 802.11 hdr flag</div><div class='add'>+			CurrentSize = Mds_BodyCopy(Adapter, pTxDes, XmitBufAddress);</div><div class='add'>+</div><div class='add'>+			// Set RTS/CTS and Normal duration field into buffer</div><div class='add'>+			Mds_DurationSet(Adapter, pTxDes, XmitBufAddress);</div><div class='add'>+</div><div class='add'>+			//</div><div class='add'>+			// Calculation MIC from buffer which maybe fragment, then fill into temporary address 8 byte</div><div class='add'>+			// 931130.5.e</div><div class='add'>+			if (MICAdd)</div><div class='add'>+				Mds_MicFill( Adapter, pTxDes, XmitBufAddress );</div><div class='add'>+</div><div class='add'>+			//Shift to the next address</div><div class='add'>+			XmitBufSize += CurrentSize;</div><div class='add'>+			XmitBufAddress += CurrentSize;</div><div class='add'>+</div><div class='add'>+#ifdef _IBSS_BEACON_SEQ_STICK_</div><div class='add'>+			if ((XmitBufAddress[ DOT_11_DA_OFFSET+8 ] &amp; 0xfc) != MAC_SUBTYPE_MNGMNT_PROBE_REQUEST) // +8 for USB hdr</div><div class='add'>+#endif</div><div class='add'>+				pMds-&gt;TxToggle = TRUE;</div><div class='add'>+</div><div class='add'>+			// Get packet to transmit completed, 1:TESTSTA 2:MLME 3: Ndis data</div><div class='add'>+			MLME_SendComplete(Adapter, 0, TRUE);</div><div class='add'>+</div><div class='add'>+			// Software TSC count 20060214</div><div class='add'>+			pMds-&gt;TxTsc++;</div><div class='add'>+			if (pMds-&gt;TxTsc == 0)</div><div class='add'>+				pMds-&gt;TxTsc_2++;</div><div class='add'>+</div><div class='add'>+			FillCount++; // 20060928</div><div class='add'>+		} while (HAL_USB_MODE_BURST(pHwData)); // End of multiple MSDU copy loop. FALSE = single TRUE = multiple sending</div><div class='add'>+</div><div class='add'>+		// Move to the next one, if necessary</div><div class='add'>+		if (BufferFilled) {</div><div class='add'>+			// size setting</div><div class='add'>+			pMds-&gt;TxBufferSize[ FillIndex ] = XmitBufSize;</div><div class='add'>+</div><div class='add'>+			// 20060928 set Tx count</div><div class='add'>+			pMds-&gt;TxCountInBuffer[FillIndex] = FillCount;</div><div class='add'>+</div><div class='add'>+			// Set owner flag</div><div class='add'>+			pMds-&gt;TxOwner[FillIndex] = 1;</div><div class='add'>+</div><div class='add'>+			pMds-&gt;TxFillIndex++;</div><div class='add'>+			pMds-&gt;TxFillIndex %= MAX_USB_TX_BUFFER_NUMBER;</div><div class='add'>+			BufferFilled = FALSE;</div><div class='add'>+		} else</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (!PacketSize) // No more pk for transmitting</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+	} while(TRUE);</div><div class='add'>+</div><div class='add'>+	//</div><div class='add'>+	// Start to send by lower module</div><div class='add'>+	//</div><div class='add'>+	if (!pHwData-&gt;IsKeyPreSet)</div><div class='add'>+		Wb35Tx_start(pHwData);</div><div class='add'>+</div><div class='add'>+ cleanup:</div><div class='add'>+	OS_ATOMIC_DEC( Adapter, &amp;pMds-&gt;TxThreadCount );</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+Mds_SendComplete(PADAPTER Adapter, PT02_DESCRIPTOR pT02)</div><div class='add'>+{</div><div class='add'>+	PMDS	pMds = &amp;Adapter-&gt;Mds;</div><div class='add'>+	phw_data_t	pHwData = &amp;Adapter-&gt;sHwData;</div><div class='add'>+	u8	PacketId = (u8)pT02-&gt;T02_Tx_PktID;</div><div class='add'>+	unsigned char	SendOK = TRUE;</div><div class='add'>+	u8	RetryCount, TxRate;</div><div class='add'>+</div><div class='add'>+	if (pT02-&gt;T02_IgnoreResult) // Don't care the result</div><div class='add'>+		return;</div><div class='add'>+	if (pT02-&gt;T02_IsLastMpdu) {</div><div class='add'>+		//TODO: DTO -- get the retry count and fragment count</div><div class='add'>+		// Tx rate</div><div class='add'>+		TxRate = pMds-&gt;TxRate[ PacketId ][ 0 ];</div><div class='add'>+		RetryCount = (u8)pT02-&gt;T02_MPDU_Cnt;</div><div class='add'>+		if (pT02-&gt;value &amp; FLAG_ERROR_TX_MASK) {</div><div class='add'>+			SendOK = FALSE;</div><div class='add'>+</div><div class='add'>+			if (pT02-&gt;T02_transmit_abort || pT02-&gt;T02_out_of_MaxTxMSDULiftTime) {</div><div class='add'>+				//retry error</div><div class='add'>+				pHwData-&gt;dto_tx_retry_count += (RetryCount+1);</div><div class='add'>+				//[for tx debug]</div><div class='add'>+				if (RetryCount&lt;7)</div><div class='add'>+					pHwData-&gt;tx_retry_count[RetryCount] += RetryCount;</div><div class='add'>+				else</div><div class='add'>+					pHwData-&gt;tx_retry_count[7] += RetryCount;</div><div class='add'>+				#ifdef _PE_STATE_DUMP_</div><div class='add'>+				WBDEBUG(("dto_tx_retry_count =%d\n", pHwData-&gt;dto_tx_retry_count));</div><div class='add'>+				#endif</div><div class='add'>+				MTO_SetTxCount(Adapter, TxRate, RetryCount);</div><div class='add'>+			}</div><div class='add'>+			pHwData-&gt;dto_tx_frag_count += (RetryCount+1);</div><div class='add'>+</div><div class='add'>+			//[for tx debug]</div><div class='add'>+			if (pT02-&gt;T02_transmit_abort_due_to_TBTT)</div><div class='add'>+				pHwData-&gt;tx_TBTT_start_count++;</div><div class='add'>+			if (pT02-&gt;T02_transmit_without_encryption_due_to_wep_on_false)</div><div class='add'>+				pHwData-&gt;tx_WepOn_false_count++;</div><div class='add'>+			if (pT02-&gt;T02_discard_due_to_null_wep_key)</div><div class='add'>+				pHwData-&gt;tx_Null_key_count++;</div><div class='add'>+		} else {</div><div class='add'>+			if (pT02-&gt;T02_effective_transmission_rate)</div><div class='add'>+				pHwData-&gt;tx_ETR_count++;</div><div class='add'>+			MTO_SetTxCount(Adapter, TxRate, RetryCount);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		// Clear send result buffer</div><div class='add'>+		pMds-&gt;TxResult[ PacketId ] = 0;</div><div class='add'>+	} else</div><div class='add'>+		pMds-&gt;TxResult[ PacketId ] |= ((u16)(pT02-&gt;value &amp; 0x0ffff));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+Mds_HeaderCopy(PADAPTER Adapter, PDESCRIPTOR pDes, PUCHAR TargetBuffer)</div><div class='add'>+{</div><div class='add'>+	PMDS	pMds = &amp;Adapter-&gt;Mds;</div><div class='add'>+	PUCHAR	src_buffer = pDes-&gt;buffer_address[0];//931130.5.g</div><div class='add'>+	PT00_DESCRIPTOR	pT00;</div><div class='add'>+	PT01_DESCRIPTOR	pT01;</div><div class='add'>+	u16	stmp;</div><div class='add'>+	u8	i, ctmp1, ctmp2, ctmpf;</div><div class='add'>+	u16	FragmentThreshold = CURRENT_FRAGMENT_THRESHOLD;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	stmp = pDes-&gt;buffer_total_size;</div><div class='add'>+	//</div><div class='add'>+	// Set USB header 8 byte</div><div class='add'>+	//</div><div class='add'>+	pT00 = (PT00_DESCRIPTOR)TargetBuffer;</div><div class='add'>+	TargetBuffer += 4;</div><div class='add'>+	pT01 = (PT01_DESCRIPTOR)TargetBuffer;</div><div class='add'>+	TargetBuffer += 4;</div><div class='add'>+</div><div class='add'>+	pT00-&gt;value = 0;// Clear</div><div class='add'>+	pT01-&gt;value = 0;// Clear</div><div class='add'>+</div><div class='add'>+	pT00-&gt;T00_tx_packet_id = pDes-&gt;Descriptor_ID;// Set packet ID</div><div class='add'>+	pT00-&gt;T00_header_length = 24;// Set header length</div><div class='add'>+	pT01-&gt;T01_retry_abort_ebable = 1;//921013 931130.5.h</div><div class='add'>+</div><div class='add'>+	// Key ID setup</div><div class='add'>+	pT01-&gt;T01_wep_id = 0;</div><div class='add'>+</div><div class='add'>+	FragmentThreshold = DEFAULT_FRAGMENT_THRESHOLD;	//Do not fragment</div><div class='add'>+	// Copy full data, the 1'st buffer contain all the data 931130.5.j</div><div class='add'>+	memcpy( TargetBuffer, src_buffer, DOT_11_MAC_HEADER_SIZE );// Copy header</div><div class='add'>+	pDes-&gt;buffer_address[0] = src_buffer + DOT_11_MAC_HEADER_SIZE;</div><div class='add'>+	pDes-&gt;buffer_total_size -= DOT_11_MAC_HEADER_SIZE;</div><div class='add'>+	pDes-&gt;buffer_size[0] = pDes-&gt;buffer_total_size;</div><div class='add'>+</div><div class='add'>+	// Set fragment threshold</div><div class='add'>+	FragmentThreshold -= (DOT_11_MAC_HEADER_SIZE + 4);</div><div class='add'>+	pDes-&gt;FragmentThreshold = FragmentThreshold;</div><div class='add'>+</div><div class='add'>+	// Set more frag bit</div><div class='add'>+	TargetBuffer[1] |= 0x04;// Set more frag bit</div><div class='add'>+</div><div class='add'>+	//</div><div class='add'>+	// Set tx rate</div><div class='add'>+	//</div><div class='add'>+	stmp = *(PUSHORT)(TargetBuffer+30); // 2n alignment address</div><div class='add'>+</div><div class='add'>+	//Use basic rate</div><div class='add'>+	ctmp1 = ctmpf = CURRENT_TX_RATE_FOR_MNG;</div><div class='add'>+</div><div class='add'>+	pDes-&gt;TxRate = ctmp1;</div><div class='add'>+	#ifdef _PE_TX_DUMP_</div><div class='add'>+	WBDEBUG(("Tx rate =%x\n", ctmp1));</div><div class='add'>+	#endif</div><div class='add'>+</div><div class='add'>+	pT01-&gt;T01_modulation_type = (ctmp1%3) ? 0 : 1;</div><div class='add'>+</div><div class='add'>+	for( i=0; i&lt;2; i++ ) {</div><div class='add'>+		if( i == 1 )</div><div class='add'>+			ctmp1 = ctmpf;</div><div class='add'>+</div><div class='add'>+		pMds-&gt;TxRate[pDes-&gt;Descriptor_ID][i] = ctmp1; // backup the ta rate and fall back rate</div><div class='add'>+</div><div class='add'>+		if( ctmp1 == 108) ctmp2 = 7;</div><div class='add'>+		else if( ctmp1 == 96 ) ctmp2 = 6; // Rate convert for USB</div><div class='add'>+		else if( ctmp1 == 72 ) ctmp2 = 5;</div><div class='add'>+		else if( ctmp1 == 48 ) ctmp2 = 4;</div><div class='add'>+		else if( ctmp1 == 36 ) ctmp2 = 3;</div><div class='add'>+		else if( ctmp1 == 24 ) ctmp2 = 2;</div><div class='add'>+		else if( ctmp1 == 18 ) ctmp2 = 1;</div><div class='add'>+		else if( ctmp1 == 12 ) ctmp2 = 0;</div><div class='add'>+		else if( ctmp1 == 22 ) ctmp2 = 3;</div><div class='add'>+		else if( ctmp1 == 11 ) ctmp2 = 2;</div><div class='add'>+		else if( ctmp1 == 4  ) ctmp2 = 1;</div><div class='add'>+		else ctmp2 = 0; // if( ctmp1 == 2  ) or default</div><div class='add'>+</div><div class='add'>+		if( i == 0 )</div><div class='add'>+			pT01-&gt;T01_transmit_rate = ctmp2;</div><div class='add'>+		else</div><div class='add'>+			pT01-&gt;T01_fall_back_rate = ctmp2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	//</div><div class='add'>+	// Set preamble type</div><div class='add'>+	//</div><div class='add'>+	if ((pT01-&gt;T01_modulation_type == 0) &amp;&amp; (pT01-&gt;T01_transmit_rate == 0))	// RATE_1M</div><div class='add'>+		pDes-&gt;PreambleMode =  WLAN_PREAMBLE_TYPE_LONG;</div><div class='add'>+	else</div><div class='add'>+		pDes-&gt;PreambleMode =  CURRENT_PREAMBLE_MODE;</div><div class='add'>+	pT01-&gt;T01_plcp_header_length = pDes-&gt;PreambleMode;	// Set preamble</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+// The function return the 4n size of usb pk</div><div class='add'>+u16</div><div class='add'>+Mds_BodyCopy(PADAPTER Adapter, PDESCRIPTOR pDes, PUCHAR TargetBuffer)</div><div class='add'>+{</div><div class='add'>+	PT00_DESCRIPTOR	pT00;</div><div class='add'>+	PMDS	pMds = &amp;Adapter-&gt;Mds;</div><div class='add'>+	PUCHAR	buffer, src_buffer, pctmp;</div><div class='add'>+	u16	Size = 0;</div><div class='add'>+	u16	SizeLeft, CopySize, CopyLeft, stmp;</div><div class='add'>+	u8	buf_index, FragmentCount = 0;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	// Copy fragment body</div><div class='add'>+	buffer = TargetBuffer; // shift 8B usb + 24B 802.11</div><div class='add'>+	SizeLeft = pDes-&gt;buffer_total_size;</div><div class='add'>+	buf_index = pDes-&gt;buffer_start_index;</div><div class='add'>+</div><div class='add'>+	pT00 = (PT00_DESCRIPTOR)buffer;</div><div class='add'>+	while (SizeLeft) {</div><div class='add'>+		pT00 = (PT00_DESCRIPTOR)buffer;</div><div class='add'>+		CopySize = SizeLeft;</div><div class='add'>+		if (SizeLeft &gt; pDes-&gt;FragmentThreshold) {</div><div class='add'>+			CopySize = pDes-&gt;FragmentThreshold;</div><div class='add'>+			pT00-&gt;T00_frame_length = 24 + CopySize;//Set USB length</div><div class='add'>+		} else</div><div class='add'>+			pT00-&gt;T00_frame_length = 24 + SizeLeft;//Set USB length</div><div class='add'>+</div><div class='add'>+		SizeLeft -= CopySize;</div><div class='add'>+</div><div class='add'>+		// 1 Byte operation</div><div class='add'>+		pctmp = (PUCHAR)( buffer + 8 + DOT_11_SEQUENCE_OFFSET );</div><div class='add'>+		*pctmp &amp;= 0xf0;</div><div class='add'>+		*pctmp |= FragmentCount;//931130.5.m</div><div class='add'>+		if( !FragmentCount )</div><div class='add'>+			pT00-&gt;T00_first_mpdu = 1;</div><div class='add'>+</div><div class='add'>+		buffer += 32; // 8B usb + 24B 802.11 header</div><div class='add'>+		Size += 32;</div><div class='add'>+</div><div class='add'>+		// Copy into buffer</div><div class='add'>+		stmp = CopySize + 3;</div><div class='add'>+		stmp &amp;= ~0x03;//4n Alignment</div><div class='add'>+		Size += stmp;// Current 4n offset of mpdu</div><div class='add'>+</div><div class='add'>+		while (CopySize) {</div><div class='add'>+			// Copy body</div><div class='add'>+			src_buffer = pDes-&gt;buffer_address[buf_index];</div><div class='add'>+			CopyLeft = CopySize;</div><div class='add'>+			if (CopySize &gt;= pDes-&gt;buffer_size[buf_index]) {</div><div class='add'>+				CopyLeft = pDes-&gt;buffer_size[buf_index];</div><div class='add'>+</div><div class='add'>+				// Get the next buffer of descriptor</div><div class='add'>+				buf_index++;</div><div class='add'>+				buf_index %= MAX_DESCRIPTOR_BUFFER_INDEX;</div><div class='add'>+			} else {</div><div class='add'>+				PUCHAR	pctmp = pDes-&gt;buffer_address[buf_index];</div><div class='add'>+				pctmp += CopySize;</div><div class='add'>+				pDes-&gt;buffer_address[buf_index] = pctmp;</div><div class='add'>+				pDes-&gt;buffer_size[buf_index] -= CopySize;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			memcpy(buffer, src_buffer, CopyLeft);</div><div class='add'>+			buffer += CopyLeft;</div><div class='add'>+			CopySize -= CopyLeft;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		// 931130.5.n</div><div class='add'>+		if (pMds-&gt;MicAdd) {</div><div class='add'>+			if (!SizeLeft) {</div><div class='add'>+				pMds-&gt;MicWriteAddress[ pMds-&gt;MicWriteIndex ] = buffer - pMds-&gt;MicAdd;</div><div class='add'>+				pMds-&gt;MicWriteSize[ pMds-&gt;MicWriteIndex ] = pMds-&gt;MicAdd;</div><div class='add'>+				pMds-&gt;MicAdd = 0;</div><div class='add'>+			}</div><div class='add'>+			else if( SizeLeft &lt; 8 ) //931130.5.p</div><div class='add'>+			{</div><div class='add'>+				pMds-&gt;MicAdd = SizeLeft;</div><div class='add'>+				pMds-&gt;MicWriteAddress[ pMds-&gt;MicWriteIndex ] = buffer - ( 8 - SizeLeft );</div><div class='add'>+				pMds-&gt;MicWriteSize[ pMds-&gt;MicWriteIndex ] = 8 - SizeLeft;</div><div class='add'>+				pMds-&gt;MicWriteIndex++;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		// Does it need to generate the new header for next mpdu?</div><div class='add'>+		if (SizeLeft) {</div><div class='add'>+			buffer = TargetBuffer + Size; // Get the next 4n start address</div><div class='add'>+			memcpy( buffer, TargetBuffer, 32 );//Copy 8B USB +24B 802.11</div><div class='add'>+			pT00 = (PT00_DESCRIPTOR)buffer;</div><div class='add'>+			pT00-&gt;T00_first_mpdu = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		FragmentCount++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pT00-&gt;T00_last_mpdu = 1;</div><div class='add'>+	pT00-&gt;T00_IsLastMpdu = 1;</div><div class='add'>+	buffer = (PUCHAR)pT00 + 8; // +8 for USB hdr</div><div class='add'>+	buffer[1] &amp;= ~0x04; // Clear more frag bit of 802.11 frame control</div><div class='add'>+	pDes-&gt;FragmentCount = FragmentCount; // Update the correct fragment number</div><div class='add'>+	return Size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+Mds_DurationSet(  PADAPTER Adapter,  PDESCRIPTOR pDes,  PUCHAR buffer )</div><div class='add'>+{</div><div class='add'>+	PT00_DESCRIPTOR	pT00;</div><div class='add'>+	PT01_DESCRIPTOR	pT01;</div><div class='add'>+	u16	Duration, NextBodyLen, OffsetSize;</div><div class='add'>+	u8	Rate, i;</div><div class='add'>+	unsigned char	CTS_on = FALSE, RTS_on = FALSE;</div><div class='add'>+	PT00_DESCRIPTOR pNextT00;</div><div class='add'>+	u16 BodyLen;</div><div class='add'>+	unsigned char boGroupAddr = FALSE;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	OffsetSize = pDes-&gt;FragmentThreshold + 32 + 3;</div><div class='add'>+	OffsetSize &amp;= ~0x03;</div><div class='add'>+	Rate = pDes-&gt;TxRate &gt;&gt; 1;</div><div class='add'>+	if (!Rate)</div><div class='add'>+		Rate = 1;</div><div class='add'>+</div><div class='add'>+	pT00 = (PT00_DESCRIPTOR)buffer;</div><div class='add'>+	pT01 = (PT01_DESCRIPTOR)(buffer+4);</div><div class='add'>+	pNextT00 = (PT00_DESCRIPTOR)(buffer+OffsetSize);</div><div class='add'>+</div><div class='add'>+	if( buffer[ DOT_11_DA_OFFSET+8 ] &amp; 0x1 ) // +8 for USB hdr</div><div class='add'>+		boGroupAddr = TRUE;</div><div class='add'>+</div><div class='add'>+	//========================================</div><div class='add'>+	// Set RTS/CTS mechanism</div><div class='add'>+	//========================================</div><div class='add'>+	if (!boGroupAddr)</div><div class='add'>+	{</div><div class='add'>+		//NOTE : If the protection mode is enabled and the MSDU will be fragmented,</div><div class='add'>+		//		 the tx rates of MPDUs will all be DSSS rates. So it will not use</div><div class='add'>+		//		 CTS-to-self in this case. CTS-To-self will only be used when without</div><div class='add'>+		//		 fragmentation. -- 20050112</div><div class='add'>+		BodyLen = (u16)pT00-&gt;T00_frame_length;	//include 802.11 header</div><div class='add'>+		BodyLen += 4;	//CRC</div><div class='add'>+</div><div class='add'>+		if( BodyLen &gt;= CURRENT_RTS_THRESHOLD )</div><div class='add'>+			RTS_on = TRUE; // Using RTS</div><div class='add'>+		else</div><div class='add'>+		{</div><div class='add'>+			if( pT01-&gt;T01_modulation_type ) // Is using OFDM</div><div class='add'>+			{</div><div class='add'>+				if( CURRENT_PROTECT_MECHANISM ) // Is using protect</div><div class='add'>+					CTS_on = TRUE; // Using CTS</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if( RTS_on || CTS_on )</div><div class='add'>+	{</div><div class='add'>+		if( pT01-&gt;T01_modulation_type) // Is using OFDM</div><div class='add'>+		{</div><div class='add'>+			//CTS duration</div><div class='add'>+			// 2 SIFS + DATA transmit time + 1 ACK</div><div class='add'>+			// ACK Rate : 24 Mega bps</div><div class='add'>+			// ACK frame length = 14 bytes</div><div class='add'>+			Duration = 2*DEFAULT_SIFSTIME +</div><div class='add'>+					   2*PREAMBLE_PLUS_SIGNAL_PLUS_SIGNALEXTENSION +</div><div class='add'>+					   ((BodyLen*8 + 22 + Rate*4 - 1)/(Rate*4))*Tsym +</div><div class='add'>+					   ((112 + 22 + 95)/96)*Tsym;</div><div class='add'>+		}</div><div class='add'>+		else	//DSSS</div><div class='add'>+		{</div><div class='add'>+			//CTS duration</div><div class='add'>+			// 2 SIFS + DATA transmit time + 1 ACK</div><div class='add'>+			// Rate : ?? Mega bps</div><div class='add'>+			// ACK frame length = 14 bytes</div><div class='add'>+			if( pT01-&gt;T01_plcp_header_length ) //long preamble</div><div class='add'>+				Duration = LONG_PREAMBLE_PLUS_PLCPHEADER_TIME*2;</div><div class='add'>+			else</div><div class='add'>+				Duration = SHORT_PREAMBLE_PLUS_PLCPHEADER_TIME*2;</div><div class='add'>+</div><div class='add'>+			Duration += ( ((BodyLen + 14)*8 + Rate-1) / Rate +</div><div class='add'>+						DEFAULT_SIFSTIME*2 );</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if( RTS_on )</div><div class='add'>+		{</div><div class='add'>+			if( pT01-&gt;T01_modulation_type ) // Is using OFDM</div><div class='add'>+			{</div><div class='add'>+				//CTS + 1 SIFS + CTS duration</div><div class='add'>+				//CTS Rate : 24 Mega bps</div><div class='add'>+				//CTS frame length = 14 bytes</div><div class='add'>+				Duration += (DEFAULT_SIFSTIME +</div><div class='add'>+								PREAMBLE_PLUS_SIGNAL_PLUS_SIGNALEXTENSION +</div><div class='add'>+								((112 + 22 + 95)/96)*Tsym);</div><div class='add'>+			}</div><div class='add'>+			else</div><div class='add'>+			{</div><div class='add'>+				//CTS + 1 SIFS + CTS duration</div><div class='add'>+				//CTS Rate : ?? Mega bps</div><div class='add'>+				//CTS frame length = 14 bytes</div><div class='add'>+				if( pT01-&gt;T01_plcp_header_length ) //long preamble</div><div class='add'>+					Duration += LONG_PREAMBLE_PLUS_PLCPHEADER_TIME;</div><div class='add'>+				else</div><div class='add'>+					Duration += SHORT_PREAMBLE_PLUS_PLCPHEADER_TIME;</div><div class='add'>+</div><div class='add'>+				Duration += ( ((112 + Rate-1) / Rate) + DEFAULT_SIFSTIME );</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		// Set the value into USB descriptor</div><div class='add'>+		pT01-&gt;T01_add_rts = RTS_on ? 1 : 0;</div><div class='add'>+		pT01-&gt;T01_add_cts = CTS_on ? 1 : 0;</div><div class='add'>+		pT01-&gt;T01_rts_cts_duration = Duration;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	//=====================================</div><div class='add'>+	// Fill the more fragment descriptor</div><div class='add'>+	//=====================================</div><div class='add'>+	if( boGroupAddr )</div><div class='add'>+		Duration = 0;</div><div class='add'>+	else</div><div class='add'>+	{</div><div class='add'>+		for( i=pDes-&gt;FragmentCount-1; i&gt;0; i-- )</div><div class='add'>+		{</div><div class='add'>+			NextBodyLen = (u16)pNextT00-&gt;T00_frame_length;</div><div class='add'>+			NextBodyLen += 4;	//CRC</div><div class='add'>+</div><div class='add'>+			if( pT01-&gt;T01_modulation_type )</div><div class='add'>+			{</div><div class='add'>+				//OFDM</div><div class='add'>+				// data transmit time + 3 SIFS + 2 ACK</div><div class='add'>+				// Rate : ??Mega bps</div><div class='add'>+				// ACK frame length = 14 bytes, tx rate = 24M</div><div class='add'>+				Duration = PREAMBLE_PLUS_SIGNAL_PLUS_SIGNALEXTENSION * 3;</div><div class='add'>+				Duration += (((NextBodyLen*8 + 22 + Rate*4 - 1)/(Rate*4)) * Tsym +</div><div class='add'>+							(((2*14)*8 + 22 + 95)/96)*Tsym +</div><div class='add'>+							DEFAULT_SIFSTIME*3);</div><div class='add'>+			}</div><div class='add'>+			else</div><div class='add'>+			{</div><div class='add'>+				//DSSS</div><div class='add'>+				// data transmit time + 2 ACK + 3 SIFS</div><div class='add'>+				// Rate : ??Mega bps</div><div class='add'>+				// ACK frame length = 14 bytes</div><div class='add'>+				//TODO :</div><div class='add'>+				if( pT01-&gt;T01_plcp_header_length ) //long preamble</div><div class='add'>+					Duration = LONG_PREAMBLE_PLUS_PLCPHEADER_TIME*3;</div><div class='add'>+				else</div><div class='add'>+					Duration = SHORT_PREAMBLE_PLUS_PLCPHEADER_TIME*3;</div><div class='add'>+</div><div class='add'>+				Duration += ( ((NextBodyLen + (2*14))*8 + Rate-1) / Rate +</div><div class='add'>+							DEFAULT_SIFSTIME*3 );</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			((PUSHORT)buffer)[5] = cpu_to_le16(Duration);// 4 USHOR for skip 8B USB, 2USHORT=FC + Duration</div><div class='add'>+</div><div class='add'>+			//----20061009 add by anson's endian</div><div class='add'>+			pNextT00-&gt;value = cpu_to_le32(pNextT00-&gt;value);</div><div class='add'>+			pT01-&gt;value = cpu_to_le32( pT01-&gt;value );</div><div class='add'>+			//----end 20061009 add by anson's endian</div><div class='add'>+</div><div class='add'>+			buffer += OffsetSize;</div><div class='add'>+			pT01 = (PT01_DESCRIPTOR)(buffer+4);</div><div class='add'>+			if (i != 1)	//The last fragment will not have the next fragment</div><div class='add'>+				pNextT00 = (PT00_DESCRIPTOR)(buffer+OffsetSize);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		//=====================================</div><div class='add'>+		// Fill the last fragment descriptor</div><div class='add'>+		//=====================================</div><div class='add'>+		if( pT01-&gt;T01_modulation_type )</div><div class='add'>+		{</div><div class='add'>+			//OFDM</div><div class='add'>+			// 1 SIFS + 1 ACK</div><div class='add'>+			// Rate : 24 Mega bps</div><div class='add'>+			// ACK frame length = 14 bytes</div><div class='add'>+			Duration = PREAMBLE_PLUS_SIGNAL_PLUS_SIGNALEXTENSION;</div><div class='add'>+			//The Tx rate of ACK use 24M</div><div class='add'>+			Duration += (((112 + 22 + 95)/96)*Tsym + DEFAULT_SIFSTIME );</div><div class='add'>+		}</div><div class='add'>+		else</div><div class='add'>+		{</div><div class='add'>+			// DSSS</div><div class='add'>+			// 1 ACK + 1 SIFS</div><div class='add'>+			// Rate : ?? Mega bps</div><div class='add'>+			// ACK frame length = 14 bytes(112 bits)</div><div class='add'>+			if( pT01-&gt;T01_plcp_header_length ) //long preamble</div><div class='add'>+				Duration = LONG_PREAMBLE_PLUS_PLCPHEADER_TIME;</div><div class='add'>+			else</div><div class='add'>+				Duration = SHORT_PREAMBLE_PLUS_PLCPHEADER_TIME;</div><div class='add'>+</div><div class='add'>+			Duration += ( (112 + Rate-1)/Rate +	DEFAULT_SIFSTIME );</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	((PUSHORT)buffer)[5] = cpu_to_le16(Duration);// 4 USHOR for skip 8B USB, 2USHORT=FC + Duration</div><div class='add'>+	pT00-&gt;value = cpu_to_le32(pT00-&gt;value);</div><div class='add'>+	pT01-&gt;value = cpu_to_le32(pT01-&gt;value);</div><div class='add'>+	//--end 20061009 add</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void MDS_EthernetPacketReceive(  PADAPTER Adapter,  PRXLAYER1 pRxLayer1 )</div><div class='add'>+{</div><div class='add'>+		OS_RECEIVE_PACKET_INDICATE( Adapter, pRxLayer1 );</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='head'>diff --git a/drivers/staging/winbond/mds_f.h b/drivers/staging/winbond/mds_f.h<br/>new file mode 100644<br/>index 000000000000..651188be1065<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/winbond/mds_f.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/mds_f.h</a></div><div class='hunk'>@@ -0,0 +1,33 @@</div><div class='add'>+unsigned char Mds_initial(  PADAPTER Adapter );</div><div class='add'>+void Mds_Destroy(  PADAPTER Adapter );</div><div class='add'>+void Mds_Tx(  PADAPTER Adapter );</div><div class='add'>+void Mds_HeaderCopy(  PADAPTER Adapter,  PDESCRIPTOR pDes,  PUCHAR TargetBuffer );</div><div class='add'>+u16 Mds_BodyCopy(  PADAPTER Adapter,  PDESCRIPTOR pDes,  PUCHAR TargetBuffer );</div><div class='add'>+void Mds_DurationSet(  PADAPTER Adapter,  PDESCRIPTOR pDes,  PUCHAR TargetBuffer );</div><div class='add'>+void Mds_SendComplete(  PADAPTER Adapter,  PT02_DESCRIPTOR pT02 );</div><div class='add'>+void Mds_MpduProcess(  PADAPTER Adapter,  PDESCRIPTOR pRxDes );</div><div class='add'>+void Mds_reset_descriptor(  PADAPTER Adapter );</div><div class='add'>+extern void DataDmp(u8 *pdata, u32 len, u32 offset);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+void vRxTimerInit(PWB32_ADAPTER Adapter);</div><div class='add'>+void vRxTimerStart(PWB32_ADAPTER Adapter, int timeout_value);</div><div class='add'>+void RxTimerHandler_1a( PADAPTER Adapter);</div><div class='add'>+void vRxTimerStop(PWB32_ADAPTER Adapter);</div><div class='add'>+void RxTimerHandler( void*			SystemSpecific1,</div><div class='add'>+					   PWB32_ADAPTER 	Adapter,</div><div class='add'>+					   void*			SystemSpecific2,</div><div class='add'>+					   void*			SystemSpecific3);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+// For Asynchronous indicating. The routine collocates with USB.</div><div class='add'>+void Mds_MsduProcess(  PWB32_ADAPTER Adapter,  PRXLAYER1 pRxLayer1,  u8 SlotIndex);</div><div class='add'>+</div><div class='add'>+// For data frame sending 20060802</div><div class='add'>+u16 MDS_GetPacketSize(  PADAPTER Adapter );</div><div class='add'>+void MDS_GetNextPacket(  PADAPTER Adapter,  PDESCRIPTOR pDes );</div><div class='add'>+void MDS_GetNextPacketComplete(  PADAPTER Adapter,  PDESCRIPTOR pDes );</div><div class='add'>+void MDS_SendResult(  PADAPTER Adapter,  u8 PacketId,  unsigned char SendOK );</div><div class='add'>+void MDS_EthernetPacketReceive(  PADAPTER Adapter,  PRXLAYER1 pRxLayer1 );</div><div class='add'>+</div><div class='add'>+</div><div class='head'>diff --git a/drivers/staging/winbond/mds_s.h b/drivers/staging/winbond/mds_s.h<br/>new file mode 100644<br/>index 000000000000..4738279d5f39<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/winbond/mds_s.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/mds_s.h</a></div><div class='hunk'>@@ -0,0 +1,183 @@</div><div class='add'>+////////////////////////////////////////////////////////////////////////////////////////////////////////</div><div class='add'>+#define MAX_USB_TX_DESCRIPTOR		15		// IS89C35 ability</div><div class='add'>+#define MAX_USB_TX_BUFFER_NUMBER	4		// Virtual pre-buffer number of MAX_USB_TX_BUFFER</div><div class='add'>+#define MAX_USB_TX_BUFFER			4096	// IS89C35 ability 4n alignment is required for hardware</div><div class='add'>+</div><div class='add'>+#define MDS_EVENT_INDICATE( _A, _B, _F )	OS_EVENT_INDICATE( _A, _B, _F )</div><div class='add'>+#define AUTH_REQUEST_PAIRWISE_ERROR			0		// _F flag setting</div><div class='add'>+#define AUTH_REQUEST_GROUP_ERROR			1		// _F flag setting</div><div class='add'>+</div><div class='add'>+// For variable setting</div><div class='add'>+#define CURRENT_BSS_TYPE				psBSS(psLOCAL-&gt;wConnectedSTAindex)-&gt;bBssType</div><div class='add'>+#define CURRENT_WEP_MODE				psSME-&gt;_dot11PrivacyInvoked</div><div class='add'>+#define CURRENT_BSSID					psBSS(psLOCAL-&gt;wConnectedSTAindex)-&gt;abBssID</div><div class='add'>+#define CURRENT_DESIRED_WPA_ENABLE		((psSME-&gt;bDesiredAuthMode==WPA_AUTH)||(psSME-&gt;bDesiredAuthMode==WPAPSK_AUTH))</div><div class='add'>+#ifdef _WPA2_</div><div class='add'>+#define CURRENT_DESIRED_WPA2_ENABLE		((psSME-&gt;bDesiredAuthMode==WPA2_AUTH)||(psSME-&gt;bDesiredAuthMode==WPA2PSK_AUTH))</div><div class='add'>+#endif //end def _WPA2_</div><div class='add'>+#define CURRENT_PAIRWISE_KEY_OK			psSME-&gt;pairwise_key_ok</div><div class='add'>+//[20040712 WS]</div><div class='add'>+#define CURRENT_GROUP_KEY_OK			psSME-&gt;group_key_ok</div><div class='add'>+#define CURRENT_PAIRWISE_KEY			psSME-&gt;tx_mic_key</div><div class='add'>+#define CURRENT_GROUP_KEY				psSME-&gt;group_tx_mic_key</div><div class='add'>+#define CURRENT_ENCRYPT_STATUS			psSME-&gt;encrypt_status</div><div class='add'>+#define CURRENT_WEP_ID					Adapter-&gt;sSmePara._dot11WEPDefaultKeyID</div><div class='add'>+#define CURRENT_CONTROL_PORT_BLOCK		( psSME-&gt;wpa_ok!=1 || (Adapter-&gt;Mds.boCounterMeasureBlock==1 &amp;&amp; (CURRENT_ENCRYPT_STATUS==ENCRYPT_TKIP)) )</div><div class='add'>+#define CURRENT_FRAGMENT_THRESHOLD		(Adapter-&gt;Mds.TxFragmentThreshold &amp; ~0x1)</div><div class='add'>+#define CURRENT_PREAMBLE_MODE			psLOCAL-&gt;boShortPreamble?WLAN_PREAMBLE_TYPE_SHORT:WLAN_PREAMBLE_TYPE_LONG</div><div class='add'>+#define CURRENT_LINK_ON					OS_LINK_STATUS</div><div class='add'>+#define CURRENT_TX_RATE					Adapter-&gt;sLocalPara.CurrentTxRate</div><div class='add'>+#define CURRENT_FALL_BACK_TX_RATE		Adapter-&gt;sLocalPara.CurrentTxFallbackRate</div><div class='add'>+#define CURRENT_TX_RATE_FOR_MNG			Adapter-&gt;sLocalPara.CurrentTxRateForMng</div><div class='add'>+#define CURRENT_PROTECT_MECHANISM		psLOCAL-&gt;boProtectMechanism</div><div class='add'>+#define CURRENT_RTS_THRESHOLD			Adapter-&gt;Mds.TxRTSThreshold</div><div class='add'>+</div><div class='add'>+#define MIB_GS_XMIT_OK_INC				Adapter-&gt;sLocalPara.GS_XMIT_OK++</div><div class='add'>+#define MIB_GS_RCV_OK_INC				Adapter-&gt;sLocalPara.GS_RCV_OK++</div><div class='add'>+#define MIB_GS_XMIT_ERROR_INC			Adapter-&gt;sLocalPara.GS_XMIT_ERROR</div><div class='add'>+</div><div class='add'>+//---------- TX -----------------------------------</div><div class='add'>+#define ETHERNET_TX_DESCRIPTORS         MAX_USB_TX_BUFFER_NUMBER</div><div class='add'>+</div><div class='add'>+//---------- RX ------------------------------------</div><div class='add'>+#define ETHERNET_RX_DESCRIPTORS			8	//It's not necessary to allocate more than 2 in sync indicate</div><div class='add'>+</div><div class='add'>+//================================================================</div><div class='add'>+// Configration default value</div><div class='add'>+//================================================================</div><div class='add'>+#define DEFAULT_MULTICASTLISTMAX		32 		// standard</div><div class='add'>+#define DEFAULT_TX_BURSTLENGTH			3 		// 32 Longwords</div><div class='add'>+#define DEFAULT_RX_BURSTLENGTH			3 		// 32 Longwords</div><div class='add'>+#define DEFAULT_TX_THRESHOLD			0 		// Full Packet</div><div class='add'>+#define DEFAULT_RX_THRESHOLD			0 		// Full Packet</div><div class='add'>+#define DEFAULT_MAXTXRATE				6 		// 11 Mbps (Long)</div><div class='add'>+#define DEFAULT_CHANNEL					3 		// Chennel 3</div><div class='add'>+#define DEFAULT_RTSThreshold			2347 	// Disable RTS</div><div class='add'>+//#define DEFAULT_PME						1 		// Enable</div><div class='add'>+#define DEFAULT_PME						0 		// Disable</div><div class='add'>+#define DEFAULT_SIFSTIME				10</div><div class='add'>+#define DEFAULT_ACKTIME_1ML             304     // 148+44+112 911220 by LCC</div><div class='add'>+#define DEFAULT_ACKTIME_2ML             248     // 148+44+56 911220 by LCC</div><div class='add'>+#define DEFAULT_FRAGMENT_THRESHOLD      2346 	// No fragment</div><div class='add'>+#define DEFAULT_PREAMBLE_LENGTH			72</div><div class='add'>+#define DEFAULT_PLCPHEADERTIME_LENGTH	24</div><div class='add'>+</div><div class='add'>+/*------------------------------------------------------------------------</div><div class='add'>+ 0.96 sec since time unit of the R03 for the current, W89C32 is about 60ns</div><div class='add'>+ instead of 960 ns. This shall be fixed in the future W89C32</div><div class='add'>+ -------------------------------------------------------------------------*/</div><div class='add'>+#define DEFAULT_MAX_RECEIVE_TIME        16440000</div><div class='add'>+</div><div class='add'>+#define RX_BUF_SIZE						2352        // 600 	// For 301 must be multiple of 8</div><div class='add'>+#define MAX_RX_DESCRIPTORS              18         // Rx Layer 2</div><div class='add'>+#define MAX_BUFFER_QUEUE	8 // The value is always equal 8 due to NDIS_PACKET's MiniportReserved field size</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+// For brand-new rx system</div><div class='add'>+#define MDS_ID_IGNORE				ETHERNET_RX_DESCRIPTORS</div><div class='add'>+</div><div class='add'>+// For Tx Packet status classify</div><div class='add'>+#define PACKET_FREE_TO_USE						0</div><div class='add'>+#define PACKET_COME_FROM_NDIS					0x08</div><div class='add'>+#define PACKET_COME_FROM_MLME					0x80</div><div class='add'>+#define PACKET_SEND_COMPLETE					0xff</div><div class='add'>+</div><div class='add'>+typedef struct _MDS</div><div class='add'>+{</div><div class='add'>+	// For Tx usage</div><div class='add'>+	u8	TxOwner[ ((MAX_USB_TX_BUFFER_NUMBER + 3) &amp; ~0x03) ];</div><div class='add'>+	PUCHAR	pTxBuffer;</div><div class='add'>+	u16	TxBufferSize[ ((MAX_USB_TX_BUFFER_NUMBER + 1) &amp; ~0x01) ];</div><div class='add'>+	u8	TxDesFrom[ ((MAX_USB_TX_DESCRIPTOR + 3) &amp; ~0x03) ];//931130.4.u // 1: MLME 2: NDIS control 3: NDIS data</div><div class='add'>+	u8	TxCountInBuffer[ ((MAX_USB_TX_DESCRIPTOR + 3) &amp; ~0x03) ]; // 20060928</div><div class='add'>+</div><div class='add'>+	u8	TxFillIndex;//the next index of TxBuffer can be used</div><div class='add'>+	u8	TxDesIndex;//The next index of TxDes can be used</div><div class='add'>+	u8	ScanTxPause;	//data Tx pause because the scanning is progressing, but probe request Tx won't.</div><div class='add'>+	u8	TxPause;//For pause the Mds_Tx modult</div><div class='add'>+</div><div class='add'>+	OS_ATOMIC	TxThreadCount;//For thread counting 931130.4.v</div><div class='add'>+//950301 delete due to HW</div><div class='add'>+//	OS_ATOMIC	TxConcurrentCount;//931130.4.w</div><div class='add'>+</div><div class='add'>+	u16	TxResult[ ((MAX_USB_TX_DESCRIPTOR + 1) &amp; ~0x01) ];//Collect the sending result of Mpdu</div><div class='add'>+</div><div class='add'>+	u8	MicRedundant[8]; // For tmp use</div><div class='add'>+	PUCHAR	MicWriteAddress[2]; //The start address to fill the Mic, use 2 point due to Mic maybe fragment</div><div class='add'>+</div><div class='add'>+	u16	MicWriteSize[2]; //931130.4.x</div><div class='add'>+</div><div class='add'>+	u16	MicAdd; // If want to add the Mic, this variable equal to 8</div><div class='add'>+	u16	MicWriteIndex;//The number of MicWriteAddress 931130.4.y</div><div class='add'>+</div><div class='add'>+	u8	TxRate[ ((MAX_USB_TX_DESCRIPTOR+1)&amp;~0x01) ][2]; // [0] current tx rate, [1] fall back rate</div><div class='add'>+	u8	TxInfo[ ((MAX_USB_TX_DESCRIPTOR+1)&amp;~0x01) ];	//Store information for callback function</div><div class='add'>+</div><div class='add'>+	//WKCHEN added for scanning mechanism</div><div class='add'>+	u8	TxToggle;		//It is TRUE if there are tx activities in some time interval</div><div class='add'>+	u8	Reserved_[3];</div><div class='add'>+</div><div class='add'>+	//---------- for Tx Parameter</div><div class='add'>+	u16	TxFragmentThreshold;    	// For frame body only</div><div class='add'>+	u16	TxRTSThreshold;</div><div class='add'>+</div><div class='add'>+	u32		MaxReceiveTime;//911220.3 Add</div><div class='add'>+</div><div class='add'>+	// depend on OS,</div><div class='add'>+	u32					MulticastListNo;</div><div class='add'>+	u32					PacketFilter; // Setting by NDIS, the current packet filter in use.</div><div class='add'>+	u8					MulticastAddressesArray[DEFAULT_MULTICASTLISTMAX][MAC_ADDR_LENGTH];</div><div class='add'>+</div><div class='add'>+	//COUNTERMEASURE</div><div class='add'>+	u8		bMICfailCount;</div><div class='add'>+	u8		boCounterMeasureBlock;</div><div class='add'>+	u8		reserved_4[2];</div><div class='add'>+</div><div class='add'>+	//NDIS_MINIPORT_TIMER	nTimer;</div><div class='add'>+	OS_TIMER	nTimer;</div><div class='add'>+</div><div class='add'>+	u32	TxTsc; // 20060214</div><div class='add'>+	u32	TxTsc_2; // 20060214</div><div class='add'>+</div><div class='add'>+} MDS, *PMDS;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+typedef struct _RxBuffer</div><div class='add'>+{</div><div class='add'>+    PUCHAR  pBufferAddress;     // Pointer the received data buffer.</div><div class='add'>+	u16	BufferSize;</div><div class='add'>+	u8	RESERVED;</div><div class='add'>+	u8	BufferIndex;// Only 1 byte</div><div class='add'>+} RXBUFFER, *PRXBUFFER;</div><div class='add'>+</div><div class='add'>+//</div><div class='add'>+// Reveive Layer 1 Format.</div><div class='add'>+//----------------------------</div><div class='add'>+typedef struct _RXLAYER1</div><div class='add'>+{</div><div class='add'>+    u16  SequenceNumber;     // The sequence number of the last received packet.</div><div class='add'>+	u16	BufferTotalSize;</div><div class='add'>+</div><div class='add'>+	u32	InUsed;</div><div class='add'>+    u32   DecryptionMethod;   // The desired defragment number of the next incoming packet.</div><div class='add'>+</div><div class='add'>+	u8	DeFragmentNumber;</div><div class='add'>+	u8	FrameType;</div><div class='add'>+    u8	TypeEncapsulated;</div><div class='add'>+	u8	BufferNumber;</div><div class='add'>+</div><div class='add'>+	u32	FirstFrameArrivedTime;</div><div class='add'>+</div><div class='add'>+	RXBUFFER	BufferQueue[ MAX_BUFFER_QUEUE ];</div><div class='add'>+</div><div class='add'>+	u8		LastFrameType; // 20061004 for fix intel 3945 's bug</div><div class='add'>+	u8		RESERVED[3];  //@@ anson</div><div class='add'>+</div><div class='add'>+	/////////////////////////////////////////////////////////////////////////////////////////////</div><div class='add'>+	// For brand-new Rx system</div><div class='add'>+	u8	ReservedBuffer[ 2400 ];//If Buffer ID is reserved one, it must copy the data into this area</div><div class='add'>+	PUCHAR	ReservedBufferPoint;// Point to the next availabe address of reserved buffer</div><div class='add'>+</div><div class='add'>+}RXLAYER1, * PRXLAYER1;</div><div class='add'>+</div><div class='add'>+</div><div class='head'>diff --git a/drivers/staging/winbond/mlme_mib.h b/drivers/staging/winbond/mlme_mib.h<br/>new file mode 100644<br/>index 000000000000..89759739cbac<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/winbond/mlme_mib.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/mlme_mib.h</a></div><div class='hunk'>@@ -0,0 +1,84 @@</div><div class='add'>+//============================================================================</div><div class='add'>+//  MLMEMIB.H -</div><div class='add'>+//</div><div class='add'>+//  Description:</div><div class='add'>+//    Get and Set some of MLME MIB attributes.</div><div class='add'>+//</div><div class='add'>+//  Revision history:</div><div class='add'>+//  --------------------------------------------------------------------------</div><div class='add'>+//           20030117  PD43 Austin Liu</div><div class='add'>+//                     Initial release</div><div class='add'>+//</div><div class='add'>+//  Copyright (c) 2003 Winbond Electronics Corp. All rights reserved.</div><div class='add'>+//============================================================================</div><div class='add'>+</div><div class='add'>+#ifndef _MLME_MIB_H</div><div class='add'>+#define _MLME_MIB_H</div><div class='add'>+</div><div class='add'>+//============================================================================</div><div class='add'>+// MLMESetExcludeUnencrypted --</div><div class='add'>+//</div><div class='add'>+// Description:</div><div class='add'>+//   Set the dot11ExcludeUnencrypted value.</div><div class='add'>+//</div><div class='add'>+// Arguments:</div><div class='add'>+//   Adapter        - The pointer to the miniport adapter context.</div><div class='add'>+//   ExUnencrypted  - unsigned char type. The value to be set.</div><div class='add'>+//</div><div class='add'>+// Return values:</div><div class='add'>+//   None.</div><div class='add'>+//============================================================================</div><div class='add'>+#define MLMESetExcludeUnencrypted(Adapter, ExUnencrypted)     \</div><div class='add'>+{                                                              \</div><div class='add'>+    (Adapter)-&gt;sLocalPara.ExcludeUnencrypted = ExUnencrypted;             \</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+//============================================================================</div><div class='add'>+// MLMEGetExcludeUnencrypted --</div><div class='add'>+//</div><div class='add'>+// Description:</div><div class='add'>+//   Get the dot11ExcludeUnencrypted value.</div><div class='add'>+//</div><div class='add'>+// Arguments:</div><div class='add'>+//   Adapter        - The pointer to the miniport adapter context.</div><div class='add'>+//</div><div class='add'>+// Return values:</div><div class='add'>+//   unsigned char type. The current dot11ExcludeUnencrypted value.</div><div class='add'>+//============================================================================</div><div class='add'>+#define MLMEGetExcludeUnencrypted(Adapter) ((unsigned char) (Adapter)-&gt;sLocalPara.ExcludeUnencrypted)</div><div class='add'>+</div><div class='add'>+//============================================================================</div><div class='add'>+// MLMESetMaxReceiveLifeTime --</div><div class='add'>+//</div><div class='add'>+// Description:</div><div class='add'>+//   Set the dot11MaxReceiveLifeTime value.</div><div class='add'>+//</div><div class='add'>+// Arguments:</div><div class='add'>+//   Adapter        - The pointer to the miniport adapter context.</div><div class='add'>+//   ReceiveLifeTime- u32 type. The value to be set.</div><div class='add'>+//</div><div class='add'>+// Return values:</div><div class='add'>+//   None.</div><div class='add'>+//============================================================================</div><div class='add'>+#define MLMESetMaxReceiveLifeTime(Adapter, ReceiveLifeTime)    \</div><div class='add'>+{                                                               \</div><div class='add'>+    (Adapter)-&gt;Mds.MaxReceiveTime = ReceiveLifeTime;                \</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+//============================================================================</div><div class='add'>+// MLMESetMaxReceiveLifeTime --</div><div class='add'>+//</div><div class='add'>+// Description:</div><div class='add'>+//   Get the dot11MaxReceiveLifeTime value.</div><div class='add'>+//</div><div class='add'>+// Arguments:</div><div class='add'>+//   Adapter        - The pointer to the miniport adapter context.</div><div class='add'>+//</div><div class='add'>+// Return values:</div><div class='add'>+//   u32 type. The current dot11MaxReceiveLifeTime value.</div><div class='add'>+//============================================================================</div><div class='add'>+#define MLMEGetMaxReceiveLifeTime(Adapter) ((u32) (Adapter)-&gt;Mds.MaxReceiveTime)</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+</div><div class='head'>diff --git a/drivers/staging/winbond/mlme_s.h b/drivers/staging/winbond/mlme_s.h<br/>new file mode 100644<br/>index 000000000000..58094f61c032<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/winbond/mlme_s.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/mlme_s.h</a></div><div class='hunk'>@@ -0,0 +1,195 @@</div><div class='add'>+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++</div><div class='add'>+//	Mlme.h</div><div class='add'>+//		Define the related definitions of MLME module</div><div class='add'>+//	history -- 01/14/03' created</div><div class='add'>+//</div><div class='add'>+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++</div><div class='add'>+</div><div class='add'>+#define AUTH_REJECT_REASON_CHALLENGE_FAIL		1</div><div class='add'>+</div><div class='add'>+//====== the state of MLME module</div><div class='add'>+#define INACTIVE			0x0</div><div class='add'>+#define IDLE_SCAN			0x1</div><div class='add'>+</div><div class='add'>+//====== the state of MLME/ESS module</div><div class='add'>+#define STATE_1				0x2</div><div class='add'>+#define AUTH_REQ			0x3</div><div class='add'>+#define AUTH_WEP			0x4</div><div class='add'>+#define STATE_2				0x5</div><div class='add'>+#define ASSOC_REQ			0x6</div><div class='add'>+#define STATE_3				0x7</div><div class='add'>+</div><div class='add'>+//====== the state of MLME/IBSS module</div><div class='add'>+#define IBSS_JOIN_SYNC		0x8</div><div class='add'>+#define IBSS_AUTH_REQ		0x9</div><div class='add'>+#define IBSS_AUTH_CHANLGE	0xa</div><div class='add'>+#define IBSS_AUTH_WEP		0xb</div><div class='add'>+#define IBSS_AUTH_IND		0xc</div><div class='add'>+#define IBSS_STATE_2		0xd</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+//=========================================</div><div class='add'>+//depend on D5C(MAC timing control 03 register): MaxTxMSDULifeTime default 0x80000us</div><div class='add'>+#define AUTH_FAIL_TIMEOUT		550</div><div class='add'>+#define ASSOC_FAIL_TIMEOUT		550</div><div class='add'>+#define REASSOC_FAIL_TIMEOUT	550</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+//</div><div class='add'>+// MLME task global CONSTANTS, STRUCTURE, variables</div><div class='add'>+//</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/////////////////////////////////////////////////////////////</div><div class='add'>+//  enum_ResultCode --</div><div class='add'>+//  Result code returned from MLME to SME.</div><div class='add'>+//</div><div class='add'>+/////////////////////////////////////////////////////////////</div><div class='add'>+// PD43 20030829 Modifiled</div><div class='add'>+//#define	SUCCESS								0</div><div class='add'>+#define MLME_SUCCESS                        0 //follow spec.</div><div class='add'>+#define	INVALID_PARAMETERS					1 //Not following spec.</div><div class='add'>+#define	NOT_SUPPPORTED						2</div><div class='add'>+#define	TIMEOUT								3</div><div class='add'>+#define	TOO_MANY_SIMULTANEOUS_REQUESTS		4</div><div class='add'>+#define REFUSED								5</div><div class='add'>+#define	BSS_ALREADY_STARTED_OR_JOINED		6</div><div class='add'>+#define	TRANSMIT_FRAME_FAIL					7</div><div class='add'>+#define	NO_BSS_FOUND						8</div><div class='add'>+#define RETRY								9</div><div class='add'>+#define GIVE_UP								10</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define OPEN_AUTH							0</div><div class='add'>+#define SHARE_AUTH							1</div><div class='add'>+#define ANY_AUTH							2</div><div class='add'>+#define WPA_AUTH							3	//for WPA</div><div class='add'>+#define WPAPSK_AUTH							4</div><div class='add'>+#define WPANONE_AUTH						5</div><div class='add'>+///////////////////////////////////////////// added by ws 04/19/04</div><div class='add'>+#ifdef _WPA2_</div><div class='add'>+#define WPA2_AUTH                           6//for WPA2</div><div class='add'>+#define WPA2PSK_AUTH                        7</div><div class='add'>+#endif //end def _WPA2_</div><div class='add'>+</div><div class='add'>+//////////////////////////////////////////////////////////////////</div><div class='add'>+//define the msg type of MLME module</div><div class='add'>+//////////////////////////////////////////////////////////////////</div><div class='add'>+//--------------------------------------------------------</div><div class='add'>+//from SME</div><div class='add'>+</div><div class='add'>+#define MLMEMSG_AUTH_REQ				0x0b</div><div class='add'>+#define MLMEMSG_DEAUTH_REQ				0x0c</div><div class='add'>+#define MLMEMSG_ASSOC_REQ				0x0d</div><div class='add'>+#define MLMEMSG_REASSOC_REQ				0x0e</div><div class='add'>+#define MLMEMSG_DISASSOC_REQ			0x0f</div><div class='add'>+#define MLMEMSG_START_IBSS_REQ			0x10</div><div class='add'>+#define MLMEMSG_IBSS_NET_CFM			0x11</div><div class='add'>+</div><div class='add'>+//from RX :</div><div class='add'>+#define MLMEMSG_RCV_MLMEFRAME			0x20</div><div class='add'>+#define MLMEMSG_RCV_ASSOCRSP			0x22</div><div class='add'>+#define MLMEMSG_RCV_REASSOCRSP			0x24</div><div class='add'>+#define MLMEMSG_RCV_DISASSOC			0x2b</div><div class='add'>+#define MLMEMSG_RCV_AUTH				0x2c</div><div class='add'>+#define MLMEMSG_RCV_DEAUTH				0x2d</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+//from TX callback</div><div class='add'>+#define MLMEMSG_TX_CALLBACK				0x40</div><div class='add'>+#define MLMEMSG_ASSOCREQ_CALLBACK		0x41</div><div class='add'>+#define MLMEMSG_REASSOCREQ_CALLBACK		0x43</div><div class='add'>+#define MLMEMSG_DISASSOC_CALLBACK		0x4a</div><div class='add'>+#define MLMEMSG_AUTH_CALLBACK			0x4c</div><div class='add'>+#define MLMEMSG_DEAUTH_CALLBACK			0x4d</div><div class='add'>+</div><div class='add'>+//#define MLMEMSG_JOIN_FAIL				4</div><div class='add'>+//#define MLMEMSG_AUTHEN_FAIL			18</div><div class='add'>+#define MLMEMSG_TIMEOUT					0x50</div><div class='add'>+</div><div class='add'>+///////////////////////////////////////////////////////////////////////////</div><div class='add'>+//Global data structures</div><div class='add'>+#define MAX_NUM_TX_MMPDU	2</div><div class='add'>+#define MAX_MMPDU_SIZE		1512</div><div class='add'>+#define MAX_NUM_RX_MMPDU	6</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+///////////////////////////////////////////////////////////////////////////</div><div class='add'>+//MACRO</div><div class='add'>+#define boMLME_InactiveState(_AA_)	(_AA_-&gt;wState==INACTIVE)</div><div class='add'>+#define boMLME_IdleScanState(_BB_)	(_BB_-&gt;wState==IDLE_SCAN)</div><div class='add'>+#define boMLME_FoundSTAinfo(_CC_)	(_CC_-&gt;wState&gt;=IDLE_SCAN)</div><div class='add'>+</div><div class='add'>+typedef struct _MLME_FRAME</div><div class='add'>+{</div><div class='add'>+	//NDIS_PACKET		MLME_Packet;</div><div class='add'>+	PCHAR			pMMPDU;</div><div class='add'>+	u16			len;</div><div class='add'>+	u8			DataType;</div><div class='add'>+	u8			IsInUsed;</div><div class='add'>+</div><div class='add'>+	OS_SPIN_LOCK	MLMESpinLock;</div><div class='add'>+</div><div class='add'>+    u8		TxMMPDU[MAX_NUM_TX_MMPDU][MAX_MMPDU_SIZE];</div><div class='add'>+	u8		TxMMPDUInUse[ (MAX_NUM_TX_MMPDU+3) &amp; ~0x03 ];</div><div class='add'>+</div><div class='add'>+	u16		wNumTxMMPDU;</div><div class='add'>+	u16		wNumTxMMPDUDiscarded;</div><div class='add'>+</div><div class='add'>+    u8		RxMMPDU[MAX_NUM_RX_MMPDU][MAX_MMPDU_SIZE];</div><div class='add'>+    u8	 	SaveRxBufSlotInUse[ (MAX_NUM_RX_MMPDU+3) &amp; ~0x03 ];</div><div class='add'>+</div><div class='add'>+	u16		wNumRxMMPDU;</div><div class='add'>+	u16		wNumRxMMPDUDiscarded;</div><div class='add'>+</div><div class='add'>+	u16		wNumRxMMPDUInMLME; 	// Number of the Rx MMPDU</div><div class='add'>+	u16		reserved_1;			//  in MLME.</div><div class='add'>+                    	            //  excluding the discarded</div><div class='add'>+} MLME_FRAME, *psMLME_FRAME;</div><div class='add'>+</div><div class='add'>+typedef struct _AUTHREQ {</div><div class='add'>+</div><div class='add'>+	u8 	peerMACaddr[MAC_ADDR_LENGTH];</div><div class='add'>+	u16	wAuthAlgorithm;</div><div class='add'>+</div><div class='add'>+} MLME_AUTHREQ_PARA, *psMLME_AUTHREQ_PARA;</div><div class='add'>+</div><div class='add'>+struct _Reason_Code {</div><div class='add'>+</div><div class='add'>+	u8	peerMACaddr[MAC_ADDR_LENGTH];</div><div class='add'>+	u16	wReasonCode;</div><div class='add'>+};</div><div class='add'>+typedef struct _Reason_Code MLME_DEAUTHREQ_PARA, *psMLME_DEAUTHREQ_PARA;</div><div class='add'>+typedef struct _Reason_Code MLME_DISASSOCREQ_PARA, *psMLME_DISASSOCREQ_PARA;</div><div class='add'>+</div><div class='add'>+typedef struct _ASSOCREQ {</div><div class='add'>+  u8       PeerSTAAddr[MAC_ADDR_LENGTH];</div><div class='add'>+  u16       CapabilityInfo;</div><div class='add'>+  u16       ListenInterval;</div><div class='add'>+</div><div class='add'>+}__attribute__ ((packed)) MLME_ASSOCREQ_PARA, *psMLME_ASSOCREQ_PARA;</div><div class='add'>+</div><div class='add'>+typedef struct _REASSOCREQ {</div><div class='add'>+  u8       NewAPAddr[MAC_ADDR_LENGTH];</div><div class='add'>+  u16       CapabilityInfo;</div><div class='add'>+  u16       ListenInterval;</div><div class='add'>+</div><div class='add'>+}__attribute__ ((packed)) MLME_REASSOCREQ_PARA, *psMLME_REASSOCREQ_PARA;</div><div class='add'>+</div><div class='add'>+typedef struct _MLMECALLBACK {</div><div class='add'>+</div><div class='add'>+  u8 	*psFramePtr;</div><div class='add'>+  u8		bResult;</div><div class='add'>+</div><div class='add'>+} MLME_TXCALLBACK, *psMLME_TXCALLBACK;</div><div class='add'>+</div><div class='add'>+typedef struct _RXDATA</div><div class='add'>+{</div><div class='add'>+	s32		FrameLength;</div><div class='add'>+	u8	__attribute__ ((packed)) *pbFramePtr;</div><div class='add'>+</div><div class='add'>+}__attribute__ ((packed)) RXDATA, *psRXDATA;</div><div class='add'>+</div><div class='add'>+</div><div class='head'>diff --git a/drivers/staging/winbond/mlmetxrx.c b/drivers/staging/winbond/mlmetxrx.c<br/>new file mode 100644<br/>index 000000000000..46b091e96794<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/winbond/mlmetxrx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/mlmetxrx.c</a></div><div class='hunk'>@@ -0,0 +1,150 @@</div><div class='add'>+//============================================================================</div><div class='add'>+//  Module Name:</div><div class='add'>+//    MLMETxRx.C</div><div class='add'>+//</div><div class='add'>+//  Description:</div><div class='add'>+//    The interface between MDS (MAC Data Service) and MLME.</div><div class='add'>+//</div><div class='add'>+//  Revision History:</div><div class='add'>+//  --------------------------------------------------------------------------</div><div class='add'>+//          200209      UN20 Jennifer Xu</div><div class='add'>+//                      Initial Release</div><div class='add'>+//          20021108    PD43 Austin Liu</div><div class='add'>+//          20030117    PD43 Austin Liu</div><div class='add'>+//                      Deleted MLMEReturnPacket and MLMEProcThread()</div><div class='add'>+//</div><div class='add'>+//  Copyright (c) 1996-2002 Winbond Electronics Corp. All Rights Reserved.</div><div class='add'>+//============================================================================</div><div class='add'>+#include "os_common.h"</div><div class='add'>+</div><div class='add'>+void MLMEResetTxRx(PWB32_ADAPTER Adapter)</div><div class='add'>+{</div><div class='add'>+	s32     i;</div><div class='add'>+</div><div class='add'>+	// Reset the interface between MDS and MLME</div><div class='add'>+	for (i = 0; i &lt; MAX_NUM_TX_MMPDU; i++)</div><div class='add'>+		Adapter-&gt;sMlmeFrame.TxMMPDUInUse[i] = FALSE;</div><div class='add'>+	for (i = 0; i &lt; MAX_NUM_RX_MMPDU; i++)</div><div class='add'>+		Adapter-&gt;sMlmeFrame.SaveRxBufSlotInUse[i] = FALSE;</div><div class='add'>+</div><div class='add'>+	Adapter-&gt;sMlmeFrame.wNumRxMMPDUInMLME   = 0;</div><div class='add'>+	Adapter-&gt;sMlmeFrame.wNumRxMMPDUDiscarded = 0;</div><div class='add'>+	Adapter-&gt;sMlmeFrame.wNumRxMMPDU          = 0;</div><div class='add'>+	Adapter-&gt;sMlmeFrame.wNumTxMMPDUDiscarded = 0;</div><div class='add'>+	Adapter-&gt;sMlmeFrame.wNumTxMMPDU          = 0;</div><div class='add'>+	Adapter-&gt;sLocalPara.boCCAbusy    = FALSE;</div><div class='add'>+	Adapter-&gt;sLocalPara.iPowerSaveMode     = PWR_ACTIVE;     // Power active</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+//=============================================================================</div><div class='add'>+//	Function:</div><div class='add'>+//    MLMEGetMMPDUBuffer()</div><div class='add'>+//</div><div class='add'>+//	Description:</div><div class='add'>+//    Return the pointer to an available data buffer with</div><div class='add'>+//    the size MAX_MMPDU_SIZE for a MMPDU.</div><div class='add'>+//</div><div class='add'>+//  Arguments:</div><div class='add'>+//    Adapter   - pointer to the miniport adapter context.</div><div class='add'>+//</div><div class='add'>+//	Return value:</div><div class='add'>+//    NULL     : No available data buffer available</div><div class='add'>+//    Otherwise: Pointer to the data buffer</div><div class='add'>+//=============================================================================</div><div class='add'>+</div><div class='add'>+/* FIXME: Should this just be replaced with kmalloc() and kfree()? */</div><div class='add'>+u8 *MLMEGetMMPDUBuffer(PWB32_ADAPTER Adapter)</div><div class='add'>+{</div><div class='add'>+	s32 i;</div><div class='add'>+	u8 *returnVal;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i&lt; MAX_NUM_TX_MMPDU; i++) {</div><div class='add'>+		if (Adapter-&gt;sMlmeFrame.TxMMPDUInUse[i] == FALSE)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	if (i &gt;= MAX_NUM_TX_MMPDU) return NULL;</div><div class='add'>+</div><div class='add'>+	returnVal = (u8 *)&amp;(Adapter-&gt;sMlmeFrame.TxMMPDU[i]);</div><div class='add'>+	Adapter-&gt;sMlmeFrame.TxMMPDUInUse[i] = TRUE;</div><div class='add'>+</div><div class='add'>+	return returnVal;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+//=============================================================================</div><div class='add'>+u8 MLMESendFrame(PWB32_ADAPTER Adapter, u8 *pMMPDU, u16 len, u8 DataType)</div><div class='add'>+/*	DataType : FRAME_TYPE_802_11_MANAGEMENT, FRAME_TYPE_802_11_MANAGEMENT_CHALLENGE,</div><div class='add'>+				FRAME_TYPE_802_11_DATA */</div><div class='add'>+{</div><div class='add'>+	if (Adapter-&gt;sMlmeFrame.IsInUsed != PACKET_FREE_TO_USE) {</div><div class='add'>+		Adapter-&gt;sMlmeFrame.wNumTxMMPDUDiscarded++;</div><div class='add'>+		return FALSE;</div><div class='add'>+	}</div><div class='add'>+	Adapter-&gt;sMlmeFrame.IsInUsed = PACKET_COME_FROM_MLME;</div><div class='add'>+</div><div class='add'>+	// Keep information for sending</div><div class='add'>+	Adapter-&gt;sMlmeFrame.pMMPDU = pMMPDU;</div><div class='add'>+	Adapter-&gt;sMlmeFrame.DataType = DataType;</div><div class='add'>+	// len must be the last setting due to QUERY_SIZE_SECOND of Mds</div><div class='add'>+	Adapter-&gt;sMlmeFrame.len = len;</div><div class='add'>+	Adapter-&gt;sMlmeFrame.wNumTxMMPDU++;</div><div class='add'>+</div><div class='add'>+	// H/W will enter power save by set the register. S/W don't send null frame</div><div class='add'>+	//with PWRMgt bit enbled to enter power save now.</div><div class='add'>+</div><div class='add'>+	// Transmit NDIS packet</div><div class='add'>+	Mds_Tx(Adapter);</div><div class='add'>+	return TRUE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+MLME_GetNextPacket(PADAPTER Adapter, PDESCRIPTOR pDes)</div><div class='add'>+{</div><div class='add'>+#define DESCRIPTOR_ADD_BUFFER( _D, _A, _S ) \</div><div class='add'>+{\</div><div class='add'>+	_D-&gt;InternalUsed = _D-&gt;buffer_start_index + _D-&gt;buffer_number; \</div><div class='add'>+	_D-&gt;InternalUsed %= MAX_DESCRIPTOR_BUFFER_INDEX; \</div><div class='add'>+	_D-&gt;buffer_address[ _D-&gt;InternalUsed ] = _A; \</div><div class='add'>+	_D-&gt;buffer_size[ _D-&gt;InternalUsed ] = _S; \</div><div class='add'>+	_D-&gt;buffer_total_size += _S; \</div><div class='add'>+	_D-&gt;buffer_number++;\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+	DESCRIPTOR_ADD_BUFFER( pDes, Adapter-&gt;sMlmeFrame.pMMPDU, Adapter-&gt;sMlmeFrame.len );</div><div class='add'>+	pDes-&gt;Type = Adapter-&gt;sMlmeFrame.DataType;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void MLMEfreeMMPDUBuffer(PWB32_ADAPTER Adapter, PCHAR pData)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	// Reclaim the data buffer</div><div class='add'>+	for (i = 0; i &lt; MAX_NUM_TX_MMPDU; i++) {</div><div class='add'>+		if (pData == (PCHAR)&amp;(Adapter-&gt;sMlmeFrame.TxMMPDU[i]))</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	if (Adapter-&gt;sMlmeFrame.TxMMPDUInUse[i])</div><div class='add'>+		Adapter-&gt;sMlmeFrame.TxMMPDUInUse[i] = FALSE;</div><div class='add'>+	else  {</div><div class='add'>+		// Something wrong</div><div class='add'>+		// PD43 Add debug code here???</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+MLME_SendComplete(PADAPTER Adapter, u8 PacketID, unsigned char SendOK)</div><div class='add'>+{</div><div class='add'>+	MLME_TXCALLBACK	TxCallback;</div><div class='add'>+</div><div class='add'>+    // Reclaim the data buffer</div><div class='add'>+	Adapter-&gt;sMlmeFrame.len = 0;</div><div class='add'>+	MLMEfreeMMPDUBuffer( Adapter, Adapter-&gt;sMlmeFrame.pMMPDU );</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	TxCallback.bResult = MLME_SUCCESS;</div><div class='add'>+</div><div class='add'>+	// Return resource</div><div class='add'>+	Adapter-&gt;sMlmeFrame.IsInUsed = PACKET_FREE_TO_USE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='head'>diff --git a/drivers/staging/winbond/mlmetxrx_f.h b/drivers/staging/winbond/mlmetxrx_f.h<br/>new file mode 100644<br/>index 000000000000..d74e225be215<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/winbond/mlmetxrx_f.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/mlmetxrx_f.h</a></div><div class='hunk'>@@ -0,0 +1,52 @@</div><div class='add'>+//================================================================</div><div class='add'>+// MLMETxRx.H --</div><div class='add'>+//</div><div class='add'>+//   Functions defined in MLMETxRx.c.</div><div class='add'>+//</div><div class='add'>+// Copyright (c) 2002 Winbond Electrics Corp. All Rights Reserved.</div><div class='add'>+//================================================================</div><div class='add'>+#ifndef _MLMETXRX_H</div><div class='add'>+#define _MLMETXRX_H</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+MLMEProcThread(</div><div class='add'>+     PWB32_ADAPTER    Adapter</div><div class='add'>+	);</div><div class='add'>+</div><div class='add'>+void MLMEResetTxRx( PWB32_ADAPTER Adapter);</div><div class='add'>+</div><div class='add'>+u8 *</div><div class='add'>+MLMEGetMMPDUBuffer(</div><div class='add'>+     PWB32_ADAPTER    Adapter</div><div class='add'>+   );</div><div class='add'>+</div><div class='add'>+void MLMEfreeMMPDUBuffer( PWB32_ADAPTER Adapter,  PCHAR pData);</div><div class='add'>+</div><div class='add'>+void MLME_GetNextPacket(  PADAPTER Adapter,  PDESCRIPTOR pDes );</div><div class='add'>+u8 MLMESendFrame( PWB32_ADAPTER Adapter,</div><div class='add'>+					u8	*pMMPDU,</div><div class='add'>+					u16	len,</div><div class='add'>+					 u8	DataType);</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+MLME_SendComplete(  PWB32_ADAPTER Adapter,  u8 PacketID,  unsigned char SendOK );</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+MLMERcvFrame(</div><div class='add'>+     PWB32_ADAPTER    Adapter,</div><div class='add'>+     PRXBUFFER        pRxBufferArray,</div><div class='add'>+     u8            NumOfBuffer,</div><div class='add'>+     u8            ReturnSlotIndex</div><div class='add'>+	);</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+MLMEReturnPacket(</div><div class='add'>+     PWB32_ADAPTER    Adapter,</div><div class='add'>+     PUCHAR           pRxBufer</div><div class='add'>+   );</div><div class='add'>+#ifdef _IBSS_BEACON_SEQ_STICK_</div><div class='add'>+s8 SendBCNullData(PWB32_ADAPTER Adapter, u16 wIdx);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='head'>diff --git a/drivers/staging/winbond/mto.c b/drivers/staging/winbond/mto.c<br/>new file mode 100644<br/>index 000000000000..2ef60e5120cc<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/winbond/mto.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/mto.c</a></div><div class='hunk'>@@ -0,0 +1,1229 @@</div><div class='add'>+//============================================================================</div><div class='add'>+//  MTO.C -</div><div class='add'>+//</div><div class='add'>+//  Description:</div><div class='add'>+//    MAC Throughput Optimization for W89C33 802.11g WLAN STA.</div><div class='add'>+//</div><div class='add'>+//    The following MIB attributes or internal variables will be affected</div><div class='add'>+//    while the MTO is being executed:</div><div class='add'>+//       dot11FragmentationThreshold,</div><div class='add'>+//       dot11RTSThreshold,</div><div class='add'>+//       transmission rate and PLCP preamble type,</div><div class='add'>+//       CCA mode,</div><div class='add'>+//       antenna diversity.</div><div class='add'>+//</div><div class='add'>+//  Revision history:</div><div class='add'>+//  --------------------------------------------------------------------------</div><div class='add'>+//           20031227  UN20 Pete Chao</div><div class='add'>+//                     First draft</div><div class='add'>+//  20031229           Turbo                copy from PD43</div><div class='add'>+//  20040210           Kevin                revised</div><div class='add'>+//  Copyright (c) 2003 Winbond Electronics Corp. All rights reserved.</div><div class='add'>+//============================================================================</div><div class='add'>+</div><div class='add'>+// LA20040210_DTO kevin</div><div class='add'>+#include "os_common.h"</div><div class='add'>+</div><div class='add'>+// Declare SQ3 to rate and fragmentation threshold table</div><div class='add'>+// Declare fragmentation thresholds table</div><div class='add'>+#define MTO_MAX_SQ3_LEVELS                      14</div><div class='add'>+#define MTO_MAX_FRAG_TH_LEVELS                  5</div><div class='add'>+#define MTO_MAX_DATA_RATE_LEVELS                12</div><div class='add'>+</div><div class='add'>+u16 MTO_Frag_Th_Tbl[MTO_MAX_FRAG_TH_LEVELS] =</div><div class='add'>+{</div><div class='add'>+    256, 384, 512, 768, 1536</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+u8  MTO_SQ3_Level[MTO_MAX_SQ3_LEVELS] =</div><div class='add'>+{</div><div class='add'>+    0, 26, 30, 32, 34, 35, 37, 42, 44, 46, 54, 62, 78, 81</div><div class='add'>+};</div><div class='add'>+u8  MTO_SQ3toRate[MTO_MAX_SQ3_LEVELS] =</div><div class='add'>+{</div><div class='add'>+    0, 1, 1, 2, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11</div><div class='add'>+};</div><div class='add'>+u8  MTO_SQ3toFrag[MTO_MAX_SQ3_LEVELS] =</div><div class='add'>+{</div><div class='add'>+    0, 2, 2, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+// One Exchange Time table</div><div class='add'>+//</div><div class='add'>+u16 MTO_One_Exchange_Time_Tbl_l[MTO_MAX_FRAG_TH_LEVELS][MTO_MAX_DATA_RATE_LEVELS] =</div><div class='add'>+{</div><div class='add'>+    { 2554, 1474,  822,    0,    0,  636,    0,    0,    0,    0,    0,    0},</div><div class='add'>+    { 3578, 1986, 1009,    0,    0,  729,    0,    0,    0,    0,    0,    0},</div><div class='add'>+    { 4602, 2498, 1195,    0,    0,  822,    0,    0,    0,    0,    0,    0},</div><div class='add'>+    { 6650, 3522, 1567,    0,    0, 1009,    0,    0,    0,    0,    0,    0},</div><div class='add'>+    {12794, 6594, 2684,    0,    0, 1567,    0,    0,    0,    0,    0,    0}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+u16 MTO_One_Exchange_Time_Tbl_s[MTO_MAX_FRAG_TH_LEVELS][MTO_MAX_DATA_RATE_LEVELS] =</div><div class='add'>+{</div><div class='add'>+    {    0, 1282,  630,  404,  288,  444,  232,  172,  144,  116,  100,   96},</div><div class='add'>+    {    0, 1794,  817,  572,  400,  537,  316,  228,  188,  144,  124,  116},</div><div class='add'>+    {    0, 2306, 1003,  744,  516,  630,  400,  288,  228,  172,  144,  136},</div><div class='add'>+    {    0, 3330, 1375, 1084,  744,  817,  572,  400,  316,  228,  188,  172},</div><div class='add'>+    {    0, 6402, 2492, 2108, 1424, 1375, 1084,  740,  572,  400,  316,  284}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define MTO_ONE_EXCHANGE_TIME(preamble_type, frag_th_lvl, data_rate_lvl) \</div><div class='add'>+            (preamble_type) ?   MTO_One_Exchange_Time_Tbl_s[frag_th_lvl][data_rate_lvl] : \</div><div class='add'>+                                MTO_One_Exchange_Time_Tbl_l[frag_th_lvl][data_rate_lvl]</div><div class='add'>+</div><div class='add'>+// Declare data rate table</div><div class='add'>+//The following table will be changed at anytime if the opration rate supported by AP don't</div><div class='add'>+//match the table</div><div class='add'>+u8  MTO_Data_Rate_Tbl[MTO_MAX_DATA_RATE_LEVELS] =</div><div class='add'>+{</div><div class='add'>+    2, 4, 11, 22, 12, 18, 24, 36, 48, 72, 96, 108</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+//The Stardard_Data_Rate_Tbl and Level2PerTbl table is used to indirectly retreive PER</div><div class='add'>+//information from Rate_PER_TBL</div><div class='add'>+//The default settings is AP can support full rate set.</div><div class='add'>+static u8  Stardard_Data_Rate_Tbl[MTO_MAX_DATA_RATE_LEVELS] =</div><div class='add'>+{</div><div class='add'>+	2, 4, 11, 22, 12, 18, 24, 36, 48, 72, 96, 108</div><div class='add'>+};</div><div class='add'>+static u8  Level2PerTbl[MTO_MAX_DATA_RATE_LEVELS] =</div><div class='add'>+{</div><div class='add'>+	0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11</div><div class='add'>+};</div><div class='add'>+//How many kind of tx rate can be supported by AP</div><div class='add'>+//DTO will change Rate between MTO_Data_Rate_Tbl[0] and MTO_Data_Rate_Tbl[MTO_DataRateAvailableLevel-1]</div><div class='add'>+static u8  MTO_DataRateAvailableLevel = MTO_MAX_DATA_RATE_LEVELS;</div><div class='add'>+//Smoothed PER table for each different RATE based on packet length of 1514</div><div class='add'>+static int Rate_PER_TBL[91][MTO_MAX_DATA_RATE_LEVELS] = {</div><div class='add'>+//        1M    2M    5.5M  11M   6M    9M    12M     18M    24M    36M    48M   54M</div><div class='add'>+/* 0%  */{ 93,   177,  420,  538,  690,  774,  1001,  1401,  1768,  2358,  2838,  3039},</div><div class='add'>+/* 1%  */{ 92,   176,  416,  533,  683,  767,  992,   1389,  1752,  2336,  2811,  3010},</div><div class='add'>+/* 2%  */{ 91,   174,  412,  528,  675,  760,  983,   1376,  1735,  2313,  2783,  2979},</div><div class='add'>+/* 3%  */{ 90,   172,  407,  523,  667,  753,  973,   1363,  1719,  2290,  2755,  2948},</div><div class='add'>+/* 4%  */{ 90,   170,  403,  518,  659,  746,  964,   1350,  1701,  2266,  2726,  2916},</div><div class='add'>+/* 5%  */{ 89,   169,  398,  512,  651,  738,  954,   1336,  1684,  2242,  2696,  2884},</div><div class='add'>+/* 6%  */{ 88,   167,  394,  507,  643,  731,  944,   1322,  1666,  2217,  2665,  2851},</div><div class='add'>+/* 7%  */{ 87,   165,  389,  502,  635,  723,  935,   1308,  1648,  2192,  2634,  2817},</div><div class='add'>+/* 8%  */{ 86,   163,  384,  497,  626,  716,  924,   1294,  1629,  2166,  2602,  2782},</div><div class='add'>+/* 9%  */{ 85,   161,  380,  491,  618,  708,  914,   1279,  1611,  2140,  2570,  2747},</div><div class='add'>+/* 10% */{ 84,   160,  375,  486,  609,  700,  904,   1265,  1591,  2113,  2537,  2711},</div><div class='add'>+/* 11% */{ 83,   158,  370,  480,  600,  692,  894,   1250,  1572,  2086,  2503,  2675},</div><div class='add'>+/* 12% */{ 82,   156,  365,  475,  592,  684,  883,   1234,  1552,  2059,  2469,  2638},</div><div class='add'>+/* 13% */{ 81,   154,  360,  469,  583,  676,  872,   1219,  1532,  2031,  2435,  2600},</div><div class='add'>+/* 14% */{ 80,   152,  355,  464,  574,  668,  862,   1204,  1512,  2003,  2400,  2562},</div><div class='add'>+/* 15% */{ 79,   150,  350,  458,  565,  660,  851,   1188,  1492,  1974,  2365,  2524},</div><div class='add'>+/* 16% */{ 78,   148,  345,  453,  556,  652,  840,   1172,  1471,  1945,  2329,  2485},</div><div class='add'>+/* 17% */{ 77,   146,  340,  447,  547,  643,  829,   1156,  1450,  1916,  2293,  2446},</div><div class='add'>+/* 18% */{ 76,   144,  335,  441,  538,  635,  818,   1140,  1429,  1887,  2256,  2406},</div><div class='add'>+/* 19% */{ 75,   143,  330,  436,  529,  627,  807,   1124,  1408,  1857,  2219,  2366},</div><div class='add'>+/* 20% */{ 74,   141,  325,  430,  520,  618,  795,   1107,  1386,  1827,  2182,  2326},</div><div class='add'>+/* 21% */{ 73,   139,  320,  424,  510,  610,  784,   1091,  1365,  1797,  2145,  2285},</div><div class='add'>+/* 22% */{ 72,   137,  314,  418,  501,  601,  772,   1074,  1343,  1766,  2107,  2244},</div><div class='add'>+/* 23% */{ 71,   135,  309,  412,  492,  592,  761,   1057,  1321,  1736,  2069,  2203},</div><div class='add'>+/* 24% */{ 70,   133,  304,  407,  482,  584,  749,   1040,  1299,  1705,  2031,  2161},</div><div class='add'>+/* 25% */{ 69,   131,  299,  401,  473,  575,  738,   1023,  1277,  1674,  1992,  2120},</div><div class='add'>+/* 26% */{ 68,   129,  293,  395,  464,  566,  726,   1006,  1254,  1642,  1953,  2078},</div><div class='add'>+/* 27% */{ 67,   127,  288,  389,  454,  557,  714,   989,   1232,  1611,  1915,  2035},</div><div class='add'>+/* 28% */{ 66,   125,  283,  383,  445,  549,  703,   972,   1209,  1579,  1876,  1993},</div><div class='add'>+/* 29% */{ 65,   123,  278,  377,  436,  540,  691,   955,   1187,  1548,  1836,  1951},</div><div class='add'>+/* 30% */{ 64,   121,  272,  371,  426,  531,  679,   937,   1164,  1516,  1797,  1908},</div><div class='add'>+/* 31% */{ 63,   119,  267,  365,  417,  522,  667,   920,   1141,  1484,  1758,  1866},</div><div class='add'>+/* 32% */{ 62,   117,  262,  359,  407,  513,  655,   902,   1118,  1453,  1719,  1823},</div><div class='add'>+/* 33% */{ 61,   115,  256,  353,  398,  504,  643,   885,   1095,  1421,  1679,  1781},</div><div class='add'>+/* 34% */{ 60,   113,  251,  347,  389,  495,  631,   867,   1072,  1389,  1640,  1738},</div><div class='add'>+/* 35% */{ 59,   111,  246,  341,  379,  486,  619,   850,   1049,  1357,  1600,  1695},</div><div class='add'>+/* 36% */{ 58,   108,  240,  335,  370,  477,  607,   832,   1027,  1325,  1561,  1653},</div><div class='add'>+/* 37% */{ 57,   106,  235,  329,  361,  468,  595,   815,   1004,  1293,  1522,  1610},</div><div class='add'>+/* 38% */{ 56,   104,  230,  323,  351,  459,  584,   797,   981,   1261,  1483,  1568},</div><div class='add'>+/* 39% */{ 55,   102,  224,  317,  342,  450,  572,   780,   958,   1230,  1443,  1526},</div><div class='add'>+/* 40% */{ 54,   100,  219,  311,  333,  441,  560,   762,   935,   1198,  1404,  1484},</div><div class='add'>+/* 41% */{ 53,   98,   214,  305,  324,  432,  548,   744,   912,   1166,  1366,  1442},</div><div class='add'>+/* 42% */{ 52,   96,   209,  299,  315,  423,  536,   727,   889,   1135,  1327,  1400},</div><div class='add'>+/* 43% */{ 51,   94,   203,  293,  306,  414,  524,   709,   866,   1104,  1289,  1358},</div><div class='add'>+/* 44% */{ 50,   92,   198,  287,  297,  405,  512,   692,   844,   1072,  1250,  1317},</div><div class='add'>+/* 45% */{ 49,   90,   193,  281,  288,  396,  500,   675,   821,   1041,  1212,  1276},</div><div class='add'>+/* 46% */{ 48,   88,   188,  275,  279,  387,  488,   657,   799,   1011,  1174,  1236},</div><div class='add'>+/* 47% */{ 47,   86,   183,  269,  271,  378,  476,   640,   777,   980,   1137,  1195},</div><div class='add'>+/* 48% */{ 46,   84,   178,  262,  262,  369,  464,   623,   754,   949,   1100,  1155},</div><div class='add'>+/* 49% */{ 45,   82,   173,  256,  254,  360,  452,   606,   732,   919,   1063,  1116},</div><div class='add'>+/* 50% */{ 44,   80,   168,  251,  245,  351,  441,   589,   710,   889,   1026,  1076},</div><div class='add'>+/* 51% */{ 43,   78,   163,  245,  237,  342,  429,   572,   689,   860,   990,   1038},</div><div class='add'>+/* 52% */{ 42,   76,   158,  239,  228,  333,  417,   555,   667,   830,   955,   999},</div><div class='add'>+/* 53% */{ 41,   74,   153,  233,  220,  324,  406,   538,   645,   801,   919,   961},</div><div class='add'>+/* 54% */{ 40,   72,   148,  227,  212,  315,  394,   522,   624,   773,   884,   924},</div><div class='add'>+/* 55% */{ 39,   70,   143,  221,  204,  307,  383,   505,   603,   744,   850,   887},</div><div class='add'>+/* 56% */{ 38,   68,   138,  215,  196,  298,  371,   489,   582,   716,   816,   851},</div><div class='add'>+/* 57% */{ 37,   67,   134,  209,  189,  289,  360,   473,   562,   688,   783,   815},</div><div class='add'>+/* 58% */{ 36,   65,   129,  203,  181,  281,  349,   457,   541,   661,   750,   780},</div><div class='add'>+/* 59% */{ 35,   63,   124,  197,  174,  272,  338,   441,   521,   634,   717,   745},</div><div class='add'>+/* 60% */{ 34,   61,   120,  192,  166,  264,  327,   425,   501,   608,   686,   712},</div><div class='add'>+/* 61% */{ 33,   59,   115,  186,  159,  255,  316,   409,   482,   582,   655,   678},</div><div class='add'>+/* 62% */{ 32,   57,   111,  180,  152,  247,  305,   394,   462,   556,   624,   646},</div><div class='add'>+/* 63% */{ 31,   55,   107,  174,  145,  238,  294,   379,   443,   531,   594,   614},</div><div class='add'>+/* 64% */{ 30,   53,   102,  169,  138,  230,  283,   364,   425,   506,   565,   583},</div><div class='add'>+/* 65% */{ 29,   52,   98,   163,  132,  222,  273,   349,   406,   482,   536,   553},</div><div class='add'>+/* 66% */{ 28,   50,   94,   158,  125,  214,  262,   334,   388,   459,   508,   523},</div><div class='add'>+/* 67% */{ 27,   48,   90,   152,  119,  206,  252,   320,   370,   436,   481,   495},</div><div class='add'>+/* 68% */{ 26,   46,   86,   147,  113,  198,  242,   306,   353,   413,   455,   467},</div><div class='add'>+/* 69% */{ 26,   44,   82,   141,  107,  190,  231,   292,   336,   391,   429,   440},</div><div class='add'>+/* 70% */{ 25,   43,   78,   136,  101,  182,  221,   278,   319,   370,   405,   414},</div><div class='add'>+/* 71% */{ 24,   41,   74,   130,  95,   174,  212,   265,   303,   350,   381,   389},</div><div class='add'>+/* 72% */{ 23,   39,   71,   125,  90,   167,  202,   252,   287,   329,   358,   365},</div><div class='add'>+/* 73% */{ 22,   37,   67,   119,  85,   159,  192,   239,   271,   310,   335,   342},</div><div class='add'>+/* 74% */{ 21,   36,   63,   114,  80,   151,  183,   226,   256,   291,   314,   320},</div><div class='add'>+/* 75% */{ 20,   34,   60,   109,  75,   144,  174,   214,   241,   273,   294,   298},</div><div class='add'>+/* 76% */{ 19,   32,   57,   104,  70,   137,  164,   202,   227,   256,   274,   278},</div><div class='add'>+/* 77% */{ 18,   31,   53,   99,   66,   130,  155,   190,   213,   239,   256,   259},</div><div class='add'>+/* 78% */{ 17,   29,   50,   94,   62,   122,  146,   178,   200,   223,   238,   241},</div><div class='add'>+/* 79% */{ 16,   28,   47,   89,   58,   115,  138,   167,   187,   208,   222,   225},</div><div class='add'>+/* 80% */{ 16,   26,   44,   84,   54,   109,  129,   156,   175,   194,   206,   209},</div><div class='add'>+/* 81% */{ 15,   24,   41,   79,   50,   102,  121,   146,   163,   180,   192,   194},</div><div class='add'>+/* 82% */{ 14,   23,   39,   74,   47,   95,   113,   136,   151,   167,   178,   181},</div><div class='add'>+/* 83% */{ 13,   21,   36,   69,   44,   89,   105,   126,   140,   155,   166,   169},</div><div class='add'>+/* 84% */{ 12,   20,   33,   64,   41,   82,   97,    116,   130,   144,   155,   158},</div><div class='add'>+/* 85% */{ 11,   19,   31,   60,   39,   76,   89,    107,   120,   134,   145,   149},</div><div class='add'>+/* 86% */{ 11,   17,   29,   55,   36,   70,   82,    98,    110,   125,   136,   140},</div><div class='add'>+/* 87% */{ 10,   16,   26,   51,   34,   64,   75,    90,    102,   116,   128,   133},</div><div class='add'>+/* 88% */{ 9,    14,   24,   46,   32,   58,   68,    81,    93,    108,   121,   128},</div><div class='add'>+/* 89% */{ 8,    13,   22,   42,   31,   52,   61,    74,    86,    102,   116,   124},</div><div class='add'>+/* 90% */{ 7,    12,   21,   37,   29,   46,   54,    66,    79,    96,    112,   121}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define RSSIBUF_NUM 10</div><div class='add'>+#define RSSI2RATE_SIZE 9</div><div class='add'>+</div><div class='add'>+static TXRETRY_REC TxRateRec={MTO_MAX_DATA_RATE_LEVELS - 1, 0};   //new record=&gt;TxRateRec</div><div class='add'>+static int TxRetryRate;</div><div class='add'>+//static int SQ3, BSS_PK_CNT, NIDLESLOT, SLOT_CNT, INTERF_CNT, GAP_CNT, DS_EVM;</div><div class='add'>+static s32 RSSIBuf[RSSIBUF_NUM]={-70, -70, -70, -70, -70, -70, -70, -70, -70, -70};</div><div class='add'>+static s32 RSSISmoothed=-700;</div><div class='add'>+static int RSSIBufIndex=0;</div><div class='add'>+static u8 max_rssi_rate;</div><div class='add'>+static int rate_tbl[13] = {0,1,2,5,11,6,9,12,18,24,36,48,54};</div><div class='add'>+//[WKCHEN]static core_data_t *pMTOcore_data=NULL;</div><div class='add'>+</div><div class='add'>+static int TotalTxPkt = 0;</div><div class='add'>+static int TotalTxPktRetry = 0;</div><div class='add'>+static int TxPktPerAnt[3] = {0,0,0};</div><div class='add'>+static int RXRSSIANT[3] ={-70,-70,-70};</div><div class='add'>+static int TxPktRetryPerAnt[3] = {0,0,0};</div><div class='add'>+//static int TxDominateFlag=FALSE;</div><div class='add'>+static u8 old_antenna[4]={1 ,0 ,1 ,0};</div><div class='add'>+static int retryrate_rec[MTO_MAX_DATA_RATE_LEVELS];//this record the retry rate at different data rate</div><div class='add'>+</div><div class='add'>+static int PeriodTotalTxPkt = 0;</div><div class='add'>+static int PeriodTotalTxPktRetry = 0;</div><div class='add'>+</div><div class='add'>+typedef struct</div><div class='add'>+{</div><div class='add'>+	s32 RSSI;</div><div class='add'>+	u8  TxRate;</div><div class='add'>+}RSSI2RATE;</div><div class='add'>+</div><div class='add'>+static RSSI2RATE RSSI2RateTbl[RSSI2RATE_SIZE] =</div><div class='add'>+{</div><div class='add'>+	{-740, 108},  // 54M</div><div class='add'>+	{-760, 96},  // 48M</div><div class='add'>+	{-820, 72},  // 36M</div><div class='add'>+	{-850, 48},  // 24M</div><div class='add'>+	{-870, 36},  // 18M</div><div class='add'>+	{-890, 24},  // 12M</div><div class='add'>+	{-900, 12},  // 6M</div><div class='add'>+	{-920, 11}, // 5.5M</div><div class='add'>+	{-950, 4}, // 2M</div><div class='add'>+};</div><div class='add'>+static u8 untogglecount;</div><div class='add'>+static u8 last_rate_ant; //this is used for antenna backoff-hh</div><div class='add'>+</div><div class='add'>+u8	boSparseTxTraffic = FALSE;</div><div class='add'>+</div><div class='add'>+void MTO_Init(MTO_FUNC_INPUT);</div><div class='add'>+void AntennaToggleInitiator(MTO_FUNC_INPUT);</div><div class='add'>+void AntennaToggleState(MTO_FUNC_INPUT);</div><div class='add'>+void TxPwrControl(MTO_FUNC_INPUT);</div><div class='add'>+void GetFreshAntennaData(MTO_FUNC_INPUT);</div><div class='add'>+void TxRateReductionCtrl(MTO_FUNC_INPUT);</div><div class='add'>+/** 1.1.31.1000 Turbo modify */</div><div class='add'>+//void MTO_SetDTORateRange(int type);</div><div class='add'>+void MTO_SetDTORateRange(MTO_FUNC_INPUT, u8 *pRateArray, u8 ArraySize);</div><div class='add'>+void MTO_SetTxCount(MTO_FUNC_INPUT, u8 t0, u8 index);</div><div class='add'>+void MTO_TxFailed(MTO_FUNC_INPUT);</div><div class='add'>+void SmoothRSSI(s32 new_rssi);</div><div class='add'>+void hal_get_dto_para(MTO_FUNC_INPUT, char *buffer);</div><div class='add'>+u8 CalcNewRate(MTO_FUNC_INPUT, u8 old_rate, u32 retry_cnt, u32 tx_frag_cnt);</div><div class='add'>+u8 GetMaxRateLevelFromRSSI(void);</div><div class='add'>+u8 MTO_GetTxFallbackRate(MTO_FUNC_INPUT);</div><div class='add'>+int Divide(int a, int b);</div><div class='add'>+void multiagc(MTO_FUNC_INPUT, u8 high_gain_mode);</div><div class='add'>+</div><div class='add'>+//===========================================================================</div><div class='add'>+//  MTO_Init --</div><div class='add'>+//</div><div class='add'>+//  Description:</div><div class='add'>+//    Set DTO Tx Rate Scope because different AP could have different Rate set.</div><div class='add'>+//    After our staion join with AP, LM core will call this function to initialize</div><div class='add'>+//    Tx Rate table.</div><div class='add'>+//</div><div class='add'>+//  Arguments:</div><div class='add'>+//    pRateArray      - The pointer to the Tx Rate Array by the following order</div><div class='add'>+//                    - 2, 4, 11, 22, 12, 18, 24, 36, 48, 72, 96, 108</div><div class='add'>+//                    - DTO won't check whether rate order is invalid or not</div><div class='add'>+//    ArraySize       - The array size to indicate how many tx rate we can choose</div><div class='add'>+//</div><div class='add'>+//  sample code:</div><div class='add'>+//	{</div><div class='add'>+//		u8 RateArray[4] = {2, 4, 11, 22};</div><div class='add'>+//		MTO_SetDTORateRange(RateArray, 4);</div><div class='add'>+//	}</div><div class='add'>+//</div><div class='add'>+//  Return Value:</div><div class='add'>+//    None</div><div class='add'>+//============================================================================</div><div class='add'>+void MTO_SetDTORateRange(MTO_FUNC_INPUT,u8 *pRateArray, u8 ArraySize)</div><div class='add'>+{</div><div class='add'>+	u8	i, j=0;</div><div class='add'>+</div><div class='add'>+	for(i=0;i&lt;ArraySize;i++)</div><div class='add'>+	{</div><div class='add'>+		if(pRateArray[i] == 22)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	if(i &lt; ArraySize) //we need adjust the order of rate list because 11Mbps rate exists</div><div class='add'>+	{</div><div class='add'>+		for(;i&gt;0;i--)</div><div class='add'>+		{</div><div class='add'>+			if(pRateArray[i-1] &lt;= 11)</div><div class='add'>+				break;</div><div class='add'>+			pRateArray[i] = pRateArray[i-1];</div><div class='add'>+		}</div><div class='add'>+		pRateArray[i] = 22;</div><div class='add'>+		MTO_OFDM_RATE_LEVEL() = i;</div><div class='add'>+	}</div><div class='add'>+	else</div><div class='add'>+	{</div><div class='add'>+		for(i=0; i&lt;ArraySize; i++)</div><div class='add'>+		{</div><div class='add'>+			if (pRateArray[i] &gt;= 12)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+		MTO_OFDM_RATE_LEVEL() = i;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for(i=0;i&lt;ArraySize;i++)</div><div class='add'>+	{</div><div class='add'>+		MTO_Data_Rate_Tbl[i] = pRateArray[i];</div><div class='add'>+		for(;j&lt;MTO_MAX_DATA_RATE_LEVELS;j++)</div><div class='add'>+		{</div><div class='add'>+			if(Stardard_Data_Rate_Tbl[j] == pRateArray[i])</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+		Level2PerTbl[i] = j;</div><div class='add'>+		#ifdef _PE_DTO_DUMP_</div><div class='add'>+		WBDEBUG(("[MTO]:Op Rate[%d]: %d\n",i, MTO_Data_Rate_Tbl[i]));</div><div class='add'>+		#endif</div><div class='add'>+	}</div><div class='add'>+	MTO_DataRateAvailableLevel = ArraySize;</div><div class='add'>+	if( MTO_DATA().RatePolicy ) // 0 means that no registry setting</div><div class='add'>+	{</div><div class='add'>+		if( MTO_DATA().RatePolicy == 1 )</div><div class='add'>+			TxRateRec.tx_rate = 0;	//ascent</div><div class='add'>+		else</div><div class='add'>+			TxRateRec.tx_rate = MTO_DataRateAvailableLevel -1 ;	//descent</div><div class='add'>+	}</div><div class='add'>+	else</div><div class='add'>+	{</div><div class='add'>+		if( MTO_INITTXRATE_MODE )</div><div class='add'>+			TxRateRec.tx_rate = 0;	//ascent</div><div class='add'>+		else</div><div class='add'>+			TxRateRec.tx_rate = MTO_DataRateAvailableLevel -1 ;	//descent</div><div class='add'>+	}</div><div class='add'>+	TxRateRec.tx_retry_rate = 0;</div><div class='add'>+	//set default rate for initial use</div><div class='add'>+	MTO_RATE_LEVEL() = TxRateRec.tx_rate;</div><div class='add'>+	MTO_FALLBACK_RATE_LEVEL() = MTO_RATE_LEVEL();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+//===========================================================================</div><div class='add'>+//  MTO_Init --</div><div class='add'>+//</div><div class='add'>+//  Description:</div><div class='add'>+//    Initialize MTO parameters.</div><div class='add'>+//</div><div class='add'>+//    This function should be invoked during system initialization.</div><div class='add'>+//</div><div class='add'>+//  Arguments:</div><div class='add'>+//    Adapter      - The pointer to the Miniport Adapter Context</div><div class='add'>+//</div><div class='add'>+//  Return Value:</div><div class='add'>+//    None</div><div class='add'>+//============================================================================</div><div class='add'>+void MTO_Init(MTO_FUNC_INPUT)</div><div class='add'>+{</div><div class='add'>+    int i;</div><div class='add'>+	//WBDEBUG(("[MTO] -&gt; MTO_Init()\n"));</div><div class='add'>+	//[WKCHEN]pMTOcore_data = pcore_data;</div><div class='add'>+// 20040510 Turbo add for global variable</div><div class='add'>+    MTO_TMR_CNT()       = 0;</div><div class='add'>+    MTO_TOGGLE_STATE()  = TOGGLE_STATE_IDLE;</div><div class='add'>+    MTO_TX_RATE_REDUCTION_STATE() = RATE_CHGSTATE_IDLE;</div><div class='add'>+    MTO_BACKOFF_TMR()   = 0;</div><div class='add'>+    MTO_LAST_RATE()     = 11;</div><div class='add'>+    MTO_CO_EFFICENT()   = 0;</div><div class='add'>+</div><div class='add'>+    //MTO_TH_FIXANT()     = MTO_DEFAULT_TH_FIXANT;</div><div class='add'>+    MTO_TH_CNT()        = MTO_DEFAULT_TH_CNT;</div><div class='add'>+    MTO_TH_SQ3()        = MTO_DEFAULT_TH_SQ3;</div><div class='add'>+    MTO_TH_IDLE_SLOT()  = MTO_DEFAULT_TH_IDLE_SLOT;</div><div class='add'>+    MTO_TH_PR_INTERF()  = MTO_DEFAULT_TH_PR_INTERF;</div><div class='add'>+</div><div class='add'>+    MTO_TMR_AGING()     = MTO_DEFAULT_TMR_AGING;</div><div class='add'>+    MTO_TMR_PERIODIC()  = MTO_DEFAULT_TMR_PERIODIC;</div><div class='add'>+</div><div class='add'>+    //[WKCHEN]MTO_CCA_MODE_SETUP()= (u8) hal_get_cca_mode(MTO_HAL());</div><div class='add'>+    //[WKCHEN]MTO_CCA_MODE()      = MTO_CCA_MODE_SETUP();</div><div class='add'>+</div><div class='add'>+    //MTO_PREAMBLE_TYPE() = MTO_PREAMBLE_LONG;</div><div class='add'>+    MTO_PREAMBLE_TYPE() = MTO_PREAMBLE_SHORT;   // for test</div><div class='add'>+</div><div class='add'>+    MTO_ANT_SEL()       = hal_get_antenna_number(MTO_HAL());</div><div class='add'>+    MTO_ANT_MAC()       = MTO_ANT_SEL();</div><div class='add'>+    MTO_CNT_ANT(0)      = 0;</div><div class='add'>+    MTO_CNT_ANT(1)      = 0;</div><div class='add'>+    MTO_SQ_ANT(0)       = 0;</div><div class='add'>+    MTO_SQ_ANT(1)       = 0;</div><div class='add'>+    MTO_ANT_DIVERSITY() = MTO_ANTENNA_DIVERSITY_ON;</div><div class='add'>+    //CardSet_AntennaDiversity(Adapter, MTO_ANT_DIVERSITY());</div><div class='add'>+    //PLMESetAntennaDiversity( Adapter, MTO_ANT_DIVERSITY());</div><div class='add'>+</div><div class='add'>+    MTO_AGING_TIMEOUT() = 0;//MTO_TMR_AGING() / MTO_TMR_PERIODIC();</div><div class='add'>+</div><div class='add'>+    // The following parameters should be initialized to the values set by user</div><div class='add'>+    //</div><div class='add'>+    //MTO_RATE_LEVEL()            = 10;</div><div class='add'>+    MTO_RATE_LEVEL()            = 0;</div><div class='add'>+	MTO_FALLBACK_RATE_LEVEL()	= MTO_RATE_LEVEL();</div><div class='add'>+    MTO_FRAG_TH_LEVEL()         = 4;</div><div class='add'>+    /** 1.1.23.1000 Turbo modify from -1 to +1</div><div class='add'>+	MTO_RTS_THRESHOLD()         = MTO_FRAG_TH() - 1;</div><div class='add'>+    MTO_RTS_THRESHOLD_SETUP()   = MTO_FRAG_TH() - 1;</div><div class='add'>+	*/</div><div class='add'>+	MTO_RTS_THRESHOLD()         = MTO_FRAG_TH() + 1;</div><div class='add'>+    MTO_RTS_THRESHOLD_SETUP()   = MTO_FRAG_TH() + 1;</div><div class='add'>+    // 1.1.23.1000 Turbo add for mto change preamble from 0 to 1</div><div class='add'>+	MTO_RATE_CHANGE_ENABLE()    = 1;</div><div class='add'>+    MTO_FRAG_CHANGE_ENABLE()    = 0;          // 1.1.29.1000 Turbo add don't support frag</div><div class='add'>+	//The default valud of ANTDIV_DEFAULT_ON will be decided by EEPROM</div><div class='add'>+	//#ifdef ANTDIV_DEFAULT_ON</div><div class='add'>+    //MTO_ANT_DIVERSITY_ENABLE()  = 1;</div><div class='add'>+	//#else</div><div class='add'>+    //MTO_ANT_DIVERSITY_ENABLE()  = 0;</div><div class='add'>+	//#endif</div><div class='add'>+    MTO_POWER_CHANGE_ENABLE()   = 1;</div><div class='add'>+	MTO_PREAMBLE_CHANGE_ENABLE()= 1;</div><div class='add'>+    MTO_RTS_CHANGE_ENABLE()     = 0;          // 1.1.29.1000 Turbo add don't support frag</div><div class='add'>+    // 20040512 Turbo add</div><div class='add'>+	//old_antenna[0] = 1;</div><div class='add'>+	//old_antenna[1] = 0;</div><div class='add'>+	//old_antenna[2] = 1;</div><div class='add'>+	//old_antenna[3] = 0;</div><div class='add'>+	for (i=0;i&lt;MTO_MAX_DATA_RATE_LEVELS;i++)</div><div class='add'>+		retryrate_rec[i]=5;</div><div class='add'>+</div><div class='add'>+	MTO_TXFLOWCOUNT() = 0;</div><div class='add'>+	//--------- DTO threshold parameters -------------</div><div class='add'>+	//MTOPARA_PERIODIC_CHECK_CYCLE() = 50;</div><div class='add'>+	MTOPARA_PERIODIC_CHECK_CYCLE() = 10;</div><div class='add'>+	MTOPARA_RSSI_TH_FOR_ANTDIV() = 10;</div><div class='add'>+	MTOPARA_TXCOUNT_TH_FOR_CALC_RATE() = 50;</div><div class='add'>+	MTOPARA_TXRATE_INC_TH()	= 10;</div><div class='add'>+	MTOPARA_TXRATE_DEC_TH() = 30;</div><div class='add'>+	MTOPARA_TXRATE_EQ_TH() = 40;</div><div class='add'>+	MTOPARA_TXRATE_BACKOFF() = 12;</div><div class='add'>+	MTOPARA_TXRETRYRATE_REDUCE() = 6;</div><div class='add'>+	if ( MTO_TXPOWER_FROM_EEPROM == 0xff)</div><div class='add'>+	{</div><div class='add'>+		switch( MTO_HAL()-&gt;phy_type)</div><div class='add'>+		{</div><div class='add'>+			case RF_AIROHA_2230:</div><div class='add'>+			case RF_AIROHA_2230S: // 20060420 Add this</div><div class='add'>+				MTOPARA_TXPOWER_INDEX() = 46; // MAX-8 // @@ Only for AL 2230</div><div class='add'>+				break;</div><div class='add'>+			case RF_AIROHA_7230:</div><div class='add'>+				MTOPARA_TXPOWER_INDEX() = 49;</div><div class='add'>+				break;</div><div class='add'>+			case RF_WB_242:</div><div class='add'>+				MTOPARA_TXPOWER_INDEX() = 10;</div><div class='add'>+				break;</div><div class='add'>+			case RF_WB_242_1:</div><div class='add'>+				MTOPARA_TXPOWER_INDEX() = 24; // -&gt;10 20060316.1 modify</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	else	//follow the setting from EEPROM</div><div class='add'>+		MTOPARA_TXPOWER_INDEX() = MTO_TXPOWER_FROM_EEPROM;</div><div class='add'>+	hal_set_rf_power(MTO_HAL(), (u8)MTOPARA_TXPOWER_INDEX());</div><div class='add'>+	//------------------------------------------------</div><div class='add'>+</div><div class='add'>+	// For RSSI turning 20060808.4 Cancel load from EEPROM</div><div class='add'>+	MTO_DATA().RSSI_high = -41;</div><div class='add'>+	MTO_DATA().RSSI_low = -60;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+//---------------------------------------------------------------------------//</div><div class='add'>+static u32 DTO_Rx_Info[13][3];</div><div class='add'>+static u32 DTO_RxCRCFail_Info[13][3];</div><div class='add'>+static u32 AntennaToggleBkoffTimer=5;</div><div class='add'>+typedef struct{</div><div class='add'>+	int RxRate;</div><div class='add'>+	int RxRatePkts;</div><div class='add'>+	int index;</div><div class='add'>+}RXRATE_ANT;</div><div class='add'>+RXRATE_ANT RxRatePeakAnt[3];</div><div class='add'>+</div><div class='add'>+#define ANT0    0</div><div class='add'>+#define ANT1    1</div><div class='add'>+#define OLD_ANT 2</div><div class='add'>+</div><div class='add'>+void SearchPeakRxRate(int index)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	RxRatePeakAnt[index].RxRatePkts=0;</div><div class='add'>+	//Find out the best rx rate which is used on different antenna</div><div class='add'>+	for(i=1;i&lt;13;i++)</div><div class='add'>+	{</div><div class='add'>+		if(DTO_Rx_Info[i][index] &gt; (u32) RxRatePeakAnt[index].RxRatePkts)</div><div class='add'>+		{</div><div class='add'>+			RxRatePeakAnt[index].RxRatePkts = DTO_Rx_Info[i][index];</div><div class='add'>+			RxRatePeakAnt[index].RxRate = rate_tbl[i];</div><div class='add'>+			RxRatePeakAnt[index].index = i;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ResetDTO_RxInfo(int index, MTO_FUNC_INPUT)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	#ifdef _PE_DTO_DUMP_</div><div class='add'>+	WBDEBUG(("ResetDTOrx\n"));</div><div class='add'>+	#endif</div><div class='add'>+</div><div class='add'>+	for(i=0;i&lt;13;i++)</div><div class='add'>+		DTO_Rx_Info[i][index] = MTO_HAL()-&gt;rx_ok_count[i];</div><div class='add'>+</div><div class='add'>+	for(i=0;i&lt;13;i++)</div><div class='add'>+		DTO_RxCRCFail_Info[i][index] = MTO_HAL()-&gt;rx_err_count[i];</div><div class='add'>+</div><div class='add'>+	TotalTxPkt = 0;</div><div class='add'>+	TotalTxPktRetry = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void GetDTO_RxInfo(int index, MTO_FUNC_INPUT)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	#ifdef _PE_DTO_DUMP_</div><div class='add'>+	WBDEBUG(("GetDTOrx\n"));</div><div class='add'>+	#endif</div><div class='add'>+</div><div class='add'>+	//PDEBUG(("[MTO]:DTO_Rx_Info[%d]=%d, rx_ok_count=%d\n", index, DTO_Rx_Info[0][index], phw_data-&gt;rx_ok_count[0]));</div><div class='add'>+	for(i=0;i&lt;13;i++)</div><div class='add'>+		DTO_Rx_Info[i][index] = abs(MTO_HAL()-&gt;rx_ok_count[i] - DTO_Rx_Info[i][index]);</div><div class='add'>+	if(DTO_Rx_Info[0][index]==0) DTO_Rx_Info[0][index] = 1;</div><div class='add'>+</div><div class='add'>+	for(i=0;i&lt;13;i++)</div><div class='add'>+		DTO_RxCRCFail_Info[i][index] = MTO_HAL()-&gt;rx_err_count[i] - DTO_RxCRCFail_Info[i][index];</div><div class='add'>+</div><div class='add'>+	TxPktPerAnt[index] = TotalTxPkt;</div><div class='add'>+	TxPktRetryPerAnt[index] = TotalTxPktRetry;</div><div class='add'>+	TotalTxPkt = 0;</div><div class='add'>+	TotalTxPktRetry = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void OutputDebugInfo(int index1, int index2)</div><div class='add'>+{</div><div class='add'>+	#ifdef _PE_DTO_DUMP_</div><div class='add'>+	WBDEBUG(("[HHDTO]:Total Rx (%d)\t\t(%d) \n ", DTO_Rx_Info[0][index1], DTO_Rx_Info[0][index2]));</div><div class='add'>+    WBDEBUG(("[HHDTO]:RECEIVE RSSI: (%d)\t\t(%d) \n ", RXRSSIANT[index1], RXRSSIANT[index2]));</div><div class='add'>+	WBDEBUG(("[HHDTO]:TX packet correct rate: (%d)%%\t\t(%d)%% \n ",Divide(TxPktPerAnt[index1]*100,TxPktRetryPerAnt[index1]), Divide(TxPktPerAnt[index2]*100,TxPktRetryPerAnt[index2])));</div><div class='add'>+	#endif</div><div class='add'>+	{</div><div class='add'>+		int tmp1, tmp2;</div><div class='add'>+		#ifdef _PE_DTO_DUMP_</div><div class='add'>+		WBDEBUG(("[HHDTO]:Total Tx (%d)\t\t(%d) \n ", TxPktPerAnt[index1], TxPktPerAnt[index2]));</div><div class='add'>+		WBDEBUG(("[HHDTO]:Total Tx retry (%d)\t\t(%d) \n ", TxPktRetryPerAnt[index1], TxPktRetryPerAnt[index2]));</div><div class='add'>+		#endif</div><div class='add'>+		tmp1 = TxPktPerAnt[index1] + DTO_Rx_Info[0][index1];</div><div class='add'>+		tmp2 = TxPktPerAnt[index2] + DTO_Rx_Info[0][index2];</div><div class='add'>+		#ifdef _PE_DTO_DUMP_</div><div class='add'>+		WBDEBUG(("[HHDTO]:Total Tx+RX (%d)\t\t(%d) \n ", tmp1, tmp2));</div><div class='add'>+		#endif</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+unsigned char TxDominate(int index)</div><div class='add'>+{</div><div class='add'>+	int tmp;</div><div class='add'>+</div><div class='add'>+	tmp = TxPktPerAnt[index] + DTO_Rx_Info[0][index];</div><div class='add'>+</div><div class='add'>+	if(Divide(TxPktPerAnt[index]*100, tmp) &gt; 40)</div><div class='add'>+		return TRUE;</div><div class='add'>+	else</div><div class='add'>+		return FALSE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+unsigned char CmpTxRetryRate(int index1, int index2)</div><div class='add'>+{</div><div class='add'>+	int tx_retry_rate1, tx_retry_rate2;</div><div class='add'>+	tx_retry_rate1 = Divide((TxPktRetryPerAnt[index1] - TxPktPerAnt[index1])*100, TxPktRetryPerAnt[index1]);</div><div class='add'>+	tx_retry_rate2 = Divide((TxPktRetryPerAnt[index2] - TxPktPerAnt[index2])*100, TxPktRetryPerAnt[index2]);</div><div class='add'>+	#ifdef _PE_DTO_DUMP_</div><div class='add'>+	WBDEBUG(("[MTO]:TxRetry Ant0: (%d%%)  Ant1: (%d%%) \n ", tx_retry_rate1, tx_retry_rate2));</div><div class='add'>+	#endif</div><div class='add'>+</div><div class='add'>+	if(tx_retry_rate1 &gt; tx_retry_rate2)</div><div class='add'>+		return TRUE;</div><div class='add'>+	else</div><div class='add'>+		return FALSE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void GetFreshAntennaData(MTO_FUNC_INPUT)</div><div class='add'>+{</div><div class='add'>+    u8      x;</div><div class='add'>+</div><div class='add'>+	x = hal_get_antenna_number(MTO_HAL());</div><div class='add'>+	//hal_get_bss_pk_cnt(MTO_HAL());</div><div class='add'>+	//hal_get_est_sq3(MTO_HAL(), 1);</div><div class='add'>+	old_antenna[0] = x;</div><div class='add'>+	//if this is the function for timer</div><div class='add'>+	ResetDTO_RxInfo(x, MTO_FUNC_INPUT_DATA);</div><div class='add'>+	if(AntennaToggleBkoffTimer)</div><div class='add'>+			AntennaToggleBkoffTimer--;</div><div class='add'>+	if (abs(last_rate_ant-MTO_RATE_LEVEL())&gt;1)  //backoff timer reset</div><div class='add'>+		AntennaToggleBkoffTimer=0;</div><div class='add'>+</div><div class='add'>+	if (MTO_ANT_DIVERSITY() != MTO_ANTENNA_DIVERSITY_ON ||</div><div class='add'>+		MTO_ANT_DIVERSITY_ENABLE() != 1)</div><div class='add'>+	AntennaToggleBkoffTimer=1;</div><div class='add'>+	#ifdef _PE_DTO_DUMP_</div><div class='add'>+	WBDEBUG(("[HHDTO]:**last data rate=%d,now data rate=%d**antenna toggle timer=%d",last_rate_ant,MTO_RATE_LEVEL(),AntennaToggleBkoffTimer));</div><div class='add'>+	#endif</div><div class='add'>+	last_rate_ant=MTO_RATE_LEVEL();</div><div class='add'>+	if(AntennaToggleBkoffTimer==0)</div><div class='add'>+	{</div><div class='add'>+		MTO_TOGGLE_STATE() = TOGGLE_STATE_WAIT0;</div><div class='add'>+		#ifdef _PE_DTO_DUMP_</div><div class='add'>+		WBDEBUG(("[HHDTO]:===state is starting==for antenna toggle==="));</div><div class='add'>+		#endif</div><div class='add'>+	}</div><div class='add'>+	else</div><div class='add'>+		MTO_TOGGLE_STATE() = TOGGLE_STATE_IDLE;</div><div class='add'>+</div><div class='add'>+	if ((MTO_BACKOFF_TMR()!=0)&amp;&amp;(MTO_RATE_LEVEL()&gt;MTO_DataRateAvailableLevel - 3))</div><div class='add'>+	{</div><div class='add'>+		MTO_TOGGLE_STATE() = TOGGLE_STATE_IDLE;</div><div class='add'>+		#ifdef _PE_DTO_DUMP_</div><div class='add'>+		WBDEBUG(("[HHDTO]:===the data rate is %d (good)and will not toogle  ===",MTO_DATA_RATE()&gt;&gt;1));</div><div class='add'>+		#endif</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int WB_PCR[2]; //packet correct rate</div><div class='add'>+</div><div class='add'>+void AntennaToggleState(MTO_FUNC_INPUT)</div><div class='add'>+{</div><div class='add'>+    int decideantflag = 0;</div><div class='add'>+	u8      x;</div><div class='add'>+	s32     rssi;</div><div class='add'>+</div><div class='add'>+	if(MTO_ANT_DIVERSITY_ENABLE() != 1)</div><div class='add'>+		return;</div><div class='add'>+	x = hal_get_antenna_number(MTO_HAL());</div><div class='add'>+	switch(MTO_TOGGLE_STATE())</div><div class='add'>+	{</div><div class='add'>+</div><div class='add'>+	   //Missing.....</div><div class='add'>+	   case TOGGLE_STATE_IDLE:</div><div class='add'>+	 case TOGGLE_STATE_BKOFF:</div><div class='add'>+	             break;;</div><div class='add'>+</div><div class='add'>+		case TOGGLE_STATE_WAIT0://========</div><div class='add'>+	               GetDTO_RxInfo(x, MTO_FUNC_INPUT_DATA);</div><div class='add'>+			sme_get_rssi(MTO_FUNC_INPUT_DATA, &amp;rssi);</div><div class='add'>+			RXRSSIANT[x] = rssi;</div><div class='add'>+			#ifdef _PE_DTO_DUMP_</div><div class='add'>+			WBDEBUG(("[HHDTO] **wait0==== Collecting Ant%d--rssi=%d\n", x,RXRSSIANT[x]));</div><div class='add'>+			#endif</div><div class='add'>+</div><div class='add'>+			//change antenna and reset the data at changed antenna</div><div class='add'>+			x = (~x) &amp; 0x01;</div><div class='add'>+			MTO_ANT_SEL() = x;</div><div class='add'>+			hal_set_antenna_number(MTO_HAL(), MTO_ANT_SEL());</div><div class='add'>+			LOCAL_ANTENNA_NO() = x;</div><div class='add'>+</div><div class='add'>+			MTO_TOGGLE_STATE() = TOGGLE_STATE_WAIT1;//go to wait1</div><div class='add'>+			ResetDTO_RxInfo(x, MTO_FUNC_INPUT_DATA);</div><div class='add'>+			break;</div><div class='add'>+		case TOGGLE_STATE_WAIT1://=====wait1</div><div class='add'>+			//MTO_CNT_ANT(x) = hal_get_bss_pk_cnt(MTO_HAL());</div><div class='add'>+			//RXRSSIANT[x] = hal_get_rssi(MTO_HAL());</div><div class='add'>+			sme_get_rssi(MTO_FUNC_INPUT_DATA, &amp;rssi);</div><div class='add'>+			RXRSSIANT[x] = rssi;</div><div class='add'>+			GetDTO_RxInfo(x, MTO_FUNC_INPUT_DATA);</div><div class='add'>+			#ifdef _PE_DTO_DUMP_</div><div class='add'>+			WBDEBUG(("[HHDTO] **wait1==== Collecting Ant%d--rssi=%d\n", x,RXRSSIANT[x]));</div><div class='add'>+			#endif</div><div class='add'>+			MTO_TOGGLE_STATE() = TOGGLE_STATE_MAKEDESISION;</div><div class='add'>+			break;</div><div class='add'>+		case TOGGLE_STATE_MAKEDESISION:</div><div class='add'>+			#ifdef _PE_DTO_DUMP_</div><div class='add'>+			WBDEBUG(("[HHDTO]:Ant--0-----------------1---\n"));</div><div class='add'>+			OutputDebugInfo(ANT0,ANT1);</div><div class='add'>+			#endif</div><div class='add'>+			//PDEBUG(("[HHDTO] **decision====\n "));</div><div class='add'>+</div><div class='add'>+			//=====following is the decision produrce</div><div class='add'>+			//</div><div class='add'>+			//    first: compare the rssi if difference &gt;10</div><div class='add'>+			//           select the larger one</div><div class='add'>+			//           ,others go to second</div><div class='add'>+			//    second: comapre the tx+rx packet count if difference &gt;100</div><div class='add'>+			//            use larger total packets antenna</div><div class='add'>+			//    third::compare the tx PER if packets&gt;20</div><div class='add'>+			//                           if difference &gt;5% using the bigger one</div><div class='add'>+			//</div><div class='add'>+			//    fourth:compare the RX PER if packets&gt;20</div><div class='add'>+			//                    if PER difference &lt;5%</div><div class='add'>+			//                   using old antenna</div><div class='add'>+			//</div><div class='add'>+			//</div><div class='add'>+			if (abs(RXRSSIANT[ANT0]-RXRSSIANT[ANT1]) &gt; MTOPARA_RSSI_TH_FOR_ANTDIV())//====rssi_th</div><div class='add'>+			{</div><div class='add'>+				if (RXRSSIANT[ANT0]&gt;RXRSSIANT[ANT1])</div><div class='add'>+				{</div><div class='add'>+					decideantflag=1;</div><div class='add'>+					MTO_ANT_MAC() = ANT0;</div><div class='add'>+				}</div><div class='add'>+				else</div><div class='add'>+				{</div><div class='add'>+					decideantflag=1;</div><div class='add'>+					MTO_ANT_MAC() = ANT1;</div><div class='add'>+				}</div><div class='add'>+				#ifdef _PE_DTO_DUMP_</div><div class='add'>+				WBDEBUG(("Select antenna by RSSI\n"));</div><div class='add'>+				#endif</div><div class='add'>+			}</div><div class='add'>+			else if  (abs(TxPktPerAnt[ANT0] + DTO_Rx_Info[0][ANT0]-TxPktPerAnt[ANT1]-DTO_Rx_Info[0][ANT1])&lt;50)//=====total packet_th</div><div class='add'>+			{</div><div class='add'>+				#ifdef _PE_DTO_DUMP_</div><div class='add'>+				WBDEBUG(("Total tx/rx is close\n"));</div><div class='add'>+				#endif</div><div class='add'>+				if (TxDominate(ANT0) &amp;&amp; TxDominate(ANT1))</div><div class='add'>+				{</div><div class='add'>+					if ((TxPktPerAnt[ANT0]&gt;10) &amp;&amp; (TxPktPerAnt[ANT1]&gt;10))//====tx packet_th</div><div class='add'>+					{</div><div class='add'>+						WB_PCR[ANT0]=Divide(TxPktPerAnt[ANT0]*100,TxPktRetryPerAnt[ANT0]);</div><div class='add'>+						WB_PCR[ANT1]=Divide(TxPktPerAnt[ANT1]*100,TxPktRetryPerAnt[ANT1]);</div><div class='add'>+						if (abs(WB_PCR[ANT0]-WB_PCR[ANT1])&gt;5)// tx PER_th</div><div class='add'>+						{</div><div class='add'>+							#ifdef _PE_DTO_DUMP_</div><div class='add'>+							WBDEBUG(("Decide by Tx correct rate\n"));</div><div class='add'>+							#endif</div><div class='add'>+							if (WB_PCR[ANT0]&gt;WB_PCR[ANT1])</div><div class='add'>+							{</div><div class='add'>+								decideantflag=1;</div><div class='add'>+								MTO_ANT_MAC() = ANT0;</div><div class='add'>+							}</div><div class='add'>+							else</div><div class='add'>+							{</div><div class='add'>+								decideantflag=1;</div><div class='add'>+								MTO_ANT_MAC() = ANT1;</div><div class='add'>+							}</div><div class='add'>+						}</div><div class='add'>+						else</div><div class='add'>+						{</div><div class='add'>+							decideantflag=0;</div><div class='add'>+							untogglecount++;</div><div class='add'>+							MTO_ANT_MAC() = old_antenna[0];</div><div class='add'>+						}</div><div class='add'>+					}</div><div class='add'>+					else</div><div class='add'>+					{</div><div class='add'>+						decideantflag=0;</div><div class='add'>+						MTO_ANT_MAC() = old_antenna[0];</div><div class='add'>+					}</div><div class='add'>+				}</div><div class='add'>+				else if ((DTO_Rx_Info[0][ANT0]&gt;10)&amp;&amp;(DTO_Rx_Info[0][ANT1]&gt;10))//rx packet th</div><div class='add'>+				{</div><div class='add'>+					#ifdef _PE_DTO_DUMP_</div><div class='add'>+					WBDEBUG(("Decide by Rx\n"));</div><div class='add'>+					#endif</div><div class='add'>+					if (abs(DTO_Rx_Info[0][ANT0] - DTO_Rx_Info[0][ANT1])&gt;50)</div><div class='add'>+					{</div><div class='add'>+						if (DTO_Rx_Info[0][ANT0] &gt; DTO_Rx_Info[0][ANT1])</div><div class='add'>+						{</div><div class='add'>+							decideantflag=1;</div><div class='add'>+							MTO_ANT_MAC() = ANT0;</div><div class='add'>+						}</div><div class='add'>+						else</div><div class='add'>+						{</div><div class='add'>+							decideantflag=1;</div><div class='add'>+							MTO_ANT_MAC() = ANT1;</div><div class='add'>+						}</div><div class='add'>+					}</div><div class='add'>+					else</div><div class='add'>+					{</div><div class='add'>+						decideantflag=0;</div><div class='add'>+						untogglecount++;</div><div class='add'>+						MTO_ANT_MAC() = old_antenna[0];</div><div class='add'>+					}</div><div class='add'>+				}</div><div class='add'>+				else</div><div class='add'>+				{</div><div class='add'>+					decideantflag=0;</div><div class='add'>+					MTO_ANT_MAC() = old_antenna[0];</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+			else if ((TxPktPerAnt[ANT0]+DTO_Rx_Info[0][ANT0])&gt;(TxPktPerAnt[ANT1]+DTO_Rx_Info[0][ANT1]))//use more packekts</div><div class='add'>+			{</div><div class='add'>+				#ifdef _PE_DTO_DUMP_</div><div class='add'>+				WBDEBUG(("decide by total tx/rx : ANT 0\n"));</div><div class='add'>+				#endif</div><div class='add'>+</div><div class='add'>+				decideantflag=1;</div><div class='add'>+				MTO_ANT_MAC() = ANT0;</div><div class='add'>+			}</div><div class='add'>+			else</div><div class='add'>+			{</div><div class='add'>+				#ifdef _PE_DTO_DUMP_</div><div class='add'>+				WBDEBUG(("decide by total tx/rx : ANT 1\n"));</div><div class='add'>+				#endif</div><div class='add'>+				decideantflag=1;</div><div class='add'>+				MTO_ANT_MAC() = ANT1;</div><div class='add'>+</div><div class='add'>+			}</div><div class='add'>+			//this is force ant toggle</div><div class='add'>+			if (decideantflag==1)</div><div class='add'>+				untogglecount=0;</div><div class='add'>+</div><div class='add'>+			untogglecount=untogglecount%4;</div><div class='add'>+			if (untogglecount==3) //change antenna</div><div class='add'>+				MTO_ANT_MAC() = ((~old_antenna[0]) &amp; 0x1);</div><div class='add'>+			#ifdef _PE_DTO_DUMP_</div><div class='add'>+			WBDEBUG(("[HHDTO]:==================untoggle-count=%d",untogglecount));</div><div class='add'>+			#endif</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+			//PDEBUG(("[HHDTO] **********************************DTO ENABLE=%d",MTO_ANT_DIVERSITY_ENABLE()));</div><div class='add'>+			if(MTO_ANT_DIVERSITY_ENABLE() == 1)</div><div class='add'>+			{</div><div class='add'>+					MTO_ANT_SEL() = MTO_ANT_MAC();</div><div class='add'>+					hal_set_antenna_number(MTO_HAL(), MTO_ANT_SEL());</div><div class='add'>+					LOCAL_ANTENNA_NO() = MTO_ANT_SEL();</div><div class='add'>+					#ifdef _PE_DTO_DUMP_</div><div class='add'>+					WBDEBUG(("[HHDTO] ==decision==*******antflag=%d******************selected antenna=%d\n",decideantflag,MTO_ANT_SEL()));</div><div class='add'>+					#endif</div><div class='add'>+			}</div><div class='add'>+			if (decideantflag)</div><div class='add'>+			{</div><div class='add'>+				old_antenna[3]=old_antenna[2];//store antenna info</div><div class='add'>+				old_antenna[2]=old_antenna[1];</div><div class='add'>+				old_antenna[1]=old_antenna[0];</div><div class='add'>+				old_antenna[0]= MTO_ANT_MAC();</div><div class='add'>+			}</div><div class='add'>+			#ifdef _PE_DTO_DUMP_</div><div class='add'>+			WBDEBUG(("[HHDTO]:**old antenna=[%d][%d][%d][%d]\n",old_antenna[0],old_antenna[1],old_antenna[2],old_antenna[3]));</div><div class='add'>+			#endif</div><div class='add'>+			if (old_antenna[0]!=old_antenna[1])</div><div class='add'>+				AntennaToggleBkoffTimer=0;</div><div class='add'>+			else if (old_antenna[1]!=old_antenna[2])</div><div class='add'>+				AntennaToggleBkoffTimer=1;</div><div class='add'>+			else if (old_antenna[2]!=old_antenna[3])</div><div class='add'>+				AntennaToggleBkoffTimer=2;</div><div class='add'>+			else</div><div class='add'>+				AntennaToggleBkoffTimer=4;</div><div class='add'>+</div><div class='add'>+			#ifdef _PE_DTO_DUMP_</div><div class='add'>+			WBDEBUG(("[HHDTO]:**back off timer=%d",AntennaToggleBkoffTimer));</div><div class='add'>+			#endif</div><div class='add'>+</div><div class='add'>+			ResetDTO_RxInfo(MTO_ANT_MAC(), MTO_FUNC_INPUT_DATA);</div><div class='add'>+			if (AntennaToggleBkoffTimer==0 &amp;&amp; decideantflag)</div><div class='add'>+				MTO_TOGGLE_STATE() = TOGGLE_STATE_WAIT0;</div><div class='add'>+			else</div><div class='add'>+				MTO_TOGGLE_STATE() = TOGGLE_STATE_IDLE;</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void multiagc(MTO_FUNC_INPUT, u8 high_gain_mode )</div><div class='add'>+{</div><div class='add'>+	s32		rssi;</div><div class='add'>+	hw_data_t	*pHwData = MTO_HAL();</div><div class='add'>+</div><div class='add'>+	sme_get_rssi(MTO_FUNC_INPUT_DATA, &amp;rssi);</div><div class='add'>+</div><div class='add'>+	if( (RF_WB_242 == pHwData-&gt;phy_type) ||</div><div class='add'>+		(RF_WB_242_1 == pHwData-&gt;phy_type) ) // 20060619.5 Add</div><div class='add'>+	{</div><div class='add'>+		if (high_gain_mode==1)</div><div class='add'>+		{</div><div class='add'>+			//hw_set_dxx_reg(phw_data, 0x0C, 0xf8f52230);</div><div class='add'>+			//hw_set_dxx_reg(phw_data, 0x20, 0x06C43440);</div><div class='add'>+			Wb35Reg_Write( pHwData, 0x100C, 0xF2F32232 ); // 940916 0xf8f52230 );</div><div class='add'>+			Wb35Reg_Write( pHwData, 0x1020, 0x04cb3440 ); // 940915 0x06C43440</div><div class='add'>+		}</div><div class='add'>+		else if (high_gain_mode==0)</div><div class='add'>+		{</div><div class='add'>+			//hw_set_dxx_reg(phw_data, 0x0C, 0xEEEE000D);</div><div class='add'>+			//hw_set_dxx_reg(phw_data, 0x20, 0x06c41440);</div><div class='add'>+			Wb35Reg_Write( pHwData, 0x100C, 0xEEEE000D );</div><div class='add'>+			Wb35Reg_Write( pHwData, 0x1020, 0x04cb1440 ); // 940915 0x06c41440</div><div class='add'>+		}</div><div class='add'>+		#ifdef _PE_DTO_DUMP_</div><div class='add'>+		WBDEBUG(("[HHDTOAGC] **rssi=%d, high gain mode=%d", rssi, high_gain_mode));</div><div class='add'>+		#endif</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void TxPwrControl(MTO_FUNC_INPUT)</div><div class='add'>+{</div><div class='add'>+    s32     rssi;</div><div class='add'>+	hw_data_t	*pHwData = MTO_HAL();</div><div class='add'>+</div><div class='add'>+	sme_get_rssi(MTO_FUNC_INPUT_DATA, &amp;rssi);</div><div class='add'>+	if( (RF_WB_242 == pHwData-&gt;phy_type) ||</div><div class='add'>+		(RF_WB_242_1 == pHwData-&gt;phy_type) ) // 20060619.5 Add</div><div class='add'>+	{</div><div class='add'>+		static u8 high_gain_mode; //this is for winbond RF switch LNA</div><div class='add'>+		                          //using different register setting</div><div class='add'>+</div><div class='add'>+		if (high_gain_mode==1)</div><div class='add'>+		{</div><div class='add'>+			if( rssi &gt; MTO_DATA().RSSI_high )</div><div class='add'>+			{</div><div class='add'>+				//hw_set_dxx_reg(phw_data, 0x0C, 0xf8f52230);</div><div class='add'>+				//hw_set_dxx_reg(phw_data, 0x20, 0x05541640);</div><div class='add'>+				high_gain_mode=0;</div><div class='add'>+			}</div><div class='add'>+			else</div><div class='add'>+			{</div><div class='add'>+				//hw_set_dxx_reg(phw_data, 0x0C, 0xf8f51830);</div><div class='add'>+				//hw_set_dxx_reg(phw_data, 0x20, 0x05543E40);</div><div class='add'>+				high_gain_mode=1;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		else //if (high_gain_mode==0)</div><div class='add'>+		{</div><div class='add'>+			if( rssi &lt; MTO_DATA().RSSI_low )</div><div class='add'>+			{</div><div class='add'>+				//hw_set_dxx_reg(phw_data, 0x0C, 0xf8f51830);</div><div class='add'>+				//hw_set_dxx_reg(phw_data, 0x20, 0x05543E40);</div><div class='add'>+				high_gain_mode=1;</div><div class='add'>+			}</div><div class='add'>+			else</div><div class='add'>+			{</div><div class='add'>+				//hw_set_dxx_reg(phw_data, 0x0C, 0xf8f52230);</div><div class='add'>+				//hw_set_dxx_reg(phw_data, 0x20, 0x05541640);</div><div class='add'>+				high_gain_mode=0;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		// Always high gain 20051014. Using the initial value only.</div><div class='add'>+		multiagc(MTO_FUNC_INPUT_DATA, high_gain_mode);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+u8 CalcNewRate(MTO_FUNC_INPUT, u8 old_rate, u32 retry_cnt, u32 tx_frag_cnt)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	u8 new_rate;</div><div class='add'>+    u32 retry_rate;</div><div class='add'>+	int TxThrouput1, TxThrouput2, TxThrouput3, BestThroupht;</div><div class='add'>+</div><div class='add'>+	if(tx_frag_cnt &lt; MTOPARA_TXCOUNT_TH_FOR_CALC_RATE()) //too few packets transmit</div><div class='add'>+	{</div><div class='add'>+		return 0xff;</div><div class='add'>+	}</div><div class='add'>+	retry_rate = Divide(retry_cnt * 100, tx_frag_cnt);</div><div class='add'>+</div><div class='add'>+	if(retry_rate &gt; 90) retry_rate = 90; //always truncate to 90% due to lookup table size</div><div class='add'>+	#ifdef _PE_DTO_DUMP_</div><div class='add'>+	WBDEBUG(("##### Current level =%d, Retry count =%d, Frag count =%d\n",</div><div class='add'>+						old_rate, retry_cnt, tx_frag_cnt));</div><div class='add'>+	WBDEBUG(("*##* Retry rate =%d, throughput =%d\n",</div><div class='add'>+						retry_rate, Rate_PER_TBL[retry_rate][old_rate]));</div><div class='add'>+	WBDEBUG(("TxRateRec.tx_rate =%d, Retry rate = %d, throughput = %d\n",</div><div class='add'>+						TxRateRec.tx_rate, TxRateRec.tx_retry_rate,</div><div class='add'>+						Rate_PER_TBL[TxRateRec.tx_retry_rate][Level2PerTbl[TxRateRec.tx_rate]]));</div><div class='add'>+	WBDEBUG(("old_rate-1 =%d, Retry rate = %d, throughput = %d\n",</div><div class='add'>+						old_rate-1, retryrate_rec[old_rate-1],</div><div class='add'>+						Rate_PER_TBL[retryrate_rec[old_rate-1]][old_rate-1]));</div><div class='add'>+	WBDEBUG(("old_rate+1 =%d, Retry rate = %d, throughput = %d\n",</div><div class='add'>+						old_rate+1, retryrate_rec[old_rate+1],</div><div class='add'>+						Rate_PER_TBL[retryrate_rec[old_rate+1]][old_rate+1]));</div><div class='add'>+	#endif</div><div class='add'>+</div><div class='add'>+	//following is for record the retry rate at the different data rate</div><div class='add'>+	if (abs(retry_rate-retryrate_rec[old_rate])&lt;50)//---the per TH</div><div class='add'>+		retryrate_rec[old_rate] = retry_rate; //update retry rate</div><div class='add'>+	else</div><div class='add'>+	{</div><div class='add'>+		for (i=0;i&lt;MTO_DataRateAvailableLevel;i++) //reset all retry rate</div><div class='add'>+			retryrate_rec[i]=0;</div><div class='add'>+		retryrate_rec[old_rate] = retry_rate;</div><div class='add'>+		#ifdef _PE_DTO_DUMP_</div><div class='add'>+		WBDEBUG(("Reset retry rate table\n"));</div><div class='add'>+		#endif</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if(TxRateRec.tx_rate &gt; old_rate)   //Decrease Tx Rate</div><div class='add'>+	{</div><div class='add'>+		TxThrouput1 = Rate_PER_TBL[TxRateRec.tx_retry_rate][Level2PerTbl[TxRateRec.tx_rate]];</div><div class='add'>+		TxThrouput2 = Rate_PER_TBL[retry_rate][Level2PerTbl[old_rate]];</div><div class='add'>+		if(TxThrouput1 &gt; TxThrouput2)</div><div class='add'>+		{</div><div class='add'>+			new_rate = TxRateRec.tx_rate;</div><div class='add'>+			BestThroupht = TxThrouput1;</div><div class='add'>+		}</div><div class='add'>+		else</div><div class='add'>+		{</div><div class='add'>+			new_rate = old_rate;</div><div class='add'>+			BestThroupht = TxThrouput2;</div><div class='add'>+		}</div><div class='add'>+		if((old_rate &gt; 0) &amp;&amp;(retry_rate&gt;MTOPARA_TXRATE_DEC_TH()))   //Min Rate</div><div class='add'>+		{</div><div class='add'>+			TxThrouput3 = Rate_PER_TBL[retryrate_rec[old_rate-1]][Level2PerTbl[old_rate-1]];</div><div class='add'>+			if(BestThroupht &lt; TxThrouput3)</div><div class='add'>+			{</div><div class='add'>+				new_rate = old_rate - 1;</div><div class='add'>+				#ifdef _PE_DTO_DUMP_</div><div class='add'>+				WBDEBUG(("--------\n"));</div><div class='add'>+				#endif</div><div class='add'>+				BestThroupht = TxThrouput3;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	else if(TxRateRec.tx_rate &lt; old_rate)  //Increase Tx Rate</div><div class='add'>+	{</div><div class='add'>+		TxThrouput1 = Rate_PER_TBL[TxRateRec.tx_retry_rate][Level2PerTbl[TxRateRec.tx_rate]];</div><div class='add'>+		TxThrouput2 = Rate_PER_TBL[retry_rate][Level2PerTbl[old_rate]];</div><div class='add'>+		if(TxThrouput1 &gt; TxThrouput2)</div><div class='add'>+		{</div><div class='add'>+			new_rate = TxRateRec.tx_rate;</div><div class='add'>+			BestThroupht = TxThrouput1;</div><div class='add'>+		}</div><div class='add'>+		else</div><div class='add'>+		{</div><div class='add'>+			new_rate = old_rate;</div><div class='add'>+			BestThroupht = TxThrouput2;</div><div class='add'>+		}</div><div class='add'>+		if ((old_rate &lt; MTO_DataRateAvailableLevel - 1)&amp;&amp;(retry_rate&lt;MTOPARA_TXRATE_INC_TH()))</div><div class='add'>+		{</div><div class='add'>+			//TxThrouput3 = Rate_PER_TBL[retryrate_rec[old_rate+1]][Level2PerTbl[old_rate+1]];</div><div class='add'>+			if (retryrate_rec[old_rate+1] &gt; MTOPARA_TXRETRYRATE_REDUCE())</div><div class='add'>+				TxThrouput3 = Rate_PER_TBL[retryrate_rec[old_rate+1]-MTOPARA_TXRETRYRATE_REDUCE()][Level2PerTbl[old_rate+1]];</div><div class='add'>+			else</div><div class='add'>+				TxThrouput3 = Rate_PER_TBL[retryrate_rec[old_rate+1]][Level2PerTbl[old_rate+1]];</div><div class='add'>+			if(BestThroupht &lt; TxThrouput3)</div><div class='add'>+			{</div><div class='add'>+				new_rate = old_rate + 1;</div><div class='add'>+				#ifdef _PE_DTO_DUMP_</div><div class='add'>+				WBDEBUG(("++++++++++\n"));</div><div class='add'>+				#endif</div><div class='add'>+				BestThroupht = TxThrouput3;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	else  //Tx Rate no change</div><div class='add'>+	{</div><div class='add'>+		TxThrouput2 = Rate_PER_TBL[retry_rate][Level2PerTbl[old_rate]];</div><div class='add'>+		new_rate = old_rate;</div><div class='add'>+		BestThroupht = TxThrouput2;</div><div class='add'>+</div><div class='add'>+		if (retry_rate &lt;MTOPARA_TXRATE_EQ_TH())    //th for change higher rate</div><div class='add'>+		{</div><div class='add'>+			if(old_rate &lt; MTO_DataRateAvailableLevel - 1)</div><div class='add'>+			{</div><div class='add'>+				//TxThrouput3 = Rate_PER_TBL[retryrate_rec[old_rate+1]][Level2PerTbl[old_rate+1]];</div><div class='add'>+				if (retryrate_rec[old_rate+1] &gt; MTOPARA_TXRETRYRATE_REDUCE())</div><div class='add'>+					TxThrouput3 = Rate_PER_TBL[retryrate_rec[old_rate+1]-MTOPARA_TXRETRYRATE_REDUCE()][Level2PerTbl[old_rate+1]];</div><div class='add'>+				else</div><div class='add'>+					TxThrouput3 = Rate_PER_TBL[retryrate_rec[old_rate+1]][Level2PerTbl[old_rate+1]];</div><div class='add'>+				if(BestThroupht &lt; TxThrouput3)</div><div class='add'>+				{</div><div class='add'>+					new_rate = old_rate + 1;</div><div class='add'>+					BestThroupht = TxThrouput3;</div><div class='add'>+					#ifdef _PE_DTO_DUMP_</div><div class='add'>+					WBDEBUG(("=++++++++++\n"));</div><div class='add'>+					#endif</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		else</div><div class='add'>+		if(old_rate &gt; 0)   //Min Rate</div><div class='add'>+		{</div><div class='add'>+			TxThrouput3 = Rate_PER_TBL[retryrate_rec[old_rate-1]][Level2PerTbl[old_rate-1]];</div><div class='add'>+			if(BestThroupht &lt; TxThrouput3)</div><div class='add'>+			{</div><div class='add'>+				new_rate = old_rate - 1;</div><div class='add'>+				#ifdef _PE_DTO_DUMP_</div><div class='add'>+				WBDEBUG(("=--------\n"));</div><div class='add'>+				#endif</div><div class='add'>+				BestThroupht = TxThrouput3;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!LOCAL_IS_IBSS_MODE())</div><div class='add'>+	{</div><div class='add'>+	max_rssi_rate = GetMaxRateLevelFromRSSI();</div><div class='add'>+	#ifdef _PE_DTO_DUMP_</div><div class='add'>+	WBDEBUG(("[MTO]:RSSI2Rate=%d\n", MTO_Data_Rate_Tbl[max_rssi_rate]));</div><div class='add'>+	#endif</div><div class='add'>+	if(new_rate &gt; max_rssi_rate)</div><div class='add'>+		new_rate = max_rssi_rate;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	//save new rate;</div><div class='add'>+	TxRateRec.tx_rate = old_rate;</div><div class='add'>+	TxRateRec.tx_retry_rate = (u8) retry_rate;</div><div class='add'>+	TxRetryRate = retry_rate;</div><div class='add'>+	return new_rate;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void SmoothRSSI(s32 new_rssi)</div><div class='add'>+{</div><div class='add'>+	RSSISmoothed = RSSISmoothed + new_rssi - RSSIBuf[RSSIBufIndex];</div><div class='add'>+	RSSIBuf[RSSIBufIndex] = new_rssi;</div><div class='add'>+	RSSIBufIndex = (RSSIBufIndex + 1) % 10;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u8 GetMaxRateLevelFromRSSI(void)</div><div class='add'>+{</div><div class='add'>+	u8 i;</div><div class='add'>+	u8 TxRate;</div><div class='add'>+</div><div class='add'>+	for(i=0;i&lt;RSSI2RATE_SIZE;i++)</div><div class='add'>+	{</div><div class='add'>+		if(RSSISmoothed &gt; RSSI2RateTbl[i].RSSI)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	#ifdef _PE_DTO_DUMP_</div><div class='add'>+	WBDEBUG(("[MTO]:RSSI=%d\n", Divide(RSSISmoothed, 10)));</div><div class='add'>+	#endif</div><div class='add'>+	if(i &lt; RSSI2RATE_SIZE)</div><div class='add'>+		TxRate = RSSI2RateTbl[i].TxRate;</div><div class='add'>+	else</div><div class='add'>+		TxRate = 2;  //divided by 2 = 1Mbps</div><div class='add'>+</div><div class='add'>+	for(i=MTO_DataRateAvailableLevel-1;i&gt;0;i--)</div><div class='add'>+	{</div><div class='add'>+		if(TxRate &gt;=MTO_Data_Rate_Tbl[i])</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	return i;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+//===========================================================================</div><div class='add'>+//  Description:</div><div class='add'>+//      If we enable DTO, we will ignore the tx count with different tx rate from</div><div class='add'>+//      DTO rate. This is because when we adjust DTO tx rate, there could be some</div><div class='add'>+//      packets in the tx queue with previous tx rate</div><div class='add'>+void MTO_SetTxCount(MTO_FUNC_INPUT, u8 tx_rate, u8 index)</div><div class='add'>+{</div><div class='add'>+	MTO_TXFLOWCOUNT()++;</div><div class='add'>+	if ((MTO_ENABLE==1) &amp;&amp; (MTO_RATE_CHANGE_ENABLE()==1))</div><div class='add'>+	{</div><div class='add'>+		if(tx_rate == MTO_DATA_RATE())</div><div class='add'>+		{</div><div class='add'>+			if (index == 0)</div><div class='add'>+			{</div><div class='add'>+				if (boSparseTxTraffic)</div><div class='add'>+					MTO_HAL()-&gt;dto_tx_frag_count += MTOPARA_PERIODIC_CHECK_CYCLE();</div><div class='add'>+				else</div><div class='add'>+					MTO_HAL()-&gt;dto_tx_frag_count += 1;</div><div class='add'>+			}</div><div class='add'>+			else</div><div class='add'>+			{</div><div class='add'>+				if (index&lt;8)</div><div class='add'>+				{</div><div class='add'>+					MTO_HAL()-&gt;dto_tx_retry_count += index;</div><div class='add'>+					MTO_HAL()-&gt;dto_tx_frag_count += (index+1);</div><div class='add'>+				}</div><div class='add'>+				else</div><div class='add'>+				{</div><div class='add'>+					MTO_HAL()-&gt;dto_tx_retry_count += 7;</div><div class='add'>+					MTO_HAL()-&gt;dto_tx_frag_count += 7;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		else if(MTO_DATA_RATE()&gt;48 &amp;&amp; tx_rate ==48)</div><div class='add'>+		{//ALFRED</div><div class='add'>+			if (index&lt;3) //for reduciing data rate scheme ,</div><div class='add'>+				         //do not calcu different data rate</div><div class='add'>+						 //3 is the reducing data rate at retry</div><div class='add'>+			{</div><div class='add'>+				MTO_HAL()-&gt;dto_tx_retry_count += index;</div><div class='add'>+				MTO_HAL()-&gt;dto_tx_frag_count += (index+1);</div><div class='add'>+			}</div><div class='add'>+			else</div><div class='add'>+			{</div><div class='add'>+				MTO_HAL()-&gt;dto_tx_retry_count += 3;</div><div class='add'>+				MTO_HAL()-&gt;dto_tx_frag_count += 3;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	else</div><div class='add'>+	{</div><div class='add'>+		MTO_HAL()-&gt;dto_tx_retry_count += index;</div><div class='add'>+		MTO_HAL()-&gt;dto_tx_frag_count += (index+1);</div><div class='add'>+	}</div><div class='add'>+	TotalTxPkt ++;</div><div class='add'>+	TotalTxPktRetry += (index+1);</div><div class='add'>+</div><div class='add'>+	PeriodTotalTxPkt ++;</div><div class='add'>+	PeriodTotalTxPktRetry += (index+1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u8 MTO_GetTxFallbackRate(MTO_FUNC_INPUT)</div><div class='add'>+{</div><div class='add'>+	return MTO_DATA_FALLBACK_RATE();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+//===========================================================================</div><div class='add'>+//  MTO_TxFailed --</div><div class='add'>+//</div><div class='add'>+//  Description:</div><div class='add'>+//    Failure of transmitting a packet indicates that certain MTO parmeters</div><div class='add'>+//    may need to be adjusted. This function is called when NIC just failed</div><div class='add'>+//    to transmit a packet or when MSDULifeTime expired.</div><div class='add'>+//</div><div class='add'>+//  Arguments:</div><div class='add'>+//    Adapter      - The pointer to the Miniport Adapter Context</div><div class='add'>+//</div><div class='add'>+//  Return Value:</div><div class='add'>+//    None</div><div class='add'>+//============================================================================</div><div class='add'>+void MTO_TxFailed(MTO_FUNC_INPUT)</div><div class='add'>+{</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int Divide(int a, int b)</div><div class='add'>+{</div><div class='add'>+	if (b==0) b=1;</div><div class='add'>+	return a/b;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='head'>diff --git a/drivers/staging/winbond/mto.h b/drivers/staging/winbond/mto.h<br/>new file mode 100644<br/>index 000000000000..f47936f46d1e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/winbond/mto.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/mto.h</a></div><div class='hunk'>@@ -0,0 +1,265 @@</div><div class='add'>+//==================================================================</div><div class='add'>+// MTO.H</div><div class='add'>+//</div><div class='add'>+// Revision history</div><div class='add'>+//=================================</div><div class='add'>+//          20030110    UN20 Pete Chao</div><div class='add'>+//                      Initial Release</div><div class='add'>+//</div><div class='add'>+// Copyright (c) 2003 Winbond Electronics Corp. All rights reserved.</div><div class='add'>+//==================================================================</div><div class='add'>+#ifndef __MTO_H__</div><div class='add'>+#define __MTO_H__</div><div class='add'>+</div><div class='add'>+#define MTO_DEFAULT_TH_CNT              5</div><div class='add'>+#define MTO_DEFAULT_TH_SQ3              112  //OLD IS 13 reference JohnXu</div><div class='add'>+#define MTO_DEFAULT_TH_IDLE_SLOT        15</div><div class='add'>+#define MTO_DEFAULT_TH_PR_INTERF        30</div><div class='add'>+#define MTO_DEFAULT_TMR_AGING           25  // unit: slot time  10 reference JohnXu</div><div class='add'>+#define MTO_DEFAULT_TMR_PERIODIC        5   // unit: slot time</div><div class='add'>+</div><div class='add'>+#define MTO_ANTENNA_DIVERSITY_OFF       0</div><div class='add'>+#define MTO_ANTENNA_DIVERSITY_ON        1</div><div class='add'>+</div><div class='add'>+// LA20040210_DTO kevin</div><div class='add'>+//#define MTO_PREAMBLE_LONG               0</div><div class='add'>+//#define MTO_PREAMBLE_SHORT              1</div><div class='add'>+#define MTO_PREAMBLE_LONG               WLAN_PREAMBLE_TYPE_LONG</div><div class='add'>+#define MTO_PREAMBLE_SHORT              WLAN_PREAMBLE_TYPE_SHORT</div><div class='add'>+</div><div class='add'>+typedef enum {</div><div class='add'>+    TOGGLE_STATE_IDLE             = 0,</div><div class='add'>+    TOGGLE_STATE_WAIT0            = 1,</div><div class='add'>+    TOGGLE_STATE_WAIT1            = 2,</div><div class='add'>+    TOGGLE_STATE_MAKEDESISION     = 3,</div><div class='add'>+	TOGGLE_STATE_BKOFF            = 4</div><div class='add'>+} TOGGLE_STATE;</div><div class='add'>+</div><div class='add'>+typedef enum {</div><div class='add'>+    RATE_CHGSTATE_IDLE         = 0,</div><div class='add'>+    RATE_CHGSTATE_CALCULATE    = 1,</div><div class='add'>+    RATE_CHGSTATE_BACKOFF	   = 2</div><div class='add'>+} TX_RATE_REDUCTION_STATE;</div><div class='add'>+</div><div class='add'>+//============================================================================</div><div class='add'>+// struct _MTOParameters --</div><div class='add'>+//</div><div class='add'>+//   Defines the parameters used in the MAC Throughput Optimization algorithm</div><div class='add'>+//============================================================================</div><div class='add'>+typedef struct _MTO_PARAMETERS</div><div class='add'>+{</div><div class='add'>+	u8      Th_Fixant;</div><div class='add'>+	u8      Th_Cnt;</div><div class='add'>+	u8      Th_SQ3;</div><div class='add'>+	u8      Th_IdleSlot;</div><div class='add'>+</div><div class='add'>+	u16     Tmr_Aging;</div><div class='add'>+	u8      Th_PrInterf;</div><div class='add'>+	u8      Tmr_Periodic;</div><div class='add'>+</div><div class='add'>+	//---------        wkchen added      -------------</div><div class='add'>+	u32		TxFlowCount;	//to judge what kind the tx flow(sparse or busy) is</div><div class='add'>+	//------------------------------------------------</div><div class='add'>+</div><div class='add'>+	//--------- DTO threshold parameters -------------</div><div class='add'>+	u16		DTO_PeriodicCheckCycle;</div><div class='add'>+	u16		DTO_RssiThForAntDiv;</div><div class='add'>+</div><div class='add'>+	u16		DTO_TxCountThForCalcNewRate;</div><div class='add'>+	u16		DTO_TxRateIncTh;</div><div class='add'>+</div><div class='add'>+	u16		DTO_TxRateDecTh;</div><div class='add'>+	u16		DTO_TxRateEqTh;</div><div class='add'>+</div><div class='add'>+	u16		DTO_TxRateBackOff;</div><div class='add'>+	u16		DTO_TxRetryRateReduce;</div><div class='add'>+</div><div class='add'>+	u16		DTO_TxPowerIndex;	//0 ~ 31</div><div class='add'>+	u16		reserved_1;</div><div class='add'>+	//------------------------------------------------</div><div class='add'>+</div><div class='add'>+	u8      PowerChangeEnable;</div><div class='add'>+	u8      AntDiversityEnable;</div><div class='add'>+	u8      Ant_mac;</div><div class='add'>+	u8      Ant_div;</div><div class='add'>+</div><div class='add'>+	u8      CCA_Mode;</div><div class='add'>+	u8      CCA_Mode_Setup;</div><div class='add'>+	u8      Preamble_Type;</div><div class='add'>+	u8      PreambleChangeEnable;</div><div class='add'>+</div><div class='add'>+	u8      DataRateLevel;</div><div class='add'>+	u8      DataRateChangeEnable;</div><div class='add'>+	u8      FragThresholdLevel;</div><div class='add'>+	u8      FragThresholdChangeEnable;</div><div class='add'>+</div><div class='add'>+	u16     RTSThreshold;</div><div class='add'>+	u16     RTSThreshold_Setup;</div><div class='add'>+</div><div class='add'>+	u32     AvgIdleSlot;</div><div class='add'>+	u32     Pr_Interf;</div><div class='add'>+	u32     AvgGapBtwnInterf;</div><div class='add'>+</div><div class='add'>+	u8	   RTSChangeEnable;</div><div class='add'>+	u8      Ant_sel;</div><div class='add'>+	u8      aging_timeout;</div><div class='add'>+	u8	   reserved_2;</div><div class='add'>+</div><div class='add'>+	u32     Cnt_Ant[2];</div><div class='add'>+	u32     SQ_Ant[2];</div><div class='add'>+</div><div class='add'>+// 20040510 remove from globe vairable</div><div class='add'>+	u32                     TmrCnt;</div><div class='add'>+	u32                     BackoffTmr;</div><div class='add'>+	TOGGLE_STATE            ToggleState;</div><div class='add'>+	TX_RATE_REDUCTION_STATE TxRateReductionState;</div><div class='add'>+</div><div class='add'>+	u8                      Last_Rate;</div><div class='add'>+	u8                      Co_efficent;</div><div class='add'>+	u8		FallbackRateLevel;</div><div class='add'>+	u8		OfdmRateLevel;</div><div class='add'>+</div><div class='add'>+	u8		RatePolicy;</div><div class='add'>+	u8		reserved_3[3];</div><div class='add'>+</div><div class='add'>+	// For RSSI turning</div><div class='add'>+	s32		RSSI_high;</div><div class='add'>+	s32		RSSI_low;</div><div class='add'>+</div><div class='add'>+} MTO_PARAMETERS, *PMTO_PARAMETERS;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define MTO_FUNC_INPUT              PWB32_ADAPTER	Adapter</div><div class='add'>+#define MTO_FUNC_INPUT_DATA         Adapter</div><div class='add'>+#define MTO_DATA()                  (Adapter-&gt;sMtoPara)</div><div class='add'>+#define MTO_HAL()                   (&amp;Adapter-&gt;sHwData)</div><div class='add'>+#define MTO_SET_PREAMBLE_TYPE(x)    // 20040511 Turbo mark LM_PREAMBLE_TYPE(&amp;pcore_data-&gt;lm_data) = (x)</div><div class='add'>+#define MTO_ENABLE					(Adapter-&gt;sLocalPara.TxRateMode == RATE_AUTO)</div><div class='add'>+#define MTO_TXPOWER_FROM_EEPROM		(Adapter-&gt;sHwData.PowerIndexFromEEPROM)</div><div class='add'>+#define LOCAL_ANTENNA_NO()			(Adapter-&gt;sLocalPara.bAntennaNo)</div><div class='add'>+#define LOCAL_IS_CONNECTED()		(Adapter-&gt;sLocalPara.wConnectedSTAindex != 0)</div><div class='add'>+#define LOCAL_IS_IBSS_MODE()		(Adapter-&gt;asBSSDescriptElement[Adapter-&gt;sLocalPara.wConnectedSTAindex].bBssType == IBSS_NET)</div><div class='add'>+#define MTO_INITTXRATE_MODE			(Adapter-&gt;sHwData.SoftwareSet&amp;0x2)	//bit 1</div><div class='add'>+// 20040510 Turbo add</div><div class='add'>+#define MTO_TMR_CNT()               MTO_DATA().TmrCnt</div><div class='add'>+#define MTO_TOGGLE_STATE()          MTO_DATA().ToggleState</div><div class='add'>+#define MTO_TX_RATE_REDUCTION_STATE() MTO_DATA().TxRateReductionState</div><div class='add'>+#define MTO_BACKOFF_TMR()           MTO_DATA().BackoffTmr</div><div class='add'>+#define MTO_LAST_RATE()             MTO_DATA().Last_Rate</div><div class='add'>+#define MTO_CO_EFFICENT()           MTO_DATA().Co_efficent</div><div class='add'>+</div><div class='add'>+#define MTO_TH_CNT()                MTO_DATA().Th_Cnt</div><div class='add'>+#define MTO_TH_SQ3()                MTO_DATA().Th_SQ3</div><div class='add'>+#define MTO_TH_IDLE_SLOT()          MTO_DATA().Th_IdleSlot</div><div class='add'>+#define MTO_TH_PR_INTERF()          MTO_DATA().Th_PrInterf</div><div class='add'>+</div><div class='add'>+#define MTO_TMR_AGING()             MTO_DATA().Tmr_Aging</div><div class='add'>+#define MTO_TMR_PERIODIC()          MTO_DATA().Tmr_Periodic</div><div class='add'>+</div><div class='add'>+#define MTO_POWER_CHANGE_ENABLE()   MTO_DATA().PowerChangeEnable</div><div class='add'>+#define MTO_ANT_DIVERSITY_ENABLE()  Adapter-&gt;sLocalPara.boAntennaDiversity</div><div class='add'>+#define MTO_ANT_MAC()               MTO_DATA().Ant_mac</div><div class='add'>+#define MTO_ANT_DIVERSITY()         MTO_DATA().Ant_div</div><div class='add'>+#define MTO_CCA_MODE()              MTO_DATA().CCA_Mode</div><div class='add'>+#define MTO_CCA_MODE_SETUP()        MTO_DATA().CCA_Mode_Setup</div><div class='add'>+#define MTO_PREAMBLE_TYPE()         MTO_DATA().Preamble_Type</div><div class='add'>+#define MTO_PREAMBLE_CHANGE_ENABLE()         MTO_DATA().PreambleChangeEnable</div><div class='add'>+</div><div class='add'>+#define MTO_RATE_LEVEL()            MTO_DATA().DataRateLevel</div><div class='add'>+#define MTO_FALLBACK_RATE_LEVEL()	MTO_DATA().FallbackRateLevel</div><div class='add'>+#define MTO_OFDM_RATE_LEVEL()		MTO_DATA().OfdmRateLevel</div><div class='add'>+#define MTO_RATE_CHANGE_ENABLE()    MTO_DATA().DataRateChangeEnable</div><div class='add'>+#define MTO_FRAG_TH_LEVEL()         MTO_DATA().FragThresholdLevel</div><div class='add'>+#define MTO_FRAG_CHANGE_ENABLE()    MTO_DATA().FragThresholdChangeEnable</div><div class='add'>+#define MTO_RTS_THRESHOLD()         MTO_DATA().RTSThreshold</div><div class='add'>+#define MTO_RTS_CHANGE_ENABLE()     MTO_DATA().RTSChangeEnable</div><div class='add'>+#define MTO_RTS_THRESHOLD_SETUP()   MTO_DATA().RTSThreshold_Setup</div><div class='add'>+</div><div class='add'>+#define MTO_AVG_IDLE_SLOT()         MTO_DATA().AvgIdleSlot</div><div class='add'>+#define MTO_PR_INTERF()             MTO_DATA().Pr_Interf</div><div class='add'>+#define MTO_AVG_GAP_BTWN_INTERF()   MTO_DATA().AvgGapBtwnInterf</div><div class='add'>+</div><div class='add'>+#define MTO_ANT_SEL()               MTO_DATA().Ant_sel</div><div class='add'>+#define MTO_CNT_ANT(x)              MTO_DATA().Cnt_Ant[(x)]</div><div class='add'>+#define MTO_SQ_ANT(x)               MTO_DATA().SQ_Ant[(x)]</div><div class='add'>+#define MTO_AGING_TIMEOUT()         MTO_DATA().aging_timeout</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define MTO_TXFLOWCOUNT()			MTO_DATA().TxFlowCount</div><div class='add'>+//--------- DTO threshold parameters -------------</div><div class='add'>+#define	MTOPARA_PERIODIC_CHECK_CYCLE()		MTO_DATA().DTO_PeriodicCheckCycle</div><div class='add'>+#define	MTOPARA_RSSI_TH_FOR_ANTDIV()		MTO_DATA().DTO_RssiThForAntDiv</div><div class='add'>+#define	MTOPARA_TXCOUNT_TH_FOR_CALC_RATE()	MTO_DATA().DTO_TxCountThForCalcNewRate</div><div class='add'>+#define	MTOPARA_TXRATE_INC_TH()			MTO_DATA().DTO_TxRateIncTh</div><div class='add'>+#define	MTOPARA_TXRATE_DEC_TH()			MTO_DATA().DTO_TxRateDecTh</div><div class='add'>+#define MTOPARA_TXRATE_EQ_TH()			MTO_DATA().DTO_TxRateEqTh</div><div class='add'>+#define	MTOPARA_TXRATE_BACKOFF()		MTO_DATA().DTO_TxRateBackOff</div><div class='add'>+#define	MTOPARA_TXRETRYRATE_REDUCE()		MTO_DATA().DTO_TxRetryRateReduce</div><div class='add'>+#define MTOPARA_TXPOWER_INDEX()			MTO_DATA().DTO_TxPowerIndex</div><div class='add'>+//------------------------------------------------</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+extern u8   MTO_Data_Rate_Tbl[];</div><div class='add'>+extern u16  MTO_Frag_Th_Tbl[];</div><div class='add'>+</div><div class='add'>+#define MTO_DATA_RATE()          MTO_Data_Rate_Tbl[MTO_RATE_LEVEL()]</div><div class='add'>+#define MTO_DATA_FALLBACK_RATE() MTO_Data_Rate_Tbl[MTO_FALLBACK_RATE_LEVEL()]	//next level</div><div class='add'>+#define MTO_FRAG_TH()            MTO_Frag_Th_Tbl[MTO_FRAG_TH_LEVEL()]</div><div class='add'>+</div><div class='add'>+typedef struct {</div><div class='add'>+	u8 tx_rate;</div><div class='add'>+	u8 tx_retry_rate;</div><div class='add'>+} TXRETRY_REC;</div><div class='add'>+</div><div class='add'>+typedef struct _STATISTICS_INFO {</div><div class='add'>+	u32   Rate54M;</div><div class='add'>+	u32   Rate48M;</div><div class='add'>+	u32   Rate36M;</div><div class='add'>+	u32   Rate24M;</div><div class='add'>+	u32   Rate18M;</div><div class='add'>+	u32   Rate12M;</div><div class='add'>+	u32   Rate9M;</div><div class='add'>+	u32   Rate6M;</div><div class='add'>+	u32   Rate11MS;</div><div class='add'>+	u32   Rate11ML;</div><div class='add'>+	u32   Rate55MS;</div><div class='add'>+	u32   Rate55ML;</div><div class='add'>+	u32   Rate2MS;</div><div class='add'>+	u32   Rate2ML;</div><div class='add'>+	u32   Rate1M;</div><div class='add'>+	u32   Rate54MOK;</div><div class='add'>+	u32   Rate48MOK;</div><div class='add'>+	u32   Rate36MOK;</div><div class='add'>+	u32   Rate24MOK;</div><div class='add'>+	u32   Rate18MOK;</div><div class='add'>+	u32   Rate12MOK;</div><div class='add'>+	u32   Rate9MOK;</div><div class='add'>+	u32   Rate6MOK;</div><div class='add'>+	u32   Rate11MSOK;</div><div class='add'>+	u32   Rate11MLOK;</div><div class='add'>+	u32   Rate55MSOK;</div><div class='add'>+	u32   Rate55MLOK;</div><div class='add'>+	u32   Rate2MSOK;</div><div class='add'>+	u32   Rate2MLOK;</div><div class='add'>+	u32   Rate1MOK;</div><div class='add'>+	u32   SQ3;</div><div class='add'>+	s32   RSSIAVG;</div><div class='add'>+	s32   RSSIMAX;</div><div class='add'>+	s32   TXRATE;</div><div class='add'>+	s32   TxRetryRate;</div><div class='add'>+	s32   BSS_PK_CNT;</div><div class='add'>+	s32   NIDLESLOT;</div><div class='add'>+	s32   SLOT_CNT;</div><div class='add'>+	s32   INTERF_CNT;</div><div class='add'>+	s32   GAP_CNT;</div><div class='add'>+	s32   DS_EVM;</div><div class='add'>+	s32   RcvBeaconNum;</div><div class='add'>+	s32   RXRATE;</div><div class='add'>+	s32   RxBytes;</div><div class='add'>+	s32   TxBytes;</div><div class='add'>+	s32   Antenna;</div><div class='add'>+} STATISTICS_INFO, *PSTATISTICS_INFO;</div><div class='add'>+</div><div class='add'>+#endif //__MTO_H__</div><div class='add'>+</div><div class='add'>+</div><div class='head'>diff --git a/drivers/staging/winbond/mto_f.h b/drivers/staging/winbond/mto_f.h<br/>new file mode 100644<br/>index 000000000000..30b3df2ccb3c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/winbond/mto_f.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/mto_f.h</a></div><div class='hunk'>@@ -0,0 +1,7 @@</div><div class='add'>+extern void MTO_Init(PWB32_ADAPTER);</div><div class='add'>+extern void MTO_PeriodicTimerExpired(PWB32_ADAPTER);</div><div class='add'>+extern void MTO_SetDTORateRange(PWB32_ADAPTER, u8 *, u8);</div><div class='add'>+extern u8 MTO_GetTxRate(MTO_FUNC_INPUT, u32 fpdu_len);</div><div class='add'>+extern u8 MTO_GetTxFallbackRate(MTO_FUNC_INPUT);</div><div class='add'>+extern void MTO_SetTxCount(MTO_FUNC_INPUT, u8 t0, u8 index);</div><div class='add'>+</div><div class='head'>diff --git a/drivers/staging/winbond/os_common.h b/drivers/staging/winbond/os_common.h<br/>new file mode 100644<br/>index 000000000000..e24ff41e871e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/winbond/os_common.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/os_common.h</a></div><div class='hunk'>@@ -0,0 +1,2 @@</div><div class='add'>+#include "linux/sysdef.h"</div><div class='add'>+</div><div class='head'>diff --git a/drivers/staging/winbond/phy_calibration.c b/drivers/staging/winbond/phy_calibration.c<br/>new file mode 100644<br/>index 000000000000..272a65066aba<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/winbond/phy_calibration.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/phy_calibration.c</a></div><div class='hunk'>@@ -0,0 +1,1759 @@</div><div class='add'>+/*</div><div class='add'>+ * phy_302_calibration.c</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2002, 2005  Winbond Electronics Corp.</div><div class='add'>+ *</div><div class='add'>+ * modification history</div><div class='add'>+ * ---------------------------------------------------------------------------</div><div class='add'>+ * 0.01.001, 2003-04-16, Kevin      created</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/****************** INCLUDE FILES SECTION ***********************************/</div><div class='add'>+#include "os_common.h"</div><div class='add'>+#include "phy_calibration.h"</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/****************** DEBUG CONSTANT AND MACRO SECTION ************************/</div><div class='add'>+</div><div class='add'>+/****************** LOCAL CONSTANT AND MACRO SECTION ************************/</div><div class='add'>+#define LOOP_TIMES      20</div><div class='add'>+#define US              1000//MICROSECOND</div><div class='add'>+</div><div class='add'>+#define AG_CONST        0.6072529350</div><div class='add'>+#define FIXED(X)        ((s32)((X) * 32768.0))</div><div class='add'>+#define DEG2RAD(X)      0.017453 * (X)</div><div class='add'>+</div><div class='add'>+/****************** LOCAL TYPE DEFINITION SECTION ***************************/</div><div class='add'>+typedef s32         fixed; /* 16.16 fixed-point */</div><div class='add'>+</div><div class='add'>+static const fixed Angles[]=</div><div class='add'>+{</div><div class='add'>+    FIXED(DEG2RAD(45.0)),    FIXED(DEG2RAD(26.565)),  FIXED(DEG2RAD(14.0362)),</div><div class='add'>+    FIXED(DEG2RAD(7.12502)), FIXED(DEG2RAD(3.57633)), FIXED(DEG2RAD(1.78991)),</div><div class='add'>+    FIXED(DEG2RAD(0.895174)),FIXED(DEG2RAD(0.447614)),FIXED(DEG2RAD(0.223811)),</div><div class='add'>+    FIXED(DEG2RAD(0.111906)),FIXED(DEG2RAD(0.055953)),FIXED(DEG2RAD(0.027977))</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/****************** LOCAL FUNCTION DECLARATION SECTION **********************/</div><div class='add'>+//void    _phy_rf_write_delay(hw_data_t *phw_data);</div><div class='add'>+//void    phy_init_rf(hw_data_t *phw_data);</div><div class='add'>+</div><div class='add'>+/****************** FUNCTION DEFINITION SECTION *****************************/</div><div class='add'>+</div><div class='add'>+s32 _s13_to_s32(u32 data)</div><div class='add'>+{</div><div class='add'>+    u32     val;</div><div class='add'>+</div><div class='add'>+    val = (data &amp; 0x0FFF);</div><div class='add'>+</div><div class='add'>+    if ((data &amp; BIT(12)) != 0)</div><div class='add'>+    {</div><div class='add'>+        val |= 0xFFFFF000;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    return ((s32) val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 _s32_to_s13(s32 data)</div><div class='add'>+{</div><div class='add'>+    u32     val;</div><div class='add'>+</div><div class='add'>+    if (data &gt; 4095)</div><div class='add'>+    {</div><div class='add'>+        data = 4095;</div><div class='add'>+    }</div><div class='add'>+    else if (data &lt; -4096)</div><div class='add'>+    {</div><div class='add'>+        data = -4096;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    val = data &amp; 0x1FFF;</div><div class='add'>+</div><div class='add'>+    return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/****************************************************************************/</div><div class='add'>+s32 _s4_to_s32(u32 data)</div><div class='add'>+{</div><div class='add'>+    s32     val;</div><div class='add'>+</div><div class='add'>+    val = (data &amp; 0x0007);</div><div class='add'>+</div><div class='add'>+    if ((data &amp; BIT(3)) != 0)</div><div class='add'>+    {</div><div class='add'>+        val |= 0xFFFFFFF8;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 _s32_to_s4(s32 data)</div><div class='add'>+{</div><div class='add'>+    u32     val;</div><div class='add'>+</div><div class='add'>+    if (data &gt; 7)</div><div class='add'>+    {</div><div class='add'>+        data = 7;</div><div class='add'>+    }</div><div class='add'>+    else if (data &lt; -8)</div><div class='add'>+    {</div><div class='add'>+        data = -8;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    val = data &amp; 0x000F;</div><div class='add'>+</div><div class='add'>+    return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/****************************************************************************/</div><div class='add'>+s32 _s5_to_s32(u32 data)</div><div class='add'>+{</div><div class='add'>+    s32     val;</div><div class='add'>+</div><div class='add'>+    val = (data &amp; 0x000F);</div><div class='add'>+</div><div class='add'>+    if ((data &amp; BIT(4)) != 0)</div><div class='add'>+    {</div><div class='add'>+        val |= 0xFFFFFFF0;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 _s32_to_s5(s32 data)</div><div class='add'>+{</div><div class='add'>+    u32     val;</div><div class='add'>+</div><div class='add'>+    if (data &gt; 15)</div><div class='add'>+    {</div><div class='add'>+        data = 15;</div><div class='add'>+    }</div><div class='add'>+    else if (data &lt; -16)</div><div class='add'>+    {</div><div class='add'>+        data = -16;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    val = data &amp; 0x001F;</div><div class='add'>+</div><div class='add'>+    return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/****************************************************************************/</div><div class='add'>+s32 _s6_to_s32(u32 data)</div><div class='add'>+{</div><div class='add'>+    s32     val;</div><div class='add'>+</div><div class='add'>+    val = (data &amp; 0x001F);</div><div class='add'>+</div><div class='add'>+    if ((data &amp; BIT(5)) != 0)</div><div class='add'>+    {</div><div class='add'>+        val |= 0xFFFFFFE0;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 _s32_to_s6(s32 data)</div><div class='add'>+{</div><div class='add'>+    u32     val;</div><div class='add'>+</div><div class='add'>+    if (data &gt; 31)</div><div class='add'>+    {</div><div class='add'>+        data = 31;</div><div class='add'>+    }</div><div class='add'>+    else if (data &lt; -32)</div><div class='add'>+    {</div><div class='add'>+        data = -32;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    val = data &amp; 0x003F;</div><div class='add'>+</div><div class='add'>+    return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/****************************************************************************/</div><div class='add'>+s32 _s9_to_s32(u32 data)</div><div class='add'>+{</div><div class='add'>+    s32     val;</div><div class='add'>+</div><div class='add'>+    val = data &amp; 0x00FF;</div><div class='add'>+</div><div class='add'>+    if ((data &amp; BIT(8)) != 0)</div><div class='add'>+    {</div><div class='add'>+        val |= 0xFFFFFF00;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 _s32_to_s9(s32 data)</div><div class='add'>+{</div><div class='add'>+    u32     val;</div><div class='add'>+</div><div class='add'>+    if (data &gt; 255)</div><div class='add'>+    {</div><div class='add'>+        data = 255;</div><div class='add'>+    }</div><div class='add'>+    else if (data &lt; -256)</div><div class='add'>+    {</div><div class='add'>+        data = -256;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    val = data &amp; 0x01FF;</div><div class='add'>+</div><div class='add'>+    return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/****************************************************************************/</div><div class='add'>+s32 _floor(s32 n)</div><div class='add'>+{</div><div class='add'>+    if (n &gt; 0)</div><div class='add'>+    {</div><div class='add'>+        n += 5;</div><div class='add'>+    }</div><div class='add'>+    else</div><div class='add'>+    {</div><div class='add'>+        n -= 5;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    return (n/10);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/****************************************************************************/</div><div class='add'>+// The following code is sqare-root function.</div><div class='add'>+// sqsum is the input and the output is sq_rt;</div><div class='add'>+// The maximum of sqsum = 2^27 -1;</div><div class='add'>+u32 _sqrt(u32 sqsum)</div><div class='add'>+{</div><div class='add'>+    u32     sq_rt;</div><div class='add'>+</div><div class='add'>+    int     g0, g1, g2, g3, g4;</div><div class='add'>+    int     seed;</div><div class='add'>+    int     next;</div><div class='add'>+    int     step;</div><div class='add'>+</div><div class='add'>+    g4 =  sqsum / 100000000;</div><div class='add'>+    g3 = (sqsum - g4*100000000) /1000000;</div><div class='add'>+    g2 = (sqsum - g4*100000000 - g3*1000000) /10000;</div><div class='add'>+    g1 = (sqsum - g4*100000000 - g3*1000000 - g2*10000) /100;</div><div class='add'>+    g0 = (sqsum - g4*100000000 - g3*1000000 - g2*10000 - g1*100);</div><div class='add'>+</div><div class='add'>+    next = g4;</div><div class='add'>+    step = 0;</div><div class='add'>+    seed = 0;</div><div class='add'>+    while (((seed+1)*(step+1)) &lt;= next)</div><div class='add'>+    {</div><div class='add'>+    	step++;</div><div class='add'>+    	seed++;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    sq_rt = seed * 10000;</div><div class='add'>+    next = (next-(seed*step))*100 + g3;</div><div class='add'>+</div><div class='add'>+    step = 0;</div><div class='add'>+    seed = 2 * seed * 10;</div><div class='add'>+    while (((seed+1)*(step+1)) &lt;= next)</div><div class='add'>+    {</div><div class='add'>+        step++;</div><div class='add'>+    	seed++;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    sq_rt = sq_rt + step * 1000;</div><div class='add'>+    next = (next - seed * step) * 100 + g2;</div><div class='add'>+    seed = (seed + step) * 10;</div><div class='add'>+    step = 0;</div><div class='add'>+    while (((seed+1)*(step+1)) &lt;= next)</div><div class='add'>+    {</div><div class='add'>+        step++;</div><div class='add'>+    	seed++;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    sq_rt = sq_rt + step * 100;</div><div class='add'>+    next = (next - seed * step) * 100 + g1;</div><div class='add'>+    seed = (seed + step) * 10;</div><div class='add'>+    step = 0;</div><div class='add'>+</div><div class='add'>+    while (((seed+1)*(step+1)) &lt;= next)</div><div class='add'>+    {</div><div class='add'>+        step++;</div><div class='add'>+    	seed++;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    sq_rt = sq_rt + step * 10;</div><div class='add'>+    next = (next - seed* step) * 100 + g0;</div><div class='add'>+    seed = (seed + step) * 10;</div><div class='add'>+    step = 0;</div><div class='add'>+</div><div class='add'>+    while (((seed+1)*(step+1)) &lt;= next)</div><div class='add'>+    {</div><div class='add'>+        step++;</div><div class='add'>+    	seed++;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    sq_rt = sq_rt + step;</div><div class='add'>+</div><div class='add'>+    return sq_rt;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/****************************************************************************/</div><div class='add'>+void _sin_cos(s32 angle, s32 *sin, s32 *cos)</div><div class='add'>+{</div><div class='add'>+    fixed       X, Y, TargetAngle, CurrAngle;</div><div class='add'>+    unsigned    Step;</div><div class='add'>+</div><div class='add'>+    X=FIXED(AG_CONST);      // AG_CONST * cos(0)</div><div class='add'>+    Y=0;                    // AG_CONST * sin(0)</div><div class='add'>+    TargetAngle=abs(angle);</div><div class='add'>+    CurrAngle=0;</div><div class='add'>+</div><div class='add'>+    for (Step=0; Step &lt; 12; Step++)</div><div class='add'>+    {</div><div class='add'>+        fixed NewX;</div><div class='add'>+</div><div class='add'>+        if(TargetAngle &gt; CurrAngle)</div><div class='add'>+        {</div><div class='add'>+            NewX=X - (Y &gt;&gt; Step);</div><div class='add'>+            Y=(X &gt;&gt; Step) + Y;</div><div class='add'>+            X=NewX;</div><div class='add'>+            CurrAngle += Angles[Step];</div><div class='add'>+        }</div><div class='add'>+        else</div><div class='add'>+        {</div><div class='add'>+            NewX=X + (Y &gt;&gt; Step);</div><div class='add'>+            Y=-(X &gt;&gt; Step) + Y;</div><div class='add'>+            X=NewX;</div><div class='add'>+            CurrAngle -= Angles[Step];</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    if (angle &gt; 0)</div><div class='add'>+    {</div><div class='add'>+        *cos = X;</div><div class='add'>+        *sin = Y;</div><div class='add'>+    }</div><div class='add'>+    else</div><div class='add'>+    {</div><div class='add'>+        *cos = X;</div><div class='add'>+        *sin = -Y;</div><div class='add'>+    }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+void _reset_rx_cal(hw_data_t *phw_data)</div><div class='add'>+{</div><div class='add'>+	u32     val;</div><div class='add'>+</div><div class='add'>+	hw_get_dxx_reg(phw_data, 0x54, &amp;val);</div><div class='add'>+</div><div class='add'>+	if (phw_data-&gt;revision == 0x2002) // 1st-cut</div><div class='add'>+	{</div><div class='add'>+		val &amp;= 0xFFFF0000;</div><div class='add'>+	}</div><div class='add'>+	else // 2nd-cut</div><div class='add'>+	{</div><div class='add'>+		val &amp;= 0x000003FF;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hw_set_dxx_reg(phw_data, 0x54, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+// ************for winbond calibration*********</div><div class='add'>+//</div><div class='add'>+</div><div class='add'>+//</div><div class='add'>+//</div><div class='add'>+// *********************************************</div><div class='add'>+void _rxadc_dc_offset_cancellation_winbond(hw_data_t *phw_data, u32 frequency)</div><div class='add'>+{</div><div class='add'>+    u32     reg_agc_ctrl3;</div><div class='add'>+    u32     reg_a_acq_ctrl;</div><div class='add'>+    u32     reg_b_acq_ctrl;</div><div class='add'>+    u32     val;</div><div class='add'>+</div><div class='add'>+    PHY_DEBUG(("[CAL] -&gt; [1]_rxadc_dc_offset_cancellation()\n"));</div><div class='add'>+    phy_init_rf(phw_data);</div><div class='add'>+</div><div class='add'>+    // set calibration channel</div><div class='add'>+    if( (RF_WB_242 == phw_data-&gt;phy_type) ||</div><div class='add'>+		(RF_WB_242_1 == phw_data-&gt;phy_type) ) // 20060619.5 Add</div><div class='add'>+    {</div><div class='add'>+        if ((frequency &gt;= 2412) &amp;&amp; (frequency &lt;= 2484))</div><div class='add'>+        {</div><div class='add'>+            // w89rf242 change frequency to 2390Mhz</div><div class='add'>+            PHY_DEBUG(("[CAL] W89RF242/11G/Channel=2390Mhz\n"));</div><div class='add'>+			phy_set_rf_data(phw_data, 3, (3&lt;&lt;24)|0x025586);</div><div class='add'>+</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+    else</div><div class='add'>+	{</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	// reset cancel_dc_i[9:5] and cancel_dc_q[4:0] in register DC_Cancel</div><div class='add'>+	hw_get_dxx_reg(phw_data, 0x5C, &amp;val);</div><div class='add'>+	val &amp;= ~(0x03FF);</div><div class='add'>+	hw_set_dxx_reg(phw_data, 0x5C, val);</div><div class='add'>+</div><div class='add'>+	// reset the TX and RX IQ calibration data</div><div class='add'>+	hw_set_dxx_reg(phw_data, 0x3C, 0);</div><div class='add'>+	hw_set_dxx_reg(phw_data, 0x54, 0);</div><div class='add'>+</div><div class='add'>+	hw_set_dxx_reg(phw_data, 0x58, 0x30303030); // IQ_Alpha Changed</div><div class='add'>+</div><div class='add'>+	// a. Disable AGC</div><div class='add'>+	hw_get_dxx_reg(phw_data, REG_AGC_CTRL3, &amp;reg_agc_ctrl3);</div><div class='add'>+	reg_agc_ctrl3 &amp;= ~BIT(2);</div><div class='add'>+	reg_agc_ctrl3 |= (MASK_LNA_FIX_GAIN|MASK_AGC_FIX);</div><div class='add'>+	hw_set_dxx_reg(phw_data, REG_AGC_CTRL3, reg_agc_ctrl3);</div><div class='add'>+</div><div class='add'>+	hw_get_dxx_reg(phw_data, REG_AGC_CTRL5, &amp;val);</div><div class='add'>+	val |= MASK_AGC_FIX_GAIN;</div><div class='add'>+	hw_set_dxx_reg(phw_data, REG_AGC_CTRL5, val);</div><div class='add'>+</div><div class='add'>+	// b. Turn off BB RX</div><div class='add'>+	hw_get_dxx_reg(phw_data, REG_A_ACQ_CTRL, &amp;reg_a_acq_ctrl);</div><div class='add'>+	reg_a_acq_ctrl |= MASK_AMER_OFF_REG;</div><div class='add'>+	hw_set_dxx_reg(phw_data, REG_A_ACQ_CTRL, reg_a_acq_ctrl);</div><div class='add'>+</div><div class='add'>+	hw_get_dxx_reg(phw_data, REG_B_ACQ_CTRL, &amp;reg_b_acq_ctrl);</div><div class='add'>+	reg_b_acq_ctrl |= MASK_BMER_OFF_REG;</div><div class='add'>+	hw_set_dxx_reg(phw_data, REG_B_ACQ_CTRL, reg_b_acq_ctrl);</div><div class='add'>+</div><div class='add'>+	// c. Make sure MAC is in receiving mode</div><div class='add'>+	// d. Turn ON ADC calibration</div><div class='add'>+	//    - ADC calibrator is triggered by this signal rising from 0 to 1</div><div class='add'>+	hw_get_dxx_reg(phw_data, REG_MODE_CTRL, &amp;val);</div><div class='add'>+	val &amp;= ~MASK_ADC_DC_CAL_STR;</div><div class='add'>+	hw_set_dxx_reg(phw_data, REG_MODE_CTRL, val);</div><div class='add'>+</div><div class='add'>+	val |= MASK_ADC_DC_CAL_STR;</div><div class='add'>+	hw_set_dxx_reg(phw_data, REG_MODE_CTRL, val);</div><div class='add'>+	pa_stall_execution(US); // *MUST* wait for a while</div><div class='add'>+</div><div class='add'>+	// e. The result are shown in "adc_dc_cal_i[8:0] and adc_dc_cal_q[8:0]"</div><div class='add'>+#ifdef _DEBUG</div><div class='add'>+	hw_get_dxx_reg(phw_data, REG_OFFSET_READ, &amp;val);</div><div class='add'>+	PHY_DEBUG(("[CAL]    REG_OFFSET_READ = 0x%08X\n", val));</div><div class='add'>+</div><div class='add'>+	PHY_DEBUG(("[CAL]    ** adc_dc_cal_i = %d (0x%04X)\n",</div><div class='add'>+			   _s9_to_s32(val&amp;0x000001FF), val&amp;0x000001FF));</div><div class='add'>+	PHY_DEBUG(("[CAL]    ** adc_dc_cal_q = %d (0x%04X)\n",</div><div class='add'>+			   _s9_to_s32((val&amp;0x0003FE00)&gt;&gt;9), (val&amp;0x0003FE00)&gt;&gt;9));</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	hw_get_dxx_reg(phw_data, REG_MODE_CTRL, &amp;val);</div><div class='add'>+	val &amp;= ~MASK_ADC_DC_CAL_STR;</div><div class='add'>+	hw_set_dxx_reg(phw_data, REG_MODE_CTRL, val);</div><div class='add'>+</div><div class='add'>+	// f. Turn on BB RX</div><div class='add'>+	//hw_get_dxx_reg(phw_data, REG_A_ACQ_CTRL, &amp;reg_a_acq_ctrl);</div><div class='add'>+	reg_a_acq_ctrl &amp;= ~MASK_AMER_OFF_REG;</div><div class='add'>+	hw_set_dxx_reg(phw_data, REG_A_ACQ_CTRL, reg_a_acq_ctrl);</div><div class='add'>+</div><div class='add'>+	//hw_get_dxx_reg(phw_data, REG_B_ACQ_CTRL, &amp;reg_b_acq_ctrl);</div><div class='add'>+	reg_b_acq_ctrl &amp;= ~MASK_BMER_OFF_REG;</div><div class='add'>+	hw_set_dxx_reg(phw_data, REG_B_ACQ_CTRL, reg_b_acq_ctrl);</div><div class='add'>+</div><div class='add'>+	// g. Enable AGC</div><div class='add'>+	//hw_get_dxx_reg(phw_data, REG_AGC_CTRL3, &amp;val);</div><div class='add'>+	reg_agc_ctrl3 |= BIT(2);</div><div class='add'>+	reg_agc_ctrl3 &amp;= ~(MASK_LNA_FIX_GAIN|MASK_AGC_FIX);</div><div class='add'>+	hw_set_dxx_reg(phw_data, REG_AGC_CTRL3, reg_agc_ctrl3);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+////////////////////////////////////////////////////////</div><div class='add'>+void _txidac_dc_offset_cancellation_winbond(hw_data_t *phw_data)</div><div class='add'>+{</div><div class='add'>+	u32     reg_agc_ctrl3;</div><div class='add'>+	u32     reg_mode_ctrl;</div><div class='add'>+	u32     reg_dc_cancel;</div><div class='add'>+	s32     iqcal_image_i;</div><div class='add'>+	s32     iqcal_image_q;</div><div class='add'>+	u32     sqsum;</div><div class='add'>+	s32     mag_0;</div><div class='add'>+	s32     mag_1;</div><div class='add'>+	s32     fix_cancel_dc_i = 0;</div><div class='add'>+	u32     val;</div><div class='add'>+	int     loop;</div><div class='add'>+</div><div class='add'>+	PHY_DEBUG(("[CAL] -&gt; [2]_txidac_dc_offset_cancellation()\n"));</div><div class='add'>+</div><div class='add'>+	// a. Set to "TX calibration mode"</div><div class='add'>+</div><div class='add'>+	//0x01 0xEE3FC2  ; 3B8FF  ; Calibration (6a). enable TX IQ calibration loop circuits</div><div class='add'>+	phy_set_rf_data(phw_data, 1, (1&lt;&lt;24)|0xEE3FC2);</div><div class='add'>+	//0x0B 0x1905D6  ; 06417  ; Calibration (6b). enable TX I/Q cal loop squaring circuit</div><div class='add'>+	phy_set_rf_data(phw_data, 11, (11&lt;&lt;24)|0x1901D6);</div><div class='add'>+	//0x05 0x24C60A  ; 09318  ; Calibration (6c). setting TX-VGA gain: TXGCH=2 &amp; GPK=110 --&gt; to be optimized</div><div class='add'>+	phy_set_rf_data(phw_data, 5, (5&lt;&lt;24)|0x24C48A);</div><div class='add'>+    //0x06 0x06880C  ; 01A20  ; Calibration (6d). RXGCH=00; RXGCL=100 000 (RXVGA=32) --&gt; to be optimized</div><div class='add'>+	phy_set_rf_data(phw_data, 6, (6&lt;&lt;24)|0x06890C);</div><div class='add'>+	//0x00 0xFDF1C0  ; 3F7C7  ; Calibration (6e). turn on IQ imbalance/Test mode</div><div class='add'>+	phy_set_rf_data(phw_data, 0, (0&lt;&lt;24)|0xFDF1C0);</div><div class='add'>+</div><div class='add'>+	hw_set_dxx_reg(phw_data, 0x58, 0x30303030); // IQ_Alpha Changed</div><div class='add'>+</div><div class='add'>+	// a. Disable AGC</div><div class='add'>+	hw_get_dxx_reg(phw_data, REG_AGC_CTRL3, &amp;reg_agc_ctrl3);</div><div class='add'>+	reg_agc_ctrl3 &amp;= ~BIT(2);</div><div class='add'>+	reg_agc_ctrl3 |= (MASK_LNA_FIX_GAIN|MASK_AGC_FIX);</div><div class='add'>+	hw_set_dxx_reg(phw_data, REG_AGC_CTRL3, reg_agc_ctrl3);</div><div class='add'>+</div><div class='add'>+	hw_get_dxx_reg(phw_data, REG_AGC_CTRL5, &amp;val);</div><div class='add'>+	val |= MASK_AGC_FIX_GAIN;</div><div class='add'>+	hw_set_dxx_reg(phw_data, REG_AGC_CTRL5, val);</div><div class='add'>+</div><div class='add'>+	// b. set iqcal_mode[1:0] to 0x2 and set iqcal_tone[3:2] to 0</div><div class='add'>+	hw_get_dxx_reg(phw_data, REG_MODE_CTRL, &amp;reg_mode_ctrl);</div><div class='add'>+</div><div class='add'>+	PHY_DEBUG(("[CAL]    MODE_CTRL (read) = 0x%08X\n", reg_mode_ctrl));</div><div class='add'>+	reg_mode_ctrl &amp;= ~(MASK_IQCAL_TONE_SEL|MASK_IQCAL_MODE);</div><div class='add'>+</div><div class='add'>+	// mode=2, tone=0</div><div class='add'>+	//reg_mode_ctrl |= (MASK_CALIB_START|2);</div><div class='add'>+</div><div class='add'>+	// mode=2, tone=1</div><div class='add'>+	//reg_mode_ctrl |= (MASK_CALIB_START|2|(1&lt;&lt;2));</div><div class='add'>+</div><div class='add'>+	// mode=2, tone=2</div><div class='add'>+	reg_mode_ctrl |= (MASK_CALIB_START|2|(2&lt;&lt;2));</div><div class='add'>+	hw_set_dxx_reg(phw_data, REG_MODE_CTRL, reg_mode_ctrl);</div><div class='add'>+	PHY_DEBUG(("[CAL]    MODE_CTRL (write) = 0x%08X\n", reg_mode_ctrl));</div><div class='add'>+	pa_stall_execution(US);</div><div class='add'>+</div><div class='add'>+	hw_get_dxx_reg(phw_data, 0x5C, &amp;reg_dc_cancel);</div><div class='add'>+	PHY_DEBUG(("[CAL]    DC_CANCEL (read) = 0x%08X\n", reg_dc_cancel));</div><div class='add'>+</div><div class='add'>+	for (loop = 0; loop &lt; LOOP_TIMES; loop++)</div><div class='add'>+	{</div><div class='add'>+		PHY_DEBUG(("[CAL] [%d.] ==================================\n", loop));</div><div class='add'>+</div><div class='add'>+		// c.</div><div class='add'>+		// reset cancel_dc_i[9:5] and cancel_dc_q[4:0] in register DC_Cancel</div><div class='add'>+		reg_dc_cancel &amp;= ~(0x03FF);</div><div class='add'>+		PHY_DEBUG(("[CAL]    DC_CANCEL (write) = 0x%08X\n", reg_dc_cancel));</div><div class='add'>+		hw_set_dxx_reg(phw_data, 0x5C, reg_dc_cancel);</div><div class='add'>+		pa_stall_execution(US);</div><div class='add'>+</div><div class='add'>+		hw_get_dxx_reg(phw_data, REG_CALIB_READ2, &amp;val);</div><div class='add'>+		PHY_DEBUG(("[CAL]    CALIB_READ2 = 0x%08X\n", val));</div><div class='add'>+</div><div class='add'>+		iqcal_image_i = _s13_to_s32(val &amp; 0x00001FFF);</div><div class='add'>+		iqcal_image_q = _s13_to_s32((val &amp; 0x03FFE000) &gt;&gt; 13);</div><div class='add'>+		sqsum = iqcal_image_i*iqcal_image_i + iqcal_image_q*iqcal_image_q;</div><div class='add'>+		mag_0 = (s32) _sqrt(sqsum);</div><div class='add'>+		PHY_DEBUG(("[CAL]    mag_0=%d (iqcal_image_i=%d, iqcal_image_q=%d)\n",</div><div class='add'>+				   mag_0, iqcal_image_i, iqcal_image_q));</div><div class='add'>+</div><div class='add'>+		// d.</div><div class='add'>+		reg_dc_cancel |= (1 &lt;&lt; CANCEL_DC_I_SHIFT);</div><div class='add'>+		PHY_DEBUG(("[CAL]    DC_CANCEL (write) = 0x%08X\n", reg_dc_cancel));</div><div class='add'>+		hw_set_dxx_reg(phw_data, 0x5C, reg_dc_cancel);</div><div class='add'>+		pa_stall_execution(US);</div><div class='add'>+</div><div class='add'>+		hw_get_dxx_reg(phw_data, REG_CALIB_READ2, &amp;val);</div><div class='add'>+		PHY_DEBUG(("[CAL]    CALIB_READ2 = 0x%08X\n", val));</div><div class='add'>+</div><div class='add'>+		iqcal_image_i = _s13_to_s32(val &amp; 0x00001FFF);</div><div class='add'>+		iqcal_image_q = _s13_to_s32((val &amp; 0x03FFE000) &gt;&gt; 13);</div><div class='add'>+		sqsum = iqcal_image_i*iqcal_image_i + iqcal_image_q*iqcal_image_q;</div><div class='add'>+		mag_1 = (s32) _sqrt(sqsum);</div><div class='add'>+		PHY_DEBUG(("[CAL]    mag_1=%d (iqcal_image_i=%d, iqcal_image_q=%d)\n",</div><div class='add'>+				   mag_1, iqcal_image_i, iqcal_image_q));</div><div class='add'>+</div><div class='add'>+		// e. Calculate the correct DC offset cancellation value for I</div><div class='add'>+		if (mag_0 != mag_1)</div><div class='add'>+		{</div><div class='add'>+			fix_cancel_dc_i = (mag_0*10000) / (mag_0*10000 - mag_1*10000);</div><div class='add'>+		}</div><div class='add'>+		else</div><div class='add'>+		{</div><div class='add'>+			if (mag_0 == mag_1)</div><div class='add'>+			{</div><div class='add'>+				PHY_DEBUG(("[CAL]   ***** mag_0 = mag_1 !!\n"));</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			fix_cancel_dc_i = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		PHY_DEBUG(("[CAL]    ** fix_cancel_dc_i = %d (0x%04X)\n",</div><div class='add'>+				   fix_cancel_dc_i, _s32_to_s5(fix_cancel_dc_i)));</div><div class='add'>+</div><div class='add'>+		if ((abs(mag_1-mag_0)*6) &gt; mag_0)</div><div class='add'>+		{</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ( loop &gt;= 19 )</div><div class='add'>+	   fix_cancel_dc_i = 0;</div><div class='add'>+</div><div class='add'>+	reg_dc_cancel &amp;= ~(0x03FF);</div><div class='add'>+	reg_dc_cancel |= (_s32_to_s5(fix_cancel_dc_i) &lt;&lt; CANCEL_DC_I_SHIFT);</div><div class='add'>+	hw_set_dxx_reg(phw_data, 0x5C, reg_dc_cancel);</div><div class='add'>+	PHY_DEBUG(("[CAL]    DC_CANCEL (write) = 0x%08X\n", reg_dc_cancel));</div><div class='add'>+</div><div class='add'>+	// g.</div><div class='add'>+	reg_mode_ctrl &amp;= ~MASK_CALIB_START;</div><div class='add'>+	hw_set_dxx_reg(phw_data, REG_MODE_CTRL, reg_mode_ctrl);</div><div class='add'>+	PHY_DEBUG(("[CAL]    MODE_CTRL (write) = 0x%08X\n", reg_mode_ctrl));</div><div class='add'>+	pa_stall_execution(US);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+///////////////////////////////////////////////////////</div><div class='add'>+void _txqdac_dc_offset_cacellation_winbond(hw_data_t *phw_data)</div><div class='add'>+{</div><div class='add'>+	u32     reg_agc_ctrl3;</div><div class='add'>+	u32     reg_mode_ctrl;</div><div class='add'>+	u32     reg_dc_cancel;</div><div class='add'>+	s32     iqcal_image_i;</div><div class='add'>+	s32     iqcal_image_q;</div><div class='add'>+	u32     sqsum;</div><div class='add'>+	s32     mag_0;</div><div class='add'>+	s32     mag_1;</div><div class='add'>+	s32     fix_cancel_dc_q = 0;</div><div class='add'>+	u32     val;</div><div class='add'>+	int     loop;</div><div class='add'>+</div><div class='add'>+	PHY_DEBUG(("[CAL] -&gt; [3]_txqdac_dc_offset_cacellation()\n"));</div><div class='add'>+	//0x01 0xEE3FC2  ; 3B8FF  ; Calibration (6a). enable TX IQ calibration loop circuits</div><div class='add'>+	phy_set_rf_data(phw_data, 1, (1&lt;&lt;24)|0xEE3FC2);</div><div class='add'>+	//0x0B 0x1905D6  ; 06417  ; Calibration (6b). enable TX I/Q cal loop squaring circuit</div><div class='add'>+	phy_set_rf_data(phw_data, 11, (11&lt;&lt;24)|0x1901D6);</div><div class='add'>+	//0x05 0x24C60A  ; 09318  ; Calibration (6c). setting TX-VGA gain: TXGCH=2 &amp; GPK=110 --&gt; to be optimized</div><div class='add'>+	phy_set_rf_data(phw_data, 5, (5&lt;&lt;24)|0x24C48A);</div><div class='add'>+    //0x06 0x06880C  ; 01A20  ; Calibration (6d). RXGCH=00; RXGCL=100 000 (RXVGA=32) --&gt; to be optimized</div><div class='add'>+	phy_set_rf_data(phw_data, 6, (6&lt;&lt;24)|0x06890C);</div><div class='add'>+	//0x00 0xFDF1C0  ; 3F7C7  ; Calibration (6e). turn on IQ imbalance/Test mode</div><div class='add'>+	phy_set_rf_data(phw_data, 0, (0&lt;&lt;24)|0xFDF1C0);</div><div class='add'>+</div><div class='add'>+	hw_set_dxx_reg(phw_data, 0x58, 0x30303030); // IQ_Alpha Changed</div><div class='add'>+</div><div class='add'>+	// a. Disable AGC</div><div class='add'>+	hw_get_dxx_reg(phw_data, REG_AGC_CTRL3, &amp;reg_agc_ctrl3);</div><div class='add'>+	reg_agc_ctrl3 &amp;= ~BIT(2);</div><div class='add'>+	reg_agc_ctrl3 |= (MASK_LNA_FIX_GAIN|MASK_AGC_FIX);</div><div class='add'>+	hw_set_dxx_reg(phw_data, REG_AGC_CTRL3, reg_agc_ctrl3);</div><div class='add'>+</div><div class='add'>+	hw_get_dxx_reg(phw_data, REG_AGC_CTRL5, &amp;val);</div><div class='add'>+	val |= MASK_AGC_FIX_GAIN;</div><div class='add'>+	hw_set_dxx_reg(phw_data, REG_AGC_CTRL5, val);</div><div class='add'>+</div><div class='add'>+	// a. set iqcal_mode[1:0] to 0x3 and set iqcal_tone[3:2] to 0</div><div class='add'>+	hw_get_dxx_reg(phw_data, REG_MODE_CTRL, &amp;reg_mode_ctrl);</div><div class='add'>+	PHY_DEBUG(("[CAL]    MODE_CTRL (read) = 0x%08X\n", reg_mode_ctrl));</div><div class='add'>+</div><div class='add'>+	//reg_mode_ctrl &amp;= ~(MASK_IQCAL_TONE_SEL|MASK_IQCAL_MODE);</div><div class='add'>+	reg_mode_ctrl &amp;= ~(MASK_IQCAL_MODE);</div><div class='add'>+	reg_mode_ctrl |= (MASK_CALIB_START|3);</div><div class='add'>+	hw_set_dxx_reg(phw_data, REG_MODE_CTRL, reg_mode_ctrl);</div><div class='add'>+	PHY_DEBUG(("[CAL]    MODE_CTRL (write) = 0x%08X\n", reg_mode_ctrl));</div><div class='add'>+	pa_stall_execution(US);</div><div class='add'>+</div><div class='add'>+	hw_get_dxx_reg(phw_data, 0x5C, &amp;reg_dc_cancel);</div><div class='add'>+	PHY_DEBUG(("[CAL]    DC_CANCEL (read) = 0x%08X\n", reg_dc_cancel));</div><div class='add'>+</div><div class='add'>+	for (loop = 0; loop &lt; LOOP_TIMES; loop++)</div><div class='add'>+	{</div><div class='add'>+		PHY_DEBUG(("[CAL] [%d.] ==================================\n", loop));</div><div class='add'>+</div><div class='add'>+		// b.</div><div class='add'>+		// reset cancel_dc_q[4:0] in register DC_Cancel</div><div class='add'>+		reg_dc_cancel &amp;= ~(0x001F);</div><div class='add'>+		PHY_DEBUG(("[CAL]    DC_CANCEL (write) = 0x%08X\n", reg_dc_cancel));</div><div class='add'>+		hw_set_dxx_reg(phw_data, 0x5C, reg_dc_cancel);</div><div class='add'>+		pa_stall_execution(US);</div><div class='add'>+</div><div class='add'>+		hw_get_dxx_reg(phw_data, REG_CALIB_READ2, &amp;val);</div><div class='add'>+		PHY_DEBUG(("[CAL]    CALIB_READ2 = 0x%08X\n", val));</div><div class='add'>+		pa_stall_execution(US);</div><div class='add'>+</div><div class='add'>+		iqcal_image_i = _s13_to_s32(val &amp; 0x00001FFF);</div><div class='add'>+		iqcal_image_q = _s13_to_s32((val &amp; 0x03FFE000) &gt;&gt; 13);</div><div class='add'>+		sqsum = iqcal_image_i*iqcal_image_i + iqcal_image_q*iqcal_image_q;</div><div class='add'>+		mag_0 = _sqrt(sqsum);</div><div class='add'>+		PHY_DEBUG(("[CAL]    mag_0=%d (iqcal_image_i=%d, iqcal_image_q=%d)\n",</div><div class='add'>+				   mag_0, iqcal_image_i, iqcal_image_q));</div><div class='add'>+</div><div class='add'>+		// c.</div><div class='add'>+		reg_dc_cancel |= (1 &lt;&lt; CANCEL_DC_Q_SHIFT);</div><div class='add'>+		PHY_DEBUG(("[CAL]    DC_CANCEL (write) = 0x%08X\n", reg_dc_cancel));</div><div class='add'>+		hw_set_dxx_reg(phw_data, 0x5C, reg_dc_cancel);</div><div class='add'>+		pa_stall_execution(US);</div><div class='add'>+</div><div class='add'>+		hw_get_dxx_reg(phw_data, REG_CALIB_READ2, &amp;val);</div><div class='add'>+		PHY_DEBUG(("[CAL]    CALIB_READ2 = 0x%08X\n", val));</div><div class='add'>+		pa_stall_execution(US);</div><div class='add'>+</div><div class='add'>+		iqcal_image_i = _s13_to_s32(val &amp; 0x00001FFF);</div><div class='add'>+		iqcal_image_q = _s13_to_s32((val &amp; 0x03FFE000) &gt;&gt; 13);</div><div class='add'>+		sqsum = iqcal_image_i*iqcal_image_i + iqcal_image_q*iqcal_image_q;</div><div class='add'>+		mag_1 = _sqrt(sqsum);</div><div class='add'>+		PHY_DEBUG(("[CAL]    mag_1=%d (iqcal_image_i=%d, iqcal_image_q=%d)\n",</div><div class='add'>+				   mag_1, iqcal_image_i, iqcal_image_q));</div><div class='add'>+</div><div class='add'>+		// d. Calculate the correct DC offset cancellation value for I</div><div class='add'>+		if (mag_0 != mag_1)</div><div class='add'>+		{</div><div class='add'>+			fix_cancel_dc_q = (mag_0*10000) / (mag_0*10000 - mag_1*10000);</div><div class='add'>+		}</div><div class='add'>+		else</div><div class='add'>+		{</div><div class='add'>+			if (mag_0 == mag_1)</div><div class='add'>+			{</div><div class='add'>+				PHY_DEBUG(("[CAL]   ***** mag_0 = mag_1 !!\n"));</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			fix_cancel_dc_q = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		PHY_DEBUG(("[CAL]    ** fix_cancel_dc_q = %d (0x%04X)\n",</div><div class='add'>+				   fix_cancel_dc_q, _s32_to_s5(fix_cancel_dc_q)));</div><div class='add'>+</div><div class='add'>+		if ((abs(mag_1-mag_0)*6) &gt; mag_0)</div><div class='add'>+		{</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ( loop &gt;= 19 )</div><div class='add'>+	   fix_cancel_dc_q = 0;</div><div class='add'>+</div><div class='add'>+	reg_dc_cancel &amp;= ~(0x001F);</div><div class='add'>+	reg_dc_cancel |= (_s32_to_s5(fix_cancel_dc_q) &lt;&lt; CANCEL_DC_Q_SHIFT);</div><div class='add'>+	hw_set_dxx_reg(phw_data, 0x5C, reg_dc_cancel);</div><div class='add'>+	PHY_DEBUG(("[CAL]    DC_CANCEL (write) = 0x%08X\n", reg_dc_cancel));</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	// f.</div><div class='add'>+	reg_mode_ctrl &amp;= ~MASK_CALIB_START;</div><div class='add'>+	hw_set_dxx_reg(phw_data, REG_MODE_CTRL, reg_mode_ctrl);</div><div class='add'>+	PHY_DEBUG(("[CAL]    MODE_CTRL (write) = 0x%08X\n", reg_mode_ctrl));</div><div class='add'>+	pa_stall_execution(US);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+//20060612.1.a 20060718.1 Modify</div><div class='add'>+u8 _tx_iq_calibration_loop_winbond(hw_data_t *phw_data,</div><div class='add'>+						   s32 a_2_threshold,</div><div class='add'>+						   s32 b_2_threshold)</div><div class='add'>+{</div><div class='add'>+	u32     reg_mode_ctrl;</div><div class='add'>+	s32     iq_mag_0_tx;</div><div class='add'>+	s32     iqcal_tone_i0;</div><div class='add'>+	s32     iqcal_tone_q0;</div><div class='add'>+	s32     iqcal_tone_i;</div><div class='add'>+	s32     iqcal_tone_q;</div><div class='add'>+	u32     sqsum;</div><div class='add'>+	s32     rot_i_b;</div><div class='add'>+	s32     rot_q_b;</div><div class='add'>+	s32     tx_cal_flt_b[4];</div><div class='add'>+	s32     tx_cal[4];</div><div class='add'>+	s32     tx_cal_reg[4];</div><div class='add'>+	s32     a_2, b_2;</div><div class='add'>+	s32     sin_b, sin_2b;</div><div class='add'>+	s32     cos_b, cos_2b;</div><div class='add'>+	s32     divisor;</div><div class='add'>+	s32     temp1, temp2;</div><div class='add'>+	u32     val;</div><div class='add'>+	u16     loop;</div><div class='add'>+	s32     iqcal_tone_i_avg,iqcal_tone_q_avg;</div><div class='add'>+	u8      verify_count;</div><div class='add'>+	int capture_time;</div><div class='add'>+</div><div class='add'>+	PHY_DEBUG(("[CAL] -&gt; _tx_iq_calibration_loop()\n"));</div><div class='add'>+	PHY_DEBUG(("[CAL]    ** a_2_threshold = %d\n", a_2_threshold));</div><div class='add'>+	PHY_DEBUG(("[CAL]    ** b_2_threshold = %d\n", b_2_threshold));</div><div class='add'>+</div><div class='add'>+	verify_count = 0;</div><div class='add'>+</div><div class='add'>+	hw_get_dxx_reg(phw_data, REG_MODE_CTRL, &amp;reg_mode_ctrl);</div><div class='add'>+	PHY_DEBUG(("[CAL]    MODE_CTRL (read) = 0x%08X\n", reg_mode_ctrl));</div><div class='add'>+</div><div class='add'>+	loop = LOOP_TIMES;</div><div class='add'>+</div><div class='add'>+	while (loop &gt; 0)</div><div class='add'>+	{</div><div class='add'>+		PHY_DEBUG(("[CAL] [%d.] &lt;_tx_iq_calibration_loop&gt;\n", (LOOP_TIMES-loop+1)));</div><div class='add'>+</div><div class='add'>+		iqcal_tone_i_avg=0;</div><div class='add'>+		iqcal_tone_q_avg=0;</div><div class='add'>+		if( !hw_set_dxx_reg(phw_data, 0x3C, 0x00) ) // 20060718.1 modify</div><div class='add'>+			return 0;</div><div class='add'>+		for(capture_time=0;capture_time&lt;10;capture_time++)</div><div class='add'>+		{</div><div class='add'>+			// a. Set iqcal_mode[1:0] to 0x2 and set "calib_start" to 0x1 to</div><div class='add'>+			//    enable "IQ alibration Mode II"</div><div class='add'>+			reg_mode_ctrl &amp;= ~(MASK_IQCAL_TONE_SEL|MASK_IQCAL_MODE);</div><div class='add'>+			reg_mode_ctrl &amp;= ~MASK_IQCAL_MODE;</div><div class='add'>+			reg_mode_ctrl |= (MASK_CALIB_START|0x02);</div><div class='add'>+			reg_mode_ctrl |= (MASK_CALIB_START|0x02|2&lt;&lt;2);</div><div class='add'>+			hw_set_dxx_reg(phw_data, REG_MODE_CTRL, reg_mode_ctrl);</div><div class='add'>+			PHY_DEBUG(("[CAL]    MODE_CTRL (write) = 0x%08X\n", reg_mode_ctrl));</div><div class='add'>+			pa_stall_execution(US);</div><div class='add'>+</div><div class='add'>+			// b.</div><div class='add'>+			hw_get_dxx_reg(phw_data, REG_CALIB_READ1, &amp;val);</div><div class='add'>+			PHY_DEBUG(("[CAL]    CALIB_READ1 = 0x%08X\n", val));</div><div class='add'>+			pa_stall_execution(US);</div><div class='add'>+</div><div class='add'>+			iqcal_tone_i0 = _s13_to_s32(val &amp; 0x00001FFF);</div><div class='add'>+			iqcal_tone_q0 = _s13_to_s32((val &amp; 0x03FFE000) &gt;&gt; 13);</div><div class='add'>+			PHY_DEBUG(("[CAL]    ** iqcal_tone_i0=%d, iqcal_tone_q0=%d\n",</div><div class='add'>+				   iqcal_tone_i0, iqcal_tone_q0));</div><div class='add'>+</div><div class='add'>+			sqsum = iqcal_tone_i0*iqcal_tone_i0 +</div><div class='add'>+			iqcal_tone_q0*iqcal_tone_q0;</div><div class='add'>+			iq_mag_0_tx = (s32) _sqrt(sqsum);</div><div class='add'>+			PHY_DEBUG(("[CAL]    ** iq_mag_0_tx=%d\n", iq_mag_0_tx));</div><div class='add'>+</div><div class='add'>+			// c. Set "calib_start" to 0x0</div><div class='add'>+			reg_mode_ctrl &amp;= ~MASK_CALIB_START;</div><div class='add'>+			hw_set_dxx_reg(phw_data, REG_MODE_CTRL, reg_mode_ctrl);</div><div class='add'>+			PHY_DEBUG(("[CAL]    MODE_CTRL (write) = 0x%08X\n", reg_mode_ctrl));</div><div class='add'>+			pa_stall_execution(US);</div><div class='add'>+</div><div class='add'>+			// d. Set iqcal_mode[1:0] to 0x3 and set "calib_start" to 0x1 to</div><div class='add'>+			//    enable "IQ alibration Mode II"</div><div class='add'>+			//hw_get_dxx_reg(phw_data, REG_MODE_CTRL, &amp;val);</div><div class='add'>+			hw_get_dxx_reg(phw_data, REG_MODE_CTRL, &amp;reg_mode_ctrl);</div><div class='add'>+			reg_mode_ctrl &amp;= ~MASK_IQCAL_MODE;</div><div class='add'>+			reg_mode_ctrl |= (MASK_CALIB_START|0x03);</div><div class='add'>+			hw_set_dxx_reg(phw_data, REG_MODE_CTRL, reg_mode_ctrl);</div><div class='add'>+			PHY_DEBUG(("[CAL]    MODE_CTRL (write) = 0x%08X\n", reg_mode_ctrl));</div><div class='add'>+			pa_stall_execution(US);</div><div class='add'>+</div><div class='add'>+			// e.</div><div class='add'>+			hw_get_dxx_reg(phw_data, REG_CALIB_READ1, &amp;val);</div><div class='add'>+			PHY_DEBUG(("[CAL]    CALIB_READ1 = 0x%08X\n", val));</div><div class='add'>+			pa_stall_execution(US);</div><div class='add'>+</div><div class='add'>+			iqcal_tone_i = _s13_to_s32(val &amp; 0x00001FFF);</div><div class='add'>+			iqcal_tone_q = _s13_to_s32((val &amp; 0x03FFE000) &gt;&gt; 13);</div><div class='add'>+			PHY_DEBUG(("[CAL]    ** iqcal_tone_i = %d, iqcal_tone_q = %d\n",</div><div class='add'>+			iqcal_tone_i, iqcal_tone_q));</div><div class='add'>+			if( capture_time == 0)</div><div class='add'>+			{</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+			else</div><div class='add'>+			{</div><div class='add'>+				iqcal_tone_i_avg=( iqcal_tone_i_avg*(capture_time-1) +iqcal_tone_i)/capture_time;</div><div class='add'>+				iqcal_tone_q_avg=( iqcal_tone_q_avg*(capture_time-1) +iqcal_tone_q)/capture_time;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		iqcal_tone_i = iqcal_tone_i_avg;</div><div class='add'>+		iqcal_tone_q = iqcal_tone_q_avg;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+		rot_i_b = (iqcal_tone_i * iqcal_tone_i0 +</div><div class='add'>+				   iqcal_tone_q * iqcal_tone_q0) / 1024;</div><div class='add'>+		rot_q_b = (iqcal_tone_i * iqcal_tone_q0 * (-1) +</div><div class='add'>+				   iqcal_tone_q * iqcal_tone_i0) / 1024;</div><div class='add'>+		PHY_DEBUG(("[CAL]    ** rot_i_b = %d, rot_q_b = %d\n",</div><div class='add'>+				   rot_i_b, rot_q_b));</div><div class='add'>+</div><div class='add'>+		// f.</div><div class='add'>+		divisor = ((iq_mag_0_tx * iq_mag_0_tx * 2)/1024 - rot_i_b) * 2;</div><div class='add'>+</div><div class='add'>+		if (divisor == 0)</div><div class='add'>+		{</div><div class='add'>+			PHY_DEBUG(("[CAL] ** &lt;_tx_iq_calibration_loop&gt; ERROR *******\n"));</div><div class='add'>+			PHY_DEBUG(("[CAL] ** divisor=0 to calculate EPS and THETA !!\n"));</div><div class='add'>+			PHY_DEBUG(("[CAL] ******************************************\n"));</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		a_2 = (rot_i_b * 32768) / divisor;</div><div class='add'>+		b_2 = (rot_q_b * (-32768)) / divisor;</div><div class='add'>+		PHY_DEBUG(("[CAL]    ***** EPSILON/2 = %d\n", a_2));</div><div class='add'>+		PHY_DEBUG(("[CAL]    ***** THETA/2   = %d\n", b_2));</div><div class='add'>+</div><div class='add'>+		phw_data-&gt;iq_rsdl_gain_tx_d2 = a_2;</div><div class='add'>+		phw_data-&gt;iq_rsdl_phase_tx_d2 = b_2;</div><div class='add'>+</div><div class='add'>+		//if ((abs(a_2) &lt; 150) &amp;&amp; (abs(b_2) &lt; 100))</div><div class='add'>+		//if ((abs(a_2) &lt; 200) &amp;&amp; (abs(b_2) &lt; 200))</div><div class='add'>+		if ((abs(a_2) &lt; a_2_threshold) &amp;&amp; (abs(b_2) &lt; b_2_threshold))</div><div class='add'>+		{</div><div class='add'>+			verify_count++;</div><div class='add'>+</div><div class='add'>+			PHY_DEBUG(("[CAL] ** &lt;_tx_iq_calibration_loop&gt; *************\n"));</div><div class='add'>+			PHY_DEBUG(("[CAL] ** VERIFY OK # %d !!\n", verify_count));</div><div class='add'>+			PHY_DEBUG(("[CAL] ******************************************\n"));</div><div class='add'>+</div><div class='add'>+			if (verify_count &gt; 2)</div><div class='add'>+			{</div><div class='add'>+				PHY_DEBUG(("[CAL] ** &lt;_tx_iq_calibration_loop&gt; *********\n"));</div><div class='add'>+				PHY_DEBUG(("[CAL] ** TX_IQ_CALIBRATION (EPS,THETA) OK !!\n"));</div><div class='add'>+				PHY_DEBUG(("[CAL] **************************************\n"));</div><div class='add'>+				return 0;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		else</div><div class='add'>+		{</div><div class='add'>+			verify_count = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		_sin_cos(b_2, &amp;sin_b, &amp;cos_b);</div><div class='add'>+		_sin_cos(b_2*2, &amp;sin_2b, &amp;cos_2b);</div><div class='add'>+		PHY_DEBUG(("[CAL]    ** sin(b/2)=%d, cos(b/2)=%d\n", sin_b, cos_b));</div><div class='add'>+		PHY_DEBUG(("[CAL]    ** sin(b)=%d, cos(b)=%d\n", sin_2b, cos_2b));</div><div class='add'>+</div><div class='add'>+		if (cos_2b == 0)</div><div class='add'>+		{</div><div class='add'>+			PHY_DEBUG(("[CAL] ** &lt;_tx_iq_calibration_loop&gt; ERROR *******\n"));</div><div class='add'>+			PHY_DEBUG(("[CAL] ** cos(b)=0 !!\n"));</div><div class='add'>+			PHY_DEBUG(("[CAL] ******************************************\n"));</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		// 1280 * 32768 = 41943040</div><div class='add'>+		temp1 = (41943040/cos_2b)*cos_b;</div><div class='add'>+</div><div class='add'>+		//temp2 = (41943040/cos_2b)*sin_b*(-1);</div><div class='add'>+		if (phw_data-&gt;revision == 0x2002) // 1st-cut</div><div class='add'>+		{</div><div class='add'>+			temp2 = (41943040/cos_2b)*sin_b*(-1);</div><div class='add'>+		}</div><div class='add'>+		else // 2nd-cut</div><div class='add'>+		{</div><div class='add'>+			temp2 = (41943040*4/cos_2b)*sin_b*(-1);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		tx_cal_flt_b[0] = _floor(temp1/(32768+a_2));</div><div class='add'>+		tx_cal_flt_b[1] = _floor(temp2/(32768+a_2));</div><div class='add'>+		tx_cal_flt_b[2] = _floor(temp2/(32768-a_2));</div><div class='add'>+		tx_cal_flt_b[3] = _floor(temp1/(32768-a_2));</div><div class='add'>+		PHY_DEBUG(("[CAL]    ** tx_cal_flt_b[0] = %d\n", tx_cal_flt_b[0]));</div><div class='add'>+		PHY_DEBUG(("[CAL]       tx_cal_flt_b[1] = %d\n", tx_cal_flt_b[1]));</div><div class='add'>+		PHY_DEBUG(("[CAL]       tx_cal_flt_b[2] = %d\n", tx_cal_flt_b[2]));</div><div class='add'>+		PHY_DEBUG(("[CAL]       tx_cal_flt_b[3] = %d\n", tx_cal_flt_b[3]));</div><div class='add'>+</div><div class='add'>+		tx_cal[2] = tx_cal_flt_b[2];</div><div class='add'>+		tx_cal[2] = tx_cal[2] +3;</div><div class='add'>+		tx_cal[1] = tx_cal[2];</div><div class='add'>+		tx_cal[3] = tx_cal_flt_b[3] - 128;</div><div class='add'>+		tx_cal[0] = -tx_cal[3]+1;</div><div class='add'>+</div><div class='add'>+		PHY_DEBUG(("[CAL]       tx_cal[0] = %d\n", tx_cal[0]));</div><div class='add'>+		PHY_DEBUG(("[CAL]       tx_cal[1] = %d\n", tx_cal[1]));</div><div class='add'>+		PHY_DEBUG(("[CAL]       tx_cal[2] = %d\n", tx_cal[2]));</div><div class='add'>+		PHY_DEBUG(("[CAL]       tx_cal[3] = %d\n", tx_cal[3]));</div><div class='add'>+</div><div class='add'>+		//if ((tx_cal[0] == 0) &amp;&amp; (tx_cal[1] == 0) &amp;&amp;</div><div class='add'>+		//    (tx_cal[2] == 0) &amp;&amp; (tx_cal[3] == 0))</div><div class='add'>+		//{</div><div class='add'>+		//    PHY_DEBUG(("[CAL] ** &lt;_tx_iq_calibration_loop&gt; *************\n"));</div><div class='add'>+		//    PHY_DEBUG(("[CAL] ** TX_IQ_CALIBRATION COMPLETE !!\n"));</div><div class='add'>+		//    PHY_DEBUG(("[CAL] ******************************************\n"));</div><div class='add'>+		//    return 0;</div><div class='add'>+		//}</div><div class='add'>+</div><div class='add'>+		// g.</div><div class='add'>+		if (phw_data-&gt;revision == 0x2002) // 1st-cut</div><div class='add'>+		{</div><div class='add'>+			hw_get_dxx_reg(phw_data, 0x54, &amp;val);</div><div class='add'>+			PHY_DEBUG(("[CAL]    ** 0x54 = 0x%08X\n", val));</div><div class='add'>+			tx_cal_reg[0] = _s4_to_s32((val &amp; 0xF0000000) &gt;&gt; 28);</div><div class='add'>+			tx_cal_reg[1] = _s4_to_s32((val &amp; 0x0F000000) &gt;&gt; 24);</div><div class='add'>+			tx_cal_reg[2] = _s4_to_s32((val &amp; 0x00F00000) &gt;&gt; 20);</div><div class='add'>+			tx_cal_reg[3] = _s4_to_s32((val &amp; 0x000F0000) &gt;&gt; 16);</div><div class='add'>+		}</div><div class='add'>+		else // 2nd-cut</div><div class='add'>+		{</div><div class='add'>+			hw_get_dxx_reg(phw_data, 0x3C, &amp;val);</div><div class='add'>+			PHY_DEBUG(("[CAL]    ** 0x3C = 0x%08X\n", val));</div><div class='add'>+			tx_cal_reg[0] = _s5_to_s32((val &amp; 0xF8000000) &gt;&gt; 27);</div><div class='add'>+			tx_cal_reg[1] = _s6_to_s32((val &amp; 0x07E00000) &gt;&gt; 21);</div><div class='add'>+			tx_cal_reg[2] = _s6_to_s32((val &amp; 0x001F8000) &gt;&gt; 15);</div><div class='add'>+			tx_cal_reg[3] = _s5_to_s32((val &amp; 0x00007C00) &gt;&gt; 10);</div><div class='add'>+</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		PHY_DEBUG(("[CAL]    ** tx_cal_reg[0] = %d\n", tx_cal_reg[0]));</div><div class='add'>+		PHY_DEBUG(("[CAL]       tx_cal_reg[1] = %d\n", tx_cal_reg[1]));</div><div class='add'>+		PHY_DEBUG(("[CAL]       tx_cal_reg[2] = %d\n", tx_cal_reg[2]));</div><div class='add'>+		PHY_DEBUG(("[CAL]       tx_cal_reg[3] = %d\n", tx_cal_reg[3]));</div><div class='add'>+</div><div class='add'>+		if (phw_data-&gt;revision == 0x2002) // 1st-cut</div><div class='add'>+		{</div><div class='add'>+			if (((tx_cal_reg[0]==7) || (tx_cal_reg[0]==(-8))) &amp;&amp;</div><div class='add'>+				((tx_cal_reg[3]==7) || (tx_cal_reg[3]==(-8))))</div><div class='add'>+			{</div><div class='add'>+				PHY_DEBUG(("[CAL] ** &lt;_tx_iq_calibration_loop&gt; *********\n"));</div><div class='add'>+				PHY_DEBUG(("[CAL] ** TX_IQ_CALIBRATION SATUATION !!\n"));</div><div class='add'>+				PHY_DEBUG(("[CAL] **************************************\n"));</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		else // 2nd-cut</div><div class='add'>+		{</div><div class='add'>+			if (((tx_cal_reg[0]==31) || (tx_cal_reg[0]==(-32))) &amp;&amp;</div><div class='add'>+				((tx_cal_reg[3]==31) || (tx_cal_reg[3]==(-32))))</div><div class='add'>+			{</div><div class='add'>+				PHY_DEBUG(("[CAL] ** &lt;_tx_iq_calibration_loop&gt; *********\n"));</div><div class='add'>+				PHY_DEBUG(("[CAL] ** TX_IQ_CALIBRATION SATUATION !!\n"));</div><div class='add'>+				PHY_DEBUG(("[CAL] **************************************\n"));</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		tx_cal[0] = tx_cal[0] + tx_cal_reg[0];</div><div class='add'>+		tx_cal[1] = tx_cal[1] + tx_cal_reg[1];</div><div class='add'>+		tx_cal[2] = tx_cal[2] + tx_cal_reg[2];</div><div class='add'>+		tx_cal[3] = tx_cal[3] + tx_cal_reg[3];</div><div class='add'>+		PHY_DEBUG(("[CAL]    ** apply tx_cal[0] = %d\n", tx_cal[0]));</div><div class='add'>+		PHY_DEBUG(("[CAL]       apply tx_cal[1] = %d\n", tx_cal[1]));</div><div class='add'>+		PHY_DEBUG(("[CAL]       apply tx_cal[2] = %d\n", tx_cal[2]));</div><div class='add'>+		PHY_DEBUG(("[CAL]       apply tx_cal[3] = %d\n", tx_cal[3]));</div><div class='add'>+</div><div class='add'>+		if (phw_data-&gt;revision == 0x2002) // 1st-cut</div><div class='add'>+		{</div><div class='add'>+			val &amp;= 0x0000FFFF;</div><div class='add'>+			val |= ((_s32_to_s4(tx_cal[0]) &lt;&lt; 28)|</div><div class='add'>+					(_s32_to_s4(tx_cal[1]) &lt;&lt; 24)|</div><div class='add'>+					(_s32_to_s4(tx_cal[2]) &lt;&lt; 20)|</div><div class='add'>+					(_s32_to_s4(tx_cal[3]) &lt;&lt; 16));</div><div class='add'>+			hw_set_dxx_reg(phw_data, 0x54, val);</div><div class='add'>+			PHY_DEBUG(("[CAL]    ** CALIB_DATA = 0x%08X\n", val));</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+		else // 2nd-cut</div><div class='add'>+		{</div><div class='add'>+			val &amp;= 0x000003FF;</div><div class='add'>+			val |= ((_s32_to_s5(tx_cal[0]) &lt;&lt; 27)|</div><div class='add'>+					(_s32_to_s6(tx_cal[1]) &lt;&lt; 21)|</div><div class='add'>+					(_s32_to_s6(tx_cal[2]) &lt;&lt; 15)|</div><div class='add'>+					(_s32_to_s5(tx_cal[3]) &lt;&lt; 10));</div><div class='add'>+			hw_set_dxx_reg(phw_data, 0x3C, val);</div><div class='add'>+			PHY_DEBUG(("[CAL]    ** TX_IQ_CALIBRATION = 0x%08X\n", val));</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		// i. Set "calib_start" to 0x0</div><div class='add'>+		reg_mode_ctrl &amp;= ~MASK_CALIB_START;</div><div class='add'>+		hw_set_dxx_reg(phw_data, REG_MODE_CTRL, reg_mode_ctrl);</div><div class='add'>+		PHY_DEBUG(("[CAL]    MODE_CTRL (write) = 0x%08X\n", reg_mode_ctrl));</div><div class='add'>+</div><div class='add'>+		loop--;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void _tx_iq_calibration_winbond(hw_data_t *phw_data)</div><div class='add'>+{</div><div class='add'>+	u32     reg_agc_ctrl3;</div><div class='add'>+#ifdef _DEBUG</div><div class='add'>+	s32     tx_cal_reg[4];</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+	u32     reg_mode_ctrl;</div><div class='add'>+	u32     val;</div><div class='add'>+	u8      result;</div><div class='add'>+</div><div class='add'>+	PHY_DEBUG(("[CAL] -&gt; [4]_tx_iq_calibration()\n"));</div><div class='add'>+</div><div class='add'>+	//0x01 0xEE3FC2  ; 3B8FF  ; Calibration (6a). enable TX IQ calibration loop circuits</div><div class='add'>+	phy_set_rf_data(phw_data, 1, (1&lt;&lt;24)|0xEE3FC2);</div><div class='add'>+	//0x0B 0x1905D6  ; 06417  ; Calibration (6b). enable TX I/Q cal loop squaring circuit</div><div class='add'>+	phy_set_rf_data(phw_data, 11, (11&lt;&lt;24)|0x19BDD6); // 20060612.1.a 0x1905D6);</div><div class='add'>+	//0x05 0x24C60A  ; 09318  ; Calibration (6c). setting TX-VGA gain: TXGCH=2 &amp; GPK=110 --&gt; to be optimized</div><div class='add'>+	phy_set_rf_data(phw_data, 5, (5&lt;&lt;24)|0x24C60A); //0x24C60A (high temperature)</div><div class='add'>+    //0x06 0x06880C  ; 01A20  ; Calibration (6d). RXGCH=00; RXGCL=100 000 (RXVGA=32) --&gt; to be optimized</div><div class='add'>+	phy_set_rf_data(phw_data, 6, (6&lt;&lt;24)|0x34880C); // 20060612.1.a 0x06890C);</div><div class='add'>+	//0x00 0xFDF1C0  ; 3F7C7  ; Calibration (6e). turn on IQ imbalance/Test mode</div><div class='add'>+	phy_set_rf_data(phw_data, 0, (0&lt;&lt;24)|0xFDF1C0);</div><div class='add'>+	//; [BB-chip]: Calibration (6f).Send test pattern</div><div class='add'>+	//; [BB-chip]: Calibration (6g). Search RXGCL optimal value</div><div class='add'>+	//; [BB-chip]: Calibration (6h). Caculate TX-path IQ imbalance and setting TX path IQ compensation table</div><div class='add'>+	//phy_set_rf_data(phw_data, 3, (3&lt;&lt;24)|0x025586);</div><div class='add'>+</div><div class='add'>+	OS_SLEEP(30000); // 20060612.1.a 30ms delay. Add the follow 2 lines</div><div class='add'>+	//To adjust TXVGA to fit iq_mag_0 range from 1250 ~ 1750</div><div class='add'>+	adjust_TXVGA_for_iq_mag( phw_data );</div><div class='add'>+</div><div class='add'>+	// a. Disable AGC</div><div class='add'>+	hw_get_dxx_reg(phw_data, REG_AGC_CTRL3, &amp;reg_agc_ctrl3);</div><div class='add'>+	reg_agc_ctrl3 &amp;= ~BIT(2);</div><div class='add'>+	reg_agc_ctrl3 |= (MASK_LNA_FIX_GAIN|MASK_AGC_FIX);</div><div class='add'>+	hw_set_dxx_reg(phw_data, REG_AGC_CTRL3, reg_agc_ctrl3);</div><div class='add'>+</div><div class='add'>+	hw_get_dxx_reg(phw_data, REG_AGC_CTRL5, &amp;val);</div><div class='add'>+	val |= MASK_AGC_FIX_GAIN;</div><div class='add'>+	hw_set_dxx_reg(phw_data, REG_AGC_CTRL5, val);</div><div class='add'>+</div><div class='add'>+	result = _tx_iq_calibration_loop_winbond(phw_data, 150, 100);</div><div class='add'>+</div><div class='add'>+	if (result &gt; 0)</div><div class='add'>+	{</div><div class='add'>+		if (phw_data-&gt;revision == 0x2002) // 1st-cut</div><div class='add'>+		{</div><div class='add'>+			hw_get_dxx_reg(phw_data, 0x54, &amp;val);</div><div class='add'>+			val &amp;= 0x0000FFFF;</div><div class='add'>+			hw_set_dxx_reg(phw_data, 0x54, val);</div><div class='add'>+		}</div><div class='add'>+		else // 2nd-cut</div><div class='add'>+		{</div><div class='add'>+			hw_get_dxx_reg(phw_data, 0x3C, &amp;val);</div><div class='add'>+			val &amp;= 0x000003FF;</div><div class='add'>+			hw_set_dxx_reg(phw_data, 0x3C, val);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		result = _tx_iq_calibration_loop_winbond(phw_data, 300, 200);</div><div class='add'>+</div><div class='add'>+		if (result &gt; 0)</div><div class='add'>+		{</div><div class='add'>+			if (phw_data-&gt;revision == 0x2002) // 1st-cut</div><div class='add'>+			{</div><div class='add'>+				hw_get_dxx_reg(phw_data, 0x54, &amp;val);</div><div class='add'>+				val &amp;= 0x0000FFFF;</div><div class='add'>+				hw_set_dxx_reg(phw_data, 0x54, val);</div><div class='add'>+			}</div><div class='add'>+			else // 2nd-cut</div><div class='add'>+			{</div><div class='add'>+				hw_get_dxx_reg(phw_data, 0x3C, &amp;val);</div><div class='add'>+				val &amp;= 0x000003FF;</div><div class='add'>+				hw_set_dxx_reg(phw_data, 0x3C, val);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			result = _tx_iq_calibration_loop_winbond(phw_data, 500, 400);</div><div class='add'>+			if (result &gt; 0)</div><div class='add'>+			{</div><div class='add'>+				if (phw_data-&gt;revision == 0x2002) // 1st-cut</div><div class='add'>+				{</div><div class='add'>+					hw_get_dxx_reg(phw_data, 0x54, &amp;val);</div><div class='add'>+					val &amp;= 0x0000FFFF;</div><div class='add'>+					hw_set_dxx_reg(phw_data, 0x54, val);</div><div class='add'>+				}</div><div class='add'>+				else // 2nd-cut</div><div class='add'>+				{</div><div class='add'>+					hw_get_dxx_reg(phw_data, 0x3C, &amp;val);</div><div class='add'>+					val &amp;= 0x000003FF;</div><div class='add'>+					hw_set_dxx_reg(phw_data, 0x3C, val);</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+				result = _tx_iq_calibration_loop_winbond(phw_data, 700, 500);</div><div class='add'>+</div><div class='add'>+				if (result &gt; 0)</div><div class='add'>+				{</div><div class='add'>+					PHY_DEBUG(("[CAL] ** &lt;_tx_iq_calibration&gt; **************\n"));</div><div class='add'>+					PHY_DEBUG(("[CAL] ** TX_IQ_CALIBRATION FAILURE !!\n"));</div><div class='add'>+					PHY_DEBUG(("[CAL] **************************************\n"));</div><div class='add'>+</div><div class='add'>+					if (phw_data-&gt;revision == 0x2002) // 1st-cut</div><div class='add'>+					{</div><div class='add'>+						hw_get_dxx_reg(phw_data, 0x54, &amp;val);</div><div class='add'>+						val &amp;= 0x0000FFFF;</div><div class='add'>+						hw_set_dxx_reg(phw_data, 0x54, val);</div><div class='add'>+					}</div><div class='add'>+					else // 2nd-cut</div><div class='add'>+					{</div><div class='add'>+						hw_get_dxx_reg(phw_data, 0x3C, &amp;val);</div><div class='add'>+						val &amp;= 0x000003FF;</div><div class='add'>+						hw_set_dxx_reg(phw_data, 0x3C, val);</div><div class='add'>+					}</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	// i. Set "calib_start" to 0x0</div><div class='add'>+	hw_get_dxx_reg(phw_data, REG_MODE_CTRL, &amp;reg_mode_ctrl);</div><div class='add'>+	reg_mode_ctrl &amp;= ~MASK_CALIB_START;</div><div class='add'>+	hw_set_dxx_reg(phw_data, REG_MODE_CTRL, reg_mode_ctrl);</div><div class='add'>+	PHY_DEBUG(("[CAL]    MODE_CTRL (write) = 0x%08X\n", reg_mode_ctrl));</div><div class='add'>+</div><div class='add'>+	// g. Enable AGC</div><div class='add'>+	//hw_get_dxx_reg(phw_data, REG_AGC_CTRL3, &amp;val);</div><div class='add'>+	reg_agc_ctrl3 |= BIT(2);</div><div class='add'>+	reg_agc_ctrl3 &amp;= ~(MASK_LNA_FIX_GAIN|MASK_AGC_FIX);</div><div class='add'>+	hw_set_dxx_reg(phw_data, REG_AGC_CTRL3, reg_agc_ctrl3);</div><div class='add'>+</div><div class='add'>+#ifdef _DEBUG</div><div class='add'>+	if (phw_data-&gt;revision == 0x2002) // 1st-cut</div><div class='add'>+	{</div><div class='add'>+		hw_get_dxx_reg(phw_data, 0x54, &amp;val);</div><div class='add'>+		PHY_DEBUG(("[CAL]    ** 0x54 = 0x%08X\n", val));</div><div class='add'>+		tx_cal_reg[0] = _s4_to_s32((val &amp; 0xF0000000) &gt;&gt; 28);</div><div class='add'>+		tx_cal_reg[1] = _s4_to_s32((val &amp; 0x0F000000) &gt;&gt; 24);</div><div class='add'>+		tx_cal_reg[2] = _s4_to_s32((val &amp; 0x00F00000) &gt;&gt; 20);</div><div class='add'>+		tx_cal_reg[3] = _s4_to_s32((val &amp; 0x000F0000) &gt;&gt; 16);</div><div class='add'>+	}</div><div class='add'>+	else // 2nd-cut</div><div class='add'>+	{</div><div class='add'>+		hw_get_dxx_reg(phw_data, 0x3C, &amp;val);</div><div class='add'>+		PHY_DEBUG(("[CAL]    ** 0x3C = 0x%08X\n", val));</div><div class='add'>+		tx_cal_reg[0] = _s5_to_s32((val &amp; 0xF8000000) &gt;&gt; 27);</div><div class='add'>+		tx_cal_reg[1] = _s6_to_s32((val &amp; 0x07E00000) &gt;&gt; 21);</div><div class='add'>+		tx_cal_reg[2] = _s6_to_s32((val &amp; 0x001F8000) &gt;&gt; 15);</div><div class='add'>+		tx_cal_reg[3] = _s5_to_s32((val &amp; 0x00007C00) &gt;&gt; 10);</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	PHY_DEBUG(("[CAL]    ** tx_cal_reg[0] = %d\n", tx_cal_reg[0]));</div><div class='add'>+	PHY_DEBUG(("[CAL]       tx_cal_reg[1] = %d\n", tx_cal_reg[1]));</div><div class='add'>+	PHY_DEBUG(("[CAL]       tx_cal_reg[2] = %d\n", tx_cal_reg[2]));</div><div class='add'>+	PHY_DEBUG(("[CAL]       tx_cal_reg[3] = %d\n", tx_cal_reg[3]));</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	// for test - BEN</div><div class='add'>+	// RF Control Override</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/////////////////////////////////////////////////////////////////////////////////////////</div><div class='add'>+u8 _rx_iq_calibration_loop_winbond(hw_data_t *phw_data, u16 factor, u32 frequency)</div><div class='add'>+{</div><div class='add'>+	u32     reg_mode_ctrl;</div><div class='add'>+	s32     iqcal_tone_i;</div><div class='add'>+	s32     iqcal_tone_q;</div><div class='add'>+	s32     iqcal_image_i;</div><div class='add'>+	s32     iqcal_image_q;</div><div class='add'>+	s32     rot_tone_i_b;</div><div class='add'>+	s32     rot_tone_q_b;</div><div class='add'>+	s32     rot_image_i_b;</div><div class='add'>+	s32     rot_image_q_b;</div><div class='add'>+	s32     rx_cal_flt_b[4];</div><div class='add'>+	s32     rx_cal[4];</div><div class='add'>+	s32     rx_cal_reg[4];</div><div class='add'>+	s32     a_2, b_2;</div><div class='add'>+	s32     sin_b, sin_2b;</div><div class='add'>+	s32     cos_b, cos_2b;</div><div class='add'>+	s32     temp1, temp2;</div><div class='add'>+	u32     val;</div><div class='add'>+	u16     loop;</div><div class='add'>+</div><div class='add'>+	u32     pwr_tone;</div><div class='add'>+	u32     pwr_image;</div><div class='add'>+	u8      verify_count;</div><div class='add'>+</div><div class='add'>+	s32     iqcal_tone_i_avg,iqcal_tone_q_avg;</div><div class='add'>+	s32     iqcal_image_i_avg,iqcal_image_q_avg;</div><div class='add'>+	u16		capture_time;</div><div class='add'>+</div><div class='add'>+	PHY_DEBUG(("[CAL] -&gt; [5]_rx_iq_calibration_loop()\n"));</div><div class='add'>+	PHY_DEBUG(("[CAL] ** factor = %d\n", factor));</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+// RF Control Override</div><div class='add'>+	hw_get_cxx_reg(phw_data, 0x80, &amp;val);</div><div class='add'>+	val |= BIT(19);</div><div class='add'>+	hw_set_cxx_reg(phw_data, 0x80, val);</div><div class='add'>+</div><div class='add'>+// RF_Ctrl</div><div class='add'>+	hw_get_cxx_reg(phw_data, 0xE4, &amp;val);</div><div class='add'>+	val |= BIT(0);</div><div class='add'>+	hw_set_cxx_reg(phw_data, 0xE4, val);</div><div class='add'>+	PHY_DEBUG(("[CAL] ** RF_CTRL(0xE4) = 0x%08X", val));</div><div class='add'>+</div><div class='add'>+	hw_set_dxx_reg(phw_data, 0x58, 0x44444444); // IQ_Alpha</div><div class='add'>+</div><div class='add'>+	// b.</div><div class='add'>+</div><div class='add'>+	hw_get_dxx_reg(phw_data, REG_MODE_CTRL, &amp;reg_mode_ctrl);</div><div class='add'>+	PHY_DEBUG(("[CAL]    MODE_CTRL (read) = 0x%08X\n", reg_mode_ctrl));</div><div class='add'>+</div><div class='add'>+	verify_count = 0;</div><div class='add'>+</div><div class='add'>+	//for (loop = 0; loop &lt; 1; loop++)</div><div class='add'>+	//for (loop = 0; loop &lt; LOOP_TIMES; loop++)</div><div class='add'>+	loop = LOOP_TIMES;</div><div class='add'>+	while (loop &gt; 0)</div><div class='add'>+	{</div><div class='add'>+		PHY_DEBUG(("[CAL] [%d.] &lt;_rx_iq_calibration_loop&gt;\n", (LOOP_TIMES-loop+1)));</div><div class='add'>+		iqcal_tone_i_avg=0;</div><div class='add'>+		iqcal_tone_q_avg=0;</div><div class='add'>+		iqcal_image_i_avg=0;</div><div class='add'>+		iqcal_image_q_avg=0;</div><div class='add'>+		capture_time=0;</div><div class='add'>+</div><div class='add'>+		for(capture_time=0; capture_time&lt;10; capture_time++)</div><div class='add'>+		{</div><div class='add'>+		// i. Set "calib_start" to 0x0</div><div class='add'>+		reg_mode_ctrl &amp;= ~MASK_CALIB_START;</div><div class='add'>+		if( !hw_set_dxx_reg(phw_data, REG_MODE_CTRL, reg_mode_ctrl) )//20060718.1 modify</div><div class='add'>+			return 0;</div><div class='add'>+		PHY_DEBUG(("[CAL]    MODE_CTRL (write) = 0x%08X\n", reg_mode_ctrl));</div><div class='add'>+		pa_stall_execution(US);</div><div class='add'>+</div><div class='add'>+		reg_mode_ctrl &amp;= ~MASK_IQCAL_MODE;</div><div class='add'>+		reg_mode_ctrl |= (MASK_CALIB_START|0x1);</div><div class='add'>+		hw_set_dxx_reg(phw_data, REG_MODE_CTRL, reg_mode_ctrl);</div><div class='add'>+		PHY_DEBUG(("[CAL]    MODE_CTRL (write) = 0x%08X\n", reg_mode_ctrl));</div><div class='add'>+		pa_stall_execution(US);  //Should be read out after 450us</div><div class='add'>+</div><div class='add'>+		// c.</div><div class='add'>+		hw_get_dxx_reg(phw_data, REG_CALIB_READ1, &amp;val);</div><div class='add'>+		PHY_DEBUG(("[CAL]    CALIB_READ1 = 0x%08X\n", val));</div><div class='add'>+</div><div class='add'>+		iqcal_tone_i = _s13_to_s32(val &amp; 0x00001FFF);</div><div class='add'>+		iqcal_tone_q = _s13_to_s32((val &amp; 0x03FFE000) &gt;&gt; 13);</div><div class='add'>+		PHY_DEBUG(("[CAL]    ** iqcal_tone_i = %d, iqcal_tone_q = %d\n",</div><div class='add'>+				   iqcal_tone_i, iqcal_tone_q));</div><div class='add'>+</div><div class='add'>+		hw_get_dxx_reg(phw_data, REG_CALIB_READ2, &amp;val);</div><div class='add'>+		PHY_DEBUG(("[CAL]    CALIB_READ2 = 0x%08X\n", val));</div><div class='add'>+</div><div class='add'>+		iqcal_image_i = _s13_to_s32(val &amp; 0x00001FFF);</div><div class='add'>+		iqcal_image_q = _s13_to_s32((val &amp; 0x03FFE000) &gt;&gt; 13);</div><div class='add'>+		PHY_DEBUG(("[CAL]    ** iqcal_image_i = %d, iqcal_image_q = %d\n",</div><div class='add'>+				   iqcal_image_i, iqcal_image_q));</div><div class='add'>+			if( capture_time == 0)</div><div class='add'>+			{</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+			else</div><div class='add'>+			{</div><div class='add'>+				iqcal_image_i_avg=( iqcal_image_i_avg*(capture_time-1) +iqcal_image_i)/capture_time;</div><div class='add'>+				iqcal_image_q_avg=( iqcal_image_q_avg*(capture_time-1) +iqcal_image_q)/capture_time;</div><div class='add'>+				iqcal_tone_i_avg=( iqcal_tone_i_avg*(capture_time-1) +iqcal_tone_i)/capture_time;</div><div class='add'>+				iqcal_tone_q_avg=( iqcal_tone_q_avg*(capture_time-1) +iqcal_tone_q)/capture_time;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+		iqcal_image_i = iqcal_image_i_avg;</div><div class='add'>+		iqcal_image_q = iqcal_image_q_avg;</div><div class='add'>+		iqcal_tone_i = iqcal_tone_i_avg;</div><div class='add'>+		iqcal_tone_q = iqcal_tone_q_avg;</div><div class='add'>+</div><div class='add'>+		// d.</div><div class='add'>+		rot_tone_i_b = (iqcal_tone_i * iqcal_tone_i +</div><div class='add'>+						iqcal_tone_q * iqcal_tone_q) / 1024;</div><div class='add'>+		rot_tone_q_b = (iqcal_tone_i * iqcal_tone_q * (-1) +</div><div class='add'>+						iqcal_tone_q * iqcal_tone_i) / 1024;</div><div class='add'>+		rot_image_i_b = (iqcal_image_i * iqcal_tone_i -</div><div class='add'>+						 iqcal_image_q * iqcal_tone_q) / 1024;</div><div class='add'>+		rot_image_q_b = (iqcal_image_i * iqcal_tone_q +</div><div class='add'>+						 iqcal_image_q * iqcal_tone_i) / 1024;</div><div class='add'>+</div><div class='add'>+		PHY_DEBUG(("[CAL]    ** rot_tone_i_b  = %d\n", rot_tone_i_b));</div><div class='add'>+		PHY_DEBUG(("[CAL]    ** rot_tone_q_b  = %d\n", rot_tone_q_b));</div><div class='add'>+		PHY_DEBUG(("[CAL]    ** rot_image_i_b = %d\n", rot_image_i_b));</div><div class='add'>+		PHY_DEBUG(("[CAL]    ** rot_image_q_b = %d\n", rot_image_q_b));</div><div class='add'>+</div><div class='add'>+		// f.</div><div class='add'>+		if (rot_tone_i_b == 0)</div><div class='add'>+		{</div><div class='add'>+			PHY_DEBUG(("[CAL] ** &lt;_rx_iq_calibration_loop&gt; ERROR *******\n"));</div><div class='add'>+			PHY_DEBUG(("[CAL] ** rot_tone_i_b=0 to calculate EPS and THETA !!\n"));</div><div class='add'>+			PHY_DEBUG(("[CAL] ******************************************\n"));</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		a_2 = (rot_image_i_b * 32768) / rot_tone_i_b -</div><div class='add'>+			phw_data-&gt;iq_rsdl_gain_tx_d2;</div><div class='add'>+		b_2 = (rot_image_q_b * 32768) / rot_tone_i_b -</div><div class='add'>+			phw_data-&gt;iq_rsdl_phase_tx_d2;</div><div class='add'>+</div><div class='add'>+		PHY_DEBUG(("[CAL]    ** iq_rsdl_gain_tx_d2 = %d\n", phw_data-&gt;iq_rsdl_gain_tx_d2));</div><div class='add'>+		PHY_DEBUG(("[CAL]    ** iq_rsdl_phase_tx_d2= %d\n", phw_data-&gt;iq_rsdl_phase_tx_d2));</div><div class='add'>+		PHY_DEBUG(("[CAL]    ***** EPSILON/2 = %d\n", a_2));</div><div class='add'>+		PHY_DEBUG(("[CAL]    ***** THETA/2   = %d\n", b_2));</div><div class='add'>+</div><div class='add'>+		_sin_cos(b_2, &amp;sin_b, &amp;cos_b);</div><div class='add'>+		_sin_cos(b_2*2, &amp;sin_2b, &amp;cos_2b);</div><div class='add'>+		PHY_DEBUG(("[CAL]    ** sin(b/2)=%d, cos(b/2)=%d\n", sin_b, cos_b));</div><div class='add'>+		PHY_DEBUG(("[CAL]    ** sin(b)=%d, cos(b)=%d\n", sin_2b, cos_2b));</div><div class='add'>+</div><div class='add'>+		if (cos_2b == 0)</div><div class='add'>+		{</div><div class='add'>+			PHY_DEBUG(("[CAL] ** &lt;_rx_iq_calibration_loop&gt; ERROR *******\n"));</div><div class='add'>+			PHY_DEBUG(("[CAL] ** cos(b)=0 !!\n"));</div><div class='add'>+			PHY_DEBUG(("[CAL] ******************************************\n"));</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		// 1280 * 32768 = 41943040</div><div class='add'>+		temp1 = (41943040/cos_2b)*cos_b;</div><div class='add'>+</div><div class='add'>+		//temp2 = (41943040/cos_2b)*sin_b*(-1);</div><div class='add'>+		if (phw_data-&gt;revision == 0x2002) // 1st-cut</div><div class='add'>+		{</div><div class='add'>+			temp2 = (41943040/cos_2b)*sin_b*(-1);</div><div class='add'>+		}</div><div class='add'>+		else // 2nd-cut</div><div class='add'>+		{</div><div class='add'>+			temp2 = (41943040*4/cos_2b)*sin_b*(-1);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		rx_cal_flt_b[0] = _floor(temp1/(32768+a_2));</div><div class='add'>+		rx_cal_flt_b[1] = _floor(temp2/(32768-a_2));</div><div class='add'>+		rx_cal_flt_b[2] = _floor(temp2/(32768+a_2));</div><div class='add'>+		rx_cal_flt_b[3] = _floor(temp1/(32768-a_2));</div><div class='add'>+</div><div class='add'>+		PHY_DEBUG(("[CAL]    ** rx_cal_flt_b[0] = %d\n", rx_cal_flt_b[0]));</div><div class='add'>+		PHY_DEBUG(("[CAL]       rx_cal_flt_b[1] = %d\n", rx_cal_flt_b[1]));</div><div class='add'>+		PHY_DEBUG(("[CAL]       rx_cal_flt_b[2] = %d\n", rx_cal_flt_b[2]));</div><div class='add'>+		PHY_DEBUG(("[CAL]       rx_cal_flt_b[3] = %d\n", rx_cal_flt_b[3]));</div><div class='add'>+</div><div class='add'>+		rx_cal[0] = rx_cal_flt_b[0] - 128;</div><div class='add'>+		rx_cal[1] = rx_cal_flt_b[1];</div><div class='add'>+		rx_cal[2] = rx_cal_flt_b[2];</div><div class='add'>+		rx_cal[3] = rx_cal_flt_b[3] - 128;</div><div class='add'>+		PHY_DEBUG(("[CAL]    ** rx_cal[0] = %d\n", rx_cal[0]));</div><div class='add'>+		PHY_DEBUG(("[CAL]       rx_cal[1] = %d\n", rx_cal[1]));</div><div class='add'>+		PHY_DEBUG(("[CAL]       rx_cal[2] = %d\n", rx_cal[2]));</div><div class='add'>+		PHY_DEBUG(("[CAL]       rx_cal[3] = %d\n", rx_cal[3]));</div><div class='add'>+</div><div class='add'>+		// e.</div><div class='add'>+		pwr_tone = (iqcal_tone_i*iqcal_tone_i + iqcal_tone_q*iqcal_tone_q);</div><div class='add'>+		pwr_image = (iqcal_image_i*iqcal_image_i + iqcal_image_q*iqcal_image_q)*factor;</div><div class='add'>+</div><div class='add'>+		PHY_DEBUG(("[CAL]    ** pwr_tone  = %d\n", pwr_tone));</div><div class='add'>+		PHY_DEBUG(("[CAL]    ** pwr_image  = %d\n", pwr_image));</div><div class='add'>+</div><div class='add'>+		if (pwr_tone &gt; pwr_image)</div><div class='add'>+		{</div><div class='add'>+			verify_count++;</div><div class='add'>+</div><div class='add'>+			PHY_DEBUG(("[CAL] ** &lt;_rx_iq_calibration_loop&gt; *************\n"));</div><div class='add'>+			PHY_DEBUG(("[CAL] ** VERIFY OK # %d !!\n", verify_count));</div><div class='add'>+			PHY_DEBUG(("[CAL] ******************************************\n"));</div><div class='add'>+</div><div class='add'>+			if (verify_count &gt; 2)</div><div class='add'>+			{</div><div class='add'>+				PHY_DEBUG(("[CAL] ** &lt;_rx_iq_calibration_loop&gt; *********\n"));</div><div class='add'>+				PHY_DEBUG(("[CAL] ** RX_IQ_CALIBRATION OK !!\n"));</div><div class='add'>+				PHY_DEBUG(("[CAL] **************************************\n"));</div><div class='add'>+				return 0;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		// g.</div><div class='add'>+		hw_get_dxx_reg(phw_data, 0x54, &amp;val);</div><div class='add'>+		PHY_DEBUG(("[CAL]    ** 0x54 = 0x%08X\n", val));</div><div class='add'>+</div><div class='add'>+		if (phw_data-&gt;revision == 0x2002) // 1st-cut</div><div class='add'>+		{</div><div class='add'>+			rx_cal_reg[0] = _s4_to_s32((val &amp; 0x0000F000) &gt;&gt; 12);</div><div class='add'>+			rx_cal_reg[1] = _s4_to_s32((val &amp; 0x00000F00) &gt;&gt;  8);</div><div class='add'>+			rx_cal_reg[2] = _s4_to_s32((val &amp; 0x000000F0) &gt;&gt;  4);</div><div class='add'>+			rx_cal_reg[3] = _s4_to_s32((val &amp; 0x0000000F));</div><div class='add'>+		}</div><div class='add'>+		else // 2nd-cut</div><div class='add'>+		{</div><div class='add'>+			rx_cal_reg[0] = _s5_to_s32((val &amp; 0xF8000000) &gt;&gt; 27);</div><div class='add'>+			rx_cal_reg[1] = _s6_to_s32((val &amp; 0x07E00000) &gt;&gt; 21);</div><div class='add'>+			rx_cal_reg[2] = _s6_to_s32((val &amp; 0x001F8000) &gt;&gt; 15);</div><div class='add'>+			rx_cal_reg[3] = _s5_to_s32((val &amp; 0x00007C00) &gt;&gt; 10);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		PHY_DEBUG(("[CAL]    ** rx_cal_reg[0] = %d\n", rx_cal_reg[0]));</div><div class='add'>+		PHY_DEBUG(("[CAL]       rx_cal_reg[1] = %d\n", rx_cal_reg[1]));</div><div class='add'>+		PHY_DEBUG(("[CAL]       rx_cal_reg[2] = %d\n", rx_cal_reg[2]));</div><div class='add'>+		PHY_DEBUG(("[CAL]       rx_cal_reg[3] = %d\n", rx_cal_reg[3]));</div><div class='add'>+</div><div class='add'>+		if (phw_data-&gt;revision == 0x2002) // 1st-cut</div><div class='add'>+		{</div><div class='add'>+			if (((rx_cal_reg[0]==7) || (rx_cal_reg[0]==(-8))) &amp;&amp;</div><div class='add'>+				((rx_cal_reg[3]==7) || (rx_cal_reg[3]==(-8))))</div><div class='add'>+			{</div><div class='add'>+				PHY_DEBUG(("[CAL] ** &lt;_rx_iq_calibration_loop&gt; *********\n"));</div><div class='add'>+				PHY_DEBUG(("[CAL] ** RX_IQ_CALIBRATION SATUATION !!\n"));</div><div class='add'>+				PHY_DEBUG(("[CAL] **************************************\n"));</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		else // 2nd-cut</div><div class='add'>+		{</div><div class='add'>+			if (((rx_cal_reg[0]==31) || (rx_cal_reg[0]==(-32))) &amp;&amp;</div><div class='add'>+				((rx_cal_reg[3]==31) || (rx_cal_reg[3]==(-32))))</div><div class='add'>+			{</div><div class='add'>+				PHY_DEBUG(("[CAL] ** &lt;_rx_iq_calibration_loop&gt; *********\n"));</div><div class='add'>+				PHY_DEBUG(("[CAL] ** RX_IQ_CALIBRATION SATUATION !!\n"));</div><div class='add'>+				PHY_DEBUG(("[CAL] **************************************\n"));</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		rx_cal[0] = rx_cal[0] + rx_cal_reg[0];</div><div class='add'>+		rx_cal[1] = rx_cal[1] + rx_cal_reg[1];</div><div class='add'>+		rx_cal[2] = rx_cal[2] + rx_cal_reg[2];</div><div class='add'>+		rx_cal[3] = rx_cal[3] + rx_cal_reg[3];</div><div class='add'>+		PHY_DEBUG(("[CAL]    ** apply rx_cal[0] = %d\n", rx_cal[0]));</div><div class='add'>+		PHY_DEBUG(("[CAL]       apply rx_cal[1] = %d\n", rx_cal[1]));</div><div class='add'>+		PHY_DEBUG(("[CAL]       apply rx_cal[2] = %d\n", rx_cal[2]));</div><div class='add'>+		PHY_DEBUG(("[CAL]       apply rx_cal[3] = %d\n", rx_cal[3]));</div><div class='add'>+</div><div class='add'>+		hw_get_dxx_reg(phw_data, 0x54, &amp;val);</div><div class='add'>+		if (phw_data-&gt;revision == 0x2002) // 1st-cut</div><div class='add'>+		{</div><div class='add'>+			val &amp;= 0x0000FFFF;</div><div class='add'>+			val |= ((_s32_to_s4(rx_cal[0]) &lt;&lt; 12)|</div><div class='add'>+					(_s32_to_s4(rx_cal[1]) &lt;&lt;  8)|</div><div class='add'>+					(_s32_to_s4(rx_cal[2]) &lt;&lt;  4)|</div><div class='add'>+					(_s32_to_s4(rx_cal[3])));</div><div class='add'>+			hw_set_dxx_reg(phw_data, 0x54, val);</div><div class='add'>+		}</div><div class='add'>+		else // 2nd-cut</div><div class='add'>+		{</div><div class='add'>+			val &amp;= 0x000003FF;</div><div class='add'>+			val |= ((_s32_to_s5(rx_cal[0]) &lt;&lt; 27)|</div><div class='add'>+					(_s32_to_s6(rx_cal[1]) &lt;&lt; 21)|</div><div class='add'>+					(_s32_to_s6(rx_cal[2]) &lt;&lt; 15)|</div><div class='add'>+					(_s32_to_s5(rx_cal[3]) &lt;&lt; 10));</div><div class='add'>+			hw_set_dxx_reg(phw_data, 0x54, val);</div><div class='add'>+</div><div class='add'>+			if( loop == 3 )</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+		PHY_DEBUG(("[CAL]    ** CALIB_DATA = 0x%08X\n", val));</div><div class='add'>+</div><div class='add'>+		loop--;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+//////////////////////////////////////////////////////////</div><div class='add'>+</div><div class='add'>+//////////////////////////////////////////////////////////////////////////</div><div class='add'>+void _rx_iq_calibration_winbond(hw_data_t *phw_data, u32 frequency)</div><div class='add'>+{</div><div class='add'>+// figo 20050523 marked thsi flag for can't compile for relesase</div><div class='add'>+#ifdef _DEBUG</div><div class='add'>+	s32     rx_cal_reg[4];</div><div class='add'>+	u32     val;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	u8      result;</div><div class='add'>+</div><div class='add'>+	PHY_DEBUG(("[CAL] -&gt; [5]_rx_iq_calibration()\n"));</div><div class='add'>+// a. Set RFIC to "RX calibration mode"</div><div class='add'>+	//; ----- Calibration (7). RX path IQ imbalance calibration loop</div><div class='add'>+	//	0x01 0xFFBFC2  ; 3FEFF  ; Calibration (7a). enable RX IQ calibration loop circuits</div><div class='add'>+	phy_set_rf_data(phw_data, 1, (1&lt;&lt;24)|0xEFBFC2);</div><div class='add'>+	//	0x0B 0x1A01D6  ; 06817  ; Calibration (7b). enable RX I/Q cal loop SW1 circuit</div><div class='add'>+	phy_set_rf_data(phw_data, 11, (11&lt;&lt;24)|0x1A05D6);</div><div class='add'>+	//0x05 0x24848A  ; 09212  ; Calibration (7c). setting TX-VGA gain (TXGCH) to 2 --&gt; to be optimized</div><div class='add'>+	phy_set_rf_data(phw_data, 5, (5&lt;&lt;24)| phw_data-&gt;txvga_setting_for_cal);</div><div class='add'>+	//0x06 0x06840C  ; 01A10  ; Calibration (7d). RXGCH=00; RXGCL=010 000 (RXVGA) --&gt; to be optimized</div><div class='add'>+	phy_set_rf_data(phw_data, 6, (6&lt;&lt;24)|0x06834C);</div><div class='add'>+	//0x00 0xFFF1C0  ; 3F7C7  ; Calibration (7e). turn on IQ imbalance/Test mode</div><div class='add'>+	phy_set_rf_data(phw_data, 0, (0&lt;&lt;24)|0xFFF1C0);</div><div class='add'>+</div><div class='add'>+	//  ; [BB-chip]: Calibration (7f). Send test pattern</div><div class='add'>+	//	; [BB-chip]: Calibration (7g). Search RXGCL optimal value</div><div class='add'>+	//	; [BB-chip]: Calibration (7h). Caculate RX-path IQ imbalance and setting RX path IQ compensation table</div><div class='add'>+</div><div class='add'>+	result = _rx_iq_calibration_loop_winbond(phw_data, 12589, frequency);</div><div class='add'>+</div><div class='add'>+	if (result &gt; 0)</div><div class='add'>+	{</div><div class='add'>+		_reset_rx_cal(phw_data);</div><div class='add'>+		result = _rx_iq_calibration_loop_winbond(phw_data, 7943, frequency);</div><div class='add'>+</div><div class='add'>+		if (result &gt; 0)</div><div class='add'>+		{</div><div class='add'>+			_reset_rx_cal(phw_data);</div><div class='add'>+			result = _rx_iq_calibration_loop_winbond(phw_data, 5011, frequency);</div><div class='add'>+</div><div class='add'>+			if (result &gt; 0)</div><div class='add'>+			{</div><div class='add'>+				PHY_DEBUG(("[CAL] ** &lt;_rx_iq_calibration&gt; **************\n"));</div><div class='add'>+				PHY_DEBUG(("[CAL] ** RX_IQ_CALIBRATION FAILURE !!\n"));</div><div class='add'>+				PHY_DEBUG(("[CAL] **************************************\n"));</div><div class='add'>+				_reset_rx_cal(phw_data);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#ifdef _DEBUG</div><div class='add'>+	hw_get_dxx_reg(phw_data, 0x54, &amp;val);</div><div class='add'>+	PHY_DEBUG(("[CAL]    ** 0x54 = 0x%08X\n", val));</div><div class='add'>+</div><div class='add'>+	if (phw_data-&gt;revision == 0x2002) // 1st-cut</div><div class='add'>+	{</div><div class='add'>+		rx_cal_reg[0] = _s4_to_s32((val &amp; 0x0000F000) &gt;&gt; 12);</div><div class='add'>+		rx_cal_reg[1] = _s4_to_s32((val &amp; 0x00000F00) &gt;&gt;  8);</div><div class='add'>+		rx_cal_reg[2] = _s4_to_s32((val &amp; 0x000000F0) &gt;&gt;  4);</div><div class='add'>+		rx_cal_reg[3] = _s4_to_s32((val &amp; 0x0000000F));</div><div class='add'>+	}</div><div class='add'>+	else // 2nd-cut</div><div class='add'>+	{</div><div class='add'>+		rx_cal_reg[0] = _s5_to_s32((val &amp; 0xF8000000) &gt;&gt; 27);</div><div class='add'>+		rx_cal_reg[1] = _s6_to_s32((val &amp; 0x07E00000) &gt;&gt; 21);</div><div class='add'>+		rx_cal_reg[2] = _s6_to_s32((val &amp; 0x001F8000) &gt;&gt; 15);</div><div class='add'>+		rx_cal_reg[3] = _s5_to_s32((val &amp; 0x00007C00) &gt;&gt; 10);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	PHY_DEBUG(("[CAL]    ** rx_cal_reg[0] = %d\n", rx_cal_reg[0]));</div><div class='add'>+	PHY_DEBUG(("[CAL]       rx_cal_reg[1] = %d\n", rx_cal_reg[1]));</div><div class='add'>+	PHY_DEBUG(("[CAL]       rx_cal_reg[2] = %d\n", rx_cal_reg[2]));</div><div class='add'>+	PHY_DEBUG(("[CAL]       rx_cal_reg[3] = %d\n", rx_cal_reg[3]));</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+////////////////////////////////////////////////////////////////////////</div><div class='add'>+void phy_calibration_winbond(hw_data_t *phw_data, u32 frequency)</div><div class='add'>+{</div><div class='add'>+	u32     reg_mode_ctrl;</div><div class='add'>+	u32     iq_alpha;</div><div class='add'>+</div><div class='add'>+	PHY_DEBUG(("[CAL] -&gt; phy_calibration_winbond()\n"));</div><div class='add'>+</div><div class='add'>+	// 20040701 1.1.25.1000 kevin</div><div class='add'>+	hw_get_cxx_reg(phw_data, 0x80, &amp;mac_ctrl);</div><div class='add'>+	hw_get_cxx_reg(phw_data, 0xE4, &amp;rf_ctrl);</div><div class='add'>+	hw_get_dxx_reg(phw_data, 0x58, &amp;iq_alpha);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	_rxadc_dc_offset_cancellation_winbond(phw_data, frequency);</div><div class='add'>+	//_txidac_dc_offset_cancellation_winbond(phw_data);</div><div class='add'>+	//_txqdac_dc_offset_cacellation_winbond(phw_data);</div><div class='add'>+</div><div class='add'>+	_tx_iq_calibration_winbond(phw_data);</div><div class='add'>+	_rx_iq_calibration_winbond(phw_data, frequency);</div><div class='add'>+</div><div class='add'>+	//------------------------------------------------------------------------</div><div class='add'>+	hw_get_dxx_reg(phw_data, REG_MODE_CTRL, &amp;reg_mode_ctrl);</div><div class='add'>+	reg_mode_ctrl &amp;= ~(MASK_IQCAL_TONE_SEL|MASK_IQCAL_MODE|MASK_CALIB_START); // set when finish</div><div class='add'>+	hw_set_dxx_reg(phw_data, REG_MODE_CTRL, reg_mode_ctrl);</div><div class='add'>+	PHY_DEBUG(("[CAL]    MODE_CTRL (write) = 0x%08X\n", reg_mode_ctrl));</div><div class='add'>+</div><div class='add'>+	// i. Set RFIC to "Normal mode"</div><div class='add'>+	hw_set_cxx_reg(phw_data, 0x80, mac_ctrl);</div><div class='add'>+	hw_set_cxx_reg(phw_data, 0xE4, rf_ctrl);</div><div class='add'>+	hw_set_dxx_reg(phw_data, 0x58, iq_alpha);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	//------------------------------------------------------------------------</div><div class='add'>+	phy_init_rf(phw_data);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+//===========================</div><div class='add'>+void phy_set_rf_data(  phw_data_t pHwData,  u32 index,  u32 value )</div><div class='add'>+{</div><div class='add'>+   u32 ltmp=0;</div><div class='add'>+</div><div class='add'>+    switch( pHwData-&gt;phy_type )</div><div class='add'>+	{</div><div class='add'>+		case RF_MAXIM_2825:</div><div class='add'>+		case RF_MAXIM_V1: // 11g Winbond 2nd BB(with Phy board (v1) + Maxim 331)</div><div class='add'>+			ltmp = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (18 &lt;&lt; 24) | BitReverse( value, 18 );</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case RF_MAXIM_2827:</div><div class='add'>+			ltmp = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (18 &lt;&lt; 24) | BitReverse( value, 18 );</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case RF_MAXIM_2828:</div><div class='add'>+			ltmp = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (18 &lt;&lt; 24) | BitReverse( value, 18 );</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case RF_MAXIM_2829:</div><div class='add'>+			ltmp = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (18 &lt;&lt; 24) | BitReverse( value, 18 );</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case RF_AIROHA_2230:</div><div class='add'>+		case RF_AIROHA_2230S: // 20060420 Add this</div><div class='add'>+			ltmp = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (20 &lt;&lt; 24) | BitReverse( value, 20 );</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case RF_AIROHA_7230:</div><div class='add'>+			ltmp = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (24 &lt;&lt; 24) | (value&amp;0xffffff);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case RF_WB_242:</div><div class='add'>+		case RF_WB_242_1: // 20060619.5 Add</div><div class='add'>+			ltmp = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (24 &lt;&lt; 24) | BitReverse( value, 24 );</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	Wb35Reg_WriteSync( pHwData, 0x0864, ltmp );</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+// 20060717 modify as Bruce's mail</div><div class='add'>+unsigned char adjust_TXVGA_for_iq_mag(hw_data_t *phw_data)</div><div class='add'>+{</div><div class='add'>+	int init_txvga = 0;</div><div class='add'>+	u32     reg_mode_ctrl;</div><div class='add'>+	u32     val;</div><div class='add'>+	s32     iqcal_tone_i0;</div><div class='add'>+	s32     iqcal_tone_q0;</div><div class='add'>+	u32     sqsum;</div><div class='add'>+	s32     iq_mag_0_tx;</div><div class='add'>+	u8		reg_state;</div><div class='add'>+	int		current_txvga;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	reg_state = 0;</div><div class='add'>+	for( init_txvga=0; init_txvga&lt;10; init_txvga++)</div><div class='add'>+	{</div><div class='add'>+		current_txvga = ( 0x24C40A|(init_txvga&lt;&lt;6) );</div><div class='add'>+		phy_set_rf_data(phw_data, 5, ((5&lt;&lt;24)|current_txvga) );</div><div class='add'>+		phw_data-&gt;txvga_setting_for_cal = current_txvga;</div><div class='add'>+</div><div class='add'>+		//pa_stall_execution(30000);//Sleep(30);</div><div class='add'>+		OS_SLEEP(30000); // 20060612.1.a</div><div class='add'>+</div><div class='add'>+		if( !hw_get_dxx_reg(phw_data, REG_MODE_CTRL, &amp;reg_mode_ctrl) ) // 20060718.1 modify</div><div class='add'>+			return FALSE;</div><div class='add'>+</div><div class='add'>+		PHY_DEBUG(("[CAL]    MODE_CTRL (read) = 0x%08X\n", reg_mode_ctrl));</div><div class='add'>+</div><div class='add'>+		// a. Set iqcal_mode[1:0] to 0x2 and set "calib_start" to 0x1 to</div><div class='add'>+		//    enable "IQ alibration Mode II"</div><div class='add'>+		reg_mode_ctrl &amp;= ~(MASK_IQCAL_TONE_SEL|MASK_IQCAL_MODE);</div><div class='add'>+		reg_mode_ctrl &amp;= ~MASK_IQCAL_MODE;</div><div class='add'>+		reg_mode_ctrl |= (MASK_CALIB_START|0x02);</div><div class='add'>+		reg_mode_ctrl |= (MASK_CALIB_START|0x02|2&lt;&lt;2);</div><div class='add'>+		hw_set_dxx_reg(phw_data, REG_MODE_CTRL, reg_mode_ctrl);</div><div class='add'>+		PHY_DEBUG(("[CAL]    MODE_CTRL (write) = 0x%08X\n", reg_mode_ctrl));</div><div class='add'>+</div><div class='add'>+		//pa_stall_execution(US);</div><div class='add'>+		OS_SLEEP(1); // 20060612.1.a</div><div class='add'>+</div><div class='add'>+		//pa_stall_execution(300);//Sleep(30);</div><div class='add'>+		OS_SLEEP(300); // 20060612.1.a</div><div class='add'>+</div><div class='add'>+		// b.</div><div class='add'>+		hw_get_dxx_reg(phw_data, REG_CALIB_READ1, &amp;val);</div><div class='add'>+</div><div class='add'>+		PHY_DEBUG(("[CAL]    CALIB_READ1 = 0x%08X\n", val));</div><div class='add'>+		//pa_stall_execution(US);</div><div class='add'>+		//pa_stall_execution(300);//Sleep(30);</div><div class='add'>+		OS_SLEEP(300); // 20060612.1.a</div><div class='add'>+</div><div class='add'>+		iqcal_tone_i0 = _s13_to_s32(val &amp; 0x00001FFF);</div><div class='add'>+		iqcal_tone_q0 = _s13_to_s32((val &amp; 0x03FFE000) &gt;&gt; 13);</div><div class='add'>+		PHY_DEBUG(("[CAL]    ** iqcal_tone_i0=%d, iqcal_tone_q0=%d\n",</div><div class='add'>+				   iqcal_tone_i0, iqcal_tone_q0));</div><div class='add'>+</div><div class='add'>+		sqsum = iqcal_tone_i0*iqcal_tone_i0 + iqcal_tone_q0*iqcal_tone_q0;</div><div class='add'>+		iq_mag_0_tx = (s32) _sqrt(sqsum);</div><div class='add'>+		PHY_DEBUG(("[CAL]    ** auto_adjust_txvga_for_iq_mag_0_tx=%d\n", iq_mag_0_tx));</div><div class='add'>+</div><div class='add'>+		if( iq_mag_0_tx&gt;=700 &amp;&amp; iq_mag_0_tx&lt;=1750 )</div><div class='add'>+			break;</div><div class='add'>+		else if(iq_mag_0_tx &gt; 1750)</div><div class='add'>+		{</div><div class='add'>+			init_txvga=-2;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		else</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if( iq_mag_0_tx&gt;=700 &amp;&amp; iq_mag_0_tx&lt;=1750 )</div><div class='add'>+		return TRUE;</div><div class='add'>+	else</div><div class='add'>+		return FALSE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='head'>diff --git a/drivers/staging/winbond/phy_calibration.h b/drivers/staging/winbond/phy_calibration.h<br/>new file mode 100644<br/>index 000000000000..b6a65d313019<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/winbond/phy_calibration.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/phy_calibration.h</a></div><div class='hunk'>@@ -0,0 +1,101 @@</div><div class='add'>+// 20031229 Turbo add</div><div class='add'>+#define REG_AGC_CTRL1               0x1000</div><div class='add'>+#define REG_AGC_CTRL2               0x1004</div><div class='add'>+#define REG_AGC_CTRL3               0x1008</div><div class='add'>+#define REG_AGC_CTRL4               0x100C</div><div class='add'>+#define REG_AGC_CTRL5               0x1010</div><div class='add'>+#define REG_AGC_CTRL6               0x1014</div><div class='add'>+#define REG_AGC_CTRL7               0x1018</div><div class='add'>+#define REG_AGC_CTRL8               0x101C</div><div class='add'>+#define REG_AGC_CTRL9               0x1020</div><div class='add'>+#define REG_AGC_CTRL10              0x1024</div><div class='add'>+#define REG_CCA_CTRL                0x1028</div><div class='add'>+#define REG_A_ACQ_CTRL              0x102C</div><div class='add'>+#define REG_B_ACQ_CTRL              0x1030</div><div class='add'>+#define REG_A_TXRX_CTRL             0x1034</div><div class='add'>+#define REG_B_TXRX_CTRL             0x1038</div><div class='add'>+#define REG_A_TX_COEF3              0x103C</div><div class='add'>+#define REG_A_TX_COEF2              0x1040</div><div class='add'>+#define REG_A_TX_COEF1              0x1044</div><div class='add'>+#define REG_B_TX_COEF2              0x1048</div><div class='add'>+#define REG_B_TX_COEF1              0x104C</div><div class='add'>+#define REG_MODE_CTRL               0x1050</div><div class='add'>+#define REG_CALIB_DATA              0x1054</div><div class='add'>+#define REG_IQ_ALPHA                0x1058</div><div class='add'>+#define REG_DC_CANCEL               0x105C</div><div class='add'>+#define REG_WTO_READ                0x1060</div><div class='add'>+#define REG_OFFSET_READ             0x1064</div><div class='add'>+#define REG_CALIB_READ1             0x1068</div><div class='add'>+#define REG_CALIB_READ2             0x106C</div><div class='add'>+#define REG_A_FREQ_EST              0x1070</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+//  20031101 Turbo add</div><div class='add'>+#define MASK_AMER_OFF_REG          BIT(31)</div><div class='add'>+</div><div class='add'>+#define MASK_BMER_OFF_REG          BIT(31)</div><div class='add'>+</div><div class='add'>+#define MASK_LNA_FIX_GAIN          (BIT(3)|BIT(4))</div><div class='add'>+#define MASK_AGC_FIX               BIT(1)</div><div class='add'>+</div><div class='add'>+#define MASK_AGC_FIX_GAIN          0xFF00</div><div class='add'>+</div><div class='add'>+#define MASK_ADC_DC_CAL_STR        BIT(10)</div><div class='add'>+#define MASK_CALIB_START           BIT(4)</div><div class='add'>+#define MASK_IQCAL_TONE_SEL        (BIT(3)|BIT(2))</div><div class='add'>+#define MASK_IQCAL_MODE            (BIT(1)|BIT(0))</div><div class='add'>+</div><div class='add'>+#define MASK_TX_CAL_0              0xF0000000</div><div class='add'>+#define TX_CAL_0_SHIFT             28</div><div class='add'>+#define MASK_TX_CAL_1              0x0F000000</div><div class='add'>+#define TX_CAL_1_SHIFT             24</div><div class='add'>+#define MASK_TX_CAL_2              0x00F00000</div><div class='add'>+#define TX_CAL_2_SHIFT             20</div><div class='add'>+#define MASK_TX_CAL_3              0x000F0000</div><div class='add'>+#define TX_CAL_3_SHIFT             16</div><div class='add'>+#define MASK_RX_CAL_0              0x0000F000</div><div class='add'>+#define RX_CAL_0_SHIFT             12</div><div class='add'>+#define MASK_RX_CAL_1              0x00000F00</div><div class='add'>+#define RX_CAL_1_SHIFT             8</div><div class='add'>+#define MASK_RX_CAL_2              0x000000F0</div><div class='add'>+#define RX_CAL_2_SHIFT             4</div><div class='add'>+#define MASK_RX_CAL_3              0x0000000F</div><div class='add'>+#define RX_CAL_3_SHIFT             0</div><div class='add'>+</div><div class='add'>+#define MASK_CANCEL_DC_I           0x3E0</div><div class='add'>+#define CANCEL_DC_I_SHIFT          5</div><div class='add'>+#define MASK_CANCEL_DC_Q           0x01F</div><div class='add'>+#define CANCEL_DC_Q_SHIFT          0</div><div class='add'>+</div><div class='add'>+// LA20040210 kevin</div><div class='add'>+//#define MASK_ADC_DC_CAL_I(x)       (((x)&amp;0x1FE00)&gt;&gt;9)</div><div class='add'>+//#define MASK_ADC_DC_CAL_Q(x)       ((x)&amp;0x1FF)</div><div class='add'>+#define MASK_ADC_DC_CAL_I(x)       (((x)&amp;0x0003FE00)&gt;&gt;9)</div><div class='add'>+#define MASK_ADC_DC_CAL_Q(x)       ((x)&amp;0x000001FF)</div><div class='add'>+</div><div class='add'>+// LA20040210 kevin (Turbo has wrong definition)</div><div class='add'>+//#define MASK_IQCAL_TONE_I          0x7FFC000</div><div class='add'>+//#define SHIFT_IQCAL_TONE_I(x)      ((x)&gt;&gt;13)</div><div class='add'>+//#define MASK_IQCAL_TONE_Q          0x1FFF</div><div class='add'>+//#define SHIFT_IQCAL_TONE_Q(x)      ((x)&gt;&gt;0)</div><div class='add'>+#define MASK_IQCAL_TONE_I          0x00001FFF</div><div class='add'>+#define SHIFT_IQCAL_TONE_I(x)      ((x)&gt;&gt;0)</div><div class='add'>+#define MASK_IQCAL_TONE_Q          0x03FFE000</div><div class='add'>+#define SHIFT_IQCAL_TONE_Q(x)      ((x)&gt;&gt;13)</div><div class='add'>+</div><div class='add'>+// LA20040210 kevin (Turbo has wrong definition)</div><div class='add'>+//#define MASK_IQCAL_IMAGE_I         0x7FFC000</div><div class='add'>+//#define SHIFT_IQCAL_IMAGE_I(x)     ((x)&gt;&gt;13)</div><div class='add'>+//#define MASK_IQCAL_IMAGE_Q         0x1FFF</div><div class='add'>+//#define SHIFT_IQCAL_IMAGE_Q(x)     ((x)&gt;&gt;0)</div><div class='add'>+</div><div class='add'>+//#define MASK_IQCAL_IMAGE_I         0x00001FFF</div><div class='add'>+//#define SHIFT_IQCAL_IMAGE_I(x)     ((x)&gt;&gt;0)</div><div class='add'>+//#define MASK_IQCAL_IMAGE_Q         0x03FFE000</div><div class='add'>+//#define SHIFT_IQCAL_IMAGE_Q(x)     ((x)&gt;&gt;13)</div><div class='add'>+</div><div class='add'>+void phy_set_rf_data(  phw_data_t pHwData,  u32 index,  u32 value );</div><div class='add'>+#define phy_init_rf( _A )	//RFSynthesizer_initial( _A )</div><div class='add'>+</div><div class='head'>diff --git a/drivers/staging/winbond/reg.c b/drivers/staging/winbond/reg.c<br/>new file mode 100644<br/>index 000000000000..b475c7a7c424<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/winbond/reg.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/reg.c</a></div><div class='hunk'>@@ -0,0 +1,2683 @@</div><div class='add'>+#include "os_common.h"</div><div class='add'>+</div><div class='add'>+///////////////////////////////////////////////////////////////////////////////////////////////////</div><div class='add'>+// Original Phy.h</div><div class='add'>+//*****************************************************************************</div><div class='add'>+</div><div class='add'>+/*****************************************************************************</div><div class='add'>+; For MAXIM2825/6/7 Ver. 331 or more</div><div class='add'>+; Edited by Tiger, Sep-17-2003</div><div class='add'>+; revised by Ben, Sep-18-2003</div><div class='add'>+</div><div class='add'>+0x00 0x000a2</div><div class='add'>+0x01 0x21cc0</div><div class='add'>+;0x02 0x13802</div><div class='add'>+0x02 0x1383a</div><div class='add'>+</div><div class='add'>+;channe1 01 ; 0x03 0x30142 ; 0x04 0x0b333;</div><div class='add'>+;channe1 02 ;0x03 0x32141 ;0x04 0x08444;</div><div class='add'>+;channe1 03 ;0x03 0x32143 ;0x04 0x0aeee;</div><div class='add'>+;channe1 04 ;0x03 0x32142 ;0x04 0x0b333;</div><div class='add'>+;channe1 05 ;0x03 0x31141 ;0x04 0x08444;</div><div class='add'>+;channe1 06 ;</div><div class='add'>+0x03 0x31143;</div><div class='add'>+0x04 0x0aeee;</div><div class='add'>+;channe1 07 ;0x03 0x31142 ;0x04 0x0b333;</div><div class='add'>+;channe1 08 ;0x03 0x33141 ;0x04 0x08444;</div><div class='add'>+;channe1 09 ;0x03 0x33143 ;0x04 0x0aeee;</div><div class='add'>+;channe1 10 ;0x03 0x33142 ;0x04 0x0b333;</div><div class='add'>+;channe1 11 ;0x03 0x30941 ;0x04 0x08444;</div><div class='add'>+;channe1 12 ;0x03 0x30943 ;0x04 0x0aeee;</div><div class='add'>+;channe1 13 ;0x03 0x30942 ;0x04 0x0b333;</div><div class='add'>+</div><div class='add'>+0x05 0x28986</div><div class='add'>+0x06 0x18008</div><div class='add'>+0x07 0x38400</div><div class='add'>+0x08 0x05100; 100 Hz DC</div><div class='add'>+;0x08 0x05900; 30 KHz DC</div><div class='add'>+0x09 0x24f08</div><div class='add'>+0x0a 0x17e00, 0x17ea0</div><div class='add'>+0x0b 0x37d80</div><div class='add'>+0x0c 0x0c900 // 0x0ca00 (lager power 9db than 0x0c000), 0x0c000</div><div class='add'>+*****************************************************************************/</div><div class='add'>+// MAX2825 (pure b/g)</div><div class='add'>+u32 max2825_rf_data[] =</div><div class='add'>+{</div><div class='add'>+    (0x00&lt;&lt;18)|0x000a2,</div><div class='add'>+    (0x01&lt;&lt;18)|0x21cc0,</div><div class='add'>+    (0x02&lt;&lt;18)|0x13806,</div><div class='add'>+    (0x03&lt;&lt;18)|0x30142,</div><div class='add'>+    (0x04&lt;&lt;18)|0x0b333,</div><div class='add'>+    (0x05&lt;&lt;18)|0x289A6,</div><div class='add'>+    (0x06&lt;&lt;18)|0x18008,</div><div class='add'>+    (0x07&lt;&lt;18)|0x38000,</div><div class='add'>+    (0x08&lt;&lt;18)|0x05100,</div><div class='add'>+    (0x09&lt;&lt;18)|0x24f08,</div><div class='add'>+    (0x0A&lt;&lt;18)|0x14000,</div><div class='add'>+    (0x0B&lt;&lt;18)|0x37d80,</div><div class='add'>+    (0x0C&lt;&lt;18)|0x0c100   // 11a: 0x0c300, 11g: 0x0c100</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+u32 max2825_channel_data_24[][3] =</div><div class='add'>+{</div><div class='add'>+    {(0x03&lt;&lt;18)|0x30142, (0x04&lt;&lt;18)|0x0b333, (0x05&lt;&lt;18)|0x289A6}, // channe1 01</div><div class='add'>+    {(0x03&lt;&lt;18)|0x32141, (0x04&lt;&lt;18)|0x08444, (0x05&lt;&lt;18)|0x289A6}, // channe1 02</div><div class='add'>+    {(0x03&lt;&lt;18)|0x32143, (0x04&lt;&lt;18)|0x0aeee, (0x05&lt;&lt;18)|0x289A6}, // channe1 03</div><div class='add'>+    {(0x03&lt;&lt;18)|0x32142, (0x04&lt;&lt;18)|0x0b333, (0x05&lt;&lt;18)|0x289A6}, // channe1 04</div><div class='add'>+    {(0x03&lt;&lt;18)|0x31141, (0x04&lt;&lt;18)|0x08444, (0x05&lt;&lt;18)|0x289A6}, // channe1 05</div><div class='add'>+    {(0x03&lt;&lt;18)|0x31143, (0x04&lt;&lt;18)|0x0aeee, (0x05&lt;&lt;18)|0x289A6}, // channe1 06</div><div class='add'>+    {(0x03&lt;&lt;18)|0x31142, (0x04&lt;&lt;18)|0x0b333, (0x05&lt;&lt;18)|0x289A6}, // channe1 07</div><div class='add'>+    {(0x03&lt;&lt;18)|0x33141, (0x04&lt;&lt;18)|0x08444, (0x05&lt;&lt;18)|0x289A6}, // channe1 08</div><div class='add'>+    {(0x03&lt;&lt;18)|0x33143, (0x04&lt;&lt;18)|0x0aeee, (0x05&lt;&lt;18)|0x289A6}, // channe1 09</div><div class='add'>+    {(0x03&lt;&lt;18)|0x33142, (0x04&lt;&lt;18)|0x0b333, (0x05&lt;&lt;18)|0x289A6}, // channe1 10</div><div class='add'>+    {(0x03&lt;&lt;18)|0x30941, (0x04&lt;&lt;18)|0x08444, (0x05&lt;&lt;18)|0x289A6}, // channe1 11</div><div class='add'>+    {(0x03&lt;&lt;18)|0x30943, (0x04&lt;&lt;18)|0x0aeee, (0x05&lt;&lt;18)|0x289A6}, // channe1 12</div><div class='add'>+    {(0x03&lt;&lt;18)|0x30942, (0x04&lt;&lt;18)|0x0b333, (0x05&lt;&lt;18)|0x289A6}, // channe1 13</div><div class='add'>+    {(0x03&lt;&lt;18)|0x32941, (0x04&lt;&lt;18)|0x09999, (0x05&lt;&lt;18)|0x289A6} // 14 (2484MHz) hhmodify</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+u32 max2825_power_data_24[] = {(0x0C&lt;&lt;18)|0x0c000, (0x0C&lt;&lt;18)|0x0c100};</div><div class='add'>+</div><div class='add'>+/****************************************************************************/</div><div class='add'>+// MAX2827 (a/b/g)</div><div class='add'>+u32 max2827_rf_data[] =</div><div class='add'>+{</div><div class='add'>+    (0x00&lt;&lt;18)|0x000a2,</div><div class='add'>+    (0x01&lt;&lt;18)|0x21cc0,</div><div class='add'>+    (0x02&lt;&lt;18)|0x13806,</div><div class='add'>+    (0x03&lt;&lt;18)|0x30142,</div><div class='add'>+    (0x04&lt;&lt;18)|0x0b333,</div><div class='add'>+    (0x05&lt;&lt;18)|0x289A6,</div><div class='add'>+    (0x06&lt;&lt;18)|0x18008,</div><div class='add'>+    (0x07&lt;&lt;18)|0x38000,</div><div class='add'>+    (0x08&lt;&lt;18)|0x05100,</div><div class='add'>+    (0x09&lt;&lt;18)|0x24f08,</div><div class='add'>+    (0x0A&lt;&lt;18)|0x14000,</div><div class='add'>+    (0x0B&lt;&lt;18)|0x37d80,</div><div class='add'>+    (0x0C&lt;&lt;18)|0x0c100   // 11a: 0x0c300, 11g: 0x0c100</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+u32 max2827_channel_data_24[][3] =</div><div class='add'>+{</div><div class='add'>+    {(0x03&lt;&lt;18)|0x30142, (0x04&lt;&lt;18)|0x0b333, (0x05&lt;&lt;18)|0x289A6}, // channe1 01</div><div class='add'>+    {(0x03&lt;&lt;18)|0x32141, (0x04&lt;&lt;18)|0x08444, (0x05&lt;&lt;18)|0x289A6}, // channe1 02</div><div class='add'>+    {(0x03&lt;&lt;18)|0x32143, (0x04&lt;&lt;18)|0x0aeee, (0x05&lt;&lt;18)|0x289A6}, // channe1 03</div><div class='add'>+    {(0x03&lt;&lt;18)|0x32142, (0x04&lt;&lt;18)|0x0b333, (0x05&lt;&lt;18)|0x289A6}, // channe1 04</div><div class='add'>+    {(0x03&lt;&lt;18)|0x31141, (0x04&lt;&lt;18)|0x08444, (0x05&lt;&lt;18)|0x289A6}, // channe1 05</div><div class='add'>+    {(0x03&lt;&lt;18)|0x31143, (0x04&lt;&lt;18)|0x0aeee, (0x05&lt;&lt;18)|0x289A6}, // channe1 06</div><div class='add'>+    {(0x03&lt;&lt;18)|0x31142, (0x04&lt;&lt;18)|0x0b333, (0x05&lt;&lt;18)|0x289A6}, // channe1 07</div><div class='add'>+    {(0x03&lt;&lt;18)|0x33141, (0x04&lt;&lt;18)|0x08444, (0x05&lt;&lt;18)|0x289A6}, // channe1 08</div><div class='add'>+    {(0x03&lt;&lt;18)|0x33143, (0x04&lt;&lt;18)|0x0aeee, (0x05&lt;&lt;18)|0x289A6}, // channe1 09</div><div class='add'>+    {(0x03&lt;&lt;18)|0x33142, (0x04&lt;&lt;18)|0x0b333, (0x05&lt;&lt;18)|0x289A6}, // channe1 10</div><div class='add'>+    {(0x03&lt;&lt;18)|0x30941, (0x04&lt;&lt;18)|0x08444, (0x05&lt;&lt;18)|0x289A6}, // channe1 11</div><div class='add'>+    {(0x03&lt;&lt;18)|0x30943, (0x04&lt;&lt;18)|0x0aeee, (0x05&lt;&lt;18)|0x289A6}, // channe1 12</div><div class='add'>+    {(0x03&lt;&lt;18)|0x30942, (0x04&lt;&lt;18)|0x0b333, (0x05&lt;&lt;18)|0x289A6}, // channe1 13</div><div class='add'>+    {(0x03&lt;&lt;18)|0x32941, (0x04&lt;&lt;18)|0x09999, (0x05&lt;&lt;18)|0x289A6}  // 14 (2484MHz) hhmodify</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+u32 max2827_channel_data_50[][3] =</div><div class='add'>+{</div><div class='add'>+    {(0x03&lt;&lt;18)|0x33cc3, (0x04&lt;&lt;18)|0x08ccc, (0x05&lt;&lt;18)|0x2A9A6}, // channel 36</div><div class='add'>+    {(0x03&lt;&lt;18)|0x302c0, (0x04&lt;&lt;18)|0x08000, (0x05&lt;&lt;18)|0x2A9A6}, // channel 40</div><div class='add'>+    {(0x03&lt;&lt;18)|0x302c2, (0x04&lt;&lt;18)|0x0b333, (0x05&lt;&lt;18)|0x2A9A6}, // channel 44</div><div class='add'>+    {(0x03&lt;&lt;18)|0x322c1, (0x04&lt;&lt;18)|0x09999, (0x05&lt;&lt;18)|0x2A9A6}, // channel 48</div><div class='add'>+    {(0x03&lt;&lt;18)|0x312c1, (0x04&lt;&lt;18)|0x0a666, (0x05&lt;&lt;18)|0x2A9A6}, // channel 52</div><div class='add'>+    {(0x03&lt;&lt;18)|0x332c3, (0x04&lt;&lt;18)|0x08ccc, (0x05&lt;&lt;18)|0x2A9A6}, // channel 56</div><div class='add'>+    {(0x03&lt;&lt;18)|0x30ac0, (0x04&lt;&lt;18)|0x08000, (0x05&lt;&lt;18)|0x2A9A6}, // channel 60</div><div class='add'>+    {(0x03&lt;&lt;18)|0x30ac2, (0x04&lt;&lt;18)|0x0b333, (0x05&lt;&lt;18)|0x2A9A6} // channel 64</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+u32 max2827_power_data_24[] = {(0x0C&lt;&lt;18)|0x0C000, (0x0C&lt;&lt;18)|0x0D600, (0x0C&lt;&lt;18)|0x0C100};</div><div class='add'>+u32 max2827_power_data_50[] = {(0x0C&lt;&lt;18)|0x0C400, (0x0C&lt;&lt;18)|0x0D500, (0x0C&lt;&lt;18)|0x0C300};</div><div class='add'>+</div><div class='add'>+/****************************************************************************/</div><div class='add'>+// MAX2828 (a/b/g)</div><div class='add'>+u32 max2828_rf_data[] =</div><div class='add'>+{</div><div class='add'>+    (0x00&lt;&lt;18)|0x000a2,</div><div class='add'>+    (0x01&lt;&lt;18)|0x21cc0,</div><div class='add'>+    (0x02&lt;&lt;18)|0x13806,</div><div class='add'>+    (0x03&lt;&lt;18)|0x30142,</div><div class='add'>+    (0x04&lt;&lt;18)|0x0b333,</div><div class='add'>+    (0x05&lt;&lt;18)|0x289A6,</div><div class='add'>+    (0x06&lt;&lt;18)|0x18008,</div><div class='add'>+    (0x07&lt;&lt;18)|0x38000,</div><div class='add'>+    (0x08&lt;&lt;18)|0x05100,</div><div class='add'>+    (0x09&lt;&lt;18)|0x24f08,</div><div class='add'>+    (0x0A&lt;&lt;18)|0x14000,</div><div class='add'>+    (0x0B&lt;&lt;18)|0x37d80,</div><div class='add'>+    (0x0C&lt;&lt;18)|0x0c100   // 11a: 0x0c300, 11g: 0x0c100</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+u32 max2828_channel_data_24[][3] =</div><div class='add'>+{</div><div class='add'>+    {(0x03&lt;&lt;18)|0x30142, (0x04&lt;&lt;18)|0x0b333, (0x05&lt;&lt;18)|0x289A6}, // channe1 01</div><div class='add'>+    {(0x03&lt;&lt;18)|0x32141, (0x04&lt;&lt;18)|0x08444, (0x05&lt;&lt;18)|0x289A6}, // channe1 02</div><div class='add'>+    {(0x03&lt;&lt;18)|0x32143, (0x04&lt;&lt;18)|0x0aeee, (0x05&lt;&lt;18)|0x289A6}, // channe1 03</div><div class='add'>+    {(0x03&lt;&lt;18)|0x32142, (0x04&lt;&lt;18)|0x0b333, (0x05&lt;&lt;18)|0x289A6}, // channe1 04</div><div class='add'>+    {(0x03&lt;&lt;18)|0x31141, (0x04&lt;&lt;18)|0x08444, (0x05&lt;&lt;18)|0x289A6}, // channe1 05</div><div class='add'>+    {(0x03&lt;&lt;18)|0x31143, (0x04&lt;&lt;18)|0x0aeee, (0x05&lt;&lt;18)|0x289A6}, // channe1 06</div><div class='add'>+    {(0x03&lt;&lt;18)|0x31142, (0x04&lt;&lt;18)|0x0b333, (0x05&lt;&lt;18)|0x289A6}, // channe1 07</div><div class='add'>+    {(0x03&lt;&lt;18)|0x33141, (0x04&lt;&lt;18)|0x08444, (0x05&lt;&lt;18)|0x289A6}, // channe1 08</div><div class='add'>+    {(0x03&lt;&lt;18)|0x33143, (0x04&lt;&lt;18)|0x0aeee, (0x05&lt;&lt;18)|0x289A6}, // channe1 09</div><div class='add'>+    {(0x03&lt;&lt;18)|0x33142, (0x04&lt;&lt;18)|0x0b333, (0x05&lt;&lt;18)|0x289A6}, // channe1 10</div><div class='add'>+    {(0x03&lt;&lt;18)|0x30941, (0x04&lt;&lt;18)|0x08444, (0x05&lt;&lt;18)|0x289A6}, // channe1 11</div><div class='add'>+    {(0x03&lt;&lt;18)|0x30943, (0x04&lt;&lt;18)|0x0aeee, (0x05&lt;&lt;18)|0x289A6}, // channe1 12</div><div class='add'>+    {(0x03&lt;&lt;18)|0x30942, (0x04&lt;&lt;18)|0x0b333, (0x05&lt;&lt;18)|0x289A6}, // channe1 13</div><div class='add'>+    {(0x03&lt;&lt;18)|0x32941, (0x04&lt;&lt;18)|0x09999, (0x05&lt;&lt;18)|0x289A6}  // 14 (2484MHz) hhmodify</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+u32 max2828_channel_data_50[][3] =</div><div class='add'>+{</div><div class='add'>+    {(0x03&lt;&lt;18)|0x33cc3, (0x04&lt;&lt;18)|0x08ccc, (0x05&lt;&lt;18)|0x289A6}, // channel 36</div><div class='add'>+    {(0x03&lt;&lt;18)|0x302c0, (0x04&lt;&lt;18)|0x08000, (0x05&lt;&lt;18)|0x289A6}, // channel 40</div><div class='add'>+    {(0x03&lt;&lt;18)|0x302c2, (0x04&lt;&lt;18)|0x0b333, (0x05&lt;&lt;18)|0x289A6}, // channel 44</div><div class='add'>+    {(0x03&lt;&lt;18)|0x322c1, (0x04&lt;&lt;18)|0x09999, (0x05&lt;&lt;18)|0x289A6}, // channel 48</div><div class='add'>+    {(0x03&lt;&lt;18)|0x312c1, (0x04&lt;&lt;18)|0x0a666, (0x05&lt;&lt;18)|0x289A6}, // channel 52</div><div class='add'>+    {(0x03&lt;&lt;18)|0x332c3, (0x04&lt;&lt;18)|0x08ccc, (0x05&lt;&lt;18)|0x289A6}, // channel 56</div><div class='add'>+    {(0x03&lt;&lt;18)|0x30ac0, (0x04&lt;&lt;18)|0x08000, (0x05&lt;&lt;18)|0x289A6}, // channel 60</div><div class='add'>+    {(0x03&lt;&lt;18)|0x30ac2, (0x04&lt;&lt;18)|0x0b333, (0x05&lt;&lt;18)|0x289A6} // channel 64</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+u32 max2828_power_data_24[] = {(0x0C&lt;&lt;18)|0x0c000, (0x0C&lt;&lt;18)|0x0c100};</div><div class='add'>+u32 max2828_power_data_50[] = {(0x0C&lt;&lt;18)|0x0c000, (0x0C&lt;&lt;18)|0x0c100};</div><div class='add'>+</div><div class='add'>+/****************************************************************************/</div><div class='add'>+// LA20040728 kevin</div><div class='add'>+// MAX2829 (a/b/g)</div><div class='add'>+u32 max2829_rf_data[] =</div><div class='add'>+{</div><div class='add'>+    (0x00&lt;&lt;18)|0x000a2,</div><div class='add'>+    (0x01&lt;&lt;18)|0x23520,</div><div class='add'>+    (0x02&lt;&lt;18)|0x13802,</div><div class='add'>+    (0x03&lt;&lt;18)|0x30142,</div><div class='add'>+    (0x04&lt;&lt;18)|0x0b333,</div><div class='add'>+    (0x05&lt;&lt;18)|0x28906,</div><div class='add'>+    (0x06&lt;&lt;18)|0x18008,</div><div class='add'>+    (0x07&lt;&lt;18)|0x3B500,</div><div class='add'>+    (0x08&lt;&lt;18)|0x05100,</div><div class='add'>+    (0x09&lt;&lt;18)|0x24f08,</div><div class='add'>+    (0x0A&lt;&lt;18)|0x14000,</div><div class='add'>+    (0x0B&lt;&lt;18)|0x37d80,</div><div class='add'>+    (0x0C&lt;&lt;18)|0x0F300 //TXVGA=51, (MAX-6 dB)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+u32 max2829_channel_data_24[][3] =</div><div class='add'>+{</div><div class='add'>+    {(3&lt;&lt;18)|0x30142, (4&lt;&lt;18)|0x0b333, (5&lt;&lt;18)|0x289C6},  // 01 (2412MHz)</div><div class='add'>+    {(3&lt;&lt;18)|0x32141, (4&lt;&lt;18)|0x08444, (5&lt;&lt;18)|0x289C6},  // 02 (2417MHz)</div><div class='add'>+    {(3&lt;&lt;18)|0x32143, (4&lt;&lt;18)|0x0aeee, (5&lt;&lt;18)|0x289C6},  // 03 (2422MHz)</div><div class='add'>+    {(3&lt;&lt;18)|0x32142, (4&lt;&lt;18)|0x0b333, (5&lt;&lt;18)|0x289C6},  // 04 (2427MHz)</div><div class='add'>+    {(3&lt;&lt;18)|0x31141, (4&lt;&lt;18)|0x08444, (5&lt;&lt;18)|0x289C6},  // 05 (2432MHz)</div><div class='add'>+    {(3&lt;&lt;18)|0x31143, (4&lt;&lt;18)|0x0aeee, (5&lt;&lt;18)|0x289C6},  // 06 (2437MHz)</div><div class='add'>+    {(3&lt;&lt;18)|0x31142, (4&lt;&lt;18)|0x0b333, (5&lt;&lt;18)|0x289C6},  // 07 (2442MHz)</div><div class='add'>+    {(3&lt;&lt;18)|0x33141, (4&lt;&lt;18)|0x08444, (5&lt;&lt;18)|0x289C6},  // 08 (2447MHz)</div><div class='add'>+    {(3&lt;&lt;18)|0x33143, (4&lt;&lt;18)|0x0aeee, (5&lt;&lt;18)|0x289C6},  // 09 (2452MHz)</div><div class='add'>+    {(3&lt;&lt;18)|0x33142, (4&lt;&lt;18)|0x0b333, (5&lt;&lt;18)|0x289C6},  // 10 (2457MHz)</div><div class='add'>+    {(3&lt;&lt;18)|0x30941, (4&lt;&lt;18)|0x08444, (5&lt;&lt;18)|0x289C6},  // 11 (2462MHz)</div><div class='add'>+    {(3&lt;&lt;18)|0x30943, (4&lt;&lt;18)|0x0aeee, (5&lt;&lt;18)|0x289C6},  // 12 (2467MHz)</div><div class='add'>+    {(3&lt;&lt;18)|0x30942, (4&lt;&lt;18)|0x0b333, (5&lt;&lt;18)|0x289C6},  // 13 (2472MHz)</div><div class='add'>+    {(3&lt;&lt;18)|0x32941, (4&lt;&lt;18)|0x09999, (5&lt;&lt;18)|0x289C6},  // 14 (2484MHz) hh-modify</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+u32 max2829_channel_data_50[][4] =</div><div class='add'>+{</div><div class='add'>+     {36, (3&lt;&lt;18)|0x33cc3, (4&lt;&lt;18)|0x08ccc, (5&lt;&lt;18)|0x2A946}, // 36 (5.180GHz)</div><div class='add'>+     {40, (3&lt;&lt;18)|0x302c0, (4&lt;&lt;18)|0x08000, (5&lt;&lt;18)|0x2A946}, // 40 (5.200GHz)</div><div class='add'>+     {44, (3&lt;&lt;18)|0x302c2, (4&lt;&lt;18)|0x0b333, (5&lt;&lt;18)|0x2A946}, // 44 (5.220GHz)</div><div class='add'>+     {48, (3&lt;&lt;18)|0x322c1, (4&lt;&lt;18)|0x09999, (5&lt;&lt;18)|0x2A946}, // 48 (5.240GHz)</div><div class='add'>+     {52, (3&lt;&lt;18)|0x312c1, (4&lt;&lt;18)|0x0a666, (5&lt;&lt;18)|0x2A946}, // 52 (5.260GHz)</div><div class='add'>+     {56, (3&lt;&lt;18)|0x332c3, (4&lt;&lt;18)|0x08ccc, (5&lt;&lt;18)|0x2A946}, // 56 (5.280GHz)</div><div class='add'>+     {60, (3&lt;&lt;18)|0x30ac0, (4&lt;&lt;18)|0x08000, (5&lt;&lt;18)|0x2A946}, // 60 (5.300GHz)</div><div class='add'>+     {64, (3&lt;&lt;18)|0x30ac2, (4&lt;&lt;18)|0x0b333, (5&lt;&lt;18)|0x2A946}, // 64 (5.320GHz)</div><div class='add'>+</div><div class='add'>+    {100, (3&lt;&lt;18)|0x30ec0, (4&lt;&lt;18)|0x08000, (5&lt;&lt;18)|0x2A9C6}, // 100 (5.500GHz)</div><div class='add'>+    {104, (3&lt;&lt;18)|0x30ec2, (4&lt;&lt;18)|0x0b333, (5&lt;&lt;18)|0x2A9C6}, // 104 (5.520GHz)</div><div class='add'>+    {108, (3&lt;&lt;18)|0x32ec1, (4&lt;&lt;18)|0x09999, (5&lt;&lt;18)|0x2A9C6}, // 108 (5.540GHz)</div><div class='add'>+    {112, (3&lt;&lt;18)|0x31ec1, (4&lt;&lt;18)|0x0a666, (5&lt;&lt;18)|0x2A9C6}, // 112 (5.560GHz)</div><div class='add'>+    {116, (3&lt;&lt;18)|0x33ec3, (4&lt;&lt;18)|0x08ccc, (5&lt;&lt;18)|0x2A9C6}, // 116 (5.580GHz)</div><div class='add'>+    {120, (3&lt;&lt;18)|0x301c0, (4&lt;&lt;18)|0x08000, (5&lt;&lt;18)|0x2A9C6}, // 120 (5.600GHz)</div><div class='add'>+    {124, (3&lt;&lt;18)|0x301c2, (4&lt;&lt;18)|0x0b333, (5&lt;&lt;18)|0x2A9C6}, // 124 (5.620GHz)</div><div class='add'>+    {128, (3&lt;&lt;18)|0x321c1, (4&lt;&lt;18)|0x09999, (5&lt;&lt;18)|0x2A9C6}, // 128 (5.640GHz)</div><div class='add'>+    {132, (3&lt;&lt;18)|0x311c1, (4&lt;&lt;18)|0x0a666, (5&lt;&lt;18)|0x2A9C6}, // 132 (5.660GHz)</div><div class='add'>+    {136, (3&lt;&lt;18)|0x331c3, (4&lt;&lt;18)|0x08ccc, (5&lt;&lt;18)|0x2A9C6}, // 136 (5.680GHz)</div><div class='add'>+    {140, (3&lt;&lt;18)|0x309c0, (4&lt;&lt;18)|0x08000, (5&lt;&lt;18)|0x2A9C6}, // 140 (5.700GHz)</div><div class='add'>+</div><div class='add'>+    {149, (3&lt;&lt;18)|0x329c2, (4&lt;&lt;18)|0x0b333, (5&lt;&lt;18)|0x2A9C6}, // 149 (5.745GHz)</div><div class='add'>+    {153, (3&lt;&lt;18)|0x319c1, (4&lt;&lt;18)|0x09999, (5&lt;&lt;18)|0x2A9C6}, // 153 (5.765GHz)</div><div class='add'>+    {157, (3&lt;&lt;18)|0x339c1, (4&lt;&lt;18)|0x0a666, (5&lt;&lt;18)|0x2A9C6}, // 157 (5.785GHz)</div><div class='add'>+    {161, (3&lt;&lt;18)|0x305c3, (4&lt;&lt;18)|0x08ccc, (5&lt;&lt;18)|0x2A9C6}, // 161 (5.805GHz)</div><div class='add'>+</div><div class='add'>+    // Japan</div><div class='add'>+    { 184, (3&lt;&lt;18)|0x308c2, (4&lt;&lt;18)|0x0b333, (5&lt;&lt;18)|0x2A946}, // 184 (4.920GHz)</div><div class='add'>+    { 188, (3&lt;&lt;18)|0x328c1, (4&lt;&lt;18)|0x09999, (5&lt;&lt;18)|0x2A946}, // 188 (4.940GHz)</div><div class='add'>+    { 192, (3&lt;&lt;18)|0x318c1, (4&lt;&lt;18)|0x0a666, (5&lt;&lt;18)|0x2A946}, // 192 (4.960GHz)</div><div class='add'>+    { 196, (3&lt;&lt;18)|0x338c3, (4&lt;&lt;18)|0x08ccc, (5&lt;&lt;18)|0x2A946}, // 196 (4.980GHz)</div><div class='add'>+    {   8, (3&lt;&lt;18)|0x324c1, (4&lt;&lt;18)|0x09999, (5&lt;&lt;18)|0x2A946}, //   8 (5.040GHz)</div><div class='add'>+    {  12, (3&lt;&lt;18)|0x314c1, (4&lt;&lt;18)|0x0a666, (5&lt;&lt;18)|0x2A946}, //  12 (5.060GHz)</div><div class='add'>+    {  16, (3&lt;&lt;18)|0x334c3, (4&lt;&lt;18)|0x08ccc, (5&lt;&lt;18)|0x2A946}, //  16 (5.080GHz)</div><div class='add'>+    {  34, (3&lt;&lt;18)|0x31cc2, (4&lt;&lt;18)|0x0b333, (5&lt;&lt;18)|0x2A946}, //  34 (5.170GHz)</div><div class='add'>+    {  38, (3&lt;&lt;18)|0x33cc1, (4&lt;&lt;18)|0x09999, (5&lt;&lt;18)|0x2A946}, //  38 (5.190GHz)</div><div class='add'>+    {  42, (3&lt;&lt;18)|0x302c1, (4&lt;&lt;18)|0x0a666, (5&lt;&lt;18)|0x2A946}, //  42 (5.210GHz)</div><div class='add'>+    {  46, (3&lt;&lt;18)|0x322c3, (4&lt;&lt;18)|0x08ccc, (5&lt;&lt;18)|0x2A946}, //  46 (5.230GHz)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*****************************************************************************</div><div class='add'>+; For MAXIM2825/6/7 Ver. 317 or less</div><div class='add'>+; Edited by Tiger, Sep-17-2003  for 2.4Ghz channels</div><div class='add'>+; Updated by Tiger, Sep-22-2003 for 5.0Ghz channels</div><div class='add'>+; Corrected by Tiger, Sep-23-2003, for 0x03 and 0x04 of 5.0Ghz channels</div><div class='add'>+</div><div class='add'>+0x00 0x00080</div><div class='add'>+0x01 0x214c0</div><div class='add'>+0x02 0x13802</div><div class='add'>+</div><div class='add'>+;2.4GHz Channels</div><div class='add'>+;channe1 01 (2.412GHz); 0x03 0x30143 ;0x04 0x0accc</div><div class='add'>+;channe1 02 (2.417GHz); 0x03 0x32140 ;0x04 0x09111</div><div class='add'>+;channe1 03 (2.422GHz); 0x03 0x32142 ;0x04 0x0bbbb</div><div class='add'>+;channe1 04 (2.427GHz); 0x03 0x32143 ;0x04 0x0accc</div><div class='add'>+;channe1 05 (2.432GHz); 0x03 0x31140 ;0x04 0x09111</div><div class='add'>+;channe1 06 (2.437GHz); 0x03 0x31142 ;0x04 0x0bbbb</div><div class='add'>+;channe1 07 (2.442GHz); 0x03 0x31143 ;0x04 0x0accc</div><div class='add'>+;channe1 08 (2.447GHz); 0x03 0x33140 ;0x04 0x09111</div><div class='add'>+;channe1 09 (2.452GHz); 0x03 0x33142 ;0x04 0x0bbbb</div><div class='add'>+;channe1 10 (2.457GHz); 0x03 0x33143 ;0x04 0x0accc</div><div class='add'>+;channe1 11 (2.462GHz); 0x03 0x30940 ;0x04 0x09111</div><div class='add'>+;channe1 12 (2.467GHz); 0x03 0x30942 ;0x04 0x0bbbb</div><div class='add'>+;channe1 13 (2.472GHz); 0x03 0x30943 ;0x04 0x0accc</div><div class='add'>+</div><div class='add'>+;5.0Ghz Channels</div><div class='add'>+;channel 36 (5.180GHz); 0x03 0x33cc0 ;0x04 0x0b333</div><div class='add'>+;channel 40 (5.200GHz); 0x03 0x302c0 ;0x04 0x08000</div><div class='add'>+;channel 44 (5.220GHz); 0x03 0x302c2 ;0x04 0x0b333</div><div class='add'>+;channel 48 (5.240GHz); 0x03 0x322c1 ;0x04 0x09999</div><div class='add'>+;channel 52 (5.260GHz); 0x03 0x312c1 ;0x04 0x0a666</div><div class='add'>+;channel 56 (5.280GHz); 0x03 0x332c3 ;0x04 0x08ccc</div><div class='add'>+;channel 60 (5.300GHz); 0x03 0x30ac0 ;0x04 0x08000</div><div class='add'>+;channel 64 (5.320GHz); 0x03 0x30ac2 ;0x04 0x08333</div><div class='add'>+</div><div class='add'>+;2.4GHz band ;0x05 0x28986;</div><div class='add'>+;5.0GHz band</div><div class='add'>+0x05 0x2a986</div><div class='add'>+</div><div class='add'>+0x06 0x18008</div><div class='add'>+0x07 0x38400</div><div class='add'>+0x08 0x05108</div><div class='add'>+0x09 0x27ff8</div><div class='add'>+0x0a 0x14000</div><div class='add'>+0x0b 0x37f99</div><div class='add'>+0x0c 0x0c000</div><div class='add'>+*****************************************************************************/</div><div class='add'>+u32 maxim_317_rf_data[]     =</div><div class='add'>+{</div><div class='add'>+    (0x00&lt;&lt;18)|0x000a2,</div><div class='add'>+    (0x01&lt;&lt;18)|0x214c0,</div><div class='add'>+    (0x02&lt;&lt;18)|0x13802,</div><div class='add'>+    (0x03&lt;&lt;18)|0x30143,</div><div class='add'>+    (0x04&lt;&lt;18)|0x0accc,</div><div class='add'>+    (0x05&lt;&lt;18)|0x28986,</div><div class='add'>+    (0x06&lt;&lt;18)|0x18008,</div><div class='add'>+    (0x07&lt;&lt;18)|0x38400,</div><div class='add'>+    (0x08&lt;&lt;18)|0x05108,</div><div class='add'>+    (0x09&lt;&lt;18)|0x27ff8,</div><div class='add'>+    (0x0A&lt;&lt;18)|0x14000,</div><div class='add'>+    (0x0B&lt;&lt;18)|0x37f99,</div><div class='add'>+    (0x0C&lt;&lt;18)|0x0c000</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+u32 maxim_317_channel_data_24[][3]    =</div><div class='add'>+{</div><div class='add'>+    {(0x03&lt;&lt;18)|0x30143, (0x04&lt;&lt;18)|0x0accc, (0x05&lt;&lt;18)|0x28986}, // channe1 01</div><div class='add'>+    {(0x03&lt;&lt;18)|0x32140, (0x04&lt;&lt;18)|0x09111, (0x05&lt;&lt;18)|0x28986}, // channe1 02</div><div class='add'>+    {(0x03&lt;&lt;18)|0x32142, (0x04&lt;&lt;18)|0x0bbbb, (0x05&lt;&lt;18)|0x28986}, // channe1 03</div><div class='add'>+    {(0x03&lt;&lt;18)|0x32143, (0x04&lt;&lt;18)|0x0accc, (0x05&lt;&lt;18)|0x28986}, // channe1 04</div><div class='add'>+    {(0x03&lt;&lt;18)|0x31140, (0x04&lt;&lt;18)|0x09111, (0x05&lt;&lt;18)|0x28986}, // channe1 05</div><div class='add'>+    {(0x03&lt;&lt;18)|0x31142, (0x04&lt;&lt;18)|0x0bbbb, (0x05&lt;&lt;18)|0x28986}, // channe1 06</div><div class='add'>+    {(0x03&lt;&lt;18)|0x31143, (0x04&lt;&lt;18)|0x0accc, (0x05&lt;&lt;18)|0x28986}, // channe1 07</div><div class='add'>+    {(0x03&lt;&lt;18)|0x33140, (0x04&lt;&lt;18)|0x09111, (0x05&lt;&lt;18)|0x28986}, // channe1 08</div><div class='add'>+    {(0x03&lt;&lt;18)|0x33142, (0x04&lt;&lt;18)|0x0bbbb, (0x05&lt;&lt;18)|0x28986}, // channe1 09</div><div class='add'>+    {(0x03&lt;&lt;18)|0x33143, (0x04&lt;&lt;18)|0x0accc, (0x05&lt;&lt;18)|0x28986}, // channe1 10</div><div class='add'>+    {(0x03&lt;&lt;18)|0x30940, (0x04&lt;&lt;18)|0x09111, (0x05&lt;&lt;18)|0x28986}, // channe1 11</div><div class='add'>+    {(0x03&lt;&lt;18)|0x30942, (0x04&lt;&lt;18)|0x0bbbb, (0x05&lt;&lt;18)|0x28986}, // channe1 12</div><div class='add'>+    {(0x03&lt;&lt;18)|0x30943, (0x04&lt;&lt;18)|0x0accc, (0x05&lt;&lt;18)|0x28986} // channe1 13</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+u32 maxim_317_channel_data_50[][3]    =</div><div class='add'>+{</div><div class='add'>+    {(0x03&lt;&lt;18)|0x33cc0, (0x04&lt;&lt;18)|0x0b333, (0x05&lt;&lt;18)|0x2a986}, // channel 36</div><div class='add'>+    {(0x03&lt;&lt;18)|0x302c0, (0x04&lt;&lt;18)|0x08000, (0x05&lt;&lt;18)|0x2a986}, // channel 40</div><div class='add'>+    {(0x03&lt;&lt;18)|0x302c3, (0x04&lt;&lt;18)|0x0accc, (0x05&lt;&lt;18)|0x2a986}, // channel 44</div><div class='add'>+    {(0x03&lt;&lt;18)|0x322c1, (0x04&lt;&lt;18)|0x09666, (0x05&lt;&lt;18)|0x2a986}, // channel 48</div><div class='add'>+    {(0x03&lt;&lt;18)|0x312c2, (0x04&lt;&lt;18)|0x09999, (0x05&lt;&lt;18)|0x2a986}, // channel 52</div><div class='add'>+    {(0x03&lt;&lt;18)|0x332c0, (0x04&lt;&lt;18)|0x0b333, (0x05&lt;&lt;18)|0x2a99e}, // channel 56</div><div class='add'>+    {(0x03&lt;&lt;18)|0x30ac0, (0x04&lt;&lt;18)|0x08000, (0x05&lt;&lt;18)|0x2a99e}, // channel 60</div><div class='add'>+    {(0x03&lt;&lt;18)|0x30ac3, (0x04&lt;&lt;18)|0x0accc, (0x05&lt;&lt;18)|0x2a99e} // channel 64</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+u32 maxim_317_power_data_24[] = {(0x0C&lt;&lt;18)|0x0c000, (0x0C&lt;&lt;18)|0x0c100};</div><div class='add'>+u32 maxim_317_power_data_50[] = {(0x0C&lt;&lt;18)|0x0c000, (0x0C&lt;&lt;18)|0x0c100};</div><div class='add'>+</div><div class='add'>+/*****************************************************************************</div><div class='add'>+;;AL2230 MP (Mass Production Version)</div><div class='add'>+;;RF Registers Setting for Airoha AL2230 silicon after June 1st, 2004</div><div class='add'>+;;Updated by Tiger Huang (June 1st, 2004)</div><div class='add'>+;;20-bit length and LSB first</div><div class='add'>+</div><div class='add'>+;;Ch01 (2412MHz) ;0x00 0x09EFC ;0x01 0x8CCCC;</div><div class='add'>+;;Ch02 (2417MHz) ;0x00 0x09EFC ;0x01 0x8CCCD;</div><div class='add'>+;;Ch03 (2422MHz) ;0x00 0x09E7C ;0x01 0x8CCCC;</div><div class='add'>+;;Ch04 (2427MHz) ;0x00 0x09E7C ;0x01 0x8CCCD;</div><div class='add'>+;;Ch05 (2432MHz) ;0x00 0x05EFC ;0x01 0x8CCCC;</div><div class='add'>+;;Ch06 (2437MHz) ;0x00 0x05EFC ;0x01 0x8CCCD;</div><div class='add'>+;;Ch07 (2442MHz) ;0x00 0x05E7C ;0x01 0x8CCCC;</div><div class='add'>+;;Ch08 (2447MHz) ;0x00 0x05E7C ;0x01 0x8CCCD;</div><div class='add'>+;;Ch09 (2452MHz) ;0x00 0x0DEFC ;0x01 0x8CCCC;</div><div class='add'>+;;Ch10 (2457MHz) ;0x00 0x0DEFC ;0x01 0x8CCCD;</div><div class='add'>+;;Ch11 (2462MHz) ;0x00 0x0DE7C ;0x01 0x8CCCC;</div><div class='add'>+;;Ch12 (2467MHz) ;0x00 0x0DE7C ;0x01 0x8CCCD;</div><div class='add'>+;;Ch13 (2472MHz) ;0x00 0x03EFC ;0x01 0x8CCCC;</div><div class='add'>+;;Ch14 (2484Mhz) ;0x00 0x03E7C ;0x01 0x86666;</div><div class='add'>+</div><div class='add'>+0x02 0x401D8; RXDCOC BW 100Hz for RXHP low</div><div class='add'>+;;0x02 0x481DC; RXDCOC BW 30Khz for RXHP low</div><div class='add'>+</div><div class='add'>+0x03 0xCFFF0</div><div class='add'>+0x04 0x23800</div><div class='add'>+0x05 0xA3B72</div><div class='add'>+0x06 0x6DA01</div><div class='add'>+0x07 0xE1688</div><div class='add'>+0x08 0x11600</div><div class='add'>+0x09 0x99E02</div><div class='add'>+0x0A 0x5DDB0</div><div class='add'>+0x0B 0xD9900</div><div class='add'>+0x0C 0x3FFBD</div><div class='add'>+0x0D 0xB0000</div><div class='add'>+0x0F 0xF00A0</div><div class='add'>+</div><div class='add'>+;RF Calibration for Airoha AL2230</div><div class='add'>+;Edit by Ben Chang (01/30/04)</div><div class='add'>+;Updated by Tiger Huang (03/03/04)</div><div class='add'>+0x0f 0xf00a0 ; Initial Setting</div><div class='add'>+0x0f 0xf00b0 ; Activate TX DCC</div><div class='add'>+0x0f 0xf02a0 ; Activate Phase Calibration</div><div class='add'>+0x0f 0xf00e0 ; Activate Filter RC Calibration</div><div class='add'>+0x0f 0xf00a0 ; Restore Initial Setting</div><div class='add'>+*****************************************************************************/</div><div class='add'>+</div><div class='add'>+u32 al2230_rf_data[]     =</div><div class='add'>+{</div><div class='add'>+    (0x00&lt;&lt;20)|0x09EFC,</div><div class='add'>+    (0x01&lt;&lt;20)|0x8CCCC,</div><div class='add'>+    (0x02&lt;&lt;20)|0x40058,// 20060627 Anson 0x401D8,</div><div class='add'>+    (0x03&lt;&lt;20)|0xCFFF0,</div><div class='add'>+    (0x04&lt;&lt;20)|0x24100,// 20060627 Anson 0x23800,</div><div class='add'>+    (0x05&lt;&lt;20)|0xA3B2F,// 20060627 Anson 0xA3B72</div><div class='add'>+    (0x06&lt;&lt;20)|0x6DA01,</div><div class='add'>+    (0x07&lt;&lt;20)|0xE3628,// 20060627 Anson 0xE1688,</div><div class='add'>+    (0x08&lt;&lt;20)|0x11600,</div><div class='add'>+    (0x09&lt;&lt;20)|0x9DC02,// 20060627 Anosn 0x97602,//0x99E02, //0x9AE02</div><div class='add'>+    (0x0A&lt;&lt;20)|0x5ddb0, // 941206 For QCOM interference 0x588b0,//0x5DDB0, 940601 adj 0x5aa30 for bluetooth</div><div class='add'>+    (0x0B&lt;&lt;20)|0xD9900,</div><div class='add'>+    (0x0C&lt;&lt;20)|0x3FFBD,</div><div class='add'>+    (0x0D&lt;&lt;20)|0xB0000,</div><div class='add'>+    (0x0F&lt;&lt;20)|0xF01A0 // 20060627 Anson 0xF00A0</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+u32 al2230s_rf_data[]     =</div><div class='add'>+{</div><div class='add'>+    (0x00&lt;&lt;20)|0x09EFC,</div><div class='add'>+    (0x01&lt;&lt;20)|0x8CCCC,</div><div class='add'>+    (0x02&lt;&lt;20)|0x40058,// 20060419 0x401D8,</div><div class='add'>+    (0x03&lt;&lt;20)|0xCFFF0,</div><div class='add'>+    (0x04&lt;&lt;20)|0x24100,// 20060419 0x23800,</div><div class='add'>+    (0x05&lt;&lt;20)|0xA3B2F,// 20060419 0xA3B72,</div><div class='add'>+    (0x06&lt;&lt;20)|0x6DA01,</div><div class='add'>+    (0x07&lt;&lt;20)|0xE3628,// 20060419 0xE1688,</div><div class='add'>+    (0x08&lt;&lt;20)|0x11600,</div><div class='add'>+    (0x09&lt;&lt;20)|0x9DC02,// 20060419 0x97602,//0x99E02, //0x9AE02</div><div class='add'>+    (0x0A&lt;&lt;20)|0x5DDB0,// 941206 For QCOM interference 0x588b0,//0x5DDB0, 940601 adj 0x5aa30 for bluetooth</div><div class='add'>+    (0x0B&lt;&lt;20)|0xD9900,</div><div class='add'>+    (0x0C&lt;&lt;20)|0x3FFBD,</div><div class='add'>+    (0x0D&lt;&lt;20)|0xB0000,</div><div class='add'>+    (0x0F&lt;&lt;20)|0xF01A0 // 20060419 0xF00A0</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+u32 al2230_channel_data_24[][2] =</div><div class='add'>+{</div><div class='add'>+    {(0x00&lt;&lt;20)|0x09EFC, (0x01&lt;&lt;20)|0x8CCCC}, // channe1 01</div><div class='add'>+    {(0x00&lt;&lt;20)|0x09EFC, (0x01&lt;&lt;20)|0x8CCCD}, // channe1 02</div><div class='add'>+    {(0x00&lt;&lt;20)|0x09E7C, (0x01&lt;&lt;20)|0x8CCCC}, // channe1 03</div><div class='add'>+    {(0x00&lt;&lt;20)|0x09E7C, (0x01&lt;&lt;20)|0x8CCCD}, // channe1 04</div><div class='add'>+    {(0x00&lt;&lt;20)|0x05EFC, (0x01&lt;&lt;20)|0x8CCCC}, // channe1 05</div><div class='add'>+    {(0x00&lt;&lt;20)|0x05EFC, (0x01&lt;&lt;20)|0x8CCCD}, // channe1 06</div><div class='add'>+    {(0x00&lt;&lt;20)|0x05E7C, (0x01&lt;&lt;20)|0x8CCCC}, // channe1 07</div><div class='add'>+    {(0x00&lt;&lt;20)|0x05E7C, (0x01&lt;&lt;20)|0x8CCCD}, // channe1 08</div><div class='add'>+    {(0x00&lt;&lt;20)|0x0DEFC, (0x01&lt;&lt;20)|0x8CCCC}, // channe1 09</div><div class='add'>+    {(0x00&lt;&lt;20)|0x0DEFC, (0x01&lt;&lt;20)|0x8CCCD}, // channe1 10</div><div class='add'>+    {(0x00&lt;&lt;20)|0x0DE7C, (0x01&lt;&lt;20)|0x8CCCC}, // channe1 11</div><div class='add'>+    {(0x00&lt;&lt;20)|0x0DE7C, (0x01&lt;&lt;20)|0x8CCCD}, // channe1 12</div><div class='add'>+    {(0x00&lt;&lt;20)|0x03EFC, (0x01&lt;&lt;20)|0x8CCCC}, // channe1 13</div><div class='add'>+    {(0x00&lt;&lt;20)|0x03E7C, (0x01&lt;&lt;20)|0x86666} // channe1 14</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+// Current setting. u32 airoha_power_data_24[] = {(0x09&lt;&lt;20)|0x90202, (0x09&lt;&lt;20)|0x96602, (0x09&lt;&lt;20)|0x97602};</div><div class='add'>+#define AIROHA_TXVGA_LOW_INDEX		31		// Index for 0x90202</div><div class='add'>+#define AIROHA_TXVGA_MIDDLE_INDEX	12		// Index for 0x96602</div><div class='add'>+#define AIROHA_TXVGA_HIGH_INDEX		8		// Index for 0x97602 1.0.24.0 1.0.28.0</div><div class='add'>+/*</div><div class='add'>+u32 airoha_power_data_24[] =</div><div class='add'>+{</div><div class='add'>+    0x9FE02,          // Max - 0 dB</div><div class='add'>+    0x9BE02,          // Max - 1 dB</div><div class='add'>+    0x9DE02,          // Max - 2 dB</div><div class='add'>+    0x99E02,          // Max - 3 dB</div><div class='add'>+    0x9EE02,          // Max - 4 dB</div><div class='add'>+    0x9AE02,          // Max - 5 dB</div><div class='add'>+    0x9CE02,          // Max - 6 dB</div><div class='add'>+    0x98E02,          // Max - 7 dB</div><div class='add'>+    0x97602,          // Max - 8 dB</div><div class='add'>+    0x93602,          // Max - 9 dB</div><div class='add'>+    0x95602,          // Max - 10 dB</div><div class='add'>+    0x91602,          // Max - 11 dB</div><div class='add'>+    0x96602,          // Max - 12 dB</div><div class='add'>+    0x92602,          // Max - 13 dB</div><div class='add'>+    0x94602,          // Max - 14 dB</div><div class='add'>+    0x90602,          // Max - 15 dB</div><div class='add'>+    0x97A02,          // Max - 16 dB</div><div class='add'>+    0x93A02,          // Max - 17 dB</div><div class='add'>+    0x95A02,          // Max - 18 dB</div><div class='add'>+    0x91A02,          // Max - 19 dB</div><div class='add'>+    0x96A02,          // Max - 20 dB</div><div class='add'>+    0x92A02,          // Max - 21 dB</div><div class='add'>+    0x94A02,          // Max - 22 dB</div><div class='add'>+    0x90A02,          // Max - 23 dB</div><div class='add'>+    0x97202,          // Max - 24 dB</div><div class='add'>+    0x93202,          // Max - 25 dB</div><div class='add'>+    0x95202,          // Max - 26 dB</div><div class='add'>+    0x91202,          // Max - 27 dB</div><div class='add'>+    0x96202,          // Max - 28 dB</div><div class='add'>+    0x92202,          // Max - 29 dB</div><div class='add'>+    0x94202,          // Max - 30 dB</div><div class='add'>+    0x90202           // Max - 31 dB</div><div class='add'>+};</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+// 20040927 1.1.69.1000 ybjiang</div><div class='add'>+// from John</div><div class='add'>+u32 al2230_txvga_data[][2] =</div><div class='add'>+{</div><div class='add'>+	//value	, index</div><div class='add'>+	{0x090202, 0},</div><div class='add'>+	{0x094202, 2},</div><div class='add'>+	{0x092202, 4},</div><div class='add'>+	{0x096202, 6},</div><div class='add'>+	{0x091202, 8},</div><div class='add'>+	{0x095202, 10},</div><div class='add'>+	{0x093202, 12},</div><div class='add'>+	{0x097202, 14},</div><div class='add'>+	{0x090A02, 16},</div><div class='add'>+	{0x094A02, 18},</div><div class='add'>+	{0x092A02, 20},</div><div class='add'>+	{0x096A02, 22},</div><div class='add'>+	{0x091A02, 24},</div><div class='add'>+	{0x095A02, 26},</div><div class='add'>+	{0x093A02, 28},</div><div class='add'>+	{0x097A02, 30},</div><div class='add'>+	{0x090602, 32},</div><div class='add'>+	{0x094602, 34},</div><div class='add'>+	{0x092602, 36},</div><div class='add'>+	{0x096602, 38},</div><div class='add'>+	{0x091602, 40},</div><div class='add'>+	{0x095602, 42},</div><div class='add'>+	{0x093602, 44},</div><div class='add'>+	{0x097602, 46},</div><div class='add'>+	{0x090E02, 48},</div><div class='add'>+	{0x098E02, 49},</div><div class='add'>+	{0x094E02, 50},</div><div class='add'>+	{0x09CE02, 51},</div><div class='add'>+	{0x092E02, 52},</div><div class='add'>+	{0x09AE02, 53},</div><div class='add'>+	{0x096E02, 54},</div><div class='add'>+	{0x09EE02, 55},</div><div class='add'>+	{0x091E02, 56},</div><div class='add'>+	{0x099E02, 57},</div><div class='add'>+	{0x095E02, 58},</div><div class='add'>+	{0x09DE02, 59},</div><div class='add'>+	{0x093E02, 60},</div><div class='add'>+	{0x09BE02, 61},</div><div class='add'>+	{0x097E02, 62},</div><div class='add'>+	{0x09FE02, 63}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+//--------------------------------</div><div class='add'>+// For Airoha AL7230, 2.4Ghz band</div><div class='add'>+// Edit by Tiger, (March, 9, 2005)</div><div class='add'>+// 24bit, MSB first</div><div class='add'>+</div><div class='add'>+//channel independent registers:</div><div class='add'>+u32 al7230_rf_data_24[]	=</div><div class='add'>+{</div><div class='add'>+	(0x00&lt;&lt;24)|0x003790,</div><div class='add'>+	(0x01&lt;&lt;24)|0x133331,</div><div class='add'>+	(0x02&lt;&lt;24)|0x841FF2,</div><div class='add'>+	(0x03&lt;&lt;24)|0x3FDFA3,</div><div class='add'>+	(0x04&lt;&lt;24)|0x7FD784,</div><div class='add'>+	(0x05&lt;&lt;24)|0x802B55,</div><div class='add'>+	(0x06&lt;&lt;24)|0x56AF36,</div><div class='add'>+	(0x07&lt;&lt;24)|0xCE0207,</div><div class='add'>+	(0x08&lt;&lt;24)|0x6EBC08,</div><div class='add'>+	(0x09&lt;&lt;24)|0x221BB9,</div><div class='add'>+	(0x0A&lt;&lt;24)|0xE0000A,</div><div class='add'>+	(0x0B&lt;&lt;24)|0x08071B,</div><div class='add'>+	(0x0C&lt;&lt;24)|0x000A3C,</div><div class='add'>+	(0x0D&lt;&lt;24)|0xFFFFFD,</div><div class='add'>+	(0x0E&lt;&lt;24)|0x00000E,</div><div class='add'>+	(0x0F&lt;&lt;24)|0x1ABA8F</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+u32 al7230_channel_data_24[][2] =</div><div class='add'>+{</div><div class='add'>+    {(0x00&lt;&lt;24)|0x003790, (0x01&lt;&lt;24)|0x133331}, // channe1 01</div><div class='add'>+    {(0x00&lt;&lt;24)|0x003790, (0x01&lt;&lt;24)|0x1B3331}, // channe1 02</div><div class='add'>+    {(0x00&lt;&lt;24)|0x003790, (0x01&lt;&lt;24)|0x033331}, // channe1 03</div><div class='add'>+    {(0x00&lt;&lt;24)|0x003790, (0x01&lt;&lt;24)|0x0B3331}, // channe1 04</div><div class='add'>+    {(0x00&lt;&lt;24)|0x0037A0, (0x01&lt;&lt;24)|0x133331}, // channe1 05</div><div class='add'>+    {(0x00&lt;&lt;24)|0x0037A0, (0x01&lt;&lt;24)|0x1B3331}, // channe1 06</div><div class='add'>+    {(0x00&lt;&lt;24)|0x0037A0, (0x01&lt;&lt;24)|0x033331}, // channe1 07</div><div class='add'>+    {(0x00&lt;&lt;24)|0x0037A0, (0x01&lt;&lt;24)|0x0B3331}, // channe1 08</div><div class='add'>+    {(0x00&lt;&lt;24)|0x0037B0, (0x01&lt;&lt;24)|0x133331}, // channe1 09</div><div class='add'>+    {(0x00&lt;&lt;24)|0x0037B0, (0x01&lt;&lt;24)|0x1B3331}, // channe1 10</div><div class='add'>+    {(0x00&lt;&lt;24)|0x0037B0, (0x01&lt;&lt;24)|0x033331}, // channe1 11</div><div class='add'>+    {(0x00&lt;&lt;24)|0x0037B0, (0x01&lt;&lt;24)|0x0B3331}, // channe1 12</div><div class='add'>+    {(0x00&lt;&lt;24)|0x0037C0, (0x01&lt;&lt;24)|0x133331}, // channe1 13</div><div class='add'>+	{(0x00&lt;&lt;24)|0x0037C0, (0x01&lt;&lt;24)|0x066661}  // channel 14</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+//channel independent registers:</div><div class='add'>+u32 al7230_rf_data_50[]	=</div><div class='add'>+{</div><div class='add'>+	(0x00&lt;&lt;24)|0x0FF520,</div><div class='add'>+	(0x01&lt;&lt;24)|0x000001,</div><div class='add'>+	(0x02&lt;&lt;24)|0x451FE2,</div><div class='add'>+	(0x03&lt;&lt;24)|0x5FDFA3,</div><div class='add'>+	(0x04&lt;&lt;24)|0x6FD784,</div><div class='add'>+	(0x05&lt;&lt;24)|0x853F55,</div><div class='add'>+	(0x06&lt;&lt;24)|0x56AF36,</div><div class='add'>+	(0x07&lt;&lt;24)|0xCE0207,</div><div class='add'>+	(0x08&lt;&lt;24)|0x6EBC08,</div><div class='add'>+	(0x09&lt;&lt;24)|0x221BB9,</div><div class='add'>+	(0x0A&lt;&lt;24)|0xE0600A,</div><div class='add'>+	(0x0B&lt;&lt;24)|0x08044B,</div><div class='add'>+	(0x0C&lt;&lt;24)|0x00143C,</div><div class='add'>+	(0x0D&lt;&lt;24)|0xFFFFFD,</div><div class='add'>+	(0x0E&lt;&lt;24)|0x00000E,</div><div class='add'>+	(0x0F&lt;&lt;24)|0x12BACF //5Ghz default state</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+u32 al7230_channel_data_5[][4] =</div><div class='add'>+{</div><div class='add'>+	//channel dependent registers: 0x00, 0x01 and 0x04</div><div class='add'>+	//11J ===========</div><div class='add'>+	{184, (0x00&lt;&lt;24)|0x0FF520, (0x01&lt;&lt;24)|0x000001, (0x04&lt;&lt;24)|0x67F784}, // channel 184</div><div class='add'>+	{188, (0x00&lt;&lt;24)|0x0FF520, (0x01&lt;&lt;24)|0x0AAAA1, (0x04&lt;&lt;24)|0x77F784}, // channel 188</div><div class='add'>+	{192, (0x00&lt;&lt;24)|0x0FF530, (0x01&lt;&lt;24)|0x155551, (0x04&lt;&lt;24)|0x77F784}, // channel 192</div><div class='add'>+	{196, (0x00&lt;&lt;24)|0x0FF530, (0x01&lt;&lt;24)|0x000001, (0x04&lt;&lt;24)|0x67F784}, // channel 196</div><div class='add'>+	{8,   (0x00&lt;&lt;24)|0x0FF540, (0x01&lt;&lt;24)|0x000001, (0x04&lt;&lt;24)|0x67F784}, // channel 008</div><div class='add'>+	{12,  (0x00&lt;&lt;24)|0x0FF540, (0x01&lt;&lt;24)|0x0AAAA1, (0x04&lt;&lt;24)|0x77F784}, // channel 012</div><div class='add'>+	{16,  (0x00&lt;&lt;24)|0x0FF550, (0x01&lt;&lt;24)|0x155551, (0x04&lt;&lt;24)|0x77F784}, // channel 016</div><div class='add'>+	{34,  (0x00&lt;&lt;24)|0x0FF560, (0x01&lt;&lt;24)|0x055551, (0x04&lt;&lt;24)|0x77F784}, // channel 034</div><div class='add'>+	{38,  (0x00&lt;&lt;24)|0x0FF570, (0x01&lt;&lt;24)|0x100001, (0x04&lt;&lt;24)|0x77F784}, // channel 038</div><div class='add'>+	{42,  (0x00&lt;&lt;24)|0x0FF570, (0x01&lt;&lt;24)|0x1AAAA1, (0x04&lt;&lt;24)|0x77F784}, // channel 042</div><div class='add'>+	{46,  (0x00&lt;&lt;24)|0x0FF570, (0x01&lt;&lt;24)|0x055551, (0x04&lt;&lt;24)|0x77F784}, // channel 046</div><div class='add'>+	//11 A/H =========</div><div class='add'>+	{36,  (0x00&lt;&lt;24)|0x0FF560, (0x01&lt;&lt;24)|0x0AAAA1, (0x04&lt;&lt;24)|0x77F784}, // channel 036</div><div class='add'>+	{40,  (0x00&lt;&lt;24)|0x0FF570, (0x01&lt;&lt;24)|0x155551, (0x04&lt;&lt;24)|0x77F784}, // channel 040</div><div class='add'>+	{44,  (0x00&lt;&lt;24)|0x0FF570, (0x01&lt;&lt;24)|0x000001, (0x04&lt;&lt;24)|0x67F784}, // channel 044</div><div class='add'>+	{48,  (0x00&lt;&lt;24)|0x0FF570, (0x01&lt;&lt;24)|0x0AAAA1, (0x04&lt;&lt;24)|0x77F784}, // channel 048</div><div class='add'>+	{52,  (0x00&lt;&lt;24)|0x0FF580, (0x01&lt;&lt;24)|0x155551, (0x04&lt;&lt;24)|0x77F784}, // channel 052</div><div class='add'>+	{56,  (0x00&lt;&lt;24)|0x0FF580, (0x01&lt;&lt;24)|0x000001, (0x04&lt;&lt;24)|0x67F784}, // channel 056</div><div class='add'>+	{60,  (0x00&lt;&lt;24)|0x0FF580, (0x01&lt;&lt;24)|0x0AAAA1, (0x04&lt;&lt;24)|0x77F784}, // channel 060</div><div class='add'>+	{64,  (0x00&lt;&lt;24)|0x0FF590, (0x01&lt;&lt;24)|0x155551, (0x04&lt;&lt;24)|0x77F784}, // channel 064</div><div class='add'>+	{100, (0x00&lt;&lt;24)|0x0FF5C0, (0x01&lt;&lt;24)|0x155551, (0x04&lt;&lt;24)|0x77F784}, // channel 100</div><div class='add'>+	{104, (0x00&lt;&lt;24)|0x0FF5C0, (0x01&lt;&lt;24)|0x000001, (0x04&lt;&lt;24)|0x67F784}, // channel 104</div><div class='add'>+	{108, (0x00&lt;&lt;24)|0x0FF5C0, (0x01&lt;&lt;24)|0x0AAAA1, (0x04&lt;&lt;24)|0x77F784}, // channel 108</div><div class='add'>+	{112, (0x00&lt;&lt;24)|0x0FF5D0, (0x01&lt;&lt;24)|0x155551, (0x04&lt;&lt;24)|0x77F784}, // channel 112</div><div class='add'>+	{116, (0x00&lt;&lt;24)|0x0FF5D0, (0x01&lt;&lt;24)|0x000001, (0x04&lt;&lt;24)|0x67F784}, // channel 116</div><div class='add'>+	{120, (0x00&lt;&lt;24)|0x0FF5D0, (0x01&lt;&lt;24)|0x0AAAA1, (0x04&lt;&lt;24)|0x77F784}, // channel 120</div><div class='add'>+	{124, (0x00&lt;&lt;24)|0x0FF5E0, (0x01&lt;&lt;24)|0x155551, (0x04&lt;&lt;24)|0x77F784}, // channel 124</div><div class='add'>+	{128, (0x00&lt;&lt;24)|0x0FF5E0, (0x01&lt;&lt;24)|0x000001, (0x04&lt;&lt;24)|0x67F784}, // channel 128</div><div class='add'>+	{132, (0x00&lt;&lt;24)|0x0FF5E0, (0x01&lt;&lt;24)|0x0AAAA1, (0x04&lt;&lt;24)|0x77F784}, // channel 132</div><div class='add'>+	{136, (0x00&lt;&lt;24)|0x0FF5F0, (0x01&lt;&lt;24)|0x155551, (0x04&lt;&lt;24)|0x77F784}, // channel 136</div><div class='add'>+	{140, (0x00&lt;&lt;24)|0x0FF5F0, (0x01&lt;&lt;24)|0x000001, (0x04&lt;&lt;24)|0x67F784}, // channel 140</div><div class='add'>+	{149, (0x00&lt;&lt;24)|0x0FF600, (0x01&lt;&lt;24)|0x180001, (0x04&lt;&lt;24)|0x77F784}, // channel 149</div><div class='add'>+	{153, (0x00&lt;&lt;24)|0x0FF600, (0x01&lt;&lt;24)|0x02AAA1, (0x04&lt;&lt;24)|0x77F784}, // channel 153</div><div class='add'>+	{157, (0x00&lt;&lt;24)|0x0FF600, (0x01&lt;&lt;24)|0x0D5551, (0x04&lt;&lt;24)|0x77F784}, // channel 157</div><div class='add'>+	{161, (0x00&lt;&lt;24)|0x0FF610, (0x01&lt;&lt;24)|0x180001, (0x04&lt;&lt;24)|0x77F784}, // channel 161</div><div class='add'>+	{165, (0x00&lt;&lt;24)|0x0FF610, (0x01&lt;&lt;24)|0x02AAA1, (0x04&lt;&lt;24)|0x77F784}  // channel 165</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+//; RF Calibration &lt;=== Register 0x0F</div><div class='add'>+//0x0F 0x1ABA8F; start from 2.4Ghz default state</div><div class='add'>+//0x0F 0x9ABA8F; TXDC compensation</div><div class='add'>+//0x0F 0x3ABA8F; RXFIL adjustment</div><div class='add'>+//0x0F 0x1ABA8F; restore 2.4Ghz default state</div><div class='add'>+</div><div class='add'>+//;TXVGA Mapping Table &lt;=== Register 0x0B</div><div class='add'>+u32 al7230_txvga_data[][2] =</div><div class='add'>+{</div><div class='add'>+	{0x08040B, 0}, //TXVGA=0;</div><div class='add'>+	{0x08041B, 1}, //TXVGA=1;</div><div class='add'>+	{0x08042B, 2}, //TXVGA=2;</div><div class='add'>+	{0x08043B, 3}, //TXVGA=3;</div><div class='add'>+	{0x08044B, 4}, //TXVGA=4;</div><div class='add'>+	{0x08045B, 5}, //TXVGA=5;</div><div class='add'>+	{0x08046B, 6}, //TXVGA=6;</div><div class='add'>+	{0x08047B, 7}, //TXVGA=7;</div><div class='add'>+	{0x08048B, 8}, //TXVGA=8;</div><div class='add'>+	{0x08049B, 9}, //TXVGA=9;</div><div class='add'>+	{0x0804AB, 10}, //TXVGA=10;</div><div class='add'>+	{0x0804BB, 11}, //TXVGA=11;</div><div class='add'>+	{0x0804CB, 12}, //TXVGA=12;</div><div class='add'>+	{0x0804DB, 13}, //TXVGA=13;</div><div class='add'>+	{0x0804EB, 14}, //TXVGA=14;</div><div class='add'>+	{0x0804FB, 15}, //TXVGA=15;</div><div class='add'>+	{0x08050B, 16}, //TXVGA=16;</div><div class='add'>+	{0x08051B, 17}, //TXVGA=17;</div><div class='add'>+	{0x08052B, 18}, //TXVGA=18;</div><div class='add'>+	{0x08053B, 19}, //TXVGA=19;</div><div class='add'>+	{0x08054B, 20}, //TXVGA=20;</div><div class='add'>+	{0x08055B, 21}, //TXVGA=21;</div><div class='add'>+	{0x08056B, 22}, //TXVGA=22;</div><div class='add'>+	{0x08057B, 23}, //TXVGA=23;</div><div class='add'>+	{0x08058B, 24}, //TXVGA=24;</div><div class='add'>+	{0x08059B, 25}, //TXVGA=25;</div><div class='add'>+	{0x0805AB, 26}, //TXVGA=26;</div><div class='add'>+	{0x0805BB, 27}, //TXVGA=27;</div><div class='add'>+	{0x0805CB, 28}, //TXVGA=28;</div><div class='add'>+	{0x0805DB, 29}, //TXVGA=29;</div><div class='add'>+	{0x0805EB, 30}, //TXVGA=30;</div><div class='add'>+	{0x0805FB, 31}, //TXVGA=31;</div><div class='add'>+	{0x08060B, 32}, //TXVGA=32;</div><div class='add'>+	{0x08061B, 33}, //TXVGA=33;</div><div class='add'>+	{0x08062B, 34}, //TXVGA=34;</div><div class='add'>+	{0x08063B, 35}, //TXVGA=35;</div><div class='add'>+	{0x08064B, 36}, //TXVGA=36;</div><div class='add'>+	{0x08065B, 37}, //TXVGA=37;</div><div class='add'>+	{0x08066B, 38}, //TXVGA=38;</div><div class='add'>+	{0x08067B, 39}, //TXVGA=39;</div><div class='add'>+	{0x08068B, 40}, //TXVGA=40;</div><div class='add'>+	{0x08069B, 41}, //TXVGA=41;</div><div class='add'>+	{0x0806AB, 42}, //TXVGA=42;</div><div class='add'>+	{0x0806BB, 43}, //TXVGA=43;</div><div class='add'>+	{0x0806CB, 44}, //TXVGA=44;</div><div class='add'>+	{0x0806DB, 45}, //TXVGA=45;</div><div class='add'>+	{0x0806EB, 46}, //TXVGA=46;</div><div class='add'>+	{0x0806FB, 47}, //TXVGA=47;</div><div class='add'>+	{0x08070B, 48}, //TXVGA=48;</div><div class='add'>+	{0x08071B, 49}, //TXVGA=49;</div><div class='add'>+	{0x08072B, 50}, //TXVGA=50;</div><div class='add'>+	{0x08073B, 51}, //TXVGA=51;</div><div class='add'>+	{0x08074B, 52}, //TXVGA=52;</div><div class='add'>+	{0x08075B, 53}, //TXVGA=53;</div><div class='add'>+	{0x08076B, 54}, //TXVGA=54;</div><div class='add'>+	{0x08077B, 55}, //TXVGA=55;</div><div class='add'>+	{0x08078B, 56}, //TXVGA=56;</div><div class='add'>+	{0x08079B, 57}, //TXVGA=57;</div><div class='add'>+	{0x0807AB, 58}, //TXVGA=58;</div><div class='add'>+	{0x0807BB, 59}, //TXVGA=59;</div><div class='add'>+	{0x0807CB, 60}, //TXVGA=60;</div><div class='add'>+	{0x0807DB, 61}, //TXVGA=61;</div><div class='add'>+	{0x0807EB, 62}, //TXVGA=62;</div><div class='add'>+	{0x0807FB, 63}, //TXVGA=63;</div><div class='add'>+};</div><div class='add'>+//--------------------------------</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+//; W89RF242 RFIC SPI programming initial data</div><div class='add'>+//; Winbond WLAN 11g RFIC BB-SPI register -- version FA5976A rev 1.3b</div><div class='add'>+//; Update Date: Ocotber 3, 2005 by PP10 Hsiang-Te Ho</div><div class='add'>+//;</div><div class='add'>+//; Version 1.3b revision items: (Oct. 1, 2005 by HTHo) for FA5976A</div><div class='add'>+u32 w89rf242_rf_data[]     =</div><div class='add'>+{</div><div class='add'>+    (0x00&lt;&lt;24)|0xF86100, // 20060721 0xF86100, //; 3E184; MODA  (0x00) -- Normal mode ; calibration off</div><div class='add'>+    (0x01&lt;&lt;24)|0xEFFFC2, //; 3BFFF; MODB  (0x01) -- turn off RSSI, and other circuits are turned on</div><div class='add'>+    (0x02&lt;&lt;24)|0x102504, //; 04094; FSET  (0x02) -- default 20MHz crystal ; Icmp=1.5mA</div><div class='add'>+    (0x03&lt;&lt;24)|0x026286, //; 0098A; FCHN  (0x03) -- default CH7, 2442MHz</div><div class='add'>+    (0x04&lt;&lt;24)|0x000208, // 20060612.1.a 0x0002C8, // 20050818 // 20050816 0x000388</div><div class='add'>+						 //; 02008; FCAL  (0x04) -- XTAL Freq Trim=001000 (socket board#1); FA5976AYG_v1.3C</div><div class='add'>+    (0x05&lt;&lt;24)|0x24C60A, // 20060612.1.a 0x24C58A, // 941003 0x24C48A, // 20050818.2 0x24848A, // 20050818 // 20050816 0x24C48A</div><div class='add'>+						 //; 09316; GANA  (0x05) -- TX VGA default (TXVGA=0x18(12)) &amp; TXGPK=110 ; FA5976A_1.3D</div><div class='add'>+    (0x06&lt;&lt;24)|0x3432CC, // 941003 0x26C34C, // 20050818 0x06B40C</div><div class='add'>+						 //; 0D0CB; GANB  (0x06) -- RXDC(DC offset) on; LNA=11; RXVGA=001011(11) ; RXFLSW=11(010001); RXGPK=00; RXGCF=00; -50dBm input</div><div class='add'>+    (0x07&lt;&lt;24)|0x0C68CE, // 20050818.2 0x0C66CE, // 20050818 // 20050816 0x0C68CE</div><div class='add'>+						 //; 031A3; FILT  (0x07) -- TX/RX filter with auto-tuning; TFLBW=011; RFLBW=100</div><div class='add'>+    (0x08&lt;&lt;24)|0x100010, //; 04000; TCAL  (0x08) -- //for LO</div><div class='add'>+    (0x09&lt;&lt;24)|0x004012, // 20060612.1.a 0x6E4012, // 0x004012,</div><div class='add'>+						 //; 1B900; RCALA (0x09) -- FASTS=11; HPDE=01 (100nsec); SEHP=1 (select B0 pin=RXHP); RXHP=1 (Turn on RXHP function)(FA5976A_1.3C)</div><div class='add'>+    (0x0A&lt;&lt;24)|0x704014, //; 1C100; RCALB (0x0A)</div><div class='add'>+    (0x0B&lt;&lt;24)|0x18BDD6, // 941003 0x1805D6, // 20050818.2 0x1801D6, // 20050818 // 20050816 0x1805D6</div><div class='add'>+						 //; 062F7; IQCAL (0x0B) -- Turn on LO phase tuner=0111 &amp; RX-LO phase = 0111; FA5976A_1.3B (2005/09/29)</div><div class='add'>+    (0x0C&lt;&lt;24)|0x575558, // 20050818.2 0x555558, // 20050818 // 20050816 0x575558</div><div class='add'>+						 //; 15D55 ; IBSA  (0x0C) -- IFPre =11 ; TC5376A_v1.3A for corner</div><div class='add'>+    (0x0D&lt;&lt;24)|0x55545A, // 20060612.1.a 0x55555A,</div><div class='add'>+						 //; 15555 ; IBSB  (0x0D)</div><div class='add'>+    (0x0E&lt;&lt;24)|0x5557DC, // 20060612.1.a 0x55555C, // 941003 0x5557DC,</div><div class='add'>+						 //; 1555F ; IBSC  (0x0E) -- IRLNA &amp; IRLNB (PTAT &amp; Const current)=01/01; FA5976B_1.3F (2005/11/25)</div><div class='add'>+	(0x10&lt;&lt;24)|0x000C20, // 941003 0x000020, // 20050818</div><div class='add'>+						 //; 00030 ; TMODA (0x10) -- LNA_gain_step=0011 ; LNA=15/16dB</div><div class='add'>+	(0x11&lt;&lt;24)|0x0C0022, // 941003 0x030022  // 20050818.2 0x030022  // 20050818 // 20050816 0x0C0022</div><div class='add'>+						 //; 03000 ; TMODB (0x11) -- Turn ON RX-Q path Test Switch; To improve IQ path group delay (FA5976A_1.3C)</div><div class='add'>+	(0x12&lt;&lt;24)|0x000024  // 20060612.1.a 0x001824  // 941003 add</div><div class='add'>+						 //; TMODC (0x12) -- Turn OFF Tempearure sensor</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+u32 w89rf242_channel_data_24[][2] =</div><div class='add'>+{</div><div class='add'>+    {(0x03&lt;&lt;24)|0x025B06, (0x04&lt;&lt;24)|0x080408}, // channe1 01</div><div class='add'>+    {(0x03&lt;&lt;24)|0x025C46, (0x04&lt;&lt;24)|0x080408}, // channe1 02</div><div class='add'>+    {(0x03&lt;&lt;24)|0x025D86, (0x04&lt;&lt;24)|0x080408}, // channe1 03</div><div class='add'>+    {(0x03&lt;&lt;24)|0x025EC6, (0x04&lt;&lt;24)|0x080408}, // channe1 04</div><div class='add'>+    {(0x03&lt;&lt;24)|0x026006, (0x04&lt;&lt;24)|0x080408}, // channe1 05</div><div class='add'>+    {(0x03&lt;&lt;24)|0x026146, (0x04&lt;&lt;24)|0x080408}, // channe1 06</div><div class='add'>+    {(0x03&lt;&lt;24)|0x026286, (0x04&lt;&lt;24)|0x080408}, // channe1 07</div><div class='add'>+    {(0x03&lt;&lt;24)|0x0263C6, (0x04&lt;&lt;24)|0x080408}, // channe1 08</div><div class='add'>+    {(0x03&lt;&lt;24)|0x026506, (0x04&lt;&lt;24)|0x080408}, // channe1 09</div><div class='add'>+    {(0x03&lt;&lt;24)|0x026646, (0x04&lt;&lt;24)|0x080408}, // channe1 10</div><div class='add'>+    {(0x03&lt;&lt;24)|0x026786, (0x04&lt;&lt;24)|0x080408}, // channe1 11</div><div class='add'>+    {(0x03&lt;&lt;24)|0x0268C6, (0x04&lt;&lt;24)|0x080408}, // channe1 12</div><div class='add'>+    {(0x03&lt;&lt;24)|0x026A06, (0x04&lt;&lt;24)|0x080408}, // channe1 13</div><div class='add'>+    {(0x03&lt;&lt;24)|0x026D06, (0x04&lt;&lt;24)|0x080408}  // channe1 14</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+u32 w89rf242_power_data_24[] = {(0x05&lt;&lt;24)|0x24C48A, (0x05&lt;&lt;24)|0x24C48A, (0x05&lt;&lt;24)|0x24C48A};</div><div class='add'>+</div><div class='add'>+// 20060315.6 Enlarge for new scale</div><div class='add'>+// 20060316.6 20060619.2.a add mapping array</div><div class='add'>+u32 w89rf242_txvga_old_mapping[][2] =</div><div class='add'>+{</div><div class='add'>+	{0, 0} , // New &lt;-&gt; Old</div><div class='add'>+	{1, 1} ,</div><div class='add'>+	{2, 2} ,</div><div class='add'>+	{3, 3} ,</div><div class='add'>+	{4, 4} ,</div><div class='add'>+	{6, 5} ,</div><div class='add'>+	{8, 6 },</div><div class='add'>+	{10, 7 },</div><div class='add'>+	{12, 8 },</div><div class='add'>+	{14, 9 },</div><div class='add'>+	{16, 10},</div><div class='add'>+	{18, 11},</div><div class='add'>+	{20, 12},</div><div class='add'>+	{22, 13},</div><div class='add'>+	{24, 14},</div><div class='add'>+	{26, 15},</div><div class='add'>+	{28, 16},</div><div class='add'>+	{30, 17},</div><div class='add'>+	{32, 18},</div><div class='add'>+	{34, 19},</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+// 20060619.3 modify from Bruce's mail</div><div class='add'>+u32 w89rf242_txvga_data[][5] =</div><div class='add'>+{</div><div class='add'>+	//low gain mode</div><div class='add'>+	{ (0x05&lt;&lt;24)|0x24C00A, 0, 0x00292315, 0x0800FEFF, 0x52523131 },//  ; min gain</div><div class='add'>+	{ (0x05&lt;&lt;24)|0x24C80A, 1, 0x00292315, 0x0800FEFF, 0x52523131 },</div><div class='add'>+	{ (0x05&lt;&lt;24)|0x24C04A, 2, 0x00292315, 0x0800FEFF, 0x52523131 },//  (default) +14dBm (ANT)</div><div class='add'>+	{ (0x05&lt;&lt;24)|0x24C84A, 3, 0x00292315, 0x0800FEFF, 0x52523131 },</div><div class='add'>+</div><div class='add'>+	//TXVGA=0x10</div><div class='add'>+	{ (0x05&lt;&lt;24)|0x24C40A, 4, 0x00292315, 0x0800FEFF, 0x60603838 },</div><div class='add'>+	{ (0x05&lt;&lt;24)|0x24C40A, 5, 0x00262114, 0x0700FEFF, 0x65653B3B },</div><div class='add'>+</div><div class='add'>+	//TXVGA=0x11</div><div class='add'>+	{ (0x05&lt;&lt;24)|0x24C44A, 6, 0x00241F13, 0x0700FFFF, 0x58583333 },</div><div class='add'>+	{ (0x05&lt;&lt;24)|0x24C44A, 7, 0x00292315, 0x0800FEFF, 0x5E5E3737 },</div><div class='add'>+</div><div class='add'>+	//TXVGA=0x12</div><div class='add'>+	{ (0x05&lt;&lt;24)|0x24C48A, 8, 0x00262114, 0x0700FEFF, 0x53533030 },</div><div class='add'>+	{ (0x05&lt;&lt;24)|0x24C48A, 9, 0x00241F13, 0x0700FFFF, 0x59593434 },</div><div class='add'>+</div><div class='add'>+	//TXVGA=0x13</div><div class='add'>+	{ (0x05&lt;&lt;24)|0x24C4CA, 10, 0x00292315, 0x0800FEFF, 0x52523030 },</div><div class='add'>+	{ (0x05&lt;&lt;24)|0x24C4CA, 11, 0x00262114, 0x0700FEFF, 0x56563232 },</div><div class='add'>+</div><div class='add'>+	//TXVGA=0x14</div><div class='add'>+	{ (0x05&lt;&lt;24)|0x24C50A, 12, 0x00292315, 0x0800FEFF, 0x54543131 },</div><div class='add'>+	{ (0x05&lt;&lt;24)|0x24C50A, 13, 0x00262114, 0x0700FEFF, 0x58583434 },</div><div class='add'>+</div><div class='add'>+	//TXVGA=0x15</div><div class='add'>+	{ (0x05&lt;&lt;24)|0x24C54A, 14, 0x00292315, 0x0800FEFF, 0x54543131 },</div><div class='add'>+	{ (0x05&lt;&lt;24)|0x24C54A, 15, 0x00262114, 0x0700FEFF, 0x59593434 },</div><div class='add'>+</div><div class='add'>+	//TXVGA=0x16</div><div class='add'>+	{ (0x05&lt;&lt;24)|0x24C58A, 16, 0x00292315, 0x0800FEFF, 0x55553131 },</div><div class='add'>+	{ (0x05&lt;&lt;24)|0x24C58A, 17, 0x00292315, 0x0800FEFF, 0x5B5B3535 },</div><div class='add'>+</div><div class='add'>+	//TXVGA=0x17</div><div class='add'>+	{ (0x05&lt;&lt;24)|0x24C5CA, 18, 0x00262114, 0x0700FEFF, 0x51512F2F },</div><div class='add'>+	{ (0x05&lt;&lt;24)|0x24C5CA, 19, 0x00241F13, 0x0700FFFF, 0x55553131 },</div><div class='add'>+</div><div class='add'>+	//TXVGA=0x18</div><div class='add'>+	{ (0x05&lt;&lt;24)|0x24C60A, 20, 0x00292315, 0x0800FEFF, 0x4F4F2E2E },</div><div class='add'>+	{ (0x05&lt;&lt;24)|0x24C60A, 21, 0x00262114, 0x0700FEFF, 0x53533030 },</div><div class='add'>+</div><div class='add'>+	//TXVGA=0x19</div><div class='add'>+	{ (0x05&lt;&lt;24)|0x24C64A, 22, 0x00292315, 0x0800FEFF, 0x4E4E2D2D },</div><div class='add'>+	{ (0x05&lt;&lt;24)|0x24C64A, 23, 0x00262114, 0x0700FEFF, 0x53533030 },</div><div class='add'>+</div><div class='add'>+	//TXVGA=0x1A</div><div class='add'>+	{ (0x05&lt;&lt;24)|0x24C68A, 24, 0x00292315, 0x0800FEFF, 0x50502E2E },</div><div class='add'>+	{ (0x05&lt;&lt;24)|0x24C68A, 25, 0x00262114, 0x0700FEFF, 0x55553131 },</div><div class='add'>+</div><div class='add'>+	//TXVGA=0x1B</div><div class='add'>+	{ (0x05&lt;&lt;24)|0x24C6CA, 26, 0x00262114, 0x0700FEFF, 0x53533030 },</div><div class='add'>+	{ (0x05&lt;&lt;24)|0x24C6CA, 27, 0x00292315, 0x0800FEFF, 0x5A5A3434 },</div><div class='add'>+</div><div class='add'>+	//TXVGA=0x1C</div><div class='add'>+	{ (0x05&lt;&lt;24)|0x24C70A, 28, 0x00292315, 0x0800FEFF, 0x55553131 },</div><div class='add'>+	{ (0x05&lt;&lt;24)|0x24C70A, 29, 0x00292315, 0x0800FEFF, 0x5D5D3636 },</div><div class='add'>+</div><div class='add'>+	//TXVGA=0x1D</div><div class='add'>+	{ (0x05&lt;&lt;24)|0x24C74A, 30, 0x00292315, 0x0800FEFF, 0x5F5F3737 },</div><div class='add'>+	{ (0x05&lt;&lt;24)|0x24C74A, 31, 0x00262114, 0x0700FEFF, 0x65653B3B },</div><div class='add'>+</div><div class='add'>+	//TXVGA=0x1E</div><div class='add'>+	{ (0x05&lt;&lt;24)|0x24C78A, 32, 0x00292315, 0x0800FEFF, 0x66663B3B },</div><div class='add'>+	{ (0x05&lt;&lt;24)|0x24C78A, 33, 0x00262114, 0x0700FEFF, 0x70704141 },</div><div class='add'>+</div><div class='add'>+	//TXVGA=0x1F</div><div class='add'>+	{ (0x05&lt;&lt;24)|0x24C7CA, 34, 0x00292315, 0x0800FEFF, 0x72724242 }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+///////////////////////////////////////////////////////////////////////////////////////////////////</div><div class='add'>+///////////////////////////////////////////////////////////////////////////////////////////////////</div><div class='add'>+///////////////////////////////////////////////////////////////////////////////////////////////////</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+//=============================================================================================================</div><div class='add'>+//  Uxx_ReadEthernetAddress --</div><div class='add'>+//</div><div class='add'>+//  Routine Description:</div><div class='add'>+//    Reads in the Ethernet address from the IC.</div><div class='add'>+//</div><div class='add'>+//  Arguments:</div><div class='add'>+//    pHwData        - The pHwData structure</div><div class='add'>+//</div><div class='add'>+//  Return Value:</div><div class='add'>+//</div><div class='add'>+//    The address is stored in EthernetIDAddr.</div><div class='add'>+//=============================================================================================================</div><div class='add'>+void</div><div class='add'>+Uxx_ReadEthernetAddress(  phw_data_t pHwData )</div><div class='add'>+{</div><div class='add'>+	u32	ltmp;</div><div class='add'>+</div><div class='add'>+	// Reading Ethernet address from EEPROM and set into hardware due to MAC address maybe change.</div><div class='add'>+	// Only unplug and plug again can make hardware read EEPROM again. 20060727</div><div class='add'>+	Wb35Reg_WriteSync( pHwData, 0x03b4, 0x08000000 ); // Start EEPROM access + Read + address(0x0d)</div><div class='add'>+	Wb35Reg_ReadSync( pHwData, 0x03b4, &amp;ltmp );</div><div class='add'>+	*(PUSHORT)pHwData-&gt;PermanentMacAddress = cpu_to_le16((u16)ltmp); //20060926 anson's endian</div><div class='add'>+	Wb35Reg_WriteSync( pHwData, 0x03b4, 0x08010000 ); // Start EEPROM access + Read + address(0x0d)</div><div class='add'>+	Wb35Reg_ReadSync( pHwData, 0x03b4, &amp;ltmp );</div><div class='add'>+	*(PUSHORT)(pHwData-&gt;PermanentMacAddress + 2) = cpu_to_le16((u16)ltmp); //20060926 anson's endian</div><div class='add'>+	Wb35Reg_WriteSync( pHwData, 0x03b4, 0x08020000 ); // Start EEPROM access + Read + address(0x0d)</div><div class='add'>+	Wb35Reg_ReadSync( pHwData, 0x03b4, &amp;ltmp );</div><div class='add'>+	*(PUSHORT)(pHwData-&gt;PermanentMacAddress + 4) = cpu_to_le16((u16)ltmp); //20060926 anson's endian</div><div class='add'>+	*(PUSHORT)(pHwData-&gt;PermanentMacAddress + 6) = 0;</div><div class='add'>+	Wb35Reg_WriteSync( pHwData, 0x03e8, cpu_to_le32(*(PULONG)pHwData-&gt;PermanentMacAddress) ); //20060926 anson's endian</div><div class='add'>+	Wb35Reg_WriteSync( pHwData, 0x03ec, cpu_to_le32(*(PULONG)(pHwData-&gt;PermanentMacAddress+4)) ); //20060926 anson's endian</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+//===============================================================================================================</div><div class='add'>+//  CardGetMulticastBit --</div><div class='add'>+//  Description:</div><div class='add'>+//    For a given multicast address, returns the byte and bit in the card multicast registers that it hashes to.</div><div class='add'>+//    Calls CardComputeCrc() to determine the CRC value.</div><div class='add'>+//  Arguments:</div><div class='add'>+//    Address - the address</div><div class='add'>+//    Byte - the byte that it hashes to</div><div class='add'>+//    Value - will have a 1 in the relevant bit</div><div class='add'>+//  Return Value:</div><div class='add'>+//    None.</div><div class='add'>+//==============================================================================================================</div><div class='add'>+void CardGetMulticastBit(   u8 Address[ETH_LENGTH_OF_ADDRESS],</div><div class='add'>+						   u8 *Byte,  u8 *Value )</div><div class='add'>+{</div><div class='add'>+    u32 Crc;</div><div class='add'>+    u32 BitNumber;</div><div class='add'>+</div><div class='add'>+    // First compute the CRC.</div><div class='add'>+    Crc = CardComputeCrc(Address, ETH_LENGTH_OF_ADDRESS);</div><div class='add'>+</div><div class='add'>+	// The computed CRC is bit0~31 from left to right</div><div class='add'>+	//At first we should do right shift 25bits, and read 7bits by using '&amp;', 2^7=128</div><div class='add'>+	BitNumber = (u32) ((Crc &gt;&gt; 26) &amp; 0x3f);</div><div class='add'>+</div><div class='add'>+	*Byte  = (u8) (BitNumber &gt;&gt; 3);// 900514 original (BitNumber / 8)</div><div class='add'>+	*Value = (u8) ((u8)1 &lt;&lt; (BitNumber % 8));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void Uxx_power_on_procedure(  phw_data_t pHwData )</div><div class='add'>+{</div><div class='add'>+	u32	ltmp, loop;</div><div class='add'>+</div><div class='add'>+	if( pHwData-&gt;phy_type &lt;= RF_MAXIM_V1 )</div><div class='add'>+		Wb35Reg_WriteSync( pHwData, 0x03d4, 0xffffff38 );</div><div class='add'>+	else</div><div class='add'>+	{</div><div class='add'>+		Wb35Reg_WriteSync( pHwData, 0x03f4, 0xFF5807FF );// 20060721 For NEW IC 0xFF5807FF</div><div class='add'>+</div><div class='add'>+		// 20060511.1 Fix the following 4 steps for Rx of RF 2230 initial fail</div><div class='add'>+		Wb35Reg_WriteSync( pHwData, 0x03d4, 0x80 );// regulator on only</div><div class='add'>+		OS_SLEEP(10000); // Modify 20051221.1.b</div><div class='add'>+		Wb35Reg_WriteSync( pHwData, 0x03d4, 0xb8 );// REG_ON RF_RSTN on, and</div><div class='add'>+		OS_SLEEP(10000); // Modify 20051221.1.b</div><div class='add'>+</div><div class='add'>+		ltmp = 0x4968;</div><div class='add'>+		if( (pHwData-&gt;phy_type == RF_WB_242) ||</div><div class='add'>+			(RF_WB_242_1 == pHwData-&gt;phy_type) ) // 20060619.5 Add</div><div class='add'>+			ltmp = 0x4468;</div><div class='add'>+		Wb35Reg_WriteSync( pHwData, 0x03d0, ltmp );</div><div class='add'>+</div><div class='add'>+		Wb35Reg_WriteSync( pHwData, 0x03d4, 0xa0 );// PLL_PD REF_PD set to 0</div><div class='add'>+</div><div class='add'>+		OS_SLEEP(20000); // Modify 20051221.1.b</div><div class='add'>+		Wb35Reg_ReadSync( pHwData, 0x03d0, &amp;ltmp );</div><div class='add'>+		loop = 500; // Wait for 5 second 20061101</div><div class='add'>+		while( !(ltmp &amp; 0x20) &amp;&amp; loop-- )</div><div class='add'>+		{</div><div class='add'>+			OS_SLEEP(10000); // Modify 20051221.1.b</div><div class='add'>+			if( !Wb35Reg_ReadSync( pHwData, 0x03d0, &amp;ltmp ) )</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		Wb35Reg_WriteSync( pHwData, 0x03d4, 0xe0 );// MLK_EN</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	Wb35Reg_WriteSync( pHwData, 0x03b0, 1 );// Reset hardware first</div><div class='add'>+	OS_SLEEP(10000); // Add this 20051221.1.b</div><div class='add'>+</div><div class='add'>+	// Set burst write delay</div><div class='add'>+	Wb35Reg_WriteSync( pHwData, 0x03f8, 0x7ff );</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void Set_ChanIndep_RfData_al7230_24(  phw_data_t pHwData, u32 *pltmp ,char number)</div><div class='add'>+{</div><div class='add'>+	u8	i;</div><div class='add'>+</div><div class='add'>+	for( i=0; i&lt;number; i++ )</div><div class='add'>+	{</div><div class='add'>+		pHwData-&gt;phy_para[i] = al7230_rf_data_24[i];</div><div class='add'>+		pltmp[i] = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (24 &lt;&lt; 24) | (al7230_rf_data_24[i]&amp;0xffffff);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void Set_ChanIndep_RfData_al7230_50(  phw_data_t pHwData, u32 *pltmp, char number)</div><div class='add'>+{</div><div class='add'>+	u8	i;</div><div class='add'>+</div><div class='add'>+	for( i=0; i&lt;number; i++ )</div><div class='add'>+	{</div><div class='add'>+		pHwData-&gt;phy_para[i] = al7230_rf_data_50[i];</div><div class='add'>+		pltmp[i] = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (24 &lt;&lt; 24) | (al7230_rf_data_50[i]&amp;0xffffff);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+//=============================================================================================================</div><div class='add'>+// RFSynthesizer_initial --</div><div class='add'>+//=============================================================================================================</div><div class='add'>+void</div><div class='add'>+RFSynthesizer_initial(phw_data_t pHwData)</div><div class='add'>+{</div><div class='add'>+	u32	altmp[32];</div><div class='add'>+	PULONG	pltmp = altmp;</div><div class='add'>+	u32	ltmp;</div><div class='add'>+	u8	number=0x00; // The number of register vale</div><div class='add'>+	u8	i;</div><div class='add'>+</div><div class='add'>+	//</div><div class='add'>+	// bit[31]      SPI Enable.</div><div class='add'>+	//              1=perform synthesizer program operation. This bit will</div><div class='add'>+	//              cleared automatically after the operation is completed.</div><div class='add'>+	// bit[30]      SPI R/W Control</div><div class='add'>+	//              0=write,    1=read</div><div class='add'>+	// bit[29:24]   SPI Data Format Length</div><div class='add'>+	// bit[17:4 ]   RF Data bits.</div><div class='add'>+	// bit[3 :0 ]   RF address.</div><div class='add'>+	switch( pHwData-&gt;phy_type )</div><div class='add'>+	{</div><div class='add'>+	case RF_MAXIM_2825:</div><div class='add'>+	case RF_MAXIM_V1: // 11g Winbond 2nd BB(with Phy board (v1) + Maxim 331)</div><div class='add'>+		number = sizeof(max2825_rf_data)/sizeof(max2825_rf_data[0]);</div><div class='add'>+		for( i=0; i&lt;number; i++ )</div><div class='add'>+		{</div><div class='add'>+			pHwData-&gt;phy_para[i] = max2825_rf_data[i];// Backup Rf parameter</div><div class='add'>+			pltmp[i] = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (18 &lt;&lt; 24) | BitReverse( max2825_rf_data[i], 18);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case RF_MAXIM_2827:</div><div class='add'>+		number = sizeof(max2827_rf_data)/sizeof(max2827_rf_data[0]);</div><div class='add'>+		for( i=0; i&lt;number; i++ )</div><div class='add'>+		{</div><div class='add'>+			pHwData-&gt;phy_para[i] = max2827_rf_data[i];</div><div class='add'>+			pltmp[i] = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (18 &lt;&lt; 24) | BitReverse( max2827_rf_data[i], 18);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case RF_MAXIM_2828:</div><div class='add'>+		number = sizeof(max2828_rf_data)/sizeof(max2828_rf_data[0]);</div><div class='add'>+		for( i=0; i&lt;number; i++ )</div><div class='add'>+		{</div><div class='add'>+			pHwData-&gt;phy_para[i] = max2828_rf_data[i];</div><div class='add'>+			pltmp[i] = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (18 &lt;&lt; 24) | BitReverse( max2828_rf_data[i], 18);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case RF_MAXIM_2829:</div><div class='add'>+		number = sizeof(max2829_rf_data)/sizeof(max2829_rf_data[0]);</div><div class='add'>+		for( i=0; i&lt;number; i++ )</div><div class='add'>+		{</div><div class='add'>+			pHwData-&gt;phy_para[i] = max2829_rf_data[i];</div><div class='add'>+			pltmp[i] = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (18 &lt;&lt; 24) | BitReverse( max2829_rf_data[i], 18);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case RF_AIROHA_2230:</div><div class='add'>+		number = sizeof(al2230_rf_data)/sizeof(al2230_rf_data[0]);</div><div class='add'>+		for( i=0; i&lt;number; i++ )</div><div class='add'>+		{</div><div class='add'>+			pHwData-&gt;phy_para[i] = al2230_rf_data[i];</div><div class='add'>+			pltmp[i] = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (20 &lt;&lt; 24) | BitReverse( al2230_rf_data[i], 20);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case RF_AIROHA_2230S:</div><div class='add'>+		number = sizeof(al2230s_rf_data)/sizeof(al2230s_rf_data[0]);</div><div class='add'>+		for( i=0; i&lt;number; i++ )</div><div class='add'>+		{</div><div class='add'>+			pHwData-&gt;phy_para[i] = al2230s_rf_data[i];</div><div class='add'>+			pltmp[i] = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (20 &lt;&lt; 24) | BitReverse( al2230s_rf_data[i], 20);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case RF_AIROHA_7230:</div><div class='add'>+</div><div class='add'>+		//Start to fill RF parameters, PLL_ON should be pulled low.</div><div class='add'>+		Wb35Reg_WriteSync( pHwData, 0x03dc, 0x00000000 );</div><div class='add'>+#ifdef _PE_STATE_DUMP_</div><div class='add'>+		WBDEBUG(("* PLL_ON    low\n"));</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+		number = sizeof(al7230_rf_data_24)/sizeof(al7230_rf_data_24[0]);</div><div class='add'>+		Set_ChanIndep_RfData_al7230_24(pHwData, pltmp, number);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case RF_WB_242:</div><div class='add'>+	case RF_WB_242_1: // 20060619.5 Add</div><div class='add'>+		number = sizeof(w89rf242_rf_data)/sizeof(w89rf242_rf_data[0]);</div><div class='add'>+		for( i=0; i&lt;number; i++ )</div><div class='add'>+		{</div><div class='add'>+			ltmp = w89rf242_rf_data[i];</div><div class='add'>+			if( i == 4 ) // Update the VCO trim from EEPROM</div><div class='add'>+			{</div><div class='add'>+				ltmp &amp;= ~0xff0; // Mask bit4 ~bit11</div><div class='add'>+				ltmp |= pHwData-&gt;VCO_trim&lt;&lt;4;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			pHwData-&gt;phy_para[i] = ltmp;</div><div class='add'>+			pltmp[i] = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (24 &lt;&lt; 24) | BitReverse( ltmp, 24);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pHwData-&gt;phy_number = number;</div><div class='add'>+</div><div class='add'>+	 // The 16 is the maximum capability of hardware. Here use 12</div><div class='add'>+	if( number &gt; 12 ) {</div><div class='add'>+		//Wb35Reg_BurstWrite( pHwData, 0x0864, pltmp, 12, NO_INCREMENT );</div><div class='add'>+		for( i=0; i&lt;12; i++ ) // For Al2230</div><div class='add'>+			Wb35Reg_WriteSync( pHwData, 0x0864, pltmp[i] );</div><div class='add'>+</div><div class='add'>+		pltmp += 12;</div><div class='add'>+		number -= 12;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	// Write to register. number must less and equal than 16</div><div class='add'>+	for( i=0; i&lt;number; i++ )</div><div class='add'>+		Wb35Reg_WriteSync( pHwData, 0x864, pltmp[i] );</div><div class='add'>+</div><div class='add'>+	// 20060630.1 Calibration only 1 time</div><div class='add'>+	if( pHwData-&gt;CalOneTime )</div><div class='add'>+		return;</div><div class='add'>+	pHwData-&gt;CalOneTime = 1;</div><div class='add'>+</div><div class='add'>+	switch( pHwData-&gt;phy_type )</div><div class='add'>+	{</div><div class='add'>+		case RF_AIROHA_2230:</div><div class='add'>+</div><div class='add'>+			// 20060511.1 --- Modifying the follow step for Rx issue-----------------</div><div class='add'>+			ltmp = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (20 &lt;&lt; 24) | BitReverse( (0x07&lt;&lt;20)|0xE168E, 20);</div><div class='add'>+			Wb35Reg_WriteSync( pHwData, 0x0864, ltmp );</div><div class='add'>+			OS_SLEEP(10000);</div><div class='add'>+			ltmp = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (20 &lt;&lt; 24) | BitReverse( al2230_rf_data[7], 20);</div><div class='add'>+			Wb35Reg_WriteSync( pHwData, 0x0864, ltmp );</div><div class='add'>+			OS_SLEEP(10000);</div><div class='add'>+</div><div class='add'>+		case RF_AIROHA_2230S: // 20060420 Add this</div><div class='add'>+</div><div class='add'>+			// 20060511.1 --- Modifying the follow step for Rx issue-----------------</div><div class='add'>+			Wb35Reg_WriteSync( pHwData, 0x03d4, 0x80 );// regulator on only</div><div class='add'>+			OS_SLEEP(10000); // Modify 20051221.1.b</div><div class='add'>+</div><div class='add'>+			Wb35Reg_WriteSync( pHwData, 0x03d4, 0xa0 );// PLL_PD REF_PD set to 0</div><div class='add'>+			OS_SLEEP(10000); // Modify 20051221.1.b</div><div class='add'>+</div><div class='add'>+			Wb35Reg_WriteSync( pHwData, 0x03d4, 0xe0 );// MLK_EN</div><div class='add'>+			Wb35Reg_WriteSync( pHwData, 0x03b0, 1 );// Reset hardware first</div><div class='add'>+			OS_SLEEP(10000); // Add this 20051221.1.b</div><div class='add'>+			//------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+			// The follow code doesn't use the burst-write mode</div><div class='add'>+			//phy_set_rf_data(phw_data, 0x0F, (0x0F&lt;&lt;20) | 0xF01A0); //Raise Initial Setting</div><div class='add'>+			ltmp = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (20 &lt;&lt; 24) | BitReverse( (0x0F&lt;&lt;20) | 0xF01A0, 20);</div><div class='add'>+			Wb35Reg_WriteSync( pHwData, 0x0864, ltmp );</div><div class='add'>+</div><div class='add'>+			ltmp = pHwData-&gt;Wb35Reg.BB5C &amp; 0xfffff000;</div><div class='add'>+			Wb35Reg_WriteSync( pHwData, 0x105c, ltmp );</div><div class='add'>+			pHwData-&gt;Wb35Reg.BB50 |= 0x13;//(MASK_IQCAL_MODE|MASK_CALIB_START);//20060315.1 modify</div><div class='add'>+        	Wb35Reg_WriteSync( pHwData, 0x1050, pHwData-&gt;Wb35Reg.BB50);</div><div class='add'>+			OS_SLEEP(5000);</div><div class='add'>+</div><div class='add'>+			//phy_set_rf_data(phw_data, 0x0F, (0x0F&lt;&lt;20) | 0xF01B0); //Activate Filter Cal.</div><div class='add'>+			ltmp = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (20 &lt;&lt; 24) | BitReverse( (0x0F&lt;&lt;20) | 0xF01B0, 20);</div><div class='add'>+			Wb35Reg_WriteSync( pHwData, 0x0864, ltmp );</div><div class='add'>+			OS_SLEEP(5000);</div><div class='add'>+</div><div class='add'>+			//phy_set_rf_data(phw_data, 0x0F, (0x0F&lt;&lt;20) | 0xF01e0); //Activate TX DCC</div><div class='add'>+			ltmp = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (20 &lt;&lt; 24) | BitReverse( (0x0F&lt;&lt;20) | 0xF01E0, 20);</div><div class='add'>+			Wb35Reg_WriteSync( pHwData, 0x0864, ltmp );</div><div class='add'>+			OS_SLEEP(5000);</div><div class='add'>+</div><div class='add'>+			//phy_set_rf_data(phw_data, 0x0F, (0x0F&lt;&lt;20) | 0xF01A0); //Resotre Initial Setting</div><div class='add'>+			ltmp = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (20 &lt;&lt; 24) | BitReverse( (0x0F&lt;&lt;20) | 0xF01A0, 20);</div><div class='add'>+			Wb35Reg_WriteSync( pHwData, 0x0864, ltmp );</div><div class='add'>+</div><div class='add'>+//			//Force TXI(Q)P(N) to normal control</div><div class='add'>+			Wb35Reg_WriteSync( pHwData, 0x105c, pHwData-&gt;Wb35Reg.BB5C );</div><div class='add'>+			pHwData-&gt;Wb35Reg.BB50 &amp;= ~0x13;//(MASK_IQCAL_MODE|MASK_CALIB_START);</div><div class='add'>+        	Wb35Reg_WriteSync( pHwData, 0x1050, pHwData-&gt;Wb35Reg.BB50);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case RF_AIROHA_7230:</div><div class='add'>+</div><div class='add'>+			//RF parameters have filled completely, PLL_ON should be</div><div class='add'>+			//pulled high</div><div class='add'>+			Wb35Reg_WriteSync( pHwData, 0x03dc, 0x00000080 );</div><div class='add'>+			#ifdef _PE_STATE_DUMP_</div><div class='add'>+			WBDEBUG(("* PLL_ON    high\n"));</div><div class='add'>+			#endif</div><div class='add'>+</div><div class='add'>+			//2.4GHz</div><div class='add'>+			//ltmp = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (24 &lt;&lt; 24) | 0x1ABA8F;</div><div class='add'>+			//Wb35Reg_WriteSync pHwData, 0x0864, ltmp );</div><div class='add'>+			//OS_SLEEP(1000); // Sleep 1 ms</div><div class='add'>+			ltmp = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (24 &lt;&lt; 24) | 0x9ABA8F;</div><div class='add'>+			Wb35Reg_WriteSync( pHwData, 0x0864, ltmp );</div><div class='add'>+			OS_SLEEP(5000);</div><div class='add'>+			ltmp = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (24 &lt;&lt; 24) | 0x3ABA8F;</div><div class='add'>+			Wb35Reg_WriteSync( pHwData, 0x0864, ltmp );</div><div class='add'>+			OS_SLEEP(5000);</div><div class='add'>+			ltmp = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (24 &lt;&lt; 24) | 0x1ABA8F;</div><div class='add'>+			Wb35Reg_WriteSync( pHwData, 0x0864, ltmp );</div><div class='add'>+			OS_SLEEP(5000);</div><div class='add'>+</div><div class='add'>+			//5GHz</div><div class='add'>+			Wb35Reg_WriteSync( pHwData, 0x03dc, 0x00000000 );</div><div class='add'>+			#ifdef _PE_STATE_DUMP_</div><div class='add'>+			WBDEBUG(("* PLL_ON    low\n"));</div><div class='add'>+			#endif</div><div class='add'>+</div><div class='add'>+			number = sizeof(al7230_rf_data_50)/sizeof(al7230_rf_data_50[0]);</div><div class='add'>+			Set_ChanIndep_RfData_al7230_50(pHwData, pltmp, number);</div><div class='add'>+			// Write to register. number must less and equal than 16</div><div class='add'>+			for( i=0; i&lt;number; i++ )</div><div class='add'>+				Wb35Reg_WriteSync( pHwData, 0x0864, pltmp[i] );</div><div class='add'>+			OS_SLEEP(5000);</div><div class='add'>+</div><div class='add'>+			Wb35Reg_WriteSync( pHwData, 0x03dc, 0x00000080 );</div><div class='add'>+			#ifdef _PE_STATE_DUMP_</div><div class='add'>+			WBDEBUG(("* PLL_ON    high\n"));</div><div class='add'>+			#endif</div><div class='add'>+</div><div class='add'>+			//ltmp = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (24 &lt;&lt; 24) | 0x12BACF;</div><div class='add'>+			//Wb35Reg_WriteSync( pHwData, 0x0864, ltmp );</div><div class='add'>+			ltmp = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (24 &lt;&lt; 24) | 0x9ABA8F;</div><div class='add'>+			Wb35Reg_WriteSync( pHwData, 0x0864, ltmp );</div><div class='add'>+			OS_SLEEP(5000);</div><div class='add'>+			ltmp = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (24 &lt;&lt; 24) | 0x3ABA8F;</div><div class='add'>+			Wb35Reg_WriteSync( pHwData, 0x0864, ltmp );</div><div class='add'>+			OS_SLEEP(5000);</div><div class='add'>+			ltmp = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (24 &lt;&lt; 24) | 0x12BACF;</div><div class='add'>+			Wb35Reg_WriteSync( pHwData, 0x0864, ltmp );</div><div class='add'>+			OS_SLEEP(5000);</div><div class='add'>+</div><div class='add'>+			//Wb35Reg_WriteSync( pHwData, 0x03dc, 0x00000080 );</div><div class='add'>+			//WBDEBUG(("* PLL_ON    high\n"));</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case RF_WB_242:</div><div class='add'>+		case RF_WB_242_1: // 20060619.5 Add</div><div class='add'>+</div><div class='add'>+			//</div><div class='add'>+			// ; Version 1.3B revision items: for FA5976A , October 3, 2005 by HTHo</div><div class='add'>+			//</div><div class='add'>+			ltmp = pHwData-&gt;Wb35Reg.BB5C &amp; 0xfffff000;</div><div class='add'>+			Wb35Reg_WriteSync( pHwData, 0x105c, ltmp );</div><div class='add'>+			Wb35Reg_WriteSync( pHwData, 0x1058, 0 );</div><div class='add'>+			pHwData-&gt;Wb35Reg.BB50 |= 0x3;//(MASK_IQCAL_MODE|MASK_CALIB_START);//20060630</div><div class='add'>+	      	Wb35Reg_WriteSync( pHwData, 0x1050, pHwData-&gt;Wb35Reg.BB50);</div><div class='add'>+</div><div class='add'>+			//----- Calibration (1). VCO frequency calibration</div><div class='add'>+			//Calibration (1a.0). Synthesizer reset (HTHo corrected 2005/05/10)</div><div class='add'>+			ltmp = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (24 &lt;&lt; 24) | BitReverse( (0x0F&lt;&lt;24) | 0x00101E, 24);</div><div class='add'>+			Wb35Reg_WriteSync( pHwData, 0x0864, ltmp );</div><div class='add'>+			OS_SLEEP( 5000 ); // Sleep 5ms</div><div class='add'>+			//Calibration (1a). VCO frequency calibration mode ; waiting 2msec VCO calibration time</div><div class='add'>+			ltmp = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (24 &lt;&lt; 24) | BitReverse( (0x00&lt;&lt;24) | 0xFE69c0, 24);</div><div class='add'>+			Wb35Reg_WriteSync( pHwData, 0x0864, ltmp );</div><div class='add'>+			OS_SLEEP( 2000 ); // Sleep 2ms</div><div class='add'>+</div><div class='add'>+			//----- Calibration (2). TX baseband Gm-C filter auto-tuning</div><div class='add'>+			//Calibration (2a). turn off ENCAL signal</div><div class='add'>+			ltmp = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (24 &lt;&lt; 24) | BitReverse( (0x00&lt;&lt;24) | 0xF8EBC0, 24);</div><div class='add'>+			Wb35Reg_WriteSync( pHwData, 0x0864, ltmp );</div><div class='add'>+			//Calibration (2b.0). TX filter auto-tuning BW: TFLBW=101 (TC5376A default)</div><div class='add'>+			ltmp = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (24 &lt;&lt; 24) | BitReverse( (0x07&lt;&lt;24) | 0x0C68CE, 24);</div><div class='add'>+			Wb35Reg_WriteSync( pHwData, 0x0864, ltmp );</div><div class='add'>+			//Calibration (2b). send TX reset signal (HTHo corrected May 10, 2005)</div><div class='add'>+			ltmp = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (24 &lt;&lt; 24) | BitReverse( (0x0F&lt;&lt;24) | 0x00201E, 24);</div><div class='add'>+			Wb35Reg_WriteSync( pHwData, 0x0864, ltmp );</div><div class='add'>+			//Calibration (2c). turn-on TX Gm-C filter auto-tuning</div><div class='add'>+			ltmp = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (24 &lt;&lt; 24) | BitReverse( (0x00&lt;&lt;24) | 0xFCEBC0, 24);</div><div class='add'>+			Wb35Reg_WriteSync( pHwData, 0x0864, ltmp );</div><div class='add'>+			OS_SLEEP( 150 ); // Sleep 150 us</div><div class='add'>+			//turn off ENCAL signal</div><div class='add'>+			ltmp = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (24 &lt;&lt; 24) | BitReverse( (0x00&lt;&lt;24) | 0xF8EBC0, 24);</div><div class='add'>+			Wb35Reg_WriteSync( pHwData, 0x0864, ltmp );</div><div class='add'>+</div><div class='add'>+			//----- Calibration (3). RX baseband Gm-C filter auto-tuning</div><div class='add'>+			//Calibration (3a). turn off ENCAL signal</div><div class='add'>+			ltmp = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (24 &lt;&lt; 24) | BitReverse( (0x00&lt;&lt;24) | 0xFAEDC0, 24);</div><div class='add'>+			Wb35Reg_WriteSync( pHwData, 0x0864, ltmp );</div><div class='add'>+			//Calibration (3b.0). RX filter auto-tuning BW: RFLBW=100 (TC5376A+corner default; July 26, 2005)</div><div class='add'>+			ltmp = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (24 &lt;&lt; 24) | BitReverse( (0x07&lt;&lt;24) | 0x0C68CE, 24);</div><div class='add'>+			Wb35Reg_WriteSync( pHwData, 0x0864, ltmp );</div><div class='add'>+			//Calibration (3b). send RX reset signal (HTHo corrected May 10, 2005)</div><div class='add'>+			ltmp = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (24 &lt;&lt; 24) | BitReverse( (0x0F&lt;&lt;24) | 0x00401E, 24);</div><div class='add'>+			Wb35Reg_WriteSync( pHwData, 0x0864, ltmp );</div><div class='add'>+			//Calibration (3c). turn-on RX Gm-C filter auto-tuning</div><div class='add'>+			ltmp = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (24 &lt;&lt; 24) | BitReverse( (0x00&lt;&lt;24) | 0xFEEDC0, 24);</div><div class='add'>+			Wb35Reg_WriteSync( pHwData, 0x0864, ltmp );</div><div class='add'>+			OS_SLEEP( 150 ); // Sleep 150 us</div><div class='add'>+			//Calibration (3e). turn off ENCAL signal</div><div class='add'>+			ltmp = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (24 &lt;&lt; 24) | BitReverse( (0x00&lt;&lt;24) | 0xFAEDC0, 24);</div><div class='add'>+			Wb35Reg_WriteSync( pHwData, 0x0864, ltmp );</div><div class='add'>+</div><div class='add'>+			//----- Calibration (4). TX LO leakage calibration</div><div class='add'>+			//Calibration (4a). TX LO leakage calibration</div><div class='add'>+			ltmp = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (24 &lt;&lt; 24) | BitReverse( (0x00&lt;&lt;24) | 0xFD6BC0, 24);</div><div class='add'>+			Wb35Reg_WriteSync( pHwData, 0x0864, ltmp );</div><div class='add'>+			OS_SLEEP( 150 ); // Sleep 150 us</div><div class='add'>+</div><div class='add'>+			//----- Calibration (5). RX DC offset calibration</div><div class='add'>+			//Calibration (5a). turn off ENCAL signal and set to RX SW DC caliration mode</div><div class='add'>+			ltmp = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (24 &lt;&lt; 24) | BitReverse( (0x00&lt;&lt;24) | 0xFAEDC0, 24);</div><div class='add'>+			Wb35Reg_WriteSync( pHwData, 0x0864, ltmp );</div><div class='add'>+			//Calibration (5b). turn off AGC servo-loop &amp; RSSI</div><div class='add'>+			ltmp = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (24 &lt;&lt; 24) | BitReverse( (0x01&lt;&lt;24) | 0xEBFFC2, 24);</div><div class='add'>+			Wb35Reg_WriteSync( pHwData, 0x0864, ltmp );</div><div class='add'>+</div><div class='add'>+			//; for LNA=11 --------</div><div class='add'>+			//Calibration (5c-h). RX DC offset current bias ON; &amp; LNA=11; RXVGA=111111</div><div class='add'>+			ltmp = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (24 &lt;&lt; 24) | BitReverse( (0x06&lt;&lt;24) | 0x343FCC, 24);</div><div class='add'>+			Wb35Reg_WriteSync( pHwData, 0x0864, ltmp );</div><div class='add'>+			//Calibration (5d). turn on RX DC offset cal function; and waiting 2 msec cal time</div><div class='add'>+			ltmp = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (24 &lt;&lt; 24) | BitReverse( (0x00&lt;&lt;24) | 0xFF6DC0, 24);</div><div class='add'>+			Wb35Reg_WriteSync( pHwData, 0x0864, ltmp );</div><div class='add'>+			OS_SLEEP(2000); // Sleep 2ms</div><div class='add'>+			//Calibration (5f). turn off ENCAL signal</div><div class='add'>+			ltmp = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (24 &lt;&lt; 24) | BitReverse( (0x00&lt;&lt;24) | 0xFAEDC0, 24);</div><div class='add'>+			Wb35Reg_WriteSync( pHwData, 0x0864, ltmp );</div><div class='add'>+</div><div class='add'>+			//; for LNA=10 --------</div><div class='add'>+			//Calibration (5c-m). RX DC offset current bias ON; &amp; LNA=10; RXVGA=111111</div><div class='add'>+			ltmp = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (24 &lt;&lt; 24) | BitReverse( (0x06&lt;&lt;24) | 0x342FCC, 24);</div><div class='add'>+			Wb35Reg_WriteSync( pHwData, 0x0864, ltmp );</div><div class='add'>+			//Calibration (5d). turn on RX DC offset cal function; and waiting 2 msec cal time</div><div class='add'>+			ltmp = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (24 &lt;&lt; 24) | BitReverse( (0x00&lt;&lt;24) | 0xFF6DC0, 24);</div><div class='add'>+			Wb35Reg_WriteSync( pHwData, 0x0864, ltmp );</div><div class='add'>+			OS_SLEEP(2000); // Sleep 2ms</div><div class='add'>+			//Calibration (5f). turn off ENCAL signal</div><div class='add'>+			ltmp = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (24 &lt;&lt; 24) | BitReverse( (0x00&lt;&lt;24) | 0xFAEDC0, 24);</div><div class='add'>+			Wb35Reg_WriteSync( pHwData, 0x0864, ltmp );</div><div class='add'>+</div><div class='add'>+			//; for LNA=01 --------</div><div class='add'>+			//Calibration (5c-m). RX DC offset current bias ON; &amp; LNA=01; RXVGA=111111</div><div class='add'>+			ltmp = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (24 &lt;&lt; 24) | BitReverse( (0x06&lt;&lt;24) | 0x341FCC, 24);</div><div class='add'>+			Wb35Reg_WriteSync( pHwData, 0x0864, ltmp );</div><div class='add'>+			//Calibration (5d). turn on RX DC offset cal function; and waiting 2 msec cal time</div><div class='add'>+			ltmp = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (24 &lt;&lt; 24) | BitReverse( (0x00&lt;&lt;24) | 0xFF6DC0, 24);</div><div class='add'>+			Wb35Reg_WriteSync( pHwData, 0x0864, ltmp );</div><div class='add'>+			OS_SLEEP(2000); // Sleep 2ms</div><div class='add'>+			//Calibration (5f). turn off ENCAL signal</div><div class='add'>+			ltmp = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (24 &lt;&lt; 24) | BitReverse( (0x00&lt;&lt;24) | 0xFAEDC0, 24);</div><div class='add'>+			Wb35Reg_WriteSync( pHwData, 0x0864, ltmp );</div><div class='add'>+</div><div class='add'>+			//; for LNA=00 --------</div><div class='add'>+			//Calibration (5c-l). RX DC offset current bias ON; &amp; LNA=00; RXVGA=111111</div><div class='add'>+			ltmp = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (24 &lt;&lt; 24) | BitReverse( (0x06&lt;&lt;24) | 0x340FCC, 24);</div><div class='add'>+			Wb35Reg_WriteSync( pHwData, 0x0864, ltmp );</div><div class='add'>+			//Calibration (5d). turn on RX DC offset cal function; and waiting 2 msec cal time</div><div class='add'>+			ltmp = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (24 &lt;&lt; 24) | BitReverse( (0x00&lt;&lt;24) | 0xFF6DC0, 24);</div><div class='add'>+			Wb35Reg_WriteSync( pHwData, 0x0864, ltmp );</div><div class='add'>+			OS_SLEEP(2000); // Sleep 2ms</div><div class='add'>+			//Calibration (5f). turn off ENCAL signal</div><div class='add'>+			ltmp = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (24 &lt;&lt; 24) | BitReverse( (0x00&lt;&lt;24) | 0xFAEDC0, 24);</div><div class='add'>+			Wb35Reg_WriteSync( pHwData, 0x0864, ltmp );</div><div class='add'>+			//Calibration (5g). turn on AGC servo-loop</div><div class='add'>+			ltmp = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (24 &lt;&lt; 24) | BitReverse( (0x01&lt;&lt;24) | 0xEFFFC2, 24);</div><div class='add'>+			Wb35Reg_WriteSync( pHwData, 0x0864, ltmp );</div><div class='add'>+</div><div class='add'>+			//; ----- Calibration (7). Switch RF chip to normal mode</div><div class='add'>+			//0x00 0xF86100 ; 3E184   ; Switch RF chip to normal mode</div><div class='add'>+//			OS_SLEEP(10000); // @@ 20060721</div><div class='add'>+			ltmp = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (24 &lt;&lt; 24) | BitReverse( (0x00&lt;&lt;24) | 0xF86100, 24);</div><div class='add'>+			Wb35Reg_WriteSync( pHwData, 0x0864, ltmp );</div><div class='add'>+			OS_SLEEP(5000); // Sleep 5 ms</div><div class='add'>+</div><div class='add'>+//			//write back</div><div class='add'>+//			Wb35Reg_WriteSync( pHwData, 0x105c, pHwData-&gt;Wb35Reg.BB5C );</div><div class='add'>+//			pHwData-&gt;Wb35Reg.BB50 &amp;= ~0x13;//(MASK_IQCAL_MODE|MASK_CALIB_START); // 20060315.1 fix</div><div class='add'>+//      	Wb35Reg_WriteSync( pHwData, 0x1050, pHwData-&gt;Wb35Reg.BB50);</div><div class='add'>+//			OS_SLEEP(1000); // Sleep 1 ms</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void BBProcessor_AL7230_2400(  phw_data_t pHwData)</div><div class='add'>+{</div><div class='add'>+	PWB35REG	pWb35Reg = &amp;pHwData-&gt;Wb35Reg;</div><div class='add'>+	u32	pltmp[12];</div><div class='add'>+</div><div class='add'>+	pltmp[0] = 0x16A8337A; // 0x16a5215f; // 0x1000 AGC_Ctrl1</div><div class='add'>+	pltmp[1] = 0x9AFF9AA6; // 0x9aff9ca6; // 0x1004 AGC_Ctrl2</div><div class='add'>+	pltmp[2] = 0x55D00A04; // 0x55d00a04; // 0x1008 AGC_Ctrl3</div><div class='add'>+	pltmp[3] = 0xFFF72031; // 0xFfFf2138; // 0x100c AGC_Ctrl4</div><div class='add'>+	pWb35Reg-&gt;BB0C = 0xFFF72031;</div><div class='add'>+	pltmp[4] = 0x0FacDCC5; // 0x1010 AGC_Ctrl5 // 20050927 0x0FacDCB7</div><div class='add'>+	pltmp[5] = 0x00CAA333; // 0x00eaa333; // 0x1014 AGC_Ctrl6</div><div class='add'>+	pltmp[6] = 0xF2211111; // 0x11111111; // 0x1018 AGC_Ctrl7</div><div class='add'>+	pltmp[7] = 0x0FA3F0ED; // 0x101c AGC_Ctrl8</div><div class='add'>+	pltmp[8] = 0x06443440; // 0x1020 AGC_Ctrl9</div><div class='add'>+	pltmp[9] = 0xA8002A79; // 0xa9002A79; // 0x1024 AGC_Ctrl10</div><div class='add'>+	pltmp[10] = 0x40000528; // 20050927 0x40000228</div><div class='add'>+	pltmp[11] = 0x232D7F30; // 0x23457f30;// 0x102c A_ACQ_Ctrl</div><div class='add'>+	pWb35Reg-&gt;BB2C = 0x232D7F30;</div><div class='add'>+	Wb35Reg_BurstWrite( pHwData, 0x1000, pltmp, 12, AUTO_INCREMENT );</div><div class='add'>+</div><div class='add'>+	pltmp[0] = 0x00002c54; // 0x1030 B_ACQ_Ctrl</div><div class='add'>+	pWb35Reg-&gt;BB30 = 0x00002c54;</div><div class='add'>+	pltmp[1] = 0x00C0D6C5; // 0x1034 A_TXRX_Ctrl</div><div class='add'>+	pltmp[2] = 0x5B2C8769; // 0x1038 B_TXRX_Ctrl</div><div class='add'>+	pltmp[3] = 0x00000000; // 0x103c 11a TX LS filter</div><div class='add'>+	pWb35Reg-&gt;BB3C = 0x00000000;</div><div class='add'>+	pltmp[4] = 0x00003F29; // 0x1040 11a TX LS filter</div><div class='add'>+	pltmp[5] = 0x0EFEFBFE; // 0x1044 11a TX LS filter</div><div class='add'>+	pltmp[6] = 0x00332C1B; // 0x00453B24; // 0x1048 11b TX RC filter</div><div class='add'>+	pltmp[7] = 0x0A00FEFF; // 0x0E00FEFF; // 0x104c 11b TX RC filter</div><div class='add'>+	pltmp[8] = 0x2B106208; // 0x1050 MODE_Ctrl</div><div class='add'>+	pWb35Reg-&gt;BB50 = 0x2B106208;</div><div class='add'>+	pltmp[9] = 0; // 0x1054</div><div class='add'>+	pWb35Reg-&gt;BB54 = 0x00000000;</div><div class='add'>+	pltmp[10] = 0x52524242; // 0x64645252; // 0x1058 IQ_Alpha</div><div class='add'>+	pWb35Reg-&gt;BB58 = 0x52524242;</div><div class='add'>+	pltmp[11] = 0xAA0AC000; // 0x105c DC_Cancel</div><div class='add'>+	Wb35Reg_BurstWrite( pHwData, 0x1030, pltmp, 12, AUTO_INCREMENT );</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void BBProcessor_AL7230_5000(  phw_data_t pHwData)</div><div class='add'>+{</div><div class='add'>+	PWB35REG	pWb35Reg = &amp;pHwData-&gt;Wb35Reg;</div><div class='add'>+	u32	pltmp[12];</div><div class='add'>+</div><div class='add'>+	pltmp[0] = 0x16AA6678; // 0x1000 AGC_Ctrl1</div><div class='add'>+	pltmp[1] = 0x9AFFA0B2; // 0x1004 AGC_Ctrl2</div><div class='add'>+	pltmp[2] = 0x55D00A04; // 0x1008 AGC_Ctrl3</div><div class='add'>+	pltmp[3] = 0xEFFF233E; // 0x100c AGC_Ctrl4</div><div class='add'>+	pWb35Reg-&gt;BB0C = 0xEFFF233E;</div><div class='add'>+	pltmp[4] = 0x0FacDCC5; // 0x1010 AGC_Ctrl5 // 20050927 0x0FacDCB7</div><div class='add'>+	pltmp[5] = 0x00CAA333; // 0x1014 AGC_Ctrl6</div><div class='add'>+	pltmp[6] = 0xF2432111; // 0x1018 AGC_Ctrl7</div><div class='add'>+	pltmp[7] = 0x0FA3F0ED; // 0x101c AGC_Ctrl8</div><div class='add'>+	pltmp[8] = 0x05C43440; // 0x1020 AGC_Ctrl9</div><div class='add'>+	pltmp[9] = 0x00002A79; // 0x1024 AGC_Ctrl10</div><div class='add'>+	pltmp[10] = 0x40000528; // 20050927 0x40000228</div><div class='add'>+	pltmp[11] = 0x232FDF30;// 0x102c A_ACQ_Ctrl</div><div class='add'>+	pWb35Reg-&gt;BB2C = 0x232FDF30;</div><div class='add'>+	Wb35Reg_BurstWrite( pHwData, 0x1000, pltmp, 12, AUTO_INCREMENT );</div><div class='add'>+</div><div class='add'>+	pltmp[0] = 0x80002C7C; // 0x1030 B_ACQ_Ctrl</div><div class='add'>+	pltmp[1] = 0x00C0D6C5; // 0x1034 A_TXRX_Ctrl</div><div class='add'>+	pltmp[2] = 0x5B2C8769; // 0x1038 B_TXRX_Ctrl</div><div class='add'>+	pltmp[3] = 0x00000000; // 0x103c 11a TX LS filter</div><div class='add'>+	pWb35Reg-&gt;BB3C = 0x00000000;</div><div class='add'>+	pltmp[4] = 0x00003F29; // 0x1040 11a TX LS filter</div><div class='add'>+	pltmp[5] = 0x0EFEFBFE; // 0x1044 11a TX LS filter</div><div class='add'>+	pltmp[6] = 0x00332C1B; // 0x1048 11b TX RC filter</div><div class='add'>+	pltmp[7] = 0x0A00FEFF; // 0x104c 11b TX RC filter</div><div class='add'>+	pltmp[8] = 0x2B107208; // 0x1050 MODE_Ctrl</div><div class='add'>+	pWb35Reg-&gt;BB50 = 0x2B107208;</div><div class='add'>+	pltmp[9] = 0; // 0x1054</div><div class='add'>+	pWb35Reg-&gt;BB54 = 0x00000000;</div><div class='add'>+	pltmp[10] = 0x52524242; // 0x1058 IQ_Alpha</div><div class='add'>+	pWb35Reg-&gt;BB58 = 0x52524242;</div><div class='add'>+	pltmp[11] = 0xAA0AC000; // 0x105c DC_Cancel</div><div class='add'>+	Wb35Reg_BurstWrite( pHwData, 0x1030, pltmp, 12, AUTO_INCREMENT );</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+//=============================================================================================================</div><div class='add'>+//  BBProcessorPowerupInit --</div><div class='add'>+//</div><div class='add'>+//  Description:</div><div class='add'>+//    Initialize the Baseband processor.</div><div class='add'>+//</div><div class='add'>+//  Arguments:</div><div class='add'>+//    pHwData    - Handle of the USB Device.</div><div class='add'>+//</div><div class='add'>+//  Return values:</div><div class='add'>+//    None.</div><div class='add'>+//=============================================================================================================</div><div class='add'>+void</div><div class='add'>+BBProcessor_initial(  phw_data_t pHwData )</div><div class='add'>+{</div><div class='add'>+	PWB35REG	pWb35Reg = &amp;pHwData-&gt;Wb35Reg;</div><div class='add'>+	u32	i, pltmp[12];</div><div class='add'>+</div><div class='add'>+    switch( pHwData-&gt;phy_type )</div><div class='add'>+    {</div><div class='add'>+		case RF_MAXIM_V1: // Initializng the Winbond 2nd BB(with Phy board (v1) + Maxim 331)</div><div class='add'>+</div><div class='add'>+			pltmp[0] = 0x16F47E77; // 0x1000 AGC_Ctrl1</div><div class='add'>+			pltmp[1] = 0x9AFFAEA4; // 0x1004 AGC_Ctrl2</div><div class='add'>+			pltmp[2] = 0x55D00A04; // 0x1008 AGC_Ctrl3</div><div class='add'>+			pltmp[3] = 0xEFFF1A34; // 0x100c AGC_Ctrl4</div><div class='add'>+			pWb35Reg-&gt;BB0C = 0xEFFF1A34;</div><div class='add'>+			pltmp[4] = 0x0FABE0B7; // 0x1010 AGC_Ctrl5</div><div class='add'>+			pltmp[5] = 0x00CAA332; // 0x1014 AGC_Ctrl6</div><div class='add'>+			pltmp[6] = 0xF6632111; // 0x1018 AGC_Ctrl7</div><div class='add'>+			pltmp[7] = 0x0FA3F0ED; // 0x101c AGC_Ctrl8</div><div class='add'>+			pltmp[8] = 0x04CC3640; // 0x1020 AGC_Ctrl9</div><div class='add'>+			pltmp[9] = 0x00002A79; // 0x1024 AGC_Ctrl10</div><div class='add'>+			pltmp[10] = (pHwData-&gt;phy_type==3) ? 0x40000a28 : 0x40000228; // 0x1028 MAXIM_331(b31=0) + WBRF_V1(b11=1) : MAXIM_331(b31=0) + WBRF_V2(b11=0)</div><div class='add'>+			pltmp[11] = 0x232FDF30; // 0x102c A_ACQ_Ctrl</div><div class='add'>+			pWb35Reg-&gt;BB2C = 0x232FDF30; //Modify for 33's 1.0.95.xxx version, antenna 1</div><div class='add'>+			Wb35Reg_BurstWrite( pHwData, 0x1000, pltmp, 12, AUTO_INCREMENT );</div><div class='add'>+</div><div class='add'>+			pltmp[0] = 0x00002C54; // 0x1030 B_ACQ_Ctrl</div><div class='add'>+			pWb35Reg-&gt;BB30 = 0x00002C54;</div><div class='add'>+			pltmp[1] = 0x00C0D6C5; // 0x1034 A_TXRX_Ctrl</div><div class='add'>+			pltmp[2] = 0x5B6C8769; // 0x1038 B_TXRX_Ctrl</div><div class='add'>+			pltmp[3] = 0x00000000; // 0x103c 11a TX LS filter</div><div class='add'>+			pWb35Reg-&gt;BB3C = 0x00000000;</div><div class='add'>+			pltmp[4] = 0x00003F29; // 0x1040 11a TX LS filter</div><div class='add'>+			pltmp[5] = 0x0EFEFBFE; // 0x1044 11a TX LS filter</div><div class='add'>+			pltmp[6] = 0x00453B24; // 0x1048 11b TX RC filter</div><div class='add'>+			pltmp[7] = 0x0E00FEFF; // 0x104c 11b TX RC filter</div><div class='add'>+			pltmp[8] = 0x27106208; // 0x1050 MODE_Ctrl</div><div class='add'>+			pWb35Reg-&gt;BB50 = 0x27106208;</div><div class='add'>+			pltmp[9] = 0; // 0x1054</div><div class='add'>+			pWb35Reg-&gt;BB54 = 0x00000000;</div><div class='add'>+			pltmp[10] = 0x64646464; // 0x1058 IQ_Alpha</div><div class='add'>+			pWb35Reg-&gt;BB58 = 0x64646464;</div><div class='add'>+			pltmp[11] = 0xAA0AC000; // 0x105c DC_Cancel</div><div class='add'>+			Wb35Reg_BurstWrite( pHwData, 0x1030, pltmp, 12, AUTO_INCREMENT );</div><div class='add'>+</div><div class='add'>+			Wb35Reg_Write( pHwData, 0x1070, 0x00000045 );</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		//------------------------------------------------------------------</div><div class='add'>+		//[20040722 WK]</div><div class='add'>+		//Only for baseband version 2</div><div class='add'>+//		case RF_MAXIM_317:</div><div class='add'>+		case RF_MAXIM_2825:</div><div class='add'>+		case RF_MAXIM_2827:</div><div class='add'>+		case RF_MAXIM_2828:</div><div class='add'>+</div><div class='add'>+			pltmp[0] = 0x16b47e77; // 0x1000 AGC_Ctrl1</div><div class='add'>+			pltmp[1] = 0x9affaea4; // 0x1004 AGC_Ctrl2</div><div class='add'>+			pltmp[2] = 0x55d00a04; // 0x1008 AGC_Ctrl3</div><div class='add'>+			pltmp[3] = 0xefff1a34; // 0x100c AGC_Ctrl4</div><div class='add'>+			pWb35Reg-&gt;BB0C = 0xefff1a34;</div><div class='add'>+			pltmp[4] = 0x0fabe0b7; // 0x1010 AGC_Ctrl5</div><div class='add'>+			pltmp[5] = 0x00caa332; // 0x1014 AGC_Ctrl6</div><div class='add'>+			pltmp[6] = 0xf6632111; // 0x1018 AGC_Ctrl7</div><div class='add'>+			pltmp[7] = 0x0FA3F0ED; // 0x101c AGC_Ctrl8</div><div class='add'>+			pltmp[8] = 0x04CC3640; // 0x1020 AGC_Ctrl9</div><div class='add'>+			pltmp[9] = 0x00002A79; // 0x1024 AGC_Ctrl10</div><div class='add'>+			pltmp[10] = 0x40000528; // 0x40000128; Modify for 33's 1.0.95</div><div class='add'>+			pltmp[11] = 0x232fdf30; // 0x102c A_ACQ_Ctrl</div><div class='add'>+			pWb35Reg-&gt;BB2C = 0x232fdf30; //Modify for 33's 1.0.95.xxx version, antenna 1</div><div class='add'>+			Wb35Reg_BurstWrite( pHwData, 0x1000, pltmp, 12, AUTO_INCREMENT );</div><div class='add'>+</div><div class='add'>+			pltmp[0] = 0x00002C54; // 0x1030 B_ACQ_Ctrl</div><div class='add'>+			pWb35Reg-&gt;BB30 = 0x00002C54;</div><div class='add'>+			pltmp[1] = 0x00C0D6C5; // 0x1034 A_TXRX_Ctrl</div><div class='add'>+			pltmp[2] = 0x5B6C8769; // 0x1038 B_TXRX_Ctrl</div><div class='add'>+			pltmp[3] = 0x00000000; // 0x103c 11a TX LS filter</div><div class='add'>+			pWb35Reg-&gt;BB3C = 0x00000000;</div><div class='add'>+			pltmp[4] = 0x00003F29; // 0x1040 11a TX LS filter</div><div class='add'>+			pltmp[5] = 0x0EFEFBFE; // 0x1044 11a TX LS filter</div><div class='add'>+			pltmp[6] = 0x00453B24; // 0x1048 11b TX RC filter</div><div class='add'>+			pltmp[7] = 0x0D00FDFF; // 0x104c 11b TX RC filter</div><div class='add'>+			pltmp[8] = 0x27106208; // 0x1050 MODE_Ctrl</div><div class='add'>+			pWb35Reg-&gt;BB50 = 0x27106208;</div><div class='add'>+			pltmp[9] = 0; // 0x1054</div><div class='add'>+			pWb35Reg-&gt;BB54 = 0x00000000;</div><div class='add'>+			pltmp[10] = 0x64646464; // 0x1058 IQ_Alpha</div><div class='add'>+			pWb35Reg-&gt;BB58 = 0x64646464;</div><div class='add'>+			pltmp[11] = 0xAA28C000; // 0x105c DC_Cancel</div><div class='add'>+			Wb35Reg_BurstWrite( pHwData, 0x1030, pltmp, 12, AUTO_INCREMENT );</div><div class='add'>+</div><div class='add'>+			Wb35Reg_Write( pHwData, 0x1070, 0x00000045 );</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case RF_MAXIM_2829:</div><div class='add'>+</div><div class='add'>+			pltmp[0] = 0x16b47e77; // 0x1000 AGC_Ctrl1</div><div class='add'>+			pltmp[1] = 0x9affaea4; // 0x1004 AGC_Ctrl2</div><div class='add'>+			pltmp[2] = 0x55d00a04; // 0x1008 AGC_Ctrl3</div><div class='add'>+			pltmp[3] = 0xf4ff1632; // 0xefff1a34; // 0x100c AGC_Ctrl4 Modify for 33's 1.0.95</div><div class='add'>+			pWb35Reg-&gt;BB0C = 0xf4ff1632; // 0xefff1a34; Modify for 33's 1.0.95</div><div class='add'>+			pltmp[4] = 0x0fabe0b7; // 0x1010 AGC_Ctrl5</div><div class='add'>+			pltmp[5] = 0x00caa332; // 0x1014 AGC_Ctrl6</div><div class='add'>+			pltmp[6] = 0xf8632112; // 0xf6632111; // 0x1018 AGC_Ctrl7 Modify for 33's 1.0.95</div><div class='add'>+			pltmp[7] = 0x0FA3F0ED; // 0x101c AGC_Ctrl8</div><div class='add'>+			pltmp[8] = 0x04CC3640; // 0x1020 AGC_Ctrl9</div><div class='add'>+			pltmp[9] = 0x00002A79; // 0x1024 AGC_Ctrl10</div><div class='add'>+			pltmp[10] = 0x40000528; // 0x40000128; modify for 33's 1.0.95</div><div class='add'>+			pltmp[11] = 0x232fdf30; // 0x102c A_ACQ_Ctrl</div><div class='add'>+			pWb35Reg-&gt;BB2C = 0x232fdf30; //Modify for 33's 1.0.95.xxx version, antenna 1</div><div class='add'>+			Wb35Reg_BurstWrite( pHwData, 0x1000, pltmp, 12, AUTO_INCREMENT );</div><div class='add'>+</div><div class='add'>+			pltmp[0] = 0x00002C54; // 0x1030 B_ACQ_Ctrl</div><div class='add'>+			pWb35Reg-&gt;BB30 = 0x00002C54;</div><div class='add'>+			pltmp[1] = 0x00C0D6C5; // 0x1034 A_TXRX_Ctrl</div><div class='add'>+			pltmp[2] = 0x5b2c8769; // 0x5B6C8769; // 0x1038 B_TXRX_Ctrl Modify for 33's 1.0.95</div><div class='add'>+			pltmp[3] = 0x00000000; // 0x103c 11a TX LS filter</div><div class='add'>+			pWb35Reg-&gt;BB3C = 0x00000000;</div><div class='add'>+			pltmp[4] = 0x00003F29; // 0x1040 11a TX LS filter</div><div class='add'>+			pltmp[5] = 0x0EFEFBFE; // 0x1044 11a TX LS filter</div><div class='add'>+			pltmp[6] = 0x002c2617; // 0x00453B24; // 0x1048 11b TX RC filter Modify for 33's 1.0.95</div><div class='add'>+			pltmp[7] = 0x0800feff; // 0x0D00FDFF; // 0x104c 11b TX RC filter Modify for 33's 1.0.95</div><div class='add'>+			pltmp[8] = 0x27106208; // 0x1050 MODE_Ctrl</div><div class='add'>+			pWb35Reg-&gt;BB50 = 0x27106208;</div><div class='add'>+			pltmp[9] = 0; // 0x1054</div><div class='add'>+			pWb35Reg-&gt;BB54 = 0x00000000;</div><div class='add'>+			pltmp[10] = 0x64644a4a; // 0x64646464; // 0x1058 IQ_Alpha Modify for 33's 1.0.95</div><div class='add'>+			pWb35Reg-&gt;BB58 = 0x64646464;</div><div class='add'>+			pltmp[11] = 0xAA28C000; // 0x105c DC_Cancel</div><div class='add'>+			Wb35Reg_BurstWrite( pHwData, 0x1030, pltmp, 12, AUTO_INCREMENT );</div><div class='add'>+</div><div class='add'>+			Wb35Reg_Write( pHwData, 0x1070, 0x00000045 );</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case RF_AIROHA_2230:</div><div class='add'>+</div><div class='add'>+			pltmp[0] = 0X16764A77; // 0x1000 AGC_Ctrl1		//0x16765A77</div><div class='add'>+			pltmp[1] = 0x9affafb2; // 0x1004 AGC_Ctrl2</div><div class='add'>+			pltmp[2] = 0x55d00a04; // 0x1008 AGC_Ctrl3</div><div class='add'>+			pltmp[3] = 0xFFFd203c; // 0xFFFb203a; // 0x100c AGC_Ctrl4 Modify for 33's 1.0.95.xxx version</div><div class='add'>+			pWb35Reg-&gt;BB0C = 0xFFFd203c;</div><div class='add'>+			pltmp[4] = 0X0FBFDCc5; // 0X0FBFDCA0; // 0x1010 AGC_Ctrl5 //0x0FB2E0B7 Modify for 33's 1.0.95.xxx version</div><div class='add'>+			pltmp[5] = 0x00caa332; // 0x00caa333; // 0x1014 AGC_Ctrl6 Modify for 33's 1.0.95.xxx version</div><div class='add'>+			pltmp[6] = 0XF6632111; // 0XF1632112; // 0x1018 AGC_Ctrl7		//0xf6632112 Modify for 33's 1.0.95.xxx version</div><div class='add'>+			pltmp[7] = 0x0FA3F0ED; // 0x101c AGC_Ctrl8</div><div class='add'>+			pltmp[8] = 0x04C43640; // 0x1020 AGC_Ctrl9</div><div class='add'>+			pltmp[9] = 0x00002A79; // 0x1024 AGC_Ctrl10</div><div class='add'>+			pltmp[10] = 0X40000528;							//0x40000228</div><div class='add'>+			pltmp[11] = 0x232dfF30; // 0x232A9F30; // 0x102c A_ACQ_Ctrl	//0x232a9730</div><div class='add'>+			pWb35Reg-&gt;BB2C = 0x232dfF30; //Modify for 33's 1.0.95.xxx version, antenna 1</div><div class='add'>+			Wb35Reg_BurstWrite( pHwData, 0x1000, pltmp, 12, AUTO_INCREMENT );</div><div class='add'>+</div><div class='add'>+			pltmp[0] = 0x00002C54; // 0x1030 B_ACQ_Ctrl</div><div class='add'>+			pWb35Reg-&gt;BB30 = 0x00002C54;</div><div class='add'>+			pltmp[1] = 0x00C0D6C5; // 0x1034 A_TXRX_Ctrl</div><div class='add'>+			pltmp[2] = 0x5B2C8769; // 0x1038 B_TXRX_Ctrl	//0x5B6C8769</div><div class='add'>+			pltmp[3] = 0x00000000; // 0x103c 11a TX LS filter</div><div class='add'>+			pWb35Reg-&gt;BB3C = 0x00000000;</div><div class='add'>+			pltmp[4] = 0x00003F29; // 0x1040 11a TX LS filter</div><div class='add'>+			pltmp[5] = 0x0EFEFBFE; // 0x1044 11a TX LS filter</div><div class='add'>+			pltmp[6] = BB48_DEFAULT_AL2230_11G; // 0x1048 11b TX RC filter 20060613.2</div><div class='add'>+			pWb35Reg-&gt;BB48 = BB48_DEFAULT_AL2230_11G; // 20051221 ch14 20060613.2</div><div class='add'>+			pltmp[7] = BB4C_DEFAULT_AL2230_11G; // 0x104c 11b TX RC filter 20060613.2</div><div class='add'>+			pWb35Reg-&gt;BB4C = BB4C_DEFAULT_AL2230_11G; // 20060613.1 20060613.2</div><div class='add'>+			pltmp[8] = 0x27106200; // 0x1050 MODE_Ctrl</div><div class='add'>+			pWb35Reg-&gt;BB50 = 0x27106200;</div><div class='add'>+			pltmp[9] = 0; // 0x1054</div><div class='add'>+			pWb35Reg-&gt;BB54 = 0x00000000;</div><div class='add'>+			pltmp[10] = 0x52524242; // 0x1058 IQ_Alpha</div><div class='add'>+			pWb35Reg-&gt;BB58 = 0x52524242;</div><div class='add'>+			pltmp[11] = 0xAA0AC000; // 0x105c DC_Cancel</div><div class='add'>+			Wb35Reg_BurstWrite( pHwData, 0x1030, pltmp, 12, AUTO_INCREMENT );</div><div class='add'>+</div><div class='add'>+			Wb35Reg_Write( pHwData, 0x1070, 0x00000045 );</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case RF_AIROHA_2230S: // 20060420 Add this</div><div class='add'>+</div><div class='add'>+			pltmp[0] = 0X16764A77; // 0x1000 AGC_Ctrl1		//0x16765A77</div><div class='add'>+			pltmp[1] = 0x9affafb2; // 0x1004 AGC_Ctrl2</div><div class='add'>+			pltmp[2] = 0x55d00a04; // 0x1008 AGC_Ctrl3</div><div class='add'>+			pltmp[3] = 0xFFFd203c; // 0xFFFb203a; // 0x100c AGC_Ctrl4 Modify for 33's 1.0.95.xxx version</div><div class='add'>+			pWb35Reg-&gt;BB0C = 0xFFFd203c;</div><div class='add'>+			pltmp[4] = 0X0FBFDCc5; // 0X0FBFDCA0; // 0x1010 AGC_Ctrl5 //0x0FB2E0B7 Modify for 33's 1.0.95.xxx version</div><div class='add'>+			pltmp[5] = 0x00caa332; // 0x00caa333; // 0x1014 AGC_Ctrl6 Modify for 33's 1.0.95.xxx version</div><div class='add'>+			pltmp[6] = 0XF6632111; // 0XF1632112; // 0x1018 AGC_Ctrl7		//0xf6632112 Modify for 33's 1.0.95.xxx version</div><div class='add'>+			pltmp[7] = 0x0FA3F0ED; // 0x101c AGC_Ctrl8</div><div class='add'>+			pltmp[8] = 0x04C43640; // 0x1020 AGC_Ctrl9</div><div class='add'>+			pltmp[9] = 0x00002A79; // 0x1024 AGC_Ctrl10</div><div class='add'>+			pltmp[10] = 0X40000528;							//0x40000228</div><div class='add'>+			pltmp[11] = 0x232dfF30; // 0x232A9F30; // 0x102c A_ACQ_Ctrl	//0x232a9730</div><div class='add'>+			pWb35Reg-&gt;BB2C = 0x232dfF30; //Modify for 33's 1.0.95.xxx version, antenna 1</div><div class='add'>+			Wb35Reg_BurstWrite( pHwData, 0x1000, pltmp, 12, AUTO_INCREMENT );</div><div class='add'>+</div><div class='add'>+			pltmp[0] = 0x00002C54; // 0x1030 B_ACQ_Ctrl</div><div class='add'>+			pWb35Reg-&gt;BB30 = 0x00002C54;</div><div class='add'>+			pltmp[1] = 0x00C0D6C5; // 0x1034 A_TXRX_Ctrl</div><div class='add'>+			pltmp[2] = 0x5B2C8769; // 0x1038 B_TXRX_Ctrl	//0x5B6C8769</div><div class='add'>+			pltmp[3] = 0x00000000; // 0x103c 11a TX LS filter</div><div class='add'>+			pWb35Reg-&gt;BB3C = 0x00000000;</div><div class='add'>+			pltmp[4] = 0x00003F29; // 0x1040 11a TX LS filter</div><div class='add'>+			pltmp[5] = 0x0EFEFBFE; // 0x1044 11a TX LS filter</div><div class='add'>+			pltmp[6] = BB48_DEFAULT_AL2230_11G; // 0x1048 11b TX RC filter 20060613.2</div><div class='add'>+			pWb35Reg-&gt;BB48 = BB48_DEFAULT_AL2230_11G; // 20051221 ch14 20060613.2</div><div class='add'>+			pltmp[7] = BB4C_DEFAULT_AL2230_11G; // 0x104c 11b TX RC filter 20060613.2</div><div class='add'>+			pWb35Reg-&gt;BB4C = BB4C_DEFAULT_AL2230_11G; // 20060613.1</div><div class='add'>+			pltmp[8] = 0x27106200; // 0x1050 MODE_Ctrl</div><div class='add'>+			pWb35Reg-&gt;BB50 = 0x27106200;</div><div class='add'>+			pltmp[9] = 0; // 0x1054</div><div class='add'>+			pWb35Reg-&gt;BB54 = 0x00000000;</div><div class='add'>+			pltmp[10] = 0x52523232; // 20060419 0x52524242; // 0x1058 IQ_Alpha</div><div class='add'>+			pWb35Reg-&gt;BB58 = 0x52523232; // 20060419 0x52524242;</div><div class='add'>+			pltmp[11] = 0xAA0AC000; // 0x105c DC_Cancel</div><div class='add'>+			Wb35Reg_BurstWrite( pHwData, 0x1030, pltmp, 12, AUTO_INCREMENT );</div><div class='add'>+</div><div class='add'>+			Wb35Reg_Write( pHwData, 0x1070, 0x00000045 );</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case RF_AIROHA_7230:</div><div class='add'>+/*</div><div class='add'>+			pltmp[0] = 0x16a84a77; // 0x1000 AGC_Ctrl1</div><div class='add'>+			pltmp[1] = 0x9affafb2; // 0x1004 AGC_Ctrl2</div><div class='add'>+			pltmp[2] = 0x55d00a04; // 0x1008 AGC_Ctrl3</div><div class='add'>+			pltmp[3] = 0xFFFb203a; // 0x100c AGC_Ctrl4</div><div class='add'>+			pWb35Reg-&gt;BB0c = 0xFFFb203a;</div><div class='add'>+			pltmp[4] = 0x0FBFDCB7; // 0x1010 AGC_Ctrl5</div><div class='add'>+			pltmp[5] = 0x00caa333; // 0x1014 AGC_Ctrl6</div><div class='add'>+			pltmp[6] = 0xf6632112; // 0x1018 AGC_Ctrl7</div><div class='add'>+			pltmp[7] = 0x0FA3F0ED; // 0x101c AGC_Ctrl8</div><div class='add'>+			pltmp[8] = 0x04C43640; // 0x1020 AGC_Ctrl9</div><div class='add'>+			pltmp[9] = 0x00002A79; // 0x1024 AGC_Ctrl10</div><div class='add'>+			pltmp[10] = 0x40000228;</div><div class='add'>+			pltmp[11] = 0x232A9F30;// 0x102c A_ACQ_Ctrl</div><div class='add'>+			pWb35Reg-&gt;BB2c = 0x232A9F30;</div><div class='add'>+			Wb35Reg_BurstWrite( pHwData, 0x1000, pltmp, 12, AUTO_INCREMENT );</div><div class='add'>+</div><div class='add'>+			pltmp[0] = 0x00002C54; // 0x1030 B_ACQ_Ctrl</div><div class='add'>+			pWb35Reg-&gt;BB30 = 0x00002C54;</div><div class='add'>+			pltmp[1] = 0x00C0D6C5; // 0x1034 A_TXRX_Ctrl</div><div class='add'>+			pltmp[2] = 0x5B2C8769; // 0x1038 B_TXRX_Ctrl</div><div class='add'>+			pltmp[3] = 0x00000000; // 0x103c 11a TX LS filter</div><div class='add'>+			pWb35Reg-&gt;BB3c = 0x00000000;</div><div class='add'>+			pltmp[4] = 0x00003F29; // 0x1040 11a TX LS filter</div><div class='add'>+			pltmp[5] = 0x0EFEFBFE; // 0x1044 11a TX LS filter</div><div class='add'>+			pltmp[6] = 0x00453B24; // 0x1048 11b TX RC filter</div><div class='add'>+			pltmp[7] = 0x0E00FEFF; // 0x104c 11b TX RC filter</div><div class='add'>+			pltmp[8] = 0x27106200; // 0x1050 MODE_Ctrl</div><div class='add'>+			pWb35Reg-&gt;BB50 = 0x27106200;</div><div class='add'>+			pltmp[9] = 0; // 0x1054</div><div class='add'>+			pWb35Reg-&gt;BB54 = 0x00000000;</div><div class='add'>+			pltmp[10] = 0x64645252; // 0x1058 IQ_Alpha</div><div class='add'>+			pWb35Reg-&gt;BB58 = 0x64645252;</div><div class='add'>+			pltmp[11] = 0xAA0AC000; // 0x105c DC_Cancel</div><div class='add'>+			Wb35Reg_BurstWrite( pHwData, 0x1030, pltmp, 12, AUTO_INCREMENT );</div><div class='add'>+*/</div><div class='add'>+			BBProcessor_AL7230_2400( pHwData );</div><div class='add'>+</div><div class='add'>+			Wb35Reg_Write( pHwData, 0x1070, 0x00000045 );</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case RF_WB_242:</div><div class='add'>+		case RF_WB_242_1: // 20060619.5 Add</div><div class='add'>+</div><div class='add'>+			pltmp[0] = 0x16A8525D; // 0x1000 AGC_Ctrl1</div><div class='add'>+			pltmp[1] = 0x9AFF9ABA; // 0x1004 AGC_Ctrl2</div><div class='add'>+			pltmp[2] = 0x55D00A04; // 0x1008 AGC_Ctrl3</div><div class='add'>+			pltmp[3] = 0xEEE91C32; // 0x100c AGC_Ctrl4</div><div class='add'>+			pWb35Reg-&gt;BB0C = 0xEEE91C32;</div><div class='add'>+			pltmp[4] = 0x0FACDCC5; // 0x1010 AGC_Ctrl5</div><div class='add'>+			pltmp[5] = 0x000AA344; // 0x1014 AGC_Ctrl6</div><div class='add'>+			pltmp[6] = 0x22222221; // 0x1018 AGC_Ctrl7</div><div class='add'>+			pltmp[7] = 0x0FA3F0ED; // 0x101c AGC_Ctrl8</div><div class='add'>+			pltmp[8] = 0x04CC3440; // 20051018 0x03CB3440; // 0x1020 AGC_Ctrl9 20051014 0x03C33440</div><div class='add'>+			pltmp[9] = 0xA9002A79; // 0x1024 AGC_Ctrl10</div><div class='add'>+			pltmp[10] = 0x40000528; // 0x1028</div><div class='add'>+			pltmp[11] = 0x23457F30; // 0x102c A_ACQ_Ctrl</div><div class='add'>+			pWb35Reg-&gt;BB2C = 0x23457F30;</div><div class='add'>+			Wb35Reg_BurstWrite( pHwData, 0x1000, pltmp, 12, AUTO_INCREMENT );</div><div class='add'>+</div><div class='add'>+			pltmp[0] = 0x00002C54; // 0x1030 B_ACQ_Ctrl</div><div class='add'>+			pWb35Reg-&gt;BB30 = 0x00002C54;</div><div class='add'>+			pltmp[1] = 0x00C0D6C5; // 0x1034 A_TXRX_Ctrl</div><div class='add'>+			pltmp[2] = 0x5B2C8769; // 0x1038 B_TXRX_Ctrl</div><div class='add'>+			pltmp[3] = pHwData-&gt;BB3c_cal; // 0x103c 11a TX LS filter</div><div class='add'>+			pWb35Reg-&gt;BB3C = pHwData-&gt;BB3c_cal;</div><div class='add'>+			pltmp[4] = 0x00003F29; // 0x1040 11a TX LS filter</div><div class='add'>+			pltmp[5] = 0x0EFEFBFE; // 0x1044 11a TX LS filter</div><div class='add'>+			pltmp[6] = BB48_DEFAULT_WB242_11G; // 0x1048 11b TX RC filter 20060613.2</div><div class='add'>+			pWb35Reg-&gt;BB48 = BB48_DEFAULT_WB242_11G; // 20060613.1 20060613.2</div><div class='add'>+			pltmp[7] = BB4C_DEFAULT_WB242_11G; // 0x104c 11b TX RC filter 20060613.2</div><div class='add'>+			pWb35Reg-&gt;BB4C = BB4C_DEFAULT_WB242_11G; // 20060613.1 20060613.2</div><div class='add'>+			pltmp[8] = 0x27106208; // 0x1050 MODE_Ctrl</div><div class='add'>+			pWb35Reg-&gt;BB50 = 0x27106208;</div><div class='add'>+			pltmp[9] = pHwData-&gt;BB54_cal; // 0x1054</div><div class='add'>+			pWb35Reg-&gt;BB54 = pHwData-&gt;BB54_cal;</div><div class='add'>+			pltmp[10] = 0x52523131; // 0x1058 IQ_Alpha</div><div class='add'>+			pWb35Reg-&gt;BB58 = 0x52523131;</div><div class='add'>+			pltmp[11] = 0xAA0AC000; // 20060825 0xAA2AC000; // 0x105c DC_Cancel</div><div class='add'>+			Wb35Reg_BurstWrite( pHwData, 0x1030, pltmp, 12, AUTO_INCREMENT );</div><div class='add'>+</div><div class='add'>+			Wb35Reg_Write( pHwData, 0x1070, 0x00000045 );</div><div class='add'>+			break;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+	// Fill the LNA table</div><div class='add'>+	pWb35Reg-&gt;LNAValue[0] = (u8)(pWb35Reg-&gt;BB0C &amp; 0xff);</div><div class='add'>+	pWb35Reg-&gt;LNAValue[1] = 0;</div><div class='add'>+	pWb35Reg-&gt;LNAValue[2] = (u8)((pWb35Reg-&gt;BB0C &amp; 0xff00)&gt;&gt;8);</div><div class='add'>+	pWb35Reg-&gt;LNAValue[3] = 0;</div><div class='add'>+</div><div class='add'>+	// Fill SQ3 table</div><div class='add'>+	for( i=0; i&lt;MAX_SQ3_FILTER_SIZE; i++ )</div><div class='add'>+		pWb35Reg-&gt;SQ3_filter[i] = 0x2f; // half of Bit 0 ~ 6</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void set_tx_power_per_channel_max2829(  phw_data_t pHwData,  ChanInfo Channel)</div><div class='add'>+{</div><div class='add'>+	RFSynthesizer_SetPowerIndex( pHwData, 100 ); // 20060620.1 Modify</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void set_tx_power_per_channel_al2230(  phw_data_t pHwData,  ChanInfo Channel )</div><div class='add'>+{</div><div class='add'>+	u8	index = 100;</div><div class='add'>+</div><div class='add'>+	if (pHwData-&gt;TxVgaFor24[Channel.ChanNo - 1] != 0xff) // 20060620.1 Add</div><div class='add'>+		index = pHwData-&gt;TxVgaFor24[Channel.ChanNo - 1];</div><div class='add'>+</div><div class='add'>+	RFSynthesizer_SetPowerIndex( pHwData, index );</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void set_tx_power_per_channel_al7230(  phw_data_t pHwData,  ChanInfo Channel)</div><div class='add'>+{</div><div class='add'>+	u8	i, index = 100;</div><div class='add'>+</div><div class='add'>+	switch ( Channel.band )</div><div class='add'>+	{</div><div class='add'>+		case BAND_TYPE_DSSS:</div><div class='add'>+		case BAND_TYPE_OFDM_24:</div><div class='add'>+			{</div><div class='add'>+				if (pHwData-&gt;TxVgaFor24[Channel.ChanNo - 1] != 0xff)</div><div class='add'>+					index = pHwData-&gt;TxVgaFor24[Channel.ChanNo - 1];</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		case BAND_TYPE_OFDM_5:</div><div class='add'>+			{</div><div class='add'>+				for (i =0; i&lt;35; i++)</div><div class='add'>+				{</div><div class='add'>+					if (Channel.ChanNo == pHwData-&gt;TxVgaFor50[i].ChanNo)</div><div class='add'>+					{</div><div class='add'>+						if (pHwData-&gt;TxVgaFor50[i].TxVgaValue != 0xff)</div><div class='add'>+							index = pHwData-&gt;TxVgaFor50[i].TxVgaValue;</div><div class='add'>+						break;</div><div class='add'>+					}</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	RFSynthesizer_SetPowerIndex( pHwData, index );</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void set_tx_power_per_channel_wb242(  phw_data_t pHwData,  ChanInfo Channel)</div><div class='add'>+{</div><div class='add'>+	u8	index = 100;</div><div class='add'>+</div><div class='add'>+	switch ( Channel.band )</div><div class='add'>+	{</div><div class='add'>+		case BAND_TYPE_DSSS:</div><div class='add'>+		case BAND_TYPE_OFDM_24:</div><div class='add'>+			{</div><div class='add'>+				if (pHwData-&gt;TxVgaFor24[Channel.ChanNo - 1] != 0xff)</div><div class='add'>+					index = pHwData-&gt;TxVgaFor24[Channel.ChanNo - 1];</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		case BAND_TYPE_OFDM_5:</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	RFSynthesizer_SetPowerIndex( pHwData, index );</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+//=============================================================================================================</div><div class='add'>+// RFSynthesizer_SwitchingChannel --</div><div class='add'>+//</div><div class='add'>+// Description:</div><div class='add'>+//   Swithch the RF channel.</div><div class='add'>+//</div><div class='add'>+// Arguments:</div><div class='add'>+//   pHwData    - Handle of the USB Device.</div><div class='add'>+//   Channel    - The channel no.</div><div class='add'>+//</div><div class='add'>+// Return values:</div><div class='add'>+//   None.</div><div class='add'>+//=============================================================================================================</div><div class='add'>+void</div><div class='add'>+RFSynthesizer_SwitchingChannel(  phw_data_t pHwData,  ChanInfo Channel )</div><div class='add'>+{</div><div class='add'>+	PWB35REG pWb35Reg = &amp;pHwData-&gt;Wb35Reg;</div><div class='add'>+	u32	pltmp[16]; // The 16 is the maximum capability of hardware</div><div class='add'>+	u32	count, ltmp;</div><div class='add'>+	u8	i, j, number;</div><div class='add'>+	u8	ChnlTmp;</div><div class='add'>+</div><div class='add'>+	switch( pHwData-&gt;phy_type )</div><div class='add'>+	{</div><div class='add'>+		case RF_MAXIM_2825:</div><div class='add'>+		case RF_MAXIM_V1: // 11g Winbond 2nd BB(with Phy board (v1) + Maxim 331)</div><div class='add'>+</div><div class='add'>+			if( Channel.band &lt;= BAND_TYPE_OFDM_24 ) // channel 1 ~ 13</div><div class='add'>+			{</div><div class='add'>+				for( i=0; i&lt;3; i++ )</div><div class='add'>+					pltmp[i] = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (18 &lt;&lt; 24) | BitReverse( max2825_channel_data_24[Channel.ChanNo-1][i], 18);</div><div class='add'>+				Wb35Reg_BurstWrite( pHwData, 0x0864, pltmp, 3, NO_INCREMENT );</div><div class='add'>+			}</div><div class='add'>+			RFSynthesizer_SetPowerIndex( pHwData, 100 );</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case RF_MAXIM_2827:</div><div class='add'>+</div><div class='add'>+			if( Channel.band &lt;= BAND_TYPE_OFDM_24 ) // channel 1 ~ 13</div><div class='add'>+			{</div><div class='add'>+				for( i=0; i&lt;3; i++ )</div><div class='add'>+					pltmp[i] = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (18 &lt;&lt; 24) | BitReverse( max2827_channel_data_24[Channel.ChanNo-1][i], 18);</div><div class='add'>+				Wb35Reg_BurstWrite( pHwData, 0x0864, pltmp, 3, NO_INCREMENT );</div><div class='add'>+			}</div><div class='add'>+			else if( Channel.band == BAND_TYPE_OFDM_5 ) // channel 36 ~ 64</div><div class='add'>+			{</div><div class='add'>+				ChnlTmp = (Channel.ChanNo - 36) / 4;</div><div class='add'>+				for( i=0; i&lt;3; i++ )</div><div class='add'>+					pltmp[i] = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (18 &lt;&lt; 24) | BitReverse( max2827_channel_data_50[ChnlTmp][i], 18);</div><div class='add'>+				Wb35Reg_BurstWrite( pHwData, 0x0864, pltmp, 3, NO_INCREMENT );</div><div class='add'>+			}</div><div class='add'>+			RFSynthesizer_SetPowerIndex( pHwData, 100 );</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case RF_MAXIM_2828:</div><div class='add'>+</div><div class='add'>+			if( Channel.band &lt;= BAND_TYPE_OFDM_24 ) // channel 1 ~ 13</div><div class='add'>+			{</div><div class='add'>+				for( i=0; i&lt;3; i++ )</div><div class='add'>+					pltmp[i] = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (18 &lt;&lt; 24) | BitReverse( max2828_channel_data_24[Channel.ChanNo-1][i], 18);</div><div class='add'>+				Wb35Reg_BurstWrite( pHwData, 0x0864, pltmp, 3, NO_INCREMENT );</div><div class='add'>+			}</div><div class='add'>+			else if( Channel.band == BAND_TYPE_OFDM_5 ) // channel 36 ~ 64</div><div class='add'>+			{</div><div class='add'>+				ChnlTmp = (Channel.ChanNo - 36) / 4;</div><div class='add'>+				for ( i = 0; i &lt; 3; i++)</div><div class='add'>+					pltmp[i] = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (18 &lt;&lt; 24) | BitReverse( max2828_channel_data_50[ChnlTmp][i], 18);</div><div class='add'>+				Wb35Reg_BurstWrite( pHwData, 0x0864, pltmp, 3, NO_INCREMENT );</div><div class='add'>+			}</div><div class='add'>+			RFSynthesizer_SetPowerIndex( pHwData, 100 );</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case RF_MAXIM_2829:</div><div class='add'>+</div><div class='add'>+			if( Channel.band &lt;= BAND_TYPE_OFDM_24)</div><div class='add'>+			{</div><div class='add'>+				for( i=0; i&lt;3; i++ )</div><div class='add'>+					pltmp[i] = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (18 &lt;&lt; 24) | BitReverse( max2829_channel_data_24[Channel.ChanNo-1][i], 18);</div><div class='add'>+				Wb35Reg_BurstWrite( pHwData, 0x0864, pltmp, 3, NO_INCREMENT );</div><div class='add'>+			}</div><div class='add'>+			else if( Channel.band == BAND_TYPE_OFDM_5 )</div><div class='add'>+			{</div><div class='add'>+				count = sizeof(max2829_channel_data_50) / sizeof(max2829_channel_data_50[0]);</div><div class='add'>+</div><div class='add'>+				for( i=0; i&lt;count; i++ )</div><div class='add'>+				{</div><div class='add'>+					if( max2829_channel_data_50[i][0] == Channel.ChanNo )</div><div class='add'>+					{</div><div class='add'>+						for( j=0; j&lt;3; j++ )</div><div class='add'>+							pltmp[j] = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (18 &lt;&lt; 24) | BitReverse( max2829_channel_data_50[i][j+1], 18);</div><div class='add'>+						Wb35Reg_BurstWrite( pHwData, 0x0864, pltmp, 3, NO_INCREMENT );</div><div class='add'>+</div><div class='add'>+						if( (max2829_channel_data_50[i][3] &amp; 0x3FFFF) == 0x2A946 )</div><div class='add'>+						{</div><div class='add'>+							ltmp = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (18 &lt;&lt; 24) | BitReverse( (5&lt;&lt;18)|0x2A906, 18);</div><div class='add'>+							Wb35Reg_Write( pHwData, 0x0864, ltmp );</div><div class='add'>+						}</div><div class='add'>+						else    // 0x2A9C6</div><div class='add'>+						{</div><div class='add'>+							ltmp = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (18 &lt;&lt; 24) | BitReverse( (5&lt;&lt;18)|0x2A986, 18);</div><div class='add'>+							Wb35Reg_Write( pHwData, 0x0864, ltmp );</div><div class='add'>+						}</div><div class='add'>+					}</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+			set_tx_power_per_channel_max2829( pHwData, Channel );</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case RF_AIROHA_2230:</div><div class='add'>+		case RF_AIROHA_2230S: // 20060420 Add this</div><div class='add'>+</div><div class='add'>+			if( Channel.band &lt;= BAND_TYPE_OFDM_24 ) // channel 1 ~ 14</div><div class='add'>+			{</div><div class='add'>+				for( i=0; i&lt;2; i++ )</div><div class='add'>+					pltmp[i] = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (20 &lt;&lt; 24) | BitReverse( al2230_channel_data_24[Channel.ChanNo-1][i], 20);</div><div class='add'>+				Wb35Reg_BurstWrite( pHwData, 0x0864, pltmp, 2, NO_INCREMENT );</div><div class='add'>+			}</div><div class='add'>+			set_tx_power_per_channel_al2230( pHwData, Channel );</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case RF_AIROHA_7230:</div><div class='add'>+</div><div class='add'>+			//Start to fill RF parameters, PLL_ON should be pulled low.</div><div class='add'>+			//Wb35Reg_Write( pHwData, 0x03dc, 0x00000000 );</div><div class='add'>+			//WBDEBUG(("* PLL_ON    low\n"));</div><div class='add'>+</div><div class='add'>+			//Channel independent registers</div><div class='add'>+			if( Channel.band != pHwData-&gt;band)</div><div class='add'>+			{</div><div class='add'>+				if (Channel.band &lt;= BAND_TYPE_OFDM_24)</div><div class='add'>+				{</div><div class='add'>+					//Update BB register</div><div class='add'>+					BBProcessor_AL7230_2400(pHwData);</div><div class='add'>+</div><div class='add'>+					number = sizeof(al7230_rf_data_24)/sizeof(al7230_rf_data_24[0]);</div><div class='add'>+					Set_ChanIndep_RfData_al7230_24(pHwData, pltmp, number);</div><div class='add'>+				}</div><div class='add'>+				else</div><div class='add'>+				{</div><div class='add'>+					//Update BB register</div><div class='add'>+					BBProcessor_AL7230_5000(pHwData);</div><div class='add'>+</div><div class='add'>+					number = sizeof(al7230_rf_data_50)/sizeof(al7230_rf_data_50[0]);</div><div class='add'>+					Set_ChanIndep_RfData_al7230_50(pHwData, pltmp, number);</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+				// Write to register. number must less and equal than 16</div><div class='add'>+				Wb35Reg_BurstWrite( pHwData, 0x0864, pltmp, number, NO_INCREMENT );</div><div class='add'>+				#ifdef _PE_STATE_DUMP_</div><div class='add'>+				WBDEBUG(("Band changed\n"));</div><div class='add'>+				#endif</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if( Channel.band &lt;= BAND_TYPE_OFDM_24 ) // channel 1 ~ 14</div><div class='add'>+			{</div><div class='add'>+				for( i=0; i&lt;2; i++ )</div><div class='add'>+					pltmp[i] = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (24 &lt;&lt; 24) | (al7230_channel_data_24[Channel.ChanNo-1][i]&amp;0xffffff);</div><div class='add'>+				Wb35Reg_BurstWrite( pHwData, 0x0864, pltmp, 2, NO_INCREMENT );</div><div class='add'>+			}</div><div class='add'>+			else if( Channel.band == BAND_TYPE_OFDM_5 )</div><div class='add'>+			{</div><div class='add'>+				//Update Reg12</div><div class='add'>+				if ((Channel.ChanNo &gt; 64) &amp;&amp; (Channel.ChanNo &lt;= 165))</div><div class='add'>+				{</div><div class='add'>+					ltmp = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (24 &lt;&lt; 24) | 0x00143c;</div><div class='add'>+					Wb35Reg_Write( pHwData, 0x0864, ltmp );</div><div class='add'>+				}</div><div class='add'>+				else	//reg12 = 0x00147c at Channel 4920 ~ 5320</div><div class='add'>+				{</div><div class='add'>+					ltmp = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (24 &lt;&lt; 24) | 0x00147c;</div><div class='add'>+					Wb35Reg_Write( pHwData, 0x0864, ltmp );</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+				count = sizeof(al7230_channel_data_5) / sizeof(al7230_channel_data_5[0]);</div><div class='add'>+</div><div class='add'>+				for (i=0; i&lt;count; i++)</div><div class='add'>+				{</div><div class='add'>+					if (al7230_channel_data_5[i][0] == Channel.ChanNo)</div><div class='add'>+					{</div><div class='add'>+						for( j=0; j&lt;3; j++ )</div><div class='add'>+							pltmp[j] = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (24 &lt;&lt; 24) | ( al7230_channel_data_5[i][j+1]&amp;0xffffff);</div><div class='add'>+						Wb35Reg_BurstWrite( pHwData, 0x0864, pltmp, 3, NO_INCREMENT );</div><div class='add'>+					}</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+			set_tx_power_per_channel_al7230(pHwData, Channel);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case RF_WB_242:</div><div class='add'>+		case RF_WB_242_1: // 20060619.5 Add</div><div class='add'>+</div><div class='add'>+			if( Channel.band &lt;= BAND_TYPE_OFDM_24 ) // channel 1 ~ 14</div><div class='add'>+			{</div><div class='add'>+				ltmp = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (24 &lt;&lt; 24) | BitReverse( w89rf242_channel_data_24[Channel.ChanNo-1][0], 24);</div><div class='add'>+				Wb35Reg_Write( pHwData, 0x864, ltmp );</div><div class='add'>+			}</div><div class='add'>+			set_tx_power_per_channel_wb242(pHwData, Channel);</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if( Channel.band &lt;= BAND_TYPE_OFDM_24 )</div><div class='add'>+	{</div><div class='add'>+        // BB: select 2.4 GHz, bit[12-11]=00</div><div class='add'>+		pWb35Reg-&gt;BB50 &amp;= ~(BIT(11)|BIT(12));</div><div class='add'>+		Wb35Reg_Write( pHwData, 0x1050, pWb35Reg-&gt;BB50 ); // MODE_Ctrl</div><div class='add'>+        // MAC: select 2.4 GHz, bit[5]=0</div><div class='add'>+		pWb35Reg-&gt;M78_ERPInformation &amp;= ~BIT(5);</div><div class='add'>+		Wb35Reg_Write( pHwData, 0x0878, pWb35Reg-&gt;M78_ERPInformation );</div><div class='add'>+        // enable 11b Baseband</div><div class='add'>+		pWb35Reg-&gt;BB30 &amp;= ~BIT(31);</div><div class='add'>+		Wb35Reg_Write( pHwData, 0x1030, pWb35Reg-&gt;BB30 );</div><div class='add'>+	}</div><div class='add'>+	else if( (Channel.band == BAND_TYPE_OFDM_5) )</div><div class='add'>+	{</div><div class='add'>+        // BB: select 5 GHz</div><div class='add'>+		pWb35Reg-&gt;BB50 &amp;= ~(BIT(11)|BIT(12));</div><div class='add'>+		if (Channel.ChanNo &lt;=64 )</div><div class='add'>+			pWb35Reg-&gt;BB50 |= BIT(12);				// 10-5.25GHz</div><div class='add'>+		else if ((Channel.ChanNo &gt;= 100) &amp;&amp; (Channel.ChanNo &lt;= 124))</div><div class='add'>+			pWb35Reg-&gt;BB50 |= BIT(11);				// 01-5.48GHz</div><div class='add'>+		else if ((Channel.ChanNo &gt;=128) &amp;&amp; (Channel.ChanNo &lt;= 161))</div><div class='add'>+			pWb35Reg-&gt;BB50 |= (BIT(12)|BIT(11));	// 11-5.775GHz</div><div class='add'>+		else	//Chan 184 ~ 196 will use bit[12-11] = 10 in version sh-src-1.2.25</div><div class='add'>+			pWb35Reg-&gt;BB50 |= BIT(12);</div><div class='add'>+		Wb35Reg_Write( pHwData, 0x1050, pWb35Reg-&gt;BB50 ); // MODE_Ctrl</div><div class='add'>+</div><div class='add'>+		//(1) M78 should alway use 2.4G setting when using RF_AIROHA_7230</div><div class='add'>+		//(2) BB30 has been updated previously.</div><div class='add'>+		if (pHwData-&gt;phy_type != RF_AIROHA_7230)</div><div class='add'>+		{</div><div class='add'>+    	    // MAC: select 5 GHz, bit[5]=1</div><div class='add'>+			pWb35Reg-&gt;M78_ERPInformation |= BIT(5);</div><div class='add'>+			Wb35Reg_Write( pHwData, 0x0878, pWb35Reg-&gt;M78_ERPInformation );</div><div class='add'>+</div><div class='add'>+    	    // disable 11b Baseband</div><div class='add'>+			pWb35Reg-&gt;BB30 |= BIT(31);</div><div class='add'>+			Wb35Reg_Write( pHwData, 0x1030, pWb35Reg-&gt;BB30 );</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+//Set the tx power directly from DUT GUI, not from the EEPROM. Return the current setting</div><div class='add'>+u8 RFSynthesizer_SetPowerIndex(  phw_data_t pHwData,  u8 PowerIndex )</div><div class='add'>+{</div><div class='add'>+	u32	Band = pHwData-&gt;band;</div><div class='add'>+	u8	index=0;</div><div class='add'>+</div><div class='add'>+	if( pHwData-&gt;power_index == PowerIndex ) // 20060620.1 Add</div><div class='add'>+		return PowerIndex;</div><div class='add'>+</div><div class='add'>+	if (RF_MAXIM_2825 == pHwData-&gt;phy_type)</div><div class='add'>+	{</div><div class='add'>+		// Channel 1 - 13</div><div class='add'>+		index = RFSynthesizer_SetMaxim2825Power( pHwData, PowerIndex );</div><div class='add'>+	}</div><div class='add'>+	else if (RF_MAXIM_2827 == pHwData-&gt;phy_type)</div><div class='add'>+	{</div><div class='add'>+		if( Band &lt;= BAND_TYPE_OFDM_24 )    // Channel 1 - 13</div><div class='add'>+			index = RFSynthesizer_SetMaxim2827_24Power( pHwData, PowerIndex );</div><div class='add'>+		else// if( Band == BAND_TYPE_OFDM_5 )  // Channel 36 - 64</div><div class='add'>+			index = RFSynthesizer_SetMaxim2827_50Power( pHwData, PowerIndex );</div><div class='add'>+	}</div><div class='add'>+	else if (RF_MAXIM_2828 == pHwData-&gt;phy_type)</div><div class='add'>+	{</div><div class='add'>+		if( Band &lt;= BAND_TYPE_OFDM_24 )    // Channel 1 - 13</div><div class='add'>+			index = RFSynthesizer_SetMaxim2828_24Power( pHwData, PowerIndex );</div><div class='add'>+		else// if( Band == BAND_TYPE_OFDM_5 )  // Channel 36 - 64</div><div class='add'>+			index = RFSynthesizer_SetMaxim2828_50Power( pHwData, PowerIndex );</div><div class='add'>+	}</div><div class='add'>+	else if( RF_AIROHA_2230 == pHwData-&gt;phy_type )</div><div class='add'>+	{</div><div class='add'>+		//Power index: 0 ~ 63 // Channel 1 - 14</div><div class='add'>+		index = RFSynthesizer_SetAiroha2230Power( pHwData, PowerIndex );</div><div class='add'>+		index = (u8)al2230_txvga_data[index][1];</div><div class='add'>+	}</div><div class='add'>+	else if( RF_AIROHA_2230S == pHwData-&gt;phy_type ) // 20060420 Add this</div><div class='add'>+	{</div><div class='add'>+		//Power index: 0 ~ 63 // Channel 1 - 14</div><div class='add'>+		index = RFSynthesizer_SetAiroha2230Power( pHwData, PowerIndex );</div><div class='add'>+		index = (u8)al2230_txvga_data[index][1];</div><div class='add'>+	}</div><div class='add'>+	else if( RF_AIROHA_7230 == pHwData-&gt;phy_type )</div><div class='add'>+	{</div><div class='add'>+		//Power index: 0 ~ 63</div><div class='add'>+		index = RFSynthesizer_SetAiroha7230Power( pHwData, PowerIndex );</div><div class='add'>+		index = (u8)al7230_txvga_data[index][1];</div><div class='add'>+	}</div><div class='add'>+	else if( (RF_WB_242 == pHwData-&gt;phy_type) ||</div><div class='add'>+		 (RF_WB_242_1 == pHwData-&gt;phy_type) ) // 20060619.5 Add</div><div class='add'>+	{</div><div class='add'>+		//Power index: 0 ~ 19 for original. New range is 0 ~ 33</div><div class='add'>+		index = RFSynthesizer_SetWinbond242Power( pHwData, PowerIndex );</div><div class='add'>+		index = (u8)w89rf242_txvga_data[index][1];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pHwData-&gt;power_index = index;  // Backup current</div><div class='add'>+	return index;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+//-- Sub function</div><div class='add'>+u8 RFSynthesizer_SetMaxim2828_24Power(  phw_data_t pHwData, u8 index )</div><div class='add'>+{</div><div class='add'>+	u32		PowerData;</div><div class='add'>+	if( index &gt; 1 ) index = 1;</div><div class='add'>+	PowerData = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (18 &lt;&lt; 24) | BitReverse( max2828_power_data_24[index], 18);</div><div class='add'>+	Wb35Reg_Write( pHwData, 0x0864, PowerData );</div><div class='add'>+	return index;</div><div class='add'>+}</div><div class='add'>+//--</div><div class='add'>+u8 RFSynthesizer_SetMaxim2828_50Power(  phw_data_t pHwData, u8 index )</div><div class='add'>+{</div><div class='add'>+	u32		PowerData;</div><div class='add'>+	if( index &gt; 1 ) index = 1;</div><div class='add'>+	PowerData = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (18 &lt;&lt; 24) | BitReverse( max2828_power_data_50[index], 18);</div><div class='add'>+	Wb35Reg_Write( pHwData, 0x0864, PowerData );</div><div class='add'>+	return index;</div><div class='add'>+}</div><div class='add'>+//--</div><div class='add'>+u8 RFSynthesizer_SetMaxim2827_24Power(  phw_data_t pHwData, u8 index )</div><div class='add'>+{</div><div class='add'>+	u32		PowerData;</div><div class='add'>+	if( index &gt; 1 ) index = 1;</div><div class='add'>+	PowerData = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (18 &lt;&lt; 24) | BitReverse( max2827_power_data_24[index], 18);</div><div class='add'>+	Wb35Reg_Write( pHwData, 0x0864, PowerData );</div><div class='add'>+	return index;</div><div class='add'>+}</div><div class='add'>+//--</div><div class='add'>+u8 RFSynthesizer_SetMaxim2827_50Power(  phw_data_t pHwData, u8 index )</div><div class='add'>+{</div><div class='add'>+	u32		PowerData;</div><div class='add'>+	if( index &gt; 1 ) index = 1;</div><div class='add'>+	PowerData = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (18 &lt;&lt; 24) | BitReverse( max2827_power_data_50[index], 18);</div><div class='add'>+	Wb35Reg_Write( pHwData, 0x0864, PowerData );</div><div class='add'>+	return index;</div><div class='add'>+}</div><div class='add'>+//--</div><div class='add'>+u8 RFSynthesizer_SetMaxim2825Power(  phw_data_t pHwData, u8 index )</div><div class='add'>+{</div><div class='add'>+	u32		PowerData;</div><div class='add'>+	if( index &gt; 1 ) index = 1;</div><div class='add'>+	PowerData = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (18 &lt;&lt; 24) | BitReverse( max2825_power_data_24[index], 18);</div><div class='add'>+	Wb35Reg_Write( pHwData, 0x0864, PowerData );</div><div class='add'>+	return index;</div><div class='add'>+}</div><div class='add'>+//--</div><div class='add'>+u8 RFSynthesizer_SetAiroha2230Power(  phw_data_t pHwData, u8 index )</div><div class='add'>+{</div><div class='add'>+	u32		PowerData;</div><div class='add'>+	u8		i,count;</div><div class='add'>+</div><div class='add'>+	count = sizeof(al2230_txvga_data) / sizeof(al2230_txvga_data[0]);</div><div class='add'>+	for (i=0; i&lt;count; i++)</div><div class='add'>+	{</div><div class='add'>+		if (al2230_txvga_data[i][1] &gt;= index)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	if (i == count)</div><div class='add'>+		i--;</div><div class='add'>+</div><div class='add'>+	PowerData = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (20 &lt;&lt; 24) | BitReverse( al2230_txvga_data[i][0], 20);</div><div class='add'>+	Wb35Reg_Write( pHwData, 0x0864, PowerData );</div><div class='add'>+	return i;</div><div class='add'>+}</div><div class='add'>+//--</div><div class='add'>+u8 RFSynthesizer_SetAiroha7230Power(  phw_data_t pHwData, u8 index )</div><div class='add'>+{</div><div class='add'>+	u32		PowerData;</div><div class='add'>+	u8		i,count;</div><div class='add'>+</div><div class='add'>+	//PowerData = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (20 &lt;&lt; 24) | BitReverse( airoha_power_data_24[index], 20);</div><div class='add'>+	count = sizeof(al7230_txvga_data) / sizeof(al7230_txvga_data[0]);</div><div class='add'>+	for (i=0; i&lt;count; i++)</div><div class='add'>+	{</div><div class='add'>+		if (al7230_txvga_data[i][1] &gt;= index)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	if (i == count)</div><div class='add'>+		i--;</div><div class='add'>+	PowerData = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (24 &lt;&lt; 24) | (al7230_txvga_data[i][0]&amp;0xffffff);</div><div class='add'>+	Wb35Reg_Write( pHwData, 0x0864, PowerData );</div><div class='add'>+	return i;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u8 RFSynthesizer_SetWinbond242Power(  phw_data_t pHwData, u8 index )</div><div class='add'>+{</div><div class='add'>+	u32		PowerData;</div><div class='add'>+	u8		i,count;</div><div class='add'>+</div><div class='add'>+	count = sizeof(w89rf242_txvga_data) / sizeof(w89rf242_txvga_data[0]);</div><div class='add'>+	for (i=0; i&lt;count; i++)</div><div class='add'>+	{</div><div class='add'>+		if (w89rf242_txvga_data[i][1] &gt;= index)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	if (i == count)</div><div class='add'>+		i--;</div><div class='add'>+</div><div class='add'>+	// Set TxVga into RF</div><div class='add'>+	PowerData = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (24 &lt;&lt; 24) | BitReverse( w89rf242_txvga_data[i][0], 24);</div><div class='add'>+	Wb35Reg_Write( pHwData, 0x0864, PowerData );</div><div class='add'>+</div><div class='add'>+	// Update BB48 BB4C BB58 for high precision txvga</div><div class='add'>+	Wb35Reg_Write( pHwData, 0x1048, w89rf242_txvga_data[i][2] );</div><div class='add'>+	Wb35Reg_Write( pHwData, 0x104c, w89rf242_txvga_data[i][3] );</div><div class='add'>+	Wb35Reg_Write( pHwData, 0x1058, w89rf242_txvga_data[i][4] );</div><div class='add'>+</div><div class='add'>+// Rf vga 0 ~ 3 for temperature compensate. It will affect the scan Bss.</div><div class='add'>+// The i value equals to 8 or 7 usually. So It's not necessary to setup this RF register.</div><div class='add'>+//	if( i &lt;= 3 )</div><div class='add'>+//		PowerData = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (24 &lt;&lt; 24) | BitReverse( 0x000024, 24 );</div><div class='add'>+//	else</div><div class='add'>+//		PowerData = (1 &lt;&lt; 31) | (0 &lt;&lt; 30) | (24 &lt;&lt; 24) | BitReverse( 0x001824, 24 );</div><div class='add'>+//	Wb35Reg_Write( pHwData, 0x0864, PowerData );</div><div class='add'>+	return i;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+//===========================================================================================================</div><div class='add'>+// Dxx_initial --</div><div class='add'>+// Mxx_initial --</div><div class='add'>+	//</div><div class='add'>+//  Routine Description:</div><div class='add'>+//		Initial the hardware setting and module variable</div><div class='add'>+	//</div><div class='add'>+//===========================================================================================================</div><div class='add'>+void Dxx_initial(  phw_data_t pHwData )</div><div class='add'>+{</div><div class='add'>+	PWB35REG	pWb35Reg = &amp;pHwData-&gt;Wb35Reg;</div><div class='add'>+</div><div class='add'>+	// Old IC:Single mode only.</div><div class='add'>+	// New IC: operation decide by Software set bit[4]. 1:multiple 0: single</div><div class='add'>+	pWb35Reg-&gt;D00_DmaControl = 0xc0000004;	//Txon, Rxon, multiple Rx for new 4k DMA</div><div class='add'>+											//Txon, Rxon, single Rx for old 8k ASIC</div><div class='add'>+	if( !HAL_USB_MODE_BURST( pHwData ) )</div><div class='add'>+		pWb35Reg-&gt;D00_DmaControl = 0xc0000000;//Txon, Rxon, single Rx for new 4k DMA</div><div class='add'>+</div><div class='add'>+	Wb35Reg_WriteSync( pHwData, 0x0400, pWb35Reg-&gt;D00_DmaControl );</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void Mxx_initial(  phw_data_t pHwData )</div><div class='add'>+{</div><div class='add'>+	PWB35REG	pWb35Reg = &amp;pHwData-&gt;Wb35Reg;</div><div class='add'>+	u32		tmp;</div><div class='add'>+	u32		pltmp[11];</div><div class='add'>+	u16	i;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	//======================================================</div><div class='add'>+	// Initial Mxx register</div><div class='add'>+	//======================================================</div><div class='add'>+</div><div class='add'>+	// M00 bit set</div><div class='add'>+#ifdef _IBSS_BEACON_SEQ_STICK_</div><div class='add'>+	pWb35Reg-&gt;M00_MacControl = 0; // Solve beacon sequence number stop by software</div><div class='add'>+#else</div><div class='add'>+	pWb35Reg-&gt;M00_MacControl = 0x80000000; // Solve beacon sequence number stop by hardware</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	// M24 disable enter power save, BB RxOn and enable NAV attack</div><div class='add'>+	pWb35Reg-&gt;M24_MacControl = 0x08040042;</div><div class='add'>+	pltmp[0] = pWb35Reg-&gt;M24_MacControl;</div><div class='add'>+</div><div class='add'>+	pltmp[1] = 0; // Skip M28, because no initialize value is required.</div><div class='add'>+</div><div class='add'>+	// M2C CWmin and CWmax setting</div><div class='add'>+	pHwData-&gt;cwmin = DEFAULT_CWMIN;</div><div class='add'>+	pHwData-&gt;cwmax = DEFAULT_CWMAX;</div><div class='add'>+	pWb35Reg-&gt;M2C_MacControl = DEFAULT_CWMIN &lt;&lt; 10;</div><div class='add'>+	pWb35Reg-&gt;M2C_MacControl |= DEFAULT_CWMAX;</div><div class='add'>+	pltmp[2] = pWb35Reg-&gt;M2C_MacControl;</div><div class='add'>+</div><div class='add'>+	// M30 BSSID</div><div class='add'>+	pltmp[3] = *(PULONG)pHwData-&gt;bssid;</div><div class='add'>+</div><div class='add'>+	// M34</div><div class='add'>+	pHwData-&gt;AID = DEFAULT_AID;</div><div class='add'>+	tmp = *(PUSHORT)(pHwData-&gt;bssid+4);</div><div class='add'>+	tmp |= DEFAULT_AID &lt;&lt; 16;</div><div class='add'>+	pltmp[4] = tmp;</div><div class='add'>+</div><div class='add'>+	// M38</div><div class='add'>+	pWb35Reg-&gt;M38_MacControl = (DEFAULT_RATE_RETRY_LIMIT&lt;&lt;8) | (DEFAULT_LONG_RETRY_LIMIT &lt;&lt; 4) | DEFAULT_SHORT_RETRY_LIMIT;</div><div class='add'>+	pltmp[5] = pWb35Reg-&gt;M38_MacControl;</div><div class='add'>+</div><div class='add'>+	// M3C</div><div class='add'>+	tmp = (DEFAULT_PIFST &lt;&lt; 26) | (DEFAULT_EIFST &lt;&lt; 16) | (DEFAULT_DIFST &lt;&lt; 8) | (DEFAULT_SIFST &lt;&lt; 4) | DEFAULT_OSIFST ;</div><div class='add'>+	pWb35Reg-&gt;M3C_MacControl = tmp;</div><div class='add'>+	pltmp[6] = tmp;</div><div class='add'>+</div><div class='add'>+	// M40</div><div class='add'>+	pHwData-&gt;slot_time_select = DEFAULT_SLOT_TIME;</div><div class='add'>+	tmp = (DEFAULT_ATIMWD &lt;&lt; 16) | DEFAULT_SLOT_TIME;</div><div class='add'>+	pWb35Reg-&gt;M40_MacControl = tmp;</div><div class='add'>+	pltmp[7] = tmp;</div><div class='add'>+</div><div class='add'>+	// M44</div><div class='add'>+	tmp = DEFAULT_MAX_TX_MSDU_LIFE_TIME &lt;&lt; 10; // *1024</div><div class='add'>+	pWb35Reg-&gt;M44_MacControl = tmp;</div><div class='add'>+	pltmp[8] = tmp;</div><div class='add'>+</div><div class='add'>+	// M48</div><div class='add'>+	pHwData-&gt;BeaconPeriod = DEFAULT_BEACON_INTERVAL;</div><div class='add'>+	pHwData-&gt;ProbeDelay = DEFAULT_PROBE_DELAY_TIME;</div><div class='add'>+	tmp = (DEFAULT_BEACON_INTERVAL &lt;&lt; 16) | DEFAULT_PROBE_DELAY_TIME;</div><div class='add'>+	pWb35Reg-&gt;M48_MacControl = tmp;</div><div class='add'>+	pltmp[9] = tmp;</div><div class='add'>+</div><div class='add'>+	//M4C</div><div class='add'>+	pWb35Reg-&gt;M4C_MacStatus = (DEFAULT_PROTOCOL_VERSION &lt;&lt; 30) | (DEFAULT_MAC_POWER_STATE &lt;&lt; 28) | (DEFAULT_DTIM_ALERT_TIME &lt;&lt; 24);</div><div class='add'>+	pltmp[10] = pWb35Reg-&gt;M4C_MacStatus;</div><div class='add'>+</div><div class='add'>+	// Burst write</div><div class='add'>+	//Wb35Reg_BurstWrite( pHwData, 0x0824, pltmp, 11, AUTO_INCREMENT );</div><div class='add'>+	for( i=0; i&lt;11; i++ )</div><div class='add'>+		Wb35Reg_WriteSync( pHwData, 0x0824 + i*4, pltmp[i] );</div><div class='add'>+</div><div class='add'>+	// M60</div><div class='add'>+	Wb35Reg_WriteSync( pHwData, 0x0860, 0x12481248 );</div><div class='add'>+	pWb35Reg-&gt;M60_MacControl = 0x12481248;</div><div class='add'>+</div><div class='add'>+	// M68</div><div class='add'>+	Wb35Reg_WriteSync( pHwData, 0x0868, 0x00050900 ); // 20051018 0x000F0F00 ); // 940930 0x00131300</div><div class='add'>+	pWb35Reg-&gt;M68_MacControl = 0x00050900;</div><div class='add'>+</div><div class='add'>+	// M98</div><div class='add'>+	Wb35Reg_WriteSync( pHwData, 0x0898, 0xffff8888 );</div><div class='add'>+	pWb35Reg-&gt;M98_MacControl = 0xffff8888;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+void Uxx_power_off_procedure(  phw_data_t pHwData )</div><div class='add'>+{</div><div class='add'>+	// SW, PMU reset and turn off clock</div><div class='add'>+	Wb35Reg_WriteSync( pHwData, 0x03b0, 3 );</div><div class='add'>+	Wb35Reg_WriteSync( pHwData, 0x03f0, 0xf9 );</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+//Decide the TxVga of every channel</div><div class='add'>+void GetTxVgaFromEEPROM(  phw_data_t pHwData )</div><div class='add'>+{</div><div class='add'>+	u32		i, j, ltmp;</div><div class='add'>+	u16		Value[MAX_TXVGA_EEPROM];</div><div class='add'>+	PUCHAR		pctmp;</div><div class='add'>+	u8		ctmp=0;</div><div class='add'>+</div><div class='add'>+	// Get the entire TxVga setting in EEPROM</div><div class='add'>+	for( i=0; i&lt;MAX_TXVGA_EEPROM; i++ )</div><div class='add'>+	{</div><div class='add'>+		Wb35Reg_WriteSync( pHwData, 0x03b4, 0x08100000 + 0x00010000*i );</div><div class='add'>+		Wb35Reg_ReadSync( pHwData, 0x03b4, &amp;ltmp );</div><div class='add'>+		Value[i] = (u16)( ltmp &amp; 0xffff ); // Get 16 bit available</div><div class='add'>+		Value[i] = cpu_to_le16( Value[i] ); // [7:0]2412 [7:0]2417 ....</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	// Adjust the filed which fills with reserved value.</div><div class='add'>+	pctmp = (PUCHAR)Value;</div><div class='add'>+	for( i=0; i&lt;(MAX_TXVGA_EEPROM*2); i++ )</div><div class='add'>+	{</div><div class='add'>+		if( pctmp[i] != 0xff )</div><div class='add'>+			ctmp = pctmp[i];</div><div class='add'>+		else</div><div class='add'>+			pctmp[i] = ctmp;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	// Adjust WB_242 to WB_242_1 TxVga scale</div><div class='add'>+	if( pHwData-&gt;phy_type == RF_WB_242 )</div><div class='add'>+	{</div><div class='add'>+		for( i=0; i&lt;4; i++ ) // Only 2412 2437 2462 2484 case must be modified</div><div class='add'>+		{</div><div class='add'>+			for( j=0; j&lt;(sizeof(w89rf242_txvga_old_mapping)/sizeof(w89rf242_txvga_old_mapping[0])); j++ )</div><div class='add'>+			{</div><div class='add'>+				if( pctmp[i] &lt; (u8)w89rf242_txvga_old_mapping[j][1] )</div><div class='add'>+				{</div><div class='add'>+					pctmp[i] = (u8)w89rf242_txvga_old_mapping[j][0];</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if( j == (sizeof(w89rf242_txvga_old_mapping)/sizeof(w89rf242_txvga_old_mapping[0])) )</div><div class='add'>+				pctmp[i] = (u8)w89rf242_txvga_old_mapping[j-1][0];</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	// 20060621 Add</div><div class='add'>+	memcpy( pHwData-&gt;TxVgaSettingInEEPROM, pctmp, MAX_TXVGA_EEPROM*2 ); //MAX_TXVGA_EEPROM is u16 count</div><div class='add'>+	EEPROMTxVgaAdjust( pHwData );</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+// This function will affect the TxVga parameter in HAL. If hal_set_current_channel</div><div class='add'>+// or RFSynthesizer_SetPowerIndex be called, new TxVga will take effect.</div><div class='add'>+// TxVgaSettingInEEPROM of sHwData is an u8 array point to EEPROM contain for IS89C35</div><div class='add'>+// This function will use default TxVgaSettingInEEPROM data to calculate new TxVga.</div><div class='add'>+void EEPROMTxVgaAdjust(  phw_data_t pHwData ) // 20060619.5 Add</div><div class='add'>+{</div><div class='add'>+	PUCHAR		pTxVga = pHwData-&gt;TxVgaSettingInEEPROM;</div><div class='add'>+	s16		i, stmp;</div><div class='add'>+</div><div class='add'>+	//-- 2.4G -- 20060704.2 Request from Tiger</div><div class='add'>+	//channel 1 ~ 5</div><div class='add'>+	stmp = pTxVga[1] - pTxVga[0];</div><div class='add'>+	for( i=0; i&lt;5; i++ )</div><div class='add'>+		pHwData-&gt;TxVgaFor24[i] = pTxVga[0] + stmp*i/4;</div><div class='add'>+	//channel 6 ~ 10</div><div class='add'>+	stmp = pTxVga[2] - pTxVga[1];</div><div class='add'>+	for( i=5; i&lt;10; i++ )</div><div class='add'>+		pHwData-&gt;TxVgaFor24[i] = pTxVga[1] + stmp*(i-5)/4;</div><div class='add'>+	//channel 11 ~ 13</div><div class='add'>+	stmp = pTxVga[3] - pTxVga[2];</div><div class='add'>+	for( i=10; i&lt;13; i++ )</div><div class='add'>+		pHwData-&gt;TxVgaFor24[i] = pTxVga[2] + stmp*(i-10)/2;</div><div class='add'>+	//channel 14</div><div class='add'>+	pHwData-&gt;TxVgaFor24[13] = pTxVga[3];</div><div class='add'>+</div><div class='add'>+	//-- 5G --</div><div class='add'>+	if( pHwData-&gt;phy_type == RF_AIROHA_7230 )</div><div class='add'>+	{</div><div class='add'>+		//channel 184</div><div class='add'>+		pHwData-&gt;TxVgaFor50[0].ChanNo = 184;</div><div class='add'>+		pHwData-&gt;TxVgaFor50[0].TxVgaValue = pTxVga[4];</div><div class='add'>+		//channel 196</div><div class='add'>+		pHwData-&gt;TxVgaFor50[3].ChanNo = 196;</div><div class='add'>+		pHwData-&gt;TxVgaFor50[3].TxVgaValue = pTxVga[5];</div><div class='add'>+		//interpolate</div><div class='add'>+		pHwData-&gt;TxVgaFor50[1].ChanNo = 188;</div><div class='add'>+		pHwData-&gt;TxVgaFor50[2].ChanNo = 192;</div><div class='add'>+		stmp = pTxVga[5] - pTxVga[4];</div><div class='add'>+		pHwData-&gt;TxVgaFor50[2].TxVgaValue = pTxVga[5] - stmp/3;</div><div class='add'>+		pHwData-&gt;TxVgaFor50[1].TxVgaValue = pTxVga[5] - stmp*2/3;</div><div class='add'>+</div><div class='add'>+		//channel 16</div><div class='add'>+		pHwData-&gt;TxVgaFor50[6].ChanNo = 16;</div><div class='add'>+		pHwData-&gt;TxVgaFor50[6].TxVgaValue = pTxVga[6];</div><div class='add'>+		pHwData-&gt;TxVgaFor50[4].ChanNo = 8;</div><div class='add'>+		pHwData-&gt;TxVgaFor50[4].TxVgaValue = pTxVga[6];</div><div class='add'>+		pHwData-&gt;TxVgaFor50[5].ChanNo = 12;</div><div class='add'>+		pHwData-&gt;TxVgaFor50[5].TxVgaValue = pTxVga[6];</div><div class='add'>+</div><div class='add'>+		//channel 36</div><div class='add'>+		pHwData-&gt;TxVgaFor50[8].ChanNo = 36;</div><div class='add'>+		pHwData-&gt;TxVgaFor50[8].TxVgaValue = pTxVga[7];</div><div class='add'>+		pHwData-&gt;TxVgaFor50[7].ChanNo = 34;</div><div class='add'>+		pHwData-&gt;TxVgaFor50[7].TxVgaValue = pTxVga[7];</div><div class='add'>+		pHwData-&gt;TxVgaFor50[9].ChanNo = 38;</div><div class='add'>+		pHwData-&gt;TxVgaFor50[9].TxVgaValue = pTxVga[7];</div><div class='add'>+</div><div class='add'>+		//channel 40</div><div class='add'>+		pHwData-&gt;TxVgaFor50[10].ChanNo = 40;</div><div class='add'>+		pHwData-&gt;TxVgaFor50[10].TxVgaValue = pTxVga[8];</div><div class='add'>+		//channel 48</div><div class='add'>+		pHwData-&gt;TxVgaFor50[14].ChanNo = 48;</div><div class='add'>+		pHwData-&gt;TxVgaFor50[14].TxVgaValue = pTxVga[9];</div><div class='add'>+		//interpolate</div><div class='add'>+		pHwData-&gt;TxVgaFor50[11].ChanNo = 42;</div><div class='add'>+		pHwData-&gt;TxVgaFor50[12].ChanNo = 44;</div><div class='add'>+		pHwData-&gt;TxVgaFor50[13].ChanNo = 46;</div><div class='add'>+		stmp = pTxVga[9] - pTxVga[8];</div><div class='add'>+		pHwData-&gt;TxVgaFor50[13].TxVgaValue = pTxVga[9] - stmp/4;</div><div class='add'>+		pHwData-&gt;TxVgaFor50[12].TxVgaValue = pTxVga[9] - stmp*2/4;</div><div class='add'>+		pHwData-&gt;TxVgaFor50[11].TxVgaValue = pTxVga[9] - stmp*3/4;</div><div class='add'>+</div><div class='add'>+		//channel 52</div><div class='add'>+		pHwData-&gt;TxVgaFor50[15].ChanNo = 52;</div><div class='add'>+		pHwData-&gt;TxVgaFor50[15].TxVgaValue = pTxVga[10];</div><div class='add'>+		//channel 64</div><div class='add'>+		pHwData-&gt;TxVgaFor50[18].ChanNo = 64;</div><div class='add'>+		pHwData-&gt;TxVgaFor50[18].TxVgaValue = pTxVga[11];</div><div class='add'>+		//interpolate</div><div class='add'>+		pHwData-&gt;TxVgaFor50[16].ChanNo = 56;</div><div class='add'>+		pHwData-&gt;TxVgaFor50[17].ChanNo = 60;</div><div class='add'>+		stmp = pTxVga[11] - pTxVga[10];</div><div class='add'>+		pHwData-&gt;TxVgaFor50[17].TxVgaValue = pTxVga[11] - stmp/3;</div><div class='add'>+		pHwData-&gt;TxVgaFor50[16].TxVgaValue = pTxVga[11] - stmp*2/3;</div><div class='add'>+</div><div class='add'>+		//channel 100</div><div class='add'>+		pHwData-&gt;TxVgaFor50[19].ChanNo = 100;</div><div class='add'>+		pHwData-&gt;TxVgaFor50[19].TxVgaValue = pTxVga[12];</div><div class='add'>+		//channel 112</div><div class='add'>+		pHwData-&gt;TxVgaFor50[22].ChanNo = 112;</div><div class='add'>+		pHwData-&gt;TxVgaFor50[22].TxVgaValue = pTxVga[13];</div><div class='add'>+		//interpolate</div><div class='add'>+		pHwData-&gt;TxVgaFor50[20].ChanNo = 104;</div><div class='add'>+		pHwData-&gt;TxVgaFor50[21].ChanNo = 108;</div><div class='add'>+		stmp = pTxVga[13] - pTxVga[12];</div><div class='add'>+		pHwData-&gt;TxVgaFor50[21].TxVgaValue = pTxVga[13] - stmp/3;</div><div class='add'>+		pHwData-&gt;TxVgaFor50[20].TxVgaValue = pTxVga[13] - stmp*2/3;</div><div class='add'>+</div><div class='add'>+		//channel 128</div><div class='add'>+		pHwData-&gt;TxVgaFor50[26].ChanNo = 128;</div><div class='add'>+		pHwData-&gt;TxVgaFor50[26].TxVgaValue = pTxVga[14];</div><div class='add'>+		//interpolate</div><div class='add'>+		pHwData-&gt;TxVgaFor50[23].ChanNo = 116;</div><div class='add'>+		pHwData-&gt;TxVgaFor50[24].ChanNo = 120;</div><div class='add'>+		pHwData-&gt;TxVgaFor50[25].ChanNo = 124;</div><div class='add'>+		stmp = pTxVga[14] - pTxVga[13];</div><div class='add'>+		pHwData-&gt;TxVgaFor50[25].TxVgaValue = pTxVga[14] - stmp/4;</div><div class='add'>+		pHwData-&gt;TxVgaFor50[24].TxVgaValue = pTxVga[14] - stmp*2/4;</div><div class='add'>+		pHwData-&gt;TxVgaFor50[23].TxVgaValue = pTxVga[14] - stmp*3/4;</div><div class='add'>+</div><div class='add'>+		//channel 140</div><div class='add'>+		pHwData-&gt;TxVgaFor50[29].ChanNo = 140;</div><div class='add'>+		pHwData-&gt;TxVgaFor50[29].TxVgaValue = pTxVga[15];</div><div class='add'>+		//interpolate</div><div class='add'>+		pHwData-&gt;TxVgaFor50[27].ChanNo = 132;</div><div class='add'>+		pHwData-&gt;TxVgaFor50[28].ChanNo = 136;</div><div class='add'>+		stmp = pTxVga[15] - pTxVga[14];</div><div class='add'>+		pHwData-&gt;TxVgaFor50[28].TxVgaValue = pTxVga[15] - stmp/3;</div><div class='add'>+		pHwData-&gt;TxVgaFor50[27].TxVgaValue = pTxVga[15] - stmp*2/3;</div><div class='add'>+</div><div class='add'>+		//channel 149</div><div class='add'>+		pHwData-&gt;TxVgaFor50[30].ChanNo = 149;</div><div class='add'>+		pHwData-&gt;TxVgaFor50[30].TxVgaValue = pTxVga[16];</div><div class='add'>+		//channel 165</div><div class='add'>+		pHwData-&gt;TxVgaFor50[34].ChanNo = 165;</div><div class='add'>+		pHwData-&gt;TxVgaFor50[34].TxVgaValue = pTxVga[17];</div><div class='add'>+		//interpolate</div><div class='add'>+		pHwData-&gt;TxVgaFor50[31].ChanNo = 153;</div><div class='add'>+		pHwData-&gt;TxVgaFor50[32].ChanNo = 157;</div><div class='add'>+		pHwData-&gt;TxVgaFor50[33].ChanNo = 161;</div><div class='add'>+		stmp = pTxVga[17] - pTxVga[16];</div><div class='add'>+		pHwData-&gt;TxVgaFor50[33].TxVgaValue = pTxVga[17] - stmp/4;</div><div class='add'>+		pHwData-&gt;TxVgaFor50[32].TxVgaValue = pTxVga[17] - stmp*2/4;</div><div class='add'>+		pHwData-&gt;TxVgaFor50[31].TxVgaValue = pTxVga[17] - stmp*3/4;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	#ifdef _PE_STATE_DUMP_</div><div class='add'>+	WBDEBUG((" TxVgaFor24 : \n"));</div><div class='add'>+	DataDmp((u8 *)pHwData-&gt;TxVgaFor24, 14 ,0);</div><div class='add'>+	WBDEBUG((" TxVgaFor50 : \n"));</div><div class='add'>+	DataDmp((u8 *)pHwData-&gt;TxVgaFor50, 70 ,0);</div><div class='add'>+	#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void BBProcessor_RateChanging(  phw_data_t pHwData,  u8 rate ) // 20060613.1</div><div class='add'>+{</div><div class='add'>+	PWB35REG	pWb35Reg = &amp;pHwData-&gt;Wb35Reg;</div><div class='add'>+	unsigned char		Is11bRate;</div><div class='add'>+</div><div class='add'>+	Is11bRate = (rate % 6) ? 1 : 0;</div><div class='add'>+	switch( pHwData-&gt;phy_type )</div><div class='add'>+	{</div><div class='add'>+		case RF_AIROHA_2230:</div><div class='add'>+		case RF_AIROHA_2230S: // 20060420 Add this</div><div class='add'>+			if( Is11bRate )</div><div class='add'>+			{</div><div class='add'>+				if( (pWb35Reg-&gt;BB48 != BB48_DEFAULT_AL2230_11B) &amp;&amp;</div><div class='add'>+					(pWb35Reg-&gt;BB4C != BB4C_DEFAULT_AL2230_11B) )</div><div class='add'>+				{</div><div class='add'>+					Wb35Reg_Write( pHwData, 0x1048, BB48_DEFAULT_AL2230_11B );</div><div class='add'>+					Wb35Reg_Write( pHwData, 0x104c, BB4C_DEFAULT_AL2230_11B );</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+			else</div><div class='add'>+			{</div><div class='add'>+				if( (pWb35Reg-&gt;BB48 != BB48_DEFAULT_AL2230_11G) &amp;&amp;</div><div class='add'>+					(pWb35Reg-&gt;BB4C != BB4C_DEFAULT_AL2230_11G) )</div><div class='add'>+				{</div><div class='add'>+					Wb35Reg_Write( pHwData, 0x1048, BB48_DEFAULT_AL2230_11G );</div><div class='add'>+					Wb35Reg_Write( pHwData, 0x104c, BB4C_DEFAULT_AL2230_11G );</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case RF_WB_242: // 20060623 The fix only for old TxVGA setting</div><div class='add'>+			if( Is11bRate )</div><div class='add'>+			{</div><div class='add'>+				if( (pWb35Reg-&gt;BB48 != BB48_DEFAULT_WB242_11B) &amp;&amp;</div><div class='add'>+					(pWb35Reg-&gt;BB4C != BB4C_DEFAULT_WB242_11B) )</div><div class='add'>+				{</div><div class='add'>+					pWb35Reg-&gt;BB48 = BB48_DEFAULT_WB242_11B;</div><div class='add'>+					pWb35Reg-&gt;BB4C = BB4C_DEFAULT_WB242_11B;</div><div class='add'>+					Wb35Reg_Write( pHwData, 0x1048, BB48_DEFAULT_WB242_11B );</div><div class='add'>+					Wb35Reg_Write( pHwData, 0x104c, BB4C_DEFAULT_WB242_11B );</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+			else</div><div class='add'>+			{</div><div class='add'>+				if( (pWb35Reg-&gt;BB48 != BB48_DEFAULT_WB242_11G) &amp;&amp;</div><div class='add'>+					(pWb35Reg-&gt;BB4C != BB4C_DEFAULT_WB242_11G) )</div><div class='add'>+				{</div><div class='add'>+					pWb35Reg-&gt;BB48 = BB48_DEFAULT_WB242_11G;</div><div class='add'>+					pWb35Reg-&gt;BB4C = BB4C_DEFAULT_WB242_11G;</div><div class='add'>+					Wb35Reg_Write( pHwData, 0x1048, BB48_DEFAULT_WB242_11G );</div><div class='add'>+					Wb35Reg_Write( pHwData, 0x104c, BB4C_DEFAULT_WB242_11G );</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='head'>diff --git a/drivers/staging/winbond/rxisr.c b/drivers/staging/winbond/rxisr.c<br/>new file mode 100644<br/>index 000000000000..18e942c9b821<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/winbond/rxisr.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/rxisr.c</a></div><div class='hunk'>@@ -0,0 +1,30 @@</div><div class='add'>+#include "os_common.h"</div><div class='add'>+</div><div class='add'>+void vRxTimerInit(PWB32_ADAPTER Adapter)</div><div class='add'>+{</div><div class='add'>+	OS_TIMER_INITIAL(&amp;(Adapter-&gt;Mds.nTimer), (void*) RxTimerHandler, (void*) Adapter);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void vRxTimerStart(PWB32_ADAPTER Adapter, int timeout_value)</div><div class='add'>+{</div><div class='add'>+	if (timeout_value&lt;MIN_TIMEOUT_VAL)</div><div class='add'>+		timeout_value=MIN_TIMEOUT_VAL;</div><div class='add'>+</div><div class='add'>+	OS_TIMER_SET( &amp;(Adapter-&gt;Mds.nTimer), timeout_value );</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void vRxTimerStop(PWB32_ADAPTER Adapter)</div><div class='add'>+{</div><div class='add'>+	OS_TIMER_CANCEL( &amp;(Adapter-&gt;Mds.nTimer), 0 );</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void RxTimerHandler_1a( PADAPTER Adapter)</div><div class='add'>+{</div><div class='add'>+	RxTimerHandler(NULL, Adapter, NULL, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void RxTimerHandler(void* SystemSpecific1, PWB32_ADAPTER Adapter,</div><div class='add'>+		    void* SystemSpecific2, void* SystemSpecific3)</div><div class='add'>+{</div><div class='add'>+	WARN_ON(1);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/staging/winbond/scan_s.h b/drivers/staging/winbond/scan_s.h<br/>new file mode 100644<br/>index 000000000000..1d1b0c4fec17<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/winbond/scan_s.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/scan_s.h</a></div><div class='hunk'>@@ -0,0 +1,115 @@</div><div class='add'>+//</div><div class='add'>+// SCAN task global CONSTANTS, STRUCTURES, variables</div><div class='add'>+//</div><div class='add'>+</div><div class='add'>+//////////////////////////////////////////////////////////////////////////</div><div class='add'>+//define the msg type of SCAN module</div><div class='add'>+#define SCANMSG_SCAN_REQ			0x01</div><div class='add'>+#define SCANMSG_BEACON				0x02</div><div class='add'>+#define SCANMSG_PROBE_RESPONSE		0x03</div><div class='add'>+#define SCANMSG_TIMEOUT				0x04</div><div class='add'>+#define SCANMSG_TXPROBE_FAIL		0x05</div><div class='add'>+#define SCANMSG_ENABLE_BGSCAN		0x06</div><div class='add'>+#define SCANMSG_STOP_SCAN			0x07</div><div class='add'>+</div><div class='add'>+// BSS Type =&gt;conform to</div><div class='add'>+// IBSS             : ToDS/FromDS = 00</div><div class='add'>+// Infrastructure   : ToDS/FromDS = 01</div><div class='add'>+#define IBSS_NET			0</div><div class='add'>+#define ESS_NET				1</div><div class='add'>+#define ANYBSS_NET			2</div><div class='add'>+</div><div class='add'>+// Scan Type</div><div class='add'>+#define ACTIVE_SCAN			0</div><div class='add'>+#define PASSIVE_SCAN		1</div><div class='add'>+</div><div class='add'>+///////////////////////////////////////////////////////////////////////////</div><div class='add'>+//Global data structures, Initial Scan &amp; Background Scan</div><div class='add'>+typedef struct _SCAN_REQ_PARA	//mandatory parameters for SCAN request</div><div class='add'>+{</div><div class='add'>+	u32				ScanType;			//passive/active scan</div><div class='add'>+</div><div class='add'>+	CHAN_LIST		sChannelList;	// 86B</div><div class='add'>+	u8			reserved_1[2];</div><div class='add'>+</div><div class='add'>+	struct SSID_Element	sSSID; // 34B. scan only for this SSID</div><div class='add'>+	u8			reserved_2[2];</div><div class='add'>+</div><div class='add'>+} SCAN_REQ_PARA, *psSCAN_REQ_PARA;</div><div class='add'>+</div><div class='add'>+typedef struct _SCAN_PARAMETERS</div><div class='add'>+{</div><div class='add'>+	u16				wState;</div><div class='add'>+	u16				iCurrentChannelIndex;</div><div class='add'>+</div><div class='add'>+	SCAN_REQ_PARA	sScanReq;</div><div class='add'>+</div><div class='add'>+	u8				BSSID[MAC_ADDR_LENGTH + 2];		//scan only for this BSSID</div><div class='add'>+</div><div class='add'>+	u32				BssType;						//scan only for this BSS type</div><div class='add'>+</div><div class='add'>+	//struct SSID_Element	sSSID;						//scan only for this SSID</div><div class='add'>+	u16				ProbeDelay;</div><div class='add'>+	u16				MinChannelTime;</div><div class='add'>+</div><div class='add'>+	u16				MaxChannelTime;</div><div class='add'>+	u16				reserved_1;</div><div class='add'>+</div><div class='add'>+    s32				iBgScanPeriod;				// XP: 5 sec</div><div class='add'>+</div><div class='add'>+    u8				boBgScan;					// Wb: enable BG scan, For XP, this value must be FALSE</div><div class='add'>+    u8				boFastScan;					// Wb: reserved</div><div class='add'>+	u8				boCCAbusy;					// Wb: HWMAC CCA busy status</div><div class='add'>+	u8				reserved_2;</div><div class='add'>+</div><div class='add'>+	//NDIS_MINIPORT_TIMER	nTimer;</div><div class='add'>+	OS_TIMER			nTimer;</div><div class='add'>+</div><div class='add'>+	u32				ScanTimeStamp;			//Increase 1 per background scan(1 minute)</div><div class='add'>+	u32				BssTimeStamp;			//Increase 1 per connect status check</div><div class='add'>+	u32				RxNumPerAntenna[2];		//</div><div class='add'>+</div><div class='add'>+	u8				AntennaToggle;			//</div><div class='add'>+	u8				boInTimerHandler;</div><div class='add'>+	u8 				boTimerActive;				// Wb: reserved</div><div class='add'>+	u8				boSave;</div><div class='add'>+</div><div class='add'>+	u32				BScanEnable; // Background scan enable. Default is On</div><div class='add'>+</div><div class='add'>+} SCAN_PARAMETERS, *psSCAN_PARAMETERS;</div><div class='add'>+</div><div class='add'>+// Encapsulate 'Adapter' data structure</div><div class='add'>+#define psSCAN			(&amp;(Adapter-&gt;sScanPara))</div><div class='add'>+#define psSCANREQ			(&amp;(Adapter-&gt;sScanPara.sScanReq))</div><div class='add'>+</div><div class='add'>+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++</div><div class='add'>+//	scan.h</div><div class='add'>+//		Define the related definitions of scan module</div><div class='add'>+//	history -- 01/14/03' created</div><div class='add'>+//</div><div class='add'>+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++</div><div class='add'>+</div><div class='add'>+//Define the state of scan module</div><div class='add'>+#define SCAN_INACTIVE						0</div><div class='add'>+#define WAIT_PROBE_DELAY					1</div><div class='add'>+#define WAIT_RESPONSE_MIN					2</div><div class='add'>+#define WAIT_RESPONSE_MAX_ACTIVE			3</div><div class='add'>+#define WAIT_BEACON_MAX_PASSIVE				4</div><div class='add'>+#define SCAN_COMPLETE						5</div><div class='add'>+#define BG_SCAN								6</div><div class='add'>+#define BG_SCANNING							7</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+// The value will load from EEPROM</div><div class='add'>+// If 0xff is set in EEPOM, the driver will use SCAN_MAX_CHNL_TIME instead.</div><div class='add'>+// The definition is in WbHal.h</div><div class='add'>+//	#define SCAN_MAX_CHNL_TIME				(50)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+// static functions</div><div class='add'>+</div><div class='add'>+//static void ScanTimerHandler(PWB32_ADAPTER Adapter);</div><div class='add'>+//static void vScanTimerStart(PWB32_ADAPTER	Adapter, int timeout_value);</div><div class='add'>+//static void vScanTimerStop(PWB32_ADAPTER Adapter);</div><div class='add'>+</div><div class='head'>diff --git a/drivers/staging/winbond/sme_api.c b/drivers/staging/winbond/sme_api.c<br/>new file mode 100644<br/>index 000000000000..40e93b7600eb<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/winbond/sme_api.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/sme_api.c</a></div><div class='hunk'>@@ -0,0 +1,13 @@</div><div class='add'>+//------------------------------------------------------------------------------------</div><div class='add'>+// sme_api.c</div><div class='add'>+//</div><div class='add'>+// Copyright(C) 2002 Winbond Electronics Corp.</div><div class='add'>+//</div><div class='add'>+//</div><div class='add'>+//------------------------------------------------------------------------------------</div><div class='add'>+#include "os_common.h"</div><div class='add'>+</div><div class='add'>+s8 sme_get_rssi(void *pcore_data, s32 *prssi)</div><div class='add'>+{</div><div class='add'>+       BUG();</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/staging/winbond/sme_api.h b/drivers/staging/winbond/sme_api.h<br/>new file mode 100644<br/>index 000000000000..016b225ca4a4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/winbond/sme_api.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/sme_api.h</a></div><div class='hunk'>@@ -0,0 +1,265 @@</div><div class='add'>+/*</div><div class='add'>+ * sme_api.h</div><div class='add'>+ *</div><div class='add'>+ * Copyright(C) 2002 Winbond Electronics Corp.</div><div class='add'>+ *</div><div class='add'>+ * modification history</div><div class='add'>+ * ---------------------------------------------------------------------------</div><div class='add'>+ * 1.00.001, 2003-04-21, Kevin       created</div><div class='add'>+ * 1.00.002, 2003-05-14, PD43 &amp; PE20 modified</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __SME_API_H__</div><div class='add'>+#define __SME_API_H__</div><div class='add'>+</div><div class='add'>+/****************** INCLUDE FILES SECTION ***********************************/</div><div class='add'>+//#include "GL\gl_core.h"</div><div class='add'>+</div><div class='add'>+/****************** CONSTANT AND MACRO SECTION ******************************/</div><div class='add'>+#define _INLINE      __inline</div><div class='add'>+</div><div class='add'>+#define MEDIA_STATE_DISCONNECTED    0</div><div class='add'>+#define MEDIA_STATE_CONNECTED       1</div><div class='add'>+</div><div class='add'>+//ARRAY CHECK</div><div class='add'>+#define MAX_POWER_TO_DB 32</div><div class='add'>+</div><div class='add'>+/****************** TYPE DEFINITION SECTION *********************************/</div><div class='add'>+</div><div class='add'>+/****************** EXPORTED FUNCTION DECLARATION SECTION *******************/</div><div class='add'>+</div><div class='add'>+// OID_802_11_BSSID</div><div class='add'>+s8 sme_get_bssid(void *pcore_data, u8 *pbssid);</div><div class='add'>+s8 sme_get_desired_bssid(void *pcore_data, u8 *pbssid);//Not use</div><div class='add'>+s8 sme_set_desired_bssid(void *pcore_data, u8 *pbssid);</div><div class='add'>+</div><div class='add'>+// OID_802_11_SSID</div><div class='add'>+s8 sme_get_ssid(void *pcore_data, u8 *pssid, u8 *pssid_len);</div><div class='add'>+s8 sme_get_desired_ssid(void *pcore_data, u8 *pssid, u8 *pssid_len);// Not use</div><div class='add'>+s8 sme_set_desired_ssid(void *pcore_data, u8 *pssid, u8 ssid_len);</div><div class='add'>+</div><div class='add'>+// OID_802_11_INFRASTRUCTURE_MODE</div><div class='add'>+s8 sme_get_bss_type(void *pcore_data, u8 *pbss_type);</div><div class='add'>+s8 sme_get_desired_bss_type(void *pcore_data, u8 *pbss_type);//Not use</div><div class='add'>+s8 sme_set_desired_bss_type(void *pcore_data, u8 bss_type);</div><div class='add'>+</div><div class='add'>+// OID_802_11_FRAGMENTATION_THRESHOLD</div><div class='add'>+s8 sme_get_fragment_threshold(void *pcore_data, u32 *pthreshold);</div><div class='add'>+s8 sme_set_fragment_threshold(void *pcore_data, u32 threshold);</div><div class='add'>+</div><div class='add'>+// OID_802_11_RTS_THRESHOLD</div><div class='add'>+s8 sme_get_rts_threshold(void *pcore_data, u32 *pthreshold);</div><div class='add'>+s8 sme_set_rts_threshold(void *pcore_data, u32 threshold);</div><div class='add'>+</div><div class='add'>+// OID_802_11_RSSI</div><div class='add'>+s8 sme_get_rssi(void *pcore_data, s32 *prssi);</div><div class='add'>+</div><div class='add'>+// OID_802_11_CONFIGURATION</div><div class='add'>+s8 sme_get_beacon_period(void *pcore_data, u16 *pbeacon_period);</div><div class='add'>+s8 sme_set_beacon_period(void *pcore_data, u16 beacon_period);</div><div class='add'>+</div><div class='add'>+s8 sme_get_atim_window(void *pcore_data, u16 *patim_window);</div><div class='add'>+s8 sme_set_atim_window(void *pcore_data, u16 atim_window);</div><div class='add'>+</div><div class='add'>+s8 sme_get_current_channel(void *pcore_data, u8 *pcurrent_channel);</div><div class='add'>+s8 sme_get_current_band(void *pcore_data, u8 *pcurrent_band);</div><div class='add'>+s8 sme_set_current_channel(void *pcore_data, u8 current_channel);</div><div class='add'>+</div><div class='add'>+// OID_802_11_BSSID_LIST</div><div class='add'>+s8 sme_get_scan_bss_count(void *pcore_data, u8 *pcount);</div><div class='add'>+s8 sme_get_scan_bss(void *pcore_data, u8 index, void **ppbss);</div><div class='add'>+</div><div class='add'>+s8 sme_get_connected_bss(void *pcore_data, void **ppbss_now);</div><div class='add'>+</div><div class='add'>+// OID_802_11_AUTHENTICATION_MODE</div><div class='add'>+s8 sme_get_auth_mode(void *pcore_data, u8 *pauth_mode);</div><div class='add'>+s8 sme_set_auth_mode(void *pcore_data, u8 auth_mode);</div><div class='add'>+</div><div class='add'>+// OID_802_11_WEP_STATUS / OID_802_11_ENCRYPTION_STATUS</div><div class='add'>+s8 sme_get_wep_mode(void *pcore_data, u8 *pwep_mode);</div><div class='add'>+s8 sme_set_wep_mode(void *pcore_data, u8 wep_mode);</div><div class='add'>+//s8 sme_get_encryption_status(void *pcore_data, u8 *pstatus);</div><div class='add'>+//s8 sme_set_encryption_status(void *pcore_data, u8 status);</div><div class='add'>+</div><div class='add'>+// ???????????????????????????????????????</div><div class='add'>+</div><div class='add'>+// OID_GEN_VENDOR_ID</div><div class='add'>+// OID_802_3_PERMANENT_ADDRESS</div><div class='add'>+s8 sme_get_permanent_mac_addr(void *pcore_data, u8 *pmac_addr);</div><div class='add'>+</div><div class='add'>+// OID_802_3_CURRENT_ADDRESS</div><div class='add'>+s8 sme_get_current_mac_addr(void *pcore_data, u8 *pmac_addr);</div><div class='add'>+</div><div class='add'>+// OID_802_11_NETWORK_TYPE_IN_USE</div><div class='add'>+s8 sme_get_network_type_in_use(void *pcore_data, u8 *ptype);</div><div class='add'>+s8 sme_set_network_type_in_use(void *pcore_data, u8 type);</div><div class='add'>+</div><div class='add'>+// OID_802_11_SUPPORTED_RATES</div><div class='add'>+s8 sme_get_supported_rate(void *pcore_data, u8 *prates);</div><div class='add'>+</div><div class='add'>+// OID_802_11_ADD_WEP</div><div class='add'>+//12/29/03' wkchen</div><div class='add'>+s8 sme_set_add_wep(void *pcore_data, u32 key_index, u32 key_len,</div><div class='add'>+					 u8 *Address, u8 *key);</div><div class='add'>+</div><div class='add'>+// OID_802_11_REMOVE_WEP</div><div class='add'>+s8 sme_set_remove_wep(void *pcre_data, u32 key_index);</div><div class='add'>+</div><div class='add'>+// OID_802_11_DISASSOCIATE</div><div class='add'>+s8 sme_set_disassociate(void *pcore_data);</div><div class='add'>+</div><div class='add'>+// OID_802_11_POWER_MODE</div><div class='add'>+s8 sme_get_power_mode(void *pcore_data, u8 *pmode);</div><div class='add'>+s8 sme_set_power_mode(void *pcore_data, u8 mode);</div><div class='add'>+</div><div class='add'>+// OID_802_11_BSSID_LIST_SCAN</div><div class='add'>+s8 sme_set_bssid_list_scan(void *pcore_data, void *pscan_para);</div><div class='add'>+</div><div class='add'>+// OID_802_11_RELOAD_DEFAULTS</div><div class='add'>+s8 sme_set_reload_defaults(void *pcore_data, u8 reload_type);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+// The following SME API functions are used for WPA</div><div class='add'>+//</div><div class='add'>+// Mandatory OIDs for WPA</div><div class='add'>+//</div><div class='add'>+</div><div class='add'>+// OID_802_11_ADD_KEY</div><div class='add'>+//s8 sme_set_add_key(void *pcore_data, NDIS_802_11_KEY *pkey);</div><div class='add'>+</div><div class='add'>+// OID_802_11_REMOVE_KEY</div><div class='add'>+//s8 sme_set_remove_key(void *pcore_data, NDIS_802_11_REMOVE_KEY *pkey);</div><div class='add'>+</div><div class='add'>+// OID_802_11_ASSOCIATION_INFORMATION</div><div class='add'>+//s8 sme_set_association_information(void *pcore_data,</div><div class='add'>+//                    NDIS_802_11_ASSOCIATION_INFORMATION *pinfo);</div><div class='add'>+</div><div class='add'>+// OID_802_11_TEST</div><div class='add'>+//s8 sme_set_test(void *pcore_data, NDIS_802_11_TEST *ptest_data);</div><div class='add'>+</div><div class='add'>+//--------------------------------------------------------------------------//</div><div class='add'>+/*</div><div class='add'>+// The left OIDs</div><div class='add'>+</div><div class='add'>+// OID_802_11_NETWORK_TYPES_SUPPORTED</div><div class='add'>+// OID_802_11_TX_POWER_LEVEL</div><div class='add'>+// OID_802_11_RSSI_TRIGGER</div><div class='add'>+// OID_802_11_NUMBER_OF_ANTENNAS</div><div class='add'>+// OID_802_11_RX_ANTENNA_SELECTED</div><div class='add'>+// OID_802_11_TX_ANTENNA_SELECTED</div><div class='add'>+// OID_802_11_STATISTICS</div><div class='add'>+// OID_802_11_DESIRED_RATES</div><div class='add'>+// OID_802_11_PRIVACY_FILTER</div><div class='add'>+</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*------------------------- none-standard ----------------------------------*/</div><div class='add'>+s8 sme_get_connect_status(void *pcore_data, u8 *pstatus);</div><div class='add'>+</div><div class='add'>+/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/</div><div class='add'>+//s8 sme_get_scan_type(void *pcore_data, u8 *pscan_type);</div><div class='add'>+//s8 sme_set_scan_type(void *pcore_data, u8 scan_type);</div><div class='add'>+</div><div class='add'>+//s8 sme_get_scan_channel_list(void *pcore_data, u8 *pscan_type);</div><div class='add'>+//s8 sme_set_scan_channel_list(void *pcore_data, u8 scan_type);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+void sme_get_encryption_status(void *pcore_data, u8 *EncryptStatus);</div><div class='add'>+void sme_set_encryption_status(void *pcore_data, u8 EncryptStatus);</div><div class='add'>+s8 sme_add_key(void		*pcore_data,</div><div class='add'>+					u32		key_index,</div><div class='add'>+					u8		key_len,</div><div class='add'>+					u8		key_type,</div><div class='add'>+					u8		*key_bssid,</div><div class='add'>+					//u8		*key_rsc,</div><div class='add'>+					u8		*ptx_tsc,</div><div class='add'>+					u8		*prx_tsc,</div><div class='add'>+					u8		*key_material);</div><div class='add'>+void sme_remove_default_key(void *pcore_data, int index);</div><div class='add'>+void sme_remove_mapping_key(void *pcore_data, u8 *pmac_addr);</div><div class='add'>+void sme_clear_all_mapping_key(void *pcore_data);</div><div class='add'>+void sme_clear_all_default_key(void *pcore_data);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+s8 sme_set_preamble_mode(void *pcore_data, u8 mode);</div><div class='add'>+s8 sme_get_preamble_mode(void *pcore_data, u8 *mode);</div><div class='add'>+s8 sme_get_preamble_type(void *pcore_data, u8 *type);</div><div class='add'>+s8 sme_set_slottime_mode(void *pcore_data, u8 mode);</div><div class='add'>+s8 sme_get_slottime_mode(void *pcore_data, u8 *mode);</div><div class='add'>+s8 sme_get_slottime_type(void *pcore_data, u8 *type);</div><div class='add'>+s8 sme_set_txrate_policy(void *pcore_data, u8 policy);</div><div class='add'>+s8 sme_get_txrate_policy(void *pcore_data, u8 *policy);</div><div class='add'>+s8 sme_get_cwmin_value(void *pcore_data, u8 *cwmin);</div><div class='add'>+s8 sme_get_cwmax_value(void *pcore_data, u16 *cwmax);</div><div class='add'>+s8 sme_get_ms_radio_mode(void *pcore_data, u8 * pMsRadioOff);</div><div class='add'>+s8 sme_set_ms_radio_mode(void *pcore_data, u8 boMsRadioOff);</div><div class='add'>+s8 sme_get_radio_mode(void *pcore_data, psRadioOff pRadioOffData);</div><div class='add'>+s8 sme_set_radio_mode(void *pcore_data, RadioOff RadioOffData);</div><div class='add'>+</div><div class='add'>+void sme_get_tx_power_level(void *pcore_data, u32 *TxPower);</div><div class='add'>+u8 sme_set_tx_power_level(void *pcore_data, u32 TxPower);</div><div class='add'>+void sme_get_antenna_count(void *pcore_data, u32 *AntennaCount);</div><div class='add'>+void sme_get_rx_antenna(void *pcore_data, u32 *RxAntenna);</div><div class='add'>+u8 sme_set_rx_antenna(void *pcore_data, u32 RxAntenna);</div><div class='add'>+void sme_get_tx_antenna(void *pcore_data, u32 *TxAntenna);</div><div class='add'>+s8 sme_set_tx_antenna(void *pcore_data, u32 TxAntenna);</div><div class='add'>+s8 sme_set_IBSS_chan(void *pcore_data, ChanInfo chan);</div><div class='add'>+</div><div class='add'>+//20061108 WPS</div><div class='add'>+s8 sme_set_IE_append(void *pcore_data, PUCHAR buffer, u16 buf_len);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+//================== Local functions ======================</div><div class='add'>+//#ifdef _HSINCHU</div><div class='add'>+//void drv_translate_rssi();   // HW RSSI bit -&gt; NDIS RSSI representation</div><div class='add'>+//void drv_translate_bss_description(); // Local bss desc -&gt; NDIS bss desc</div><div class='add'>+//void drv_translate_channel(u8 NetworkType, u8 ChannelNumber, u32 *freq); // channel number -&gt; channel /freq.</div><div class='add'>+//#endif _HSINCHU</div><div class='add'>+//</div><div class='add'>+static const u32 PowerDbToMw[] =</div><div class='add'>+{</div><div class='add'>+	56,	//mW, MAX - 0,	17.5 dbm</div><div class='add'>+	40,	//mW, MAX - 1,	16.0 dbm</div><div class='add'>+	30,	//mW, MAX - 2,	14.8 dbm</div><div class='add'>+	20,	//mW, MAX - 3,	13.0 dbm</div><div class='add'>+	15,	//mW, MAX - 4,	11.8 dbm</div><div class='add'>+	12,	//mW, MAX - 5,	10.6 dbm</div><div class='add'>+	9,	//mW, MAX - 6,	 9.4 dbm</div><div class='add'>+	7,	//mW, MAX - 7,	 8.3 dbm</div><div class='add'>+	5,	//mW, MAX - 8,	 6.4 dbm</div><div class='add'>+	4,	//mW, MAX - 9,	 5.3 dbm</div><div class='add'>+	3,	//mW, MAX - 10,  4.0 dbm</div><div class='add'>+	2,	//mW, MAX - 11,  ? dbm</div><div class='add'>+	2,	//mW, MAX - 12,  ? dbm</div><div class='add'>+	2,	//mW, MAX - 13,  ? dbm</div><div class='add'>+	2,	//mW, MAX - 14,  ? dbm</div><div class='add'>+	2,	//mW, MAX - 15,  ? dbm</div><div class='add'>+	2,	//mW, MAX - 16,  ? dbm</div><div class='add'>+	2,	//mW, MAX - 17,  ? dbm</div><div class='add'>+	2,	//mW, MAX - 18,  ? dbm</div><div class='add'>+	1,	//mW, MAX - 19,  ? dbm</div><div class='add'>+	1,	//mW, MAX - 20,  ? dbm</div><div class='add'>+	1,	//mW, MAX - 21,  ? dbm</div><div class='add'>+	1,	//mW, MAX - 22,  ? dbm</div><div class='add'>+	1,	//mW, MAX - 23,  ? dbm</div><div class='add'>+	1,	//mW, MAX - 24,  ? dbm</div><div class='add'>+	1,	//mW, MAX - 25,  ? dbm</div><div class='add'>+	1,	//mW, MAX - 26,  ? dbm</div><div class='add'>+	1,	//mW, MAX - 27,  ? dbm</div><div class='add'>+	1,	//mW, MAX - 28,  ? dbm</div><div class='add'>+	1,	//mW, MAX - 29,  ? dbm</div><div class='add'>+	1,	//mW, MAX - 30,  ? dbm</div><div class='add'>+	1	//mW, MAX - 31,  ? dbm</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#endif /* __SME_API_H__ */</div><div class='add'>+</div><div class='add'>+</div><div class='head'>diff --git a/drivers/staging/winbond/sme_s.h b/drivers/staging/winbond/sme_s.h<br/>new file mode 100644<br/>index 000000000000..dfd2fbc4edef<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/winbond/sme_s.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/sme_s.h</a></div><div class='hunk'>@@ -0,0 +1,228 @@</div><div class='add'>+//</div><div class='add'>+// SME_S.H -</div><div class='add'>+// SME task global CONSTANTS, STRUCTURES, variables</div><div class='add'>+//</div><div class='add'>+</div><div class='add'>+//////////////////////////////////////////////////////////////////////////</div><div class='add'>+//define the msg type of SME module</div><div class='add'>+// 0x00~0x1F : MSG from GUI dispatch</div><div class='add'>+// 0x20~0x3F : MSG from MLME</div><div class='add'>+// 0x40~0x5F : MSG from SCAN</div><div class='add'>+// 0x60~0x6F : MSG from TX/RX</div><div class='add'>+// 0x70~0x7F : MSG from ROAMING</div><div class='add'>+// 0x80~0x8F : MSG from ISR</div><div class='add'>+// 0x90		 : MSG TimeOut</div><div class='add'>+</div><div class='add'>+// from GUI</div><div class='add'>+#define SMEMSG_SCAN_REQ					0x01</div><div class='add'>+//#define SMEMSG_PASSIVE_SCAN_REQ			0x02</div><div class='add'>+#define SMEMSG_JOIN_REQ					0x03</div><div class='add'>+#define SMEMSG_START_IBSS				0x04</div><div class='add'>+#define SMEMSG_DISCONNECT_REQ			0x05</div><div class='add'>+#define SMEMSG_AUTHEN_REQ				0x06</div><div class='add'>+#define SMEMSG_DEAUTHEN_REQ				0x07</div><div class='add'>+#define SMEMSG_ASSOC_REQ				0x08</div><div class='add'>+#define SMEMSG_REASSOC_REQ				0x09</div><div class='add'>+#define SMEMSG_DISASSOC_REQ				0x0a</div><div class='add'>+#define SMEMSG_POWERSAVE_REQ			0x0b</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+// from MLME</div><div class='add'>+#define SMEMSG_AUTHEN_CFM				0x21</div><div class='add'>+#define SMEMSG_AUTHEN_IND				0x22</div><div class='add'>+#define SMEMSG_ASSOC_CFM				0x23</div><div class='add'>+#define SMEMSG_DEAUTHEN_IND				0x24</div><div class='add'>+#define SMEMSG_DISASSOC_IND				0x25</div><div class='add'>+// from SCAN</div><div class='add'>+#define SMEMSG_SCAN_CFM					0x41</div><div class='add'>+#define SMEMSG_START_IBSS_CFM			0x42</div><div class='add'>+// from MTO, function call to set SME parameters</div><div class='add'>+</div><div class='add'>+// 0x60~0x6F : MSG from TX/RX</div><div class='add'>+//#define SMEMSG_IBSS_JOIN_UPDATE_BSSID	0x61</div><div class='add'>+#define SMEMSG_COUNTERMEASURE_MICFAIL_TIMEOUT		0x62</div><div class='add'>+#define SMEMSG_COUNTERMEASURE_BLOCK_TIMEOUT	0x63</div><div class='add'>+// from ROAMING</div><div class='add'>+#define SMEMSG_HANDOVER_JOIN_REQ		0x71</div><div class='add'>+#define SMEMSG_END_ROAMING				0x72</div><div class='add'>+#define SMEMSG_SCAN_JOIN_REQ			0x73</div><div class='add'>+// from ISR</div><div class='add'>+#define SMEMSG_TSF_SYNC_IND				0x81</div><div class='add'>+// from TimeOut</div><div class='add'>+#define SMEMSG_TIMEOUT					0x91</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define MAX_PMKID_Accunt                16</div><div class='add'>+//@added by ws 04/22/05</div><div class='add'>+#define Cipher_Disabled                 0</div><div class='add'>+#define Cipher_Wep                      1</div><div class='add'>+#define Cipher_Tkip                     2</div><div class='add'>+#define Cipher_Ccmp                     4</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+///////////////////////////////////////////////////////////////////////////</div><div class='add'>+//Constants</div><div class='add'>+</div><div class='add'>+///////////////////////////////////////////////////////////////////////////</div><div class='add'>+//Global data structures</div><div class='add'>+</div><div class='add'>+#define NUMOFWEPENTRIES     64</div><div class='add'>+</div><div class='add'>+typedef enum _WEPKeyMode</div><div class='add'>+{</div><div class='add'>+    WEPKEY_DISABLED = 0,</div><div class='add'>+    WEPKEY_64       = 1,</div><div class='add'>+    WEPKEY_128      = 2</div><div class='add'>+</div><div class='add'>+} WEPKEYMODE, *pWEPKEYMODE;</div><div class='add'>+</div><div class='add'>+#ifdef _WPA2_</div><div class='add'>+</div><div class='add'>+typedef struct _BSSInfo</div><div class='add'>+{</div><div class='add'>+  u8        PreAuthBssID[6];</div><div class='add'>+  PMKID        pmkid_value;</div><div class='add'>+}BSSID_Info;</div><div class='add'>+</div><div class='add'>+typedef struct _PMKID_Table //added by ws 05/05/04</div><div class='add'>+{</div><div class='add'>+   u32  Length;</div><div class='add'>+   u32  BSSIDInfoCount;</div><div class='add'>+   BSSID_Info BSSIDInfo[16];</div><div class='add'>+</div><div class='add'>+} PMKID_Table;</div><div class='add'>+</div><div class='add'>+#endif //end def _WPA2_</div><div class='add'>+</div><div class='add'>+#define MAX_BASIC_RATE_SET          15</div><div class='add'>+#define MAX_OPT_RATE_SET            MAX_BASIC_RATE_SET</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+typedef struct _SME_PARAMETERS</div><div class='add'>+{</div><div class='add'>+    u16				wState;</div><div class='add'>+	u8				boDUTmode;</div><div class='add'>+	u8				bDesiredPowerSave;</div><div class='add'>+</div><div class='add'>+	// SME timer and timeout value</div><div class='add'>+	//NDIS_MINIPORT_TIMER	nTimer;</div><div class='add'>+	OS_TIMER			nTimer;</div><div class='add'>+</div><div class='add'>+	u8				boInTimerHandler;</div><div class='add'>+	u8 				boAuthRetryActive;</div><div class='add'>+	u8				reserved_0[2];</div><div class='add'>+</div><div class='add'>+	u32				AuthenRetryTimerVal;	// NOTE: Assoc don't fail timeout</div><div class='add'>+	u32				JoinFailTimerVal;		// 10*Beacon-Interval</div><div class='add'>+</div><div class='add'>+	//Rates</div><div class='add'>+	u8				BSSBasicRateSet[(MAX_BASIC_RATE_SET + 3) &amp; ~0x03 ];    // BSS basic rate set</div><div class='add'>+	u8				OperationalRateSet[(MAX_OPT_RATE_SET + 3) &amp; ~0x03 ]; // Operational rate set</div><div class='add'>+</div><div class='add'>+	u8				NumOfBSSBasicRate;</div><div class='add'>+	u8				NumOfOperationalRate;</div><div class='add'>+	u8				reserved_1[2];</div><div class='add'>+</div><div class='add'>+	u32				BasicRateBitmap;</div><div class='add'>+	u32				OpRateBitmap;</div><div class='add'>+</div><div class='add'>+	// System parameters Set by GUI</div><div class='add'>+	//-------------------- start IBSS parameter ---------------------------//</div><div class='add'>+	u32				boStartIBSS;			//Start IBSS toggle</div><div class='add'>+</div><div class='add'>+	u16				wBeaconPeriod;</div><div class='add'>+	u16				wATIM_Window;</div><div class='add'>+</div><div class='add'>+	ChanInfo			IbssChan; // 2B	//channel setting when start IBSS</div><div class='add'>+	u8				reserved_2[2];</div><div class='add'>+</div><div class='add'>+    // Join related</div><div class='add'>+	u16				wDesiredJoinBSS;		// BSS index which desire to join</div><div class='add'>+	u8				boJoinReq;				//Join request toggle</div><div class='add'>+	u8				bDesiredBSSType;		//for Join request</div><div class='add'>+</div><div class='add'>+    u16				wCapabilityInfo;        // Used when invoking the MLME_Associate_request().</div><div class='add'>+	u16				wNonERPcapabilityInfo;</div><div class='add'>+</div><div class='add'>+    struct SSID_Element sDesiredSSID; // 34 B</div><div class='add'>+	u8				reserved_3[2];</div><div class='add'>+</div><div class='add'>+	u8    			abDesiredBSSID[MAC_ADDR_LENGTH + 2];</div><div class='add'>+</div><div class='add'>+	u8				bJoinScanCount;			// the time of scan-join action need to do</div><div class='add'>+	u8				bDesiredAuthMode;       // AUTH_OPEN_SYSTEM or AUTH_SHARED_KEY</div><div class='add'>+	u8				reserved_4[2];</div><div class='add'>+</div><div class='add'>+    // Encryption parameters</div><div class='add'>+	u8     			_dot11PrivacyInvoked;</div><div class='add'>+    u8             	_dot11PrivacyOptionImplemented;</div><div class='add'>+	u8				reserved_5[2];</div><div class='add'>+</div><div class='add'>+    //@ ws added</div><div class='add'>+    u8				DesiredEncrypt;</div><div class='add'>+	u8				encrypt_status;	//ENCRYPT_DISABLE, ENCRYPT_WEP, ENCRYPT_WEP_NOKEY, ENCRYPT_TKIP, ...</div><div class='add'>+	u8				key_length;</div><div class='add'>+	u8				pairwise_key_ok;</div><div class='add'>+</div><div class='add'>+	u8				group_key_ok;</div><div class='add'>+    u8				wpa_ok;             // indicate the control port of 802.1x is open or close</div><div class='add'>+	u8				pairwise_key_type;</div><div class='add'>+	u8				group_key_type;</div><div class='add'>+</div><div class='add'>+    u32               _dot11WEPDefaultKeyID;</div><div class='add'>+</div><div class='add'>+	u8              	tx_mic_key[8];      // TODO: 0627 kevin-TKIP</div><div class='add'>+	u8              	rx_mic_key[8];      // TODO: 0627 kevin-TKIP</div><div class='add'>+	u8				group_tx_mic_key[8];</div><div class='add'>+	u8				group_rx_mic_key[8];</div><div class='add'>+</div><div class='add'>+//	#ifdef _WPA_</div><div class='add'>+	u8				AssocReqVarIE[200];</div><div class='add'>+	u8				AssocRespVarIE[200];</div><div class='add'>+</div><div class='add'>+	u16				AssocReqVarLen;</div><div class='add'>+	u16				AssocRespVarLen;</div><div class='add'>+	u8				boReassoc;				//use assoc. or reassoc.</div><div class='add'>+	u8				reserved_6[3];</div><div class='add'>+	u16				AssocRespCapability;</div><div class='add'>+	u16				AssocRespStatus;</div><div class='add'>+//	#endif</div><div class='add'>+</div><div class='add'>+	#ifdef _WPA2_</div><div class='add'>+    u8               PmkIdTable[256];</div><div class='add'>+    u32               PmkidTableIndex;</div><div class='add'>+	#endif //end def _WPA2_</div><div class='add'>+</div><div class='add'>+} SME_PARAMETERS, *PSME_PARAMETERS;</div><div class='add'>+</div><div class='add'>+#define psSME			(&amp;(Adapter-&gt;sSmePara))</div><div class='add'>+</div><div class='add'>+#define wSMEGetCurrentSTAState(Adapter)		((u16)(Adapter)-&gt;sSmePara.wState)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++</div><div class='add'>+//	SmeModule.h</div><div class='add'>+//		Define the related definitions of SME module</div><div class='add'>+//	history -- 01/14/03' created</div><div class='add'>+//</div><div class='add'>+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++</div><div class='add'>+</div><div class='add'>+//Define the state of SME module</div><div class='add'>+#define DISABLED						0</div><div class='add'>+#define INIT_SCAN						1</div><div class='add'>+#define SCAN_READY						2</div><div class='add'>+#define START_IBSS						3</div><div class='add'>+#define JOIN_PENDING					4</div><div class='add'>+#define JOIN_CFM						5</div><div class='add'>+#define AUTHENTICATE_PENDING			6</div><div class='add'>+#define AUTHENTICATED					7</div><div class='add'>+#define CONNECTED						8</div><div class='add'>+//#define EAP_STARTING					9</div><div class='add'>+//#define EAPOL_AUTHEN_PENDING			10</div><div class='add'>+//#define SECURE_CONNECTED				11</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+// Static function</div><div class='add'>+</div><div class='head'>diff --git a/drivers/staging/winbond/wb35_ver.h b/drivers/staging/winbond/wb35_ver.h<br/>new file mode 100644<br/>index 000000000000..2433bc073004<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/winbond/wb35_ver.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/wb35_ver.h</a></div><div class='hunk'>@@ -0,0 +1,30 @@</div><div class='add'>+//</div><div class='add'>+// Only define one of follow</div><div class='add'>+//</div><div class='add'>+</div><div class='add'>+#ifdef WB_WIN</div><div class='add'>+	#define VER_FILEVERSION             1,00,47,00</div><div class='add'>+	#define VER_FILEVERSION_STR         "1.00.47.00"</div><div class='add'>+	#define WB32_DRIVER_MAJOR_VERSION   0x0100</div><div class='add'>+	#define WB32_DRIVER_MINOR_VERSION   0x4700</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef WB_CE</div><div class='add'>+	#define VER_FILEVERSION             2,00,47,00</div><div class='add'>+	#define VER_FILEVERSION_STR         "2.00.47.00"</div><div class='add'>+	#define WB32_DRIVER_MAJOR_VERSION   0x0200</div><div class='add'>+	#define WB32_DRIVER_MINOR_VERSION   0x4700</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef WB_LINUX</div><div class='add'>+	#define VER_FILEVERSION             3,00,47,00</div><div class='add'>+	#define VER_FILEVERSION_STR         "3.00.47.00"</div><div class='add'>+	#define WB32_DRIVER_MAJOR_VERSION   0x0300</div><div class='add'>+	#define WB32_DRIVER_MINOR_VERSION   0x4700</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='head'>diff --git a/drivers/staging/winbond/wbhal.c b/drivers/staging/winbond/wbhal.c<br/>new file mode 100644<br/>index 000000000000..daf442247558<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/winbond/wbhal.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/wbhal.c</a></div><div class='hunk'>@@ -0,0 +1,878 @@</div><div class='add'>+#include "os_common.h"</div><div class='add'>+</div><div class='add'>+void hal_get_ethernet_address( phw_data_t pHwData, PUCHAR current_address )</div><div class='add'>+{</div><div class='add'>+	if( pHwData-&gt;SurpriseRemove ) return;</div><div class='add'>+</div><div class='add'>+	memcpy( current_address, pHwData-&gt;CurrentMacAddress, ETH_LENGTH_OF_ADDRESS );</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void hal_set_ethernet_address( phw_data_t pHwData, PUCHAR current_address )</div><div class='add'>+{</div><div class='add'>+	u32 ltmp[2];</div><div class='add'>+</div><div class='add'>+	if( pHwData-&gt;SurpriseRemove ) return;</div><div class='add'>+</div><div class='add'>+	memcpy( pHwData-&gt;CurrentMacAddress, current_address, ETH_LENGTH_OF_ADDRESS );</div><div class='add'>+</div><div class='add'>+	ltmp[0]= cpu_to_le32( *(PULONG)pHwData-&gt;CurrentMacAddress );</div><div class='add'>+	ltmp[1]= cpu_to_le32( *(PULONG)(pHwData-&gt;CurrentMacAddress + 4) ) &amp; 0xffff;</div><div class='add'>+</div><div class='add'>+	Wb35Reg_BurstWrite( pHwData, 0x03e8, ltmp, 2, AUTO_INCREMENT );</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void hal_get_permanent_address( phw_data_t pHwData, PUCHAR pethernet_address )</div><div class='add'>+{</div><div class='add'>+	if( pHwData-&gt;SurpriseRemove ) return;</div><div class='add'>+</div><div class='add'>+	memcpy( pethernet_address, pHwData-&gt;PermanentMacAddress, 6 );</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u8 hal_init_hardware(phw_data_t pHwData, PWB32_ADAPTER Adapter)</div><div class='add'>+{</div><div class='add'>+	u16 SoftwareSet;</div><div class='add'>+	pHwData-&gt;Adapter = Adapter;</div><div class='add'>+</div><div class='add'>+	// Initial the variable</div><div class='add'>+	pHwData-&gt;MaxReceiveLifeTime = DEFAULT_MSDU_LIFE_TIME; // Setting Rx maximum MSDU life time</div><div class='add'>+	pHwData-&gt;FragmentThreshold = DEFAULT_FRAGMENT_THRESHOLD; // Setting default fragment threshold</div><div class='add'>+</div><div class='add'>+	if (WbUsb_initial(pHwData)) {</div><div class='add'>+		pHwData-&gt;InitialResource = 1;</div><div class='add'>+		if( Wb35Reg_initial(pHwData)) {</div><div class='add'>+			pHwData-&gt;InitialResource = 2;</div><div class='add'>+			if (Wb35Tx_initial(pHwData)) {</div><div class='add'>+				pHwData-&gt;InitialResource = 3;</div><div class='add'>+				if (Wb35Rx_initial(pHwData)) {</div><div class='add'>+					pHwData-&gt;InitialResource = 4;</div><div class='add'>+					OS_TIMER_INITIAL( &amp;pHwData-&gt;LEDTimer, hal_led_control, pHwData );</div><div class='add'>+					OS_TIMER_SET( &amp;pHwData-&gt;LEDTimer, 1000 ); // 20060623</div><div class='add'>+</div><div class='add'>+					//</div><div class='add'>+					// For restrict to vendor's hardware</div><div class='add'>+					//</div><div class='add'>+					SoftwareSet = hal_software_set( pHwData );</div><div class='add'>+</div><div class='add'>+					#ifdef Vendor2</div><div class='add'>+					// Try to make sure the EEPROM contain</div><div class='add'>+					SoftwareSet &gt;&gt;= 8;</div><div class='add'>+					if( SoftwareSet != 0x82 )</div><div class='add'>+						return FALSE;</div><div class='add'>+					#endif</div><div class='add'>+</div><div class='add'>+					Wb35Rx_start( pHwData );</div><div class='add'>+					Wb35Tx_EP2VM_start( pHwData );</div><div class='add'>+</div><div class='add'>+					return TRUE;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pHwData-&gt;SurpriseRemove = 1;</div><div class='add'>+	return FALSE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+void hal_halt(phw_data_t pHwData, void *ppa_data)</div><div class='add'>+{</div><div class='add'>+	switch( pHwData-&gt;InitialResource )</div><div class='add'>+	{</div><div class='add'>+		case 4:</div><div class='add'>+		case 3: OS_TIMER_CANCEL( &amp;pHwData-&gt;LEDTimer, &amp;cancel );</div><div class='add'>+			OS_SLEEP(100000); // Wait for Timer DPC exit 940623.2</div><div class='add'>+			Wb35Rx_destroy( pHwData ); // Release the Rx</div><div class='add'>+		case 2: Wb35Tx_destroy( pHwData ); // Release the Tx</div><div class='add'>+		case 1: Wb35Reg_destroy( pHwData ); // Release the Wb35 Regisster resources</div><div class='add'>+				WbUsb_destroy( pHwData );// Release the WbUsb</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+//---------------------------------------------------------------------------------------------------</div><div class='add'>+void hal_set_rates(phw_data_t pHwData, PUCHAR pbss_rates,</div><div class='add'>+		   u8 length, unsigned char basic_rate_set)</div><div class='add'>+{</div><div class='add'>+	PWB35REG	pWb35Reg = &amp;pHwData-&gt;Wb35Reg;</div><div class='add'>+	u32		tmp, tmp1;</div><div class='add'>+	u8		Rate[12]={ 2, 4, 11, 22, 12, 18, 24, 36, 48, 72, 96, 108 };</div><div class='add'>+	u8		SupportedRate[16];</div><div class='add'>+	u8		i, j, k, Count1, Count2, Byte;</div><div class='add'>+</div><div class='add'>+	if( pHwData-&gt;SurpriseRemove ) return;</div><div class='add'>+</div><div class='add'>+	if (basic_rate_set) {</div><div class='add'>+		pWb35Reg-&gt;M28_MacControl &amp;= ~0x000fff00;</div><div class='add'>+		tmp1 = 0x00000100;</div><div class='add'>+	} else {</div><div class='add'>+		pWb35Reg-&gt;M28_MacControl &amp;= ~0xfff00000;</div><div class='add'>+		tmp1 = 0x00100000;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tmp = 0;</div><div class='add'>+	for (i=0; i&lt;length; i++) {</div><div class='add'>+		Byte = pbss_rates[i] &amp; 0x7f;</div><div class='add'>+		for (j=0; j&lt;12; j++) {</div><div class='add'>+			if( Byte == Rate[j] )</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (j &lt; 12)</div><div class='add'>+			tmp |= (tmp1&lt;&lt;j);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pWb35Reg-&gt;M28_MacControl |= tmp;</div><div class='add'>+	Wb35Reg_Write( pHwData, 0x0828, pWb35Reg-&gt;M28_MacControl );</div><div class='add'>+</div><div class='add'>+	// 930206.2.c M78 setting</div><div class='add'>+	j = k = Count1 = Count2 = 0;</div><div class='add'>+	memset( SupportedRate, 0, 16 );</div><div class='add'>+	tmp = 0x00100000;</div><div class='add'>+	tmp1 = 0x00000100;</div><div class='add'>+	for (i=0; i&lt;12; i++) { // Get the supported rate</div><div class='add'>+		if (tmp &amp; pWb35Reg-&gt;M28_MacControl) {</div><div class='add'>+			SupportedRate[j] = Rate[i];</div><div class='add'>+</div><div class='add'>+			if (tmp1 &amp; pWb35Reg-&gt;M28_MacControl)</div><div class='add'>+				SupportedRate[j] |= 0x80;</div><div class='add'>+</div><div class='add'>+			if (k)</div><div class='add'>+				Count2++;</div><div class='add'>+			else</div><div class='add'>+				Count1++;</div><div class='add'>+</div><div class='add'>+			j++;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (i==4 &amp;&amp; k==0) {</div><div class='add'>+			if( !(pWb35Reg-&gt;M28_MacControl &amp; 0x000ff000) ) // if basic rate in 11g domain)</div><div class='add'>+			{</div><div class='add'>+				k = 1;</div><div class='add'>+				j = 8;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		tmp &lt;&lt;= 1;</div><div class='add'>+		tmp1 &lt;&lt;= 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	// Fill data into support rate until buffer full</div><div class='add'>+	//---20060926 add by anson's endian</div><div class='add'>+	for (i=0; i&lt;4; i++)</div><div class='add'>+		*(PULONG)(SupportedRate+(i&lt;&lt;2)) = cpu_to_le32( *(PULONG)(SupportedRate+(i&lt;&lt;2)) );</div><div class='add'>+	//--- end 20060926 add by anson's endian</div><div class='add'>+	Wb35Reg_BurstWrite( pHwData,0x087c, (PULONG)SupportedRate, 4, AUTO_INCREMENT );</div><div class='add'>+	pWb35Reg-&gt;M7C_MacControl = ((PULONG)SupportedRate)[0];</div><div class='add'>+	pWb35Reg-&gt;M80_MacControl = ((PULONG)SupportedRate)[1];</div><div class='add'>+	pWb35Reg-&gt;M84_MacControl = ((PULONG)SupportedRate)[2];</div><div class='add'>+	pWb35Reg-&gt;M88_MacControl = ((PULONG)SupportedRate)[3];</div><div class='add'>+</div><div class='add'>+	// Fill length</div><div class='add'>+	tmp = Count1&lt;&lt;28 | Count2&lt;&lt;24;</div><div class='add'>+	pWb35Reg-&gt;M78_ERPInformation &amp;= ~0xff000000;</div><div class='add'>+	pWb35Reg-&gt;M78_ERPInformation |= tmp;</div><div class='add'>+	Wb35Reg_Write( pHwData, 0x0878, pWb35Reg-&gt;M78_ERPInformation );</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+//---------------------------------------------------------------------------------------------------</div><div class='add'>+void hal_set_beacon_period(  phw_data_t pHwData,  u16 beacon_period )</div><div class='add'>+{</div><div class='add'>+	u32	tmp;</div><div class='add'>+</div><div class='add'>+	if( pHwData-&gt;SurpriseRemove ) return;</div><div class='add'>+</div><div class='add'>+	pHwData-&gt;BeaconPeriod = beacon_period;</div><div class='add'>+	tmp = pHwData-&gt;BeaconPeriod &lt;&lt; 16;</div><div class='add'>+	tmp |= pHwData-&gt;ProbeDelay;</div><div class='add'>+	Wb35Reg_Write( pHwData, 0x0848, tmp );</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+void hal_set_current_channel_ex(  phw_data_t pHwData,  ChanInfo channel )</div><div class='add'>+{</div><div class='add'>+	PWB35REG pWb35Reg = &amp;pHwData-&gt;Wb35Reg;</div><div class='add'>+</div><div class='add'>+	if( pHwData-&gt;SurpriseRemove )</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	printk("Going to channel: %d/%d\n", channel.band, channel.ChanNo);</div><div class='add'>+</div><div class='add'>+	RFSynthesizer_SwitchingChannel( pHwData, channel );// Switch channel</div><div class='add'>+	pHwData-&gt;Channel = channel.ChanNo;</div><div class='add'>+	pHwData-&gt;band = channel.band;</div><div class='add'>+	#ifdef _PE_STATE_DUMP_</div><div class='add'>+	WBDEBUG(("Set channel is %d, band =%d\n", pHwData-&gt;Channel, pHwData-&gt;band));</div><div class='add'>+	#endif</div><div class='add'>+	pWb35Reg-&gt;M28_MacControl &amp;= ~0xff; // Clean channel information field</div><div class='add'>+	pWb35Reg-&gt;M28_MacControl |= channel.ChanNo;</div><div class='add'>+	Wb35Reg_WriteWithCallbackValue( pHwData, 0x0828, pWb35Reg-&gt;M28_MacControl,</div><div class='add'>+					(PCHAR)&amp;channel, sizeof(ChanInfo));</div><div class='add'>+}</div><div class='add'>+//---------------------------------------------------------------------------------------------------</div><div class='add'>+void hal_set_current_channel(  phw_data_t pHwData,  ChanInfo channel )</div><div class='add'>+{</div><div class='add'>+	hal_set_current_channel_ex( pHwData, channel );</div><div class='add'>+}</div><div class='add'>+//---------------------------------------------------------------------------------------------------</div><div class='add'>+void hal_get_current_channel(  phw_data_t pHwData,  ChanInfo *channel )</div><div class='add'>+{</div><div class='add'>+	channel-&gt;ChanNo = pHwData-&gt;Channel;</div><div class='add'>+	channel-&gt;band = pHwData-&gt;band;</div><div class='add'>+}</div><div class='add'>+//---------------------------------------------------------------------------------------------------</div><div class='add'>+void hal_set_accept_broadcast(  phw_data_t pHwData,  u8 enable )</div><div class='add'>+{</div><div class='add'>+	PWB35REG	pWb35Reg = &amp;pHwData-&gt;Wb35Reg;</div><div class='add'>+</div><div class='add'>+	if( pHwData-&gt;SurpriseRemove ) return;</div><div class='add'>+</div><div class='add'>+	pWb35Reg-&gt;M00_MacControl &amp;= ~0x02000000;//The HW value</div><div class='add'>+</div><div class='add'>+	if (enable)</div><div class='add'>+		pWb35Reg-&gt;M00_MacControl |= 0x02000000;//The HW value</div><div class='add'>+</div><div class='add'>+	Wb35Reg_Write( pHwData, 0x0800, pWb35Reg-&gt;M00_MacControl );</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+//for wep key error detection, we need to accept broadcast packets to be received temporary.</div><div class='add'>+void hal_set_accept_promiscuous( phw_data_t pHwData,  u8 enable)</div><div class='add'>+{</div><div class='add'>+	PWB35REG	pWb35Reg = &amp;pHwData-&gt;Wb35Reg;</div><div class='add'>+</div><div class='add'>+	if (pHwData-&gt;SurpriseRemove) return;</div><div class='add'>+	if (enable) {</div><div class='add'>+		pWb35Reg-&gt;M00_MacControl |= 0x00400000;</div><div class='add'>+		Wb35Reg_Write( pHwData, 0x0800, pWb35Reg-&gt;M00_MacControl );</div><div class='add'>+	} else {</div><div class='add'>+		pWb35Reg-&gt;M00_MacControl&amp;=~0x00400000;</div><div class='add'>+		Wb35Reg_Write( pHwData, 0x0800, pWb35Reg-&gt;M00_MacControl );</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void hal_set_accept_multicast(  phw_data_t pHwData,  u8 enable )</div><div class='add'>+{</div><div class='add'>+	PWB35REG	pWb35Reg = &amp;pHwData-&gt;Wb35Reg;</div><div class='add'>+</div><div class='add'>+	if( pHwData-&gt;SurpriseRemove ) return;</div><div class='add'>+</div><div class='add'>+	pWb35Reg-&gt;M00_MacControl &amp;= ~0x01000000;//The HW value</div><div class='add'>+	if (enable)  pWb35Reg-&gt;M00_MacControl |= 0x01000000;//The HW value</div><div class='add'>+	Wb35Reg_Write( pHwData, 0x0800, pWb35Reg-&gt;M00_MacControl );</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void hal_set_accept_beacon(  phw_data_t pHwData,  u8 enable )</div><div class='add'>+{</div><div class='add'>+	PWB35REG	pWb35Reg = &amp;pHwData-&gt;Wb35Reg;</div><div class='add'>+</div><div class='add'>+	if( pHwData-&gt;SurpriseRemove ) return;</div><div class='add'>+</div><div class='add'>+	// 20040108 debug</div><div class='add'>+	if( !enable )//Due to SME and MLME are not suitable for 35</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	pWb35Reg-&gt;M00_MacControl &amp;= ~0x04000000;//The HW value</div><div class='add'>+	if( enable )</div><div class='add'>+		pWb35Reg-&gt;M00_MacControl |= 0x04000000;//The HW value</div><div class='add'>+</div><div class='add'>+	Wb35Reg_Write( pHwData, 0x0800, pWb35Reg-&gt;M00_MacControl );</div><div class='add'>+}</div><div class='add'>+//---------------------------------------------------------------------------------------------------</div><div class='add'>+void hal_set_multicast_address( phw_data_t pHwData, PUCHAR address, u8 number )</div><div class='add'>+{</div><div class='add'>+	PWB35REG	pWb35Reg = &amp;pHwData-&gt;Wb35Reg;</div><div class='add'>+	u8		Byte, Bit;</div><div class='add'>+</div><div class='add'>+	if( pHwData-&gt;SurpriseRemove ) return;</div><div class='add'>+</div><div class='add'>+	//Erases and refills the card multicast registers. Used when an address</div><div class='add'>+	//    has been deleted and all bits must be recomputed.</div><div class='add'>+	pWb35Reg-&gt;M04_MulticastAddress1 = 0;</div><div class='add'>+	pWb35Reg-&gt;M08_MulticastAddress2 = 0;</div><div class='add'>+</div><div class='add'>+	while( number )</div><div class='add'>+	{</div><div class='add'>+		number--;</div><div class='add'>+		CardGetMulticastBit( (address+(number*ETH_LENGTH_OF_ADDRESS)), &amp;Byte, &amp;Bit);</div><div class='add'>+		pWb35Reg-&gt;Multicast[Byte] |= Bit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	// Updating register</div><div class='add'>+	Wb35Reg_BurstWrite( pHwData, 0x0804, (PULONG)pWb35Reg-&gt;Multicast, 2, AUTO_INCREMENT );</div><div class='add'>+}</div><div class='add'>+//---------------------------------------------------------------------------------------------------</div><div class='add'>+u8 hal_get_accept_beacon(  phw_data_t pHwData )</div><div class='add'>+{</div><div class='add'>+	PWB35REG pWb35Reg = &amp;pHwData-&gt;Wb35Reg;</div><div class='add'>+</div><div class='add'>+	if( pHwData-&gt;SurpriseRemove ) return 0;</div><div class='add'>+</div><div class='add'>+	if( pWb35Reg-&gt;M00_MacControl &amp; 0x04000000 )</div><div class='add'>+		return 1;</div><div class='add'>+	else</div><div class='add'>+		return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+unsigned char hal_reset_hardware( phw_data_t pHwData, void* ppa )</div><div class='add'>+{</div><div class='add'>+	// Not implement yet</div><div class='add'>+	return TRUE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void hal_stop(  phw_data_t pHwData )</div><div class='add'>+{</div><div class='add'>+	PWB35REG	pWb35Reg = &amp;pHwData-&gt;Wb35Reg;</div><div class='add'>+</div><div class='add'>+	pHwData-&gt;Wb35Rx.rx_halt = 1;</div><div class='add'>+	Wb35Rx_stop( pHwData );</div><div class='add'>+</div><div class='add'>+	pHwData-&gt;Wb35Tx.tx_halt = 1;</div><div class='add'>+	Wb35Tx_stop( pHwData );</div><div class='add'>+</div><div class='add'>+	pWb35Reg-&gt;D00_DmaControl &amp;= ~0xc0000000;//Tx Off, Rx Off</div><div class='add'>+	Wb35Reg_Write( pHwData, 0x0400, pWb35Reg-&gt;D00_DmaControl );</div><div class='add'>+</div><div class='add'>+	WbUsb_Stop( pHwData ); // 20051230 Add.4</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+unsigned char hal_idle(phw_data_t pHwData)</div><div class='add'>+{</div><div class='add'>+	PWB35REG	pWb35Reg = &amp;pHwData-&gt;Wb35Reg;</div><div class='add'>+	PWBUSB	pWbUsb = &amp;pHwData-&gt;WbUsb;</div><div class='add'>+</div><div class='add'>+	if( !pHwData-&gt;SurpriseRemove &amp;&amp; ( pWbUsb-&gt;DetectCount || pWb35Reg-&gt;EP0vm_state!=VM_STOP ) )</div><div class='add'>+		return FALSE;</div><div class='add'>+</div><div class='add'>+	return TRUE;</div><div class='add'>+}</div><div class='add'>+//---------------------------------------------------------------------------------------------------</div><div class='add'>+void hal_set_cwmin(  phw_data_t pHwData,  u8	cwin_min )</div><div class='add'>+{</div><div class='add'>+	PWB35REG	pWb35Reg = &amp;pHwData-&gt;Wb35Reg;</div><div class='add'>+</div><div class='add'>+	if( pHwData-&gt;SurpriseRemove ) return;</div><div class='add'>+</div><div class='add'>+	pHwData-&gt;cwmin = cwin_min;</div><div class='add'>+	pWb35Reg-&gt;M2C_MacControl &amp;= ~0x7c00;	//bit 10 ~ 14</div><div class='add'>+	pWb35Reg-&gt;M2C_MacControl |= (pHwData-&gt;cwmin&lt;&lt;10);</div><div class='add'>+	Wb35Reg_Write( pHwData, 0x082c, pWb35Reg-&gt;M2C_MacControl );</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+s32 hal_get_rssi(  phw_data_t pHwData,  u32 *HalRssiArry,  u8 Count )</div><div class='add'>+{</div><div class='add'>+	PWB35REG pWb35Reg = &amp;pHwData-&gt;Wb35Reg;</div><div class='add'>+	R01_DESCRIPTOR	r01;</div><div class='add'>+	s32 ltmp = 0, tmp;</div><div class='add'>+	u8	i;</div><div class='add'>+</div><div class='add'>+	if( pHwData-&gt;SurpriseRemove ) return -200;</div><div class='add'>+	if( Count &gt; MAX_ACC_RSSI_COUNT ) // Because the TS may use this funtion</div><div class='add'>+		Count = MAX_ACC_RSSI_COUNT;</div><div class='add'>+</div><div class='add'>+	// RSSI = C1 + C2 * (agc_state[7:0] + offset_map(lna_state[1:0]))</div><div class='add'>+	// C1 = -195, C2 = 0.66 = 85/128</div><div class='add'>+	for (i=0; i&lt;Count; i++)</div><div class='add'>+	{</div><div class='add'>+		r01.value = HalRssiArry[i];</div><div class='add'>+		tmp = ((( r01.R01_AGC_state + pWb35Reg-&gt;LNAValue[r01.R01_LNA_state]) * 85 ) &gt;&gt;7 ) - 195;</div><div class='add'>+		ltmp += tmp;</div><div class='add'>+	}</div><div class='add'>+	ltmp /= Count;</div><div class='add'>+	if( pHwData-&gt;phy_type == RF_AIROHA_2230 ) ltmp -= 5; // 10;</div><div class='add'>+	if( pHwData-&gt;phy_type == RF_AIROHA_2230S ) ltmp -= 5; // 10; 20060420 Add this</div><div class='add'>+</div><div class='add'>+	//if( ltmp &lt; -200 ) ltmp = -200;</div><div class='add'>+	if( ltmp &lt; -110 ) ltmp = -110;// 1.0.24.0 For NJRC</div><div class='add'>+</div><div class='add'>+	return ltmp;</div><div class='add'>+}</div><div class='add'>+//----------------------------------------------------------------------------------------------------</div><div class='add'>+s32 hal_get_rssi_bss(  phw_data_t pHwData,  u16 idx,  u8 Count )</div><div class='add'>+{</div><div class='add'>+	PWB35REG pWb35Reg = &amp;pHwData-&gt;Wb35Reg;</div><div class='add'>+	R01_DESCRIPTOR	r01;</div><div class='add'>+	s32 ltmp = 0, tmp;</div><div class='add'>+	u8	i, j;</div><div class='add'>+	PADAPTER	Adapter = pHwData-&gt;Adapter;</div><div class='add'>+//	u32 *HalRssiArry = psBSS(idx)-&gt;HalRssi;</div><div class='add'>+</div><div class='add'>+	if( pHwData-&gt;SurpriseRemove ) return -200;</div><div class='add'>+	if( Count &gt; MAX_ACC_RSSI_COUNT ) // Because the TS may use this funtion</div><div class='add'>+		Count = MAX_ACC_RSSI_COUNT;</div><div class='add'>+</div><div class='add'>+	// RSSI = C1 + C2 * (agc_state[7:0] + offset_map(lna_state[1:0]))</div><div class='add'>+	// C1 = -195, C2 = 0.66 = 85/128</div><div class='add'>+#if 0</div><div class='add'>+	for (i=0; i&lt;Count; i++)</div><div class='add'>+	{</div><div class='add'>+		r01.value = HalRssiArry[i];</div><div class='add'>+		tmp = ((( r01.R01_AGC_state + pWb35Reg-&gt;LNAValue[r01.R01_LNA_state]) * 85 ) &gt;&gt;7 ) - 195;</div><div class='add'>+		ltmp += tmp;</div><div class='add'>+	}</div><div class='add'>+#else</div><div class='add'>+	if (psBSS(idx)-&gt;HalRssiIndex == 0)</div><div class='add'>+		psBSS(idx)-&gt;HalRssiIndex = MAX_ACC_RSSI_COUNT;</div><div class='add'>+	j = (u8)psBSS(idx)-&gt;HalRssiIndex-1;</div><div class='add'>+</div><div class='add'>+	for (i=0; i&lt;Count; i++)</div><div class='add'>+	{</div><div class='add'>+		r01.value = psBSS(idx)-&gt;HalRssi[j];</div><div class='add'>+		tmp = ((( r01.R01_AGC_state + pWb35Reg-&gt;LNAValue[r01.R01_LNA_state]) * 85 ) &gt;&gt;7 ) - 195;</div><div class='add'>+		ltmp += tmp;</div><div class='add'>+		if (j == 0)</div><div class='add'>+		{</div><div class='add'>+			j = MAX_ACC_RSSI_COUNT;</div><div class='add'>+		}</div><div class='add'>+		j--;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	ltmp /= Count;</div><div class='add'>+	if( pHwData-&gt;phy_type == RF_AIROHA_2230 ) ltmp -= 5; // 10;</div><div class='add'>+	if( pHwData-&gt;phy_type == RF_AIROHA_2230S ) ltmp -= 5; // 10; 20060420 Add this</div><div class='add'>+</div><div class='add'>+	//if( ltmp &lt; -200 ) ltmp = -200;</div><div class='add'>+	if( ltmp &lt; -110 ) ltmp = -110;// 1.0.24.0 For NJRC</div><div class='add'>+</div><div class='add'>+	return ltmp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+//---------------------------------------------------------------------------</div><div class='add'>+void hal_led_control_1a(  phw_data_t pHwData )</div><div class='add'>+{</div><div class='add'>+	hal_led_control( NULL, pHwData, NULL, NULL );</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void hal_led_control(  void* S1,  phw_data_t pHwData,  void* S3,  void* S4 )</div><div class='add'>+{</div><div class='add'>+	PADAPTER	Adapter = pHwData-&gt;Adapter;</div><div class='add'>+	PWB35REG	pWb35Reg = &amp;pHwData-&gt;Wb35Reg;</div><div class='add'>+	u32	LEDSet = (pHwData-&gt;SoftwareSet &amp; HAL_LED_SET_MASK) &gt;&gt; HAL_LED_SET_SHIFT;</div><div class='add'>+	u8	LEDgray[20] = { 0,3,4,6,8,10,11,12,13,14,15,14,13,12,11,10,8,6,4,2 };</div><div class='add'>+	u8	LEDgray2[30] = { 7,8,9,10,11,12,13,14,15,0,0,0,0,0,0,0,0,0,0,0,0,0,15,14,13,12,11,10,9,8 };</div><div class='add'>+	u32	TimeInterval = 500, ltmp, ltmp2;</div><div class='add'>+        ltmp=0;</div><div class='add'>+</div><div class='add'>+	if( pHwData-&gt;SurpriseRemove ) return;</div><div class='add'>+</div><div class='add'>+	if( pHwData-&gt;LED_control ) {</div><div class='add'>+		ltmp2 = pHwData-&gt;LED_control &amp; 0xff;</div><div class='add'>+		if( ltmp2 == 5 ) // 5 is WPS mode</div><div class='add'>+		{</div><div class='add'>+			TimeInterval = 100;</div><div class='add'>+			ltmp2 = (pHwData-&gt;LED_control&gt;&gt;8) &amp; 0xff;</div><div class='add'>+			switch( ltmp2 )</div><div class='add'>+			{</div><div class='add'>+				case 1: // [0.2 On][0.1 Off]...</div><div class='add'>+					pHwData-&gt;LED_Blinking %= 3;</div><div class='add'>+					ltmp = 0x1010; // Led 1 &amp; 0 Green and Red</div><div class='add'>+					if( pHwData-&gt;LED_Blinking == 2 ) // Turn off</div><div class='add'>+						ltmp = 0;</div><div class='add'>+					break;</div><div class='add'>+				case 2: // [0.1 On][0.1 Off]...</div><div class='add'>+					pHwData-&gt;LED_Blinking %= 2;</div><div class='add'>+					ltmp = 0x0010; // Led 0 red color</div><div class='add'>+					if( pHwData-&gt;LED_Blinking ) // Turn off</div><div class='add'>+						ltmp = 0;</div><div class='add'>+					break;</div><div class='add'>+				case 3: // [0.1 On][0.1 Off][0.1 On][0.1 Off][0.1 On][0.1 Off][0.1 On][0.1 Off][0.1 On][0.1 Off][0.5 Off]...</div><div class='add'>+					pHwData-&gt;LED_Blinking %= 15;</div><div class='add'>+					ltmp = 0x0010; // Led 0 red color</div><div class='add'>+					if( (pHwData-&gt;LED_Blinking &gt;= 9) || (pHwData-&gt;LED_Blinking%2) ) // Turn off 0.6 sec</div><div class='add'>+						ltmp = 0;</div><div class='add'>+					break;</div><div class='add'>+				case 4: // [300 On][ off ]</div><div class='add'>+					ltmp = 0x1000; // Led 1 Green color</div><div class='add'>+					if( pHwData-&gt;LED_Blinking &gt;= 3000 )</div><div class='add'>+						ltmp = 0; // led maybe on after 300sec * 32bit counter overlap.</div><div class='add'>+					break;</div><div class='add'>+			}</div><div class='add'>+			pHwData-&gt;LED_Blinking++;</div><div class='add'>+</div><div class='add'>+			pWb35Reg-&gt;U1BC_LEDConfigure = ltmp;</div><div class='add'>+			if( LEDSet != 7 ) // Only 111 mode has 2 LEDs on PCB.</div><div class='add'>+			{</div><div class='add'>+				pWb35Reg-&gt;U1BC_LEDConfigure |= (ltmp &amp;0xff)&lt;&lt;8; // Copy LED result to each LED control register</div><div class='add'>+				pWb35Reg-&gt;U1BC_LEDConfigure |= (ltmp &amp;0xff00)&gt;&gt;8;</div><div class='add'>+			}</div><div class='add'>+			Wb35Reg_Write( pHwData, 0x03bc, pWb35Reg-&gt;U1BC_LEDConfigure );</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	else if( pHwData-&gt;CurrentRadioSw || pHwData-&gt;CurrentRadioHw ) // If radio off</div><div class='add'>+	{</div><div class='add'>+		if( pWb35Reg-&gt;U1BC_LEDConfigure &amp; 0x1010 )</div><div class='add'>+		{</div><div class='add'>+			pWb35Reg-&gt;U1BC_LEDConfigure &amp;= ~0x1010;</div><div class='add'>+			Wb35Reg_Write( pHwData, 0x03bc, pWb35Reg-&gt;U1BC_LEDConfigure );</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	else</div><div class='add'>+	{</div><div class='add'>+		switch( LEDSet )</div><div class='add'>+		{</div><div class='add'>+			case 4: // [100] Only 1 Led be placed on PCB and use pin 21 of IC. Use LED_0 for showing</div><div class='add'>+				if( !pHwData-&gt;LED_LinkOn ) // Blink only if not Link On</div><div class='add'>+				{</div><div class='add'>+					// Blinking if scanning is on progress</div><div class='add'>+					if( pHwData-&gt;LED_Scanning )</div><div class='add'>+					{</div><div class='add'>+						if( pHwData-&gt;LED_Blinking == 0 )</div><div class='add'>+						{</div><div class='add'>+							pWb35Reg-&gt;U1BC_LEDConfigure |= 0x10;</div><div class='add'>+							Wb35Reg_Write( pHwData, 0x03bc, pWb35Reg-&gt;U1BC_LEDConfigure ); // LED_0 On</div><div class='add'>+							pHwData-&gt;LED_Blinking = 1;</div><div class='add'>+							TimeInterval = 300;</div><div class='add'>+						}</div><div class='add'>+						else</div><div class='add'>+						{</div><div class='add'>+							pWb35Reg-&gt;U1BC_LEDConfigure &amp;= ~0x10;</div><div class='add'>+							Wb35Reg_Write( pHwData, 0x03bc, pWb35Reg-&gt;U1BC_LEDConfigure ); // LED_0 Off</div><div class='add'>+							pHwData-&gt;LED_Blinking = 0;</div><div class='add'>+							TimeInterval = 300;</div><div class='add'>+						}</div><div class='add'>+					}</div><div class='add'>+					else</div><div class='add'>+					{</div><div class='add'>+						//Turn Off LED_0</div><div class='add'>+						if( pWb35Reg-&gt;U1BC_LEDConfigure &amp; 0x10 )</div><div class='add'>+						{</div><div class='add'>+							pWb35Reg-&gt;U1BC_LEDConfigure &amp;= ~0x10;</div><div class='add'>+							Wb35Reg_Write( pHwData, 0x03bc, pWb35Reg-&gt;U1BC_LEDConfigure ); // LED_0 Off</div><div class='add'>+						}</div><div class='add'>+					}</div><div class='add'>+				}</div><div class='add'>+				else</div><div class='add'>+				{</div><div class='add'>+					// Turn On LED_0</div><div class='add'>+					if( (pWb35Reg-&gt;U1BC_LEDConfigure &amp; 0x10) == 0 )</div><div class='add'>+					{</div><div class='add'>+						pWb35Reg-&gt;U1BC_LEDConfigure |= 0x10;</div><div class='add'>+						Wb35Reg_Write( pHwData, 0x03bc, pWb35Reg-&gt;U1BC_LEDConfigure ); // LED_0 Off</div><div class='add'>+					}</div><div class='add'>+				}</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			case 6: // [110] Only 1 Led be placed on PCB and use pin 21 of IC. Use LED_0 for showing</div><div class='add'>+				if( !pHwData-&gt;LED_LinkOn ) // Blink only if not Link On</div><div class='add'>+				{</div><div class='add'>+					// Blinking if scanning is on progress</div><div class='add'>+					if( pHwData-&gt;LED_Scanning )</div><div class='add'>+					{</div><div class='add'>+						if( pHwData-&gt;LED_Blinking == 0 )</div><div class='add'>+						{</div><div class='add'>+							pWb35Reg-&gt;U1BC_LEDConfigure &amp;= ~0xf;</div><div class='add'>+							pWb35Reg-&gt;U1BC_LEDConfigure |= 0x10;</div><div class='add'>+							Wb35Reg_Write( pHwData, 0x03bc, pWb35Reg-&gt;U1BC_LEDConfigure ); // LED_0 On</div><div class='add'>+							pHwData-&gt;LED_Blinking = 1;</div><div class='add'>+							TimeInterval = 300;</div><div class='add'>+						}</div><div class='add'>+						else</div><div class='add'>+						{</div><div class='add'>+							pWb35Reg-&gt;U1BC_LEDConfigure &amp;= ~0x1f;</div><div class='add'>+							Wb35Reg_Write( pHwData, 0x03bc, pWb35Reg-&gt;U1BC_LEDConfigure ); // LED_0 Off</div><div class='add'>+							pHwData-&gt;LED_Blinking = 0;</div><div class='add'>+							TimeInterval = 300;</div><div class='add'>+						}</div><div class='add'>+					}</div><div class='add'>+					else</div><div class='add'>+					{</div><div class='add'>+						// 20060901 Gray blinking if in disconnect state and not scanning</div><div class='add'>+						ltmp = pWb35Reg-&gt;U1BC_LEDConfigure;</div><div class='add'>+						pWb35Reg-&gt;U1BC_LEDConfigure &amp;= ~0x1f;</div><div class='add'>+						if( LEDgray2[(pHwData-&gt;LED_Blinking%30)] )</div><div class='add'>+						{</div><div class='add'>+							pWb35Reg-&gt;U1BC_LEDConfigure |= 0x10;</div><div class='add'>+							pWb35Reg-&gt;U1BC_LEDConfigure |= LEDgray2[ (pHwData-&gt;LED_Blinking%30) ];</div><div class='add'>+						}</div><div class='add'>+						pHwData-&gt;LED_Blinking++;</div><div class='add'>+						if( pWb35Reg-&gt;U1BC_LEDConfigure != ltmp )</div><div class='add'>+							Wb35Reg_Write( pHwData, 0x03bc, pWb35Reg-&gt;U1BC_LEDConfigure ); // LED_0 Off</div><div class='add'>+						TimeInterval = 100;</div><div class='add'>+					}</div><div class='add'>+				}</div><div class='add'>+				else</div><div class='add'>+				{</div><div class='add'>+					// Turn On LED_0</div><div class='add'>+					if( (pWb35Reg-&gt;U1BC_LEDConfigure &amp; 0x10) == 0 )</div><div class='add'>+					{</div><div class='add'>+						pWb35Reg-&gt;U1BC_LEDConfigure |= 0x10;</div><div class='add'>+						Wb35Reg_Write( pHwData, 0x03bc, pWb35Reg-&gt;U1BC_LEDConfigure ); // LED_0 Off</div><div class='add'>+					}</div><div class='add'>+				}</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			case 5: // [101] Only 1 Led be placed on PCB and use LED_1 for showing</div><div class='add'>+				if( !pHwData-&gt;LED_LinkOn ) // Blink only if not Link On</div><div class='add'>+				{</div><div class='add'>+					// Blinking if scanning is on progress</div><div class='add'>+					if( pHwData-&gt;LED_Scanning )</div><div class='add'>+					{</div><div class='add'>+						if( pHwData-&gt;LED_Blinking == 0 )</div><div class='add'>+						{</div><div class='add'>+							pWb35Reg-&gt;U1BC_LEDConfigure |= 0x1000;</div><div class='add'>+							Wb35Reg_Write( pHwData, 0x03bc, pWb35Reg-&gt;U1BC_LEDConfigure ); // LED_1 On</div><div class='add'>+							pHwData-&gt;LED_Blinking = 1;</div><div class='add'>+							TimeInterval = 300;</div><div class='add'>+						}</div><div class='add'>+						else</div><div class='add'>+						{</div><div class='add'>+							pWb35Reg-&gt;U1BC_LEDConfigure &amp;= ~0x1000;</div><div class='add'>+							Wb35Reg_Write( pHwData, 0x03bc, pWb35Reg-&gt;U1BC_LEDConfigure ); // LED_1 Off</div><div class='add'>+							pHwData-&gt;LED_Blinking = 0;</div><div class='add'>+							TimeInterval = 300;</div><div class='add'>+						}</div><div class='add'>+					}</div><div class='add'>+					else</div><div class='add'>+					{</div><div class='add'>+						//Turn Off LED_1</div><div class='add'>+						if( pWb35Reg-&gt;U1BC_LEDConfigure &amp; 0x1000 )</div><div class='add'>+						{</div><div class='add'>+							pWb35Reg-&gt;U1BC_LEDConfigure &amp;= ~0x1000;</div><div class='add'>+							Wb35Reg_Write( pHwData, 0x03bc, pWb35Reg-&gt;U1BC_LEDConfigure ); // LED_1 Off</div><div class='add'>+						}</div><div class='add'>+					}</div><div class='add'>+				}</div><div class='add'>+				else</div><div class='add'>+				{</div><div class='add'>+					// Is transmitting/receiving ??</div><div class='add'>+					if( (OS_CURRENT_RX_BYTE( Adapter ) != pHwData-&gt;RxByteCountLast ) ||</div><div class='add'>+						(OS_CURRENT_TX_BYTE( Adapter ) != pHwData-&gt;TxByteCountLast ) )</div><div class='add'>+					{</div><div class='add'>+						if( (pWb35Reg-&gt;U1BC_LEDConfigure &amp; 0x3000) != 0x3000 )</div><div class='add'>+						{</div><div class='add'>+							pWb35Reg-&gt;U1BC_LEDConfigure |= 0x3000;</div><div class='add'>+							Wb35Reg_Write( pHwData, 0x03bc, pWb35Reg-&gt;U1BC_LEDConfigure ); // LED_1 On</div><div class='add'>+						}</div><div class='add'>+</div><div class='add'>+						// Update variable</div><div class='add'>+						pHwData-&gt;RxByteCountLast = OS_CURRENT_RX_BYTE( Adapter );</div><div class='add'>+						pHwData-&gt;TxByteCountLast = OS_CURRENT_TX_BYTE( Adapter );</div><div class='add'>+						TimeInterval = 200;</div><div class='add'>+					}</div><div class='add'>+					else</div><div class='add'>+					{</div><div class='add'>+						// Turn On LED_1 and blinking if transmitting/receiving</div><div class='add'>+						 if( (pWb35Reg-&gt;U1BC_LEDConfigure &amp; 0x3000) != 0x1000 )</div><div class='add'>+						 {</div><div class='add'>+							 pWb35Reg-&gt;U1BC_LEDConfigure &amp;= ~0x3000;</div><div class='add'>+							 pWb35Reg-&gt;U1BC_LEDConfigure |= 0x1000;</div><div class='add'>+							 Wb35Reg_Write( pHwData, 0x03bc, pWb35Reg-&gt;U1BC_LEDConfigure ); // LED_1 On</div><div class='add'>+						 }</div><div class='add'>+					}</div><div class='add'>+				}</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			default: // Default setting. 2 LED be placed on PCB. LED_0: Link On LED_1 Active</div><div class='add'>+				if( (pWb35Reg-&gt;U1BC_LEDConfigure &amp; 0x3000) != 0x3000 )</div><div class='add'>+				{</div><div class='add'>+					pWb35Reg-&gt;U1BC_LEDConfigure |= 0x3000;// LED_1 is always on and event enable</div><div class='add'>+					Wb35Reg_Write( pHwData, 0x03bc, pWb35Reg-&gt;U1BC_LEDConfigure );</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+				if( pHwData-&gt;LED_Blinking )</div><div class='add'>+				{</div><div class='add'>+					// Gray blinking</div><div class='add'>+					pWb35Reg-&gt;U1BC_LEDConfigure &amp;= ~0x0f;</div><div class='add'>+					pWb35Reg-&gt;U1BC_LEDConfigure |= 0x10;</div><div class='add'>+					pWb35Reg-&gt;U1BC_LEDConfigure |= LEDgray[ (pHwData-&gt;LED_Blinking-1)%20 ];</div><div class='add'>+					Wb35Reg_Write( pHwData, 0x03bc, pWb35Reg-&gt;U1BC_LEDConfigure );</div><div class='add'>+</div><div class='add'>+					pHwData-&gt;LED_Blinking += 2;</div><div class='add'>+					if( pHwData-&gt;LED_Blinking &lt; 40 )</div><div class='add'>+						TimeInterval = 100;</div><div class='add'>+					else</div><div class='add'>+					{</div><div class='add'>+						pHwData-&gt;LED_Blinking = 0; // Stop blinking</div><div class='add'>+						pWb35Reg-&gt;U1BC_LEDConfigure &amp;= ~0x0f;</div><div class='add'>+						Wb35Reg_Write( pHwData, 0x03bc, pWb35Reg-&gt;U1BC_LEDConfigure );</div><div class='add'>+					}</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+				if( pHwData-&gt;LED_LinkOn )</div><div class='add'>+				{</div><div class='add'>+					if( !(pWb35Reg-&gt;U1BC_LEDConfigure &amp; 0x10) ) // Check the LED_0</div><div class='add'>+					{</div><div class='add'>+						//Try to turn ON LED_0 after gray blinking</div><div class='add'>+						pWb35Reg-&gt;U1BC_LEDConfigure |= 0x10;</div><div class='add'>+						pHwData-&gt;LED_Blinking = 1; //Start blinking</div><div class='add'>+						TimeInterval = 50;</div><div class='add'>+					}</div><div class='add'>+				}</div><div class='add'>+				else</div><div class='add'>+				{</div><div class='add'>+					if( pWb35Reg-&gt;U1BC_LEDConfigure &amp; 0x10 ) // Check the LED_0</div><div class='add'>+					{</div><div class='add'>+						pWb35Reg-&gt;U1BC_LEDConfigure &amp;= ~0x10;</div><div class='add'>+						Wb35Reg_Write( pHwData, 0x03bc, pWb35Reg-&gt;U1BC_LEDConfigure );</div><div class='add'>+					}</div><div class='add'>+				}</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		//20060828.1 Active send null packet to avoid AP disconnect</div><div class='add'>+		if( pHwData-&gt;LED_LinkOn )</div><div class='add'>+		{</div><div class='add'>+			pHwData-&gt;NullPacketCount += TimeInterval;</div><div class='add'>+			if( pHwData-&gt;NullPacketCount &gt;= DEFAULT_NULL_PACKET_COUNT )</div><div class='add'>+			{</div><div class='add'>+				pHwData-&gt;NullPacketCount = 0;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pHwData-&gt;time_count += TimeInterval;</div><div class='add'>+	Wb35Tx_CurrentTime( pHwData, pHwData-&gt;time_count ); // 20060928 add</div><div class='add'>+	OS_TIMER_SET( &amp;pHwData-&gt;LEDTimer, TimeInterval ); // 20060623.1</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+void hal_set_phy_type(  phw_data_t pHwData,  u8 PhyType )</div><div class='add'>+{</div><div class='add'>+	pHwData-&gt;phy_type = PhyType;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void hal_get_phy_type(  phw_data_t pHwData,  u8 *PhyType )</div><div class='add'>+{</div><div class='add'>+	*PhyType = pHwData-&gt;phy_type;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void hal_reset_counter(  phw_data_t pHwData )</div><div class='add'>+{</div><div class='add'>+	pHwData-&gt;dto_tx_retry_count = 0;</div><div class='add'>+	pHwData-&gt;dto_tx_frag_count = 0;</div><div class='add'>+	memset( pHwData-&gt;tx_retry_count, 0, 8);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void hal_set_radio_mode( phw_data_t pHwData,  unsigned char radio_off)</div><div class='add'>+{</div><div class='add'>+	PWB35REG	pWb35Reg = &amp;pHwData-&gt;Wb35Reg;</div><div class='add'>+</div><div class='add'>+	if( pHwData-&gt;SurpriseRemove ) return;</div><div class='add'>+</div><div class='add'>+	if (radio_off)	//disable Baseband receive off</div><div class='add'>+	{</div><div class='add'>+		pHwData-&gt;CurrentRadioSw = 1; // off</div><div class='add'>+		pWb35Reg-&gt;M24_MacControl &amp;= 0xffffffbf;</div><div class='add'>+	}</div><div class='add'>+	else</div><div class='add'>+	{</div><div class='add'>+		pHwData-&gt;CurrentRadioSw = 0; // on</div><div class='add'>+		pWb35Reg-&gt;M24_MacControl |= 0x00000040;</div><div class='add'>+	}</div><div class='add'>+	Wb35Reg_Write( pHwData, 0x0824, pWb35Reg-&gt;M24_MacControl );</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u8 hal_get_antenna_number(  phw_data_t pHwData )</div><div class='add'>+{</div><div class='add'>+	PWB35REG	pWb35Reg = &amp;pHwData-&gt;Wb35Reg;</div><div class='add'>+</div><div class='add'>+	if ((pWb35Reg-&gt;BB2C &amp; BIT(11)) == 0)</div><div class='add'>+		return 0;</div><div class='add'>+	else</div><div class='add'>+		return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void hal_set_antenna_number(  phw_data_t pHwData, u8 number )</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	PWB35REG	pWb35Reg = &amp;pHwData-&gt;Wb35Reg;</div><div class='add'>+</div><div class='add'>+	if (number == 1) {</div><div class='add'>+		pWb35Reg-&gt;BB2C |= BIT(11);</div><div class='add'>+	} else {</div><div class='add'>+		pWb35Reg-&gt;BB2C &amp;= ~BIT(11);</div><div class='add'>+	}</div><div class='add'>+	Wb35Reg_Write( pHwData, 0x102c, pWb35Reg-&gt;BB2C );</div><div class='add'>+#ifdef _PE_STATE_DUMP_</div><div class='add'>+	WBDEBUG(("Current antenna number : %d\n", number));</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+//----------------------------------------------------------------------------------------------------</div><div class='add'>+//0 : radio on; 1: radio off</div><div class='add'>+u8 hal_get_hw_radio_off(  phw_data_t pHwData )</div><div class='add'>+{</div><div class='add'>+	PWB35REG	pWb35Reg = &amp;pHwData-&gt;Wb35Reg;</div><div class='add'>+</div><div class='add'>+	if( pHwData-&gt;SurpriseRemove ) return 1;</div><div class='add'>+</div><div class='add'>+	//read the bit16 of register U1B0</div><div class='add'>+	Wb35Reg_Read( pHwData, 0x3b0, &amp;pWb35Reg-&gt;U1B0 );</div><div class='add'>+	if ((pWb35Reg-&gt;U1B0 &amp; 0x00010000)) {</div><div class='add'>+		pHwData-&gt;CurrentRadioHw = 1;</div><div class='add'>+		return 1;</div><div class='add'>+	} else {</div><div class='add'>+		pHwData-&gt;CurrentRadioHw = 0;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+unsigned char hal_get_dxx_reg(  phw_data_t pHwData,  u16 number,  PULONG pValue )</div><div class='add'>+{</div><div class='add'>+	if( number &lt; 0x1000 )</div><div class='add'>+		number += 0x1000;</div><div class='add'>+	return Wb35Reg_ReadSync( pHwData, number, pValue );</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+unsigned char hal_set_dxx_reg(  phw_data_t pHwData,  u16 number,  u32 value )</div><div class='add'>+{</div><div class='add'>+	unsigned char	ret;</div><div class='add'>+</div><div class='add'>+	if( number &lt; 0x1000 )</div><div class='add'>+		number += 0x1000;</div><div class='add'>+	ret = Wb35Reg_WriteSync( pHwData, number, value );</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void hal_scan_status_indicate(phw_data_t pHwData, unsigned char IsOnProgress)</div><div class='add'>+{</div><div class='add'>+	if( pHwData-&gt;SurpriseRemove ) return;</div><div class='add'>+	pHwData-&gt;LED_Scanning = IsOnProgress ? 1 : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void hal_system_power_change(phw_data_t pHwData, u32 PowerState)</div><div class='add'>+{</div><div class='add'>+	if( PowerState != 0 )</div><div class='add'>+	{</div><div class='add'>+		pHwData-&gt;SurpriseRemove = 1;</div><div class='add'>+		if( pHwData-&gt;WbUsb.IsUsb20 )</div><div class='add'>+			hal_stop( pHwData );</div><div class='add'>+	}</div><div class='add'>+	else</div><div class='add'>+	{</div><div class='add'>+		if( !pHwData-&gt;WbUsb.IsUsb20 )</div><div class='add'>+			hal_stop( pHwData );</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void hal_surprise_remove(  phw_data_t pHwData )</div><div class='add'>+{</div><div class='add'>+	PADAPTER Adapter = pHwData-&gt;Adapter;</div><div class='add'>+	if (OS_ATOMIC_INC( Adapter, &amp;pHwData-&gt;SurpriseRemoveCount ) == 1) {</div><div class='add'>+		#ifdef _PE_STATE_DUMP_</div><div class='add'>+		WBDEBUG(("Calling hal_surprise_remove\n"));</div><div class='add'>+		#endif</div><div class='add'>+		OS_STOP( Adapter );</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void hal_rate_change(  phw_data_t pHwData ) // Notify the HAL rate is changing 20060613.1</div><div class='add'>+{</div><div class='add'>+	PADAPTER	Adapter = pHwData-&gt;Adapter;</div><div class='add'>+	u8		rate = CURRENT_TX_RATE;</div><div class='add'>+</div><div class='add'>+	BBProcessor_RateChanging( pHwData, rate );</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void hal_set_rf_power(phw_data_t pHwData, u8 PowerIndex)</div><div class='add'>+{</div><div class='add'>+	RFSynthesizer_SetPowerIndex( pHwData, PowerIndex );</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+unsigned char hal_set_LED(phw_data_t pHwData, u32 Mode) // 20061108 for WPS led control</div><div class='add'>+{</div><div class='add'>+	pHwData-&gt;LED_Blinking = 0;</div><div class='add'>+	pHwData-&gt;LED_control = Mode;</div><div class='add'>+	OS_TIMER_SET( &amp;pHwData-&gt;LEDTimer, 10 ); // 20060623</div><div class='add'>+	return TRUE;</div><div class='add'>+}</div><div class='add'>+</div><div class='head'>diff --git a/drivers/staging/winbond/wbhal_f.h b/drivers/staging/winbond/wbhal_f.h<br/>new file mode 100644<br/>index 000000000000..fe25f97af724<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/winbond/wbhal_f.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/wbhal_f.h</a></div><div class='hunk'>@@ -0,0 +1,122 @@</div><div class='add'>+//=====================================================================</div><div class='add'>+// Device related include</div><div class='add'>+//=====================================================================</div><div class='add'>+#ifdef WB_LINUX</div><div class='add'>+	#include "linux/wbusb_f.h"</div><div class='add'>+	#include "linux/wb35reg_f.h"</div><div class='add'>+	#include "linux/wb35tx_f.h"</div><div class='add'>+	#include "linux/wb35rx_f.h"</div><div class='add'>+#else</div><div class='add'>+	#include "wbusb_f.h"</div><div class='add'>+	#include "wb35reg_f.h"</div><div class='add'>+	#include "wb35tx_f.h"</div><div class='add'>+	#include "wb35rx_f.h"</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+//====================================================================================</div><div class='add'>+// Function declaration</div><div class='add'>+//====================================================================================</div><div class='add'>+void hal_remove_mapping_key(  phw_data_t pHwData,  PUCHAR pmac_addr );</div><div class='add'>+void hal_remove_default_key(  phw_data_t pHwData,  u32 index );</div><div class='add'>+unsigned char hal_set_mapping_key(  phw_data_t Adapter,  PUCHAR pmac_addr,  u8 null_key,  u8 wep_on,  PUCHAR ptx_tsc,  PUCHAR prx_tsc,  u8 key_type,  u8 key_len,  PUCHAR pkey_data );</div><div class='add'>+unsigned char hal_set_default_key(  phw_data_t Adapter,  u8 index,  u8 null_key,  u8 wep_on,  PUCHAR ptx_tsc,  PUCHAR prx_tsc,  u8 key_type,  u8 key_len,  PUCHAR pkey_data );</div><div class='add'>+void hal_clear_all_default_key(  phw_data_t pHwData );</div><div class='add'>+void hal_clear_all_group_key(  phw_data_t pHwData );</div><div class='add'>+void hal_clear_all_mapping_key(  phw_data_t pHwData );</div><div class='add'>+void hal_clear_all_key(  phw_data_t pHwData );</div><div class='add'>+void hal_get_ethernet_address(  phw_data_t pHwData,  PUCHAR current_address );</div><div class='add'>+void hal_set_ethernet_address(  phw_data_t pHwData,  PUCHAR current_address );</div><div class='add'>+void hal_get_permanent_address(  phw_data_t pHwData,  PUCHAR pethernet_address );</div><div class='add'>+unsigned char hal_init_hardware(  phw_data_t pHwData,  PADAPTER Adapter );</div><div class='add'>+void hal_set_power_save_mode(  phw_data_t pHwData,  unsigned char power_save,  unsigned char wakeup,  unsigned char dtim );</div><div class='add'>+void hal_get_power_save_mode(  phw_data_t pHwData,   PBOOLEAN pin_pwr_save );</div><div class='add'>+void hal_set_slot_time(  phw_data_t pHwData,  u8 type );</div><div class='add'>+#define hal_set_atim_window( _A, _ATM )</div><div class='add'>+void hal_set_rates(  phw_data_t pHwData,  PUCHAR pbss_rates,  u8 length,  unsigned char basic_rate_set );</div><div class='add'>+#define hal_set_basic_rates( _A, _R, _L ) hal_set_rates( _A, _R, _L, TRUE )</div><div class='add'>+#define hal_set_op_rates( _A, _R, _L ) hal_set_rates( _A, _R, _L, FALSE )</div><div class='add'>+void hal_start_bss(  phw_data_t pHwData,  u8 mac_op_mode );</div><div class='add'>+void hal_join_request(  phw_data_t pHwData,  u8 bss_type ); // 0:BSS STA 1:IBSS STA//</div><div class='add'>+void hal_stop_sync_bss(  phw_data_t pHwData );</div><div class='add'>+void hal_resume_sync_bss(  phw_data_t pHwData);</div><div class='add'>+void hal_set_aid(  phw_data_t pHwData,  u16 aid );</div><div class='add'>+void hal_set_bssid(  phw_data_t pHwData,  PUCHAR pbssid );</div><div class='add'>+void hal_get_bssid(  phw_data_t pHwData,  PUCHAR pbssid );</div><div class='add'>+void hal_set_beacon_period(  phw_data_t pHwData,  u16 beacon_period );</div><div class='add'>+void hal_set_listen_interval(  phw_data_t pHwData,  u16 listen_interval );</div><div class='add'>+void hal_set_cap_info(  phw_data_t pHwData,  u16 capability_info );</div><div class='add'>+void hal_set_ssid(  phw_data_t pHwData,  PUCHAR pssid,  u8 ssid_len );</div><div class='add'>+void hal_set_current_channel(  phw_data_t pHwData,  ChanInfo channel );</div><div class='add'>+void hal_set_current_channel_ex(  phw_data_t pHwData,  ChanInfo channel );</div><div class='add'>+void hal_get_current_channel(  phw_data_t pHwData,  ChanInfo *channel );</div><div class='add'>+void hal_set_accept_broadcast(  phw_data_t pHwData,  u8 enable );</div><div class='add'>+void hal_set_accept_multicast(  phw_data_t pHwData,  u8 enable );</div><div class='add'>+void hal_set_accept_beacon(  phw_data_t pHwData,  u8 enable );</div><div class='add'>+void hal_set_multicast_address(  phw_data_t pHwData,  PUCHAR address,  u8 number );</div><div class='add'>+u8 hal_get_accept_beacon(  phw_data_t pHwData );</div><div class='add'>+void hal_stop(  phw_data_t pHwData );</div><div class='add'>+void hal_halt(  phw_data_t pHwData, void *ppa_data );</div><div class='add'>+void hal_start_tx0(  phw_data_t pHwData );</div><div class='add'>+void hal_set_phy_type(  phw_data_t pHwData,  u8 PhyType );</div><div class='add'>+void hal_get_phy_type(  phw_data_t pHwData,  u8 *PhyType );</div><div class='add'>+unsigned char hal_reset_hardware(  phw_data_t pHwData,  void* ppa );</div><div class='add'>+void hal_set_cwmin(  phw_data_t pHwData,  u8	cwin_min );</div><div class='add'>+#define hal_get_cwmin( _A ) ( (_A)-&gt;cwmin )</div><div class='add'>+void hal_set_cwmax(  phw_data_t pHwData,  u16 cwin_max );</div><div class='add'>+#define hal_get_cwmax( _A ) ( (_A)-&gt;cwmax )</div><div class='add'>+void hal_set_rsn_wpa(  phw_data_t pHwData,  u32 * RSN_IE_Bitmap , u32 * RSN_OUI_type , unsigned char bDesiredAuthMode);</div><div class='add'>+//s32 hal_get_rssi(  phw_data_t pHwData,  u32 HalRssi );</div><div class='add'>+s32 hal_get_rssi(  phw_data_t pHwData,  u32 *HalRssiArry,  u8 Count );</div><div class='add'>+s32 hal_get_rssi_bss(  phw_data_t pHwData,  u16 idx,  u8 Count );</div><div class='add'>+void hal_set_connect_info(  phw_data_t pHwData,  unsigned char boConnect );</div><div class='add'>+u8 hal_get_est_sq3(  phw_data_t pHwData,  u8 Count );</div><div class='add'>+void hal_led_control_1a(  phw_data_t pHwData );</div><div class='add'>+void hal_led_control(  void* S1,  phw_data_t pHwData,  void* S3,  void* S4 );</div><div class='add'>+void hal_set_rf_power(  phw_data_t pHwData,  u8 PowerIndex ); // 20060621 Modify</div><div class='add'>+void hal_reset_counter(  phw_data_t pHwData );</div><div class='add'>+void hal_set_radio_mode(  phw_data_t pHwData,  unsigned char boValue);</div><div class='add'>+void hal_descriptor_indicate(  phw_data_t pHwData,  PDESCRIPTOR pDes );</div><div class='add'>+u8 hal_get_antenna_number(  phw_data_t pHwData );</div><div class='add'>+void hal_set_antenna_number(  phw_data_t pHwData, u8 number );</div><div class='add'>+u32 hal_get_bss_pk_cnt(  phw_data_t pHwData );</div><div class='add'>+#define hal_get_region_from_EEPROM( _A ) ( (_A)-&gt;Wb35Reg.EEPROMRegion )</div><div class='add'>+void hal_set_accept_promiscuous		(  phw_data_t pHwData,  u8 enable);</div><div class='add'>+#define hal_get_tx_buffer( _A, _B ) Wb35Tx_get_tx_buffer( _A, _B )</div><div class='add'>+u8 hal_get_hw_radio_off			(  phw_data_t pHwData );</div><div class='add'>+#define hal_software_set( _A )		(_A-&gt;SoftwareSet)</div><div class='add'>+#define hal_driver_init_OK( _A )	(_A-&gt;IsInitOK)</div><div class='add'>+#define hal_rssi_boundary_high( _A ) (_A-&gt;RSSI_high)</div><div class='add'>+#define hal_rssi_boundary_low( _A ) (_A-&gt;RSSI_low)</div><div class='add'>+#define hal_scan_interval( _A )		(_A-&gt;Scan_Interval)</div><div class='add'>+void hal_scan_status_indicate(  phw_data_t pHwData, u8 status);	// 0: complete, 1: in progress</div><div class='add'>+void hal_system_power_change(  phw_data_t pHwData, u32 PowerState ); // 20051230 -=D0 1=D1 ..</div><div class='add'>+void hal_surprise_remove(  phw_data_t pHwData );</div><div class='add'>+</div><div class='add'>+#define PHY_DEBUG( msg, args... )</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+void hal_rate_change(  phw_data_t pHwData ); // Notify the HAL rate is changing 20060613.1</div><div class='add'>+unsigned char hal_get_dxx_reg(  phw_data_t pHwData,  u16 number,  PULONG pValue );</div><div class='add'>+unsigned char hal_set_dxx_reg(  phw_data_t pHwData,  u16 number,  u32 value );</div><div class='add'>+#define hal_get_time_count( _P )	(_P-&gt;time_count/10)	// return 100ms count</div><div class='add'>+#define hal_detect_error( _P )		(_P-&gt;WbUsb.DetectCount)</div><div class='add'>+unsigned char hal_set_LED(  phw_data_t pHwData,  u32 Mode ); // 20061108 for WPS led control</div><div class='add'>+</div><div class='add'>+//-------------------------------------------------------------------------</div><div class='add'>+// The follow function is unused for IS89C35</div><div class='add'>+//-------------------------------------------------------------------------</div><div class='add'>+#define hal_disable_interrupt(_A)</div><div class='add'>+#define hal_enable_interrupt(_A)</div><div class='add'>+#define hal_get_interrupt_type( _A)</div><div class='add'>+#define hal_get_clear_interrupt(_A)</div><div class='add'>+#define hal_ibss_disconnect(_A) hal_stop_sync_bss(_A)</div><div class='add'>+#define hal_join_request_stop(_A)</div><div class='add'>+unsigned char	hal_idle(  phw_data_t pHwData );</div><div class='add'>+#define pa_stall_execution( _A )	//OS_SLEEP( 1 )</div><div class='add'>+#define hw_get_cxx_reg( _A, _B, _C )</div><div class='add'>+#define hw_set_cxx_reg( _A, _B, _C )</div><div class='add'>+#define hw_get_dxx_reg( _A, _B, _C )	hal_get_dxx_reg( _A, _B, (PULONG)_C )</div><div class='add'>+#define hw_set_dxx_reg( _A, _B, _C )	hal_set_dxx_reg( _A, _B, (u32)_C )</div><div class='add'>+</div><div class='add'>+</div><div class='head'>diff --git a/drivers/staging/winbond/wbhal_s.h b/drivers/staging/winbond/wbhal_s.h<br/>new file mode 100644<br/>index 000000000000..5b862ff357bd<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/winbond/wbhal_s.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/wbhal_s.h</a></div><div class='hunk'>@@ -0,0 +1,615 @@</div><div class='add'>+//[20040722 WK]</div><div class='add'>+#define HAL_LED_SET_MASK		0x001c	//20060901 Extend</div><div class='add'>+#define HAL_LED_SET_SHIFT		2</div><div class='add'>+</div><div class='add'>+//supported RF type</div><div class='add'>+#define RF_MAXIM_2825		0</div><div class='add'>+#define RF_MAXIM_2827		1</div><div class='add'>+#define RF_MAXIM_2828		2</div><div class='add'>+#define RF_MAXIM_2829		3</div><div class='add'>+#define RF_MAXIM_V1			15</div><div class='add'>+#define RF_AIROHA_2230		16</div><div class='add'>+#define RF_AIROHA_7230		17</div><div class='add'>+#define RF_AIROHA_2230S		18	// 20060420 Add this</div><div class='add'>+// #define RF_RFMD_2959		32	// 20060626 Remove all about RFMD</div><div class='add'>+#define RF_WB_242			33</div><div class='add'>+#define RF_WB_242_1			34	// 20060619.5 Add</div><div class='add'>+#define RF_DECIDE_BY_INF	255</div><div class='add'>+</div><div class='add'>+//----------------------------------------------------------------</div><div class='add'>+// The follow define connect to upper layer</div><div class='add'>+//	User must modify for connection between HAL and upper layer</div><div class='add'>+//----------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/////////////////////////////////////////////////////////////////////////////////////////////////////</div><div class='add'>+//================================================================================================</div><div class='add'>+// Common define</div><div class='add'>+//================================================================================================</div><div class='add'>+#define HAL_USB_MODE_BURST( _H )	(_H-&gt;SoftwareSet &amp; 0x20 ) // Bit 5 20060901 Modify</div><div class='add'>+</div><div class='add'>+// Scan interval</div><div class='add'>+#define SCAN_MAX_CHNL_TIME				(50)</div><div class='add'>+</div><div class='add'>+// For TxL2 Frame typr recognise</div><div class='add'>+#define FRAME_TYPE_802_3_DATA			0</div><div class='add'>+#define FRAME_TYPE_802_11_MANAGEMENT		1</div><div class='add'>+#define FRAME_TYPE_802_11_MANAGEMENT_CHALLENGE  2</div><div class='add'>+#define FRAME_TYPE_802_11_CONTROL		3</div><div class='add'>+#define FRAME_TYPE_802_11_DATA			4</div><div class='add'>+#define FRAME_TYPE_PROMISCUOUS			5</div><div class='add'>+</div><div class='add'>+// The follow definition is used for convert the frame--------------------</div><div class='add'>+#define DOT_11_SEQUENCE_OFFSET		22 //Sequence control offset</div><div class='add'>+#define DOT_3_TYPE_OFFSET			12</div><div class='add'>+#define DOT_11_MAC_HEADER_SIZE		24</div><div class='add'>+#define DOT_11_SNAP_SIZE			6</div><div class='add'>+#define DOT_11_TYPE_OFFSET			30 //The start offset of 802.11 Frame. Type encapsulatuin.</div><div class='add'>+#define DEFAULT_SIFSTIME			10</div><div class='add'>+#define DEFAULT_FRAGMENT_THRESHOLD		2346 // No fragment</div><div class='add'>+#define DEFAULT_MSDU_LIFE_TIME			0xffff</div><div class='add'>+</div><div class='add'>+#define LONG_PREAMBLE_PLUS_PLCPHEADER_TIME						(144+48)</div><div class='add'>+#define SHORT_PREAMBLE_PLUS_PLCPHEADER_TIME 					(72+24)</div><div class='add'>+#define PREAMBLE_PLUS_SIGNAL_PLUS_SIGNALEXTENSION				(16+4+6)</div><div class='add'>+#define Tsym 4</div><div class='add'>+</div><div class='add'>+//  Frame Type of Bits (2, 3)---------------------------------------------</div><div class='add'>+#define MAC_TYPE_MANAGEMENT			0x00</div><div class='add'>+#define MAC_TYPE_CONTROL			0x04</div><div class='add'>+#define MAC_TYPE_DATA				0x08</div><div class='add'>+#define MASK_FRAGMENT_NUMBER		0x000F</div><div class='add'>+#define SEQUENCE_NUMBER_SHIFT		4</div><div class='add'>+</div><div class='add'>+#define  HAL_WOL_TYPE_WAKEUP_FRAME		0x01</div><div class='add'>+#define  HAL_WOL_TYPE_MAGIC_PACKET		0x02</div><div class='add'>+</div><div class='add'>+// 20040106 ADDED</div><div class='add'>+#define HAL_KEYTYPE_WEP40                       0</div><div class='add'>+#define HAL_KEYTYPE_WEP104                      1</div><div class='add'>+#define HAL_KEYTYPE_TKIP                        2 // 128 bit key</div><div class='add'>+#define HAL_KEYTYPE_AES_CCMP                    3 // 128 bit key</div><div class='add'>+</div><div class='add'>+// For VM state</div><div class='add'>+enum {</div><div class='add'>+	VM_STOP = 0,</div><div class='add'>+	VM_RUNNING,</div><div class='add'>+	VM_COMPLETED</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+// Be used for 802.11 mac header</div><div class='add'>+typedef struct _MAC_FRAME_CONTROL {</div><div class='add'>+	u8	mac_frame_info; // this is a combination of the protovl version, type and subtype</div><div class='add'>+	u8	to_ds:1;</div><div class='add'>+	u8	from_ds:1;</div><div class='add'>+	u8	more_frag:1;</div><div class='add'>+	u8	retry:1;</div><div class='add'>+	u8	pwr_mgt:1;</div><div class='add'>+	u8	more_data:1;</div><div class='add'>+	u8	WEP:1;</div><div class='add'>+	u8	order:1;</div><div class='add'>+} MAC_FRAME_CONTROL, *PMAC_FRAME_CONTROL;</div><div class='add'>+</div><div class='add'>+//-----------------------------------------------------</div><div class='add'>+// Normal Key table format</div><div class='add'>+//-----------------------------------------------------</div><div class='add'>+// The order of KEY index is MAPPING_KEY_START_INDEX &gt; GROUP_KEY_START_INDEX</div><div class='add'>+#define MAX_KEY_TABLE				24	// 24 entry for storing key data</div><div class='add'>+#define GROUP_KEY_START_INDEX		4</div><div class='add'>+#define MAPPING_KEY_START_INDEX		8</div><div class='add'>+typedef struct _KEY_TABLE</div><div class='add'>+{</div><div class='add'>+	u32	DW0_Valid:1;</div><div class='add'>+	u32	DW0_NullKey:1;</div><div class='add'>+	u32	DW0_Security_Mode:2;//0:WEP 40 bit 1:WEP 104 bit 2:TKIP 128 bit 3:CCMP 128 bit</div><div class='add'>+	u32	DW0_WEPON:1;</div><div class='add'>+	u32	DW0_RESERVED:11;</div><div class='add'>+	u32	DW0_Address1:16;</div><div class='add'>+</div><div class='add'>+	u32	DW1_Address2;</div><div class='add'>+</div><div class='add'>+	u32	DW2_RxSequenceCount1;</div><div class='add'>+</div><div class='add'>+	u32	DW3_RxSequenceCount2:16;</div><div class='add'>+	u32	DW3_RESERVED:16;</div><div class='add'>+</div><div class='add'>+	u32	DW4_TxSequenceCount1;</div><div class='add'>+</div><div class='add'>+	u32	DW5_TxSequenceCount2:16;</div><div class='add'>+	u32	DW5_RESERVED:16;</div><div class='add'>+</div><div class='add'>+} KEY_TABLE, *PKEY_TABLE;</div><div class='add'>+</div><div class='add'>+//--------------------------------------------------------</div><div class='add'>+// 			 Descriptor</div><div class='add'>+//--------------------------------------------------------</div><div class='add'>+#define MAX_DESCRIPTOR_BUFFER_INDEX	8	// Have to multiple of 2</div><div class='add'>+//#define FLAG_ERROR_TX_MASK			cpu_to_le32(0x000000bf) //20061009 marked by anson's endian</div><div class='add'>+#define FLAG_ERROR_TX_MASK			0x000000bf  //20061009 anson's endian</div><div class='add'>+//#define FLAG_ERROR_RX_MASK			0x00000c3f</div><div class='add'>+//#define FLAG_ERROR_RX_MASK			cpu_to_le32(0x0000083f)	//20061009 marked by anson's endian</div><div class='add'>+									//Don't care replay error,</div><div class='add'>+												//it is handled by S/W</div><div class='add'>+#define FLAG_ERROR_RX_MASK			0x0000083f	//20060926 anson's endian</div><div class='add'>+</div><div class='add'>+#define FLAG_BAND_RX_MASK			0x10000000	//Bit 28</div><div class='add'>+</div><div class='add'>+typedef struct _R00_DESCRIPTOR</div><div class='add'>+{</div><div class='add'>+	union</div><div class='add'>+	{</div><div class='add'>+		u32	value;</div><div class='add'>+		#ifdef _BIG_ENDIAN_  //20060926 anson's endian</div><div class='add'>+		struct</div><div class='add'>+		{</div><div class='add'>+			u32	R00_packet_or_buffer_status:1;</div><div class='add'>+			u32	R00_packet_in_fifo:1;</div><div class='add'>+			u32	R00_RESERVED:2;</div><div class='add'>+			u32	R00_receive_byte_count:12;</div><div class='add'>+			u32	R00_receive_time_index:16;</div><div class='add'>+		};</div><div class='add'>+		#else</div><div class='add'>+		struct</div><div class='add'>+		{</div><div class='add'>+			u32	R00_receive_time_index:16;</div><div class='add'>+			u32	R00_receive_byte_count:12;</div><div class='add'>+			u32	R00_RESERVED:2;</div><div class='add'>+			u32	R00_packet_in_fifo:1;</div><div class='add'>+			u32	R00_packet_or_buffer_status:1;</div><div class='add'>+		};</div><div class='add'>+		#endif</div><div class='add'>+	};</div><div class='add'>+} R00_DESCRIPTOR, *PR00_DESCRIPTOR;</div><div class='add'>+</div><div class='add'>+typedef struct _T00_DESCRIPTOR</div><div class='add'>+{</div><div class='add'>+	union</div><div class='add'>+	{</div><div class='add'>+		u32	value;</div><div class='add'>+		#ifdef _BIG_ENDIAN_  //20061009 anson's endian</div><div class='add'>+		struct</div><div class='add'>+		{</div><div class='add'>+			u32	T00_first_mpdu:1; // for hardware use</div><div class='add'>+			u32	T00_last_mpdu:1; // for hardware use</div><div class='add'>+			u32	T00_IsLastMpdu:1;// 0: not   1:Yes for software used</div><div class='add'>+			u32	T00_IgnoreResult:1;// The same mechanism with T00 setting. 050111 Modify for TS</div><div class='add'>+			u32	T00_RESERVED_ID:2;//3 bit ID reserved</div><div class='add'>+			u32	T00_tx_packet_id:4;//930519.4.e 930810.3.c</div><div class='add'>+			u32	T00_RESERVED:4;</div><div class='add'>+			u32	T00_header_length:6;</div><div class='add'>+			u32	T00_frame_length:12;</div><div class='add'>+		};</div><div class='add'>+		#else</div><div class='add'>+		struct</div><div class='add'>+		{</div><div class='add'>+			u32	T00_frame_length:12;</div><div class='add'>+			u32	T00_header_length:6;</div><div class='add'>+			u32	T00_RESERVED:4;</div><div class='add'>+			u32	T00_tx_packet_id:4;//930519.4.e 930810.3.c</div><div class='add'>+			u32	T00_RESERVED_ID:2;//3 bit ID reserved</div><div class='add'>+			u32	T00_IgnoreResult:1;// The same mechanism with T00 setting. 050111 Modify for TS</div><div class='add'>+			u32	T00_IsLastMpdu:1;// 0: not   1:Yes for software used</div><div class='add'>+			u32	T00_last_mpdu:1; // for hardware use</div><div class='add'>+			u32	T00_first_mpdu:1; // for hardware use</div><div class='add'>+		};</div><div class='add'>+		#endif</div><div class='add'>+	};</div><div class='add'>+} T00_DESCRIPTOR, *PT00_DESCRIPTOR;</div><div class='add'>+</div><div class='add'>+typedef struct _R01_DESCRIPTOR</div><div class='add'>+{</div><div class='add'>+	union</div><div class='add'>+	{</div><div class='add'>+		u32	value;</div><div class='add'>+		#ifdef _BIG_ENDIAN_ //20060926 add by anson's endian</div><div class='add'>+		struct</div><div class='add'>+		{</div><div class='add'>+			u32	R01_RESERVED:3;</div><div class='add'>+			u32	R01_mod_type:1;</div><div class='add'>+			u32	R01_pre_type:1;</div><div class='add'>+			u32	R01_data_rate:3;</div><div class='add'>+			u32	R01_AGC_state:8;</div><div class='add'>+			u32	R01_LNA_state:2;</div><div class='add'>+			u32	R01_decryption_method:2;</div><div class='add'>+			u32	R01_mic_error:1;</div><div class='add'>+			u32	R01_replay:1;</div><div class='add'>+			u32	R01_broadcast_frame:1;</div><div class='add'>+			u32	R01_multicast_frame:1;</div><div class='add'>+			u32	R01_directed_frame:1;</div><div class='add'>+			u32	R01_receive_frame_antenna_selection:1;</div><div class='add'>+			u32	R01_frame_receive_during_atim_window:1;</div><div class='add'>+			u32	R01_protocol_version_error:1;</div><div class='add'>+			u32	R01_authentication_frame_icv_error:1;</div><div class='add'>+			u32	R01_null_key_to_authentication_frame:1;</div><div class='add'>+			u32	R01_icv_error:1;</div><div class='add'>+			u32	R01_crc_error:1;</div><div class='add'>+		};</div><div class='add'>+		#else</div><div class='add'>+		struct</div><div class='add'>+		{</div><div class='add'>+			u32	R01_crc_error:1;</div><div class='add'>+			u32	R01_icv_error:1;</div><div class='add'>+			u32	R01_null_key_to_authentication_frame:1;</div><div class='add'>+			u32	R01_authentication_frame_icv_error:1;</div><div class='add'>+			u32	R01_protocol_version_error:1;</div><div class='add'>+			u32	R01_frame_receive_during_atim_window:1;</div><div class='add'>+			u32	R01_receive_frame_antenna_selection:1;</div><div class='add'>+			u32	R01_directed_frame:1;</div><div class='add'>+			u32	R01_multicast_frame:1;</div><div class='add'>+			u32	R01_broadcast_frame:1;</div><div class='add'>+			u32	R01_replay:1;</div><div class='add'>+			u32	R01_mic_error:1;</div><div class='add'>+			u32	R01_decryption_method:2;</div><div class='add'>+			u32	R01_LNA_state:2;</div><div class='add'>+			u32	R01_AGC_state:8;</div><div class='add'>+			u32	R01_data_rate:3;</div><div class='add'>+			u32	R01_pre_type:1;</div><div class='add'>+			u32	R01_mod_type:1;</div><div class='add'>+			u32	R01_RESERVED:3;</div><div class='add'>+		};</div><div class='add'>+		#endif</div><div class='add'>+	};</div><div class='add'>+} R01_DESCRIPTOR, *PR01_DESCRIPTOR;</div><div class='add'>+</div><div class='add'>+typedef struct _T01_DESCRIPTOR</div><div class='add'>+{</div><div class='add'>+	union</div><div class='add'>+	{</div><div class='add'>+		u32	value;</div><div class='add'>+		#ifdef _BIG_ENDIAN_ //20061009 anson's endian</div><div class='add'>+		struct</div><div class='add'>+		{</div><div class='add'>+			u32	T01_rts_cts_duration:16;</div><div class='add'>+			u32	T01_fall_back_rate:3;</div><div class='add'>+			u32	T01_add_rts:1;</div><div class='add'>+			u32	T01_add_cts:1;</div><div class='add'>+			u32	T01_modulation_type:1;</div><div class='add'>+			u32	T01_plcp_header_length:1;</div><div class='add'>+			u32	T01_transmit_rate:3;</div><div class='add'>+			u32	T01_wep_id:2;</div><div class='add'>+			u32	T01_add_challenge_text:1;</div><div class='add'>+			u32	T01_inhibit_crc:1;</div><div class='add'>+			u32	T01_loop_back_wep_mode:1;</div><div class='add'>+			u32	T01_retry_abort_ebable:1;</div><div class='add'>+		};</div><div class='add'>+		#else</div><div class='add'>+		struct</div><div class='add'>+		{</div><div class='add'>+			u32	T01_retry_abort_ebable:1;</div><div class='add'>+			u32	T01_loop_back_wep_mode:1;</div><div class='add'>+			u32	T01_inhibit_crc:1;</div><div class='add'>+			u32	T01_add_challenge_text:1;</div><div class='add'>+			u32	T01_wep_id:2;</div><div class='add'>+			u32	T01_transmit_rate:3;</div><div class='add'>+			u32	T01_plcp_header_length:1;</div><div class='add'>+			u32	T01_modulation_type:1;</div><div class='add'>+			u32	T01_add_cts:1;</div><div class='add'>+			u32	T01_add_rts:1;</div><div class='add'>+			u32	T01_fall_back_rate:3;</div><div class='add'>+			u32	T01_rts_cts_duration:16;</div><div class='add'>+		};</div><div class='add'>+		#endif</div><div class='add'>+	};</div><div class='add'>+} T01_DESCRIPTOR, *PT01_DESCRIPTOR;</div><div class='add'>+</div><div class='add'>+typedef struct _T02_DESCRIPTOR</div><div class='add'>+{</div><div class='add'>+	union</div><div class='add'>+	{</div><div class='add'>+		u32	value;</div><div class='add'>+		#ifdef _BIG_ENDIAN_  //20061009 add by anson's endian</div><div class='add'>+		struct</div><div class='add'>+		{</div><div class='add'>+			u32	T02_IsLastMpdu:1;// The same mechanism with T00 setting</div><div class='add'>+			u32	T02_IgnoreResult:1;// The same mechanism with T00 setting. 050111 Modify for TS</div><div class='add'>+			u32	T02_RESERVED_ID:2;// The same mechanism with T00 setting</div><div class='add'>+			u32	T02_Tx_PktID:4;</div><div class='add'>+			u32	T02_MPDU_Cnt:4;</div><div class='add'>+			u32	T02_RTS_Cnt:4;</div><div class='add'>+			u32	T02_RESERVED:7;</div><div class='add'>+			u32	T02_transmit_complete:1;</div><div class='add'>+			u32	T02_transmit_abort_due_to_TBTT:1;</div><div class='add'>+			u32	T02_effective_transmission_rate:1;</div><div class='add'>+			u32	T02_transmit_without_encryption_due_to_wep_on_false:1;</div><div class='add'>+			u32	T02_discard_due_to_null_wep_key:1;</div><div class='add'>+			u32	T02_RESERVED_1:1;</div><div class='add'>+			u32	T02_out_of_MaxTxMSDULiftTime:1;</div><div class='add'>+			u32	T02_transmit_abort:1;</div><div class='add'>+			u32	T02_transmit_fail:1;</div><div class='add'>+		};</div><div class='add'>+		#else</div><div class='add'>+		struct</div><div class='add'>+		{</div><div class='add'>+			u32	T02_transmit_fail:1;</div><div class='add'>+			u32	T02_transmit_abort:1;</div><div class='add'>+			u32	T02_out_of_MaxTxMSDULiftTime:1;</div><div class='add'>+			u32	T02_RESERVED_1:1;</div><div class='add'>+			u32	T02_discard_due_to_null_wep_key:1;</div><div class='add'>+			u32	T02_transmit_without_encryption_due_to_wep_on_false:1;</div><div class='add'>+			u32	T02_effective_transmission_rate:1;</div><div class='add'>+			u32	T02_transmit_abort_due_to_TBTT:1;</div><div class='add'>+			u32	T02_transmit_complete:1;</div><div class='add'>+			u32	T02_RESERVED:7;</div><div class='add'>+			u32	T02_RTS_Cnt:4;</div><div class='add'>+			u32	T02_MPDU_Cnt:4;</div><div class='add'>+			u32	T02_Tx_PktID:4;</div><div class='add'>+			u32	T02_RESERVED_ID:2;// The same mechanism with T00 setting</div><div class='add'>+			u32	T02_IgnoreResult:1;// The same mechanism with T00 setting. 050111 Modify for TS</div><div class='add'>+			u32	T02_IsLastMpdu:1;// The same mechanism with T00 setting</div><div class='add'>+		};</div><div class='add'>+		#endif</div><div class='add'>+	};</div><div class='add'>+} T02_DESCRIPTOR, *PT02_DESCRIPTOR;</div><div class='add'>+</div><div class='add'>+typedef struct _DESCRIPTOR {		// Skip length = 8 DWORD</div><div class='add'>+	// ID for descriptor ---, The field doesn't be cleard in the operation of Descriptor definition</div><div class='add'>+	u8	Descriptor_ID;</div><div class='add'>+	//----------------------The above region doesn't be cleared by DESCRIPTOR_RESET------</div><div class='add'>+	u8	RESERVED[3];</div><div class='add'>+</div><div class='add'>+	u16	FragmentThreshold;</div><div class='add'>+	u8	InternalUsed;//Only can be used by operation of descriptor definition</div><div class='add'>+	u8	Type;// 0: 802.3	1:802.11 data frame	2:802.11 management frame</div><div class='add'>+</div><div class='add'>+	u8	PreambleMode;// 0: short 1:long</div><div class='add'>+	u8	TxRate;</div><div class='add'>+	u8	FragmentCount;</div><div class='add'>+	u8	EapFix; // For speed up key install</div><div class='add'>+</div><div class='add'>+	// For R00 and T00 ----------------------------------------------</div><div class='add'>+	union</div><div class='add'>+	{</div><div class='add'>+		R00_DESCRIPTOR	R00;</div><div class='add'>+		T00_DESCRIPTOR	T00;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	// For R01 and T01 ----------------------------------------------</div><div class='add'>+	union</div><div class='add'>+	{</div><div class='add'>+		R01_DESCRIPTOR	R01;</div><div class='add'>+		T01_DESCRIPTOR	T01;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	// For R02 and T02 ----------------------------------------------</div><div class='add'>+	union</div><div class='add'>+	{</div><div class='add'>+		u32			R02;</div><div class='add'>+		T02_DESCRIPTOR	T02;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	// For R03 and T03 ----------------------------------------------</div><div class='add'>+	// For software used</div><div class='add'>+	union</div><div class='add'>+	{</div><div class='add'>+		u32	R03;</div><div class='add'>+		u32	T03;</div><div class='add'>+		struct</div><div class='add'>+		{</div><div class='add'>+			u8	buffer_number;</div><div class='add'>+			u8	buffer_start_index;</div><div class='add'>+			u16	buffer_total_size;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	// For storing the buffer</div><div class='add'>+	u16	buffer_size[ MAX_DESCRIPTOR_BUFFER_INDEX ];</div><div class='add'>+	void*	buffer_address[ MAX_DESCRIPTOR_BUFFER_INDEX ];//931130.4.q</div><div class='add'>+</div><div class='add'>+} DESCRIPTOR, *PDESCRIPTOR;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define DEFAULT_NULL_PACKET_COUNT		180000	//20060828.1 Add. 180 seconds</div><div class='add'>+</div><div class='add'>+#define MAX_TXVGA_EEPROM	9	//How many word(u16) of EEPROM will be used for TxVGA</div><div class='add'>+#define MAX_RF_PARAMETER	32</div><div class='add'>+</div><div class='add'>+typedef struct _TXVGA_FOR_50 {</div><div class='add'>+	u8	ChanNo;</div><div class='add'>+	u8	TxVgaValue;</div><div class='add'>+} TXVGA_FOR_50;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+//=====================================================================</div><div class='add'>+// Device related include</div><div class='add'>+//=====================================================================</div><div class='add'>+</div><div class='add'>+#include "linux/wbusb_s.h"</div><div class='add'>+#include "linux/wb35reg_s.h"</div><div class='add'>+#include "linux/wb35tx_s.h"</div><div class='add'>+#include "linux/wb35rx_s.h"</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+// For Hal using ==================================================================</div><div class='add'>+typedef struct _HW_DATA_T</div><div class='add'>+{</div><div class='add'>+	// For compatible with 33</div><div class='add'>+	u32	revision;</div><div class='add'>+	u32	BB3c_cal; // The value for Tx calibration comes from EEPROM</div><div class='add'>+	u32	BB54_cal; // The value for Rx calibration comes from EEPROM</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	// For surprise remove</div><div class='add'>+	u32	SurpriseRemove; // 0: Normal 1: Surprise remove</div><div class='add'>+	u8	InitialResource;</div><div class='add'>+	u8	IsKeyPreSet;</div><div class='add'>+	u8	CalOneTime; // 20060630.1</div><div class='add'>+</div><div class='add'>+	u8	VCO_trim;</div><div class='add'>+</div><div class='add'>+	// For Fix 1'st DMA bug</div><div class='add'>+	u32	FragCount;</div><div class='add'>+	u32	DMAFix; //V1_DMA_FIX The variable can be removed if driver want to save mem space for V2.</div><div class='add'>+</div><div class='add'>+	//=======================================================================================</div><div class='add'>+	// For USB driver, hal need more variables. Due to</div><div class='add'>+	//	1. NDIS-WDM operation</div><div class='add'>+	//	2. The SME, MLME and OLD MDS need Adapter structure, but the driver under HAL doesn't</div><div class='add'>+	//		have that parameter when receiving and indicating packet.</div><div class='add'>+	//		The MDS must input the Adapter pointer as the second parameter of hal_init_hardware.</div><div class='add'>+	//		The function usage is different than PCI driver.</div><div class='add'>+	//=======================================================================================</div><div class='add'>+	void* Adapter;</div><div class='add'>+</div><div class='add'>+	//===============================================</div><div class='add'>+	// Definition for MAC address</div><div class='add'>+	//===============================================</div><div class='add'>+	u8		PermanentMacAddress[ETH_LENGTH_OF_ADDRESS + 2]; // The Enthernet addr that are stored in EEPROM.  + 2 to 8-byte alignment</div><div class='add'>+	u8		CurrentMacAddress[ETH_LENGTH_OF_ADDRESS + 2]; // The Enthernet addr that are in used.  + 2 to 8-byte alignment</div><div class='add'>+</div><div class='add'>+	//=====================================================================</div><div class='add'>+	// Definition for 802.11</div><div class='add'>+	//=====================================================================</div><div class='add'>+	PUCHAR	bssid_pointer; // Used by hal_get_bssid for return value</div><div class='add'>+	u8	bssid[8];// Only 6 byte will be used. 8 byte is required for read buffer</div><div class='add'>+	u8	ssid[32];// maximum ssid length is 32 byte</div><div class='add'>+</div><div class='add'>+	u16	AID;</div><div class='add'>+	u8	ssid_length;</div><div class='add'>+	u8	Channel;</div><div class='add'>+</div><div class='add'>+	u16	ListenInterval;</div><div class='add'>+	u16	CapabilityInformation;</div><div class='add'>+</div><div class='add'>+	u16	BeaconPeriod;</div><div class='add'>+	u16	ProbeDelay;</div><div class='add'>+</div><div class='add'>+	u8	bss_type;// 0: IBSS_NET or 1:ESS_NET</div><div class='add'>+	u8	preamble;// 0: short preamble, 1: long preamble</div><div class='add'>+	u8	slot_time_select;// 9 or 20 value</div><div class='add'>+	u8	phy_type;// Phy select</div><div class='add'>+</div><div class='add'>+	u32	phy_para[MAX_RF_PARAMETER];</div><div class='add'>+	u32	phy_number;</div><div class='add'>+</div><div class='add'>+	u32	CurrentRadioSw; // 20060320.2 0:On 1:Off</div><div class='add'>+	u32	CurrentRadioHw; // 20060825 0:On 1:Off</div><div class='add'>+</div><div class='add'>+	PUCHAR	power_save_point;  // Used by hal_get_power_save_mode for return value</div><div class='add'>+	u8	cwmin;</div><div class='add'>+	u8	desired_power_save;</div><div class='add'>+	u8	dtim;// Is running dtim</div><div class='add'>+	u8	mapping_key_replace_index;//In Key table, the next index be replaced 931130.4.r</div><div class='add'>+</div><div class='add'>+	u16	MaxReceiveLifeTime;</div><div class='add'>+	u16	FragmentThreshold;</div><div class='add'>+	u16	FragmentThreshold_tmp;</div><div class='add'>+	u16	cwmax;</div><div class='add'>+</div><div class='add'>+	u8	Key_slot[MAX_KEY_TABLE][8]; //Ownership record for key slot. For Alignment</div><div class='add'>+	u32	Key_content[MAX_KEY_TABLE][12]; // 10DW for each entry + 2 for burst command( Off and On valid bit)</div><div class='add'>+	u8	CurrentDefaultKeyIndex;</div><div class='add'>+	u32	CurrentDefaultKeyLength;</div><div class='add'>+</div><div class='add'>+	//========================================================================</div><div class='add'>+	// Variable for each module</div><div class='add'>+	//========================================================================</div><div class='add'>+	WBUSB		WbUsb; // Need WbUsb.h</div><div class='add'>+	WB35REG		Wb35Reg; // Need Wb35Reg.h</div><div class='add'>+	WB35TX		Wb35Tx; // Need Wb35Tx.h</div><div class='add'>+	WB35RX		Wb35Rx; // Need Wb35Rx.h</div><div class='add'>+</div><div class='add'>+	OS_TIMER	LEDTimer;// For LED</div><div class='add'>+</div><div class='add'>+	u32		LEDpoint;// For LED</div><div class='add'>+</div><div class='add'>+    u32         dto_tx_retry_count;         // LA20040210_DTO kevin</div><div class='add'>+    u32         dto_tx_frag_count;          // LA20040210_DTO kevin</div><div class='add'>+    u32         rx_ok_count[13];    // index=0: total rx ok</div><div class='add'>+    //u32         rx_ok_bytes[13];    // index=0, total rx ok bytes</div><div class='add'>+    u32         rx_err_count[13];   // index=0: total rx err</div><div class='add'>+</div><div class='add'>+	//for Tx debug</div><div class='add'>+	u32			tx_TBTT_start_count;</div><div class='add'>+	u32			tx_ETR_count;</div><div class='add'>+	u32			tx_WepOn_false_count;</div><div class='add'>+	u32			tx_Null_key_count;</div><div class='add'>+	u32			tx_retry_count[8];</div><div class='add'>+</div><div class='add'>+	u8		PowerIndexFromEEPROM; // For 2412MHz</div><div class='add'>+	u8		power_index;</div><div class='add'>+	u8		IsWaitJoinComplete;	// TRUE: set join request</div><div class='add'>+	u8		band;</div><div class='add'>+</div><div class='add'>+	u16		SoftwareSet;</div><div class='add'>+	u16		Reserved_s;</div><div class='add'>+</div><div class='add'>+	u32		IsInitOK; // 0: Driver starting   1: Driver init OK</div><div class='add'>+</div><div class='add'>+	// For Phy calibration</div><div class='add'>+    s32		iq_rsdl_gain_tx_d2;</div><div class='add'>+    s32		iq_rsdl_phase_tx_d2;</div><div class='add'>+	u32		txvga_setting_for_cal; // 20060703.1 Add</div><div class='add'>+</div><div class='add'>+	u8		TxVgaSettingInEEPROM[ (((MAX_TXVGA_EEPROM*2)+3) &amp; ~0x03) ]; // 20060621 For backup EEPROM value</div><div class='add'>+	u8		TxVgaFor24[16]; // Max is 14, 2 for alignment</div><div class='add'>+	TXVGA_FOR_50	TxVgaFor50[36];	// 35 channels in 5G. 35x2 = 70 byte. 2 for alignments</div><div class='add'>+</div><div class='add'>+	u16		Scan_Interval;</div><div class='add'>+	u16		RESERVED6;</div><div class='add'>+</div><div class='add'>+	// LED control</div><div class='add'>+	u32		LED_control;</div><div class='add'>+		// LED_control 4 byte: Gray_Led_1[3]		Gray_Led_0[2]		Led[1]			Led[0]</div><div class='add'>+		// Gray_Led</div><div class='add'>+		//		For Led gray setting</div><div class='add'>+		// Led</div><div class='add'>+		//		0: normal control, LED behavior will decide by EEPROM setting</div><div class='add'>+		//		1: Turn off specific LED</div><div class='add'>+		//		2: Always on specific LED</div><div class='add'>+		//		3: slow blinking specific LED</div><div class='add'>+		//		4: fast blinking specific LED</div><div class='add'>+		//		5: WPS led control is set. Led0 is Red, Led1 id Green</div><div class='add'>+		//			Led[1] is parameter for WPS LED mode</div><div class='add'>+		//				 // 1:InProgress  2: Error 3: Session overlap 4: Success 20061108 control</div><div class='add'>+</div><div class='add'>+	u32		LED_LinkOn;		//Turn LED on control</div><div class='add'>+	u32		LED_Scanning;	// Let LED in scan process control</div><div class='add'>+	u32		LED_Blinking; // Temp variable for shining</div><div class='add'>+	u32		RxByteCountLast;</div><div class='add'>+	u32		TxByteCountLast;</div><div class='add'>+</div><div class='add'>+	s32		SurpriseRemoveCount;</div><div class='add'>+</div><div class='add'>+	// For global timer</div><div class='add'>+	u32		time_count;//TICK_TIME_100ms 1 = 100ms</div><div class='add'>+</div><div class='add'>+	// For error recover</div><div class='add'>+	u32		HwStop;</div><div class='add'>+</div><div class='add'>+	// 20060828.1 for avoid AP disconnect</div><div class='add'>+	u32		NullPacketCount;</div><div class='add'>+</div><div class='add'>+} hw_data_t, *phw_data_t;</div><div class='add'>+</div><div class='add'>+// The mapping of Rx and Tx descriptor field</div><div class='add'>+typedef struct _HAL_RATE</div><div class='add'>+{</div><div class='add'>+	// DSSS</div><div class='add'>+	u32	RESERVED_0;</div><div class='add'>+	u32   NumRate2MS;</div><div class='add'>+	u32   NumRate55MS;</div><div class='add'>+	u32   NumRate11MS;</div><div class='add'>+</div><div class='add'>+	u32	RESERVED_1[4];</div><div class='add'>+</div><div class='add'>+	u32   NumRate1M;</div><div class='add'>+	u32   NumRate2ML;</div><div class='add'>+	u32   NumRate55ML;</div><div class='add'>+	u32   NumRate11ML;</div><div class='add'>+</div><div class='add'>+	u32	RESERVED_2[4];</div><div class='add'>+</div><div class='add'>+	// OFDM</div><div class='add'>+	u32   NumRate6M;</div><div class='add'>+	u32   NumRate9M;</div><div class='add'>+	u32   NumRate12M;</div><div class='add'>+	u32   NumRate18M;</div><div class='add'>+	u32   NumRate24M;</div><div class='add'>+	u32   NumRate36M;</div><div class='add'>+	u32   NumRate48M;</div><div class='add'>+	u32   NumRate54M;</div><div class='add'>+} HAL_RATE, *PHAL_RATE;</div><div class='add'>+</div><div class='add'>+</div><div class='head'>diff --git a/drivers/staging/winbond/wblinux.c b/drivers/staging/winbond/wblinux.c<br/>new file mode 100644<br/>index 000000000000..2eade5a47b19<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/winbond/wblinux.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/wblinux.c</a></div><div class='hunk'>@@ -0,0 +1,277 @@</div><div class='add'>+//============================================================================</div><div class='add'>+//  Copyright (c) 1996-2005 Winbond Electronic Corporation</div><div class='add'>+//</div><div class='add'>+//  Module Name:</div><div class='add'>+//    wblinux.c</div><div class='add'>+//</div><div class='add'>+//  Abstract:</div><div class='add'>+//    Linux releated routines</div><div class='add'>+//</div><div class='add'>+//============================================================================</div><div class='add'>+#include "os_common.h"</div><div class='add'>+</div><div class='add'>+u32</div><div class='add'>+WBLINUX_MemoryAlloc(void* *VirtualAddress, u32 Length)</div><div class='add'>+{</div><div class='add'>+	*VirtualAddress = kzalloc( Length, GFP_ATOMIC ); //GFP_KERNEL is not suitable</div><div class='add'>+</div><div class='add'>+	if (*VirtualAddress == NULL)</div><div class='add'>+		return 0;</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+s32</div><div class='add'>+EncapAtomicInc(PADAPTER Adapter, void* pAtomic)</div><div class='add'>+{</div><div class='add'>+	PWBLINUX pWbLinux = &amp;Adapter-&gt;WbLinux;</div><div class='add'>+	u32	ltmp;</div><div class='add'>+	PULONG	pltmp = (PULONG)pAtomic;</div><div class='add'>+	OS_SPIN_LOCK_ACQUIRED( &amp;pWbLinux-&gt;AtomicSpinLock );</div><div class='add'>+	(*pltmp)++;</div><div class='add'>+	ltmp = (*pltmp);</div><div class='add'>+	OS_SPIN_LOCK_RELEASED( &amp;pWbLinux-&gt;AtomicSpinLock );</div><div class='add'>+	return ltmp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+s32</div><div class='add'>+EncapAtomicDec(PADAPTER Adapter, void* pAtomic)</div><div class='add'>+{</div><div class='add'>+	PWBLINUX pWbLinux = &amp;Adapter-&gt;WbLinux;</div><div class='add'>+	u32	ltmp;</div><div class='add'>+	PULONG	pltmp = (PULONG)pAtomic;</div><div class='add'>+	OS_SPIN_LOCK_ACQUIRED( &amp;pWbLinux-&gt;AtomicSpinLock );</div><div class='add'>+	(*pltmp)--;</div><div class='add'>+	ltmp = (*pltmp);</div><div class='add'>+	OS_SPIN_LOCK_RELEASED( &amp;pWbLinux-&gt;AtomicSpinLock );</div><div class='add'>+	return ltmp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+unsigned char</div><div class='add'>+WBLINUX_Initial(PADAPTER Adapter)</div><div class='add'>+{</div><div class='add'>+	PWBLINUX pWbLinux = &amp;Adapter-&gt;WbLinux;</div><div class='add'>+</div><div class='add'>+	OS_SPIN_LOCK_ALLOCATE( &amp;pWbLinux-&gt;SpinLock );</div><div class='add'>+	OS_SPIN_LOCK_ALLOCATE( &amp;pWbLinux-&gt;AtomicSpinLock );</div><div class='add'>+	return TRUE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+WBLinux_ReceivePacket(PADAPTER Adapter, PRXLAYER1 pRxLayer1)</div><div class='add'>+{</div><div class='add'>+	BUG();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+WBLINUX_GetNextPacket(PADAPTER Adapter,  PDESCRIPTOR pDes)</div><div class='add'>+{</div><div class='add'>+	BUG();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+WBLINUX_GetNextPacketCompleted(PADAPTER Adapter, PDESCRIPTOR pDes)</div><div class='add'>+{</div><div class='add'>+	BUG();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+WBLINUX_Destroy(PADAPTER Adapter)</div><div class='add'>+{</div><div class='add'>+	WBLINUX_stop( Adapter );</div><div class='add'>+	OS_SPIN_LOCK_FREE( &amp;pWbNdis-&gt;SpinLock );</div><div class='add'>+#ifdef _PE_USB_INI_DUMP_</div><div class='add'>+	WBDEBUG(("[w35und] unregister_netdev!\n"));</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+WBLINUX_stop(  PADAPTER Adapter )</div><div class='add'>+{</div><div class='add'>+	PWBLINUX	pWbLinux = &amp;Adapter-&gt;WbLinux;</div><div class='add'>+	struct sk_buff *pSkb;</div><div class='add'>+</div><div class='add'>+	if (OS_ATOMIC_INC( Adapter, &amp;pWbLinux-&gt;ThreadCount ) == 1) {</div><div class='add'>+		// Shutdown module immediately</div><div class='add'>+		pWbLinux-&gt;shutdown = 1;</div><div class='add'>+</div><div class='add'>+		while (pWbLinux-&gt;skb_array[ pWbLinux-&gt;skb_GetIndex ]) {</div><div class='add'>+			// Trying to free the un-sending packet</div><div class='add'>+			pSkb = pWbLinux-&gt;skb_array[ pWbLinux-&gt;skb_GetIndex ];</div><div class='add'>+			pWbLinux-&gt;skb_array[ pWbLinux-&gt;skb_GetIndex ] = NULL;</div><div class='add'>+			if( in_irq() )</div><div class='add'>+				dev_kfree_skb_irq( pSkb );</div><div class='add'>+			else</div><div class='add'>+				dev_kfree_skb( pSkb );</div><div class='add'>+</div><div class='add'>+			pWbLinux-&gt;skb_GetIndex++;</div><div class='add'>+			pWbLinux-&gt;skb_GetIndex %= WBLINUX_PACKET_ARRAY_SIZE;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+#ifdef _PE_STATE_DUMP_</div><div class='add'>+		WBDEBUG(( "[w35und] SKB_RELEASE OK\n" ));</div><div class='add'>+#endif</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	OS_ATOMIC_DEC( Adapter, &amp;pWbLinux-&gt;ThreadCount );</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+WbWlanHalt(  PADAPTER Adapter )</div><div class='add'>+{</div><div class='add'>+	//---------------------</div><div class='add'>+	Adapter-&gt;sLocalPara.ShutDowned = TRUE;</div><div class='add'>+</div><div class='add'>+	Mds_Destroy( Adapter );</div><div class='add'>+</div><div class='add'>+	// Turn off Rx and Tx hardware ability</div><div class='add'>+	hal_stop( &amp;Adapter-&gt;sHwData );</div><div class='add'>+#ifdef _PE_USB_INI_DUMP_</div><div class='add'>+	WBDEBUG(("[w35und] Hal_stop O.K.\n"));</div><div class='add'>+#endif</div><div class='add'>+	OS_SLEEP(100000);// Waiting Irp completed</div><div class='add'>+</div><div class='add'>+	// Destroy the NDIS module</div><div class='add'>+	WBLINUX_Destroy( Adapter );</div><div class='add'>+</div><div class='add'>+	// Halt the HAL</div><div class='add'>+	hal_halt(&amp;Adapter-&gt;sHwData, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+unsigned char</div><div class='add'>+WbWLanInitialize(PADAPTER Adapter)</div><div class='add'>+{</div><div class='add'>+	phw_data_t	pHwData;</div><div class='add'>+	PUCHAR		pMacAddr, pMacAddr2;</div><div class='add'>+	u32		InitStep = 0;</div><div class='add'>+	u8		EEPROM_region;</div><div class='add'>+	u8		HwRadioOff;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		//</div><div class='add'>+		// Setting default value for Linux</div><div class='add'>+		//</div><div class='add'>+		Adapter-&gt;sLocalPara.region_INF = REGION_AUTO;</div><div class='add'>+		Adapter-&gt;sLocalPara.TxRateMode = RATE_AUTO;</div><div class='add'>+		psLOCAL-&gt;bMacOperationMode = MODE_802_11_BG;	// B/G mode</div><div class='add'>+		Adapter-&gt;Mds.TxRTSThreshold = DEFAULT_RTSThreshold;</div><div class='add'>+		Adapter-&gt;Mds.TxFragmentThreshold = DEFAULT_FRAGMENT_THRESHOLD;</div><div class='add'>+		hal_set_phy_type( &amp;Adapter-&gt;sHwData, RF_WB_242_1 );</div><div class='add'>+		Adapter-&gt;sLocalPara.MTUsize = MAX_ETHERNET_PACKET_SIZE;</div><div class='add'>+		psLOCAL-&gt;bPreambleMode = AUTO_MODE;</div><div class='add'>+		Adapter-&gt;sLocalPara.RadioOffStatus.boSwRadioOff = FALSE;</div><div class='add'>+		pHwData = &amp;Adapter-&gt;sHwData;</div><div class='add'>+		hal_set_phy_type( pHwData, RF_DECIDE_BY_INF );</div><div class='add'>+</div><div class='add'>+		//</div><div class='add'>+		// Initial each module and variable</div><div class='add'>+		//</div><div class='add'>+		if (!WBLINUX_Initial(Adapter)) {</div><div class='add'>+#ifdef _PE_USB_INI_DUMP_</div><div class='add'>+			WBDEBUG(("[w35und]WBNDIS initialization failed\n"));</div><div class='add'>+#endif</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		// Initial Software variable</div><div class='add'>+		Adapter-&gt;sLocalPara.ShutDowned = FALSE;</div><div class='add'>+</div><div class='add'>+		//added by ws for wep key error detection</div><div class='add'>+		Adapter-&gt;sLocalPara.bWepKeyError= FALSE;</div><div class='add'>+		Adapter-&gt;sLocalPara.bToSelfPacketReceived = FALSE;</div><div class='add'>+		Adapter-&gt;sLocalPara.WepKeyDetectTimerCount= 2 * 100; /// 2 seconds</div><div class='add'>+</div><div class='add'>+		// Initial USB hal</div><div class='add'>+		InitStep = 1;</div><div class='add'>+		pHwData = &amp;Adapter-&gt;sHwData;</div><div class='add'>+		if (!hal_init_hardware(pHwData, Adapter))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		EEPROM_region = hal_get_region_from_EEPROM( pHwData );</div><div class='add'>+		if (EEPROM_region != REGION_AUTO)</div><div class='add'>+			psLOCAL-&gt;region = EEPROM_region;</div><div class='add'>+		else {</div><div class='add'>+			if (psLOCAL-&gt;region_INF != REGION_AUTO)</div><div class='add'>+				psLOCAL-&gt;region = psLOCAL-&gt;region_INF;</div><div class='add'>+			else</div><div class='add'>+				psLOCAL-&gt;region = REGION_USA;	//default setting</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		// Get Software setting flag from hal</div><div class='add'>+		Adapter-&gt;sLocalPara.boAntennaDiversity = FALSE;</div><div class='add'>+		if (hal_software_set(pHwData) &amp; 0x00000001)</div><div class='add'>+			Adapter-&gt;sLocalPara.boAntennaDiversity = TRUE;</div><div class='add'>+</div><div class='add'>+		//</div><div class='add'>+		// For TS module</div><div class='add'>+		//</div><div class='add'>+		InitStep = 2;</div><div class='add'>+</div><div class='add'>+		// For MDS module</div><div class='add'>+		InitStep = 3;</div><div class='add'>+		Mds_initial(Adapter);</div><div class='add'>+</div><div class='add'>+		//=======================================</div><div class='add'>+		// Initialize the SME, SCAN, MLME, ROAM</div><div class='add'>+		//=======================================</div><div class='add'>+		InitStep = 4;</div><div class='add'>+		InitStep = 5;</div><div class='add'>+		InitStep = 6;</div><div class='add'>+</div><div class='add'>+		// If no user-defined address in the registry, use the addresss "burned" on the NIC instead.</div><div class='add'>+		pMacAddr = Adapter-&gt;sLocalPara.ThisMacAddress;</div><div class='add'>+		pMacAddr2 = Adapter-&gt;sLocalPara.PermanentAddress;</div><div class='add'>+		hal_get_permanent_address( pHwData, Adapter-&gt;sLocalPara.PermanentAddress );// Reading ethernet address from EEPROM</div><div class='add'>+		if (OS_MEMORY_COMPARE(pMacAddr, "\x00\x00\x00\x00\x00\x00", MAC_ADDR_LENGTH )) // Is equal</div><div class='add'>+		{</div><div class='add'>+			memcpy( pMacAddr, pMacAddr2, MAC_ADDR_LENGTH );</div><div class='add'>+		} else {</div><div class='add'>+			// Set the user define MAC address</div><div class='add'>+			hal_set_ethernet_address( pHwData, Adapter-&gt;sLocalPara.ThisMacAddress );</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		//get current antenna</div><div class='add'>+		psLOCAL-&gt;bAntennaNo = hal_get_antenna_number(pHwData);</div><div class='add'>+#ifdef _PE_STATE_DUMP_</div><div class='add'>+		WBDEBUG(("Driver init, antenna no = %d\n", psLOCAL-&gt;bAntennaNo));</div><div class='add'>+#endif</div><div class='add'>+		hal_get_hw_radio_off( pHwData );</div><div class='add'>+</div><div class='add'>+		// Waiting for HAL setting OK</div><div class='add'>+		while (!hal_idle(pHwData))</div><div class='add'>+			OS_SLEEP(10000);</div><div class='add'>+</div><div class='add'>+		MTO_Init(Adapter);</div><div class='add'>+</div><div class='add'>+		HwRadioOff = hal_get_hw_radio_off( pHwData );</div><div class='add'>+		psLOCAL-&gt;RadioOffStatus.boHwRadioOff = !!HwRadioOff;</div><div class='add'>+</div><div class='add'>+		hal_set_radio_mode( pHwData, (unsigned char)(psLOCAL-&gt;RadioOffStatus.boSwRadioOff || psLOCAL-&gt;RadioOffStatus.boHwRadioOff) );</div><div class='add'>+</div><div class='add'>+		hal_driver_init_OK(pHwData) = 1; // Notify hal that the driver is ready now.</div><div class='add'>+		//set a tx power for reference.....</div><div class='add'>+//		sme_set_tx_power_level(Adapter, 12);	FIXME?</div><div class='add'>+		return TRUE;</div><div class='add'>+	}</div><div class='add'>+	while(FALSE);</div><div class='add'>+</div><div class='add'>+	switch (InitStep) {</div><div class='add'>+	case 5:</div><div class='add'>+	case 4:</div><div class='add'>+	case 3: Mds_Destroy( Adapter );</div><div class='add'>+	case 2:</div><div class='add'>+	case 1: WBLINUX_Destroy( Adapter );</div><div class='add'>+		hal_halt( pHwData, NULL );</div><div class='add'>+	case 0: break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return FALSE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void WBLINUX_ConnectStatus(PADAPTER Adapter, u32 flag)</div><div class='add'>+{</div><div class='add'>+	PWBLINUX	pWbLinux = &amp;Adapter-&gt;WbLinux;</div><div class='add'>+</div><div class='add'>+	pWbLinux-&gt;LinkStatus = flag; // OS_DISCONNECTED	or  OS_CONNECTED</div><div class='add'>+}</div><div class='add'>+</div><div class='head'>diff --git a/drivers/staging/winbond/wblinux_f.h b/drivers/staging/winbond/wblinux_f.h<br/>new file mode 100644<br/>index 000000000000..68240c5fc80d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/winbond/wblinux_f.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/wblinux_f.h</a></div><div class='hunk'>@@ -0,0 +1,23 @@</div><div class='add'>+//=========================================================================</div><div class='add'>+// Copyright (c) 1996-2004 Winbond Electronic Corporation</div><div class='add'>+//</div><div class='add'>+// wblinux_f.h</div><div class='add'>+//</div><div class='add'>+u32 WBLINUX_MemoryAlloc(  void* *VirtualAddress,  u32 Length );</div><div class='add'>+s32 EncapAtomicInc(  PADAPTER Adapter,  void* pAtomic );</div><div class='add'>+s32 EncapAtomicDec(  PADAPTER Adapter,  void* pAtomic );</div><div class='add'>+void WBLinux_ReceivePacket(  PADAPTER Adapter,  PRXLAYER1 pRxLayer1 );</div><div class='add'>+unsigned char WBLINUX_Initial(  PADAPTER Adapter );</div><div class='add'>+int wb35_start_xmit(struct sk_buff *skb, struct net_device *netdev );</div><div class='add'>+void WBLINUX_GetNextPacket(  PADAPTER Adapter,  PDESCRIPTOR pDes );</div><div class='add'>+void WBLINUX_GetNextPacketCompleted(  PADAPTER Adapter,  PDESCRIPTOR pDes );</div><div class='add'>+void WBLINUX_stop(  PADAPTER Adapter );</div><div class='add'>+void WBLINUX_Destroy(  PADAPTER Adapter );</div><div class='add'>+void wb35_set_multicast( struct net_device *netdev );</div><div class='add'>+struct net_device_stats * wb35_netdev_stats( struct net_device *netdev );</div><div class='add'>+void WBLINUX_stop(  PADAPTER Adapter );</div><div class='add'>+void WbWlanHalt(  PADAPTER Adapter );</div><div class='add'>+void WBLINUX_ConnectStatus(  PADAPTER Adapter,  u32 flag );</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='head'>diff --git a/drivers/staging/winbond/wblinux_s.h b/drivers/staging/winbond/wblinux_s.h<br/>new file mode 100644<br/>index 000000000000..97e9167ab839<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/winbond/wblinux_s.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/winbond/wblinux_s.h</a></div><div class='hunk'>@@ -0,0 +1,45 @@</div><div class='add'>+//============================================================</div><div class='add'>+// wblinux_s.h</div><div class='add'>+//</div><div class='add'>+#define OS_MEMORY_ALLOC( _V, _S )	WBLINUX_MemoryAlloc( _V, _S )</div><div class='add'>+#define OS_LINK_STATUS			(Adapter-&gt;WbLinux.LinkStatus == OS_CONNECTED)</div><div class='add'>+#define OS_SET_SHUTDOWN( _A )		_A-&gt;WbLinux.shutdown=1</div><div class='add'>+#define OS_SET_RESUME( _A )		_A-&gt;WbLinux.shutdown=0</div><div class='add'>+#define OS_CONNECT_STATUS_INDICATE( _A, _F )		WBLINUX_ConnectStatus( _A, _F )</div><div class='add'>+#define OS_DISCONNECTED	0</div><div class='add'>+#define OS_CONNECTED	1</div><div class='add'>+#define OS_STOP( _A )	WBLINUX_stop( _A )</div><div class='add'>+</div><div class='add'>+#define OS_CURRENT_RX_BYTE( _A )		_A-&gt;WbLinux.RxByteCount</div><div class='add'>+#define OS_CURRENT_TX_BYTE( _A )		_A-&gt;WbLinux.TxByteCount</div><div class='add'>+#define OS_EVENT_INDICATE( _A, _B, _F )</div><div class='add'>+#define OS_PMKID_STATUS_EVENT( _A )</div><div class='add'>+#define OS_RECEIVE_PACKET_INDICATE( _A, _D )		WBLinux_ReceivePacket( _A, _D )</div><div class='add'>+#define OS_RECEIVE_802_1X_PACKET_INDICATE( _A, _D )	EAP_ReceivePacket( _A, _D )</div><div class='add'>+#define OS_GET_PACKET( _A, _D )				WBLINUX_GetNextPacket( _A, _D )</div><div class='add'>+#define OS_GET_PACKET_COMPLETE( _A, _D )	WBLINUX_GetNextPacketCompleted( _A, _D )</div><div class='add'>+#define OS_SEND_RESULT( _A, _ID, _R )</div><div class='add'>+</div><div class='add'>+#define WBLINUX_PACKET_ARRAY_SIZE	(ETHERNET_TX_DESCRIPTORS*4)</div><div class='add'>+</div><div class='add'>+typedef struct _WBLINUX</div><div class='add'>+{</div><div class='add'>+	OS_SPIN_LOCK	AtomicSpinLock;</div><div class='add'>+	OS_SPIN_LOCK	SpinLock;</div><div class='add'>+	u32	shutdown;</div><div class='add'>+</div><div class='add'>+	OS_ATOMIC	ThreadCount;</div><div class='add'>+</div><div class='add'>+	u32	LinkStatus;		// OS_DISCONNECTED or OS_CONNECTED</div><div class='add'>+</div><div class='add'>+	u32	RxByteCount;</div><div class='add'>+	u32	TxByteCount;</div><div class='add'>+</div><div class='add'>+	struct sk_buff *skb_array[ WBLINUX_PACKET_ARRAY_SIZE ];</div><div class='add'>+	struct sk_buff *packet_return;</div><div class='add'>+	s32	skb_SetIndex;</div><div class='add'>+	s32	skb_GetIndex;</div><div class='add'>+	s32	netif_state_stop; // 1: stop  0: normal</div><div class='add'>+} WBLINUX, *PWBLINUX;</div><div class='add'>+</div><div class='add'>+</div><div class='head'>diff --git a/drivers/staging/wlan-ng/Kconfig b/drivers/staging/wlan-ng/Kconfig<br/>new file mode 100644<br/>index 000000000000..10b1f0f634d3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/wlan-ng/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/wlan-ng/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,10 @@</div><div class='add'>+config PRISM2_USB</div><div class='add'>+	tristate "Prism2.5 USB driver"</div><div class='add'>+	depends on USB</div><div class='add'>+	default n</div><div class='add'>+	---help---</div><div class='add'>+	  This is the wlan-ng prism 2.5 USB driver for a wide range of</div><div class='add'>+	  old USB wireless devices.</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here: the module</div><div class='add'>+	  will be called prism2_usb.</div><div class='head'>diff --git a/drivers/staging/wlan-ng/Makefile b/drivers/staging/wlan-ng/Makefile<br/>new file mode 100644<br/>index 000000000000..777b5111b3d0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/wlan-ng/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/wlan-ng/Makefile</a></div><div class='hunk'>@@ -0,0 +1,9 @@</div><div class='add'>+obj-$(CONFIG_PRISM2_USB) += prism2_usb.o</div><div class='add'>+obj-$(CONFIG_PRISM2_USB) += p80211.o</div><div class='add'>+</div><div class='add'>+p80211-objs := p80211mod.o \</div><div class='add'>+		p80211conv.o \</div><div class='add'>+		p80211req.o \</div><div class='add'>+		p80211wep.o \</div><div class='add'>+		p80211wext.o \</div><div class='add'>+		p80211netdev.o</div><div class='head'>diff --git a/drivers/staging/wlan-ng/README b/drivers/staging/wlan-ng/README<br/>new file mode 100644<br/>index 000000000000..f50e4eb6c272<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/wlan-ng/README?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/wlan-ng/README</a></div><div class='hunk'>@@ -0,0 +1,8 @@</div><div class='add'>+TODO:</div><div class='add'>+	- checkpatch.pl cleanups</div><div class='add'>+	- sparse warnings</div><div class='add'>+	- Lindent cleanups</div><div class='add'>+	- move to use the in-kernel wireless stack</div><div class='add'>+	- possible enable the pcmcia and pci portions of the driver</div><div class='add'>+</div><div class='add'>+Please send all patches to Greg Kroah-Hartman &lt;greg@kroah.com&gt;</div><div class='head'>diff --git a/drivers/staging/wlan-ng/hfa384x.c b/drivers/staging/wlan-ng/hfa384x.c<br/>new file mode 100644<br/>index 000000000000..04df3fd9c520<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/wlan-ng/hfa384x.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/wlan-ng/hfa384x.c</a></div><div class='hunk'>@@ -0,0 +1,4018 @@</div><div class='add'>+/* src/prism2/driver/hfa384x.c</div><div class='add'>+*</div><div class='add'>+* Implements the functions of the Intersil hfa384x MAC</div><div class='add'>+*</div><div class='add'>+* Copyright (C) 1999 AbsoluteValue Systems, Inc.  All Rights Reserved.</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* linux-wlan</div><div class='add'>+*</div><div class='add'>+*   The contents of this file are subject to the Mozilla Public</div><div class='add'>+*   License Version 1.1 (the "License"); you may not use this file</div><div class='add'>+*   except in compliance with the License. You may obtain a copy of</div><div class='add'>+*   the License at http://www.mozilla.org/MPL/</div><div class='add'>+*</div><div class='add'>+*   Software distributed under the License is distributed on an "AS</div><div class='add'>+*   IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or</div><div class='add'>+*   implied. See the License for the specific language governing</div><div class='add'>+*   rights and limitations under the License.</div><div class='add'>+*</div><div class='add'>+*   Alternatively, the contents of this file may be used under the</div><div class='add'>+*   terms of the GNU Public License version 2 (the "GPL"), in which</div><div class='add'>+*   case the provisions of the GPL are applicable instead of the</div><div class='add'>+*   above.  If you wish to allow the use of your version of this file</div><div class='add'>+*   only under the terms of the GPL and not to allow others to use</div><div class='add'>+*   your version of this file under the MPL, indicate your decision</div><div class='add'>+*   by deleting the provisions above and replace them with the notice</div><div class='add'>+*   and other provisions required by the GPL.  If you do not delete</div><div class='add'>+*   the provisions above, a recipient may use your version of this</div><div class='add'>+*   file under either the MPL or the GPL.</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* Inquiries regarding the linux-wlan Open Source project can be</div><div class='add'>+* made directly to:</div><div class='add'>+*</div><div class='add'>+* AbsoluteValue Systems Inc.</div><div class='add'>+* info@linux-wlan.com</div><div class='add'>+* http://www.linux-wlan.com</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* Portions of the development of this software were funded by</div><div class='add'>+* Intersil Corporation as part of PRISM(R) chipset product development.</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* This file implements functions that correspond to the prism2/hfa384x</div><div class='add'>+* 802.11 MAC hardware and firmware host interface.</div><div class='add'>+*</div><div class='add'>+* The functions can be considered to represent several levels of</div><div class='add'>+* abstraction.  The lowest level functions are simply C-callable wrappers</div><div class='add'>+* around the register accesses.  The next higher level represents C-callable</div><div class='add'>+* prism2 API functions that match the Intersil documentation as closely</div><div class='add'>+* as is reasonable.  The next higher layer implements common sequences</div><div class='add'>+* of invokations of the API layer (e.g. write to bap, followed by cmd).</div><div class='add'>+*</div><div class='add'>+* Common sequences:</div><div class='add'>+* hfa384x_drvr_xxx	Highest level abstractions provided by the</div><div class='add'>+*			hfa384x code.  They are driver defined wrappers</div><div class='add'>+*			for common sequences.  These functions generally</div><div class='add'>+*			use the services of the lower levels.</div><div class='add'>+*</div><div class='add'>+* hfa384x_drvr_xxxconfig  An example of the drvr level abstraction. These</div><div class='add'>+*			functions are wrappers for the RID get/set</div><div class='add'>+*			sequence. They 	call copy_[to|from]_bap() and</div><div class='add'>+*			cmd_access().	These functions operate on the</div><div class='add'>+*			RIDs and buffers without validation.  The caller</div><div class='add'>+*			is responsible for that.</div><div class='add'>+*</div><div class='add'>+* API wrapper functions:</div><div class='add'>+* hfa384x_cmd_xxx	functions that provide access to the f/w commands.</div><div class='add'>+*			The function arguments correspond to each command</div><div class='add'>+*			argument, even command arguments that get packed</div><div class='add'>+*			into single registers.  These functions _just_</div><div class='add'>+*			issue the command by setting the cmd/parm regs</div><div class='add'>+*			&amp; reading the status/resp regs.  Additional</div><div class='add'>+*			activities required to fully use a command</div><div class='add'>+*			(read/write from/to bap, get/set int status etc.)</div><div class='add'>+*			are implemented separately.  Think of these as</div><div class='add'>+*			C-callable prism2 commands.</div><div class='add'>+*</div><div class='add'>+* Lowest Layer Functions:</div><div class='add'>+* hfa384x_docmd_xxx	These functions implement the sequence required</div><div class='add'>+*			to issue any prism2 command.  Primarily used by the</div><div class='add'>+*			hfa384x_cmd_xxx functions.</div><div class='add'>+*</div><div class='add'>+* hfa384x_bap_xxx	BAP read/write access functions.</div><div class='add'>+*			Note: we usually use BAP0 for non-interrupt context</div><div class='add'>+*			 and BAP1 for interrupt context.</div><div class='add'>+*</div><div class='add'>+* hfa384x_dl_xxx	download related functions.</div><div class='add'>+*</div><div class='add'>+* Driver State Issues:</div><div class='add'>+* Note that there are two pairs of functions that manage the</div><div class='add'>+* 'initialized' and 'running' states of the hw/MAC combo.  The four</div><div class='add'>+* functions are create(), destroy(), start(), and stop().  create()</div><div class='add'>+* sets up the data structures required to support the hfa384x_*</div><div class='add'>+* functions and destroy() cleans them up.  The start() function gets</div><div class='add'>+* the actual hardware running and enables the interrupts.  The stop()</div><div class='add'>+* function shuts the hardware down.  The sequence should be:</div><div class='add'>+* create()</div><div class='add'>+*  .</div><div class='add'>+*  .  Self contained test routines can run here, particularly</div><div class='add'>+*  .  corereset() and test_hostif().</div><div class='add'>+*  .</div><div class='add'>+* start()</div><div class='add'>+*  .</div><div class='add'>+*  .  Do interesting things w/ the hardware</div><div class='add'>+*  .</div><div class='add'>+* stop()</div><div class='add'>+* destroy()</div><div class='add'>+*</div><div class='add'>+* Note that destroy() can be called without calling stop() first.</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+</div><div class='add'>+/* System Includes */</div><div class='add'>+#define WLAN_DBVAR	prism2_debug</div><div class='add'>+#include "version.h"</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#include &lt;linux/version.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/wireless.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/timer.h&gt;</div><div class='add'>+#include &lt;asm/semaphore.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;asm/byteorder.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+</div><div class='add'>+#if (LINUX_VERSION_CODE &lt; KERNEL_VERSION(2,5,0))</div><div class='add'>+#include &lt;linux/tqueue.h&gt;</div><div class='add'>+#else</div><div class='add'>+#include &lt;linux/workqueue.h&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if (WLAN_HOSTIF == WLAN_PCMCIA)</div><div class='add'>+#if (LINUX_VERSION_CODE &lt; KERNEL_VERSION(2,6,13) )</div><div class='add'>+#include &lt;pcmcia/version.h&gt;</div><div class='add'>+#endif</div><div class='add'>+#include &lt;pcmcia/cs_types.h&gt;</div><div class='add'>+#include &lt;pcmcia/cs.h&gt;</div><div class='add'>+#include &lt;pcmcia/cistpl.h&gt;</div><div class='add'>+#include &lt;pcmcia/ds.h&gt;</div><div class='add'>+#include &lt;pcmcia/cisreg.h&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if ((WLAN_HOSTIF == WLAN_PLX) || (WLAN_HOSTIF == WLAN_PCI))</div><div class='add'>+#include &lt;linux/ioport.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#include "wlan_compat.h"</div><div class='add'>+</div><div class='add'>+// XXXX #define CMD_IRQ</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Project Includes */</div><div class='add'>+</div><div class='add'>+#include "p80211types.h"</div><div class='add'>+#include "p80211hdr.h"</div><div class='add'>+#include "p80211mgmt.h"</div><div class='add'>+#include "p80211conv.h"</div><div class='add'>+#include "p80211msg.h"</div><div class='add'>+#include "p80211netdev.h"</div><div class='add'>+#include "p80211req.h"</div><div class='add'>+#include "p80211metadef.h"</div><div class='add'>+#include "p80211metastruct.h"</div><div class='add'>+#include "hfa384x.h"</div><div class='add'>+#include "prism2mgmt.h"</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Local Constants */</div><div class='add'>+</div><div class='add'>+static const UINT16 crc16tab[256] =</div><div class='add'>+{</div><div class='add'>+	0x0000, 0xc0c1, 0xc181, 0x0140, 0xc301, 0x03c0, 0x0280, 0xc241,</div><div class='add'>+	0xc601, 0x06c0, 0x0780, 0xc741, 0x0500, 0xc5c1, 0xc481, 0x0440,</div><div class='add'>+	0xcc01, 0x0cc0, 0x0d80, 0xcd41, 0x0f00, 0xcfc1, 0xce81, 0x0e40,</div><div class='add'>+	0x0a00, 0xcac1, 0xcb81, 0x0b40, 0xc901, 0x09c0, 0x0880, 0xc841,</div><div class='add'>+	0xd801, 0x18c0, 0x1980, 0xd941, 0x1b00, 0xdbc1, 0xda81, 0x1a40,</div><div class='add'>+	0x1e00, 0xdec1, 0xdf81, 0x1f40, 0xdd01, 0x1dc0, 0x1c80, 0xdc41,</div><div class='add'>+	0x1400, 0xd4c1, 0xd581, 0x1540, 0xd701, 0x17c0, 0x1680, 0xd641,</div><div class='add'>+	0xd201, 0x12c0, 0x1380, 0xd341, 0x1100, 0xd1c1, 0xd081, 0x1040,</div><div class='add'>+	0xf001, 0x30c0, 0x3180, 0xf141, 0x3300, 0xf3c1, 0xf281, 0x3240,</div><div class='add'>+	0x3600, 0xf6c1, 0xf781, 0x3740, 0xf501, 0x35c0, 0x3480, 0xf441,</div><div class='add'>+	0x3c00, 0xfcc1, 0xfd81, 0x3d40, 0xff01, 0x3fc0, 0x3e80, 0xfe41,</div><div class='add'>+	0xfa01, 0x3ac0, 0x3b80, 0xfb41, 0x3900, 0xf9c1, 0xf881, 0x3840,</div><div class='add'>+	0x2800, 0xe8c1, 0xe981, 0x2940, 0xeb01, 0x2bc0, 0x2a80, 0xea41,</div><div class='add'>+	0xee01, 0x2ec0, 0x2f80, 0xef41, 0x2d00, 0xedc1, 0xec81, 0x2c40,</div><div class='add'>+	0xe401, 0x24c0, 0x2580, 0xe541, 0x2700, 0xe7c1, 0xe681, 0x2640,</div><div class='add'>+	0x2200, 0xe2c1, 0xe381, 0x2340, 0xe101, 0x21c0, 0x2080, 0xe041,</div><div class='add'>+	0xa001, 0x60c0, 0x6180, 0xa141, 0x6300, 0xa3c1, 0xa281, 0x6240,</div><div class='add'>+	0x6600, 0xa6c1, 0xa781, 0x6740, 0xa501, 0x65c0, 0x6480, 0xa441,</div><div class='add'>+	0x6c00, 0xacc1, 0xad81, 0x6d40, 0xaf01, 0x6fc0, 0x6e80, 0xae41,</div><div class='add'>+	0xaa01, 0x6ac0, 0x6b80, 0xab41, 0x6900, 0xa9c1, 0xa881, 0x6840,</div><div class='add'>+	0x7800, 0xb8c1, 0xb981, 0x7940, 0xbb01, 0x7bc0, 0x7a80, 0xba41,</div><div class='add'>+	0xbe01, 0x7ec0, 0x7f80, 0xbf41, 0x7d00, 0xbdc1, 0xbc81, 0x7c40,</div><div class='add'>+	0xb401, 0x74c0, 0x7580, 0xb541, 0x7700, 0xb7c1, 0xb681, 0x7640,</div><div class='add'>+	0x7200, 0xb2c1, 0xb381, 0x7340, 0xb101, 0x71c0, 0x7080, 0xb041,</div><div class='add'>+	0x5000, 0x90c1, 0x9181, 0x5140, 0x9301, 0x53c0, 0x5280, 0x9241,</div><div class='add'>+	0x9601, 0x56c0, 0x5780, 0x9741, 0x5500, 0x95c1, 0x9481, 0x5440,</div><div class='add'>+	0x9c01, 0x5cc0, 0x5d80, 0x9d41, 0x5f00, 0x9fc1, 0x9e81, 0x5e40,</div><div class='add'>+	0x5a00, 0x9ac1, 0x9b81, 0x5b40, 0x9901, 0x59c0, 0x5880, 0x9841,</div><div class='add'>+	0x8801, 0x48c0, 0x4980, 0x8941, 0x4b00, 0x8bc1, 0x8a81, 0x4a40,</div><div class='add'>+	0x4e00, 0x8ec1, 0x8f81, 0x4f40, 0x8d01, 0x4dc0, 0x4c80, 0x8c41,</div><div class='add'>+	0x4400, 0x84c1, 0x8581, 0x4540, 0x8701, 0x47c0, 0x4680, 0x8641,</div><div class='add'>+	0x8201, 0x42c0, 0x4380, 0x8341, 0x4100, 0x81c1, 0x8081, 0x4040</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Local Macros */</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Local Types */</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Local Static Definitions */</div><div class='add'>+extern int prism2_debug;</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Local Function Declarations */</div><div class='add'>+</div><div class='add'>+static void	hfa384x_int_dtim(wlandevice_t *wlandev);</div><div class='add'>+static void	hfa384x_int_infdrop(wlandevice_t *wlandev);</div><div class='add'>+</div><div class='add'>+static void     hfa384x_bap_tasklet(unsigned long data);</div><div class='add'>+</div><div class='add'>+static void	hfa384x_int_info(wlandevice_t *wlandev);</div><div class='add'>+static void	hfa384x_int_txexc(wlandevice_t *wlandev);</div><div class='add'>+static void	hfa384x_int_tx(wlandevice_t *wlandev);</div><div class='add'>+static void	hfa384x_int_rx(wlandevice_t *wlandev);</div><div class='add'>+</div><div class='add'>+#ifdef CMD_IRQ</div><div class='add'>+static void	hfa384x_int_cmd(wlandevice_t *wlandev);</div><div class='add'>+#endif</div><div class='add'>+static void	hfa384x_int_rxmonitor( wlandevice_t *wlandev,</div><div class='add'>+			UINT16 rxfid, hfa384x_rx_frame_t *rxdesc);</div><div class='add'>+static void	hfa384x_int_alloc(wlandevice_t *wlandev);</div><div class='add'>+</div><div class='add'>+static int hfa384x_docmd_wait( hfa384x_t *hw, hfa384x_metacmd_t *cmd);</div><div class='add'>+</div><div class='add'>+static int hfa384x_dl_docmd_wait( hfa384x_t *hw, hfa384x_metacmd_t *cmd);</div><div class='add'>+</div><div class='add'>+static UINT16</div><div class='add'>+hfa384x_mkcrc16(UINT8 *p, int len);</div><div class='add'>+</div><div class='add'>+int hfa384x_copy_to_bap4(hfa384x_t *hw, UINT16 bap, UINT16 id, UINT16 offset,</div><div class='add'>+			 void *buf, UINT len, void* buf2, UINT len2,</div><div class='add'>+			 void *buf3, UINT len3, void* buf4, UINT len4);</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Function Definitions */</div><div class='add'>+</div><div class='add'>+static UINT16</div><div class='add'>+txfid_queue_empty(hfa384x_t *hw)</div><div class='add'>+{</div><div class='add'>+	return (hw-&gt;txfid_head == hw-&gt;txfid_tail) ? 1 : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static UINT16</div><div class='add'>+txfid_queue_remove(hfa384x_t *hw)</div><div class='add'>+{</div><div class='add'>+	UINT16 result= 0;</div><div class='add'>+</div><div class='add'>+	if (txfid_queue_empty(hw)) {</div><div class='add'>+		WLAN_LOG_DEBUG(3,"queue empty.\n");</div><div class='add'>+	} else {</div><div class='add'>+		result = hw-&gt;txfid_queue[hw-&gt;txfid_head];</div><div class='add'>+		hw-&gt;txfid_head = (hw-&gt;txfid_head + 1) % hw-&gt;txfid_N;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return (UINT16)result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static INT16</div><div class='add'>+txfid_queue_add(hfa384x_t *hw, UINT16 val)</div><div class='add'>+{</div><div class='add'>+	INT16 result = 0;</div><div class='add'>+</div><div class='add'>+	if (hw-&gt;txfid_head == ((hw-&gt;txfid_tail + 1) % hw-&gt;txfid_N)) {</div><div class='add'>+		result = -1;</div><div class='add'>+		WLAN_LOG_DEBUG(3,"queue full.\n");</div><div class='add'>+	} else {</div><div class='add'>+		hw-&gt;txfid_queue[hw-&gt;txfid_tail] = val;</div><div class='add'>+		result = hw-&gt;txfid_tail;</div><div class='add'>+		hw-&gt;txfid_tail = (hw-&gt;txfid_tail + 1) % hw-&gt;txfid_N;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_create</div><div class='add'>+*</div><div class='add'>+* Initializes the hfa384x_t data structure for use.  Note this</div><div class='add'>+* does _not_ intialize the actual hardware, just the data structures</div><div class='add'>+* we use to keep track of its state.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw		device structure</div><div class='add'>+*	irq		device irq number</div><div class='add'>+*	iobase		[pcmcia] i/o base address for register access</div><div class='add'>+*			[pci] zero</div><div class='add'>+*			[plx] i/o base address for register access</div><div class='add'>+*	membase		[pcmcia] pcmcia_cs "link" pointer</div><div class='add'>+*			[pci] memory base address for register access</div><div class='add'>+*			[plx] memory base address for card attribute memory</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	nothing</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+void hfa384x_create(hfa384x_t *hw, UINT irq, UINT32 iobase,</div><div class='add'>+		    UINT8 __iomem *membase)</div><div class='add'>+{</div><div class='add'>+	DBFENTER;</div><div class='add'>+	memset(hw, 0, sizeof(hfa384x_t));</div><div class='add'>+	hw-&gt;irq = irq;</div><div class='add'>+	hw-&gt;iobase = iobase;</div><div class='add'>+	hw-&gt;membase = membase;</div><div class='add'>+	spin_lock_init(&amp;(hw-&gt;cmdlock));</div><div class='add'>+</div><div class='add'>+	/* BAP setup */</div><div class='add'>+ 	spin_lock_init(&amp;(hw-&gt;baplock));</div><div class='add'>+	tasklet_init(&amp;hw-&gt;bap_tasklet,</div><div class='add'>+		     hfa384x_bap_tasklet,</div><div class='add'>+		     (unsigned long) hw);</div><div class='add'>+</div><div class='add'>+	init_waitqueue_head(&amp;hw-&gt;cmdq);</div><div class='add'>+	sema_init(&amp;hw-&gt;infofid_sem, 1);</div><div class='add'>+</div><div class='add'>+        hw-&gt;txfid_head = 0;</div><div class='add'>+        hw-&gt;txfid_tail = 0;</div><div class='add'>+        hw-&gt;txfid_N = HFA384x_DRVR_FIDSTACKLEN_MAX;</div><div class='add'>+        memset(hw-&gt;txfid_queue, 0, sizeof(hw-&gt;txfid_queue));</div><div class='add'>+</div><div class='add'>+	hw-&gt;isram16 = 1;</div><div class='add'>+</div><div class='add'>+	/* Init the auth queue head */</div><div class='add'>+	skb_queue_head_init(&amp;hw-&gt;authq);</div><div class='add'>+</div><div class='add'>+	INIT_WORK2(&amp;hw-&gt;link_bh, prism2sta_processing_defer);</div><div class='add'>+</div><div class='add'>+        INIT_WORK2(&amp;hw-&gt;commsqual_bh, prism2sta_commsqual_defer);</div><div class='add'>+</div><div class='add'>+	init_timer(&amp;hw-&gt;commsqual_timer);</div><div class='add'>+	hw-&gt;commsqual_timer.data = (unsigned long) hw;</div><div class='add'>+	hw-&gt;commsqual_timer.function = prism2sta_commsqual_timer;</div><div class='add'>+</div><div class='add'>+	hw-&gt;link_status = HFA384x_LINK_NOTCONNECTED;</div><div class='add'>+	hw-&gt;state = HFA384x_STATE_INIT;</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_destroy</div><div class='add'>+*</div><div class='add'>+* Partner to hfa384x_create().  This function cleans up the hw</div><div class='add'>+* structure so that it can be freed by the caller using a simple</div><div class='add'>+* kfree.  Currently, this function is just a placeholder.  If, at some</div><div class='add'>+* point in the future, an hw in the 'shutdown' state requires a 'deep'</div><div class='add'>+* kfree, this is where it should be done.  Note that if this function</div><div class='add'>+* is called on a _running_ hw structure, the drvr_stop() function is</div><div class='add'>+* called.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw		device structure</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	nothing, this function is not allowed to fail.</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+void</div><div class='add'>+hfa384x_destroy( hfa384x_t *hw)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	if ( hw-&gt;state == HFA384x_STATE_RUNNING ) {</div><div class='add'>+		hfa384x_drvr_stop(hw);</div><div class='add'>+	}</div><div class='add'>+	hw-&gt;state = HFA384x_STATE_PREINIT;</div><div class='add'>+</div><div class='add'>+	if (hw-&gt;scanresults) {</div><div class='add'>+		kfree(hw-&gt;scanresults);</div><div class='add'>+		hw-&gt;scanresults = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+        /* Now to clean out the auth queue */</div><div class='add'>+        while ( (skb = skb_dequeue(&amp;hw-&gt;authq)) ) {</div><div class='add'>+                dev_kfree_skb(skb);</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_drvr_getconfig</div><div class='add'>+*</div><div class='add'>+* Performs the sequence necessary to read a config/info item.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw		device structure</div><div class='add'>+*	rid		config/info record id (host order)</div><div class='add'>+*	buf		host side record buffer.  Upon return it will</div><div class='add'>+*			contain the body portion of the record (minus the</div><div class='add'>+*			RID and len).</div><div class='add'>+*	len		buffer length (in bytes, should match record length)</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0		success</div><div class='add'>+*	&gt;0		f/w reported error - f/w status code</div><div class='add'>+*	&lt;0		driver reported error</div><div class='add'>+*	-ENODATA 	length mismatch between argument and retrieved</div><div class='add'>+*			record.</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int hfa384x_drvr_getconfig(hfa384x_t *hw, UINT16 rid, void *buf, UINT16 len)</div><div class='add'>+{</div><div class='add'>+	int 		result = 0;</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	result = hfa384x_cmd_access( hw, 0, rid, buf, len);</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_drvr_setconfig</div><div class='add'>+*</div><div class='add'>+* Performs the sequence necessary to write a config/info item.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw		device structure</div><div class='add'>+*	rid		config/info record id (in host order)</div><div class='add'>+*	buf		host side record buffer</div><div class='add'>+*	len		buffer length (in bytes)</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0		success</div><div class='add'>+*	&gt;0		f/w reported error - f/w status code</div><div class='add'>+*	&lt;0		driver reported error</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int hfa384x_drvr_setconfig(hfa384x_t *hw, UINT16 rid, void *buf, UINT16 len)</div><div class='add'>+{</div><div class='add'>+	int		result = 0;</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	result = hfa384x_cmd_access( hw, 1, rid, buf, len);</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_drvr_readpda</div><div class='add'>+*</div><div class='add'>+* Performs the sequence to read the PDA space.  Note there is no</div><div class='add'>+* drvr_writepda() function.  Writing a PDA is</div><div class='add'>+* generally implemented by a calling component via calls to</div><div class='add'>+* cmd_download and writing to the flash download buffer via the</div><div class='add'>+* aux regs.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw		device structure</div><div class='add'>+*	buf		buffer to store PDA in</div><div class='add'>+*	len		buffer length</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0		success</div><div class='add'>+*	&gt;0		f/w reported error - f/w status code</div><div class='add'>+*	&lt;0		driver reported error</div><div class='add'>+*	-ETIMEOUT	timout waiting for the cmd regs to become</div><div class='add'>+*			available, or waiting for the control reg</div><div class='add'>+*			to indicate the Aux port is enabled.</div><div class='add'>+*	-ENODATA	the buffer does NOT contain a valid PDA.</div><div class='add'>+*			Either the card PDA is bad, or the auxdata</div><div class='add'>+*			reads are giving us garbage.</div><div class='add'>+</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread or non-card interrupt.</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int hfa384x_drvr_readpda(hfa384x_t *hw, void *buf, UINT len)</div><div class='add'>+{</div><div class='add'>+	int		result = 0;</div><div class='add'>+	UINT16		*pda = buf;</div><div class='add'>+	int		pdaok = 0;</div><div class='add'>+	int		morepdrs = 1;</div><div class='add'>+	int		currpdr = 0;	/* word offset of the current pdr */</div><div class='add'>+	int		i;</div><div class='add'>+	UINT16		pdrlen;		/* pdr length in bytes, host order */</div><div class='add'>+	UINT16		pdrcode;	/* pdr code, host order */</div><div class='add'>+	UINT16		crc;</div><div class='add'>+	UINT16		pdacrc;</div><div class='add'>+	struct pdaloc {</div><div class='add'>+		UINT32	cardaddr;</div><div class='add'>+		UINT16	auxctl;</div><div class='add'>+	} pdaloc[] =</div><div class='add'>+	{</div><div class='add'>+		{ HFA3842_PDA_BASE,		HFA384x_AUX_CTL_NV},</div><div class='add'>+		{ HFA3842_PDA_BASE,		HFA384x_AUX_CTL_EXTDS},</div><div class='add'>+		{ HFA3841_PDA_BASE,		HFA384x_AUX_CTL_NV},</div><div class='add'>+		{ HFA3841_PDA_BASE,		HFA384x_AUX_CTL_EXTDS},</div><div class='add'>+		{ HFA3841_PDA_BOGUS_BASE,	HFA384x_AUX_CTL_NV}</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+	/* Check for aux available */</div><div class='add'>+	result = hfa384x_cmd_aux_enable(hw, 0);</div><div class='add'>+	if ( result ) {</div><div class='add'>+		WLAN_LOG_DEBUG(1,"aux_enable() failed. result=%d\n", result);</div><div class='add'>+		goto failed;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Read the pda from each known address.  */</div><div class='add'>+	for ( i = 0; i &lt; (sizeof(pdaloc)/sizeof(pdaloc[0])); i++) {</div><div class='add'>+		WLAN_LOG_DEBUG( 3, "Checking PDA@(0x%08x,%s)\n",</div><div class='add'>+			pdaloc[i].cardaddr,</div><div class='add'>+			pdaloc[i].auxctl == HFA384x_AUX_CTL_NV ?</div><div class='add'>+			"CTL_NV" : "CTL_EXTDS");</div><div class='add'>+</div><div class='add'>+		/* Copy bufsize bytes from our current pdaloc */</div><div class='add'>+		hfa384x_copy_from_aux(hw,</div><div class='add'>+			pdaloc[i].cardaddr,</div><div class='add'>+			pdaloc[i].auxctl,</div><div class='add'>+			buf,</div><div class='add'>+			len);</div><div class='add'>+</div><div class='add'>+		/* Test for garbage */</div><div class='add'>+		/* Traverse the PDR list Looking for PDA-END */</div><div class='add'>+		pdaok = 1;	/* intially assume good */</div><div class='add'>+		morepdrs = 1;</div><div class='add'>+		currpdr = 0;</div><div class='add'>+		while ( pdaok &amp;&amp; morepdrs ) {</div><div class='add'>+			pdrlen = hfa384x2host_16(pda[currpdr]) * 2;</div><div class='add'>+			pdrcode = hfa384x2host_16(pda[currpdr+1]);</div><div class='add'>+</div><div class='add'>+			/* Test for completion at END record */</div><div class='add'>+			if ( pdrcode == HFA384x_PDR_END_OF_PDA ) {</div><div class='add'>+				if ( pdrlen == 4 ) {</div><div class='add'>+					morepdrs = 0;</div><div class='add'>+					/* Calculate CRC-16 and compare to PDA</div><div class='add'>+					 * value.  Note the addition of 2 words</div><div class='add'>+					 * for ENDREC.len and ENDREC.code</div><div class='add'>+					 * fields.</div><div class='add'>+					 */</div><div class='add'>+					crc = hfa384x_mkcrc16( (UINT8*)pda,</div><div class='add'>+						(currpdr + 2) * sizeof(UINT16));</div><div class='add'>+					pdacrc =hfa384x2host_16(pda[currpdr+2]);</div><div class='add'>+					if ( crc != pdacrc ) {</div><div class='add'>+						WLAN_LOG_DEBUG(3,</div><div class='add'>+						"PDA crc failed:"</div><div class='add'>+						"calc_crc=0x%04x,"</div><div class='add'>+						"pdr_crc=0x%04x.\n",</div><div class='add'>+						crc, pdacrc);</div><div class='add'>+						pdaok = 0;</div><div class='add'>+					}</div><div class='add'>+				} else {</div><div class='add'>+					WLAN_LOG_DEBUG(3,</div><div class='add'>+					"END record detected w/ "</div><div class='add'>+					"len(%d) != 2, assuming bad PDA\n",</div><div class='add'>+					pdrlen);</div><div class='add'>+					pdaok = 0;</div><div class='add'>+</div><div class='add'>+				}</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* Test the record length */</div><div class='add'>+			if ( pdrlen &gt; HFA384x_PDR_LEN_MAX || pdrlen == 0) {</div><div class='add'>+				WLAN_LOG_DEBUG(3,</div><div class='add'>+					"pdrlen for address #%d "</div><div class='add'>+					"at %#x:%#x:%d\n",</div><div class='add'>+					i, pdaloc[i].cardaddr,</div><div class='add'>+					pdaloc[i].auxctl, pdrlen);</div><div class='add'>+				WLAN_LOG_DEBUG(3,"pdrlen invalid=%d\n",</div><div class='add'>+					pdrlen);</div><div class='add'>+				pdaok = 0;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* Move to the next pdr */</div><div class='add'>+			if ( morepdrs ) {</div><div class='add'>+				/* note the access to pda[], we need words */</div><div class='add'>+				currpdr += hfa384x2host_16(pda[currpdr]) + 1;</div><div class='add'>+				if (currpdr*sizeof(UINT16) &gt; len) {</div><div class='add'>+					WLAN_LOG_DEBUG(3,</div><div class='add'>+					"Didn't find PDA_END in buffer, "</div><div class='add'>+					"trying next location.\n");</div><div class='add'>+					pdaok = 0;</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if ( pdaok ) {</div><div class='add'>+			WLAN_LOG_INFO(</div><div class='add'>+				"PDA Read from 0x%08x in %s space.\n",</div><div class='add'>+				pdaloc[i].cardaddr,</div><div class='add'>+				pdaloc[i].auxctl == 0 ? "EXTDS" :</div><div class='add'>+				pdaloc[i].auxctl == 1 ? "NV" :</div><div class='add'>+				pdaloc[i].auxctl == 2 ? "PHY" :</div><div class='add'>+				pdaloc[i].auxctl == 3 ? "ICSRAM" :</div><div class='add'>+				"&lt;bogus auxctl&gt;");</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	result = pdaok ? 0 : -ENODATA;</div><div class='add'>+</div><div class='add'>+	if ( result ) {</div><div class='add'>+		WLAN_LOG_DEBUG(3,"Failure: pda is not okay\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hfa384x_cmd_aux_disable(hw);</div><div class='add'>+failed:</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* mkpda_crc</div><div class='add'>+*</div><div class='add'>+* Calculates the CRC16 for the given PDA and inserts the value</div><div class='add'>+* into the end record.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	pda	ptr to the PDA data structure.</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0	- success</div><div class='add'>+*	~0	- failure (probably an errno)</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+static UINT16</div><div class='add'>+hfa384x_mkcrc16(UINT8 *p, int len)</div><div class='add'>+{</div><div class='add'>+	UINT16	crc = 0;</div><div class='add'>+	UINT8	*lim = p + len;</div><div class='add'>+</div><div class='add'>+	while (p &lt; lim) {</div><div class='add'>+		crc = (crc &gt;&gt; 8 ) ^ crc16tab[(crc &amp; 0xff) ^ *p++];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return crc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_drvr_ramdl_enable</div><div class='add'>+*</div><div class='add'>+* Begins the ram download state.  Checks to see that we're not</div><div class='add'>+* already in a download state and that a port isn't enabled.</div><div class='add'>+* Sets the download state and calls cmd_download with the</div><div class='add'>+* ENABLE_VOLATILE subcommand and the exeaddr argument.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw		device structure</div><div class='add'>+*	exeaddr		the card execution address that will be</div><div class='add'>+*                       jumped to when ramdl_disable() is called</div><div class='add'>+*			(host order).</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0		success</div><div class='add'>+*	&gt;0		f/w reported error - f/w status code</div><div class='add'>+*	&lt;0		driver reported error</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int hfa384x_drvr_ramdl_enable(hfa384x_t *hw, UINT32 exeaddr)</div><div class='add'>+{</div><div class='add'>+	int		result = 0;</div><div class='add'>+	UINT16		lowaddr;</div><div class='add'>+	UINT16		hiaddr;</div><div class='add'>+	int		i;</div><div class='add'>+	DBFENTER;</div><div class='add'>+	/* Check that a port isn't active */</div><div class='add'>+	for ( i = 0; i &lt; HFA384x_PORTID_MAX; i++) {</div><div class='add'>+		if ( hw-&gt;port_enabled[i] ) {</div><div class='add'>+			WLAN_LOG_DEBUG(1,"Can't download with a port enabled.\n");</div><div class='add'>+			result = -EINVAL;</div><div class='add'>+			goto done;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check that we're not already in a download state */</div><div class='add'>+	if ( hw-&gt;dlstate != HFA384x_DLSTATE_DISABLED ) {</div><div class='add'>+		WLAN_LOG_DEBUG(1,"Download state not disabled.\n");</div><div class='add'>+		result = -EINVAL;</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Are we supposed to go into genesis mode? */</div><div class='add'>+	if (exeaddr == 0x3f0000) {</div><div class='add'>+		UINT16 initseq[2] = { 0xe100, 0xffa1 };</div><div class='add'>+		UINT16 readbuf[2];</div><div class='add'>+		UINT8 hcr = 0x0f; /* Default to x16 SRAM */</div><div class='add'>+		hw-&gt;isram16 = 1;</div><div class='add'>+</div><div class='add'>+		WLAN_LOG_DEBUG(1, "Dropping into Genesis mode\n");</div><div class='add'>+</div><div class='add'>+		/* Issue card reset and enable aux port */</div><div class='add'>+		hfa384x_corereset(hw, prism2_reset_holdtime,</div><div class='add'>+				  prism2_reset_settletime, 0);</div><div class='add'>+		hfa384x_cmd_aux_enable(hw, 1);</div><div class='add'>+</div><div class='add'>+		/* Genesis set */</div><div class='add'>+		hfa384x_copy_to_aux(hw, 0x7E0038, HFA384x_AUX_CTL_EXTDS,</div><div class='add'>+				    initseq, sizeof(initseq));</div><div class='add'>+</div><div class='add'>+		hfa384x_corereset(hw, prism2_reset_holdtime,</div><div class='add'>+				  prism2_reset_settletime, hcr);</div><div class='add'>+</div><div class='add'>+		/* Validate memory config */</div><div class='add'>+		hfa384x_copy_to_aux(hw, 0x7E0038, HFA384x_AUX_CTL_EXTDS,</div><div class='add'>+				    initseq, sizeof(initseq));</div><div class='add'>+		hfa384x_copy_from_aux(hw, 0x7E0038, HFA384x_AUX_CTL_EXTDS,</div><div class='add'>+				    readbuf, sizeof(initseq));</div><div class='add'>+		WLAN_HEX_DUMP(3, "readback", readbuf, sizeof(readbuf));</div><div class='add'>+</div><div class='add'>+		if (memcmp(initseq, readbuf, sizeof(readbuf))) {</div><div class='add'>+			hcr = 0x1f; /* x8 SRAM */</div><div class='add'>+			hw-&gt;isram16 = 0;</div><div class='add'>+</div><div class='add'>+			hfa384x_copy_to_aux(hw, 0x7E0038, HFA384x_AUX_CTL_EXTDS,</div><div class='add'>+					    initseq, sizeof(initseq));</div><div class='add'>+			hfa384x_corereset(hw, prism2_reset_holdtime,</div><div class='add'>+					  prism2_reset_settletime, hcr);</div><div class='add'>+</div><div class='add'>+			hfa384x_copy_to_aux(hw, 0x7E0038, HFA384x_AUX_CTL_EXTDS,</div><div class='add'>+					    initseq, sizeof(initseq));</div><div class='add'>+			hfa384x_copy_from_aux(hw, 0x7E0038, HFA384x_AUX_CTL_EXTDS,</div><div class='add'>+					    readbuf, sizeof(initseq));</div><div class='add'>+			WLAN_HEX_DUMP(2, "readback", readbuf, sizeof(readbuf));</div><div class='add'>+</div><div class='add'>+			if (memcmp(initseq, readbuf, sizeof(readbuf))) {</div><div class='add'>+				WLAN_LOG_ERROR("Genesis mode failed\n");</div><div class='add'>+				result = -1;</div><div class='add'>+				goto done;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Now we're in genesis mode */</div><div class='add'>+		hw-&gt;dlstate = HFA384x_DLSTATE_GENESIS;</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Retrieve the buffer loc&amp;size and timeout */</div><div class='add'>+	if ( (result = hfa384x_drvr_getconfig(hw, HFA384x_RID_DOWNLOADBUFFER,</div><div class='add'>+				&amp;(hw-&gt;bufinfo), sizeof(hw-&gt;bufinfo))) ) {</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+	hw-&gt;bufinfo.page = hfa384x2host_16(hw-&gt;bufinfo.page);</div><div class='add'>+	hw-&gt;bufinfo.offset = hfa384x2host_16(hw-&gt;bufinfo.offset);</div><div class='add'>+	hw-&gt;bufinfo.len = hfa384x2host_16(hw-&gt;bufinfo.len);</div><div class='add'>+	if ( (result = hfa384x_drvr_getconfig16(hw, HFA384x_RID_MAXLOADTIME,</div><div class='add'>+				&amp;(hw-&gt;dltimeout))) ) {</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+	hw-&gt;dltimeout = hfa384x2host_16(hw-&gt;dltimeout);</div><div class='add'>+</div><div class='add'>+	/* Enable the aux port */</div><div class='add'>+	if ( (result = hfa384x_cmd_aux_enable(hw, 0)) ) {</div><div class='add'>+		WLAN_LOG_DEBUG(1,"Aux enable failed, result=%d.\n", result);</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Call the download(1,addr) function */</div><div class='add'>+	lowaddr = HFA384x_ADDR_CMD_MKOFF(exeaddr);</div><div class='add'>+	hiaddr =  HFA384x_ADDR_CMD_MKPAGE(exeaddr);</div><div class='add'>+</div><div class='add'>+	result = hfa384x_cmd_download(hw, HFA384x_PROGMODE_RAM,</div><div class='add'>+			lowaddr, hiaddr, 0);</div><div class='add'>+	if ( result == 0) {</div><div class='add'>+		/* Set the download state */</div><div class='add'>+		hw-&gt;dlstate = HFA384x_DLSTATE_RAMENABLED;</div><div class='add'>+	} else {</div><div class='add'>+		WLAN_LOG_DEBUG(1,"cmd_download(0x%04x, 0x%04x) failed, result=%d.\n",</div><div class='add'>+				lowaddr,hiaddr, result);</div><div class='add'>+		/* Disable  the aux port */</div><div class='add'>+		hfa384x_cmd_aux_disable(hw);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+ done:</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_drvr_ramdl_disable</div><div class='add'>+*</div><div class='add'>+* Ends the ram download state.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw		device structure</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0		success</div><div class='add'>+*	&gt;0		f/w reported error - f/w status code</div><div class='add'>+*	&lt;0		driver reported error</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int hfa384x_drvr_ramdl_disable(hfa384x_t *hw)</div><div class='add'>+{</div><div class='add'>+	DBFENTER;</div><div class='add'>+	/* Check that we're already in the download state */</div><div class='add'>+	if ( ( hw-&gt;dlstate != HFA384x_DLSTATE_RAMENABLED ) &amp;&amp;</div><div class='add'>+	     ( hw-&gt;dlstate != HFA384x_DLSTATE_GENESIS ) ) {</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (hw-&gt;dlstate == HFA384x_DLSTATE_GENESIS) {</div><div class='add'>+		hfa384x_corereset(hw, prism2_reset_holdtime,</div><div class='add'>+				  prism2_reset_settletime,</div><div class='add'>+				  hw-&gt;isram16 ? 0x07: 0x17);</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Disable the aux port */</div><div class='add'>+	hfa384x_cmd_download(hw, HFA384x_PROGMODE_DISABLE, 0, 0 , 0);</div><div class='add'>+</div><div class='add'>+ done:</div><div class='add'>+	hw-&gt;dlstate = HFA384x_DLSTATE_DISABLED;</div><div class='add'>+	hfa384x_cmd_aux_disable(hw);</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_drvr_ramdl_write</div><div class='add'>+*</div><div class='add'>+* Performs a RAM download of a chunk of data. First checks to see</div><div class='add'>+* that we're in the RAM download state, then uses the aux functions</div><div class='add'>+* to 1) copy the data, 2) readback and compare.  The download</div><div class='add'>+* state is unaffected.  When all data has been written using</div><div class='add'>+* this function, call drvr_ramdl_disable() to end the download state</div><div class='add'>+* and restart the MAC.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw		device structure</div><div class='add'>+*	daddr		Card address to write to. (host order)</div><div class='add'>+*	buf		Ptr to data to write.</div><div class='add'>+*	len		Length of data (host order).</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0		success</div><div class='add'>+*	&gt;0		f/w reported error - f/w status code</div><div class='add'>+*	&lt;0		driver reported error</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int hfa384x_drvr_ramdl_write(hfa384x_t *hw, UINT32 daddr, void* buf, UINT32 len)</div><div class='add'>+{</div><div class='add'>+	int		result = 0;</div><div class='add'>+	UINT8		*verbuf;</div><div class='add'>+	DBFENTER;</div><div class='add'>+	/* Check that we're in the ram download state */</div><div class='add'>+	if ( ( hw-&gt;dlstate != HFA384x_DLSTATE_RAMENABLED ) &amp;&amp;</div><div class='add'>+	     ( hw-&gt;dlstate != HFA384x_DLSTATE_GENESIS ) ) {</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	WLAN_LOG_INFO("Writing %d bytes to ram @0x%06x\n", len, daddr);</div><div class='add'>+#if 0</div><div class='add'>+WLAN_HEX_DUMP(1, "dldata", buf, len);</div><div class='add'>+#endif</div><div class='add'>+	/* Copy the data via the aux port */</div><div class='add'>+	hfa384x_copy_to_aux(hw, daddr, HFA384x_AUX_CTL_EXTDS, buf, len);</div><div class='add'>+</div><div class='add'>+	/* Create a buffer for the verify */</div><div class='add'>+	verbuf = kmalloc(len, GFP_KERNEL);</div><div class='add'>+	if (verbuf == NULL ) return 1;</div><div class='add'>+</div><div class='add'>+	/* Read back and compare */</div><div class='add'>+	hfa384x_copy_from_aux(hw, daddr, HFA384x_AUX_CTL_EXTDS, verbuf, len);</div><div class='add'>+</div><div class='add'>+	if ( memcmp(buf, verbuf, len) ) {</div><div class='add'>+		WLAN_LOG_DEBUG(1,"ramdl verify failed!\n");</div><div class='add'>+		result = -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kfree_s(verbuf, len);</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_drvr_flashdl_enable</div><div class='add'>+*</div><div class='add'>+* Begins the flash download state.  Checks to see that we're not</div><div class='add'>+* already in a download state and that a port isn't enabled.</div><div class='add'>+* Sets the download state and retrieves the flash download</div><div class='add'>+* buffer location, buffer size, and timeout length.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw		device structure</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0		success</div><div class='add'>+*	&gt;0		f/w reported error - f/w status code</div><div class='add'>+*	&lt;0		driver reported error</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int hfa384x_drvr_flashdl_enable(hfa384x_t *hw)</div><div class='add'>+{</div><div class='add'>+	int		result = 0;</div><div class='add'>+	int		i;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+	/* Check that a port isn't active */</div><div class='add'>+	for ( i = 0; i &lt; HFA384x_PORTID_MAX; i++) {</div><div class='add'>+		if ( hw-&gt;port_enabled[i] ) {</div><div class='add'>+			WLAN_LOG_DEBUG(1,"called when port enabled.\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check that we're not already in a download state */</div><div class='add'>+	if ( hw-&gt;dlstate != HFA384x_DLSTATE_DISABLED ) {</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Retrieve the buffer loc&amp;size and timeout */</div><div class='add'>+	if ( (result = hfa384x_drvr_getconfig(hw, HFA384x_RID_DOWNLOADBUFFER,</div><div class='add'>+				&amp;(hw-&gt;bufinfo), sizeof(hw-&gt;bufinfo))) ) {</div><div class='add'>+		return result;</div><div class='add'>+	}</div><div class='add'>+	hw-&gt;bufinfo.page = hfa384x2host_16(hw-&gt;bufinfo.page);</div><div class='add'>+	hw-&gt;bufinfo.offset = hfa384x2host_16(hw-&gt;bufinfo.offset);</div><div class='add'>+	hw-&gt;bufinfo.len = hfa384x2host_16(hw-&gt;bufinfo.len);</div><div class='add'>+	if ( (result = hfa384x_drvr_getconfig16(hw, HFA384x_RID_MAXLOADTIME,</div><div class='add'>+				&amp;(hw-&gt;dltimeout))) ) {</div><div class='add'>+		return result;</div><div class='add'>+	}</div><div class='add'>+	hw-&gt;dltimeout = hfa384x2host_16(hw-&gt;dltimeout);</div><div class='add'>+</div><div class='add'>+	/* Enable the aux port */</div><div class='add'>+	if ( (result = hfa384x_cmd_aux_enable(hw, 0)) ) {</div><div class='add'>+		return result;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hw-&gt;dlstate = HFA384x_DLSTATE_FLASHENABLED;</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_drvr_flashdl_disable</div><div class='add'>+*</div><div class='add'>+* Ends the flash download state.  Note that this will cause the MAC</div><div class='add'>+* firmware to restart.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw		device structure</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0		success</div><div class='add'>+*	&gt;0		f/w reported error - f/w status code</div><div class='add'>+*	&lt;0		driver reported error</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int hfa384x_drvr_flashdl_disable(hfa384x_t *hw)</div><div class='add'>+{</div><div class='add'>+	DBFENTER;</div><div class='add'>+	/* Check that we're already in the download state */</div><div class='add'>+	if ( hw-&gt;dlstate != HFA384x_DLSTATE_FLASHENABLED ) {</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* There isn't much we can do at this point, so I don't */</div><div class='add'>+	/*  bother  w/ the return value */</div><div class='add'>+	hfa384x_cmd_download(hw, HFA384x_PROGMODE_DISABLE, 0, 0 , 0);</div><div class='add'>+	hw-&gt;dlstate = HFA384x_DLSTATE_DISABLED;</div><div class='add'>+</div><div class='add'>+	/* Disable the aux port */</div><div class='add'>+	hfa384x_cmd_aux_disable(hw);</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_drvr_flashdl_write</div><div class='add'>+*</div><div class='add'>+* Performs a FLASH download of a chunk of data. First checks to see</div><div class='add'>+* that we're in the FLASH download state, then sets the download</div><div class='add'>+* mode, uses the aux functions to 1) copy the data to the flash</div><div class='add'>+* buffer, 2) sets the download 'write flash' mode, 3) readback and</div><div class='add'>+* compare.  Lather rinse, repeat as many times an necessary to get</div><div class='add'>+* all the given data into flash.</div><div class='add'>+* When all data has been written using this function (possibly</div><div class='add'>+* repeatedly), call drvr_flashdl_disable() to end the download state</div><div class='add'>+* and restart the MAC.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw		device structure</div><div class='add'>+*	daddr		Card address to write to. (host order)</div><div class='add'>+*	buf		Ptr to data to write.</div><div class='add'>+*	len		Length of data (host order).</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0		success</div><div class='add'>+*	&gt;0		f/w reported error - f/w status code</div><div class='add'>+*	&lt;0		driver reported error</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int hfa384x_drvr_flashdl_write(hfa384x_t *hw, UINT32 daddr, void* buf, UINT32 len)</div><div class='add'>+{</div><div class='add'>+	int		result = 0;</div><div class='add'>+	UINT8		*verbuf;</div><div class='add'>+	UINT32		dlbufaddr;</div><div class='add'>+	UINT32		currlen;</div><div class='add'>+	UINT32		currdaddr;</div><div class='add'>+	UINT16		destlo;</div><div class='add'>+	UINT16		desthi;</div><div class='add'>+	int		nwrites;</div><div class='add'>+	int		i;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+	/* Check that we're in the flash download state */</div><div class='add'>+	if ( hw-&gt;dlstate != HFA384x_DLSTATE_FLASHENABLED ) {</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	WLAN_LOG_INFO("Download %d bytes to flash @0x%06x\n", len, daddr);</div><div class='add'>+</div><div class='add'>+	/* Need a flat address for arithmetic */</div><div class='add'>+	dlbufaddr = HFA384x_ADDR_AUX_MKFLAT(</div><div class='add'>+			hw-&gt;bufinfo.page,</div><div class='add'>+			hw-&gt;bufinfo.offset);</div><div class='add'>+	verbuf = kmalloc(hw-&gt;bufinfo.len, GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+#if 0</div><div class='add'>+WLAN_LOG_WARNING("dlbuf@0x%06lx len=%d to=%d\n", dlbufaddr, hw-&gt;bufinfo.len, hw-&gt;dltimeout);</div><div class='add'>+#endif</div><div class='add'>+	/* Figure out how many times to to the flash prog */</div><div class='add'>+	nwrites = len / hw-&gt;bufinfo.len;</div><div class='add'>+	nwrites += (len % hw-&gt;bufinfo.len) ? 1 : 0;</div><div class='add'>+</div><div class='add'>+	if ( verbuf == NULL ) {</div><div class='add'>+		WLAN_LOG_ERROR("Failed to allocate flash verify buffer\n");</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+	/* For each */</div><div class='add'>+	for ( i = 0; i &lt; nwrites; i++) {</div><div class='add'>+		/* Get the dest address and len */</div><div class='add'>+		currlen = (len - (hw-&gt;bufinfo.len * i)) &gt; hw-&gt;bufinfo.len ?</div><div class='add'>+				hw-&gt;bufinfo.len :</div><div class='add'>+				(len - (hw-&gt;bufinfo.len * i));</div><div class='add'>+		currdaddr = daddr + (hw-&gt;bufinfo.len * i);</div><div class='add'>+		destlo = HFA384x_ADDR_CMD_MKOFF(currdaddr);</div><div class='add'>+		desthi = HFA384x_ADDR_CMD_MKPAGE(currdaddr);</div><div class='add'>+		WLAN_LOG_INFO("Writing %d bytes to flash @0x%06x\n", currlen, currdaddr);</div><div class='add'>+#if 0</div><div class='add'>+WLAN_HEX_DUMP(1, "dldata", buf+(hw-&gt;bufinfo.len*i), currlen);</div><div class='add'>+#endif</div><div class='add'>+		/* Set the download mode */</div><div class='add'>+		result = hfa384x_cmd_download(hw, HFA384x_PROGMODE_NV,</div><div class='add'>+				destlo, desthi, currlen);</div><div class='add'>+		if ( result ) {</div><div class='add'>+			WLAN_LOG_ERROR("download(NV,lo=%x,hi=%x,len=%x) "</div><div class='add'>+				"cmd failed, result=%d. Aborting d/l\n",</div><div class='add'>+				destlo, desthi, currlen, result);</div><div class='add'>+			goto exit_proc;</div><div class='add'>+		}</div><div class='add'>+		/* copy the data to the flash buffer */</div><div class='add'>+		hfa384x_copy_to_aux(hw, dlbufaddr, HFA384x_AUX_CTL_EXTDS,</div><div class='add'>+					buf+(hw-&gt;bufinfo.len*i), currlen);</div><div class='add'>+		/* set the download 'write flash' mode */</div><div class='add'>+		result = hfa384x_cmd_download(hw, HFA384x_PROGMODE_NVWRITE, 0,0,0);</div><div class='add'>+		if ( result ) {</div><div class='add'>+			WLAN_LOG_ERROR(</div><div class='add'>+				"download(NVWRITE,lo=%x,hi=%x,len=%x) "</div><div class='add'>+				"cmd failed, result=%d. Aborting d/l\n",</div><div class='add'>+				destlo, desthi, currlen, result);</div><div class='add'>+			goto exit_proc;</div><div class='add'>+		}</div><div class='add'>+		/* readback and compare, if fail...bail */</div><div class='add'>+		hfa384x_copy_from_aux(hw,</div><div class='add'>+				currdaddr, HFA384x_AUX_CTL_NV,</div><div class='add'>+				verbuf, currlen);</div><div class='add'>+</div><div class='add'>+		if ( memcmp(buf+(hw-&gt;bufinfo.len*i), verbuf, currlen) ) {</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+exit_proc:</div><div class='add'>+         /* DOH! This kfree's for you Mark :-) My forehead hurts... */</div><div class='add'>+         kfree(verbuf);</div><div class='add'>+</div><div class='add'>+	/* Leave the firmware in the 'post-prog' mode.  flashdl_disable will */</div><div class='add'>+	/*  actually disable programming mode.  Remember, that will cause the */</div><div class='add'>+	/*  the firmware to effectively reset itself. */</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_cmd_initialize</div><div class='add'>+*</div><div class='add'>+* Issues the initialize command and sets the hw-&gt;state based</div><div class='add'>+* on the result.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw		device structure</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0		success</div><div class='add'>+*	&gt;0		f/w reported error - f/w status code</div><div class='add'>+*	&lt;0		driver reported error</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int hfa384x_cmd_initialize(hfa384x_t *hw)</div><div class='add'>+{</div><div class='add'>+	int result = 0;</div><div class='add'>+	int i;</div><div class='add'>+	hfa384x_metacmd_t cmd;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	/* we don't want to be interrupted during the reset */</div><div class='add'>+	hfa384x_setreg(hw, 0, HFA384x_INTEN);</div><div class='add'>+	hfa384x_setreg(hw, 0xffff, HFA384x_EVACK);</div><div class='add'>+</div><div class='add'>+	cmd.cmd = HFA384x_CMDCODE_INIT;</div><div class='add'>+	cmd.parm0 = 0;</div><div class='add'>+	cmd.parm1 = 0;</div><div class='add'>+	cmd.parm2 = 0;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;hw-&gt;cmdlock);</div><div class='add'>+	result = hfa384x_docmd_wait(hw, &amp;cmd);</div><div class='add'>+	spin_unlock_bh(&amp;hw-&gt;cmdlock);</div><div class='add'>+</div><div class='add'>+	if ( result == 0 ) {</div><div class='add'>+		for ( i = 0; i &lt; HFA384x_NUMPORTS_MAX; i++) {</div><div class='add'>+			hw-&gt;port_enabled[i] = 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+        hw-&gt;link_status = HFA384x_LINK_NOTCONNECTED;</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_drvr_commtallies</div><div class='add'>+*</div><div class='add'>+* Send a commtallies inquiry to the MAC.  Note that this is an async</div><div class='add'>+* call that will result in an info frame arriving sometime later.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw		device structure</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	zero		success.</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int hfa384x_drvr_commtallies( hfa384x_t *hw )</div><div class='add'>+{</div><div class='add'>+	hfa384x_metacmd_t cmd;</div><div class='add'>+	int result;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	cmd.cmd = HFA384x_CMDCODE_INQ;</div><div class='add'>+	cmd.parm0 = HFA384x_IT_COMMTALLIES;</div><div class='add'>+	cmd.parm1 = 0;</div><div class='add'>+	cmd.parm2 = 0;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;hw-&gt;cmdlock);</div><div class='add'>+	result = hfa384x_docmd_wait(hw, &amp;cmd);</div><div class='add'>+	spin_unlock_bh(&amp;hw-&gt;cmdlock);</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_drvr_enable</div><div class='add'>+*</div><div class='add'>+* Issues the enable command to enable communications on one of</div><div class='add'>+* the MACs 'ports'.  Only macport 0 is valid  for stations.</div><div class='add'>+* APs may also enable macports 1-6.  Only ports that are currently</div><div class='add'>+* disabled may be enabled.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw		device structure</div><div class='add'>+*	macport		MAC port number</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0		success</div><div class='add'>+*	&gt;0		f/w reported failure - f/w status code</div><div class='add'>+*	&lt;0		driver reported error (timeout|bad arg)</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int hfa384x_drvr_enable(hfa384x_t *hw, UINT16 macport)</div><div class='add'>+{</div><div class='add'>+	int	result = 0;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+	if ((!hw-&gt;isap &amp;&amp; macport != 0) ||</div><div class='add'>+	    (hw-&gt;isap &amp;&amp; !(macport &lt;= HFA384x_PORTID_MAX)) ||</div><div class='add'>+	    (hw-&gt;port_enabled[macport]) ){</div><div class='add'>+		result = -EINVAL;</div><div class='add'>+	} else {</div><div class='add'>+		result = hfa384x_cmd_enable(hw, macport);</div><div class='add'>+		if ( result == 0 ) {</div><div class='add'>+			hw-&gt;port_enabled[macport] = 1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_cmd_enable</div><div class='add'>+*</div><div class='add'>+* Issues the the enable command to enable communications on one of the</div><div class='add'>+* MACs 'ports'.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw		device structure</div><div class='add'>+*	macport		MAC port number</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0		success</div><div class='add'>+*	&gt;0		f/w reported failure - f/w status code</div><div class='add'>+*	&lt;0		driver reported error (timeout|bad arg)</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int hfa384x_cmd_enable(hfa384x_t *hw, UINT16 macport)</div><div class='add'>+{</div><div class='add'>+	int	result = 0;</div><div class='add'>+	hfa384x_metacmd_t cmd;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	cmd.cmd = HFA384x_CMD_CMDCODE_SET(HFA384x_CMDCODE_ENABLE) |</div><div class='add'>+		  HFA384x_CMD_MACPORT_SET(macport);</div><div class='add'>+	cmd.parm0 = 0;</div><div class='add'>+	cmd.parm1 = 0;</div><div class='add'>+	cmd.parm2 = 0;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;hw-&gt;cmdlock);</div><div class='add'>+	result = hfa384x_docmd_wait(hw, &amp;cmd);</div><div class='add'>+	spin_unlock_bh(&amp;hw-&gt;cmdlock);</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_drvr_disable</div><div class='add'>+*</div><div class='add'>+* Issues the disable command to stop communications on one of</div><div class='add'>+* the MACs 'ports'.  Only macport 0 is valid  for stations.</div><div class='add'>+* APs may also disable macports 1-6.  Only ports that have been</div><div class='add'>+* previously enabled may be disabled.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw		device structure</div><div class='add'>+*	macport		MAC port number (host order)</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0		success</div><div class='add'>+*	&gt;0		f/w reported failure - f/w status code</div><div class='add'>+*	&lt;0		driver reported error (timeout|bad arg)</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int hfa384x_drvr_disable(hfa384x_t *hw, UINT16 macport)</div><div class='add'>+{</div><div class='add'>+	int	result = 0;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+	if ((!hw-&gt;isap &amp;&amp; macport != 0) ||</div><div class='add'>+	    (hw-&gt;isap &amp;&amp; !(macport &lt;= HFA384x_PORTID_MAX)) ||</div><div class='add'>+	    !(hw-&gt;port_enabled[macport]) ){</div><div class='add'>+		result = -EINVAL;</div><div class='add'>+	} else {</div><div class='add'>+		result = hfa384x_cmd_disable(hw, macport);</div><div class='add'>+		if ( result == 0 ) {</div><div class='add'>+			hw-&gt;port_enabled[macport] = 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_cmd_disable</div><div class='add'>+*</div><div class='add'>+* Issues the command to disable a port.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw		device structure</div><div class='add'>+*	macport		MAC port number (host order)</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0		success</div><div class='add'>+*	&gt;0		f/w reported failure - f/w status code</div><div class='add'>+*	&lt;0		driver reported error (timeout|bad arg)</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int hfa384x_cmd_disable(hfa384x_t *hw, UINT16 macport)</div><div class='add'>+{</div><div class='add'>+	int	result = 0;</div><div class='add'>+	hfa384x_metacmd_t cmd;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	cmd.cmd = HFA384x_CMD_CMDCODE_SET(HFA384x_CMDCODE_DISABLE) |</div><div class='add'>+		  HFA384x_CMD_MACPORT_SET(macport);</div><div class='add'>+	cmd.parm0 = 0;</div><div class='add'>+	cmd.parm1 = 0;</div><div class='add'>+	cmd.parm2 = 0;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;hw-&gt;cmdlock);</div><div class='add'>+	result = hfa384x_docmd_wait(hw, &amp;cmd);</div><div class='add'>+	spin_unlock_bh(&amp;hw-&gt;cmdlock);</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_cmd_diagnose</div><div class='add'>+*</div><div class='add'>+* Issues the diagnose command to test the: register interface,</div><div class='add'>+* MAC controller (including loopback), External RAM, Non-volatile</div><div class='add'>+* memory integrity, and synthesizers.  Following execution of this</div><div class='add'>+* command, MAC/firmware are in the 'initial state'.  Therefore,</div><div class='add'>+* the Initialize command should be issued after successful</div><div class='add'>+* completion of this command.  This function may only be called</div><div class='add'>+* when the MAC is in the 'communication disabled' state.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw		device structure</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0		success</div><div class='add'>+*	&gt;0		f/w reported failure - f/w status code</div><div class='add'>+*	&lt;0		driver reported error (timeout|bad arg)</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+#define DIAG_PATTERNA ((UINT16)0xaaaa)</div><div class='add'>+#define DIAG_PATTERNB ((UINT16)0x5555)</div><div class='add'>+</div><div class='add'>+int hfa384x_cmd_diagnose(hfa384x_t *hw)</div><div class='add'>+{</div><div class='add'>+	int	result = 0;</div><div class='add'>+	hfa384x_metacmd_t cmd;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	cmd.cmd = HFA384x_CMD_CMDCODE_SET(HFA384x_CMDCODE_DIAG);</div><div class='add'>+	cmd.parm0 = DIAG_PATTERNA;</div><div class='add'>+	cmd.parm1 = DIAG_PATTERNB;</div><div class='add'>+	cmd.parm2 = 0;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;hw-&gt;cmdlock);</div><div class='add'>+	result = hfa384x_docmd_wait(hw, &amp;cmd);</div><div class='add'>+	spin_unlock_bh(&amp;hw-&gt;cmdlock);</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_cmd_allocate</div><div class='add'>+*</div><div class='add'>+* Issues the allocate command instructing the firmware to allocate</div><div class='add'>+* a 'frame structure buffer' in MAC controller RAM.  This command</div><div class='add'>+* does not provide the result, it only initiates one of the f/w's</div><div class='add'>+* asynchronous processes to construct the buffer.  When the</div><div class='add'>+* allocation is complete, it will be indicated via the Alloc</div><div class='add'>+* bit in the EvStat register and the FID identifying the allocated</div><div class='add'>+* space will be available from the AllocFID register.  Some care</div><div class='add'>+* should be taken when waiting for the Alloc event.  If a Tx or</div><div class='add'>+* Notify command w/ Reclaim has been previously executed, it's</div><div class='add'>+* possible the first Alloc event after execution of this command</div><div class='add'>+* will be for the reclaimed buffer and not the one you asked for.</div><div class='add'>+* This case must be handled in the Alloc event handler.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw		device structure</div><div class='add'>+*	len		allocation length, must be an even value</div><div class='add'>+*			in the range [4-2400]. (host order)</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0		success</div><div class='add'>+*	&gt;0		f/w reported failure - f/w status code</div><div class='add'>+*	&lt;0		driver reported error (timeout|bad arg)</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int hfa384x_cmd_allocate(hfa384x_t *hw, UINT16 len)</div><div class='add'>+{</div><div class='add'>+	int	result = 0;</div><div class='add'>+	hfa384x_metacmd_t cmd;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	if ( (len % 2) ||</div><div class='add'>+	     len &lt; HFA384x_CMD_ALLOC_LEN_MIN ||</div><div class='add'>+	     len &gt; HFA384x_CMD_ALLOC_LEN_MAX ) {</div><div class='add'>+		result = -EINVAL;</div><div class='add'>+	} else {</div><div class='add'>+		cmd.cmd = HFA384x_CMD_CMDCODE_SET(HFA384x_CMDCODE_ALLOC);</div><div class='add'>+		cmd.parm0 = len;</div><div class='add'>+		cmd.parm1 = 0;</div><div class='add'>+		cmd.parm2 = 0;</div><div class='add'>+</div><div class='add'>+		spin_lock_bh(&amp;hw-&gt;cmdlock);</div><div class='add'>+		result = hfa384x_docmd_wait(hw, &amp;cmd);</div><div class='add'>+		spin_unlock_bh(&amp;hw-&gt;cmdlock);</div><div class='add'>+	}</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_cmd_transmit</div><div class='add'>+*</div><div class='add'>+* Instructs the firmware to transmit a frame previously copied</div><div class='add'>+* to a given buffer.  This function returns immediately, the Tx</div><div class='add'>+* results are available via the Tx or TxExc events (if the frame</div><div class='add'>+* control bits are set).  The reclaim argument specifies if the</div><div class='add'>+* FID passed will be used by the f/w tx process or returned for</div><div class='add'>+* use w/ another transmit command.  If reclaim is set, expect an</div><div class='add'>+* Alloc event signalling the availibility of the FID for reuse.</div><div class='add'>+*</div><div class='add'>+* NOTE: hw-&gt;cmdlock MUST BE HELD before calling this function!</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw		device structure</div><div class='add'>+*	reclaim		[0|1] indicates whether the given FID will</div><div class='add'>+*			be handed back (via Alloc event) for reuse.</div><div class='add'>+*			(host order)</div><div class='add'>+*	qos		[0-3] Value to put in the QoS field of the</div><div class='add'>+*			tx command, identifies a queue to place the</div><div class='add'>+*			outgoing frame in.</div><div class='add'>+*			(host order)</div><div class='add'>+*	fid		FID of buffer containing the frame that was</div><div class='add'>+*			previously copied to MAC memory via the bap.</div><div class='add'>+*			(host order)</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0		success</div><div class='add'>+*	&gt;0		f/w reported failure - f/w status code</div><div class='add'>+*	&lt;0		driver reported error (timeout|bad arg)</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*	hw-&gt;resp0 will contain the FID being used by async tx</div><div class='add'>+*	process.  If reclaim==0, resp0 will be the same as the fid</div><div class='add'>+*	argument.  If reclaim==1, resp0 will be the different and</div><div class='add'>+*	is the value to watch for in the Tx|TxExc to indicate completion</div><div class='add'>+*	of the frame passed in fid.</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int hfa384x_cmd_transmit(hfa384x_t *hw, UINT16 reclaim, UINT16 qos, UINT16 fid)</div><div class='add'>+{</div><div class='add'>+	int	result = 0;</div><div class='add'>+	hfa384x_metacmd_t cmd;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+	cmd.cmd = HFA384x_CMD_CMDCODE_SET(HFA384x_CMDCODE_TX) |</div><div class='add'>+		HFA384x_CMD_RECL_SET(reclaim) |</div><div class='add'>+		HFA384x_CMD_QOS_SET(qos);</div><div class='add'>+	cmd.parm0 = fid;</div><div class='add'>+	cmd.parm1 = 0;</div><div class='add'>+	cmd.parm2 = 0;</div><div class='add'>+</div><div class='add'>+	result = hfa384x_docmd_wait(hw, &amp;cmd);</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_cmd_clearpersist</div><div class='add'>+*</div><div class='add'>+* Instructs the firmware to clear the persistence bit in a given</div><div class='add'>+* FID.  This has the effect of telling the firmware to drop the</div><div class='add'>+* persistent frame.  The FID must be one that was previously used</div><div class='add'>+* to transmit a PRST frame.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw		device structure</div><div class='add'>+*	fid		FID of the persistent frame (host order)</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0		success</div><div class='add'>+*	&gt;0		f/w reported failure - f/w status code</div><div class='add'>+*	&lt;0		driver reported error (timeout|bad arg)</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int hfa384x_cmd_clearpersist(hfa384x_t *hw, UINT16 fid)</div><div class='add'>+{</div><div class='add'>+	int	result = 0;</div><div class='add'>+	hfa384x_metacmd_t cmd;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	cmd.cmd = HFA384x_CMD_CMDCODE_SET(HFA384x_CMDCODE_CLRPRST);</div><div class='add'>+	cmd.parm0 = fid;</div><div class='add'>+	cmd.parm1 = 0;</div><div class='add'>+	cmd.parm2 = 0;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;hw-&gt;cmdlock);</div><div class='add'>+	result = hfa384x_docmd_wait(hw, &amp;cmd);</div><div class='add'>+	spin_unlock_bh(&amp;hw-&gt;cmdlock);</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_cmd_notify</div><div class='add'>+*</div><div class='add'>+* Sends an info frame to the firmware to alter the behavior</div><div class='add'>+* of the f/w asynch processes.  Can only be called when the MAC</div><div class='add'>+* is in the enabled state.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw		device structure</div><div class='add'>+*	reclaim		[0|1] indicates whether the given FID will</div><div class='add'>+*			be handed back (via Alloc event) for reuse.</div><div class='add'>+*			(host order)</div><div class='add'>+*	fid		FID of buffer containing the frame that was</div><div class='add'>+*			previously copied to MAC memory via the bap.</div><div class='add'>+*			(host order)</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0		success</div><div class='add'>+*	&gt;0		f/w reported failure - f/w status code</div><div class='add'>+*	&lt;0		driver reported error (timeout|bad arg)</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*	hw-&gt;resp0 will contain the FID being used by async notify</div><div class='add'>+*	process.  If reclaim==0, resp0 will be the same as the fid</div><div class='add'>+*	argument.  If reclaim==1, resp0 will be the different.</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int hfa384x_cmd_notify(hfa384x_t *hw, UINT16 reclaim, UINT16 fid,</div><div class='add'>+		       void *buf, UINT16 len)</div><div class='add'>+{</div><div class='add'>+	int	result = 0;</div><div class='add'>+	hfa384x_metacmd_t cmd;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+	cmd.cmd = HFA384x_CMD_CMDCODE_SET(HFA384x_CMDCODE_NOTIFY) |</div><div class='add'>+		HFA384x_CMD_RECL_SET(reclaim);</div><div class='add'>+	cmd.parm0 = fid;</div><div class='add'>+	cmd.parm1 = 0;</div><div class='add'>+	cmd.parm2 = 0;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;hw-&gt;cmdlock);</div><div class='add'>+</div><div class='add'>+        /* Copy the record to FID */</div><div class='add'>+        result = hfa384x_copy_to_bap(hw, HFA384x_BAP_PROC, hw-&gt;infofid, 0, buf, len);</div><div class='add'>+        if ( result ) {</div><div class='add'>+                WLAN_LOG_DEBUG(1,</div><div class='add'>+			"copy_to_bap(%04x, 0, %d) failed, result=0x%x\n",</div><div class='add'>+                        hw-&gt;infofid, len, result);</div><div class='add'>+		result = -EIO;</div><div class='add'>+                goto failed;</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+	result = hfa384x_docmd_wait(hw, &amp;cmd);</div><div class='add'>+</div><div class='add'>+ failed:</div><div class='add'>+	spin_unlock_bh(&amp;hw-&gt;cmdlock);</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#if 0</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_cmd_inquiry</div><div class='add'>+*</div><div class='add'>+* Requests an info frame from the firmware.  The info frame will</div><div class='add'>+* be delivered asynchronously via the Info event.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw		device structure</div><div class='add'>+*	fid		FID of the info frame requested. (host order)</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0		success</div><div class='add'>+*	&gt;0		f/w reported failure - f/w status code</div><div class='add'>+*	&lt;0		driver reported error (timeout|bad arg)</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+static int hfa384x_cmd_inquiry(hfa384x_t *hw, UINT16 fid)</div><div class='add'>+{</div><div class='add'>+	int	result = 0;</div><div class='add'>+	hfa384x_metacmd_t cmd;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	cmd.cmd = HFA384x_CMD_CMDCODE_SET(HFA384x_CMDCODE_INQ);</div><div class='add'>+	cmd.parm0 = fid;</div><div class='add'>+	cmd.parm1 = 0;</div><div class='add'>+	cmd.parm2 = 0;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;hw-&gt;cmdlock);</div><div class='add'>+	result = hfa384x_docmd_wait(hw, &amp;cmd);</div><div class='add'>+	spin_unlock_bh(&amp;hw-&gt;cmdlock);</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_cmd_access</div><div class='add'>+*</div><div class='add'>+* Requests that a given record be copied to/from the record</div><div class='add'>+* buffer.  If we're writing from the record buffer, the contents</div><div class='add'>+* must previously have been written to the record buffer via the</div><div class='add'>+* bap.  If we're reading into the record buffer, the record can</div><div class='add'>+* be read out of the record buffer after this call.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw		device structure</div><div class='add'>+*	write		[0|1] copy the record buffer to the given</div><div class='add'>+*			configuration record. (host order)</div><div class='add'>+*	rid		RID of the record to read/write. (host order)</div><div class='add'>+*	buf		host side record buffer.  Upon return it will</div><div class='add'>+*			contain the body portion of the record (minus the</div><div class='add'>+*			RID and len).</div><div class='add'>+*	len		buffer length (in bytes, should match record length)</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0		success</div><div class='add'>+*	&gt;0		f/w reported failure - f/w status code</div><div class='add'>+*	&lt;0		driver reported error (timeout|bad arg)</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int hfa384x_cmd_access(hfa384x_t *hw, UINT16 write, UINT16 rid,</div><div class='add'>+		       void* buf, UINT16 len)</div><div class='add'>+{</div><div class='add'>+	int	result = 0;</div><div class='add'>+	hfa384x_metacmd_t cmd;</div><div class='add'>+	hfa384x_rec_t	rec;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+#if (LINUX_VERSION_CODE &gt;= KERNEL_VERSION(2,4,0))</div><div class='add'>+	/* This should NOT be called in interrupt context! */</div><div class='add'>+	if (in_irq()) {</div><div class='add'>+		WLAN_LOG_ERROR("Krap, in Interrupt context!");</div><div class='add'>+#ifdef WLAN_INCLUDE_DEBUG</div><div class='add'>+		BUG();</div><div class='add'>+#endif</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	spin_lock_bh(&amp;hw-&gt;cmdlock);</div><div class='add'>+</div><div class='add'>+	if (write) {</div><div class='add'>+		rec.rid = host2hfa384x_16(rid);</div><div class='add'>+		rec.reclen = host2hfa384x_16((len/2) + 1); /* note conversion to words, +1 for rid field */</div><div class='add'>+		/* write the record */</div><div class='add'>+		result = hfa384x_copy_to_bap4( hw, HFA384x_BAP_PROC, rid, 0,</div><div class='add'>+					       &amp;rec, sizeof(rec),</div><div class='add'>+					       buf, len,</div><div class='add'>+					       NULL, 0, NULL, 0);</div><div class='add'>+		if ( result ) {</div><div class='add'>+			WLAN_LOG_DEBUG(3,"Failure writing record header+data\n");</div><div class='add'>+			goto fail;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cmd.cmd = HFA384x_CMD_CMDCODE_SET(HFA384x_CMDCODE_ACCESS) |</div><div class='add'>+		HFA384x_CMD_WRITE_SET(write);</div><div class='add'>+	cmd.parm0 = rid;</div><div class='add'>+	cmd.parm1 = 0;</div><div class='add'>+	cmd.parm2 = 0;</div><div class='add'>+</div><div class='add'>+	result = hfa384x_docmd_wait(hw, &amp;cmd);</div><div class='add'>+	if ( result ) {</div><div class='add'>+		WLAN_LOG_ERROR("Call to hfa384x_docmd_wait failed (%d %d)\n",</div><div class='add'>+				result, cmd.result.resp0);</div><div class='add'>+		goto fail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!write) {</div><div class='add'>+		result = hfa384x_copy_from_bap( hw, HFA384x_BAP_PROC, rid, 0, &amp;rec, sizeof(rec));</div><div class='add'>+		if ( result ) {</div><div class='add'>+			WLAN_LOG_DEBUG(3,"Call to hfa384x_copy_from_bap failed\n");</div><div class='add'>+			goto fail;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Validate the record length */</div><div class='add'>+		if ( ((hfa384x2host_16(rec.reclen)-1)*2) != len ) {  /* note body len calculation in bytes */</div><div class='add'>+			WLAN_LOG_DEBUG(1, "RID len mismatch, rid=0x%04x hlen=%d fwlen=%d\n",</div><div class='add'>+					rid, len, (hfa384x2host_16(rec.reclen)-1)*2);</div><div class='add'>+			result = -ENODATA;</div><div class='add'>+			goto fail;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		result = hfa384x_copy_from_bap( hw, HFA384x_BAP_PROC, rid, sizeof(rec), buf, len);</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+ fail:</div><div class='add'>+	spin_unlock_bh(&amp;hw-&gt;cmdlock);</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_cmd_monitor</div><div class='add'>+*</div><div class='add'>+* Enables the 'monitor mode' of the MAC.  Here's the description of</div><div class='add'>+* monitor mode that I've received thus far:</div><div class='add'>+*</div><div class='add'>+*  "The "monitor mode" of operation is that the MAC passes all</div><div class='add'>+*  frames for which the PLCP checks are correct. All received</div><div class='add'>+*  MPDUs are passed to the host with MAC Port = 7, with a</div><div class='add'>+*  receive status of good, FCS error, or undecryptable. Passing</div><div class='add'>+*  certain MPDUs is a violation of the 802.11 standard, but useful</div><div class='add'>+*  for a debugging tool."  Normal communication is not possible</div><div class='add'>+*  while monitor mode is enabled.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw		device structure</div><div class='add'>+*	enable		a code (0x0b|0x0f) that enables/disables</div><div class='add'>+*			monitor mode. (host order)</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0		success</div><div class='add'>+*	&gt;0		f/w reported failure - f/w status code</div><div class='add'>+*	&lt;0		driver reported error (timeout|bad arg)</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int hfa384x_cmd_monitor(hfa384x_t *hw, UINT16 enable)</div><div class='add'>+{</div><div class='add'>+	int	result = 0;</div><div class='add'>+	hfa384x_metacmd_t cmd;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	cmd.cmd = HFA384x_CMD_CMDCODE_SET(HFA384x_CMDCODE_MONITOR) |</div><div class='add'>+		HFA384x_CMD_AINFO_SET(enable);</div><div class='add'>+	cmd.parm0 = 0;</div><div class='add'>+	cmd.parm1 = 0;</div><div class='add'>+	cmd.parm2 = 0;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;hw-&gt;cmdlock);</div><div class='add'>+	result = hfa384x_docmd_wait(hw, &amp;cmd);</div><div class='add'>+	spin_unlock_bh(&amp;hw-&gt;cmdlock);</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_cmd_download</div><div class='add'>+*</div><div class='add'>+* Sets the controls for the MAC controller code/data download</div><div class='add'>+* process.  The arguments set the mode and address associated</div><div class='add'>+* with a download.  Note that the aux registers should be enabled</div><div class='add'>+* prior to setting one of the download enable modes.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw		device structure</div><div class='add'>+*	mode		0 - Disable programming and begin code exec</div><div class='add'>+*			1 - Enable volatile mem programming</div><div class='add'>+*			2 - Enable non-volatile mem programming</div><div class='add'>+*			3 - Program non-volatile section from NV download</div><div class='add'>+*			    buffer.</div><div class='add'>+*			(host order)</div><div class='add'>+*	lowaddr</div><div class='add'>+*	highaddr	For mode 1, sets the high &amp; low order bits of</div><div class='add'>+*			the "destination address".  This address will be</div><div class='add'>+*			the execution start address when download is</div><div class='add'>+*			subsequently disabled.</div><div class='add'>+*			For mode 2, sets the high &amp; low order bits of</div><div class='add'>+*			the destination in NV ram.</div><div class='add'>+*			For modes 0 &amp; 3, should be zero. (host order)</div><div class='add'>+*			NOTE: these address args are in CMD format</div><div class='add'>+*	codelen		Length of the data to write in mode 2,</div><div class='add'>+*			zero otherwise. (host order)</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0		success</div><div class='add'>+*	&gt;0		f/w reported failure - f/w status code</div><div class='add'>+*	&lt;0		driver reported error (timeout|bad arg)</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int hfa384x_cmd_download(hfa384x_t *hw, UINT16 mode, UINT16 lowaddr,</div><div class='add'>+				UINT16 highaddr, UINT16 codelen)</div><div class='add'>+{</div><div class='add'>+	int	result = 0;</div><div class='add'>+	hfa384x_metacmd_t cmd;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	cmd.cmd = HFA384x_CMD_CMDCODE_SET(HFA384x_CMDCODE_DOWNLD) |</div><div class='add'>+		HFA384x_CMD_PROGMODE_SET(mode);</div><div class='add'>+	cmd.parm0 = lowaddr;</div><div class='add'>+	cmd.parm1 = highaddr;</div><div class='add'>+	cmd.parm2 = codelen;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;hw-&gt;cmdlock);</div><div class='add'>+	result = hfa384x_dl_docmd_wait(hw, &amp;cmd);</div><div class='add'>+	spin_unlock_bh(&amp;hw-&gt;cmdlock);</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_cmd_aux_enable</div><div class='add'>+*</div><div class='add'>+* Goes through the process of enabling the auxilary port.  This</div><div class='add'>+* is necessary prior to raw reads/writes to card data space.</div><div class='add'>+* Direct access to the card data space is only used for downloading</div><div class='add'>+* code and debugging.</div><div class='add'>+* Note that a call to this function is required before attempting</div><div class='add'>+* a download.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw		device structure</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0		success</div><div class='add'>+*	&gt;0		f/w reported failure - f/w status code</div><div class='add'>+*	&lt;0		driver reported error (timeout)</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int hfa384x_cmd_aux_enable(hfa384x_t *hw, int force)</div><div class='add'>+{</div><div class='add'>+	int		result = -ETIMEDOUT;</div><div class='add'>+	unsigned long	flags;</div><div class='add'>+	UINT32		retries_remaining;</div><div class='add'>+	UINT16		reg;</div><div class='add'>+	UINT		auxen_mirror = hw-&gt;auxen;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	/* Check for existing enable */</div><div class='add'>+	if ( hw-&gt;auxen ) {</div><div class='add'>+		hw-&gt;auxen++;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* acquire the lock */</div><div class='add'>+	spin_lock_irqsave( &amp;(hw-&gt;cmdlock), flags);</div><div class='add'>+	/* wait for cmd register busy bit to clear */</div><div class='add'>+	retries_remaining = 100000;</div><div class='add'>+	do {</div><div class='add'>+		reg = hfa384x_getreg(hw, HFA384x_CMD);</div><div class='add'>+		udelay(10);</div><div class='add'>+	}</div><div class='add'>+	while (HFA384x_CMD_ISBUSY(reg) &amp;&amp; --retries_remaining);</div><div class='add'>+	if (retries_remaining != 0) {</div><div class='add'>+		/* busy bit clear, it's OK to write to ParamX regs */</div><div class='add'>+		hfa384x_setreg(hw, HFA384x_AUXPW0,</div><div class='add'>+			HFA384x_PARAM0);</div><div class='add'>+		hfa384x_setreg(hw, HFA384x_AUXPW1,</div><div class='add'>+			HFA384x_PARAM1);</div><div class='add'>+		hfa384x_setreg(hw, HFA384x_AUXPW2,</div><div class='add'>+			HFA384x_PARAM2);</div><div class='add'>+</div><div class='add'>+		/* Set the aux enable in the Control register */</div><div class='add'>+		hfa384x_setreg(hw, HFA384x_CONTROL_AUX_DOENABLE,</div><div class='add'>+			HFA384x_CONTROL);</div><div class='add'>+</div><div class='add'>+		/* Now wait for completion */</div><div class='add'>+		retries_remaining = 100000;</div><div class='add'>+		do {</div><div class='add'>+			reg = hfa384x_getreg(hw, HFA384x_CONTROL);</div><div class='add'>+			udelay(10);</div><div class='add'>+		}</div><div class='add'>+		while ( ((reg &amp; (BIT14|BIT15)) != HFA384x_CONTROL_AUX_ISENABLED) &amp;&amp;</div><div class='add'>+			--retries_remaining );</div><div class='add'>+		if (retries_remaining != 0) {</div><div class='add'>+			result = 0;</div><div class='add'>+			hw-&gt;auxen++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Force it enabled even if the command failed, if told.. */</div><div class='add'>+	if ((hw-&gt;auxen == auxen_mirror) &amp;&amp; force)</div><div class='add'>+		hw-&gt;auxen++;</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore( &amp;(hw-&gt;cmdlock), flags);</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_cmd_aux_disable</div><div class='add'>+*</div><div class='add'>+* Goes through the process of disabling the auxilary port</div><div class='add'>+* enabled with aux_enable().</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw		device structure</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0		success</div><div class='add'>+*	&gt;0		f/w reported failure - f/w status code</div><div class='add'>+*	&lt;0		driver reported error (timeout)</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int hfa384x_cmd_aux_disable(hfa384x_t *hw)</div><div class='add'>+{</div><div class='add'>+	int		result = -ETIMEDOUT;</div><div class='add'>+	unsigned long   timeout;</div><div class='add'>+	UINT16		reg = 0;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	/* See if there's more than one enable */</div><div class='add'>+	if (hw-&gt;auxen) hw-&gt;auxen--;</div><div class='add'>+	if (hw-&gt;auxen) return 0;</div><div class='add'>+</div><div class='add'>+	/* Clear the aux enable in the Control register */</div><div class='add'>+	hfa384x_setreg(hw, 0, HFA384x_PARAM0);</div><div class='add'>+	hfa384x_setreg(hw, 0, HFA384x_PARAM1);</div><div class='add'>+	hfa384x_setreg(hw, 0, HFA384x_PARAM2);</div><div class='add'>+	hfa384x_setreg(hw, HFA384x_CONTROL_AUX_DODISABLE,</div><div class='add'>+		HFA384x_CONTROL);</div><div class='add'>+</div><div class='add'>+	/* Now wait for completion */</div><div class='add'>+	timeout = jiffies + 1*HZ;</div><div class='add'>+	reg = hfa384x_getreg(hw, HFA384x_CONTROL);</div><div class='add'>+	while ( ((reg &amp; (BIT14|BIT15)) != HFA384x_CONTROL_AUX_ISDISABLED) &amp;&amp;</div><div class='add'>+		time_before(jiffies,timeout) ){</div><div class='add'>+		udelay(10);</div><div class='add'>+		reg = hfa384x_getreg(hw, HFA384x_CONTROL);</div><div class='add'>+	}</div><div class='add'>+	if ((reg &amp; (BIT14|BIT15)) == HFA384x_CONTROL_AUX_ISDISABLED ) {</div><div class='add'>+		result = 0;</div><div class='add'>+	}</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_drvr_low_level</div><div class='add'>+*</div><div class='add'>+* Write test commands to the card.  Some test commands don't make</div><div class='add'>+* sense without prior set-up.  For example, continous TX isn't very</div><div class='add'>+* useful until you set the channel.  That functionality should be</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*      process thread</div><div class='add'>+* -----------------------------------------------------------------*/</div><div class='add'>+int hfa384x_drvr_low_level(hfa384x_t *hw, hfa384x_metacmd_t *cmd)</div><div class='add'>+{</div><div class='add'>+	int             result = 0;</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	/* Do i need a host2hfa... conversion ? */</div><div class='add'>+#if 0</div><div class='add'>+	printk(KERN_INFO "%#x %#x %#x %#x\n", cmd-&gt;cmd, cmd-&gt;parm0, cmd-&gt;parm1, cmd-&gt;parm2);</div><div class='add'>+#endif</div><div class='add'>+	spin_lock_bh(&amp;hw-&gt;cmdlock);</div><div class='add'>+	result = hfa384x_docmd_wait(hw, cmd);</div><div class='add'>+	spin_unlock_bh(&amp;hw-&gt;cmdlock);</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* TODO: determine if these will ever be needed */</div><div class='add'>+#if 0</div><div class='add'>+int hfa384x_cmd_readmif(hfa384x_t *hw)</div><div class='add'>+{</div><div class='add'>+	DBFENTER;</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+int hfa384x_cmd_writemif(hfa384x_t *hw)</div><div class='add'>+{</div><div class='add'>+	DBFENTER;</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_drvr_mmi_read</div><div class='add'>+*</div><div class='add'>+* Read mmi registers.  mmi is intersil-speak for the baseband</div><div class='add'>+* processor registers.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*       hw              device structure</div><div class='add'>+*       register        The test register to be accessed (must be even #).</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*       0               success</div><div class='add'>+*       &gt;0              f/w reported error - f/w status code</div><div class='add'>+*       &lt;0              driver reported error</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*       process thread</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int hfa384x_drvr_mmi_read(hfa384x_t *hw, UINT32 addr, UINT32 *resp)</div><div class='add'>+{</div><div class='add'>+        int             result = 0;</div><div class='add'>+	hfa384x_metacmd_t cmd;</div><div class='add'>+</div><div class='add'>+        DBFENTER;</div><div class='add'>+	cmd.cmd = (UINT16) 0x30;</div><div class='add'>+	cmd.parm0 = (UINT16) addr;</div><div class='add'>+	cmd.parm1 = 0;</div><div class='add'>+	cmd.parm2 = 0;</div><div class='add'>+</div><div class='add'>+        /* Do i need a host2hfa... conversion ? */</div><div class='add'>+	spin_lock_bh(&amp;hw-&gt;cmdlock);</div><div class='add'>+	result = hfa384x_docmd_wait(hw, &amp;cmd);</div><div class='add'>+	spin_unlock_bh(&amp;hw-&gt;cmdlock);</div><div class='add'>+</div><div class='add'>+	*resp = (UINT32) cmd.result.resp0;</div><div class='add'>+</div><div class='add'>+        DBFEXIT;</div><div class='add'>+        return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_drvr_mmi_write</div><div class='add'>+*</div><div class='add'>+* Read mmi registers.  mmi is intersil-speak for the baseband</div><div class='add'>+* processor registers.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*       hw              device structure</div><div class='add'>+*       addr            The test register to be accessed (must be even #).</div><div class='add'>+*       data            The data value to write to the register.</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*       0               success</div><div class='add'>+*       &gt;0              f/w reported error - f/w status code</div><div class='add'>+*       &lt;0              driver reported error</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*       process thread</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+hfa384x_drvr_mmi_write(hfa384x_t *hw, UINT32 addr, UINT32 data)</div><div class='add'>+{</div><div class='add'>+        int             result = 0;</div><div class='add'>+	hfa384x_metacmd_t cmd;</div><div class='add'>+</div><div class='add'>+        DBFENTER;</div><div class='add'>+	cmd.cmd = (UINT16) 0x31;</div><div class='add'>+	cmd.parm0 = (UINT16) addr;</div><div class='add'>+	cmd.parm1 = (UINT16) data;</div><div class='add'>+	cmd.parm2 = 0;</div><div class='add'>+</div><div class='add'>+        WLAN_LOG_DEBUG(1,"mmi write : addr = 0x%08x\n", addr);</div><div class='add'>+        WLAN_LOG_DEBUG(1,"mmi write : data = 0x%08x\n", data);</div><div class='add'>+</div><div class='add'>+        /* Do i need a host2hfa... conversion ? */</div><div class='add'>+	spin_lock_bh(&amp;hw-&gt;cmdlock);</div><div class='add'>+	result = hfa384x_docmd_wait(hw, &amp;cmd);</div><div class='add'>+	spin_unlock_bh(&amp;hw-&gt;cmdlock);</div><div class='add'>+</div><div class='add'>+        DBFEXIT;</div><div class='add'>+        return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* TODO: determine if these will ever be needed */</div><div class='add'>+#if 0</div><div class='add'>+int hfa384x_cmd_readmif(hfa384x_t *hw)</div><div class='add'>+{</div><div class='add'>+        DBFENTER;</div><div class='add'>+        DBFEXIT;</div><div class='add'>+        return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+int hfa384x_cmd_writemif(hfa384x_t *hw)</div><div class='add'>+{</div><div class='add'>+        DBFENTER;</div><div class='add'>+        DBFEXIT;</div><div class='add'>+        return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_copy_from_bap</div><div class='add'>+*</div><div class='add'>+* Copies a collection of bytes from the MAC controller memory via</div><div class='add'>+* one set of BAP registers.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw		device structure</div><div class='add'>+*	bap		[0|1] which BAP to use</div><div class='add'>+*	id		FID or RID, destined for the select register (host order)</div><div class='add'>+*	offset		An _even_ offset into the buffer for the given</div><div class='add'>+*			FID/RID.  We haven't the means to validate this,</div><div class='add'>+*			so be careful. (host order)</div><div class='add'>+*	buf		ptr to array of bytes</div><div class='add'>+*	len		length of data to transfer in bytes</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0		success</div><div class='add'>+*	&gt;0		f/w reported failure - value of offset reg.</div><div class='add'>+*	&lt;0		driver reported error (timeout|bad arg)</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread</div><div class='add'>+*	interrupt</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int hfa384x_copy_from_bap(hfa384x_t *hw, UINT16 bap, UINT16 id, UINT16 offset,</div><div class='add'>+				void *buf, UINT len)</div><div class='add'>+{</div><div class='add'>+	int		result = 0;</div><div class='add'>+	unsigned long	flags = 0;</div><div class='add'>+	UINT8		*d = (UINT8*)buf;</div><div class='add'>+	UINT		selectreg;</div><div class='add'>+	UINT		offsetreg;</div><div class='add'>+	UINT		datareg;</div><div class='add'>+	UINT		i;</div><div class='add'>+	UINT16		reg = 0;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	/* Validate bap, offset, buf, and len */</div><div class='add'>+	if ( (bap &gt; 1) ||</div><div class='add'>+	     (offset &gt; HFA384x_BAP_OFFSET_MAX) ||</div><div class='add'>+	     (offset % 2) ||</div><div class='add'>+	     (buf == NULL) ||</div><div class='add'>+	     (len &gt; HFA384x_BAP_DATALEN_MAX) ){</div><div class='add'>+	     	result = -EINVAL;</div><div class='add'>+	} else {</div><div class='add'>+		selectreg = (bap == 1) ?  HFA384x_SELECT1 : HFA384x_SELECT0 ;</div><div class='add'>+		offsetreg = (bap == 1) ?  HFA384x_OFFSET1 : HFA384x_OFFSET0 ;</div><div class='add'>+		datareg =   (bap == 1) ?  HFA384x_DATA1 : HFA384x_DATA0 ;</div><div class='add'>+</div><div class='add'>+		/* Obtain lock */</div><div class='add'>+		spin_lock_irqsave( &amp;(hw-&gt;baplock), flags);</div><div class='add'>+</div><div class='add'>+		/* Write id to select reg */</div><div class='add'>+		hfa384x_setreg(hw, id, selectreg);</div><div class='add'>+		/* Write offset to offset reg */</div><div class='add'>+		hfa384x_setreg(hw, offset, offsetreg);</div><div class='add'>+		/* Wait for offset[busy] to clear (see BAP_TIMEOUT) */</div><div class='add'>+		i = 0;</div><div class='add'>+		do {</div><div class='add'>+			reg = hfa384x_getreg(hw, offsetreg);</div><div class='add'>+			if ( i &gt; 0 ) udelay(10);</div><div class='add'>+			i++;</div><div class='add'>+		} while ( i &lt; prism2_bap_timeout &amp;&amp; HFA384x_OFFSET_ISBUSY(reg));</div><div class='add'>+#if (WLAN_HOSTIF != WLAN_PCI)</div><div class='add'>+		/* Release lock */</div><div class='add'>+		spin_unlock_irqrestore( &amp;(hw-&gt;baplock), flags);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+		if ( HFA384x_OFFSET_ISBUSY(reg) ){</div><div class='add'>+			/* If timeout, return -ETIMEDOUT */</div><div class='add'>+			result = reg;</div><div class='add'>+		} else if ( HFA384x_OFFSET_ISERR(reg) ){</div><div class='add'>+			/* If offset[err] == 1, return -EINVAL */</div><div class='add'>+			result = reg;</div><div class='add'>+		} else {</div><div class='add'>+			/* Read even(len) buf contents from data reg */</div><div class='add'>+			for ( i = 0; i &lt; (len &amp; 0xfffe); i+=2 ) {</div><div class='add'>+				*(UINT16*)(&amp;(d[i])) =</div><div class='add'>+					hfa384x_getreg_noswap(hw, datareg);</div><div class='add'>+			}</div><div class='add'>+			/* If len odd, handle last byte */</div><div class='add'>+			if ( len % 2 ){</div><div class='add'>+				reg = hfa384x_getreg_noswap(hw, datareg);</div><div class='add'>+				d[len-1] = ((UINT8*)(&amp;reg))[0];</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* According to Intersil errata dated 9/16/02:</div><div class='add'>+</div><div class='add'>+		"In PRISM PCI MAC host interface, if both BAPs are concurrently</div><div class='add'>+		 requesing memory access, both will accept the Ack.   There is no</div><div class='add'>+		 firmware workaround possible.  To prevent BAP access failures or</div><div class='add'>+		 hang conditions the host MUST NOT access both BAPs in sucession</div><div class='add'>+		 unless at least 5us elapses between accesses.  The safest choice</div><div class='add'>+		 is to USE ONLY ONE BAP for all data movement operations."</div><div class='add'>+</div><div class='add'>+		 What this means:</div><div class='add'>+</div><div class='add'>+		 We have to serialize ALL BAP accesses, and furthermore, add a 5us</div><div class='add'>+		 delay after access if we're using a PCI platform.</div><div class='add'>+</div><div class='add'>+		 Unfortunately, this means we have to lock out interrupts througout</div><div class='add'>+		 the entire BAP copy.</div><div class='add'>+</div><div class='add'>+		 It remains to be seen if "BAP access" means "BAP setup" or the more</div><div class='add'>+		 literal definition of "copying data back and forth"  I'm erring for</div><div class='add'>+		 the latter, safer definition.  -- SLP.</div><div class='add'>+</div><div class='add'>+		*/</div><div class='add'>+</div><div class='add'>+#if (WLAN_HOSTIF == WLAN_PCI)</div><div class='add'>+		udelay(5);</div><div class='add'>+		/* Release lock */</div><div class='add'>+		spin_unlock_irqrestore( &amp;(hw-&gt;baplock), flags);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (result) {</div><div class='add'>+	  WLAN_LOG_DEBUG(1,</div><div class='add'>+			  "copy_from_bap(0x%04x, 0, %d) failed, result=0x%x\n",</div><div class='add'>+			  reg, len, result);</div><div class='add'>+	}</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_copy_to_bap</div><div class='add'>+*</div><div class='add'>+* Copies a collection of bytes to the MAC controller memory via</div><div class='add'>+* one set of BAP registers.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw		device structure</div><div class='add'>+*	bap		[0|1] which BAP to use</div><div class='add'>+*	id		FID or RID, destined for the select register (host order)</div><div class='add'>+*	offset		An _even_ offset into the buffer for the given</div><div class='add'>+*			FID/RID.  We haven't the means to validate this,</div><div class='add'>+*			so be careful. (host order)</div><div class='add'>+*	buf		ptr to array of bytes</div><div class='add'>+*	len		length of data to transfer (in bytes)</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0		success</div><div class='add'>+*	&gt;0		f/w reported failure - value of offset reg.</div><div class='add'>+*	&lt;0		driver reported error (timeout|bad arg)</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread</div><div class='add'>+*	interrupt</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int hfa384x_copy_to_bap(hfa384x_t *hw, UINT16 bap, UINT16 id, UINT16 offset,</div><div class='add'>+				void *buf, UINT len)</div><div class='add'>+{</div><div class='add'>+	return hfa384x_copy_to_bap4(hw, bap, id, offset, buf, len, NULL, 0, NULL, 0, NULL, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hfa384x_copy_to_bap4(hfa384x_t *hw, UINT16 bap, UINT16 id, UINT16 offset,</div><div class='add'>+			 void *buf, UINT len1, void* buf2, UINT len2,</div><div class='add'>+			 void *buf3, UINT len3, void *buf4, UINT len4)</div><div class='add'>+{</div><div class='add'>+	int		result = 0;</div><div class='add'>+	unsigned long	flags = 0;</div><div class='add'>+	UINT8		*d;</div><div class='add'>+	UINT		selectreg;</div><div class='add'>+	UINT		offsetreg;</div><div class='add'>+	UINT		datareg;</div><div class='add'>+	UINT		i;</div><div class='add'>+	UINT16		reg;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+//	printk(KERN_DEBUG "ctb1 %d id %04x o %d %d %d %d %d\n", bap, id, offset, len1, len2, len3, len4);</div><div class='add'>+</div><div class='add'>+	/* Validate bap, offset, buf, and len */</div><div class='add'>+	if ( (bap &gt; 1) ||</div><div class='add'>+	     (offset &gt; HFA384x_BAP_OFFSET_MAX) ||</div><div class='add'>+	     (offset % 2) ||</div><div class='add'>+	     (buf == NULL) ||</div><div class='add'>+	     (len1+len2+len3+len4 &gt; HFA384x_BAP_DATALEN_MAX) ){</div><div class='add'>+	     	result = -EINVAL;</div><div class='add'>+	} else {</div><div class='add'>+		selectreg = (bap == 1) ? HFA384x_SELECT1 : HFA384x_SELECT0;</div><div class='add'>+		offsetreg = (bap == 1) ? HFA384x_OFFSET1 : HFA384x_OFFSET0;</div><div class='add'>+		datareg =   (bap == 1) ? HFA384x_DATA1   : HFA384x_DATA0;</div><div class='add'>+		/* Obtain lock */</div><div class='add'>+		spin_lock_irqsave( &amp;(hw-&gt;baplock), flags);</div><div class='add'>+</div><div class='add'>+		/* Write id to select reg */</div><div class='add'>+		hfa384x_setreg(hw, id, selectreg);</div><div class='add'>+		udelay(10);</div><div class='add'>+		/* Write offset to offset reg */</div><div class='add'>+		hfa384x_setreg(hw, offset, offsetreg);</div><div class='add'>+		/* Wait for offset[busy] to clear (see BAP_TIMEOUT) */</div><div class='add'>+		i = 0;</div><div class='add'>+		do {</div><div class='add'>+			reg = hfa384x_getreg(hw, offsetreg);</div><div class='add'>+			if ( i &gt; 0 ) udelay(10);</div><div class='add'>+			i++;</div><div class='add'>+		} while ( i &lt; prism2_bap_timeout &amp;&amp; HFA384x_OFFSET_ISBUSY(reg));</div><div class='add'>+</div><div class='add'>+#if (WLAN_HOSTIF != WLAN_PCI)</div><div class='add'>+		/* Release lock */</div><div class='add'>+		spin_unlock_irqrestore( &amp;(hw-&gt;baplock), flags);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+		if ( HFA384x_OFFSET_ISBUSY(reg) ){</div><div class='add'>+			/* If timeout, return reg */</div><div class='add'>+			result = reg;</div><div class='add'>+		} else if ( HFA384x_OFFSET_ISERR(reg) ){</div><div class='add'>+			/* If offset[err] == 1, return reg */</div><div class='add'>+			result = reg;</div><div class='add'>+		} else {</div><div class='add'>+			d = (UINT8*)buf;</div><div class='add'>+			/* Write even(len1) buf contents to data reg */</div><div class='add'>+			for ( i = 0; i &lt; (len1 &amp; 0xfffe); i+=2 ) {</div><div class='add'>+				hfa384x_setreg_noswap(hw,</div><div class='add'>+					*(UINT16*)(&amp;(d[i])), datareg);</div><div class='add'>+			}</div><div class='add'>+			if (len1 &amp; 1) {</div><div class='add'>+				UINT16 data;</div><div class='add'>+				UINT8 *b = (UINT8 *) &amp;data;</div><div class='add'>+				b[0] = d[len1-1];</div><div class='add'>+				if (buf2 != NULL) {</div><div class='add'>+					d = (UINT8*)buf2;</div><div class='add'>+					b[1] = d[0];</div><div class='add'>+					len2--;</div><div class='add'>+					buf2++;</div><div class='add'>+				}</div><div class='add'>+				hfa384x_setreg_noswap(hw, data, datareg);</div><div class='add'>+			}</div><div class='add'>+			if ((buf2 != NULL) &amp;&amp; (len2 &gt; 0)) {</div><div class='add'>+				/* Write even(len2) buf contents to data reg */</div><div class='add'>+				d = (UINT8*)buf2;</div><div class='add'>+				for ( i = 0; i &lt; (len2 &amp; 0xfffe); i+=2 ) {</div><div class='add'>+					hfa384x_setreg_noswap(hw, *(UINT16*)(&amp;(d[i])), datareg);</div><div class='add'>+				}</div><div class='add'>+				if (len2 &amp; 1) {</div><div class='add'>+					UINT16 data;</div><div class='add'>+					UINT8 *b = (UINT8 *) &amp;data;</div><div class='add'>+					b[0] = d[len2-1];</div><div class='add'>+					if (buf3 != NULL) {</div><div class='add'>+						d = (UINT8*)buf3;</div><div class='add'>+						b[1] = d[0];</div><div class='add'>+						len3--;</div><div class='add'>+						buf3++;</div><div class='add'>+					}</div><div class='add'>+					hfa384x_setreg_noswap(hw, data, datareg);</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if ((buf3 != NULL) &amp;&amp; (len3 &gt; 0)) {</div><div class='add'>+				/* Write even(len3) buf contents to data reg */</div><div class='add'>+				d = (UINT8*)buf3;</div><div class='add'>+				for ( i = 0; i &lt; (len3 &amp; 0xfffe); i+=2 ) {</div><div class='add'>+					hfa384x_setreg_noswap(hw, *(UINT16*)(&amp;(d[i])), datareg);</div><div class='add'>+				}</div><div class='add'>+				if (len3 &amp; 1) {</div><div class='add'>+					UINT16 data;</div><div class='add'>+					UINT8 *b = (UINT8 *) &amp;data;</div><div class='add'>+					b[0] = d[len3-1];</div><div class='add'>+					if (buf4 != NULL) {</div><div class='add'>+						d = (UINT8*)buf4;</div><div class='add'>+						b[1] = d[0];</div><div class='add'>+						len4--;</div><div class='add'>+						buf4++;</div><div class='add'>+					}</div><div class='add'>+					hfa384x_setreg_noswap(hw, data, datareg);</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+			if ((buf4 != NULL) &amp;&amp; (len4 &gt; 0)) {</div><div class='add'>+				/* Write even(len4) buf contents to data reg */</div><div class='add'>+				d = (UINT8*)buf4;</div><div class='add'>+				for ( i = 0; i &lt; (len4 &amp; 0xfffe); i+=2 ) {</div><div class='add'>+					hfa384x_setreg_noswap(hw, *(UINT16*)(&amp;(d[i])), datareg);</div><div class='add'>+				}</div><div class='add'>+				if (len4 &amp; 1) {</div><div class='add'>+					UINT16 data;</div><div class='add'>+					UINT8 *b = (UINT8 *) &amp;data;</div><div class='add'>+					b[0] = d[len4-1];</div><div class='add'>+					b[1] = 0;</div><div class='add'>+</div><div class='add'>+					hfa384x_setreg_noswap(hw, data, datareg);</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+//			printk(KERN_DEBUG "ctb2 %d id %04x o %d %d %d %d %d\n", bap, id, offset, len1, len2, len3, len4);</div><div class='add'>+</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+#if (WLAN_HOSTIF == WLAN_PCI)</div><div class='add'>+		udelay(5);</div><div class='add'>+		/* Release lock */</div><div class='add'>+		spin_unlock_irqrestore( &amp;(hw-&gt;baplock), flags);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (result)</div><div class='add'>+		WLAN_LOG_ERROR("copy_to_bap() failed.\n");</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_copy_from_aux</div><div class='add'>+*</div><div class='add'>+* Copies a collection of bytes from the controller memory.  The</div><div class='add'>+* Auxiliary port MUST be enabled prior to calling this function.</div><div class='add'>+* We _might_ be in a download state.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw		device structure</div><div class='add'>+*	cardaddr	address in hfa384x data space to read</div><div class='add'>+*	auxctl		address space select</div><div class='add'>+*	buf		ptr to destination host buffer</div><div class='add'>+*	len		length of data to transfer (in bytes)</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	nothing</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*	buf contains the data copied</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread</div><div class='add'>+*	interrupt</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+void</div><div class='add'>+hfa384x_copy_from_aux(</div><div class='add'>+	hfa384x_t *hw, UINT32 cardaddr, UINT32 auxctl, void *buf, UINT len)</div><div class='add'>+{</div><div class='add'>+	UINT16		currpage;</div><div class='add'>+	UINT16		curroffset;</div><div class='add'>+	UINT		i = 0;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	if ( !(hw-&gt;auxen) ) {</div><div class='add'>+		WLAN_LOG_DEBUG(1,</div><div class='add'>+			"Attempt to read 0x%04x when aux not enabled\n",</div><div class='add'>+			cardaddr);</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+	/* Build appropriate aux page and offset */</div><div class='add'>+	currpage = HFA384x_AUX_MKPAGE(cardaddr);</div><div class='add'>+	curroffset = HFA384x_AUX_MKOFF(cardaddr, auxctl);</div><div class='add'>+	hfa384x_setreg(hw, currpage, HFA384x_AUXPAGE);</div><div class='add'>+	hfa384x_setreg(hw, curroffset, HFA384x_AUXOFFSET);</div><div class='add'>+	udelay(5);	/* beat */</div><div class='add'>+</div><div class='add'>+	/* read the data */</div><div class='add'>+	while ( i &lt; len) {</div><div class='add'>+		*((UINT16*)(buf+i)) = hfa384x_getreg_noswap(hw, HFA384x_AUXDATA);</div><div class='add'>+		i+=2;</div><div class='add'>+		curroffset+=2;</div><div class='add'>+		if ( (curroffset&amp;HFA384x_ADDR_AUX_OFF_MASK) &gt;</div><div class='add'>+			HFA384x_ADDR_AUX_OFF_MAX ) {</div><div class='add'>+			currpage++;</div><div class='add'>+			curroffset = 0;</div><div class='add'>+			curroffset = HFA384x_AUX_MKOFF(curroffset, auxctl);</div><div class='add'>+			hfa384x_setreg(hw, currpage, HFA384x_AUXPAGE);</div><div class='add'>+			hfa384x_setreg(hw, curroffset, HFA384x_AUXOFFSET);</div><div class='add'>+			udelay(5);	/* beat */</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	/* Make sure the auxctl bits are clear */</div><div class='add'>+	hfa384x_setreg(hw, 0, HFA384x_AUXOFFSET);</div><div class='add'>+	DBFEXIT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_copy_to_aux</div><div class='add'>+*</div><div class='add'>+* Copies a collection of bytes to the controller memory.  The</div><div class='add'>+* Auxiliary port MUST be enabled prior to calling this function.</div><div class='add'>+* We _might_ be in a download state.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw		device structure</div><div class='add'>+*	cardaddr	address in hfa384x data space to read</div><div class='add'>+*	auxctl		address space select</div><div class='add'>+*	buf		ptr to destination host buffer</div><div class='add'>+*	len		length of data to transfer (in bytes)</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	nothing</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*	Controller memory now contains a copy of buf</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread</div><div class='add'>+*	interrupt</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+void</div><div class='add'>+hfa384x_copy_to_aux(</div><div class='add'>+	hfa384x_t *hw, UINT32 cardaddr, UINT32 auxctl, void *buf, UINT len)</div><div class='add'>+{</div><div class='add'>+	UINT16		currpage;</div><div class='add'>+	UINT16		curroffset;</div><div class='add'>+	UINT		i = 0;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	if ( !(hw-&gt;auxen) ) {</div><div class='add'>+		WLAN_LOG_DEBUG(1,</div><div class='add'>+			"Attempt to read 0x%04x when aux not enabled\n",</div><div class='add'>+			cardaddr);</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+	/* Build appropriate aux page and offset */</div><div class='add'>+	currpage = HFA384x_AUX_MKPAGE(cardaddr);</div><div class='add'>+	curroffset = HFA384x_AUX_MKOFF(cardaddr, auxctl);</div><div class='add'>+	hfa384x_setreg(hw, currpage, HFA384x_AUXPAGE);</div><div class='add'>+	hfa384x_setreg(hw, curroffset, HFA384x_AUXOFFSET);</div><div class='add'>+	udelay(5);	/* beat */</div><div class='add'>+</div><div class='add'>+	/* write the data */</div><div class='add'>+	while ( i &lt; len) {</div><div class='add'>+		hfa384x_setreg_noswap(hw,</div><div class='add'>+			*((UINT16*)(buf+i)), HFA384x_AUXDATA);</div><div class='add'>+		i+=2;</div><div class='add'>+		curroffset+=2;</div><div class='add'>+		if ( curroffset &gt; HFA384x_ADDR_AUX_OFF_MAX ) {</div><div class='add'>+			currpage++;</div><div class='add'>+			curroffset = 0;</div><div class='add'>+			hfa384x_setreg(hw, currpage, HFA384x_AUXPAGE);</div><div class='add'>+			hfa384x_setreg(hw, curroffset, HFA384x_AUXOFFSET);</div><div class='add'>+			udelay(5);	/* beat */</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	DBFEXIT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_cmd_wait</div><div class='add'>+*</div><div class='add'>+* Waits for availability of the Command register, then</div><div class='add'>+* issues the given command.  Then polls the Evstat register</div><div class='add'>+* waiting for command completion.  Timeouts shouldn't be</div><div class='add'>+* possible since we're preventing overlapping commands and all</div><div class='add'>+* commands should be cleared and acknowledged.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		device structure</div><div class='add'>+*       cmd             cmd structure.  Includes all arguments and result</div><div class='add'>+*                       data points.  All in host order.</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0		success</div><div class='add'>+*	-ETIMEDOUT	timed out waiting for register ready or</div><div class='add'>+*			command completion</div><div class='add'>+*	&gt;0		command indicated error, Status and Resp0-2 are</div><div class='add'>+*			in hw structure.</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+static int hfa384x_docmd_wait( hfa384x_t *hw, hfa384x_metacmd_t *cmd)</div><div class='add'>+{</div><div class='add'>+	int		result = -ETIMEDOUT;</div><div class='add'>+	UINT16		reg = 0;</div><div class='add'>+	UINT16          counter;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	hw-&gt;cmdflag = 0;</div><div class='add'>+	hw-&gt;cmddata = cmd;</div><div class='add'>+</div><div class='add'>+	/* wait for the busy bit to clear */</div><div class='add'>+	counter = 0;</div><div class='add'>+	reg = hfa384x_getreg(hw, HFA384x_CMD);</div><div class='add'>+	while ( HFA384x_CMD_ISBUSY(reg) &amp;&amp;</div><div class='add'>+		(counter &lt; 10)) {</div><div class='add'>+		reg = hfa384x_getreg(hw, HFA384x_CMD);</div><div class='add'>+		counter++;</div><div class='add'>+		udelay(10);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (HFA384x_CMD_ISBUSY(reg)) {</div><div class='add'>+		WLAN_LOG_ERROR("hfa384x_cmd timeout(1), reg=0x%0hx.\n", reg);</div><div class='add'>+		goto failed;</div><div class='add'>+	}</div><div class='add'>+	if (!HFA384x_CMD_ISBUSY(reg)) {</div><div class='add'>+		/* busy bit clear, write command */</div><div class='add'>+		hfa384x_setreg(hw, cmd-&gt;parm0, HFA384x_PARAM0);</div><div class='add'>+		hfa384x_setreg(hw, cmd-&gt;parm1, HFA384x_PARAM1);</div><div class='add'>+		hfa384x_setreg(hw, cmd-&gt;parm2, HFA384x_PARAM2);</div><div class='add'>+		hfa384x_setreg(hw, cmd-&gt;cmd, HFA384x_CMD);</div><div class='add'>+</div><div class='add'>+#ifdef CMD_IRQ</div><div class='add'>+</div><div class='add'>+#if (LINUX_VERSION_CODE &lt; KERNEL_VERSION(2,2,0))</div><div class='add'>+		while (! hw-&gt;cmdflag)</div><div class='add'>+			interruptible_sleep_on(&amp;hw-&gt;cmdq);</div><div class='add'>+#else</div><div class='add'>+		wait_event_interruptible(hw-&gt;cmdq, hw-&gt;cmdflag);</div><div class='add'>+#endif</div><div class='add'>+		result = HFA384x_STATUS_RESULT_GET(cmd-&gt;status);</div><div class='add'>+#else // CMD_IRQ</div><div class='add'>+		/* Now wait for completion */</div><div class='add'>+		counter = 0;</div><div class='add'>+		reg = hfa384x_getreg(hw, HFA384x_EVSTAT);</div><div class='add'>+		/* Initialization is the problem.  It takes about</div><div class='add'>+                   100ms. "normal" commands are typically is about</div><div class='add'>+                   200-400 us (I've never seen less than 200).  Longer</div><div class='add'>+                   is better so that we're not hammering the bus. */</div><div class='add'>+		while ( !HFA384x_EVSTAT_ISCMD(reg) &amp;&amp;</div><div class='add'>+			(counter &lt; 5000)) {</div><div class='add'>+			reg = hfa384x_getreg(hw, HFA384x_EVSTAT);</div><div class='add'>+			counter++;</div><div class='add'>+			udelay(200);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if ( HFA384x_EVSTAT_ISCMD(reg) ) {</div><div class='add'>+			result = 0;</div><div class='add'>+			cmd-&gt;result.status = hfa384x_getreg(hw, HFA384x_STATUS);</div><div class='add'>+			cmd-&gt;result.resp0 = hfa384x_getreg(hw, HFA384x_RESP0);</div><div class='add'>+			cmd-&gt;result.resp1 = hfa384x_getreg(hw, HFA384x_RESP1);</div><div class='add'>+			cmd-&gt;result.resp2 = hfa384x_getreg(hw, HFA384x_RESP2);</div><div class='add'>+			hfa384x_setreg(hw, HFA384x_EVACK_CMD,</div><div class='add'>+				HFA384x_EVACK);</div><div class='add'>+			result = HFA384x_STATUS_RESULT_GET(cmd-&gt;result.status);</div><div class='add'>+		} else {</div><div class='add'>+			WLAN_LOG_ERROR("hfa384x_cmd timeout(2), reg=0x%0hx.\n", reg);</div><div class='add'>+		}</div><div class='add'>+#endif  /* CMD_IRQ */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+ failed:</div><div class='add'>+	hw-&gt;cmdflag = 0;</div><div class='add'>+	hw-&gt;cmddata = NULL;</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_dl_docmd_wait</div><div class='add'>+*</div><div class='add'>+* Waits for availability of the Command register, then</div><div class='add'>+* issues the given command.  Then polls the Evstat register</div><div class='add'>+* waiting for command completion.  Timeouts shouldn't be</div><div class='add'>+* possible since we're preventing overlapping commands and all</div><div class='add'>+* commands should be cleared and acknowledged.</div><div class='add'>+*</div><div class='add'>+* This routine is only used for downloads.  Since it doesn't lock out</div><div class='add'>+* interrupts the system response is much better.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		device structure</div><div class='add'>+*       cmd             cmd structure.  Includes all arguments and result</div><div class='add'>+*                       data points.  All in host order.</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0		success</div><div class='add'>+*	-ETIMEDOUT	timed out waiting for register ready or</div><div class='add'>+*			command completion</div><div class='add'>+*	&gt;0		command indicated error, Status and Resp0-2 are</div><div class='add'>+*			in hw structure.</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+static int hfa384x_dl_docmd_wait( hfa384x_t *hw, hfa384x_metacmd_t *cmd)</div><div class='add'>+{</div><div class='add'>+	int		result = -ETIMEDOUT;</div><div class='add'>+	unsigned long	timeout;</div><div class='add'>+	UINT16		reg = 0;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+	/* wait for the busy bit to clear */</div><div class='add'>+	timeout = jiffies + 1*HZ;</div><div class='add'>+	reg = hfa384x_getreg(hw, HFA384x_CMD);</div><div class='add'>+	while ( HFA384x_CMD_ISBUSY(reg) &amp;&amp; time_before( jiffies, timeout) ) {</div><div class='add'>+		reg = hfa384x_getreg(hw, HFA384x_CMD);</div><div class='add'>+		udelay(10);</div><div class='add'>+	}</div><div class='add'>+	if (HFA384x_CMD_ISBUSY(reg)) {</div><div class='add'>+		WLAN_LOG_WARNING("Timed out waiting for cmd register.\n");</div><div class='add'>+		goto failed;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!HFA384x_CMD_ISBUSY(reg)) {</div><div class='add'>+		/* busy bit clear, write command */</div><div class='add'>+		hfa384x_setreg(hw, cmd-&gt;parm0, HFA384x_PARAM0);</div><div class='add'>+		hfa384x_setreg(hw, cmd-&gt;parm1, HFA384x_PARAM1);</div><div class='add'>+		hfa384x_setreg(hw, cmd-&gt;parm2, HFA384x_PARAM2);</div><div class='add'>+		hfa384x_setreg(hw, cmd-&gt;cmd, HFA384x_CMD);</div><div class='add'>+</div><div class='add'>+		/* Now wait for completion */</div><div class='add'>+		if ( (HFA384x_CMD_CMDCODE_GET(cmd-&gt;cmd) == HFA384x_CMDCODE_DOWNLD) ) {</div><div class='add'>+			/* dltimeout is in ms */</div><div class='add'>+			timeout = (((UINT32)hw-&gt;dltimeout) / 1000UL) * HZ;</div><div class='add'>+			if ( timeout &gt; 0 ) {</div><div class='add'>+				timeout += jiffies;</div><div class='add'>+			} else {</div><div class='add'>+				timeout = jiffies + 1*HZ;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			timeout = jiffies + 1*HZ;</div><div class='add'>+		}</div><div class='add'>+		reg = hfa384x_getreg(hw, HFA384x_EVSTAT);</div><div class='add'>+		while ( !HFA384x_EVSTAT_ISCMD(reg) &amp;&amp; time_before(jiffies,timeout) ) {</div><div class='add'>+			udelay(100);</div><div class='add'>+			reg = hfa384x_getreg(hw, HFA384x_EVSTAT);</div><div class='add'>+		}</div><div class='add'>+		if ( HFA384x_EVSTAT_ISCMD(reg) ) {</div><div class='add'>+			result = 0;</div><div class='add'>+			cmd-&gt;result.status = hfa384x_getreg(hw, HFA384x_STATUS);</div><div class='add'>+			cmd-&gt;result.resp0 = hfa384x_getreg(hw, HFA384x_RESP0);</div><div class='add'>+			cmd-&gt;result.resp1 = hfa384x_getreg(hw, HFA384x_RESP1);</div><div class='add'>+			cmd-&gt;result.resp2 = hfa384x_getreg(hw, HFA384x_RESP2);</div><div class='add'>+			hfa384x_setreg(hw, HFA384x_EVACK_CMD, HFA384x_EVACK);</div><div class='add'>+			result = HFA384x_STATUS_RESULT_GET(cmd-&gt;result.status);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+failed:</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_drvr_start</div><div class='add'>+*</div><div class='add'>+* Issues the MAC initialize command, sets up some data structures,</div><div class='add'>+* and enables the interrupts.  After this function completes, the</div><div class='add'>+* low-level stuff should be ready for any/all commands.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw		device structure</div><div class='add'>+* Returns:</div><div class='add'>+*	0		success</div><div class='add'>+*	&gt;0		f/w reported error - f/w status code</div><div class='add'>+*	&lt;0		driver reported error</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int hfa384x_drvr_start(hfa384x_t *hw)</div><div class='add'>+{</div><div class='add'>+	int	result = 0;</div><div class='add'>+	UINT16			reg;</div><div class='add'>+	int			i;</div><div class='add'>+	int			j;</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	/* call initialize */</div><div class='add'>+	result = hfa384x_cmd_initialize(hw);</div><div class='add'>+	if (result != 0) {</div><div class='add'>+		WLAN_LOG_ERROR("Initialize command failed.\n");</div><div class='add'>+		goto failed;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* make sure interrupts are disabled and any layabout events cleared */</div><div class='add'>+	hfa384x_setreg(hw, 0, HFA384x_INTEN);</div><div class='add'>+	hfa384x_setreg(hw, 0xffff, HFA384x_EVACK);</div><div class='add'>+</div><div class='add'>+        hw-&gt;txfid_head = 0;</div><div class='add'>+        hw-&gt;txfid_tail = 0;</div><div class='add'>+        hw-&gt;txfid_N = HFA384x_DRVR_FIDSTACKLEN_MAX;</div><div class='add'>+        memset(hw-&gt;txfid_queue, 0, sizeof(hw-&gt;txfid_queue));</div><div class='add'>+</div><div class='add'>+	/* Allocate tx and notify FIDs */</div><div class='add'>+	/* First, tx */</div><div class='add'>+	for ( i = 0; i &lt; HFA384x_DRVR_FIDSTACKLEN_MAX-1; i++) {</div><div class='add'>+		result = hfa384x_cmd_allocate(hw, HFA384x_DRVR_TXBUF_MAX);</div><div class='add'>+		if (result != 0) {</div><div class='add'>+			WLAN_LOG_ERROR("Allocate(tx) command failed.\n");</div><div class='add'>+			goto failed;</div><div class='add'>+		}</div><div class='add'>+		j = 0;</div><div class='add'>+		do {</div><div class='add'>+			reg = hfa384x_getreg(hw, HFA384x_EVSTAT);</div><div class='add'>+			udelay(10);</div><div class='add'>+			j++;</div><div class='add'>+		} while ( !HFA384x_EVSTAT_ISALLOC(reg) &amp;&amp; j &lt; 50); /* 50 is timeout */</div><div class='add'>+		if ( j &gt;= 50 ) {</div><div class='add'>+			WLAN_LOG_ERROR("Timed out waiting for evalloc(tx).\n");</div><div class='add'>+			result = -ETIMEDOUT;</div><div class='add'>+			goto failed;</div><div class='add'>+		}</div><div class='add'>+		reg = hfa384x_getreg(hw, HFA384x_ALLOCFID);</div><div class='add'>+</div><div class='add'>+		txfid_queue_add(hw, reg);</div><div class='add'>+</div><div class='add'>+		WLAN_LOG_DEBUG(4,"hw-&gt;txfid_queue[%d]=0x%04x\n",i,reg);</div><div class='add'>+</div><div class='add'>+		reg = HFA384x_EVACK_ALLOC_SET(1);</div><div class='add'>+		hfa384x_setreg(hw, reg, HFA384x_EVACK);</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Now, the info frame fid */</div><div class='add'>+	result = hfa384x_cmd_allocate(hw, HFA384x_INFOFRM_MAXLEN);</div><div class='add'>+	if (result != 0) {</div><div class='add'>+		WLAN_LOG_ERROR("Allocate(tx) command failed.\n");</div><div class='add'>+		goto failed;</div><div class='add'>+	}</div><div class='add'>+	i = 0;</div><div class='add'>+	do {</div><div class='add'>+		reg = hfa384x_getreg(hw, HFA384x_EVSTAT);</div><div class='add'>+		udelay(10);</div><div class='add'>+		i++;</div><div class='add'>+	} while ( !HFA384x_EVSTAT_ISALLOC(reg) &amp;&amp; i &lt; 50); /* 50 is timeout */</div><div class='add'>+	if ( i &gt;= 50 ) {</div><div class='add'>+		WLAN_LOG_ERROR("Timed out waiting for evalloc(info).\n");</div><div class='add'>+		result = -ETIMEDOUT;</div><div class='add'>+		goto failed;</div><div class='add'>+	}</div><div class='add'>+	hw-&gt;infofid = hfa384x_getreg(hw, HFA384x_ALLOCFID);</div><div class='add'>+	reg = HFA384x_EVACK_ALLOC_SET(1);</div><div class='add'>+	hfa384x_setreg(hw, reg, HFA384x_EVACK);</div><div class='add'>+	WLAN_LOG_DEBUG(4,"hw-&gt;infofid=0x%04x\n", hw-&gt;infofid);</div><div class='add'>+</div><div class='add'>+	/* Set swsupport regs to magic # for card presence detection */</div><div class='add'>+	hfa384x_setreg(hw, HFA384x_DRVR_MAGIC, HFA384x_SWSUPPORT0);</div><div class='add'>+</div><div class='add'>+	/* Now enable the interrupts and set the running state */</div><div class='add'>+	hfa384x_setreg(hw, 0xffff, HFA384x_EVSTAT);</div><div class='add'>+	hfa384x_events_all(hw);</div><div class='add'>+</div><div class='add'>+	hw-&gt;state = HFA384x_STATE_RUNNING;</div><div class='add'>+</div><div class='add'>+	goto done;</div><div class='add'>+failed:</div><div class='add'>+	WLAN_LOG_ERROR("Failed, result=%d\n", result);</div><div class='add'>+done:</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_drvr_stop</div><div class='add'>+*</div><div class='add'>+* Issues the initialize command to leave us in the 'reset' state.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw		device structure</div><div class='add'>+* Returns:</div><div class='add'>+*	0		success</div><div class='add'>+*	&gt;0		f/w reported error - f/w status code</div><div class='add'>+*	&lt;0		driver reported error</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int hfa384x_drvr_stop(hfa384x_t *hw)</div><div class='add'>+{</div><div class='add'>+	int	result = 0;</div><div class='add'>+	int i;</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	del_timer_sync(&amp;hw-&gt;commsqual_timer);</div><div class='add'>+</div><div class='add'>+	if ( hw-&gt;wlandev-&gt;hwremoved ) {</div><div class='add'>+		/* only flush when we're shutting down for good */</div><div class='add'>+		flush_scheduled_work();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (hw-&gt;state == HFA384x_STATE_RUNNING) {</div><div class='add'>+		/*</div><div class='add'>+		 * Send the MAC initialize cmd.</div><div class='add'>+		 */</div><div class='add'>+		hfa384x_cmd_initialize(hw);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Make absolutely sure interrupts are disabled and any</div><div class='add'>+		 * layabout events cleared</div><div class='add'>+		 */</div><div class='add'>+		hfa384x_setreg(hw, 0, HFA384x_INTEN);</div><div class='add'>+		hfa384x_setreg(hw, 0xffff, HFA384x_EVACK);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tasklet_kill(&amp;hw-&gt;bap_tasklet);</div><div class='add'>+</div><div class='add'>+	hw-&gt;link_status = HFA384x_LINK_NOTCONNECTED;</div><div class='add'>+	hw-&gt;state = HFA384x_STATE_INIT;</div><div class='add'>+</div><div class='add'>+	/* Clear all the port status */</div><div class='add'>+	for ( i = 0; i &lt; HFA384x_NUMPORTS_MAX; i++) {</div><div class='add'>+		hw-&gt;port_enabled[i] = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_drvr_txframe</div><div class='add'>+*</div><div class='add'>+* Takes a frame from prism2sta and queues it for transmission.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw		device structure</div><div class='add'>+*	skb		packet buffer struct.  Contains an 802.11</div><div class='add'>+*			data frame.</div><div class='add'>+*       p80211_hdr      points to the 802.11 header for the packet.</div><div class='add'>+* Returns:</div><div class='add'>+*	0		Success and more buffs available</div><div class='add'>+*	1		Success but no more buffs</div><div class='add'>+*	2		Allocation failure</div><div class='add'>+*	3		MAC Tx command failed</div><div class='add'>+*	4		Buffer full or queue busy</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int hfa384x_drvr_txframe(hfa384x_t *hw, struct sk_buff *skb, p80211_hdr_t *p80211_hdr, p80211_metawep_t *p80211_wep)</div><div class='add'>+{</div><div class='add'>+	hfa384x_tx_frame_t	txdesc;</div><div class='add'>+	UINT16			macq = 0;</div><div class='add'>+	UINT16			fid;</div><div class='add'>+	int			result;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	/* Build Tx frame structure */</div><div class='add'>+	/* Set up the control field */</div><div class='add'>+	memset(&amp;txdesc, 0, sizeof(txdesc));</div><div class='add'>+</div><div class='add'>+/* Tx complete and Tx exception disable per dleach.  Might be causing</div><div class='add'>+ * buf depletion</div><div class='add'>+ */</div><div class='add'>+#define DOBOTH 1</div><div class='add'>+#if DOBOTH</div><div class='add'>+	txdesc.tx_control =</div><div class='add'>+		HFA384x_TX_MACPORT_SET(0) | HFA384x_TX_STRUCTYPE_SET(1) |</div><div class='add'>+		HFA384x_TX_TXEX_SET(1) | HFA384x_TX_TXOK_SET(1);</div><div class='add'>+#elif DOEXC</div><div class='add'>+	txdesc.tx_control =</div><div class='add'>+		HFA384x_TX_MACPORT_SET(0) | HFA384x_TX_STRUCTYPE_SET(1) |</div><div class='add'>+		HFA384x_TX_TXEX_SET(1) | HFA384x_TX_TXOK_SET(0);</div><div class='add'>+#else</div><div class='add'>+	txdesc.tx_control =</div><div class='add'>+		HFA384x_TX_MACPORT_SET(0) | HFA384x_TX_STRUCTYPE_SET(1) |</div><div class='add'>+		HFA384x_TX_TXEX_SET(0) | HFA384x_TX_TXOK_SET(0);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* if we're using host WEP, increase size by IV+ICV */</div><div class='add'>+	if (p80211_wep-&gt;data) {</div><div class='add'>+		txdesc.data_len = host2hfa384x_16(skb-&gt;len+8);</div><div class='add'>+		//		txdesc.tx_control |= HFA384x_TX_NOENCRYPT_SET(1);</div><div class='add'>+	} else {</div><div class='add'>+		txdesc.data_len =  host2hfa384x_16(skb-&gt;len);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	txdesc.tx_control = host2hfa384x_16(txdesc.tx_control);</div><div class='add'>+	/* copy the header over to the txdesc */</div><div class='add'>+	memcpy(&amp;(txdesc.frame_control), p80211_hdr, sizeof(p80211_hdr_t));</div><div class='add'>+</div><div class='add'>+	/* Since tbusy is set whenever the stack is empty, there should</div><div class='add'>+	 * always be something on the stack if we get to this point.</div><div class='add'>+	 * [MSM]: NOT TRUE!!!!! so I added the test of fid below.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* Allocate FID */</div><div class='add'>+</div><div class='add'>+	fid = txfid_queue_remove(hw);</div><div class='add'>+</div><div class='add'>+	if ( fid == 0 ) { /* stack or queue was empty */</div><div class='add'>+		return 4;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* now let's get the cmdlock */</div><div class='add'>+	spin_lock(&amp;hw-&gt;cmdlock);</div><div class='add'>+</div><div class='add'>+	/* Copy descriptor+payload to FID */</div><div class='add'>+        if (p80211_wep-&gt;data) {</div><div class='add'>+		result = hfa384x_copy_to_bap4(hw, HFA384x_BAP_PROC, fid, 0,</div><div class='add'>+					      &amp;txdesc, sizeof(txdesc),</div><div class='add'>+					      p80211_wep-&gt;iv, sizeof(p80211_wep-&gt;iv),</div><div class='add'>+					      p80211_wep-&gt;data, skb-&gt;len,</div><div class='add'>+					      p80211_wep-&gt;icv, sizeof(p80211_wep-&gt;icv));</div><div class='add'>+	} else {</div><div class='add'>+		result = hfa384x_copy_to_bap4(hw, HFA384x_BAP_PROC, fid, 0,</div><div class='add'>+					      &amp;txdesc, sizeof(txdesc),</div><div class='add'>+					      skb-&gt;data, skb-&gt;len,</div><div class='add'>+					      NULL, 0, NULL, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ( result ) {</div><div class='add'>+		WLAN_LOG_DEBUG(1,</div><div class='add'>+			"copy_to_bap(%04x, %d, %d) failed, result=0x%x\n",</div><div class='add'>+			fid,</div><div class='add'>+		 	sizeof(txdesc),</div><div class='add'>+	 		skb-&gt;len,</div><div class='add'>+			result);</div><div class='add'>+</div><div class='add'>+		/* put the fid back in the queue */</div><div class='add'>+		txfid_queue_add(hw, fid);</div><div class='add'>+</div><div class='add'>+		result = 3;</div><div class='add'>+		goto failed;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Issue Tx command */</div><div class='add'>+	result = hfa384x_cmd_transmit(hw, HFA384x_TXCMD_RECL, macq, fid);</div><div class='add'>+</div><div class='add'>+	if ( result != 0 ) {</div><div class='add'>+		txfid_queue_add(hw, fid);</div><div class='add'>+</div><div class='add'>+		WLAN_LOG_DEBUG(1,"cmd_tx(%04x) failed, result=%d\n",</div><div class='add'>+			fid, result);</div><div class='add'>+		result = 3;</div><div class='add'>+		goto failed;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* indicate we haven't any buffers, int_alloc will clear */</div><div class='add'>+	result = txfid_queue_empty(hw);</div><div class='add'>+failed:</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;hw-&gt;cmdlock);</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_interrupt</div><div class='add'>+*</div><div class='add'>+* Driver interrupt handler.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	irq		irq number</div><div class='add'>+*	dev_id		pointer to the device</div><div class='add'>+*	regs		registers</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	nothing</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*	May result in a frame being passed up the stack or an info</div><div class='add'>+*	frame being handled.</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	Ummm, could it be interrupt?</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+irqreturn_t hfa384x_interrupt(int irq, void *dev_id PT_REGS)</div><div class='add'>+{</div><div class='add'>+	int			reg;</div><div class='add'>+	wlandevice_t		*wlandev = (wlandevice_t*)dev_id;</div><div class='add'>+	hfa384x_t		*hw = wlandev-&gt;priv;</div><div class='add'>+	int			ev_read = 0;</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	if (!wlandev || wlandev-&gt;hwremoved)</div><div class='add'>+		return IRQ_NONE;  /* Not much we can do w/o hardware */</div><div class='add'>+#if (WLAN_HOSTIF == WLAN_PCMCIA)</div><div class='add'>+	if (hw-&gt;iobase == 0)  /* XXX FIXME Properly */</div><div class='add'>+		return IRQ_NONE;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	for (;;ev_read++) {</div><div class='add'>+		if (ev_read &gt;= prism2_irq_evread_max)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		/* Check swsupport reg magic # for card presence */</div><div class='add'>+		reg = hfa384x_getreg(hw, HFA384x_SWSUPPORT0);</div><div class='add'>+		if ( reg != HFA384x_DRVR_MAGIC) {</div><div class='add'>+			WLAN_LOG_DEBUG(2, "irq=%d, no magic.  Card removed?.\n", irq);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* read the EvStat register for interrupt enabled events */</div><div class='add'>+		reg = hfa384x_getreg(hw, HFA384x_EVSTAT);</div><div class='add'>+</div><div class='add'>+		/* AND with the enabled interrupts */</div><div class='add'>+		reg &amp;= hfa384x_getreg(hw, HFA384x_INTEN);</div><div class='add'>+</div><div class='add'>+		/* Handle the events */</div><div class='add'>+		if ( HFA384x_EVSTAT_ISWTERR(reg) ){</div><div class='add'>+			WLAN_LOG_ERROR(</div><div class='add'>+			"Error: WTERR interrupt received (unhandled).\n");</div><div class='add'>+			hfa384x_setreg(hw, HFA384x_EVACK_WTERR_SET(1),</div><div class='add'>+				HFA384x_EVACK);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if ( HFA384x_EVSTAT_ISINFDROP(reg) ){</div><div class='add'>+			hfa384x_int_infdrop(wlandev);</div><div class='add'>+			hfa384x_setreg(hw, HFA384x_EVACK_INFDROP_SET(1),</div><div class='add'>+				HFA384x_EVACK);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (HFA384x_EVSTAT_ISBAP_OP(reg)) {</div><div class='add'>+			/* Disable the BAP interrupts */</div><div class='add'>+			hfa384x_events_nobap(hw);</div><div class='add'>+			tasklet_schedule(&amp;hw-&gt;bap_tasklet);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if ( HFA384x_EVSTAT_ISALLOC(reg) ){</div><div class='add'>+			hfa384x_int_alloc(wlandev);</div><div class='add'>+			hfa384x_setreg(hw, HFA384x_EVACK_ALLOC_SET(1),</div><div class='add'>+				HFA384x_EVACK);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if ( HFA384x_EVSTAT_ISDTIM(reg) ){</div><div class='add'>+			hfa384x_int_dtim(wlandev);</div><div class='add'>+			hfa384x_setreg(hw, HFA384x_EVACK_DTIM_SET(1),</div><div class='add'>+				HFA384x_EVACK);</div><div class='add'>+		}</div><div class='add'>+#ifdef CMD_IRQ</div><div class='add'>+		if ( HFA384x_EVSTAT_ISCMD(reg) ){</div><div class='add'>+			hfa384x_int_cmd(wlandev);</div><div class='add'>+			hfa384x_setreg(hw, HFA384x_EVACK_CMD_SET(1),</div><div class='add'>+				       HFA384x_EVACK);</div><div class='add'>+		}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+		/* allow the evstat to be updated after the evack */</div><div class='add'>+		udelay(20);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CMD_IRQ</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_int_cmd</div><div class='add'>+*</div><div class='add'>+* Handles command completion event.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		wlan device structure</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	nothing</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	interrupt</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+void hfa384x_int_cmd(wlandevice_t *wlandev)</div><div class='add'>+{</div><div class='add'>+	hfa384x_t		*hw = wlandev-&gt;priv;</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	// check to make sure it's the right command?</div><div class='add'>+	if (hw-&gt;cmddata) {</div><div class='add'>+		hw-&gt;cmddata-&gt;status = hfa384x_getreg(hw, HFA384x_STATUS);</div><div class='add'>+		hw-&gt;cmddata-&gt;resp0 = hfa384x_getreg(hw, HFA384x_RESP0);</div><div class='add'>+		hw-&gt;cmddata-&gt;resp1 = hfa384x_getreg(hw, HFA384x_RESP1);</div><div class='add'>+		hw-&gt;cmddata-&gt;resp2 = hfa384x_getreg(hw, HFA384x_RESP2);</div><div class='add'>+	}</div><div class='add'>+	hw-&gt;cmdflag = 1;</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "um. int_cmd\n");</div><div class='add'>+</div><div class='add'>+	wake_up_interruptible(&amp;hw-&gt;cmdq);</div><div class='add'>+</div><div class='add'>+	// XXXX perform a bap copy too?</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_int_dtim</div><div class='add'>+*</div><div class='add'>+* Handles the DTIM early warning event.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		wlan device structure</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	nothing</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	interrupt</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+static void hfa384x_int_dtim(wlandevice_t *wlandev)</div><div class='add'>+{</div><div class='add'>+#if 0</div><div class='add'>+	hfa384x_t		*hw = wlandev-&gt;priv;</div><div class='add'>+#endif</div><div class='add'>+	DBFENTER;</div><div class='add'>+	prism2sta_ev_dtim(wlandev);</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_int_infdrop</div><div class='add'>+*</div><div class='add'>+* Handles the InfDrop event.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		wlan device structure</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	nothing</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	interrupt</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+static void hfa384x_int_infdrop(wlandevice_t *wlandev)</div><div class='add'>+{</div><div class='add'>+#if 0</div><div class='add'>+	hfa384x_t		*hw = wlandev-&gt;priv;</div><div class='add'>+#endif</div><div class='add'>+	DBFENTER;</div><div class='add'>+	prism2sta_ev_infdrop(wlandev);</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_int_info</div><div class='add'>+*</div><div class='add'>+* Handles the Info event.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		wlan device structure</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	nothing</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	tasklet</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+static void hfa384x_int_info(wlandevice_t *wlandev)</div><div class='add'>+{</div><div class='add'>+	hfa384x_t		*hw = wlandev-&gt;priv;</div><div class='add'>+	UINT16			reg;</div><div class='add'>+	hfa384x_InfFrame_t	inf;</div><div class='add'>+	int			result;</div><div class='add'>+	DBFENTER;</div><div class='add'>+	/* Retrieve the FID */</div><div class='add'>+	reg = hfa384x_getreg(hw, HFA384x_INFOFID);</div><div class='add'>+</div><div class='add'>+	/* Retrieve the length */</div><div class='add'>+	result = hfa384x_copy_from_bap( hw,</div><div class='add'>+		HFA384x_BAP_INT, reg, 0, &amp;inf.framelen, sizeof(UINT16));</div><div class='add'>+	if ( result ) {</div><div class='add'>+		WLAN_LOG_DEBUG(1,</div><div class='add'>+			"copy_from_bap(0x%04x, 0, %d) failed, result=0x%x\n",</div><div class='add'>+			reg, sizeof(inf), result);</div><div class='add'>+		goto failed;</div><div class='add'>+	}</div><div class='add'>+	inf.framelen = hfa384x2host_16(inf.framelen);</div><div class='add'>+</div><div class='add'>+	/* Retrieve the rest */</div><div class='add'>+	result = hfa384x_copy_from_bap( hw,</div><div class='add'>+		HFA384x_BAP_INT, reg, sizeof(UINT16),</div><div class='add'>+		&amp;(inf.infotype), inf.framelen * sizeof(UINT16));</div><div class='add'>+	if ( result ) {</div><div class='add'>+		WLAN_LOG_DEBUG(1,</div><div class='add'>+			"copy_from_bap(0x%04x, 0, %d) failed, result=0x%x\n",</div><div class='add'>+			reg, sizeof(inf), result);</div><div class='add'>+		goto failed;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	prism2sta_ev_info(wlandev, &amp;inf);</div><div class='add'>+failed:</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_int_txexc</div><div class='add'>+*</div><div class='add'>+* Handles the TxExc event.  A Transmit Exception event indicates</div><div class='add'>+* that the MAC's TX process was unsuccessful - so the packet did</div><div class='add'>+* not get transmitted.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		wlan device structure</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	nothing</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	tasklet</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+static void hfa384x_int_txexc(wlandevice_t *wlandev)</div><div class='add'>+{</div><div class='add'>+	hfa384x_t		*hw = wlandev-&gt;priv;</div><div class='add'>+	UINT16			status;</div><div class='add'>+	UINT16			fid;</div><div class='add'>+	int			result = 0;</div><div class='add'>+	DBFENTER;</div><div class='add'>+	/* Collect the status and display */</div><div class='add'>+	fid = hfa384x_getreg(hw, HFA384x_TXCOMPLFID);</div><div class='add'>+	result = hfa384x_copy_from_bap(hw, HFA384x_BAP_INT, fid, 0, &amp;status, sizeof(status));</div><div class='add'>+	if ( result ) {</div><div class='add'>+		WLAN_LOG_DEBUG(1,</div><div class='add'>+			"copy_from_bap(0x%04x, 0, %d) failed, result=0x%x\n",</div><div class='add'>+			fid, sizeof(status), result);</div><div class='add'>+		goto failed;</div><div class='add'>+	}</div><div class='add'>+	status = hfa384x2host_16(status);</div><div class='add'>+	prism2sta_ev_txexc(wlandev, status);</div><div class='add'>+failed:</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_int_tx</div><div class='add'>+*</div><div class='add'>+* Handles the Tx event.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		wlan device structure</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	nothing</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	tasklet</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+static void hfa384x_int_tx(wlandevice_t *wlandev)</div><div class='add'>+{</div><div class='add'>+	hfa384x_t		*hw = wlandev-&gt;priv;</div><div class='add'>+	UINT16			fid;</div><div class='add'>+	UINT16			status;</div><div class='add'>+	int			result = 0;</div><div class='add'>+	DBFENTER;</div><div class='add'>+	fid = hfa384x_getreg(hw, HFA384x_TXCOMPLFID);</div><div class='add'>+	result = hfa384x_copy_from_bap(hw, HFA384x_BAP_INT, fid, 0, &amp;status, sizeof(status));</div><div class='add'>+	if ( result ) {</div><div class='add'>+		WLAN_LOG_DEBUG(1,</div><div class='add'>+			"copy_from_bap(0x%04x, 0, %d) failed, result=0x%x\n",</div><div class='add'>+			fid, sizeof(status), result);</div><div class='add'>+		goto failed;</div><div class='add'>+	}</div><div class='add'>+	status = hfa384x2host_16(status);</div><div class='add'>+	prism2sta_ev_tx(wlandev, status);</div><div class='add'>+failed:</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_int_rx</div><div class='add'>+*</div><div class='add'>+* Handles the Rx event.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		wlan device structure</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	nothing</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	tasklet</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+static void hfa384x_int_rx(wlandevice_t *wlandev)</div><div class='add'>+{</div><div class='add'>+	hfa384x_t		*hw = wlandev-&gt;priv;</div><div class='add'>+	UINT16			rxfid;</div><div class='add'>+	hfa384x_rx_frame_t	rxdesc;</div><div class='add'>+	int			result;</div><div class='add'>+	int                     hdrlen;</div><div class='add'>+	UINT16                  fc;</div><div class='add'>+	p80211_rxmeta_t	*rxmeta;</div><div class='add'>+	struct sk_buff          *skb = NULL;</div><div class='add'>+	UINT8 *datap;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	/* Get the FID */</div><div class='add'>+	rxfid = hfa384x_getreg(hw, HFA384x_RXFID);</div><div class='add'>+	/* Get the descriptor (including headers) */</div><div class='add'>+	result = hfa384x_copy_from_bap(hw,</div><div class='add'>+			HFA384x_BAP_INT,</div><div class='add'>+			rxfid,</div><div class='add'>+			0,</div><div class='add'>+			&amp;rxdesc,</div><div class='add'>+			sizeof(rxdesc));</div><div class='add'>+	if ( result ) {</div><div class='add'>+		WLAN_LOG_DEBUG(1,</div><div class='add'>+			"copy_from_bap(0x%04x, %d, %d) failed, result=0x%x\n",</div><div class='add'>+			rxfid,</div><div class='add'>+			0,</div><div class='add'>+			sizeof(rxdesc),</div><div class='add'>+			result);</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Byte order convert once up front. */</div><div class='add'>+	rxdesc.status =	hfa384x2host_16(rxdesc.status);</div><div class='add'>+	rxdesc.time =	hfa384x2host_32(rxdesc.time);</div><div class='add'>+</div><div class='add'>+	/* drop errors and whatnot in promisc mode */</div><div class='add'>+	if (( wlandev-&gt;netdev-&gt;flags &amp; IFF_PROMISC ) &amp;&amp;</div><div class='add'>+	    (HFA384x_RXSTATUS_ISFCSERR(rxdesc.status) ||</div><div class='add'>+	     HFA384x_RXSTATUS_ISUNDECR(rxdesc.status)))</div><div class='add'>+	  goto done;</div><div class='add'>+</div><div class='add'>+	/* Now handle frame based on port# */</div><div class='add'>+	switch( HFA384x_RXSTATUS_MACPORT_GET(rxdesc.status) )</div><div class='add'>+	{</div><div class='add'>+	case 0:</div><div class='add'>+</div><div class='add'>+		fc = ieee2host16(rxdesc.frame_control);</div><div class='add'>+</div><div class='add'>+		/* If exclude and we receive an unencrypted, drop it */</div><div class='add'>+		if ( (wlandev-&gt;hostwep &amp; HOSTWEP_EXCLUDEUNENCRYPTED) &amp;&amp;</div><div class='add'>+		     !WLAN_GET_FC_ISWEP(fc)) {</div><div class='add'>+			goto done;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		hdrlen = p80211_headerlen(fc);</div><div class='add'>+</div><div class='add'>+		/* Allocate the buffer, note CRC (aka FCS). pballoc */</div><div class='add'>+		/* assumes there needs to be space for one */</div><div class='add'>+		skb = dev_alloc_skb(hfa384x2host_16(rxdesc.data_len) + hdrlen + WLAN_CRC_LEN + 2); /* a little extra */</div><div class='add'>+</div><div class='add'>+		if ( ! skb ) {</div><div class='add'>+			WLAN_LOG_ERROR("alloc_skb failed.\n");</div><div class='add'>+			goto done;</div><div class='add'>+                }</div><div class='add'>+</div><div class='add'>+		skb-&gt;dev = wlandev-&gt;netdev;</div><div class='add'>+</div><div class='add'>+		/* theoretically align the IP header on a 32-bit word. */</div><div class='add'>+		if ( hdrlen == WLAN_HDR_A4_LEN )</div><div class='add'>+			skb_reserve(skb, 2);</div><div class='add'>+</div><div class='add'>+		/* Copy the 802.11 hdr to the buffer */</div><div class='add'>+		datap = skb_put(skb, WLAN_HDR_A3_LEN);</div><div class='add'>+		memcpy(datap, &amp;rxdesc.frame_control, WLAN_HDR_A3_LEN);</div><div class='add'>+</div><div class='add'>+		/* Snag the A4 address if present */</div><div class='add'>+		if (hdrlen == WLAN_HDR_A4_LEN) {</div><div class='add'>+			datap = skb_put(skb, WLAN_ADDR_LEN);</div><div class='add'>+			memcpy(datap, &amp;rxdesc.address4, WLAN_HDR_A3_LEN);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* we can convert the data_len as we passed the original on */</div><div class='add'>+		rxdesc.data_len = hfa384x2host_16(rxdesc.data_len);</div><div class='add'>+</div><div class='add'>+		/* Copy the payload data to the buffer */</div><div class='add'>+		if ( rxdesc.data_len &gt; 0 ) {</div><div class='add'>+			datap = skb_put(skb, rxdesc.data_len);</div><div class='add'>+			result = hfa384x_copy_from_bap(hw,</div><div class='add'>+				HFA384x_BAP_INT, rxfid, HFA384x_RX_DATA_OFF,</div><div class='add'>+				datap, rxdesc.data_len);</div><div class='add'>+			if ( result ) {</div><div class='add'>+				WLAN_LOG_DEBUG(1,</div><div class='add'>+					"copy_from_bap(0x%04x, %d, %d) failed, result=0x%x\n",</div><div class='add'>+					rxfid,</div><div class='add'>+					HFA384x_RX_DATA_OFF,</div><div class='add'>+					rxdesc.data_len,</div><div class='add'>+					result);</div><div class='add'>+				goto failed;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		/* the prism2 cards don't return the FCS */</div><div class='add'>+		datap = skb_put(skb, WLAN_CRC_LEN);</div><div class='add'>+		memset (datap, 0xff, WLAN_CRC_LEN);</div><div class='add'>+		skb_reset_mac_header(skb);</div><div class='add'>+</div><div class='add'>+		/* Attach the rxmeta, set some stuff */</div><div class='add'>+		p80211skb_rxmeta_attach(wlandev, skb);</div><div class='add'>+		rxmeta = P80211SKB_RXMETA(skb);</div><div class='add'>+		rxmeta-&gt;mactime = rxdesc.time;</div><div class='add'>+		rxmeta-&gt;rxrate = rxdesc.rate;</div><div class='add'>+		rxmeta-&gt;signal = rxdesc.signal - hw-&gt;dbmadjust;</div><div class='add'>+		rxmeta-&gt;noise = rxdesc.silence - hw-&gt;dbmadjust;</div><div class='add'>+</div><div class='add'>+		prism2sta_ev_rx(wlandev, skb);</div><div class='add'>+		goto done;</div><div class='add'>+	case 7:</div><div class='add'>+</div><div class='add'>+        	if ( ! HFA384x_RXSTATUS_ISFCSERR(rxdesc.status) ) {</div><div class='add'>+                        hfa384x_int_rxmonitor( wlandev, rxfid, &amp;rxdesc);</div><div class='add'>+                } else {</div><div class='add'>+                        WLAN_LOG_DEBUG(3,"Received monitor frame: FCSerr set\n");</div><div class='add'>+                }</div><div class='add'>+		goto done;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+</div><div class='add'>+		WLAN_LOG_WARNING("Received frame on unsupported port=%d\n",</div><div class='add'>+			HFA384x_RXSTATUS_MACPORT_GET(rxdesc.status) );</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+ failed:</div><div class='add'>+	dev_kfree_skb(skb);</div><div class='add'>+</div><div class='add'>+ done:</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_int_rxmonitor</div><div class='add'>+*</div><div class='add'>+* Helper function for int_rx.  Handles monitor frames.</div><div class='add'>+* Note that this function allocates space for the FCS and sets it</div><div class='add'>+* to 0xffffffff.  The hfa384x doesn't give us the FCS value but the</div><div class='add'>+* higher layers expect it.  0xffffffff is used as a flag to indicate</div><div class='add'>+* the FCS is bogus.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		wlan device structure</div><div class='add'>+*	rxfid		received FID</div><div class='add'>+*	rxdesc		rx descriptor read from card in int_rx</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	nothing</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*	Allocates an skb and passes it up via the PF_PACKET interface.</div><div class='add'>+* Call context:</div><div class='add'>+*	interrupt</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+static void hfa384x_int_rxmonitor( wlandevice_t *wlandev, UINT16 rxfid,</div><div class='add'>+				   hfa384x_rx_frame_t *rxdesc)</div><div class='add'>+{</div><div class='add'>+	hfa384x_t			*hw = wlandev-&gt;priv;</div><div class='add'>+	UINT				hdrlen = 0;</div><div class='add'>+	UINT				datalen = 0;</div><div class='add'>+	UINT				skblen = 0;</div><div class='add'>+	UINT				truncated = 0;</div><div class='add'>+	UINT8				*datap;</div><div class='add'>+	UINT16				fc;</div><div class='add'>+	struct sk_buff			*skb;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+	/* Don't forget the status, time, and data_len fields are in host order */</div><div class='add'>+	/* Figure out how big the frame is */</div><div class='add'>+	fc = ieee2host16(rxdesc-&gt;frame_control);</div><div class='add'>+	hdrlen = p80211_headerlen(fc);</div><div class='add'>+	datalen = hfa384x2host_16(rxdesc-&gt;data_len);</div><div class='add'>+</div><div class='add'>+	/* Allocate an ind message+framesize skb */</div><div class='add'>+	skblen = sizeof(p80211msg_lnxind_wlansniffrm_t) +</div><div class='add'>+		hdrlen + datalen + WLAN_CRC_LEN;</div><div class='add'>+</div><div class='add'>+	/* sanity check the length */</div><div class='add'>+	if ( skblen &gt;</div><div class='add'>+		(sizeof(p80211msg_lnxind_wlansniffrm_t) +</div><div class='add'>+		WLAN_HDR_A4_LEN + WLAN_DATA_MAXLEN + WLAN_CRC_LEN) ) {</div><div class='add'>+		WLAN_LOG_DEBUG(1, "overlen frm: len=%d\n",</div><div class='add'>+			skblen - sizeof(p80211msg_lnxind_wlansniffrm_t));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ( (skb = dev_alloc_skb(skblen)) == NULL ) {</div><div class='add'>+		WLAN_LOG_ERROR("alloc_skb failed trying to allocate %d bytes\n", skblen);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* only prepend the prism header if in the right mode */</div><div class='add'>+	if ((wlandev-&gt;netdev-&gt;type == ARPHRD_IEEE80211_PRISM) &amp;&amp;</div><div class='add'>+	    (hw-&gt;sniffhdr == 0)) {</div><div class='add'>+		p80211msg_lnxind_wlansniffrm_t	*msg;</div><div class='add'>+		datap = skb_put(skb, sizeof(p80211msg_lnxind_wlansniffrm_t));</div><div class='add'>+		msg = (p80211msg_lnxind_wlansniffrm_t*) datap;</div><div class='add'>+</div><div class='add'>+		/* Initialize the message members */</div><div class='add'>+		msg-&gt;msgcode = DIDmsg_lnxind_wlansniffrm;</div><div class='add'>+		msg-&gt;msglen = sizeof(p80211msg_lnxind_wlansniffrm_t);</div><div class='add'>+		strcpy(msg-&gt;devname, wlandev-&gt;name);</div><div class='add'>+</div><div class='add'>+		msg-&gt;hosttime.did = DIDmsg_lnxind_wlansniffrm_hosttime;</div><div class='add'>+		msg-&gt;hosttime.status = 0;</div><div class='add'>+		msg-&gt;hosttime.len = 4;</div><div class='add'>+		msg-&gt;hosttime.data = jiffies;</div><div class='add'>+</div><div class='add'>+		msg-&gt;mactime.did = DIDmsg_lnxind_wlansniffrm_mactime;</div><div class='add'>+		msg-&gt;mactime.status = 0;</div><div class='add'>+		msg-&gt;mactime.len = 4;</div><div class='add'>+		msg-&gt;mactime.data = rxdesc-&gt;time * 1000;</div><div class='add'>+</div><div class='add'>+		msg-&gt;channel.did = DIDmsg_lnxind_wlansniffrm_channel;</div><div class='add'>+		msg-&gt;channel.status = 0;</div><div class='add'>+		msg-&gt;channel.len = 4;</div><div class='add'>+		msg-&gt;channel.data = hw-&gt;sniff_channel;</div><div class='add'>+</div><div class='add'>+		msg-&gt;rssi.did = DIDmsg_lnxind_wlansniffrm_rssi;</div><div class='add'>+		msg-&gt;rssi.status = P80211ENUM_msgitem_status_no_value;</div><div class='add'>+		msg-&gt;rssi.len = 4;</div><div class='add'>+		msg-&gt;rssi.data = 0;</div><div class='add'>+</div><div class='add'>+		msg-&gt;sq.did = DIDmsg_lnxind_wlansniffrm_sq;</div><div class='add'>+		msg-&gt;sq.status = P80211ENUM_msgitem_status_no_value;</div><div class='add'>+		msg-&gt;sq.len = 4;</div><div class='add'>+		msg-&gt;sq.data = 0;</div><div class='add'>+</div><div class='add'>+		msg-&gt;signal.did = DIDmsg_lnxind_wlansniffrm_signal;</div><div class='add'>+		msg-&gt;signal.status = 0;</div><div class='add'>+		msg-&gt;signal.len = 4;</div><div class='add'>+		msg-&gt;signal.data = rxdesc-&gt;signal;</div><div class='add'>+</div><div class='add'>+		msg-&gt;noise.did = DIDmsg_lnxind_wlansniffrm_noise;</div><div class='add'>+		msg-&gt;noise.status = 0;</div><div class='add'>+		msg-&gt;noise.len = 4;</div><div class='add'>+		msg-&gt;noise.data = rxdesc-&gt;silence;</div><div class='add'>+</div><div class='add'>+		msg-&gt;rate.did = DIDmsg_lnxind_wlansniffrm_rate;</div><div class='add'>+		msg-&gt;rate.status = 0;</div><div class='add'>+		msg-&gt;rate.len = 4;</div><div class='add'>+		msg-&gt;rate.data = rxdesc-&gt;rate / 5; /* set to 802.11 units */</div><div class='add'>+</div><div class='add'>+		msg-&gt;istx.did = DIDmsg_lnxind_wlansniffrm_istx;</div><div class='add'>+		msg-&gt;istx.status = 0;</div><div class='add'>+		msg-&gt;istx.len = 4;</div><div class='add'>+		msg-&gt;istx.data = P80211ENUM_truth_false;</div><div class='add'>+</div><div class='add'>+		msg-&gt;frmlen.did = DIDmsg_lnxind_wlansniffrm_frmlen;</div><div class='add'>+		msg-&gt;frmlen.status = 0;</div><div class='add'>+		msg-&gt;frmlen.len = 4;</div><div class='add'>+		msg-&gt;frmlen.data = hdrlen + datalen + WLAN_CRC_LEN;</div><div class='add'>+	} else if ((wlandev-&gt;netdev-&gt;type == ARPHRD_IEEE80211_PRISM) &amp;&amp;</div><div class='add'>+		   (hw-&gt;sniffhdr != 0)) {</div><div class='add'>+		p80211_caphdr_t		*caphdr;</div><div class='add'>+		/* The NEW header format! */</div><div class='add'>+		datap = skb_put(skb, sizeof(p80211_caphdr_t));</div><div class='add'>+		caphdr = (p80211_caphdr_t*) datap;</div><div class='add'>+</div><div class='add'>+		caphdr-&gt;version =	htonl(P80211CAPTURE_VERSION);</div><div class='add'>+		caphdr-&gt;length =	htonl(sizeof(p80211_caphdr_t));</div><div class='add'>+		caphdr-&gt;mactime =	__cpu_to_be64(rxdesc-&gt;time);</div><div class='add'>+		caphdr-&gt;hosttime =	__cpu_to_be64(jiffies);</div><div class='add'>+		caphdr-&gt;phytype =	htonl(4); /* dss_dot11_b */</div><div class='add'>+		caphdr-&gt;channel =	htonl(hw-&gt;sniff_channel);</div><div class='add'>+		caphdr-&gt;datarate =	htonl(rxdesc-&gt;rate);</div><div class='add'>+		caphdr-&gt;antenna =	htonl(0); /* unknown */</div><div class='add'>+		caphdr-&gt;priority =	htonl(0); /* unknown */</div><div class='add'>+		caphdr-&gt;ssi_type =	htonl(3); /* rssi_raw */</div><div class='add'>+		caphdr-&gt;ssi_signal =	htonl(rxdesc-&gt;signal);</div><div class='add'>+		caphdr-&gt;ssi_noise =	htonl(rxdesc-&gt;silence);</div><div class='add'>+		caphdr-&gt;preamble =	htonl(0); /* unknown */</div><div class='add'>+		caphdr-&gt;encoding =	htonl(1); /* cck */</div><div class='add'>+	}</div><div class='add'>+	/* Copy the 802.11 header to the skb (ctl frames may be less than a full header) */</div><div class='add'>+	datap = skb_put(skb, hdrlen);</div><div class='add'>+	memcpy( datap, &amp;(rxdesc-&gt;frame_control), hdrlen);</div><div class='add'>+</div><div class='add'>+	/* If any, copy the data from the card to the skb */</div><div class='add'>+	if ( datalen &gt; 0 )</div><div class='add'>+	{</div><div class='add'>+		/* Truncate the packet if the user wants us to */</div><div class='add'>+		UINT	dataread = datalen;</div><div class='add'>+		if(hw-&gt;sniff_truncate &gt; 0 &amp;&amp; dataread &gt; hw-&gt;sniff_truncate) {</div><div class='add'>+			dataread = hw-&gt;sniff_truncate;</div><div class='add'>+			truncated = 1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		datap = skb_put(skb, dataread);</div><div class='add'>+		hfa384x_copy_from_bap(hw,</div><div class='add'>+			HFA384x_BAP_INT, rxfid, HFA384x_RX_DATA_OFF,</div><div class='add'>+			datap, dataread);</div><div class='add'>+</div><div class='add'>+		/* check for unencrypted stuff if WEP bit set. */</div><div class='add'>+		if (*(datap - hdrlen + 1) &amp; 0x40) // wep set</div><div class='add'>+		  if ((*(datap) == 0xaa) &amp;&amp; (*(datap+1) == 0xaa))</div><div class='add'>+		    *(datap - hdrlen + 1) &amp;= 0xbf; // clear wep; it's the 802.2 header!</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!truncated &amp;&amp; hw-&gt;sniff_fcs) {</div><div class='add'>+		/* Set the FCS */</div><div class='add'>+		datap = skb_put(skb, WLAN_CRC_LEN);</div><div class='add'>+		memset( datap, 0xff, WLAN_CRC_LEN);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* pass it back up */</div><div class='add'>+	prism2sta_ev_rx(wlandev, skb);</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_int_alloc</div><div class='add'>+*</div><div class='add'>+* Handles the Alloc event.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		wlan device structure</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	nothing</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	interrupt</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+static void hfa384x_int_alloc(wlandevice_t *wlandev)</div><div class='add'>+{</div><div class='add'>+	hfa384x_t		*hw = wlandev-&gt;priv;</div><div class='add'>+	UINT16			fid;</div><div class='add'>+	INT16			result;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	/* Handle the reclaimed FID */</div><div class='add'>+	/*   collect the FID and push it onto the stack */</div><div class='add'>+	fid = hfa384x_getreg(hw, HFA384x_ALLOCFID);</div><div class='add'>+</div><div class='add'>+	if ( fid != hw-&gt;infofid ) { /* It's a transmit fid */</div><div class='add'>+		WLAN_LOG_DEBUG(5, "int_alloc(%#x)\n", fid);</div><div class='add'>+		result = txfid_queue_add(hw, fid);</div><div class='add'>+		if (result != -1) {</div><div class='add'>+			prism2sta_ev_alloc(wlandev);</div><div class='add'>+			WLAN_LOG_DEBUG(5, "q_add.\n");</div><div class='add'>+		} else {</div><div class='add'>+			WLAN_LOG_DEBUG(5, "q_full.\n");</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		/* unlock the info fid */</div><div class='add'>+		up(&amp;hw-&gt;infofid_sem);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_drvr_handover</div><div class='add'>+*</div><div class='add'>+* Sends a handover notification to the MAC.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw		device structure</div><div class='add'>+*	addr		address of station that's left</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	zero		success.</div><div class='add'>+*	-ERESTARTSYS	received signal while waiting for semaphore.</div><div class='add'>+*	-EIO		failed to write to bap, or failed in cmd.</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread, NOTE: this call may block on a semaphore!</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int hfa384x_drvr_handover( hfa384x_t *hw, UINT8 *addr)</div><div class='add'>+{</div><div class='add'>+	int			result = 0;</div><div class='add'>+        hfa384x_HandoverAddr_t  rec;</div><div class='add'>+        UINT                    len;</div><div class='add'>+        DBFENTER;</div><div class='add'>+</div><div class='add'>+	/* Acquire the infofid */</div><div class='add'>+	if ( down_interruptible(&amp;hw-&gt;infofid_sem) ) {</div><div class='add'>+		result = -ERESTARTSYS;</div><div class='add'>+		goto failed;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+        /* Set up the record */</div><div class='add'>+        len = sizeof(hfa384x_HandoverAddr_t);</div><div class='add'>+        rec.framelen = host2hfa384x_16(len/2 - 1);</div><div class='add'>+        rec.infotype = host2hfa384x_16(HFA384x_IT_HANDOVERADDR);</div><div class='add'>+        memcpy(rec.handover_addr, addr, sizeof(rec.handover_addr));</div><div class='add'>+</div><div class='add'>+        /* Issue the command */</div><div class='add'>+        result = hfa384x_cmd_notify(hw, 1, hw-&gt;infofid, &amp;rec, len);</div><div class='add'>+</div><div class='add'>+        if ( result != 0 ) {</div><div class='add'>+                WLAN_LOG_DEBUG(1,"cmd_notify(%04x) failed, result=%d",</div><div class='add'>+                        hw-&gt;infofid, result);</div><div class='add'>+		result = -EIO;</div><div class='add'>+                goto failed;</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+failed:</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void hfa384x_tx_timeout(wlandevice_t *wlandev)</div><div class='add'>+{</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	WLAN_LOG_WARNING("Implement me.\n");</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Handles all "rx" BAP operations */</div><div class='add'>+static void     hfa384x_bap_tasklet(unsigned long data)</div><div class='add'>+{</div><div class='add'>+	hfa384x_t *hw = (hfa384x_t *) data;</div><div class='add'>+	wlandevice_t *wlandev = hw-&gt;wlandev;</div><div class='add'>+	int counter = prism2_irq_evread_max;</div><div class='add'>+	int			reg;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	while (counter-- &gt; 0) {</div><div class='add'>+		/* Get interrupt register */</div><div class='add'>+		reg = hfa384x_getreg(hw, HFA384x_EVSTAT);</div><div class='add'>+</div><div class='add'>+		if ((reg == 0xffff) ||</div><div class='add'>+		    !(reg &amp; HFA384x_INT_BAP_OP)) {</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if ( HFA384x_EVSTAT_ISINFO(reg) ){</div><div class='add'>+			hfa384x_int_info(wlandev);</div><div class='add'>+			hfa384x_setreg(hw, HFA384x_EVACK_INFO_SET(1),</div><div class='add'>+				HFA384x_EVACK);</div><div class='add'>+		}</div><div class='add'>+		if ( HFA384x_EVSTAT_ISTXEXC(reg) ){</div><div class='add'>+			hfa384x_int_txexc(wlandev);</div><div class='add'>+			hfa384x_setreg(hw, HFA384x_EVACK_TXEXC_SET(1),</div><div class='add'>+				HFA384x_EVACK);</div><div class='add'>+		}</div><div class='add'>+		if ( HFA384x_EVSTAT_ISTX(reg) ){</div><div class='add'>+			hfa384x_int_tx(wlandev);</div><div class='add'>+			hfa384x_setreg(hw, HFA384x_EVACK_TX_SET(1),</div><div class='add'>+				HFA384x_EVACK);</div><div class='add'>+		}</div><div class='add'>+		if ( HFA384x_EVSTAT_ISRX(reg) ){</div><div class='add'>+			hfa384x_int_rx(wlandev);</div><div class='add'>+			hfa384x_setreg(hw, HFA384x_EVACK_RX_SET(1),</div><div class='add'>+				HFA384x_EVACK);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* re-enable interrupts */</div><div class='add'>+	hfa384x_events_all(hw);</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/staging/wlan-ng/hfa384x.h b/drivers/staging/wlan-ng/hfa384x.h<br/>new file mode 100644<br/>index 000000000000..a2054639d24b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/wlan-ng/hfa384x.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/wlan-ng/hfa384x.h</a></div><div class='hunk'>@@ -0,0 +1,3067 @@</div><div class='add'>+/* hfa384x.h</div><div class='add'>+*</div><div class='add'>+* Defines the constants and data structures for the hfa384x</div><div class='add'>+*</div><div class='add'>+* Copyright (C) 1999 AbsoluteValue Systems, Inc.  All Rights Reserved.</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* linux-wlan</div><div class='add'>+*</div><div class='add'>+*   The contents of this file are subject to the Mozilla Public</div><div class='add'>+*   License Version 1.1 (the "License"); you may not use this file</div><div class='add'>+*   except in compliance with the License. You may obtain a copy of</div><div class='add'>+*   the License at http://www.mozilla.org/MPL/</div><div class='add'>+*</div><div class='add'>+*   Software distributed under the License is distributed on an "AS</div><div class='add'>+*   IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or</div><div class='add'>+*   implied. See the License for the specific language governing</div><div class='add'>+*   rights and limitations under the License.</div><div class='add'>+*</div><div class='add'>+*   Alternatively, the contents of this file may be used under the</div><div class='add'>+*   terms of the GNU Public License version 2 (the "GPL"), in which</div><div class='add'>+*   case the provisions of the GPL are applicable instead of the</div><div class='add'>+*   above.  If you wish to allow the use of your version of this file</div><div class='add'>+*   only under the terms of the GPL and not to allow others to use</div><div class='add'>+*   your version of this file under the MPL, indicate your decision</div><div class='add'>+*   by deleting the provisions above and replace them with the notice</div><div class='add'>+*   and other provisions required by the GPL.  If you do not delete</div><div class='add'>+*   the provisions above, a recipient may use your version of this</div><div class='add'>+*   file under either the MPL or the GPL.</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* Inquiries regarding the linux-wlan Open Source project can be</div><div class='add'>+* made directly to:</div><div class='add'>+*</div><div class='add'>+* AbsoluteValue Systems Inc.</div><div class='add'>+* info@linux-wlan.com</div><div class='add'>+* http://www.linux-wlan.com</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* Portions of the development of this software were funded by</div><div class='add'>+* Intersil Corporation as part of PRISM(R) chipset product development.</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+*   [Implementation and usage notes]</div><div class='add'>+*</div><div class='add'>+*   [References]</div><div class='add'>+*	CW10 Programmer's Manual v1.5</div><div class='add'>+*	IEEE 802.11 D10.0</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#ifndef _HFA384x_H</div><div class='add'>+#define _HFA384x_H</div><div class='add'>+</div><div class='add'>+/*=============================================================*/</div><div class='add'>+#define HFA384x_FIRMWARE_VERSION(a,b,c) (((a) &lt;&lt; 16) + ((b) &lt;&lt; 8) + (c))</div><div class='add'>+</div><div class='add'>+#define HFA384x_LEVEL_TO_dBm(v)   (0x100 + (v) * 100 / 255 - 100)</div><div class='add'>+</div><div class='add'>+/*------ Constants --------------------------------------------*/</div><div class='add'>+/*--- Mins &amp; Maxs -----------------------------------*/</div><div class='add'>+#define		HFA384x_CMD_ALLOC_LEN_MIN	((UINT16)4)</div><div class='add'>+#define		HFA384x_CMD_ALLOC_LEN_MAX	((UINT16)2400)</div><div class='add'>+#define		HFA384x_BAP_DATALEN_MAX		((UINT16)4096)</div><div class='add'>+#define		HFA384x_BAP_OFFSET_MAX		((UINT16)4096)</div><div class='add'>+#define		HFA384x_PORTID_MAX		((UINT16)7)</div><div class='add'>+#define		HFA384x_NUMPORTS_MAX		((UINT16)(HFA384x_PORTID_MAX+1))</div><div class='add'>+#define		HFA384x_PDR_LEN_MAX		((UINT16)512)	/* in bytes, from EK */</div><div class='add'>+#define		HFA384x_PDA_RECS_MAX		((UINT16)200)	/* a guess */</div><div class='add'>+#define		HFA384x_PDA_LEN_MAX		((UINT16)1024)	/* in bytes, from EK */</div><div class='add'>+#define		HFA384x_SCANRESULT_MAX		((UINT16)31)</div><div class='add'>+#define		HFA384x_HSCANRESULT_MAX		((UINT16)31)</div><div class='add'>+#define		HFA384x_CHINFORESULT_MAX	((UINT16)16)</div><div class='add'>+#define		HFA384x_DRVR_FIDSTACKLEN_MAX	(10)</div><div class='add'>+#define		HFA384x_DRVR_TXBUF_MAX		(sizeof(hfa384x_tx_frame_t) + \</div><div class='add'>+						WLAN_DATA_MAXLEN - \</div><div class='add'>+						WLAN_WEP_IV_LEN - \</div><div class='add'>+						WLAN_WEP_ICV_LEN + 2)</div><div class='add'>+#define		HFA384x_DRVR_MAGIC		(0x4a2d)</div><div class='add'>+#define		HFA384x_INFODATA_MAXLEN		(sizeof(hfa384x_infodata_t))</div><div class='add'>+#define		HFA384x_INFOFRM_MAXLEN		(sizeof(hfa384x_InfFrame_t))</div><div class='add'>+#define		HFA384x_RID_GUESSING_MAXLEN	2048  /* I'm not really sure */</div><div class='add'>+#define		HFA384x_RIDDATA_MAXLEN		HFA384x_RID_GUESSING_MAXLEN</div><div class='add'>+#define		HFA384x_USB_RWMEM_MAXLEN	2048</div><div class='add'>+</div><div class='add'>+/*--- Support Constants -----------------------------*/</div><div class='add'>+#define		HFA384x_BAP_PROC			((UINT16)0)</div><div class='add'>+#define		HFA384x_BAP_INT				((UINT16)1)</div><div class='add'>+#define		HFA384x_PORTTYPE_IBSS			((UINT16)0)</div><div class='add'>+#define		HFA384x_PORTTYPE_BSS			((UINT16)1)</div><div class='add'>+#define		HFA384x_PORTTYPE_WDS			((UINT16)2)</div><div class='add'>+#define		HFA384x_PORTTYPE_PSUEDOIBSS		((UINT16)3)</div><div class='add'>+#define		HFA384x_PORTTYPE_HOSTAP    		((UINT16)6)</div><div class='add'>+#define		HFA384x_WEPFLAGS_PRIVINVOKED		((UINT16)BIT0)</div><div class='add'>+#define		HFA384x_WEPFLAGS_EXCLUDE		((UINT16)BIT1)</div><div class='add'>+#define		HFA384x_WEPFLAGS_DISABLE_TXCRYPT	((UINT16)BIT4)</div><div class='add'>+#define		HFA384x_WEPFLAGS_DISABLE_RXCRYPT	((UINT16)BIT7)</div><div class='add'>+#define		HFA384x_WEPFLAGS_DISALLOW_MIXED 	((UINT16)BIT11)</div><div class='add'>+#define		HFA384x_WEPFLAGS_IV_INTERVAL1		((UINT16)0)</div><div class='add'>+#define		HFA384x_WEPFLAGS_IV_INTERVAL10		((UINT16)BIT5)</div><div class='add'>+#define		HFA384x_WEPFLAGS_IV_INTERVAL50		((UINT16)BIT6)</div><div class='add'>+#define		HFA384x_WEPFLAGS_IV_INTERVAL100		((UINT16)(BIT5 | BIT6))</div><div class='add'>+#define		HFA384x_WEPFLAGS_FIRMWARE_WPA  		((UINT16)BIT8)</div><div class='add'>+#define		HFA384x_WEPFLAGS_HOST_MIC      		((UINT16)BIT9)</div><div class='add'>+#define 	HFA384x_ROAMMODE_FWSCAN_FWROAM		((UINT16)1)</div><div class='add'>+#define 	HFA384x_ROAMMODE_FWSCAN_HOSTROAM	((UINT16)2)</div><div class='add'>+#define 	HFA384x_ROAMMODE_HOSTSCAN_HOSTROAM	((UINT16)3)</div><div class='add'>+#define 	HFA384x_PORTSTATUS_DISABLED		((UINT16)1)</div><div class='add'>+#define 	HFA384x_PORTSTATUS_INITSRCH		((UINT16)2)</div><div class='add'>+#define 	HFA384x_PORTSTATUS_CONN_IBSS		((UINT16)3)</div><div class='add'>+#define 	HFA384x_PORTSTATUS_CONN_ESS		((UINT16)4)</div><div class='add'>+#define 	HFA384x_PORTSTATUS_OOR_ESS		((UINT16)5)</div><div class='add'>+#define 	HFA384x_PORTSTATUS_CONN_WDS		((UINT16)6)</div><div class='add'>+#define 	HFA384x_PORTSTATUS_HOSTAP		((UINT16)8)</div><div class='add'>+#define		HFA384x_RATEBIT_1			((UINT16)1)</div><div class='add'>+#define		HFA384x_RATEBIT_2			((UINT16)2)</div><div class='add'>+#define		HFA384x_RATEBIT_5dot5			((UINT16)4)</div><div class='add'>+#define		HFA384x_RATEBIT_11			((UINT16)8)</div><div class='add'>+</div><div class='add'>+/*--- Just some symbolic names for legibility -------*/</div><div class='add'>+#define		HFA384x_TXCMD_NORECL		((UINT16)0)</div><div class='add'>+#define		HFA384x_TXCMD_RECL		((UINT16)1)</div><div class='add'>+</div><div class='add'>+/*--- MAC Internal memory constants and macros ------*/</div><div class='add'>+/* masks and macros used to manipulate MAC internal memory addresses. */</div><div class='add'>+/* MAC internal memory addresses are 23 bit quantities.  The MAC uses</div><div class='add'>+ * a paged address space where the upper 16 bits are the page number</div><div class='add'>+ * and the lower 7 bits are the offset.  There are various Host API</div><div class='add'>+ * elements that require two 16-bit quantities to specify a MAC</div><div class='add'>+ * internal memory address.  Unfortunately, some of the API's use a</div><div class='add'>+ * page/offset format where the offset value is JUST the lower seven</div><div class='add'>+ * bits and the page is  the remaining 16 bits.  Some of the API's</div><div class='add'>+ * assume that the 23 bit address has been split at the 16th bit.  We</div><div class='add'>+ * refer to these two formats as AUX format and CMD format.  The</div><div class='add'>+ * macros below help handle some of this.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* Handy constant */</div><div class='add'>+#define		HFA384x_ADDR_AUX_OFF_MAX	((UINT16)0x007f)</div><div class='add'>+</div><div class='add'>+/* Mask bits for discarding unwanted pieces in a flat address */</div><div class='add'>+#define		HFA384x_ADDR_FLAT_AUX_PAGE_MASK	(0x007fff80)</div><div class='add'>+#define		HFA384x_ADDR_FLAT_AUX_OFF_MASK	(0x0000007f)</div><div class='add'>+#define		HFA384x_ADDR_FLAT_CMD_PAGE_MASK	(0xffff0000)</div><div class='add'>+#define		HFA384x_ADDR_FLAT_CMD_OFF_MASK	(0x0000ffff)</div><div class='add'>+</div><div class='add'>+/* Mask bits for discarding unwanted pieces in AUX format 16-bit address parts */</div><div class='add'>+#define		HFA384x_ADDR_AUX_PAGE_MASK	(0xffff)</div><div class='add'>+#define		HFA384x_ADDR_AUX_OFF_MASK	(0x007f)</div><div class='add'>+</div><div class='add'>+/* Mask bits for discarding unwanted pieces in CMD format 16-bit address parts */</div><div class='add'>+#define		HFA384x_ADDR_CMD_PAGE_MASK	(0x007f)</div><div class='add'>+#define		HFA384x_ADDR_CMD_OFF_MASK	(0xffff)</div><div class='add'>+</div><div class='add'>+/* Make a 32-bit flat address from AUX format 16-bit page and offset */</div><div class='add'>+#define		HFA384x_ADDR_AUX_MKFLAT(p,o)	\</div><div class='add'>+		(((UINT32)(((UINT16)(p))&amp;HFA384x_ADDR_AUX_PAGE_MASK)) &lt;&lt;7) | \</div><div class='add'>+		((UINT32)(((UINT16)(o))&amp;HFA384x_ADDR_AUX_OFF_MASK))</div><div class='add'>+</div><div class='add'>+/* Make a 32-bit flat address from CMD format 16-bit page and offset */</div><div class='add'>+#define		HFA384x_ADDR_CMD_MKFLAT(p,o)	\</div><div class='add'>+		(((UINT32)(((UINT16)(p))&amp;HFA384x_ADDR_CMD_PAGE_MASK)) &lt;&lt;16) | \</div><div class='add'>+		((UINT32)(((UINT16)(o))&amp;HFA384x_ADDR_CMD_OFF_MASK))</div><div class='add'>+</div><div class='add'>+/* Make AUX format offset and page from a 32-bit flat address */</div><div class='add'>+#define		HFA384x_ADDR_AUX_MKPAGE(f) \</div><div class='add'>+		((UINT16)((((UINT32)(f))&amp;HFA384x_ADDR_FLAT_AUX_PAGE_MASK)&gt;&gt;7))</div><div class='add'>+#define		HFA384x_ADDR_AUX_MKOFF(f) \</div><div class='add'>+		((UINT16)(((UINT32)(f))&amp;HFA384x_ADDR_FLAT_AUX_OFF_MASK))</div><div class='add'>+</div><div class='add'>+/* Make CMD format offset and page from a 32-bit flat address */</div><div class='add'>+#define		HFA384x_ADDR_CMD_MKPAGE(f) \</div><div class='add'>+		((UINT16)((((UINT32)(f))&amp;HFA384x_ADDR_FLAT_CMD_PAGE_MASK)&gt;&gt;16))</div><div class='add'>+#define		HFA384x_ADDR_CMD_MKOFF(f) \</div><div class='add'>+		((UINT16)(((UINT32)(f))&amp;HFA384x_ADDR_FLAT_CMD_OFF_MASK))</div><div class='add'>+</div><div class='add'>+/*--- Aux register masks/tests ----------------------*/</div><div class='add'>+/* Some of the upper bits of the AUX offset register are used to */</div><div class='add'>+/*  select address space. */</div><div class='add'>+#define		HFA384x_AUX_CTL_EXTDS	(0x00)</div><div class='add'>+#define		HFA384x_AUX_CTL_NV	(0x01)</div><div class='add'>+#define		HFA384x_AUX_CTL_PHY	(0x02)</div><div class='add'>+#define		HFA384x_AUX_CTL_ICSRAM	(0x03)</div><div class='add'>+</div><div class='add'>+/* Make AUX register offset and page values from a flat address */</div><div class='add'>+#define		HFA384x_AUX_MKOFF(f, c) \</div><div class='add'>+	(HFA384x_ADDR_AUX_MKOFF(f) | (((UINT16)(c))&lt;&lt;12))</div><div class='add'>+#define		HFA384x_AUX_MKPAGE(f)	HFA384x_ADDR_AUX_MKPAGE(f)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*--- Controller Memory addresses -------------------*/</div><div class='add'>+#define		HFA3842_PDA_BASE	(0x007f0000UL)</div><div class='add'>+#define		HFA3841_PDA_BASE	(0x003f0000UL)</div><div class='add'>+#define		HFA3841_PDA_BOGUS_BASE	(0x00390000UL)</div><div class='add'>+</div><div class='add'>+/*--- Driver Download states  -----------------------*/</div><div class='add'>+#define		HFA384x_DLSTATE_DISABLED		0</div><div class='add'>+#define		HFA384x_DLSTATE_RAMENABLED		1</div><div class='add'>+#define		HFA384x_DLSTATE_FLASHENABLED		2</div><div class='add'>+#define		HFA384x_DLSTATE_FLASHWRITTEN		3</div><div class='add'>+#define		HFA384x_DLSTATE_FLASHWRITEPENDING	4</div><div class='add'>+#define		HFA384x_DLSTATE_GENESIS 		5</div><div class='add'>+</div><div class='add'>+/*--- Register I/O offsets --------------------------*/</div><div class='add'>+#if ((WLAN_HOSTIF == WLAN_PCMCIA) || (WLAN_HOSTIF == WLAN_PLX))</div><div class='add'>+</div><div class='add'>+#define		HFA384x_CMD_OFF			(0x00)</div><div class='add'>+#define		HFA384x_PARAM0_OFF		(0x02)</div><div class='add'>+#define		HFA384x_PARAM1_OFF		(0x04)</div><div class='add'>+#define		HFA384x_PARAM2_OFF		(0x06)</div><div class='add'>+#define		HFA384x_STATUS_OFF		(0x08)</div><div class='add'>+#define		HFA384x_RESP0_OFF		(0x0A)</div><div class='add'>+#define		HFA384x_RESP1_OFF		(0x0C)</div><div class='add'>+#define		HFA384x_RESP2_OFF		(0x0E)</div><div class='add'>+#define		HFA384x_INFOFID_OFF		(0x10)</div><div class='add'>+#define		HFA384x_RXFID_OFF		(0x20)</div><div class='add'>+#define		HFA384x_ALLOCFID_OFF		(0x22)</div><div class='add'>+#define		HFA384x_TXCOMPLFID_OFF		(0x24)</div><div class='add'>+#define		HFA384x_SELECT0_OFF		(0x18)</div><div class='add'>+#define		HFA384x_OFFSET0_OFF		(0x1C)</div><div class='add'>+#define		HFA384x_DATA0_OFF		(0x36)</div><div class='add'>+#define		HFA384x_SELECT1_OFF		(0x1A)</div><div class='add'>+#define		HFA384x_OFFSET1_OFF		(0x1E)</div><div class='add'>+#define		HFA384x_DATA1_OFF		(0x38)</div><div class='add'>+#define		HFA384x_EVSTAT_OFF		(0x30)</div><div class='add'>+#define		HFA384x_INTEN_OFF		(0x32)</div><div class='add'>+#define		HFA384x_EVACK_OFF		(0x34)</div><div class='add'>+#define		HFA384x_CONTROL_OFF		(0x14)</div><div class='add'>+#define		HFA384x_SWSUPPORT0_OFF		(0x28)</div><div class='add'>+#define		HFA384x_SWSUPPORT1_OFF		(0x2A)</div><div class='add'>+#define		HFA384x_SWSUPPORT2_OFF		(0x2C)</div><div class='add'>+#define		HFA384x_AUXPAGE_OFF		(0x3A)</div><div class='add'>+#define		HFA384x_AUXOFFSET_OFF		(0x3C)</div><div class='add'>+#define		HFA384x_AUXDATA_OFF		(0x3E)</div><div class='add'>+</div><div class='add'>+#elif (WLAN_HOSTIF == WLAN_PCI || WLAN_HOSTIF == WLAN_USB)</div><div class='add'>+</div><div class='add'>+#define		HFA384x_CMD_OFF			(0x00)</div><div class='add'>+#define		HFA384x_PARAM0_OFF		(0x04)</div><div class='add'>+#define		HFA384x_PARAM1_OFF		(0x08)</div><div class='add'>+#define		HFA384x_PARAM2_OFF		(0x0c)</div><div class='add'>+#define		HFA384x_STATUS_OFF		(0x10)</div><div class='add'>+#define		HFA384x_RESP0_OFF		(0x14)</div><div class='add'>+#define		HFA384x_RESP1_OFF		(0x18)</div><div class='add'>+#define		HFA384x_RESP2_OFF		(0x1c)</div><div class='add'>+#define		HFA384x_INFOFID_OFF		(0x20)</div><div class='add'>+#define		HFA384x_RXFID_OFF		(0x40)</div><div class='add'>+#define		HFA384x_ALLOCFID_OFF		(0x44)</div><div class='add'>+#define		HFA384x_TXCOMPLFID_OFF		(0x48)</div><div class='add'>+#define		HFA384x_SELECT0_OFF		(0x30)</div><div class='add'>+#define		HFA384x_OFFSET0_OFF		(0x38)</div><div class='add'>+#define		HFA384x_DATA0_OFF		(0x6c)</div><div class='add'>+#define		HFA384x_SELECT1_OFF		(0x34)</div><div class='add'>+#define		HFA384x_OFFSET1_OFF		(0x3c)</div><div class='add'>+#define		HFA384x_DATA1_OFF		(0x70)</div><div class='add'>+#define		HFA384x_EVSTAT_OFF		(0x60)</div><div class='add'>+#define		HFA384x_INTEN_OFF		(0x64)</div><div class='add'>+#define		HFA384x_EVACK_OFF		(0x68)</div><div class='add'>+#define		HFA384x_CONTROL_OFF		(0x28)</div><div class='add'>+#define		HFA384x_SWSUPPORT0_OFF		(0x50)</div><div class='add'>+#define		HFA384x_SWSUPPORT1_OFF		(0x54)</div><div class='add'>+#define		HFA384x_SWSUPPORT2_OFF		(0x58)</div><div class='add'>+#define		HFA384x_AUXPAGE_OFF		(0x74)</div><div class='add'>+#define		HFA384x_AUXOFFSET_OFF		(0x78)</div><div class='add'>+#define		HFA384x_AUXDATA_OFF		(0x7c)</div><div class='add'>+#define		HFA384x_PCICOR_OFF		(0x4c)</div><div class='add'>+#define		HFA384x_PCIHCR_OFF		(0x5c)</div><div class='add'>+#define		HFA384x_PCI_M0_ADDRH_OFF	(0x80)</div><div class='add'>+#define		HFA384x_PCI_M0_ADDRL_OFF	(0x84)</div><div class='add'>+#define		HFA384x_PCI_M0_LEN_OFF		(0x88)</div><div class='add'>+#define		HFA384x_PCI_M0_CTL_OFF		(0x8c)</div><div class='add'>+#define		HFA384x_PCI_STATUS_OFF		(0x98)</div><div class='add'>+#define		HFA384x_PCI_M1_ADDRH_OFF	(0xa0)</div><div class='add'>+#define		HFA384x_PCI_M1_ADDRL_OFF	(0xa4)</div><div class='add'>+#define		HFA384x_PCI_M1_LEN_OFF		(0xa8)</div><div class='add'>+#define		HFA384x_PCI_M1_CTL_OFF		(0xac)</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*--- Register Field Masks --------------------------*/</div><div class='add'>+#define		HFA384x_CMD_BUSY		((UINT16)BIT15)</div><div class='add'>+#define		HFA384x_CMD_AINFO		((UINT16)(BIT14 | BIT13 | BIT12 | BIT11 | BIT10 | BIT9 | BIT8))</div><div class='add'>+#define		HFA384x_CMD_MACPORT		((UINT16)(BIT10 | BIT9 | BIT8))</div><div class='add'>+#define		HFA384x_CMD_RECL		((UINT16)BIT8)</div><div class='add'>+#define		HFA384x_CMD_WRITE		((UINT16)BIT8)</div><div class='add'>+#define		HFA384x_CMD_PROGMODE		((UINT16)(BIT9 | BIT8))</div><div class='add'>+#define		HFA384x_CMD_CMDCODE		((UINT16)(BIT5 | BIT4 | BIT3 | BIT2 | BIT1 | BIT0))</div><div class='add'>+</div><div class='add'>+#define		HFA384x_STATUS_RESULT		((UINT16)(BIT14 | BIT13 | BIT12 | BIT11 | BIT10 | BIT9 | BIT8))</div><div class='add'>+#define		HFA384x_STATUS_CMDCODE		((UINT16)(BIT5 | BIT4 | BIT3 | BIT2 | BIT1 | BIT0))</div><div class='add'>+</div><div class='add'>+#define		HFA384x_OFFSET_BUSY		((UINT16)BIT15)</div><div class='add'>+#define		HFA384x_OFFSET_ERR		((UINT16)BIT14)</div><div class='add'>+#define		HFA384x_OFFSET_DATAOFF		((UINT16)(BIT11 | BIT10 | BIT9 | BIT8 | BIT7 | BIT6 | BIT5 | BIT4 | BIT3 | BIT2 | BIT1))</div><div class='add'>+</div><div class='add'>+#define		HFA384x_EVSTAT_TICK		((UINT16)BIT15)</div><div class='add'>+#define		HFA384x_EVSTAT_WTERR		((UINT16)BIT14)</div><div class='add'>+#define		HFA384x_EVSTAT_INFDROP		((UINT16)BIT13)</div><div class='add'>+#define		HFA384x_EVSTAT_INFO		((UINT16)BIT7)</div><div class='add'>+#define		HFA384x_EVSTAT_DTIM		((UINT16)BIT5)</div><div class='add'>+#define		HFA384x_EVSTAT_CMD		((UINT16)BIT4)</div><div class='add'>+#define		HFA384x_EVSTAT_ALLOC		((UINT16)BIT3)</div><div class='add'>+#define		HFA384x_EVSTAT_TXEXC		((UINT16)BIT2)</div><div class='add'>+#define		HFA384x_EVSTAT_TX		((UINT16)BIT1)</div><div class='add'>+#define		HFA384x_EVSTAT_RX		((UINT16)BIT0)</div><div class='add'>+</div><div class='add'>+#define         HFA384x_INT_BAP_OP           (HFA384x_EVSTAT_INFO|HFA384x_EVSTAT_RX|HFA384x_EVSTAT_TX|HFA384x_EVSTAT_TXEXC)</div><div class='add'>+</div><div class='add'>+#define         HFA384x_INT_NORMAL           (HFA384x_EVSTAT_INFO|HFA384x_EVSTAT_RX|HFA384x_EVSTAT_TX|HFA384x_EVSTAT_TXEXC|HFA384x_EVSTAT_INFDROP|HFA384x_EVSTAT_ALLOC|HFA384x_EVSTAT_DTIM)</div><div class='add'>+</div><div class='add'>+#define		HFA384x_INTEN_TICK		((UINT16)BIT15)</div><div class='add'>+#define		HFA384x_INTEN_WTERR		((UINT16)BIT14)</div><div class='add'>+#define		HFA384x_INTEN_INFDROP		((UINT16)BIT13)</div><div class='add'>+#define		HFA384x_INTEN_INFO		((UINT16)BIT7)</div><div class='add'>+#define		HFA384x_INTEN_DTIM		((UINT16)BIT5)</div><div class='add'>+#define		HFA384x_INTEN_CMD		((UINT16)BIT4)</div><div class='add'>+#define		HFA384x_INTEN_ALLOC		((UINT16)BIT3)</div><div class='add'>+#define		HFA384x_INTEN_TXEXC		((UINT16)BIT2)</div><div class='add'>+#define		HFA384x_INTEN_TX		((UINT16)BIT1)</div><div class='add'>+#define		HFA384x_INTEN_RX		((UINT16)BIT0)</div><div class='add'>+</div><div class='add'>+#define		HFA384x_EVACK_TICK		((UINT16)BIT15)</div><div class='add'>+#define		HFA384x_EVACK_WTERR		((UINT16)BIT14)</div><div class='add'>+#define		HFA384x_EVACK_INFDROP		((UINT16)BIT13)</div><div class='add'>+#define		HFA384x_EVACK_INFO		((UINT16)BIT7)</div><div class='add'>+#define		HFA384x_EVACK_DTIM		((UINT16)BIT5)</div><div class='add'>+#define		HFA384x_EVACK_CMD		((UINT16)BIT4)</div><div class='add'>+#define		HFA384x_EVACK_ALLOC		((UINT16)BIT3)</div><div class='add'>+#define		HFA384x_EVACK_TXEXC		((UINT16)BIT2)</div><div class='add'>+#define		HFA384x_EVACK_TX		((UINT16)BIT1)</div><div class='add'>+#define		HFA384x_EVACK_RX		((UINT16)BIT0)</div><div class='add'>+</div><div class='add'>+#define		HFA384x_CONTROL_AUXEN		((UINT16)(BIT15 | BIT14))</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*--- Command Code Constants --------------------------*/</div><div class='add'>+/*--- Controller Commands --------------------------*/</div><div class='add'>+#define		HFA384x_CMDCODE_INIT		((UINT16)0x00)</div><div class='add'>+#define		HFA384x_CMDCODE_ENABLE		((UINT16)0x01)</div><div class='add'>+#define		HFA384x_CMDCODE_DISABLE		((UINT16)0x02)</div><div class='add'>+#define		HFA384x_CMDCODE_DIAG		((UINT16)0x03)</div><div class='add'>+</div><div class='add'>+/*--- Buffer Mgmt Commands --------------------------*/</div><div class='add'>+#define		HFA384x_CMDCODE_ALLOC		((UINT16)0x0A)</div><div class='add'>+#define		HFA384x_CMDCODE_TX		((UINT16)0x0B)</div><div class='add'>+#define		HFA384x_CMDCODE_CLRPRST		((UINT16)0x12)</div><div class='add'>+</div><div class='add'>+/*--- Regulate Commands --------------------------*/</div><div class='add'>+#define		HFA384x_CMDCODE_NOTIFY		((UINT16)0x10)</div><div class='add'>+#define		HFA384x_CMDCODE_INQ		((UINT16)0x11)</div><div class='add'>+</div><div class='add'>+/*--- Configure Commands --------------------------*/</div><div class='add'>+#define		HFA384x_CMDCODE_ACCESS		((UINT16)0x21)</div><div class='add'>+#define		HFA384x_CMDCODE_DOWNLD		((UINT16)0x22)</div><div class='add'>+</div><div class='add'>+/*--- Debugging Commands -----------------------------*/</div><div class='add'>+#define 	HFA384x_CMDCODE_MONITOR		((UINT16)(0x38))</div><div class='add'>+#define		HFA384x_MONITOR_ENABLE		((UINT16)(0x0b))</div><div class='add'>+#define		HFA384x_MONITOR_DISABLE		((UINT16)(0x0f))</div><div class='add'>+</div><div class='add'>+/*--- Result Codes --------------------------*/</div><div class='add'>+#define		HFA384x_SUCCESS			((UINT16)(0x00))</div><div class='add'>+#define		HFA384x_CARD_FAIL		((UINT16)(0x01))</div><div class='add'>+#define		HFA384x_NO_BUFF			((UINT16)(0x05))</div><div class='add'>+#define		HFA384x_CMD_ERR			((UINT16)(0x7F))</div><div class='add'>+</div><div class='add'>+/*--- Programming Modes --------------------------</div><div class='add'>+	MODE 0: Disable programming</div><div class='add'>+	MODE 1: Enable volatile memory programming</div><div class='add'>+	MODE 2: Enable non-volatile memory programming</div><div class='add'>+	MODE 3: Program non-volatile memory section</div><div class='add'>+--------------------------------------------------*/</div><div class='add'>+#define		HFA384x_PROGMODE_DISABLE	((UINT16)0x00)</div><div class='add'>+#define		HFA384x_PROGMODE_RAM		((UINT16)0x01)</div><div class='add'>+#define		HFA384x_PROGMODE_NV		((UINT16)0x02)</div><div class='add'>+#define		HFA384x_PROGMODE_NVWRITE	((UINT16)0x03)</div><div class='add'>+</div><div class='add'>+/*--- AUX register enable --------------------------*/</div><div class='add'>+#define		HFA384x_AUXPW0			((UINT16)0xfe01)</div><div class='add'>+#define		HFA384x_AUXPW1			((UINT16)0xdc23)</div><div class='add'>+#define		HFA384x_AUXPW2			((UINT16)0xba45)</div><div class='add'>+</div><div class='add'>+#define		HFA384x_CONTROL_AUX_ISDISABLED	((UINT16)0x0000)</div><div class='add'>+#define		HFA384x_CONTROL_AUX_ISENABLED	((UINT16)0xc000)</div><div class='add'>+#define		HFA384x_CONTROL_AUX_DOENABLE	((UINT16)0x8000)</div><div class='add'>+#define		HFA384x_CONTROL_AUX_DODISABLE	((UINT16)0x4000)</div><div class='add'>+</div><div class='add'>+/*--- Record ID Constants --------------------------*/</div><div class='add'>+/*--------------------------------------------------------------------</div><div class='add'>+Configuration RIDs: Network Parameters, Static Configuration Entities</div><div class='add'>+--------------------------------------------------------------------*/</div><div class='add'>+#define		HFA384x_RID_CNFPORTTYPE		((UINT16)0xFC00)</div><div class='add'>+#define		HFA384x_RID_CNFOWNMACADDR	((UINT16)0xFC01)</div><div class='add'>+#define		HFA384x_RID_CNFDESIREDSSID	((UINT16)0xFC02)</div><div class='add'>+#define		HFA384x_RID_CNFOWNCHANNEL	((UINT16)0xFC03)</div><div class='add'>+#define		HFA384x_RID_CNFOWNSSID		((UINT16)0xFC04)</div><div class='add'>+#define		HFA384x_RID_CNFOWNATIMWIN	((UINT16)0xFC05)</div><div class='add'>+#define		HFA384x_RID_CNFSYSSCALE		((UINT16)0xFC06)</div><div class='add'>+#define		HFA384x_RID_CNFMAXDATALEN	((UINT16)0xFC07)</div><div class='add'>+#define		HFA384x_RID_CNFWDSADDR		((UINT16)0xFC08)</div><div class='add'>+#define		HFA384x_RID_CNFPMENABLED	((UINT16)0xFC09)</div><div class='add'>+#define		HFA384x_RID_CNFPMEPS		((UINT16)0xFC0A)</div><div class='add'>+#define		HFA384x_RID_CNFMULTICASTRX	((UINT16)0xFC0B)</div><div class='add'>+#define		HFA384x_RID_CNFMAXSLEEPDUR	((UINT16)0xFC0C)</div><div class='add'>+#define		HFA384x_RID_CNFPMHOLDDUR	((UINT16)0xFC0D)</div><div class='add'>+#define		HFA384x_RID_CNFOWNNAME		((UINT16)0xFC0E)</div><div class='add'>+#define		HFA384x_RID_CNFOWNDTIMPER	((UINT16)0xFC10)</div><div class='add'>+#define		HFA384x_RID_CNFWDSADDR1		((UINT16)0xFC11)</div><div class='add'>+#define		HFA384x_RID_CNFWDSADDR2		((UINT16)0xFC12)</div><div class='add'>+#define		HFA384x_RID_CNFWDSADDR3		((UINT16)0xFC13)</div><div class='add'>+#define		HFA384x_RID_CNFWDSADDR4		((UINT16)0xFC14)</div><div class='add'>+#define		HFA384x_RID_CNFWDSADDR5		((UINT16)0xFC15)</div><div class='add'>+#define		HFA384x_RID_CNFWDSADDR6		((UINT16)0xFC16)</div><div class='add'>+#define		HFA384x_RID_CNFMCASTPMBUFF	((UINT16)0xFC17)</div><div class='add'>+</div><div class='add'>+/*--------------------------------------------------------------------</div><div class='add'>+Configuration RID lengths: Network Params, Static Config Entities</div><div class='add'>+  This is the length of JUST the DATA part of the RID (does not</div><div class='add'>+  include the len or code fields)</div><div class='add'>+--------------------------------------------------------------------*/</div><div class='add'>+/* TODO: fill in the rest of these */</div><div class='add'>+#define		HFA384x_RID_CNFPORTTYPE_LEN	((UINT16)2)</div><div class='add'>+#define		HFA384x_RID_CNFOWNMACADDR_LEN	((UINT16)6)</div><div class='add'>+#define		HFA384x_RID_CNFDESIREDSSID_LEN	((UINT16)34)</div><div class='add'>+#define		HFA384x_RID_CNFOWNCHANNEL_LEN	((UINT16)2)</div><div class='add'>+#define		HFA384x_RID_CNFOWNSSID_LEN	((UINT16)34)</div><div class='add'>+#define		HFA384x_RID_CNFOWNATIMWIN_LEN	((UINT16)2)</div><div class='add'>+#define		HFA384x_RID_CNFSYSSCALE_LEN	((UINT16)0)</div><div class='add'>+#define		HFA384x_RID_CNFMAXDATALEN_LEN	((UINT16)0)</div><div class='add'>+#define		HFA384x_RID_CNFWDSADDR_LEN	((UINT16)6)</div><div class='add'>+#define		HFA384x_RID_CNFPMENABLED_LEN	((UINT16)0)</div><div class='add'>+#define		HFA384x_RID_CNFPMEPS_LEN	((UINT16)0)</div><div class='add'>+#define		HFA384x_RID_CNFMULTICASTRX_LEN	((UINT16)0)</div><div class='add'>+#define		HFA384x_RID_CNFMAXSLEEPDUR_LEN	((UINT16)0)</div><div class='add'>+#define		HFA384x_RID_CNFPMHOLDDUR_LEN	((UINT16)0)</div><div class='add'>+#define		HFA384x_RID_CNFOWNNAME_LEN	((UINT16)34)</div><div class='add'>+#define		HFA384x_RID_CNFOWNDTIMPER_LEN	((UINT16)0)</div><div class='add'>+#define		HFA384x_RID_CNFWDSADDR1_LEN	((UINT16)6)</div><div class='add'>+#define		HFA384x_RID_CNFWDSADDR2_LEN	((UINT16)6)</div><div class='add'>+#define		HFA384x_RID_CNFWDSADDR3_LEN	((UINT16)6)</div><div class='add'>+#define		HFA384x_RID_CNFWDSADDR4_LEN	((UINT16)6)</div><div class='add'>+#define		HFA384x_RID_CNFWDSADDR5_LEN	((UINT16)6)</div><div class='add'>+#define		HFA384x_RID_CNFWDSADDR6_LEN	((UINT16)6)</div><div class='add'>+#define		HFA384x_RID_CNFMCASTPMBUFF_LEN	((UINT16)0)</div><div class='add'>+#define		HFA384x_RID_CNFAUTHENTICATION_LEN ((UINT16)sizeof(UINT16))</div><div class='add'>+#define		HFA384x_RID_CNFMAXSLEEPDUR_LEN	((UINT16)0)</div><div class='add'>+</div><div class='add'>+/*--------------------------------------------------------------------</div><div class='add'>+Configuration RIDs: Network Parameters, Dynamic Configuration Entities</div><div class='add'>+--------------------------------------------------------------------*/</div><div class='add'>+#define		HFA384x_RID_GROUPADDR		((UINT16)0xFC80)</div><div class='add'>+#define		HFA384x_RID_CREATEIBSS		((UINT16)0xFC81)</div><div class='add'>+#define		HFA384x_RID_FRAGTHRESH		((UINT16)0xFC82)</div><div class='add'>+#define		HFA384x_RID_RTSTHRESH		((UINT16)0xFC83)</div><div class='add'>+#define		HFA384x_RID_TXRATECNTL		((UINT16)0xFC84)</div><div class='add'>+#define		HFA384x_RID_PROMISCMODE		((UINT16)0xFC85)</div><div class='add'>+#define		HFA384x_RID_FRAGTHRESH0		((UINT16)0xFC90)</div><div class='add'>+#define		HFA384x_RID_FRAGTHRESH1		((UINT16)0xFC91)</div><div class='add'>+#define		HFA384x_RID_FRAGTHRESH2		((UINT16)0xFC92)</div><div class='add'>+#define		HFA384x_RID_FRAGTHRESH3		((UINT16)0xFC93)</div><div class='add'>+#define		HFA384x_RID_FRAGTHRESH4		((UINT16)0xFC94)</div><div class='add'>+#define		HFA384x_RID_FRAGTHRESH5		((UINT16)0xFC95)</div><div class='add'>+#define		HFA384x_RID_FRAGTHRESH6		((UINT16)0xFC96)</div><div class='add'>+#define		HFA384x_RID_RTSTHRESH0		((UINT16)0xFC97)</div><div class='add'>+#define		HFA384x_RID_RTSTHRESH1		((UINT16)0xFC98)</div><div class='add'>+#define		HFA384x_RID_RTSTHRESH2		((UINT16)0xFC99)</div><div class='add'>+#define		HFA384x_RID_RTSTHRESH3		((UINT16)0xFC9A)</div><div class='add'>+#define		HFA384x_RID_RTSTHRESH4		((UINT16)0xFC9B)</div><div class='add'>+#define		HFA384x_RID_RTSTHRESH5		((UINT16)0xFC9C)</div><div class='add'>+#define		HFA384x_RID_RTSTHRESH6		((UINT16)0xFC9D)</div><div class='add'>+#define		HFA384x_RID_TXRATECNTL0		((UINT16)0xFC9E)</div><div class='add'>+#define		HFA384x_RID_TXRATECNTL1		((UINT16)0xFC9F)</div><div class='add'>+#define		HFA384x_RID_TXRATECNTL2		((UINT16)0xFCA0)</div><div class='add'>+#define		HFA384x_RID_TXRATECNTL3		((UINT16)0xFCA1)</div><div class='add'>+#define		HFA384x_RID_TXRATECNTL4		((UINT16)0xFCA2)</div><div class='add'>+#define		HFA384x_RID_TXRATECNTL5		((UINT16)0xFCA3)</div><div class='add'>+#define		HFA384x_RID_TXRATECNTL6		((UINT16)0xFCA4)</div><div class='add'>+</div><div class='add'>+/*--------------------------------------------------------------------</div><div class='add'>+Configuration RID Lengths: Network Param, Dynamic Config Entities</div><div class='add'>+  This is the length of JUST the DATA part of the RID (does not</div><div class='add'>+  include the len or code fields)</div><div class='add'>+--------------------------------------------------------------------*/</div><div class='add'>+/* TODO: fill in the rest of these */</div><div class='add'>+#define		HFA384x_RID_GROUPADDR_LEN	((UINT16)16 * WLAN_ADDR_LEN)</div><div class='add'>+#define		HFA384x_RID_CREATEIBSS_LEN	((UINT16)0)</div><div class='add'>+#define		HFA384x_RID_FRAGTHRESH_LEN	((UINT16)0)</div><div class='add'>+#define		HFA384x_RID_RTSTHRESH_LEN	((UINT16)0)</div><div class='add'>+#define		HFA384x_RID_TXRATECNTL_LEN	((UINT16)4)</div><div class='add'>+#define		HFA384x_RID_PROMISCMODE_LEN	((UINT16)2)</div><div class='add'>+#define		HFA384x_RID_FRAGTHRESH0_LEN	((UINT16)0)</div><div class='add'>+#define		HFA384x_RID_FRAGTHRESH1_LEN	((UINT16)0)</div><div class='add'>+#define		HFA384x_RID_FRAGTHRESH2_LEN	((UINT16)0)</div><div class='add'>+#define		HFA384x_RID_FRAGTHRESH3_LEN	((UINT16)0)</div><div class='add'>+#define		HFA384x_RID_FRAGTHRESH4_LEN	((UINT16)0)</div><div class='add'>+#define		HFA384x_RID_FRAGTHRESH5_LEN	((UINT16)0)</div><div class='add'>+#define		HFA384x_RID_FRAGTHRESH6_LEN	((UINT16)0)</div><div class='add'>+#define		HFA384x_RID_RTSTHRESH0_LEN	((UINT16)0)</div><div class='add'>+#define		HFA384x_RID_RTSTHRESH1_LEN	((UINT16)0)</div><div class='add'>+#define		HFA384x_RID_RTSTHRESH2_LEN	((UINT16)0)</div><div class='add'>+#define		HFA384x_RID_RTSTHRESH3_LEN	((UINT16)0)</div><div class='add'>+#define		HFA384x_RID_RTSTHRESH4_LEN	((UINT16)0)</div><div class='add'>+#define		HFA384x_RID_RTSTHRESH5_LEN	((UINT16)0)</div><div class='add'>+#define		HFA384x_RID_RTSTHRESH6_LEN	((UINT16)0)</div><div class='add'>+#define		HFA384x_RID_TXRATECNTL0_LEN	((UINT16)0)</div><div class='add'>+#define		HFA384x_RID_TXRATECNTL1_LEN	((UINT16)0)</div><div class='add'>+#define		HFA384x_RID_TXRATECNTL2_LEN	((UINT16)0)</div><div class='add'>+#define		HFA384x_RID_TXRATECNTL3_LEN	((UINT16)0)</div><div class='add'>+#define		HFA384x_RID_TXRATECNTL4_LEN	((UINT16)0)</div><div class='add'>+#define		HFA384x_RID_TXRATECNTL5_LEN	((UINT16)0)</div><div class='add'>+#define		HFA384x_RID_TXRATECNTL6_LEN	((UINT16)0)</div><div class='add'>+</div><div class='add'>+/*--------------------------------------------------------------------</div><div class='add'>+Configuration RIDs: Behavior Parameters</div><div class='add'>+--------------------------------------------------------------------*/</div><div class='add'>+#define		HFA384x_RID_ITICKTIME		((UINT16)0xFCE0)</div><div class='add'>+</div><div class='add'>+/*--------------------------------------------------------------------</div><div class='add'>+Configuration RID Lengths: Behavior Parameters</div><div class='add'>+  This is the length of JUST the DATA part of the RID (does not</div><div class='add'>+  include the len or code fields)</div><div class='add'>+--------------------------------------------------------------------*/</div><div class='add'>+#define		HFA384x_RID_ITICKTIME_LEN	((UINT16)2)</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------------</div><div class='add'>+Information RIDs: NIC Information</div><div class='add'>+--------------------------------------------------------------------*/</div><div class='add'>+#define		HFA384x_RID_MAXLOADTIME		((UINT16)0xFD00)</div><div class='add'>+#define		HFA384x_RID_DOWNLOADBUFFER	((UINT16)0xFD01)</div><div class='add'>+#define		HFA384x_RID_PRIIDENTITY		((UINT16)0xFD02)</div><div class='add'>+#define		HFA384x_RID_PRISUPRANGE		((UINT16)0xFD03)</div><div class='add'>+#define		HFA384x_RID_PRI_CFIACTRANGES	((UINT16)0xFD04)</div><div class='add'>+#define		HFA384x_RID_NICSERIALNUMBER	((UINT16)0xFD0A)</div><div class='add'>+#define		HFA384x_RID_NICIDENTITY		((UINT16)0xFD0B)</div><div class='add'>+#define		HFA384x_RID_MFISUPRANGE		((UINT16)0xFD0C)</div><div class='add'>+#define		HFA384x_RID_CFISUPRANGE		((UINT16)0xFD0D)</div><div class='add'>+#define		HFA384x_RID_CHANNELLIST		((UINT16)0xFD10)</div><div class='add'>+#define		HFA384x_RID_REGULATORYDOMAINS	((UINT16)0xFD11)</div><div class='add'>+#define		HFA384x_RID_TEMPTYPE		((UINT16)0xFD12)</div><div class='add'>+#define		HFA384x_RID_CIS			((UINT16)0xFD13)</div><div class='add'>+#define		HFA384x_RID_STAIDENTITY		((UINT16)0xFD20)</div><div class='add'>+#define		HFA384x_RID_STASUPRANGE		((UINT16)0xFD21)</div><div class='add'>+#define		HFA384x_RID_STA_MFIACTRANGES	((UINT16)0xFD22)</div><div class='add'>+#define		HFA384x_RID_STA_CFIACTRANGES	((UINT16)0xFD23)</div><div class='add'>+#define		HFA384x_RID_BUILDSEQ		((UINT16)0xFFFE)</div><div class='add'>+#define		HFA384x_RID_FWID		((UINT16)0xFFFF)</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------------</div><div class='add'>+Information RID Lengths: NIC Information</div><div class='add'>+  This is the length of JUST the DATA part of the RID (does not</div><div class='add'>+  include the len or code fields)</div><div class='add'>+--------------------------------------------------------------------*/</div><div class='add'>+#define		HFA384x_RID_MAXLOADTIME_LEN		((UINT16)0)</div><div class='add'>+#define		HFA384x_RID_DOWNLOADBUFFER_LEN		((UINT16)sizeof(hfa384x_downloadbuffer_t))</div><div class='add'>+#define		HFA384x_RID_PRIIDENTITY_LEN		((UINT16)8)</div><div class='add'>+#define		HFA384x_RID_PRISUPRANGE_LEN		((UINT16)10)</div><div class='add'>+#define		HFA384x_RID_CFIACTRANGES_LEN		((UINT16)10)</div><div class='add'>+#define		HFA384x_RID_NICSERIALNUMBER_LEN		((UINT16)12)</div><div class='add'>+#define		HFA384x_RID_NICIDENTITY_LEN		((UINT16)8)</div><div class='add'>+#define		HFA384x_RID_MFISUPRANGE_LEN		((UINT16)10)</div><div class='add'>+#define		HFA384x_RID_CFISUPRANGE_LEN		((UINT16)10)</div><div class='add'>+#define		HFA384x_RID_CHANNELLIST_LEN		((UINT16)0)</div><div class='add'>+#define		HFA384x_RID_REGULATORYDOMAINS_LEN	((UINT16)12)</div><div class='add'>+#define		HFA384x_RID_TEMPTYPE_LEN		((UINT16)0)</div><div class='add'>+#define		HFA384x_RID_CIS_LEN			((UINT16)480)</div><div class='add'>+#define		HFA384x_RID_STAIDENTITY_LEN		((UINT16)8)</div><div class='add'>+#define		HFA384x_RID_STASUPRANGE_LEN		((UINT16)10)</div><div class='add'>+#define		HFA384x_RID_MFIACTRANGES_LEN		((UINT16)10)</div><div class='add'>+#define		HFA384x_RID_CFIACTRANGES2_LEN		((UINT16)10)</div><div class='add'>+#define		HFA384x_RID_BUILDSEQ_LEN		((UINT16)sizeof(hfa384x_BuildSeq_t))</div><div class='add'>+#define		HFA384x_RID_FWID_LEN			((UINT16)sizeof(hfa384x_FWID_t))</div><div class='add'>+</div><div class='add'>+/*--------------------------------------------------------------------</div><div class='add'>+Information RIDs:  MAC Information</div><div class='add'>+--------------------------------------------------------------------*/</div><div class='add'>+#define		HFA384x_RID_PORTSTATUS		((UINT16)0xFD40)</div><div class='add'>+#define		HFA384x_RID_CURRENTSSID		((UINT16)0xFD41)</div><div class='add'>+#define		HFA384x_RID_CURRENTBSSID	((UINT16)0xFD42)</div><div class='add'>+#define		HFA384x_RID_COMMSQUALITY	((UINT16)0xFD43)</div><div class='add'>+#define		HFA384x_RID_CURRENTTXRATE	((UINT16)0xFD44)</div><div class='add'>+#define		HFA384x_RID_CURRENTBCNINT	((UINT16)0xFD45)</div><div class='add'>+#define		HFA384x_RID_CURRENTSCALETHRESH	((UINT16)0xFD46)</div><div class='add'>+#define		HFA384x_RID_PROTOCOLRSPTIME	((UINT16)0xFD47)</div><div class='add'>+#define		HFA384x_RID_SHORTRETRYLIMIT	((UINT16)0xFD48)</div><div class='add'>+#define		HFA384x_RID_LONGRETRYLIMIT	((UINT16)0xFD49)</div><div class='add'>+#define		HFA384x_RID_MAXTXLIFETIME	((UINT16)0xFD4A)</div><div class='add'>+#define		HFA384x_RID_MAXRXLIFETIME	((UINT16)0xFD4B)</div><div class='add'>+#define		HFA384x_RID_CFPOLLABLE		((UINT16)0xFD4C)</div><div class='add'>+#define		HFA384x_RID_AUTHALGORITHMS	((UINT16)0xFD4D)</div><div class='add'>+#define		HFA384x_RID_PRIVACYOPTIMP	((UINT16)0xFD4F)</div><div class='add'>+#define		HFA384x_RID_DBMCOMMSQUALITY	((UINT16)0xFD51)</div><div class='add'>+#define		HFA384x_RID_CURRENTTXRATE1	((UINT16)0xFD80)</div><div class='add'>+#define		HFA384x_RID_CURRENTTXRATE2	((UINT16)0xFD81)</div><div class='add'>+#define		HFA384x_RID_CURRENTTXRATE3	((UINT16)0xFD82)</div><div class='add'>+#define		HFA384x_RID_CURRENTTXRATE4	((UINT16)0xFD83)</div><div class='add'>+#define		HFA384x_RID_CURRENTTXRATE5	((UINT16)0xFD84)</div><div class='add'>+#define		HFA384x_RID_CURRENTTXRATE6	((UINT16)0xFD85)</div><div class='add'>+#define		HFA384x_RID_OWNMACADDRESS	((UINT16)0xFD86)</div><div class='add'>+// #define	HFA384x_RID_PCFINFO		((UINT16)0xFD87)</div><div class='add'>+#define		HFA384x_RID_SCANRESULTS       	((UINT16)0xFD88) // NEW</div><div class='add'>+#define		HFA384x_RID_HOSTSCANRESULTS   	((UINT16)0xFD89) // NEW</div><div class='add'>+#define		HFA384x_RID_AUTHENTICATIONUSED	((UINT16)0xFD8A) // NEW</div><div class='add'>+#define		HFA384x_RID_ASSOCIATEFAILURE  	((UINT16)0xFD8D) // 1.8.0</div><div class='add'>+</div><div class='add'>+/*--------------------------------------------------------------------</div><div class='add'>+Information RID Lengths:  MAC Information</div><div class='add'>+  This is the length of JUST the DATA part of the RID (does not</div><div class='add'>+  include the len or code fields)</div><div class='add'>+--------------------------------------------------------------------*/</div><div class='add'>+#define		HFA384x_RID_PORTSTATUS_LEN		((UINT16)0)</div><div class='add'>+#define		HFA384x_RID_CURRENTSSID_LEN		((UINT16)34)</div><div class='add'>+#define		HFA384x_RID_CURRENTBSSID_LEN		((UINT16)WLAN_BSSID_LEN)</div><div class='add'>+#define		HFA384x_RID_COMMSQUALITY_LEN		((UINT16)sizeof(hfa384x_commsquality_t))</div><div class='add'>+#define		HFA384x_RID_DBMCOMMSQUALITY_LEN		((UINT16)sizeof(hfa384x_dbmcommsquality_t))</div><div class='add'>+#define		HFA384x_RID_CURRENTTXRATE_LEN		((UINT16)0)</div><div class='add'>+#define		HFA384x_RID_CURRENTBCNINT_LEN		((UINT16)0)</div><div class='add'>+#define		HFA384x_RID_STACURSCALETHRESH_LEN	((UINT16)12)</div><div class='add'>+#define		HFA384x_RID_APCURSCALETHRESH_LEN	((UINT16)6)</div><div class='add'>+#define		HFA384x_RID_PROTOCOLRSPTIME_LEN		((UINT16)0)</div><div class='add'>+#define		HFA384x_RID_SHORTRETRYLIMIT_LEN		((UINT16)0)</div><div class='add'>+#define		HFA384x_RID_LONGRETRYLIMIT_LEN		((UINT16)0)</div><div class='add'>+#define		HFA384x_RID_MAXTXLIFETIME_LEN		((UINT16)0)</div><div class='add'>+#define		HFA384x_RID_MAXRXLIFETIME_LEN		((UINT16)0)</div><div class='add'>+#define		HFA384x_RID_CFPOLLABLE_LEN		((UINT16)0)</div><div class='add'>+#define		HFA384x_RID_AUTHALGORITHMS_LEN		((UINT16)4)</div><div class='add'>+#define		HFA384x_RID_PRIVACYOPTIMP_LEN		((UINT16)0)</div><div class='add'>+#define		HFA384x_RID_CURRENTTXRATE1_LEN		((UINT16)0)</div><div class='add'>+#define		HFA384x_RID_CURRENTTXRATE2_LEN		((UINT16)0)</div><div class='add'>+#define		HFA384x_RID_CURRENTTXRATE3_LEN		((UINT16)0)</div><div class='add'>+#define		HFA384x_RID_CURRENTTXRATE4_LEN		((UINT16)0)</div><div class='add'>+#define		HFA384x_RID_CURRENTTXRATE5_LEN		((UINT16)0)</div><div class='add'>+#define		HFA384x_RID_CURRENTTXRATE6_LEN		((UINT16)0)</div><div class='add'>+#define		HFA384x_RID_OWNMACADDRESS_LEN		((UINT16)6)</div><div class='add'>+#define		HFA384x_RID_PCFINFO_LEN			((UINT16)6)</div><div class='add'>+#define		HFA384x_RID_CNFAPPCFINFO_LEN		((UINT16)sizeof(hfa384x_PCFInfo_data_t))</div><div class='add'>+#define		HFA384x_RID_SCANREQUEST_LEN		((UINT16)sizeof(hfa384x_ScanRequest_data_t))</div><div class='add'>+#define		HFA384x_RID_JOINREQUEST_LEN		((UINT16)sizeof(hfa384x_JoinRequest_data_t))</div><div class='add'>+#define		HFA384x_RID_AUTHENTICATESTA_LEN		((UINT16)sizeof(hfa384x_authenticateStation_data_t))</div><div class='add'>+#define		HFA384x_RID_CHANNELINFOREQUEST_LEN	((UINT16)sizeof(hfa384x_ChannelInfoRequest_data_t))</div><div class='add'>+/*--------------------------------------------------------------------</div><div class='add'>+Information RIDs:  Modem Information</div><div class='add'>+--------------------------------------------------------------------*/</div><div class='add'>+#define		HFA384x_RID_PHYTYPE		((UINT16)0xFDC0)</div><div class='add'>+#define		HFA384x_RID_CURRENTCHANNEL	((UINT16)0xFDC1)</div><div class='add'>+#define		HFA384x_RID_CURRENTPOWERSTATE	((UINT16)0xFDC2)</div><div class='add'>+#define		HFA384x_RID_CCAMODE		((UINT16)0xFDC3)</div><div class='add'>+#define		HFA384x_RID_SUPPORTEDDATARATES	((UINT16)0xFDC6)</div><div class='add'>+#define		HFA384x_RID_LFOSTATUS           ((UINT16)0xFDC7) // 1.7.1</div><div class='add'>+</div><div class='add'>+/*--------------------------------------------------------------------</div><div class='add'>+Information RID Lengths:  Modem Information</div><div class='add'>+  This is the length of JUST the DATA part of the RID (does not</div><div class='add'>+  include the len or code fields)</div><div class='add'>+--------------------------------------------------------------------*/</div><div class='add'>+#define		HFA384x_RID_PHYTYPE_LEN			((UINT16)0)</div><div class='add'>+#define		HFA384x_RID_CURRENTCHANNEL_LEN		((UINT16)0)</div><div class='add'>+#define		HFA384x_RID_CURRENTPOWERSTATE_LEN	((UINT16)0)</div><div class='add'>+#define		HFA384x_RID_CCAMODE_LEN			((UINT16)0)</div><div class='add'>+#define		HFA384x_RID_SUPPORTEDDATARATES_LEN	((UINT16)10)</div><div class='add'>+</div><div class='add'>+/*--------------------------------------------------------------------</div><div class='add'>+API ENHANCEMENTS (NOT ALREADY IMPLEMENTED)</div><div class='add'>+--------------------------------------------------------------------*/</div><div class='add'>+#define		HFA384x_RID_CNFWEPDEFAULTKEYID	((UINT16)0xFC23)</div><div class='add'>+#define		HFA384x_RID_CNFWEPDEFAULTKEY0	((UINT16)0xFC24)</div><div class='add'>+#define		HFA384x_RID_CNFWEPDEFAULTKEY1	((UINT16)0xFC25)</div><div class='add'>+#define		HFA384x_RID_CNFWEPDEFAULTKEY2	((UINT16)0xFC26)</div><div class='add'>+#define		HFA384x_RID_CNFWEPDEFAULTKEY3	((UINT16)0xFC27)</div><div class='add'>+#define		HFA384x_RID_CNFWEPFLAGS		((UINT16)0xFC28)</div><div class='add'>+#define		HFA384x_RID_CNFWEPKEYMAPTABLE	((UINT16)0xFC29)</div><div class='add'>+#define		HFA384x_RID_CNFAUTHENTICATION	((UINT16)0xFC2A)</div><div class='add'>+#define		HFA384x_RID_CNFMAXASSOCSTATIONS	((UINT16)0xFC2B)</div><div class='add'>+#define		HFA384x_RID_CNFTXCONTROL	((UINT16)0xFC2C)</div><div class='add'>+#define		HFA384x_RID_CNFROAMINGMODE	((UINT16)0xFC2D)</div><div class='add'>+#define		HFA384x_RID_CNFHOSTAUTHASSOC	((UINT16)0xFC2E)</div><div class='add'>+#define		HFA384x_RID_CNFRCVCRCERROR	((UINT16)0xFC30)</div><div class='add'>+// #define		HFA384x_RID_CNFMMLIFE		((UINT16)0xFC31)</div><div class='add'>+#define		HFA384x_RID_CNFALTRETRYCNT	((UINT16)0xFC32)</div><div class='add'>+#define		HFA384x_RID_CNFAPBCNINT		((UINT16)0xFC33)</div><div class='add'>+#define		HFA384x_RID_CNFAPPCFINFO	((UINT16)0xFC34)</div><div class='add'>+#define		HFA384x_RID_CNFSTAPCFINFO	((UINT16)0xFC35)</div><div class='add'>+#define		HFA384x_RID_CNFPRIORITYQUSAGE	((UINT16)0xFC37)</div><div class='add'>+#define		HFA384x_RID_CNFTIMCTRL		((UINT16)0xFC40)</div><div class='add'>+#define		HFA384x_RID_CNFTHIRTY2TALLY	((UINT16)0xFC42)</div><div class='add'>+#define		HFA384x_RID_CNFENHSECURITY	((UINT16)0xFC43)</div><div class='add'>+#define		HFA384x_RID_CNFDBMADJUST  	((UINT16)0xFC46) // NEW</div><div class='add'>+#define		HFA384x_RID_CNFWPADATA       	((UINT16)0xFC48) // 1.7.0</div><div class='add'>+#define		HFA384x_RID_CNFPROPOGATIONDELAY	((UINT16)0xFC49) // 1.7.6</div><div class='add'>+#define		HFA384x_RID_CNFSHORTPREAMBLE	((UINT16)0xFCB0)</div><div class='add'>+#define		HFA384x_RID_CNFEXCLONGPREAMBLE	((UINT16)0xFCB1)</div><div class='add'>+#define		HFA384x_RID_CNFAUTHRSPTIMEOUT	((UINT16)0xFCB2)</div><div class='add'>+#define		HFA384x_RID_CNFBASICRATES	((UINT16)0xFCB3)</div><div class='add'>+#define		HFA384x_RID_CNFSUPPRATES	((UINT16)0xFCB4)</div><div class='add'>+#define		HFA384x_RID_CNFFALLBACKCTRL	((UINT16)0xFCB5) // NEW</div><div class='add'>+#define		HFA384x_RID_WEPKEYSTATUS   	((UINT16)0xFCB6) // NEW</div><div class='add'>+#define		HFA384x_RID_WEPKEYMAPINDEX 	((UINT16)0xFCB7) // NEW</div><div class='add'>+#define		HFA384x_RID_BROADCASTKEYID 	((UINT16)0xFCB8) // NEW</div><div class='add'>+#define		HFA384x_RID_ENTSECFLAGEYID 	((UINT16)0xFCB9) // NEW</div><div class='add'>+#define		HFA384x_RID_CNFPASSIVESCANCTRL	((UINT16)0xFCBA) // NEW STA</div><div class='add'>+#define		HFA384x_RID_CNFWPAHANDLING	((UINT16)0xFCBB) // 1.7.0</div><div class='add'>+#define		HFA384x_RID_MDCCONTROL        	((UINT16)0xFCBC) // 1.7.0/1.4.0</div><div class='add'>+#define		HFA384x_RID_MDCCOUNTRY        	((UINT16)0xFCBD) // 1.7.0/1.4.0</div><div class='add'>+#define		HFA384x_RID_TXPOWERMAX        	((UINT16)0xFCBE) // 1.7.0/1.4.0</div><div class='add'>+#define		HFA384x_RID_CNFLFOENBLED      	((UINT16)0xFCBF) // 1.6.3</div><div class='add'>+#define         HFA384x_RID_CAPINFO             ((UINT16)0xFCC0) // 1.7.0/1.3.7</div><div class='add'>+#define         HFA384x_RID_LISTENINTERVAL      ((UINT16)0xFCC1) // 1.7.0/1.3.7</div><div class='add'>+#define         HFA384x_RID_DIVERSITYENABLED    ((UINT16)0xFCC2) // 1.7.0/1.3.7</div><div class='add'>+#define         HFA384x_RID_LED_CONTROL         ((UINT16)0xFCC4) // 1.7.6</div><div class='add'>+#define         HFA384x_RID_HFO_DELAY           ((UINT16)0xFCC5) // 1.7.6</div><div class='add'>+#define         HFA384x_RID_DISSALOWEDBSSID     ((UINT16)0xFCC6) // 1.8.0</div><div class='add'>+#define		HFA384x_RID_SCANREQUEST		((UINT16)0xFCE1)</div><div class='add'>+#define		HFA384x_RID_JOINREQUEST		((UINT16)0xFCE2)</div><div class='add'>+#define		HFA384x_RID_AUTHENTICATESTA	((UINT16)0xFCE3)</div><div class='add'>+#define		HFA384x_RID_CHANNELINFOREQUEST	((UINT16)0xFCE4)</div><div class='add'>+#define		HFA384x_RID_HOSTSCAN          	((UINT16)0xFCE5) // NEW STA</div><div class='add'>+#define		HFA384x_RID_ASSOCIATESTA	((UINT16)0xFCE6)</div><div class='add'>+</div><div class='add'>+#define		HFA384x_RID_CNFWEPDEFAULTKEY_LEN	((UINT16)6)</div><div class='add'>+#define		HFA384x_RID_CNFWEP128DEFAULTKEY_LEN	((UINT16)14)</div><div class='add'>+#define		HFA384x_RID_CNFPRIOQUSAGE_LEN		((UINT16)4)</div><div class='add'>+/*--------------------------------------------------------------------</div><div class='add'>+PD Record codes</div><div class='add'>+--------------------------------------------------------------------*/</div><div class='add'>+#define HFA384x_PDR_PCB_PARTNUM		((UINT16)0x0001)</div><div class='add'>+#define HFA384x_PDR_PDAVER		((UINT16)0x0002)</div><div class='add'>+#define HFA384x_PDR_NIC_SERIAL		((UINT16)0x0003)</div><div class='add'>+#define HFA384x_PDR_MKK_MEASUREMENTS	((UINT16)0x0004)</div><div class='add'>+#define HFA384x_PDR_NIC_RAMSIZE		((UINT16)0x0005)</div><div class='add'>+#define HFA384x_PDR_MFISUPRANGE		((UINT16)0x0006)</div><div class='add'>+#define HFA384x_PDR_CFISUPRANGE		((UINT16)0x0007)</div><div class='add'>+#define HFA384x_PDR_NICID		((UINT16)0x0008)</div><div class='add'>+//#define HFA384x_PDR_REFDAC_MEASUREMENTS	((UINT16)0x0010)</div><div class='add'>+//#define HFA384x_PDR_VGDAC_MEASUREMENTS	((UINT16)0x0020)</div><div class='add'>+//#define HFA384x_PDR_LEVEL_COMP_MEASUREMENTS	((UINT16)0x0030)</div><div class='add'>+//#define HFA384x_PDR_MODEM_TRIMDAC_MEASUREMENTS	((UINT16)0x0040)</div><div class='add'>+//#define HFA384x_PDR_COREGA_HACK		((UINT16)0x00ff)</div><div class='add'>+#define HFA384x_PDR_MAC_ADDRESS		((UINT16)0x0101)</div><div class='add'>+//#define HFA384x_PDR_MKK_CALLNAME	((UINT16)0x0102)</div><div class='add'>+#define HFA384x_PDR_REGDOMAIN		((UINT16)0x0103)</div><div class='add'>+#define HFA384x_PDR_ALLOWED_CHANNEL	((UINT16)0x0104)</div><div class='add'>+#define HFA384x_PDR_DEFAULT_CHANNEL	((UINT16)0x0105)</div><div class='add'>+//#define HFA384x_PDR_PRIVACY_OPTION	((UINT16)0x0106)</div><div class='add'>+#define HFA384x_PDR_TEMPTYPE		((UINT16)0x0107)</div><div class='add'>+//#define HFA384x_PDR_REFDAC_SETUP	((UINT16)0x0110)</div><div class='add'>+//#define HFA384x_PDR_VGDAC_SETUP		((UINT16)0x0120)</div><div class='add'>+//#define HFA384x_PDR_LEVEL_COMP_SETUP	((UINT16)0x0130)</div><div class='add'>+//#define HFA384x_PDR_TRIMDAC_SETUP	((UINT16)0x0140)</div><div class='add'>+#define HFA384x_PDR_IFR_SETTING		((UINT16)0x0200)</div><div class='add'>+#define HFA384x_PDR_RFR_SETTING		((UINT16)0x0201)</div><div class='add'>+#define HFA384x_PDR_HFA3861_BASELINE	((UINT16)0x0202)</div><div class='add'>+#define HFA384x_PDR_HFA3861_SHADOW	((UINT16)0x0203)</div><div class='add'>+#define HFA384x_PDR_HFA3861_IFRF	((UINT16)0x0204)</div><div class='add'>+#define HFA384x_PDR_HFA3861_CHCALSP	((UINT16)0x0300)</div><div class='add'>+#define HFA384x_PDR_HFA3861_CHCALI	((UINT16)0x0301)</div><div class='add'>+#define HFA384x_PDR_MAX_TX_POWER  	((UINT16)0x0302)</div><div class='add'>+#define HFA384x_PDR_MASTER_CHAN_LIST	((UINT16)0x0303)</div><div class='add'>+#define HFA384x_PDR_3842_NIC_CONFIG	((UINT16)0x0400)</div><div class='add'>+#define HFA384x_PDR_USB_ID		((UINT16)0x0401)</div><div class='add'>+#define HFA384x_PDR_PCI_ID		((UINT16)0x0402)</div><div class='add'>+#define HFA384x_PDR_PCI_IFCONF		((UINT16)0x0403)</div><div class='add'>+#define HFA384x_PDR_PCI_PMCONF		((UINT16)0x0404)</div><div class='add'>+#define HFA384x_PDR_RFENRGY		((UINT16)0x0406)</div><div class='add'>+#define HFA384x_PDR_USB_POWER_TYPE      ((UINT16)0x0407)</div><div class='add'>+//#define HFA384x_PDR_UNKNOWN408		((UINT16)0x0408)</div><div class='add'>+#define HFA384x_PDR_USB_MAX_POWER	((UINT16)0x0409)</div><div class='add'>+#define HFA384x_PDR_USB_MANUFACTURER	((UINT16)0x0410)</div><div class='add'>+#define HFA384x_PDR_USB_PRODUCT  	((UINT16)0x0411)</div><div class='add'>+#define HFA384x_PDR_ANT_DIVERSITY   	((UINT16)0x0412)</div><div class='add'>+#define HFA384x_PDR_HFO_DELAY       	((UINT16)0x0413)</div><div class='add'>+#define HFA384x_PDR_SCALE_THRESH 	((UINT16)0x0414)</div><div class='add'>+</div><div class='add'>+#define HFA384x_PDR_HFA3861_MANF_TESTSP	((UINT16)0x0900)</div><div class='add'>+#define HFA384x_PDR_HFA3861_MANF_TESTI	((UINT16)0x0901)</div><div class='add'>+#define HFA384x_PDR_END_OF_PDA		((UINT16)0x0000)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*=============================================================*/</div><div class='add'>+/*------ Macros -----------------------------------------------*/</div><div class='add'>+</div><div class='add'>+/*--- Register ID macros ------------------------*/</div><div class='add'>+</div><div class='add'>+#define		HFA384x_CMD		HFA384x_CMD_OFF</div><div class='add'>+#define		HFA384x_PARAM0		HFA384x_PARAM0_OFF</div><div class='add'>+#define		HFA384x_PARAM1		HFA384x_PARAM1_OFF</div><div class='add'>+#define		HFA384x_PARAM2		HFA384x_PARAM2_OFF</div><div class='add'>+#define		HFA384x_STATUS		HFA384x_STATUS_OFF</div><div class='add'>+#define		HFA384x_RESP0		HFA384x_RESP0_OFF</div><div class='add'>+#define		HFA384x_RESP1		HFA384x_RESP1_OFF</div><div class='add'>+#define		HFA384x_RESP2		HFA384x_RESP2_OFF</div><div class='add'>+#define		HFA384x_INFOFID		HFA384x_INFOFID_OFF</div><div class='add'>+#define		HFA384x_RXFID		HFA384x_RXFID_OFF</div><div class='add'>+#define		HFA384x_ALLOCFID	HFA384x_ALLOCFID_OFF</div><div class='add'>+#define		HFA384x_TXCOMPLFID	HFA384x_TXCOMPLFID_OFF</div><div class='add'>+#define		HFA384x_SELECT0		HFA384x_SELECT0_OFF</div><div class='add'>+#define		HFA384x_OFFSET0		HFA384x_OFFSET0_OFF</div><div class='add'>+#define		HFA384x_DATA0		HFA384x_DATA0_OFF</div><div class='add'>+#define		HFA384x_SELECT1		HFA384x_SELECT1_OFF</div><div class='add'>+#define		HFA384x_OFFSET1		HFA384x_OFFSET1_OFF</div><div class='add'>+#define		HFA384x_DATA1		HFA384x_DATA1_OFF</div><div class='add'>+#define		HFA384x_EVSTAT		HFA384x_EVSTAT_OFF</div><div class='add'>+#define		HFA384x_INTEN		HFA384x_INTEN_OFF</div><div class='add'>+#define		HFA384x_EVACK		HFA384x_EVACK_OFF</div><div class='add'>+#define		HFA384x_CONTROL		HFA384x_CONTROL_OFF</div><div class='add'>+#define		HFA384x_SWSUPPORT0	HFA384x_SWSUPPORT0_OFF</div><div class='add'>+#define		HFA384x_SWSUPPORT1	HFA384x_SWSUPPORT1_OFF</div><div class='add'>+#define		HFA384x_SWSUPPORT2	HFA384x_SWSUPPORT2_OFF</div><div class='add'>+#define		HFA384x_AUXPAGE		HFA384x_AUXPAGE_OFF</div><div class='add'>+#define		HFA384x_AUXOFFSET	HFA384x_AUXOFFSET_OFF</div><div class='add'>+#define		HFA384x_AUXDATA		HFA384x_AUXDATA_OFF</div><div class='add'>+#define		HFA384x_PCICOR		HFA384x_PCICOR_OFF</div><div class='add'>+#define		HFA384x_PCIHCR		HFA384x_PCIHCR_OFF</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*--- Register Test/Get/Set Field macros ------------------------*/</div><div class='add'>+</div><div class='add'>+#define		HFA384x_CMD_ISBUSY(value)		((UINT16)(((UINT16)value) &amp; HFA384x_CMD_BUSY))</div><div class='add'>+#define		HFA384x_CMD_AINFO_GET(value)		((UINT16)(((UINT16)(value) &amp; HFA384x_CMD_AINFO) &gt;&gt; 8))</div><div class='add'>+#define		HFA384x_CMD_AINFO_SET(value)		((UINT16)((UINT16)(value) &lt;&lt; 8))</div><div class='add'>+#define		HFA384x_CMD_MACPORT_GET(value)		((UINT16)(HFA384x_CMD_AINFO_GET((UINT16)(value) &amp; HFA384x_CMD_MACPORT)))</div><div class='add'>+#define		HFA384x_CMD_MACPORT_SET(value)		((UINT16)HFA384x_CMD_AINFO_SET(value))</div><div class='add'>+#define		HFA384x_CMD_ISRECL(value)		((UINT16)(HFA384x_CMD_AINFO_GET((UINT16)(value) &amp; HFA384x_CMD_RECL)))</div><div class='add'>+#define		HFA384x_CMD_RECL_SET(value)		((UINT16)HFA384x_CMD_AINFO_SET(value))</div><div class='add'>+#define		HFA384x_CMD_QOS_GET(value)		((UINT16((((UINT16)(value))&amp;((UINT16)0x3000)) &gt;&gt; 12))</div><div class='add'>+#define		HFA384x_CMD_QOS_SET(value)		((UINT16)((((UINT16)(value)) &lt;&lt; 12) &amp; 0x3000))</div><div class='add'>+#define		HFA384x_CMD_ISWRITE(value)		((UINT16)(HFA384x_CMD_AINFO_GET((UINT16)(value) &amp; HFA384x_CMD_WRITE)))</div><div class='add'>+#define		HFA384x_CMD_WRITE_SET(value)		((UINT16)HFA384x_CMD_AINFO_SET((UINT16)value))</div><div class='add'>+#define		HFA384x_CMD_PROGMODE_GET(value)		((UINT16)(HFA384x_CMD_AINFO_GET((UINT16)(value) &amp; HFA384x_CMD_PROGMODE)))</div><div class='add'>+#define		HFA384x_CMD_PROGMODE_SET(value)		((UINT16)HFA384x_CMD_AINFO_SET((UINT16)value))</div><div class='add'>+#define		HFA384x_CMD_CMDCODE_GET(value)		((UINT16)(((UINT16)(value)) &amp; HFA384x_CMD_CMDCODE))</div><div class='add'>+#define		HFA384x_CMD_CMDCODE_SET(value)		((UINT16)(value))</div><div class='add'>+</div><div class='add'>+#define		HFA384x_STATUS_RESULT_GET(value)	((UINT16)((((UINT16)(value)) &amp; HFA384x_STATUS_RESULT) &gt;&gt; 8))</div><div class='add'>+#define		HFA384x_STATUS_RESULT_SET(value)	(((UINT16)(value)) &lt;&lt; 8)</div><div class='add'>+#define		HFA384x_STATUS_CMDCODE_GET(value)	(((UINT16)(value)) &amp; HFA384x_STATUS_CMDCODE)</div><div class='add'>+#define		HFA384x_STATUS_CMDCODE_SET(value)	((UINT16)(value))</div><div class='add'>+</div><div class='add'>+#define		HFA384x_OFFSET_ISBUSY(value)		((UINT16)(((UINT16)(value)) &amp; HFA384x_OFFSET_BUSY))</div><div class='add'>+#define		HFA384x_OFFSET_ISERR(value)		((UINT16)(((UINT16)(value)) &amp; HFA384x_OFFSET_ERR))</div><div class='add'>+#define		HFA384x_OFFSET_DATAOFF_GET(value)	((UINT16)(((UINT16)(value)) &amp; HFA384x_OFFSET_DATAOFF))</div><div class='add'>+#define		HFA384x_OFFSET_DATAOFF_SET(value)	((UINT16)(value))</div><div class='add'>+</div><div class='add'>+#define		HFA384x_EVSTAT_ISTICK(value)		((UINT16)(((UINT16)(value)) &amp; HFA384x_EVSTAT_TICK))</div><div class='add'>+#define		HFA384x_EVSTAT_ISWTERR(value)		((UINT16)(((UINT16)(value)) &amp; HFA384x_EVSTAT_WTERR))</div><div class='add'>+#define		HFA384x_EVSTAT_ISINFDROP(value)		((UINT16)(((UINT16)(value)) &amp; HFA384x_EVSTAT_INFDROP))</div><div class='add'>+#define		HFA384x_EVSTAT_ISINFO(value)		((UINT16)(((UINT16)(value)) &amp; HFA384x_EVSTAT_INFO))</div><div class='add'>+#define		HFA384x_EVSTAT_ISDTIM(value)		((UINT16)(((UINT16)(value)) &amp; HFA384x_EVSTAT_DTIM))</div><div class='add'>+#define		HFA384x_EVSTAT_ISCMD(value)		((UINT16)(((UINT16)(value)) &amp; HFA384x_EVSTAT_CMD))</div><div class='add'>+#define		HFA384x_EVSTAT_ISALLOC(value)		((UINT16)(((UINT16)(value)) &amp; HFA384x_EVSTAT_ALLOC))</div><div class='add'>+#define		HFA384x_EVSTAT_ISTXEXC(value)		((UINT16)(((UINT16)(value)) &amp; HFA384x_EVSTAT_TXEXC))</div><div class='add'>+#define		HFA384x_EVSTAT_ISTX(value)		((UINT16)(((UINT16)(value)) &amp; HFA384x_EVSTAT_TX))</div><div class='add'>+#define		HFA384x_EVSTAT_ISRX(value)		((UINT16)(((UINT16)(value)) &amp; HFA384x_EVSTAT_RX))</div><div class='add'>+</div><div class='add'>+#define		HFA384x_EVSTAT_ISBAP_OP(value)		((UINT16)(((UINT16)(value)) &amp; HFA384x_INT_BAP_OP))</div><div class='add'>+</div><div class='add'>+#define		HFA384x_INTEN_ISTICK(value)		((UINT16)(((UINT16)(value)) &amp; HFA384x_INTEN_TICK))</div><div class='add'>+#define		HFA384x_INTEN_TICK_SET(value)		((UINT16)(((UINT16)(value)) &lt;&lt; 15))</div><div class='add'>+#define		HFA384x_INTEN_ISWTERR(value)		((UINT16)(((UINT16)(value)) &amp; HFA384x_INTEN_WTERR))</div><div class='add'>+#define		HFA384x_INTEN_WTERR_SET(value)		((UINT16)(((UINT16)(value)) &lt;&lt; 14))</div><div class='add'>+#define		HFA384x_INTEN_ISINFDROP(value)		((UINT16)(((UINT16)(value)) &amp; HFA384x_INTEN_INFDROP))</div><div class='add'>+#define		HFA384x_INTEN_INFDROP_SET(value)	((UINT16)(((UINT16)(value)) &lt;&lt; 13))</div><div class='add'>+#define		HFA384x_INTEN_ISINFO(value)		((UINT16)(((UINT16)(value)) &amp; HFA384x_INTEN_INFO))</div><div class='add'>+#define		HFA384x_INTEN_INFO_SET(value)		((UINT16)(((UINT16)(value)) &lt;&lt; 7))</div><div class='add'>+#define		HFA384x_INTEN_ISDTIM(value)		((UINT16)(((UINT16)(value)) &amp; HFA384x_INTEN_DTIM))</div><div class='add'>+#define		HFA384x_INTEN_DTIM_SET(value)		((UINT16)(((UINT16)(value)) &lt;&lt; 5))</div><div class='add'>+#define		HFA384x_INTEN_ISCMD(value)		((UINT16)(((UINT16)(value)) &amp; HFA384x_INTEN_CMD))</div><div class='add'>+#define		HFA384x_INTEN_CMD_SET(value)		((UINT16)(((UINT16)(value)) &lt;&lt; 4))</div><div class='add'>+#define		HFA384x_INTEN_ISALLOC(value)		((UINT16)(((UINT16)(value)) &amp; HFA384x_INTEN_ALLOC))</div><div class='add'>+#define		HFA384x_INTEN_ALLOC_SET(value)		((UINT16)(((UINT16)(value)) &lt;&lt; 3))</div><div class='add'>+#define		HFA384x_INTEN_ISTXEXC(value)		((UINT16)(((UINT16)(value)) &amp; HFA384x_INTEN_TXEXC))</div><div class='add'>+#define		HFA384x_INTEN_TXEXC_SET(value)		((UINT16)(((UINT16)(value)) &lt;&lt; 2))</div><div class='add'>+#define		HFA384x_INTEN_ISTX(value)		((UINT16)(((UINT16)(value)) &amp; HFA384x_INTEN_TX))</div><div class='add'>+#define		HFA384x_INTEN_TX_SET(value)		((UINT16)(((UINT16)(value)) &lt;&lt; 1))</div><div class='add'>+#define		HFA384x_INTEN_ISRX(value)		((UINT16)(((UINT16)(value)) &amp; HFA384x_INTEN_RX))</div><div class='add'>+#define		HFA384x_INTEN_RX_SET(value)		((UINT16)(((UINT16)(value)) &lt;&lt; 0))</div><div class='add'>+</div><div class='add'>+#define		HFA384x_EVACK_ISTICK(value)		((UINT16)(((UINT16)(value)) &amp; HFA384x_EVACK_TICK))</div><div class='add'>+#define		HFA384x_EVACK_TICK_SET(value)		((UINT16)(((UINT16)(value)) &lt;&lt; 15))</div><div class='add'>+#define		HFA384x_EVACK_ISWTERR(value)		((UINT16)(((UINT16)(value)) &amp; HFA384x_EVACK_WTERR))</div><div class='add'>+#define		HFA384x_EVACK_WTERR_SET(value)		((UINT16)(((UINT16)(value)) &lt;&lt; 14))</div><div class='add'>+#define		HFA384x_EVACK_ISINFDROP(value)		((UINT16)(((UINT16)(value)) &amp; HFA384x_EVACK_INFDROP))</div><div class='add'>+#define		HFA384x_EVACK_INFDROP_SET(value)	((UINT16)(((UINT16)(value)) &lt;&lt; 13))</div><div class='add'>+#define		HFA384x_EVACK_ISINFO(value)		((UINT16)(((UINT16)(value)) &amp; HFA384x_EVACK_INFO))</div><div class='add'>+#define		HFA384x_EVACK_INFO_SET(value)		((UINT16)(((UINT16)(value)) &lt;&lt; 7))</div><div class='add'>+#define		HFA384x_EVACK_ISDTIM(value)		((UINT16)(((UINT16)(value)) &amp; HFA384x_EVACK_DTIM))</div><div class='add'>+#define		HFA384x_EVACK_DTIM_SET(value)		((UINT16)(((UINT16)(value)) &lt;&lt; 5))</div><div class='add'>+#define		HFA384x_EVACK_ISCMD(value)		((UINT16)(((UINT16)(value)) &amp; HFA384x_EVACK_CMD))</div><div class='add'>+#define		HFA384x_EVACK_CMD_SET(value)		((UINT16)(((UINT16)(value)) &lt;&lt; 4))</div><div class='add'>+#define		HFA384x_EVACK_ISALLOC(value)		((UINT16)(((UINT16)(value)) &amp; HFA384x_EVACK_ALLOC))</div><div class='add'>+#define		HFA384x_EVACK_ALLOC_SET(value)		((UINT16)(((UINT16)(value)) &lt;&lt; 3))</div><div class='add'>+#define		HFA384x_EVACK_ISTXEXC(value)		((UINT16)(((UINT16)(value)) &amp; HFA384x_EVACK_TXEXC))</div><div class='add'>+#define		HFA384x_EVACK_TXEXC_SET(value)		((UINT16)(((UINT16)(value)) &lt;&lt; 2))</div><div class='add'>+#define		HFA384x_EVACK_ISTX(value)		((UINT16)(((UINT16)(value)) &amp; HFA384x_EVACK_TX))</div><div class='add'>+#define		HFA384x_EVACK_TX_SET(value)		((UINT16)(((UINT16)(value)) &lt;&lt; 1))</div><div class='add'>+#define		HFA384x_EVACK_ISRX(value)		((UINT16)(((UINT16)(value)) &amp; HFA384x_EVACK_RX))</div><div class='add'>+#define		HFA384x_EVACK_RX_SET(value)		((UINT16)(((UINT16)(value)) &lt;&lt; 0))</div><div class='add'>+</div><div class='add'>+#define		HFA384x_CONTROL_AUXEN_SET(value)	((UINT16)(((UINT16)(value)) &lt;&lt; 14))</div><div class='add'>+#define		HFA384x_CONTROL_AUXEN_GET(value)	((UINT16)(((UINT16)(value)) &gt;&gt; 14))</div><div class='add'>+</div><div class='add'>+/* Byte Order */</div><div class='add'>+#ifdef __KERNEL__</div><div class='add'>+#define hfa384x2host_16(n)	(__le16_to_cpu((UINT16)(n)))</div><div class='add'>+#define hfa384x2host_32(n)	(__le32_to_cpu((UINT32)(n)))</div><div class='add'>+#define host2hfa384x_16(n)	(__cpu_to_le16((UINT16)(n)))</div><div class='add'>+#define host2hfa384x_32(n)	(__cpu_to_le32((UINT32)(n)))</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* Host Maintained State Info */</div><div class='add'>+#define HFA384x_STATE_PREINIT	0</div><div class='add'>+#define HFA384x_STATE_INIT	1</div><div class='add'>+#define HFA384x_STATE_RUNNING	2</div><div class='add'>+</div><div class='add'>+/*=============================================================*/</div><div class='add'>+/*------ Types and their related constants --------------------*/</div><div class='add'>+</div><div class='add'>+#define HFA384x_HOSTAUTHASSOC_HOSTAUTH   BIT0</div><div class='add'>+#define HFA384x_HOSTAUTHASSOC_HOSTASSOC  BIT1</div><div class='add'>+</div><div class='add'>+#define HFA384x_WHAHANDLING_DISABLED     0</div><div class='add'>+#define HFA384x_WHAHANDLING_PASSTHROUGH  BIT1</div><div class='add'>+</div><div class='add'>+/*-------------------------------------------------------------*/</div><div class='add'>+/* Commonly used basic types */</div><div class='add'>+typedef struct hfa384x_bytestr</div><div class='add'>+{</div><div class='add'>+	UINT16	len;</div><div class='add'>+	UINT8	data[0];</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_bytestr_t;</div><div class='add'>+</div><div class='add'>+typedef struct hfa384x_bytestr32</div><div class='add'>+{</div><div class='add'>+	UINT16	len;</div><div class='add'>+	UINT8	data[32];</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_bytestr32_t;</div><div class='add'>+</div><div class='add'>+/*--------------------------------------------------------------------</div><div class='add'>+Configuration Record Structures:</div><div class='add'>+	Network Parameters, Static Configuration Entities</div><div class='add'>+--------------------------------------------------------------------*/</div><div class='add'>+/* Prototype structure: all configuration record structures start with</div><div class='add'>+these members */</div><div class='add'>+</div><div class='add'>+typedef struct hfa384x_record</div><div class='add'>+{</div><div class='add'>+	UINT16	reclen;</div><div class='add'>+	UINT16	rid;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_rec_t;</div><div class='add'>+</div><div class='add'>+typedef struct hfa384x_record16</div><div class='add'>+{</div><div class='add'>+	UINT16	reclen;</div><div class='add'>+	UINT16	rid;</div><div class='add'>+	UINT16	val;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_rec16_t;</div><div class='add'>+</div><div class='add'>+typedef struct hfa384x_record32</div><div class='add'>+{</div><div class='add'>+	UINT16	reclen;</div><div class='add'>+	UINT16	rid;</div><div class='add'>+	UINT32	val;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_rec32;</div><div class='add'>+</div><div class='add'>+/*-- Hardware/Firmware Component Information ----------*/</div><div class='add'>+typedef struct hfa384x_compident</div><div class='add'>+{</div><div class='add'>+	UINT16	id;</div><div class='add'>+	UINT16	variant;</div><div class='add'>+	UINT16	major;</div><div class='add'>+	UINT16	minor;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_compident_t;</div><div class='add'>+</div><div class='add'>+typedef struct hfa384x_caplevel</div><div class='add'>+{</div><div class='add'>+	UINT16	role;</div><div class='add'>+	UINT16	id;</div><div class='add'>+	UINT16	variant;</div><div class='add'>+	UINT16	bottom;</div><div class='add'>+	UINT16	top;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_caplevel_t;</div><div class='add'>+</div><div class='add'>+/*-- Configuration Record: cnfPortType --*/</div><div class='add'>+typedef struct hfa384x_cnfPortType</div><div class='add'>+{</div><div class='add'>+	UINT16	cnfPortType;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_cnfPortType_t;</div><div class='add'>+</div><div class='add'>+/*-- Configuration Record: cnfOwnMACAddress --*/</div><div class='add'>+typedef struct hfa384x_cnfOwnMACAddress</div><div class='add'>+{</div><div class='add'>+	UINT8	cnfOwnMACAddress[6];</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_cnfOwnMACAddress_t;</div><div class='add'>+</div><div class='add'>+/*-- Configuration Record: cnfDesiredSSID --*/</div><div class='add'>+typedef struct hfa384x_cnfDesiredSSID</div><div class='add'>+{</div><div class='add'>+	UINT8	cnfDesiredSSID[34];</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_cnfDesiredSSID_t;</div><div class='add'>+</div><div class='add'>+/*-- Configuration Record: cnfOwnChannel --*/</div><div class='add'>+typedef struct hfa384x_cnfOwnChannel</div><div class='add'>+{</div><div class='add'>+	UINT16	cnfOwnChannel;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_cnfOwnChannel_t;</div><div class='add'>+</div><div class='add'>+/*-- Configuration Record: cnfOwnSSID --*/</div><div class='add'>+typedef struct hfa384x_cnfOwnSSID</div><div class='add'>+{</div><div class='add'>+	UINT8	cnfOwnSSID[34];</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_cnfOwnSSID_t;</div><div class='add'>+</div><div class='add'>+/*-- Configuration Record: cnfOwnATIMWindow --*/</div><div class='add'>+typedef struct hfa384x_cnfOwnATIMWindow</div><div class='add'>+{</div><div class='add'>+	UINT16	cnfOwnATIMWindow;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_cnfOwnATIMWindow_t;</div><div class='add'>+</div><div class='add'>+/*-- Configuration Record: cnfSystemScale --*/</div><div class='add'>+typedef struct hfa384x_cnfSystemScale</div><div class='add'>+{</div><div class='add'>+	UINT16	cnfSystemScale;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_cnfSystemScale_t;</div><div class='add'>+</div><div class='add'>+/*-- Configuration Record: cnfMaxDataLength --*/</div><div class='add'>+typedef struct hfa384x_cnfMaxDataLength</div><div class='add'>+{</div><div class='add'>+	UINT16	cnfMaxDataLength;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_cnfMaxDataLength_t;</div><div class='add'>+</div><div class='add'>+/*-- Configuration Record: cnfWDSAddress --*/</div><div class='add'>+typedef struct hfa384x_cnfWDSAddress</div><div class='add'>+{</div><div class='add'>+	UINT8	cnfWDSAddress[6];</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_cnfWDSAddress_t;</div><div class='add'>+</div><div class='add'>+/*-- Configuration Record: cnfPMEnabled --*/</div><div class='add'>+typedef struct hfa384x_cnfPMEnabled</div><div class='add'>+{</div><div class='add'>+	UINT16	cnfPMEnabled;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_cnfPMEnabled_t;</div><div class='add'>+</div><div class='add'>+/*-- Configuration Record: cnfPMEPS --*/</div><div class='add'>+typedef struct hfa384x_cnfPMEPS</div><div class='add'>+{</div><div class='add'>+	UINT16	cnfPMEPS;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_cnfPMEPS_t;</div><div class='add'>+</div><div class='add'>+/*-- Configuration Record: cnfMulticastReceive --*/</div><div class='add'>+typedef struct hfa384x_cnfMulticastReceive</div><div class='add'>+{</div><div class='add'>+	UINT16	cnfMulticastReceive;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_cnfMulticastReceive_t;</div><div class='add'>+</div><div class='add'>+/*-- Configuration Record: cnfAuthentication --*/</div><div class='add'>+#define HFA384x_CNFAUTHENTICATION_OPENSYSTEM	0x0001</div><div class='add'>+#define HFA384x_CNFAUTHENTICATION_SHAREDKEY	0x0002</div><div class='add'>+#define HFA384x_CNFAUTHENTICATION_LEAP     	0x0004</div><div class='add'>+</div><div class='add'>+/*-- Configuration Record: cnfMaxSleepDuration --*/</div><div class='add'>+typedef struct hfa384x_cnfMaxSleepDuration</div><div class='add'>+{</div><div class='add'>+	UINT16	cnfMaxSleepDuration;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_cnfMaxSleepDuration_t;</div><div class='add'>+</div><div class='add'>+/*-- Configuration Record: cnfPMHoldoverDuration --*/</div><div class='add'>+typedef struct hfa384x_cnfPMHoldoverDuration</div><div class='add'>+{</div><div class='add'>+	UINT16	cnfPMHoldoverDuration;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_cnfPMHoldoverDuration_t;</div><div class='add'>+</div><div class='add'>+/*-- Configuration Record: cnfOwnName --*/</div><div class='add'>+typedef struct hfa384x_cnfOwnName</div><div class='add'>+{</div><div class='add'>+	UINT8	cnfOwnName[34];</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_cnfOwnName_t;</div><div class='add'>+</div><div class='add'>+/*-- Configuration Record: cnfOwnDTIMPeriod --*/</div><div class='add'>+typedef struct hfa384x_cnfOwnDTIMPeriod</div><div class='add'>+{</div><div class='add'>+	UINT16	cnfOwnDTIMPeriod;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_cnfOwnDTIMPeriod_t;</div><div class='add'>+</div><div class='add'>+/*-- Configuration Record: cnfWDSAddress --*/</div><div class='add'>+typedef struct hfa384x_cnfWDSAddressN</div><div class='add'>+{</div><div class='add'>+	UINT8	cnfWDSAddress[6];</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_cnfWDSAddressN_t;</div><div class='add'>+</div><div class='add'>+/*-- Configuration Record: cnfMulticastPMBuffering --*/</div><div class='add'>+typedef struct hfa384x_cnfMulticastPMBuffering</div><div class='add'>+{</div><div class='add'>+	UINT16	cnfMulticastPMBuffering;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_cnfMulticastPMBuffering_t;</div><div class='add'>+</div><div class='add'>+/*--------------------------------------------------------------------</div><div class='add'>+Configuration Record Structures:</div><div class='add'>+	Network Parameters, Dynamic Configuration Entities</div><div class='add'>+--------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+/*-- Configuration Record: GroupAddresses --*/</div><div class='add'>+typedef struct hfa384x_GroupAddresses</div><div class='add'>+{</div><div class='add'>+	UINT8	MACAddress[16][6];</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_GroupAddresses_t;</div><div class='add'>+</div><div class='add'>+/*-- Configuration Record: CreateIBSS --*/</div><div class='add'>+typedef struct hfa384x_CreateIBSS</div><div class='add'>+{</div><div class='add'>+	UINT16	CreateIBSS;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_CreateIBSS_t;</div><div class='add'>+</div><div class='add'>+#define HFA384x_CREATEIBSS_JOINCREATEIBSS          0</div><div class='add'>+#define HFA384x_CREATEIBSS_JOINESS_JOINCREATEIBSS  1</div><div class='add'>+#define HFA384x_CREATEIBSS_JOINIBSS                2</div><div class='add'>+#define HFA384x_CREATEIBSS_JOINESS_JOINIBSS        3</div><div class='add'>+</div><div class='add'>+/*-- Configuration Record: FragmentationThreshold --*/</div><div class='add'>+typedef struct hfa384x_FragmentationThreshold</div><div class='add'>+{</div><div class='add'>+	UINT16	FragmentationThreshold;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_FragmentationThreshold_t;</div><div class='add'>+</div><div class='add'>+/*-- Configuration Record: RTSThreshold --*/</div><div class='add'>+typedef struct hfa384x_RTSThreshold</div><div class='add'>+{</div><div class='add'>+	UINT16	RTSThreshold;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_RTSThreshold_t;</div><div class='add'>+</div><div class='add'>+/*-- Configuration Record: TxRateControl --*/</div><div class='add'>+typedef struct hfa384x_TxRateControl</div><div class='add'>+{</div><div class='add'>+	UINT16	TxRateControl;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_TxRateControl_t;</div><div class='add'>+</div><div class='add'>+/*-- Configuration Record: PromiscuousMode --*/</div><div class='add'>+typedef struct hfa384x_PromiscuousMode</div><div class='add'>+{</div><div class='add'>+	UINT16	PromiscuousMode;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_PromiscuousMode_t;</div><div class='add'>+</div><div class='add'>+/*-- Configuration Record: ScanRequest (data portion only) --*/</div><div class='add'>+typedef struct hfa384x_ScanRequest_data</div><div class='add'>+{</div><div class='add'>+	UINT16	channelList;</div><div class='add'>+	UINT16	txRate;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_ScanRequest_data_t;</div><div class='add'>+</div><div class='add'>+/*-- Configuration Record: HostScanRequest (data portion only) --*/</div><div class='add'>+typedef struct hfa384x_HostScanRequest_data</div><div class='add'>+{</div><div class='add'>+	UINT16	channelList;</div><div class='add'>+	UINT16	txRate;</div><div class='add'>+	hfa384x_bytestr32_t ssid;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_HostScanRequest_data_t;</div><div class='add'>+</div><div class='add'>+/*-- Configuration Record: JoinRequest (data portion only) --*/</div><div class='add'>+typedef struct hfa384x_JoinRequest_data</div><div class='add'>+{</div><div class='add'>+	UINT8	bssid[WLAN_BSSID_LEN];</div><div class='add'>+	UINT16	channel;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_JoinRequest_data_t;</div><div class='add'>+</div><div class='add'>+/*-- Configuration Record: authenticateStation (data portion only) --*/</div><div class='add'>+typedef struct hfa384x_authenticateStation_data</div><div class='add'>+{</div><div class='add'>+	UINT8	address[WLAN_ADDR_LEN];</div><div class='add'>+	UINT16	status;</div><div class='add'>+	UINT16	algorithm;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_authenticateStation_data_t;</div><div class='add'>+</div><div class='add'>+/*-- Configuration Record: associateStation (data portion only) --*/</div><div class='add'>+typedef struct hfa384x_associateStation_data</div><div class='add'>+{</div><div class='add'>+	UINT8	address[WLAN_ADDR_LEN];</div><div class='add'>+	UINT16	status;</div><div class='add'>+	UINT16	type;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_associateStation_data_t;</div><div class='add'>+</div><div class='add'>+/*-- Configuration Record: ChannelInfoRequest (data portion only) --*/</div><div class='add'>+typedef struct hfa384x_ChannelInfoRequest_data</div><div class='add'>+{</div><div class='add'>+	UINT16	channelList;</div><div class='add'>+	UINT16	channelDwellTime;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_ChannelInfoRequest_data_t;</div><div class='add'>+</div><div class='add'>+/*-- Configuration Record: WEPKeyMapping (data portion only) --*/</div><div class='add'>+typedef struct hfa384x_WEPKeyMapping</div><div class='add'>+{</div><div class='add'>+	UINT8	address[WLAN_ADDR_LEN];</div><div class='add'>+	UINT16	key_index;</div><div class='add'>+	UINT8 	key[16];</div><div class='add'>+	UINT8 	mic_transmit_key[4];</div><div class='add'>+	UINT8 	mic_receive_key[4];</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_WEPKeyMapping_t;</div><div class='add'>+</div><div class='add'>+/*-- Configuration Record: WPAData       (data portion only) --*/</div><div class='add'>+typedef struct hfa384x_WPAData</div><div class='add'>+{</div><div class='add'>+	UINT16	datalen;</div><div class='add'>+        UINT8 	data[0]; // max 80</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_WPAData_t;</div><div class='add'>+</div><div class='add'>+/*--------------------------------------------------------------------</div><div class='add'>+Configuration Record Structures: Behavior Parameters</div><div class='add'>+--------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+/*-- Configuration Record: TickTime --*/</div><div class='add'>+typedef struct hfa384x_TickTime</div><div class='add'>+{</div><div class='add'>+	UINT16	TickTime;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_TickTime_t;</div><div class='add'>+</div><div class='add'>+/*--------------------------------------------------------------------</div><div class='add'>+Information Record Structures: NIC Information</div><div class='add'>+--------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+/*-- Information Record: MaxLoadTime --*/</div><div class='add'>+typedef struct hfa384x_MaxLoadTime</div><div class='add'>+{</div><div class='add'>+	UINT16	MaxLoadTime;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_MaxLoadTime_t;</div><div class='add'>+</div><div class='add'>+/*-- Information Record: DownLoadBuffer --*/</div><div class='add'>+/* NOTE: The page and offset are in AUX format */</div><div class='add'>+typedef struct hfa384x_downloadbuffer</div><div class='add'>+{</div><div class='add'>+	UINT16	page;</div><div class='add'>+	UINT16	offset;</div><div class='add'>+	UINT16	len;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_downloadbuffer_t;</div><div class='add'>+</div><div class='add'>+/*-- Information Record: PRIIdentity --*/</div><div class='add'>+typedef struct hfa384x_PRIIdentity</div><div class='add'>+{</div><div class='add'>+	UINT16	PRICompID;</div><div class='add'>+	UINT16	PRIVariant;</div><div class='add'>+	UINT16	PRIMajorVersion;</div><div class='add'>+	UINT16	PRIMinorVersion;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_PRIIdentity_t;</div><div class='add'>+</div><div class='add'>+/*-- Information Record: PRISupRange --*/</div><div class='add'>+typedef struct hfa384x_PRISupRange</div><div class='add'>+{</div><div class='add'>+	UINT16	PRIRole;</div><div class='add'>+	UINT16	PRIID;</div><div class='add'>+	UINT16	PRIVariant;</div><div class='add'>+	UINT16	PRIBottom;</div><div class='add'>+	UINT16	PRITop;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_PRISupRange_t;</div><div class='add'>+</div><div class='add'>+/*-- Information Record: CFIActRanges --*/</div><div class='add'>+typedef struct hfa384x_CFIActRanges</div><div class='add'>+{</div><div class='add'>+	UINT16	CFIRole;</div><div class='add'>+	UINT16	CFIID;</div><div class='add'>+	UINT16	CFIVariant;</div><div class='add'>+	UINT16	CFIBottom;</div><div class='add'>+	UINT16	CFITop;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_CFIActRanges_t;</div><div class='add'>+</div><div class='add'>+/*-- Information Record: NICSerialNumber --*/</div><div class='add'>+typedef struct hfa384x_NICSerialNumber</div><div class='add'>+{</div><div class='add'>+	UINT8	NICSerialNumber[12];</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_NICSerialNumber_t;</div><div class='add'>+</div><div class='add'>+/*-- Information Record: NICIdentity --*/</div><div class='add'>+typedef struct hfa384x_NICIdentity</div><div class='add'>+{</div><div class='add'>+	UINT16	NICCompID;</div><div class='add'>+	UINT16	NICVariant;</div><div class='add'>+	UINT16	NICMajorVersion;</div><div class='add'>+	UINT16	NICMinorVersion;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_NICIdentity_t;</div><div class='add'>+</div><div class='add'>+/*-- Information Record: MFISupRange --*/</div><div class='add'>+typedef struct hfa384x_MFISupRange</div><div class='add'>+{</div><div class='add'>+	UINT16	MFIRole;</div><div class='add'>+	UINT16	MFIID;</div><div class='add'>+	UINT16	MFIVariant;</div><div class='add'>+	UINT16	MFIBottom;</div><div class='add'>+	UINT16	MFITop;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_MFISupRange_t;</div><div class='add'>+</div><div class='add'>+/*-- Information Record: CFISupRange --*/</div><div class='add'>+typedef struct hfa384x_CFISupRange</div><div class='add'>+{</div><div class='add'>+	UINT16	CFIRole;</div><div class='add'>+	UINT16	CFIID;</div><div class='add'>+	UINT16	CFIVariant;</div><div class='add'>+	UINT16	CFIBottom;</div><div class='add'>+	UINT16	CFITop;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_CFISupRange_t;</div><div class='add'>+</div><div class='add'>+/*-- Information Record: BUILDSEQ:BuildSeq --*/</div><div class='add'>+typedef struct hfa384x_BuildSeq {</div><div class='add'>+	UINT16	primary;</div><div class='add'>+	UINT16	secondary;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_BuildSeq_t;</div><div class='add'>+</div><div class='add'>+/*-- Information Record: FWID --*/</div><div class='add'>+#define HFA384x_FWID_LEN	14</div><div class='add'>+typedef struct hfa384x_FWID {</div><div class='add'>+	UINT8	primary[HFA384x_FWID_LEN];</div><div class='add'>+	UINT8	secondary[HFA384x_FWID_LEN];</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_FWID_t;</div><div class='add'>+</div><div class='add'>+/*-- Information Record: ChannelList --*/</div><div class='add'>+typedef struct hfa384x_ChannelList</div><div class='add'>+{</div><div class='add'>+	UINT16	ChannelList;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_ChannelList_t;</div><div class='add'>+</div><div class='add'>+/*-- Information Record: RegulatoryDomains --*/</div><div class='add'>+typedef struct hfa384x_RegulatoryDomains</div><div class='add'>+{</div><div class='add'>+	UINT8	RegulatoryDomains[12];</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_RegulatoryDomains_t;</div><div class='add'>+</div><div class='add'>+/*-- Information Record: TempType --*/</div><div class='add'>+typedef struct hfa384x_TempType</div><div class='add'>+{</div><div class='add'>+	UINT16	TempType;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_TempType_t;</div><div class='add'>+</div><div class='add'>+/*-- Information Record: CIS --*/</div><div class='add'>+typedef struct hfa384x_CIS</div><div class='add'>+{</div><div class='add'>+	UINT8	CIS[480];</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_CIS_t;</div><div class='add'>+</div><div class='add'>+/*-- Information Record: STAIdentity --*/</div><div class='add'>+typedef struct hfa384x_STAIdentity</div><div class='add'>+{</div><div class='add'>+	UINT16	STACompID;</div><div class='add'>+	UINT16	STAVariant;</div><div class='add'>+	UINT16	STAMajorVersion;</div><div class='add'>+	UINT16	STAMinorVersion;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_STAIdentity_t;</div><div class='add'>+</div><div class='add'>+/*-- Information Record: STASupRange --*/</div><div class='add'>+typedef struct hfa384x_STASupRange</div><div class='add'>+{</div><div class='add'>+	UINT16	STARole;</div><div class='add'>+	UINT16	STAID;</div><div class='add'>+	UINT16	STAVariant;</div><div class='add'>+	UINT16	STABottom;</div><div class='add'>+	UINT16	STATop;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_STASupRange_t;</div><div class='add'>+</div><div class='add'>+/*-- Information Record: MFIActRanges --*/</div><div class='add'>+typedef struct hfa384x_MFIActRanges</div><div class='add'>+{</div><div class='add'>+	UINT16	MFIRole;</div><div class='add'>+	UINT16	MFIID;</div><div class='add'>+	UINT16	MFIVariant;</div><div class='add'>+	UINT16	MFIBottom;</div><div class='add'>+	UINT16	MFITop;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_MFIActRanges_t;</div><div class='add'>+</div><div class='add'>+/*--------------------------------------------------------------------</div><div class='add'>+Information Record Structures: NIC Information</div><div class='add'>+--------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+/*-- Information Record: PortStatus --*/</div><div class='add'>+typedef struct hfa384x_PortStatus</div><div class='add'>+{</div><div class='add'>+	UINT16	PortStatus;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_PortStatus_t;</div><div class='add'>+</div><div class='add'>+#define HFA384x_PSTATUS_DISABLED	((UINT16)1)</div><div class='add'>+#define HFA384x_PSTATUS_SEARCHING	((UINT16)2)</div><div class='add'>+#define HFA384x_PSTATUS_CONN_IBSS	((UINT16)3)</div><div class='add'>+#define HFA384x_PSTATUS_CONN_ESS	((UINT16)4)</div><div class='add'>+#define HFA384x_PSTATUS_OUTOFRANGE	((UINT16)5)</div><div class='add'>+#define HFA384x_PSTATUS_CONN_WDS	((UINT16)6)</div><div class='add'>+</div><div class='add'>+/*-- Information Record: CurrentSSID --*/</div><div class='add'>+typedef struct hfa384x_CurrentSSID</div><div class='add'>+{</div><div class='add'>+	UINT8	CurrentSSID[34];</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_CurrentSSID_t;</div><div class='add'>+</div><div class='add'>+/*-- Information Record: CurrentBSSID --*/</div><div class='add'>+typedef struct hfa384x_CurrentBSSID</div><div class='add'>+{</div><div class='add'>+	UINT8	CurrentBSSID[6];</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_CurrentBSSID_t;</div><div class='add'>+</div><div class='add'>+/*-- Information Record: commsquality --*/</div><div class='add'>+typedef struct hfa384x_commsquality</div><div class='add'>+{</div><div class='add'>+	UINT16	CQ_currBSS;</div><div class='add'>+	UINT16	ASL_currBSS;</div><div class='add'>+	UINT16	ANL_currFC;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_commsquality_t;</div><div class='add'>+</div><div class='add'>+/*-- Information Record: dmbcommsquality --*/</div><div class='add'>+typedef struct hfa384x_dbmcommsquality</div><div class='add'>+{</div><div class='add'>+	UINT16	CQdbm_currBSS;</div><div class='add'>+	UINT16	ASLdbm_currBSS;</div><div class='add'>+	UINT16	ANLdbm_currFC;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_dbmcommsquality_t;</div><div class='add'>+</div><div class='add'>+/*-- Information Record: CurrentTxRate --*/</div><div class='add'>+typedef struct hfa384x_CurrentTxRate</div><div class='add'>+{</div><div class='add'>+	UINT16	CurrentTxRate;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_CurrentTxRate_t;</div><div class='add'>+</div><div class='add'>+/*-- Information Record: CurrentBeaconInterval --*/</div><div class='add'>+typedef struct hfa384x_CurrentBeaconInterval</div><div class='add'>+{</div><div class='add'>+	UINT16	CurrentBeaconInterval;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_CurrentBeaconInterval_t;</div><div class='add'>+</div><div class='add'>+/*-- Information Record: CurrentScaleThresholds --*/</div><div class='add'>+typedef struct hfa384x_CurrentScaleThresholds</div><div class='add'>+{</div><div class='add'>+	UINT16	EnergyDetectThreshold;</div><div class='add'>+	UINT16	CarrierDetectThreshold;</div><div class='add'>+	UINT16	DeferDetectThreshold;</div><div class='add'>+	UINT16	CellSearchThreshold; /* Stations only */</div><div class='add'>+	UINT16	DeadSpotThreshold; /* Stations only */</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_CurrentScaleThresholds_t;</div><div class='add'>+</div><div class='add'>+/*-- Information Record: ProtocolRspTime --*/</div><div class='add'>+typedef struct hfa384x_ProtocolRspTime</div><div class='add'>+{</div><div class='add'>+	UINT16	ProtocolRspTime;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_ProtocolRspTime_t;</div><div class='add'>+</div><div class='add'>+/*-- Information Record: ShortRetryLimit --*/</div><div class='add'>+typedef struct hfa384x_ShortRetryLimit</div><div class='add'>+{</div><div class='add'>+	UINT16	ShortRetryLimit;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_ShortRetryLimit_t;</div><div class='add'>+</div><div class='add'>+/*-- Information Record: LongRetryLimit --*/</div><div class='add'>+typedef struct hfa384x_LongRetryLimit</div><div class='add'>+{</div><div class='add'>+	UINT16	LongRetryLimit;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_LongRetryLimit_t;</div><div class='add'>+</div><div class='add'>+/*-- Information Record: MaxTransmitLifetime --*/</div><div class='add'>+typedef struct hfa384x_MaxTransmitLifetime</div><div class='add'>+{</div><div class='add'>+	UINT16	MaxTransmitLifetime;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_MaxTransmitLifetime_t;</div><div class='add'>+</div><div class='add'>+/*-- Information Record: MaxReceiveLifetime --*/</div><div class='add'>+typedef struct hfa384x_MaxReceiveLifetime</div><div class='add'>+{</div><div class='add'>+	UINT16	MaxReceiveLifetime;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_MaxReceiveLifetime_t;</div><div class='add'>+</div><div class='add'>+/*-- Information Record: CFPollable --*/</div><div class='add'>+typedef struct hfa384x_CFPollable</div><div class='add'>+{</div><div class='add'>+	UINT16	CFPollable;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_CFPollable_t;</div><div class='add'>+</div><div class='add'>+/*-- Information Record: AuthenticationAlgorithms --*/</div><div class='add'>+typedef struct hfa384x_AuthenticationAlgorithms</div><div class='add'>+{</div><div class='add'>+	UINT16	AuthenticationType;</div><div class='add'>+	UINT16	TypeEnabled;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_AuthenticationAlgorithms_t;</div><div class='add'>+</div><div class='add'>+/*-- Information Record: AuthenticationAlgorithms</div><div class='add'>+(data only --*/</div><div class='add'>+typedef struct hfa384x_AuthenticationAlgorithms_data</div><div class='add'>+{</div><div class='add'>+	UINT16	AuthenticationType;</div><div class='add'>+	UINT16	TypeEnabled;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_AuthenticationAlgorithms_data_t;</div><div class='add'>+</div><div class='add'>+/*-- Information Record: PrivacyOptionImplemented --*/</div><div class='add'>+typedef struct hfa384x_PrivacyOptionImplemented</div><div class='add'>+{</div><div class='add'>+	UINT16	PrivacyOptionImplemented;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_PrivacyOptionImplemented_t;</div><div class='add'>+</div><div class='add'>+/*-- Information Record: OwnMACAddress --*/</div><div class='add'>+typedef struct hfa384x_OwnMACAddress</div><div class='add'>+{</div><div class='add'>+	UINT8	OwnMACAddress[6];</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_OwnMACAddress_t;</div><div class='add'>+</div><div class='add'>+/*-- Information Record: PCFInfo --*/</div><div class='add'>+typedef struct hfa384x_PCFInfo</div><div class='add'>+{</div><div class='add'>+	UINT16	MediumOccupancyLimit;</div><div class='add'>+	UINT16	CFPPeriod;</div><div class='add'>+	UINT16	CFPMaxDuration;</div><div class='add'>+	UINT16	CFPFlags;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_PCFInfo_t;</div><div class='add'>+</div><div class='add'>+/*-- Information Record: PCFInfo (data portion only) --*/</div><div class='add'>+typedef struct hfa384x_PCFInfo_data</div><div class='add'>+{</div><div class='add'>+	UINT16	MediumOccupancyLimit;</div><div class='add'>+	UINT16	CFPPeriod;</div><div class='add'>+	UINT16	CFPMaxDuration;</div><div class='add'>+	UINT16	CFPFlags;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_PCFInfo_data_t;</div><div class='add'>+</div><div class='add'>+/*--------------------------------------------------------------------</div><div class='add'>+Information Record Structures: Modem Information Records</div><div class='add'>+--------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+/*-- Information Record: PHYType --*/</div><div class='add'>+typedef struct hfa384x_PHYType</div><div class='add'>+{</div><div class='add'>+	UINT16	PHYType;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_PHYType_t;</div><div class='add'>+</div><div class='add'>+/*-- Information Record: CurrentChannel --*/</div><div class='add'>+typedef struct hfa384x_CurrentChannel</div><div class='add'>+{</div><div class='add'>+	UINT16	CurrentChannel;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_CurrentChannel_t;</div><div class='add'>+</div><div class='add'>+/*-- Information Record: CurrentPowerState --*/</div><div class='add'>+typedef struct hfa384x_CurrentPowerState</div><div class='add'>+{</div><div class='add'>+	UINT16	CurrentPowerState;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_CurrentPowerState_t;</div><div class='add'>+</div><div class='add'>+/*-- Information Record: CCAMode --*/</div><div class='add'>+typedef struct hfa384x_CCAMode</div><div class='add'>+{</div><div class='add'>+	UINT16	CCAMode;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_CCAMode_t;</div><div class='add'>+</div><div class='add'>+/*-- Information Record: SupportedDataRates --*/</div><div class='add'>+typedef struct hfa384x_SupportedDataRates</div><div class='add'>+{</div><div class='add'>+	UINT8	SupportedDataRates[10];</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_SupportedDataRates_t;</div><div class='add'>+</div><div class='add'>+/*-- Information Record: LFOStatus --*/</div><div class='add'>+typedef struct hfa384x_LFOStatus</div><div class='add'>+{</div><div class='add'>+	UINT16  TestResults;</div><div class='add'>+	UINT16  LFOResult;</div><div class='add'>+	UINT16  VRHFOResult;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_LFOStatus_t;</div><div class='add'>+</div><div class='add'>+#define HFA384x_TESTRESULT_ALLPASSED    BIT0</div><div class='add'>+#define HFA384x_TESTRESULT_LFO_FAIL     BIT1</div><div class='add'>+#define HFA384x_TESTRESULT_VR_HF0_FAIL  BIT2</div><div class='add'>+#define HFA384x_HOST_FIRM_COORDINATE    BIT7</div><div class='add'>+#define HFA384x_TESTRESULT_COORDINATE   BIT15</div><div class='add'>+</div><div class='add'>+/*-- Information Record: LEDControl --*/</div><div class='add'>+typedef struct hfa384x_LEDControl</div><div class='add'>+{</div><div class='add'>+	UINT16  searching_on;</div><div class='add'>+	UINT16  searching_off;</div><div class='add'>+	UINT16  assoc_on;</div><div class='add'>+	UINT16  assoc_off;</div><div class='add'>+	UINT16  activity;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_LEDControl_t;</div><div class='add'>+</div><div class='add'>+/*--------------------------------------------------------------------</div><div class='add'>+                 FRAME DESCRIPTORS AND FRAME STRUCTURES</div><div class='add'>+</div><div class='add'>+FRAME DESCRIPTORS: Offsets</div><div class='add'>+</div><div class='add'>+----------------------------------------------------------------------</div><div class='add'>+Control Info (offset 44-51)</div><div class='add'>+--------------------------------------------------------------------*/</div><div class='add'>+#define		HFA384x_FD_STATUS_OFF			((UINT16)0x44)</div><div class='add'>+#define		HFA384x_FD_TIME_OFF			((UINT16)0x46)</div><div class='add'>+#define		HFA384x_FD_SWSUPPORT_OFF		((UINT16)0x4A)</div><div class='add'>+#define		HFA384x_FD_SILENCE_OFF			((UINT16)0x4A)</div><div class='add'>+#define		HFA384x_FD_SIGNAL_OFF			((UINT16)0x4B)</div><div class='add'>+#define		HFA384x_FD_RATE_OFF			((UINT16)0x4C)</div><div class='add'>+#define		HFA384x_FD_RXFLOW_OFF			((UINT16)0x4D)</div><div class='add'>+#define		HFA384x_FD_RESERVED_OFF			((UINT16)0x4E)</div><div class='add'>+#define		HFA384x_FD_TXCONTROL_OFF		((UINT16)0x50)</div><div class='add'>+/*--------------------------------------------------------------------</div><div class='add'>+802.11 Header (offset 52-6B)</div><div class='add'>+--------------------------------------------------------------------*/</div><div class='add'>+#define		HFA384x_FD_FRAMECONTROL_OFF		((UINT16)0x52)</div><div class='add'>+#define		HFA384x_FD_DURATIONID_OFF		((UINT16)0x54)</div><div class='add'>+#define		HFA384x_FD_ADDRESS1_OFF			((UINT16)0x56)</div><div class='add'>+#define		HFA384x_FD_ADDRESS2_OFF			((UINT16)0x5C)</div><div class='add'>+#define		HFA384x_FD_ADDRESS3_OFF			((UINT16)0x62)</div><div class='add'>+#define		HFA384x_FD_SEQCONTROL_OFF		((UINT16)0x68)</div><div class='add'>+#define		HFA384x_FD_ADDRESS4_OFF			((UINT16)0x6A)</div><div class='add'>+#define		HFA384x_FD_DATALEN_OFF			((UINT16)0x70)</div><div class='add'>+/*--------------------------------------------------------------------</div><div class='add'>+802.3 Header (offset 72-7F)</div><div class='add'>+--------------------------------------------------------------------*/</div><div class='add'>+#define		HFA384x_FD_DESTADDRESS_OFF		((UINT16)0x72)</div><div class='add'>+#define		HFA384x_FD_SRCADDRESS_OFF		((UINT16)0x78)</div><div class='add'>+#define		HFA384x_FD_DATALENGTH_OFF		((UINT16)0x7E)</div><div class='add'>+</div><div class='add'>+/*--------------------------------------------------------------------</div><div class='add'>+FRAME STRUCTURES: Communication Frames</div><div class='add'>+----------------------------------------------------------------------</div><div class='add'>+Communication Frames: Transmit Frames</div><div class='add'>+--------------------------------------------------------------------*/</div><div class='add'>+/*-- Communication Frame: Transmit Frame Structure --*/</div><div class='add'>+typedef struct hfa384x_tx_frame</div><div class='add'>+{</div><div class='add'>+	UINT16	status;</div><div class='add'>+	UINT16	reserved1;</div><div class='add'>+	UINT16	reserved2;</div><div class='add'>+	UINT32	sw_support;</div><div class='add'>+	UINT8	tx_retrycount;</div><div class='add'>+	UINT8   tx_rate;</div><div class='add'>+	UINT16	tx_control;</div><div class='add'>+</div><div class='add'>+	/*-- 802.11 Header Information --*/</div><div class='add'>+</div><div class='add'>+	UINT16	frame_control;</div><div class='add'>+	UINT16	duration_id;</div><div class='add'>+	UINT8	address1[6];</div><div class='add'>+	UINT8	address2[6];</div><div class='add'>+	UINT8	address3[6];</div><div class='add'>+	UINT16	sequence_control;</div><div class='add'>+	UINT8	address4[6];</div><div class='add'>+	UINT16	data_len; /* little endian format */</div><div class='add'>+</div><div class='add'>+	/*-- 802.3 Header Information --*/</div><div class='add'>+</div><div class='add'>+	UINT8	dest_addr[6];</div><div class='add'>+	UINT8	src_addr[6];</div><div class='add'>+	UINT16	data_length; /* big endian format */</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_tx_frame_t;</div><div class='add'>+/*--------------------------------------------------------------------</div><div class='add'>+Communication Frames: Field Masks for Transmit Frames</div><div class='add'>+--------------------------------------------------------------------*/</div><div class='add'>+/*-- Status Field --*/</div><div class='add'>+#define		HFA384x_TXSTATUS_ACKERR			((UINT16)BIT5)</div><div class='add'>+#define		HFA384x_TXSTATUS_FORMERR		((UINT16)BIT3)</div><div class='add'>+#define		HFA384x_TXSTATUS_DISCON			((UINT16)BIT2)</div><div class='add'>+#define		HFA384x_TXSTATUS_AGEDERR		((UINT16)BIT1)</div><div class='add'>+#define		HFA384x_TXSTATUS_RETRYERR		((UINT16)BIT0)</div><div class='add'>+/*-- Transmit Control Field --*/</div><div class='add'>+#define		HFA384x_TX_CFPOLL			((UINT16)BIT12)</div><div class='add'>+#define		HFA384x_TX_PRST				((UINT16)BIT11)</div><div class='add'>+#define		HFA384x_TX_MACPORT			((UINT16)(BIT10 | BIT9 | BIT8))</div><div class='add'>+#define		HFA384x_TX_NOENCRYPT			((UINT16)BIT7)</div><div class='add'>+#define		HFA384x_TX_RETRYSTRAT			((UINT16)(BIT6 | BIT5))</div><div class='add'>+#define		HFA384x_TX_STRUCTYPE			((UINT16)(BIT4 | BIT3))</div><div class='add'>+#define		HFA384x_TX_TXEX				((UINT16)BIT2)</div><div class='add'>+#define		HFA384x_TX_TXOK				((UINT16)BIT1)</div><div class='add'>+/*--------------------------------------------------------------------</div><div class='add'>+Communication Frames: Test/Get/Set Field Values for Transmit Frames</div><div class='add'>+--------------------------------------------------------------------*/</div><div class='add'>+/*-- Status Field --*/</div><div class='add'>+#define HFA384x_TXSTATUS_ISERROR(v)	\</div><div class='add'>+	(((UINT16)(v))&amp;\</div><div class='add'>+	(HFA384x_TXSTATUS_ACKERR|HFA384x_TXSTATUS_FORMERR|\</div><div class='add'>+	HFA384x_TXSTATUS_DISCON|HFA384x_TXSTATUS_AGEDERR|\</div><div class='add'>+	HFA384x_TXSTATUS_RETRYERR))</div><div class='add'>+</div><div class='add'>+#define	HFA384x_TXSTATUS_ISACKERR(v)	((UINT16)(((UINT16)(v)) &amp; HFA384x_TXSTATUS_ACKERR))</div><div class='add'>+#define	HFA384x_TXSTATUS_ISFORMERR(v)	((UINT16)(((UINT16)(v)) &amp; HFA384x_TXSTATUS_FORMERR))</div><div class='add'>+#define	HFA384x_TXSTATUS_ISDISCON(v)	((UINT16)(((UINT16)(v)) &amp; HFA384x_TXSTATUS_DISCON))</div><div class='add'>+#define	HFA384x_TXSTATUS_ISAGEDERR(v)	((UINT16)(((UINT16)(v)) &amp; HFA384x_TXSTATUS_AGEDERR))</div><div class='add'>+#define	HFA384x_TXSTATUS_ISRETRYERR(v)	((UINT16)(((UINT16)(v)) &amp; HFA384x_TXSTATUS_RETRYERR))</div><div class='add'>+</div><div class='add'>+#define	HFA384x_TX_GET(v,m,s)		((((UINT16)(v))&amp;((UINT16)(m)))&gt;&gt;((UINT16)(s)))</div><div class='add'>+#define	HFA384x_TX_SET(v,m,s)		((((UINT16)(v))&lt;&lt;((UINT16)(s)))&amp;((UINT16)(m)))</div><div class='add'>+</div><div class='add'>+#define	HFA384x_TX_CFPOLL_GET(v)	HFA384x_TX_GET(v, HFA384x_TX_CFPOLL,12)</div><div class='add'>+#define	HFA384x_TX_CFPOLL_SET(v)	HFA384x_TX_SET(v, HFA384x_TX_CFPOLL,12)</div><div class='add'>+#define	HFA384x_TX_PRST_GET(v)		HFA384x_TX_GET(v, HFA384x_TX_PRST,11)</div><div class='add'>+#define	HFA384x_TX_PRST_SET(v)		HFA384x_TX_SET(v, HFA384x_TX_PRST,11)</div><div class='add'>+#define	HFA384x_TX_MACPORT_GET(v)	HFA384x_TX_GET(v, HFA384x_TX_MACPORT, 8)</div><div class='add'>+#define	HFA384x_TX_MACPORT_SET(v)	HFA384x_TX_SET(v, HFA384x_TX_MACPORT, 8)</div><div class='add'>+#define	HFA384x_TX_NOENCRYPT_GET(v)	HFA384x_TX_GET(v, HFA384x_TX_NOENCRYPT, 7)</div><div class='add'>+#define	HFA384x_TX_NOENCRYPT_SET(v)	HFA384x_TX_SET(v, HFA384x_TX_NOENCRYPT, 7)</div><div class='add'>+#define	HFA384x_TX_RETRYSTRAT_GET(v)	HFA384x_TX_GET(v, HFA384x_TX_RETRYSTRAT, 5)</div><div class='add'>+#define	HFA384x_TX_RETRYSTRAT_SET(v)	HFA384x_TX_SET(v, HFA384x_TX_RETRYSTRAT, 5)</div><div class='add'>+#define	HFA384x_TX_STRUCTYPE_GET(v)	HFA384x_TX_GET(v, HFA384x_TX_STRUCTYPE, 3)</div><div class='add'>+#define	HFA384x_TX_STRUCTYPE_SET(v)	HFA384x_TX_SET(v, HFA384x_TX_STRUCTYPE, 3)</div><div class='add'>+#define	HFA384x_TX_TXEX_GET(v)		HFA384x_TX_GET(v, HFA384x_TX_TXEX, 2)</div><div class='add'>+#define	HFA384x_TX_TXEX_SET(v)		HFA384x_TX_SET(v, HFA384x_TX_TXEX, 2)</div><div class='add'>+#define	HFA384x_TX_TXOK_GET(v)		HFA384x_TX_GET(v, HFA384x_TX_TXOK, 1)</div><div class='add'>+#define	HFA384x_TX_TXOK_SET(v)		HFA384x_TX_SET(v, HFA384x_TX_TXOK, 1)</div><div class='add'>+/*--------------------------------------------------------------------</div><div class='add'>+Communication Frames: Receive Frames</div><div class='add'>+--------------------------------------------------------------------*/</div><div class='add'>+/*-- Communication Frame: Receive Frame Structure --*/</div><div class='add'>+typedef struct hfa384x_rx_frame</div><div class='add'>+{</div><div class='add'>+	/*-- MAC rx descriptor (hfa384x byte order) --*/</div><div class='add'>+	UINT16	status;</div><div class='add'>+	UINT32	time;</div><div class='add'>+	UINT8	silence;</div><div class='add'>+	UINT8	signal;</div><div class='add'>+	UINT8	rate;</div><div class='add'>+	UINT8	rx_flow;</div><div class='add'>+	UINT16	reserved1;</div><div class='add'>+	UINT16	reserved2;</div><div class='add'>+</div><div class='add'>+	/*-- 802.11 Header Information (802.11 byte order) --*/</div><div class='add'>+	UINT16	frame_control;</div><div class='add'>+	UINT16	duration_id;</div><div class='add'>+	UINT8	address1[6];</div><div class='add'>+	UINT8	address2[6];</div><div class='add'>+	UINT8	address3[6];</div><div class='add'>+	UINT16	sequence_control;</div><div class='add'>+	UINT8	address4[6];</div><div class='add'>+	UINT16	data_len; /* hfa384x (little endian) format */</div><div class='add'>+</div><div class='add'>+	/*-- 802.3 Header Information --*/</div><div class='add'>+	UINT8	dest_addr[6];</div><div class='add'>+	UINT8	src_addr[6];</div><div class='add'>+	UINT16	data_length; /* IEEE? (big endian) format */</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_rx_frame_t;</div><div class='add'>+/*--------------------------------------------------------------------</div><div class='add'>+Communication Frames: Field Masks for Receive Frames</div><div class='add'>+--------------------------------------------------------------------*/</div><div class='add'>+/*-- Offsets --------*/</div><div class='add'>+#define		HFA384x_RX_DATA_LEN_OFF			((UINT16)44)</div><div class='add'>+#define		HFA384x_RX_80211HDR_OFF			((UINT16)14)</div><div class='add'>+#define		HFA384x_RX_DATA_OFF			((UINT16)60)</div><div class='add'>+</div><div class='add'>+/*-- Status Fields --*/</div><div class='add'>+#define		HFA384x_RXSTATUS_MSGTYPE		((UINT16)(BIT15 | BIT14 | BIT13))</div><div class='add'>+#define		HFA384x_RXSTATUS_MACPORT		((UINT16)(BIT10 | BIT9 | BIT8))</div><div class='add'>+#define		HFA384x_RXSTATUS_UNDECR			((UINT16)BIT1)</div><div class='add'>+#define		HFA384x_RXSTATUS_FCSERR			((UINT16)BIT0)</div><div class='add'>+/*--------------------------------------------------------------------</div><div class='add'>+Communication Frames: Test/Get/Set Field Values for Receive Frames</div><div class='add'>+--------------------------------------------------------------------*/</div><div class='add'>+#define		HFA384x_RXSTATUS_MSGTYPE_GET(value)	((UINT16)((((UINT16)(value)) &amp; HFA384x_RXSTATUS_MSGTYPE) &gt;&gt; 13))</div><div class='add'>+#define		HFA384x_RXSTATUS_MSGTYPE_SET(value)	((UINT16)(((UINT16)(value)) &lt;&lt; 13))</div><div class='add'>+#define		HFA384x_RXSTATUS_MACPORT_GET(value)	((UINT16)((((UINT16)(value)) &amp; HFA384x_RXSTATUS_MACPORT) &gt;&gt; 8))</div><div class='add'>+#define		HFA384x_RXSTATUS_MACPORT_SET(value)	((UINT16)(((UINT16)(value)) &lt;&lt; 8))</div><div class='add'>+#define		HFA384x_RXSTATUS_ISUNDECR(value)	((UINT16)(((UINT16)(value)) &amp; HFA384x_RXSTATUS_UNDECR))</div><div class='add'>+#define		HFA384x_RXSTATUS_ISFCSERR(value)	((UINT16)(((UINT16)(value)) &amp; HFA384x_RXSTATUS_FCSERR))</div><div class='add'>+/*--------------------------------------------------------------------</div><div class='add'>+ FRAME STRUCTURES: Information Types and Information Frame Structures</div><div class='add'>+----------------------------------------------------------------------</div><div class='add'>+Information Types</div><div class='add'>+--------------------------------------------------------------------*/</div><div class='add'>+#define		HFA384x_IT_HANDOVERADDR			((UINT16)0xF000UL)</div><div class='add'>+#define		HFA384x_IT_HANDOVERDEAUTHADDRESS	((UINT16)0xF001UL)//AP 1.3.7</div><div class='add'>+#define		HFA384x_IT_COMMTALLIES			((UINT16)0xF100UL)</div><div class='add'>+#define		HFA384x_IT_SCANRESULTS			((UINT16)0xF101UL)</div><div class='add'>+#define		HFA384x_IT_CHINFORESULTS		((UINT16)0xF102UL)</div><div class='add'>+#define		HFA384x_IT_HOSTSCANRESULTS		((UINT16)0xF103UL)</div><div class='add'>+#define		HFA384x_IT_LINKSTATUS			((UINT16)0xF200UL)</div><div class='add'>+#define		HFA384x_IT_ASSOCSTATUS			((UINT16)0xF201UL)</div><div class='add'>+#define		HFA384x_IT_AUTHREQ			((UINT16)0xF202UL)</div><div class='add'>+#define		HFA384x_IT_PSUSERCNT			((UINT16)0xF203UL)</div><div class='add'>+#define		HFA384x_IT_KEYIDCHANGED			((UINT16)0xF204UL)</div><div class='add'>+#define		HFA384x_IT_ASSOCREQ    			((UINT16)0xF205UL)</div><div class='add'>+#define		HFA384x_IT_MICFAILURE  			((UINT16)0xF206UL)</div><div class='add'>+</div><div class='add'>+/*--------------------------------------------------------------------</div><div class='add'>+Information Frames Structures</div><div class='add'>+----------------------------------------------------------------------</div><div class='add'>+Information Frames: Notification Frame Structures</div><div class='add'>+--------------------------------------------------------------------*/</div><div class='add'>+/*--  Notification Frame,MAC Mgmt: Handover Address --*/</div><div class='add'>+typedef struct hfa384x_HandoverAddr</div><div class='add'>+{</div><div class='add'>+	UINT16	framelen;</div><div class='add'>+	UINT16	infotype;</div><div class='add'>+	UINT8	handover_addr[WLAN_BSSID_LEN];</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_HandoverAddr_t;</div><div class='add'>+</div><div class='add'>+/*--  Inquiry Frame, Diagnose: Communication Tallies --*/</div><div class='add'>+typedef struct hfa384x_CommTallies16</div><div class='add'>+{</div><div class='add'>+	UINT16	txunicastframes;</div><div class='add'>+	UINT16	txmulticastframes;</div><div class='add'>+	UINT16	txfragments;</div><div class='add'>+	UINT16	txunicastoctets;</div><div class='add'>+	UINT16	txmulticastoctets;</div><div class='add'>+	UINT16	txdeferredtrans;</div><div class='add'>+	UINT16	txsingleretryframes;</div><div class='add'>+	UINT16	txmultipleretryframes;</div><div class='add'>+	UINT16	txretrylimitexceeded;</div><div class='add'>+	UINT16	txdiscards;</div><div class='add'>+	UINT16	rxunicastframes;</div><div class='add'>+	UINT16	rxmulticastframes;</div><div class='add'>+	UINT16	rxfragments;</div><div class='add'>+	UINT16	rxunicastoctets;</div><div class='add'>+	UINT16	rxmulticastoctets;</div><div class='add'>+	UINT16	rxfcserrors;</div><div class='add'>+	UINT16	rxdiscardsnobuffer;</div><div class='add'>+	UINT16	txdiscardswrongsa;</div><div class='add'>+	UINT16	rxdiscardswepundecr;</div><div class='add'>+	UINT16	rxmsginmsgfrag;</div><div class='add'>+	UINT16	rxmsginbadmsgfrag;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_CommTallies16_t;</div><div class='add'>+</div><div class='add'>+typedef struct hfa384x_CommTallies32</div><div class='add'>+{</div><div class='add'>+	UINT32	txunicastframes;</div><div class='add'>+	UINT32	txmulticastframes;</div><div class='add'>+	UINT32	txfragments;</div><div class='add'>+	UINT32	txunicastoctets;</div><div class='add'>+	UINT32	txmulticastoctets;</div><div class='add'>+	UINT32	txdeferredtrans;</div><div class='add'>+	UINT32	txsingleretryframes;</div><div class='add'>+	UINT32	txmultipleretryframes;</div><div class='add'>+	UINT32	txretrylimitexceeded;</div><div class='add'>+	UINT32	txdiscards;</div><div class='add'>+	UINT32	rxunicastframes;</div><div class='add'>+	UINT32	rxmulticastframes;</div><div class='add'>+	UINT32	rxfragments;</div><div class='add'>+	UINT32	rxunicastoctets;</div><div class='add'>+	UINT32	rxmulticastoctets;</div><div class='add'>+	UINT32	rxfcserrors;</div><div class='add'>+	UINT32	rxdiscardsnobuffer;</div><div class='add'>+	UINT32	txdiscardswrongsa;</div><div class='add'>+	UINT32	rxdiscardswepundecr;</div><div class='add'>+	UINT32	rxmsginmsgfrag;</div><div class='add'>+	UINT32	rxmsginbadmsgfrag;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_CommTallies32_t;</div><div class='add'>+</div><div class='add'>+/*--  Inquiry Frame, Diagnose: Scan Results &amp; Subfields--*/</div><div class='add'>+typedef struct hfa384x_ScanResultSub</div><div class='add'>+{</div><div class='add'>+	UINT16	chid;</div><div class='add'>+	UINT16	anl;</div><div class='add'>+	UINT16	sl;</div><div class='add'>+	UINT8	bssid[WLAN_BSSID_LEN];</div><div class='add'>+	UINT16	bcnint;</div><div class='add'>+	UINT16	capinfo;</div><div class='add'>+	hfa384x_bytestr32_t	ssid;</div><div class='add'>+	UINT8	supprates[10]; /* 802.11 info element */</div><div class='add'>+	UINT16	proberesp_rate;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_ScanResultSub_t;</div><div class='add'>+</div><div class='add'>+typedef struct hfa384x_ScanResult</div><div class='add'>+{</div><div class='add'>+	UINT16	rsvd;</div><div class='add'>+	UINT16	scanreason;</div><div class='add'>+	hfa384x_ScanResultSub_t</div><div class='add'>+		result[HFA384x_SCANRESULT_MAX];</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_ScanResult_t;</div><div class='add'>+</div><div class='add'>+/*--  Inquiry Frame, Diagnose: ChInfo Results &amp; Subfields--*/</div><div class='add'>+typedef struct hfa384x_ChInfoResultSub</div><div class='add'>+{</div><div class='add'>+	UINT16	chid;</div><div class='add'>+	UINT16	anl;</div><div class='add'>+	UINT16	pnl;</div><div class='add'>+	UINT16	active;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_ChInfoResultSub_t;</div><div class='add'>+</div><div class='add'>+#define HFA384x_CHINFORESULT_BSSACTIVE	BIT0</div><div class='add'>+#define HFA384x_CHINFORESULT_PCFACTIVE	BIT1</div><div class='add'>+</div><div class='add'>+typedef struct hfa384x_ChInfoResult</div><div class='add'>+{</div><div class='add'>+	UINT16	scanchannels;</div><div class='add'>+	hfa384x_ChInfoResultSub_t</div><div class='add'>+		result[HFA384x_CHINFORESULT_MAX];</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_ChInfoResult_t;</div><div class='add'>+</div><div class='add'>+/*--  Inquiry Frame, Diagnose: Host Scan Results &amp; Subfields--*/</div><div class='add'>+typedef struct hfa384x_HScanResultSub</div><div class='add'>+{</div><div class='add'>+	UINT16	chid;</div><div class='add'>+	UINT16	anl;</div><div class='add'>+	UINT16	sl;</div><div class='add'>+	UINT8	bssid[WLAN_BSSID_LEN];</div><div class='add'>+	UINT16	bcnint;</div><div class='add'>+	UINT16	capinfo;</div><div class='add'>+	hfa384x_bytestr32_t	ssid;</div><div class='add'>+	UINT8	supprates[10]; /* 802.11 info element */</div><div class='add'>+	UINT16	proberesp_rate;</div><div class='add'>+	UINT16	atim;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_HScanResultSub_t;</div><div class='add'>+</div><div class='add'>+typedef struct hfa384x_HScanResult</div><div class='add'>+{</div><div class='add'>+	UINT16	nresult;</div><div class='add'>+	UINT16	rsvd;</div><div class='add'>+	hfa384x_HScanResultSub_t</div><div class='add'>+		result[HFA384x_HSCANRESULT_MAX];</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_HScanResult_t;</div><div class='add'>+</div><div class='add'>+/*--  Unsolicited Frame, MAC Mgmt: LinkStatus --*/</div><div class='add'>+</div><div class='add'>+#define HFA384x_LINK_NOTCONNECTED	((UINT16)0)</div><div class='add'>+#define HFA384x_LINK_CONNECTED		((UINT16)1)</div><div class='add'>+#define HFA384x_LINK_DISCONNECTED	((UINT16)2)</div><div class='add'>+#define HFA384x_LINK_AP_CHANGE		((UINT16)3)</div><div class='add'>+#define HFA384x_LINK_AP_OUTOFRANGE	((UINT16)4)</div><div class='add'>+#define HFA384x_LINK_AP_INRANGE		((UINT16)5)</div><div class='add'>+#define HFA384x_LINK_ASSOCFAIL		((UINT16)6)</div><div class='add'>+</div><div class='add'>+typedef struct hfa384x_LinkStatus</div><div class='add'>+{</div><div class='add'>+	UINT16	linkstatus;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_LinkStatus_t;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*--  Unsolicited Frame, MAC Mgmt: AssociationStatus (--*/</div><div class='add'>+</div><div class='add'>+#define HFA384x_ASSOCSTATUS_STAASSOC	((UINT16)1)</div><div class='add'>+#define HFA384x_ASSOCSTATUS_REASSOC	((UINT16)2)</div><div class='add'>+#define HFA384x_ASSOCSTATUS_DISASSOC	((UINT16)3)</div><div class='add'>+#define HFA384x_ASSOCSTATUS_ASSOCFAIL	((UINT16)4)</div><div class='add'>+#define HFA384x_ASSOCSTATUS_AUTHFAIL	((UINT16)5)</div><div class='add'>+</div><div class='add'>+typedef struct hfa384x_AssocStatus</div><div class='add'>+{</div><div class='add'>+	UINT16	assocstatus;</div><div class='add'>+	UINT8	sta_addr[WLAN_ADDR_LEN];</div><div class='add'>+	/* old_ap_addr is only valid if assocstatus == 2 */</div><div class='add'>+	UINT8	old_ap_addr[WLAN_ADDR_LEN];</div><div class='add'>+	UINT16	reason;</div><div class='add'>+	UINT16	reserved;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_AssocStatus_t;</div><div class='add'>+</div><div class='add'>+/*--  Unsolicited Frame, MAC Mgmt: AuthRequest (AP Only) --*/</div><div class='add'>+</div><div class='add'>+typedef struct hfa384x_AuthRequest</div><div class='add'>+{</div><div class='add'>+	UINT8	sta_addr[WLAN_ADDR_LEN];</div><div class='add'>+	UINT16	algorithm;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_AuthReq_t;</div><div class='add'>+</div><div class='add'>+/*--  Unsolicited Frame, MAC Mgmt: AssocRequest (AP Only) --*/</div><div class='add'>+</div><div class='add'>+typedef struct hfa384x_AssocRequest</div><div class='add'>+{</div><div class='add'>+	UINT8	sta_addr[WLAN_ADDR_LEN];</div><div class='add'>+	UINT16	type;</div><div class='add'>+	UINT8   wpa_data[80];</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_AssocReq_t;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define HFA384x_ASSOCREQ_TYPE_ASSOC     0</div><div class='add'>+#define HFA384x_ASSOCREQ_TYPE_REASSOC   1</div><div class='add'>+</div><div class='add'>+/*--  Unsolicited Frame, MAC Mgmt: MIC Failure  (AP Only) --*/</div><div class='add'>+</div><div class='add'>+typedef struct hfa384x_MicFailure</div><div class='add'>+{</div><div class='add'>+	UINT8	sender[WLAN_ADDR_LEN];</div><div class='add'>+	UINT8	dest[WLAN_ADDR_LEN];</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_MicFailure_t;</div><div class='add'>+</div><div class='add'>+/*--  Unsolicited Frame, MAC Mgmt: PSUserCount (AP Only) --*/</div><div class='add'>+</div><div class='add'>+typedef struct hfa384x_PSUserCount</div><div class='add'>+{</div><div class='add'>+	UINT16	usercnt;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_PSUserCount_t;</div><div class='add'>+</div><div class='add'>+typedef struct hfa384x_KeyIDChanged</div><div class='add'>+{</div><div class='add'>+	UINT8	sta_addr[WLAN_ADDR_LEN];</div><div class='add'>+	UINT16	keyid;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_KeyIDChanged_t;</div><div class='add'>+</div><div class='add'>+/*--  Collection of all Inf frames ---------------*/</div><div class='add'>+typedef union hfa384x_infodata {</div><div class='add'>+	hfa384x_CommTallies16_t	commtallies16;</div><div class='add'>+	hfa384x_CommTallies32_t	commtallies32;</div><div class='add'>+	hfa384x_ScanResult_t	scanresult;</div><div class='add'>+	hfa384x_ChInfoResult_t	chinforesult;</div><div class='add'>+	hfa384x_HScanResult_t	hscanresult;</div><div class='add'>+	hfa384x_LinkStatus_t	linkstatus;</div><div class='add'>+	hfa384x_AssocStatus_t	assocstatus;</div><div class='add'>+	hfa384x_AuthReq_t	authreq;</div><div class='add'>+	hfa384x_PSUserCount_t	psusercnt;</div><div class='add'>+	hfa384x_KeyIDChanged_t  keyidchanged;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_infodata_t;</div><div class='add'>+</div><div class='add'>+typedef struct hfa384x_InfFrame</div><div class='add'>+{</div><div class='add'>+	UINT16			framelen;</div><div class='add'>+	UINT16			infotype;</div><div class='add'>+	hfa384x_infodata_t	info;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_InfFrame_t;</div><div class='add'>+</div><div class='add'>+#if (WLAN_HOSTIF == WLAN_USB)</div><div class='add'>+/*--------------------------------------------------------------------</div><div class='add'>+USB Packet structures and constants.</div><div class='add'>+--------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+/* Should be sent to the ctrlout endpoint */</div><div class='add'>+#define HFA384x_USB_ENBULKIN	6</div><div class='add'>+</div><div class='add'>+/* Should be sent to the bulkout endpoint */</div><div class='add'>+#define HFA384x_USB_TXFRM	0</div><div class='add'>+#define HFA384x_USB_CMDREQ	1</div><div class='add'>+#define HFA384x_USB_WRIDREQ	2</div><div class='add'>+#define HFA384x_USB_RRIDREQ	3</div><div class='add'>+#define HFA384x_USB_WMEMREQ	4</div><div class='add'>+#define HFA384x_USB_RMEMREQ	5</div><div class='add'>+</div><div class='add'>+/* Received from the bulkin endpoint */</div><div class='add'>+#define HFA384x_USB_ISFRM(a)	(!((a) &amp; 0x8000))</div><div class='add'>+#define HFA384x_USB_ISTXFRM(a)	(((a) &amp; 0x9000) == 0x1000)</div><div class='add'>+#define HFA384x_USB_ISRXFRM(a)	(!((a) &amp; 0x9000))</div><div class='add'>+#define HFA384x_USB_INFOFRM	0x8000</div><div class='add'>+#define HFA384x_USB_CMDRESP	0x8001</div><div class='add'>+#define HFA384x_USB_WRIDRESP	0x8002</div><div class='add'>+#define HFA384x_USB_RRIDRESP	0x8003</div><div class='add'>+#define HFA384x_USB_WMEMRESP	0x8004</div><div class='add'>+#define HFA384x_USB_RMEMRESP	0x8005</div><div class='add'>+#define HFA384x_USB_BUFAVAIL	0x8006</div><div class='add'>+#define HFA384x_USB_ERROR	0x8007</div><div class='add'>+</div><div class='add'>+/*------------------------------------*/</div><div class='add'>+/* Request (bulk OUT) packet contents */</div><div class='add'>+</div><div class='add'>+typedef struct hfa384x_usb_txfrm {</div><div class='add'>+	hfa384x_tx_frame_t	desc;</div><div class='add'>+	UINT8			data[WLAN_DATA_MAXLEN];</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_usb_txfrm_t;</div><div class='add'>+</div><div class='add'>+typedef struct hfa384x_usb_cmdreq {</div><div class='add'>+	UINT16		type;</div><div class='add'>+	UINT16		cmd;</div><div class='add'>+	UINT16		parm0;</div><div class='add'>+	UINT16		parm1;</div><div class='add'>+	UINT16		parm2;</div><div class='add'>+	UINT8		pad[54];</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_usb_cmdreq_t;</div><div class='add'>+</div><div class='add'>+typedef struct hfa384x_usb_wridreq {</div><div class='add'>+	UINT16		type;</div><div class='add'>+	UINT16		frmlen;</div><div class='add'>+	UINT16		rid;</div><div class='add'>+	UINT8		data[HFA384x_RIDDATA_MAXLEN];</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_usb_wridreq_t;</div><div class='add'>+</div><div class='add'>+typedef struct hfa384x_usb_rridreq {</div><div class='add'>+	UINT16		type;</div><div class='add'>+	UINT16		frmlen;</div><div class='add'>+	UINT16		rid;</div><div class='add'>+	UINT8		pad[58];</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_usb_rridreq_t;</div><div class='add'>+</div><div class='add'>+typedef struct hfa384x_usb_wmemreq {</div><div class='add'>+	UINT16		type;</div><div class='add'>+	UINT16		frmlen;</div><div class='add'>+	UINT16		offset;</div><div class='add'>+	UINT16		page;</div><div class='add'>+	UINT8		data[HFA384x_USB_RWMEM_MAXLEN];</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_usb_wmemreq_t;</div><div class='add'>+</div><div class='add'>+typedef struct hfa384x_usb_rmemreq {</div><div class='add'>+	UINT16		type;</div><div class='add'>+	UINT16		frmlen;</div><div class='add'>+	UINT16		offset;</div><div class='add'>+	UINT16		page;</div><div class='add'>+	UINT8		pad[56];</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_usb_rmemreq_t;</div><div class='add'>+</div><div class='add'>+/*------------------------------------*/</div><div class='add'>+/* Response (bulk IN) packet contents */</div><div class='add'>+</div><div class='add'>+typedef struct hfa384x_usb_rxfrm {</div><div class='add'>+	hfa384x_rx_frame_t	desc;</div><div class='add'>+	UINT8			data[WLAN_DATA_MAXLEN];</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_usb_rxfrm_t;</div><div class='add'>+</div><div class='add'>+typedef struct hfa384x_usb_infofrm {</div><div class='add'>+	UINT16			type;</div><div class='add'>+	hfa384x_InfFrame_t	info;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_usb_infofrm_t;</div><div class='add'>+</div><div class='add'>+typedef struct hfa384x_usb_statusresp {</div><div class='add'>+	UINT16		type;</div><div class='add'>+	UINT16		status;</div><div class='add'>+	UINT16		resp0;</div><div class='add'>+	UINT16		resp1;</div><div class='add'>+	UINT16		resp2;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_usb_cmdresp_t;</div><div class='add'>+</div><div class='add'>+typedef hfa384x_usb_cmdresp_t hfa384x_usb_wridresp_t;</div><div class='add'>+</div><div class='add'>+typedef struct hfa384x_usb_rridresp {</div><div class='add'>+	UINT16		type;</div><div class='add'>+	UINT16		frmlen;</div><div class='add'>+	UINT16		rid;</div><div class='add'>+	UINT8		data[HFA384x_RIDDATA_MAXLEN];</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_usb_rridresp_t;</div><div class='add'>+</div><div class='add'>+typedef hfa384x_usb_cmdresp_t hfa384x_usb_wmemresp_t;</div><div class='add'>+</div><div class='add'>+typedef struct hfa384x_usb_rmemresp {</div><div class='add'>+	UINT16		type;</div><div class='add'>+	UINT16		frmlen;</div><div class='add'>+	UINT8		data[HFA384x_USB_RWMEM_MAXLEN];</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_usb_rmemresp_t;</div><div class='add'>+</div><div class='add'>+typedef struct hfa384x_usb_bufavail {</div><div class='add'>+	UINT16		type;</div><div class='add'>+	UINT16		frmlen;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_usb_bufavail_t;</div><div class='add'>+</div><div class='add'>+typedef struct hfa384x_usb_error {</div><div class='add'>+	UINT16		type;</div><div class='add'>+	UINT16		errortype;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_usb_error_t;</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------*/</div><div class='add'>+/* Unions for packaging all the known packet types together */</div><div class='add'>+</div><div class='add'>+typedef union hfa384x_usbout {</div><div class='add'>+	UINT16			type;</div><div class='add'>+	hfa384x_usb_txfrm_t	txfrm;</div><div class='add'>+	hfa384x_usb_cmdreq_t	cmdreq;</div><div class='add'>+	hfa384x_usb_wridreq_t	wridreq;</div><div class='add'>+	hfa384x_usb_rridreq_t	rridreq;</div><div class='add'>+	hfa384x_usb_wmemreq_t	wmemreq;</div><div class='add'>+	hfa384x_usb_rmemreq_t	rmemreq;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_usbout_t;</div><div class='add'>+</div><div class='add'>+typedef union hfa384x_usbin {</div><div class='add'>+	UINT16			type;</div><div class='add'>+	hfa384x_usb_rxfrm_t	rxfrm;</div><div class='add'>+	hfa384x_usb_txfrm_t	txfrm;</div><div class='add'>+	hfa384x_usb_infofrm_t	infofrm;</div><div class='add'>+	hfa384x_usb_cmdresp_t	cmdresp;</div><div class='add'>+	hfa384x_usb_wridresp_t	wridresp;</div><div class='add'>+	hfa384x_usb_rridresp_t	rridresp;</div><div class='add'>+	hfa384x_usb_wmemresp_t	wmemresp;</div><div class='add'>+	hfa384x_usb_rmemresp_t	rmemresp;</div><div class='add'>+	hfa384x_usb_bufavail_t	bufavail;</div><div class='add'>+	hfa384x_usb_error_t	usberror;</div><div class='add'>+	UINT8			boguspad[3000];</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_usbin_t;</div><div class='add'>+</div><div class='add'>+#endif /* WLAN_USB */</div><div class='add'>+</div><div class='add'>+/*--------------------------------------------------------------------</div><div class='add'>+PD record structures.</div><div class='add'>+--------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+typedef struct hfa384x_pdr_pcb_partnum</div><div class='add'>+{</div><div class='add'>+	UINT8	num[8];</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_pdr_pcb_partnum_t;</div><div class='add'>+</div><div class='add'>+typedef struct hfa384x_pdr_pcb_tracenum</div><div class='add'>+{</div><div class='add'>+	UINT8	num[8];</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_pdr_pcb_tracenum_t;</div><div class='add'>+</div><div class='add'>+typedef struct hfa384x_pdr_nic_serial</div><div class='add'>+{</div><div class='add'>+	UINT8	num[12];</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_pdr_nic_serial_t;</div><div class='add'>+</div><div class='add'>+typedef struct hfa384x_pdr_mkk_measurements</div><div class='add'>+{</div><div class='add'>+	double	carrier_freq;</div><div class='add'>+	double	occupied_band;</div><div class='add'>+	double	power_density;</div><div class='add'>+	double	tx_spur_f1;</div><div class='add'>+	double	tx_spur_f2;</div><div class='add'>+	double	tx_spur_f3;</div><div class='add'>+	double	tx_spur_f4;</div><div class='add'>+	double	tx_spur_l1;</div><div class='add'>+	double	tx_spur_l2;</div><div class='add'>+	double	tx_spur_l3;</div><div class='add'>+	double	tx_spur_l4;</div><div class='add'>+	double	rx_spur_f1;</div><div class='add'>+	double	rx_spur_f2;</div><div class='add'>+	double	rx_spur_l1;</div><div class='add'>+	double	rx_spur_l2;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_pdr_mkk_measurements_t;</div><div class='add'>+</div><div class='add'>+typedef struct hfa384x_pdr_nic_ramsize</div><div class='add'>+{</div><div class='add'>+	UINT8	size[12]; /* units of KB */</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_pdr_nic_ramsize_t;</div><div class='add'>+</div><div class='add'>+typedef struct hfa384x_pdr_mfisuprange</div><div class='add'>+{</div><div class='add'>+	UINT16	id;</div><div class='add'>+	UINT16	variant;</div><div class='add'>+	UINT16	bottom;</div><div class='add'>+	UINT16	top;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_pdr_mfisuprange_t;</div><div class='add'>+</div><div class='add'>+typedef struct hfa384x_pdr_cfisuprange</div><div class='add'>+{</div><div class='add'>+	UINT16	id;</div><div class='add'>+	UINT16	variant;</div><div class='add'>+	UINT16	bottom;</div><div class='add'>+	UINT16	top;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_pdr_cfisuprange_t;</div><div class='add'>+</div><div class='add'>+typedef struct hfa384x_pdr_nicid</div><div class='add'>+{</div><div class='add'>+	UINT16	id;</div><div class='add'>+	UINT16	variant;</div><div class='add'>+	UINT16	major;</div><div class='add'>+	UINT16	minor;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_pdr_nicid_t;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+typedef struct hfa384x_pdr_refdac_measurements</div><div class='add'>+{</div><div class='add'>+	UINT16	value[0];</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_pdr_refdac_measurements_t;</div><div class='add'>+</div><div class='add'>+typedef struct hfa384x_pdr_vgdac_measurements</div><div class='add'>+{</div><div class='add'>+	UINT16	value[0];</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_pdr_vgdac_measurements_t;</div><div class='add'>+</div><div class='add'>+typedef struct hfa384x_pdr_level_comp_measurements</div><div class='add'>+{</div><div class='add'>+	UINT16	value[0];</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_pdr_level_compc_measurements_t;</div><div class='add'>+</div><div class='add'>+typedef struct hfa384x_pdr_mac_address</div><div class='add'>+{</div><div class='add'>+	UINT8	addr[6];</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_pdr_mac_address_t;</div><div class='add'>+</div><div class='add'>+typedef struct hfa384x_pdr_mkk_callname</div><div class='add'>+{</div><div class='add'>+	UINT8	callname[8];</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_pdr_mkk_callname_t;</div><div class='add'>+</div><div class='add'>+typedef struct hfa384x_pdr_regdomain</div><div class='add'>+{</div><div class='add'>+	UINT16	numdomains;</div><div class='add'>+	UINT16	domain[5];</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_pdr_regdomain_t;</div><div class='add'>+</div><div class='add'>+typedef struct hfa384x_pdr_allowed_channel</div><div class='add'>+{</div><div class='add'>+	UINT16	ch_bitmap;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_pdr_allowed_channel_t;</div><div class='add'>+</div><div class='add'>+typedef struct hfa384x_pdr_default_channel</div><div class='add'>+{</div><div class='add'>+	UINT16	channel;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_pdr_default_channel_t;</div><div class='add'>+</div><div class='add'>+typedef struct hfa384x_pdr_privacy_option</div><div class='add'>+{</div><div class='add'>+	UINT16	available;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_pdr_privacy_option_t;</div><div class='add'>+</div><div class='add'>+typedef struct hfa384x_pdr_temptype</div><div class='add'>+{</div><div class='add'>+	UINT16	type;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_pdr_temptype_t;</div><div class='add'>+</div><div class='add'>+typedef struct hfa384x_pdr_refdac_setup</div><div class='add'>+{</div><div class='add'>+	UINT16	ch_value[14];</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_pdr_refdac_setup_t;</div><div class='add'>+</div><div class='add'>+typedef struct hfa384x_pdr_vgdac_setup</div><div class='add'>+{</div><div class='add'>+	UINT16	ch_value[14];</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_pdr_vgdac_setup_t;</div><div class='add'>+</div><div class='add'>+typedef struct hfa384x_pdr_level_comp_setup</div><div class='add'>+{</div><div class='add'>+	UINT16	ch_value[14];</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_pdr_level_comp_setup_t;</div><div class='add'>+</div><div class='add'>+typedef struct hfa384x_pdr_trimdac_setup</div><div class='add'>+{</div><div class='add'>+	UINT16	trimidac;</div><div class='add'>+	UINT16	trimqdac;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_pdr_trimdac_setup_t;</div><div class='add'>+</div><div class='add'>+typedef struct hfa384x_pdr_ifr_setting</div><div class='add'>+{</div><div class='add'>+	UINT16	value[3];</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_pdr_ifr_setting_t;</div><div class='add'>+</div><div class='add'>+typedef struct hfa384x_pdr_rfr_setting</div><div class='add'>+{</div><div class='add'>+	UINT16	value[3];</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_pdr_rfr_setting_t;</div><div class='add'>+</div><div class='add'>+typedef struct hfa384x_pdr_hfa3861_baseline</div><div class='add'>+{</div><div class='add'>+	UINT16	value[50];</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_pdr_hfa3861_baseline_t;</div><div class='add'>+</div><div class='add'>+typedef struct hfa384x_pdr_hfa3861_shadow</div><div class='add'>+{</div><div class='add'>+	UINT32	value[32];</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_pdr_hfa3861_shadow_t;</div><div class='add'>+</div><div class='add'>+typedef struct hfa384x_pdr_hfa3861_ifrf</div><div class='add'>+{</div><div class='add'>+	UINT32	value[20];</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_pdr_hfa3861_ifrf_t;</div><div class='add'>+</div><div class='add'>+typedef struct hfa384x_pdr_hfa3861_chcalsp</div><div class='add'>+{</div><div class='add'>+	UINT16	value[14];</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_pdr_hfa3861_chcalsp_t;</div><div class='add'>+</div><div class='add'>+typedef struct hfa384x_pdr_hfa3861_chcali</div><div class='add'>+{</div><div class='add'>+	UINT16	value[17];</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_pdr_hfa3861_chcali_t;</div><div class='add'>+</div><div class='add'>+typedef struct hfa384x_pdr_hfa3861_nic_config</div><div class='add'>+{</div><div class='add'>+	UINT16	config_bitmap;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_pdr_nic_config_t;</div><div class='add'>+</div><div class='add'>+typedef struct hfa384x_pdr_hfo_delay</div><div class='add'>+{</div><div class='add'>+	UINT8   hfo_delay;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_hfo_delay_t;</div><div class='add'>+</div><div class='add'>+typedef struct hfa384x_pdr_hfa3861_manf_testsp</div><div class='add'>+{</div><div class='add'>+	UINT16	value[30];</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_pdr_hfa3861_manf_testsp_t;</div><div class='add'>+</div><div class='add'>+typedef struct hfa384x_pdr_hfa3861_manf_testi</div><div class='add'>+{</div><div class='add'>+	UINT16	value[30];</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_pdr_hfa3861_manf_testi_t;</div><div class='add'>+</div><div class='add'>+typedef struct hfa384x_end_of_pda</div><div class='add'>+{</div><div class='add'>+	UINT16	crc;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_pdr_end_of_pda_t;</div><div class='add'>+</div><div class='add'>+typedef struct hfa384x_pdrec</div><div class='add'>+{</div><div class='add'>+	UINT16	len; /* in words */</div><div class='add'>+	UINT16	code;</div><div class='add'>+	union pdr {</div><div class='add'>+	hfa384x_pdr_pcb_partnum_t	pcb_partnum;</div><div class='add'>+	hfa384x_pdr_pcb_tracenum_t	pcb_tracenum;</div><div class='add'>+	hfa384x_pdr_nic_serial_t	nic_serial;</div><div class='add'>+	hfa384x_pdr_mkk_measurements_t	mkk_measurements;</div><div class='add'>+	hfa384x_pdr_nic_ramsize_t	nic_ramsize;</div><div class='add'>+	hfa384x_pdr_mfisuprange_t	mfisuprange;</div><div class='add'>+	hfa384x_pdr_cfisuprange_t	cfisuprange;</div><div class='add'>+	hfa384x_pdr_nicid_t		nicid;</div><div class='add'>+	hfa384x_pdr_refdac_measurements_t	refdac_measurements;</div><div class='add'>+	hfa384x_pdr_vgdac_measurements_t	vgdac_measurements;</div><div class='add'>+	hfa384x_pdr_level_compc_measurements_t	level_compc_measurements;</div><div class='add'>+	hfa384x_pdr_mac_address_t	mac_address;</div><div class='add'>+	hfa384x_pdr_mkk_callname_t	mkk_callname;</div><div class='add'>+	hfa384x_pdr_regdomain_t		regdomain;</div><div class='add'>+	hfa384x_pdr_allowed_channel_t	allowed_channel;</div><div class='add'>+	hfa384x_pdr_default_channel_t	default_channel;</div><div class='add'>+	hfa384x_pdr_privacy_option_t	privacy_option;</div><div class='add'>+	hfa384x_pdr_temptype_t		temptype;</div><div class='add'>+	hfa384x_pdr_refdac_setup_t	refdac_setup;</div><div class='add'>+	hfa384x_pdr_vgdac_setup_t	vgdac_setup;</div><div class='add'>+	hfa384x_pdr_level_comp_setup_t	level_comp_setup;</div><div class='add'>+	hfa384x_pdr_trimdac_setup_t	trimdac_setup;</div><div class='add'>+	hfa384x_pdr_ifr_setting_t	ifr_setting;</div><div class='add'>+	hfa384x_pdr_rfr_setting_t	rfr_setting;</div><div class='add'>+	hfa384x_pdr_hfa3861_baseline_t	hfa3861_baseline;</div><div class='add'>+	hfa384x_pdr_hfa3861_shadow_t	hfa3861_shadow;</div><div class='add'>+	hfa384x_pdr_hfa3861_ifrf_t	hfa3861_ifrf;</div><div class='add'>+	hfa384x_pdr_hfa3861_chcalsp_t	hfa3861_chcalsp;</div><div class='add'>+	hfa384x_pdr_hfa3861_chcali_t	hfa3861_chcali;</div><div class='add'>+	hfa384x_pdr_nic_config_t	nic_config;</div><div class='add'>+	hfa384x_hfo_delay_t             hfo_delay;</div><div class='add'>+	hfa384x_pdr_hfa3861_manf_testsp_t	hfa3861_manf_testsp;</div><div class='add'>+	hfa384x_pdr_hfa3861_manf_testi_t	hfa3861_manf_testi;</div><div class='add'>+	hfa384x_pdr_end_of_pda_t	end_of_pda;</div><div class='add'>+</div><div class='add'>+	} data;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ hfa384x_pdrec_t;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#ifdef __KERNEL__</div><div class='add'>+/*--------------------------------------------------------------------</div><div class='add'>+---  MAC state structure, argument to all functions --</div><div class='add'>+---  Also, a collection of support types --</div><div class='add'>+--------------------------------------------------------------------*/</div><div class='add'>+typedef struct hfa384x_statusresult</div><div class='add'>+{</div><div class='add'>+	UINT16	status;</div><div class='add'>+	UINT16	resp0;</div><div class='add'>+	UINT16	resp1;</div><div class='add'>+	UINT16	resp2;</div><div class='add'>+} hfa384x_cmdresult_t;</div><div class='add'>+</div><div class='add'>+#if (WLAN_HOSTIF == WLAN_USB)</div><div class='add'>+</div><div class='add'>+/* USB Control Exchange (CTLX):</div><div class='add'>+ *  A queue of the structure below is maintained for all of the</div><div class='add'>+ *  Request/Response type USB packets supported by Prism2.</div><div class='add'>+ */</div><div class='add'>+/* The following hfa384x_* structures are arguments to</div><div class='add'>+ * the usercb() for the different CTLX types.</div><div class='add'>+ */</div><div class='add'>+typedef hfa384x_cmdresult_t hfa384x_wridresult_t;</div><div class='add'>+typedef hfa384x_cmdresult_t hfa384x_wmemresult_t;</div><div class='add'>+</div><div class='add'>+typedef struct hfa384x_rridresult</div><div class='add'>+{</div><div class='add'>+	UINT16		rid;</div><div class='add'>+	const void	*riddata;</div><div class='add'>+	UINT		riddata_len;</div><div class='add'>+} hfa384x_rridresult_t;</div><div class='add'>+</div><div class='add'>+enum ctlx_state {</div><div class='add'>+	CTLX_START = 0,	/* Start state, not queued */</div><div class='add'>+</div><div class='add'>+	CTLX_COMPLETE,	/* CTLX successfully completed */</div><div class='add'>+	CTLX_REQ_FAILED,	/* OUT URB completed w/ error */</div><div class='add'>+</div><div class='add'>+	CTLX_PENDING,		/* Queued, data valid */</div><div class='add'>+	CTLX_REQ_SUBMITTED,	/* OUT URB submitted */</div><div class='add'>+	CTLX_REQ_COMPLETE,	/* OUT URB complete */</div><div class='add'>+	CTLX_RESP_COMPLETE	/* IN URB received */</div><div class='add'>+};</div><div class='add'>+typedef enum ctlx_state  CTLX_STATE;</div><div class='add'>+</div><div class='add'>+struct hfa384x_usbctlx;</div><div class='add'>+struct hfa384x;</div><div class='add'>+</div><div class='add'>+typedef void (*ctlx_cmdcb_t)( struct hfa384x*, const struct hfa384x_usbctlx* );</div><div class='add'>+</div><div class='add'>+typedef void (*ctlx_usercb_t)(</div><div class='add'>+	struct hfa384x	*hw,</div><div class='add'>+	void		*ctlxresult,</div><div class='add'>+	void		*usercb_data);</div><div class='add'>+</div><div class='add'>+typedef struct hfa384x_usbctlx</div><div class='add'>+{</div><div class='add'>+	struct list_head	list;</div><div class='add'>+</div><div class='add'>+	size_t			outbufsize;</div><div class='add'>+	hfa384x_usbout_t	outbuf;		/* pkt buf for OUT */</div><div class='add'>+	hfa384x_usbin_t		inbuf;		/* pkt buf for IN(a copy) */</div><div class='add'>+</div><div class='add'>+	CTLX_STATE		state;		/* Tracks running state */</div><div class='add'>+</div><div class='add'>+	struct completion	done;</div><div class='add'>+	volatile int		reapable;	/* Food for the reaper task */</div><div class='add'>+</div><div class='add'>+	ctlx_cmdcb_t		cmdcb;		/* Async command callback */</div><div class='add'>+	ctlx_usercb_t		usercb;		/* Async user callback, */</div><div class='add'>+	void			*usercb_data;	/*  at CTLX completion  */</div><div class='add'>+</div><div class='add'>+	int			variant;	/* Identifies cmd variant */</div><div class='add'>+} hfa384x_usbctlx_t;</div><div class='add'>+</div><div class='add'>+typedef struct hfa384x_usbctlxq</div><div class='add'>+{</div><div class='add'>+	spinlock_t		lock;</div><div class='add'>+	struct list_head	pending;</div><div class='add'>+	struct list_head	active;</div><div class='add'>+	struct list_head	completing;</div><div class='add'>+	struct list_head	reapable;</div><div class='add'>+} hfa384x_usbctlxq_t;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+typedef struct hfa484x_metacmd</div><div class='add'>+{</div><div class='add'>+	UINT16		cmd;</div><div class='add'>+</div><div class='add'>+	UINT16          parm0;</div><div class='add'>+	UINT16          parm1;</div><div class='add'>+	UINT16          parm2;</div><div class='add'>+</div><div class='add'>+#if 0 //XXX cmd irq stuff</div><div class='add'>+	UINT16          bulkid;         /* what RID/FID to copy down. */</div><div class='add'>+	int             bulklen;        /* how much to copy from BAP */</div><div class='add'>+        char            *bulkdata;      /* And to where? */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	hfa384x_cmdresult_t result;</div><div class='add'>+} hfa384x_metacmd_t;</div><div class='add'>+</div><div class='add'>+#define	MAX_PRISM2_GRP_ADDR	16</div><div class='add'>+#define	MAX_GRP_ADDR		32</div><div class='add'>+#define WLAN_COMMENT_MAX	80  /* Max. length of user comment string. */</div><div class='add'>+</div><div class='add'>+#define MM_SAT_PCF		(BIT14)</div><div class='add'>+#define MM_GCSD_PCF		(BIT15)</div><div class='add'>+#define MM_GCSD_PCF_EB		(BIT14 | BIT15)</div><div class='add'>+</div><div class='add'>+#define WLAN_STATE_STOPPED	0   /* Network is not active. */</div><div class='add'>+#define WLAN_STATE_STARTED	1   /* Network has been started. */</div><div class='add'>+</div><div class='add'>+#define WLAN_AUTH_MAX           60  /* Max. # of authenticated stations. */</div><div class='add'>+#define WLAN_ACCESS_MAX		60  /* Max. # of stations in an access list. */</div><div class='add'>+#define WLAN_ACCESS_NONE	0   /* No stations may be authenticated. */</div><div class='add'>+#define WLAN_ACCESS_ALL		1   /* All stations may be authenticated. */</div><div class='add'>+#define WLAN_ACCESS_ALLOW	2   /* Authenticate only "allowed" stations. */</div><div class='add'>+#define WLAN_ACCESS_DENY	3   /* Do not authenticate "denied" stations. */</div><div class='add'>+</div><div class='add'>+/* XXX These are going away ASAP */</div><div class='add'>+typedef struct prism2sta_authlist</div><div class='add'>+{</div><div class='add'>+	UINT	cnt;</div><div class='add'>+	UINT8	addr[WLAN_AUTH_MAX][WLAN_ADDR_LEN];</div><div class='add'>+	UINT8	assoc[WLAN_AUTH_MAX];</div><div class='add'>+} prism2sta_authlist_t;</div><div class='add'>+</div><div class='add'>+typedef struct prism2sta_accesslist</div><div class='add'>+{</div><div class='add'>+	UINT	modify;</div><div class='add'>+	UINT	cnt;</div><div class='add'>+	UINT8	addr[WLAN_ACCESS_MAX][WLAN_ADDR_LEN];</div><div class='add'>+	UINT	cnt1;</div><div class='add'>+	UINT8	addr1[WLAN_ACCESS_MAX][WLAN_ADDR_LEN];</div><div class='add'>+} prism2sta_accesslist_t;</div><div class='add'>+</div><div class='add'>+typedef struct hfa384x</div><div class='add'>+{</div><div class='add'>+#if (WLAN_HOSTIF != WLAN_USB)</div><div class='add'>+	/* Resource config */</div><div class='add'>+	UINT32			iobase;</div><div class='add'>+	char			__iomem *membase;</div><div class='add'>+	UINT32			irq;</div><div class='add'>+#else</div><div class='add'>+	/* USB support data */</div><div class='add'>+	struct usb_device	*usb;</div><div class='add'>+	struct urb		rx_urb;</div><div class='add'>+	struct sk_buff		*rx_urb_skb;</div><div class='add'>+	struct urb		tx_urb;</div><div class='add'>+	struct urb		ctlx_urb;</div><div class='add'>+	hfa384x_usbout_t	txbuff;</div><div class='add'>+	hfa384x_usbctlxq_t	ctlxq;</div><div class='add'>+	struct timer_list	reqtimer;</div><div class='add'>+	struct timer_list	resptimer;</div><div class='add'>+</div><div class='add'>+	struct timer_list	throttle;</div><div class='add'>+</div><div class='add'>+	struct tasklet_struct	reaper_bh;</div><div class='add'>+	struct tasklet_struct	completion_bh;</div><div class='add'>+</div><div class='add'>+	struct work_struct	usb_work;</div><div class='add'>+</div><div class='add'>+	unsigned long		usb_flags;</div><div class='add'>+#define THROTTLE_RX	0</div><div class='add'>+#define THROTTLE_TX	1</div><div class='add'>+#define WORK_RX_HALT	2</div><div class='add'>+#define WORK_TX_HALT	3</div><div class='add'>+#define WORK_RX_RESUME	4</div><div class='add'>+#define WORK_TX_RESUME	5</div><div class='add'>+</div><div class='add'>+	unsigned short		req_timer_done:1;</div><div class='add'>+	unsigned short		resp_timer_done:1;</div><div class='add'>+</div><div class='add'>+	int                     endp_in;</div><div class='add'>+	int                     endp_out;</div><div class='add'>+#endif /* !USB */</div><div class='add'>+</div><div class='add'>+#if (WLAN_HOSTIF == WLAN_PCMCIA)</div><div class='add'>+#if LINUX_VERSION_CODE &gt; KERNEL_VERSION(2,6,16)</div><div class='add'>+	struct pcmcia_device *pdev;</div><div class='add'>+#else</div><div class='add'>+	dev_link_t	*link;</div><div class='add'>+#endif</div><div class='add'>+	dev_node_t	node;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	int                     sniff_fcs;</div><div class='add'>+	int                     sniff_channel;</div><div class='add'>+	int                     sniff_truncate;</div><div class='add'>+	int                     sniffhdr;</div><div class='add'>+</div><div class='add'>+	wait_queue_head_t cmdq;	        /* wait queue itself */</div><div class='add'>+</div><div class='add'>+	/* Controller state */</div><div class='add'>+	UINT32		state;</div><div class='add'>+	UINT32		isap;</div><div class='add'>+	UINT8		port_enabled[HFA384x_NUMPORTS_MAX];</div><div class='add'>+#if (WLAN_HOSTIF != WLAN_USB)</div><div class='add'>+	UINT		auxen;</div><div class='add'>+	UINT            isram16;</div><div class='add'>+#endif /* !USB */</div><div class='add'>+</div><div class='add'>+	/* Download support */</div><div class='add'>+	UINT				dlstate;</div><div class='add'>+	hfa384x_downloadbuffer_t	bufinfo;</div><div class='add'>+	UINT16				dltimeout;</div><div class='add'>+</div><div class='add'>+#if (WLAN_HOSTIF != WLAN_USB)</div><div class='add'>+	spinlock_t	cmdlock;</div><div class='add'>+	volatile int    cmdflag;        /* wait queue flag */</div><div class='add'>+	hfa384x_metacmd_t *cmddata;      /* for our async callback */</div><div class='add'>+</div><div class='add'>+	/* BAP support */</div><div class='add'>+	spinlock_t	baplock;</div><div class='add'>+	struct tasklet_struct   bap_tasklet;</div><div class='add'>+</div><div class='add'>+	/* MAC buffer ids */</div><div class='add'>+        UINT16          txfid_head;</div><div class='add'>+        UINT16          txfid_tail;</div><div class='add'>+        UINT            txfid_N;</div><div class='add'>+        UINT16          txfid_queue[HFA384x_DRVR_FIDSTACKLEN_MAX];</div><div class='add'>+	UINT16			infofid;</div><div class='add'>+	struct semaphore	infofid_sem;</div><div class='add'>+#endif /* !USB */</div><div class='add'>+</div><div class='add'>+	int                          scanflag;    /* to signal scan comlete */</div><div class='add'>+	int                          join_ap;        /* are we joined to a specific ap */</div><div class='add'>+	int                          join_retries;   /* number of join retries till we fail */</div><div class='add'>+	hfa384x_JoinRequest_data_t   joinreq;        /* join request saved data */</div><div class='add'>+</div><div class='add'>+	wlandevice_t            *wlandev;</div><div class='add'>+	/* Timer to allow for the deferred processing of linkstatus messages */</div><div class='add'>+	struct work_struct 	link_bh;</div><div class='add'>+</div><div class='add'>+        struct work_struct      commsqual_bh;</div><div class='add'>+	hfa384x_commsquality_t  qual;</div><div class='add'>+	struct timer_list	commsqual_timer;</div><div class='add'>+</div><div class='add'>+	UINT16 link_status;</div><div class='add'>+	UINT16 link_status_new;</div><div class='add'>+	struct sk_buff_head        authq;</div><div class='add'>+</div><div class='add'>+	/* And here we have stuff that used to be in priv */</div><div class='add'>+</div><div class='add'>+	/* State variables */</div><div class='add'>+	UINT		presniff_port_type;</div><div class='add'>+	UINT16		presniff_wepflags;</div><div class='add'>+	UINT32		dot11_desired_bss_type;</div><div class='add'>+	int		ap;	/* AP flag: 0 - Station, 1 - Access Point. */</div><div class='add'>+</div><div class='add'>+	int             dbmadjust;</div><div class='add'>+</div><div class='add'>+	/* Group Addresses - right now, there are up to a total</div><div class='add'>+	of MAX_GRP_ADDR group addresses */</div><div class='add'>+	UINT8		dot11_grp_addr[MAX_GRP_ADDR][WLAN_ADDR_LEN];</div><div class='add'>+	UINT		dot11_grpcnt;</div><div class='add'>+</div><div class='add'>+	/* Component Identities */</div><div class='add'>+	hfa384x_compident_t	ident_nic;</div><div class='add'>+	hfa384x_compident_t	ident_pri_fw;</div><div class='add'>+	hfa384x_compident_t	ident_sta_fw;</div><div class='add'>+	hfa384x_compident_t	ident_ap_fw;</div><div class='add'>+	UINT16			mm_mods;</div><div class='add'>+</div><div class='add'>+	/* Supplier compatibility ranges */</div><div class='add'>+	hfa384x_caplevel_t	cap_sup_mfi;</div><div class='add'>+	hfa384x_caplevel_t	cap_sup_cfi;</div><div class='add'>+	hfa384x_caplevel_t	cap_sup_pri;</div><div class='add'>+	hfa384x_caplevel_t	cap_sup_sta;</div><div class='add'>+	hfa384x_caplevel_t	cap_sup_ap;</div><div class='add'>+</div><div class='add'>+	/* Actor compatibility ranges */</div><div class='add'>+	hfa384x_caplevel_t	cap_act_pri_cfi; /* pri f/w to controller interface */</div><div class='add'>+	hfa384x_caplevel_t	cap_act_sta_cfi; /* sta f/w to controller interface */</div><div class='add'>+	hfa384x_caplevel_t	cap_act_sta_mfi; /* sta f/w to modem interface */</div><div class='add'>+	hfa384x_caplevel_t	cap_act_ap_cfi;  /* ap f/w to controller interface */</div><div class='add'>+	hfa384x_caplevel_t	cap_act_ap_mfi;  /* ap f/w to modem interface */</div><div class='add'>+</div><div class='add'>+	UINT32			psusercount;  /* Power save user count. */</div><div class='add'>+	hfa384x_CommTallies32_t	tallies;      /* Communication tallies. */</div><div class='add'>+	UINT8			comment[WLAN_COMMENT_MAX+1]; /* User comment */</div><div class='add'>+</div><div class='add'>+	/* Channel Info request results (AP only) */</div><div class='add'>+	struct {</div><div class='add'>+		atomic_t		done;</div><div class='add'>+		UINT8			count;</div><div class='add'>+		hfa384x_ChInfoResult_t	results;</div><div class='add'>+	} channel_info;</div><div class='add'>+</div><div class='add'>+	hfa384x_InfFrame_t      *scanresults;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+        prism2sta_authlist_t	authlist;     /* Authenticated station list. */</div><div class='add'>+	UINT			accessmode;   /* Access mode. */</div><div class='add'>+        prism2sta_accesslist_t	allow;        /* Allowed station list. */</div><div class='add'>+        prism2sta_accesslist_t	deny;         /* Denied station list. */</div><div class='add'>+</div><div class='add'>+} hfa384x_t;</div><div class='add'>+</div><div class='add'>+/*=============================================================*/</div><div class='add'>+/*--- Function Declarations -----------------------------------*/</div><div class='add'>+/*=============================================================*/</div><div class='add'>+#if (WLAN_HOSTIF == WLAN_USB)</div><div class='add'>+void</div><div class='add'>+hfa384x_create(</div><div class='add'>+	hfa384x_t *hw,</div><div class='add'>+	struct usb_device *usb);</div><div class='add'>+#else</div><div class='add'>+void</div><div class='add'>+hfa384x_create(</div><div class='add'>+	hfa384x_t *hw,</div><div class='add'>+	UINT irq,</div><div class='add'>+	UINT32 iobase,</div><div class='add'>+	UINT8 __iomem *membase);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+void hfa384x_destroy(hfa384x_t *hw);</div><div class='add'>+</div><div class='add'>+irqreturn_t</div><div class='add'>+hfa384x_interrupt(int irq, void *dev_id PT_REGS);</div><div class='add'>+int</div><div class='add'>+hfa384x_corereset( hfa384x_t *hw, int holdtime, int settletime, int genesis);</div><div class='add'>+int</div><div class='add'>+hfa384x_drvr_chinforesults( hfa384x_t *hw);</div><div class='add'>+int</div><div class='add'>+hfa384x_drvr_commtallies( hfa384x_t *hw);</div><div class='add'>+int</div><div class='add'>+hfa384x_drvr_disable(hfa384x_t *hw, UINT16 macport);</div><div class='add'>+int</div><div class='add'>+hfa384x_drvr_enable(hfa384x_t *hw, UINT16 macport);</div><div class='add'>+int</div><div class='add'>+hfa384x_drvr_flashdl_enable(hfa384x_t *hw);</div><div class='add'>+int</div><div class='add'>+hfa384x_drvr_flashdl_disable(hfa384x_t *hw);</div><div class='add'>+int</div><div class='add'>+hfa384x_drvr_flashdl_write(hfa384x_t *hw, UINT32 daddr, void* buf, UINT32 len);</div><div class='add'>+int</div><div class='add'>+hfa384x_drvr_getconfig(hfa384x_t *hw, UINT16 rid, void *buf, UINT16 len);</div><div class='add'>+int</div><div class='add'>+hfa384x_drvr_handover( hfa384x_t *hw, UINT8 *addr);</div><div class='add'>+int</div><div class='add'>+hfa384x_drvr_hostscanresults( hfa384x_t *hw);</div><div class='add'>+int</div><div class='add'>+hfa384x_drvr_low_level(hfa384x_t *hw, hfa384x_metacmd_t *cmd);</div><div class='add'>+int</div><div class='add'>+hfa384x_drvr_mmi_read(hfa384x_t *hw, UINT32 address, UINT32 *result);</div><div class='add'>+int</div><div class='add'>+hfa384x_drvr_mmi_write(hfa384x_t *hw, UINT32 address, UINT32 data);</div><div class='add'>+int</div><div class='add'>+hfa384x_drvr_ramdl_enable(hfa384x_t *hw, UINT32 exeaddr);</div><div class='add'>+int</div><div class='add'>+hfa384x_drvr_ramdl_disable(hfa384x_t *hw);</div><div class='add'>+int</div><div class='add'>+hfa384x_drvr_ramdl_write(hfa384x_t *hw, UINT32 daddr, void* buf, UINT32 len);</div><div class='add'>+int</div><div class='add'>+hfa384x_drvr_readpda(hfa384x_t *hw, void *buf, UINT len);</div><div class='add'>+int</div><div class='add'>+hfa384x_drvr_scanresults( hfa384x_t *hw);</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+hfa384x_drvr_setconfig(hfa384x_t *hw, UINT16 rid, void *buf, UINT16 len);</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+hfa384x_drvr_getconfig16(hfa384x_t *hw, UINT16 rid, void *val)</div><div class='add'>+{</div><div class='add'>+	int		result = 0;</div><div class='add'>+	result = hfa384x_drvr_getconfig(hw, rid, val, sizeof(UINT16));</div><div class='add'>+	if ( result == 0 ) {</div><div class='add'>+		*((UINT16*)val) = hfa384x2host_16(*((UINT16*)val));</div><div class='add'>+	}</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+hfa384x_drvr_getconfig32(hfa384x_t *hw, UINT16 rid, void *val)</div><div class='add'>+{</div><div class='add'>+	int		result = 0;</div><div class='add'>+</div><div class='add'>+	result = hfa384x_drvr_getconfig(hw, rid, val, sizeof(UINT32));</div><div class='add'>+	if ( result == 0 ) {</div><div class='add'>+		*((UINT32*)val) = hfa384x2host_32(*((UINT32*)val));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+hfa384x_drvr_setconfig16(hfa384x_t *hw, UINT16 rid, UINT16 val)</div><div class='add'>+{</div><div class='add'>+	UINT16 value = host2hfa384x_16(val);</div><div class='add'>+	return hfa384x_drvr_setconfig(hw, rid, &amp;value, sizeof(value));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+hfa384x_drvr_setconfig32(hfa384x_t *hw, UINT16 rid, UINT32 val)</div><div class='add'>+{</div><div class='add'>+	UINT32 value = host2hfa384x_32(val);</div><div class='add'>+	return hfa384x_drvr_setconfig(hw, rid, &amp;value, sizeof(value));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#if (WLAN_HOSTIF == WLAN_USB)</div><div class='add'>+int</div><div class='add'>+hfa384x_drvr_getconfig_async(hfa384x_t     *hw,</div><div class='add'>+                              UINT16        rid,</div><div class='add'>+                              ctlx_usercb_t usercb,</div><div class='add'>+                              void          *usercb_data);</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+hfa384x_drvr_setconfig_async(hfa384x_t *hw,</div><div class='add'>+                              UINT16 rid,</div><div class='add'>+                              void *buf,</div><div class='add'>+                              UINT16 len,</div><div class='add'>+                              ctlx_usercb_t usercb,</div><div class='add'>+                              void *usercb_data);</div><div class='add'>+#else</div><div class='add'>+static inline int</div><div class='add'>+hfa384x_drvr_setconfig_async(hfa384x_t *hw, UINT16 rid, void *buf, UINT16 len,</div><div class='add'>+			     void *ptr1, void *ptr2)</div><div class='add'>+{</div><div class='add'>+         (void)ptr1;</div><div class='add'>+         (void)ptr2;</div><div class='add'>+         return hfa384x_drvr_setconfig(hw, rid, buf, len);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+hfa384x_drvr_setconfig16_async(hfa384x_t *hw, UINT16 rid, UINT16 val)</div><div class='add'>+{</div><div class='add'>+	UINT16 value = host2hfa384x_16(val);</div><div class='add'>+	return hfa384x_drvr_setconfig_async(hw, rid, &amp;value, sizeof(value),</div><div class='add'>+					    NULL , NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+hfa384x_drvr_setconfig32_async(hfa384x_t *hw, UINT16 rid, UINT32 val)</div><div class='add'>+{</div><div class='add'>+	UINT32 value = host2hfa384x_32(val);</div><div class='add'>+	return hfa384x_drvr_setconfig_async(hw, rid, &amp;value, sizeof(value),</div><div class='add'>+					    NULL , NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+hfa384x_drvr_start(hfa384x_t *hw);</div><div class='add'>+int</div><div class='add'>+hfa384x_drvr_stop(hfa384x_t *hw);</div><div class='add'>+int</div><div class='add'>+hfa384x_drvr_txframe(hfa384x_t *hw, struct sk_buff *skb, p80211_hdr_t *p80211_hdr, p80211_metawep_t *p80211_wep);</div><div class='add'>+void</div><div class='add'>+hfa384x_tx_timeout(wlandevice_t *wlandev);</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+hfa384x_cmd_initialize(hfa384x_t *hw);</div><div class='add'>+int</div><div class='add'>+hfa384x_cmd_enable(hfa384x_t *hw, UINT16 macport);</div><div class='add'>+int</div><div class='add'>+hfa384x_cmd_disable(hfa384x_t *hw, UINT16 macport);</div><div class='add'>+int</div><div class='add'>+hfa384x_cmd_diagnose(hfa384x_t *hw);</div><div class='add'>+int</div><div class='add'>+hfa384x_cmd_allocate(hfa384x_t *hw, UINT16 len);</div><div class='add'>+int</div><div class='add'>+hfa384x_cmd_transmit(hfa384x_t *hw, UINT16 reclaim, UINT16 qos, UINT16 fid);</div><div class='add'>+int</div><div class='add'>+hfa384x_cmd_clearpersist(hfa384x_t *hw, UINT16 fid);</div><div class='add'>+int</div><div class='add'>+hfa384x_cmd_notify(hfa384x_t *hw, UINT16 reclaim, UINT16 fid, void *buf, UINT16 len);</div><div class='add'>+int</div><div class='add'>+hfa384x_cmd_inquire(hfa384x_t *hw, UINT16 fid);</div><div class='add'>+int</div><div class='add'>+hfa384x_cmd_access(hfa384x_t *hw, UINT16 write, UINT16 rid, void *buf, UINT16 len);</div><div class='add'>+int</div><div class='add'>+hfa384x_cmd_monitor(hfa384x_t *hw, UINT16 enable);</div><div class='add'>+int</div><div class='add'>+hfa384x_cmd_download(</div><div class='add'>+	hfa384x_t *hw,</div><div class='add'>+	UINT16 mode,</div><div class='add'>+	UINT16 lowaddr,</div><div class='add'>+	UINT16 highaddr,</div><div class='add'>+	UINT16 codelen);</div><div class='add'>+int</div><div class='add'>+hfa384x_cmd_aux_enable(hfa384x_t *hw, int force);</div><div class='add'>+int</div><div class='add'>+hfa384x_cmd_aux_disable(hfa384x_t *hw);</div><div class='add'>+int</div><div class='add'>+hfa384x_copy_from_bap(</div><div class='add'>+	hfa384x_t *hw,</div><div class='add'>+	UINT16	bap,</div><div class='add'>+	UINT16	id,</div><div class='add'>+	UINT16	offset,</div><div class='add'>+	void	*buf,</div><div class='add'>+	UINT	len);</div><div class='add'>+int</div><div class='add'>+hfa384x_copy_to_bap(</div><div class='add'>+	hfa384x_t *hw,</div><div class='add'>+	UINT16	bap,</div><div class='add'>+	UINT16	id,</div><div class='add'>+	UINT16	offset,</div><div class='add'>+	void	*buf,</div><div class='add'>+	UINT	len);</div><div class='add'>+void</div><div class='add'>+hfa384x_copy_from_aux(</div><div class='add'>+	hfa384x_t *hw,</div><div class='add'>+	UINT32	cardaddr,</div><div class='add'>+	UINT32	auxctl,</div><div class='add'>+	void	*buf,</div><div class='add'>+	UINT	len);</div><div class='add'>+void</div><div class='add'>+hfa384x_copy_to_aux(</div><div class='add'>+	hfa384x_t *hw,</div><div class='add'>+	UINT32	cardaddr,</div><div class='add'>+	UINT32	auxctl,</div><div class='add'>+	void	*buf,</div><div class='add'>+	UINT	len);</div><div class='add'>+</div><div class='add'>+#if (WLAN_HOSTIF != WLAN_USB)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+   HFA384x is a LITTLE ENDIAN part.</div><div class='add'>+</div><div class='add'>+   the get/setreg functions implicitly byte-swap the data to LE.</div><div class='add'>+   the _noswap variants do not perform a byte-swap on the data.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+static inline UINT16</div><div class='add'>+__hfa384x_getreg(hfa384x_t *hw, UINT reg);</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+__hfa384x_setreg(hfa384x_t *hw, UINT16 val, UINT reg);</div><div class='add'>+</div><div class='add'>+static inline UINT16</div><div class='add'>+__hfa384x_getreg_noswap(hfa384x_t *hw, UINT reg);</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+__hfa384x_setreg_noswap(hfa384x_t *hw, UINT16 val, UINT reg);</div><div class='add'>+</div><div class='add'>+#ifdef REVERSE_ENDIAN</div><div class='add'>+#define hfa384x_getreg __hfa384x_getreg_noswap</div><div class='add'>+#define hfa384x_setreg __hfa384x_setreg_noswap</div><div class='add'>+#define hfa384x_getreg_noswap __hfa384x_getreg</div><div class='add'>+#define hfa384x_setreg_noswap __hfa384x_setreg</div><div class='add'>+#else</div><div class='add'>+#define hfa384x_getreg __hfa384x_getreg</div><div class='add'>+#define hfa384x_setreg __hfa384x_setreg</div><div class='add'>+#define hfa384x_getreg_noswap __hfa384x_getreg_noswap</div><div class='add'>+#define hfa384x_setreg_noswap __hfa384x_setreg_noswap</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_getreg</div><div class='add'>+*</div><div class='add'>+* Retrieve the value of one of the MAC registers.  Done here</div><div class='add'>+* because different PRISM2 MAC parts use different buses and such.</div><div class='add'>+* NOTE: This function returns the value in HOST ORDER!!!!!!</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*       hw         MAC part structure</div><div class='add'>+*       reg        Register identifier (offset for I/O based i/f)</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*       Value from the register in HOST ORDER!!!!</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+static inline UINT16</div><div class='add'>+__hfa384x_getreg(hfa384x_t *hw, UINT reg)</div><div class='add'>+{</div><div class='add'>+/*	printk(KERN_DEBUG "Reading from 0x%0x\n", hw-&gt;membase + reg); */</div><div class='add'>+#if ((WLAN_HOSTIF == WLAN_PCMCIA) || (WLAN_HOSTIF == WLAN_PLX))</div><div class='add'>+	return wlan_inw_le16_to_cpu(hw-&gt;iobase+reg);</div><div class='add'>+#elif (WLAN_HOSTIF == WLAN_PCI)</div><div class='add'>+	return __le16_to_cpu(readw(hw-&gt;membase + reg));</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_setreg</div><div class='add'>+*</div><div class='add'>+* Set the value of one of the MAC registers.  Done here</div><div class='add'>+* because different PRISM2 MAC parts use different buses and such.</div><div class='add'>+* NOTE: This function assumes the value is in HOST ORDER!!!!!!</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*       hw	MAC part structure</div><div class='add'>+*	val	Value, in HOST ORDER!!, to put in the register</div><div class='add'>+*       reg	Register identifier (offset for I/O based i/f)</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*       Nothing</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+static inline void</div><div class='add'>+__hfa384x_setreg(hfa384x_t *hw, UINT16 val, UINT reg)</div><div class='add'>+{</div><div class='add'>+#if ((WLAN_HOSTIF == WLAN_PCMCIA) || (WLAN_HOSTIF == WLAN_PLX))</div><div class='add'>+	wlan_outw_cpu_to_le16( val, hw-&gt;iobase + reg);</div><div class='add'>+	return;</div><div class='add'>+#elif (WLAN_HOSTIF == WLAN_PCI)</div><div class='add'>+	writew(__cpu_to_le16(val), hw-&gt;membase + reg);</div><div class='add'>+	return;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_getreg_noswap</div><div class='add'>+*</div><div class='add'>+* Retrieve the value of one of the MAC registers.  Done here</div><div class='add'>+* because different PRISM2 MAC parts use different buses and such.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*       hw         MAC part structure</div><div class='add'>+*       reg        Register identifier (offset for I/O based i/f)</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*       Value from the register.</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+static inline UINT16</div><div class='add'>+__hfa384x_getreg_noswap(hfa384x_t *hw, UINT reg)</div><div class='add'>+{</div><div class='add'>+#if ((WLAN_HOSTIF == WLAN_PCMCIA) || (WLAN_HOSTIF == WLAN_PLX))</div><div class='add'>+	return wlan_inw(hw-&gt;iobase+reg);</div><div class='add'>+#elif (WLAN_HOSTIF == WLAN_PCI)</div><div class='add'>+	return readw(hw-&gt;membase + reg);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_setreg_noswap</div><div class='add'>+*</div><div class='add'>+* Set the value of one of the MAC registers.  Done here</div><div class='add'>+* because different PRISM2 MAC parts use different buses and such.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*       hw	MAC part structure</div><div class='add'>+*	val	Value to put in the register</div><div class='add'>+*       reg	Register identifier (offset for I/O based i/f)</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*       Nothing</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+static inline void</div><div class='add'>+__hfa384x_setreg_noswap(hfa384x_t *hw, UINT16 val, UINT reg)</div><div class='add'>+{</div><div class='add'>+#if ((WLAN_HOSTIF == WLAN_PCMCIA) || (WLAN_HOSTIF == WLAN_PLX))</div><div class='add'>+	wlan_outw( val, hw-&gt;iobase + reg);</div><div class='add'>+	return;</div><div class='add'>+#elif (WLAN_HOSTIF == WLAN_PCI)</div><div class='add'>+	writew(val, hw-&gt;membase + reg);</div><div class='add'>+	return;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static inline void hfa384x_events_all(hfa384x_t *hw)</div><div class='add'>+{</div><div class='add'>+	hfa384x_setreg(hw,</div><div class='add'>+		       HFA384x_INT_NORMAL</div><div class='add'>+#ifdef CMD_IRQ</div><div class='add'>+		       | HFA384x_INTEN_CMD_SET(1)</div><div class='add'>+#endif</div><div class='add'>+		       ,</div><div class='add'>+		       HFA384x_INTEN);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void hfa384x_events_nobap(hfa384x_t *hw)</div><div class='add'>+{</div><div class='add'>+	hfa384x_setreg(hw,</div><div class='add'>+		        (HFA384x_INT_NORMAL &amp; ~HFA384x_INT_BAP_OP)</div><div class='add'>+#ifdef CMD_IRQ</div><div class='add'>+		       | HFA384x_INTEN_CMD_SET(1)</div><div class='add'>+#endif</div><div class='add'>+		       ,</div><div class='add'>+		       HFA384x_INTEN);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* WLAN_HOSTIF != WLAN_USB */</div><div class='add'>+#endif /* __KERNEL__ */</div><div class='add'>+</div><div class='add'>+#endif  /* _HFA384x_H */</div><div class='head'>diff --git a/drivers/staging/wlan-ng/hfa384x_usb.c b/drivers/staging/wlan-ng/hfa384x_usb.c<br/>new file mode 100644<br/>index 000000000000..db0c502f5d90<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/wlan-ng/hfa384x_usb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/wlan-ng/hfa384x_usb.c</a></div><div class='hunk'>@@ -0,0 +1,5027 @@</div><div class='add'>+/* src/prism2/driver/hfa384x_usb.c</div><div class='add'>+*</div><div class='add'>+* Functions that talk to the USB variantof the Intersil hfa384x MAC</div><div class='add'>+*</div><div class='add'>+* Copyright (C) 1999 AbsoluteValue Systems, Inc.  All Rights Reserved.</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* linux-wlan</div><div class='add'>+*</div><div class='add'>+*   The contents of this file are subject to the Mozilla Public</div><div class='add'>+*   License Version 1.1 (the "License"); you may not use this file</div><div class='add'>+*   except in compliance with the License. You may obtain a copy of</div><div class='add'>+*   the License at http://www.mozilla.org/MPL/</div><div class='add'>+*</div><div class='add'>+*   Software distributed under the License is distributed on an "AS</div><div class='add'>+*   IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or</div><div class='add'>+*   implied. See the License for the specific language governing</div><div class='add'>+*   rights and limitations under the License.</div><div class='add'>+*</div><div class='add'>+*   Alternatively, the contents of this file may be used under the</div><div class='add'>+*   terms of the GNU Public License version 2 (the "GPL"), in which</div><div class='add'>+*   case the provisions of the GPL are applicable instead of the</div><div class='add'>+*   above.  If you wish to allow the use of your version of this file</div><div class='add'>+*   only under the terms of the GPL and not to allow others to use</div><div class='add'>+*   your version of this file under the MPL, indicate your decision</div><div class='add'>+*   by deleting the provisions above and replace them with the notice</div><div class='add'>+*   and other provisions required by the GPL.  If you do not delete</div><div class='add'>+*   the provisions above, a recipient may use your version of this</div><div class='add'>+*   file under either the MPL or the GPL.</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* Inquiries regarding the linux-wlan Open Source project can be</div><div class='add'>+* made directly to:</div><div class='add'>+*</div><div class='add'>+* AbsoluteValue Systems Inc.</div><div class='add'>+* info@linux-wlan.com</div><div class='add'>+* http://www.linux-wlan.com</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* Portions of the development of this software were funded by</div><div class='add'>+* Intersil Corporation as part of PRISM(R) chipset product development.</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* This file implements functions that correspond to the prism2/hfa384x</div><div class='add'>+* 802.11 MAC hardware and firmware host interface.</div><div class='add'>+*</div><div class='add'>+* The functions can be considered to represent several levels of</div><div class='add'>+* abstraction.  The lowest level functions are simply C-callable wrappers</div><div class='add'>+* around the register accesses.  The next higher level represents C-callable</div><div class='add'>+* prism2 API functions that match the Intersil documentation as closely</div><div class='add'>+* as is reasonable.  The next higher layer implements common sequences</div><div class='add'>+* of invokations of the API layer (e.g. write to bap, followed by cmd).</div><div class='add'>+*</div><div class='add'>+* Common sequences:</div><div class='add'>+* hfa384x_drvr_xxx	Highest level abstractions provided by the</div><div class='add'>+*			hfa384x code.  They are driver defined wrappers</div><div class='add'>+*			for common sequences.  These functions generally</div><div class='add'>+*			use the services of the lower levels.</div><div class='add'>+*</div><div class='add'>+* hfa384x_drvr_xxxconfig  An example of the drvr level abstraction. These</div><div class='add'>+*			functions are wrappers for the RID get/set</div><div class='add'>+*			sequence. They 	call copy_[to|from]_bap() and</div><div class='add'>+*			cmd_access().	These functions operate on the</div><div class='add'>+*			RIDs and buffers without validation.  The caller</div><div class='add'>+*			is responsible for that.</div><div class='add'>+*</div><div class='add'>+* API wrapper functions:</div><div class='add'>+* hfa384x_cmd_xxx	functions that provide access to the f/w commands.</div><div class='add'>+*			The function arguments correspond to each command</div><div class='add'>+*			argument, even command arguments that get packed</div><div class='add'>+*			into single registers.  These functions _just_</div><div class='add'>+*			issue the command by setting the cmd/parm regs</div><div class='add'>+*			&amp; reading the status/resp regs.  Additional</div><div class='add'>+*			activities required to fully use a command</div><div class='add'>+*			(read/write from/to bap, get/set int status etc.)</div><div class='add'>+*			are implemented separately.  Think of these as</div><div class='add'>+*			C-callable prism2 commands.</div><div class='add'>+*</div><div class='add'>+* Lowest Layer Functions:</div><div class='add'>+* hfa384x_docmd_xxx	These functions implement the sequence required</div><div class='add'>+*			to issue any prism2 command.  Primarily used by the</div><div class='add'>+*			hfa384x_cmd_xxx functions.</div><div class='add'>+*</div><div class='add'>+* hfa384x_bap_xxx	BAP read/write access functions.</div><div class='add'>+*			Note: we usually use BAP0 for non-interrupt context</div><div class='add'>+*			 and BAP1 for interrupt context.</div><div class='add'>+*</div><div class='add'>+* hfa384x_dl_xxx	download related functions.</div><div class='add'>+*</div><div class='add'>+* Driver State Issues:</div><div class='add'>+* Note that there are two pairs of functions that manage the</div><div class='add'>+* 'initialized' and 'running' states of the hw/MAC combo.  The four</div><div class='add'>+* functions are create(), destroy(), start(), and stop().  create()</div><div class='add'>+* sets up the data structures required to support the hfa384x_*</div><div class='add'>+* functions and destroy() cleans them up.  The start() function gets</div><div class='add'>+* the actual hardware running and enables the interrupts.  The stop()</div><div class='add'>+* function shuts the hardware down.  The sequence should be:</div><div class='add'>+* create()</div><div class='add'>+* start()</div><div class='add'>+*  .</div><div class='add'>+*  .  Do interesting things w/ the hardware</div><div class='add'>+*  .</div><div class='add'>+* stop()</div><div class='add'>+* destroy()</div><div class='add'>+*</div><div class='add'>+* Note that destroy() can be called without calling stop() first.</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* System Includes */</div><div class='add'>+#define WLAN_DBVAR	prism2_debug</div><div class='add'>+</div><div class='add'>+#include "version.h"</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#include &lt;linux/version.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/wireless.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/timer.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;asm/byteorder.h&gt;</div><div class='add'>+#include &lt;asm/bitops.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/usb.h&gt;</div><div class='add'>+</div><div class='add'>+#include "wlan_compat.h"</div><div class='add'>+</div><div class='add'>+#if (WLAN_HOSTIF != WLAN_USB)</div><div class='add'>+#error "This file is specific to USB"</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#if LINUX_VERSION_CODE &lt; KERNEL_VERSION(2,6,10)</div><div class='add'>+static int</div><div class='add'>+wait_for_completion_interruptible(struct completion *x)</div><div class='add'>+{</div><div class='add'>+  int ret = 0;</div><div class='add'>+</div><div class='add'>+  might_sleep();</div><div class='add'>+</div><div class='add'>+  spin_lock_irq(&amp;x-&gt;wait.lock);</div><div class='add'>+  if (!x-&gt;done) {</div><div class='add'>+    DECLARE_WAITQUEUE(wait, current);</div><div class='add'>+</div><div class='add'>+    wait.flags |= WQ_FLAG_EXCLUSIVE;</div><div class='add'>+    __add_wait_queue_tail(&amp;x-&gt;wait, &amp;wait);</div><div class='add'>+    do {</div><div class='add'>+      if (signal_pending(current)) {</div><div class='add'>+        ret = -ERESTARTSYS;</div><div class='add'>+        __remove_wait_queue(&amp;x-&gt;wait, &amp;wait);</div><div class='add'>+        goto out;</div><div class='add'>+      }</div><div class='add'>+      __set_current_state(TASK_INTERRUPTIBLE);</div><div class='add'>+      spin_unlock_irq(&amp;x-&gt;wait.lock);</div><div class='add'>+      schedule();</div><div class='add'>+      spin_lock_irq(&amp;x-&gt;wait.lock);</div><div class='add'>+    } while (!x-&gt;done);</div><div class='add'>+    __remove_wait_queue(&amp;x-&gt;wait, &amp;wait);</div><div class='add'>+  }</div><div class='add'>+  x-&gt;done--;</div><div class='add'>+out:</div><div class='add'>+  spin_unlock_irq(&amp;x-&gt;wait.lock);</div><div class='add'>+</div><div class='add'>+  return ret;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if LINUX_VERSION_CODE &lt; KERNEL_VERSION(2,5,69)</div><div class='add'>+static void</div><div class='add'>+usb_init_urb(struct urb *urb)</div><div class='add'>+{</div><div class='add'>+	memset(urb, 0, sizeof(*urb));</div><div class='add'>+#if LINUX_VERSION_CODE &gt;= KERNEL_VERSION(2,5,0) /* tune me! */</div><div class='add'>+	urb-&gt;count = (atomic_t)ATOMIC_INIT(1);</div><div class='add'>+#endif</div><div class='add'>+	spin_lock_init(&amp;urb-&gt;lock);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if LINUX_VERSION_CODE &gt;= KERNEL_VERSION(2,5,0) /* tune me! */</div><div class='add'>+#  define SUBMIT_URB(u,f)  usb_submit_urb(u,f)</div><div class='add'>+#else</div><div class='add'>+#  define SUBMIT_URB(u,f)  usb_submit_urb(u)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Project Includes */</div><div class='add'>+</div><div class='add'>+#include "p80211types.h"</div><div class='add'>+#include "p80211hdr.h"</div><div class='add'>+#include "p80211mgmt.h"</div><div class='add'>+#include "p80211conv.h"</div><div class='add'>+#include "p80211msg.h"</div><div class='add'>+#include "p80211netdev.h"</div><div class='add'>+#include "p80211req.h"</div><div class='add'>+#include "p80211metadef.h"</div><div class='add'>+#include "p80211metastruct.h"</div><div class='add'>+#include "hfa384x.h"</div><div class='add'>+#include "prism2mgmt.h"</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Local Constants */</div><div class='add'>+</div><div class='add'>+enum cmd_mode</div><div class='add'>+{</div><div class='add'>+  DOWAIT = 0,</div><div class='add'>+  DOASYNC</div><div class='add'>+};</div><div class='add'>+typedef enum cmd_mode CMD_MODE;</div><div class='add'>+</div><div class='add'>+#define THROTTLE_JIFFIES	(HZ/8)</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Local Macros */</div><div class='add'>+</div><div class='add'>+#define ROUNDUP64(a) (((a)+63)&amp;~63)</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Local Types */</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Local Static Definitions */</div><div class='add'>+extern int prism2_debug;</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Local Function Declarations */</div><div class='add'>+</div><div class='add'>+#ifdef DEBUG_USB</div><div class='add'>+static void</div><div class='add'>+dbprint_urb(struct urb* urb);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+hfa384x_int_rxmonitor(</div><div class='add'>+	wlandevice_t *wlandev,</div><div class='add'>+	hfa384x_usb_rxfrm_t *rxfrm);</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+hfa384x_usb_defer(struct work_struct *data);</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+submit_rx_urb(hfa384x_t *hw, gfp_t flags);</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+submit_tx_urb(hfa384x_t *hw, struct urb *tx_urb, gfp_t flags);</div><div class='add'>+</div><div class='add'>+/*---------------------------------------------------*/</div><div class='add'>+/* Callbacks */</div><div class='add'>+#ifdef URB_ONLY_CALLBACK</div><div class='add'>+static void</div><div class='add'>+hfa384x_usbout_callback(struct urb *urb);</div><div class='add'>+static void</div><div class='add'>+hfa384x_ctlxout_callback(struct urb *urb);</div><div class='add'>+static void</div><div class='add'>+hfa384x_usbin_callback(struct urb *urb);</div><div class='add'>+#else</div><div class='add'>+static void</div><div class='add'>+hfa384x_usbout_callback(struct urb *urb, struct pt_regs *regs);</div><div class='add'>+static void</div><div class='add'>+hfa384x_ctlxout_callback(struct urb *urb, struct pt_regs *regs);</div><div class='add'>+static void</div><div class='add'>+hfa384x_usbin_callback(struct urb *urb, struct pt_regs *regs);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+hfa384x_usbin_txcompl(wlandevice_t *wlandev, hfa384x_usbin_t *usbin);</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+hfa384x_usbin_rx(wlandevice_t *wlandev, struct sk_buff *skb);</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+hfa384x_usbin_info(wlandevice_t *wlandev, hfa384x_usbin_t *usbin);</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+hfa384x_usbout_tx(wlandevice_t *wlandev, hfa384x_usbout_t *usbout);</div><div class='add'>+</div><div class='add'>+static void hfa384x_usbin_ctlx(hfa384x_t *hw, hfa384x_usbin_t *usbin,</div><div class='add'>+			       int urb_status);</div><div class='add'>+</div><div class='add'>+/*---------------------------------------------------*/</div><div class='add'>+/* Functions to support the prism2 usb command queue */</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+hfa384x_usbctlxq_run(hfa384x_t *hw);</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+hfa384x_usbctlx_reqtimerfn(unsigned long data);</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+hfa384x_usbctlx_resptimerfn(unsigned long data);</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+hfa384x_usb_throttlefn(unsigned long data);</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+hfa384x_usbctlx_completion_task(unsigned long data);</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+hfa384x_usbctlx_reaper_task(unsigned long data);</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+hfa384x_usbctlx_submit(hfa384x_t *hw, hfa384x_usbctlx_t *ctlx);</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+unlocked_usbctlx_complete(hfa384x_t *hw, hfa384x_usbctlx_t *ctlx);</div><div class='add'>+</div><div class='add'>+struct usbctlx_completor</div><div class='add'>+{</div><div class='add'>+	int (*complete)(struct usbctlx_completor*);</div><div class='add'>+};</div><div class='add'>+typedef struct usbctlx_completor usbctlx_completor_t;</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+hfa384x_usbctlx_complete_sync(hfa384x_t *hw,</div><div class='add'>+                              hfa384x_usbctlx_t *ctlx,</div><div class='add'>+                              usbctlx_completor_t *completor);</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+unlocked_usbctlx_cancel_async(hfa384x_t *hw, hfa384x_usbctlx_t *ctlx);</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+hfa384x_cb_status(hfa384x_t *hw, const hfa384x_usbctlx_t *ctlx);</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+hfa384x_cb_rrid(hfa384x_t *hw, const hfa384x_usbctlx_t *ctlx);</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+usbctlx_get_status(const hfa384x_usb_cmdresp_t *cmdresp,</div><div class='add'>+                   hfa384x_cmdresult_t *result);</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+usbctlx_get_rridresult(const hfa384x_usb_rridresp_t *rridresp,</div><div class='add'>+                       hfa384x_rridresult_t *result);</div><div class='add'>+</div><div class='add'>+/*---------------------------------------------------*/</div><div class='add'>+/* Low level req/resp CTLX formatters and submitters */</div><div class='add'>+static int</div><div class='add'>+hfa384x_docmd(</div><div class='add'>+	hfa384x_t *hw,</div><div class='add'>+	CMD_MODE mode,</div><div class='add'>+	hfa384x_metacmd_t *cmd,</div><div class='add'>+	ctlx_cmdcb_t cmdcb,</div><div class='add'>+	ctlx_usercb_t usercb,</div><div class='add'>+	void	*usercb_data);</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+hfa384x_dorrid(</div><div class='add'>+	hfa384x_t *hw,</div><div class='add'>+	CMD_MODE mode,</div><div class='add'>+	UINT16	rid,</div><div class='add'>+	void	*riddata,</div><div class='add'>+	UINT	riddatalen,</div><div class='add'>+	ctlx_cmdcb_t cmdcb,</div><div class='add'>+	ctlx_usercb_t usercb,</div><div class='add'>+	void	*usercb_data);</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+hfa384x_dowrid(</div><div class='add'>+	hfa384x_t *hw,</div><div class='add'>+	CMD_MODE mode,</div><div class='add'>+	UINT16	rid,</div><div class='add'>+	void	*riddata,</div><div class='add'>+	UINT	riddatalen,</div><div class='add'>+	ctlx_cmdcb_t cmdcb,</div><div class='add'>+	ctlx_usercb_t usercb,</div><div class='add'>+	void	*usercb_data);</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+hfa384x_dormem(</div><div class='add'>+	hfa384x_t *hw,</div><div class='add'>+	CMD_MODE mode,</div><div class='add'>+	UINT16	page,</div><div class='add'>+	UINT16	offset,</div><div class='add'>+	void	*data,</div><div class='add'>+	UINT	len,</div><div class='add'>+	ctlx_cmdcb_t cmdcb,</div><div class='add'>+	ctlx_usercb_t usercb,</div><div class='add'>+	void	*usercb_data);</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+hfa384x_dowmem(</div><div class='add'>+	hfa384x_t *hw,</div><div class='add'>+	CMD_MODE mode,</div><div class='add'>+	UINT16	page,</div><div class='add'>+	UINT16	offset,</div><div class='add'>+	void	*data,</div><div class='add'>+	UINT	len,</div><div class='add'>+	ctlx_cmdcb_t cmdcb,</div><div class='add'>+	ctlx_usercb_t usercb,</div><div class='add'>+	void	*usercb_data);</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+hfa384x_isgood_pdrcode(UINT16 pdrcode);</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Function Definitions */</div><div class='add'>+static inline const char* ctlxstr(CTLX_STATE s)</div><div class='add'>+{</div><div class='add'>+	static const char* ctlx_str[] = {</div><div class='add'>+		"Initial state",</div><div class='add'>+		"Complete",</div><div class='add'>+		"Request failed",</div><div class='add'>+		"Request pending",</div><div class='add'>+		"Request packet submitted",</div><div class='add'>+		"Request packet completed",</div><div class='add'>+		"Response packet completed"</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return ctlx_str[s];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static inline hfa384x_usbctlx_t*</div><div class='add'>+get_active_ctlx(hfa384x_t *hw)</div><div class='add'>+{</div><div class='add'>+	return list_entry(hw-&gt;ctlxq.active.next, hfa384x_usbctlx_t, list);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#ifdef DEBUG_USB</div><div class='add'>+void</div><div class='add'>+dbprint_urb(struct urb* urb)</div><div class='add'>+{</div><div class='add'>+	WLAN_LOG_DEBUG(3,"urb-&gt;pipe=0x%08x\n", urb-&gt;pipe);</div><div class='add'>+	WLAN_LOG_DEBUG(3,"urb-&gt;status=0x%08x\n", urb-&gt;status);</div><div class='add'>+	WLAN_LOG_DEBUG(3,"urb-&gt;transfer_flags=0x%08x\n", urb-&gt;transfer_flags);</div><div class='add'>+	WLAN_LOG_DEBUG(3,"urb-&gt;transfer_buffer=0x%08x\n", (UINT)urb-&gt;transfer_buffer);</div><div class='add'>+	WLAN_LOG_DEBUG(3,"urb-&gt;transfer_buffer_length=0x%08x\n", urb-&gt;transfer_buffer_length);</div><div class='add'>+	WLAN_LOG_DEBUG(3,"urb-&gt;actual_length=0x%08x\n", urb-&gt;actual_length);</div><div class='add'>+	WLAN_LOG_DEBUG(3,"urb-&gt;bandwidth=0x%08x\n", urb-&gt;bandwidth);</div><div class='add'>+	WLAN_LOG_DEBUG(3,"urb-&gt;setup_packet(ctl)=0x%08x\n", (UINT)urb-&gt;setup_packet);</div><div class='add'>+	WLAN_LOG_DEBUG(3,"urb-&gt;start_frame(iso/irq)=0x%08x\n", urb-&gt;start_frame);</div><div class='add'>+	WLAN_LOG_DEBUG(3,"urb-&gt;interval(irq)=0x%08x\n", urb-&gt;interval);</div><div class='add'>+	WLAN_LOG_DEBUG(3,"urb-&gt;error_count(iso)=0x%08x\n", urb-&gt;error_count);</div><div class='add'>+	WLAN_LOG_DEBUG(3,"urb-&gt;timeout=0x%08x\n", urb-&gt;timeout);</div><div class='add'>+	WLAN_LOG_DEBUG(3,"urb-&gt;context=0x%08x\n", (UINT)urb-&gt;context);</div><div class='add'>+	WLAN_LOG_DEBUG(3,"urb-&gt;complete=0x%08x\n", (UINT)urb-&gt;complete);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* submit_rx_urb</div><div class='add'>+*</div><div class='add'>+* Listen for input data on the BULK-IN pipe. If the pipe has</div><div class='add'>+* stalled then schedule it to be reset.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw		device struct</div><div class='add'>+*	memflags	memory allocation flags</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	error code from submission</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	Any</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+static int</div><div class='add'>+submit_rx_urb(hfa384x_t *hw, gfp_t memflags)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int result;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	skb = dev_alloc_skb(sizeof(hfa384x_usbin_t));</div><div class='add'>+	if (skb == NULL) {</div><div class='add'>+		result = -ENOMEM;</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Post the IN urb */</div><div class='add'>+	usb_fill_bulk_urb(&amp;hw-&gt;rx_urb, hw-&gt;usb,</div><div class='add'>+	              hw-&gt;endp_in,</div><div class='add'>+	              skb-&gt;data, sizeof(hfa384x_usbin_t),</div><div class='add'>+	              hfa384x_usbin_callback, hw-&gt;wlandev);</div><div class='add'>+</div><div class='add'>+	hw-&gt;rx_urb_skb = skb;</div><div class='add'>+</div><div class='add'>+	result = -ENOLINK;</div><div class='add'>+	if ( !hw-&gt;wlandev-&gt;hwremoved &amp;&amp; !test_bit(WORK_RX_HALT, &amp;hw-&gt;usb_flags)) {</div><div class='add'>+		result = SUBMIT_URB(&amp;hw-&gt;rx_urb, memflags);</div><div class='add'>+</div><div class='add'>+		/* Check whether we need to reset the RX pipe */</div><div class='add'>+		if (result == -EPIPE) {</div><div class='add'>+			WLAN_LOG_WARNING("%s rx pipe stalled: requesting reset\n",</div><div class='add'>+			                 hw-&gt;wlandev-&gt;netdev-&gt;name);</div><div class='add'>+			if ( !test_and_set_bit(WORK_RX_HALT, &amp;hw-&gt;usb_flags) )</div><div class='add'>+				schedule_work(&amp;hw-&gt;usb_work);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Don't leak memory if anything should go wrong */</div><div class='add'>+	if (result != 0) {</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+		hw-&gt;rx_urb_skb = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+ done:</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* submit_tx_urb</div><div class='add'>+*</div><div class='add'>+* Prepares and submits the URB of transmitted data. If the</div><div class='add'>+* submission fails then it will schedule the output pipe to</div><div class='add'>+* be reset.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw		device struct</div><div class='add'>+*	tx_urb		URB of data for tranmission</div><div class='add'>+*	memflags	memory allocation flags</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	error code from submission</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	Any</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+static int</div><div class='add'>+submit_tx_urb(hfa384x_t *hw, struct urb *tx_urb, gfp_t memflags)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev = hw-&gt;wlandev-&gt;netdev;</div><div class='add'>+	int result;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	result = -ENOLINK;</div><div class='add'>+	if ( netif_running(netdev) ) {</div><div class='add'>+</div><div class='add'>+		if ( !hw-&gt;wlandev-&gt;hwremoved &amp;&amp; !test_bit(WORK_TX_HALT, &amp;hw-&gt;usb_flags) ) {</div><div class='add'>+			result = SUBMIT_URB(tx_urb, memflags);</div><div class='add'>+</div><div class='add'>+			/* Test whether we need to reset the TX pipe */</div><div class='add'>+			if (result == -EPIPE) {</div><div class='add'>+				WLAN_LOG_WARNING("%s tx pipe stalled: requesting reset\n",</div><div class='add'>+				                 netdev-&gt;name);</div><div class='add'>+				set_bit(WORK_TX_HALT, &amp;hw-&gt;usb_flags);</div><div class='add'>+				schedule_work(&amp;hw-&gt;usb_work);</div><div class='add'>+			} else if (result == 0) {</div><div class='add'>+				netif_stop_queue(netdev);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa394x_usb_defer</div><div class='add'>+*</div><div class='add'>+* There are some things that the USB stack cannot do while</div><div class='add'>+* in interrupt context, so we arrange this function to run</div><div class='add'>+* in process context.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw	device structure</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	nothing</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process (by design)</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+static void</div><div class='add'>+hfa384x_usb_defer(struct work_struct *data)</div><div class='add'>+{</div><div class='add'>+	hfa384x_t *hw = container_of(data, struct hfa384x, usb_work);</div><div class='add'>+	struct net_device *netdev = hw-&gt;wlandev-&gt;netdev;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	/* Don't bother trying to reset anything if the plug</div><div class='add'>+	 * has been pulled ...</div><div class='add'>+	 */</div><div class='add'>+	if ( hw-&gt;wlandev-&gt;hwremoved ) {</div><div class='add'>+		DBFEXIT;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Reception has stopped: try to reset the input pipe */</div><div class='add'>+	if (test_bit(WORK_RX_HALT, &amp;hw-&gt;usb_flags)) {</div><div class='add'>+		int ret;</div><div class='add'>+</div><div class='add'>+		usb_kill_urb(&amp;hw-&gt;rx_urb);  /* Cannot be holding spinlock! */</div><div class='add'>+</div><div class='add'>+		ret = usb_clear_halt(hw-&gt;usb, hw-&gt;endp_in);</div><div class='add'>+		if (ret != 0) {</div><div class='add'>+			printk(KERN_ERR</div><div class='add'>+			       "Failed to clear rx pipe for %s: err=%d\n",</div><div class='add'>+			       netdev-&gt;name, ret);</div><div class='add'>+		} else {</div><div class='add'>+			printk(KERN_INFO "%s rx pipe reset complete.\n",</div><div class='add'>+			                 netdev-&gt;name);</div><div class='add'>+			clear_bit(WORK_RX_HALT, &amp;hw-&gt;usb_flags);</div><div class='add'>+			set_bit(WORK_RX_RESUME, &amp;hw-&gt;usb_flags);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Resume receiving data back from the device. */</div><div class='add'>+	if ( test_bit(WORK_RX_RESUME, &amp;hw-&gt;usb_flags) ) {</div><div class='add'>+		int ret;</div><div class='add'>+</div><div class='add'>+		ret = submit_rx_urb(hw, GFP_KERNEL);</div><div class='add'>+		if (ret != 0) {</div><div class='add'>+			printk(KERN_ERR</div><div class='add'>+			       "Failed to resume %s rx pipe.\n", netdev-&gt;name);</div><div class='add'>+		} else {</div><div class='add'>+			clear_bit(WORK_RX_RESUME, &amp;hw-&gt;usb_flags);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Transmission has stopped: try to reset the output pipe */</div><div class='add'>+	if (test_bit(WORK_TX_HALT, &amp;hw-&gt;usb_flags)) {</div><div class='add'>+		int ret;</div><div class='add'>+</div><div class='add'>+		usb_kill_urb(&amp;hw-&gt;tx_urb);</div><div class='add'>+		ret = usb_clear_halt(hw-&gt;usb, hw-&gt;endp_out);</div><div class='add'>+		if (ret != 0) {</div><div class='add'>+			printk(KERN_ERR</div><div class='add'>+			       "Failed to clear tx pipe for %s: err=%d\n",</div><div class='add'>+			       netdev-&gt;name, ret);</div><div class='add'>+		} else {</div><div class='add'>+			printk(KERN_INFO "%s tx pipe reset complete.\n",</div><div class='add'>+			                 netdev-&gt;name);</div><div class='add'>+			clear_bit(WORK_TX_HALT, &amp;hw-&gt;usb_flags);</div><div class='add'>+			set_bit(WORK_TX_RESUME, &amp;hw-&gt;usb_flags);</div><div class='add'>+</div><div class='add'>+			/* Stopping the BULK-OUT pipe also blocked</div><div class='add'>+			 * us from sending any more CTLX URBs, so</div><div class='add'>+			 * we need to re-run our queue ...</div><div class='add'>+			 */</div><div class='add'>+			hfa384x_usbctlxq_run(hw);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Resume transmitting. */</div><div class='add'>+	if ( test_and_clear_bit(WORK_TX_RESUME, &amp;hw-&gt;usb_flags) ) {</div><div class='add'>+		p80211netdev_wake_queue(hw-&gt;wlandev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_create</div><div class='add'>+*</div><div class='add'>+* Sets up the hfa384x_t data structure for use.  Note this</div><div class='add'>+* does _not_ intialize the actual hardware, just the data structures</div><div class='add'>+* we use to keep track of its state.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw		device structure</div><div class='add'>+*	irq		device irq number</div><div class='add'>+*	iobase		i/o base address for register access</div><div class='add'>+*	membase		memory base address for register access</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	nothing</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+void</div><div class='add'>+hfa384x_create( hfa384x_t *hw, struct usb_device *usb)</div><div class='add'>+{</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	memset(hw, 0, sizeof(hfa384x_t));</div><div class='add'>+	hw-&gt;usb = usb;</div><div class='add'>+</div><div class='add'>+	/* set up the endpoints */</div><div class='add'>+	hw-&gt;endp_in = usb_rcvbulkpipe(usb, 1);</div><div class='add'>+	hw-&gt;endp_out = usb_sndbulkpipe(usb, 2);</div><div class='add'>+</div><div class='add'>+	/* Set up the waitq */</div><div class='add'>+	init_waitqueue_head(&amp;hw-&gt;cmdq);</div><div class='add'>+</div><div class='add'>+	/* Initialize the command queue */</div><div class='add'>+	spin_lock_init(&amp;hw-&gt;ctlxq.lock);</div><div class='add'>+	INIT_LIST_HEAD(&amp;hw-&gt;ctlxq.pending);</div><div class='add'>+	INIT_LIST_HEAD(&amp;hw-&gt;ctlxq.active);</div><div class='add'>+	INIT_LIST_HEAD(&amp;hw-&gt;ctlxq.completing);</div><div class='add'>+	INIT_LIST_HEAD(&amp;hw-&gt;ctlxq.reapable);</div><div class='add'>+</div><div class='add'>+	/* Initialize the authentication queue */</div><div class='add'>+	skb_queue_head_init(&amp;hw-&gt;authq);</div><div class='add'>+</div><div class='add'>+	tasklet_init(&amp;hw-&gt;reaper_bh,</div><div class='add'>+	             hfa384x_usbctlx_reaper_task,</div><div class='add'>+	             (unsigned long)hw);</div><div class='add'>+	tasklet_init(&amp;hw-&gt;completion_bh,</div><div class='add'>+	             hfa384x_usbctlx_completion_task,</div><div class='add'>+	             (unsigned long)hw);</div><div class='add'>+	INIT_WORK2(&amp;hw-&gt;link_bh, prism2sta_processing_defer);</div><div class='add'>+	INIT_WORK2(&amp;hw-&gt;usb_work, hfa384x_usb_defer);</div><div class='add'>+</div><div class='add'>+	init_timer(&amp;hw-&gt;throttle);</div><div class='add'>+	hw-&gt;throttle.function = hfa384x_usb_throttlefn;</div><div class='add'>+	hw-&gt;throttle.data = (unsigned long)hw;</div><div class='add'>+</div><div class='add'>+	init_timer(&amp;hw-&gt;resptimer);</div><div class='add'>+	hw-&gt;resptimer.function = hfa384x_usbctlx_resptimerfn;</div><div class='add'>+	hw-&gt;resptimer.data = (unsigned long)hw;</div><div class='add'>+</div><div class='add'>+	init_timer(&amp;hw-&gt;reqtimer);</div><div class='add'>+	hw-&gt;reqtimer.function = hfa384x_usbctlx_reqtimerfn;</div><div class='add'>+	hw-&gt;reqtimer.data = (unsigned long)hw;</div><div class='add'>+</div><div class='add'>+	usb_init_urb(&amp;hw-&gt;rx_urb);</div><div class='add'>+	usb_init_urb(&amp;hw-&gt;tx_urb);</div><div class='add'>+	usb_init_urb(&amp;hw-&gt;ctlx_urb);</div><div class='add'>+</div><div class='add'>+	hw-&gt;link_status = HFA384x_LINK_NOTCONNECTED;</div><div class='add'>+	hw-&gt;state = HFA384x_STATE_INIT;</div><div class='add'>+</div><div class='add'>+        INIT_WORK2(&amp;hw-&gt;commsqual_bh, prism2sta_commsqual_defer);</div><div class='add'>+	init_timer(&amp;hw-&gt;commsqual_timer);</div><div class='add'>+	hw-&gt;commsqual_timer.data = (unsigned long) hw;</div><div class='add'>+	hw-&gt;commsqual_timer.function = prism2sta_commsqual_timer;</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_destroy</div><div class='add'>+*</div><div class='add'>+* Partner to hfa384x_create().  This function cleans up the hw</div><div class='add'>+* structure so that it can be freed by the caller using a simple</div><div class='add'>+* kfree.  Currently, this function is just a placeholder.  If, at some</div><div class='add'>+* point in the future, an hw in the 'shutdown' state requires a 'deep'</div><div class='add'>+* kfree, this is where it should be done.  Note that if this function</div><div class='add'>+* is called on a _running_ hw structure, the drvr_stop() function is</div><div class='add'>+* called.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw		device structure</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	nothing, this function is not allowed to fail.</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+void</div><div class='add'>+hfa384x_destroy( hfa384x_t *hw)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	if ( hw-&gt;state == HFA384x_STATE_RUNNING ) {</div><div class='add'>+		hfa384x_drvr_stop(hw);</div><div class='add'>+	}</div><div class='add'>+	hw-&gt;state = HFA384x_STATE_PREINIT;</div><div class='add'>+</div><div class='add'>+	if (hw-&gt;scanresults) {</div><div class='add'>+		kfree(hw-&gt;scanresults);</div><div class='add'>+		hw-&gt;scanresults = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Now to clean out the auth queue */</div><div class='add'>+        while ( (skb = skb_dequeue(&amp;hw-&gt;authq)) ) {</div><div class='add'>+                dev_kfree_skb(skb);</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+ */</div><div class='add'>+static hfa384x_usbctlx_t* usbctlx_alloc(void)</div><div class='add'>+{</div><div class='add'>+	hfa384x_usbctlx_t *ctlx;</div><div class='add'>+</div><div class='add'>+	ctlx = kmalloc(sizeof(*ctlx), in_interrupt() ? GFP_ATOMIC : GFP_KERNEL);</div><div class='add'>+	if (ctlx != NULL)</div><div class='add'>+	{</div><div class='add'>+		memset(ctlx, 0, sizeof(*ctlx));</div><div class='add'>+		init_completion(&amp;ctlx-&gt;done);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ctlx;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+ *</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+static int</div><div class='add'>+usbctlx_get_status(const hfa384x_usb_cmdresp_t *cmdresp,</div><div class='add'>+                   hfa384x_cmdresult_t *result)</div><div class='add'>+{</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	result-&gt;status = hfa384x2host_16(cmdresp-&gt;status);</div><div class='add'>+	result-&gt;resp0 = hfa384x2host_16(cmdresp-&gt;resp0);</div><div class='add'>+	result-&gt;resp1 = hfa384x2host_16(cmdresp-&gt;resp1);</div><div class='add'>+	result-&gt;resp2 = hfa384x2host_16(cmdresp-&gt;resp2);</div><div class='add'>+</div><div class='add'>+	WLAN_LOG_DEBUG(4, "cmdresult:status=0x%04x "</div><div class='add'>+	                  "resp0=0x%04x resp1=0x%04x resp2=0x%04x\n",</div><div class='add'>+	                result-&gt;status,</div><div class='add'>+	                result-&gt;resp0,</div><div class='add'>+	                result-&gt;resp1,</div><div class='add'>+	                result-&gt;resp2);</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return (result-&gt;status &amp; HFA384x_STATUS_RESULT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+usbctlx_get_rridresult(const hfa384x_usb_rridresp_t *rridresp,</div><div class='add'>+                       hfa384x_rridresult_t *result)</div><div class='add'>+{</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	result-&gt;rid = hfa384x2host_16(rridresp-&gt;rid);</div><div class='add'>+	result-&gt;riddata = rridresp-&gt;data;</div><div class='add'>+	result-&gt;riddata_len = ((hfa384x2host_16(rridresp-&gt;frmlen) - 1) * 2);</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* Completor object:</div><div class='add'>+* This completor must be passed to hfa384x_usbctlx_complete_sync()</div><div class='add'>+* when processing a CTLX that returns a hfa384x_cmdresult_t structure.</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+struct usbctlx_cmd_completor</div><div class='add'>+{</div><div class='add'>+	usbctlx_completor_t	head;</div><div class='add'>+</div><div class='add'>+	const hfa384x_usb_cmdresp_t	*cmdresp;</div><div class='add'>+	hfa384x_cmdresult_t	*result;</div><div class='add'>+};</div><div class='add'>+typedef struct usbctlx_cmd_completor usbctlx_cmd_completor_t;</div><div class='add'>+</div><div class='add'>+static int usbctlx_cmd_completor_fn(usbctlx_completor_t *head)</div><div class='add'>+{</div><div class='add'>+	usbctlx_cmd_completor_t *complete = (usbctlx_cmd_completor_t*)head;</div><div class='add'>+	return usbctlx_get_status(complete-&gt;cmdresp, complete-&gt;result);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline usbctlx_completor_t*</div><div class='add'>+init_cmd_completor(usbctlx_cmd_completor_t *completor,</div><div class='add'>+                   const hfa384x_usb_cmdresp_t *cmdresp,</div><div class='add'>+                   hfa384x_cmdresult_t *result)</div><div class='add'>+{</div><div class='add'>+	completor-&gt;head.complete = usbctlx_cmd_completor_fn;</div><div class='add'>+	completor-&gt;cmdresp = cmdresp;</div><div class='add'>+	completor-&gt;result = result;</div><div class='add'>+	return &amp;(completor-&gt;head);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* Completor object:</div><div class='add'>+* This completor must be passed to hfa384x_usbctlx_complete_sync()</div><div class='add'>+* when processing a CTLX that reads a RID.</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+struct usbctlx_rrid_completor</div><div class='add'>+{</div><div class='add'>+	usbctlx_completor_t	head;</div><div class='add'>+</div><div class='add'>+	const hfa384x_usb_rridresp_t	*rridresp;</div><div class='add'>+	void			*riddata;</div><div class='add'>+	UINT			riddatalen;</div><div class='add'>+};</div><div class='add'>+typedef struct usbctlx_rrid_completor usbctlx_rrid_completor_t;</div><div class='add'>+</div><div class='add'>+static int usbctlx_rrid_completor_fn(usbctlx_completor_t *head)</div><div class='add'>+{</div><div class='add'>+	usbctlx_rrid_completor_t *complete = (usbctlx_rrid_completor_t*)head;</div><div class='add'>+	hfa384x_rridresult_t rridresult;</div><div class='add'>+</div><div class='add'>+	usbctlx_get_rridresult(complete-&gt;rridresp, &amp;rridresult);</div><div class='add'>+</div><div class='add'>+	/* Validate the length, note body len calculation in bytes */</div><div class='add'>+	if ( rridresult.riddata_len != complete-&gt;riddatalen ) {</div><div class='add'>+		WLAN_LOG_WARNING(</div><div class='add'>+			"RID len mismatch, rid=0x%04x hlen=%d fwlen=%d\n",</div><div class='add'>+		        rridresult.rid,</div><div class='add'>+		        complete-&gt;riddatalen,</div><div class='add'>+		        rridresult.riddata_len);</div><div class='add'>+		return -ENODATA;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(complete-&gt;riddata,</div><div class='add'>+	       rridresult.riddata,</div><div class='add'>+	       complete-&gt;riddatalen);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline usbctlx_completor_t*</div><div class='add'>+init_rrid_completor(usbctlx_rrid_completor_t *completor,</div><div class='add'>+                    const hfa384x_usb_rridresp_t *rridresp,</div><div class='add'>+                    void *riddata,</div><div class='add'>+                    UINT riddatalen)</div><div class='add'>+{</div><div class='add'>+	completor-&gt;head.complete = usbctlx_rrid_completor_fn;</div><div class='add'>+	completor-&gt;rridresp = rridresp;</div><div class='add'>+	completor-&gt;riddata = riddata;</div><div class='add'>+	completor-&gt;riddatalen = riddatalen;</div><div class='add'>+	return &amp;(completor-&gt;head);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* Completor object:</div><div class='add'>+* Interprets the results of a synchronous RID-write</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+typedef usbctlx_cmd_completor_t usbctlx_wrid_completor_t;</div><div class='add'>+#define init_wrid_completor  init_cmd_completor</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* Completor object:</div><div class='add'>+* Interprets the results of a synchronous memory-write</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+typedef usbctlx_cmd_completor_t usbctlx_wmem_completor_t;</div><div class='add'>+#define init_wmem_completor  init_cmd_completor</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* Completor object:</div><div class='add'>+* Interprets the results of a synchronous memory-read</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+struct usbctlx_rmem_completor</div><div class='add'>+{</div><div class='add'>+        usbctlx_completor_t           head;</div><div class='add'>+</div><div class='add'>+        const hfa384x_usb_rmemresp_t  *rmemresp;</div><div class='add'>+        void                          *data;</div><div class='add'>+        UINT                          len;</div><div class='add'>+};</div><div class='add'>+typedef struct usbctlx_rmem_completor usbctlx_rmem_completor_t;</div><div class='add'>+</div><div class='add'>+static int usbctlx_rmem_completor_fn(usbctlx_completor_t *head)</div><div class='add'>+{</div><div class='add'>+	usbctlx_rmem_completor_t *complete = (usbctlx_rmem_completor_t*)head;</div><div class='add'>+</div><div class='add'>+	WLAN_LOG_DEBUG(4,"rmemresp:len=%d\n", complete-&gt;rmemresp-&gt;frmlen);</div><div class='add'>+	memcpy(complete-&gt;data, complete-&gt;rmemresp-&gt;data, complete-&gt;len);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline usbctlx_completor_t*</div><div class='add'>+init_rmem_completor(usbctlx_rmem_completor_t *completor,</div><div class='add'>+                    hfa384x_usb_rmemresp_t *rmemresp,</div><div class='add'>+                    void *data,</div><div class='add'>+                    UINT len)</div><div class='add'>+{</div><div class='add'>+	completor-&gt;head.complete = usbctlx_rmem_completor_fn;</div><div class='add'>+	completor-&gt;rmemresp = rmemresp;</div><div class='add'>+	completor-&gt;data = data;</div><div class='add'>+	completor-&gt;len = len;</div><div class='add'>+	return &amp;(completor-&gt;head);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_cb_status</div><div class='add'>+*</div><div class='add'>+* Ctlx_complete handler for async CMD type control exchanges.</div><div class='add'>+* mark the hw struct as such.</div><div class='add'>+*</div><div class='add'>+* Note: If the handling is changed here, it should probably be</div><div class='add'>+*       changed in docmd as well.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw		hw struct</div><div class='add'>+*	ctlx		completed CTLX</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	nothing</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	interrupt</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+static void</div><div class='add'>+hfa384x_cb_status(hfa384x_t *hw, const hfa384x_usbctlx_t *ctlx)</div><div class='add'>+{</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	if ( ctlx-&gt;usercb != NULL ) {</div><div class='add'>+		hfa384x_cmdresult_t cmdresult;</div><div class='add'>+</div><div class='add'>+		if (ctlx-&gt;state != CTLX_COMPLETE) {</div><div class='add'>+			memset(&amp;cmdresult, 0, sizeof(cmdresult));</div><div class='add'>+			cmdresult.status = HFA384x_STATUS_RESULT_SET(HFA384x_CMD_ERR);</div><div class='add'>+		} else {</div><div class='add'>+			usbctlx_get_status(&amp;ctlx-&gt;inbuf.cmdresp, &amp;cmdresult);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ctlx-&gt;usercb(hw, &amp;cmdresult, ctlx-&gt;usercb_data);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_cb_rrid</div><div class='add'>+*</div><div class='add'>+* CTLX completion handler for async RRID type control exchanges.</div><div class='add'>+*</div><div class='add'>+* Note: If the handling is changed here, it should probably be</div><div class='add'>+*       changed in dorrid as well.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw		hw struct</div><div class='add'>+*	ctlx		completed CTLX</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	nothing</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	interrupt</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+static void</div><div class='add'>+hfa384x_cb_rrid(hfa384x_t *hw, const hfa384x_usbctlx_t *ctlx)</div><div class='add'>+{</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	if ( ctlx-&gt;usercb != NULL ) {</div><div class='add'>+		hfa384x_rridresult_t rridresult;</div><div class='add'>+</div><div class='add'>+		if (ctlx-&gt;state != CTLX_COMPLETE) {</div><div class='add'>+			memset(&amp;rridresult, 0, sizeof(rridresult));</div><div class='add'>+			rridresult.rid = hfa384x2host_16(ctlx-&gt;outbuf.rridreq.rid);</div><div class='add'>+		} else {</div><div class='add'>+			usbctlx_get_rridresult(&amp;ctlx-&gt;inbuf.rridresp, &amp;rridresult);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ctlx-&gt;usercb(hw, &amp;rridresult, ctlx-&gt;usercb_data);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+hfa384x_docmd_wait(hfa384x_t *hw, hfa384x_metacmd_t *cmd)</div><div class='add'>+{</div><div class='add'>+	return hfa384x_docmd(hw, DOWAIT, cmd, NULL, NULL, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+hfa384x_docmd_async(hfa384x_t *hw,</div><div class='add'>+                    hfa384x_metacmd_t *cmd,</div><div class='add'>+                    ctlx_cmdcb_t cmdcb,</div><div class='add'>+                    ctlx_usercb_t usercb,</div><div class='add'>+                    void *usercb_data)</div><div class='add'>+{</div><div class='add'>+	return hfa384x_docmd(hw, DOASYNC, cmd,</div><div class='add'>+	                        cmdcb, usercb, usercb_data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+hfa384x_dorrid_wait(hfa384x_t *hw, UINT16 rid, void *riddata, UINT riddatalen)</div><div class='add'>+{</div><div class='add'>+	return hfa384x_dorrid(hw, DOWAIT,</div><div class='add'>+	                      rid, riddata, riddatalen,</div><div class='add'>+	                      NULL, NULL, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+hfa384x_dorrid_async(hfa384x_t *hw,</div><div class='add'>+                     UINT16 rid, void *riddata, UINT riddatalen,</div><div class='add'>+                     ctlx_cmdcb_t cmdcb,</div><div class='add'>+                     ctlx_usercb_t usercb,</div><div class='add'>+                     void *usercb_data)</div><div class='add'>+{</div><div class='add'>+	return hfa384x_dorrid(hw, DOASYNC,</div><div class='add'>+	                      rid, riddata, riddatalen,</div><div class='add'>+	                      cmdcb, usercb, usercb_data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+hfa384x_dowrid_wait(hfa384x_t *hw, UINT16 rid, void *riddata, UINT riddatalen)</div><div class='add'>+{</div><div class='add'>+	return hfa384x_dowrid(hw, DOWAIT,</div><div class='add'>+	                      rid, riddata, riddatalen,</div><div class='add'>+	                      NULL, NULL, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+hfa384x_dowrid_async(hfa384x_t *hw,</div><div class='add'>+                     UINT16 rid, void *riddata, UINT riddatalen,</div><div class='add'>+                     ctlx_cmdcb_t cmdcb,</div><div class='add'>+                     ctlx_usercb_t usercb,</div><div class='add'>+                     void *usercb_data)</div><div class='add'>+{</div><div class='add'>+	return hfa384x_dowrid(hw, DOASYNC,</div><div class='add'>+	                      rid, riddata, riddatalen,</div><div class='add'>+	                      cmdcb, usercb, usercb_data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+hfa384x_dormem_wait(hfa384x_t *hw,</div><div class='add'>+                    UINT16 page, UINT16 offset, void *data, UINT len)</div><div class='add'>+{</div><div class='add'>+	return hfa384x_dormem(hw, DOWAIT,</div><div class='add'>+	                      page, offset, data, len,</div><div class='add'>+	                      NULL, NULL, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+hfa384x_dormem_async(hfa384x_t *hw,</div><div class='add'>+                     UINT16 page, UINT16 offset, void *data, UINT len,</div><div class='add'>+                     ctlx_cmdcb_t cmdcb,</div><div class='add'>+                     ctlx_usercb_t usercb,</div><div class='add'>+                     void *usercb_data)</div><div class='add'>+{</div><div class='add'>+	return hfa384x_dormem(hw, DOASYNC,</div><div class='add'>+	                      page, offset, data, len,</div><div class='add'>+	                      cmdcb, usercb, usercb_data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+hfa384x_dowmem_wait(</div><div class='add'>+        hfa384x_t *hw,</div><div class='add'>+        UINT16  page,</div><div class='add'>+        UINT16  offset,</div><div class='add'>+        void    *data,</div><div class='add'>+        UINT    len)</div><div class='add'>+{</div><div class='add'>+	return hfa384x_dowmem(hw, DOWAIT,</div><div class='add'>+                                  page, offset, data, len,</div><div class='add'>+	                          NULL, NULL, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+hfa384x_dowmem_async(</div><div class='add'>+        hfa384x_t *hw,</div><div class='add'>+        UINT16  page,</div><div class='add'>+        UINT16  offset,</div><div class='add'>+        void    *data,</div><div class='add'>+        UINT    len,</div><div class='add'>+        ctlx_cmdcb_t cmdcb,</div><div class='add'>+        ctlx_usercb_t usercb,</div><div class='add'>+        void    *usercb_data)</div><div class='add'>+{</div><div class='add'>+	return hfa384x_dowmem(hw, DOASYNC,</div><div class='add'>+                                  page, offset, data, len,</div><div class='add'>+	                          cmdcb, usercb, usercb_data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_cmd_initialize</div><div class='add'>+*</div><div class='add'>+* Issues the initialize command and sets the hw-&gt;state based</div><div class='add'>+* on the result.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw		device structure</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0		success</div><div class='add'>+*	&gt;0		f/w reported error - f/w status code</div><div class='add'>+*	&lt;0		driver reported error</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int</div><div class='add'>+hfa384x_cmd_initialize(hfa384x_t *hw)</div><div class='add'>+{</div><div class='add'>+	int	result = 0;</div><div class='add'>+	int	i;</div><div class='add'>+	hfa384x_metacmd_t cmd;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	cmd.cmd = HFA384x_CMDCODE_INIT;</div><div class='add'>+	cmd.parm0 = 0;</div><div class='add'>+	cmd.parm1 = 0;</div><div class='add'>+	cmd.parm2 = 0;</div><div class='add'>+</div><div class='add'>+	result = hfa384x_docmd_wait(hw, &amp;cmd);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	WLAN_LOG_DEBUG(3,"cmdresp.init: "</div><div class='add'>+		"status=0x%04x, resp0=0x%04x, "</div><div class='add'>+		"resp1=0x%04x, resp2=0x%04x\n",</div><div class='add'>+		cmd.result.status,</div><div class='add'>+		cmd.result.resp0,</div><div class='add'>+		cmd.result.resp1,</div><div class='add'>+		cmd.result.resp2);</div><div class='add'>+	if ( result == 0 ) {</div><div class='add'>+		for ( i = 0; i &lt; HFA384x_NUMPORTS_MAX; i++) {</div><div class='add'>+			hw-&gt;port_enabled[i] = 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+        hw-&gt;link_status = HFA384x_LINK_NOTCONNECTED;</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_cmd_disable</div><div class='add'>+*</div><div class='add'>+* Issues the disable command to stop communications on one of</div><div class='add'>+* the MACs 'ports'.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw		device structure</div><div class='add'>+*	macport		MAC port number (host order)</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0		success</div><div class='add'>+*	&gt;0		f/w reported failure - f/w status code</div><div class='add'>+*	&lt;0		driver reported error (timeout|bad arg)</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int hfa384x_cmd_disable(hfa384x_t *hw, UINT16 macport)</div><div class='add'>+{</div><div class='add'>+	int	result = 0;</div><div class='add'>+	hfa384x_metacmd_t cmd;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	cmd.cmd = HFA384x_CMD_CMDCODE_SET(HFA384x_CMDCODE_DISABLE) |</div><div class='add'>+		  HFA384x_CMD_MACPORT_SET(macport);</div><div class='add'>+	cmd.parm0 = 0;</div><div class='add'>+	cmd.parm1 = 0;</div><div class='add'>+	cmd.parm2 = 0;</div><div class='add'>+</div><div class='add'>+	result = hfa384x_docmd_wait(hw, &amp;cmd);</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_cmd_enable</div><div class='add'>+*</div><div class='add'>+* Issues the enable command to enable communications on one of</div><div class='add'>+* the MACs 'ports'.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw		device structure</div><div class='add'>+*	macport		MAC port number</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0		success</div><div class='add'>+*	&gt;0		f/w reported failure - f/w status code</div><div class='add'>+*	&lt;0		driver reported error (timeout|bad arg)</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int hfa384x_cmd_enable(hfa384x_t *hw, UINT16 macport)</div><div class='add'>+{</div><div class='add'>+	int	result = 0;</div><div class='add'>+	hfa384x_metacmd_t cmd;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	cmd.cmd = HFA384x_CMD_CMDCODE_SET(HFA384x_CMDCODE_ENABLE) |</div><div class='add'>+		  HFA384x_CMD_MACPORT_SET(macport);</div><div class='add'>+	cmd.parm0 = 0;</div><div class='add'>+	cmd.parm1 = 0;</div><div class='add'>+	cmd.parm2 = 0;</div><div class='add'>+</div><div class='add'>+	result = hfa384x_docmd_wait(hw, &amp;cmd);</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_cmd_notify</div><div class='add'>+*</div><div class='add'>+* Sends an info frame to the firmware to alter the behavior</div><div class='add'>+* of the f/w asynch processes.  Can only be called when the MAC</div><div class='add'>+* is in the enabled state.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw		device structure</div><div class='add'>+*	reclaim		[0|1] indicates whether the given FID will</div><div class='add'>+*			be handed back (via Alloc event) for reuse.</div><div class='add'>+*			(host order)</div><div class='add'>+*	fid		FID of buffer containing the frame that was</div><div class='add'>+*			previously copied to MAC memory via the bap.</div><div class='add'>+*			(host order)</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0		success</div><div class='add'>+*	&gt;0		f/w reported failure - f/w status code</div><div class='add'>+*	&lt;0		driver reported error (timeout|bad arg)</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*	hw-&gt;resp0 will contain the FID being used by async notify</div><div class='add'>+*	process.  If reclaim==0, resp0 will be the same as the fid</div><div class='add'>+*	argument.  If reclaim==1, resp0 will be the different.</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int hfa384x_cmd_notify(hfa384x_t *hw, UINT16 reclaim, UINT16 fid,</div><div class='add'>+		       void *buf, UINT16 len)</div><div class='add'>+{</div><div class='add'>+#if 0</div><div class='add'>+	int	result = 0;</div><div class='add'>+	UINT16	cmd;</div><div class='add'>+	DBFENTER;</div><div class='add'>+	cmd =	HFA384x_CMD_CMDCODE_SET(HFA384x_CMDCODE_NOTIFY) |</div><div class='add'>+		HFA384x_CMD_RECL_SET(reclaim);</div><div class='add'>+	result = hfa384x_docmd_wait(hw, cmd);</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+#endif</div><div class='add'>+return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#if 0</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_cmd_inquiry</div><div class='add'>+*</div><div class='add'>+* Requests an info frame from the firmware.  The info frame will</div><div class='add'>+* be delivered asynchronously via the Info event.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw		device structure</div><div class='add'>+*	fid		FID of the info frame requested. (host order)</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0		success</div><div class='add'>+*	&gt;0		f/w reported failure - f/w status code</div><div class='add'>+*	&lt;0		driver reported error (timeout|bad arg)</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int hfa384x_cmd_inquiry(hfa384x_t *hw, UINT16 fid)</div><div class='add'>+{</div><div class='add'>+	int	result = 0;</div><div class='add'>+	hfa384x_metacmd_t cmd;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	cmd.cmd = HFA384x_CMD_CMDCODE_SET(HFA384x_CMDCODE_INQ);</div><div class='add'>+	cmd.parm0 = 0;</div><div class='add'>+	cmd.parm1 = 0;</div><div class='add'>+	cmd.parm2 = 0;</div><div class='add'>+</div><div class='add'>+	result = hfa384x_docmd_wait(hw, &amp;cmd);</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_cmd_monitor</div><div class='add'>+*</div><div class='add'>+* Enables the 'monitor mode' of the MAC.  Here's the description of</div><div class='add'>+* monitor mode that I've received thus far:</div><div class='add'>+*</div><div class='add'>+*  "The "monitor mode" of operation is that the MAC passes all</div><div class='add'>+*  frames for which the PLCP checks are correct. All received</div><div class='add'>+*  MPDUs are passed to the host with MAC Port = 7, with a</div><div class='add'>+*  receive status of good, FCS error, or undecryptable. Passing</div><div class='add'>+*  certain MPDUs is a violation of the 802.11 standard, but useful</div><div class='add'>+*  for a debugging tool."  Normal communication is not possible</div><div class='add'>+*  while monitor mode is enabled.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw		device structure</div><div class='add'>+*	enable		a code (0x0b|0x0f) that enables/disables</div><div class='add'>+*			monitor mode. (host order)</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0		success</div><div class='add'>+*	&gt;0		f/w reported failure - f/w status code</div><div class='add'>+*	&lt;0		driver reported error (timeout|bad arg)</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int hfa384x_cmd_monitor(hfa384x_t *hw, UINT16 enable)</div><div class='add'>+{</div><div class='add'>+	int	result = 0;</div><div class='add'>+	hfa384x_metacmd_t cmd;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	cmd.cmd = HFA384x_CMD_CMDCODE_SET(HFA384x_CMDCODE_MONITOR) |</div><div class='add'>+		HFA384x_CMD_AINFO_SET(enable);</div><div class='add'>+	cmd.parm0 = 0;</div><div class='add'>+	cmd.parm1 = 0;</div><div class='add'>+	cmd.parm2 = 0;</div><div class='add'>+</div><div class='add'>+	result = hfa384x_docmd_wait(hw, &amp;cmd);</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_cmd_download</div><div class='add'>+*</div><div class='add'>+* Sets the controls for the MAC controller code/data download</div><div class='add'>+* process.  The arguments set the mode and address associated</div><div class='add'>+* with a download.  Note that the aux registers should be enabled</div><div class='add'>+* prior to setting one of the download enable modes.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw		device structure</div><div class='add'>+*	mode		0 - Disable programming and begin code exec</div><div class='add'>+*			1 - Enable volatile mem programming</div><div class='add'>+*			2 - Enable non-volatile mem programming</div><div class='add'>+*			3 - Program non-volatile section from NV download</div><div class='add'>+*			    buffer.</div><div class='add'>+*			(host order)</div><div class='add'>+*	lowaddr</div><div class='add'>+*	highaddr	For mode 1, sets the high &amp; low order bits of</div><div class='add'>+*			the "destination address".  This address will be</div><div class='add'>+*			the execution start address when download is</div><div class='add'>+*			subsequently disabled.</div><div class='add'>+*			For mode 2, sets the high &amp; low order bits of</div><div class='add'>+*			the destination in NV ram.</div><div class='add'>+*			For modes 0 &amp; 3, should be zero. (host order)</div><div class='add'>+*			NOTE: these are CMD format.</div><div class='add'>+*	codelen		Length of the data to write in mode 2,</div><div class='add'>+*			zero otherwise. (host order)</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0		success</div><div class='add'>+*	&gt;0		f/w reported failure - f/w status code</div><div class='add'>+*	&lt;0		driver reported error (timeout|bad arg)</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int hfa384x_cmd_download(hfa384x_t *hw, UINT16 mode, UINT16 lowaddr,</div><div class='add'>+				UINT16 highaddr, UINT16 codelen)</div><div class='add'>+{</div><div class='add'>+	int	result = 0;</div><div class='add'>+	hfa384x_metacmd_t cmd;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+	WLAN_LOG_DEBUG(5,</div><div class='add'>+		"mode=%d, lowaddr=0x%04x, highaddr=0x%04x, codelen=%d\n",</div><div class='add'>+		mode, lowaddr, highaddr, codelen);</div><div class='add'>+</div><div class='add'>+	cmd.cmd = (HFA384x_CMD_CMDCODE_SET(HFA384x_CMDCODE_DOWNLD) |</div><div class='add'>+		   HFA384x_CMD_PROGMODE_SET(mode));</div><div class='add'>+</div><div class='add'>+	cmd.parm0 = lowaddr;</div><div class='add'>+	cmd.parm1 = highaddr;</div><div class='add'>+	cmd.parm2 = codelen;</div><div class='add'>+</div><div class='add'>+	result = hfa384x_docmd_wait(hw, &amp;cmd);</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_copy_from_aux</div><div class='add'>+*</div><div class='add'>+* Copies a collection of bytes from the controller memory.  The</div><div class='add'>+* Auxiliary port MUST be enabled prior to calling this function.</div><div class='add'>+* We _might_ be in a download state.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw		device structure</div><div class='add'>+*	cardaddr	address in hfa384x data space to read</div><div class='add'>+*	auxctl		address space select</div><div class='add'>+*	buf		ptr to destination host buffer</div><div class='add'>+*	len		length of data to transfer (in bytes)</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	nothing</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*	buf contains the data copied</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process</div><div class='add'>+*	interrupt</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+void</div><div class='add'>+hfa384x_copy_from_aux(</div><div class='add'>+	hfa384x_t *hw, UINT32 cardaddr, UINT32 auxctl, void *buf, UINT len)</div><div class='add'>+{</div><div class='add'>+	DBFENTER;</div><div class='add'>+	WLAN_LOG_ERROR("not used in USB.\n");</div><div class='add'>+	DBFEXIT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_copy_to_aux</div><div class='add'>+*</div><div class='add'>+* Copies a collection of bytes to the controller memory.  The</div><div class='add'>+* Auxiliary port MUST be enabled prior to calling this function.</div><div class='add'>+* We _might_ be in a download state.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw		device structure</div><div class='add'>+*	cardaddr	address in hfa384x data space to read</div><div class='add'>+*	auxctl		address space select</div><div class='add'>+*	buf		ptr to destination host buffer</div><div class='add'>+*	len		length of data to transfer (in bytes)</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	nothing</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*	Controller memory now contains a copy of buf</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process</div><div class='add'>+*	interrupt</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+void</div><div class='add'>+hfa384x_copy_to_aux(</div><div class='add'>+	hfa384x_t *hw, UINT32 cardaddr, UINT32 auxctl, void *buf, UINT len)</div><div class='add'>+{</div><div class='add'>+	DBFENTER;</div><div class='add'>+	WLAN_LOG_ERROR("not used in USB.\n");</div><div class='add'>+	DBFEXIT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_corereset</div><div class='add'>+*</div><div class='add'>+* Perform a reset of the hfa38xx MAC core.  We assume that the hw</div><div class='add'>+* structure is in its "created" state.  That is, it is initialized</div><div class='add'>+* with proper values.  Note that if a reset is done after the</div><div class='add'>+* device has been active for awhile, the caller might have to clean</div><div class='add'>+* up some leftover cruft in the hw structure.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw		device structure</div><div class='add'>+*	holdtime	how long (in ms) to hold the reset</div><div class='add'>+*	settletime	how long (in ms) to wait after releasing</div><div class='add'>+*			the reset</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	nothing</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int hfa384x_corereset(hfa384x_t *hw, int holdtime, int settletime, int genesis)</div><div class='add'>+{</div><div class='add'>+#if 0</div><div class='add'>+#if (LINUX_VERSION_CODE &lt; KERNEL_VERSION(2,5,0))</div><div class='add'>+	struct usb_device	*parent = hw-&gt;usb-&gt;parent;</div><div class='add'>+	int			i;</div><div class='add'>+	int			port = -1;</div><div class='add'>+#endif</div><div class='add'>+#endif</div><div class='add'>+	int 			result = 0;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define P2_USB_RT_PORT		(USB_TYPE_CLASS | USB_RECIP_OTHER)</div><div class='add'>+#define P2_USB_FEAT_RESET	4</div><div class='add'>+#define P2_USB_FEAT_C_RESET	20</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+#if 0</div><div class='add'>+#if (LINUX_VERSION_CODE &lt; KERNEL_VERSION(2,5,0))</div><div class='add'>+	/* Find the hub port */</div><div class='add'>+	for ( i = 0; i &lt; parent-&gt;maxchild; i++) {</div><div class='add'>+		if (parent-&gt;children[i] == hw-&gt;usb) {</div><div class='add'>+			port = i;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (port &lt; 0) return -ENOENT;</div><div class='add'>+</div><div class='add'>+	/* Set and clear the reset */</div><div class='add'>+	usb_control_msg(parent, usb_sndctrlpipe(parent, 0),</div><div class='add'>+		USB_REQ_SET_FEATURE, P2_USB_RT_PORT, P2_USB_FEAT_RESET,</div><div class='add'>+		port+1, NULL, 0, 1*HZ);</div><div class='add'>+	wait_ms(holdtime);</div><div class='add'>+	usb_control_msg(parent, usb_sndctrlpipe(parent, 0),</div><div class='add'>+		USB_REQ_CLEAR_FEATURE, P2_USB_RT_PORT, P2_USB_FEAT_C_RESET,</div><div class='add'>+		port+1, NULL, 0, 1*HZ);</div><div class='add'>+	wait_ms(settletime);</div><div class='add'>+</div><div class='add'>+	/* Set the device address */</div><div class='add'>+	result=usb_set_address(hw-&gt;usb);</div><div class='add'>+	if (result &lt; 0) {</div><div class='add'>+		WLAN_LOG_ERROR("reset_usbdev: Dev not accepting address, "</div><div class='add'>+			"result=%d\n", result);</div><div class='add'>+		clear_bit(hw-&gt;usb-&gt;devnum, &amp;hw-&gt;usb-&gt;bus-&gt;devmap.devicemap);</div><div class='add'>+		hw-&gt;usb-&gt;devnum = -1;</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+	/* Let the address settle */</div><div class='add'>+	wait_ms(20);</div><div class='add'>+</div><div class='add'>+	/* Assume we're reusing the original descriptor data */</div><div class='add'>+</div><div class='add'>+	/* Set the configuration. */</div><div class='add'>+	WLAN_LOG_DEBUG(3, "Setting Configuration %d\n",</div><div class='add'>+		hw-&gt;usb-&gt;config[0].bConfigurationValue);</div><div class='add'>+	result=usb_set_configuration(hw-&gt;usb, hw-&gt;usb-&gt;config[0].bConfigurationValue);</div><div class='add'>+	if ( result ) {</div><div class='add'>+		WLAN_LOG_ERROR("usb_set_configuration() failed, result=%d.\n",</div><div class='add'>+				result);</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+	/* Let the configuration settle */</div><div class='add'>+	wait_ms(20);</div><div class='add'>+</div><div class='add'>+ done:</div><div class='add'>+#else</div><div class='add'>+	result=usb_reset_device(hw-&gt;usb);</div><div class='add'>+	if(result&lt;0) {</div><div class='add'>+		WLAN_LOG_ERROR("usb_reset_device() failed, result=%d.\n",result);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	result=usb_reset_device(hw-&gt;usb);</div><div class='add'>+	if(result&lt;0) {</div><div class='add'>+		WLAN_LOG_ERROR("usb_reset_device() failed, result=%d.\n",result);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_usbctlx_complete_sync</div><div class='add'>+*</div><div class='add'>+* Waits for a synchronous CTLX object to complete,</div><div class='add'>+* and then handles the response.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw		device structure</div><div class='add'>+*	ctlx	 	CTLX ptr</div><div class='add'>+*	completor	functor object to decide what to</div><div class='add'>+*			do with the CTLX's result.</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0		Success</div><div class='add'>+*	-ERESTARTSYS	Interrupted by a signal</div><div class='add'>+*	-EIO		CTLX failed</div><div class='add'>+*	-ENODEV		Adapter was unplugged</div><div class='add'>+*	???		Result from completor</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+static int hfa384x_usbctlx_complete_sync(hfa384x_t *hw,</div><div class='add'>+					 hfa384x_usbctlx_t *ctlx,</div><div class='add'>+					 usbctlx_completor_t *completor)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int result;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	result = wait_for_completion_interruptible(&amp;ctlx-&gt;done);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;hw-&gt;ctlxq.lock, flags);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We can only handle the CTLX if the USB disconnect</div><div class='add'>+	 * function has not run yet ...</div><div class='add'>+	 */</div><div class='add'>+	cleanup:</div><div class='add'>+	if ( hw-&gt;wlandev-&gt;hwremoved )</div><div class='add'>+	{</div><div class='add'>+		spin_unlock_irqrestore(&amp;hw-&gt;ctlxq.lock, flags);</div><div class='add'>+		result = -ENODEV;</div><div class='add'>+	}</div><div class='add'>+	else if ( result != 0 )</div><div class='add'>+	{</div><div class='add'>+		int runqueue = 0;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * We were probably interrupted, so delete</div><div class='add'>+		 * this CTLX asynchronously, kill the timers</div><div class='add'>+		 * and the URB, and then start the next</div><div class='add'>+		 * pending CTLX.</div><div class='add'>+		 *</div><div class='add'>+		 * NOTE: We can only delete the timers and</div><div class='add'>+		 *       the URB if this CTLX is active.</div><div class='add'>+		 */</div><div class='add'>+		if (ctlx == get_active_ctlx(hw))</div><div class='add'>+		{</div><div class='add'>+			spin_unlock_irqrestore(&amp;hw-&gt;ctlxq.lock, flags);</div><div class='add'>+</div><div class='add'>+			del_singleshot_timer_sync(&amp;hw-&gt;reqtimer);</div><div class='add'>+			del_singleshot_timer_sync(&amp;hw-&gt;resptimer);</div><div class='add'>+			hw-&gt;req_timer_done = 1;</div><div class='add'>+			hw-&gt;resp_timer_done = 1;</div><div class='add'>+			usb_kill_urb(&amp;hw-&gt;ctlx_urb);</div><div class='add'>+</div><div class='add'>+			spin_lock_irqsave(&amp;hw-&gt;ctlxq.lock, flags);</div><div class='add'>+</div><div class='add'>+			runqueue = 1;</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * This scenario is so unlikely that I'm</div><div class='add'>+			 * happy with a grubby "goto" solution ...</div><div class='add'>+			 */</div><div class='add'>+			if ( hw-&gt;wlandev-&gt;hwremoved )</div><div class='add'>+				goto cleanup;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * The completion task will send this CTLX</div><div class='add'>+		 * to the reaper the next time it runs. We</div><div class='add'>+		 * are no longer in a hurry.</div><div class='add'>+		 */</div><div class='add'>+		ctlx-&gt;reapable = 1;</div><div class='add'>+		ctlx-&gt;state = CTLX_REQ_FAILED;</div><div class='add'>+		list_move_tail(&amp;ctlx-&gt;list, &amp;hw-&gt;ctlxq.completing);</div><div class='add'>+</div><div class='add'>+		spin_unlock_irqrestore(&amp;hw-&gt;ctlxq.lock, flags);</div><div class='add'>+</div><div class='add'>+		if (runqueue)</div><div class='add'>+			hfa384x_usbctlxq_run(hw);</div><div class='add'>+	} else {</div><div class='add'>+		if (ctlx-&gt;state == CTLX_COMPLETE) {</div><div class='add'>+			result = completor-&gt;complete(completor);</div><div class='add'>+		} else {</div><div class='add'>+			WLAN_LOG_WARNING("CTLX[%d] error: state(%s)\n",</div><div class='add'>+			                 hfa384x2host_16(ctlx-&gt;outbuf.type),</div><div class='add'>+			                 ctlxstr(ctlx-&gt;state));</div><div class='add'>+			result = -EIO;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		list_del(&amp;ctlx-&gt;list);</div><div class='add'>+		spin_unlock_irqrestore(&amp;hw-&gt;ctlxq.lock, flags);</div><div class='add'>+		kfree(ctlx);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_docmd</div><div class='add'>+*</div><div class='add'>+* Constructs a command CTLX and submits it.</div><div class='add'>+*</div><div class='add'>+* NOTE: Any changes to the 'post-submit' code in this function</div><div class='add'>+*       need to be carried over to hfa384x_cbcmd() since the handling</div><div class='add'>+*       is virtually identical.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw		device structure</div><div class='add'>+*	mode		DOWAIT or DOASYNC</div><div class='add'>+*       cmd             cmd structure.  Includes all arguments and result</div><div class='add'>+*                       data points.  All in host order. in host order</div><div class='add'>+*	cmdcb		command-specific callback</div><div class='add'>+*	usercb		user callback for async calls, NULL for DOWAIT calls</div><div class='add'>+*	usercb_data	user supplied data pointer for async calls, NULL</div><div class='add'>+*			for DOASYNC calls</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0		success</div><div class='add'>+*	-EIO		CTLX failure</div><div class='add'>+*	-ERESTARTSYS	Awakened on signal</div><div class='add'>+*	&gt;0		command indicated error, Status and Resp0-2 are</div><div class='add'>+*			in hw structure.</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+static int</div><div class='add'>+hfa384x_docmd(</div><div class='add'>+	hfa384x_t *hw,</div><div class='add'>+	CMD_MODE mode,</div><div class='add'>+	hfa384x_metacmd_t *cmd,</div><div class='add'>+	ctlx_cmdcb_t	cmdcb,</div><div class='add'>+	ctlx_usercb_t	usercb,</div><div class='add'>+	void	*usercb_data)</div><div class='add'>+{</div><div class='add'>+	int			result;</div><div class='add'>+	hfa384x_usbctlx_t	*ctlx;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+	ctlx = usbctlx_alloc();</div><div class='add'>+	if ( ctlx == NULL ) {</div><div class='add'>+		result = -ENOMEM;</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Initialize the command */</div><div class='add'>+	ctlx-&gt;outbuf.cmdreq.type = 	host2hfa384x_16(HFA384x_USB_CMDREQ);</div><div class='add'>+	ctlx-&gt;outbuf.cmdreq.cmd =	host2hfa384x_16(cmd-&gt;cmd);</div><div class='add'>+	ctlx-&gt;outbuf.cmdreq.parm0 =	host2hfa384x_16(cmd-&gt;parm0);</div><div class='add'>+	ctlx-&gt;outbuf.cmdreq.parm1 =	host2hfa384x_16(cmd-&gt;parm1);</div><div class='add'>+	ctlx-&gt;outbuf.cmdreq.parm2 =	host2hfa384x_16(cmd-&gt;parm2);</div><div class='add'>+</div><div class='add'>+	ctlx-&gt;outbufsize = sizeof(ctlx-&gt;outbuf.cmdreq);</div><div class='add'>+</div><div class='add'>+	WLAN_LOG_DEBUG(4, "cmdreq: cmd=0x%04x "</div><div class='add'>+		"parm0=0x%04x parm1=0x%04x parm2=0x%04x\n",</div><div class='add'>+		cmd-&gt;cmd,</div><div class='add'>+		cmd-&gt;parm0,</div><div class='add'>+		cmd-&gt;parm1,</div><div class='add'>+		cmd-&gt;parm2);</div><div class='add'>+</div><div class='add'>+	ctlx-&gt;reapable = mode;</div><div class='add'>+	ctlx-&gt;cmdcb = cmdcb;</div><div class='add'>+	ctlx-&gt;usercb = usercb;</div><div class='add'>+	ctlx-&gt;usercb_data = usercb_data;</div><div class='add'>+</div><div class='add'>+	result = hfa384x_usbctlx_submit(hw, ctlx);</div><div class='add'>+	if (result != 0) {</div><div class='add'>+		kfree(ctlx);</div><div class='add'>+	} else if (mode == DOWAIT) {</div><div class='add'>+		usbctlx_cmd_completor_t completor;</div><div class='add'>+</div><div class='add'>+		result = hfa384x_usbctlx_complete_sync(</div><div class='add'>+		             hw, ctlx, init_cmd_completor(&amp;completor,</div><div class='add'>+		                                          &amp;ctlx-&gt;inbuf.cmdresp,</div><div class='add'>+		                                          &amp;cmd-&gt;result) );</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_dorrid</div><div class='add'>+*</div><div class='add'>+* Constructs a read rid CTLX and issues it.</div><div class='add'>+*</div><div class='add'>+* NOTE: Any changes to the 'post-submit' code in this function</div><div class='add'>+*       need to be carried over to hfa384x_cbrrid() since the handling</div><div class='add'>+*       is virtually identical.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw		device structure</div><div class='add'>+*	mode		DOWAIT or DOASYNC</div><div class='add'>+*	rid		Read RID number (host order)</div><div class='add'>+*	riddata		Caller supplied buffer that MAC formatted RID.data</div><div class='add'>+*			record will be written to for DOWAIT calls. Should</div><div class='add'>+*			be NULL for DOASYNC calls.</div><div class='add'>+*	riddatalen	Buffer length for DOWAIT calls. Zero for DOASYNC calls.</div><div class='add'>+*	cmdcb		command callback for async calls, NULL for DOWAIT calls</div><div class='add'>+*	usercb		user callback for async calls, NULL for DOWAIT calls</div><div class='add'>+*	usercb_data	user supplied data pointer for async calls, NULL</div><div class='add'>+*			for DOWAIT calls</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0		success</div><div class='add'>+*	-EIO		CTLX failure</div><div class='add'>+*	-ERESTARTSYS	Awakened on signal</div><div class='add'>+*	-ENODATA	riddatalen != macdatalen</div><div class='add'>+*	&gt;0		command indicated error, Status and Resp0-2 are</div><div class='add'>+*			in hw structure.</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	interrupt (DOASYNC)</div><div class='add'>+*	process (DOWAIT or DOASYNC)</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+static int</div><div class='add'>+hfa384x_dorrid(</div><div class='add'>+	hfa384x_t *hw,</div><div class='add'>+	CMD_MODE mode,</div><div class='add'>+	UINT16	rid,</div><div class='add'>+	void	*riddata,</div><div class='add'>+	UINT	riddatalen,</div><div class='add'>+        ctlx_cmdcb_t cmdcb,</div><div class='add'>+	ctlx_usercb_t usercb,</div><div class='add'>+	void	*usercb_data)</div><div class='add'>+{</div><div class='add'>+	int			result;</div><div class='add'>+	hfa384x_usbctlx_t	*ctlx;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+	ctlx = usbctlx_alloc();</div><div class='add'>+	if ( ctlx == NULL ) {</div><div class='add'>+		result = -ENOMEM;</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Initialize the command */</div><div class='add'>+	ctlx-&gt;outbuf.rridreq.type =   host2hfa384x_16(HFA384x_USB_RRIDREQ);</div><div class='add'>+	ctlx-&gt;outbuf.rridreq.frmlen =</div><div class='add'>+		host2hfa384x_16(sizeof(ctlx-&gt;outbuf.rridreq.rid));</div><div class='add'>+	ctlx-&gt;outbuf.rridreq.rid =    host2hfa384x_16(rid);</div><div class='add'>+</div><div class='add'>+	ctlx-&gt;outbufsize = sizeof(ctlx-&gt;outbuf.rridreq);</div><div class='add'>+</div><div class='add'>+	ctlx-&gt;reapable = mode;</div><div class='add'>+	ctlx-&gt;cmdcb = cmdcb;</div><div class='add'>+	ctlx-&gt;usercb = usercb;</div><div class='add'>+	ctlx-&gt;usercb_data = usercb_data;</div><div class='add'>+</div><div class='add'>+	/* Submit the CTLX */</div><div class='add'>+	result = hfa384x_usbctlx_submit(hw, ctlx);</div><div class='add'>+	if (result != 0) {</div><div class='add'>+		kfree(ctlx);</div><div class='add'>+	} else if (mode == DOWAIT) {</div><div class='add'>+		usbctlx_rrid_completor_t completor;</div><div class='add'>+</div><div class='add'>+		result = hfa384x_usbctlx_complete_sync(</div><div class='add'>+		           hw, ctlx, init_rrid_completor(&amp;completor,</div><div class='add'>+		                                         &amp;ctlx-&gt;inbuf.rridresp,</div><div class='add'>+		                                         riddata,</div><div class='add'>+		                                         riddatalen) );</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_dowrid</div><div class='add'>+*</div><div class='add'>+* Constructs a write rid CTLX and issues it.</div><div class='add'>+*</div><div class='add'>+* NOTE: Any changes to the 'post-submit' code in this function</div><div class='add'>+*       need to be carried over to hfa384x_cbwrid() since the handling</div><div class='add'>+*       is virtually identical.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw		device structure</div><div class='add'>+*	CMD_MODE	DOWAIT or DOASYNC</div><div class='add'>+*	rid		RID code</div><div class='add'>+*	riddata		Data portion of RID formatted for MAC</div><div class='add'>+*	riddatalen	Length of the data portion in bytes</div><div class='add'>+*       cmdcb           command callback for async calls, NULL for DOWAIT calls</div><div class='add'>+*	usercb		user callback for async calls, NULL for DOWAIT calls</div><div class='add'>+*	usercb_data	user supplied data pointer for async calls</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0		success</div><div class='add'>+*	-ETIMEDOUT	timed out waiting for register ready or</div><div class='add'>+*			command completion</div><div class='add'>+*	&gt;0		command indicated error, Status and Resp0-2 are</div><div class='add'>+*			in hw structure.</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	interrupt (DOASYNC)</div><div class='add'>+*	process (DOWAIT or DOASYNC)</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+static int</div><div class='add'>+hfa384x_dowrid(</div><div class='add'>+	hfa384x_t *hw,</div><div class='add'>+	CMD_MODE mode,</div><div class='add'>+	UINT16	rid,</div><div class='add'>+	void	*riddata,</div><div class='add'>+	UINT	riddatalen,</div><div class='add'>+	ctlx_cmdcb_t cmdcb,</div><div class='add'>+	ctlx_usercb_t usercb,</div><div class='add'>+	void	*usercb_data)</div><div class='add'>+{</div><div class='add'>+	int			result;</div><div class='add'>+	hfa384x_usbctlx_t	*ctlx;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+	ctlx = usbctlx_alloc();</div><div class='add'>+	if ( ctlx == NULL ) {</div><div class='add'>+		result = -ENOMEM;</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Initialize the command */</div><div class='add'>+	ctlx-&gt;outbuf.wridreq.type =   host2hfa384x_16(HFA384x_USB_WRIDREQ);</div><div class='add'>+	ctlx-&gt;outbuf.wridreq.frmlen = host2hfa384x_16(</div><div class='add'>+					(sizeof(ctlx-&gt;outbuf.wridreq.rid) +</div><div class='add'>+					riddatalen + 1) / 2);</div><div class='add'>+	ctlx-&gt;outbuf.wridreq.rid =    host2hfa384x_16(rid);</div><div class='add'>+	memcpy(ctlx-&gt;outbuf.wridreq.data, riddata, riddatalen);</div><div class='add'>+</div><div class='add'>+	ctlx-&gt;outbufsize = sizeof(ctlx-&gt;outbuf.wridreq.type) +</div><div class='add'>+	                   sizeof(ctlx-&gt;outbuf.wridreq.frmlen) +</div><div class='add'>+	                   sizeof(ctlx-&gt;outbuf.wridreq.rid) +</div><div class='add'>+	                   riddatalen;</div><div class='add'>+</div><div class='add'>+	ctlx-&gt;reapable = mode;</div><div class='add'>+	ctlx-&gt;cmdcb = cmdcb;</div><div class='add'>+	ctlx-&gt;usercb = usercb;</div><div class='add'>+	ctlx-&gt;usercb_data = usercb_data;</div><div class='add'>+</div><div class='add'>+	/* Submit the CTLX */</div><div class='add'>+	result = hfa384x_usbctlx_submit(hw, ctlx);</div><div class='add'>+	if (result != 0) {</div><div class='add'>+		kfree(ctlx);</div><div class='add'>+	} else if (mode == DOWAIT) {</div><div class='add'>+		usbctlx_wrid_completor_t completor;</div><div class='add'>+		hfa384x_cmdresult_t wridresult;</div><div class='add'>+</div><div class='add'>+		result = hfa384x_usbctlx_complete_sync(</div><div class='add'>+		               hw,</div><div class='add'>+		               ctlx,</div><div class='add'>+		               init_wrid_completor(&amp;completor,</div><div class='add'>+		                                   &amp;ctlx-&gt;inbuf.wridresp,</div><div class='add'>+		                                   &amp;wridresult) );</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_dormem</div><div class='add'>+*</div><div class='add'>+* Constructs a readmem CTLX and issues it.</div><div class='add'>+*</div><div class='add'>+* NOTE: Any changes to the 'post-submit' code in this function</div><div class='add'>+*       need to be carried over to hfa384x_cbrmem() since the handling</div><div class='add'>+*       is virtually identical.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw		device structure</div><div class='add'>+*	mode		DOWAIT or DOASYNC</div><div class='add'>+*	page		MAC address space page (CMD format)</div><div class='add'>+*	offset		MAC address space offset</div><div class='add'>+*	data		Ptr to data buffer to receive read</div><div class='add'>+*	len		Length of the data to read (max == 2048)</div><div class='add'>+*	cmdcb		command callback for async calls, NULL for DOWAIT calls</div><div class='add'>+*	usercb		user callback for async calls, NULL for DOWAIT calls</div><div class='add'>+*	usercb_data	user supplied data pointer for async calls</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0		success</div><div class='add'>+*	-ETIMEDOUT	timed out waiting for register ready or</div><div class='add'>+*			command completion</div><div class='add'>+*	&gt;0		command indicated error, Status and Resp0-2 are</div><div class='add'>+*			in hw structure.</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	interrupt (DOASYNC)</div><div class='add'>+*	process (DOWAIT or DOASYNC)</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+static int</div><div class='add'>+hfa384x_dormem(</div><div class='add'>+	hfa384x_t *hw,</div><div class='add'>+	CMD_MODE mode,</div><div class='add'>+	UINT16	page,</div><div class='add'>+	UINT16	offset,</div><div class='add'>+	void	*data,</div><div class='add'>+	UINT	len,</div><div class='add'>+	ctlx_cmdcb_t cmdcb,</div><div class='add'>+	ctlx_usercb_t usercb,</div><div class='add'>+	void	*usercb_data)</div><div class='add'>+{</div><div class='add'>+	int			result;</div><div class='add'>+	hfa384x_usbctlx_t	*ctlx;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+	ctlx = usbctlx_alloc();</div><div class='add'>+	if ( ctlx == NULL ) {</div><div class='add'>+		result = -ENOMEM;</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Initialize the command */</div><div class='add'>+	ctlx-&gt;outbuf.rmemreq.type =    host2hfa384x_16(HFA384x_USB_RMEMREQ);</div><div class='add'>+	ctlx-&gt;outbuf.rmemreq.frmlen =  host2hfa384x_16(</div><div class='add'>+					sizeof(ctlx-&gt;outbuf.rmemreq.offset) +</div><div class='add'>+					sizeof(ctlx-&gt;outbuf.rmemreq.page) +</div><div class='add'>+					len);</div><div class='add'>+	ctlx-&gt;outbuf.rmemreq.offset =	host2hfa384x_16(offset);</div><div class='add'>+	ctlx-&gt;outbuf.rmemreq.page =	host2hfa384x_16(page);</div><div class='add'>+</div><div class='add'>+	ctlx-&gt;outbufsize = sizeof(ctlx-&gt;outbuf.rmemreq);</div><div class='add'>+</div><div class='add'>+	WLAN_LOG_DEBUG(4,</div><div class='add'>+		"type=0x%04x frmlen=%d offset=0x%04x page=0x%04x\n",</div><div class='add'>+		ctlx-&gt;outbuf.rmemreq.type,</div><div class='add'>+		ctlx-&gt;outbuf.rmemreq.frmlen,</div><div class='add'>+		ctlx-&gt;outbuf.rmemreq.offset,</div><div class='add'>+		ctlx-&gt;outbuf.rmemreq.page);</div><div class='add'>+</div><div class='add'>+	WLAN_LOG_DEBUG(4,"pktsize=%zd\n",</div><div class='add'>+		ROUNDUP64(sizeof(ctlx-&gt;outbuf.rmemreq)));</div><div class='add'>+</div><div class='add'>+	ctlx-&gt;reapable = mode;</div><div class='add'>+	ctlx-&gt;cmdcb = cmdcb;</div><div class='add'>+	ctlx-&gt;usercb = usercb;</div><div class='add'>+	ctlx-&gt;usercb_data = usercb_data;</div><div class='add'>+</div><div class='add'>+	result = hfa384x_usbctlx_submit(hw, ctlx);</div><div class='add'>+	if (result != 0) {</div><div class='add'>+		kfree(ctlx);</div><div class='add'>+	} else if ( mode == DOWAIT ) {</div><div class='add'>+                usbctlx_rmem_completor_t completor;</div><div class='add'>+</div><div class='add'>+                result = hfa384x_usbctlx_complete_sync(</div><div class='add'>+                           hw, ctlx, init_rmem_completor(&amp;completor,</div><div class='add'>+                                                         &amp;ctlx-&gt;inbuf.rmemresp,</div><div class='add'>+                                                         data,</div><div class='add'>+                                                         len) );</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_dowmem</div><div class='add'>+*</div><div class='add'>+* Constructs a writemem CTLX and issues it.</div><div class='add'>+*</div><div class='add'>+* NOTE: Any changes to the 'post-submit' code in this function</div><div class='add'>+*       need to be carried over to hfa384x_cbwmem() since the handling</div><div class='add'>+*       is virtually identical.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw		device structure</div><div class='add'>+*	mode		DOWAIT or DOASYNC</div><div class='add'>+*	page		MAC address space page (CMD format)</div><div class='add'>+*	offset		MAC address space offset</div><div class='add'>+*	data		Ptr to data buffer containing write data</div><div class='add'>+*	len		Length of the data to read (max == 2048)</div><div class='add'>+*	cmdcb		command callback for async calls, NULL for DOWAIT calls</div><div class='add'>+*	usercb		user callback for async calls, NULL for DOWAIT calls</div><div class='add'>+*	usercb_data	user supplied data pointer for async calls.</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0		success</div><div class='add'>+*	-ETIMEDOUT	timed out waiting for register ready or</div><div class='add'>+*			command completion</div><div class='add'>+*	&gt;0		command indicated error, Status and Resp0-2 are</div><div class='add'>+*			in hw structure.</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	interrupt (DOWAIT)</div><div class='add'>+*	process (DOWAIT or DOASYNC)</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+static int</div><div class='add'>+hfa384x_dowmem(</div><div class='add'>+	hfa384x_t *hw,</div><div class='add'>+	CMD_MODE mode,</div><div class='add'>+	UINT16	page,</div><div class='add'>+	UINT16	offset,</div><div class='add'>+	void	*data,</div><div class='add'>+	UINT	len,</div><div class='add'>+	ctlx_cmdcb_t cmdcb,</div><div class='add'>+	ctlx_usercb_t usercb,</div><div class='add'>+	void	*usercb_data)</div><div class='add'>+{</div><div class='add'>+	int			result;</div><div class='add'>+	hfa384x_usbctlx_t	*ctlx;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+	WLAN_LOG_DEBUG(5, "page=0x%04x offset=0x%04x len=%d\n",</div><div class='add'>+		page,offset,len);</div><div class='add'>+</div><div class='add'>+	ctlx = usbctlx_alloc();</div><div class='add'>+	if ( ctlx == NULL ) {</div><div class='add'>+		result = -ENOMEM;</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Initialize the command */</div><div class='add'>+	ctlx-&gt;outbuf.wmemreq.type =   host2hfa384x_16(HFA384x_USB_WMEMREQ);</div><div class='add'>+	ctlx-&gt;outbuf.wmemreq.frmlen = host2hfa384x_16(</div><div class='add'>+					sizeof(ctlx-&gt;outbuf.wmemreq.offset) +</div><div class='add'>+					sizeof(ctlx-&gt;outbuf.wmemreq.page) +</div><div class='add'>+					len);</div><div class='add'>+	ctlx-&gt;outbuf.wmemreq.offset = host2hfa384x_16(offset);</div><div class='add'>+	ctlx-&gt;outbuf.wmemreq.page =   host2hfa384x_16(page);</div><div class='add'>+	memcpy(ctlx-&gt;outbuf.wmemreq.data, data, len);</div><div class='add'>+</div><div class='add'>+	ctlx-&gt;outbufsize = sizeof(ctlx-&gt;outbuf.wmemreq.type) +</div><div class='add'>+	                   sizeof(ctlx-&gt;outbuf.wmemreq.frmlen) +</div><div class='add'>+	                   sizeof(ctlx-&gt;outbuf.wmemreq.offset) +</div><div class='add'>+	                   sizeof(ctlx-&gt;outbuf.wmemreq.page) +</div><div class='add'>+	                   len;</div><div class='add'>+</div><div class='add'>+	ctlx-&gt;reapable = mode;</div><div class='add'>+	ctlx-&gt;cmdcb = cmdcb;</div><div class='add'>+	ctlx-&gt;usercb = usercb;</div><div class='add'>+	ctlx-&gt;usercb_data = usercb_data;</div><div class='add'>+</div><div class='add'>+	result = hfa384x_usbctlx_submit(hw, ctlx);</div><div class='add'>+	if (result != 0) {</div><div class='add'>+		kfree(ctlx);</div><div class='add'>+	} else if ( mode == DOWAIT ) {</div><div class='add'>+                usbctlx_wmem_completor_t completor;</div><div class='add'>+                hfa384x_cmdresult_t wmemresult;</div><div class='add'>+</div><div class='add'>+                result = hfa384x_usbctlx_complete_sync(</div><div class='add'>+                               hw,</div><div class='add'>+                               ctlx,</div><div class='add'>+                               init_wmem_completor(&amp;completor,</div><div class='add'>+                                                   &amp;ctlx-&gt;inbuf.wmemresp,</div><div class='add'>+                                                   &amp;wmemresult) );</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_drvr_commtallies</div><div class='add'>+*</div><div class='add'>+* Send a commtallies inquiry to the MAC.  Note that this is an async</div><div class='add'>+* call that will result in an info frame arriving sometime later.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw		device structure</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	zero		success.</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int hfa384x_drvr_commtallies( hfa384x_t *hw )</div><div class='add'>+{</div><div class='add'>+	hfa384x_metacmd_t cmd;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	cmd.cmd = HFA384x_CMDCODE_INQ;</div><div class='add'>+	cmd.parm0 = HFA384x_IT_COMMTALLIES;</div><div class='add'>+	cmd.parm1 = 0;</div><div class='add'>+	cmd.parm2 = 0;</div><div class='add'>+</div><div class='add'>+	hfa384x_docmd_async(hw, &amp;cmd, NULL, NULL, NULL);</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_drvr_disable</div><div class='add'>+*</div><div class='add'>+* Issues the disable command to stop communications on one of</div><div class='add'>+* the MACs 'ports'.  Only macport 0 is valid  for stations.</div><div class='add'>+* APs may also disable macports 1-6.  Only ports that have been</div><div class='add'>+* previously enabled may be disabled.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw		device structure</div><div class='add'>+*	macport		MAC port number (host order)</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0		success</div><div class='add'>+*	&gt;0		f/w reported failure - f/w status code</div><div class='add'>+*	&lt;0		driver reported error (timeout|bad arg)</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int hfa384x_drvr_disable(hfa384x_t *hw, UINT16 macport)</div><div class='add'>+{</div><div class='add'>+	int	result = 0;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+	if ((!hw-&gt;isap &amp;&amp; macport != 0) ||</div><div class='add'>+	    (hw-&gt;isap &amp;&amp; !(macport &lt;= HFA384x_PORTID_MAX)) ||</div><div class='add'>+	    !(hw-&gt;port_enabled[macport]) ){</div><div class='add'>+		result = -EINVAL;</div><div class='add'>+	} else {</div><div class='add'>+		result = hfa384x_cmd_disable(hw, macport);</div><div class='add'>+		if ( result == 0 ) {</div><div class='add'>+			hw-&gt;port_enabled[macport] = 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_drvr_enable</div><div class='add'>+*</div><div class='add'>+* Issues the enable command to enable communications on one of</div><div class='add'>+* the MACs 'ports'.  Only macport 0 is valid  for stations.</div><div class='add'>+* APs may also enable macports 1-6.  Only ports that are currently</div><div class='add'>+* disabled may be enabled.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw		device structure</div><div class='add'>+*	macport		MAC port number</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0		success</div><div class='add'>+*	&gt;0		f/w reported failure - f/w status code</div><div class='add'>+*	&lt;0		driver reported error (timeout|bad arg)</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int hfa384x_drvr_enable(hfa384x_t *hw, UINT16 macport)</div><div class='add'>+{</div><div class='add'>+	int	result = 0;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+	if ((!hw-&gt;isap &amp;&amp; macport != 0) ||</div><div class='add'>+	    (hw-&gt;isap &amp;&amp; !(macport &lt;= HFA384x_PORTID_MAX)) ||</div><div class='add'>+	    (hw-&gt;port_enabled[macport]) ){</div><div class='add'>+		result = -EINVAL;</div><div class='add'>+	} else {</div><div class='add'>+		result = hfa384x_cmd_enable(hw, macport);</div><div class='add'>+		if ( result == 0 ) {</div><div class='add'>+			hw-&gt;port_enabled[macport] = 1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_drvr_flashdl_enable</div><div class='add'>+*</div><div class='add'>+* Begins the flash download state.  Checks to see that we're not</div><div class='add'>+* already in a download state and that a port isn't enabled.</div><div class='add'>+* Sets the download state and retrieves the flash download</div><div class='add'>+* buffer location, buffer size, and timeout length.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw		device structure</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0		success</div><div class='add'>+*	&gt;0		f/w reported error - f/w status code</div><div class='add'>+*	&lt;0		driver reported error</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int hfa384x_drvr_flashdl_enable(hfa384x_t *hw)</div><div class='add'>+{</div><div class='add'>+	int		result = 0;</div><div class='add'>+	int		i;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+	/* Check that a port isn't active */</div><div class='add'>+	for ( i = 0; i &lt; HFA384x_PORTID_MAX; i++) {</div><div class='add'>+		if ( hw-&gt;port_enabled[i] ) {</div><div class='add'>+			WLAN_LOG_DEBUG(1,"called when port enabled.\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check that we're not already in a download state */</div><div class='add'>+	if ( hw-&gt;dlstate != HFA384x_DLSTATE_DISABLED ) {</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Retrieve the buffer loc&amp;size and timeout */</div><div class='add'>+	if ( (result = hfa384x_drvr_getconfig(hw, HFA384x_RID_DOWNLOADBUFFER,</div><div class='add'>+				&amp;(hw-&gt;bufinfo), sizeof(hw-&gt;bufinfo))) ) {</div><div class='add'>+		return result;</div><div class='add'>+	}</div><div class='add'>+	hw-&gt;bufinfo.page = hfa384x2host_16(hw-&gt;bufinfo.page);</div><div class='add'>+	hw-&gt;bufinfo.offset = hfa384x2host_16(hw-&gt;bufinfo.offset);</div><div class='add'>+	hw-&gt;bufinfo.len = hfa384x2host_16(hw-&gt;bufinfo.len);</div><div class='add'>+	if ( (result = hfa384x_drvr_getconfig16(hw, HFA384x_RID_MAXLOADTIME,</div><div class='add'>+				&amp;(hw-&gt;dltimeout))) ) {</div><div class='add'>+		return result;</div><div class='add'>+	}</div><div class='add'>+	hw-&gt;dltimeout = hfa384x2host_16(hw-&gt;dltimeout);</div><div class='add'>+</div><div class='add'>+	WLAN_LOG_DEBUG(1,"flashdl_enable\n");</div><div class='add'>+</div><div class='add'>+	hw-&gt;dlstate = HFA384x_DLSTATE_FLASHENABLED;</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_drvr_flashdl_disable</div><div class='add'>+*</div><div class='add'>+* Ends the flash download state.  Note that this will cause the MAC</div><div class='add'>+* firmware to restart.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw		device structure</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0		success</div><div class='add'>+*	&gt;0		f/w reported error - f/w status code</div><div class='add'>+*	&lt;0		driver reported error</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int hfa384x_drvr_flashdl_disable(hfa384x_t *hw)</div><div class='add'>+{</div><div class='add'>+	DBFENTER;</div><div class='add'>+	/* Check that we're already in the download state */</div><div class='add'>+	if ( hw-&gt;dlstate != HFA384x_DLSTATE_FLASHENABLED ) {</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	WLAN_LOG_DEBUG(1,"flashdl_enable\n");</div><div class='add'>+</div><div class='add'>+	/* There isn't much we can do at this point, so I don't */</div><div class='add'>+	/*  bother  w/ the return value */</div><div class='add'>+	hfa384x_cmd_download(hw, HFA384x_PROGMODE_DISABLE, 0, 0 , 0);</div><div class='add'>+	hw-&gt;dlstate = HFA384x_DLSTATE_DISABLED;</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_drvr_flashdl_write</div><div class='add'>+*</div><div class='add'>+* Performs a FLASH download of a chunk of data. First checks to see</div><div class='add'>+* that we're in the FLASH download state, then sets the download</div><div class='add'>+* mode, uses the aux functions to 1) copy the data to the flash</div><div class='add'>+* buffer, 2) sets the download 'write flash' mode, 3) readback and</div><div class='add'>+* compare.  Lather rinse, repeat as many times an necessary to get</div><div class='add'>+* all the given data into flash.</div><div class='add'>+* When all data has been written using this function (possibly</div><div class='add'>+* repeatedly), call drvr_flashdl_disable() to end the download state</div><div class='add'>+* and restart the MAC.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw		device structure</div><div class='add'>+*	daddr		Card address to write to. (host order)</div><div class='add'>+*	buf		Ptr to data to write.</div><div class='add'>+*	len		Length of data (host order).</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0		success</div><div class='add'>+*	&gt;0		f/w reported error - f/w status code</div><div class='add'>+*	&lt;0		driver reported error</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int</div><div class='add'>+hfa384x_drvr_flashdl_write(</div><div class='add'>+	hfa384x_t	*hw,</div><div class='add'>+	UINT32		daddr,</div><div class='add'>+	void		*buf,</div><div class='add'>+	UINT32		len)</div><div class='add'>+{</div><div class='add'>+	int		result = 0;</div><div class='add'>+	UINT32		dlbufaddr;</div><div class='add'>+	int		nburns;</div><div class='add'>+	UINT32		burnlen;</div><div class='add'>+	UINT32		burndaddr;</div><div class='add'>+	UINT16		burnlo;</div><div class='add'>+	UINT16		burnhi;</div><div class='add'>+	int		nwrites;</div><div class='add'>+	UINT8		*writebuf;</div><div class='add'>+	UINT16		writepage;</div><div class='add'>+	UINT16		writeoffset;</div><div class='add'>+	UINT32		writelen;</div><div class='add'>+	int		i;</div><div class='add'>+	int		j;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+	WLAN_LOG_DEBUG(5,"daddr=0x%08x len=%d\n", daddr, len);</div><div class='add'>+</div><div class='add'>+	/* Check that we're in the flash download state */</div><div class='add'>+	if ( hw-&gt;dlstate != HFA384x_DLSTATE_FLASHENABLED ) {</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	WLAN_LOG_INFO("Download %d bytes to flash @0x%06x\n", len, daddr);</div><div class='add'>+</div><div class='add'>+	/* Convert to flat address for arithmetic */</div><div class='add'>+	/* NOTE: dlbuffer RID stores the address in AUX format */</div><div class='add'>+	dlbufaddr = HFA384x_ADDR_AUX_MKFLAT(</div><div class='add'>+			hw-&gt;bufinfo.page, hw-&gt;bufinfo.offset);</div><div class='add'>+	WLAN_LOG_DEBUG(5,</div><div class='add'>+		"dlbuf.page=0x%04x dlbuf.offset=0x%04x dlbufaddr=0x%08x\n",</div><div class='add'>+		hw-&gt;bufinfo.page, hw-&gt;bufinfo.offset, dlbufaddr);</div><div class='add'>+</div><div class='add'>+#if 0</div><div class='add'>+WLAN_LOG_WARNING("dlbuf@0x%06lx len=%d to=%d\n", dlbufaddr, hw-&gt;bufinfo.len, hw-&gt;dltimeout);</div><div class='add'>+#endif</div><div class='add'>+	/* Calculations to determine how many fills of the dlbuffer to do</div><div class='add'>+	 * and how many USB wmemreq's to do for each fill.  At this point</div><div class='add'>+	 * in time, the dlbuffer size and the wmemreq size are the same.</div><div class='add'>+	 * Therefore, nwrites should always be 1.  The extra complexity</div><div class='add'>+	 * here is a hedge against future changes.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* Figure out how many times to do the flash programming */</div><div class='add'>+	nburns = len / hw-&gt;bufinfo.len;</div><div class='add'>+	nburns += (len % hw-&gt;bufinfo.len) ? 1 : 0;</div><div class='add'>+</div><div class='add'>+	/* For each flash program cycle, how many USB wmemreq's are needed? */</div><div class='add'>+	nwrites = hw-&gt;bufinfo.len / HFA384x_USB_RWMEM_MAXLEN;</div><div class='add'>+	nwrites += (hw-&gt;bufinfo.len % HFA384x_USB_RWMEM_MAXLEN) ? 1 : 0;</div><div class='add'>+</div><div class='add'>+	/* For each burn */</div><div class='add'>+	for ( i = 0; i &lt; nburns; i++) {</div><div class='add'>+		/* Get the dest address and len */</div><div class='add'>+		burnlen = (len - (hw-&gt;bufinfo.len * i)) &gt; hw-&gt;bufinfo.len ?</div><div class='add'>+				hw-&gt;bufinfo.len :</div><div class='add'>+				(len - (hw-&gt;bufinfo.len * i));</div><div class='add'>+		burndaddr = daddr + (hw-&gt;bufinfo.len * i);</div><div class='add'>+		burnlo = HFA384x_ADDR_CMD_MKOFF(burndaddr);</div><div class='add'>+		burnhi = HFA384x_ADDR_CMD_MKPAGE(burndaddr);</div><div class='add'>+</div><div class='add'>+		WLAN_LOG_INFO("Writing %d bytes to flash @0x%06x\n",</div><div class='add'>+			burnlen, burndaddr);</div><div class='add'>+</div><div class='add'>+		/* Set the download mode */</div><div class='add'>+		result = hfa384x_cmd_download(hw, HFA384x_PROGMODE_NV,</div><div class='add'>+				burnlo, burnhi, burnlen);</div><div class='add'>+		if ( result ) {</div><div class='add'>+			WLAN_LOG_ERROR("download(NV,lo=%x,hi=%x,len=%x) "</div><div class='add'>+				"cmd failed, result=%d. Aborting d/l\n",</div><div class='add'>+				burnlo, burnhi, burnlen, result);</div><div class='add'>+			goto exit_proc;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* copy the data to the flash download buffer */</div><div class='add'>+		for ( j=0; j &lt; nwrites; j++) {</div><div class='add'>+			writebuf = buf +</div><div class='add'>+				(i*hw-&gt;bufinfo.len) +</div><div class='add'>+				(j*HFA384x_USB_RWMEM_MAXLEN);</div><div class='add'>+</div><div class='add'>+			writepage = HFA384x_ADDR_CMD_MKPAGE(</div><div class='add'>+					dlbufaddr +</div><div class='add'>+					(j*HFA384x_USB_RWMEM_MAXLEN));</div><div class='add'>+			writeoffset = HFA384x_ADDR_CMD_MKOFF(</div><div class='add'>+					dlbufaddr +</div><div class='add'>+					(j*HFA384x_USB_RWMEM_MAXLEN));</div><div class='add'>+</div><div class='add'>+			writelen = burnlen-(j*HFA384x_USB_RWMEM_MAXLEN);</div><div class='add'>+			writelen = writelen  &gt; HFA384x_USB_RWMEM_MAXLEN ?</div><div class='add'>+					HFA384x_USB_RWMEM_MAXLEN :</div><div class='add'>+					writelen;</div><div class='add'>+</div><div class='add'>+			result = hfa384x_dowmem_wait( hw,</div><div class='add'>+					writepage,</div><div class='add'>+					writeoffset,</div><div class='add'>+					writebuf,</div><div class='add'>+					writelen );</div><div class='add'>+#if 0</div><div class='add'>+</div><div class='add'>+Comment out for debugging, assume the write was successful.</div><div class='add'>+			if (result) {</div><div class='add'>+				WLAN_LOG_ERROR(</div><div class='add'>+					"Write to dl buffer failed, "</div><div class='add'>+					"result=0x%04x. Aborting.\n",</div><div class='add'>+					result);</div><div class='add'>+				goto exit_proc;</div><div class='add'>+			}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* set the download 'write flash' mode */</div><div class='add'>+		result = hfa384x_cmd_download(hw,</div><div class='add'>+				HFA384x_PROGMODE_NVWRITE,</div><div class='add'>+				0,0,0);</div><div class='add'>+		if ( result ) {</div><div class='add'>+			WLAN_LOG_ERROR(</div><div class='add'>+				"download(NVWRITE,lo=%x,hi=%x,len=%x) "</div><div class='add'>+				"cmd failed, result=%d. Aborting d/l\n",</div><div class='add'>+				burnlo, burnhi, burnlen, result);</div><div class='add'>+			goto exit_proc;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* TODO: We really should do a readback and compare. */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+exit_proc:</div><div class='add'>+</div><div class='add'>+	/* Leave the firmware in the 'post-prog' mode.  flashdl_disable will */</div><div class='add'>+	/*  actually disable programming mode.  Remember, that will cause the */</div><div class='add'>+	/*  the firmware to effectively reset itself. */</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_drvr_getconfig</div><div class='add'>+*</div><div class='add'>+* Performs the sequence necessary to read a config/info item.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw		device structure</div><div class='add'>+*	rid		config/info record id (host order)</div><div class='add'>+*	buf		host side record buffer.  Upon return it will</div><div class='add'>+*			contain the body portion of the record (minus the</div><div class='add'>+*			RID and len).</div><div class='add'>+*	len		buffer length (in bytes, should match record length)</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0		success</div><div class='add'>+*	&gt;0		f/w reported error - f/w status code</div><div class='add'>+*	&lt;0		driver reported error</div><div class='add'>+*	-ENODATA 	length mismatch between argument and retrieved</div><div class='add'>+*			record.</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int hfa384x_drvr_getconfig(hfa384x_t *hw, UINT16 rid, void *buf, UINT16 len)</div><div class='add'>+{</div><div class='add'>+	int 			result;</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	result = hfa384x_dorrid_wait(hw, rid, buf, len);</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+ * hfa384x_drvr_getconfig_async</div><div class='add'>+ *</div><div class='add'>+ * Performs the sequence necessary to perform an async read of</div><div class='add'>+ * of a config/info item.</div><div class='add'>+ *</div><div class='add'>+ * Arguments:</div><div class='add'>+ *       hw              device structure</div><div class='add'>+ *       rid             config/info record id (host order)</div><div class='add'>+ *       buf             host side record buffer.  Upon return it will</div><div class='add'>+ *                       contain the body portion of the record (minus the</div><div class='add'>+ *                       RID and len).</div><div class='add'>+ *       len             buffer length (in bytes, should match record length)</div><div class='add'>+ *       cbfn            caller supplied callback, called when the command</div><div class='add'>+ *                       is done (successful or not).</div><div class='add'>+ *       cbfndata        pointer to some caller supplied data that will be</div><div class='add'>+ *                       passed in as an argument to the cbfn.</div><div class='add'>+ *</div><div class='add'>+ * Returns:</div><div class='add'>+ *       nothing         the cbfn gets a status argument identifying if</div><div class='add'>+ *                       any errors occur.</div><div class='add'>+ * Side effects:</div><div class='add'>+ *       Queues an hfa384x_usbcmd_t for subsequent execution.</div><div class='add'>+ *</div><div class='add'>+ * Call context:</div><div class='add'>+ *       Any</div><div class='add'>+ ----------------------------------------------------------------*/</div><div class='add'>+int</div><div class='add'>+hfa384x_drvr_getconfig_async(</div><div class='add'>+         hfa384x_t               *hw,</div><div class='add'>+         UINT16                  rid,</div><div class='add'>+         ctlx_usercb_t           usercb,</div><div class='add'>+         void                    *usercb_data)</div><div class='add'>+{</div><div class='add'>+         return hfa384x_dorrid_async(hw, rid, NULL, 0,</div><div class='add'>+				     hfa384x_cb_rrid, usercb, usercb_data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+ * hfa384x_drvr_setconfig_async</div><div class='add'>+ *</div><div class='add'>+ * Performs the sequence necessary to write a config/info item.</div><div class='add'>+ *</div><div class='add'>+ * Arguments:</div><div class='add'>+ *       hw              device structure</div><div class='add'>+ *       rid             config/info record id (in host order)</div><div class='add'>+ *       buf             host side record buffer</div><div class='add'>+ *       len             buffer length (in bytes)</div><div class='add'>+ *       usercb          completion callback</div><div class='add'>+ *       usercb_data     completion callback argument</div><div class='add'>+ *</div><div class='add'>+ * Returns:</div><div class='add'>+ *       0               success</div><div class='add'>+ *       &gt;0              f/w reported error - f/w status code</div><div class='add'>+ *       &lt;0              driver reported error</div><div class='add'>+ *</div><div class='add'>+ * Side effects:</div><div class='add'>+ *</div><div class='add'>+ * Call context:</div><div class='add'>+ *       process</div><div class='add'>+ ----------------------------------------------------------------*/</div><div class='add'>+int</div><div class='add'>+hfa384x_drvr_setconfig_async(</div><div class='add'>+         hfa384x_t       *hw,</div><div class='add'>+         UINT16          rid,</div><div class='add'>+         void            *buf,</div><div class='add'>+         UINT16          len,</div><div class='add'>+         ctlx_usercb_t   usercb,</div><div class='add'>+         void            *usercb_data)</div><div class='add'>+{</div><div class='add'>+	return hfa384x_dowrid_async(hw, rid, buf, len,</div><div class='add'>+				    hfa384x_cb_status, usercb, usercb_data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_drvr_handover</div><div class='add'>+*</div><div class='add'>+* Sends a handover notification to the MAC.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw		device structure</div><div class='add'>+*	addr		address of station that's left</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	zero		success.</div><div class='add'>+*	-ERESTARTSYS	received signal while waiting for semaphore.</div><div class='add'>+*	-EIO		failed to write to bap, or failed in cmd.</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int hfa384x_drvr_handover( hfa384x_t *hw, UINT8 *addr)</div><div class='add'>+{</div><div class='add'>+        DBFENTER;</div><div class='add'>+	WLAN_LOG_ERROR("Not currently supported in USB!\n");</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return -EIO;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_drvr_low_level</div><div class='add'>+*</div><div class='add'>+* Write test commands to the card.  Some test commands don't make</div><div class='add'>+* sense without prior set-up.  For example, continous TX isn't very</div><div class='add'>+* useful until you set the channel.  That functionality should be</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*      process thread</div><div class='add'>+* -----------------------------------------------------------------*/</div><div class='add'>+int hfa384x_drvr_low_level(hfa384x_t *hw, hfa384x_metacmd_t *cmd)</div><div class='add'>+{</div><div class='add'>+	int             result;</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	/* Do i need a host2hfa... conversion ? */</div><div class='add'>+</div><div class='add'>+	result = hfa384x_docmd_wait(hw, cmd);</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_drvr_mmi_read</div><div class='add'>+*</div><div class='add'>+* Read mmi registers.  mmi is intersil-speak for the baseband</div><div class='add'>+* processor registers.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*       hw              device structure</div><div class='add'>+*       register        The test register to be accessed (must be even #).</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*       0               success</div><div class='add'>+*       &gt;0              f/w reported error - f/w status code</div><div class='add'>+*       &lt;0              driver reported error</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*       process</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int hfa384x_drvr_mmi_read(hfa384x_t *hw, UINT32 addr, UINT32 *resp)</div><div class='add'>+{</div><div class='add'>+#if 0</div><div class='add'>+        int             result = 0;</div><div class='add'>+        UINT16  cmd_code = (UINT16) 0x30;</div><div class='add'>+        UINT16 param = (UINT16) addr;</div><div class='add'>+        DBFENTER;</div><div class='add'>+</div><div class='add'>+        /* Do i need a host2hfa... conversion ? */</div><div class='add'>+        result = hfa384x_docmd_wait(hw, cmd_code);</div><div class='add'>+</div><div class='add'>+        DBFEXIT;</div><div class='add'>+        return result;</div><div class='add'>+#endif</div><div class='add'>+return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_drvr_mmi_write</div><div class='add'>+*</div><div class='add'>+* Read mmi registers.  mmi is intersil-speak for the baseband</div><div class='add'>+* processor registers.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*       hw              device structure</div><div class='add'>+*       addr            The test register to be accessed (must be even #).</div><div class='add'>+*       data            The data value to write to the register.</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*       0               success</div><div class='add'>+*       &gt;0              f/w reported error - f/w status code</div><div class='add'>+*       &lt;0              driver reported error</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*       process</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+hfa384x_drvr_mmi_write(hfa384x_t *hw, UINT32 addr, UINT32 data)</div><div class='add'>+{</div><div class='add'>+#if 0</div><div class='add'>+        int             result = 0;</div><div class='add'>+        UINT16  cmd_code = (UINT16) 0x31;</div><div class='add'>+        UINT16 param0 = (UINT16) addr;</div><div class='add'>+        UINT16 param1 = (UINT16) data;</div><div class='add'>+        DBFENTER;</div><div class='add'>+</div><div class='add'>+        WLAN_LOG_DEBUG(1,"mmi write : addr = 0x%08lx\n", addr);</div><div class='add'>+        WLAN_LOG_DEBUG(1,"mmi write : data = 0x%08lx\n", data);</div><div class='add'>+</div><div class='add'>+        /* Do i need a host2hfa... conversion ? */</div><div class='add'>+        result = hfa384x_docmd_wait(hw, cmd_code);</div><div class='add'>+</div><div class='add'>+        DBFEXIT;</div><div class='add'>+        return result;</div><div class='add'>+#endif</div><div class='add'>+return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_drvr_ramdl_disable</div><div class='add'>+*</div><div class='add'>+* Ends the ram download state.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw		device structure</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0		success</div><div class='add'>+*	&gt;0		f/w reported error - f/w status code</div><div class='add'>+*	&lt;0		driver reported error</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int</div><div class='add'>+hfa384x_drvr_ramdl_disable(hfa384x_t *hw)</div><div class='add'>+{</div><div class='add'>+	DBFENTER;</div><div class='add'>+	/* Check that we're already in the download state */</div><div class='add'>+	if ( hw-&gt;dlstate != HFA384x_DLSTATE_RAMENABLED ) {</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	WLAN_LOG_DEBUG(3,"ramdl_disable()\n");</div><div class='add'>+</div><div class='add'>+	/* There isn't much we can do at this point, so I don't */</div><div class='add'>+	/*  bother  w/ the return value */</div><div class='add'>+	hfa384x_cmd_download(hw, HFA384x_PROGMODE_DISABLE, 0, 0 , 0);</div><div class='add'>+	hw-&gt;dlstate = HFA384x_DLSTATE_DISABLED;</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_drvr_ramdl_enable</div><div class='add'>+*</div><div class='add'>+* Begins the ram download state.  Checks to see that we're not</div><div class='add'>+* already in a download state and that a port isn't enabled.</div><div class='add'>+* Sets the download state and calls cmd_download with the</div><div class='add'>+* ENABLE_VOLATILE subcommand and the exeaddr argument.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw		device structure</div><div class='add'>+*	exeaddr		the card execution address that will be</div><div class='add'>+*                       jumped to when ramdl_disable() is called</div><div class='add'>+*			(host order).</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0		success</div><div class='add'>+*	&gt;0		f/w reported error - f/w status code</div><div class='add'>+*	&lt;0		driver reported error</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int</div><div class='add'>+hfa384x_drvr_ramdl_enable(hfa384x_t *hw, UINT32 exeaddr)</div><div class='add'>+{</div><div class='add'>+	int		result = 0;</div><div class='add'>+	UINT16		lowaddr;</div><div class='add'>+	UINT16		hiaddr;</div><div class='add'>+	int		i;</div><div class='add'>+	DBFENTER;</div><div class='add'>+	/* Check that a port isn't active */</div><div class='add'>+	for ( i = 0; i &lt; HFA384x_PORTID_MAX; i++) {</div><div class='add'>+		if ( hw-&gt;port_enabled[i] ) {</div><div class='add'>+			WLAN_LOG_ERROR(</div><div class='add'>+				"Can't download with a macport enabled.\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check that we're not already in a download state */</div><div class='add'>+	if ( hw-&gt;dlstate != HFA384x_DLSTATE_DISABLED ) {</div><div class='add'>+		WLAN_LOG_ERROR(</div><div class='add'>+			"Download state not disabled.\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	WLAN_LOG_DEBUG(3,"ramdl_enable, exeaddr=0x%08x\n", exeaddr);</div><div class='add'>+</div><div class='add'>+	/* Call the download(1,addr) function */</div><div class='add'>+	lowaddr = HFA384x_ADDR_CMD_MKOFF(exeaddr);</div><div class='add'>+	hiaddr =  HFA384x_ADDR_CMD_MKPAGE(exeaddr);</div><div class='add'>+</div><div class='add'>+	result = hfa384x_cmd_download(hw, HFA384x_PROGMODE_RAM,</div><div class='add'>+			lowaddr, hiaddr, 0);</div><div class='add'>+</div><div class='add'>+	if ( result == 0) {</div><div class='add'>+		/* Set the download state */</div><div class='add'>+		hw-&gt;dlstate = HFA384x_DLSTATE_RAMENABLED;</div><div class='add'>+	} else {</div><div class='add'>+		WLAN_LOG_DEBUG(1,</div><div class='add'>+			"cmd_download(0x%04x, 0x%04x) failed, result=%d.\n",</div><div class='add'>+			lowaddr,</div><div class='add'>+			hiaddr,</div><div class='add'>+			result);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_drvr_ramdl_write</div><div class='add'>+*</div><div class='add'>+* Performs a RAM download of a chunk of data. First checks to see</div><div class='add'>+* that we're in the RAM download state, then uses the [read|write]mem USB</div><div class='add'>+* commands to 1) copy the data, 2) readback and compare.  The download</div><div class='add'>+* state is unaffected.  When all data has been written using</div><div class='add'>+* this function, call drvr_ramdl_disable() to end the download state</div><div class='add'>+* and restart the MAC.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw		device structure</div><div class='add'>+*	daddr		Card address to write to. (host order)</div><div class='add'>+*	buf		Ptr to data to write.</div><div class='add'>+*	len		Length of data (host order).</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0		success</div><div class='add'>+*	&gt;0		f/w reported error - f/w status code</div><div class='add'>+*	&lt;0		driver reported error</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int</div><div class='add'>+hfa384x_drvr_ramdl_write(hfa384x_t *hw, UINT32 daddr, void* buf, UINT32 len)</div><div class='add'>+{</div><div class='add'>+	int		result = 0;</div><div class='add'>+	int		nwrites;</div><div class='add'>+	UINT8		*data = buf;</div><div class='add'>+	int		i;</div><div class='add'>+	UINT32		curraddr;</div><div class='add'>+	UINT16		currpage;</div><div class='add'>+	UINT16		curroffset;</div><div class='add'>+	UINT16		currlen;</div><div class='add'>+	DBFENTER;</div><div class='add'>+	/* Check that we're in the ram download state */</div><div class='add'>+	if ( hw-&gt;dlstate != HFA384x_DLSTATE_RAMENABLED ) {</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	WLAN_LOG_INFO("Writing %d bytes to ram @0x%06x\n", len, daddr);</div><div class='add'>+</div><div class='add'>+	/* How many dowmem calls?  */</div><div class='add'>+	nwrites = len / HFA384x_USB_RWMEM_MAXLEN;</div><div class='add'>+	nwrites += len % HFA384x_USB_RWMEM_MAXLEN ? 1 : 0;</div><div class='add'>+</div><div class='add'>+	/* Do blocking wmem's */</div><div class='add'>+	for(i=0; i &lt; nwrites; i++) {</div><div class='add'>+		/* make address args */</div><div class='add'>+		curraddr = daddr + (i * HFA384x_USB_RWMEM_MAXLEN);</div><div class='add'>+		currpage = HFA384x_ADDR_CMD_MKPAGE(curraddr);</div><div class='add'>+		curroffset = HFA384x_ADDR_CMD_MKOFF(curraddr);</div><div class='add'>+		currlen = len - (i * HFA384x_USB_RWMEM_MAXLEN);</div><div class='add'>+		if ( currlen &gt; HFA384x_USB_RWMEM_MAXLEN) {</div><div class='add'>+			currlen = HFA384x_USB_RWMEM_MAXLEN;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	 	/* Do blocking ctlx */</div><div class='add'>+		result = hfa384x_dowmem_wait( hw,</div><div class='add'>+				currpage,</div><div class='add'>+				curroffset,</div><div class='add'>+				data + (i*HFA384x_USB_RWMEM_MAXLEN),</div><div class='add'>+				currlen );</div><div class='add'>+</div><div class='add'>+		if (result) break;</div><div class='add'>+</div><div class='add'>+		/* TODO: We really should have a readback. */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_drvr_readpda</div><div class='add'>+*</div><div class='add'>+* Performs the sequence to read the PDA space.  Note there is no</div><div class='add'>+* drvr_writepda() function.  Writing a PDA is</div><div class='add'>+* generally implemented by a calling component via calls to</div><div class='add'>+* cmd_download and writing to the flash download buffer via the</div><div class='add'>+* aux regs.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw		device structure</div><div class='add'>+*	buf		buffer to store PDA in</div><div class='add'>+*	len		buffer length</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0		success</div><div class='add'>+*	&gt;0		f/w reported error - f/w status code</div><div class='add'>+*	&lt;0		driver reported error</div><div class='add'>+*	-ETIMEOUT	timout waiting for the cmd regs to become</div><div class='add'>+*			available, or waiting for the control reg</div><div class='add'>+*			to indicate the Aux port is enabled.</div><div class='add'>+*	-ENODATA	the buffer does NOT contain a valid PDA.</div><div class='add'>+*			Either the card PDA is bad, or the auxdata</div><div class='add'>+*			reads are giving us garbage.</div><div class='add'>+</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process or non-card interrupt.</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int hfa384x_drvr_readpda(hfa384x_t *hw, void *buf, UINT len)</div><div class='add'>+{</div><div class='add'>+	int		result = 0;</div><div class='add'>+	UINT16		*pda = buf;</div><div class='add'>+	int		pdaok = 0;</div><div class='add'>+	int		morepdrs = 1;</div><div class='add'>+	int		currpdr = 0;	/* word offset of the current pdr */</div><div class='add'>+	size_t		i;</div><div class='add'>+	UINT16		pdrlen;		/* pdr length in bytes, host order */</div><div class='add'>+	UINT16		pdrcode;	/* pdr code, host order */</div><div class='add'>+	UINT16		currpage;</div><div class='add'>+	UINT16		curroffset;</div><div class='add'>+	struct pdaloc {</div><div class='add'>+		UINT32	cardaddr;</div><div class='add'>+		UINT16	auxctl;</div><div class='add'>+	} pdaloc[] =</div><div class='add'>+	{</div><div class='add'>+		{ HFA3842_PDA_BASE,		0},</div><div class='add'>+		{ HFA3841_PDA_BASE,		0},</div><div class='add'>+		{ HFA3841_PDA_BOGUS_BASE,	0}</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	/* Read the pda from each known address.  */</div><div class='add'>+	for ( i = 0; i &lt; ARRAY_SIZE(pdaloc); i++) {</div><div class='add'>+		/* Make address */</div><div class='add'>+		currpage = HFA384x_ADDR_CMD_MKPAGE(pdaloc[i].cardaddr);</div><div class='add'>+		curroffset = HFA384x_ADDR_CMD_MKOFF(pdaloc[i].cardaddr);</div><div class='add'>+</div><div class='add'>+		result = hfa384x_dormem_wait(hw,</div><div class='add'>+			currpage,</div><div class='add'>+			curroffset,</div><div class='add'>+			buf,</div><div class='add'>+			len);		/* units of bytes */</div><div class='add'>+</div><div class='add'>+		if (result) {</div><div class='add'>+			WLAN_LOG_WARNING(</div><div class='add'>+					  "Read from index %zd failed, continuing\n",</div><div class='add'>+				i );</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Test for garbage */</div><div class='add'>+		pdaok = 1;	/* initially assume good */</div><div class='add'>+		morepdrs = 1;</div><div class='add'>+		while ( pdaok &amp;&amp; morepdrs ) {</div><div class='add'>+			pdrlen = hfa384x2host_16(pda[currpdr]) * 2;</div><div class='add'>+			pdrcode = hfa384x2host_16(pda[currpdr+1]);</div><div class='add'>+			/* Test the record length */</div><div class='add'>+			if ( pdrlen &gt; HFA384x_PDR_LEN_MAX || pdrlen == 0) {</div><div class='add'>+				WLAN_LOG_ERROR("pdrlen invalid=%d\n",</div><div class='add'>+					pdrlen);</div><div class='add'>+				pdaok = 0;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			/* Test the code */</div><div class='add'>+			if ( !hfa384x_isgood_pdrcode(pdrcode) ) {</div><div class='add'>+				WLAN_LOG_ERROR("pdrcode invalid=%d\n",</div><div class='add'>+					pdrcode);</div><div class='add'>+				pdaok = 0;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			/* Test for completion */</div><div class='add'>+			if ( pdrcode == HFA384x_PDR_END_OF_PDA) {</div><div class='add'>+				morepdrs = 0;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* Move to the next pdr (if necessary) */</div><div class='add'>+			if ( morepdrs ) {</div><div class='add'>+				/* note the access to pda[], need words here */</div><div class='add'>+				currpdr += hfa384x2host_16(pda[currpdr]) + 1;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if ( pdaok ) {</div><div class='add'>+			WLAN_LOG_INFO(</div><div class='add'>+				"PDA Read from 0x%08x in %s space.\n",</div><div class='add'>+				pdaloc[i].cardaddr,</div><div class='add'>+				pdaloc[i].auxctl == 0 ? "EXTDS" :</div><div class='add'>+				pdaloc[i].auxctl == 1 ? "NV" :</div><div class='add'>+				pdaloc[i].auxctl == 2 ? "PHY" :</div><div class='add'>+				pdaloc[i].auxctl == 3 ? "ICSRAM" :</div><div class='add'>+				"&lt;bogus auxctl&gt;");</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	result = pdaok ? 0 : -ENODATA;</div><div class='add'>+</div><div class='add'>+	if ( result ) {</div><div class='add'>+		WLAN_LOG_DEBUG(3,"Failure: pda is not okay\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_drvr_setconfig</div><div class='add'>+*</div><div class='add'>+* Performs the sequence necessary to write a config/info item.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw		device structure</div><div class='add'>+*	rid		config/info record id (in host order)</div><div class='add'>+*	buf		host side record buffer</div><div class='add'>+*	len		buffer length (in bytes)</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0		success</div><div class='add'>+*	&gt;0		f/w reported error - f/w status code</div><div class='add'>+*	&lt;0		driver reported error</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int hfa384x_drvr_setconfig(hfa384x_t *hw, UINT16 rid, void *buf, UINT16 len)</div><div class='add'>+{</div><div class='add'>+	return hfa384x_dowrid_wait(hw, rid, buf, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_drvr_start</div><div class='add'>+*</div><div class='add'>+* Issues the MAC initialize command, sets up some data structures,</div><div class='add'>+* and enables the interrupts.  After this function completes, the</div><div class='add'>+* low-level stuff should be ready for any/all commands.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw		device structure</div><div class='add'>+* Returns:</div><div class='add'>+*	0		success</div><div class='add'>+*	&gt;0		f/w reported error - f/w status code</div><div class='add'>+*	&lt;0		driver reported error</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int hfa384x_drvr_start(hfa384x_t *hw)</div><div class='add'>+{</div><div class='add'>+	int		result;</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	might_sleep();</div><div class='add'>+</div><div class='add'>+	if (usb_clear_halt(hw-&gt;usb, hw-&gt;endp_in)) {</div><div class='add'>+		WLAN_LOG_ERROR(</div><div class='add'>+			"Failed to reset bulk in endpoint.\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (usb_clear_halt(hw-&gt;usb, hw-&gt;endp_out)) {</div><div class='add'>+		WLAN_LOG_ERROR(</div><div class='add'>+			"Failed to reset bulk out endpoint.\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Synchronous unlink, in case we're trying to restart the driver */</div><div class='add'>+	usb_kill_urb(&amp;hw-&gt;rx_urb);</div><div class='add'>+</div><div class='add'>+	/* Post the IN urb */</div><div class='add'>+	result = submit_rx_urb(hw, GFP_KERNEL);</div><div class='add'>+	if (result != 0) {</div><div class='add'>+		WLAN_LOG_ERROR(</div><div class='add'>+			"Fatal, failed to submit RX URB, result=%d\n",</div><div class='add'>+			result);</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* call initialize */</div><div class='add'>+	result = hfa384x_cmd_initialize(hw);</div><div class='add'>+	if (result != 0) {</div><div class='add'>+		usb_kill_urb(&amp;hw-&gt;rx_urb);</div><div class='add'>+		WLAN_LOG_ERROR(</div><div class='add'>+			"cmd_initialize() failed, result=%d\n",</div><div class='add'>+			result);</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hw-&gt;state = HFA384x_STATE_RUNNING;</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_drvr_stop</div><div class='add'>+*</div><div class='add'>+* Shuts down the MAC to the point where it is safe to unload the</div><div class='add'>+* driver.  Any subsystem that may be holding a data or function</div><div class='add'>+* ptr into the driver must be cleared/deinitialized.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw		device structure</div><div class='add'>+* Returns:</div><div class='add'>+*	0		success</div><div class='add'>+*	&gt;0		f/w reported error - f/w status code</div><div class='add'>+*	&lt;0		driver reported error</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int</div><div class='add'>+hfa384x_drvr_stop(hfa384x_t *hw)</div><div class='add'>+{</div><div class='add'>+	int	result = 0;</div><div class='add'>+	int	i;</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	might_sleep();</div><div class='add'>+</div><div class='add'>+	/* There's no need for spinlocks here. The USB "disconnect"</div><div class='add'>+	 * function sets this "removed" flag and then calls us.</div><div class='add'>+	 */</div><div class='add'>+	if ( !hw-&gt;wlandev-&gt;hwremoved ) {</div><div class='add'>+		/* Call initialize to leave the MAC in its 'reset' state */</div><div class='add'>+		hfa384x_cmd_initialize(hw);</div><div class='add'>+</div><div class='add'>+		/* Cancel the rxurb */</div><div class='add'>+		usb_kill_urb(&amp;hw-&gt;rx_urb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hw-&gt;link_status = HFA384x_LINK_NOTCONNECTED;</div><div class='add'>+	hw-&gt;state = HFA384x_STATE_INIT;</div><div class='add'>+</div><div class='add'>+	del_timer_sync(&amp;hw-&gt;commsqual_timer);</div><div class='add'>+</div><div class='add'>+	/* Clear all the port status */</div><div class='add'>+	for ( i = 0; i &lt; HFA384x_NUMPORTS_MAX; i++) {</div><div class='add'>+		hw-&gt;port_enabled[i] = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_drvr_txframe</div><div class='add'>+*</div><div class='add'>+* Takes a frame from prism2sta and queues it for transmission.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw		device structure</div><div class='add'>+*	skb		packet buffer struct.  Contains an 802.11</div><div class='add'>+*			data frame.</div><div class='add'>+*       p80211_hdr      points to the 802.11 header for the packet.</div><div class='add'>+* Returns:</div><div class='add'>+*	0		Success and more buffs available</div><div class='add'>+*	1		Success but no more buffs</div><div class='add'>+*	2		Allocation failure</div><div class='add'>+*	4		Buffer full or queue busy</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	interrupt</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int hfa384x_drvr_txframe(hfa384x_t *hw, struct sk_buff *skb, p80211_hdr_t *p80211_hdr, p80211_metawep_t *p80211_wep)</div><div class='add'>+</div><div class='add'>+{</div><div class='add'>+	int		usbpktlen = sizeof(hfa384x_tx_frame_t);</div><div class='add'>+	int		result;</div><div class='add'>+	int		ret;</div><div class='add'>+	char		*ptr;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	if (hw-&gt;tx_urb.status == -EINPROGRESS) {</div><div class='add'>+		WLAN_LOG_WARNING("TX URB already in use\n");</div><div class='add'>+		result = 3;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Build Tx frame structure */</div><div class='add'>+	/* Set up the control field */</div><div class='add'>+	memset(&amp;hw-&gt;txbuff.txfrm.desc, 0, sizeof(hw-&gt;txbuff.txfrm.desc));</div><div class='add'>+</div><div class='add'>+	/* Setup the usb type field */</div><div class='add'>+	hw-&gt;txbuff.type = host2hfa384x_16(HFA384x_USB_TXFRM);</div><div class='add'>+</div><div class='add'>+	/* Set up the sw_support field to identify this frame */</div><div class='add'>+	hw-&gt;txbuff.txfrm.desc.sw_support = 0x0123;</div><div class='add'>+</div><div class='add'>+/* Tx complete and Tx exception disable per dleach.  Might be causing</div><div class='add'>+ * buf depletion</div><div class='add'>+ */</div><div class='add'>+//#define DOEXC  SLP -- doboth breaks horribly under load, doexc less so.</div><div class='add'>+#if defined(DOBOTH)</div><div class='add'>+	hw-&gt;txbuff.txfrm.desc.tx_control =</div><div class='add'>+		HFA384x_TX_MACPORT_SET(0) | HFA384x_TX_STRUCTYPE_SET(1) |</div><div class='add'>+		HFA384x_TX_TXEX_SET(1) | HFA384x_TX_TXOK_SET(1);</div><div class='add'>+#elif defined(DOEXC)</div><div class='add'>+	hw-&gt;txbuff.txfrm.desc.tx_control =</div><div class='add'>+		HFA384x_TX_MACPORT_SET(0) | HFA384x_TX_STRUCTYPE_SET(1) |</div><div class='add'>+		HFA384x_TX_TXEX_SET(1) | HFA384x_TX_TXOK_SET(0);</div><div class='add'>+#else</div><div class='add'>+	hw-&gt;txbuff.txfrm.desc.tx_control =</div><div class='add'>+		HFA384x_TX_MACPORT_SET(0) | HFA384x_TX_STRUCTYPE_SET(1) |</div><div class='add'>+		HFA384x_TX_TXEX_SET(0) | HFA384x_TX_TXOK_SET(0);</div><div class='add'>+#endif</div><div class='add'>+	hw-&gt;txbuff.txfrm.desc.tx_control =</div><div class='add'>+		host2hfa384x_16(hw-&gt;txbuff.txfrm.desc.tx_control);</div><div class='add'>+</div><div class='add'>+	/* copy the header over to the txdesc */</div><div class='add'>+	memcpy(&amp;(hw-&gt;txbuff.txfrm.desc.frame_control), p80211_hdr, sizeof(p80211_hdr_t));</div><div class='add'>+</div><div class='add'>+	/* if we're using host WEP, increase size by IV+ICV */</div><div class='add'>+	if (p80211_wep-&gt;data) {</div><div class='add'>+		hw-&gt;txbuff.txfrm.desc.data_len = host2hfa384x_16(skb-&gt;len+8);</div><div class='add'>+		// hw-&gt;txbuff.txfrm.desc.tx_control |= HFA384x_TX_NOENCRYPT_SET(1);</div><div class='add'>+		usbpktlen+=8;</div><div class='add'>+	} else {</div><div class='add'>+		hw-&gt;txbuff.txfrm.desc.data_len = host2hfa384x_16(skb-&gt;len);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	usbpktlen += skb-&gt;len;</div><div class='add'>+</div><div class='add'>+	/* copy over the WEP IV if we are using host WEP */</div><div class='add'>+	ptr = hw-&gt;txbuff.txfrm.data;</div><div class='add'>+	if (p80211_wep-&gt;data) {</div><div class='add'>+		memcpy(ptr, p80211_wep-&gt;iv, sizeof(p80211_wep-&gt;iv));</div><div class='add'>+		ptr+= sizeof(p80211_wep-&gt;iv);</div><div class='add'>+		memcpy(ptr, p80211_wep-&gt;data, skb-&gt;len);</div><div class='add'>+	} else {</div><div class='add'>+		memcpy(ptr, skb-&gt;data, skb-&gt;len);</div><div class='add'>+	}</div><div class='add'>+	/* copy over the packet data */</div><div class='add'>+	ptr+= skb-&gt;len;</div><div class='add'>+</div><div class='add'>+	/* copy over the WEP ICV if we are using host WEP */</div><div class='add'>+	if (p80211_wep-&gt;data) {</div><div class='add'>+		memcpy(ptr, p80211_wep-&gt;icv, sizeof(p80211_wep-&gt;icv));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Send the USB packet */</div><div class='add'>+	usb_fill_bulk_urb( &amp;(hw-&gt;tx_urb), hw-&gt;usb,</div><div class='add'>+	               hw-&gt;endp_out,</div><div class='add'>+	               &amp;(hw-&gt;txbuff), ROUNDUP64(usbpktlen),</div><div class='add'>+	               hfa384x_usbout_callback, hw-&gt;wlandev );</div><div class='add'>+	hw-&gt;tx_urb.transfer_flags |= USB_QUEUE_BULK;</div><div class='add'>+</div><div class='add'>+	result = 1;</div><div class='add'>+	ret = submit_tx_urb(hw, &amp;hw-&gt;tx_urb, GFP_ATOMIC);</div><div class='add'>+	if ( ret != 0 ) {</div><div class='add'>+		WLAN_LOG_ERROR(</div><div class='add'>+			"submit_tx_urb() failed, error=%d\n", ret);</div><div class='add'>+		result = 3;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+ exit:</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void hfa384x_tx_timeout(wlandevice_t *wlandev)</div><div class='add'>+{</div><div class='add'>+	hfa384x_t	*hw = wlandev-&gt;priv;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;hw-&gt;ctlxq.lock, flags);</div><div class='add'>+</div><div class='add'>+	if ( !hw-&gt;wlandev-&gt;hwremoved &amp;&amp;</div><div class='add'>+	     /* Note the bitwise OR, not the logical OR. */</div><div class='add'>+	     ( !test_and_set_bit(WORK_TX_HALT, &amp;hw-&gt;usb_flags) |</div><div class='add'>+	       !test_and_set_bit(WORK_RX_HALT, &amp;hw-&gt;usb_flags) ) )</div><div class='add'>+	{</div><div class='add'>+		schedule_work(&amp;hw-&gt;usb_work);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;hw-&gt;ctlxq.lock, flags);</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_usbctlx_reaper_task</div><div class='add'>+*</div><div class='add'>+* Tasklet to delete dead CTLX objects</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	data	ptr to a hfa384x_t</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	Interrupt</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+static void hfa384x_usbctlx_reaper_task(unsigned long data)</div><div class='add'>+{</div><div class='add'>+	hfa384x_t	*hw = (hfa384x_t*)data;</div><div class='add'>+	struct list_head *entry;</div><div class='add'>+	struct list_head *temp;</div><div class='add'>+	unsigned long	flags;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;hw-&gt;ctlxq.lock, flags);</div><div class='add'>+</div><div class='add'>+	/* This list is guaranteed to be empty if someone</div><div class='add'>+	 * has unplugged the adapter.</div><div class='add'>+	 */</div><div class='add'>+	list_for_each_safe(entry, temp, &amp;hw-&gt;ctlxq.reapable) {</div><div class='add'>+		hfa384x_usbctlx_t	*ctlx;</div><div class='add'>+</div><div class='add'>+		ctlx = list_entry(entry, hfa384x_usbctlx_t, list);</div><div class='add'>+		list_del(&amp;ctlx-&gt;list);</div><div class='add'>+		kfree(ctlx);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;hw-&gt;ctlxq.lock, flags);</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_usbctlx_completion_task</div><div class='add'>+*</div><div class='add'>+* Tasklet to call completion handlers for returned CTLXs</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	data	ptr to hfa384x_t</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	Nothing</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	Interrupt</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+static void hfa384x_usbctlx_completion_task(unsigned long data)</div><div class='add'>+{</div><div class='add'>+	hfa384x_t *hw = (hfa384x_t*)data;</div><div class='add'>+	struct list_head *entry;</div><div class='add'>+	struct list_head *temp;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	int reap = 0;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;hw-&gt;ctlxq.lock, flags);</div><div class='add'>+</div><div class='add'>+	/* This list is guaranteed to be empty if someone</div><div class='add'>+	 * has unplugged the adapter ...</div><div class='add'>+	 */</div><div class='add'>+	list_for_each_safe(entry, temp, &amp;hw-&gt;ctlxq.completing) {</div><div class='add'>+		hfa384x_usbctlx_t *ctlx;</div><div class='add'>+</div><div class='add'>+		ctlx = list_entry(entry, hfa384x_usbctlx_t, list);</div><div class='add'>+</div><div class='add'>+		/* Call the completion function that this</div><div class='add'>+		 * command was assigned, assuming it has one.</div><div class='add'>+		 */</div><div class='add'>+		if ( ctlx-&gt;cmdcb != NULL ) {</div><div class='add'>+			spin_unlock_irqrestore(&amp;hw-&gt;ctlxq.lock, flags);</div><div class='add'>+			ctlx-&gt;cmdcb(hw, ctlx);</div><div class='add'>+			spin_lock_irqsave(&amp;hw-&gt;ctlxq.lock, flags);</div><div class='add'>+</div><div class='add'>+			/* Make sure we don't try and complete</div><div class='add'>+			 * this CTLX more than once!</div><div class='add'>+			 */</div><div class='add'>+			ctlx-&gt;cmdcb = NULL;</div><div class='add'>+</div><div class='add'>+			/* Did someone yank the adapter out</div><div class='add'>+			 * while our list was (briefly) unlocked?</div><div class='add'>+			 */</div><div class='add'>+			if ( hw-&gt;wlandev-&gt;hwremoved )</div><div class='add'>+			{</div><div class='add'>+				reap = 0;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * "Reapable" CTLXs are ones which don't have any</div><div class='add'>+		 * threads waiting for them to die. Hence they must</div><div class='add'>+		 * be delivered to The Reaper!</div><div class='add'>+		 */</div><div class='add'>+		if ( ctlx-&gt;reapable ) {</div><div class='add'>+			/* Move the CTLX off the "completing" list (hopefully)</div><div class='add'>+			 * on to the "reapable" list where the reaper task</div><div class='add'>+			 * can find it. And "reapable" means that this CTLX</div><div class='add'>+			 * isn't sitting on a wait-queue somewhere.</div><div class='add'>+			 */</div><div class='add'>+			list_move_tail(&amp;ctlx-&gt;list, &amp;hw-&gt;ctlxq.reapable);</div><div class='add'>+			reap = 1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		complete(&amp;ctlx-&gt;done);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;hw-&gt;ctlxq.lock, flags);</div><div class='add'>+</div><div class='add'>+	if (reap)</div><div class='add'>+		tasklet_schedule(&amp;hw-&gt;reaper_bh);</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* unlocked_usbctlx_cancel_async</div><div class='add'>+*</div><div class='add'>+* Mark the CTLX dead asynchronously, and ensure that the</div><div class='add'>+* next command on the queue is run afterwards.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw	ptr to the hfa384x_t structure</div><div class='add'>+*	ctlx	ptr to a CTLX structure</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0	the CTLX's URB is inactive</div><div class='add'>+* -EINPROGRESS	the URB is currently being unlinked</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	Either process or interrupt, but presumably interrupt</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+static int unlocked_usbctlx_cancel_async(hfa384x_t *hw, hfa384x_usbctlx_t *ctlx)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Try to delete the URB containing our request packet.</div><div class='add'>+	 * If we succeed, then its completion handler will be</div><div class='add'>+	 * called with a status of -ECONNRESET.</div><div class='add'>+	 */</div><div class='add'>+	hw-&gt;ctlx_urb.transfer_flags |= URB_ASYNC_UNLINK;</div><div class='add'>+	ret = usb_unlink_urb(&amp;hw-&gt;ctlx_urb);</div><div class='add'>+</div><div class='add'>+	if (ret != -EINPROGRESS) {</div><div class='add'>+		/*</div><div class='add'>+		 * The OUT URB had either already completed</div><div class='add'>+		 * or was still in the pending queue, so the</div><div class='add'>+		 * URB's completion function will not be called.</div><div class='add'>+		 * We will have to complete the CTLX ourselves.</div><div class='add'>+		 */</div><div class='add'>+		ctlx-&gt;state = CTLX_REQ_FAILED;</div><div class='add'>+		unlocked_usbctlx_complete(hw, ctlx);</div><div class='add'>+		ret = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* unlocked_usbctlx_complete</div><div class='add'>+*</div><div class='add'>+* A CTLX has completed.  It may have been successful, it may not</div><div class='add'>+* have been. At this point, the CTLX should be quiescent.  The URBs</div><div class='add'>+* aren't active and the timers should have been stopped.</div><div class='add'>+*</div><div class='add'>+* The CTLX is migrated to the "completing" queue, and the completing</div><div class='add'>+* tasklet is scheduled.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw		ptr to a hfa384x_t structure</div><div class='add'>+*	ctlx		ptr to a ctlx structure</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	nothing</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	Either, assume interrupt</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+static void unlocked_usbctlx_complete(hfa384x_t *hw, hfa384x_usbctlx_t *ctlx)</div><div class='add'>+{</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	/* Timers have been stopped, and ctlx should be in</div><div class='add'>+	 * a terminal state. Retire it from the "active"</div><div class='add'>+	 * queue.</div><div class='add'>+	 */</div><div class='add'>+	list_move_tail(&amp;ctlx-&gt;list, &amp;hw-&gt;ctlxq.completing);</div><div class='add'>+	tasklet_schedule(&amp;hw-&gt;completion_bh);</div><div class='add'>+</div><div class='add'>+	switch (ctlx-&gt;state) {</div><div class='add'>+	case CTLX_COMPLETE:</div><div class='add'>+	case CTLX_REQ_FAILED:</div><div class='add'>+		/* This are the correct terminating states. */</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		WLAN_LOG_ERROR("CTLX[%d] not in a terminating state(%s)\n",</div><div class='add'>+		               hfa384x2host_16(ctlx-&gt;outbuf.type),</div><div class='add'>+		               ctlxstr(ctlx-&gt;state));</div><div class='add'>+		break;</div><div class='add'>+	} /* switch */</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_usbctlxq_run</div><div class='add'>+*</div><div class='add'>+* Checks to see if the head item is running.  If not, starts it.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw	ptr to hfa384x_t</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	nothing</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	any</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+static void</div><div class='add'>+hfa384x_usbctlxq_run(hfa384x_t	*hw)</div><div class='add'>+{</div><div class='add'>+	unsigned long		flags;</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	/* acquire lock */</div><div class='add'>+	spin_lock_irqsave(&amp;hw-&gt;ctlxq.lock, flags);</div><div class='add'>+</div><div class='add'>+	/* Only one active CTLX at any one time, because there's no</div><div class='add'>+	 * other (reliable) way to match the response URB to the</div><div class='add'>+	 * correct CTLX.</div><div class='add'>+	 *</div><div class='add'>+	 * Don't touch any of these CTLXs if the hardware</div><div class='add'>+	 * has been removed or the USB subsystem is stalled.</div><div class='add'>+	 */</div><div class='add'>+	if ( !list_empty(&amp;hw-&gt;ctlxq.active) ||</div><div class='add'>+	     test_bit(WORK_TX_HALT, &amp;hw-&gt;usb_flags) ||</div><div class='add'>+	     hw-&gt;wlandev-&gt;hwremoved )</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	while ( !list_empty(&amp;hw-&gt;ctlxq.pending) ) {</div><div class='add'>+		hfa384x_usbctlx_t	*head;</div><div class='add'>+		int			result;</div><div class='add'>+</div><div class='add'>+		/* This is the first pending command */</div><div class='add'>+		head = list_entry(hw-&gt;ctlxq.pending.next,</div><div class='add'>+		                  hfa384x_usbctlx_t,</div><div class='add'>+		                  list);</div><div class='add'>+</div><div class='add'>+		/* We need to split this off to avoid a race condition */</div><div class='add'>+		list_move_tail(&amp;head-&gt;list, &amp;hw-&gt;ctlxq.active);</div><div class='add'>+</div><div class='add'>+		/* Fill the out packet */</div><div class='add'>+		usb_fill_bulk_urb( &amp;(hw-&gt;ctlx_urb), hw-&gt;usb,</div><div class='add'>+		                   hw-&gt;endp_out,</div><div class='add'>+		                   &amp;(head-&gt;outbuf), ROUNDUP64(head-&gt;outbufsize),</div><div class='add'>+		                   hfa384x_ctlxout_callback, hw);</div><div class='add'>+		hw-&gt;ctlx_urb.transfer_flags |= USB_QUEUE_BULK;</div><div class='add'>+</div><div class='add'>+		/* Now submit the URB and update the CTLX's state</div><div class='add'>+		 */</div><div class='add'>+		if ((result = SUBMIT_URB(&amp;hw-&gt;ctlx_urb, GFP_ATOMIC)) == 0) {</div><div class='add'>+			/* This CTLX is now running on the active queue */</div><div class='add'>+			head-&gt;state = CTLX_REQ_SUBMITTED;</div><div class='add'>+</div><div class='add'>+			/* Start the OUT wait timer */</div><div class='add'>+			hw-&gt;req_timer_done = 0;</div><div class='add'>+			hw-&gt;reqtimer.expires = jiffies + HZ;</div><div class='add'>+			add_timer(&amp;hw-&gt;reqtimer);</div><div class='add'>+</div><div class='add'>+			/* Start the IN wait timer */</div><div class='add'>+			hw-&gt;resp_timer_done = 0;</div><div class='add'>+			hw-&gt;resptimer.expires = jiffies + 2*HZ;</div><div class='add'>+			add_timer(&amp;hw-&gt;resptimer);</div><div class='add'>+</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (result == -EPIPE) {</div><div class='add'>+			/* The OUT pipe needs resetting, so put</div><div class='add'>+			 * this CTLX back in the "pending" queue</div><div class='add'>+			 * and schedule a reset ...</div><div class='add'>+			 */</div><div class='add'>+			WLAN_LOG_WARNING("%s tx pipe stalled: requesting reset\n",</div><div class='add'>+			                 hw-&gt;wlandev-&gt;netdev-&gt;name);</div><div class='add'>+			list_move(&amp;head-&gt;list, &amp;hw-&gt;ctlxq.pending);</div><div class='add'>+			set_bit(WORK_TX_HALT, &amp;hw-&gt;usb_flags);</div><div class='add'>+			schedule_work(&amp;hw-&gt;usb_work);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (result == -ESHUTDOWN) {</div><div class='add'>+			WLAN_LOG_WARNING("%s urb shutdown!\n",</div><div class='add'>+					 hw-&gt;wlandev-&gt;netdev-&gt;name);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		WLAN_LOG_ERROR("Failed to submit CTLX[%d]: error=%d\n",</div><div class='add'>+		               hfa384x2host_16(head-&gt;outbuf.type), result);</div><div class='add'>+		unlocked_usbctlx_complete(hw, head);</div><div class='add'>+	} /* while */</div><div class='add'>+</div><div class='add'>+	unlock:</div><div class='add'>+	spin_unlock_irqrestore(&amp;hw-&gt;ctlxq.lock, flags);</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_usbin_callback</div><div class='add'>+*</div><div class='add'>+* Callback for URBs on the BULKIN endpoint.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	urb		ptr to the completed urb</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	nothing</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	interrupt</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+#ifdef URB_ONLY_CALLBACK</div><div class='add'>+static void hfa384x_usbin_callback(struct urb *urb)</div><div class='add'>+#else</div><div class='add'>+static void hfa384x_usbin_callback(struct urb *urb, struct pt_regs *regs)</div><div class='add'>+#endif</div><div class='add'>+{</div><div class='add'>+	wlandevice_t		*wlandev = urb-&gt;context;</div><div class='add'>+	hfa384x_t		*hw;</div><div class='add'>+	hfa384x_usbin_t		*usbin = (hfa384x_usbin_t *) urb-&gt;transfer_buffer;</div><div class='add'>+	struct sk_buff          *skb = NULL;</div><div class='add'>+	int			result;</div><div class='add'>+	int                     urb_status;</div><div class='add'>+	UINT16			type;</div><div class='add'>+</div><div class='add'>+	enum USBIN_ACTION {</div><div class='add'>+		HANDLE,</div><div class='add'>+		RESUBMIT,</div><div class='add'>+		ABORT</div><div class='add'>+	} action;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	if ( !wlandev ||</div><div class='add'>+	     !wlandev-&gt;netdev ||</div><div class='add'>+	     !netif_device_present(wlandev-&gt;netdev) )</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	hw = wlandev-&gt;priv;</div><div class='add'>+	if (!hw)</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	skb = hw-&gt;rx_urb_skb;</div><div class='add'>+	if (!skb || (skb-&gt;data != urb-&gt;transfer_buffer)) {</div><div class='add'>+		BUG();</div><div class='add'>+	}</div><div class='add'>+	hw-&gt;rx_urb_skb = NULL;</div><div class='add'>+</div><div class='add'>+	/* Check for error conditions within the URB */</div><div class='add'>+	switch (urb-&gt;status) {</div><div class='add'>+	case 0:</div><div class='add'>+		action = HANDLE;</div><div class='add'>+</div><div class='add'>+		/* Check for short packet */</div><div class='add'>+		if ( urb-&gt;actual_length == 0 ) {</div><div class='add'>+			++(wlandev-&gt;linux_stats.rx_errors);</div><div class='add'>+			++(wlandev-&gt;linux_stats.rx_length_errors);</div><div class='add'>+			action = RESUBMIT;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case -EPIPE:</div><div class='add'>+		WLAN_LOG_WARNING("%s rx pipe stalled: requesting reset\n",</div><div class='add'>+		                 wlandev-&gt;netdev-&gt;name);</div><div class='add'>+		if ( !test_and_set_bit(WORK_RX_HALT, &amp;hw-&gt;usb_flags) )</div><div class='add'>+			schedule_work(&amp;hw-&gt;usb_work);</div><div class='add'>+		++(wlandev-&gt;linux_stats.rx_errors);</div><div class='add'>+		action = ABORT;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case -EILSEQ:</div><div class='add'>+	case -ETIMEDOUT:</div><div class='add'>+	case -EPROTO:</div><div class='add'>+		if ( !test_and_set_bit(THROTTLE_RX, &amp;hw-&gt;usb_flags) &amp;&amp;</div><div class='add'>+		     !timer_pending(&amp;hw-&gt;throttle) ) {</div><div class='add'>+			mod_timer(&amp;hw-&gt;throttle, jiffies + THROTTLE_JIFFIES);</div><div class='add'>+		}</div><div class='add'>+		++(wlandev-&gt;linux_stats.rx_errors);</div><div class='add'>+		action = ABORT;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case -EOVERFLOW:</div><div class='add'>+		++(wlandev-&gt;linux_stats.rx_over_errors);</div><div class='add'>+		action = RESUBMIT;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case -ENODEV:</div><div class='add'>+	case -ESHUTDOWN:</div><div class='add'>+		WLAN_LOG_DEBUG(3,"status=%d, device removed.\n", urb-&gt;status);</div><div class='add'>+		action = ABORT;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case -ENOENT:</div><div class='add'>+	case -ECONNRESET:</div><div class='add'>+		WLAN_LOG_DEBUG(3,"status=%d, urb explicitly unlinked.\n", urb-&gt;status);</div><div class='add'>+		action = ABORT;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		WLAN_LOG_DEBUG(3,"urb status=%d, transfer flags=0x%x\n",</div><div class='add'>+		                 urb-&gt;status, urb-&gt;transfer_flags);</div><div class='add'>+		++(wlandev-&gt;linux_stats.rx_errors);</div><div class='add'>+		action = RESUBMIT;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	urb_status = urb-&gt;status;</div><div class='add'>+</div><div class='add'>+	if (action != ABORT) {</div><div class='add'>+		/* Repost the RX URB */</div><div class='add'>+		result = submit_rx_urb(hw, GFP_ATOMIC);</div><div class='add'>+</div><div class='add'>+		if (result != 0) {</div><div class='add'>+			WLAN_LOG_ERROR(</div><div class='add'>+				"Fatal, failed to resubmit rx_urb. error=%d\n",</div><div class='add'>+				result);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Handle any USB-IN packet */</div><div class='add'>+	/* Note: the check of the sw_support field, the type field doesn't</div><div class='add'>+	 *       have bit 12 set like the docs suggest.</div><div class='add'>+	 */</div><div class='add'>+	type = hfa384x2host_16(usbin-&gt;type);</div><div class='add'>+	if (HFA384x_USB_ISRXFRM(type)) {</div><div class='add'>+		if (action == HANDLE) {</div><div class='add'>+			if (usbin-&gt;txfrm.desc.sw_support == 0x0123) {</div><div class='add'>+				hfa384x_usbin_txcompl(wlandev, usbin);</div><div class='add'>+			} else {</div><div class='add'>+				skb_put(skb, sizeof(*usbin));</div><div class='add'>+				hfa384x_usbin_rx(wlandev, skb);</div><div class='add'>+				skb = NULL;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+	if (HFA384x_USB_ISTXFRM(type)) {</div><div class='add'>+		if (action == HANDLE)</div><div class='add'>+			hfa384x_usbin_txcompl(wlandev, usbin);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+	switch (type) {</div><div class='add'>+	case HFA384x_USB_INFOFRM:</div><div class='add'>+		if (action == ABORT)</div><div class='add'>+			goto exit;</div><div class='add'>+		if (action == HANDLE)</div><div class='add'>+			hfa384x_usbin_info(wlandev, usbin);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case HFA384x_USB_CMDRESP:</div><div class='add'>+	case HFA384x_USB_WRIDRESP:</div><div class='add'>+	case HFA384x_USB_RRIDRESP:</div><div class='add'>+	case HFA384x_USB_WMEMRESP:</div><div class='add'>+	case HFA384x_USB_RMEMRESP:</div><div class='add'>+		/* ALWAYS, ALWAYS, ALWAYS handle this CTLX!!!! */</div><div class='add'>+		hfa384x_usbin_ctlx(hw, usbin, urb_status);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case HFA384x_USB_BUFAVAIL:</div><div class='add'>+		WLAN_LOG_DEBUG(3,"Received BUFAVAIL packet, frmlen=%d\n",</div><div class='add'>+			usbin-&gt;bufavail.frmlen);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case HFA384x_USB_ERROR:</div><div class='add'>+		WLAN_LOG_DEBUG(3,"Received USB_ERROR packet, errortype=%d\n",</div><div class='add'>+			usbin-&gt;usberror.errortype);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		WLAN_LOG_DEBUG(3,"Unrecognized USBIN packet, type=%x, status=%d\n",</div><div class='add'>+			usbin-&gt;type, urb_status);</div><div class='add'>+		break;</div><div class='add'>+	} /* switch */</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+</div><div class='add'>+	if (skb)</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_usbin_ctlx</div><div class='add'>+*</div><div class='add'>+* We've received a URB containing a Prism2 "response" message.</div><div class='add'>+* This message needs to be matched up with a CTLX on the active</div><div class='add'>+* queue and our state updated accordingly.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw		ptr to hfa384x_t</div><div class='add'>+*	usbin		ptr to USB IN packet</div><div class='add'>+*	urb_status	status of this Bulk-In URB</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	nothing</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	interrupt</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+static void hfa384x_usbin_ctlx(hfa384x_t *hw, hfa384x_usbin_t *usbin,</div><div class='add'>+			       int urb_status)</div><div class='add'>+{</div><div class='add'>+	hfa384x_usbctlx_t	*ctlx;</div><div class='add'>+	int			run_queue = 0;</div><div class='add'>+	unsigned long		flags;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+retry:</div><div class='add'>+	spin_lock_irqsave(&amp;hw-&gt;ctlxq.lock, flags);</div><div class='add'>+</div><div class='add'>+	/* There can be only one CTLX on the active queue</div><div class='add'>+	 * at any one time, and this is the CTLX that the</div><div class='add'>+	 * timers are waiting for.</div><div class='add'>+	 */</div><div class='add'>+	if ( list_empty(&amp;hw-&gt;ctlxq.active) ) {</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Remove the "response timeout". It's possible that</div><div class='add'>+	 * we are already too late, and that the timeout is</div><div class='add'>+	 * already running. And that's just too bad for us,</div><div class='add'>+	 * because we could lose our CTLX from the active</div><div class='add'>+	 * queue here ...</div><div class='add'>+	 */</div><div class='add'>+	if (del_timer(&amp;hw-&gt;resptimer) == 0) {</div><div class='add'>+		if (hw-&gt;resp_timer_done == 0) {</div><div class='add'>+			spin_unlock_irqrestore(&amp;hw-&gt;ctlxq.lock, flags);</div><div class='add'>+			goto retry;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	else {</div><div class='add'>+		hw-&gt;resp_timer_done = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ctlx = get_active_ctlx(hw);</div><div class='add'>+</div><div class='add'>+	if (urb_status != 0) {</div><div class='add'>+		/*</div><div class='add'>+		 * Bad CTLX, so get rid of it. But we only</div><div class='add'>+		 * remove it from the active queue if we're no</div><div class='add'>+		 * longer expecting the OUT URB to complete.</div><div class='add'>+		 */</div><div class='add'>+		if (unlocked_usbctlx_cancel_async(hw, ctlx) == 0)</div><div class='add'>+			run_queue = 1;</div><div class='add'>+	} else {</div><div class='add'>+		const UINT16 intype = (usbin-&gt;type&amp;~host2hfa384x_16(0x8000));</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Check that our message is what we're expecting ...</div><div class='add'>+		 */</div><div class='add'>+		if (ctlx-&gt;outbuf.type != intype) {</div><div class='add'>+			WLAN_LOG_WARNING("Expected IN[%d], received IN[%d] - ignored.\n",</div><div class='add'>+			                 hfa384x2host_16(ctlx-&gt;outbuf.type),</div><div class='add'>+			                 hfa384x2host_16(intype));</div><div class='add'>+			goto unlock;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* This URB has succeeded, so grab the data ... */</div><div class='add'>+		memcpy(&amp;ctlx-&gt;inbuf, usbin, sizeof(ctlx-&gt;inbuf));</div><div class='add'>+</div><div class='add'>+		switch (ctlx-&gt;state) {</div><div class='add'>+		case CTLX_REQ_SUBMITTED:</div><div class='add'>+			/*</div><div class='add'>+			 * We have received our response URB before</div><div class='add'>+			 * our request has been acknowledged. Odd,</div><div class='add'>+			 * but our OUT URB is still alive...</div><div class='add'>+			 */</div><div class='add'>+			WLAN_LOG_DEBUG(0, "Causality violation: please reboot Universe, or email linux-wlan-devel@lists.linux-wlan.com\n");</div><div class='add'>+			ctlx-&gt;state = CTLX_RESP_COMPLETE;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case CTLX_REQ_COMPLETE:</div><div class='add'>+			/*</div><div class='add'>+			 * This is the usual path: our request</div><div class='add'>+			 * has already been acknowledged, and</div><div class='add'>+			 * now we have received the reply too.</div><div class='add'>+			 */</div><div class='add'>+			ctlx-&gt;state = CTLX_COMPLETE;</div><div class='add'>+			unlocked_usbctlx_complete(hw, ctlx);</div><div class='add'>+			run_queue = 1;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		default:</div><div class='add'>+			/*</div><div class='add'>+			 * Throw this CTLX away ...</div><div class='add'>+			 */</div><div class='add'>+			WLAN_LOG_ERROR("Matched IN URB, CTLX[%d] in invalid state(%s)."</div><div class='add'>+			               " Discarded.\n",</div><div class='add'>+			               hfa384x2host_16(ctlx-&gt;outbuf.type),</div><div class='add'>+			               ctlxstr(ctlx-&gt;state));</div><div class='add'>+			if (unlocked_usbctlx_cancel_async(hw, ctlx) == 0)</div><div class='add'>+				run_queue = 1;</div><div class='add'>+			break;</div><div class='add'>+		} /* switch */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	spin_unlock_irqrestore(&amp;hw-&gt;ctlxq.lock, flags);</div><div class='add'>+</div><div class='add'>+	if (run_queue)</div><div class='add'>+		hfa384x_usbctlxq_run(hw);</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_usbin_txcompl</div><div class='add'>+*</div><div class='add'>+* At this point we have the results of a previous transmit.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		wlan device</div><div class='add'>+*	usbin		ptr to the usb transfer buffer</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	nothing</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	interrupt</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+static void hfa384x_usbin_txcompl(wlandevice_t *wlandev, hfa384x_usbin_t *usbin)</div><div class='add'>+{</div><div class='add'>+	UINT16			status;</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	status = hfa384x2host_16(usbin-&gt;type); /* yeah I know it says type...*/</div><div class='add'>+</div><div class='add'>+	/* Was there an error? */</div><div class='add'>+	if (HFA384x_TXSTATUS_ISERROR(status)) {</div><div class='add'>+		prism2sta_ev_txexc(wlandev, status);</div><div class='add'>+	} else {</div><div class='add'>+		prism2sta_ev_tx(wlandev, status);</div><div class='add'>+	}</div><div class='add'>+	// prism2sta_ev_alloc(wlandev);</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_usbin_rx</div><div class='add'>+*</div><div class='add'>+* At this point we have a successful received a rx frame packet.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		wlan device</div><div class='add'>+*	usbin		ptr to the usb transfer buffer</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	nothing</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	interrupt</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+static void hfa384x_usbin_rx(wlandevice_t *wlandev, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	hfa384x_usbin_t         *usbin = (hfa384x_usbin_t *) skb-&gt;data;</div><div class='add'>+	hfa384x_t               *hw = wlandev-&gt;priv;</div><div class='add'>+	int                     hdrlen;</div><div class='add'>+	p80211_rxmeta_t         *rxmeta;</div><div class='add'>+	UINT16                  data_len;</div><div class='add'>+	UINT16                  fc;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	/* Byte order convert once up front. */</div><div class='add'>+	usbin-&gt;rxfrm.desc.status =</div><div class='add'>+		hfa384x2host_16(usbin-&gt;rxfrm.desc.status);</div><div class='add'>+	usbin-&gt;rxfrm.desc.time =</div><div class='add'>+		hfa384x2host_32(usbin-&gt;rxfrm.desc.time);</div><div class='add'>+</div><div class='add'>+	/* Now handle frame based on port# */</div><div class='add'>+	switch( HFA384x_RXSTATUS_MACPORT_GET(usbin-&gt;rxfrm.desc.status) )</div><div class='add'>+	{</div><div class='add'>+	case 0:</div><div class='add'>+		fc = ieee2host16(usbin-&gt;rxfrm.desc.frame_control);</div><div class='add'>+</div><div class='add'>+		/* If exclude and we receive an unencrypted, drop it */</div><div class='add'>+		if ( (wlandev-&gt;hostwep &amp; HOSTWEP_EXCLUDEUNENCRYPTED) &amp;&amp;</div><div class='add'>+		     !WLAN_GET_FC_ISWEP(fc)){</div><div class='add'>+			goto done;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		data_len = hfa384x2host_16(usbin-&gt;rxfrm.desc.data_len);</div><div class='add'>+</div><div class='add'>+		/* How much header data do we have? */</div><div class='add'>+		hdrlen = p80211_headerlen(fc);</div><div class='add'>+</div><div class='add'>+		/* Pull off the descriptor */</div><div class='add'>+		skb_pull(skb, sizeof(hfa384x_rx_frame_t));</div><div class='add'>+</div><div class='add'>+		/* Now shunt the header block up against the data block</div><div class='add'>+		 * with an "overlapping" copy</div><div class='add'>+		 */</div><div class='add'>+		memmove(skb_push(skb, hdrlen),</div><div class='add'>+		        &amp;usbin-&gt;rxfrm.desc.frame_control,</div><div class='add'>+		        hdrlen);</div><div class='add'>+</div><div class='add'>+		skb-&gt;dev = wlandev-&gt;netdev;</div><div class='add'>+		skb-&gt;dev-&gt;last_rx = jiffies;</div><div class='add'>+</div><div class='add'>+		/* And set the frame length properly */</div><div class='add'>+		skb_trim(skb, data_len + hdrlen);</div><div class='add'>+</div><div class='add'>+		/* The prism2 series does not return the CRC */</div><div class='add'>+		memset(skb_put(skb, WLAN_CRC_LEN), 0xff, WLAN_CRC_LEN);</div><div class='add'>+</div><div class='add'>+		skb_reset_mac_header(skb);</div><div class='add'>+</div><div class='add'>+		/* Attach the rxmeta, set some stuff */</div><div class='add'>+		p80211skb_rxmeta_attach(wlandev, skb);</div><div class='add'>+		rxmeta = P80211SKB_RXMETA(skb);</div><div class='add'>+		rxmeta-&gt;mactime = usbin-&gt;rxfrm.desc.time;</div><div class='add'>+		rxmeta-&gt;rxrate = usbin-&gt;rxfrm.desc.rate;</div><div class='add'>+		rxmeta-&gt;signal = usbin-&gt;rxfrm.desc.signal - hw-&gt;dbmadjust;</div><div class='add'>+		rxmeta-&gt;noise = usbin-&gt;rxfrm.desc.silence - hw-&gt;dbmadjust;</div><div class='add'>+</div><div class='add'>+		prism2sta_ev_rx(wlandev, skb);</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 7:</div><div class='add'>+		if ( ! HFA384x_RXSTATUS_ISFCSERR(usbin-&gt;rxfrm.desc.status) ) {</div><div class='add'>+			/* Copy to wlansnif skb */</div><div class='add'>+			hfa384x_int_rxmonitor( wlandev, &amp;usbin-&gt;rxfrm);</div><div class='add'>+			dev_kfree_skb(skb);</div><div class='add'>+		} else {</div><div class='add'>+			WLAN_LOG_DEBUG(3,"Received monitor frame: FCSerr set\n");</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		WLAN_LOG_WARNING("Received frame on unsupported port=%d\n",</div><div class='add'>+			HFA384x_RXSTATUS_MACPORT_GET(usbin-&gt;rxfrm.desc.status) );</div><div class='add'>+		goto done;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_int_rxmonitor</div><div class='add'>+*</div><div class='add'>+* Helper function for int_rx.  Handles monitor frames.</div><div class='add'>+* Note that this function allocates space for the FCS and sets it</div><div class='add'>+* to 0xffffffff.  The hfa384x doesn't give us the FCS value but the</div><div class='add'>+* higher layers expect it.  0xffffffff is used as a flag to indicate</div><div class='add'>+* the FCS is bogus.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		wlan device structure</div><div class='add'>+*	rxfrm		rx descriptor read from card in int_rx</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	nothing</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*	Allocates an skb and passes it up via the PF_PACKET interface.</div><div class='add'>+* Call context:</div><div class='add'>+*	interrupt</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+static void hfa384x_int_rxmonitor( wlandevice_t *wlandev, hfa384x_usb_rxfrm_t *rxfrm)</div><div class='add'>+{</div><div class='add'>+	hfa384x_rx_frame_t              *rxdesc = &amp;(rxfrm-&gt;desc);</div><div class='add'>+	UINT				hdrlen = 0;</div><div class='add'>+	UINT				datalen = 0;</div><div class='add'>+	UINT				skblen = 0;</div><div class='add'>+	p80211msg_lnxind_wlansniffrm_t	*msg;</div><div class='add'>+	UINT8				*datap;</div><div class='add'>+	UINT16				fc;</div><div class='add'>+	struct sk_buff			*skb;</div><div class='add'>+	hfa384x_t		        *hw = wlandev-&gt;priv;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+	/* Don't forget the status, time, and data_len fields are in host order */</div><div class='add'>+	/* Figure out how big the frame is */</div><div class='add'>+	fc = ieee2host16(rxdesc-&gt;frame_control);</div><div class='add'>+	hdrlen = p80211_headerlen(fc);</div><div class='add'>+	datalen = hfa384x2host_16(rxdesc-&gt;data_len);</div><div class='add'>+</div><div class='add'>+	/* Allocate an ind message+framesize skb */</div><div class='add'>+	skblen = sizeof(p80211msg_lnxind_wlansniffrm_t) +</div><div class='add'>+		hdrlen + datalen + WLAN_CRC_LEN;</div><div class='add'>+</div><div class='add'>+	/* sanity check the length */</div><div class='add'>+	if ( skblen &gt;</div><div class='add'>+		(sizeof(p80211msg_lnxind_wlansniffrm_t) +</div><div class='add'>+		WLAN_HDR_A4_LEN + WLAN_DATA_MAXLEN + WLAN_CRC_LEN) ) {</div><div class='add'>+		WLAN_LOG_DEBUG(1, "overlen frm: len=%zd\n",</div><div class='add'>+			skblen - sizeof(p80211msg_lnxind_wlansniffrm_t));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ( (skb = dev_alloc_skb(skblen)) == NULL ) {</div><div class='add'>+		WLAN_LOG_ERROR("alloc_skb failed trying to allocate %d bytes\n", skblen);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* only prepend the prism header if in the right mode */</div><div class='add'>+	if ((wlandev-&gt;netdev-&gt;type == ARPHRD_IEEE80211_PRISM) &amp;&amp;</div><div class='add'>+	    (hw-&gt;sniffhdr == 0)) {</div><div class='add'>+		datap = skb_put(skb, sizeof(p80211msg_lnxind_wlansniffrm_t));</div><div class='add'>+		msg = (p80211msg_lnxind_wlansniffrm_t*) datap;</div><div class='add'>+</div><div class='add'>+		/* Initialize the message members */</div><div class='add'>+		msg-&gt;msgcode = DIDmsg_lnxind_wlansniffrm;</div><div class='add'>+		msg-&gt;msglen = sizeof(p80211msg_lnxind_wlansniffrm_t);</div><div class='add'>+		strcpy(msg-&gt;devname, wlandev-&gt;name);</div><div class='add'>+</div><div class='add'>+		msg-&gt;hosttime.did = DIDmsg_lnxind_wlansniffrm_hosttime;</div><div class='add'>+		msg-&gt;hosttime.status = 0;</div><div class='add'>+		msg-&gt;hosttime.len = 4;</div><div class='add'>+		msg-&gt;hosttime.data = jiffies;</div><div class='add'>+</div><div class='add'>+		msg-&gt;mactime.did = DIDmsg_lnxind_wlansniffrm_mactime;</div><div class='add'>+		msg-&gt;mactime.status = 0;</div><div class='add'>+		msg-&gt;mactime.len = 4;</div><div class='add'>+		msg-&gt;mactime.data = rxdesc-&gt;time;</div><div class='add'>+</div><div class='add'>+		msg-&gt;channel.did = DIDmsg_lnxind_wlansniffrm_channel;</div><div class='add'>+		msg-&gt;channel.status = 0;</div><div class='add'>+		msg-&gt;channel.len = 4;</div><div class='add'>+		msg-&gt;channel.data = hw-&gt;sniff_channel;</div><div class='add'>+</div><div class='add'>+		msg-&gt;rssi.did = DIDmsg_lnxind_wlansniffrm_rssi;</div><div class='add'>+		msg-&gt;rssi.status = P80211ENUM_msgitem_status_no_value;</div><div class='add'>+		msg-&gt;rssi.len = 4;</div><div class='add'>+		msg-&gt;rssi.data = 0;</div><div class='add'>+</div><div class='add'>+		msg-&gt;sq.did = DIDmsg_lnxind_wlansniffrm_sq;</div><div class='add'>+		msg-&gt;sq.status = P80211ENUM_msgitem_status_no_value;</div><div class='add'>+		msg-&gt;sq.len = 4;</div><div class='add'>+		msg-&gt;sq.data = 0;</div><div class='add'>+</div><div class='add'>+		msg-&gt;signal.did = DIDmsg_lnxind_wlansniffrm_signal;</div><div class='add'>+		msg-&gt;signal.status = 0;</div><div class='add'>+		msg-&gt;signal.len = 4;</div><div class='add'>+		msg-&gt;signal.data = rxdesc-&gt;signal;</div><div class='add'>+</div><div class='add'>+		msg-&gt;noise.did = DIDmsg_lnxind_wlansniffrm_noise;</div><div class='add'>+		msg-&gt;noise.status = 0;</div><div class='add'>+		msg-&gt;noise.len = 4;</div><div class='add'>+		msg-&gt;noise.data = rxdesc-&gt;silence;</div><div class='add'>+</div><div class='add'>+		msg-&gt;rate.did = DIDmsg_lnxind_wlansniffrm_rate;</div><div class='add'>+		msg-&gt;rate.status = 0;</div><div class='add'>+		msg-&gt;rate.len = 4;</div><div class='add'>+		msg-&gt;rate.data = rxdesc-&gt;rate / 5; /* set to 802.11 units */</div><div class='add'>+</div><div class='add'>+		msg-&gt;istx.did = DIDmsg_lnxind_wlansniffrm_istx;</div><div class='add'>+		msg-&gt;istx.status = 0;</div><div class='add'>+		msg-&gt;istx.len = 4;</div><div class='add'>+		msg-&gt;istx.data = P80211ENUM_truth_false;</div><div class='add'>+</div><div class='add'>+		msg-&gt;frmlen.did = DIDmsg_lnxind_wlansniffrm_frmlen;</div><div class='add'>+		msg-&gt;frmlen.status = 0;</div><div class='add'>+		msg-&gt;frmlen.len = 4;</div><div class='add'>+		msg-&gt;frmlen.data = hdrlen + datalen + WLAN_CRC_LEN;</div><div class='add'>+	} else if ((wlandev-&gt;netdev-&gt;type == ARPHRD_IEEE80211_PRISM) &amp;&amp;</div><div class='add'>+		   (hw-&gt;sniffhdr != 0)) {</div><div class='add'>+		p80211_caphdr_t		*caphdr;</div><div class='add'>+		/* The NEW header format! */</div><div class='add'>+		datap = skb_put(skb, sizeof(p80211_caphdr_t));</div><div class='add'>+		caphdr = (p80211_caphdr_t*) datap;</div><div class='add'>+</div><div class='add'>+		caphdr-&gt;version =	htonl(P80211CAPTURE_VERSION);</div><div class='add'>+		caphdr-&gt;length =	htonl(sizeof(p80211_caphdr_t));</div><div class='add'>+		caphdr-&gt;mactime =	__cpu_to_be64(rxdesc-&gt;time) * 1000;</div><div class='add'>+		caphdr-&gt;hosttime =	__cpu_to_be64(jiffies);</div><div class='add'>+		caphdr-&gt;phytype =	htonl(4); /* dss_dot11_b */</div><div class='add'>+		caphdr-&gt;channel =	htonl(hw-&gt;sniff_channel);</div><div class='add'>+		caphdr-&gt;datarate =	htonl(rxdesc-&gt;rate);</div><div class='add'>+		caphdr-&gt;antenna =	htonl(0); /* unknown */</div><div class='add'>+		caphdr-&gt;priority =	htonl(0); /* unknown */</div><div class='add'>+		caphdr-&gt;ssi_type =	htonl(3); /* rssi_raw */</div><div class='add'>+		caphdr-&gt;ssi_signal =	htonl(rxdesc-&gt;signal);</div><div class='add'>+		caphdr-&gt;ssi_noise =	htonl(rxdesc-&gt;silence);</div><div class='add'>+		caphdr-&gt;preamble =	htonl(0); /* unknown */</div><div class='add'>+		caphdr-&gt;encoding =	htonl(1); /* cck */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Copy the 802.11 header to the skb (ctl frames may be less than a full header) */</div><div class='add'>+	datap = skb_put(skb, hdrlen);</div><div class='add'>+	memcpy( datap, &amp;(rxdesc-&gt;frame_control), hdrlen);</div><div class='add'>+</div><div class='add'>+	/* If any, copy the data from the card to the skb */</div><div class='add'>+	if ( datalen &gt; 0 )</div><div class='add'>+	{</div><div class='add'>+		datap = skb_put(skb, datalen);</div><div class='add'>+		memcpy(datap, rxfrm-&gt;data, datalen);</div><div class='add'>+</div><div class='add'>+		/* check for unencrypted stuff if WEP bit set. */</div><div class='add'>+		if (*(datap - hdrlen + 1) &amp; 0x40) // wep set</div><div class='add'>+		  if ((*(datap) == 0xaa) &amp;&amp; (*(datap+1) == 0xaa))</div><div class='add'>+		    *(datap - hdrlen + 1) &amp;= 0xbf; // clear wep; it's the 802.2 header!</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (hw-&gt;sniff_fcs) {</div><div class='add'>+		/* Set the FCS */</div><div class='add'>+		datap = skb_put(skb, WLAN_CRC_LEN);</div><div class='add'>+		memset( datap, 0xff, WLAN_CRC_LEN);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* pass it back up */</div><div class='add'>+	prism2sta_ev_rx(wlandev, skb);</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_usbin_info</div><div class='add'>+*</div><div class='add'>+* At this point we have a successful received a Prism2 info frame.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		wlan device</div><div class='add'>+*	usbin		ptr to the usb transfer buffer</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	nothing</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	interrupt</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+static void hfa384x_usbin_info(wlandevice_t *wlandev, hfa384x_usbin_t *usbin)</div><div class='add'>+{</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	usbin-&gt;infofrm.info.framelen = hfa384x2host_16(usbin-&gt;infofrm.info.framelen);</div><div class='add'>+	prism2sta_ev_info(wlandev, &amp;usbin-&gt;infofrm.info);</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_usbout_callback</div><div class='add'>+*</div><div class='add'>+* Callback for URBs on the BULKOUT endpoint.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	urb		ptr to the completed urb</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	nothing</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	interrupt</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+#ifdef URB_ONLY_CALLBACK</div><div class='add'>+static void hfa384x_usbout_callback(struct urb *urb)</div><div class='add'>+#else</div><div class='add'>+static void hfa384x_usbout_callback(struct urb *urb, struct pt_regs *regs)</div><div class='add'>+#endif</div><div class='add'>+{</div><div class='add'>+	wlandevice_t		*wlandev = urb-&gt;context;</div><div class='add'>+	hfa384x_usbout_t	*usbout = urb-&gt;transfer_buffer;</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+#ifdef DEBUG_USB</div><div class='add'>+	dbprint_urb(urb);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	if ( wlandev &amp;&amp;</div><div class='add'>+	     wlandev-&gt;netdev ) {</div><div class='add'>+</div><div class='add'>+		switch(urb-&gt;status) {</div><div class='add'>+		case 0:</div><div class='add'>+			hfa384x_usbout_tx(wlandev, usbout);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case -EPIPE:</div><div class='add'>+		{</div><div class='add'>+			hfa384x_t *hw = wlandev-&gt;priv;</div><div class='add'>+			WLAN_LOG_WARNING("%s tx pipe stalled: requesting reset\n",</div><div class='add'>+			                 wlandev-&gt;netdev-&gt;name);</div><div class='add'>+			if ( !test_and_set_bit(WORK_TX_HALT, &amp;hw-&gt;usb_flags) )</div><div class='add'>+				schedule_work(&amp;hw-&gt;usb_work);</div><div class='add'>+			++(wlandev-&gt;linux_stats.tx_errors);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		case -EPROTO:</div><div class='add'>+		case -ETIMEDOUT:</div><div class='add'>+		case -EILSEQ:</div><div class='add'>+		{</div><div class='add'>+			hfa384x_t *hw = wlandev-&gt;priv;</div><div class='add'>+</div><div class='add'>+			if ( !test_and_set_bit(THROTTLE_TX, &amp;hw-&gt;usb_flags)</div><div class='add'>+			     &amp;&amp; !timer_pending(&amp;hw-&gt;throttle) ) {</div><div class='add'>+				mod_timer(&amp;hw-&gt;throttle,</div><div class='add'>+				          jiffies + THROTTLE_JIFFIES);</div><div class='add'>+			}</div><div class='add'>+			++(wlandev-&gt;linux_stats.tx_errors);</div><div class='add'>+			netif_stop_queue(wlandev-&gt;netdev);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		case -ENOENT:</div><div class='add'>+		case -ESHUTDOWN:</div><div class='add'>+			/* Ignorable errors */</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		default:</div><div class='add'>+			WLAN_LOG_INFO("unknown urb-&gt;status=%d\n", urb-&gt;status);</div><div class='add'>+			++(wlandev-&gt;linux_stats.tx_errors);</div><div class='add'>+			break;</div><div class='add'>+		} /* switch */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_ctlxout_callback</div><div class='add'>+*</div><div class='add'>+* Callback for control data on the BULKOUT endpoint.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	urb		ptr to the completed urb</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+* nothing</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+* interrupt</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+#ifdef URB_ONLY_CALLBACK</div><div class='add'>+static void hfa384x_ctlxout_callback(struct urb *urb)</div><div class='add'>+#else</div><div class='add'>+static void hfa384x_ctlxout_callback(struct urb *urb, struct pt_regs *regs)</div><div class='add'>+#endif</div><div class='add'>+{</div><div class='add'>+	hfa384x_t	*hw = urb-&gt;context;</div><div class='add'>+	int             delete_resptimer = 0;</div><div class='add'>+	int             timer_ok = 1;</div><div class='add'>+	int		run_queue = 0;</div><div class='add'>+	hfa384x_usbctlx_t	*ctlx;</div><div class='add'>+	unsigned long	flags;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	WLAN_LOG_DEBUG(3,"urb-&gt;status=%d\n", urb-&gt;status);</div><div class='add'>+#ifdef DEBUG_USB</div><div class='add'>+	dbprint_urb(urb);</div><div class='add'>+#endif</div><div class='add'>+	if ( (urb-&gt;status == -ESHUTDOWN) ||</div><div class='add'>+	     (urb-&gt;status == -ENODEV) ||</div><div class='add'>+	     (hw == NULL) )</div><div class='add'>+		goto done;</div><div class='add'>+</div><div class='add'>+retry:</div><div class='add'>+	spin_lock_irqsave(&amp;hw-&gt;ctlxq.lock, flags);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Only one CTLX at a time on the "active" list, and</div><div class='add'>+	 * none at all if we are unplugged. However, we can</div><div class='add'>+	 * rely on the disconnect function to clean everything</div><div class='add'>+	 * up if someone unplugged the adapter.</div><div class='add'>+	 */</div><div class='add'>+	if ( list_empty(&amp;hw-&gt;ctlxq.active) ) {</div><div class='add'>+		spin_unlock_irqrestore(&amp;hw-&gt;ctlxq.lock, flags);</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Having something on the "active" queue means</div><div class='add'>+	 * that we have timers to worry about ...</div><div class='add'>+	 */</div><div class='add'>+	if (del_timer(&amp;hw-&gt;reqtimer) == 0) {</div><div class='add'>+		if (hw-&gt;req_timer_done == 0) {</div><div class='add'>+			/*</div><div class='add'>+			 * This timer was actually running while we</div><div class='add'>+			 * were trying to delete it. Let it terminate</div><div class='add'>+			 * gracefully instead.</div><div class='add'>+			 */</div><div class='add'>+			spin_unlock_irqrestore(&amp;hw-&gt;ctlxq.lock, flags);</div><div class='add'>+			goto retry;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	else {</div><div class='add'>+		hw-&gt;req_timer_done = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ctlx = get_active_ctlx(hw);</div><div class='add'>+</div><div class='add'>+	if ( urb-&gt;status == 0 ) {</div><div class='add'>+		/* Request portion of a CTLX is successful */</div><div class='add'>+		switch ( ctlx-&gt;state ) {</div><div class='add'>+		case CTLX_REQ_SUBMITTED:</div><div class='add'>+			/* This OUT-ACK received before IN */</div><div class='add'>+			ctlx-&gt;state = CTLX_REQ_COMPLETE;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case CTLX_RESP_COMPLETE:</div><div class='add'>+			/* IN already received before this OUT-ACK,</div><div class='add'>+			 * so this command must now be complete.</div><div class='add'>+			 */</div><div class='add'>+			ctlx-&gt;state = CTLX_COMPLETE;</div><div class='add'>+			unlocked_usbctlx_complete(hw, ctlx);</div><div class='add'>+			run_queue = 1;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		default:</div><div class='add'>+			/* This is NOT a valid CTLX "success" state! */</div><div class='add'>+			WLAN_LOG_ERROR(</div><div class='add'>+			    "Illegal CTLX[%d] success state(%s, %d) in OUT URB\n",</div><div class='add'>+			    hfa384x2host_16(ctlx-&gt;outbuf.type),</div><div class='add'>+			    ctlxstr(ctlx-&gt;state), urb-&gt;status);</div><div class='add'>+			break;</div><div class='add'>+		} /* switch */</div><div class='add'>+	} else {</div><div class='add'>+		/* If the pipe has stalled then we need to reset it */</div><div class='add'>+		if ( (urb-&gt;status == -EPIPE) &amp;&amp;</div><div class='add'>+		      !test_and_set_bit(WORK_TX_HALT, &amp;hw-&gt;usb_flags) ) {</div><div class='add'>+			WLAN_LOG_WARNING("%s tx pipe stalled: requesting reset\n",</div><div class='add'>+			                 hw-&gt;wlandev-&gt;netdev-&gt;name);</div><div class='add'>+			schedule_work(&amp;hw-&gt;usb_work);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* If someone cancels the OUT URB then its status</div><div class='add'>+		 * should be either -ECONNRESET or -ENOENT.</div><div class='add'>+		 */</div><div class='add'>+		ctlx-&gt;state = CTLX_REQ_FAILED;</div><div class='add'>+		unlocked_usbctlx_complete(hw, ctlx);</div><div class='add'>+		delete_resptimer = 1;</div><div class='add'>+		run_queue = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+ delresp:</div><div class='add'>+	if (delete_resptimer) {</div><div class='add'>+		if ((timer_ok = del_timer(&amp;hw-&gt;resptimer)) != 0) {</div><div class='add'>+			hw-&gt;resp_timer_done = 1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;hw-&gt;ctlxq.lock, flags);</div><div class='add'>+</div><div class='add'>+	if ( !timer_ok &amp;&amp; (hw-&gt;resp_timer_done == 0) ) {</div><div class='add'>+		spin_lock_irqsave(&amp;hw-&gt;ctlxq.lock, flags);</div><div class='add'>+		goto delresp;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (run_queue)</div><div class='add'>+		hfa384x_usbctlxq_run(hw);</div><div class='add'>+</div><div class='add'>+ done:</div><div class='add'>+	DBFEXIT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_usbctlx_reqtimerfn</div><div class='add'>+*</div><div class='add'>+* Timer response function for CTLX request timeouts.  If this</div><div class='add'>+* function is called, it means that the callback for the OUT</div><div class='add'>+* URB containing a Prism2.x XXX_Request was never called.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	data		a ptr to the hfa384x_t</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	nothing</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	interrupt</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+static void</div><div class='add'>+hfa384x_usbctlx_reqtimerfn(unsigned long data)</div><div class='add'>+{</div><div class='add'>+	hfa384x_t	*hw = (hfa384x_t*)data;</div><div class='add'>+	unsigned long   flags;</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;hw-&gt;ctlxq.lock, flags);</div><div class='add'>+</div><div class='add'>+	hw-&gt;req_timer_done = 1;</div><div class='add'>+</div><div class='add'>+	/* Removing the hardware automatically empties</div><div class='add'>+	 * the active list ...</div><div class='add'>+	 */</div><div class='add'>+	if ( !list_empty(&amp;hw-&gt;ctlxq.active) )</div><div class='add'>+	{</div><div class='add'>+		/*</div><div class='add'>+		 * We must ensure that our URB is removed from</div><div class='add'>+		 * the system, if it hasn't already expired.</div><div class='add'>+		 */</div><div class='add'>+		hw-&gt;ctlx_urb.transfer_flags |= URB_ASYNC_UNLINK;</div><div class='add'>+		if (usb_unlink_urb(&amp;hw-&gt;ctlx_urb) == -EINPROGRESS)</div><div class='add'>+		{</div><div class='add'>+			hfa384x_usbctlx_t *ctlx = get_active_ctlx(hw);</div><div class='add'>+</div><div class='add'>+			ctlx-&gt;state = CTLX_REQ_FAILED;</div><div class='add'>+</div><div class='add'>+			/* This URB was active, but has now been</div><div class='add'>+			 * cancelled. It will now have a status of</div><div class='add'>+			 * -ECONNRESET in the callback function.</div><div class='add'>+			 *</div><div class='add'>+			 * We are cancelling this CTLX, so we're</div><div class='add'>+			 * not going to need to wait for a response.</div><div class='add'>+			 * The URB's callback function will check</div><div class='add'>+			 * that this timer is truly dead.</div><div class='add'>+			 */</div><div class='add'>+			if (del_timer(&amp;hw-&gt;resptimer) != 0)</div><div class='add'>+				hw-&gt;resp_timer_done = 1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;hw-&gt;ctlxq.lock, flags);</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_usbctlx_resptimerfn</div><div class='add'>+*</div><div class='add'>+* Timer response function for CTLX response timeouts.  If this</div><div class='add'>+* function is called, it means that the callback for the IN</div><div class='add'>+* URB containing a Prism2.x XXX_Response was never called.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	data		a ptr to the hfa384x_t</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	nothing</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	interrupt</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+static void</div><div class='add'>+hfa384x_usbctlx_resptimerfn(unsigned long data)</div><div class='add'>+{</div><div class='add'>+	hfa384x_t *hw = (hfa384x_t*)data;</div><div class='add'>+	unsigned long   flags;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;hw-&gt;ctlxq.lock, flags);</div><div class='add'>+</div><div class='add'>+	hw-&gt;resp_timer_done = 1;</div><div class='add'>+</div><div class='add'>+	/* The active list will be empty if the</div><div class='add'>+	 * adapter has been unplugged ...</div><div class='add'>+	 */</div><div class='add'>+	if ( !list_empty(&amp;hw-&gt;ctlxq.active) )</div><div class='add'>+	{</div><div class='add'>+		hfa384x_usbctlx_t *ctlx = get_active_ctlx(hw);</div><div class='add'>+</div><div class='add'>+		if ( unlocked_usbctlx_cancel_async(hw, ctlx) == 0 )</div><div class='add'>+		{</div><div class='add'>+			spin_unlock_irqrestore(&amp;hw-&gt;ctlxq.lock, flags);</div><div class='add'>+			hfa384x_usbctlxq_run(hw);</div><div class='add'>+			goto done;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;hw-&gt;ctlxq.lock, flags);</div><div class='add'>+</div><div class='add'>+ done:</div><div class='add'>+	DBFEXIT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_usb_throttlefn</div><div class='add'>+*</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	data	ptr to hw</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	Nothing</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	Interrupt</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+static void</div><div class='add'>+hfa384x_usb_throttlefn(unsigned long data)</div><div class='add'>+{</div><div class='add'>+	hfa384x_t *hw = (hfa384x_t*)data;</div><div class='add'>+	unsigned long   flags;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;hw-&gt;ctlxq.lock, flags);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We need to check BOTH the RX and the TX throttle controls,</div><div class='add'>+	 * so we use the bitwise OR instead of the logical OR.</div><div class='add'>+	 */</div><div class='add'>+	WLAN_LOG_DEBUG(3, "flags=0x%lx\n", hw-&gt;usb_flags);</div><div class='add'>+	if ( !hw-&gt;wlandev-&gt;hwremoved &amp;&amp;</div><div class='add'>+	     (</div><div class='add'>+	       (test_and_clear_bit(THROTTLE_RX, &amp;hw-&gt;usb_flags) &amp;&amp;</div><div class='add'>+	       !test_and_set_bit(WORK_RX_RESUME, &amp;hw-&gt;usb_flags))</div><div class='add'>+	       |</div><div class='add'>+	       (test_and_clear_bit(THROTTLE_TX, &amp;hw-&gt;usb_flags) &amp;&amp;</div><div class='add'>+	        !test_and_set_bit(WORK_TX_RESUME, &amp;hw-&gt;usb_flags))</div><div class='add'>+	     ) )</div><div class='add'>+	{</div><div class='add'>+		schedule_work(&amp;hw-&gt;usb_work);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;hw-&gt;ctlxq.lock, flags);</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_usbctlx_submit</div><div class='add'>+*</div><div class='add'>+* Called from the doxxx functions to submit a CTLX to the queue</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	hw		ptr to the hw struct</div><div class='add'>+*	ctlx		ctlx structure to enqueue</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	-ENODEV if the adapter is unplugged</div><div class='add'>+*	0</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process or interrupt</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+static int</div><div class='add'>+hfa384x_usbctlx_submit(</div><div class='add'>+	hfa384x_t		*hw,</div><div class='add'>+	hfa384x_usbctlx_t	*ctlx)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;hw-&gt;ctlxq.lock, flags);</div><div class='add'>+</div><div class='add'>+	if (hw-&gt;wlandev-&gt;hwremoved) {</div><div class='add'>+		spin_unlock_irqrestore(&amp;hw-&gt;ctlxq.lock, flags);</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+	} else {</div><div class='add'>+		ctlx-&gt;state = CTLX_PENDING;</div><div class='add'>+		list_add_tail(&amp;ctlx-&gt;list, &amp;hw-&gt;ctlxq.pending);</div><div class='add'>+</div><div class='add'>+		spin_unlock_irqrestore(&amp;hw-&gt;ctlxq.lock, flags);</div><div class='add'>+		hfa384x_usbctlxq_run(hw);</div><div class='add'>+		ret = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_usbout_tx</div><div class='add'>+*</div><div class='add'>+* At this point we have finished a send of a frame.  Mark the URB</div><div class='add'>+* as available and call ev_alloc to notify higher layers we're</div><div class='add'>+* ready for more.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		wlan device</div><div class='add'>+*	usbout		ptr to the usb transfer buffer</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	nothing</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	interrupt</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+static void hfa384x_usbout_tx(wlandevice_t *wlandev, hfa384x_usbout_t *usbout)</div><div class='add'>+{</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	prism2sta_ev_alloc(wlandev);</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* hfa384x_isgood_pdrcore</div><div class='add'>+*</div><div class='add'>+* Quick check of PDR codes.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	pdrcode		PDR code number (host order)</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	zero		not good.</div><div class='add'>+*	one		is good.</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+static int</div><div class='add'>+hfa384x_isgood_pdrcode(UINT16 pdrcode)</div><div class='add'>+{</div><div class='add'>+	switch(pdrcode) {</div><div class='add'>+	case HFA384x_PDR_END_OF_PDA:</div><div class='add'>+	case HFA384x_PDR_PCB_PARTNUM:</div><div class='add'>+	case HFA384x_PDR_PDAVER:</div><div class='add'>+	case HFA384x_PDR_NIC_SERIAL:</div><div class='add'>+	case HFA384x_PDR_MKK_MEASUREMENTS:</div><div class='add'>+	case HFA384x_PDR_NIC_RAMSIZE:</div><div class='add'>+	case HFA384x_PDR_MFISUPRANGE:</div><div class='add'>+	case HFA384x_PDR_CFISUPRANGE:</div><div class='add'>+	case HFA384x_PDR_NICID:</div><div class='add'>+	case HFA384x_PDR_MAC_ADDRESS:</div><div class='add'>+	case HFA384x_PDR_REGDOMAIN:</div><div class='add'>+	case HFA384x_PDR_ALLOWED_CHANNEL:</div><div class='add'>+	case HFA384x_PDR_DEFAULT_CHANNEL:</div><div class='add'>+	case HFA384x_PDR_TEMPTYPE:</div><div class='add'>+	case HFA384x_PDR_IFR_SETTING:</div><div class='add'>+	case HFA384x_PDR_RFR_SETTING:</div><div class='add'>+	case HFA384x_PDR_HFA3861_BASELINE:</div><div class='add'>+	case HFA384x_PDR_HFA3861_SHADOW:</div><div class='add'>+	case HFA384x_PDR_HFA3861_IFRF:</div><div class='add'>+	case HFA384x_PDR_HFA3861_CHCALSP:</div><div class='add'>+	case HFA384x_PDR_HFA3861_CHCALI:</div><div class='add'>+	case HFA384x_PDR_3842_NIC_CONFIG:</div><div class='add'>+	case HFA384x_PDR_USB_ID:</div><div class='add'>+	case HFA384x_PDR_PCI_ID:</div><div class='add'>+	case HFA384x_PDR_PCI_IFCONF:</div><div class='add'>+	case HFA384x_PDR_PCI_PMCONF:</div><div class='add'>+	case HFA384x_PDR_RFENRGY:</div><div class='add'>+	case HFA384x_PDR_HFA3861_MANF_TESTSP:</div><div class='add'>+	case HFA384x_PDR_HFA3861_MANF_TESTI:</div><div class='add'>+		/* code is OK */</div><div class='add'>+		return 1;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		if ( pdrcode &lt; 0x1000 ) {</div><div class='add'>+			/* code is OK, but we don't know exactly what it is */</div><div class='add'>+			WLAN_LOG_DEBUG(3,</div><div class='add'>+				"Encountered unknown PDR#=0x%04x, "</div><div class='add'>+				"assuming it's ok.\n",</div><div class='add'>+				pdrcode);</div><div class='add'>+			return 1;</div><div class='add'>+		} else {</div><div class='add'>+			/* bad code */</div><div class='add'>+			WLAN_LOG_DEBUG(3,</div><div class='add'>+				"Encountered unknown PDR#=0x%04x, "</div><div class='add'>+				"(&gt;=0x1000), assuming it's bad.\n",</div><div class='add'>+				pdrcode);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return 0; /* avoid compiler warnings */</div><div class='add'>+}</div><div class='add'>+</div><div class='head'>diff --git a/drivers/staging/wlan-ng/p80211conv.c b/drivers/staging/wlan-ng/p80211conv.c<br/>new file mode 100644<br/>index 000000000000..68121b9b34fa<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/wlan-ng/p80211conv.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/wlan-ng/p80211conv.c</a></div><div class='hunk'>@@ -0,0 +1,683 @@</div><div class='add'>+/* src/p80211/p80211conv.c</div><div class='add'>+*</div><div class='add'>+* Ether/802.11 conversions and packet buffer routines</div><div class='add'>+*</div><div class='add'>+* Copyright (C) 1999 AbsoluteValue Systems, Inc.  All Rights Reserved.</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* linux-wlan</div><div class='add'>+*</div><div class='add'>+*   The contents of this file are subject to the Mozilla Public</div><div class='add'>+*   License Version 1.1 (the "License"); you may not use this file</div><div class='add'>+*   except in compliance with the License. You may obtain a copy of</div><div class='add'>+*   the License at http://www.mozilla.org/MPL/</div><div class='add'>+*</div><div class='add'>+*   Software distributed under the License is distributed on an "AS</div><div class='add'>+*   IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or</div><div class='add'>+*   implied. See the License for the specific language governing</div><div class='add'>+*   rights and limitations under the License.</div><div class='add'>+*</div><div class='add'>+*   Alternatively, the contents of this file may be used under the</div><div class='add'>+*   terms of the GNU Public License version 2 (the "GPL"), in which</div><div class='add'>+*   case the provisions of the GPL are applicable instead of the</div><div class='add'>+*   above.  If you wish to allow the use of your version of this file</div><div class='add'>+*   only under the terms of the GPL and not to allow others to use</div><div class='add'>+*   your version of this file under the MPL, indicate your decision</div><div class='add'>+*   by deleting the provisions above and replace them with the notice</div><div class='add'>+*   and other provisions required by the GPL.  If you do not delete</div><div class='add'>+*   the provisions above, a recipient may use your version of this</div><div class='add'>+*   file under either the MPL or the GPL.</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* Inquiries regarding the linux-wlan Open Source project can be</div><div class='add'>+* made directly to:</div><div class='add'>+*</div><div class='add'>+* AbsoluteValue Systems Inc.</div><div class='add'>+* info@linux-wlan.com</div><div class='add'>+* http://www.linux-wlan.com</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* Portions of the development of this software were funded by</div><div class='add'>+* Intersil Corporation as part of PRISM(R) chipset product development.</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* This file defines the functions that perform Ethernet to/from</div><div class='add'>+* 802.11 frame conversions.</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*/</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* System Includes */</div><div class='add'>+</div><div class='add'>+#define __NO_VERSION__		/* prevent the static definition */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#include &lt;linux/version.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/wireless.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/if_ether.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/byteorder.h&gt;</div><div class='add'>+</div><div class='add'>+#include "version.h"</div><div class='add'>+#include "wlan_compat.h"</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Project Includes */</div><div class='add'>+</div><div class='add'>+#include "p80211types.h"</div><div class='add'>+#include "p80211hdr.h"</div><div class='add'>+#include "p80211conv.h"</div><div class='add'>+#include "p80211mgmt.h"</div><div class='add'>+#include "p80211msg.h"</div><div class='add'>+#include "p80211netdev.h"</div><div class='add'>+#include "p80211ioctl.h"</div><div class='add'>+#include "p80211req.h"</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Local Constants */</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Local Macros */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Local Types */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Local Static Definitions */</div><div class='add'>+</div><div class='add'>+static UINT8	oui_rfc1042[] = {0x00, 0x00, 0x00};</div><div class='add'>+static UINT8	oui_8021h[] = {0x00, 0x00, 0xf8};</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Local Function Declarations */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Function Definitions */</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* p80211pb_ether_to_80211</div><div class='add'>+*</div><div class='add'>+* Uses the contents of the ether frame and the etherconv setting</div><div class='add'>+* to build the elements of the 802.11 frame.</div><div class='add'>+*</div><div class='add'>+* We don't actually set</div><div class='add'>+* up the frame header here.  That's the MAC's job.  We're only handling</div><div class='add'>+* conversion of DIXII or 802.3+LLC frames to something that works</div><div class='add'>+* with 802.11.</div><div class='add'>+*</div><div class='add'>+* Note -- 802.11 header is NOT part of the skb.  Likewise, the 802.11</div><div class='add'>+*         FCS is also not present and will need to be added elsewhere.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	ethconv		Conversion type to perform</div><div class='add'>+*	skb		skbuff containing the ether frame</div><div class='add'>+*       p80211_hdr      802.11 header</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0 on success, non-zero otherwise</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	May be called in interrupt or non-interrupt context</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int skb_ether_to_p80211( wlandevice_t *wlandev, UINT32 ethconv, struct sk_buff *skb, p80211_hdr_t *p80211_hdr, p80211_metawep_t *p80211_wep)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	UINT16          fc;</div><div class='add'>+	UINT16          proto;</div><div class='add'>+	wlan_ethhdr_t   e_hdr;</div><div class='add'>+	wlan_llc_t      *e_llc;</div><div class='add'>+	wlan_snap_t     *e_snap;</div><div class='add'>+	int foo;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+	memcpy(&amp;e_hdr, skb-&gt;data, sizeof(e_hdr));</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;len &lt;= 0) {</div><div class='add'>+		WLAN_LOG_DEBUG(1, "zero-length skb!\n");</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ( ethconv == WLAN_ETHCONV_ENCAP ) { /* simplest case */</div><div class='add'>+	        WLAN_LOG_DEBUG(3, "ENCAP len: %d\n", skb-&gt;len);</div><div class='add'>+		/* here, we don't care what kind of ether frm. Just stick it */</div><div class='add'>+		/*  in the 80211 payload */</div><div class='add'>+		/* which is to say, leave the skb alone. */</div><div class='add'>+	} else {</div><div class='add'>+		/* step 1: classify ether frame, DIX or 802.3? */</div><div class='add'>+		proto = ntohs(e_hdr.type);</div><div class='add'>+		if ( proto &lt;= 1500 ) {</div><div class='add'>+		        WLAN_LOG_DEBUG(3, "802.3 len: %d\n", skb-&gt;len);</div><div class='add'>+                        /* codes &lt;= 1500 reserved for 802.3 lengths */</div><div class='add'>+			/* it's 802.3, pass ether payload unchanged,  */</div><div class='add'>+</div><div class='add'>+			/* trim off ethernet header */</div><div class='add'>+			skb_pull(skb, WLAN_ETHHDR_LEN);</div><div class='add'>+</div><div class='add'>+			/*   leave off any PAD octets.  */</div><div class='add'>+			skb_trim(skb, proto);</div><div class='add'>+		} else {</div><div class='add'>+		        WLAN_LOG_DEBUG(3, "DIXII len: %d\n", skb-&gt;len);</div><div class='add'>+			/* it's DIXII, time for some conversion */</div><div class='add'>+</div><div class='add'>+			/* trim off ethernet header */</div><div class='add'>+			skb_pull(skb, WLAN_ETHHDR_LEN);</div><div class='add'>+</div><div class='add'>+			/* tack on SNAP */</div><div class='add'>+			e_snap = (wlan_snap_t *) skb_push(skb, sizeof(wlan_snap_t));</div><div class='add'>+			e_snap-&gt;type = htons(proto);</div><div class='add'>+			if ( ethconv == WLAN_ETHCONV_8021h &amp;&amp; p80211_stt_findproto(proto) ) {</div><div class='add'>+				memcpy( e_snap-&gt;oui, oui_8021h, WLAN_IEEE_OUI_LEN);</div><div class='add'>+			} else {</div><div class='add'>+				memcpy( e_snap-&gt;oui, oui_rfc1042, WLAN_IEEE_OUI_LEN);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* tack on llc */</div><div class='add'>+			e_llc = (wlan_llc_t *) skb_push(skb, sizeof(wlan_llc_t));</div><div class='add'>+			e_llc-&gt;dsap = 0xAA;	/* SNAP, see IEEE 802 */</div><div class='add'>+			e_llc-&gt;ssap = 0xAA;</div><div class='add'>+			e_llc-&gt;ctl = 0x03;</div><div class='add'>+</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Set up the 802.11 header */</div><div class='add'>+	/* It's a data frame */</div><div class='add'>+	fc = host2ieee16( WLAN_SET_FC_FTYPE(WLAN_FTYPE_DATA) |</div><div class='add'>+			  WLAN_SET_FC_FSTYPE(WLAN_FSTYPE_DATAONLY));</div><div class='add'>+</div><div class='add'>+	switch ( wlandev-&gt;macmode ) {</div><div class='add'>+	case WLAN_MACMODE_IBSS_STA:</div><div class='add'>+		memcpy(p80211_hdr-&gt;a3.a1, &amp;e_hdr.daddr, WLAN_ADDR_LEN);</div><div class='add'>+		memcpy(p80211_hdr-&gt;a3.a2, wlandev-&gt;netdev-&gt;dev_addr, WLAN_ADDR_LEN);</div><div class='add'>+		memcpy(p80211_hdr-&gt;a3.a3, wlandev-&gt;bssid, WLAN_ADDR_LEN);</div><div class='add'>+		break;</div><div class='add'>+	case WLAN_MACMODE_ESS_STA:</div><div class='add'>+		fc |= host2ieee16(WLAN_SET_FC_TODS(1));</div><div class='add'>+		memcpy(p80211_hdr-&gt;a3.a1, wlandev-&gt;bssid, WLAN_ADDR_LEN);</div><div class='add'>+		memcpy(p80211_hdr-&gt;a3.a2, wlandev-&gt;netdev-&gt;dev_addr, WLAN_ADDR_LEN);</div><div class='add'>+		memcpy(p80211_hdr-&gt;a3.a3, &amp;e_hdr.daddr, WLAN_ADDR_LEN);</div><div class='add'>+		break;</div><div class='add'>+	case WLAN_MACMODE_ESS_AP:</div><div class='add'>+		fc |= host2ieee16(WLAN_SET_FC_FROMDS(1));</div><div class='add'>+		memcpy(p80211_hdr-&gt;a3.a1, &amp;e_hdr.daddr, WLAN_ADDR_LEN);</div><div class='add'>+		memcpy(p80211_hdr-&gt;a3.a2, wlandev-&gt;bssid, WLAN_ADDR_LEN);</div><div class='add'>+		memcpy(p80211_hdr-&gt;a3.a3, &amp;e_hdr.saddr, WLAN_ADDR_LEN);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		WLAN_LOG_ERROR("Error: Converting eth to wlan in unknown mode.\n");</div><div class='add'>+		return 1;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	p80211_wep-&gt;data = NULL;</div><div class='add'>+</div><div class='add'>+	if ((wlandev-&gt;hostwep &amp; HOSTWEP_PRIVACYINVOKED) &amp;&amp; (wlandev-&gt;hostwep &amp; HOSTWEP_ENCRYPT)) {</div><div class='add'>+		// XXXX need to pick keynum other than default?</div><div class='add'>+</div><div class='add'>+#if 1</div><div class='add'>+		p80211_wep-&gt;data = kmalloc(skb-&gt;len, GFP_ATOMIC);</div><div class='add'>+#else</div><div class='add'>+		p80211_wep-&gt;data = skb-&gt;data;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+		if ((foo = wep_encrypt(wlandev, skb-&gt;data, p80211_wep-&gt;data,</div><div class='add'>+				       skb-&gt;len,</div><div class='add'>+				(wlandev-&gt;hostwep &amp; HOSTWEP_DEFAULTKEY_MASK),</div><div class='add'>+				p80211_wep-&gt;iv, p80211_wep-&gt;icv))) {</div><div class='add'>+			WLAN_LOG_WARNING("Host en-WEP failed, dropping frame (%d).\n", foo);</div><div class='add'>+			return 2;</div><div class='add'>+		}</div><div class='add'>+		fc |= host2ieee16(WLAN_SET_FC_ISWEP(1));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	//	skb-&gt;nh.raw = skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	p80211_hdr-&gt;a3.fc = fc;</div><div class='add'>+	p80211_hdr-&gt;a3.dur = 0;</div><div class='add'>+	p80211_hdr-&gt;a3.seq = 0;</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* jkriegl: from orinoco, modified */</div><div class='add'>+static void orinoco_spy_gather(wlandevice_t *wlandev, char *mac,</div><div class='add'>+			       p80211_rxmeta_t *rxmeta)</div><div class='add'>+{</div><div class='add'>+        int i;</div><div class='add'>+</div><div class='add'>+        /* Gather wireless spy statistics: for each packet, compare the</div><div class='add'>+         * source address with out list, and if match, get the stats... */</div><div class='add'>+</div><div class='add'>+        for (i = 0; i &lt; wlandev-&gt;spy_number; i++) {</div><div class='add'>+</div><div class='add'>+                if (!memcmp(wlandev-&gt;spy_address[i], mac, ETH_ALEN)) {</div><div class='add'>+			memcpy(wlandev-&gt;spy_address[i], mac, ETH_ALEN);</div><div class='add'>+                        wlandev-&gt;spy_stat[i].level = rxmeta-&gt;signal;</div><div class='add'>+                        wlandev-&gt;spy_stat[i].noise = rxmeta-&gt;noise;</div><div class='add'>+                        wlandev-&gt;spy_stat[i].qual = (rxmeta-&gt;signal &gt; rxmeta-&gt;noise) ? \</div><div class='add'>+                                                     (rxmeta-&gt;signal - rxmeta-&gt;noise) : 0;</div><div class='add'>+                        wlandev-&gt;spy_stat[i].updated = 0x7;</div><div class='add'>+                }</div><div class='add'>+        }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* p80211pb_80211_to_ether</div><div class='add'>+*</div><div class='add'>+* Uses the contents of a received 802.11 frame and the etherconv</div><div class='add'>+* setting to build an ether frame.</div><div class='add'>+*</div><div class='add'>+* This function extracts the src and dest address from the 802.11</div><div class='add'>+* frame to use in the construction of the eth frame.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	ethconv		Conversion type to perform</div><div class='add'>+*	skb		Packet buffer containing the 802.11 frame</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0 on success, non-zero otherwise</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	May be called in interrupt or non-interrupt context</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int skb_p80211_to_ether( wlandevice_t *wlandev, UINT32 ethconv, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	netdevice_t     *netdev = wlandev-&gt;netdev;</div><div class='add'>+	UINT16          fc;</div><div class='add'>+	UINT            payload_length;</div><div class='add'>+	UINT            payload_offset;</div><div class='add'>+	UINT8		daddr[WLAN_ETHADDR_LEN];</div><div class='add'>+	UINT8		saddr[WLAN_ETHADDR_LEN];</div><div class='add'>+	p80211_hdr_t    *w_hdr;</div><div class='add'>+	wlan_ethhdr_t   *e_hdr;</div><div class='add'>+	wlan_llc_t      *e_llc;</div><div class='add'>+	wlan_snap_t     *e_snap;</div><div class='add'>+</div><div class='add'>+	int foo;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	payload_length = skb-&gt;len - WLAN_HDR_A3_LEN - WLAN_CRC_LEN;</div><div class='add'>+	payload_offset = WLAN_HDR_A3_LEN;</div><div class='add'>+</div><div class='add'>+	w_hdr = (p80211_hdr_t *) skb-&gt;data;</div><div class='add'>+</div><div class='add'>+        /* setup some vars for convenience */</div><div class='add'>+	fc = ieee2host16(w_hdr-&gt;a3.fc);</div><div class='add'>+	if ( (WLAN_GET_FC_TODS(fc) == 0) &amp;&amp; (WLAN_GET_FC_FROMDS(fc) == 0) ) {</div><div class='add'>+		memcpy(daddr, w_hdr-&gt;a3.a1, WLAN_ETHADDR_LEN);</div><div class='add'>+		memcpy(saddr, w_hdr-&gt;a3.a2, WLAN_ETHADDR_LEN);</div><div class='add'>+	} else if( (WLAN_GET_FC_TODS(fc) == 0) &amp;&amp; (WLAN_GET_FC_FROMDS(fc) == 1) ) {</div><div class='add'>+		memcpy(daddr, w_hdr-&gt;a3.a1, WLAN_ETHADDR_LEN);</div><div class='add'>+		memcpy(saddr, w_hdr-&gt;a3.a3, WLAN_ETHADDR_LEN);</div><div class='add'>+	} else if( (WLAN_GET_FC_TODS(fc) == 1) &amp;&amp; (WLAN_GET_FC_FROMDS(fc) == 0) ) {</div><div class='add'>+		memcpy(daddr, w_hdr-&gt;a3.a3, WLAN_ETHADDR_LEN);</div><div class='add'>+		memcpy(saddr, w_hdr-&gt;a3.a2, WLAN_ETHADDR_LEN);</div><div class='add'>+	} else {</div><div class='add'>+		payload_offset = WLAN_HDR_A4_LEN;</div><div class='add'>+		payload_length -= ( WLAN_HDR_A4_LEN - WLAN_HDR_A3_LEN );</div><div class='add'>+		if (payload_length &lt; 0 ) {</div><div class='add'>+			WLAN_LOG_ERROR("A4 frame too short!\n");</div><div class='add'>+			return 1;</div><div class='add'>+		}</div><div class='add'>+		memcpy(daddr, w_hdr-&gt;a4.a3, WLAN_ETHADDR_LEN);</div><div class='add'>+		memcpy(saddr, w_hdr-&gt;a4.a4, WLAN_ETHADDR_LEN);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* perform de-wep if necessary.. */</div><div class='add'>+	if ((wlandev-&gt;hostwep &amp; HOSTWEP_PRIVACYINVOKED) &amp;&amp; WLAN_GET_FC_ISWEP(fc) &amp;&amp; (wlandev-&gt;hostwep &amp; HOSTWEP_DECRYPT)) {</div><div class='add'>+		if (payload_length &lt;= 8) {</div><div class='add'>+			WLAN_LOG_ERROR("WEP frame too short (%u).\n",</div><div class='add'>+					skb-&gt;len);</div><div class='add'>+			return 1;</div><div class='add'>+		}</div><div class='add'>+		if ((foo = wep_decrypt(wlandev, skb-&gt;data + payload_offset + 4,</div><div class='add'>+				       payload_length - 8, -1,</div><div class='add'>+				       skb-&gt;data + payload_offset,</div><div class='add'>+				       skb-&gt;data + payload_offset + payload_length - 4))) {</div><div class='add'>+			/* de-wep failed, drop skb. */</div><div class='add'>+			WLAN_LOG_DEBUG(1, "Host de-WEP failed, dropping frame (%d).\n", foo);</div><div class='add'>+			wlandev-&gt;rx.decrypt_err++;</div><div class='add'>+			return 2;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* subtract the IV+ICV length off the payload */</div><div class='add'>+		payload_length -= 8;</div><div class='add'>+		/* chop off the IV */</div><div class='add'>+		skb_pull(skb, 4);</div><div class='add'>+		/* chop off the ICV. */</div><div class='add'>+		skb_trim(skb, skb-&gt;len - 4);</div><div class='add'>+</div><div class='add'>+		wlandev-&gt;rx.decrypt++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	e_hdr = (wlan_ethhdr_t *) (skb-&gt;data + payload_offset);</div><div class='add'>+</div><div class='add'>+	e_llc = (wlan_llc_t *) (skb-&gt;data + payload_offset);</div><div class='add'>+	e_snap = (wlan_snap_t *) (skb-&gt;data + payload_offset + sizeof(wlan_llc_t));</div><div class='add'>+</div><div class='add'>+	/* Test for the various encodings */</div><div class='add'>+	if ( (payload_length &gt;= sizeof(wlan_ethhdr_t)) &amp;&amp;</div><div class='add'>+	     ( e_llc-&gt;dsap != 0xaa || e_llc-&gt;ssap != 0xaa ) &amp;&amp;</div><div class='add'>+	     ((memcmp(daddr, e_hdr-&gt;daddr, WLAN_ETHADDR_LEN) == 0) ||</div><div class='add'>+	     (memcmp(saddr, e_hdr-&gt;saddr, WLAN_ETHADDR_LEN) == 0))) {</div><div class='add'>+		WLAN_LOG_DEBUG(3, "802.3 ENCAP len: %d\n", payload_length);</div><div class='add'>+		/* 802.3 Encapsulated */</div><div class='add'>+		/* Test for an overlength frame */</div><div class='add'>+		if ( payload_length &gt; (netdev-&gt;mtu + WLAN_ETHHDR_LEN)) {</div><div class='add'>+			/* A bogus length ethfrm has been encap'd. */</div><div class='add'>+			/* Is someone trying an oflow attack? */</div><div class='add'>+			WLAN_LOG_ERROR("ENCAP frame too large (%d &gt; %d)\n",</div><div class='add'>+				payload_length, netdev-&gt;mtu + WLAN_ETHHDR_LEN);</div><div class='add'>+			return 1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Chop off the 802.11 header.  it's already sane. */</div><div class='add'>+		skb_pull(skb, payload_offset);</div><div class='add'>+		/* chop off the 802.11 CRC */</div><div class='add'>+		skb_trim(skb, skb-&gt;len - WLAN_CRC_LEN);</div><div class='add'>+</div><div class='add'>+	} else if ((payload_length &gt;= sizeof(wlan_llc_t) + sizeof(wlan_snap_t)) &amp;&amp;</div><div class='add'>+		   (e_llc-&gt;dsap == 0xaa) &amp;&amp;</div><div class='add'>+		   (e_llc-&gt;ssap == 0xaa) &amp;&amp;</div><div class='add'>+		   (e_llc-&gt;ctl == 0x03) &amp;&amp;</div><div class='add'>+		   (((memcmp( e_snap-&gt;oui, oui_rfc1042, WLAN_IEEE_OUI_LEN)==0) &amp;&amp;</div><div class='add'>+		    (ethconv == WLAN_ETHCONV_8021h) &amp;&amp;</div><div class='add'>+		    (p80211_stt_findproto(ieee2host16(e_snap-&gt;type)))) ||</div><div class='add'>+		    (memcmp( e_snap-&gt;oui, oui_rfc1042, WLAN_IEEE_OUI_LEN)!=0)))</div><div class='add'>+	{</div><div class='add'>+		WLAN_LOG_DEBUG(3, "SNAP+RFC1042 len: %d\n", payload_length);</div><div class='add'>+		/* it's a SNAP + RFC1042 frame &amp;&amp; protocol is in STT */</div><div class='add'>+		/* build 802.3 + RFC1042 */</div><div class='add'>+</div><div class='add'>+		/* Test for an overlength frame */</div><div class='add'>+		if ( payload_length &gt; netdev-&gt;mtu ) {</div><div class='add'>+			/* A bogus length ethfrm has been sent. */</div><div class='add'>+			/* Is someone trying an oflow attack? */</div><div class='add'>+			WLAN_LOG_ERROR("SNAP frame too large (%d &gt; %d)\n",</div><div class='add'>+				payload_length, netdev-&gt;mtu);</div><div class='add'>+			return 1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* chop 802.11 header from skb. */</div><div class='add'>+		skb_pull(skb, payload_offset);</div><div class='add'>+</div><div class='add'>+		/* create 802.3 header at beginning of skb. */</div><div class='add'>+		e_hdr = (wlan_ethhdr_t *) skb_push(skb, WLAN_ETHHDR_LEN);</div><div class='add'>+		memcpy(e_hdr-&gt;daddr, daddr, WLAN_ETHADDR_LEN);</div><div class='add'>+		memcpy(e_hdr-&gt;saddr, saddr, WLAN_ETHADDR_LEN);</div><div class='add'>+		e_hdr-&gt;type = htons(payload_length);</div><div class='add'>+</div><div class='add'>+		/* chop off the 802.11 CRC */</div><div class='add'>+		skb_trim(skb, skb-&gt;len - WLAN_CRC_LEN);</div><div class='add'>+</div><div class='add'>+	}  else if ((payload_length &gt;= sizeof(wlan_llc_t) + sizeof(wlan_snap_t)) &amp;&amp;</div><div class='add'>+		    (e_llc-&gt;dsap == 0xaa) &amp;&amp;</div><div class='add'>+		    (e_llc-&gt;ssap == 0xaa) &amp;&amp;</div><div class='add'>+		    (e_llc-&gt;ctl == 0x03) ) {</div><div class='add'>+		WLAN_LOG_DEBUG(3, "802.1h/RFC1042 len: %d\n", payload_length);</div><div class='add'>+		/* it's an 802.1h frame || (an RFC1042 &amp;&amp; protocol is not in STT) */</div><div class='add'>+		/* build a DIXII + RFC894 */</div><div class='add'>+</div><div class='add'>+		/* Test for an overlength frame */</div><div class='add'>+		if ((payload_length - sizeof(wlan_llc_t) - sizeof(wlan_snap_t))</div><div class='add'>+		    &gt; netdev-&gt;mtu) {</div><div class='add'>+			/* A bogus length ethfrm has been sent. */</div><div class='add'>+			/* Is someone trying an oflow attack? */</div><div class='add'>+			WLAN_LOG_ERROR("DIXII frame too large (%ld &gt; %d)\n",</div><div class='add'>+					(long int) (payload_length - sizeof(wlan_llc_t) -</div><div class='add'>+						    sizeof(wlan_snap_t)),</div><div class='add'>+					netdev-&gt;mtu);</div><div class='add'>+			return 1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* chop 802.11 header from skb. */</div><div class='add'>+		skb_pull(skb, payload_offset);</div><div class='add'>+</div><div class='add'>+		/* chop llc header from skb. */</div><div class='add'>+		skb_pull(skb, sizeof(wlan_llc_t));</div><div class='add'>+</div><div class='add'>+		/* chop snap header from skb. */</div><div class='add'>+		skb_pull(skb, sizeof(wlan_snap_t));</div><div class='add'>+</div><div class='add'>+		/* create 802.3 header at beginning of skb. */</div><div class='add'>+		e_hdr = (wlan_ethhdr_t *) skb_push(skb, WLAN_ETHHDR_LEN);</div><div class='add'>+		e_hdr-&gt;type = e_snap-&gt;type;</div><div class='add'>+		memcpy(e_hdr-&gt;daddr, daddr, WLAN_ETHADDR_LEN);</div><div class='add'>+		memcpy(e_hdr-&gt;saddr, saddr, WLAN_ETHADDR_LEN);</div><div class='add'>+</div><div class='add'>+		/* chop off the 802.11 CRC */</div><div class='add'>+		skb_trim(skb, skb-&gt;len - WLAN_CRC_LEN);</div><div class='add'>+	} else {</div><div class='add'>+		WLAN_LOG_DEBUG(3, "NON-ENCAP len: %d\n", payload_length);</div><div class='add'>+		/* any NON-ENCAP */</div><div class='add'>+		/* it's a generic 80211+LLC or IPX 'Raw 802.3' */</div><div class='add'>+		/*  build an 802.3 frame */</div><div class='add'>+		/* allocate space and setup hostbuf */</div><div class='add'>+</div><div class='add'>+		/* Test for an overlength frame */</div><div class='add'>+		if ( payload_length &gt; netdev-&gt;mtu ) {</div><div class='add'>+			/* A bogus length ethfrm has been sent. */</div><div class='add'>+			/* Is someone trying an oflow attack? */</div><div class='add'>+			WLAN_LOG_ERROR("OTHER frame too large (%d &gt; %d)\n",</div><div class='add'>+				payload_length,</div><div class='add'>+				netdev-&gt;mtu);</div><div class='add'>+			return 1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Chop off the 802.11 header. */</div><div class='add'>+		skb_pull(skb, payload_offset);</div><div class='add'>+</div><div class='add'>+		/* create 802.3 header at beginning of skb. */</div><div class='add'>+		e_hdr = (wlan_ethhdr_t *) skb_push(skb, WLAN_ETHHDR_LEN);</div><div class='add'>+		memcpy(e_hdr-&gt;daddr, daddr, WLAN_ETHADDR_LEN);</div><div class='add'>+		memcpy(e_hdr-&gt;saddr, saddr, WLAN_ETHADDR_LEN);</div><div class='add'>+		e_hdr-&gt;type = htons(payload_length);</div><div class='add'>+</div><div class='add'>+		/* chop off the 802.11 CRC */</div><div class='add'>+		skb_trim(skb, skb-&gt;len - WLAN_CRC_LEN);</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb-&gt;protocol = eth_type_trans(skb, netdev);</div><div class='add'>+	skb_reset_mac_header(skb);</div><div class='add'>+</div><div class='add'>+        /* jkriegl: process signal and noise as set in hfa384x_int_rx() */</div><div class='add'>+	/* jkriegl: only process signal/noise if requested by iwspy */</div><div class='add'>+        if (wlandev-&gt;spy_number)</div><div class='add'>+                orinoco_spy_gather(wlandev, eth_hdr(skb)-&gt;h_source, P80211SKB_RXMETA(skb));</div><div class='add'>+</div><div class='add'>+	/* Free the metadata */</div><div class='add'>+	p80211skb_rxmeta_detach(skb);</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* p80211_stt_findproto</div><div class='add'>+*</div><div class='add'>+* Searches the 802.1h Selective Translation Table for a given</div><div class='add'>+* protocol.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	proto	protocl number (in host order) to search for.</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	1 - if the table is empty or a match is found.</div><div class='add'>+*	0 - if the table is non-empty and a match is not found.</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	May be called in interrupt or non-interrupt context</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int p80211_stt_findproto(UINT16 proto)</div><div class='add'>+{</div><div class='add'>+	/* Always return found for now.  This is the behavior used by the */</div><div class='add'>+	/*  Zoom Win95 driver when 802.1h mode is selected */</div><div class='add'>+	/* TODO: If necessary, add an actual search we'll probably</div><div class='add'>+		 need this to match the CMAC's way of doing things.</div><div class='add'>+		 Need to do some testing to confirm.</div><div class='add'>+	*/</div><div class='add'>+</div><div class='add'>+	if (proto == 0x80f3)  /* APPLETALK */</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* p80211skb_rxmeta_detach</div><div class='add'>+*</div><div class='add'>+* Disconnects the frmmeta and rxmeta from an skb.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		The wlandev this skb belongs to.</div><div class='add'>+*	skb		The skb we're attaching to.</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0 on success, non-zero otherwise</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	May be called in interrupt or non-interrupt context</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+void</div><div class='add'>+p80211skb_rxmeta_detach(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	p80211_rxmeta_t		*rxmeta;</div><div class='add'>+	p80211_frmmeta_t	*frmmeta;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+	/* Sanity checks */</div><div class='add'>+	if ( skb==NULL ) {			/* bad skb */</div><div class='add'>+		WLAN_LOG_DEBUG(1, "Called w/ null skb.\n");</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+	frmmeta = P80211SKB_FRMMETA(skb);</div><div class='add'>+	if ( frmmeta == NULL ) { 		/* no magic */</div><div class='add'>+		WLAN_LOG_DEBUG(1, "Called w/ bad frmmeta magic.\n");</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+	rxmeta = frmmeta-&gt;rx;</div><div class='add'>+	if ( rxmeta == NULL ) {			/* bad meta ptr */</div><div class='add'>+		WLAN_LOG_DEBUG(1, "Called w/ bad rxmeta ptr.\n");</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Free rxmeta */</div><div class='add'>+	kfree(rxmeta);</div><div class='add'>+</div><div class='add'>+	/* Clear skb-&gt;cb */</div><div class='add'>+	memset(skb-&gt;cb, 0, sizeof(skb-&gt;cb));</div><div class='add'>+exit:</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* p80211skb_rxmeta_attach</div><div class='add'>+*</div><div class='add'>+* Allocates a p80211rxmeta structure, initializes it, and attaches</div><div class='add'>+* it to an skb.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		The wlandev this skb belongs to.</div><div class='add'>+*	skb		The skb we're attaching to.</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0 on success, non-zero otherwise</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	May be called in interrupt or non-interrupt context</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int</div><div class='add'>+p80211skb_rxmeta_attach(struct wlandevice *wlandev, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	int			result = 0;</div><div class='add'>+	p80211_rxmeta_t		*rxmeta;</div><div class='add'>+	p80211_frmmeta_t	*frmmeta;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	/* If these already have metadata, we error out! */</div><div class='add'>+	if (P80211SKB_RXMETA(skb) != NULL) {</div><div class='add'>+		WLAN_LOG_ERROR("%s: RXmeta already attached!\n",</div><div class='add'>+				wlandev-&gt;name);</div><div class='add'>+		result = 0;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Allocate the rxmeta */</div><div class='add'>+	rxmeta = kmalloc(sizeof(p80211_rxmeta_t), GFP_ATOMIC);</div><div class='add'>+</div><div class='add'>+	if ( rxmeta == NULL ) {</div><div class='add'>+		WLAN_LOG_ERROR("%s: Failed to allocate rxmeta.\n",</div><div class='add'>+				wlandev-&gt;name);</div><div class='add'>+		result = 1;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Initialize the rxmeta */</div><div class='add'>+	memset(rxmeta, 0, sizeof(p80211_rxmeta_t));</div><div class='add'>+	rxmeta-&gt;wlandev = wlandev;</div><div class='add'>+	rxmeta-&gt;hosttime = jiffies;</div><div class='add'>+</div><div class='add'>+	/* Overlay a frmmeta_t onto skb-&gt;cb */</div><div class='add'>+	memset(skb-&gt;cb, 0, sizeof(p80211_frmmeta_t));</div><div class='add'>+	frmmeta = (p80211_frmmeta_t*)(skb-&gt;cb);</div><div class='add'>+	frmmeta-&gt;magic = P80211_FRMMETA_MAGIC;</div><div class='add'>+	frmmeta-&gt;rx = rxmeta;</div><div class='add'>+exit:</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* p80211skb_free</div><div class='add'>+*</div><div class='add'>+* Frees an entire p80211skb by checking and freeing the meta struct</div><div class='add'>+* and then freeing the skb.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		The wlandev this skb belongs to.</div><div class='add'>+*	skb		The skb we're attaching to.</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0 on success, non-zero otherwise</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	May be called in interrupt or non-interrupt context</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+void</div><div class='add'>+p80211skb_free(struct wlandevice *wlandev, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	p80211_frmmeta_t	*meta;</div><div class='add'>+	DBFENTER;</div><div class='add'>+	meta = P80211SKB_FRMMETA(skb);</div><div class='add'>+	if ( meta &amp;&amp; meta-&gt;rx) {</div><div class='add'>+		p80211skb_rxmeta_detach(skb);</div><div class='add'>+	} else {</div><div class='add'>+		WLAN_LOG_ERROR("Freeing an skb (%p) w/ no frmmeta.\n", skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_kfree_skb(skb);</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/staging/wlan-ng/p80211conv.h b/drivers/staging/wlan-ng/p80211conv.h<br/>new file mode 100644<br/>index 000000000000..3f5ab57cd9a8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/wlan-ng/p80211conv.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/wlan-ng/p80211conv.h</a></div><div class='hunk'>@@ -0,0 +1,186 @@</div><div class='add'>+/* p80211conv.h</div><div class='add'>+*</div><div class='add'>+* Ether/802.11 conversions and packet buffer routines</div><div class='add'>+*</div><div class='add'>+* Copyright (C) 1999 AbsoluteValue Systems, Inc.  All Rights Reserved.</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* linux-wlan</div><div class='add'>+*</div><div class='add'>+*   The contents of this file are subject to the Mozilla Public</div><div class='add'>+*   License Version 1.1 (the "License"); you may not use this file</div><div class='add'>+*   except in compliance with the License. You may obtain a copy of</div><div class='add'>+*   the License at http://www.mozilla.org/MPL/</div><div class='add'>+*</div><div class='add'>+*   Software distributed under the License is distributed on an "AS</div><div class='add'>+*   IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or</div><div class='add'>+*   implied. See the License for the specific language governing</div><div class='add'>+*   rights and limitations under the License.</div><div class='add'>+*</div><div class='add'>+*   Alternatively, the contents of this file may be used under the</div><div class='add'>+*   terms of the GNU Public License version 2 (the "GPL"), in which</div><div class='add'>+*   case the provisions of the GPL are applicable instead of the</div><div class='add'>+*   above.  If you wish to allow the use of your version of this file</div><div class='add'>+*   only under the terms of the GPL and not to allow others to use</div><div class='add'>+*   your version of this file under the MPL, indicate your decision</div><div class='add'>+*   by deleting the provisions above and replace them with the notice</div><div class='add'>+*   and other provisions required by the GPL.  If you do not delete</div><div class='add'>+*   the provisions above, a recipient may use your version of this</div><div class='add'>+*   file under either the MPL or the GPL.</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* Inquiries regarding the linux-wlan Open Source project can be</div><div class='add'>+* made directly to:</div><div class='add'>+*</div><div class='add'>+* AbsoluteValue Systems Inc.</div><div class='add'>+* info@linux-wlan.com</div><div class='add'>+* http://www.linux-wlan.com</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* Portions of the development of this software were funded by</div><div class='add'>+* Intersil Corporation as part of PRISM(R) chipset product development.</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* This file declares the functions, types and macros that perform</div><div class='add'>+* Ethernet to/from 802.11 frame conversions.</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#ifndef _LINUX_P80211CONV_H</div><div class='add'>+#define _LINUX_P80211CONV_H</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Constants */</div><div class='add'>+</div><div class='add'>+#define WLAN_ETHADDR_LEN	6</div><div class='add'>+#define WLAN_IEEE_OUI_LEN	3</div><div class='add'>+</div><div class='add'>+#define WLAN_ETHCONV_ENCAP	1</div><div class='add'>+#define WLAN_ETHCONV_RFC1042	2</div><div class='add'>+#define WLAN_ETHCONV_8021h	3</div><div class='add'>+</div><div class='add'>+#define WLAN_MIN_ETHFRM_LEN	60</div><div class='add'>+#define WLAN_MAX_ETHFRM_LEN	1514</div><div class='add'>+#define WLAN_ETHHDR_LEN		14</div><div class='add'>+</div><div class='add'>+#define P80211CAPTURE_VERSION	0x80211001</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Macros */</div><div class='add'>+</div><div class='add'>+#define	P80211_FRMMETA_MAGIC		0x802110</div><div class='add'>+</div><div class='add'>+#define P80211SKB_FRMMETA(s) \</div><div class='add'>+	(((((p80211_frmmeta_t*)((s)-&gt;cb))-&gt;magic)==P80211_FRMMETA_MAGIC) ? \</div><div class='add'>+		((p80211_frmmeta_t*)((s)-&gt;cb)) : \</div><div class='add'>+		(NULL))</div><div class='add'>+</div><div class='add'>+#define P80211SKB_RXMETA(s) \</div><div class='add'>+	(P80211SKB_FRMMETA((s)) ?  P80211SKB_FRMMETA((s))-&gt;rx : ((p80211_rxmeta_t*)(NULL)))</div><div class='add'>+</div><div class='add'>+typedef struct p80211_rxmeta</div><div class='add'>+{</div><div class='add'>+	struct wlandevice	*wlandev;</div><div class='add'>+</div><div class='add'>+	UINT64	mactime;	/* Hi-rez MAC-supplied time value */</div><div class='add'>+	UINT64	hosttime;	/* Best-rez host supplied time value */</div><div class='add'>+</div><div class='add'>+	UINT	rxrate;		/* Receive data rate in 100kbps */</div><div class='add'>+	UINT	priority;	/* 0-15, 0=contention, 6=CF */</div><div class='add'>+	INT	signal;		/* An SSI, see p80211netdev.h */</div><div class='add'>+	INT	noise;		/* An SSI, see p80211netdev.h */</div><div class='add'>+	UINT	channel;	/* Receive channel (mostly for snifs) */</div><div class='add'>+	UINT	preamble;	/* P80211ENUM_preambletype_* */</div><div class='add'>+	UINT	encoding;	/* P80211ENUM_encoding_* */</div><div class='add'>+</div><div class='add'>+} p80211_rxmeta_t;</div><div class='add'>+</div><div class='add'>+typedef struct p80211_frmmeta</div><div class='add'>+{</div><div class='add'>+	UINT			magic;</div><div class='add'>+	p80211_rxmeta_t		*rx;</div><div class='add'>+} p80211_frmmeta_t;</div><div class='add'>+</div><div class='add'>+void p80211skb_free(struct wlandevice *wlandev, struct sk_buff *skb);</div><div class='add'>+int p80211skb_rxmeta_attach(struct wlandevice *wlandev, struct sk_buff *skb);</div><div class='add'>+void p80211skb_rxmeta_detach(struct sk_buff *skb);</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Types */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Frame capture header.  (See doc/capturefrm.txt)</div><div class='add'>+ */</div><div class='add'>+typedef struct p80211_caphdr</div><div class='add'>+{</div><div class='add'>+	UINT32		version;</div><div class='add'>+	UINT32		length;</div><div class='add'>+	UINT64		mactime;</div><div class='add'>+	UINT64		hosttime;</div><div class='add'>+	UINT32		phytype;</div><div class='add'>+	UINT32		channel;</div><div class='add'>+	UINT32		datarate;</div><div class='add'>+	UINT32		antenna;</div><div class='add'>+	UINT32		priority;</div><div class='add'>+	UINT32		ssi_type;</div><div class='add'>+	INT32		ssi_signal;</div><div class='add'>+	INT32		ssi_noise;</div><div class='add'>+	UINT32		preamble;</div><div class='add'>+	UINT32		encoding;</div><div class='add'>+} p80211_caphdr_t;</div><div class='add'>+</div><div class='add'>+/* buffer free method pointer type */</div><div class='add'>+typedef void (* freebuf_method_t)(void *buf, int size);</div><div class='add'>+</div><div class='add'>+typedef struct p80211_metawep {</div><div class='add'>+	void  *data;</div><div class='add'>+	UINT8 iv[4];</div><div class='add'>+	UINT8 icv[4];</div><div class='add'>+} p80211_metawep_t;</div><div class='add'>+</div><div class='add'>+/* local ether header type */</div><div class='add'>+typedef struct wlan_ethhdr</div><div class='add'>+{</div><div class='add'>+	UINT8	daddr[WLAN_ETHADDR_LEN];</div><div class='add'>+	UINT8	saddr[WLAN_ETHADDR_LEN];</div><div class='add'>+	UINT16	type;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ wlan_ethhdr_t;</div><div class='add'>+</div><div class='add'>+/* local llc header type */</div><div class='add'>+typedef struct wlan_llc</div><div class='add'>+{</div><div class='add'>+	UINT8	dsap;</div><div class='add'>+	UINT8	ssap;</div><div class='add'>+	UINT8	ctl;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ wlan_llc_t;</div><div class='add'>+</div><div class='add'>+/* local snap header type */</div><div class='add'>+typedef struct wlan_snap</div><div class='add'>+{</div><div class='add'>+	UINT8	oui[WLAN_IEEE_OUI_LEN];</div><div class='add'>+	UINT16	type;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ wlan_snap_t;</div><div class='add'>+</div><div class='add'>+/* Circular include trick */</div><div class='add'>+struct wlandevice;</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Externs */</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/*Function Declarations */</div><div class='add'>+</div><div class='add'>+int skb_p80211_to_ether( struct wlandevice *wlandev, UINT32 ethconv,</div><div class='add'>+			 struct sk_buff *skb);</div><div class='add'>+int skb_ether_to_p80211( struct wlandevice *wlandev, UINT32 ethconv,</div><div class='add'>+			 struct sk_buff *skb, p80211_hdr_t *p80211_hdr,</div><div class='add'>+			 p80211_metawep_t *p80211_wep );</div><div class='add'>+</div><div class='add'>+int p80211_stt_findproto(UINT16 proto);</div><div class='add'>+int p80211_stt_addproto(UINT16 proto);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/staging/wlan-ng/p80211hdr.h b/drivers/staging/wlan-ng/p80211hdr.h<br/>new file mode 100644<br/>index 000000000000..b7b0872fd861<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/wlan-ng/p80211hdr.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/wlan-ng/p80211hdr.h</a></div><div class='hunk'>@@ -0,0 +1,299 @@</div><div class='add'>+/* p80211hdr.h</div><div class='add'>+*</div><div class='add'>+* Macros, types, and functions for handling 802.11 MAC headers</div><div class='add'>+*</div><div class='add'>+* Copyright (C) 1999 AbsoluteValue Systems, Inc.  All Rights Reserved.</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* linux-wlan</div><div class='add'>+*</div><div class='add'>+*   The contents of this file are subject to the Mozilla Public</div><div class='add'>+*   License Version 1.1 (the "License"); you may not use this file</div><div class='add'>+*   except in compliance with the License. You may obtain a copy of</div><div class='add'>+*   the License at http://www.mozilla.org/MPL/</div><div class='add'>+*</div><div class='add'>+*   Software distributed under the License is distributed on an "AS</div><div class='add'>+*   IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or</div><div class='add'>+*   implied. See the License for the specific language governing</div><div class='add'>+*   rights and limitations under the License.</div><div class='add'>+*</div><div class='add'>+*   Alternatively, the contents of this file may be used under the</div><div class='add'>+*   terms of the GNU Public License version 2 (the "GPL"), in which</div><div class='add'>+*   case the provisions of the GPL are applicable instead of the</div><div class='add'>+*   above.  If you wish to allow the use of your version of this file</div><div class='add'>+*   only under the terms of the GPL and not to allow others to use</div><div class='add'>+*   your version of this file under the MPL, indicate your decision</div><div class='add'>+*   by deleting the provisions above and replace them with the notice</div><div class='add'>+*   and other provisions required by the GPL.  If you do not delete</div><div class='add'>+*   the provisions above, a recipient may use your version of this</div><div class='add'>+*   file under either the MPL or the GPL.</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* Inquiries regarding the linux-wlan Open Source project can be</div><div class='add'>+* made directly to:</div><div class='add'>+*</div><div class='add'>+* AbsoluteValue Systems Inc.</div><div class='add'>+* info@linux-wlan.com</div><div class='add'>+* http://www.linux-wlan.com</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* Portions of the development of this software were funded by</div><div class='add'>+* Intersil Corporation as part of PRISM(R) chipset product development.</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* This file declares the constants and types used in the interface</div><div class='add'>+* between a wlan driver and the user mode utilities.</div><div class='add'>+*</div><div class='add'>+* Note:</div><div class='add'>+*  - Constant values are always in HOST byte order.  To assign</div><div class='add'>+*    values to multi-byte fields they _must_ be converted to</div><div class='add'>+*    ieee byte order.  To retrieve multi-byte values from incoming</div><div class='add'>+*    frames, they must be converted to host order.</div><div class='add'>+*</div><div class='add'>+* All functions declared here are implemented in p80211.c</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#ifndef _P80211HDR_H</div><div class='add'>+#define _P80211HDR_H</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* System Includes */</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Project Includes */</div><div class='add'>+</div><div class='add'>+#ifndef  _WLAN_COMPAT_H</div><div class='add'>+#include "wlan_compat.h"</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Constants */</div><div class='add'>+</div><div class='add'>+/*--- Sizes -----------------------------------------------*/</div><div class='add'>+#define WLAN_ADDR_LEN			6</div><div class='add'>+#define WLAN_CRC_LEN			4</div><div class='add'>+#define WLAN_BSSID_LEN			6</div><div class='add'>+#define WLAN_BSS_TS_LEN			8</div><div class='add'>+#define WLAN_HDR_A3_LEN			24</div><div class='add'>+#define WLAN_HDR_A4_LEN			30</div><div class='add'>+#define WLAN_SSID_MAXLEN		32</div><div class='add'>+#define WLAN_DATA_MAXLEN		2312</div><div class='add'>+#define WLAN_A3FR_MAXLEN		(WLAN_HDR_A3_LEN + WLAN_DATA_MAXLEN + WLAN_CRC_LEN)</div><div class='add'>+#define WLAN_A4FR_MAXLEN		(WLAN_HDR_A4_LEN + WLAN_DATA_MAXLEN + WLAN_CRC_LEN)</div><div class='add'>+#define WLAN_BEACON_FR_MAXLEN		(WLAN_HDR_A3_LEN + 334)</div><div class='add'>+#define WLAN_ATIM_FR_MAXLEN		(WLAN_HDR_A3_LEN + 0)</div><div class='add'>+#define WLAN_DISASSOC_FR_MAXLEN		(WLAN_HDR_A3_LEN + 2)</div><div class='add'>+#define WLAN_ASSOCREQ_FR_MAXLEN		(WLAN_HDR_A3_LEN + 48)</div><div class='add'>+#define WLAN_ASSOCRESP_FR_MAXLEN	(WLAN_HDR_A3_LEN + 16)</div><div class='add'>+#define WLAN_REASSOCREQ_FR_MAXLEN	(WLAN_HDR_A3_LEN + 54)</div><div class='add'>+#define WLAN_REASSOCRESP_FR_MAXLEN	(WLAN_HDR_A3_LEN + 16)</div><div class='add'>+#define WLAN_PROBEREQ_FR_MAXLEN		(WLAN_HDR_A3_LEN + 44)</div><div class='add'>+#define WLAN_PROBERESP_FR_MAXLEN	(WLAN_HDR_A3_LEN + 78)</div><div class='add'>+#define WLAN_AUTHEN_FR_MAXLEN		(WLAN_HDR_A3_LEN + 261)</div><div class='add'>+#define WLAN_DEAUTHEN_FR_MAXLEN		(WLAN_HDR_A3_LEN + 2)</div><div class='add'>+#define WLAN_WEP_NKEYS			4</div><div class='add'>+#define WLAN_WEP_MAXKEYLEN		13</div><div class='add'>+#define WLAN_CHALLENGE_IE_LEN		130</div><div class='add'>+#define WLAN_CHALLENGE_LEN		128</div><div class='add'>+#define WLAN_WEP_IV_LEN			4</div><div class='add'>+#define WLAN_WEP_ICV_LEN		4</div><div class='add'>+</div><div class='add'>+/*--- Frame Control Field -------------------------------------*/</div><div class='add'>+/* Frame Types */</div><div class='add'>+#define WLAN_FTYPE_MGMT			0x00</div><div class='add'>+#define WLAN_FTYPE_CTL			0x01</div><div class='add'>+#define WLAN_FTYPE_DATA			0x02</div><div class='add'>+</div><div class='add'>+/* Frame subtypes */</div><div class='add'>+/* Management */</div><div class='add'>+#define WLAN_FSTYPE_ASSOCREQ		0x00</div><div class='add'>+#define WLAN_FSTYPE_ASSOCRESP		0x01</div><div class='add'>+#define WLAN_FSTYPE_REASSOCREQ		0x02</div><div class='add'>+#define WLAN_FSTYPE_REASSOCRESP		0x03</div><div class='add'>+#define WLAN_FSTYPE_PROBEREQ		0x04</div><div class='add'>+#define WLAN_FSTYPE_PROBERESP		0x05</div><div class='add'>+#define WLAN_FSTYPE_BEACON		0x08</div><div class='add'>+#define WLAN_FSTYPE_ATIM		0x09</div><div class='add'>+#define WLAN_FSTYPE_DISASSOC		0x0a</div><div class='add'>+#define WLAN_FSTYPE_AUTHEN		0x0b</div><div class='add'>+#define WLAN_FSTYPE_DEAUTHEN		0x0c</div><div class='add'>+</div><div class='add'>+/* Control */</div><div class='add'>+#define WLAN_FSTYPE_BLOCKACKREQ		0x8</div><div class='add'>+#define WLAN_FSTYPE_BLOCKACK  		0x9</div><div class='add'>+#define WLAN_FSTYPE_PSPOLL		0x0a</div><div class='add'>+#define WLAN_FSTYPE_RTS			0x0b</div><div class='add'>+#define WLAN_FSTYPE_CTS			0x0c</div><div class='add'>+#define WLAN_FSTYPE_ACK			0x0d</div><div class='add'>+#define WLAN_FSTYPE_CFEND		0x0e</div><div class='add'>+#define WLAN_FSTYPE_CFENDCFACK		0x0f</div><div class='add'>+</div><div class='add'>+/* Data */</div><div class='add'>+#define WLAN_FSTYPE_DATAONLY		0x00</div><div class='add'>+#define WLAN_FSTYPE_DATA_CFACK		0x01</div><div class='add'>+#define WLAN_FSTYPE_DATA_CFPOLL		0x02</div><div class='add'>+#define WLAN_FSTYPE_DATA_CFACK_CFPOLL	0x03</div><div class='add'>+#define WLAN_FSTYPE_NULL		0x04</div><div class='add'>+#define WLAN_FSTYPE_CFACK		0x05</div><div class='add'>+#define WLAN_FSTYPE_CFPOLL		0x06</div><div class='add'>+#define WLAN_FSTYPE_CFACK_CFPOLL	0x07</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Macros */</div><div class='add'>+</div><div class='add'>+/*--- FC Macros ----------------------------------------------*/</div><div class='add'>+/* Macros to get/set the bitfields of the Frame Control Field */</div><div class='add'>+/*  GET_FC_??? - takes the host byte-order value of an FC     */</div><div class='add'>+/*               and retrieves the value of one of the        */</div><div class='add'>+/*               bitfields and moves that value so its lsb is */</div><div class='add'>+/*               in bit 0.                                    */</div><div class='add'>+/*  SET_FC_??? - takes a host order value for one of the FC   */</div><div class='add'>+/*               bitfields and moves it to the proper bit     */</div><div class='add'>+/*               location for ORing into a host order FC.     */</div><div class='add'>+/*               To send the FC produced from SET_FC_???,     */</div><div class='add'>+/*               one must put the bytes in IEEE order.        */</div><div class='add'>+/*  e.g.                                                      */</div><div class='add'>+/*     printf("the frame subtype is %x",                      */</div><div class='add'>+/*                 GET_FC_FTYPE( ieee2host( rx.fc )))         */</div><div class='add'>+/*                                                            */</div><div class='add'>+/*     tx.fc = host2ieee( SET_FC_FTYPE(WLAN_FTYP_CTL) |       */</div><div class='add'>+/*                        SET_FC_FSTYPE(WLAN_FSTYPE_RTS) );   */</div><div class='add'>+/*------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+#define WLAN_GET_FC_PVER(n)	 (((UINT16)(n)) &amp; (BIT0 | BIT1))</div><div class='add'>+#define WLAN_GET_FC_FTYPE(n)	((((UINT16)(n)) &amp; (BIT2 | BIT3)) &gt;&gt; 2)</div><div class='add'>+#define WLAN_GET_FC_FSTYPE(n)	((((UINT16)(n)) &amp; (BIT4|BIT5|BIT6|BIT7)) &gt;&gt; 4)</div><div class='add'>+#define WLAN_GET_FC_TODS(n) 	((((UINT16)(n)) &amp; (BIT8)) &gt;&gt; 8)</div><div class='add'>+#define WLAN_GET_FC_FROMDS(n)	((((UINT16)(n)) &amp; (BIT9)) &gt;&gt; 9)</div><div class='add'>+#define WLAN_GET_FC_MOREFRAG(n) ((((UINT16)(n)) &amp; (BIT10)) &gt;&gt; 10)</div><div class='add'>+#define WLAN_GET_FC_RETRY(n)	((((UINT16)(n)) &amp; (BIT11)) &gt;&gt; 11)</div><div class='add'>+#define WLAN_GET_FC_PWRMGT(n)	((((UINT16)(n)) &amp; (BIT12)) &gt;&gt; 12)</div><div class='add'>+#define WLAN_GET_FC_MOREDATA(n) ((((UINT16)(n)) &amp; (BIT13)) &gt;&gt; 13)</div><div class='add'>+#define WLAN_GET_FC_ISWEP(n)	((((UINT16)(n)) &amp; (BIT14)) &gt;&gt; 14)</div><div class='add'>+#define WLAN_GET_FC_ORDER(n)	((((UINT16)(n)) &amp; (BIT15)) &gt;&gt; 15)</div><div class='add'>+</div><div class='add'>+#define WLAN_SET_FC_PVER(n)	((UINT16)(n))</div><div class='add'>+#define WLAN_SET_FC_FTYPE(n)	(((UINT16)(n)) &lt;&lt; 2)</div><div class='add'>+#define WLAN_SET_FC_FSTYPE(n)	(((UINT16)(n)) &lt;&lt; 4)</div><div class='add'>+#define WLAN_SET_FC_TODS(n) 	(((UINT16)(n)) &lt;&lt; 8)</div><div class='add'>+#define WLAN_SET_FC_FROMDS(n)	(((UINT16)(n)) &lt;&lt; 9)</div><div class='add'>+#define WLAN_SET_FC_MOREFRAG(n) (((UINT16)(n)) &lt;&lt; 10)</div><div class='add'>+#define WLAN_SET_FC_RETRY(n)	(((UINT16)(n)) &lt;&lt; 11)</div><div class='add'>+#define WLAN_SET_FC_PWRMGT(n)	(((UINT16)(n)) &lt;&lt; 12)</div><div class='add'>+#define WLAN_SET_FC_MOREDATA(n) (((UINT16)(n)) &lt;&lt; 13)</div><div class='add'>+#define WLAN_SET_FC_ISWEP(n)	(((UINT16)(n)) &lt;&lt; 14)</div><div class='add'>+#define WLAN_SET_FC_ORDER(n)	(((UINT16)(n)) &lt;&lt; 15)</div><div class='add'>+</div><div class='add'>+/*--- Duration Macros ----------------------------------------*/</div><div class='add'>+/* Macros to get/set the bitfields of the Duration Field      */</div><div class='add'>+/*  - the duration value is only valid when bit15 is zero     */</div><div class='add'>+/*  - the firmware handles these values, so I'm not going     */</div><div class='add'>+/*    these macros right now.                                 */</div><div class='add'>+/*------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+/*--- Sequence Control  Macros -------------------------------*/</div><div class='add'>+/* Macros to get/set the bitfields of the Sequence Control    */</div><div class='add'>+/* Field.                                                     */</div><div class='add'>+/*------------------------------------------------------------*/</div><div class='add'>+#define WLAN_GET_SEQ_FRGNUM(n) (((UINT16)(n)) &amp; (BIT0|BIT1|BIT2|BIT3))</div><div class='add'>+#define WLAN_GET_SEQ_SEQNUM(n) ((((UINT16)(n)) &amp; (~(BIT0|BIT1|BIT2|BIT3))) &gt;&gt; 4)</div><div class='add'>+</div><div class='add'>+/*--- Data ptr macro -----------------------------------------*/</div><div class='add'>+/* Creates a UINT8* to the data portion of a frame            */</div><div class='add'>+/* Assumes you're passing in a ptr to the beginning of the hdr*/</div><div class='add'>+/*------------------------------------------------------------*/</div><div class='add'>+#define WLAN_HDR_A3_DATAP(p) (((UINT8*)(p)) + WLAN_HDR_A3_LEN)</div><div class='add'>+#define WLAN_HDR_A4_DATAP(p) (((UINT8*)(p)) + WLAN_HDR_A4_LEN)</div><div class='add'>+</div><div class='add'>+#define DOT11_RATE5_ISBASIC_GET(r)     (((UINT8)(r)) &amp; BIT7)</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Types */</div><div class='add'>+</div><div class='add'>+/* BSS Timestamp */</div><div class='add'>+typedef UINT8 wlan_bss_ts_t[WLAN_BSS_TS_LEN];</div><div class='add'>+</div><div class='add'>+/* Generic 802.11 Header types */</div><div class='add'>+</div><div class='add'>+typedef struct p80211_hdr_a3</div><div class='add'>+{</div><div class='add'>+	UINT16	fc;</div><div class='add'>+	UINT16	dur;</div><div class='add'>+	UINT8	a1[WLAN_ADDR_LEN];</div><div class='add'>+	UINT8	a2[WLAN_ADDR_LEN];</div><div class='add'>+	UINT8	a3[WLAN_ADDR_LEN];</div><div class='add'>+	UINT16	seq;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ p80211_hdr_a3_t;</div><div class='add'>+</div><div class='add'>+typedef struct p80211_hdr_a4</div><div class='add'>+{</div><div class='add'>+	UINT16	fc;</div><div class='add'>+	UINT16	dur;</div><div class='add'>+	UINT8	a1[WLAN_ADDR_LEN];</div><div class='add'>+	UINT8	a2[WLAN_ADDR_LEN];</div><div class='add'>+	UINT8	a3[WLAN_ADDR_LEN];</div><div class='add'>+	UINT16	seq;</div><div class='add'>+	UINT8	a4[WLAN_ADDR_LEN];</div><div class='add'>+} __WLAN_ATTRIB_PACK__ p80211_hdr_a4_t;</div><div class='add'>+</div><div class='add'>+typedef union p80211_hdr</div><div class='add'>+{</div><div class='add'>+	p80211_hdr_a3_t		a3;</div><div class='add'>+	p80211_hdr_a4_t		a4;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ p80211_hdr_t;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Extern Declarations */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Function Declarations */</div><div class='add'>+</div><div class='add'>+/* Frame and header lenght macros */</div><div class='add'>+</div><div class='add'>+#define WLAN_CTL_FRAMELEN(fstype) (\</div><div class='add'>+	(fstype) == WLAN_FSTYPE_BLOCKACKREQ	? 24 : \</div><div class='add'>+	(fstype) == WLAN_FSTYPE_BLOCKACK   	? 152 : \</div><div class='add'>+	(fstype) == WLAN_FSTYPE_PSPOLL		? 20 : \</div><div class='add'>+	(fstype) == WLAN_FSTYPE_RTS		? 20 : \</div><div class='add'>+	(fstype) == WLAN_FSTYPE_CTS		? 14 : \</div><div class='add'>+	(fstype) == WLAN_FSTYPE_ACK		? 14 : \</div><div class='add'>+	(fstype) == WLAN_FSTYPE_CFEND		? 20 : \</div><div class='add'>+	(fstype) == WLAN_FSTYPE_CFENDCFACK	? 20 : 4)</div><div class='add'>+</div><div class='add'>+#define WLAN_FCS_LEN			4</div><div class='add'>+</div><div class='add'>+/* ftcl in HOST order */</div><div class='add'>+inline static UINT16 p80211_headerlen(UINT16 fctl)</div><div class='add'>+{</div><div class='add'>+	UINT16 hdrlen = 0;</div><div class='add'>+</div><div class='add'>+	switch ( WLAN_GET_FC_FTYPE(fctl) ) {</div><div class='add'>+	case WLAN_FTYPE_MGMT:</div><div class='add'>+		hdrlen = WLAN_HDR_A3_LEN;</div><div class='add'>+		break;</div><div class='add'>+	case WLAN_FTYPE_DATA:</div><div class='add'>+		hdrlen = WLAN_HDR_A3_LEN;</div><div class='add'>+		if ( WLAN_GET_FC_TODS(fctl) &amp;&amp; WLAN_GET_FC_FROMDS(fctl) ) {</div><div class='add'>+			hdrlen += WLAN_ADDR_LEN;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case WLAN_FTYPE_CTL:</div><div class='add'>+		hdrlen = WLAN_CTL_FRAMELEN(WLAN_GET_FC_FSTYPE(fctl)) -</div><div class='add'>+			WLAN_FCS_LEN;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		hdrlen = WLAN_HDR_A3_LEN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return hdrlen;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* _P80211HDR_H */</div><div class='head'>diff --git a/drivers/staging/wlan-ng/p80211ioctl.h b/drivers/staging/wlan-ng/p80211ioctl.h<br/>new file mode 100644<br/>index 000000000000..25b2ea836227<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/wlan-ng/p80211ioctl.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/wlan-ng/p80211ioctl.h</a></div><div class='hunk'>@@ -0,0 +1,123 @@</div><div class='add'>+/* p80211ioctl.h</div><div class='add'>+*</div><div class='add'>+* Declares constants and types for the p80211 ioctls</div><div class='add'>+*</div><div class='add'>+* Copyright (C) 1999 AbsoluteValue Systems, Inc.  All Rights Reserved.</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* linux-wlan</div><div class='add'>+*</div><div class='add'>+*   The contents of this file are subject to the Mozilla Public</div><div class='add'>+*   License Version 1.1 (the "License"); you may not use this file</div><div class='add'>+*   except in compliance with the License. You may obtain a copy of</div><div class='add'>+*   the License at http://www.mozilla.org/MPL/</div><div class='add'>+*</div><div class='add'>+*   Software distributed under the License is distributed on an "AS</div><div class='add'>+*   IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or</div><div class='add'>+*   implied. See the License for the specific language governing</div><div class='add'>+*   rights and limitations under the License.</div><div class='add'>+*</div><div class='add'>+*   Alternatively, the contents of this file may be used under the</div><div class='add'>+*   terms of the GNU Public License version 2 (the "GPL"), in which</div><div class='add'>+*   case the provisions of the GPL are applicable instead of the</div><div class='add'>+*   above.  If you wish to allow the use of your version of this file</div><div class='add'>+*   only under the terms of the GPL and not to allow others to use</div><div class='add'>+*   your version of this file under the MPL, indicate your decision</div><div class='add'>+*   by deleting the provisions above and replace them with the notice</div><div class='add'>+*   and other provisions required by the GPL.  If you do not delete</div><div class='add'>+*   the provisions above, a recipient may use your version of this</div><div class='add'>+*   file under either the MPL or the GPL.</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* Inquiries regarding the linux-wlan Open Source project can be</div><div class='add'>+* made directly to:</div><div class='add'>+*</div><div class='add'>+* AbsoluteValue Systems Inc.</div><div class='add'>+* info@linux-wlan.com</div><div class='add'>+* http://www.linux-wlan.com</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* Portions of the development of this software were funded by</div><div class='add'>+* Intersil Corporation as part of PRISM(R) chipset product development.</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+*  While this file is called 'ioctl' is purpose goes a little beyond</div><div class='add'>+*  that.  This file defines the types and contants used to implement</div><div class='add'>+*  the p80211 request/confirm/indicate interfaces on Linux.  The</div><div class='add'>+*  request/confirm interface is, in fact, normally implemented as an</div><div class='add'>+*  ioctl.  The indicate interface on the other hand, is implemented</div><div class='add'>+*  using the Linux 'netlink' interface.</div><div class='add'>+*</div><div class='add'>+*  The reason I say that request/confirm is 'normally' implemented</div><div class='add'>+*  via ioctl is that we're reserving the right to be able to send</div><div class='add'>+*  request commands via the netlink interface.  This will be necessary</div><div class='add'>+*  if we ever need to send request messages when there aren't any</div><div class='add'>+*  wlan network devices present (i.e. sending a message that only p80211</div><div class='add'>+*  cares about.</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#ifndef _P80211IOCTL_H</div><div class='add'>+#define _P80211IOCTL_H</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Constants */</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------*/</div><div class='add'>+/* p80211 ioctl "request" codes.  See argument 2 of ioctl(2). */</div><div class='add'>+</div><div class='add'>+#define P80211_IFTEST		(SIOCDEVPRIVATE + 0)</div><div class='add'>+#define P80211_IFREQ		(SIOCDEVPRIVATE + 1)</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------*/</div><div class='add'>+/* Magic number, a quick test to see we're getting the desired struct */</div><div class='add'>+</div><div class='add'>+#define P80211_IOCTL_MAGIC	(0x4a2d464dUL)</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------*/</div><div class='add'>+/* Netlink protocol numbers for the indication interface */</div><div class='add'>+</div><div class='add'>+#define P80211_NL_SOCK_IND	NETLINK_USERSOCK</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------*/</div><div class='add'>+/* Netlink multicast bits for different types of messages */</div><div class='add'>+</div><div class='add'>+#define P80211_NL_MCAST_GRP_MLME	BIT0	/* Local station messages */</div><div class='add'>+#define P80211_NL_MCAST_GRP_SNIFF	BIT1	/* Sniffer messages */</div><div class='add'>+#define P80211_NL_MCAST_GRP_DIST	BIT2	/* Distribution system messages */</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Macros */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Types */</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------*/</div><div class='add'>+/* A ptr to the following structure type is passed as the third */</div><div class='add'>+/*  argument to the ioctl system call when issuing a request to */</div><div class='add'>+/*  the p80211 module. */</div><div class='add'>+</div><div class='add'>+typedef struct p80211ioctl_req</div><div class='add'>+{</div><div class='add'>+	char 	name[WLAN_DEVNAMELEN_MAX];</div><div class='add'>+	caddr_t data;</div><div class='add'>+	UINT32	magic;</div><div class='add'>+	UINT16	len;</div><div class='add'>+	UINT32	result;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ p80211ioctl_req_t;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Extern Declarations */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Function Declarations */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#endif /* _P80211IOCTL_H */</div><div class='head'>diff --git a/drivers/staging/wlan-ng/p80211meta.h b/drivers/staging/wlan-ng/p80211meta.h<br/>new file mode 100644<br/>index 000000000000..5cb3f5ada4f5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/wlan-ng/p80211meta.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/wlan-ng/p80211meta.h</a></div><div class='hunk'>@@ -0,0 +1,169 @@</div><div class='add'>+/* p80211meta.h</div><div class='add'>+*</div><div class='add'>+* Macros, constants, types, and funcs for p80211 metadata</div><div class='add'>+*</div><div class='add'>+* Copyright (C) 1999 AbsoluteValue Systems, Inc.  All Rights Reserved.</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* linux-wlan</div><div class='add'>+*</div><div class='add'>+*   The contents of this file are subject to the Mozilla Public</div><div class='add'>+*   License Version 1.1 (the "License"); you may not use this file</div><div class='add'>+*   except in compliance with the License. You may obtain a copy of</div><div class='add'>+*   the License at http://www.mozilla.org/MPL/</div><div class='add'>+*</div><div class='add'>+*   Software distributed under the License is distributed on an "AS</div><div class='add'>+*   IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or</div><div class='add'>+*   implied. See the License for the specific language governing</div><div class='add'>+*   rights and limitations under the License.</div><div class='add'>+*</div><div class='add'>+*   Alternatively, the contents of this file may be used under the</div><div class='add'>+*   terms of the GNU Public License version 2 (the "GPL"), in which</div><div class='add'>+*   case the provisions of the GPL are applicable instead of the</div><div class='add'>+*   above.  If you wish to allow the use of your version of this file</div><div class='add'>+*   only under the terms of the GPL and not to allow others to use</div><div class='add'>+*   your version of this file under the MPL, indicate your decision</div><div class='add'>+*   by deleting the provisions above and replace them with the notice</div><div class='add'>+*   and other provisions required by the GPL.  If you do not delete</div><div class='add'>+*   the provisions above, a recipient may use your version of this</div><div class='add'>+*   file under either the MPL or the GPL.</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* Inquiries regarding the linux-wlan Open Source project can be</div><div class='add'>+* made directly to:</div><div class='add'>+*</div><div class='add'>+* AbsoluteValue Systems Inc.</div><div class='add'>+* info@linux-wlan.com</div><div class='add'>+* http://www.linux-wlan.com</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* Portions of the development of this software were funded by</div><div class='add'>+* Intersil Corporation as part of PRISM(R) chipset product development.</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* This file declares some of the constants and types used in various</div><div class='add'>+* parts of the linux-wlan system.</div><div class='add'>+*</div><div class='add'>+* Notes:</div><div class='add'>+*   - Constant values are always in HOST byte order.</div><div class='add'>+*</div><div class='add'>+* All functions and statics declared here are implemented in p80211types.c</div><div class='add'>+*   --------------------------------------------------------------------</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#ifndef _P80211META_H</div><div class='add'>+#define _P80211META_H</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* System Includes */</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Project Includes */</div><div class='add'>+</div><div class='add'>+#ifndef _WLAN_COMPAT_H</div><div class='add'>+#include "wlan_compat.h"</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Constants */</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------*/</div><div class='add'>+/* */</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Macros */</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------*/</div><div class='add'>+/* The following macros are used to ensure consistent naming */</div><div class='add'>+/*  conventions for all the different metadata lists. */</div><div class='add'>+</div><div class='add'>+#define MKREQMETANAME(name)		p80211meta_ ## req ## _ ## name</div><div class='add'>+#define MKINDMETANAME(name)		p80211meta_ ## ind ## _ ## name</div><div class='add'>+#define MKMIBMETANAME(name)		p80211meta_ ## mib ## _ ## name</div><div class='add'>+#define MKGRPMETANAME(name)		p80211meta_ ## grp ## _ ## name</div><div class='add'>+</div><div class='add'>+#define MKREQMETASIZE(name)		p80211meta_ ## req ## _ ## name ## _ ## size</div><div class='add'>+#define MKINDMETASIZE(name)		p80211meta_ ## ind ## _ ## name ## _ ## size</div><div class='add'>+#define MKMIBMETASIZE(name)		p80211meta_ ## mib ## _ ## name ## _ ## size</div><div class='add'>+#define MKGRPMETASIZE(name)		p80211meta_ ## grp ## _ ## name ## _ ## size</div><div class='add'>+</div><div class='add'>+#define GETMETASIZE(aptr)		(**((UINT32**)(aptr)))</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------*/</div><div class='add'>+/* The following ifdef depends on the following defines: */</div><div class='add'>+/*  P80211_NOINCLUDESTRINGS - if defined, all metadata name fields */</div><div class='add'>+/*                               are empty strings */</div><div class='add'>+</div><div class='add'>+#ifdef P80211_NOINCLUDESTRINGS</div><div class='add'>+	#define	MKITEMNAME(s)	("")</div><div class='add'>+#else</div><div class='add'>+	#define	MKITEMNAME(s)	(s)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Types */</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------*/</div><div class='add'>+/* The following structure types are used for the metadata */</div><div class='add'>+/* representation of category list metadata, group list metadata, */</div><div class='add'>+/* and data item metadata for both Mib and Messages. */</div><div class='add'>+</div><div class='add'>+typedef struct p80211meta</div><div class='add'>+{</div><div class='add'>+	char			*name;		/* data item name */</div><div class='add'>+	UINT32			did;		/* partial did */</div><div class='add'>+	UINT32			flags;		/* set of various flag bits */</div><div class='add'>+	UINT32			min;		/* min value of a BOUNDEDINT */</div><div class='add'>+	UINT32			max;		/* max value of a BOUNDEDINT */</div><div class='add'>+</div><div class='add'>+	UINT32			maxlen;		/* maxlen of a OCTETSTR or DISPLAYSTR */</div><div class='add'>+	UINT32			minlen;		/* minlen of a OCTETSTR or DISPLAYSTR */</div><div class='add'>+	p80211enum_t		*enumptr;	/* ptr to the enum type for ENUMINT */</div><div class='add'>+	p80211_totext_t		totextptr;	/* ptr to totext conversion function */</div><div class='add'>+	p80211_fromtext_t	fromtextptr;	/* ptr to totext conversion function */</div><div class='add'>+	p80211_valid_t		validfunptr;	/* ptr to totext conversion function */</div><div class='add'>+} p80211meta_t;</div><div class='add'>+</div><div class='add'>+typedef struct grplistitem</div><div class='add'>+{</div><div class='add'>+	char		*name;</div><div class='add'>+	p80211meta_t	*itemlist;</div><div class='add'>+} grplistitem_t;</div><div class='add'>+</div><div class='add'>+typedef struct catlistitem</div><div class='add'>+{</div><div class='add'>+	char		*name;</div><div class='add'>+	grplistitem_t	*grplist;</div><div class='add'>+} catlistitem_t;</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Extern Declarations */</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------*/</div><div class='add'>+/* */</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Function Declarations */</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------*/</div><div class='add'>+/* */</div><div class='add'>+UINT32 p80211_text2did(catlistitem_t *catlist, char *catname, char *grpname, char *itemname);</div><div class='add'>+UINT32 p80211_text2catdid(catlistitem_t *list, char *name );</div><div class='add'>+UINT32 p80211_text2grpdid(grplistitem_t *list, char *name );</div><div class='add'>+UINT32 p80211_text2itemdid(p80211meta_t *list, char *name );</div><div class='add'>+UINT32 p80211_isvalid_did( catlistitem_t *catlist, UINT32 did );</div><div class='add'>+UINT32 p80211_isvalid_catdid( catlistitem_t *catlist, UINT32 did );</div><div class='add'>+UINT32 p80211_isvalid_grpdid( catlistitem_t *catlist, UINT32 did );</div><div class='add'>+UINT32 p80211_isvalid_itemdid( catlistitem_t *catlist, UINT32 did );</div><div class='add'>+catlistitem_t *p80211_did2cat( catlistitem_t *catlist, UINT32 did );</div><div class='add'>+grplistitem_t *p80211_did2grp( catlistitem_t *catlist, UINT32 did );</div><div class='add'>+p80211meta_t *p80211_did2item( catlistitem_t *catlist, UINT32 did );</div><div class='add'>+UINT32 p80211item_maxdatalen( struct catlistitem *metalist, UINT32 did );</div><div class='add'>+UINT32 p80211_metaname2did(struct catlistitem *metalist, char *itemname);</div><div class='add'>+UINT32 p80211item_getoffset( struct catlistitem *metalist, UINT32 did );</div><div class='add'>+int p80211item_gettype(p80211meta_t *meta);</div><div class='add'>+</div><div class='add'>+#endif /* _P80211META_H */</div><div class='head'>diff --git a/drivers/staging/wlan-ng/p80211metadef.h b/drivers/staging/wlan-ng/p80211metadef.h<br/>new file mode 100644<br/>index 000000000000..2c7f435a97e0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/wlan-ng/p80211metadef.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/wlan-ng/p80211metadef.h</a></div><div class='hunk'>@@ -0,0 +1,2524 @@</div><div class='add'>+/* This file is GENERATED AUTOMATICALLY.  DO NOT EDIT OR MODIFY.</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* Copyright (C) 1999 AbsoluteValue Systems, Inc.  All Rights Reserved.</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* linux-wlan</div><div class='add'>+*</div><div class='add'>+*   The contents of this file are subject to the Mozilla Public</div><div class='add'>+*   License Version 1.1 (the "License"); you may not use this file</div><div class='add'>+*   except in compliance with the License. You may obtain a copy of</div><div class='add'>+*   the License at http://www.mozilla.org/MPL/</div><div class='add'>+*</div><div class='add'>+*   Software distributed under the License is distributed on an "AS</div><div class='add'>+*   IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or</div><div class='add'>+*   implied. See the License for the specific language governing</div><div class='add'>+*   rights and limitations under the License.</div><div class='add'>+*</div><div class='add'>+*   Alternatively, the contents of this file may be used under the</div><div class='add'>+*   terms of the GNU Public License version 2 (the "GPL"), in which</div><div class='add'>+*   case the provisions of the GPL are applicable instead of the</div><div class='add'>+*   above.  If you wish to allow the use of your version of this file</div><div class='add'>+*   only under the terms of the GPL and not to allow others to use</div><div class='add'>+*   your version of this file under the MPL, indicate your decision</div><div class='add'>+*   by deleting the provisions above and replace them with the notice</div><div class='add'>+*   and other provisions required by the GPL.  If you do not delete</div><div class='add'>+*   the provisions above, a recipient may use your version of this</div><div class='add'>+*   file under either the MPL or the GPL.</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* Inquiries regarding the linux-wlan Open Source project can be</div><div class='add'>+* made directly to:</div><div class='add'>+*</div><div class='add'>+* AbsoluteValue Systems Inc.</div><div class='add'>+* info@linux-wlan.com</div><div class='add'>+* http://www.linux-wlan.com</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* Portions of the development of this software were funded by</div><div class='add'>+* Intersil Corporation as part of PRISM(R) chipset product development.</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#ifndef _P80211MKMETADEF_H</div><div class='add'>+#define _P80211MKMETADEF_H</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define DIDmsg_cat_dot11req \</div><div class='add'>+			P80211DID_MKSECTION(1)</div><div class='add'>+#define DIDmsg_dot11req_mibget \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(1))</div><div class='add'>+#define DIDmsg_dot11req_mibget_mibattribute \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(1) | \</div><div class='add'>+			P80211DID_MKITEM(1) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_mibget_resultcode \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(1) | \</div><div class='add'>+			P80211DID_MKITEM(2) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_mibset \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(2))</div><div class='add'>+#define DIDmsg_dot11req_mibset_mibattribute \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(1) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_mibset_resultcode \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(2) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_powermgmt \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(3))</div><div class='add'>+#define DIDmsg_dot11req_powermgmt_powermgmtmode \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(1) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_powermgmt_wakeup \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(2) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_powermgmt_receivedtims \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(3) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_powermgmt_resultcode \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(4) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_scan \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(4))</div><div class='add'>+#define DIDmsg_dot11req_scan_bsstype \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(4) | \</div><div class='add'>+			P80211DID_MKITEM(1) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_scan_bssid \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(4) | \</div><div class='add'>+			P80211DID_MKITEM(2) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_scan_ssid \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(4) | \</div><div class='add'>+			P80211DID_MKITEM(3) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_scan_scantype \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(4) | \</div><div class='add'>+			P80211DID_MKITEM(4) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_scan_probedelay \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(4) | \</div><div class='add'>+			P80211DID_MKITEM(5) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_scan_channellist \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(4) | \</div><div class='add'>+			P80211DID_MKITEM(6) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_scan_minchanneltime \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(4) | \</div><div class='add'>+			P80211DID_MKITEM(7) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_scan_maxchanneltime \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(4) | \</div><div class='add'>+			P80211DID_MKITEM(8) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_scan_resultcode \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(4) | \</div><div class='add'>+			P80211DID_MKITEM(9) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_scan_numbss \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(4) | \</div><div class='add'>+			P80211DID_MKITEM(10) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_scan_append \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(4) | \</div><div class='add'>+			P80211DID_MKITEM(11) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_scan_results \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(5))</div><div class='add'>+#define DIDmsg_dot11req_scan_results_bssindex \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(1) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_scan_results_resultcode \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(2) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_scan_results_signal \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(3) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_scan_results_noise \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(4) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_scan_results_bssid \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(5) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_scan_results_ssid \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(6) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_scan_results_bsstype \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(7) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_scan_results_beaconperiod \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(8) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_scan_results_dtimperiod \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(9) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_scan_results_timestamp \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(10) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_scan_results_localtime \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(11) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_scan_results_fhdwelltime \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(12) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_scan_results_fhhopset \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(13) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_scan_results_fhhoppattern \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(14) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_scan_results_fhhopindex \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(15) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_scan_results_dschannel \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(16) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_scan_results_cfpcount \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(17) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_scan_results_cfpperiod \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(18) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_scan_results_cfpmaxduration \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(19) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_scan_results_cfpdurremaining \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(20) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_scan_results_ibssatimwindow \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(21) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_scan_results_cfpollable \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(22) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_scan_results_cfpollreq \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(23) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_scan_results_privacy \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(24) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_scan_results_basicrate1 \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(25) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_scan_results_basicrate2 \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(26) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_scan_results_basicrate3 \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(27) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_scan_results_basicrate4 \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(28) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_scan_results_basicrate5 \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(29) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_scan_results_basicrate6 \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(30) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_scan_results_basicrate7 \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(31) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_scan_results_basicrate8 \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(32) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_scan_results_supprate1 \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(33) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_scan_results_supprate2 \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(34) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_scan_results_supprate3 \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(35) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_scan_results_supprate4 \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(36) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_scan_results_supprate5 \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(37) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_scan_results_supprate6 \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(38) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_scan_results_supprate7 \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(39) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_scan_results_supprate8 \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(40) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_join \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(6))</div><div class='add'>+#define DIDmsg_dot11req_join_bssid \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(6) | \</div><div class='add'>+			P80211DID_MKITEM(1) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_join_joinfailuretimeout \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(6) | \</div><div class='add'>+			P80211DID_MKITEM(2) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_join_basicrate1 \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(6) | \</div><div class='add'>+			P80211DID_MKITEM(3) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_join_basicrate2 \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(6) | \</div><div class='add'>+			P80211DID_MKITEM(4) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_join_basicrate3 \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(6) | \</div><div class='add'>+			P80211DID_MKITEM(5) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_join_basicrate4 \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(6) | \</div><div class='add'>+			P80211DID_MKITEM(6) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_join_basicrate5 \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(6) | \</div><div class='add'>+			P80211DID_MKITEM(7) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_join_basicrate6 \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(6) | \</div><div class='add'>+			P80211DID_MKITEM(8) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_join_basicrate7 \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(6) | \</div><div class='add'>+			P80211DID_MKITEM(9) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_join_basicrate8 \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(6) | \</div><div class='add'>+			P80211DID_MKITEM(10) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_join_operationalrate1 \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(6) | \</div><div class='add'>+			P80211DID_MKITEM(11) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_join_operationalrate2 \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(6) | \</div><div class='add'>+			P80211DID_MKITEM(12) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_join_operationalrate3 \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(6) | \</div><div class='add'>+			P80211DID_MKITEM(13) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_join_operationalrate4 \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(6) | \</div><div class='add'>+			P80211DID_MKITEM(14) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_join_operationalrate5 \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(6) | \</div><div class='add'>+			P80211DID_MKITEM(15) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_join_operationalrate6 \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(6) | \</div><div class='add'>+			P80211DID_MKITEM(16) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_join_operationalrate7 \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(6) | \</div><div class='add'>+			P80211DID_MKITEM(17) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_join_operationalrate8 \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(6) | \</div><div class='add'>+			P80211DID_MKITEM(18) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_join_resultcode \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(6) | \</div><div class='add'>+			P80211DID_MKITEM(19) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_authenticate \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(7))</div><div class='add'>+#define DIDmsg_dot11req_authenticate_peerstaaddress \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(7) | \</div><div class='add'>+			P80211DID_MKITEM(1) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_authenticate_authenticationtype \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(7) | \</div><div class='add'>+			P80211DID_MKITEM(2) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_authenticate_authenticationfailuretimeout \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(7) | \</div><div class='add'>+			P80211DID_MKITEM(3) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_authenticate_resultcode \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(7) | \</div><div class='add'>+			P80211DID_MKITEM(4) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_deauthenticate \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(8))</div><div class='add'>+#define DIDmsg_dot11req_deauthenticate_peerstaaddress \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(8) | \</div><div class='add'>+			P80211DID_MKITEM(1) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_deauthenticate_reasoncode \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(8) | \</div><div class='add'>+			P80211DID_MKITEM(2) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_deauthenticate_resultcode \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(8) | \</div><div class='add'>+			P80211DID_MKITEM(3) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_associate \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(9))</div><div class='add'>+#define DIDmsg_dot11req_associate_peerstaaddress \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(9) | \</div><div class='add'>+			P80211DID_MKITEM(1) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_associate_associatefailuretimeout \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(9) | \</div><div class='add'>+			P80211DID_MKITEM(2) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_associate_cfpollable \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(9) | \</div><div class='add'>+			P80211DID_MKITEM(3) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_associate_cfpollreq \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(9) | \</div><div class='add'>+			P80211DID_MKITEM(4) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_associate_privacy \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(9) | \</div><div class='add'>+			P80211DID_MKITEM(5) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_associate_listeninterval \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(9) | \</div><div class='add'>+			P80211DID_MKITEM(6) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_associate_resultcode \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(9) | \</div><div class='add'>+			P80211DID_MKITEM(7) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_reassociate \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(10))</div><div class='add'>+#define DIDmsg_dot11req_reassociate_newapaddress \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(10) | \</div><div class='add'>+			P80211DID_MKITEM(1) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_reassociate_reassociatefailuretimeout \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(10) | \</div><div class='add'>+			P80211DID_MKITEM(2) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_reassociate_cfpollable \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(10) | \</div><div class='add'>+			P80211DID_MKITEM(3) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_reassociate_cfpollreq \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(10) | \</div><div class='add'>+			P80211DID_MKITEM(4) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_reassociate_privacy \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(10) | \</div><div class='add'>+			P80211DID_MKITEM(5) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_reassociate_listeninterval \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(10) | \</div><div class='add'>+			P80211DID_MKITEM(6) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_reassociate_resultcode \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(10) | \</div><div class='add'>+			P80211DID_MKITEM(7) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_disassociate \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(11))</div><div class='add'>+#define DIDmsg_dot11req_disassociate_peerstaaddress \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(11) | \</div><div class='add'>+			P80211DID_MKITEM(1) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_disassociate_reasoncode \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(11) | \</div><div class='add'>+			P80211DID_MKITEM(2) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_disassociate_resultcode \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(11) | \</div><div class='add'>+			P80211DID_MKITEM(3) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_reset \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(12))</div><div class='add'>+#define DIDmsg_dot11req_reset_setdefaultmib \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(12) | \</div><div class='add'>+			P80211DID_MKITEM(1) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_reset_macaddress \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(12) | \</div><div class='add'>+			P80211DID_MKITEM(2) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_reset_resultcode \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(12) | \</div><div class='add'>+			P80211DID_MKITEM(3) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_start \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(13))</div><div class='add'>+#define DIDmsg_dot11req_start_ssid \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(13) | \</div><div class='add'>+			P80211DID_MKITEM(1) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_start_bsstype \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(13) | \</div><div class='add'>+			P80211DID_MKITEM(2) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_start_beaconperiod \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(13) | \</div><div class='add'>+			P80211DID_MKITEM(3) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_start_dtimperiod \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(13) | \</div><div class='add'>+			P80211DID_MKITEM(4) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_start_cfpperiod \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(13) | \</div><div class='add'>+			P80211DID_MKITEM(5) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_start_cfpmaxduration \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(13) | \</div><div class='add'>+			P80211DID_MKITEM(6) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_start_fhdwelltime \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(13) | \</div><div class='add'>+			P80211DID_MKITEM(7) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_start_fhhopset \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(13) | \</div><div class='add'>+			P80211DID_MKITEM(8) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_start_fhhoppattern \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(13) | \</div><div class='add'>+			P80211DID_MKITEM(9) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_start_dschannel \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(13) | \</div><div class='add'>+			P80211DID_MKITEM(10) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_start_ibssatimwindow \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(13) | \</div><div class='add'>+			P80211DID_MKITEM(11) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_start_probedelay \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(13) | \</div><div class='add'>+			P80211DID_MKITEM(12) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_start_cfpollable \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(13) | \</div><div class='add'>+			P80211DID_MKITEM(13) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_start_cfpollreq \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(13) | \</div><div class='add'>+			P80211DID_MKITEM(14) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_start_basicrate1 \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(13) | \</div><div class='add'>+			P80211DID_MKITEM(15) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_start_basicrate2 \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(13) | \</div><div class='add'>+			P80211DID_MKITEM(16) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_start_basicrate3 \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(13) | \</div><div class='add'>+			P80211DID_MKITEM(17) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_start_basicrate4 \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(13) | \</div><div class='add'>+			P80211DID_MKITEM(18) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_start_basicrate5 \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(13) | \</div><div class='add'>+			P80211DID_MKITEM(19) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_start_basicrate6 \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(13) | \</div><div class='add'>+			P80211DID_MKITEM(20) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_start_basicrate7 \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(13) | \</div><div class='add'>+			P80211DID_MKITEM(21) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_start_basicrate8 \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(13) | \</div><div class='add'>+			P80211DID_MKITEM(22) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_start_operationalrate1 \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(13) | \</div><div class='add'>+			P80211DID_MKITEM(23) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_start_operationalrate2 \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(13) | \</div><div class='add'>+			P80211DID_MKITEM(24) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_start_operationalrate3 \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(13) | \</div><div class='add'>+			P80211DID_MKITEM(25) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_start_operationalrate4 \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(13) | \</div><div class='add'>+			P80211DID_MKITEM(26) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_start_operationalrate5 \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(13) | \</div><div class='add'>+			P80211DID_MKITEM(27) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_start_operationalrate6 \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(13) | \</div><div class='add'>+			P80211DID_MKITEM(28) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_start_operationalrate7 \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(13) | \</div><div class='add'>+			P80211DID_MKITEM(29) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_start_operationalrate8 \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(13) | \</div><div class='add'>+			P80211DID_MKITEM(30) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11req_start_resultcode \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(13) | \</div><div class='add'>+			P80211DID_MKITEM(31) | 0x00000000)</div><div class='add'>+#define DIDmsg_cat_dot11ind \</div><div class='add'>+			P80211DID_MKSECTION(2)</div><div class='add'>+#define DIDmsg_dot11ind_authenticate \</div><div class='add'>+			(P80211DID_MKSECTION(2) | \</div><div class='add'>+			P80211DID_MKGROUP(1))</div><div class='add'>+#define DIDmsg_dot11ind_authenticate_peerstaaddress \</div><div class='add'>+			(P80211DID_MKSECTION(2) | \</div><div class='add'>+			P80211DID_MKGROUP(1) | \</div><div class='add'>+			P80211DID_MKITEM(1) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11ind_authenticate_authenticationtype \</div><div class='add'>+			(P80211DID_MKSECTION(2) | \</div><div class='add'>+			P80211DID_MKGROUP(1) | \</div><div class='add'>+			P80211DID_MKITEM(2) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11ind_deauthenticate \</div><div class='add'>+			(P80211DID_MKSECTION(2) | \</div><div class='add'>+			P80211DID_MKGROUP(2))</div><div class='add'>+#define DIDmsg_dot11ind_deauthenticate_peerstaaddress \</div><div class='add'>+			(P80211DID_MKSECTION(2) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(1) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11ind_deauthenticate_reasoncode \</div><div class='add'>+			(P80211DID_MKSECTION(2) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(2) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11ind_associate \</div><div class='add'>+			(P80211DID_MKSECTION(2) | \</div><div class='add'>+			P80211DID_MKGROUP(3))</div><div class='add'>+#define DIDmsg_dot11ind_associate_peerstaaddress \</div><div class='add'>+			(P80211DID_MKSECTION(2) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(1) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11ind_associate_aid \</div><div class='add'>+			(P80211DID_MKSECTION(2) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(2) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11ind_reassociate \</div><div class='add'>+			(P80211DID_MKSECTION(2) | \</div><div class='add'>+			P80211DID_MKGROUP(4))</div><div class='add'>+#define DIDmsg_dot11ind_reassociate_peerstaaddress \</div><div class='add'>+			(P80211DID_MKSECTION(2) | \</div><div class='add'>+			P80211DID_MKGROUP(4) | \</div><div class='add'>+			P80211DID_MKITEM(1) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11ind_reassociate_aid \</div><div class='add'>+			(P80211DID_MKSECTION(2) | \</div><div class='add'>+			P80211DID_MKGROUP(4) | \</div><div class='add'>+			P80211DID_MKITEM(2) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11ind_reassociate_oldapaddress \</div><div class='add'>+			(P80211DID_MKSECTION(2) | \</div><div class='add'>+			P80211DID_MKGROUP(4) | \</div><div class='add'>+			P80211DID_MKITEM(3) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11ind_disassociate \</div><div class='add'>+			(P80211DID_MKSECTION(2) | \</div><div class='add'>+			P80211DID_MKGROUP(5))</div><div class='add'>+#define DIDmsg_dot11ind_disassociate_peerstaaddress \</div><div class='add'>+			(P80211DID_MKSECTION(2) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(1) | 0x00000000)</div><div class='add'>+#define DIDmsg_dot11ind_disassociate_reasoncode \</div><div class='add'>+			(P80211DID_MKSECTION(2) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(2) | 0x00000000)</div><div class='add'>+#define DIDmsg_cat_lnxreq \</div><div class='add'>+			P80211DID_MKSECTION(3)</div><div class='add'>+#define DIDmsg_lnxreq_ifstate \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(1))</div><div class='add'>+#define DIDmsg_lnxreq_ifstate_ifstate \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(1) | \</div><div class='add'>+			P80211DID_MKITEM(1) | 0x00000000)</div><div class='add'>+#define DIDmsg_lnxreq_ifstate_resultcode \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(1) | \</div><div class='add'>+			P80211DID_MKITEM(2) | 0x00000000)</div><div class='add'>+#define DIDmsg_lnxreq_wlansniff \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(2))</div><div class='add'>+#define DIDmsg_lnxreq_wlansniff_enable \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(1) | 0x00000000)</div><div class='add'>+#define DIDmsg_lnxreq_wlansniff_channel \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(2) | 0x00000000)</div><div class='add'>+#define DIDmsg_lnxreq_wlansniff_prismheader \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(3) | 0x00000000)</div><div class='add'>+#define DIDmsg_lnxreq_wlansniff_wlanheader \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(4) | 0x00000000)</div><div class='add'>+#define DIDmsg_lnxreq_wlansniff_keepwepflags \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(5) | 0x00000000)</div><div class='add'>+#define DIDmsg_lnxreq_wlansniff_stripfcs \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(6) | 0x00000000)</div><div class='add'>+#define DIDmsg_lnxreq_wlansniff_packet_trunc \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(7) | 0x00000000)</div><div class='add'>+#define DIDmsg_lnxreq_wlansniff_resultcode \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(8) | 0x00000000)</div><div class='add'>+#define DIDmsg_lnxreq_hostwep \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(3))</div><div class='add'>+#define DIDmsg_lnxreq_hostwep_resultcode \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(1) | 0x00000000)</div><div class='add'>+#define DIDmsg_lnxreq_hostwep_decrypt \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(2) | 0x00000000)</div><div class='add'>+#define DIDmsg_lnxreq_hostwep_encrypt \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(3) | 0x00000000)</div><div class='add'>+#define DIDmsg_lnxreq_commsquality \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(4))</div><div class='add'>+#define DIDmsg_lnxreq_commsquality_resultcode \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(4) | \</div><div class='add'>+			P80211DID_MKITEM(1) | 0x00000000)</div><div class='add'>+#define DIDmsg_lnxreq_commsquality_dbm \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(4) | \</div><div class='add'>+			P80211DID_MKITEM(2) | 0x00000000)</div><div class='add'>+#define DIDmsg_lnxreq_commsquality_link \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(4) | \</div><div class='add'>+			P80211DID_MKITEM(3) | 0x00000000)</div><div class='add'>+#define DIDmsg_lnxreq_commsquality_level \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(4) | \</div><div class='add'>+			P80211DID_MKITEM(4) | 0x00000000)</div><div class='add'>+#define DIDmsg_lnxreq_commsquality_noise \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(4) | \</div><div class='add'>+			P80211DID_MKITEM(5) | 0x00000000)</div><div class='add'>+#define DIDmsg_lnxreq_autojoin \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(5))</div><div class='add'>+#define DIDmsg_lnxreq_autojoin_ssid \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(1) | 0x00000000)</div><div class='add'>+#define DIDmsg_lnxreq_autojoin_authtype \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(2) | 0x00000000)</div><div class='add'>+#define DIDmsg_lnxreq_autojoin_resultcode \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(3) | 0x00000000)</div><div class='add'>+#define DIDmsg_cat_lnxind \</div><div class='add'>+			P80211DID_MKSECTION(4)</div><div class='add'>+#define DIDmsg_lnxind_wlansniffrm \</div><div class='add'>+			(P80211DID_MKSECTION(4) | \</div><div class='add'>+			P80211DID_MKGROUP(1))</div><div class='add'>+#define DIDmsg_lnxind_wlansniffrm_hosttime \</div><div class='add'>+			(P80211DID_MKSECTION(4) | \</div><div class='add'>+			P80211DID_MKGROUP(1) | \</div><div class='add'>+			P80211DID_MKITEM(1) | 0x00000000)</div><div class='add'>+#define DIDmsg_lnxind_wlansniffrm_mactime \</div><div class='add'>+			(P80211DID_MKSECTION(4) | \</div><div class='add'>+			P80211DID_MKGROUP(1) | \</div><div class='add'>+			P80211DID_MKITEM(2) | 0x00000000)</div><div class='add'>+#define DIDmsg_lnxind_wlansniffrm_channel \</div><div class='add'>+			(P80211DID_MKSECTION(4) | \</div><div class='add'>+			P80211DID_MKGROUP(1) | \</div><div class='add'>+			P80211DID_MKITEM(3) | 0x00000000)</div><div class='add'>+#define DIDmsg_lnxind_wlansniffrm_rssi \</div><div class='add'>+			(P80211DID_MKSECTION(4) | \</div><div class='add'>+			P80211DID_MKGROUP(1) | \</div><div class='add'>+			P80211DID_MKITEM(4) | 0x00000000)</div><div class='add'>+#define DIDmsg_lnxind_wlansniffrm_sq \</div><div class='add'>+			(P80211DID_MKSECTION(4) | \</div><div class='add'>+			P80211DID_MKGROUP(1) | \</div><div class='add'>+			P80211DID_MKITEM(5) | 0x00000000)</div><div class='add'>+#define DIDmsg_lnxind_wlansniffrm_signal \</div><div class='add'>+			(P80211DID_MKSECTION(4) | \</div><div class='add'>+			P80211DID_MKGROUP(1) | \</div><div class='add'>+			P80211DID_MKITEM(6) | 0x00000000)</div><div class='add'>+#define DIDmsg_lnxind_wlansniffrm_noise \</div><div class='add'>+			(P80211DID_MKSECTION(4) | \</div><div class='add'>+			P80211DID_MKGROUP(1) | \</div><div class='add'>+			P80211DID_MKITEM(7) | 0x00000000)</div><div class='add'>+#define DIDmsg_lnxind_wlansniffrm_rate \</div><div class='add'>+			(P80211DID_MKSECTION(4) | \</div><div class='add'>+			P80211DID_MKGROUP(1) | \</div><div class='add'>+			P80211DID_MKITEM(8) | 0x00000000)</div><div class='add'>+#define DIDmsg_lnxind_wlansniffrm_istx \</div><div class='add'>+			(P80211DID_MKSECTION(4) | \</div><div class='add'>+			P80211DID_MKGROUP(1) | \</div><div class='add'>+			P80211DID_MKITEM(9) | 0x00000000)</div><div class='add'>+#define DIDmsg_lnxind_wlansniffrm_frmlen \</div><div class='add'>+			(P80211DID_MKSECTION(4) | \</div><div class='add'>+			P80211DID_MKGROUP(1) | \</div><div class='add'>+			P80211DID_MKITEM(10) | 0x00000000)</div><div class='add'>+#define DIDmsg_lnxind_roam \</div><div class='add'>+			(P80211DID_MKSECTION(4) | \</div><div class='add'>+			P80211DID_MKGROUP(2))</div><div class='add'>+#define DIDmsg_lnxind_roam_reason \</div><div class='add'>+			(P80211DID_MKSECTION(4) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(1) | 0x00000000)</div><div class='add'>+#define DIDmsg_cat_p2req \</div><div class='add'>+			P80211DID_MKSECTION(5)</div><div class='add'>+#define DIDmsg_p2req_join \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(1))</div><div class='add'>+#define DIDmsg_p2req_join_bssid \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(1) | \</div><div class='add'>+			P80211DID_MKITEM(1) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_join_basicrate1 \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(1) | \</div><div class='add'>+			P80211DID_MKITEM(2) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_join_basicrate2 \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(1) | \</div><div class='add'>+			P80211DID_MKITEM(3) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_join_basicrate3 \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(1) | \</div><div class='add'>+			P80211DID_MKITEM(4) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_join_basicrate4 \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(1) | \</div><div class='add'>+			P80211DID_MKITEM(5) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_join_basicrate5 \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(1) | \</div><div class='add'>+			P80211DID_MKITEM(6) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_join_basicrate6 \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(1) | \</div><div class='add'>+			P80211DID_MKITEM(7) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_join_basicrate7 \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(1) | \</div><div class='add'>+			P80211DID_MKITEM(8) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_join_basicrate8 \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(1) | \</div><div class='add'>+			P80211DID_MKITEM(9) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_join_operationalrate1 \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(1) | \</div><div class='add'>+			P80211DID_MKITEM(10) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_join_operationalrate2 \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(1) | \</div><div class='add'>+			P80211DID_MKITEM(11) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_join_operationalrate3 \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(1) | \</div><div class='add'>+			P80211DID_MKITEM(12) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_join_operationalrate4 \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(1) | \</div><div class='add'>+			P80211DID_MKITEM(13) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_join_operationalrate5 \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(1) | \</div><div class='add'>+			P80211DID_MKITEM(14) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_join_operationalrate6 \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(1) | \</div><div class='add'>+			P80211DID_MKITEM(15) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_join_operationalrate7 \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(1) | \</div><div class='add'>+			P80211DID_MKITEM(16) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_join_operationalrate8 \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(1) | \</div><div class='add'>+			P80211DID_MKITEM(17) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_join_ssid \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(1) | \</div><div class='add'>+			P80211DID_MKITEM(18) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_join_channel \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(1) | \</div><div class='add'>+			P80211DID_MKITEM(19) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_join_authtype \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(1) | \</div><div class='add'>+			P80211DID_MKITEM(20) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_join_resultcode \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(1) | \</div><div class='add'>+			P80211DID_MKITEM(21) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_readpda \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(2))</div><div class='add'>+#define DIDmsg_p2req_readpda_pda \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(1) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_readpda_resultcode \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(2) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_readcis \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(3))</div><div class='add'>+#define DIDmsg_p2req_readcis_cis \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(1) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_readcis_resultcode \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(2) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_auxport_state \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(4))</div><div class='add'>+#define DIDmsg_p2req_auxport_state_enable \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(4) | \</div><div class='add'>+			P80211DID_MKITEM(1) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_auxport_state_resultcode \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(4) | \</div><div class='add'>+			P80211DID_MKITEM(2) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_auxport_read \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(5))</div><div class='add'>+#define DIDmsg_p2req_auxport_read_addr \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(1) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_auxport_read_len \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(2) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_auxport_read_data \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(3) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_auxport_read_resultcode \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(4) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_auxport_write \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(6))</div><div class='add'>+#define DIDmsg_p2req_auxport_write_addr \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(6) | \</div><div class='add'>+			P80211DID_MKITEM(1) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_auxport_write_len \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(6) | \</div><div class='add'>+			P80211DID_MKITEM(2) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_auxport_write_data \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(6) | \</div><div class='add'>+			P80211DID_MKITEM(3) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_auxport_write_resultcode \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(6) | \</div><div class='add'>+			P80211DID_MKITEM(4) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_low_level \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(7))</div><div class='add'>+#define DIDmsg_p2req_low_level_command \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(7) | \</div><div class='add'>+			P80211DID_MKITEM(1) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_low_level_param0 \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(7) | \</div><div class='add'>+			P80211DID_MKITEM(2) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_low_level_param1 \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(7) | \</div><div class='add'>+			P80211DID_MKITEM(3) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_low_level_param2 \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(7) | \</div><div class='add'>+			P80211DID_MKITEM(4) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_low_level_resp0 \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(7) | \</div><div class='add'>+			P80211DID_MKITEM(5) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_low_level_resp1 \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(7) | \</div><div class='add'>+			P80211DID_MKITEM(6) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_low_level_resp2 \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(7) | \</div><div class='add'>+			P80211DID_MKITEM(7) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_low_level_resultcode \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(7) | \</div><div class='add'>+			P80211DID_MKITEM(8) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_test_command \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(8))</div><div class='add'>+#define DIDmsg_p2req_test_command_testcode \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(8) | \</div><div class='add'>+			P80211DID_MKITEM(1) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_test_command_testparam \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(8) | \</div><div class='add'>+			P80211DID_MKITEM(2) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_test_command_resultcode \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(8) | \</div><div class='add'>+			P80211DID_MKITEM(3) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_test_command_status \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(8) | \</div><div class='add'>+			P80211DID_MKITEM(4) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_test_command_resp0 \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(8) | \</div><div class='add'>+			P80211DID_MKITEM(5) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_test_command_resp1 \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(8) | \</div><div class='add'>+			P80211DID_MKITEM(6) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_test_command_resp2 \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(8) | \</div><div class='add'>+			P80211DID_MKITEM(7) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_mmi_read \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(9))</div><div class='add'>+#define DIDmsg_p2req_mmi_read_addr \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(9) | \</div><div class='add'>+			P80211DID_MKITEM(1) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_mmi_read_value \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(9) | \</div><div class='add'>+			P80211DID_MKITEM(2) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_mmi_read_resultcode \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(9) | \</div><div class='add'>+			P80211DID_MKITEM(3) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_mmi_write \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(10))</div><div class='add'>+#define DIDmsg_p2req_mmi_write_addr \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(10) | \</div><div class='add'>+			P80211DID_MKITEM(1) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_mmi_write_data \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(10) | \</div><div class='add'>+			P80211DID_MKITEM(2) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_mmi_write_resultcode \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(10) | \</div><div class='add'>+			P80211DID_MKITEM(3) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_ramdl_state \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(11))</div><div class='add'>+#define DIDmsg_p2req_ramdl_state_enable \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(11) | \</div><div class='add'>+			P80211DID_MKITEM(1) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_ramdl_state_exeaddr \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(11) | \</div><div class='add'>+			P80211DID_MKITEM(2) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_ramdl_state_resultcode \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(11) | \</div><div class='add'>+			P80211DID_MKITEM(3) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_ramdl_write \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(12))</div><div class='add'>+#define DIDmsg_p2req_ramdl_write_addr \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(12) | \</div><div class='add'>+			P80211DID_MKITEM(1) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_ramdl_write_len \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(12) | \</div><div class='add'>+			P80211DID_MKITEM(2) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_ramdl_write_data \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(12) | \</div><div class='add'>+			P80211DID_MKITEM(3) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_ramdl_write_resultcode \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(12) | \</div><div class='add'>+			P80211DID_MKITEM(4) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_flashdl_state \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(13))</div><div class='add'>+#define DIDmsg_p2req_flashdl_state_enable \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(13) | \</div><div class='add'>+			P80211DID_MKITEM(1) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_flashdl_state_resultcode \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(13) | \</div><div class='add'>+			P80211DID_MKITEM(2) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_flashdl_write \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(14))</div><div class='add'>+#define DIDmsg_p2req_flashdl_write_addr \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(14) | \</div><div class='add'>+			P80211DID_MKITEM(1) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_flashdl_write_len \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(14) | \</div><div class='add'>+			P80211DID_MKITEM(2) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_flashdl_write_data \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(14) | \</div><div class='add'>+			P80211DID_MKITEM(3) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_flashdl_write_resultcode \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(14) | \</div><div class='add'>+			P80211DID_MKITEM(4) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_mm_state \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(15))</div><div class='add'>+#define DIDmsg_p2req_mm_state_enable \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(15) | \</div><div class='add'>+			P80211DID_MKITEM(1) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_mm_state_resultcode \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(15) | \</div><div class='add'>+			P80211DID_MKITEM(2) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_dump_state \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(16))</div><div class='add'>+#define DIDmsg_p2req_dump_state_level \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(16) | \</div><div class='add'>+			P80211DID_MKITEM(1) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_dump_state_resultcode \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(16) | \</div><div class='add'>+			P80211DID_MKITEM(2) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_channel_info \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(17))</div><div class='add'>+#define DIDmsg_p2req_channel_info_channellist \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(17) | \</div><div class='add'>+			P80211DID_MKITEM(1) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_channel_info_channeldwelltime \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(17) | \</div><div class='add'>+			P80211DID_MKITEM(2) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_channel_info_resultcode \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(17) | \</div><div class='add'>+			P80211DID_MKITEM(3) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_channel_info_numchinfo \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(17) | \</div><div class='add'>+			P80211DID_MKITEM(4) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_channel_info_results \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(18))</div><div class='add'>+#define DIDmsg_p2req_channel_info_results_channel \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(18) | \</div><div class='add'>+			P80211DID_MKITEM(1) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_channel_info_results_resultcode \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(18) | \</div><div class='add'>+			P80211DID_MKITEM(2) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_channel_info_results_avgnoiselevel \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(18) | \</div><div class='add'>+			P80211DID_MKITEM(3) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_channel_info_results_peaknoiselevel \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(18) | \</div><div class='add'>+			P80211DID_MKITEM(4) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_channel_info_results_bssactive \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(18) | \</div><div class='add'>+			P80211DID_MKITEM(5) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_channel_info_results_pcfactive \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(18) | \</div><div class='add'>+			P80211DID_MKITEM(6) | 0x00000000)</div><div class='add'>+#define DIDmsg_p2req_enable \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(19))</div><div class='add'>+#define DIDmsg_p2req_enable_resultcode \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(19) | \</div><div class='add'>+			P80211DID_MKITEM(1) | 0x00000000)</div><div class='add'>+#define DIDmib_cat_dot11smt \</div><div class='add'>+			P80211DID_MKSECTION(1)</div><div class='add'>+#define DIDmib_dot11smt_p80211Table \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(1))</div><div class='add'>+#define DIDmib_dot11smt_p80211Table_p80211_ifstate \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(1) | \</div><div class='add'>+			P80211DID_MKITEM(1) | 0x10000000)</div><div class='add'>+#define DIDmib_dot11smt_dot11StationConfigTable \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(2))</div><div class='add'>+#define DIDmib_dot11smt_dot11StationConfigTable_dot11StationID \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(1) | 0x18000000)</div><div class='add'>+#define DIDmib_dot11smt_dot11StationConfigTable_dot11MediumOccupancyLimit \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(2) | 0x18000000)</div><div class='add'>+#define DIDmib_dot11smt_dot11StationConfigTable_dot11CFPollable \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(3) | 0x10000000)</div><div class='add'>+#define DIDmib_dot11smt_dot11StationConfigTable_dot11CFPPeriod \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(4) | 0x18000000)</div><div class='add'>+#define DIDmib_dot11smt_dot11StationConfigTable_dot11CFPMaxDuration \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(5) | 0x18000000)</div><div class='add'>+#define DIDmib_dot11smt_dot11StationConfigTable_dot11AuthenticationResponseTimeOut \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(6) | 0x18000000)</div><div class='add'>+#define DIDmib_dot11smt_dot11StationConfigTable_dot11PrivacyOptionImplemented \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(7) | 0x10000000)</div><div class='add'>+#define DIDmib_dot11smt_dot11StationConfigTable_dot11PowerManagementMode \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(8) | 0x18000000)</div><div class='add'>+#define DIDmib_dot11smt_dot11StationConfigTable_dot11DesiredSSID \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(9) | 0x18000000)</div><div class='add'>+#define DIDmib_dot11smt_dot11StationConfigTable_dot11DesiredBSSType \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(10) | 0x18000000)</div><div class='add'>+#define DIDmib_dot11smt_dot11StationConfigTable_dot11OperationalRateSet \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(11) | 0x18000000)</div><div class='add'>+#define DIDmib_dot11smt_dot11StationConfigTable_dot11BeaconPeriod \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(12) | 0x18000000)</div><div class='add'>+#define DIDmib_dot11smt_dot11StationConfigTable_dot11DTIMPeriod \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(13) | 0x18000000)</div><div class='add'>+#define DIDmib_dot11smt_dot11StationConfigTable_dot11AssociationResponseTimeOut \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(14) | 0x10000000)</div><div class='add'>+#define DIDmib_dot11smt_dot11StationConfigTable_dot11DisassociateReason \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(15) | 0x10000000)</div><div class='add'>+#define DIDmib_dot11smt_dot11StationConfigTable_dot11DisassociateStation \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(16) | 0x10000000)</div><div class='add'>+#define DIDmib_dot11smt_dot11StationConfigTable_dot11DeauthenticateReason \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(17) | 0x10000000)</div><div class='add'>+#define DIDmib_dot11smt_dot11StationConfigTable_dot11DeauthenticateStation \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(18) | 0x10000000)</div><div class='add'>+#define DIDmib_dot11smt_dot11StationConfigTable_dot11AuthenticateFailStatus \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(19) | 0x10000000)</div><div class='add'>+#define DIDmib_dot11smt_dot11StationConfigTable_dot11AuthenticateFailStation \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(20) | 0x10000000)</div><div class='add'>+#define DIDmib_dot11smt_dot11AuthenticationAlgorithmsTable \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(3))</div><div class='add'>+#define DIDmib_dot11smt_dot11AuthenticationAlgorithmsTable_dot11AuthenticationAlgorithm1 \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(1) | 0x14000000)</div><div class='add'>+#define DIDmib_dot11smt_dot11AuthenticationAlgorithmsTable_dot11AuthenticationAlgorithmsEnable1 \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(2) | 0x1c000000)</div><div class='add'>+#define DIDmib_dot11smt_dot11AuthenticationAlgorithmsTable_dot11AuthenticationAlgorithm2 \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(3) | 0x14000000)</div><div class='add'>+#define DIDmib_dot11smt_dot11AuthenticationAlgorithmsTable_dot11AuthenticationAlgorithmsEnable2 \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(4) | 0x1c000000)</div><div class='add'>+#define DIDmib_dot11smt_dot11AuthenticationAlgorithmsTable_dot11AuthenticationAlgorithm3 \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(5) | 0x14000000)</div><div class='add'>+#define DIDmib_dot11smt_dot11AuthenticationAlgorithmsTable_dot11AuthenticationAlgorithmsEnable3 \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(6) | 0x1c000000)</div><div class='add'>+#define DIDmib_dot11smt_dot11AuthenticationAlgorithmsTable_dot11AuthenticationAlgorithm4 \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(7) | 0x14000000)</div><div class='add'>+#define DIDmib_dot11smt_dot11AuthenticationAlgorithmsTable_dot11AuthenticationAlgorithmsEnable4 \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(8) | 0x1c000000)</div><div class='add'>+#define DIDmib_dot11smt_dot11AuthenticationAlgorithmsTable_dot11AuthenticationAlgorithm5 \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(9) | 0x14000000)</div><div class='add'>+#define DIDmib_dot11smt_dot11AuthenticationAlgorithmsTable_dot11AuthenticationAlgorithmsEnable5 \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(10) | 0x1c000000)</div><div class='add'>+#define DIDmib_dot11smt_dot11AuthenticationAlgorithmsTable_dot11AuthenticationAlgorithm6 \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(11) | 0x14000000)</div><div class='add'>+#define DIDmib_dot11smt_dot11AuthenticationAlgorithmsTable_dot11AuthenticationAlgorithmsEnable6 \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(12) | 0x1c000000)</div><div class='add'>+#define DIDmib_dot11smt_dot11WEPDefaultKeysTable \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(4))</div><div class='add'>+#define DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey0 \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(4) | \</div><div class='add'>+			P80211DID_MKITEM(1) | 0x0c000000)</div><div class='add'>+#define DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey1 \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(4) | \</div><div class='add'>+			P80211DID_MKITEM(2) | 0x0c000000)</div><div class='add'>+#define DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey2 \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(4) | \</div><div class='add'>+			P80211DID_MKITEM(3) | 0x0c000000)</div><div class='add'>+#define DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey3 \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(4) | \</div><div class='add'>+			P80211DID_MKITEM(4) | 0x0c000000)</div><div class='add'>+#define DIDmib_dot11smt_dot11WEPKeyMappingsTable \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(5))</div><div class='add'>+#define DIDmib_dot11smt_dot11WEPKeyMappingsTable_dot11WEPKeyMappingIndex \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(1) | 0x1c000000)</div><div class='add'>+#define DIDmib_dot11smt_dot11WEPKeyMappingsTable_dot11WEPKeyMappingAddress \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(2) | 0x1c000000)</div><div class='add'>+#define DIDmib_dot11smt_dot11WEPKeyMappingsTable_dot11WEPKeyMappingWEPOn \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(3) | 0x1c000000)</div><div class='add'>+#define DIDmib_dot11smt_dot11WEPKeyMappingsTable_dot11WEPKeyMappingValue \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(4) | 0x1c000000)</div><div class='add'>+#define DIDmib_dot11smt_dot11PrivacyTable \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(6))</div><div class='add'>+#define DIDmib_dot11smt_dot11PrivacyTable_dot11PrivacyInvoked \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(6) | \</div><div class='add'>+			P80211DID_MKITEM(1) | 0x18000000)</div><div class='add'>+#define DIDmib_dot11smt_dot11PrivacyTable_dot11WEPDefaultKeyID \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(6) | \</div><div class='add'>+			P80211DID_MKITEM(2) | 0x18000000)</div><div class='add'>+#define DIDmib_dot11smt_dot11PrivacyTable_dot11WEPKeyMappingLength \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(6) | \</div><div class='add'>+			P80211DID_MKITEM(3) | 0x18000000)</div><div class='add'>+#define DIDmib_dot11smt_dot11PrivacyTable_dot11ExcludeUnencrypted \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(6) | \</div><div class='add'>+			P80211DID_MKITEM(4) | 0x18000000)</div><div class='add'>+#define DIDmib_dot11smt_dot11PrivacyTable_dot11WEPICVErrorCount \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(6) | \</div><div class='add'>+			P80211DID_MKITEM(5) | 0x10000000)</div><div class='add'>+#define DIDmib_dot11smt_dot11PrivacyTable_dot11WEPExcludedCount \</div><div class='add'>+			(P80211DID_MKSECTION(1) | \</div><div class='add'>+			P80211DID_MKGROUP(6) | \</div><div class='add'>+			P80211DID_MKITEM(6) | 0x10000000)</div><div class='add'>+#define DIDmib_cat_dot11mac \</div><div class='add'>+			P80211DID_MKSECTION(2)</div><div class='add'>+#define DIDmib_dot11mac_dot11OperationTable \</div><div class='add'>+			(P80211DID_MKSECTION(2) | \</div><div class='add'>+			P80211DID_MKGROUP(1))</div><div class='add'>+#define DIDmib_dot11mac_dot11OperationTable_dot11MACAddress \</div><div class='add'>+			(P80211DID_MKSECTION(2) | \</div><div class='add'>+			P80211DID_MKGROUP(1) | \</div><div class='add'>+			P80211DID_MKITEM(1) | 0x18000000)</div><div class='add'>+#define DIDmib_dot11mac_dot11OperationTable_dot11RTSThreshold \</div><div class='add'>+			(P80211DID_MKSECTION(2) | \</div><div class='add'>+			P80211DID_MKGROUP(1) | \</div><div class='add'>+			P80211DID_MKITEM(2) | 0x18000000)</div><div class='add'>+#define DIDmib_dot11mac_dot11OperationTable_dot11ShortRetryLimit \</div><div class='add'>+			(P80211DID_MKSECTION(2) | \</div><div class='add'>+			P80211DID_MKGROUP(1) | \</div><div class='add'>+			P80211DID_MKITEM(3) | 0x10000000)</div><div class='add'>+#define DIDmib_dot11mac_dot11OperationTable_dot11LongRetryLimit \</div><div class='add'>+			(P80211DID_MKSECTION(2) | \</div><div class='add'>+			P80211DID_MKGROUP(1) | \</div><div class='add'>+			P80211DID_MKITEM(4) | 0x10000000)</div><div class='add'>+#define DIDmib_dot11mac_dot11OperationTable_dot11FragmentationThreshold \</div><div class='add'>+			(P80211DID_MKSECTION(2) | \</div><div class='add'>+			P80211DID_MKGROUP(1) | \</div><div class='add'>+			P80211DID_MKITEM(5) | 0x18000000)</div><div class='add'>+#define DIDmib_dot11mac_dot11OperationTable_dot11MaxTransmitMSDULifetime \</div><div class='add'>+			(P80211DID_MKSECTION(2) | \</div><div class='add'>+			P80211DID_MKGROUP(1) | \</div><div class='add'>+			P80211DID_MKITEM(6) | 0x10000000)</div><div class='add'>+#define DIDmib_dot11mac_dot11OperationTable_dot11MaxReceiveLifetime \</div><div class='add'>+			(P80211DID_MKSECTION(2) | \</div><div class='add'>+			P80211DID_MKGROUP(1) | \</div><div class='add'>+			P80211DID_MKITEM(7) | 0x10000000)</div><div class='add'>+#define DIDmib_dot11mac_dot11OperationTable_dot11ManufacturerID \</div><div class='add'>+			(P80211DID_MKSECTION(2) | \</div><div class='add'>+			P80211DID_MKGROUP(1) | \</div><div class='add'>+			P80211DID_MKITEM(8) | 0x10000000)</div><div class='add'>+#define DIDmib_dot11mac_dot11OperationTable_dot11ProductID \</div><div class='add'>+			(P80211DID_MKSECTION(2) | \</div><div class='add'>+			P80211DID_MKGROUP(1) | \</div><div class='add'>+			P80211DID_MKITEM(9) | 0x10000000)</div><div class='add'>+#define DIDmib_dot11mac_dot11CountersTable \</div><div class='add'>+			(P80211DID_MKSECTION(2) | \</div><div class='add'>+			P80211DID_MKGROUP(2))</div><div class='add'>+#define DIDmib_dot11mac_dot11CountersTable_dot11TransmittedFragmentCount \</div><div class='add'>+			(P80211DID_MKSECTION(2) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(1) | 0x10000000)</div><div class='add'>+#define DIDmib_dot11mac_dot11CountersTable_dot11MulticastTransmittedFrameCount \</div><div class='add'>+			(P80211DID_MKSECTION(2) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(2) | 0x10000000)</div><div class='add'>+#define DIDmib_dot11mac_dot11CountersTable_dot11FailedCount \</div><div class='add'>+			(P80211DID_MKSECTION(2) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(3) | 0x10000000)</div><div class='add'>+#define DIDmib_dot11mac_dot11CountersTable_dot11RetryCount \</div><div class='add'>+			(P80211DID_MKSECTION(2) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(4) | 0x10000000)</div><div class='add'>+#define DIDmib_dot11mac_dot11CountersTable_dot11MultipleRetryCount \</div><div class='add'>+			(P80211DID_MKSECTION(2) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(5) | 0x10000000)</div><div class='add'>+#define DIDmib_dot11mac_dot11CountersTable_dot11FrameDuplicateCount \</div><div class='add'>+			(P80211DID_MKSECTION(2) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(6) | 0x10000000)</div><div class='add'>+#define DIDmib_dot11mac_dot11CountersTable_dot11RTSSuccessCount \</div><div class='add'>+			(P80211DID_MKSECTION(2) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(7) | 0x10000000)</div><div class='add'>+#define DIDmib_dot11mac_dot11CountersTable_dot11RTSFailureCount \</div><div class='add'>+			(P80211DID_MKSECTION(2) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(8) | 0x10000000)</div><div class='add'>+#define DIDmib_dot11mac_dot11CountersTable_dot11ACKFailureCount \</div><div class='add'>+			(P80211DID_MKSECTION(2) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(9) | 0x10000000)</div><div class='add'>+#define DIDmib_dot11mac_dot11CountersTable_dot11ReceivedFragmentCount \</div><div class='add'>+			(P80211DID_MKSECTION(2) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(10) | 0x10000000)</div><div class='add'>+#define DIDmib_dot11mac_dot11CountersTable_dot11MulticastReceivedFrameCount \</div><div class='add'>+			(P80211DID_MKSECTION(2) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(11) | 0x10000000)</div><div class='add'>+#define DIDmib_dot11mac_dot11CountersTable_dot11FCSErrorCount \</div><div class='add'>+			(P80211DID_MKSECTION(2) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(12) | 0x10000000)</div><div class='add'>+#define DIDmib_dot11mac_dot11CountersTable_dot11TransmittedFrameCount \</div><div class='add'>+			(P80211DID_MKSECTION(2) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(13) | 0x10000000)</div><div class='add'>+#define DIDmib_dot11mac_dot11CountersTable_dot11WEPUndecryptableCount \</div><div class='add'>+			(P80211DID_MKSECTION(2) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(14) | 0x10000000)</div><div class='add'>+#define DIDmib_dot11mac_dot11GroupAddressesTable \</div><div class='add'>+			(P80211DID_MKSECTION(2) | \</div><div class='add'>+			P80211DID_MKGROUP(3))</div><div class='add'>+#define DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address1 \</div><div class='add'>+			(P80211DID_MKSECTION(2) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(1) | 0x1c000000)</div><div class='add'>+#define DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address2 \</div><div class='add'>+			(P80211DID_MKSECTION(2) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(2) | 0x1c000000)</div><div class='add'>+#define DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address3 \</div><div class='add'>+			(P80211DID_MKSECTION(2) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(3) | 0x1c000000)</div><div class='add'>+#define DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address4 \</div><div class='add'>+			(P80211DID_MKSECTION(2) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(4) | 0x1c000000)</div><div class='add'>+#define DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address5 \</div><div class='add'>+			(P80211DID_MKSECTION(2) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(5) | 0x1c000000)</div><div class='add'>+#define DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address6 \</div><div class='add'>+			(P80211DID_MKSECTION(2) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(6) | 0x1c000000)</div><div class='add'>+#define DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address7 \</div><div class='add'>+			(P80211DID_MKSECTION(2) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(7) | 0x1c000000)</div><div class='add'>+#define DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address8 \</div><div class='add'>+			(P80211DID_MKSECTION(2) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(8) | 0x1c000000)</div><div class='add'>+#define DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address9 \</div><div class='add'>+			(P80211DID_MKSECTION(2) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(9) | 0x1c000000)</div><div class='add'>+#define DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address10 \</div><div class='add'>+			(P80211DID_MKSECTION(2) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(10) | 0x1c000000)</div><div class='add'>+#define DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address11 \</div><div class='add'>+			(P80211DID_MKSECTION(2) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(11) | 0x1c000000)</div><div class='add'>+#define DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address12 \</div><div class='add'>+			(P80211DID_MKSECTION(2) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(12) | 0x1c000000)</div><div class='add'>+#define DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address13 \</div><div class='add'>+			(P80211DID_MKSECTION(2) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(13) | 0x1c000000)</div><div class='add'>+#define DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address14 \</div><div class='add'>+			(P80211DID_MKSECTION(2) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(14) | 0x1c000000)</div><div class='add'>+#define DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address15 \</div><div class='add'>+			(P80211DID_MKSECTION(2) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(15) | 0x1c000000)</div><div class='add'>+#define DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address16 \</div><div class='add'>+			(P80211DID_MKSECTION(2) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(16) | 0x1c000000)</div><div class='add'>+#define DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address17 \</div><div class='add'>+			(P80211DID_MKSECTION(2) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(17) | 0x1c000000)</div><div class='add'>+#define DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address18 \</div><div class='add'>+			(P80211DID_MKSECTION(2) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(18) | 0x1c000000)</div><div class='add'>+#define DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address19 \</div><div class='add'>+			(P80211DID_MKSECTION(2) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(19) | 0x1c000000)</div><div class='add'>+#define DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address20 \</div><div class='add'>+			(P80211DID_MKSECTION(2) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(20) | 0x1c000000)</div><div class='add'>+#define DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address21 \</div><div class='add'>+			(P80211DID_MKSECTION(2) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(21) | 0x1c000000)</div><div class='add'>+#define DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address22 \</div><div class='add'>+			(P80211DID_MKSECTION(2) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(22) | 0x1c000000)</div><div class='add'>+#define DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address23 \</div><div class='add'>+			(P80211DID_MKSECTION(2) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(23) | 0x1c000000)</div><div class='add'>+#define DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address24 \</div><div class='add'>+			(P80211DID_MKSECTION(2) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(24) | 0x1c000000)</div><div class='add'>+#define DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address25 \</div><div class='add'>+			(P80211DID_MKSECTION(2) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(25) | 0x1c000000)</div><div class='add'>+#define DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address26 \</div><div class='add'>+			(P80211DID_MKSECTION(2) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(26) | 0x1c000000)</div><div class='add'>+#define DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address27 \</div><div class='add'>+			(P80211DID_MKSECTION(2) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(27) | 0x1c000000)</div><div class='add'>+#define DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address28 \</div><div class='add'>+			(P80211DID_MKSECTION(2) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(28) | 0x1c000000)</div><div class='add'>+#define DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address29 \</div><div class='add'>+			(P80211DID_MKSECTION(2) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(29) | 0x1c000000)</div><div class='add'>+#define DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address30 \</div><div class='add'>+			(P80211DID_MKSECTION(2) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(30) | 0x1c000000)</div><div class='add'>+#define DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address31 \</div><div class='add'>+			(P80211DID_MKSECTION(2) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(31) | 0x1c000000)</div><div class='add'>+#define DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address32 \</div><div class='add'>+			(P80211DID_MKSECTION(2) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(32) | 0x1c000000)</div><div class='add'>+#define DIDmib_cat_dot11phy \</div><div class='add'>+			P80211DID_MKSECTION(3)</div><div class='add'>+#define DIDmib_dot11phy_dot11PhyOperationTable \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(1))</div><div class='add'>+#define DIDmib_dot11phy_dot11PhyOperationTable_dot11PHYType \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(1) | \</div><div class='add'>+			P80211DID_MKITEM(1) | 0x10000000)</div><div class='add'>+#define DIDmib_dot11phy_dot11PhyOperationTable_dot11CurrentRegDomain \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(1) | \</div><div class='add'>+			P80211DID_MKITEM(2) | 0x18000000)</div><div class='add'>+#define DIDmib_dot11phy_dot11PhyOperationTable_dot11TempType \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(1) | \</div><div class='add'>+			P80211DID_MKITEM(3) | 0x10000000)</div><div class='add'>+#define DIDmib_dot11phy_dot11PhyOperationTable_dot11ChannelAgilityPresent \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(1) | \</div><div class='add'>+			P80211DID_MKITEM(4) | 0x10000000)</div><div class='add'>+#define DIDmib_dot11phy_dot11PhyOperationTable_dot11ChannelAgilityEnabled \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(1) | \</div><div class='add'>+			P80211DID_MKITEM(5) | 0x10000000)</div><div class='add'>+#define DIDmib_dot11phy_dot11PhyOperationTable_dot11ShortPreambleEnabled \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(1) | \</div><div class='add'>+			P80211DID_MKITEM(6) | 0x10000000)</div><div class='add'>+#define DIDmib_dot11phy_dot11PhyAntennaTable \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(2))</div><div class='add'>+#define DIDmib_dot11phy_dot11PhyAntennaTable_dot11CurrentTxAntenna \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(1) | 0x18000000)</div><div class='add'>+#define DIDmib_dot11phy_dot11PhyAntennaTable_dot11DiversitySupport \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(2) | 0x10000000)</div><div class='add'>+#define DIDmib_dot11phy_dot11PhyAntennaTable_dot11CurrentRxAntenna \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(3) | 0x18000000)</div><div class='add'>+#define DIDmib_dot11phy_dot11PhyTxPowerTable \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(3))</div><div class='add'>+#define DIDmib_dot11phy_dot11PhyTxPowerTable_dot11NumberSupportedPowerLevels \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(1) | 0x10000000)</div><div class='add'>+#define DIDmib_dot11phy_dot11PhyTxPowerTable_dot11TxPowerLevel1 \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(2) | 0x10000000)</div><div class='add'>+#define DIDmib_dot11phy_dot11PhyTxPowerTable_dot11TxPowerLevel2 \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(3) | 0x10000000)</div><div class='add'>+#define DIDmib_dot11phy_dot11PhyTxPowerTable_dot11TxPowerLevel3 \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(4) | 0x10000000)</div><div class='add'>+#define DIDmib_dot11phy_dot11PhyTxPowerTable_dot11TxPowerLevel4 \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(5) | 0x10000000)</div><div class='add'>+#define DIDmib_dot11phy_dot11PhyTxPowerTable_dot11TxPowerLevel5 \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(6) | 0x10000000)</div><div class='add'>+#define DIDmib_dot11phy_dot11PhyTxPowerTable_dot11TxPowerLevel6 \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(7) | 0x10000000)</div><div class='add'>+#define DIDmib_dot11phy_dot11PhyTxPowerTable_dot11TxPowerLevel7 \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(8) | 0x10000000)</div><div class='add'>+#define DIDmib_dot11phy_dot11PhyTxPowerTable_dot11TxPowerLevel8 \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(9) | 0x10000000)</div><div class='add'>+#define DIDmib_dot11phy_dot11PhyTxPowerTable_dot11CurrentTxPowerLevel \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(10) | 0x18000000)</div><div class='add'>+#define DIDmib_dot11phy_dot11PhyFHSSTable \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(4))</div><div class='add'>+#define DIDmib_dot11phy_dot11PhyFHSSTable_dot11HopTime \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(4) | \</div><div class='add'>+			P80211DID_MKITEM(1) | 0x10000000)</div><div class='add'>+#define DIDmib_dot11phy_dot11PhyFHSSTable_dot11CurrentChannelNumber \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(4) | \</div><div class='add'>+			P80211DID_MKITEM(2) | 0x18000000)</div><div class='add'>+#define DIDmib_dot11phy_dot11PhyFHSSTable_dot11MaxDwellTime \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(4) | \</div><div class='add'>+			P80211DID_MKITEM(3) | 0x10000000)</div><div class='add'>+#define DIDmib_dot11phy_dot11PhyFHSSTable_dot11CurrentDwellTime \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(4) | \</div><div class='add'>+			P80211DID_MKITEM(4) | 0x18000000)</div><div class='add'>+#define DIDmib_dot11phy_dot11PhyFHSSTable_dot11CurrentSet \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(4) | \</div><div class='add'>+			P80211DID_MKITEM(5) | 0x18000000)</div><div class='add'>+#define DIDmib_dot11phy_dot11PhyFHSSTable_dot11CurrentPattern \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(4) | \</div><div class='add'>+			P80211DID_MKITEM(6) | 0x18000000)</div><div class='add'>+#define DIDmib_dot11phy_dot11PhyFHSSTable_dot11CurrentIndex \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(4) | \</div><div class='add'>+			P80211DID_MKITEM(7) | 0x18000000)</div><div class='add'>+#define DIDmib_dot11phy_dot11PhyDSSSTable \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(5))</div><div class='add'>+#define DIDmib_dot11phy_dot11PhyDSSSTable_dot11CurrentChannel \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(1) | 0x10000000)</div><div class='add'>+#define DIDmib_dot11phy_dot11PhyDSSSTable_dot11CCAModeSupported \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(2) | 0x10000000)</div><div class='add'>+#define DIDmib_dot11phy_dot11PhyDSSSTable_dot11CurrentCCAMode \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(3) | 0x10000000)</div><div class='add'>+#define DIDmib_dot11phy_dot11PhyDSSSTable_dot11EDThreshold \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(4) | 0x18000000)</div><div class='add'>+#define DIDmib_dot11phy_dot11PhyDSSSTable_dot11ShortPreambleOptionImplemented \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(5) | 0x10000000)</div><div class='add'>+#define DIDmib_dot11phy_dot11PhyDSSSTable_dot11PBCCOptionImplemented \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(6) | 0x10000000)</div><div class='add'>+#define DIDmib_dot11phy_dot11PhyIRTable \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(6))</div><div class='add'>+#define DIDmib_dot11phy_dot11PhyIRTable_dot11CCAWatchdogTimerMax \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(6) | \</div><div class='add'>+			P80211DID_MKITEM(1) | 0x18000000)</div><div class='add'>+#define DIDmib_dot11phy_dot11PhyIRTable_dot11CCAWatchdogCountMax \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(6) | \</div><div class='add'>+			P80211DID_MKITEM(2) | 0x18000000)</div><div class='add'>+#define DIDmib_dot11phy_dot11PhyIRTable_dot11CCAWatchdogTimerMin \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(6) | \</div><div class='add'>+			P80211DID_MKITEM(3) | 0x18000000)</div><div class='add'>+#define DIDmib_dot11phy_dot11PhyIRTable_dot11CCAWatchdogCountMin \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(6) | \</div><div class='add'>+			P80211DID_MKITEM(4) | 0x18000000)</div><div class='add'>+#define DIDmib_dot11phy_dot11RegDomainsSupportedTable \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(7))</div><div class='add'>+#define DIDmib_dot11phy_dot11RegDomainsSupportedTable_dot11RegDomainsSupportIndex \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(7) | \</div><div class='add'>+			P80211DID_MKITEM(1) | 0x1c000000)</div><div class='add'>+#define DIDmib_dot11phy_dot11RegDomainsSupportedTable_dot11RegDomainsSupportValue \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(7) | \</div><div class='add'>+			P80211DID_MKITEM(2) | 0x14000000)</div><div class='add'>+#define DIDmib_dot11phy_dot11AntennasListTable \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(8))</div><div class='add'>+#define DIDmib_dot11phy_dot11AntennasListTable_dot11AntennaListIndex \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(8) | \</div><div class='add'>+			P80211DID_MKITEM(1) | 0x1c000000)</div><div class='add'>+#define DIDmib_dot11phy_dot11AntennasListTable_dot11SupportedTxAntenna \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(8) | \</div><div class='add'>+			P80211DID_MKITEM(2) | 0x1c000000)</div><div class='add'>+#define DIDmib_dot11phy_dot11AntennasListTable_dot11SupportedRxAntenna \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(8) | \</div><div class='add'>+			P80211DID_MKITEM(3) | 0x1c000000)</div><div class='add'>+#define DIDmib_dot11phy_dot11AntennasListTable_dot11DiversitySelectionRx \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(8) | \</div><div class='add'>+			P80211DID_MKITEM(4) | 0x1c000000)</div><div class='add'>+#define DIDmib_dot11phy_dot11SupportedDataRatesTxTable \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(9))</div><div class='add'>+#define DIDmib_dot11phy_dot11SupportedDataRatesTxTable_dot11SupportedDataRatesTxIndex \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(9) | \</div><div class='add'>+			P80211DID_MKITEM(1) | 0x1c000000)</div><div class='add'>+#define DIDmib_dot11phy_dot11SupportedDataRatesTxTable_dot11SupportedDataRatesTxValue \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(9) | \</div><div class='add'>+			P80211DID_MKITEM(2) | 0x14000000)</div><div class='add'>+#define DIDmib_dot11phy_dot11SupportedDataRatesRxTable \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(10))</div><div class='add'>+#define DIDmib_dot11phy_dot11SupportedDataRatesRxTable_dot11SupportedDataRatesRxIndex \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(10) | \</div><div class='add'>+			P80211DID_MKITEM(1) | 0x1c000000)</div><div class='add'>+#define DIDmib_dot11phy_dot11SupportedDataRatesRxTable_dot11SupportedDataRatesRxValue \</div><div class='add'>+			(P80211DID_MKSECTION(3) | \</div><div class='add'>+			P80211DID_MKGROUP(10) | \</div><div class='add'>+			P80211DID_MKITEM(2) | 0x14000000)</div><div class='add'>+#define DIDmib_cat_lnx \</div><div class='add'>+			P80211DID_MKSECTION(4)</div><div class='add'>+#define DIDmib_lnx_lnxConfigTable \</div><div class='add'>+			(P80211DID_MKSECTION(4) | \</div><div class='add'>+			P80211DID_MKGROUP(1))</div><div class='add'>+#define DIDmib_lnx_lnxConfigTable_lnxRSNAIE \</div><div class='add'>+			(P80211DID_MKSECTION(4) | \</div><div class='add'>+			P80211DID_MKGROUP(1) | \</div><div class='add'>+			P80211DID_MKITEM(1) | 0x18000000)</div><div class='add'>+#define DIDmib_cat_p2 \</div><div class='add'>+			P80211DID_MKSECTION(5)</div><div class='add'>+#define DIDmib_p2_p2Table \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(1))</div><div class='add'>+#define DIDmib_p2_p2Table_p2MMTx \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(1) | \</div><div class='add'>+			P80211DID_MKITEM(1) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Table_p2EarlyBeacon \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(1) | \</div><div class='add'>+			P80211DID_MKITEM(2) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Table_p2ReceivedFrameStatistics \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(1) | \</div><div class='add'>+			P80211DID_MKITEM(3) | 0x10000000)</div><div class='add'>+#define DIDmib_p2_p2Table_p2CommunicationTallies \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(1) | \</div><div class='add'>+			P80211DID_MKITEM(4) | 0x10000000)</div><div class='add'>+#define DIDmib_p2_p2Table_p2Authenticated \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(1) | \</div><div class='add'>+			P80211DID_MKITEM(5) | 0x10000000)</div><div class='add'>+#define DIDmib_p2_p2Table_p2Associated \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(1) | \</div><div class='add'>+			P80211DID_MKITEM(6) | 0x10000000)</div><div class='add'>+#define DIDmib_p2_p2Table_p2PowerSaveUserCount \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(1) | \</div><div class='add'>+			P80211DID_MKITEM(7) | 0x10000000)</div><div class='add'>+#define DIDmib_p2_p2Table_p2Comment \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(1) | \</div><div class='add'>+			P80211DID_MKITEM(8) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Table_p2AccessMode \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(1) | \</div><div class='add'>+			P80211DID_MKITEM(9) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Table_p2AccessAllow \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(1) | \</div><div class='add'>+			P80211DID_MKITEM(10) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Table_p2AccessDeny \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(1) | \</div><div class='add'>+			P80211DID_MKITEM(11) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Table_p2ChannelInfoResults \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(1) | \</div><div class='add'>+			P80211DID_MKITEM(12) | 0x10000000)</div><div class='add'>+#define DIDmib_p2_p2Static \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(2))</div><div class='add'>+#define DIDmib_p2_p2Static_p2CnfPortType \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(1) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Static_p2CnfOwnMACAddress \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(2) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Static_p2CnfDesiredSSID \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(3) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Static_p2CnfOwnChannel \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(4) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Static_p2CnfOwnSSID \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(5) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Static_p2CnfOwnATIMWindow \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(6) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Static_p2CnfSystemScale \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(7) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Static_p2CnfMaxDataLength \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(8) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Static_p2CnfWDSAddress \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(9) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Static_p2CnfPMEnabled \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(10) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Static_p2CnfPMEPS \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(11) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Static_p2CnfMulticastReceive \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(12) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Static_p2CnfMaxSleepDuration \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(13) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Static_p2CnfPMHoldoverDuration \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(14) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Static_p2CnfOwnName \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(15) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Static_p2CnfOwnDTIMPeriod \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(16) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Static_p2CnfWDSAddress1 \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(17) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Static_p2CnfWDSAddress2 \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(18) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Static_p2CnfWDSAddress3 \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(19) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Static_p2CnfWDSAddress4 \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(20) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Static_p2CnfWDSAddress5 \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(21) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Static_p2CnfWDSAddress6 \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(22) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Static_p2CnfMulticastPMBuffering \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(23) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Static_p2CnfWEPDefaultKeyID \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(24) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Static_p2CnfWEPDefaultKey0 \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(25) | 0x08000000)</div><div class='add'>+#define DIDmib_p2_p2Static_p2CnfWEPDefaultKey1 \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(26) | 0x08000000)</div><div class='add'>+#define DIDmib_p2_p2Static_p2CnfWEPDefaultKey2 \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(27) | 0x08000000)</div><div class='add'>+#define DIDmib_p2_p2Static_p2CnfWEPDefaultKey3 \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(28) | 0x08000000)</div><div class='add'>+#define DIDmib_p2_p2Static_p2CnfWEPFlags \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(29) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Static_p2CnfAuthentication \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(30) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Static_p2CnfMaxAssociatedStations \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(31) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Static_p2CnfTxControl \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(32) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Static_p2CnfRoamingMode \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(33) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Static_p2CnfHostAuthentication \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(34) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Static_p2CnfRcvCrcError \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(35) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Static_p2CnfAltRetryCount \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(36) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Static_p2CnfBeaconInterval \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(37) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Static_p2CnfMediumOccupancyLimit \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(38) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Static_p2CnfCFPPeriod \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(39) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Static_p2CnfCFPMaxDuration \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(40) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Static_p2CnfCFPFlags \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(41) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Static_p2CnfSTAPCFInfo \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(42) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Static_p2CnfPriorityQUsage \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(43) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Static_p2CnfTIMCtrl \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(44) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Static_p2CnfThirty2Tally \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(45) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Static_p2CnfEnhSecurity \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(46) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Static_p2CnfShortPreamble \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(47) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Static_p2CnfExcludeLongPreamble \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(48) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Static_p2CnfAuthenticationRspTO \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(49) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Static_p2CnfBasicRates \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(50) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Static_p2CnfSupportedRates \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(2) | \</div><div class='add'>+			P80211DID_MKITEM(51) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Dynamic \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(3))</div><div class='add'>+#define DIDmib_p2_p2Dynamic_p2CreateIBSS \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(1) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Dynamic_p2FragmentationThreshold \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(2) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Dynamic_p2RTSThreshold \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(3) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Dynamic_p2TxRateControl \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(4) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Dynamic_p2PromiscuousMode \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(5) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Dynamic_p2FragmentationThreshold0 \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(6) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Dynamic_p2FragmentationThreshold1 \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(7) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Dynamic_p2FragmentationThreshold2 \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(8) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Dynamic_p2FragmentationThreshold3 \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(9) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Dynamic_p2FragmentationThreshold4 \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(10) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Dynamic_p2FragmentationThreshold5 \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(11) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Dynamic_p2FragmentationThreshold6 \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(12) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Dynamic_p2RTSThreshold0 \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(13) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Dynamic_p2RTSThreshold1 \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(14) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Dynamic_p2RTSThreshold2 \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(15) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Dynamic_p2RTSThreshold3 \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(16) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Dynamic_p2RTSThreshold4 \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(17) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Dynamic_p2RTSThreshold5 \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(18) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Dynamic_p2RTSThreshold6 \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(19) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Dynamic_p2TxRateControl0 \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(20) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Dynamic_p2TxRateControl1 \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(21) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Dynamic_p2TxRateControl2 \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(22) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Dynamic_p2TxRateControl3 \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(23) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Dynamic_p2TxRateControl4 \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(24) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Dynamic_p2TxRateControl5 \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(25) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Dynamic_p2TxRateControl6 \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(3) | \</div><div class='add'>+			P80211DID_MKITEM(26) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2Behavior \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(4))</div><div class='add'>+#define DIDmib_p2_p2Behavior_p2TickTime \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(4) | \</div><div class='add'>+			P80211DID_MKITEM(1) | 0x18000000)</div><div class='add'>+#define DIDmib_p2_p2NIC \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(5))</div><div class='add'>+#define DIDmib_p2_p2NIC_p2MaxLoadTime \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(1) | 0x10000000)</div><div class='add'>+#define DIDmib_p2_p2NIC_p2DLBufferPage \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(2) | 0x10000000)</div><div class='add'>+#define DIDmib_p2_p2NIC_p2DLBufferOffset \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(3) | 0x10000000)</div><div class='add'>+#define DIDmib_p2_p2NIC_p2DLBufferLength \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(4) | 0x10000000)</div><div class='add'>+#define DIDmib_p2_p2NIC_p2PRIIdentity \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(5) | 0x10000000)</div><div class='add'>+#define DIDmib_p2_p2NIC_p2PRISupRange \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(6) | 0x10000000)</div><div class='add'>+#define DIDmib_p2_p2NIC_p2CFIActRanges \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(7) | 0x10000000)</div><div class='add'>+#define DIDmib_p2_p2NIC_p2NICSerialNumber \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(8) | 0x10000000)</div><div class='add'>+#define DIDmib_p2_p2NIC_p2NICIdentity \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(9) | 0x10000000)</div><div class='add'>+#define DIDmib_p2_p2NIC_p2MFISupRange \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(10) | 0x10000000)</div><div class='add'>+#define DIDmib_p2_p2NIC_p2CFISupRange \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(11) | 0x10000000)</div><div class='add'>+#define DIDmib_p2_p2NIC_p2ChannelList \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(12) | 0x10000000)</div><div class='add'>+#define DIDmib_p2_p2NIC_p2RegulatoryDomains \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(13) | 0x10000000)</div><div class='add'>+#define DIDmib_p2_p2NIC_p2TempType \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(14) | 0x10000000)</div><div class='add'>+#define DIDmib_p2_p2NIC_p2STAIdentity \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(15) | 0x10000000)</div><div class='add'>+#define DIDmib_p2_p2NIC_p2STASupRange \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(16) | 0x10000000)</div><div class='add'>+#define DIDmib_p2_p2NIC_p2MFIActRanges \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(17) | 0x10000000)</div><div class='add'>+#define DIDmib_p2_p2NIC_p2STACFIActRanges \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(18) | 0x10000000)</div><div class='add'>+#define DIDmib_p2_p2NIC_p2BuildSequence \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(19) | 0x10000000)</div><div class='add'>+#define DIDmib_p2_p2NIC_p2PrimaryFWID \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(20) | 0x10000000)</div><div class='add'>+#define DIDmib_p2_p2NIC_p2SecondaryFWID \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(21) | 0x10000000)</div><div class='add'>+#define DIDmib_p2_p2NIC_p2TertiaryFWID \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(5) | \</div><div class='add'>+			P80211DID_MKITEM(22) | 0x10000000)</div><div class='add'>+#define DIDmib_p2_p2MAC \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(6))</div><div class='add'>+#define DIDmib_p2_p2MAC_p2PortStatus \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(6) | \</div><div class='add'>+			P80211DID_MKITEM(1) | 0x10000000)</div><div class='add'>+#define DIDmib_p2_p2MAC_p2CurrentSSID \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(6) | \</div><div class='add'>+			P80211DID_MKITEM(2) | 0x10000000)</div><div class='add'>+#define DIDmib_p2_p2MAC_p2CurrentBSSID \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(6) | \</div><div class='add'>+			P80211DID_MKITEM(3) | 0x10000000)</div><div class='add'>+#define DIDmib_p2_p2MAC_p2CommsQuality \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(6) | \</div><div class='add'>+			P80211DID_MKITEM(4) | 0x10000000)</div><div class='add'>+#define DIDmib_p2_p2MAC_p2CommsQualityCQ \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(6) | \</div><div class='add'>+			P80211DID_MKITEM(5) | 0x10000000)</div><div class='add'>+#define DIDmib_p2_p2MAC_p2CommsQualityASL \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(6) | \</div><div class='add'>+			P80211DID_MKITEM(6) | 0x10000000)</div><div class='add'>+#define DIDmib_p2_p2MAC_p2CommsQualityANL \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(6) | \</div><div class='add'>+			P80211DID_MKITEM(7) | 0x10000000)</div><div class='add'>+#define DIDmib_p2_p2MAC_p2dbmCommsQuality \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(6) | \</div><div class='add'>+			P80211DID_MKITEM(8) | 0x10000000)</div><div class='add'>+#define DIDmib_p2_p2MAC_p2dbmCommsQualityCQ \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(6) | \</div><div class='add'>+			P80211DID_MKITEM(9) | 0x10000000)</div><div class='add'>+#define DIDmib_p2_p2MAC_p2dbmCommsQualityASL \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(6) | \</div><div class='add'>+			P80211DID_MKITEM(10) | 0x10000000)</div><div class='add'>+#define DIDmib_p2_p2MAC_p2dbmCommsQualityANL \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(6) | \</div><div class='add'>+			P80211DID_MKITEM(11) | 0x10000000)</div><div class='add'>+#define DIDmib_p2_p2MAC_p2CurrentTxRate \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(6) | \</div><div class='add'>+			P80211DID_MKITEM(12) | 0x10000000)</div><div class='add'>+#define DIDmib_p2_p2MAC_p2CurrentBeaconInterval \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(6) | \</div><div class='add'>+			P80211DID_MKITEM(13) | 0x10000000)</div><div class='add'>+#define DIDmib_p2_p2MAC_p2StaCurrentScaleThresholds \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(6) | \</div><div class='add'>+			P80211DID_MKITEM(14) | 0x10000000)</div><div class='add'>+#define DIDmib_p2_p2MAC_p2APCurrentScaleThresholds \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(6) | \</div><div class='add'>+			P80211DID_MKITEM(15) | 0x10000000)</div><div class='add'>+#define DIDmib_p2_p2MAC_p2ProtocolRspTime \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(6) | \</div><div class='add'>+			P80211DID_MKITEM(16) | 0x10000000)</div><div class='add'>+#define DIDmib_p2_p2MAC_p2ShortRetryLimit \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(6) | \</div><div class='add'>+			P80211DID_MKITEM(17) | 0x10000000)</div><div class='add'>+#define DIDmib_p2_p2MAC_p2LongRetryLimit \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(6) | \</div><div class='add'>+			P80211DID_MKITEM(18) | 0x10000000)</div><div class='add'>+#define DIDmib_p2_p2MAC_p2MaxTransmitLifetime \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(6) | \</div><div class='add'>+			P80211DID_MKITEM(19) | 0x10000000)</div><div class='add'>+#define DIDmib_p2_p2MAC_p2MaxReceiveLifetime \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(6) | \</div><div class='add'>+			P80211DID_MKITEM(20) | 0x10000000)</div><div class='add'>+#define DIDmib_p2_p2MAC_p2CFPollable \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(6) | \</div><div class='add'>+			P80211DID_MKITEM(21) | 0x10000000)</div><div class='add'>+#define DIDmib_p2_p2MAC_p2AuthenticationAlgorithms \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(6) | \</div><div class='add'>+			P80211DID_MKITEM(22) | 0x10000000)</div><div class='add'>+#define DIDmib_p2_p2MAC_p2PrivacyOptionImplemented \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(6) | \</div><div class='add'>+			P80211DID_MKITEM(23) | 0x10000000)</div><div class='add'>+#define DIDmib_p2_p2MAC_p2CurrentTxRate1 \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(6) | \</div><div class='add'>+			P80211DID_MKITEM(24) | 0x10000000)</div><div class='add'>+#define DIDmib_p2_p2MAC_p2CurrentTxRate2 \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(6) | \</div><div class='add'>+			P80211DID_MKITEM(25) | 0x10000000)</div><div class='add'>+#define DIDmib_p2_p2MAC_p2CurrentTxRate3 \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(6) | \</div><div class='add'>+			P80211DID_MKITEM(26) | 0x10000000)</div><div class='add'>+#define DIDmib_p2_p2MAC_p2CurrentTxRate4 \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(6) | \</div><div class='add'>+			P80211DID_MKITEM(27) | 0x10000000)</div><div class='add'>+#define DIDmib_p2_p2MAC_p2CurrentTxRate5 \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(6) | \</div><div class='add'>+			P80211DID_MKITEM(28) | 0x10000000)</div><div class='add'>+#define DIDmib_p2_p2MAC_p2CurrentTxRate6 \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(6) | \</div><div class='add'>+			P80211DID_MKITEM(29) | 0x10000000)</div><div class='add'>+#define DIDmib_p2_p2MAC_p2OwnMACAddress \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(6) | \</div><div class='add'>+			P80211DID_MKITEM(30) | 0x10000000)</div><div class='add'>+#define DIDmib_p2_p2Modem \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(7))</div><div class='add'>+#define DIDmib_p2_p2Modem_p2PHYType \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(7) | \</div><div class='add'>+			P80211DID_MKITEM(1) | 0x10000000)</div><div class='add'>+#define DIDmib_p2_p2Modem_p2CurrentChannel \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(7) | \</div><div class='add'>+			P80211DID_MKITEM(2) | 0x10000000)</div><div class='add'>+#define DIDmib_p2_p2Modem_p2CurrentPowerState \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(7) | \</div><div class='add'>+			P80211DID_MKITEM(3) | 0x10000000)</div><div class='add'>+#define DIDmib_p2_p2Modem_p2CCAMode \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(7) | \</div><div class='add'>+			P80211DID_MKITEM(4) | 0x10000000)</div><div class='add'>+#define DIDmib_p2_p2Modem_p2SupportedDataRates \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(7) | \</div><div class='add'>+			P80211DID_MKITEM(5) | 0x10000000)</div><div class='add'>+#define DIDmib_p2_p2Modem_p2TxPowerMax \</div><div class='add'>+			(P80211DID_MKSECTION(5) | \</div><div class='add'>+			P80211DID_MKGROUP(7) | \</div><div class='add'>+			P80211DID_MKITEM(6) | 0x18000000)</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/staging/wlan-ng/p80211metamib.h b/drivers/staging/wlan-ng/p80211metamib.h<br/>new file mode 100644<br/>index 000000000000..19867fd314eb<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/wlan-ng/p80211metamib.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/wlan-ng/p80211metamib.h</a></div><div class='hunk'>@@ -0,0 +1,105 @@</div><div class='add'>+/* p80211metamib.h</div><div class='add'>+*</div><div class='add'>+* Macros, const, types, and funcs for p80211 mib metadata</div><div class='add'>+*</div><div class='add'>+* Copyright (C) 1999 AbsoluteValue Systems, Inc.  All Rights Reserved.</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* linux-wlan</div><div class='add'>+*</div><div class='add'>+*   The contents of this file are subject to the Mozilla Public</div><div class='add'>+*   License Version 1.1 (the "License"); you may not use this file</div><div class='add'>+*   except in compliance with the License. You may obtain a copy of</div><div class='add'>+*   the License at http://www.mozilla.org/MPL/</div><div class='add'>+*</div><div class='add'>+*   Software distributed under the License is distributed on an "AS</div><div class='add'>+*   IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or</div><div class='add'>+*   implied. See the License for the specific language governing</div><div class='add'>+*   rights and limitations under the License.</div><div class='add'>+*</div><div class='add'>+*   Alternatively, the contents of this file may be used under the</div><div class='add'>+*   terms of the GNU Public License version 2 (the "GPL"), in which</div><div class='add'>+*   case the provisions of the GPL are applicable instead of the</div><div class='add'>+*   above.  If you wish to allow the use of your version of this file</div><div class='add'>+*   only under the terms of the GPL and not to allow others to use</div><div class='add'>+*   your version of this file under the MPL, indicate your decision</div><div class='add'>+*   by deleting the provisions above and replace them with the notice</div><div class='add'>+*   and other provisions required by the GPL.  If you do not delete</div><div class='add'>+*   the provisions above, a recipient may use your version of this</div><div class='add'>+*   file under either the MPL or the GPL.</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* Inquiries regarding the linux-wlan Open Source project can be</div><div class='add'>+* made directly to:</div><div class='add'>+*</div><div class='add'>+* AbsoluteValue Systems Inc.</div><div class='add'>+* info@linux-wlan.com</div><div class='add'>+* http://www.linux-wlan.com</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* Portions of the development of this software were funded by</div><div class='add'>+* Intersil Corporation as part of PRISM(R) chipset product development.</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* This file declares some of the constants and types used in various</div><div class='add'>+* parts of the linux-wlan system.</div><div class='add'>+*</div><div class='add'>+* Notes:</div><div class='add'>+*   - Constant values are always in HOST byte order.</div><div class='add'>+*</div><div class='add'>+* All functions and statics declared here are implemented in p80211types.c</div><div class='add'>+*   --------------------------------------------------------------------</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#ifndef _P80211METAMIB_H</div><div class='add'>+#define _P80211METAMIB_H</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* System Includes */</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Project Includes */</div><div class='add'>+</div><div class='add'>+#ifndef _WLAN_COMPAT_H</div><div class='add'>+#include "wlan_compat.h"</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Constants */</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------*/</div><div class='add'>+/* */</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Macros */</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------*/</div><div class='add'>+/* */</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Types */</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------*/</div><div class='add'>+/* */</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Extern Declarations */</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------*/</div><div class='add'>+/* The following is the external declaration for the mib */</div><div class='add'>+/* category metadata list */</div><div class='add'>+</div><div class='add'>+extern catlistitem_t mib_catlist[];</div><div class='add'>+extern UINT32 mib_catlist_size;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Function Declarations */</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------*/</div><div class='add'>+/* */</div><div class='add'>+</div><div class='add'>+#endif /* _P80211METAMIB_H */</div><div class='head'>diff --git a/drivers/staging/wlan-ng/p80211metamsg.h b/drivers/staging/wlan-ng/p80211metamsg.h<br/>new file mode 100644<br/>index 000000000000..4d6dfcc79b86<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/wlan-ng/p80211metamsg.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/wlan-ng/p80211metamsg.h</a></div><div class='hunk'>@@ -0,0 +1,105 @@</div><div class='add'>+/* p80211metamsg.h</div><div class='add'>+*</div><div class='add'>+* Macros, const, types, and funcs for p80211 msg metadata</div><div class='add'>+*</div><div class='add'>+* Copyright (C) 1999 AbsoluteValue Systems, Inc.  All Rights Reserved.</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* linux-wlan</div><div class='add'>+*</div><div class='add'>+*   The contents of this file are subject to the Mozilla Public</div><div class='add'>+*   License Version 1.1 (the "License"); you may not use this file</div><div class='add'>+*   except in compliance with the License. You may obtain a copy of</div><div class='add'>+*   the License at http://www.mozilla.org/MPL/</div><div class='add'>+*</div><div class='add'>+*   Software distributed under the License is distributed on an "AS</div><div class='add'>+*   IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or</div><div class='add'>+*   implied. See the License for the specific language governing</div><div class='add'>+*   rights and limitations under the License.</div><div class='add'>+*</div><div class='add'>+*   Alternatively, the contents of this file may be used under the</div><div class='add'>+*   terms of the GNU Public License version 2 (the "GPL"), in which</div><div class='add'>+*   case the provisions of the GPL are applicable instead of the</div><div class='add'>+*   above.  If you wish to allow the use of your version of this file</div><div class='add'>+*   only under the terms of the GPL and not to allow others to use</div><div class='add'>+*   your version of this file under the MPL, indicate your decision</div><div class='add'>+*   by deleting the provisions above and replace them with the notice</div><div class='add'>+*   and other provisions required by the GPL.  If you do not delete</div><div class='add'>+*   the provisions above, a recipient may use your version of this</div><div class='add'>+*   file under either the MPL or the GPL.</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* Inquiries regarding the linux-wlan Open Source project can be</div><div class='add'>+* made directly to:</div><div class='add'>+*</div><div class='add'>+* AbsoluteValue Systems Inc.</div><div class='add'>+* info@linux-wlan.com</div><div class='add'>+* http://www.linux-wlan.com</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* Portions of the development of this software were funded by</div><div class='add'>+* Intersil Corporation as part of PRISM(R) chipset product development.</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* This file declares some of the constants and types used in various</div><div class='add'>+* parts of the linux-wlan system.</div><div class='add'>+*</div><div class='add'>+* Notes:</div><div class='add'>+*   - Constant values are always in HOST byte order.</div><div class='add'>+*</div><div class='add'>+* All functions and statics declared here are implemented in p80211types.c</div><div class='add'>+*   --------------------------------------------------------------------</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#ifndef _P80211METAMSG_H</div><div class='add'>+#define _P80211METAMSG_H</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* System Includes */</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Project Includes */</div><div class='add'>+</div><div class='add'>+#ifndef _WLAN_COMPAT_H</div><div class='add'>+#include "wlan_compat.h"</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Constants */</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------*/</div><div class='add'>+/* */</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Macros */</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------*/</div><div class='add'>+/* */</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Types */</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------*/</div><div class='add'>+/* */</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Extern Declarations */</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------*/</div><div class='add'>+/* The following is the external declaration for the message */</div><div class='add'>+/* category metadata list */</div><div class='add'>+</div><div class='add'>+extern catlistitem_t msg_catlist[];</div><div class='add'>+extern UINT32 msg_catlist_size;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Function Declarations */</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------*/</div><div class='add'>+/* */</div><div class='add'>+</div><div class='add'>+#endif /* _P80211METAMSG_H */</div><div class='head'>diff --git a/drivers/staging/wlan-ng/p80211metastruct.h b/drivers/staging/wlan-ng/p80211metastruct.h<br/>new file mode 100644<br/>index 000000000000..715f4b2adc65<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/wlan-ng/p80211metastruct.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/wlan-ng/p80211metastruct.h</a></div><div class='hunk'>@@ -0,0 +1,644 @@</div><div class='add'>+/* This file is GENERATED AUTOMATICALLY.  DO NOT EDIT OR MODIFY.</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* Copyright (C) 1999 AbsoluteValue Systems, Inc.  All Rights Reserved.</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* linux-wlan</div><div class='add'>+*</div><div class='add'>+*   The contents of this file are subject to the Mozilla Public</div><div class='add'>+*   License Version 1.1 (the "License"); you may not use this file</div><div class='add'>+*   except in compliance with the License. You may obtain a copy of</div><div class='add'>+*   the License at http://www.mozilla.org/MPL/</div><div class='add'>+*</div><div class='add'>+*   Software distributed under the License is distributed on an "AS</div><div class='add'>+*   IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or</div><div class='add'>+*   implied. See the License for the specific language governing</div><div class='add'>+*   rights and limitations under the License.</div><div class='add'>+*</div><div class='add'>+*   Alternatively, the contents of this file may be used under the</div><div class='add'>+*   terms of the GNU Public License version 2 (the "GPL"), in which</div><div class='add'>+*   case the provisions of the GPL are applicable instead of the</div><div class='add'>+*   above.  If you wish to allow the use of your version of this file</div><div class='add'>+*   only under the terms of the GPL and not to allow others to use</div><div class='add'>+*   your version of this file under the MPL, indicate your decision</div><div class='add'>+*   by deleting the provisions above and replace them with the notice</div><div class='add'>+*   and other provisions required by the GPL.  If you do not delete</div><div class='add'>+*   the provisions above, a recipient may use your version of this</div><div class='add'>+*   file under either the MPL or the GPL.</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* Inquiries regarding the linux-wlan Open Source project can be</div><div class='add'>+* made directly to:</div><div class='add'>+*</div><div class='add'>+* AbsoluteValue Systems Inc.</div><div class='add'>+* info@linux-wlan.com</div><div class='add'>+* http://www.linux-wlan.com</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* Portions of the development of this software were funded by</div><div class='add'>+* Intersil Corporation as part of PRISM(R) chipset product development.</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#ifndef _P80211MKMETASTRUCT_H</div><div class='add'>+#define _P80211MKMETASTRUCT_H</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+typedef struct p80211msg_dot11req_mibget</div><div class='add'>+{</div><div class='add'>+	UINT32		msgcode	;</div><div class='add'>+	UINT32		msglen	;</div><div class='add'>+	UINT8		devname[WLAN_DEVNAMELEN_MAX]	;</div><div class='add'>+	p80211item_unk392_t	mibattribute	;</div><div class='add'>+	p80211item_uint32_t	resultcode	;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ p80211msg_dot11req_mibget_t;</div><div class='add'>+</div><div class='add'>+typedef struct p80211msg_dot11req_mibset</div><div class='add'>+{</div><div class='add'>+	UINT32		msgcode	;</div><div class='add'>+	UINT32		msglen	;</div><div class='add'>+	UINT8		devname[WLAN_DEVNAMELEN_MAX]	;</div><div class='add'>+	p80211item_unk392_t	mibattribute	;</div><div class='add'>+	p80211item_uint32_t	resultcode	;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ p80211msg_dot11req_mibset_t;</div><div class='add'>+</div><div class='add'>+typedef struct p80211msg_dot11req_powermgmt</div><div class='add'>+{</div><div class='add'>+	UINT32		msgcode	;</div><div class='add'>+	UINT32		msglen	;</div><div class='add'>+	UINT8		devname[WLAN_DEVNAMELEN_MAX]	;</div><div class='add'>+	p80211item_uint32_t	powermgmtmode	;</div><div class='add'>+	p80211item_uint32_t	wakeup	;</div><div class='add'>+	p80211item_uint32_t	receivedtims	;</div><div class='add'>+	p80211item_uint32_t	resultcode	;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ p80211msg_dot11req_powermgmt_t;</div><div class='add'>+</div><div class='add'>+typedef struct p80211msg_dot11req_scan</div><div class='add'>+{</div><div class='add'>+	UINT32		msgcode	;</div><div class='add'>+	UINT32		msglen	;</div><div class='add'>+	UINT8		devname[WLAN_DEVNAMELEN_MAX]	;</div><div class='add'>+	p80211item_uint32_t	bsstype	;</div><div class='add'>+	p80211item_pstr6_t	bssid	;</div><div class='add'>+	UINT8	pad_0C[1]	;</div><div class='add'>+	p80211item_pstr32_t	ssid	;</div><div class='add'>+	UINT8	pad_1D[3]	;</div><div class='add'>+	p80211item_uint32_t	scantype	;</div><div class='add'>+	p80211item_uint32_t	probedelay	;</div><div class='add'>+	p80211item_pstr14_t	channellist	;</div><div class='add'>+	UINT8	pad_2C[1]	;</div><div class='add'>+	p80211item_uint32_t	minchanneltime	;</div><div class='add'>+	p80211item_uint32_t	maxchanneltime	;</div><div class='add'>+	p80211item_uint32_t	resultcode	;</div><div class='add'>+	p80211item_uint32_t	numbss	;</div><div class='add'>+	p80211item_uint32_t	append	;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ p80211msg_dot11req_scan_t;</div><div class='add'>+</div><div class='add'>+typedef struct p80211msg_dot11req_scan_results</div><div class='add'>+{</div><div class='add'>+	UINT32		msgcode	;</div><div class='add'>+	UINT32		msglen	;</div><div class='add'>+	UINT8		devname[WLAN_DEVNAMELEN_MAX]	;</div><div class='add'>+	p80211item_uint32_t	bssindex	;</div><div class='add'>+	p80211item_uint32_t	resultcode	;</div><div class='add'>+	p80211item_uint32_t	signal	;</div><div class='add'>+	p80211item_uint32_t	noise	;</div><div class='add'>+	p80211item_pstr6_t	bssid	;</div><div class='add'>+	UINT8	pad_3C[1]	;</div><div class='add'>+	p80211item_pstr32_t	ssid	;</div><div class='add'>+	UINT8	pad_4D[3]	;</div><div class='add'>+	p80211item_uint32_t	bsstype	;</div><div class='add'>+	p80211item_uint32_t	beaconperiod	;</div><div class='add'>+	p80211item_uint32_t	dtimperiod	;</div><div class='add'>+	p80211item_uint32_t	timestamp	;</div><div class='add'>+	p80211item_uint32_t	localtime	;</div><div class='add'>+	p80211item_uint32_t	fhdwelltime	;</div><div class='add'>+	p80211item_uint32_t	fhhopset	;</div><div class='add'>+	p80211item_uint32_t	fhhoppattern	;</div><div class='add'>+	p80211item_uint32_t	fhhopindex	;</div><div class='add'>+	p80211item_uint32_t	dschannel	;</div><div class='add'>+	p80211item_uint32_t	cfpcount	;</div><div class='add'>+	p80211item_uint32_t	cfpperiod	;</div><div class='add'>+	p80211item_uint32_t	cfpmaxduration	;</div><div class='add'>+	p80211item_uint32_t	cfpdurremaining	;</div><div class='add'>+	p80211item_uint32_t	ibssatimwindow	;</div><div class='add'>+	p80211item_uint32_t	cfpollable	;</div><div class='add'>+	p80211item_uint32_t	cfpollreq	;</div><div class='add'>+	p80211item_uint32_t	privacy	;</div><div class='add'>+	p80211item_uint32_t	basicrate1	;</div><div class='add'>+	p80211item_uint32_t	basicrate2	;</div><div class='add'>+	p80211item_uint32_t	basicrate3	;</div><div class='add'>+	p80211item_uint32_t	basicrate4	;</div><div class='add'>+	p80211item_uint32_t	basicrate5	;</div><div class='add'>+	p80211item_uint32_t	basicrate6	;</div><div class='add'>+	p80211item_uint32_t	basicrate7	;</div><div class='add'>+	p80211item_uint32_t	basicrate8	;</div><div class='add'>+	p80211item_uint32_t	supprate1	;</div><div class='add'>+	p80211item_uint32_t	supprate2	;</div><div class='add'>+	p80211item_uint32_t	supprate3	;</div><div class='add'>+	p80211item_uint32_t	supprate4	;</div><div class='add'>+	p80211item_uint32_t	supprate5	;</div><div class='add'>+	p80211item_uint32_t	supprate6	;</div><div class='add'>+	p80211item_uint32_t	supprate7	;</div><div class='add'>+	p80211item_uint32_t	supprate8	;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ p80211msg_dot11req_scan_results_t;</div><div class='add'>+</div><div class='add'>+typedef struct p80211msg_dot11req_join</div><div class='add'>+{</div><div class='add'>+	UINT32		msgcode	;</div><div class='add'>+	UINT32		msglen	;</div><div class='add'>+	UINT8		devname[WLAN_DEVNAMELEN_MAX]	;</div><div class='add'>+	p80211item_pstr6_t	bssid	;</div><div class='add'>+	UINT8	pad_5C[1]	;</div><div class='add'>+	p80211item_uint32_t	joinfailuretimeout	;</div><div class='add'>+	p80211item_uint32_t	basicrate1	;</div><div class='add'>+	p80211item_uint32_t	basicrate2	;</div><div class='add'>+	p80211item_uint32_t	basicrate3	;</div><div class='add'>+	p80211item_uint32_t	basicrate4	;</div><div class='add'>+	p80211item_uint32_t	basicrate5	;</div><div class='add'>+	p80211item_uint32_t	basicrate6	;</div><div class='add'>+	p80211item_uint32_t	basicrate7	;</div><div class='add'>+	p80211item_uint32_t	basicrate8	;</div><div class='add'>+	p80211item_uint32_t	operationalrate1	;</div><div class='add'>+	p80211item_uint32_t	operationalrate2	;</div><div class='add'>+	p80211item_uint32_t	operationalrate3	;</div><div class='add'>+	p80211item_uint32_t	operationalrate4	;</div><div class='add'>+	p80211item_uint32_t	operationalrate5	;</div><div class='add'>+	p80211item_uint32_t	operationalrate6	;</div><div class='add'>+	p80211item_uint32_t	operationalrate7	;</div><div class='add'>+	p80211item_uint32_t	operationalrate8	;</div><div class='add'>+	p80211item_uint32_t	resultcode	;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ p80211msg_dot11req_join_t;</div><div class='add'>+</div><div class='add'>+typedef struct p80211msg_dot11req_authenticate</div><div class='add'>+{</div><div class='add'>+	UINT32		msgcode	;</div><div class='add'>+	UINT32		msglen	;</div><div class='add'>+	UINT8		devname[WLAN_DEVNAMELEN_MAX]	;</div><div class='add'>+	p80211item_pstr6_t	peerstaaddress	;</div><div class='add'>+	UINT8	pad_6C[1]	;</div><div class='add'>+	p80211item_uint32_t	authenticationtype	;</div><div class='add'>+	p80211item_uint32_t	authenticationfailuretimeout	;</div><div class='add'>+	p80211item_uint32_t	resultcode	;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ p80211msg_dot11req_authenticate_t;</div><div class='add'>+</div><div class='add'>+typedef struct p80211msg_dot11req_deauthenticate</div><div class='add'>+{</div><div class='add'>+	UINT32		msgcode	;</div><div class='add'>+	UINT32		msglen	;</div><div class='add'>+	UINT8		devname[WLAN_DEVNAMELEN_MAX]	;</div><div class='add'>+	p80211item_pstr6_t	peerstaaddress	;</div><div class='add'>+	UINT8	pad_7C[1]	;</div><div class='add'>+	p80211item_uint32_t	reasoncode	;</div><div class='add'>+	p80211item_uint32_t	resultcode	;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ p80211msg_dot11req_deauthenticate_t;</div><div class='add'>+</div><div class='add'>+typedef struct p80211msg_dot11req_associate</div><div class='add'>+{</div><div class='add'>+	UINT32		msgcode	;</div><div class='add'>+	UINT32		msglen	;</div><div class='add'>+	UINT8		devname[WLAN_DEVNAMELEN_MAX]	;</div><div class='add'>+	p80211item_pstr6_t	peerstaaddress	;</div><div class='add'>+	UINT8	pad_8C[1]	;</div><div class='add'>+	p80211item_uint32_t	associatefailuretimeout	;</div><div class='add'>+	p80211item_uint32_t	cfpollable	;</div><div class='add'>+	p80211item_uint32_t	cfpollreq	;</div><div class='add'>+	p80211item_uint32_t	privacy	;</div><div class='add'>+	p80211item_uint32_t	listeninterval	;</div><div class='add'>+	p80211item_uint32_t	resultcode	;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ p80211msg_dot11req_associate_t;</div><div class='add'>+</div><div class='add'>+typedef struct p80211msg_dot11req_reassociate</div><div class='add'>+{</div><div class='add'>+	UINT32		msgcode	;</div><div class='add'>+	UINT32		msglen	;</div><div class='add'>+	UINT8		devname[WLAN_DEVNAMELEN_MAX]	;</div><div class='add'>+	p80211item_pstr6_t	newapaddress	;</div><div class='add'>+	UINT8	pad_9C[1]	;</div><div class='add'>+	p80211item_uint32_t	reassociatefailuretimeout	;</div><div class='add'>+	p80211item_uint32_t	cfpollable	;</div><div class='add'>+	p80211item_uint32_t	cfpollreq	;</div><div class='add'>+	p80211item_uint32_t	privacy	;</div><div class='add'>+	p80211item_uint32_t	listeninterval	;</div><div class='add'>+	p80211item_uint32_t	resultcode	;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ p80211msg_dot11req_reassociate_t;</div><div class='add'>+</div><div class='add'>+typedef struct p80211msg_dot11req_disassociate</div><div class='add'>+{</div><div class='add'>+	UINT32		msgcode	;</div><div class='add'>+	UINT32		msglen	;</div><div class='add'>+	UINT8		devname[WLAN_DEVNAMELEN_MAX]	;</div><div class='add'>+	p80211item_pstr6_t	peerstaaddress	;</div><div class='add'>+	UINT8	pad_10C[1]	;</div><div class='add'>+	p80211item_uint32_t	reasoncode	;</div><div class='add'>+	p80211item_uint32_t	resultcode	;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ p80211msg_dot11req_disassociate_t;</div><div class='add'>+</div><div class='add'>+typedef struct p80211msg_dot11req_reset</div><div class='add'>+{</div><div class='add'>+	UINT32		msgcode	;</div><div class='add'>+	UINT32		msglen	;</div><div class='add'>+	UINT8		devname[WLAN_DEVNAMELEN_MAX]	;</div><div class='add'>+	p80211item_uint32_t	setdefaultmib	;</div><div class='add'>+	p80211item_pstr6_t	macaddress	;</div><div class='add'>+	UINT8	pad_11C[1]	;</div><div class='add'>+	p80211item_uint32_t	resultcode	;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ p80211msg_dot11req_reset_t;</div><div class='add'>+</div><div class='add'>+typedef struct p80211msg_dot11req_start</div><div class='add'>+{</div><div class='add'>+	UINT32		msgcode	;</div><div class='add'>+	UINT32		msglen	;</div><div class='add'>+	UINT8		devname[WLAN_DEVNAMELEN_MAX]	;</div><div class='add'>+	p80211item_pstr32_t	ssid	;</div><div class='add'>+	UINT8	pad_12D[3]	;</div><div class='add'>+	p80211item_uint32_t	bsstype	;</div><div class='add'>+	p80211item_uint32_t	beaconperiod	;</div><div class='add'>+	p80211item_uint32_t	dtimperiod	;</div><div class='add'>+	p80211item_uint32_t	cfpperiod	;</div><div class='add'>+	p80211item_uint32_t	cfpmaxduration	;</div><div class='add'>+	p80211item_uint32_t	fhdwelltime	;</div><div class='add'>+	p80211item_uint32_t	fhhopset	;</div><div class='add'>+	p80211item_uint32_t	fhhoppattern	;</div><div class='add'>+	p80211item_uint32_t	dschannel	;</div><div class='add'>+	p80211item_uint32_t	ibssatimwindow	;</div><div class='add'>+	p80211item_uint32_t	probedelay	;</div><div class='add'>+	p80211item_uint32_t	cfpollable	;</div><div class='add'>+	p80211item_uint32_t	cfpollreq	;</div><div class='add'>+	p80211item_uint32_t	basicrate1	;</div><div class='add'>+	p80211item_uint32_t	basicrate2	;</div><div class='add'>+	p80211item_uint32_t	basicrate3	;</div><div class='add'>+	p80211item_uint32_t	basicrate4	;</div><div class='add'>+	p80211item_uint32_t	basicrate5	;</div><div class='add'>+	p80211item_uint32_t	basicrate6	;</div><div class='add'>+	p80211item_uint32_t	basicrate7	;</div><div class='add'>+	p80211item_uint32_t	basicrate8	;</div><div class='add'>+	p80211item_uint32_t	operationalrate1	;</div><div class='add'>+	p80211item_uint32_t	operationalrate2	;</div><div class='add'>+	p80211item_uint32_t	operationalrate3	;</div><div class='add'>+	p80211item_uint32_t	operationalrate4	;</div><div class='add'>+	p80211item_uint32_t	operationalrate5	;</div><div class='add'>+	p80211item_uint32_t	operationalrate6	;</div><div class='add'>+	p80211item_uint32_t	operationalrate7	;</div><div class='add'>+	p80211item_uint32_t	operationalrate8	;</div><div class='add'>+	p80211item_uint32_t	resultcode	;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ p80211msg_dot11req_start_t;</div><div class='add'>+</div><div class='add'>+typedef struct p80211msg_dot11ind_authenticate</div><div class='add'>+{</div><div class='add'>+	UINT32		msgcode	;</div><div class='add'>+	UINT32		msglen	;</div><div class='add'>+	UINT8		devname[WLAN_DEVNAMELEN_MAX]	;</div><div class='add'>+	p80211item_pstr6_t	peerstaaddress	;</div><div class='add'>+	UINT8	pad_13C[1]	;</div><div class='add'>+	p80211item_uint32_t	authenticationtype	;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ p80211msg_dot11ind_authenticate_t;</div><div class='add'>+</div><div class='add'>+typedef struct p80211msg_dot11ind_deauthenticate</div><div class='add'>+{</div><div class='add'>+	UINT32		msgcode	;</div><div class='add'>+	UINT32		msglen	;</div><div class='add'>+	UINT8		devname[WLAN_DEVNAMELEN_MAX]	;</div><div class='add'>+	p80211item_pstr6_t	peerstaaddress	;</div><div class='add'>+	UINT8	pad_14C[1]	;</div><div class='add'>+	p80211item_uint32_t	reasoncode	;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ p80211msg_dot11ind_deauthenticate_t;</div><div class='add'>+</div><div class='add'>+typedef struct p80211msg_dot11ind_associate</div><div class='add'>+{</div><div class='add'>+	UINT32		msgcode	;</div><div class='add'>+	UINT32		msglen	;</div><div class='add'>+	UINT8		devname[WLAN_DEVNAMELEN_MAX]	;</div><div class='add'>+	p80211item_pstr6_t	peerstaaddress	;</div><div class='add'>+	UINT8	pad_15C[1]	;</div><div class='add'>+	p80211item_uint32_t	aid	;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ p80211msg_dot11ind_associate_t;</div><div class='add'>+</div><div class='add'>+typedef struct p80211msg_dot11ind_reassociate</div><div class='add'>+{</div><div class='add'>+	UINT32		msgcode	;</div><div class='add'>+	UINT32		msglen	;</div><div class='add'>+	UINT8		devname[WLAN_DEVNAMELEN_MAX]	;</div><div class='add'>+	p80211item_pstr6_t	peerstaaddress	;</div><div class='add'>+	UINT8	pad_16C[1]	;</div><div class='add'>+	p80211item_uint32_t	aid	;</div><div class='add'>+	p80211item_pstr6_t	oldapaddress	;</div><div class='add'>+	UINT8	pad_17C[1]	;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ p80211msg_dot11ind_reassociate_t;</div><div class='add'>+</div><div class='add'>+typedef struct p80211msg_dot11ind_disassociate</div><div class='add'>+{</div><div class='add'>+	UINT32		msgcode	;</div><div class='add'>+	UINT32		msglen	;</div><div class='add'>+	UINT8		devname[WLAN_DEVNAMELEN_MAX]	;</div><div class='add'>+	p80211item_pstr6_t	peerstaaddress	;</div><div class='add'>+	UINT8	pad_18C[1]	;</div><div class='add'>+	p80211item_uint32_t	reasoncode	;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ p80211msg_dot11ind_disassociate_t;</div><div class='add'>+</div><div class='add'>+typedef struct p80211msg_lnxreq_ifstate</div><div class='add'>+{</div><div class='add'>+	UINT32		msgcode	;</div><div class='add'>+	UINT32		msglen	;</div><div class='add'>+	UINT8		devname[WLAN_DEVNAMELEN_MAX]	;</div><div class='add'>+	p80211item_uint32_t	ifstate	;</div><div class='add'>+	p80211item_uint32_t	resultcode	;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ p80211msg_lnxreq_ifstate_t;</div><div class='add'>+</div><div class='add'>+typedef struct p80211msg_lnxreq_wlansniff</div><div class='add'>+{</div><div class='add'>+	UINT32		msgcode	;</div><div class='add'>+	UINT32		msglen	;</div><div class='add'>+	UINT8		devname[WLAN_DEVNAMELEN_MAX]	;</div><div class='add'>+	p80211item_uint32_t	enable	;</div><div class='add'>+	p80211item_uint32_t	channel	;</div><div class='add'>+	p80211item_uint32_t	prismheader	;</div><div class='add'>+	p80211item_uint32_t	wlanheader	;</div><div class='add'>+	p80211item_uint32_t	keepwepflags	;</div><div class='add'>+	p80211item_uint32_t	stripfcs	;</div><div class='add'>+	p80211item_uint32_t	packet_trunc	;</div><div class='add'>+	p80211item_uint32_t	resultcode	;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ p80211msg_lnxreq_wlansniff_t;</div><div class='add'>+</div><div class='add'>+typedef struct p80211msg_lnxreq_hostwep</div><div class='add'>+{</div><div class='add'>+	UINT32		msgcode	;</div><div class='add'>+	UINT32		msglen	;</div><div class='add'>+	UINT8		devname[WLAN_DEVNAMELEN_MAX]	;</div><div class='add'>+	p80211item_uint32_t	resultcode	;</div><div class='add'>+	p80211item_uint32_t	decrypt	;</div><div class='add'>+	p80211item_uint32_t	encrypt	;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ p80211msg_lnxreq_hostwep_t;</div><div class='add'>+</div><div class='add'>+typedef struct p80211msg_lnxreq_commsquality</div><div class='add'>+{</div><div class='add'>+	UINT32		msgcode	;</div><div class='add'>+	UINT32		msglen	;</div><div class='add'>+	UINT8		devname[WLAN_DEVNAMELEN_MAX]	;</div><div class='add'>+	p80211item_uint32_t	resultcode	;</div><div class='add'>+	p80211item_uint32_t	dbm	;</div><div class='add'>+	p80211item_uint32_t	link	;</div><div class='add'>+	p80211item_uint32_t	level	;</div><div class='add'>+	p80211item_uint32_t	noise	;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ p80211msg_lnxreq_commsquality_t;</div><div class='add'>+</div><div class='add'>+typedef struct p80211msg_lnxreq_autojoin</div><div class='add'>+{</div><div class='add'>+	UINT32		msgcode	;</div><div class='add'>+	UINT32		msglen	;</div><div class='add'>+	UINT8		devname[WLAN_DEVNAMELEN_MAX]	;</div><div class='add'>+	p80211item_pstr32_t	ssid	;</div><div class='add'>+	UINT8	pad_19D[3]	;</div><div class='add'>+	p80211item_uint32_t	authtype	;</div><div class='add'>+	p80211item_uint32_t	resultcode	;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ p80211msg_lnxreq_autojoin_t;</div><div class='add'>+</div><div class='add'>+typedef struct p80211msg_lnxind_wlansniffrm</div><div class='add'>+{</div><div class='add'>+	UINT32		msgcode	;</div><div class='add'>+	UINT32		msglen	;</div><div class='add'>+	UINT8		devname[WLAN_DEVNAMELEN_MAX]	;</div><div class='add'>+	p80211item_uint32_t	hosttime	;</div><div class='add'>+	p80211item_uint32_t	mactime	;</div><div class='add'>+	p80211item_uint32_t	channel	;</div><div class='add'>+	p80211item_uint32_t	rssi	;</div><div class='add'>+	p80211item_uint32_t	sq	;</div><div class='add'>+	p80211item_uint32_t	signal	;</div><div class='add'>+	p80211item_uint32_t	noise	;</div><div class='add'>+	p80211item_uint32_t	rate	;</div><div class='add'>+	p80211item_uint32_t	istx	;</div><div class='add'>+	p80211item_uint32_t	frmlen	;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ p80211msg_lnxind_wlansniffrm_t;</div><div class='add'>+</div><div class='add'>+typedef struct p80211msg_lnxind_roam</div><div class='add'>+{</div><div class='add'>+	UINT32		msgcode	;</div><div class='add'>+	UINT32		msglen	;</div><div class='add'>+	UINT8		devname[WLAN_DEVNAMELEN_MAX]	;</div><div class='add'>+	p80211item_uint32_t	reason	;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ p80211msg_lnxind_roam_t;</div><div class='add'>+</div><div class='add'>+typedef struct p80211msg_p2req_join</div><div class='add'>+{</div><div class='add'>+	UINT32		msgcode	;</div><div class='add'>+	UINT32		msglen	;</div><div class='add'>+	UINT8		devname[WLAN_DEVNAMELEN_MAX]	;</div><div class='add'>+	p80211item_pstr6_t	bssid	;</div><div class='add'>+	UINT8	pad_20C[1]	;</div><div class='add'>+	p80211item_uint32_t	basicrate1	;</div><div class='add'>+	p80211item_uint32_t	basicrate2	;</div><div class='add'>+	p80211item_uint32_t	basicrate3	;</div><div class='add'>+	p80211item_uint32_t	basicrate4	;</div><div class='add'>+	p80211item_uint32_t	basicrate5	;</div><div class='add'>+	p80211item_uint32_t	basicrate6	;</div><div class='add'>+	p80211item_uint32_t	basicrate7	;</div><div class='add'>+	p80211item_uint32_t	basicrate8	;</div><div class='add'>+	p80211item_uint32_t	operationalrate1	;</div><div class='add'>+	p80211item_uint32_t	operationalrate2	;</div><div class='add'>+	p80211item_uint32_t	operationalrate3	;</div><div class='add'>+	p80211item_uint32_t	operationalrate4	;</div><div class='add'>+	p80211item_uint32_t	operationalrate5	;</div><div class='add'>+	p80211item_uint32_t	operationalrate6	;</div><div class='add'>+	p80211item_uint32_t	operationalrate7	;</div><div class='add'>+	p80211item_uint32_t	operationalrate8	;</div><div class='add'>+	p80211item_pstr32_t	ssid	;</div><div class='add'>+	UINT8	pad_21D[3]	;</div><div class='add'>+	p80211item_uint32_t	channel	;</div><div class='add'>+	p80211item_uint32_t	authtype	;</div><div class='add'>+	p80211item_uint32_t	resultcode	;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ p80211msg_p2req_join_t;</div><div class='add'>+</div><div class='add'>+typedef struct p80211msg_p2req_readpda</div><div class='add'>+{</div><div class='add'>+	UINT32		msgcode	;</div><div class='add'>+	UINT32		msglen	;</div><div class='add'>+	UINT8		devname[WLAN_DEVNAMELEN_MAX]	;</div><div class='add'>+	p80211item_unk1024_t	pda	;</div><div class='add'>+	p80211item_uint32_t	resultcode	;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ p80211msg_p2req_readpda_t;</div><div class='add'>+</div><div class='add'>+typedef struct p80211msg_p2req_readcis</div><div class='add'>+{</div><div class='add'>+	UINT32		msgcode	;</div><div class='add'>+	UINT32		msglen	;</div><div class='add'>+	UINT8		devname[WLAN_DEVNAMELEN_MAX]	;</div><div class='add'>+	p80211item_unk1024_t	cis	;</div><div class='add'>+	p80211item_uint32_t	resultcode	;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ p80211msg_p2req_readcis_t;</div><div class='add'>+</div><div class='add'>+typedef struct p80211msg_p2req_auxport_state</div><div class='add'>+{</div><div class='add'>+	UINT32		msgcode	;</div><div class='add'>+	UINT32		msglen	;</div><div class='add'>+	UINT8		devname[WLAN_DEVNAMELEN_MAX]	;</div><div class='add'>+	p80211item_uint32_t	enable	;</div><div class='add'>+	p80211item_uint32_t	resultcode	;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ p80211msg_p2req_auxport_state_t;</div><div class='add'>+</div><div class='add'>+typedef struct p80211msg_p2req_auxport_read</div><div class='add'>+{</div><div class='add'>+	UINT32		msgcode	;</div><div class='add'>+	UINT32		msglen	;</div><div class='add'>+	UINT8		devname[WLAN_DEVNAMELEN_MAX]	;</div><div class='add'>+	p80211item_uint32_t	addr	;</div><div class='add'>+	p80211item_uint32_t	len	;</div><div class='add'>+	p80211item_unk1024_t	data	;</div><div class='add'>+	p80211item_uint32_t	resultcode	;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ p80211msg_p2req_auxport_read_t;</div><div class='add'>+</div><div class='add'>+typedef struct p80211msg_p2req_auxport_write</div><div class='add'>+{</div><div class='add'>+	UINT32		msgcode	;</div><div class='add'>+	UINT32		msglen	;</div><div class='add'>+	UINT8		devname[WLAN_DEVNAMELEN_MAX]	;</div><div class='add'>+	p80211item_uint32_t	addr	;</div><div class='add'>+	p80211item_uint32_t	len	;</div><div class='add'>+	p80211item_unk1024_t	data	;</div><div class='add'>+	p80211item_uint32_t	resultcode	;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ p80211msg_p2req_auxport_write_t;</div><div class='add'>+</div><div class='add'>+typedef struct p80211msg_p2req_low_level</div><div class='add'>+{</div><div class='add'>+	UINT32		msgcode	;</div><div class='add'>+	UINT32		msglen	;</div><div class='add'>+	UINT8		devname[WLAN_DEVNAMELEN_MAX]	;</div><div class='add'>+	p80211item_uint32_t	command	;</div><div class='add'>+	p80211item_uint32_t	param0	;</div><div class='add'>+	p80211item_uint32_t	param1	;</div><div class='add'>+	p80211item_uint32_t	param2	;</div><div class='add'>+	p80211item_uint32_t	resp0	;</div><div class='add'>+	p80211item_uint32_t	resp1	;</div><div class='add'>+	p80211item_uint32_t	resp2	;</div><div class='add'>+	p80211item_uint32_t	resultcode	;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ p80211msg_p2req_low_level_t;</div><div class='add'>+</div><div class='add'>+typedef struct p80211msg_p2req_test_command</div><div class='add'>+{</div><div class='add'>+	UINT32		msgcode	;</div><div class='add'>+	UINT32		msglen	;</div><div class='add'>+	UINT8		devname[WLAN_DEVNAMELEN_MAX]	;</div><div class='add'>+	p80211item_uint32_t	testcode	;</div><div class='add'>+	p80211item_uint32_t	testparam	;</div><div class='add'>+	p80211item_uint32_t	resultcode	;</div><div class='add'>+	p80211item_uint32_t	status	;</div><div class='add'>+	p80211item_uint32_t	resp0	;</div><div class='add'>+	p80211item_uint32_t	resp1	;</div><div class='add'>+	p80211item_uint32_t	resp2	;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ p80211msg_p2req_test_command_t;</div><div class='add'>+</div><div class='add'>+typedef struct p80211msg_p2req_mmi_read</div><div class='add'>+{</div><div class='add'>+	UINT32		msgcode	;</div><div class='add'>+	UINT32		msglen	;</div><div class='add'>+	UINT8		devname[WLAN_DEVNAMELEN_MAX]	;</div><div class='add'>+	p80211item_uint32_t	addr	;</div><div class='add'>+	p80211item_uint32_t	value	;</div><div class='add'>+	p80211item_uint32_t	resultcode	;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ p80211msg_p2req_mmi_read_t;</div><div class='add'>+</div><div class='add'>+typedef struct p80211msg_p2req_mmi_write</div><div class='add'>+{</div><div class='add'>+	UINT32		msgcode	;</div><div class='add'>+	UINT32		msglen	;</div><div class='add'>+	UINT8		devname[WLAN_DEVNAMELEN_MAX]	;</div><div class='add'>+	p80211item_uint32_t	addr	;</div><div class='add'>+	p80211item_uint32_t	data	;</div><div class='add'>+	p80211item_uint32_t	resultcode	;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ p80211msg_p2req_mmi_write_t;</div><div class='add'>+</div><div class='add'>+typedef struct p80211msg_p2req_ramdl_state</div><div class='add'>+{</div><div class='add'>+	UINT32		msgcode	;</div><div class='add'>+	UINT32		msglen	;</div><div class='add'>+	UINT8		devname[WLAN_DEVNAMELEN_MAX]	;</div><div class='add'>+	p80211item_uint32_t	enable	;</div><div class='add'>+	p80211item_uint32_t	exeaddr	;</div><div class='add'>+	p80211item_uint32_t	resultcode	;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ p80211msg_p2req_ramdl_state_t;</div><div class='add'>+</div><div class='add'>+typedef struct p80211msg_p2req_ramdl_write</div><div class='add'>+{</div><div class='add'>+	UINT32		msgcode	;</div><div class='add'>+	UINT32		msglen	;</div><div class='add'>+	UINT8		devname[WLAN_DEVNAMELEN_MAX]	;</div><div class='add'>+	p80211item_uint32_t	addr	;</div><div class='add'>+	p80211item_uint32_t	len	;</div><div class='add'>+	p80211item_unk4096_t	data	;</div><div class='add'>+	p80211item_uint32_t	resultcode	;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ p80211msg_p2req_ramdl_write_t;</div><div class='add'>+</div><div class='add'>+typedef struct p80211msg_p2req_flashdl_state</div><div class='add'>+{</div><div class='add'>+	UINT32		msgcode	;</div><div class='add'>+	UINT32		msglen	;</div><div class='add'>+	UINT8		devname[WLAN_DEVNAMELEN_MAX]	;</div><div class='add'>+	p80211item_uint32_t	enable	;</div><div class='add'>+	p80211item_uint32_t	resultcode	;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ p80211msg_p2req_flashdl_state_t;</div><div class='add'>+</div><div class='add'>+typedef struct p80211msg_p2req_flashdl_write</div><div class='add'>+{</div><div class='add'>+	UINT32		msgcode	;</div><div class='add'>+	UINT32		msglen	;</div><div class='add'>+	UINT8		devname[WLAN_DEVNAMELEN_MAX]	;</div><div class='add'>+	p80211item_uint32_t	addr	;</div><div class='add'>+	p80211item_uint32_t	len	;</div><div class='add'>+	p80211item_unk4096_t	data	;</div><div class='add'>+	p80211item_uint32_t	resultcode	;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ p80211msg_p2req_flashdl_write_t;</div><div class='add'>+</div><div class='add'>+typedef struct p80211msg_p2req_mm_state</div><div class='add'>+{</div><div class='add'>+	UINT32		msgcode	;</div><div class='add'>+	UINT32		msglen	;</div><div class='add'>+	UINT8		devname[WLAN_DEVNAMELEN_MAX]	;</div><div class='add'>+	p80211item_uint32_t	enable	;</div><div class='add'>+	p80211item_uint32_t	resultcode	;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ p80211msg_p2req_mm_state_t;</div><div class='add'>+</div><div class='add'>+typedef struct p80211msg_p2req_dump_state</div><div class='add'>+{</div><div class='add'>+	UINT32		msgcode	;</div><div class='add'>+	UINT32		msglen	;</div><div class='add'>+	UINT8		devname[WLAN_DEVNAMELEN_MAX]	;</div><div class='add'>+	p80211item_uint32_t	level	;</div><div class='add'>+	p80211item_uint32_t	resultcode	;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ p80211msg_p2req_dump_state_t;</div><div class='add'>+</div><div class='add'>+typedef struct p80211msg_p2req_channel_info</div><div class='add'>+{</div><div class='add'>+	UINT32		msgcode	;</div><div class='add'>+	UINT32		msglen	;</div><div class='add'>+	UINT8		devname[WLAN_DEVNAMELEN_MAX]	;</div><div class='add'>+	p80211item_uint32_t	channellist	;</div><div class='add'>+	p80211item_uint32_t	channeldwelltime	;</div><div class='add'>+	p80211item_uint32_t	resultcode	;</div><div class='add'>+	p80211item_uint32_t	numchinfo	;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ p80211msg_p2req_channel_info_t;</div><div class='add'>+</div><div class='add'>+typedef struct p80211msg_p2req_channel_info_results</div><div class='add'>+{</div><div class='add'>+	UINT32		msgcode	;</div><div class='add'>+	UINT32		msglen	;</div><div class='add'>+	UINT8		devname[WLAN_DEVNAMELEN_MAX]	;</div><div class='add'>+	p80211item_uint32_t	channel	;</div><div class='add'>+	p80211item_uint32_t	resultcode	;</div><div class='add'>+	p80211item_uint32_t	avgnoiselevel	;</div><div class='add'>+	p80211item_uint32_t	peaknoiselevel	;</div><div class='add'>+	p80211item_uint32_t	bssactive	;</div><div class='add'>+	p80211item_uint32_t	pcfactive	;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ p80211msg_p2req_channel_info_results_t;</div><div class='add'>+</div><div class='add'>+typedef struct p80211msg_p2req_enable</div><div class='add'>+{</div><div class='add'>+	UINT32		msgcode	;</div><div class='add'>+	UINT32		msglen	;</div><div class='add'>+	UINT8		devname[WLAN_DEVNAMELEN_MAX]	;</div><div class='add'>+	p80211item_uint32_t	resultcode	;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ p80211msg_p2req_enable_t;</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/staging/wlan-ng/p80211mgmt.h b/drivers/staging/wlan-ng/p80211mgmt.h<br/>new file mode 100644<br/>index 000000000000..bd4c1629eabf<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/wlan-ng/p80211mgmt.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/wlan-ng/p80211mgmt.h</a></div><div class='hunk'>@@ -0,0 +1,575 @@</div><div class='add'>+/* p80211mgmt.h</div><div class='add'>+*</div><div class='add'>+* Macros, types, and functions to handle 802.11 mgmt frames</div><div class='add'>+*</div><div class='add'>+* Copyright (C) 1999 AbsoluteValue Systems, Inc.  All Rights Reserved.</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* linux-wlan</div><div class='add'>+*</div><div class='add'>+*   The contents of this file are subject to the Mozilla Public</div><div class='add'>+*   License Version 1.1 (the "License"); you may not use this file</div><div class='add'>+*   except in compliance with the License. You may obtain a copy of</div><div class='add'>+*   the License at http://www.mozilla.org/MPL/</div><div class='add'>+*</div><div class='add'>+*   Software distributed under the License is distributed on an "AS</div><div class='add'>+*   IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or</div><div class='add'>+*   implied. See the License for the specific language governing</div><div class='add'>+*   rights and limitations under the License.</div><div class='add'>+*</div><div class='add'>+*   Alternatively, the contents of this file may be used under the</div><div class='add'>+*   terms of the GNU Public License version 2 (the "GPL"), in which</div><div class='add'>+*   case the provisions of the GPL are applicable instead of the</div><div class='add'>+*   above.  If you wish to allow the use of your version of this file</div><div class='add'>+*   only under the terms of the GPL and not to allow others to use</div><div class='add'>+*   your version of this file under the MPL, indicate your decision</div><div class='add'>+*   by deleting the provisions above and replace them with the notice</div><div class='add'>+*   and other provisions required by the GPL.  If you do not delete</div><div class='add'>+*   the provisions above, a recipient may use your version of this</div><div class='add'>+*   file under either the MPL or the GPL.</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* Inquiries regarding the linux-wlan Open Source project can be</div><div class='add'>+* made directly to:</div><div class='add'>+*</div><div class='add'>+* AbsoluteValue Systems Inc.</div><div class='add'>+* info@linux-wlan.com</div><div class='add'>+* http://www.linux-wlan.com</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* Portions of the development of this software were funded by</div><div class='add'>+* Intersil Corporation as part of PRISM(R) chipset product development.</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* This file declares the constants and types used in the interface</div><div class='add'>+* between a wlan driver and the user mode utilities.</div><div class='add'>+*</div><div class='add'>+* Notes:</div><div class='add'>+*  - Constant values are always in HOST byte order.  To assign</div><div class='add'>+*    values to multi-byte fields they _must_ be converted to</div><div class='add'>+*    ieee byte order.  To retrieve multi-byte values from incoming</div><div class='add'>+*    frames, they must be converted to host order.</div><div class='add'>+*</div><div class='add'>+*  - The len member of the frame structure does NOT!!! include</div><div class='add'>+*    the MAC CRC.  Therefore, the len field on rx'd frames should</div><div class='add'>+*    have 4 subtracted from it.</div><div class='add'>+*</div><div class='add'>+* All functions declared here are implemented in p80211.c</div><div class='add'>+*</div><div class='add'>+* The types, macros, and functions defined here are primarily</div><div class='add'>+* used for encoding and decoding management frames.  They are</div><div class='add'>+* designed to follow these patterns of use:</div><div class='add'>+*</div><div class='add'>+* DECODE:</div><div class='add'>+* 1) a frame of length len is received into buffer b</div><div class='add'>+* 2) using the hdr structure and macros, we determine the type</div><div class='add'>+* 3) an appropriate mgmt frame structure, mf, is allocated and zeroed</div><div class='add'>+* 4) mf.hdr = b</div><div class='add'>+*    mf.buf = b</div><div class='add'>+*    mf.len = len</div><div class='add'>+* 5) call mgmt_decode( mf )</div><div class='add'>+* 6) the frame field pointers in mf are now set.  Note that any</div><div class='add'>+*    multi-byte frame field values accessed using the frame field</div><div class='add'>+*    pointers are in ieee byte order and will have to be converted</div><div class='add'>+*    to host order.</div><div class='add'>+*</div><div class='add'>+* ENCODE:</div><div class='add'>+* 1) Library client allocates buffer space for maximum length</div><div class='add'>+*    frame of the desired type</div><div class='add'>+* 2) Library client allocates a mgmt frame structure, called mf,</div><div class='add'>+*    of the desired type</div><div class='add'>+* 3) Set the following:</div><div class='add'>+*    mf.type = &lt;desired type&gt;</div><div class='add'>+*    mf.buf = &lt;allocated buffer address&gt;</div><div class='add'>+* 4) call mgmt_encode( mf )</div><div class='add'>+* 5) all of the fixed field pointers and fixed length information element</div><div class='add'>+*    pointers in mf are now set to their respective locations in the</div><div class='add'>+*    allocated space (fortunately, all variable length information elements</div><div class='add'>+*    fall at the end of their respective frames).</div><div class='add'>+* 5a) The length field is set to include the last of the fixed and fixed</div><div class='add'>+*     length fields.  It may have to be updated for optional or variable</div><div class='add'>+* 	length information elements.</div><div class='add'>+* 6) Optional and variable length information elements are special cases</div><div class='add'>+*    and must be handled individually by the client code.</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#ifndef _P80211MGMT_H</div><div class='add'>+#define _P80211MGMT_H</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* System Includes */</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Project Includes */</div><div class='add'>+</div><div class='add'>+#ifndef  _WLAN_COMPAT_H</div><div class='add'>+#include "wlan_compat.h"</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef  _P80211HDR_H</div><div class='add'>+#include "p80211hdr.h"</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Constants */</div><div class='add'>+</div><div class='add'>+/*-- Information Element IDs --------------------*/</div><div class='add'>+#define WLAN_EID_SSID		0</div><div class='add'>+#define WLAN_EID_SUPP_RATES	1</div><div class='add'>+#define WLAN_EID_FH_PARMS	2</div><div class='add'>+#define WLAN_EID_DS_PARMS	3</div><div class='add'>+#define WLAN_EID_CF_PARMS	4</div><div class='add'>+#define WLAN_EID_TIM		5</div><div class='add'>+#define WLAN_EID_IBSS_PARMS	6</div><div class='add'>+/*-- values 7-15 reserved --*/</div><div class='add'>+#define WLAN_EID_CHALLENGE	16</div><div class='add'>+/*-- values 17-31 reserved for challenge text extension --*/</div><div class='add'>+/*-- values 32-255 reserved --*/</div><div class='add'>+</div><div class='add'>+/*-- Reason Codes -------------------------------*/</div><div class='add'>+#define WLAN_MGMT_REASON_RSVD			0</div><div class='add'>+#define WLAN_MGMT_REASON_UNSPEC			1</div><div class='add'>+#define WLAN_MGMT_REASON_PRIOR_AUTH_INVALID	2</div><div class='add'>+#define WLAN_MGMT_REASON_DEAUTH_LEAVING		3</div><div class='add'>+#define WLAN_MGMT_REASON_DISASSOC_INACTIVE	4</div><div class='add'>+#define WLAN_MGMT_REASON_DISASSOC_AP_BUSY	5</div><div class='add'>+#define WLAN_MGMT_REASON_CLASS2_NONAUTH		6</div><div class='add'>+#define WLAN_MGMT_REASON_CLASS3_NONASSOC	7</div><div class='add'>+#define WLAN_MGMT_REASON_DISASSOC_STA_HASLEFT	8</div><div class='add'>+#define WLAN_MGMT_REASON_CANT_ASSOC_NONAUTH	9</div><div class='add'>+</div><div class='add'>+/*-- Status Codes -------------------------------*/</div><div class='add'>+#define WLAN_MGMT_STATUS_SUCCESS		0</div><div class='add'>+#define WLAN_MGMT_STATUS_UNSPEC_FAILURE		1</div><div class='add'>+#define WLAN_MGMT_STATUS_CAPS_UNSUPPORTED	10</div><div class='add'>+#define WLAN_MGMT_STATUS_REASSOC_NO_ASSOC	11</div><div class='add'>+#define WLAN_MGMT_STATUS_ASSOC_DENIED_UNSPEC	12</div><div class='add'>+#define WLAN_MGMT_STATUS_UNSUPPORTED_AUTHALG	13</div><div class='add'>+#define WLAN_MGMT_STATUS_RX_AUTH_NOSEQ		14</div><div class='add'>+#define WLAN_MGMT_STATUS_CHALLENGE_FAIL		15</div><div class='add'>+#define WLAN_MGMT_STATUS_AUTH_TIMEOUT		16</div><div class='add'>+#define WLAN_MGMT_STATUS_ASSOC_DENIED_BUSY	17</div><div class='add'>+#define WLAN_MGMT_STATUS_ASSOC_DENIED_RATES	18</div><div class='add'>+  /* p80211b additions */</div><div class='add'>+#define WLAN_MGMT_STATUS_ASSOC_DENIED_NOSHORT	19</div><div class='add'>+#define WLAN_MGMT_STATUS_ASSOC_DENIED_NOPBCC	20</div><div class='add'>+#define WLAN_MGMT_STATUS_ASSOC_DENIED_NOAGILITY	21</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*-- Auth Algorithm Field ---------------------------*/</div><div class='add'>+#define WLAN_AUTH_ALG_OPENSYSTEM		0</div><div class='add'>+#define WLAN_AUTH_ALG_SHAREDKEY			1</div><div class='add'>+</div><div class='add'>+/*-- Management Frame Field Offsets -------------*/</div><div class='add'>+/* Note: Not all fields are listed because of variable lengths,   */</div><div class='add'>+/*       see the code in p80211.c to see how we search for fields */</div><div class='add'>+/* Note: These offsets are from the start of the frame data       */</div><div class='add'>+</div><div class='add'>+#define WLAN_BEACON_OFF_TS			0</div><div class='add'>+#define WLAN_BEACON_OFF_BCN_INT			8</div><div class='add'>+#define WLAN_BEACON_OFF_CAPINFO			10</div><div class='add'>+#define WLAN_BEACON_OFF_SSID			12</div><div class='add'>+</div><div class='add'>+#define WLAN_DISASSOC_OFF_REASON		0</div><div class='add'>+</div><div class='add'>+#define WLAN_ASSOCREQ_OFF_CAP_INFO		0</div><div class='add'>+#define WLAN_ASSOCREQ_OFF_LISTEN_INT		2</div><div class='add'>+#define WLAN_ASSOCREQ_OFF_SSID			4</div><div class='add'>+</div><div class='add'>+#define WLAN_ASSOCRESP_OFF_CAP_INFO		0</div><div class='add'>+#define WLAN_ASSOCRESP_OFF_STATUS		2</div><div class='add'>+#define WLAN_ASSOCRESP_OFF_AID			4</div><div class='add'>+#define WLAN_ASSOCRESP_OFF_SUPP_RATES		6</div><div class='add'>+</div><div class='add'>+#define WLAN_REASSOCREQ_OFF_CAP_INFO		0</div><div class='add'>+#define WLAN_REASSOCREQ_OFF_LISTEN_INT		2</div><div class='add'>+#define WLAN_REASSOCREQ_OFF_CURR_AP		4</div><div class='add'>+#define WLAN_REASSOCREQ_OFF_SSID		10</div><div class='add'>+</div><div class='add'>+#define WLAN_REASSOCRESP_OFF_CAP_INFO		0</div><div class='add'>+#define WLAN_REASSOCRESP_OFF_STATUS		2</div><div class='add'>+#define WLAN_REASSOCRESP_OFF_AID		4</div><div class='add'>+#define WLAN_REASSOCRESP_OFF_SUPP_RATES		6</div><div class='add'>+</div><div class='add'>+#define WLAN_PROBEREQ_OFF_SSID			0</div><div class='add'>+</div><div class='add'>+#define WLAN_PROBERESP_OFF_TS			0</div><div class='add'>+#define WLAN_PROBERESP_OFF_BCN_INT		8</div><div class='add'>+#define WLAN_PROBERESP_OFF_CAP_INFO		10</div><div class='add'>+#define WLAN_PROBERESP_OFF_SSID			12</div><div class='add'>+</div><div class='add'>+#define WLAN_AUTHEN_OFF_AUTH_ALG		0</div><div class='add'>+#define WLAN_AUTHEN_OFF_AUTH_SEQ		2</div><div class='add'>+#define WLAN_AUTHEN_OFF_STATUS			4</div><div class='add'>+#define WLAN_AUTHEN_OFF_CHALLENGE		6</div><div class='add'>+</div><div class='add'>+#define WLAN_DEAUTHEN_OFF_REASON		0</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Macros */</div><div class='add'>+</div><div class='add'>+/*-- Capability Field ---------------------------*/</div><div class='add'>+#define WLAN_GET_MGMT_CAP_INFO_ESS(n)		((n) &amp; BIT0)</div><div class='add'>+#define WLAN_GET_MGMT_CAP_INFO_IBSS(n)		(((n) &amp; BIT1) &gt;&gt; 1)</div><div class='add'>+#define WLAN_GET_MGMT_CAP_INFO_CFPOLLABLE(n)	(((n) &amp; BIT2) &gt;&gt; 2)</div><div class='add'>+#define WLAN_GET_MGMT_CAP_INFO_CFPOLLREQ(n)	(((n) &amp; BIT3) &gt;&gt; 3)</div><div class='add'>+#define WLAN_GET_MGMT_CAP_INFO_PRIVACY(n)	(((n) &amp; BIT4) &gt;&gt; 4)</div><div class='add'>+  /* p80211b additions */</div><div class='add'>+#define WLAN_GET_MGMT_CAP_INFO_SHORT(n)		(((n) &amp; BIT5) &gt;&gt; 5)</div><div class='add'>+#define WLAN_GET_MGMT_CAP_INFO_PBCC(n)		(((n) &amp; BIT6) &gt;&gt; 6)</div><div class='add'>+#define WLAN_GET_MGMT_CAP_INFO_AGILITY(n)	(((n) &amp; BIT7) &gt;&gt; 7)</div><div class='add'>+</div><div class='add'>+#define WLAN_SET_MGMT_CAP_INFO_ESS(n)		(n)</div><div class='add'>+#define WLAN_SET_MGMT_CAP_INFO_IBSS(n)		((n) &lt;&lt; 1)</div><div class='add'>+#define WLAN_SET_MGMT_CAP_INFO_CFPOLLABLE(n)	((n) &lt;&lt; 2)</div><div class='add'>+#define WLAN_SET_MGMT_CAP_INFO_CFPOLLREQ(n)	((n) &lt;&lt; 3)</div><div class='add'>+#define WLAN_SET_MGMT_CAP_INFO_PRIVACY(n)	((n) &lt;&lt; 4)</div><div class='add'>+  /* p80211b additions */</div><div class='add'>+#define WLAN_SET_MGMT_CAP_INFO_SHORT(n)		((n) &lt;&lt; 5)</div><div class='add'>+#define WLAN_SET_MGMT_CAP_INFO_PBCC(n)		((n) &lt;&lt; 6)</div><div class='add'>+#define WLAN_SET_MGMT_CAP_INFO_AGILITY(n)	((n) &lt;&lt; 7)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Types */</div><div class='add'>+</div><div class='add'>+/*-- Information Element Types --------------------*/</div><div class='add'>+/* prototype structure, all IEs start with these members */</div><div class='add'>+</div><div class='add'>+typedef struct wlan_ie</div><div class='add'>+{</div><div class='add'>+	UINT8	eid;</div><div class='add'>+	UINT8	len;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ wlan_ie_t;</div><div class='add'>+</div><div class='add'>+/*-- Service Set Identity (SSID)  -----------------*/</div><div class='add'>+typedef struct wlan_ie_ssid</div><div class='add'>+{</div><div class='add'>+	UINT8	eid;</div><div class='add'>+	UINT8	len;</div><div class='add'>+	UINT8	ssid[1];  /* may be zero, ptrs may overlap */</div><div class='add'>+} __WLAN_ATTRIB_PACK__ wlan_ie_ssid_t;</div><div class='add'>+</div><div class='add'>+/*-- Supported Rates  -----------------------------*/</div><div class='add'>+typedef struct wlan_ie_supp_rates</div><div class='add'>+{</div><div class='add'>+	UINT8	eid;</div><div class='add'>+	UINT8	len;</div><div class='add'>+	UINT8	rates[1];  /* had better be at LEAST one! */</div><div class='add'>+} __WLAN_ATTRIB_PACK__ wlan_ie_supp_rates_t;</div><div class='add'>+</div><div class='add'>+/*-- FH Parameter Set  ----------------------------*/</div><div class='add'>+typedef struct wlan_ie_fh_parms</div><div class='add'>+{</div><div class='add'>+	UINT8	eid;</div><div class='add'>+	UINT8	len;</div><div class='add'>+	UINT16	dwell;</div><div class='add'>+	UINT8	hopset;</div><div class='add'>+	UINT8	hoppattern;</div><div class='add'>+	UINT8	hopindex;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ wlan_ie_fh_parms_t;</div><div class='add'>+</div><div class='add'>+/*-- DS Parameter Set  ----------------------------*/</div><div class='add'>+typedef struct wlan_ie_ds_parms</div><div class='add'>+{</div><div class='add'>+	UINT8	eid;</div><div class='add'>+	UINT8	len;</div><div class='add'>+	UINT8	curr_ch;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ wlan_ie_ds_parms_t;</div><div class='add'>+</div><div class='add'>+/*-- CF Parameter Set  ----------------------------*/</div><div class='add'>+</div><div class='add'>+typedef struct wlan_ie_cf_parms</div><div class='add'>+{</div><div class='add'>+	UINT8	eid;</div><div class='add'>+	UINT8	len;</div><div class='add'>+	UINT8	cfp_cnt;</div><div class='add'>+	UINT8	cfp_period;</div><div class='add'>+	UINT16	cfp_maxdur;</div><div class='add'>+	UINT16	cfp_durremaining;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ wlan_ie_cf_parms_t;</div><div class='add'>+</div><div class='add'>+/*-- TIM ------------------------------------------*/</div><div class='add'>+typedef struct wlan_ie_tim</div><div class='add'>+{</div><div class='add'>+	UINT8	eid;</div><div class='add'>+	UINT8	len;</div><div class='add'>+	UINT8	dtim_cnt;</div><div class='add'>+	UINT8	dtim_period;</div><div class='add'>+	UINT8	bitmap_ctl;</div><div class='add'>+	UINT8	virt_bm[1];</div><div class='add'>+} __WLAN_ATTRIB_PACK__ wlan_ie_tim_t;</div><div class='add'>+</div><div class='add'>+/*-- IBSS Parameter Set ---------------------------*/</div><div class='add'>+typedef struct wlan_ie_ibss_parms</div><div class='add'>+{</div><div class='add'>+	UINT8	eid;</div><div class='add'>+	UINT8	len;</div><div class='add'>+	UINT16	atim_win;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ wlan_ie_ibss_parms_t;</div><div class='add'>+</div><div class='add'>+/*-- Challenge Text  ------------------------------*/</div><div class='add'>+typedef struct wlan_ie_challenge</div><div class='add'>+{</div><div class='add'>+	UINT8	eid;</div><div class='add'>+	UINT8	len;</div><div class='add'>+	UINT8	challenge[1];</div><div class='add'>+} __WLAN_ATTRIB_PACK__ wlan_ie_challenge_t;</div><div class='add'>+</div><div class='add'>+/*-------------------------------------------------*/</div><div class='add'>+/*  Frame Types  */</div><div class='add'>+</div><div class='add'>+/* prototype structure, all mgmt frame types will start with these members */</div><div class='add'>+typedef struct wlan_fr_mgmt</div><div class='add'>+{</div><div class='add'>+	UINT16			type;</div><div class='add'>+	UINT16			len;	/* DOES NOT include CRC !!!!*/</div><div class='add'>+	UINT8			*buf;</div><div class='add'>+	p80211_hdr_t		*hdr;</div><div class='add'>+	/* used for target specific data, skb in Linux */</div><div class='add'>+	void			*priv;</div><div class='add'>+	/*-- fixed fields -----------*/</div><div class='add'>+	/*-- info elements ----------*/</div><div class='add'>+} wlan_fr_mgmt_t;</div><div class='add'>+</div><div class='add'>+/*-- Beacon ---------------------------------------*/</div><div class='add'>+typedef struct wlan_fr_beacon</div><div class='add'>+{</div><div class='add'>+	UINT16			type;</div><div class='add'>+	UINT16			len;</div><div class='add'>+	UINT8			*buf;</div><div class='add'>+	p80211_hdr_t		*hdr;</div><div class='add'>+	/* used for target specific data, skb in Linux */</div><div class='add'>+	void			*priv;</div><div class='add'>+	/*-- fixed fields -----------*/</div><div class='add'>+	UINT64			*ts;</div><div class='add'>+	UINT16			*bcn_int;</div><div class='add'>+	UINT16			*cap_info;</div><div class='add'>+	/*-- info elements ----------*/</div><div class='add'>+	wlan_ie_ssid_t		*ssid;</div><div class='add'>+	wlan_ie_supp_rates_t	*supp_rates;</div><div class='add'>+	wlan_ie_fh_parms_t	*fh_parms;</div><div class='add'>+	wlan_ie_ds_parms_t	*ds_parms;</div><div class='add'>+	wlan_ie_cf_parms_t	*cf_parms;</div><div class='add'>+	wlan_ie_ibss_parms_t	*ibss_parms;</div><div class='add'>+	wlan_ie_tim_t		*tim;</div><div class='add'>+</div><div class='add'>+} wlan_fr_beacon_t;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*-- IBSS ATIM ------------------------------------*/</div><div class='add'>+typedef struct wlan_fr_ibssatim</div><div class='add'>+{</div><div class='add'>+	UINT16			type;</div><div class='add'>+	UINT16			len;</div><div class='add'>+	UINT8*			buf;</div><div class='add'>+	p80211_hdr_t		*hdr;</div><div class='add'>+	/* used for target specific data, skb in Linux */</div><div class='add'>+	void			*priv;</div><div class='add'>+</div><div class='add'>+	/*-- fixed fields -----------*/</div><div class='add'>+	/*-- info elements ----------*/</div><div class='add'>+</div><div class='add'>+	/* this frame type has a null body */</div><div class='add'>+</div><div class='add'>+} wlan_fr_ibssatim_t;</div><div class='add'>+</div><div class='add'>+/*-- Disassociation -------------------------------*/</div><div class='add'>+typedef struct wlan_fr_disassoc</div><div class='add'>+{</div><div class='add'>+	UINT16			type;</div><div class='add'>+	UINT16			len;</div><div class='add'>+	UINT8			*buf;</div><div class='add'>+	p80211_hdr_t		*hdr;</div><div class='add'>+	/* used for target specific data, skb in Linux */</div><div class='add'>+	void			*priv;</div><div class='add'>+	/*-- fixed fields -----------*/</div><div class='add'>+	UINT16			*reason;</div><div class='add'>+</div><div class='add'>+	/*-- info elements ----------*/</div><div class='add'>+</div><div class='add'>+} wlan_fr_disassoc_t;</div><div class='add'>+</div><div class='add'>+/*-- Association Request --------------------------*/</div><div class='add'>+typedef struct wlan_fr_assocreq</div><div class='add'>+{</div><div class='add'>+	UINT16			type;</div><div class='add'>+	UINT16			len;</div><div class='add'>+	UINT8*			buf;</div><div class='add'>+	p80211_hdr_t		*hdr;</div><div class='add'>+	/* used for target specific data, skb in Linux */</div><div class='add'>+	void			*priv;</div><div class='add'>+	/*-- fixed fields -----------*/</div><div class='add'>+	UINT16			*cap_info;</div><div class='add'>+	UINT16			*listen_int;</div><div class='add'>+	/*-- info elements ----------*/</div><div class='add'>+	wlan_ie_ssid_t		*ssid;</div><div class='add'>+	wlan_ie_supp_rates_t	*supp_rates;</div><div class='add'>+</div><div class='add'>+} wlan_fr_assocreq_t;</div><div class='add'>+</div><div class='add'>+/*-- Association Response -------------------------*/</div><div class='add'>+typedef struct wlan_fr_assocresp</div><div class='add'>+{</div><div class='add'>+	UINT16			type;</div><div class='add'>+	UINT16			len;</div><div class='add'>+	UINT8			*buf;</div><div class='add'>+	p80211_hdr_t		*hdr;</div><div class='add'>+	/* used for target specific data, skb in Linux */</div><div class='add'>+	void			*priv;</div><div class='add'>+	/*-- fixed fields -----------*/</div><div class='add'>+	UINT16			*cap_info;</div><div class='add'>+	UINT16			*status;</div><div class='add'>+	UINT16			*aid;</div><div class='add'>+	/*-- info elements ----------*/</div><div class='add'>+	wlan_ie_supp_rates_t	*supp_rates;</div><div class='add'>+</div><div class='add'>+} wlan_fr_assocresp_t;</div><div class='add'>+</div><div class='add'>+/*-- Reassociation Request ------------------------*/</div><div class='add'>+typedef struct wlan_fr_reassocreq</div><div class='add'>+{</div><div class='add'>+	UINT16			type;</div><div class='add'>+	UINT16			len;</div><div class='add'>+	UINT8			*buf;</div><div class='add'>+	p80211_hdr_t		*hdr;</div><div class='add'>+	/* used for target specific data, skb in Linux */</div><div class='add'>+	void			*priv;</div><div class='add'>+	/*-- fixed fields -----------*/</div><div class='add'>+	UINT16			*cap_info;</div><div class='add'>+	UINT16			*listen_int;</div><div class='add'>+	UINT8			*curr_ap;</div><div class='add'>+	/*-- info elements ----------*/</div><div class='add'>+	wlan_ie_ssid_t		*ssid;</div><div class='add'>+	wlan_ie_supp_rates_t	*supp_rates;</div><div class='add'>+</div><div class='add'>+} wlan_fr_reassocreq_t;</div><div class='add'>+</div><div class='add'>+/*-- Reassociation Response -----------------------*/</div><div class='add'>+typedef struct wlan_fr_reassocresp</div><div class='add'>+{</div><div class='add'>+	UINT16			type;</div><div class='add'>+	UINT16			len;</div><div class='add'>+	UINT8			*buf;</div><div class='add'>+	p80211_hdr_t		*hdr;</div><div class='add'>+	/* used for target specific data, skb in Linux */</div><div class='add'>+	void			*priv;</div><div class='add'>+	/*-- fixed fields -----------*/</div><div class='add'>+	UINT16			*cap_info;</div><div class='add'>+	UINT16			*status;</div><div class='add'>+	UINT16			*aid;</div><div class='add'>+	/*-- info elements ----------*/</div><div class='add'>+	wlan_ie_supp_rates_t	*supp_rates;</div><div class='add'>+</div><div class='add'>+} wlan_fr_reassocresp_t;</div><div class='add'>+</div><div class='add'>+/*-- Probe Request --------------------------------*/</div><div class='add'>+typedef struct wlan_fr_probereq</div><div class='add'>+{</div><div class='add'>+	UINT16			type;</div><div class='add'>+	UINT16			len;</div><div class='add'>+	UINT8			*buf;</div><div class='add'>+	p80211_hdr_t		*hdr;</div><div class='add'>+	/* used for target specific data, skb in Linux */</div><div class='add'>+	void			*priv;</div><div class='add'>+	/*-- fixed fields -----------*/</div><div class='add'>+	/*-- info elements ----------*/</div><div class='add'>+	wlan_ie_ssid_t		*ssid;</div><div class='add'>+	wlan_ie_supp_rates_t	*supp_rates;</div><div class='add'>+</div><div class='add'>+} wlan_fr_probereq_t;</div><div class='add'>+</div><div class='add'>+/*-- Probe Response -------------------------------*/</div><div class='add'>+typedef struct wlan_fr_proberesp</div><div class='add'>+{</div><div class='add'>+	UINT16			type;</div><div class='add'>+	UINT16			len;</div><div class='add'>+	UINT8			*buf;</div><div class='add'>+	p80211_hdr_t		*hdr;</div><div class='add'>+	/* used for target specific data, skb in Linux */</div><div class='add'>+	void			*priv;</div><div class='add'>+	/*-- fixed fields -----------*/</div><div class='add'>+	UINT64			*ts;</div><div class='add'>+	UINT16			*bcn_int;</div><div class='add'>+	UINT16			*cap_info;</div><div class='add'>+	/*-- info elements ----------*/</div><div class='add'>+	wlan_ie_ssid_t		*ssid;</div><div class='add'>+	wlan_ie_supp_rates_t	*supp_rates;</div><div class='add'>+	wlan_ie_fh_parms_t	*fh_parms;</div><div class='add'>+	wlan_ie_ds_parms_t	*ds_parms;</div><div class='add'>+	wlan_ie_cf_parms_t	*cf_parms;</div><div class='add'>+	wlan_ie_ibss_parms_t	*ibss_parms;</div><div class='add'>+} wlan_fr_proberesp_t;</div><div class='add'>+</div><div class='add'>+/*-- Authentication -------------------------------*/</div><div class='add'>+typedef struct wlan_fr_authen</div><div class='add'>+{</div><div class='add'>+	UINT16			type;</div><div class='add'>+	UINT16			len;</div><div class='add'>+	UINT8			*buf;</div><div class='add'>+	p80211_hdr_t		*hdr;</div><div class='add'>+	/* used for target specific data, skb in Linux */</div><div class='add'>+	void			*priv;</div><div class='add'>+	/*-- fixed fields -----------*/</div><div class='add'>+	UINT16			*auth_alg;</div><div class='add'>+	UINT16			*auth_seq;</div><div class='add'>+	UINT16			*status;</div><div class='add'>+	/*-- info elements ----------*/</div><div class='add'>+	wlan_ie_challenge_t	*challenge;</div><div class='add'>+</div><div class='add'>+} wlan_fr_authen_t;</div><div class='add'>+</div><div class='add'>+/*-- Deauthenication -----------------------------*/</div><div class='add'>+typedef struct wlan_fr_deauthen</div><div class='add'>+{</div><div class='add'>+	UINT16			type;</div><div class='add'>+	UINT16			len;</div><div class='add'>+	UINT8			*buf;</div><div class='add'>+	p80211_hdr_t		*hdr;</div><div class='add'>+	/* used for target specific data, skb in Linux */</div><div class='add'>+	void			*priv;</div><div class='add'>+	/*-- fixed fields -----------*/</div><div class='add'>+	UINT16			*reason;</div><div class='add'>+</div><div class='add'>+	/*-- info elements ----------*/</div><div class='add'>+</div><div class='add'>+} wlan_fr_deauthen_t;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Extern Declarations */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Function Declarations */</div><div class='add'>+</div><div class='add'>+void wlan_mgmt_encode_beacon( wlan_fr_beacon_t  *f );</div><div class='add'>+void wlan_mgmt_decode_beacon( wlan_fr_beacon_t  *f );</div><div class='add'>+void wlan_mgmt_encode_disassoc( wlan_fr_disassoc_t  *f );</div><div class='add'>+void wlan_mgmt_decode_disassoc( wlan_fr_disassoc_t  *f );</div><div class='add'>+void wlan_mgmt_encode_assocreq( wlan_fr_assocreq_t  *f );</div><div class='add'>+void wlan_mgmt_decode_assocreq( wlan_fr_assocreq_t  *f );</div><div class='add'>+void wlan_mgmt_encode_assocresp( wlan_fr_assocresp_t  *f );</div><div class='add'>+void wlan_mgmt_decode_assocresp( wlan_fr_assocresp_t  *f );</div><div class='add'>+void wlan_mgmt_encode_reassocreq( wlan_fr_reassocreq_t  *f );</div><div class='add'>+void wlan_mgmt_decode_reassocreq( wlan_fr_reassocreq_t  *f );</div><div class='add'>+void wlan_mgmt_encode_reassocresp( wlan_fr_reassocresp_t  *f );</div><div class='add'>+void wlan_mgmt_decode_reassocresp( wlan_fr_reassocresp_t  *f );</div><div class='add'>+void wlan_mgmt_encode_probereq( wlan_fr_probereq_t  *f );</div><div class='add'>+void wlan_mgmt_decode_probereq( wlan_fr_probereq_t  *f );</div><div class='add'>+void wlan_mgmt_encode_proberesp( wlan_fr_proberesp_t  *f );</div><div class='add'>+void wlan_mgmt_decode_proberesp( wlan_fr_proberesp_t  *f );</div><div class='add'>+void wlan_mgmt_encode_authen( wlan_fr_authen_t  *f );</div><div class='add'>+void wlan_mgmt_decode_authen( wlan_fr_authen_t  *f );</div><div class='add'>+void wlan_mgmt_encode_deauthen( wlan_fr_deauthen_t  *f );</div><div class='add'>+void wlan_mgmt_decode_deauthen( wlan_fr_deauthen_t  *f );</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#endif /* _P80211MGMT_H */</div><div class='head'>diff --git a/drivers/staging/wlan-ng/p80211mod.c b/drivers/staging/wlan-ng/p80211mod.c<br/>new file mode 100644<br/>index 000000000000..e2c3f63be8be<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/wlan-ng/p80211mod.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/wlan-ng/p80211mod.c</a></div><div class='hunk'>@@ -0,0 +1,216 @@</div><div class='add'>+/* src/p80211/p80211mod.c</div><div class='add'>+*</div><div class='add'>+* Module entry and exit for p80211</div><div class='add'>+*</div><div class='add'>+* Copyright (C) 1999 AbsoluteValue Systems, Inc.  All Rights Reserved.</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* linux-wlan</div><div class='add'>+*</div><div class='add'>+*   The contents of this file are subject to the Mozilla Public</div><div class='add'>+*   License Version 1.1 (the "License"); you may not use this file</div><div class='add'>+*   except in compliance with the License. You may obtain a copy of</div><div class='add'>+*   the License at http://www.mozilla.org/MPL/</div><div class='add'>+*</div><div class='add'>+*   Software distributed under the License is distributed on an "AS</div><div class='add'>+*   IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or</div><div class='add'>+*   implied. See the License for the specific language governing</div><div class='add'>+*   rights and limitations under the License.</div><div class='add'>+*</div><div class='add'>+*   Alternatively, the contents of this file may be used under the</div><div class='add'>+*   terms of the GNU Public License version 2 (the "GPL"), in which</div><div class='add'>+*   case the provisions of the GPL are applicable instead of the</div><div class='add'>+*   above.  If you wish to allow the use of your version of this file</div><div class='add'>+*   only under the terms of the GPL and not to allow others to use</div><div class='add'>+*   your version of this file under the MPL, indicate your decision</div><div class='add'>+*   by deleting the provisions above and replace them with the notice</div><div class='add'>+*   and other provisions required by the GPL.  If you do not delete</div><div class='add'>+*   the provisions above, a recipient may use your version of this</div><div class='add'>+*   file under either the MPL or the GPL.</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* Inquiries regarding the linux-wlan Open Source project can be</div><div class='add'>+* made directly to:</div><div class='add'>+*</div><div class='add'>+* AbsoluteValue Systems Inc.</div><div class='add'>+* info@linux-wlan.com</div><div class='add'>+* http://www.linux-wlan.com</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* Portions of the development of this software were funded by</div><div class='add'>+* Intersil Corporation as part of PRISM(R) chipset product development.</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* This file contains the p80211.o entry and exit points defined for linux</div><div class='add'>+* kernel modules.</div><div class='add'>+*</div><div class='add'>+* Notes:</div><div class='add'>+* - all module parameters for  p80211.o should be defined here.</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* System Includes */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#include &lt;linux/version.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#if (LINUX_VERSION_CODE &gt;= KERNEL_VERSION(2,4,25))</div><div class='add'>+#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/wireless.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+</div><div class='add'>+#include "version.h"</div><div class='add'>+#include "wlan_compat.h"</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Project Includes */</div><div class='add'>+</div><div class='add'>+#include "p80211types.h"</div><div class='add'>+#include "p80211hdr.h"</div><div class='add'>+#include "p80211mgmt.h"</div><div class='add'>+#include "p80211conv.h"</div><div class='add'>+#include "p80211msg.h"</div><div class='add'>+#include "p80211netdev.h"</div><div class='add'>+#include "p80211req.h"</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Local Constants */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Local Macros */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Local Types */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Local Static Definitions */</div><div class='add'>+</div><div class='add'>+static char *version = "p80211.o: " WLAN_RELEASE;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------*/</div><div class='add'>+/* --Module Parameters */</div><div class='add'>+</div><div class='add'>+int wlan_watchdog = 5000;</div><div class='add'>+module_param(wlan_watchdog, int, 0644);</div><div class='add'>+MODULE_PARM_DESC(wlan_watchdog, "transmit timeout in milliseconds");</div><div class='add'>+</div><div class='add'>+int wlan_wext_write = 0;</div><div class='add'>+#if WIRELESS_EXT &gt; 12</div><div class='add'>+module_param(wlan_wext_write, int, 0644);</div><div class='add'>+MODULE_PARM_DESC(wlan_wext_write, "enable write wireless extensions");</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef WLAN_INCLUDE_DEBUG</div><div class='add'>+int wlan_debug=0;</div><div class='add'>+module_param(wlan_debug, int, 0644);</div><div class='add'>+MODULE_PARM_DESC(wlan_debug, "p80211 debug level");</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("Dual MPL/GPL");</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Local Function Declarations */</div><div class='add'>+</div><div class='add'>+int	init_module(void);</div><div class='add'>+void	cleanup_module(void);</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Function Definitions */</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* init_module</div><div class='add'>+*</div><div class='add'>+* Module initialization routine, called once at module load time.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	none</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0	- success</div><div class='add'>+*	~0	- failure, module is unloaded.</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*	TODO: define</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread (insmod or modprobe)</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int init_module(void)</div><div class='add'>+{</div><div class='add'>+        DBFENTER;</div><div class='add'>+</div><div class='add'>+#if 0</div><div class='add'>+        printk(KERN_NOTICE "%s (%s) Loaded\n", version, WLAN_BUILD_DATE);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	p80211netdev_startup();</div><div class='add'>+#ifdef CONFIG_HOTPLUG</div><div class='add'>+	p80211_run_sbin_hotplug(NULL, WLAN_HOTPLUG_STARTUP);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+        DBFEXIT;</div><div class='add'>+        return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* cleanup_module</div><div class='add'>+*</div><div class='add'>+* Called at module unload time.  This is our last chance to</div><div class='add'>+* clean up after ourselves.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	none</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	nothing</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*	TODO: define</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread</div><div class='add'>+*</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+void cleanup_module(void)</div><div class='add'>+{</div><div class='add'>+        DBFENTER;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_HOTPLUG</div><div class='add'>+	p80211_run_sbin_hotplug(NULL, WLAN_HOTPLUG_SHUTDOWN);</div><div class='add'>+#endif</div><div class='add'>+	p80211netdev_shutdown();</div><div class='add'>+        printk(KERN_NOTICE "%s Unloaded\n", version);</div><div class='add'>+</div><div class='add'>+        DBFEXIT;</div><div class='add'>+        return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL(p80211netdev_hwremoved);</div><div class='add'>+EXPORT_SYMBOL(register_wlandev);</div><div class='add'>+EXPORT_SYMBOL(p80211netdev_rx);</div><div class='add'>+EXPORT_SYMBOL(unregister_wlandev);</div><div class='add'>+EXPORT_SYMBOL(wlan_setup);</div><div class='add'>+EXPORT_SYMBOL(wlan_unsetup);</div><div class='add'>+EXPORT_SYMBOL(p80211_suspend);</div><div class='add'>+EXPORT_SYMBOL(p80211_resume);</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL(p80211skb_free);</div><div class='add'>+EXPORT_SYMBOL(p80211skb_rxmeta_attach);</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL(p80211wext_event_associated);</div><div class='head'>diff --git a/drivers/staging/wlan-ng/p80211msg.h b/drivers/staging/wlan-ng/p80211msg.h<br/>new file mode 100644<br/>index 000000000000..c14e9fbbd687<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/wlan-ng/p80211msg.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/wlan-ng/p80211msg.h</a></div><div class='hunk'>@@ -0,0 +1,102 @@</div><div class='add'>+/* p80211msg.h</div><div class='add'>+*</div><div class='add'>+* Macros, constants, types, and funcs for req and ind messages</div><div class='add'>+*</div><div class='add'>+* Copyright (C) 1999 AbsoluteValue Systems, Inc.  All Rights Reserved.</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* linux-wlan</div><div class='add'>+*</div><div class='add'>+*   The contents of this file are subject to the Mozilla Public</div><div class='add'>+*   License Version 1.1 (the "License"); you may not use this file</div><div class='add'>+*   except in compliance with the License. You may obtain a copy of</div><div class='add'>+*   the License at http://www.mozilla.org/MPL/</div><div class='add'>+*</div><div class='add'>+*   Software distributed under the License is distributed on an "AS</div><div class='add'>+*   IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or</div><div class='add'>+*   implied. See the License for the specific language governing</div><div class='add'>+*   rights and limitations under the License.</div><div class='add'>+*</div><div class='add'>+*   Alternatively, the contents of this file may be used under the</div><div class='add'>+*   terms of the GNU Public License version 2 (the "GPL"), in which</div><div class='add'>+*   case the provisions of the GPL are applicable instead of the</div><div class='add'>+*   above.  If you wish to allow the use of your version of this file</div><div class='add'>+*   only under the terms of the GPL and not to allow others to use</div><div class='add'>+*   your version of this file under the MPL, indicate your decision</div><div class='add'>+*   by deleting the provisions above and replace them with the notice</div><div class='add'>+*   and other provisions required by the GPL.  If you do not delete</div><div class='add'>+*   the provisions above, a recipient may use your version of this</div><div class='add'>+*   file under either the MPL or the GPL.</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* Inquiries regarding the linux-wlan Open Source project can be</div><div class='add'>+* made directly to:</div><div class='add'>+*</div><div class='add'>+* AbsoluteValue Systems Inc.</div><div class='add'>+* info@linux-wlan.com</div><div class='add'>+* http://www.linux-wlan.com</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* Portions of the development of this software were funded by</div><div class='add'>+* Intersil Corporation as part of PRISM(R) chipset product development.</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#ifndef _P80211MSG_H</div><div class='add'>+#define _P80211MSG_H</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* System Includes */</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Project Includes */</div><div class='add'>+</div><div class='add'>+#ifndef _WLAN_COMPAT_H</div><div class='add'>+#include "wlan_compat.h"</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Constants */</div><div class='add'>+</div><div class='add'>+#define MSG_BUFF_LEN		4000</div><div class='add'>+#define WLAN_DEVNAMELEN_MAX	16</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Macros */</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Types */</div><div class='add'>+</div><div class='add'>+/*--------------------------------------------------------------------*/</div><div class='add'>+/*----- Message Structure Types --------------------------------------*/</div><div class='add'>+</div><div class='add'>+/*--------------------------------------------------------------------*/</div><div class='add'>+/* Prototype msg type */</div><div class='add'>+</div><div class='add'>+typedef struct p80211msg</div><div class='add'>+{</div><div class='add'>+	UINT32	msgcode;</div><div class='add'>+	UINT32	msglen;</div><div class='add'>+	UINT8	devname[WLAN_DEVNAMELEN_MAX];</div><div class='add'>+} __WLAN_ATTRIB_PACK__ p80211msg_t;</div><div class='add'>+</div><div class='add'>+typedef struct p80211msgd</div><div class='add'>+{</div><div class='add'>+	UINT32	msgcode;</div><div class='add'>+	UINT32	msglen;</div><div class='add'>+	UINT8	devname[WLAN_DEVNAMELEN_MAX];</div><div class='add'>+	UINT8	args[0];</div><div class='add'>+} __WLAN_ATTRIB_PACK__ p80211msgd_t;</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Extern Declarations */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Function Declarations */</div><div class='add'>+</div><div class='add'>+#endif  /* _P80211MSG_H */</div><div class='add'>+</div><div class='head'>diff --git a/drivers/staging/wlan-ng/p80211netdev.c b/drivers/staging/wlan-ng/p80211netdev.c<br/>new file mode 100644<br/>index 000000000000..11f84a829e14<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/wlan-ng/p80211netdev.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/wlan-ng/p80211netdev.c</a></div><div class='hunk'>@@ -0,0 +1,1502 @@</div><div class='add'>+/* src/p80211/p80211knetdev.c</div><div class='add'>+*</div><div class='add'>+* Linux Kernel net device interface</div><div class='add'>+*</div><div class='add'>+* Copyright (C) 1999 AbsoluteValue Systems, Inc.  All Rights Reserved.</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* linux-wlan</div><div class='add'>+*</div><div class='add'>+*   The contents of this file are subject to the Mozilla Public</div><div class='add'>+*   License Version 1.1 (the "License"); you may not use this file</div><div class='add'>+*   except in compliance with the License. You may obtain a copy of</div><div class='add'>+*   the License at http://www.mozilla.org/MPL/</div><div class='add'>+*</div><div class='add'>+*   Software distributed under the License is distributed on an "AS</div><div class='add'>+*   IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or</div><div class='add'>+*   implied. See the License for the specific language governing</div><div class='add'>+*   rights and limitations under the License.</div><div class='add'>+*</div><div class='add'>+*   Alternatively, the contents of this file may be used under the</div><div class='add'>+*   terms of the GNU Public License version 2 (the "GPL"), in which</div><div class='add'>+*   case the provisions of the GPL are applicable instead of the</div><div class='add'>+*   above.  If you wish to allow the use of your version of this file</div><div class='add'>+*   only under the terms of the GPL and not to allow others to use</div><div class='add'>+*   your version of this file under the MPL, indicate your decision</div><div class='add'>+*   by deleting the provisions above and replace them with the notice</div><div class='add'>+*   and other provisions required by the GPL.  If you do not delete</div><div class='add'>+*   the provisions above, a recipient may use your version of this</div><div class='add'>+*   file under either the MPL or the GPL.</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* Inquiries regarding the linux-wlan Open Source project can be</div><div class='add'>+* made directly to:</div><div class='add'>+*</div><div class='add'>+* AbsoluteValue Systems Inc.</div><div class='add'>+* info@linux-wlan.com</div><div class='add'>+* http://www.linux-wlan.com</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* Portions of the development of this software were funded by</div><div class='add'>+* Intersil Corporation as part of PRISM(R) chipset product development.</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* The functions required for a Linux network device are defined here.</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* System Includes */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#include &lt;linux/version.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/proc_fs.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/kmod.h&gt;</div><div class='add'>+#include &lt;linux/if_arp.h&gt;</div><div class='add'>+#include &lt;linux/wireless.h&gt;</div><div class='add'>+#include &lt;linux/sockios.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/bitops.h&gt;</div><div class='add'>+#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;asm/byteorder.h&gt;</div><div class='add'>+</div><div class='add'>+#ifdef SIOCETHTOOL</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if WIRELESS_EXT &gt; 12</div><div class='add'>+#include &lt;net/iw_handler.h&gt;</div><div class='add'>+#endif</div><div class='add'>+#include &lt;net/net_namespace.h&gt;</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Project Includes */</div><div class='add'>+</div><div class='add'>+#include "version.h"</div><div class='add'>+#include "wlan_compat.h"</div><div class='add'>+#include "p80211types.h"</div><div class='add'>+#include "p80211hdr.h"</div><div class='add'>+#include "p80211conv.h"</div><div class='add'>+#include "p80211mgmt.h"</div><div class='add'>+#include "p80211msg.h"</div><div class='add'>+#include "p80211netdev.h"</div><div class='add'>+#include "p80211ioctl.h"</div><div class='add'>+#include "p80211req.h"</div><div class='add'>+#include "p80211metastruct.h"</div><div class='add'>+#include "p80211metadef.h"</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Local Constants */</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Local Macros */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Local Types */</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Local Static Definitions */</div><div class='add'>+</div><div class='add'>+#define __NO_VERSION__		/* prevent the static definition */</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PROC_FS</div><div class='add'>+static struct proc_dir_entry	*proc_p80211;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Local Function Declarations */</div><div class='add'>+</div><div class='add'>+/* Support functions */</div><div class='add'>+static void p80211netdev_rx_bh(unsigned long arg);</div><div class='add'>+</div><div class='add'>+/* netdevice method functions */</div><div class='add'>+static int p80211knetdev_init( netdevice_t *netdev);</div><div class='add'>+static struct net_device_stats* p80211knetdev_get_stats(netdevice_t *netdev);</div><div class='add'>+static int p80211knetdev_open( netdevice_t *netdev);</div><div class='add'>+static int p80211knetdev_stop( netdevice_t *netdev );</div><div class='add'>+static int p80211knetdev_hard_start_xmit( struct sk_buff *skb, netdevice_t *netdev);</div><div class='add'>+static void p80211knetdev_set_multicast_list(netdevice_t *dev);</div><div class='add'>+static int p80211knetdev_do_ioctl(netdevice_t *dev, struct ifreq *ifr, int cmd);</div><div class='add'>+static int p80211knetdev_set_mac_address(netdevice_t *dev, void *addr);</div><div class='add'>+static void p80211knetdev_tx_timeout(netdevice_t *netdev);</div><div class='add'>+static int p80211_rx_typedrop( wlandevice_t *wlandev, UINT16 fc);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PROC_FS</div><div class='add'>+static int</div><div class='add'>+p80211netdev_proc_read(</div><div class='add'>+	char	*page,</div><div class='add'>+	char	**start,</div><div class='add'>+	off_t	offset,</div><div class='add'>+	int	count,</div><div class='add'>+	int	*eof,</div><div class='add'>+	void	*data);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Function Definitions */</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* p80211knetdev_startup</div><div class='add'>+*</div><div class='add'>+* Initialize the wlandevice/netdevice part of 802.11 services at</div><div class='add'>+* load time.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	none</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	nothing</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+void p80211netdev_startup(void)</div><div class='add'>+{</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PROC_FS</div><div class='add'>+	if (init_net.proc_net != NULL) {</div><div class='add'>+		proc_p80211 = create_proc_entry(</div><div class='add'>+				"p80211",</div><div class='add'>+				(S_IFDIR|S_IRUGO|S_IXUGO),</div><div class='add'>+				init_net.proc_net);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* p80211knetdev_shutdown</div><div class='add'>+*</div><div class='add'>+* Shutdown the wlandevice/netdevice part of 802.11 services at</div><div class='add'>+* unload time.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	none</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	nothing</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+void</div><div class='add'>+p80211netdev_shutdown(void)</div><div class='add'>+{</div><div class='add'>+	DBFENTER;</div><div class='add'>+#ifdef CONFIG_PROC_FS</div><div class='add'>+	if (proc_p80211 != NULL) {</div><div class='add'>+		remove_proc_entry("p80211", init_net.proc_net);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	DBFEXIT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* p80211knetdev_init</div><div class='add'>+*</div><div class='add'>+* Init method for a Linux netdevice.  Called in response to</div><div class='add'>+* register_netdev.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	none</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	nothing</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+static int p80211knetdev_init( netdevice_t *netdev)</div><div class='add'>+{</div><div class='add'>+	DBFENTER;</div><div class='add'>+	/* Called in response to register_netdev */</div><div class='add'>+	/* This is usually the probe function, but the probe has */</div><div class='add'>+	/* already been done by the MSD and the create_kdev */</div><div class='add'>+	/* function.  All we do here is return success */</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* p80211knetdev_get_stats</div><div class='add'>+*</div><div class='add'>+* Statistics retrieval for linux netdevices.  Here we're reporting</div><div class='add'>+* the Linux i/f level statistics.  Hence, for the primary numbers,</div><div class='add'>+* we don't want to report the numbers from the MIB.  Eventually,</div><div class='add'>+* it might be useful to collect some of the error counters though.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	netdev		Linux netdevice</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	the address of the statistics structure</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+static struct net_device_stats*</div><div class='add'>+p80211knetdev_get_stats(netdevice_t *netdev)</div><div class='add'>+{</div><div class='add'>+	wlandevice_t	*wlandev = (wlandevice_t*)netdev-&gt;priv;</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	/* TODO: review the MIB stats for items that correspond to</div><div class='add'>+		linux stats */</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return &amp;(wlandev-&gt;linux_stats);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* p80211knetdev_open</div><div class='add'>+*</div><div class='add'>+* Linux netdevice open method.  Following a successful call here,</div><div class='add'>+* the device is supposed to be ready for tx and rx.  In our</div><div class='add'>+* situation that may not be entirely true due to the state of the</div><div class='add'>+* MAC below.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	netdev		Linux network device structure</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	zero on success, non-zero otherwise</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+static int p80211knetdev_open( netdevice_t *netdev )</div><div class='add'>+{</div><div class='add'>+	int 		result = 0; /* success */</div><div class='add'>+	wlandevice_t	*wlandev = (wlandevice_t*)(netdev-&gt;priv);</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	/* Check to make sure the MSD is running */</div><div class='add'>+	if ( wlandev-&gt;msdstate != WLAN_MSD_RUNNING ) {</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Tell the MSD to open */</div><div class='add'>+	if ( wlandev-&gt;open != NULL) {</div><div class='add'>+		result = wlandev-&gt;open(wlandev);</div><div class='add'>+		if ( result == 0 ) {</div><div class='add'>+#if ( LINUX_VERSION_CODE &lt; KERNEL_VERSION(2,3,43) )</div><div class='add'>+			netdev-&gt;interrupt = 0;</div><div class='add'>+#endif</div><div class='add'>+			p80211netdev_start_queue(wlandev);</div><div class='add'>+			wlandev-&gt;state = WLAN_DEVICE_OPEN;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		result = -EAGAIN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* p80211knetdev_stop</div><div class='add'>+*</div><div class='add'>+* Linux netdevice stop (close) method.  Following this call,</div><div class='add'>+* no frames should go up or down through this interface.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	netdev		Linux network device structure</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	zero on success, non-zero otherwise</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+static int p80211knetdev_stop( netdevice_t *netdev )</div><div class='add'>+{</div><div class='add'>+	int		result = 0;</div><div class='add'>+	wlandevice_t	*wlandev = (wlandevice_t*)(netdev-&gt;priv);</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	if ( wlandev-&gt;close != NULL ) {</div><div class='add'>+		result = wlandev-&gt;close(wlandev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	p80211netdev_stop_queue(wlandev);</div><div class='add'>+	wlandev-&gt;state = WLAN_DEVICE_CLOSED;</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* p80211netdev_rx</div><div class='add'>+*</div><div class='add'>+* Frame receive function called by the mac specific driver.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		WLAN network device structure</div><div class='add'>+*	skb		skbuff containing a full 802.11 frame.</div><div class='add'>+* Returns:</div><div class='add'>+*	nothing</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+void</div><div class='add'>+p80211netdev_rx(wlandevice_t *wlandev, struct sk_buff *skb )</div><div class='add'>+{</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	/* Enqueue for post-irq processing */</div><div class='add'>+	skb_queue_tail(&amp;wlandev-&gt;nsd_rxq, skb);</div><div class='add'>+</div><div class='add'>+	tasklet_schedule(&amp;wlandev-&gt;rx_bh);</div><div class='add'>+</div><div class='add'>+        DBFEXIT;</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* p80211netdev_rx_bh</div><div class='add'>+*</div><div class='add'>+* Deferred processing of all received frames.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		WLAN network device structure</div><div class='add'>+*	skb		skbuff containing a full 802.11 frame.</div><div class='add'>+* Returns:</div><div class='add'>+*	nothing</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+static void p80211netdev_rx_bh(unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	wlandevice_t *wlandev = (wlandevice_t *) arg;</div><div class='add'>+	struct sk_buff *skb = NULL;</div><div class='add'>+	netdevice_t     *dev = wlandev-&gt;netdev;</div><div class='add'>+	p80211_hdr_a3_t *hdr;</div><div class='add'>+	UINT16 fc;</div><div class='add'>+</div><div class='add'>+        DBFENTER;</div><div class='add'>+</div><div class='add'>+	/* Let's empty our our queue */</div><div class='add'>+	while ( (skb = skb_dequeue(&amp;wlandev-&gt;nsd_rxq)) ) {</div><div class='add'>+		if (wlandev-&gt;state == WLAN_DEVICE_OPEN) {</div><div class='add'>+</div><div class='add'>+			if (dev-&gt;type != ARPHRD_ETHER) {</div><div class='add'>+				/* RAW frame; we shouldn't convert it */</div><div class='add'>+				// XXX Append the Prism Header here instead.</div><div class='add'>+</div><div class='add'>+				/* set up various data fields */</div><div class='add'>+				skb-&gt;dev = dev;</div><div class='add'>+				skb_reset_mac_header(skb);</div><div class='add'>+				skb-&gt;ip_summed = CHECKSUM_NONE;</div><div class='add'>+				skb-&gt;pkt_type = PACKET_OTHERHOST;</div><div class='add'>+				skb-&gt;protocol = htons(ETH_P_80211_RAW);</div><div class='add'>+				dev-&gt;last_rx = jiffies;</div><div class='add'>+</div><div class='add'>+				wlandev-&gt;linux_stats.rx_packets++;</div><div class='add'>+				wlandev-&gt;linux_stats.rx_bytes += skb-&gt;len;</div><div class='add'>+				netif_rx_ni(skb);</div><div class='add'>+				continue;</div><div class='add'>+			} else {</div><div class='add'>+				hdr = (p80211_hdr_a3_t *)skb-&gt;data;</div><div class='add'>+				fc = ieee2host16(hdr-&gt;fc);</div><div class='add'>+				if (p80211_rx_typedrop(wlandev, fc)) {</div><div class='add'>+					dev_kfree_skb(skb);</div><div class='add'>+					continue;</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+				/* perform mcast filtering */</div><div class='add'>+				if (wlandev-&gt;netdev-&gt;flags &amp; IFF_ALLMULTI) {</div><div class='add'>+					/* allow my local address through */</div><div class='add'>+					if (memcmp(hdr-&gt;a1, wlandev-&gt;netdev-&gt;dev_addr, WLAN_ADDR_LEN) != 0) {</div><div class='add'>+						/* but reject anything else that isn't multicast */</div><div class='add'>+						if (!(hdr-&gt;a1[0] &amp; 0x01)) {</div><div class='add'>+							dev_kfree_skb(skb);</div><div class='add'>+							continue;</div><div class='add'>+						}</div><div class='add'>+					}</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+				if ( skb_p80211_to_ether(wlandev, wlandev-&gt;ethconv, skb) == 0 ) {</div><div class='add'>+					skb-&gt;dev-&gt;last_rx = jiffies;</div><div class='add'>+					wlandev-&gt;linux_stats.rx_packets++;</div><div class='add'>+					wlandev-&gt;linux_stats.rx_bytes += skb-&gt;len;</div><div class='add'>+					netif_rx_ni(skb);</div><div class='add'>+					continue;</div><div class='add'>+				}</div><div class='add'>+				WLAN_LOG_DEBUG(1, "p80211_to_ether failed.\n");</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+        DBFEXIT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* p80211knetdev_hard_start_xmit</div><div class='add'>+*</div><div class='add'>+* Linux netdevice method for transmitting a frame.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	skb	Linux sk_buff containing the frame.</div><div class='add'>+*	netdev	Linux netdevice.</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*	If the lower layers report that buffers are full. netdev-&gt;tbusy</div><div class='add'>+*	will be set to prevent higher layers from sending more traffic.</div><div class='add'>+*</div><div class='add'>+*	Note: If this function returns non-zero, higher layers retain</div><div class='add'>+*	      ownership of the skb.</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	zero on success, non-zero on failure.</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+static int p80211knetdev_hard_start_xmit( struct sk_buff *skb, netdevice_t *netdev)</div><div class='add'>+{</div><div class='add'>+	int		result = 0;</div><div class='add'>+	int		txresult = -1;</div><div class='add'>+	wlandevice_t	*wlandev = (wlandevice_t*)netdev-&gt;priv;</div><div class='add'>+	p80211_hdr_t    p80211_hdr;</div><div class='add'>+	p80211_metawep_t p80211_wep;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	if (skb == NULL) {</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+        if (wlandev-&gt;state != WLAN_DEVICE_OPEN) {</div><div class='add'>+		result = 1;</div><div class='add'>+		goto failed;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(&amp;p80211_hdr, 0, sizeof(p80211_hdr_t));</div><div class='add'>+	memset(&amp;p80211_wep, 0, sizeof(p80211_metawep_t));</div><div class='add'>+</div><div class='add'>+#if (LINUX_VERSION_CODE &lt; KERNEL_VERSION(2,3,38) )</div><div class='add'>+	if ( test_and_set_bit(0, (void*)&amp;(netdev-&gt;tbusy)) != 0 ) {</div><div class='add'>+		/* We've been called w/ tbusy set, has the tx */</div><div class='add'>+		/* path stalled?   */</div><div class='add'>+		WLAN_LOG_DEBUG(1, "called when tbusy set\n");</div><div class='add'>+		result = 1;</div><div class='add'>+		goto failed;</div><div class='add'>+	}</div><div class='add'>+#else</div><div class='add'>+	if ( netif_queue_stopped(netdev) ) {</div><div class='add'>+		WLAN_LOG_DEBUG(1, "called when queue stopped.\n");</div><div class='add'>+		result = 1;</div><div class='add'>+		goto failed;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netif_stop_queue(netdev);</div><div class='add'>+</div><div class='add'>+	/* No timeout handling here, 2.3.38+ kernels call the</div><div class='add'>+	 * timeout function directly.</div><div class='add'>+	 * TODO: Add timeout handling.</div><div class='add'>+	*/</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* Check to see that a valid mode is set */</div><div class='add'>+	switch( wlandev-&gt;macmode ) {</div><div class='add'>+	case WLAN_MACMODE_IBSS_STA:</div><div class='add'>+	case WLAN_MACMODE_ESS_STA:</div><div class='add'>+	case WLAN_MACMODE_ESS_AP:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		/* Mode isn't set yet, just drop the frame</div><div class='add'>+		 * and return success .</div><div class='add'>+		 * TODO: we need a saner way to handle this</div><div class='add'>+		 */</div><div class='add'>+		if(skb-&gt;protocol != ETH_P_80211_RAW) {</div><div class='add'>+			p80211netdev_start_queue(wlandev);</div><div class='add'>+			WLAN_LOG_NOTICE(</div><div class='add'>+				"Tx attempt prior to association, frame dropped.\n");</div><div class='add'>+			wlandev-&gt;linux_stats.tx_dropped++;</div><div class='add'>+			result = 0;</div><div class='add'>+			goto failed;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check for raw transmits */</div><div class='add'>+	if(skb-&gt;protocol == ETH_P_80211_RAW) {</div><div class='add'>+		if (!capable(CAP_NET_ADMIN)) {</div><div class='add'>+			result = 1;</div><div class='add'>+			goto failed;</div><div class='add'>+		}</div><div class='add'>+		/* move the header over */</div><div class='add'>+		memcpy(&amp;p80211_hdr, skb-&gt;data, sizeof(p80211_hdr_t));</div><div class='add'>+		skb_pull(skb, sizeof(p80211_hdr_t));</div><div class='add'>+	} else {</div><div class='add'>+		if ( skb_ether_to_p80211(wlandev, wlandev-&gt;ethconv, skb, &amp;p80211_hdr, &amp;p80211_wep) != 0 ) {</div><div class='add'>+			/* convert failed */</div><div class='add'>+			WLAN_LOG_DEBUG(1, "ether_to_80211(%d) failed.\n",</div><div class='add'>+					wlandev-&gt;ethconv);</div><div class='add'>+			result = 1;</div><div class='add'>+			goto failed;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if ( wlandev-&gt;txframe == NULL ) {</div><div class='add'>+		result = 1;</div><div class='add'>+		goto failed;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netdev-&gt;trans_start = jiffies;</div><div class='add'>+</div><div class='add'>+	wlandev-&gt;linux_stats.tx_packets++;</div><div class='add'>+	/* count only the packet payload */</div><div class='add'>+	wlandev-&gt;linux_stats.tx_bytes += skb-&gt;len;</div><div class='add'>+</div><div class='add'>+	txresult = wlandev-&gt;txframe(wlandev, skb, &amp;p80211_hdr, &amp;p80211_wep);</div><div class='add'>+</div><div class='add'>+	if ( txresult == 0) {</div><div class='add'>+		/* success and more buf */</div><div class='add'>+		/* avail, re: hw_txdata */</div><div class='add'>+		p80211netdev_wake_queue(wlandev);</div><div class='add'>+		result = 0;</div><div class='add'>+	} else if ( txresult == 1 ) {</div><div class='add'>+		/* success, no more avail */</div><div class='add'>+		WLAN_LOG_DEBUG(3, "txframe success, no more bufs\n");</div><div class='add'>+		/* netdev-&gt;tbusy = 1;  don't set here, irqhdlr */</div><div class='add'>+		/*   may have already cleared it */</div><div class='add'>+		result = 0;</div><div class='add'>+	} else if ( txresult == 2 ) {</div><div class='add'>+		/* alloc failure, drop frame */</div><div class='add'>+		WLAN_LOG_DEBUG(3, "txframe returned alloc_fail\n");</div><div class='add'>+		result = 1;</div><div class='add'>+	} else {</div><div class='add'>+		/* buffer full or queue busy, drop frame. */</div><div class='add'>+		WLAN_LOG_DEBUG(3, "txframe returned full or busy\n");</div><div class='add'>+		result = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+ failed:</div><div class='add'>+	/* Free up the WEP buffer if it's not the same as the skb */</div><div class='add'>+	if ((p80211_wep.data) &amp;&amp; (p80211_wep.data != skb-&gt;data))</div><div class='add'>+		kfree(p80211_wep.data);</div><div class='add'>+</div><div class='add'>+	/* we always free the skb here, never in a lower level. */</div><div class='add'>+	if (!result)</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* p80211knetdev_set_multicast_list</div><div class='add'>+*</div><div class='add'>+* Called from higher lavers whenever there's a need to set/clear</div><div class='add'>+* promiscuous mode or rewrite the multicast list.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	none</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	nothing</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+static void p80211knetdev_set_multicast_list(netdevice_t *dev)</div><div class='add'>+{</div><div class='add'>+	wlandevice_t	*wlandev = (wlandevice_t*)dev-&gt;priv;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	/* TODO:  real multicast support as well */</div><div class='add'>+</div><div class='add'>+	if (wlandev-&gt;set_multicast_list)</div><div class='add'>+		wlandev-&gt;set_multicast_list(wlandev, dev);</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef SIOCETHTOOL</div><div class='add'>+</div><div class='add'>+static int p80211netdev_ethtool(wlandevice_t *wlandev, void __user *useraddr)</div><div class='add'>+{</div><div class='add'>+	UINT32 ethcmd;</div><div class='add'>+	struct ethtool_drvinfo info;</div><div class='add'>+	struct ethtool_value edata;</div><div class='add'>+</div><div class='add'>+	memset(&amp;info, 0, sizeof(info));</div><div class='add'>+	memset(&amp;edata, 0, sizeof(edata));</div><div class='add'>+</div><div class='add'>+	if (copy_from_user(&amp;ethcmd, useraddr, sizeof(ethcmd)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	switch (ethcmd) {</div><div class='add'>+	case ETHTOOL_GDRVINFO:</div><div class='add'>+		info.cmd = ethcmd;</div><div class='add'>+		snprintf(info.driver, sizeof(info.driver), "p80211_%s",</div><div class='add'>+			 wlandev-&gt;nsdname);</div><div class='add'>+		snprintf(info.version, sizeof(info.version), "%s",</div><div class='add'>+			 WLAN_RELEASE);</div><div class='add'>+</div><div class='add'>+		// info.fw_version</div><div class='add'>+		// info.bus_info</div><div class='add'>+</div><div class='add'>+		if (copy_to_user(useraddr, &amp;info, sizeof(info)))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		return 0;</div><div class='add'>+#ifdef ETHTOOL_GLINK</div><div class='add'>+	case ETHTOOL_GLINK:</div><div class='add'>+		edata.cmd = ethcmd;</div><div class='add'>+</div><div class='add'>+		if (wlandev-&gt;linkstatus &amp;&amp;</div><div class='add'>+		    (wlandev-&gt;macmode != WLAN_MACMODE_NONE)) {</div><div class='add'>+			edata.data = 1;</div><div class='add'>+		} else {</div><div class='add'>+			edata.data = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (copy_to_user(useraddr, &amp;edata, sizeof(edata)))</div><div class='add'>+                        return -EFAULT;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* p80211knetdev_do_ioctl</div><div class='add'>+*</div><div class='add'>+* Handle an ioctl call on one of our devices.  Everything Linux</div><div class='add'>+* ioctl specific is done here.  Then we pass the contents of the</div><div class='add'>+* ifr-&gt;data to the request message handler.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	dev	Linux kernel netdevice</div><div class='add'>+*	ifr	Our private ioctl request structure, typed for the</div><div class='add'>+*		generic struct ifreq so we can use ptr to func</div><div class='add'>+*		w/o cast.</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	zero on success, a negative errno on failure.  Possible values:</div><div class='add'>+*		-ENETDOWN Device isn't up.</div><div class='add'>+*		-EBUSY	cmd already in progress</div><div class='add'>+*		-ETIME	p80211 cmd timed out (MSD may have its own timers)</div><div class='add'>+*		-EFAULT memory fault copying msg from user buffer</div><div class='add'>+*		-ENOMEM unable to allocate kernel msg buffer</div><div class='add'>+*		-ENOSYS	bad magic, it the cmd really for us?</div><div class='add'>+*		-EINTR	sleeping on cmd, awakened by signal, cmd cancelled.</div><div class='add'>+*</div><div class='add'>+* Call Context:</div><div class='add'>+*	Process thread (ioctl caller).  TODO: SMP support may require</div><div class='add'>+*	locks.</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+static int p80211knetdev_do_ioctl(netdevice_t *dev, struct ifreq *ifr, int cmd)</div><div class='add'>+{</div><div class='add'>+	int			result = 0;</div><div class='add'>+	p80211ioctl_req_t	*req = (p80211ioctl_req_t*)ifr;</div><div class='add'>+	wlandevice_t		*wlandev = (wlandevice_t*)dev-&gt;priv;</div><div class='add'>+	UINT8			*msgbuf;</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	WLAN_LOG_DEBUG(2, "rx'd ioctl, cmd=%d, len=%d\n", cmd, req-&gt;len);</div><div class='add'>+</div><div class='add'>+#if WIRELESS_EXT &lt; 13</div><div class='add'>+	/* Is this a wireless extensions ioctl? */</div><div class='add'>+	if ((cmd &gt;= SIOCIWFIRST) &amp;&amp; (cmd &lt;= SIOCIWLAST)) {</div><div class='add'>+		if ((result = p80211wext_support_ioctl(dev, ifr, cmd))</div><div class='add'>+		    != (-EOPNOTSUPP)) {</div><div class='add'>+			goto bail;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef SIOCETHTOOL</div><div class='add'>+	if (cmd == SIOCETHTOOL) {</div><div class='add'>+		result = p80211netdev_ethtool(wlandev, (void __user *) ifr-&gt;ifr_data);</div><div class='add'>+		goto bail;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* Test the magic, assume ifr is good if it's there */</div><div class='add'>+	if ( req-&gt;magic != P80211_IOCTL_MAGIC ) {</div><div class='add'>+		result = -ENOSYS;</div><div class='add'>+		goto bail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ( cmd == P80211_IFTEST ) {</div><div class='add'>+		result = 0;</div><div class='add'>+		goto bail;</div><div class='add'>+	} else if ( cmd != P80211_IFREQ ) {</div><div class='add'>+		result = -ENOSYS;</div><div class='add'>+		goto bail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Allocate a buf of size req-&gt;len */</div><div class='add'>+	if ((msgbuf = kmalloc( req-&gt;len, GFP_KERNEL))) {</div><div class='add'>+		if ( copy_from_user( msgbuf, (void __user *) req-&gt;data, req-&gt;len) ) {</div><div class='add'>+			result = -EFAULT;</div><div class='add'>+		} else {</div><div class='add'>+			result = p80211req_dorequest( wlandev, msgbuf);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if ( result == 0 ) {</div><div class='add'>+			if ( copy_to_user( (void __user *) req-&gt;data, msgbuf, req-&gt;len)) {</div><div class='add'>+				result = -EFAULT;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		kfree(msgbuf);</div><div class='add'>+	} else {</div><div class='add'>+		result = -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+bail:</div><div class='add'>+	DBFEXIT;</div><div class='add'>+</div><div class='add'>+	return result; /* If allocate,copyfrom or copyto fails, return errno */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* p80211knetdev_set_mac_address</div><div class='add'>+*</div><div class='add'>+* Handles the ioctl for changing the MACAddress of a netdevice</div><div class='add'>+*</div><div class='add'>+* references: linux/netdevice.h and drivers/net/net_init.c</div><div class='add'>+*</div><div class='add'>+* NOTE: [MSM] We only prevent address changes when the netdev is</div><div class='add'>+* up.  We don't control anything based on dot11 state.  If the</div><div class='add'>+* address is changed on a STA that's currently associated, you</div><div class='add'>+* will probably lose the ability to send and receive data frames.</div><div class='add'>+* Just be aware.  Therefore, this should usually only be done</div><div class='add'>+* prior to scan/join/auth/assoc.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	dev	netdevice struct</div><div class='add'>+*	addr	the new MACAddress (a struct)</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	zero on success, a negative errno on failure.  Possible values:</div><div class='add'>+*		-EBUSY	device is bussy (cmd not possible)</div><div class='add'>+*		-and errors returned by: p80211req_dorequest(..)</div><div class='add'>+*</div><div class='add'>+* by: Collin R. Mulliner &lt;collin@mulliner.org&gt;</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+static int p80211knetdev_set_mac_address(netdevice_t *dev, void *addr)</div><div class='add'>+{</div><div class='add'>+	struct sockaddr			*new_addr = addr;</div><div class='add'>+	p80211msg_dot11req_mibset_t	dot11req;</div><div class='add'>+	p80211item_unk392_t		*mibattr;</div><div class='add'>+	p80211item_pstr6_t		*macaddr;</div><div class='add'>+	p80211item_uint32_t		*resultcode;</div><div class='add'>+	int result = 0;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+	/* If we're running, we don't allow MAC address changes */</div><div class='add'>+#if (LINUX_VERSION_CODE &lt; KERNEL_VERSION(2,3,38) )</div><div class='add'>+	if ( dev-&gt;start) {</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+#else</div><div class='add'>+	if (netif_running(dev)) {</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* Set up some convenience pointers. */</div><div class='add'>+	mibattr = &amp;dot11req.mibattribute;</div><div class='add'>+	macaddr = (p80211item_pstr6_t*)&amp;mibattr-&gt;data;</div><div class='add'>+	resultcode = &amp;dot11req.resultcode;</div><div class='add'>+</div><div class='add'>+	/* Set up a dot11req_mibset */</div><div class='add'>+	memset(&amp;dot11req, 0, sizeof(p80211msg_dot11req_mibset_t));</div><div class='add'>+	dot11req.msgcode = DIDmsg_dot11req_mibset;</div><div class='add'>+	dot11req.msglen = sizeof(p80211msg_dot11req_mibset_t);</div><div class='add'>+	memcpy(dot11req.devname,</div><div class='add'>+		((wlandevice_t*)(dev-&gt;priv))-&gt;name,</div><div class='add'>+		WLAN_DEVNAMELEN_MAX - 1);</div><div class='add'>+</div><div class='add'>+	/* Set up the mibattribute argument */</div><div class='add'>+	mibattr-&gt;did = DIDmsg_dot11req_mibset_mibattribute;</div><div class='add'>+	mibattr-&gt;status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+	mibattr-&gt;len = sizeof(mibattr-&gt;data);</div><div class='add'>+</div><div class='add'>+	macaddr-&gt;did = DIDmib_dot11mac_dot11OperationTable_dot11MACAddress;</div><div class='add'>+	macaddr-&gt;status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+	macaddr-&gt;len = sizeof(macaddr-&gt;data);</div><div class='add'>+	macaddr-&gt;data.len = WLAN_ADDR_LEN;</div><div class='add'>+	memcpy(&amp;macaddr-&gt;data.data, new_addr-&gt;sa_data, WLAN_ADDR_LEN);</div><div class='add'>+</div><div class='add'>+	/* Set up the resultcode argument */</div><div class='add'>+	resultcode-&gt;did = DIDmsg_dot11req_mibset_resultcode;</div><div class='add'>+	resultcode-&gt;status = P80211ENUM_msgitem_status_no_value;</div><div class='add'>+	resultcode-&gt;len = sizeof(resultcode-&gt;data);</div><div class='add'>+	resultcode-&gt;data = 0;</div><div class='add'>+</div><div class='add'>+	/* now fire the request */</div><div class='add'>+	result = p80211req_dorequest(dev-&gt;priv, (UINT8*)&amp;dot11req);</div><div class='add'>+</div><div class='add'>+	/* If the request wasn't successful, report an error and don't</div><div class='add'>+	 * change the netdev address</div><div class='add'>+	 */</div><div class='add'>+	if ( result != 0 || resultcode-&gt;data != P80211ENUM_resultcode_success) {</div><div class='add'>+		WLAN_LOG_ERROR(</div><div class='add'>+		"Low-level driver failed dot11req_mibset(dot11MACAddress).\n");</div><div class='add'>+		result = -EADDRNOTAVAIL;</div><div class='add'>+	} else {</div><div class='add'>+		/* everything's ok, change the addr in netdev */</div><div class='add'>+		memcpy(dev-&gt;dev_addr, new_addr-&gt;sa_data, dev-&gt;addr_len);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wlan_change_mtu(netdevice_t *dev, int new_mtu)</div><div class='add'>+{</div><div class='add'>+	DBFENTER;</div><div class='add'>+	// 2312 is max 802.11 payload, 20 is overhead, (ether + llc +snap)</div><div class='add'>+	// and another 8 for wep.</div><div class='add'>+        if ( (new_mtu &lt; 68) || (new_mtu &gt; (2312 - 20 - 8)))</div><div class='add'>+                return -EINVAL;</div><div class='add'>+</div><div class='add'>+        dev-&gt;mtu = new_mtu;</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+</div><div class='add'>+        return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* wlan_setup</div><div class='add'>+*</div><div class='add'>+* Roughly matches the functionality of ether_setup.  Here</div><div class='add'>+* we set up any members of the wlandevice structure that are common</div><div class='add'>+* to all devices.  Additionally, we allocate a linux 'struct device'</div><div class='add'>+* and perform the same setup as ether_setup.</div><div class='add'>+*</div><div class='add'>+* Note: It's important that the caller have setup the wlandev-&gt;name</div><div class='add'>+*	ptr prior to calling this function.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		ptr to the wlandev structure for the</div><div class='add'>+*			interface.</div><div class='add'>+* Returns:</div><div class='add'>+*	zero on success, non-zero otherwise.</div><div class='add'>+* Call Context:</div><div class='add'>+*	Should be process thread.  We'll assume it might be</div><div class='add'>+*	interrupt though.  When we add support for statically</div><div class='add'>+*	compiled drivers, this function will be called in the</div><div class='add'>+*	context of the kernel startup code.</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int wlan_setup(wlandevice_t *wlandev)</div><div class='add'>+{</div><div class='add'>+	int		result = 0;</div><div class='add'>+	netdevice_t	*dev;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	/* Set up the wlandev */</div><div class='add'>+	wlandev-&gt;state = WLAN_DEVICE_CLOSED;</div><div class='add'>+	wlandev-&gt;ethconv = WLAN_ETHCONV_8021h;</div><div class='add'>+	wlandev-&gt;macmode = WLAN_MACMODE_NONE;</div><div class='add'>+</div><div class='add'>+	/* Set up the rx queue */</div><div class='add'>+	skb_queue_head_init(&amp;wlandev-&gt;nsd_rxq);</div><div class='add'>+	tasklet_init(&amp;wlandev-&gt;rx_bh,</div><div class='add'>+		     p80211netdev_rx_bh,</div><div class='add'>+		     (unsigned long)wlandev);</div><div class='add'>+</div><div class='add'>+	/* Allocate and initialize the struct device */</div><div class='add'>+	dev = kmalloc(sizeof(netdevice_t), GFP_ATOMIC);</div><div class='add'>+	if ( dev == NULL ) {</div><div class='add'>+		WLAN_LOG_ERROR("Failed to alloc netdev.\n");</div><div class='add'>+		result = 1;</div><div class='add'>+	} else {</div><div class='add'>+		memset( dev, 0, sizeof(netdevice_t));</div><div class='add'>+		ether_setup(dev);</div><div class='add'>+		wlandev-&gt;netdev = dev;</div><div class='add'>+		dev-&gt;priv = wlandev;</div><div class='add'>+		dev-&gt;hard_start_xmit =	p80211knetdev_hard_start_xmit;</div><div class='add'>+		dev-&gt;get_stats =	p80211knetdev_get_stats;</div><div class='add'>+#ifdef HAVE_PRIVATE_IOCTL</div><div class='add'>+		dev-&gt;do_ioctl = 	p80211knetdev_do_ioctl;</div><div class='add'>+#endif</div><div class='add'>+#ifdef HAVE_MULTICAST</div><div class='add'>+		dev-&gt;set_multicast_list = p80211knetdev_set_multicast_list;</div><div class='add'>+#endif</div><div class='add'>+		dev-&gt;init =		p80211knetdev_init;</div><div class='add'>+		dev-&gt;open =		p80211knetdev_open;</div><div class='add'>+		dev-&gt;stop =		p80211knetdev_stop;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_NET_WIRELESS</div><div class='add'>+#if ((WIRELESS_EXT &lt; 17) &amp;&amp; (WIRELESS_EXT &lt; 21))</div><div class='add'>+		dev-&gt;get_wireless_stats = p80211wext_get_wireless_stats;</div><div class='add'>+#endif</div><div class='add'>+#if WIRELESS_EXT &gt; 12</div><div class='add'>+		dev-&gt;wireless_handlers = &amp;p80211wext_handler_def;</div><div class='add'>+#endif</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if (LINUX_VERSION_CODE &lt; KERNEL_VERSION(2,3,38) )</div><div class='add'>+		dev-&gt;tbusy = 1;</div><div class='add'>+		dev-&gt;start = 0;</div><div class='add'>+#else</div><div class='add'>+		netif_stop_queue(dev);</div><div class='add'>+#endif</div><div class='add'>+#ifdef HAVE_CHANGE_MTU</div><div class='add'>+		dev-&gt;change_mtu = wlan_change_mtu;</div><div class='add'>+#endif</div><div class='add'>+#ifdef HAVE_SET_MAC_ADDR</div><div class='add'>+		dev-&gt;set_mac_address =	p80211knetdev_set_mac_address;</div><div class='add'>+#endif</div><div class='add'>+#ifdef HAVE_TX_TIMEOUT</div><div class='add'>+		dev-&gt;tx_timeout      =  &amp;p80211knetdev_tx_timeout;</div><div class='add'>+		dev-&gt;watchdog_timeo  =  (wlan_watchdog * HZ) / 1000;</div><div class='add'>+#endif</div><div class='add'>+		netif_carrier_off(dev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* wlan_unsetup</div><div class='add'>+*</div><div class='add'>+* This function is paired with the wlan_setup routine.  It should</div><div class='add'>+* be called after unregister_wlandev.  Basically, all it does is</div><div class='add'>+* free the 'struct device' that's associated with the wlandev.</div><div class='add'>+* We do it here because the 'struct device' isn't allocated</div><div class='add'>+* explicitly in the driver code, it's done in wlan_setup.  To</div><div class='add'>+* do the free in the driver might seem like 'magic'.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		ptr to the wlandev structure for the</div><div class='add'>+*			interface.</div><div class='add'>+* Returns:</div><div class='add'>+*	zero on success, non-zero otherwise.</div><div class='add'>+* Call Context:</div><div class='add'>+*	Should be process thread.  We'll assume it might be</div><div class='add'>+*	interrupt though.  When we add support for statically</div><div class='add'>+*	compiled drivers, this function will be called in the</div><div class='add'>+*	context of the kernel startup code.</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int wlan_unsetup(wlandevice_t *wlandev)</div><div class='add'>+{</div><div class='add'>+	int		result = 0;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	tasklet_kill(&amp;wlandev-&gt;rx_bh);</div><div class='add'>+</div><div class='add'>+	if (wlandev-&gt;netdev == NULL ) {</div><div class='add'>+		WLAN_LOG_ERROR("called without wlandev-&gt;netdev set.\n");</div><div class='add'>+		result = 1;</div><div class='add'>+	} else {</div><div class='add'>+		free_netdev(wlandev-&gt;netdev);</div><div class='add'>+		wlandev-&gt;netdev = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* register_wlandev</div><div class='add'>+*</div><div class='add'>+* Roughly matches the functionality of register_netdev.  This function</div><div class='add'>+* is called after the driver has successfully probed and set up the</div><div class='add'>+* resources for the device.  It's now ready to become a named device</div><div class='add'>+* in the Linux system.</div><div class='add'>+*</div><div class='add'>+* First we allocate a name for the device (if not already set), then</div><div class='add'>+* we call the Linux function register_netdevice.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		ptr to the wlandev structure for the</div><div class='add'>+*			interface.</div><div class='add'>+* Returns:</div><div class='add'>+*	zero on success, non-zero otherwise.</div><div class='add'>+* Call Context:</div><div class='add'>+*	Can be either interrupt or not.</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int register_wlandev(wlandevice_t *wlandev)</div><div class='add'>+{</div><div class='add'>+	int		i = 0;</div><div class='add'>+	netdevice_t	*dev = wlandev-&gt;netdev;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	i = dev_alloc_name(wlandev-&gt;netdev, "wlan%d");</div><div class='add'>+	if (i &gt;= 0) {</div><div class='add'>+		i = register_netdev(wlandev-&gt;netdev);</div><div class='add'>+	}</div><div class='add'>+	if (i != 0) {</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#if ( LINUX_VERSION_CODE &lt; KERNEL_VERSION(2,4,0) )</div><div class='add'>+	dev-&gt;name = wlandev-&gt;name;</div><div class='add'>+#else</div><div class='add'>+	strcpy(wlandev-&gt;name, dev-&gt;name);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PROC_FS</div><div class='add'>+	if (proc_p80211) {</div><div class='add'>+		wlandev-&gt;procdir = proc_mkdir(wlandev-&gt;name, proc_p80211);</div><div class='add'>+		if ( wlandev-&gt;procdir )</div><div class='add'>+			wlandev-&gt;procwlandev =</div><div class='add'>+				create_proc_read_entry("wlandev", 0,</div><div class='add'>+						       wlandev-&gt;procdir,</div><div class='add'>+						       p80211netdev_proc_read,</div><div class='add'>+						       wlandev);</div><div class='add'>+		if (wlandev-&gt;nsd_proc_read)</div><div class='add'>+			create_proc_read_entry("nsd", 0,</div><div class='add'>+					       wlandev-&gt;procdir,</div><div class='add'>+					       wlandev-&gt;nsd_proc_read,</div><div class='add'>+					       wlandev);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_HOTPLUG</div><div class='add'>+	p80211_run_sbin_hotplug(wlandev, WLAN_HOTPLUG_REGISTER);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* unregister_wlandev</div><div class='add'>+*</div><div class='add'>+* Roughly matches the functionality of unregister_netdev.  This</div><div class='add'>+* function is called to remove a named device from the system.</div><div class='add'>+*</div><div class='add'>+* First we tell linux that the device should no longer exist.</div><div class='add'>+* Then we remove it from the list of known wlan devices.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		ptr to the wlandev structure for the</div><div class='add'>+*			interface.</div><div class='add'>+* Returns:</div><div class='add'>+*	zero on success, non-zero otherwise.</div><div class='add'>+* Call Context:</div><div class='add'>+*	Can be either interrupt or not.</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int unregister_wlandev(wlandevice_t *wlandev)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_HOTPLUG</div><div class='add'>+	p80211_run_sbin_hotplug(wlandev, WLAN_HOTPLUG_REMOVE);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PROC_FS</div><div class='add'>+	if ( wlandev-&gt;procwlandev ) {</div><div class='add'>+		remove_proc_entry("wlandev", wlandev-&gt;procdir);</div><div class='add'>+	}</div><div class='add'>+	if ( wlandev-&gt;nsd_proc_read ) {</div><div class='add'>+		remove_proc_entry("nsd", wlandev-&gt;procdir);</div><div class='add'>+	}</div><div class='add'>+	if (wlandev-&gt;procdir) {</div><div class='add'>+		remove_proc_entry(wlandev-&gt;name, proc_p80211);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	unregister_netdev(wlandev-&gt;netdev);</div><div class='add'>+</div><div class='add'>+	/* Now to clean out the rx queue */</div><div class='add'>+	while ( (skb = skb_dequeue(&amp;wlandev-&gt;nsd_rxq)) ) {</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PROC_FS</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* proc_read</div><div class='add'>+*</div><div class='add'>+* Read function for /proc/net/p80211/&lt;device&gt;/wlandev</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	buf</div><div class='add'>+*	start</div><div class='add'>+*	offset</div><div class='add'>+*	count</div><div class='add'>+*	eof</div><div class='add'>+*	data</div><div class='add'>+* Returns:</div><div class='add'>+*	zero on success, non-zero otherwise.</div><div class='add'>+* Call Context:</div><div class='add'>+*	Can be either interrupt or not.</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+static int</div><div class='add'>+p80211netdev_proc_read(</div><div class='add'>+	char	*page,</div><div class='add'>+	char	**start,</div><div class='add'>+	off_t	offset,</div><div class='add'>+	int	count,</div><div class='add'>+	int	*eof,</div><div class='add'>+	void	*data)</div><div class='add'>+{</div><div class='add'>+	char	 *p = page;</div><div class='add'>+	wlandevice_t *wlandev = (wlandevice_t *) data;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+	if (offset != 0) {</div><div class='add'>+		*eof = 1;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	p += sprintf(p, "p80211 version: %s (%s)\n\n",</div><div class='add'>+		     WLAN_RELEASE, WLAN_BUILD_DATE);</div><div class='add'>+	p += sprintf(p, "name       : %s\n", wlandev-&gt;name);</div><div class='add'>+	p += sprintf(p, "nsd name   : %s\n", wlandev-&gt;nsdname);</div><div class='add'>+	p += sprintf(p, "address    : %02x:%02x:%02x:%02x:%02x:%02x\n",</div><div class='add'>+		     wlandev-&gt;netdev-&gt;dev_addr[0], wlandev-&gt;netdev-&gt;dev_addr[1], wlandev-&gt;netdev-&gt;dev_addr[2],</div><div class='add'>+		     wlandev-&gt;netdev-&gt;dev_addr[3], wlandev-&gt;netdev-&gt;dev_addr[4], wlandev-&gt;netdev-&gt;dev_addr[5]);</div><div class='add'>+	p += sprintf(p, "nsd caps   : %s%s%s%s%s%s%s%s%s%s\n",</div><div class='add'>+		     (wlandev-&gt;nsdcaps &amp; P80211_NSDCAP_HARDWAREWEP) ? "wep_hw " : "",</div><div class='add'>+		     (wlandev-&gt;nsdcaps &amp; P80211_NSDCAP_TIEDWEP) ? "wep_tied " : "",</div><div class='add'>+		     (wlandev-&gt;nsdcaps &amp; P80211_NSDCAP_NOHOSTWEP) ? "wep_hw_only " : "",</div><div class='add'>+		     (wlandev-&gt;nsdcaps &amp; P80211_NSDCAP_PBCC) ? "pbcc " : "",</div><div class='add'>+		     (wlandev-&gt;nsdcaps &amp; P80211_NSDCAP_SHORT_PREAMBLE) ? "short_preamble " : "",</div><div class='add'>+		     (wlandev-&gt;nsdcaps &amp; P80211_NSDCAP_AGILITY) ? "agility " : "",</div><div class='add'>+		     (wlandev-&gt;nsdcaps &amp; P80211_NSDCAP_AP_RETRANSMIT) ? "ap_retransmit " : "",</div><div class='add'>+		     (wlandev-&gt;nsdcaps &amp; P80211_NSDCAP_HWFRAGMENT) ? "hw_frag " : "",</div><div class='add'>+		     (wlandev-&gt;nsdcaps &amp; P80211_NSDCAP_AUTOJOIN) ? "autojoin " : "",</div><div class='add'>+		     (wlandev-&gt;nsdcaps &amp; P80211_NSDCAP_NOSCAN) ? "" : "scan ");</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	p += sprintf(p, "bssid      : %02x:%02x:%02x:%02x:%02x:%02x\n",</div><div class='add'>+		     wlandev-&gt;bssid[0], wlandev-&gt;bssid[1], wlandev-&gt;bssid[2],</div><div class='add'>+		     wlandev-&gt;bssid[3], wlandev-&gt;bssid[4], wlandev-&gt;bssid[5]);</div><div class='add'>+</div><div class='add'>+	p += sprintf(p, "Enabled    : %s%s\n",</div><div class='add'>+		     (wlandev-&gt;shortpreamble) ? "short_preamble " : "",</div><div class='add'>+		     (wlandev-&gt;hostwep &amp; HOSTWEP_PRIVACYINVOKED) ? "privacy" : "");</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+ exit:</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return (p - page);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* p80211netdev_hwremoved</div><div class='add'>+*</div><div class='add'>+* Hardware removed notification. This function should be called</div><div class='add'>+* immediately after an MSD has detected that the underlying hardware</div><div class='add'>+* has been yanked out from under us.  The primary things we need</div><div class='add'>+* to do are:</div><div class='add'>+*   - Mark the wlandev</div><div class='add'>+*   - Prevent any further traffic from the knetdev i/f</div><div class='add'>+*   - Prevent any further requests from mgmt i/f</div><div class='add'>+*   - If there are any waitq'd mgmt requests or mgmt-frame exchanges,</div><div class='add'>+*     shut them down.</div><div class='add'>+*   - Call the MSD hwremoved function.</div><div class='add'>+*</div><div class='add'>+* The remainder of the cleanup will be handled by unregister().</div><div class='add'>+* Our primary goal here is to prevent as much tickling of the MSD</div><div class='add'>+* as possible since the MSD is already in a 'wounded' state.</div><div class='add'>+*</div><div class='add'>+* TODO: As new features are added, this function should be</div><div class='add'>+*       updated.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		WLAN network device structure</div><div class='add'>+* Returns:</div><div class='add'>+*	nothing</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	Usually interrupt.</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+void p80211netdev_hwremoved(wlandevice_t *wlandev)</div><div class='add'>+{</div><div class='add'>+	DBFENTER;</div><div class='add'>+	wlandev-&gt;hwremoved = 1;</div><div class='add'>+	if ( wlandev-&gt;state == WLAN_DEVICE_OPEN) {</div><div class='add'>+		p80211netdev_stop_queue(wlandev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netif_device_detach(wlandev-&gt;netdev);</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* p80211_rx_typedrop</div><div class='add'>+*</div><div class='add'>+* Classifies the frame, increments the appropriate counter, and</div><div class='add'>+* returns 0|1|2 indicating whether the driver should handle, ignore, or</div><div class='add'>+* drop the frame</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		wlan device structure</div><div class='add'>+*	fc		frame control field</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	zero if the frame should be handled by the driver,</div><div class='add'>+*       one if the frame should be ignored</div><div class='add'>+*       anything else means we drop it.</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	interrupt</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+static int p80211_rx_typedrop( wlandevice_t *wlandev, UINT16 fc)</div><div class='add'>+{</div><div class='add'>+	UINT16	ftype;</div><div class='add'>+	UINT16	fstype;</div><div class='add'>+	int	drop = 0;</div><div class='add'>+	/* Classify frame, increment counter */</div><div class='add'>+	ftype = WLAN_GET_FC_FTYPE(fc);</div><div class='add'>+	fstype = WLAN_GET_FC_FSTYPE(fc);</div><div class='add'>+#if 0</div><div class='add'>+	WLAN_LOG_DEBUG(4,</div><div class='add'>+		"rx_typedrop : ftype=%d fstype=%d.\n", ftype, fstype);</div><div class='add'>+#endif</div><div class='add'>+	switch ( ftype ) {</div><div class='add'>+	case WLAN_FTYPE_MGMT:</div><div class='add'>+		if ((wlandev-&gt;netdev-&gt;flags &amp; IFF_PROMISC) ||</div><div class='add'>+			(wlandev-&gt;netdev-&gt;flags &amp; IFF_ALLMULTI)) {</div><div class='add'>+			drop = 1;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		WLAN_LOG_DEBUG(3, "rx'd mgmt:\n");</div><div class='add'>+		wlandev-&gt;rx.mgmt++;</div><div class='add'>+		switch( fstype ) {</div><div class='add'>+		case WLAN_FSTYPE_ASSOCREQ:</div><div class='add'>+			/* printk("assocreq"); */</div><div class='add'>+			wlandev-&gt;rx.assocreq++;</div><div class='add'>+			break;</div><div class='add'>+		case WLAN_FSTYPE_ASSOCRESP:</div><div class='add'>+			/* printk("assocresp"); */</div><div class='add'>+			wlandev-&gt;rx.assocresp++;</div><div class='add'>+			break;</div><div class='add'>+		case WLAN_FSTYPE_REASSOCREQ:</div><div class='add'>+			/* printk("reassocreq"); */</div><div class='add'>+			wlandev-&gt;rx.reassocreq++;</div><div class='add'>+			break;</div><div class='add'>+		case WLAN_FSTYPE_REASSOCRESP:</div><div class='add'>+			/* printk("reassocresp"); */</div><div class='add'>+			wlandev-&gt;rx.reassocresp++;</div><div class='add'>+			break;</div><div class='add'>+		case WLAN_FSTYPE_PROBEREQ:</div><div class='add'>+			/* printk("probereq"); */</div><div class='add'>+			wlandev-&gt;rx.probereq++;</div><div class='add'>+			break;</div><div class='add'>+		case WLAN_FSTYPE_PROBERESP:</div><div class='add'>+			/* printk("proberesp"); */</div><div class='add'>+			wlandev-&gt;rx.proberesp++;</div><div class='add'>+			break;</div><div class='add'>+		case WLAN_FSTYPE_BEACON:</div><div class='add'>+			/* printk("beacon"); */</div><div class='add'>+			wlandev-&gt;rx.beacon++;</div><div class='add'>+			break;</div><div class='add'>+		case WLAN_FSTYPE_ATIM:</div><div class='add'>+			/* printk("atim"); */</div><div class='add'>+			wlandev-&gt;rx.atim++;</div><div class='add'>+			break;</div><div class='add'>+		case WLAN_FSTYPE_DISASSOC:</div><div class='add'>+			/* printk("disassoc"); */</div><div class='add'>+			wlandev-&gt;rx.disassoc++;</div><div class='add'>+			break;</div><div class='add'>+		case WLAN_FSTYPE_AUTHEN:</div><div class='add'>+			/* printk("authen"); */</div><div class='add'>+			wlandev-&gt;rx.authen++;</div><div class='add'>+			break;</div><div class='add'>+		case WLAN_FSTYPE_DEAUTHEN:</div><div class='add'>+			/* printk("deauthen"); */</div><div class='add'>+			wlandev-&gt;rx.deauthen++;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			/* printk("unknown"); */</div><div class='add'>+			wlandev-&gt;rx.mgmt_unknown++;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		/* printk("\n"); */</div><div class='add'>+		drop = 2;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case WLAN_FTYPE_CTL:</div><div class='add'>+		if ((wlandev-&gt;netdev-&gt;flags &amp; IFF_PROMISC) ||</div><div class='add'>+			(wlandev-&gt;netdev-&gt;flags &amp; IFF_ALLMULTI)) {</div><div class='add'>+			drop = 1;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		WLAN_LOG_DEBUG(3, "rx'd ctl:\n");</div><div class='add'>+		wlandev-&gt;rx.ctl++;</div><div class='add'>+		switch( fstype ) {</div><div class='add'>+		case WLAN_FSTYPE_PSPOLL:</div><div class='add'>+			/* printk("pspoll"); */</div><div class='add'>+			wlandev-&gt;rx.pspoll++;</div><div class='add'>+			break;</div><div class='add'>+		case WLAN_FSTYPE_RTS:</div><div class='add'>+			/* printk("rts"); */</div><div class='add'>+			wlandev-&gt;rx.rts++;</div><div class='add'>+			break;</div><div class='add'>+		case WLAN_FSTYPE_CTS:</div><div class='add'>+			/* printk("cts"); */</div><div class='add'>+			wlandev-&gt;rx.cts++;</div><div class='add'>+			break;</div><div class='add'>+		case WLAN_FSTYPE_ACK:</div><div class='add'>+			/* printk("ack"); */</div><div class='add'>+			wlandev-&gt;rx.ack++;</div><div class='add'>+			break;</div><div class='add'>+		case WLAN_FSTYPE_CFEND:</div><div class='add'>+			/* printk("cfend"); */</div><div class='add'>+			wlandev-&gt;rx.cfend++;</div><div class='add'>+			break;</div><div class='add'>+		case WLAN_FSTYPE_CFENDCFACK:</div><div class='add'>+			/* printk("cfendcfack"); */</div><div class='add'>+			wlandev-&gt;rx.cfendcfack++;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			/* printk("unknown"); */</div><div class='add'>+			wlandev-&gt;rx.ctl_unknown++;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		/* printk("\n"); */</div><div class='add'>+		drop = 2;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case WLAN_FTYPE_DATA:</div><div class='add'>+		wlandev-&gt;rx.data++;</div><div class='add'>+		switch( fstype ) {</div><div class='add'>+		case WLAN_FSTYPE_DATAONLY:</div><div class='add'>+			wlandev-&gt;rx.dataonly++;</div><div class='add'>+			break;</div><div class='add'>+		case WLAN_FSTYPE_DATA_CFACK:</div><div class='add'>+			wlandev-&gt;rx.data_cfack++;</div><div class='add'>+			break;</div><div class='add'>+		case WLAN_FSTYPE_DATA_CFPOLL:</div><div class='add'>+			wlandev-&gt;rx.data_cfpoll++;</div><div class='add'>+			break;</div><div class='add'>+		case WLAN_FSTYPE_DATA_CFACK_CFPOLL:</div><div class='add'>+			wlandev-&gt;rx.data__cfack_cfpoll++;</div><div class='add'>+			break;</div><div class='add'>+		case WLAN_FSTYPE_NULL:</div><div class='add'>+			WLAN_LOG_DEBUG(3, "rx'd data:null\n");</div><div class='add'>+			wlandev-&gt;rx.null++;</div><div class='add'>+			break;</div><div class='add'>+		case WLAN_FSTYPE_CFACK:</div><div class='add'>+			WLAN_LOG_DEBUG(3, "rx'd data:cfack\n");</div><div class='add'>+			wlandev-&gt;rx.cfack++;</div><div class='add'>+			break;</div><div class='add'>+		case WLAN_FSTYPE_CFPOLL:</div><div class='add'>+			WLAN_LOG_DEBUG(3, "rx'd data:cfpoll\n");</div><div class='add'>+			wlandev-&gt;rx.cfpoll++;</div><div class='add'>+			break;</div><div class='add'>+		case WLAN_FSTYPE_CFACK_CFPOLL:</div><div class='add'>+			WLAN_LOG_DEBUG(3, "rx'd data:cfack_cfpoll\n");</div><div class='add'>+			wlandev-&gt;rx.cfack_cfpoll++;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			/* printk("unknown"); */</div><div class='add'>+			wlandev-&gt;rx.data_unknown++;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return drop;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_HOTPLUG</div><div class='add'>+/* Notify userspace when a netdevice event occurs,</div><div class='add'>+ * by running '/sbin/hotplug net' with certain</div><div class='add'>+ * environment variables set.</div><div class='add'>+ */</div><div class='add'>+int p80211_run_sbin_hotplug(wlandevice_t *wlandev, char *action)</div><div class='add'>+{</div><div class='add'>+        char *argv[3], *envp[7], ifname[12 + IFNAMSIZ], action_str[32];</div><div class='add'>+	char nsdname[32], wlan_wext[32];</div><div class='add'>+        int i;</div><div class='add'>+</div><div class='add'>+	if (wlandev) {</div><div class='add'>+		sprintf(ifname, "INTERFACE=%s", wlandev-&gt;name);</div><div class='add'>+		sprintf(nsdname, "NSDNAME=%s", wlandev-&gt;nsdname);</div><div class='add'>+	} else {</div><div class='add'>+		sprintf(ifname, "INTERFACE=null");</div><div class='add'>+		sprintf(nsdname, "NSDNAME=null");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sprintf(wlan_wext, "WLAN_WEXT=%s", wlan_wext_write ? "y" : "");</div><div class='add'>+        sprintf(action_str, "ACTION=%s", action);</div><div class='add'>+</div><div class='add'>+        i = 0;</div><div class='add'>+        argv[i++] = hotplug_path;</div><div class='add'>+        argv[i++] = "wlan";</div><div class='add'>+        argv[i] = NULL;</div><div class='add'>+</div><div class='add'>+        i = 0;</div><div class='add'>+        /* minimal command environment */</div><div class='add'>+        envp [i++] = "HOME=/";</div><div class='add'>+        envp [i++] = "PATH=/sbin:/bin:/usr/sbin:/usr/bin";</div><div class='add'>+        envp [i++] = ifname;</div><div class='add'>+        envp [i++] = action_str;</div><div class='add'>+        envp [i++] = nsdname;</div><div class='add'>+        envp [i++] = wlan_wext;</div><div class='add'>+        envp [i] = NULL;</div><div class='add'>+</div><div class='add'>+#if (LINUX_VERSION_CODE &lt; KERNEL_VERSION(2,5,62))</div><div class='add'>+        return call_usermodehelper(argv [0], argv, envp);</div><div class='add'>+#else</div><div class='add'>+        return call_usermodehelper(argv [0], argv, envp, 0);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+void    p80211_suspend(wlandevice_t *wlandev)</div><div class='add'>+{</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_HOTPLUG</div><div class='add'>+	p80211_run_sbin_hotplug(wlandev, WLAN_HOTPLUG_SUSPEND);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void    p80211_resume(wlandevice_t *wlandev)</div><div class='add'>+{</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_HOTPLUG</div><div class='add'>+	p80211_run_sbin_hotplug(wlandev, WLAN_HOTPLUG_RESUME);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void p80211knetdev_tx_timeout( netdevice_t *netdev)</div><div class='add'>+{</div><div class='add'>+	wlandevice_t	*wlandev = (wlandevice_t*)netdev-&gt;priv;</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	if (wlandev-&gt;tx_timeout) {</div><div class='add'>+		wlandev-&gt;tx_timeout(wlandev);</div><div class='add'>+	} else {</div><div class='add'>+		WLAN_LOG_WARNING("Implement tx_timeout for %s\n",</div><div class='add'>+				 wlandev-&gt;nsdname);</div><div class='add'>+		p80211netdev_wake_queue(wlandev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/staging/wlan-ng/p80211netdev.h b/drivers/staging/wlan-ng/p80211netdev.h<br/>new file mode 100644<br/>index 000000000000..9b2e0cdcb449<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/wlan-ng/p80211netdev.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/wlan-ng/p80211netdev.h</a></div><div class='hunk'>@@ -0,0 +1,336 @@</div><div class='add'>+/* p80211netdev.h</div><div class='add'>+*</div><div class='add'>+* WLAN net device structure and functions</div><div class='add'>+*</div><div class='add'>+* Copyright (C) 1999 AbsoluteValue Systems, Inc.  All Rights Reserved.</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* linux-wlan</div><div class='add'>+*</div><div class='add'>+*   The contents of this file are subject to the Mozilla Public</div><div class='add'>+*   License Version 1.1 (the "License"); you may not use this file</div><div class='add'>+*   except in compliance with the License. You may obtain a copy of</div><div class='add'>+*   the License at http://www.mozilla.org/MPL/</div><div class='add'>+*</div><div class='add'>+*   Software distributed under the License is distributed on an "AS</div><div class='add'>+*   IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or</div><div class='add'>+*   implied. See the License for the specific language governing</div><div class='add'>+*   rights and limitations under the License.</div><div class='add'>+*</div><div class='add'>+*   Alternatively, the contents of this file may be used under the</div><div class='add'>+*   terms of the GNU Public License version 2 (the "GPL"), in which</div><div class='add'>+*   case the provisions of the GPL are applicable instead of the</div><div class='add'>+*   above.  If you wish to allow the use of your version of this file</div><div class='add'>+*   only under the terms of the GPL and not to allow others to use</div><div class='add'>+*   your version of this file under the MPL, indicate your decision</div><div class='add'>+*   by deleting the provisions above and replace them with the notice</div><div class='add'>+*   and other provisions required by the GPL.  If you do not delete</div><div class='add'>+*   the provisions above, a recipient may use your version of this</div><div class='add'>+*   file under either the MPL or the GPL.</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* Inquiries regarding the linux-wlan Open Source project can be</div><div class='add'>+* made directly to:</div><div class='add'>+*</div><div class='add'>+* AbsoluteValue Systems Inc.</div><div class='add'>+* info@linux-wlan.com</div><div class='add'>+* http://www.linux-wlan.com</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* Portions of the development of this software were funded by</div><div class='add'>+* Intersil Corporation as part of PRISM(R) chipset product development.</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* This file declares the structure type that represents each wlan</div><div class='add'>+* interface.</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#ifndef _LINUX_P80211NETDEV_H</div><div class='add'>+#define _LINUX_P80211NETDEV_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/wireless.h&gt;</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Constants */</div><div class='add'>+</div><div class='add'>+#define WLAN_DEVICE_CLOSED	0</div><div class='add'>+#define WLAN_DEVICE_OPEN	1</div><div class='add'>+</div><div class='add'>+#define WLAN_MACMODE_NONE	0</div><div class='add'>+#define WLAN_MACMODE_IBSS_STA	1</div><div class='add'>+#define WLAN_MACMODE_ESS_STA	2</div><div class='add'>+#define WLAN_MACMODE_ESS_AP	3</div><div class='add'>+</div><div class='add'>+/* MSD States */</div><div class='add'>+#define WLAN_MSD_START			-1</div><div class='add'>+#define WLAN_MSD_DRIVERLOADED		0</div><div class='add'>+#define WLAN_MSD_HWPRESENT_PENDING	1</div><div class='add'>+#define WLAN_MSD_HWFAIL			2</div><div class='add'>+#define WLAN_MSD_HWPRESENT		3</div><div class='add'>+#define WLAN_MSD_FWLOAD_PENDING		4</div><div class='add'>+#define WLAN_MSD_FWLOAD			5</div><div class='add'>+#define WLAN_MSD_RUNNING_PENDING	6</div><div class='add'>+#define WLAN_MSD_RUNNING		7</div><div class='add'>+</div><div class='add'>+#ifndef ETH_P_ECONET</div><div class='add'>+#define ETH_P_ECONET   0x0018    /* needed for 2.2.x kernels */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define ETH_P_80211_RAW        (ETH_P_ECONET + 1)</div><div class='add'>+</div><div class='add'>+#ifndef ARPHRD_IEEE80211</div><div class='add'>+#define ARPHRD_IEEE80211 801     /* kernel 2.4.6 */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef ARPHRD_IEEE80211_PRISM  /* kernel 2.4.18 */</div><div class='add'>+#define ARPHRD_IEEE80211_PRISM 802</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*--- NSD Capabilities Flags ------------------------------*/</div><div class='add'>+#define P80211_NSDCAP_HARDWAREWEP           0x01  /* hardware wep engine */</div><div class='add'>+#define P80211_NSDCAP_TIEDWEP               0x02  /* can't decouple en/de */</div><div class='add'>+#define P80211_NSDCAP_NOHOSTWEP             0x04  /* must use hardware wep */</div><div class='add'>+#define P80211_NSDCAP_PBCC                  0x08  /* hardware supports PBCC */</div><div class='add'>+#define P80211_NSDCAP_SHORT_PREAMBLE        0x10  /* hardware supports */</div><div class='add'>+#define P80211_NSDCAP_AGILITY               0x20  /* hardware supports */</div><div class='add'>+#define P80211_NSDCAP_AP_RETRANSMIT         0x40  /* nsd handles retransmits */</div><div class='add'>+#define P80211_NSDCAP_HWFRAGMENT            0x80  /* nsd handles frag/defrag */</div><div class='add'>+#define P80211_NSDCAP_AUTOJOIN              0x100  /* nsd does autojoin */</div><div class='add'>+#define P80211_NSDCAP_NOSCAN                0x200  /* nsd can scan */</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Macros */</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Types */</div><div class='add'>+</div><div class='add'>+/* Received frame statistics */</div><div class='add'>+typedef struct p80211_frmrx_t</div><div class='add'>+{</div><div class='add'>+	UINT32	mgmt;</div><div class='add'>+	UINT32	assocreq;</div><div class='add'>+	UINT32	assocresp;</div><div class='add'>+	UINT32	reassocreq;</div><div class='add'>+	UINT32	reassocresp;</div><div class='add'>+	UINT32	probereq;</div><div class='add'>+	UINT32	proberesp;</div><div class='add'>+	UINT32	beacon;</div><div class='add'>+	UINT32	atim;</div><div class='add'>+	UINT32	disassoc;</div><div class='add'>+	UINT32	authen;</div><div class='add'>+	UINT32	deauthen;</div><div class='add'>+	UINT32	mgmt_unknown;</div><div class='add'>+	UINT32	ctl;</div><div class='add'>+	UINT32	pspoll;</div><div class='add'>+	UINT32	rts;</div><div class='add'>+	UINT32	cts;</div><div class='add'>+	UINT32	ack;</div><div class='add'>+	UINT32	cfend;</div><div class='add'>+	UINT32	cfendcfack;</div><div class='add'>+	UINT32	ctl_unknown;</div><div class='add'>+	UINT32	data;</div><div class='add'>+	UINT32	dataonly;</div><div class='add'>+	UINT32	data_cfack;</div><div class='add'>+	UINT32	data_cfpoll;</div><div class='add'>+	UINT32	data__cfack_cfpoll;</div><div class='add'>+	UINT32	null;</div><div class='add'>+	UINT32	cfack;</div><div class='add'>+	UINT32	cfpoll;</div><div class='add'>+	UINT32	cfack_cfpoll;</div><div class='add'>+	UINT32	data_unknown;</div><div class='add'>+	UINT32  decrypt;</div><div class='add'>+	UINT32  decrypt_err;</div><div class='add'>+} p80211_frmrx_t;</div><div class='add'>+</div><div class='add'>+#ifdef WIRELESS_EXT</div><div class='add'>+/* called by /proc/net/wireless */</div><div class='add'>+struct iw_statistics* p80211wext_get_wireless_stats(netdevice_t *dev);</div><div class='add'>+/* wireless extensions' ioctls */</div><div class='add'>+int p80211wext_support_ioctl(netdevice_t *dev, struct ifreq *ifr, int cmd);</div><div class='add'>+#if WIRELESS_EXT &gt; 12</div><div class='add'>+extern struct iw_handler_def p80211wext_handler_def;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+int p80211wext_event_associated(struct wlandevice *wlandev, int assoc);</div><div class='add'>+</div><div class='add'>+#endif /* wireless extensions */</div><div class='add'>+</div><div class='add'>+/* WEP stuff */</div><div class='add'>+#define NUM_WEPKEYS 4</div><div class='add'>+#define MAX_KEYLEN 32</div><div class='add'>+</div><div class='add'>+#define HOSTWEP_DEFAULTKEY_MASK (BIT1|BIT0)</div><div class='add'>+#define HOSTWEP_DECRYPT  BIT4</div><div class='add'>+#define HOSTWEP_ENCRYPT  BIT5</div><div class='add'>+#define HOSTWEP_PRIVACYINVOKED BIT6</div><div class='add'>+#define HOSTWEP_EXCLUDEUNENCRYPTED BIT7</div><div class='add'>+</div><div class='add'>+extern int wlan_watchdog;</div><div class='add'>+extern int wlan_wext_write;</div><div class='add'>+</div><div class='add'>+/* WLAN device type */</div><div class='add'>+typedef struct wlandevice</div><div class='add'>+{</div><div class='add'>+	struct wlandevice	*next;		/* link for list of devices */</div><div class='add'>+	void			*priv;		/* private data for MSD */</div><div class='add'>+</div><div class='add'>+	/* Subsystem State */</div><div class='add'>+	char		name[WLAN_DEVNAMELEN_MAX]; /* Dev name, from register_wlandev()*/</div><div class='add'>+	char		*nsdname;</div><div class='add'>+</div><div class='add'>+	UINT32          state;          /* Device I/F state (open/closed) */</div><div class='add'>+	UINT32		msdstate;	/* state of underlying driver */</div><div class='add'>+	UINT32		hwremoved;	/* Has the hw been yanked out? */</div><div class='add'>+</div><div class='add'>+	/* Hardware config */</div><div class='add'>+	UINT		irq;</div><div class='add'>+	UINT		iobase;</div><div class='add'>+	UINT		membase;</div><div class='add'>+	UINT32          nsdcaps;  /* NSD Capabilities flags */</div><div class='add'>+</div><div class='add'>+	/* Config vars */</div><div class='add'>+	UINT		ethconv;</div><div class='add'>+</div><div class='add'>+	/* device methods (init by MSD, used by p80211 */</div><div class='add'>+	int		(*open)(struct wlandevice *wlandev);</div><div class='add'>+	int		(*close)(struct wlandevice *wlandev);</div><div class='add'>+	void		(*reset)(struct wlandevice *wlandev );</div><div class='add'>+	int		(*txframe)(struct wlandevice *wlandev, struct sk_buff *skb, p80211_hdr_t *p80211_hdr, p80211_metawep_t *p80211_wep);</div><div class='add'>+	int		(*mlmerequest)(struct wlandevice *wlandev, p80211msg_t *msg);</div><div class='add'>+	int             (*set_multicast_list)(struct wlandevice *wlandev,</div><div class='add'>+					      netdevice_t *dev);</div><div class='add'>+	void		(*tx_timeout)(struct wlandevice *wlandev);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PROC_FS</div><div class='add'>+	int             (*nsd_proc_read)(char *page, char **start, off_t offset, int count, int	*eof, void *data);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* 802.11 State */</div><div class='add'>+	UINT8		bssid[WLAN_BSSID_LEN];</div><div class='add'>+	p80211pstr32_t	ssid;</div><div class='add'>+	UINT32		macmode;</div><div class='add'>+	int             linkstatus;</div><div class='add'>+	int             shortpreamble;  /* C bool */</div><div class='add'>+</div><div class='add'>+	/* WEP State */</div><div class='add'>+	UINT8 wep_keys[NUM_WEPKEYS][MAX_KEYLEN];</div><div class='add'>+	UINT8 wep_keylens[NUM_WEPKEYS];</div><div class='add'>+	int   hostwep;</div><div class='add'>+</div><div class='add'>+	/* Request/Confirm i/f state (used by p80211) */</div><div class='add'>+	unsigned long		request_pending; /* flag, access atomically */</div><div class='add'>+</div><div class='add'>+	/* netlink socket */</div><div class='add'>+	/* queue for indications waiting for cmd completion */</div><div class='add'>+	/* Linux netdevice and support */</div><div class='add'>+	netdevice_t		*netdev;	/* ptr to linux netdevice */</div><div class='add'>+	struct net_device_stats linux_stats;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PROC_FS</div><div class='add'>+	/* Procfs support */</div><div class='add'>+	struct proc_dir_entry	*procdir;</div><div class='add'>+	struct proc_dir_entry	*procwlandev;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* Rx bottom half */</div><div class='add'>+	struct tasklet_struct	rx_bh;</div><div class='add'>+</div><div class='add'>+	struct sk_buff_head	nsd_rxq;</div><div class='add'>+</div><div class='add'>+	/* 802.11 device statistics */</div><div class='add'>+	struct p80211_frmrx_t	rx;</div><div class='add'>+</div><div class='add'>+/* compatibility to wireless extensions */</div><div class='add'>+#ifdef WIRELESS_EXT</div><div class='add'>+	struct iw_statistics	wstats;</div><div class='add'>+</div><div class='add'>+	/* jkriegl: iwspy fields */</div><div class='add'>+        UINT8			spy_number;</div><div class='add'>+        char			spy_address[IW_MAX_SPY][ETH_ALEN];</div><div class='add'>+        struct iw_quality       spy_stat[IW_MAX_SPY];</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+} wlandevice_t;</div><div class='add'>+</div><div class='add'>+/* WEP stuff */</div><div class='add'>+int wep_change_key(wlandevice_t *wlandev, int keynum, UINT8* key, int keylen);</div><div class='add'>+int wep_decrypt(wlandevice_t *wlandev, UINT8 *buf, UINT32 len, int key_override, UINT8 *iv, UINT8 *icv);</div><div class='add'>+int wep_encrypt(wlandevice_t *wlandev, UINT8 *buf, UINT8 *dst, UINT32 len, int keynum, UINT8 *iv, UINT8 *icv);</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Externs */</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Function Declarations */</div><div class='add'>+</div><div class='add'>+void	p80211netdev_startup(void);</div><div class='add'>+void	p80211netdev_shutdown(void);</div><div class='add'>+int	wlan_setup(wlandevice_t *wlandev);</div><div class='add'>+int	wlan_unsetup(wlandevice_t *wlandev);</div><div class='add'>+int	register_wlandev(wlandevice_t *wlandev);</div><div class='add'>+int	unregister_wlandev(wlandevice_t *wlandev);</div><div class='add'>+void	p80211netdev_rx(wlandevice_t *wlandev, struct sk_buff *skb);</div><div class='add'>+void	p80211netdev_hwremoved(wlandevice_t *wlandev);</div><div class='add'>+void    p80211_suspend(wlandevice_t *wlandev);</div><div class='add'>+void    p80211_resume(wlandevice_t *wlandev);</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Function Definitions */</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+p80211netdev_stop_queue(wlandevice_t *wlandev)</div><div class='add'>+{</div><div class='add'>+	if ( !wlandev ) return;</div><div class='add'>+	if ( !wlandev-&gt;netdev ) return;</div><div class='add'>+#if (LINUX_VERSION_CODE &lt; KERNEL_VERSION(2,3,38) )</div><div class='add'>+	wlandev-&gt;netdev-&gt;tbusy = 1;</div><div class='add'>+	wlandev-&gt;netdev-&gt;start = 0;</div><div class='add'>+#else</div><div class='add'>+	netif_stop_queue(wlandev-&gt;netdev);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+p80211netdev_start_queue(wlandevice_t *wlandev)</div><div class='add'>+{</div><div class='add'>+	if ( !wlandev ) return;</div><div class='add'>+	if ( !wlandev-&gt;netdev ) return;</div><div class='add'>+#if (LINUX_VERSION_CODE &lt; KERNEL_VERSION(2,3,38) )</div><div class='add'>+	wlandev-&gt;netdev-&gt;tbusy = 0;</div><div class='add'>+	wlandev-&gt;netdev-&gt;start = 1;</div><div class='add'>+#else</div><div class='add'>+	netif_start_queue(wlandev-&gt;netdev);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+p80211netdev_wake_queue(wlandevice_t *wlandev)</div><div class='add'>+{</div><div class='add'>+	if ( !wlandev ) return;</div><div class='add'>+	if ( !wlandev-&gt;netdev ) return;</div><div class='add'>+#if (LINUX_VERSION_CODE &lt; KERNEL_VERSION(2,3,38) )</div><div class='add'>+	wlandev-&gt;netdev-&gt;tbusy = 0;</div><div class='add'>+	mark_bh(NET_BH);</div><div class='add'>+#else</div><div class='add'>+	netif_wake_queue(wlandev-&gt;netdev);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_HOTPLUG</div><div class='add'>+#define WLAN_HOTPLUG_REGISTER "register"</div><div class='add'>+#define WLAN_HOTPLUG_REMOVE   "remove"</div><div class='add'>+#define WLAN_HOTPLUG_STARTUP  "startup"</div><div class='add'>+#define WLAN_HOTPLUG_SHUTDOWN "shutdown"</div><div class='add'>+#define WLAN_HOTPLUG_SUSPEND "suspend"</div><div class='add'>+#define WLAN_HOTPLUG_RESUME "resume"</div><div class='add'>+int p80211_run_sbin_hotplug(wlandevice_t *wlandev, char *action);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/staging/wlan-ng/p80211req.c b/drivers/staging/wlan-ng/p80211req.c<br/>new file mode 100644<br/>index 000000000000..0233abeccc4b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/wlan-ng/p80211req.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/wlan-ng/p80211req.c</a></div><div class='hunk'>@@ -0,0 +1,329 @@</div><div class='add'>+/* src/p80211/p80211req.c</div><div class='add'>+*</div><div class='add'>+* Request/Indication/MacMgmt interface handling functions</div><div class='add'>+*</div><div class='add'>+* Copyright (C) 1999 AbsoluteValue Systems, Inc.  All Rights Reserved.</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* linux-wlan</div><div class='add'>+*</div><div class='add'>+*   The contents of this file are subject to the Mozilla Public</div><div class='add'>+*   License Version 1.1 (the "License"); you may not use this file</div><div class='add'>+*   except in compliance with the License. You may obtain a copy of</div><div class='add'>+*   the License at http://www.mozilla.org/MPL/</div><div class='add'>+*</div><div class='add'>+*   Software distributed under the License is distributed on an "AS</div><div class='add'>+*   IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or</div><div class='add'>+*   implied. See the License for the specific language governing</div><div class='add'>+*   rights and limitations under the License.</div><div class='add'>+*</div><div class='add'>+*   Alternatively, the contents of this file may be used under the</div><div class='add'>+*   terms of the GNU Public License version 2 (the "GPL"), in which</div><div class='add'>+*   case the provisions of the GPL are applicable instead of the</div><div class='add'>+*   above.  If you wish to allow the use of your version of this file</div><div class='add'>+*   only under the terms of the GPL and not to allow others to use</div><div class='add'>+*   your version of this file under the MPL, indicate your decision</div><div class='add'>+*   by deleting the provisions above and replace them with the notice</div><div class='add'>+*   and other provisions required by the GPL.  If you do not delete</div><div class='add'>+*   the provisions above, a recipient may use your version of this</div><div class='add'>+*   file under either the MPL or the GPL.</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* Inquiries regarding the linux-wlan Open Source project can be</div><div class='add'>+* made directly to:</div><div class='add'>+*</div><div class='add'>+* AbsoluteValue Systems Inc.</div><div class='add'>+* info@linux-wlan.com</div><div class='add'>+* http://www.linux-wlan.com</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* Portions of the development of this software were funded by</div><div class='add'>+* Intersil Corporation as part of PRISM(R) chipset product development.</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* This file contains the functions, types, and macros to support the</div><div class='add'>+* MLME request interface that's implemented via the device ioctls.</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* System Includes */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#include &lt;linux/version.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/wireless.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;net/sock.h&gt;</div><div class='add'>+#include &lt;linux/netlink.h&gt;</div><div class='add'>+</div><div class='add'>+#include "version.h"</div><div class='add'>+#include "wlan_compat.h"</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Project Includes */</div><div class='add'>+</div><div class='add'>+#include "p80211types.h"</div><div class='add'>+#include "p80211hdr.h"</div><div class='add'>+#include "p80211mgmt.h"</div><div class='add'>+#include "p80211conv.h"</div><div class='add'>+#include "p80211msg.h"</div><div class='add'>+#include "p80211netdev.h"</div><div class='add'>+#include "p80211ioctl.h"</div><div class='add'>+#include "p80211metadef.h"</div><div class='add'>+#include "p80211metastruct.h"</div><div class='add'>+#include "p80211req.h"</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Local Constants */</div><div class='add'>+</div><div class='add'>+/* Maximum amount of time we'll wait for a request to complete */</div><div class='add'>+#define P80211REQ_MAXTIME	3*HZ	/* 3 seconds */</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Local Macros */</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Local Types */</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Local Static Definitions */</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Local Function Declarations */</div><div class='add'>+</div><div class='add'>+static void p80211req_handlemsg( wlandevice_t *wlandev, p80211msg_t *msg);</div><div class='add'>+static int p80211req_mibset_mibget(wlandevice_t *wlandev, p80211msg_dot11req_mibget_t *mib_msg, int isget);</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Function Definitions */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* p80211req_dorequest</div><div class='add'>+*</div><div class='add'>+* Handles an MLME reqest/confirm message.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		WLAN device struct</div><div class='add'>+*	msgbuf		Buffer containing a request message</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0 on success, an errno otherwise</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	Potentially blocks the caller, so it's a good idea to</div><div class='add'>+*	not call this function from an interrupt context.</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int p80211req_dorequest( wlandevice_t *wlandev, UINT8 *msgbuf)</div><div class='add'>+{</div><div class='add'>+	int		result = 0;</div><div class='add'>+	p80211msg_t	*msg = (p80211msg_t*)msgbuf;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	/* Check to make sure the MSD is running */</div><div class='add'>+	if (</div><div class='add'>+	!((wlandev-&gt;msdstate == WLAN_MSD_HWPRESENT &amp;&amp;</div><div class='add'>+	msg-&gt;msgcode == DIDmsg_lnxreq_ifstate) ||</div><div class='add'>+	wlandev-&gt;msdstate == WLAN_MSD_RUNNING ||</div><div class='add'>+	wlandev-&gt;msdstate == WLAN_MSD_FWLOAD) ) {</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check Permissions */</div><div class='add'>+	if (!capable(CAP_NET_ADMIN) &amp;&amp;</div><div class='add'>+	    (msg-&gt;msgcode != DIDmsg_dot11req_mibget)) {</div><div class='add'>+		WLAN_LOG_ERROR("%s: only dot11req_mibget allowed for non-root.\n", wlandev-&gt;name);</div><div class='add'>+		return -EPERM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check for busy status */</div><div class='add'>+	if ( test_and_set_bit(1, &amp;(wlandev-&gt;request_pending))) {</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Allow p80211 to look at msg and handle if desired. */</div><div class='add'>+	/* So far, all p80211 msgs are immediate, no waitq/timer necessary */</div><div class='add'>+	/* This may change. */</div><div class='add'>+	p80211req_handlemsg(wlandev, msg);</div><div class='add'>+</div><div class='add'>+	/* Pass it down to wlandev via wlandev-&gt;mlmerequest */</div><div class='add'>+	if ( wlandev-&gt;mlmerequest != NULL )</div><div class='add'>+		wlandev-&gt;mlmerequest(wlandev, msg);</div><div class='add'>+</div><div class='add'>+	clear_bit( 1, &amp;(wlandev-&gt;request_pending));</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;	/* if result==0, msg-&gt;status still may contain an err */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* p80211req_handlemsg</div><div class='add'>+*</div><div class='add'>+* p80211 message handler.  Primarily looks for messages that</div><div class='add'>+* belong to p80211 and then dispatches the appropriate response.</div><div class='add'>+* TODO: we don't do anything yet.  Once the linuxMIB is better</div><div class='add'>+*	defined we'll need a get/set handler.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		WLAN device struct</div><div class='add'>+*	msg		message structure</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	nothing (any results are set in the status field of the msg)</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	Process thread</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+static void p80211req_handlemsg( wlandevice_t *wlandev, p80211msg_t *msg)</div><div class='add'>+{</div><div class='add'>+        DBFENTER;</div><div class='add'>+</div><div class='add'>+	switch (msg-&gt;msgcode) {</div><div class='add'>+</div><div class='add'>+	case DIDmsg_lnxreq_hostwep: {</div><div class='add'>+		p80211msg_lnxreq_hostwep_t *req = (p80211msg_lnxreq_hostwep_t*) msg;</div><div class='add'>+		wlandev-&gt;hostwep &amp;= ~(HOSTWEP_DECRYPT|HOSTWEP_ENCRYPT);</div><div class='add'>+		if (req-&gt;decrypt.data == P80211ENUM_truth_true)</div><div class='add'>+			wlandev-&gt;hostwep |= HOSTWEP_DECRYPT;</div><div class='add'>+		if (req-&gt;encrypt.data == P80211ENUM_truth_true)</div><div class='add'>+			wlandev-&gt;hostwep |= HOSTWEP_ENCRYPT;</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case DIDmsg_dot11req_mibget:</div><div class='add'>+	case DIDmsg_dot11req_mibset: {</div><div class='add'>+		int isget = (msg-&gt;msgcode == DIDmsg_dot11req_mibget);</div><div class='add'>+		p80211msg_dot11req_mibget_t  *mib_msg = (p80211msg_dot11req_mibget_t *) msg;</div><div class='add'>+		p80211req_mibset_mibget (wlandev, mib_msg, isget);</div><div class='add'>+	}</div><div class='add'>+	default:</div><div class='add'>+		// XXX do nothing!</div><div class='add'>+		;</div><div class='add'>+	} /* switch msg-&gt;msgcode */</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int p80211req_mibset_mibget(wlandevice_t *wlandev,</div><div class='add'>+				   p80211msg_dot11req_mibget_t *mib_msg,</div><div class='add'>+				   int isget)</div><div class='add'>+{</div><div class='add'>+	p80211itemd_t   *mibitem = (p80211itemd_t *) mib_msg-&gt;mibattribute.data;</div><div class='add'>+	p80211pstrd_t  *pstr = (p80211pstrd_t*) mibitem-&gt;data;</div><div class='add'>+	UINT8 *key = mibitem-&gt;data + sizeof(p80211pstrd_t);</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	switch (mibitem-&gt;did) {</div><div class='add'>+	case DIDmib_dot11smt_p80211Table_p80211_ifstate: {</div><div class='add'>+		UINT32 *data = (UINT32 *) mibitem-&gt;data;</div><div class='add'>+		if (isget)</div><div class='add'>+			switch (wlandev-&gt;msdstate) {</div><div class='add'>+			case WLAN_MSD_HWPRESENT:</div><div class='add'>+				*data = P80211ENUM_ifstate_disable;</div><div class='add'>+				break;</div><div class='add'>+			case WLAN_MSD_FWLOAD:</div><div class='add'>+				*data = P80211ENUM_ifstate_fwload;</div><div class='add'>+				break;</div><div class='add'>+			case WLAN_MSD_RUNNING:</div><div class='add'>+				*data = P80211ENUM_ifstate_enable;</div><div class='add'>+				break;</div><div class='add'>+			default:</div><div class='add'>+				*data = P80211ENUM_ifstate_enable;</div><div class='add'>+			}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case DIDmib_dot11phy_dot11PhyOperationTable_dot11ShortPreambleEnabled: {</div><div class='add'>+		UINT32 *data = (UINT32 *) mibitem-&gt;data;</div><div class='add'>+</div><div class='add'>+		if (isget)</div><div class='add'>+			*data = wlandev-&gt;shortpreamble;</div><div class='add'>+		else</div><div class='add'>+			wlandev-&gt;shortpreamble = *data;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey0: {</div><div class='add'>+		if (!isget)</div><div class='add'>+			wep_change_key(wlandev, 0, key, pstr-&gt;len);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey1: {</div><div class='add'>+		if (!isget)</div><div class='add'>+			wep_change_key(wlandev, 1, key, pstr-&gt;len);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey2: {</div><div class='add'>+		if (!isget)</div><div class='add'>+			wep_change_key(wlandev, 2, key, pstr-&gt;len);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey3: {</div><div class='add'>+		if (!isget)</div><div class='add'>+			wep_change_key(wlandev, 3, key, pstr-&gt;len);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case DIDmib_dot11smt_dot11PrivacyTable_dot11WEPDefaultKeyID: {</div><div class='add'>+		UINT32 *data = (UINT32 *) mibitem-&gt;data;</div><div class='add'>+</div><div class='add'>+		if (isget) {</div><div class='add'>+			*data = wlandev-&gt;hostwep &amp; HOSTWEP_DEFAULTKEY_MASK;</div><div class='add'>+			} else {</div><div class='add'>+				wlandev-&gt;hostwep &amp;= ~(HOSTWEP_DEFAULTKEY_MASK);</div><div class='add'>+</div><div class='add'>+				wlandev-&gt;hostwep |= (*data &amp; HOSTWEP_DEFAULTKEY_MASK);</div><div class='add'>+			}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case DIDmib_dot11smt_dot11PrivacyTable_dot11PrivacyInvoked: {</div><div class='add'>+		UINT32 *data = (UINT32 *) mibitem-&gt;data;</div><div class='add'>+</div><div class='add'>+		if (isget) {</div><div class='add'>+			if (wlandev-&gt;hostwep &amp; HOSTWEP_PRIVACYINVOKED)</div><div class='add'>+				*data = P80211ENUM_truth_true;</div><div class='add'>+			else</div><div class='add'>+				*data = P80211ENUM_truth_false;</div><div class='add'>+		} else {</div><div class='add'>+				wlandev-&gt;hostwep &amp;= ~(HOSTWEP_PRIVACYINVOKED);</div><div class='add'>+				if (*data == P80211ENUM_truth_true)</div><div class='add'>+					wlandev-&gt;hostwep |= HOSTWEP_PRIVACYINVOKED;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case DIDmib_dot11smt_dot11PrivacyTable_dot11ExcludeUnencrypted: {</div><div class='add'>+		UINT32 *data = (UINT32 *) mibitem-&gt;data;</div><div class='add'>+</div><div class='add'>+		if (isget) {</div><div class='add'>+			if (wlandev-&gt;hostwep &amp; HOSTWEP_EXCLUDEUNENCRYPTED)</div><div class='add'>+				*data = P80211ENUM_truth_true;</div><div class='add'>+			else</div><div class='add'>+				*data = P80211ENUM_truth_false;</div><div class='add'>+		} else {</div><div class='add'>+			wlandev-&gt;hostwep &amp;= ~(HOSTWEP_EXCLUDEUNENCRYPTED);</div><div class='add'>+			if (*data == P80211ENUM_truth_true)</div><div class='add'>+				wlandev-&gt;hostwep |= HOSTWEP_EXCLUDEUNENCRYPTED;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	default:</div><div class='add'>+		// XXXX do nothing!</div><div class='add'>+		;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='head'>diff --git a/drivers/staging/wlan-ng/p80211req.h b/drivers/staging/wlan-ng/p80211req.h<br/>new file mode 100644<br/>index 000000000000..54abdceedc5d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/wlan-ng/p80211req.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/wlan-ng/p80211req.h</a></div><div class='hunk'>@@ -0,0 +1,68 @@</div><div class='add'>+/* p80211req.h</div><div class='add'>+*</div><div class='add'>+* Request handling functions</div><div class='add'>+*</div><div class='add'>+* Copyright (C) 1999 AbsoluteValue Systems, Inc.  All Rights Reserved.</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* linux-wlan</div><div class='add'>+*</div><div class='add'>+*   The contents of this file are subject to the Mozilla Public</div><div class='add'>+*   License Version 1.1 (the "License"); you may not use this file</div><div class='add'>+*   except in compliance with the License. You may obtain a copy of</div><div class='add'>+*   the License at http://www.mozilla.org/MPL/</div><div class='add'>+*</div><div class='add'>+*   Software distributed under the License is distributed on an "AS</div><div class='add'>+*   IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or</div><div class='add'>+*   implied. See the License for the specific language governing</div><div class='add'>+*   rights and limitations under the License.</div><div class='add'>+*</div><div class='add'>+*   Alternatively, the contents of this file may be used under the</div><div class='add'>+*   terms of the GNU Public License version 2 (the "GPL"), in which</div><div class='add'>+*   case the provisions of the GPL are applicable instead of the</div><div class='add'>+*   above.  If you wish to allow the use of your version of this file</div><div class='add'>+*   only under the terms of the GPL and not to allow others to use</div><div class='add'>+*   your version of this file under the MPL, indicate your decision</div><div class='add'>+*   by deleting the provisions above and replace them with the notice</div><div class='add'>+*   and other provisions required by the GPL.  If you do not delete</div><div class='add'>+*   the provisions above, a recipient may use your version of this</div><div class='add'>+*   file under either the MPL or the GPL.</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* Inquiries regarding the linux-wlan Open Source project can be</div><div class='add'>+* made directly to:</div><div class='add'>+*</div><div class='add'>+* AbsoluteValue Systems Inc.</div><div class='add'>+* info@linux-wlan.com</div><div class='add'>+* http://www.linux-wlan.com</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* Portions of the development of this software were funded by</div><div class='add'>+* Intersil Corporation as part of PRISM(R) chipset product development.</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#ifndef _LINUX_P80211REQ_H</div><div class='add'>+#define _LINUX_P80211REQ_H</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Constants */</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Macros */</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Types */</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Externs */</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Function Declarations */</div><div class='add'>+</div><div class='add'>+int	p80211req_dorequest(wlandevice_t *wlandev, UINT8 *msgbuf);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/staging/wlan-ng/p80211types.h b/drivers/staging/wlan-ng/p80211types.h<br/>new file mode 100644<br/>index 000000000000..811b0ce39bf6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/wlan-ng/p80211types.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/wlan-ng/p80211types.h</a></div><div class='hunk'>@@ -0,0 +1,675 @@</div><div class='add'>+/* p80211types.h</div><div class='add'>+*</div><div class='add'>+* Macros, constants, types, and funcs for p80211 data types</div><div class='add'>+*</div><div class='add'>+* Copyright (C) 1999 AbsoluteValue Systems, Inc.  All Rights Reserved.</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* linux-wlan</div><div class='add'>+*</div><div class='add'>+*   The contents of this file are subject to the Mozilla Public</div><div class='add'>+*   License Version 1.1 (the "License"); you may not use this file</div><div class='add'>+*   except in compliance with the License. You may obtain a copy of</div><div class='add'>+*   the License at http://www.mozilla.org/MPL/</div><div class='add'>+*</div><div class='add'>+*   Software distributed under the License is distributed on an "AS</div><div class='add'>+*   IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or</div><div class='add'>+*   implied. See the License for the specific language governing</div><div class='add'>+*   rights and limitations under the License.</div><div class='add'>+*</div><div class='add'>+*   Alternatively, the contents of this file may be used under the</div><div class='add'>+*   terms of the GNU Public License version 2 (the "GPL"), in which</div><div class='add'>+*   case the provisions of the GPL are applicable instead of the</div><div class='add'>+*   above.  If you wish to allow the use of your version of this file</div><div class='add'>+*   only under the terms of the GPL and not to allow others to use</div><div class='add'>+*   your version of this file under the MPL, indicate your decision</div><div class='add'>+*   by deleting the provisions above and replace them with the notice</div><div class='add'>+*   and other provisions required by the GPL.  If you do not delete</div><div class='add'>+*   the provisions above, a recipient may use your version of this</div><div class='add'>+*   file under either the MPL or the GPL.</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* Inquiries regarding the linux-wlan Open Source project can be</div><div class='add'>+* made directly to:</div><div class='add'>+*</div><div class='add'>+* AbsoluteValue Systems Inc.</div><div class='add'>+* info@linux-wlan.com</div><div class='add'>+* http://www.linux-wlan.com</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* Portions of the development of this software were funded by</div><div class='add'>+* Intersil Corporation as part of PRISM(R) chipset product development.</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* This file declares some of the constants and types used in various</div><div class='add'>+* parts of the linux-wlan system.</div><div class='add'>+*</div><div class='add'>+* Notes:</div><div class='add'>+*   - Constant values are always in HOST byte order.</div><div class='add'>+*</div><div class='add'>+* All functions and statics declared here are implemented in p80211types.c</div><div class='add'>+*   --------------------------------------------------------------------</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#ifndef _P80211TYPES_H</div><div class='add'>+#define _P80211TYPES_H</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* System Includes */</div><div class='add'>+/*================================================================*/</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Project Includes */</div><div class='add'>+/*================================================================*/</div><div class='add'>+</div><div class='add'>+#ifndef _WLAN_COMPAT_H</div><div class='add'>+#include "wlan_compat.h"</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Constants */</div><div class='add'>+/*================================================================*/</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------*/</div><div class='add'>+/* p80211 data type codes used for MIB items and message */</div><div class='add'>+/* arguments. The various metadata structures provide additional */</div><div class='add'>+/* information about these types. */</div><div class='add'>+</div><div class='add'>+#define P80211_TYPE_OCTETSTR		1	/* pascal array of bytes */</div><div class='add'>+#define P80211_TYPE_DISPLAYSTR		2	/* pascal array of bytes containing ascii */</div><div class='add'>+#define P80211_TYPE_INT			4	/* UINT32 min and max limited by 32 bits */</div><div class='add'>+#define P80211_TYPE_ENUMINT		5	/* UINT32 holding a numeric</div><div class='add'>+						   code that can be mapped</div><div class='add'>+						   to a textual name */</div><div class='add'>+#define P80211_TYPE_UNKDATA		6	/* Data item containing an</div><div class='add'>+						   unknown data type */</div><div class='add'>+#define P80211_TYPE_INTARRAY		7	/* Array of 32-bit integers. */</div><div class='add'>+#define P80211_TYPE_BITARRAY		8	/* Array of bits. */</div><div class='add'>+#define P80211_TYPE_MACARRAY		9	/* Array of MAC addresses. */</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------*/</div><div class='add'>+/* The following constants are indexes into the Mib Category List */</div><div class='add'>+/* and the Message Category List */</div><div class='add'>+</div><div class='add'>+/* Mib Category List */</div><div class='add'>+#define P80211_MIB_CAT_DOT11SMT		1</div><div class='add'>+#define P80211_MIB_CAT_DOT11MAC		2</div><div class='add'>+#define P80211_MIB_CAT_DOT11PHY		3</div><div class='add'>+</div><div class='add'>+#define P80211SEC_DOT11SMT		P80211_MIB_CAT_DOT11SMT</div><div class='add'>+#define P80211SEC_DOT11MAC		P80211_MIB_CAT_DOT11MAC</div><div class='add'>+#define P80211SEC_DOT11PHY		P80211_MIB_CAT_DOT11PHY</div><div class='add'>+</div><div class='add'>+/* Message Category List */</div><div class='add'>+#define P80211_MSG_CAT_DOT11REQ		1</div><div class='add'>+#define P80211_MSG_CAT_DOT11IND		2</div><div class='add'>+/* #define P80211_MSG_CAT_DOT11CFM		3 (doesn't exist at this time) */</div><div class='add'>+</div><div class='add'>+#define P80211SEC_DOT11REQ		P80211_MSG_CAT_DOT11REQ</div><div class='add'>+#define P80211SEC_DOT11IND		P80211_MSG_CAT_DOT11IND</div><div class='add'>+/* #define P80211SEC_DOT11CFM		P80211_MSG_CAT_DOT11CFM  (doesn't exist at this time */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------*/</div><div class='add'>+/* p80211 DID field codes that represent access type and */</div><div class='add'>+/* is_table status. */</div><div class='add'>+</div><div class='add'>+#define P80211DID_ACCESS_READ		0x10000000</div><div class='add'>+#define P80211DID_ACCESS_WRITE		0x08000000</div><div class='add'>+#define P80211DID_WRITEONLY		0x00000001</div><div class='add'>+#define P80211DID_READONLY		0x00000002</div><div class='add'>+#define P80211DID_READWRITE		0x00000003</div><div class='add'>+#define P80211DID_ISTABLE_FALSE		0</div><div class='add'>+#define P80211DID_ISTABLE_TRUE		1</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------*/</div><div class='add'>+/* p80211 enumeration constants.  The value to text mappings for */</div><div class='add'>+/*  these is in p80211types.c.  These defines were generated */</div><div class='add'>+/*  from the mappings. */</div><div class='add'>+</div><div class='add'>+/* error codes for lookups */</div><div class='add'>+#define P80211ENUM_BAD				0xffffffffUL</div><div class='add'>+#define P80211ENUM_BADSTR			"P80211ENUM_BAD"</div><div class='add'>+</div><div class='add'>+#define P80211ENUM_truth_false			0</div><div class='add'>+#define P80211ENUM_truth_true			1</div><div class='add'>+#define P80211ENUM_ifstate_disable		0</div><div class='add'>+#define P80211ENUM_ifstate_fwload		1</div><div class='add'>+#define P80211ENUM_ifstate_enable		2</div><div class='add'>+#define P80211ENUM_powermgmt_active		1</div><div class='add'>+#define P80211ENUM_powermgmt_powersave		2</div><div class='add'>+#define P80211ENUM_bsstype_infrastructure	1</div><div class='add'>+#define P80211ENUM_bsstype_independent		2</div><div class='add'>+#define P80211ENUM_bsstype_any			3</div><div class='add'>+#define P80211ENUM_authalg_opensystem		1</div><div class='add'>+#define P80211ENUM_authalg_sharedkey		2</div><div class='add'>+#define P80211ENUM_phytype_fhss			1</div><div class='add'>+#define P80211ENUM_phytype_dsss			2</div><div class='add'>+#define P80211ENUM_phytype_irbaseband		3</div><div class='add'>+#define P80211ENUM_temptype_commercial		1</div><div class='add'>+#define P80211ENUM_temptype_industrial		2</div><div class='add'>+#define P80211ENUM_regdomain_fcc		16</div><div class='add'>+#define P80211ENUM_regdomain_doc		32</div><div class='add'>+#define P80211ENUM_regdomain_etsi		48</div><div class='add'>+#define P80211ENUM_regdomain_spain		49</div><div class='add'>+#define P80211ENUM_regdomain_france		50</div><div class='add'>+#define P80211ENUM_regdomain_mkk		64</div><div class='add'>+#define P80211ENUM_ccamode_edonly		1</div><div class='add'>+#define P80211ENUM_ccamode_csonly		2</div><div class='add'>+#define P80211ENUM_ccamode_edandcs		4</div><div class='add'>+#define P80211ENUM_ccamode_cswithtimer		8</div><div class='add'>+#define P80211ENUM_ccamode_hrcsanded		16</div><div class='add'>+#define P80211ENUM_diversity_fixedlist		1</div><div class='add'>+#define P80211ENUM_diversity_notsupported	2</div><div class='add'>+#define P80211ENUM_diversity_dynamic		3</div><div class='add'>+#define P80211ENUM_scantype_active		1</div><div class='add'>+#define P80211ENUM_scantype_passive		2</div><div class='add'>+#define P80211ENUM_scantype_both		3</div><div class='add'>+#define P80211ENUM_resultcode_success		1</div><div class='add'>+#define P80211ENUM_resultcode_invalid_parameters	2</div><div class='add'>+#define P80211ENUM_resultcode_not_supported	3</div><div class='add'>+#define P80211ENUM_resultcode_timeout		4</div><div class='add'>+#define P80211ENUM_resultcode_too_many_req	5</div><div class='add'>+#define P80211ENUM_resultcode_refused		6</div><div class='add'>+#define P80211ENUM_resultcode_bss_already	7</div><div class='add'>+#define P80211ENUM_resultcode_invalid_access	8</div><div class='add'>+#define P80211ENUM_resultcode_invalid_mibattribute	9</div><div class='add'>+#define P80211ENUM_resultcode_cant_set_readonly_mib	10</div><div class='add'>+#define P80211ENUM_resultcode_implementation_failure	11</div><div class='add'>+#define P80211ENUM_resultcode_cant_get_writeonly_mib	12</div><div class='add'>+#define P80211ENUM_reason_unspec_reason		1</div><div class='add'>+#define P80211ENUM_reason_auth_not_valid	2</div><div class='add'>+#define P80211ENUM_reason_deauth_lv_ss		3</div><div class='add'>+#define P80211ENUM_reason_inactivity		4</div><div class='add'>+#define P80211ENUM_reason_ap_overload		5</div><div class='add'>+#define P80211ENUM_reason_class23_err		6</div><div class='add'>+#define P80211ENUM_reason_class3_err		7</div><div class='add'>+#define P80211ENUM_reason_disas_lv_ss		8</div><div class='add'>+#define P80211ENUM_reason_asoc_not_auth		9</div><div class='add'>+#define P80211ENUM_status_successful		0</div><div class='add'>+#define P80211ENUM_status_unspec_failure	1</div><div class='add'>+#define P80211ENUM_status_unsup_cap		10</div><div class='add'>+#define P80211ENUM_status_reasoc_no_asoc	11</div><div class='add'>+#define P80211ENUM_status_fail_other		12</div><div class='add'>+#define P80211ENUM_status_unspt_alg		13</div><div class='add'>+#define P80211ENUM_status_auth_seq_fail		14</div><div class='add'>+#define P80211ENUM_status_chlng_fail		15</div><div class='add'>+#define P80211ENUM_status_auth_timeout		16</div><div class='add'>+#define P80211ENUM_status_ap_full		17</div><div class='add'>+#define P80211ENUM_status_unsup_rate		18</div><div class='add'>+#define P80211ENUM_status_unsup_shortpreamble	19</div><div class='add'>+#define P80211ENUM_status_unsup_pbcc		20</div><div class='add'>+#define P80211ENUM_status_unsup_agility		21</div><div class='add'>+#define P80211ENUM_msgitem_status_data_ok		0</div><div class='add'>+#define P80211ENUM_msgitem_status_no_value		1</div><div class='add'>+#define P80211ENUM_msgitem_status_invalid_itemname	2</div><div class='add'>+#define P80211ENUM_msgitem_status_invalid_itemdata	3</div><div class='add'>+#define P80211ENUM_msgitem_status_missing_itemdata	4</div><div class='add'>+#define P80211ENUM_msgitem_status_incomplete_itemdata	5</div><div class='add'>+#define P80211ENUM_msgitem_status_invalid_msg_did	6</div><div class='add'>+#define P80211ENUM_msgitem_status_invalid_mib_did	7</div><div class='add'>+#define P80211ENUM_msgitem_status_missing_conv_func	8</div><div class='add'>+#define P80211ENUM_msgitem_status_string_too_long	9</div><div class='add'>+#define P80211ENUM_msgitem_status_data_out_of_range	10</div><div class='add'>+#define P80211ENUM_msgitem_status_string_too_short	11</div><div class='add'>+#define P80211ENUM_msgitem_status_missing_valid_func	12</div><div class='add'>+#define P80211ENUM_msgitem_status_unknown		13</div><div class='add'>+#define P80211ENUM_msgitem_status_invalid_did		14</div><div class='add'>+#define P80211ENUM_msgitem_status_missing_print_func	15</div><div class='add'>+</div><div class='add'>+#define P80211ENUM_lnxroam_reason_unknown        0</div><div class='add'>+#define P80211ENUM_lnxroam_reason_beacon         1</div><div class='add'>+#define P80211ENUM_lnxroam_reason_signal         2</div><div class='add'>+#define P80211ENUM_lnxroam_reason_txretry        3</div><div class='add'>+#define P80211ENUM_lnxroam_reason_notjoined      4</div><div class='add'>+</div><div class='add'>+#define P80211ENUM_p2preamble_long               0</div><div class='add'>+#define P80211ENUM_p2preamble_short              2</div><div class='add'>+#define P80211ENUM_p2preamble_mixed              3</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------*/</div><div class='add'>+/* p80211 max length constants for the different pascal strings. */</div><div class='add'>+</div><div class='add'>+#define MAXLEN_PSTR6		(6)	/* pascal array of 6 bytes */</div><div class='add'>+#define MAXLEN_PSTR14		(14)	/* pascal array of 14 bytes */</div><div class='add'>+#define MAXLEN_PSTR32		(32)	/* pascal array of 32 bytes */</div><div class='add'>+#define MAXLEN_PSTR255		(255)	/* pascal array of 255 bytes */</div><div class='add'>+#define MAXLEN_MIBATTRIBUTE	(392)	/* maximum mibattribute */</div><div class='add'>+					/* where the size of the DATA itself */</div><div class='add'>+					/* is a DID-LEN-DATA triple */</div><div class='add'>+					/* with a max size of 4+4+384 */</div><div class='add'>+</div><div class='add'>+#define P80211_SET_INT(item, value) do { \</div><div class='add'>+	(item).data   = (value); \</div><div class='add'>+	(item).status = P80211ENUM_msgitem_status_data_ok; \</div><div class='add'>+	} while(0)</div><div class='add'>+/*----------------------------------------------------------------*/</div><div class='add'>+/* string constants */</div><div class='add'>+</div><div class='add'>+#define NOT_SET			"NOT_SET"</div><div class='add'>+#define NOT_SUPPORTED		"NOT_SUPPORTED"</div><div class='add'>+#define UNKNOWN_DATA		"UNKNOWN_DATA"</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*--------------------------------------------------------------------*/</div><div class='add'>+/*  Metadata flags  */</div><div class='add'>+</div><div class='add'>+/* MSM: Do these belong in p80211meta.h? I'm not sure. */</div><div class='add'>+</div><div class='add'>+#define ISREQUIRED		(0x80000000UL)</div><div class='add'>+#define ISREQUEST		(0x40000000UL)</div><div class='add'>+#define ISCONFIRM		(0x20000000UL)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Macros */</div><div class='add'>+</div><div class='add'>+/*--------------------------------------------------------------------*/</div><div class='add'>+/* The following macros are used to manipulate the 'flags' field in   */</div><div class='add'>+/*  the metadata.  These are only used when the metadata is for       */</div><div class='add'>+/*  command arguments to determine if the data item is required, and  */</div><div class='add'>+/*  whether the metadata item is for a request command, confirm       */</div><div class='add'>+/*  command or both.                                                  */</div><div class='add'>+/*--------------------------------------------------------------------*/</div><div class='add'>+/* MSM: Do these belong in p80211meta.h?  I'm not sure */</div><div class='add'>+</div><div class='add'>+#define P80211ITEM_SETFLAGS(q, r, c)	( q | r | c )</div><div class='add'>+</div><div class='add'>+#define P80211ITEM_ISREQUIRED(flags)	(((UINT32)(flags &amp; ISREQUIRED)) &gt;&gt; 31 )</div><div class='add'>+#define P80211ITEM_ISREQUEST(flags)	(((UINT32)(flags &amp; ISREQUEST)) &gt;&gt; 30 )</div><div class='add'>+#define P80211ITEM_ISCONFIRM(flags)	(((UINT32)(flags &amp; ISCONFIRM)) &gt;&gt; 29 )</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------*/</div><div class='add'>+/* The following macro creates a name for an enum */</div><div class='add'>+</div><div class='add'>+#define MKENUMNAME(name) p80211enum_ ## name</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* The following constants and macros are used to construct and</div><div class='add'>+* deconstruct the Data ID codes.  The coding is as follows:</div><div class='add'>+*</div><div class='add'>+*     ...rwtnnnnnnnniiiiiiggggggssssss      s - Section</div><div class='add'>+*                                           g - Group</div><div class='add'>+*                                           i - Item</div><div class='add'>+*                                           n - Index</div><div class='add'>+*                                           t - Table flag</div><div class='add'>+*                                           w - Write flag</div><div class='add'>+*                                           r - Read flag</div><div class='add'>+*                                           . - Unused</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#define P80211DID_INVALID		0xffffffffUL</div><div class='add'>+#define P80211DID_VALID			0x00000000UL</div><div class='add'>+</div><div class='add'>+#define P80211DID_LSB_SECTION		(0)</div><div class='add'>+#define P80211DID_LSB_GROUP		(6)</div><div class='add'>+#define P80211DID_LSB_ITEM		(12)</div><div class='add'>+#define P80211DID_LSB_INDEX		(18)</div><div class='add'>+#define P80211DID_LSB_ISTABLE		(26)</div><div class='add'>+#define P80211DID_LSB_ACCESS 		(27)</div><div class='add'>+</div><div class='add'>+#define P80211DID_MASK_SECTION		(0x0000003fUL)</div><div class='add'>+#define P80211DID_MASK_GROUP		(0x0000003fUL)</div><div class='add'>+#define P80211DID_MASK_ITEM		(0x0000003fUL)</div><div class='add'>+#define P80211DID_MASK_INDEX		(0x000000ffUL)</div><div class='add'>+#define P80211DID_MASK_ISTABLE		(0x00000001UL)</div><div class='add'>+#define P80211DID_MASK_ACCESS 		(0x00000003UL)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define P80211DID_MK(a,m,l)	((((UINT32)(a)) &amp; (m)) &lt;&lt; (l))</div><div class='add'>+</div><div class='add'>+#define P80211DID_MKSECTION(a)	P80211DID_MK(a, \</div><div class='add'>+					P80211DID_MASK_SECTION, \</div><div class='add'>+					P80211DID_LSB_SECTION )</div><div class='add'>+#define P80211DID_MKGROUP(a)	P80211DID_MK(a, \</div><div class='add'>+					P80211DID_MASK_GROUP, \</div><div class='add'>+					P80211DID_LSB_GROUP )</div><div class='add'>+#define P80211DID_MKITEM(a)	P80211DID_MK(a, \</div><div class='add'>+					P80211DID_MASK_ITEM, \</div><div class='add'>+					P80211DID_LSB_ITEM )</div><div class='add'>+#define P80211DID_MKINDEX(a)	P80211DID_MK(a, \</div><div class='add'>+					P80211DID_MASK_INDEX, \</div><div class='add'>+					P80211DID_LSB_INDEX )</div><div class='add'>+#define P80211DID_MKISTABLE(a)	P80211DID_MK(a, \</div><div class='add'>+					P80211DID_MASK_ISTABLE, \</div><div class='add'>+					P80211DID_LSB_ISTABLE )</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define P80211DID_MKID(s,g,i,n,t,a)	(P80211DID_MKSECTION(s) | \</div><div class='add'>+						P80211DID_MKGROUP(g) | \</div><div class='add'>+				 		P80211DID_MKITEM(i) | \</div><div class='add'>+				 		P80211DID_MKINDEX(n) | \</div><div class='add'>+						P80211DID_MKISTABLE(t) | \</div><div class='add'>+						(a) )</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define P80211DID_GET(a,m,l)	((((UINT32)(a)) &gt;&gt; (l)) &amp; (m))</div><div class='add'>+</div><div class='add'>+#define P80211DID_SECTION(a)	P80211DID_GET(a, \</div><div class='add'>+					P80211DID_MASK_SECTION, \</div><div class='add'>+					P80211DID_LSB_SECTION)</div><div class='add'>+#define P80211DID_GROUP(a)	P80211DID_GET(a, \</div><div class='add'>+					P80211DID_MASK_GROUP, \</div><div class='add'>+					P80211DID_LSB_GROUP)</div><div class='add'>+#define P80211DID_ITEM(a)	P80211DID_GET(a, \</div><div class='add'>+					P80211DID_MASK_ITEM, \</div><div class='add'>+					P80211DID_LSB_ITEM)</div><div class='add'>+#define P80211DID_INDEX(a)	P80211DID_GET(a, \</div><div class='add'>+					P80211DID_MASK_INDEX, \</div><div class='add'>+					P80211DID_LSB_INDEX)</div><div class='add'>+#define P80211DID_ISTABLE(a)	P80211DID_GET(a, \</div><div class='add'>+					P80211DID_MASK_ISTABLE, \</div><div class='add'>+					P80211DID_LSB_ISTABLE)</div><div class='add'>+#define P80211DID_ACCESS(a)	P80211DID_GET(a, \</div><div class='add'>+					P80211DID_MASK_ACCESS, \</div><div class='add'>+					P80211DID_LSB_ACCESS)</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Types */</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------*/</div><div class='add'>+/* The following structure types are used for the represenation */</div><div class='add'>+/*  of ENUMINT type metadata. */</div><div class='add'>+</div><div class='add'>+typedef struct p80211enumpair</div><div class='add'>+{</div><div class='add'>+	UINT32			val;</div><div class='add'>+	char			*name;</div><div class='add'>+} p80211enumpair_t;</div><div class='add'>+</div><div class='add'>+typedef struct p80211enum</div><div class='add'>+{</div><div class='add'>+	INT			nitems;</div><div class='add'>+	p80211enumpair_t	*list;</div><div class='add'>+} p80211enum_t;</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------*/</div><div class='add'>+/* The following structure types are used to store data items in */</div><div class='add'>+/*  messages. */</div><div class='add'>+</div><div class='add'>+/* Template pascal string */</div><div class='add'>+typedef struct p80211pstr</div><div class='add'>+{</div><div class='add'>+	UINT8		len;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ p80211pstr_t;</div><div class='add'>+</div><div class='add'>+typedef struct p80211pstrd</div><div class='add'>+{</div><div class='add'>+	UINT8		len;</div><div class='add'>+	UINT8		data[0];</div><div class='add'>+} __WLAN_ATTRIB_PACK__ p80211pstrd_t;</div><div class='add'>+</div><div class='add'>+/* Maximum pascal string */</div><div class='add'>+typedef struct p80211pstr255</div><div class='add'>+{</div><div class='add'>+	UINT8		len;</div><div class='add'>+	UINT8		data[MAXLEN_PSTR255];</div><div class='add'>+} __WLAN_ATTRIB_PACK__ p80211pstr255_t;</div><div class='add'>+</div><div class='add'>+/* pascal string for macaddress and bssid */</div><div class='add'>+typedef struct p80211pstr6</div><div class='add'>+{</div><div class='add'>+	UINT8		len;</div><div class='add'>+	UINT8		data[MAXLEN_PSTR6];</div><div class='add'>+} __WLAN_ATTRIB_PACK__ p80211pstr6_t;</div><div class='add'>+</div><div class='add'>+/* pascal string for channel list */</div><div class='add'>+typedef struct p80211pstr14</div><div class='add'>+{</div><div class='add'>+	UINT8		len;</div><div class='add'>+	UINT8		data[MAXLEN_PSTR14];</div><div class='add'>+} __WLAN_ATTRIB_PACK__ p80211pstr14_t;</div><div class='add'>+</div><div class='add'>+/* pascal string for ssid */</div><div class='add'>+typedef struct p80211pstr32</div><div class='add'>+{</div><div class='add'>+	UINT8		len;</div><div class='add'>+	UINT8		data[MAXLEN_PSTR32];</div><div class='add'>+} __WLAN_ATTRIB_PACK__ p80211pstr32_t;</div><div class='add'>+</div><div class='add'>+/* MAC address array */</div><div class='add'>+typedef struct p80211macarray</div><div class='add'>+{</div><div class='add'>+	UINT32		cnt;</div><div class='add'>+	UINT8		data[1][MAXLEN_PSTR6];</div><div class='add'>+} __WLAN_ATTRIB_PACK__ p80211macarray_t;</div><div class='add'>+</div><div class='add'>+/* prototype template */</div><div class='add'>+typedef struct p80211item</div><div class='add'>+{</div><div class='add'>+	UINT32		did;</div><div class='add'>+	UINT16		status;</div><div class='add'>+	UINT16		len;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ p80211item_t;</div><div class='add'>+</div><div class='add'>+/* prototype template w/ data item */</div><div class='add'>+typedef struct p80211itemd</div><div class='add'>+{</div><div class='add'>+	UINT32		did;</div><div class='add'>+	UINT16		status;</div><div class='add'>+	UINT16		len;</div><div class='add'>+	UINT8		data[0];</div><div class='add'>+} __WLAN_ATTRIB_PACK__ p80211itemd_t;</div><div class='add'>+</div><div class='add'>+/* message data item for INT, BOUNDEDINT, ENUMINT */</div><div class='add'>+typedef struct p80211item_uint32</div><div class='add'>+{</div><div class='add'>+	UINT32		did;</div><div class='add'>+	UINT16		status;</div><div class='add'>+	UINT16		len;</div><div class='add'>+	UINT32		data;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ p80211item_uint32_t;</div><div class='add'>+</div><div class='add'>+/* message data item for OCTETSTR, DISPLAYSTR */</div><div class='add'>+typedef struct p80211item_pstr6</div><div class='add'>+{</div><div class='add'>+	UINT32		did;</div><div class='add'>+	UINT16		status;</div><div class='add'>+	UINT16		len;</div><div class='add'>+	p80211pstr6_t	data;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ p80211item_pstr6_t;</div><div class='add'>+</div><div class='add'>+/* message data item for OCTETSTR, DISPLAYSTR */</div><div class='add'>+typedef struct p80211item_pstr14</div><div class='add'>+{</div><div class='add'>+	UINT32			did;</div><div class='add'>+	UINT16			status;</div><div class='add'>+	UINT16			len;</div><div class='add'>+	p80211pstr14_t		data;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ p80211item_pstr14_t;</div><div class='add'>+</div><div class='add'>+/* message data item for OCTETSTR, DISPLAYSTR */</div><div class='add'>+typedef struct p80211item_pstr32</div><div class='add'>+{</div><div class='add'>+	UINT32			did;</div><div class='add'>+	UINT16			status;</div><div class='add'>+	UINT16			len;</div><div class='add'>+	p80211pstr32_t		data;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ p80211item_pstr32_t;</div><div class='add'>+</div><div class='add'>+/* message data item for OCTETSTR, DISPLAYSTR */</div><div class='add'>+typedef struct p80211item_pstr255</div><div class='add'>+{</div><div class='add'>+	UINT32			did;</div><div class='add'>+	UINT16			status;</div><div class='add'>+	UINT16			len;</div><div class='add'>+	p80211pstr255_t		data;</div><div class='add'>+} __WLAN_ATTRIB_PACK__ p80211item_pstr255_t;</div><div class='add'>+</div><div class='add'>+/* message data item for UNK 392, namely mib items */</div><div class='add'>+typedef struct  p80211item_unk392</div><div class='add'>+{</div><div class='add'>+	UINT32		did;</div><div class='add'>+	UINT16		status;</div><div class='add'>+	UINT16		len;</div><div class='add'>+	UINT8		data[MAXLEN_MIBATTRIBUTE];</div><div class='add'>+} __WLAN_ATTRIB_PACK__ p80211item_unk392_t;</div><div class='add'>+</div><div class='add'>+/* message data item for UNK 1025, namely p2 pdas */</div><div class='add'>+typedef struct  p80211item_unk1024</div><div class='add'>+{</div><div class='add'>+	UINT32		did;</div><div class='add'>+	UINT16		status;</div><div class='add'>+	UINT16		len;</div><div class='add'>+	UINT8		data[1024];</div><div class='add'>+}  __WLAN_ATTRIB_PACK__ p80211item_unk1024_t;</div><div class='add'>+</div><div class='add'>+/* message data item for UNK 4096, namely p2 download chunks */</div><div class='add'>+typedef struct  p80211item_unk4096</div><div class='add'>+{</div><div class='add'>+	UINT32		did;</div><div class='add'>+	UINT16		status;</div><div class='add'>+	UINT16		len;</div><div class='add'>+	UINT8		data[4096];</div><div class='add'>+}  __WLAN_ATTRIB_PACK__ p80211item_unk4096_t;</div><div class='add'>+</div><div class='add'>+struct catlistitem;</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------*/</div><div class='add'>+/* The following structure type is used to represent all of the */</div><div class='add'>+/*  metadata items.  Some components may choose to use more, */</div><div class='add'>+/*  less or different metadata items. */</div><div class='add'>+</div><div class='add'>+typedef void (*p80211_totext_t)( struct catlistitem *, UINT32 did, UINT8* itembuf, char *textbuf);</div><div class='add'>+typedef void (*p80211_fromtext_t)( struct catlistitem *, UINT32 did, UINT8* itembuf, char *textbuf);</div><div class='add'>+typedef UINT32 (*p80211_valid_t)( struct catlistitem *, UINT32 did, UINT8* itembuf);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Extern Declarations */</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------*/</div><div class='add'>+/* Enumeration Lists */</div><div class='add'>+/*  The following are the external declarations */</div><div class='add'>+/*  for all enumerations  */</div><div class='add'>+</div><div class='add'>+extern p80211enum_t MKENUMNAME(truth);</div><div class='add'>+extern p80211enum_t MKENUMNAME(ifstate);</div><div class='add'>+extern p80211enum_t MKENUMNAME(powermgmt);</div><div class='add'>+extern p80211enum_t MKENUMNAME(bsstype);</div><div class='add'>+extern p80211enum_t MKENUMNAME(authalg);</div><div class='add'>+extern p80211enum_t MKENUMNAME(phytype);</div><div class='add'>+extern p80211enum_t MKENUMNAME(temptype);</div><div class='add'>+extern p80211enum_t MKENUMNAME(regdomain);</div><div class='add'>+extern p80211enum_t MKENUMNAME(ccamode);</div><div class='add'>+extern p80211enum_t MKENUMNAME(diversity);</div><div class='add'>+extern p80211enum_t MKENUMNAME(scantype);</div><div class='add'>+extern p80211enum_t MKENUMNAME(resultcode);</div><div class='add'>+extern p80211enum_t MKENUMNAME(reason);</div><div class='add'>+extern p80211enum_t MKENUMNAME(status);</div><div class='add'>+extern p80211enum_t MKENUMNAME(msgcode);</div><div class='add'>+extern p80211enum_t MKENUMNAME(msgitem_status);</div><div class='add'>+</div><div class='add'>+extern p80211enum_t MKENUMNAME(lnxroam_reason);</div><div class='add'>+</div><div class='add'>+extern p80211enum_t MKENUMNAME(p2preamble);</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Function Declarations */</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------*/</div><div class='add'>+/* The following declare some utility functions for use with the */</div><div class='add'>+/*  p80211enum_t type. */</div><div class='add'>+</div><div class='add'>+UINT32 p80211enum_text2int(p80211enum_t *ep, char *text);</div><div class='add'>+UINT32 p80211enum_int2text(p80211enum_t *ep, UINT32 val, char *text);</div><div class='add'>+void p80211_error2text(int err_code, char *err_str);</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------*/</div><div class='add'>+/* The following declare some utility functions for use with the */</div><div class='add'>+/*  p80211item_t and p80211meta_t types. */</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------*/</div><div class='add'>+/* The following declare functions that perform validation and    */</div><div class='add'>+/* text to binary conversions based on the metadata for interface */</div><div class='add'>+/* and MIB data items.                                            */</div><div class='add'>+/*----------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+/*-- DISPLAYSTR ------------------------------------------------------*/</div><div class='add'>+/* pstr ==&gt; cstr */</div><div class='add'>+void p80211_totext_displaystr( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf, char *textbuf );</div><div class='add'>+</div><div class='add'>+/* cstr ==&gt; pstr */</div><div class='add'>+void p80211_fromtext_displaystr( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf, char *textbuf );</div><div class='add'>+</div><div class='add'>+/* function that checks validity of a displaystr binary value */</div><div class='add'>+UINT32 p80211_isvalid_displaystr( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf );</div><div class='add'>+</div><div class='add'>+/*-- OCTETSTR --------------------------------------------------------*/</div><div class='add'>+/* pstr ==&gt; "xx:xx:...." */</div><div class='add'>+void p80211_totext_octetstr( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf, char *textbuf );</div><div class='add'>+</div><div class='add'>+/* "xx:xx:...." ==&gt; pstr */</div><div class='add'>+void p80211_fromtext_octetstr( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf, char *textbuf );</div><div class='add'>+</div><div class='add'>+/* function that checks validity of an octetstr binary value */</div><div class='add'>+UINT32 p80211_isvalid_octetstr( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf );</div><div class='add'>+</div><div class='add'>+/*-- INT -------------------------------------------------------------*/</div><div class='add'>+/* UINT32 ==&gt; %d */</div><div class='add'>+void p80211_totext_int( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf, char *textbuf );</div><div class='add'>+</div><div class='add'>+/* %d ==&gt; UINT32 */</div><div class='add'>+void p80211_fromtext_int( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf, char *textbuf );</div><div class='add'>+</div><div class='add'>+/* function that checks validity of an int's binary value (always successful) */</div><div class='add'>+UINT32 p80211_isvalid_int( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf );</div><div class='add'>+</div><div class='add'>+/*-- ENUMINT ---------------------------------------------------------*/</div><div class='add'>+/* UINT32 ==&gt; &lt;valuename&gt; */</div><div class='add'>+void p80211_totext_enumint( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf, char *textbuf );</div><div class='add'>+</div><div class='add'>+/* &lt;valuename&gt; ==&gt; UINT32 */</div><div class='add'>+void p80211_fromtext_enumint( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf, char *textbuf );</div><div class='add'>+</div><div class='add'>+/* function that checks validity of an enum's binary value */</div><div class='add'>+UINT32 p80211_isvalid_enumint( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf );</div><div class='add'>+</div><div class='add'>+/*-- INTARRAY --------------------------------------------------------*/</div><div class='add'>+/* UINT32[] =&gt; %d,%d,%d,... */</div><div class='add'>+void p80211_totext_intarray( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf, char *textbuf );</div><div class='add'>+</div><div class='add'>+/* %d,%d,%d,... ==&gt; UINT32[] */</div><div class='add'>+void p80211_fromtext_intarray( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf, char *textbuf );</div><div class='add'>+</div><div class='add'>+/* function that checks validity of an integer array's value */</div><div class='add'>+UINT32 p80211_isvalid_intarray( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf );</div><div class='add'>+</div><div class='add'>+/*-- BITARRAY --------------------------------------------------------*/</div><div class='add'>+/* UINT32 ==&gt; %d,%d,%d,... */</div><div class='add'>+void p80211_totext_bitarray( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf, char *textbuf );</div><div class='add'>+</div><div class='add'>+/* %d,%d,%d,... ==&gt; UINT32 */</div><div class='add'>+void p80211_fromtext_bitarray( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf, char *textbuf );</div><div class='add'>+</div><div class='add'>+/* function that checks validity of a bit array's value */</div><div class='add'>+UINT32 p80211_isvalid_bitarray( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf );</div><div class='add'>+</div><div class='add'>+/*-- MACARRAY --------------------------------------------------------*/</div><div class='add'>+void p80211_totext_macarray( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf, char *textbuf );</div><div class='add'>+</div><div class='add'>+void p80211_fromtext_macarray( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf, char *textbuf );</div><div class='add'>+</div><div class='add'>+/* function that checks validity of a MAC address array's value */</div><div class='add'>+UINT32 p80211_isvalid_macarray( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf );</div><div class='add'>+</div><div class='add'>+/*-- MIBATTRIUBTE ------------------------------------------------------*/</div><div class='add'>+/* &lt;mibvalue&gt; ==&gt; &lt;textual representation identified in MIB metadata&gt; */</div><div class='add'>+void p80211_totext_getmibattribute( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf, char *textbuf );</div><div class='add'>+void p80211_totext_setmibattribute( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf, char *textbuf );</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* &lt;textual representation identified in MIB metadata&gt; ==&gt; &lt;mibvalue&gt; */</div><div class='add'>+void p80211_fromtext_getmibattribute( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf, char *textbuf );</div><div class='add'>+void p80211_fromtext_setmibattribute( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf, char *textbuf );</div><div class='add'>+</div><div class='add'>+/* function that checks validity of a mibitem's binary value */</div><div class='add'>+UINT32 p80211_isvalid_getmibattribute( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf );</div><div class='add'>+UINT32 p80211_isvalid_setmibattribute( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf );</div><div class='add'>+</div><div class='add'>+#endif /* _P80211TYPES_H */</div><div class='add'>+</div><div class='head'>diff --git a/drivers/staging/wlan-ng/p80211wep.c b/drivers/staging/wlan-ng/p80211wep.c<br/>new file mode 100644<br/>index 000000000000..53fe2985971f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/wlan-ng/p80211wep.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/wlan-ng/p80211wep.c</a></div><div class='hunk'>@@ -0,0 +1,317 @@</div><div class='add'>+/* src/p80211/p80211wep.c</div><div class='add'>+*</div><div class='add'>+* WEP encode/decode for P80211.</div><div class='add'>+*</div><div class='add'>+* Copyright (C) 2002 AbsoluteValue Systems, Inc.  All Rights Reserved.</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* linux-wlan</div><div class='add'>+*</div><div class='add'>+*   The contents of this file are subject to the Mozilla Public</div><div class='add'>+*   License Version 1.1 (the "License"); you may not use this file</div><div class='add'>+*   except in compliance with the License. You may obtain a copy of</div><div class='add'>+*   the License at http://www.mozilla.org/MPL/</div><div class='add'>+*</div><div class='add'>+*   Software distributed under the License is distributed on an "AS</div><div class='add'>+*   IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or</div><div class='add'>+*   implied. See the License for the specific language governing</div><div class='add'>+*   rights and limitations under the License.</div><div class='add'>+*</div><div class='add'>+*   Alternatively, the contents of this file may be used under the</div><div class='add'>+*   terms of the GNU Public License version 2 (the "GPL"), in which</div><div class='add'>+*   case the provisions of the GPL are applicable instead of the</div><div class='add'>+*   above.  If you wish to allow the use of your version of this file</div><div class='add'>+*   only under the terms of the GPL and not to allow others to use</div><div class='add'>+*   your version of this file under the MPL, indicate your decision</div><div class='add'>+*   by deleting the provisions above and replace them with the notice</div><div class='add'>+*   and other provisions required by the GPL.  If you do not delete</div><div class='add'>+*   the provisions above, a recipient may use your version of this</div><div class='add'>+*   file under either the MPL or the GPL.</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* Inquiries regarding the linux-wlan Open Source project can be</div><div class='add'>+* made directly to:</div><div class='add'>+*</div><div class='add'>+* AbsoluteValue Systems Inc.</div><div class='add'>+* info@linux-wlan.com</div><div class='add'>+* http://www.linux-wlan.com</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* Portions of the development of this software were funded by</div><div class='add'>+* Intersil Corporation as part of PRISM(R) chipset product development.</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* System Includes */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#include &lt;linux/version.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/wireless.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/random.h&gt;</div><div class='add'>+</div><div class='add'>+#include "version.h"</div><div class='add'>+#include "wlan_compat.h"</div><div class='add'>+</div><div class='add'>+// #define WEP_DEBUG</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Project Includes */</div><div class='add'>+</div><div class='add'>+#include "version.h"</div><div class='add'>+#include "p80211hdr.h"</div><div class='add'>+#include "p80211types.h"</div><div class='add'>+#include "p80211msg.h"</div><div class='add'>+#include "p80211conv.h"</div><div class='add'>+#include "p80211netdev.h"</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Local Constants */</div><div class='add'>+</div><div class='add'>+#define SSWAP(a,b) {UINT8 tmp = s[a]; s[a] = s[b]; s[b] = tmp;}</div><div class='add'>+#define WEP_KEY(x)       (((x) &amp; 0xC0) &gt;&gt; 6)</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Local Macros */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Local Types */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Local Static Definitions */</div><div class='add'>+</div><div class='add'>+static const UINT32 wep_crc32_table[256] = {</div><div class='add'>+        0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL, 0x076dc419L,</div><div class='add'>+        0x706af48fL, 0xe963a535L, 0x9e6495a3L, 0x0edb8832L, 0x79dcb8a4L,</div><div class='add'>+        0xe0d5e91eL, 0x97d2d988L, 0x09b64c2bL, 0x7eb17cbdL, 0xe7b82d07L,</div><div class='add'>+        0x90bf1d91L, 0x1db71064L, 0x6ab020f2L, 0xf3b97148L, 0x84be41deL,</div><div class='add'>+        0x1adad47dL, 0x6ddde4ebL, 0xf4d4b551L, 0x83d385c7L, 0x136c9856L,</div><div class='add'>+        0x646ba8c0L, 0xfd62f97aL, 0x8a65c9ecL, 0x14015c4fL, 0x63066cd9L,</div><div class='add'>+        0xfa0f3d63L, 0x8d080df5L, 0x3b6e20c8L, 0x4c69105eL, 0xd56041e4L,</div><div class='add'>+        0xa2677172L, 0x3c03e4d1L, 0x4b04d447L, 0xd20d85fdL, 0xa50ab56bL,</div><div class='add'>+        0x35b5a8faL, 0x42b2986cL, 0xdbbbc9d6L, 0xacbcf940L, 0x32d86ce3L,</div><div class='add'>+        0x45df5c75L, 0xdcd60dcfL, 0xabd13d59L, 0x26d930acL, 0x51de003aL,</div><div class='add'>+        0xc8d75180L, 0xbfd06116L, 0x21b4f4b5L, 0x56b3c423L, 0xcfba9599L,</div><div class='add'>+        0xb8bda50fL, 0x2802b89eL, 0x5f058808L, 0xc60cd9b2L, 0xb10be924L,</div><div class='add'>+        0x2f6f7c87L, 0x58684c11L, 0xc1611dabL, 0xb6662d3dL, 0x76dc4190L,</div><div class='add'>+        0x01db7106L, 0x98d220bcL, 0xefd5102aL, 0x71b18589L, 0x06b6b51fL,</div><div class='add'>+        0x9fbfe4a5L, 0xe8b8d433L, 0x7807c9a2L, 0x0f00f934L, 0x9609a88eL,</div><div class='add'>+        0xe10e9818L, 0x7f6a0dbbL, 0x086d3d2dL, 0x91646c97L, 0xe6635c01L,</div><div class='add'>+        0x6b6b51f4L, 0x1c6c6162L, 0x856530d8L, 0xf262004eL, 0x6c0695edL,</div><div class='add'>+        0x1b01a57bL, 0x8208f4c1L, 0xf50fc457L, 0x65b0d9c6L, 0x12b7e950L,</div><div class='add'>+        0x8bbeb8eaL, 0xfcb9887cL, 0x62dd1ddfL, 0x15da2d49L, 0x8cd37cf3L,</div><div class='add'>+        0xfbd44c65L, 0x4db26158L, 0x3ab551ceL, 0xa3bc0074L, 0xd4bb30e2L,</div><div class='add'>+        0x4adfa541L, 0x3dd895d7L, 0xa4d1c46dL, 0xd3d6f4fbL, 0x4369e96aL,</div><div class='add'>+        0x346ed9fcL, 0xad678846L, 0xda60b8d0L, 0x44042d73L, 0x33031de5L,</div><div class='add'>+        0xaa0a4c5fL, 0xdd0d7cc9L, 0x5005713cL, 0x270241aaL, 0xbe0b1010L,</div><div class='add'>+        0xc90c2086L, 0x5768b525L, 0x206f85b3L, 0xb966d409L, 0xce61e49fL,</div><div class='add'>+        0x5edef90eL, 0x29d9c998L, 0xb0d09822L, 0xc7d7a8b4L, 0x59b33d17L,</div><div class='add'>+        0x2eb40d81L, 0xb7bd5c3bL, 0xc0ba6cadL, 0xedb88320L, 0x9abfb3b6L,</div><div class='add'>+        0x03b6e20cL, 0x74b1d29aL, 0xead54739L, 0x9dd277afL, 0x04db2615L,</div><div class='add'>+        0x73dc1683L, 0xe3630b12L, 0x94643b84L, 0x0d6d6a3eL, 0x7a6a5aa8L,</div><div class='add'>+        0xe40ecf0bL, 0x9309ff9dL, 0x0a00ae27L, 0x7d079eb1L, 0xf00f9344L,</div><div class='add'>+        0x8708a3d2L, 0x1e01f268L, 0x6906c2feL, 0xf762575dL, 0x806567cbL,</div><div class='add'>+        0x196c3671L, 0x6e6b06e7L, 0xfed41b76L, 0x89d32be0L, 0x10da7a5aL,</div><div class='add'>+        0x67dd4accL, 0xf9b9df6fL, 0x8ebeeff9L, 0x17b7be43L, 0x60b08ed5L,</div><div class='add'>+        0xd6d6a3e8L, 0xa1d1937eL, 0x38d8c2c4L, 0x4fdff252L, 0xd1bb67f1L,</div><div class='add'>+        0xa6bc5767L, 0x3fb506ddL, 0x48b2364bL, 0xd80d2bdaL, 0xaf0a1b4cL,</div><div class='add'>+        0x36034af6L, 0x41047a60L, 0xdf60efc3L, 0xa867df55L, 0x316e8eefL,</div><div class='add'>+        0x4669be79L, 0xcb61b38cL, 0xbc66831aL, 0x256fd2a0L, 0x5268e236L,</div><div class='add'>+        0xcc0c7795L, 0xbb0b4703L, 0x220216b9L, 0x5505262fL, 0xc5ba3bbeL,</div><div class='add'>+        0xb2bd0b28L, 0x2bb45a92L, 0x5cb36a04L, 0xc2d7ffa7L, 0xb5d0cf31L,</div><div class='add'>+        0x2cd99e8bL, 0x5bdeae1dL, 0x9b64c2b0L, 0xec63f226L, 0x756aa39cL,</div><div class='add'>+        0x026d930aL, 0x9c0906a9L, 0xeb0e363fL, 0x72076785L, 0x05005713L,</div><div class='add'>+        0x95bf4a82L, 0xe2b87a14L, 0x7bb12baeL, 0x0cb61b38L, 0x92d28e9bL,</div><div class='add'>+        0xe5d5be0dL, 0x7cdcefb7L, 0x0bdbdf21L, 0x86d3d2d4L, 0xf1d4e242L,</div><div class='add'>+        0x68ddb3f8L, 0x1fda836eL, 0x81be16cdL, 0xf6b9265bL, 0x6fb077e1L,</div><div class='add'>+        0x18b74777L, 0x88085ae6L, 0xff0f6a70L, 0x66063bcaL, 0x11010b5cL,</div><div class='add'>+        0x8f659effL, 0xf862ae69L, 0x616bffd3L, 0x166ccf45L, 0xa00ae278L,</div><div class='add'>+        0xd70dd2eeL, 0x4e048354L, 0x3903b3c2L, 0xa7672661L, 0xd06016f7L,</div><div class='add'>+        0x4969474dL, 0x3e6e77dbL, 0xaed16a4aL, 0xd9d65adcL, 0x40df0b66L,</div><div class='add'>+        0x37d83bf0L, 0xa9bcae53L, 0xdebb9ec5L, 0x47b2cf7fL, 0x30b5ffe9L,</div><div class='add'>+        0xbdbdf21cL, 0xcabac28aL, 0x53b39330L, 0x24b4a3a6L, 0xbad03605L,</div><div class='add'>+        0xcdd70693L, 0x54de5729L, 0x23d967bfL, 0xb3667a2eL, 0xc4614ab8L,</div><div class='add'>+        0x5d681b02L, 0x2a6f2b94L, 0xb40bbe37L, 0xc30c8ea1L, 0x5a05df1bL,</div><div class='add'>+        0x2d02ef8dL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Local Function Declarations */</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Function Definitions */</div><div class='add'>+</div><div class='add'>+/* keylen in bytes! */</div><div class='add'>+</div><div class='add'>+int wep_change_key(wlandevice_t *wlandev, int keynum, UINT8* key, int keylen)</div><div class='add'>+{</div><div class='add'>+	if (keylen &lt; 0)  return -1;</div><div class='add'>+	if (keylen &gt;= MAX_KEYLEN) return -1;</div><div class='add'>+	if (key == NULL) return -1;</div><div class='add'>+	if (keynum &lt; 0)  return -1;</div><div class='add'>+	if (keynum &gt;= NUM_WEPKEYS) return -1;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#ifdef WEP_DEBUG</div><div class='add'>+	printk(KERN_DEBUG "WEP key %d len %d = %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x\n", keynum, keylen, key[0], key[1], key[2], key[3], key[4], key[5], key[6], key[7]);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	wlandev-&gt;wep_keylens[keynum] = keylen;</div><div class='add'>+	memcpy(wlandev-&gt;wep_keys[keynum], key, keylen);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+  4-byte IV at start of buffer, 4-byte ICV at end of buffer.</div><div class='add'>+  if successful, buf start is payload begin, length -= 8;</div><div class='add'>+ */</div><div class='add'>+int wep_decrypt(wlandevice_t *wlandev, UINT8 *buf, UINT32 len, int key_override, UINT8 *iv, UINT8 *icv)</div><div class='add'>+{</div><div class='add'>+	UINT32 i, j, k, crc, keylen;</div><div class='add'>+	UINT8 s[256], key[64], c_crc[4];</div><div class='add'>+	UINT8 keyidx;</div><div class='add'>+</div><div class='add'>+	/* Needs to be at least 8 bytes of payload */</div><div class='add'>+	if (len &lt;= 0) return -1;</div><div class='add'>+</div><div class='add'>+	/* initialize the first bytes of the key from the IV */</div><div class='add'>+	key[0] = iv[0];</div><div class='add'>+	key[1] = iv[1];</div><div class='add'>+	key[2] = iv[2];</div><div class='add'>+	keyidx = WEP_KEY(iv[3]);</div><div class='add'>+</div><div class='add'>+	if (key_override &gt;= 0)</div><div class='add'>+		keyidx = key_override;</div><div class='add'>+</div><div class='add'>+	if (keyidx &gt;= NUM_WEPKEYS) return -2;</div><div class='add'>+</div><div class='add'>+	keylen = wlandev-&gt;wep_keylens[keyidx];</div><div class='add'>+</div><div class='add'>+	if (keylen == 0) return -3;</div><div class='add'>+</div><div class='add'>+	/* copy the rest of the key over from the designated key */</div><div class='add'>+	memcpy(key+3, wlandev-&gt;wep_keys[keyidx], keylen);</div><div class='add'>+</div><div class='add'>+	keylen+=3;  /* add in IV bytes */</div><div class='add'>+</div><div class='add'>+#ifdef WEP_DEBUG</div><div class='add'>+	printk(KERN_DEBUG "D %d: %02x %02x %02x (%d %d) %02x:%02x:%02x:%02x:%02x\n", len, key[0], key[1], key[2], keyidx, keylen, key[3], key[4], key[5], key[6], key[7]);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* set up the RC4 state */</div><div class='add'>+	for (i = 0; i &lt; 256; i++)</div><div class='add'>+		s[i] = i;</div><div class='add'>+	j = 0;</div><div class='add'>+	for (i = 0; i &lt; 256; i++) {</div><div class='add'>+		j = (j + s[i] + key[i % keylen]) &amp; 0xff;</div><div class='add'>+		SSWAP(i,j);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Apply the RC4 to the data, update the CRC32 */</div><div class='add'>+	crc = ~0;</div><div class='add'>+	i = j = 0;</div><div class='add'>+	for (k = 0; k &lt; len; k++) {</div><div class='add'>+		i = (i+1) &amp; 0xff;</div><div class='add'>+		j = (j+s[i]) &amp; 0xff;</div><div class='add'>+		SSWAP(i,j);</div><div class='add'>+		buf[k] ^= s[(s[i] + s[j]) &amp; 0xff];</div><div class='add'>+		crc = wep_crc32_table[(crc ^ buf[k]) &amp; 0xff] ^ (crc &gt;&gt; 8);</div><div class='add'>+	}</div><div class='add'>+	crc = ~crc;</div><div class='add'>+</div><div class='add'>+	/* now let's check the crc */</div><div class='add'>+	c_crc[0] = crc;</div><div class='add'>+	c_crc[1] = crc &gt;&gt; 8;</div><div class='add'>+	c_crc[2] = crc &gt;&gt; 16;</div><div class='add'>+	c_crc[3] = crc &gt;&gt; 24;</div><div class='add'>+</div><div class='add'>+	for (k = 0; k &lt; 4; k++) {</div><div class='add'>+		i = (i + 1) &amp; 0xff;</div><div class='add'>+		j = (j+s[i]) &amp; 0xff;</div><div class='add'>+		SSWAP(i,j);</div><div class='add'>+		if ((c_crc[k] ^ s[(s[i] + s[j]) &amp; 0xff]) != icv[k])</div><div class='add'>+			return -(4 | (k &lt;&lt; 4)) ; /* ICV mismatch */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* encrypts in-place. */</div><div class='add'>+int wep_encrypt(wlandevice_t *wlandev, UINT8 *buf, UINT8 *dst, UINT32 len, int keynum, UINT8 *iv, UINT8 *icv)</div><div class='add'>+{</div><div class='add'>+	UINT32 i, j, k, crc, keylen;</div><div class='add'>+	UINT8 s[256], key[64];</div><div class='add'>+</div><div class='add'>+	/* no point in WEPping an empty frame */</div><div class='add'>+	if (len &lt;= 0) return -1;</div><div class='add'>+</div><div class='add'>+	/* we need to have a real key.. */</div><div class='add'>+	if (keynum &gt;= NUM_WEPKEYS) return -2;</div><div class='add'>+	keylen = wlandev-&gt;wep_keylens[keynum];</div><div class='add'>+	if (keylen &lt;= 0) return -3;</div><div class='add'>+</div><div class='add'>+	/* use a random IV.  And skip known weak ones. */</div><div class='add'>+	get_random_bytes(iv, 3);</div><div class='add'>+	while ((iv[1] == 0xff) &amp;&amp; (iv[0] &gt;= 3) &amp;&amp; (iv[0] &lt; keylen))</div><div class='add'>+		get_random_bytes(iv, 3);</div><div class='add'>+</div><div class='add'>+	iv[3] = (keynum &amp; 0x03) &lt;&lt; 6;</div><div class='add'>+</div><div class='add'>+	key[0] = iv[0];</div><div class='add'>+	key[1] = iv[1];</div><div class='add'>+	key[2] = iv[2];</div><div class='add'>+</div><div class='add'>+	/* copy the rest of the key over from the designated key */</div><div class='add'>+	memcpy(key+3, wlandev-&gt;wep_keys[keynum], keylen);</div><div class='add'>+</div><div class='add'>+	keylen+=3;  /* add in IV bytes */</div><div class='add'>+</div><div class='add'>+#ifdef WEP_DEBUG</div><div class='add'>+	printk(KERN_DEBUG "E %d (%d/%d %d) %02x %02x %02x %02x:%02x:%02x:%02x:%02x\n", len,  iv[3], keynum, keylen, key[0], key[1], key[2], key[3], key[4], key[5], key[6], key[7]);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* set up the RC4 state */</div><div class='add'>+	for (i = 0; i &lt; 256; i++)</div><div class='add'>+		s[i] = i;</div><div class='add'>+	j = 0;</div><div class='add'>+	for (i = 0; i &lt; 256; i++) {</div><div class='add'>+		j = (j + s[i] + key[i % keylen]) &amp; 0xff;</div><div class='add'>+		SSWAP(i,j);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Update CRC32 then apply RC4 to the data */</div><div class='add'>+	crc = ~0;</div><div class='add'>+	i = j = 0;</div><div class='add'>+	for (k = 0; k &lt; len; k++) {</div><div class='add'>+		crc = wep_crc32_table[(crc ^ buf[k]) &amp; 0xff] ^ (crc &gt;&gt; 8);</div><div class='add'>+		i = (i+1) &amp; 0xff;</div><div class='add'>+		j = (j+s[i]) &amp; 0xff;</div><div class='add'>+		SSWAP(i,j);</div><div class='add'>+		dst[k] = buf[k] ^ s[(s[i] + s[j]) &amp; 0xff];</div><div class='add'>+	}</div><div class='add'>+	crc = ~crc;</div><div class='add'>+</div><div class='add'>+	/* now let's encrypt the crc */</div><div class='add'>+	icv[0] = crc;</div><div class='add'>+	icv[1] = crc &gt;&gt; 8;</div><div class='add'>+	icv[2] = crc &gt;&gt; 16;</div><div class='add'>+	icv[3] = crc &gt;&gt; 24;</div><div class='add'>+</div><div class='add'>+	for (k = 0; k &lt; 4; k++) {</div><div class='add'>+		i = (i + 1) &amp; 0xff;</div><div class='add'>+		j = (j+s[i]) &amp; 0xff;</div><div class='add'>+		SSWAP(i,j);</div><div class='add'>+		icv[k] ^= s[(s[i] + s[j]) &amp; 0xff];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/staging/wlan-ng/p80211wext.c b/drivers/staging/wlan-ng/p80211wext.c<br/>new file mode 100644<br/>index 000000000000..906ba4392376<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/wlan-ng/p80211wext.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/wlan-ng/p80211wext.c</a></div><div class='hunk'>@@ -0,0 +1,2048 @@</div><div class='add'>+/* src/p80211/p80211wext.c</div><div class='add'>+*</div><div class='add'>+* Glue code to make linux-wlan-ng a happy wireless extension camper.</div><div class='add'>+*</div><div class='add'>+* original author:  Reyk Floeter &lt;reyk@synack.de&gt;</div><div class='add'>+* Completely re-written by Solomon Peachy &lt;solomon@linux-wlan.com&gt;</div><div class='add'>+*</div><div class='add'>+* Copyright (C) 2002 AbsoluteValue Systems, Inc.  All Rights Reserved.</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* linux-wlan</div><div class='add'>+*</div><div class='add'>+*   The contents of this file are subject to the Mozilla Public</div><div class='add'>+*   License Version 1.1 (the "License"); you may not use this file</div><div class='add'>+*   except in compliance with the License. You may obtain a copy of</div><div class='add'>+*   the License at http://www.mozilla.org/MPL/</div><div class='add'>+*</div><div class='add'>+*   Software distributed under the License is distributed on an "AS</div><div class='add'>+*   IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or</div><div class='add'>+*   implied. See the License for the specific language governing</div><div class='add'>+*   rights and limitations under the License.</div><div class='add'>+*</div><div class='add'>+*   Alternatively, the contents of this file may be used under the</div><div class='add'>+*   terms of the GNU Public License version 2 (the "GPL"), in which</div><div class='add'>+*   case the provisions of the GPL are applicable instead of the</div><div class='add'>+*   above.  If you wish to allow the use of your version of this file</div><div class='add'>+*   only under the terms of the GPL and not to allow others to use</div><div class='add'>+*   your version of this file under the MPL, indicate your decision</div><div class='add'>+*   by deleting the provisions above and replace them with the notice</div><div class='add'>+*   and other provisions required by the GPL.  If you do not delete</div><div class='add'>+*   the provisions above, a recipient may use your version of this</div><div class='add'>+*   file under either the MPL or the GPL.</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* System Includes */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#include &lt;linux/version.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/wireless.h&gt;</div><div class='add'>+#if WIRELESS_EXT &gt; 12</div><div class='add'>+#include &lt;net/iw_handler.h&gt;</div><div class='add'>+#endif</div><div class='add'>+#include &lt;linux/if_arp.h&gt;</div><div class='add'>+#include &lt;asm/bitops.h&gt;</div><div class='add'>+#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;asm/byteorder.h&gt;</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Project Includes */</div><div class='add'>+</div><div class='add'>+#include "version.h"</div><div class='add'>+#include "wlan_compat.h"</div><div class='add'>+</div><div class='add'>+#include "p80211types.h"</div><div class='add'>+#include "p80211hdr.h"</div><div class='add'>+#include "p80211conv.h"</div><div class='add'>+#include "p80211mgmt.h"</div><div class='add'>+#include "p80211msg.h"</div><div class='add'>+#include "p80211metastruct.h"</div><div class='add'>+#include "p80211metadef.h"</div><div class='add'>+#include "p80211netdev.h"</div><div class='add'>+#include "p80211ioctl.h"</div><div class='add'>+#include "p80211req.h"</div><div class='add'>+</div><div class='add'>+static int p80211wext_giwrate(netdevice_t *dev,</div><div class='add'>+			      struct iw_request_info *info,</div><div class='add'>+			      struct iw_param *rrq, char *extra);</div><div class='add'>+static int p80211wext_giwessid(netdevice_t *dev,</div><div class='add'>+			       struct iw_request_info *info,</div><div class='add'>+			       struct iw_point *data, char *essid);</div><div class='add'>+/* compatibility to wireless extensions */</div><div class='add'>+#ifdef WIRELESS_EXT</div><div class='add'>+</div><div class='add'>+static UINT8 p80211_mhz_to_channel(UINT16 mhz)</div><div class='add'>+{</div><div class='add'>+	if (mhz &gt;= 5000) {</div><div class='add'>+		return ((mhz - 5000) / 5);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (mhz == 2482)</div><div class='add'>+		return 14;</div><div class='add'>+</div><div class='add'>+	if (mhz &gt;= 2407) {</div><div class='add'>+		return ((mhz - 2407) / 5);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static UINT16 p80211_channel_to_mhz(UINT8 ch, int dot11a)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	if (ch == 0)</div><div class='add'>+		return 0;</div><div class='add'>+	if (ch &gt; 200)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* 5G */</div><div class='add'>+</div><div class='add'>+	if (dot11a) {</div><div class='add'>+		return (5000 + (5 * ch));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* 2.4G */</div><div class='add'>+</div><div class='add'>+	if (ch == 14)</div><div class='add'>+		return 2484;</div><div class='add'>+</div><div class='add'>+	if ((ch &lt; 14) &amp;&amp; (ch &gt; 0)) {</div><div class='add'>+		return (2407 + (5 * ch));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* taken from orinoco.c ;-) */</div><div class='add'>+static const long p80211wext_channel_freq[] = {</div><div class='add'>+	2412, 2417, 2422, 2427, 2432, 2437, 2442,</div><div class='add'>+	2447, 2452, 2457, 2462, 2467, 2472, 2484</div><div class='add'>+};</div><div class='add'>+#define NUM_CHANNELS (sizeof(p80211wext_channel_freq) / sizeof(p80211wext_channel_freq[0]))</div><div class='add'>+</div><div class='add'>+/* steal a spare bit to store the shared/opensystems state. should default to open if not set */</div><div class='add'>+#define HOSTWEP_SHAREDKEY BIT3</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/** function declarations =============== */</div><div class='add'>+</div><div class='add'>+static int qual_as_percent(int snr ) {</div><div class='add'>+  if ( snr &lt;= 0 )</div><div class='add'>+    return 0;</div><div class='add'>+  if ( snr &lt;= 40 )</div><div class='add'>+    return snr*5/2;</div><div class='add'>+  return 100;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int p80211wext_dorequest(wlandevice_t *wlandev, UINT32 did, UINT32 data)</div><div class='add'>+{</div><div class='add'>+	p80211msg_dot11req_mibset_t	msg;</div><div class='add'>+	p80211item_uint32_t		mibitem;</div><div class='add'>+	int	result;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	msg.msgcode = DIDmsg_dot11req_mibset;</div><div class='add'>+	mibitem.did = did;</div><div class='add'>+	mibitem.data = data;</div><div class='add'>+	memcpy(&amp;msg.mibattribute.data, &amp;mibitem, sizeof(mibitem));</div><div class='add'>+	result = p80211req_dorequest(wlandev, (UINT8*)&amp;msg);</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int p80211wext_autojoin(wlandevice_t *wlandev)</div><div class='add'>+{</div><div class='add'>+	p80211msg_lnxreq_autojoin_t     msg;</div><div class='add'>+	struct iw_point			data;</div><div class='add'>+	char ssid[IW_ESSID_MAX_SIZE];</div><div class='add'>+</div><div class='add'>+	int result;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	/* Get ESSID */</div><div class='add'>+	result = p80211wext_giwessid(wlandev-&gt;netdev, NULL, &amp;data, ssid);</div><div class='add'>+</div><div class='add'>+	if (result) {</div><div class='add'>+		err = -EFAULT;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ( wlandev-&gt;hostwep &amp; HOSTWEP_SHAREDKEY )</div><div class='add'>+	  msg.authtype.data = P80211ENUM_authalg_sharedkey;</div><div class='add'>+	else</div><div class='add'>+	  msg.authtype.data = P80211ENUM_authalg_opensystem;</div><div class='add'>+</div><div class='add'>+	msg.msgcode = DIDmsg_lnxreq_autojoin;</div><div class='add'>+</div><div class='add'>+	/* Trim the last '\0' to fit the SSID format */</div><div class='add'>+</div><div class='add'>+	if (data.length &amp;&amp; ssid[data.length-1] == '\0') {</div><div class='add'>+		data.length = data.length - 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(msg.ssid.data.data, ssid, data.length);</div><div class='add'>+	msg.ssid.data.len = data.length;</div><div class='add'>+</div><div class='add'>+	result = p80211req_dorequest(wlandev, (UINT8*)&amp;msg);</div><div class='add'>+</div><div class='add'>+	if (result) {</div><div class='add'>+		err = -EFAULT;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return err;</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* called by /proc/net/wireless */</div><div class='add'>+struct iw_statistics* p80211wext_get_wireless_stats (netdevice_t *dev)</div><div class='add'>+{</div><div class='add'>+	p80211msg_lnxreq_commsquality_t  quality;</div><div class='add'>+	wlandevice_t *wlandev = (wlandevice_t*)dev-&gt;priv;</div><div class='add'>+	struct iw_statistics* wstats = &amp;wlandev-&gt;wstats;</div><div class='add'>+	int retval;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+	/* Check */</div><div class='add'>+	if ( (wlandev == NULL) || (wlandev-&gt;msdstate != WLAN_MSD_RUNNING) )</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	/* XXX Only valid in station mode */</div><div class='add'>+	wstats-&gt;status = 0;</div><div class='add'>+</div><div class='add'>+	/* build request message */</div><div class='add'>+	quality.msgcode = DIDmsg_lnxreq_commsquality;</div><div class='add'>+	quality.dbm.data = P80211ENUM_truth_true;</div><div class='add'>+	quality.dbm.status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+</div><div class='add'>+	/* send message to nsd */</div><div class='add'>+	if ( wlandev-&gt;mlmerequest == NULL )</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	retval = wlandev-&gt;mlmerequest(wlandev, (p80211msg_t*) &amp;quality);</div><div class='add'>+</div><div class='add'>+	wstats-&gt;qual.qual = qual_as_percent(quality.link.data);    /* overall link quality */</div><div class='add'>+	wstats-&gt;qual.level = quality.level.data;  /* instant signal level */</div><div class='add'>+	wstats-&gt;qual.noise = quality.noise.data;  /* instant noise level */</div><div class='add'>+</div><div class='add'>+#if WIRELESS_EXT &gt; 18</div><div class='add'>+	wstats-&gt;qual.updated = IW_QUAL_ALL_UPDATED | IW_QUAL_DBM;</div><div class='add'>+#else</div><div class='add'>+	wstats-&gt;qual.updated = 7;</div><div class='add'>+#endif</div><div class='add'>+	wstats-&gt;discard.code = wlandev-&gt;rx.decrypt_err;</div><div class='add'>+	wstats-&gt;discard.nwid = 0;</div><div class='add'>+	wstats-&gt;discard.misc = 0;</div><div class='add'>+</div><div class='add'>+#if WIRELESS_EXT &gt; 11</div><div class='add'>+	wstats-&gt;discard.fragment = 0;  // incomplete fragments</div><div class='add'>+	wstats-&gt;discard.retries = 0;   // tx retries.</div><div class='add'>+	wstats-&gt;miss.beacon = 0;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+</div><div class='add'>+	return wstats;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int p80211wext_giwname(netdevice_t *dev,</div><div class='add'>+			      struct iw_request_info *info,</div><div class='add'>+			      char *name, char *extra)</div><div class='add'>+{</div><div class='add'>+	struct iw_param rate;</div><div class='add'>+	int result;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	result = p80211wext_giwrate(dev, NULL, &amp;rate, NULL);</div><div class='add'>+</div><div class='add'>+	if (result) {</div><div class='add'>+		err = -EFAULT;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (rate.value) {</div><div class='add'>+	case 1000000:</div><div class='add'>+	case 2000000:</div><div class='add'>+		strcpy(name, "IEEE 802.11-DS");</div><div class='add'>+		break;</div><div class='add'>+	case 5500000:</div><div class='add'>+	case 11000000:</div><div class='add'>+		strcpy(name, "IEEE 802.11-b");</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+exit:</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int p80211wext_giwfreq(netdevice_t *dev,</div><div class='add'>+			      struct iw_request_info *info,</div><div class='add'>+			      struct iw_freq *freq, char *extra)</div><div class='add'>+{</div><div class='add'>+	wlandevice_t *wlandev = (wlandevice_t*)dev-&gt;priv;</div><div class='add'>+	p80211item_uint32_t             mibitem;</div><div class='add'>+	p80211msg_dot11req_mibset_t     msg;</div><div class='add'>+	int result;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	msg.msgcode = DIDmsg_dot11req_mibget;</div><div class='add'>+	mibitem.did = DIDmib_dot11phy_dot11PhyDSSSTable_dot11CurrentChannel;</div><div class='add'>+	memcpy(&amp;msg.mibattribute.data, &amp;mibitem, sizeof(mibitem));</div><div class='add'>+	result = p80211req_dorequest(wlandev, (UINT8*)&amp;msg);</div><div class='add'>+</div><div class='add'>+	if (result) {</div><div class='add'>+		err = -EFAULT;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;mibitem, &amp;msg.mibattribute.data, sizeof(mibitem));</div><div class='add'>+</div><div class='add'>+	if (mibitem.data &gt; NUM_CHANNELS) {</div><div class='add'>+		err = -EFAULT;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* convert into frequency instead of a channel */</div><div class='add'>+	freq-&gt;e = 1;</div><div class='add'>+	freq-&gt;m = p80211_channel_to_mhz(mibitem.data, 0) * 100000;</div><div class='add'>+</div><div class='add'>+ exit:</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int p80211wext_siwfreq(netdevice_t *dev,</div><div class='add'>+			      struct iw_request_info *info,</div><div class='add'>+			      struct iw_freq *freq, char *extra)</div><div class='add'>+{</div><div class='add'>+	wlandevice_t *wlandev = (wlandevice_t*)dev-&gt;priv;</div><div class='add'>+	p80211item_uint32_t             mibitem;</div><div class='add'>+	p80211msg_dot11req_mibset_t     msg;</div><div class='add'>+	int result;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	if (!wlan_wext_write) {</div><div class='add'>+		err = (-EOPNOTSUPP);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	msg.msgcode = DIDmsg_dot11req_mibset;</div><div class='add'>+	mibitem.did = DIDmib_dot11phy_dot11PhyDSSSTable_dot11CurrentChannel;</div><div class='add'>+	mibitem.status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+</div><div class='add'>+	if ( (freq-&gt;e == 0) &amp;&amp; (freq-&gt;m &lt;= 1000) )</div><div class='add'>+		mibitem.data = freq-&gt;m;</div><div class='add'>+	else</div><div class='add'>+		mibitem.data = p80211_mhz_to_channel(freq-&gt;m);</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;msg.mibattribute.data, &amp;mibitem, sizeof(mibitem));</div><div class='add'>+	result = p80211req_dorequest(wlandev, (UINT8*)&amp;msg);</div><div class='add'>+</div><div class='add'>+	if (result) {</div><div class='add'>+		err = -EFAULT;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+ exit:</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#if WIRELESS_EXT &gt; 8</div><div class='add'>+</div><div class='add'>+static int p80211wext_giwmode(netdevice_t *dev,</div><div class='add'>+			      struct iw_request_info *info,</div><div class='add'>+			      __u32 *mode, char *extra)</div><div class='add'>+{</div><div class='add'>+	wlandevice_t *wlandev = (wlandevice_t*)dev-&gt;priv;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	switch (wlandev-&gt;macmode) {</div><div class='add'>+	case WLAN_MACMODE_IBSS_STA:</div><div class='add'>+		*mode = IW_MODE_ADHOC;</div><div class='add'>+		break;</div><div class='add'>+	case WLAN_MACMODE_ESS_STA:</div><div class='add'>+		*mode = IW_MODE_INFRA;</div><div class='add'>+		break;</div><div class='add'>+	case WLAN_MACMODE_ESS_AP:</div><div class='add'>+		*mode = IW_MODE_MASTER;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		/* Not set yet. */</div><div class='add'>+		*mode = IW_MODE_AUTO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int p80211wext_siwmode(netdevice_t *dev,</div><div class='add'>+			      struct iw_request_info *info,</div><div class='add'>+			      __u32 *mode, char *extra)</div><div class='add'>+{</div><div class='add'>+	wlandevice_t *wlandev = (wlandevice_t*)dev-&gt;priv;</div><div class='add'>+	p80211item_uint32_t             mibitem;</div><div class='add'>+	p80211msg_dot11req_mibset_t     msg;</div><div class='add'>+	int 	result;</div><div class='add'>+	int     err = 0;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	if (!wlan_wext_write) {</div><div class='add'>+		err = (-EOPNOTSUPP);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (*mode != IW_MODE_ADHOC &amp;&amp; *mode != IW_MODE_INFRA &amp;&amp;</div><div class='add'>+	    *mode != IW_MODE_MASTER) {</div><div class='add'>+		err = (-EOPNOTSUPP);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Operation mode is the same with current mode */</div><div class='add'>+	if (*mode == wlandev-&gt;macmode)</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	switch (*mode) {</div><div class='add'>+	case IW_MODE_ADHOC:</div><div class='add'>+		wlandev-&gt;macmode = WLAN_MACMODE_IBSS_STA;</div><div class='add'>+		break;</div><div class='add'>+	case IW_MODE_INFRA:</div><div class='add'>+		wlandev-&gt;macmode = WLAN_MACMODE_ESS_STA;</div><div class='add'>+		break;</div><div class='add'>+	case IW_MODE_MASTER:</div><div class='add'>+		wlandev-&gt;macmode = WLAN_MACMODE_ESS_AP;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		/* Not set yet. */</div><div class='add'>+		WLAN_LOG_INFO("Operation mode: %d not support\n", *mode);</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Set Operation mode to the PORT TYPE RID */</div><div class='add'>+</div><div class='add'>+#warning "get rid of p2mib here"</div><div class='add'>+</div><div class='add'>+	msg.msgcode = DIDmsg_dot11req_mibset;</div><div class='add'>+	mibitem.did = DIDmib_p2_p2Static_p2CnfPortType;</div><div class='add'>+	mibitem.data = (*mode == IW_MODE_ADHOC) ? 0 : 1;</div><div class='add'>+	memcpy(&amp;msg.mibattribute.data, &amp;mibitem, sizeof(mibitem));</div><div class='add'>+	result = p80211req_dorequest(wlandev, (UINT8*)&amp;msg);</div><div class='add'>+</div><div class='add'>+	if (result)</div><div class='add'>+		err = -EFAULT;</div><div class='add'>+</div><div class='add'>+ exit:</div><div class='add'>+	DBFEXIT;</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int p80211wext_giwrange(netdevice_t *dev,</div><div class='add'>+			       struct iw_request_info *info,</div><div class='add'>+			       struct iw_point *data, char *extra)</div><div class='add'>+{</div><div class='add'>+        struct iw_range *range = (struct iw_range *) extra;</div><div class='add'>+	int i, val;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	// for backward compatability set size &amp; zero everything we don't understand</div><div class='add'>+	data-&gt;length = sizeof(*range);</div><div class='add'>+	memset(range,0,sizeof(*range));</div><div class='add'>+</div><div class='add'>+#if WIRELESS_EXT &gt; 9</div><div class='add'>+	range-&gt;txpower_capa = IW_TXPOW_DBM;</div><div class='add'>+	// XXX what about min/max_pmp, min/max_pmt, etc.</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if WIRELESS_EXT &gt; 10</div><div class='add'>+	range-&gt;we_version_compiled = WIRELESS_EXT;</div><div class='add'>+	range-&gt;we_version_source = 13;</div><div class='add'>+</div><div class='add'>+	range-&gt;retry_capa = IW_RETRY_LIMIT;</div><div class='add'>+	range-&gt;retry_flags = IW_RETRY_LIMIT;</div><div class='add'>+	range-&gt;min_retry = 0;</div><div class='add'>+	range-&gt;max_retry = 255;</div><div class='add'>+#endif /* WIRELESS_EXT &gt; 10 */</div><div class='add'>+</div><div class='add'>+#if WIRELESS_EXT &gt; 16</div><div class='add'>+        range-&gt;event_capa[0] = (IW_EVENT_CAPA_K_0 |  //mode/freq/ssid</div><div class='add'>+                                IW_EVENT_CAPA_MASK(SIOCGIWAP) |</div><div class='add'>+                                IW_EVENT_CAPA_MASK(SIOCGIWSCAN));</div><div class='add'>+        range-&gt;event_capa[1] = IW_EVENT_CAPA_K_1;  //encode</div><div class='add'>+        range-&gt;event_capa[4] = (IW_EVENT_CAPA_MASK(IWEVQUAL) |</div><div class='add'>+                                IW_EVENT_CAPA_MASK(IWEVCUSTOM) );</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	range-&gt;num_channels = NUM_CHANNELS;</div><div class='add'>+</div><div class='add'>+	/* XXX need to filter against the regulatory domain &amp;| active set */</div><div class='add'>+	val = 0;</div><div class='add'>+	for (i = 0; i &lt; NUM_CHANNELS ; i++) {</div><div class='add'>+		range-&gt;freq[val].i = i + 1;</div><div class='add'>+		range-&gt;freq[val].m = p80211wext_channel_freq[i] * 100000;</div><div class='add'>+		range-&gt;freq[val].e = 1;</div><div class='add'>+		val++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	range-&gt;num_frequency = val;</div><div class='add'>+</div><div class='add'>+	/* Max of /proc/net/wireless */</div><div class='add'>+	range-&gt;max_qual.qual = 100;</div><div class='add'>+	range-&gt;max_qual.level = 0;</div><div class='add'>+	range-&gt;max_qual.noise = 0;</div><div class='add'>+	range-&gt;sensitivity = 3;</div><div class='add'>+	// XXX these need to be nsd-specific!</div><div class='add'>+</div><div class='add'>+	range-&gt;min_rts = 0;</div><div class='add'>+	range-&gt;max_rts = 2347;</div><div class='add'>+	range-&gt;min_frag = 256;</div><div class='add'>+	range-&gt;max_frag = 2346;</div><div class='add'>+</div><div class='add'>+	range-&gt;max_encoding_tokens = NUM_WEPKEYS;</div><div class='add'>+	range-&gt;num_encoding_sizes = 2;</div><div class='add'>+	range-&gt;encoding_size[0] = 5;</div><div class='add'>+	range-&gt;encoding_size[1] = 13;</div><div class='add'>+</div><div class='add'>+	// XXX what about num_bitrates/throughput?</div><div class='add'>+	range-&gt;num_bitrates = 0;</div><div class='add'>+</div><div class='add'>+	/* estimated max throughput */</div><div class='add'>+	// XXX need to cap it if we're running at ~2Mbps..</div><div class='add'>+	range-&gt;throughput = 5500000;</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static int p80211wext_giwap(netdevice_t *dev,</div><div class='add'>+			    struct iw_request_info *info,</div><div class='add'>+			    struct sockaddr *ap_addr, char *extra)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	wlandevice_t *wlandev = (wlandevice_t*)dev-&gt;priv;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	memcpy(ap_addr-&gt;sa_data, wlandev-&gt;bssid, WLAN_BSSID_LEN);</div><div class='add'>+	ap_addr-&gt;sa_family = ARPHRD_ETHER;</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#if WIRELESS_EXT &gt; 8</div><div class='add'>+static int p80211wext_giwencode(netdevice_t *dev,</div><div class='add'>+				struct iw_request_info *info,</div><div class='add'>+				struct iw_point *erq, char *key)</div><div class='add'>+{</div><div class='add'>+	wlandevice_t *wlandev = (wlandevice_t*)dev-&gt;priv;</div><div class='add'>+	int err = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	if (wlandev-&gt;hostwep &amp; HOSTWEP_PRIVACYINVOKED)</div><div class='add'>+		erq-&gt;flags = IW_ENCODE_ENABLED;</div><div class='add'>+	else</div><div class='add'>+		erq-&gt;flags = IW_ENCODE_DISABLED;</div><div class='add'>+</div><div class='add'>+	if (wlandev-&gt;hostwep &amp; HOSTWEP_EXCLUDEUNENCRYPTED)</div><div class='add'>+		erq-&gt;flags |= IW_ENCODE_RESTRICTED;</div><div class='add'>+	else</div><div class='add'>+		erq-&gt;flags |= IW_ENCODE_OPEN;</div><div class='add'>+</div><div class='add'>+	i = (erq-&gt;flags &amp; IW_ENCODE_INDEX) - 1;</div><div class='add'>+</div><div class='add'>+	if (i == -1)</div><div class='add'>+		i = wlandev-&gt;hostwep &amp; HOSTWEP_DEFAULTKEY_MASK;</div><div class='add'>+</div><div class='add'>+	if ((i &lt; 0) || (i &gt;= NUM_WEPKEYS)) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	erq-&gt;flags |= i + 1;</div><div class='add'>+</div><div class='add'>+	/* copy the key from the driver cache as the keys are read-only MIBs */</div><div class='add'>+	erq-&gt;length = wlandev-&gt;wep_keylens[i];</div><div class='add'>+	memcpy(key, wlandev-&gt;wep_keys[i], erq-&gt;length);</div><div class='add'>+</div><div class='add'>+ exit:</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int p80211wext_siwencode(netdevice_t *dev,</div><div class='add'>+				struct iw_request_info *info,</div><div class='add'>+				struct iw_point *erq, char *key)</div><div class='add'>+{</div><div class='add'>+	wlandevice_t *wlandev = (wlandevice_t*)dev-&gt;priv;</div><div class='add'>+	p80211msg_dot11req_mibset_t	msg;</div><div class='add'>+	p80211item_pstr32_t		pstr;</div><div class='add'>+</div><div class='add'>+	int err = 0;</div><div class='add'>+	int result = 0;</div><div class='add'>+	int enable = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+	if (!wlan_wext_write) {</div><div class='add'>+		err = (-EOPNOTSUPP);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check the Key index first. */</div><div class='add'>+	if((i = (erq-&gt;flags &amp; IW_ENCODE_INDEX))) {</div><div class='add'>+</div><div class='add'>+		if ((i &lt; 1) || (i &gt; NUM_WEPKEYS)) {</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+		else</div><div class='add'>+			i--;</div><div class='add'>+</div><div class='add'>+		result = p80211wext_dorequest(wlandev, DIDmib_dot11smt_dot11PrivacyTable_dot11WEPDefaultKeyID, i);</div><div class='add'>+</div><div class='add'>+		if (result) {</div><div class='add'>+			err = -EFAULT;</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+		else {</div><div class='add'>+			enable = 1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+	else {</div><div class='add'>+		// Do not thing when no Key Index</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check if there is no key information in the iwconfig request */</div><div class='add'>+	if((erq-&gt;flags &amp; IW_ENCODE_NOKEY) == 0 &amp;&amp; enable == 1) {</div><div class='add'>+</div><div class='add'>+		/*------------------------------------------------------------</div><div class='add'>+		 * If there is WEP Key for setting, check the Key Information</div><div class='add'>+		 * and then set it to the firmware.</div><div class='add'>+		 -------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+		if (erq-&gt;length &gt; 0) {</div><div class='add'>+</div><div class='add'>+			/* copy the key from the driver cache as the keys are read-only MIBs */</div><div class='add'>+			wlandev-&gt;wep_keylens[i] = erq-&gt;length;</div><div class='add'>+			memcpy(wlandev-&gt;wep_keys[i], key, erq-&gt;length);</div><div class='add'>+</div><div class='add'>+			/* Prepare data struture for p80211req_dorequest. */</div><div class='add'>+			memcpy(pstr.data.data, key, erq-&gt;length);</div><div class='add'>+			pstr.data.len = erq-&gt;length;</div><div class='add'>+</div><div class='add'>+			switch(i)</div><div class='add'>+			{</div><div class='add'>+				case 0:</div><div class='add'>+					pstr.did = DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey0;</div><div class='add'>+					break;</div><div class='add'>+</div><div class='add'>+				case 1:</div><div class='add'>+					pstr.did = DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey1;</div><div class='add'>+					break;</div><div class='add'>+</div><div class='add'>+				case 2:</div><div class='add'>+					pstr.did = DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey2;</div><div class='add'>+					break;</div><div class='add'>+</div><div class='add'>+				case 3:</div><div class='add'>+					pstr.did = DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey3;</div><div class='add'>+					break;</div><div class='add'>+</div><div class='add'>+				default:</div><div class='add'>+					err = -EINVAL;</div><div class='add'>+					goto exit;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			msg.msgcode = DIDmsg_dot11req_mibset;</div><div class='add'>+			memcpy(&amp;msg.mibattribute.data, &amp;pstr, sizeof(pstr));</div><div class='add'>+			result = p80211req_dorequest(wlandev, (UINT8*)&amp;msg);</div><div class='add'>+</div><div class='add'>+			if (result) {</div><div class='add'>+				err = -EFAULT;</div><div class='add'>+				goto exit;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check the PrivacyInvoked flag */</div><div class='add'>+	if (erq-&gt;flags &amp; IW_ENCODE_DISABLED) {</div><div class='add'>+		result = p80211wext_dorequest(wlandev, DIDmib_dot11smt_dot11PrivacyTable_dot11PrivacyInvoked, P80211ENUM_truth_false);</div><div class='add'>+	}</div><div class='add'>+	else if((erq-&gt;flags &amp; IW_ENCODE_ENABLED) || enable == 1) {</div><div class='add'>+		result = p80211wext_dorequest(wlandev, DIDmib_dot11smt_dot11PrivacyTable_dot11PrivacyInvoked, P80211ENUM_truth_true);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (result) {</div><div class='add'>+		err = -EFAULT;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check the ExcludeUnencrypted flag */</div><div class='add'>+	if (erq-&gt;flags &amp; IW_ENCODE_RESTRICTED) {</div><div class='add'>+		result = p80211wext_dorequest(wlandev, DIDmib_dot11smt_dot11PrivacyTable_dot11ExcludeUnencrypted, P80211ENUM_truth_true);</div><div class='add'>+	}</div><div class='add'>+	else if (erq-&gt;flags &amp; IW_ENCODE_OPEN) {</div><div class='add'>+		result = p80211wext_dorequest(wlandev, DIDmib_dot11smt_dot11PrivacyTable_dot11ExcludeUnencrypted, P80211ENUM_truth_false);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (result) {</div><div class='add'>+		err = -EFAULT;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+ exit:</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int p80211wext_giwessid(netdevice_t *dev,</div><div class='add'>+			       struct iw_request_info *info,</div><div class='add'>+			       struct iw_point *data, char *essid)</div><div class='add'>+{</div><div class='add'>+	wlandevice_t *wlandev = (wlandevice_t*)dev-&gt;priv;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	if (wlandev-&gt;ssid.len) {</div><div class='add'>+		data-&gt;length = wlandev-&gt;ssid.len;</div><div class='add'>+		data-&gt;flags = 1;</div><div class='add'>+		memcpy(essid, wlandev-&gt;ssid.data, data-&gt;length);</div><div class='add'>+		essid[data-&gt;length] = 0;</div><div class='add'>+#if (WIRELESS_EXT &lt; 21)</div><div class='add'>+		data-&gt;length++;</div><div class='add'>+#endif</div><div class='add'>+	} else {</div><div class='add'>+	  	memset(essid, 0, sizeof(wlandev-&gt;ssid.data));</div><div class='add'>+		data-&gt;length = 0;</div><div class='add'>+		data-&gt;flags = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int p80211wext_siwessid(netdevice_t *dev,</div><div class='add'>+			       struct iw_request_info *info,</div><div class='add'>+			       struct iw_point *data, char *essid)</div><div class='add'>+{</div><div class='add'>+	wlandevice_t *wlandev = (wlandevice_t*)dev-&gt;priv;</div><div class='add'>+	p80211msg_lnxreq_autojoin_t     msg;</div><div class='add'>+</div><div class='add'>+	int result;</div><div class='add'>+	int err = 0;</div><div class='add'>+	int length = data-&gt;length;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	if (!wlan_wext_write) {</div><div class='add'>+		err = (-EOPNOTSUPP);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	if ( wlandev-&gt;hostwep &amp; HOSTWEP_SHAREDKEY )</div><div class='add'>+	  msg.authtype.data = P80211ENUM_authalg_sharedkey;</div><div class='add'>+	else</div><div class='add'>+	  msg.authtype.data = P80211ENUM_authalg_opensystem;</div><div class='add'>+</div><div class='add'>+	msg.msgcode = DIDmsg_lnxreq_autojoin;</div><div class='add'>+</div><div class='add'>+#if (WIRELESS_EXT &lt; 21)</div><div class='add'>+	if (length) length--;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* Trim the last '\0' to fit the SSID format */</div><div class='add'>+</div><div class='add'>+	if (length &amp;&amp; essid[length-1] == '\0') {</div><div class='add'>+	  length--;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(msg.ssid.data.data, essid, length);</div><div class='add'>+	msg.ssid.data.len = length;</div><div class='add'>+</div><div class='add'>+	WLAN_LOG_DEBUG(1,"autojoin_ssid for %s \n",essid);</div><div class='add'>+	result = p80211req_dorequest(wlandev, (UINT8*)&amp;msg);</div><div class='add'>+        WLAN_LOG_DEBUG(1,"autojoin_ssid %d\n",result);</div><div class='add'>+</div><div class='add'>+	if (result) {</div><div class='add'>+		err = -EFAULT;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+ exit:</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int p80211wext_siwcommit(netdevice_t *dev,</div><div class='add'>+				struct iw_request_info *info,</div><div class='add'>+				struct iw_point *data, char *essid)</div><div class='add'>+{</div><div class='add'>+	wlandevice_t *wlandev = (wlandevice_t*)dev-&gt;priv;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	if (!wlan_wext_write) {</div><div class='add'>+		err = (-EOPNOTSUPP);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Auto Join */</div><div class='add'>+	err = p80211wext_autojoin(wlandev);</div><div class='add'>+</div><div class='add'>+ exit:</div><div class='add'>+ 	DBFEXIT;</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int p80211wext_giwrate(netdevice_t *dev,</div><div class='add'>+			      struct iw_request_info *info,</div><div class='add'>+			      struct iw_param *rrq, char *extra)</div><div class='add'>+{</div><div class='add'>+	wlandevice_t *wlandev = (wlandevice_t*)dev-&gt;priv;</div><div class='add'>+	p80211item_uint32_t             mibitem;</div><div class='add'>+	p80211msg_dot11req_mibset_t     msg;</div><div class='add'>+	int result;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	msg.msgcode = DIDmsg_dot11req_mibget;</div><div class='add'>+	mibitem.did = DIDmib_p2_p2MAC_p2CurrentTxRate;</div><div class='add'>+	memcpy(&amp;msg.mibattribute.data, &amp;mibitem, sizeof(mibitem));</div><div class='add'>+	result = p80211req_dorequest(wlandev, (UINT8*)&amp;msg);</div><div class='add'>+</div><div class='add'>+	if (result) {</div><div class='add'>+		err = -EFAULT;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;mibitem, &amp;msg.mibattribute.data, sizeof(mibitem));</div><div class='add'>+</div><div class='add'>+	rrq-&gt;fixed = 0;   /* can it change? */</div><div class='add'>+	rrq-&gt;disabled = 0;</div><div class='add'>+	rrq-&gt;value = 0;</div><div class='add'>+</div><div class='add'>+#define		HFA384x_RATEBIT_1			((UINT16)1)</div><div class='add'>+#define		HFA384x_RATEBIT_2			((UINT16)2)</div><div class='add'>+#define		HFA384x_RATEBIT_5dot5			((UINT16)4)</div><div class='add'>+#define		HFA384x_RATEBIT_11			((UINT16)8)</div><div class='add'>+</div><div class='add'>+	switch (mibitem.data) {</div><div class='add'>+	case HFA384x_RATEBIT_1:</div><div class='add'>+		rrq-&gt;value = 1000000;</div><div class='add'>+		break;</div><div class='add'>+	case HFA384x_RATEBIT_2:</div><div class='add'>+		rrq-&gt;value = 2000000;</div><div class='add'>+		break;</div><div class='add'>+	case HFA384x_RATEBIT_5dot5:</div><div class='add'>+		rrq-&gt;value = 5500000;</div><div class='add'>+		break;</div><div class='add'>+	case HFA384x_RATEBIT_11:</div><div class='add'>+		rrq-&gt;value = 11000000;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+	}</div><div class='add'>+ exit:</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int p80211wext_giwrts(netdevice_t *dev,</div><div class='add'>+			     struct iw_request_info *info,</div><div class='add'>+			     struct iw_param *rts, char *extra)</div><div class='add'>+{</div><div class='add'>+	wlandevice_t *wlandev = (wlandevice_t*)dev-&gt;priv;</div><div class='add'>+	p80211item_uint32_t             mibitem;</div><div class='add'>+	p80211msg_dot11req_mibset_t     msg;</div><div class='add'>+	int result;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	msg.msgcode = DIDmsg_dot11req_mibget;</div><div class='add'>+	mibitem.did = DIDmib_dot11mac_dot11OperationTable_dot11RTSThreshold;</div><div class='add'>+	memcpy(&amp;msg.mibattribute.data, &amp;mibitem, sizeof(mibitem));</div><div class='add'>+	result = p80211req_dorequest(wlandev, (UINT8*)&amp;msg);</div><div class='add'>+</div><div class='add'>+	if (result) {</div><div class='add'>+		err = -EFAULT;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;mibitem, &amp;msg.mibattribute.data, sizeof(mibitem));</div><div class='add'>+</div><div class='add'>+	rts-&gt;value = mibitem.data;</div><div class='add'>+	rts-&gt;disabled = (rts-&gt;value == 2347);</div><div class='add'>+	rts-&gt;fixed = 1;</div><div class='add'>+</div><div class='add'>+ exit:</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int p80211wext_siwrts(netdevice_t *dev,</div><div class='add'>+			     struct iw_request_info *info,</div><div class='add'>+			     struct iw_param *rts, char *extra)</div><div class='add'>+{</div><div class='add'>+	wlandevice_t *wlandev = (wlandevice_t*)dev-&gt;priv;</div><div class='add'>+	p80211item_uint32_t             mibitem;</div><div class='add'>+	p80211msg_dot11req_mibset_t     msg;</div><div class='add'>+	int result;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	if (!wlan_wext_write) {</div><div class='add'>+		err = (-EOPNOTSUPP);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	msg.msgcode = DIDmsg_dot11req_mibget;</div><div class='add'>+	mibitem.did = DIDmib_dot11mac_dot11OperationTable_dot11RTSThreshold;</div><div class='add'>+	if (rts-&gt;disabled)</div><div class='add'>+		mibitem.data = 2347;</div><div class='add'>+	else</div><div class='add'>+		mibitem.data = rts-&gt;value;</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;msg.mibattribute.data, &amp;mibitem, sizeof(mibitem));</div><div class='add'>+	result = p80211req_dorequest(wlandev, (UINT8*)&amp;msg);</div><div class='add'>+</div><div class='add'>+	if (result) {</div><div class='add'>+		err = -EFAULT;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+ exit:</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int p80211wext_giwfrag(netdevice_t *dev,</div><div class='add'>+			      struct iw_request_info *info,</div><div class='add'>+			      struct iw_param *frag, char *extra)</div><div class='add'>+{</div><div class='add'>+	wlandevice_t *wlandev = (wlandevice_t*)dev-&gt;priv;</div><div class='add'>+	p80211item_uint32_t             mibitem;</div><div class='add'>+	p80211msg_dot11req_mibset_t     msg;</div><div class='add'>+	int result;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	msg.msgcode = DIDmsg_dot11req_mibget;</div><div class='add'>+	mibitem.did = DIDmib_dot11mac_dot11OperationTable_dot11FragmentationThreshold;</div><div class='add'>+	memcpy(&amp;msg.mibattribute.data, &amp;mibitem, sizeof(mibitem));</div><div class='add'>+	result = p80211req_dorequest(wlandev, (UINT8*)&amp;msg);</div><div class='add'>+</div><div class='add'>+	if (result) {</div><div class='add'>+		err = -EFAULT;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;mibitem, &amp;msg.mibattribute.data, sizeof(mibitem));</div><div class='add'>+</div><div class='add'>+	frag-&gt;value = mibitem.data;</div><div class='add'>+	frag-&gt;disabled = (frag-&gt;value == 2346);</div><div class='add'>+	frag-&gt;fixed = 1;</div><div class='add'>+</div><div class='add'>+ exit:</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int p80211wext_siwfrag(netdevice_t *dev,</div><div class='add'>+			      struct iw_request_info *info,</div><div class='add'>+			      struct iw_param *frag, char *extra)</div><div class='add'>+{</div><div class='add'>+	wlandevice_t *wlandev = (wlandevice_t*)dev-&gt;priv;</div><div class='add'>+	p80211item_uint32_t             mibitem;</div><div class='add'>+	p80211msg_dot11req_mibset_t     msg;</div><div class='add'>+	int result;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	if (!wlan_wext_write) {</div><div class='add'>+		err = (-EOPNOTSUPP);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	msg.msgcode = DIDmsg_dot11req_mibset;</div><div class='add'>+	mibitem.did = DIDmib_dot11mac_dot11OperationTable_dot11FragmentationThreshold;</div><div class='add'>+</div><div class='add'>+	if (frag-&gt;disabled)</div><div class='add'>+		mibitem.data = 2346;</div><div class='add'>+	else</div><div class='add'>+		mibitem.data = frag-&gt;value;</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;msg.mibattribute.data, &amp;mibitem, sizeof(mibitem));</div><div class='add'>+	result = p80211req_dorequest(wlandev, (UINT8*)&amp;msg);</div><div class='add'>+</div><div class='add'>+	if (result) {</div><div class='add'>+		err = -EFAULT;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+ exit:</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif  /* WIRELESS_EXT &gt; 8 */</div><div class='add'>+</div><div class='add'>+#if WIRELESS_EXT &gt; 10</div><div class='add'>+</div><div class='add'>+#ifndef IW_RETRY_LONG</div><div class='add'>+#define IW_RETRY_LONG IW_RETRY_MAX</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef IW_RETRY_SHORT</div><div class='add'>+#define IW_RETRY_SHORT IW_RETRY_MIN</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static int p80211wext_giwretry(netdevice_t *dev,</div><div class='add'>+			       struct iw_request_info *info,</div><div class='add'>+			       struct iw_param *rrq, char *extra)</div><div class='add'>+{</div><div class='add'>+	wlandevice_t *wlandev = (wlandevice_t*)dev-&gt;priv;</div><div class='add'>+	p80211item_uint32_t             mibitem;</div><div class='add'>+	p80211msg_dot11req_mibset_t     msg;</div><div class='add'>+	int result;</div><div class='add'>+	int err = 0;</div><div class='add'>+	UINT16 shortretry, longretry, lifetime;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	msg.msgcode = DIDmsg_dot11req_mibget;</div><div class='add'>+	mibitem.did = DIDmib_dot11mac_dot11OperationTable_dot11ShortRetryLimit;</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;msg.mibattribute.data, &amp;mibitem, sizeof(mibitem));</div><div class='add'>+	result = p80211req_dorequest(wlandev, (UINT8*)&amp;msg);</div><div class='add'>+</div><div class='add'>+	if (result) {</div><div class='add'>+		err = -EFAULT;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;mibitem, &amp;msg.mibattribute.data, sizeof(mibitem));</div><div class='add'>+</div><div class='add'>+	shortretry = mibitem.data;</div><div class='add'>+</div><div class='add'>+	mibitem.did = DIDmib_dot11mac_dot11OperationTable_dot11LongRetryLimit;</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;msg.mibattribute.data, &amp;mibitem, sizeof(mibitem));</div><div class='add'>+	result = p80211req_dorequest(wlandev, (UINT8*)&amp;msg);</div><div class='add'>+</div><div class='add'>+	if (result) {</div><div class='add'>+		err = -EFAULT;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;mibitem, &amp;msg.mibattribute.data, sizeof(mibitem));</div><div class='add'>+</div><div class='add'>+	longretry = mibitem.data;</div><div class='add'>+</div><div class='add'>+	mibitem.did = DIDmib_dot11mac_dot11OperationTable_dot11MaxTransmitMSDULifetime;</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;msg.mibattribute.data, &amp;mibitem, sizeof(mibitem));</div><div class='add'>+	result = p80211req_dorequest(wlandev, (UINT8*)&amp;msg);</div><div class='add'>+</div><div class='add'>+	if (result) {</div><div class='add'>+		err = -EFAULT;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;mibitem, &amp;msg.mibattribute.data, sizeof(mibitem));</div><div class='add'>+</div><div class='add'>+	lifetime = mibitem.data;</div><div class='add'>+</div><div class='add'>+	rrq-&gt;disabled = 0;</div><div class='add'>+</div><div class='add'>+	if ((rrq-&gt;flags &amp; IW_RETRY_TYPE) == IW_RETRY_LIFETIME) {</div><div class='add'>+		rrq-&gt;flags = IW_RETRY_LIFETIME;</div><div class='add'>+		rrq-&gt;value = lifetime * 1024;</div><div class='add'>+	} else {</div><div class='add'>+		if (rrq-&gt;flags &amp; IW_RETRY_LONG) {</div><div class='add'>+			rrq-&gt;flags = IW_RETRY_LIMIT | IW_RETRY_LONG;</div><div class='add'>+			rrq-&gt;value = longretry;</div><div class='add'>+		} else {</div><div class='add'>+			rrq-&gt;flags = IW_RETRY_LIMIT;</div><div class='add'>+			rrq-&gt;value = shortretry;</div><div class='add'>+			if (shortretry != longretry)</div><div class='add'>+				rrq-&gt;flags |= IW_RETRY_SHORT;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+ exit:</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return err;</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int p80211wext_siwretry(netdevice_t *dev,</div><div class='add'>+			       struct iw_request_info *info,</div><div class='add'>+			       struct iw_param *rrq, char *extra)</div><div class='add'>+{</div><div class='add'>+	wlandevice_t *wlandev = (wlandevice_t*)dev-&gt;priv;</div><div class='add'>+	p80211item_uint32_t             mibitem;</div><div class='add'>+	p80211msg_dot11req_mibset_t     msg;</div><div class='add'>+	int result;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	if (!wlan_wext_write) {</div><div class='add'>+		err = (-EOPNOTSUPP);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rrq-&gt;disabled) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	msg.msgcode = DIDmsg_dot11req_mibset;</div><div class='add'>+</div><div class='add'>+	if ((rrq-&gt;flags &amp; IW_RETRY_TYPE) == IW_RETRY_LIFETIME) {</div><div class='add'>+		mibitem.did = DIDmib_dot11mac_dot11OperationTable_dot11MaxTransmitMSDULifetime;</div><div class='add'>+		mibitem.data =  rrq-&gt;value /= 1024;</div><div class='add'>+</div><div class='add'>+		memcpy(&amp;msg.mibattribute.data, &amp;mibitem, sizeof(mibitem));</div><div class='add'>+		result = p80211req_dorequest(wlandev, (UINT8*)&amp;msg);</div><div class='add'>+</div><div class='add'>+		if (result) {</div><div class='add'>+			err = -EFAULT;</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		if (rrq-&gt;flags &amp; IW_RETRY_LONG) {</div><div class='add'>+			mibitem.did = DIDmib_dot11mac_dot11OperationTable_dot11LongRetryLimit;</div><div class='add'>+			mibitem.data = rrq-&gt;value;</div><div class='add'>+</div><div class='add'>+			memcpy(&amp;msg.mibattribute.data, &amp;mibitem, sizeof(mibitem));</div><div class='add'>+			result = p80211req_dorequest(wlandev, (UINT8*)&amp;msg);</div><div class='add'>+</div><div class='add'>+			if (result) {</div><div class='add'>+				err = -EFAULT;</div><div class='add'>+				goto exit;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (rrq-&gt;flags &amp; IW_RETRY_SHORT) {</div><div class='add'>+			mibitem.did = DIDmib_dot11mac_dot11OperationTable_dot11ShortRetryLimit;</div><div class='add'>+			mibitem.data = rrq-&gt;value;</div><div class='add'>+</div><div class='add'>+			memcpy(&amp;msg.mibattribute.data, &amp;mibitem, sizeof(mibitem));</div><div class='add'>+			result = p80211req_dorequest(wlandev, (UINT8*)&amp;msg);</div><div class='add'>+</div><div class='add'>+			if (result) {</div><div class='add'>+				err = -EFAULT;</div><div class='add'>+				goto exit;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+ exit:</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return err;</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* WIRELESS_EXT &gt; 10 */</div><div class='add'>+</div><div class='add'>+#if WIRELESS_EXT &gt; 9</div><div class='add'>+static int p80211wext_siwtxpow(netdevice_t *dev,</div><div class='add'>+                               struct iw_request_info *info,</div><div class='add'>+                               struct iw_param *rrq, char *extra)</div><div class='add'>+{</div><div class='add'>+        wlandevice_t *wlandev = (wlandevice_t*)dev-&gt;priv;</div><div class='add'>+        p80211item_uint32_t             mibitem;</div><div class='add'>+        p80211msg_dot11req_mibset_t     msg;</div><div class='add'>+        int result;</div><div class='add'>+        int err = 0;</div><div class='add'>+</div><div class='add'>+        DBFENTER;</div><div class='add'>+</div><div class='add'>+       if (!wlan_wext_write) {</div><div class='add'>+                err = (-EOPNOTSUPP);</div><div class='add'>+                goto exit;</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+        msg.msgcode = DIDmsg_dot11req_mibset;</div><div class='add'>+</div><div class='add'>+        switch (rrq-&gt;value) {</div><div class='add'>+</div><div class='add'>+          case 1 : mibitem.did = DIDmib_dot11phy_dot11PhyTxPowerTable_dot11TxPowerLevel1; break;</div><div class='add'>+          case 2 : mibitem.did = DIDmib_dot11phy_dot11PhyTxPowerTable_dot11TxPowerLevel2; break;</div><div class='add'>+          case 3 : mibitem.did = DIDmib_dot11phy_dot11PhyTxPowerTable_dot11TxPowerLevel3; break;</div><div class='add'>+          case 4 : mibitem.did = DIDmib_dot11phy_dot11PhyTxPowerTable_dot11TxPowerLevel4; break;</div><div class='add'>+          case 5 : mibitem.did = DIDmib_dot11phy_dot11PhyTxPowerTable_dot11TxPowerLevel5; break;</div><div class='add'>+          case 6 : mibitem.did = DIDmib_dot11phy_dot11PhyTxPowerTable_dot11TxPowerLevel6; break;</div><div class='add'>+          case 7 : mibitem.did = DIDmib_dot11phy_dot11PhyTxPowerTable_dot11TxPowerLevel7; break;</div><div class='add'>+          case 8 : mibitem.did = DIDmib_dot11phy_dot11PhyTxPowerTable_dot11TxPowerLevel8; break;</div><div class='add'>+          default: mibitem.did = DIDmib_dot11phy_dot11PhyTxPowerTable_dot11TxPowerLevel8; break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+        memcpy(&amp;msg.mibattribute.data, &amp;mibitem, sizeof(mibitem));</div><div class='add'>+        result = p80211req_dorequest(wlandev, (UINT8*)&amp;msg);</div><div class='add'>+</div><div class='add'>+        if (result) {</div><div class='add'>+                err = -EFAULT;</div><div class='add'>+                goto exit;</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+ exit:</div><div class='add'>+        DBFEXIT;</div><div class='add'>+        return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int p80211wext_giwtxpow(netdevice_t *dev,</div><div class='add'>+			       struct iw_request_info *info,</div><div class='add'>+			       struct iw_param *rrq, char *extra)</div><div class='add'>+{</div><div class='add'>+	wlandevice_t *wlandev = (wlandevice_t*)dev-&gt;priv;</div><div class='add'>+	p80211item_uint32_t             mibitem;</div><div class='add'>+	p80211msg_dot11req_mibset_t     msg;</div><div class='add'>+	int result;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	msg.msgcode = DIDmsg_dot11req_mibget;</div><div class='add'>+	mibitem.did = DIDmib_dot11phy_dot11PhyTxPowerTable_dot11CurrentTxPowerLevel;</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;msg.mibattribute.data, &amp;mibitem, sizeof(mibitem));</div><div class='add'>+	result = p80211req_dorequest(wlandev, (UINT8*)&amp;msg);</div><div class='add'>+</div><div class='add'>+	if (result) {</div><div class='add'>+		err = -EFAULT;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;mibitem, &amp;msg.mibattribute.data, sizeof(mibitem));</div><div class='add'>+</div><div class='add'>+	// XXX handle OFF by setting disabled = 1;</div><div class='add'>+</div><div class='add'>+	rrq-&gt;flags = 0; // IW_TXPOW_DBM;</div><div class='add'>+	rrq-&gt;disabled = 0;</div><div class='add'>+	rrq-&gt;fixed = 0;</div><div class='add'>+	rrq-&gt;value = mibitem.data;</div><div class='add'>+</div><div class='add'>+ exit:</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+#endif /* WIRELESS_EXT &gt; 9 */</div><div class='add'>+</div><div class='add'>+static int p80211wext_siwspy(netdevice_t *dev,</div><div class='add'>+			     struct iw_request_info *info,</div><div class='add'>+			     struct iw_point *srq, char *extra)</div><div class='add'>+{</div><div class='add'>+	wlandevice_t *wlandev = (wlandevice_t*)dev-&gt;priv;</div><div class='add'>+        struct sockaddr address[IW_MAX_SPY];</div><div class='add'>+        int number = srq-&gt;length;</div><div class='add'>+        int i;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	/* Copy the data from the input buffer */</div><div class='add'>+	memcpy(address, extra, sizeof(struct sockaddr)*number);</div><div class='add'>+</div><div class='add'>+        wlandev-&gt;spy_number = 0;</div><div class='add'>+</div><div class='add'>+        if (number &gt; 0) {</div><div class='add'>+</div><div class='add'>+                /* extract the addresses */</div><div class='add'>+                for (i = 0; i &lt; number; i++) {</div><div class='add'>+</div><div class='add'>+                        memcpy(wlandev-&gt;spy_address[i], address[i].sa_data, ETH_ALEN);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+                /* reset stats */</div><div class='add'>+                memset(wlandev-&gt;spy_stat, 0, sizeof(struct iw_quality) * IW_MAX_SPY);</div><div class='add'>+</div><div class='add'>+                /* set number of addresses */</div><div class='add'>+                wlandev-&gt;spy_number = number;</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* jkriegl: from orinoco, modified */</div><div class='add'>+static int p80211wext_giwspy(netdevice_t *dev,</div><div class='add'>+			     struct iw_request_info *info,</div><div class='add'>+			     struct iw_point *srq, char *extra)</div><div class='add'>+{</div><div class='add'>+	wlandevice_t *wlandev = (wlandevice_t*)dev-&gt;priv;</div><div class='add'>+</div><div class='add'>+        struct sockaddr address[IW_MAX_SPY];</div><div class='add'>+        struct iw_quality spy_stat[IW_MAX_SPY];</div><div class='add'>+        int number;</div><div class='add'>+        int i;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+        number = wlandev-&gt;spy_number;</div><div class='add'>+</div><div class='add'>+        if (number &gt; 0) {</div><div class='add'>+</div><div class='add'>+                /* populate address and spy struct's */</div><div class='add'>+                for (i = 0; i &lt; number; i++) {</div><div class='add'>+                        memcpy(address[i].sa_data, wlandev-&gt;spy_address[i], ETH_ALEN);</div><div class='add'>+                        address[i].sa_family = AF_UNIX;</div><div class='add'>+                	memcpy(&amp;spy_stat[i], &amp;wlandev-&gt;spy_stat[i], sizeof(struct iw_quality));</div><div class='add'>+                }</div><div class='add'>+</div><div class='add'>+		/* reset update flag */</div><div class='add'>+                for (i=0; i &lt; number; i++)</div><div class='add'>+                        wlandev-&gt;spy_stat[i].updated = 0;</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+        /* push stuff to user space */</div><div class='add'>+        srq-&gt;length = number;</div><div class='add'>+	memcpy(extra, address, sizeof(struct sockaddr)*number);</div><div class='add'>+	memcpy(extra+sizeof(struct sockaddr)*number, spy_stat, sizeof(struct iw_quality)*number);</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int prism2_result2err (int prism2_result)</div><div class='add'>+{</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	switch (prism2_result) {</div><div class='add'>+		case P80211ENUM_resultcode_invalid_parameters:</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			break;</div><div class='add'>+		case P80211ENUM_resultcode_implementation_failure:</div><div class='add'>+			err = -EIO;</div><div class='add'>+			break;</div><div class='add'>+		case P80211ENUM_resultcode_not_supported:</div><div class='add'>+			err = -EOPNOTSUPP;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			err = 0;</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#if WIRELESS_EXT &gt; 13</div><div class='add'>+static int p80211wext_siwscan(netdevice_t *dev,</div><div class='add'>+			     struct iw_request_info *info,</div><div class='add'>+			     struct iw_point *srq, char *extra)</div><div class='add'>+{</div><div class='add'>+	wlandevice_t *wlandev = (wlandevice_t*)dev-&gt;priv;</div><div class='add'>+	p80211msg_dot11req_scan_t	msg;</div><div class='add'>+	int result;</div><div class='add'>+	int err = 0;</div><div class='add'>+	int i = 0;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	if (wlandev-&gt;macmode == WLAN_MACMODE_ESS_AP) {</div><div class='add'>+		WLAN_LOG_ERROR("Can't scan in AP mode\n");</div><div class='add'>+		err = (-EOPNOTSUPP);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(&amp;msg, 0x00, sizeof(p80211msg_dot11req_scan_t));</div><div class='add'>+	msg.msgcode = DIDmsg_dot11req_scan;</div><div class='add'>+	msg.bsstype.data = P80211ENUM_bsstype_any;</div><div class='add'>+</div><div class='add'>+	memset(&amp;(msg.bssid.data), 0xFF, sizeof (p80211item_pstr6_t));</div><div class='add'>+	msg.bssid.data.len = 6;</div><div class='add'>+</div><div class='add'>+	msg.scantype.data = P80211ENUM_scantype_active;</div><div class='add'>+	msg.probedelay.data = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 1; i &lt;= 14; i++)</div><div class='add'>+		msg.channellist.data.data[i-1] = i;</div><div class='add'>+	msg.channellist.data.len = 14;</div><div class='add'>+</div><div class='add'>+	msg.maxchanneltime.data = 250;</div><div class='add'>+	msg.minchanneltime.data = 200;</div><div class='add'>+</div><div class='add'>+	result = p80211req_dorequest(wlandev, (UINT8*)&amp;msg);</div><div class='add'>+	if (result)</div><div class='add'>+		err = prism2_result2err (msg.resultcode.data);</div><div class='add'>+</div><div class='add'>+ exit:</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Helper to translate scan into Wireless Extensions scan results.</div><div class='add'>+ * Inspired by the prism54 code, which was in turn inspired by the</div><div class='add'>+ * airo driver code.</div><div class='add'>+ */</div><div class='add'>+static char *</div><div class='add'>+wext_translate_bss(struct iw_request_info *info, char *current_ev,</div><div class='add'>+		   char *end_buf, p80211msg_dot11req_scan_results_t *bss)</div><div class='add'>+{</div><div class='add'>+	struct iw_event iwe;	/* Temporary buffer */</div><div class='add'>+</div><div class='add'>+	/* The first entry must be the MAC address */</div><div class='add'>+	memcpy(iwe.u.ap_addr.sa_data, bss-&gt;bssid.data.data, WLAN_BSSID_LEN);</div><div class='add'>+	iwe.u.ap_addr.sa_family = ARPHRD_ETHER;</div><div class='add'>+	iwe.cmd = SIOCGIWAP;</div><div class='add'>+	current_ev = iwe_stream_add_event(info, current_ev, end_buf, &amp;iwe, IW_EV_ADDR_LEN);</div><div class='add'>+</div><div class='add'>+	/* The following entries will be displayed in the same order we give them */</div><div class='add'>+</div><div class='add'>+	/* The ESSID. */</div><div class='add'>+	if (bss-&gt;ssid.data.len &gt; 0) {</div><div class='add'>+		char essid[IW_ESSID_MAX_SIZE + 1];</div><div class='add'>+		int size;</div><div class='add'>+</div><div class='add'>+		size = wlan_min(IW_ESSID_MAX_SIZE, bss-&gt;ssid.data.len);</div><div class='add'>+		memset(&amp;essid, 0, sizeof (essid));</div><div class='add'>+		memcpy(&amp;essid, bss-&gt;ssid.data.data, size);</div><div class='add'>+		WLAN_LOG_DEBUG(1, " essid size = %d\n", size);</div><div class='add'>+		iwe.u.data.length = size;</div><div class='add'>+		iwe.u.data.flags = 1;</div><div class='add'>+		iwe.cmd = SIOCGIWESSID;</div><div class='add'>+		current_ev = iwe_stream_add_point(info, current_ev, end_buf, &amp;iwe, &amp;essid[0]);</div><div class='add'>+		WLAN_LOG_DEBUG(1, " essid size OK.\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (bss-&gt;bsstype.data) {</div><div class='add'>+		case P80211ENUM_bsstype_infrastructure:</div><div class='add'>+			iwe.u.mode = IW_MODE_MASTER;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case P80211ENUM_bsstype_independent:</div><div class='add'>+			iwe.u.mode = IW_MODE_ADHOC;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		default:</div><div class='add'>+			iwe.u.mode = 0;</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	iwe.cmd = SIOCGIWMODE;</div><div class='add'>+	if (iwe.u.mode)</div><div class='add'>+		current_ev = iwe_stream_add_event(info, current_ev, end_buf, &amp;iwe, IW_EV_UINT_LEN);</div><div class='add'>+</div><div class='add'>+	/* Encryption capability */</div><div class='add'>+	if (bss-&gt;privacy.data == P80211ENUM_truth_true)</div><div class='add'>+		iwe.u.data.flags = IW_ENCODE_ENABLED | IW_ENCODE_NOKEY;</div><div class='add'>+	else</div><div class='add'>+		iwe.u.data.flags = IW_ENCODE_DISABLED;</div><div class='add'>+	iwe.u.data.length = 0;</div><div class='add'>+	iwe.cmd = SIOCGIWENCODE;</div><div class='add'>+	current_ev = iwe_stream_add_point(info, current_ev, end_buf, &amp;iwe, NULL);</div><div class='add'>+</div><div class='add'>+	/* Add frequency. (short) bss-&gt;channel is the frequency in MHz */</div><div class='add'>+	iwe.u.freq.m = bss-&gt;dschannel.data;</div><div class='add'>+	iwe.u.freq.e = 0;</div><div class='add'>+	iwe.cmd = SIOCGIWFREQ;</div><div class='add'>+	current_ev = iwe_stream_add_event(info, current_ev, end_buf, &amp;iwe, IW_EV_FREQ_LEN);</div><div class='add'>+</div><div class='add'>+	/* Add quality statistics */</div><div class='add'>+	iwe.u.qual.level = bss-&gt;signal.data;</div><div class='add'>+	iwe.u.qual.noise = bss-&gt;noise.data;</div><div class='add'>+	/* do a simple SNR for quality */</div><div class='add'>+	iwe.u.qual.qual = qual_as_percent(bss-&gt;signal.data - bss-&gt;noise.data);</div><div class='add'>+	iwe.cmd = IWEVQUAL;</div><div class='add'>+	current_ev = iwe_stream_add_event(info, current_ev, end_buf, &amp;iwe, IW_EV_QUAL_LEN);</div><div class='add'>+</div><div class='add'>+	return current_ev;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int p80211wext_giwscan(netdevice_t *dev,</div><div class='add'>+			     struct iw_request_info *info,</div><div class='add'>+			     struct iw_point *srq, char *extra)</div><div class='add'>+{</div><div class='add'>+	wlandevice_t *wlandev = (wlandevice_t*)dev-&gt;priv;</div><div class='add'>+	p80211msg_dot11req_scan_results_t	msg;</div><div class='add'>+	int result = 0;</div><div class='add'>+	int err = 0;</div><div class='add'>+	int i = 0;</div><div class='add'>+	int scan_good = 0;</div><div class='add'>+	char *current_ev = extra;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	/* Since wireless tools doesn't really have a way of passing how</div><div class='add'>+	 * many scan results results there were back here, keep grabbing them</div><div class='add'>+	 * until we fail.</div><div class='add'>+	 */</div><div class='add'>+	do {</div><div class='add'>+		memset(&amp;msg, 0, sizeof(msg));</div><div class='add'>+		msg.msgcode = DIDmsg_dot11req_scan_results;</div><div class='add'>+		msg.bssindex.data = i;</div><div class='add'>+</div><div class='add'>+		result = p80211req_dorequest(wlandev, (UINT8*)&amp;msg);</div><div class='add'>+		if ((result != 0) ||</div><div class='add'>+		    (msg.resultcode.data != P80211ENUM_resultcode_success)) {</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		current_ev = wext_translate_bss(info, current_ev, extra + IW_SCAN_MAX_DATA, &amp;msg);</div><div class='add'>+		scan_good = 1;</div><div class='add'>+		i++;</div><div class='add'>+	} while (i &lt; IW_MAX_AP);</div><div class='add'>+</div><div class='add'>+	srq-&gt;length = (current_ev - extra);</div><div class='add'>+	srq-&gt;flags = 0;	/* todo */</div><div class='add'>+</div><div class='add'>+	if (result &amp;&amp; !scan_good)</div><div class='add'>+		err = prism2_result2err (msg.resultcode.data);</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*****************************************************/</div><div class='add'>+//extra wireless extensions stuff to support NetworkManager (I hope)</div><div class='add'>+</div><div class='add'>+#if WIRELESS_EXT &gt; 17</div><div class='add'>+/* SIOCSIWENCODEEXT */</div><div class='add'>+static int p80211wext_set_encodeext(struct net_device *dev,</div><div class='add'>+				struct iw_request_info *info,</div><div class='add'>+				union iwreq_data *wrqu, char *extra)</div><div class='add'>+{</div><div class='add'>+  wlandevice_t *wlandev = (wlandevice_t*)dev-&gt;priv;</div><div class='add'>+  struct iw_encode_ext *ext = (struct iw_encode_ext *)extra;</div><div class='add'>+	p80211msg_dot11req_mibset_t	msg;</div><div class='add'>+	p80211item_pstr32_t		*pstr;</div><div class='add'>+</div><div class='add'>+  int result = 0;</div><div class='add'>+  struct iw_point *encoding = &amp;wrqu-&gt;encoding;</div><div class='add'>+  int idx = encoding-&gt;flags &amp; IW_ENCODE_INDEX;</div><div class='add'>+</div><div class='add'>+  WLAN_LOG_DEBUG(1,"set_encode_ext flags[%d] alg[%d] keylen[%d]\n",ext-&gt;ext_flags,(int)ext-&gt;alg,(int)ext-&gt;key_len);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+  if ( ext-&gt;ext_flags &amp; IW_ENCODE_EXT_GROUP_KEY ) {</div><div class='add'>+    // set default key ? I'm not sure if this the the correct thing to do here</div><div class='add'>+</div><div class='add'>+    if ( idx ) {</div><div class='add'>+      if (idx &lt; 1 || idx &gt; NUM_WEPKEYS) {</div><div class='add'>+	return -EINVAL;</div><div class='add'>+      } else</div><div class='add'>+	idx--;</div><div class='add'>+    }</div><div class='add'>+    WLAN_LOG_DEBUG(1,"setting default key (%d)\n",idx);</div><div class='add'>+    result = p80211wext_dorequest(wlandev, DIDmib_dot11smt_dot11PrivacyTable_dot11WEPDefaultKeyID, idx);</div><div class='add'>+    if ( result )</div><div class='add'>+      return -EFAULT;</div><div class='add'>+  }</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+  if ( ext-&gt;ext_flags &amp; IW_ENCODE_EXT_SET_TX_KEY ) {</div><div class='add'>+    if ( ! ext-&gt;alg &amp; IW_ENCODE_ALG_WEP) {</div><div class='add'>+      WLAN_LOG_DEBUG(1,"asked to set a non wep key :(");</div><div class='add'>+      return -EINVAL;</div><div class='add'>+    }</div><div class='add'>+    if (idx) {</div><div class='add'>+      if (idx &lt;1 || idx &gt; NUM_WEPKEYS)</div><div class='add'>+	return -EINVAL;</div><div class='add'>+      else</div><div class='add'>+	idx--;</div><div class='add'>+    }</div><div class='add'>+    WLAN_LOG_DEBUG(1,"Set WEP key (%d)\n",idx);</div><div class='add'>+    wlandev-&gt;wep_keylens[idx] = ext-&gt;key_len;</div><div class='add'>+    memcpy(wlandev-&gt;wep_keys[idx], ext-&gt;key, ext-&gt;key_len);</div><div class='add'>+</div><div class='add'>+    memset( &amp;msg,0,sizeof(msg));</div><div class='add'>+    pstr = (p80211item_pstr32_t*)&amp;msg.mibattribute.data;</div><div class='add'>+    memcpy(pstr-&gt;data.data, ext-&gt;key,ext-&gt;key_len);</div><div class='add'>+    pstr-&gt;data.len = ext-&gt;key_len;</div><div class='add'>+    switch (idx) {</div><div class='add'>+    case 0:</div><div class='add'>+      pstr-&gt;did = DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey0;</div><div class='add'>+      break;</div><div class='add'>+    case 1:</div><div class='add'>+      pstr-&gt;did = DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey1;</div><div class='add'>+      break;</div><div class='add'>+    case 2:</div><div class='add'>+      pstr-&gt;did = DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey2;</div><div class='add'>+      break;</div><div class='add'>+    case 3:</div><div class='add'>+      pstr-&gt;did = DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey3;</div><div class='add'>+      break;</div><div class='add'>+    default:</div><div class='add'>+      break;</div><div class='add'>+    }</div><div class='add'>+    msg.msgcode = DIDmsg_dot11req_mibset;</div><div class='add'>+    result = p80211req_dorequest(wlandev,(UINT8*)&amp;msg);</div><div class='add'>+    WLAN_LOG_DEBUG(1,"result (%d)\n",result);</div><div class='add'>+  }</div><div class='add'>+  return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* SIOCGIWENCODEEXT */</div><div class='add'>+static int p80211wext_get_encodeext(struct net_device *dev,</div><div class='add'>+				struct iw_request_info *info,</div><div class='add'>+				union iwreq_data *wrqu, char *extra)</div><div class='add'>+</div><div class='add'>+{</div><div class='add'>+	wlandevice_t *wlandev = (wlandevice_t*)dev-&gt;priv;</div><div class='add'>+	struct iw_encode_ext *ext = (struct iw_encode_ext *)extra;</div><div class='add'>+</div><div class='add'>+	struct iw_point *encoding = &amp;wrqu-&gt;encoding;</div><div class='add'>+	int result = 0;</div><div class='add'>+	int max_len;</div><div class='add'>+	int idx;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	WLAN_LOG_DEBUG(1,"get_encode_ext flags[%d] alg[%d] keylen[%d]\n",ext-&gt;ext_flags,(int)ext-&gt;alg,(int)ext-&gt;key_len);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	max_len = encoding-&gt;length - sizeof(*ext);</div><div class='add'>+	if ( max_len &lt;= 0) {</div><div class='add'>+		WLAN_LOG_DEBUG(1,"get_encodeext max_len [%d] invalid\n",max_len);</div><div class='add'>+		result = -EINVAL;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+	idx = encoding-&gt;flags &amp; IW_ENCODE_INDEX;</div><div class='add'>+</div><div class='add'>+	WLAN_LOG_DEBUG(1,"get_encode_ext index [%d]\n",idx);</div><div class='add'>+</div><div class='add'>+	if (idx) {</div><div class='add'>+		if (idx &lt; 1 || idx &gt; NUM_WEPKEYS ) {</div><div class='add'>+			WLAN_LOG_DEBUG(1,"get_encode_ext invalid key index [%d]\n",idx);</div><div class='add'>+			result = -EINVAL;</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+		idx--;</div><div class='add'>+	} else {</div><div class='add'>+		/* default key ? not sure what to do */</div><div class='add'>+		/* will just use key[0] for now ! FIX ME */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	encoding-&gt;flags = idx + 1;</div><div class='add'>+	memset(ext,0,sizeof(*ext));</div><div class='add'>+</div><div class='add'>+	ext-&gt;alg = IW_ENCODE_ALG_WEP;</div><div class='add'>+	ext-&gt;key_len = wlandev-&gt;wep_keylens[idx];</div><div class='add'>+	memcpy( ext-&gt;key, wlandev-&gt;wep_keys[idx] , ext-&gt;key_len );</div><div class='add'>+</div><div class='add'>+	encoding-&gt;flags |= IW_ENCODE_ENABLED;</div><div class='add'>+exit:</div><div class='add'>+	DBFEXIT;</div><div class='add'>+</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* SIOCSIWAUTH */</div><div class='add'>+static int p80211_wext_set_iwauth (struct net_device *dev,</div><div class='add'>+				   struct iw_request_info *info,</div><div class='add'>+				   union iwreq_data *wrqu, char *extra)</div><div class='add'>+{</div><div class='add'>+  wlandevice_t *wlandev = (wlandevice_t*)dev-&gt;priv;</div><div class='add'>+  struct iw_param *param = &amp;wrqu-&gt;param;</div><div class='add'>+  int result =0;</div><div class='add'>+</div><div class='add'>+  WLAN_LOG_DEBUG(1,"set_iwauth flags[%d]\n",(int)param-&gt;flags &amp; IW_AUTH_INDEX );</div><div class='add'>+</div><div class='add'>+  switch (param-&gt;flags &amp; IW_AUTH_INDEX) {</div><div class='add'>+  case IW_AUTH_DROP_UNENCRYPTED:</div><div class='add'>+    WLAN_LOG_DEBUG(1,"drop_unencrypted %d\n",param-&gt;value);</div><div class='add'>+    if (param-&gt;value)</div><div class='add'>+      result = p80211wext_dorequest(wlandev, DIDmib_dot11smt_dot11PrivacyTable_dot11ExcludeUnencrypted, P80211ENUM_truth_true);</div><div class='add'>+    else</div><div class='add'>+      result = p80211wext_dorequest(wlandev, DIDmib_dot11smt_dot11PrivacyTable_dot11ExcludeUnencrypted, P80211ENUM_truth_false);</div><div class='add'>+    break;</div><div class='add'>+</div><div class='add'>+  case IW_AUTH_PRIVACY_INVOKED:</div><div class='add'>+    WLAN_LOG_DEBUG(1,"privacy invoked %d\n",param-&gt;value);</div><div class='add'>+    if ( param-&gt;value)</div><div class='add'>+      result = p80211wext_dorequest(wlandev, DIDmib_dot11smt_dot11PrivacyTable_dot11PrivacyInvoked, P80211ENUM_truth_true);</div><div class='add'>+    else</div><div class='add'>+      result = p80211wext_dorequest(wlandev, DIDmib_dot11smt_dot11PrivacyTable_dot11PrivacyInvoked, P80211ENUM_truth_false);</div><div class='add'>+</div><div class='add'>+    break;</div><div class='add'>+</div><div class='add'>+  case IW_AUTH_80211_AUTH_ALG:</div><div class='add'>+    if ( param-&gt;value &amp; IW_AUTH_ALG_OPEN_SYSTEM ) {</div><div class='add'>+      WLAN_LOG_DEBUG(1,"set open_system\n");</div><div class='add'>+      wlandev-&gt;hostwep &amp;= ~HOSTWEP_SHAREDKEY;</div><div class='add'>+    } else if ( param-&gt;value &amp; IW_AUTH_ALG_SHARED_KEY) {</div><div class='add'>+      WLAN_LOG_DEBUG(1,"set shared key\n");</div><div class='add'>+      wlandev-&gt;hostwep |= HOSTWEP_SHAREDKEY;</div><div class='add'>+    } else {</div><div class='add'>+      /* don't know what to do know :( */</div><div class='add'>+      WLAN_LOG_DEBUG(1,"unknown AUTH_ALG (%d)\n",param-&gt;value);</div><div class='add'>+      result = -EINVAL;</div><div class='add'>+    }</div><div class='add'>+    break;</div><div class='add'>+</div><div class='add'>+  default:</div><div class='add'>+    break;</div><div class='add'>+  }</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+  return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* SIOCSIWAUTH */</div><div class='add'>+static int p80211_wext_get_iwauth (struct net_device *dev,</div><div class='add'>+				   struct iw_request_info *info,</div><div class='add'>+				   union iwreq_data *wrqu, char *extra)</div><div class='add'>+{</div><div class='add'>+  wlandevice_t *wlandev = (wlandevice_t*)dev-&gt;priv;</div><div class='add'>+  struct iw_param *param = &amp;wrqu-&gt;param;</div><div class='add'>+  int result =0;</div><div class='add'>+</div><div class='add'>+  WLAN_LOG_DEBUG(1,"get_iwauth flags[%d]\n",(int)param-&gt;flags &amp; IW_AUTH_INDEX );</div><div class='add'>+</div><div class='add'>+  switch (param-&gt;flags &amp; IW_AUTH_INDEX) {</div><div class='add'>+  case IW_AUTH_DROP_UNENCRYPTED:</div><div class='add'>+    param-&gt;value = wlandev-&gt;hostwep &amp; HOSTWEP_EXCLUDEUNENCRYPTED?1:0;</div><div class='add'>+    break;</div><div class='add'>+</div><div class='add'>+  case IW_AUTH_PRIVACY_INVOKED:</div><div class='add'>+    param-&gt;value = wlandev-&gt;hostwep &amp; HOSTWEP_PRIVACYINVOKED?1:0;</div><div class='add'>+    break;</div><div class='add'>+</div><div class='add'>+  case IW_AUTH_80211_AUTH_ALG:</div><div class='add'>+    param-&gt;value = wlandev-&gt;hostwep &amp; HOSTWEP_SHAREDKEY?IW_AUTH_ALG_SHARED_KEY:IW_AUTH_ALG_OPEN_SYSTEM;</div><div class='add'>+    break;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+  default:</div><div class='add'>+    break;</div><div class='add'>+  }</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+  return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*****************************************************/</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+typedef int (*iw_handler)(netdevice_t *dev, struct iw_request_info *info,</div><div class='add'>+                          union iwreq_data *wrqu, char *extra);</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#if WIRELESS_EXT &gt; 12</div><div class='add'>+static iw_handler p80211wext_handlers[] =  {</div><div class='add'>+	(iw_handler) p80211wext_siwcommit,		/* SIOCSIWCOMMIT */</div><div class='add'>+	(iw_handler) p80211wext_giwname,		/* SIOCGIWNAME */</div><div class='add'>+	(iw_handler) NULL,				/* SIOCSIWNWID */</div><div class='add'>+	(iw_handler) NULL,				/* SIOCGIWNWID */</div><div class='add'>+	(iw_handler) p80211wext_siwfreq,  		/* SIOCSIWFREQ */</div><div class='add'>+	(iw_handler) p80211wext_giwfreq,  		/* SIOCGIWFREQ */</div><div class='add'>+	(iw_handler) p80211wext_siwmode,       		/* SIOCSIWMODE */</div><div class='add'>+	(iw_handler) p80211wext_giwmode,       		/* SIOCGIWMODE */</div><div class='add'>+	(iw_handler) NULL,                 		/* SIOCSIWSENS */</div><div class='add'>+	(iw_handler) NULL,                		/* SIOCGIWSENS */</div><div class='add'>+	(iw_handler) NULL, /* not used */     		/* SIOCSIWRANGE */</div><div class='add'>+	(iw_handler) p80211wext_giwrange,      		/* SIOCGIWRANGE */</div><div class='add'>+	(iw_handler) NULL, /* not used */     		/* SIOCSIWPRIV */</div><div class='add'>+	(iw_handler) NULL, /* kernel code */   		/* SIOCGIWPRIV */</div><div class='add'>+	(iw_handler) NULL, /* not used */     		/* SIOCSIWSTATS */</div><div class='add'>+	(iw_handler) NULL, /* kernel code */   		/* SIOCGIWSTATS */</div><div class='add'>+	(iw_handler) p80211wext_siwspy,			/* SIOCSIWSPY */</div><div class='add'>+	(iw_handler) p80211wext_giwspy,			/* SIOCGIWSPY */</div><div class='add'>+	(iw_handler) NULL,				/* -- hole -- */</div><div class='add'>+	(iw_handler) NULL,				/* -- hole -- */</div><div class='add'>+	(iw_handler) NULL,              		/* SIOCSIWAP */</div><div class='add'>+	(iw_handler) p80211wext_giwap,         		/* SIOCGIWAP */</div><div class='add'>+	(iw_handler) NULL,				/* -- hole -- */</div><div class='add'>+	(iw_handler) NULL,                  		/* SIOCGIWAPLIST */</div><div class='add'>+#if WIRELESS_EXT &gt; 13</div><div class='add'>+	(iw_handler) p80211wext_siwscan,			/* SIOCSIWSCAN */</div><div class='add'>+	(iw_handler) p80211wext_giwscan,			/* SIOCGIWSCAN */</div><div class='add'>+#else /* WIRELESS_EXT &gt; 13 */</div><div class='add'>+	(iw_handler) NULL,	/* null */		/* SIOCSIWSCAN */</div><div class='add'>+	(iw_handler) NULL,	/* null */		/* SIOCGIWSCAN */</div><div class='add'>+#endif /* WIRELESS_EXT &gt; 13 */</div><div class='add'>+	(iw_handler) p80211wext_siwessid,  		/* SIOCSIWESSID */</div><div class='add'>+	(iw_handler) p80211wext_giwessid,      		/* SIOCGIWESSID */</div><div class='add'>+	(iw_handler) NULL,                 		/* SIOCSIWNICKN */</div><div class='add'>+	(iw_handler) p80211wext_giwessid,      		/* SIOCGIWNICKN */</div><div class='add'>+	(iw_handler) NULL,				/* -- hole -- */</div><div class='add'>+	(iw_handler) NULL,				/* -- hole -- */</div><div class='add'>+	(iw_handler) NULL,                		/* SIOCSIWRATE */</div><div class='add'>+	(iw_handler) p80211wext_giwrate,      		/* SIOCGIWRATE */</div><div class='add'>+	(iw_handler) p80211wext_siwrts,  		/* SIOCSIWRTS */</div><div class='add'>+	(iw_handler) p80211wext_giwrts,        		/* SIOCGIWRTS */</div><div class='add'>+	(iw_handler) p80211wext_siwfrag,      		/* SIOCSIWFRAG */</div><div class='add'>+	(iw_handler) p80211wext_giwfrag,   		/* SIOCGIWFRAG */</div><div class='add'>+	(iw_handler) p80211wext_siwtxpow,           	/* SIOCSIWTXPOW */</div><div class='add'>+	(iw_handler) p80211wext_giwtxpow,  		/* SIOCGIWTXPOW */</div><div class='add'>+	(iw_handler) p80211wext_siwretry,     		/* SIOCSIWRETRY */</div><div class='add'>+	(iw_handler) p80211wext_giwretry,  		/* SIOCGIWRETRY */</div><div class='add'>+	(iw_handler) p80211wext_siwencode,     		/* SIOCSIWENCODE */</div><div class='add'>+	(iw_handler) p80211wext_giwencode,  		/* SIOCGIWENCODE */</div><div class='add'>+	(iw_handler) NULL,                 		/* SIOCSIWPOWER */</div><div class='add'>+	(iw_handler) NULL,                  		/* SIOCGIWPOWER */</div><div class='add'>+#if WIRELESS_EXT &gt; 17</div><div class='add'>+/* WPA operations */</div><div class='add'>+</div><div class='add'>+	(iw_handler) NULL,				/* -- hole -- */</div><div class='add'>+	(iw_handler) NULL,				/* -- hole -- */</div><div class='add'>+	(iw_handler) NULL, /* SIOCSIWGENIE	set generic IE */</div><div class='add'>+	(iw_handler) NULL, /* SIOCGIWGENIE	get generic IE */</div><div class='add'>+	(iw_handler) p80211_wext_set_iwauth, /* SIOCSIWAUTH	set authentication mode params */</div><div class='add'>+	(iw_handler) p80211_wext_get_iwauth, /* SIOCGIWAUTH	get authentication mode params */</div><div class='add'>+</div><div class='add'>+	(iw_handler) p80211wext_set_encodeext, /* SIOCSIWENCODEEXT  set encoding token &amp; mode */</div><div class='add'>+	(iw_handler) p80211wext_get_encodeext, /* SIOCGIWENCODEEXT  get encoding token &amp; mode */</div><div class='add'>+	(iw_handler) NULL, /* SIOCSIWPMKSA	PMKSA cache operation */</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct iw_handler_def p80211wext_handler_def = {</div><div class='add'>+	.num_standard = sizeof(p80211wext_handlers) / sizeof(iw_handler),</div><div class='add'>+	.num_private = 0,</div><div class='add'>+	.num_private_args = 0,</div><div class='add'>+        .standard = p80211wext_handlers,</div><div class='add'>+	.private = NULL,</div><div class='add'>+	.private_args = NULL,</div><div class='add'>+#if WIRELESS_EXT &gt; 16</div><div class='add'>+	.get_wireless_stats = p80211wext_get_wireless_stats</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* wireless extensions' ioctls */</div><div class='add'>+int p80211wext_support_ioctl(netdevice_t *dev, struct ifreq *ifr, int cmd)</div><div class='add'>+{</div><div class='add'>+	wlandevice_t *wlandev = (wlandevice_t*)dev-&gt;priv;</div><div class='add'>+</div><div class='add'>+#if WIRELESS_EXT &lt; 13</div><div class='add'>+	struct iwreq *iwr = (struct iwreq*)ifr;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	p80211item_uint32_t             mibitem;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	mibitem.status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+</div><div class='add'>+	if ( wlandev-&gt;msdstate != WLAN_MSD_RUNNING ) {</div><div class='add'>+		err = -ENODEV;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	WLAN_LOG_DEBUG(1, "Received wireless extension ioctl #%d.\n", cmd);</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+#if WIRELESS_EXT &lt; 13</div><div class='add'>+	case SIOCSIWNAME:  /* unused  */</div><div class='add'>+		err = (-EOPNOTSUPP);</div><div class='add'>+		break;</div><div class='add'>+	case SIOCGIWNAME: /* get name == wireless protocol */</div><div class='add'>+                err = p80211wext_giwname(dev, NULL, (char *) &amp;iwr-&gt;u, NULL);</div><div class='add'>+		break;</div><div class='add'>+	case SIOCSIWNWID:</div><div class='add'>+	case SIOCGIWNWID:</div><div class='add'>+		err = (-EOPNOTSUPP);</div><div class='add'>+		break;</div><div class='add'>+	case SIOCSIWFREQ: /* set channel */</div><div class='add'>+                err = p80211wext_siwfreq(dev, NULL, &amp;(iwr-&gt;u.freq), NULL);</div><div class='add'>+		break;</div><div class='add'>+	case SIOCGIWFREQ: /* get channel */</div><div class='add'>+                err = p80211wext_giwfreq(dev, NULL, &amp;(iwr-&gt;u.freq), NULL);</div><div class='add'>+		break;</div><div class='add'>+	case SIOCSIWRANGE:</div><div class='add'>+	case SIOCSIWPRIV:</div><div class='add'>+	case SIOCSIWAP: /* set access point MAC addresses (BSSID) */</div><div class='add'>+		err = (-EOPNOTSUPP);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case SIOCGIWAP:	/* get access point MAC addresses (BSSID) */</div><div class='add'>+                err = p80211wext_giwap(dev, NULL, &amp;(iwr-&gt;u.ap_addr), NULL);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+#if WIRELESS_EXT &gt; 8</div><div class='add'>+	case SIOCSIWMODE: /* set operation mode */</div><div class='add'>+	case SIOCSIWESSID: /* set SSID (network name) */</div><div class='add'>+	case SIOCSIWRATE: /* set default bit rate (bps) */</div><div class='add'>+		err = (-EOPNOTSUPP);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case SIOCGIWMODE: /* get operation mode */</div><div class='add'>+		err = p80211wext_giwmode(dev, NULL, &amp;iwr-&gt;u.mode, NULL);</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	case SIOCGIWNICKN: /* get node name/nickname */</div><div class='add'>+	case SIOCGIWESSID: /* get SSID */</div><div class='add'>+		if(iwr-&gt;u.essid.pointer) {</div><div class='add'>+                        char ssid[IW_ESSID_MAX_SIZE+1];</div><div class='add'>+			memset(ssid, 0, sizeof(ssid));</div><div class='add'>+</div><div class='add'>+			err = p80211wext_giwessid(dev, NULL, &amp;iwr-&gt;u.essid, ssid);</div><div class='add'>+			if(copy_to_user(iwr-&gt;u.essid.pointer, ssid, sizeof(ssid)))</div><div class='add'>+				err = (-EFAULT);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case SIOCGIWRATE:</div><div class='add'>+                err = p80211wext_giwrate(dev, NULL, &amp;iwr-&gt;u.bitrate, NULL);</div><div class='add'>+		break;</div><div class='add'>+	case SIOCGIWRTS:</div><div class='add'>+		err = p80211wext_giwrts(dev, NULL, &amp;iwr-&gt;u.rts, NULL);</div><div class='add'>+		break;</div><div class='add'>+	case SIOCGIWFRAG:</div><div class='add'>+		err = p80211wext_giwfrag(dev, NULL, &amp;iwr-&gt;u.rts, NULL);</div><div class='add'>+		break;</div><div class='add'>+	case SIOCGIWENCODE:</div><div class='add'>+		if (!capable(CAP_NET_ADMIN))</div><div class='add'>+			err = -EPERM;</div><div class='add'>+		else if (iwr-&gt;u.encoding.pointer) {</div><div class='add'>+			char keybuf[MAX_KEYLEN];</div><div class='add'>+			err = p80211wext_giwencode(dev, NULL,</div><div class='add'>+						     &amp;iwr-&gt;u.encoding, keybuf);</div><div class='add'>+			if (copy_to_user(iwr-&gt;u.encoding.pointer, keybuf,</div><div class='add'>+					 iwr-&gt;u.encoding.length))</div><div class='add'>+				err = -EFAULT;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case SIOCGIWAPLIST:</div><div class='add'>+	case SIOCSIWRTS:</div><div class='add'>+	case SIOCSIWFRAG:</div><div class='add'>+	case SIOCSIWSENS:</div><div class='add'>+	case SIOCGIWSENS:</div><div class='add'>+	case SIOCSIWNICKN: /* set node name/nickname */</div><div class='add'>+	case SIOCSIWENCODE: /* set encoding token &amp; mode */</div><div class='add'>+	case SIOCSIWSPY:</div><div class='add'>+	case SIOCGIWSPY:</div><div class='add'>+	case SIOCSIWPOWER:</div><div class='add'>+	case SIOCGIWPOWER:</div><div class='add'>+	case SIOCGIWPRIV:</div><div class='add'>+		err = (-EOPNOTSUPP);</div><div class='add'>+		break;</div><div class='add'>+	case SIOCGIWRANGE:</div><div class='add'>+		if(iwr-&gt;u.data.pointer != NULL) {</div><div class='add'>+                        struct iw_range range;</div><div class='add'>+                        err = p80211wext_giwrange(dev, NULL, &amp;iwr-&gt;u.data,</div><div class='add'>+						  (char *) &amp;range);</div><div class='add'>+			/* Push that up to the caller */</div><div class='add'>+			if (copy_to_user(iwr-&gt;u.data.pointer, &amp;range, sizeof(range)))</div><div class='add'>+				err = -EFAULT;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+#endif /* WIRELESS_EXT &gt; 8 */</div><div class='add'>+#if WIRELESS_EXT &gt; 9</div><div class='add'>+	case SIOCSIWTXPOW:</div><div class='add'>+		err = (-EOPNOTSUPP);</div><div class='add'>+		break;</div><div class='add'>+	case SIOCGIWTXPOW:</div><div class='add'>+		err = p80211wext_giwtxpow(dev, NULL, &amp;iwr-&gt;u.txpower, NULL);</div><div class='add'>+		break;</div><div class='add'>+#endif /* WIRELESS_EXT &gt; 9 */</div><div class='add'>+#if WIRELESS_EXT &gt; 10</div><div class='add'>+	case SIOCSIWRETRY:</div><div class='add'>+		err = (-EOPNOTSUPP);</div><div class='add'>+		break;</div><div class='add'>+	case SIOCGIWRETRY:</div><div class='add'>+		err = p80211wext_giwretry(dev, NULL, &amp;iwr-&gt;u.retry, NULL);</div><div class='add'>+		break;</div><div class='add'>+#endif /* WIRELESS_EXT &gt; 10 */</div><div class='add'>+</div><div class='add'>+#endif /* WIRELESS_EXT &lt;= 12 */</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		err = (-EOPNOTSUPP);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+ exit:</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return (err);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int p80211wext_event_associated(wlandevice_t *wlandev, int assoc)</div><div class='add'>+{</div><div class='add'>+        union iwreq_data data;</div><div class='add'>+</div><div class='add'>+        DBFENTER;</div><div class='add'>+</div><div class='add'>+#if WIRELESS_EXT &gt; 13</div><div class='add'>+        /* Send the association state first */</div><div class='add'>+        data.ap_addr.sa_family = ARPHRD_ETHER;</div><div class='add'>+        if (assoc) {</div><div class='add'>+                memcpy(data.ap_addr.sa_data, wlandev-&gt;bssid, WLAN_ADDR_LEN);</div><div class='add'>+        } else {</div><div class='add'>+                memset(data.ap_addr.sa_data, 0, WLAN_ADDR_LEN);</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+        if (wlan_wext_write)</div><div class='add'>+                wireless_send_event(wlandev-&gt;netdev, SIOCGIWAP, &amp;data, NULL);</div><div class='add'>+</div><div class='add'>+        if (!assoc) goto done;</div><div class='add'>+</div><div class='add'>+        // XXX send association data, like IEs, etc etc.</div><div class='add'>+#endif</div><div class='add'>+ done:</div><div class='add'>+        DBFEXIT;</div><div class='add'>+        return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#endif /* compatibility to wireless extensions */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='head'>diff --git a/drivers/staging/wlan-ng/prism2_cs.c b/drivers/staging/wlan-ng/prism2_cs.c<br/>new file mode 100644<br/>index 000000000000..63ce5659f21a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/wlan-ng/prism2_cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/wlan-ng/prism2_cs.c</a></div><div class='hunk'>@@ -0,0 +1,1487 @@</div><div class='add'>+#define WLAN_HOSTIF WLAN_PCMCIA</div><div class='add'>+#include "hfa384x.c"</div><div class='add'>+#include "prism2mgmt.c"</div><div class='add'>+#include "prism2mib.c"</div><div class='add'>+#include "prism2sta.c"</div><div class='add'>+</div><div class='add'>+#if (LINUX_VERSION_CODE &lt;= KERNEL_VERSION(2,4,21) )</div><div class='add'>+#if (WLAN_CPU_FAMILY == WLAN_Ix86)</div><div class='add'>+#ifndef CONFIG_ISA</div><div class='add'>+#warning "You may need to enable ISA support in your kernel."</div><div class='add'>+#endif</div><div class='add'>+#endif</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if (LINUX_VERSION_CODE &lt; KERNEL_VERSION(2,6,11) )</div><div class='add'>+static u_int	irq_mask = 0xdeb8;		/* Interrupt mask */</div><div class='add'>+static int	irq_list[4] = { -1 };		/* Interrupt list */</div><div class='add'>+#endif</div><div class='add'>+static u_int	prism2_ignorevcc=1;		/* Boolean, if set, we</div><div class='add'>+						 * ignore what the Vcc</div><div class='add'>+						 * is set to and what the CIS</div><div class='add'>+						 * says.</div><div class='add'>+						 */</div><div class='add'>+module_param( prism2_ignorevcc, int, 0644);</div><div class='add'>+</div><div class='add'>+#if (LINUX_VERSION_CODE &lt; KERNEL_VERSION(2,6,11) )</div><div class='add'>+#if (LINUX_VERSION_CODE &lt;= KERNEL_VERSION(2,6,9))</div><div class='add'>+static int numlist = 4;</div><div class='add'>+module_param_array(irq_list, int, numlist, 0444);</div><div class='add'>+#else</div><div class='add'>+module_param_array(irq_list, int, NULL, 0444);</div><div class='add'>+#endif</div><div class='add'>+module_param( irq_mask, int, 0644);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if LINUX_VERSION_CODE &gt; KERNEL_VERSION(2,6,15)</div><div class='add'>+static int prism2_cs_suspend(struct pcmcia_device *pdev);</div><div class='add'>+static int prism2_cs_resume(struct pcmcia_device *pdev);</div><div class='add'>+static void prism2_cs_remove(struct pcmcia_device *pdev);</div><div class='add'>+static int prism2_cs_probe(struct pcmcia_device *pdev);</div><div class='add'>+#else</div><div class='add'>+dev_link_t	*prism2sta_attach(void);</div><div class='add'>+static void	prism2sta_detach(dev_link_t *link);</div><div class='add'>+static void	prism2sta_config(dev_link_t *link);</div><div class='add'>+static void	prism2sta_release(u_long arg);</div><div class='add'>+static int 	prism2sta_event (event_t event, int priority, event_callback_args_t *args);</div><div class='add'>+</div><div class='add'>+static dev_link_t	*dev_list = NULL;	/* head of instance list */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if (LINUX_VERSION_CODE &lt; KERNEL_VERSION(2,5,68))</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* cs_error</div><div class='add'>+*</div><div class='add'>+* Utility function to print card services error messages.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	handle	client handle identifying this CS client</div><div class='add'>+*	func	CS function number that generated the error</div><div class='add'>+*	ret	CS function return code</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	nothing</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread</div><div class='add'>+*	interrupt</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+static void cs_error(client_handle_t handle, int func, int ret)</div><div class='add'>+{</div><div class='add'>+#if (defined(CS_RELEASE_CODE) &amp;&amp; (CS_RELEASE_CODE &lt; 0x2911))</div><div class='add'>+	CardServices(ReportError, dev_info, (void *)func, (void *)ret);</div><div class='add'>+#else</div><div class='add'>+	error_info_t err = { func, ret };</div><div class='add'>+	pcmcia_report_error(handle, &amp;err);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+#else // kernel_version</div><div class='add'>+</div><div class='add'>+#if LINUX_VERSION_CODE &gt; KERNEL_VERSION(2,6,12)</div><div class='add'>+static struct pcmcia_device_id prism2_cs_ids[] = {</div><div class='add'>+	PCMCIA_DEVICE_PROD_ID12("INTERSIL",  "HFA384x/IEEE", 0x74c5e40d, 0xdb472a18), // Intersil PRISM2 Reference Design 11Mb/s 802.11b WLAN Card</div><div class='add'>+	PCMCIA_DEVICE_MANF_CARD(0x0138, 0x0002), // Compaq WL100/200 11Mb/s 802.11b WLAN Card</div><div class='add'>+	PCMCIA_DEVICE_MANF_CARD(0x028a, 0x0002), // Compaq iPaq HNW-100 11Mb/s 802.11b WLAN Card</div><div class='add'>+	PCMCIA_DEVICE_MANF_CARD(0x0250, 0x0002), // Samsung SWL2000-N 11Mb/s 802.11b WLAN Card</div><div class='add'>+	PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0002), // Z-Com XI300 11Mb/s 802.11b WLAN Card</div><div class='add'>+	PCMCIA_DEVICE_PROD_ID12("ZoomAir 11Mbps High",  "Rate wireless Networking", 0x273fe3db, 0x32a1eaee), // ZoomAir 4100 11Mb/s 802.11b WLAN Card</div><div class='add'>+	PCMCIA_DEVICE_PROD_ID123("Instant Wireless ",  " Network PC CARD",  "Version 01.02", 0x11d901af, 0x6e9bd926, 0x4b74baa0), // Linksys WPC11 11Mbps 802.11b WLAN Card</div><div class='add'>+	PCMCIA_DEVICE_PROD_ID123("Addtron",  "AWP-100 Wireless PCMCIA",  "Version 01.02", 0xe6ec52ce, 0x8649af2, 0x4b74baa0), // Addtron AWP-100 11Mbps 802.11b WLAN Card</div><div class='add'>+	PCMCIA_DEVICE_PROD_ID123("D",  "Link DWL-650 11Mbps WLAN Card",  "Version 01.02", 0x71b18589, 0xb6f1b0ab, 0x4b74baa0), // D-Link DWL-650 11Mbps 802.11b WLAN Card</div><div class='add'>+	PCMCIA_DEVICE_PROD_ID123("SMC",  "SMC2632W",  "Version 01.02", 0xc4f8b18b, 0x474a1f2a, 0x4b74baa0), // SMC 2632W 11Mbps 802.11b WLAN Card</div><div class='add'>+	PCMCIA_DEVICE_PROD_ID1234("Intersil",  "PRISM 2_5 PCMCIA ADAPTER",  "ISL37300P",  "Eval-RevA", 0x4b801a17, 0x6345a0bf, 0xc9049a39, 0xc23adc0e), // BroMax Freeport 11Mbps 802.11b WLAN Card (Prism 2.5)</div><div class='add'>+	PCMCIA_DEVICE_PROD_ID123("U.S. Robotics",  "IEEE 802.11b PC-CARD",  "Version 01.02", 0xc7b8df9d, 0x1700d087, 0x4b74baa0), // U.S. Robotics IEEE 802.11b PC-CARD</div><div class='add'>+	PCMCIA_DEVICE_PROD_ID12("Digital Data Communications",  "WPC-0100", 0xfdd73470, 0xe0b6f146), // Level-One WPC-0100</div><div class='add'>+	PCMCIA_DEVICE_MANF_CARD(0x0274, 0x1612), // Bromax OEM 11Mbps 802.11b WLAN Card (Prism 2.5)</div><div class='add'>+	PCMCIA_DEVICE_MANF_CARD(0x0274, 0x1613), // Bromax OEM 11Mbps 802.11b WLAN Card (Prism 3)</div><div class='add'>+	PCMCIA_DEVICE_PROD_ID12("corega K.K.",  "Wireless LAN PCC-11", 0x5261440f, 0xa6405584), // corega K.K. Wireless LAN PCC-11</div><div class='add'>+	PCMCIA_DEVICE_PROD_ID12("corega K.K.",  "Wireless LAN PCCA-11", 0x5261440f, 0xdf6115f9), // corega K.K. Wireless LAN PCCA-11</div><div class='add'>+	PCMCIA_DEVICE_MANF_CARD(0xc001, 0x0008), // CONTEC FLEXSCAN/FX-DDS110-PCC</div><div class='add'>+	PCMCIA_DEVICE_PROD_ID12("PLANEX",  "GeoWave/GW-NS110", 0x209f40ab, 0x46263178), // PLANEX GeoWave/GW-NS110</div><div class='add'>+	PCMCIA_DEVICE_PROD_ID123("OEM",  "PRISM2 IEEE 802.11 PC-Card",  "Version 01.02", 0xfea54c90, 0x48f2bdd6, 0x4b74baa0), // Ambicom WL1100 11Mbps 802.11b WLAN Card</div><div class='add'>+	PCMCIA_DEVICE_PROD_ID123("LeArtery",  "SYNCBYAIR 11Mbps Wireless LAN PC Card",  "Version 01.02", 0x7e3b326a, 0x49893e92, 0x4b74baa0), // LeArtery SYNCBYAIR 11Mbps 802.11b WLAN Card</div><div class='add'>+PCMCIA_DEVICE_MANF_CARD(0x01ff, 0x0008), // Intermec MobileLAN 11Mbps 802.11b WLAN Card</div><div class='add'>+	PCMCIA_DEVICE_PROD_ID123("NETGEAR MA401 Wireless PC",  "Card",  "Version 01.00", 0xa37434e9, 0x9762e8f1, 0xa57adb8c), // NETGEAR MA401 11Mbps 802.11 WLAN Card</div><div class='add'>+	PCMCIA_DEVICE_PROD_ID1234("Intersil",  "PRISM Freedom PCMCIA Adapter",  "ISL37100P",  "Eval-RevA", 0x4b801a17, 0xf222ec2d, 0x630d52b2, 0xc23adc0e), // Intersil PRISM Freedom 11mbps 802.11 WLAN Card</div><div class='add'>+	PCMCIA_DEVICE_PROD_ID123("OTC",  "Wireless AirEZY 2411-PCC WLAN Card",  "Version 01.02", 0x4ac44287, 0x235a6bed, 0x4b74baa0), // OTC Wireless AirEZY 2411-PCC 11Mbps 802.11 WLAN Card</div><div class='add'>+	PCMCIA_DEVICE_PROD_ID1234("802.11",  "11Mbps Wireless LAN Card",  "v08C1",  ""   , 0xb67a610e, 0x655aa7b7, 0x264b451a, 0x0), // Dynalink L11HDT 11Mbps 802.11 WLAN Card</div><div class='add'>+	PCMCIA_DEVICE_MANF_CARD(0xc250, 0x0002), // Dynalink L11HDT 11Mbps 802.11 WLAN Card</div><div class='add'>+	PCMCIA_DEVICE_PROD_ID12("PROXIM",  "RangeLAN-DS/LAN PC CARD", 0xc6536a5e, 0x3f35797d), // PROXIM RangeLAN-DS/LAN PC CARD</div><div class='add'>+	PCMCIA_DEVICE_PROD_ID1234("ACTIONTEC",  "PRISM Wireless LAN PC Card",  "0381",  "RevA", 0x393089da, 0xa71e69d5, 0x90471fa9, 0x57a66194), // ACTIONTEC PRISM Wireless LAN PC Card</div><div class='add'>+	PCMCIA_DEVICE_MANF_CARD(0x1668, 0x0101), // ACTIONTEC PRISM Wireless LAN PC Card</div><div class='add'>+	PCMCIA_DEVICE_PROD_ID12("3Com",  "3CRWE737A AirConnect Wireless LAN PC Card", 0x41240e5b, 0x56010af3), // 3Com AirConnect 3CRWE737A</div><div class='add'>+	PCMCIA_DEVICE_PROD_ID12("3Com",  "3CRWE777A AirConnect Wireless LAN PCI Card"  , 0x41240e5b, 0xafc7c33e), // 3Com AirConnect 3CRWE777A</div><div class='add'>+	PCMCIA_DEVICE_PROD_ID12("ASUS",  "802_11b_PC_CARD_25", 0x78fc06ee, 0xdb9aa842), // ASUS WL-100 802.11b WLAN  PC Card</div><div class='add'>+	PCMCIA_DEVICE_PROD_ID12("ASUS",  "802_11B_CF_CARD_25", 0x78fc06ee, 0x45a50c1e), // ASUS WL-110 802.11b WLAN CF Card</div><div class='add'>+	PCMCIA_DEVICE_PROD_ID12("BUFFALO",  "WLI-CF-S11G", 0x2decece3, 0x82067c18), // BUFFALO WLI-CF-S11G 802.11b WLAN Card</div><div class='add'>+	PCMCIA_DEVICE_PROD_ID1234("The Linksys Group, Inc.", "Wireless Network CF Card", "ISL37300P", "RevA", 0xa5f472c2, 0x9c05598d, 0xc9049a39, 0x57a66194), // Linksys WCF11 11Mbps 802.11b WLAN Card (Prism 2.5)</div><div class='add'>+	PCMCIA_DEVICE_PROD_ID1234("Linksys",  "Wireless CompactFlash Card",  "",  "", 0x733cc81, 0xc52f395, 0x0, 0x0), // Linksys WCF12 11Mbps 802.11b WLAN Card (Prism 3)</div><div class='add'>+	PCMCIA_DEVICE_MANF_CARD(0x028a, 0x0673), // Linksys WCF12 11Mbps 802.11b WLAN Card (Prism 3)</div><div class='add'>+	PCMCIA_DEVICE_PROD_ID1234("NETGEAR MA401RA Wireless PC",  "Card",  "ISL37300P",  "Eval-RevA", 0x306467f, 0x9762e8f1, 0xc9049a39, 0xc23adc0e), // NETGEAR MA401RA 11Mbps 802.11 WLAN Card</div><div class='add'>+	PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0005), // D-Link DCF-660W  11Mbps 802.11b WLAN Card</div><div class='add'>+	PCMCIA_DEVICE_MANF_CARD(0x02d2, 0x0001), // Microsoft Wireless Notebook Adapter MN-520</div><div class='add'>+	PCMCIA_DEVICE_MANF_CARD(0x0089, 0x0002), // AnyPoint(TM) Wireless II PC Card</div><div class='add'>+	PCMCIA_DEVICE_PROD_ID1234("D",  "Link DRC-650 11Mbps WLAN Card",  "Version 01.02",  "" , 0x71b18589, 0xf144e3ac, 0x4b74baa0, 0x0), // D-Link DRC-650 802.11b WLAN Card</div><div class='add'>+	PCMCIA_DEVICE_MANF_CARD(0x9005, 0x0021), // Adaptec AWN-8030</div><div class='add'>+	PCMCIA_DEVICE_MANF_CARD(0x000b, 0x7110), // D-Link DWL-650 rev P 802.11b WLAN card</div><div class='add'>+	// PCMCIA_DEVICE_PROD_ID1234("D-Link",  "DWL-650 Wireless PC Card RevP",  "ISL37101P-10",  "A3", 0x1a424a1c, 0x6ea57632, 0xdd97a26b, 0x56b21f52), // D-Link DWL-650 rev P 802.11b WLAN card</div><div class='add'>+	PCMCIA_DEVICE_PROD_ID123("INTERSIL",   "I-GATE 11M PC Card / PC Card plus",  "Version 01.02", 0x74c5e40d, 0x8304ff77, 0x4b74baa0), // I-Gate 11M PC Card</div><div class='add'>+	PCMCIA_DEVICE_PROD_ID1234("BENQ",  "AWL100 PCMCIA ADAPTER",  "ISL37300P",  "Eval-RevA", 0x35dadc74, 0x1f7fedb, 0xc9049a39, 0xc23adc0e), // benQ AWL100 802.11b WLAN Card</div><div class='add'>+	PCMCIA_DEVICE_MANF_CARD(0x000b, 0x7300), // benQ AWL100 802.11b WLAN Card</div><div class='add'>+	// PCMCIA_DEVICE_PROD_ID1("INTERSIL", 0x74c5e40d), // Intersil Prism 2 card</div><div class='add'>+	// PCMCIA_DEVICE_MANF_CARD(0x0156, 0x0002), // Intersil Prism 2 card</div><div class='add'>+</div><div class='add'>+	PCMCIA_DEVICE_NULL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_DEVICE_TABLE(pcmcia, prism2_cs_ids);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static struct pcmcia_driver prism2_cs_driver = {</div><div class='add'>+	.drv = {</div><div class='add'>+		.name = "prism2_cs",</div><div class='add'>+	},</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+#if LINUX_VERSION_CODE &gt; KERNEL_VERSION(2,6,15)</div><div class='add'>+	.suspend = prism2_cs_suspend,</div><div class='add'>+	.resume = prism2_cs_resume,</div><div class='add'>+	.remove = prism2_cs_remove,</div><div class='add'>+	.probe = prism2_cs_probe,</div><div class='add'>+	.id_table = prism2_cs_ids,</div><div class='add'>+#else</div><div class='add'>+	.attach = prism2sta_attach,</div><div class='add'>+	.detach = prism2sta_detach,</div><div class='add'>+#if LINUX_VERSION_CODE &gt; KERNEL_VERSION(2,6,12)</div><div class='add'>+	.id_table = prism2_cs_ids,</div><div class='add'>+	.event =  prism2sta_event,</div><div class='add'>+#endif // &gt; 2.6.12</div><div class='add'>+#endif // &lt;= 2.6.15</div><div class='add'>+};</div><div class='add'>+#endif /* kernel_version */</div><div class='add'>+</div><div class='add'>+#if LINUX_VERSION_CODE &gt; KERNEL_VERSION(2,6,15)</div><div class='add'>+#define CS_CHECK(fn, ret) \</div><div class='add'>+do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)</div><div class='add'>+</div><div class='add'>+#define CFG_CHECK(fn, retf) \</div><div class='add'>+do { int ret = (retf); \</div><div class='add'>+if (ret != 0) { \</div><div class='add'>+        WLAN_LOG_DEBUG(1, "CardServices(" #fn ") returned %d\n", ret); \</div><div class='add'>+        cs_error(pdev, fn, ret); \</div><div class='add'>+        goto next_entry; \</div><div class='add'>+} \</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+static void prism2_cs_remove(struct pcmcia_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct wlandevice  *wlandev;</div><div class='add'>+</div><div class='add'>+#if LINUX_VERSION_CODE &lt; KERNEL_VERSION(2,6,17)</div><div class='add'>+        dev_link_t *link = dev_to_instance(pdev);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+#if LINUX_VERSION_CODE &gt; KERNEL_VERSION(2,6,16)</div><div class='add'>+	wlandev = pdev-&gt;priv;</div><div class='add'>+#else</div><div class='add'>+	wlandev = link-&gt;priv;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	if (wlandev) {</div><div class='add'>+		p80211netdev_hwremoved(wlandev);</div><div class='add'>+		unregister_wlandev(wlandev);</div><div class='add'>+		wlan_unsetup(wlandev);</div><div class='add'>+		if (wlandev-&gt;priv) {</div><div class='add'>+			hfa384x_t *hw = wlandev-&gt;priv;</div><div class='add'>+			wlandev-&gt;priv = NULL;</div><div class='add'>+			if (hw) {</div><div class='add'>+				hfa384x_destroy(hw);</div><div class='add'>+				kfree(hw);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		kfree(wlandev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#if LINUX_VERSION_CODE &gt; KERNEL_VERSION(2,6,16)</div><div class='add'>+	pdev-&gt;priv = NULL;</div><div class='add'>+        pcmcia_disable_device(pdev);</div><div class='add'>+#else</div><div class='add'>+        if (link-&gt;state &amp; DEV_CONFIG) {</div><div class='add'>+	        if (link-&gt;win)</div><div class='add'>+			pcmcia_release_window(link-&gt;win);</div><div class='add'>+		pcmcia_release_configuration(link-&gt;handle);</div><div class='add'>+		if (link-&gt;io.NumPorts1)</div><div class='add'>+			pcmcia_release_io(link-&gt;handle, &amp;link-&gt;io);</div><div class='add'>+		if (link-&gt;irq.AssignedIRQ)</div><div class='add'>+			pcmcia_release_irq(link-&gt;handle, &amp;link-&gt;irq);</div><div class='add'>+</div><div class='add'>+		link-&gt;state &amp;= ~DEV_CONFIG;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	link-&gt;priv = NULL;</div><div class='add'>+	kfree(link);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int prism2_cs_suspend(struct pcmcia_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct wlandevice  *wlandev;</div><div class='add'>+</div><div class='add'>+#if LINUX_VERSION_CODE &lt; KERNEL_VERSION(2,6,17)</div><div class='add'>+        dev_link_t *link = dev_to_instance(pdev);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+#if LINUX_VERSION_CODE &gt; KERNEL_VERSION(2,6,16)</div><div class='add'>+	wlandev = pdev-&gt;priv;</div><div class='add'>+	prism2sta_ifstate(wlandev, P80211ENUM_ifstate_disable);</div><div class='add'>+#else</div><div class='add'>+	wlandev = link-&gt;priv;</div><div class='add'>+</div><div class='add'>+        link-&gt;state |= DEV_SUSPEND;</div><div class='add'>+        if (link-&gt;state &amp; DEV_CONFIG) {</div><div class='add'>+		prism2sta_ifstate(wlandev, P80211ENUM_ifstate_disable);</div><div class='add'>+		pcmcia_release_configuration(link-&gt;handle);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int prism2_cs_resume(struct pcmcia_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct wlandevice  *wlandev;</div><div class='add'>+</div><div class='add'>+#if LINUX_VERSION_CODE &lt; KERNEL_VERSION(2,6,17)</div><div class='add'>+        dev_link_t *link = dev_to_instance(pdev);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+#if LINUX_VERSION_CODE &gt; KERNEL_VERSION(2,6,16)</div><div class='add'>+	wlandev = pdev-&gt;priv;</div><div class='add'>+	// XXX do something here?</div><div class='add'>+#else</div><div class='add'>+	wlandev = link-&gt;priv;</div><div class='add'>+        link-&gt;state &amp;= ~DEV_SUSPEND;</div><div class='add'>+        if (link-&gt;state &amp; DEV_CONFIG) {</div><div class='add'>+                pcmcia_request_configuration(link-&gt;handle, &amp;link-&gt;conf);</div><div class='add'>+		// XXX do something here?</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int prism2_cs_probe(struct pcmcia_device *pdev)</div><div class='add'>+{</div><div class='add'>+	int rval = 0;</div><div class='add'>+	struct wlandevice *wlandev = NULL;</div><div class='add'>+	hfa384x_t *hw = NULL;</div><div class='add'>+</div><div class='add'>+        config_info_t socketconf;</div><div class='add'>+        cisparse_t *parse = NULL;</div><div class='add'>+	tuple_t tuple;</div><div class='add'>+	uint8_t	buf[64];</div><div class='add'>+        int last_fn, last_ret;</div><div class='add'>+        cistpl_cftable_entry_t dflt = { 0 };</div><div class='add'>+</div><div class='add'>+#if LINUX_VERSION_CODE &lt; KERNEL_VERSION(2,6,17)</div><div class='add'>+	dev_link_t *link;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+#if LINUX_VERSION_CODE &gt; KERNEL_VERSION(2,6,16)</div><div class='add'>+	/* Set up interrupt type */</div><div class='add'>+        pdev-&gt;conf.IntType = INT_MEMORY_AND_IO;</div><div class='add'>+#else</div><div class='add'>+        link = kmalloc(sizeof(dev_link_t), GFP_KERNEL);</div><div class='add'>+        if (link == NULL)</div><div class='add'>+                return -ENOMEM;</div><div class='add'>+        memset(link, 0, sizeof(dev_link_t));</div><div class='add'>+</div><div class='add'>+        link-&gt;conf.Vcc = 33;</div><div class='add'>+        link-&gt;conf.IntType = INT_MEMORY_AND_IO;</div><div class='add'>+</div><div class='add'>+        link-&gt;handle = pdev;</div><div class='add'>+        pdev-&gt;instance = link;</div><div class='add'>+        link-&gt;state |= DEV_PRESENT | DEV_CONFIG_PENDING;</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	// VCC crap?</div><div class='add'>+        parse = kmalloc(sizeof(cisparse_t), GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	wlandev = create_wlan();</div><div class='add'>+	if (!wlandev || !parse) {</div><div class='add'>+		WLAN_LOG_ERROR("%s: Memory allocation failure.\n", dev_info);</div><div class='add'>+		rval = -EIO;</div><div class='add'>+		goto failed;</div><div class='add'>+	}</div><div class='add'>+	hw = wlandev-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if ( wlan_setup(wlandev) != 0 ) {</div><div class='add'>+		WLAN_LOG_ERROR("%s: wlan_setup() failed.\n", dev_info);</div><div class='add'>+		rval = -EIO;</div><div class='add'>+		goto failed;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Initialize the hw struct for now */</div><div class='add'>+	hfa384x_create(hw, 0, 0, NULL);</div><div class='add'>+	hw-&gt;wlandev = wlandev;</div><div class='add'>+</div><div class='add'>+#if LINUX_VERSION_CODE &gt; KERNEL_VERSION(2,6,16)</div><div class='add'>+	hw-&gt;pdev = pdev;</div><div class='add'>+	pdev-&gt;priv = wlandev;</div><div class='add'>+#else</div><div class='add'>+	hw-&gt;link = link;</div><div class='add'>+	link-&gt;priv = wlandev;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+        tuple.DesiredTuple = CISTPL_CONFIG;</div><div class='add'>+        tuple.Attributes = 0;</div><div class='add'>+        tuple.TupleData = buf;</div><div class='add'>+        tuple.TupleDataMax = sizeof(buf);</div><div class='add'>+        tuple.TupleOffset = 0;</div><div class='add'>+        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(pdev, &amp;tuple));</div><div class='add'>+        CS_CHECK(GetTupleData, pcmcia_get_tuple_data(pdev, &amp;tuple));</div><div class='add'>+        CS_CHECK(ParseTuple, pcmcia_parse_tuple(pdev, &amp;tuple, parse));</div><div class='add'>+#if LINUX_VERSION_CODE &gt; KERNEL_VERSION(2,6,16)</div><div class='add'>+        pdev-&gt;conf.ConfigBase = parse-&gt;config.base;</div><div class='add'>+        pdev-&gt;conf.Present = parse-&gt;config.rmask[0];</div><div class='add'>+#else</div><div class='add'>+        link-&gt;conf.ConfigBase = parse-&gt;config.base;</div><div class='add'>+        link-&gt;conf.Present = parse-&gt;config.rmask[0];</div><div class='add'>+</div><div class='add'>+	link-&gt;conf.Vcc = socketconf.Vcc;</div><div class='add'>+#endif</div><div class='add'>+        CS_CHECK(GetConfigurationInfo,</div><div class='add'>+                 pcmcia_get_configuration_info(pdev, &amp;socketconf));</div><div class='add'>+</div><div class='add'>+	tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;</div><div class='add'>+	CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(pdev, &amp;tuple));</div><div class='add'>+        for (;;) {</div><div class='add'>+		cistpl_cftable_entry_t *cfg = &amp;(parse-&gt;cftable_entry);</div><div class='add'>+                CFG_CHECK(GetTupleData,</div><div class='add'>+                           pcmcia_get_tuple_data(pdev, &amp;tuple));</div><div class='add'>+                CFG_CHECK(ParseTuple,</div><div class='add'>+                           pcmcia_parse_tuple(pdev, &amp;tuple, parse));</div><div class='add'>+</div><div class='add'>+                if (cfg-&gt;flags &amp; CISTPL_CFTABLE_DEFAULT)</div><div class='add'>+                        dflt = *cfg;</div><div class='add'>+                if (cfg-&gt;index == 0)</div><div class='add'>+                        goto next_entry;</div><div class='add'>+#if LINUX_VERSION_CODE &gt; KERNEL_VERSION(2,6,16)</div><div class='add'>+                pdev-&gt;conf.ConfigIndex = cfg-&gt;index;</div><div class='add'>+#else</div><div class='add'>+                link-&gt;conf.ConfigIndex = cfg-&gt;index;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+                /* Does this card need audio output? */</div><div class='add'>+                if (cfg-&gt;flags &amp; CISTPL_CFTABLE_AUDIO) {</div><div class='add'>+#if LINUX_VERSION_CODE &gt; KERNEL_VERSION(2,6,16)</div><div class='add'>+                        pdev-&gt;conf.Attributes |= CONF_ENABLE_SPKR;</div><div class='add'>+                        pdev-&gt;conf.Status = CCSR_AUDIO_ENA;</div><div class='add'>+#else</div><div class='add'>+                        link-&gt;conf.Attributes |= CONF_ENABLE_SPKR;</div><div class='add'>+                        link-&gt;conf.Status = CCSR_AUDIO_ENA;</div><div class='add'>+#endif</div><div class='add'>+                }</div><div class='add'>+</div><div class='add'>+                /* Use power settings for Vcc and Vpp if present */</div><div class='add'>+                /*  Note that the CIS values need to be rescaled */</div><div class='add'>+                if (cfg-&gt;vcc.present &amp; (1 &lt;&lt; CISTPL_POWER_VNOM)) {</div><div class='add'>+                        if (socketconf.Vcc != cfg-&gt;vcc.param[CISTPL_POWER_VNOM] /</div><div class='add'>+                            10000 &amp;&amp; !prism2_ignorevcc) {</div><div class='add'>+                                WLAN_LOG_DEBUG(1, "  Vcc mismatch - skipping"</div><div class='add'>+                                       " this entry\n");</div><div class='add'>+                                goto next_entry;</div><div class='add'>+                        }</div><div class='add'>+                } else if (dflt.vcc.present &amp; (1 &lt;&lt; CISTPL_POWER_VNOM)) {</div><div class='add'>+                        if (socketconf.Vcc != dflt.vcc.param[CISTPL_POWER_VNOM] /</div><div class='add'>+                            10000 &amp;&amp; !prism2_ignorevcc) {</div><div class='add'>+                                WLAN_LOG_DEBUG(1, "  Vcc (default) mismatch "</div><div class='add'>+                                       "- skipping this entry\n");</div><div class='add'>+                                goto next_entry;</div><div class='add'>+                        }</div><div class='add'>+                }</div><div class='add'>+</div><div class='add'>+                if (cfg-&gt;vpp1.present &amp; (1 &lt;&lt; CISTPL_POWER_VNOM)) {</div><div class='add'>+#if LINUX_VERSION_CODE &gt; KERNEL_VERSION(2,6,16)</div><div class='add'>+                        pdev-&gt;conf.Vpp =</div><div class='add'>+                                cfg-&gt;vpp1.param[CISTPL_POWER_VNOM] / 10000;</div><div class='add'>+#else</div><div class='add'>+                        link-&gt;conf.Vpp1 = link-&gt;conf.Vpp2 =</div><div class='add'>+                                cfg-&gt;vpp1.param[CISTPL_POWER_VNOM] / 10000;</div><div class='add'>+#endif</div><div class='add'>+                } else if (dflt.vpp1.present &amp; (1 &lt;&lt; CISTPL_POWER_VNOM)) {</div><div class='add'>+#if LINUX_VERSION_CODE &gt; KERNEL_VERSION(2,6,16)</div><div class='add'>+                        pdev-&gt;conf.Vpp =</div><div class='add'>+                                dflt.vpp1.param[CISTPL_POWER_VNOM] / 10000;</div><div class='add'>+#else</div><div class='add'>+                        link-&gt;conf.Vpp1 = link-&gt;conf.Vpp2 =</div><div class='add'>+                                dflt.vpp1.param[CISTPL_POWER_VNOM] / 10000;</div><div class='add'>+#endif</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Do we need to allocate an interrupt? */</div><div class='add'>+		/* HACK: due to a bad CIS....we ALWAYS need an interrupt */</div><div class='add'>+		/* if (cfg-&gt;irq.IRQInfo1 || dflt.irq.IRQInfo1) */</div><div class='add'>+#if LINUX_VERSION_CODE &gt; KERNEL_VERSION(2,6,16)</div><div class='add'>+		pdev-&gt;conf.Attributes |= CONF_ENABLE_IRQ;</div><div class='add'>+#else</div><div class='add'>+		link-&gt;conf.Attributes |= CONF_ENABLE_IRQ;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+		/* IO window settings */</div><div class='add'>+#if LINUX_VERSION_CODE &gt; KERNEL_VERSION(2,6,16)</div><div class='add'>+		pdev-&gt;io.NumPorts1 = pdev-&gt;io.NumPorts2 = 0;</div><div class='add'>+		if ((cfg-&gt;io.nwin &gt; 0) || (dflt.io.nwin &gt; 0)) {</div><div class='add'>+			cistpl_io_t *io = (cfg-&gt;io.nwin) ? &amp;cfg-&gt;io : &amp;dflt.io;</div><div class='add'>+			pdev-&gt;io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;</div><div class='add'>+			if (!(io-&gt;flags &amp; CISTPL_IO_8BIT))</div><div class='add'>+				pdev-&gt;io.Attributes1 = IO_DATA_PATH_WIDTH_16;</div><div class='add'>+			if (!(io-&gt;flags &amp; CISTPL_IO_16BIT))</div><div class='add'>+				pdev-&gt;io.Attributes1 = IO_DATA_PATH_WIDTH_8;</div><div class='add'>+			pdev-&gt;io.BasePort1 = io-&gt;win[0].base;</div><div class='add'>+			if  ( pdev-&gt;io.BasePort1 != 0 ) {</div><div class='add'>+				WLAN_LOG_WARNING(</div><div class='add'>+				"Brain damaged CIS: hard coded iobase="</div><div class='add'>+				"0x%x, try letting pcmcia_cs decide...\n",</div><div class='add'>+				pdev-&gt;io.BasePort1 );</div><div class='add'>+				pdev-&gt;io.BasePort1 = 0;</div><div class='add'>+			}</div><div class='add'>+			pdev-&gt;io.NumPorts1 = io-&gt;win[0].len;</div><div class='add'>+			if (io-&gt;nwin &gt; 1) {</div><div class='add'>+				pdev-&gt;io.Attributes2 = pdev-&gt;io.Attributes1;</div><div class='add'>+				pdev-&gt;io.BasePort2 = io-&gt;win[1].base;</div><div class='add'>+				pdev-&gt;io.NumPorts2 = io-&gt;win[1].len;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		/* This reserves IO space but doesn't actually enable it */</div><div class='add'>+		CFG_CHECK(RequestIO, pcmcia_request_io(pdev, &amp;pdev-&gt;io));</div><div class='add'>+#else</div><div class='add'>+		link-&gt;io.NumPorts1 = link-&gt;io.NumPorts2 = 0;</div><div class='add'>+		if ((cfg-&gt;io.nwin &gt; 0) || (dflt.io.nwin &gt; 0)) {</div><div class='add'>+			cistpl_io_t *io = (cfg-&gt;io.nwin) ? &amp;cfg-&gt;io : &amp;dflt.io;</div><div class='add'>+			link-&gt;io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;</div><div class='add'>+			if (!(io-&gt;flags &amp; CISTPL_IO_8BIT))</div><div class='add'>+				link-&gt;io.Attributes1 = IO_DATA_PATH_WIDTH_16;</div><div class='add'>+			if (!(io-&gt;flags &amp; CISTPL_IO_16BIT))</div><div class='add'>+				link-&gt;io.Attributes1 = IO_DATA_PATH_WIDTH_8;</div><div class='add'>+			link-&gt;io.BasePort1 = io-&gt;win[0].base;</div><div class='add'>+			if  ( link-&gt;io.BasePort1 != 0 ) {</div><div class='add'>+				WLAN_LOG_WARNING(</div><div class='add'>+				"Brain damaged CIS: hard coded iobase="</div><div class='add'>+				"0x%x, try letting pcmcia_cs decide...\n",</div><div class='add'>+				link-&gt;io.BasePort1 );</div><div class='add'>+				link-&gt;io.BasePort1 = 0;</div><div class='add'>+			}</div><div class='add'>+			link-&gt;io.NumPorts1 = io-&gt;win[0].len;</div><div class='add'>+			if (io-&gt;nwin &gt; 1) {</div><div class='add'>+				link-&gt;io.Attributes2 = link-&gt;io.Attributes1;</div><div class='add'>+				link-&gt;io.BasePort2 = io-&gt;win[1].base;</div><div class='add'>+				link-&gt;io.NumPorts2 = io-&gt;win[1].len;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		/* This reserves IO space but doesn't actually enable it */</div><div class='add'>+		CFG_CHECK(RequestIO, pcmcia_request_io(pdev, &amp;link-&gt;io));</div><div class='add'>+#endif</div><div class='add'>+		/* If we got this far, we're cool! */</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	next_entry:</div><div class='add'>+		if (cfg-&gt;flags &amp; CISTPL_CFTABLE_DEFAULT)</div><div class='add'>+			dflt = *cfg;</div><div class='add'>+		CS_CHECK(GetNextTuple, pcmcia_get_next_tuple(pdev, &amp;tuple));</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Let pcmcia know the device name */</div><div class='add'>+#if LINUX_VERSION_CODE &gt; KERNEL_VERSION(2,6,16)</div><div class='add'>+	pdev-&gt;dev_node = &amp;hw-&gt;node;</div><div class='add'>+#else</div><div class='add'>+	link-&gt;dev = &amp;hw-&gt;node;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* Register the network device and get assigned a name */</div><div class='add'>+	SET_MODULE_OWNER(wlandev-&gt;netdev);</div><div class='add'>+	SET_NETDEV_DEV(wlandev-&gt;netdev,  &amp;handle_to_dev(pdev));</div><div class='add'>+	if (register_wlandev(wlandev) != 0) {</div><div class='add'>+		WLAN_LOG_NOTICE("prism2sta_cs: register_wlandev() failed.\n");</div><div class='add'>+		goto failed;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	strcpy(hw-&gt;node.dev_name, wlandev-&gt;name);</div><div class='add'>+</div><div class='add'>+	/* Allocate an interrupt line.  Note that this does not assign a */</div><div class='add'>+	/* handler to the interrupt, unless the 'Handler' member of the */</div><div class='add'>+	/* irq structure is initialized. */</div><div class='add'>+#if LINUX_VERSION_CODE &gt; KERNEL_VERSION(2,6,16)</div><div class='add'>+	if (pdev-&gt;conf.Attributes &amp; CONF_ENABLE_IRQ) {</div><div class='add'>+		pdev-&gt;irq.IRQInfo1 = IRQ_LEVEL_ID;</div><div class='add'>+		pdev-&gt;irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_HANDLE_PRESENT;</div><div class='add'>+		pdev-&gt;irq.Handler = hfa384x_interrupt;</div><div class='add'>+		pdev-&gt;irq.Instance = wlandev;</div><div class='add'>+		CS_CHECK(RequestIRQ, pcmcia_request_irq(pdev, &amp;pdev-&gt;irq));</div><div class='add'>+	}</div><div class='add'>+#else</div><div class='add'>+	if (link-&gt;conf.Attributes &amp; CONF_ENABLE_IRQ) {</div><div class='add'>+		link-&gt;irq.IRQInfo1 = IRQ_LEVEL_ID;</div><div class='add'>+		link-&gt;irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_HANDLE_PRESENT;</div><div class='add'>+		link-&gt;irq.Handler = hfa384x_interrupt;</div><div class='add'>+		link-&gt;irq.Instance = wlandev;</div><div class='add'>+		CS_CHECK(RequestIRQ, pcmcia_request_irq(pdev, &amp;link-&gt;irq));</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* This actually configures the PCMCIA socket -- setting up */</div><div class='add'>+	/* the I/O windows and the interrupt mapping, and putting the */</div><div class='add'>+	/* card and host interface into "Memory and IO" mode. */</div><div class='add'>+#if LINUX_VERSION_CODE &gt; KERNEL_VERSION(2,6,16)</div><div class='add'>+	CS_CHECK(RequestConfiguration, pcmcia_request_configuration(pdev, &amp;pdev-&gt;conf));</div><div class='add'>+#else</div><div class='add'>+	CS_CHECK(RequestConfiguration, pcmcia_request_configuration(pdev, &amp;link-&gt;conf));</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* Fill the netdevice with this info */</div><div class='add'>+#if LINUX_VERSION_CODE &gt; KERNEL_VERSION(2,6,16)</div><div class='add'>+	wlandev-&gt;netdev-&gt;irq = pdev-&gt;irq.AssignedIRQ;</div><div class='add'>+	wlandev-&gt;netdev-&gt;base_addr = pdev-&gt;io.BasePort1;</div><div class='add'>+#else</div><div class='add'>+	wlandev-&gt;netdev-&gt;irq = link-&gt;irq.AssignedIRQ;</div><div class='add'>+	wlandev-&gt;netdev-&gt;base_addr = link-&gt;io.BasePort1;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* And the rest of the hw structure */</div><div class='add'>+	hw-&gt;irq = wlandev-&gt;netdev-&gt;irq;</div><div class='add'>+	hw-&gt;iobase = wlandev-&gt;netdev-&gt;base_addr;</div><div class='add'>+</div><div class='add'>+#if LINUX_VERSION_CODE &lt; KERNEL_VERSION(2,6,17)</div><div class='add'>+	link-&gt;state |= DEV_CONFIG;</div><div class='add'>+	link-&gt;state &amp;= ~DEV_CONFIG_PENDING;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* And now we're done! */</div><div class='add'>+	wlandev-&gt;msdstate = WLAN_MSD_HWPRESENT;</div><div class='add'>+</div><div class='add'>+	goto done;</div><div class='add'>+</div><div class='add'>+ cs_failed:</div><div class='add'>+        cs_error(pdev, last_fn, last_ret);</div><div class='add'>+</div><div class='add'>+failed:</div><div class='add'>+	// wlandev, hw, etc etc..</div><div class='add'>+#if LINUX_VERSION_CODE &gt; KERNEL_VERSION(2,6,16)</div><div class='add'>+	pdev-&gt;priv = NULL;</div><div class='add'>+#else</div><div class='add'>+	pdev-&gt;instance = NULL;</div><div class='add'>+	if (link) {</div><div class='add'>+		link-&gt;priv = NULL;</div><div class='add'>+		kfree(link);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	if (wlandev) {</div><div class='add'>+		wlan_unsetup(wlandev);</div><div class='add'>+		if (wlandev-&gt;priv) {</div><div class='add'>+			hw = wlandev-&gt;priv;</div><div class='add'>+			wlandev-&gt;priv = NULL;</div><div class='add'>+			if (hw) {</div><div class='add'>+				hfa384x_destroy(hw);</div><div class='add'>+				kfree(hw);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		kfree(wlandev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	if (parse) kfree(parse);</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return rval;</div><div class='add'>+}</div><div class='add'>+#else  // &lt;= 2.6.15</div><div class='add'>+#define CS_CHECK(fn, ret) \</div><div class='add'>+do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)</div><div class='add'>+</div><div class='add'>+#define CFG_CHECK(fn, retf) \</div><div class='add'>+do { int ret = (retf); \</div><div class='add'>+if (ret != 0) { \</div><div class='add'>+        WLAN_LOG_DEBUG(1, "CardServices(" #fn ") returned %d\n", ret); \</div><div class='add'>+        cs_error(link-&gt;handle, fn, ret); \</div><div class='add'>+        goto next_entry; \</div><div class='add'>+} \</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2sta_attach</div><div class='add'>+*</div><div class='add'>+* Half of the attach/detach pair.  Creates and registers a device</div><div class='add'>+* instance with Card Services.  In this case, it also creates the</div><div class='add'>+* wlandev structure and device private structure.  These are</div><div class='add'>+* linked to the device instance via its priv member.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	none</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	A valid ptr to dev_link_t on success, NULL otherwise</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread (insmod/init_module/register_pccard_driver)</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+dev_link_t *prism2sta_attach(void)</div><div class='add'>+{</div><div class='add'>+	client_reg_t		client_reg;</div><div class='add'>+	int			result;</div><div class='add'>+	dev_link_t		*link = NULL;</div><div class='add'>+	wlandevice_t		*wlandev = NULL;</div><div class='add'>+	hfa384x_t		*hw = NULL;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	/* Alloc our structures */</div><div class='add'>+	link =		kmalloc(sizeof(struct dev_link_t), GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (!link || ((wlandev = create_wlan()) == NULL)) {</div><div class='add'>+		WLAN_LOG_ERROR("%s: Memory allocation failure.\n", dev_info);</div><div class='add'>+		result = -EIO;</div><div class='add'>+		goto failed;</div><div class='add'>+	}</div><div class='add'>+	hw = wlandev-&gt;priv;</div><div class='add'>+</div><div class='add'>+	/* Clear all the structs */</div><div class='add'>+	memset(link, 0, sizeof(struct dev_link_t));</div><div class='add'>+</div><div class='add'>+	if ( wlan_setup(wlandev) != 0 ) {</div><div class='add'>+		WLAN_LOG_ERROR("%s: wlan_setup() failed.\n", dev_info);</div><div class='add'>+		result = -EIO;</div><div class='add'>+		goto failed;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Initialize the hw struct for now */</div><div class='add'>+	hfa384x_create(hw, 0, 0, NULL);</div><div class='add'>+	hw-&gt;wlandev = wlandev;</div><div class='add'>+</div><div class='add'>+	/* Initialize the PC card device object. */</div><div class='add'>+#if (LINUX_VERSION_CODE &lt; KERNEL_VERSION(2,6,0))</div><div class='add'>+	init_timer(&amp;link-&gt;release);</div><div class='add'>+	link-&gt;release.function = &amp;prism2sta_release;</div><div class='add'>+	link-&gt;release.data = (u_long)link;</div><div class='add'>+#endif</div><div class='add'>+	link-&gt;conf.IntType = INT_MEMORY_AND_IO;</div><div class='add'>+	link-&gt;priv = wlandev;</div><div class='add'>+#if (defined(CS_RELEASE_CODE) &amp;&amp; (CS_RELEASE_CODE &lt; 0x2911))</div><div class='add'>+	link-&gt;irq.Instance = wlandev;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* Link in to the list of devices managed by this driver */</div><div class='add'>+	link-&gt;next = dev_list;</div><div class='add'>+	dev_list = link;</div><div class='add'>+</div><div class='add'>+	/* Register with Card Services */</div><div class='add'>+	client_reg.dev_info = &amp;dev_info;</div><div class='add'>+#if (LINUX_VERSION_CODE &lt; KERNEL_VERSION(2,6,11) )</div><div class='add'>+	client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if (LINUX_VERSION_CODE &lt; KERNEL_VERSION(2,6,13) )</div><div class='add'>+	client_reg.EventMask =</div><div class='add'>+		CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |</div><div class='add'>+		CS_EVENT_RESET_REQUEST |</div><div class='add'>+		CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |</div><div class='add'>+		CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME;</div><div class='add'>+	client_reg.event_handler = &amp;prism2sta_event;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	client_reg.Version = 0x0210;</div><div class='add'>+	client_reg.event_callback_args.client_data = link;</div><div class='add'>+</div><div class='add'>+	result = pcmcia_register_client(&amp;link-&gt;handle, &amp;client_reg);</div><div class='add'>+	if (result != 0) {</div><div class='add'>+		cs_error(link-&gt;handle, RegisterClient, result);</div><div class='add'>+		prism2sta_detach(link);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	goto done;</div><div class='add'>+</div><div class='add'>+ failed:</div><div class='add'>+	if (link)	kfree(link);</div><div class='add'>+	if (wlandev)	kfree(wlandev);</div><div class='add'>+	if (hw)		kfree(hw);</div><div class='add'>+	link = NULL;</div><div class='add'>+</div><div class='add'>+ done:</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return link;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2sta_detach</div><div class='add'>+*</div><div class='add'>+* Remove one of the device instances managed by this driver.</div><div class='add'>+*   Search the list for the given instance,</div><div class='add'>+*   check our flags for a waiting timer'd release call</div><div class='add'>+*   call release</div><div class='add'>+*   Deregister the instance with Card Services</div><div class='add'>+*   (netdevice) unregister the network device.</div><div class='add'>+*   unlink the instance from the list</div><div class='add'>+*   free the link, priv, and priv-&gt;priv memory</div><div class='add'>+* Note: the dev_list variable is a driver scoped static used to</div><div class='add'>+*	maintain a list of device instances managed by this</div><div class='add'>+*	driver.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	link	ptr to the instance to detach</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	nothing</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*	the link structure is gone, the netdevice is gone</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	Might be interrupt, don't block.</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+void prism2sta_detach(dev_link_t *link)</div><div class='add'>+{</div><div class='add'>+	dev_link_t		**linkp;</div><div class='add'>+	wlandevice_t		*wlandev;</div><div class='add'>+	hfa384x_t		*hw;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	/* Locate prev device structure */</div><div class='add'>+	for (linkp = &amp;dev_list; *linkp; linkp = &amp;(*linkp)-&gt;next) {</div><div class='add'>+		if (*linkp == link) break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (*linkp != NULL) {</div><div class='add'>+#if (LINUX_VERSION_CODE &lt; KERNEL_VERSION(2,4,0))</div><div class='add'>+		unsigned long	flags;</div><div class='add'>+		/* Get rid of any timer'd release call */</div><div class='add'>+		save_flags(flags);</div><div class='add'>+		cli();</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if (LINUX_VERSION_CODE &lt; KERNEL_VERSION(2,6,0))</div><div class='add'>+		if (link-&gt;state &amp; DEV_RELEASE_PENDING) {</div><div class='add'>+			del_timer_sync(&amp;link-&gt;release);</div><div class='add'>+			link-&gt;state &amp;= ~DEV_RELEASE_PENDING;</div><div class='add'>+		}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if (LINUX_VERSION_CODE &lt; KERNEL_VERSION(2,4,0))</div><div class='add'>+		restore_flags(flags);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+		/* If link says we're still config'd, call release */</div><div class='add'>+		if (link-&gt;state &amp; DEV_CONFIG) {</div><div class='add'>+			prism2sta_release((u_long)link);</div><div class='add'>+			if (link-&gt;state &amp; DEV_STALE_CONFIG) {</div><div class='add'>+				link-&gt;state |= DEV_STALE_LINK;</div><div class='add'>+				return;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Tell Card Services we're not around any more */</div><div class='add'>+		if (link-&gt;handle) {</div><div class='add'>+			pcmcia_deregister_client(link-&gt;handle);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Unlink device structure, free bits */</div><div class='add'>+		*linkp = link-&gt;next;</div><div class='add'>+		if ( link-&gt;priv != NULL ) {</div><div class='add'>+			wlandev = (wlandevice_t*)link-&gt;priv;</div><div class='add'>+			p80211netdev_hwremoved(wlandev);</div><div class='add'>+			if (link-&gt;dev != NULL) {</div><div class='add'>+				unregister_wlandev(wlandev);</div><div class='add'>+			}</div><div class='add'>+			wlan_unsetup(wlandev);</div><div class='add'>+			if (wlandev-&gt;priv) {</div><div class='add'>+				hw = wlandev-&gt;priv;</div><div class='add'>+				wlandev-&gt;priv = NULL;</div><div class='add'>+				if (hw) {</div><div class='add'>+					hfa384x_destroy(hw);</div><div class='add'>+					kfree(hw);</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+			link-&gt;priv = NULL;</div><div class='add'>+			kfree(wlandev);</div><div class='add'>+		}</div><div class='add'>+		kfree(link);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2sta_config</div><div class='add'>+*</div><div class='add'>+* Half of the config/release pair.  Usually called in response to</div><div class='add'>+* a card insertion event.  At this point, we _know_ there's some</div><div class='add'>+* physical device present.  That means we can start poking around</div><div class='add'>+* at the CIS and at any device specific config data we want.</div><div class='add'>+*</div><div class='add'>+* Note the gotos and the macros.  I recoded this once without</div><div class='add'>+* them, and it got incredibly ugly.  It's actually simpler with</div><div class='add'>+* them.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	link	the dev_link_t structure created in attach that</div><div class='add'>+*		represents this device instance.</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	nothing</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*	Resources (irq, io, mem) are allocated</div><div class='add'>+*	The pcmcia dev_link-&gt;node-&gt;name is set</div><div class='add'>+*	(For netcards) The device structure is finished and,</div><div class='add'>+*	  most importantly, registered.  This means that there</div><div class='add'>+*	  is now a _named_ device that can be configured from</div><div class='add'>+*	  userland.</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	May be called from a timer.  Don't block!</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+#define CS_CHECK(fn, ret) \</div><div class='add'>+do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)</div><div class='add'>+</div><div class='add'>+#define CFG_CHECK(fn, retf) \</div><div class='add'>+do { int ret = (retf); \</div><div class='add'>+if (ret != 0) { \</div><div class='add'>+        WLAN_LOG_DEBUG(1, "CardServices(" #fn ") returned %d\n", ret); \</div><div class='add'>+        cs_error(link-&gt;handle, fn, ret); \</div><div class='add'>+        goto next_entry; \</div><div class='add'>+} \</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+void prism2sta_config(dev_link_t *link)</div><div class='add'>+{</div><div class='add'>+	client_handle_t		handle;</div><div class='add'>+	wlandevice_t		*wlandev;</div><div class='add'>+	hfa384x_t               *hw;</div><div class='add'>+	int			last_fn;</div><div class='add'>+	int			last_ret;</div><div class='add'>+	tuple_t			tuple;</div><div class='add'>+	cisparse_t		parse;</div><div class='add'>+	config_info_t		socketconf;</div><div class='add'>+	UINT8			buf[64];</div><div class='add'>+	int			minVcc = 0;</div><div class='add'>+	int			maxVcc = 0;</div><div class='add'>+	cistpl_cftable_entry_t	dflt = { 0 };</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	handle = link-&gt;handle;</div><div class='add'>+	wlandev = (wlandevice_t*)link-&gt;priv;</div><div class='add'>+	hw = wlandev-&gt;priv;</div><div class='add'>+</div><div class='add'>+	/* Collect the config register info */</div><div class='add'>+	tuple.DesiredTuple = CISTPL_CONFIG;</div><div class='add'>+	tuple.Attributes = 0;</div><div class='add'>+	tuple.TupleData = buf;</div><div class='add'>+	tuple.TupleDataMax = sizeof(buf);</div><div class='add'>+	tuple.TupleOffset = 0;</div><div class='add'>+	CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &amp;tuple));</div><div class='add'>+	CS_CHECK(GetTupleData, pcmcia_get_tuple_data(handle, &amp;tuple));</div><div class='add'>+	CS_CHECK(ParseTuple, pcmcia_parse_tuple(handle, &amp;tuple, &amp;parse));</div><div class='add'>+</div><div class='add'>+	link-&gt;conf.ConfigBase = parse.config.base;</div><div class='add'>+	link-&gt;conf.Present = parse.config.rmask[0];</div><div class='add'>+</div><div class='add'>+	/* Configure card */</div><div class='add'>+	link-&gt;state |= DEV_CONFIG;</div><div class='add'>+</div><div class='add'>+	/* Acquire the current socket config (need Vcc setting) */</div><div class='add'>+	CS_CHECK(GetConfigurationInfo, pcmcia_get_configuration_info(handle, &amp;socketconf));</div><div class='add'>+</div><div class='add'>+	/* Loop through the config table entries until we find one that works */</div><div class='add'>+	/* Assumes a complete and valid CIS */</div><div class='add'>+	tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;</div><div class='add'>+	CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &amp;tuple));</div><div class='add'>+	while (1) {</div><div class='add'>+		cistpl_cftable_entry_t *cfg = &amp;(parse.cftable_entry);</div><div class='add'>+		CFG_CHECK(GetTupleData, pcmcia_get_tuple_data(handle, &amp;tuple));</div><div class='add'>+		CFG_CHECK(ParseTuple, pcmcia_parse_tuple(handle, &amp;tuple, &amp;parse));</div><div class='add'>+</div><div class='add'>+		if (cfg-&gt;index == 0) goto next_entry;</div><div class='add'>+		link-&gt;conf.ConfigIndex = cfg-&gt;index;</div><div class='add'>+</div><div class='add'>+		/* Lets print out the Vcc that the controller+pcmcia-cs set</div><div class='add'>+		 * for us, cause that's what we're going to use.</div><div class='add'>+		 */</div><div class='add'>+		WLAN_LOG_DEBUG(1,"Initial Vcc=%d/10v\n", socketconf.Vcc);</div><div class='add'>+		if (prism2_ignorevcc) {</div><div class='add'>+			link-&gt;conf.Vcc = socketconf.Vcc;</div><div class='add'>+			goto skipvcc;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Use power settings for Vcc and Vpp if present */</div><div class='add'>+		/* Note that the CIS values need to be rescaled */</div><div class='add'>+		if (cfg-&gt;vcc.present &amp; (1&lt;&lt;CISTPL_POWER_VNOM)) {</div><div class='add'>+			WLAN_LOG_DEBUG(1, "Vcc obtained from curtupl.VNOM\n");</div><div class='add'>+			minVcc = maxVcc =</div><div class='add'>+				cfg-&gt;vcc.param[CISTPL_POWER_VNOM]/10000;</div><div class='add'>+		} else if (dflt.vcc.present &amp; (1&lt;&lt;CISTPL_POWER_VNOM)) {</div><div class='add'>+			WLAN_LOG_DEBUG(1, "Vcc set from dflt.VNOM\n");</div><div class='add'>+			minVcc = maxVcc =</div><div class='add'>+				dflt.vcc.param[CISTPL_POWER_VNOM]/10000;</div><div class='add'>+		} else if ((cfg-&gt;vcc.present &amp; (1&lt;&lt;CISTPL_POWER_VMAX)) &amp;&amp;</div><div class='add'>+			   (cfg-&gt;vcc.present &amp; (1&lt;&lt;CISTPL_POWER_VMIN)) ) {</div><div class='add'>+			WLAN_LOG_DEBUG(1, "Vcc set from curtupl(VMIN,VMAX)\n");			minVcc = cfg-&gt;vcc.param[CISTPL_POWER_VMIN]/10000;</div><div class='add'>+			maxVcc = cfg-&gt;vcc.param[CISTPL_POWER_VMAX]/10000;</div><div class='add'>+		} else if ((dflt.vcc.present &amp; (1&lt;&lt;CISTPL_POWER_VMAX)) &amp;&amp;</div><div class='add'>+			   (dflt.vcc.present &amp; (1&lt;&lt;CISTPL_POWER_VMIN)) ) {</div><div class='add'>+			WLAN_LOG_DEBUG(1, "Vcc set from dflt(VMIN,VMAX)\n");</div><div class='add'>+			minVcc = dflt.vcc.param[CISTPL_POWER_VMIN]/10000;</div><div class='add'>+			maxVcc = dflt.vcc.param[CISTPL_POWER_VMAX]/10000;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if ( socketconf.Vcc &gt;= minVcc &amp;&amp; socketconf.Vcc &lt;= maxVcc) {</div><div class='add'>+			link-&gt;conf.Vcc = socketconf.Vcc;</div><div class='add'>+		} else {</div><div class='add'>+			/* [MSM]: Note that I've given up trying to change</div><div class='add'>+			 * the Vcc if a change is indicated.  It seems the</div><div class='add'>+			 * system&amp;socketcontroller&amp;card vendors can't seem</div><div class='add'>+			 * to get it right, so I'm tired of trying to hack</div><div class='add'>+			 * my way around it.  pcmcia-cs does its best using</div><div class='add'>+			 * the voltage sense pins but sometimes the controller</div><div class='add'>+			 * lies.  Then, even if we have a good read on the VS</div><div class='add'>+			 * pins, some system designs will silently ignore our</div><div class='add'>+			 * requests to set the voltage.  Additionally, some</div><div class='add'>+			 * vendors have 3.3v indicated on their sense pins,</div><div class='add'>+			 * but 5v specified in the CIS or vice-versa.  I've</div><div class='add'>+			 * had it.  My only recommendation is "let the buyer</div><div class='add'>+			 * beware".  Your system might supply 5v to a 3v card</div><div class='add'>+			 * (possibly causing damage) or a 3v capable system</div><div class='add'>+			 * might supply 5v to a 3v capable card (wasting</div><div class='add'>+			 * precious battery life).</div><div class='add'>+			 * My only recommendation (if you care) is to get</div><div class='add'>+			 * yourself an extender card (I don't know where, I</div><div class='add'>+			 * have only one myself) and a meter and test it for</div><div class='add'>+			 * yourself.</div><div class='add'>+			 */</div><div class='add'>+			goto next_entry;</div><div class='add'>+		}</div><div class='add'>+skipvcc:</div><div class='add'>+		WLAN_LOG_DEBUG(1, "link-&gt;conf.Vcc=%d\n", link-&gt;conf.Vcc);</div><div class='add'>+</div><div class='add'>+		/* Do we need to allocate an interrupt? */</div><div class='add'>+		/* HACK: due to a bad CIS....we ALWAYS need an interrupt */</div><div class='add'>+		/* if (cfg-&gt;irq.IRQInfo1 || dflt.irq.IRQInfo1) */</div><div class='add'>+			link-&gt;conf.Attributes |= CONF_ENABLE_IRQ;</div><div class='add'>+</div><div class='add'>+		/* IO window settings */</div><div class='add'>+		link-&gt;io.NumPorts1 = link-&gt;io.NumPorts2 = 0;</div><div class='add'>+		if ((cfg-&gt;io.nwin &gt; 0) || (dflt.io.nwin &gt; 0)) {</div><div class='add'>+			cistpl_io_t *io = (cfg-&gt;io.nwin) ? &amp;cfg-&gt;io : &amp;dflt.io;</div><div class='add'>+			link-&gt;io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;</div><div class='add'>+			if (!(io-&gt;flags &amp; CISTPL_IO_8BIT))</div><div class='add'>+				link-&gt;io.Attributes1 = IO_DATA_PATH_WIDTH_16;</div><div class='add'>+			if (!(io-&gt;flags &amp; CISTPL_IO_16BIT))</div><div class='add'>+				link-&gt;io.Attributes1 = IO_DATA_PATH_WIDTH_8;</div><div class='add'>+			link-&gt;io.BasePort1 = io-&gt;win[0].base;</div><div class='add'>+			if  ( link-&gt;io.BasePort1 != 0 ) {</div><div class='add'>+				WLAN_LOG_WARNING(</div><div class='add'>+				"Brain damaged CIS: hard coded iobase="</div><div class='add'>+				"0x%x, try letting pcmcia_cs decide...\n",</div><div class='add'>+				link-&gt;io.BasePort1 );</div><div class='add'>+				link-&gt;io.BasePort1 = 0;</div><div class='add'>+			}</div><div class='add'>+			link-&gt;io.NumPorts1 = io-&gt;win[0].len;</div><div class='add'>+			if (io-&gt;nwin &gt; 1) {</div><div class='add'>+				link-&gt;io.Attributes2 = link-&gt;io.Attributes1;</div><div class='add'>+				link-&gt;io.BasePort2 = io-&gt;win[1].base;</div><div class='add'>+				link-&gt;io.NumPorts2 = io-&gt;win[1].len;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* This reserves IO space but doesn't actually enable it */</div><div class='add'>+		CFG_CHECK(RequestIO, pcmcia_request_io(link-&gt;handle, &amp;link-&gt;io));</div><div class='add'>+</div><div class='add'>+		/* If we got this far, we're cool! */</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+next_entry:</div><div class='add'>+		if (cfg-&gt;flags &amp; CISTPL_CFTABLE_DEFAULT)</div><div class='add'>+			dflt = *cfg;</div><div class='add'>+		CS_CHECK(GetNextTuple,</div><div class='add'>+                         pcmcia_get_next_tuple(handle, &amp;tuple));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Allocate an interrupt line.  Note that this does not assign a */</div><div class='add'>+	/* handler to the interrupt, unless the 'Handler' member of the */</div><div class='add'>+	/* irq structure is initialized. */</div><div class='add'>+	if (link-&gt;conf.Attributes &amp; CONF_ENABLE_IRQ)</div><div class='add'>+	{</div><div class='add'>+#if (LINUX_VERSION_CODE &lt; KERNEL_VERSION(2,6,11) )</div><div class='add'>+		int			i;</div><div class='add'>+		link-&gt;irq.IRQInfo1 = IRQ_INFO2_VALID | IRQ_LEVEL_ID;</div><div class='add'>+		if (irq_list[0] == -1)</div><div class='add'>+			link-&gt;irq.IRQInfo2 = irq_mask;</div><div class='add'>+		else</div><div class='add'>+			for (i=0; i&lt;4; i++)</div><div class='add'>+				link-&gt;irq.IRQInfo2 |= 1 &lt;&lt; irq_list[i];</div><div class='add'>+#else</div><div class='add'>+		link-&gt;irq.IRQInfo1 = IRQ_LEVEL_ID;</div><div class='add'>+#endif</div><div class='add'>+		link-&gt;irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_HANDLE_PRESENT;</div><div class='add'>+		link-&gt;irq.Handler = hfa384x_interrupt;</div><div class='add'>+		link-&gt;irq.Instance = wlandev;</div><div class='add'>+		CS_CHECK(RequestIRQ, pcmcia_request_irq(link-&gt;handle, &amp;link-&gt;irq));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* This actually configures the PCMCIA socket -- setting up */</div><div class='add'>+	/* the I/O windows and the interrupt mapping, and putting the */</div><div class='add'>+	/* card and host interface into "Memory and IO" mode. */</div><div class='add'>+	CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link-&gt;handle, &amp;link-&gt;conf));</div><div class='add'>+</div><div class='add'>+	/* Fill the netdevice with this info */</div><div class='add'>+	wlandev-&gt;netdev-&gt;irq = link-&gt;irq.AssignedIRQ;</div><div class='add'>+	wlandev-&gt;netdev-&gt;base_addr = link-&gt;io.BasePort1;</div><div class='add'>+</div><div class='add'>+	/* Report what we've done */</div><div class='add'>+	WLAN_LOG_INFO("%s: index 0x%02x: Vcc %d.%d",</div><div class='add'>+		dev_info, link-&gt;conf.ConfigIndex,</div><div class='add'>+		link-&gt;conf.Vcc/10, link-&gt;conf.Vcc%10);</div><div class='add'>+	if (link-&gt;conf.Vpp1)</div><div class='add'>+		printk(", Vpp %d.%d", link-&gt;conf.Vpp1/10, link-&gt;conf.Vpp1%10);</div><div class='add'>+	if (link-&gt;conf.Attributes &amp; CONF_ENABLE_IRQ)</div><div class='add'>+		printk(", irq %d", link-&gt;irq.AssignedIRQ);</div><div class='add'>+	if (link-&gt;io.NumPorts1)</div><div class='add'>+		printk(", io 0x%04x-0x%04x", link-&gt;io.BasePort1, link-&gt;io.BasePort1+link-&gt;io.NumPorts1-1);</div><div class='add'>+	if (link-&gt;io.NumPorts2)</div><div class='add'>+		printk(" &amp; 0x%04x-0x%04x", link-&gt;io.BasePort2, link-&gt;io.BasePort2+link-&gt;io.NumPorts2-1);</div><div class='add'>+	printk("\n");</div><div class='add'>+</div><div class='add'>+	link-&gt;state &amp;= ~DEV_CONFIG_PENDING;</div><div class='add'>+</div><div class='add'>+	/* Let pcmcia know the device name */</div><div class='add'>+	link-&gt;dev = &amp;hw-&gt;node;</div><div class='add'>+</div><div class='add'>+	/* Register the network device and get assigned a name */</div><div class='add'>+	SET_MODULE_OWNER(wlandev-&gt;netdev);</div><div class='add'>+#if (LINUX_VERSION_CODE &gt;= KERNEL_VERSION(2,6,11) )</div><div class='add'>+	SET_NETDEV_DEV(wlandev-&gt;netdev,  &amp;handle_to_dev(link-&gt;handle));</div><div class='add'>+#endif</div><div class='add'>+	if (register_wlandev(wlandev) != 0) {</div><div class='add'>+		WLAN_LOG_NOTICE("prism2sta_cs: register_wlandev() failed.\n");</div><div class='add'>+		goto failed;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	strcpy(hw-&gt;node.dev_name, wlandev-&gt;name);</div><div class='add'>+</div><div class='add'>+	/* Any device custom config/query stuff should be done here */</div><div class='add'>+	/* For a netdevice, we should at least grab the mac address */</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+cs_failed:</div><div class='add'>+	cs_error(link-&gt;handle, last_fn, last_ret);</div><div class='add'>+	WLAN_LOG_ERROR("NextTuple failure? It's probably a Vcc mismatch.\n");</div><div class='add'>+</div><div class='add'>+failed:</div><div class='add'>+	prism2sta_release((u_long)link);</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2sta_release</div><div class='add'>+*</div><div class='add'>+* Half of the config/release pair.  Usually called in response to</div><div class='add'>+* a card ejection event.  Checks to make sure no higher layers</div><div class='add'>+* are still (or think they are) using the card via the link-&gt;open</div><div class='add'>+* field.</div><div class='add'>+*</div><div class='add'>+* NOTE: Don't forget to increment the link-&gt;open variable in the</div><div class='add'>+*  device_open method, and decrement it in the device_close</div><div class='add'>+*  method.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	arg	a generic 32 bit variable.  It's the value that</div><div class='add'>+*		we assigned to link-&gt;release.data in sta_attach().</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	nothing</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*	All resources should be released after this function</div><div class='add'>+*	executes and finds the device !open.</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	Possibly in a timer context.  Don't do anything that'll</div><div class='add'>+*	block.</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+void prism2sta_release(u_long arg)</div><div class='add'>+{</div><div class='add'>+        dev_link_t	*link = (dev_link_t *)arg;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	/* First thing we should do is get the MSD back to the</div><div class='add'>+	 * HWPRESENT state.  I.e. everything quiescent.</div><div class='add'>+	 */</div><div class='add'>+	prism2sta_ifstate(link-&gt;priv, P80211ENUM_ifstate_disable);</div><div class='add'>+</div><div class='add'>+        if (link-&gt;open) {</div><div class='add'>+		/* TODO: I don't think we're even using this bit of code</div><div class='add'>+		 * and I don't think it's hurting us at the moment.</div><div class='add'>+		 */</div><div class='add'>+                WLAN_LOG_DEBUG(1,</div><div class='add'>+			"prism2sta_cs: release postponed, '%s' still open\n",</div><div class='add'>+			link-&gt;dev-&gt;dev_name);</div><div class='add'>+                link-&gt;state |= DEV_STALE_CONFIG;</div><div class='add'>+                return;</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+        pcmcia_release_configuration(link-&gt;handle);</div><div class='add'>+        pcmcia_release_io(link-&gt;handle, &amp;link-&gt;io);</div><div class='add'>+        pcmcia_release_irq(link-&gt;handle, &amp;link-&gt;irq);</div><div class='add'>+</div><div class='add'>+        link-&gt;state &amp;= ~(DEV_CONFIG | DEV_RELEASE_PENDING);</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2sta_event</div><div class='add'>+*</div><div class='add'>+* Handler for card services events.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	event		The event code</div><div class='add'>+*	priority	hi/low - REMOVAL is the only hi</div><div class='add'>+*	args		ptr to card services struct containing info about</div><div class='add'>+*			pcmcia status</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	Zero on success, non-zero otherwise</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	Both interrupt and process thread, depends on the event.</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+static int</div><div class='add'>+prism2sta_event (</div><div class='add'>+	event_t event,</div><div class='add'>+	int priority,</div><div class='add'>+	event_callback_args_t *args)</div><div class='add'>+{</div><div class='add'>+	int			result = 0;</div><div class='add'>+	dev_link_t		*link = (dev_link_t *) args-&gt;client_data;</div><div class='add'>+	wlandevice_t		*wlandev = (wlandevice_t*)link-&gt;priv;</div><div class='add'>+	hfa384x_t		*hw = NULL;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	if (wlandev) hw = wlandev-&gt;priv;</div><div class='add'>+</div><div class='add'>+	switch (event)</div><div class='add'>+	{</div><div class='add'>+	case CS_EVENT_CARD_INSERTION:</div><div class='add'>+		WLAN_LOG_DEBUG(5,"event is INSERTION\n");</div><div class='add'>+		link-&gt;state |= DEV_PRESENT | DEV_CONFIG_PENDING;</div><div class='add'>+		prism2sta_config(link);</div><div class='add'>+		if (!(link-&gt;state &amp; DEV_CONFIG)) {</div><div class='add'>+			wlandev-&gt;netdev-&gt;irq = 0;</div><div class='add'>+			WLAN_LOG_ERROR(</div><div class='add'>+				"%s: Initialization failed!\n", dev_info);</div><div class='add'>+			wlandev-&gt;msdstate = WLAN_MSD_HWFAIL;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Fill in the rest of the hw struct */</div><div class='add'>+		hw-&gt;irq = wlandev-&gt;netdev-&gt;irq;</div><div class='add'>+		hw-&gt;iobase = wlandev-&gt;netdev-&gt;base_addr;</div><div class='add'>+		hw-&gt;link = link;</div><div class='add'>+</div><div class='add'>+		if (prism2_doreset) {</div><div class='add'>+			result = hfa384x_corereset(hw,</div><div class='add'>+					prism2_reset_holdtime,</div><div class='add'>+					prism2_reset_settletime, 0);</div><div class='add'>+			if ( result ) {</div><div class='add'>+				WLAN_LOG_ERROR(</div><div class='add'>+					"corereset() failed, result=%d.\n",</div><div class='add'>+					result);</div><div class='add'>+				wlandev-&gt;msdstate = WLAN_MSD_HWFAIL;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+#if 0</div><div class='add'>+		/*</div><div class='add'>+		 * TODO: test_hostif() not implemented yet.</div><div class='add'>+		 */</div><div class='add'>+		result = hfa384x_test_hostif(hw);</div><div class='add'>+		if (result) {</div><div class='add'>+			WLAN_LOG_ERROR(</div><div class='add'>+			"test_hostif() failed, result=%d.\n", result);</div><div class='add'>+			wlandev-&gt;msdstate = WLAN_MSD_HWFAIL;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+#endif</div><div class='add'>+		wlandev-&gt;msdstate = WLAN_MSD_HWPRESENT;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case CS_EVENT_CARD_REMOVAL:</div><div class='add'>+		WLAN_LOG_DEBUG(5,"event is REMOVAL\n");</div><div class='add'>+		link-&gt;state &amp;= ~DEV_PRESENT;</div><div class='add'>+</div><div class='add'>+		if (wlandev) {</div><div class='add'>+			p80211netdev_hwremoved(wlandev);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+#if (LINUX_VERSION_CODE &lt; KERNEL_VERSION(2,6,0))</div><div class='add'>+		if (link-&gt;state &amp; DEV_CONFIG)</div><div class='add'>+		{</div><div class='add'>+			link-&gt;release.expires = jiffies + (HZ/20);</div><div class='add'>+			add_timer(&amp;link-&gt;release);</div><div class='add'>+		}</div><div class='add'>+#endif</div><div class='add'>+		break;</div><div class='add'>+	case CS_EVENT_RESET_REQUEST:</div><div class='add'>+		WLAN_LOG_DEBUG(5,"event is RESET_REQUEST\n");</div><div class='add'>+		WLAN_LOG_NOTICE(</div><div class='add'>+			"prism2 card reset not supported "</div><div class='add'>+			"due to post-reset user mode configuration "</div><div class='add'>+			"requirements.\n");</div><div class='add'>+		WLAN_LOG_NOTICE(</div><div class='add'>+			"  From user mode, use "</div><div class='add'>+			"'cardctl suspend;cardctl resume' "</div><div class='add'>+			"instead.\n");</div><div class='add'>+		break;</div><div class='add'>+	case CS_EVENT_RESET_PHYSICAL:</div><div class='add'>+	case CS_EVENT_CARD_RESET:</div><div class='add'>+		WLAN_LOG_WARNING("Rx'd CS_EVENT_RESET_xxx, should not "</div><div class='add'>+			"be possible since RESET_REQUEST was denied.\n");</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case CS_EVENT_PM_SUSPEND:</div><div class='add'>+		WLAN_LOG_DEBUG(5,"event is SUSPEND\n");</div><div class='add'>+		link-&gt;state |= DEV_SUSPEND;</div><div class='add'>+		if (link-&gt;state &amp; DEV_CONFIG)</div><div class='add'>+		{</div><div class='add'>+			prism2sta_ifstate(wlandev, P80211ENUM_ifstate_disable);</div><div class='add'>+			pcmcia_release_configuration(link-&gt;handle);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case CS_EVENT_PM_RESUME:</div><div class='add'>+		WLAN_LOG_DEBUG(5,"event is RESUME\n");</div><div class='add'>+		link-&gt;state &amp;= ~DEV_SUSPEND;</div><div class='add'>+		if (link-&gt;state &amp; DEV_CONFIG) {</div><div class='add'>+			pcmcia_request_configuration(link-&gt;handle, &amp;link-&gt;conf);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return 0;  /* noone else does anthing with the return value */</div><div class='add'>+}</div><div class='add'>+#endif // &lt;= 2.6.15</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+int hfa384x_corereset(hfa384x_t *hw, int holdtime, int settletime, int genesis)</div><div class='add'>+{</div><div class='add'>+	int		result = 0;</div><div class='add'>+	conf_reg_t	reg;</div><div class='add'>+	UINT8		corsave;</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	WLAN_LOG_DEBUG(3, "Doing reset via CardServices().\n");</div><div class='add'>+</div><div class='add'>+	/* Collect COR */</div><div class='add'>+	reg.Function = 0;</div><div class='add'>+	reg.Action = CS_READ;</div><div class='add'>+	reg.Offset = CISREG_COR;</div><div class='add'>+#if LINUX_VERSION_CODE &gt; KERNEL_VERSION(2,6,16)</div><div class='add'>+	result = pcmcia_access_configuration_register(hw-&gt;pdev, &amp;reg);</div><div class='add'>+#else</div><div class='add'>+	result = pcmcia_access_configuration_register(</div><div class='add'>+			hw-&gt;link-&gt;handle,</div><div class='add'>+			&amp;reg);</div><div class='add'>+#endif</div><div class='add'>+	if (result != CS_SUCCESS ) {</div><div class='add'>+		WLAN_LOG_ERROR(</div><div class='add'>+			":0: AccessConfigurationRegister(CS_READ) failed,"</div><div class='add'>+			"result=%d.\n", result);</div><div class='add'>+		result = -EIO;</div><div class='add'>+	}</div><div class='add'>+	corsave = reg.Value;</div><div class='add'>+</div><div class='add'>+	/* Write reset bit (BIT7) */</div><div class='add'>+	reg.Value |= BIT7;</div><div class='add'>+	reg.Action = CS_WRITE;</div><div class='add'>+	reg.Offset = CISREG_COR;</div><div class='add'>+#if LINUX_VERSION_CODE &gt; KERNEL_VERSION(2,6,16)</div><div class='add'>+	result = pcmcia_access_configuration_register(hw-&gt;pdev, &amp;reg);</div><div class='add'>+#else</div><div class='add'>+	result = pcmcia_access_configuration_register(</div><div class='add'>+			hw-&gt;link-&gt;handle,</div><div class='add'>+			&amp;reg);</div><div class='add'>+#endif</div><div class='add'>+	if (result != CS_SUCCESS ) {</div><div class='add'>+		WLAN_LOG_ERROR(</div><div class='add'>+			":1: AccessConfigurationRegister(CS_WRITE) failed,"</div><div class='add'>+			"result=%d.\n", result);</div><div class='add'>+		result = -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Hold for holdtime */</div><div class='add'>+	mdelay(holdtime);</div><div class='add'>+</div><div class='add'>+	if (genesis) {</div><div class='add'>+		reg.Value = genesis;</div><div class='add'>+		reg.Action = CS_WRITE;</div><div class='add'>+		reg.Offset = CISREG_CCSR;</div><div class='add'>+#if LINUX_VERSION_CODE &gt; KERNEL_VERSION(2,6,16)</div><div class='add'>+		result = pcmcia_access_configuration_register(hw-&gt;pdev, &amp;reg);</div><div class='add'>+#else</div><div class='add'>+		result = pcmcia_access_configuration_register(</div><div class='add'>+				      hw-&gt;link-&gt;handle,</div><div class='add'>+				      &amp;reg);</div><div class='add'>+#endif</div><div class='add'>+		if (result != CS_SUCCESS ) {</div><div class='add'>+			WLAN_LOG_ERROR(</div><div class='add'>+				":1: AccessConfigurationRegister(CS_WRITE) failed,"</div><div class='add'>+				"result=%d.\n", result);</div><div class='add'>+			result = -EIO;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Hold for holdtime */</div><div class='add'>+	mdelay(holdtime);</div><div class='add'>+</div><div class='add'>+	/* Clear reset bit */</div><div class='add'>+	reg.Value &amp;= ~BIT7;</div><div class='add'>+	reg.Action = CS_WRITE;</div><div class='add'>+	reg.Offset = CISREG_COR;</div><div class='add'>+#if LINUX_VERSION_CODE &gt; KERNEL_VERSION(2,6,16)</div><div class='add'>+	result = pcmcia_access_configuration_register(hw-&gt;pdev, &amp;reg);</div><div class='add'>+#else</div><div class='add'>+	result = pcmcia_access_configuration_register(</div><div class='add'>+				      hw-&gt;link-&gt;handle,</div><div class='add'>+				      &amp;reg);</div><div class='add'>+#endif</div><div class='add'>+	if (result != CS_SUCCESS ) {</div><div class='add'>+		WLAN_LOG_ERROR(</div><div class='add'>+			":2: AccessConfigurationRegister(CS_WRITE) failed,"</div><div class='add'>+			"result=%d.\n", result);</div><div class='add'>+		result = -EIO;</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Wait for settletime */</div><div class='add'>+	mdelay(settletime);</div><div class='add'>+</div><div class='add'>+	/* Set non-reset bits back what they were */</div><div class='add'>+	reg.Value = corsave;</div><div class='add'>+	reg.Action = CS_WRITE;</div><div class='add'>+	reg.Offset = CISREG_COR;</div><div class='add'>+#if LINUX_VERSION_CODE &gt; KERNEL_VERSION(2,6,16)</div><div class='add'>+	result = pcmcia_access_configuration_register(hw-&gt;pdev, &amp;reg);</div><div class='add'>+#else</div><div class='add'>+	result = pcmcia_access_configuration_register(</div><div class='add'>+				      hw-&gt;link-&gt;handle,</div><div class='add'>+				      &amp;reg);</div><div class='add'>+#endif</div><div class='add'>+	if (result != CS_SUCCESS ) {</div><div class='add'>+		WLAN_LOG_ERROR(</div><div class='add'>+			":2: AccessConfigurationRegister(CS_WRITE) failed,"</div><div class='add'>+			"result=%d.\n", result);</div><div class='add'>+		result = -EIO;</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef MODULE</div><div class='add'>+</div><div class='add'>+static int __init prism2cs_init(void)</div><div class='add'>+{</div><div class='add'>+#if (LINUX_VERSION_CODE &lt; KERNEL_VERSION(2,5,68))</div><div class='add'>+	servinfo_t	serv;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+        WLAN_LOG_NOTICE("%s Loaded\n", version);</div><div class='add'>+        WLAN_LOG_NOTICE("dev_info is: %s\n", dev_info);</div><div class='add'>+</div><div class='add'>+#if (LINUX_VERSION_CODE &lt; KERNEL_VERSION(2,5,68))</div><div class='add'>+	pcmcia_get_card_services_info(&amp;serv);</div><div class='add'>+	if ( serv.Revision != CS_RELEASE_CODE )</div><div class='add'>+	{</div><div class='add'>+		printk(KERN_NOTICE"%s: CardServices release does not match!\n", dev_info);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* This call will result in a call to prism2sta_attach */</div><div class='add'>+	/*   and eventually prism2sta_detach */</div><div class='add'>+	register_pccard_driver( &amp;dev_info, &amp;prism2sta_attach, &amp;prism2sta_detach);</div><div class='add'>+#else</div><div class='add'>+	pcmcia_register_driver(&amp;prism2_cs_driver);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit prism2cs_cleanup(void)</div><div class='add'>+{</div><div class='add'>+#if (LINUX_VERSION_CODE &lt; KERNEL_VERSION(2,5,68))</div><div class='add'>+        dev_link_t *link = dev_list;</div><div class='add'>+        dev_link_t *nlink;</div><div class='add'>+        DBFENTER;</div><div class='add'>+</div><div class='add'>+#if (LINUX_VERSION_CODE &lt; KERNEL_VERSION(2,6,10) )</div><div class='add'>+	for (link=dev_list; link != NULL; link = nlink) {</div><div class='add'>+		nlink = link-&gt;next;</div><div class='add'>+		if ( link-&gt;state &amp; DEV_CONFIG ) {</div><div class='add'>+			prism2sta_release((u_long)link);</div><div class='add'>+		}</div><div class='add'>+		prism2sta_detach(link); /* remember detach() frees link */</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	unregister_pccard_driver( &amp;dev_info);</div><div class='add'>+#else</div><div class='add'>+	pcmcia_unregister_driver(&amp;prism2_cs_driver);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+        printk(KERN_NOTICE "%s Unloaded\n", version);</div><div class='add'>+</div><div class='add'>+        DBFEXIT;</div><div class='add'>+        return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(prism2cs_init);</div><div class='add'>+module_exit(prism2cs_cleanup);</div><div class='add'>+</div><div class='add'>+#endif // MODULE</div><div class='add'>+</div><div class='head'>diff --git a/drivers/staging/wlan-ng/prism2_pci.c b/drivers/staging/wlan-ng/prism2_pci.c<br/>new file mode 100644<br/>index 000000000000..afe32dfbf6b1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/wlan-ng/prism2_pci.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/wlan-ng/prism2_pci.c</a></div><div class='hunk'>@@ -0,0 +1,332 @@</div><div class='add'>+#define WLAN_HOSTIF WLAN_PCI</div><div class='add'>+#include "hfa384x.c"</div><div class='add'>+#include "prism2mgmt.c"</div><div class='add'>+#include "prism2mib.c"</div><div class='add'>+#include "prism2sta.c"</div><div class='add'>+</div><div class='add'>+#define PCI_SIZE		0x1000		/* Memory size - 4K bytes */</div><div class='add'>+</div><div class='add'>+/* ISL3874A 11Mb/s WLAN controller */</div><div class='add'>+#define PCIVENDOR_INTERSIL	0x1260UL</div><div class='add'>+#define PCIDEVICE_ISL3874	0x3873UL /* [MSM] yeah I know...the ID says</div><div class='add'>+					    3873. Trust me, it's a 3874. */</div><div class='add'>+</div><div class='add'>+/* Samsung SWL-2210P 11Mb/s WLAN controller (uses ISL3874A) */</div><div class='add'>+#define PCIVENDOR_SAMSUNG      0x167dUL</div><div class='add'>+#define PCIDEVICE_SWL_2210P    0xa000UL</div><div class='add'>+</div><div class='add'>+#define PCIVENDOR_NETGEAR      0x1385UL /* for MA311 */</div><div class='add'>+</div><div class='add'>+/* PCI Class &amp; Sub-Class code, Network-'Other controller' */</div><div class='add'>+#define PCI_CLASS_NETWORK_OTHERS 0x280</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2sta_probe_pci</div><div class='add'>+*</div><div class='add'>+* Probe routine called when a PCI device w/ matching ID is found.</div><div class='add'>+* The ISL3874 implementation uses the following map:</div><div class='add'>+*   BAR0: Prism2.x registers memory mapped, size=4k</div><div class='add'>+* Here's the sequence:</div><div class='add'>+*   - Allocate the PCI resources.</div><div class='add'>+*   - Read the PCMCIA attribute memory to make sure we have a WLAN card</div><div class='add'>+*   - Reset the MAC</div><div class='add'>+*   - Initialize the netdev and wlan data</div><div class='add'>+*   - Initialize the MAC</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	pdev		ptr to pci device structure containing info about</div><div class='add'>+*			pci configuration.</div><div class='add'>+*	id		ptr to the device id entry that matched this device.</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	zero		- success</div><div class='add'>+*	negative	- failed</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread</div><div class='add'>+*</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+static int __devinit</div><div class='add'>+prism2sta_probe_pci(</div><div class='add'>+	struct pci_dev *pdev,</div><div class='add'>+	const struct pci_device_id *id)</div><div class='add'>+{</div><div class='add'>+	int		result;</div><div class='add'>+	phys_t		phymem = 0;</div><div class='add'>+	void		__iomem *mem = NULL;</div><div class='add'>+        wlandevice_t    *wlandev = NULL;</div><div class='add'>+	hfa384x_t	*hw = NULL;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	/* Enable the pci device */</div><div class='add'>+	if (pci_enable_device(pdev)) {</div><div class='add'>+		WLAN_LOG_ERROR("%s: pci_enable_device() failed.\n", dev_info);</div><div class='add'>+		result = -EIO;</div><div class='add'>+		goto fail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Figure out our resources */</div><div class='add'>+	phymem = pci_resource_start(pdev, 0);</div><div class='add'>+</div><div class='add'>+        if (!request_mem_region(phymem, pci_resource_len(pdev, 0), "Prism2")) {</div><div class='add'>+		printk(KERN_ERR "prism2: Cannot reserve PCI memory region\n");</div><div class='add'>+		result = -EIO;</div><div class='add'>+		goto fail;</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+	mem = ioremap(phymem, PCI_SIZE);</div><div class='add'>+	if ( mem == 0 ) {</div><div class='add'>+		WLAN_LOG_ERROR("%s: ioremap() failed.\n", dev_info);</div><div class='add'>+		result = -EIO;</div><div class='add'>+		goto fail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Log the device */</div><div class='add'>+        WLAN_LOG_INFO("A Prism2.5 PCI device found, "</div><div class='add'>+		"phymem:0x%llx, irq:%d, mem:0x%p\n",</div><div class='add'>+		(unsigned long long)phymem, pdev-&gt;irq, mem);</div><div class='add'>+</div><div class='add'>+	if ((wlandev = create_wlan()) == NULL) {</div><div class='add'>+		WLAN_LOG_ERROR("%s: Memory allocation failure.\n", dev_info);</div><div class='add'>+		result = -EIO;</div><div class='add'>+		goto fail;</div><div class='add'>+	}</div><div class='add'>+	hw = wlandev-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if ( wlan_setup(wlandev) != 0 ) {</div><div class='add'>+		WLAN_LOG_ERROR("%s: wlan_setup() failed.\n", dev_info);</div><div class='add'>+		result = -EIO;</div><div class='add'>+		goto fail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Setup netdevice's ability to report resources</div><div class='add'>+	 * Note: the netdevice was allocated by wlan_setup()</div><div class='add'>+	 */</div><div class='add'>+        wlandev-&gt;netdev-&gt;irq = pdev-&gt;irq;</div><div class='add'>+        wlandev-&gt;netdev-&gt;mem_start = (unsigned long) mem;</div><div class='add'>+        wlandev-&gt;netdev-&gt;mem_end = wlandev-&gt;netdev-&gt;mem_start +</div><div class='add'>+		pci_resource_len(pdev, 0);</div><div class='add'>+</div><div class='add'>+	/* Initialize the hw data */</div><div class='add'>+        hfa384x_create(hw, wlandev-&gt;netdev-&gt;irq, 0, mem);</div><div class='add'>+	hw-&gt;wlandev = wlandev;</div><div class='add'>+</div><div class='add'>+	/* Register the wlandev, this gets us a name and registers the</div><div class='add'>+	 * linux netdevice.</div><div class='add'>+	 */</div><div class='add'>+	SET_MODULE_OWNER(wlandev-&gt;netdev);</div><div class='add'>+#if (LINUX_VERSION_CODE &gt;= KERNEL_VERSION(2,6,0))</div><div class='add'>+       SET_NETDEV_DEV(wlandev-&gt;netdev, &amp;(pdev-&gt;dev));</div><div class='add'>+#endif</div><div class='add'>+        if ( register_wlandev(wlandev) != 0 ) {</div><div class='add'>+		WLAN_LOG_ERROR("%s: register_wlandev() failed.\n", dev_info);</div><div class='add'>+		result = -EIO;</div><div class='add'>+		goto fail;</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+#if 0</div><div class='add'>+	/* TODO: Move this and an irq test into an hfa384x_testif() routine.</div><div class='add'>+	 */</div><div class='add'>+	outw(PRISM2STA_MAGIC, HFA384x_SWSUPPORT(wlandev-&gt;netdev-&gt;base_addr));</div><div class='add'>+	reg=inw( HFA384x_SWSUPPORT(wlandev-&gt;netdev-&gt;base_addr));</div><div class='add'>+	if ( reg != PRISM2STA_MAGIC ) {</div><div class='add'>+		WLAN_LOG_ERROR("MAC register access test failed!\n");</div><div class='add'>+		result = -EIO;</div><div class='add'>+		goto fail;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* Do a chip-level reset on the MAC */</div><div class='add'>+	if (prism2_doreset) {</div><div class='add'>+		result = hfa384x_corereset(hw,</div><div class='add'>+				prism2_reset_holdtime,</div><div class='add'>+				prism2_reset_settletime, 0);</div><div class='add'>+		if (result != 0) {</div><div class='add'>+			WLAN_LOG_ERROR(</div><div class='add'>+				"%s: hfa384x_corereset() failed.\n",</div><div class='add'>+				dev_info);</div><div class='add'>+			unregister_wlandev(wlandev);</div><div class='add'>+			hfa384x_destroy(hw);</div><div class='add'>+			result = -EIO;</div><div class='add'>+			goto fail;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+        pci_set_drvdata(pdev, wlandev);</div><div class='add'>+</div><div class='add'>+	/* Shouldn't actually hook up the IRQ until we</div><div class='add'>+	 * _know_ things are alright.  A test routine would help.</div><div class='add'>+	 */</div><div class='add'>+       	request_irq(wlandev-&gt;netdev-&gt;irq, hfa384x_interrupt,</div><div class='add'>+		SA_SHIRQ, wlandev-&gt;name, wlandev);</div><div class='add'>+</div><div class='add'>+	wlandev-&gt;msdstate = WLAN_MSD_HWPRESENT;</div><div class='add'>+</div><div class='add'>+	result = 0;</div><div class='add'>+	goto done;</div><div class='add'>+</div><div class='add'>+ fail:</div><div class='add'>+	pci_set_drvdata(pdev, NULL);</div><div class='add'>+	if (wlandev)	kfree(wlandev);</div><div class='add'>+	if (hw)		kfree(hw);</div><div class='add'>+        if (mem)        iounmap(mem);</div><div class='add'>+	pci_release_regions(pdev);</div><div class='add'>+        pci_disable_device(pdev);</div><div class='add'>+</div><div class='add'>+ done:</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __devexit prism2sta_remove_pci(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+       	wlandevice_t		*wlandev;</div><div class='add'>+	hfa384x_t	*hw;</div><div class='add'>+</div><div class='add'>+	wlandev = (wlandevice_t *) pci_get_drvdata(pdev);</div><div class='add'>+	hw = wlandev-&gt;priv;</div><div class='add'>+</div><div class='add'>+	p80211netdev_hwremoved(wlandev);</div><div class='add'>+</div><div class='add'>+	/* reset hardware */</div><div class='add'>+	prism2sta_ifstate(wlandev, P80211ENUM_ifstate_disable);</div><div class='add'>+</div><div class='add'>+        if (pdev-&gt;irq)</div><div class='add'>+		free_irq(pdev-&gt;irq, wlandev);</div><div class='add'>+</div><div class='add'>+	unregister_wlandev(wlandev);</div><div class='add'>+</div><div class='add'>+	/* free local stuff */</div><div class='add'>+	if (hw) {</div><div class='add'>+		hfa384x_destroy(hw);</div><div class='add'>+		kfree(hw);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iounmap((void __iomem *)wlandev-&gt;netdev-&gt;mem_start);</div><div class='add'>+	wlan_unsetup(wlandev);</div><div class='add'>+</div><div class='add'>+	pci_release_regions(pdev);</div><div class='add'>+        pci_disable_device(pdev);</div><div class='add'>+	pci_set_drvdata(pdev, NULL);</div><div class='add'>+</div><div class='add'>+	kfree(wlandev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static struct pci_device_id pci_id_tbl[] = {</div><div class='add'>+	{</div><div class='add'>+		PCIVENDOR_INTERSIL, PCIDEVICE_ISL3874,</div><div class='add'>+		PCI_ANY_ID, PCI_ANY_ID,</div><div class='add'>+		0, 0,</div><div class='add'>+		/* Driver data, we just put the name here */</div><div class='add'>+		(unsigned long)"Intersil Prism2.5 ISL3874 11Mb/s WLAN Controller"</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		PCIVENDOR_INTERSIL, 0x3872,</div><div class='add'>+		PCI_ANY_ID, PCI_ANY_ID,</div><div class='add'>+		0, 0,</div><div class='add'>+		/* Driver data, we just put the name here */</div><div class='add'>+		(unsigned long)"Intersil Prism2.5 ISL3872 11Mb/s WLAN Controller"</div><div class='add'>+	},</div><div class='add'>+        {</div><div class='add'>+               PCIVENDOR_SAMSUNG, PCIDEVICE_SWL_2210P,</div><div class='add'>+               PCI_ANY_ID, PCI_ANY_ID,</div><div class='add'>+               0, 0,</div><div class='add'>+               /* Driver data, we just put the name here */</div><div class='add'>+               (unsigned long)"Samsung MagicLAN SWL-2210P 11Mb/s WLAN Controller"</div><div class='add'>+	},</div><div class='add'>+	{ /* for NetGear MA311 */</div><div class='add'>+		PCIVENDOR_NETGEAR, 0x3872,</div><div class='add'>+		PCI_ANY_ID, PCI_ANY_ID,</div><div class='add'>+		0, 0,</div><div class='add'>+		/* Driver data, we just put the name here */</div><div class='add'>+		(unsigned long)"Netgear MA311 WLAN Controller"</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_DEVICE_TABLE(pci, pci_id_tbl);</div><div class='add'>+</div><div class='add'>+/* Function declared here because of ptr reference below */</div><div class='add'>+static int  __devinit prism2sta_probe_pci(struct pci_dev *pdev,</div><div class='add'>+				const struct pci_device_id *id);</div><div class='add'>+static void  __devexit prism2sta_remove_pci(struct pci_dev *pdev);</div><div class='add'>+</div><div class='add'>+static struct pci_driver prism2_pci_drv_id = {</div><div class='add'>+        .name = "prism2_pci",</div><div class='add'>+        .id_table = pci_id_tbl,</div><div class='add'>+        .probe = prism2sta_probe_pci,</div><div class='add'>+        .remove = prism2sta_remove_pci,</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+        .suspend = prism2sta_suspend_pci,</div><div class='add'>+        .resume = prism2sta_resume_pci,</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#ifdef MODULE</div><div class='add'>+</div><div class='add'>+static int __init prism2pci_init(void)</div><div class='add'>+{</div><div class='add'>+        WLAN_LOG_NOTICE("%s Loaded\n", version);</div><div class='add'>+	return pci_module_init(&amp;prism2_pci_drv_id);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __exit prism2pci_cleanup(void)</div><div class='add'>+{</div><div class='add'>+	pci_unregister_driver(&amp;prism2_pci_drv_id);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_init(prism2pci_init);</div><div class='add'>+module_exit(prism2pci_cleanup);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+int hfa384x_corereset(hfa384x_t *hw, int holdtime, int settletime, int genesis)</div><div class='add'>+{</div><div class='add'>+	int		result = 0;</div><div class='add'>+	unsigned long	timeout;</div><div class='add'>+	UINT16	reg;</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	/* Assert reset and wait awhile</div><div class='add'>+	 * (note: these delays are _really_ long, but they appear to be</div><div class='add'>+	 *        necessary.)</div><div class='add'>+	 */</div><div class='add'>+	hfa384x_setreg(hw, 0xc5, HFA384x_PCICOR);</div><div class='add'>+	timeout = jiffies + HZ/4;</div><div class='add'>+	while(time_before(jiffies, timeout)) udelay(5);</div><div class='add'>+</div><div class='add'>+	if (genesis) {</div><div class='add'>+		hfa384x_setreg(hw, genesis, HFA384x_PCIHCR);</div><div class='add'>+		timeout = jiffies + HZ/4;</div><div class='add'>+		while(time_before(jiffies, timeout)) udelay(5);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Clear the reset and wait some more</div><div class='add'>+	 */</div><div class='add'>+	hfa384x_setreg(hw, 0x45, HFA384x_PCICOR);</div><div class='add'>+	timeout = jiffies + HZ/2;</div><div class='add'>+	while(time_before(jiffies, timeout)) udelay(5);</div><div class='add'>+</div><div class='add'>+	/* Wait for f/w to complete initialization (CMD:BUSY == 0)</div><div class='add'>+	 */</div><div class='add'>+	timeout = jiffies + 2*HZ;</div><div class='add'>+	reg = hfa384x_getreg(hw, HFA384x_CMD);</div><div class='add'>+	while ( HFA384x_CMD_ISBUSY(reg) &amp;&amp; time_before( jiffies, timeout) ) {</div><div class='add'>+		reg = hfa384x_getreg(hw, HFA384x_CMD);</div><div class='add'>+		udelay(10);</div><div class='add'>+	}</div><div class='add'>+	if (HFA384x_CMD_ISBUSY(reg)) {</div><div class='add'>+		WLAN_LOG_WARNING("corereset: Timed out waiting for cmd register.\n");</div><div class='add'>+		result=1;</div><div class='add'>+	}</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/staging/wlan-ng/prism2_plx.c b/drivers/staging/wlan-ng/prism2_plx.c<br/>new file mode 100644<br/>index 000000000000..320443f37a8f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/wlan-ng/prism2_plx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/wlan-ng/prism2_plx.c</a></div><div class='hunk'>@@ -0,0 +1,472 @@</div><div class='add'>+#define WLAN_HOSTIF WLAN_PLX</div><div class='add'>+#include "hfa384x.c"</div><div class='add'>+#include "prism2mgmt.c"</div><div class='add'>+#include "prism2mib.c"</div><div class='add'>+#include "prism2sta.c"</div><div class='add'>+</div><div class='add'>+#define PLX_ATTR_SIZE	0x1000	/* Attribute memory size - 4K bytes */</div><div class='add'>+#define COR_OFFSET	0x3e0	/* COR attribute offset of Prism2 PC card */</div><div class='add'>+#define COR_VALUE	0x41	/* Enable PC card with irq in level trigger */</div><div class='add'>+#define PLX_INTCSR	0x4c	/* Interrupt Control and Status Register */</div><div class='add'>+#define PLX_INTCSR_INTEN (1&lt;&lt;6) /* Interrupt Enable bit */</div><div class='add'>+#define PLX_MIN_ATTR_LEN 512    /* at least 2 x 256 is needed for CIS */</div><div class='add'>+</div><div class='add'>+/* 3Com 3CRW777A (PLX) board ID */</div><div class='add'>+#define PCIVENDOR_3COM       0x10B7</div><div class='add'>+#define PCIDEVICE_AIRCONNECT 0x7770</div><div class='add'>+</div><div class='add'>+/* Eumitcom PCI WL11000 PCI Adapter (PLX) board device+vendor ID */</div><div class='add'>+#define PCIVENDOR_EUMITCOM	0x1638UL</div><div class='add'>+#define PCIDEVICE_WL11000	0x1100UL</div><div class='add'>+</div><div class='add'>+/* Global Sun Tech GL24110P PCI Adapter (PLX) board device+vendor ID */</div><div class='add'>+#define PCIVENDOR_GLOBALSUN	0x16abUL</div><div class='add'>+#define PCIDEVICE_GL24110P	0x1101UL</div><div class='add'>+#define PCIDEVICE_GL24110P_ALT	0x1102UL</div><div class='add'>+</div><div class='add'>+/* Netgear MA301 PCI Adapter (PLX) board device+vendor ID */</div><div class='add'>+#define PCIVENDOR_NETGEAR	0x1385UL</div><div class='add'>+#define PCIDEVICE_MA301		0x4100UL</div><div class='add'>+</div><div class='add'>+/* US Robotics USR2410 PCI Adapter (PLX) board device+vendor ID */</div><div class='add'>+#define	PCIVENDOR_USROBOTICS    0x16ecUL</div><div class='add'>+#define PCIDEVICE_USR2410       0x3685UL</div><div class='add'>+</div><div class='add'>+/* Linksys WPC11 card with the WDT11 adapter (PLX) board device+vendor ID */</div><div class='add'>+#define	PCIVENDOR_Linksys       0x16abUL</div><div class='add'>+#define PCIDEVICE_Wpc11Wdt11    0x1102UL</div><div class='add'>+</div><div class='add'>+/* National Datacomm Corp SOHOware Netblaster II PCI */</div><div class='add'>+#define PCIVENDOR_NDC	        0x15e8UL</div><div class='add'>+#define PCIDEVICE_NCP130_PLX 	0x0130UL</div><div class='add'>+#define PCIDEVICE_NCP130_ASIC	0x0131UL</div><div class='add'>+</div><div class='add'>+/* NDC NCP130_PLX is also sold by Corega. Their name is CGWLPCIA11 */</div><div class='add'>+#define PCIVENDOR_COREGA       PCIVENDOR_NDC</div><div class='add'>+#define PCIDEVICE_CGWLPCIA11   PCIDEVICE_NCP130_PLX</div><div class='add'>+</div><div class='add'>+/* PCI Class &amp; Sub-Class code, Network-'Other controller' */</div><div class='add'>+#define PCI_CLASS_NETWORK_OTHERS 0x280</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2sta_probe_plx</div><div class='add'>+*</div><div class='add'>+* Probe routine called when a PCI device w/ matching ID is found.</div><div class='add'>+* This PLX implementation uses the following map:</div><div class='add'>+*   BAR0: Unused</div><div class='add'>+*   BAR1: ????</div><div class='add'>+*   BAR2: PCMCIA attribute memory</div><div class='add'>+*   BAR3: PCMCIA i/o space</div><div class='add'>+* Here's the sequence:</div><div class='add'>+*   - Allocate the PCI resources.</div><div class='add'>+*   - Read the PCMCIA attribute memory to make sure we have a WLAN card</div><div class='add'>+*   - Reset the MAC using the PCMCIA COR</div><div class='add'>+*   - Initialize the netdev and wlan data</div><div class='add'>+*   - Initialize the MAC</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	pdev		ptr to pci device structure containing info about</div><div class='add'>+*			pci configuration.</div><div class='add'>+*	id		ptr to the device id entry that matched this device.</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	zero		- success</div><div class='add'>+*	negative	- failed</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread</div><div class='add'>+*</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+static int __devinit</div><div class='add'>+prism2sta_probe_plx(</div><div class='add'>+	struct pci_dev			*pdev,</div><div class='add'>+	const struct pci_device_id	*id)</div><div class='add'>+{</div><div class='add'>+	int		result;</div><div class='add'>+        phys_t	pccard_ioaddr;</div><div class='add'>+	phys_t  pccard_attr_mem;</div><div class='add'>+        unsigned int    pccard_attr_len;</div><div class='add'>+	void __iomem *attr_mem = NULL;</div><div class='add'>+	UINT32		plx_addr;</div><div class='add'>+        wlandevice_t    *wlandev = NULL;</div><div class='add'>+	hfa384x_t	*hw = NULL;</div><div class='add'>+	int		reg;</div><div class='add'>+        u32		regic;</div><div class='add'>+</div><div class='add'>+	if (pci_enable_device(pdev))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	/* TMC7160 boards are special */</div><div class='add'>+	if ((pdev-&gt;vendor == PCIVENDOR_NDC) &amp;&amp;</div><div class='add'>+	    (pdev-&gt;device == PCIDEVICE_NCP130_ASIC)) {</div><div class='add'>+		unsigned long delay;</div><div class='add'>+</div><div class='add'>+		pccard_attr_mem = 0;</div><div class='add'>+		pccard_ioaddr = pci_resource_start(pdev, 1);</div><div class='add'>+</div><div class='add'>+		outb(0x45, pccard_ioaddr);</div><div class='add'>+		delay = jiffies + 1*HZ;</div><div class='add'>+		while (time_before(jiffies, delay));</div><div class='add'>+</div><div class='add'>+		if (inb(pccard_ioaddr) != 0x45) {</div><div class='add'>+			WLAN_LOG_ERROR("Initialize the TMC7160 failed. (0x%x)\n", inb(pccard_ioaddr));</div><div class='add'>+			return -EIO;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		pccard_ioaddr = pci_resource_start(pdev, 2);</div><div class='add'>+		prism2_doreset = 0;</div><div class='add'>+</div><div class='add'>+		WLAN_LOG_INFO("NDC NCP130 with TMC716(ASIC) PCI interface device found at io:0x%x, irq:%d\n", pccard_ioaddr, pdev-&gt;irq);</div><div class='add'>+		goto init;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Collect the resource requirements */</div><div class='add'>+	pccard_attr_mem = pci_resource_start(pdev, 2);</div><div class='add'>+	pccard_attr_len = pci_resource_len(pdev, 2);</div><div class='add'>+        if (pccard_attr_len &lt; PLX_MIN_ATTR_LEN)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	pccard_ioaddr = pci_resource_start(pdev, 3);</div><div class='add'>+</div><div class='add'>+	/* bjoern: We need to tell the card to enable interrupts, in</div><div class='add'>+	 * case the serial eprom didn't do this already. See the</div><div class='add'>+	 * PLX9052 data book, p8-1 and 8-24 for reference.</div><div class='add'>+	 * [MSM]: This bit of code came from the orinoco_cs driver.</div><div class='add'>+	 */</div><div class='add'>+	plx_addr = pci_resource_start(pdev, 1);</div><div class='add'>+</div><div class='add'>+	regic = 0;</div><div class='add'>+	regic = inl(plx_addr+PLX_INTCSR);</div><div class='add'>+	if(regic &amp; PLX_INTCSR_INTEN) {</div><div class='add'>+		WLAN_LOG_DEBUG(1,</div><div class='add'>+			"%s: Local Interrupt already enabled\n", dev_info);</div><div class='add'>+	} else {</div><div class='add'>+		regic |= PLX_INTCSR_INTEN;</div><div class='add'>+		outl(regic, plx_addr+PLX_INTCSR);</div><div class='add'>+		regic = inl(plx_addr+PLX_INTCSR);</div><div class='add'>+		if(!(regic &amp; PLX_INTCSR_INTEN)) {</div><div class='add'>+			WLAN_LOG_ERROR(</div><div class='add'>+				"%s: Couldn't enable Local Interrupts\n",</div><div class='add'>+				dev_info);</div><div class='add'>+			return -EIO;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* These assignments are here in case of future mappings for</div><div class='add'>+	 * io space and irq that might be similar to ioremap</div><div class='add'>+	 */</div><div class='add'>+        if (!request_mem_region(pccard_attr_mem, pci_resource_len(pdev, 2), "Prism2")) {</div><div class='add'>+		WLAN_LOG_ERROR("%s: Couldn't reserve PCI memory region\n", dev_info);</div><div class='add'>+		return -EIO;</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+	attr_mem = ioremap(pccard_attr_mem, pccard_attr_len);</div><div class='add'>+</div><div class='add'>+	WLAN_LOG_INFO("A PLX PCI/PCMCIA interface device found, "</div><div class='add'>+		"phymem:0x%llx, phyio=0x%x, irq:%d, "</div><div class='add'>+		"mem: 0x%lx\n",</div><div class='add'>+		(unsigned long long)pccard_attr_mem, pccard_ioaddr, pdev-&gt;irq,</div><div class='add'>+		(unsigned long)attr_mem);</div><div class='add'>+</div><div class='add'>+	/* Verify whether PC card is present.</div><div class='add'>+	 * [MSM] This needs improvement, the right thing to do is</div><div class='add'>+	 * probably to walk the CIS looking for the vendor and product</div><div class='add'>+	 * IDs.  It would be nice if this could be tied in with the</div><div class='add'>+	 * etc/pcmcia/wlan-ng.conf file.  Any volunteers?  ;-)</div><div class='add'>+	 */</div><div class='add'>+	if (</div><div class='add'>+	readb(attr_mem + 0) != 0x01 || readb(attr_mem + 2) != 0x03 ||</div><div class='add'>+	readb(attr_mem + 4) != 0x00 || readb(attr_mem + 6) != 0x00 ||</div><div class='add'>+	readb(attr_mem + 8) != 0xFF || readb(attr_mem + 10) != 0x17 ||</div><div class='add'>+	readb(attr_mem + 12) != 0x04 || readb(attr_mem + 14) != 0x67) {</div><div class='add'>+		WLAN_LOG_ERROR("Prism2 PC card CIS is invalid.\n");</div><div class='add'>+		return -EIO;</div><div class='add'>+        }</div><div class='add'>+        WLAN_LOG_INFO("A PCMCIA WLAN adapter was found.\n");</div><div class='add'>+</div><div class='add'>+        /* Write COR to enable PC card */</div><div class='add'>+	writeb(COR_VALUE, attr_mem + COR_OFFSET);</div><div class='add'>+	reg = readb(attr_mem + COR_OFFSET);</div><div class='add'>+</div><div class='add'>+ init:</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Now do everything the same as a PCI device</div><div class='add'>+	 * [MSM] TODO: We could probably factor this out of pcmcia/pci/plx</div><div class='add'>+	 * and perhaps usb.  Perhaps a task for another day.......</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	if ((wlandev = create_wlan()) == NULL) {</div><div class='add'>+		WLAN_LOG_ERROR("%s: Memory allocation failure.\n", dev_info);</div><div class='add'>+		result = -EIO;</div><div class='add'>+		goto failed;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hw = wlandev-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if ( wlan_setup(wlandev) != 0 ) {</div><div class='add'>+		WLAN_LOG_ERROR("%s: wlan_setup() failed.\n", dev_info);</div><div class='add'>+		result = -EIO;</div><div class='add'>+		goto failed;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Setup netdevice's ability to report resources</div><div class='add'>+	 * Note: the netdevice was allocated by wlan_setup()</div><div class='add'>+	 */</div><div class='add'>+        wlandev-&gt;netdev-&gt;irq = pdev-&gt;irq;</div><div class='add'>+        wlandev-&gt;netdev-&gt;base_addr = pccard_ioaddr;</div><div class='add'>+        wlandev-&gt;netdev-&gt;mem_start = (unsigned long)attr_mem;</div><div class='add'>+        wlandev-&gt;netdev-&gt;mem_end = (unsigned long)attr_mem + pci_resource_len(pdev, 0);</div><div class='add'>+</div><div class='add'>+	/* Initialize the hw data */</div><div class='add'>+        hfa384x_create(hw, wlandev-&gt;netdev-&gt;irq, pccard_ioaddr, attr_mem);</div><div class='add'>+	hw-&gt;wlandev = wlandev;</div><div class='add'>+</div><div class='add'>+	/* Register the wlandev, this gets us a name and registers the</div><div class='add'>+	 * linux netdevice.</div><div class='add'>+	 */</div><div class='add'>+	SET_MODULE_OWNER(wlandev-&gt;netdev);</div><div class='add'>+#if (LINUX_VERSION_CODE &gt;= KERNEL_VERSION(2,6,0))</div><div class='add'>+       SET_NETDEV_DEV(wlandev-&gt;netdev, &amp;(pdev-&gt;dev));</div><div class='add'>+#endif</div><div class='add'>+        if ( register_wlandev(wlandev) != 0 ) {</div><div class='add'>+		WLAN_LOG_ERROR("%s: register_wlandev() failed.\n", dev_info);</div><div class='add'>+		result = -EIO;</div><div class='add'>+		goto failed;</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+#if 0</div><div class='add'>+	/* TODO: Move this and an irq test into an hfa384x_testif() routine.</div><div class='add'>+	 */</div><div class='add'>+	outw(PRISM2STA_MAGIC, HFA384x_SWSUPPORT(wlandev-&gt;netdev-&gt;base_addr));</div><div class='add'>+	reg=inw( HFA384x_SWSUPPORT(wlandev-&gt;netdev-&gt;base_addr));</div><div class='add'>+	if ( reg != PRISM2STA_MAGIC ) {</div><div class='add'>+		WLAN_LOG_ERROR("MAC register access test failed!\n");</div><div class='add'>+ 		result = -EIO;</div><div class='add'>+		goto failed;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* Do a chip-level reset on the MAC */</div><div class='add'>+	if (prism2_doreset) {</div><div class='add'>+		result = hfa384x_corereset(hw,</div><div class='add'>+				prism2_reset_holdtime,</div><div class='add'>+				prism2_reset_settletime, 0);</div><div class='add'>+		if (result != 0) {</div><div class='add'>+			unregister_wlandev(wlandev);</div><div class='add'>+			hfa384x_destroy(hw);</div><div class='add'>+			WLAN_LOG_ERROR(</div><div class='add'>+				"%s: hfa384x_corereset() failed.\n",</div><div class='add'>+				dev_info);</div><div class='add'>+			result = -EIO;</div><div class='add'>+			goto failed;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pci_set_drvdata(pdev, wlandev);</div><div class='add'>+</div><div class='add'>+	/* Shouldn't actually hook up the IRQ until we</div><div class='add'>+	 * _know_ things are alright.  A test routine would help.</div><div class='add'>+	 */</div><div class='add'>+       	request_irq(wlandev-&gt;netdev-&gt;irq, hfa384x_interrupt,</div><div class='add'>+		SA_SHIRQ, wlandev-&gt;name, wlandev);</div><div class='add'>+</div><div class='add'>+	wlandev-&gt;msdstate = WLAN_MSD_HWPRESENT;</div><div class='add'>+</div><div class='add'>+	result = 0;</div><div class='add'>+</div><div class='add'>+	goto done;</div><div class='add'>+</div><div class='add'>+ failed:</div><div class='add'>+</div><div class='add'>+	pci_set_drvdata(pdev, NULL);</div><div class='add'>+	if (wlandev)	kfree(wlandev);</div><div class='add'>+	if (hw)		kfree(hw);</div><div class='add'>+        if (attr_mem)        iounmap(attr_mem);</div><div class='add'>+	pci_release_regions(pdev);</div><div class='add'>+        pci_disable_device(pdev);</div><div class='add'>+</div><div class='add'>+ done:</div><div class='add'>+	DBFEXIT;</div><div class='add'>+        return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __devexit prism2sta_remove_plx(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+       	wlandevice_t		*wlandev;</div><div class='add'>+	hfa384x_t               *hw;</div><div class='add'>+</div><div class='add'>+	wlandev = (wlandevice_t *) pci_get_drvdata(pdev);</div><div class='add'>+	hw = wlandev-&gt;priv;</div><div class='add'>+</div><div class='add'>+	p80211netdev_hwremoved(wlandev);</div><div class='add'>+</div><div class='add'>+	/* reset hardware */</div><div class='add'>+	prism2sta_ifstate(wlandev, P80211ENUM_ifstate_disable);</div><div class='add'>+</div><div class='add'>+        if (pdev-&gt;irq)</div><div class='add'>+		free_irq(pdev-&gt;irq, wlandev);</div><div class='add'>+</div><div class='add'>+	unregister_wlandev(wlandev);</div><div class='add'>+</div><div class='add'>+	/* free local stuff */</div><div class='add'>+	if (hw) {</div><div class='add'>+		hfa384x_destroy(hw);</div><div class='add'>+		kfree(hw);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iounmap((void __iomem *)wlandev-&gt;netdev-&gt;mem_start);</div><div class='add'>+	wlan_unsetup(wlandev);</div><div class='add'>+</div><div class='add'>+	pci_release_regions(pdev);</div><div class='add'>+        pci_disable_device(pdev);</div><div class='add'>+	pci_set_drvdata(pdev, NULL);</div><div class='add'>+</div><div class='add'>+	kfree(wlandev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct pci_device_id plx_id_tbl[] = {</div><div class='add'>+	{</div><div class='add'>+		PCIVENDOR_EUMITCOM, PCIDEVICE_WL11000,</div><div class='add'>+		PCI_ANY_ID, PCI_ANY_ID,</div><div class='add'>+		0, 0,</div><div class='add'>+		/* Driver data, we just put the name here */</div><div class='add'>+		(unsigned long)"Eumitcom WL11000 PCI(PLX) card"</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		PCIVENDOR_GLOBALSUN, PCIDEVICE_GL24110P,</div><div class='add'>+		PCI_ANY_ID, PCI_ANY_ID,</div><div class='add'>+		0, 0,</div><div class='add'>+		/* Driver data, we just put the name here */</div><div class='add'>+		(unsigned long)"Global Sun Tech GL24110P PCI(PLX) card"</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		PCIVENDOR_GLOBALSUN, PCIDEVICE_GL24110P_ALT,</div><div class='add'>+		PCI_ANY_ID, PCI_ANY_ID,</div><div class='add'>+		0, 0,</div><div class='add'>+		/* Driver data, we just put the name here */</div><div class='add'>+		(unsigned long)"Global Sun Tech GL24110P PCI(PLX) card"</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		PCIVENDOR_NETGEAR, PCIDEVICE_MA301,</div><div class='add'>+		PCI_ANY_ID, PCI_ANY_ID,</div><div class='add'>+		0, 0,</div><div class='add'>+		/* Driver data, we just put the name here */</div><div class='add'>+		(unsigned long)"Global Sun Tech GL24110P PCI(PLX) card"</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		PCIVENDOR_USROBOTICS, PCIDEVICE_USR2410,</div><div class='add'>+		PCI_ANY_ID, PCI_ANY_ID,</div><div class='add'>+		0, 0,</div><div class='add'>+		/* Driver data, we just put the name here */</div><div class='add'>+		(unsigned long)"US Robotics USR2410 PCI(PLX) card"</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		PCIVENDOR_Linksys, PCIDEVICE_Wpc11Wdt11,</div><div class='add'>+		PCI_ANY_ID, PCI_ANY_ID,</div><div class='add'>+		0, 0,</div><div class='add'>+		/* Driver data, we just put the name here */</div><div class='add'>+		(unsigned long)"Linksys WPC11 with WDT11 PCI(PLX) adapter"</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+	        PCIVENDOR_NDC, PCIDEVICE_NCP130_PLX,</div><div class='add'>+		PCI_ANY_ID, PCI_ANY_ID,</div><div class='add'>+		0, 0,</div><div class='add'>+		/* Driver data, we just put the name here */</div><div class='add'>+		(unsigned long)"NDC Netblaster II PCI(PLX)"</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+	        PCIVENDOR_NDC, PCIDEVICE_NCP130_ASIC,</div><div class='add'>+		PCI_ANY_ID, PCI_ANY_ID,</div><div class='add'>+		0, 0,</div><div class='add'>+		/* Driver data, we just put the name here */</div><div class='add'>+		(unsigned long)"NDC Netblaster II PCI(TMC7160)"</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		PCIVENDOR_3COM, PCIDEVICE_AIRCONNECT,</div><div class='add'>+		PCI_ANY_ID, PCI_ANY_ID,</div><div class='add'>+		0, 0,</div><div class='add'>+		/* Driver data, we just put the name here */</div><div class='add'>+		(unsigned long)"3Com AirConnect PCI 802.11b 11Mb/s WLAN Controller"</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_DEVICE_TABLE(pci, plx_id_tbl);</div><div class='add'>+</div><div class='add'>+/* Function declared here because of ptr reference below */</div><div class='add'>+static int __devinit prism2sta_probe_plx(struct pci_dev *pdev,</div><div class='add'>+					 const struct pci_device_id *);</div><div class='add'>+static void __devexit prism2sta_remove_plx(struct pci_dev *pdev);</div><div class='add'>+</div><div class='add'>+static struct pci_driver prism2_plx_drv_id = {</div><div class='add'>+        .name = "prism2_plx",</div><div class='add'>+        .id_table = plx_id_tbl,</div><div class='add'>+        .probe = prism2sta_probe_plx,</div><div class='add'>+        .remove = prism2sta_remove_plx,</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+        .suspend = prism2sta_suspend_pci,</div><div class='add'>+        .resume = prism2sta_resume_pci,</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#ifdef MODULE</div><div class='add'>+</div><div class='add'>+static int __init prism2plx_init(void)</div><div class='add'>+{</div><div class='add'>+        WLAN_LOG_NOTICE("%s Loaded\n", version);</div><div class='add'>+	return pci_module_init(&amp;prism2_plx_drv_id);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __exit prism2plx_cleanup(void)</div><div class='add'>+{</div><div class='add'>+	pci_unregister_driver(&amp;prism2_plx_drv_id);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_init(prism2plx_init);</div><div class='add'>+module_exit(prism2plx_cleanup);</div><div class='add'>+</div><div class='add'>+#endif // MODULE</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+int hfa384x_corereset(hfa384x_t *hw, int holdtime, int settletime, int genesis)</div><div class='add'>+{</div><div class='add'>+	int		result = 0;</div><div class='add'>+</div><div class='add'>+#define COR_OFFSET	0x3e0	/* COR attribute offset of Prism2 PC card */</div><div class='add'>+#define COR_VALUE	0x41	/* Enable PC card with irq in level trigger */</div><div class='add'>+</div><div class='add'>+#define HCR_OFFSET	0x3e2	/* HCR attribute offset of Prism2 PC card */</div><div class='add'>+</div><div class='add'>+	UINT8		corsave;</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	WLAN_LOG_DEBUG(3, "Doing reset via direct COR access.\n");</div><div class='add'>+</div><div class='add'>+	/* Collect COR */</div><div class='add'>+	corsave = readb(hw-&gt;membase + COR_OFFSET);</div><div class='add'>+	/* Write reset bit (BIT7) */</div><div class='add'>+	writeb(corsave | BIT7, hw-&gt;membase + COR_OFFSET);</div><div class='add'>+	/* Hold for holdtime */</div><div class='add'>+	mdelay(holdtime);</div><div class='add'>+</div><div class='add'>+	if (genesis) {</div><div class='add'>+		writeb(genesis, hw-&gt;membase + HCR_OFFSET);</div><div class='add'>+		/* Hold for holdtime */</div><div class='add'>+		mdelay(holdtime);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Clear reset bit */</div><div class='add'>+	writeb(corsave &amp; ~BIT7, hw-&gt;membase + COR_OFFSET);</div><div class='add'>+	/* Wait for settletime */</div><div class='add'>+	mdelay(settletime);</div><div class='add'>+	/* Set non-reset bits back what they were */</div><div class='add'>+	writeb(corsave, hw-&gt;membase + COR_OFFSET);</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/staging/wlan-ng/prism2_usb.c b/drivers/staging/wlan-ng/prism2_usb.c<br/>new file mode 100644<br/>index 000000000000..e45be2374503<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/wlan-ng/prism2_usb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/wlan-ng/prism2_usb.c</a></div><div class='hunk'>@@ -0,0 +1,361 @@</div><div class='add'>+#define WLAN_HOSTIF WLAN_USB</div><div class='add'>+#include "hfa384x_usb.c"</div><div class='add'>+#include "prism2mgmt.c"</div><div class='add'>+#include "prism2mib.c"</div><div class='add'>+#include "prism2sta.c"</div><div class='add'>+</div><div class='add'>+#if (LINUX_VERSION_CODE &lt; KERNEL_VERSION(2,4,0))</div><div class='add'>+#error "prism2_usb requires at least a 2.4.x kernel!"</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define PRISM_USB_DEVICE(vid, pid, name) \</div><div class='add'>+           USB_DEVICE(vid, pid),  \</div><div class='add'>+           .driver_info = (unsigned long) name</div><div class='add'>+</div><div class='add'>+static struct usb_device_id usb_prism_tbl[] = {</div><div class='add'>+	{PRISM_USB_DEVICE(0x04bb, 0x0922, "IOData AirPort WN-B11/USBS")},</div><div class='add'>+	{PRISM_USB_DEVICE(0x07aa, 0x0012, "Corega Wireless LAN USB Stick-11")},</div><div class='add'>+	{PRISM_USB_DEVICE(0x09aa, 0x3642, "Prism2.x 11Mbps WLAN USB Adapter")},</div><div class='add'>+	{PRISM_USB_DEVICE(0x1668, 0x0408, "Actiontec Prism2.5 11Mbps WLAN USB Adapter")},</div><div class='add'>+	{PRISM_USB_DEVICE(0x1668, 0x0421, "Actiontec Prism2.5 11Mbps WLAN USB Adapter")},</div><div class='add'>+	{PRISM_USB_DEVICE(0x1915, 0x2236, "Linksys WUSB11v3.0 11Mbps WLAN USB Adapter")},</div><div class='add'>+	{PRISM_USB_DEVICE(0x066b, 0x2212, "Linksys WUSB11v2.5 11Mbps WLAN USB Adapter")},</div><div class='add'>+	{PRISM_USB_DEVICE(0x066b, 0x2213, "Linksys WUSB12v1.1 11Mbps WLAN USB Adapter")},</div><div class='add'>+	{PRISM_USB_DEVICE(0x067c, 0x1022, "Siemens SpeedStream 1022 11Mbps WLAN USB Adapter")},</div><div class='add'>+	{PRISM_USB_DEVICE(0x049f, 0x0033, "Compaq/Intel W100 PRO/Wireless 11Mbps multiport WLAN Adapter")},</div><div class='add'>+	{PRISM_USB_DEVICE(0x0411, 0x0016, "Melco WLI-USB-S11 11Mbps WLAN Adapter")},</div><div class='add'>+	{PRISM_USB_DEVICE(0x08de, 0x7a01, "PRISM25 IEEE 802.11 Mini USB Adapter")},</div><div class='add'>+	{PRISM_USB_DEVICE(0x8086, 0x1111, "Intel PRO/Wireless 2011B LAN USB Adapter")},</div><div class='add'>+	{PRISM_USB_DEVICE(0x0d8e, 0x7a01, "PRISM25 IEEE 802.11 Mini USB Adapter")},</div><div class='add'>+	{PRISM_USB_DEVICE(0x045e, 0x006e, "Microsoft MN510 Wireless USB Adapter")},</div><div class='add'>+	{PRISM_USB_DEVICE(0x0967, 0x0204, "Acer Warplink USB Adapter")},</div><div class='add'>+	{PRISM_USB_DEVICE(0x0cde, 0x0002, "Z-Com 725/726 Prism2.5 USB/USB Integrated")},</div><div class='add'>+	{PRISM_USB_DEVICE(0x0cde, 0x0005, "Z-Com Xl735 Wireless 802.11b USB Adapter")},</div><div class='add'>+	{PRISM_USB_DEVICE(0x413c, 0x8100, "Dell TrueMobile 1180 Wireless USB Adapter")},</div><div class='add'>+	{PRISM_USB_DEVICE(0x0b3b, 0x1601, "ALLNET 0193 11Mbps WLAN USB Adapter")},</div><div class='add'>+	{PRISM_USB_DEVICE(0x0b3b, 0x1602, "ZyXEL ZyAIR B200 Wireless USB Adapter")},</div><div class='add'>+	{PRISM_USB_DEVICE(0x0baf, 0x00eb, "USRobotics USR1120 Wireless USB Adapter")},</div><div class='add'>+	{PRISM_USB_DEVICE(0x0411, 0x0027, "Melco WLI-USB-KS11G 11Mbps WLAN Adapter")},</div><div class='add'>+        {PRISM_USB_DEVICE(0x04f1, 0x3009, "JVC MP-XP7250 Builtin USB WLAN Adapter")},</div><div class='add'>+	{PRISM_USB_DEVICE(0x0846, 0x4110, "NetGear MA111")},</div><div class='add'>+        {PRISM_USB_DEVICE(0x03f3, 0x0020, "Adaptec AWN-8020 USB WLAN Adapter")},</div><div class='add'>+//	{PRISM_USB_DEVICE(0x0ace, 0x1201, "ZyDAS ZD1201 Wireless USB Adapter")},</div><div class='add'>+	{PRISM_USB_DEVICE(0x2821, 0x3300, "ASUS-WL140 Wireless USB Adapter")},</div><div class='add'>+	{PRISM_USB_DEVICE(0x2001, 0x3700, "DWL-122 Wireless USB Adapter")},</div><div class='add'>+	{PRISM_USB_DEVICE(0x2001, 0x3702, "DWL-120 Rev F Wireless USB Adapter")},</div><div class='add'>+	{PRISM_USB_DEVICE(0x50c2, 0x4013, "Averatec USB WLAN Adapter")},</div><div class='add'>+	{PRISM_USB_DEVICE(0x2c02, 0x14ea, "Planex GW-US11H WLAN USB Adapter")},</div><div class='add'>+	{PRISM_USB_DEVICE(0x124a, 0x168b, "Airvast PRISM3 WLAN USB Adapter")},</div><div class='add'>+	{PRISM_USB_DEVICE(0x083a, 0x3503, "T-Sinus 111 USB WLAN Adapter")},</div><div class='add'>+	{PRISM_USB_DEVICE(0x2821, 0x3300, "Hawking HighDB USB Adapter")},</div><div class='add'>+	{PRISM_USB_DEVICE(0x0411, 0x0044, "Melco WLI-USB-KB11 11Mbps WLAN Adapter")},</div><div class='add'>+	{PRISM_USB_DEVICE(0x1668, 0x6106, "ROPEX FreeLan 802.11b USB Adapter")},</div><div class='add'>+	{PRISM_USB_DEVICE(0x124a, 0x4017, "Pheenet WL-503IA 802.11b USB Adapter")},</div><div class='add'>+	{PRISM_USB_DEVICE(0x0bb2, 0x0302, "Ambit Microsystems Corp.")},</div><div class='add'>+	{PRISM_USB_DEVICE(0x9016, 0x182d, "Sitecom WL-022 802.11b USB Adapter")},</div><div class='add'>+	{PRISM_USB_DEVICE(0x0543, 0x0f01, "ViewSonic Airsync USB Adapter 11Mbps (Prism2.5)")},</div><div class='add'>+	{ /* terminator */ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_DEVICE_TABLE(usb, usb_prism_tbl);</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2sta_probe_usb</div><div class='add'>+*</div><div class='add'>+* Probe routine called by the USB subsystem.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	dev		ptr to the usb_device struct</div><div class='add'>+*	ifnum		interface number being offered</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	NULL		- we're not claiming the device+interface</div><div class='add'>+*	non-NULL	- we are claiming the device+interface and</div><div class='add'>+*			  this is a ptr to the data we want back</div><div class='add'>+*			  when disconnect is called.</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	I'm not sure, assume it's interrupt.</div><div class='add'>+*</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+#if (LINUX_VERSION_CODE &lt; KERNEL_VERSION(2,5,0))</div><div class='add'>+static void __devinit *prism2sta_probe_usb(</div><div class='add'>+	struct usb_device *dev,</div><div class='add'>+	unsigned int ifnum,</div><div class='add'>+	const struct usb_device_id *id)</div><div class='add'>+#else</div><div class='add'>+static int prism2sta_probe_usb(</div><div class='add'>+	struct usb_interface *interface,</div><div class='add'>+	const struct usb_device_id *id)</div><div class='add'>+#endif</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+#if (LINUX_VERSION_CODE &lt; KERNEL_VERSION(2,5,0))</div><div class='add'>+	struct usb_interface *interface;</div><div class='add'>+#else</div><div class='add'>+	struct usb_device *dev;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	wlandevice_t	*wlandev = NULL;</div><div class='add'>+	hfa384x_t	*hw = NULL;</div><div class='add'>+	int              result = 0;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+#if (LINUX_VERSION_CODE &lt; KERNEL_VERSION(2,5,0))</div><div class='add'>+	interface = &amp;dev-&gt;actconfig-&gt;interface[ifnum];</div><div class='add'>+#else</div><div class='add'>+	dev = interface_to_usbdev(interface);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	if ((wlandev = create_wlan()) == NULL) {</div><div class='add'>+		WLAN_LOG_ERROR("%s: Memory allocation failure.\n", dev_info);</div><div class='add'>+		result = -EIO;</div><div class='add'>+		goto failed;</div><div class='add'>+	}</div><div class='add'>+	hw = wlandev-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if ( wlan_setup(wlandev) != 0 ) {</div><div class='add'>+		WLAN_LOG_ERROR("%s: wlan_setup() failed.\n", dev_info);</div><div class='add'>+		result = -EIO;</div><div class='add'>+		goto failed;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Initialize the hw data */</div><div class='add'>+	hfa384x_create(hw, dev);</div><div class='add'>+	hw-&gt;wlandev = wlandev;</div><div class='add'>+</div><div class='add'>+	/* Register the wlandev, this gets us a name and registers the</div><div class='add'>+	 * linux netdevice.</div><div class='add'>+	 */</div><div class='add'>+#if (LINUX_VERSION_CODE &gt;= KERNEL_VERSION(2,6,0))</div><div class='add'>+	SET_NETDEV_DEV(wlandev-&gt;netdev, &amp;(interface-&gt;dev));</div><div class='add'>+#endif</div><div class='add'>+        if ( register_wlandev(wlandev) != 0 ) {</div><div class='add'>+		WLAN_LOG_ERROR("%s: register_wlandev() failed.\n", dev_info);</div><div class='add'>+		result = -EIO;</div><div class='add'>+		goto failed;</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+	/* Do a chip-level reset on the MAC */</div><div class='add'>+	if (prism2_doreset) {</div><div class='add'>+		result = hfa384x_corereset(hw,</div><div class='add'>+				prism2_reset_holdtime,</div><div class='add'>+				prism2_reset_settletime, 0);</div><div class='add'>+		if (result != 0) {</div><div class='add'>+			unregister_wlandev(wlandev);</div><div class='add'>+			hfa384x_destroy(hw);</div><div class='add'>+			result = -EIO;</div><div class='add'>+			WLAN_LOG_ERROR(</div><div class='add'>+				"%s: hfa384x_corereset() failed.\n",</div><div class='add'>+				dev_info);</div><div class='add'>+			goto failed;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#ifndef NEW_MODULE_CODE</div><div class='add'>+	usb_inc_dev_use(dev);</div><div class='add'>+#endif</div><div class='add'>+#if (LINUX_VERSION_CODE &gt;= KERNEL_VERSION(2,6,15))</div><div class='add'>+	usb_get_dev(dev);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	wlandev-&gt;msdstate = WLAN_MSD_HWPRESENT;</div><div class='add'>+</div><div class='add'>+	goto done;</div><div class='add'>+</div><div class='add'>+ failed:</div><div class='add'>+	if (wlandev)	kfree(wlandev);</div><div class='add'>+	if (hw)		kfree(hw);</div><div class='add'>+	wlandev = NULL;</div><div class='add'>+</div><div class='add'>+ done:</div><div class='add'>+	DBFEXIT;</div><div class='add'>+</div><div class='add'>+#if (LINUX_VERSION_CODE &lt; KERNEL_VERSION(2,5,0))</div><div class='add'>+	return wlandev;</div><div class='add'>+#else</div><div class='add'>+	usb_set_intfdata(interface, wlandev);</div><div class='add'>+	return result;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2sta_disconnect_usb</div><div class='add'>+*</div><div class='add'>+* Called when a device previously claimed by probe is removed</div><div class='add'>+* from the USB.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	dev		ptr to the usb_device struct</div><div class='add'>+*	ptr		ptr returned by probe() when the device</div><div class='add'>+*                       was claimed.</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	Nothing</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+#if (LINUX_VERSION_CODE &lt; KERNEL_VERSION(2,5,0))</div><div class='add'>+static void __devexit</div><div class='add'>+prism2sta_disconnect_usb(struct usb_device *dev, void *ptr)</div><div class='add'>+#else</div><div class='add'>+static void</div><div class='add'>+prism2sta_disconnect_usb(struct usb_interface *interface)</div><div class='add'>+#endif</div><div class='add'>+{</div><div class='add'>+#if (LINUX_VERSION_CODE &gt;= KERNEL_VERSION(2,5,0))</div><div class='add'>+	wlandevice_t		*wlandev;</div><div class='add'>+#else</div><div class='add'>+	wlandevice_t		*wlandev = (wlandevice_t*)ptr;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+        DBFENTER;</div><div class='add'>+</div><div class='add'>+#if (LINUX_VERSION_CODE &gt;= KERNEL_VERSION(2,5,0))</div><div class='add'>+	wlandev = (wlandevice_t *) usb_get_intfdata(interface);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	if ( wlandev != NULL ) {</div><div class='add'>+		LIST_HEAD(cleanlist);</div><div class='add'>+		struct list_head	*entry;</div><div class='add'>+		struct list_head	*temp;</div><div class='add'>+		unsigned long		flags;</div><div class='add'>+</div><div class='add'>+		hfa384x_t		*hw = wlandev-&gt;priv;</div><div class='add'>+</div><div class='add'>+		if (!hw)</div><div class='add'>+			goto exit;</div><div class='add'>+</div><div class='add'>+		spin_lock_irqsave(&amp;hw-&gt;ctlxq.lock, flags);</div><div class='add'>+</div><div class='add'>+		p80211netdev_hwremoved(wlandev);</div><div class='add'>+		list_splice_init(&amp;hw-&gt;ctlxq.reapable, &amp;cleanlist);</div><div class='add'>+		list_splice_init(&amp;hw-&gt;ctlxq.completing, &amp;cleanlist);</div><div class='add'>+		list_splice_init(&amp;hw-&gt;ctlxq.pending, &amp;cleanlist);</div><div class='add'>+		list_splice_init(&amp;hw-&gt;ctlxq.active, &amp;cleanlist);</div><div class='add'>+</div><div class='add'>+		spin_unlock_irqrestore(&amp;hw-&gt;ctlxq.lock, flags);</div><div class='add'>+</div><div class='add'>+		/* There's no hardware to shutdown, but the driver</div><div class='add'>+		 * might have some tasks or tasklets that must be</div><div class='add'>+		 * stopped before we can tear everything down.</div><div class='add'>+		 */</div><div class='add'>+		prism2sta_ifstate(wlandev, P80211ENUM_ifstate_disable);</div><div class='add'>+</div><div class='add'>+		del_singleshot_timer_sync(&amp;hw-&gt;throttle);</div><div class='add'>+		del_singleshot_timer_sync(&amp;hw-&gt;reqtimer);</div><div class='add'>+		del_singleshot_timer_sync(&amp;hw-&gt;resptimer);</div><div class='add'>+</div><div class='add'>+		/* Unlink all the URBs. This "removes the wheels"</div><div class='add'>+		 * from the entire CTLX handling mechanism.</div><div class='add'>+		 */</div><div class='add'>+		usb_kill_urb(&amp;hw-&gt;rx_urb);</div><div class='add'>+		usb_kill_urb(&amp;hw-&gt;tx_urb);</div><div class='add'>+		usb_kill_urb(&amp;hw-&gt;ctlx_urb);</div><div class='add'>+</div><div class='add'>+		tasklet_kill(&amp;hw-&gt;completion_bh);</div><div class='add'>+		tasklet_kill(&amp;hw-&gt;reaper_bh);</div><div class='add'>+</div><div class='add'>+		flush_scheduled_work();</div><div class='add'>+</div><div class='add'>+		/* Now we complete any outstanding commands</div><div class='add'>+		 * and tell everyone who is waiting for their</div><div class='add'>+		 * responses that we have shut down.</div><div class='add'>+		 */</div><div class='add'>+		list_for_each(entry, &amp;cleanlist) {</div><div class='add'>+			hfa384x_usbctlx_t	*ctlx;</div><div class='add'>+</div><div class='add'>+			ctlx = list_entry(entry, hfa384x_usbctlx_t, list);</div><div class='add'>+			complete(&amp;ctlx-&gt;done);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Give any outstanding synchronous commands</div><div class='add'>+		 * a chance to complete. All they need to do</div><div class='add'>+		 * is "wake up", so that's easy.</div><div class='add'>+		 * (I'd like a better way to do this, really.)</div><div class='add'>+		 */</div><div class='add'>+		msleep(100);</div><div class='add'>+</div><div class='add'>+		/* Now delete the CTLXs, because no-one else can now. */</div><div class='add'>+		list_for_each_safe(entry, temp, &amp;cleanlist) {</div><div class='add'>+			hfa384x_usbctlx_t *ctlx;</div><div class='add'>+</div><div class='add'>+			ctlx = list_entry(entry, hfa384x_usbctlx_t, list);</div><div class='add'>+			kfree(ctlx);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Unhook the wlandev */</div><div class='add'>+		unregister_wlandev(wlandev);</div><div class='add'>+		wlan_unsetup(wlandev);</div><div class='add'>+</div><div class='add'>+#ifndef NEW_MODULE_CODE</div><div class='add'>+		usb_dec_dev_use(hw-&gt;usb);</div><div class='add'>+#endif</div><div class='add'>+#if (LINUX_VERSION_CODE &gt;= KERNEL_VERSION(2,6,15))</div><div class='add'>+		usb_put_dev(hw-&gt;usb);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+		hfa384x_destroy(hw);</div><div class='add'>+		kfree(hw);</div><div class='add'>+</div><div class='add'>+		kfree(wlandev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+ exit:</div><div class='add'>+</div><div class='add'>+#if (LINUX_VERSION_CODE &gt;= KERNEL_VERSION(2,5,0))</div><div class='add'>+	usb_set_intfdata(interface, NULL);</div><div class='add'>+#endif</div><div class='add'>+	DBFEXIT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static struct usb_driver prism2_usb_driver = {</div><div class='add'>+#if (LINUX_VERSION_CODE &gt; KERNEL_VERSION(2,4,19)) &amp;&amp; (LINUX_VERSION_CODE &lt; KERNEL_VERSION(2,6,16))</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+#endif</div><div class='add'>+	.name = "prism2_usb",</div><div class='add'>+	.probe = prism2sta_probe_usb,</div><div class='add'>+	.disconnect = prism2sta_disconnect_usb,</div><div class='add'>+	.id_table = usb_prism_tbl,</div><div class='add'>+	/* fops, minor? */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#ifdef MODULE</div><div class='add'>+</div><div class='add'>+static int __init prism2usb_init(void)</div><div class='add'>+{</div><div class='add'>+        DBFENTER;</div><div class='add'>+</div><div class='add'>+        WLAN_LOG_NOTICE("%s Loaded\n", version);</div><div class='add'>+        WLAN_LOG_NOTICE("dev_info is: %s\n", dev_info);</div><div class='add'>+</div><div class='add'>+	/* This call will result in calls to prism2sta_probe_usb. */</div><div class='add'>+	return usb_register(&amp;prism2_usb_driver);</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __exit prism2usb_cleanup(void)</div><div class='add'>+{</div><div class='add'>+        DBFENTER;</div><div class='add'>+</div><div class='add'>+	usb_deregister(&amp;prism2_usb_driver);</div><div class='add'>+</div><div class='add'>+        printk(KERN_NOTICE "%s Unloaded\n", version);</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_init(prism2usb_init);</div><div class='add'>+module_exit(prism2usb_cleanup);</div><div class='add'>+</div><div class='add'>+#endif // module</div><div class='head'>diff --git a/drivers/staging/wlan-ng/prism2mgmt.c b/drivers/staging/wlan-ng/prism2mgmt.c<br/>new file mode 100644<br/>index 000000000000..c975025b6ae0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/wlan-ng/prism2mgmt.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/wlan-ng/prism2mgmt.c</a></div><div class='hunk'>@@ -0,0 +1,2956 @@</div><div class='add'>+/* src/prism2/driver/prism2mgmt.c</div><div class='add'>+*</div><div class='add'>+* Management request handler functions.</div><div class='add'>+*</div><div class='add'>+* Copyright (C) 1999 AbsoluteValue Systems, Inc.  All Rights Reserved.</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* linux-wlan</div><div class='add'>+*</div><div class='add'>+*   The contents of this file are subject to the Mozilla Public</div><div class='add'>+*   License Version 1.1 (the "License"); you may not use this file</div><div class='add'>+*   except in compliance with the License. You may obtain a copy of</div><div class='add'>+*   the License at http://www.mozilla.org/MPL/</div><div class='add'>+*</div><div class='add'>+*   Software distributed under the License is distributed on an "AS</div><div class='add'>+*   IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or</div><div class='add'>+*   implied. See the License for the specific language governing</div><div class='add'>+*   rights and limitations under the License.</div><div class='add'>+*</div><div class='add'>+*   Alternatively, the contents of this file may be used under the</div><div class='add'>+*   terms of the GNU Public License version 2 (the "GPL"), in which</div><div class='add'>+*   case the provisions of the GPL are applicable instead of the</div><div class='add'>+*   above.  If you wish to allow the use of your version of this file</div><div class='add'>+*   only under the terms of the GPL and not to allow others to use</div><div class='add'>+*   your version of this file under the MPL, indicate your decision</div><div class='add'>+*   by deleting the provisions above and replace them with the notice</div><div class='add'>+*   and other provisions required by the GPL.  If you do not delete</div><div class='add'>+*   the provisions above, a recipient may use your version of this</div><div class='add'>+*   file under either the MPL or the GPL.</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* Inquiries regarding the linux-wlan Open Source project can be</div><div class='add'>+* made directly to:</div><div class='add'>+*</div><div class='add'>+* AbsoluteValue Systems Inc.</div><div class='add'>+* info@linux-wlan.com</div><div class='add'>+* http://www.linux-wlan.com</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* Portions of the development of this software were funded by</div><div class='add'>+* Intersil Corporation as part of PRISM(R) chipset product development.</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* The functions in this file handle management requests sent from</div><div class='add'>+* user mode.</div><div class='add'>+*</div><div class='add'>+* Most of these functions have two separate blocks of code that are</div><div class='add'>+* conditional on whether this is a station or an AP.  This is used</div><div class='add'>+* to separate out the STA and AP responses to these management primitives.</div><div class='add'>+* It's a choice (good, bad, indifferent?) to have the code in the same</div><div class='add'>+* place so it's clear that the same primitive is implemented in both</div><div class='add'>+* cases but has different behavior.</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* System Includes */</div><div class='add'>+#define WLAN_DBVAR	prism2_debug</div><div class='add'>+</div><div class='add'>+#include "version.h"</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#include &lt;linux/version.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/if_arp.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/wait.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/wireless.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/byteorder.h&gt;</div><div class='add'>+#include &lt;linux/random.h&gt;</div><div class='add'>+</div><div class='add'>+#if (WLAN_HOSTIF == WLAN_USB)</div><div class='add'>+#include &lt;linux/usb.h&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if (WLAN_HOSTIF == WLAN_PCMCIA)</div><div class='add'>+#include &lt;pcmcia/version.h&gt;</div><div class='add'>+#include &lt;pcmcia/cs_types.h&gt;</div><div class='add'>+#include &lt;pcmcia/cs.h&gt;</div><div class='add'>+#include &lt;pcmcia/cistpl.h&gt;</div><div class='add'>+#include &lt;pcmcia/ds.h&gt;</div><div class='add'>+#include &lt;pcmcia/cisreg.h&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#include "wlan_compat.h"</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Project Includes */</div><div class='add'>+</div><div class='add'>+#include "p80211types.h"</div><div class='add'>+#include "p80211hdr.h"</div><div class='add'>+#include "p80211mgmt.h"</div><div class='add'>+#include "p80211conv.h"</div><div class='add'>+#include "p80211msg.h"</div><div class='add'>+#include "p80211netdev.h"</div><div class='add'>+#include "p80211metadef.h"</div><div class='add'>+#include "p80211metastruct.h"</div><div class='add'>+#include "hfa384x.h"</div><div class='add'>+#include "prism2mgmt.h"</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Local Constants */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Local Macros */</div><div class='add'>+</div><div class='add'>+/* Converts 802.11 format rate specifications to prism2 */</div><div class='add'>+#define p80211rate_to_p2bit(n)	((((n)&amp;~BIT7) == 2) ? BIT0 : \</div><div class='add'>+				 (((n)&amp;~BIT7) == 4) ? BIT1 : \</div><div class='add'>+				 (((n)&amp;~BIT7) == 11) ? BIT2 : \</div><div class='add'>+				 (((n)&amp;~BIT7) == 22) ? BIT3 : 0)</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Local Types */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Local Static Definitions */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Local Function Declarations */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Function Definitions */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2mgmt_powermgmt</div><div class='add'>+*</div><div class='add'>+* Set the power management state of this station's MAC.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		wlan device structure</div><div class='add'>+*	msgp		ptr to msg buffer</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0	success and done</div><div class='add'>+*	&lt;0	success, but we're waiting for something to finish.</div><div class='add'>+*	&gt;0	an error occurred while handling the message.</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread  (usually)</div><div class='add'>+*	interrupt</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int prism2mgmt_powermgmt(wlandevice_t *wlandev, void *msgp)</div><div class='add'>+{</div><div class='add'>+	int 			result = 0;</div><div class='add'>+	hfa384x_t		*hw = wlandev-&gt;priv;</div><div class='add'>+	p80211msg_dot11req_powermgmt_t	*msg = msgp;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	if (!hw-&gt;ap) {</div><div class='add'>+</div><div class='add'>+		/*** STATION ***/</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Set CNFPMENABLED (on or off)</div><div class='add'>+		 * Set CNFMULTICASTRX (if PM on, otherwise clear)</div><div class='add'>+		 * Spout a notice stating that SleepDuration and</div><div class='add'>+		 * HoldoverDuration and PMEPS also have an impact.</div><div class='add'>+		 */</div><div class='add'>+		/* Powermgmt is currently unsupported for STA */</div><div class='add'>+		msg-&gt;resultcode.status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+		msg-&gt;resultcode.data = P80211ENUM_resultcode_not_supported;</div><div class='add'>+	} else {</div><div class='add'>+</div><div class='add'>+		/*** ACCESS POINT ***/</div><div class='add'>+</div><div class='add'>+		/* Powermgmt is never supported for AP */</div><div class='add'>+		msg-&gt;resultcode.status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+		msg-&gt;resultcode.data = P80211ENUM_resultcode_not_supported;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2mgmt_scan</div><div class='add'>+*</div><div class='add'>+* Initiate a scan for BSSs.</div><div class='add'>+*</div><div class='add'>+* This function corresponds to MLME-scan.request and part of</div><div class='add'>+* MLME-scan.confirm.  As far as I can tell in the standard, there</div><div class='add'>+* are no restrictions on when a scan.request may be issued.  We have</div><div class='add'>+* to handle in whatever state the driver/MAC happen to be.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		wlan device structure</div><div class='add'>+*	msgp		ptr to msg buffer</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0	success and done</div><div class='add'>+*	&lt;0	success, but we're waiting for something to finish.</div><div class='add'>+*	&gt;0	an error occurred while handling the message.</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread  (usually)</div><div class='add'>+*	interrupt</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int prism2mgmt_scan(wlandevice_t *wlandev, void *msgp)</div><div class='add'>+{</div><div class='add'>+	int 			result = 0;</div><div class='add'>+	hfa384x_t		*hw = wlandev-&gt;priv;</div><div class='add'>+	p80211msg_dot11req_scan_t	*msg = msgp;</div><div class='add'>+        UINT16                  roamingmode, word;</div><div class='add'>+	int                     i, timeout;</div><div class='add'>+	int                     istmpenable = 0;</div><div class='add'>+</div><div class='add'>+        hfa384x_HostScanRequest_data_t  scanreq;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+        if (hw-&gt;ap) {</div><div class='add'>+                WLAN_LOG_ERROR("Prism2 in AP mode cannot perform scans.\n");</div><div class='add'>+                result = 1;</div><div class='add'>+                msg-&gt;resultcode.data = P80211ENUM_resultcode_not_supported;</div><div class='add'>+                goto exit;</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+        /* gatekeeper check */</div><div class='add'>+        if (HFA384x_FIRMWARE_VERSION(hw-&gt;ident_sta_fw.major,</div><div class='add'>+                                     hw-&gt;ident_sta_fw.minor,</div><div class='add'>+                                     hw-&gt;ident_sta_fw.variant) &lt;</div><div class='add'>+            HFA384x_FIRMWARE_VERSION(1,3,2)) {</div><div class='add'>+		WLAN_LOG_ERROR("HostScan not supported with current firmware (&lt;1.3.2).\n");</div><div class='add'>+                result = 1;</div><div class='add'>+                msg-&gt;resultcode.data = P80211ENUM_resultcode_not_supported;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+        memset(&amp;scanreq, 0, sizeof(scanreq));</div><div class='add'>+</div><div class='add'>+        /* save current roaming mode */</div><div class='add'>+        result = hfa384x_drvr_getconfig16(hw,</div><div class='add'>+                        HFA384x_RID_CNFROAMINGMODE, &amp;roamingmode);</div><div class='add'>+        if ( result ) {</div><div class='add'>+                WLAN_LOG_ERROR("getconfig(ROAMMODE) failed. result=%d\n",</div><div class='add'>+                                result);</div><div class='add'>+                msg-&gt;resultcode.data =</div><div class='add'>+                        P80211ENUM_resultcode_implementation_failure;</div><div class='add'>+                goto exit;</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+        /* drop into mode 3 for the scan */</div><div class='add'>+        result = hfa384x_drvr_setconfig16(hw,</div><div class='add'>+                        HFA384x_RID_CNFROAMINGMODE,</div><div class='add'>+			HFA384x_ROAMMODE_HOSTSCAN_HOSTROAM);</div><div class='add'>+        if ( result ) {</div><div class='add'>+                WLAN_LOG_ERROR("setconfig(ROAMINGMODE) failed. result=%d\n",</div><div class='add'>+                                result);</div><div class='add'>+                msg-&gt;resultcode.data =</div><div class='add'>+                        P80211ENUM_resultcode_implementation_failure;</div><div class='add'>+                goto exit;</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+        /* active or passive? */</div><div class='add'>+        if (HFA384x_FIRMWARE_VERSION(hw-&gt;ident_sta_fw.major,</div><div class='add'>+                                     hw-&gt;ident_sta_fw.minor,</div><div class='add'>+                                     hw-&gt;ident_sta_fw.variant) &gt;</div><div class='add'>+            HFA384x_FIRMWARE_VERSION(1,5,0)) {</div><div class='add'>+                if (msg-&gt;scantype.data != P80211ENUM_scantype_active) {</div><div class='add'>+                        word = host2hfa384x_16(msg-&gt;maxchanneltime.data);</div><div class='add'>+                } else {</div><div class='add'>+                        word = 0;</div><div class='add'>+                }</div><div class='add'>+                result = hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFPASSIVESCANCTRL, word);</div><div class='add'>+                if ( result ) {</div><div class='add'>+                        WLAN_LOG_WARNING("Passive scan not supported with "</div><div class='add'>+					  "current firmware.  (&lt;1.5.1)\n");</div><div class='add'>+                }</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+	/* set up the txrate to be 2MBPS. Should be fastest basicrate... */</div><div class='add'>+	word = HFA384x_RATEBIT_2;</div><div class='add'>+	scanreq.txRate = host2hfa384x_16(word);</div><div class='add'>+</div><div class='add'>+        /* set up the channel list */</div><div class='add'>+        word = 0;</div><div class='add'>+        for (i = 0; i &lt; msg-&gt;channellist.data.len; i++) {</div><div class='add'>+                UINT8 channel = msg-&gt;channellist.data.data[i];</div><div class='add'>+                if (channel &gt; 14) continue;</div><div class='add'>+                /* channel 1 is BIT0 ... channel 14 is BIT13 */</div><div class='add'>+                word |= (1 &lt;&lt; (channel-1));</div><div class='add'>+        }</div><div class='add'>+        scanreq.channelList = host2hfa384x_16(word);</div><div class='add'>+</div><div class='add'>+        /* set up the ssid, if present. */</div><div class='add'>+        scanreq.ssid.len = host2hfa384x_16(msg-&gt;ssid.data.len);</div><div class='add'>+        memcpy(scanreq.ssid.data, msg-&gt;ssid.data.data, msg-&gt;ssid.data.len);</div><div class='add'>+</div><div class='add'>+	/* Enable the MAC port if it's not already enabled  */</div><div class='add'>+	result = hfa384x_drvr_getconfig16(hw, HFA384x_RID_PORTSTATUS, &amp;word);</div><div class='add'>+	if ( result ) {</div><div class='add'>+		WLAN_LOG_ERROR("getconfig(PORTSTATUS) failed. "</div><div class='add'>+				"result=%d\n", result);</div><div class='add'>+		msg-&gt;resultcode.data =</div><div class='add'>+			P80211ENUM_resultcode_implementation_failure;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+	if (word == HFA384x_PORTSTATUS_DISABLED) {</div><div class='add'>+		UINT16 wordbuf[17];</div><div class='add'>+</div><div class='add'>+		result = hfa384x_drvr_setconfig16(hw,</div><div class='add'>+			HFA384x_RID_CNFROAMINGMODE,</div><div class='add'>+			HFA384x_ROAMMODE_HOSTSCAN_HOSTROAM);</div><div class='add'>+		if ( result ) {</div><div class='add'>+			WLAN_LOG_ERROR("setconfig(ROAMINGMODE) failed. result=%d\n", result);</div><div class='add'>+			msg-&gt;resultcode.data =</div><div class='add'>+				P80211ENUM_resultcode_implementation_failure;</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+		/* Construct a bogus SSID and assign it to OwnSSID and</div><div class='add'>+		 * DesiredSSID</div><div class='add'>+		 */</div><div class='add'>+		wordbuf[0] = host2hfa384x_16(WLAN_SSID_MAXLEN);</div><div class='add'>+		get_random_bytes(&amp;wordbuf[1], WLAN_SSID_MAXLEN);</div><div class='add'>+		result = hfa384x_drvr_setconfig( hw, HFA384x_RID_CNFOWNSSID,</div><div class='add'>+				wordbuf, HFA384x_RID_CNFOWNSSID_LEN);</div><div class='add'>+		if ( result ) {</div><div class='add'>+			WLAN_LOG_ERROR("Failed to set OwnSSID.\n");</div><div class='add'>+			msg-&gt;resultcode.data =</div><div class='add'>+				P80211ENUM_resultcode_implementation_failure;</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+		result = hfa384x_drvr_setconfig( hw, HFA384x_RID_CNFDESIREDSSID,</div><div class='add'>+				wordbuf, HFA384x_RID_CNFDESIREDSSID_LEN);</div><div class='add'>+		if ( result ) {</div><div class='add'>+			WLAN_LOG_ERROR("Failed to set DesiredSSID.\n");</div><div class='add'>+			msg-&gt;resultcode.data =</div><div class='add'>+				P80211ENUM_resultcode_implementation_failure;</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+		/* bsstype */</div><div class='add'>+		result = hfa384x_drvr_setconfig16(hw,</div><div class='add'>+				HFA384x_RID_CNFPORTTYPE,</div><div class='add'>+				HFA384x_PORTTYPE_IBSS);</div><div class='add'>+		if ( result ) {</div><div class='add'>+			WLAN_LOG_ERROR("Failed to set CNFPORTTYPE.\n");</div><div class='add'>+			msg-&gt;resultcode.data =</div><div class='add'>+				P80211ENUM_resultcode_implementation_failure;</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+		/* ibss options */</div><div class='add'>+		result = hfa384x_drvr_setconfig16(hw,</div><div class='add'>+				HFA384x_RID_CREATEIBSS,</div><div class='add'>+				HFA384x_CREATEIBSS_JOINCREATEIBSS);</div><div class='add'>+		if ( result ) {</div><div class='add'>+			WLAN_LOG_ERROR("Failed to set CREATEIBSS.\n");</div><div class='add'>+			msg-&gt;resultcode.data =</div><div class='add'>+				P80211ENUM_resultcode_implementation_failure;</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+		result = hfa384x_drvr_enable(hw, 0);</div><div class='add'>+		if ( result ) {</div><div class='add'>+			WLAN_LOG_ERROR("drvr_enable(0) failed. "</div><div class='add'>+					"result=%d\n", result);</div><div class='add'>+			msg-&gt;resultcode.data =</div><div class='add'>+			P80211ENUM_resultcode_implementation_failure;</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+		istmpenable = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+        /* Figure out our timeout first Kus, then HZ */</div><div class='add'>+        timeout = msg-&gt;channellist.data.len * msg-&gt;maxchanneltime.data;</div><div class='add'>+	timeout = (timeout * HZ)/1000;</div><div class='add'>+</div><div class='add'>+        /* Issue the scan request */</div><div class='add'>+        hw-&gt;scanflag = 0;</div><div class='add'>+</div><div class='add'>+	WLAN_HEX_DUMP(5,"hscanreq", &amp;scanreq, sizeof(scanreq));</div><div class='add'>+</div><div class='add'>+        result = hfa384x_drvr_setconfig( hw,</div><div class='add'>+                        HFA384x_RID_HOSTSCAN, &amp;scanreq,</div><div class='add'>+                        sizeof(hfa384x_HostScanRequest_data_t));</div><div class='add'>+        if ( result ) {</div><div class='add'>+                WLAN_LOG_ERROR("setconfig(SCANREQUEST) failed. result=%d\n",</div><div class='add'>+                                result);</div><div class='add'>+                msg-&gt;resultcode.data =</div><div class='add'>+                        P80211ENUM_resultcode_implementation_failure;</div><div class='add'>+                goto exit;</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+        /* sleep until info frame arrives */</div><div class='add'>+        wait_event_interruptible_timeout(hw-&gt;cmdq, hw-&gt;scanflag, timeout);</div><div class='add'>+</div><div class='add'>+	msg-&gt;numbss.status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+	if (hw-&gt;scanflag == -1)</div><div class='add'>+		hw-&gt;scanflag = 0;</div><div class='add'>+</div><div class='add'>+	msg-&gt;numbss.data = hw-&gt;scanflag;</div><div class='add'>+</div><div class='add'>+        hw-&gt;scanflag = 0;</div><div class='add'>+</div><div class='add'>+	/* Disable port if we temporarily enabled it. */</div><div class='add'>+	if (istmpenable) {</div><div class='add'>+		result = hfa384x_drvr_disable(hw, 0);</div><div class='add'>+		if ( result ) {</div><div class='add'>+			WLAN_LOG_ERROR("drvr_disable(0) failed. "</div><div class='add'>+					"result=%d\n", result);</div><div class='add'>+			msg-&gt;resultcode.data =</div><div class='add'>+			P80211ENUM_resultcode_implementation_failure;</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* restore original roaming mode */</div><div class='add'>+	result = hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFROAMINGMODE,</div><div class='add'>+					  roamingmode);</div><div class='add'>+        if ( result ) {</div><div class='add'>+                WLAN_LOG_ERROR("setconfig(ROAMMODE) failed. result=%d\n",</div><div class='add'>+                                result);</div><div class='add'>+                msg-&gt;resultcode.data =</div><div class='add'>+                        P80211ENUM_resultcode_implementation_failure;</div><div class='add'>+                goto exit;</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+        result = 0;</div><div class='add'>+        msg-&gt;resultcode.data = P80211ENUM_resultcode_success;</div><div class='add'>+</div><div class='add'>+ exit:</div><div class='add'>+	msg-&gt;resultcode.status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2mgmt_scan_results</div><div class='add'>+*</div><div class='add'>+* Retrieve the BSS description for one of the BSSs identified in</div><div class='add'>+* a scan.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		wlan device structure</div><div class='add'>+*	msgp		ptr to msg buffer</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0	success and done</div><div class='add'>+*	&lt;0	success, but we're waiting for something to finish.</div><div class='add'>+*	&gt;0	an error occurred while handling the message.</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread  (usually)</div><div class='add'>+*	interrupt</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int prism2mgmt_scan_results(wlandevice_t *wlandev, void *msgp)</div><div class='add'>+{</div><div class='add'>+	int 			result = 0;</div><div class='add'>+        p80211msg_dot11req_scan_results_t       *req;</div><div class='add'>+	hfa384x_t		*hw = wlandev-&gt;priv;</div><div class='add'>+	hfa384x_HScanResultSub_t *item = NULL;</div><div class='add'>+</div><div class='add'>+	int count;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+        req = (p80211msg_dot11req_scan_results_t *) msgp;</div><div class='add'>+</div><div class='add'>+	req-&gt;resultcode.status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+</div><div class='add'>+	if (hw-&gt;ap) {</div><div class='add'>+		result = 1;</div><div class='add'>+		req-&gt;resultcode.data = P80211ENUM_resultcode_not_supported;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (! hw-&gt;scanresults) {</div><div class='add'>+		WLAN_LOG_ERROR("dot11req_scan_results can only be used after a successful dot11req_scan.\n");</div><div class='add'>+		result = 2;</div><div class='add'>+		req-&gt;resultcode.data = P80211ENUM_resultcode_invalid_parameters;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+        count = (hw-&gt;scanresults-&gt;framelen - 3) / 32;</div><div class='add'>+	if (count &gt; 32)  count = 32;</div><div class='add'>+</div><div class='add'>+	if (req-&gt;bssindex.data &gt;= count) {</div><div class='add'>+		WLAN_LOG_DEBUG(0, "requested index (%d) out of range (%d)\n",</div><div class='add'>+				req-&gt;bssindex.data, count);</div><div class='add'>+		result = 2;</div><div class='add'>+		req-&gt;resultcode.data = P80211ENUM_resultcode_invalid_parameters;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	item = &amp;(hw-&gt;scanresults-&gt;info.hscanresult.result[req-&gt;bssindex.data]);</div><div class='add'>+	/* signal and noise */</div><div class='add'>+	req-&gt;signal.status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+	req-&gt;noise.status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+	req-&gt;signal.data = hfa384x2host_16(item-&gt;sl);</div><div class='add'>+	req-&gt;noise.data = hfa384x2host_16(item-&gt;anl);</div><div class='add'>+</div><div class='add'>+	/* BSSID */</div><div class='add'>+	req-&gt;bssid.status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+	req-&gt;bssid.data.len = WLAN_BSSID_LEN;</div><div class='add'>+	memcpy(req-&gt;bssid.data.data, item-&gt;bssid, WLAN_BSSID_LEN);</div><div class='add'>+</div><div class='add'>+	/* SSID */</div><div class='add'>+	req-&gt;ssid.status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+	req-&gt;ssid.data.len = hfa384x2host_16(item-&gt;ssid.len);</div><div class='add'>+	memcpy(req-&gt;ssid.data.data, item-&gt;ssid.data, req-&gt;ssid.data.len);</div><div class='add'>+</div><div class='add'>+	/* supported rates */</div><div class='add'>+        for (count = 0; count &lt; 10 ; count++)</div><div class='add'>+                if (item-&gt;supprates[count] == 0)</div><div class='add'>+                        break;</div><div class='add'>+</div><div class='add'>+#define REQBASICRATE(N) \</div><div class='add'>+	if ((count &gt;= N) &amp;&amp; DOT11_RATE5_ISBASIC_GET(item-&gt;supprates[(N)-1])) { \</div><div class='add'>+		req-&gt;basicrate ## N .data = item-&gt;supprates[(N)-1]; \</div><div class='add'>+		req-&gt;basicrate ## N .status = P80211ENUM_msgitem_status_data_ok; \</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	REQBASICRATE(1);</div><div class='add'>+	REQBASICRATE(2);</div><div class='add'>+	REQBASICRATE(3);</div><div class='add'>+	REQBASICRATE(4);</div><div class='add'>+	REQBASICRATE(5);</div><div class='add'>+	REQBASICRATE(6);</div><div class='add'>+	REQBASICRATE(7);</div><div class='add'>+	REQBASICRATE(8);</div><div class='add'>+</div><div class='add'>+#define REQSUPPRATE(N) \</div><div class='add'>+	if (count &gt;= N) { \</div><div class='add'>+		req-&gt;supprate ## N .data = item-&gt;supprates[(N)-1]; \</div><div class='add'>+		req-&gt;supprate ## N .status = P80211ENUM_msgitem_status_data_ok; \</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	REQSUPPRATE(1);</div><div class='add'>+	REQSUPPRATE(2);</div><div class='add'>+	REQSUPPRATE(3);</div><div class='add'>+	REQSUPPRATE(4);</div><div class='add'>+	REQSUPPRATE(5);</div><div class='add'>+	REQSUPPRATE(6);</div><div class='add'>+	REQSUPPRATE(7);</div><div class='add'>+	REQSUPPRATE(8);</div><div class='add'>+</div><div class='add'>+	/* beacon period */</div><div class='add'>+	req-&gt;beaconperiod.status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+	req-&gt;beaconperiod.data = hfa384x2host_16(item-&gt;bcnint);</div><div class='add'>+</div><div class='add'>+	/* timestamps */</div><div class='add'>+	req-&gt;timestamp.status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+	req-&gt;timestamp.data = jiffies;</div><div class='add'>+	req-&gt;localtime.status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+	req-&gt;localtime.data = jiffies;</div><div class='add'>+</div><div class='add'>+	/* atim window */</div><div class='add'>+	req-&gt;ibssatimwindow.status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+	req-&gt;ibssatimwindow.data = hfa384x2host_16(item-&gt;atim);</div><div class='add'>+</div><div class='add'>+	/* Channel */</div><div class='add'>+	req-&gt;dschannel.status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+	req-&gt;dschannel.data = hfa384x2host_16(item-&gt;chid);</div><div class='add'>+</div><div class='add'>+	/* capinfo bits */</div><div class='add'>+	count = hfa384x2host_16(item-&gt;capinfo);</div><div class='add'>+</div><div class='add'>+	/* privacy flag */</div><div class='add'>+	req-&gt;privacy.status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+	req-&gt;privacy.data = WLAN_GET_MGMT_CAP_INFO_PRIVACY(count);</div><div class='add'>+</div><div class='add'>+	/* cfpollable */</div><div class='add'>+	req-&gt;cfpollable.status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+	req-&gt;cfpollable.data = WLAN_GET_MGMT_CAP_INFO_CFPOLLABLE(count);</div><div class='add'>+</div><div class='add'>+	/* cfpollreq */</div><div class='add'>+	req-&gt;cfpollreq.status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+	req-&gt;cfpollreq.data = WLAN_GET_MGMT_CAP_INFO_CFPOLLREQ(count);</div><div class='add'>+</div><div class='add'>+	/* bsstype */</div><div class='add'>+	req-&gt;bsstype.status =  P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+	req-&gt;bsstype.data = (WLAN_GET_MGMT_CAP_INFO_ESS(count)) ?</div><div class='add'>+		P80211ENUM_bsstype_infrastructure :</div><div class='add'>+		P80211ENUM_bsstype_independent;</div><div class='add'>+</div><div class='add'>+	// item-&gt;proberesp_rate</div><div class='add'>+/*</div><div class='add'>+	req-&gt;fhdwelltime</div><div class='add'>+	req-&gt;fhhopset</div><div class='add'>+	req-&gt;fhhoppattern</div><div class='add'>+	req-&gt;fhhopindex</div><div class='add'>+        req-&gt;cfpdurremaining</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+	result = 0;</div><div class='add'>+	req-&gt;resultcode.data = P80211ENUM_resultcode_success;</div><div class='add'>+</div><div class='add'>+ exit:</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2mgmt_join</div><div class='add'>+*</div><div class='add'>+* Join a BSS whose BSS description was previously obtained with</div><div class='add'>+* a scan.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		wlan device structure</div><div class='add'>+*	msgp		ptr to msg buffer</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0	success and done</div><div class='add'>+*	&lt;0	success, but we're waiting for something to finish.</div><div class='add'>+*	&gt;0	an error occurred while handling the message.</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread  (usually)</div><div class='add'>+*	interrupt</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int prism2mgmt_join(wlandevice_t *wlandev, void *msgp)</div><div class='add'>+{</div><div class='add'>+	int 			result = 0;</div><div class='add'>+	hfa384x_t		*hw = wlandev-&gt;priv;</div><div class='add'>+	p80211msg_dot11req_join_t	*msg = msgp;</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	if (!hw-&gt;ap) {</div><div class='add'>+</div><div class='add'>+		/*** STATION ***/</div><div class='add'>+</div><div class='add'>+		/* TODO: Implement after scan */</div><div class='add'>+		msg-&gt;resultcode.status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+		msg-&gt;resultcode.data = P80211ENUM_resultcode_not_supported;</div><div class='add'>+	} else {</div><div class='add'>+</div><div class='add'>+		/*** ACCESS POINT ***/</div><div class='add'>+</div><div class='add'>+		/* Never supported by APs */</div><div class='add'>+		msg-&gt;resultcode.status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+		msg-&gt;resultcode.data = P80211ENUM_resultcode_not_supported;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2mgmt_p2_join</div><div class='add'>+*</div><div class='add'>+* Join a specific BSS</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		wlan device structure</div><div class='add'>+*	msgp		ptr to msg buffer</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0	success and done</div><div class='add'>+*	&lt;0	success, but we're waiting for something to finish.</div><div class='add'>+*	&gt;0	an error occurred while handling the message.</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread  (usually)</div><div class='add'>+*	interrupt</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int prism2mgmt_p2_join(wlandevice_t *wlandev, void *msgp)</div><div class='add'>+{</div><div class='add'>+	int 			result = 0;</div><div class='add'>+	hfa384x_t		*hw = wlandev-&gt;priv;</div><div class='add'>+	p80211msg_p2req_join_t	*msg = msgp;</div><div class='add'>+	UINT16			reg;</div><div class='add'>+	p80211pstrd_t		*pstr;</div><div class='add'>+	UINT8			bytebuf[256];</div><div class='add'>+	hfa384x_bytestr_t	*p2bytestr = (hfa384x_bytestr_t*)bytebuf;</div><div class='add'>+        hfa384x_JoinRequest_data_t	joinreq;</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	if (!hw-&gt;ap) {</div><div class='add'>+</div><div class='add'>+		wlandev-&gt;macmode = WLAN_MACMODE_NONE;</div><div class='add'>+</div><div class='add'>+		/*** STATION ***/</div><div class='add'>+		/* Set the PortType */</div><div class='add'>+		msg-&gt;resultcode.status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+		msg-&gt;resultcode.data = P80211ENUM_resultcode_success;</div><div class='add'>+</div><div class='add'>+		/* ess port */</div><div class='add'>+		result = hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFPORTTYPE, 1);</div><div class='add'>+		if ( result ) {</div><div class='add'>+			WLAN_LOG_ERROR("Failed to set Port Type\n");</div><div class='add'>+			goto failed;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Set the auth type */</div><div class='add'>+		if ( msg-&gt;authtype.data == P80211ENUM_authalg_sharedkey ) {</div><div class='add'>+			reg = HFA384x_CNFAUTHENTICATION_SHAREDKEY;</div><div class='add'>+		} else {</div><div class='add'>+			reg = HFA384x_CNFAUTHENTICATION_OPENSYSTEM;</div><div class='add'>+		}</div><div class='add'>+		result = hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFAUTHENTICATION, reg);</div><div class='add'>+		if ( result ) {</div><div class='add'>+			WLAN_LOG_ERROR("Failed to set Authentication\n");</div><div class='add'>+			goto failed;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Turn off all roaming */</div><div class='add'>+		hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFROAMINGMODE, 3);</div><div class='add'>+		if ( result ) {</div><div class='add'>+			WLAN_LOG_ERROR("Failed to Turn off Roaming\n");</div><div class='add'>+			goto failed;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Basic rates */</div><div class='add'>+                reg = 0;</div><div class='add'>+		if ( msg-&gt;basicrate1.status == P80211ENUM_msgitem_status_data_ok ) {</div><div class='add'>+			reg = p80211rate_to_p2bit(msg-&gt;basicrate1.data);</div><div class='add'>+		}</div><div class='add'>+		if ( msg-&gt;basicrate2.status == P80211ENUM_msgitem_status_data_ok ) {</div><div class='add'>+			reg |= p80211rate_to_p2bit(msg-&gt;basicrate2.data);</div><div class='add'>+		}</div><div class='add'>+		if ( msg-&gt;basicrate3.status == P80211ENUM_msgitem_status_data_ok ) {</div><div class='add'>+			reg |= p80211rate_to_p2bit(msg-&gt;basicrate3.data);</div><div class='add'>+		}</div><div class='add'>+		if ( msg-&gt;basicrate4.status == P80211ENUM_msgitem_status_data_ok ) {</div><div class='add'>+			reg |= p80211rate_to_p2bit(msg-&gt;basicrate4.data);</div><div class='add'>+		}</div><div class='add'>+		if ( msg-&gt;basicrate5.status == P80211ENUM_msgitem_status_data_ok ) {</div><div class='add'>+			reg |= p80211rate_to_p2bit(msg-&gt;basicrate5.data);</div><div class='add'>+		}</div><div class='add'>+		if ( msg-&gt;basicrate6.status == P80211ENUM_msgitem_status_data_ok ) {</div><div class='add'>+			reg |= p80211rate_to_p2bit(msg-&gt;basicrate6.data);</div><div class='add'>+		}</div><div class='add'>+		if ( msg-&gt;basicrate7.status == P80211ENUM_msgitem_status_data_ok ) {</div><div class='add'>+			reg |= p80211rate_to_p2bit(msg-&gt;basicrate7.data);</div><div class='add'>+		}</div><div class='add'>+		if ( msg-&gt;basicrate8.status == P80211ENUM_msgitem_status_data_ok ) {</div><div class='add'>+			reg |= p80211rate_to_p2bit(msg-&gt;basicrate8.data);</div><div class='add'>+		}</div><div class='add'>+		if( reg == 0)</div><div class='add'>+			 reg = 0x03;</div><div class='add'>+		result = hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFBASICRATES, reg);</div><div class='add'>+		if ( result ) {</div><div class='add'>+			WLAN_LOG_ERROR("Failed to set basicrates=%d.\n", reg);</div><div class='add'>+			goto failed;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Operational rates (supprates and txratecontrol) */</div><div class='add'>+		reg = 0;</div><div class='add'>+		if ( msg-&gt;operationalrate1.status == P80211ENUM_msgitem_status_data_ok ) {</div><div class='add'>+			reg = p80211rate_to_p2bit(msg-&gt;operationalrate1.data);</div><div class='add'>+		}</div><div class='add'>+		if ( msg-&gt;operationalrate2.status == P80211ENUM_msgitem_status_data_ok ) {</div><div class='add'>+			reg |= p80211rate_to_p2bit(msg-&gt;operationalrate2.data);</div><div class='add'>+		}</div><div class='add'>+		if ( msg-&gt;operationalrate3.status == P80211ENUM_msgitem_status_data_ok ) {</div><div class='add'>+			reg |= p80211rate_to_p2bit(msg-&gt;operationalrate3.data);</div><div class='add'>+		}</div><div class='add'>+		if ( msg-&gt;operationalrate4.status == P80211ENUM_msgitem_status_data_ok ) {</div><div class='add'>+			reg |= p80211rate_to_p2bit(msg-&gt;operationalrate4.data);</div><div class='add'>+		}</div><div class='add'>+		if ( msg-&gt;operationalrate5.status == P80211ENUM_msgitem_status_data_ok ) {</div><div class='add'>+			reg |= p80211rate_to_p2bit(msg-&gt;operationalrate5.data);</div><div class='add'>+		}</div><div class='add'>+		if ( msg-&gt;operationalrate6.status == P80211ENUM_msgitem_status_data_ok ) {</div><div class='add'>+			reg |= p80211rate_to_p2bit(msg-&gt;operationalrate6.data);</div><div class='add'>+		}</div><div class='add'>+		if ( msg-&gt;operationalrate7.status == P80211ENUM_msgitem_status_data_ok ) {</div><div class='add'>+			reg |= p80211rate_to_p2bit(msg-&gt;operationalrate7.data);</div><div class='add'>+		}</div><div class='add'>+		if ( msg-&gt;operationalrate8.status == P80211ENUM_msgitem_status_data_ok ) {</div><div class='add'>+			reg |= p80211rate_to_p2bit(msg-&gt;operationalrate8.data);</div><div class='add'>+		}</div><div class='add'>+		if( reg == 0)</div><div class='add'>+			 reg = 0x0f;</div><div class='add'>+		result = hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFSUPPRATES, reg);</div><div class='add'>+		if ( result ) {</div><div class='add'>+			WLAN_LOG_ERROR("Failed to set supprates=%d.\n", reg);</div><div class='add'>+			goto failed;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+ 		result = hfa384x_drvr_setconfig16(hw, HFA384x_RID_TXRATECNTL, reg);</div><div class='add'>+		if ( result ) {</div><div class='add'>+			WLAN_LOG_ERROR("Failed to set txrates=%d.\n", reg);</div><div class='add'>+			goto failed;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Set the ssid */</div><div class='add'>+		memset(bytebuf, 0, 256);</div><div class='add'>+		pstr = (p80211pstrd_t*)&amp;(msg-&gt;ssid.data);</div><div class='add'>+		prism2mgmt_pstr2bytestr(p2bytestr, pstr);</div><div class='add'>+		result = hfa384x_drvr_setconfig(</div><div class='add'>+			hw, HFA384x_RID_CNFDESIREDSSID,</div><div class='add'>+			bytebuf, HFA384x_RID_CNFDESIREDSSID_LEN);</div><div class='add'>+		if ( result ) {</div><div class='add'>+			WLAN_LOG_ERROR("Failed to set SSID\n");</div><div class='add'>+			goto failed;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Enable the Port */</div><div class='add'>+		result = hfa384x_cmd_enable(hw, 0);</div><div class='add'>+		if ( result ) {</div><div class='add'>+			WLAN_LOG_ERROR("Enable macport failed, result=%d.\n", result);</div><div class='add'>+			goto failed;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Fill in the join request */</div><div class='add'>+		joinreq.channel = msg-&gt;channel.data;</div><div class='add'>+		memcpy( joinreq.bssid, ((unsigned char *) &amp;msg-&gt;bssid.data) + 1, WLAN_BSSID_LEN);</div><div class='add'>+		hw-&gt;joinreq = joinreq;</div><div class='add'>+		hw-&gt;join_ap = 1;</div><div class='add'>+</div><div class='add'>+		/* Send the join request */</div><div class='add'>+		result = hfa384x_drvr_setconfig( hw,</div><div class='add'>+			HFA384x_RID_JOINREQUEST,</div><div class='add'>+			&amp;joinreq, HFA384x_RID_JOINREQUEST_LEN);</div><div class='add'>+                if(result != 0) {</div><div class='add'>+			WLAN_LOG_ERROR("Join request failed, result=%d.\n", result);</div><div class='add'>+			goto failed;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	} else {</div><div class='add'>+</div><div class='add'>+		/*** ACCESS POINT ***/</div><div class='add'>+</div><div class='add'>+		/* Never supported by APs */</div><div class='add'>+		msg-&gt;resultcode.status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+		msg-&gt;resultcode.data = P80211ENUM_resultcode_not_supported;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+        goto done;</div><div class='add'>+failed:</div><div class='add'>+	WLAN_LOG_DEBUG(1, "Failed to set a config option, result=%d\n", result);</div><div class='add'>+	msg-&gt;resultcode.data = P80211ENUM_resultcode_invalid_parameters;</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+        result = 0;</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2mgmt_authenticate</div><div class='add'>+*</div><div class='add'>+* Station should be begin an authentication exchange.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		wlan device structure</div><div class='add'>+*	msgp		ptr to msg buffer</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0	success and done</div><div class='add'>+*	&lt;0	success, but we're waiting for something to finish.</div><div class='add'>+*	&gt;0	an error occurred while handling the message.</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread  (usually)</div><div class='add'>+*	interrupt</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int prism2mgmt_authenticate(wlandevice_t *wlandev, void *msgp)</div><div class='add'>+{</div><div class='add'>+	int 			result = 0;</div><div class='add'>+	hfa384x_t		*hw = wlandev-&gt;priv;</div><div class='add'>+	p80211msg_dot11req_authenticate_t	*msg = msgp;</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	if (!hw-&gt;ap) {</div><div class='add'>+</div><div class='add'>+		/*** STATION ***/</div><div class='add'>+</div><div class='add'>+		/* TODO: Decide how we're going to handle this one w/ Prism2 */</div><div class='add'>+		/*       It could be entertaining since Prism2 doesn't have  */</div><div class='add'>+		/*       an explicit way to control this */</div><div class='add'>+		msg-&gt;resultcode.status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+		msg-&gt;resultcode.data = P80211ENUM_resultcode_not_supported;</div><div class='add'>+	} else {</div><div class='add'>+</div><div class='add'>+		/*** ACCESS POINT ***/</div><div class='add'>+</div><div class='add'>+		/* Never supported by APs */</div><div class='add'>+		msg-&gt;resultcode.status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+		msg-&gt;resultcode.data = P80211ENUM_resultcode_not_supported;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2mgmt_deauthenticate</div><div class='add'>+*</div><div class='add'>+* Send a deauthenticate notification.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		wlan device structure</div><div class='add'>+*	msgp		ptr to msg buffer</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0	success and done</div><div class='add'>+*	&lt;0	success, but we're waiting for something to finish.</div><div class='add'>+*	&gt;0	an error occurred while handling the message.</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread  (usually)</div><div class='add'>+*	interrupt</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int prism2mgmt_deauthenticate(wlandevice_t *wlandev, void *msgp)</div><div class='add'>+{</div><div class='add'>+	int 			result = 0;</div><div class='add'>+	hfa384x_t		*hw = wlandev-&gt;priv;</div><div class='add'>+	p80211msg_dot11req_deauthenticate_t	*msg = msgp;</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	if (!hw-&gt;ap) {</div><div class='add'>+</div><div class='add'>+		/*** STATION ***/</div><div class='add'>+</div><div class='add'>+		/* TODO: Decide how we're going to handle this one w/ Prism2 */</div><div class='add'>+		/*       It could be entertaining since Prism2 doesn't have  */</div><div class='add'>+		/*       an explicit way to control this */</div><div class='add'>+		msg-&gt;resultcode.status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+		msg-&gt;resultcode.data = P80211ENUM_resultcode_not_supported;</div><div class='add'>+	} else {</div><div class='add'>+</div><div class='add'>+		/*** ACCESS POINT ***/</div><div class='add'>+		hfa384x_drvr_handover(hw, msg-&gt;peerstaaddress.data.data);</div><div class='add'>+		msg-&gt;resultcode.status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+		msg-&gt;resultcode.data = P80211ENUM_resultcode_success;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2mgmt_associate</div><div class='add'>+*</div><div class='add'>+* Associate with an ESS.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		wlan device structure</div><div class='add'>+*	msgp		ptr to msg buffer</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0	success and done</div><div class='add'>+*	&lt;0	success, but we're waiting for something to finish.</div><div class='add'>+*	&gt;0	an error occurred while handling the message.</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread  (usually)</div><div class='add'>+*	interrupt</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int prism2mgmt_associate(wlandevice_t *wlandev, void *msgp)</div><div class='add'>+{</div><div class='add'>+	hfa384x_t		*hw = wlandev-&gt;priv;</div><div class='add'>+	int 			result = 0;</div><div class='add'>+	p80211msg_dot11req_associate_t	*msg = msgp;</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	if (!hw-&gt;ap) {</div><div class='add'>+</div><div class='add'>+		/*** STATION ***/</div><div class='add'>+</div><div class='add'>+#if 0</div><div class='add'>+		/* Set the TxRates */</div><div class='add'>+		reg = 0x000f;</div><div class='add'>+		hfa384x_drvr_setconfig16(hw, HFA384x_RID_TXRATECNTL, reg);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+		/* Set the PortType */</div><div class='add'>+		/* ess port */</div><div class='add'>+		hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFPORTTYPE, 1);</div><div class='add'>+</div><div class='add'>+		/* Enable the Port */</div><div class='add'>+		hfa384x_drvr_enable(hw, 0);</div><div class='add'>+</div><div class='add'>+		/* Set the resultcode */</div><div class='add'>+		msg-&gt;resultcode.status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+		msg-&gt;resultcode.data = P80211ENUM_resultcode_success;</div><div class='add'>+</div><div class='add'>+	} else {</div><div class='add'>+</div><div class='add'>+		/*** ACCESS POINT ***/</div><div class='add'>+</div><div class='add'>+		/* Never supported on AP */</div><div class='add'>+		msg-&gt;resultcode.status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+		msg-&gt;resultcode.data = P80211ENUM_resultcode_not_supported;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2mgmt_reassociate</div><div class='add'>+*</div><div class='add'>+* Renew association because of a BSS change.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		wlan device structure</div><div class='add'>+*	msgp		ptr to msg buffer</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0	success and done</div><div class='add'>+*	&lt;0	success, but we're waiting for something to finish.</div><div class='add'>+*	&gt;0	an error occurred while handling the message.</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread  (usually)</div><div class='add'>+*	interrupt</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int prism2mgmt_reassociate(wlandevice_t *wlandev, void *msgp)</div><div class='add'>+{</div><div class='add'>+	int 			result = 0;</div><div class='add'>+	hfa384x_t		*hw = wlandev-&gt;priv;</div><div class='add'>+	p80211msg_dot11req_reassociate_t	*msg = msgp;</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	if (!hw-&gt;ap) {</div><div class='add'>+</div><div class='add'>+		/*** STATION ***/</div><div class='add'>+</div><div class='add'>+		/* TODO: Not supported yet...not sure how we're going to do it */</div><div class='add'>+		msg-&gt;resultcode.status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+		msg-&gt;resultcode.data = P80211ENUM_resultcode_not_supported;</div><div class='add'>+	} else {</div><div class='add'>+</div><div class='add'>+		/*** ACCESS POINT ***/</div><div class='add'>+</div><div class='add'>+		/* Never supported on AP */</div><div class='add'>+		msg-&gt;resultcode.status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+		msg-&gt;resultcode.data = P80211ENUM_resultcode_not_supported;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2mgmt_disassociate</div><div class='add'>+*</div><div class='add'>+* Send a disassociation notification.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		wlan device structure</div><div class='add'>+*	msgp		ptr to msg buffer</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0	success and done</div><div class='add'>+*	&lt;0	success, but we're waiting for something to finish.</div><div class='add'>+*	&gt;0	an error occurred while handling the message.</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread  (usually)</div><div class='add'>+*	interrupt</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int prism2mgmt_disassociate(wlandevice_t *wlandev, void *msgp)</div><div class='add'>+{</div><div class='add'>+	int 			result = 0;</div><div class='add'>+	hfa384x_t		*hw = wlandev-&gt;priv;</div><div class='add'>+	p80211msg_dot11req_disassociate_t	*msg = msgp;</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	if (!hw-&gt;ap) {</div><div class='add'>+</div><div class='add'>+		/*** STATION ***/</div><div class='add'>+</div><div class='add'>+		/* TODO: Not supported yet...not sure how to do it */</div><div class='add'>+		msg-&gt;resultcode.status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+		msg-&gt;resultcode.data = P80211ENUM_resultcode_not_supported;</div><div class='add'>+	} else {</div><div class='add'>+</div><div class='add'>+		/*** ACCESS POINT ***/</div><div class='add'>+		hfa384x_drvr_handover(hw, msg-&gt;peerstaaddress.data.data);</div><div class='add'>+		msg-&gt;resultcode.status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+		msg-&gt;resultcode.data = P80211ENUM_resultcode_success;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2mgmt_reset</div><div class='add'>+*</div><div class='add'>+* Reset the MAC and MSD.  The p80211 layer has it's own handling</div><div class='add'>+* that should be done before and after this function.</div><div class='add'>+* Procedure:</div><div class='add'>+*   - disable system interrupts ??</div><div class='add'>+*   - disable MAC interrupts</div><div class='add'>+*   - restore system interrupts</div><div class='add'>+*   - issue the MAC initialize command</div><div class='add'>+*   - clear any MSD level state (including timers, queued events,</div><div class='add'>+*     etc.).  Note that if we're removing timer'd/queue events, we may</div><div class='add'>+*     need to have remained in the system interrupt disabled state.</div><div class='add'>+*     We should be left in the same state that we're in following</div><div class='add'>+*     driver initialization.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		wlan device structure</div><div class='add'>+*	msgp		ptr to msg buffer, MAY BE NULL! for a driver local</div><div class='add'>+*			call.</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0	success and done</div><div class='add'>+*	&lt;0	success, but we're waiting for something to finish.</div><div class='add'>+*	&gt;0	an error occurred while handling the message.</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread, commonly wlanctl, but might be rmmod/pci_close.</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int prism2mgmt_reset(wlandevice_t *wlandev, void *msgp)</div><div class='add'>+{</div><div class='add'>+	int 			result = 0;</div><div class='add'>+	hfa384x_t		*hw = wlandev-&gt;priv;</div><div class='add'>+	p80211msg_dot11req_reset_t	*msg = msgp;</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * This is supported on both AP and STA and it's not allowed</div><div class='add'>+	 * to fail.</div><div class='add'>+	 */</div><div class='add'>+	if ( msgp ) {</div><div class='add'>+		msg-&gt;resultcode.status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+		msg-&gt;resultcode.data = P80211ENUM_resultcode_success;</div><div class='add'>+		WLAN_LOG_INFO("dot11req_reset: the macaddress and "</div><div class='add'>+			"setdefaultmib arguments are currently unsupported.\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If we got this far, the MSD must be in the MSDRUNNING state</div><div class='add'>+	 * therefore, we must stop and then restart the hw/MAC combo.</div><div class='add'>+	 */</div><div class='add'>+	hfa384x_drvr_stop(hw);</div><div class='add'>+	result = hfa384x_drvr_start(hw);</div><div class='add'>+	if (result != 0) {</div><div class='add'>+		WLAN_LOG_ERROR("dot11req_reset: Initialize command failed,"</div><div class='add'>+				" bad things will happen from here.\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2mgmt_start</div><div class='add'>+*</div><div class='add'>+* Start a BSS.  Any station can do this for IBSS, only AP for ESS.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		wlan device structure</div><div class='add'>+*	msgp		ptr to msg buffer</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0	success and done</div><div class='add'>+*	&lt;0	success, but we're waiting for something to finish.</div><div class='add'>+*	&gt;0	an error occurred while handling the message.</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread  (usually)</div><div class='add'>+*	interrupt</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int prism2mgmt_start(wlandevice_t *wlandev, void *msgp)</div><div class='add'>+{</div><div class='add'>+	int 			result = 0;</div><div class='add'>+	hfa384x_t		*hw = wlandev-&gt;priv;</div><div class='add'>+	p80211msg_dot11req_start_t	*msg = msgp;</div><div class='add'>+</div><div class='add'>+	p80211pstrd_t		*pstr;</div><div class='add'>+	UINT8			bytebuf[80];</div><div class='add'>+	hfa384x_bytestr_t	*p2bytestr = (hfa384x_bytestr_t*)bytebuf;</div><div class='add'>+	hfa384x_PCFInfo_data_t	*pcfinfo = (hfa384x_PCFInfo_data_t*)bytebuf;</div><div class='add'>+	UINT16			word;</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	wlandev-&gt;macmode = WLAN_MACMODE_NONE;</div><div class='add'>+</div><div class='add'>+	/* Set the SSID */</div><div class='add'>+	memcpy(&amp;wlandev-&gt;ssid, &amp;msg-&gt;ssid.data, sizeof(msg-&gt;ssid.data));</div><div class='add'>+</div><div class='add'>+	if (!hw-&gt;ap) {</div><div class='add'>+		/*** ADHOC IBSS ***/</div><div class='add'>+		/* see if current f/w is less than 8c3 */</div><div class='add'>+		if (HFA384x_FIRMWARE_VERSION(hw-&gt;ident_sta_fw.major,</div><div class='add'>+					     hw-&gt;ident_sta_fw.minor,</div><div class='add'>+					     hw-&gt;ident_sta_fw.variant) &lt;</div><div class='add'>+		    HFA384x_FIRMWARE_VERSION(0,8,3)) {</div><div class='add'>+			/* Ad-Hoc not quite supported on Prism2 */</div><div class='add'>+			msg-&gt;resultcode.status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+			msg-&gt;resultcode.data = P80211ENUM_resultcode_not_supported;</div><div class='add'>+			goto done;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+  		msg-&gt;resultcode.status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+</div><div class='add'>+		/*** STATION ***/</div><div class='add'>+		/* Set the REQUIRED config items */</div><div class='add'>+		/* SSID */</div><div class='add'>+		pstr = (p80211pstrd_t*)&amp;(msg-&gt;ssid.data);</div><div class='add'>+		prism2mgmt_pstr2bytestr(p2bytestr, pstr);</div><div class='add'>+		result = hfa384x_drvr_setconfig( hw, HFA384x_RID_CNFOWNSSID,</div><div class='add'>+				bytebuf, HFA384x_RID_CNFOWNSSID_LEN);</div><div class='add'>+		if ( result ) {</div><div class='add'>+			WLAN_LOG_ERROR("Failed to set CnfOwnSSID\n");</div><div class='add'>+			goto failed;</div><div class='add'>+		}</div><div class='add'>+		result = hfa384x_drvr_setconfig( hw, HFA384x_RID_CNFDESIREDSSID,</div><div class='add'>+				bytebuf, HFA384x_RID_CNFDESIREDSSID_LEN);</div><div class='add'>+		if ( result ) {</div><div class='add'>+			WLAN_LOG_ERROR("Failed to set CnfDesiredSSID\n");</div><div class='add'>+			goto failed;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* bsstype - we use the default in the ap firmware */</div><div class='add'>+		/* IBSS port */</div><div class='add'>+		hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFPORTTYPE, 0);</div><div class='add'>+</div><div class='add'>+		/* beacon period */</div><div class='add'>+		word = msg-&gt;beaconperiod.data;</div><div class='add'>+		result = hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFAPBCNINT, word);</div><div class='add'>+		if ( result ) {</div><div class='add'>+			WLAN_LOG_ERROR("Failed to set beacon period=%d.\n", word);</div><div class='add'>+			goto failed;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* dschannel */</div><div class='add'>+		word = msg-&gt;dschannel.data;</div><div class='add'>+		result = hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFOWNCHANNEL, word);</div><div class='add'>+		if ( result ) {</div><div class='add'>+			WLAN_LOG_ERROR("Failed to set channel=%d.\n", word);</div><div class='add'>+			goto failed;</div><div class='add'>+		}</div><div class='add'>+		/* Basic rates */</div><div class='add'>+		word = p80211rate_to_p2bit(msg-&gt;basicrate1.data);</div><div class='add'>+		if ( msg-&gt;basicrate2.status == P80211ENUM_msgitem_status_data_ok ) {</div><div class='add'>+			word |= p80211rate_to_p2bit(msg-&gt;basicrate2.data);</div><div class='add'>+		}</div><div class='add'>+		if ( msg-&gt;basicrate3.status == P80211ENUM_msgitem_status_data_ok ) {</div><div class='add'>+			word |= p80211rate_to_p2bit(msg-&gt;basicrate3.data);</div><div class='add'>+		}</div><div class='add'>+		if ( msg-&gt;basicrate4.status == P80211ENUM_msgitem_status_data_ok ) {</div><div class='add'>+			word |= p80211rate_to_p2bit(msg-&gt;basicrate4.data);</div><div class='add'>+		}</div><div class='add'>+		if ( msg-&gt;basicrate5.status == P80211ENUM_msgitem_status_data_ok ) {</div><div class='add'>+			word |= p80211rate_to_p2bit(msg-&gt;basicrate5.data);</div><div class='add'>+		}</div><div class='add'>+		if ( msg-&gt;basicrate6.status == P80211ENUM_msgitem_status_data_ok ) {</div><div class='add'>+			word |= p80211rate_to_p2bit(msg-&gt;basicrate6.data);</div><div class='add'>+		}</div><div class='add'>+		if ( msg-&gt;basicrate7.status == P80211ENUM_msgitem_status_data_ok ) {</div><div class='add'>+			word |= p80211rate_to_p2bit(msg-&gt;basicrate7.data);</div><div class='add'>+		}</div><div class='add'>+		if ( msg-&gt;basicrate8.status == P80211ENUM_msgitem_status_data_ok ) {</div><div class='add'>+			word |= p80211rate_to_p2bit(msg-&gt;basicrate8.data);</div><div class='add'>+		}</div><div class='add'>+		result = hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFBASICRATES, word);</div><div class='add'>+		if ( result ) {</div><div class='add'>+			WLAN_LOG_ERROR("Failed to set basicrates=%d.\n", word);</div><div class='add'>+			goto failed;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Operational rates (supprates and txratecontrol) */</div><div class='add'>+		word = p80211rate_to_p2bit(msg-&gt;operationalrate1.data);</div><div class='add'>+		if ( msg-&gt;operationalrate2.status == P80211ENUM_msgitem_status_data_ok ) {</div><div class='add'>+			word |= p80211rate_to_p2bit(msg-&gt;operationalrate2.data);</div><div class='add'>+		}</div><div class='add'>+		if ( msg-&gt;operationalrate3.status == P80211ENUM_msgitem_status_data_ok ) {</div><div class='add'>+			word |= p80211rate_to_p2bit(msg-&gt;operationalrate3.data);</div><div class='add'>+		}</div><div class='add'>+		if ( msg-&gt;operationalrate4.status == P80211ENUM_msgitem_status_data_ok ) {</div><div class='add'>+			word |= p80211rate_to_p2bit(msg-&gt;operationalrate4.data);</div><div class='add'>+		}</div><div class='add'>+		if ( msg-&gt;operationalrate5.status == P80211ENUM_msgitem_status_data_ok ) {</div><div class='add'>+			word |= p80211rate_to_p2bit(msg-&gt;operationalrate5.data);</div><div class='add'>+		}</div><div class='add'>+		if ( msg-&gt;operationalrate6.status == P80211ENUM_msgitem_status_data_ok ) {</div><div class='add'>+			word |= p80211rate_to_p2bit(msg-&gt;operationalrate6.data);</div><div class='add'>+		}</div><div class='add'>+		if ( msg-&gt;operationalrate7.status == P80211ENUM_msgitem_status_data_ok ) {</div><div class='add'>+			word |= p80211rate_to_p2bit(msg-&gt;operationalrate7.data);</div><div class='add'>+		}</div><div class='add'>+		if ( msg-&gt;operationalrate8.status == P80211ENUM_msgitem_status_data_ok ) {</div><div class='add'>+			word |= p80211rate_to_p2bit(msg-&gt;operationalrate8.data);</div><div class='add'>+		}</div><div class='add'>+		result = hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFSUPPRATES, word);</div><div class='add'>+		if ( result ) {</div><div class='add'>+			WLAN_LOG_ERROR("Failed to set supprates=%d.\n", word);</div><div class='add'>+			goto failed;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+ 		result = hfa384x_drvr_setconfig16(hw, HFA384x_RID_TXRATECNTL, word);</div><div class='add'>+		if ( result ) {</div><div class='add'>+			WLAN_LOG_ERROR("Failed to set txrates=%d.\n", word);</div><div class='add'>+			goto failed;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Set the macmode so the frame setup code knows what to do */</div><div class='add'>+		if ( msg-&gt;bsstype.data == P80211ENUM_bsstype_independent ) {</div><div class='add'>+			wlandev-&gt;macmode = WLAN_MACMODE_IBSS_STA;</div><div class='add'>+			/* lets extend the data length a bit */</div><div class='add'>+			hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFMAXDATALEN, 2304);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Enable the Port */</div><div class='add'>+		result = hfa384x_drvr_enable(hw, 0);</div><div class='add'>+		if ( result ) {</div><div class='add'>+			WLAN_LOG_ERROR("Enable macport failed, result=%d.\n", result);</div><div class='add'>+			goto failed;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		msg-&gt;resultcode.data = P80211ENUM_resultcode_success;</div><div class='add'>+</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*** ACCESS POINT ***/</div><div class='add'>+</div><div class='add'>+	msg-&gt;resultcode.status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+</div><div class='add'>+	/* Validate the command, if BSStype=infra is the tertiary loaded? */</div><div class='add'>+	if ( msg-&gt;bsstype.data == P80211ENUM_bsstype_independent ) {</div><div class='add'>+		WLAN_LOG_ERROR("AP driver cannot create IBSS.\n");</div><div class='add'>+		goto failed;</div><div class='add'>+	} else if ( hw-&gt;cap_sup_sta.id != 5) {</div><div class='add'>+		WLAN_LOG_ERROR("AP driver failed to detect AP firmware.\n");</div><div class='add'>+		goto failed;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Set the REQUIRED config items */</div><div class='add'>+	/* SSID */</div><div class='add'>+	pstr = (p80211pstrd_t*)&amp;(msg-&gt;ssid.data);</div><div class='add'>+	prism2mgmt_pstr2bytestr(p2bytestr, pstr);</div><div class='add'>+	result = hfa384x_drvr_setconfig( hw, HFA384x_RID_CNFOWNSSID,</div><div class='add'>+				bytebuf, HFA384x_RID_CNFOWNSSID_LEN);</div><div class='add'>+	if ( result ) {</div><div class='add'>+		WLAN_LOG_ERROR("Failed to set SSID, result=0x%04x\n", result);</div><div class='add'>+		goto failed;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* bsstype - we use the default in the ap firmware */</div><div class='add'>+</div><div class='add'>+	/* beacon period */</div><div class='add'>+	word = msg-&gt;beaconperiod.data;</div><div class='add'>+	result = hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFAPBCNINT, word);</div><div class='add'>+	if ( result ) {</div><div class='add'>+		WLAN_LOG_ERROR("Failed to set beacon period=%d.\n", word);</div><div class='add'>+		goto failed;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* dschannel */</div><div class='add'>+	word = msg-&gt;dschannel.data;</div><div class='add'>+	result = hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFOWNCHANNEL, word);</div><div class='add'>+	if ( result ) {</div><div class='add'>+		WLAN_LOG_ERROR("Failed to set channel=%d.\n", word);</div><div class='add'>+		goto failed;</div><div class='add'>+	}</div><div class='add'>+	/* Basic rates */</div><div class='add'>+	word = p80211rate_to_p2bit(msg-&gt;basicrate1.data);</div><div class='add'>+	if ( msg-&gt;basicrate2.status == P80211ENUM_msgitem_status_data_ok ) {</div><div class='add'>+		word |= p80211rate_to_p2bit(msg-&gt;basicrate2.data);</div><div class='add'>+	}</div><div class='add'>+	if ( msg-&gt;basicrate3.status == P80211ENUM_msgitem_status_data_ok ) {</div><div class='add'>+		word |= p80211rate_to_p2bit(msg-&gt;basicrate3.data);</div><div class='add'>+	}</div><div class='add'>+	if ( msg-&gt;basicrate4.status == P80211ENUM_msgitem_status_data_ok ) {</div><div class='add'>+		word |= p80211rate_to_p2bit(msg-&gt;basicrate4.data);</div><div class='add'>+	}</div><div class='add'>+	if ( msg-&gt;basicrate5.status == P80211ENUM_msgitem_status_data_ok ) {</div><div class='add'>+		word |= p80211rate_to_p2bit(msg-&gt;basicrate5.data);</div><div class='add'>+	}</div><div class='add'>+	if ( msg-&gt;basicrate6.status == P80211ENUM_msgitem_status_data_ok ) {</div><div class='add'>+		word |= p80211rate_to_p2bit(msg-&gt;basicrate6.data);</div><div class='add'>+	}</div><div class='add'>+	if ( msg-&gt;basicrate7.status == P80211ENUM_msgitem_status_data_ok ) {</div><div class='add'>+		word |= p80211rate_to_p2bit(msg-&gt;basicrate7.data);</div><div class='add'>+	}</div><div class='add'>+	if ( msg-&gt;basicrate8.status == P80211ENUM_msgitem_status_data_ok ) {</div><div class='add'>+		word |= p80211rate_to_p2bit(msg-&gt;basicrate8.data);</div><div class='add'>+	}</div><div class='add'>+	result = hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFBASICRATES, word);</div><div class='add'>+	if ( result ) {</div><div class='add'>+		WLAN_LOG_ERROR("Failed to set basicrates=%d.\n", word);</div><div class='add'>+		goto failed;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Operational rates (supprates and txratecontrol) */</div><div class='add'>+	word = p80211rate_to_p2bit(msg-&gt;operationalrate1.data);</div><div class='add'>+	if ( msg-&gt;operationalrate2.status == P80211ENUM_msgitem_status_data_ok ) {</div><div class='add'>+		word |= p80211rate_to_p2bit(msg-&gt;operationalrate2.data);</div><div class='add'>+	}</div><div class='add'>+	if ( msg-&gt;operationalrate3.status == P80211ENUM_msgitem_status_data_ok ) {</div><div class='add'>+		word |= p80211rate_to_p2bit(msg-&gt;operationalrate3.data);</div><div class='add'>+	}</div><div class='add'>+	if ( msg-&gt;operationalrate4.status == P80211ENUM_msgitem_status_data_ok ) {</div><div class='add'>+		word |= p80211rate_to_p2bit(msg-&gt;operationalrate4.data);</div><div class='add'>+	}</div><div class='add'>+	if ( msg-&gt;operationalrate5.status == P80211ENUM_msgitem_status_data_ok ) {</div><div class='add'>+		word |= p80211rate_to_p2bit(msg-&gt;operationalrate5.data);</div><div class='add'>+	}</div><div class='add'>+	if ( msg-&gt;operationalrate6.status == P80211ENUM_msgitem_status_data_ok ) {</div><div class='add'>+		word |= p80211rate_to_p2bit(msg-&gt;operationalrate6.data);</div><div class='add'>+	}</div><div class='add'>+	if ( msg-&gt;operationalrate7.status == P80211ENUM_msgitem_status_data_ok ) {</div><div class='add'>+		word |= p80211rate_to_p2bit(msg-&gt;operationalrate7.data);</div><div class='add'>+	}</div><div class='add'>+	if ( msg-&gt;operationalrate8.status == P80211ENUM_msgitem_status_data_ok ) {</div><div class='add'>+		word |= p80211rate_to_p2bit(msg-&gt;operationalrate8.data);</div><div class='add'>+	}</div><div class='add'>+	result = hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFSUPPRATES, word);</div><div class='add'>+	if ( result ) {</div><div class='add'>+		WLAN_LOG_ERROR("Failed to set supprates=%d.\n", word);</div><div class='add'>+		goto failed;</div><div class='add'>+	}</div><div class='add'>+	result = hfa384x_drvr_setconfig16(hw, HFA384x_RID_TXRATECNTL0, word);</div><div class='add'>+	if ( result ) {</div><div class='add'>+		WLAN_LOG_ERROR("Failed to set txrates=%d.\n", word);</div><div class='add'>+		goto failed;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* ibssatimwindow */</div><div class='add'>+	if (msg-&gt;ibssatimwindow.status == P80211ENUM_msgitem_status_data_ok) {</div><div class='add'>+		WLAN_LOG_INFO("prism2mgmt_start: atimwindow not used in "</div><div class='add'>+			       "Infrastructure mode, ignored.\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* DTIM period */</div><div class='add'>+	word = msg-&gt;dtimperiod.data;</div><div class='add'>+	result = hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFOWNDTIMPER, word);</div><div class='add'>+	if ( result ) {</div><div class='add'>+		WLAN_LOG_ERROR("Failed to set dtim period=%d.\n", word);</div><div class='add'>+		goto failed;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* probedelay */</div><div class='add'>+	if (msg-&gt;probedelay.status == P80211ENUM_msgitem_status_data_ok) {</div><div class='add'>+		WLAN_LOG_INFO("prism2mgmt_start: probedelay not "</div><div class='add'>+			       "supported in prism2, ignored.\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* cfpollable, cfpollreq, cfpperiod, cfpmaxduration */</div><div class='add'>+	if (msg-&gt;cfpollable.data == P80211ENUM_truth_true &amp;&amp;</div><div class='add'>+	    msg-&gt;cfpollreq.data == P80211ENUM_truth_true ) {</div><div class='add'>+		WLAN_LOG_ERROR("cfpollable=cfpollreq=true is illegal.\n");</div><div class='add'>+		result = -1;</div><div class='add'>+		goto failed;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* read the PCFInfo and update */</div><div class='add'>+	result = hfa384x_drvr_getconfig(hw, HFA384x_RID_CNFAPPCFINFO,</div><div class='add'>+					pcfinfo, HFA384x_RID_CNFAPPCFINFO_LEN);</div><div class='add'>+	if ( result ) {</div><div class='add'>+		WLAN_LOG_INFO("prism2mgmt_start: read(pcfinfo) failed, "</div><div class='add'>+				"assume it's "</div><div class='add'>+				"not supported, pcf settings ignored.\n");</div><div class='add'>+		goto pcf_skip;</div><div class='add'>+	}</div><div class='add'>+	if ((msg-&gt;cfpollable.data == P80211ENUM_truth_false &amp;&amp;</div><div class='add'>+	     msg-&gt;cfpollreq.data == P80211ENUM_truth_false) ) {</div><div class='add'>+	    	pcfinfo-&gt;MediumOccupancyLimit = 0;</div><div class='add'>+		pcfinfo-&gt;CFPPeriod = 0;</div><div class='add'>+		pcfinfo-&gt;CFPMaxDuration = 0;</div><div class='add'>+		pcfinfo-&gt;CFPFlags &amp;= host2hfa384x_16((UINT16)~BIT0);</div><div class='add'>+</div><div class='add'>+		if ( msg-&gt;cfpperiod.status == P80211ENUM_msgitem_status_data_ok ||</div><div class='add'>+		     msg-&gt;cfpmaxduration.status == P80211ENUM_msgitem_status_data_ok ) {</div><div class='add'>+			WLAN_LOG_WARNING(</div><div class='add'>+				"Setting cfpperiod or cfpmaxduration when "</div><div class='add'>+				"cfpollable and cfreq are false is pointless.\n");</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if ((msg-&gt;cfpollable.data == P80211ENUM_truth_true ||</div><div class='add'>+	     msg-&gt;cfpollreq.data == P80211ENUM_truth_true) ) {</div><div class='add'>+		if ( msg-&gt;cfpollable.data == P80211ENUM_truth_true) {</div><div class='add'>+			pcfinfo-&gt;CFPFlags |= host2hfa384x_16((UINT16)BIT0);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if ( msg-&gt;cfpperiod.status == P80211ENUM_msgitem_status_data_ok) {</div><div class='add'>+			pcfinfo-&gt;CFPPeriod = msg-&gt;cfpperiod.data;</div><div class='add'>+			pcfinfo-&gt;CFPPeriod = host2hfa384x_16(pcfinfo-&gt;CFPPeriod);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if ( msg-&gt;cfpmaxduration.status == P80211ENUM_msgitem_status_data_ok) {</div><div class='add'>+			pcfinfo-&gt;CFPMaxDuration = msg-&gt;cfpmaxduration.data;</div><div class='add'>+			pcfinfo-&gt;CFPMaxDuration = host2hfa384x_16(pcfinfo-&gt;CFPMaxDuration);</div><div class='add'>+			pcfinfo-&gt;MediumOccupancyLimit = pcfinfo-&gt;CFPMaxDuration;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	result = hfa384x_drvr_setconfig(hw, HFA384x_RID_CNFAPPCFINFO,</div><div class='add'>+					pcfinfo, HFA384x_RID_CNFAPPCFINFO_LEN);</div><div class='add'>+	if ( result ) {</div><div class='add'>+		WLAN_LOG_ERROR("write(pcfinfo) failed.\n");</div><div class='add'>+		goto failed;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+pcf_skip:</div><div class='add'>+	/* Set the macmode so the frame setup code knows what to do */</div><div class='add'>+	if ( msg-&gt;bsstype.data == P80211ENUM_bsstype_infrastructure ) {</div><div class='add'>+		wlandev-&gt;macmode = WLAN_MACMODE_ESS_AP;</div><div class='add'>+		/* lets extend the data length a bit */</div><div class='add'>+		hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFMAXDATALEN, 2304);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Set the BSSID to the same as our MAC */</div><div class='add'>+	memcpy( wlandev-&gt;bssid, wlandev-&gt;netdev-&gt;dev_addr, WLAN_BSSID_LEN);</div><div class='add'>+</div><div class='add'>+	/* Enable the Port */</div><div class='add'>+	result = hfa384x_drvr_enable(hw, 0);</div><div class='add'>+	if ( result ) {</div><div class='add'>+		WLAN_LOG_ERROR("Enable macport failed, result=%d.\n", result);</div><div class='add'>+		goto failed;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	msg-&gt;resultcode.data = P80211ENUM_resultcode_success;</div><div class='add'>+</div><div class='add'>+	goto done;</div><div class='add'>+failed:</div><div class='add'>+	WLAN_LOG_DEBUG(1, "Failed to set a config option, result=%d\n", result);</div><div class='add'>+	msg-&gt;resultcode.data = P80211ENUM_resultcode_invalid_parameters;</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	result = 0;</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2mgmt_enable</div><div class='add'>+*</div><div class='add'>+* Start a BSS.  Any station can do this for IBSS, only AP for ESS.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		wlan device structure</div><div class='add'>+*	msgp		ptr to msg buffer</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0	success and done</div><div class='add'>+*	&lt;0	success, but we're waiting for something to finish.</div><div class='add'>+*	&gt;0	an error occurred while handling the message.</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread  (usually)</div><div class='add'>+*	interrupt</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int prism2mgmt_enable(wlandevice_t *wlandev, void *msgp)</div><div class='add'>+{</div><div class='add'>+	int			result = 0;</div><div class='add'>+	hfa384x_t		*hw = wlandev-&gt;priv;</div><div class='add'>+	p80211msg_p2req_enable_t	*msg = msgp;</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	if (!hw-&gt;ap) {</div><div class='add'>+</div><div class='add'>+		/*** STATION ***/</div><div class='add'>+</div><div class='add'>+		/* Ad-Hoc not quite supported on Prism2 */</div><div class='add'>+		msg-&gt;resultcode.status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+		msg-&gt;resultcode.data = P80211ENUM_resultcode_not_supported;</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*** ACCESS POINT ***/</div><div class='add'>+</div><div class='add'>+	msg-&gt;resultcode.status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+</div><div class='add'>+	/* Is the tertiary loaded? */</div><div class='add'>+	if ( hw-&gt;cap_sup_sta.id != 5) {</div><div class='add'>+		WLAN_LOG_ERROR("AP driver failed to detect AP firmware.\n");</div><div class='add'>+		goto failed;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Set the macmode so the frame setup code knows what to do */</div><div class='add'>+	wlandev-&gt;macmode = WLAN_MACMODE_ESS_AP;</div><div class='add'>+</div><div class='add'>+	/* Set the BSSID to the same as our MAC */</div><div class='add'>+	memcpy( wlandev-&gt;bssid, wlandev-&gt;netdev-&gt;dev_addr, WLAN_BSSID_LEN);</div><div class='add'>+</div><div class='add'>+	/* Enable the Port */</div><div class='add'>+	result = hfa384x_drvr_enable(hw, 0);</div><div class='add'>+	if ( result ) {</div><div class='add'>+		WLAN_LOG_ERROR("Enable macport failed, result=%d.\n", result);</div><div class='add'>+		goto failed;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	msg-&gt;resultcode.data = P80211ENUM_resultcode_success;</div><div class='add'>+</div><div class='add'>+	goto done;</div><div class='add'>+failed:</div><div class='add'>+	msg-&gt;resultcode.data = P80211ENUM_resultcode_invalid_parameters;</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	result = 0;</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2mgmt_readpda</div><div class='add'>+*</div><div class='add'>+* Collect the PDA data and put it in the message.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		wlan device structure</div><div class='add'>+*	msgp		ptr to msg buffer</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0	success and done</div><div class='add'>+*	&lt;0	success, but we're waiting for something to finish.</div><div class='add'>+*	&gt;0	an error occurred while handling the message.</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread  (usually)</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int prism2mgmt_readpda(wlandevice_t *wlandev, void *msgp)</div><div class='add'>+{</div><div class='add'>+	hfa384x_t		*hw = wlandev-&gt;priv;</div><div class='add'>+	p80211msg_p2req_readpda_t	*msg = msgp;</div><div class='add'>+	int				result;</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	/* We only support collecting the PDA when in the FWLOAD</div><div class='add'>+	 * state.</div><div class='add'>+	 */</div><div class='add'>+	if (wlandev-&gt;msdstate != WLAN_MSD_FWLOAD) {</div><div class='add'>+		WLAN_LOG_ERROR(</div><div class='add'>+			"PDA may only be read "</div><div class='add'>+			"in the fwload state.\n");</div><div class='add'>+		msg-&gt;resultcode.data =</div><div class='add'>+			P80211ENUM_resultcode_implementation_failure;</div><div class='add'>+		msg-&gt;resultcode.status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+	} else {</div><div class='add'>+		/*  Call drvr_readpda(), it handles the auxport enable</div><div class='add'>+		 *  and validating the returned PDA.</div><div class='add'>+		 */</div><div class='add'>+		result = hfa384x_drvr_readpda(</div><div class='add'>+			hw,</div><div class='add'>+			msg-&gt;pda.data,</div><div class='add'>+			HFA384x_PDA_LEN_MAX);</div><div class='add'>+		if (result) {</div><div class='add'>+			WLAN_LOG_ERROR(</div><div class='add'>+				"hfa384x_drvr_readpda() failed, "</div><div class='add'>+				"result=%d\n",</div><div class='add'>+				result);</div><div class='add'>+</div><div class='add'>+			msg-&gt;resultcode.data =</div><div class='add'>+				P80211ENUM_resultcode_implementation_failure;</div><div class='add'>+			msg-&gt;resultcode.status =</div><div class='add'>+				P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+			DBFEXIT;</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+		msg-&gt;pda.status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+		msg-&gt;resultcode.data = P80211ENUM_resultcode_success;</div><div class='add'>+		msg-&gt;resultcode.status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2mgmt_readcis</div><div class='add'>+*</div><div class='add'>+* Collect the CIS data and put it in the message.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		wlan device structure</div><div class='add'>+*	msgp		ptr to msg buffer</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0	success and done</div><div class='add'>+*	&lt;0	success, but we're waiting for something to finish.</div><div class='add'>+*	&gt;0	an error occurred while handling the message.</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread  (usually)</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int prism2mgmt_readcis(wlandevice_t *wlandev, void *msgp)</div><div class='add'>+{</div><div class='add'>+	int			result;</div><div class='add'>+	hfa384x_t		*hw = wlandev-&gt;priv;</div><div class='add'>+	p80211msg_p2req_readcis_t	*msg = msgp;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+        memset(msg-&gt;cis.data, 0, sizeof(msg-&gt;cis.data));</div><div class='add'>+</div><div class='add'>+	result = hfa384x_drvr_getconfig(hw, HFA384x_RID_CIS,</div><div class='add'>+					msg-&gt;cis.data, HFA384x_RID_CIS_LEN);</div><div class='add'>+	if ( result ) {</div><div class='add'>+		WLAN_LOG_INFO("prism2mgmt_readcis: read(cis) failed.\n");</div><div class='add'>+		msg-&gt;cis.status = P80211ENUM_msgitem_status_no_value;</div><div class='add'>+		msg-&gt;resultcode.data = P80211ENUM_resultcode_implementation_failure;</div><div class='add'>+</div><div class='add'>+		}</div><div class='add'>+	else {</div><div class='add'>+		msg-&gt;cis.status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+		msg-&gt;resultcode.data = P80211ENUM_resultcode_success;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	msg-&gt;resultcode.status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2mgmt_auxport_state</div><div class='add'>+*</div><div class='add'>+* Enables/Disables the card's auxiliary port.  Should be called</div><div class='add'>+* before and after a sequence of auxport_read()/auxport_write()</div><div class='add'>+* calls.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		wlan device structure</div><div class='add'>+*	msgp		ptr to msg buffer</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0	success and done</div><div class='add'>+*	&lt;0	success, but we're waiting for something to finish.</div><div class='add'>+*	&gt;0	an error occurred while handling the message.</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread  (usually)</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int prism2mgmt_auxport_state(wlandevice_t *wlandev, void *msgp)</div><div class='add'>+{</div><div class='add'>+	p80211msg_p2req_auxport_state_t	*msg = msgp;</div><div class='add'>+</div><div class='add'>+#if (WLAN_HOSTIF != WLAN_USB)</div><div class='add'>+	hfa384x_t		*hw = wlandev-&gt;priv;</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	msg-&gt;resultcode.status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+	if (msg-&gt;enable.data == P80211ENUM_truth_true) {</div><div class='add'>+		if ( hfa384x_cmd_aux_enable(hw, 0) ) {</div><div class='add'>+			msg-&gt;resultcode.data = P80211ENUM_resultcode_implementation_failure;</div><div class='add'>+		} else {</div><div class='add'>+			msg-&gt;resultcode.data = P80211ENUM_resultcode_success;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		hfa384x_cmd_aux_disable(hw);</div><div class='add'>+		msg-&gt;resultcode.data = P80211ENUM_resultcode_success;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#else /* !USB */</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	msg-&gt;resultcode.status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+	msg-&gt;resultcode.data = P80211ENUM_resultcode_not_supported;</div><div class='add'>+</div><div class='add'>+#endif /* WLAN_HOSTIF != WLAN_USB */</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2mgmt_auxport_read</div><div class='add'>+*</div><div class='add'>+* Copies data from the card using the auxport.  The auxport must</div><div class='add'>+* have previously been enabled.  Note: this is not the way to</div><div class='add'>+* do downloads, see the [ram|flash]dl functions.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		wlan device structure</div><div class='add'>+*	msgp		ptr to msg buffer</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0	success and done</div><div class='add'>+*	&lt;0	success, but we're waiting for something to finish.</div><div class='add'>+*	&gt;0	an error occurred while handling the message.</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread  (usually)</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int prism2mgmt_auxport_read(wlandevice_t *wlandev, void *msgp)</div><div class='add'>+{</div><div class='add'>+#if (WLAN_HOSTIF != WLAN_USB)</div><div class='add'>+	hfa384x_t		*hw = wlandev-&gt;priv;</div><div class='add'>+	p80211msg_p2req_auxport_read_t	*msg = msgp;</div><div class='add'>+	UINT32			addr;</div><div class='add'>+	UINT32			len;</div><div class='add'>+	UINT8*			buf;</div><div class='add'>+	UINT32			maxlen = sizeof(msg-&gt;data.data);</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	if ( hw-&gt;auxen ) {</div><div class='add'>+		addr = msg-&gt;addr.data;</div><div class='add'>+		len = msg-&gt;len.data;</div><div class='add'>+		buf = msg-&gt;data.data;</div><div class='add'>+		if ( len &lt;= maxlen ) {  /* max read/write size */</div><div class='add'>+			hfa384x_copy_from_aux(hw, addr, HFA384x_AUX_CTL_EXTDS, buf, len);</div><div class='add'>+			msg-&gt;resultcode.data = P80211ENUM_resultcode_success;</div><div class='add'>+		} else {</div><div class='add'>+			WLAN_LOG_DEBUG(1,"Attempt to read &gt; maxlen from auxport.\n");</div><div class='add'>+			msg-&gt;resultcode.data = P80211ENUM_resultcode_refused;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	} else {</div><div class='add'>+		msg-&gt;resultcode.data = P80211ENUM_resultcode_refused;</div><div class='add'>+	}</div><div class='add'>+	msg-&gt;data.status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+	msg-&gt;resultcode.status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return 0;</div><div class='add'>+#else</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	WLAN_LOG_ERROR("prism2mgmt_auxport_read: Not supported on USB.\n");</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return 0;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2mgmt_auxport_write</div><div class='add'>+*</div><div class='add'>+* Copies data to the card using the auxport.  The auxport must</div><div class='add'>+* have previously been enabled.  Note: this is not the way to</div><div class='add'>+* do downloads, see the [ram|flash]dl functions.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		wlan device structure</div><div class='add'>+*	msgp		ptr to msg buffer</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0	success and done</div><div class='add'>+*	&lt;0	success, but we're waiting for something to finish.</div><div class='add'>+*	&gt;0	an error occurred while handling the message.</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread  (usually)</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int prism2mgmt_auxport_write(wlandevice_t *wlandev, void *msgp)</div><div class='add'>+{</div><div class='add'>+#if (WLAN_HOSTIF != WLAN_USB)</div><div class='add'>+	hfa384x_t		*hw = wlandev-&gt;priv;</div><div class='add'>+	p80211msg_p2req_auxport_write_t	*msg = msgp;</div><div class='add'>+	UINT32			addr;</div><div class='add'>+	UINT32			len;</div><div class='add'>+	UINT8*			buf;</div><div class='add'>+	UINT32			maxlen = sizeof(msg-&gt;data.data);</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	if ( hw-&gt;auxen ) {</div><div class='add'>+		addr = msg-&gt;addr.data;</div><div class='add'>+		len = msg-&gt;len.data;</div><div class='add'>+		buf = msg-&gt;data.data;</div><div class='add'>+		if ( len &lt;= maxlen ) {  /* max read/write size */</div><div class='add'>+			hfa384x_copy_to_aux(hw, addr, HFA384x_AUX_CTL_EXTDS, buf, len);</div><div class='add'>+		} else {</div><div class='add'>+			WLAN_LOG_DEBUG(1,"Attempt to write &gt; maxlen from auxport.\n");</div><div class='add'>+			msg-&gt;resultcode.data = P80211ENUM_resultcode_refused;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	} else {</div><div class='add'>+		msg-&gt;resultcode.data = P80211ENUM_resultcode_refused;</div><div class='add'>+	}</div><div class='add'>+	msg-&gt;data.status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+	msg-&gt;resultcode.status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return 0;</div><div class='add'>+#else</div><div class='add'>+	DBFENTER;</div><div class='add'>+	WLAN_LOG_ERROR("prism2mgmt_auxport_read: Not supported on USB.\n");</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return 0;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2mgmt_low_level</div><div class='add'>+*</div><div class='add'>+* Puts the card into the desired test mode.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*       wlandev         wlan device structure</div><div class='add'>+*       msgp            ptr to msg buffer</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*       0       success and done</div><div class='add'>+*       &lt;0      success, but we're waiting for something to finish.</div><div class='add'>+*       &gt;0      an error occurred while handling the message.</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*       process thread  (usually)</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int prism2mgmt_low_level(wlandevice_t *wlandev, void *msgp)</div><div class='add'>+{</div><div class='add'>+	hfa384x_t		*hw = wlandev-&gt;priv;</div><div class='add'>+        p80211msg_p2req_low_level_t     *msg = msgp;</div><div class='add'>+	hfa384x_metacmd_t cmd;</div><div class='add'>+        DBFENTER;</div><div class='add'>+</div><div class='add'>+        msg-&gt;resultcode.status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+</div><div class='add'>+        /* call some routine to execute the test command */</div><div class='add'>+	cmd.cmd = (UINT16) msg-&gt;command.data;</div><div class='add'>+	cmd.parm0 = (UINT16) msg-&gt;param0.data;</div><div class='add'>+	cmd.parm1 = (UINT16) msg-&gt;param1.data;</div><div class='add'>+	cmd.parm2 = (UINT16) msg-&gt;param2.data;</div><div class='add'>+</div><div class='add'>+        hfa384x_drvr_low_level(hw,&amp;cmd);</div><div class='add'>+</div><div class='add'>+        msg-&gt;resp0.data = (UINT32) cmd.result.resp0;</div><div class='add'>+        msg-&gt;resp1.data = (UINT32) cmd.result.resp1;</div><div class='add'>+        msg-&gt;resp2.data = (UINT32) cmd.result.resp2;</div><div class='add'>+</div><div class='add'>+        msg-&gt;resultcode.data = P80211ENUM_resultcode_success;</div><div class='add'>+</div><div class='add'>+        DBFEXIT;</div><div class='add'>+        return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2mgmt_test_command</div><div class='add'>+*</div><div class='add'>+* Puts the card into the desired test mode.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		wlan device structure</div><div class='add'>+*	msgp		ptr to msg buffer</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0	success and done</div><div class='add'>+*	&lt;0	success, but we're waiting for something to finish.</div><div class='add'>+*	&gt;0	an error occurred while handling the message.</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread  (usually)</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int prism2mgmt_test_command(wlandevice_t *wlandev, void *msgp)</div><div class='add'>+{</div><div class='add'>+	hfa384x_t		*hw = wlandev-&gt;priv;</div><div class='add'>+	p80211msg_p2req_test_command_t	*msg = msgp;</div><div class='add'>+	hfa384x_metacmd_t cmd;</div><div class='add'>+</div><div class='add'>+        DBFENTER;</div><div class='add'>+</div><div class='add'>+	cmd.cmd = ((UINT16) msg-&gt;testcode.data) &lt;&lt; 8 | 0x38;</div><div class='add'>+	cmd.parm0 = (UINT16) msg-&gt;testparam.data;</div><div class='add'>+	cmd.parm1 = 0;</div><div class='add'>+	cmd.parm2 = 0;</div><div class='add'>+</div><div class='add'>+        /* call some routine to execute the test command */</div><div class='add'>+</div><div class='add'>+        hfa384x_drvr_low_level(hw,&amp;cmd);</div><div class='add'>+</div><div class='add'>+        msg-&gt;resultcode.status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+        msg-&gt;resultcode.data = P80211ENUM_resultcode_success;</div><div class='add'>+</div><div class='add'>+        msg-&gt;status.status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+        msg-&gt;status.data = cmd.result.status;</div><div class='add'>+        msg-&gt;resp0.status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+        msg-&gt;resp0.data = cmd.result.resp0;</div><div class='add'>+        msg-&gt;resp1.status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+        msg-&gt;resp1.data = cmd.result.resp1;</div><div class='add'>+        msg-&gt;resp2.status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+        msg-&gt;resp2.data = cmd.result.resp2;</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2mgmt_mmi_read</div><div class='add'>+*</div><div class='add'>+* Read from one of the MMI registers.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		wlan device structure</div><div class='add'>+*	msgp		ptr to msg buffer</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0	success and done</div><div class='add'>+*	&lt;0	success, but we're waiting for something to finish.</div><div class='add'>+*	&gt;0	an error occurred while handling the message.</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread  (usually)</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int prism2mgmt_mmi_read(wlandevice_t *wlandev, void *msgp)</div><div class='add'>+{</div><div class='add'>+	hfa384x_t		*hw = wlandev-&gt;priv;</div><div class='add'>+	p80211msg_p2req_mmi_read_t	*msg = msgp;</div><div class='add'>+	UINT32 resp = 0;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	msg-&gt;resultcode.status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+</div><div class='add'>+	/* call some routine to execute the test command */</div><div class='add'>+</div><div class='add'>+	hfa384x_drvr_mmi_read(hw, msg-&gt;addr.data, &amp;resp);</div><div class='add'>+</div><div class='add'>+	/* I'm not sure if this is "architecturally" correct, but it</div><div class='add'>+           is expedient. */</div><div class='add'>+</div><div class='add'>+	msg-&gt;value.status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+	msg-&gt;value.data = resp;</div><div class='add'>+	msg-&gt;resultcode.data = P80211ENUM_resultcode_success;</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2mgmt_mmi_write</div><div class='add'>+*</div><div class='add'>+* Write a data value to one of the MMI registers.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		wlan device structure</div><div class='add'>+*	msgp		ptr to msg buffer</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0	success and done</div><div class='add'>+*	&lt;0	success, but we're waiting for something to finish.</div><div class='add'>+*	&gt;0	an error occurred while handling the message.</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread  (usually)</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int prism2mgmt_mmi_write(wlandevice_t *wlandev, void *msgp)</div><div class='add'>+{</div><div class='add'>+	hfa384x_t		*hw = wlandev-&gt;priv;</div><div class='add'>+	p80211msg_p2req_mmi_write_t	*msg = msgp;</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	msg-&gt;resultcode.status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+</div><div class='add'>+	/* call some routine to execute the test command */</div><div class='add'>+</div><div class='add'>+	hfa384x_drvr_mmi_write(hw, msg-&gt;addr.data, msg-&gt;data.data);</div><div class='add'>+</div><div class='add'>+	msg-&gt;resultcode.data = P80211ENUM_resultcode_success;</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2mgmt_ramdl_state</div><div class='add'>+*</div><div class='add'>+* Establishes the beginning/end of a card RAM download session.</div><div class='add'>+*</div><div class='add'>+* It is expected that the ramdl_write() function will be called</div><div class='add'>+* one or more times between the 'enable' and 'disable' calls to</div><div class='add'>+* this function.</div><div class='add'>+*</div><div class='add'>+* Note: This function should not be called when a mac comm port</div><div class='add'>+*       is active.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		wlan device structure</div><div class='add'>+*	msgp		ptr to msg buffer</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0	success and done</div><div class='add'>+*	&lt;0	success, but we're waiting for something to finish.</div><div class='add'>+*	&gt;0	an error occurred while handling the message.</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread  (usually)</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int prism2mgmt_ramdl_state(wlandevice_t *wlandev, void *msgp)</div><div class='add'>+{</div><div class='add'>+	hfa384x_t		*hw = wlandev-&gt;priv;</div><div class='add'>+	p80211msg_p2req_ramdl_state_t	*msg = msgp;</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	if (wlandev-&gt;msdstate != WLAN_MSD_FWLOAD) {</div><div class='add'>+		WLAN_LOG_ERROR(</div><div class='add'>+			"ramdl_state(): may only be called "</div><div class='add'>+			"in the fwload state.\n");</div><div class='add'>+		msg-&gt;resultcode.data =</div><div class='add'>+			P80211ENUM_resultcode_implementation_failure;</div><div class='add'>+		msg-&gt;resultcode.status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+		DBFEXIT;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	** Note: Interrupts are locked out if this is an AP and are NOT</div><div class='add'>+	** locked out if this is a station.</div><div class='add'>+	*/</div><div class='add'>+</div><div class='add'>+	msg-&gt;resultcode.status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+	if  ( msg-&gt;enable.data == P80211ENUM_truth_true ) {</div><div class='add'>+		if ( hfa384x_drvr_ramdl_enable(hw, msg-&gt;exeaddr.data) ) {</div><div class='add'>+			msg-&gt;resultcode.data = P80211ENUM_resultcode_implementation_failure;</div><div class='add'>+		} else {</div><div class='add'>+			msg-&gt;resultcode.data = P80211ENUM_resultcode_success;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		hfa384x_drvr_ramdl_disable(hw);</div><div class='add'>+		msg-&gt;resultcode.data = P80211ENUM_resultcode_success;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2mgmt_ramdl_write</div><div class='add'>+*</div><div class='add'>+* Writes a buffer to the card RAM using the download state.  This</div><div class='add'>+* is for writing code to card RAM.  To just read or write raw data</div><div class='add'>+* use the aux functions.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		wlan device structure</div><div class='add'>+*	msgp		ptr to msg buffer</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0	success and done</div><div class='add'>+*	&lt;0	success, but we're waiting for something to finish.</div><div class='add'>+*	&gt;0	an error occurred while handling the message.</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread  (usually)</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int prism2mgmt_ramdl_write(wlandevice_t *wlandev, void *msgp)</div><div class='add'>+{</div><div class='add'>+	hfa384x_t		*hw = wlandev-&gt;priv;</div><div class='add'>+	p80211msg_p2req_ramdl_write_t	*msg = msgp;</div><div class='add'>+	UINT32			addr;</div><div class='add'>+	UINT32			len;</div><div class='add'>+	UINT8			*buf;</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	if (wlandev-&gt;msdstate != WLAN_MSD_FWLOAD) {</div><div class='add'>+		WLAN_LOG_ERROR(</div><div class='add'>+			"ramdl_write(): may only be called "</div><div class='add'>+			"in the fwload state.\n");</div><div class='add'>+		msg-&gt;resultcode.data =</div><div class='add'>+			P80211ENUM_resultcode_implementation_failure;</div><div class='add'>+		msg-&gt;resultcode.status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+		DBFEXIT;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	msg-&gt;resultcode.status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+	/* first validate the length */</div><div class='add'>+	if  ( msg-&gt;len.data &gt; sizeof(msg-&gt;data.data) ) {</div><div class='add'>+		msg-&gt;resultcode.status = P80211ENUM_resultcode_invalid_parameters;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	/* call the hfa384x function to do the write */</div><div class='add'>+	addr = msg-&gt;addr.data;</div><div class='add'>+	len = msg-&gt;len.data;</div><div class='add'>+	buf = msg-&gt;data.data;</div><div class='add'>+	if ( hfa384x_drvr_ramdl_write(hw, addr, buf, len) ) {</div><div class='add'>+		msg-&gt;resultcode.data = P80211ENUM_resultcode_refused;</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+	msg-&gt;resultcode.data = P80211ENUM_resultcode_success;</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2mgmt_flashdl_state</div><div class='add'>+*</div><div class='add'>+* Establishes the beginning/end of a card Flash download session.</div><div class='add'>+*</div><div class='add'>+* It is expected that the flashdl_write() function will be called</div><div class='add'>+* one or more times between the 'enable' and 'disable' calls to</div><div class='add'>+* this function.</div><div class='add'>+*</div><div class='add'>+* Note: This function should not be called when a mac comm port</div><div class='add'>+*       is active.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		wlan device structure</div><div class='add'>+*	msgp		ptr to msg buffer</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0	success and done</div><div class='add'>+*	&lt;0	success, but we're waiting for something to finish.</div><div class='add'>+*	&gt;0	an error occurred while handling the message.</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread  (usually)</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int prism2mgmt_flashdl_state(wlandevice_t *wlandev, void *msgp)</div><div class='add'>+{</div><div class='add'>+	int			result = 0;</div><div class='add'>+	hfa384x_t		*hw = wlandev-&gt;priv;</div><div class='add'>+	p80211msg_p2req_flashdl_state_t	*msg = msgp;</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	if (wlandev-&gt;msdstate != WLAN_MSD_FWLOAD) {</div><div class='add'>+		WLAN_LOG_ERROR(</div><div class='add'>+			"flashdl_state(): may only be called "</div><div class='add'>+			"in the fwload state.\n");</div><div class='add'>+		msg-&gt;resultcode.data =</div><div class='add'>+			P80211ENUM_resultcode_implementation_failure;</div><div class='add'>+		msg-&gt;resultcode.status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+		DBFEXIT;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	** Note: Interrupts are locked out if this is an AP and are NOT</div><div class='add'>+	** locked out if this is a station.</div><div class='add'>+	*/</div><div class='add'>+</div><div class='add'>+	msg-&gt;resultcode.status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+	if  ( msg-&gt;enable.data == P80211ENUM_truth_true ) {</div><div class='add'>+		if ( hfa384x_drvr_flashdl_enable(hw) ) {</div><div class='add'>+			msg-&gt;resultcode.data = P80211ENUM_resultcode_implementation_failure;</div><div class='add'>+		} else {</div><div class='add'>+			msg-&gt;resultcode.data = P80211ENUM_resultcode_success;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		hfa384x_drvr_flashdl_disable(hw);</div><div class='add'>+		msg-&gt;resultcode.data = P80211ENUM_resultcode_success;</div><div class='add'>+		/* NOTE: At this point, the MAC is in the post-reset</div><div class='add'>+		 * state and the driver is in the fwload state.</div><div class='add'>+		 * We need to get the MAC back into the fwload</div><div class='add'>+		 * state.  To do this, we set the nsdstate to HWPRESENT</div><div class='add'>+		 * and then call the ifstate function to redo everything</div><div class='add'>+		 * that got us into the fwload state.</div><div class='add'>+		 */</div><div class='add'>+		wlandev-&gt;msdstate = WLAN_MSD_HWPRESENT;</div><div class='add'>+		result = prism2sta_ifstate(wlandev, P80211ENUM_ifstate_fwload);</div><div class='add'>+		if (result != P80211ENUM_resultcode_success) {</div><div class='add'>+			WLAN_LOG_ERROR("prism2sta_ifstate(fwload) failed,"</div><div class='add'>+				"P80211ENUM_resultcode=%d\n", result);</div><div class='add'>+			msg-&gt;resultcode.data =</div><div class='add'>+				P80211ENUM_resultcode_implementation_failure;</div><div class='add'>+			result = -1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2mgmt_flashdl_write</div><div class='add'>+*</div><div class='add'>+*</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		wlan device structure</div><div class='add'>+*	msgp		ptr to msg buffer</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0	success and done</div><div class='add'>+*	&lt;0	success, but we're waiting for something to finish.</div><div class='add'>+*	&gt;0	an error occurred while handling the message.</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread  (usually)</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int prism2mgmt_flashdl_write(wlandevice_t *wlandev, void *msgp)</div><div class='add'>+{</div><div class='add'>+	hfa384x_t		*hw = wlandev-&gt;priv;</div><div class='add'>+	p80211msg_p2req_flashdl_write_t	*msg = msgp;</div><div class='add'>+	UINT32			addr;</div><div class='add'>+	UINT32			len;</div><div class='add'>+	UINT8			*buf;</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	if (wlandev-&gt;msdstate != WLAN_MSD_FWLOAD) {</div><div class='add'>+		WLAN_LOG_ERROR(</div><div class='add'>+			"flashdl_write(): may only be called "</div><div class='add'>+			"in the fwload state.\n");</div><div class='add'>+		msg-&gt;resultcode.data =</div><div class='add'>+			P80211ENUM_resultcode_implementation_failure;</div><div class='add'>+		msg-&gt;resultcode.status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+		DBFEXIT;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	** Note: Interrupts are locked out if this is an AP and are NOT</div><div class='add'>+	** locked out if this is a station.</div><div class='add'>+	*/</div><div class='add'>+</div><div class='add'>+	msg-&gt;resultcode.status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+	/* first validate the length */</div><div class='add'>+	if  ( msg-&gt;len.data &gt; sizeof(msg-&gt;data.data) ) {</div><div class='add'>+		msg-&gt;resultcode.status =</div><div class='add'>+			P80211ENUM_resultcode_invalid_parameters;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	/* call the hfa384x function to do the write */</div><div class='add'>+	addr = msg-&gt;addr.data;</div><div class='add'>+	len = msg-&gt;len.data;</div><div class='add'>+	buf = msg-&gt;data.data;</div><div class='add'>+	if ( hfa384x_drvr_flashdl_write(hw, addr, buf, len) ) {</div><div class='add'>+		msg-&gt;resultcode.data = P80211ENUM_resultcode_refused;</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+	msg-&gt;resultcode.data = P80211ENUM_resultcode_success;</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2mgmt_dump_state</div><div class='add'>+*</div><div class='add'>+* Dumps the driver's and hardware's current state via the kernel</div><div class='add'>+* log at KERN_NOTICE level.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		wlan device structure</div><div class='add'>+*	msgp		ptr to msg buffer</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0	success and done</div><div class='add'>+*	&lt;0	success, but we're waiting for something to finish.</div><div class='add'>+*	&gt;0	an error occurred while handling the message.</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread  (usually)</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int prism2mgmt_dump_state(wlandevice_t *wlandev, void *msgp)</div><div class='add'>+{</div><div class='add'>+	p80211msg_p2req_dump_state_t	*msg = msgp;</div><div class='add'>+	int				result = 0;</div><div class='add'>+</div><div class='add'>+#if (WLAN_HOSTIF != WLAN_USB)</div><div class='add'>+	hfa384x_t		*hw = wlandev-&gt;priv;</div><div class='add'>+	UINT16				auxbuf[15];</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	WLAN_LOG_NOTICE("prism2 driver and hardware state:\n");</div><div class='add'>+	if  ( (result = hfa384x_cmd_aux_enable(hw, 0)) ) {</div><div class='add'>+		WLAN_LOG_ERROR("aux_enable failed, result=%d\n", result);</div><div class='add'>+		goto failed;</div><div class='add'>+	}</div><div class='add'>+	hfa384x_copy_from_aux(hw,</div><div class='add'>+		0x01e2,</div><div class='add'>+		HFA384x_AUX_CTL_EXTDS,</div><div class='add'>+		auxbuf,</div><div class='add'>+		sizeof(auxbuf));</div><div class='add'>+	hfa384x_cmd_aux_disable(hw);</div><div class='add'>+	WLAN_LOG_NOTICE("  cmac: FreeBlocks=%d\n", auxbuf[5]);</div><div class='add'>+	WLAN_LOG_NOTICE("  cmac: IntEn=0x%02x EvStat=0x%02x\n",</div><div class='add'>+		hfa384x_getreg(hw, HFA384x_INTEN),</div><div class='add'>+		hfa384x_getreg(hw, HFA384x_EVSTAT));</div><div class='add'>+</div><div class='add'>+	#ifdef USE_FID_STACK</div><div class='add'>+	WLAN_LOG_NOTICE("  drvr: txfid_top=%d stacksize=%d\n",</div><div class='add'>+		hw-&gt;txfid_top,HFA384x_DRVR_FIDSTACKLEN_MAX);</div><div class='add'>+	#else</div><div class='add'>+	WLAN_LOG_NOTICE("  drvr: txfid_head=%d txfid_tail=%d txfid_N=%d\n",</div><div class='add'>+		hw-&gt;txfid_head, hw-&gt;txfid_tail, hw-&gt;txfid_N);</div><div class='add'>+	#endif</div><div class='add'>+</div><div class='add'>+	msg-&gt;resultcode.status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+	msg-&gt;resultcode.data = P80211ENUM_resultcode_success;</div><div class='add'>+</div><div class='add'>+#else /* (WLAN_HOSTIF == WLAN_USB) */</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	msg-&gt;resultcode.status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+	msg-&gt;resultcode.data = P80211ENUM_resultcode_not_supported;</div><div class='add'>+	goto failed;</div><div class='add'>+</div><div class='add'>+#endif /* (WLAN_HOSTIF != WLAN_USB) */</div><div class='add'>+</div><div class='add'>+failed:</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2mgmt_channel_info</div><div class='add'>+*</div><div class='add'>+* Issues a ChannelInfoRequest.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		wlan device structure</div><div class='add'>+*	msgp		ptr to msg buffer</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0	success and done</div><div class='add'>+*	&lt;0	success, but we're waiting for something to finish.</div><div class='add'>+*	&gt;0	an error occurred while handling the message.</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread  (usually)</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int prism2mgmt_channel_info(wlandevice_t *wlandev, void *msgp)</div><div class='add'>+{</div><div class='add'>+	p80211msg_p2req_channel_info_t	*msg=msgp;</div><div class='add'>+	hfa384x_t			*hw = wlandev-&gt;priv;</div><div class='add'>+	int				result, i, n=0;</div><div class='add'>+	UINT16				channel_mask=0;</div><div class='add'>+	hfa384x_ChannelInfoRequest_data_t	chinforeq;</div><div class='add'>+	// unsigned long 			now;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	if (!hw-&gt;ap) {</div><div class='add'>+</div><div class='add'>+		/*** STATION ***/</div><div class='add'>+</div><div class='add'>+		/* Not supported in STA f/w */</div><div class='add'>+		P80211_SET_INT(msg-&gt;resultcode, P80211ENUM_resultcode_not_supported);</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*** ACCESS POINT ***/</div><div class='add'>+</div><div class='add'>+#define CHINFO_TIMEOUT 2</div><div class='add'>+</div><div class='add'>+	P80211_SET_INT(msg-&gt;resultcode, P80211ENUM_resultcode_success);</div><div class='add'>+</div><div class='add'>+	/* setting default value for channellist = all channels */</div><div class='add'>+	if (!msg-&gt;channellist.data) {</div><div class='add'>+		P80211_SET_INT(msg-&gt;channellist, 0x00007FFE);</div><div class='add'>+	}</div><div class='add'>+	/* setting default value for channeldwelltime = 100 ms */</div><div class='add'>+	if (!msg-&gt;channeldwelltime.data) {</div><div class='add'>+		P80211_SET_INT(msg-&gt;channeldwelltime, 100);</div><div class='add'>+	}</div><div class='add'>+	channel_mask = (UINT16) (msg-&gt;channellist.data &gt;&gt; 1);</div><div class='add'>+	for (i=0, n=0; i &lt; 14; i++) {</div><div class='add'>+		if (channel_mask &amp; (1&lt;&lt;i)) {</div><div class='add'>+			n++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	P80211_SET_INT(msg-&gt;numchinfo, n);</div><div class='add'>+	chinforeq.channelList = host2hfa384x_16(channel_mask);</div><div class='add'>+	chinforeq.channelDwellTime = host2hfa384x_16(msg-&gt;channeldwelltime.data);</div><div class='add'>+</div><div class='add'>+	atomic_set(&amp;hw-&gt;channel_info.done, 1);</div><div class='add'>+</div><div class='add'>+	result = hfa384x_drvr_setconfig( hw, HFA384x_RID_CHANNELINFOREQUEST,</div><div class='add'>+					 &amp;chinforeq, HFA384x_RID_CHANNELINFOREQUEST_LEN);</div><div class='add'>+	if ( result ) {</div><div class='add'>+		WLAN_LOG_ERROR("setconfig(CHANNELINFOREQUEST) failed. result=%d\n",</div><div class='add'>+				result);</div><div class='add'>+		msg-&gt;resultcode.data = P80211ENUM_resultcode_not_supported;</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+	/*</div><div class='add'>+	now = jiffies;</div><div class='add'>+	while (atomic_read(&amp;hw-&gt;channel_info.done) != 1) {</div><div class='add'>+		if ((jiffies - now) &gt; CHINFO_TIMEOUT*HZ) {</div><div class='add'>+			WLAN_LOG_NOTICE("ChannelInfo results not received in %d seconds, aborting.\n",</div><div class='add'>+					CHINFO_TIMEOUT);</div><div class='add'>+			msg-&gt;resultcode.data = P80211ENUM_resultcode_timeout;</div><div class='add'>+			goto done;</div><div class='add'>+		}</div><div class='add'>+		current-&gt;state = TASK_INTERRUPTIBLE;</div><div class='add'>+		schedule_timeout(HZ/4);</div><div class='add'>+		current-&gt;state = TASK_RUNNING;</div><div class='add'>+	}</div><div class='add'>+	*/</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2mgmt_channel_info_results</div><div class='add'>+*</div><div class='add'>+* Returns required ChannelInfo result.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		wlan device structure</div><div class='add'>+*	msgp		ptr to msg buffer</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0	success and done</div><div class='add'>+*	&lt;0	success, but we're waiting for something to finish.</div><div class='add'>+*	&gt;0	an error occurred while handling the message.</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread  (usually)</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int prism2mgmt_channel_info_results(wlandevice_t *wlandev, void *msgp)</div><div class='add'>+{</div><div class='add'>+	hfa384x_t			*hw = wlandev-&gt;priv;</div><div class='add'>+</div><div class='add'>+	p80211msg_p2req_channel_info_results_t	*msg=msgp;</div><div class='add'>+	int				result=0;</div><div class='add'>+	int		channel;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	if (!hw-&gt;ap) {</div><div class='add'>+</div><div class='add'>+		/*** STATION ***/</div><div class='add'>+</div><div class='add'>+		/* Not supported in STA f/w */</div><div class='add'>+		P80211_SET_INT(msg-&gt;resultcode, P80211ENUM_resultcode_not_supported);</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*** ACCESS POINT ***/</div><div class='add'>+</div><div class='add'>+	switch (atomic_read(&amp;hw-&gt;channel_info.done)) {</div><div class='add'>+	case 0: msg-&gt;resultcode.status = P80211ENUM_msgitem_status_no_value;</div><div class='add'>+		goto done;</div><div class='add'>+	case 1: msg-&gt;resultcode.status = P80211ENUM_msgitem_status_incomplete_itemdata;</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	P80211_SET_INT(msg-&gt;resultcode, P80211ENUM_resultcode_success);</div><div class='add'>+	channel=msg-&gt;channel.data-1;</div><div class='add'>+</div><div class='add'>+	if (channel &lt; 0 || ! (hw-&gt;channel_info.results.scanchannels &amp; 1&lt;&lt;channel) ) {</div><div class='add'>+		msg-&gt;resultcode.data = P80211ENUM_resultcode_invalid_parameters;</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+	WLAN_LOG_DEBUG(2, "chinfo_results: channel %d, avg/peak level=%d/%d dB, active=%d\n",</div><div class='add'>+			channel+1,</div><div class='add'>+			hw-&gt;channel_info.results.result[channel].anl,</div><div class='add'>+			hw-&gt;channel_info.results.result[channel].pnl,</div><div class='add'>+			hw-&gt;channel_info.results.result[channel].active</div><div class='add'>+		);</div><div class='add'>+	P80211_SET_INT(msg-&gt;avgnoiselevel, hw-&gt;channel_info.results.result[channel].anl);</div><div class='add'>+	P80211_SET_INT(msg-&gt;peaknoiselevel, hw-&gt;channel_info.results.result[channel].pnl);</div><div class='add'>+	P80211_SET_INT(msg-&gt;bssactive, hw-&gt;channel_info.results.result[channel].active &amp;</div><div class='add'>+		HFA384x_CHINFORESULT_BSSACTIVE</div><div class='add'>+                ? P80211ENUM_truth_true</div><div class='add'>+                : P80211ENUM_truth_false) ;</div><div class='add'>+	P80211_SET_INT(msg-&gt;pcfactive, hw-&gt;channel_info.results.result[channel].active &amp;</div><div class='add'>+		HFA384x_CHINFORESULT_PCFACTIVE</div><div class='add'>+                ? P80211ENUM_truth_true</div><div class='add'>+                : P80211ENUM_truth_false) ;</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2mgmt_autojoin</div><div class='add'>+*</div><div class='add'>+* Associate with an ESS.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		wlan device structure</div><div class='add'>+*	msgp		ptr to msg buffer</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0	success and done</div><div class='add'>+*	&lt;0	success, but we're waiting for something to finish.</div><div class='add'>+*	&gt;0	an error occurred while handling the message.</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread  (usually)</div><div class='add'>+*	interrupt</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int prism2mgmt_autojoin(wlandevice_t *wlandev, void *msgp)</div><div class='add'>+{</div><div class='add'>+	hfa384x_t			*hw = wlandev-&gt;priv;</div><div class='add'>+	int 			result = 0;</div><div class='add'>+	UINT16			reg;</div><div class='add'>+	UINT16			port_type;</div><div class='add'>+	p80211msg_lnxreq_autojoin_t	*msg = msgp;</div><div class='add'>+	p80211pstrd_t		*pstr;</div><div class='add'>+	UINT8			bytebuf[256];</div><div class='add'>+	hfa384x_bytestr_t	*p2bytestr = (hfa384x_bytestr_t*)bytebuf;</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	wlandev-&gt;macmode = WLAN_MACMODE_NONE;</div><div class='add'>+</div><div class='add'>+	/* Set the SSID */</div><div class='add'>+	memcpy(&amp;wlandev-&gt;ssid, &amp;msg-&gt;ssid.data, sizeof(msg-&gt;ssid.data));</div><div class='add'>+</div><div class='add'>+	if (hw-&gt;ap) {</div><div class='add'>+</div><div class='add'>+		/*** ACCESS POINT ***/</div><div class='add'>+</div><div class='add'>+		/* Never supported on AP */</div><div class='add'>+		msg-&gt;resultcode.status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+		msg-&gt;resultcode.data = P80211ENUM_resultcode_not_supported;</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Disable the Port */</div><div class='add'>+	hfa384x_drvr_disable(hw, 0);</div><div class='add'>+</div><div class='add'>+	/*** STATION ***/</div><div class='add'>+	/* Set the TxRates */</div><div class='add'>+	hfa384x_drvr_setconfig16(hw, HFA384x_RID_TXRATECNTL, 0x000f);</div><div class='add'>+</div><div class='add'>+	/* Set the auth type */</div><div class='add'>+	if ( msg-&gt;authtype.data == P80211ENUM_authalg_sharedkey ) {</div><div class='add'>+		reg = HFA384x_CNFAUTHENTICATION_SHAREDKEY;</div><div class='add'>+	} else {</div><div class='add'>+		reg = HFA384x_CNFAUTHENTICATION_OPENSYSTEM;</div><div class='add'>+	}</div><div class='add'>+	hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFAUTHENTICATION, reg);</div><div class='add'>+</div><div class='add'>+	/* Set the ssid */</div><div class='add'>+	memset(bytebuf, 0, 256);</div><div class='add'>+	pstr = (p80211pstrd_t*)&amp;(msg-&gt;ssid.data);</div><div class='add'>+	prism2mgmt_pstr2bytestr(p2bytestr, pstr);</div><div class='add'>+        result = hfa384x_drvr_setconfig(</div><div class='add'>+			hw, HFA384x_RID_CNFDESIREDSSID,</div><div class='add'>+			bytebuf, HFA384x_RID_CNFDESIREDSSID_LEN);</div><div class='add'>+#if 0</div><div class='add'>+	/* we can use the new-fangled auto-unknown mode if the firmware</div><div class='add'>+	   is 1.3.3 or newer */</div><div class='add'>+	if (HFA384x_FIRMARE_VERSION(hw-&gt;ident_sta_fw.major,</div><div class='add'>+				    hw-&gt;ident_sta_fw.minor,</div><div class='add'>+				    hw-&gt;ident_sta_fw.variant) &gt;=</div><div class='add'>+	    HFA384x_FIRMWARE_VERSION(1,3,3)) {</div><div class='add'>+		/* Set up the IBSS options */</div><div class='add'>+		reg =  HFA384x_CREATEIBSS_JOINESS_JOINCREATEIBSS;</div><div class='add'>+		hfa384x_drvr_setconfig16(hw, HFA384x_RID_CREATEIBSS, reg);</div><div class='add'>+</div><div class='add'>+		/* Set the PortType */</div><div class='add'>+		port_type = HFA384x_PORTTYPE_IBSS;</div><div class='add'>+	} else {</div><div class='add'>+		port_type = HFA384x_PORTTYPE_BSS;</div><div class='add'>+	}</div><div class='add'>+#else</div><div class='add'>+	port_type = HFA384x_PORTTYPE_BSS;</div><div class='add'>+#endif</div><div class='add'>+	/* Set the PortType */</div><div class='add'>+	hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFPORTTYPE, port_type);</div><div class='add'>+</div><div class='add'>+	/* Enable the Port */</div><div class='add'>+	hfa384x_drvr_enable(hw, 0);</div><div class='add'>+</div><div class='add'>+	/* Set the resultcode */</div><div class='add'>+	msg-&gt;resultcode.status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+	msg-&gt;resultcode.data = P80211ENUM_resultcode_success;</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2mgmt_wlansniff</div><div class='add'>+*</div><div class='add'>+* Start or stop sniffing.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		wlan device structure</div><div class='add'>+*	msgp		ptr to msg buffer</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0	success and done</div><div class='add'>+*	&lt;0	success, but we're waiting for something to finish.</div><div class='add'>+*	&gt;0	an error occurred while handling the message.</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread  (usually)</div><div class='add'>+*	interrupt</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int prism2mgmt_wlansniff(wlandevice_t *wlandev, void *msgp)</div><div class='add'>+{</div><div class='add'>+	int 			result = 0;</div><div class='add'>+	p80211msg_lnxreq_wlansniff_t	*msg = msgp;</div><div class='add'>+</div><div class='add'>+	hfa384x_t			*hw = wlandev-&gt;priv;</div><div class='add'>+	UINT16			word;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	msg-&gt;resultcode.status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+	switch (msg-&gt;enable.data)</div><div class='add'>+	{</div><div class='add'>+	case P80211ENUM_truth_false:</div><div class='add'>+		/* Confirm that we're in monitor mode */</div><div class='add'>+		if ( wlandev-&gt;netdev-&gt;type == ARPHRD_ETHER ) {</div><div class='add'>+			msg-&gt;resultcode.data = P80211ENUM_resultcode_invalid_parameters;</div><div class='add'>+			result = 0;</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+		/* Disable monitor mode */</div><div class='add'>+		result = hfa384x_cmd_monitor(hw, HFA384x_MONITOR_DISABLE);</div><div class='add'>+		if ( result ) {</div><div class='add'>+			WLAN_LOG_DEBUG(1,</div><div class='add'>+				"failed to disable monitor mode, result=%d\n",</div><div class='add'>+				result);</div><div class='add'>+			goto failed;</div><div class='add'>+		}</div><div class='add'>+		/* Disable port 0 */</div><div class='add'>+		result = hfa384x_drvr_disable(hw, 0);</div><div class='add'>+		if ( result ) {</div><div class='add'>+			WLAN_LOG_DEBUG(1,</div><div class='add'>+			"failed to disable port 0 after sniffing, result=%d\n",</div><div class='add'>+			result);</div><div class='add'>+			goto failed;</div><div class='add'>+		}</div><div class='add'>+		/* Clear the driver state */</div><div class='add'>+		wlandev-&gt;netdev-&gt;type = ARPHRD_ETHER;</div><div class='add'>+</div><div class='add'>+		/* Restore the wepflags */</div><div class='add'>+		result = hfa384x_drvr_setconfig16(hw,</div><div class='add'>+				HFA384x_RID_CNFWEPFLAGS,</div><div class='add'>+				hw-&gt;presniff_wepflags);</div><div class='add'>+		if ( result ) {</div><div class='add'>+			WLAN_LOG_DEBUG(1,</div><div class='add'>+			"failed to restore wepflags=0x%04x, result=%d\n",</div><div class='add'>+			hw-&gt;presniff_wepflags,</div><div class='add'>+			result);</div><div class='add'>+			goto failed;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Set the port to its prior type and enable (if necessary) */</div><div class='add'>+		if (hw-&gt;presniff_port_type != 0 ) {</div><div class='add'>+			word = hw-&gt;presniff_port_type;</div><div class='add'>+			result = hfa384x_drvr_setconfig16(hw,</div><div class='add'>+				HFA384x_RID_CNFPORTTYPE, word);</div><div class='add'>+			if ( result ) {</div><div class='add'>+				WLAN_LOG_DEBUG(1,</div><div class='add'>+				"failed to restore porttype, result=%d\n",</div><div class='add'>+				result);</div><div class='add'>+				goto failed;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* Enable the port */</div><div class='add'>+			result = hfa384x_drvr_enable(hw, 0);</div><div class='add'>+			if ( result ) {</div><div class='add'>+				WLAN_LOG_DEBUG(1, "failed to enable port to presniff setting, result=%d\n", result);</div><div class='add'>+				goto failed;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			result = hfa384x_drvr_disable(hw, 0);</div><div class='add'>+</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		WLAN_LOG_INFO("monitor mode disabled\n");</div><div class='add'>+		msg-&gt;resultcode.data = P80211ENUM_resultcode_success;</div><div class='add'>+		result = 0;</div><div class='add'>+		goto exit;</div><div class='add'>+		break;</div><div class='add'>+	case P80211ENUM_truth_true:</div><div class='add'>+		/* Disable the port (if enabled), only check Port 0 */</div><div class='add'>+		if ( hw-&gt;port_enabled[0]) {</div><div class='add'>+			if (wlandev-&gt;netdev-&gt;type == ARPHRD_ETHER) {</div><div class='add'>+				/* Save macport 0 state */</div><div class='add'>+				result = hfa384x_drvr_getconfig16(hw,</div><div class='add'>+								  HFA384x_RID_CNFPORTTYPE,</div><div class='add'>+								  &amp;(hw-&gt;presniff_port_type));</div><div class='add'>+				if ( result ) {</div><div class='add'>+					WLAN_LOG_DEBUG(1,"failed to read porttype, result=%d\n", result);</div><div class='add'>+					goto failed;</div><div class='add'>+				}</div><div class='add'>+				/* Save the wepflags state */</div><div class='add'>+				result = hfa384x_drvr_getconfig16(hw,</div><div class='add'>+								  HFA384x_RID_CNFWEPFLAGS,</div><div class='add'>+								  &amp;(hw-&gt;presniff_wepflags));</div><div class='add'>+				if ( result ) {</div><div class='add'>+					WLAN_LOG_DEBUG(1,"failed to read wepflags, result=%d\n", result);</div><div class='add'>+					goto failed;</div><div class='add'>+				}</div><div class='add'>+				hfa384x_drvr_stop(hw);</div><div class='add'>+				result = hfa384x_drvr_start(hw);</div><div class='add'>+				if ( result ) {</div><div class='add'>+					WLAN_LOG_DEBUG(1,</div><div class='add'>+						       "failed to restart the card for sniffing, result=%d\n",</div><div class='add'>+						       result);</div><div class='add'>+					goto failed;</div><div class='add'>+				}</div><div class='add'>+			} else {</div><div class='add'>+				/* Disable the port */</div><div class='add'>+				result = hfa384x_drvr_disable(hw, 0);</div><div class='add'>+				if ( result ) {</div><div class='add'>+					WLAN_LOG_DEBUG(1,</div><div class='add'>+						       "failed to enable port for sniffing, result=%d\n",</div><div class='add'>+						       result);</div><div class='add'>+					goto failed;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			hw-&gt;presniff_port_type = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Set the channel we wish to sniff  */</div><div class='add'>+		word = msg-&gt;channel.data;</div><div class='add'>+		result = hfa384x_drvr_setconfig16(hw,</div><div class='add'>+						  HFA384x_RID_CNFOWNCHANNEL, word);</div><div class='add'>+		hw-&gt;sniff_channel=word;</div><div class='add'>+</div><div class='add'>+		if ( result ) {</div><div class='add'>+			WLAN_LOG_DEBUG(1,</div><div class='add'>+				       "failed to set channel %d, result=%d\n",</div><div class='add'>+					       word,</div><div class='add'>+				       result);</div><div class='add'>+			goto failed;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Now if we're already sniffing, we can skip the rest */</div><div class='add'>+		if (wlandev-&gt;netdev-&gt;type != ARPHRD_ETHER) {</div><div class='add'>+			/* Set the port type to pIbss */</div><div class='add'>+			word = HFA384x_PORTTYPE_PSUEDOIBSS;</div><div class='add'>+			result = hfa384x_drvr_setconfig16(hw,</div><div class='add'>+							  HFA384x_RID_CNFPORTTYPE, word);</div><div class='add'>+			if ( result ) {</div><div class='add'>+				WLAN_LOG_DEBUG(1,</div><div class='add'>+					       "failed to set porttype %d, result=%d\n",</div><div class='add'>+					       word,</div><div class='add'>+					       result);</div><div class='add'>+				goto failed;</div><div class='add'>+			}</div><div class='add'>+			if ((msg-&gt;keepwepflags.status == P80211ENUM_msgitem_status_data_ok) &amp;&amp; (msg-&gt;keepwepflags.data != P80211ENUM_truth_true)) {</div><div class='add'>+				/* Set the wepflags for no decryption */</div><div class='add'>+				word = HFA384x_WEPFLAGS_DISABLE_TXCRYPT |</div><div class='add'>+					HFA384x_WEPFLAGS_DISABLE_RXCRYPT;</div><div class='add'>+				result = hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFWEPFLAGS, word);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if ( result ) {</div><div class='add'>+				WLAN_LOG_DEBUG(1,</div><div class='add'>+					       "failed to set wepflags=0x%04x, result=%d\n",</div><div class='add'>+					       word,</div><div class='add'>+					       result);</div><div class='add'>+				goto failed;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Do we want to strip the FCS in monitor mode? */</div><div class='add'>+		if ((msg-&gt;stripfcs.status == P80211ENUM_msgitem_status_data_ok) &amp;&amp; (msg-&gt;stripfcs.data == P80211ENUM_truth_true)) {</div><div class='add'>+			hw-&gt;sniff_fcs = 0;</div><div class='add'>+		} else {</div><div class='add'>+			hw-&gt;sniff_fcs = 1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Do we want to truncate the packets? */</div><div class='add'>+		if (msg-&gt;packet_trunc.status == P80211ENUM_msgitem_status_data_ok) {</div><div class='add'>+			hw-&gt;sniff_truncate = msg-&gt;packet_trunc.data;</div><div class='add'>+		} else {</div><div class='add'>+			hw-&gt;sniff_truncate = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Enable the port */</div><div class='add'>+		result = hfa384x_drvr_enable(hw, 0);</div><div class='add'>+		if ( result ) {</div><div class='add'>+			WLAN_LOG_DEBUG(1,</div><div class='add'>+			"failed to enable port for sniffing, result=%d\n",</div><div class='add'>+			result);</div><div class='add'>+			goto failed;</div><div class='add'>+		}</div><div class='add'>+		/* Enable monitor mode */</div><div class='add'>+		result = hfa384x_cmd_monitor(hw, HFA384x_MONITOR_ENABLE);</div><div class='add'>+		if ( result ) {</div><div class='add'>+			WLAN_LOG_DEBUG(1,</div><div class='add'>+			"failed to enable monitor mode, result=%d\n",</div><div class='add'>+			result);</div><div class='add'>+			goto failed;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (wlandev-&gt;netdev-&gt;type == ARPHRD_ETHER) {</div><div class='add'>+			WLAN_LOG_INFO("monitor mode enabled\n");</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Set the driver state */</div><div class='add'>+		/* Do we want the prism2 header? */</div><div class='add'>+		if ((msg-&gt;prismheader.status == P80211ENUM_msgitem_status_data_ok) &amp;&amp; (msg-&gt;prismheader.data == P80211ENUM_truth_true)) {</div><div class='add'>+			hw-&gt;sniffhdr = 0;</div><div class='add'>+			wlandev-&gt;netdev-&gt;type = ARPHRD_IEEE80211_PRISM;</div><div class='add'>+		} else if ((msg-&gt;wlanheader.status == P80211ENUM_msgitem_status_data_ok) &amp;&amp; (msg-&gt;wlanheader.data == P80211ENUM_truth_true)) {</div><div class='add'>+			hw-&gt;sniffhdr = 1;</div><div class='add'>+			wlandev-&gt;netdev-&gt;type = ARPHRD_IEEE80211_PRISM;</div><div class='add'>+		} else {</div><div class='add'>+			wlandev-&gt;netdev-&gt;type = ARPHRD_IEEE80211;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		msg-&gt;resultcode.data = P80211ENUM_resultcode_success;</div><div class='add'>+		result = 0;</div><div class='add'>+		goto exit;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		msg-&gt;resultcode.data = P80211ENUM_resultcode_invalid_parameters;</div><div class='add'>+		result = 0;</div><div class='add'>+		goto exit;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+failed:</div><div class='add'>+	msg-&gt;resultcode.data = P80211ENUM_resultcode_refused;</div><div class='add'>+	result = 0;</div><div class='add'>+exit:</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/staging/wlan-ng/prism2mgmt.h b/drivers/staging/wlan-ng/prism2mgmt.h<br/>new file mode 100644<br/>index 000000000000..733fd999c928<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/wlan-ng/prism2mgmt.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/wlan-ng/prism2mgmt.h</a></div><div class='hunk'>@@ -0,0 +1,182 @@</div><div class='add'>+/* prism2mgmt.h</div><div class='add'>+*</div><div class='add'>+* Declares the mgmt command handler functions</div><div class='add'>+*</div><div class='add'>+* Copyright (C) 1999 AbsoluteValue Systems, Inc.  All Rights Reserved.</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* linux-wlan</div><div class='add'>+*</div><div class='add'>+*   The contents of this file are subject to the Mozilla Public</div><div class='add'>+*   License Version 1.1 (the "License"); you may not use this file</div><div class='add'>+*   except in compliance with the License. You may obtain a copy of</div><div class='add'>+*   the License at http://www.mozilla.org/MPL/</div><div class='add'>+*</div><div class='add'>+*   Software distributed under the License is distributed on an "AS</div><div class='add'>+*   IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or</div><div class='add'>+*   implied. See the License for the specific language governing</div><div class='add'>+*   rights and limitations under the License.</div><div class='add'>+*</div><div class='add'>+*   Alternatively, the contents of this file may be used under the</div><div class='add'>+*   terms of the GNU Public License version 2 (the "GPL"), in which</div><div class='add'>+*   case the provisions of the GPL are applicable instead of the</div><div class='add'>+*   above.  If you wish to allow the use of your version of this file</div><div class='add'>+*   only under the terms of the GPL and not to allow others to use</div><div class='add'>+*   your version of this file under the MPL, indicate your decision</div><div class='add'>+*   by deleting the provisions above and replace them with the notice</div><div class='add'>+*   and other provisions required by the GPL.  If you do not delete</div><div class='add'>+*   the provisions above, a recipient may use your version of this</div><div class='add'>+*   file under either the MPL or the GPL.</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* Inquiries regarding the linux-wlan Open Source project can be</div><div class='add'>+* made directly to:</div><div class='add'>+*</div><div class='add'>+* AbsoluteValue Systems Inc.</div><div class='add'>+* info@linux-wlan.com</div><div class='add'>+* http://www.linux-wlan.com</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* Portions of the development of this software were funded by</div><div class='add'>+* Intersil Corporation as part of PRISM(R) chipset product development.</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* This file contains the constants and data structures for interaction</div><div class='add'>+* with the hfa384x Wireless LAN (WLAN) Media Access Contoller (MAC).</div><div class='add'>+* The hfa384x is a portion of the Harris PRISM(tm) WLAN chipset.</div><div class='add'>+*</div><div class='add'>+* [Implementation and usage notes]</div><div class='add'>+*</div><div class='add'>+* [References]</div><div class='add'>+*   CW10 Programmer's Manual v1.5</div><div class='add'>+*   IEEE 802.11 D10.0</div><div class='add'>+*</div><div class='add'>+*    --------------------------------------------------------------------</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#ifndef _PRISM2MGMT_H</div><div class='add'>+#define _PRISM2MGMT_H</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*=============================================================*/</div><div class='add'>+/*------ Constants --------------------------------------------*/</div><div class='add'>+</div><div class='add'>+/*=============================================================*/</div><div class='add'>+/*------ Macros -----------------------------------------------*/</div><div class='add'>+</div><div class='add'>+/*=============================================================*/</div><div class='add'>+/*------ Types and their related constants --------------------*/</div><div class='add'>+</div><div class='add'>+/*=============================================================*/</div><div class='add'>+/*------ Static variable externs ------------------------------*/</div><div class='add'>+</div><div class='add'>+#if (WLAN_HOSTIF != WLAN_USB)</div><div class='add'>+extern int      prism2_bap_timeout;</div><div class='add'>+extern int	prism2_irq_evread_max;</div><div class='add'>+#endif</div><div class='add'>+extern int	prism2_debug;</div><div class='add'>+extern int      prism2_reset_holdtime;</div><div class='add'>+extern int      prism2_reset_settletime;</div><div class='add'>+/*=============================================================*/</div><div class='add'>+/*--- Function Declarations -----------------------------------*/</div><div class='add'>+/*=============================================================*/</div><div class='add'>+</div><div class='add'>+UINT32</div><div class='add'>+prism2sta_ifstate(wlandevice_t *wlandev, UINT32 ifstate);</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+prism2sta_ev_dtim(wlandevice_t *wlandev);</div><div class='add'>+void</div><div class='add'>+prism2sta_ev_infdrop(wlandevice_t *wlandev);</div><div class='add'>+void</div><div class='add'>+prism2sta_ev_info(wlandevice_t *wlandev, hfa384x_InfFrame_t *inf);</div><div class='add'>+void</div><div class='add'>+prism2sta_ev_txexc(wlandevice_t *wlandev, UINT16 status);</div><div class='add'>+void</div><div class='add'>+prism2sta_ev_tx(wlandevice_t *wlandev, UINT16 status);</div><div class='add'>+void</div><div class='add'>+prism2sta_ev_rx(wlandevice_t *wlandev, struct sk_buff *skb);</div><div class='add'>+void</div><div class='add'>+prism2sta_ev_alloc(wlandevice_t *wlandev);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+int prism2mgmt_mibset_mibget(wlandevice_t *wlandev, void *msgp);</div><div class='add'>+int prism2mgmt_powermgmt(wlandevice_t *wlandev, void *msgp);</div><div class='add'>+int prism2mgmt_scan(wlandevice_t *wlandev, void *msgp);</div><div class='add'>+int prism2mgmt_scan_results(wlandevice_t *wlandev, void *msgp);</div><div class='add'>+int prism2mgmt_join(wlandevice_t *wlandev, void *msgp);</div><div class='add'>+int prism2mgmt_p2_join(wlandevice_t *wlandev, void *msgp);</div><div class='add'>+int prism2mgmt_authenticate(wlandevice_t *wlandev, void *msgp);</div><div class='add'>+int prism2mgmt_deauthenticate(wlandevice_t *wlandev, void *msgp);</div><div class='add'>+int prism2mgmt_associate(wlandevice_t *wlandev, void *msgp);</div><div class='add'>+int prism2mgmt_reassociate(wlandevice_t *wlandev, void *msgp);</div><div class='add'>+int prism2mgmt_disassociate(wlandevice_t *wlandev, void *msgp);</div><div class='add'>+int prism2mgmt_reset(wlandevice_t *wlandev, void *msgp);</div><div class='add'>+int prism2mgmt_start(wlandevice_t *wlandev, void *msgp);</div><div class='add'>+int prism2mgmt_wlansniff(wlandevice_t *wlandev, void *msgp);</div><div class='add'>+int prism2mgmt_readpda(wlandevice_t *wlandev, void *msgp);</div><div class='add'>+int prism2mgmt_readcis(wlandevice_t *wlandev, void *msgp);</div><div class='add'>+int prism2mgmt_auxport_state(wlandevice_t *wlandev, void *msgp);</div><div class='add'>+int prism2mgmt_auxport_read(wlandevice_t *wlandev, void *msgp);</div><div class='add'>+int prism2mgmt_auxport_write(wlandevice_t *wlandev, void *msgp);</div><div class='add'>+int prism2mgmt_low_level(wlandevice_t *wlandev, void *msgp);</div><div class='add'>+int prism2mgmt_test_command(wlandevice_t *wlandev, void *msgp);</div><div class='add'>+int prism2mgmt_mmi_read(wlandevice_t *wlandev, void *msgp);</div><div class='add'>+int prism2mgmt_mmi_write(wlandevice_t *wlandev, void *msgp);</div><div class='add'>+int prism2mgmt_ramdl_state(wlandevice_t *wlandev, void *msgp);</div><div class='add'>+int prism2mgmt_ramdl_write(wlandevice_t *wlandev, void *msgp);</div><div class='add'>+int prism2mgmt_flashdl_state(wlandevice_t *wlandev, void *msgp);</div><div class='add'>+int prism2mgmt_flashdl_write(wlandevice_t *wlandev, void *msgp);</div><div class='add'>+int prism2mgmt_mm_state(wlandevice_t *wlandev, void *msgp);</div><div class='add'>+int prism2mgmt_dump_state(wlandevice_t *wlandev, void *msgp);</div><div class='add'>+int prism2mgmt_enable(wlandevice_t *wlandev, void *msgp);</div><div class='add'>+int prism2mgmt_channel_info(wlandevice_t *wlandev, void *msgp);</div><div class='add'>+int prism2mgmt_channel_info_results(wlandevice_t *wlandev, void *msgp);</div><div class='add'>+int prism2mgmt_autojoin(wlandevice_t *wlandev, void *msgp);</div><div class='add'>+</div><div class='add'>+/*---------------------------------------------------------------</div><div class='add'>+* conversion functions going between wlan message data types and</div><div class='add'>+* Prism2 data types</div><div class='add'>+---------------------------------------------------------------*/</div><div class='add'>+/* byte area conversion functions*/</div><div class='add'>+void prism2mgmt_pstr2bytearea(UINT8 *bytearea, p80211pstrd_t *pstr);</div><div class='add'>+void prism2mgmt_bytearea2pstr(UINT8 *bytearea, p80211pstrd_t *pstr, int len);</div><div class='add'>+</div><div class='add'>+/* byte string conversion functions*/</div><div class='add'>+void prism2mgmt_pstr2bytestr(hfa384x_bytestr_t *bytestr, p80211pstrd_t *pstr);</div><div class='add'>+void prism2mgmt_bytestr2pstr(hfa384x_bytestr_t *bytestr, p80211pstrd_t *pstr);</div><div class='add'>+</div><div class='add'>+/* integer conversion functions */</div><div class='add'>+void prism2mgmt_prism2int2p80211int(UINT16 *prism2int, UINT32 *wlanint);</div><div class='add'>+void prism2mgmt_p80211int2prism2int(UINT16 *prism2int, UINT32 *wlanint);</div><div class='add'>+</div><div class='add'>+/* enumerated integer conversion functions */</div><div class='add'>+void prism2mgmt_prism2enum2p80211enum(UINT16 *prism2enum, UINT32 *wlanenum, UINT16 rid);</div><div class='add'>+void prism2mgmt_p80211enum2prism2enum(UINT16 *prism2enum, UINT32 *wlanenum, UINT16 rid);</div><div class='add'>+</div><div class='add'>+/* functions to convert a bit area to/from an Operational Rate Set */</div><div class='add'>+void prism2mgmt_get_oprateset(UINT16 *rate, p80211pstrd_t *pstr);</div><div class='add'>+void prism2mgmt_set_oprateset(UINT16 *rate, p80211pstrd_t *pstr);</div><div class='add'>+</div><div class='add'>+/* functions to convert Group Addresses */</div><div class='add'>+void prism2mgmt_get_grpaddr(UINT32 did,</div><div class='add'>+	p80211pstrd_t *pstr, hfa384x_t *priv );</div><div class='add'>+int prism2mgmt_set_grpaddr(UINT32 did,</div><div class='add'>+	UINT8 *prism2buf, p80211pstrd_t *pstr, hfa384x_t *priv );</div><div class='add'>+int prism2mgmt_get_grpaddr_index( UINT32 did );</div><div class='add'>+</div><div class='add'>+void prism2sta_processing_defer(struct work_struct *data);</div><div class='add'>+</div><div class='add'>+void prism2sta_commsqual_defer(struct work_struct *data);</div><div class='add'>+void prism2sta_commsqual_timer(unsigned long data);</div><div class='add'>+</div><div class='add'>+/*=============================================================*/</div><div class='add'>+/*--- Inline Function Definitions (if supported) --------------*/</div><div class='add'>+/*=============================================================*/</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/staging/wlan-ng/prism2mib.c b/drivers/staging/wlan-ng/prism2mib.c<br/>new file mode 100644<br/>index 000000000000..268fd9bba1ef<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/wlan-ng/prism2mib.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/wlan-ng/prism2mib.c</a></div><div class='hunk'>@@ -0,0 +1,3799 @@</div><div class='add'>+/* src/prism2/driver/prism2mib.c</div><div class='add'>+*</div><div class='add'>+* Management request for mibset/mibget</div><div class='add'>+*</div><div class='add'>+* Copyright (C) 1999 AbsoluteValue Systems, Inc.  All Rights Reserved.</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* linux-wlan</div><div class='add'>+*</div><div class='add'>+*   The contents of this file are subject to the Mozilla Public</div><div class='add'>+*   License Version 1.1 (the "License"); you may not use this file</div><div class='add'>+*   except in compliance with the License. You may obtain a copy of</div><div class='add'>+*   the License at http://www.mozilla.org/MPL/</div><div class='add'>+*</div><div class='add'>+*   Software distributed under the License is distributed on an "AS</div><div class='add'>+*   IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or</div><div class='add'>+*   implied. See the License for the specific language governing</div><div class='add'>+*   rights and limitations under the License.</div><div class='add'>+*</div><div class='add'>+*   Alternatively, the contents of this file may be used under the</div><div class='add'>+*   terms of the GNU Public License version 2 (the "GPL"), in which</div><div class='add'>+*   case the provisions of the GPL are applicable instead of the</div><div class='add'>+*   above.  If you wish to allow the use of your version of this file</div><div class='add'>+*   only under the terms of the GPL and not to allow others to use</div><div class='add'>+*   your version of this file under the MPL, indicate your decision</div><div class='add'>+*   by deleting the provisions above and replace them with the notice</div><div class='add'>+*   and other provisions required by the GPL.  If you do not delete</div><div class='add'>+*   the provisions above, a recipient may use your version of this</div><div class='add'>+*   file under either the MPL or the GPL.</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* Inquiries regarding the linux-wlan Open Source project can be</div><div class='add'>+* made directly to:</div><div class='add'>+*</div><div class='add'>+* AbsoluteValue Systems Inc.</div><div class='add'>+* info@linux-wlan.com</div><div class='add'>+* http://www.linux-wlan.com</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* Portions of the development of this software were funded by</div><div class='add'>+* Intersil Corporation as part of PRISM(R) chipset product development.</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* The functions in this file handle the mibset/mibget management</div><div class='add'>+* functions.</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* System Includes */</div><div class='add'>+#define WLAN_DBVAR	prism2_debug</div><div class='add'>+</div><div class='add'>+#include "version.h"</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#include &lt;linux/version.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/wireless.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;asm/byteorder.h&gt;</div><div class='add'>+</div><div class='add'>+#include "wlan_compat.h"</div><div class='add'>+</div><div class='add'>+//#if (WLAN_HOSTIF == WLAN_PCMCIA)</div><div class='add'>+//#include &lt;pcmcia/version.h&gt;</div><div class='add'>+//#include &lt;pcmcia/cs_types.h&gt;</div><div class='add'>+//#include &lt;pcmcia/cs.h&gt;</div><div class='add'>+//#include &lt;pcmcia/cistpl.h&gt;</div><div class='add'>+//#include &lt;pcmcia/ds.h&gt;</div><div class='add'>+//#include &lt;pcmcia/cisreg.h&gt;</div><div class='add'>+//#endif</div><div class='add'>+//</div><div class='add'>+//#if ((WLAN_HOSTIF == WLAN_PLX) || (WLAN_HOSTIF == WLAN_PCI))</div><div class='add'>+//#include &lt;linux/ioport.h&gt;</div><div class='add'>+//#include &lt;linux/pci.h&gt;</div><div class='add'>+//endif</div><div class='add'>+</div><div class='add'>+//#if (WLAN_HOSTIF == WLAN_USB)</div><div class='add'>+#include &lt;linux/usb.h&gt;</div><div class='add'>+//#endif</div><div class='add'>+</div><div class='add'>+#include "wlan_compat.h"</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Project Includes */</div><div class='add'>+</div><div class='add'>+#include "p80211types.h"</div><div class='add'>+#include "p80211hdr.h"</div><div class='add'>+#include "p80211mgmt.h"</div><div class='add'>+#include "p80211conv.h"</div><div class='add'>+#include "p80211msg.h"</div><div class='add'>+#include "p80211netdev.h"</div><div class='add'>+#include "p80211metadef.h"</div><div class='add'>+#include "p80211metastruct.h"</div><div class='add'>+#include "hfa384x.h"</div><div class='add'>+#include "prism2mgmt.h"</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Local Constants */</div><div class='add'>+</div><div class='add'>+#define MIB_TMP_MAXLEN    200    /* Max length of RID record (in bytes). */</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Local Types */</div><div class='add'>+</div><div class='add'>+#define  F_AP         0x1        /* MIB is supported on Access Points. */</div><div class='add'>+#define  F_STA        0x2        /* MIB is supported on stations. */</div><div class='add'>+#define  F_READ       0x4        /* MIB may be read. */</div><div class='add'>+#define  F_WRITE      0x8        /* MIB may be written. */</div><div class='add'>+</div><div class='add'>+typedef struct mibrec</div><div class='add'>+{</div><div class='add'>+    UINT32   did;</div><div class='add'>+    UINT16   flag;</div><div class='add'>+    UINT16   parm1;</div><div class='add'>+    UINT16   parm2;</div><div class='add'>+    UINT16   parm3;</div><div class='add'>+    int      (*func)(struct mibrec                *mib,</div><div class='add'>+                     int                          isget,</div><div class='add'>+                     wlandevice_t                 *wlandev,</div><div class='add'>+                     hfa384x_t                    *hw,</div><div class='add'>+                     p80211msg_dot11req_mibset_t  *msg,</div><div class='add'>+                     void                         *data);</div><div class='add'>+} mibrec_t;</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Local Function Declarations */</div><div class='add'>+</div><div class='add'>+static int prism2mib_bytestr2pstr(</div><div class='add'>+mibrec_t                     *mib,</div><div class='add'>+int                          isget,</div><div class='add'>+wlandevice_t                 *wlandev,</div><div class='add'>+hfa384x_t                    *hw,</div><div class='add'>+p80211msg_dot11req_mibset_t  *msg,</div><div class='add'>+void                         *data);</div><div class='add'>+</div><div class='add'>+static int prism2mib_bytearea2pstr(</div><div class='add'>+mibrec_t                     *mib,</div><div class='add'>+int                          isget,</div><div class='add'>+wlandevice_t                 *wlandev,</div><div class='add'>+hfa384x_t                    *hw,</div><div class='add'>+p80211msg_dot11req_mibset_t  *msg,</div><div class='add'>+void                         *data);</div><div class='add'>+</div><div class='add'>+static int prism2mib_uint32(</div><div class='add'>+mibrec_t                     *mib,</div><div class='add'>+int                          isget,</div><div class='add'>+wlandevice_t                 *wlandev,</div><div class='add'>+hfa384x_t                    *hw,</div><div class='add'>+p80211msg_dot11req_mibset_t  *msg,</div><div class='add'>+void                         *data);</div><div class='add'>+</div><div class='add'>+static int prism2mib_uint32array(</div><div class='add'>+mibrec_t                     *mib,</div><div class='add'>+int                          isget,</div><div class='add'>+wlandevice_t                 *wlandev,</div><div class='add'>+hfa384x_t                    *hw,</div><div class='add'>+p80211msg_dot11req_mibset_t  *msg,</div><div class='add'>+void                         *data);</div><div class='add'>+</div><div class='add'>+static int prism2mib_uint32offset(</div><div class='add'>+mibrec_t                     *mib,</div><div class='add'>+int                          isget,</div><div class='add'>+wlandevice_t                 *wlandev,</div><div class='add'>+hfa384x_t                    *hw,</div><div class='add'>+p80211msg_dot11req_mibset_t  *msg,</div><div class='add'>+void                         *data);</div><div class='add'>+</div><div class='add'>+static int prism2mib_truth(</div><div class='add'>+mibrec_t                     *mib,</div><div class='add'>+int                          isget,</div><div class='add'>+wlandevice_t                 *wlandev,</div><div class='add'>+hfa384x_t                    *hw,</div><div class='add'>+p80211msg_dot11req_mibset_t  *msg,</div><div class='add'>+void                         *data);</div><div class='add'>+</div><div class='add'>+static int prism2mib_preamble(</div><div class='add'>+mibrec_t                     *mib,</div><div class='add'>+int                          isget,</div><div class='add'>+wlandevice_t                 *wlandev,</div><div class='add'>+hfa384x_t                    *hw,</div><div class='add'>+p80211msg_dot11req_mibset_t  *msg,</div><div class='add'>+void                         *data);</div><div class='add'>+</div><div class='add'>+static int prism2mib_flag(</div><div class='add'>+mibrec_t                     *mib,</div><div class='add'>+int                          isget,</div><div class='add'>+wlandevice_t                 *wlandev,</div><div class='add'>+hfa384x_t                    *hw,</div><div class='add'>+p80211msg_dot11req_mibset_t  *msg,</div><div class='add'>+void                         *data);</div><div class='add'>+</div><div class='add'>+static int prism2mib_appcfinfoflag(</div><div class='add'>+mibrec_t                     *mib,</div><div class='add'>+int                          isget,</div><div class='add'>+wlandevice_t                 *wlandev,</div><div class='add'>+hfa384x_t                    *hw,</div><div class='add'>+p80211msg_dot11req_mibset_t  *msg,</div><div class='add'>+void                         *data);</div><div class='add'>+</div><div class='add'>+static int prism2mib_regulatorydomains(</div><div class='add'>+mibrec_t                     *mib,</div><div class='add'>+int                          isget,</div><div class='add'>+wlandevice_t                 *wlandev,</div><div class='add'>+hfa384x_t                    *hw,</div><div class='add'>+p80211msg_dot11req_mibset_t  *msg,</div><div class='add'>+void                         *data);</div><div class='add'>+</div><div class='add'>+static int prism2mib_wepdefaultkey(</div><div class='add'>+mibrec_t                     *mib,</div><div class='add'>+int                          isget,</div><div class='add'>+wlandevice_t                 *wlandev,</div><div class='add'>+hfa384x_t                    *hw,</div><div class='add'>+p80211msg_dot11req_mibset_t  *msg,</div><div class='add'>+void                         *data);</div><div class='add'>+</div><div class='add'>+static int prism2mib_powermanagement(</div><div class='add'>+mibrec_t                     *mib,</div><div class='add'>+int                          isget,</div><div class='add'>+wlandevice_t                 *wlandev,</div><div class='add'>+hfa384x_t                    *hw,</div><div class='add'>+p80211msg_dot11req_mibset_t  *msg,</div><div class='add'>+void                         *data);</div><div class='add'>+</div><div class='add'>+static int prism2mib_privacyinvoked(</div><div class='add'>+mibrec_t                     *mib,</div><div class='add'>+int                          isget,</div><div class='add'>+wlandevice_t                 *wlandev,</div><div class='add'>+hfa384x_t                    *hw,</div><div class='add'>+p80211msg_dot11req_mibset_t  *msg,</div><div class='add'>+void                         *data);</div><div class='add'>+</div><div class='add'>+static int prism2mib_excludeunencrypted(</div><div class='add'>+mibrec_t                     *mib,</div><div class='add'>+int                          isget,</div><div class='add'>+wlandevice_t                 *wlandev,</div><div class='add'>+hfa384x_t                    *hw,</div><div class='add'>+p80211msg_dot11req_mibset_t  *msg,</div><div class='add'>+void                         *data);</div><div class='add'>+</div><div class='add'>+static int prism2mib_fragmentationthreshold(</div><div class='add'>+mibrec_t                     *mib,</div><div class='add'>+int                          isget,</div><div class='add'>+wlandevice_t                 *wlandev,</div><div class='add'>+hfa384x_t                    *hw,</div><div class='add'>+p80211msg_dot11req_mibset_t  *msg,</div><div class='add'>+void                         *data);</div><div class='add'>+</div><div class='add'>+static int prism2mib_operationalrateset(</div><div class='add'>+mibrec_t                     *mib,</div><div class='add'>+int                          isget,</div><div class='add'>+wlandevice_t                 *wlandev,</div><div class='add'>+hfa384x_t                    *hw,</div><div class='add'>+p80211msg_dot11req_mibset_t  *msg,</div><div class='add'>+void                         *data);</div><div class='add'>+</div><div class='add'>+static int prism2mib_groupaddress(</div><div class='add'>+mibrec_t                     *mib,</div><div class='add'>+int                          isget,</div><div class='add'>+wlandevice_t                 *wlandev,</div><div class='add'>+hfa384x_t                    *hw,</div><div class='add'>+p80211msg_dot11req_mibset_t  *msg,</div><div class='add'>+void                         *data);</div><div class='add'>+</div><div class='add'>+static int prism2mib_fwid(</div><div class='add'>+mibrec_t                     *mib,</div><div class='add'>+int                          isget,</div><div class='add'>+wlandevice_t                 *wlandev,</div><div class='add'>+hfa384x_t                    *hw,</div><div class='add'>+p80211msg_dot11req_mibset_t  *msg,</div><div class='add'>+void                         *data);</div><div class='add'>+</div><div class='add'>+static int prism2mib_authalg(</div><div class='add'>+mibrec_t                     *mib,</div><div class='add'>+int                          isget,</div><div class='add'>+wlandevice_t                 *wlandev,</div><div class='add'>+hfa384x_t                    *hw,</div><div class='add'>+p80211msg_dot11req_mibset_t  *msg,</div><div class='add'>+void                         *data);</div><div class='add'>+</div><div class='add'>+static int prism2mib_authalgenable(</div><div class='add'>+mibrec_t                     *mib,</div><div class='add'>+int                          isget,</div><div class='add'>+wlandevice_t                 *wlandev,</div><div class='add'>+hfa384x_t                    *hw,</div><div class='add'>+p80211msg_dot11req_mibset_t  *msg,</div><div class='add'>+void                         *data);</div><div class='add'>+</div><div class='add'>+static int prism2mib_priv(</div><div class='add'>+mibrec_t                     *mib,</div><div class='add'>+int                          isget,</div><div class='add'>+wlandevice_t                 *wlandev,</div><div class='add'>+hfa384x_t                    *hw,</div><div class='add'>+p80211msg_dot11req_mibset_t  *msg,</div><div class='add'>+void                         *data);</div><div class='add'>+</div><div class='add'>+static void prism2mib_priv_authlist(</div><div class='add'>+hfa384x_t      *hw,</div><div class='add'>+prism2sta_authlist_t  *list);</div><div class='add'>+</div><div class='add'>+static void prism2mib_priv_accessmode(</div><div class='add'>+hfa384x_t         *hw,</div><div class='add'>+UINT32            mode);</div><div class='add'>+</div><div class='add'>+static void prism2mib_priv_accessallow(</div><div class='add'>+hfa384x_t         *hw,</div><div class='add'>+p80211macarray_t  *macarray);</div><div class='add'>+</div><div class='add'>+static void prism2mib_priv_accessdeny(</div><div class='add'>+hfa384x_t         *hw,</div><div class='add'>+p80211macarray_t  *macarray);</div><div class='add'>+</div><div class='add'>+static void prism2mib_priv_deauthenticate(</div><div class='add'>+hfa384x_t         *hw,</div><div class='add'>+UINT8             *addr);</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Local Static Definitions */</div><div class='add'>+</div><div class='add'>+static mibrec_t mibtab[] = {</div><div class='add'>+</div><div class='add'>+    /* dot11smt MIB's */</div><div class='add'>+</div><div class='add'>+    { DIDmib_dot11smt_dot11StationConfigTable_dot11StationID,</div><div class='add'>+          F_AP | F_STA | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_CNFOWNMACADDR, HFA384x_RID_CNFOWNMACADDR_LEN, 0,</div><div class='add'>+          prism2mib_bytearea2pstr },</div><div class='add'>+    { DIDmib_dot11smt_dot11StationConfigTable_dot11MediumOccupancyLimit,</div><div class='add'>+          F_AP | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_CNFAPPCFINFO, HFA384x_RID_CNFAPPCFINFO_LEN, 0,</div><div class='add'>+          prism2mib_uint32offset },</div><div class='add'>+    { DIDmib_dot11smt_dot11StationConfigTable_dot11CFPollable,</div><div class='add'>+          F_STA | F_READ,</div><div class='add'>+          HFA384x_RID_CFPOLLABLE, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_dot11smt_dot11StationConfigTable_dot11CFPPeriod,</div><div class='add'>+          F_AP | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_CNFAPPCFINFO, HFA384x_RID_CNFAPPCFINFO_LEN, 1,</div><div class='add'>+          prism2mib_uint32offset },</div><div class='add'>+    { DIDmib_dot11smt_dot11StationConfigTable_dot11CFPMaxDuration,</div><div class='add'>+          F_AP | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_CNFAPPCFINFO, HFA384x_RID_CNFAPPCFINFO_LEN, 2,</div><div class='add'>+          prism2mib_uint32offset },</div><div class='add'>+    { DIDmib_dot11smt_dot11StationConfigTable_dot11AuthenticationResponseTimeOut,</div><div class='add'>+          F_STA | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_CNFAUTHRSPTIMEOUT, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_dot11smt_dot11StationConfigTable_dot11PrivacyOptionImplemented,</div><div class='add'>+          F_AP | F_STA | F_READ,</div><div class='add'>+          HFA384x_RID_PRIVACYOPTIMP, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_dot11smt_dot11StationConfigTable_dot11PowerManagementMode,</div><div class='add'>+          F_STA | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_CNFPMENABLED, 0, 0,</div><div class='add'>+          prism2mib_powermanagement },</div><div class='add'>+    { DIDmib_dot11smt_dot11StationConfigTable_dot11DesiredSSID,</div><div class='add'>+          F_STA | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_CNFDESIREDSSID, HFA384x_RID_CNFDESIREDSSID_LEN, 0,</div><div class='add'>+          prism2mib_bytestr2pstr },</div><div class='add'>+    { DIDmib_dot11smt_dot11StationConfigTable_dot11DesiredBSSType,</div><div class='add'>+          F_STA | F_READ | F_WRITE,</div><div class='add'>+          0, 0, 0,</div><div class='add'>+          prism2mib_priv },</div><div class='add'>+    { DIDmib_dot11smt_dot11StationConfigTable_dot11OperationalRateSet,</div><div class='add'>+          F_STA | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_TXRATECNTL, 0, 0,</div><div class='add'>+          prism2mib_operationalrateset },</div><div class='add'>+    { DIDmib_dot11smt_dot11StationConfigTable_dot11OperationalRateSet,</div><div class='add'>+          F_AP | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_TXRATECNTL0, 0, 0,</div><div class='add'>+          prism2mib_operationalrateset },</div><div class='add'>+    { DIDmib_dot11smt_dot11StationConfigTable_dot11BeaconPeriod,</div><div class='add'>+          F_AP | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_CNFAPBCNINT, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_dot11smt_dot11StationConfigTable_dot11DTIMPeriod,</div><div class='add'>+          F_AP | F_STA | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_CNFOWNDTIMPER, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_dot11smt_dot11StationConfigTable_dot11AssociationResponseTimeOut,</div><div class='add'>+          F_AP | F_STA | F_READ,</div><div class='add'>+          HFA384x_RID_PROTOCOLRSPTIME, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_dot11smt_dot11AuthenticationAlgorithmsTable_dot11AuthenticationAlgorithm1,</div><div class='add'>+          F_AP | F_STA | F_READ,</div><div class='add'>+          1, 0, 0,</div><div class='add'>+          prism2mib_authalg },</div><div class='add'>+    { DIDmib_dot11smt_dot11AuthenticationAlgorithmsTable_dot11AuthenticationAlgorithm2,</div><div class='add'>+          F_AP | F_STA | F_READ,</div><div class='add'>+          2, 0, 0,</div><div class='add'>+          prism2mib_authalg },</div><div class='add'>+    { DIDmib_dot11smt_dot11AuthenticationAlgorithmsTable_dot11AuthenticationAlgorithm3,</div><div class='add'>+          F_AP | F_STA | F_READ,</div><div class='add'>+          3, 0, 0,</div><div class='add'>+          prism2mib_authalg },</div><div class='add'>+    { DIDmib_dot11smt_dot11AuthenticationAlgorithmsTable_dot11AuthenticationAlgorithm4,</div><div class='add'>+          F_AP | F_STA | F_READ,</div><div class='add'>+          4, 0, 0,</div><div class='add'>+          prism2mib_authalg },</div><div class='add'>+    { DIDmib_dot11smt_dot11AuthenticationAlgorithmsTable_dot11AuthenticationAlgorithm5,</div><div class='add'>+          F_AP | F_STA | F_READ,</div><div class='add'>+          5, 0, 0,</div><div class='add'>+          prism2mib_authalg },</div><div class='add'>+    { DIDmib_dot11smt_dot11AuthenticationAlgorithmsTable_dot11AuthenticationAlgorithm6,</div><div class='add'>+          F_AP | F_STA | F_READ,</div><div class='add'>+          6, 0, 0,</div><div class='add'>+          prism2mib_authalg },</div><div class='add'>+    { DIDmib_dot11smt_dot11AuthenticationAlgorithmsTable_dot11AuthenticationAlgorithmsEnable1,</div><div class='add'>+          F_AP | F_STA | F_READ | F_WRITE,</div><div class='add'>+          1, 0, 0,</div><div class='add'>+          prism2mib_authalgenable },</div><div class='add'>+    { DIDmib_dot11smt_dot11AuthenticationAlgorithmsTable_dot11AuthenticationAlgorithmsEnable2,</div><div class='add'>+          F_AP | F_STA | F_READ | F_WRITE,</div><div class='add'>+          2, 0, 0,</div><div class='add'>+          prism2mib_authalgenable },</div><div class='add'>+    { DIDmib_dot11smt_dot11AuthenticationAlgorithmsTable_dot11AuthenticationAlgorithmsEnable3,</div><div class='add'>+          F_AP | F_STA | F_READ | F_WRITE,</div><div class='add'>+          3, 0, 0,</div><div class='add'>+          prism2mib_authalgenable },</div><div class='add'>+    { DIDmib_dot11smt_dot11AuthenticationAlgorithmsTable_dot11AuthenticationAlgorithmsEnable4,</div><div class='add'>+          F_AP | F_STA | F_READ | F_WRITE,</div><div class='add'>+          4, 0, 0,</div><div class='add'>+          prism2mib_authalgenable },</div><div class='add'>+    { DIDmib_dot11smt_dot11AuthenticationAlgorithmsTable_dot11AuthenticationAlgorithmsEnable5,</div><div class='add'>+          F_AP | F_STA | F_READ | F_WRITE,</div><div class='add'>+          5, 0, 0,</div><div class='add'>+          prism2mib_authalgenable },</div><div class='add'>+    { DIDmib_dot11smt_dot11AuthenticationAlgorithmsTable_dot11AuthenticationAlgorithmsEnable6,</div><div class='add'>+          F_AP | F_STA | F_READ | F_WRITE,</div><div class='add'>+          6, 0, 0,</div><div class='add'>+          prism2mib_authalgenable },</div><div class='add'>+    { DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey0,</div><div class='add'>+          F_AP | F_STA | F_WRITE,</div><div class='add'>+          HFA384x_RID_CNFWEPDEFAULTKEY0, 0, 0,</div><div class='add'>+          prism2mib_wepdefaultkey },</div><div class='add'>+    { DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey1,</div><div class='add'>+          F_AP | F_STA | F_WRITE,</div><div class='add'>+          HFA384x_RID_CNFWEPDEFAULTKEY1, 0, 0,</div><div class='add'>+          prism2mib_wepdefaultkey },</div><div class='add'>+    { DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey2,</div><div class='add'>+          F_AP | F_STA | F_WRITE,</div><div class='add'>+          HFA384x_RID_CNFWEPDEFAULTKEY2, 0, 0,</div><div class='add'>+          prism2mib_wepdefaultkey },</div><div class='add'>+    { DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey3,</div><div class='add'>+          F_AP | F_STA | F_WRITE,</div><div class='add'>+          HFA384x_RID_CNFWEPDEFAULTKEY3, 0, 0,</div><div class='add'>+          prism2mib_wepdefaultkey },</div><div class='add'>+    { DIDmib_dot11smt_dot11PrivacyTable_dot11PrivacyInvoked,</div><div class='add'>+          F_AP | F_STA | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_CNFWEPFLAGS, HFA384x_WEPFLAGS_PRIVINVOKED, 0,</div><div class='add'>+          prism2mib_privacyinvoked },</div><div class='add'>+    { DIDmib_dot11smt_dot11PrivacyTable_dot11WEPDefaultKeyID,</div><div class='add'>+          F_AP | F_STA | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_CNFWEPDEFAULTKEYID, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_dot11smt_dot11PrivacyTable_dot11ExcludeUnencrypted,</div><div class='add'>+          F_AP | F_STA | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_CNFWEPFLAGS, HFA384x_WEPFLAGS_EXCLUDE, 0,</div><div class='add'>+          prism2mib_excludeunencrypted },</div><div class='add'>+    { DIDmib_dot11phy_dot11PhyOperationTable_dot11ShortPreambleEnabled,</div><div class='add'>+          F_AP | F_STA | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_CNFSHORTPREAMBLE, 0, 0,</div><div class='add'>+          prism2mib_preamble },</div><div class='add'>+</div><div class='add'>+    /* dot11mac MIB's */</div><div class='add'>+</div><div class='add'>+    { DIDmib_dot11mac_dot11OperationTable_dot11MACAddress,</div><div class='add'>+          F_AP | F_STA | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_CNFOWNMACADDR, HFA384x_RID_CNFOWNMACADDR_LEN, 0,</div><div class='add'>+          prism2mib_bytearea2pstr },</div><div class='add'>+    { DIDmib_dot11mac_dot11OperationTable_dot11RTSThreshold,</div><div class='add'>+          F_STA | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_RTSTHRESH, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_dot11mac_dot11OperationTable_dot11RTSThreshold,</div><div class='add'>+          F_AP | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_RTSTHRESH0, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_dot11mac_dot11OperationTable_dot11ShortRetryLimit,</div><div class='add'>+          F_AP | F_STA | F_READ,</div><div class='add'>+          HFA384x_RID_SHORTRETRYLIMIT, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_dot11mac_dot11OperationTable_dot11LongRetryLimit,</div><div class='add'>+          F_AP | F_STA | F_READ,</div><div class='add'>+          HFA384x_RID_LONGRETRYLIMIT, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_dot11mac_dot11OperationTable_dot11FragmentationThreshold,</div><div class='add'>+          F_STA | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_FRAGTHRESH, 0, 0,</div><div class='add'>+          prism2mib_fragmentationthreshold },</div><div class='add'>+    { DIDmib_dot11mac_dot11OperationTable_dot11FragmentationThreshold,</div><div class='add'>+          F_AP | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_FRAGTHRESH0, 0, 0,</div><div class='add'>+          prism2mib_fragmentationthreshold },</div><div class='add'>+    { DIDmib_dot11mac_dot11OperationTable_dot11MaxTransmitMSDULifetime,</div><div class='add'>+          F_AP | F_STA | F_READ,</div><div class='add'>+          HFA384x_RID_MAXTXLIFETIME, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_dot11mac_dot11OperationTable_dot11MaxReceiveLifetime,</div><div class='add'>+          F_AP | F_STA | F_READ,</div><div class='add'>+          HFA384x_RID_MAXRXLIFETIME, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address1,</div><div class='add'>+          F_STA | F_READ | F_WRITE,</div><div class='add'>+          0, 0, 0,</div><div class='add'>+          prism2mib_groupaddress },</div><div class='add'>+    { DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address2,</div><div class='add'>+          F_STA | F_READ | F_WRITE,</div><div class='add'>+          0, 0, 0,</div><div class='add'>+          prism2mib_groupaddress },</div><div class='add'>+    { DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address3,</div><div class='add'>+          F_STA | F_READ | F_WRITE,</div><div class='add'>+          0, 0, 0,</div><div class='add'>+          prism2mib_groupaddress },</div><div class='add'>+    { DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address4,</div><div class='add'>+          F_STA | F_READ | F_WRITE,</div><div class='add'>+          0, 0, 0,</div><div class='add'>+          prism2mib_groupaddress },</div><div class='add'>+    { DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address5,</div><div class='add'>+          F_STA | F_READ | F_WRITE,</div><div class='add'>+          0, 0, 0,</div><div class='add'>+          prism2mib_groupaddress },</div><div class='add'>+    { DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address6,</div><div class='add'>+          F_STA | F_READ | F_WRITE,</div><div class='add'>+          0, 0, 0,</div><div class='add'>+          prism2mib_groupaddress },</div><div class='add'>+    { DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address7,</div><div class='add'>+          F_STA | F_READ | F_WRITE,</div><div class='add'>+          0, 0, 0,</div><div class='add'>+          prism2mib_groupaddress },</div><div class='add'>+    { DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address8,</div><div class='add'>+          F_STA | F_READ | F_WRITE,</div><div class='add'>+          0, 0, 0,</div><div class='add'>+          prism2mib_groupaddress },</div><div class='add'>+    { DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address9,</div><div class='add'>+          F_STA | F_READ | F_WRITE,</div><div class='add'>+          0, 0, 0,</div><div class='add'>+          prism2mib_groupaddress },</div><div class='add'>+    { DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address10,</div><div class='add'>+          F_STA | F_READ | F_WRITE,</div><div class='add'>+          0, 0, 0,</div><div class='add'>+          prism2mib_groupaddress },</div><div class='add'>+    { DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address11,</div><div class='add'>+          F_STA | F_READ | F_WRITE,</div><div class='add'>+          0, 0, 0,</div><div class='add'>+          prism2mib_groupaddress },</div><div class='add'>+    { DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address12,</div><div class='add'>+          F_STA | F_READ | F_WRITE,</div><div class='add'>+          0, 0, 0,</div><div class='add'>+          prism2mib_groupaddress },</div><div class='add'>+    { DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address13,</div><div class='add'>+          F_STA | F_READ | F_WRITE,</div><div class='add'>+          0, 0, 0,</div><div class='add'>+          prism2mib_groupaddress },</div><div class='add'>+    { DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address14,</div><div class='add'>+          F_STA | F_READ | F_WRITE,</div><div class='add'>+          0, 0, 0,</div><div class='add'>+          prism2mib_groupaddress },</div><div class='add'>+    { DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address15,</div><div class='add'>+          F_STA | F_READ | F_WRITE,</div><div class='add'>+          0, 0, 0,</div><div class='add'>+          prism2mib_groupaddress },</div><div class='add'>+    { DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address16,</div><div class='add'>+          F_STA | F_READ | F_WRITE,</div><div class='add'>+          0, 0, 0,</div><div class='add'>+          prism2mib_groupaddress },</div><div class='add'>+    { DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address17,</div><div class='add'>+          F_STA | F_READ | F_WRITE,</div><div class='add'>+          0, 0, 0,</div><div class='add'>+          prism2mib_groupaddress },</div><div class='add'>+    { DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address18,</div><div class='add'>+          F_STA | F_READ | F_WRITE,</div><div class='add'>+          0, 0, 0,</div><div class='add'>+          prism2mib_groupaddress },</div><div class='add'>+    { DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address19,</div><div class='add'>+          F_STA | F_READ | F_WRITE,</div><div class='add'>+          0, 0, 0,</div><div class='add'>+          prism2mib_groupaddress },</div><div class='add'>+    { DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address20,</div><div class='add'>+          F_STA | F_READ | F_WRITE,</div><div class='add'>+          0, 0, 0,</div><div class='add'>+          prism2mib_groupaddress },</div><div class='add'>+    { DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address21,</div><div class='add'>+          F_STA | F_READ | F_WRITE,</div><div class='add'>+          0, 0, 0,</div><div class='add'>+          prism2mib_groupaddress },</div><div class='add'>+    { DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address22,</div><div class='add'>+          F_STA | F_READ | F_WRITE,</div><div class='add'>+          0, 0, 0,</div><div class='add'>+          prism2mib_groupaddress },</div><div class='add'>+    { DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address23,</div><div class='add'>+          F_STA | F_READ | F_WRITE,</div><div class='add'>+          0, 0, 0,</div><div class='add'>+          prism2mib_groupaddress },</div><div class='add'>+    { DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address24,</div><div class='add'>+          F_STA | F_READ | F_WRITE,</div><div class='add'>+          0, 0, 0,</div><div class='add'>+          prism2mib_groupaddress },</div><div class='add'>+    { DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address25,</div><div class='add'>+          F_STA | F_READ | F_WRITE,</div><div class='add'>+          0, 0, 0,</div><div class='add'>+          prism2mib_groupaddress },</div><div class='add'>+    { DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address26,</div><div class='add'>+          F_STA | F_READ | F_WRITE,</div><div class='add'>+          0, 0, 0,</div><div class='add'>+          prism2mib_groupaddress },</div><div class='add'>+    { DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address27,</div><div class='add'>+          F_STA | F_READ | F_WRITE,</div><div class='add'>+          0, 0, 0,</div><div class='add'>+          prism2mib_groupaddress },</div><div class='add'>+    { DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address28,</div><div class='add'>+          F_STA | F_READ | F_WRITE,</div><div class='add'>+          0, 0, 0,</div><div class='add'>+          prism2mib_groupaddress },</div><div class='add'>+    { DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address29,</div><div class='add'>+          F_STA | F_READ | F_WRITE,</div><div class='add'>+          0, 0, 0,</div><div class='add'>+          prism2mib_groupaddress },</div><div class='add'>+    { DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address30,</div><div class='add'>+          F_STA | F_READ | F_WRITE,</div><div class='add'>+          0, 0, 0,</div><div class='add'>+          prism2mib_groupaddress },</div><div class='add'>+    { DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address31,</div><div class='add'>+          F_STA | F_READ | F_WRITE,</div><div class='add'>+          0, 0, 0,</div><div class='add'>+          prism2mib_groupaddress },</div><div class='add'>+    { DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address32,</div><div class='add'>+          F_STA | F_READ | F_WRITE,</div><div class='add'>+          0, 0, 0,</div><div class='add'>+          prism2mib_groupaddress },</div><div class='add'>+</div><div class='add'>+    /* dot11phy MIB's */</div><div class='add'>+</div><div class='add'>+    { DIDmib_dot11phy_dot11PhyOperationTable_dot11PHYType,</div><div class='add'>+          F_AP | F_STA | F_READ,</div><div class='add'>+          HFA384x_RID_PHYTYPE, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_dot11phy_dot11PhyOperationTable_dot11TempType,</div><div class='add'>+          F_AP | F_STA | F_READ,</div><div class='add'>+          HFA384x_RID_TEMPTYPE, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_dot11phy_dot11PhyDSSSTable_dot11CurrentChannel,</div><div class='add'>+          F_STA | F_READ,</div><div class='add'>+          HFA384x_RID_CURRENTCHANNEL, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_dot11phy_dot11PhyDSSSTable_dot11CurrentChannel,</div><div class='add'>+          F_AP | F_READ,</div><div class='add'>+          HFA384x_RID_CNFOWNCHANNEL, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_dot11phy_dot11PhyDSSSTable_dot11CurrentCCAMode,</div><div class='add'>+          F_AP | F_STA | F_READ,</div><div class='add'>+          HFA384x_RID_CCAMODE, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+</div><div class='add'>+    /* p2Table MIB's */</div><div class='add'>+</div><div class='add'>+    { DIDmib_p2_p2Table_p2MMTx,</div><div class='add'>+          F_AP | F_STA | F_READ | F_WRITE,</div><div class='add'>+          0, 0, 0,</div><div class='add'>+          prism2mib_priv },</div><div class='add'>+    { DIDmib_p2_p2Table_p2EarlyBeacon,</div><div class='add'>+          F_AP | F_READ | F_WRITE,</div><div class='add'>+          BIT7, 0, 0,</div><div class='add'>+          prism2mib_appcfinfoflag },</div><div class='add'>+    { DIDmib_p2_p2Table_p2ReceivedFrameStatistics,</div><div class='add'>+          F_AP | F_STA | F_READ,</div><div class='add'>+          0, 0, 0,</div><div class='add'>+          prism2mib_priv },</div><div class='add'>+    { DIDmib_p2_p2Table_p2CommunicationTallies,</div><div class='add'>+          F_AP | F_STA | F_READ,</div><div class='add'>+          0, 0, 0,</div><div class='add'>+          prism2mib_priv },</div><div class='add'>+    { DIDmib_p2_p2Table_p2Authenticated,</div><div class='add'>+          F_AP | F_READ,</div><div class='add'>+          0, 0, 0,</div><div class='add'>+          prism2mib_priv },</div><div class='add'>+    { DIDmib_p2_p2Table_p2Associated,</div><div class='add'>+          F_AP | F_READ,</div><div class='add'>+          0, 0, 0,</div><div class='add'>+          prism2mib_priv },</div><div class='add'>+    { DIDmib_p2_p2Table_p2PowerSaveUserCount,</div><div class='add'>+          F_AP | F_READ,</div><div class='add'>+          0, 0, 0,</div><div class='add'>+          prism2mib_priv },</div><div class='add'>+    { DIDmib_p2_p2Table_p2Comment,</div><div class='add'>+          F_AP | F_STA | F_READ | F_WRITE,</div><div class='add'>+          0, 0, 0,</div><div class='add'>+          prism2mib_priv },</div><div class='add'>+    { DIDmib_p2_p2Table_p2AccessMode,</div><div class='add'>+          F_AP | F_READ | F_WRITE,</div><div class='add'>+          0, 0, 0,</div><div class='add'>+          prism2mib_priv },</div><div class='add'>+    { DIDmib_p2_p2Table_p2AccessAllow,</div><div class='add'>+          F_AP | F_READ | F_WRITE,</div><div class='add'>+          0, 0, 0,</div><div class='add'>+          prism2mib_priv },</div><div class='add'>+    { DIDmib_p2_p2Table_p2AccessDeny,</div><div class='add'>+          F_AP | F_READ | F_WRITE,</div><div class='add'>+          0, 0, 0,</div><div class='add'>+          prism2mib_priv },</div><div class='add'>+    { DIDmib_p2_p2Table_p2ChannelInfoResults,</div><div class='add'>+          F_AP | F_READ,</div><div class='add'>+          0, 0, 0,</div><div class='add'>+          prism2mib_priv },</div><div class='add'>+</div><div class='add'>+    /* p2Static MIB's */</div><div class='add'>+</div><div class='add'>+    { DIDmib_p2_p2Static_p2CnfPortType,</div><div class='add'>+          F_STA | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_CNFPORTTYPE, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_p2_p2Static_p2CnfOwnMACAddress,</div><div class='add'>+          F_AP | F_STA | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_CNFOWNMACADDR, HFA384x_RID_CNFOWNMACADDR_LEN, 0,</div><div class='add'>+          prism2mib_bytearea2pstr },</div><div class='add'>+    { DIDmib_p2_p2Static_p2CnfDesiredSSID,</div><div class='add'>+          F_STA | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_CNFDESIREDSSID, HFA384x_RID_CNFDESIREDSSID_LEN, 0,</div><div class='add'>+          prism2mib_bytestr2pstr },</div><div class='add'>+    { DIDmib_p2_p2Static_p2CnfOwnChannel,</div><div class='add'>+          F_AP | F_STA | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_CNFOWNCHANNEL, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_p2_p2Static_p2CnfOwnSSID,</div><div class='add'>+          F_AP | F_STA | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_CNFOWNSSID, HFA384x_RID_CNFOWNSSID_LEN, 0,</div><div class='add'>+          prism2mib_bytestr2pstr },</div><div class='add'>+    { DIDmib_p2_p2Static_p2CnfOwnATIMWindow,</div><div class='add'>+          F_STA | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_CNFOWNATIMWIN, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_p2_p2Static_p2CnfSystemScale,</div><div class='add'>+          F_AP | F_STA | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_CNFSYSSCALE, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_p2_p2Static_p2CnfMaxDataLength,</div><div class='add'>+          F_AP | F_STA | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_CNFMAXDATALEN, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_p2_p2Static_p2CnfWDSAddress,</div><div class='add'>+          F_STA | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_CNFWDSADDR, HFA384x_RID_CNFWDSADDR_LEN, 0,</div><div class='add'>+          prism2mib_bytearea2pstr },</div><div class='add'>+    { DIDmib_p2_p2Static_p2CnfPMEnabled,</div><div class='add'>+          F_STA | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_CNFPMENABLED, 0, 0,</div><div class='add'>+          prism2mib_truth },</div><div class='add'>+    { DIDmib_p2_p2Static_p2CnfPMEPS,</div><div class='add'>+          F_STA | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_CNFPMEPS, 0, 0,</div><div class='add'>+          prism2mib_truth },</div><div class='add'>+    { DIDmib_p2_p2Static_p2CnfMulticastReceive,</div><div class='add'>+          F_STA | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_CNFMULTICASTRX, 0, 0,</div><div class='add'>+          prism2mib_truth },</div><div class='add'>+    { DIDmib_p2_p2Static_p2CnfMaxSleepDuration,</div><div class='add'>+          F_STA | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_CNFMAXSLEEPDUR, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_p2_p2Static_p2CnfPMHoldoverDuration,</div><div class='add'>+          F_STA | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_CNFPMHOLDDUR, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_p2_p2Static_p2CnfOwnName,</div><div class='add'>+          F_AP | F_STA | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_CNFOWNNAME, HFA384x_RID_CNFOWNNAME_LEN, 0,</div><div class='add'>+          prism2mib_bytestr2pstr },</div><div class='add'>+    { DIDmib_p2_p2Static_p2CnfOwnDTIMPeriod,</div><div class='add'>+          F_AP | F_STA | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_CNFOWNDTIMPER, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_p2_p2Static_p2CnfWDSAddress1,</div><div class='add'>+          F_AP | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_CNFWDSADDR1, HFA384x_RID_CNFWDSADDR1_LEN, 0,</div><div class='add'>+          prism2mib_bytearea2pstr },</div><div class='add'>+    { DIDmib_p2_p2Static_p2CnfWDSAddress2,</div><div class='add'>+          F_AP | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_CNFWDSADDR2, HFA384x_RID_CNFWDSADDR2_LEN, 0,</div><div class='add'>+          prism2mib_bytearea2pstr },</div><div class='add'>+    { DIDmib_p2_p2Static_p2CnfWDSAddress3,</div><div class='add'>+          F_AP | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_CNFWDSADDR3, HFA384x_RID_CNFWDSADDR3_LEN, 0,</div><div class='add'>+          prism2mib_bytearea2pstr },</div><div class='add'>+    { DIDmib_p2_p2Static_p2CnfWDSAddress4,</div><div class='add'>+          F_AP | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_CNFWDSADDR4, HFA384x_RID_CNFWDSADDR4_LEN, 0,</div><div class='add'>+          prism2mib_bytearea2pstr },</div><div class='add'>+    { DIDmib_p2_p2Static_p2CnfWDSAddress5,</div><div class='add'>+          F_AP | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_CNFWDSADDR5, HFA384x_RID_CNFWDSADDR5_LEN, 0,</div><div class='add'>+          prism2mib_bytearea2pstr },</div><div class='add'>+    { DIDmib_p2_p2Static_p2CnfWDSAddress6,</div><div class='add'>+          F_AP | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_CNFWDSADDR6, HFA384x_RID_CNFWDSADDR6_LEN, 0,</div><div class='add'>+          prism2mib_bytearea2pstr },</div><div class='add'>+    { DIDmib_p2_p2Static_p2CnfMulticastPMBuffering,</div><div class='add'>+          F_AP | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_CNFMCASTPMBUFF, 0, 0,</div><div class='add'>+          prism2mib_truth },</div><div class='add'>+    { DIDmib_p2_p2Static_p2CnfWEPDefaultKeyID,</div><div class='add'>+          F_AP | F_STA | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_CNFWEPDEFAULTKEYID, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_p2_p2Static_p2CnfWEPDefaultKey0,</div><div class='add'>+          F_AP | F_STA | F_WRITE,</div><div class='add'>+          HFA384x_RID_CNFWEPDEFAULTKEY0, 0, 0,</div><div class='add'>+          prism2mib_wepdefaultkey },</div><div class='add'>+    { DIDmib_p2_p2Static_p2CnfWEPDefaultKey1,</div><div class='add'>+          F_AP | F_STA | F_WRITE,</div><div class='add'>+          HFA384x_RID_CNFWEPDEFAULTKEY1, 0, 0,</div><div class='add'>+          prism2mib_wepdefaultkey },</div><div class='add'>+    { DIDmib_p2_p2Static_p2CnfWEPDefaultKey2,</div><div class='add'>+          F_AP | F_STA | F_WRITE,</div><div class='add'>+          HFA384x_RID_CNFWEPDEFAULTKEY2, 0, 0,</div><div class='add'>+          prism2mib_wepdefaultkey },</div><div class='add'>+    { DIDmib_p2_p2Static_p2CnfWEPDefaultKey3,</div><div class='add'>+          F_AP | F_STA | F_WRITE,</div><div class='add'>+          HFA384x_RID_CNFWEPDEFAULTKEY3, 0, 0,</div><div class='add'>+          prism2mib_wepdefaultkey },</div><div class='add'>+    { DIDmib_p2_p2Static_p2CnfWEPFlags,</div><div class='add'>+          F_AP | F_STA | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_CNFWEPFLAGS, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_p2_p2Static_p2CnfAuthentication,</div><div class='add'>+          F_AP | F_STA | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_CNFAUTHENTICATION, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_p2_p2Static_p2CnfMaxAssociatedStations,</div><div class='add'>+          F_AP | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_CNFMAXASSOCSTATIONS, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_p2_p2Static_p2CnfTxControl,</div><div class='add'>+          F_AP | F_STA | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_CNFTXCONTROL, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_p2_p2Static_p2CnfRoamingMode,</div><div class='add'>+          F_STA | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_CNFROAMINGMODE, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_p2_p2Static_p2CnfHostAuthentication,</div><div class='add'>+          F_AP | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_CNFHOSTAUTHASSOC, 0, 0,</div><div class='add'>+          prism2mib_truth },</div><div class='add'>+    { DIDmib_p2_p2Static_p2CnfRcvCrcError,</div><div class='add'>+          F_AP | F_STA | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_CNFRCVCRCERROR, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_p2_p2Static_p2CnfAltRetryCount,</div><div class='add'>+          F_AP | F_STA | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_CNFALTRETRYCNT, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_p2_p2Static_p2CnfBeaconInterval,</div><div class='add'>+          F_AP | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_CNFAPBCNINT, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_p2_p2Static_p2CnfMediumOccupancyLimit,</div><div class='add'>+          F_AP | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_CNFAPPCFINFO, HFA384x_RID_CNFAPPCFINFO_LEN, 0,</div><div class='add'>+          prism2mib_uint32offset },</div><div class='add'>+    { DIDmib_p2_p2Static_p2CnfCFPPeriod,</div><div class='add'>+          F_AP | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_CNFAPPCFINFO, HFA384x_RID_CNFAPPCFINFO_LEN, 1,</div><div class='add'>+          prism2mib_uint32offset },</div><div class='add'>+    { DIDmib_p2_p2Static_p2CnfCFPMaxDuration,</div><div class='add'>+          F_AP | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_CNFAPPCFINFO, HFA384x_RID_CNFAPPCFINFO_LEN, 2,</div><div class='add'>+          prism2mib_uint32offset },</div><div class='add'>+    { DIDmib_p2_p2Static_p2CnfCFPFlags,</div><div class='add'>+          F_AP | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_CNFAPPCFINFO, HFA384x_RID_CNFAPPCFINFO_LEN, 3,</div><div class='add'>+          prism2mib_uint32offset },</div><div class='add'>+    { DIDmib_p2_p2Static_p2CnfSTAPCFInfo,</div><div class='add'>+          F_STA | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_CNFSTAPCFINFO, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_p2_p2Static_p2CnfPriorityQUsage,</div><div class='add'>+          F_AP | F_STA | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_CNFPRIORITYQUSAGE, HFA384x_RID_CNFPRIOQUSAGE_LEN, 0,</div><div class='add'>+          prism2mib_uint32array },</div><div class='add'>+    { DIDmib_p2_p2Static_p2CnfTIMCtrl,</div><div class='add'>+          F_AP | F_STA | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_CNFTIMCTRL, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_p2_p2Static_p2CnfThirty2Tally,</div><div class='add'>+          F_AP | F_STA | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_CNFTHIRTY2TALLY, 0, 0,</div><div class='add'>+          prism2mib_truth },</div><div class='add'>+    { DIDmib_p2_p2Static_p2CnfEnhSecurity,</div><div class='add'>+          F_AP | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_CNFENHSECURITY, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_p2_p2Static_p2CnfShortPreamble,</div><div class='add'>+          F_AP | F_STA | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_CNFSHORTPREAMBLE, 0, 0,</div><div class='add'>+          prism2mib_preamble },</div><div class='add'>+    { DIDmib_p2_p2Static_p2CnfExcludeLongPreamble,</div><div class='add'>+          F_AP | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_CNFEXCLONGPREAMBLE, 0, 0,</div><div class='add'>+          prism2mib_truth },</div><div class='add'>+    { DIDmib_p2_p2Static_p2CnfAuthenticationRspTO,</div><div class='add'>+          F_STA | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_CNFAUTHRSPTIMEOUT, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_p2_p2Static_p2CnfBasicRates,</div><div class='add'>+          F_AP | F_STA | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_CNFBASICRATES, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_p2_p2Static_p2CnfSupportedRates,</div><div class='add'>+          F_AP | F_STA | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_CNFSUPPRATES, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+</div><div class='add'>+    /* p2Dynamic MIB's */</div><div class='add'>+</div><div class='add'>+    { DIDmib_p2_p2Dynamic_p2CreateIBSS,</div><div class='add'>+          F_STA | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_CREATEIBSS, 0, 0,</div><div class='add'>+          prism2mib_truth },</div><div class='add'>+    { DIDmib_p2_p2Dynamic_p2FragmentationThreshold,</div><div class='add'>+          F_STA | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_FRAGTHRESH, 0, 0,</div><div class='add'>+          prism2mib_fragmentationthreshold },</div><div class='add'>+    { DIDmib_p2_p2Dynamic_p2RTSThreshold,</div><div class='add'>+          F_STA | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_RTSTHRESH, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_p2_p2Dynamic_p2TxRateControl,</div><div class='add'>+          F_STA | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_TXRATECNTL, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_p2_p2Dynamic_p2PromiscuousMode,</div><div class='add'>+          F_STA | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_PROMISCMODE, 0, 0,</div><div class='add'>+          prism2mib_truth },</div><div class='add'>+    { DIDmib_p2_p2Dynamic_p2FragmentationThreshold0,</div><div class='add'>+          F_AP | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_FRAGTHRESH0, 0, 0,</div><div class='add'>+          prism2mib_fragmentationthreshold },</div><div class='add'>+    { DIDmib_p2_p2Dynamic_p2FragmentationThreshold1,</div><div class='add'>+          F_AP | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_FRAGTHRESH1, 0, 0,</div><div class='add'>+          prism2mib_fragmentationthreshold },</div><div class='add'>+    { DIDmib_p2_p2Dynamic_p2FragmentationThreshold2,</div><div class='add'>+          F_AP | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_FRAGTHRESH2, 0, 0,</div><div class='add'>+          prism2mib_fragmentationthreshold },</div><div class='add'>+    { DIDmib_p2_p2Dynamic_p2FragmentationThreshold3,</div><div class='add'>+          F_AP | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_FRAGTHRESH3, 0, 0,</div><div class='add'>+          prism2mib_fragmentationthreshold },</div><div class='add'>+    { DIDmib_p2_p2Dynamic_p2FragmentationThreshold4,</div><div class='add'>+          F_AP | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_FRAGTHRESH4, 0, 0,</div><div class='add'>+          prism2mib_fragmentationthreshold },</div><div class='add'>+    { DIDmib_p2_p2Dynamic_p2FragmentationThreshold5,</div><div class='add'>+          F_AP | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_FRAGTHRESH5, 0, 0,</div><div class='add'>+          prism2mib_fragmentationthreshold },</div><div class='add'>+    { DIDmib_p2_p2Dynamic_p2FragmentationThreshold6,</div><div class='add'>+          F_AP | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_FRAGTHRESH6, 0, 0,</div><div class='add'>+          prism2mib_fragmentationthreshold },</div><div class='add'>+    { DIDmib_p2_p2Dynamic_p2RTSThreshold0,</div><div class='add'>+          F_AP | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_RTSTHRESH0, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_p2_p2Dynamic_p2RTSThreshold1,</div><div class='add'>+          F_AP | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_RTSTHRESH1, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_p2_p2Dynamic_p2RTSThreshold2,</div><div class='add'>+          F_AP | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_RTSTHRESH2, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_p2_p2Dynamic_p2RTSThreshold3,</div><div class='add'>+          F_AP | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_RTSTHRESH3, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_p2_p2Dynamic_p2RTSThreshold4,</div><div class='add'>+          F_AP | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_RTSTHRESH4, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_p2_p2Dynamic_p2RTSThreshold5,</div><div class='add'>+          F_AP | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_RTSTHRESH5, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_p2_p2Dynamic_p2RTSThreshold6,</div><div class='add'>+          F_AP | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_RTSTHRESH6, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_p2_p2Dynamic_p2TxRateControl0,</div><div class='add'>+          F_AP | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_TXRATECNTL0, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_p2_p2Dynamic_p2TxRateControl1,</div><div class='add'>+          F_AP | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_TXRATECNTL1, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_p2_p2Dynamic_p2TxRateControl2,</div><div class='add'>+          F_AP | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_TXRATECNTL2, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_p2_p2Dynamic_p2TxRateControl3,</div><div class='add'>+          F_AP | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_TXRATECNTL3, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_p2_p2Dynamic_p2TxRateControl4,</div><div class='add'>+          F_AP | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_TXRATECNTL4, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_p2_p2Dynamic_p2TxRateControl5,</div><div class='add'>+          F_AP | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_TXRATECNTL5, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_p2_p2Dynamic_p2TxRateControl6,</div><div class='add'>+          F_AP | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_TXRATECNTL6, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+</div><div class='add'>+    /* p2Behavior MIB's */</div><div class='add'>+</div><div class='add'>+    { DIDmib_p2_p2Behavior_p2TickTime,</div><div class='add'>+          F_AP | F_STA | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_ITICKTIME, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+</div><div class='add'>+    /* p2NIC MIB's */</div><div class='add'>+</div><div class='add'>+    { DIDmib_p2_p2NIC_p2MaxLoadTime,</div><div class='add'>+          F_AP | F_STA | F_READ,</div><div class='add'>+          HFA384x_RID_MAXLOADTIME, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_p2_p2NIC_p2DLBufferPage,</div><div class='add'>+          F_AP | F_STA | F_READ,</div><div class='add'>+          HFA384x_RID_DOWNLOADBUFFER, HFA384x_RID_DOWNLOADBUFFER_LEN, 0,</div><div class='add'>+          prism2mib_uint32offset },</div><div class='add'>+    { DIDmib_p2_p2NIC_p2DLBufferOffset,</div><div class='add'>+          F_AP | F_STA | F_READ,</div><div class='add'>+          HFA384x_RID_DOWNLOADBUFFER, HFA384x_RID_DOWNLOADBUFFER_LEN, 1,</div><div class='add'>+          prism2mib_uint32offset },</div><div class='add'>+    { DIDmib_p2_p2NIC_p2DLBufferLength,</div><div class='add'>+          F_AP | F_STA | F_READ,</div><div class='add'>+          HFA384x_RID_DOWNLOADBUFFER, HFA384x_RID_DOWNLOADBUFFER_LEN, 2,</div><div class='add'>+          prism2mib_uint32offset },</div><div class='add'>+    { DIDmib_p2_p2NIC_p2PRIIdentity,</div><div class='add'>+          F_AP | F_STA | F_READ,</div><div class='add'>+          HFA384x_RID_PRIIDENTITY, HFA384x_RID_PRIIDENTITY_LEN, 0,</div><div class='add'>+          prism2mib_uint32array },</div><div class='add'>+    { DIDmib_p2_p2NIC_p2PRISupRange,</div><div class='add'>+          F_AP | F_STA | F_READ,</div><div class='add'>+          HFA384x_RID_PRISUPRANGE, HFA384x_RID_PRISUPRANGE_LEN, 0,</div><div class='add'>+          prism2mib_uint32array },</div><div class='add'>+    { DIDmib_p2_p2NIC_p2CFIActRanges,</div><div class='add'>+          F_AP | F_STA | F_READ,</div><div class='add'>+          HFA384x_RID_PRI_CFIACTRANGES, HFA384x_RID_CFIACTRANGES_LEN, 0,</div><div class='add'>+          prism2mib_uint32array },</div><div class='add'>+    { DIDmib_p2_p2NIC_p2BuildSequence,</div><div class='add'>+          F_AP | F_STA | F_READ,</div><div class='add'>+          HFA384x_RID_BUILDSEQ, HFA384x_RID_BUILDSEQ_LEN, 0,</div><div class='add'>+          prism2mib_uint32array },</div><div class='add'>+    { DIDmib_p2_p2NIC_p2PrimaryFWID,</div><div class='add'>+          F_AP | F_STA | F_READ,</div><div class='add'>+          0, 0, 0,</div><div class='add'>+          prism2mib_fwid },</div><div class='add'>+    { DIDmib_p2_p2NIC_p2SecondaryFWID,</div><div class='add'>+          F_AP | F_STA | F_READ,</div><div class='add'>+          0, 0, 0,</div><div class='add'>+          prism2mib_fwid },</div><div class='add'>+    { DIDmib_p2_p2NIC_p2TertiaryFWID,</div><div class='add'>+          F_AP | F_READ,</div><div class='add'>+          0, 0, 0,</div><div class='add'>+          prism2mib_fwid },</div><div class='add'>+    { DIDmib_p2_p2NIC_p2NICSerialNumber,</div><div class='add'>+          F_AP | F_STA | F_READ,</div><div class='add'>+          HFA384x_RID_NICSERIALNUMBER, HFA384x_RID_NICSERIALNUMBER_LEN, 0,</div><div class='add'>+          prism2mib_bytearea2pstr },</div><div class='add'>+    { DIDmib_p2_p2NIC_p2NICIdentity,</div><div class='add'>+          F_AP | F_STA | F_READ,</div><div class='add'>+          HFA384x_RID_NICIDENTITY, HFA384x_RID_NICIDENTITY_LEN, 0,</div><div class='add'>+          prism2mib_uint32array },</div><div class='add'>+    { DIDmib_p2_p2NIC_p2MFISupRange,</div><div class='add'>+          F_AP | F_STA | F_READ,</div><div class='add'>+          HFA384x_RID_MFISUPRANGE, HFA384x_RID_MFISUPRANGE_LEN, 0,</div><div class='add'>+          prism2mib_uint32array },</div><div class='add'>+    { DIDmib_p2_p2NIC_p2CFISupRange,</div><div class='add'>+          F_AP | F_STA | F_READ,</div><div class='add'>+          HFA384x_RID_CFISUPRANGE, HFA384x_RID_CFISUPRANGE_LEN, 0,</div><div class='add'>+          prism2mib_uint32array },</div><div class='add'>+    { DIDmib_p2_p2NIC_p2ChannelList,</div><div class='add'>+          F_AP | F_STA | F_READ,</div><div class='add'>+          HFA384x_RID_CHANNELLIST, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_p2_p2NIC_p2RegulatoryDomains,</div><div class='add'>+          F_AP | F_STA | F_READ,</div><div class='add'>+          HFA384x_RID_REGULATORYDOMAINS, HFA384x_RID_REGULATORYDOMAINS_LEN, 0,</div><div class='add'>+          prism2mib_regulatorydomains },</div><div class='add'>+    { DIDmib_p2_p2NIC_p2TempType,</div><div class='add'>+          F_AP | F_STA | F_READ,</div><div class='add'>+          HFA384x_RID_TEMPTYPE, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_p2_p2NIC_p2STAIdentity,</div><div class='add'>+          F_AP | F_STA | F_READ,</div><div class='add'>+          HFA384x_RID_STAIDENTITY, HFA384x_RID_STAIDENTITY_LEN, 0,</div><div class='add'>+          prism2mib_uint32array },</div><div class='add'>+    { DIDmib_p2_p2NIC_p2STASupRange,</div><div class='add'>+          F_AP | F_STA | F_READ,</div><div class='add'>+          HFA384x_RID_STASUPRANGE, HFA384x_RID_STASUPRANGE_LEN, 0,</div><div class='add'>+          prism2mib_uint32array },</div><div class='add'>+    { DIDmib_p2_p2NIC_p2MFIActRanges,</div><div class='add'>+          F_AP | F_STA | F_READ,</div><div class='add'>+          HFA384x_RID_STA_MFIACTRANGES, HFA384x_RID_MFIACTRANGES_LEN, 0,</div><div class='add'>+          prism2mib_uint32array },</div><div class='add'>+    { DIDmib_p2_p2NIC_p2STACFIActRanges,</div><div class='add'>+          F_AP | F_STA | F_READ,</div><div class='add'>+          HFA384x_RID_STA_CFIACTRANGES, HFA384x_RID_CFIACTRANGES2_LEN, 0,</div><div class='add'>+          prism2mib_uint32array },</div><div class='add'>+</div><div class='add'>+    /* p2MAC MIB's */</div><div class='add'>+</div><div class='add'>+    { DIDmib_p2_p2MAC_p2PortStatus,</div><div class='add'>+          F_STA | F_READ,</div><div class='add'>+          HFA384x_RID_PORTSTATUS, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_p2_p2MAC_p2CurrentSSID,</div><div class='add'>+          F_STA | F_READ,</div><div class='add'>+          HFA384x_RID_CURRENTSSID, HFA384x_RID_CURRENTSSID_LEN, 0,</div><div class='add'>+          prism2mib_bytestr2pstr },</div><div class='add'>+    { DIDmib_p2_p2MAC_p2CurrentBSSID,</div><div class='add'>+          F_STA | F_READ,</div><div class='add'>+          HFA384x_RID_CURRENTBSSID, HFA384x_RID_CURRENTBSSID_LEN, 0,</div><div class='add'>+          prism2mib_bytearea2pstr },</div><div class='add'>+    { DIDmib_p2_p2MAC_p2CommsQuality,</div><div class='add'>+          F_STA | F_READ,</div><div class='add'>+          HFA384x_RID_COMMSQUALITY, HFA384x_RID_COMMSQUALITY_LEN, 0,</div><div class='add'>+          prism2mib_uint32array },</div><div class='add'>+    { DIDmib_p2_p2MAC_p2CommsQualityCQ,</div><div class='add'>+          F_STA | F_READ,</div><div class='add'>+          HFA384x_RID_COMMSQUALITY, HFA384x_RID_COMMSQUALITY_LEN, 0,</div><div class='add'>+          prism2mib_uint32offset },</div><div class='add'>+    { DIDmib_p2_p2MAC_p2CommsQualityASL,</div><div class='add'>+          F_STA | F_READ,</div><div class='add'>+          HFA384x_RID_COMMSQUALITY, HFA384x_RID_COMMSQUALITY_LEN, 1,</div><div class='add'>+          prism2mib_uint32offset },</div><div class='add'>+    { DIDmib_p2_p2MAC_p2CommsQualityANL,</div><div class='add'>+          F_STA | F_READ,</div><div class='add'>+          HFA384x_RID_COMMSQUALITY, HFA384x_RID_COMMSQUALITY_LEN, 2,</div><div class='add'>+          prism2mib_uint32offset },</div><div class='add'>+    { DIDmib_p2_p2MAC_p2dbmCommsQuality,</div><div class='add'>+          F_STA | F_READ,</div><div class='add'>+          HFA384x_RID_DBMCOMMSQUALITY, HFA384x_RID_DBMCOMMSQUALITY_LEN, 0,</div><div class='add'>+          prism2mib_uint32array },</div><div class='add'>+    { DIDmib_p2_p2MAC_p2dbmCommsQualityCQ,</div><div class='add'>+          F_STA | F_READ,</div><div class='add'>+          HFA384x_RID_COMMSQUALITY, HFA384x_RID_COMMSQUALITY_LEN, 0,</div><div class='add'>+          prism2mib_uint32offset },</div><div class='add'>+    { DIDmib_p2_p2MAC_p2dbmCommsQualityASL,</div><div class='add'>+          F_STA | F_READ,</div><div class='add'>+          HFA384x_RID_COMMSQUALITY, HFA384x_RID_COMMSQUALITY_LEN, 1,</div><div class='add'>+          prism2mib_uint32offset },</div><div class='add'>+    { DIDmib_p2_p2MAC_p2dbmCommsQualityANL,</div><div class='add'>+          F_STA | F_READ,</div><div class='add'>+          HFA384x_RID_COMMSQUALITY, HFA384x_RID_COMMSQUALITY_LEN, 2,</div><div class='add'>+          prism2mib_uint32offset },</div><div class='add'>+    { DIDmib_p2_p2MAC_p2CurrentTxRate,</div><div class='add'>+          F_STA | F_READ,</div><div class='add'>+          HFA384x_RID_CURRENTTXRATE, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_p2_p2MAC_p2CurrentBeaconInterval,</div><div class='add'>+          F_AP | F_STA | F_READ,</div><div class='add'>+          HFA384x_RID_CURRENTBCNINT, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_p2_p2MAC_p2StaCurrentScaleThresholds,</div><div class='add'>+          F_STA | F_READ,</div><div class='add'>+          HFA384x_RID_CURRENTSCALETHRESH, HFA384x_RID_STACURSCALETHRESH_LEN, 0,</div><div class='add'>+          prism2mib_uint32array },</div><div class='add'>+    { DIDmib_p2_p2MAC_p2APCurrentScaleThresholds,</div><div class='add'>+          F_AP | F_READ,</div><div class='add'>+          HFA384x_RID_CURRENTSCALETHRESH, HFA384x_RID_APCURSCALETHRESH_LEN, 0,</div><div class='add'>+          prism2mib_uint32array },</div><div class='add'>+    { DIDmib_p2_p2MAC_p2ProtocolRspTime,</div><div class='add'>+          F_AP | F_STA | F_READ,</div><div class='add'>+          HFA384x_RID_PROTOCOLRSPTIME, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_p2_p2MAC_p2ShortRetryLimit,</div><div class='add'>+          F_AP | F_STA | F_READ,</div><div class='add'>+          HFA384x_RID_SHORTRETRYLIMIT, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_p2_p2MAC_p2LongRetryLimit,</div><div class='add'>+          F_AP | F_STA | F_READ,</div><div class='add'>+          HFA384x_RID_LONGRETRYLIMIT, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_p2_p2MAC_p2MaxTransmitLifetime,</div><div class='add'>+          F_AP | F_STA | F_READ,</div><div class='add'>+          HFA384x_RID_MAXTXLIFETIME, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_p2_p2MAC_p2MaxReceiveLifetime,</div><div class='add'>+          F_AP | F_STA | F_READ,</div><div class='add'>+          HFA384x_RID_MAXRXLIFETIME, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_p2_p2MAC_p2CFPollable,</div><div class='add'>+          F_STA | F_READ,</div><div class='add'>+          HFA384x_RID_CFPOLLABLE, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_p2_p2MAC_p2AuthenticationAlgorithms,</div><div class='add'>+          F_AP | F_STA | F_READ,</div><div class='add'>+          HFA384x_RID_AUTHALGORITHMS, HFA384x_RID_AUTHALGORITHMS_LEN, 0,</div><div class='add'>+          prism2mib_uint32array },</div><div class='add'>+    { DIDmib_p2_p2MAC_p2PrivacyOptionImplemented,</div><div class='add'>+          F_AP | F_STA | F_READ,</div><div class='add'>+          HFA384x_RID_PRIVACYOPTIMP, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_p2_p2MAC_p2CurrentTxRate1,</div><div class='add'>+          F_AP | F_READ,</div><div class='add'>+          HFA384x_RID_CURRENTTXRATE1, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_p2_p2MAC_p2CurrentTxRate2,</div><div class='add'>+          F_AP | F_READ,</div><div class='add'>+          HFA384x_RID_CURRENTTXRATE2, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_p2_p2MAC_p2CurrentTxRate3,</div><div class='add'>+          F_AP | F_READ,</div><div class='add'>+          HFA384x_RID_CURRENTTXRATE3, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_p2_p2MAC_p2CurrentTxRate4,</div><div class='add'>+          F_AP | F_READ,</div><div class='add'>+          HFA384x_RID_CURRENTTXRATE4, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_p2_p2MAC_p2CurrentTxRate5,</div><div class='add'>+          F_AP | F_READ,</div><div class='add'>+          HFA384x_RID_CURRENTTXRATE5, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_p2_p2MAC_p2CurrentTxRate6,</div><div class='add'>+          F_AP | F_READ,</div><div class='add'>+          HFA384x_RID_CURRENTTXRATE6, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_p2_p2MAC_p2OwnMACAddress,</div><div class='add'>+          F_AP | F_READ,</div><div class='add'>+          HFA384x_RID_OWNMACADDRESS, HFA384x_RID_OWNMACADDRESS_LEN, 0,</div><div class='add'>+          prism2mib_bytearea2pstr },</div><div class='add'>+</div><div class='add'>+    /* p2Modem MIB's */</div><div class='add'>+</div><div class='add'>+    { DIDmib_p2_p2Modem_p2PHYType,</div><div class='add'>+          F_AP | F_STA | F_READ,</div><div class='add'>+          HFA384x_RID_PHYTYPE, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_p2_p2Modem_p2CurrentChannel,</div><div class='add'>+          F_AP | F_STA | F_READ,</div><div class='add'>+          HFA384x_RID_CURRENTCHANNEL, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_p2_p2Modem_p2CurrentPowerState,</div><div class='add'>+          F_AP | F_STA | F_READ,</div><div class='add'>+          HFA384x_RID_CURRENTPOWERSTATE, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_p2_p2Modem_p2CCAMode,</div><div class='add'>+          F_AP | F_STA | F_READ,</div><div class='add'>+          HFA384x_RID_CCAMODE, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_p2_p2Modem_p2TxPowerMax,</div><div class='add'>+          F_AP | F_STA | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_TXPOWERMAX, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_dot11phy_dot11PhyTxPowerTable_dot11CurrentTxPowerLevel,</div><div class='add'>+          F_AP | F_STA | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_TXPOWERMAX, 0, 0,</div><div class='add'>+          prism2mib_uint32 },</div><div class='add'>+    { DIDmib_p2_p2Modem_p2SupportedDataRates,</div><div class='add'>+          F_AP | F_STA | F_READ,</div><div class='add'>+          HFA384x_RID_SUPPORTEDDATARATES, HFA384x_RID_SUPPORTEDDATARATES_LEN, 0,</div><div class='add'>+          prism2mib_bytestr2pstr },</div><div class='add'>+</div><div class='add'>+    /* And finally, lnx mibs */</div><div class='add'>+    { DIDmib_lnx_lnxConfigTable_lnxRSNAIE,</div><div class='add'>+          F_STA | F_READ | F_WRITE,</div><div class='add'>+          HFA384x_RID_CNFWPADATA, 0, 0,</div><div class='add'>+          prism2mib_priv },</div><div class='add'>+    { 0, 0, 0, 0, 0, NULL}};</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+These MIB's are not supported at this time:</div><div class='add'>+</div><div class='add'>+DIDmib_dot11phy_dot11PhyOperationTable_dot11ChannelAgilityPresent</div><div class='add'>+DIDmib_dot11phy_dot11PhyOperationTable_dot11ChannelAgilityEnabled</div><div class='add'>+DIDmib_dot11phy_dot11PhyDSSSTable_dot11PBCCOptionImplemented</div><div class='add'>+DIDmib_dot11phy_dot11RegDomainsSupportedTable_dot11RegDomainsSupportIndex</div><div class='add'>+DIDmib_dot11phy_dot11SupportedDataRatesTxTable_dot11SupportedDataRatesTxIndex</div><div class='add'>+DIDmib_dot11phy_dot11SupportedDataRatesTxTable_dot11SupportedDataRatesTxValue</div><div class='add'>+DIDmib_dot11phy_dot11SupportedDataRatesRxTable_dot11SupportedDataRatesRxIndex</div><div class='add'>+DIDmib_dot11phy_dot11SupportedDataRatesRxTable_dot11SupportedDataRatesRxValue</div><div class='add'>+</div><div class='add'>+DIDmib_dot11phy_dot11RegDomainsSupportedTable_dot11RegDomainsSupportValue</div><div class='add'>+TODO: need to investigate why wlan has this as enumerated and Prism2 has this</div><div class='add'>+      as btye str.</div><div class='add'>+</div><div class='add'>+DIDmib_dot11phy_dot11PhyDSSSTable_dot11ShortPreambleOptionImplemented</div><div class='add'>+TODO: Find out the firmware version number(s) for identifying</div><div class='add'>+      whether the firmware is capable of short preamble. TRUE or FALSE</div><div class='add'>+      will be returned based on the version of the firmware.</div><div class='add'>+</div><div class='add'>+WEP Key mappings aren't supported in the f/w.</div><div class='add'>+DIDmib_dot11smt_dot11WEPKeyMappingsTable_dot11WEPKeyMappingIndex</div><div class='add'>+DIDmib_dot11smt_dot11WEPKeyMappingsTable_dot11WEPKeyMappingAddress</div><div class='add'>+DIDmib_dot11smt_dot11WEPKeyMappingsTable_dot11WEPKeyMappingWEPOn</div><div class='add'>+DIDmib_dot11smt_dot11WEPKeyMappingsTable_dot11WEPKeyMappingValue</div><div class='add'>+DIDmib_dot11smt_dot11PrivacyTable_dot11WEPKeyMappingLength</div><div class='add'>+</div><div class='add'>+TODO: implement counters.</div><div class='add'>+DIDmib_dot11smt_dot11PrivacyTable_dot11WEPICVErrorCount</div><div class='add'>+DIDmib_dot11smt_dot11PrivacyTable_dot11WEPExcludedCount</div><div class='add'>+DIDmib_dot11mac_dot11CountersTable_dot11TransmittedFragmentCount</div><div class='add'>+DIDmib_dot11mac_dot11CountersTable_dot11MulticastTransmittedFrameCount</div><div class='add'>+DIDmib_dot11mac_dot11CountersTable_dot11FailedCount</div><div class='add'>+DIDmib_dot11mac_dot11CountersTable_dot11RetryCount</div><div class='add'>+DIDmib_dot11mac_dot11CountersTable_dot11MultipleRetryCount</div><div class='add'>+DIDmib_dot11mac_dot11CountersTable_dot11FrameDuplicateCount</div><div class='add'>+DIDmib_dot11mac_dot11CountersTable_dot11RTSSuccessCount</div><div class='add'>+DIDmib_dot11mac_dot11CountersTable_dot11RTSFailureCount</div><div class='add'>+DIDmib_dot11mac_dot11CountersTable_dot11ACKFailureCount</div><div class='add'>+DIDmib_dot11mac_dot11CountersTable_dot11ReceivedFragmentCount</div><div class='add'>+DIDmib_dot11mac_dot11CountersTable_dot11MulticastReceivedFrameCount</div><div class='add'>+DIDmib_dot11mac_dot11CountersTable_dot11FCSErrorCount</div><div class='add'>+DIDmib_dot11mac_dot11CountersTable_dot11TransmittedFrameCount</div><div class='add'>+DIDmib_dot11mac_dot11CountersTable_dot11WEPUndecryptableCount</div><div class='add'>+</div><div class='add'>+TODO: implement sane values for these.</div><div class='add'>+DIDmib_dot11mac_dot11OperationTable_dot11ManufacturerID</div><div class='add'>+DIDmib_dot11mac_dot11OperationTable_dot11ProductID</div><div class='add'>+</div><div class='add'>+Not too worried about these at the moment.</div><div class='add'>+DIDmib_dot11phy_dot11PhyAntennaTable_dot11CurrentTxAntenna</div><div class='add'>+DIDmib_dot11phy_dot11PhyAntennaTable_dot11DiversitySupport</div><div class='add'>+DIDmib_dot11phy_dot11PhyAntennaTable_dot11CurrentRxAntenna</div><div class='add'>+DIDmib_dot11phy_dot11PhyTxPowerTable_dot11NumberSupportedPowerLevels</div><div class='add'>+DIDmib_dot11phy_dot11PhyTxPowerTable_dot11TxPowerLevel1</div><div class='add'>+DIDmib_dot11phy_dot11PhyTxPowerTable_dot11TxPowerLevel2</div><div class='add'>+DIDmib_dot11phy_dot11PhyTxPowerTable_dot11TxPowerLevel3</div><div class='add'>+DIDmib_dot11phy_dot11PhyTxPowerTable_dot11TxPowerLevel4</div><div class='add'>+DIDmib_dot11phy_dot11PhyTxPowerTable_dot11TxPowerLevel5</div><div class='add'>+DIDmib_dot11phy_dot11PhyTxPowerTable_dot11TxPowerLevel6</div><div class='add'>+DIDmib_dot11phy_dot11PhyTxPowerTable_dot11TxPowerLevel7</div><div class='add'>+DIDmib_dot11phy_dot11PhyTxPowerTable_dot11TxPowerLevel8</div><div class='add'>+DIDmib_dot11phy_dot11PhyTxPowerTable_dot11CurrentTxPowerLevel</div><div class='add'>+</div><div class='add'>+Ummm, FH and IR don't apply</div><div class='add'>+DIDmib_dot11phy_dot11PhyFHSSTable_dot11HopTime</div><div class='add'>+DIDmib_dot11phy_dot11PhyFHSSTable_dot11CurrentChannelNumber</div><div class='add'>+DIDmib_dot11phy_dot11PhyFHSSTable_dot11MaxDwellTime</div><div class='add'>+DIDmib_dot11phy_dot11PhyFHSSTable_dot11CurrentDwellTime</div><div class='add'>+DIDmib_dot11phy_dot11PhyFHSSTable_dot11CurrentSet</div><div class='add'>+DIDmib_dot11phy_dot11PhyFHSSTable_dot11CurrentPattern</div><div class='add'>+DIDmib_dot11phy_dot11PhyFHSSTable_dot11CurrentIndex</div><div class='add'>+DIDmib_dot11phy_dot11PhyDSSSTable_dot11CCAModeSupported</div><div class='add'>+DIDmib_dot11phy_dot11PhyDSSSTable_dot11EDThreshold</div><div class='add'>+DIDmib_dot11phy_dot11PhyIRTable_dot11CCAWatchdogTimerMax</div><div class='add'>+DIDmib_dot11phy_dot11PhyIRTable_dot11CCAWatchdogCountMax</div><div class='add'>+DIDmib_dot11phy_dot11PhyIRTable_dot11CCAWatchdogTimerMin</div><div class='add'>+DIDmib_dot11phy_dot11PhyIRTable_dot11CCAWatchdogCountMin</div><div class='add'>+</div><div class='add'>+We just don't have enough antennas right now to worry about this.</div><div class='add'>+DIDmib_dot11phy_dot11AntennasListTable_dot11AntennaListIndex</div><div class='add'>+DIDmib_dot11phy_dot11AntennasListTable_dot11SupportedTxAntenna</div><div class='add'>+DIDmib_dot11phy_dot11AntennasListTable_dot11SupportedRxAntenna</div><div class='add'>+DIDmib_dot11phy_dot11AntennasListTable_dot11DiversitySelectionRx</div><div class='add'>+</div><div class='add'>+------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Function Definitions */</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2mgmt_mibset_mibget</div><div class='add'>+*</div><div class='add'>+* Set the value of a mib item.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		wlan device structure</div><div class='add'>+*	msgp		ptr to msg buffer</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0	success and done</div><div class='add'>+*	&lt;0	success, but we're waiting for something to finish.</div><div class='add'>+*	&gt;0	an error occurred while handling the message.</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread  (usually)</div><div class='add'>+*	interrupt</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+int prism2mgmt_mibset_mibget(wlandevice_t *wlandev, void *msgp)</div><div class='add'>+{</div><div class='add'>+	hfa384x_t		*hw = wlandev-&gt;priv;</div><div class='add'>+	int			result, isget;</div><div class='add'>+	mibrec_t		*mib;</div><div class='add'>+	UINT16			which;</div><div class='add'>+</div><div class='add'>+	p80211msg_dot11req_mibset_t	*msg = msgp;</div><div class='add'>+	p80211itemd_t			*mibitem;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	msg-&gt;resultcode.status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+	msg-&gt;resultcode.data = P80211ENUM_resultcode_success;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	** Determine if this is an Access Point or a station.</div><div class='add'>+	*/</div><div class='add'>+</div><div class='add'>+	which = hw-&gt;ap ? F_AP : F_STA;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	** Find the MIB in the MIB table.  Note that a MIB may be in the</div><div class='add'>+	** table twice...once for an AP and once for a station.  Make sure</div><div class='add'>+	** to get the correct one.  Note that DID=0 marks the end of the</div><div class='add'>+	** MIB table.</div><div class='add'>+	*/</div><div class='add'>+</div><div class='add'>+	mibitem = (p80211itemd_t *) msg-&gt;mibattribute.data;</div><div class='add'>+</div><div class='add'>+	for (mib = mibtab; mib-&gt;did != 0; mib++)</div><div class='add'>+		if (mib-&gt;did == mibitem-&gt;did &amp;&amp; (mib-&gt;flag &amp; which))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+	if (mib-&gt;did == 0) {</div><div class='add'>+		msg-&gt;resultcode.data = P80211ENUM_resultcode_not_supported;</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	** Determine if this is a "mibget" or a "mibset".  If this is a</div><div class='add'>+	** "mibget", then make sure that the MIB may be read.  Otherwise,</div><div class='add'>+	** this is a "mibset" so make make sure that the MIB may be written.</div><div class='add'>+	*/</div><div class='add'>+</div><div class='add'>+	isget = (msg-&gt;msgcode == DIDmsg_dot11req_mibget);</div><div class='add'>+</div><div class='add'>+	if (isget) {</div><div class='add'>+		if (!(mib-&gt;flag &amp; F_READ)) {</div><div class='add'>+			msg-&gt;resultcode.data =</div><div class='add'>+				P80211ENUM_resultcode_cant_get_writeonly_mib;</div><div class='add'>+			goto done;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		if (!(mib-&gt;flag &amp; F_WRITE)) {</div><div class='add'>+			msg-&gt;resultcode.data =</div><div class='add'>+				P80211ENUM_resultcode_cant_set_readonly_mib;</div><div class='add'>+			goto done;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	** Execute the MIB function.  If things worked okay, then make</div><div class='add'>+	** sure that the MIB function also worked okay.  If so, and this</div><div class='add'>+	** is a "mibget", then the status value must be set for both the</div><div class='add'>+	** "mibattribute" parameter and the mib item within the data</div><div class='add'>+	** portion of the "mibattribute".</div><div class='add'>+	*/</div><div class='add'>+</div><div class='add'>+	result = mib-&gt;func(mib, isget, wlandev, hw, msg,</div><div class='add'>+			   (void *) mibitem-&gt;data);</div><div class='add'>+</div><div class='add'>+	if (msg-&gt;resultcode.data == P80211ENUM_resultcode_success) {</div><div class='add'>+		if (result != 0) {</div><div class='add'>+			WLAN_LOG_DEBUG(1, "get/set failure, result=%d\n",</div><div class='add'>+					result);</div><div class='add'>+			msg-&gt;resultcode.data =</div><div class='add'>+				 P80211ENUM_resultcode_implementation_failure;</div><div class='add'>+		} else {</div><div class='add'>+			if (isget) {</div><div class='add'>+				msg-&gt;mibattribute.status =</div><div class='add'>+					P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+				mibitem-&gt;status =</div><div class='add'>+					P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	DBFEXIT;</div><div class='add'>+</div><div class='add'>+	return(0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2mib_bytestr2pstr</div><div class='add'>+*</div><div class='add'>+* Get/set pstr data to/from a byte string.</div><div class='add'>+*</div><div class='add'>+* MIB record parameters:</div><div class='add'>+*       parm1    Prism2 RID value.</div><div class='add'>+*       parm2    Number of bytes of RID data.</div><div class='add'>+*       parm3    Not used.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*       mib      MIB record.</div><div class='add'>+*       isget    MIBGET/MIBSET flag.</div><div class='add'>+*       wlandev  wlan device structure.</div><div class='add'>+*       priv     "priv" structure.</div><div class='add'>+*       hw       "hw" structure.</div><div class='add'>+*       msg      Message structure.</div><div class='add'>+*       data     Data buffer.</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*       0   - Success.</div><div class='add'>+*       ~0  - Error.</div><div class='add'>+*</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+static int prism2mib_bytestr2pstr(</div><div class='add'>+mibrec_t                     *mib,</div><div class='add'>+int                          isget,</div><div class='add'>+wlandevice_t                 *wlandev,</div><div class='add'>+hfa384x_t                    *hw,</div><div class='add'>+p80211msg_dot11req_mibset_t  *msg,</div><div class='add'>+void                         *data)</div><div class='add'>+{</div><div class='add'>+	int                result;</div><div class='add'>+	p80211pstrd_t      *pstr = (p80211pstrd_t*) data;</div><div class='add'>+	UINT8              bytebuf[MIB_TMP_MAXLEN];</div><div class='add'>+	hfa384x_bytestr_t  *p2bytestr = (hfa384x_bytestr_t*) bytebuf;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	if (isget) {</div><div class='add'>+		result = hfa384x_drvr_getconfig(hw, mib-&gt;parm1, bytebuf, mib-&gt;parm2);</div><div class='add'>+		prism2mgmt_bytestr2pstr(p2bytestr, pstr);</div><div class='add'>+	} else {</div><div class='add'>+		memset(bytebuf, 0, mib-&gt;parm2);</div><div class='add'>+		prism2mgmt_pstr2bytestr(p2bytestr, pstr);</div><div class='add'>+		result = hfa384x_drvr_setconfig(hw, mib-&gt;parm1, bytebuf, mib-&gt;parm2);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return(result);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2mib_bytearea2pstr</div><div class='add'>+*</div><div class='add'>+* Get/set pstr data to/from a byte area.</div><div class='add'>+*</div><div class='add'>+* MIB record parameters:</div><div class='add'>+*       parm1    Prism2 RID value.</div><div class='add'>+*       parm2    Number of bytes of RID data.</div><div class='add'>+*       parm3    Not used.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*       mib      MIB record.</div><div class='add'>+*       isget    MIBGET/MIBSET flag.</div><div class='add'>+*       wlandev  wlan device structure.</div><div class='add'>+*       priv     "priv" structure.</div><div class='add'>+*       hw       "hw" structure.</div><div class='add'>+*       msg      Message structure.</div><div class='add'>+*       data     Data buffer.</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*       0   - Success.</div><div class='add'>+*       ~0  - Error.</div><div class='add'>+*</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+static int prism2mib_bytearea2pstr(</div><div class='add'>+mibrec_t                     *mib,</div><div class='add'>+int                          isget,</div><div class='add'>+wlandevice_t                 *wlandev,</div><div class='add'>+hfa384x_t                    *hw,</div><div class='add'>+p80211msg_dot11req_mibset_t  *msg,</div><div class='add'>+void                         *data)</div><div class='add'>+{</div><div class='add'>+	int            result;</div><div class='add'>+	p80211pstrd_t  *pstr = (p80211pstrd_t*) data;</div><div class='add'>+	UINT8          bytebuf[MIB_TMP_MAXLEN];</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	if (isget) {</div><div class='add'>+		result = hfa384x_drvr_getconfig(hw, mib-&gt;parm1, bytebuf, mib-&gt;parm2);</div><div class='add'>+		prism2mgmt_bytearea2pstr(bytebuf, pstr,	mib-&gt;parm2);</div><div class='add'>+	} else {</div><div class='add'>+		memset(bytebuf, 0, mib-&gt;parm2);</div><div class='add'>+		prism2mgmt_pstr2bytearea(bytebuf, pstr);</div><div class='add'>+		result = hfa384x_drvr_setconfig(hw, mib-&gt;parm1, bytebuf, mib-&gt;parm2);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return(result);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2mib_uint32</div><div class='add'>+*</div><div class='add'>+* Get/set uint32 data.</div><div class='add'>+*</div><div class='add'>+* MIB record parameters:</div><div class='add'>+*       parm1    Prism2 RID value.</div><div class='add'>+*       parm2    Not used.</div><div class='add'>+*       parm3    Not used.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*       mib      MIB record.</div><div class='add'>+*       isget    MIBGET/MIBSET flag.</div><div class='add'>+*       wlandev  wlan device structure.</div><div class='add'>+*       priv     "priv" structure.</div><div class='add'>+*       hw       "hw" structure.</div><div class='add'>+*       msg      Message structure.</div><div class='add'>+*       data     Data buffer.</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*       0   - Success.</div><div class='add'>+*       ~0  - Error.</div><div class='add'>+*</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+static int prism2mib_uint32(</div><div class='add'>+mibrec_t                     *mib,</div><div class='add'>+int                          isget,</div><div class='add'>+wlandevice_t                 *wlandev,</div><div class='add'>+hfa384x_t                    *hw,</div><div class='add'>+p80211msg_dot11req_mibset_t  *msg,</div><div class='add'>+void                         *data)</div><div class='add'>+{</div><div class='add'>+	int     result;</div><div class='add'>+	UINT32  *uint32 = (UINT32*) data;</div><div class='add'>+	UINT8   bytebuf[MIB_TMP_MAXLEN];</div><div class='add'>+	UINT16  *wordbuf = (UINT16*) bytebuf;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	if (isget) {</div><div class='add'>+		result = hfa384x_drvr_getconfig16(hw, mib-&gt;parm1, wordbuf);</div><div class='add'>+		*uint32 = *wordbuf;</div><div class='add'>+		/* [MSM] Removed, getconfig16 returns the value in host order.</div><div class='add'>+		 * prism2mgmt_prism2int2p80211int(wordbuf, uint32);</div><div class='add'>+		 */</div><div class='add'>+	} else {</div><div class='add'>+		/* [MSM] Removed, setconfig16 expects host order.</div><div class='add'>+		 * prism2mgmt_p80211int2prism2int(wordbuf, uint32);</div><div class='add'>+		 */</div><div class='add'>+		*wordbuf = *uint32;</div><div class='add'>+		result = hfa384x_drvr_setconfig16(hw, mib-&gt;parm1, *wordbuf);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return(result);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2mib_uint32array</div><div class='add'>+*</div><div class='add'>+* Get/set an array of uint32 data.</div><div class='add'>+*</div><div class='add'>+* MIB record parameters:</div><div class='add'>+*       parm1    Prism2 RID value.</div><div class='add'>+*       parm2    Number of bytes of RID data.</div><div class='add'>+*       parm3    Not used.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*       mib      MIB record.</div><div class='add'>+*       isget    MIBGET/MIBSET flag.</div><div class='add'>+*       wlandev  wlan device structure.</div><div class='add'>+*       priv     "priv" structure.</div><div class='add'>+*       hw       "hw" structure.</div><div class='add'>+*       msg      Message structure.</div><div class='add'>+*       data     Data buffer.</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*       0   - Success.</div><div class='add'>+*       ~0  - Error.</div><div class='add'>+*</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+static int prism2mib_uint32array(</div><div class='add'>+mibrec_t                     *mib,</div><div class='add'>+int                          isget,</div><div class='add'>+wlandevice_t                 *wlandev,</div><div class='add'>+hfa384x_t                    *hw,</div><div class='add'>+p80211msg_dot11req_mibset_t  *msg,</div><div class='add'>+void                         *data)</div><div class='add'>+{</div><div class='add'>+	int     result;</div><div class='add'>+	UINT32  *uint32 = (UINT32 *) data;</div><div class='add'>+	UINT8   bytebuf[MIB_TMP_MAXLEN];</div><div class='add'>+	UINT16  *wordbuf = (UINT16*) bytebuf;</div><div class='add'>+	int     i, cnt;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	cnt = mib-&gt;parm2 / sizeof(UINT16);</div><div class='add'>+</div><div class='add'>+	if (isget) {</div><div class='add'>+		result = hfa384x_drvr_getconfig(hw, mib-&gt;parm1, wordbuf, mib-&gt;parm2);</div><div class='add'>+		for (i = 0; i &lt; cnt; i++)</div><div class='add'>+			prism2mgmt_prism2int2p80211int(wordbuf+i, uint32+i);</div><div class='add'>+	} else {</div><div class='add'>+		for (i = 0; i &lt; cnt; i++)</div><div class='add'>+			prism2mgmt_p80211int2prism2int(wordbuf+i, uint32+i);</div><div class='add'>+		result = hfa384x_drvr_setconfig(hw, mib-&gt;parm1, wordbuf, mib-&gt;parm2);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return(result);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2mib_uint32offset</div><div class='add'>+*</div><div class='add'>+* Get/set a single element in an array of uint32 data.</div><div class='add'>+*</div><div class='add'>+* MIB record parameters:</div><div class='add'>+*       parm1    Prism2 RID value.</div><div class='add'>+*       parm2    Number of bytes of RID data.</div><div class='add'>+*       parm3    Element index.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*       mib      MIB record.</div><div class='add'>+*       isget    MIBGET/MIBSET flag.</div><div class='add'>+*       wlandev  wlan device structure.</div><div class='add'>+*       priv     "priv" structure.</div><div class='add'>+*       hw       "hw" structure.</div><div class='add'>+*       msg      Message structure.</div><div class='add'>+*       data     Data buffer.</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*       0   - Success.</div><div class='add'>+*       ~0  - Error.</div><div class='add'>+*</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+static int prism2mib_uint32offset(</div><div class='add'>+mibrec_t                     *mib,</div><div class='add'>+int                          isget,</div><div class='add'>+wlandevice_t                 *wlandev,</div><div class='add'>+hfa384x_t                    *hw,</div><div class='add'>+p80211msg_dot11req_mibset_t  *msg,</div><div class='add'>+void                         *data)</div><div class='add'>+{</div><div class='add'>+	int     result;</div><div class='add'>+	UINT32  *uint32 = (UINT32*) data;</div><div class='add'>+	UINT8   bytebuf[MIB_TMP_MAXLEN];</div><div class='add'>+	UINT16  *wordbuf = (UINT16*) bytebuf;</div><div class='add'>+	UINT16  cnt;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	cnt = mib-&gt;parm2 / sizeof(UINT16);</div><div class='add'>+</div><div class='add'>+	result = hfa384x_drvr_getconfig(hw, mib-&gt;parm1, wordbuf, mib-&gt;parm2);</div><div class='add'>+	if (result == 0) {</div><div class='add'>+		if (isget) {</div><div class='add'>+			if (mib-&gt;parm3 &lt; cnt)</div><div class='add'>+				prism2mgmt_prism2int2p80211int(wordbuf+mib-&gt;parm3, uint32);</div><div class='add'>+			else</div><div class='add'>+				*uint32 = 0;</div><div class='add'>+		} else {</div><div class='add'>+			if (mib-&gt;parm3 &lt; cnt) {</div><div class='add'>+				prism2mgmt_p80211int2prism2int(wordbuf+mib-&gt;parm3, uint32);</div><div class='add'>+				result = hfa384x_drvr_setconfig(hw, mib-&gt;parm1, wordbuf, mib-&gt;parm2);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return(result);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2mib_truth</div><div class='add'>+*</div><div class='add'>+* Get/set truth data.</div><div class='add'>+*</div><div class='add'>+* MIB record parameters:</div><div class='add'>+*       parm1    Prism2 RID value.</div><div class='add'>+*       parm2    Not used.</div><div class='add'>+*       parm3    Not used.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*       mib      MIB record.</div><div class='add'>+*       isget    MIBGET/MIBSET flag.</div><div class='add'>+*       wlandev  wlan device structure.</div><div class='add'>+*       priv     "priv" structure.</div><div class='add'>+*       hw       "hw" structure.</div><div class='add'>+*       msg      Message structure.</div><div class='add'>+*       data     Data buffer.</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*       0   - Success.</div><div class='add'>+*       ~0  - Error.</div><div class='add'>+*</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+static int prism2mib_truth(</div><div class='add'>+mibrec_t                     *mib,</div><div class='add'>+int                          isget,</div><div class='add'>+wlandevice_t                 *wlandev,</div><div class='add'>+hfa384x_t                    *hw,</div><div class='add'>+p80211msg_dot11req_mibset_t  *msg,</div><div class='add'>+void                         *data)</div><div class='add'>+{</div><div class='add'>+	int     result;</div><div class='add'>+	UINT32  *uint32 = (UINT32*) data;</div><div class='add'>+	UINT8   bytebuf[MIB_TMP_MAXLEN];</div><div class='add'>+	UINT16  *wordbuf = (UINT16*) bytebuf;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	if (isget) {</div><div class='add'>+		result = hfa384x_drvr_getconfig16(hw, mib-&gt;parm1, wordbuf);</div><div class='add'>+		*uint32 = (*wordbuf) ?</div><div class='add'>+				P80211ENUM_truth_true : P80211ENUM_truth_false;</div><div class='add'>+	} else {</div><div class='add'>+		*wordbuf = ((*uint32) == P80211ENUM_truth_true) ? 1 : 0;</div><div class='add'>+		result = hfa384x_drvr_setconfig16(hw, mib-&gt;parm1, *wordbuf);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return(result);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2mib_flag</div><div class='add'>+*</div><div class='add'>+* Get/set a flag.</div><div class='add'>+*</div><div class='add'>+* MIB record parameters:</div><div class='add'>+*       parm1    Prism2 RID value.</div><div class='add'>+*       parm2    Bit to get/set.</div><div class='add'>+*       parm3    Not used.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*       mib      MIB record.</div><div class='add'>+*       isget    MIBGET/MIBSET flag.</div><div class='add'>+*       wlandev  wlan device structure.</div><div class='add'>+*       priv     "priv" structure.</div><div class='add'>+*       hw       "hw" structure.</div><div class='add'>+*       msg      Message structure.</div><div class='add'>+*       data     Data buffer.</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*       0   - Success.</div><div class='add'>+*       ~0  - Error.</div><div class='add'>+*</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+static int prism2mib_flag(</div><div class='add'>+mibrec_t                     *mib,</div><div class='add'>+int                          isget,</div><div class='add'>+wlandevice_t                 *wlandev,</div><div class='add'>+hfa384x_t                    *hw,</div><div class='add'>+p80211msg_dot11req_mibset_t  *msg,</div><div class='add'>+void                         *data)</div><div class='add'>+{</div><div class='add'>+	int     result;</div><div class='add'>+	UINT32  *uint32 = (UINT32*) data;</div><div class='add'>+	UINT8   bytebuf[MIB_TMP_MAXLEN];</div><div class='add'>+	UINT16  *wordbuf = (UINT16*) bytebuf;</div><div class='add'>+	UINT32  flags;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	result = hfa384x_drvr_getconfig16(hw, mib-&gt;parm1, wordbuf);</div><div class='add'>+	if (result == 0) {</div><div class='add'>+		/* [MSM] Removed, getconfig16 returns the value in host order.</div><div class='add'>+		 * prism2mgmt_prism2int2p80211int(wordbuf, &amp;flags);</div><div class='add'>+		 */</div><div class='add'>+		flags = *wordbuf;</div><div class='add'>+		if (isget) {</div><div class='add'>+			*uint32 = (flags &amp; mib-&gt;parm2) ?</div><div class='add'>+				P80211ENUM_truth_true : P80211ENUM_truth_false;</div><div class='add'>+		} else {</div><div class='add'>+			if ((*uint32) == P80211ENUM_truth_true)</div><div class='add'>+				flags |= mib-&gt;parm2;</div><div class='add'>+			else</div><div class='add'>+				flags &amp;= ~mib-&gt;parm2;</div><div class='add'>+			/* [MSM] Removed, setconfig16 expects host order.</div><div class='add'>+			 * prism2mgmt_p80211int2prism2int(wordbuf, &amp;flags);</div><div class='add'>+			 */</div><div class='add'>+			*wordbuf = flags;</div><div class='add'>+			result = hfa384x_drvr_setconfig16(hw, mib-&gt;parm1, *wordbuf);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return(result);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2mib_appcfinfoflag</div><div class='add'>+*</div><div class='add'>+* Get/set a single flag in the APPCFINFO record.</div><div class='add'>+*</div><div class='add'>+* MIB record parameters:</div><div class='add'>+*       parm1    Bit to get/set.</div><div class='add'>+*       parm2    Not used.</div><div class='add'>+*       parm3    Not used.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*       mib      MIB record.</div><div class='add'>+*       isget    MIBGET/MIBSET flag.</div><div class='add'>+*       wlandev  wlan device structure.</div><div class='add'>+*       priv     "priv" structure.</div><div class='add'>+*       hw       "hw" structure.</div><div class='add'>+*       msg      Message structure.</div><div class='add'>+*       data     Data buffer.</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*       0   - Success.</div><div class='add'>+*       ~0  - Error.</div><div class='add'>+*</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+static int prism2mib_appcfinfoflag(</div><div class='add'>+mibrec_t                     *mib,</div><div class='add'>+int                          isget,</div><div class='add'>+wlandevice_t                 *wlandev,</div><div class='add'>+hfa384x_t                    *hw,</div><div class='add'>+p80211msg_dot11req_mibset_t  *msg,</div><div class='add'>+void                         *data)</div><div class='add'>+{</div><div class='add'>+	int     result;</div><div class='add'>+	UINT32  *uint32 = (UINT32*) data;</div><div class='add'>+	UINT8   bytebuf[MIB_TMP_MAXLEN];</div><div class='add'>+	UINT16  *wordbuf = (UINT16*) bytebuf;</div><div class='add'>+	UINT16  word;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	result = hfa384x_drvr_getconfig(hw, HFA384x_RID_CNFAPPCFINFO,</div><div class='add'>+					bytebuf, HFA384x_RID_CNFAPPCFINFO_LEN);</div><div class='add'>+	if (result == 0) {</div><div class='add'>+		if (isget) {</div><div class='add'>+			*uint32 = (hfa384x2host_16(wordbuf[3]) &amp; mib-&gt;parm1) ?</div><div class='add'>+				P80211ENUM_truth_true : P80211ENUM_truth_false;</div><div class='add'>+		} else {</div><div class='add'>+			word = hfa384x2host_16(wordbuf[3]);</div><div class='add'>+			word = ((*uint32) == P80211ENUM_truth_true) ?</div><div class='add'>+				(word | mib-&gt;parm1) : (word &amp; ~mib-&gt;parm1);</div><div class='add'>+			wordbuf[3] = host2hfa384x_16(word);</div><div class='add'>+			result = hfa384x_drvr_setconfig(hw, HFA384x_RID_CNFAPPCFINFO,</div><div class='add'>+					bytebuf, HFA384x_RID_CNFAPPCFINFO_LEN);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return(result);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2mib_regulatorydomains</div><div class='add'>+*</div><div class='add'>+* Get regulatory domain data.</div><div class='add'>+*</div><div class='add'>+* MIB record parameters:</div><div class='add'>+*       parm1    Prism2 RID value.</div><div class='add'>+*       parm2    Number of bytes of RID data.</div><div class='add'>+*       parm3    Not used.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*       mib      MIB record.</div><div class='add'>+*       isget    MIBGET/MIBSET flag.</div><div class='add'>+*       wlandev  wlan device structure.</div><div class='add'>+*       priv     "priv" structure.</div><div class='add'>+*       hw       "hw" structure.</div><div class='add'>+*       msg      Message structure.</div><div class='add'>+*       data     Data buffer.</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*       0   - Success.</div><div class='add'>+*       ~0  - Error.</div><div class='add'>+*</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+static int prism2mib_regulatorydomains(</div><div class='add'>+mibrec_t                     *mib,</div><div class='add'>+int                          isget,</div><div class='add'>+wlandevice_t                 *wlandev,</div><div class='add'>+hfa384x_t                    *hw,</div><div class='add'>+p80211msg_dot11req_mibset_t  *msg,</div><div class='add'>+void                         *data)</div><div class='add'>+{</div><div class='add'>+	int            result;</div><div class='add'>+	UINT32         cnt;</div><div class='add'>+	p80211pstrd_t  *pstr = (p80211pstrd_t*) data;</div><div class='add'>+	UINT8          bytebuf[MIB_TMP_MAXLEN];</div><div class='add'>+	UINT16         *wordbuf = (UINT16*) bytebuf;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	result = 0;</div><div class='add'>+</div><div class='add'>+	if (isget) {</div><div class='add'>+		result = hfa384x_drvr_getconfig(hw, mib-&gt;parm1, wordbuf, mib-&gt;parm2);</div><div class='add'>+		prism2mgmt_prism2int2p80211int(wordbuf, &amp;cnt);</div><div class='add'>+		pstr-&gt;len = (UINT8) cnt;</div><div class='add'>+		memcpy(pstr-&gt;data, &amp;wordbuf[1], pstr-&gt;len);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return(result);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2mib_wepdefaultkey</div><div class='add'>+*</div><div class='add'>+* Get/set WEP default keys.</div><div class='add'>+*</div><div class='add'>+* MIB record parameters:</div><div class='add'>+*       parm1    Prism2 RID value.</div><div class='add'>+*       parm2    Number of bytes of RID data.</div><div class='add'>+*       parm3    Not used.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*       mib      MIB record.</div><div class='add'>+*       isget    MIBGET/MIBSET flag.</div><div class='add'>+*       wlandev  wlan device structure.</div><div class='add'>+*       priv     "priv" structure.</div><div class='add'>+*       hw       "hw" structure.</div><div class='add'>+*       msg      Message structure.</div><div class='add'>+*       data     Data buffer.</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*       0   - Success.</div><div class='add'>+*       ~0  - Error.</div><div class='add'>+*</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+static int prism2mib_wepdefaultkey(</div><div class='add'>+mibrec_t                     *mib,</div><div class='add'>+int                          isget,</div><div class='add'>+wlandevice_t                 *wlandev,</div><div class='add'>+hfa384x_t                    *hw,</div><div class='add'>+p80211msg_dot11req_mibset_t  *msg,</div><div class='add'>+void                         *data)</div><div class='add'>+{</div><div class='add'>+	int            result;</div><div class='add'>+	p80211pstrd_t  *pstr = (p80211pstrd_t*) data;</div><div class='add'>+	UINT8          bytebuf[MIB_TMP_MAXLEN];</div><div class='add'>+	UINT16         len;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	if (isget) {</div><div class='add'>+		result = 0;    /* Should never happen. */</div><div class='add'>+	} else {</div><div class='add'>+		len = (pstr-&gt;len &gt; 5) ? HFA384x_RID_CNFWEP128DEFAULTKEY_LEN :</div><div class='add'>+					HFA384x_RID_CNFWEPDEFAULTKEY_LEN;</div><div class='add'>+		memset(bytebuf, 0, len);</div><div class='add'>+		prism2mgmt_pstr2bytearea(bytebuf, pstr);</div><div class='add'>+		result = hfa384x_drvr_setconfig(hw, mib-&gt;parm1, bytebuf, len);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return(result);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2mib_powermanagement</div><div class='add'>+*</div><div class='add'>+* Get/set 802.11 power management value.  Note that this is defined differently</div><div class='add'>+* by 802.11 and Prism2:</div><div class='add'>+*</div><div class='add'>+*       Meaning     802.11       Prism2</div><div class='add'>+*        active       1           false</div><div class='add'>+*      powersave      2           true</div><div class='add'>+*</div><div class='add'>+* MIB record parameters:</div><div class='add'>+*       parm1    Prism2 RID value.</div><div class='add'>+*       parm2    Not used.</div><div class='add'>+*       parm3    Not used.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*       mib      MIB record.</div><div class='add'>+*       isget    MIBGET/MIBSET flag.</div><div class='add'>+*       wlandev  wlan device structure.</div><div class='add'>+*       priv     "priv" structure.</div><div class='add'>+*       hw       "hw" structure.</div><div class='add'>+*       msg      Message structure.</div><div class='add'>+*       data     Data buffer.</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*       0   - Success.</div><div class='add'>+*       ~0  - Error.</div><div class='add'>+*</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+static int prism2mib_powermanagement(</div><div class='add'>+mibrec_t                     *mib,</div><div class='add'>+int                          isget,</div><div class='add'>+wlandevice_t                 *wlandev,</div><div class='add'>+hfa384x_t                    *hw,</div><div class='add'>+p80211msg_dot11req_mibset_t  *msg,</div><div class='add'>+void                         *data)</div><div class='add'>+{</div><div class='add'>+	int     result;</div><div class='add'>+	UINT32  *uint32 = (UINT32*) data;</div><div class='add'>+	UINT32  value;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	if (isget) {</div><div class='add'>+		result = prism2mib_uint32(mib, isget, wlandev, hw, msg, &amp;value);</div><div class='add'>+		*uint32 = (value == 0) ? 1 : 2;</div><div class='add'>+	} else {</div><div class='add'>+		value = ((*uint32) == 1) ? 0 : 1;</div><div class='add'>+		result = prism2mib_uint32(mib, isget, wlandev, hw, msg, &amp;value);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return(result);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2mib_preamble</div><div class='add'>+*</div><div class='add'>+* Get/set Prism2 short preamble</div><div class='add'>+*</div><div class='add'>+* MIB record parameters:</div><div class='add'>+*       parm1    Prism2 RID value.</div><div class='add'>+*       parm2    Not used.</div><div class='add'>+*       parm3    Not used.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*       mib      MIB record.</div><div class='add'>+*       isget    MIBGET/MIBSET flag.</div><div class='add'>+*       wlandev  wlan device structure.</div><div class='add'>+*       priv     "priv" structure.</div><div class='add'>+*       hw       "hw" structure.</div><div class='add'>+*       msg      Message structure.</div><div class='add'>+*       data     Data buffer.</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*       0   - Success.</div><div class='add'>+*       ~0  - Error.</div><div class='add'>+*</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+static int prism2mib_preamble(</div><div class='add'>+mibrec_t                     *mib,</div><div class='add'>+int                          isget,</div><div class='add'>+wlandevice_t                 *wlandev,</div><div class='add'>+hfa384x_t                    *hw,</div><div class='add'>+p80211msg_dot11req_mibset_t  *msg,</div><div class='add'>+void                         *data)</div><div class='add'>+{</div><div class='add'>+	int     result;</div><div class='add'>+	UINT32  *uint32 = (UINT32*) data;</div><div class='add'>+	UINT8   bytebuf[MIB_TMP_MAXLEN];</div><div class='add'>+	UINT16  *wordbuf = (UINT16*) bytebuf;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	if (isget) {</div><div class='add'>+		result = hfa384x_drvr_getconfig16(hw, mib-&gt;parm1, wordbuf);</div><div class='add'>+		*uint32 = *wordbuf;</div><div class='add'>+	} else {</div><div class='add'>+		*wordbuf = *uint32;</div><div class='add'>+		result = hfa384x_drvr_setconfig16(hw, mib-&gt;parm1, *wordbuf);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return(result);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2mib_privacyinvoked</div><div class='add'>+*</div><div class='add'>+* Get/set the dot11PrivacyInvoked value.</div><div class='add'>+*</div><div class='add'>+* MIB record parameters:</div><div class='add'>+*       parm1    Prism2 RID value.</div><div class='add'>+*       parm2    Bit value for PrivacyInvoked flag.</div><div class='add'>+*       parm3    Not used.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*       mib      MIB record.</div><div class='add'>+*       isget    MIBGET/MIBSET flag.</div><div class='add'>+*       wlandev  wlan device structure.</div><div class='add'>+*       priv     "priv" structure.</div><div class='add'>+*       hw       "hw" structure.</div><div class='add'>+*       msg      Message structure.</div><div class='add'>+*       data     Data buffer.</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*       0   - Success.</div><div class='add'>+*       ~0  - Error.</div><div class='add'>+*</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+static int prism2mib_privacyinvoked(</div><div class='add'>+mibrec_t                     *mib,</div><div class='add'>+int                          isget,</div><div class='add'>+wlandevice_t                 *wlandev,</div><div class='add'>+hfa384x_t                    *hw,</div><div class='add'>+p80211msg_dot11req_mibset_t  *msg,</div><div class='add'>+void                         *data)</div><div class='add'>+{</div><div class='add'>+	int     result;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	if (wlandev-&gt;hostwep &amp; HOSTWEP_DECRYPT) {</div><div class='add'>+		if (wlandev-&gt;hostwep &amp; HOSTWEP_DECRYPT)</div><div class='add'>+			mib-&gt;parm2 |= HFA384x_WEPFLAGS_DISABLE_RXCRYPT;</div><div class='add'>+		if (wlandev-&gt;hostwep &amp; HOSTWEP_ENCRYPT)</div><div class='add'>+			mib-&gt;parm2 |= HFA384x_WEPFLAGS_DISABLE_TXCRYPT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	result = prism2mib_flag(mib, isget, wlandev, hw, msg, data);</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return(result);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2mib_excludeunencrypted</div><div class='add'>+*</div><div class='add'>+* Get/set the dot11ExcludeUnencrypted value.</div><div class='add'>+*</div><div class='add'>+* MIB record parameters:</div><div class='add'>+*       parm1    Prism2 RID value.</div><div class='add'>+*       parm2    Bit value for ExcludeUnencrypted flag.</div><div class='add'>+*       parm3    Not used.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*       mib      MIB record.</div><div class='add'>+*       isget    MIBGET/MIBSET flag.</div><div class='add'>+*       wlandev  wlan device structure.</div><div class='add'>+*       priv     "priv" structure.</div><div class='add'>+*       hw       "hw" structure.</div><div class='add'>+*       msg      Message structure.</div><div class='add'>+*       data     Data buffer.</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*       0   - Success.</div><div class='add'>+*       ~0  - Error.</div><div class='add'>+*</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+static int prism2mib_excludeunencrypted(</div><div class='add'>+mibrec_t                     *mib,</div><div class='add'>+int                          isget,</div><div class='add'>+wlandevice_t                 *wlandev,</div><div class='add'>+hfa384x_t                    *hw,</div><div class='add'>+p80211msg_dot11req_mibset_t  *msg,</div><div class='add'>+void                         *data)</div><div class='add'>+{</div><div class='add'>+	int     result;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	result = prism2mib_flag(mib, isget, wlandev, hw, msg, data);</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return(result);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2mib_fragmentationthreshold</div><div class='add'>+*</div><div class='add'>+* Get/set the fragmentation threshold.</div><div class='add'>+*</div><div class='add'>+* MIB record parameters:</div><div class='add'>+*       parm1    Prism2 RID value.</div><div class='add'>+*       parm2    Not used.</div><div class='add'>+*       parm3    Not used.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*       mib      MIB record.</div><div class='add'>+*       isget    MIBGET/MIBSET flag.</div><div class='add'>+*       wlandev  wlan device structure.</div><div class='add'>+*       priv     "priv" structure.</div><div class='add'>+*       hw       "hw" structure.</div><div class='add'>+*       msg      Message structure.</div><div class='add'>+*       data     Data buffer.</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*       0   - Success.</div><div class='add'>+*       ~0  - Error.</div><div class='add'>+*</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+static int prism2mib_fragmentationthreshold(</div><div class='add'>+mibrec_t                     *mib,</div><div class='add'>+int                          isget,</div><div class='add'>+wlandevice_t                 *wlandev,</div><div class='add'>+hfa384x_t                    *hw,</div><div class='add'>+p80211msg_dot11req_mibset_t  *msg,</div><div class='add'>+void                         *data)</div><div class='add'>+{</div><div class='add'>+	int     result;</div><div class='add'>+	UINT32  *uint32 = (UINT32*) data;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	if (!isget)</div><div class='add'>+		if ((*uint32) % 2) {</div><div class='add'>+			WLAN_LOG_WARNING("Attempt to set odd number "</div><div class='add'>+					  "FragmentationThreshold\n");</div><div class='add'>+			msg-&gt;resultcode.data = P80211ENUM_resultcode_not_supported;</div><div class='add'>+			return(0);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	result = prism2mib_uint32(mib, isget, wlandev, hw, msg, data);</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return(result);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2mib_operationalrateset</div><div class='add'>+*</div><div class='add'>+* Get/set the operational rate set.</div><div class='add'>+*</div><div class='add'>+* MIB record parameters:</div><div class='add'>+*       parm1    Prism2 RID value.</div><div class='add'>+*       parm2    Not used.</div><div class='add'>+*       parm3    Not used.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*       mib      MIB record.</div><div class='add'>+*       isget    MIBGET/MIBSET flag.</div><div class='add'>+*       wlandev  wlan device structure.</div><div class='add'>+*       priv     "priv" structure.</div><div class='add'>+*       hw       "hw" structure.</div><div class='add'>+*       msg      Message structure.</div><div class='add'>+*       data     Data buffer.</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*       0   - Success.</div><div class='add'>+*       ~0  - Error.</div><div class='add'>+*</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+static int prism2mib_operationalrateset(</div><div class='add'>+mibrec_t                     *mib,</div><div class='add'>+int                          isget,</div><div class='add'>+wlandevice_t                 *wlandev,</div><div class='add'>+hfa384x_t                    *hw,</div><div class='add'>+p80211msg_dot11req_mibset_t  *msg,</div><div class='add'>+void                         *data)</div><div class='add'>+{</div><div class='add'>+	int            result;</div><div class='add'>+	p80211pstrd_t  *pstr = (p80211pstrd_t *) data;</div><div class='add'>+	UINT8          bytebuf[MIB_TMP_MAXLEN];</div><div class='add'>+	UINT16         *wordbuf = (UINT16*) bytebuf;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	if (isget) {</div><div class='add'>+		result = hfa384x_drvr_getconfig16(hw, mib-&gt;parm1, wordbuf);</div><div class='add'>+		prism2mgmt_get_oprateset(wordbuf, pstr);</div><div class='add'>+	} else {</div><div class='add'>+		prism2mgmt_set_oprateset(wordbuf, pstr);</div><div class='add'>+		result = hfa384x_drvr_setconfig16(hw, mib-&gt;parm1, *wordbuf);</div><div class='add'>+		result = hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFSUPPRATES, *wordbuf);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return(result);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2mib_groupaddress</div><div class='add'>+*</div><div class='add'>+* Get/set the dot11GroupAddressesTable.</div><div class='add'>+*</div><div class='add'>+* MIB record parameters:</div><div class='add'>+*       parm1    Not used.</div><div class='add'>+*       parm2    Not used.</div><div class='add'>+*       parm3    Not used.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*       mib      MIB record.</div><div class='add'>+*       isget    MIBGET/MIBSET flag.</div><div class='add'>+*       wlandev  wlan device structure.</div><div class='add'>+*       priv     "priv" structure.</div><div class='add'>+*       hw       "hw" structure.</div><div class='add'>+*       msg      Message structure.</div><div class='add'>+*       data     Data buffer.</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*       0   - Success.</div><div class='add'>+*       ~0  - Error.</div><div class='add'>+*</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+static int prism2mib_groupaddress(</div><div class='add'>+mibrec_t                     *mib,</div><div class='add'>+int                          isget,</div><div class='add'>+wlandevice_t                 *wlandev,</div><div class='add'>+hfa384x_t                    *hw,</div><div class='add'>+p80211msg_dot11req_mibset_t  *msg,</div><div class='add'>+void                         *data)</div><div class='add'>+{</div><div class='add'>+	int            result;</div><div class='add'>+	p80211pstrd_t  *pstr = (p80211pstrd_t *) data;</div><div class='add'>+	UINT8          bytebuf[MIB_TMP_MAXLEN];</div><div class='add'>+	UINT16         len;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	/* TODO: fix this.  f/w doesn't support mcast filters */</div><div class='add'>+</div><div class='add'>+	if (isget) {</div><div class='add'>+		prism2mgmt_get_grpaddr(mib-&gt;did, pstr, hw);</div><div class='add'>+		return(0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	result = prism2mgmt_set_grpaddr(mib-&gt;did, bytebuf, pstr, hw);</div><div class='add'>+	if (result != 0) {</div><div class='add'>+		msg-&gt;resultcode.data = P80211ENUM_resultcode_not_supported;</div><div class='add'>+		return(result);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (hw-&gt;dot11_grpcnt &lt;= MAX_PRISM2_GRP_ADDR) {</div><div class='add'>+		len = hw-&gt;dot11_grpcnt * WLAN_ADDR_LEN;</div><div class='add'>+		memcpy(bytebuf, hw-&gt;dot11_grp_addr[0], len);</div><div class='add'>+		result = hfa384x_drvr_setconfig(hw, HFA384x_RID_GROUPADDR, bytebuf, len);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		** Turn off promiscuous mode if count is equal to MAX.  We may</div><div class='add'>+		** have been at a higher count in promiscuous mode and need to</div><div class='add'>+		** turn it off.</div><div class='add'>+		*/</div><div class='add'>+</div><div class='add'>+		/* but only if we're not already in promisc mode. :) */</div><div class='add'>+		if ((hw-&gt;dot11_grpcnt == MAX_PRISM2_GRP_ADDR) &amp;&amp;</div><div class='add'>+		    !( wlandev-&gt;netdev-&gt;flags &amp; IFF_PROMISC)) {</div><div class='add'>+			result = hfa384x_drvr_setconfig16(hw,</div><div class='add'>+					     HFA384x_RID_PROMISCMODE, 0);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		** Clear group addresses in card and set to promiscuous mode.</div><div class='add'>+		*/</div><div class='add'>+</div><div class='add'>+		memset(bytebuf, 0, sizeof(bytebuf));</div><div class='add'>+		result = hfa384x_drvr_setconfig(hw, HFA384x_RID_GROUPADDR,</div><div class='add'>+						bytebuf, 0);</div><div class='add'>+		if (result == 0) {</div><div class='add'>+			result = hfa384x_drvr_setconfig16(hw,</div><div class='add'>+					HFA384x_RID_PROMISCMODE, 1);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return(result);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2mib_fwid</div><div class='add'>+*</div><div class='add'>+* Get the firmware ID.</div><div class='add'>+*</div><div class='add'>+* MIB record parameters:</div><div class='add'>+*       parm1    Not used.</div><div class='add'>+*       parm2    Not used.</div><div class='add'>+*       parm3    Not used.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*       mib      MIB record.</div><div class='add'>+*       isget    MIBGET/MIBSET flag.</div><div class='add'>+*       wlandev  wlan device structure.</div><div class='add'>+*       priv     "priv" structure.</div><div class='add'>+*       hw       "hw" structure.</div><div class='add'>+*       msg      Message structure.</div><div class='add'>+*       data     Data buffer.</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*       0   - Success.</div><div class='add'>+*       ~0  - Error.</div><div class='add'>+*</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+static int prism2mib_fwid(</div><div class='add'>+mibrec_t                     *mib,</div><div class='add'>+int                          isget,</div><div class='add'>+wlandevice_t                 *wlandev,</div><div class='add'>+hfa384x_t                    *hw,</div><div class='add'>+p80211msg_dot11req_mibset_t  *msg,</div><div class='add'>+void                         *data)</div><div class='add'>+{</div><div class='add'>+	int             result;</div><div class='add'>+	p80211pstrd_t   *pstr = (p80211pstrd_t *) data;</div><div class='add'>+	hfa384x_FWID_t  fwid;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	if (isget) {</div><div class='add'>+		result = hfa384x_drvr_getconfig(hw, HFA384x_RID_FWID,</div><div class='add'>+						&amp;fwid, HFA384x_RID_FWID_LEN);</div><div class='add'>+		if (mib-&gt;did == DIDmib_p2_p2NIC_p2PrimaryFWID) {</div><div class='add'>+			fwid.primary[HFA384x_FWID_LEN - 1] = '\0';</div><div class='add'>+			pstr-&gt;len = strlen(fwid.primary);</div><div class='add'>+			memcpy(pstr-&gt;data, fwid.primary, pstr-&gt;len);</div><div class='add'>+		} else {</div><div class='add'>+			fwid.secondary[HFA384x_FWID_LEN - 1] = '\0';</div><div class='add'>+			pstr-&gt;len = strlen(fwid.secondary);</div><div class='add'>+			memcpy(pstr-&gt;data, fwid.secondary, pstr-&gt;len);</div><div class='add'>+		}</div><div class='add'>+	} else</div><div class='add'>+		result = 0;     /* Should never happen. */</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return(result);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2mib_authalg</div><div class='add'>+*</div><div class='add'>+* Get values from the AuhtenticationAlgorithmsTable.</div><div class='add'>+*</div><div class='add'>+* MIB record parameters:</div><div class='add'>+*       parm1    Table index (1-6).</div><div class='add'>+*       parm2    Not used.</div><div class='add'>+*       parm3    Not used.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*       mib      MIB record.</div><div class='add'>+*       isget    MIBGET/MIBSET flag.</div><div class='add'>+*       wlandev  wlan device structure.</div><div class='add'>+*       priv     "priv" structure.</div><div class='add'>+*       hw       "hw" structure.</div><div class='add'>+*       msg      Message structure.</div><div class='add'>+*       data     Data buffer.</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*       0   - Success.</div><div class='add'>+*       ~0  - Error.</div><div class='add'>+*</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+static int prism2mib_authalg(</div><div class='add'>+mibrec_t                     *mib,</div><div class='add'>+int                          isget,</div><div class='add'>+wlandevice_t                 *wlandev,</div><div class='add'>+hfa384x_t                    *hw,</div><div class='add'>+p80211msg_dot11req_mibset_t  *msg,</div><div class='add'>+void                         *data)</div><div class='add'>+{</div><div class='add'>+	UINT32  *uint32 = (UINT32*) data;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	/* MSM: pkx supplied code that  code queries RID FD4D....but the f/w's</div><div class='add'>+         *  results are bogus. Therefore, we have to simulate the appropriate</div><div class='add'>+         *  results here in the driver based on our knowledge of existing MAC</div><div class='add'>+         *  features.  That's the whole point behind this ugly function.</div><div class='add'>+         */</div><div class='add'>+</div><div class='add'>+	if (isget) {</div><div class='add'>+		msg-&gt;resultcode.data = P80211ENUM_resultcode_success;</div><div class='add'>+		switch (mib-&gt;parm1) {</div><div class='add'>+			case 1: /* Open System */</div><div class='add'>+				*uint32 = P80211ENUM_authalg_opensystem;</div><div class='add'>+				break;</div><div class='add'>+			case 2: /* SharedKey */</div><div class='add'>+				*uint32 = P80211ENUM_authalg_sharedkey;</div><div class='add'>+				break;</div><div class='add'>+			default:</div><div class='add'>+				*uint32 = 0;</div><div class='add'>+				msg-&gt;resultcode.data = P80211ENUM_resultcode_not_supported;</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return(0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2mib_authalgenable</div><div class='add'>+*</div><div class='add'>+* Get/set the enable values from the AuhtenticationAlgorithmsTable.</div><div class='add'>+*</div><div class='add'>+* MIB record parameters:</div><div class='add'>+*       parm1    Table index (1-6).</div><div class='add'>+*       parm2    Not used.</div><div class='add'>+*       parm3    Not used.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*       mib      MIB record.</div><div class='add'>+*       isget    MIBGET/MIBSET flag.</div><div class='add'>+*       wlandev  wlan device structure.</div><div class='add'>+*       priv     "priv" structure.</div><div class='add'>+*       hw       "hw" structure.</div><div class='add'>+*       msg      Message structure.</div><div class='add'>+*       data     Data buffer.</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*       0   - Success.</div><div class='add'>+*       ~0  - Error.</div><div class='add'>+*</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+static int prism2mib_authalgenable(</div><div class='add'>+mibrec_t                     *mib,</div><div class='add'>+int                          isget,</div><div class='add'>+wlandevice_t                 *wlandev,</div><div class='add'>+hfa384x_t                    *hw,</div><div class='add'>+p80211msg_dot11req_mibset_t  *msg,</div><div class='add'>+void                         *data)</div><div class='add'>+{</div><div class='add'>+	int     result;</div><div class='add'>+	UINT32  *uint32 = (UINT32*) data;</div><div class='add'>+</div><div class='add'>+	int     index;</div><div class='add'>+	UINT16  cnf_auth;</div><div class='add'>+	UINT16	mask;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	index = mib-&gt;parm1 - 1;</div><div class='add'>+</div><div class='add'>+	result = hfa384x_drvr_getconfig16( hw,</div><div class='add'>+			HFA384x_RID_CNFAUTHENTICATION, &amp;cnf_auth);</div><div class='add'>+	WLAN_LOG_DEBUG(2,"cnfAuthentication0=%d, index=%d\n", cnf_auth, index);</div><div class='add'>+</div><div class='add'>+	if (isget) {</div><div class='add'>+		if ( index == 0 || index == 1 ) {</div><div class='add'>+			*uint32 = (cnf_auth &amp; (1&lt;&lt;index)) ?</div><div class='add'>+				P80211ENUM_truth_true: P80211ENUM_truth_false;</div><div class='add'>+		} else {</div><div class='add'>+			*uint32 = P80211ENUM_truth_false;</div><div class='add'>+			msg-&gt;resultcode.data = P80211ENUM_resultcode_not_supported;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		if ( index == 0 || index == 1 ) {</div><div class='add'>+			mask = 1 &lt;&lt; index;</div><div class='add'>+			if (*uint32==P80211ENUM_truth_true ) {</div><div class='add'>+				cnf_auth |= mask;</div><div class='add'>+			} else {</div><div class='add'>+				cnf_auth &amp;= ~mask;</div><div class='add'>+			}</div><div class='add'>+			result = hfa384x_drvr_setconfig16( hw,</div><div class='add'>+					HFA384x_RID_CNFAUTHENTICATION, cnf_auth);</div><div class='add'>+			WLAN_LOG_DEBUG(2,"cnfAuthentication:=%d\n", cnf_auth);</div><div class='add'>+			if ( result ) {</div><div class='add'>+				WLAN_LOG_DEBUG(1,"Unable to set p2cnfAuthentication to %d\n", cnf_auth);</div><div class='add'>+				msg-&gt;resultcode.data = P80211ENUM_resultcode_implementation_failure;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			msg-&gt;resultcode.data = P80211ENUM_resultcode_not_supported;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return(result);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2mib_priv</div><div class='add'>+*</div><div class='add'>+* Get/set values in the "priv" data structure.</div><div class='add'>+*</div><div class='add'>+* MIB record parameters:</div><div class='add'>+*       parm1    Not used.</div><div class='add'>+*       parm2    Not used.</div><div class='add'>+*       parm3    Not used.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*       mib      MIB record.</div><div class='add'>+*       isget    MIBGET/MIBSET flag.</div><div class='add'>+*       wlandev  wlan device structure.</div><div class='add'>+*       priv     "priv" structure.</div><div class='add'>+*       hw       "hw" structure.</div><div class='add'>+*       msg      Message structure.</div><div class='add'>+*       data     Data buffer.</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*       0   - Success.</div><div class='add'>+*       ~0  - Error.</div><div class='add'>+*</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+static int prism2mib_priv(</div><div class='add'>+mibrec_t                     *mib,</div><div class='add'>+int                          isget,</div><div class='add'>+wlandevice_t                 *wlandev,</div><div class='add'>+hfa384x_t                    *hw,</div><div class='add'>+p80211msg_dot11req_mibset_t  *msg,</div><div class='add'>+void                         *data)</div><div class='add'>+{</div><div class='add'>+	UINT32            *uint32 = (UINT32*) data;</div><div class='add'>+	p80211pstrd_t     *pstr = (p80211pstrd_t*) data;</div><div class='add'>+	p80211macarray_t  *macarray = (p80211macarray_t *) data;</div><div class='add'>+</div><div class='add'>+	int  i, cnt, result, done;</div><div class='add'>+</div><div class='add'>+	prism2sta_authlist_t  old;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	** "test" is a lot longer than necessary but who cares?  ...as long as</div><div class='add'>+	** it is long enough!</div><div class='add'>+	*/</div><div class='add'>+</div><div class='add'>+	UINT8  test[sizeof(wlandev-&gt;rx) + sizeof(hw-&gt;tallies)];</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	switch (mib-&gt;did) {</div><div class='add'>+	case DIDmib_p2_p2Table_p2ReceivedFrameStatistics:</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		** Note: The values in this record are changed by the</div><div class='add'>+		** interrupt handler and therefore cannot be guaranteed</div><div class='add'>+		** to be stable while they are being copied.  However,</div><div class='add'>+		** the interrupt handler will take priority over this</div><div class='add'>+		** code.  Hence, if the same values are copied twice,</div><div class='add'>+		** then we are ensured that the values have not been</div><div class='add'>+		** changed.  If they have, then just try again.  Don't</div><div class='add'>+		** try more than 10 times...if we still haven't got it,</div><div class='add'>+		** then the values we do have are probably good enough.</div><div class='add'>+		** This scheme for copying values is used in order to</div><div class='add'>+		** prevent having to block the interrupt handler while</div><div class='add'>+		** we copy the values.</div><div class='add'>+		*/</div><div class='add'>+</div><div class='add'>+		if (isget)</div><div class='add'>+			for (i = 0; i &lt; 10; i++) {</div><div class='add'>+				memcpy(data, &amp;wlandev-&gt;rx, sizeof(wlandev-&gt;rx));</div><div class='add'>+				memcpy(test, &amp;wlandev-&gt;rx, sizeof(wlandev-&gt;rx));</div><div class='add'>+				if (memcmp(data, test, sizeof(wlandev-&gt;rx)) == 0) break;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case DIDmib_p2_p2Table_p2CommunicationTallies:</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		** Note: The values in this record are changed by the</div><div class='add'>+		** interrupt handler and therefore cannot be guaranteed</div><div class='add'>+		** to be stable while they are being copied.  See the</div><div class='add'>+		** note above about copying values.</div><div class='add'>+		*/</div><div class='add'>+</div><div class='add'>+		if (isget) {</div><div class='add'>+			result = hfa384x_drvr_commtallies(hw);</div><div class='add'>+</div><div class='add'>+			/* ?????? We need to wait a bit here for the */</div><div class='add'>+			/*   tallies to get updated. ?????? */</div><div class='add'>+			/* MSM: TODO: The right way to do this is to</div><div class='add'>+			 *      add a "commtallie" wait queue to the</div><div class='add'>+			 *      priv structure that gets run every time</div><div class='add'>+			 *      we receive a commtally info frame.</div><div class='add'>+			 *      This process would sleep on that</div><div class='add'>+			 *      queue and get awakened when the</div><div class='add'>+			 *      the requested info frame arrives.</div><div class='add'>+			 *      Don't have time to do and test this</div><div class='add'>+			 *      right now.</div><div class='add'>+			 */</div><div class='add'>+</div><div class='add'>+			/* Ugh, this is nasty. */</div><div class='add'>+			for (i = 0; i &lt; 10; i++) {</div><div class='add'>+				memcpy(data,</div><div class='add'>+				       &amp;hw-&gt;tallies,</div><div class='add'>+				       sizeof(hw-&gt;tallies));</div><div class='add'>+				memcpy(test,</div><div class='add'>+				       &amp;hw-&gt;tallies,</div><div class='add'>+				       sizeof(hw-&gt;tallies));</div><div class='add'>+				if ( memcmp(data,</div><div class='add'>+					    test,</div><div class='add'>+					    sizeof(hw-&gt;tallies)) == 0)</div><div class='add'>+					break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case DIDmib_p2_p2Table_p2Authenticated:</div><div class='add'>+</div><div class='add'>+		if (isget) {</div><div class='add'>+			prism2mib_priv_authlist(hw, &amp;old);</div><div class='add'>+</div><div class='add'>+			macarray-&gt;cnt = 0;</div><div class='add'>+			for (i = 0; i &lt; old.cnt; i++) {</div><div class='add'>+				if (!old.assoc[i]) {</div><div class='add'>+					memcpy(macarray-&gt;data[macarray-&gt;cnt], old.addr[i], WLAN_ADDR_LEN);</div><div class='add'>+					macarray-&gt;cnt++;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case DIDmib_p2_p2Table_p2Associated:</div><div class='add'>+</div><div class='add'>+		if (isget) {</div><div class='add'>+			prism2mib_priv_authlist(hw, &amp;old);</div><div class='add'>+</div><div class='add'>+			macarray-&gt;cnt = 0;</div><div class='add'>+			for (i = 0; i &lt; old.cnt; i++) {</div><div class='add'>+				if (old.assoc[i]) {</div><div class='add'>+					memcpy(macarray-&gt;data[macarray-&gt;cnt], old.addr[i], WLAN_ADDR_LEN);</div><div class='add'>+					macarray-&gt;cnt++;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case DIDmib_p2_p2Table_p2PowerSaveUserCount:</div><div class='add'>+</div><div class='add'>+		if (isget)</div><div class='add'>+			*uint32 = hw-&gt;psusercount;</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case DIDmib_p2_p2Table_p2Comment:</div><div class='add'>+</div><div class='add'>+		if (isget) {</div><div class='add'>+			pstr-&gt;len = strlen(hw-&gt;comment);</div><div class='add'>+			memcpy(pstr-&gt;data, hw-&gt;comment, pstr-&gt;len);</div><div class='add'>+		} else {</div><div class='add'>+			cnt = pstr-&gt;len;</div><div class='add'>+			if (cnt &lt; 0) cnt = 0;</div><div class='add'>+			if (cnt &gt;= sizeof(hw-&gt;comment))</div><div class='add'>+				cnt = sizeof(hw-&gt;comment)-1;</div><div class='add'>+			memcpy(hw-&gt;comment, pstr-&gt;data, cnt);</div><div class='add'>+			pstr-&gt;data[cnt] = '\0';</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case DIDmib_p2_p2Table_p2AccessMode:</div><div class='add'>+</div><div class='add'>+		if (isget)</div><div class='add'>+			*uint32 = hw-&gt;accessmode;</div><div class='add'>+		else</div><div class='add'>+			prism2mib_priv_accessmode(hw, *uint32);</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case DIDmib_p2_p2Table_p2AccessAllow:</div><div class='add'>+</div><div class='add'>+		if (isget) {</div><div class='add'>+			macarray-&gt;cnt = hw-&gt;allow.cnt;</div><div class='add'>+			memcpy(macarray-&gt;data, hw-&gt;allow.addr,</div><div class='add'>+			       macarray-&gt;cnt*WLAN_ADDR_LEN);</div><div class='add'>+		} else {</div><div class='add'>+			prism2mib_priv_accessallow(hw, macarray);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case DIDmib_p2_p2Table_p2AccessDeny:</div><div class='add'>+</div><div class='add'>+		if (isget) {</div><div class='add'>+			macarray-&gt;cnt = hw-&gt;deny.cnt;</div><div class='add'>+			memcpy(macarray-&gt;data, hw-&gt;deny.addr,</div><div class='add'>+			       macarray-&gt;cnt*WLAN_ADDR_LEN);</div><div class='add'>+		} else {</div><div class='add'>+			prism2mib_priv_accessdeny(hw, macarray);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case DIDmib_p2_p2Table_p2ChannelInfoResults:</div><div class='add'>+</div><div class='add'>+		if (isget) {</div><div class='add'>+			done = atomic_read(&amp;hw-&gt;channel_info.done);</div><div class='add'>+			if (done == 0) {</div><div class='add'>+				msg-&gt;resultcode.status = P80211ENUM_msgitem_status_no_value;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			if (done == 1) {</div><div class='add'>+				msg-&gt;resultcode.status = P80211ENUM_msgitem_status_incomplete_itemdata;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			for (i = 0; i &lt; 14; i++, uint32 += 5) {</div><div class='add'>+				uint32[0] = i+1;</div><div class='add'>+				uint32[1] = hw-&gt;channel_info.results.result[i].anl;</div><div class='add'>+				uint32[2] = hw-&gt;channel_info.results.result[i].pnl;</div><div class='add'>+				uint32[3] = (hw-&gt;channel_info.results.result[i].active &amp; HFA384x_CHINFORESULT_BSSACTIVE) ? 1 : 0;</div><div class='add'>+				uint32[4] = (hw-&gt;channel_info.results.result[i].active &amp; HFA384x_CHINFORESULT_PCFACTIVE) ? 1 : 0;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case DIDmib_dot11smt_dot11StationConfigTable_dot11DesiredBSSType:</div><div class='add'>+</div><div class='add'>+		if (isget)</div><div class='add'>+			*uint32 = hw-&gt;dot11_desired_bss_type;</div><div class='add'>+		else</div><div class='add'>+			hw-&gt;dot11_desired_bss_type = *uint32;</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case DIDmib_lnx_lnxConfigTable_lnxRSNAIE: {</div><div class='add'>+		hfa384x_WPAData_t wpa;</div><div class='add'>+		if (isget) {</div><div class='add'>+			hfa384x_drvr_getconfig( hw, HFA384x_RID_CNFWPADATA,</div><div class='add'>+						(UINT8 *) &amp;wpa, sizeof(wpa));</div><div class='add'>+			pstr-&gt;len = hfa384x2host_16(wpa.datalen);</div><div class='add'>+			memcpy(pstr-&gt;data, wpa.data, pstr-&gt;len);</div><div class='add'>+		} else {</div><div class='add'>+			wpa.datalen = host2hfa384x_16(pstr-&gt;len);</div><div class='add'>+			memcpy(wpa.data, pstr-&gt;data, pstr-&gt;len);</div><div class='add'>+</div><div class='add'>+			result = hfa384x_drvr_setconfig(hw, HFA384x_RID_CNFWPADATA,</div><div class='add'>+				(UINT8 *) &amp;wpa, sizeof(wpa));</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	default:</div><div class='add'>+		WLAN_LOG_ERROR("Unhandled DID 0x%08x\n", mib-&gt;did);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return(0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2mib_priv_authlist</div><div class='add'>+*</div><div class='add'>+* Get a copy of the list of authenticated stations.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*       priv     "priv" structure.</div><div class='add'>+*       list     List of authenticated stations.</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	Nothing</div><div class='add'>+*</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+static void prism2mib_priv_authlist(</div><div class='add'>+hfa384x_t             *hw,</div><div class='add'>+prism2sta_authlist_t  *list)</div><div class='add'>+{</div><div class='add'>+	prism2sta_authlist_t  test;</div><div class='add'>+	int                   i;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	** Note: The values in this record are changed by the interrupt</div><div class='add'>+	** handler and therefore cannot be guaranteed to be stable while</div><div class='add'>+	** they are being copied.  However, the interrupt handler will</div><div class='add'>+	** take priority over this code.  Hence, if the same values are</div><div class='add'>+	** copied twice, then we are ensured that the values have not</div><div class='add'>+	** been changed.  If they have, then just try again.  Don't try</div><div class='add'>+	** more than 10 times...the list of authenticated stations is</div><div class='add'>+	** unlikely to be changing frequently enough that we can't get</div><div class='add'>+	** a snapshot in 10 tries.  Don't try more than this so that we</div><div class='add'>+	** don't risk locking-up for long periods of time.  If we still</div><div class='add'>+	** haven't got the snapshot, then generate an error message and</div><div class='add'>+	** return an empty list (since this is the only valid list that</div><div class='add'>+	** we can guarentee).  This scheme for copying values is used in</div><div class='add'>+	** order to prevent having to block the interrupt handler while</div><div class='add'>+	** we copy the values.</div><div class='add'>+	*/</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 10; i++) {</div><div class='add'>+		memcpy(list, &amp;hw-&gt;authlist, sizeof(prism2sta_authlist_t));</div><div class='add'>+		memcpy(&amp;test, &amp;hw-&gt;authlist, sizeof(prism2sta_authlist_t));</div><div class='add'>+		if (memcmp(list, &amp;test, sizeof(prism2sta_authlist_t)) == 0)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (i &gt;= 10) {</div><div class='add'>+		list-&gt;cnt = 0;</div><div class='add'>+		WLAN_LOG_ERROR("Could not obtain snapshot of authenticated stations.\n");</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2mib_priv_accessmode</div><div class='add'>+*</div><div class='add'>+* Set the Access Mode.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*       priv     "priv" structure.</div><div class='add'>+*       hw       "hw" structure.</div><div class='add'>+*       mode     New access mode.</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	Nothing</div><div class='add'>+*</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+static void prism2mib_priv_accessmode(</div><div class='add'>+hfa384x_t         *hw,</div><div class='add'>+UINT32            mode)</div><div class='add'>+{</div><div class='add'>+	prism2sta_authlist_t  old;</div><div class='add'>+	int                   i, j, deauth;</div><div class='add'>+	UINT8                 *addr;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	** If the mode is not changing or it is changing to "All", then it's</div><div class='add'>+	** okay to go ahead without a lot of messing around.  Otherwise, the</div><div class='add'>+	** access mode is changing in a way that may leave some stations</div><div class='add'>+	** authenticated which should not be authenticated.  It will be</div><div class='add'>+	** necessary to de-authenticate these stations.</div><div class='add'>+	*/</div><div class='add'>+</div><div class='add'>+	if (mode == WLAN_ACCESS_ALL || mode == hw-&gt;accessmode) {</div><div class='add'>+		hw-&gt;accessmode = mode;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	** Switch to the new access mode.  Once this is done, then the interrupt</div><div class='add'>+	** handler (which uses this value) will be prevented from authenticating</div><div class='add'>+	** ADDITIONAL stations which should not be authenticated.  Then get a</div><div class='add'>+	** copy of the current list of authenticated stations.</div><div class='add'>+	*/</div><div class='add'>+</div><div class='add'>+	hw-&gt;accessmode = mode;</div><div class='add'>+</div><div class='add'>+	prism2mib_priv_authlist(hw, &amp;old);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	** Now go through the list of previously authenticated stations (some</div><div class='add'>+	** of which might de-authenticate themselves while we are processing it</div><div class='add'>+	** but that is okay).  Any station which no longer matches the access</div><div class='add'>+	** mode, must be de-authenticated.</div><div class='add'>+	*/</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; old.cnt; i++) {</div><div class='add'>+		addr = old.addr[i];</div><div class='add'>+</div><div class='add'>+		if (mode == WLAN_ACCESS_NONE)</div><div class='add'>+			deauth = 1;</div><div class='add'>+		else {</div><div class='add'>+			if (mode == WLAN_ACCESS_ALLOW) {</div><div class='add'>+				for (j = 0; j &lt; hw-&gt;allow.cnt; j++)</div><div class='add'>+					if (memcmp(addr, hw-&gt;allow.addr[j],</div><div class='add'>+							WLAN_ADDR_LEN) == 0)</div><div class='add'>+						break;</div><div class='add'>+				deauth = (j &gt;= hw-&gt;allow.cnt);</div><div class='add'>+			} else {</div><div class='add'>+				for (j = 0; j &lt; hw-&gt;deny.cnt; j++)</div><div class='add'>+					if (memcmp(addr, hw-&gt;deny.addr[j],</div><div class='add'>+							WLAN_ADDR_LEN) == 0)</div><div class='add'>+						break;</div><div class='add'>+				deauth = (j &lt; hw-&gt;deny.cnt);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (deauth) prism2mib_priv_deauthenticate(hw, addr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2mib_priv_accessallow</div><div class='add'>+*</div><div class='add'>+* Change the list of allowed MAC addresses.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*       priv      "priv" structure.</div><div class='add'>+*       hw        "hw" structure.</div><div class='add'>+*       macarray  New array of MAC addresses.</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	Nothing</div><div class='add'>+*</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+static void prism2mib_priv_accessallow(</div><div class='add'>+hfa384x_t         *hw,</div><div class='add'>+p80211macarray_t  *macarray)</div><div class='add'>+{</div><div class='add'>+	prism2sta_authlist_t  old;</div><div class='add'>+	int                   i, j;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	** Change the access list.  Note that the interrupt handler may be in</div><div class='add'>+	** the middle of using the access list!!!  Since the interrupt handler</div><div class='add'>+	** will	always have priority over this process and this is the only</div><div class='add'>+	** process that will modify the list, this problem can be handled as</div><div class='add'>+	** follows:</div><div class='add'>+	**</div><div class='add'>+	**    1. Set the "modify" flag.</div><div class='add'>+	**    2. Change the first copy of the list.</div><div class='add'>+	**    3. Clear the "modify" flag.</div><div class='add'>+	**    4. Change the backup copy of the list.</div><div class='add'>+	**</div><div class='add'>+	** The interrupt handler will check the "modify" flag.  If NOT set, then</div><div class='add'>+	** the first copy of the list is valid and may be used.  Otherwise, the</div><div class='add'>+	** first copy is being changed but the backup copy is valid and may be</div><div class='add'>+	** used.  Doing things this way prevents having to have the interrupt</div><div class='add'>+	** handler block while the list is being updated.</div><div class='add'>+	*/</div><div class='add'>+</div><div class='add'>+	hw-&gt;allow.modify = 1;</div><div class='add'>+</div><div class='add'>+	hw-&gt;allow.cnt = macarray-&gt;cnt;</div><div class='add'>+	memcpy(hw-&gt;allow.addr, macarray-&gt;data, macarray-&gt;cnt*WLAN_ADDR_LEN);</div><div class='add'>+</div><div class='add'>+	hw-&gt;allow.modify = 0;</div><div class='add'>+</div><div class='add'>+	hw-&gt;allow.cnt1 = macarray-&gt;cnt;</div><div class='add'>+	memcpy(hw-&gt;allow.addr1, macarray-&gt;data, macarray-&gt;cnt*WLAN_ADDR_LEN);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	** If the current access mode is "Allow", then changing the access</div><div class='add'>+	** list may leave some stations authenticated which should not be</div><div class='add'>+	** authenticated.  It will be necessary to de-authenticate these</div><div class='add'>+	** stations.  Otherwise, the list can be changed without a lot of fuss.</div><div class='add'>+	*/</div><div class='add'>+</div><div class='add'>+	if (hw-&gt;accessmode == WLAN_ACCESS_ALLOW) {</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		** Go through the list of authenticated stations (some of</div><div class='add'>+		** which might de-authenticate themselves while we are</div><div class='add'>+		** processing it but that is okay).  Any station which is</div><div class='add'>+		** no longer in the list of allowed stations, must be</div><div class='add'>+		** de-authenticated.</div><div class='add'>+		*/</div><div class='add'>+</div><div class='add'>+		prism2mib_priv_authlist(hw, &amp;old);</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; old.cnt; i++) {</div><div class='add'>+			for (j = 0; j &lt; hw-&gt;allow.cnt; j++)</div><div class='add'>+				if (memcmp(old.addr[i], hw-&gt;allow.addr[j],</div><div class='add'>+							WLAN_ADDR_LEN) == 0)</div><div class='add'>+					break;</div><div class='add'>+			if (j &gt;= hw-&gt;allow.cnt)</div><div class='add'>+				prism2mib_priv_deauthenticate(hw, old.addr[i]);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2mib_priv_accessdeny</div><div class='add'>+*</div><div class='add'>+* Change the list of denied MAC addresses.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*       priv      "priv" structure.</div><div class='add'>+*       hw        "hw" structure.</div><div class='add'>+*       macarray  New array of MAC addresses.</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	Nothing</div><div class='add'>+*</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+static void prism2mib_priv_accessdeny(</div><div class='add'>+hfa384x_t         *hw,</div><div class='add'>+p80211macarray_t  *macarray)</div><div class='add'>+{</div><div class='add'>+	prism2sta_authlist_t  old;</div><div class='add'>+	int                   i, j;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	** Change the access list.  Note that the interrupt handler may be in</div><div class='add'>+	** the middle of using the access list!!!  Since the interrupt handler</div><div class='add'>+	** will always have priority over this process and this is the only</div><div class='add'>+	** process that will modify the list, this problem can be handled as</div><div class='add'>+	** follows:</div><div class='add'>+	**</div><div class='add'>+	**    1. Set the "modify" flag.</div><div class='add'>+	**    2. Change the first copy of the list.</div><div class='add'>+	**    3. Clear the "modify" flag.</div><div class='add'>+	**    4. Change the backup copy of the list.</div><div class='add'>+	**</div><div class='add'>+	** The interrupt handler will check the "modify" flag.  If NOT set, then</div><div class='add'>+	** the first copy of the list is valid and may be used.  Otherwise, the</div><div class='add'>+	** first copy is being changed but the backup copy is valid and may be</div><div class='add'>+	** used.  Doing things this way prevents having to have the interrupt</div><div class='add'>+	** handler block while the list is being updated.</div><div class='add'>+	*/</div><div class='add'>+</div><div class='add'>+	hw-&gt;deny.modify = 1;</div><div class='add'>+</div><div class='add'>+	hw-&gt;deny.cnt = macarray-&gt;cnt;</div><div class='add'>+	memcpy(hw-&gt;deny.addr, macarray-&gt;data, macarray-&gt;cnt*WLAN_ADDR_LEN);</div><div class='add'>+</div><div class='add'>+	hw-&gt;deny.modify = 0;</div><div class='add'>+</div><div class='add'>+	hw-&gt;deny.cnt1 = macarray-&gt;cnt;</div><div class='add'>+	memcpy(hw-&gt;deny.addr1, macarray-&gt;data, macarray-&gt;cnt*WLAN_ADDR_LEN);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	** If the current access mode is "Deny", then changing the access</div><div class='add'>+	** list may leave some stations authenticated which should not be</div><div class='add'>+	** authenticated.  It will be necessary to de-authenticate these</div><div class='add'>+	** stations.  Otherwise, the list can be changed without a lot of fuss.</div><div class='add'>+	*/</div><div class='add'>+</div><div class='add'>+	if (hw-&gt;accessmode == WLAN_ACCESS_DENY) {</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		** Go through the list of authenticated stations (some of</div><div class='add'>+		** which might de-authenticate themselves while we are</div><div class='add'>+		** processing it but that is okay).  Any station which is</div><div class='add'>+		** now in the list of denied stations, must be de-authenticated.</div><div class='add'>+		*/</div><div class='add'>+</div><div class='add'>+		prism2mib_priv_authlist(hw, &amp;old);</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; old.cnt; i++)</div><div class='add'>+			for (j = 0; j &lt; hw-&gt;deny.cnt; j++)</div><div class='add'>+				if (memcmp(old.addr[i], hw-&gt;deny.addr[j],</div><div class='add'>+							 WLAN_ADDR_LEN) == 0) {</div><div class='add'>+					prism2mib_priv_deauthenticate(hw, old.addr[i]);</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2mib_priv_deauthenticate</div><div class='add'>+*</div><div class='add'>+* De-authenticate a station.  This is done by sending a HandoverAddress</div><div class='add'>+* information frame to the firmware.  This should work, according to</div><div class='add'>+* Intersil.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*       priv     "priv" structure.</div><div class='add'>+*       hw       "hw" structure.</div><div class='add'>+*       addr     MAC address of station to be de-authenticated.</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	Nothing</div><div class='add'>+*</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+static void prism2mib_priv_deauthenticate(</div><div class='add'>+hfa384x_t         *hw,</div><div class='add'>+UINT8             *addr)</div><div class='add'>+{</div><div class='add'>+	DBFENTER;</div><div class='add'>+	hfa384x_drvr_handover(hw, addr);</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2mgmt_pstr2bytestr</div><div class='add'>+*</div><div class='add'>+* Convert the pstr data in the WLAN message structure into an hfa384x</div><div class='add'>+* byte string format.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	bytestr		hfa384x byte string data type</div><div class='add'>+*	pstr		wlan message data</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	Nothing</div><div class='add'>+*</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+void prism2mgmt_pstr2bytestr(hfa384x_bytestr_t *bytestr, p80211pstrd_t *pstr)</div><div class='add'>+{</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	bytestr-&gt;len = host2hfa384x_16((UINT16)(pstr-&gt;len));</div><div class='add'>+	memcpy(bytestr-&gt;data, pstr-&gt;data, pstr-&gt;len);</div><div class='add'>+	DBFEXIT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2mgmt_pstr2bytearea</div><div class='add'>+*</div><div class='add'>+* Convert the pstr data in the WLAN message structure into an hfa384x</div><div class='add'>+* byte area format.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	bytearea	hfa384x byte area data type</div><div class='add'>+*	pstr		wlan message data</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	Nothing</div><div class='add'>+*</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+void prism2mgmt_pstr2bytearea(UINT8 *bytearea, p80211pstrd_t *pstr)</div><div class='add'>+{</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	memcpy(bytearea, pstr-&gt;data, pstr-&gt;len);</div><div class='add'>+	DBFEXIT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2mgmt_bytestr2pstr</div><div class='add'>+*</div><div class='add'>+* Convert the data in an hfa384x byte string format into a</div><div class='add'>+* pstr in the WLAN message.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	bytestr		hfa384x byte string data type</div><div class='add'>+*	msg		wlan message</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	Nothing</div><div class='add'>+*</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+void prism2mgmt_bytestr2pstr(hfa384x_bytestr_t *bytestr, p80211pstrd_t *pstr)</div><div class='add'>+{</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	pstr-&gt;len = (UINT8)(hfa384x2host_16((UINT16)(bytestr-&gt;len)));</div><div class='add'>+	memcpy(pstr-&gt;data, bytestr-&gt;data, pstr-&gt;len);</div><div class='add'>+	DBFEXIT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2mgmt_bytearea2pstr</div><div class='add'>+*</div><div class='add'>+* Convert the data in an hfa384x byte area format into a pstr</div><div class='add'>+* in the WLAN message.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	bytearea	hfa384x byte area data type</div><div class='add'>+*	msg		wlan message</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	Nothing</div><div class='add'>+*</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+void prism2mgmt_bytearea2pstr(UINT8 *bytearea, p80211pstrd_t *pstr, int len)</div><div class='add'>+{</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	pstr-&gt;len = (UINT8)len;</div><div class='add'>+	memcpy(pstr-&gt;data, bytearea, len);</div><div class='add'>+	DBFEXIT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2mgmt_prism2int2p80211int</div><div class='add'>+*</div><div class='add'>+* Convert an hfa384x integer into a wlan integer</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	prism2enum	pointer to hfa384x integer</div><div class='add'>+*	wlanenum	pointer to p80211 integer</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	Nothing</div><div class='add'>+*</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+void prism2mgmt_prism2int2p80211int(UINT16 *prism2int, UINT32 *wlanint)</div><div class='add'>+{</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	*wlanint = (UINT32)hfa384x2host_16(*prism2int);</div><div class='add'>+	DBFEXIT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2mgmt_p80211int2prism2int</div><div class='add'>+*</div><div class='add'>+* Convert a wlan integer into an hfa384x integer</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	prism2enum	pointer to hfa384x integer</div><div class='add'>+*	wlanenum	pointer to p80211 integer</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	Nothing</div><div class='add'>+*</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+void prism2mgmt_p80211int2prism2int(UINT16 *prism2int, UINT32 *wlanint)</div><div class='add'>+{</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	*prism2int = host2hfa384x_16((UINT16)(*wlanint));</div><div class='add'>+	DBFEXIT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2mgmt_prism2enum2p80211enum</div><div class='add'>+*</div><div class='add'>+* Convert the hfa384x enumerated int into a p80211 enumerated int</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	prism2enum	pointer to hfa384x integer</div><div class='add'>+*	wlanenum	pointer to p80211 integer</div><div class='add'>+*	rid		hfa384x record id</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	Nothing</div><div class='add'>+*</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+void prism2mgmt_prism2enum2p80211enum(UINT16 *prism2enum, UINT32 *wlanenum, UINT16 rid)</div><div class='add'>+{</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	/* At the moment, the need for this functionality hasn't</div><div class='add'>+	presented itself. All the wlan enumerated values are</div><div class='add'>+	a 1-to-1 match against the Prism2 enumerated values*/</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2mgmt_p80211enum2prism2enum</div><div class='add'>+*</div><div class='add'>+* Convert the p80211 enumerated int into an hfa384x enumerated int</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	prism2enum	pointer to hfa384x integer</div><div class='add'>+*	wlanenum	pointer to p80211 integer</div><div class='add'>+*	rid		hfa384x record id</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	Nothing</div><div class='add'>+*</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+void prism2mgmt_p80211enum2prism2enum(UINT16 *prism2enum, UINT32 *wlanenum, UINT16 rid)</div><div class='add'>+{</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	/* At the moment, the need for this functionality hasn't</div><div class='add'>+	presented itself. All the wlan enumerated values are</div><div class='add'>+	a 1-to-1 match against the Prism2 enumerated values*/</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2mgmt_get_oprateset</div><div class='add'>+*</div><div class='add'>+* Convert the hfa384x bit area into a wlan octet string.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	rate		Prism2 bit area</div><div class='add'>+*	pstr		wlan octet string</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	Nothing</div><div class='add'>+*</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+void prism2mgmt_get_oprateset(UINT16 *rate, p80211pstrd_t *pstr)</div><div class='add'>+{</div><div class='add'>+	UINT8	len;</div><div class='add'>+	UINT8	*datarate;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	len = 0;</div><div class='add'>+	datarate = pstr-&gt;data;</div><div class='add'>+</div><div class='add'>+ 	/* 1 Mbps */</div><div class='add'>+	if ( BIT0 &amp; (*rate) ) {</div><div class='add'>+		len += (UINT8)1;</div><div class='add'>+		*datarate = (UINT8)2;</div><div class='add'>+		datarate++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+ 	/* 2 Mbps */</div><div class='add'>+	if ( BIT1 &amp; (*rate) ) {</div><div class='add'>+		len += (UINT8)1;</div><div class='add'>+		*datarate = (UINT8)4;</div><div class='add'>+		datarate++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+ 	/* 5.5 Mbps */</div><div class='add'>+	if ( BIT2 &amp; (*rate) ) {</div><div class='add'>+		len += (UINT8)1;</div><div class='add'>+		*datarate = (UINT8)11;</div><div class='add'>+		datarate++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+ 	/* 11 Mbps */</div><div class='add'>+	if ( BIT3 &amp; (*rate) ) {</div><div class='add'>+		len += (UINT8)1;</div><div class='add'>+		*datarate = (UINT8)22;</div><div class='add'>+		datarate++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pstr-&gt;len = len;</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2mgmt_set_oprateset</div><div class='add'>+*</div><div class='add'>+* Convert the wlan octet string into an hfa384x bit area.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	rate		Prism2 bit area</div><div class='add'>+*	pstr		wlan octet string</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	Nothing</div><div class='add'>+*</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+void prism2mgmt_set_oprateset(UINT16 *rate, p80211pstrd_t *pstr)</div><div class='add'>+{</div><div class='add'>+	UINT8	*datarate;</div><div class='add'>+	int	i;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	*rate = 0;</div><div class='add'>+</div><div class='add'>+	datarate = pstr-&gt;data;</div><div class='add'>+</div><div class='add'>+	for ( i=0; i &lt; pstr-&gt;len; i++, datarate++ ) {</div><div class='add'>+		switch (*datarate) {</div><div class='add'>+		case 2: /* 1 Mbps */</div><div class='add'>+			*rate |= BIT0;</div><div class='add'>+			break;</div><div class='add'>+		case 4: /* 2 Mbps */</div><div class='add'>+			*rate |= BIT1;</div><div class='add'>+			break;</div><div class='add'>+		case 11: /* 5.5 Mbps */</div><div class='add'>+			*rate |= BIT2;</div><div class='add'>+			break;</div><div class='add'>+		case 22: /* 11 Mbps */</div><div class='add'>+			*rate |= BIT3;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			WLAN_LOG_DEBUG(1, "Unrecoginzed Rate of %d\n",</div><div class='add'>+				*datarate);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2mgmt_get_grpaddr</div><div class='add'>+*</div><div class='add'>+* Retrieves a particular group address from the list of</div><div class='add'>+* group addresses.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	did		mibitem did</div><div class='add'>+*	pstr		wlan octet string</div><div class='add'>+*	priv		prism2 driver private data structure</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	Nothing</div><div class='add'>+*</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+void prism2mgmt_get_grpaddr(UINT32 did, p80211pstrd_t *pstr,</div><div class='add'>+	hfa384x_t *hw )</div><div class='add'>+{</div><div class='add'>+	int	index;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	index = prism2mgmt_get_grpaddr_index(did);</div><div class='add'>+</div><div class='add'>+	if ( index &gt;= 0 ) {</div><div class='add'>+		pstr-&gt;len = WLAN_ADDR_LEN;</div><div class='add'>+		memcpy(pstr-&gt;data, hw-&gt;dot11_grp_addr[index],</div><div class='add'>+			WLAN_ADDR_LEN);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2mgmt_set_grpaddr</div><div class='add'>+*</div><div class='add'>+* Convert the wlan octet string into an hfa384x bit area.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	did		mibitem did</div><div class='add'>+*	buf</div><div class='add'>+*	groups</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0	Success</div><div class='add'>+*	!0	Error</div><div class='add'>+*</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int prism2mgmt_set_grpaddr(UINT32 did, UINT8 *prism2buf,</div><div class='add'>+	p80211pstrd_t *pstr, hfa384x_t *hw )</div><div class='add'>+{</div><div class='add'>+	UINT8	no_addr[WLAN_ADDR_LEN];</div><div class='add'>+	int	index;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	memset(no_addr, 0, WLAN_ADDR_LEN);</div><div class='add'>+	if (memcmp(no_addr, pstr-&gt;data, WLAN_ADDR_LEN) != 0) {</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		** The address is NOT 0 so we are "adding" an address to the</div><div class='add'>+		** group address list.  Check to make sure we aren't trying</div><div class='add'>+		** to add more than the maximum allowed number of group</div><div class='add'>+		** addresses in the list.  The new address is added to the</div><div class='add'>+		** end of the list regardless of the DID used to add the</div><div class='add'>+		** address.</div><div class='add'>+		*/</div><div class='add'>+</div><div class='add'>+		if (hw-&gt;dot11_grpcnt &gt;= MAX_GRP_ADDR) return(-1);</div><div class='add'>+</div><div class='add'>+		memcpy(hw-&gt;dot11_grp_addr[hw-&gt;dot11_grpcnt], pstr-&gt;data,</div><div class='add'>+								 WLAN_ADDR_LEN);</div><div class='add'>+		hw-&gt;dot11_grpcnt += 1;</div><div class='add'>+	} else {</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		** The address is 0.  Interpret this as "deleting" an address</div><div class='add'>+		** from the group address list.  Get the address index from</div><div class='add'>+		** the DID.  If this is within the range of used addresses,</div><div class='add'>+		** then delete the specified address by shifting all following</div><div class='add'>+		** addresses down.  Then clear the last address (which should</div><div class='add'>+		** now be unused).  If the address index is NOT within the</div><div class='add'>+		** range of used addresses, then just ignore the address.</div><div class='add'>+		*/</div><div class='add'>+</div><div class='add'>+		index = prism2mgmt_get_grpaddr_index(did);</div><div class='add'>+		if (index &gt;= 0 &amp;&amp; index &lt; hw-&gt;dot11_grpcnt) {</div><div class='add'>+			hw-&gt;dot11_grpcnt -= 1;</div><div class='add'>+			memmove(hw-&gt;dot11_grp_addr[index],</div><div class='add'>+				hw-&gt;dot11_grp_addr[index + 1],</div><div class='add'>+				((hw-&gt;dot11_grpcnt)-index) * WLAN_ADDR_LEN);</div><div class='add'>+			memset(hw-&gt;dot11_grp_addr[hw-&gt;dot11_grpcnt], 0,</div><div class='add'>+								 WLAN_ADDR_LEN);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return(0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2mgmt_get_grpaddr_index</div><div class='add'>+*</div><div class='add'>+* Gets the index in the group address list based on the did.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	did		mibitem did</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	&gt;= 0	If valid did</div><div class='add'>+*	&lt; 0	If not valid did</div><div class='add'>+*</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+int prism2mgmt_get_grpaddr_index( UINT32 did )</div><div class='add'>+{</div><div class='add'>+	int	index;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	index = -1;</div><div class='add'>+</div><div class='add'>+	switch (did) {</div><div class='add'>+	case DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address1:</div><div class='add'>+		index = 0;</div><div class='add'>+		break;</div><div class='add'>+	case DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address2:</div><div class='add'>+		index = 1;</div><div class='add'>+		break;</div><div class='add'>+	case DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address3:</div><div class='add'>+		index = 2;</div><div class='add'>+		break;</div><div class='add'>+	case DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address4:</div><div class='add'>+		index = 3;</div><div class='add'>+		break;</div><div class='add'>+	case DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address5:</div><div class='add'>+		index = 4;</div><div class='add'>+		break;</div><div class='add'>+	case DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address6:</div><div class='add'>+		index = 5;</div><div class='add'>+		break;</div><div class='add'>+	case DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address7:</div><div class='add'>+		index = 6;</div><div class='add'>+		break;</div><div class='add'>+	case DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address8:</div><div class='add'>+		index = 7;</div><div class='add'>+		break;</div><div class='add'>+	case DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address9:</div><div class='add'>+		index = 8;</div><div class='add'>+		break;</div><div class='add'>+	case DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address10:</div><div class='add'>+		index = 9;</div><div class='add'>+		break;</div><div class='add'>+	case DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address11:</div><div class='add'>+		index = 10;</div><div class='add'>+		break;</div><div class='add'>+	case DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address12:</div><div class='add'>+		index = 11;</div><div class='add'>+		break;</div><div class='add'>+	case DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address13:</div><div class='add'>+		index = 12;</div><div class='add'>+		break;</div><div class='add'>+	case DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address14:</div><div class='add'>+		index = 13;</div><div class='add'>+		break;</div><div class='add'>+	case DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address15:</div><div class='add'>+		index = 14;</div><div class='add'>+		break;</div><div class='add'>+	case DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address16:</div><div class='add'>+		index = 15;</div><div class='add'>+		break;</div><div class='add'>+	case DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address17:</div><div class='add'>+		index = 16;</div><div class='add'>+		break;</div><div class='add'>+	case DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address18:</div><div class='add'>+		index = 17;</div><div class='add'>+		break;</div><div class='add'>+	case DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address19:</div><div class='add'>+		index = 18;</div><div class='add'>+		break;</div><div class='add'>+	case DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address20:</div><div class='add'>+		index = 19;</div><div class='add'>+		break;</div><div class='add'>+	case DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address21:</div><div class='add'>+		index = 20;</div><div class='add'>+		break;</div><div class='add'>+	case DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address22:</div><div class='add'>+		index = 21;</div><div class='add'>+		break;</div><div class='add'>+	case DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address23:</div><div class='add'>+		index = 22;</div><div class='add'>+		break;</div><div class='add'>+	case DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address24:</div><div class='add'>+		index = 23;</div><div class='add'>+		break;</div><div class='add'>+	case DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address25:</div><div class='add'>+		index = 24;</div><div class='add'>+		break;</div><div class='add'>+	case DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address26:</div><div class='add'>+		index = 25;</div><div class='add'>+		break;</div><div class='add'>+	case DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address27:</div><div class='add'>+		index = 26;</div><div class='add'>+		break;</div><div class='add'>+	case DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address28:</div><div class='add'>+		index = 27;</div><div class='add'>+		break;</div><div class='add'>+	case DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address29:</div><div class='add'>+		index = 28;</div><div class='add'>+		break;</div><div class='add'>+	case DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address30:</div><div class='add'>+		index = 29;</div><div class='add'>+		break;</div><div class='add'>+	case DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address31:</div><div class='add'>+		index = 30;</div><div class='add'>+		break;</div><div class='add'>+	case DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address32:</div><div class='add'>+		index = 31;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return index;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/staging/wlan-ng/prism2sta.c b/drivers/staging/wlan-ng/prism2sta.c<br/>new file mode 100644<br/>index 000000000000..18aa15f9e417<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/wlan-ng/prism2sta.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/wlan-ng/prism2sta.c</a></div><div class='hunk'>@@ -0,0 +1,2502 @@</div><div class='add'>+/* src/prism2/driver/prism2sta.c</div><div class='add'>+*</div><div class='add'>+* Implements the station functionality for prism2</div><div class='add'>+*</div><div class='add'>+* Copyright (C) 1999 AbsoluteValue Systems, Inc.  All Rights Reserved.</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* linux-wlan</div><div class='add'>+*</div><div class='add'>+*   The contents of this file are subject to the Mozilla Public</div><div class='add'>+*   License Version 1.1 (the "License"); you may not use this file</div><div class='add'>+*   except in compliance with the License. You may obtain a copy of</div><div class='add'>+*   the License at http://www.mozilla.org/MPL/</div><div class='add'>+*</div><div class='add'>+*   Software distributed under the License is distributed on an "AS</div><div class='add'>+*   IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or</div><div class='add'>+*   implied. See the License for the specific language governing</div><div class='add'>+*   rights and limitations under the License.</div><div class='add'>+*</div><div class='add'>+*   Alternatively, the contents of this file may be used under the</div><div class='add'>+*   terms of the GNU Public License version 2 (the "GPL"), in which</div><div class='add'>+*   case the provisions of the GPL are applicable instead of the</div><div class='add'>+*   above.  If you wish to allow the use of your version of this file</div><div class='add'>+*   only under the terms of the GPL and not to allow others to use</div><div class='add'>+*   your version of this file under the MPL, indicate your decision</div><div class='add'>+*   by deleting the provisions above and replace them with the notice</div><div class='add'>+*   and other provisions required by the GPL.  If you do not delete</div><div class='add'>+*   the provisions above, a recipient may use your version of this</div><div class='add'>+*   file under either the MPL or the GPL.</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* Inquiries regarding the linux-wlan Open Source project can be</div><div class='add'>+* made directly to:</div><div class='add'>+*</div><div class='add'>+* AbsoluteValue Systems Inc.</div><div class='add'>+* info@linux-wlan.com</div><div class='add'>+* http://www.linux-wlan.com</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* Portions of the development of this software were funded by</div><div class='add'>+* Intersil Corporation as part of PRISM(R) chipset product development.</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* This file implements the module and linux pcmcia routines for the</div><div class='add'>+* prism2 driver.</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* System Includes */</div><div class='add'>+#define WLAN_DBVAR	prism2_debug</div><div class='add'>+</div><div class='add'>+#include "version.h"</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#include &lt;linux/version.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#if (LINUX_VERSION_CODE &gt;= KERNEL_VERSION(2,4,25))</div><div class='add'>+#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/wireless.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+</div><div class='add'>+#if (LINUX_VERSION_CODE &lt; KERNEL_VERSION(2,5,0))</div><div class='add'>+#include &lt;linux/tqueue.h&gt;</div><div class='add'>+#else</div><div class='add'>+#include &lt;linux/workqueue.h&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;asm/byteorder.h&gt;</div><div class='add'>+#include &lt;linux/if_arp.h&gt;</div><div class='add'>+</div><div class='add'>+#if (WLAN_HOSTIF == WLAN_PCMCIA)</div><div class='add'>+#include &lt;pcmcia/version.h&gt;</div><div class='add'>+#include &lt;pcmcia/cs_types.h&gt;</div><div class='add'>+#include &lt;pcmcia/cs.h&gt;</div><div class='add'>+#include &lt;pcmcia/cistpl.h&gt;</div><div class='add'>+#include &lt;pcmcia/ds.h&gt;</div><div class='add'>+#include &lt;pcmcia/cisreg.h&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#include "wlan_compat.h"</div><div class='add'>+</div><div class='add'>+#if ((WLAN_HOSTIF == WLAN_PLX) || (WLAN_HOSTIF == WLAN_PCI))</div><div class='add'>+#include &lt;linux/ioport.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Project Includes */</div><div class='add'>+</div><div class='add'>+#include "p80211types.h"</div><div class='add'>+#include "p80211hdr.h"</div><div class='add'>+#include "p80211mgmt.h"</div><div class='add'>+#include "p80211conv.h"</div><div class='add'>+#include "p80211msg.h"</div><div class='add'>+#include "p80211netdev.h"</div><div class='add'>+#include "p80211req.h"</div><div class='add'>+#include "p80211metadef.h"</div><div class='add'>+#include "p80211metastruct.h"</div><div class='add'>+#include "hfa384x.h"</div><div class='add'>+#include "prism2mgmt.h"</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Local Constants */</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Local Macros */</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Local Types */</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Local Static Definitions */</div><div class='add'>+</div><div class='add'>+#if (WLAN_HOSTIF == WLAN_PCMCIA)</div><div class='add'>+#define DRIVER_SUFFIX	"_cs"</div><div class='add'>+#elif (WLAN_HOSTIF == WLAN_PLX)</div><div class='add'>+#define DRIVER_SUFFIX	"_plx"</div><div class='add'>+typedef char* dev_info_t;</div><div class='add'>+#elif (WLAN_HOSTIF == WLAN_PCI)</div><div class='add'>+#define DRIVER_SUFFIX	"_pci"</div><div class='add'>+typedef char* dev_info_t;</div><div class='add'>+#elif (WLAN_HOSTIF == WLAN_USB)</div><div class='add'>+#define DRIVER_SUFFIX	"_usb"</div><div class='add'>+typedef char* dev_info_t;</div><div class='add'>+#else</div><div class='add'>+#error "HOSTIF unsupported or undefined!"</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static char		*version = "prism2" DRIVER_SUFFIX ".o: " WLAN_RELEASE;</div><div class='add'>+static dev_info_t	dev_info = "prism2" DRIVER_SUFFIX;</div><div class='add'>+</div><div class='add'>+#if (WLAN_HOSTIF == WLAN_PLX || WLAN_HOSTIF == WLAN_PCI)</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+static int prism2sta_suspend_pci(struct pci_dev *pdev, pm_message_t state);</div><div class='add'>+static int prism2sta_resume_pci(struct pci_dev *pdev);</div><div class='add'>+#endif</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if (WLAN_HOSTIF == WLAN_PCI)</div><div class='add'>+</div><div class='add'>+#endif /* WLAN_PCI */</div><div class='add'>+</div><div class='add'>+static wlandevice_t *create_wlan(void);</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------*/</div><div class='add'>+/* --Module Parameters */</div><div class='add'>+</div><div class='add'>+int      prism2_reset_holdtime=30;	/* Reset hold time in ms */</div><div class='add'>+int	 prism2_reset_settletime=100;	/* Reset settle time in ms */</div><div class='add'>+</div><div class='add'>+#if (WLAN_HOSTIF == WLAN_USB)</div><div class='add'>+static int	prism2_doreset=0;		/* Do a reset at init? */</div><div class='add'>+#else</div><div class='add'>+static int      prism2_doreset=1;		/* Do a reset at init? */</div><div class='add'>+int             prism2_bap_timeout=1000;        /* BAP timeout */</div><div class='add'>+int		prism2_irq_evread_max=20;	/* Maximum number of</div><div class='add'>+						 * ev_reads (loops)</div><div class='add'>+						 * in irq handler</div><div class='add'>+						 */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef WLAN_INCLUDE_DEBUG</div><div class='add'>+int prism2_debug=0;</div><div class='add'>+module_param( prism2_debug, int, 0644);</div><div class='add'>+MODULE_PARM_DESC(prism2_debug, "prism2 debugging");</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+module_param( prism2_doreset, int, 0644);</div><div class='add'>+MODULE_PARM_DESC(prism2_doreset, "Issue a reset on initialization");</div><div class='add'>+</div><div class='add'>+module_param( prism2_reset_holdtime, int, 0644);</div><div class='add'>+MODULE_PARM_DESC( prism2_reset_holdtime, "reset hold time in ms");</div><div class='add'>+module_param( prism2_reset_settletime, int, 0644);</div><div class='add'>+MODULE_PARM_DESC( prism2_reset_settletime, "reset settle time in ms");</div><div class='add'>+</div><div class='add'>+#if (WLAN_HOSTIF != WLAN_USB)</div><div class='add'>+module_param( prism2_bap_timeout, int, 0644);</div><div class='add'>+MODULE_PARM_DESC(prism2_bap_timeout, "BufferAccessPath Timeout in 10*n us");</div><div class='add'>+module_param( prism2_irq_evread_max, int, 0644);</div><div class='add'>+MODULE_PARM_DESC( prism2_irq_evread_max, "Maximim number of event reads in interrupt handler");</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("Dual MPL/GPL");</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Local Function Declarations */</div><div class='add'>+</div><div class='add'>+static int	prism2sta_open(wlandevice_t *wlandev);</div><div class='add'>+static int	prism2sta_close(wlandevice_t *wlandev);</div><div class='add'>+static void	prism2sta_reset(wlandevice_t *wlandev );</div><div class='add'>+static int      prism2sta_txframe(wlandevice_t *wlandev, struct sk_buff *skb, p80211_hdr_t *p80211_hdr, p80211_metawep_t *p80211_wep);</div><div class='add'>+static int	prism2sta_mlmerequest(wlandevice_t *wlandev, p80211msg_t *msg);</div><div class='add'>+static int	prism2sta_getcardinfo(wlandevice_t *wlandev);</div><div class='add'>+static int	prism2sta_globalsetup(wlandevice_t *wlandev);</div><div class='add'>+static int      prism2sta_setmulticast(wlandevice_t *wlandev,</div><div class='add'>+				       netdevice_t *dev);</div><div class='add'>+</div><div class='add'>+static void	prism2sta_inf_handover(</div><div class='add'>+			wlandevice_t *wlandev, hfa384x_InfFrame_t *inf);</div><div class='add'>+static void	prism2sta_inf_tallies(</div><div class='add'>+			wlandevice_t *wlandev, hfa384x_InfFrame_t *inf);</div><div class='add'>+static void     prism2sta_inf_hostscanresults(</div><div class='add'>+			wlandevice_t *wlandev, hfa384x_InfFrame_t *inf);</div><div class='add'>+static void	prism2sta_inf_scanresults(</div><div class='add'>+			wlandevice_t *wlandev, hfa384x_InfFrame_t *inf);</div><div class='add'>+static void	prism2sta_inf_chinforesults(</div><div class='add'>+			wlandevice_t *wlandev, hfa384x_InfFrame_t *inf);</div><div class='add'>+static void	prism2sta_inf_linkstatus(</div><div class='add'>+			wlandevice_t *wlandev, hfa384x_InfFrame_t *inf);</div><div class='add'>+static void	prism2sta_inf_assocstatus(</div><div class='add'>+			wlandevice_t *wlandev, hfa384x_InfFrame_t *inf);</div><div class='add'>+static void	prism2sta_inf_authreq(</div><div class='add'>+			wlandevice_t *wlandev, hfa384x_InfFrame_t *inf);</div><div class='add'>+static void	prism2sta_inf_authreq_defer(</div><div class='add'>+			wlandevice_t *wlandev, hfa384x_InfFrame_t *inf);</div><div class='add'>+static void	prism2sta_inf_psusercnt(</div><div class='add'>+			wlandevice_t *wlandev, hfa384x_InfFrame_t *inf);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PROC_FS</div><div class='add'>+static int</div><div class='add'>+prism2sta_proc_read(</div><div class='add'>+	char	*page,</div><div class='add'>+	char	**start,</div><div class='add'>+	off_t	offset,</div><div class='add'>+	int	count,</div><div class='add'>+	int	*eof,</div><div class='add'>+	void	*data);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*================================================================*/</div><div class='add'>+/* Function Definitions */</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* dmpmem</div><div class='add'>+*</div><div class='add'>+* Debug utility function to dump memory to the kernel debug log.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	buf	ptr data we want dumped</div><div class='add'>+*	len	length of data</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	nothing</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread</div><div class='add'>+*	interrupt</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+inline void dmpmem(void *buf, int n)</div><div class='add'>+{</div><div class='add'>+	int c;</div><div class='add'>+	for ( c= 0; c &lt; n; c++) {</div><div class='add'>+		if ( (c % 16) == 0 ) printk(KERN_DEBUG"dmp[%d]: ", c);</div><div class='add'>+		printk("%02x ", ((UINT8*)buf)[c]);</div><div class='add'>+		if ( (c % 16) == 15 ) printk("\n");</div><div class='add'>+	}</div><div class='add'>+	if ( (c % 16) != 0 ) printk("\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2sta_open</div><div class='add'>+*</div><div class='add'>+* WLAN device open method.  Called from p80211netdev when kernel</div><div class='add'>+* device open (start) method is called in response to the</div><div class='add'>+* SIOCSIIFFLAGS ioctl changing the flags bit IFF_UP</div><div class='add'>+* from clear to set.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		wlan device structure</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0	success</div><div class='add'>+*	&gt;0	f/w reported error</div><div class='add'>+*	&lt;0	driver reported error</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+static int prism2sta_open(wlandevice_t *wlandev)</div><div class='add'>+{</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+#ifdef ANCIENT_MODULE_CODE</div><div class='add'>+	MOD_INC_USE_COUNT;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* We don't currently have to do anything else.</div><div class='add'>+	 * The setup of the MAC should be subsequently completed via</div><div class='add'>+	 * the mlme commands.</div><div class='add'>+	 * Higher layers know we're ready from dev-&gt;start==1 and</div><div class='add'>+	 * dev-&gt;tbusy==0.  Our rx path knows to pass up received/</div><div class='add'>+	 * frames because of dev-&gt;flags&amp;IFF_UP is true.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2sta_close</div><div class='add'>+*</div><div class='add'>+* WLAN device close method.  Called from p80211netdev when kernel</div><div class='add'>+* device close method is called in response to the</div><div class='add'>+* SIOCSIIFFLAGS ioctl changing the flags bit IFF_UP</div><div class='add'>+* from set to clear.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		wlan device structure</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0	success</div><div class='add'>+*	&gt;0	f/w reported error</div><div class='add'>+*	&lt;0	driver reported error</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+static int prism2sta_close(wlandevice_t *wlandev)</div><div class='add'>+{</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+#ifdef ANCIENT_MODULE_CODE</div><div class='add'>+	MOD_DEC_USE_COUNT;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* We don't currently have to do anything else.</div><div class='add'>+	 * Higher layers know we're not ready from dev-&gt;start==0 and</div><div class='add'>+	 * dev-&gt;tbusy==1.  Our rx path knows to not pass up received</div><div class='add'>+	 * frames because of dev-&gt;flags&amp;IFF_UP is false.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2sta_reset</div><div class='add'>+*</div><div class='add'>+* Not currently implented.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		wlan device structure</div><div class='add'>+*	none</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	nothing</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+static void prism2sta_reset(wlandevice_t *wlandev )</div><div class='add'>+{</div><div class='add'>+	DBFENTER;</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2sta_txframe</div><div class='add'>+*</div><div class='add'>+* Takes a frame from p80211 and queues it for transmission.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		wlan device structure</div><div class='add'>+*	pb		packet buffer struct.  Contains an 802.11</div><div class='add'>+*			data frame.</div><div class='add'>+*       p80211_hdr      points to the 802.11 header for the packet.</div><div class='add'>+* Returns:</div><div class='add'>+*	0		Success and more buffs available</div><div class='add'>+*	1		Success but no more buffs</div><div class='add'>+*	2		Allocation failure</div><div class='add'>+*	4		Buffer full or queue busy</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+static int prism2sta_txframe(wlandevice_t *wlandev, struct sk_buff *skb,</div><div class='add'>+			     p80211_hdr_t *p80211_hdr,</div><div class='add'>+			     p80211_metawep_t *p80211_wep)</div><div class='add'>+{</div><div class='add'>+	hfa384x_t		*hw = (hfa384x_t *)wlandev-&gt;priv;</div><div class='add'>+	int			result;</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	/* If necessary, set the 802.11 WEP bit */</div><div class='add'>+	if ((wlandev-&gt;hostwep &amp; (HOSTWEP_PRIVACYINVOKED | HOSTWEP_ENCRYPT)) == HOSTWEP_PRIVACYINVOKED) {</div><div class='add'>+		p80211_hdr-&gt;a3.fc |= host2ieee16(WLAN_SET_FC_ISWEP(1));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	result = hfa384x_drvr_txframe(hw, skb, p80211_hdr, p80211_wep);</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2sta_mlmerequest</div><div class='add'>+*</div><div class='add'>+* wlan command message handler.  All we do here is pass the message</div><div class='add'>+* over to the prism2sta_mgmt_handler.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		wlan device structure</div><div class='add'>+*	msg		wlan command message</div><div class='add'>+* Returns:</div><div class='add'>+*	0		success</div><div class='add'>+*	&lt;0		successful acceptance of message, but we're</div><div class='add'>+*			waiting for an async process to finish before</div><div class='add'>+*			we're done with the msg.  When the asynch</div><div class='add'>+*			process is done, we'll call the p80211</div><div class='add'>+*			function p80211req_confirm() .</div><div class='add'>+*	&gt;0		An error occurred while we were handling</div><div class='add'>+*			the message.</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+static int prism2sta_mlmerequest(wlandevice_t *wlandev, p80211msg_t *msg)</div><div class='add'>+{</div><div class='add'>+        hfa384x_t               *hw = (hfa384x_t *)wlandev-&gt;priv;</div><div class='add'>+</div><div class='add'>+	int result = 0;</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	switch( msg-&gt;msgcode )</div><div class='add'>+	{</div><div class='add'>+	case DIDmsg_dot11req_mibget :</div><div class='add'>+		WLAN_LOG_DEBUG(2,"Received mibget request\n");</div><div class='add'>+		result = prism2mgmt_mibset_mibget(wlandev, msg);</div><div class='add'>+		break;</div><div class='add'>+	case DIDmsg_dot11req_mibset :</div><div class='add'>+		WLAN_LOG_DEBUG(2,"Received mibset request\n");</div><div class='add'>+		result = prism2mgmt_mibset_mibget(wlandev, msg);</div><div class='add'>+		break;</div><div class='add'>+	case DIDmsg_dot11req_powermgmt :</div><div class='add'>+		WLAN_LOG_DEBUG(2,"Received powermgmt request\n");</div><div class='add'>+		result = prism2mgmt_powermgmt(wlandev, msg);</div><div class='add'>+		break;</div><div class='add'>+	case DIDmsg_dot11req_scan :</div><div class='add'>+		WLAN_LOG_DEBUG(2,"Received scan request\n");</div><div class='add'>+		result = prism2mgmt_scan(wlandev, msg);</div><div class='add'>+		break;</div><div class='add'>+	case DIDmsg_dot11req_scan_results :</div><div class='add'>+		WLAN_LOG_DEBUG(2,"Received scan_results request\n");</div><div class='add'>+		result = prism2mgmt_scan_results(wlandev, msg);</div><div class='add'>+		break;</div><div class='add'>+	case DIDmsg_dot11req_join :</div><div class='add'>+		WLAN_LOG_DEBUG(2,"Received join request\n");</div><div class='add'>+		result = prism2mgmt_join(wlandev, msg);</div><div class='add'>+		break;</div><div class='add'>+	case DIDmsg_dot11req_authenticate :</div><div class='add'>+		WLAN_LOG_DEBUG(2,"Received authenticate request\n");</div><div class='add'>+		result = prism2mgmt_authenticate(wlandev, msg);</div><div class='add'>+		break;</div><div class='add'>+	case DIDmsg_dot11req_deauthenticate :</div><div class='add'>+		WLAN_LOG_DEBUG(2,"Received mlme deauthenticate request\n");</div><div class='add'>+		result = prism2mgmt_deauthenticate(wlandev, msg);</div><div class='add'>+		break;</div><div class='add'>+	case DIDmsg_dot11req_associate :</div><div class='add'>+		WLAN_LOG_DEBUG(2,"Received mlme associate request\n");</div><div class='add'>+		result = prism2mgmt_associate(wlandev, msg);</div><div class='add'>+		break;</div><div class='add'>+	case DIDmsg_dot11req_reassociate :</div><div class='add'>+		WLAN_LOG_DEBUG(2,"Received mlme reassociate request\n");</div><div class='add'>+		result = prism2mgmt_reassociate(wlandev, msg);</div><div class='add'>+		break;</div><div class='add'>+	case DIDmsg_dot11req_disassociate :</div><div class='add'>+		WLAN_LOG_DEBUG(2,"Received mlme disassociate request\n");</div><div class='add'>+		result = prism2mgmt_disassociate(wlandev, msg);</div><div class='add'>+		break;</div><div class='add'>+	case DIDmsg_dot11req_reset :</div><div class='add'>+		WLAN_LOG_DEBUG(2,"Received mlme reset request\n");</div><div class='add'>+		result = prism2mgmt_reset(wlandev, msg);</div><div class='add'>+		break;</div><div class='add'>+	case DIDmsg_dot11req_start :</div><div class='add'>+		WLAN_LOG_DEBUG(2,"Received mlme start request\n");</div><div class='add'>+		result = prism2mgmt_start(wlandev, msg);</div><div class='add'>+		break;</div><div class='add'>+	/*</div><div class='add'>+	 * Prism2 specific messages</div><div class='add'>+	 */</div><div class='add'>+	case DIDmsg_p2req_join :</div><div class='add'>+		WLAN_LOG_DEBUG(2,"Received p2 join request\n");</div><div class='add'>+		result = prism2mgmt_p2_join(wlandev, msg);</div><div class='add'>+		break;</div><div class='add'>+       	case DIDmsg_p2req_readpda :</div><div class='add'>+		WLAN_LOG_DEBUG(2,"Received mlme readpda request\n");</div><div class='add'>+		result = prism2mgmt_readpda(wlandev, msg);</div><div class='add'>+		break;</div><div class='add'>+	case DIDmsg_p2req_readcis :</div><div class='add'>+		WLAN_LOG_DEBUG(2,"Received mlme readcis request\n");</div><div class='add'>+		result = prism2mgmt_readcis(wlandev, msg);</div><div class='add'>+		break;</div><div class='add'>+	case DIDmsg_p2req_auxport_state :</div><div class='add'>+		WLAN_LOG_DEBUG(2,"Received mlme auxport_state request\n");</div><div class='add'>+		result = prism2mgmt_auxport_state(wlandev, msg);</div><div class='add'>+		break;</div><div class='add'>+	case DIDmsg_p2req_auxport_read :</div><div class='add'>+		WLAN_LOG_DEBUG(2,"Received mlme auxport_read request\n");</div><div class='add'>+		result = prism2mgmt_auxport_read(wlandev, msg);</div><div class='add'>+		break;</div><div class='add'>+	case DIDmsg_p2req_auxport_write :</div><div class='add'>+		WLAN_LOG_DEBUG(2,"Received mlme auxport_write request\n");</div><div class='add'>+		result = prism2mgmt_auxport_write(wlandev, msg);</div><div class='add'>+		break;</div><div class='add'>+	case DIDmsg_p2req_low_level :</div><div class='add'>+		WLAN_LOG_DEBUG(2,"Received mlme low_level request\n");</div><div class='add'>+		result = prism2mgmt_low_level(wlandev, msg);</div><div class='add'>+		break;</div><div class='add'>+        case DIDmsg_p2req_test_command :</div><div class='add'>+                WLAN_LOG_DEBUG(2,"Received mlme test_command request\n");</div><div class='add'>+                result = prism2mgmt_test_command(wlandev, msg);</div><div class='add'>+                break;</div><div class='add'>+        case DIDmsg_p2req_mmi_read :</div><div class='add'>+                WLAN_LOG_DEBUG(2,"Received mlme mmi_read request\n");</div><div class='add'>+                result = prism2mgmt_mmi_read(wlandev, msg);</div><div class='add'>+                break;</div><div class='add'>+        case DIDmsg_p2req_mmi_write :</div><div class='add'>+                WLAN_LOG_DEBUG(2,"Received mlme mmi_write request\n");</div><div class='add'>+                result = prism2mgmt_mmi_write(wlandev, msg);</div><div class='add'>+                break;</div><div class='add'>+	case DIDmsg_p2req_ramdl_state :</div><div class='add'>+		WLAN_LOG_DEBUG(2,"Received mlme ramdl_state request\n");</div><div class='add'>+		result = prism2mgmt_ramdl_state(wlandev, msg);</div><div class='add'>+		break;</div><div class='add'>+	case DIDmsg_p2req_ramdl_write :</div><div class='add'>+		WLAN_LOG_DEBUG(2,"Received mlme ramdl_write request\n");</div><div class='add'>+		result = prism2mgmt_ramdl_write(wlandev, msg);</div><div class='add'>+		break;</div><div class='add'>+	case DIDmsg_p2req_flashdl_state :</div><div class='add'>+		WLAN_LOG_DEBUG(2,"Received mlme flashdl_state request\n");</div><div class='add'>+		result = prism2mgmt_flashdl_state(wlandev, msg);</div><div class='add'>+		break;</div><div class='add'>+	case DIDmsg_p2req_flashdl_write :</div><div class='add'>+		WLAN_LOG_DEBUG(2,"Received mlme flashdl_write request\n");</div><div class='add'>+		result = prism2mgmt_flashdl_write(wlandev, msg);</div><div class='add'>+		break;</div><div class='add'>+	case DIDmsg_p2req_dump_state :</div><div class='add'>+		WLAN_LOG_DEBUG(2,"Received mlme dump_state request\n");</div><div class='add'>+		result = prism2mgmt_dump_state(wlandev, msg);</div><div class='add'>+		break;</div><div class='add'>+	case DIDmsg_p2req_channel_info :</div><div class='add'>+		WLAN_LOG_DEBUG(2,"Received mlme channel_info request\n");</div><div class='add'>+		result = prism2mgmt_channel_info(wlandev, msg);</div><div class='add'>+		break;</div><div class='add'>+	case DIDmsg_p2req_channel_info_results :</div><div class='add'>+		WLAN_LOG_DEBUG(2,"Received mlme channel_info_results request\n");</div><div class='add'>+		result = prism2mgmt_channel_info_results(wlandev, msg);</div><div class='add'>+		break;</div><div class='add'>+	/*</div><div class='add'>+	 * Linux specific messages</div><div class='add'>+	 */</div><div class='add'>+	case DIDmsg_lnxreq_hostwep :</div><div class='add'>+		break;   // ignore me.</div><div class='add'>+        case DIDmsg_lnxreq_ifstate :</div><div class='add'>+		{</div><div class='add'>+		p80211msg_lnxreq_ifstate_t	*ifstatemsg;</div><div class='add'>+                WLAN_LOG_DEBUG(2,"Received mlme ifstate request\n");</div><div class='add'>+		ifstatemsg = (p80211msg_lnxreq_ifstate_t*)msg;</div><div class='add'>+                result = prism2sta_ifstate(wlandev, ifstatemsg-&gt;ifstate.data);</div><div class='add'>+		ifstatemsg-&gt;resultcode.status =</div><div class='add'>+			P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+		ifstatemsg-&gt;resultcode.data = result;</div><div class='add'>+		result = 0;</div><div class='add'>+		}</div><div class='add'>+                break;</div><div class='add'>+        case DIDmsg_lnxreq_wlansniff :</div><div class='add'>+                WLAN_LOG_DEBUG(2,"Received mlme wlansniff request\n");</div><div class='add'>+                result = prism2mgmt_wlansniff(wlandev, msg);</div><div class='add'>+                break;</div><div class='add'>+	case DIDmsg_lnxreq_autojoin :</div><div class='add'>+		WLAN_LOG_DEBUG(2,"Received mlme autojoin request\n");</div><div class='add'>+		result = prism2mgmt_autojoin(wlandev, msg);</div><div class='add'>+		break;</div><div class='add'>+	case DIDmsg_p2req_enable :</div><div class='add'>+		WLAN_LOG_DEBUG(2,"Received mlme enable request\n");</div><div class='add'>+		result = prism2mgmt_enable(wlandev, msg);</div><div class='add'>+		break;</div><div class='add'>+	case DIDmsg_lnxreq_commsquality: {</div><div class='add'>+		p80211msg_lnxreq_commsquality_t *qualmsg;</div><div class='add'>+</div><div class='add'>+		WLAN_LOG_DEBUG(2,"Received commsquality request\n");</div><div class='add'>+</div><div class='add'>+		if (hw-&gt;ap)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		qualmsg = (p80211msg_lnxreq_commsquality_t*) msg;</div><div class='add'>+</div><div class='add'>+		qualmsg-&gt;link.status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+		qualmsg-&gt;level.status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+		qualmsg-&gt;noise.status = P80211ENUM_msgitem_status_data_ok;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+		qualmsg-&gt;link.data = hfa384x2host_16(hw-&gt;qual.CQ_currBSS);</div><div class='add'>+		qualmsg-&gt;level.data = hfa384x2host_16(hw-&gt;qual.ASL_currBSS);</div><div class='add'>+		qualmsg-&gt;noise.data = hfa384x2host_16(hw-&gt;qual.ANL_currFC);</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	default:</div><div class='add'>+		WLAN_LOG_WARNING("Unknown mgmt request message 0x%08x", msg-&gt;msgcode);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2sta_ifstate</div><div class='add'>+*</div><div class='add'>+* Interface state.  This is the primary WLAN interface enable/disable</div><div class='add'>+* handler.  Following the driver/load/deviceprobe sequence, this</div><div class='add'>+* function must be called with a state of "enable" before any other</div><div class='add'>+* commands will be accepted.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		wlan device structure</div><div class='add'>+*	msgp		ptr to msg buffer</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+* 	A p80211 message resultcode value.</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread  (usually)</div><div class='add'>+*	interrupt</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+UINT32 prism2sta_ifstate(wlandevice_t *wlandev, UINT32 ifstate)</div><div class='add'>+{</div><div class='add'>+        hfa384x_t               *hw = (hfa384x_t *)wlandev-&gt;priv;</div><div class='add'>+	UINT32 			result;</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	result = P80211ENUM_resultcode_implementation_failure;</div><div class='add'>+</div><div class='add'>+	WLAN_LOG_DEBUG(2, "Current MSD state(%d), requesting(%d)\n",</div><div class='add'>+	                  wlandev-&gt;msdstate, ifstate);</div><div class='add'>+	switch (ifstate)</div><div class='add'>+	{</div><div class='add'>+	case P80211ENUM_ifstate_fwload:</div><div class='add'>+		switch (wlandev-&gt;msdstate) {</div><div class='add'>+		case WLAN_MSD_HWPRESENT:</div><div class='add'>+			wlandev-&gt;msdstate = WLAN_MSD_FWLOAD_PENDING;</div><div class='add'>+			/*</div><div class='add'>+			 * Initialize the device+driver sufficiently</div><div class='add'>+			 * for firmware loading.</div><div class='add'>+			 */</div><div class='add'>+#if (WLAN_HOSTIF != WLAN_USB)</div><div class='add'>+			result=hfa384x_cmd_initialize(hw);</div><div class='add'>+#else</div><div class='add'>+			if ((result=hfa384x_drvr_start(hw))) {</div><div class='add'>+				WLAN_LOG_ERROR(</div><div class='add'>+					"hfa384x_drvr_start() failed,"</div><div class='add'>+					"result=%d\n", (int)result);</div><div class='add'>+				result =</div><div class='add'>+				P80211ENUM_resultcode_implementation_failure;</div><div class='add'>+				wlandev-&gt;msdstate = WLAN_MSD_HWPRESENT;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+#endif</div><div class='add'>+			wlandev-&gt;msdstate = WLAN_MSD_FWLOAD;</div><div class='add'>+			result = P80211ENUM_resultcode_success;</div><div class='add'>+			break;</div><div class='add'>+		case WLAN_MSD_FWLOAD:</div><div class='add'>+			hfa384x_cmd_initialize(hw);</div><div class='add'>+			result = P80211ENUM_resultcode_success;</div><div class='add'>+			break;</div><div class='add'>+		case WLAN_MSD_RUNNING:</div><div class='add'>+			WLAN_LOG_WARNING(</div><div class='add'>+				"Cannot enter fwload state from enable state,"</div><div class='add'>+				"you must disable first.\n");</div><div class='add'>+			result = P80211ENUM_resultcode_invalid_parameters;</div><div class='add'>+			break;</div><div class='add'>+		case WLAN_MSD_HWFAIL:</div><div class='add'>+		default:</div><div class='add'>+			/* probe() had a problem or the msdstate contains</div><div class='add'>+			 * an unrecognized value, there's nothing we can do.</div><div class='add'>+			 */</div><div class='add'>+			result = P80211ENUM_resultcode_implementation_failure;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case P80211ENUM_ifstate_enable:</div><div class='add'>+		switch (wlandev-&gt;msdstate) {</div><div class='add'>+		case WLAN_MSD_HWPRESENT:</div><div class='add'>+		case WLAN_MSD_FWLOAD:</div><div class='add'>+			wlandev-&gt;msdstate = WLAN_MSD_RUNNING_PENDING;</div><div class='add'>+			/* Initialize the device+driver for full</div><div class='add'>+			 * operation. Note that this might me an FWLOAD to</div><div class='add'>+			 * to RUNNING transition so we must not do a chip</div><div class='add'>+			 * or board level reset.  Note that on failure,</div><div class='add'>+			 * the MSD state is set to HWPRESENT because we</div><div class='add'>+			 * can't make any assumptions about the state</div><div class='add'>+			 * of the hardware or a previous firmware load.</div><div class='add'>+			 */</div><div class='add'>+			if ((result=hfa384x_drvr_start(hw))) {</div><div class='add'>+				WLAN_LOG_ERROR(</div><div class='add'>+					"hfa384x_drvr_start() failed,"</div><div class='add'>+					"result=%d\n", (int)result);</div><div class='add'>+				result =</div><div class='add'>+				P80211ENUM_resultcode_implementation_failure;</div><div class='add'>+				wlandev-&gt;msdstate = WLAN_MSD_HWPRESENT;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if ((result=prism2sta_getcardinfo(wlandev))) {</div><div class='add'>+				WLAN_LOG_ERROR(</div><div class='add'>+					"prism2sta_getcardinfo() failed,"</div><div class='add'>+					"result=%d\n", (int)result);</div><div class='add'>+				result =</div><div class='add'>+				P80211ENUM_resultcode_implementation_failure;</div><div class='add'>+				hfa384x_drvr_stop(hw);</div><div class='add'>+				wlandev-&gt;msdstate = WLAN_MSD_HWPRESENT;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			if ((result=prism2sta_globalsetup(wlandev))) {</div><div class='add'>+				WLAN_LOG_ERROR(</div><div class='add'>+					"prism2sta_globalsetup() failed,"</div><div class='add'>+					"result=%d\n", (int)result);</div><div class='add'>+				result =</div><div class='add'>+				P80211ENUM_resultcode_implementation_failure;</div><div class='add'>+				hfa384x_drvr_stop(hw);</div><div class='add'>+				wlandev-&gt;msdstate = WLAN_MSD_HWPRESENT;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			wlandev-&gt;msdstate = WLAN_MSD_RUNNING;</div><div class='add'>+			hw-&gt;join_ap = 0;</div><div class='add'>+			hw-&gt;join_retries = 60;</div><div class='add'>+			result = P80211ENUM_resultcode_success;</div><div class='add'>+			break;</div><div class='add'>+		case WLAN_MSD_RUNNING:</div><div class='add'>+			/* Do nothing, we're already in this state.*/</div><div class='add'>+			result = P80211ENUM_resultcode_success;</div><div class='add'>+			break;</div><div class='add'>+		case WLAN_MSD_HWFAIL:</div><div class='add'>+		default:</div><div class='add'>+			/* probe() had a problem or the msdstate contains</div><div class='add'>+			 * an unrecognized value, there's nothing we can do.</div><div class='add'>+			 */</div><div class='add'>+			result = P80211ENUM_resultcode_implementation_failure;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case P80211ENUM_ifstate_disable:</div><div class='add'>+		switch (wlandev-&gt;msdstate) {</div><div class='add'>+		case WLAN_MSD_HWPRESENT:</div><div class='add'>+			/* Do nothing, we're already in this state.*/</div><div class='add'>+			result = P80211ENUM_resultcode_success;</div><div class='add'>+			break;</div><div class='add'>+		case WLAN_MSD_FWLOAD:</div><div class='add'>+		case WLAN_MSD_RUNNING:</div><div class='add'>+			wlandev-&gt;msdstate = WLAN_MSD_HWPRESENT_PENDING;</div><div class='add'>+			/*</div><div class='add'>+			 * TODO: Shut down the MAC completely. Here a chip</div><div class='add'>+			 * or board level reset is probably called for.</div><div class='add'>+			 * After a "disable" _all_ results are lost, even</div><div class='add'>+			 * those from a fwload.</div><div class='add'>+			 */</div><div class='add'>+			if (!wlandev-&gt;hwremoved)</div><div class='add'>+				netif_carrier_off(wlandev-&gt;netdev);</div><div class='add'>+</div><div class='add'>+			hfa384x_drvr_stop(hw);</div><div class='add'>+</div><div class='add'>+			wlandev-&gt;macmode = WLAN_MACMODE_NONE;</div><div class='add'>+			wlandev-&gt;msdstate = WLAN_MSD_HWPRESENT;</div><div class='add'>+			result = P80211ENUM_resultcode_success;</div><div class='add'>+			break;</div><div class='add'>+		case WLAN_MSD_HWFAIL:</div><div class='add'>+		default:</div><div class='add'>+			/* probe() had a problem or the msdstate contains</div><div class='add'>+			 * an unrecognized value, there's nothing we can do.</div><div class='add'>+			 */</div><div class='add'>+			result = P80211ENUM_resultcode_implementation_failure;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		result = P80211ENUM_resultcode_invalid_parameters;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2sta_getcardinfo</div><div class='add'>+*</div><div class='add'>+* Collect the NICID, firmware version and any other identifiers</div><div class='add'>+* we'd like to have in host-side data structures.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		wlan device structure</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0	success</div><div class='add'>+*	&gt;0	f/w reported error</div><div class='add'>+*	&lt;0	driver reported error</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	Either.</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+static int prism2sta_getcardinfo(wlandevice_t *wlandev)</div><div class='add'>+{</div><div class='add'>+	int 			result = 0;</div><div class='add'>+        hfa384x_t               *hw = (hfa384x_t *)wlandev-&gt;priv;</div><div class='add'>+	UINT16                  temp;</div><div class='add'>+	UINT8			snum[HFA384x_RID_NICSERIALNUMBER_LEN];</div><div class='add'>+	char			pstr[(HFA384x_RID_NICSERIALNUMBER_LEN * 4) + 1];</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	/* Collect version and compatibility info */</div><div class='add'>+	/*  Some are critical, some are not */</div><div class='add'>+	/* NIC identity */</div><div class='add'>+	result = hfa384x_drvr_getconfig(hw, HFA384x_RID_NICIDENTITY,</div><div class='add'>+			&amp;hw-&gt;ident_nic, sizeof(hfa384x_compident_t));</div><div class='add'>+	if ( result ) {</div><div class='add'>+		WLAN_LOG_ERROR("Failed to retrieve NICIDENTITY\n");</div><div class='add'>+		goto failed;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* get all the nic id fields in host byte order */</div><div class='add'>+	hw-&gt;ident_nic.id = hfa384x2host_16(hw-&gt;ident_nic.id);</div><div class='add'>+	hw-&gt;ident_nic.variant = hfa384x2host_16(hw-&gt;ident_nic.variant);</div><div class='add'>+	hw-&gt;ident_nic.major = hfa384x2host_16(hw-&gt;ident_nic.major);</div><div class='add'>+	hw-&gt;ident_nic.minor = hfa384x2host_16(hw-&gt;ident_nic.minor);</div><div class='add'>+</div><div class='add'>+	WLAN_LOG_INFO( "ident: nic h/w: id=0x%02x %d.%d.%d\n",</div><div class='add'>+			hw-&gt;ident_nic.id, hw-&gt;ident_nic.major,</div><div class='add'>+			hw-&gt;ident_nic.minor, hw-&gt;ident_nic.variant);</div><div class='add'>+</div><div class='add'>+	/* Primary f/w identity */</div><div class='add'>+	result = hfa384x_drvr_getconfig(hw, HFA384x_RID_PRIIDENTITY,</div><div class='add'>+			&amp;hw-&gt;ident_pri_fw, sizeof(hfa384x_compident_t));</div><div class='add'>+	if ( result ) {</div><div class='add'>+		WLAN_LOG_ERROR("Failed to retrieve PRIIDENTITY\n");</div><div class='add'>+		goto failed;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* get all the private fw id fields in host byte order */</div><div class='add'>+	hw-&gt;ident_pri_fw.id = hfa384x2host_16(hw-&gt;ident_pri_fw.id);</div><div class='add'>+	hw-&gt;ident_pri_fw.variant = hfa384x2host_16(hw-&gt;ident_pri_fw.variant);</div><div class='add'>+	hw-&gt;ident_pri_fw.major = hfa384x2host_16(hw-&gt;ident_pri_fw.major);</div><div class='add'>+	hw-&gt;ident_pri_fw.minor = hfa384x2host_16(hw-&gt;ident_pri_fw.minor);</div><div class='add'>+</div><div class='add'>+	WLAN_LOG_INFO( "ident: pri f/w: id=0x%02x %d.%d.%d\n",</div><div class='add'>+			hw-&gt;ident_pri_fw.id, hw-&gt;ident_pri_fw.major,</div><div class='add'>+			hw-&gt;ident_pri_fw.minor, hw-&gt;ident_pri_fw.variant);</div><div class='add'>+</div><div class='add'>+	/* Station (Secondary?) f/w identity */</div><div class='add'>+	result = hfa384x_drvr_getconfig(hw, HFA384x_RID_STAIDENTITY,</div><div class='add'>+			&amp;hw-&gt;ident_sta_fw, sizeof(hfa384x_compident_t));</div><div class='add'>+	if ( result ) {</div><div class='add'>+		WLAN_LOG_ERROR("Failed to retrieve STAIDENTITY\n");</div><div class='add'>+		goto failed;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (hw-&gt;ident_nic.id &lt; 0x8000) {</div><div class='add'>+		WLAN_LOG_ERROR("FATAL: Card is not an Intersil Prism2/2.5/3\n");</div><div class='add'>+		result = -1;</div><div class='add'>+		goto failed;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* get all the station fw id fields in host byte order */</div><div class='add'>+	hw-&gt;ident_sta_fw.id = hfa384x2host_16(hw-&gt;ident_sta_fw.id);</div><div class='add'>+	hw-&gt;ident_sta_fw.variant = hfa384x2host_16(hw-&gt;ident_sta_fw.variant);</div><div class='add'>+	hw-&gt;ident_sta_fw.major = hfa384x2host_16(hw-&gt;ident_sta_fw.major);</div><div class='add'>+	hw-&gt;ident_sta_fw.minor = hfa384x2host_16(hw-&gt;ident_sta_fw.minor);</div><div class='add'>+</div><div class='add'>+	/* strip out the 'special' variant bits */</div><div class='add'>+	hw-&gt;mm_mods = hw-&gt;ident_sta_fw.variant &amp; (BIT14 | BIT15);</div><div class='add'>+	hw-&gt;ident_sta_fw.variant &amp;= ~((UINT16)(BIT14 | BIT15));</div><div class='add'>+</div><div class='add'>+	if  ( hw-&gt;ident_sta_fw.id == 0x1f ) {</div><div class='add'>+		hw-&gt;ap = 0;</div><div class='add'>+		WLAN_LOG_INFO(</div><div class='add'>+			"ident: sta f/w: id=0x%02x %d.%d.%d\n",</div><div class='add'>+			hw-&gt;ident_sta_fw.id, hw-&gt;ident_sta_fw.major,</div><div class='add'>+			hw-&gt;ident_sta_fw.minor, hw-&gt;ident_sta_fw.variant);</div><div class='add'>+	} else {</div><div class='add'>+		hw-&gt;ap = 1;</div><div class='add'>+		WLAN_LOG_INFO(</div><div class='add'>+			"ident:  ap f/w: id=0x%02x %d.%d.%d\n",</div><div class='add'>+			hw-&gt;ident_sta_fw.id, hw-&gt;ident_sta_fw.major,</div><div class='add'>+			hw-&gt;ident_sta_fw.minor, hw-&gt;ident_sta_fw.variant);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Compatibility range, Modem supplier */</div><div class='add'>+	result = hfa384x_drvr_getconfig(hw, HFA384x_RID_MFISUPRANGE,</div><div class='add'>+			&amp;hw-&gt;cap_sup_mfi, sizeof(hfa384x_caplevel_t));</div><div class='add'>+	if ( result ) {</div><div class='add'>+		WLAN_LOG_ERROR("Failed to retrieve MFISUPRANGE\n");</div><div class='add'>+		goto failed;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* get all the Compatibility range, modem interface supplier</div><div class='add'>+	fields in byte order */</div><div class='add'>+	hw-&gt;cap_sup_mfi.role = hfa384x2host_16(hw-&gt;cap_sup_mfi.role);</div><div class='add'>+	hw-&gt;cap_sup_mfi.id = hfa384x2host_16(hw-&gt;cap_sup_mfi.id);</div><div class='add'>+	hw-&gt;cap_sup_mfi.variant = hfa384x2host_16(hw-&gt;cap_sup_mfi.variant);</div><div class='add'>+	hw-&gt;cap_sup_mfi.bottom = hfa384x2host_16(hw-&gt;cap_sup_mfi.bottom);</div><div class='add'>+	hw-&gt;cap_sup_mfi.top = hfa384x2host_16(hw-&gt;cap_sup_mfi.top);</div><div class='add'>+</div><div class='add'>+	WLAN_LOG_INFO(</div><div class='add'>+		"MFI:SUP:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n",</div><div class='add'>+		hw-&gt;cap_sup_mfi.role, hw-&gt;cap_sup_mfi.id,</div><div class='add'>+		hw-&gt;cap_sup_mfi.variant, hw-&gt;cap_sup_mfi.bottom,</div><div class='add'>+		hw-&gt;cap_sup_mfi.top);</div><div class='add'>+</div><div class='add'>+	/* Compatibility range, Controller supplier */</div><div class='add'>+	result = hfa384x_drvr_getconfig(hw, HFA384x_RID_CFISUPRANGE,</div><div class='add'>+			&amp;hw-&gt;cap_sup_cfi, sizeof(hfa384x_caplevel_t));</div><div class='add'>+	if ( result ) {</div><div class='add'>+		WLAN_LOG_ERROR("Failed to retrieve CFISUPRANGE\n");</div><div class='add'>+		goto failed;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* get all the Compatibility range, controller interface supplier</div><div class='add'>+	fields in byte order */</div><div class='add'>+	hw-&gt;cap_sup_cfi.role = hfa384x2host_16(hw-&gt;cap_sup_cfi.role);</div><div class='add'>+	hw-&gt;cap_sup_cfi.id = hfa384x2host_16(hw-&gt;cap_sup_cfi.id);</div><div class='add'>+	hw-&gt;cap_sup_cfi.variant = hfa384x2host_16(hw-&gt;cap_sup_cfi.variant);</div><div class='add'>+	hw-&gt;cap_sup_cfi.bottom = hfa384x2host_16(hw-&gt;cap_sup_cfi.bottom);</div><div class='add'>+	hw-&gt;cap_sup_cfi.top = hfa384x2host_16(hw-&gt;cap_sup_cfi.top);</div><div class='add'>+</div><div class='add'>+	WLAN_LOG_INFO(</div><div class='add'>+		"CFI:SUP:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n",</div><div class='add'>+		hw-&gt;cap_sup_cfi.role, hw-&gt;cap_sup_cfi.id,</div><div class='add'>+		hw-&gt;cap_sup_cfi.variant, hw-&gt;cap_sup_cfi.bottom,</div><div class='add'>+		hw-&gt;cap_sup_cfi.top);</div><div class='add'>+</div><div class='add'>+	/* Compatibility range, Primary f/w supplier */</div><div class='add'>+	result = hfa384x_drvr_getconfig(hw, HFA384x_RID_PRISUPRANGE,</div><div class='add'>+			&amp;hw-&gt;cap_sup_pri, sizeof(hfa384x_caplevel_t));</div><div class='add'>+	if ( result ) {</div><div class='add'>+		WLAN_LOG_ERROR("Failed to retrieve PRISUPRANGE\n");</div><div class='add'>+		goto failed;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* get all the Compatibility range, primary firmware supplier</div><div class='add'>+	fields in byte order */</div><div class='add'>+	hw-&gt;cap_sup_pri.role = hfa384x2host_16(hw-&gt;cap_sup_pri.role);</div><div class='add'>+	hw-&gt;cap_sup_pri.id = hfa384x2host_16(hw-&gt;cap_sup_pri.id);</div><div class='add'>+	hw-&gt;cap_sup_pri.variant = hfa384x2host_16(hw-&gt;cap_sup_pri.variant);</div><div class='add'>+	hw-&gt;cap_sup_pri.bottom = hfa384x2host_16(hw-&gt;cap_sup_pri.bottom);</div><div class='add'>+	hw-&gt;cap_sup_pri.top = hfa384x2host_16(hw-&gt;cap_sup_pri.top);</div><div class='add'>+</div><div class='add'>+	WLAN_LOG_INFO(</div><div class='add'>+		"PRI:SUP:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n",</div><div class='add'>+		hw-&gt;cap_sup_pri.role, hw-&gt;cap_sup_pri.id,</div><div class='add'>+		hw-&gt;cap_sup_pri.variant, hw-&gt;cap_sup_pri.bottom,</div><div class='add'>+		hw-&gt;cap_sup_pri.top);</div><div class='add'>+</div><div class='add'>+	/* Compatibility range, Station f/w supplier */</div><div class='add'>+	result = hfa384x_drvr_getconfig(hw, HFA384x_RID_STASUPRANGE,</div><div class='add'>+			&amp;hw-&gt;cap_sup_sta, sizeof(hfa384x_caplevel_t));</div><div class='add'>+	if ( result ) {</div><div class='add'>+		WLAN_LOG_ERROR("Failed to retrieve STASUPRANGE\n");</div><div class='add'>+		goto failed;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* get all the Compatibility range, station firmware supplier</div><div class='add'>+	fields in byte order */</div><div class='add'>+	hw-&gt;cap_sup_sta.role = hfa384x2host_16(hw-&gt;cap_sup_sta.role);</div><div class='add'>+	hw-&gt;cap_sup_sta.id = hfa384x2host_16(hw-&gt;cap_sup_sta.id);</div><div class='add'>+	hw-&gt;cap_sup_sta.variant = hfa384x2host_16(hw-&gt;cap_sup_sta.variant);</div><div class='add'>+	hw-&gt;cap_sup_sta.bottom = hfa384x2host_16(hw-&gt;cap_sup_sta.bottom);</div><div class='add'>+	hw-&gt;cap_sup_sta.top = hfa384x2host_16(hw-&gt;cap_sup_sta.top);</div><div class='add'>+</div><div class='add'>+	if ( hw-&gt;cap_sup_sta.id == 0x04 ) {</div><div class='add'>+		WLAN_LOG_INFO(</div><div class='add'>+		"STA:SUP:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n",</div><div class='add'>+		hw-&gt;cap_sup_sta.role, hw-&gt;cap_sup_sta.id,</div><div class='add'>+		hw-&gt;cap_sup_sta.variant, hw-&gt;cap_sup_sta.bottom,</div><div class='add'>+		hw-&gt;cap_sup_sta.top);</div><div class='add'>+	} else {</div><div class='add'>+		WLAN_LOG_INFO(</div><div class='add'>+		"AP:SUP:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n",</div><div class='add'>+		hw-&gt;cap_sup_sta.role, hw-&gt;cap_sup_sta.id,</div><div class='add'>+		hw-&gt;cap_sup_sta.variant, hw-&gt;cap_sup_sta.bottom,</div><div class='add'>+		hw-&gt;cap_sup_sta.top);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Compatibility range, primary f/w actor, CFI supplier */</div><div class='add'>+	result = hfa384x_drvr_getconfig(hw, HFA384x_RID_PRI_CFIACTRANGES,</div><div class='add'>+			&amp;hw-&gt;cap_act_pri_cfi, sizeof(hfa384x_caplevel_t));</div><div class='add'>+	if ( result ) {</div><div class='add'>+		WLAN_LOG_ERROR("Failed to retrieve PRI_CFIACTRANGES\n");</div><div class='add'>+		goto failed;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* get all the Compatibility range, primary f/w actor, CFI supplier</div><div class='add'>+	fields in byte order */</div><div class='add'>+	hw-&gt;cap_act_pri_cfi.role = hfa384x2host_16(hw-&gt;cap_act_pri_cfi.role);</div><div class='add'>+	hw-&gt;cap_act_pri_cfi.id = hfa384x2host_16(hw-&gt;cap_act_pri_cfi.id);</div><div class='add'>+	hw-&gt;cap_act_pri_cfi.variant = hfa384x2host_16(hw-&gt;cap_act_pri_cfi.variant);</div><div class='add'>+	hw-&gt;cap_act_pri_cfi.bottom = hfa384x2host_16(hw-&gt;cap_act_pri_cfi.bottom);</div><div class='add'>+	hw-&gt;cap_act_pri_cfi.top = hfa384x2host_16(hw-&gt;cap_act_pri_cfi.top);</div><div class='add'>+</div><div class='add'>+	WLAN_LOG_INFO(</div><div class='add'>+		"PRI-CFI:ACT:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n",</div><div class='add'>+		hw-&gt;cap_act_pri_cfi.role, hw-&gt;cap_act_pri_cfi.id,</div><div class='add'>+		hw-&gt;cap_act_pri_cfi.variant, hw-&gt;cap_act_pri_cfi.bottom,</div><div class='add'>+		hw-&gt;cap_act_pri_cfi.top);</div><div class='add'>+</div><div class='add'>+	/* Compatibility range, sta f/w actor, CFI supplier */</div><div class='add'>+	result = hfa384x_drvr_getconfig(hw, HFA384x_RID_STA_CFIACTRANGES,</div><div class='add'>+			&amp;hw-&gt;cap_act_sta_cfi, sizeof(hfa384x_caplevel_t));</div><div class='add'>+	if ( result ) {</div><div class='add'>+		WLAN_LOG_ERROR("Failed to retrieve STA_CFIACTRANGES\n");</div><div class='add'>+		goto failed;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* get all the Compatibility range, station f/w actor, CFI supplier</div><div class='add'>+	fields in byte order */</div><div class='add'>+	hw-&gt;cap_act_sta_cfi.role = hfa384x2host_16(hw-&gt;cap_act_sta_cfi.role);</div><div class='add'>+	hw-&gt;cap_act_sta_cfi.id = hfa384x2host_16(hw-&gt;cap_act_sta_cfi.id);</div><div class='add'>+	hw-&gt;cap_act_sta_cfi.variant = hfa384x2host_16(hw-&gt;cap_act_sta_cfi.variant);</div><div class='add'>+	hw-&gt;cap_act_sta_cfi.bottom = hfa384x2host_16(hw-&gt;cap_act_sta_cfi.bottom);</div><div class='add'>+	hw-&gt;cap_act_sta_cfi.top = hfa384x2host_16(hw-&gt;cap_act_sta_cfi.top);</div><div class='add'>+</div><div class='add'>+	WLAN_LOG_INFO(</div><div class='add'>+		"STA-CFI:ACT:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n",</div><div class='add'>+		hw-&gt;cap_act_sta_cfi.role, hw-&gt;cap_act_sta_cfi.id,</div><div class='add'>+		hw-&gt;cap_act_sta_cfi.variant, hw-&gt;cap_act_sta_cfi.bottom,</div><div class='add'>+		hw-&gt;cap_act_sta_cfi.top);</div><div class='add'>+</div><div class='add'>+	/* Compatibility range, sta f/w actor, MFI supplier */</div><div class='add'>+	result = hfa384x_drvr_getconfig(hw, HFA384x_RID_STA_MFIACTRANGES,</div><div class='add'>+			&amp;hw-&gt;cap_act_sta_mfi, sizeof(hfa384x_caplevel_t));</div><div class='add'>+	if ( result ) {</div><div class='add'>+		WLAN_LOG_ERROR("Failed to retrieve STA_MFIACTRANGES\n");</div><div class='add'>+		goto failed;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* get all the Compatibility range, station f/w actor, MFI supplier</div><div class='add'>+	fields in byte order */</div><div class='add'>+	hw-&gt;cap_act_sta_mfi.role = hfa384x2host_16(hw-&gt;cap_act_sta_mfi.role);</div><div class='add'>+	hw-&gt;cap_act_sta_mfi.id = hfa384x2host_16(hw-&gt;cap_act_sta_mfi.id);</div><div class='add'>+	hw-&gt;cap_act_sta_mfi.variant = hfa384x2host_16(hw-&gt;cap_act_sta_mfi.variant);</div><div class='add'>+	hw-&gt;cap_act_sta_mfi.bottom = hfa384x2host_16(hw-&gt;cap_act_sta_mfi.bottom);</div><div class='add'>+	hw-&gt;cap_act_sta_mfi.top = hfa384x2host_16(hw-&gt;cap_act_sta_mfi.top);</div><div class='add'>+</div><div class='add'>+	WLAN_LOG_INFO(</div><div class='add'>+		"STA-MFI:ACT:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n",</div><div class='add'>+		hw-&gt;cap_act_sta_mfi.role, hw-&gt;cap_act_sta_mfi.id,</div><div class='add'>+		hw-&gt;cap_act_sta_mfi.variant, hw-&gt;cap_act_sta_mfi.bottom,</div><div class='add'>+		hw-&gt;cap_act_sta_mfi.top);</div><div class='add'>+</div><div class='add'>+	/* Serial Number */</div><div class='add'>+	result = hfa384x_drvr_getconfig(hw, HFA384x_RID_NICSERIALNUMBER,</div><div class='add'>+			snum, HFA384x_RID_NICSERIALNUMBER_LEN);</div><div class='add'>+	if ( !result ) {</div><div class='add'>+		wlan_mkprintstr(snum, HFA384x_RID_NICSERIALNUMBER_LEN,</div><div class='add'>+				pstr, sizeof(pstr));</div><div class='add'>+		WLAN_LOG_INFO("Prism2 card SN: %s\n", pstr);</div><div class='add'>+	} else {</div><div class='add'>+		WLAN_LOG_ERROR("Failed to retrieve Prism2 Card SN\n");</div><div class='add'>+		goto failed;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Collect the MAC address */</div><div class='add'>+	result = hfa384x_drvr_getconfig(hw, HFA384x_RID_CNFOWNMACADDR,</div><div class='add'>+		wlandev-&gt;netdev-&gt;dev_addr, WLAN_ADDR_LEN);</div><div class='add'>+	if ( result != 0 ) {</div><div class='add'>+		WLAN_LOG_ERROR("Failed to retrieve mac address\n");</div><div class='add'>+		goto failed;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* short preamble is always implemented */</div><div class='add'>+	wlandev-&gt;nsdcaps |= P80211_NSDCAP_SHORT_PREAMBLE;</div><div class='add'>+</div><div class='add'>+	/* find out if hardware wep is implemented */</div><div class='add'>+	hfa384x_drvr_getconfig16(hw, HFA384x_RID_PRIVACYOPTIMP, &amp;temp);</div><div class='add'>+	if (temp)</div><div class='add'>+		wlandev-&gt;nsdcaps |= P80211_NSDCAP_HARDWAREWEP;</div><div class='add'>+</div><div class='add'>+	/* get the dBm Scaling constant */</div><div class='add'>+	hfa384x_drvr_getconfig16(hw, HFA384x_RID_CNFDBMADJUST, &amp;temp);</div><div class='add'>+	hw-&gt;dbmadjust = temp;</div><div class='add'>+</div><div class='add'>+	/* Only enable scan by default on newer firmware */</div><div class='add'>+        if (HFA384x_FIRMWARE_VERSION(hw-&gt;ident_sta_fw.major,</div><div class='add'>+                                     hw-&gt;ident_sta_fw.minor,</div><div class='add'>+                                     hw-&gt;ident_sta_fw.variant) &lt;</div><div class='add'>+	    HFA384x_FIRMWARE_VERSION(1,5,5)) {</div><div class='add'>+		wlandev-&gt;nsdcaps |= P80211_NSDCAP_NOSCAN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* TODO: Set any internally managed config items */</div><div class='add'>+</div><div class='add'>+	goto done;</div><div class='add'>+failed:</div><div class='add'>+	WLAN_LOG_ERROR("Failed, result=%d\n", result);</div><div class='add'>+done:</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2sta_globalsetup</div><div class='add'>+*</div><div class='add'>+* Set any global RIDs that we want to set at device activation.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		wlan device structure</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	0	success</div><div class='add'>+*	&gt;0	f/w reported error</div><div class='add'>+*	&lt;0	driver reported error</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+static int prism2sta_globalsetup(wlandevice_t *wlandev)</div><div class='add'>+{</div><div class='add'>+	hfa384x_t               *hw = (hfa384x_t *)wlandev-&gt;priv;</div><div class='add'>+</div><div class='add'>+	/* Set the maximum frame size */</div><div class='add'>+	return hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFMAXDATALEN,</div><div class='add'>+	                                    WLAN_DATA_MAXLEN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int prism2sta_setmulticast(wlandevice_t *wlandev, netdevice_t *dev)</div><div class='add'>+{</div><div class='add'>+	int result = 0;</div><div class='add'>+	hfa384x_t               *hw = (hfa384x_t *)wlandev-&gt;priv;</div><div class='add'>+</div><div class='add'>+	UINT16  promisc;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	/* If we're not ready, what's the point? */</div><div class='add'>+	if ( hw-&gt;state != HFA384x_STATE_RUNNING )</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	/* If we're an AP, do nothing here */</div><div class='add'>+	if (hw-&gt;ap)</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	if ( (dev-&gt;flags &amp; (IFF_PROMISC | IFF_ALLMULTI)) != 0 )</div><div class='add'>+		promisc = P80211ENUM_truth_true;</div><div class='add'>+	else</div><div class='add'>+		promisc = P80211ENUM_truth_false;</div><div class='add'>+</div><div class='add'>+	result = hfa384x_drvr_setconfig16_async(hw, HFA384x_RID_PROMISCMODE, promisc);</div><div class='add'>+</div><div class='add'>+	/* XXX TODO: configure the multicast list */</div><div class='add'>+	// CLEAR_HW_MULTICAST_LIST</div><div class='add'>+	// struct dev_mc_list element = dev-&gt;mc_list;</div><div class='add'>+	// while (element != null) {</div><div class='add'>+	//  HW_ADD_MULTICAST_ADDR(element-&gt;dmi_addr, dmi_addrlen)</div><div class='add'>+	//  element = element-&gt;next;</div><div class='add'>+	// }</div><div class='add'>+</div><div class='add'>+ exit:</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2sta_inf_handover</div><div class='add'>+*</div><div class='add'>+* Handles the receipt of a Handover info frame. Should only be present</div><div class='add'>+* in APs only.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		wlan device structure</div><div class='add'>+*	inf		ptr to info frame (contents in hfa384x order)</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	nothing</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	interrupt</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+static void prism2sta_inf_handover(wlandevice_t *wlandev, hfa384x_InfFrame_t *inf)</div><div class='add'>+{</div><div class='add'>+	DBFENTER;</div><div class='add'>+	WLAN_LOG_DEBUG(2,"received infoframe:HANDOVER (unhandled)\n");</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2sta_inf_tallies</div><div class='add'>+*</div><div class='add'>+* Handles the receipt of a CommTallies info frame.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		wlan device structure</div><div class='add'>+*	inf		ptr to info frame (contents in hfa384x order)</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	nothing</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	interrupt</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+static void prism2sta_inf_tallies(wlandevice_t *wlandev, hfa384x_InfFrame_t *inf)</div><div class='add'>+{</div><div class='add'>+        hfa384x_t               *hw = (hfa384x_t *)wlandev-&gt;priv;</div><div class='add'>+	UINT16			*src16;</div><div class='add'>+	UINT32			*dst;</div><div class='add'>+	UINT32			*src32;</div><div class='add'>+	int			i;</div><div class='add'>+	int			cnt;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	** Determine if these are 16-bit or 32-bit tallies, based on the</div><div class='add'>+	** record length of the info record.</div><div class='add'>+	*/</div><div class='add'>+</div><div class='add'>+	cnt = sizeof(hfa384x_CommTallies32_t) / sizeof(UINT32);</div><div class='add'>+	if (inf-&gt;framelen &gt; 22) {</div><div class='add'>+		dst   = (UINT32 *) &amp;hw-&gt;tallies;</div><div class='add'>+		src32 = (UINT32 *) &amp;inf-&gt;info.commtallies32;</div><div class='add'>+		for (i = 0; i &lt; cnt; i++, dst++, src32++)</div><div class='add'>+			*dst += hfa384x2host_32(*src32);</div><div class='add'>+	} else {</div><div class='add'>+		dst   = (UINT32 *) &amp;hw-&gt;tallies;</div><div class='add'>+		src16 = (UINT16 *) &amp;inf-&gt;info.commtallies16;</div><div class='add'>+		for (i = 0; i &lt; cnt; i++, dst++, src16++)</div><div class='add'>+			*dst += hfa384x2host_16(*src16);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2sta_inf_scanresults</div><div class='add'>+*</div><div class='add'>+* Handles the receipt of a Scan Results info frame.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		wlan device structure</div><div class='add'>+*	inf		ptr to info frame (contents in hfa384x order)</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	nothing</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	interrupt</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+static void prism2sta_inf_scanresults(wlandevice_t *wlandev,</div><div class='add'>+				      hfa384x_InfFrame_t *inf)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+        hfa384x_t               *hw = (hfa384x_t *)wlandev-&gt;priv;</div><div class='add'>+	int			nbss;</div><div class='add'>+	hfa384x_ScanResult_t	*sr = &amp;(inf-&gt;info.scanresult);</div><div class='add'>+	int			i;</div><div class='add'>+	hfa384x_JoinRequest_data_t	joinreq;</div><div class='add'>+	int			result;</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	/* Get the number of results, first in bytes, then in results */</div><div class='add'>+	nbss = (inf-&gt;framelen * sizeof(UINT16)) -</div><div class='add'>+		sizeof(inf-&gt;infotype) -</div><div class='add'>+		sizeof(inf-&gt;info.scanresult.scanreason);</div><div class='add'>+	nbss /= sizeof(hfa384x_ScanResultSub_t);</div><div class='add'>+</div><div class='add'>+	/* Print em */</div><div class='add'>+	WLAN_LOG_DEBUG(1,"rx scanresults, reason=%d, nbss=%d:\n",</div><div class='add'>+		inf-&gt;info.scanresult.scanreason, nbss);</div><div class='add'>+	for ( i = 0; i &lt; nbss; i++) {</div><div class='add'>+		WLAN_LOG_DEBUG(1, "chid=%d anl=%d sl=%d bcnint=%d\n",</div><div class='add'>+			sr-&gt;result[i].chid,</div><div class='add'>+			sr-&gt;result[i].anl,</div><div class='add'>+			sr-&gt;result[i].sl,</div><div class='add'>+			sr-&gt;result[i].bcnint);</div><div class='add'>+		WLAN_LOG_DEBUG(1, "  capinfo=0x%04x proberesp_rate=%d\n",</div><div class='add'>+			sr-&gt;result[i].capinfo,</div><div class='add'>+			sr-&gt;result[i].proberesp_rate);</div><div class='add'>+	}</div><div class='add'>+	/* issue a join request */</div><div class='add'>+	joinreq.channel = sr-&gt;result[0].chid;</div><div class='add'>+	memcpy( joinreq.bssid, sr-&gt;result[0].bssid, WLAN_BSSID_LEN);</div><div class='add'>+	result = hfa384x_drvr_setconfig( hw,</div><div class='add'>+			HFA384x_RID_JOINREQUEST,</div><div class='add'>+			&amp;joinreq, HFA384x_RID_JOINREQUEST_LEN);</div><div class='add'>+	if (result) {</div><div class='add'>+		WLAN_LOG_ERROR("setconfig(joinreq) failed, result=%d\n", result);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2sta_inf_hostscanresults</div><div class='add'>+*</div><div class='add'>+* Handles the receipt of a Scan Results info frame.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		wlan device structure</div><div class='add'>+*	inf		ptr to info frame (contents in hfa384x order)</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	nothing</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	interrupt</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+static void prism2sta_inf_hostscanresults(wlandevice_t *wlandev,</div><div class='add'>+					  hfa384x_InfFrame_t *inf)</div><div class='add'>+{</div><div class='add'>+        hfa384x_t               *hw = (hfa384x_t *)wlandev-&gt;priv;</div><div class='add'>+	int			nbss;</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	nbss = (inf-&gt;framelen - 3) / 32;</div><div class='add'>+	WLAN_LOG_DEBUG(1, "Received %d hostscan results\n", nbss);</div><div class='add'>+</div><div class='add'>+	if (nbss &gt; 32)</div><div class='add'>+		nbss = 32;</div><div class='add'>+</div><div class='add'>+	if (hw-&gt;scanresults)</div><div class='add'>+		kfree(hw-&gt;scanresults);</div><div class='add'>+</div><div class='add'>+	hw-&gt;scanresults = kmalloc(sizeof(hfa384x_InfFrame_t), GFP_ATOMIC);</div><div class='add'>+	memcpy(hw-&gt;scanresults, inf, sizeof(hfa384x_InfFrame_t));</div><div class='add'>+</div><div class='add'>+	if (nbss == 0)</div><div class='add'>+		nbss = -1;</div><div class='add'>+</div><div class='add'>+        /* Notify/wake the sleeping caller. */</div><div class='add'>+        hw-&gt;scanflag = nbss;</div><div class='add'>+        wake_up_interruptible(&amp;hw-&gt;cmdq);</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2sta_inf_chinforesults</div><div class='add'>+*</div><div class='add'>+* Handles the receipt of a Channel Info Results info frame.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		wlan device structure</div><div class='add'>+*	inf		ptr to info frame (contents in hfa384x order)</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	nothing</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	interrupt</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+static void prism2sta_inf_chinforesults(wlandevice_t *wlandev,</div><div class='add'>+					hfa384x_InfFrame_t *inf)</div><div class='add'>+{</div><div class='add'>+        hfa384x_t               *hw = (hfa384x_t *)wlandev-&gt;priv;</div><div class='add'>+	unsigned int		i, n;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+	hw-&gt;channel_info.results.scanchannels =</div><div class='add'>+		hfa384x2host_16(inf-&gt;info.chinforesult.scanchannels);</div><div class='add'>+#if 0</div><div class='add'>+	memcpy(&amp;inf-&gt;info.chinforesult, &amp;hw-&gt;channel_info.results, sizeof(hfa384x_ChInfoResult_t));</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	for (i=0, n=0; i&lt;HFA384x_CHINFORESULT_MAX; i++) {</div><div class='add'>+		if (hw-&gt;channel_info.results.scanchannels &amp; (1&lt;&lt;i)) {</div><div class='add'>+			int 	channel=hfa384x2host_16(inf-&gt;info.chinforesult.result[n].chid)-1;</div><div class='add'>+			hfa384x_ChInfoResultSub_t *chinforesult=&amp;hw-&gt;channel_info.results.result[channel];</div><div class='add'>+			chinforesult-&gt;chid   = channel;</div><div class='add'>+			chinforesult-&gt;anl    = hfa384x2host_16(inf-&gt;info.chinforesult.result[n].anl);</div><div class='add'>+			chinforesult-&gt;pnl    = hfa384x2host_16(inf-&gt;info.chinforesult.result[n].pnl);</div><div class='add'>+			chinforesult-&gt;active = hfa384x2host_16(inf-&gt;info.chinforesult.result[n].active);</div><div class='add'>+			WLAN_LOG_DEBUG(2, "chinfo: channel %d, %s level (avg/peak)=%d/%d dB, pcf %d\n",</div><div class='add'>+					channel+1,</div><div class='add'>+					chinforesult-&gt;active &amp;</div><div class='add'>+					HFA384x_CHINFORESULT_BSSACTIVE ? "signal" : "noise",</div><div class='add'>+					chinforesult-&gt;anl, chinforesult-&gt;pnl,</div><div class='add'>+					chinforesult-&gt;active &amp; HFA384x_CHINFORESULT_PCFACTIVE ? 1 : 0</div><div class='add'>+			);</div><div class='add'>+			n++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	atomic_set(&amp;hw-&gt;channel_info.done, 2);</div><div class='add'>+</div><div class='add'>+	hw-&gt;channel_info.count = n;</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void prism2sta_processing_defer(struct work_struct *data)</div><div class='add'>+{</div><div class='add'>+	hfa384x_t		*hw = container_of(data, struct hfa384x, link_bh);</div><div class='add'>+	wlandevice_t            *wlandev = hw-&gt;wlandev;</div><div class='add'>+	hfa384x_bytestr32_t ssid;</div><div class='add'>+	int			result;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+	/* First let's process the auth frames */</div><div class='add'>+	{</div><div class='add'>+		struct sk_buff          *skb;</div><div class='add'>+		hfa384x_InfFrame_t *inf;</div><div class='add'>+</div><div class='add'>+		while ( (skb = skb_dequeue(&amp;hw-&gt;authq)) ) {</div><div class='add'>+			inf = (hfa384x_InfFrame_t *) skb-&gt;data;</div><div class='add'>+			prism2sta_inf_authreq_defer(wlandev, inf);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Now let's handle the linkstatus stuff */</div><div class='add'>+	if (hw-&gt;link_status == hw-&gt;link_status_new)</div><div class='add'>+		goto failed;</div><div class='add'>+</div><div class='add'>+	hw-&gt;link_status = hw-&gt;link_status_new;</div><div class='add'>+</div><div class='add'>+	switch(hw-&gt;link_status) {</div><div class='add'>+	case HFA384x_LINK_NOTCONNECTED:</div><div class='add'>+		/* I'm currently assuming that this is the initial link</div><div class='add'>+		 * state.  It should only be possible immediately</div><div class='add'>+		 * following an Enable command.</div><div class='add'>+		 * Response:</div><div class='add'>+		 * Block Transmits, Ignore receives of data frames</div><div class='add'>+		 */</div><div class='add'>+		netif_carrier_off(wlandev-&gt;netdev);</div><div class='add'>+</div><div class='add'>+		WLAN_LOG_INFO("linkstatus=NOTCONNECTED (unhandled)\n");</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case HFA384x_LINK_CONNECTED:</div><div class='add'>+		/* This one indicates a successful scan/join/auth/assoc.</div><div class='add'>+		 * When we have the full MLME complement, this event will</div><div class='add'>+		 * signify successful completion of both mlme_authenticate</div><div class='add'>+		 * and mlme_associate.  State management will get a little</div><div class='add'>+		 * ugly here.</div><div class='add'>+		 * Response:</div><div class='add'>+		 * Indicate authentication and/or association</div><div class='add'>+		 * Enable Transmits, Receives and pass up data frames</div><div class='add'>+		 */</div><div class='add'>+</div><div class='add'>+		netif_carrier_on(wlandev-&gt;netdev);</div><div class='add'>+</div><div class='add'>+		/* If we are joining a specific AP, set our state and reset retries */</div><div class='add'>+		if(hw-&gt;join_ap == 1)</div><div class='add'>+			hw-&gt;join_ap = 2;</div><div class='add'>+		hw-&gt;join_retries = 60;</div><div class='add'>+</div><div class='add'>+		/* Don't call this in monitor mode */</div><div class='add'>+		if ( wlandev-&gt;netdev-&gt;type == ARPHRD_ETHER ) {</div><div class='add'>+			UINT16			portstatus;</div><div class='add'>+</div><div class='add'>+			WLAN_LOG_INFO("linkstatus=CONNECTED\n");</div><div class='add'>+</div><div class='add'>+			/* For non-usb devices, we can use the sync versions */</div><div class='add'>+			/* Collect the BSSID, and set state to allow tx */</div><div class='add'>+</div><div class='add'>+			result = hfa384x_drvr_getconfig(hw,</div><div class='add'>+							HFA384x_RID_CURRENTBSSID,</div><div class='add'>+							wlandev-&gt;bssid, WLAN_BSSID_LEN);</div><div class='add'>+			if ( result ) {</div><div class='add'>+				WLAN_LOG_DEBUG(1,</div><div class='add'>+					       "getconfig(0x%02x) failed, result = %d\n",</div><div class='add'>+					       HFA384x_RID_CURRENTBSSID, result);</div><div class='add'>+				goto failed;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			result = hfa384x_drvr_getconfig(hw,</div><div class='add'>+							HFA384x_RID_CURRENTSSID,</div><div class='add'>+							&amp;ssid, sizeof(ssid));</div><div class='add'>+			if ( result ) {</div><div class='add'>+				WLAN_LOG_DEBUG(1,</div><div class='add'>+					       "getconfig(0x%02x) failed, result = %d\n",</div><div class='add'>+					       HFA384x_RID_CURRENTSSID, result);</div><div class='add'>+				goto failed;</div><div class='add'>+			}</div><div class='add'>+			prism2mgmt_bytestr2pstr((hfa384x_bytestr_t *)&amp;ssid,</div><div class='add'>+						(p80211pstrd_t *) &amp;wlandev-&gt;ssid);</div><div class='add'>+</div><div class='add'>+			/* Collect the port status */</div><div class='add'>+			result = hfa384x_drvr_getconfig16(hw,</div><div class='add'>+							  HFA384x_RID_PORTSTATUS, &amp;portstatus);</div><div class='add'>+			if ( result ) {</div><div class='add'>+				WLAN_LOG_DEBUG(1,</div><div class='add'>+					       "getconfig(0x%02x) failed, result = %d\n",</div><div class='add'>+					       HFA384x_RID_PORTSTATUS, result);</div><div class='add'>+				goto failed;</div><div class='add'>+			}</div><div class='add'>+			wlandev-&gt;macmode =</div><div class='add'>+				(portstatus == HFA384x_PSTATUS_CONN_IBSS) ?</div><div class='add'>+				WLAN_MACMODE_IBSS_STA : WLAN_MACMODE_ESS_STA;</div><div class='add'>+</div><div class='add'>+			/* Get the ball rolling on the comms quality stuff */</div><div class='add'>+			prism2sta_commsqual_defer(&amp;hw-&gt;commsqual_bh);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case HFA384x_LINK_DISCONNECTED:</div><div class='add'>+		/* This one indicates that our association is gone.  We've</div><div class='add'>+		 * lost connection with the AP and/or been disassociated.</div><div class='add'>+		 * This indicates that the MAC has completely cleared it's</div><div class='add'>+		 * associated state.  We * should send a deauth indication</div><div class='add'>+		 * (implying disassoc) up * to the MLME.</div><div class='add'>+		 * Response:</div><div class='add'>+		 * Indicate Deauthentication</div><div class='add'>+		 * Block Transmits, Ignore receives of data frames</div><div class='add'>+		 */</div><div class='add'>+		if(hw-&gt;join_ap == 2)</div><div class='add'>+		{</div><div class='add'>+			hfa384x_JoinRequest_data_t      joinreq;</div><div class='add'>+			joinreq = hw-&gt;joinreq;</div><div class='add'>+			/* Send the join request */</div><div class='add'>+			hfa384x_drvr_setconfig( hw,</div><div class='add'>+				HFA384x_RID_JOINREQUEST,</div><div class='add'>+				&amp;joinreq, HFA384x_RID_JOINREQUEST_LEN);</div><div class='add'>+			WLAN_LOG_INFO("linkstatus=DISCONNECTED (re-submitting join)\n");</div><div class='add'>+		} else {</div><div class='add'>+			if (wlandev-&gt;netdev-&gt;type == ARPHRD_ETHER)</div><div class='add'>+				WLAN_LOG_INFO("linkstatus=DISCONNECTED (unhandled)\n");</div><div class='add'>+		}</div><div class='add'>+		wlandev-&gt;macmode = WLAN_MACMODE_NONE;</div><div class='add'>+</div><div class='add'>+		netif_carrier_off(wlandev-&gt;netdev);</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case HFA384x_LINK_AP_CHANGE:</div><div class='add'>+		/* This one indicates that the MAC has decided to and</div><div class='add'>+		 * successfully completed a change to another AP.  We</div><div class='add'>+		 * should probably implement a reassociation indication</div><div class='add'>+		 * in response to this one.  I'm thinking that the the</div><div class='add'>+		 * p80211 layer needs to be notified in case of</div><div class='add'>+		 * buffering/queueing issues.  User mode also needs to be</div><div class='add'>+		 * notified so that any BSS dependent elements can be</div><div class='add'>+		 * updated.</div><div class='add'>+		 * associated state.  We * should send a deauth indication</div><div class='add'>+		 * (implying disassoc) up * to the MLME.</div><div class='add'>+		 * Response:</div><div class='add'>+		 * Indicate Reassociation</div><div class='add'>+		 * Enable Transmits, Receives and pass up data frames</div><div class='add'>+		 */</div><div class='add'>+		WLAN_LOG_INFO("linkstatus=AP_CHANGE\n");</div><div class='add'>+</div><div class='add'>+		result = hfa384x_drvr_getconfig(hw,</div><div class='add'>+						HFA384x_RID_CURRENTBSSID,</div><div class='add'>+						wlandev-&gt;bssid, WLAN_BSSID_LEN);</div><div class='add'>+		if ( result ) {</div><div class='add'>+			WLAN_LOG_DEBUG(1,</div><div class='add'>+				       "getconfig(0x%02x) failed, result = %d\n",</div><div class='add'>+				       HFA384x_RID_CURRENTBSSID, result);</div><div class='add'>+			goto failed;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		result = hfa384x_drvr_getconfig(hw,</div><div class='add'>+						HFA384x_RID_CURRENTSSID,</div><div class='add'>+						&amp;ssid, sizeof(ssid));</div><div class='add'>+		if ( result ) {</div><div class='add'>+			WLAN_LOG_DEBUG(1,</div><div class='add'>+				       "getconfig(0x%02x) failed, result = %d\n",</div><div class='add'>+				       HFA384x_RID_CURRENTSSID, result);</div><div class='add'>+			goto failed;</div><div class='add'>+		}</div><div class='add'>+		prism2mgmt_bytestr2pstr((hfa384x_bytestr_t *)&amp;ssid,</div><div class='add'>+					(p80211pstrd_t *) &amp;wlandev-&gt;ssid);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+		hw-&gt;link_status = HFA384x_LINK_CONNECTED;</div><div class='add'>+		netif_carrier_on(wlandev-&gt;netdev);</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case HFA384x_LINK_AP_OUTOFRANGE:</div><div class='add'>+		/* This one indicates that the MAC has decided that the</div><div class='add'>+		 * AP is out of range, but hasn't found a better candidate</div><div class='add'>+		 * so the MAC maintains its "associated" state in case</div><div class='add'>+		 * we get back in range.  We should block transmits and</div><div class='add'>+		 * receives in this state.  Do we need an indication here?</div><div class='add'>+		 * Probably not since a polling user-mode element would</div><div class='add'>+		 * get this status from from p2PortStatus(FD40). What about</div><div class='add'>+		 * p80211?</div><div class='add'>+		 * Response:</div><div class='add'>+		 * Block Transmits, Ignore receives of data frames</div><div class='add'>+		 */</div><div class='add'>+		WLAN_LOG_INFO("linkstatus=AP_OUTOFRANGE (unhandled)\n");</div><div class='add'>+</div><div class='add'>+		netif_carrier_off(wlandev-&gt;netdev);</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case HFA384x_LINK_AP_INRANGE:</div><div class='add'>+		/* This one indicates that the MAC has decided that the</div><div class='add'>+		 * AP is back in range.  We continue working with our</div><div class='add'>+		 * existing association.</div><div class='add'>+		 * Response:</div><div class='add'>+		 * Enable Transmits, Receives and pass up data frames</div><div class='add'>+		 */</div><div class='add'>+		WLAN_LOG_INFO("linkstatus=AP_INRANGE\n");</div><div class='add'>+</div><div class='add'>+		hw-&gt;link_status = HFA384x_LINK_CONNECTED;</div><div class='add'>+		netif_carrier_on(wlandev-&gt;netdev);</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case HFA384x_LINK_ASSOCFAIL:</div><div class='add'>+		/* This one is actually a peer to CONNECTED.  We've</div><div class='add'>+		 * requested a join for a given SSID and optionally BSSID.</div><div class='add'>+		 * We can use this one to indicate authentication and</div><div class='add'>+		 * association failures.  The trick is going to be</div><div class='add'>+		 * 1) identifying the failure, and 2) state management.</div><div class='add'>+		 * Response:</div><div class='add'>+		 * Disable Transmits, Ignore receives of data frames</div><div class='add'>+		 */</div><div class='add'>+		if(hw-&gt;join_ap &amp;&amp; --hw-&gt;join_retries &gt; 0)</div><div class='add'>+		{</div><div class='add'>+			hfa384x_JoinRequest_data_t      joinreq;</div><div class='add'>+			joinreq = hw-&gt;joinreq;</div><div class='add'>+			/* Send the join request */</div><div class='add'>+			hfa384x_drvr_setconfig( hw,</div><div class='add'>+				HFA384x_RID_JOINREQUEST,</div><div class='add'>+				&amp;joinreq, HFA384x_RID_JOINREQUEST_LEN);</div><div class='add'>+			WLAN_LOG_INFO("linkstatus=ASSOCFAIL (re-submitting join)\n");</div><div class='add'>+		} else {</div><div class='add'>+			WLAN_LOG_INFO("linkstatus=ASSOCFAIL (unhandled)\n");</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		netif_carrier_off(wlandev-&gt;netdev);</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		/* This is bad, IO port problems? */</div><div class='add'>+		WLAN_LOG_WARNING(</div><div class='add'>+			"unknown linkstatus=0x%02x\n", hw-&gt;link_status);</div><div class='add'>+		goto failed;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	wlandev-&gt;linkstatus = (hw-&gt;link_status == HFA384x_LINK_CONNECTED);</div><div class='add'>+#ifdef WIRELESS_EXT</div><div class='add'>+	p80211wext_event_associated(wlandev, wlandev-&gt;linkstatus);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+ failed:</div><div class='add'>+	DBFEXIT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2sta_inf_linkstatus</div><div class='add'>+*</div><div class='add'>+* Handles the receipt of a Link Status info frame.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		wlan device structure</div><div class='add'>+*	inf		ptr to info frame (contents in hfa384x order)</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	nothing</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	interrupt</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+static void prism2sta_inf_linkstatus(wlandevice_t *wlandev,</div><div class='add'>+				     hfa384x_InfFrame_t *inf)</div><div class='add'>+{</div><div class='add'>+        hfa384x_t               *hw = (hfa384x_t *)wlandev-&gt;priv;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	hw-&gt;link_status_new = hfa384x2host_16(inf-&gt;info.linkstatus.linkstatus);</div><div class='add'>+</div><div class='add'>+	schedule_work(&amp;hw-&gt;link_bh);</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2sta_inf_assocstatus</div><div class='add'>+*</div><div class='add'>+* Handles the receipt of an Association Status info frame. Should</div><div class='add'>+* be present in APs only.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		wlan device structure</div><div class='add'>+*	inf		ptr to info frame (contents in hfa384x order)</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	nothing</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	interrupt</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+static void prism2sta_inf_assocstatus(wlandevice_t *wlandev,</div><div class='add'>+				      hfa384x_InfFrame_t *inf)</div><div class='add'>+{</div><div class='add'>+        hfa384x_t               *hw = (hfa384x_t *)wlandev-&gt;priv;</div><div class='add'>+	hfa384x_AssocStatus_t	rec;</div><div class='add'>+	int			i;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;rec, &amp;inf-&gt;info.assocstatus, sizeof(rec));</div><div class='add'>+	rec.assocstatus = hfa384x2host_16(rec.assocstatus);</div><div class='add'>+	rec.reason      = hfa384x2host_16(rec.reason);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	** Find the address in the list of authenticated stations.  If it wasn't</div><div class='add'>+	** found, then this address has not been previously authenticated and</div><div class='add'>+	** something weird has happened if this is anything other than an</div><div class='add'>+	** "authentication failed" message.  If the address was found, then</div><div class='add'>+	** set the "associated" flag for that station, based on whether the</div><div class='add'>+	** station is associating or losing its association.  Something weird</div><div class='add'>+	** has also happened if we find the address in the list of authenticated</div><div class='add'>+	** stations but we are getting an "authentication failed" message.</div><div class='add'>+	*/</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; hw-&gt;authlist.cnt; i++)</div><div class='add'>+		if (memcmp(rec.sta_addr, hw-&gt;authlist.addr[i], WLAN_ADDR_LEN) == 0)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+	if (i &gt;= hw-&gt;authlist.cnt) {</div><div class='add'>+		if (rec.assocstatus != HFA384x_ASSOCSTATUS_AUTHFAIL)</div><div class='add'>+			WLAN_LOG_WARNING("assocstatus info frame received for non-authenticated station.\n");</div><div class='add'>+	} else {</div><div class='add'>+		hw-&gt;authlist.assoc[i] =</div><div class='add'>+			(rec.assocstatus == HFA384x_ASSOCSTATUS_STAASSOC ||</div><div class='add'>+			 rec.assocstatus == HFA384x_ASSOCSTATUS_REASSOC);</div><div class='add'>+</div><div class='add'>+		if (rec.assocstatus == HFA384x_ASSOCSTATUS_AUTHFAIL)</div><div class='add'>+			WLAN_LOG_WARNING("authfail assocstatus info frame received for authenticated station.\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2sta_inf_authreq</div><div class='add'>+*</div><div class='add'>+* Handles the receipt of an Authentication Request info frame. Should</div><div class='add'>+* be present in APs only.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		wlan device structure</div><div class='add'>+*	inf		ptr to info frame (contents in hfa384x order)</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	nothing</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	interrupt</div><div class='add'>+*</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+static void prism2sta_inf_authreq(wlandevice_t *wlandev,</div><div class='add'>+				  hfa384x_InfFrame_t *inf)</div><div class='add'>+{</div><div class='add'>+        hfa384x_t               *hw = (hfa384x_t *)wlandev-&gt;priv;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	skb = dev_alloc_skb(sizeof(*inf));</div><div class='add'>+	if (skb) {</div><div class='add'>+		skb_put(skb, sizeof(*inf));</div><div class='add'>+		memcpy(skb-&gt;data, inf, sizeof(*inf));</div><div class='add'>+		skb_queue_tail(&amp;hw-&gt;authq, skb);</div><div class='add'>+		schedule_work(&amp;hw-&gt;link_bh);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void prism2sta_inf_authreq_defer(wlandevice_t *wlandev,</div><div class='add'>+					hfa384x_InfFrame_t *inf)</div><div class='add'>+{</div><div class='add'>+        hfa384x_t               *hw = (hfa384x_t *)wlandev-&gt;priv;</div><div class='add'>+	hfa384x_authenticateStation_data_t  rec;</div><div class='add'>+</div><div class='add'>+	int    i, added, result, cnt;</div><div class='add'>+	UINT8  *addr;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	** Build the AuthenticateStation record.  Initialize it for denying</div><div class='add'>+	** authentication.</div><div class='add'>+	*/</div><div class='add'>+</div><div class='add'>+	memcpy(rec.address, inf-&gt;info.authreq.sta_addr, WLAN_ADDR_LEN);</div><div class='add'>+	rec.status = P80211ENUM_status_unspec_failure;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	** Authenticate based on the access mode.</div><div class='add'>+	*/</div><div class='add'>+</div><div class='add'>+	switch (hw-&gt;accessmode) {</div><div class='add'>+		case WLAN_ACCESS_NONE:</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			** Deny all new authentications.  However, if a station</div><div class='add'>+			** is ALREADY authenticated, then accept it.</div><div class='add'>+			*/</div><div class='add'>+</div><div class='add'>+			for (i = 0; i &lt; hw-&gt;authlist.cnt; i++)</div><div class='add'>+				if (memcmp(rec.address, hw-&gt;authlist.addr[i],</div><div class='add'>+						WLAN_ADDR_LEN) == 0) {</div><div class='add'>+					rec.status = P80211ENUM_status_successful;</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case WLAN_ACCESS_ALL:</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			** Allow all authentications.</div><div class='add'>+			*/</div><div class='add'>+</div><div class='add'>+			rec.status = P80211ENUM_status_successful;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case WLAN_ACCESS_ALLOW:</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			** Only allow the authentication if the MAC address</div><div class='add'>+			** is in the list of allowed addresses.</div><div class='add'>+			**</div><div class='add'>+			** Since this is the interrupt handler, we may be here</div><div class='add'>+			** while the access list is in the middle of being</div><div class='add'>+			** updated.  Choose the list which is currently okay.</div><div class='add'>+			** See "prism2mib_priv_accessallow()" for details.</div><div class='add'>+			*/</div><div class='add'>+</div><div class='add'>+			if (hw-&gt;allow.modify == 0) {</div><div class='add'>+				cnt  = hw-&gt;allow.cnt;</div><div class='add'>+				addr = hw-&gt;allow.addr[0];</div><div class='add'>+			} else {</div><div class='add'>+				cnt  = hw-&gt;allow.cnt1;</div><div class='add'>+				addr = hw-&gt;allow.addr1[0];</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			for (i = 0; i &lt; cnt; i++, addr += WLAN_ADDR_LEN)</div><div class='add'>+				if (memcmp(rec.address, addr, WLAN_ADDR_LEN) == 0) {</div><div class='add'>+					rec.status = P80211ENUM_status_successful;</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case WLAN_ACCESS_DENY:</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			** Allow the authentication UNLESS the MAC address is</div><div class='add'>+			** in the list of denied addresses.</div><div class='add'>+			**</div><div class='add'>+			** Since this is the interrupt handler, we may be here</div><div class='add'>+			** while the access list is in the middle of being</div><div class='add'>+			** updated.  Choose the list which is currently okay.</div><div class='add'>+			** See "prism2mib_priv_accessdeny()" for details.</div><div class='add'>+			*/</div><div class='add'>+</div><div class='add'>+			if (hw-&gt;deny.modify == 0) {</div><div class='add'>+				cnt  = hw-&gt;deny.cnt;</div><div class='add'>+				addr = hw-&gt;deny.addr[0];</div><div class='add'>+			} else {</div><div class='add'>+				cnt  = hw-&gt;deny.cnt1;</div><div class='add'>+				addr = hw-&gt;deny.addr1[0];</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			rec.status = P80211ENUM_status_successful;</div><div class='add'>+</div><div class='add'>+			for (i = 0; i &lt; cnt; i++, addr += WLAN_ADDR_LEN)</div><div class='add'>+				if (memcmp(rec.address, addr, WLAN_ADDR_LEN) == 0) {</div><div class='add'>+					rec.status = P80211ENUM_status_unspec_failure;</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	** If the authentication is okay, then add the MAC address to the list</div><div class='add'>+	** of authenticated stations.  Don't add the address if it is already in</div><div class='add'>+	** the list.  (802.11b does not seem to disallow a station from issuing</div><div class='add'>+	** an authentication request when the station is already authenticated.</div><div class='add'>+	** Does this sort of thing ever happen?  We might as well do the check</div><div class='add'>+	** just in case.)</div><div class='add'>+	*/</div><div class='add'>+</div><div class='add'>+	added = 0;</div><div class='add'>+</div><div class='add'>+	if (rec.status == P80211ENUM_status_successful) {</div><div class='add'>+		for (i = 0; i &lt; hw-&gt;authlist.cnt; i++)</div><div class='add'>+			if (memcmp(rec.address, hw-&gt;authlist.addr[i], WLAN_ADDR_LEN) == 0)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+		if (i &gt;= hw-&gt;authlist.cnt) {</div><div class='add'>+			if (hw-&gt;authlist.cnt &gt;= WLAN_AUTH_MAX) {</div><div class='add'>+				rec.status = P80211ENUM_status_ap_full;</div><div class='add'>+			} else {</div><div class='add'>+				memcpy(hw-&gt;authlist.addr[hw-&gt;authlist.cnt],</div><div class='add'>+					rec.address, WLAN_ADDR_LEN);</div><div class='add'>+				hw-&gt;authlist.cnt++;</div><div class='add'>+				added = 1;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	** Send back the results of the authentication.  If this doesn't work,</div><div class='add'>+	** then make sure to remove the address from the authenticated list if</div><div class='add'>+	** it was added.</div><div class='add'>+	*/</div><div class='add'>+</div><div class='add'>+	rec.status = host2hfa384x_16(rec.status);</div><div class='add'>+	rec.algorithm = inf-&gt;info.authreq.algorithm;</div><div class='add'>+</div><div class='add'>+	result = hfa384x_drvr_setconfig(hw, HFA384x_RID_AUTHENTICATESTA,</div><div class='add'>+							&amp;rec, sizeof(rec));</div><div class='add'>+	if (result) {</div><div class='add'>+		if (added) hw-&gt;authlist.cnt--;</div><div class='add'>+		WLAN_LOG_ERROR("setconfig(authenticatestation) failed, result=%d\n", result);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2sta_inf_psusercnt</div><div class='add'>+*</div><div class='add'>+* Handles the receipt of a PowerSaveUserCount info frame. Should</div><div class='add'>+* be present in APs only.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		wlan device structure</div><div class='add'>+*	inf		ptr to info frame (contents in hfa384x order)</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	nothing</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	interrupt</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+static void prism2sta_inf_psusercnt(wlandevice_t *wlandev,</div><div class='add'>+				    hfa384x_InfFrame_t *inf)</div><div class='add'>+{</div><div class='add'>+        hfa384x_t               *hw = (hfa384x_t *)wlandev-&gt;priv;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	hw-&gt;psusercount = hfa384x2host_16(inf-&gt;info.psusercnt.usercnt);</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2sta_ev_dtim</div><div class='add'>+*</div><div class='add'>+* Handles the DTIM early warning event.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		wlan device structure</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	nothing</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	interrupt</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+void prism2sta_ev_dtim(wlandevice_t *wlandev)</div><div class='add'>+{</div><div class='add'>+#if 0</div><div class='add'>+        hfa384x_t               *hw = (hfa384x_t *)wlandev-&gt;priv;</div><div class='add'>+#endif</div><div class='add'>+	DBFENTER;</div><div class='add'>+	WLAN_LOG_DEBUG(3, "DTIM event, currently unhandled.\n");</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2sta_ev_infdrop</div><div class='add'>+*</div><div class='add'>+* Handles the InfDrop event.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		wlan device structure</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	nothing</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	interrupt</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+void prism2sta_ev_infdrop(wlandevice_t *wlandev)</div><div class='add'>+{</div><div class='add'>+#if 0</div><div class='add'>+        hfa384x_t               *hw = (hfa384x_t *)wlandev-&gt;priv;</div><div class='add'>+#endif</div><div class='add'>+	DBFENTER;</div><div class='add'>+	WLAN_LOG_DEBUG(3, "Info frame dropped due to card mem low.\n");</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2sta_ev_info</div><div class='add'>+*</div><div class='add'>+* Handles the Info event.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		wlan device structure</div><div class='add'>+*	inf		ptr to a generic info frame</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	nothing</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	interrupt</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+void prism2sta_ev_info(wlandevice_t *wlandev, hfa384x_InfFrame_t *inf)</div><div class='add'>+{</div><div class='add'>+	DBFENTER;</div><div class='add'>+	inf-&gt;infotype = hfa384x2host_16(inf-&gt;infotype);</div><div class='add'>+	/* Dispatch */</div><div class='add'>+	switch ( inf-&gt;infotype ) {</div><div class='add'>+		case HFA384x_IT_HANDOVERADDR:</div><div class='add'>+			prism2sta_inf_handover(wlandev, inf);</div><div class='add'>+			break;</div><div class='add'>+		case HFA384x_IT_COMMTALLIES:</div><div class='add'>+			prism2sta_inf_tallies(wlandev, inf);</div><div class='add'>+			break;</div><div class='add'>+               case HFA384x_IT_HOSTSCANRESULTS:</div><div class='add'>+                        prism2sta_inf_hostscanresults(wlandev, inf);</div><div class='add'>+                        break;</div><div class='add'>+		case HFA384x_IT_SCANRESULTS:</div><div class='add'>+			prism2sta_inf_scanresults(wlandev, inf);</div><div class='add'>+			break;</div><div class='add'>+		case HFA384x_IT_CHINFORESULTS:</div><div class='add'>+			prism2sta_inf_chinforesults(wlandev, inf);</div><div class='add'>+			break;</div><div class='add'>+		case HFA384x_IT_LINKSTATUS:</div><div class='add'>+			prism2sta_inf_linkstatus(wlandev, inf);</div><div class='add'>+			break;</div><div class='add'>+		case HFA384x_IT_ASSOCSTATUS:</div><div class='add'>+			prism2sta_inf_assocstatus(wlandev, inf);</div><div class='add'>+			break;</div><div class='add'>+		case HFA384x_IT_AUTHREQ:</div><div class='add'>+			prism2sta_inf_authreq(wlandev, inf);</div><div class='add'>+			break;</div><div class='add'>+		case HFA384x_IT_PSUSERCNT:</div><div class='add'>+			prism2sta_inf_psusercnt(wlandev, inf);</div><div class='add'>+			break;</div><div class='add'>+	        case HFA384x_IT_KEYIDCHANGED:</div><div class='add'>+			WLAN_LOG_WARNING("Unhandled IT_KEYIDCHANGED\n");</div><div class='add'>+			break;</div><div class='add'>+	        case HFA384x_IT_ASSOCREQ:</div><div class='add'>+			WLAN_LOG_WARNING("Unhandled IT_ASSOCREQ\n");</div><div class='add'>+			break;</div><div class='add'>+	        case HFA384x_IT_MICFAILURE:</div><div class='add'>+			WLAN_LOG_WARNING("Unhandled IT_MICFAILURE\n");</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			WLAN_LOG_WARNING(</div><div class='add'>+				"Unknown info type=0x%02x\n", inf-&gt;infotype);</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2sta_ev_txexc</div><div class='add'>+*</div><div class='add'>+* Handles the TxExc event.  A Transmit Exception event indicates</div><div class='add'>+* that the MAC's TX process was unsuccessful - so the packet did</div><div class='add'>+* not get transmitted.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		wlan device structure</div><div class='add'>+*	status		tx frame status word</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	nothing</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	interrupt</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+void prism2sta_ev_txexc(wlandevice_t *wlandev, UINT16 status)</div><div class='add'>+{</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	WLAN_LOG_DEBUG(3, "TxExc status=0x%x.\n", status);</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2sta_ev_tx</div><div class='add'>+*</div><div class='add'>+* Handles the Tx event.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		wlan device structure</div><div class='add'>+*	status		tx frame status word</div><div class='add'>+* Returns:</div><div class='add'>+*	nothing</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	interrupt</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+void prism2sta_ev_tx(wlandevice_t *wlandev, UINT16 status)</div><div class='add'>+{</div><div class='add'>+	DBFENTER;</div><div class='add'>+	WLAN_LOG_DEBUG(4, "Tx Complete, status=0x%04x\n", status);</div><div class='add'>+	/* update linux network stats */</div><div class='add'>+	wlandev-&gt;linux_stats.tx_packets++;</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2sta_ev_rx</div><div class='add'>+*</div><div class='add'>+* Handles the Rx event.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		wlan device structure</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	nothing</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	interrupt</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+void prism2sta_ev_rx(wlandevice_t *wlandev, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	p80211netdev_rx(wlandev, skb);</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* prism2sta_ev_alloc</div><div class='add'>+*</div><div class='add'>+* Handles the Alloc event.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	wlandev		wlan device structure</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	nothing</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	interrupt</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+void prism2sta_ev_alloc(wlandevice_t *wlandev)</div><div class='add'>+{</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	p80211netdev_wake_queue(wlandev);</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#if (WLAN_HOSTIF == WLAN_PLX || WLAN_HOSTIF == WLAN_PCI)</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+static int prism2sta_suspend_pci(struct pci_dev *pdev, pm_message_t state)</div><div class='add'>+{</div><div class='add'>+       	wlandevice_t		*wlandev;</div><div class='add'>+</div><div class='add'>+	wlandev = (wlandevice_t *) pci_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	/* reset hardware */</div><div class='add'>+	if (wlandev) {</div><div class='add'>+		prism2sta_ifstate(wlandev, P80211ENUM_ifstate_disable);</div><div class='add'>+		p80211_suspend(wlandev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	// call a netif_device_detach(wlandev-&gt;netdev) ?</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int prism2sta_resume_pci (struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+       	wlandevice_t		*wlandev;</div><div class='add'>+</div><div class='add'>+	wlandev = (wlandevice_t *) pci_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	if (wlandev) {</div><div class='add'>+		prism2sta_ifstate(wlandev, P80211ENUM_ifstate_disable);</div><div class='add'>+		p80211_resume(wlandev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+        return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------</div><div class='add'>+* create_wlan</div><div class='add'>+*</div><div class='add'>+* Called at module init time.  This creates the wlandevice_t structure</div><div class='add'>+* and initializes it with relevant bits.</div><div class='add'>+*</div><div class='add'>+* Arguments:</div><div class='add'>+*	none</div><div class='add'>+*</div><div class='add'>+* Returns:</div><div class='add'>+*	the created wlandevice_t structure.</div><div class='add'>+*</div><div class='add'>+* Side effects:</div><div class='add'>+* 	also allocates the priv/hw structures.</div><div class='add'>+*</div><div class='add'>+* Call context:</div><div class='add'>+*	process thread</div><div class='add'>+*</div><div class='add'>+----------------------------------------------------------------*/</div><div class='add'>+static wlandevice_t *create_wlan(void)</div><div class='add'>+{</div><div class='add'>+        wlandevice_t    *wlandev = NULL;</div><div class='add'>+	hfa384x_t	*hw = NULL;</div><div class='add'>+</div><div class='add'>+      	/* Alloc our structures */</div><div class='add'>+	wlandev =	kmalloc(sizeof(wlandevice_t), GFP_KERNEL);</div><div class='add'>+	hw =		kmalloc(sizeof(hfa384x_t), GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (!wlandev || !hw) {</div><div class='add'>+		WLAN_LOG_ERROR("%s: Memory allocation failure.\n", dev_info);</div><div class='add'>+		if (wlandev)	kfree(wlandev);</div><div class='add'>+		if (hw)		kfree(hw);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Clear all the structs */</div><div class='add'>+	memset(wlandev, 0, sizeof(wlandevice_t));</div><div class='add'>+	memset(hw, 0, sizeof(hfa384x_t));</div><div class='add'>+</div><div class='add'>+	/* Initialize the network device object. */</div><div class='add'>+	wlandev-&gt;nsdname = dev_info;</div><div class='add'>+	wlandev-&gt;msdstate = WLAN_MSD_HWPRESENT_PENDING;</div><div class='add'>+	wlandev-&gt;priv = hw;</div><div class='add'>+	wlandev-&gt;open = prism2sta_open;</div><div class='add'>+	wlandev-&gt;close = prism2sta_close;</div><div class='add'>+	wlandev-&gt;reset = prism2sta_reset;</div><div class='add'>+#ifdef CONFIG_PROC_FS</div><div class='add'>+	wlandev-&gt;nsd_proc_read = prism2sta_proc_read;</div><div class='add'>+#endif</div><div class='add'>+	wlandev-&gt;txframe = prism2sta_txframe;</div><div class='add'>+	wlandev-&gt;mlmerequest = prism2sta_mlmerequest;</div><div class='add'>+	wlandev-&gt;set_multicast_list = prism2sta_setmulticast;</div><div class='add'>+	wlandev-&gt;tx_timeout = hfa384x_tx_timeout;</div><div class='add'>+</div><div class='add'>+	wlandev-&gt;nsdcaps = P80211_NSDCAP_HWFRAGMENT |</div><div class='add'>+	                   P80211_NSDCAP_AUTOJOIN;</div><div class='add'>+</div><div class='add'>+	/* Initialize the device private data stucture. */</div><div class='add'>+        hw-&gt;dot11_desired_bss_type = 1;</div><div class='add'>+</div><div class='add'>+	return wlandev;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PROC_FS</div><div class='add'>+static int</div><div class='add'>+prism2sta_proc_read(</div><div class='add'>+	char	*page,</div><div class='add'>+	char	**start,</div><div class='add'>+	off_t	offset,</div><div class='add'>+	int	count,</div><div class='add'>+	int	*eof,</div><div class='add'>+	void	*data)</div><div class='add'>+{</div><div class='add'>+	char	 *p = page;</div><div class='add'>+	wlandevice_t *wlandev = (wlandevice_t *) data;</div><div class='add'>+	hfa384x_t *hw = (hfa384x_t *) wlandev-&gt;priv;</div><div class='add'>+</div><div class='add'>+	UINT16 hwtype = 0;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+	if (offset != 0) {</div><div class='add'>+		*eof = 1;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	// XXX 0x0001 for prism2.5/3, 0x0000 for prism2.</div><div class='add'>+	hwtype = BIT0;</div><div class='add'>+</div><div class='add'>+#if (WLAN_HOSTIF != WLAN_USB)</div><div class='add'>+	if (hw-&gt;isram16)</div><div class='add'>+		hwtype |= BIT1;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if (WLAN_HOSTIF == WLAN_PCI)</div><div class='add'>+	hwtype |= BIT2;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define PRISM2_CVS_ID "$Id: prism2sta.c 1826 2007-03-19 15:37:00Z pizza $"</div><div class='add'>+</div><div class='add'>+	p += sprintf(p, "# %s version %s (%s) '%s'\n\n",</div><div class='add'>+		     dev_info,</div><div class='add'>+		     WLAN_RELEASE, WLAN_BUILD_DATE, PRISM2_CVS_ID);</div><div class='add'>+</div><div class='add'>+	p += sprintf(p, "# nic h/w: id=0x%02x %d.%d.%d\n",</div><div class='add'>+		     hw-&gt;ident_nic.id, hw-&gt;ident_nic.major,</div><div class='add'>+		     hw-&gt;ident_nic.minor, hw-&gt;ident_nic.variant);</div><div class='add'>+</div><div class='add'>+	p += sprintf(p, "# pri f/w: id=0x%02x %d.%d.%d\n",</div><div class='add'>+		     hw-&gt;ident_pri_fw.id, hw-&gt;ident_pri_fw.major,</div><div class='add'>+		     hw-&gt;ident_pri_fw.minor, hw-&gt;ident_pri_fw.variant);</div><div class='add'>+</div><div class='add'>+	if (hw-&gt;ident_sta_fw.id == 0x1f) {</div><div class='add'>+		p += sprintf(p, "# sta f/w: id=0x%02x %d.%d.%d\n",</div><div class='add'>+			     hw-&gt;ident_sta_fw.id, hw-&gt;ident_sta_fw.major,</div><div class='add'>+			     hw-&gt;ident_sta_fw.minor, hw-&gt;ident_sta_fw.variant);</div><div class='add'>+	} else {</div><div class='add'>+		p += sprintf(p, "# ap f/w: id=0x%02x %d.%d.%d\n",</div><div class='add'>+			     hw-&gt;ident_sta_fw.id, hw-&gt;ident_sta_fw.major,</div><div class='add'>+			     hw-&gt;ident_sta_fw.minor, hw-&gt;ident_sta_fw.variant);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#if (WLAN_HOSTIF != WLAN_USB)</div><div class='add'>+	p += sprintf(p, "# initial nic hw type, needed for SSF ramdl\n");</div><div class='add'>+	p += sprintf(p, "initnichw=%04x\n", hwtype);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+ exit:</div><div class='add'>+	DBFEXIT;</div><div class='add'>+	return (p - page);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+void prism2sta_commsqual_defer(struct work_struct *data)</div><div class='add'>+{</div><div class='add'>+	hfa384x_t		*hw = container_of(data, struct hfa384x, commsqual_bh);</div><div class='add'>+        wlandevice_t            *wlandev = hw-&gt;wlandev;</div><div class='add'>+	hfa384x_bytestr32_t ssid;</div><div class='add'>+	int result = 0;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	if (hw-&gt;wlandev-&gt;hwremoved)</div><div class='add'>+		goto done;</div><div class='add'>+</div><div class='add'>+	/* we don't care if we're in AP mode */</div><div class='add'>+	if ((wlandev-&gt;macmode == WLAN_MACMODE_NONE) ||</div><div class='add'>+	    (wlandev-&gt;macmode == WLAN_MACMODE_ESS_AP)) {</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* It only makes sense to poll these in non-IBSS */</div><div class='add'>+	if (wlandev-&gt;macmode != WLAN_MACMODE_IBSS_STA) {</div><div class='add'>+		result = hfa384x_drvr_getconfig(hw, HFA384x_RID_DBMCOMMSQUALITY,</div><div class='add'>+						&amp;hw-&gt;qual,</div><div class='add'>+						HFA384x_RID_DBMCOMMSQUALITY_LEN);</div><div class='add'>+</div><div class='add'>+		if (result) {</div><div class='add'>+			WLAN_LOG_ERROR("error fetching commsqual\n");</div><div class='add'>+			goto done;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		// qual.CQ_currBSS; // link</div><div class='add'>+		// ASL_currBSS;  // level</div><div class='add'>+		// qual.ANL_currFC; // noise</div><div class='add'>+</div><div class='add'>+		WLAN_LOG_DEBUG(3, "commsqual %d %d %d\n",</div><div class='add'>+			       hfa384x2host_16(hw-&gt;qual.CQ_currBSS),</div><div class='add'>+			       hfa384x2host_16(hw-&gt;qual.ASL_currBSS),</div><div class='add'>+			       hfa384x2host_16(hw-&gt;qual.ANL_currFC));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Lastly, we need to make sure the BSSID didn't change on us */</div><div class='add'>+	result = hfa384x_drvr_getconfig(hw,</div><div class='add'>+					HFA384x_RID_CURRENTBSSID,</div><div class='add'>+					wlandev-&gt;bssid, WLAN_BSSID_LEN);</div><div class='add'>+	if ( result ) {</div><div class='add'>+		WLAN_LOG_DEBUG(1,</div><div class='add'>+			       "getconfig(0x%02x) failed, result = %d\n",</div><div class='add'>+			       HFA384x_RID_CURRENTBSSID, result);</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	result = hfa384x_drvr_getconfig(hw,</div><div class='add'>+					HFA384x_RID_CURRENTSSID,</div><div class='add'>+					&amp;ssid, sizeof(ssid));</div><div class='add'>+	if ( result ) {</div><div class='add'>+		WLAN_LOG_DEBUG(1,</div><div class='add'>+			       "getconfig(0x%02x) failed, result = %d\n",</div><div class='add'>+			       HFA384x_RID_CURRENTSSID, result);</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+	prism2mgmt_bytestr2pstr((hfa384x_bytestr_t *)&amp;ssid,</div><div class='add'>+				(p80211pstrd_t *) &amp;wlandev-&gt;ssid);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	/* Reschedule timer */</div><div class='add'>+	mod_timer(&amp;hw-&gt;commsqual_timer, jiffies + HZ);</div><div class='add'>+</div><div class='add'>+ done:</div><div class='add'>+	DBFEXIT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void prism2sta_commsqual_timer(unsigned long data)</div><div class='add'>+{</div><div class='add'>+        hfa384x_t               *hw = (hfa384x_t *) data;</div><div class='add'>+</div><div class='add'>+	DBFENTER;</div><div class='add'>+</div><div class='add'>+	schedule_work(&amp;hw-&gt;commsqual_bh);</div><div class='add'>+</div><div class='add'>+	DBFEXIT;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/staging/wlan-ng/version.h b/drivers/staging/wlan-ng/version.h<br/>new file mode 100644<br/>index 000000000000..305f88239446<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/wlan-ng/version.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/wlan-ng/version.h</a></div><div class='hunk'>@@ -0,0 +1,64 @@</div><div class='add'>+/* src/include/wlan/version.h</div><div class='add'>+*</div><div class='add'>+*</div><div class='add'>+* Copyright (C) 1999 AbsoluteValue Systems, Inc.  All Rights Reserved.</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* linux-wlan</div><div class='add'>+*</div><div class='add'>+*   The contents of this file are subject to the Mozilla Public</div><div class='add'>+*   License Version 1.1 (the "License"); you may not use this file</div><div class='add'>+*   except in compliance with the License. You may obtain a copy of</div><div class='add'>+*   the License at http://www.mozilla.org/MPL/</div><div class='add'>+*</div><div class='add'>+*   Software distributed under the License is distributed on an "AS</div><div class='add'>+*   IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or</div><div class='add'>+*   implied. See the License for the specific language governing</div><div class='add'>+*   rights and limitations under the License.</div><div class='add'>+*</div><div class='add'>+*   Alternatively, the contents of this file may be used under the</div><div class='add'>+*   terms of the GNU Public License version 2 (the "GPL"), in which</div><div class='add'>+*   case the provisions of the GPL are applicable instead of the</div><div class='add'>+*   above.  If you wish to allow the use of your version of this file</div><div class='add'>+*   only under the terms of the GPL and not to allow others to use</div><div class='add'>+*   your version of this file under the MPL, indicate your decision</div><div class='add'>+*   by deleting the provisions above and replace them with the notice</div><div class='add'>+*   and other provisions required by the GPL.  If you do not delete</div><div class='add'>+*   the provisions above, a recipient may use your version of this</div><div class='add'>+*   file under either the MPL or the GPL.</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* Inquiries regarding the linux-wlan Open Source project can be</div><div class='add'>+* made directly to:</div><div class='add'>+*</div><div class='add'>+* AbsoluteValue Systems Inc.</div><div class='add'>+* info@linux-wlan.com</div><div class='add'>+* http://www.linux-wlan.com</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* Portions of the development of this software were funded by</div><div class='add'>+* Intersil Corporation as part of PRISM(R) chipset product development.</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*/</div><div class='add'>+#ifndef _WLAN_VERSION_H</div><div class='add'>+#define _WLAN_VERSION_H</div><div class='add'>+#ifndef KERNEL_VERSION</div><div class='add'>+#define KERNEL_VERSION(a,b,c) (((a) &lt;&lt; 16) + ((b) &lt;&lt; 8) + (c))</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* WLAN_HOSTIF (generally set on the command line, not detected) */</div><div class='add'>+#define WLAN_NONE                       0</div><div class='add'>+#define WLAN_PCMCIA                     1</div><div class='add'>+#define WLAN_ISA                        2</div><div class='add'>+#define WLAN_PCI                        3</div><div class='add'>+#define WLAN_USB                        4</div><div class='add'>+#define WLAN_PLX                        5</div><div class='add'>+#define WLAN_SLAVE                      6</div><div class='add'>+#define WLAN_RELEASE	"0.2.8"</div><div class='add'>+#define WLAN_RELEASE_CODE 0x000208</div><div class='add'>+#define WLAN_BUILD_DATE "Thu Oct  2 11:04:42 PDT 2008"</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/staging/wlan-ng/wlan_compat.h b/drivers/staging/wlan-ng/wlan_compat.h<br/>new file mode 100644<br/>index 000000000000..17026570708f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/staging/wlan-ng/wlan_compat.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/staging/wlan-ng/wlan_compat.h</a></div><div class='hunk'>@@ -0,0 +1,757 @@</div><div class='add'>+/* wlan_compat.h</div><div class='add'>+*</div><div class='add'>+* Types and macros to aid in portability</div><div class='add'>+*</div><div class='add'>+* Copyright (C) 1999 AbsoluteValue Systems, Inc.  All Rights Reserved.</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* linux-wlan</div><div class='add'>+*</div><div class='add'>+*   The contents of this file are subject to the Mozilla Public</div><div class='add'>+*   License Version 1.1 (the "License"); you may not use this file</div><div class='add'>+*   except in compliance with the License. You may obtain a copy of</div><div class='add'>+*   the License at http://www.mozilla.org/MPL/</div><div class='add'>+*</div><div class='add'>+*   Software distributed under the License is distributed on an "AS</div><div class='add'>+*   IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or</div><div class='add'>+*   implied. See the License for the specific language governing</div><div class='add'>+*   rights and limitations under the License.</div><div class='add'>+*</div><div class='add'>+*   Alternatively, the contents of this file may be used under the</div><div class='add'>+*   terms of the GNU Public License version 2 (the "GPL"), in which</div><div class='add'>+*   case the provisions of the GPL are applicable instead of the</div><div class='add'>+*   above.  If you wish to allow the use of your version of this file</div><div class='add'>+*   only under the terms of the GPL and not to allow others to use</div><div class='add'>+*   your version of this file under the MPL, indicate your decision</div><div class='add'>+*   by deleting the provisions above and replace them with the notice</div><div class='add'>+*   and other provisions required by the GPL.  If you do not delete</div><div class='add'>+*   the provisions above, a recipient may use your version of this</div><div class='add'>+*   file under either the MPL or the GPL.</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* Inquiries regarding the linux-wlan Open Source project can be</div><div class='add'>+* made directly to:</div><div class='add'>+*</div><div class='add'>+* AbsoluteValue Systems Inc.</div><div class='add'>+* info@linux-wlan.com</div><div class='add'>+* http://www.linux-wlan.com</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*</div><div class='add'>+* Portions of the development of this software were funded by</div><div class='add'>+* Intersil Corporation as part of PRISM(R) chipset product development.</div><div class='add'>+*</div><div class='add'>+* --------------------------------------------------------------------</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#ifndef _WLAN_COMPAT_H</div><div class='add'>+#define _WLAN_COMPAT_H</div><div class='add'>+</div><div class='add'>+/*=============================================================*/</div><div class='add'>+/*------ Establish Platform Identity --------------------------*/</div><div class='add'>+/*=============================================================*/</div><div class='add'>+/* Key macros: */</div><div class='add'>+/* WLAN_CPU_FAMILY */</div><div class='add'>+	#define WLAN_Ix86			1</div><div class='add'>+	#define WLAN_PPC			2</div><div class='add'>+	#define WLAN_Ix96			3</div><div class='add'>+	#define WLAN_ARM			4</div><div class='add'>+	#define WLAN_ALPHA			5</div><div class='add'>+	#define WLAN_MIPS			6</div><div class='add'>+	#define WLAN_HPPA			7</div><div class='add'>+	#define WLAN_SPARC			8</div><div class='add'>+	#define WLAN_SH    			9</div><div class='add'>+	#define WLAN_x86_64                     10</div><div class='add'>+/* WLAN_SYSARCH */</div><div class='add'>+	#define WLAN_PCAT			1</div><div class='add'>+	#define WLAN_MBX			2</div><div class='add'>+	#define WLAN_RPX			3</div><div class='add'>+	#define WLAN_LWARCH			4</div><div class='add'>+	#define WLAN_PMAC			5</div><div class='add'>+	#define WLAN_SKIFF			6</div><div class='add'>+	#define WLAN_BITSY			7</div><div class='add'>+	#define WLAN_ALPHAARCH			7</div><div class='add'>+	#define WLAN_MIPSARCH			9</div><div class='add'>+	#define WLAN_HPPAARCH			10</div><div class='add'>+	#define WLAN_SPARCARCH			11</div><div class='add'>+	#define WLAN_SHARCH   			12</div><div class='add'>+</div><div class='add'>+/* Note: the PLX HOSTIF above refers to some vendors implementations for */</div><div class='add'>+/*       PCI.  It's a PLX chip that is a PCI to PCMCIA adapter, but it   */</div><div class='add'>+/*       isn't a real PCMCIA host interface adapter providing all the    */</div><div class='add'>+/*       card&amp;socket services.                                           */</div><div class='add'>+</div><div class='add'>+#if (defined(CONFIG_PPC) || defined(CONFIG_8xx) || defined(__powerpc__))</div><div class='add'>+#ifndef __ppc__</div><div class='add'>+#define __ppc__</div><div class='add'>+#endif</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(__KERNEL__)</div><div class='add'>+</div><div class='add'>+#ifndef AUTOCONF_INCLUDED</div><div class='add'>+#include &lt;linux/config.h&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(__x86_64__)</div><div class='add'>+	#define WLAN_CPU_FAMILY		WLAN_x86_64</div><div class='add'>+	#define WLAN_SYSARCH		WLAN_PCAT</div><div class='add'>+#elif defined(__i386__) || defined(__i486__) || defined(__i586__) || defined(__i686__)</div><div class='add'>+	#define WLAN_CPU_FAMILY		WLAN_Ix86</div><div class='add'>+	#define WLAN_SYSARCH		WLAN_PCAT</div><div class='add'>+#elif defined(__ppc__)</div><div class='add'>+	#define WLAN_CPU_FAMILY		WLAN_PPC</div><div class='add'>+	#if defined(CONFIG_MBX)</div><div class='add'>+		#define WLAN_SYSARCH	WLAN_MBX</div><div class='add'>+	#elif defined(CONFIG_RPXLITE)</div><div class='add'>+		#define WLAN_SYSARCH	WLAN_RPX</div><div class='add'>+	#elif defined(CONFIG_RPXCLASSIC)</div><div class='add'>+		#define WLAN_SYSARCH	WLAN_RPX</div><div class='add'>+	#else</div><div class='add'>+		#define WLAN_SYSARCH	WLAN_PMAC</div><div class='add'>+	#endif</div><div class='add'>+#elif defined(__arm__)</div><div class='add'>+	#define WLAN_CPU_FAMILY		WLAN_ARM</div><div class='add'>+	#define WLAN_SYSARCH		WLAN_SKIFF</div><div class='add'>+#elif defined(__alpha__)</div><div class='add'>+	#define WLAN_CPU_FAMILY		WLAN_ALPHA</div><div class='add'>+	#define WLAN_SYSARCH		WLAN_ALPHAARCH</div><div class='add'>+#elif defined(__mips__)</div><div class='add'>+	#define WLAN_CPU_FAMILY		WLAN_MIPS</div><div class='add'>+	#define WLAN_SYSARCH		WLAN_MIPSARCH</div><div class='add'>+#elif defined(__hppa__)</div><div class='add'>+	#define WLAN_CPU_FAMILY		WLAN_HPPA</div><div class='add'>+	#define WLAN_SYSARCH		WLAN_HPPAARCH</div><div class='add'>+#elif defined(__sparc__)</div><div class='add'>+        #define WLAN_CPU_FAMILY         WLAN_SPARC</div><div class='add'>+        #define WLAN_SYSARCH            WLAN_SPARC</div><div class='add'>+#elif defined(__sh__)</div><div class='add'>+        #define WLAN_CPU_FAMILY         WLAN_SH</div><div class='add'>+        #define WLAN_SYSARCH            WLAN_SHARCH</div><div class='add'>+        #ifndef __LITTLE_ENDIAN__</div><div class='add'>+        #define __LITTLE_ENDIAN__</div><div class='add'>+        #endif</div><div class='add'>+#else</div><div class='add'>+	#error "No CPU identified!"</div><div class='add'>+#endif</div><div class='add'>+#endif /* __KERNEL__ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+   Some big endian machines implicitly do all I/O in little endian mode.</div><div class='add'>+</div><div class='add'>+   In particular:</div><div class='add'>+          Linux/PPC on PowerMacs (PCI)</div><div class='add'>+	  Arm/Intel Xscale (PCI)</div><div class='add'>+</div><div class='add'>+   This may also affect PLX boards and other BE &amp;| PPC platforms;</div><div class='add'>+   as new ones are discovered, add them below.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#if defined(WLAN_HOSTIF)</div><div class='add'>+#if ((WLAN_HOSTIF == WLAN_PCI) || (WLAN_HOSTIF == WLAN_PLX))</div><div class='add'>+#if ((WLAN_SYSARCH == WLAN_SKIFF) || (WLAN_SYSARCH == WLAN_PMAC) || (WLAN_SYSARCH == WLAN_SPARC))</div><div class='add'>+#define REVERSE_ENDIAN</div><div class='add'>+#endif</div><div class='add'>+#endif</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*=============================================================*/</div><div class='add'>+/*------ Bit settings -----------------------------------------*/</div><div class='add'>+/*=============================================================*/</div><div class='add'>+</div><div class='add'>+#define BIT0	0x00000001</div><div class='add'>+#define BIT1	0x00000002</div><div class='add'>+#define BIT2	0x00000004</div><div class='add'>+#define BIT3	0x00000008</div><div class='add'>+#define BIT4	0x00000010</div><div class='add'>+#define BIT5	0x00000020</div><div class='add'>+#define BIT6	0x00000040</div><div class='add'>+#define BIT7	0x00000080</div><div class='add'>+#define BIT8	0x00000100</div><div class='add'>+#define BIT9	0x00000200</div><div class='add'>+#define BIT10	0x00000400</div><div class='add'>+#define BIT11	0x00000800</div><div class='add'>+#define BIT12	0x00001000</div><div class='add'>+#define BIT13	0x00002000</div><div class='add'>+#define BIT14	0x00004000</div><div class='add'>+#define BIT15	0x00008000</div><div class='add'>+#define BIT16	0x00010000</div><div class='add'>+#define BIT17	0x00020000</div><div class='add'>+#define BIT18	0x00040000</div><div class='add'>+#define BIT19	0x00080000</div><div class='add'>+#define BIT20	0x00100000</div><div class='add'>+#define BIT21	0x00200000</div><div class='add'>+#define BIT22	0x00400000</div><div class='add'>+#define BIT23	0x00800000</div><div class='add'>+#define BIT24	0x01000000</div><div class='add'>+#define BIT25	0x02000000</div><div class='add'>+#define BIT26	0x04000000</div><div class='add'>+#define BIT27	0x08000000</div><div class='add'>+#define BIT28	0x10000000</div><div class='add'>+#define BIT29	0x20000000</div><div class='add'>+#define BIT30	0x40000000</div><div class='add'>+#define BIT31	0x80000000</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+typedef u_int8_t	UINT8;</div><div class='add'>+typedef u_int16_t	UINT16;</div><div class='add'>+typedef u_int32_t	UINT32;</div><div class='add'>+</div><div class='add'>+typedef int8_t		INT8;</div><div class='add'>+typedef int16_t		INT16;</div><div class='add'>+typedef int32_t		INT32;</div><div class='add'>+</div><div class='add'>+typedef unsigned int    UINT;</div><div class='add'>+typedef signed int      INT;</div><div class='add'>+</div><div class='add'>+typedef u_int64_t	UINT64;</div><div class='add'>+typedef int64_t		INT64;</div><div class='add'>+</div><div class='add'>+#define UINT8_MAX	(0xffUL)</div><div class='add'>+#define UINT16_MAX	(0xffffUL)</div><div class='add'>+#define UINT32_MAX	(0xffffffffUL)</div><div class='add'>+</div><div class='add'>+#define INT8_MAX	(0x7fL)</div><div class='add'>+#define INT16_MAX	(0x7fffL)</div><div class='add'>+#define INT32_MAX	(0x7fffffffL)</div><div class='add'>+</div><div class='add'>+/*=============================================================*/</div><div class='add'>+/*------ Compiler Portability Macros --------------------------*/</div><div class='add'>+/*=============================================================*/</div><div class='add'>+#define __WLAN_ATTRIB_PACK__		__attribute__ ((packed))</div><div class='add'>+</div><div class='add'>+/*=============================================================*/</div><div class='add'>+/*------ OS Portability Macros --------------------------------*/</div><div class='add'>+/*=============================================================*/</div><div class='add'>+</div><div class='add'>+#ifndef WLAN_DBVAR</div><div class='add'>+#define WLAN_DBVAR	wlan_debug</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef KERNEL_VERSION</div><div class='add'>+#define KERNEL_VERSION(a,b,c) (((a) &lt;&lt; 16) + ((b) &lt;&lt; 8) + (c))</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if (LINUX_VERSION_CODE &gt;= KERNEL_VERSION(2,6,0))</div><div class='add'>+#  if (LINUX_VERSION_CODE &gt; KERNEL_VERSION(2,6,8))</div><div class='add'>+#    include &lt;linux/hardirq.h&gt;</div><div class='add'>+#  else</div><div class='add'>+#    include &lt;asm/hardirq.h&gt;</div><div class='add'>+#  endif</div><div class='add'>+#elif defined(__KERNEL__)</div><div class='add'>+#  define PREEMPT_MASK  (0x000000FFUL)</div><div class='add'>+#  define preempt_count() (0UL)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define WLAN_LOG_ERROR(x,args...) printk(KERN_ERR "%s: " x , __FUNCTION__ , ##args);</div><div class='add'>+</div><div class='add'>+#define WLAN_LOG_WARNING(x,args...) printk(KERN_WARNING "%s: " x , __FUNCTION__ , ##args);</div><div class='add'>+</div><div class='add'>+#define WLAN_LOG_NOTICE(x,args...) printk(KERN_NOTICE "%s: " x , __FUNCTION__ , ##args);</div><div class='add'>+</div><div class='add'>+#define WLAN_LOG_INFO(args... ) printk(KERN_INFO args)</div><div class='add'>+</div><div class='add'>+#if defined(WLAN_INCLUDE_DEBUG)</div><div class='add'>+	#define WLAN_ASSERT(c) if ((!(c)) &amp;&amp; WLAN_DBVAR &gt;= 1) { \</div><div class='add'>+		WLAN_LOG_DEBUG(1, "Assertion failure!\n"); }</div><div class='add'>+	#define WLAN_HEX_DUMP( l, x, p, n)	if( WLAN_DBVAR &gt;= (l) ){ \</div><div class='add'>+		int __i__; \</div><div class='add'>+		printk(KERN_DEBUG x ":"); \</div><div class='add'>+		for( __i__=0; __i__ &lt; (n); __i__++) \</div><div class='add'>+			printk( " %02x", ((UINT8*)(p))[__i__]); \</div><div class='add'>+		printk("\n"); }</div><div class='add'>+	#define DBFENTER { if ( WLAN_DBVAR &gt;= 5 ){ WLAN_LOG_DEBUG(3,"----&gt;\n"); } }</div><div class='add'>+	#define DBFEXIT  { if ( WLAN_DBVAR &gt;= 5 ){ WLAN_LOG_DEBUG(3,"&lt;----\n"); } }</div><div class='add'>+</div><div class='add'>+	#define WLAN_LOG_DEBUG(l,x,args...) if ( WLAN_DBVAR &gt;= (l)) printk(KERN_DEBUG "%s(%lu): " x ,  __FUNCTION__, (preempt_count() &amp; PREEMPT_MASK), ##args );</div><div class='add'>+#else</div><div class='add'>+	#define WLAN_ASSERT(c)</div><div class='add'>+	#define WLAN_HEX_DUMP( l, s, p, n)</div><div class='add'>+	#define DBFENTER</div><div class='add'>+	#define DBFEXIT</div><div class='add'>+</div><div class='add'>+	#define WLAN_LOG_DEBUG(l, s, args...)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SMP</div><div class='add'>+#define __SMP__			1</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(__KERNEL__)</div><div class='add'>+</div><div class='add'>+#if ((LINUX_VERSION_CODE &lt; KERNEL_VERSION(2,5,0)) || (LINUX_VERSION_CODE &gt;= KERNEL_VERSION(2,6,19)))</div><div class='add'>+#define URB_ONLY_CALLBACK</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if (LINUX_VERSION_CODE &lt; KERNEL_VERSION(2,6,19))</div><div class='add'>+#define PT_REGS    , struct pt_regs *regs</div><div class='add'>+#else</div><div class='add'>+#define PT_REGS</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if (LINUX_VERSION_CODE &lt; KERNEL_VERSION(2,6,7))</div><div class='add'>+#  define del_singleshot_timer_sync(a)  del_timer_sync(a)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if (LINUX_VERSION_CODE &gt;= KERNEL_VERSION(2,4,17))</div><div class='add'>+#define CONFIG_NETLINK		1</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if (LINUX_VERSION_CODE &gt;= KERNEL_VERSION(2,4,0))</div><div class='add'>+#define kfree_s(a, b)	kfree((a))</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if (LINUX_VERSION_CODE &lt; KERNEL_VERSION(2,2,18))</div><div class='add'>+#ifndef init_waitqueue_head</div><div class='add'>+#if (LINUX_VERSION_CODE &lt; KERNEL_VERSION(2,0,16))</div><div class='add'>+#define init_waitqueue_head(p)  (*(p) = NULL)</div><div class='add'>+#else</div><div class='add'>+#define init_waitqueue_head(p)  init_waitqueue(p)</div><div class='add'>+#endif</div><div class='add'>+typedef struct wait_queue *wait_queue_head_t;</div><div class='add'>+typedef struct wait_queue wait_queue_t;</div><div class='add'>+#define set_current_state(b)  { current-&gt;state = (b); mb(); }</div><div class='add'>+#define init_waitqueue_entry(a, b) { (a)-&gt;task = current; }</div><div class='add'>+#endif</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef wait_event_interruptible_timeout</div><div class='add'>+// retval == 0; signal met; we're good.</div><div class='add'>+// retval &lt; 0; interrupted by signal.</div><div class='add'>+// retval &gt; 0; timed out.</div><div class='add'>+</div><div class='add'>+#if (LINUX_VERSION_CODE &gt;= KERNEL_VERSION(2,4,0))  // fixme?</div><div class='add'>+</div><div class='add'>+#define __wait_event_interruptible_timeout(wq, condition, ret)            \</div><div class='add'>+do {                                                                      \</div><div class='add'>+          wait_queue_t __wait;                                            \</div><div class='add'>+          init_waitqueue_entry(&amp;__wait, current);                         \</div><div class='add'>+	                                                                  \</div><div class='add'>+          add_wait_queue(&amp;wq, &amp;__wait);                                   \</div><div class='add'>+          for (;;) {                                                      \</div><div class='add'>+                  set_current_state(TASK_INTERRUPTIBLE);                  \</div><div class='add'>+                  if (condition)                                          \</div><div class='add'>+                          break;                                          \</div><div class='add'>+                  if (!signal_pending(current)) {                         \</div><div class='add'>+                          ret = schedule_timeout(ret)    ;                \</div><div class='add'>+                          if (!ret)                                       \</div><div class='add'>+                                 break;                                   \</div><div class='add'>+                          continue;                                       \</div><div class='add'>+                  }                                                       \</div><div class='add'>+                  ret = -ERESTARTSYS;                                     \</div><div class='add'>+                  break;                                                  \</div><div class='add'>+          }                                                               \</div><div class='add'>+          set_current_state(TASK_RUNNING);                                \</div><div class='add'>+          remove_wait_queue(&amp;wq, &amp;__wait);                                \</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#else // 2.2</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define __wait_event_interruptible_timeout(wq, condition, ret)          \</div><div class='add'>+do {                                                                    \</div><div class='add'>+        struct wait_queue __wait;                                       \</div><div class='add'>+                                                                        \</div><div class='add'>+        __wait.task = current;                                          \</div><div class='add'>+        add_wait_queue(&amp;wq, &amp;__wait);                                   \</div><div class='add'>+        for (;;) {                                                      \</div><div class='add'>+                current-&gt;state = TASK_INTERRUPTIBLE;                    \</div><div class='add'>+                if (condition)                                          \</div><div class='add'>+                        break;                                          \</div><div class='add'>+                if (!signal_pending(current)) {                         \</div><div class='add'>+                        ret = schedule_timeout(ret);                    \</div><div class='add'>+                        if (!ret)                                       \</div><div class='add'>+                               break;                                   \</div><div class='add'>+                        continue;                                       \</div><div class='add'>+                }                                                       \</div><div class='add'>+                ret = -ERESTARTSYS;                                     \</div><div class='add'>+                break;                                                  \</div><div class='add'>+        }                                                               \</div><div class='add'>+        current-&gt;state = TASK_RUNNING;                                  \</div><div class='add'>+        remove_wait_queue(&amp;wq, &amp;__wait);                                \</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#endif  // version &gt;= 2.4</div><div class='add'>+</div><div class='add'>+#define wait_event_interruptible_timeout(wq, condition, timeout)	  \</div><div class='add'>+({									  \</div><div class='add'>+	long __ret = timeout;						  \</div><div class='add'>+	if (!(condition))						  \</div><div class='add'>+		__wait_event_interruptible_timeout(wq, condition, __ret); \</div><div class='add'>+	__ret;								  \</div><div class='add'>+})</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if (LINUX_VERSION_CODE &lt; KERNEL_VERSION(2,4,20))</div><div class='add'>+#ifdef _LINUX_LIST_H</div><div class='add'>+</div><div class='add'>+static inline void list_move_tail(struct list_head *list,</div><div class='add'>+          struct list_head *head)</div><div class='add'>+{</div><div class='add'>+        __list_del(list-&gt;prev, list-&gt;next);</div><div class='add'>+        list_add_tail(list, head);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void __list_splice(struct list_head *list,</div><div class='add'>+				 struct list_head *head)</div><div class='add'>+{</div><div class='add'>+      struct list_head *first = list-&gt;next;</div><div class='add'>+      struct list_head *last = list-&gt;prev;</div><div class='add'>+      struct list_head *at = head-&gt;next;</div><div class='add'>+</div><div class='add'>+      first-&gt;prev = head;</div><div class='add'>+      head-&gt;next = first;</div><div class='add'>+</div><div class='add'>+      last-&gt;next = at;</div><div class='add'>+      at-&gt;prev = last;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void list_move(struct list_head *list, struct list_head *head)</div><div class='add'>+{</div><div class='add'>+      __list_del(list-&gt;prev, list-&gt;next);</div><div class='add'>+      list_add(list, head);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void list_splice_init(struct list_head *list,</div><div class='add'>+            struct list_head *head)</div><div class='add'>+{</div><div class='add'>+	if (!list_empty(list)) {</div><div class='add'>+		__list_splice(list, head);</div><div class='add'>+		INIT_LIST_HEAD(list);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#endif  // LIST_H</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if (LINUX_VERSION_CODE &lt; KERNEL_VERSION(2,1,90))</div><div class='add'>+#define spin_lock(l)            do { } while (0)</div><div class='add'>+#define spin_unlock(l)          do { } while (0)</div><div class='add'>+#define spin_lock_irqsave(l,f)  do { save_flags(f); cli(); } while (0)</div><div class='add'>+#define spin_unlock_irqrestore(l,f) do { restore_flags(f); } while (0)</div><div class='add'>+#define spin_lock_init(s)       do { } while (0)</div><div class='add'>+#define spin_trylock(l)         (1)</div><div class='add'>+typedef int spinlock_t;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if (LINUX_VERSION_CODE &lt; KERNEL_VERSION(2,4,0)) // XXX ???</div><div class='add'>+#define spin_lock_bh         spin_lock</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if (LINUX_VERSION_CODE &lt; KERNEL_VERSION(2,4,0))</div><div class='add'>+#ifdef CONFIG_SMP</div><div class='add'>+#define spin_is_locked(x)       (*(volatile char *)(&amp;(x)-&gt;lock) &lt;= 0)</div><div class='add'>+#else</div><div class='add'>+#define spin_is_locked(l)       (0)</div><div class='add'>+#endif</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if (LINUX_VERSION_CODE &lt; KERNEL_VERSION(2,4,28))</div><div class='add'>+#define __user</div><div class='add'>+#define __iomem</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef _LINUX_PROC_FS_H</div><div class='add'>+#if (LINUX_VERSION_CODE &lt; KERNEL_VERSION(2,3,25))</div><div class='add'>+</div><div class='add'>+extern inline struct proc_dir_entry *</div><div class='add'>+create_proc_read_entry(const char *name, mode_t mode,</div><div class='add'>+                       struct proc_dir_entry *base,</div><div class='add'>+                       read_proc_t *read_proc, void *data)</div><div class='add'>+{</div><div class='add'>+    struct proc_dir_entry *res = create_proc_entry(name, mode, base);</div><div class='add'>+    if (res) {</div><div class='add'>+        res-&gt;read_proc = read_proc;</div><div class='add'>+        res-&gt;data = data;</div><div class='add'>+    }</div><div class='add'>+    return res;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if (LINUX_VERSION_CODE &lt; KERNEL_VERSION(2,3,29))</div><div class='add'>+#ifndef proc_mkdir</div><div class='add'>+#define proc_mkdir(name, root) create_proc_entry(name, S_IFDIR, root)</div><div class='add'>+#endif</div><div class='add'>+#endif</div><div class='add'>+#endif /* _LINUX_PROC_FS_H */</div><div class='add'>+</div><div class='add'>+#if (LINUX_VERSION_CODE &lt; KERNEL_VERSION(2,5,0))</div><div class='add'>+#ifndef INIT_TQUEUE</div><div class='add'>+#define PREPARE_TQUEUE(_tq, _routine, _data)                    \</div><div class='add'>+        do {                                                    \</div><div class='add'>+                (_tq)-&gt;routine = _routine;                      \</div><div class='add'>+                (_tq)-&gt;data = _data;                            \</div><div class='add'>+        } while (0)</div><div class='add'>+#define INIT_TQUEUE(_tq, _routine, _data)                       \</div><div class='add'>+        do {                                                    \</div><div class='add'>+                INIT_LIST_HEAD(&amp;(_tq)-&gt;list);                   \</div><div class='add'>+                (_tq)-&gt;sync = 0;                                \</div><div class='add'>+                PREPARE_TQUEUE((_tq), (_routine), (_data));     \</div><div class='add'>+        } while (0)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef container_of</div><div class='add'>+#define container_of(ptr, type, member) ({			\</div><div class='add'>+        const typeof( ((type *)0)-&gt;member ) *__mptr = (ptr);	\</div><div class='add'>+        (type *)( (char *)__mptr - offsetof(type,member) );})</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef INIT_WORK</div><div class='add'>+#define work_struct tq_struct</div><div class='add'>+</div><div class='add'>+#if (LINUX_VERSION_CODE &lt; KERNEL_VERSION(2,4,0))</div><div class='add'>+#define schedule_work(a)   queue_task(a, &amp;tq_scheduler)</div><div class='add'>+#else</div><div class='add'>+#define schedule_work(a)  schedule_task(a)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define flush_scheduled_work  flush_scheduled_tasks</div><div class='add'>+#define INIT_WORK2(_wq, _routine)  INIT_TQUEUE(_wq, (void (*)(void *))_routine, _wq)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#else // &gt;= 2.5 kernel</div><div class='add'>+</div><div class='add'>+#if LINUX_VERSION_CODE &lt; KERNEL_VERSION(2,6,20)</div><div class='add'>+#define INIT_WORK2(_wq, _routine)	INIT_WORK(_wq, (void (*)(void *))_routine, _wq)</div><div class='add'>+#else</div><div class='add'>+#define INIT_WORK2(_wq, _routine)	INIT_WORK(_wq, _routine)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif // &gt;= 2.5 kernel</div><div class='add'>+</div><div class='add'>+#if (LINUX_VERSION_CODE &lt; KERNEL_VERSION(2,3,38))</div><div class='add'>+typedef struct device netdevice_t;</div><div class='add'>+#elif (LINUX_VERSION_CODE &lt; KERNEL_VERSION(2,4,4))</div><div class='add'>+typedef struct net_device netdevice_t;</div><div class='add'>+#else</div><div class='add'>+#undef netdevice_t</div><div class='add'>+typedef struct net_device netdevice_t;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef WIRELESS_EXT</div><div class='add'>+#if (WIRELESS_EXT &lt; 13)</div><div class='add'>+struct iw_request_info</div><div class='add'>+{</div><div class='add'>+        __u16           cmd;            /* Wireless Extension command */</div><div class='add'>+        __u16           flags;          /* More to come ;-) */</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#if (LINUX_VERSION_CODE &lt; KERNEL_VERSION(2,1,18))</div><div class='add'>+#define MODULE_PARM(a,b)        extern int __bogus_decl</div><div class='add'>+#define MODULE_AUTHOR(a)        extern int __bogus_decl</div><div class='add'>+#define MODULE_DESCRIPTION(a)   extern int __bogus_decl</div><div class='add'>+#define MODULE_SUPPORTED_DEVICE(a) extern int __bogus_decl</div><div class='add'>+#undef  GET_USE_COUNT</div><div class='add'>+#define GET_USE_COUNT(m)        mod_use_count_</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef MODULE_OWNER</div><div class='add'>+#define MODULE_OWNER(a)         extern int __bogus_decl</div><div class='add'>+#define ANCIENT_MODULE_CODE</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef MODULE_LICENSE</div><div class='add'>+#define MODULE_LICENSE(m)       extern int __bogus_decl</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* TODO:  Do we care about this? */</div><div class='add'>+#ifndef MODULE_DEVICE_TABLE</div><div class='add'>+#define MODULE_DEVICE_TABLE(foo,bar)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define wlan_minutes2ticks(a) ((a)*(wlan_ticks_per_sec *  60))</div><div class='add'>+#define wlan_seconds2ticks(a) ((a)*(wlan_ticks_per_sec))</div><div class='add'>+</div><div class='add'>+#if (LINUX_VERSION_CODE &gt; KERNEL_VERSION(2,5,47))</div><div class='add'>+#define NEW_MODULE_CODE</div><div class='add'>+#ifdef ANCIENT_MODULE_CODE</div><div class='add'>+#undef ANCIENT_MODULE_CODE</div><div class='add'>+#endif</div><div class='add'>+#elif (LINUX_VERSION_CODE &lt; KERNEL_VERSION(2,4,25))</div><div class='add'>+#define module_param(name, type, perm)                                       \</div><div class='add'>+        static inline void *__check_existence_##name(void) { return &amp;name; } \</div><div class='add'>+        MODULE_PARM(name, _MODULE_PARM_STRING_ ## type)</div><div class='add'>+</div><div class='add'>+#define _MODULE_PARM_STRING_byte "b"</div><div class='add'>+#define _MODULE_PARM_STRING_short "h"</div><div class='add'>+#define _MODULE_PARM_STRING_ushort "h"</div><div class='add'>+#define _MODULE_PARM_STRING_int "i"</div><div class='add'>+#define _MODULE_PARM_STRING_uint "i"</div><div class='add'>+#define _MODULE_PARM_STRING_long "l"</div><div class='add'>+#define _MODULE_PARM_STRING_ulong "l"</div><div class='add'>+#define _MODULE_PARM_STRING_bool "i"</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* linux &lt; 2.5.69 */</div><div class='add'>+#ifndef IRQ_NONE</div><div class='add'>+typedef void irqreturn_t;</div><div class='add'>+#define IRQ_NONE</div><div class='add'>+#define IRQ_HANDLED</div><div class='add'>+#define IRQ_RETVAL(x)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef in_atomic</div><div class='add'>+#define in_atomic()  0</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if (LINUX_VERSION_CODE &gt; KERNEL_VERSION(2,6,13))</div><div class='add'>+#define URB_ASYNC_UNLINK 0</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if (LINUX_VERSION_CODE &lt; KERNEL_VERSION(2,6,7))</div><div class='add'>+#define URB_ASYNC_UNLINK  USB_ASYNC_UNLINK</div><div class='add'>+#define usb_fill_bulk_urb  FILL_BULK_URB</div><div class='add'>+#define usb_kill_urb  usb_unlink_urb</div><div class='add'>+#else</div><div class='add'>+#define USB_QUEUE_BULK 0</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if (LINUX_VERSION_CODE &lt; KERNEL_VERSION(2,6,11))</div><div class='add'>+typedef u32 pm_message_t;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if (LINUX_VERSION_CODE &gt; KERNEL_VERSION(2,6,9))</div><div class='add'>+#define hotplug_path  "/etc/hotplug/wlan.agent"</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if (LINUX_VERSION_CODE &lt; KERNEL_VERSION(2,6,0))</div><div class='add'>+#define free_netdev(x)       kfree(x)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if (LINUX_VERSION_CODE &lt; KERNEL_VERSION(2,6,9))</div><div class='add'>+#define eth_hdr(x)           (x)-&gt;mac.ethernet</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if (LINUX_VERSION_CODE &lt; KERNEL_VERSION(2,4,0))</div><div class='add'>+#define del_timer_sync(a)       del_timer(a)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef might_sleep</div><div class='add'>+#define might_sleep(a)   do { } while (0)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* Apparently 2.4.2 ethtool is quite different, maybe newer too? */</div><div class='add'>+#if (defined(SIOETHTOOL) &amp;&amp; !defined(ETHTOOL_GDRVINFO))</div><div class='add'>+#undef SIOETHTOOL</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+// pcmcia-cs stuff</div><div class='add'>+#if ((LINUX_VERSION_CODE &lt; KERNEL_VERSION(2,5,68)) &amp;&amp; \</div><div class='add'>+     !defined(pcmcia_access_configuration_register))</div><div class='add'>+#define pcmcia_access_configuration_register(handle, reg) \</div><div class='add'>+        CardServices(AccessConfigurationRegister, handle, reg)</div><div class='add'>+#define pcmcia_register_client(handle, reg) \</div><div class='add'>+        CardServices(RegisterClient, handle, reg)</div><div class='add'>+#define pcmcia_deregister_client(handle) \</div><div class='add'>+        CardServices(DeregisterClient, handle)</div><div class='add'>+#define pcmcia_get_first_tuple(handle, tuple) \</div><div class='add'>+        CardServices(GetFirstTuple, handle, tuple)</div><div class='add'>+#define pcmcia_get_next_tuple(handle, tuple) \</div><div class='add'>+        CardServices(GetNextTuple, handle, tuple)</div><div class='add'>+#define pcmcia_get_tuple_data(handle, tuple) \</div><div class='add'>+        CardServices(GetTupleData, handle, tuple)</div><div class='add'>+#define pcmcia_parse_tuple(handle, tuple, parse) \</div><div class='add'>+        CardServices(ParseTuple, handle, tuple, parse)</div><div class='add'>+#define pcmcia_get_configuration_info(handle, config) \</div><div class='add'>+        CardServices(GetConfigurationInfo, handle, config)</div><div class='add'>+#define pcmcia_request_io(handle, req) \</div><div class='add'>+        CardServices(RequestIO, handle, req)</div><div class='add'>+#define pcmcia_request_irq(handle, req) \</div><div class='add'>+        CardServices(RequestIRQ, handle, req)</div><div class='add'>+#define pcmcia_request_configuration(handle, req) \</div><div class='add'>+        CardServices(RequestConfiguration, handle, req)</div><div class='add'>+#define pcmcia_release_configuration(handle) \</div><div class='add'>+        CardServices(ReleaseConfiguration, handle)</div><div class='add'>+#define pcmcia_release_io(handle, req) \</div><div class='add'>+        CardServices(ReleaseIO, handle, req)</div><div class='add'>+#define pcmcia_release_irq(handle, req) \</div><div class='add'>+        CardServices(ReleaseIRQ, handle, req)</div><div class='add'>+#define pcmcia_release_window(win) \</div><div class='add'>+        CardServices(ReleaseWindow, win)</div><div class='add'>+#define pcmcia_get_card_services_info(info) \</div><div class='add'>+        CardServices(GetCardServicesInfo, info)</div><div class='add'>+#define pcmcia_report_error(handle, err) \</div><div class='add'>+        CardServices(ReportError, handle, err)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif /* __KERNEL__ */</div><div class='add'>+</div><div class='add'>+/*=============================================================*/</div><div class='add'>+/*------ Hardware Portability Macros --------------------------*/</div><div class='add'>+/*=============================================================*/</div><div class='add'>+</div><div class='add'>+#define ieee2host16(n)	__le16_to_cpu(n)</div><div class='add'>+#define ieee2host32(n)	__le32_to_cpu(n)</div><div class='add'>+#define host2ieee16(n)	__cpu_to_le16(n)</div><div class='add'>+#define host2ieee32(n)	__cpu_to_le32(n)</div><div class='add'>+</div><div class='add'>+#if (WLAN_CPU_FAMILY != WLAN_MIPS)</div><div class='add'>+typedef UINT32 phys_t;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if (WLAN_CPU_FAMILY == WLAN_PPC)</div><div class='add'>+       #define wlan_inw(a)                     in_be16((unsigned short *)((a)+_IO_BASE))</div><div class='add'>+       #define wlan_inw_le16_to_cpu(a)         inw((a))</div><div class='add'>+       #define wlan_outw(v,a)                  out_be16((unsigned short *)((a)+_IO_BASE), (v))</div><div class='add'>+       #define wlan_outw_cpu_to_le16(v,a)      outw((v),(a))</div><div class='add'>+#else</div><div class='add'>+       #define wlan_inw(a)                     inw((a))</div><div class='add'>+       #define wlan_inw_le16_to_cpu(a)         __cpu_to_le16(inw((a)))</div><div class='add'>+       #define wlan_outw(v,a)                  outw((v),(a))</div><div class='add'>+       #define wlan_outw_cpu_to_le16(v,a)      outw(__cpu_to_le16((v)),(a))</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*=============================================================*/</div><div class='add'>+/*--- General Macros ------------------------------------------*/</div><div class='add'>+/*=============================================================*/</div><div class='add'>+</div><div class='add'>+#define wlan_max(a, b) (((a) &gt; (b)) ? (a) : (b))</div><div class='add'>+#define wlan_min(a, b) (((a) &lt; (b)) ? (a) : (b))</div><div class='add'>+</div><div class='add'>+#define wlan_isprint(c)	(((c) &gt; (0x19)) &amp;&amp; ((c) &lt; (0x7f)))</div><div class='add'>+</div><div class='add'>+#define wlan_hexchar(x) (((x) &lt; 0x0a) ? ('0' + (x)) : ('a' + ((x) - 0x0a)))</div><div class='add'>+</div><div class='add'>+/* Create a string of printable chars from something that might not be */</div><div class='add'>+/* It's recommended that the str be 4*len + 1 bytes long */</div><div class='add'>+#define wlan_mkprintstr(buf, buflen, str, strlen) \</div><div class='add'>+{ \</div><div class='add'>+	int i = 0; \</div><div class='add'>+	int j = 0; \</div><div class='add'>+	memset(str, 0, (strlen)); \</div><div class='add'>+	for (i = 0; i &lt; (buflen); i++) { \</div><div class='add'>+		if ( wlan_isprint((buf)[i]) ) { \</div><div class='add'>+			(str)[j] = (buf)[i]; \</div><div class='add'>+			j++; \</div><div class='add'>+		} else { \</div><div class='add'>+			(str)[j] = '\\'; \</div><div class='add'>+			(str)[j+1] = 'x'; \</div><div class='add'>+			(str)[j+2] = wlan_hexchar(((buf)[i] &amp; 0xf0) &gt;&gt; 4); \</div><div class='add'>+			(str)[j+3] = wlan_hexchar(((buf)[i] &amp; 0x0f)); \</div><div class='add'>+			j += 4; \</div><div class='add'>+		} \</div><div class='add'>+	} \</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*=============================================================*/</div><div class='add'>+/*--- Variables -----------------------------------------------*/</div><div class='add'>+/*=============================================================*/</div><div class='add'>+</div><div class='add'>+#ifdef WLAN_INCLUDE_DEBUG</div><div class='add'>+extern int wlan_debug;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+extern int wlan_ethconv;		/* What's the default ethconv? */</div><div class='add'>+</div><div class='add'>+/*=============================================================*/</div><div class='add'>+/*--- Functions -----------------------------------------------*/</div><div class='add'>+/*=============================================================*/</div><div class='add'>+#endif /* _WLAN_COMPAT_H */</div><div class='add'>+</div><div class='head'>diff --git a/drivers/telephony/ixj.c b/drivers/telephony/ixj.c<br/>index ec7aeb502d15..41b6530b8f25 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/telephony/ixj.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/telephony/ixj.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/telephony/ixj.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/telephony/ixj.c</a></div><div class='hunk'>@@ -42,8 +42,6 @@</div><div class='ctx'>  ***************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * $Log: ixj.c,v $</div><div class='del'>- *</div><div class='ctx'>  * Revision 4.8  2003/07/09 19:39:00  Daniele Bellucci</div><div class='ctx'>  * Audit some copy_*_user and minor cleanup.</div><div class='ctx'>  *</div><div class='head'>diff --git a/drivers/telephony/ixj_pcmcia.c b/drivers/telephony/ixj_pcmcia.c<br/>index ff9a29b76336..347c3ed1d9f1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/telephony/ixj_pcmcia.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/telephony/ixj_pcmcia.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/telephony/ixj_pcmcia.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/telephony/ixj_pcmcia.c</a></div><div class='hunk'>@@ -124,65 +124,53 @@ static void ixj_get_serial(struct pcmcia_device * link, IXJ * j)</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int ixj_config_check(struct pcmcia_device *p_dev,</div><div class='add'>+			    cistpl_cftable_entry_t *cfg,</div><div class='add'>+			    cistpl_cftable_entry_t *dflt,</div><div class='add'>+			    unsigned int vcc,</div><div class='add'>+			    void *priv_data)</div><div class='add'>+{</div><div class='add'>+	if ((cfg-&gt;io.nwin &gt; 0) || (dflt-&gt;io.nwin &gt; 0)) {</div><div class='add'>+		cistpl_io_t *io = (cfg-&gt;io.nwin) ? &amp;cfg-&gt;io : &amp;dflt-&gt;io;</div><div class='add'>+		p_dev-&gt;io.BasePort1 = io-&gt;win[0].base;</div><div class='add'>+		p_dev-&gt;io.NumPorts1 = io-&gt;win[0].len;</div><div class='add'>+		if (io-&gt;nwin == 2) {</div><div class='add'>+			p_dev-&gt;io.BasePort2 = io-&gt;win[1].base;</div><div class='add'>+			p_dev-&gt;io.NumPorts2 = io-&gt;win[1].len;</div><div class='add'>+		}</div><div class='add'>+		if (!pcmcia_request_io(p_dev, &amp;p_dev-&gt;io))</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ixj_config(struct pcmcia_device * link)</div><div class='ctx'> {</div><div class='ctx'> 	IXJ *j;</div><div class='ctx'> 	ixj_info_t *info;</div><div class='del'>-	tuple_t tuple;</div><div class='del'>-	u_short buf[128];</div><div class='del'>-	cisparse_t parse;</div><div class='del'>-	cistpl_cftable_entry_t *cfg = &amp;parse.cftable_entry;</div><div class='del'>-	cistpl_cftable_entry_t dflt =</div><div class='del'>-	{</div><div class='del'>-		0</div><div class='del'>-	};</div><div class='del'>-	int last_ret, last_fn;</div><div class='add'>+	cistpl_cftable_entry_t dflt = { 0 };</div><div class='add'>+</div><div class='ctx'> 	info = link-&gt;priv;</div><div class='ctx'> 	DEBUG(0, "ixj_config(0x%p)\n", link);</div><div class='del'>-	tuple.TupleData = (cisdata_t *) buf;</div><div class='del'>-	tuple.TupleOffset = 0;</div><div class='del'>-	tuple.TupleDataMax = 255;</div><div class='del'>-	tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;</div><div class='del'>-	tuple.Attributes = 0;</div><div class='del'>-	CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &amp;tuple));</div><div class='del'>-	while (1) {</div><div class='del'>-		if (pcmcia_get_tuple_data(link, &amp;tuple) != 0 ||</div><div class='del'>-				pcmcia_parse_tuple(link, &amp;tuple, &amp;parse) != 0)</div><div class='del'>-			goto next_entry;</div><div class='del'>-		if ((cfg-&gt;io.nwin &gt; 0) || (dflt.io.nwin &gt; 0)) {</div><div class='del'>-			cistpl_io_t *io = (cfg-&gt;io.nwin) ? &amp;cfg-&gt;io : &amp;dflt.io;</div><div class='del'>-			link-&gt;conf.ConfigIndex = cfg-&gt;index;</div><div class='del'>-			link-&gt;io.BasePort1 = io-&gt;win[0].base;</div><div class='del'>-			link-&gt;io.NumPorts1 = io-&gt;win[0].len;</div><div class='del'>-			if (io-&gt;nwin == 2) {</div><div class='del'>-				link-&gt;io.BasePort2 = io-&gt;win[1].base;</div><div class='del'>-				link-&gt;io.NumPorts2 = io-&gt;win[1].len;</div><div class='del'>-			}</div><div class='del'>-			if (pcmcia_request_io(link, &amp;link-&gt;io) != 0)</div><div class='del'>-				goto next_entry;</div><div class='del'>-			/* If we've got this far, we're done */</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	      next_entry:</div><div class='del'>-		if (cfg-&gt;flags &amp; CISTPL_CFTABLE_DEFAULT)</div><div class='del'>-			dflt = *cfg;</div><div class='del'>-		CS_CHECK(GetNextTuple, pcmcia_get_next_tuple(link, &amp;tuple));</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &amp;link-&gt;conf));</div><div class='add'>+	if (pcmcia_loop_config(link, ixj_config_check, &amp;dflt))</div><div class='add'>+		goto cs_failed;</div><div class='add'>+</div><div class='add'>+	if (pcmcia_request_configuration(link, &amp;link-&gt;conf))</div><div class='add'>+		goto cs_failed;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'>  	 *	Register the card with the core.</div><div class='del'>- 	 */	</div><div class='del'>-	j=ixj_pcmcia_probe(link-&gt;io.BasePort1,link-&gt;io.BasePort1 + 0x10);</div><div class='add'>+	 */</div><div class='add'>+	j = ixj_pcmcia_probe(link-&gt;io.BasePort1, link-&gt;io.BasePort1 + 0x10);</div><div class='ctx'> </div><div class='ctx'> 	info-&gt;ndev = 1;</div><div class='ctx'> 	info-&gt;node.major = PHONE_MAJOR;</div><div class='ctx'> 	link-&gt;dev_node = &amp;info-&gt;node;</div><div class='ctx'> 	ixj_get_serial(link, j);</div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='ctx'>       cs_failed:</div><div class='del'>-	cs_error(link, last_fn, last_ret);</div><div class='ctx'> 	ixj_cs_release(link);</div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/uio/Kconfig b/drivers/uio/Kconfig<br/>index 4190be64917f..04b954cfce76 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/uio/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/uio/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/uio/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/uio/Kconfig</a></div><div class='hunk'>@@ -58,4 +58,17 @@ config UIO_SMX</div><div class='ctx'> </div><div class='ctx'> 	  If you compile this as a module, it will be called uio_smx.</div><div class='ctx'> </div><div class='add'>+config UIO_SERCOS3</div><div class='add'>+	tristate "Automata Sercos III PCI card driver"</div><div class='add'>+	default n</div><div class='add'>+	help</div><div class='add'>+	  Userspace I/O interface for the Sercos III PCI card from</div><div class='add'>+	  Automata GmbH. The userspace part of this driver will be</div><div class='add'>+	  available for download from the Automata GmbH web site.</div><div class='add'>+</div><div class='add'>+	  Automata GmbH:        http://www.automataweb.com</div><div class='add'>+	  Sercos III interface: http://www.sercos.com</div><div class='add'>+</div><div class='add'>+	  If you compile this as a module, it will be called uio_sercos3.</div><div class='add'>+</div><div class='ctx'> endif</div><div class='head'>diff --git a/drivers/uio/Makefile b/drivers/uio/Makefile<br/>index 8667bbdef904..e69558149859 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/uio/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/uio/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/uio/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/uio/Makefile</a></div><div class='hunk'>@@ -3,3 +3,4 @@ obj-$(CONFIG_UIO_CIF)	+= uio_cif.o</div><div class='ctx'> obj-$(CONFIG_UIO_PDRV)	+= uio_pdrv.o</div><div class='ctx'> obj-$(CONFIG_UIO_PDRV_GENIRQ)	+= uio_pdrv_genirq.o</div><div class='ctx'> obj-$(CONFIG_UIO_SMX)	+= uio_smx.o</div><div class='add'>+obj-$(CONFIG_UIO_SERCOS3)	+= uio_sercos3.o</div><div class='head'>diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c<br/>index 3a6934bf7131..5dccf057a7dd 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/uio/uio.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/uio/uio.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/uio/uio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/uio/uio.c</a></div><div class='hunk'>@@ -67,6 +67,11 @@ static ssize_t map_size_show(struct uio_mem *mem, char *buf)</div><div class='ctx'> 	return sprintf(buf, "0x%lx\n", mem-&gt;size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static ssize_t map_offset_show(struct uio_mem *mem, char *buf)</div><div class='add'>+{</div><div class='add'>+	return sprintf(buf, "0x%lx\n", mem-&gt;addr &amp; ~PAGE_MASK);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> struct uio_sysfs_entry {</div><div class='ctx'> 	struct attribute attr;</div><div class='ctx'> 	ssize_t (*show)(struct uio_mem *, char *);</div><div class='hunk'>@@ -77,10 +82,13 @@ static struct uio_sysfs_entry addr_attribute =</div><div class='ctx'> 	__ATTR(addr, S_IRUGO, map_addr_show, NULL);</div><div class='ctx'> static struct uio_sysfs_entry size_attribute =</div><div class='ctx'> 	__ATTR(size, S_IRUGO, map_size_show, NULL);</div><div class='add'>+static struct uio_sysfs_entry offset_attribute =</div><div class='add'>+	__ATTR(offset, S_IRUGO, map_offset_show, NULL);</div><div class='ctx'> </div><div class='ctx'> static struct attribute *attrs[] = {</div><div class='ctx'> 	&amp;addr_attribute.attr,</div><div class='ctx'> 	&amp;size_attribute.attr,</div><div class='add'>+	&amp;offset_attribute.attr,</div><div class='ctx'> 	NULL,	/* need to NULL terminate the list of attributes */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -482,15 +490,23 @@ static int uio_vma_fault(struct vm_area_struct *vma, struct vm_fault *vmf)</div><div class='ctx'> {</div><div class='ctx'> 	struct uio_device *idev = vma-&gt;vm_private_data;</div><div class='ctx'> 	struct page *page;</div><div class='add'>+	unsigned long offset;</div><div class='ctx'> </div><div class='ctx'> 	int mi = uio_find_mem_index(vma);</div><div class='ctx'> 	if (mi &lt; 0)</div><div class='ctx'> 		return VM_FAULT_SIGBUS;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * We need to subtract mi because userspace uses offset = N*PAGE_SIZE</div><div class='add'>+	 * to use mem[N].</div><div class='add'>+	 */</div><div class='add'>+	offset = (vmf-&gt;pgoff - mi) &lt;&lt; PAGE_SHIFT;</div><div class='add'>+</div><div class='ctx'> 	if (idev-&gt;info-&gt;mem[mi].memtype == UIO_MEM_LOGICAL)</div><div class='del'>-		page = virt_to_page(idev-&gt;info-&gt;mem[mi].addr);</div><div class='add'>+		page = virt_to_page(idev-&gt;info-&gt;mem[mi].addr + offset);</div><div class='ctx'> 	else</div><div class='del'>-		page = vmalloc_to_page((void*)idev-&gt;info-&gt;mem[mi].addr);</div><div class='add'>+		page = vmalloc_to_page((void *)idev-&gt;info-&gt;mem[mi].addr</div><div class='add'>+							+ offset);</div><div class='ctx'> 	get_page(page);</div><div class='ctx'> 	vmf-&gt;page = page;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -682,9 +698,9 @@ int __uio_register_device(struct module *owner,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err_get_minor;</div><div class='ctx'> </div><div class='del'>-	idev-&gt;dev = device_create_drvdata(uio_class-&gt;class, parent,</div><div class='del'>-					  MKDEV(uio_major, idev-&gt;minor), idev,</div><div class='del'>-					  "uio%d", idev-&gt;minor);</div><div class='add'>+	idev-&gt;dev = device_create(uio_class-&gt;class, parent,</div><div class='add'>+				  MKDEV(uio_major, idev-&gt;minor), idev,</div><div class='add'>+				  "uio%d", idev-&gt;minor);</div><div class='ctx'> 	if (IS_ERR(idev-&gt;dev)) {</div><div class='ctx'> 		printk(KERN_ERR "UIO: device register failed\n");</div><div class='ctx'> 		ret = PTR_ERR(idev-&gt;dev);</div><div class='head'>diff --git a/drivers/uio/uio_pdrv.c b/drivers/uio/uio_pdrv.c<br/>index 0b4ef39cd85d..d494ce9288c3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/uio/uio_pdrv.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/uio/uio_pdrv.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/uio/uio_pdrv.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/uio/uio_pdrv.c</a></div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> #include &lt;linux/uio_driver.h&gt;</div><div class='ctx'> #include &lt;linux/stringify.h&gt;</div><div class='ctx'> </div><div class='del'>-#define DRIVER_NAME "uio"</div><div class='add'>+#define DRIVER_NAME "uio_pdrv"</div><div class='ctx'> </div><div class='ctx'> struct uio_platdata {</div><div class='ctx'> 	struct uio_info *uioinfo;</div><div class='head'>diff --git a/drivers/uio/uio_sercos3.c b/drivers/uio/uio_sercos3.c<br/>new file mode 100644<br/>index 000000000000..a6d1b2bc47f3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/uio/uio_sercos3.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/uio/uio_sercos3.c</a></div><div class='hunk'>@@ -0,0 +1,243 @@</div><div class='add'>+/* sercos3: UIO driver for the Automata Sercos III PCI card</div><div class='add'>+</div><div class='add'>+   Copyright (C) 2008 Linutronix GmbH</div><div class='add'>+     Author: John Ogness &lt;john.ogness@linutronix.de&gt;</div><div class='add'>+</div><div class='add'>+   This is a straight-forward UIO driver, where interrupts are disabled</div><div class='add'>+   by the interrupt handler and re-enabled via a write to the UIO device</div><div class='add'>+   by the userspace-part.</div><div class='add'>+</div><div class='add'>+   The only part that may seem odd is the use of a logical OR when</div><div class='add'>+   storing and restoring enabled interrupts. This is done because the</div><div class='add'>+   userspace-part could directly modify the Interrupt Enable Register</div><div class='add'>+   at any time. To reduce possible conflicts, the kernel driver uses</div><div class='add'>+   a logical OR to make more controlled changes (rather than blindly</div><div class='add'>+   overwriting previous values).</div><div class='add'>+</div><div class='add'>+   Race conditions exist if the userspace-part directly modifies the</div><div class='add'>+   Interrupt Enable Register while in operation. The consequences are</div><div class='add'>+   that certain interrupts would fail to be enabled or disabled. For</div><div class='add'>+   this reason, the userspace-part should only directly modify the</div><div class='add'>+   Interrupt Enable Register at the beginning (to get things going).</div><div class='add'>+   The userspace-part can safely disable interrupts at any time using</div><div class='add'>+   a write to the UIO device.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/uio_driver.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+</div><div class='add'>+/* ID's for SERCOS III PCI card (PLX 9030) */</div><div class='add'>+#define SERCOS_SUB_VENDOR_ID  0x1971</div><div class='add'>+#define SERCOS_SUB_SYSID_3530 0x3530</div><div class='add'>+#define SERCOS_SUB_SYSID_3535 0x3535</div><div class='add'>+#define SERCOS_SUB_SYSID_3780 0x3780</div><div class='add'>+</div><div class='add'>+/* Interrupt Enable Register */</div><div class='add'>+#define IER0_OFFSET 0x08</div><div class='add'>+</div><div class='add'>+/* Interrupt Status Register */</div><div class='add'>+#define ISR0_OFFSET 0x18</div><div class='add'>+</div><div class='add'>+struct sercos3_priv {</div><div class='add'>+	u32 ier0_cache;</div><div class='add'>+	spinlock_t ier0_cache_lock;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* this function assumes ier0_cache_lock is locked! */</div><div class='add'>+static void sercos3_disable_interrupts(struct uio_info *info,</div><div class='add'>+				       struct sercos3_priv *priv)</div><div class='add'>+{</div><div class='add'>+	void __iomem *ier0 = info-&gt;mem[3].internal_addr + IER0_OFFSET;</div><div class='add'>+</div><div class='add'>+	/* add enabled interrupts to cache */</div><div class='add'>+	priv-&gt;ier0_cache |= ioread32(ier0);</div><div class='add'>+</div><div class='add'>+	/* disable interrupts */</div><div class='add'>+	iowrite32(0, ier0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* this function assumes ier0_cache_lock is locked! */</div><div class='add'>+static void sercos3_enable_interrupts(struct uio_info *info,</div><div class='add'>+				      struct sercos3_priv *priv)</div><div class='add'>+{</div><div class='add'>+	void __iomem *ier0 = info-&gt;mem[3].internal_addr + IER0_OFFSET;</div><div class='add'>+</div><div class='add'>+	/* restore previously enabled interrupts */</div><div class='add'>+	iowrite32(ioread32(ier0) | priv-&gt;ier0_cache, ier0);</div><div class='add'>+	priv-&gt;ier0_cache = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t sercos3_handler(int irq, struct uio_info *info)</div><div class='add'>+{</div><div class='add'>+	struct sercos3_priv *priv = info-&gt;priv;</div><div class='add'>+	void __iomem *isr0 = info-&gt;mem[3].internal_addr + ISR0_OFFSET;</div><div class='add'>+	void __iomem *ier0 = info-&gt;mem[3].internal_addr + IER0_OFFSET;</div><div class='add'>+</div><div class='add'>+	if (!(ioread32(isr0) &amp; ioread32(ier0)))</div><div class='add'>+		return IRQ_NONE;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;priv-&gt;ier0_cache_lock);</div><div class='add'>+	sercos3_disable_interrupts(info, priv);</div><div class='add'>+	spin_unlock(&amp;priv-&gt;ier0_cache_lock);</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sercos3_irqcontrol(struct uio_info *info, s32 irq_on)</div><div class='add'>+{</div><div class='add'>+	struct sercos3_priv *priv = info-&gt;priv;</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(&amp;priv-&gt;ier0_cache_lock);</div><div class='add'>+	if (irq_on)</div><div class='add'>+		sercos3_enable_interrupts(info, priv);</div><div class='add'>+	else</div><div class='add'>+		sercos3_disable_interrupts(info, priv);</div><div class='add'>+	spin_unlock_irq(&amp;priv-&gt;ier0_cache_lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sercos3_setup_iomem(struct pci_dev *dev, struct uio_info *info,</div><div class='add'>+			       int n, int pci_bar)</div><div class='add'>+{</div><div class='add'>+	info-&gt;mem[n].addr = pci_resource_start(dev, pci_bar);</div><div class='add'>+	if (!info-&gt;mem[n].addr)</div><div class='add'>+		return -1;</div><div class='add'>+	info-&gt;mem[n].internal_addr = ioremap(pci_resource_start(dev, pci_bar),</div><div class='add'>+					     pci_resource_len(dev, pci_bar));</div><div class='add'>+	if (!info-&gt;mem[n].internal_addr)</div><div class='add'>+		return -1;</div><div class='add'>+	info-&gt;mem[n].size = pci_resource_len(dev, pci_bar);</div><div class='add'>+	info-&gt;mem[n].memtype = UIO_MEM_PHYS;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devinit sercos3_pci_probe(struct pci_dev *dev,</div><div class='add'>+				       const struct pci_device_id *id)</div><div class='add'>+{</div><div class='add'>+	struct uio_info *info;</div><div class='add'>+	struct sercos3_priv *priv;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	info = kzalloc(sizeof(struct uio_info), GFP_KERNEL);</div><div class='add'>+	if (!info)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	priv = kzalloc(sizeof(struct sercos3_priv), GFP_KERNEL);</div><div class='add'>+	if (!priv)</div><div class='add'>+		goto out_free;</div><div class='add'>+</div><div class='add'>+	if (pci_enable_device(dev))</div><div class='add'>+		goto out_free_priv;</div><div class='add'>+</div><div class='add'>+	if (pci_request_regions(dev, "sercos3"))</div><div class='add'>+		goto out_disable;</div><div class='add'>+</div><div class='add'>+	/* we only need PCI BAR's 0, 2, 3, 4, 5 */</div><div class='add'>+	if (sercos3_setup_iomem(dev, info, 0, 0))</div><div class='add'>+		goto out_unmap;</div><div class='add'>+	if (sercos3_setup_iomem(dev, info, 1, 2))</div><div class='add'>+		goto out_unmap;</div><div class='add'>+	if (sercos3_setup_iomem(dev, info, 2, 3))</div><div class='add'>+		goto out_unmap;</div><div class='add'>+	if (sercos3_setup_iomem(dev, info, 3, 4))</div><div class='add'>+		goto out_unmap;</div><div class='add'>+	if (sercos3_setup_iomem(dev, info, 4, 5))</div><div class='add'>+		goto out_unmap;</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;priv-&gt;ier0_cache_lock);</div><div class='add'>+	info-&gt;priv = priv;</div><div class='add'>+	info-&gt;name = "Sercos_III_PCI";</div><div class='add'>+	info-&gt;version = "0.0.1";</div><div class='add'>+	info-&gt;irq = dev-&gt;irq;</div><div class='add'>+	info-&gt;irq_flags = IRQF_DISABLED | IRQF_SHARED;</div><div class='add'>+	info-&gt;handler = sercos3_handler;</div><div class='add'>+	info-&gt;irqcontrol = sercos3_irqcontrol;</div><div class='add'>+</div><div class='add'>+	pci_set_drvdata(dev, info);</div><div class='add'>+</div><div class='add'>+	if (uio_register_device(&amp;dev-&gt;dev, info))</div><div class='add'>+		goto out_unmap;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_unmap:</div><div class='add'>+	for (i = 0; i &lt; 5; i++) {</div><div class='add'>+		if (info-&gt;mem[i].internal_addr)</div><div class='add'>+			iounmap(info-&gt;mem[i].internal_addr);</div><div class='add'>+	}</div><div class='add'>+	pci_release_regions(dev);</div><div class='add'>+out_disable:</div><div class='add'>+	pci_disable_device(dev);</div><div class='add'>+out_free_priv:</div><div class='add'>+	kfree(priv);</div><div class='add'>+out_free:</div><div class='add'>+	kfree(info);</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sercos3_pci_remove(struct pci_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct uio_info *info = pci_get_drvdata(dev);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	uio_unregister_device(info);</div><div class='add'>+	pci_release_regions(dev);</div><div class='add'>+	pci_disable_device(dev);</div><div class='add'>+	pci_set_drvdata(dev, NULL);</div><div class='add'>+	for (i = 0; i &lt; 5; i++) {</div><div class='add'>+		if (info-&gt;mem[i].internal_addr)</div><div class='add'>+			iounmap(info-&gt;mem[i].internal_addr);</div><div class='add'>+	}</div><div class='add'>+	kfree(info-&gt;priv);</div><div class='add'>+	kfree(info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct pci_device_id sercos3_pci_ids[] __devinitdata = {</div><div class='add'>+	{</div><div class='add'>+		.vendor =       PCI_VENDOR_ID_PLX,</div><div class='add'>+		.device =       PCI_DEVICE_ID_PLX_9030,</div><div class='add'>+		.subvendor =    SERCOS_SUB_VENDOR_ID,</div><div class='add'>+		.subdevice =    SERCOS_SUB_SYSID_3530,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.vendor =       PCI_VENDOR_ID_PLX,</div><div class='add'>+		.device =       PCI_DEVICE_ID_PLX_9030,</div><div class='add'>+		.subvendor =    SERCOS_SUB_VENDOR_ID,</div><div class='add'>+		.subdevice =    SERCOS_SUB_SYSID_3535,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.vendor =       PCI_VENDOR_ID_PLX,</div><div class='add'>+		.device =       PCI_DEVICE_ID_PLX_9030,</div><div class='add'>+		.subvendor =    SERCOS_SUB_VENDOR_ID,</div><div class='add'>+		.subdevice =    SERCOS_SUB_SYSID_3780,</div><div class='add'>+	},</div><div class='add'>+	{ 0, }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct pci_driver sercos3_pci_driver = {</div><div class='add'>+	.name = "sercos3",</div><div class='add'>+	.id_table = sercos3_pci_ids,</div><div class='add'>+	.probe = sercos3_pci_probe,</div><div class='add'>+	.remove = sercos3_pci_remove,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init sercos3_init_module(void)</div><div class='add'>+{</div><div class='add'>+	return pci_register_driver(&amp;sercos3_pci_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit sercos3_exit_module(void)</div><div class='add'>+{</div><div class='add'>+	pci_unregister_driver(&amp;sercos3_pci_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(sercos3_init_module);</div><div class='add'>+module_exit(sercos3_exit_module);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("UIO driver for the Automata Sercos III PCI card");</div><div class='add'>+MODULE_AUTHOR("John Ogness &lt;john.ogness@linutronix.de&gt;");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c<br/>index 07228721cafe..06dd114910d4 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/atm/usbatm.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/atm/usbatm.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/atm/usbatm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/atm/usbatm.c</a></div><div class='hunk'>@@ -344,7 +344,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char</div><div class='ctx'> 				__func__, sarb-&gt;len, vcc);</div><div class='ctx'> 		/* discard cells already received */</div><div class='ctx'> 		skb_trim(sarb, 0);</div><div class='del'>-		UDSL_ASSERT(sarb-&gt;tail + ATM_CELL_PAYLOAD &lt;= sarb-&gt;end);</div><div class='add'>+		UDSL_ASSERT(instance, sarb-&gt;tail + ATM_CELL_PAYLOAD &lt;= sarb-&gt;end);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	memcpy(skb_tail_pointer(sarb), source + ATM_CELL_HEADER, ATM_CELL_PAYLOAD);</div><div class='hunk'>@@ -432,7 +432,7 @@ static void usbatm_extract_cells(struct usbatm_data *instance,</div><div class='ctx'> 		unsigned char *cell_buf = instance-&gt;cell_buf;</div><div class='ctx'> 		unsigned int space_left = stride - buf_usage;</div><div class='ctx'> </div><div class='del'>-		UDSL_ASSERT(buf_usage &lt;= stride);</div><div class='add'>+		UDSL_ASSERT(instance, buf_usage &lt;= stride);</div><div class='ctx'> </div><div class='ctx'> 		if (avail_data &gt;= space_left) {</div><div class='ctx'> 			/* add new data and process cell */</div><div class='hunk'>@@ -475,7 +475,7 @@ static unsigned int usbatm_write_cells(struct usbatm_data *instance,</div><div class='ctx'> 	unsigned int stride = instance-&gt;tx_channel.stride;</div><div class='ctx'> </div><div class='ctx'> 	vdbg("%s: skb-&gt;len=%d, avail_space=%u", __func__, skb-&gt;len, avail_space);</div><div class='del'>-	UDSL_ASSERT(!(avail_space % stride));</div><div class='add'>+	UDSL_ASSERT(instance, !(avail_space % stride));</div><div class='ctx'> </div><div class='ctx'> 	for (bytes_written = 0; bytes_written &lt; avail_space &amp;&amp; ctrl-&gt;len;</div><div class='ctx'> 	     bytes_written += stride, target += stride) {</div><div class='hunk'>@@ -547,7 +547,7 @@ static void usbatm_rx_process(unsigned long data)</div><div class='ctx'> 				if (!urb-&gt;iso_frame_desc[i].status) {</div><div class='ctx'> 					unsigned int actual_length = urb-&gt;iso_frame_desc[i].actual_length;</div><div class='ctx'> </div><div class='del'>-					UDSL_ASSERT(actual_length &lt;= packet_size);</div><div class='add'>+					UDSL_ASSERT(instance, actual_length &lt;= packet_size);</div><div class='ctx'> </div><div class='ctx'> 					if (!merge_length)</div><div class='ctx'> 						merge_start = (unsigned char *)urb-&gt;transfer_buffer + urb-&gt;iso_frame_desc[i].offset;</div><div class='hunk'>@@ -640,14 +640,13 @@ static void usbatm_cancel_send(struct usbatm_data *instance,</div><div class='ctx'> </div><div class='ctx'> 	atm_dbg(instance, "%s entered\n", __func__);</div><div class='ctx'> 	spin_lock_irq(&amp;instance-&gt;sndqueue.lock);</div><div class='del'>-	for (skb = instance-&gt;sndqueue.next, n = skb-&gt;next;</div><div class='del'>-	     skb != (struct sk_buff *)&amp;instance-&gt;sndqueue;</div><div class='del'>-	     skb = n, n = skb-&gt;next)</div><div class='add'>+	skb_queue_walk_safe(&amp;instance-&gt;sndqueue, skb, n) {</div><div class='ctx'> 		if (UDSL_SKB(skb)-&gt;atm.vcc == vcc) {</div><div class='ctx'> 			atm_dbg(instance, "%s: popping skb 0x%p\n", __func__, skb);</div><div class='ctx'> 			__skb_unlink(skb, &amp;instance-&gt;sndqueue);</div><div class='ctx'> 			usbatm_pop(vcc, skb);</div><div class='ctx'> 		}</div><div class='add'>+	}</div><div class='ctx'> 	spin_unlock_irq(&amp;instance-&gt;sndqueue.lock);</div><div class='ctx'> </div><div class='ctx'> 	tasklet_disable(&amp;instance-&gt;tx_channel.tasklet);</div><div class='hunk'>@@ -1189,7 +1188,7 @@ int usbatm_usb_probe(struct usb_interface *intf, const struct usb_device_id *id,</div><div class='ctx'> 		struct urb *urb;</div><div class='ctx'> 		unsigned int iso_packets = usb_pipeisoc(channel-&gt;endpoint) ? channel-&gt;buf_size / channel-&gt;packet_size : 0;</div><div class='ctx'> </div><div class='del'>-		UDSL_ASSERT(!usb_pipeisoc(channel-&gt;endpoint) || usb_pipein(channel-&gt;endpoint));</div><div class='add'>+		UDSL_ASSERT(instance, !usb_pipeisoc(channel-&gt;endpoint) || usb_pipein(channel-&gt;endpoint));</div><div class='ctx'> </div><div class='ctx'> 		urb = usb_alloc_urb(iso_packets, GFP_KERNEL);</div><div class='ctx'> 		if (!urb) {</div><div class='head'>diff --git a/drivers/usb/atm/usbatm.h b/drivers/usb/atm/usbatm.h<br/>index e6887c6cf3cf..f6f4508a9d42 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/atm/usbatm.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/atm/usbatm.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/atm/usbatm.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/atm/usbatm.h</a></div><div class='hunk'>@@ -40,9 +40,15 @@</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='del'>-#define UDSL_ASSERT(x)	BUG_ON(!(x))</div><div class='add'>+#define UDSL_ASSERT(instance, x)	BUG_ON(!(x))</div><div class='ctx'> #else</div><div class='del'>-#define UDSL_ASSERT(x)	do { if (!(x)) warn("failed assertion '%s' at line %d", __stringify(x), __LINE__); } while(0)</div><div class='add'>+#define UDSL_ASSERT(instance, x)					\</div><div class='add'>+	do {	\</div><div class='add'>+		if (!(x))						\</div><div class='add'>+			dev_warn(&amp;(instance)-&gt;usb_intf-&gt;dev,		\</div><div class='add'>+				 "failed assertion '%s' at line %d",	\</div><div class='add'>+				 __stringify(x), __LINE__);		\</div><div class='add'>+	} while(0)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #define usb_err(instance, format, arg...)	\</div><div class='head'>diff --git a/drivers/usb/atm/xusbatm.c b/drivers/usb/atm/xusbatm.c<br/>index 8472543eee81..17d167bbd2dc 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/atm/xusbatm.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/atm/xusbatm.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/atm/xusbatm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/atm/xusbatm.c</a></div><div class='hunk'>@@ -193,7 +193,7 @@ static int __init xusbatm_init(void)</div><div class='ctx'> 	    num_vendor != num_product ||</div><div class='ctx'> 	    num_vendor != num_rx_endpoint ||</div><div class='ctx'> 	    num_vendor != num_tx_endpoint) {</div><div class='del'>-		warn("malformed module parameters");</div><div class='add'>+		printk(KERN_WARNING "xusbatm: malformed module parameters\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/usb/class/Kconfig b/drivers/usb/class/Kconfig<br/>index 66f17ed88cb5..2519e320098f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/class/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/class/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/class/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/class/Kconfig</a></div><div class='hunk'>@@ -40,3 +40,13 @@ config USB_WDM</div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='ctx'> 	  module will be called cdc-wdm.</div><div class='ctx'> </div><div class='add'>+config USB_TMC</div><div class='add'>+	tristate "USB Test and Measurement Class support"</div><div class='add'>+	depends on USB</div><div class='add'>+	help</div><div class='add'>+	  Say Y here if you want to connect a USB device that follows</div><div class='add'>+	  the USB.org specification for USB Test and Measurement devices</div><div class='add'>+	  to your computer's USB port.</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here: the</div><div class='add'>+	  module will be called usbtmc.</div><div class='head'>diff --git a/drivers/usb/class/Makefile b/drivers/usb/class/Makefile<br/>index 535d59a30600..32e85277b5cf 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/class/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/class/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/class/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/class/Makefile</a></div><div class='hunk'>@@ -6,3 +6,4 @@</div><div class='ctx'> obj-$(CONFIG_USB_ACM)		+= cdc-acm.o</div><div class='ctx'> obj-$(CONFIG_USB_PRINTER)	+= usblp.o</div><div class='ctx'> obj-$(CONFIG_USB_WDM)		+= cdc-wdm.o</div><div class='add'>+obj-$(CONFIG_USB_TMC)		+= usbtmc.o</div><div class='head'>diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c<br/>index c257453fa9de..fab23ee8702b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/class/cdc-acm.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/class/cdc-acm.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/class/cdc-acm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/class/cdc-acm.c</a></div><div class='hunk'>@@ -326,8 +326,8 @@ exit:</div><div class='ctx'> 	usb_mark_last_busy(acm-&gt;dev);</div><div class='ctx'> 	retval = usb_submit_urb (urb, GFP_ATOMIC);</div><div class='ctx'> 	if (retval)</div><div class='del'>-		err ("%s - usb_submit_urb failed with result %d",</div><div class='del'>-		     __func__, retval);</div><div class='add'>+		dev_err(&amp;urb-&gt;dev-&gt;dev, "%s - usb_submit_urb failed with "</div><div class='add'>+			"result %d", __func__, retval);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* data interface returns incoming bytes, or we got unthrottled */</div><div class='hunk'>@@ -514,7 +514,7 @@ static void acm_waker(struct work_struct *waker)</div><div class='ctx'> </div><div class='ctx'> 	rv = usb_autopm_get_interface(acm-&gt;control);</div><div class='ctx'> 	if (rv &lt; 0) {</div><div class='del'>-		err("Autopm failure in %s", __func__);</div><div class='add'>+		dev_err(&amp;acm-&gt;dev-&gt;dev, "Autopm failure in %s\n", __func__);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (acm-&gt;delayed_wb) {</div><div class='hunk'>@@ -924,7 +924,7 @@ static int acm_probe (struct usb_interface *intf,</div><div class='ctx'> 	</div><div class='ctx'> 	/* normal probing*/</div><div class='ctx'> 	if (!buffer) {</div><div class='del'>-		err("Weird descriptor references\n");</div><div class='add'>+		dev_err(&amp;intf-&gt;dev, "Weird descriptor references\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -934,21 +934,24 @@ static int acm_probe (struct usb_interface *intf,</div><div class='ctx'> 			buflen = intf-&gt;cur_altsetting-&gt;endpoint-&gt;extralen;</div><div class='ctx'> 			buffer = intf-&gt;cur_altsetting-&gt;endpoint-&gt;extra;</div><div class='ctx'> 		} else {</div><div class='del'>-			err("Zero length descriptor references\n");</div><div class='add'>+			dev_err(&amp;intf-&gt;dev,</div><div class='add'>+				"Zero length descriptor references\n");</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	while (buflen &gt; 0) {</div><div class='ctx'> 		if (buffer [1] != USB_DT_CS_INTERFACE) {</div><div class='del'>-			err("skipping garbage\n");</div><div class='add'>+			dev_err(&amp;intf-&gt;dev, "skipping garbage\n");</div><div class='ctx'> 			goto next_desc;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		switch (buffer [2]) {</div><div class='ctx'> 			case USB_CDC_UNION_TYPE: /* we've found it */</div><div class='ctx'> 				if (union_header) {</div><div class='del'>-					err("More than one union descriptor, skipping ...");</div><div class='add'>+					dev_err(&amp;intf-&gt;dev, "More than one "</div><div class='add'>+						"union descriptor, "</div><div class='add'>+						"skipping ...\n");</div><div class='ctx'> 					goto next_desc;</div><div class='ctx'> 				}</div><div class='ctx'> 				union_header = (struct usb_cdc_union_desc *)</div><div class='hunk'>@@ -966,7 +969,9 @@ static int acm_probe (struct usb_interface *intf,</div><div class='ctx'> 				call_management_function = buffer[3];</div><div class='ctx'> 				call_interface_num = buffer[4];</div><div class='ctx'> 				if ((call_management_function &amp; 3) != 3)</div><div class='del'>-					err("This device cannot do calls on its own. It is no modem.");</div><div class='add'>+					dev_err(&amp;intf-&gt;dev, "This device "</div><div class='add'>+						"cannot do calls on its own. "</div><div class='add'>+						"It is no modem.\n");</div><div class='ctx'> 				break;</div><div class='ctx'> 			default:</div><div class='ctx'> 				/* there are LOTS more CDC descriptors that</div><div class='hunk'>@@ -1051,7 +1056,7 @@ skip_normal_probe:</div><div class='ctx'> 	for (minor = 0; minor &lt; ACM_TTY_MINORS &amp;&amp; acm_table[minor]; minor++);</div><div class='ctx'> </div><div class='ctx'> 	if (minor == ACM_TTY_MINORS) {</div><div class='del'>-		err("no more free acm devices");</div><div class='add'>+		dev_err(&amp;intf-&gt;dev, "no more free acm devices\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1454,7 +1459,8 @@ static int __init acm_init(void)</div><div class='ctx'> 		return retval;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	info(DRIVER_VERSION ":" DRIVER_DESC);</div><div class='add'>+	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"</div><div class='add'>+	       DRIVER_DESC "\n");</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/usb/class/cdc-wdm.c b/drivers/usb/class/cdc-wdm.c<br/>index 7e8e1235e4e5..7429f70b9d06 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/class/cdc-wdm.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/class/cdc-wdm.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/class/cdc-wdm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/class/cdc-wdm.c</a></div><div class='hunk'>@@ -132,10 +132,12 @@ static void wdm_in_callback(struct urb *urb)</div><div class='ctx'> 				"nonzero urb status received: -ESHUTDOWN");</div><div class='ctx'> 			break;</div><div class='ctx'> 		case -EPIPE:</div><div class='del'>-			err("nonzero urb status received: -EPIPE");</div><div class='add'>+			dev_err(&amp;desc-&gt;intf-&gt;dev,</div><div class='add'>+				"nonzero urb status received: -EPIPE\n");</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='del'>-			err("Unexpected error %d", status);</div><div class='add'>+			dev_err(&amp;desc-&gt;intf-&gt;dev,</div><div class='add'>+				"Unexpected error %d\n", status);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -170,16 +172,18 @@ static void wdm_int_callback(struct urb *urb)</div><div class='ctx'> 			return; /* unplug */</div><div class='ctx'> 		case -EPIPE:</div><div class='ctx'> 			set_bit(WDM_INT_STALL, &amp;desc-&gt;flags);</div><div class='del'>-			err("Stall on int endpoint");</div><div class='add'>+			dev_err(&amp;desc-&gt;intf-&gt;dev, "Stall on int endpoint\n");</div><div class='ctx'> 			goto sw; /* halt is cleared in work */</div><div class='ctx'> 		default:</div><div class='del'>-			err("nonzero urb status received: %d", status);</div><div class='add'>+			dev_err(&amp;desc-&gt;intf-&gt;dev,</div><div class='add'>+				"nonzero urb status received: %d\n", status);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (urb-&gt;actual_length &lt; sizeof(struct usb_cdc_notification)) {</div><div class='del'>-		err("wdm_int_callback - %d bytes", urb-&gt;actual_length);</div><div class='add'>+		dev_err(&amp;desc-&gt;intf-&gt;dev, "wdm_int_callback - %d bytes\n",</div><div class='add'>+			urb-&gt;actual_length);</div><div class='ctx'> 		goto exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -198,7 +202,8 @@ static void wdm_int_callback(struct urb *urb)</div><div class='ctx'> 		goto exit;</div><div class='ctx'> 	default:</div><div class='ctx'> 		clear_bit(WDM_POLL_RUNNING, &amp;desc-&gt;flags);</div><div class='del'>-		err("unknown notification %d received: index %d len %d",</div><div class='add'>+		dev_err(&amp;desc-&gt;intf-&gt;dev,</div><div class='add'>+			"unknown notification %d received: index %d len %d\n",</div><div class='ctx'> 			dr-&gt;bNotificationType, dr-&gt;wIndex, dr-&gt;wLength);</div><div class='ctx'> 		goto exit;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -236,14 +241,16 @@ static void wdm_int_callback(struct urb *urb)</div><div class='ctx'> sw:</div><div class='ctx'> 			rv = schedule_work(&amp;desc-&gt;rxwork);</div><div class='ctx'> 			if (rv)</div><div class='del'>-				err("Cannot schedule work");</div><div class='add'>+				dev_err(&amp;desc-&gt;intf-&gt;dev,</div><div class='add'>+					"Cannot schedule work\n");</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> exit:</div><div class='ctx'> 	rv = usb_submit_urb(urb, GFP_ATOMIC);</div><div class='ctx'> 	if (rv)</div><div class='del'>-		err("%s - usb_submit_urb failed with result %d",</div><div class='del'>-		     __func__, rv);</div><div class='add'>+		dev_err(&amp;desc-&gt;intf-&gt;dev,</div><div class='add'>+			"%s - usb_submit_urb failed with result %d\n",</div><div class='add'>+			__func__, rv);</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -353,7 +360,7 @@ static ssize_t wdm_write</div><div class='ctx'> 	if (rv &lt; 0) {</div><div class='ctx'> 		kfree(buf);</div><div class='ctx'> 		clear_bit(WDM_IN_USE, &amp;desc-&gt;flags);</div><div class='del'>-		err("Tx URB error: %d", rv);</div><div class='add'>+		dev_err(&amp;desc-&gt;intf-&gt;dev, "Tx URB error: %d\n", rv);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		dev_dbg(&amp;desc-&gt;intf-&gt;dev, "Tx URB has been submitted index=%d",</div><div class='ctx'> 			req-&gt;wIndex);</div><div class='hunk'>@@ -401,7 +408,8 @@ retry:</div><div class='ctx'> 			int t = desc-&gt;rerr;</div><div class='ctx'> 			desc-&gt;rerr = 0;</div><div class='ctx'> 			spin_unlock_irq(&amp;desc-&gt;iuspin);</div><div class='del'>-			err("reading had resulted in %d", t);</div><div class='add'>+			dev_err(&amp;desc-&gt;intf-&gt;dev,</div><div class='add'>+				"reading had resulted in %d\n", t);</div><div class='ctx'> 			rv = -EIO;</div><div class='ctx'> 			goto err;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -440,7 +448,7 @@ retry:</div><div class='ctx'> err:</div><div class='ctx'> 	mutex_unlock(&amp;desc-&gt;rlock);</div><div class='ctx'> 	if (rv &lt; 0)</div><div class='del'>-		err("wdm_read: exit error");</div><div class='add'>+		dev_err(&amp;desc-&gt;intf-&gt;dev, "wdm_read: exit error\n");</div><div class='ctx'> 	return rv;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -450,7 +458,8 @@ static int wdm_flush(struct file *file, fl_owner_t id)</div><div class='ctx'> </div><div class='ctx'> 	wait_event(desc-&gt;wait, !test_bit(WDM_IN_USE, &amp;desc-&gt;flags));</div><div class='ctx'> 	if (desc-&gt;werr &lt; 0)</div><div class='del'>-		err("Error in flush path: %d", desc-&gt;werr);</div><div class='add'>+		dev_err(&amp;desc-&gt;intf-&gt;dev, "Error in flush path: %d\n",</div><div class='add'>+			desc-&gt;werr);</div><div class='ctx'> </div><div class='ctx'> 	return desc-&gt;werr;</div><div class='ctx'> }</div><div class='hunk'>@@ -502,7 +511,7 @@ static int wdm_open(struct inode *inode, struct file *file)</div><div class='ctx'> </div><div class='ctx'> 	rv = usb_autopm_get_interface(desc-&gt;intf);</div><div class='ctx'> 	if (rv &lt; 0) {</div><div class='del'>-		err("Error autopm - %d", rv);</div><div class='add'>+		dev_err(&amp;desc-&gt;intf-&gt;dev, "Error autopm - %d\n", rv);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	intf-&gt;needs_remote_wakeup = 1;</div><div class='hunk'>@@ -512,7 +521,8 @@ static int wdm_open(struct inode *inode, struct file *file)</div><div class='ctx'> 		rv = usb_submit_urb(desc-&gt;validity, GFP_KERNEL);</div><div class='ctx'> 		if (rv &lt; 0) {</div><div class='ctx'> 			desc-&gt;count--;</div><div class='del'>-			err("Error submitting int urb - %d", rv);</div><div class='add'>+			dev_err(&amp;desc-&gt;intf-&gt;dev,</div><div class='add'>+				"Error submitting int urb - %d\n", rv);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		rv = 0;</div><div class='hunk'>@@ -600,7 +610,7 @@ static int wdm_probe(struct usb_interface *intf, const struct usb_device_id *id)</div><div class='ctx'> </div><div class='ctx'> 	while (buflen &gt; 0) {</div><div class='ctx'> 		if (buffer [1] != USB_DT_CS_INTERFACE) {</div><div class='del'>-			err("skipping garbage");</div><div class='add'>+			dev_err(&amp;intf-&gt;dev, "skipping garbage\n");</div><div class='ctx'> 			goto next_desc;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -614,7 +624,8 @@ static int wdm_probe(struct usb_interface *intf, const struct usb_device_id *id)</div><div class='ctx'> 				"Finding maximum buffer length: %d", maxcom);</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='del'>-			err("Ignoring extra header, type %d, length %d",</div><div class='add'>+			dev_err(&amp;intf-&gt;dev,</div><div class='add'>+				"Ignoring extra header, type %d, length %d\n",</div><div class='ctx'> 				buffer[2], buffer[0]);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -772,7 +783,8 @@ static int recover_from_urb_loss(struct wdm_device *desc)</div><div class='ctx'> 	if (desc-&gt;count) {</div><div class='ctx'> 		rv = usb_submit_urb(desc-&gt;validity, GFP_NOIO);</div><div class='ctx'> 		if (rv &lt; 0)</div><div class='del'>-			err("Error resume submitting int urb - %d", rv);</div><div class='add'>+			dev_err(&amp;desc-&gt;intf-&gt;dev,</div><div class='add'>+				"Error resume submitting int urb - %d\n", rv);</div><div class='ctx'> 	}</div><div class='ctx'> 	return rv;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/usb/class/usblp.c b/drivers/usb/class/usblp.c<br/>index 0647164d36db..b5775af3ba26 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/class/usblp.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/class/usblp.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/class/usblp.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/class/usblp.c</a></div><div class='hunk'>@@ -593,8 +593,9 @@ static long usblp_ioctl(struct file *file, unsigned int cmd, unsigned long arg)</div><div class='ctx'> 				err = usblp_hp_channel_change_request(usblp,</div><div class='ctx'> 					arg, &amp;newChannel);</div><div class='ctx'> 				if (err &lt; 0) {</div><div class='del'>-					err("usblp%d: error = %d setting "</div><div class='del'>-						"HP channel",</div><div class='add'>+					dev_err(&amp;usblp-&gt;dev-&gt;dev,</div><div class='add'>+						"usblp%d: error = %d setting "</div><div class='add'>+						"HP channel\n",</div><div class='ctx'> 						usblp-&gt;minor, err);</div><div class='ctx'> 					retval = -EIO;</div><div class='ctx'> 					goto done;</div><div class='hunk'>@@ -1076,15 +1077,16 @@ static int usblp_probe(struct usb_interface *intf,</div><div class='ctx'> 		       const struct usb_device_id *id)</div><div class='ctx'> {</div><div class='ctx'> 	struct usb_device *dev = interface_to_usbdev (intf);</div><div class='del'>-	struct usblp *usblp = NULL;</div><div class='add'>+	struct usblp *usblp;</div><div class='ctx'> 	int protocol;</div><div class='ctx'> 	int retval;</div><div class='ctx'> </div><div class='ctx'> 	/* Malloc and start initializing usblp structure so we can use it</div><div class='ctx'> 	 * directly. */</div><div class='del'>-	if (!(usblp = kzalloc(sizeof(struct usblp), GFP_KERNEL))) {</div><div class='add'>+	usblp = kzalloc(sizeof(struct usblp), GFP_KERNEL);</div><div class='add'>+	if (!usblp) {</div><div class='ctx'> 		retval = -ENOMEM;</div><div class='del'>-		goto abort;</div><div class='add'>+		goto abort_ret;</div><div class='ctx'> 	}</div><div class='ctx'> 	usblp-&gt;dev = dev;</div><div class='ctx'> 	mutex_init(&amp;usblp-&gt;wmut);</div><div class='hunk'>@@ -1179,12 +1181,11 @@ abort_intfdata:</div><div class='ctx'> 	usb_set_intfdata (intf, NULL);</div><div class='ctx'> 	device_remove_file(&amp;intf-&gt;dev, &amp;dev_attr_ieee1284_id);</div><div class='ctx'> abort:</div><div class='del'>-	if (usblp) {</div><div class='del'>-		kfree(usblp-&gt;readbuf);</div><div class='del'>-		kfree(usblp-&gt;statusbuf);</div><div class='del'>-		kfree(usblp-&gt;device_id_string);</div><div class='del'>-		kfree(usblp);</div><div class='del'>-	}</div><div class='add'>+	kfree(usblp-&gt;readbuf);</div><div class='add'>+	kfree(usblp-&gt;statusbuf);</div><div class='add'>+	kfree(usblp-&gt;device_id_string);</div><div class='add'>+	kfree(usblp);</div><div class='add'>+abort_ret:</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1345,7 +1346,7 @@ static void usblp_disconnect(struct usb_interface *intf)</div><div class='ctx'> 	usb_deregister_dev(intf, &amp;usblp_class);</div><div class='ctx'> </div><div class='ctx'> 	if (!usblp || !usblp-&gt;dev) {</div><div class='del'>-		err("bogus disconnect");</div><div class='add'>+		dev_err(&amp;intf-&gt;dev, "bogus disconnect\n");</div><div class='ctx'> 		BUG ();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/usb/class/usbtmc.c b/drivers/usb/class/usbtmc.c<br/>new file mode 100644<br/>index 000000000000..543811f6e6e8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/class/usbtmc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/class/usbtmc.c</a></div><div class='hunk'>@@ -0,0 +1,1087 @@</div><div class='add'>+/**</div><div class='add'>+ * drivers/usb/class/usbtmc.c - USB Test &amp; Measurment class driver</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2007 Stefan Kopp, Gechingen, Germany</div><div class='add'>+ * Copyright (C) 2008 Novell, Inc.</div><div class='add'>+ * Copyright (C) 2008 Greg Kroah-Hartman &lt;gregkh@suse.de&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public License</div><div class='add'>+ * as published by the Free Software Foundation; either version 2</div><div class='add'>+ * of the License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * The GNU General Public License is available at</div><div class='add'>+ * http://www.gnu.org/copyleft/gpl.html.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/kref.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/usb.h&gt;</div><div class='add'>+#include &lt;linux/usb/tmc.h&gt;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define USBTMC_MINOR_BASE	176</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Size of driver internal IO buffer. Must be multiple of 4 and at least as</div><div class='add'>+ * large as wMaxPacketSize (which is usually 512 bytes).</div><div class='add'>+ */</div><div class='add'>+#define USBTMC_SIZE_IOBUFFER	2048</div><div class='add'>+</div><div class='add'>+/* Default USB timeout (in milliseconds) */</div><div class='add'>+#define USBTMC_TIMEOUT		10</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Maximum number of read cycles to empty bulk in endpoint during CLEAR and</div><div class='add'>+ * ABORT_BULK_IN requests. Ends the loop if (for whatever reason) a short</div><div class='add'>+ * packet is never read.</div><div class='add'>+ */</div><div class='add'>+#define USBTMC_MAX_READS_TO_CLEAR_BULK_IN	100</div><div class='add'>+</div><div class='add'>+static struct usb_device_id usbtmc_devices[] = {</div><div class='add'>+	{ USB_INTERFACE_INFO(USB_CLASS_APP_SPEC, 3, 0), },</div><div class='add'>+	{ 0, } /* terminating entry */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This structure is the capabilities for the device</div><div class='add'>+ * See section 4.2.1.8 of the USBTMC specification for details.</div><div class='add'>+ */</div><div class='add'>+struct usbtmc_dev_capabilities {</div><div class='add'>+	__u8 interface_capabilities;</div><div class='add'>+	__u8 device_capabilities;</div><div class='add'>+	__u8 usb488_interface_capabilities;</div><div class='add'>+	__u8 usb488_device_capabilities;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* This structure holds private data for each USBTMC device. One copy is</div><div class='add'>+ * allocated for each USBTMC device in the driver's probe function.</div><div class='add'>+ */</div><div class='add'>+struct usbtmc_device_data {</div><div class='add'>+	const struct usb_device_id *id;</div><div class='add'>+	struct usb_device *usb_dev;</div><div class='add'>+	struct usb_interface *intf;</div><div class='add'>+</div><div class='add'>+	unsigned int bulk_in;</div><div class='add'>+	unsigned int bulk_out;</div><div class='add'>+</div><div class='add'>+	u8 bTag;</div><div class='add'>+	u8 bTag_last_write;	/* needed for abort */</div><div class='add'>+	u8 bTag_last_read;	/* needed for abort */</div><div class='add'>+</div><div class='add'>+	/* attributes from the USB TMC spec for this device */</div><div class='add'>+	u8 TermChar;</div><div class='add'>+	bool TermCharEnabled;</div><div class='add'>+	bool auto_abort;</div><div class='add'>+</div><div class='add'>+	struct usbtmc_dev_capabilities	capabilities;</div><div class='add'>+	struct kref kref;</div><div class='add'>+	struct mutex io_mutex;	/* only one i/o function running at a time */</div><div class='add'>+};</div><div class='add'>+#define to_usbtmc_data(d) container_of(d, struct usbtmc_device_data, kref)</div><div class='add'>+</div><div class='add'>+/* Forward declarations */</div><div class='add'>+static struct usb_driver usbtmc_driver;</div><div class='add'>+</div><div class='add'>+static void usbtmc_delete(struct kref *kref)</div><div class='add'>+{</div><div class='add'>+	struct usbtmc_device_data *data = to_usbtmc_data(kref);</div><div class='add'>+</div><div class='add'>+	usb_put_dev(data-&gt;usb_dev);</div><div class='add'>+	kfree(data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int usbtmc_open(struct inode *inode, struct file *filp)</div><div class='add'>+{</div><div class='add'>+	struct usb_interface *intf;</div><div class='add'>+	struct usbtmc_device_data *data;</div><div class='add'>+	int retval = -ENODEV;</div><div class='add'>+</div><div class='add'>+	intf = usb_find_interface(&amp;usbtmc_driver, iminor(inode));</div><div class='add'>+	if (!intf) {</div><div class='add'>+		printk(KERN_ERR KBUILD_MODNAME</div><div class='add'>+		       ": can not find device for minor %d", iminor(inode));</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	data = usb_get_intfdata(intf);</div><div class='add'>+	kref_get(&amp;data-&gt;kref);</div><div class='add'>+</div><div class='add'>+	/* Store pointer in file structure's private data field */</div><div class='add'>+	filp-&gt;private_data = data;</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int usbtmc_release(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct usbtmc_device_data *data = file-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	kref_put(&amp;data-&gt;kref, usbtmc_delete);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int usbtmc_ioctl_abort_bulk_in(struct usbtmc_device_data *data)</div><div class='add'>+{</div><div class='add'>+	char *buffer;</div><div class='add'>+	struct device *dev;</div><div class='add'>+	int rv;</div><div class='add'>+	int n;</div><div class='add'>+	int actual;</div><div class='add'>+	struct usb_host_interface *current_setting;</div><div class='add'>+	int max_size;</div><div class='add'>+</div><div class='add'>+	dev = &amp;data-&gt;intf-&gt;dev;</div><div class='add'>+	buffer = kmalloc(USBTMC_SIZE_IOBUFFER, GFP_KERNEL);</div><div class='add'>+	if (!buffer)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	rv = usb_control_msg(data-&gt;usb_dev,</div><div class='add'>+			     usb_rcvctrlpipe(data-&gt;usb_dev, 0),</div><div class='add'>+			     USBTMC_REQUEST_INITIATE_ABORT_BULK_IN,</div><div class='add'>+			     USB_DIR_IN | USB_TYPE_CLASS | USB_RECIP_ENDPOINT,</div><div class='add'>+			     data-&gt;bTag_last_read, data-&gt;bulk_in,</div><div class='add'>+			     buffer, 2, USBTMC_TIMEOUT);</div><div class='add'>+</div><div class='add'>+	if (rv &lt; 0) {</div><div class='add'>+		dev_err(dev, "usb_control_msg returned %d\n", rv);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev, "INITIATE_ABORT_BULK_IN returned %x\n", buffer[0]);</div><div class='add'>+</div><div class='add'>+	if (buffer[0] == USBTMC_STATUS_FAILED) {</div><div class='add'>+		rv = 0;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (buffer[0] != USBTMC_STATUS_SUCCESS) {</div><div class='add'>+		dev_err(dev, "INITIATE_ABORT_BULK_IN returned %x\n",</div><div class='add'>+			buffer[0]);</div><div class='add'>+		rv = -EPERM;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	max_size = 0;</div><div class='add'>+	current_setting = data-&gt;intf-&gt;cur_altsetting;</div><div class='add'>+	for (n = 0; n &lt; current_setting-&gt;desc.bNumEndpoints; n++)</div><div class='add'>+		if (current_setting-&gt;endpoint[n].desc.bEndpointAddress ==</div><div class='add'>+			data-&gt;bulk_in)</div><div class='add'>+			max_size = le16_to_cpu(current_setting-&gt;endpoint[n].</div><div class='add'>+						desc.wMaxPacketSize);</div><div class='add'>+</div><div class='add'>+	if (max_size == 0) {</div><div class='add'>+		dev_err(dev, "Couldn't get wMaxPacketSize\n");</div><div class='add'>+		rv = -EPERM;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_dbg(&amp;data-&gt;intf-&gt;dev, "wMaxPacketSize is %d\n", max_size);</div><div class='add'>+</div><div class='add'>+	n = 0;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		dev_dbg(dev, "Reading from bulk in EP\n");</div><div class='add'>+</div><div class='add'>+		rv = usb_bulk_msg(data-&gt;usb_dev,</div><div class='add'>+				  usb_rcvbulkpipe(data-&gt;usb_dev,</div><div class='add'>+						  data-&gt;bulk_in),</div><div class='add'>+				  buffer, USBTMC_SIZE_IOBUFFER,</div><div class='add'>+				  &amp;actual, USBTMC_TIMEOUT);</div><div class='add'>+</div><div class='add'>+		n++;</div><div class='add'>+</div><div class='add'>+		if (rv &lt; 0) {</div><div class='add'>+			dev_err(dev, "usb_bulk_msg returned %d\n", rv);</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+	} while ((actual == max_size) &amp;&amp;</div><div class='add'>+		 (n &lt; USBTMC_MAX_READS_TO_CLEAR_BULK_IN));</div><div class='add'>+</div><div class='add'>+	if (actual == max_size) {</div><div class='add'>+		dev_err(dev, "Couldn't clear device buffer within %d cycles\n",</div><div class='add'>+			USBTMC_MAX_READS_TO_CLEAR_BULK_IN);</div><div class='add'>+		rv = -EPERM;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	n = 0;</div><div class='add'>+</div><div class='add'>+usbtmc_abort_bulk_in_status:</div><div class='add'>+	rv = usb_control_msg(data-&gt;usb_dev,</div><div class='add'>+			     usb_rcvctrlpipe(data-&gt;usb_dev, 0),</div><div class='add'>+			     USBTMC_REQUEST_CHECK_ABORT_BULK_IN_STATUS,</div><div class='add'>+			     USB_DIR_IN | USB_TYPE_CLASS | USB_RECIP_ENDPOINT,</div><div class='add'>+			     0, data-&gt;bulk_in, buffer, 0x08,</div><div class='add'>+			     USBTMC_TIMEOUT);</div><div class='add'>+</div><div class='add'>+	if (rv &lt; 0) {</div><div class='add'>+		dev_err(dev, "usb_control_msg returned %d\n", rv);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev, "INITIATE_ABORT_BULK_IN returned %x\n", buffer[0]);</div><div class='add'>+</div><div class='add'>+	if (buffer[0] == USBTMC_STATUS_SUCCESS) {</div><div class='add'>+		rv = 0;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (buffer[0] != USBTMC_STATUS_PENDING) {</div><div class='add'>+		dev_err(dev, "INITIATE_ABORT_BULK_IN returned %x\n", buffer[0]);</div><div class='add'>+		rv = -EPERM;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (buffer[1] == 1)</div><div class='add'>+		do {</div><div class='add'>+			dev_dbg(dev, "Reading from bulk in EP\n");</div><div class='add'>+</div><div class='add'>+			rv = usb_bulk_msg(data-&gt;usb_dev,</div><div class='add'>+					  usb_rcvbulkpipe(data-&gt;usb_dev,</div><div class='add'>+							  data-&gt;bulk_in),</div><div class='add'>+					  buffer, USBTMC_SIZE_IOBUFFER,</div><div class='add'>+					  &amp;actual, USBTMC_TIMEOUT);</div><div class='add'>+</div><div class='add'>+			n++;</div><div class='add'>+</div><div class='add'>+			if (rv &lt; 0) {</div><div class='add'>+				dev_err(dev, "usb_bulk_msg returned %d\n", rv);</div><div class='add'>+				goto exit;</div><div class='add'>+			}</div><div class='add'>+		} while ((actual = max_size) &amp;&amp;</div><div class='add'>+			 (n &lt; USBTMC_MAX_READS_TO_CLEAR_BULK_IN));</div><div class='add'>+</div><div class='add'>+	if (actual == max_size) {</div><div class='add'>+		dev_err(dev, "Couldn't clear device buffer within %d cycles\n",</div><div class='add'>+			USBTMC_MAX_READS_TO_CLEAR_BULK_IN);</div><div class='add'>+		rv = -EPERM;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	goto usbtmc_abort_bulk_in_status;</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	kfree(buffer);</div><div class='add'>+	return rv;</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int usbtmc_ioctl_abort_bulk_out(struct usbtmc_device_data *data)</div><div class='add'>+{</div><div class='add'>+	struct device *dev;</div><div class='add'>+	u8 *buffer;</div><div class='add'>+	int rv;</div><div class='add'>+	int n;</div><div class='add'>+</div><div class='add'>+	dev = &amp;data-&gt;intf-&gt;dev;</div><div class='add'>+</div><div class='add'>+	buffer = kmalloc(8, GFP_KERNEL);</div><div class='add'>+	if (!buffer)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	rv = usb_control_msg(data-&gt;usb_dev,</div><div class='add'>+			     usb_rcvctrlpipe(data-&gt;usb_dev, 0),</div><div class='add'>+			     USBTMC_REQUEST_INITIATE_ABORT_BULK_OUT,</div><div class='add'>+			     USB_DIR_IN | USB_TYPE_CLASS | USB_RECIP_ENDPOINT,</div><div class='add'>+			     data-&gt;bTag_last_write, data-&gt;bulk_out,</div><div class='add'>+			     buffer, 2, USBTMC_TIMEOUT);</div><div class='add'>+</div><div class='add'>+	if (rv &lt; 0) {</div><div class='add'>+		dev_err(dev, "usb_control_msg returned %d\n", rv);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev, "INITIATE_ABORT_BULK_OUT returned %x\n", buffer[0]);</div><div class='add'>+</div><div class='add'>+	if (buffer[0] != USBTMC_STATUS_SUCCESS) {</div><div class='add'>+		dev_err(dev, "INITIATE_ABORT_BULK_OUT returned %x\n",</div><div class='add'>+			buffer[0]);</div><div class='add'>+		rv = -EPERM;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	n = 0;</div><div class='add'>+</div><div class='add'>+usbtmc_abort_bulk_out_check_status:</div><div class='add'>+	rv = usb_control_msg(data-&gt;usb_dev,</div><div class='add'>+			     usb_rcvctrlpipe(data-&gt;usb_dev, 0),</div><div class='add'>+			     USBTMC_REQUEST_CHECK_ABORT_BULK_OUT_STATUS,</div><div class='add'>+			     USB_DIR_IN | USB_TYPE_CLASS | USB_RECIP_ENDPOINT,</div><div class='add'>+			     0, data-&gt;bulk_out, buffer, 0x08,</div><div class='add'>+			     USBTMC_TIMEOUT);</div><div class='add'>+	n++;</div><div class='add'>+	if (rv &lt; 0) {</div><div class='add'>+		dev_err(dev, "usb_control_msg returned %d\n", rv);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev, "CHECK_ABORT_BULK_OUT returned %x\n", buffer[0]);</div><div class='add'>+</div><div class='add'>+	if (buffer[0] == USBTMC_STATUS_SUCCESS)</div><div class='add'>+		goto usbtmc_abort_bulk_out_clear_halt;</div><div class='add'>+</div><div class='add'>+	if ((buffer[0] == USBTMC_STATUS_PENDING) &amp;&amp;</div><div class='add'>+	    (n &lt; USBTMC_MAX_READS_TO_CLEAR_BULK_IN))</div><div class='add'>+		goto usbtmc_abort_bulk_out_check_status;</div><div class='add'>+</div><div class='add'>+	rv = -EPERM;</div><div class='add'>+	goto exit;</div><div class='add'>+</div><div class='add'>+usbtmc_abort_bulk_out_clear_halt:</div><div class='add'>+	rv = usb_control_msg(data-&gt;usb_dev,</div><div class='add'>+			     usb_sndctrlpipe(data-&gt;usb_dev, 0),</div><div class='add'>+			     USB_REQ_CLEAR_FEATURE,</div><div class='add'>+			     USB_DIR_OUT | USB_TYPE_STANDARD |</div><div class='add'>+			     USB_RECIP_ENDPOINT,</div><div class='add'>+			     USB_ENDPOINT_HALT, data-&gt;bulk_out, buffer,</div><div class='add'>+			     0, USBTMC_TIMEOUT);</div><div class='add'>+</div><div class='add'>+	if (rv &lt; 0) {</div><div class='add'>+		dev_err(dev, "usb_control_msg returned %d\n", rv);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+	rv = 0;</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	kfree(buffer);</div><div class='add'>+	return rv;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t usbtmc_read(struct file *filp, char __user *buf,</div><div class='add'>+			   size_t count, loff_t *f_pos)</div><div class='add'>+{</div><div class='add'>+	struct usbtmc_device_data *data;</div><div class='add'>+	struct device *dev;</div><div class='add'>+	unsigned long int n_characters;</div><div class='add'>+	u8 *buffer;</div><div class='add'>+	int actual;</div><div class='add'>+	int done;</div><div class='add'>+	int remaining;</div><div class='add'>+	int retval;</div><div class='add'>+	int this_part;</div><div class='add'>+</div><div class='add'>+	/* Get pointer to private data structure */</div><div class='add'>+	data = filp-&gt;private_data;</div><div class='add'>+	dev = &amp;data-&gt;intf-&gt;dev;</div><div class='add'>+</div><div class='add'>+	buffer = kmalloc(USBTMC_SIZE_IOBUFFER, GFP_KERNEL);</div><div class='add'>+	if (!buffer)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;data-&gt;io_mutex);</div><div class='add'>+</div><div class='add'>+	remaining = count;</div><div class='add'>+	done = 0;</div><div class='add'>+</div><div class='add'>+	while (remaining &gt; 0) {</div><div class='add'>+		if (remaining &gt; USBTMC_SIZE_IOBUFFER - 12 - 3)</div><div class='add'>+			this_part = USBTMC_SIZE_IOBUFFER - 12 - 3;</div><div class='add'>+		else</div><div class='add'>+			this_part = remaining;</div><div class='add'>+</div><div class='add'>+		/* Setup IO buffer for DEV_DEP_MSG_IN message</div><div class='add'>+		 * Refer to class specs for details</div><div class='add'>+		 */</div><div class='add'>+		buffer[0] = 2;</div><div class='add'>+		buffer[1] = data-&gt;bTag;</div><div class='add'>+		buffer[2] = ~(data-&gt;bTag);</div><div class='add'>+		buffer[3] = 0; /* Reserved */</div><div class='add'>+		buffer[4] = (this_part - 12 - 3) &amp; 255;</div><div class='add'>+		buffer[5] = ((this_part - 12 - 3) &gt;&gt; 8) &amp; 255;</div><div class='add'>+		buffer[6] = ((this_part - 12 - 3) &gt;&gt; 16) &amp; 255;</div><div class='add'>+		buffer[7] = ((this_part - 12 - 3) &gt;&gt; 24) &amp; 255;</div><div class='add'>+		buffer[8] = data-&gt;TermCharEnabled * 2;</div><div class='add'>+		/* Use term character? */</div><div class='add'>+		buffer[9] = data-&gt;TermChar;</div><div class='add'>+		buffer[10] = 0; /* Reserved */</div><div class='add'>+		buffer[11] = 0; /* Reserved */</div><div class='add'>+</div><div class='add'>+		/* Send bulk URB */</div><div class='add'>+		retval = usb_bulk_msg(data-&gt;usb_dev,</div><div class='add'>+				      usb_sndbulkpipe(data-&gt;usb_dev,</div><div class='add'>+						      data-&gt;bulk_out),</div><div class='add'>+				      buffer, 12, &amp;actual, USBTMC_TIMEOUT);</div><div class='add'>+</div><div class='add'>+		/* Store bTag (in case we need to abort) */</div><div class='add'>+		data-&gt;bTag_last_write = data-&gt;bTag;</div><div class='add'>+</div><div class='add'>+		/* Increment bTag -- and increment again if zero */</div><div class='add'>+		data-&gt;bTag++;</div><div class='add'>+		if (!data-&gt;bTag)</div><div class='add'>+			(data-&gt;bTag)++;</div><div class='add'>+</div><div class='add'>+		if (retval &lt; 0) {</div><div class='add'>+			dev_err(dev, "usb_bulk_msg returned %d\n", retval);</div><div class='add'>+			if (data-&gt;auto_abort)</div><div class='add'>+				usbtmc_ioctl_abort_bulk_out(data);</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Send bulk URB */</div><div class='add'>+		retval = usb_bulk_msg(data-&gt;usb_dev,</div><div class='add'>+				      usb_rcvbulkpipe(data-&gt;usb_dev,</div><div class='add'>+						      data-&gt;bulk_in),</div><div class='add'>+				      buffer, USBTMC_SIZE_IOBUFFER, &amp;actual,</div><div class='add'>+				      USBTMC_TIMEOUT);</div><div class='add'>+</div><div class='add'>+		/* Store bTag (in case we need to abort) */</div><div class='add'>+		data-&gt;bTag_last_read = data-&gt;bTag;</div><div class='add'>+</div><div class='add'>+		if (retval &lt; 0) {</div><div class='add'>+			dev_err(dev, "Unable to read data, error %d\n", retval);</div><div class='add'>+			if (data-&gt;auto_abort)</div><div class='add'>+				usbtmc_ioctl_abort_bulk_in(data);</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* How many characters did the instrument send? */</div><div class='add'>+		n_characters = buffer[4] +</div><div class='add'>+			       (buffer[5] &lt;&lt; 8) +</div><div class='add'>+			       (buffer[6] &lt;&lt; 16) +</div><div class='add'>+			       (buffer[7] &lt;&lt; 24);</div><div class='add'>+</div><div class='add'>+		/* Copy buffer to user space */</div><div class='add'>+		if (copy_to_user(buf + done, &amp;buffer[12], n_characters)) {</div><div class='add'>+			/* There must have been an addressing problem */</div><div class='add'>+			retval = -EFAULT;</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		done += n_characters;</div><div class='add'>+		if (n_characters &lt; USBTMC_SIZE_IOBUFFER)</div><div class='add'>+			remaining = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Update file position value */</div><div class='add'>+	*f_pos = *f_pos + done;</div><div class='add'>+	retval = done;</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	mutex_unlock(&amp;data-&gt;io_mutex);</div><div class='add'>+	kfree(buffer);</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t usbtmc_write(struct file *filp, const char __user *buf,</div><div class='add'>+			    size_t count, loff_t *f_pos)</div><div class='add'>+{</div><div class='add'>+	struct usbtmc_device_data *data;</div><div class='add'>+	u8 *buffer;</div><div class='add'>+	int retval;</div><div class='add'>+	int actual;</div><div class='add'>+	unsigned long int n_bytes;</div><div class='add'>+	int n;</div><div class='add'>+	int remaining;</div><div class='add'>+	int done;</div><div class='add'>+	int this_part;</div><div class='add'>+</div><div class='add'>+	data = filp-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	buffer = kmalloc(USBTMC_SIZE_IOBUFFER, GFP_KERNEL);</div><div class='add'>+	if (!buffer)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;data-&gt;io_mutex);</div><div class='add'>+</div><div class='add'>+	remaining = count;</div><div class='add'>+	done = 0;</div><div class='add'>+</div><div class='add'>+	while (remaining &gt; 0) {</div><div class='add'>+		if (remaining &gt; USBTMC_SIZE_IOBUFFER - 12) {</div><div class='add'>+			this_part = USBTMC_SIZE_IOBUFFER - 12;</div><div class='add'>+			buffer[8] = 0;</div><div class='add'>+		} else {</div><div class='add'>+			this_part = remaining;</div><div class='add'>+			buffer[8] = 1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Setup IO buffer for DEV_DEP_MSG_OUT message */</div><div class='add'>+		buffer[0] = 1;</div><div class='add'>+		buffer[1] = data-&gt;bTag;</div><div class='add'>+		buffer[2] = ~(data-&gt;bTag);</div><div class='add'>+		buffer[3] = 0; /* Reserved */</div><div class='add'>+		buffer[4] = this_part &amp; 255;</div><div class='add'>+		buffer[5] = (this_part &gt;&gt; 8) &amp; 255;</div><div class='add'>+		buffer[6] = (this_part &gt;&gt; 16) &amp; 255;</div><div class='add'>+		buffer[7] = (this_part &gt;&gt; 24) &amp; 255;</div><div class='add'>+		/* buffer[8] is set above... */</div><div class='add'>+		buffer[9] = 0; /* Reserved */</div><div class='add'>+		buffer[10] = 0; /* Reserved */</div><div class='add'>+		buffer[11] = 0; /* Reserved */</div><div class='add'>+</div><div class='add'>+		if (copy_from_user(&amp;buffer[12], buf + done, this_part)) {</div><div class='add'>+			retval = -EFAULT;</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		n_bytes = 12 + this_part;</div><div class='add'>+		if (this_part % 4)</div><div class='add'>+			n_bytes += 4 - this_part % 4;</div><div class='add'>+			for (n = 12 + this_part; n &lt; n_bytes; n++)</div><div class='add'>+				buffer[n] = 0;</div><div class='add'>+</div><div class='add'>+		retval = usb_bulk_msg(data-&gt;usb_dev,</div><div class='add'>+				      usb_sndbulkpipe(data-&gt;usb_dev,</div><div class='add'>+						      data-&gt;bulk_out),</div><div class='add'>+				      buffer, n_bytes, &amp;actual, USBTMC_TIMEOUT);</div><div class='add'>+</div><div class='add'>+		data-&gt;bTag_last_write = data-&gt;bTag;</div><div class='add'>+		data-&gt;bTag++;</div><div class='add'>+</div><div class='add'>+		if (!data-&gt;bTag)</div><div class='add'>+			data-&gt;bTag++;</div><div class='add'>+</div><div class='add'>+		if (retval &lt; 0) {</div><div class='add'>+			dev_err(&amp;data-&gt;intf-&gt;dev,</div><div class='add'>+				"Unable to send data, error %d\n", retval);</div><div class='add'>+			if (data-&gt;auto_abort)</div><div class='add'>+				usbtmc_ioctl_abort_bulk_out(data);</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		remaining -= this_part;</div><div class='add'>+		done += this_part;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	retval = count;</div><div class='add'>+exit:</div><div class='add'>+	mutex_unlock(&amp;data-&gt;io_mutex);</div><div class='add'>+	kfree(buffer);</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int usbtmc_ioctl_clear(struct usbtmc_device_data *data)</div><div class='add'>+{</div><div class='add'>+	struct usb_host_interface *current_setting;</div><div class='add'>+	struct usb_endpoint_descriptor *desc;</div><div class='add'>+	struct device *dev;</div><div class='add'>+	u8 *buffer;</div><div class='add'>+	int rv;</div><div class='add'>+	int n;</div><div class='add'>+	int actual;</div><div class='add'>+	int max_size;</div><div class='add'>+</div><div class='add'>+	dev = &amp;data-&gt;intf-&gt;dev;</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev, "Sending INITIATE_CLEAR request\n");</div><div class='add'>+</div><div class='add'>+	buffer = kmalloc(USBTMC_SIZE_IOBUFFER, GFP_KERNEL);</div><div class='add'>+	if (!buffer)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	rv = usb_control_msg(data-&gt;usb_dev,</div><div class='add'>+			     usb_rcvctrlpipe(data-&gt;usb_dev, 0),</div><div class='add'>+			     USBTMC_REQUEST_INITIATE_CLEAR,</div><div class='add'>+			     USB_DIR_IN | USB_TYPE_CLASS | USB_RECIP_INTERFACE,</div><div class='add'>+			     0, 0, buffer, 1, USBTMC_TIMEOUT);</div><div class='add'>+	if (rv &lt; 0) {</div><div class='add'>+		dev_err(dev, "usb_control_msg returned %d\n", rv);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev, "INITIATE_CLEAR returned %x\n", buffer[0]);</div><div class='add'>+</div><div class='add'>+	if (buffer[0] != USBTMC_STATUS_SUCCESS) {</div><div class='add'>+		dev_err(dev, "INITIATE_CLEAR returned %x\n", buffer[0]);</div><div class='add'>+		rv = -EPERM;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	max_size = 0;</div><div class='add'>+	current_setting = data-&gt;intf-&gt;cur_altsetting;</div><div class='add'>+	for (n = 0; n &lt; current_setting-&gt;desc.bNumEndpoints; n++) {</div><div class='add'>+		desc = &amp;current_setting-&gt;endpoint[n].desc;</div><div class='add'>+		if (desc-&gt;bEndpointAddress == data-&gt;bulk_in)</div><div class='add'>+			max_size = le16_to_cpu(desc-&gt;wMaxPacketSize);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (max_size == 0) {</div><div class='add'>+		dev_err(dev, "Couldn't get wMaxPacketSize\n");</div><div class='add'>+		rv = -EPERM;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev, "wMaxPacketSize is %d\n", max_size);</div><div class='add'>+</div><div class='add'>+	n = 0;</div><div class='add'>+</div><div class='add'>+usbtmc_clear_check_status:</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev, "Sending CHECK_CLEAR_STATUS request\n");</div><div class='add'>+</div><div class='add'>+	rv = usb_control_msg(data-&gt;usb_dev,</div><div class='add'>+			     usb_rcvctrlpipe(data-&gt;usb_dev, 0),</div><div class='add'>+			     USBTMC_REQUEST_CHECK_CLEAR_STATUS,</div><div class='add'>+			     USB_DIR_IN | USB_TYPE_CLASS | USB_RECIP_INTERFACE,</div><div class='add'>+			     0, 0, buffer, 2, USBTMC_TIMEOUT);</div><div class='add'>+	if (rv &lt; 0) {</div><div class='add'>+		dev_err(dev, "usb_control_msg returned %d\n", rv);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev, "CHECK_CLEAR_STATUS returned %x\n", buffer[0]);</div><div class='add'>+</div><div class='add'>+	if (buffer[0] == USBTMC_STATUS_SUCCESS)</div><div class='add'>+		goto usbtmc_clear_bulk_out_halt;</div><div class='add'>+</div><div class='add'>+	if (buffer[0] != USBTMC_STATUS_PENDING) {</div><div class='add'>+		dev_err(dev, "CHECK_CLEAR_STATUS returned %x\n", buffer[0]);</div><div class='add'>+		rv = -EPERM;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (buffer[1] == 1)</div><div class='add'>+		do {</div><div class='add'>+			dev_dbg(dev, "Reading from bulk in EP\n");</div><div class='add'>+</div><div class='add'>+			rv = usb_bulk_msg(data-&gt;usb_dev,</div><div class='add'>+					  usb_rcvbulkpipe(data-&gt;usb_dev,</div><div class='add'>+							  data-&gt;bulk_in),</div><div class='add'>+					  buffer, USBTMC_SIZE_IOBUFFER,</div><div class='add'>+					  &amp;actual, USBTMC_TIMEOUT);</div><div class='add'>+			n++;</div><div class='add'>+</div><div class='add'>+			if (rv &lt; 0) {</div><div class='add'>+				dev_err(dev, "usb_control_msg returned %d\n",</div><div class='add'>+					rv);</div><div class='add'>+				goto exit;</div><div class='add'>+			}</div><div class='add'>+		} while ((actual == max_size) &amp;&amp;</div><div class='add'>+			  (n &lt; USBTMC_MAX_READS_TO_CLEAR_BULK_IN));</div><div class='add'>+</div><div class='add'>+	if (actual == max_size) {</div><div class='add'>+		dev_err(dev, "Couldn't clear device buffer within %d cycles\n",</div><div class='add'>+			USBTMC_MAX_READS_TO_CLEAR_BULK_IN);</div><div class='add'>+		rv = -EPERM;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	goto usbtmc_clear_check_status;</div><div class='add'>+</div><div class='add'>+usbtmc_clear_bulk_out_halt:</div><div class='add'>+</div><div class='add'>+	rv = usb_control_msg(data-&gt;usb_dev,</div><div class='add'>+			     usb_sndctrlpipe(data-&gt;usb_dev, 0),</div><div class='add'>+			     USB_REQ_CLEAR_FEATURE,</div><div class='add'>+			     USB_DIR_OUT | USB_TYPE_STANDARD |</div><div class='add'>+			     USB_RECIP_ENDPOINT,</div><div class='add'>+			     USB_ENDPOINT_HALT,</div><div class='add'>+			     data-&gt;bulk_out, buffer, 0,</div><div class='add'>+			     USBTMC_TIMEOUT);</div><div class='add'>+	if (rv &lt; 0) {</div><div class='add'>+		dev_err(dev, "usb_control_msg returned %d\n", rv);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+	rv = 0;</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	kfree(buffer);</div><div class='add'>+	return rv;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int usbtmc_ioctl_clear_out_halt(struct usbtmc_device_data *data)</div><div class='add'>+{</div><div class='add'>+	u8 *buffer;</div><div class='add'>+	int rv;</div><div class='add'>+</div><div class='add'>+	buffer = kmalloc(2, GFP_KERNEL);</div><div class='add'>+	if (!buffer)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	rv = usb_control_msg(data-&gt;usb_dev,</div><div class='add'>+			     usb_sndctrlpipe(data-&gt;usb_dev, 0),</div><div class='add'>+			     USB_REQ_CLEAR_FEATURE,</div><div class='add'>+			     USB_DIR_OUT | USB_TYPE_STANDARD |</div><div class='add'>+			     USB_RECIP_ENDPOINT,</div><div class='add'>+			     USB_ENDPOINT_HALT, data-&gt;bulk_out,</div><div class='add'>+			     buffer, 0, USBTMC_TIMEOUT);</div><div class='add'>+</div><div class='add'>+	if (rv &lt; 0) {</div><div class='add'>+		dev_err(&amp;data-&gt;usb_dev-&gt;dev, "usb_control_msg returned %d\n",</div><div class='add'>+			rv);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+	rv = 0;</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	kfree(buffer);</div><div class='add'>+	return rv;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int usbtmc_ioctl_clear_in_halt(struct usbtmc_device_data *data)</div><div class='add'>+{</div><div class='add'>+	u8 *buffer;</div><div class='add'>+	int rv;</div><div class='add'>+</div><div class='add'>+	buffer = kmalloc(2, GFP_KERNEL);</div><div class='add'>+	if (!buffer)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	rv = usb_control_msg(data-&gt;usb_dev, usb_sndctrlpipe(data-&gt;usb_dev, 0),</div><div class='add'>+			     USB_REQ_CLEAR_FEATURE,</div><div class='add'>+			     USB_DIR_OUT | USB_TYPE_STANDARD |</div><div class='add'>+			     USB_RECIP_ENDPOINT,</div><div class='add'>+			     USB_ENDPOINT_HALT, data-&gt;bulk_in, buffer, 0,</div><div class='add'>+			     USBTMC_TIMEOUT);</div><div class='add'>+</div><div class='add'>+	if (rv &lt; 0) {</div><div class='add'>+		dev_err(&amp;data-&gt;usb_dev-&gt;dev, "usb_control_msg returned %d\n",</div><div class='add'>+			rv);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+	rv = 0;</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	kfree(buffer);</div><div class='add'>+	return rv;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int get_capabilities(struct usbtmc_device_data *data)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = &amp;data-&gt;usb_dev-&gt;dev;</div><div class='add'>+	char *buffer;</div><div class='add'>+	int rv;</div><div class='add'>+</div><div class='add'>+	buffer = kmalloc(0x18, GFP_KERNEL);</div><div class='add'>+	if (!buffer)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	rv = usb_control_msg(data-&gt;usb_dev, usb_rcvctrlpipe(data-&gt;usb_dev, 0),</div><div class='add'>+			     USBTMC_REQUEST_GET_CAPABILITIES,</div><div class='add'>+			     USB_DIR_IN | USB_TYPE_CLASS | USB_RECIP_INTERFACE,</div><div class='add'>+			     0, 0, buffer, 0x18, USBTMC_TIMEOUT);</div><div class='add'>+	if (rv &lt; 0) {</div><div class='add'>+		dev_err(dev, "usb_control_msg returned %d\n", rv);</div><div class='add'>+		return rv;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev, "GET_CAPABILITIES returned %x\n", buffer[0]);</div><div class='add'>+	dev_dbg(dev, "Interface capabilities are %x\n", buffer[4]);</div><div class='add'>+	dev_dbg(dev, "Device capabilities are %x\n", buffer[5]);</div><div class='add'>+	dev_dbg(dev, "USB488 interface capabilities are %x\n", buffer[14]);</div><div class='add'>+	dev_dbg(dev, "USB488 device capabilities are %x\n", buffer[15]);</div><div class='add'>+	if (buffer[0] != USBTMC_STATUS_SUCCESS) {</div><div class='add'>+		dev_err(dev, "GET_CAPABILITIES returned %x\n", buffer[0]);</div><div class='add'>+		return -EPERM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	data-&gt;capabilities.interface_capabilities = buffer[4];</div><div class='add'>+	data-&gt;capabilities.device_capabilities = buffer[5];</div><div class='add'>+	data-&gt;capabilities.usb488_interface_capabilities = buffer[14];</div><div class='add'>+	data-&gt;capabilities.usb488_device_capabilities = buffer[15];</div><div class='add'>+</div><div class='add'>+	kfree(buffer);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define capability_attribute(name)					\</div><div class='add'>+static ssize_t show_##name(struct device *dev,				\</div><div class='add'>+			   struct device_attribute *attr, char *buf)	\</div><div class='add'>+{									\</div><div class='add'>+	struct usb_interface *intf = to_usb_interface(dev);		\</div><div class='add'>+	struct usbtmc_device_data *data = usb_get_intfdata(intf);	\</div><div class='add'>+									\</div><div class='add'>+	return sprintf(buf, "%d\n", data-&gt;capabilities.name);		\</div><div class='add'>+}									\</div><div class='add'>+static DEVICE_ATTR(name, S_IRUGO, show_##name, NULL)</div><div class='add'>+</div><div class='add'>+capability_attribute(interface_capabilities);</div><div class='add'>+capability_attribute(device_capabilities);</div><div class='add'>+capability_attribute(usb488_interface_capabilities);</div><div class='add'>+capability_attribute(usb488_device_capabilities);</div><div class='add'>+</div><div class='add'>+static struct attribute *capability_attrs[] = {</div><div class='add'>+	&amp;dev_attr_interface_capabilities.attr,</div><div class='add'>+	&amp;dev_attr_device_capabilities.attr,</div><div class='add'>+	&amp;dev_attr_usb488_interface_capabilities.attr,</div><div class='add'>+	&amp;dev_attr_usb488_device_capabilities.attr,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct attribute_group capability_attr_grp = {</div><div class='add'>+	.attrs = capability_attrs,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static ssize_t show_TermChar(struct device *dev,</div><div class='add'>+			     struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct usb_interface *intf = to_usb_interface(dev);</div><div class='add'>+	struct usbtmc_device_data *data = usb_get_intfdata(intf);</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "%c\n", data-&gt;TermChar);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t store_TermChar(struct device *dev,</div><div class='add'>+			      struct device_attribute *attr,</div><div class='add'>+			      const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct usb_interface *intf = to_usb_interface(dev);</div><div class='add'>+	struct usbtmc_device_data *data = usb_get_intfdata(intf);</div><div class='add'>+</div><div class='add'>+	if (count &lt; 1)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	data-&gt;TermChar = buf[0];</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+static DEVICE_ATTR(TermChar, S_IRUGO, show_TermChar, store_TermChar);</div><div class='add'>+</div><div class='add'>+#define data_attribute(name)						\</div><div class='add'>+static ssize_t show_##name(struct device *dev,				\</div><div class='add'>+			   struct device_attribute *attr, char *buf)	\</div><div class='add'>+{									\</div><div class='add'>+	struct usb_interface *intf = to_usb_interface(dev);		\</div><div class='add'>+	struct usbtmc_device_data *data = usb_get_intfdata(intf);	\</div><div class='add'>+									\</div><div class='add'>+	return sprintf(buf, "%d\n", data-&gt;name);			\</div><div class='add'>+}									\</div><div class='add'>+static ssize_t store_##name(struct device *dev,				\</div><div class='add'>+			    struct device_attribute *attr,		\</div><div class='add'>+			    const char *buf, size_t count)		\</div><div class='add'>+{									\</div><div class='add'>+	struct usb_interface *intf = to_usb_interface(dev);		\</div><div class='add'>+	struct usbtmc_device_data *data = usb_get_intfdata(intf);	\</div><div class='add'>+	ssize_t result;							\</div><div class='add'>+	unsigned val;							\</div><div class='add'>+									\</div><div class='add'>+	result = sscanf(buf, "%u\n", &amp;val);				\</div><div class='add'>+	if (result != 1)						\</div><div class='add'>+		result = -EINVAL;					\</div><div class='add'>+	data-&gt;name = val;						\</div><div class='add'>+	if (result &lt; 0)							\</div><div class='add'>+		return result;						\</div><div class='add'>+	else								\</div><div class='add'>+		return count;						\</div><div class='add'>+}									\</div><div class='add'>+static DEVICE_ATTR(name, S_IRUGO, show_##name, store_##name)</div><div class='add'>+</div><div class='add'>+data_attribute(TermCharEnabled);</div><div class='add'>+data_attribute(auto_abort);</div><div class='add'>+</div><div class='add'>+static struct attribute *data_attrs[] = {</div><div class='add'>+	&amp;dev_attr_TermChar.attr,</div><div class='add'>+	&amp;dev_attr_TermCharEnabled.attr,</div><div class='add'>+	&amp;dev_attr_auto_abort.attr,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct attribute_group data_attr_grp = {</div><div class='add'>+	.attrs = data_attrs,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int usbtmc_ioctl_indicator_pulse(struct usbtmc_device_data *data)</div><div class='add'>+{</div><div class='add'>+	struct device *dev;</div><div class='add'>+	u8 *buffer;</div><div class='add'>+	int rv;</div><div class='add'>+</div><div class='add'>+	dev = &amp;data-&gt;intf-&gt;dev;</div><div class='add'>+</div><div class='add'>+	buffer = kmalloc(2, GFP_KERNEL);</div><div class='add'>+	if (!buffer)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	rv = usb_control_msg(data-&gt;usb_dev,</div><div class='add'>+			     usb_rcvctrlpipe(data-&gt;usb_dev, 0),</div><div class='add'>+			     USBTMC_REQUEST_INDICATOR_PULSE,</div><div class='add'>+			     USB_DIR_IN | USB_TYPE_CLASS | USB_RECIP_INTERFACE,</div><div class='add'>+			     0, 0, buffer, 0x01, USBTMC_TIMEOUT);</div><div class='add'>+</div><div class='add'>+	if (rv &lt; 0) {</div><div class='add'>+		dev_err(dev, "usb_control_msg returned %d\n", rv);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev, "INDICATOR_PULSE returned %x\n", buffer[0]);</div><div class='add'>+</div><div class='add'>+	if (buffer[0] != USBTMC_STATUS_SUCCESS) {</div><div class='add'>+		dev_err(dev, "INDICATOR_PULSE returned %x\n", buffer[0]);</div><div class='add'>+		rv = -EPERM;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+	rv = 0;</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	kfree(buffer);</div><div class='add'>+	return rv;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long usbtmc_ioctl(struct file *file, unsigned int cmd, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	struct usbtmc_device_data *data;</div><div class='add'>+	int retval = -EBADRQC;</div><div class='add'>+</div><div class='add'>+	data = file-&gt;private_data;</div><div class='add'>+	mutex_lock(&amp;data-&gt;io_mutex);</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case USBTMC_IOCTL_CLEAR_OUT_HALT:</div><div class='add'>+		retval = usbtmc_ioctl_clear_out_halt(data);</div><div class='add'>+</div><div class='add'>+	case USBTMC_IOCTL_CLEAR_IN_HALT:</div><div class='add'>+		retval = usbtmc_ioctl_clear_in_halt(data);</div><div class='add'>+</div><div class='add'>+	case USBTMC_IOCTL_INDICATOR_PULSE:</div><div class='add'>+		retval = usbtmc_ioctl_indicator_pulse(data);</div><div class='add'>+</div><div class='add'>+	case USBTMC_IOCTL_CLEAR:</div><div class='add'>+		retval = usbtmc_ioctl_clear(data);</div><div class='add'>+</div><div class='add'>+	case USBTMC_IOCTL_ABORT_BULK_OUT:</div><div class='add'>+		retval = usbtmc_ioctl_abort_bulk_out(data);</div><div class='add'>+</div><div class='add'>+	case USBTMC_IOCTL_ABORT_BULK_IN:</div><div class='add'>+		retval = usbtmc_ioctl_abort_bulk_in(data);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;data-&gt;io_mutex);</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct file_operations fops = {</div><div class='add'>+	.owner		= THIS_MODULE,</div><div class='add'>+	.read		= usbtmc_read,</div><div class='add'>+	.write		= usbtmc_write,</div><div class='add'>+	.open		= usbtmc_open,</div><div class='add'>+	.release	= usbtmc_release,</div><div class='add'>+	.unlocked_ioctl	= usbtmc_ioctl,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct usb_class_driver usbtmc_class = {</div><div class='add'>+	.name =		"usbtmc%d",</div><div class='add'>+	.fops =		&amp;fops,</div><div class='add'>+	.minor_base =	USBTMC_MINOR_BASE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int usbtmc_probe(struct usb_interface *intf,</div><div class='add'>+			const struct usb_device_id *id)</div><div class='add'>+{</div><div class='add'>+	struct usbtmc_device_data *data;</div><div class='add'>+	struct usb_host_interface *iface_desc;</div><div class='add'>+	struct usb_endpoint_descriptor *endpoint;</div><div class='add'>+	int n;</div><div class='add'>+	int retcode;</div><div class='add'>+</div><div class='add'>+	dev_dbg(&amp;intf-&gt;dev, "%s called\n", __func__);</div><div class='add'>+</div><div class='add'>+	data = kmalloc(sizeof(struct usbtmc_device_data), GFP_KERNEL);</div><div class='add'>+	if (!data) {</div><div class='add'>+		dev_err(&amp;intf-&gt;dev, "Unable to allocate kernel memory\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	data-&gt;intf = intf;</div><div class='add'>+	data-&gt;id = id;</div><div class='add'>+	data-&gt;usb_dev = usb_get_dev(interface_to_usbdev(intf));</div><div class='add'>+	usb_set_intfdata(intf, data);</div><div class='add'>+	kref_init(&amp;data-&gt;kref);</div><div class='add'>+	mutex_init(&amp;data-&gt;io_mutex);</div><div class='add'>+</div><div class='add'>+	/* Initialize USBTMC bTag and other fields */</div><div class='add'>+	data-&gt;bTag	= 1;</div><div class='add'>+	data-&gt;TermCharEnabled = 0;</div><div class='add'>+	data-&gt;TermChar = '\n';</div><div class='add'>+</div><div class='add'>+	/* USBTMC devices have only one setting, so use that */</div><div class='add'>+	iface_desc = data-&gt;intf-&gt;cur_altsetting;</div><div class='add'>+</div><div class='add'>+	/* Find bulk in endpoint */</div><div class='add'>+	for (n = 0; n &lt; iface_desc-&gt;desc.bNumEndpoints; n++) {</div><div class='add'>+		endpoint = &amp;iface_desc-&gt;endpoint[n].desc;</div><div class='add'>+</div><div class='add'>+		if (usb_endpoint_is_bulk_in(endpoint)) {</div><div class='add'>+			data-&gt;bulk_in = endpoint-&gt;bEndpointAddress;</div><div class='add'>+			dev_dbg(&amp;intf-&gt;dev, "Found bulk in endpoint at %u\n",</div><div class='add'>+				data-&gt;bulk_in);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Find bulk out endpoint */</div><div class='add'>+	for (n = 0; n &lt; iface_desc-&gt;desc.bNumEndpoints; n++) {</div><div class='add'>+		endpoint = &amp;iface_desc-&gt;endpoint[n].desc;</div><div class='add'>+</div><div class='add'>+		if (usb_endpoint_is_bulk_out(endpoint)) {</div><div class='add'>+			data-&gt;bulk_out = endpoint-&gt;bEndpointAddress;</div><div class='add'>+			dev_dbg(&amp;intf-&gt;dev, "Found Bulk out endpoint at %u\n",</div><div class='add'>+				data-&gt;bulk_out);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	retcode = get_capabilities(data);</div><div class='add'>+	if (retcode)</div><div class='add'>+		dev_err(&amp;intf-&gt;dev, "can't read capabilities\n");</div><div class='add'>+	else</div><div class='add'>+		retcode = sysfs_create_group(&amp;intf-&gt;dev.kobj,</div><div class='add'>+					     &amp;capability_attr_grp);</div><div class='add'>+</div><div class='add'>+	retcode = sysfs_create_group(&amp;intf-&gt;dev.kobj, &amp;data_attr_grp);</div><div class='add'>+</div><div class='add'>+	retcode = usb_register_dev(intf, &amp;usbtmc_class);</div><div class='add'>+	if (retcode) {</div><div class='add'>+		dev_err(&amp;intf-&gt;dev, "Not able to get a minor"</div><div class='add'>+			" (base %u, slice default): %d\n", USBTMC_MINOR_BASE,</div><div class='add'>+			retcode);</div><div class='add'>+		goto error_register;</div><div class='add'>+	}</div><div class='add'>+	dev_dbg(&amp;intf-&gt;dev, "Using minor number %d\n", intf-&gt;minor);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+error_register:</div><div class='add'>+	sysfs_remove_group(&amp;intf-&gt;dev.kobj, &amp;capability_attr_grp);</div><div class='add'>+	sysfs_remove_group(&amp;intf-&gt;dev.kobj, &amp;data_attr_grp);</div><div class='add'>+	kref_put(&amp;data-&gt;kref, usbtmc_delete);</div><div class='add'>+	return retcode;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void usbtmc_disconnect(struct usb_interface *intf)</div><div class='add'>+{</div><div class='add'>+	struct usbtmc_device_data *data;</div><div class='add'>+</div><div class='add'>+	dev_dbg(&amp;intf-&gt;dev, "usbtmc_disconnect called\n");</div><div class='add'>+</div><div class='add'>+	data = usb_get_intfdata(intf);</div><div class='add'>+	usb_deregister_dev(intf, &amp;usbtmc_class);</div><div class='add'>+	sysfs_remove_group(&amp;intf-&gt;dev.kobj, &amp;capability_attr_grp);</div><div class='add'>+	sysfs_remove_group(&amp;intf-&gt;dev.kobj, &amp;data_attr_grp);</div><div class='add'>+	kref_put(&amp;data-&gt;kref, usbtmc_delete);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct usb_driver usbtmc_driver = {</div><div class='add'>+	.name		= "usbtmc",</div><div class='add'>+	.id_table	= usbtmc_devices,</div><div class='add'>+	.probe		= usbtmc_probe,</div><div class='add'>+	.disconnect	= usbtmc_disconnect</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init usbtmc_init(void)</div><div class='add'>+{</div><div class='add'>+	int retcode;</div><div class='add'>+</div><div class='add'>+	retcode = usb_register(&amp;usbtmc_driver);</div><div class='add'>+	if (retcode)</div><div class='add'>+		printk(KERN_ERR KBUILD_MODNAME": Unable to register driver\n");</div><div class='add'>+	return retcode;</div><div class='add'>+}</div><div class='add'>+module_init(usbtmc_init);</div><div class='add'>+</div><div class='add'>+static void __exit usbtmc_exit(void)</div><div class='add'>+{</div><div class='add'>+	usb_deregister(&amp;usbtmc_driver);</div><div class='add'>+}</div><div class='add'>+module_exit(usbtmc_exit);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/usb/core/Kconfig b/drivers/usb/core/Kconfig<br/>index cc9f397e8398..e1759d17ac5d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/core/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/core/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/core/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/core/Kconfig</a></div><div class='hunk'>@@ -134,5 +134,5 @@ config USB_OTG_BLACKLIST_HUB</div><div class='ctx'> 	  If you say Y here, then Linux will refuse to enumerate</div><div class='ctx'> 	  external hubs.  OTG hosts are allowed to reduce hardware</div><div class='ctx'> 	  and software costs by not supporting external hubs.  So</div><div class='del'>-	  are "Emedded Hosts" that don't offer OTG support.</div><div class='add'>+	  are "Embedded Hosts" that don't offer OTG support.</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c<br/>index 20290c5b1562..2bccefebff1b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/core/devio.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/core/devio.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/core/devio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/core/devio.c</a></div><div class='hunk'>@@ -413,7 +413,8 @@ static void driver_disconnect(struct usb_interface *intf)</div><div class='ctx'> 	if (likely(ifnum &lt; 8*sizeof(ps-&gt;ifclaimed)))</div><div class='ctx'> 		clear_bit(ifnum, &amp;ps-&gt;ifclaimed);</div><div class='ctx'> 	else</div><div class='del'>-		warn("interface number %u out of range", ifnum);</div><div class='add'>+		dev_warn(&amp;intf-&gt;dev, "interface number %u out of range\n",</div><div class='add'>+			 ifnum);</div><div class='ctx'> </div><div class='ctx'> 	usb_set_intfdata(intf, NULL);</div><div class='ctx'> </div><div class='hunk'>@@ -624,6 +625,8 @@ static int usbdev_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	smp_wmb();</div><div class='ctx'> 	list_add_tail(&amp;ps-&gt;list, &amp;dev-&gt;filelist);</div><div class='ctx'> 	file-&gt;private_data = ps;</div><div class='add'>+	snoop(&amp;dev-&gt;dev, "opened by process %d: %s\n", task_pid_nr(current),</div><div class='add'>+			current-&gt;comm);</div><div class='ctx'>  out:</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		kfree(ps);</div><div class='hunk'>@@ -1729,9 +1732,9 @@ static int usb_classdev_add(struct usb_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *cldev;</div><div class='ctx'> </div><div class='del'>-	cldev = device_create_drvdata(usb_classdev_class, &amp;dev-&gt;dev,</div><div class='del'>-				      dev-&gt;dev.devt, NULL, "usbdev%d.%d",</div><div class='del'>-				      dev-&gt;bus-&gt;busnum, dev-&gt;devnum);</div><div class='add'>+	cldev = device_create(usb_classdev_class, &amp;dev-&gt;dev, dev-&gt;dev.devt,</div><div class='add'>+			      NULL, "usbdev%d.%d", dev-&gt;bus-&gt;busnum,</div><div class='add'>+			      dev-&gt;devnum);</div><div class='ctx'> 	if (IS_ERR(cldev))</div><div class='ctx'> 		return PTR_ERR(cldev);</div><div class='ctx'> 	dev-&gt;usb_classdev = cldev;</div><div class='hunk'>@@ -1774,19 +1777,20 @@ int __init usb_devio_init(void)</div><div class='ctx'> 	retval = register_chrdev_region(USB_DEVICE_DEV, USB_DEVICE_MAX,</div><div class='ctx'> 					"usb_device");</div><div class='ctx'> 	if (retval) {</div><div class='del'>-		err("unable to register minors for usb_device");</div><div class='add'>+		printk(KERN_ERR "Unable to register minors for usb_device\n");</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	cdev_init(&amp;usb_device_cdev, &amp;usbdev_file_operations);</div><div class='ctx'> 	retval = cdev_add(&amp;usb_device_cdev, USB_DEVICE_DEV, USB_DEVICE_MAX);</div><div class='ctx'> 	if (retval) {</div><div class='del'>-		err("unable to get usb_device major %d", USB_DEVICE_MAJOR);</div><div class='add'>+		printk(KERN_ERR "Unable to get usb_device major %d\n",</div><div class='add'>+		       USB_DEVICE_MAJOR);</div><div class='ctx'> 		goto error_cdev;</div><div class='ctx'> 	}</div><div class='ctx'> #ifdef CONFIG_USB_DEVICE_CLASS</div><div class='ctx'> 	usb_classdev_class = class_create(THIS_MODULE, "usb_device");</div><div class='ctx'> 	if (IS_ERR(usb_classdev_class)) {</div><div class='del'>-		err("unable to register usb_device class");</div><div class='add'>+		printk(KERN_ERR "Unable to register usb_device class\n");</div><div class='ctx'> 		retval = PTR_ERR(usb_classdev_class);</div><div class='ctx'> 		cdev_del(&amp;usb_device_cdev);</div><div class='ctx'> 		usb_classdev_class = NULL;</div><div class='head'>diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c<br/>index 5a7fa6f09958..e935be7eb468 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/core/driver.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/core/driver.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/core/driver.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/core/driver.c</a></div><div class='hunk'>@@ -1070,7 +1070,8 @@ static int autosuspend_check(struct usb_device *udev, int reschedule)</div><div class='ctx'> 				struct usb_driver *driver;</div><div class='ctx'> </div><div class='ctx'> 				driver = to_usb_driver(intf-&gt;dev.driver);</div><div class='del'>-				if (!driver-&gt;reset_resume)</div><div class='add'>+				if (!driver-&gt;reset_resume ||</div><div class='add'>+				    intf-&gt;needs_remote_wakeup)</div><div class='ctx'> 					return -EOPNOTSUPP;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='head'>diff --git a/drivers/usb/core/endpoint.c b/drivers/usb/core/endpoint.c<br/>index 22912136fc14..946fae43d622 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/core/endpoint.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/core/endpoint.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/core/endpoint.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/core/endpoint.c</a></div><div class='hunk'>@@ -169,7 +169,8 @@ static int usb_endpoint_major_init(void)</div><div class='ctx'> 	error = alloc_chrdev_region(&amp;dev, 0, MAX_ENDPOINT_MINORS,</div><div class='ctx'> 				    "usb_endpoint");</div><div class='ctx'> 	if (error) {</div><div class='del'>-		err("unable to get a dynamic major for usb endpoints");</div><div class='add'>+		printk(KERN_ERR "Unable to get a dynamic major for "</div><div class='add'>+		       "usb endpoints.\n");</div><div class='ctx'> 		return error;</div><div class='ctx'> 	}</div><div class='ctx'> 	usb_endpoint_major = MAJOR(dev);</div><div class='head'>diff --git a/drivers/usb/core/file.c b/drivers/usb/core/file.c<br/>index 6b1b229e38cd..997e659ff693 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/core/file.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/core/file.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/core/file.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/core/file.c</a></div><div class='hunk'>@@ -86,7 +86,7 @@ static int init_usb_class(void)</div><div class='ctx'> 	usb_class-&gt;class = class_create(THIS_MODULE, "usb");</div><div class='ctx'> 	if (IS_ERR(usb_class-&gt;class)) {</div><div class='ctx'> 		result = IS_ERR(usb_class-&gt;class);</div><div class='del'>-		err("class_create failed for usb devices");</div><div class='add'>+		printk(KERN_ERR "class_create failed for usb devices\n");</div><div class='ctx'> 		kfree(usb_class);</div><div class='ctx'> 		usb_class = NULL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -115,7 +115,8 @@ int usb_major_init(void)</div><div class='ctx'> </div><div class='ctx'> 	error = register_chrdev(USB_MAJOR, "usb", &amp;usb_fops);</div><div class='ctx'> 	if (error)</div><div class='del'>-		err("unable to get major %d for usb devices", USB_MAJOR);</div><div class='add'>+		printk(KERN_ERR "Unable to get major %d for usb devices\n",</div><div class='add'>+		       USB_MAJOR);</div><div class='ctx'> </div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='hunk'>@@ -196,9 +197,9 @@ int usb_register_dev(struct usb_interface *intf,</div><div class='ctx'> 		++temp;</div><div class='ctx'> 	else</div><div class='ctx'> 		temp = name;</div><div class='del'>-	intf-&gt;usb_dev = device_create_drvdata(usb_class-&gt;class, &amp;intf-&gt;dev,</div><div class='del'>-					      MKDEV(USB_MAJOR, minor), NULL,</div><div class='del'>-					      "%s", temp);</div><div class='add'>+	intf-&gt;usb_dev = device_create(usb_class-&gt;class, &amp;intf-&gt;dev,</div><div class='add'>+				      MKDEV(USB_MAJOR, minor), NULL,</div><div class='add'>+				      "%s", temp);</div><div class='ctx'> 	if (IS_ERR(intf-&gt;usb_dev)) {</div><div class='ctx'> 		down_write(&amp;minor_rwsem);</div><div class='ctx'> 		usb_minors[intf-&gt;minor] = NULL;</div><div class='head'>diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c<br/>index 8ab389dca2b9..fc9018e72a09 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/core/hcd.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/core/hcd.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/core/hcd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/core/hcd.c</a></div><div class='hunk'>@@ -81,6 +81,10 @@</div><div class='ctx'> </div><div class='ctx'> /*-------------------------------------------------------------------------*/</div><div class='ctx'> </div><div class='add'>+/* Keep track of which host controller drivers are loaded */</div><div class='add'>+unsigned long usb_hcds_loaded;</div><div class='add'>+EXPORT_SYMBOL_GPL(usb_hcds_loaded);</div><div class='add'>+</div><div class='ctx'> /* host controllers we manage */</div><div class='ctx'> LIST_HEAD (usb_bus_list);</div><div class='ctx'> EXPORT_SYMBOL_GPL (usb_bus_list);</div><div class='hunk'>@@ -818,9 +822,8 @@ static int usb_register_bus(struct usb_bus *bus)</div><div class='ctx'> 	set_bit (busnum, busmap.busmap);</div><div class='ctx'> 	bus-&gt;busnum = busnum;</div><div class='ctx'> </div><div class='del'>-	bus-&gt;dev = device_create_drvdata(usb_host_class, bus-&gt;controller,</div><div class='del'>-					 MKDEV(0, 0), bus,</div><div class='del'>-					 "usb_host%d", busnum);</div><div class='add'>+	bus-&gt;dev = device_create(usb_host_class, bus-&gt;controller, MKDEV(0, 0),</div><div class='add'>+				 bus, "usb_host%d", busnum);</div><div class='ctx'> 	result = PTR_ERR(bus-&gt;dev);</div><div class='ctx'> 	if (IS_ERR(bus-&gt;dev))</div><div class='ctx'> 		goto error_create_class_dev;</div><div class='head'>diff --git a/drivers/usb/core/hcd.h b/drivers/usb/core/hcd.h<br/>index e710ce04e228..2dcde61c465e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/core/hcd.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/core/hcd.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/core/hcd.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/core/hcd.h</a></div><div class='hunk'>@@ -482,4 +482,10 @@ static inline void usbmon_urb_complete(struct usb_bus *bus, struct urb *urb,</div><div class='ctx'>  */</div><div class='ctx'> extern struct rw_semaphore ehci_cf_port_reset_rwsem;</div><div class='ctx'> </div><div class='add'>+/* Keep track of which host controller drivers are loaded */</div><div class='add'>+#define USB_UHCI_LOADED		0</div><div class='add'>+#define USB_OHCI_LOADED		1</div><div class='add'>+#define USB_EHCI_LOADED		2</div><div class='add'>+extern unsigned long usb_hcds_loaded;</div><div class='add'>+</div><div class='ctx'> #endif /* __KERNEL__ */</div><div class='head'>diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c<br/>index d99963873e37..d73ce262c365 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/core/hub.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/core/hub.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/core/hub.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/core/hub.c</a></div><div class='hunk'>@@ -77,6 +77,7 @@ struct usb_hub {</div><div class='ctx'> 	unsigned		has_indicators:1;</div><div class='ctx'> 	u8			indicator[USB_MAXCHILDREN];</div><div class='ctx'> 	struct delayed_work	leds;</div><div class='add'>+	struct delayed_work	init_work;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -100,6 +101,15 @@ module_param (blinkenlights, bool, S_IRUGO);</div><div class='ctx'> MODULE_PARM_DESC (blinkenlights, "true to cycle leds on hubs");</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Device SATA8000 FW1.0 from DATAST0R Technology Corp requires about</div><div class='add'>+ * 10 seconds to send reply for the initial 64-byte descriptor request.</div><div class='add'>+ */</div><div class='add'>+/* define initial 64-byte descriptor request timeout in milliseconds */</div><div class='add'>+static int initial_descriptor_timeout = USB_CTRL_GET_TIMEOUT;</div><div class='add'>+module_param(initial_descriptor_timeout, int, S_IRUGO|S_IWUSR);</div><div class='add'>+MODULE_PARM_DESC(initial_descriptor_timeout, "initial 64-byte descriptor request timeout in milliseconds (default 5000 - 5.0 seconds)");</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * As of 2.6.10 we introduce a new USB device initialization scheme which</div><div class='ctx'>  * closely resembles the way Windows works.  Hopefully it will be compatible</div><div class='ctx'>  * with a wider range of devices than the old scheme.  However some previously</div><div class='hunk'>@@ -515,10 +525,14 @@ void usb_hub_tt_clear_buffer (struct usb_device *udev, int pipe)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(usb_hub_tt_clear_buffer);</div><div class='ctx'> </div><div class='del'>-static void hub_power_on(struct usb_hub *hub)</div><div class='add'>+/* If do_delay is false, return the number of milliseconds the caller</div><div class='add'>+ * needs to delay.</div><div class='add'>+ */</div><div class='add'>+static unsigned hub_power_on(struct usb_hub *hub, bool do_delay)</div><div class='ctx'> {</div><div class='ctx'> 	int port1;</div><div class='ctx'> 	unsigned pgood_delay = hub-&gt;descriptor-&gt;bPwrOn2PwrGood * 2;</div><div class='add'>+	unsigned delay;</div><div class='ctx'> 	u16 wHubCharacteristics =</div><div class='ctx'> 			le16_to_cpu(hub-&gt;descriptor-&gt;wHubCharacteristics);</div><div class='ctx'> </div><div class='hunk'>@@ -537,7 +551,10 @@ static void hub_power_on(struct usb_hub *hub)</div><div class='ctx'> 		set_port_feature(hub-&gt;hdev, port1, USB_PORT_FEAT_POWER);</div><div class='ctx'> </div><div class='ctx'> 	/* Wait at least 100 msec for power to become stable */</div><div class='del'>-	msleep(max(pgood_delay, (unsigned) 100));</div><div class='add'>+	delay = max(pgood_delay, (unsigned) 100);</div><div class='add'>+	if (do_delay)</div><div class='add'>+		msleep(delay);</div><div class='add'>+	return delay;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int hub_hub_status(struct usb_hub *hub,</div><div class='hunk'>@@ -599,21 +616,55 @@ static void hub_port_logical_disconnect(struct usb_hub *hub, int port1)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> enum hub_activation_type {</div><div class='del'>-	HUB_INIT, HUB_POST_RESET, HUB_RESUME, HUB_RESET_RESUME</div><div class='add'>+	HUB_INIT, HUB_INIT2, HUB_INIT3,</div><div class='add'>+	HUB_POST_RESET, HUB_RESUME, HUB_RESET_RESUME,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static void hub_init_func2(struct work_struct *ws);</div><div class='add'>+static void hub_init_func3(struct work_struct *ws);</div><div class='add'>+</div><div class='ctx'> static void hub_activate(struct usb_hub *hub, enum hub_activation_type type)</div><div class='ctx'> {</div><div class='ctx'> 	struct usb_device *hdev = hub-&gt;hdev;</div><div class='ctx'> 	int port1;</div><div class='ctx'> 	int status;</div><div class='ctx'> 	bool need_debounce_delay = false;</div><div class='add'>+	unsigned delay;</div><div class='add'>+</div><div class='add'>+	/* Continue a partial initialization */</div><div class='add'>+	if (type == HUB_INIT2)</div><div class='add'>+		goto init2;</div><div class='add'>+	if (type == HUB_INIT3)</div><div class='add'>+		goto init3;</div><div class='ctx'> </div><div class='ctx'> 	/* After a resume, port power should still be on.</div><div class='ctx'> 	 * For any other type of activation, turn it on.</div><div class='ctx'> 	 */</div><div class='del'>-	if (type != HUB_RESUME)</div><div class='del'>-		hub_power_on(hub);</div><div class='add'>+	if (type != HUB_RESUME) {</div><div class='add'>+</div><div class='add'>+		/* Speed up system boot by using a delayed_work for the</div><div class='add'>+		 * hub's initial power-up delays.  This is pretty awkward</div><div class='add'>+		 * and the implementation looks like a home-brewed sort of</div><div class='add'>+		 * setjmp/longjmp, but it saves at least 100 ms for each</div><div class='add'>+		 * root hub (assuming usbcore is compiled into the kernel</div><div class='add'>+		 * rather than as a module).  It adds up.</div><div class='add'>+		 *</div><div class='add'>+		 * This can't be done for HUB_RESUME or HUB_RESET_RESUME</div><div class='add'>+		 * because for those activation types the ports have to be</div><div class='add'>+		 * operational when we return.  In theory this could be done</div><div class='add'>+		 * for HUB_POST_RESET, but it's easier not to.</div><div class='add'>+		 */</div><div class='add'>+		if (type == HUB_INIT) {</div><div class='add'>+			delay = hub_power_on(hub, false);</div><div class='add'>+			PREPARE_DELAYED_WORK(&amp;hub-&gt;init_work, hub_init_func2);</div><div class='add'>+			schedule_delayed_work(&amp;hub-&gt;init_work,</div><div class='add'>+					msecs_to_jiffies(delay));</div><div class='add'>+			return;		/* Continues at init2: below */</div><div class='add'>+		} else {</div><div class='add'>+			hub_power_on(hub, true);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+ init2:</div><div class='ctx'> </div><div class='ctx'> 	/* Check each port and set hub-&gt;change_bits to let khubd know</div><div class='ctx'> 	 * which ports need attention.</div><div class='hunk'>@@ -692,9 +743,20 @@ static void hub_activate(struct usb_hub *hub, enum hub_activation_type type)</div><div class='ctx'> 	 * If any port-status changes do occur during this delay, khubd</div><div class='ctx'> 	 * will see them later and handle them normally.</div><div class='ctx'> 	 */</div><div class='del'>-	if (need_debounce_delay)</div><div class='del'>-		msleep(HUB_DEBOUNCE_STABLE);</div><div class='del'>-</div><div class='add'>+	if (need_debounce_delay) {</div><div class='add'>+		delay = HUB_DEBOUNCE_STABLE;</div><div class='add'>+</div><div class='add'>+		/* Don't do a long sleep inside a workqueue routine */</div><div class='add'>+		if (type == HUB_INIT2) {</div><div class='add'>+			PREPARE_DELAYED_WORK(&amp;hub-&gt;init_work, hub_init_func3);</div><div class='add'>+			schedule_delayed_work(&amp;hub-&gt;init_work,</div><div class='add'>+					msecs_to_jiffies(delay));</div><div class='add'>+			return;		/* Continues at init3: below */</div><div class='add'>+		} else {</div><div class='add'>+			msleep(delay);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+ init3:</div><div class='ctx'> 	hub-&gt;quiescing = 0;</div><div class='ctx'> </div><div class='ctx'> 	status = usb_submit_urb(hub-&gt;urb, GFP_NOIO);</div><div class='hunk'>@@ -707,6 +769,21 @@ static void hub_activate(struct usb_hub *hub, enum hub_activation_type type)</div><div class='ctx'> 	kick_khubd(hub);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Implement the continuations for the delays above */</div><div class='add'>+static void hub_init_func2(struct work_struct *ws)</div><div class='add'>+{</div><div class='add'>+	struct usb_hub *hub = container_of(ws, struct usb_hub, init_work.work);</div><div class='add'>+</div><div class='add'>+	hub_activate(hub, HUB_INIT2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hub_init_func3(struct work_struct *ws)</div><div class='add'>+{</div><div class='add'>+	struct usb_hub *hub = container_of(ws, struct usb_hub, init_work.work);</div><div class='add'>+</div><div class='add'>+	hub_activate(hub, HUB_INIT3);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> enum hub_quiescing_type {</div><div class='ctx'> 	HUB_DISCONNECT, HUB_PRE_RESET, HUB_SUSPEND</div><div class='ctx'> };</div><div class='hunk'>@@ -716,6 +793,8 @@ static void hub_quiesce(struct usb_hub *hub, enum hub_quiescing_type type)</div><div class='ctx'> 	struct usb_device *hdev = hub-&gt;hdev;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	cancel_delayed_work_sync(&amp;hub-&gt;init_work);</div><div class='add'>+</div><div class='ctx'> 	/* khubd and related activity won't re-trigger */</div><div class='ctx'> 	hub-&gt;quiescing = 1;</div><div class='ctx'> </div><div class='hunk'>@@ -1099,6 +1178,7 @@ descriptor_error:</div><div class='ctx'> 	hub-&gt;intfdev = &amp;intf-&gt;dev;</div><div class='ctx'> 	hub-&gt;hdev = hdev;</div><div class='ctx'> 	INIT_DELAYED_WORK(&amp;hub-&gt;leds, led_work);</div><div class='add'>+	INIT_DELAYED_WORK(&amp;hub-&gt;init_work, NULL);</div><div class='ctx'> 	usb_get_intf(intf);</div><div class='ctx'> </div><div class='ctx'> 	usb_set_intfdata (intf, hub);</div><div class='hunk'>@@ -2467,7 +2547,7 @@ hub_port_init (struct usb_hub *hub, struct usb_device *udev, int port1,</div><div class='ctx'> 					USB_REQ_GET_DESCRIPTOR, USB_DIR_IN,</div><div class='ctx'> 					USB_DT_DEVICE &lt;&lt; 8, 0,</div><div class='ctx'> 					buf, GET_DESCRIPTOR_BUFSIZE,</div><div class='del'>-					USB_CTRL_GET_TIMEOUT);</div><div class='add'>+					initial_descriptor_timeout);</div><div class='ctx'> 				switch (buf-&gt;bMaxPacketSize0) {</div><div class='ctx'> 				case 8: case 16: case 32: case 64: case 255:</div><div class='ctx'> 					if (buf-&gt;bDescriptorType ==</div><div class='hunk'>@@ -3035,7 +3115,7 @@ static void hub_events(void)</div><div class='ctx'> 					i);</div><div class='ctx'> 				clear_port_feature(hdev, i,</div><div class='ctx'> 					USB_PORT_FEAT_C_OVER_CURRENT);</div><div class='del'>-				hub_power_on(hub);</div><div class='add'>+				hub_power_on(hub, true);</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			if (portchange &amp; USB_PORT_STAT_C_RESET) {</div><div class='hunk'>@@ -3070,7 +3150,7 @@ static void hub_events(void)</div><div class='ctx'> 				dev_dbg (hub_dev, "overcurrent change\n");</div><div class='ctx'> 				msleep(500);	/* Cool down */</div><div class='ctx'> 				clear_hub_feature(hdev, C_HUB_OVER_CURRENT);</div><div class='del'>-                        	hub_power_on(hub);</div><div class='add'>+                        	hub_power_on(hub, true);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/usb/core/inode.c b/drivers/usb/core/inode.c<br/>index db410e92c80d..94632264dccf 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/core/inode.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/core/inode.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/core/inode.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/core/inode.c</a></div><div class='hunk'>@@ -97,7 +97,7 @@ enum {</div><div class='ctx'> 	Opt_err,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static match_table_t tokens = {</div><div class='add'>+static const match_table_t tokens = {</div><div class='ctx'> 	{Opt_devuid, "devuid=%u"},</div><div class='ctx'> 	{Opt_devgid, "devgid=%u"},</div><div class='ctx'> 	{Opt_devmode, "devmode=%o"},</div><div class='hunk'>@@ -180,8 +180,8 @@ static int parse_options(struct super_block *s, char *data)</div><div class='ctx'> 			listmode = option &amp; S_IRWXUGO;</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='del'>-			err("usbfs: unrecognised mount option \"%s\" "</div><div class='del'>-			    "or missing value\n", p);</div><div class='add'>+			printk(KERN_ERR "usbfs: unrecognised mount option "</div><div class='add'>+			       "\"%s\" or missing value\n", p);</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -240,7 +240,9 @@ static void update_sb(struct super_block *sb)</div><div class='ctx'> 				update_special(bus);</div><div class='ctx'> 				break;</div><div class='ctx'> 			default:</div><div class='del'>-				warn("Unknown node %s mode %x found on remount!\n",bus-&gt;d_name.name,bus-&gt;d_inode-&gt;i_mode);</div><div class='add'>+				printk(KERN_WARNING "usbfs: Unknown node %s "</div><div class='add'>+				       "mode %x found on remount!\n",</div><div class='add'>+				       bus-&gt;d_name.name, bus-&gt;d_inode-&gt;i_mode);</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -259,7 +261,7 @@ static int remount(struct super_block *sb, int *flags, char *data)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (parse_options(sb, data)) {</div><div class='del'>-		warn("usbfs: mount parameter error:");</div><div class='add'>+		printk(KERN_WARNING "usbfs: mount parameter error.\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -599,7 +601,7 @@ static int create_special_files (void)</div><div class='ctx'> 	/* create the devices special file */</div><div class='ctx'> 	retval = simple_pin_fs(&amp;usb_fs_type, &amp;usbfs_mount, &amp;usbfs_mount_count);</div><div class='ctx'> 	if (retval) {</div><div class='del'>-		err ("Unable to get usbfs mount");</div><div class='add'>+		printk(KERN_ERR "Unable to get usbfs mount\n");</div><div class='ctx'> 		goto exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -611,7 +613,7 @@ static int create_special_files (void)</div><div class='ctx'> 					       NULL, &amp;usbfs_devices_fops,</div><div class='ctx'> 					       listuid, listgid);</div><div class='ctx'> 	if (devices_usbfs_dentry == NULL) {</div><div class='del'>-		err ("Unable to create devices usbfs file");</div><div class='add'>+		printk(KERN_ERR "Unable to create devices usbfs file\n");</div><div class='ctx'> 		retval = -ENODEV;</div><div class='ctx'> 		goto error_clean_mounts;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -663,7 +665,7 @@ static void usbfs_add_bus(struct usb_bus *bus)</div><div class='ctx'> 	bus-&gt;usbfs_dentry = fs_create_file (name, busmode | S_IFDIR, parent,</div><div class='ctx'> 					    bus, NULL, busuid, busgid);</div><div class='ctx'> 	if (bus-&gt;usbfs_dentry == NULL) {</div><div class='del'>-		err ("error creating usbfs bus entry");</div><div class='add'>+		printk(KERN_ERR "Error creating usbfs bus entry\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -694,7 +696,7 @@ static void usbfs_add_device(struct usb_device *dev)</div><div class='ctx'> 					    &amp;usbdev_file_operations,</div><div class='ctx'> 					    devuid, devgid);</div><div class='ctx'> 	if (dev-&gt;usbfs_dentry == NULL) {</div><div class='del'>-		err ("error creating usbfs device entry");</div><div class='add'>+		printk(KERN_ERR "Error creating usbfs device entry\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c<br/>index 286b4431a097..887738577b28 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/core/message.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/core/message.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/core/message.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/core/message.c</a></div><div class='hunk'>@@ -1204,7 +1204,8 @@ int usb_set_interface(struct usb_device *dev, int interface, int alternate)</div><div class='ctx'> </div><div class='ctx'> 	alt = usb_altnum_to_altsetting(iface, alternate);</div><div class='ctx'> 	if (!alt) {</div><div class='del'>-		warn("selecting invalid altsetting %d", alternate);</div><div class='add'>+		dev_warn(&amp;dev-&gt;dev, "selecting invalid altsetting %d",</div><div class='add'>+			 alternate);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/usb/core/sysfs.c b/drivers/usb/core/sysfs.c<br/>index 5e1f5d55bf04..f66fba11fbd5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/core/sysfs.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/core/sysfs.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/core/sysfs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/core/sysfs.c</a></div><div class='hunk'>@@ -743,6 +743,29 @@ static ssize_t show_modalias(struct device *dev,</div><div class='ctx'> }</div><div class='ctx'> static DEVICE_ATTR(modalias, S_IRUGO, show_modalias, NULL);</div><div class='ctx'> </div><div class='add'>+static ssize_t show_supports_autosuspend(struct device *dev,</div><div class='add'>+		struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct usb_interface *intf;</div><div class='add'>+	struct usb_device *udev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	intf = to_usb_interface(dev);</div><div class='add'>+	udev = interface_to_usbdev(intf);</div><div class='add'>+</div><div class='add'>+	usb_lock_device(udev);</div><div class='add'>+	/* Devices will be autosuspended even when an interface isn't claimed */</div><div class='add'>+	if (!intf-&gt;dev.driver ||</div><div class='add'>+			to_usb_driver(intf-&gt;dev.driver)-&gt;supports_autosuspend)</div><div class='add'>+		ret = sprintf(buf, "%u\n", 1);</div><div class='add'>+	else</div><div class='add'>+		ret = sprintf(buf, "%u\n", 0);</div><div class='add'>+	usb_unlock_device(udev);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+static DEVICE_ATTR(supports_autosuspend, S_IRUGO, show_supports_autosuspend, NULL);</div><div class='add'>+</div><div class='ctx'> static struct attribute *intf_attrs[] = {</div><div class='ctx'> 	&amp;dev_attr_bInterfaceNumber.attr,</div><div class='ctx'> 	&amp;dev_attr_bAlternateSetting.attr,</div><div class='hunk'>@@ -751,6 +774,7 @@ static struct attribute *intf_attrs[] = {</div><div class='ctx'> 	&amp;dev_attr_bInterfaceSubClass.attr,</div><div class='ctx'> 	&amp;dev_attr_bInterfaceProtocol.attr,</div><div class='ctx'> 	&amp;dev_attr_modalias.attr,</div><div class='add'>+	&amp;dev_attr_supports_autosuspend.attr,</div><div class='ctx'> 	NULL,</div><div class='ctx'> };</div><div class='ctx'> static struct attribute_group intf_attr_grp = {</div><div class='head'>diff --git a/drivers/usb/core/urb.c b/drivers/usb/core/urb.c<br/>index 47111e88f791..f2638009a464 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/core/urb.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/core/urb.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/core/urb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/core/urb.c</a></div><div class='hunk'>@@ -10,6 +10,8 @@</div><div class='ctx'> </div><div class='ctx'> #define to_urb(d) container_of(d, struct urb, kref)</div><div class='ctx'> </div><div class='add'>+static DEFINE_SPINLOCK(usb_reject_lock);</div><div class='add'>+</div><div class='ctx'> static void urb_destroy(struct kref *kref)</div><div class='ctx'> {</div><div class='ctx'> 	struct urb *urb = to_urb(kref);</div><div class='hunk'>@@ -68,7 +70,7 @@ struct urb *usb_alloc_urb(int iso_packets, gfp_t mem_flags)</div><div class='ctx'> 		iso_packets * sizeof(struct usb_iso_packet_descriptor),</div><div class='ctx'> 		mem_flags);</div><div class='ctx'> 	if (!urb) {</div><div class='del'>-		err("alloc_urb: kmalloc failed");</div><div class='add'>+		printk(KERN_ERR "alloc_urb: kmalloc failed\n");</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> 	usb_init_urb(urb);</div><div class='hunk'>@@ -127,6 +129,13 @@ void usb_anchor_urb(struct urb *urb, struct usb_anchor *anchor)</div><div class='ctx'> 	usb_get_urb(urb);</div><div class='ctx'> 	list_add_tail(&amp;urb-&gt;anchor_list, &amp;anchor-&gt;urb_list);</div><div class='ctx'> 	urb-&gt;anchor = anchor;</div><div class='add'>+</div><div class='add'>+	if (unlikely(anchor-&gt;poisoned)) {</div><div class='add'>+		spin_lock(&amp;usb_reject_lock);</div><div class='add'>+		urb-&gt;reject++;</div><div class='add'>+		spin_unlock(&amp;usb_reject_lock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;anchor-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(usb_anchor_urb);</div><div class='hunk'>@@ -398,7 +407,7 @@ int usb_submit_urb(struct urb *urb, gfp_t mem_flags)</div><div class='ctx'> </div><div class='ctx'> 	/* fail if submitter gave bogus flags */</div><div class='ctx'> 	if (urb-&gt;transfer_flags != orig_flags) {</div><div class='del'>-		err("BOGUS urb flags, %x --&gt; %x",</div><div class='add'>+		dev_err(&amp;dev-&gt;dev, "BOGUS urb flags, %x --&gt; %x\n",</div><div class='ctx'> 			orig_flags, urb-&gt;transfer_flags);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -544,25 +553,70 @@ EXPORT_SYMBOL_GPL(usb_unlink_urb);</div><div class='ctx'>  */</div><div class='ctx'> void usb_kill_urb(struct urb *urb)</div><div class='ctx'> {</div><div class='del'>-	static DEFINE_MUTEX(reject_mutex);</div><div class='del'>-</div><div class='ctx'> 	might_sleep();</div><div class='ctx'> 	if (!(urb &amp;&amp; urb-&gt;dev &amp;&amp; urb-&gt;ep))</div><div class='ctx'> 		return;</div><div class='del'>-	mutex_lock(&amp;reject_mutex);</div><div class='add'>+	spin_lock_irq(&amp;usb_reject_lock);</div><div class='ctx'> 	++urb-&gt;reject;</div><div class='del'>-	mutex_unlock(&amp;reject_mutex);</div><div class='add'>+	spin_unlock_irq(&amp;usb_reject_lock);</div><div class='ctx'> </div><div class='ctx'> 	usb_hcd_unlink_urb(urb, -ENOENT);</div><div class='ctx'> 	wait_event(usb_kill_urb_queue, atomic_read(&amp;urb-&gt;use_count) == 0);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;reject_mutex);</div><div class='add'>+	spin_lock_irq(&amp;usb_reject_lock);</div><div class='ctx'> 	--urb-&gt;reject;</div><div class='del'>-	mutex_unlock(&amp;reject_mutex);</div><div class='add'>+	spin_unlock_irq(&amp;usb_reject_lock);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(usb_kill_urb);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * usb_poison_urb - reliably kill a transfer and prevent further use of an URB</div><div class='add'>+ * @urb: pointer to URB describing a previously submitted request,</div><div class='add'>+ *	may be NULL</div><div class='add'>+ *</div><div class='add'>+ * This routine cancels an in-progress request.  It is guaranteed that</div><div class='add'>+ * upon return all completion handlers will have finished and the URB</div><div class='add'>+ * will be totally idle and cannot be reused.  These features make</div><div class='add'>+ * this an ideal way to stop I/O in a disconnect() callback.</div><div class='add'>+ * If the request has not already finished or been unlinked</div><div class='add'>+ * the completion handler will see urb-&gt;status == -ENOENT.</div><div class='add'>+ *</div><div class='add'>+ * After and while the routine runs, attempts to resubmit the URB will fail</div><div class='add'>+ * with error -EPERM.  Thus even if the URB's completion handler always</div><div class='add'>+ * tries to resubmit, it will not succeed and the URB will become idle.</div><div class='add'>+ *</div><div class='add'>+ * This routine may not be used in an interrupt context (such as a bottom</div><div class='add'>+ * half or a completion handler), or when holding a spinlock, or in other</div><div class='add'>+ * situations where the caller can't schedule().</div><div class='add'>+ */</div><div class='add'>+void usb_poison_urb(struct urb *urb)</div><div class='add'>+{</div><div class='add'>+	might_sleep();</div><div class='add'>+	if (!(urb &amp;&amp; urb-&gt;dev &amp;&amp; urb-&gt;ep))</div><div class='add'>+		return;</div><div class='add'>+	spin_lock_irq(&amp;usb_reject_lock);</div><div class='add'>+	++urb-&gt;reject;</div><div class='add'>+	spin_unlock_irq(&amp;usb_reject_lock);</div><div class='add'>+</div><div class='add'>+	usb_hcd_unlink_urb(urb, -ENOENT);</div><div class='add'>+	wait_event(usb_kill_urb_queue, atomic_read(&amp;urb-&gt;use_count) == 0);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(usb_poison_urb);</div><div class='add'>+</div><div class='add'>+void usb_unpoison_urb(struct urb *urb)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	if (!urb)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;usb_reject_lock, flags);</div><div class='add'>+	--urb-&gt;reject;</div><div class='add'>+	spin_unlock_irqrestore(&amp;usb_reject_lock, flags);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(usb_unpoison_urb);</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * usb_kill_anchored_urbs - cancel transfer requests en masse</div><div class='ctx'>  * @anchor: anchor the requests are bound to</div><div class='ctx'>  *</div><div class='hunk'>@@ -589,6 +643,35 @@ void usb_kill_anchored_urbs(struct usb_anchor *anchor)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(usb_kill_anchored_urbs);</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * usb_poison_anchored_urbs - cease all traffic from an anchor</div><div class='add'>+ * @anchor: anchor the requests are bound to</div><div class='add'>+ *</div><div class='add'>+ * this allows all outstanding URBs to be poisoned starting</div><div class='add'>+ * from the back of the queue. Newly added URBs will also be</div><div class='add'>+ * poisoned</div><div class='add'>+ */</div><div class='add'>+void usb_poison_anchored_urbs(struct usb_anchor *anchor)</div><div class='add'>+{</div><div class='add'>+	struct urb *victim;</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(&amp;anchor-&gt;lock);</div><div class='add'>+	anchor-&gt;poisoned = 1;</div><div class='add'>+	while (!list_empty(&amp;anchor-&gt;urb_list)) {</div><div class='add'>+		victim = list_entry(anchor-&gt;urb_list.prev, struct urb,</div><div class='add'>+				    anchor_list);</div><div class='add'>+		/* we must make sure the URB isn't freed before we kill it*/</div><div class='add'>+		usb_get_urb(victim);</div><div class='add'>+		spin_unlock_irq(&amp;anchor-&gt;lock);</div><div class='add'>+		/* this will unanchor the URB */</div><div class='add'>+		usb_poison_urb(victim);</div><div class='add'>+		usb_put_urb(victim);</div><div class='add'>+		spin_lock_irq(&amp;anchor-&gt;lock);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irq(&amp;anchor-&gt;lock);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(usb_poison_anchored_urbs);</div><div class='ctx'> /**</div><div class='ctx'>  * usb_unlink_anchored_urbs - asynchronously cancel transfer requests en masse</div><div class='ctx'>  * @anchor: anchor the requests are bound to</div><div class='hunk'>@@ -633,3 +716,73 @@ int usb_wait_anchor_empty_timeout(struct usb_anchor *anchor,</div><div class='ctx'> 				  msecs_to_jiffies(timeout));</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(usb_wait_anchor_empty_timeout);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * usb_get_from_anchor - get an anchor's oldest urb</div><div class='add'>+ * @anchor: the anchor whose urb you want</div><div class='add'>+ *</div><div class='add'>+ * this will take the oldest urb from an anchor,</div><div class='add'>+ * unanchor and return it</div><div class='add'>+ */</div><div class='add'>+struct urb *usb_get_from_anchor(struct usb_anchor *anchor)</div><div class='add'>+{</div><div class='add'>+	struct urb *victim;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;anchor-&gt;lock, flags);</div><div class='add'>+	if (!list_empty(&amp;anchor-&gt;urb_list)) {</div><div class='add'>+		victim = list_entry(anchor-&gt;urb_list.next, struct urb,</div><div class='add'>+				    anchor_list);</div><div class='add'>+		usb_get_urb(victim);</div><div class='add'>+		spin_unlock_irqrestore(&amp;anchor-&gt;lock, flags);</div><div class='add'>+		usb_unanchor_urb(victim);</div><div class='add'>+	} else {</div><div class='add'>+		spin_unlock_irqrestore(&amp;anchor-&gt;lock, flags);</div><div class='add'>+		victim = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return victim;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL_GPL(usb_get_from_anchor);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * usb_scuttle_anchored_urbs - unanchor all an anchor's urbs</div><div class='add'>+ * @anchor: the anchor whose urbs you want to unanchor</div><div class='add'>+ *</div><div class='add'>+ * use this to get rid of all an anchor's urbs</div><div class='add'>+ */</div><div class='add'>+void usb_scuttle_anchored_urbs(struct usb_anchor *anchor)</div><div class='add'>+{</div><div class='add'>+	struct urb *victim;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;anchor-&gt;lock, flags);</div><div class='add'>+	while (!list_empty(&amp;anchor-&gt;urb_list)) {</div><div class='add'>+		victim = list_entry(anchor-&gt;urb_list.prev, struct urb,</div><div class='add'>+				    anchor_list);</div><div class='add'>+		usb_get_urb(victim);</div><div class='add'>+		spin_unlock_irqrestore(&amp;anchor-&gt;lock, flags);</div><div class='add'>+		/* this may free the URB */</div><div class='add'>+		usb_unanchor_urb(victim);</div><div class='add'>+		usb_put_urb(victim);</div><div class='add'>+		spin_lock_irqsave(&amp;anchor-&gt;lock, flags);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;anchor-&gt;lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL_GPL(usb_scuttle_anchored_urbs);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * usb_anchor_empty - is an anchor empty</div><div class='add'>+ * @anchor: the anchor you want to query</div><div class='add'>+ *</div><div class='add'>+ * returns 1 if the anchor has no urbs associated with it</div><div class='add'>+ */</div><div class='add'>+int usb_anchor_empty(struct usb_anchor *anchor)</div><div class='add'>+{</div><div class='add'>+	return list_empty(&amp;anchor-&gt;urb_list);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL_GPL(usb_anchor_empty);</div><div class='add'>+</div><div class='head'>diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig<br/>index acc95b2ac6f8..dd4cd5a51370 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/gadget/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/gadget/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/gadget/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/gadget/Kconfig</a></div><div class='hunk'>@@ -45,7 +45,7 @@ if USB_GADGET</div><div class='ctx'> </div><div class='ctx'> config USB_GADGET_DEBUG</div><div class='ctx'> 	boolean "Debugging messages (DEVELOPMENT)"</div><div class='del'>-	depends on USB_GADGET &amp;&amp; DEBUG_KERNEL</div><div class='add'>+	depends on DEBUG_KERNEL</div><div class='ctx'> 	help</div><div class='ctx'> 	   Many controller and gadget drivers will print some debugging</div><div class='ctx'> 	   messages if you use this option to ask for those messages.</div><div class='hunk'>@@ -59,7 +59,7 @@ config USB_GADGET_DEBUG</div><div class='ctx'> </div><div class='ctx'> config USB_GADGET_DEBUG_FILES</div><div class='ctx'> 	boolean "Debugging information files (DEVELOPMENT)"</div><div class='del'>-	depends on USB_GADGET &amp;&amp; PROC_FS</div><div class='add'>+	depends on PROC_FS</div><div class='ctx'> 	help</div><div class='ctx'> 	   Some of the drivers in the "gadget" framework can expose</div><div class='ctx'> 	   debugging information in files such as /proc/driver/udc</div><div class='hunk'>@@ -70,7 +70,7 @@ config USB_GADGET_DEBUG_FILES</div><div class='ctx'> </div><div class='ctx'> config USB_GADGET_DEBUG_FS</div><div class='ctx'> 	boolean "Debugging information files in debugfs (DEVELOPMENT)"</div><div class='del'>-	depends on USB_GADGET &amp;&amp; DEBUG_FS</div><div class='add'>+	depends on DEBUG_FS</div><div class='ctx'> 	help</div><div class='ctx'> 	   Some of the drivers in the "gadget" framework can expose</div><div class='ctx'> 	   debugging information in files under /sys/kernel/debug/.</div><div class='hunk'>@@ -79,12 +79,36 @@ config USB_GADGET_DEBUG_FS</div><div class='ctx'> 	   Enable these files by choosing "Y" here.  If in doubt, or</div><div class='ctx'> 	   to conserve kernel memory, say "N".</div><div class='ctx'> </div><div class='add'>+config USB_GADGET_VBUS_DRAW</div><div class='add'>+	int "Maximum VBUS Power usage (2-500 mA)"</div><div class='add'>+	range 2 500</div><div class='add'>+	default 2</div><div class='add'>+	help</div><div class='add'>+	   Some devices need to draw power from USB when they are</div><div class='add'>+	   configured, perhaps to operate circuitry or to recharge</div><div class='add'>+	   batteries.  This is in addition to any local power supply,</div><div class='add'>+	   such as an AC adapter or batteries.</div><div class='add'>+</div><div class='add'>+	   Enter the maximum power your device draws through USB, in</div><div class='add'>+	   milliAmperes.  The permitted range of values is 2 - 500 mA;</div><div class='add'>+	   0 mA would be legal, but can make some hosts misbehave.</div><div class='add'>+</div><div class='add'>+	   This value will be used except for system-specific gadget</div><div class='add'>+	   drivers that have more specific information.</div><div class='add'>+</div><div class='ctx'> config	USB_GADGET_SELECTED</div><div class='ctx'> 	boolean</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB Peripheral Controller Support</div><div class='ctx'> #</div><div class='add'>+# The order here is alphabetical, except that integrated controllers go</div><div class='add'>+# before discrete ones so they will be the initial/default value:</div><div class='add'>+#   - integrated/SOC controllers first</div><div class='add'>+#   - licensed IP used in both SOC and discrete versions</div><div class='add'>+#   - discrete ones (including all PCI-only controllers)</div><div class='add'>+#   - debug/dummy gadget+hcd is last.</div><div class='add'>+#</div><div class='ctx'> choice</div><div class='ctx'> 	prompt "USB Peripheral Controller"</div><div class='ctx'> 	depends on USB_GADGET</div><div class='hunk'>@@ -94,26 +118,27 @@ choice</div><div class='ctx'> 	   Many controller drivers are platform-specific; these</div><div class='ctx'> 	   often need board-specific hooks.</div><div class='ctx'> </div><div class='del'>-config USB_GADGET_AMD5536UDC</div><div class='del'>-	boolean "AMD5536 UDC"</div><div class='del'>-	depends on PCI</div><div class='del'>-	select USB_GADGET_DUALSPEED</div><div class='add'>+#</div><div class='add'>+# Integrated controllers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+config USB_GADGET_AT91</div><div class='add'>+	boolean "Atmel AT91 USB Device Port"</div><div class='add'>+	depends on ARCH_AT91 &amp;&amp; !ARCH_AT91SAM9RL &amp;&amp; !ARCH_AT91CAP9</div><div class='add'>+	select USB_GADGET_SELECTED</div><div class='ctx'> 	help</div><div class='del'>-	   The AMD5536 UDC is part of the AMD Geode CS5536, an x86 southbridge.</div><div class='del'>-	   It is a USB Highspeed DMA capable USB device controller. Beside ep0</div><div class='del'>-	   it provides 4 IN and 4 OUT endpoints (bulk or interrupt type).</div><div class='del'>-	   The UDC port supports OTG operation, and may be used as a host port</div><div class='del'>-	   if it's not being used to implement peripheral or OTG roles.</div><div class='add'>+	   Many Atmel AT91 processors (such as the AT91RM2000) have a</div><div class='add'>+	   full speed USB Device Port with support for five configurable</div><div class='add'>+	   endpoints (plus endpoint zero).</div><div class='ctx'> </div><div class='ctx'> 	   Say "y" to link the driver statically, or "m" to build a</div><div class='del'>-	   dynamically linked module called "amd5536udc" and force all</div><div class='add'>+	   dynamically linked module called "at91_udc" and force all</div><div class='ctx'> 	   gadget drivers to also be dynamically linked.</div><div class='ctx'> </div><div class='del'>-config USB_AMD5536UDC</div><div class='add'>+config USB_AT91</div><div class='ctx'> 	tristate</div><div class='del'>-	depends on USB_GADGET_AMD5536UDC</div><div class='add'>+	depends on USB_GADGET_AT91</div><div class='ctx'> 	default USB_GADGET</div><div class='del'>-	select USB_GADGET_SELECTED</div><div class='ctx'> </div><div class='ctx'> config USB_GADGET_ATMEL_USBA</div><div class='ctx'> 	boolean "Atmel USBA"</div><div class='hunk'>@@ -150,28 +175,50 @@ config USB_FSL_USB2</div><div class='ctx'> 	default USB_GADGET</div><div class='ctx'> 	select USB_GADGET_SELECTED</div><div class='ctx'> </div><div class='del'>-config USB_GADGET_NET2280</div><div class='del'>-	boolean "NetChip 228x"</div><div class='del'>-	depends on PCI</div><div class='del'>-	select USB_GADGET_DUALSPEED</div><div class='add'>+config USB_GADGET_LH7A40X</div><div class='add'>+	boolean "LH7A40X"</div><div class='add'>+	depends on ARCH_LH7A40X</div><div class='ctx'> 	help</div><div class='del'>-	   NetChip 2280 / 2282 is a PCI based USB peripheral controller which</div><div class='del'>-	   supports both full and high speed USB 2.0 data transfers.  </div><div class='del'>-	   </div><div class='del'>-	   It has six configurable endpoints, as well as endpoint zero</div><div class='del'>-	   (for control transfers) and several endpoints with dedicated</div><div class='del'>-	   functions.</div><div class='add'>+	   This driver provides USB Device Controller driver for LH7A40x</div><div class='add'>+</div><div class='add'>+config USB_LH7A40X</div><div class='add'>+	tristate</div><div class='add'>+	depends on USB_GADGET_LH7A40X</div><div class='add'>+	default USB_GADGET</div><div class='add'>+	select USB_GADGET_SELECTED</div><div class='add'>+</div><div class='add'>+config USB_GADGET_OMAP</div><div class='add'>+	boolean "OMAP USB Device Controller"</div><div class='add'>+	depends on ARCH_OMAP</div><div class='add'>+	select ISP1301_OMAP if MACH_OMAP_H2 || MACH_OMAP_H3 || MACH_OMAP_H4_OTG</div><div class='add'>+	help</div><div class='add'>+	   Many Texas Instruments OMAP processors have flexible full</div><div class='add'>+	   speed USB device controllers, with support for up to 30</div><div class='add'>+	   endpoints (plus endpoint zero).  This driver supports the</div><div class='add'>+	   controller in the OMAP 1611, and should work with controllers</div><div class='add'>+	   in other OMAP processors too, given minor tweaks.</div><div class='ctx'> </div><div class='ctx'> 	   Say "y" to link the driver statically, or "m" to build a</div><div class='del'>-	   dynamically linked module called "net2280" and force all</div><div class='add'>+	   dynamically linked module called "omap_udc" and force all</div><div class='ctx'> 	   gadget drivers to also be dynamically linked.</div><div class='ctx'> </div><div class='del'>-config USB_NET2280</div><div class='add'>+config USB_OMAP</div><div class='ctx'> 	tristate</div><div class='del'>-	depends on USB_GADGET_NET2280</div><div class='add'>+	depends on USB_GADGET_OMAP</div><div class='ctx'> 	default USB_GADGET</div><div class='ctx'> 	select USB_GADGET_SELECTED</div><div class='ctx'> </div><div class='add'>+config USB_OTG</div><div class='add'>+	boolean "OTG Support"</div><div class='add'>+	depends on USB_GADGET_OMAP &amp;&amp; ARCH_OMAP_OTG &amp;&amp; USB_OHCI_HCD</div><div class='add'>+	help</div><div class='add'>+	   The most notable feature of USB OTG is support for a</div><div class='add'>+	   "Dual-Role" device, which can act as either a device</div><div class='add'>+	   or a host.  The initial role choice can be changed</div><div class='add'>+	   later, when two dual-role devices talk to each other.</div><div class='add'>+</div><div class='add'>+	   Select this only if your OMAP board has a Mini-AB connector.</div><div class='add'>+</div><div class='ctx'> config USB_GADGET_PXA25X</div><div class='ctx'> 	boolean "PXA 25x or IXP 4xx"</div><div class='ctx'> 	depends on (ARCH_PXA &amp;&amp; PXA25x) || ARCH_IXP4XX</div><div class='hunk'>@@ -203,34 +250,6 @@ config USB_PXA25X_SMALL</div><div class='ctx'> 	default y if USB_ETH</div><div class='ctx'> 	default y if USB_G_SERIAL</div><div class='ctx'> </div><div class='del'>-config USB_GADGET_M66592</div><div class='del'>-	boolean "Renesas M66592 USB Peripheral Controller"</div><div class='del'>-	select USB_GADGET_DUALSPEED</div><div class='del'>-	help</div><div class='del'>-	   M66592 is a discrete USB peripheral controller chip that</div><div class='del'>-	   supports both full and high speed USB 2.0 data transfers.</div><div class='del'>-	   It has seven configurable endpoints, and endpoint zero.</div><div class='del'>-</div><div class='del'>-	   Say "y" to link the driver statically, or "m" to build a</div><div class='del'>-	   dynamically linked module called "m66592_udc" and force all</div><div class='del'>-	   gadget drivers to also be dynamically linked.</div><div class='del'>-</div><div class='del'>-config USB_M66592</div><div class='del'>-	tristate</div><div class='del'>-	depends on USB_GADGET_M66592</div><div class='del'>-	default USB_GADGET</div><div class='del'>-	select USB_GADGET_SELECTED</div><div class='del'>-</div><div class='del'>-config SUPERH_BUILT_IN_M66592</div><div class='del'>-	boolean "Enable SuperH built-in USB like the M66592"</div><div class='del'>-	depends on USB_GADGET_M66592 &amp;&amp; CPU_SUBTYPE_SH7722</div><div class='del'>-	help</div><div class='del'>-	   SH7722 has USB like the M66592.</div><div class='del'>-</div><div class='del'>-	   The transfer rate is very slow when use "Ethernet Gadget".</div><div class='del'>-	   However, this problem is improved if change a value of</div><div class='del'>-	   NET_IP_ALIGN to 4.</div><div class='del'>-</div><div class='ctx'> config USB_GADGET_PXA27X</div><div class='ctx'> 	boolean "PXA 27x"</div><div class='ctx'> 	depends on ARCH_PXA &amp;&amp; PXA27x</div><div class='hunk'>@@ -251,40 +270,32 @@ config USB_PXA27X</div><div class='ctx'> 	default USB_GADGET</div><div class='ctx'> 	select USB_GADGET_SELECTED</div><div class='ctx'> </div><div class='del'>-config USB_GADGET_GOKU</div><div class='del'>-	boolean "Toshiba TC86C001 'Goku-S'"</div><div class='del'>-	depends on PCI</div><div class='add'>+config USB_GADGET_S3C2410</div><div class='add'>+	boolean "S3C2410 USB Device Controller"</div><div class='add'>+	depends on ARCH_S3C2410</div><div class='ctx'> 	help</div><div class='del'>-	   The Toshiba TC86C001 is a PCI device which includes controllers</div><div class='del'>-	   for full speed USB devices, IDE, I2C, SIO, plus a USB host (OHCI).</div><div class='del'>-	   </div><div class='del'>-	   The device controller has three configurable (bulk or interrupt)</div><div class='del'>-	   endpoints, plus endpoint zero (for control transfers).</div><div class='add'>+	  Samsung's S3C2410 is an ARM-4 processor with an integrated</div><div class='add'>+	  full speed USB 1.1 device controller.  It has 4 configurable</div><div class='add'>+	  endpoints, as well as endpoint zero (for control transfers).</div><div class='ctx'> </div><div class='del'>-	   Say "y" to link the driver statically, or "m" to build a</div><div class='del'>-	   dynamically linked module called "goku_udc" and to force all</div><div class='del'>-	   gadget drivers to also be dynamically linked.</div><div class='add'>+	  This driver has been tested on the S3C2410, S3C2412, and</div><div class='add'>+	  S3C2440 processors.</div><div class='ctx'> </div><div class='del'>-config USB_GOKU</div><div class='add'>+config USB_S3C2410</div><div class='ctx'> 	tristate</div><div class='del'>-	depends on USB_GADGET_GOKU</div><div class='add'>+	depends on USB_GADGET_S3C2410</div><div class='ctx'> 	default USB_GADGET</div><div class='ctx'> 	select USB_GADGET_SELECTED</div><div class='ctx'> </div><div class='add'>+config USB_S3C2410_DEBUG</div><div class='add'>+	boolean "S3C2410 udc debug messages"</div><div class='add'>+	depends on USB_GADGET_S3C2410</div><div class='ctx'> </div><div class='del'>-config USB_GADGET_LH7A40X</div><div class='del'>-	boolean "LH7A40X"</div><div class='del'>-	depends on ARCH_LH7A40X</div><div class='del'>-	help</div><div class='del'>-    This driver provides USB Device Controller driver for LH7A40x</div><div class='del'>-</div><div class='del'>-config USB_LH7A40X</div><div class='del'>-	tristate</div><div class='del'>-	depends on USB_GADGET_LH7A40X</div><div class='del'>-	default USB_GADGET</div><div class='del'>-	select USB_GADGET_SELECTED</div><div class='add'>+#</div><div class='add'>+# Controllers available in both integrated and discrete versions</div><div class='add'>+#</div><div class='ctx'> </div><div class='del'>-# built in ../musb along with host support</div><div class='add'>+# musb builds in ../musb along with host support</div><div class='ctx'> config USB_GADGET_MUSB_HDRC</div><div class='ctx'> 	boolean "Inventra HDRC USB Peripheral (TI, ...)"</div><div class='ctx'> 	depends on USB_MUSB_HDRC &amp;&amp; (USB_MUSB_PERIPHERAL || USB_MUSB_OTG)</div><div class='hunk'>@@ -294,76 +305,124 @@ config USB_GADGET_MUSB_HDRC</div><div class='ctx'> 	  This OTG-capable silicon IP is used in dual designs including</div><div class='ctx'> 	  the TI DaVinci, OMAP 243x, OMAP 343x, and TUSB 6010.</div><div class='ctx'> </div><div class='del'>-config USB_GADGET_OMAP</div><div class='del'>-	boolean "OMAP USB Device Controller"</div><div class='del'>-	depends on ARCH_OMAP</div><div class='del'>-	select ISP1301_OMAP if MACH_OMAP_H2 || MACH_OMAP_H3</div><div class='add'>+config USB_GADGET_M66592</div><div class='add'>+	boolean "Renesas M66592 USB Peripheral Controller"</div><div class='add'>+	select USB_GADGET_DUALSPEED</div><div class='ctx'> 	help</div><div class='del'>-	   Many Texas Instruments OMAP processors have flexible full</div><div class='del'>-	   speed USB device controllers, with support for up to 30</div><div class='del'>-	   endpoints (plus endpoint zero).  This driver supports the</div><div class='del'>-	   controller in the OMAP 1611, and should work with controllers</div><div class='del'>-	   in other OMAP processors too, given minor tweaks.</div><div class='add'>+	   M66592 is a discrete USB peripheral controller chip that</div><div class='add'>+	   supports both full and high speed USB 2.0 data transfers.</div><div class='add'>+	   It has seven configurable endpoints, and endpoint zero.</div><div class='ctx'> </div><div class='ctx'> 	   Say "y" to link the driver statically, or "m" to build a</div><div class='del'>-	   dynamically linked module called "omap_udc" and force all</div><div class='add'>+	   dynamically linked module called "m66592_udc" and force all</div><div class='ctx'> 	   gadget drivers to also be dynamically linked.</div><div class='ctx'> </div><div class='del'>-config USB_OMAP</div><div class='add'>+config USB_M66592</div><div class='ctx'> 	tristate</div><div class='del'>-	depends on USB_GADGET_OMAP</div><div class='add'>+	depends on USB_GADGET_M66592</div><div class='ctx'> 	default USB_GADGET</div><div class='ctx'> 	select USB_GADGET_SELECTED</div><div class='ctx'> </div><div class='del'>-config USB_OTG</div><div class='del'>-	boolean "OTG Support"</div><div class='del'>-	depends on USB_GADGET_OMAP &amp;&amp; ARCH_OMAP_OTG &amp;&amp; USB_OHCI_HCD</div><div class='add'>+config SUPERH_BUILT_IN_M66592</div><div class='add'>+	boolean "Enable SuperH built-in USB like the M66592"</div><div class='add'>+	depends on USB_GADGET_M66592 &amp;&amp; CPU_SUBTYPE_SH7722</div><div class='ctx'> 	help</div><div class='del'>-	   The most notable feature of USB OTG is support for a</div><div class='del'>-	   "Dual-Role" device, which can act as either a device</div><div class='del'>-	   or a host.  The initial role choice can be changed</div><div class='del'>-	   later, when two dual-role devices talk to each other.</div><div class='add'>+	   SH7722 has USB like the M66592.</div><div class='ctx'> </div><div class='del'>-	   Select this only if your OMAP board has a Mini-AB connector.</div><div class='add'>+	   The transfer rate is very slow when use "Ethernet Gadget".</div><div class='add'>+	   However, this problem is improved if change a value of</div><div class='add'>+	   NET_IP_ALIGN to 4.</div><div class='ctx'> </div><div class='del'>-config USB_GADGET_S3C2410</div><div class='del'>-	boolean "S3C2410 USB Device Controller"</div><div class='del'>-	depends on ARCH_S3C2410</div><div class='add'>+#</div><div class='add'>+# Controllers available only in discrete form (and all PCI controllers)</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+config USB_GADGET_AMD5536UDC</div><div class='add'>+	boolean "AMD5536 UDC"</div><div class='add'>+	depends on PCI</div><div class='add'>+	select USB_GADGET_DUALSPEED</div><div class='ctx'> 	help</div><div class='del'>-	  Samsung's S3C2410 is an ARM-4 processor with an integrated</div><div class='del'>-	  full speed USB 1.1 device controller.  It has 4 configurable</div><div class='del'>-	  endpoints, as well as endpoint zero (for control transfers).</div><div class='add'>+	   The AMD5536 UDC is part of the AMD Geode CS5536, an x86 southbridge.</div><div class='add'>+	   It is a USB Highspeed DMA capable USB device controller. Beside ep0</div><div class='add'>+	   it provides 4 IN and 4 OUT endpoints (bulk or interrupt type).</div><div class='add'>+	   The UDC port supports OTG operation, and may be used as a host port</div><div class='add'>+	   if it's not being used to implement peripheral or OTG roles.</div><div class='ctx'> </div><div class='del'>-	  This driver has been tested on the S3C2410, S3C2412, and</div><div class='del'>-	  S3C2440 processors.</div><div class='add'>+	   Say "y" to link the driver statically, or "m" to build a</div><div class='add'>+	   dynamically linked module called "amd5536udc" and force all</div><div class='add'>+	   gadget drivers to also be dynamically linked.</div><div class='ctx'> </div><div class='del'>-config USB_S3C2410</div><div class='add'>+config USB_AMD5536UDC</div><div class='ctx'> 	tristate</div><div class='del'>-	depends on USB_GADGET_S3C2410</div><div class='add'>+	depends on USB_GADGET_AMD5536UDC</div><div class='ctx'> 	default USB_GADGET</div><div class='ctx'> 	select USB_GADGET_SELECTED</div><div class='ctx'> </div><div class='del'>-config USB_S3C2410_DEBUG</div><div class='del'>-	boolean "S3C2410 udc debug messages"</div><div class='del'>-	depends on USB_GADGET_S3C2410</div><div class='add'>+config USB_GADGET_FSL_QE</div><div class='add'>+	boolean "Freescale QE/CPM USB Device Controller"</div><div class='add'>+	depends on FSL_SOC &amp;&amp; (QUICC_ENGINE || CPM)</div><div class='add'>+	help</div><div class='add'>+	   Some of Freescale PowerPC processors have a Full Speed</div><div class='add'>+	   QE/CPM2 USB controller, which support device mode with 4</div><div class='add'>+	   programmable endpoints. This driver supports the</div><div class='add'>+	   controller in the MPC8360 and MPC8272, and should work with</div><div class='add'>+	   controllers having QE or CPM2, given minor tweaks.</div><div class='ctx'> </div><div class='del'>-config USB_GADGET_AT91</div><div class='del'>-	boolean "AT91 USB Device Port"</div><div class='del'>-	depends on ARCH_AT91 &amp;&amp; !ARCH_AT91SAM9RL &amp;&amp; !ARCH_AT91CAP9</div><div class='add'>+	   Set CONFIG_USB_GADGET to "m" to build this driver as a</div><div class='add'>+	   dynmically linked module called "fsl_qe_udc".</div><div class='add'>+</div><div class='add'>+config USB_FSL_QE</div><div class='add'>+	tristate</div><div class='add'>+	depends on USB_GADGET_FSL_QE</div><div class='add'>+	default USB_GADGET</div><div class='ctx'> 	select USB_GADGET_SELECTED</div><div class='add'>+</div><div class='add'>+config USB_GADGET_NET2280</div><div class='add'>+	boolean "NetChip 228x"</div><div class='add'>+	depends on PCI</div><div class='add'>+	select USB_GADGET_DUALSPEED</div><div class='ctx'> 	help</div><div class='del'>-	   Many Atmel AT91 processors (such as the AT91RM2000) have a</div><div class='del'>-	   full speed USB Device Port with support for five configurable</div><div class='del'>-	   endpoints (plus endpoint zero).</div><div class='add'>+	   NetChip 2280 / 2282 is a PCI based USB peripheral controller which</div><div class='add'>+	   supports both full and high speed USB 2.0 data transfers.</div><div class='add'>+</div><div class='add'>+	   It has six configurable endpoints, as well as endpoint zero</div><div class='add'>+	   (for control transfers) and several endpoints with dedicated</div><div class='add'>+	   functions.</div><div class='ctx'> </div><div class='ctx'> 	   Say "y" to link the driver statically, or "m" to build a</div><div class='del'>-	   dynamically linked module called "at91_udc" and force all</div><div class='add'>+	   dynamically linked module called "net2280" and force all</div><div class='ctx'> 	   gadget drivers to also be dynamically linked.</div><div class='ctx'> </div><div class='del'>-config USB_AT91</div><div class='add'>+config USB_NET2280</div><div class='ctx'> 	tristate</div><div class='del'>-	depends on USB_GADGET_AT91</div><div class='add'>+	depends on USB_GADGET_NET2280</div><div class='add'>+	default USB_GADGET</div><div class='add'>+	select USB_GADGET_SELECTED</div><div class='add'>+</div><div class='add'>+config USB_GADGET_GOKU</div><div class='add'>+	boolean "Toshiba TC86C001 'Goku-S'"</div><div class='add'>+	depends on PCI</div><div class='add'>+	help</div><div class='add'>+	   The Toshiba TC86C001 is a PCI device which includes controllers</div><div class='add'>+	   for full speed USB devices, IDE, I2C, SIO, plus a USB host (OHCI).</div><div class='add'>+</div><div class='add'>+	   The device controller has three configurable (bulk or interrupt)</div><div class='add'>+	   endpoints, plus endpoint zero (for control transfers).</div><div class='add'>+</div><div class='add'>+	   Say "y" to link the driver statically, or "m" to build a</div><div class='add'>+	   dynamically linked module called "goku_udc" and to force all</div><div class='add'>+	   gadget drivers to also be dynamically linked.</div><div class='add'>+</div><div class='add'>+config USB_GOKU</div><div class='add'>+	tristate</div><div class='add'>+	depends on USB_GADGET_GOKU</div><div class='ctx'> 	default USB_GADGET</div><div class='add'>+	select USB_GADGET_SELECTED</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# LAST -- dummy/emulated controller</div><div class='add'>+#</div><div class='ctx'> </div><div class='ctx'> config USB_GADGET_DUMMY_HCD</div><div class='ctx'> 	boolean "Dummy HCD (DEVELOPMENT)"</div><div class='hunk'>@@ -553,19 +612,23 @@ config USB_FILE_STORAGE_TEST</div><div class='ctx'> 	  normal operation.</div><div class='ctx'> </div><div class='ctx'> config USB_G_SERIAL</div><div class='del'>-	tristate "Serial Gadget (with CDC ACM support)"</div><div class='add'>+	tristate "Serial Gadget (with CDC ACM and CDC OBEX support)"</div><div class='ctx'> 	help</div><div class='ctx'> 	  The Serial Gadget talks to the Linux-USB generic serial driver.</div><div class='ctx'> 	  This driver supports a CDC-ACM module option, which can be used</div><div class='ctx'> 	  to interoperate with MS-Windows hosts or with the Linux-USB</div><div class='ctx'> 	  "cdc-acm" driver.</div><div class='ctx'> </div><div class='add'>+	  This driver also supports a CDC-OBEX option.  You will need a</div><div class='add'>+	  user space OBEX server talking to /dev/ttyGS*, since the kernel</div><div class='add'>+	  itself doesn't implement the OBEX protocol.</div><div class='add'>+</div><div class='ctx'> 	  Say "y" to link the driver statically, or "m" to build a</div><div class='ctx'> 	  dynamically linked module called "g_serial".</div><div class='ctx'> </div><div class='ctx'> 	  For more information, see Documentation/usb/gadget_serial.txt</div><div class='ctx'> 	  which includes instructions and a "driver info file" needed to</div><div class='del'>-	  make MS-Windows work with this driver.</div><div class='add'>+	  make MS-Windows work with CDC ACM.</div><div class='ctx'> </div><div class='ctx'> config USB_MIDI_GADGET</div><div class='ctx'> 	tristate "MIDI Gadget (EXPERIMENTAL)"</div><div class='head'>diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile<br/>index fcb5cb9094d9..bd4041b47dce 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/gadget/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/gadget/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/gadget/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/gadget/Makefile</a></div><div class='hunk'>@@ -18,28 +18,20 @@ obj-$(CONFIG_USB_AT91)		+= at91_udc.o</div><div class='ctx'> obj-$(CONFIG_USB_ATMEL_USBA)	+= atmel_usba_udc.o</div><div class='ctx'> obj-$(CONFIG_USB_FSL_USB2)	+= fsl_usb2_udc.o</div><div class='ctx'> obj-$(CONFIG_USB_M66592)	+= m66592-udc.o</div><div class='add'>+obj-$(CONFIG_USB_FSL_QE)	+= fsl_qe_udc.o</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB gadget drivers</div><div class='ctx'> #</div><div class='del'>-C_UTILS =	composite.o usbstring.o config.o epautoconf.o</div><div class='del'>-</div><div class='del'>-g_zero-objs			:= zero.o f_sourcesink.o f_loopback.o $(C_UTILS)</div><div class='del'>-g_ether-objs			:= ether.o u_ether.o f_subset.o f_ecm.o $(C_UTILS)</div><div class='del'>-g_serial-objs			:= serial.o u_serial.o f_acm.o f_serial.o $(C_UTILS)</div><div class='del'>-g_midi-objs			:= gmidi.o usbstring.o config.o epautoconf.o</div><div class='add'>+g_zero-objs			:= zero.o</div><div class='add'>+g_ether-objs			:= ether.o</div><div class='add'>+g_serial-objs			:= serial.o</div><div class='add'>+g_midi-objs			:= gmidi.o</div><div class='ctx'> gadgetfs-objs			:= inode.o</div><div class='del'>-g_file_storage-objs		:= file_storage.o usbstring.o config.o \</div><div class='del'>-					epautoconf.o</div><div class='del'>-g_printer-objs			:= printer.o usbstring.o config.o \</div><div class='del'>-					epautoconf.o</div><div class='del'>-g_cdc-objs			:= cdc2.o u_ether.o f_ecm.o \</div><div class='del'>-					u_serial.o f_acm.o $(C_UTILS)</div><div class='add'>+g_file_storage-objs		:= file_storage.o</div><div class='add'>+g_printer-objs			:= printer.o</div><div class='add'>+g_cdc-objs			:= cdc2.o</div><div class='ctx'> </div><div class='del'>-ifeq ($(CONFIG_USB_ETH_RNDIS),y)</div><div class='del'>-	g_ether-objs		+= f_rndis.o rndis.o</div><div class='del'>-endif</div><div class='del'>- </div><div class='ctx'> obj-$(CONFIG_USB_ZERO)		+= g_zero.o</div><div class='ctx'> obj-$(CONFIG_USB_ETH)		+= g_ether.o</div><div class='ctx'> obj-$(CONFIG_USB_GADGETFS)	+= gadgetfs.o</div><div class='head'>diff --git a/drivers/usb/gadget/cdc2.c b/drivers/usb/gadget/cdc2.c<br/>index a39a4b940c33..5495b171cf29 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/gadget/cdc2.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/gadget/cdc2.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/gadget/cdc2.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/gadget/cdc2.c</a></div><div class='hunk'>@@ -43,6 +43,25 @@</div><div class='ctx'> </div><div class='ctx'> /*-------------------------------------------------------------------------*/</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Kbuild is not very cooperative with respect to linking separately</div><div class='add'>+ * compiled library objects into one module.  So for now we won't use</div><div class='add'>+ * separate compilation ... ensuring init/exit sections work to shrink</div><div class='add'>+ * the runtime footprint, and giving us at least some parts of what</div><div class='add'>+ * a "gcc --combine ... part1.c part2.c part3.c ... " build would.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "composite.c"</div><div class='add'>+#include "usbstring.c"</div><div class='add'>+#include "config.c"</div><div class='add'>+#include "epautoconf.c"</div><div class='add'>+#include "u_serial.c"</div><div class='add'>+#include "f_acm.c"</div><div class='add'>+#include "f_ecm.c"</div><div class='add'>+#include "u_ether.c"</div><div class='add'>+</div><div class='add'>+/*-------------------------------------------------------------------------*/</div><div class='add'>+</div><div class='ctx'> static struct usb_device_descriptor device_desc = {</div><div class='ctx'> 	.bLength =		sizeof device_desc,</div><div class='ctx'> 	.bDescriptorType =	USB_DT_DEVICE,</div><div class='hunk'>@@ -136,7 +155,6 @@ static struct usb_configuration cdc_config_driver = {</div><div class='ctx'> 	.bConfigurationValue	= 1,</div><div class='ctx'> 	/* .iConfiguration = DYNAMIC */</div><div class='ctx'> 	.bmAttributes		= USB_CONFIG_ATT_SELFPOWER,</div><div class='del'>-	.bMaxPower		= 1,	/* 2 mA, minimal */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*-------------------------------------------------------------------------*/</div><div class='hunk'>@@ -148,7 +166,8 @@ static int __init cdc_bind(struct usb_composite_dev *cdev)</div><div class='ctx'> 	int			status;</div><div class='ctx'> </div><div class='ctx'> 	if (!can_support_ecm(cdev-&gt;gadget)) {</div><div class='del'>-		ERROR(cdev, "controller '%s' not usable\n", gadget-&gt;name);</div><div class='add'>+		dev_err(&amp;gadget-&gt;dev, "controller '%s' not usable\n",</div><div class='add'>+				gadget-&gt;name);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -203,7 +222,8 @@ static int __init cdc_bind(struct usb_composite_dev *cdev)</div><div class='ctx'> 	if (status &lt; 0)</div><div class='ctx'> 		goto fail1;</div><div class='ctx'> </div><div class='del'>-	INFO(cdev, "%s, version: " DRIVER_VERSION "\n", DRIVER_DESC);</div><div class='add'>+	dev_info(&amp;gadget-&gt;dev, "%s, version: " DRIVER_VERSION "\n",</div><div class='add'>+			DRIVER_DESC);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c<br/>index 85c876c1f150..f2da0269e1b1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/gadget/composite.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/gadget/composite.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/gadget/composite.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/gadget/composite.c</a></div><div class='hunk'>@@ -128,6 +128,70 @@ done:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * usb_function_deactivate - prevent function and gadget enumeration</div><div class='add'>+ * @function: the function that isn't yet ready to respond</div><div class='add'>+ *</div><div class='add'>+ * Blocks response of the gadget driver to host enumeration by</div><div class='add'>+ * preventing the data line pullup from being activated.  This is</div><div class='add'>+ * normally called during @bind() processing to change from the</div><div class='add'>+ * initial "ready to respond" state, or when a required resource</div><div class='add'>+ * becomes available.</div><div class='add'>+ *</div><div class='add'>+ * For example, drivers that serve as a passthrough to a userspace</div><div class='add'>+ * daemon can block enumeration unless that daemon (such as an OBEX,</div><div class='add'>+ * MTP, or print server) is ready to handle host requests.</div><div class='add'>+ *</div><div class='add'>+ * Not all systems support software control of their USB peripheral</div><div class='add'>+ * data pullups.</div><div class='add'>+ *</div><div class='add'>+ * Returns zero on success, else negative errno.</div><div class='add'>+ */</div><div class='add'>+int usb_function_deactivate(struct usb_function *function)</div><div class='add'>+{</div><div class='add'>+	struct usb_composite_dev	*cdev = function-&gt;config-&gt;cdev;</div><div class='add'>+	int				status = 0;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;cdev-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (cdev-&gt;deactivations == 0)</div><div class='add'>+		status = usb_gadget_disconnect(cdev-&gt;gadget);</div><div class='add'>+	if (status == 0)</div><div class='add'>+		cdev-&gt;deactivations++;</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;cdev-&gt;lock);</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * usb_function_activate - allow function and gadget enumeration</div><div class='add'>+ * @function: function on which usb_function_activate() was called</div><div class='add'>+ *</div><div class='add'>+ * Reverses effect of usb_function_deactivate().  If no more functions</div><div class='add'>+ * are delaying their activation, the gadget driver will respond to</div><div class='add'>+ * host enumeration procedures.</div><div class='add'>+ *</div><div class='add'>+ * Returns zero on success, else negative errno.</div><div class='add'>+ */</div><div class='add'>+int usb_function_activate(struct usb_function *function)</div><div class='add'>+{</div><div class='add'>+	struct usb_composite_dev	*cdev = function-&gt;config-&gt;cdev;</div><div class='add'>+	int				status = 0;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;cdev-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(cdev-&gt;deactivations == 0))</div><div class='add'>+		status = -EINVAL;</div><div class='add'>+	else {</div><div class='add'>+		cdev-&gt;deactivations--;</div><div class='add'>+		if (cdev-&gt;deactivations == 0)</div><div class='add'>+			status = usb_gadget_connect(cdev-&gt;gadget);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;cdev-&gt;lock);</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * usb_interface_id() - allocate an unused interface ID</div><div class='ctx'>  * @config: configuration associated with the interface</div><div class='ctx'>  * @function: function handling the interface</div><div class='hunk'>@@ -181,7 +245,7 @@ static int config_buf(struct usb_configuration *config,</div><div class='ctx'> 	c-&gt;bConfigurationValue = config-&gt;bConfigurationValue;</div><div class='ctx'> 	c-&gt;iConfiguration = config-&gt;iConfiguration;</div><div class='ctx'> 	c-&gt;bmAttributes = USB_CONFIG_ATT_ONE | config-&gt;bmAttributes;</div><div class='del'>-	c-&gt;bMaxPower = config-&gt;bMaxPower;</div><div class='add'>+	c-&gt;bMaxPower = config-&gt;bMaxPower ? : (CONFIG_USB_GADGET_VBUS_DRAW / 2);</div><div class='ctx'> </div><div class='ctx'> 	/* There may be e.g. OTG descriptors */</div><div class='ctx'> 	if (config-&gt;descriptors) {</div><div class='hunk'>@@ -368,7 +432,7 @@ static int set_config(struct usb_composite_dev *cdev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* when we return, be sure our power usage is valid */</div><div class='del'>-	power = 2 * c-&gt;bMaxPower;</div><div class='add'>+	power = c-&gt;bMaxPower ? (2 * c-&gt;bMaxPower) : CONFIG_USB_GADGET_VBUS_DRAW;</div><div class='ctx'> done:</div><div class='ctx'> 	usb_gadget_vbus_draw(gadget, power);</div><div class='ctx'> 	return result;</div><div class='head'>diff --git a/drivers/usb/gadget/dummy_hcd.c b/drivers/usb/gadget/dummy_hcd.c<br/>index 7600a0c78753..9064696636ac 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/gadget/dummy_hcd.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/gadget/dummy_hcd.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/gadget/dummy_hcd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/gadget/dummy_hcd.c</a></div><div class='hunk'>@@ -82,6 +82,7 @@ struct dummy_ep {</div><div class='ctx'> 	const struct usb_endpoint_descriptor *desc;</div><div class='ctx'> 	struct usb_ep			ep;</div><div class='ctx'> 	unsigned			halted : 1;</div><div class='add'>+	unsigned			wedged : 1;</div><div class='ctx'> 	unsigned			already_seen : 1;</div><div class='ctx'> 	unsigned			setup_stage : 1;</div><div class='ctx'> };</div><div class='hunk'>@@ -436,6 +437,7 @@ dummy_enable (struct usb_ep *_ep, const struct usb_endpoint_descriptor *desc)</div><div class='ctx'> 	/* at this point real hardware should be NAKing transfers</div><div class='ctx'> 	 * to that endpoint, until a buffer is queued to it.</div><div class='ctx'> 	 */</div><div class='add'>+	ep-&gt;halted = ep-&gt;wedged = 0;</div><div class='ctx'> 	retval = 0;</div><div class='ctx'> done:</div><div class='ctx'> 	return retval;</div><div class='hunk'>@@ -597,7 +599,7 @@ static int dummy_dequeue (struct usb_ep *_ep, struct usb_request *_req)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-dummy_set_halt (struct usb_ep *_ep, int value)</div><div class='add'>+dummy_set_halt_and_wedge(struct usb_ep *_ep, int value, int wedged)</div><div class='ctx'> {</div><div class='ctx'> 	struct dummy_ep		*ep;</div><div class='ctx'> 	struct dummy		*dum;</div><div class='hunk'>@@ -609,16 +611,32 @@ dummy_set_halt (struct usb_ep *_ep, int value)</div><div class='ctx'> 	if (!dum-&gt;driver)</div><div class='ctx'> 		return -ESHUTDOWN;</div><div class='ctx'> 	if (!value)</div><div class='del'>-		ep-&gt;halted = 0;</div><div class='add'>+		ep-&gt;halted = ep-&gt;wedged = 0;</div><div class='ctx'> 	else if (ep-&gt;desc &amp;&amp; (ep-&gt;desc-&gt;bEndpointAddress &amp; USB_DIR_IN) &amp;&amp;</div><div class='ctx'> 			!list_empty (&amp;ep-&gt;queue))</div><div class='ctx'> 		return -EAGAIN;</div><div class='del'>-	else</div><div class='add'>+	else {</div><div class='ctx'> 		ep-&gt;halted = 1;</div><div class='add'>+		if (wedged)</div><div class='add'>+			ep-&gt;wedged = 1;</div><div class='add'>+	}</div><div class='ctx'> 	/* FIXME clear emulated data toggle too */</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int</div><div class='add'>+dummy_set_halt(struct usb_ep *_ep, int value)</div><div class='add'>+{</div><div class='add'>+	return dummy_set_halt_and_wedge(_ep, value, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dummy_set_wedge(struct usb_ep *_ep)</div><div class='add'>+{</div><div class='add'>+	if (!_ep || _ep-&gt;name == ep0name)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	return dummy_set_halt_and_wedge(_ep, 1, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct usb_ep_ops dummy_ep_ops = {</div><div class='ctx'> 	.enable		= dummy_enable,</div><div class='ctx'> 	.disable	= dummy_disable,</div><div class='hunk'>@@ -630,6 +648,7 @@ static const struct usb_ep_ops dummy_ep_ops = {</div><div class='ctx'> 	.dequeue	= dummy_dequeue,</div><div class='ctx'> </div><div class='ctx'> 	.set_halt	= dummy_set_halt,</div><div class='add'>+	.set_wedge	= dummy_set_wedge,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*-------------------------------------------------------------------------*/</div><div class='hunk'>@@ -760,7 +779,8 @@ usb_gadget_register_driver (struct usb_gadget_driver *driver)</div><div class='ctx'> 		ep-&gt;ep.name = ep_name [i];</div><div class='ctx'> 		ep-&gt;ep.ops = &amp;dummy_ep_ops;</div><div class='ctx'> 		list_add_tail (&amp;ep-&gt;ep.ep_list, &amp;dum-&gt;gadget.ep_list);</div><div class='del'>-		ep-&gt;halted = ep-&gt;already_seen = ep-&gt;setup_stage = 0;</div><div class='add'>+		ep-&gt;halted = ep-&gt;wedged = ep-&gt;already_seen =</div><div class='add'>+				ep-&gt;setup_stage = 0;</div><div class='ctx'> 		ep-&gt;ep.maxpacket = ~0;</div><div class='ctx'> 		ep-&gt;last_io = jiffies;</div><div class='ctx'> 		ep-&gt;gadget = &amp;dum-&gt;gadget;</div><div class='hunk'>@@ -1351,7 +1371,7 @@ restart:</div><div class='ctx'> 				} else if (setup.bRequestType == Ep_Request) {</div><div class='ctx'> 					// endpoint halt</div><div class='ctx'> 					ep2 = find_endpoint (dum, w_index);</div><div class='del'>-					if (!ep2) {</div><div class='add'>+					if (!ep2 || ep2-&gt;ep.name == ep0name) {</div><div class='ctx'> 						value = -EOPNOTSUPP;</div><div class='ctx'> 						break;</div><div class='ctx'> 					}</div><div class='hunk'>@@ -1380,7 +1400,8 @@ restart:</div><div class='ctx'> 						value = -EOPNOTSUPP;</div><div class='ctx'> 						break;</div><div class='ctx'> 					}</div><div class='del'>-					ep2-&gt;halted = 0;</div><div class='add'>+					if (!ep2-&gt;wedged)</div><div class='add'>+						ep2-&gt;halted = 0;</div><div class='ctx'> 					value = 0;</div><div class='ctx'> 					status = 0;</div><div class='ctx'> 				}</div><div class='head'>diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c<br/>index bcac2e68660d..37252d0012a7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/gadget/ether.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/gadget/ether.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/gadget/ether.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/gadget/ether.c</a></div><div class='hunk'>@@ -96,6 +96,28 @@ static inline bool has_rndis(void)</div><div class='ctx'> </div><div class='ctx'> /*-------------------------------------------------------------------------*/</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Kbuild is not very cooperative with respect to linking separately</div><div class='add'>+ * compiled library objects into one module.  So for now we won't use</div><div class='add'>+ * separate compilation ... ensuring init/exit sections work to shrink</div><div class='add'>+ * the runtime footprint, and giving us at least some parts of what</div><div class='add'>+ * a "gcc --combine ... part1.c part2.c part3.c ... " build would.</div><div class='add'>+ */</div><div class='add'>+#include "composite.c"</div><div class='add'>+#include "usbstring.c"</div><div class='add'>+#include "config.c"</div><div class='add'>+#include "epautoconf.c"</div><div class='add'>+</div><div class='add'>+#include "f_ecm.c"</div><div class='add'>+#include "f_subset.c"</div><div class='add'>+#ifdef	CONFIG_USB_ETH_RNDIS</div><div class='add'>+#include "f_rndis.c"</div><div class='add'>+#include "rndis.c"</div><div class='add'>+#endif</div><div class='add'>+#include "u_ether.c"</div><div class='add'>+</div><div class='add'>+/*-------------------------------------------------------------------------*/</div><div class='add'>+</div><div class='ctx'> /* DO NOT REUSE THESE IDs with a protocol-incompatible driver!!  Ever!!</div><div class='ctx'>  * Instead:  allocate your own, using normal USB-IF procedures.</div><div class='ctx'>  */</div><div class='hunk'>@@ -220,7 +242,6 @@ static struct usb_configuration rndis_config_driver = {</div><div class='ctx'> 	.bConfigurationValue	= 2,</div><div class='ctx'> 	/* .iConfiguration = DYNAMIC */</div><div class='ctx'> 	.bmAttributes		= USB_CONFIG_ATT_SELFPOWER,</div><div class='del'>-	.bMaxPower		= 1,	/* 2 mA, minimal */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*-------------------------------------------------------------------------*/</div><div class='hunk'>@@ -249,7 +270,6 @@ static struct usb_configuration eth_config_driver = {</div><div class='ctx'> 	.bConfigurationValue	= 1,</div><div class='ctx'> 	/* .iConfiguration = DYNAMIC */</div><div class='ctx'> 	.bmAttributes		= USB_CONFIG_ATT_SELFPOWER,</div><div class='del'>-	.bMaxPower		= 1,	/* 2 mA, minimal */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*-------------------------------------------------------------------------*/</div><div class='hunk'>@@ -293,7 +313,8 @@ static int __init eth_bind(struct usb_composite_dev *cdev)</div><div class='ctx'> 		 * but if the controller isn't recognized at all then</div><div class='ctx'> 		 * that assumption is a bit more likely to be wrong.</div><div class='ctx'> 		 */</div><div class='del'>-		WARNING(cdev, "controller '%s' not recognized; trying %s\n",</div><div class='add'>+		dev_warn(&amp;gadget-&gt;dev,</div><div class='add'>+				"controller '%s' not recognized; trying %s\n",</div><div class='ctx'> 				gadget-&gt;name,</div><div class='ctx'> 				eth_config_driver.label);</div><div class='ctx'> 		device_desc.bcdDevice =</div><div class='hunk'>@@ -332,7 +353,8 @@ static int __init eth_bind(struct usb_composite_dev *cdev)</div><div class='ctx'> 	if (status &lt; 0)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='del'>-	INFO(cdev, "%s, version: " DRIVER_VERSION "\n", DRIVER_DESC);</div><div class='add'>+	dev_info(&amp;gadget-&gt;dev, "%s, version: " DRIVER_VERSION "\n",</div><div class='add'>+			DRIVER_DESC);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/usb/gadget/f_ecm.c b/drivers/usb/gadget/f_ecm.c<br/>index a2b5c092bda0..4ae579948e54 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/gadget/f_ecm.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/gadget/f_ecm.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/gadget/f_ecm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/gadget/f_ecm.c</a></div><div class='hunk'>@@ -83,7 +83,7 @@ static inline struct f_ecm *func_to_ecm(struct usb_function *f)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* peak (theoretical) bulk transfer rate in bits-per-second */</div><div class='del'>-static inline unsigned bitrate(struct usb_gadget *g)</div><div class='add'>+static inline unsigned ecm_bitrate(struct usb_gadget *g)</div><div class='ctx'> {</div><div class='ctx'> 	if (gadget_is_dualspeed(g) &amp;&amp; g-&gt;speed == USB_SPEED_HIGH)</div><div class='ctx'> 		return 13 * 512 * 8 * 1000 * 8;</div><div class='hunk'>@@ -107,7 +107,7 @@ static inline unsigned bitrate(struct usb_gadget *g)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define LOG2_STATUS_INTERVAL_MSEC	5	/* 1 &lt;&lt; 5 == 32 msec */</div><div class='del'>-#define STATUS_BYTECOUNT		16	/* 8 byte header + data */</div><div class='add'>+#define ECM_STATUS_BYTECOUNT		16	/* 8 byte header + data */</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* interface descriptor: */</div><div class='hunk'>@@ -125,8 +125,8 @@ static struct usb_interface_descriptor ecm_control_intf __initdata = {</div><div class='ctx'> 	/* .iInterface = DYNAMIC */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct usb_cdc_header_desc header_desc __initdata = {</div><div class='del'>-	.bLength =		sizeof header_desc,</div><div class='add'>+static struct usb_cdc_header_desc ecm_header_desc __initdata = {</div><div class='add'>+	.bLength =		sizeof ecm_header_desc,</div><div class='ctx'> 	.bDescriptorType =	USB_DT_CS_INTERFACE,</div><div class='ctx'> 	.bDescriptorSubType =	USB_CDC_HEADER_TYPE,</div><div class='ctx'> </div><div class='hunk'>@@ -141,8 +141,8 @@ static struct usb_cdc_union_desc ecm_union_desc __initdata = {</div><div class='ctx'> 	/* .bSlaveInterface0 =	DYNAMIC */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct usb_cdc_ether_desc ether_desc __initdata = {</div><div class='del'>-	.bLength =		sizeof ether_desc,</div><div class='add'>+static struct usb_cdc_ether_desc ecm_desc __initdata = {</div><div class='add'>+	.bLength =		sizeof ecm_desc,</div><div class='ctx'> 	.bDescriptorType =	USB_DT_CS_INTERFACE,</div><div class='ctx'> 	.bDescriptorSubType =	USB_CDC_ETHERNET_TYPE,</div><div class='ctx'> </div><div class='hunk'>@@ -186,17 +186,17 @@ static struct usb_interface_descriptor ecm_data_intf __initdata = {</div><div class='ctx'> </div><div class='ctx'> /* full speed support: */</div><div class='ctx'> </div><div class='del'>-static struct usb_endpoint_descriptor fs_notify_desc __initdata = {</div><div class='add'>+static struct usb_endpoint_descriptor fs_ecm_notify_desc __initdata = {</div><div class='ctx'> 	.bLength =		USB_DT_ENDPOINT_SIZE,</div><div class='ctx'> 	.bDescriptorType =	USB_DT_ENDPOINT,</div><div class='ctx'> </div><div class='ctx'> 	.bEndpointAddress =	USB_DIR_IN,</div><div class='ctx'> 	.bmAttributes =		USB_ENDPOINT_XFER_INT,</div><div class='del'>-	.wMaxPacketSize =	__constant_cpu_to_le16(STATUS_BYTECOUNT),</div><div class='add'>+	.wMaxPacketSize =	__constant_cpu_to_le16(ECM_STATUS_BYTECOUNT),</div><div class='ctx'> 	.bInterval =		1 &lt;&lt; LOG2_STATUS_INTERVAL_MSEC,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct usb_endpoint_descriptor fs_in_desc __initdata = {</div><div class='add'>+static struct usb_endpoint_descriptor fs_ecm_in_desc __initdata = {</div><div class='ctx'> 	.bLength =		USB_DT_ENDPOINT_SIZE,</div><div class='ctx'> 	.bDescriptorType =	USB_DT_ENDPOINT,</div><div class='ctx'> </div><div class='hunk'>@@ -204,7 +204,7 @@ static struct usb_endpoint_descriptor fs_in_desc __initdata = {</div><div class='ctx'> 	.bmAttributes =		USB_ENDPOINT_XFER_BULK,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct usb_endpoint_descriptor fs_out_desc __initdata = {</div><div class='add'>+static struct usb_endpoint_descriptor fs_ecm_out_desc __initdata = {</div><div class='ctx'> 	.bLength =		USB_DT_ENDPOINT_SIZE,</div><div class='ctx'> 	.bDescriptorType =	USB_DT_ENDPOINT,</div><div class='ctx'> </div><div class='hunk'>@@ -212,34 +212,34 @@ static struct usb_endpoint_descriptor fs_out_desc __initdata = {</div><div class='ctx'> 	.bmAttributes =		USB_ENDPOINT_XFER_BULK,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct usb_descriptor_header *eth_fs_function[] __initdata = {</div><div class='add'>+static struct usb_descriptor_header *ecm_fs_function[] __initdata = {</div><div class='ctx'> 	/* CDC ECM control descriptors */</div><div class='ctx'> 	(struct usb_descriptor_header *) &amp;ecm_control_intf,</div><div class='del'>-	(struct usb_descriptor_header *) &amp;header_desc,</div><div class='add'>+	(struct usb_descriptor_header *) &amp;ecm_header_desc,</div><div class='ctx'> 	(struct usb_descriptor_header *) &amp;ecm_union_desc,</div><div class='del'>-	(struct usb_descriptor_header *) &amp;ether_desc,</div><div class='add'>+	(struct usb_descriptor_header *) &amp;ecm_desc,</div><div class='ctx'> 	/* NOTE: status endpoint might need to be removed */</div><div class='del'>-	(struct usb_descriptor_header *) &amp;fs_notify_desc,</div><div class='add'>+	(struct usb_descriptor_header *) &amp;fs_ecm_notify_desc,</div><div class='ctx'> 	/* data interface, altsettings 0 and 1 */</div><div class='ctx'> 	(struct usb_descriptor_header *) &amp;ecm_data_nop_intf,</div><div class='ctx'> 	(struct usb_descriptor_header *) &amp;ecm_data_intf,</div><div class='del'>-	(struct usb_descriptor_header *) &amp;fs_in_desc,</div><div class='del'>-	(struct usb_descriptor_header *) &amp;fs_out_desc,</div><div class='add'>+	(struct usb_descriptor_header *) &amp;fs_ecm_in_desc,</div><div class='add'>+	(struct usb_descriptor_header *) &amp;fs_ecm_out_desc,</div><div class='ctx'> 	NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* high speed support: */</div><div class='ctx'> </div><div class='del'>-static struct usb_endpoint_descriptor hs_notify_desc __initdata = {</div><div class='add'>+static struct usb_endpoint_descriptor hs_ecm_notify_desc __initdata = {</div><div class='ctx'> 	.bLength =		USB_DT_ENDPOINT_SIZE,</div><div class='ctx'> 	.bDescriptorType =	USB_DT_ENDPOINT,</div><div class='ctx'> </div><div class='ctx'> 	.bEndpointAddress =	USB_DIR_IN,</div><div class='ctx'> 	.bmAttributes =		USB_ENDPOINT_XFER_INT,</div><div class='del'>-	.wMaxPacketSize =	__constant_cpu_to_le16(STATUS_BYTECOUNT),</div><div class='add'>+	.wMaxPacketSize =	__constant_cpu_to_le16(ECM_STATUS_BYTECOUNT),</div><div class='ctx'> 	.bInterval =		LOG2_STATUS_INTERVAL_MSEC + 4,</div><div class='ctx'> };</div><div class='del'>-static struct usb_endpoint_descriptor hs_in_desc __initdata = {</div><div class='add'>+static struct usb_endpoint_descriptor hs_ecm_in_desc __initdata = {</div><div class='ctx'> 	.bLength =		USB_DT_ENDPOINT_SIZE,</div><div class='ctx'> 	.bDescriptorType =	USB_DT_ENDPOINT,</div><div class='ctx'> </div><div class='hunk'>@@ -248,7 +248,7 @@ static struct usb_endpoint_descriptor hs_in_desc __initdata = {</div><div class='ctx'> 	.wMaxPacketSize =	__constant_cpu_to_le16(512),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct usb_endpoint_descriptor hs_out_desc __initdata = {</div><div class='add'>+static struct usb_endpoint_descriptor hs_ecm_out_desc __initdata = {</div><div class='ctx'> 	.bLength =		USB_DT_ENDPOINT_SIZE,</div><div class='ctx'> 	.bDescriptorType =	USB_DT_ENDPOINT,</div><div class='ctx'> </div><div class='hunk'>@@ -257,19 +257,19 @@ static struct usb_endpoint_descriptor hs_out_desc __initdata = {</div><div class='ctx'> 	.wMaxPacketSize =	__constant_cpu_to_le16(512),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct usb_descriptor_header *eth_hs_function[] __initdata = {</div><div class='add'>+static struct usb_descriptor_header *ecm_hs_function[] __initdata = {</div><div class='ctx'> 	/* CDC ECM control descriptors */</div><div class='ctx'> 	(struct usb_descriptor_header *) &amp;ecm_control_intf,</div><div class='del'>-	(struct usb_descriptor_header *) &amp;header_desc,</div><div class='add'>+	(struct usb_descriptor_header *) &amp;ecm_header_desc,</div><div class='ctx'> 	(struct usb_descriptor_header *) &amp;ecm_union_desc,</div><div class='del'>-	(struct usb_descriptor_header *) &amp;ether_desc,</div><div class='add'>+	(struct usb_descriptor_header *) &amp;ecm_desc,</div><div class='ctx'> 	/* NOTE: status endpoint might need to be removed */</div><div class='del'>-	(struct usb_descriptor_header *) &amp;hs_notify_desc,</div><div class='add'>+	(struct usb_descriptor_header *) &amp;hs_ecm_notify_desc,</div><div class='ctx'> 	/* data interface, altsettings 0 and 1 */</div><div class='ctx'> 	(struct usb_descriptor_header *) &amp;ecm_data_nop_intf,</div><div class='ctx'> 	(struct usb_descriptor_header *) &amp;ecm_data_intf,</div><div class='del'>-	(struct usb_descriptor_header *) &amp;hs_in_desc,</div><div class='del'>-	(struct usb_descriptor_header *) &amp;hs_out_desc,</div><div class='add'>+	(struct usb_descriptor_header *) &amp;hs_ecm_in_desc,</div><div class='add'>+	(struct usb_descriptor_header *) &amp;hs_ecm_out_desc,</div><div class='ctx'> 	NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -329,14 +329,14 @@ static void ecm_do_notify(struct f_ecm *ecm)</div><div class='ctx'> 		event-&gt;bNotificationType = USB_CDC_NOTIFY_SPEED_CHANGE;</div><div class='ctx'> 		event-&gt;wValue = cpu_to_le16(0);</div><div class='ctx'> 		event-&gt;wLength = cpu_to_le16(8);</div><div class='del'>-		req-&gt;length = STATUS_BYTECOUNT;</div><div class='add'>+		req-&gt;length = ECM_STATUS_BYTECOUNT;</div><div class='ctx'> </div><div class='ctx'> 		/* SPEED_CHANGE data is up/down speeds in bits/sec */</div><div class='ctx'> 		data = req-&gt;buf + sizeof *event;</div><div class='del'>-		data[0] = cpu_to_le32(bitrate(cdev-&gt;gadget));</div><div class='add'>+		data[0] = cpu_to_le32(ecm_bitrate(cdev-&gt;gadget));</div><div class='ctx'> 		data[1] = data[0];</div><div class='ctx'> </div><div class='del'>-		DBG(cdev, "notify speed %d\n", bitrate(cdev-&gt;gadget));</div><div class='add'>+		DBG(cdev, "notify speed %d\n", ecm_bitrate(cdev-&gt;gadget));</div><div class='ctx'> 		ecm-&gt;notify_state = ECM_NOTIFY_NONE;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -628,13 +628,13 @@ ecm_bind(struct usb_configuration *c, struct usb_function *f)</div><div class='ctx'> 	status = -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	/* allocate instance-specific endpoints */</div><div class='del'>-	ep = usb_ep_autoconfig(cdev-&gt;gadget, &amp;fs_in_desc);</div><div class='add'>+	ep = usb_ep_autoconfig(cdev-&gt;gadget, &amp;fs_ecm_in_desc);</div><div class='ctx'> 	if (!ep)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	ecm-&gt;port.in_ep = ep;</div><div class='ctx'> 	ep-&gt;driver_data = cdev;	/* claim */</div><div class='ctx'> </div><div class='del'>-	ep = usb_ep_autoconfig(cdev-&gt;gadget, &amp;fs_out_desc);</div><div class='add'>+	ep = usb_ep_autoconfig(cdev-&gt;gadget, &amp;fs_ecm_out_desc);</div><div class='ctx'> 	if (!ep)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	ecm-&gt;port.out_ep = ep;</div><div class='hunk'>@@ -644,7 +644,7 @@ ecm_bind(struct usb_configuration *c, struct usb_function *f)</div><div class='ctx'> 	 * don't treat it that way.  It's simpler, and some newer CDC</div><div class='ctx'> 	 * profiles (wireless handsets) no longer treat it as optional.</div><div class='ctx'> 	 */</div><div class='del'>-	ep = usb_ep_autoconfig(cdev-&gt;gadget, &amp;fs_notify_desc);</div><div class='add'>+	ep = usb_ep_autoconfig(cdev-&gt;gadget, &amp;fs_ecm_notify_desc);</div><div class='ctx'> 	if (!ep)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	ecm-&gt;notify = ep;</div><div class='hunk'>@@ -656,47 +656,47 @@ ecm_bind(struct usb_configuration *c, struct usb_function *f)</div><div class='ctx'> 	ecm-&gt;notify_req = usb_ep_alloc_request(ep, GFP_KERNEL);</div><div class='ctx'> 	if (!ecm-&gt;notify_req)</div><div class='ctx'> 		goto fail;</div><div class='del'>-	ecm-&gt;notify_req-&gt;buf = kmalloc(STATUS_BYTECOUNT, GFP_KERNEL);</div><div class='add'>+	ecm-&gt;notify_req-&gt;buf = kmalloc(ECM_STATUS_BYTECOUNT, GFP_KERNEL);</div><div class='ctx'> 	if (!ecm-&gt;notify_req-&gt;buf)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	ecm-&gt;notify_req-&gt;context = ecm;</div><div class='ctx'> 	ecm-&gt;notify_req-&gt;complete = ecm_notify_complete;</div><div class='ctx'> </div><div class='ctx'> 	/* copy descriptors, and track endpoint copies */</div><div class='del'>-	f-&gt;descriptors = usb_copy_descriptors(eth_fs_function);</div><div class='add'>+	f-&gt;descriptors = usb_copy_descriptors(ecm_fs_function);</div><div class='ctx'> 	if (!f-&gt;descriptors)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='del'>-	ecm-&gt;fs.in = usb_find_endpoint(eth_fs_function,</div><div class='del'>-			f-&gt;descriptors, &amp;fs_in_desc);</div><div class='del'>-	ecm-&gt;fs.out = usb_find_endpoint(eth_fs_function,</div><div class='del'>-			f-&gt;descriptors, &amp;fs_out_desc);</div><div class='del'>-	ecm-&gt;fs.notify = usb_find_endpoint(eth_fs_function,</div><div class='del'>-			f-&gt;descriptors, &amp;fs_notify_desc);</div><div class='add'>+	ecm-&gt;fs.in = usb_find_endpoint(ecm_fs_function,</div><div class='add'>+			f-&gt;descriptors, &amp;fs_ecm_in_desc);</div><div class='add'>+	ecm-&gt;fs.out = usb_find_endpoint(ecm_fs_function,</div><div class='add'>+			f-&gt;descriptors, &amp;fs_ecm_out_desc);</div><div class='add'>+	ecm-&gt;fs.notify = usb_find_endpoint(ecm_fs_function,</div><div class='add'>+			f-&gt;descriptors, &amp;fs_ecm_notify_desc);</div><div class='ctx'> </div><div class='ctx'> 	/* support all relevant hardware speeds... we expect that when</div><div class='ctx'> 	 * hardware is dual speed, all bulk-capable endpoints work at</div><div class='ctx'> 	 * both speeds</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (gadget_is_dualspeed(c-&gt;cdev-&gt;gadget)) {</div><div class='del'>-		hs_in_desc.bEndpointAddress =</div><div class='del'>-				fs_in_desc.bEndpointAddress;</div><div class='del'>-		hs_out_desc.bEndpointAddress =</div><div class='del'>-				fs_out_desc.bEndpointAddress;</div><div class='del'>-		hs_notify_desc.bEndpointAddress =</div><div class='del'>-				fs_notify_desc.bEndpointAddress;</div><div class='add'>+		hs_ecm_in_desc.bEndpointAddress =</div><div class='add'>+				fs_ecm_in_desc.bEndpointAddress;</div><div class='add'>+		hs_ecm_out_desc.bEndpointAddress =</div><div class='add'>+				fs_ecm_out_desc.bEndpointAddress;</div><div class='add'>+		hs_ecm_notify_desc.bEndpointAddress =</div><div class='add'>+				fs_ecm_notify_desc.bEndpointAddress;</div><div class='ctx'> </div><div class='ctx'> 		/* copy descriptors, and track endpoint copies */</div><div class='del'>-		f-&gt;hs_descriptors = usb_copy_descriptors(eth_hs_function);</div><div class='add'>+		f-&gt;hs_descriptors = usb_copy_descriptors(ecm_hs_function);</div><div class='ctx'> 		if (!f-&gt;hs_descriptors)</div><div class='ctx'> 			goto fail;</div><div class='ctx'> </div><div class='del'>-		ecm-&gt;hs.in = usb_find_endpoint(eth_hs_function,</div><div class='del'>-				f-&gt;hs_descriptors, &amp;hs_in_desc);</div><div class='del'>-		ecm-&gt;hs.out = usb_find_endpoint(eth_hs_function,</div><div class='del'>-				f-&gt;hs_descriptors, &amp;hs_out_desc);</div><div class='del'>-		ecm-&gt;hs.notify = usb_find_endpoint(eth_hs_function,</div><div class='del'>-				f-&gt;hs_descriptors, &amp;hs_notify_desc);</div><div class='add'>+		ecm-&gt;hs.in = usb_find_endpoint(ecm_hs_function,</div><div class='add'>+				f-&gt;hs_descriptors, &amp;hs_ecm_in_desc);</div><div class='add'>+		ecm-&gt;hs.out = usb_find_endpoint(ecm_hs_function,</div><div class='add'>+				f-&gt;hs_descriptors, &amp;hs_ecm_out_desc);</div><div class='add'>+		ecm-&gt;hs.notify = usb_find_endpoint(ecm_hs_function,</div><div class='add'>+				f-&gt;hs_descriptors, &amp;hs_ecm_notify_desc);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* NOTE:  all that is done without knowing or caring about</div><div class='hunk'>@@ -795,7 +795,7 @@ int __init ecm_bind_config(struct usb_configuration *c, u8 ethaddr[ETH_ALEN])</div><div class='ctx'> 		if (status &lt; 0)</div><div class='ctx'> 			return status;</div><div class='ctx'> 		ecm_string_defs[1].id = status;</div><div class='del'>-		ether_desc.iMACAddress = status;</div><div class='add'>+		ecm_desc.iMACAddress = status;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* allocate and initialize one new instance */</div><div class='head'>diff --git a/drivers/usb/gadget/f_loopback.c b/drivers/usb/gadget/f_loopback.c<br/>index eda4cde72c82..8affe1dfc2c1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/gadget/f_loopback.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/gadget/f_loopback.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/gadget/f_loopback.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/gadget/f_loopback.c</a></div><div class='hunk'>@@ -70,7 +70,7 @@ static struct usb_interface_descriptor loopback_intf = {</div><div class='ctx'> </div><div class='ctx'> /* full speed support: */</div><div class='ctx'> </div><div class='del'>-static struct usb_endpoint_descriptor fs_source_desc = {</div><div class='add'>+static struct usb_endpoint_descriptor fs_loop_source_desc = {</div><div class='ctx'> 	.bLength =		USB_DT_ENDPOINT_SIZE,</div><div class='ctx'> 	.bDescriptorType =	USB_DT_ENDPOINT,</div><div class='ctx'> </div><div class='hunk'>@@ -78,7 +78,7 @@ static struct usb_endpoint_descriptor fs_source_desc = {</div><div class='ctx'> 	.bmAttributes =		USB_ENDPOINT_XFER_BULK,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct usb_endpoint_descriptor fs_sink_desc = {</div><div class='add'>+static struct usb_endpoint_descriptor fs_loop_sink_desc = {</div><div class='ctx'> 	.bLength =		USB_DT_ENDPOINT_SIZE,</div><div class='ctx'> 	.bDescriptorType =	USB_DT_ENDPOINT,</div><div class='ctx'> </div><div class='hunk'>@@ -88,14 +88,14 @@ static struct usb_endpoint_descriptor fs_sink_desc = {</div><div class='ctx'> </div><div class='ctx'> static struct usb_descriptor_header *fs_loopback_descs[] = {</div><div class='ctx'> 	(struct usb_descriptor_header *) &amp;loopback_intf,</div><div class='del'>-	(struct usb_descriptor_header *) &amp;fs_sink_desc,</div><div class='del'>-	(struct usb_descriptor_header *) &amp;fs_source_desc,</div><div class='add'>+	(struct usb_descriptor_header *) &amp;fs_loop_sink_desc,</div><div class='add'>+	(struct usb_descriptor_header *) &amp;fs_loop_source_desc,</div><div class='ctx'> 	NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* high speed support: */</div><div class='ctx'> </div><div class='del'>-static struct usb_endpoint_descriptor hs_source_desc = {</div><div class='add'>+static struct usb_endpoint_descriptor hs_loop_source_desc = {</div><div class='ctx'> 	.bLength =		USB_DT_ENDPOINT_SIZE,</div><div class='ctx'> 	.bDescriptorType =	USB_DT_ENDPOINT,</div><div class='ctx'> </div><div class='hunk'>@@ -103,7 +103,7 @@ static struct usb_endpoint_descriptor hs_source_desc = {</div><div class='ctx'> 	.wMaxPacketSize =	__constant_cpu_to_le16(512),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct usb_endpoint_descriptor hs_sink_desc = {</div><div class='add'>+static struct usb_endpoint_descriptor hs_loop_sink_desc = {</div><div class='ctx'> 	.bLength =		USB_DT_ENDPOINT_SIZE,</div><div class='ctx'> 	.bDescriptorType =	USB_DT_ENDPOINT,</div><div class='ctx'> </div><div class='hunk'>@@ -113,8 +113,8 @@ static struct usb_endpoint_descriptor hs_sink_desc = {</div><div class='ctx'> </div><div class='ctx'> static struct usb_descriptor_header *hs_loopback_descs[] = {</div><div class='ctx'> 	(struct usb_descriptor_header *) &amp;loopback_intf,</div><div class='del'>-	(struct usb_descriptor_header *) &amp;hs_source_desc,</div><div class='del'>-	(struct usb_descriptor_header *) &amp;hs_sink_desc,</div><div class='add'>+	(struct usb_descriptor_header *) &amp;hs_loop_source_desc,</div><div class='add'>+	(struct usb_descriptor_header *) &amp;hs_loop_sink_desc,</div><div class='ctx'> 	NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -152,7 +152,7 @@ loopback_bind(struct usb_configuration *c, struct usb_function *f)</div><div class='ctx'> </div><div class='ctx'> 	/* allocate endpoints */</div><div class='ctx'> </div><div class='del'>-	loop-&gt;in_ep = usb_ep_autoconfig(cdev-&gt;gadget, &amp;fs_source_desc);</div><div class='add'>+	loop-&gt;in_ep = usb_ep_autoconfig(cdev-&gt;gadget, &amp;fs_loop_source_desc);</div><div class='ctx'> 	if (!loop-&gt;in_ep) {</div><div class='ctx'> autoconf_fail:</div><div class='ctx'> 		ERROR(cdev, "%s: can't autoconfigure on %s\n",</div><div class='hunk'>@@ -161,17 +161,17 @@ autoconf_fail:</div><div class='ctx'> 	}</div><div class='ctx'> 	loop-&gt;in_ep-&gt;driver_data = cdev;	/* claim */</div><div class='ctx'> </div><div class='del'>-	loop-&gt;out_ep = usb_ep_autoconfig(cdev-&gt;gadget, &amp;fs_sink_desc);</div><div class='add'>+	loop-&gt;out_ep = usb_ep_autoconfig(cdev-&gt;gadget, &amp;fs_loop_sink_desc);</div><div class='ctx'> 	if (!loop-&gt;out_ep)</div><div class='ctx'> 		goto autoconf_fail;</div><div class='ctx'> 	loop-&gt;out_ep-&gt;driver_data = cdev;	/* claim */</div><div class='ctx'> </div><div class='ctx'> 	/* support high speed hardware */</div><div class='ctx'> 	if (gadget_is_dualspeed(c-&gt;cdev-&gt;gadget)) {</div><div class='del'>-		hs_source_desc.bEndpointAddress =</div><div class='del'>-				fs_source_desc.bEndpointAddress;</div><div class='del'>-		hs_sink_desc.bEndpointAddress =</div><div class='del'>-				fs_sink_desc.bEndpointAddress;</div><div class='add'>+		hs_loop_source_desc.bEndpointAddress =</div><div class='add'>+				fs_loop_source_desc.bEndpointAddress;</div><div class='add'>+		hs_loop_sink_desc.bEndpointAddress =</div><div class='add'>+				fs_loop_sink_desc.bEndpointAddress;</div><div class='ctx'> 		f-&gt;hs_descriptors = hs_loopback_descs;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -255,8 +255,10 @@ enable_loopback(struct usb_composite_dev *cdev, struct f_loopback *loop)</div><div class='ctx'> 	struct usb_request			*req;</div><div class='ctx'> 	unsigned				i;</div><div class='ctx'> </div><div class='del'>-	src = ep_choose(cdev-&gt;gadget, &amp;hs_source_desc, &amp;fs_source_desc);</div><div class='del'>-	sink = ep_choose(cdev-&gt;gadget, &amp;hs_sink_desc, &amp;fs_sink_desc);</div><div class='add'>+	src = ep_choose(cdev-&gt;gadget,</div><div class='add'>+			&amp;hs_loop_source_desc, &amp;fs_loop_source_desc);</div><div class='add'>+	sink = ep_choose(cdev-&gt;gadget,</div><div class='add'>+			&amp;hs_loop_sink_desc, &amp;fs_loop_sink_desc);</div><div class='ctx'> </div><div class='ctx'> 	/* one endpoint writes data back IN to the host */</div><div class='ctx'> 	ep = loop-&gt;in_ep;</div><div class='hunk'>@@ -350,7 +352,6 @@ static struct usb_configuration loopback_driver = {</div><div class='ctx'> 	.bind		= loopback_bind_config,</div><div class='ctx'> 	.bConfigurationValue = 2,</div><div class='ctx'> 	.bmAttributes	= USB_CONFIG_ATT_SELFPOWER,</div><div class='del'>-	.bMaxPower	= 1,	/* 2 mA, minimal */</div><div class='ctx'> 	/* .iConfiguration = DYNAMIC */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/usb/gadget/f_obex.c b/drivers/usb/gadget/f_obex.c<br/>new file mode 100644<br/>index 000000000000..80c2e7e9622f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/gadget/f_obex.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/gadget/f_obex.c</a></div><div class='hunk'>@@ -0,0 +1,493 @@</div><div class='add'>+/*</div><div class='add'>+ * f_obex.c -- USB CDC OBEX function driver</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2008 Nokia Corporation</div><div class='add'>+ * Contact: Felipe Balbi &lt;felipe.balbi@nokia.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * Based on f_acm.c by Al Borchers and David Brownell.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* #define VERBOSE_DEBUG */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/utsname.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+</div><div class='add'>+#include "u_serial.h"</div><div class='add'>+#include "gadget_chips.h"</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This CDC OBEX function support just packages a TTY-ish byte stream.</div><div class='add'>+ * A user mode server will put it into "raw" mode and handle all the</div><div class='add'>+ * relevant protocol details ... this is just a kernel passthrough.</div><div class='add'>+ * When possible, we prevent gadget enumeration until that server is</div><div class='add'>+ * ready to handle the commands.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+struct obex_ep_descs {</div><div class='add'>+	struct usb_endpoint_descriptor	*obex_in;</div><div class='add'>+	struct usb_endpoint_descriptor	*obex_out;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct f_obex {</div><div class='add'>+	struct gserial			port;</div><div class='add'>+	u8				ctrl_id;</div><div class='add'>+	u8				data_id;</div><div class='add'>+	u8				port_num;</div><div class='add'>+	u8				can_activate;</div><div class='add'>+</div><div class='add'>+	struct obex_ep_descs		fs;</div><div class='add'>+	struct obex_ep_descs		hs;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline struct f_obex *func_to_obex(struct usb_function *f)</div><div class='add'>+{</div><div class='add'>+	return container_of(f, struct f_obex, port.func);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct f_obex *port_to_obex(struct gserial *p)</div><div class='add'>+{</div><div class='add'>+	return container_of(p, struct f_obex, port);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*-------------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+#define OBEX_CTRL_IDX	0</div><div class='add'>+#define OBEX_DATA_IDX	1</div><div class='add'>+</div><div class='add'>+static struct usb_string obex_string_defs[] = {</div><div class='add'>+	[OBEX_CTRL_IDX].s	= "CDC Object Exchange (OBEX)",</div><div class='add'>+	[OBEX_DATA_IDX].s	= "CDC OBEX Data",</div><div class='add'>+	{  },	/* end of list */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct usb_gadget_strings obex_string_table = {</div><div class='add'>+	.language		= 0x0409,	/* en-US */</div><div class='add'>+	.strings		= obex_string_defs,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct usb_gadget_strings *obex_strings[] = {</div><div class='add'>+	&amp;obex_string_table,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*-------------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+static struct usb_interface_descriptor obex_control_intf __initdata = {</div><div class='add'>+	.bLength		= sizeof(obex_control_intf),</div><div class='add'>+	.bDescriptorType	= USB_DT_INTERFACE,</div><div class='add'>+	.bInterfaceNumber	= 0,</div><div class='add'>+</div><div class='add'>+	.bAlternateSetting	= 0,</div><div class='add'>+	.bNumEndpoints		= 0,</div><div class='add'>+	.bInterfaceClass	= USB_CLASS_COMM,</div><div class='add'>+	.bInterfaceSubClass	= USB_CDC_SUBCLASS_OBEX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct usb_interface_descriptor obex_data_nop_intf __initdata = {</div><div class='add'>+	.bLength		= sizeof(obex_data_nop_intf),</div><div class='add'>+	.bDescriptorType	= USB_DT_INTERFACE,</div><div class='add'>+	.bInterfaceNumber	= 1,</div><div class='add'>+</div><div class='add'>+	.bAlternateSetting	= 0,</div><div class='add'>+	.bNumEndpoints		= 0,</div><div class='add'>+	.bInterfaceClass	= USB_CLASS_CDC_DATA,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct usb_interface_descriptor obex_data_intf __initdata = {</div><div class='add'>+	.bLength		= sizeof(obex_data_intf),</div><div class='add'>+	.bDescriptorType	= USB_DT_INTERFACE,</div><div class='add'>+	.bInterfaceNumber	= 2,</div><div class='add'>+</div><div class='add'>+	.bAlternateSetting	= 1,</div><div class='add'>+	.bNumEndpoints		= 2,</div><div class='add'>+	.bInterfaceClass	= USB_CLASS_CDC_DATA,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct usb_cdc_header_desc obex_cdc_header_desc __initdata = {</div><div class='add'>+	.bLength		= sizeof(obex_cdc_header_desc),</div><div class='add'>+	.bDescriptorType	= USB_DT_CS_INTERFACE,</div><div class='add'>+	.bDescriptorSubType	= USB_CDC_HEADER_TYPE,</div><div class='add'>+	.bcdCDC			= __constant_cpu_to_le16(0x0120),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct usb_cdc_union_desc obex_cdc_union_desc __initdata = {</div><div class='add'>+	.bLength		= sizeof(obex_cdc_union_desc),</div><div class='add'>+	.bDescriptorType	= USB_DT_CS_INTERFACE,</div><div class='add'>+	.bDescriptorSubType	= USB_CDC_UNION_TYPE,</div><div class='add'>+	.bMasterInterface0	= 1,</div><div class='add'>+	.bSlaveInterface0	= 2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct usb_cdc_obex_desc obex_desc __initdata = {</div><div class='add'>+	.bLength		= sizeof(obex_desc),</div><div class='add'>+	.bDescriptorType	= USB_DT_CS_INTERFACE,</div><div class='add'>+	.bDescriptorSubType	= USB_CDC_OBEX_TYPE,</div><div class='add'>+	.bcdVersion		= __constant_cpu_to_le16(0x0100),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* High-Speed Support */</div><div class='add'>+</div><div class='add'>+static struct usb_endpoint_descriptor obex_hs_ep_out_desc __initdata = {</div><div class='add'>+	.bLength		= USB_DT_ENDPOINT_SIZE,</div><div class='add'>+	.bDescriptorType	= USB_DT_ENDPOINT,</div><div class='add'>+</div><div class='add'>+	.bEndpointAddress	= USB_DIR_OUT,</div><div class='add'>+	.bmAttributes		= USB_ENDPOINT_XFER_BULK,</div><div class='add'>+	.wMaxPacketSize		= __constant_cpu_to_le16(512),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct usb_endpoint_descriptor obex_hs_ep_in_desc __initdata = {</div><div class='add'>+	.bLength		= USB_DT_ENDPOINT_SIZE,</div><div class='add'>+	.bDescriptorType	= USB_DT_ENDPOINT,</div><div class='add'>+</div><div class='add'>+	.bEndpointAddress	= USB_DIR_IN,</div><div class='add'>+	.bmAttributes		= USB_ENDPOINT_XFER_BULK,</div><div class='add'>+	.wMaxPacketSize		= __constant_cpu_to_le16(512),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct usb_descriptor_header *hs_function[] __initdata = {</div><div class='add'>+	(struct usb_descriptor_header *) &amp;obex_control_intf,</div><div class='add'>+	(struct usb_descriptor_header *) &amp;obex_cdc_header_desc,</div><div class='add'>+	(struct usb_descriptor_header *) &amp;obex_desc,</div><div class='add'>+	(struct usb_descriptor_header *) &amp;obex_cdc_union_desc,</div><div class='add'>+</div><div class='add'>+	(struct usb_descriptor_header *) &amp;obex_data_nop_intf,</div><div class='add'>+	(struct usb_descriptor_header *) &amp;obex_data_intf,</div><div class='add'>+	(struct usb_descriptor_header *) &amp;obex_hs_ep_in_desc,</div><div class='add'>+	(struct usb_descriptor_header *) &amp;obex_hs_ep_out_desc,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Full-Speed Support */</div><div class='add'>+</div><div class='add'>+static struct usb_endpoint_descriptor obex_fs_ep_in_desc __initdata = {</div><div class='add'>+	.bLength		= USB_DT_ENDPOINT_SIZE,</div><div class='add'>+	.bDescriptorType	= USB_DT_ENDPOINT,</div><div class='add'>+</div><div class='add'>+	.bEndpointAddress	= USB_DIR_IN,</div><div class='add'>+	.bmAttributes		= USB_ENDPOINT_XFER_BULK,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct usb_endpoint_descriptor obex_fs_ep_out_desc __initdata = {</div><div class='add'>+	.bLength		= USB_DT_ENDPOINT_SIZE,</div><div class='add'>+	.bDescriptorType	= USB_DT_ENDPOINT,</div><div class='add'>+</div><div class='add'>+	.bEndpointAddress	= USB_DIR_OUT,</div><div class='add'>+	.bmAttributes		= USB_ENDPOINT_XFER_BULK,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct usb_descriptor_header *fs_function[] __initdata = {</div><div class='add'>+	(struct usb_descriptor_header *) &amp;obex_control_intf,</div><div class='add'>+	(struct usb_descriptor_header *) &amp;obex_cdc_header_desc,</div><div class='add'>+	(struct usb_descriptor_header *) &amp;obex_desc,</div><div class='add'>+	(struct usb_descriptor_header *) &amp;obex_cdc_union_desc,</div><div class='add'>+</div><div class='add'>+	(struct usb_descriptor_header *) &amp;obex_data_nop_intf,</div><div class='add'>+	(struct usb_descriptor_header *) &amp;obex_data_intf,</div><div class='add'>+	(struct usb_descriptor_header *) &amp;obex_fs_ep_in_desc,</div><div class='add'>+	(struct usb_descriptor_header *) &amp;obex_fs_ep_out_desc,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*-------------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+static int obex_set_alt(struct usb_function *f, unsigned intf, unsigned alt)</div><div class='add'>+{</div><div class='add'>+	struct f_obex		*obex = func_to_obex(f);</div><div class='add'>+	struct usb_composite_dev *cdev = f-&gt;config-&gt;cdev;</div><div class='add'>+</div><div class='add'>+	if (intf == obex-&gt;ctrl_id) {</div><div class='add'>+		if (alt != 0)</div><div class='add'>+			goto fail;</div><div class='add'>+		/* NOP */</div><div class='add'>+		DBG(cdev, "reset obex ttyGS%d control\n", obex-&gt;port_num);</div><div class='add'>+</div><div class='add'>+	} else if (intf == obex-&gt;data_id) {</div><div class='add'>+		if (alt &gt; 1)</div><div class='add'>+			goto fail;</div><div class='add'>+</div><div class='add'>+		if (obex-&gt;port.in-&gt;driver_data) {</div><div class='add'>+			DBG(cdev, "reset obex ttyGS%d\n", obex-&gt;port_num);</div><div class='add'>+			gserial_disconnect(&amp;obex-&gt;port);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!obex-&gt;port.in_desc) {</div><div class='add'>+			DBG(cdev, "init obex ttyGS%d\n", obex-&gt;port_num);</div><div class='add'>+			obex-&gt;port.in_desc = ep_choose(cdev-&gt;gadget,</div><div class='add'>+					obex-&gt;hs.obex_in, obex-&gt;fs.obex_in);</div><div class='add'>+			obex-&gt;port.out_desc = ep_choose(cdev-&gt;gadget,</div><div class='add'>+					obex-&gt;hs.obex_out, obex-&gt;fs.obex_out);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (alt == 1) {</div><div class='add'>+			DBG(cdev, "activate obex ttyGS%d\n", obex-&gt;port_num);</div><div class='add'>+			gserial_connect(&amp;obex-&gt;port, obex-&gt;port_num);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	} else</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+fail:</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int obex_get_alt(struct usb_function *f, unsigned intf)</div><div class='add'>+{</div><div class='add'>+	struct f_obex		*obex = func_to_obex(f);</div><div class='add'>+</div><div class='add'>+	if (intf == obex-&gt;ctrl_id)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return obex-&gt;port.in-&gt;driver_data ? 1 : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void obex_disable(struct usb_function *f)</div><div class='add'>+{</div><div class='add'>+	struct f_obex	*obex = func_to_obex(f);</div><div class='add'>+	struct usb_composite_dev *cdev = f-&gt;config-&gt;cdev;</div><div class='add'>+</div><div class='add'>+	DBG(cdev, "obex ttyGS%d disable\n", obex-&gt;port_num);</div><div class='add'>+	gserial_disconnect(&amp;obex-&gt;port);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*-------------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+static void obex_connect(struct gserial *g)</div><div class='add'>+{</div><div class='add'>+	struct f_obex		*obex = port_to_obex(g);</div><div class='add'>+	struct usb_composite_dev *cdev = g-&gt;func.config-&gt;cdev;</div><div class='add'>+	int			status;</div><div class='add'>+</div><div class='add'>+	if (!obex-&gt;can_activate)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	status = usb_function_activate(&amp;g-&gt;func);</div><div class='add'>+	if (status)</div><div class='add'>+		DBG(cdev, "obex ttyGS%d function activate --&gt; %d\n",</div><div class='add'>+			obex-&gt;port_num, status);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void obex_disconnect(struct gserial *g)</div><div class='add'>+{</div><div class='add'>+	struct f_obex		*obex = port_to_obex(g);</div><div class='add'>+	struct usb_composite_dev *cdev = g-&gt;func.config-&gt;cdev;</div><div class='add'>+	int			status;</div><div class='add'>+</div><div class='add'>+	if (!obex-&gt;can_activate)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	status = usb_function_deactivate(&amp;g-&gt;func);</div><div class='add'>+	if (status)</div><div class='add'>+		DBG(cdev, "obex ttyGS%d function deactivate --&gt; %d\n",</div><div class='add'>+			obex-&gt;port_num, status);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*-------------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+static int __init</div><div class='add'>+obex_bind(struct usb_configuration *c, struct usb_function *f)</div><div class='add'>+{</div><div class='add'>+	struct usb_composite_dev *cdev = c-&gt;cdev;</div><div class='add'>+	struct f_obex		*obex = func_to_obex(f);</div><div class='add'>+	int			status;</div><div class='add'>+	struct usb_ep		*ep;</div><div class='add'>+</div><div class='add'>+	/* allocate instance-specific interface IDs, and patch descriptors */</div><div class='add'>+</div><div class='add'>+	status = usb_interface_id(c, f);</div><div class='add'>+	if (status &lt; 0)</div><div class='add'>+		goto fail;</div><div class='add'>+	obex-&gt;ctrl_id = status;</div><div class='add'>+</div><div class='add'>+	obex_control_intf.bInterfaceNumber = status;</div><div class='add'>+	obex_cdc_union_desc.bMasterInterface0 = status;</div><div class='add'>+</div><div class='add'>+	status = usb_interface_id(c, f);</div><div class='add'>+	if (status &lt; 0)</div><div class='add'>+		goto fail;</div><div class='add'>+	obex-&gt;data_id = status;</div><div class='add'>+</div><div class='add'>+	obex_data_nop_intf.bInterfaceNumber = status;</div><div class='add'>+	obex_data_intf.bInterfaceNumber = status;</div><div class='add'>+	obex_cdc_union_desc.bSlaveInterface0 = status;</div><div class='add'>+</div><div class='add'>+	/* allocate instance-specific endpoints */</div><div class='add'>+</div><div class='add'>+	ep = usb_ep_autoconfig(cdev-&gt;gadget, &amp;obex_fs_ep_in_desc);</div><div class='add'>+	if (!ep)</div><div class='add'>+		goto fail;</div><div class='add'>+	obex-&gt;port.in = ep;</div><div class='add'>+	ep-&gt;driver_data = cdev;	/* claim */</div><div class='add'>+</div><div class='add'>+	ep = usb_ep_autoconfig(cdev-&gt;gadget, &amp;obex_fs_ep_out_desc);</div><div class='add'>+	if (!ep)</div><div class='add'>+		goto fail;</div><div class='add'>+	obex-&gt;port.out = ep;</div><div class='add'>+	ep-&gt;driver_data = cdev;	/* claim */</div><div class='add'>+</div><div class='add'>+	/* copy descriptors, and track endpoint copies */</div><div class='add'>+	f-&gt;descriptors = usb_copy_descriptors(fs_function);</div><div class='add'>+</div><div class='add'>+	obex-&gt;fs.obex_in = usb_find_endpoint(fs_function,</div><div class='add'>+			f-&gt;descriptors, &amp;obex_fs_ep_in_desc);</div><div class='add'>+	obex-&gt;fs.obex_out = usb_find_endpoint(fs_function,</div><div class='add'>+			f-&gt;descriptors, &amp;obex_fs_ep_out_desc);</div><div class='add'>+</div><div class='add'>+	/* support all relevant hardware speeds... we expect that when</div><div class='add'>+	 * hardware is dual speed, all bulk-capable endpoints work at</div><div class='add'>+	 * both speeds</div><div class='add'>+	 */</div><div class='add'>+	if (gadget_is_dualspeed(c-&gt;cdev-&gt;gadget)) {</div><div class='add'>+</div><div class='add'>+		obex_hs_ep_in_desc.bEndpointAddress =</div><div class='add'>+				obex_fs_ep_in_desc.bEndpointAddress;</div><div class='add'>+		obex_hs_ep_out_desc.bEndpointAddress =</div><div class='add'>+				obex_fs_ep_out_desc.bEndpointAddress;</div><div class='add'>+</div><div class='add'>+		/* copy descriptors, and track endpoint copies */</div><div class='add'>+		f-&gt;hs_descriptors = usb_copy_descriptors(hs_function);</div><div class='add'>+</div><div class='add'>+		obex-&gt;hs.obex_in = usb_find_endpoint(hs_function,</div><div class='add'>+				f-&gt;descriptors, &amp;obex_hs_ep_in_desc);</div><div class='add'>+		obex-&gt;hs.obex_out = usb_find_endpoint(hs_function,</div><div class='add'>+				f-&gt;descriptors, &amp;obex_hs_ep_out_desc);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Avoid letting this gadget enumerate until the userspace</div><div class='add'>+	 * OBEX server is active.</div><div class='add'>+	 */</div><div class='add'>+	status = usb_function_deactivate(f);</div><div class='add'>+	if (status &lt; 0)</div><div class='add'>+		WARNING(cdev, "obex ttyGS%d: can't prevent enumeration, %d\n",</div><div class='add'>+			obex-&gt;port_num, status);</div><div class='add'>+	else</div><div class='add'>+		obex-&gt;can_activate = true;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	DBG(cdev, "obex ttyGS%d: %s speed IN/%s OUT/%s\n",</div><div class='add'>+			obex-&gt;port_num,</div><div class='add'>+			gadget_is_dualspeed(c-&gt;cdev-&gt;gadget) ? "dual" : "full",</div><div class='add'>+			obex-&gt;port.in-&gt;name, obex-&gt;port.out-&gt;name);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+fail:</div><div class='add'>+	/* we might as well release our claims on endpoints */</div><div class='add'>+	if (obex-&gt;port.out)</div><div class='add'>+		obex-&gt;port.out-&gt;driver_data = NULL;</div><div class='add'>+	if (obex-&gt;port.in)</div><div class='add'>+		obex-&gt;port.in-&gt;driver_data = NULL;</div><div class='add'>+</div><div class='add'>+	ERROR(cdev, "%s/%p: can't bind, err %d\n", f-&gt;name, f, status);</div><div class='add'>+</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+obex_unbind(struct usb_configuration *c, struct usb_function *f)</div><div class='add'>+{</div><div class='add'>+	if (gadget_is_dualspeed(c-&gt;cdev-&gt;gadget))</div><div class='add'>+		usb_free_descriptors(f-&gt;hs_descriptors);</div><div class='add'>+	usb_free_descriptors(f-&gt;descriptors);</div><div class='add'>+	kfree(func_to_obex(f));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Some controllers can't support CDC OBEX ... */</div><div class='add'>+static inline bool can_support_obex(struct usb_configuration *c)</div><div class='add'>+{</div><div class='add'>+	/* Since the first interface is a NOP, we can ignore the</div><div class='add'>+	 * issue of multi-interface support on most controllers.</div><div class='add'>+	 *</div><div class='add'>+	 * Altsettings are mandatory, however...</div><div class='add'>+	 */</div><div class='add'>+	if (!gadget_supports_altsettings(c-&gt;cdev-&gt;gadget))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* everything else is *probably* fine ... */</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * obex_bind_config - add a CDC OBEX function to a configuration</div><div class='add'>+ * @c: the configuration to support the CDC OBEX instance</div><div class='add'>+ * @port_num: /dev/ttyGS* port this interface will use</div><div class='add'>+ * Context: single threaded during gadget setup</div><div class='add'>+ *</div><div class='add'>+ * Returns zero on success, else negative errno.</div><div class='add'>+ *</div><div class='add'>+ * Caller must have called @gserial_setup() with enough ports to</div><div class='add'>+ * handle all the ones it binds.  Caller is also responsible</div><div class='add'>+ * for calling @gserial_cleanup() before module unload.</div><div class='add'>+ */</div><div class='add'>+int __init obex_bind_config(struct usb_configuration *c, u8 port_num)</div><div class='add'>+{</div><div class='add'>+	struct f_obex	*obex;</div><div class='add'>+	int		status;</div><div class='add'>+</div><div class='add'>+	if (!can_support_obex(c))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* maybe allocate device-global string IDs, and patch descriptors */</div><div class='add'>+	if (obex_string_defs[OBEX_CTRL_IDX].id == 0) {</div><div class='add'>+		status = usb_string_id(c-&gt;cdev);</div><div class='add'>+		if (status &lt; 0)</div><div class='add'>+			return status;</div><div class='add'>+		obex_string_defs[OBEX_CTRL_IDX].id = status;</div><div class='add'>+</div><div class='add'>+		obex_control_intf.iInterface = status;</div><div class='add'>+</div><div class='add'>+		status = usb_string_id(c-&gt;cdev);</div><div class='add'>+		if (status &lt; 0)</div><div class='add'>+			return status;</div><div class='add'>+		obex_string_defs[OBEX_DATA_IDX].id = status;</div><div class='add'>+</div><div class='add'>+		obex_data_nop_intf.iInterface =</div><div class='add'>+			obex_data_intf.iInterface = status;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* allocate and initialize one new instance */</div><div class='add'>+	obex = kzalloc(sizeof *obex, GFP_KERNEL);</div><div class='add'>+	if (!obex)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	obex-&gt;port_num = port_num;</div><div class='add'>+</div><div class='add'>+	obex-&gt;port.connect = obex_connect;</div><div class='add'>+	obex-&gt;port.disconnect = obex_disconnect;</div><div class='add'>+</div><div class='add'>+	obex-&gt;port.func.name = "obex";</div><div class='add'>+	obex-&gt;port.func.strings = obex_strings;</div><div class='add'>+	/* descriptors are per-instance copies */</div><div class='add'>+	obex-&gt;port.func.bind = obex_bind;</div><div class='add'>+	obex-&gt;port.func.unbind = obex_unbind;</div><div class='add'>+	obex-&gt;port.func.set_alt = obex_set_alt;</div><div class='add'>+	obex-&gt;port.func.get_alt = obex_get_alt;</div><div class='add'>+	obex-&gt;port.func.disable = obex_disable;</div><div class='add'>+</div><div class='add'>+	status = usb_add_function(c, &amp;obex-&gt;port.func);</div><div class='add'>+	if (status)</div><div class='add'>+		kfree(obex);</div><div class='add'>+</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Felipe Balbi");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/usb/gadget/f_sourcesink.c b/drivers/usb/gadget/f_sourcesink.c<br/>index f18c3a14d72a..dc84d26d2835 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/gadget/f_sourcesink.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/gadget/f_sourcesink.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/gadget/f_sourcesink.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/gadget/f_sourcesink.c</a></div><div class='hunk'>@@ -552,7 +552,6 @@ static struct usb_configuration sourcesink_driver = {</div><div class='ctx'> 	.setup		= sourcesink_setup,</div><div class='ctx'> 	.bConfigurationValue = 3,</div><div class='ctx'> 	.bmAttributes	= USB_CONFIG_ATT_SELFPOWER,</div><div class='del'>-	.bMaxPower	= 1,	/* 2 mA, minimal */</div><div class='ctx'> 	/* .iConfiguration = DYNAMIC */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/usb/gadget/f_subset.c b/drivers/usb/gadget/f_subset.c<br/>index acb8d233aa1d..fe1832875771 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/gadget/f_subset.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/gadget/f_subset.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/gadget/f_subset.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/gadget/f_subset.c</a></div><div class='hunk'>@@ -103,8 +103,8 @@ static struct usb_interface_descriptor subset_data_intf __initdata = {</div><div class='ctx'> 	/* .iInterface = DYNAMIC */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct usb_cdc_header_desc header_desc __initdata = {</div><div class='del'>-	.bLength =		sizeof header_desc,</div><div class='add'>+static struct usb_cdc_header_desc mdlm_header_desc __initdata = {</div><div class='add'>+	.bLength =		sizeof mdlm_header_desc,</div><div class='ctx'> 	.bDescriptorType =	USB_DT_CS_INTERFACE,</div><div class='ctx'> 	.bDescriptorSubType =	USB_CDC_HEADER_TYPE,</div><div class='ctx'> </div><div class='hunk'>@@ -152,7 +152,7 @@ static struct usb_cdc_ether_desc ether_desc __initdata = {</div><div class='ctx'> </div><div class='ctx'> /* full speed support: */</div><div class='ctx'> </div><div class='del'>-static struct usb_endpoint_descriptor fs_in_desc __initdata = {</div><div class='add'>+static struct usb_endpoint_descriptor fs_subset_in_desc __initdata = {</div><div class='ctx'> 	.bLength =		USB_DT_ENDPOINT_SIZE,</div><div class='ctx'> 	.bDescriptorType =	USB_DT_ENDPOINT,</div><div class='ctx'> </div><div class='hunk'>@@ -160,7 +160,7 @@ static struct usb_endpoint_descriptor fs_in_desc __initdata = {</div><div class='ctx'> 	.bmAttributes =		USB_ENDPOINT_XFER_BULK,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct usb_endpoint_descriptor fs_out_desc __initdata = {</div><div class='add'>+static struct usb_endpoint_descriptor fs_subset_out_desc __initdata = {</div><div class='ctx'> 	.bLength =		USB_DT_ENDPOINT_SIZE,</div><div class='ctx'> 	.bDescriptorType =	USB_DT_ENDPOINT,</div><div class='ctx'> </div><div class='hunk'>@@ -170,18 +170,18 @@ static struct usb_endpoint_descriptor fs_out_desc __initdata = {</div><div class='ctx'> </div><div class='ctx'> static struct usb_descriptor_header *fs_eth_function[] __initdata = {</div><div class='ctx'> 	(struct usb_descriptor_header *) &amp;subset_data_intf,</div><div class='del'>-	(struct usb_descriptor_header *) &amp;header_desc,</div><div class='add'>+	(struct usb_descriptor_header *) &amp;mdlm_header_desc,</div><div class='ctx'> 	(struct usb_descriptor_header *) &amp;mdlm_desc,</div><div class='ctx'> 	(struct usb_descriptor_header *) &amp;mdlm_detail_desc,</div><div class='ctx'> 	(struct usb_descriptor_header *) &amp;ether_desc,</div><div class='del'>-	(struct usb_descriptor_header *) &amp;fs_in_desc,</div><div class='del'>-	(struct usb_descriptor_header *) &amp;fs_out_desc,</div><div class='add'>+	(struct usb_descriptor_header *) &amp;fs_subset_in_desc,</div><div class='add'>+	(struct usb_descriptor_header *) &amp;fs_subset_out_desc,</div><div class='ctx'> 	NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* high speed support: */</div><div class='ctx'> </div><div class='del'>-static struct usb_endpoint_descriptor hs_in_desc __initdata = {</div><div class='add'>+static struct usb_endpoint_descriptor hs_subset_in_desc __initdata = {</div><div class='ctx'> 	.bLength =		USB_DT_ENDPOINT_SIZE,</div><div class='ctx'> 	.bDescriptorType =	USB_DT_ENDPOINT,</div><div class='ctx'> </div><div class='hunk'>@@ -189,7 +189,7 @@ static struct usb_endpoint_descriptor hs_in_desc __initdata = {</div><div class='ctx'> 	.wMaxPacketSize =	__constant_cpu_to_le16(512),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct usb_endpoint_descriptor hs_out_desc __initdata = {</div><div class='add'>+static struct usb_endpoint_descriptor hs_subset_out_desc __initdata = {</div><div class='ctx'> 	.bLength =		USB_DT_ENDPOINT_SIZE,</div><div class='ctx'> 	.bDescriptorType =	USB_DT_ENDPOINT,</div><div class='ctx'> </div><div class='hunk'>@@ -199,12 +199,12 @@ static struct usb_endpoint_descriptor hs_out_desc __initdata = {</div><div class='ctx'> </div><div class='ctx'> static struct usb_descriptor_header *hs_eth_function[] __initdata = {</div><div class='ctx'> 	(struct usb_descriptor_header *) &amp;subset_data_intf,</div><div class='del'>-	(struct usb_descriptor_header *) &amp;header_desc,</div><div class='add'>+	(struct usb_descriptor_header *) &amp;mdlm_header_desc,</div><div class='ctx'> 	(struct usb_descriptor_header *) &amp;mdlm_desc,</div><div class='ctx'> 	(struct usb_descriptor_header *) &amp;mdlm_detail_desc,</div><div class='ctx'> 	(struct usb_descriptor_header *) &amp;ether_desc,</div><div class='del'>-	(struct usb_descriptor_header *) &amp;hs_in_desc,</div><div class='del'>-	(struct usb_descriptor_header *) &amp;hs_out_desc,</div><div class='add'>+	(struct usb_descriptor_header *) &amp;hs_subset_in_desc,</div><div class='add'>+	(struct usb_descriptor_header *) &amp;hs_subset_out_desc,</div><div class='ctx'> 	NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -281,13 +281,13 @@ geth_bind(struct usb_configuration *c, struct usb_function *f)</div><div class='ctx'> 	status = -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	/* allocate instance-specific endpoints */</div><div class='del'>-	ep = usb_ep_autoconfig(cdev-&gt;gadget, &amp;fs_in_desc);</div><div class='add'>+	ep = usb_ep_autoconfig(cdev-&gt;gadget, &amp;fs_subset_in_desc);</div><div class='ctx'> 	if (!ep)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	geth-&gt;port.in_ep = ep;</div><div class='ctx'> 	ep-&gt;driver_data = cdev;	/* claim */</div><div class='ctx'> </div><div class='del'>-	ep = usb_ep_autoconfig(cdev-&gt;gadget, &amp;fs_out_desc);</div><div class='add'>+	ep = usb_ep_autoconfig(cdev-&gt;gadget, &amp;fs_subset_out_desc);</div><div class='ctx'> 	if (!ep)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	geth-&gt;port.out_ep = ep;</div><div class='hunk'>@@ -297,9 +297,9 @@ geth_bind(struct usb_configuration *c, struct usb_function *f)</div><div class='ctx'> 	f-&gt;descriptors = usb_copy_descriptors(fs_eth_function);</div><div class='ctx'> </div><div class='ctx'> 	geth-&gt;fs.in = usb_find_endpoint(fs_eth_function,</div><div class='del'>-			f-&gt;descriptors, &amp;fs_in_desc);</div><div class='add'>+			f-&gt;descriptors, &amp;fs_subset_in_desc);</div><div class='ctx'> 	geth-&gt;fs.out = usb_find_endpoint(fs_eth_function,</div><div class='del'>-			f-&gt;descriptors, &amp;fs_out_desc);</div><div class='add'>+			f-&gt;descriptors, &amp;fs_subset_out_desc);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 	/* support all relevant hardware speeds... we expect that when</div><div class='hunk'>@@ -307,18 +307,18 @@ geth_bind(struct usb_configuration *c, struct usb_function *f)</div><div class='ctx'> 	 * both speeds</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (gadget_is_dualspeed(c-&gt;cdev-&gt;gadget)) {</div><div class='del'>-		hs_in_desc.bEndpointAddress =</div><div class='del'>-				fs_in_desc.bEndpointAddress;</div><div class='del'>-		hs_out_desc.bEndpointAddress =</div><div class='del'>-				fs_out_desc.bEndpointAddress;</div><div class='add'>+		hs_subset_in_desc.bEndpointAddress =</div><div class='add'>+				fs_subset_in_desc.bEndpointAddress;</div><div class='add'>+		hs_subset_out_desc.bEndpointAddress =</div><div class='add'>+				fs_subset_out_desc.bEndpointAddress;</div><div class='ctx'> </div><div class='ctx'> 		/* copy descriptors, and track endpoint copies */</div><div class='ctx'> 		f-&gt;hs_descriptors = usb_copy_descriptors(hs_eth_function);</div><div class='ctx'> </div><div class='ctx'> 		geth-&gt;hs.in = usb_find_endpoint(hs_eth_function,</div><div class='del'>-				f-&gt;hs_descriptors, &amp;hs_in_desc);</div><div class='add'>+				f-&gt;hs_descriptors, &amp;hs_subset_in_desc);</div><div class='ctx'> 		geth-&gt;hs.out = usb_find_endpoint(hs_eth_function,</div><div class='del'>-				f-&gt;hs_descriptors, &amp;hs_out_desc);</div><div class='add'>+				f-&gt;hs_descriptors, &amp;hs_subset_out_desc);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* NOTE:  all that is done without knowing or caring about</div><div class='head'>diff --git a/drivers/usb/gadget/file_storage.c b/drivers/usb/gadget/file_storage.c<br/>index ea2c31d18080..c4e62a6297d7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/gadget/file_storage.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/gadget/file_storage.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/gadget/file_storage.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/gadget/file_storage.c</a></div><div class='hunk'>@@ -245,6 +245,18 @@</div><div class='ctx'> #include "gadget_chips.h"</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Kbuild is not very cooperative with respect to linking separately</div><div class='add'>+ * compiled library objects into one module.  So for now we won't use</div><div class='add'>+ * separate compilation ... ensuring init/exit sections work to shrink</div><div class='add'>+ * the runtime footprint, and giving us at least some parts of what</div><div class='add'>+ * a "gcc --combine ... part1.c part2.c part3.c ... " build would.</div><div class='add'>+ */</div><div class='add'>+#include "usbstring.c"</div><div class='add'>+#include "config.c"</div><div class='add'>+#include "epautoconf.c"</div><div class='add'>+</div><div class='ctx'> /*-------------------------------------------------------------------------*/</div><div class='ctx'> </div><div class='ctx'> #define DRIVER_DESC		"File-backed Storage Gadget"</div><div class='hunk'>@@ -839,7 +851,7 @@ config_desc = {</div><div class='ctx'> 	.bConfigurationValue =	CONFIG_VALUE,</div><div class='ctx'> 	.iConfiguration =	STRING_CONFIG,</div><div class='ctx'> 	.bmAttributes =		USB_CONFIG_ATT_ONE | USB_CONFIG_ATT_SELFPOWER,</div><div class='del'>-	.bMaxPower =		1,	// self-powered</div><div class='add'>+	.bMaxPower =		CONFIG_USB_GADGET_VBUS_DRAW / 2,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct usb_otg_descriptor</div><div class='hunk'>@@ -2664,11 +2676,24 @@ static int check_command(struct fsg_dev *fsg, int cmnd_size,</div><div class='ctx'> 	/* Verify the length of the command itself */</div><div class='ctx'> 	if (cmnd_size != fsg-&gt;cmnd_size) {</div><div class='ctx'> </div><div class='del'>-		/* Special case workaround: MS-Windows issues REQUEST SENSE</div><div class='del'>-		 * with cbw-&gt;Length == 12 (it should be 6). */</div><div class='del'>-		if (fsg-&gt;cmnd[0] == SC_REQUEST_SENSE &amp;&amp; fsg-&gt;cmnd_size == 12)</div><div class='add'>+		/* Special case workaround: There are plenty of buggy SCSI</div><div class='add'>+		 * implementations. Many have issues with cbw-&gt;Length</div><div class='add'>+		 * field passing a wrong command size. For those cases we</div><div class='add'>+		 * always try to work around the problem by using the length</div><div class='add'>+		 * sent by the host side provided it is at least as large</div><div class='add'>+		 * as the correct command length.</div><div class='add'>+		 * Examples of such cases would be MS-Windows, which issues</div><div class='add'>+		 * REQUEST SENSE with cbw-&gt;Length == 12 where it should</div><div class='add'>+		 * be 6, and xbox360 issuing INQUIRY, TEST UNIT READY and</div><div class='add'>+		 * REQUEST SENSE with cbw-&gt;Length == 10 where it should</div><div class='add'>+		 * be 6 as well.</div><div class='add'>+		 */</div><div class='add'>+		if (cmnd_size &lt;= fsg-&gt;cmnd_size) {</div><div class='add'>+			DBG(fsg, "%s is buggy! Expected length %d "</div><div class='add'>+					"but we got %d\n", name,</div><div class='add'>+					cmnd_size, fsg-&gt;cmnd_size);</div><div class='ctx'> 			cmnd_size = fsg-&gt;cmnd_size;</div><div class='del'>-		else {</div><div class='add'>+		} else {</div><div class='ctx'> 			fsg-&gt;phase_error = 1;</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='head'>diff --git a/drivers/usb/gadget/fsl_qe_udc.c b/drivers/usb/gadget/fsl_qe_udc.c<br/>new file mode 100644<br/>index 000000000000..1fe8b44787b3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/gadget/fsl_qe_udc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/gadget/fsl_qe_udc.c</a></div><div class='hunk'>@@ -0,0 +1,2760 @@</div><div class='add'>+/*</div><div class='add'>+ * driver/usb/gadget/fsl_qe_udc.c</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2006-2008 Freescale Semiconductor, Inc. All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * 	Xie Xiaobo &lt;X.Xie@freescale.com&gt;</div><div class='add'>+ * 	Li Yang &lt;leoli@freescale.com&gt;</div><div class='add'>+ * 	Based on bareboard code from Shlomi Gridish.</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ * Freescle QE/CPM USB Pheripheral Controller Driver</div><div class='add'>+ * The controller can be found on MPC8360, MPC8272, and etc.</div><div class='add'>+ * MPC8360 Rev 1.1 may need QE mircocode update</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms of the GNU General Public License as published by the</div><div class='add'>+ * Free Software Foundation;  either version 2 of the License, or (at your</div><div class='add'>+ * option) any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#undef USB_TRACE</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/ioport.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/of_platform.h&gt;</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/usb/ch9.h&gt;</div><div class='add'>+#include &lt;linux/usb/gadget.h&gt;</div><div class='add'>+#include &lt;linux/usb/otg.h&gt;</div><div class='add'>+#include &lt;asm/qe.h&gt;</div><div class='add'>+#include &lt;asm/cpm.h&gt;</div><div class='add'>+#include &lt;asm/dma.h&gt;</div><div class='add'>+#include &lt;asm/reg.h&gt;</div><div class='add'>+#include "fsl_qe_udc.h"</div><div class='add'>+</div><div class='add'>+#define DRIVER_DESC     "Freescale QE/CPM USB Device Controller driver"</div><div class='add'>+#define DRIVER_AUTHOR   "Xie XiaoBo"</div><div class='add'>+#define DRIVER_VERSION  "1.0"</div><div class='add'>+</div><div class='add'>+#define DMA_ADDR_INVALID        (~(dma_addr_t)0)</div><div class='add'>+</div><div class='add'>+static const char driver_name[] = "fsl_qe_udc";</div><div class='add'>+static const char driver_desc[] = DRIVER_DESC;</div><div class='add'>+</div><div class='add'>+/*ep name is important in gadget, it should obey the convention of ep_match()*/</div><div class='add'>+static const char *const ep_name[] = {</div><div class='add'>+	"ep0-control", /* everyone has ep0 */</div><div class='add'>+	/* 3 configurable endpoints */</div><div class='add'>+	"ep1",</div><div class='add'>+	"ep2",</div><div class='add'>+	"ep3",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct usb_endpoint_descriptor qe_ep0_desc = {</div><div class='add'>+	.bLength =		USB_DT_ENDPOINT_SIZE,</div><div class='add'>+	.bDescriptorType =	USB_DT_ENDPOINT,</div><div class='add'>+</div><div class='add'>+	.bEndpointAddress =	0,</div><div class='add'>+	.bmAttributes =		USB_ENDPOINT_XFER_CONTROL,</div><div class='add'>+	.wMaxPacketSize =	USB_MAX_CTRL_PAYLOAD,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* it is initialized in probe()  */</div><div class='add'>+static struct qe_udc *udc_controller;</div><div class='add'>+</div><div class='add'>+/********************************************************************</div><div class='add'>+ *      Internal Used Function Start</div><div class='add'>+********************************************************************/</div><div class='add'>+/*-----------------------------------------------------------------</div><div class='add'>+ * done() - retire a request; caller blocked irqs</div><div class='add'>+ *--------------------------------------------------------------*/</div><div class='add'>+static void done(struct qe_ep *ep, struct qe_req *req, int status)</div><div class='add'>+{</div><div class='add'>+	struct qe_udc *udc = ep-&gt;udc;</div><div class='add'>+	unsigned char stopped = ep-&gt;stopped;</div><div class='add'>+</div><div class='add'>+	/* the req-&gt;queue pointer is used by ep_queue() func, in which</div><div class='add'>+	 * the request will be added into a udc_ep-&gt;queue 'd tail</div><div class='add'>+	 * so here the req will be dropped from the ep-&gt;queue</div><div class='add'>+	 */</div><div class='add'>+	list_del_init(&amp;req-&gt;queue);</div><div class='add'>+</div><div class='add'>+	/* req.status should be set as -EINPROGRESS in ep_queue() */</div><div class='add'>+	if (req-&gt;req.status == -EINPROGRESS)</div><div class='add'>+		req-&gt;req.status = status;</div><div class='add'>+	else</div><div class='add'>+		status = req-&gt;req.status;</div><div class='add'>+</div><div class='add'>+	if (req-&gt;mapped) {</div><div class='add'>+		dma_unmap_single(udc-&gt;gadget.dev.parent,</div><div class='add'>+			req-&gt;req.dma, req-&gt;req.length,</div><div class='add'>+			ep_is_in(ep)</div><div class='add'>+				? DMA_TO_DEVICE</div><div class='add'>+				: DMA_FROM_DEVICE);</div><div class='add'>+		req-&gt;req.dma = DMA_ADDR_INVALID;</div><div class='add'>+		req-&gt;mapped = 0;</div><div class='add'>+	} else</div><div class='add'>+		dma_sync_single_for_cpu(udc-&gt;gadget.dev.parent,</div><div class='add'>+			req-&gt;req.dma, req-&gt;req.length,</div><div class='add'>+			ep_is_in(ep)</div><div class='add'>+				? DMA_TO_DEVICE</div><div class='add'>+				: DMA_FROM_DEVICE);</div><div class='add'>+</div><div class='add'>+	if (status &amp;&amp; (status != -ESHUTDOWN))</div><div class='add'>+		dev_vdbg(udc-&gt;dev, "complete %s req %p stat %d len %u/%u\n",</div><div class='add'>+			ep-&gt;ep.name, &amp;req-&gt;req, status,</div><div class='add'>+			req-&gt;req.actual, req-&gt;req.length);</div><div class='add'>+</div><div class='add'>+	/* don't modify queue heads during completion callback */</div><div class='add'>+	ep-&gt;stopped = 1;</div><div class='add'>+	spin_unlock(&amp;udc-&gt;lock);</div><div class='add'>+</div><div class='add'>+	/* this complete() should a func implemented by gadget layer,</div><div class='add'>+	 * eg fsg-&gt;bulk_in_complete() */</div><div class='add'>+	if (req-&gt;req.complete)</div><div class='add'>+		req-&gt;req.complete(&amp;ep-&gt;ep, &amp;req-&gt;req);</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;udc-&gt;lock);</div><div class='add'>+</div><div class='add'>+	ep-&gt;stopped = stopped;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*-----------------------------------------------------------------</div><div class='add'>+ * nuke(): delete all requests related to this ep</div><div class='add'>+ *--------------------------------------------------------------*/</div><div class='add'>+static void nuke(struct qe_ep *ep, int status)</div><div class='add'>+{</div><div class='add'>+	/* Whether this eq has request linked */</div><div class='add'>+	while (!list_empty(&amp;ep-&gt;queue)) {</div><div class='add'>+		struct qe_req *req = NULL;</div><div class='add'>+		req = list_entry(ep-&gt;queue.next, struct qe_req, queue);</div><div class='add'>+</div><div class='add'>+		done(ep, req, status);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*---------------------------------------------------------------------------*</div><div class='add'>+ * USB and Endpoint manipulate process, include parameter and register       *</div><div class='add'>+ *---------------------------------------------------------------------------*/</div><div class='add'>+/* @value: 1--set stall 0--clean stall */</div><div class='add'>+static int qe_eprx_stall_change(struct qe_ep *ep, int value)</div><div class='add'>+{</div><div class='add'>+	u16 tem_usep;</div><div class='add'>+	u8 epnum = ep-&gt;epnum;</div><div class='add'>+	struct qe_udc *udc = ep-&gt;udc;</div><div class='add'>+</div><div class='add'>+	tem_usep = in_be16(&amp;udc-&gt;usb_regs-&gt;usb_usep[epnum]);</div><div class='add'>+	tem_usep = tem_usep &amp; ~USB_RHS_MASK;</div><div class='add'>+	if (value == 1)</div><div class='add'>+		tem_usep |= USB_RHS_STALL;</div><div class='add'>+	else if (ep-&gt;dir == USB_DIR_IN)</div><div class='add'>+		tem_usep |= USB_RHS_IGNORE_OUT;</div><div class='add'>+</div><div class='add'>+	out_be16(&amp;udc-&gt;usb_regs-&gt;usb_usep[epnum], tem_usep);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qe_eptx_stall_change(struct qe_ep *ep, int value)</div><div class='add'>+{</div><div class='add'>+	u16 tem_usep;</div><div class='add'>+	u8 epnum = ep-&gt;epnum;</div><div class='add'>+	struct qe_udc *udc = ep-&gt;udc;</div><div class='add'>+</div><div class='add'>+	tem_usep = in_be16(&amp;udc-&gt;usb_regs-&gt;usb_usep[epnum]);</div><div class='add'>+	tem_usep = tem_usep &amp; ~USB_THS_MASK;</div><div class='add'>+	if (value == 1)</div><div class='add'>+		tem_usep |= USB_THS_STALL;</div><div class='add'>+	else if (ep-&gt;dir == USB_DIR_OUT)</div><div class='add'>+		tem_usep |= USB_THS_IGNORE_IN;</div><div class='add'>+</div><div class='add'>+	out_be16(&amp;udc-&gt;usb_regs-&gt;usb_usep[epnum], tem_usep);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qe_ep0_stall(struct qe_udc *udc)</div><div class='add'>+{</div><div class='add'>+	qe_eptx_stall_change(&amp;udc-&gt;eps[0], 1);</div><div class='add'>+	qe_eprx_stall_change(&amp;udc-&gt;eps[0], 1);</div><div class='add'>+	udc_controller-&gt;ep0_state = WAIT_FOR_SETUP;</div><div class='add'>+	udc_controller-&gt;ep0_dir = 0;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qe_eprx_nack(struct qe_ep *ep)</div><div class='add'>+{</div><div class='add'>+	u8 epnum = ep-&gt;epnum;</div><div class='add'>+	struct qe_udc *udc = ep-&gt;udc;</div><div class='add'>+</div><div class='add'>+	if (ep-&gt;state == EP_STATE_IDLE) {</div><div class='add'>+		/* Set the ep's nack */</div><div class='add'>+		clrsetbits_be16(&amp;udc-&gt;usb_regs-&gt;usb_usep[epnum],</div><div class='add'>+				USB_RHS_MASK, USB_RHS_NACK);</div><div class='add'>+</div><div class='add'>+		/* Mask Rx and Busy interrupts */</div><div class='add'>+		clrbits16(&amp;udc-&gt;usb_regs-&gt;usb_usbmr,</div><div class='add'>+				(USB_E_RXB_MASK | USB_E_BSY_MASK));</div><div class='add'>+</div><div class='add'>+		ep-&gt;state = EP_STATE_NACK;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qe_eprx_normal(struct qe_ep *ep)</div><div class='add'>+{</div><div class='add'>+	struct qe_udc *udc = ep-&gt;udc;</div><div class='add'>+</div><div class='add'>+	if (ep-&gt;state == EP_STATE_NACK) {</div><div class='add'>+		clrsetbits_be16(&amp;udc-&gt;usb_regs-&gt;usb_usep[ep-&gt;epnum],</div><div class='add'>+				USB_RTHS_MASK, USB_THS_IGNORE_IN);</div><div class='add'>+</div><div class='add'>+		/* Unmask RX interrupts */</div><div class='add'>+		out_be16(&amp;udc-&gt;usb_regs-&gt;usb_usber,</div><div class='add'>+				USB_E_BSY_MASK | USB_E_RXB_MASK);</div><div class='add'>+		setbits16(&amp;udc-&gt;usb_regs-&gt;usb_usbmr,</div><div class='add'>+				(USB_E_RXB_MASK | USB_E_BSY_MASK));</div><div class='add'>+</div><div class='add'>+		ep-&gt;state = EP_STATE_IDLE;</div><div class='add'>+		ep-&gt;has_data = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qe_ep_cmd_stoptx(struct qe_ep *ep)</div><div class='add'>+{</div><div class='add'>+	if (ep-&gt;udc-&gt;soc_type == PORT_CPM)</div><div class='add'>+		cpm_command(CPM_USB_STOP_TX | (ep-&gt;epnum &lt;&lt; CPM_USB_EP_SHIFT),</div><div class='add'>+				CPM_USB_STOP_TX_OPCODE);</div><div class='add'>+	else</div><div class='add'>+		qe_issue_cmd(QE_USB_STOP_TX, QE_CR_SUBBLOCK_USB,</div><div class='add'>+				ep-&gt;epnum, 0);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qe_ep_cmd_restarttx(struct qe_ep *ep)</div><div class='add'>+{</div><div class='add'>+	if (ep-&gt;udc-&gt;soc_type == PORT_CPM)</div><div class='add'>+		cpm_command(CPM_USB_RESTART_TX | (ep-&gt;epnum &lt;&lt;</div><div class='add'>+				CPM_USB_EP_SHIFT), CPM_USB_RESTART_TX_OPCODE);</div><div class='add'>+	else</div><div class='add'>+		qe_issue_cmd(QE_USB_RESTART_TX, QE_CR_SUBBLOCK_USB,</div><div class='add'>+				ep-&gt;epnum, 0);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qe_ep_flushtxfifo(struct qe_ep *ep)</div><div class='add'>+{</div><div class='add'>+	struct qe_udc *udc = ep-&gt;udc;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	i = (int)ep-&gt;epnum;</div><div class='add'>+</div><div class='add'>+	qe_ep_cmd_stoptx(ep);</div><div class='add'>+	out_8(&amp;udc-&gt;usb_regs-&gt;usb_uscom,</div><div class='add'>+		USB_CMD_FLUSH_FIFO | (USB_CMD_EP_MASK &amp; (ep-&gt;epnum)));</div><div class='add'>+	out_be16(&amp;udc-&gt;ep_param[i]-&gt;tbptr, in_be16(&amp;udc-&gt;ep_param[i]-&gt;tbase));</div><div class='add'>+	out_be32(&amp;udc-&gt;ep_param[i]-&gt;tstate, 0);</div><div class='add'>+	out_be16(&amp;udc-&gt;ep_param[i]-&gt;tbcnt, 0);</div><div class='add'>+</div><div class='add'>+	ep-&gt;c_txbd = ep-&gt;txbase;</div><div class='add'>+	ep-&gt;n_txbd = ep-&gt;txbase;</div><div class='add'>+	qe_ep_cmd_restarttx(ep);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qe_ep_filltxfifo(struct qe_ep *ep)</div><div class='add'>+{</div><div class='add'>+	struct qe_udc *udc = ep-&gt;udc;</div><div class='add'>+</div><div class='add'>+	out_8(&amp;udc-&gt;usb_regs-&gt;usb_uscom,</div><div class='add'>+			USB_CMD_STR_FIFO | (USB_CMD_EP_MASK &amp; (ep-&gt;epnum)));</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qe_epbds_reset(struct qe_udc *udc, int pipe_num)</div><div class='add'>+{</div><div class='add'>+	struct qe_ep *ep;</div><div class='add'>+	u32 bdring_len;</div><div class='add'>+	struct qe_bd __iomem *bd;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	ep = &amp;udc-&gt;eps[pipe_num];</div><div class='add'>+</div><div class='add'>+	if (ep-&gt;dir == USB_DIR_OUT)</div><div class='add'>+		bdring_len = USB_BDRING_LEN_RX;</div><div class='add'>+	else</div><div class='add'>+		bdring_len = USB_BDRING_LEN;</div><div class='add'>+</div><div class='add'>+	bd = ep-&gt;rxbase;</div><div class='add'>+	for (i = 0; i &lt; (bdring_len - 1); i++) {</div><div class='add'>+		out_be32((u32 __iomem *)bd, R_E | R_I);</div><div class='add'>+		bd++;</div><div class='add'>+	}</div><div class='add'>+	out_be32((u32 __iomem *)bd, R_E | R_I | R_W);</div><div class='add'>+</div><div class='add'>+	bd = ep-&gt;txbase;</div><div class='add'>+	for (i = 0; i &lt; USB_BDRING_LEN_TX - 1; i++) {</div><div class='add'>+		out_be32(&amp;bd-&gt;buf, 0);</div><div class='add'>+		out_be32((u32 __iomem *)bd, 0);</div><div class='add'>+		bd++;</div><div class='add'>+	}</div><div class='add'>+	out_be32((u32 __iomem *)bd, T_W);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qe_ep_reset(struct qe_udc *udc, int pipe_num)</div><div class='add'>+{</div><div class='add'>+	struct qe_ep *ep;</div><div class='add'>+	u16 tmpusep;</div><div class='add'>+</div><div class='add'>+	ep = &amp;udc-&gt;eps[pipe_num];</div><div class='add'>+	tmpusep = in_be16(&amp;udc-&gt;usb_regs-&gt;usb_usep[pipe_num]);</div><div class='add'>+	tmpusep &amp;= ~USB_RTHS_MASK;</div><div class='add'>+</div><div class='add'>+	switch (ep-&gt;dir) {</div><div class='add'>+	case USB_DIR_BOTH:</div><div class='add'>+		qe_ep_flushtxfifo(ep);</div><div class='add'>+		break;</div><div class='add'>+	case USB_DIR_OUT:</div><div class='add'>+		tmpusep |= USB_THS_IGNORE_IN;</div><div class='add'>+		break;</div><div class='add'>+	case USB_DIR_IN:</div><div class='add'>+		qe_ep_flushtxfifo(ep);</div><div class='add'>+		tmpusep |= USB_RHS_IGNORE_OUT;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	out_be16(&amp;udc-&gt;usb_regs-&gt;usb_usep[pipe_num], tmpusep);</div><div class='add'>+</div><div class='add'>+	qe_epbds_reset(udc, pipe_num);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qe_ep_toggledata01(struct qe_ep *ep)</div><div class='add'>+{</div><div class='add'>+	ep-&gt;data01 ^= 0x1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qe_ep_bd_init(struct qe_udc *udc, unsigned char pipe_num)</div><div class='add'>+{</div><div class='add'>+	struct qe_ep *ep = &amp;udc-&gt;eps[pipe_num];</div><div class='add'>+	unsigned long tmp_addr = 0;</div><div class='add'>+	struct usb_ep_para __iomem *epparam;</div><div class='add'>+	int i;</div><div class='add'>+	struct qe_bd __iomem *bd;</div><div class='add'>+	int bdring_len;</div><div class='add'>+</div><div class='add'>+	if (ep-&gt;dir == USB_DIR_OUT)</div><div class='add'>+		bdring_len = USB_BDRING_LEN_RX;</div><div class='add'>+	else</div><div class='add'>+		bdring_len = USB_BDRING_LEN;</div><div class='add'>+</div><div class='add'>+	epparam = udc-&gt;ep_param[pipe_num];</div><div class='add'>+	/* alloc multi-ram for BD rings and set the ep parameters */</div><div class='add'>+	tmp_addr = cpm_muram_alloc(sizeof(struct qe_bd) * (bdring_len +</div><div class='add'>+				USB_BDRING_LEN_TX), QE_ALIGNMENT_OF_BD);</div><div class='add'>+	out_be16(&amp;epparam-&gt;rbase, (u16)tmp_addr);</div><div class='add'>+	out_be16(&amp;epparam-&gt;tbase, (u16)(tmp_addr +</div><div class='add'>+				(sizeof(struct qe_bd) * bdring_len)));</div><div class='add'>+</div><div class='add'>+	out_be16(&amp;epparam-&gt;rbptr, in_be16(&amp;epparam-&gt;rbase));</div><div class='add'>+	out_be16(&amp;epparam-&gt;tbptr, in_be16(&amp;epparam-&gt;tbase));</div><div class='add'>+</div><div class='add'>+	ep-&gt;rxbase = cpm_muram_addr(tmp_addr);</div><div class='add'>+	ep-&gt;txbase = cpm_muram_addr(tmp_addr + (sizeof(struct qe_bd)</div><div class='add'>+				* bdring_len));</div><div class='add'>+	ep-&gt;n_rxbd = ep-&gt;rxbase;</div><div class='add'>+	ep-&gt;e_rxbd = ep-&gt;rxbase;</div><div class='add'>+	ep-&gt;n_txbd = ep-&gt;txbase;</div><div class='add'>+	ep-&gt;c_txbd = ep-&gt;txbase;</div><div class='add'>+	ep-&gt;data01 = 0; /* data0 */</div><div class='add'>+</div><div class='add'>+	/* Init TX and RX bds */</div><div class='add'>+	bd = ep-&gt;rxbase;</div><div class='add'>+	for (i = 0; i &lt; bdring_len - 1; i++) {</div><div class='add'>+		out_be32(&amp;bd-&gt;buf, 0);</div><div class='add'>+		out_be32((u32 __iomem *)bd, 0);</div><div class='add'>+		bd++;</div><div class='add'>+	}</div><div class='add'>+	out_be32(&amp;bd-&gt;buf, 0);</div><div class='add'>+	out_be32((u32 __iomem *)bd, R_W);</div><div class='add'>+</div><div class='add'>+	bd = ep-&gt;txbase;</div><div class='add'>+	for (i = 0; i &lt; USB_BDRING_LEN_TX - 1; i++) {</div><div class='add'>+		out_be32(&amp;bd-&gt;buf, 0);</div><div class='add'>+		out_be32((u32 __iomem *)bd, 0);</div><div class='add'>+		bd++;</div><div class='add'>+	}</div><div class='add'>+	out_be32(&amp;bd-&gt;buf, 0);</div><div class='add'>+	out_be32((u32 __iomem *)bd, T_W);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qe_ep_rxbd_update(struct qe_ep *ep)</div><div class='add'>+{</div><div class='add'>+	unsigned int size;</div><div class='add'>+	int i;</div><div class='add'>+	unsigned int tmp;</div><div class='add'>+	struct qe_bd __iomem *bd;</div><div class='add'>+	unsigned int bdring_len;</div><div class='add'>+</div><div class='add'>+	if (ep-&gt;rxbase == NULL)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	bd = ep-&gt;rxbase;</div><div class='add'>+</div><div class='add'>+	ep-&gt;rxframe = kmalloc(sizeof(*ep-&gt;rxframe), GFP_ATOMIC);</div><div class='add'>+	if (ep-&gt;rxframe == NULL) {</div><div class='add'>+		dev_err(ep-&gt;udc-&gt;dev, "malloc rxframe failed\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	qe_frame_init(ep-&gt;rxframe);</div><div class='add'>+</div><div class='add'>+	if (ep-&gt;dir == USB_DIR_OUT)</div><div class='add'>+		bdring_len = USB_BDRING_LEN_RX;</div><div class='add'>+	else</div><div class='add'>+		bdring_len = USB_BDRING_LEN;</div><div class='add'>+</div><div class='add'>+	size = (ep-&gt;ep.maxpacket + USB_CRC_SIZE + 2) * (bdring_len + 1);</div><div class='add'>+	ep-&gt;rxbuffer = kzalloc(size, GFP_ATOMIC);</div><div class='add'>+	if (ep-&gt;rxbuffer == NULL) {</div><div class='add'>+		dev_err(ep-&gt;udc-&gt;dev, "malloc rxbuffer failed,size=%d\n",</div><div class='add'>+				size);</div><div class='add'>+		kfree(ep-&gt;rxframe);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ep-&gt;rxbuf_d = virt_to_phys((void *)ep-&gt;rxbuffer);</div><div class='add'>+	if (ep-&gt;rxbuf_d == DMA_ADDR_INVALID) {</div><div class='add'>+		ep-&gt;rxbuf_d = dma_map_single(udc_controller-&gt;gadget.dev.parent,</div><div class='add'>+					ep-&gt;rxbuffer,</div><div class='add'>+					size,</div><div class='add'>+					DMA_FROM_DEVICE);</div><div class='add'>+		ep-&gt;rxbufmap = 1;</div><div class='add'>+	} else {</div><div class='add'>+		dma_sync_single_for_device(udc_controller-&gt;gadget.dev.parent,</div><div class='add'>+					ep-&gt;rxbuf_d, size,</div><div class='add'>+					DMA_FROM_DEVICE);</div><div class='add'>+		ep-&gt;rxbufmap = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	size = ep-&gt;ep.maxpacket + USB_CRC_SIZE + 2;</div><div class='add'>+	tmp = ep-&gt;rxbuf_d;</div><div class='add'>+	tmp = (u32)(((tmp &gt;&gt; 2) &lt;&lt; 2) + 4);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; bdring_len - 1; i++) {</div><div class='add'>+		out_be32(&amp;bd-&gt;buf, tmp);</div><div class='add'>+		out_be32((u32 __iomem *)bd, (R_E | R_I));</div><div class='add'>+		tmp = tmp + size;</div><div class='add'>+		bd++;</div><div class='add'>+	}</div><div class='add'>+	out_be32(&amp;bd-&gt;buf, tmp);</div><div class='add'>+	out_be32((u32 __iomem *)bd, (R_E | R_I | R_W));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qe_ep_register_init(struct qe_udc *udc, unsigned char pipe_num)</div><div class='add'>+{</div><div class='add'>+	struct qe_ep *ep = &amp;udc-&gt;eps[pipe_num];</div><div class='add'>+	struct usb_ep_para __iomem *epparam;</div><div class='add'>+	u16 usep, logepnum;</div><div class='add'>+	u16 tmp;</div><div class='add'>+	u8 rtfcr = 0;</div><div class='add'>+</div><div class='add'>+	epparam = udc-&gt;ep_param[pipe_num];</div><div class='add'>+</div><div class='add'>+	usep = 0;</div><div class='add'>+	logepnum = (ep-&gt;desc-&gt;bEndpointAddress &amp; USB_ENDPOINT_NUMBER_MASK);</div><div class='add'>+	usep |= (logepnum &lt;&lt; USB_EPNUM_SHIFT);</div><div class='add'>+</div><div class='add'>+	switch (ep-&gt;desc-&gt;bmAttributes &amp; 0x03) {</div><div class='add'>+	case USB_ENDPOINT_XFER_BULK:</div><div class='add'>+		usep |= USB_TRANS_BULK;</div><div class='add'>+		break;</div><div class='add'>+	case USB_ENDPOINT_XFER_ISOC:</div><div class='add'>+		usep |=  USB_TRANS_ISO;</div><div class='add'>+		break;</div><div class='add'>+	case USB_ENDPOINT_XFER_INT:</div><div class='add'>+		usep |= USB_TRANS_INT;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		usep |= USB_TRANS_CTR;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (ep-&gt;dir) {</div><div class='add'>+	case USB_DIR_OUT:</div><div class='add'>+		usep |= USB_THS_IGNORE_IN;</div><div class='add'>+		break;</div><div class='add'>+	case USB_DIR_IN:</div><div class='add'>+		usep |= USB_RHS_IGNORE_OUT;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	out_be16(&amp;udc-&gt;usb_regs-&gt;usb_usep[pipe_num], usep);</div><div class='add'>+</div><div class='add'>+	rtfcr = 0x30;</div><div class='add'>+	out_8(&amp;epparam-&gt;rbmr, rtfcr);</div><div class='add'>+	out_8(&amp;epparam-&gt;tbmr, rtfcr);</div><div class='add'>+</div><div class='add'>+	tmp = (u16)(ep-&gt;ep.maxpacket + USB_CRC_SIZE);</div><div class='add'>+	/* MRBLR must be divisble by 4 */</div><div class='add'>+	tmp = (u16)(((tmp &gt;&gt; 2) &lt;&lt; 2) + 4);</div><div class='add'>+	out_be16(&amp;epparam-&gt;mrblr, tmp);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qe_ep_init(struct qe_udc *udc,</div><div class='add'>+		      unsigned char pipe_num,</div><div class='add'>+		      const struct usb_endpoint_descriptor *desc)</div><div class='add'>+{</div><div class='add'>+	struct qe_ep *ep = &amp;udc-&gt;eps[pipe_num];</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int reval = 0;</div><div class='add'>+	u16 max = 0;</div><div class='add'>+</div><div class='add'>+	max = le16_to_cpu(desc-&gt;wMaxPacketSize);</div><div class='add'>+</div><div class='add'>+	/* check the max package size validate for this endpoint */</div><div class='add'>+	/* Refer to USB2.0 spec table 9-13,</div><div class='add'>+	*/</div><div class='add'>+	if (pipe_num != 0) {</div><div class='add'>+		switch (desc-&gt;bmAttributes &amp; USB_ENDPOINT_XFERTYPE_MASK) {</div><div class='add'>+		case USB_ENDPOINT_XFER_BULK:</div><div class='add'>+			if (strstr(ep-&gt;ep.name, "-iso")</div><div class='add'>+					|| strstr(ep-&gt;ep.name, "-int"))</div><div class='add'>+				goto en_done;</div><div class='add'>+			switch (udc-&gt;gadget.speed) {</div><div class='add'>+			case USB_SPEED_HIGH:</div><div class='add'>+			if ((max == 128) || (max == 256) || (max == 512))</div><div class='add'>+				break;</div><div class='add'>+			default:</div><div class='add'>+				switch (max) {</div><div class='add'>+				case 4:</div><div class='add'>+				case 8:</div><div class='add'>+				case 16:</div><div class='add'>+				case 32:</div><div class='add'>+				case 64:</div><div class='add'>+					break;</div><div class='add'>+				default:</div><div class='add'>+				case USB_SPEED_LOW:</div><div class='add'>+					goto en_done;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		case USB_ENDPOINT_XFER_INT:</div><div class='add'>+			if (strstr(ep-&gt;ep.name, "-iso"))	/* bulk is ok */</div><div class='add'>+				goto en_done;</div><div class='add'>+			switch (udc-&gt;gadget.speed) {</div><div class='add'>+			case USB_SPEED_HIGH:</div><div class='add'>+				if (max &lt;= 1024)</div><div class='add'>+					break;</div><div class='add'>+			case USB_SPEED_FULL:</div><div class='add'>+				if (max &lt;= 64)</div><div class='add'>+					break;</div><div class='add'>+			default:</div><div class='add'>+				if (max &lt;= 8)</div><div class='add'>+					break;</div><div class='add'>+				goto en_done;</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		case USB_ENDPOINT_XFER_ISOC:</div><div class='add'>+			if (strstr(ep-&gt;ep.name, "-bulk")</div><div class='add'>+				|| strstr(ep-&gt;ep.name, "-int"))</div><div class='add'>+				goto en_done;</div><div class='add'>+			switch (udc-&gt;gadget.speed) {</div><div class='add'>+			case USB_SPEED_HIGH:</div><div class='add'>+				if (max &lt;= 1024)</div><div class='add'>+					break;</div><div class='add'>+			case USB_SPEED_FULL:</div><div class='add'>+				if (max &lt;= 1023)</div><div class='add'>+					break;</div><div class='add'>+			default:</div><div class='add'>+				goto en_done;</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		case USB_ENDPOINT_XFER_CONTROL:</div><div class='add'>+			if (strstr(ep-&gt;ep.name, "-iso")</div><div class='add'>+				|| strstr(ep-&gt;ep.name, "-int"))</div><div class='add'>+				goto en_done;</div><div class='add'>+			switch (udc-&gt;gadget.speed) {</div><div class='add'>+			case USB_SPEED_HIGH:</div><div class='add'>+			case USB_SPEED_FULL:</div><div class='add'>+				switch (max) {</div><div class='add'>+				case 1:</div><div class='add'>+				case 2:</div><div class='add'>+				case 4:</div><div class='add'>+				case 8:</div><div class='add'>+				case 16:</div><div class='add'>+				case 32:</div><div class='add'>+				case 64:</div><div class='add'>+					break;</div><div class='add'>+				default:</div><div class='add'>+					goto en_done;</div><div class='add'>+				}</div><div class='add'>+			case USB_SPEED_LOW:</div><div class='add'>+				switch (max) {</div><div class='add'>+				case 1:</div><div class='add'>+				case 2:</div><div class='add'>+				case 4:</div><div class='add'>+				case 8:</div><div class='add'>+					break;</div><div class='add'>+				default:</div><div class='add'>+					goto en_done;</div><div class='add'>+				}</div><div class='add'>+			default:</div><div class='add'>+				goto en_done;</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		default:</div><div class='add'>+			goto en_done;</div><div class='add'>+		}</div><div class='add'>+	} /* if ep0*/</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;udc-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	/* initialize ep structure */</div><div class='add'>+	ep-&gt;ep.maxpacket = max;</div><div class='add'>+	ep-&gt;tm = (u8)(desc-&gt;bmAttributes &amp; USB_ENDPOINT_XFERTYPE_MASK);</div><div class='add'>+	ep-&gt;desc = desc;</div><div class='add'>+	ep-&gt;stopped = 0;</div><div class='add'>+	ep-&gt;init = 1;</div><div class='add'>+</div><div class='add'>+	if (pipe_num == 0) {</div><div class='add'>+		ep-&gt;dir = USB_DIR_BOTH;</div><div class='add'>+		udc-&gt;ep0_dir = USB_DIR_OUT;</div><div class='add'>+		udc-&gt;ep0_state = WAIT_FOR_SETUP;</div><div class='add'>+	} else	{</div><div class='add'>+		switch (desc-&gt;bEndpointAddress &amp; USB_ENDPOINT_DIR_MASK) {</div><div class='add'>+		case USB_DIR_OUT:</div><div class='add'>+			ep-&gt;dir = USB_DIR_OUT;</div><div class='add'>+			break;</div><div class='add'>+		case USB_DIR_IN:</div><div class='add'>+			ep-&gt;dir = USB_DIR_IN;</div><div class='add'>+		default:</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* hardware special operation */</div><div class='add'>+	qe_ep_bd_init(udc, pipe_num);</div><div class='add'>+	if ((ep-&gt;tm == USBP_TM_CTL) || (ep-&gt;dir == USB_DIR_OUT)) {</div><div class='add'>+		reval = qe_ep_rxbd_update(ep);</div><div class='add'>+		if (reval)</div><div class='add'>+			goto en_done1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((ep-&gt;tm == USBP_TM_CTL) || (ep-&gt;dir == USB_DIR_IN)) {</div><div class='add'>+		ep-&gt;txframe = kmalloc(sizeof(*ep-&gt;txframe), GFP_ATOMIC);</div><div class='add'>+		if (ep-&gt;txframe == NULL) {</div><div class='add'>+			dev_err(udc-&gt;dev, "malloc txframe failed\n");</div><div class='add'>+			goto en_done2;</div><div class='add'>+		}</div><div class='add'>+		qe_frame_init(ep-&gt;txframe);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	qe_ep_register_init(udc, pipe_num);</div><div class='add'>+</div><div class='add'>+	/* Now HW will be NAKing transfers to that EP,</div><div class='add'>+	 * until a buffer is queued to it. */</div><div class='add'>+	spin_unlock_irqrestore(&amp;udc-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+en_done2:</div><div class='add'>+	kfree(ep-&gt;rxbuffer);</div><div class='add'>+	kfree(ep-&gt;rxframe);</div><div class='add'>+en_done1:</div><div class='add'>+	spin_unlock_irqrestore(&amp;udc-&gt;lock, flags);</div><div class='add'>+en_done:</div><div class='add'>+	dev_dbg(udc-&gt;dev, "failed to initialize %s\n", ep-&gt;ep.name);</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void qe_usb_enable(void)</div><div class='add'>+{</div><div class='add'>+	setbits8(&amp;udc_controller-&gt;usb_regs-&gt;usb_usmod, USB_MODE_EN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void qe_usb_disable(void)</div><div class='add'>+{</div><div class='add'>+	clrbits8(&amp;udc_controller-&gt;usb_regs-&gt;usb_usmod, USB_MODE_EN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------------------*</div><div class='add'>+ *		USB and EP basic manipulate function end		      *</div><div class='add'>+ *----------------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/******************************************************************************</div><div class='add'>+		UDC transmit and receive process</div><div class='add'>+ ******************************************************************************/</div><div class='add'>+static void recycle_one_rxbd(struct qe_ep *ep)</div><div class='add'>+{</div><div class='add'>+	u32 bdstatus;</div><div class='add'>+</div><div class='add'>+	bdstatus = in_be32((u32 __iomem *)ep-&gt;e_rxbd);</div><div class='add'>+	bdstatus = R_I | R_E | (bdstatus &amp; R_W);</div><div class='add'>+	out_be32((u32 __iomem *)ep-&gt;e_rxbd, bdstatus);</div><div class='add'>+</div><div class='add'>+	if (bdstatus &amp; R_W)</div><div class='add'>+		ep-&gt;e_rxbd = ep-&gt;rxbase;</div><div class='add'>+	else</div><div class='add'>+		ep-&gt;e_rxbd++;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void recycle_rxbds(struct qe_ep *ep, unsigned char stopatnext)</div><div class='add'>+{</div><div class='add'>+	u32 bdstatus;</div><div class='add'>+	struct qe_bd __iomem *bd, *nextbd;</div><div class='add'>+	unsigned char stop = 0;</div><div class='add'>+</div><div class='add'>+	nextbd = ep-&gt;n_rxbd;</div><div class='add'>+	bd = ep-&gt;e_rxbd;</div><div class='add'>+	bdstatus = in_be32((u32 __iomem *)bd);</div><div class='add'>+</div><div class='add'>+	while (!(bdstatus &amp; R_E) &amp;&amp; !(bdstatus &amp; BD_LENGTH_MASK) &amp;&amp; !stop) {</div><div class='add'>+		bdstatus = R_E | R_I | (bdstatus &amp; R_W);</div><div class='add'>+		out_be32((u32 __iomem *)bd, bdstatus);</div><div class='add'>+</div><div class='add'>+		if (bdstatus &amp; R_W)</div><div class='add'>+			bd = ep-&gt;rxbase;</div><div class='add'>+		else</div><div class='add'>+			bd++;</div><div class='add'>+</div><div class='add'>+		bdstatus = in_be32((u32 __iomem *)bd);</div><div class='add'>+		if (stopatnext &amp;&amp; (bd == nextbd))</div><div class='add'>+			stop = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ep-&gt;e_rxbd = bd;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ep_recycle_rxbds(struct qe_ep *ep)</div><div class='add'>+{</div><div class='add'>+	struct qe_bd __iomem *bd = ep-&gt;n_rxbd;</div><div class='add'>+	u32 bdstatus;</div><div class='add'>+	u8 epnum = ep-&gt;epnum;</div><div class='add'>+	struct qe_udc *udc = ep-&gt;udc;</div><div class='add'>+</div><div class='add'>+	bdstatus = in_be32((u32 __iomem *)bd);</div><div class='add'>+	if (!(bdstatus &amp; R_E) &amp;&amp; !(bdstatus &amp; BD_LENGTH_MASK)) {</div><div class='add'>+		bd = ep-&gt;rxbase +</div><div class='add'>+				((in_be16(&amp;udc-&gt;ep_param[epnum]-&gt;rbptr) -</div><div class='add'>+				  in_be16(&amp;udc-&gt;ep_param[epnum]-&gt;rbase))</div><div class='add'>+				 &gt;&gt; 3);</div><div class='add'>+		bdstatus = in_be32((u32 __iomem *)bd);</div><div class='add'>+</div><div class='add'>+		if (bdstatus &amp; R_W)</div><div class='add'>+			bd = ep-&gt;rxbase;</div><div class='add'>+		else</div><div class='add'>+			bd++;</div><div class='add'>+</div><div class='add'>+		ep-&gt;e_rxbd = bd;</div><div class='add'>+		recycle_rxbds(ep, 0);</div><div class='add'>+		ep-&gt;e_rxbd = ep-&gt;n_rxbd;</div><div class='add'>+	} else</div><div class='add'>+		recycle_rxbds(ep, 1);</div><div class='add'>+</div><div class='add'>+	if (in_be16(&amp;udc-&gt;usb_regs-&gt;usb_usber) &amp; USB_E_BSY_MASK)</div><div class='add'>+		out_be16(&amp;udc-&gt;usb_regs-&gt;usb_usber, USB_E_BSY_MASK);</div><div class='add'>+</div><div class='add'>+	if (ep-&gt;has_data &lt;= 0 &amp;&amp; (!list_empty(&amp;ep-&gt;queue)))</div><div class='add'>+		qe_eprx_normal(ep);</div><div class='add'>+</div><div class='add'>+	ep-&gt;localnack = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void setup_received_handle(struct qe_udc *udc,</div><div class='add'>+					struct usb_ctrlrequest *setup);</div><div class='add'>+static int qe_ep_rxframe_handle(struct qe_ep *ep);</div><div class='add'>+static void ep0_req_complete(struct qe_udc *udc, struct qe_req *req);</div><div class='add'>+/* when BD PID is setup, handle the packet */</div><div class='add'>+static int ep0_setup_handle(struct qe_udc *udc)</div><div class='add'>+{</div><div class='add'>+	struct qe_ep *ep = &amp;udc-&gt;eps[0];</div><div class='add'>+	struct qe_frame *pframe;</div><div class='add'>+	unsigned int fsize;</div><div class='add'>+	u8 *cp;</div><div class='add'>+</div><div class='add'>+	pframe = ep-&gt;rxframe;</div><div class='add'>+	if ((frame_get_info(pframe) &amp; PID_SETUP)</div><div class='add'>+			&amp;&amp; (udc-&gt;ep0_state == WAIT_FOR_SETUP)) {</div><div class='add'>+		fsize = frame_get_length(pframe);</div><div class='add'>+		if (unlikely(fsize != 8))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		cp = (u8 *)&amp;udc-&gt;local_setup_buff;</div><div class='add'>+		memcpy(cp, pframe-&gt;data, fsize);</div><div class='add'>+		ep-&gt;data01 = 1;</div><div class='add'>+</div><div class='add'>+		/* handle the usb command base on the usb_ctrlrequest */</div><div class='add'>+		setup_received_handle(udc, &amp;udc-&gt;local_setup_buff);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qe_ep0_rx(struct qe_udc *udc)</div><div class='add'>+{</div><div class='add'>+	struct qe_ep *ep = &amp;udc-&gt;eps[0];</div><div class='add'>+	struct qe_frame *pframe;</div><div class='add'>+	struct qe_bd __iomem *bd;</div><div class='add'>+	u32 bdstatus, length;</div><div class='add'>+	u32 vaddr;</div><div class='add'>+</div><div class='add'>+	pframe = ep-&gt;rxframe;</div><div class='add'>+</div><div class='add'>+	if (ep-&gt;dir == USB_DIR_IN) {</div><div class='add'>+		dev_err(udc-&gt;dev, "ep0 not a control endpoint\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bd = ep-&gt;n_rxbd;</div><div class='add'>+	bdstatus = in_be32((u32 __iomem *)bd);</div><div class='add'>+	length = bdstatus &amp; BD_LENGTH_MASK;</div><div class='add'>+</div><div class='add'>+	while (!(bdstatus &amp; R_E) &amp;&amp; length) {</div><div class='add'>+		if ((bdstatus &amp; R_F) &amp;&amp; (bdstatus &amp; R_L)</div><div class='add'>+			&amp;&amp; !(bdstatus &amp; R_ERROR)) {</div><div class='add'>+			if (length == USB_CRC_SIZE) {</div><div class='add'>+				udc-&gt;ep0_state = WAIT_FOR_SETUP;</div><div class='add'>+				dev_vdbg(udc-&gt;dev,</div><div class='add'>+					"receive a ZLP in status phase\n");</div><div class='add'>+			} else {</div><div class='add'>+				qe_frame_clean(pframe);</div><div class='add'>+				vaddr = (u32)phys_to_virt(in_be32(&amp;bd-&gt;buf));</div><div class='add'>+				frame_set_data(pframe, (u8 *)vaddr);</div><div class='add'>+				frame_set_length(pframe,</div><div class='add'>+						(length - USB_CRC_SIZE));</div><div class='add'>+				frame_set_status(pframe, FRAME_OK);</div><div class='add'>+				switch (bdstatus &amp; R_PID) {</div><div class='add'>+				case R_PID_SETUP:</div><div class='add'>+					frame_set_info(pframe, PID_SETUP);</div><div class='add'>+					break;</div><div class='add'>+				case R_PID_DATA1:</div><div class='add'>+					frame_set_info(pframe, PID_DATA1);</div><div class='add'>+					break;</div><div class='add'>+				default:</div><div class='add'>+					frame_set_info(pframe, PID_DATA0);</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+				if ((bdstatus &amp; R_PID) == R_PID_SETUP)</div><div class='add'>+					ep0_setup_handle(udc);</div><div class='add'>+				else</div><div class='add'>+					qe_ep_rxframe_handle(ep);</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			dev_err(udc-&gt;dev, "The receive frame with error!\n");</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* note: don't clear the rxbd's buffer address */</div><div class='add'>+		recycle_one_rxbd(ep);</div><div class='add'>+</div><div class='add'>+		/* Get next BD */</div><div class='add'>+		if (bdstatus &amp; R_W)</div><div class='add'>+			bd = ep-&gt;rxbase;</div><div class='add'>+		else</div><div class='add'>+			bd++;</div><div class='add'>+</div><div class='add'>+		bdstatus = in_be32((u32 __iomem *)bd);</div><div class='add'>+		length = bdstatus &amp; BD_LENGTH_MASK;</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ep-&gt;n_rxbd = bd;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qe_ep_rxframe_handle(struct qe_ep *ep)</div><div class='add'>+{</div><div class='add'>+	struct qe_frame *pframe;</div><div class='add'>+	u8 framepid = 0;</div><div class='add'>+	unsigned int fsize;</div><div class='add'>+	u8 *cp;</div><div class='add'>+	struct qe_req *req;</div><div class='add'>+</div><div class='add'>+	pframe = ep-&gt;rxframe;</div><div class='add'>+</div><div class='add'>+	if (frame_get_info(pframe) &amp; PID_DATA1)</div><div class='add'>+		framepid = 0x1;</div><div class='add'>+</div><div class='add'>+	if (framepid != ep-&gt;data01) {</div><div class='add'>+		dev_err(ep-&gt;udc-&gt;dev, "the data01 error!\n");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fsize = frame_get_length(pframe);</div><div class='add'>+	if (list_empty(&amp;ep-&gt;queue)) {</div><div class='add'>+		dev_err(ep-&gt;udc-&gt;dev, "the %s have no requeue!\n", ep-&gt;name);</div><div class='add'>+	} else {</div><div class='add'>+		req = list_entry(ep-&gt;queue.next, struct qe_req, queue);</div><div class='add'>+</div><div class='add'>+		cp = (u8 *)(req-&gt;req.buf) + req-&gt;req.actual;</div><div class='add'>+		if (cp) {</div><div class='add'>+			memcpy(cp, pframe-&gt;data, fsize);</div><div class='add'>+			req-&gt;req.actual += fsize;</div><div class='add'>+			if ((fsize &lt; ep-&gt;ep.maxpacket) ||</div><div class='add'>+					(req-&gt;req.actual &gt;= req-&gt;req.length)) {</div><div class='add'>+				if (ep-&gt;epnum == 0)</div><div class='add'>+					ep0_req_complete(ep-&gt;udc, req);</div><div class='add'>+				else</div><div class='add'>+					done(ep, req, 0);</div><div class='add'>+				if (list_empty(&amp;ep-&gt;queue) &amp;&amp; ep-&gt;epnum != 0)</div><div class='add'>+					qe_eprx_nack(ep);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	qe_ep_toggledata01(ep);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ep_rx_tasklet(unsigned long data)</div><div class='add'>+{</div><div class='add'>+	struct qe_udc *udc = (struct qe_udc *)data;</div><div class='add'>+	struct qe_ep *ep;</div><div class='add'>+	struct qe_frame *pframe;</div><div class='add'>+	struct qe_bd __iomem *bd;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u32 bdstatus, length;</div><div class='add'>+	u32 vaddr, i;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;udc-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	for (i = 1; i &lt; USB_MAX_ENDPOINTS; i++) {</div><div class='add'>+		ep = &amp;udc-&gt;eps[i];</div><div class='add'>+</div><div class='add'>+		if (ep-&gt;dir == USB_DIR_IN || ep-&gt;enable_tasklet == 0) {</div><div class='add'>+			dev_dbg(udc-&gt;dev,</div><div class='add'>+				"This is a transmit ep or disable tasklet!\n");</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		pframe = ep-&gt;rxframe;</div><div class='add'>+		bd = ep-&gt;n_rxbd;</div><div class='add'>+		bdstatus = in_be32((u32 __iomem *)bd);</div><div class='add'>+		length = bdstatus &amp; BD_LENGTH_MASK;</div><div class='add'>+</div><div class='add'>+		while (!(bdstatus &amp; R_E) &amp;&amp; length) {</div><div class='add'>+			if (list_empty(&amp;ep-&gt;queue)) {</div><div class='add'>+				qe_eprx_nack(ep);</div><div class='add'>+				dev_dbg(udc-&gt;dev,</div><div class='add'>+					"The rxep have noreq %d\n",</div><div class='add'>+					ep-&gt;has_data);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if ((bdstatus &amp; R_F) &amp;&amp; (bdstatus &amp; R_L)</div><div class='add'>+				&amp;&amp; !(bdstatus &amp; R_ERROR)) {</div><div class='add'>+				qe_frame_clean(pframe);</div><div class='add'>+				vaddr = (u32)phys_to_virt(in_be32(&amp;bd-&gt;buf));</div><div class='add'>+				frame_set_data(pframe, (u8 *)vaddr);</div><div class='add'>+				frame_set_length(pframe,</div><div class='add'>+						(length - USB_CRC_SIZE));</div><div class='add'>+				frame_set_status(pframe, FRAME_OK);</div><div class='add'>+				switch (bdstatus &amp; R_PID) {</div><div class='add'>+				case R_PID_DATA1:</div><div class='add'>+					frame_set_info(pframe, PID_DATA1);</div><div class='add'>+					break;</div><div class='add'>+				case R_PID_SETUP:</div><div class='add'>+					frame_set_info(pframe, PID_SETUP);</div><div class='add'>+					break;</div><div class='add'>+				default:</div><div class='add'>+					frame_set_info(pframe, PID_DATA0);</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+				/* handle the rx frame */</div><div class='add'>+				qe_ep_rxframe_handle(ep);</div><div class='add'>+			} else {</div><div class='add'>+				dev_err(udc-&gt;dev,</div><div class='add'>+					"error in received frame\n");</div><div class='add'>+			}</div><div class='add'>+			/* note: don't clear the rxbd's buffer address */</div><div class='add'>+			/*clear the length */</div><div class='add'>+			out_be32((u32 __iomem *)bd, bdstatus &amp; BD_STATUS_MASK);</div><div class='add'>+			ep-&gt;has_data--;</div><div class='add'>+			if (!(ep-&gt;localnack))</div><div class='add'>+				recycle_one_rxbd(ep);</div><div class='add'>+</div><div class='add'>+			/* Get next BD */</div><div class='add'>+			if (bdstatus &amp; R_W)</div><div class='add'>+				bd = ep-&gt;rxbase;</div><div class='add'>+			else</div><div class='add'>+				bd++;</div><div class='add'>+</div><div class='add'>+			bdstatus = in_be32((u32 __iomem *)bd);</div><div class='add'>+			length = bdstatus &amp; BD_LENGTH_MASK;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ep-&gt;n_rxbd = bd;</div><div class='add'>+</div><div class='add'>+		if (ep-&gt;localnack)</div><div class='add'>+			ep_recycle_rxbds(ep);</div><div class='add'>+</div><div class='add'>+		ep-&gt;enable_tasklet = 0;</div><div class='add'>+	} /* for i=1 */</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;udc-&gt;lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qe_ep_rx(struct qe_ep *ep)</div><div class='add'>+{</div><div class='add'>+	struct qe_udc *udc;</div><div class='add'>+	struct qe_frame *pframe;</div><div class='add'>+	struct qe_bd __iomem *bd;</div><div class='add'>+	u16 swoffs, ucoffs, emptybds;</div><div class='add'>+</div><div class='add'>+	udc = ep-&gt;udc;</div><div class='add'>+	pframe = ep-&gt;rxframe;</div><div class='add'>+</div><div class='add'>+	if (ep-&gt;dir == USB_DIR_IN) {</div><div class='add'>+		dev_err(udc-&gt;dev, "transmit ep in rx function\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bd = ep-&gt;n_rxbd;</div><div class='add'>+</div><div class='add'>+	swoffs = (u16)(bd - ep-&gt;rxbase);</div><div class='add'>+	ucoffs = (u16)((in_be16(&amp;udc-&gt;ep_param[ep-&gt;epnum]-&gt;rbptr) -</div><div class='add'>+			in_be16(&amp;udc-&gt;ep_param[ep-&gt;epnum]-&gt;rbase)) &gt;&gt; 3);</div><div class='add'>+	if (swoffs &lt; ucoffs)</div><div class='add'>+		emptybds = USB_BDRING_LEN_RX - ucoffs + swoffs;</div><div class='add'>+	else</div><div class='add'>+		emptybds = swoffs - ucoffs;</div><div class='add'>+</div><div class='add'>+	if (emptybds &lt; MIN_EMPTY_BDS) {</div><div class='add'>+		qe_eprx_nack(ep);</div><div class='add'>+		ep-&gt;localnack = 1;</div><div class='add'>+		dev_vdbg(udc-&gt;dev, "%d empty bds, send NACK\n", emptybds);</div><div class='add'>+	}</div><div class='add'>+	ep-&gt;has_data = USB_BDRING_LEN_RX - emptybds;</div><div class='add'>+</div><div class='add'>+	if (list_empty(&amp;ep-&gt;queue)) {</div><div class='add'>+		qe_eprx_nack(ep);</div><div class='add'>+		dev_vdbg(udc-&gt;dev, "The rxep have no req queued with %d BDs\n",</div><div class='add'>+				ep-&gt;has_data);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tasklet_schedule(&amp;udc-&gt;rx_tasklet);</div><div class='add'>+	ep-&gt;enable_tasklet = 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* send data from a frame, no matter what tx_req */</div><div class='add'>+static int qe_ep_tx(struct qe_ep *ep, struct qe_frame *frame)</div><div class='add'>+{</div><div class='add'>+	struct qe_udc *udc = ep-&gt;udc;</div><div class='add'>+	struct qe_bd __iomem *bd;</div><div class='add'>+	u16 saveusbmr;</div><div class='add'>+	u32 bdstatus, pidmask;</div><div class='add'>+	u32 paddr;</div><div class='add'>+</div><div class='add'>+	if (ep-&gt;dir == USB_DIR_OUT) {</div><div class='add'>+		dev_err(udc-&gt;dev, "receive ep passed to tx function\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Disable the Tx interrupt */</div><div class='add'>+	saveusbmr = in_be16(&amp;udc-&gt;usb_regs-&gt;usb_usbmr);</div><div class='add'>+	out_be16(&amp;udc-&gt;usb_regs-&gt;usb_usbmr,</div><div class='add'>+			saveusbmr &amp; ~(USB_E_TXB_MASK | USB_E_TXE_MASK));</div><div class='add'>+</div><div class='add'>+	bd = ep-&gt;n_txbd;</div><div class='add'>+	bdstatus = in_be32((u32 __iomem *)bd);</div><div class='add'>+</div><div class='add'>+	if (!(bdstatus &amp; (T_R | BD_LENGTH_MASK))) {</div><div class='add'>+		if (frame_get_length(frame) == 0) {</div><div class='add'>+			frame_set_data(frame, udc-&gt;nullbuf);</div><div class='add'>+			frame_set_length(frame, 2);</div><div class='add'>+			frame-&gt;info |= (ZLP | NO_CRC);</div><div class='add'>+			dev_vdbg(udc-&gt;dev, "the frame size = 0\n");</div><div class='add'>+		}</div><div class='add'>+		paddr = virt_to_phys((void *)frame-&gt;data);</div><div class='add'>+		out_be32(&amp;bd-&gt;buf, paddr);</div><div class='add'>+		bdstatus = (bdstatus&amp;T_W);</div><div class='add'>+		if (!(frame_get_info(frame) &amp; NO_CRC))</div><div class='add'>+			bdstatus |= T_R | T_I | T_L | T_TC</div><div class='add'>+					| frame_get_length(frame);</div><div class='add'>+		else</div><div class='add'>+			bdstatus |= T_R | T_I | T_L | frame_get_length(frame);</div><div class='add'>+</div><div class='add'>+		/* if the packet is a ZLP in status phase */</div><div class='add'>+		if ((ep-&gt;epnum == 0) &amp;&amp; (udc-&gt;ep0_state == DATA_STATE_NEED_ZLP))</div><div class='add'>+			ep-&gt;data01 = 0x1;</div><div class='add'>+</div><div class='add'>+		if (ep-&gt;data01) {</div><div class='add'>+			pidmask = T_PID_DATA1;</div><div class='add'>+			frame-&gt;info |= PID_DATA1;</div><div class='add'>+		} else {</div><div class='add'>+			pidmask = T_PID_DATA0;</div><div class='add'>+			frame-&gt;info |= PID_DATA0;</div><div class='add'>+		}</div><div class='add'>+		bdstatus |= T_CNF;</div><div class='add'>+		bdstatus |= pidmask;</div><div class='add'>+		out_be32((u32 __iomem *)bd, bdstatus);</div><div class='add'>+		qe_ep_filltxfifo(ep);</div><div class='add'>+</div><div class='add'>+		/* enable the TX interrupt */</div><div class='add'>+		out_be16(&amp;udc-&gt;usb_regs-&gt;usb_usbmr, saveusbmr);</div><div class='add'>+</div><div class='add'>+		qe_ep_toggledata01(ep);</div><div class='add'>+		if (bdstatus &amp; T_W)</div><div class='add'>+			ep-&gt;n_txbd = ep-&gt;txbase;</div><div class='add'>+		else</div><div class='add'>+			ep-&gt;n_txbd++;</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	} else {</div><div class='add'>+		out_be16(&amp;udc-&gt;usb_regs-&gt;usb_usbmr, saveusbmr);</div><div class='add'>+		dev_vdbg(udc-&gt;dev, "The tx bd is not ready!\n");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* when a bd was transmitted, the function can</div><div class='add'>+ * handle the tx_req, not include ep0           */</div><div class='add'>+static int txcomplete(struct qe_ep *ep, unsigned char restart)</div><div class='add'>+{</div><div class='add'>+	if (ep-&gt;tx_req != NULL) {</div><div class='add'>+		if (!restart) {</div><div class='add'>+			int asent = ep-&gt;last;</div><div class='add'>+			ep-&gt;sent += asent;</div><div class='add'>+			ep-&gt;last -= asent;</div><div class='add'>+		} else {</div><div class='add'>+			ep-&gt;last = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* a request already were transmitted completely */</div><div class='add'>+		if ((ep-&gt;tx_req-&gt;req.length - ep-&gt;sent) &lt;= 0) {</div><div class='add'>+			ep-&gt;tx_req-&gt;req.actual = (unsigned int)ep-&gt;sent;</div><div class='add'>+			done(ep, ep-&gt;tx_req, 0);</div><div class='add'>+			ep-&gt;tx_req = NULL;</div><div class='add'>+			ep-&gt;last = 0;</div><div class='add'>+			ep-&gt;sent = 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* we should gain a new tx_req fot this endpoint */</div><div class='add'>+	if (ep-&gt;tx_req == NULL) {</div><div class='add'>+		if (!list_empty(&amp;ep-&gt;queue)) {</div><div class='add'>+			ep-&gt;tx_req = list_entry(ep-&gt;queue.next,	struct qe_req,</div><div class='add'>+							queue);</div><div class='add'>+			ep-&gt;last = 0;</div><div class='add'>+			ep-&gt;sent = 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* give a frame and a tx_req, send some data */</div><div class='add'>+static int qe_usb_senddata(struct qe_ep *ep, struct qe_frame *frame)</div><div class='add'>+{</div><div class='add'>+	unsigned int size;</div><div class='add'>+	u8 *buf;</div><div class='add'>+</div><div class='add'>+	qe_frame_clean(frame);</div><div class='add'>+	size = min_t(u32, (ep-&gt;tx_req-&gt;req.length - ep-&gt;sent),</div><div class='add'>+				ep-&gt;ep.maxpacket);</div><div class='add'>+	buf = (u8 *)ep-&gt;tx_req-&gt;req.buf + ep-&gt;sent;</div><div class='add'>+	if (buf &amp;&amp; size) {</div><div class='add'>+		ep-&gt;last = size;</div><div class='add'>+		frame_set_data(frame, buf);</div><div class='add'>+		frame_set_length(frame, size);</div><div class='add'>+		frame_set_status(frame, FRAME_OK);</div><div class='add'>+		frame_set_info(frame, 0);</div><div class='add'>+		return qe_ep_tx(ep, frame);</div><div class='add'>+	}</div><div class='add'>+	return -EIO;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* give a frame struct,send a ZLP */</div><div class='add'>+static int sendnulldata(struct qe_ep *ep, struct qe_frame *frame, uint infor)</div><div class='add'>+{</div><div class='add'>+	struct qe_udc *udc = ep-&gt;udc;</div><div class='add'>+</div><div class='add'>+	if (frame == NULL)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	qe_frame_clean(frame);</div><div class='add'>+	frame_set_data(frame, (u8 *)udc-&gt;nullbuf);</div><div class='add'>+	frame_set_length(frame, 2);</div><div class='add'>+	frame_set_status(frame, FRAME_OK);</div><div class='add'>+	frame_set_info(frame, (ZLP | NO_CRC | infor));</div><div class='add'>+</div><div class='add'>+	return qe_ep_tx(ep, frame);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int frame_create_tx(struct qe_ep *ep, struct qe_frame *frame)</div><div class='add'>+{</div><div class='add'>+	struct qe_req *req = ep-&gt;tx_req;</div><div class='add'>+	int reval;</div><div class='add'>+</div><div class='add'>+	if (req == NULL)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	if ((req-&gt;req.length - ep-&gt;sent) &gt; 0)</div><div class='add'>+		reval = qe_usb_senddata(ep, frame);</div><div class='add'>+	else</div><div class='add'>+		reval = sendnulldata(ep, frame, 0);</div><div class='add'>+</div><div class='add'>+	return reval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* if direction is DIR_IN, the status is Device-&gt;Host</div><div class='add'>+ * if direction is DIR_OUT, the status transaction is Device&lt;-Host</div><div class='add'>+ * in status phase, udc create a request and gain status */</div><div class='add'>+static int ep0_prime_status(struct qe_udc *udc, int direction)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	struct qe_ep *ep = &amp;udc-&gt;eps[0];</div><div class='add'>+</div><div class='add'>+	if (direction == USB_DIR_IN) {</div><div class='add'>+		udc-&gt;ep0_state = DATA_STATE_NEED_ZLP;</div><div class='add'>+		udc-&gt;ep0_dir = USB_DIR_IN;</div><div class='add'>+		sendnulldata(ep, ep-&gt;txframe, SETUP_STATUS | NO_REQ);</div><div class='add'>+	} else {</div><div class='add'>+		udc-&gt;ep0_dir = USB_DIR_OUT;</div><div class='add'>+		udc-&gt;ep0_state = WAIT_FOR_OUT_STATUS;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* a request complete in ep0, whether gadget request or udc request */</div><div class='add'>+static void ep0_req_complete(struct qe_udc *udc, struct qe_req *req)</div><div class='add'>+{</div><div class='add'>+	struct qe_ep *ep = &amp;udc-&gt;eps[0];</div><div class='add'>+	/* because usb and ep's status already been set in ch9setaddress() */</div><div class='add'>+</div><div class='add'>+	switch (udc-&gt;ep0_state) {</div><div class='add'>+	case DATA_STATE_XMIT:</div><div class='add'>+		done(ep, req, 0);</div><div class='add'>+		/* receive status phase */</div><div class='add'>+		if (ep0_prime_status(udc, USB_DIR_OUT))</div><div class='add'>+			qe_ep0_stall(udc);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case DATA_STATE_NEED_ZLP:</div><div class='add'>+		done(ep, req, 0);</div><div class='add'>+		udc-&gt;ep0_state = WAIT_FOR_SETUP;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case DATA_STATE_RECV:</div><div class='add'>+		done(ep, req, 0);</div><div class='add'>+		/* send status phase */</div><div class='add'>+		if (ep0_prime_status(udc, USB_DIR_IN))</div><div class='add'>+			qe_ep0_stall(udc);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case WAIT_FOR_OUT_STATUS:</div><div class='add'>+		done(ep, req, 0);</div><div class='add'>+		udc-&gt;ep0_state = WAIT_FOR_SETUP;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case WAIT_FOR_SETUP:</div><div class='add'>+		dev_vdbg(udc-&gt;dev, "Unexpected interrupt\n");</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		qe_ep0_stall(udc);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ep0_txcomplete(struct qe_ep *ep, unsigned char restart)</div><div class='add'>+{</div><div class='add'>+	struct qe_req *tx_req = NULL;</div><div class='add'>+	struct qe_frame *frame = ep-&gt;txframe;</div><div class='add'>+</div><div class='add'>+	if ((frame_get_info(frame) &amp; (ZLP | NO_REQ)) == (ZLP | NO_REQ)) {</div><div class='add'>+		if (!restart)</div><div class='add'>+			ep-&gt;udc-&gt;ep0_state = WAIT_FOR_SETUP;</div><div class='add'>+		else</div><div class='add'>+			sendnulldata(ep, ep-&gt;txframe, SETUP_STATUS | NO_REQ);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tx_req = ep-&gt;tx_req;</div><div class='add'>+	if (tx_req != NULL) {</div><div class='add'>+		if (!restart) {</div><div class='add'>+			int asent = ep-&gt;last;</div><div class='add'>+			ep-&gt;sent += asent;</div><div class='add'>+			ep-&gt;last -= asent;</div><div class='add'>+		} else {</div><div class='add'>+			ep-&gt;last = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* a request already were transmitted completely */</div><div class='add'>+		if ((ep-&gt;tx_req-&gt;req.length - ep-&gt;sent) &lt;= 0) {</div><div class='add'>+			ep-&gt;tx_req-&gt;req.actual = (unsigned int)ep-&gt;sent;</div><div class='add'>+			ep0_req_complete(ep-&gt;udc, ep-&gt;tx_req);</div><div class='add'>+			ep-&gt;tx_req = NULL;</div><div class='add'>+			ep-&gt;last = 0;</div><div class='add'>+			ep-&gt;sent = 0;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		dev_vdbg(ep-&gt;udc-&gt;dev, "the ep0_controller have no req\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ep0_txframe_handle(struct qe_ep *ep)</div><div class='add'>+{</div><div class='add'>+	/* if have error, transmit again */</div><div class='add'>+	if (frame_get_status(ep-&gt;txframe) &amp; FRAME_ERROR) {</div><div class='add'>+		qe_ep_flushtxfifo(ep);</div><div class='add'>+		dev_vdbg(ep-&gt;udc-&gt;dev, "The EP0 transmit data have error!\n");</div><div class='add'>+		if (frame_get_info(ep-&gt;txframe) &amp; PID_DATA0)</div><div class='add'>+			ep-&gt;data01 = 0;</div><div class='add'>+		else</div><div class='add'>+			ep-&gt;data01 = 1;</div><div class='add'>+</div><div class='add'>+		ep0_txcomplete(ep, 1);</div><div class='add'>+	} else</div><div class='add'>+		ep0_txcomplete(ep, 0);</div><div class='add'>+</div><div class='add'>+	frame_create_tx(ep, ep-&gt;txframe);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qe_ep0_txconf(struct qe_ep *ep)</div><div class='add'>+{</div><div class='add'>+	struct qe_bd __iomem *bd;</div><div class='add'>+	struct qe_frame *pframe;</div><div class='add'>+	u32 bdstatus;</div><div class='add'>+</div><div class='add'>+	bd = ep-&gt;c_txbd;</div><div class='add'>+	bdstatus = in_be32((u32 __iomem *)bd);</div><div class='add'>+	while (!(bdstatus &amp; T_R) &amp;&amp; (bdstatus &amp; ~T_W)) {</div><div class='add'>+		pframe = ep-&gt;txframe;</div><div class='add'>+</div><div class='add'>+		/* clear and recycle the BD */</div><div class='add'>+		out_be32((u32 __iomem *)bd, bdstatus &amp; T_W);</div><div class='add'>+		out_be32(&amp;bd-&gt;buf, 0);</div><div class='add'>+		if (bdstatus &amp; T_W)</div><div class='add'>+			ep-&gt;c_txbd = ep-&gt;txbase;</div><div class='add'>+		else</div><div class='add'>+			ep-&gt;c_txbd++;</div><div class='add'>+</div><div class='add'>+		if (ep-&gt;c_txbd == ep-&gt;n_txbd) {</div><div class='add'>+			if (bdstatus &amp; DEVICE_T_ERROR) {</div><div class='add'>+				frame_set_status(pframe, FRAME_ERROR);</div><div class='add'>+				if (bdstatus &amp; T_TO)</div><div class='add'>+					pframe-&gt;status |= TX_ER_TIMEOUT;</div><div class='add'>+				if (bdstatus &amp; T_UN)</div><div class='add'>+					pframe-&gt;status |= TX_ER_UNDERUN;</div><div class='add'>+			}</div><div class='add'>+			ep0_txframe_handle(ep);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		bd = ep-&gt;c_txbd;</div><div class='add'>+		bdstatus = in_be32((u32 __iomem *)bd);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ep_txframe_handle(struct qe_ep *ep)</div><div class='add'>+{</div><div class='add'>+	if (frame_get_status(ep-&gt;txframe) &amp; FRAME_ERROR) {</div><div class='add'>+		qe_ep_flushtxfifo(ep);</div><div class='add'>+		dev_vdbg(ep-&gt;udc-&gt;dev, "The EP0 transmit data have error!\n");</div><div class='add'>+		if (frame_get_info(ep-&gt;txframe) &amp; PID_DATA0)</div><div class='add'>+			ep-&gt;data01 = 0;</div><div class='add'>+		else</div><div class='add'>+			ep-&gt;data01 = 1;</div><div class='add'>+</div><div class='add'>+		txcomplete(ep, 1);</div><div class='add'>+	} else</div><div class='add'>+		txcomplete(ep, 0);</div><div class='add'>+</div><div class='add'>+	frame_create_tx(ep, ep-&gt;txframe); /* send the data */</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* confirm the already trainsmited bd */</div><div class='add'>+static int qe_ep_txconf(struct qe_ep *ep)</div><div class='add'>+{</div><div class='add'>+	struct qe_bd __iomem *bd;</div><div class='add'>+	struct qe_frame *pframe = NULL;</div><div class='add'>+	u32 bdstatus;</div><div class='add'>+	unsigned char breakonrxinterrupt = 0;</div><div class='add'>+</div><div class='add'>+	bd = ep-&gt;c_txbd;</div><div class='add'>+	bdstatus = in_be32((u32 __iomem *)bd);</div><div class='add'>+	while (!(bdstatus &amp; T_R) &amp;&amp; (bdstatus &amp; ~T_W)) {</div><div class='add'>+		pframe = ep-&gt;txframe;</div><div class='add'>+		if (bdstatus &amp; DEVICE_T_ERROR) {</div><div class='add'>+			frame_set_status(pframe, FRAME_ERROR);</div><div class='add'>+			if (bdstatus &amp; T_TO)</div><div class='add'>+				pframe-&gt;status |= TX_ER_TIMEOUT;</div><div class='add'>+			if (bdstatus &amp; T_UN)</div><div class='add'>+				pframe-&gt;status |= TX_ER_UNDERUN;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* clear and recycle the BD */</div><div class='add'>+		out_be32((u32 __iomem *)bd, bdstatus &amp; T_W);</div><div class='add'>+		out_be32(&amp;bd-&gt;buf, 0);</div><div class='add'>+		if (bdstatus &amp; T_W)</div><div class='add'>+			ep-&gt;c_txbd = ep-&gt;txbase;</div><div class='add'>+		else</div><div class='add'>+			ep-&gt;c_txbd++;</div><div class='add'>+</div><div class='add'>+		/* handle the tx frame */</div><div class='add'>+		ep_txframe_handle(ep);</div><div class='add'>+		bd = ep-&gt;c_txbd;</div><div class='add'>+		bdstatus = in_be32((u32 __iomem *)bd);</div><div class='add'>+	}</div><div class='add'>+	if (breakonrxinterrupt)</div><div class='add'>+		return -EIO;</div><div class='add'>+	else</div><div class='add'>+		return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Add a request in queue, and try to transmit a packet */</div><div class='add'>+static int ep_req_send(struct qe_ep *ep, struct qe_req *req)</div><div class='add'>+{</div><div class='add'>+	int reval = 0;</div><div class='add'>+</div><div class='add'>+	if (ep-&gt;tx_req == NULL) {</div><div class='add'>+		ep-&gt;sent = 0;</div><div class='add'>+		ep-&gt;last = 0;</div><div class='add'>+		txcomplete(ep, 0); /* can gain a new tx_req */</div><div class='add'>+		reval = frame_create_tx(ep, ep-&gt;txframe);</div><div class='add'>+	}</div><div class='add'>+	return reval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Maybe this is a good ideal */</div><div class='add'>+static int ep_req_rx(struct qe_ep *ep, struct qe_req *req)</div><div class='add'>+{</div><div class='add'>+	struct qe_udc *udc = ep-&gt;udc;</div><div class='add'>+	struct qe_frame *pframe = NULL;</div><div class='add'>+	struct qe_bd __iomem *bd;</div><div class='add'>+	u32 bdstatus, length;</div><div class='add'>+	u32 vaddr, fsize;</div><div class='add'>+	u8 *cp;</div><div class='add'>+	u8 finish_req = 0;</div><div class='add'>+	u8 framepid;</div><div class='add'>+</div><div class='add'>+	if (list_empty(&amp;ep-&gt;queue)) {</div><div class='add'>+		dev_vdbg(udc-&gt;dev, "the req already finish!\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	pframe = ep-&gt;rxframe;</div><div class='add'>+</div><div class='add'>+	bd = ep-&gt;n_rxbd;</div><div class='add'>+	bdstatus = in_be32((u32 __iomem *)bd);</div><div class='add'>+	length = bdstatus &amp; BD_LENGTH_MASK;</div><div class='add'>+</div><div class='add'>+	while (!(bdstatus &amp; R_E) &amp;&amp; length) {</div><div class='add'>+		if (finish_req)</div><div class='add'>+			break;</div><div class='add'>+		if ((bdstatus &amp; R_F) &amp;&amp; (bdstatus &amp; R_L)</div><div class='add'>+					&amp;&amp; !(bdstatus &amp; R_ERROR)) {</div><div class='add'>+			qe_frame_clean(pframe);</div><div class='add'>+			vaddr = (u32)phys_to_virt(in_be32(&amp;bd-&gt;buf));</div><div class='add'>+			frame_set_data(pframe, (u8 *)vaddr);</div><div class='add'>+			frame_set_length(pframe, (length - USB_CRC_SIZE));</div><div class='add'>+			frame_set_status(pframe, FRAME_OK);</div><div class='add'>+			switch (bdstatus &amp; R_PID) {</div><div class='add'>+			case R_PID_DATA1:</div><div class='add'>+				frame_set_info(pframe, PID_DATA1); break;</div><div class='add'>+			default:</div><div class='add'>+				frame_set_info(pframe, PID_DATA0); break;</div><div class='add'>+			}</div><div class='add'>+			/* handle the rx frame */</div><div class='add'>+</div><div class='add'>+			if (frame_get_info(pframe) &amp; PID_DATA1)</div><div class='add'>+				framepid = 0x1;</div><div class='add'>+			else</div><div class='add'>+				framepid = 0;</div><div class='add'>+</div><div class='add'>+			if (framepid != ep-&gt;data01) {</div><div class='add'>+				dev_vdbg(udc-&gt;dev, "the data01 error!\n");</div><div class='add'>+			} else {</div><div class='add'>+				fsize = frame_get_length(pframe);</div><div class='add'>+</div><div class='add'>+				cp = (u8 *)(req-&gt;req.buf) + req-&gt;req.actual;</div><div class='add'>+				if (cp) {</div><div class='add'>+					memcpy(cp, pframe-&gt;data, fsize);</div><div class='add'>+					req-&gt;req.actual += fsize;</div><div class='add'>+					if ((fsize &lt; ep-&gt;ep.maxpacket)</div><div class='add'>+						|| (req-&gt;req.actual &gt;=</div><div class='add'>+							req-&gt;req.length)) {</div><div class='add'>+						finish_req = 1;</div><div class='add'>+						done(ep, req, 0);</div><div class='add'>+						if (list_empty(&amp;ep-&gt;queue))</div><div class='add'>+							qe_eprx_nack(ep);</div><div class='add'>+					}</div><div class='add'>+				}</div><div class='add'>+				qe_ep_toggledata01(ep);</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			dev_err(udc-&gt;dev, "The receive frame with error!\n");</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* note: don't clear the rxbd's buffer address *</div><div class='add'>+		 * only Clear the length */</div><div class='add'>+		out_be32((u32 __iomem *)bd, (bdstatus &amp; BD_STATUS_MASK));</div><div class='add'>+		ep-&gt;has_data--;</div><div class='add'>+</div><div class='add'>+		/* Get next BD */</div><div class='add'>+		if (bdstatus &amp; R_W)</div><div class='add'>+			bd = ep-&gt;rxbase;</div><div class='add'>+		else</div><div class='add'>+			bd++;</div><div class='add'>+</div><div class='add'>+		bdstatus = in_be32((u32 __iomem *)bd);</div><div class='add'>+		length = bdstatus &amp; BD_LENGTH_MASK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ep-&gt;n_rxbd = bd;</div><div class='add'>+	ep_recycle_rxbds(ep);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* only add the request in queue */</div><div class='add'>+static int ep_req_receive(struct qe_ep *ep, struct qe_req *req)</div><div class='add'>+{</div><div class='add'>+	if (ep-&gt;state == EP_STATE_NACK) {</div><div class='add'>+		if (ep-&gt;has_data &lt;= 0) {</div><div class='add'>+			/* Enable rx and unmask rx interrupt */</div><div class='add'>+			qe_eprx_normal(ep);</div><div class='add'>+		} else {</div><div class='add'>+			/* Copy the exist BD data */</div><div class='add'>+			ep_req_rx(ep, req);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/********************************************************************</div><div class='add'>+	Internal Used Function End</div><div class='add'>+********************************************************************/</div><div class='add'>+</div><div class='add'>+/*-----------------------------------------------------------------------</div><div class='add'>+	Endpoint Management Functions For Gadget</div><div class='add'>+ -----------------------------------------------------------------------*/</div><div class='add'>+static int qe_ep_enable(struct usb_ep *_ep,</div><div class='add'>+			 const struct usb_endpoint_descriptor *desc)</div><div class='add'>+{</div><div class='add'>+	struct qe_udc *udc;</div><div class='add'>+	struct qe_ep *ep;</div><div class='add'>+	int retval = 0;</div><div class='add'>+	unsigned char epnum;</div><div class='add'>+</div><div class='add'>+	ep = container_of(_ep, struct qe_ep, ep);</div><div class='add'>+</div><div class='add'>+	/* catch various bogus parameters */</div><div class='add'>+	if (!_ep || !desc || ep-&gt;desc || _ep-&gt;name == ep_name[0] ||</div><div class='add'>+			(desc-&gt;bDescriptorType != USB_DT_ENDPOINT))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	udc = ep-&gt;udc;</div><div class='add'>+	if (!udc-&gt;driver || (udc-&gt;gadget.speed == USB_SPEED_UNKNOWN))</div><div class='add'>+		return -ESHUTDOWN;</div><div class='add'>+</div><div class='add'>+	epnum = (u8)desc-&gt;bEndpointAddress &amp; 0xF;</div><div class='add'>+</div><div class='add'>+	retval = qe_ep_init(udc, epnum, desc);</div><div class='add'>+	if (retval != 0) {</div><div class='add'>+		cpm_muram_free(cpm_muram_offset(ep-&gt;rxbase));</div><div class='add'>+		dev_dbg(udc-&gt;dev, "enable ep%d failed\n", ep-&gt;epnum);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	dev_dbg(udc-&gt;dev, "enable ep%d successful\n", ep-&gt;epnum);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qe_ep_disable(struct usb_ep *_ep)</div><div class='add'>+{</div><div class='add'>+	struct qe_udc *udc;</div><div class='add'>+	struct qe_ep *ep;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	unsigned int size;</div><div class='add'>+</div><div class='add'>+	ep = container_of(_ep, struct qe_ep, ep);</div><div class='add'>+	udc = ep-&gt;udc;</div><div class='add'>+</div><div class='add'>+	if (!_ep || !ep-&gt;desc) {</div><div class='add'>+		dev_dbg(udc-&gt;dev, "%s not enabled\n", _ep ? ep-&gt;ep.name : NULL);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;udc-&gt;lock, flags);</div><div class='add'>+	/* Nuke all pending requests (does flush) */</div><div class='add'>+	nuke(ep, -ESHUTDOWN);</div><div class='add'>+	ep-&gt;desc = NULL;</div><div class='add'>+	ep-&gt;stopped = 1;</div><div class='add'>+	spin_unlock_irqrestore(&amp;udc-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	cpm_muram_free(cpm_muram_offset(ep-&gt;rxbase));</div><div class='add'>+</div><div class='add'>+	if (ep-&gt;dir == USB_DIR_OUT)</div><div class='add'>+		size = (ep-&gt;ep.maxpacket + USB_CRC_SIZE + 2) *</div><div class='add'>+				(USB_BDRING_LEN_RX + 1);</div><div class='add'>+	else</div><div class='add'>+		size = (ep-&gt;ep.maxpacket + USB_CRC_SIZE + 2) *</div><div class='add'>+				(USB_BDRING_LEN + 1);</div><div class='add'>+</div><div class='add'>+	if (ep-&gt;dir != USB_DIR_IN) {</div><div class='add'>+		kfree(ep-&gt;rxframe);</div><div class='add'>+		if (ep-&gt;rxbufmap) {</div><div class='add'>+			dma_unmap_single(udc_controller-&gt;gadget.dev.parent,</div><div class='add'>+					ep-&gt;rxbuf_d, size,</div><div class='add'>+					DMA_FROM_DEVICE);</div><div class='add'>+			ep-&gt;rxbuf_d = DMA_ADDR_INVALID;</div><div class='add'>+		} else {</div><div class='add'>+			dma_sync_single_for_cpu(</div><div class='add'>+					udc_controller-&gt;gadget.dev.parent,</div><div class='add'>+					ep-&gt;rxbuf_d, size,</div><div class='add'>+					DMA_FROM_DEVICE);</div><div class='add'>+		}</div><div class='add'>+		kfree(ep-&gt;rxbuffer);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ep-&gt;dir != USB_DIR_OUT)</div><div class='add'>+		kfree(ep-&gt;txframe);</div><div class='add'>+</div><div class='add'>+	dev_dbg(udc-&gt;dev, "disabled %s OK\n", _ep-&gt;name);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct usb_request *qe_alloc_request(struct usb_ep *_ep,	gfp_t gfp_flags)</div><div class='add'>+{</div><div class='add'>+	struct qe_req *req;</div><div class='add'>+</div><div class='add'>+	req = kzalloc(sizeof(*req), gfp_flags);</div><div class='add'>+	if (!req)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	req-&gt;req.dma = DMA_ADDR_INVALID;</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;req-&gt;queue);</div><div class='add'>+</div><div class='add'>+	return &amp;req-&gt;req;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void qe_free_request(struct usb_ep *_ep, struct usb_request *_req)</div><div class='add'>+{</div><div class='add'>+	struct qe_req *req;</div><div class='add'>+</div><div class='add'>+	req = container_of(_req, struct qe_req, req);</div><div class='add'>+</div><div class='add'>+	if (_req)</div><div class='add'>+		kfree(req);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* queues (submits) an I/O request to an endpoint */</div><div class='add'>+static int qe_ep_queue(struct usb_ep *_ep, struct usb_request *_req,</div><div class='add'>+				gfp_t gfp_flags)</div><div class='add'>+{</div><div class='add'>+	struct qe_ep *ep = container_of(_ep, struct qe_ep, ep);</div><div class='add'>+	struct qe_req *req = container_of(_req, struct qe_req, req);</div><div class='add'>+	struct qe_udc *udc;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int reval;</div><div class='add'>+</div><div class='add'>+	udc = ep-&gt;udc;</div><div class='add'>+	/* catch various bogus parameters */</div><div class='add'>+	if (!_req || !req-&gt;req.complete || !req-&gt;req.buf</div><div class='add'>+			|| !list_empty(&amp;req-&gt;queue)) {</div><div class='add'>+		dev_dbg(udc-&gt;dev, "bad params\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (!_ep || (!ep-&gt;desc &amp;&amp; ep_index(ep))) {</div><div class='add'>+		dev_dbg(udc-&gt;dev, "bad ep\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!udc-&gt;driver || udc-&gt;gadget.speed == USB_SPEED_UNKNOWN)</div><div class='add'>+		return -ESHUTDOWN;</div><div class='add'>+</div><div class='add'>+	req-&gt;ep = ep;</div><div class='add'>+</div><div class='add'>+	/* map virtual address to hardware */</div><div class='add'>+	if (req-&gt;req.dma == DMA_ADDR_INVALID) {</div><div class='add'>+		req-&gt;req.dma = dma_map_single(ep-&gt;udc-&gt;gadget.dev.parent,</div><div class='add'>+					req-&gt;req.buf,</div><div class='add'>+					req-&gt;req.length,</div><div class='add'>+					ep_is_in(ep)</div><div class='add'>+					? DMA_TO_DEVICE :</div><div class='add'>+					DMA_FROM_DEVICE);</div><div class='add'>+		req-&gt;mapped = 1;</div><div class='add'>+	} else {</div><div class='add'>+		dma_sync_single_for_device(ep-&gt;udc-&gt;gadget.dev.parent,</div><div class='add'>+					req-&gt;req.dma, req-&gt;req.length,</div><div class='add'>+					ep_is_in(ep)</div><div class='add'>+					? DMA_TO_DEVICE :</div><div class='add'>+					DMA_FROM_DEVICE);</div><div class='add'>+		req-&gt;mapped = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	req-&gt;req.status = -EINPROGRESS;</div><div class='add'>+	req-&gt;req.actual = 0;</div><div class='add'>+</div><div class='add'>+	list_add_tail(&amp;req-&gt;queue, &amp;ep-&gt;queue);</div><div class='add'>+	dev_vdbg(udc-&gt;dev, "gadget have request in %s! %d\n",</div><div class='add'>+			ep-&gt;name, req-&gt;req.length);</div><div class='add'>+	spin_lock_irqsave(&amp;udc-&gt;lock, flags);</div><div class='add'>+	/* push the request to device */</div><div class='add'>+	if (ep_is_in(ep))</div><div class='add'>+		reval = ep_req_send(ep, req);</div><div class='add'>+</div><div class='add'>+	/* EP0 */</div><div class='add'>+	if (ep_index(ep) == 0 &amp;&amp; req-&gt;req.length &gt; 0) {</div><div class='add'>+		if (ep_is_in(ep))</div><div class='add'>+			udc-&gt;ep0_state = DATA_STATE_XMIT;</div><div class='add'>+		else</div><div class='add'>+			udc-&gt;ep0_state = DATA_STATE_RECV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ep-&gt;dir == USB_DIR_OUT)</div><div class='add'>+		reval = ep_req_receive(ep, req);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;udc-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* dequeues (cancels, unlinks) an I/O request from an endpoint */</div><div class='add'>+static int qe_ep_dequeue(struct usb_ep *_ep, struct usb_request *_req)</div><div class='add'>+{</div><div class='add'>+	struct qe_ep *ep = container_of(_ep, struct qe_ep, ep);</div><div class='add'>+	struct qe_req *req;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	if (!_ep || !_req)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;ep-&gt;udc-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	/* make sure it's actually queued on this endpoint */</div><div class='add'>+	list_for_each_entry(req, &amp;ep-&gt;queue, queue) {</div><div class='add'>+		if (&amp;req-&gt;req == _req)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (&amp;req-&gt;req != _req) {</div><div class='add'>+		spin_unlock_irqrestore(&amp;ep-&gt;udc-&gt;lock, flags);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	done(ep, req, -ECONNRESET);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;ep-&gt;udc-&gt;lock, flags);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*-----------------------------------------------------------------</div><div class='add'>+ * modify the endpoint halt feature</div><div class='add'>+ * @ep: the non-isochronous endpoint being stalled</div><div class='add'>+ * @value: 1--set halt  0--clear halt</div><div class='add'>+ * Returns zero, or a negative error code.</div><div class='add'>+*----------------------------------------------------------------*/</div><div class='add'>+static int qe_ep_set_halt(struct usb_ep *_ep, int value)</div><div class='add'>+{</div><div class='add'>+	struct qe_ep *ep;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int status = -EOPNOTSUPP;</div><div class='add'>+	struct qe_udc *udc;</div><div class='add'>+</div><div class='add'>+	ep = container_of(_ep, struct qe_ep, ep);</div><div class='add'>+	if (!_ep || !ep-&gt;desc) {</div><div class='add'>+		status = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	udc = ep-&gt;udc;</div><div class='add'>+	/* Attempt to halt IN ep will fail if any transfer requests</div><div class='add'>+	 * are still queue */</div><div class='add'>+	if (value &amp;&amp; ep_is_in(ep) &amp;&amp; !list_empty(&amp;ep-&gt;queue)) {</div><div class='add'>+		status = -EAGAIN;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	status = 0;</div><div class='add'>+	spin_lock_irqsave(&amp;ep-&gt;udc-&gt;lock, flags);</div><div class='add'>+	qe_eptx_stall_change(ep, value);</div><div class='add'>+	qe_eprx_stall_change(ep, value);</div><div class='add'>+	spin_unlock_irqrestore(&amp;ep-&gt;udc-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	if (ep-&gt;epnum == 0) {</div><div class='add'>+		udc-&gt;ep0_state = WAIT_FOR_SETUP;</div><div class='add'>+		udc-&gt;ep0_dir = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* set data toggle to DATA0 on clear halt */</div><div class='add'>+	if (value == 0)</div><div class='add'>+		ep-&gt;data01 = 0;</div><div class='add'>+out:</div><div class='add'>+	dev_vdbg(udc-&gt;dev, "%s %s halt stat %d\n", ep-&gt;ep.name,</div><div class='add'>+			value ?  "set" : "clear", status);</div><div class='add'>+</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct usb_ep_ops qe_ep_ops = {</div><div class='add'>+	.enable = qe_ep_enable,</div><div class='add'>+	.disable = qe_ep_disable,</div><div class='add'>+</div><div class='add'>+	.alloc_request = qe_alloc_request,</div><div class='add'>+	.free_request = qe_free_request,</div><div class='add'>+</div><div class='add'>+	.queue = qe_ep_queue,</div><div class='add'>+	.dequeue = qe_ep_dequeue,</div><div class='add'>+</div><div class='add'>+	.set_halt = qe_ep_set_halt,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*------------------------------------------------------------------------</div><div class='add'>+	Gadget Driver Layer Operations</div><div class='add'>+ ------------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+/* Get the current frame number */</div><div class='add'>+static int qe_get_frame(struct usb_gadget *gadget)</div><div class='add'>+{</div><div class='add'>+	u16 tmp;</div><div class='add'>+</div><div class='add'>+	tmp = in_be16(&amp;udc_controller-&gt;usb_param-&gt;frame_n);</div><div class='add'>+	if (tmp &amp; 0x8000)</div><div class='add'>+		tmp = tmp &amp; 0x07ff;</div><div class='add'>+	else</div><div class='add'>+		tmp = -EINVAL;</div><div class='add'>+</div><div class='add'>+	return (int)tmp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Tries to wake up the host connected to this gadget</div><div class='add'>+ *</div><div class='add'>+ * Return : 0-success</div><div class='add'>+ * Negative-this feature not enabled by host or not supported by device hw</div><div class='add'>+ */</div><div class='add'>+static int qe_wakeup(struct usb_gadget *gadget)</div><div class='add'>+{</div><div class='add'>+	return -ENOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Notify controller that VBUS is powered, Called by whatever</div><div class='add'>+   detects VBUS sessions */</div><div class='add'>+static int qe_vbus_session(struct usb_gadget *gadget, int is_active)</div><div class='add'>+{</div><div class='add'>+	return -ENOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* constrain controller's VBUS power usage</div><div class='add'>+ * This call is used by gadget drivers during SET_CONFIGURATION calls,</div><div class='add'>+ * reporting how much power the device may consume.  For example, this</div><div class='add'>+ * could affect how quickly batteries are recharged.</div><div class='add'>+ *</div><div class='add'>+ * Returns zero on success, else negative errno.</div><div class='add'>+ */</div><div class='add'>+static int qe_vbus_draw(struct usb_gadget *gadget, unsigned mA)</div><div class='add'>+{</div><div class='add'>+	return -ENOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Change Data+ pullup status</div><div class='add'>+ * this func is used by usb_gadget_connect/disconnect</div><div class='add'>+ */</div><div class='add'>+static int qe_pullup(struct usb_gadget *gadget, int is_on)</div><div class='add'>+{</div><div class='add'>+	return -ENOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* defined in usb_gadget.h */</div><div class='add'>+static struct usb_gadget_ops qe_gadget_ops = {</div><div class='add'>+	.get_frame = qe_get_frame,</div><div class='add'>+	.wakeup = qe_wakeup,</div><div class='add'>+/*	.set_selfpowered = qe_set_selfpowered,*/ /* always selfpowered */</div><div class='add'>+	.vbus_session = qe_vbus_session,</div><div class='add'>+	.vbus_draw = qe_vbus_draw,</div><div class='add'>+	.pullup = qe_pullup,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*-------------------------------------------------------------------------</div><div class='add'>+	USB ep0 Setup process in BUS Enumeration</div><div class='add'>+ -------------------------------------------------------------------------*/</div><div class='add'>+static int udc_reset_ep_queue(struct qe_udc *udc, u8 pipe)</div><div class='add'>+{</div><div class='add'>+	struct qe_ep *ep = &amp;udc-&gt;eps[pipe];</div><div class='add'>+</div><div class='add'>+	nuke(ep, -ECONNRESET);</div><div class='add'>+	ep-&gt;tx_req = NULL;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int reset_queues(struct qe_udc *udc)</div><div class='add'>+{</div><div class='add'>+	u8 pipe;</div><div class='add'>+</div><div class='add'>+	for (pipe = 0; pipe &lt; USB_MAX_ENDPOINTS; pipe++)</div><div class='add'>+		udc_reset_ep_queue(udc, pipe);</div><div class='add'>+</div><div class='add'>+	/* report disconnect; the driver is already quiesced */</div><div class='add'>+	spin_unlock(&amp;udc-&gt;lock);</div><div class='add'>+	udc-&gt;driver-&gt;disconnect(&amp;udc-&gt;gadget);</div><div class='add'>+	spin_lock(&amp;udc-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ch9setaddress(struct qe_udc *udc, u16 value, u16 index,</div><div class='add'>+			u16 length)</div><div class='add'>+{</div><div class='add'>+	/* Save the new address to device struct */</div><div class='add'>+	udc-&gt;device_address = (u8) value;</div><div class='add'>+	/* Update usb state */</div><div class='add'>+	udc-&gt;usb_state = USB_STATE_ADDRESS;</div><div class='add'>+</div><div class='add'>+	/* Status phase , send a ZLP */</div><div class='add'>+	if (ep0_prime_status(udc, USB_DIR_IN))</div><div class='add'>+		qe_ep0_stall(udc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ownercomplete(struct usb_ep *_ep, struct usb_request *_req)</div><div class='add'>+{</div><div class='add'>+	struct qe_req *req = container_of(_req, struct qe_req, req);</div><div class='add'>+</div><div class='add'>+	req-&gt;req.buf = NULL;</div><div class='add'>+	kfree(req);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ch9getstatus(struct qe_udc *udc, u8 request_type, u16 value,</div><div class='add'>+			u16 index, u16 length)</div><div class='add'>+{</div><div class='add'>+	u16 usb_status = 0;</div><div class='add'>+	struct qe_req *req;</div><div class='add'>+	struct qe_ep *ep;</div><div class='add'>+	int status = 0;</div><div class='add'>+</div><div class='add'>+	ep = &amp;udc-&gt;eps[0];</div><div class='add'>+	if ((request_type &amp; USB_RECIP_MASK) == USB_RECIP_DEVICE) {</div><div class='add'>+		/* Get device status */</div><div class='add'>+		usb_status = 1 &lt;&lt; USB_DEVICE_SELF_POWERED;</div><div class='add'>+	} else if ((request_type &amp; USB_RECIP_MASK) == USB_RECIP_INTERFACE) {</div><div class='add'>+		/* Get interface status */</div><div class='add'>+		/* We don't have interface information in udc driver */</div><div class='add'>+		usb_status = 0;</div><div class='add'>+	} else if ((request_type &amp; USB_RECIP_MASK) == USB_RECIP_ENDPOINT) {</div><div class='add'>+		/* Get endpoint status */</div><div class='add'>+		int pipe = index &amp; USB_ENDPOINT_NUMBER_MASK;</div><div class='add'>+		struct qe_ep *target_ep = &amp;udc-&gt;eps[pipe];</div><div class='add'>+		u16 usep;</div><div class='add'>+</div><div class='add'>+		/* stall if endpoint doesn't exist */</div><div class='add'>+		if (!target_ep-&gt;desc)</div><div class='add'>+			goto stall;</div><div class='add'>+</div><div class='add'>+		usep = in_be16(&amp;udc-&gt;usb_regs-&gt;usb_usep[pipe]);</div><div class='add'>+		if (index &amp; USB_DIR_IN) {</div><div class='add'>+			if (target_ep-&gt;dir != USB_DIR_IN)</div><div class='add'>+				goto stall;</div><div class='add'>+			if ((usep &amp; USB_THS_MASK) == USB_THS_STALL)</div><div class='add'>+				usb_status = 1 &lt;&lt; USB_ENDPOINT_HALT;</div><div class='add'>+		} else {</div><div class='add'>+			if (target_ep-&gt;dir != USB_DIR_OUT)</div><div class='add'>+				goto stall;</div><div class='add'>+			if ((usep &amp; USB_RHS_MASK) == USB_RHS_STALL)</div><div class='add'>+				usb_status = 1 &lt;&lt; USB_ENDPOINT_HALT;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	req = container_of(qe_alloc_request(&amp;ep-&gt;ep, GFP_KERNEL),</div><div class='add'>+					struct qe_req, req);</div><div class='add'>+	req-&gt;req.length = 2;</div><div class='add'>+	req-&gt;req.buf = udc-&gt;statusbuf;</div><div class='add'>+	*(u16 *)req-&gt;req.buf = cpu_to_le16(usb_status);</div><div class='add'>+	req-&gt;req.status = -EINPROGRESS;</div><div class='add'>+	req-&gt;req.actual = 0;</div><div class='add'>+	req-&gt;req.complete = ownercomplete;</div><div class='add'>+</div><div class='add'>+	udc-&gt;ep0_dir = USB_DIR_IN;</div><div class='add'>+</div><div class='add'>+	/* data phase */</div><div class='add'>+	status = qe_ep_queue(&amp;ep-&gt;ep, &amp;req-&gt;req, GFP_ATOMIC);</div><div class='add'>+</div><div class='add'>+	if (status == 0)</div><div class='add'>+		return;</div><div class='add'>+stall:</div><div class='add'>+	dev_err(udc-&gt;dev, "Can't respond to getstatus request \n");</div><div class='add'>+	qe_ep0_stall(udc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* only handle the setup request, suppose the device in normal status */</div><div class='add'>+static void setup_received_handle(struct qe_udc *udc,</div><div class='add'>+				struct usb_ctrlrequest *setup)</div><div class='add'>+{</div><div class='add'>+	/* Fix Endian (udc-&gt;local_setup_buff is cpu Endian now)*/</div><div class='add'>+	u16 wValue = le16_to_cpu(setup-&gt;wValue);</div><div class='add'>+	u16 wIndex = le16_to_cpu(setup-&gt;wIndex);</div><div class='add'>+	u16 wLength = le16_to_cpu(setup-&gt;wLength);</div><div class='add'>+</div><div class='add'>+	/* clear the previous request in the ep0 */</div><div class='add'>+	udc_reset_ep_queue(udc, 0);</div><div class='add'>+</div><div class='add'>+	if (setup-&gt;bRequestType &amp; USB_DIR_IN)</div><div class='add'>+		udc-&gt;ep0_dir = USB_DIR_IN;</div><div class='add'>+	else</div><div class='add'>+		udc-&gt;ep0_dir = USB_DIR_OUT;</div><div class='add'>+</div><div class='add'>+	switch (setup-&gt;bRequest) {</div><div class='add'>+	case USB_REQ_GET_STATUS:</div><div class='add'>+		/* Data+Status phase form udc */</div><div class='add'>+		if ((setup-&gt;bRequestType &amp; (USB_DIR_IN | USB_TYPE_MASK))</div><div class='add'>+					!= (USB_DIR_IN | USB_TYPE_STANDARD))</div><div class='add'>+			break;</div><div class='add'>+		ch9getstatus(udc, setup-&gt;bRequestType, wValue, wIndex,</div><div class='add'>+					wLength);</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	case USB_REQ_SET_ADDRESS:</div><div class='add'>+		/* Status phase from udc */</div><div class='add'>+		if (setup-&gt;bRequestType != (USB_DIR_OUT | USB_TYPE_STANDARD |</div><div class='add'>+						USB_RECIP_DEVICE))</div><div class='add'>+			break;</div><div class='add'>+		ch9setaddress(udc, wValue, wIndex, wLength);</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	case USB_REQ_CLEAR_FEATURE:</div><div class='add'>+	case USB_REQ_SET_FEATURE:</div><div class='add'>+		/* Requests with no data phase, status phase from udc */</div><div class='add'>+		if ((setup-&gt;bRequestType &amp; USB_TYPE_MASK)</div><div class='add'>+					!= USB_TYPE_STANDARD)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if ((setup-&gt;bRequestType &amp; USB_RECIP_MASK)</div><div class='add'>+				== USB_RECIP_ENDPOINT) {</div><div class='add'>+			int pipe = wIndex &amp; USB_ENDPOINT_NUMBER_MASK;</div><div class='add'>+			struct qe_ep *ep;</div><div class='add'>+</div><div class='add'>+			if (wValue != 0 || wLength != 0</div><div class='add'>+				|| pipe &gt; USB_MAX_ENDPOINTS)</div><div class='add'>+				break;</div><div class='add'>+			ep = &amp;udc-&gt;eps[pipe];</div><div class='add'>+</div><div class='add'>+			spin_unlock(&amp;udc-&gt;lock);</div><div class='add'>+			qe_ep_set_halt(&amp;ep-&gt;ep,</div><div class='add'>+					(setup-&gt;bRequest == USB_REQ_SET_FEATURE)</div><div class='add'>+						? 1 : 0);</div><div class='add'>+			spin_lock(&amp;udc-&gt;lock);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ep0_prime_status(udc, USB_DIR_IN);</div><div class='add'>+</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (wLength) {</div><div class='add'>+		/* Data phase from gadget, status phase from udc */</div><div class='add'>+		if (setup-&gt;bRequestType &amp; USB_DIR_IN) {</div><div class='add'>+			udc-&gt;ep0_state = DATA_STATE_XMIT;</div><div class='add'>+			udc-&gt;ep0_dir = USB_DIR_IN;</div><div class='add'>+		} else {</div><div class='add'>+			udc-&gt;ep0_state = DATA_STATE_RECV;</div><div class='add'>+			udc-&gt;ep0_dir = USB_DIR_OUT;</div><div class='add'>+		}</div><div class='add'>+		spin_unlock(&amp;udc-&gt;lock);</div><div class='add'>+		if (udc-&gt;driver-&gt;setup(&amp;udc-&gt;gadget,</div><div class='add'>+					&amp;udc-&gt;local_setup_buff) &lt; 0)</div><div class='add'>+			qe_ep0_stall(udc);</div><div class='add'>+		spin_lock(&amp;udc-&gt;lock);</div><div class='add'>+	} else {</div><div class='add'>+		/* No data phase, IN status from gadget */</div><div class='add'>+		udc-&gt;ep0_dir = USB_DIR_IN;</div><div class='add'>+		spin_unlock(&amp;udc-&gt;lock);</div><div class='add'>+		if (udc-&gt;driver-&gt;setup(&amp;udc-&gt;gadget,</div><div class='add'>+					&amp;udc-&gt;local_setup_buff) &lt; 0)</div><div class='add'>+			qe_ep0_stall(udc);</div><div class='add'>+		spin_lock(&amp;udc-&gt;lock);</div><div class='add'>+		udc-&gt;ep0_state = DATA_STATE_NEED_ZLP;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*-------------------------------------------------------------------------</div><div class='add'>+	USB Interrupt handlers</div><div class='add'>+ -------------------------------------------------------------------------*/</div><div class='add'>+static void suspend_irq(struct qe_udc *udc)</div><div class='add'>+{</div><div class='add'>+	udc-&gt;resume_state = udc-&gt;usb_state;</div><div class='add'>+	udc-&gt;usb_state = USB_STATE_SUSPENDED;</div><div class='add'>+</div><div class='add'>+	/* report suspend to the driver ,serial.c not support this*/</div><div class='add'>+	if (udc-&gt;driver-&gt;suspend)</div><div class='add'>+		udc-&gt;driver-&gt;suspend(&amp;udc-&gt;gadget);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void resume_irq(struct qe_udc *udc)</div><div class='add'>+{</div><div class='add'>+	udc-&gt;usb_state = udc-&gt;resume_state;</div><div class='add'>+	udc-&gt;resume_state = 0;</div><div class='add'>+</div><div class='add'>+	/* report resume to the driver , serial.c not support this*/</div><div class='add'>+	if (udc-&gt;driver-&gt;resume)</div><div class='add'>+		udc-&gt;driver-&gt;resume(&amp;udc-&gt;gadget);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void idle_irq(struct qe_udc *udc)</div><div class='add'>+{</div><div class='add'>+	u8 usbs;</div><div class='add'>+</div><div class='add'>+	usbs = in_8(&amp;udc-&gt;usb_regs-&gt;usb_usbs);</div><div class='add'>+	if (usbs &amp; USB_IDLE_STATUS_MASK) {</div><div class='add'>+		if ((udc-&gt;usb_state) != USB_STATE_SUSPENDED)</div><div class='add'>+			suspend_irq(udc);</div><div class='add'>+	} else {</div><div class='add'>+		if (udc-&gt;usb_state == USB_STATE_SUSPENDED)</div><div class='add'>+			resume_irq(udc);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int reset_irq(struct qe_udc *udc)</div><div class='add'>+{</div><div class='add'>+	unsigned char i;</div><div class='add'>+</div><div class='add'>+	qe_usb_disable();</div><div class='add'>+	out_8(&amp;udc-&gt;usb_regs-&gt;usb_usadr, 0);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; USB_MAX_ENDPOINTS; i++) {</div><div class='add'>+		if (udc-&gt;eps[i].init)</div><div class='add'>+			qe_ep_reset(udc, i);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	reset_queues(udc);</div><div class='add'>+	udc-&gt;usb_state = USB_STATE_DEFAULT;</div><div class='add'>+	udc-&gt;ep0_state = WAIT_FOR_SETUP;</div><div class='add'>+	udc-&gt;ep0_dir = USB_DIR_OUT;</div><div class='add'>+	qe_usb_enable();</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bsy_irq(struct qe_udc *udc)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int txe_irq(struct qe_udc *udc)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* ep0 tx interrupt also in here */</div><div class='add'>+static int tx_irq(struct qe_udc *udc)</div><div class='add'>+{</div><div class='add'>+	struct qe_ep *ep;</div><div class='add'>+	struct qe_bd __iomem *bd;</div><div class='add'>+	int i, res = 0;</div><div class='add'>+</div><div class='add'>+	if ((udc-&gt;usb_state == USB_STATE_ADDRESS)</div><div class='add'>+		&amp;&amp; (in_8(&amp;udc-&gt;usb_regs-&gt;usb_usadr) == 0))</div><div class='add'>+		out_8(&amp;udc-&gt;usb_regs-&gt;usb_usadr, udc-&gt;device_address);</div><div class='add'>+</div><div class='add'>+	for (i = (USB_MAX_ENDPOINTS-1); ((i &gt;= 0) &amp;&amp; (res == 0)); i--) {</div><div class='add'>+		ep = &amp;udc-&gt;eps[i];</div><div class='add'>+		if (ep &amp;&amp; ep-&gt;init &amp;&amp; (ep-&gt;dir != USB_DIR_OUT)) {</div><div class='add'>+			bd = ep-&gt;c_txbd;</div><div class='add'>+			if (!(in_be32((u32 __iomem *)bd) &amp; T_R)</div><div class='add'>+						&amp;&amp; (in_be32(&amp;bd-&gt;buf))) {</div><div class='add'>+				/* confirm the transmitted bd */</div><div class='add'>+				if (ep-&gt;epnum == 0)</div><div class='add'>+					res = qe_ep0_txconf(ep);</div><div class='add'>+				else</div><div class='add'>+					res = qe_ep_txconf(ep);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* setup packect's rx is handle in the function too */</div><div class='add'>+static void rx_irq(struct qe_udc *udc)</div><div class='add'>+{</div><div class='add'>+	struct qe_ep *ep;</div><div class='add'>+	struct qe_bd __iomem *bd;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; USB_MAX_ENDPOINTS; i++) {</div><div class='add'>+		ep = &amp;udc-&gt;eps[i];</div><div class='add'>+		if (ep &amp;&amp; ep-&gt;init &amp;&amp; (ep-&gt;dir != USB_DIR_IN)) {</div><div class='add'>+			bd = ep-&gt;n_rxbd;</div><div class='add'>+			if (!(in_be32((u32 __iomem *)bd) &amp; R_E)</div><div class='add'>+						&amp;&amp; (in_be32(&amp;bd-&gt;buf))) {</div><div class='add'>+				if (ep-&gt;epnum == 0) {</div><div class='add'>+					qe_ep0_rx(udc);</div><div class='add'>+				} else {</div><div class='add'>+					/*non-setup package receive*/</div><div class='add'>+					qe_ep_rx(ep);</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t qe_udc_irq(int irq, void *_udc)</div><div class='add'>+{</div><div class='add'>+	struct qe_udc *udc = (struct qe_udc *)_udc;</div><div class='add'>+	u16 irq_src;</div><div class='add'>+	irqreturn_t status = IRQ_NONE;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;udc-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	irq_src = in_be16(&amp;udc-&gt;usb_regs-&gt;usb_usber) &amp;</div><div class='add'>+		in_be16(&amp;udc-&gt;usb_regs-&gt;usb_usbmr);</div><div class='add'>+	/* Clear notification bits */</div><div class='add'>+	out_be16(&amp;udc-&gt;usb_regs-&gt;usb_usber, irq_src);</div><div class='add'>+	/* USB Interrupt */</div><div class='add'>+	if (irq_src &amp; USB_E_IDLE_MASK) {</div><div class='add'>+		idle_irq(udc);</div><div class='add'>+		irq_src &amp;= ~USB_E_IDLE_MASK;</div><div class='add'>+		status = IRQ_HANDLED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (irq_src &amp; USB_E_TXB_MASK) {</div><div class='add'>+		tx_irq(udc);</div><div class='add'>+		irq_src &amp;= ~USB_E_TXB_MASK;</div><div class='add'>+		status = IRQ_HANDLED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (irq_src &amp; USB_E_RXB_MASK) {</div><div class='add'>+		rx_irq(udc);</div><div class='add'>+		irq_src &amp;= ~USB_E_RXB_MASK;</div><div class='add'>+		status = IRQ_HANDLED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (irq_src &amp; USB_E_RESET_MASK) {</div><div class='add'>+		reset_irq(udc);</div><div class='add'>+		irq_src &amp;= ~USB_E_RESET_MASK;</div><div class='add'>+		status = IRQ_HANDLED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (irq_src &amp; USB_E_BSY_MASK) {</div><div class='add'>+		bsy_irq(udc);</div><div class='add'>+		irq_src &amp;= ~USB_E_BSY_MASK;</div><div class='add'>+		status = IRQ_HANDLED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (irq_src &amp; USB_E_TXE_MASK) {</div><div class='add'>+		txe_irq(udc);</div><div class='add'>+		irq_src &amp;= ~USB_E_TXE_MASK;</div><div class='add'>+		status = IRQ_HANDLED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;udc-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*-------------------------------------------------------------------------</div><div class='add'>+	Gadget driver register and unregister.</div><div class='add'>+ --------------------------------------------------------------------------*/</div><div class='add'>+int usb_gadget_register_driver(struct usb_gadget_driver *driver)</div><div class='add'>+{</div><div class='add'>+	int retval;</div><div class='add'>+	unsigned long flags = 0;</div><div class='add'>+</div><div class='add'>+	/* standard operations */</div><div class='add'>+	if (!udc_controller)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	if (!driver || (driver-&gt;speed != USB_SPEED_FULL</div><div class='add'>+			&amp;&amp; driver-&gt;speed != USB_SPEED_HIGH)</div><div class='add'>+			|| !driver-&gt;bind || !driver-&gt;disconnect</div><div class='add'>+			|| !driver-&gt;setup)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (udc_controller-&gt;driver)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	/* lock is needed but whether should use this lock or another */</div><div class='add'>+	spin_lock_irqsave(&amp;udc_controller-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	driver-&gt;driver.bus = NULL;</div><div class='add'>+	/* hook up the driver */</div><div class='add'>+	udc_controller-&gt;driver = driver;</div><div class='add'>+	udc_controller-&gt;gadget.dev.driver = &amp;driver-&gt;driver;</div><div class='add'>+	udc_controller-&gt;gadget.speed = (enum usb_device_speed)(driver-&gt;speed);</div><div class='add'>+	spin_unlock_irqrestore(&amp;udc_controller-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	retval = driver-&gt;bind(&amp;udc_controller-&gt;gadget);</div><div class='add'>+	if (retval) {</div><div class='add'>+		dev_err(udc_controller-&gt;dev, "bind to %s --&gt; %d",</div><div class='add'>+				driver-&gt;driver.name, retval);</div><div class='add'>+		udc_controller-&gt;gadget.dev.driver = NULL;</div><div class='add'>+		udc_controller-&gt;driver = NULL;</div><div class='add'>+		return retval;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Enable IRQ reg and Set usbcmd reg EN bit */</div><div class='add'>+	qe_usb_enable();</div><div class='add'>+</div><div class='add'>+	out_be16(&amp;udc_controller-&gt;usb_regs-&gt;usb_usber, 0xffff);</div><div class='add'>+	out_be16(&amp;udc_controller-&gt;usb_regs-&gt;usb_usbmr, USB_E_DEFAULT_DEVICE);</div><div class='add'>+	udc_controller-&gt;usb_state = USB_STATE_ATTACHED;</div><div class='add'>+	udc_controller-&gt;ep0_state = WAIT_FOR_SETUP;</div><div class='add'>+	udc_controller-&gt;ep0_dir = USB_DIR_OUT;</div><div class='add'>+	dev_info(udc_controller-&gt;dev, "%s bind to driver %s \n",</div><div class='add'>+		udc_controller-&gt;gadget.name, driver-&gt;driver.name);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(usb_gadget_register_driver);</div><div class='add'>+</div><div class='add'>+int usb_gadget_unregister_driver(struct usb_gadget_driver *driver)</div><div class='add'>+{</div><div class='add'>+	struct qe_ep *loop_ep;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	if (!udc_controller)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	if (!driver || driver != udc_controller-&gt;driver)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* stop usb controller, disable intr */</div><div class='add'>+	qe_usb_disable();</div><div class='add'>+</div><div class='add'>+	/* in fact, no needed */</div><div class='add'>+	udc_controller-&gt;usb_state = USB_STATE_ATTACHED;</div><div class='add'>+	udc_controller-&gt;ep0_state = WAIT_FOR_SETUP;</div><div class='add'>+	udc_controller-&gt;ep0_dir = 0;</div><div class='add'>+</div><div class='add'>+	/* stand operation */</div><div class='add'>+	spin_lock_irqsave(&amp;udc_controller-&gt;lock, flags);</div><div class='add'>+	udc_controller-&gt;gadget.speed = USB_SPEED_UNKNOWN;</div><div class='add'>+	nuke(&amp;udc_controller-&gt;eps[0], -ESHUTDOWN);</div><div class='add'>+	list_for_each_entry(loop_ep, &amp;udc_controller-&gt;gadget.ep_list,</div><div class='add'>+				ep.ep_list)</div><div class='add'>+		nuke(loop_ep, -ESHUTDOWN);</div><div class='add'>+	spin_unlock_irqrestore(&amp;udc_controller-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	/* unbind gadget and unhook driver. */</div><div class='add'>+	driver-&gt;unbind(&amp;udc_controller-&gt;gadget);</div><div class='add'>+	udc_controller-&gt;gadget.dev.driver = NULL;</div><div class='add'>+	udc_controller-&gt;driver = NULL;</div><div class='add'>+</div><div class='add'>+	dev_info(udc_controller-&gt;dev, "unregistered gadget driver '%s'\r\n",</div><div class='add'>+			driver-&gt;driver.name);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(usb_gadget_unregister_driver);</div><div class='add'>+</div><div class='add'>+/* udc structure's alloc and setup, include ep-param alloc */</div><div class='add'>+static struct qe_udc __devinit *qe_udc_config(struct of_device *ofdev)</div><div class='add'>+{</div><div class='add'>+	struct qe_udc *udc;</div><div class='add'>+	struct device_node *np = ofdev-&gt;node;</div><div class='add'>+	unsigned int tmp_addr = 0;</div><div class='add'>+	struct usb_device_para __iomem *usbpram;</div><div class='add'>+	unsigned int i;</div><div class='add'>+	u64 size;</div><div class='add'>+	u32 offset;</div><div class='add'>+</div><div class='add'>+	udc = kzalloc(sizeof(*udc), GFP_KERNEL);</div><div class='add'>+	if (udc == NULL) {</div><div class='add'>+		dev_err(&amp;ofdev-&gt;dev, "malloc udc failed\n");</div><div class='add'>+		goto cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	udc-&gt;dev = &amp;ofdev-&gt;dev;</div><div class='add'>+</div><div class='add'>+	/* get default address of usb parameter in MURAM from device tree */</div><div class='add'>+	offset = *of_get_address(np, 1, &amp;size, NULL);</div><div class='add'>+	udc-&gt;usb_param = cpm_muram_addr(offset);</div><div class='add'>+	memset_io(udc-&gt;usb_param, 0, size);</div><div class='add'>+</div><div class='add'>+	usbpram = udc-&gt;usb_param;</div><div class='add'>+	out_be16(&amp;usbpram-&gt;frame_n, 0);</div><div class='add'>+	out_be32(&amp;usbpram-&gt;rstate, 0);</div><div class='add'>+</div><div class='add'>+	tmp_addr = cpm_muram_alloc((USB_MAX_ENDPOINTS *</div><div class='add'>+					sizeof(struct usb_ep_para)),</div><div class='add'>+					   USB_EP_PARA_ALIGNMENT);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; USB_MAX_ENDPOINTS; i++) {</div><div class='add'>+		out_be16(&amp;usbpram-&gt;epptr[i], (u16)tmp_addr);</div><div class='add'>+		udc-&gt;ep_param[i] = cpm_muram_addr(tmp_addr);</div><div class='add'>+		tmp_addr += 32;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset_io(udc-&gt;ep_param[0], 0,</div><div class='add'>+			USB_MAX_ENDPOINTS * sizeof(struct usb_ep_para));</div><div class='add'>+</div><div class='add'>+	udc-&gt;resume_state = USB_STATE_NOTATTACHED;</div><div class='add'>+	udc-&gt;usb_state = USB_STATE_POWERED;</div><div class='add'>+	udc-&gt;ep0_dir = 0;</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;udc-&gt;lock);</div><div class='add'>+	return udc;</div><div class='add'>+</div><div class='add'>+cleanup:</div><div class='add'>+	kfree(udc);</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* USB Controller register init */</div><div class='add'>+static int __devinit qe_udc_reg_init(struct qe_udc *udc)</div><div class='add'>+{</div><div class='add'>+	struct usb_ctlr __iomem *qe_usbregs;</div><div class='add'>+	qe_usbregs = udc-&gt;usb_regs;</div><div class='add'>+</div><div class='add'>+	/* Init the usb register */</div><div class='add'>+	out_8(&amp;qe_usbregs-&gt;usb_usmod, 0x01);</div><div class='add'>+	out_be16(&amp;qe_usbregs-&gt;usb_usbmr, 0);</div><div class='add'>+	out_8(&amp;qe_usbregs-&gt;usb_uscom, 0);</div><div class='add'>+	out_be16(&amp;qe_usbregs-&gt;usb_usber, USBER_ALL_CLEAR);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devinit qe_ep_config(struct qe_udc *udc, unsigned char pipe_num)</div><div class='add'>+{</div><div class='add'>+	struct qe_ep *ep = &amp;udc-&gt;eps[pipe_num];</div><div class='add'>+</div><div class='add'>+	ep-&gt;udc = udc;</div><div class='add'>+	strcpy(ep-&gt;name, ep_name[pipe_num]);</div><div class='add'>+	ep-&gt;ep.name = ep_name[pipe_num];</div><div class='add'>+</div><div class='add'>+	ep-&gt;ep.ops = &amp;qe_ep_ops;</div><div class='add'>+	ep-&gt;stopped = 1;</div><div class='add'>+	ep-&gt;ep.maxpacket = (unsigned short) ~0;</div><div class='add'>+	ep-&gt;desc = NULL;</div><div class='add'>+	ep-&gt;dir = 0xff;</div><div class='add'>+	ep-&gt;epnum = (u8)pipe_num;</div><div class='add'>+	ep-&gt;sent = 0;</div><div class='add'>+	ep-&gt;last = 0;</div><div class='add'>+	ep-&gt;init = 0;</div><div class='add'>+	ep-&gt;rxframe = NULL;</div><div class='add'>+	ep-&gt;txframe = NULL;</div><div class='add'>+	ep-&gt;tx_req = NULL;</div><div class='add'>+	ep-&gt;state = EP_STATE_IDLE;</div><div class='add'>+	ep-&gt;has_data = 0;</div><div class='add'>+</div><div class='add'>+	/* the queue lists any req for this ep */</div><div class='add'>+	INIT_LIST_HEAD(&amp;ep-&gt;queue);</div><div class='add'>+</div><div class='add'>+	/* gagdet.ep_list used for ep_autoconfig so no ep0*/</div><div class='add'>+	if (pipe_num != 0)</div><div class='add'>+		list_add_tail(&amp;ep-&gt;ep.ep_list, &amp;udc-&gt;gadget.ep_list);</div><div class='add'>+</div><div class='add'>+	ep-&gt;gadget = &amp;udc-&gt;gadget;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*-----------------------------------------------------------------------</div><div class='add'>+ *	UDC device Driver operation functions				*</div><div class='add'>+ *----------------------------------------------------------------------*/</div><div class='add'>+static void qe_udc_release(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	int i = 0;</div><div class='add'>+</div><div class='add'>+	complete(udc_controller-&gt;done);</div><div class='add'>+	cpm_muram_free(cpm_muram_offset(udc_controller-&gt;ep_param[0]));</div><div class='add'>+	for (i = 0; i &lt; USB_MAX_ENDPOINTS; i++)</div><div class='add'>+		udc_controller-&gt;ep_param[i] = NULL;</div><div class='add'>+</div><div class='add'>+	kfree(udc_controller);</div><div class='add'>+	udc_controller = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Driver probe functions */</div><div class='add'>+static int __devinit qe_udc_probe(struct of_device *ofdev,</div><div class='add'>+			const struct of_device_id *match)</div><div class='add'>+{</div><div class='add'>+	struct device_node *np = ofdev-&gt;node;</div><div class='add'>+	struct qe_ep *ep;</div><div class='add'>+	unsigned int ret = 0;</div><div class='add'>+	unsigned int i;</div><div class='add'>+	const void *prop;</div><div class='add'>+</div><div class='add'>+	prop = of_get_property(np, "mode", NULL);</div><div class='add'>+	if (!prop || strcmp(prop, "peripheral"))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	/* Initialize the udc structure including QH member and other member */</div><div class='add'>+	udc_controller = qe_udc_config(ofdev);</div><div class='add'>+	if (!udc_controller) {</div><div class='add'>+		dev_dbg(&amp;ofdev-&gt;dev, "udc_controll is NULL\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	udc_controller-&gt;soc_type = (unsigned long)match-&gt;data;</div><div class='add'>+	udc_controller-&gt;usb_regs = of_iomap(np, 0);</div><div class='add'>+	if (!udc_controller-&gt;usb_regs) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto err1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* initialize usb hw reg except for regs for EP,</div><div class='add'>+	 * leave usbintr reg untouched*/</div><div class='add'>+	qe_udc_reg_init(udc_controller);</div><div class='add'>+</div><div class='add'>+	/* here comes the stand operations for probe</div><div class='add'>+	 * set the qe_udc-&gt;gadget.xxx */</div><div class='add'>+	udc_controller-&gt;gadget.ops = &amp;qe_gadget_ops;</div><div class='add'>+</div><div class='add'>+	/* gadget.ep0 is a pointer */</div><div class='add'>+	udc_controller-&gt;gadget.ep0 = &amp;udc_controller-&gt;eps[0].ep;</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;udc_controller-&gt;gadget.ep_list);</div><div class='add'>+</div><div class='add'>+	/* modify in register gadget process */</div><div class='add'>+	udc_controller-&gt;gadget.speed = USB_SPEED_UNKNOWN;</div><div class='add'>+</div><div class='add'>+	/* name: Identifies the controller hardware type. */</div><div class='add'>+	udc_controller-&gt;gadget.name = driver_name;</div><div class='add'>+</div><div class='add'>+	device_initialize(&amp;udc_controller-&gt;gadget.dev);</div><div class='add'>+</div><div class='add'>+	strcpy(udc_controller-&gt;gadget.dev.bus_id, "gadget");</div><div class='add'>+</div><div class='add'>+	udc_controller-&gt;gadget.dev.release = qe_udc_release;</div><div class='add'>+	udc_controller-&gt;gadget.dev.parent = &amp;ofdev-&gt;dev;</div><div class='add'>+</div><div class='add'>+	/* initialize qe_ep struct */</div><div class='add'>+	for (i = 0; i &lt; USB_MAX_ENDPOINTS ; i++) {</div><div class='add'>+		/* because the ep type isn't decide here so</div><div class='add'>+		 * qe_ep_init() should be called in ep_enable() */</div><div class='add'>+</div><div class='add'>+		/* setup the qe_ep struct and link ep.ep.list</div><div class='add'>+		 * into gadget.ep_list */</div><div class='add'>+		qe_ep_config(udc_controller, (unsigned char)i);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* ep0 initialization in here */</div><div class='add'>+	ret = qe_ep_init(udc_controller, 0, &amp;qe_ep0_desc);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err2;</div><div class='add'>+</div><div class='add'>+	/* create a buf for ZLP send, need to remain zeroed */</div><div class='add'>+	udc_controller-&gt;nullbuf = kzalloc(256, GFP_KERNEL);</div><div class='add'>+	if (udc_controller-&gt;nullbuf == NULL) {</div><div class='add'>+		dev_dbg(udc_controller-&gt;dev, "cannot alloc nullbuf\n");</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto err3;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* buffer for data of get_status request */</div><div class='add'>+	udc_controller-&gt;statusbuf = kzalloc(2, GFP_KERNEL);</div><div class='add'>+	if (udc_controller-&gt;statusbuf == NULL) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto err4;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	udc_controller-&gt;nullp = virt_to_phys((void *)udc_controller-&gt;nullbuf);</div><div class='add'>+	if (udc_controller-&gt;nullp == DMA_ADDR_INVALID) {</div><div class='add'>+		udc_controller-&gt;nullp = dma_map_single(</div><div class='add'>+					udc_controller-&gt;gadget.dev.parent,</div><div class='add'>+					udc_controller-&gt;nullbuf,</div><div class='add'>+					256,</div><div class='add'>+					DMA_TO_DEVICE);</div><div class='add'>+		udc_controller-&gt;nullmap = 1;</div><div class='add'>+	} else {</div><div class='add'>+		dma_sync_single_for_device(udc_controller-&gt;gadget.dev.parent,</div><div class='add'>+					udc_controller-&gt;nullp, 256,</div><div class='add'>+					DMA_TO_DEVICE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tasklet_init(&amp;udc_controller-&gt;rx_tasklet, ep_rx_tasklet,</div><div class='add'>+			(unsigned long)udc_controller);</div><div class='add'>+	/* request irq and disable DR  */</div><div class='add'>+	udc_controller-&gt;usb_irq = irq_of_parse_and_map(np, 0);</div><div class='add'>+</div><div class='add'>+	ret = request_irq(udc_controller-&gt;usb_irq, qe_udc_irq, 0,</div><div class='add'>+				driver_name, udc_controller);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(udc_controller-&gt;dev, "cannot request irq %d err %d \n",</div><div class='add'>+			udc_controller-&gt;usb_irq, ret);</div><div class='add'>+		goto err5;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = device_add(&amp;udc_controller-&gt;gadget.dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err6;</div><div class='add'>+</div><div class='add'>+	dev_info(udc_controller-&gt;dev,</div><div class='add'>+			"%s USB controller initialized as device\n",</div><div class='add'>+			(udc_controller-&gt;soc_type == PORT_QE) ? "QE" : "CPM");</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err6:</div><div class='add'>+	free_irq(udc_controller-&gt;usb_irq, udc_controller);</div><div class='add'>+err5:</div><div class='add'>+	if (udc_controller-&gt;nullmap) {</div><div class='add'>+		dma_unmap_single(udc_controller-&gt;gadget.dev.parent,</div><div class='add'>+			udc_controller-&gt;nullp, 256,</div><div class='add'>+				DMA_TO_DEVICE);</div><div class='add'>+			udc_controller-&gt;nullp = DMA_ADDR_INVALID;</div><div class='add'>+	} else {</div><div class='add'>+		dma_sync_single_for_cpu(udc_controller-&gt;gadget.dev.parent,</div><div class='add'>+			udc_controller-&gt;nullp, 256,</div><div class='add'>+				DMA_TO_DEVICE);</div><div class='add'>+	}</div><div class='add'>+	kfree(udc_controller-&gt;statusbuf);</div><div class='add'>+err4:</div><div class='add'>+	kfree(udc_controller-&gt;nullbuf);</div><div class='add'>+err3:</div><div class='add'>+	ep = &amp;udc_controller-&gt;eps[0];</div><div class='add'>+	cpm_muram_free(cpm_muram_offset(ep-&gt;rxbase));</div><div class='add'>+	kfree(ep-&gt;rxframe);</div><div class='add'>+	kfree(ep-&gt;rxbuffer);</div><div class='add'>+	kfree(ep-&gt;txframe);</div><div class='add'>+err2:</div><div class='add'>+	iounmap(udc_controller-&gt;usb_regs);</div><div class='add'>+err1:</div><div class='add'>+	kfree(udc_controller);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+static int qe_udc_suspend(struct of_device *dev, pm_message_t state)</div><div class='add'>+{</div><div class='add'>+	return -ENOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qe_udc_resume(struct of_device *dev)</div><div class='add'>+{</div><div class='add'>+	return -ENOTSUPP;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static int __devexit qe_udc_remove(struct of_device *ofdev)</div><div class='add'>+{</div><div class='add'>+	struct qe_ep *ep;</div><div class='add'>+	unsigned int size;</div><div class='add'>+</div><div class='add'>+	DECLARE_COMPLETION(done);</div><div class='add'>+</div><div class='add'>+	if (!udc_controller)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	udc_controller-&gt;done = &amp;done;</div><div class='add'>+	tasklet_disable(&amp;udc_controller-&gt;rx_tasklet);</div><div class='add'>+</div><div class='add'>+	if (udc_controller-&gt;nullmap) {</div><div class='add'>+		dma_unmap_single(udc_controller-&gt;gadget.dev.parent,</div><div class='add'>+			udc_controller-&gt;nullp, 256,</div><div class='add'>+				DMA_TO_DEVICE);</div><div class='add'>+			udc_controller-&gt;nullp = DMA_ADDR_INVALID;</div><div class='add'>+	} else {</div><div class='add'>+		dma_sync_single_for_cpu(udc_controller-&gt;gadget.dev.parent,</div><div class='add'>+			udc_controller-&gt;nullp, 256,</div><div class='add'>+				DMA_TO_DEVICE);</div><div class='add'>+	}</div><div class='add'>+	kfree(udc_controller-&gt;statusbuf);</div><div class='add'>+	kfree(udc_controller-&gt;nullbuf);</div><div class='add'>+</div><div class='add'>+	ep = &amp;udc_controller-&gt;eps[0];</div><div class='add'>+	cpm_muram_free(cpm_muram_offset(ep-&gt;rxbase));</div><div class='add'>+	size = (ep-&gt;ep.maxpacket + USB_CRC_SIZE + 2) * (USB_BDRING_LEN + 1);</div><div class='add'>+</div><div class='add'>+	kfree(ep-&gt;rxframe);</div><div class='add'>+	if (ep-&gt;rxbufmap) {</div><div class='add'>+		dma_unmap_single(udc_controller-&gt;gadget.dev.parent,</div><div class='add'>+				ep-&gt;rxbuf_d, size,</div><div class='add'>+				DMA_FROM_DEVICE);</div><div class='add'>+		ep-&gt;rxbuf_d = DMA_ADDR_INVALID;</div><div class='add'>+	} else {</div><div class='add'>+		dma_sync_single_for_cpu(udc_controller-&gt;gadget.dev.parent,</div><div class='add'>+				ep-&gt;rxbuf_d, size,</div><div class='add'>+				DMA_FROM_DEVICE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kfree(ep-&gt;rxbuffer);</div><div class='add'>+	kfree(ep-&gt;txframe);</div><div class='add'>+</div><div class='add'>+	free_irq(udc_controller-&gt;usb_irq, udc_controller);</div><div class='add'>+</div><div class='add'>+	tasklet_kill(&amp;udc_controller-&gt;rx_tasklet);</div><div class='add'>+</div><div class='add'>+	iounmap(udc_controller-&gt;usb_regs);</div><div class='add'>+</div><div class='add'>+	device_unregister(&amp;udc_controller-&gt;gadget.dev);</div><div class='add'>+	/* wait for release() of gadget.dev to free udc */</div><div class='add'>+	wait_for_completion(&amp;done);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*-------------------------------------------------------------------------*/</div><div class='add'>+static struct of_device_id __devinitdata qe_udc_match[] = {</div><div class='add'>+	{</div><div class='add'>+		.compatible = "fsl,mpc8360-qe-usb",</div><div class='add'>+		.data = (void *)PORT_QE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.compatible = "fsl,mpc8272-cpm-usb",</div><div class='add'>+		.data = (void *)PORT_CPM,</div><div class='add'>+	},</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_DEVICE_TABLE(of, qe_udc_match);</div><div class='add'>+</div><div class='add'>+static struct of_platform_driver udc_driver = {</div><div class='add'>+	.name           = (char *)driver_name,</div><div class='add'>+	.match_table    = qe_udc_match,</div><div class='add'>+	.probe          = qe_udc_probe,</div><div class='add'>+	.remove         = __devexit_p(qe_udc_remove),</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+	.suspend        = qe_udc_suspend,</div><div class='add'>+	.resume         = qe_udc_resume,</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init qe_udc_init(void)</div><div class='add'>+{</div><div class='add'>+	printk(KERN_INFO "%s: %s, %s\n", driver_name, driver_desc,</div><div class='add'>+			DRIVER_VERSION);</div><div class='add'>+	return of_register_platform_driver(&amp;udc_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit qe_udc_exit(void)</div><div class='add'>+{</div><div class='add'>+	of_unregister_platform_driver(&amp;udc_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(qe_udc_init);</div><div class='add'>+module_exit(qe_udc_exit);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION(DRIVER_DESC);</div><div class='add'>+MODULE_AUTHOR(DRIVER_AUTHOR);</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='head'>diff --git a/drivers/usb/gadget/fsl_qe_udc.h b/drivers/usb/gadget/fsl_qe_udc.h<br/>new file mode 100644<br/>index 000000000000..31b2710882e4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/gadget/fsl_qe_udc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/gadget/fsl_qe_udc.h</a></div><div class='hunk'>@@ -0,0 +1,437 @@</div><div class='add'>+/*</div><div class='add'>+ * drivers/usb/gadget/qe_udc.h</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2006-2008 Freescale Semiconductor, Inc. All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * 	Xiaobo Xie &lt;X.Xie@freescale.com&gt;</div><div class='add'>+ * 	Li Yang &lt;leoli@freescale.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ * Freescale USB device/endpoint management registers</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or (at</div><div class='add'>+ * your option) any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __FSL_QE_UDC_H</div><div class='add'>+#define __FSL_QE_UDC_H</div><div class='add'>+</div><div class='add'>+/* SoC type */</div><div class='add'>+#define PORT_CPM	0</div><div class='add'>+#define PORT_QE		1</div><div class='add'>+</div><div class='add'>+#define USB_MAX_ENDPOINTS               4</div><div class='add'>+#define USB_MAX_PIPES                   USB_MAX_ENDPOINTS</div><div class='add'>+#define USB_EP0_MAX_SIZE		64</div><div class='add'>+#define USB_MAX_CTRL_PAYLOAD            0x4000</div><div class='add'>+#define USB_BDRING_LEN			16</div><div class='add'>+#define USB_BDRING_LEN_RX		256</div><div class='add'>+#define USB_BDRING_LEN_TX		16</div><div class='add'>+#define MIN_EMPTY_BDS			128</div><div class='add'>+#define MAX_DATA_BDS			8</div><div class='add'>+#define USB_CRC_SIZE			2</div><div class='add'>+#define USB_DIR_BOTH			0x88</div><div class='add'>+#define R_BUF_MAXSIZE			0x800</div><div class='add'>+#define USB_EP_PARA_ALIGNMENT		32</div><div class='add'>+</div><div class='add'>+/* USB Mode Register bit define */</div><div class='add'>+#define USB_MODE_EN		0x01</div><div class='add'>+#define USB_MODE_HOST		0x02</div><div class='add'>+#define USB_MODE_TEST		0x04</div><div class='add'>+#define USB_MODE_SFTE		0x08</div><div class='add'>+#define USB_MODE_RESUME		0x40</div><div class='add'>+#define USB_MODE_LSS		0x80</div><div class='add'>+</div><div class='add'>+/* USB Slave Address Register Mask */</div><div class='add'>+#define USB_SLVADDR_MASK	0x7F</div><div class='add'>+</div><div class='add'>+/* USB Endpoint register define */</div><div class='add'>+#define USB_EPNUM_MASK		0xF000</div><div class='add'>+#define USB_EPNUM_SHIFT		12</div><div class='add'>+</div><div class='add'>+#define USB_TRANS_MODE_SHIFT	8</div><div class='add'>+#define USB_TRANS_CTR		0x0000</div><div class='add'>+#define USB_TRANS_INT		0x0100</div><div class='add'>+#define USB_TRANS_BULK		0x0200</div><div class='add'>+#define USB_TRANS_ISO		0x0300</div><div class='add'>+</div><div class='add'>+#define USB_EP_MF		0x0020</div><div class='add'>+#define USB_EP_RTE		0x0010</div><div class='add'>+</div><div class='add'>+#define USB_THS_SHIFT		2</div><div class='add'>+#define USB_THS_MASK		0x000c</div><div class='add'>+#define USB_THS_NORMAL		0x0</div><div class='add'>+#define USB_THS_IGNORE_IN	0x0004</div><div class='add'>+#define USB_THS_NACK		0x0008</div><div class='add'>+#define USB_THS_STALL		0x000c</div><div class='add'>+</div><div class='add'>+#define USB_RHS_SHIFT   	0</div><div class='add'>+#define USB_RHS_MASK		0x0003</div><div class='add'>+#define USB_RHS_NORMAL  	0x0</div><div class='add'>+#define USB_RHS_IGNORE_OUT	0x0001</div><div class='add'>+#define USB_RHS_NACK		0x0002</div><div class='add'>+#define USB_RHS_STALL		0x0003</div><div class='add'>+</div><div class='add'>+#define USB_RTHS_MASK		0x000f</div><div class='add'>+</div><div class='add'>+/* USB Command Register define */</div><div class='add'>+#define USB_CMD_STR_FIFO	0x80</div><div class='add'>+#define USB_CMD_FLUSH_FIFO	0x40</div><div class='add'>+#define USB_CMD_ISFT		0x20</div><div class='add'>+#define USB_CMD_DSFT		0x10</div><div class='add'>+#define USB_CMD_EP_MASK		0x03</div><div class='add'>+</div><div class='add'>+/* USB Event and Mask Register define */</div><div class='add'>+#define USB_E_MSF_MASK		0x0800</div><div class='add'>+#define USB_E_SFT_MASK		0x0400</div><div class='add'>+#define USB_E_RESET_MASK	0x0200</div><div class='add'>+#define USB_E_IDLE_MASK		0x0100</div><div class='add'>+#define USB_E_TXE4_MASK		0x0080</div><div class='add'>+#define USB_E_TXE3_MASK		0x0040</div><div class='add'>+#define USB_E_TXE2_MASK		0x0020</div><div class='add'>+#define USB_E_TXE1_MASK		0x0010</div><div class='add'>+#define USB_E_SOF_MASK		0x0008</div><div class='add'>+#define USB_E_BSY_MASK		0x0004</div><div class='add'>+#define USB_E_TXB_MASK		0x0002</div><div class='add'>+#define USB_E_RXB_MASK		0x0001</div><div class='add'>+#define USBER_ALL_CLEAR 	0x0fff</div><div class='add'>+</div><div class='add'>+#define USB_E_DEFAULT_DEVICE   (USB_E_RESET_MASK | USB_E_TXE4_MASK | \</div><div class='add'>+				USB_E_TXE3_MASK | USB_E_TXE2_MASK | \</div><div class='add'>+				USB_E_TXE1_MASK | USB_E_BSY_MASK | \</div><div class='add'>+				USB_E_TXB_MASK | USB_E_RXB_MASK)</div><div class='add'>+</div><div class='add'>+#define USB_E_TXE_MASK         (USB_E_TXE4_MASK | USB_E_TXE3_MASK|\</div><div class='add'>+				 USB_E_TXE2_MASK | USB_E_TXE1_MASK)</div><div class='add'>+/* USB Status Register define */</div><div class='add'>+#define USB_IDLE_STATUS_MASK	0x01</div><div class='add'>+</div><div class='add'>+/* USB Start of Frame Timer */</div><div class='add'>+#define USB_USSFT_MASK		0x3FFF</div><div class='add'>+</div><div class='add'>+/* USB Frame Number Register */</div><div class='add'>+#define USB_USFRN_MASK		0xFFFF</div><div class='add'>+</div><div class='add'>+struct usb_device_para{</div><div class='add'>+	u16	epptr[4];</div><div class='add'>+	u32	rstate;</div><div class='add'>+	u32	rptr;</div><div class='add'>+	u16	frame_n;</div><div class='add'>+	u16	rbcnt;</div><div class='add'>+	u32	rtemp;</div><div class='add'>+	u32	rxusb_data;</div><div class='add'>+	u16	rxuptr;</div><div class='add'>+	u8	reso[2];</div><div class='add'>+	u32	softbl;</div><div class='add'>+	u8	sofucrctemp;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct usb_ep_para{</div><div class='add'>+	u16	rbase;</div><div class='add'>+	u16	tbase;</div><div class='add'>+	u8	rbmr;</div><div class='add'>+	u8	tbmr;</div><div class='add'>+	u16	mrblr;</div><div class='add'>+	u16	rbptr;</div><div class='add'>+	u16	tbptr;</div><div class='add'>+	u32	tstate;</div><div class='add'>+	u32	tptr;</div><div class='add'>+	u16	tcrc;</div><div class='add'>+	u16	tbcnt;</div><div class='add'>+	u32	ttemp;</div><div class='add'>+	u16	txusbu_ptr;</div><div class='add'>+	u8	reserve[2];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define USB_BUSMODE_GBL		0x20</div><div class='add'>+#define USB_BUSMODE_BO_MASK	0x18</div><div class='add'>+#define USB_BUSMODE_BO_SHIFT	0x3</div><div class='add'>+#define USB_BUSMODE_BE		0x2</div><div class='add'>+#define USB_BUSMODE_CETM	0x04</div><div class='add'>+#define USB_BUSMODE_DTB		0x02</div><div class='add'>+</div><div class='add'>+/* Endpoint basic handle */</div><div class='add'>+#define ep_index(EP)		((EP)-&gt;desc-&gt;bEndpointAddress &amp; 0xF)</div><div class='add'>+#define ep_maxpacket(EP)	((EP)-&gt;ep.maxpacket)</div><div class='add'>+#define ep_is_in(EP)	((ep_index(EP) == 0) ? (EP-&gt;udc-&gt;ep0_dir == \</div><div class='add'>+			USB_DIR_IN) : ((EP)-&gt;desc-&gt;bEndpointAddress \</div><div class='add'>+			&amp; USB_DIR_IN) == USB_DIR_IN)</div><div class='add'>+</div><div class='add'>+/* ep0 transfer state */</div><div class='add'>+#define WAIT_FOR_SETUP          0</div><div class='add'>+#define DATA_STATE_XMIT         1</div><div class='add'>+#define DATA_STATE_NEED_ZLP     2</div><div class='add'>+#define WAIT_FOR_OUT_STATUS     3</div><div class='add'>+#define DATA_STATE_RECV         4</div><div class='add'>+</div><div class='add'>+/* ep tramsfer mode */</div><div class='add'>+#define USBP_TM_CTL	0</div><div class='add'>+#define USBP_TM_ISO	1</div><div class='add'>+#define USBP_TM_BULK	2</div><div class='add'>+#define USBP_TM_INT	3</div><div class='add'>+</div><div class='add'>+/*-----------------------------------------------------------------------------</div><div class='add'>+	USB RX And TX DATA Frame</div><div class='add'>+ -----------------------------------------------------------------------------*/</div><div class='add'>+struct qe_frame{</div><div class='add'>+	u8 *data;</div><div class='add'>+	u32 len;</div><div class='add'>+	u32 status;</div><div class='add'>+	u32 info;</div><div class='add'>+</div><div class='add'>+	void *privdata;</div><div class='add'>+	struct list_head node;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Frame structure, info field. */</div><div class='add'>+#define PID_DATA0              0x80000000 /* Data toggle zero */</div><div class='add'>+#define PID_DATA1              0x40000000 /* Data toggle one  */</div><div class='add'>+#define PID_SETUP              0x20000000 /* setup bit */</div><div class='add'>+#define SETUP_STATUS           0x10000000 /* setup status bit */</div><div class='add'>+#define SETADDR_STATUS         0x08000000 /* setupup address status bit */</div><div class='add'>+#define NO_REQ                 0x04000000 /* Frame without request */</div><div class='add'>+#define HOST_DATA              0x02000000 /* Host data frame */</div><div class='add'>+#define FIRST_PACKET_IN_FRAME  0x01000000 /* first packet in the frame */</div><div class='add'>+#define TOKEN_FRAME            0x00800000 /* Host token frame */</div><div class='add'>+#define ZLP                    0x00400000 /* Zero length packet */</div><div class='add'>+#define IN_TOKEN_FRAME         0x00200000 /* In token package */</div><div class='add'>+#define OUT_TOKEN_FRAME        0x00100000 /* Out token package */</div><div class='add'>+#define SETUP_TOKEN_FRAME      0x00080000 /* Setup token package */</div><div class='add'>+#define STALL_FRAME            0x00040000 /* Stall handshake */</div><div class='add'>+#define NACK_FRAME             0x00020000 /* Nack handshake */</div><div class='add'>+#define NO_PID                 0x00010000 /* No send PID */</div><div class='add'>+#define NO_CRC                 0x00008000 /* No send CRC */</div><div class='add'>+#define HOST_COMMAND           0x00004000 /* Host command frame   */</div><div class='add'>+</div><div class='add'>+/* Frame status field */</div><div class='add'>+/* Receive side */</div><div class='add'>+#define FRAME_OK               0x00000000 /* Frame tranmitted or received OK */</div><div class='add'>+#define FRAME_ERROR            0x80000000 /* Error occured on frame */</div><div class='add'>+#define START_FRAME_LOST       0x40000000 /* START_FRAME_LOST */</div><div class='add'>+#define END_FRAME_LOST         0x20000000 /* END_FRAME_LOST */</div><div class='add'>+#define RX_ER_NONOCT           0x10000000 /* Rx Non Octet Aligned Packet */</div><div class='add'>+#define RX_ER_BITSTUFF         0x08000000 /* Frame Aborted --Received packet</div><div class='add'>+					     with bit stuff error */</div><div class='add'>+#define RX_ER_CRC              0x04000000 /* Received packet with CRC error */</div><div class='add'>+#define RX_ER_OVERUN           0x02000000 /* Over-run occured on reception */</div><div class='add'>+#define RX_ER_PID              0x01000000 /* Wrong PID received */</div><div class='add'>+/* Tranmit side */</div><div class='add'>+#define TX_ER_NAK              0x00800000 /* Received NAK handshake */</div><div class='add'>+#define TX_ER_STALL            0x00400000 /* Received STALL handshake */</div><div class='add'>+#define TX_ER_TIMEOUT          0x00200000 /* Transmit time out */</div><div class='add'>+#define TX_ER_UNDERUN          0x00100000 /* Transmit underrun */</div><div class='add'>+#define FRAME_INPROGRESS       0x00080000 /* Frame is being transmitted */</div><div class='add'>+#define ER_DATA_UNDERUN        0x00040000 /* Frame is shorter then expected */</div><div class='add'>+#define ER_DATA_OVERUN         0x00020000 /* Frame is longer then expected */</div><div class='add'>+</div><div class='add'>+/* QE USB frame operation functions */</div><div class='add'>+#define frame_get_length(frm) (frm-&gt;len)</div><div class='add'>+#define frame_set_length(frm, leng) (frm-&gt;len = leng)</div><div class='add'>+#define frame_get_data(frm) (frm-&gt;data)</div><div class='add'>+#define frame_set_data(frm, dat) (frm-&gt;data = dat)</div><div class='add'>+#define frame_get_info(frm) (frm-&gt;info)</div><div class='add'>+#define frame_set_info(frm, inf) (frm-&gt;info = inf)</div><div class='add'>+#define frame_get_status(frm) (frm-&gt;status)</div><div class='add'>+#define frame_set_status(frm, stat) (frm-&gt;status = stat)</div><div class='add'>+#define frame_get_privdata(frm) (frm-&gt;privdata)</div><div class='add'>+#define frame_set_privdata(frm, dat) (frm-&gt;privdata = dat)</div><div class='add'>+</div><div class='add'>+static inline void qe_frame_clean(struct qe_frame *frm)</div><div class='add'>+{</div><div class='add'>+	frame_set_data(frm, NULL);</div><div class='add'>+	frame_set_length(frm, 0);</div><div class='add'>+	frame_set_status(frm, FRAME_OK);</div><div class='add'>+	frame_set_info(frm, 0);</div><div class='add'>+	frame_set_privdata(frm, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void qe_frame_init(struct qe_frame *frm)</div><div class='add'>+{</div><div class='add'>+	qe_frame_clean(frm);</div><div class='add'>+	INIT_LIST_HEAD(&amp;(frm-&gt;node));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct qe_req {</div><div class='add'>+	struct usb_request req;</div><div class='add'>+	struct list_head queue;</div><div class='add'>+	/* ep_queue() func will add</div><div class='add'>+	 a request-&gt;queue into a udc_ep-&gt;queue 'd tail */</div><div class='add'>+	struct qe_ep *ep;</div><div class='add'>+	unsigned mapped:1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct qe_ep {</div><div class='add'>+	struct usb_ep ep;</div><div class='add'>+	struct list_head queue;</div><div class='add'>+	struct qe_udc *udc;</div><div class='add'>+	const struct usb_endpoint_descriptor *desc;</div><div class='add'>+	struct usb_gadget *gadget;</div><div class='add'>+</div><div class='add'>+	u8 state;</div><div class='add'>+</div><div class='add'>+	struct qe_bd __iomem *rxbase;</div><div class='add'>+	struct qe_bd __iomem *n_rxbd;</div><div class='add'>+	struct qe_bd __iomem *e_rxbd;</div><div class='add'>+</div><div class='add'>+	struct qe_bd __iomem *txbase;</div><div class='add'>+	struct qe_bd __iomem *n_txbd;</div><div class='add'>+	struct qe_bd __iomem *c_txbd;</div><div class='add'>+</div><div class='add'>+	struct qe_frame *rxframe;</div><div class='add'>+	u8 *rxbuffer;</div><div class='add'>+	dma_addr_t rxbuf_d;</div><div class='add'>+	u8 rxbufmap;</div><div class='add'>+	unsigned char localnack;</div><div class='add'>+	int has_data;</div><div class='add'>+</div><div class='add'>+	struct qe_frame *txframe;</div><div class='add'>+	struct qe_req *tx_req;</div><div class='add'>+	int sent;  /*data already sent */</div><div class='add'>+	int last;  /*data sent in the last time*/</div><div class='add'>+</div><div class='add'>+	u8 dir;</div><div class='add'>+	u8 epnum;</div><div class='add'>+	u8 tm; /* transfer mode */</div><div class='add'>+	u8 data01;</div><div class='add'>+	u8 init;</div><div class='add'>+</div><div class='add'>+	u8 already_seen;</div><div class='add'>+	u8 enable_tasklet;</div><div class='add'>+	u8 setup_stage;</div><div class='add'>+	u32 last_io;            /* timestamp */</div><div class='add'>+</div><div class='add'>+	char name[14];</div><div class='add'>+</div><div class='add'>+	unsigned double_buf:1;</div><div class='add'>+	unsigned stopped:1;</div><div class='add'>+	unsigned fnf:1;</div><div class='add'>+	unsigned has_dma:1;</div><div class='add'>+</div><div class='add'>+	u8 ackwait;</div><div class='add'>+	u8 dma_channel;</div><div class='add'>+	u16 dma_counter;</div><div class='add'>+	int lch;</div><div class='add'>+</div><div class='add'>+	struct timer_list timer;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct qe_udc {</div><div class='add'>+	struct usb_gadget gadget;</div><div class='add'>+	struct usb_gadget_driver *driver;</div><div class='add'>+	struct device *dev;</div><div class='add'>+	struct qe_ep eps[USB_MAX_ENDPOINTS];</div><div class='add'>+	struct usb_ctrlrequest local_setup_buff;</div><div class='add'>+	spinlock_t lock;	/* lock for set/config qe_udc */</div><div class='add'>+	unsigned long soc_type;		/* QE or CPM soc */</div><div class='add'>+</div><div class='add'>+	struct qe_req *status_req;	/* ep0 status request */</div><div class='add'>+</div><div class='add'>+	/* USB and EP Parameter Block pointer */</div><div class='add'>+	struct usb_device_para __iomem *usb_param;</div><div class='add'>+	struct usb_ep_para __iomem *ep_param[4];</div><div class='add'>+</div><div class='add'>+	u32 max_pipes;          /* Device max pipes */</div><div class='add'>+	u32 max_use_endpts;     /* Max endpointes to be used */</div><div class='add'>+	u32 bus_reset;          /* Device is bus reseting */</div><div class='add'>+	u32 resume_state;       /* USB state to resume*/</div><div class='add'>+	u32 usb_state;          /* USB current state */</div><div class='add'>+	u32 usb_next_state;     /* USB next state */</div><div class='add'>+	u32 ep0_state;          /* Enpoint zero state */</div><div class='add'>+	u32 ep0_dir;            /* Enpoint zero direction: can be</div><div class='add'>+				USB_DIR_IN or USB_DIR_OUT*/</div><div class='add'>+	u32 usb_sof_count;      /* SOF count */</div><div class='add'>+	u32 errors;             /* USB ERRORs count */</div><div class='add'>+</div><div class='add'>+	u8 *tmpbuf;</div><div class='add'>+	u32 c_start;</div><div class='add'>+	u32 c_end;</div><div class='add'>+</div><div class='add'>+	u8 *nullbuf;</div><div class='add'>+	u8 *statusbuf;</div><div class='add'>+	dma_addr_t nullp;</div><div class='add'>+	u8 nullmap;</div><div class='add'>+	u8 device_address;	/* Device USB address */</div><div class='add'>+</div><div class='add'>+	unsigned int usb_clock;</div><div class='add'>+	unsigned int usb_irq;</div><div class='add'>+	struct usb_ctlr __iomem *usb_regs;</div><div class='add'>+</div><div class='add'>+	struct tasklet_struct rx_tasklet;</div><div class='add'>+</div><div class='add'>+	struct completion *done;	/* to make sure release() is done */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define EP_STATE_IDLE	0</div><div class='add'>+#define EP_STATE_NACK	1</div><div class='add'>+#define EP_STATE_STALL	2</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * transmit BD's status</div><div class='add'>+ */</div><div class='add'>+#define T_R           0x80000000         /* ready bit */</div><div class='add'>+#define T_W           0x20000000         /* wrap bit */</div><div class='add'>+#define T_I           0x10000000         /* interrupt on completion */</div><div class='add'>+#define T_L           0x08000000         /* last */</div><div class='add'>+#define T_TC          0x04000000         /* transmit CRC */</div><div class='add'>+#define T_CNF         0x02000000         /* wait for  transmit confirm */</div><div class='add'>+#define T_LSP         0x01000000         /* Low-speed transaction */</div><div class='add'>+#define T_PID         0x00c00000         /* packet id */</div><div class='add'>+#define T_NAK         0x00100000         /* No ack. */</div><div class='add'>+#define T_STAL        0x00080000         /* Stall recieved */</div><div class='add'>+#define T_TO          0x00040000         /* time out */</div><div class='add'>+#define T_UN          0x00020000         /* underrun */</div><div class='add'>+</div><div class='add'>+#define DEVICE_T_ERROR    (T_UN | T_TO)</div><div class='add'>+#define HOST_T_ERROR      (T_UN | T_TO | T_NAK | T_STAL)</div><div class='add'>+#define DEVICE_T_BD_MASK  DEVICE_T_ERROR</div><div class='add'>+#define HOST_T_BD_MASK    HOST_T_ERROR</div><div class='add'>+</div><div class='add'>+#define T_PID_SHIFT   6</div><div class='add'>+#define T_PID_DATA0   0x00800000         /* Data 0 toggle */</div><div class='add'>+#define T_PID_DATA1   0x00c00000         /* Data 1 toggle */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * receive BD's status</div><div class='add'>+ */</div><div class='add'>+#define R_E           0x80000000         /* buffer empty */</div><div class='add'>+#define R_W           0x20000000         /* wrap bit */</div><div class='add'>+#define R_I           0x10000000         /* interrupt on reception */</div><div class='add'>+#define R_L           0x08000000         /* last */</div><div class='add'>+#define R_F           0x04000000         /* first */</div><div class='add'>+#define R_PID         0x00c00000         /* packet id */</div><div class='add'>+#define R_NO          0x00100000         /* Rx Non Octet Aligned Packet */</div><div class='add'>+#define R_AB          0x00080000         /* Frame Aborted */</div><div class='add'>+#define R_CR          0x00040000         /* CRC Error */</div><div class='add'>+#define R_OV          0x00020000         /* Overrun */</div><div class='add'>+</div><div class='add'>+#define R_ERROR       (R_NO | R_AB | R_CR | R_OV)</div><div class='add'>+#define R_BD_MASK     R_ERROR</div><div class='add'>+</div><div class='add'>+#define R_PID_DATA0   0x00000000</div><div class='add'>+#define R_PID_DATA1   0x00400000</div><div class='add'>+#define R_PID_SETUP   0x00800000</div><div class='add'>+</div><div class='add'>+#define CPM_USB_STOP_TX 0x2e600000</div><div class='add'>+#define CPM_USB_RESTART_TX 0x2e600000</div><div class='add'>+#define CPM_USB_STOP_TX_OPCODE 0x0a</div><div class='add'>+#define CPM_USB_RESTART_TX_OPCODE 0x0b</div><div class='add'>+#define CPM_USB_EP_SHIFT 5</div><div class='add'>+</div><div class='add'>+#ifndef CONFIG_CPM</div><div class='add'>+inline int cpm_command(u32 command, u8 opcode)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef CONFIG_QUICC_ENGINE</div><div class='add'>+inline int qe_issue_cmd(u32 cmd, u32 device, u8 mcn_protocol,</div><div class='add'>+	u32 cmd_input)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif  /* __FSL_QE_UDC_H */</div><div class='head'>diff --git a/drivers/usb/gadget/fsl_usb2_udc.c b/drivers/usb/gadget/fsl_usb2_udc.c<br/>index 45ad556169f1..091bb55c9aa7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/gadget/fsl_usb2_udc.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/gadget/fsl_usb2_udc.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/gadget/fsl_usb2_udc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/gadget/fsl_usb2_udc.c</a></div><div class='hunk'>@@ -23,11 +23,8 @@</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/timer.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='hunk'>@@ -44,11 +41,9 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/byteorder.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/unaligned.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='del'>-#include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "fsl_usb2_udc.h"</div><div class='ctx'> </div><div class='hunk'>@@ -61,8 +56,8 @@</div><div class='ctx'> static const char driver_name[] = "fsl-usb2-udc";</div><div class='ctx'> static const char driver_desc[] = DRIVER_DESC;</div><div class='ctx'> </div><div class='del'>-volatile static struct usb_dr_device *dr_regs = NULL;</div><div class='del'>-volatile static struct usb_sys_interface *usb_sys_regs = NULL;</div><div class='add'>+static struct usb_dr_device *dr_regs;</div><div class='add'>+static struct usb_sys_interface *usb_sys_regs;</div><div class='ctx'> </div><div class='ctx'> /* it is initialized in probe()  */</div><div class='ctx'> static struct fsl_udc *udc_controller = NULL;</div><div class='hunk'>@@ -76,16 +71,14 @@ fsl_ep0_desc = {</div><div class='ctx'> 	.wMaxPacketSize =	USB_MAX_CTRL_PAYLOAD,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int fsl_udc_suspend(struct platform_device *pdev, pm_message_t state);</div><div class='del'>-static int fsl_udc_resume(struct platform_device *pdev);</div><div class='ctx'> static void fsl_ep_fifo_flush(struct usb_ep *_ep);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PPC32</div><div class='ctx'> #define fsl_readl(addr)		in_le32(addr)</div><div class='del'>-#define fsl_writel(addr, val32) out_le32(val32, addr)</div><div class='add'>+#define fsl_writel(val32, addr) out_le32(addr, val32)</div><div class='ctx'> #else</div><div class='ctx'> #define fsl_readl(addr)		readl(addr)</div><div class='del'>-#define fsl_writel(addr, val32) writel(addr, val32)</div><div class='add'>+#define fsl_writel(val32, addr) writel(val32, addr)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /********************************************************************</div><div class='hunk'>@@ -185,10 +178,6 @@ static int dr_controller_setup(struct fsl_udc *udc)</div><div class='ctx'> 	unsigned long timeout;</div><div class='ctx'> #define FSL_UDC_RESET_TIMEOUT 1000</div><div class='ctx'> </div><div class='del'>-	/* before here, make sure dr_regs has been initialized */</div><div class='del'>-	if (!udc)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='ctx'> 	/* Stop and reset the usb controller */</div><div class='ctx'> 	tmp = fsl_readl(&amp;dr_regs-&gt;usbcmd);</div><div class='ctx'> 	tmp &amp;= ~USB_CMD_RUN_STOP;</div><div class='hunk'>@@ -202,7 +191,7 @@ static int dr_controller_setup(struct fsl_udc *udc)</div><div class='ctx'> 	timeout = jiffies + FSL_UDC_RESET_TIMEOUT;</div><div class='ctx'> 	while (fsl_readl(&amp;dr_regs-&gt;usbcmd) &amp; USB_CMD_CTRL_RESET) {</div><div class='ctx'> 		if (time_after(jiffies, timeout)) {</div><div class='del'>-			ERR("udc reset timeout! \n");</div><div class='add'>+			ERR("udc reset timeout!\n");</div><div class='ctx'> 			return -ETIMEDOUT;</div><div class='ctx'> 		}</div><div class='ctx'> 		cpu_relax();</div><div class='hunk'>@@ -315,7 +304,8 @@ static void dr_controller_stop(struct fsl_udc *udc)</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void dr_ep_setup(unsigned char ep_num, unsigned char dir, unsigned char ep_type)</div><div class='add'>+static void dr_ep_setup(unsigned char ep_num, unsigned char dir,</div><div class='add'>+			unsigned char ep_type)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int tmp_epctrl = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -563,7 +553,7 @@ static int fsl_ep_disable(struct usb_ep *_ep)</div><div class='ctx'> 	/* nuke all pending requests (does flush) */</div><div class='ctx'> 	nuke(ep, -ESHUTDOWN);</div><div class='ctx'> </div><div class='del'>-	ep-&gt;desc = 0;</div><div class='add'>+	ep-&gt;desc = NULL;</div><div class='ctx'> 	ep-&gt;stopped = 1;</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;udc-&gt;lock, flags);</div><div class='ctx'> </div><div class='hunk'>@@ -602,7 +592,7 @@ static void fsl_free_request(struct usb_ep *_ep, struct usb_request *_req)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*-------------------------------------------------------------------------*/</div><div class='del'>-static int fsl_queue_td(struct fsl_ep *ep, struct fsl_req *req)</div><div class='add'>+static void fsl_queue_td(struct fsl_ep *ep, struct fsl_req *req)</div><div class='ctx'> {</div><div class='ctx'> 	int i = ep_index(ep) * 2 + ep_is_in(ep);</div><div class='ctx'> 	u32 temp, bitmask, tmp_stat;</div><div class='hunk'>@@ -653,13 +643,16 @@ static int fsl_queue_td(struct fsl_ep *ep, struct fsl_req *req)</div><div class='ctx'> 			| EP_QUEUE_HEAD_STATUS_HALT));</div><div class='ctx'> 	dQH-&gt;size_ioc_int_sts &amp;= temp;</div><div class='ctx'> </div><div class='add'>+	/* Ensure that updates to the QH will occure before priming. */</div><div class='add'>+	wmb();</div><div class='add'>+</div><div class='ctx'> 	/* Prime endpoint by writing 1 to ENDPTPRIME */</div><div class='ctx'> 	temp = ep_is_in(ep)</div><div class='ctx'> 		? (1 &lt;&lt; (ep_index(ep) + 16))</div><div class='ctx'> 		: (1 &lt;&lt; (ep_index(ep)));</div><div class='ctx'> 	fsl_writel(temp, &amp;dr_regs-&gt;endpointprime);</div><div class='ctx'> out:</div><div class='del'>-	return 0;</div><div class='add'>+	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Fill in the dTD structure</div><div class='hunk'>@@ -710,7 +703,7 @@ static struct ep_td_struct *fsl_build_dtd(struct fsl_req *req, unsigned *length,</div><div class='ctx'> 		*is_last = 0;</div><div class='ctx'> </div><div class='ctx'> 	if ((*is_last) == 0)</div><div class='del'>-		VDBG("multi-dtd request!\n");</div><div class='add'>+		VDBG("multi-dtd request!");</div><div class='ctx'> 	/* Fill in the transfer size; set active bit */</div><div class='ctx'> 	swap_temp = ((*length &lt;&lt; DTD_LENGTH_BIT_POS) | DTD_STATUS_ACTIVE);</div><div class='ctx'> </div><div class='hunk'>@@ -773,11 +766,11 @@ fsl_ep_queue(struct usb_ep *_ep, struct usb_request *_req, gfp_t gfp_flags)</div><div class='ctx'> 	/* catch various bogus parameters */</div><div class='ctx'> 	if (!_req || !req-&gt;req.complete || !req-&gt;req.buf</div><div class='ctx'> 			|| !list_empty(&amp;req-&gt;queue)) {</div><div class='del'>-		VDBG("%s, bad params\n", __func__);</div><div class='add'>+		VDBG("%s, bad params", __func__);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (unlikely(!_ep || !ep-&gt;desc)) {</div><div class='del'>-		VDBG("%s, bad ep\n", __func__);</div><div class='add'>+		VDBG("%s, bad ep", __func__);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (ep-&gt;desc-&gt;bmAttributes == USB_ENDPOINT_XFER_ISOC) {</div><div class='hunk'>@@ -1069,7 +1062,7 @@ static int fsl_vbus_session(struct usb_gadget *gadget, int is_active)</div><div class='ctx'> </div><div class='ctx'> 	udc = container_of(gadget, struct fsl_udc, gadget);</div><div class='ctx'> 	spin_lock_irqsave(&amp;udc-&gt;lock, flags);</div><div class='del'>-	VDBG("VBUS %s\n", is_active ? "on" : "off");</div><div class='add'>+	VDBG("VBUS %s", is_active ? "on" : "off");</div><div class='ctx'> 	udc-&gt;vbus_active = (is_active != 0);</div><div class='ctx'> 	if (can_pullup(udc))</div><div class='ctx'> 		fsl_writel((fsl_readl(&amp;dr_regs-&gt;usbcmd) | USB_CMD_RUN_STOP),</div><div class='hunk'>@@ -1146,7 +1139,6 @@ static int ep0_prime_status(struct fsl_udc *udc, int direction)</div><div class='ctx'> {</div><div class='ctx'> 	struct fsl_req *req = udc-&gt;status_req;</div><div class='ctx'> 	struct fsl_ep *ep;</div><div class='del'>-	int status = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (direction == EP_DIR_IN)</div><div class='ctx'> 		udc-&gt;ep0_dir = USB_DIR_IN;</div><div class='hunk'>@@ -1164,27 +1156,21 @@ static int ep0_prime_status(struct fsl_udc *udc, int direction)</div><div class='ctx'> 	req-&gt;dtd_count = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (fsl_req_to_dtd(req) == 0)</div><div class='del'>-		status = fsl_queue_td(ep, req);</div><div class='add'>+		fsl_queue_td(ep, req);</div><div class='ctx'> 	else</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	if (status)</div><div class='del'>-		ERR("Can't queue ep0 status request \n");</div><div class='ctx'> 	list_add_tail(&amp;req-&gt;queue, &amp;ep-&gt;queue);</div><div class='ctx'> </div><div class='del'>-	return status;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int udc_reset_ep_queue(struct fsl_udc *udc, u8 pipe)</div><div class='add'>+static void udc_reset_ep_queue(struct fsl_udc *udc, u8 pipe)</div><div class='ctx'> {</div><div class='ctx'> 	struct fsl_ep *ep = get_ep_by_pipe(udc, pipe);</div><div class='ctx'> </div><div class='del'>-	if (!ep-&gt;name)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	nuke(ep, -ESHUTDOWN);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	if (ep-&gt;name)</div><div class='add'>+		nuke(ep, -ESHUTDOWN);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1208,10 +1194,8 @@ static void ch9getstatus(struct fsl_udc *udc, u8 request_type, u16 value,</div><div class='ctx'> 		u16 index, u16 length)</div><div class='ctx'> {</div><div class='ctx'> 	u16 tmp = 0;		/* Status, cpu endian */</div><div class='del'>-</div><div class='ctx'> 	struct fsl_req *req;</div><div class='ctx'> 	struct fsl_ep *ep;</div><div class='del'>-	int status = 0;</div><div class='ctx'> </div><div class='ctx'> 	ep = &amp;udc-&gt;eps[0];</div><div class='ctx'> </div><div class='hunk'>@@ -1250,14 +1234,10 @@ static void ch9getstatus(struct fsl_udc *udc, u8 request_type, u16 value,</div><div class='ctx'> </div><div class='ctx'> 	/* prime the data phase */</div><div class='ctx'> 	if ((fsl_req_to_dtd(req) == 0))</div><div class='del'>-		status = fsl_queue_td(ep, req);</div><div class='add'>+		fsl_queue_td(ep, req);</div><div class='ctx'> 	else			/* no mem */</div><div class='ctx'> 		goto stall;</div><div class='ctx'> </div><div class='del'>-	if (status) {</div><div class='del'>-		ERR("Can't respond to getstatus request \n");</div><div class='del'>-		goto stall;</div><div class='del'>-	}</div><div class='ctx'> 	list_add_tail(&amp;req-&gt;queue, &amp;ep-&gt;queue);</div><div class='ctx'> 	udc-&gt;ep0_state = DATA_STATE_XMIT;</div><div class='ctx'> 	return;</div><div class='hunk'>@@ -1397,7 +1377,7 @@ static void ep0_req_complete(struct fsl_udc *udc, struct fsl_ep *ep0,</div><div class='ctx'> 		udc-&gt;ep0_state = WAIT_FOR_SETUP;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case WAIT_FOR_SETUP:</div><div class='del'>-		ERR("Unexpect ep0 packets \n");</div><div class='add'>+		ERR("Unexpect ep0 packets\n");</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		ep0stall(udc);</div><div class='hunk'>@@ -1476,7 +1456,7 @@ static int process_ep_req(struct fsl_udc *udc, int pipe,</div><div class='ctx'> 				status = -EILSEQ;</div><div class='ctx'> 				break;</div><div class='ctx'> 			} else</div><div class='del'>-				ERR("Unknown error has occured (0x%x)!\r\n",</div><div class='add'>+				ERR("Unknown error has occured (0x%x)!\n",</div><div class='ctx'> 					errors);</div><div class='ctx'> </div><div class='ctx'> 		} else if (le32_to_cpu(curr_td-&gt;size_ioc_sts)</div><div class='hunk'>@@ -1495,7 +1475,7 @@ static int process_ep_req(struct fsl_udc *udc, int pipe,</div><div class='ctx'> 			}</div><div class='ctx'> 		} else {</div><div class='ctx'> 			td_complete++;</div><div class='del'>-			VDBG("dTD transmitted successful ");</div><div class='add'>+			VDBG("dTD transmitted successful");</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (j != curr_req-&gt;dtd_count - 1)</div><div class='hunk'>@@ -1568,9 +1548,6 @@ static void port_change_irq(struct fsl_udc *udc)</div><div class='ctx'> {</div><div class='ctx'> 	u32 speed;</div><div class='ctx'> </div><div class='del'>-	if (udc-&gt;bus_reset)</div><div class='del'>-		udc-&gt;bus_reset = 0;</div><div class='del'>-</div><div class='ctx'> 	/* Bus resetting is finished */</div><div class='ctx'> 	if (!(fsl_readl(&amp;dr_regs-&gt;portsc1) &amp; PORTSCX_PORT_RESET)) {</div><div class='ctx'> 		/* Get the speed */</div><div class='hunk'>@@ -1678,8 +1655,6 @@ static void reset_irq(struct fsl_udc *udc)</div><div class='ctx'> </div><div class='ctx'> 	if (fsl_readl(&amp;dr_regs-&gt;portsc1) &amp; PORTSCX_PORT_RESET) {</div><div class='ctx'> 		VDBG("Bus reset");</div><div class='del'>-		/* Bus is reseting */</div><div class='del'>-		udc-&gt;bus_reset = 1;</div><div class='ctx'> 		/* Reset all the queues, include XD, dTD, EP queue</div><div class='ctx'> 		 * head and TR Queue */</div><div class='ctx'> 		reset_queues(udc);</div><div class='hunk'>@@ -1768,7 +1743,7 @@ static irqreturn_t fsl_udc_irq(int irq, void *_udc)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (irq_src &amp; (USB_STS_ERR | USB_STS_SYS_ERR)) {</div><div class='del'>-		VDBG("Error IRQ %x ", irq_src);</div><div class='add'>+		VDBG("Error IRQ %x", irq_src);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;udc-&gt;lock, flags);</div><div class='hunk'>@@ -1799,7 +1774,7 @@ int usb_gadget_register_driver(struct usb_gadget_driver *driver)</div><div class='ctx'> 	/* lock is needed but whether should use this lock or another */</div><div class='ctx'> 	spin_lock_irqsave(&amp;udc_controller-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-	driver-&gt;driver.bus = 0;</div><div class='add'>+	driver-&gt;driver.bus = NULL;</div><div class='ctx'> 	/* hook up the driver */</div><div class='ctx'> 	udc_controller-&gt;driver = driver;</div><div class='ctx'> 	udc_controller-&gt;gadget.dev.driver = &amp;driver-&gt;driver;</div><div class='hunk'>@@ -1809,8 +1784,8 @@ int usb_gadget_register_driver(struct usb_gadget_driver *driver)</div><div class='ctx'> 	retval = driver-&gt;bind(&amp;udc_controller-&gt;gadget);</div><div class='ctx'> 	if (retval) {</div><div class='ctx'> 		VDBG("bind to %s --&gt; %d", driver-&gt;driver.name, retval);</div><div class='del'>-		udc_controller-&gt;gadget.dev.driver = 0;</div><div class='del'>-		udc_controller-&gt;driver = 0;</div><div class='add'>+		udc_controller-&gt;gadget.dev.driver = NULL;</div><div class='add'>+		udc_controller-&gt;driver = NULL;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1819,12 +1794,12 @@ int usb_gadget_register_driver(struct usb_gadget_driver *driver)</div><div class='ctx'> 	udc_controller-&gt;usb_state = USB_STATE_ATTACHED;</div><div class='ctx'> 	udc_controller-&gt;ep0_state = WAIT_FOR_SETUP;</div><div class='ctx'> 	udc_controller-&gt;ep0_dir = 0;</div><div class='del'>-	printk(KERN_INFO "%s: bind to driver %s \n",</div><div class='add'>+	printk(KERN_INFO "%s: bind to driver %s\n",</div><div class='ctx'> 			udc_controller-&gt;gadget.name, driver-&gt;driver.name);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	if (retval)</div><div class='del'>-		printk("retval %d \n", retval);</div><div class='add'>+		printk("gadget driver register failed %d\n", retval);</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(usb_gadget_register_driver);</div><div class='hunk'>@@ -1842,7 +1817,7 @@ int usb_gadget_unregister_driver(struct usb_gadget_driver *driver)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (udc_controller-&gt;transceiver)</div><div class='del'>-		(void)otg_set_peripheral(udc_controller-&gt;transceiver, 0);</div><div class='add'>+		otg_set_peripheral(udc_controller-&gt;transceiver, NULL);</div><div class='ctx'> </div><div class='ctx'> 	/* stop DR, disable intr */</div><div class='ctx'> 	dr_controller_stop(udc_controller);</div><div class='hunk'>@@ -1863,10 +1838,10 @@ int usb_gadget_unregister_driver(struct usb_gadget_driver *driver)</div><div class='ctx'> </div><div class='ctx'> 	/* unbind gadget and unhook driver. */</div><div class='ctx'> 	driver-&gt;unbind(&amp;udc_controller-&gt;gadget);</div><div class='del'>-	udc_controller-&gt;gadget.dev.driver = 0;</div><div class='del'>-	udc_controller-&gt;driver = 0;</div><div class='add'>+	udc_controller-&gt;gadget.dev.driver = NULL;</div><div class='add'>+	udc_controller-&gt;driver = NULL;</div><div class='ctx'> </div><div class='del'>-	printk("unregistered gadget driver '%s'\r\n", driver-&gt;driver.name);</div><div class='add'>+	printk("unregistered gadget driver '%s'\n", driver-&gt;driver.name);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(usb_gadget_unregister_driver);</div><div class='hunk'>@@ -1922,7 +1897,7 @@ static int fsl_proc_read(char *page, char **start, off_t off, int count,</div><div class='ctx'> 	tmp_reg = fsl_readl(&amp;dr_regs-&gt;usbsts);</div><div class='ctx'> 	t = scnprintf(next, size,</div><div class='ctx'> 			"USB Status Reg:\n"</div><div class='del'>-			"Dr Suspend: %d" "Reset Received: %d" "System Error: %s"</div><div class='add'>+			"Dr Suspend: %d Reset Received: %d System Error: %s "</div><div class='ctx'> 			"USB Error Interrupt: %s\n\n",</div><div class='ctx'> 			(tmp_reg &amp; USB_STS_SUSPEND) ? 1 : 0,</div><div class='ctx'> 			(tmp_reg &amp; USB_STS_RESET) ? 1 : 0,</div><div class='hunk'>@@ -1934,11 +1909,11 @@ static int fsl_proc_read(char *page, char **start, off_t off, int count,</div><div class='ctx'> 	tmp_reg = fsl_readl(&amp;dr_regs-&gt;usbintr);</div><div class='ctx'> 	t = scnprintf(next, size,</div><div class='ctx'> 			"USB Intrrupt Enable Reg:\n"</div><div class='del'>-			"Sleep Enable: %d" "SOF Received Enable: %d"</div><div class='add'>+			"Sleep Enable: %d SOF Received Enable: %d "</div><div class='ctx'> 			"Reset Enable: %d\n"</div><div class='del'>-			"System Error Enable: %d"</div><div class='add'>+			"System Error Enable: %d "</div><div class='ctx'> 			"Port Change Dectected Enable: %d\n"</div><div class='del'>-			"USB Error Intr Enable: %d" "USB Intr Enable: %d\n\n",</div><div class='add'>+			"USB Error Intr Enable: %d USB Intr Enable: %d\n\n",</div><div class='ctx'> 			(tmp_reg &amp; USB_INTR_DEVICE_SUSPEND) ? 1 : 0,</div><div class='ctx'> 			(tmp_reg &amp; USB_INTR_SOF_EN) ? 1 : 0,</div><div class='ctx'> 			(tmp_reg &amp; USB_INTR_RESET_EN) ? 1 : 0,</div><div class='hunk'>@@ -1951,21 +1926,21 @@ static int fsl_proc_read(char *page, char **start, off_t off, int count,</div><div class='ctx'> </div><div class='ctx'> 	tmp_reg = fsl_readl(&amp;dr_regs-&gt;frindex);</div><div class='ctx'> 	t = scnprintf(next, size,</div><div class='del'>-			"USB Frame Index Reg:" "Frame Number is 0x%x\n\n",</div><div class='add'>+			"USB Frame Index Reg: Frame Number is 0x%x\n\n",</div><div class='ctx'> 			(tmp_reg &amp; USB_FRINDEX_MASKS));</div><div class='ctx'> 	size -= t;</div><div class='ctx'> 	next += t;</div><div class='ctx'> </div><div class='ctx'> 	tmp_reg = fsl_readl(&amp;dr_regs-&gt;deviceaddr);</div><div class='ctx'> 	t = scnprintf(next, size,</div><div class='del'>-			"USB Device Address Reg:" "Device Addr is 0x%x\n\n",</div><div class='add'>+			"USB Device Address Reg: Device Addr is 0x%x\n\n",</div><div class='ctx'> 			(tmp_reg &amp; USB_DEVICE_ADDRESS_MASK));</div><div class='ctx'> 	size -= t;</div><div class='ctx'> 	next += t;</div><div class='ctx'> </div><div class='ctx'> 	tmp_reg = fsl_readl(&amp;dr_regs-&gt;endpointlistaddr);</div><div class='ctx'> 	t = scnprintf(next, size,</div><div class='del'>-			"USB Endpoint List Address Reg:"</div><div class='add'>+			"USB Endpoint List Address Reg: "</div><div class='ctx'> 			"Device Addr is 0x%x\n\n",</div><div class='ctx'> 			(tmp_reg &amp; USB_EP_LIST_ADDRESS_MASK));</div><div class='ctx'> 	size -= t;</div><div class='hunk'>@@ -1974,11 +1949,12 @@ static int fsl_proc_read(char *page, char **start, off_t off, int count,</div><div class='ctx'> 	tmp_reg = fsl_readl(&amp;dr_regs-&gt;portsc1);</div><div class='ctx'> 	t = scnprintf(next, size,</div><div class='ctx'> 		"USB Port Status&amp;Control Reg:\n"</div><div class='del'>-		"Port Transceiver Type : %s" "Port Speed: %s \n"</div><div class='del'>-		"PHY Low Power Suspend: %s" "Port Reset: %s"</div><div class='del'>-		"Port Suspend Mode: %s \n" "Over-current Change: %s"</div><div class='add'>+		"Port Transceiver Type : %s Port Speed: %s\n"</div><div class='add'>+		"PHY Low Power Suspend: %s Port Reset: %s "</div><div class='add'>+		"Port Suspend Mode: %s\n"</div><div class='add'>+		"Over-current Change: %s "</div><div class='ctx'> 		"Port Enable/Disable Change: %s\n"</div><div class='del'>-		"Port Enabled/Disabled: %s"</div><div class='add'>+		"Port Enabled/Disabled: %s "</div><div class='ctx'> 		"Current Connect Status: %s\n\n", ( {</div><div class='ctx'> 			char *s;</div><div class='ctx'> 			switch (tmp_reg &amp; PORTSCX_PTS_FSLS) {</div><div class='hunk'>@@ -2023,7 +1999,7 @@ static int fsl_proc_read(char *page, char **start, off_t off, int count,</div><div class='ctx'> </div><div class='ctx'> 	tmp_reg = fsl_readl(&amp;dr_regs-&gt;usbmode);</div><div class='ctx'> 	t = scnprintf(next, size,</div><div class='del'>-			"USB Mode Reg:" "Controller Mode is : %s\n\n", ( {</div><div class='add'>+			"USB Mode Reg: Controller Mode is: %s\n\n", ( {</div><div class='ctx'> 				char *s;</div><div class='ctx'> 				switch (tmp_reg &amp; USB_MODE_CTRL_MODE_HOST) {</div><div class='ctx'> 				case USB_MODE_CTRL_MODE_IDLE:</div><div class='hunk'>@@ -2042,7 +2018,7 @@ static int fsl_proc_read(char *page, char **start, off_t off, int count,</div><div class='ctx'> </div><div class='ctx'> 	tmp_reg = fsl_readl(&amp;dr_regs-&gt;endptsetupstat);</div><div class='ctx'> 	t = scnprintf(next, size,</div><div class='del'>-			"Endpoint Setup Status Reg:" "SETUP on ep 0x%x\n\n",</div><div class='add'>+			"Endpoint Setup Status Reg: SETUP on ep 0x%x\n\n",</div><div class='ctx'> 			(tmp_reg &amp; EP_SETUP_STATUS_MASK));</div><div class='ctx'> 	size -= t;</div><div class='ctx'> 	next += t;</div><div class='hunk'>@@ -2055,12 +2031,12 @@ static int fsl_proc_read(char *page, char **start, off_t off, int count,</div><div class='ctx'> 		next += t;</div><div class='ctx'> 	}</div><div class='ctx'> 	tmp_reg = fsl_readl(&amp;dr_regs-&gt;endpointprime);</div><div class='del'>-	t = scnprintf(next, size, "EP Prime Reg = [0x%x]\n", tmp_reg);</div><div class='add'>+	t = scnprintf(next, size, "EP Prime Reg = [0x%x]\n\n", tmp_reg);</div><div class='ctx'> 	size -= t;</div><div class='ctx'> 	next += t;</div><div class='ctx'> </div><div class='ctx'> 	tmp_reg = usb_sys_regs-&gt;snoop1;</div><div class='del'>-	t = scnprintf(next, size, "\nSnoop1 Reg : = [0x%x]\n\n", tmp_reg);</div><div class='add'>+	t = scnprintf(next, size, "Snoop1 Reg : = [0x%x]\n\n", tmp_reg);</div><div class='ctx'> 	size -= t;</div><div class='ctx'> 	next += t;</div><div class='ctx'> </div><div class='hunk'>@@ -2084,7 +2060,7 @@ static int fsl_proc_read(char *page, char **start, off_t off, int count,</div><div class='ctx'> 	} else {</div><div class='ctx'> 		list_for_each_entry(req, &amp;ep-&gt;queue, queue) {</div><div class='ctx'> 			t = scnprintf(next, size,</div><div class='del'>-				"req %p actual 0x%x length 0x%x  buf %p\n",</div><div class='add'>+				"req %p actual 0x%x length 0x%x buf %p\n",</div><div class='ctx'> 				&amp;req-&gt;req, req-&gt;req.actual,</div><div class='ctx'> 				req-&gt;req.length, req-&gt;req.buf);</div><div class='ctx'> 			size -= t;</div><div class='hunk'>@@ -2110,7 +2086,7 @@ static int fsl_proc_read(char *page, char **start, off_t off, int count,</div><div class='ctx'> 			} else {</div><div class='ctx'> 				list_for_each_entry(req, &amp;ep-&gt;queue, queue) {</div><div class='ctx'> 					t = scnprintf(next, size,</div><div class='del'>-						"req %p actual 0x%x length"</div><div class='add'>+						"req %p actual 0x%x length "</div><div class='ctx'> 						"0x%x  buf %p\n",</div><div class='ctx'> 						&amp;req-&gt;req, req-&gt;req.actual,</div><div class='ctx'> 						req-&gt;req.length, req-&gt;req.buf);</div><div class='hunk'>@@ -2202,7 +2178,6 @@ static int __init struct_udc_setup(struct fsl_udc *udc,</div><div class='ctx'> 	udc-&gt;usb_state = USB_STATE_POWERED;</div><div class='ctx'> 	udc-&gt;ep0_dir = 0;</div><div class='ctx'> 	udc-&gt;remote_wakeup = 0;	/* default to 0 on reset */</div><div class='del'>-	spin_lock_init(&amp;udc-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -2254,7 +2229,7 @@ static int __init fsl_udc_probe(struct platform_device *pdev)</div><div class='ctx'> 	u32 dccparams;</div><div class='ctx'> </div><div class='ctx'> 	if (strcmp(pdev-&gt;name, driver_name)) {</div><div class='del'>-		VDBG("Wrong device\n");</div><div class='add'>+		VDBG("Wrong device");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2264,23 +2239,26 @@ static int __init fsl_udc_probe(struct platform_device *pdev)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	spin_lock_init(&amp;udc_controller-&gt;lock);</div><div class='add'>+	udc_controller-&gt;stopped = 1;</div><div class='add'>+</div><div class='ctx'> 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='ctx'> 	if (!res) {</div><div class='del'>-		kfree(udc_controller);</div><div class='del'>-		return -ENXIO;</div><div class='add'>+		ret = -ENXIO;</div><div class='add'>+		goto err_kfree;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!request_mem_region(res-&gt;start, res-&gt;end - res-&gt;start + 1,</div><div class='ctx'> 				driver_name)) {</div><div class='del'>-		ERR("request mem region for %s failed \n", pdev-&gt;name);</div><div class='del'>-		kfree(udc_controller);</div><div class='del'>-		return -EBUSY;</div><div class='add'>+		ERR("request mem region for %s failed\n", pdev-&gt;name);</div><div class='add'>+		ret = -EBUSY;</div><div class='add'>+		goto err_kfree;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dr_regs = ioremap(res-&gt;start, res-&gt;end - res-&gt;start + 1);</div><div class='ctx'> 	if (!dr_regs) {</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='del'>-		goto err1;</div><div class='add'>+		goto err_release_mem_region;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	usb_sys_regs = (struct usb_sys_interface *)</div><div class='hunk'>@@ -2291,7 +2269,7 @@ static int __init fsl_udc_probe(struct platform_device *pdev)</div><div class='ctx'> 	if (!(dccparams &amp; DCCPARAMS_DC)) {</div><div class='ctx'> 		ERR("This SOC doesn't support device role\n");</div><div class='ctx'> 		ret = -ENODEV;</div><div class='del'>-		goto err2;</div><div class='add'>+		goto err_iounmap;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Get max device endpoints */</div><div class='ctx'> 	/* DEN is bidirectional ep number, max_ep doubles the number */</div><div class='hunk'>@@ -2300,22 +2278,22 @@ static int __init fsl_udc_probe(struct platform_device *pdev)</div><div class='ctx'> 	udc_controller-&gt;irq = platform_get_irq(pdev, 0);</div><div class='ctx'> 	if (!udc_controller-&gt;irq) {</div><div class='ctx'> 		ret = -ENODEV;</div><div class='del'>-		goto err2;</div><div class='add'>+		goto err_iounmap;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = request_irq(udc_controller-&gt;irq, fsl_udc_irq, IRQF_SHARED,</div><div class='ctx'> 			driver_name, udc_controller);</div><div class='ctx'> 	if (ret != 0) {</div><div class='del'>-		ERR("cannot request irq %d err %d \n",</div><div class='add'>+		ERR("cannot request irq %d err %d\n",</div><div class='ctx'> 				udc_controller-&gt;irq, ret);</div><div class='del'>-		goto err2;</div><div class='add'>+		goto err_iounmap;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize the udc structure including QH member and other member */</div><div class='ctx'> 	if (struct_udc_setup(udc_controller, pdev)) {</div><div class='ctx'> 		ERR("Can't initialize udc data structure\n");</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='del'>-		goto err3;</div><div class='add'>+		goto err_free_irq;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* initialize usb hw reg except for regs for EP,</div><div class='hunk'>@@ -2336,7 +2314,7 @@ static int __init fsl_udc_probe(struct platform_device *pdev)</div><div class='ctx'> 	udc_controller-&gt;gadget.dev.parent = &amp;pdev-&gt;dev;</div><div class='ctx'> 	ret = device_register(&amp;udc_controller-&gt;gadget.dev);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto err3;</div><div class='add'>+		goto err_free_irq;</div><div class='ctx'> </div><div class='ctx'> 	/* setup QH and epctrl for ep0 */</div><div class='ctx'> 	ep0_setup(udc_controller);</div><div class='hunk'>@@ -2366,20 +2344,22 @@ static int __init fsl_udc_probe(struct platform_device *pdev)</div><div class='ctx'> 			DTD_ALIGNMENT, UDC_DMA_BOUNDARY);</div><div class='ctx'> 	if (udc_controller-&gt;td_pool == NULL) {</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='del'>-		goto err4;</div><div class='add'>+		goto err_unregister;</div><div class='ctx'> 	}</div><div class='ctx'> 	create_proc_file();</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>-err4:</div><div class='add'>+err_unregister:</div><div class='ctx'> 	device_unregister(&amp;udc_controller-&gt;gadget.dev);</div><div class='del'>-err3:</div><div class='add'>+err_free_irq:</div><div class='ctx'> 	free_irq(udc_controller-&gt;irq, udc_controller);</div><div class='del'>-err2:</div><div class='add'>+err_iounmap:</div><div class='ctx'> 	iounmap(dr_regs);</div><div class='del'>-err1:</div><div class='add'>+err_release_mem_region:</div><div class='ctx'> 	release_mem_region(res-&gt;start, res-&gt;end - res-&gt;start + 1);</div><div class='add'>+err_kfree:</div><div class='ctx'> 	kfree(udc_controller);</div><div class='add'>+	udc_controller = NULL;</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2469,7 +2449,7 @@ module_init(udc_init);</div><div class='ctx'> static void __exit udc_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	platform_driver_unregister(&amp;udc_driver);</div><div class='del'>-	printk("%s unregistered \n", driver_desc);</div><div class='add'>+	printk("%s unregistered\n", driver_desc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_exit(udc_exit);</div><div class='head'>diff --git a/drivers/usb/gadget/fsl_usb2_udc.h b/drivers/usb/gadget/fsl_usb2_udc.h<br/>index 6131752a38bc..e63ef12645f5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/gadget/fsl_usb2_udc.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/gadget/fsl_usb2_udc.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/gadget/fsl_usb2_udc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/gadget/fsl_usb2_udc.h</a></div><div class='hunk'>@@ -424,16 +424,6 @@ struct ep_td_struct {</div><div class='ctx'> /* Controller dma boundary */</div><div class='ctx'> #define UDC_DMA_BOUNDARY			0x1000</div><div class='ctx'> </div><div class='del'>-/* -----------------------------------------------------------------------*/</div><div class='del'>-/* ##### enum data</div><div class='del'>-*/</div><div class='del'>-typedef enum {</div><div class='del'>-	e_ULPI,</div><div class='del'>-	e_UTMI_8BIT,</div><div class='del'>-	e_UTMI_16BIT,</div><div class='del'>-	e_SERIAL</div><div class='del'>-} e_PhyInterface;</div><div class='del'>-</div><div class='ctx'> /*-------------------------------------------------------------------------*/</div><div class='ctx'> </div><div class='ctx'> /* ### driver private data</div><div class='hunk'>@@ -469,9 +459,9 @@ struct fsl_ep {</div><div class='ctx'> #define EP_DIR_OUT	0</div><div class='ctx'> </div><div class='ctx'> struct fsl_udc {</div><div class='del'>-</div><div class='ctx'> 	struct usb_gadget gadget;</div><div class='ctx'> 	struct usb_gadget_driver *driver;</div><div class='add'>+	struct completion *done;	/* to make sure release() is done */</div><div class='ctx'> 	struct fsl_ep *eps;</div><div class='ctx'> 	unsigned int max_ep;</div><div class='ctx'> 	unsigned int irq;</div><div class='hunk'>@@ -492,20 +482,13 @@ struct fsl_udc {</div><div class='ctx'> 	size_t ep_qh_size;		/* size after alignment adjustment*/</div><div class='ctx'> 	dma_addr_t ep_qh_dma;		/* dma address of QH */</div><div class='ctx'> </div><div class='del'>-	u32 max_pipes;		/* Device max pipes */</div><div class='del'>-	u32 max_use_endpts;	/* Max endpointes to be used */</div><div class='del'>-	u32 bus_reset;		/* Device is bus reseting */</div><div class='add'>+	u32 max_pipes;          /* Device max pipes */</div><div class='ctx'> 	u32 resume_state;	/* USB state to resume */</div><div class='ctx'> 	u32 usb_state;		/* USB current state */</div><div class='del'>-	u32 usb_next_state;	/* USB next state */</div><div class='ctx'> 	u32 ep0_state;		/* Endpoint zero state */</div><div class='ctx'> 	u32 ep0_dir;		/* Endpoint zero direction: can be</div><div class='ctx'> 				   USB_DIR_IN or USB_DIR_OUT */</div><div class='del'>-	u32 usb_sof_count;	/* SOF count */</div><div class='del'>-	u32 errors;		/* USB ERRORs count */</div><div class='ctx'> 	u8 device_address;	/* Device USB address */</div><div class='del'>-</div><div class='del'>-	struct completion *done;	/* to make sure release() is done */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*-------------------------------------------------------------------------*/</div><div class='head'>diff --git a/drivers/usb/gadget/gadget_chips.h b/drivers/usb/gadget/gadget_chips.h<br/>index 17d9905101b7..4e3107dd2f34 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/gadget/gadget_chips.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/gadget/gadget_chips.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/gadget/gadget_chips.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/gadget/gadget_chips.h</a></div><div class='hunk'>@@ -151,6 +151,13 @@</div><div class='ctx'> #define	gadget_is_m66592(g)	0</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+/* Freescale CPM/QE UDC SUPPORT */</div><div class='add'>+#ifdef CONFIG_USB_GADGET_FSL_QE</div><div class='add'>+#define gadget_is_fsl_qe(g)	!strcmp("fsl_qe_udc", (g)-&gt;name)</div><div class='add'>+#else</div><div class='add'>+#define gadget_is_fsl_qe(g)	0</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> // CONFIG_USB_GADGET_SX2</div><div class='ctx'> // CONFIG_USB_GADGET_AU1X00</div><div class='hunk'>@@ -216,6 +223,8 @@ static inline int usb_gadget_controller_number(struct usb_gadget *gadget)</div><div class='ctx'> 		return 0x20;</div><div class='ctx'> 	else if (gadget_is_m66592(gadget))</div><div class='ctx'> 		return 0x21;</div><div class='add'>+	else if (gadget_is_fsl_qe(gadget))</div><div class='add'>+		return 0x22;</div><div class='ctx'> 	return -ENOENT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/usb/gadget/gmidi.c b/drivers/usb/gadget/gmidi.c<br/>index ea8651e3da1a..60d3f9e9b51f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/gadget/gmidi.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/gadget/gmidi.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/gadget/gmidi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/gadget/gmidi.c</a></div><div class='hunk'>@@ -35,6 +35,21 @@</div><div class='ctx'> </div><div class='ctx'> #include "gadget_chips.h"</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Kbuild is not very cooperative with respect to linking separately</div><div class='add'>+ * compiled library objects into one module.  So for now we won't use</div><div class='add'>+ * separate compilation ... ensuring init/exit sections work to shrink</div><div class='add'>+ * the runtime footprint, and giving us at least some parts of what</div><div class='add'>+ * a "gcc --combine ... part1.c part2.c part3.c ... " build would.</div><div class='add'>+ */</div><div class='add'>+#include "usbstring.c"</div><div class='add'>+#include "config.c"</div><div class='add'>+#include "epautoconf.c"</div><div class='add'>+</div><div class='add'>+/*-------------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> MODULE_AUTHOR("Ben Williamson");</div><div class='ctx'> MODULE_LICENSE("GPL v2");</div><div class='ctx'> </div><div class='hunk'>@@ -207,7 +222,7 @@ static struct usb_config_descriptor config_desc = {</div><div class='ctx'> 	 * power properties of the device. Is it selfpowered?</div><div class='ctx'> 	 */</div><div class='ctx'> 	.bmAttributes =		USB_CONFIG_ATT_ONE,</div><div class='del'>-	.bMaxPower =		1,</div><div class='add'>+	.bMaxPower =		CONFIG_USB_GADGET_VBUS_DRAW / 2,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* B.3.1  Standard AC Interface Descriptor */</div><div class='head'>diff --git a/drivers/usb/gadget/net2280.c b/drivers/usb/gadget/net2280.c<br/>index 5cfb5ebf3881..8ae70de2c37d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/gadget/net2280.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/gadget/net2280.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/gadget/net2280.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/gadget/net2280.c</a></div><div class='hunk'>@@ -178,6 +178,7 @@ net2280_enable (struct usb_ep *_ep, const struct usb_endpoint_descriptor *desc)</div><div class='ctx'> </div><div class='ctx'> 	/* ep_reset() has already been called */</div><div class='ctx'> 	ep-&gt;stopped = 0;</div><div class='add'>+	ep-&gt;wedged = 0;</div><div class='ctx'> 	ep-&gt;out_overflow = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* set speed-dependent max packet; may kick in high bandwidth */</div><div class='hunk'>@@ -1218,7 +1219,7 @@ static int net2280_dequeue (struct usb_ep *_ep, struct usb_request *_req)</div><div class='ctx'> static int net2280_fifo_status (struct usb_ep *_ep);</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-net2280_set_halt (struct usb_ep *_ep, int value)</div><div class='add'>+net2280_set_halt_and_wedge(struct usb_ep *_ep, int value, int wedged)</div><div class='ctx'> {</div><div class='ctx'> 	struct net2280_ep	*ep;</div><div class='ctx'> 	unsigned long		flags;</div><div class='hunk'>@@ -1239,16 +1240,21 @@ net2280_set_halt (struct usb_ep *_ep, int value)</div><div class='ctx'> 	else if (ep-&gt;is_in &amp;&amp; value &amp;&amp; net2280_fifo_status (_ep) != 0)</div><div class='ctx'> 		retval = -EAGAIN;</div><div class='ctx'> 	else {</div><div class='del'>-		VDEBUG (ep-&gt;dev, "%s %s halt\n", _ep-&gt;name,</div><div class='del'>-				value ? "set" : "clear");</div><div class='add'>+		VDEBUG (ep-&gt;dev, "%s %s %s\n", _ep-&gt;name,</div><div class='add'>+				value ? "set" : "clear",</div><div class='add'>+				wedged ? "wedge" : "halt");</div><div class='ctx'> 		/* set/clear, then synch memory views with the device */</div><div class='ctx'> 		if (value) {</div><div class='ctx'> 			if (ep-&gt;num == 0)</div><div class='ctx'> 				ep-&gt;dev-&gt;protocol_stall = 1;</div><div class='ctx'> 			else</div><div class='ctx'> 				set_halt (ep);</div><div class='del'>-		} else</div><div class='add'>+			if (wedged)</div><div class='add'>+				ep-&gt;wedged = 1;</div><div class='add'>+		} else {</div><div class='ctx'> 			clear_halt (ep);</div><div class='add'>+			ep-&gt;wedged = 0;</div><div class='add'>+		}</div><div class='ctx'> 		(void) readl (&amp;ep-&gt;regs-&gt;ep_rsp);</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_irqrestore (&amp;ep-&gt;dev-&gt;lock, flags);</div><div class='hunk'>@@ -1257,6 +1263,20 @@ net2280_set_halt (struct usb_ep *_ep, int value)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='add'>+net2280_set_halt(struct usb_ep *_ep, int value)</div><div class='add'>+{</div><div class='add'>+	return net2280_set_halt_and_wedge(_ep, value, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+net2280_set_wedge(struct usb_ep *_ep)</div><div class='add'>+{</div><div class='add'>+	if (!_ep || _ep-&gt;name == ep0name)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	return net2280_set_halt_and_wedge(_ep, 1, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='ctx'> net2280_fifo_status (struct usb_ep *_ep)</div><div class='ctx'> {</div><div class='ctx'> 	struct net2280_ep	*ep;</div><div class='hunk'>@@ -1302,6 +1322,7 @@ static const struct usb_ep_ops net2280_ep_ops = {</div><div class='ctx'> 	.dequeue	= net2280_dequeue,</div><div class='ctx'> </div><div class='ctx'> 	.set_halt	= net2280_set_halt,</div><div class='add'>+	.set_wedge	= net2280_set_wedge,</div><div class='ctx'> 	.fifo_status	= net2280_fifo_status,</div><div class='ctx'> 	.fifo_flush	= net2280_fifo_flush,</div><div class='ctx'> };</div><div class='hunk'>@@ -2410,9 +2431,14 @@ static void handle_stat0_irqs (struct net2280 *dev, u32 stat)</div><div class='ctx'> 				goto do_stall;</div><div class='ctx'> 			if ((e = get_ep_by_addr (dev, w_index)) == 0)</div><div class='ctx'> 				goto do_stall;</div><div class='del'>-			clear_halt (e);</div><div class='add'>+			if (e-&gt;wedged) {</div><div class='add'>+				VDEBUG(dev, "%s wedged, halt not cleared\n",</div><div class='add'>+						ep-&gt;ep.name);</div><div class='add'>+			} else {</div><div class='add'>+				VDEBUG(dev, "%s clear halt\n", ep-&gt;ep.name);</div><div class='add'>+				clear_halt(e);</div><div class='add'>+			}</div><div class='ctx'> 			allow_status (ep);</div><div class='del'>-			VDEBUG (dev, "%s clear halt\n", ep-&gt;ep.name);</div><div class='ctx'> 			goto next_endpoints;</div><div class='ctx'> 			}</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -2427,6 +2453,8 @@ static void handle_stat0_irqs (struct net2280 *dev, u32 stat)</div><div class='ctx'> 				goto do_stall;</div><div class='ctx'> 			if ((e = get_ep_by_addr (dev, w_index)) == 0)</div><div class='ctx'> 				goto do_stall;</div><div class='add'>+			if (e-&gt;ep.name == ep0name)</div><div class='add'>+				goto do_stall;</div><div class='ctx'> 			set_halt (e);</div><div class='ctx'> 			allow_status (ep);</div><div class='ctx'> 			VDEBUG (dev, "%s set halt\n", ep-&gt;ep.name);</div><div class='head'>diff --git a/drivers/usb/gadget/net2280.h b/drivers/usb/gadget/net2280.h<br/>index 81a71dbdc2c6..c36852263d93 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/gadget/net2280.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/gadget/net2280.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/gadget/net2280.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/gadget/net2280.h</a></div><div class='hunk'>@@ -109,6 +109,7 @@ struct net2280_ep {</div><div class='ctx'> 						in_fifo_validate : 1,</div><div class='ctx'> 						out_overflow : 1,</div><div class='ctx'> 						stopped : 1,</div><div class='add'>+						wedged : 1,</div><div class='ctx'> 						is_in : 1,</div><div class='ctx'> 						is_iso : 1,</div><div class='ctx'> 						responded : 1;</div><div class='head'>diff --git a/drivers/usb/gadget/omap_udc.c b/drivers/usb/gadget/omap_udc.c<br/>index bb54cca4c543..34e9e393f929 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/gadget/omap_udc.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/gadget/omap_udc.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/gadget/omap_udc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/gadget/omap_udc.c</a></div><div class='hunk'>@@ -2313,6 +2313,13 @@ static int proc_otg_show(struct seq_file *s)</div><div class='ctx'> </div><div class='ctx'> 	tmp = omap_readl(OTG_REV);</div><div class='ctx'> 	if (cpu_is_omap24xx()) {</div><div class='add'>+		/*</div><div class='add'>+		 * REVISIT: Not clear how this works on OMAP2.  trans</div><div class='add'>+		 * is ANDed to produce bits 7 and 8, which might make</div><div class='add'>+		 * sense for USB_TRANSCEIVER_CTRL on OMAP1,</div><div class='add'>+		 * but with CONTROL_DEVCONF, these bits have something to</div><div class='add'>+		 * do with the frame adjustment counter and McBSP2.</div><div class='add'>+		 */</div><div class='ctx'> 		ctrl_name = "control_devconf";</div><div class='ctx'> 		trans = omap_ctrl_readl(OMAP2_CONTROL_DEVCONF0);</div><div class='ctx'> 	} else {</div><div class='head'>diff --git a/drivers/usb/gadget/printer.c b/drivers/usb/gadget/printer.c<br/>index e0090085b78e..5a3034fdfe47 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/gadget/printer.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/gadget/printer.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/gadget/printer.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/gadget/printer.c</a></div><div class='hunk'>@@ -53,6 +53,20 @@</div><div class='ctx'> </div><div class='ctx'> #include "gadget_chips.h"</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Kbuild is not very cooperative with respect to linking separately</div><div class='add'>+ * compiled library objects into one module.  So for now we won't use</div><div class='add'>+ * separate compilation ... ensuring init/exit sections work to shrink</div><div class='add'>+ * the runtime footprint, and giving us at least some parts of what</div><div class='add'>+ * a "gcc --combine ... part1.c part2.c part3.c ... " build would.</div><div class='add'>+ */</div><div class='add'>+#include "usbstring.c"</div><div class='add'>+#include "config.c"</div><div class='add'>+#include "epautoconf.c"</div><div class='add'>+</div><div class='add'>+/*-------------------------------------------------------------------------*/</div><div class='add'>+</div><div class='ctx'> #define DRIVER_DESC		"Printer Gadget"</div><div class='ctx'> #define DRIVER_VERSION		"2007 OCT 06"</div><div class='ctx'> </div><div class='hunk'>@@ -238,7 +252,7 @@ static struct usb_config_descriptor config_desc = {</div><div class='ctx'> 	.bConfigurationValue =	DEV_CONFIG_VALUE,</div><div class='ctx'> 	.iConfiguration =	0,</div><div class='ctx'> 	.bmAttributes =		USB_CONFIG_ATT_ONE | USB_CONFIG_ATT_SELFPOWER,</div><div class='del'>-	.bMaxPower =		1	/* Self-Powered */</div><div class='add'>+	.bMaxPower =		CONFIG_USB_GADGET_VBUS_DRAW / 2,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct usb_interface_descriptor intf_desc = {</div><div class='hunk'>@@ -1264,8 +1278,7 @@ unknown:</div><div class='ctx'> 	/* respond with data transfer before status phase? */</div><div class='ctx'> 	if (value &gt;= 0) {</div><div class='ctx'> 		req-&gt;length = value;</div><div class='del'>-		req-&gt;zero = value &lt; wLength</div><div class='del'>-				&amp;&amp; (value % gadget-&gt;ep0-&gt;maxpacket) == 0;</div><div class='add'>+		req-&gt;zero = value &lt; wLength;</div><div class='ctx'> 		value = usb_ep_queue(gadget-&gt;ep0, req, GFP_ATOMIC);</div><div class='ctx'> 		if (value &lt; 0) {</div><div class='ctx'> 			DBG(dev, "ep_queue --&gt; %d\n", value);</div><div class='hunk'>@@ -1360,8 +1373,8 @@ printer_bind(struct usb_gadget *gadget)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 	/* Setup the sysfs files for the printer gadget. */</div><div class='del'>-	dev-&gt;pdev = device_create_drvdata(usb_gadget_class, NULL,</div><div class='del'>-					  g_printer_devno, NULL, "g_printer");</div><div class='add'>+	dev-&gt;pdev = device_create(usb_gadget_class, NULL, g_printer_devno,</div><div class='add'>+				  NULL, "g_printer");</div><div class='ctx'> 	if (IS_ERR(dev-&gt;pdev)) {</div><div class='ctx'> 		ERROR(dev, "Failed to create device: g_printer\n");</div><div class='ctx'> 		goto fail;</div><div class='hunk'>@@ -1463,7 +1476,6 @@ autoconf_fail:</div><div class='ctx'> 	if (gadget-&gt;is_otg) {</div><div class='ctx'> 		otg_desc.bmAttributes |= USB_OTG_HNP,</div><div class='ctx'> 		config_desc.bmAttributes |= USB_CONFIG_ATT_WAKEUP;</div><div class='del'>-		config_desc.bMaxPower = 4;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;dev-&gt;lock);</div><div class='head'>diff --git a/drivers/usb/gadget/pxa27x_udc.c b/drivers/usb/gadget/pxa27x_udc.c<br/>index 7cbc78a6853d..bcf375ca3d72 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/gadget/pxa27x_udc.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/gadget/pxa27x_udc.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/gadget/pxa27x_udc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/gadget/pxa27x_udc.c</a></div><div class='hunk'>@@ -22,7 +22,6 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='head'>diff --git a/drivers/usb/gadget/rndis.c b/drivers/usb/gadget/rndis.c<br/>index 7228e8562236..8c26f5ea2b83 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/gadget/rndis.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/gadget/rndis.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/gadget/rndis.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/gadget/rndis.c</a></div><div class='hunk'>@@ -57,11 +57,6 @@ MODULE_PARM_DESC (rndis_debug, "enable debugging");</div><div class='ctx'> #define rndis_debug		0</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#define DBG(str,args...) do { \</div><div class='del'>-	if (rndis_debug) \</div><div class='del'>-		pr_debug(str , ## args); \</div><div class='del'>-	} while (0)</div><div class='del'>-</div><div class='ctx'> #define RNDIS_MAX_CONFIGS	1</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -183,9 +178,9 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,</div><div class='ctx'> 	if (!resp) return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	if (buf_len &amp;&amp; rndis_debug &gt; 1) {</div><div class='del'>-		DBG("query OID %08x value, len %d:\n", OID, buf_len);</div><div class='add'>+		pr_debug("query OID %08x value, len %d:\n", OID, buf_len);</div><div class='ctx'> 		for (i = 0; i &lt; buf_len; i += 16) {</div><div class='del'>-			DBG("%03d: %08x %08x %08x %08x\n", i,</div><div class='add'>+			pr_debug("%03d: %08x %08x %08x %08x\n", i,</div><div class='ctx'> 				get_unaligned_le32(&amp;buf[i]),</div><div class='ctx'> 				get_unaligned_le32(&amp;buf[i + 4]),</div><div class='ctx'> 				get_unaligned_le32(&amp;buf[i + 8]),</div><div class='hunk'>@@ -209,7 +204,7 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,</div><div class='ctx'> </div><div class='ctx'> 	/* mandatory */</div><div class='ctx'> 	case OID_GEN_SUPPORTED_LIST:</div><div class='del'>-		DBG("%s: OID_GEN_SUPPORTED_LIST\n", __func__);</div><div class='add'>+		pr_debug("%s: OID_GEN_SUPPORTED_LIST\n", __func__);</div><div class='ctx'> 		length = sizeof (oid_supported_list);</div><div class='ctx'> 		count  = length / sizeof (u32);</div><div class='ctx'> 		for (i = 0; i &lt; count; i++)</div><div class='hunk'>@@ -219,7 +214,7 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,</div><div class='ctx'> </div><div class='ctx'> 	/* mandatory */</div><div class='ctx'> 	case OID_GEN_HARDWARE_STATUS:</div><div class='del'>-		DBG("%s: OID_GEN_HARDWARE_STATUS\n", __func__);</div><div class='add'>+		pr_debug("%s: OID_GEN_HARDWARE_STATUS\n", __func__);</div><div class='ctx'> 		/* Bogus question!</div><div class='ctx'> 		 * Hardware must be ready to receive high level protocols.</div><div class='ctx'> 		 * BTW:</div><div class='hunk'>@@ -232,14 +227,14 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,</div><div class='ctx'> </div><div class='ctx'> 	/* mandatory */</div><div class='ctx'> 	case OID_GEN_MEDIA_SUPPORTED:</div><div class='del'>-		DBG("%s: OID_GEN_MEDIA_SUPPORTED\n", __func__);</div><div class='add'>+		pr_debug("%s: OID_GEN_MEDIA_SUPPORTED\n", __func__);</div><div class='ctx'> 		*outbuf = cpu_to_le32 (rndis_per_dev_params [configNr].medium);</div><div class='ctx'> 		retval = 0;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	/* mandatory */</div><div class='ctx'> 	case OID_GEN_MEDIA_IN_USE:</div><div class='del'>-		DBG("%s: OID_GEN_MEDIA_IN_USE\n", __func__);</div><div class='add'>+		pr_debug("%s: OID_GEN_MEDIA_IN_USE\n", __func__);</div><div class='ctx'> 		/* one medium, one transport... (maybe you do it better) */</div><div class='ctx'> 		*outbuf = cpu_to_le32 (rndis_per_dev_params [configNr].medium);</div><div class='ctx'> 		retval = 0;</div><div class='hunk'>@@ -247,7 +242,7 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,</div><div class='ctx'> </div><div class='ctx'> 	/* mandatory */</div><div class='ctx'> 	case OID_GEN_MAXIMUM_FRAME_SIZE:</div><div class='del'>-		DBG("%s: OID_GEN_MAXIMUM_FRAME_SIZE\n", __func__);</div><div class='add'>+		pr_debug("%s: OID_GEN_MAXIMUM_FRAME_SIZE\n", __func__);</div><div class='ctx'> 		if (rndis_per_dev_params [configNr].dev) {</div><div class='ctx'> 			*outbuf = cpu_to_le32 (</div><div class='ctx'> 				rndis_per_dev_params [configNr].dev-&gt;mtu);</div><div class='hunk'>@@ -258,7 +253,7 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,</div><div class='ctx'> 	/* mandatory */</div><div class='ctx'> 	case OID_GEN_LINK_SPEED:</div><div class='ctx'> 		if (rndis_debug &gt; 1)</div><div class='del'>-			DBG("%s: OID_GEN_LINK_SPEED\n", __func__);</div><div class='add'>+			pr_debug("%s: OID_GEN_LINK_SPEED\n", __func__);</div><div class='ctx'> 		if (rndis_per_dev_params [configNr].media_state</div><div class='ctx'> 				== NDIS_MEDIA_STATE_DISCONNECTED)</div><div class='ctx'> 			*outbuf = __constant_cpu_to_le32 (0);</div><div class='hunk'>@@ -270,7 +265,7 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,</div><div class='ctx'> </div><div class='ctx'> 	/* mandatory */</div><div class='ctx'> 	case OID_GEN_TRANSMIT_BLOCK_SIZE:</div><div class='del'>-		DBG("%s: OID_GEN_TRANSMIT_BLOCK_SIZE\n", __func__);</div><div class='add'>+		pr_debug("%s: OID_GEN_TRANSMIT_BLOCK_SIZE\n", __func__);</div><div class='ctx'> 		if (rndis_per_dev_params [configNr].dev) {</div><div class='ctx'> 			*outbuf = cpu_to_le32 (</div><div class='ctx'> 				rndis_per_dev_params [configNr].dev-&gt;mtu);</div><div class='hunk'>@@ -280,7 +275,7 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,</div><div class='ctx'> </div><div class='ctx'> 	/* mandatory */</div><div class='ctx'> 	case OID_GEN_RECEIVE_BLOCK_SIZE:</div><div class='del'>-		DBG("%s: OID_GEN_RECEIVE_BLOCK_SIZE\n", __func__);</div><div class='add'>+		pr_debug("%s: OID_GEN_RECEIVE_BLOCK_SIZE\n", __func__);</div><div class='ctx'> 		if (rndis_per_dev_params [configNr].dev) {</div><div class='ctx'> 			*outbuf = cpu_to_le32 (</div><div class='ctx'> 				rndis_per_dev_params [configNr].dev-&gt;mtu);</div><div class='hunk'>@@ -290,7 +285,7 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,</div><div class='ctx'> </div><div class='ctx'> 	/* mandatory */</div><div class='ctx'> 	case OID_GEN_VENDOR_ID:</div><div class='del'>-		DBG("%s: OID_GEN_VENDOR_ID\n", __func__);</div><div class='add'>+		pr_debug("%s: OID_GEN_VENDOR_ID\n", __func__);</div><div class='ctx'> 		*outbuf = cpu_to_le32 (</div><div class='ctx'> 			rndis_per_dev_params [configNr].vendorID);</div><div class='ctx'> 		retval = 0;</div><div class='hunk'>@@ -298,7 +293,7 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,</div><div class='ctx'> </div><div class='ctx'> 	/* mandatory */</div><div class='ctx'> 	case OID_GEN_VENDOR_DESCRIPTION:</div><div class='del'>-		DBG("%s: OID_GEN_VENDOR_DESCRIPTION\n", __func__);</div><div class='add'>+		pr_debug("%s: OID_GEN_VENDOR_DESCRIPTION\n", __func__);</div><div class='ctx'> 		length = strlen (rndis_per_dev_params [configNr].vendorDescr);</div><div class='ctx'> 		memcpy (outbuf,</div><div class='ctx'> 			rndis_per_dev_params [configNr].vendorDescr, length);</div><div class='hunk'>@@ -306,7 +301,7 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case OID_GEN_VENDOR_DRIVER_VERSION:</div><div class='del'>-		DBG("%s: OID_GEN_VENDOR_DRIVER_VERSION\n", __func__);</div><div class='add'>+		pr_debug("%s: OID_GEN_VENDOR_DRIVER_VERSION\n", __func__);</div><div class='ctx'> 		/* Created as LE */</div><div class='ctx'> 		*outbuf = rndis_driver_version;</div><div class='ctx'> 		retval = 0;</div><div class='hunk'>@@ -314,14 +309,14 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,</div><div class='ctx'> </div><div class='ctx'> 	/* mandatory */</div><div class='ctx'> 	case OID_GEN_CURRENT_PACKET_FILTER:</div><div class='del'>-		DBG("%s: OID_GEN_CURRENT_PACKET_FILTER\n", __func__);</div><div class='add'>+		pr_debug("%s: OID_GEN_CURRENT_PACKET_FILTER\n", __func__);</div><div class='ctx'> 		*outbuf = cpu_to_le32 (*rndis_per_dev_params[configNr].filter);</div><div class='ctx'> 		retval = 0;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	/* mandatory */</div><div class='ctx'> 	case OID_GEN_MAXIMUM_TOTAL_SIZE:</div><div class='del'>-		DBG("%s: OID_GEN_MAXIMUM_TOTAL_SIZE\n", __func__);</div><div class='add'>+		pr_debug("%s: OID_GEN_MAXIMUM_TOTAL_SIZE\n", __func__);</div><div class='ctx'> 		*outbuf = __constant_cpu_to_le32(RNDIS_MAX_TOTAL_SIZE);</div><div class='ctx'> 		retval = 0;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -329,14 +324,14 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,</div><div class='ctx'> 	/* mandatory */</div><div class='ctx'> 	case OID_GEN_MEDIA_CONNECT_STATUS:</div><div class='ctx'> 		if (rndis_debug &gt; 1)</div><div class='del'>-			DBG("%s: OID_GEN_MEDIA_CONNECT_STATUS\n", __func__);</div><div class='add'>+			pr_debug("%s: OID_GEN_MEDIA_CONNECT_STATUS\n", __func__);</div><div class='ctx'> 		*outbuf = cpu_to_le32 (rndis_per_dev_params [configNr]</div><div class='ctx'> 						.media_state);</div><div class='ctx'> 		retval = 0;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case OID_GEN_PHYSICAL_MEDIUM:</div><div class='del'>-		DBG("%s: OID_GEN_PHYSICAL_MEDIUM\n", __func__);</div><div class='add'>+		pr_debug("%s: OID_GEN_PHYSICAL_MEDIUM\n", __func__);</div><div class='ctx'> 		*outbuf = __constant_cpu_to_le32 (0);</div><div class='ctx'> 		retval = 0;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -346,7 +341,7 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,</div><div class='ctx'> 	 * versions emit undefined RNDIS messages. DOCUMENT ALL THESE!</div><div class='ctx'> 	 */</div><div class='ctx'> 	case OID_GEN_MAC_OPTIONS:		/* from WinME */</div><div class='del'>-		DBG("%s: OID_GEN_MAC_OPTIONS\n", __func__);</div><div class='add'>+		pr_debug("%s: OID_GEN_MAC_OPTIONS\n", __func__);</div><div class='ctx'> 		*outbuf = __constant_cpu_to_le32(</div><div class='ctx'> 			  NDIS_MAC_OPTION_RECEIVE_SERIALIZED</div><div class='ctx'> 			| NDIS_MAC_OPTION_FULL_DUPLEX);</div><div class='hunk'>@@ -358,7 +353,7 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,</div><div class='ctx'> 	/* mandatory */</div><div class='ctx'> 	case OID_GEN_XMIT_OK:</div><div class='ctx'> 		if (rndis_debug &gt; 1)</div><div class='del'>-			DBG("%s: OID_GEN_XMIT_OK\n", __func__);</div><div class='add'>+			pr_debug("%s: OID_GEN_XMIT_OK\n", __func__);</div><div class='ctx'> 		if (stats) {</div><div class='ctx'> 			*outbuf = cpu_to_le32(stats-&gt;tx_packets</div><div class='ctx'> 				- stats-&gt;tx_errors - stats-&gt;tx_dropped);</div><div class='hunk'>@@ -369,7 +364,7 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,</div><div class='ctx'> 	/* mandatory */</div><div class='ctx'> 	case OID_GEN_RCV_OK:</div><div class='ctx'> 		if (rndis_debug &gt; 1)</div><div class='del'>-			DBG("%s: OID_GEN_RCV_OK\n", __func__);</div><div class='add'>+			pr_debug("%s: OID_GEN_RCV_OK\n", __func__);</div><div class='ctx'> 		if (stats) {</div><div class='ctx'> 			*outbuf = cpu_to_le32(stats-&gt;rx_packets</div><div class='ctx'> 				- stats-&gt;rx_errors - stats-&gt;rx_dropped);</div><div class='hunk'>@@ -380,7 +375,7 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,</div><div class='ctx'> 	/* mandatory */</div><div class='ctx'> 	case OID_GEN_XMIT_ERROR:</div><div class='ctx'> 		if (rndis_debug &gt; 1)</div><div class='del'>-			DBG("%s: OID_GEN_XMIT_ERROR\n", __func__);</div><div class='add'>+			pr_debug("%s: OID_GEN_XMIT_ERROR\n", __func__);</div><div class='ctx'> 		if (stats) {</div><div class='ctx'> 			*outbuf = cpu_to_le32(stats-&gt;tx_errors);</div><div class='ctx'> 			retval = 0;</div><div class='hunk'>@@ -390,7 +385,7 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,</div><div class='ctx'> 	/* mandatory */</div><div class='ctx'> 	case OID_GEN_RCV_ERROR:</div><div class='ctx'> 		if (rndis_debug &gt; 1)</div><div class='del'>-			DBG("%s: OID_GEN_RCV_ERROR\n", __func__);</div><div class='add'>+			pr_debug("%s: OID_GEN_RCV_ERROR\n", __func__);</div><div class='ctx'> 		if (stats) {</div><div class='ctx'> 			*outbuf = cpu_to_le32(stats-&gt;rx_errors);</div><div class='ctx'> 			retval = 0;</div><div class='hunk'>@@ -399,7 +394,7 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,</div><div class='ctx'> </div><div class='ctx'> 	/* mandatory */</div><div class='ctx'> 	case OID_GEN_RCV_NO_BUFFER:</div><div class='del'>-		DBG("%s: OID_GEN_RCV_NO_BUFFER\n", __func__);</div><div class='add'>+		pr_debug("%s: OID_GEN_RCV_NO_BUFFER\n", __func__);</div><div class='ctx'> 		if (stats) {</div><div class='ctx'> 			*outbuf = cpu_to_le32(stats-&gt;rx_dropped);</div><div class='ctx'> 			retval = 0;</div><div class='hunk'>@@ -410,7 +405,7 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,</div><div class='ctx'> </div><div class='ctx'> 	/* mandatory */</div><div class='ctx'> 	case OID_802_3_PERMANENT_ADDRESS:</div><div class='del'>-		DBG("%s: OID_802_3_PERMANENT_ADDRESS\n", __func__);</div><div class='add'>+		pr_debug("%s: OID_802_3_PERMANENT_ADDRESS\n", __func__);</div><div class='ctx'> 		if (rndis_per_dev_params [configNr].dev) {</div><div class='ctx'> 			length = ETH_ALEN;</div><div class='ctx'> 			memcpy (outbuf,</div><div class='hunk'>@@ -422,7 +417,7 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,</div><div class='ctx'> </div><div class='ctx'> 	/* mandatory */</div><div class='ctx'> 	case OID_802_3_CURRENT_ADDRESS:</div><div class='del'>-		DBG("%s: OID_802_3_CURRENT_ADDRESS\n", __func__);</div><div class='add'>+		pr_debug("%s: OID_802_3_CURRENT_ADDRESS\n", __func__);</div><div class='ctx'> 		if (rndis_per_dev_params [configNr].dev) {</div><div class='ctx'> 			length = ETH_ALEN;</div><div class='ctx'> 			memcpy (outbuf,</div><div class='hunk'>@@ -434,7 +429,7 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,</div><div class='ctx'> </div><div class='ctx'> 	/* mandatory */</div><div class='ctx'> 	case OID_802_3_MULTICAST_LIST:</div><div class='del'>-		DBG("%s: OID_802_3_MULTICAST_LIST\n", __func__);</div><div class='add'>+		pr_debug("%s: OID_802_3_MULTICAST_LIST\n", __func__);</div><div class='ctx'> 		/* Multicast base address only */</div><div class='ctx'> 		*outbuf = __constant_cpu_to_le32 (0xE0000000);</div><div class='ctx'> 		retval = 0;</div><div class='hunk'>@@ -442,21 +437,21 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,</div><div class='ctx'> </div><div class='ctx'> 	/* mandatory */</div><div class='ctx'> 	case OID_802_3_MAXIMUM_LIST_SIZE:</div><div class='del'>-		DBG("%s: OID_802_3_MAXIMUM_LIST_SIZE\n", __func__);</div><div class='add'>+		pr_debug("%s: OID_802_3_MAXIMUM_LIST_SIZE\n", __func__);</div><div class='ctx'> 		/* Multicast base address only */</div><div class='ctx'> 		*outbuf = __constant_cpu_to_le32 (1);</div><div class='ctx'> 		retval = 0;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case OID_802_3_MAC_OPTIONS:</div><div class='del'>-		DBG("%s: OID_802_3_MAC_OPTIONS\n", __func__);</div><div class='add'>+		pr_debug("%s: OID_802_3_MAC_OPTIONS\n", __func__);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	/* ieee802.3 statistics OIDs (table 4-4) */</div><div class='ctx'> </div><div class='ctx'> 	/* mandatory */</div><div class='ctx'> 	case OID_802_3_RCV_ERROR_ALIGNMENT:</div><div class='del'>-		DBG("%s: OID_802_3_RCV_ERROR_ALIGNMENT\n", __func__);</div><div class='add'>+		pr_debug("%s: OID_802_3_RCV_ERROR_ALIGNMENT\n", __func__);</div><div class='ctx'> 		if (stats) {</div><div class='ctx'> 			*outbuf = cpu_to_le32(stats-&gt;rx_frame_errors);</div><div class='ctx'> 			retval = 0;</div><div class='hunk'>@@ -465,14 +460,14 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,</div><div class='ctx'> </div><div class='ctx'> 	/* mandatory */</div><div class='ctx'> 	case OID_802_3_XMIT_ONE_COLLISION:</div><div class='del'>-		DBG("%s: OID_802_3_XMIT_ONE_COLLISION\n", __func__);</div><div class='add'>+		pr_debug("%s: OID_802_3_XMIT_ONE_COLLISION\n", __func__);</div><div class='ctx'> 		*outbuf = __constant_cpu_to_le32 (0);</div><div class='ctx'> 		retval = 0;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	/* mandatory */</div><div class='ctx'> 	case OID_802_3_XMIT_MORE_COLLISIONS:</div><div class='del'>-		DBG("%s: OID_802_3_XMIT_MORE_COLLISIONS\n", __func__);</div><div class='add'>+		pr_debug("%s: OID_802_3_XMIT_MORE_COLLISIONS\n", __func__);</div><div class='ctx'> 		*outbuf = __constant_cpu_to_le32 (0);</div><div class='ctx'> 		retval = 0;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -504,9 +499,9 @@ static int gen_ndis_set_resp (u8 configNr, u32 OID, u8 *buf, u32 buf_len,</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	if (buf_len &amp;&amp; rndis_debug &gt; 1) {</div><div class='del'>-		DBG("set OID %08x value, len %d:\n", OID, buf_len);</div><div class='add'>+		pr_debug("set OID %08x value, len %d:\n", OID, buf_len);</div><div class='ctx'> 		for (i = 0; i &lt; buf_len; i += 16) {</div><div class='del'>-			DBG("%03d: %08x %08x %08x %08x\n", i,</div><div class='add'>+			pr_debug("%03d: %08x %08x %08x %08x\n", i,</div><div class='ctx'> 				get_unaligned_le32(&amp;buf[i]),</div><div class='ctx'> 				get_unaligned_le32(&amp;buf[i + 4]),</div><div class='ctx'> 				get_unaligned_le32(&amp;buf[i + 8]),</div><div class='hunk'>@@ -525,7 +520,7 @@ static int gen_ndis_set_resp (u8 configNr, u32 OID, u8 *buf, u32 buf_len,</div><div class='ctx'> 		 *	MULTICAST, ALL_MULTICAST, BROADCAST</div><div class='ctx'> 		 */</div><div class='ctx'> 		*params-&gt;filter = (u16)get_unaligned_le32(buf);</div><div class='del'>-		DBG("%s: OID_GEN_CURRENT_PACKET_FILTER %08x\n",</div><div class='add'>+		pr_debug("%s: OID_GEN_CURRENT_PACKET_FILTER %08x\n",</div><div class='ctx'> 			__func__, *params-&gt;filter);</div><div class='ctx'> </div><div class='ctx'> 		/* this call has a significant side effect:  it's</div><div class='hunk'>@@ -547,7 +542,7 @@ static int gen_ndis_set_resp (u8 configNr, u32 OID, u8 *buf, u32 buf_len,</div><div class='ctx'> </div><div class='ctx'> 	case OID_802_3_MULTICAST_LIST:</div><div class='ctx'> 		/* I think we can ignore this */</div><div class='del'>-		DBG("%s: OID_802_3_MULTICAST_LIST\n", __func__);</div><div class='add'>+		pr_debug("%s: OID_802_3_MULTICAST_LIST\n", __func__);</div><div class='ctx'> 		retval = 0;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='hunk'>@@ -606,7 +601,7 @@ static int rndis_query_response (int configNr, rndis_query_msg_type *buf)</div><div class='ctx'> 	rndis_resp_t            *r;</div><div class='ctx'> 	struct rndis_params	*params = rndis_per_dev_params + configNr;</div><div class='ctx'> </div><div class='del'>-	// DBG("%s: OID = %08X\n", __func__, cpu_to_le32(buf-&gt;OID));</div><div class='add'>+	/* pr_debug("%s: OID = %08X\n", __func__, cpu_to_le32(buf-&gt;OID)); */</div><div class='ctx'> 	if (!params-&gt;dev)</div><div class='ctx'> 		return -ENOTSUPP;</div><div class='ctx'> </div><div class='hunk'>@@ -659,15 +654,15 @@ static int rndis_set_response (int configNr, rndis_set_msg_type *buf)</div><div class='ctx'> 	BufOffset = le32_to_cpu (buf-&gt;InformationBufferOffset);</div><div class='ctx'> </div><div class='ctx'> #ifdef	VERBOSE_DEBUG</div><div class='del'>-	DBG("%s: Length: %d\n", __func__, BufLength);</div><div class='del'>-	DBG("%s: Offset: %d\n", __func__, BufOffset);</div><div class='del'>-	DBG("%s: InfoBuffer: ", __func__);</div><div class='add'>+	pr_debug("%s: Length: %d\n", __func__, BufLength);</div><div class='add'>+	pr_debug("%s: Offset: %d\n", __func__, BufOffset);</div><div class='add'>+	pr_debug("%s: InfoBuffer: ", __func__);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; BufLength; i++) {</div><div class='del'>-		DBG("%02x ", *(((u8 *) buf) + i + 8 + BufOffset));</div><div class='add'>+		pr_debug("%02x ", *(((u8 *) buf) + i + 8 + BufOffset));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	DBG("\n");</div><div class='add'>+	pr_debug("\n");</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	resp-&gt;MessageType = __constant_cpu_to_le32 (REMOTE_NDIS_SET_CMPLT);</div><div class='hunk'>@@ -821,14 +816,14 @@ int rndis_msg_parser (u8 configNr, u8 *buf)</div><div class='ctx'> 	/* For USB: responses may take up to 10 seconds */</div><div class='ctx'> 	switch (MsgType) {</div><div class='ctx'> 	case REMOTE_NDIS_INITIALIZE_MSG:</div><div class='del'>-		DBG("%s: REMOTE_NDIS_INITIALIZE_MSG\n",</div><div class='add'>+		pr_debug("%s: REMOTE_NDIS_INITIALIZE_MSG\n",</div><div class='ctx'> 			__func__ );</div><div class='ctx'> 		params-&gt;state = RNDIS_INITIALIZED;</div><div class='ctx'> 		return  rndis_init_response (configNr,</div><div class='ctx'> 					(rndis_init_msg_type *) buf);</div><div class='ctx'> </div><div class='ctx'> 	case REMOTE_NDIS_HALT_MSG:</div><div class='del'>-		DBG("%s: REMOTE_NDIS_HALT_MSG\n",</div><div class='add'>+		pr_debug("%s: REMOTE_NDIS_HALT_MSG\n",</div><div class='ctx'> 			__func__ );</div><div class='ctx'> 		params-&gt;state = RNDIS_UNINITIALIZED;</div><div class='ctx'> 		if (params-&gt;dev) {</div><div class='hunk'>@@ -846,7 +841,7 @@ int rndis_msg_parser (u8 configNr, u8 *buf)</div><div class='ctx'> 					(rndis_set_msg_type *) buf);</div><div class='ctx'> </div><div class='ctx'> 	case REMOTE_NDIS_RESET_MSG:</div><div class='del'>-		DBG("%s: REMOTE_NDIS_RESET_MSG\n",</div><div class='add'>+		pr_debug("%s: REMOTE_NDIS_RESET_MSG\n",</div><div class='ctx'> 			__func__ );</div><div class='ctx'> 		return rndis_reset_response (configNr,</div><div class='ctx'> 					(rndis_reset_msg_type *) buf);</div><div class='hunk'>@@ -854,7 +849,7 @@ int rndis_msg_parser (u8 configNr, u8 *buf)</div><div class='ctx'> 	case REMOTE_NDIS_KEEPALIVE_MSG:</div><div class='ctx'> 		/* For USB: host does this every 5 seconds */</div><div class='ctx'> 		if (rndis_debug &gt; 1)</div><div class='del'>-			DBG("%s: REMOTE_NDIS_KEEPALIVE_MSG\n",</div><div class='add'>+			pr_debug("%s: REMOTE_NDIS_KEEPALIVE_MSG\n",</div><div class='ctx'> 				__func__ );</div><div class='ctx'> 		return rndis_keepalive_response (configNr,</div><div class='ctx'> 						 (rndis_keepalive_msg_type *)</div><div class='hunk'>@@ -870,7 +865,7 @@ int rndis_msg_parser (u8 configNr, u8 *buf)</div><div class='ctx'> 		{</div><div class='ctx'> 			unsigned i;</div><div class='ctx'> 			for (i = 0; i &lt; MsgLength; i += 16) {</div><div class='del'>-				DBG("%03d: "</div><div class='add'>+				pr_debug("%03d: "</div><div class='ctx'> 					" %02x %02x %02x %02x"</div><div class='ctx'> 					" %02x %02x %02x %02x"</div><div class='ctx'> 					" %02x %02x %02x %02x"</div><div class='hunk'>@@ -905,18 +900,18 @@ int rndis_register(void (*resp_avail)(void *v), void *v)</div><div class='ctx'> 			rndis_per_dev_params [i].used = 1;</div><div class='ctx'> 			rndis_per_dev_params [i].resp_avail = resp_avail;</div><div class='ctx'> 			rndis_per_dev_params [i].v = v;</div><div class='del'>-			DBG("%s: configNr = %d\n", __func__, i);</div><div class='add'>+			pr_debug("%s: configNr = %d\n", __func__, i);</div><div class='ctx'> 			return i;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	DBG("failed\n");</div><div class='add'>+	pr_debug("failed\n");</div><div class='ctx'> </div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void rndis_deregister (int configNr)</div><div class='ctx'> {</div><div class='del'>-	DBG("%s: \n", __func__ );</div><div class='add'>+	pr_debug("%s: \n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	if (configNr &gt;= RNDIS_MAX_CONFIGS) return;</div><div class='ctx'> 	rndis_per_dev_params [configNr].used = 0;</div><div class='hunk'>@@ -926,7 +921,7 @@ void rndis_deregister (int configNr)</div><div class='ctx'> </div><div class='ctx'> int rndis_set_param_dev(u8 configNr, struct net_device *dev, u16 *cdc_filter)</div><div class='ctx'> {</div><div class='del'>-	DBG("%s:\n", __func__ );</div><div class='add'>+	pr_debug("%s:\n", __func__);</div><div class='ctx'> 	if (!dev)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	if (configNr &gt;= RNDIS_MAX_CONFIGS) return -1;</div><div class='hunk'>@@ -939,7 +934,7 @@ int rndis_set_param_dev(u8 configNr, struct net_device *dev, u16 *cdc_filter)</div><div class='ctx'> </div><div class='ctx'> int rndis_set_param_vendor (u8 configNr, u32 vendorID, const char *vendorDescr)</div><div class='ctx'> {</div><div class='del'>-	DBG("%s:\n", __func__ );</div><div class='add'>+	pr_debug("%s:\n", __func__);</div><div class='ctx'> 	if (!vendorDescr) return -1;</div><div class='ctx'> 	if (configNr &gt;= RNDIS_MAX_CONFIGS) return -1;</div><div class='ctx'> </div><div class='hunk'>@@ -951,7 +946,7 @@ int rndis_set_param_vendor (u8 configNr, u32 vendorID, const char *vendorDescr)</div><div class='ctx'> </div><div class='ctx'> int rndis_set_param_medium (u8 configNr, u32 medium, u32 speed)</div><div class='ctx'> {</div><div class='del'>-	DBG("%s: %u %u\n", __func__, medium, speed);</div><div class='add'>+	pr_debug("%s: %u %u\n", __func__, medium, speed);</div><div class='ctx'> 	if (configNr &gt;= RNDIS_MAX_CONFIGS) return -1;</div><div class='ctx'> </div><div class='ctx'> 	rndis_per_dev_params [configNr].medium = medium;</div><div class='hunk'>@@ -1114,7 +1109,7 @@ static ssize_t rndis_proc_write(struct file *file, const char __user *buffer,</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			if (fl_speed) p-&gt;speed = speed;</div><div class='del'>-			else DBG("%c is not valid\n", c);</div><div class='add'>+			else pr_debug("%c is not valid\n", c);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -1159,12 +1154,12 @@ int __init rndis_init (void)</div><div class='ctx'> 					&amp;rndis_proc_fops,</div><div class='ctx'> 					(void *)(rndis_per_dev_params + i))))</div><div class='ctx'> 		{</div><div class='del'>-			DBG("%s :remove entries", __func__);</div><div class='add'>+			pr_debug("%s :remove entries", __func__);</div><div class='ctx'> 			while (i) {</div><div class='ctx'> 				sprintf (name, NAME_TEMPLATE, --i);</div><div class='ctx'> 				remove_proc_entry (name, NULL);</div><div class='ctx'> 			}</div><div class='del'>-			DBG("\n");</div><div class='add'>+			pr_debug("\n");</div><div class='ctx'> 			return -EIO;</div><div class='ctx'> 		}</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/usb/gadget/s3c2410_udc.c b/drivers/usb/gadget/s3c2410_udc.c<br/>index 29d13ebe7500..48f51b12d2e2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/gadget/s3c2410_udc.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/gadget/s3c2410_udc.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/gadget/s3c2410_udc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/gadget/s3c2410_udc.c</a></div><div class='hunk'>@@ -1651,7 +1651,7 @@ int usb_gadget_register_driver(struct usb_gadget_driver *driver)</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='ctx'> 	if (!driver-&gt;bind || !driver-&gt;setup</div><div class='del'>-			|| driver-&gt;speed != USB_SPEED_FULL) {</div><div class='add'>+			|| driver-&gt;speed &lt; USB_SPEED_FULL) {</div><div class='ctx'> 		printk(KERN_ERR "Invalid driver: bind %p setup %p speed %d\n",</div><div class='ctx'> 			driver-&gt;bind, driver-&gt;setup, driver-&gt;speed);</div><div class='ctx'> 		return -EINVAL;</div><div class='head'>diff --git a/drivers/usb/gadget/serial.c b/drivers/usb/gadget/serial.c<br/>index b3699afff002..37879af1c433 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/gadget/serial.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/gadget/serial.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/gadget/serial.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/gadget/serial.c</a></div><div class='hunk'>@@ -30,6 +30,25 @@</div><div class='ctx'> </div><div class='ctx'> /*-------------------------------------------------------------------------*/</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Kbuild is not very cooperative with respect to linking separately</div><div class='add'>+ * compiled library objects into one module.  So for now we won't use</div><div class='add'>+ * separate compilation ... ensuring init/exit sections work to shrink</div><div class='add'>+ * the runtime footprint, and giving us at least some parts of what</div><div class='add'>+ * a "gcc --combine ... part1.c part2.c part3.c ... " build would.</div><div class='add'>+ */</div><div class='add'>+#include "composite.c"</div><div class='add'>+#include "usbstring.c"</div><div class='add'>+#include "config.c"</div><div class='add'>+#include "epautoconf.c"</div><div class='add'>+</div><div class='add'>+#include "f_acm.c"</div><div class='add'>+#include "f_obex.c"</div><div class='add'>+#include "f_serial.c"</div><div class='add'>+#include "u_serial.c"</div><div class='add'>+</div><div class='add'>+/*-------------------------------------------------------------------------*/</div><div class='add'>+</div><div class='ctx'> /* Thanks to NetChip Technologies for donating this product ID.</div><div class='ctx'> *</div><div class='ctx'> * DO NOT REUSE THESE IDs with a protocol-incompatible driver!!  Ever!!</div><div class='hunk'>@@ -38,6 +57,7 @@</div><div class='ctx'> #define GS_VENDOR_ID			0x0525	/* NetChip */</div><div class='ctx'> #define GS_PRODUCT_ID			0xa4a6	/* Linux-USB Serial Gadget */</div><div class='ctx'> #define GS_CDC_PRODUCT_ID		0xa4a7	/* ... as CDC-ACM */</div><div class='add'>+#define GS_CDC_OBEX_PRODUCT_ID		0xa4a9	/* ... as CDC-OBEX */</div><div class='ctx'> </div><div class='ctx'> /* string IDs are assigned dynamically */</div><div class='ctx'> </div><div class='hunk'>@@ -107,6 +127,10 @@ static int use_acm = true;</div><div class='ctx'> module_param(use_acm, bool, 0);</div><div class='ctx'> MODULE_PARM_DESC(use_acm, "Use CDC ACM, default=yes");</div><div class='ctx'> </div><div class='add'>+static int use_obex = false;</div><div class='add'>+module_param(use_obex, bool, 0);</div><div class='add'>+MODULE_PARM_DESC(use_obex, "Use CDC OBEX, default=no");</div><div class='add'>+</div><div class='ctx'> static unsigned n_ports = 1;</div><div class='ctx'> module_param(n_ports, uint, 0);</div><div class='ctx'> MODULE_PARM_DESC(n_ports, "number of ports to create, default=1");</div><div class='hunk'>@@ -121,6 +145,8 @@ static int __init serial_bind_config(struct usb_configuration *c)</div><div class='ctx'> 	for (i = 0; i &lt; n_ports &amp;&amp; status == 0; i++) {</div><div class='ctx'> 		if (use_acm)</div><div class='ctx'> 			status = acm_bind_config(c, i);</div><div class='add'>+		else if (use_obex)</div><div class='add'>+			status = obex_bind_config(c, i);</div><div class='ctx'> 		else</div><div class='ctx'> 			status = gser_bind_config(c, i);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -133,7 +159,6 @@ static struct usb_configuration serial_config_driver = {</div><div class='ctx'> 	/* .bConfigurationValue = f(use_acm) */</div><div class='ctx'> 	/* .iConfiguration = DYNAMIC */</div><div class='ctx'> 	.bmAttributes	= USB_CONFIG_ATT_SELFPOWER,</div><div class='del'>-	.bMaxPower	= 1,	/* 2 mA, minimal */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init gs_bind(struct usb_composite_dev *cdev)</div><div class='hunk'>@@ -231,6 +256,12 @@ static int __init init(void)</div><div class='ctx'> 		device_desc.bDeviceClass = USB_CLASS_COMM;</div><div class='ctx'> 		device_desc.idProduct =</div><div class='ctx'> 				__constant_cpu_to_le16(GS_CDC_PRODUCT_ID);</div><div class='add'>+	} else if (use_obex) {</div><div class='add'>+		serial_config_driver.label = "CDC OBEX config";</div><div class='add'>+		serial_config_driver.bConfigurationValue = 3;</div><div class='add'>+		device_desc.bDeviceClass = USB_CLASS_COMM;</div><div class='add'>+		device_desc.idProduct =</div><div class='add'>+			__constant_cpu_to_le16(GS_CDC_OBEX_PRODUCT_ID);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		serial_config_driver.label = "Generic Serial config";</div><div class='ctx'> 		serial_config_driver.bConfigurationValue = 1;</div><div class='head'>diff --git a/drivers/usb/gadget/u_ether.c b/drivers/usb/gadget/u_ether.c<br/>index 3791e6271903..66948b72bb9b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/gadget/u_ether.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/gadget/u_ether.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/gadget/u_ether.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/gadget/u_ether.c</a></div><div class='hunk'>@@ -52,7 +52,7 @@</div><div class='ctx'>  * this single "physical" link to be used by multiple virtual links.)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define DRIVER_VERSION	"29-May-2008"</div><div class='add'>+#define UETH__VERSION	"29-May-2008"</div><div class='ctx'> </div><div class='ctx'> struct eth_dev {</div><div class='ctx'> 	/* lock is held while accessing port_usb</div><div class='hunk'>@@ -170,7 +170,7 @@ static void eth_get_drvinfo(struct net_device *net, struct ethtool_drvinfo *p)</div><div class='ctx'> 	struct eth_dev	*dev = netdev_priv(net);</div><div class='ctx'> </div><div class='ctx'> 	strlcpy(p-&gt;driver, "g_ether", sizeof p-&gt;driver);</div><div class='del'>-	strlcpy(p-&gt;version, DRIVER_VERSION, sizeof p-&gt;version);</div><div class='add'>+	strlcpy(p-&gt;version, UETH__VERSION, sizeof p-&gt;version);</div><div class='ctx'> 	strlcpy(p-&gt;fw_version, dev-&gt;gadget-&gt;name, sizeof p-&gt;fw_version);</div><div class='ctx'> 	strlcpy(p-&gt;bus_info, dev_name(&amp;dev-&gt;gadget-&gt;dev), sizeof p-&gt;bus_info);</div><div class='ctx'> }</div><div class='hunk'>@@ -873,6 +873,13 @@ struct net_device *gether_connect(struct gether *link)</div><div class='ctx'> 		spin_lock(&amp;dev-&gt;lock);</div><div class='ctx'> 		dev-&gt;port_usb = link;</div><div class='ctx'> 		link-&gt;ioport = dev;</div><div class='add'>+		if (netif_running(dev-&gt;net)) {</div><div class='add'>+			if (link-&gt;open)</div><div class='add'>+				link-&gt;open(link);</div><div class='add'>+		} else {</div><div class='add'>+			if (link-&gt;close)</div><div class='add'>+				link-&gt;close(link);</div><div class='add'>+		}</div><div class='ctx'> 		spin_unlock(&amp;dev-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 		netif_carrier_on(dev-&gt;net);</div><div class='head'>diff --git a/drivers/usb/gadget/u_serial.h b/drivers/usb/gadget/u_serial.h<br/>index af3910d01aea..300f0ed9475d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/gadget/u_serial.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/gadget/u_serial.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/gadget/u_serial.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/gadget/u_serial.h</a></div><div class='hunk'>@@ -62,5 +62,6 @@ void gserial_disconnect(struct gserial *);</div><div class='ctx'> /* functions are bound to configurations by a config or gadget driver */</div><div class='ctx'> int acm_bind_config(struct usb_configuration *c, u8 port_num);</div><div class='ctx'> int gser_bind_config(struct usb_configuration *c, u8 port_num);</div><div class='add'>+int obex_bind_config(struct usb_configuration *c, u8 port_num);</div><div class='ctx'> </div><div class='ctx'> #endif /* __U_SERIAL_H */</div><div class='head'>diff --git a/drivers/usb/gadget/zero.c b/drivers/usb/gadget/zero.c<br/>index aa0bd4f126a1..361d9659ac48 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/gadget/zero.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/gadget/zero.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/gadget/zero.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/gadget/zero.c</a></div><div class='hunk'>@@ -59,6 +59,23 @@</div><div class='ctx'> </div><div class='ctx'> /*-------------------------------------------------------------------------*/</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Kbuild is not very cooperative with respect to linking separately</div><div class='add'>+ * compiled library objects into one module.  So for now we won't use</div><div class='add'>+ * separate compilation ... ensuring init/exit sections work to shrink</div><div class='add'>+ * the runtime footprint, and giving us at least some parts of what</div><div class='add'>+ * a "gcc --combine ... part1.c part2.c part3.c ... " build would.</div><div class='add'>+ */</div><div class='add'>+#include "composite.c"</div><div class='add'>+#include "usbstring.c"</div><div class='add'>+#include "config.c"</div><div class='add'>+#include "epautoconf.c"</div><div class='add'>+</div><div class='add'>+#include "f_sourcesink.c"</div><div class='add'>+#include "f_loopback.c"</div><div class='add'>+</div><div class='add'>+/*-------------------------------------------------------------------------*/</div><div class='add'>+</div><div class='ctx'> #define DRIVER_VERSION		"Cinco de Mayo 2008"</div><div class='ctx'> </div><div class='ctx'> static const char longname[] = "Gadget Zero";</div><div class='head'>diff --git a/drivers/usb/host/ehci-dbg.c b/drivers/usb/host/ehci-dbg.c<br/>index b0f8ed5a7fb9..0cb53ca8d343 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/host/ehci-dbg.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/host/ehci-dbg.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/host/ehci-dbg.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/host/ehci-dbg.c</a></div><div class='hunk'>@@ -358,7 +358,8 @@ struct debug_buffer {</div><div class='ctx'> 	struct usb_bus *bus;</div><div class='ctx'> 	struct mutex mutex;	/* protect filling of buffer */</div><div class='ctx'> 	size_t count;		/* number of characters filled into buffer */</div><div class='del'>-	char *page;</div><div class='add'>+	char *output_buf;</div><div class='add'>+	size_t alloc_size;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define speed_char(info1) ({ char tmp; \</div><div class='hunk'>@@ -488,8 +489,8 @@ static ssize_t fill_async_buffer(struct debug_buffer *buf)</div><div class='ctx'> </div><div class='ctx'> 	hcd = bus_to_hcd(buf-&gt;bus);</div><div class='ctx'> 	ehci = hcd_to_ehci (hcd);</div><div class='del'>-	next = buf-&gt;page;</div><div class='del'>-	size = PAGE_SIZE;</div><div class='add'>+	next = buf-&gt;output_buf;</div><div class='add'>+	size = buf-&gt;alloc_size;</div><div class='ctx'> </div><div class='ctx'> 	*next = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -510,7 +511,7 @@ static ssize_t fill_async_buffer(struct debug_buffer *buf)</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_irqrestore (&amp;ehci-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-	return strlen(buf-&gt;page);</div><div class='add'>+	return strlen(buf-&gt;output_buf);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define DBG_SCHED_LIMIT 64</div><div class='hunk'>@@ -531,8 +532,8 @@ static ssize_t fill_periodic_buffer(struct debug_buffer *buf)</div><div class='ctx'> </div><div class='ctx'> 	hcd = bus_to_hcd(buf-&gt;bus);</div><div class='ctx'> 	ehci = hcd_to_ehci (hcd);</div><div class='del'>-	next = buf-&gt;page;</div><div class='del'>-	size = PAGE_SIZE;</div><div class='add'>+	next = buf-&gt;output_buf;</div><div class='add'>+	size = buf-&gt;alloc_size;</div><div class='ctx'> </div><div class='ctx'> 	temp = scnprintf (next, size, "size = %d\n", ehci-&gt;periodic_size);</div><div class='ctx'> 	size -= temp;</div><div class='hunk'>@@ -568,14 +569,16 @@ static ssize_t fill_periodic_buffer(struct debug_buffer *buf)</div><div class='ctx'> 				for (temp = 0; temp &lt; seen_count; temp++) {</div><div class='ctx'> 					if (seen [temp].ptr != p.ptr)</div><div class='ctx'> 						continue;</div><div class='del'>-					if (p.qh-&gt;qh_next.ptr)</div><div class='add'>+					if (p.qh-&gt;qh_next.ptr) {</div><div class='ctx'> 						temp = scnprintf (next, size,</div><div class='ctx'> 							" ...");</div><div class='del'>-					p.ptr = NULL;</div><div class='add'>+						size -= temp;</div><div class='add'>+						next += temp;</div><div class='add'>+					}</div><div class='ctx'> 					break;</div><div class='ctx'> 				}</div><div class='ctx'> 				/* show more info the first time around */</div><div class='del'>-				if (temp == seen_count &amp;&amp; p.ptr) {</div><div class='add'>+				if (temp == seen_count) {</div><div class='ctx'> 					u32	scratch = hc32_to_cpup(ehci,</div><div class='ctx'> 							&amp;p.qh-&gt;hw_info1);</div><div class='ctx'> 					struct ehci_qtd	*qtd;</div><div class='hunk'>@@ -649,7 +652,7 @@ static ssize_t fill_periodic_buffer(struct debug_buffer *buf)</div><div class='ctx'> 	spin_unlock_irqrestore (&amp;ehci-&gt;lock, flags);</div><div class='ctx'> 	kfree (seen);</div><div class='ctx'> </div><div class='del'>-	return PAGE_SIZE - size;</div><div class='add'>+	return buf-&gt;alloc_size - size;</div><div class='ctx'> }</div><div class='ctx'> #undef DBG_SCHED_LIMIT</div><div class='ctx'> </div><div class='hunk'>@@ -665,14 +668,14 @@ static ssize_t fill_registers_buffer(struct debug_buffer *buf)</div><div class='ctx'> </div><div class='ctx'> 	hcd = bus_to_hcd(buf-&gt;bus);</div><div class='ctx'> 	ehci = hcd_to_ehci (hcd);</div><div class='del'>-	next = buf-&gt;page;</div><div class='del'>-	size = PAGE_SIZE;</div><div class='add'>+	next = buf-&gt;output_buf;</div><div class='add'>+	size = buf-&gt;alloc_size;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave (&amp;ehci-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	if (!test_bit(HCD_FLAG_HW_ACCESSIBLE, &amp;hcd-&gt;flags)) {</div><div class='ctx'> 		size = scnprintf (next, size,</div><div class='del'>-			"bus %s, device %s (driver " DRIVER_VERSION ")\n"</div><div class='add'>+			"bus %s, device %s\n"</div><div class='ctx'> 			"%s\n"</div><div class='ctx'> 			"SUSPENDED (no register access)\n",</div><div class='ctx'> 			hcd-&gt;self.controller-&gt;bus-&gt;name,</div><div class='hunk'>@@ -684,7 +687,7 @@ static ssize_t fill_registers_buffer(struct debug_buffer *buf)</div><div class='ctx'> 	/* Capability Registers */</div><div class='ctx'> 	i = HC_VERSION(ehci_readl(ehci, &amp;ehci-&gt;caps-&gt;hc_capbase));</div><div class='ctx'> 	temp = scnprintf (next, size,</div><div class='del'>-		"bus %s, device %s (driver " DRIVER_VERSION ")\n"</div><div class='add'>+		"bus %s, device %s\n"</div><div class='ctx'> 		"%s\n"</div><div class='ctx'> 		"EHCI %x.%02x, hcd state %d\n",</div><div class='ctx'> 		hcd-&gt;self.controller-&gt;bus-&gt;name,</div><div class='hunk'>@@ -808,7 +811,7 @@ static ssize_t fill_registers_buffer(struct debug_buffer *buf)</div><div class='ctx'> done:</div><div class='ctx'> 	spin_unlock_irqrestore (&amp;ehci-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-	return PAGE_SIZE - size;</div><div class='add'>+	return buf-&gt;alloc_size - size;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct debug_buffer *alloc_buffer(struct usb_bus *bus,</div><div class='hunk'>@@ -822,6 +825,7 @@ static struct debug_buffer *alloc_buffer(struct usb_bus *bus,</div><div class='ctx'> 		buf-&gt;bus = bus;</div><div class='ctx'> 		buf-&gt;fill_func = fill_func;</div><div class='ctx'> 		mutex_init(&amp;buf-&gt;mutex);</div><div class='add'>+		buf-&gt;alloc_size = PAGE_SIZE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return buf;</div><div class='hunk'>@@ -831,10 +835,10 @@ static int fill_buffer(struct debug_buffer *buf)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	if (!buf-&gt;page)</div><div class='del'>-		buf-&gt;page = (char *)get_zeroed_page(GFP_KERNEL);</div><div class='add'>+	if (!buf-&gt;output_buf)</div><div class='add'>+		buf-&gt;output_buf = (char *)vmalloc(buf-&gt;alloc_size);</div><div class='ctx'> </div><div class='del'>-	if (!buf-&gt;page) {</div><div class='add'>+	if (!buf-&gt;output_buf) {</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -867,7 +871,7 @@ static ssize_t debug_output(struct file *file, char __user *user_buf,</div><div class='ctx'> 	mutex_unlock(&amp;buf-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	ret = simple_read_from_buffer(user_buf, len, offset,</div><div class='del'>-				      buf-&gt;page, buf-&gt;count);</div><div class='add'>+				      buf-&gt;output_buf, buf-&gt;count);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -879,8 +883,8 @@ static int debug_close(struct inode *inode, struct file *file)</div><div class='ctx'> 	struct debug_buffer *buf = file-&gt;private_data;</div><div class='ctx'> </div><div class='ctx'> 	if (buf) {</div><div class='del'>-		if (buf-&gt;page)</div><div class='del'>-			free_page((unsigned long)buf-&gt;page);</div><div class='add'>+		if (buf-&gt;output_buf)</div><div class='add'>+			vfree(buf-&gt;output_buf);</div><div class='ctx'> 		kfree(buf);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -895,10 +899,14 @@ static int debug_async_open(struct inode *inode, struct file *file)</div><div class='ctx'> </div><div class='ctx'> static int debug_periodic_open(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='del'>-	file-&gt;private_data = alloc_buffer(inode-&gt;i_private,</div><div class='del'>-					  fill_periodic_buffer);</div><div class='add'>+	struct debug_buffer *buf;</div><div class='add'>+	buf = alloc_buffer(inode-&gt;i_private, fill_periodic_buffer);</div><div class='add'>+	if (!buf)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	return file-&gt;private_data ? 0 : -ENOMEM;</div><div class='add'>+	buf-&gt;alloc_size = (sizeof(void *) == 4 ? 6 : 8)*PAGE_SIZE;</div><div class='add'>+	file-&gt;private_data = buf;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int debug_registers_open(struct inode *inode, struct file *file)</div><div class='head'>diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c<br/>index 8409e0705d63..d343afacb0b0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/host/ehci-hcd.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/host/ehci-hcd.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/host/ehci-hcd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/host/ehci-hcd.c</a></div><div class='hunk'>@@ -24,6 +24,7 @@</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/timer.h&gt;</div><div class='hunk'>@@ -59,7 +60,6 @@</div><div class='ctx'>  * providing early devices for those host controllers to talk to!</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define DRIVER_VERSION "10 Dec 2004"</div><div class='ctx'> #define DRIVER_AUTHOR "David Brownell"</div><div class='ctx'> #define DRIVER_DESC "USB 2.0 'Enhanced' Host Controller (EHCI) Driver"</div><div class='ctx'> </div><div class='hunk'>@@ -620,9 +620,9 @@ static int ehci_run (struct usb_hcd *hcd)</div><div class='ctx'> </div><div class='ctx'> 	temp = HC_VERSION(ehci_readl(ehci, &amp;ehci-&gt;caps-&gt;hc_capbase));</div><div class='ctx'> 	ehci_info (ehci,</div><div class='del'>-		"USB %x.%x started, EHCI %x.%02x, driver %s%s\n",</div><div class='add'>+		"USB %x.%x started, EHCI %x.%02x%s\n",</div><div class='ctx'> 		((ehci-&gt;sbrn &amp; 0xf0)&gt;&gt;4), (ehci-&gt;sbrn &amp; 0x0f),</div><div class='del'>-		temp &gt;&gt; 8, temp &amp; 0xff, DRIVER_VERSION,</div><div class='add'>+		temp &gt;&gt; 8, temp &amp; 0xff,</div><div class='ctx'> 		ignore_oc ? ", overcurrent ignored" : "");</div><div class='ctx'> </div><div class='ctx'> 	ehci_writel(ehci, INTR_MASK,</div><div class='hunk'>@@ -706,7 +706,7 @@ static irqreturn_t ehci_irq (struct usb_hcd *hcd)</div><div class='ctx'> 		pcd_status = status;</div><div class='ctx'> </div><div class='ctx'> 		/* resume root hub? */</div><div class='del'>-		if (!(ehci_readl(ehci, &amp;ehci-&gt;regs-&gt;command) &amp; CMD_RUN))</div><div class='add'>+		if (!(cmd &amp; CMD_RUN))</div><div class='ctx'> 			usb_hcd_resume_root_hub(hcd);</div><div class='ctx'> </div><div class='ctx'> 		while (i--) {</div><div class='hunk'>@@ -715,8 +715,11 @@ static irqreturn_t ehci_irq (struct usb_hcd *hcd)</div><div class='ctx'> </div><div class='ctx'> 			if (pstatus &amp; PORT_OWNER)</div><div class='ctx'> 				continue;</div><div class='del'>-			if (!(pstatus &amp; PORT_RESUME)</div><div class='del'>-					|| ehci-&gt;reset_done [i] != 0)</div><div class='add'>+			if (!(test_bit(i, &amp;ehci-&gt;suspended_ports) &amp;&amp;</div><div class='add'>+					((pstatus &amp; PORT_RESUME) ||</div><div class='add'>+						!(pstatus &amp; PORT_SUSPEND)) &amp;&amp;</div><div class='add'>+					(pstatus &amp; PORT_PE) &amp;&amp;</div><div class='add'>+					ehci-&gt;reset_done[i] == 0))</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='ctx'> 			/* start 20 msec resume signaling from this port,</div><div class='hunk'>@@ -731,9 +734,8 @@ static irqreturn_t ehci_irq (struct usb_hcd *hcd)</div><div class='ctx'> </div><div class='ctx'> 	/* PCI errors [4.15.2.4] */</div><div class='ctx'> 	if (unlikely ((status &amp; STS_FATAL) != 0)) {</div><div class='del'>-		dbg_cmd (ehci, "fatal", ehci_readl(ehci,</div><div class='del'>-						   &amp;ehci-&gt;regs-&gt;command));</div><div class='del'>-		dbg_status (ehci, "fatal", status);</div><div class='add'>+		dbg_cmd(ehci, "fatal", cmd);</div><div class='add'>+		dbg_status(ehci, "fatal", status);</div><div class='ctx'> 		if (status &amp; STS_HALT) {</div><div class='ctx'> 			ehci_err (ehci, "fatal error\n");</div><div class='ctx'> dead:</div><div class='hunk'>@@ -994,9 +996,7 @@ static int ehci_get_frame (struct usb_hcd *hcd)</div><div class='ctx'> </div><div class='ctx'> /*-------------------------------------------------------------------------*/</div><div class='ctx'> </div><div class='del'>-#define DRIVER_INFO DRIVER_VERSION " " DRIVER_DESC</div><div class='del'>-</div><div class='del'>-MODULE_DESCRIPTION (DRIVER_INFO);</div><div class='add'>+MODULE_DESCRIPTION(DRIVER_DESC);</div><div class='ctx'> MODULE_AUTHOR (DRIVER_AUTHOR);</div><div class='ctx'> MODULE_LICENSE ("GPL");</div><div class='ctx'> </div><div class='hunk'>@@ -1020,11 +1020,6 @@ MODULE_LICENSE ("GPL");</div><div class='ctx'> #define	PS3_SYSTEM_BUS_DRIVER	ps3_ehci_driver</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_440EPX) &amp;&amp; !defined(CONFIG_PPC_MERGE)</div><div class='del'>-#include "ehci-ppc-soc.c"</div><div class='del'>-#define	PLATFORM_DRIVER		ehci_ppc_soc_driver</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_USB_EHCI_HCD_PPC_OF</div><div class='ctx'> #include "ehci-ppc-of.c"</div><div class='ctx'> #define OF_PLATFORM_DRIVER	ehci_hcd_ppc_of_driver</div><div class='hunk'>@@ -1049,6 +1044,16 @@ static int __init ehci_hcd_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int retval = 0;</div><div class='ctx'> </div><div class='add'>+	if (usb_disabled())</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "%s: " DRIVER_DESC "\n", hcd_name);</div><div class='add'>+	set_bit(USB_EHCI_LOADED, &amp;usb_hcds_loaded);</div><div class='add'>+	if (test_bit(USB_UHCI_LOADED, &amp;usb_hcds_loaded) ||</div><div class='add'>+			test_bit(USB_OHCI_LOADED, &amp;usb_hcds_loaded))</div><div class='add'>+		printk(KERN_WARNING "Warning! ehci_hcd should always be loaded"</div><div class='add'>+				" before uhci_hcd and ohci_hcd, not after\n");</div><div class='add'>+</div><div class='ctx'> 	pr_debug("%s: block sizes: qh %Zd qtd %Zd itd %Zd sitd %Zd\n",</div><div class='ctx'> 		 hcd_name,</div><div class='ctx'> 		 sizeof(struct ehci_qh), sizeof(struct ehci_qtd),</div><div class='hunk'>@@ -1056,8 +1061,10 @@ static int __init ehci_hcd_init(void)</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 	ehci_debug_root = debugfs_create_dir("ehci", NULL);</div><div class='del'>-	if (!ehci_debug_root)</div><div class='del'>-		return -ENOENT;</div><div class='add'>+	if (!ehci_debug_root) {</div><div class='add'>+		retval = -ENOENT;</div><div class='add'>+		goto err_debug;</div><div class='add'>+	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PLATFORM_DRIVER</div><div class='hunk'>@@ -1105,6 +1112,8 @@ clean0:</div><div class='ctx'> 	debugfs_remove(ehci_debug_root);</div><div class='ctx'> 	ehci_debug_root = NULL;</div><div class='ctx'> #endif</div><div class='add'>+err_debug:</div><div class='add'>+	clear_bit(USB_EHCI_LOADED, &amp;usb_hcds_loaded);</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> module_init(ehci_hcd_init);</div><div class='hunk'>@@ -1126,6 +1135,7 @@ static void __exit ehci_hcd_cleanup(void)</div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 	debugfs_remove(ehci_debug_root);</div><div class='ctx'> #endif</div><div class='add'>+	clear_bit(USB_EHCI_LOADED, &amp;usb_hcds_loaded);</div><div class='ctx'> }</div><div class='ctx'> module_exit(ehci_hcd_cleanup);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c<br/>index 740835bb8575..218f9660d7ee 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/host/ehci-hub.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/host/ehci-hub.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/host/ehci-hub.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/host/ehci-hub.c</a></div><div class='hunk'>@@ -236,10 +236,8 @@ static int ehci_bus_resume (struct usb_hcd *hcd)</div><div class='ctx'> 		temp = ehci_readl(ehci, &amp;ehci-&gt;regs-&gt;port_status [i]);</div><div class='ctx'> 		temp &amp;= ~(PORT_RWC_BITS | PORT_WAKE_BITS);</div><div class='ctx'> 		if (test_bit(i, &amp;ehci-&gt;bus_suspended) &amp;&amp;</div><div class='del'>-				(temp &amp; PORT_SUSPEND)) {</div><div class='del'>-			ehci-&gt;reset_done [i] = jiffies + msecs_to_jiffies (20);</div><div class='add'>+				(temp &amp; PORT_SUSPEND))</div><div class='ctx'> 			temp |= PORT_RESUME;</div><div class='del'>-		}</div><div class='ctx'> 		ehci_writel(ehci, temp, &amp;ehci-&gt;regs-&gt;port_status [i]);</div><div class='ctx'> 	}</div><div class='ctx'> 	i = HCS_N_PORTS (ehci-&gt;hcs_params);</div><div class='hunk'>@@ -482,10 +480,9 @@ ehci_hub_status_data (struct usb_hcd *hcd, char *buf)</div><div class='ctx'> 		 * controller by the user.</div><div class='ctx'> 		 */</div><div class='ctx'> </div><div class='del'>-		if ((temp &amp; mask) != 0</div><div class='del'>-				|| ((temp &amp; PORT_RESUME) != 0</div><div class='del'>-					&amp;&amp; time_after_eq(jiffies,</div><div class='del'>-						ehci-&gt;reset_done[i]))) {</div><div class='add'>+		if ((temp &amp; mask) != 0 || test_bit(i, &amp;ehci-&gt;port_c_suspend)</div><div class='add'>+				|| (ehci-&gt;reset_done[i] &amp;&amp; time_after_eq(</div><div class='add'>+					jiffies, ehci-&gt;reset_done[i]))) {</div><div class='ctx'> 			if (i &lt; 7)</div><div class='ctx'> 			    buf [0] |= 1 &lt;&lt; (i + 1);</div><div class='ctx'> 			else</div><div class='hunk'>@@ -688,6 +685,7 @@ static int ehci_hub_control (</div><div class='ctx'> 			/* resume completed? */</div><div class='ctx'> 			else if (time_after_eq(jiffies,</div><div class='ctx'> 					ehci-&gt;reset_done[wIndex])) {</div><div class='add'>+				clear_bit(wIndex, &amp;ehci-&gt;suspended_ports);</div><div class='ctx'> 				set_bit(wIndex, &amp;ehci-&gt;port_c_suspend);</div><div class='ctx'> 				ehci-&gt;reset_done[wIndex] = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -734,6 +732,9 @@ static int ehci_hub_control (</div><div class='ctx'> 					ehci_readl(ehci, status_reg));</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		if (!(temp &amp; (PORT_RESUME|PORT_RESET)))</div><div class='add'>+			ehci-&gt;reset_done[wIndex] = 0;</div><div class='add'>+</div><div class='ctx'> 		/* transfer dedicated ports to the companion hc */</div><div class='ctx'> 		if ((temp &amp; PORT_CONNECT) &amp;&amp;</div><div class='ctx'> 				test_bit(wIndex, &amp;ehci-&gt;companion_ports)) {</div><div class='hunk'>@@ -757,8 +758,17 @@ static int ehci_hub_control (</div><div class='ctx'> 		}</div><div class='ctx'> 		if (temp &amp; PORT_PE)</div><div class='ctx'> 			status |= 1 &lt;&lt; USB_PORT_FEAT_ENABLE;</div><div class='del'>-		if (temp &amp; (PORT_SUSPEND|PORT_RESUME))</div><div class='add'>+</div><div class='add'>+		/* maybe the port was unsuspended without our knowledge */</div><div class='add'>+		if (temp &amp; (PORT_SUSPEND|PORT_RESUME)) {</div><div class='ctx'> 			status |= 1 &lt;&lt; USB_PORT_FEAT_SUSPEND;</div><div class='add'>+		} else if (test_bit(wIndex, &amp;ehci-&gt;suspended_ports)) {</div><div class='add'>+			clear_bit(wIndex, &amp;ehci-&gt;suspended_ports);</div><div class='add'>+			ehci-&gt;reset_done[wIndex] = 0;</div><div class='add'>+			if (temp &amp; PORT_PE)</div><div class='add'>+				set_bit(wIndex, &amp;ehci-&gt;port_c_suspend);</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		if (temp &amp; PORT_OC)</div><div class='ctx'> 			status |= 1 &lt;&lt; USB_PORT_FEAT_OVER_CURRENT;</div><div class='ctx'> 		if (temp &amp; PORT_RESET)</div><div class='hunk'>@@ -803,6 +813,7 @@ static int ehci_hub_control (</div><div class='ctx'> 					|| (temp &amp; PORT_RESET) != 0)</div><div class='ctx'> 				goto error;</div><div class='ctx'> 			ehci_writel(ehci, temp | PORT_SUSPEND, status_reg);</div><div class='add'>+			set_bit(wIndex, &amp;ehci-&gt;suspended_ports);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case USB_PORT_FEAT_POWER:</div><div class='ctx'> 			if (HCS_PPC (ehci-&gt;hcs_params))</div><div class='head'>diff --git a/drivers/usb/host/ehci-ixp4xx.c b/drivers/usb/host/ehci-ixp4xx.c<br/>index f9575c409124..9c32063a0c2f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/host/ehci-ixp4xx.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/host/ehci-ixp4xx.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/host/ehci-ixp4xx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/host/ehci-ixp4xx.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  * IXP4XX EHCI Host Controller Driver</div><div class='ctx'>  *</div><div class='del'>- * Author: Vladimir Barinov &lt;vbarinov@ru.mvista.com&gt;</div><div class='add'>+ * Author: Vladimir Barinov &lt;vbarinov@embeddedalley.com&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * Based on "ehci-fsl.c" by Randy Vinson &lt;rvinson@mvista.com&gt;</div><div class='ctx'>  *</div><div class='head'>diff --git a/drivers/usb/host/ehci-ppc-soc.c b/drivers/usb/host/ehci-ppc-soc.c<br/>deleted file mode 100644<br/>index 529590eb4037..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/host/ehci-ppc-soc.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/host/ehci-ppc-soc.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,201 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * EHCI HCD (Host Controller Driver) for USB.</div><div class='del'>- *</div><div class='del'>- * (C) Copyright 2006-2007 Stefan Roese &lt;sr@denx.de&gt;, DENX Software Engineering</div><div class='del'>- *</div><div class='del'>- * Bus Glue for PPC On-Chip EHCI driver</div><div class='del'>- * Tested on AMCC 440EPx</div><div class='del'>- *</div><div class='del'>- * Based on "ehci-au1xxx.c" by K.Boge &lt;karsten.boge@amd.com&gt;</div><div class='del'>- *</div><div class='del'>- * This file is licenced under the GPL.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/platform_device.h&gt;</div><div class='del'>-</div><div class='del'>-extern int usb_disabled(void);</div><div class='del'>-</div><div class='del'>-/* called during probe() after chip reset completes */</div><div class='del'>-static int ehci_ppc_soc_setup(struct usb_hcd *hcd)</div><div class='del'>-{</div><div class='del'>-	struct ehci_hcd	*ehci = hcd_to_ehci(hcd);</div><div class='del'>-	int		retval;</div><div class='del'>-</div><div class='del'>-	retval = ehci_halt(ehci);</div><div class='del'>-	if (retval)</div><div class='del'>-		return retval;</div><div class='del'>-</div><div class='del'>-	retval = ehci_init(hcd);</div><div class='del'>-	if (retval)</div><div class='del'>-		return retval;</div><div class='del'>-</div><div class='del'>-	ehci-&gt;sbrn = 0x20;</div><div class='del'>-	return ehci_reset(ehci);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * usb_ehci_ppc_soc_probe - initialize PPC-SoC-based HCDs</div><div class='del'>- * Context: !in_interrupt()</div><div class='del'>- *</div><div class='del'>- * Allocates basic resources for this USB host controller, and</div><div class='del'>- * then invokes the start() method for the HCD associated with it</div><div class='del'>- * through the hotplug entry's driver_data.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-int usb_ehci_ppc_soc_probe(const struct hc_driver *driver,</div><div class='del'>-			   struct usb_hcd **hcd_out,</div><div class='del'>-			   struct platform_device *dev)</div><div class='del'>-{</div><div class='del'>-	int retval;</div><div class='del'>-	struct usb_hcd *hcd;</div><div class='del'>-	struct ehci_hcd *ehci;</div><div class='del'>-</div><div class='del'>-	if (dev-&gt;resource[1].flags != IORESOURCE_IRQ) {</div><div class='del'>-		pr_debug("resource[1] is not IORESOURCE_IRQ");</div><div class='del'>-		retval = -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-	hcd = usb_create_hcd(driver, &amp;dev-&gt;dev, "PPC-SOC EHCI");</div><div class='del'>-	if (!hcd)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	hcd-&gt;rsrc_start = dev-&gt;resource[0].start;</div><div class='del'>-	hcd-&gt;rsrc_len = dev-&gt;resource[0].end - dev-&gt;resource[0].start + 1;</div><div class='del'>-</div><div class='del'>-	if (!request_mem_region(hcd-&gt;rsrc_start, hcd-&gt;rsrc_len, hcd_name)) {</div><div class='del'>-		pr_debug("request_mem_region failed");</div><div class='del'>-		retval = -EBUSY;</div><div class='del'>-		goto err1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hcd-&gt;regs = ioremap(hcd-&gt;rsrc_start, hcd-&gt;rsrc_len);</div><div class='del'>-	if (!hcd-&gt;regs) {</div><div class='del'>-		pr_debug("ioremap failed");</div><div class='del'>-		retval = -ENOMEM;</div><div class='del'>-		goto err2;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ehci = hcd_to_ehci(hcd);</div><div class='del'>-	ehci-&gt;big_endian_mmio = 1;</div><div class='del'>-	ehci-&gt;big_endian_desc = 1;</div><div class='del'>-	ehci-&gt;caps = hcd-&gt;regs;</div><div class='del'>-	ehci-&gt;regs = hcd-&gt;regs + HC_LENGTH(ehci_readl(ehci, &amp;ehci-&gt;caps-&gt;hc_capbase));</div><div class='del'>-</div><div class='del'>-	/* cache this readonly data; minimize chip reads */</div><div class='del'>-	ehci-&gt;hcs_params = ehci_readl(ehci, &amp;ehci-&gt;caps-&gt;hcs_params);</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_440EPX)</div><div class='del'>-	/*</div><div class='del'>-	 * 440EPx Errata USBH_3</div><div class='del'>-	 * Fix: Enable Break Memory Transfer (BMT) in INSNREG3</div><div class='del'>-	 */</div><div class='del'>-	out_be32((void *)((ulong)(&amp;ehci-&gt;regs-&gt;command) + 0x8c), (1 &lt;&lt; 0));</div><div class='del'>-	ehci_dbg(ehci, "Break Memory Transfer (BMT) has beed enabled!\n");</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	retval = usb_add_hcd(hcd, dev-&gt;resource[1].start, IRQF_DISABLED);</div><div class='del'>-	if (retval == 0)</div><div class='del'>-		return retval;</div><div class='del'>-</div><div class='del'>-	iounmap(hcd-&gt;regs);</div><div class='del'>-err2:</div><div class='del'>-	release_mem_region(hcd-&gt;rsrc_start, hcd-&gt;rsrc_len);</div><div class='del'>-err1:</div><div class='del'>-	usb_put_hcd(hcd);</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* may be called without controller electrically present */</div><div class='del'>-/* may be called with controller, bus, and devices active */</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * usb_ehci_hcd_ppc_soc_remove - shutdown processing for PPC-SoC-based HCDs</div><div class='del'>- * @dev: USB Host Controller being removed</div><div class='del'>- * Context: !in_interrupt()</div><div class='del'>- *</div><div class='del'>- * Reverses the effect of usb_ehci_hcd_ppc_soc_probe(), first invoking</div><div class='del'>- * the HCD's stop() method.  It is always called from a thread</div><div class='del'>- * context, normally "rmmod", "apmd", or something similar.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-void usb_ehci_ppc_soc_remove(struct usb_hcd *hcd, struct platform_device *dev)</div><div class='del'>-{</div><div class='del'>-	usb_remove_hcd(hcd);</div><div class='del'>-	iounmap(hcd-&gt;regs);</div><div class='del'>-	release_mem_region(hcd-&gt;rsrc_start, hcd-&gt;rsrc_len);</div><div class='del'>-	usb_put_hcd(hcd);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct hc_driver ehci_ppc_soc_hc_driver = {</div><div class='del'>-	.description = hcd_name,</div><div class='del'>-	.product_desc = "PPC-SOC EHCI",</div><div class='del'>-	.hcd_priv_size = sizeof(struct ehci_hcd),</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * generic hardware linkage</div><div class='del'>-	 */</div><div class='del'>-	.irq = ehci_irq,</div><div class='del'>-	.flags = HCD_MEMORY | HCD_USB2,</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * basic lifecycle operations</div><div class='del'>-	 */</div><div class='del'>-	.reset = ehci_ppc_soc_setup,</div><div class='del'>-	.start = ehci_run,</div><div class='del'>-	.stop = ehci_stop,</div><div class='del'>-	.shutdown = ehci_shutdown,</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * managing i/o requests and associated device resources</div><div class='del'>-	 */</div><div class='del'>-	.urb_enqueue = ehci_urb_enqueue,</div><div class='del'>-	.urb_dequeue = ehci_urb_dequeue,</div><div class='del'>-	.endpoint_disable = ehci_endpoint_disable,</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * scheduling support</div><div class='del'>-	 */</div><div class='del'>-	.get_frame_number = ehci_get_frame,</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * root hub support</div><div class='del'>-	 */</div><div class='del'>-	.hub_status_data = ehci_hub_status_data,</div><div class='del'>-	.hub_control = ehci_hub_control,</div><div class='del'>-	.bus_suspend = ehci_bus_suspend,</div><div class='del'>-	.bus_resume = ehci_bus_resume,</div><div class='del'>-	.relinquish_port = ehci_relinquish_port,</div><div class='del'>-	.port_handed_over = ehci_port_handed_over,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int ehci_hcd_ppc_soc_drv_probe(struct platform_device *pdev)</div><div class='del'>-{</div><div class='del'>-	struct usb_hcd *hcd = NULL;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	pr_debug("In ehci_hcd_ppc_soc_drv_probe\n");</div><div class='del'>-</div><div class='del'>-	if (usb_disabled())</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	/* FIXME we only want one one probe() not two */</div><div class='del'>-	ret = usb_ehci_ppc_soc_probe(&amp;ehci_ppc_soc_hc_driver, &amp;hcd, pdev);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ehci_hcd_ppc_soc_drv_remove(struct platform_device *pdev)</div><div class='del'>-{</div><div class='del'>-	struct usb_hcd *hcd = platform_get_drvdata(pdev);</div><div class='del'>-</div><div class='del'>-	/* FIXME we only want one one remove() not two */</div><div class='del'>-	usb_ehci_ppc_soc_remove(hcd, pdev);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-MODULE_ALIAS("platform:ppc-soc-ehci");</div><div class='del'>-static struct platform_driver ehci_ppc_soc_driver = {</div><div class='del'>-	.probe = ehci_hcd_ppc_soc_drv_probe,</div><div class='del'>-	.remove = ehci_hcd_ppc_soc_drv_remove,</div><div class='del'>-	.shutdown = usb_hcd_platform_shutdown,</div><div class='del'>-	.driver = {</div><div class='del'>-		.name = "ppc-soc-ehci",</div><div class='del'>-	}</div><div class='del'>-};</div><div class='head'>diff --git a/drivers/usb/host/ehci.h b/drivers/usb/host/ehci.h<br/>index 5799298364fb..b11798d17ae5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/host/ehci.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/host/ehci.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/host/ehci.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/host/ehci.h</a></div><div class='hunk'>@@ -99,6 +99,8 @@ struct ehci_hcd {			/* one per controller */</div><div class='ctx'> 			owned by the companion during a bus suspend */</div><div class='ctx'> 	unsigned long		port_c_suspend;		/* which ports have</div><div class='ctx'> 			the change-suspend feature turned on */</div><div class='add'>+	unsigned long		suspended_ports;	/* which ports are</div><div class='add'>+			suspended */</div><div class='ctx'> </div><div class='ctx'> 	/* per-HC memory pools (could be per-bus, but ...) */</div><div class='ctx'> 	struct dma_pool		*qh_pool;	/* qh per active urb */</div><div class='hunk'>@@ -181,14 +183,16 @@ timer_action (struct ehci_hcd *ehci, enum ehci_timer_action action)</div><div class='ctx'> 	 * the async ring; just the I/O watchdog.  Note that if a</div><div class='ctx'> 	 * SHRINK were pending, OFF would never be requested.</div><div class='ctx'> 	 */</div><div class='del'>-	if (timer_pending(&amp;ehci-&gt;watchdog)</div><div class='del'>-			&amp;&amp; ((BIT(TIMER_ASYNC_SHRINK) | BIT(TIMER_ASYNC_OFF))</div><div class='del'>-				&amp; ehci-&gt;actions))</div><div class='del'>-		return;</div><div class='add'>+	enum ehci_timer_action oldactions = ehci-&gt;actions;</div><div class='ctx'> </div><div class='ctx'> 	if (!test_and_set_bit (action, &amp;ehci-&gt;actions)) {</div><div class='ctx'> 		unsigned long t;</div><div class='ctx'> </div><div class='add'>+		if (timer_pending(&amp;ehci-&gt;watchdog)</div><div class='add'>+			&amp;&amp; ((BIT(TIMER_ASYNC_SHRINK) | BIT(TIMER_ASYNC_OFF))</div><div class='add'>+				&amp; oldactions))</div><div class='add'>+			return;</div><div class='add'>+</div><div class='ctx'> 		switch (action) {</div><div class='ctx'> 		case TIMER_IO_WATCHDOG:</div><div class='ctx'> 			t = EHCI_IO_JIFFIES;</div><div class='hunk'>@@ -204,149 +208,13 @@ timer_action (struct ehci_hcd *ehci, enum ehci_timer_action action)</div><div class='ctx'> 			t = DIV_ROUND_UP(EHCI_SHRINK_FRAMES * HZ, 1000) + 1;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		mod_timer(&amp;ehci-&gt;watchdog, t + jiffies);</div><div class='add'>+		mod_timer(&amp;ehci-&gt;watchdog, round_jiffies(t + jiffies));</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*-------------------------------------------------------------------------*/</div><div class='ctx'> </div><div class='del'>-/* EHCI register interface, corresponds to EHCI Revision 0.95 specification */</div><div class='del'>-</div><div class='del'>-/* Section 2.2 Host Controller Capability Registers */</div><div class='del'>-struct ehci_caps {</div><div class='del'>-	/* these fields are specified as 8 and 16 bit registers,</div><div class='del'>-	 * but some hosts can't perform 8 or 16 bit PCI accesses.</div><div class='del'>-	 */</div><div class='del'>-	u32		hc_capbase;</div><div class='del'>-#define HC_LENGTH(p)		(((p)&gt;&gt;00)&amp;0x00ff)	/* bits 7:0 */</div><div class='del'>-#define HC_VERSION(p)		(((p)&gt;&gt;16)&amp;0xffff)	/* bits 31:16 */</div><div class='del'>-	u32		hcs_params;     /* HCSPARAMS - offset 0x4 */</div><div class='del'>-#define HCS_DEBUG_PORT(p)	(((p)&gt;&gt;20)&amp;0xf)	/* bits 23:20, debug port? */</div><div class='del'>-#define HCS_INDICATOR(p)	((p)&amp;(1 &lt;&lt; 16))	/* true: has port indicators */</div><div class='del'>-#define HCS_N_CC(p)		(((p)&gt;&gt;12)&amp;0xf)	/* bits 15:12, #companion HCs */</div><div class='del'>-#define HCS_N_PCC(p)		(((p)&gt;&gt;8)&amp;0xf)	/* bits 11:8, ports per CC */</div><div class='del'>-#define HCS_PORTROUTED(p)	((p)&amp;(1 &lt;&lt; 7))	/* true: port routing */</div><div class='del'>-#define HCS_PPC(p)		((p)&amp;(1 &lt;&lt; 4))	/* true: port power control */</div><div class='del'>-#define HCS_N_PORTS(p)		(((p)&gt;&gt;0)&amp;0xf)	/* bits 3:0, ports on HC */</div><div class='del'>-</div><div class='del'>-	u32		hcc_params;      /* HCCPARAMS - offset 0x8 */</div><div class='del'>-#define HCC_EXT_CAPS(p)		(((p)&gt;&gt;8)&amp;0xff)	/* for pci extended caps */</div><div class='del'>-#define HCC_ISOC_CACHE(p)       ((p)&amp;(1 &lt;&lt; 7))  /* true: can cache isoc frame */</div><div class='del'>-#define HCC_ISOC_THRES(p)       (((p)&gt;&gt;4)&amp;0x7)  /* bits 6:4, uframes cached */</div><div class='del'>-#define HCC_CANPARK(p)		((p)&amp;(1 &lt;&lt; 2))  /* true: can park on async qh */</div><div class='del'>-#define HCC_PGM_FRAMELISTLEN(p) ((p)&amp;(1 &lt;&lt; 1))  /* true: periodic_size changes*/</div><div class='del'>-#define HCC_64BIT_ADDR(p)       ((p)&amp;(1))       /* true: can use 64-bit addr */</div><div class='del'>-	u8		portroute [8];	 /* nibbles for routing - offset 0xC */</div><div class='del'>-} __attribute__ ((packed));</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Section 2.3 Host Controller Operational Registers */</div><div class='del'>-struct ehci_regs {</div><div class='del'>-</div><div class='del'>-	/* USBCMD: offset 0x00 */</div><div class='del'>-	u32		command;</div><div class='del'>-/* 23:16 is r/w intr rate, in microframes; default "8" == 1/msec */</div><div class='del'>-#define CMD_PARK	(1&lt;&lt;11)		/* enable "park" on async qh */</div><div class='del'>-#define CMD_PARK_CNT(c)	(((c)&gt;&gt;8)&amp;3)	/* how many transfers to park for */</div><div class='del'>-#define CMD_LRESET	(1&lt;&lt;7)		/* partial reset (no ports, etc) */</div><div class='del'>-#define CMD_IAAD	(1&lt;&lt;6)		/* "doorbell" interrupt async advance */</div><div class='del'>-#define CMD_ASE		(1&lt;&lt;5)		/* async schedule enable */</div><div class='del'>-#define CMD_PSE		(1&lt;&lt;4)		/* periodic schedule enable */</div><div class='del'>-/* 3:2 is periodic frame list size */</div><div class='del'>-#define CMD_RESET	(1&lt;&lt;1)		/* reset HC not bus */</div><div class='del'>-#define CMD_RUN		(1&lt;&lt;0)		/* start/stop HC */</div><div class='del'>-</div><div class='del'>-	/* USBSTS: offset 0x04 */</div><div class='del'>-	u32		status;</div><div class='del'>-#define STS_ASS		(1&lt;&lt;15)		/* Async Schedule Status */</div><div class='del'>-#define STS_PSS		(1&lt;&lt;14)		/* Periodic Schedule Status */</div><div class='del'>-#define STS_RECL	(1&lt;&lt;13)		/* Reclamation */</div><div class='del'>-#define STS_HALT	(1&lt;&lt;12)		/* Not running (any reason) */</div><div class='del'>-/* some bits reserved */</div><div class='del'>-	/* these STS_* flags are also intr_enable bits (USBINTR) */</div><div class='del'>-#define STS_IAA		(1&lt;&lt;5)		/* Interrupted on async advance */</div><div class='del'>-#define STS_FATAL	(1&lt;&lt;4)		/* such as some PCI access errors */</div><div class='del'>-#define STS_FLR		(1&lt;&lt;3)		/* frame list rolled over */</div><div class='del'>-#define STS_PCD		(1&lt;&lt;2)		/* port change detect */</div><div class='del'>-#define STS_ERR		(1&lt;&lt;1)		/* "error" completion (overflow, ...) */</div><div class='del'>-#define STS_INT		(1&lt;&lt;0)		/* "normal" completion (short, ...) */</div><div class='del'>-</div><div class='del'>-	/* USBINTR: offset 0x08 */</div><div class='del'>-	u32		intr_enable;</div><div class='del'>-</div><div class='del'>-	/* FRINDEX: offset 0x0C */</div><div class='del'>-	u32		frame_index;	/* current microframe number */</div><div class='del'>-	/* CTRLDSSEGMENT: offset 0x10 */</div><div class='del'>-	u32		segment;	/* address bits 63:32 if needed */</div><div class='del'>-	/* PERIODICLISTBASE: offset 0x14 */</div><div class='del'>-	u32		frame_list;	/* points to periodic list */</div><div class='del'>-	/* ASYNCLISTADDR: offset 0x18 */</div><div class='del'>-	u32		async_next;	/* address of next async queue head */</div><div class='del'>-</div><div class='del'>-	u32		reserved [9];</div><div class='del'>-</div><div class='del'>-	/* CONFIGFLAG: offset 0x40 */</div><div class='del'>-	u32		configured_flag;</div><div class='del'>-#define FLAG_CF		(1&lt;&lt;0)		/* true: we'll support "high speed" */</div><div class='del'>-</div><div class='del'>-	/* PORTSC: offset 0x44 */</div><div class='del'>-	u32		port_status [0];	/* up to N_PORTS */</div><div class='del'>-/* 31:23 reserved */</div><div class='del'>-#define PORT_WKOC_E	(1&lt;&lt;22)		/* wake on overcurrent (enable) */</div><div class='del'>-#define PORT_WKDISC_E	(1&lt;&lt;21)		/* wake on disconnect (enable) */</div><div class='del'>-#define PORT_WKCONN_E	(1&lt;&lt;20)		/* wake on connect (enable) */</div><div class='del'>-/* 19:16 for port testing */</div><div class='del'>-#define PORT_LED_OFF	(0&lt;&lt;14)</div><div class='del'>-#define PORT_LED_AMBER	(1&lt;&lt;14)</div><div class='del'>-#define PORT_LED_GREEN	(2&lt;&lt;14)</div><div class='del'>-#define PORT_LED_MASK	(3&lt;&lt;14)</div><div class='del'>-#define PORT_OWNER	(1&lt;&lt;13)		/* true: companion hc owns this port */</div><div class='del'>-#define PORT_POWER	(1&lt;&lt;12)		/* true: has power (see PPC) */</div><div class='del'>-#define PORT_USB11(x) (((x)&amp;(3&lt;&lt;10))==(1&lt;&lt;10))	/* USB 1.1 device */</div><div class='del'>-/* 11:10 for detecting lowspeed devices (reset vs release ownership) */</div><div class='del'>-/* 9 reserved */</div><div class='del'>-#define PORT_RESET	(1&lt;&lt;8)		/* reset port */</div><div class='del'>-#define PORT_SUSPEND	(1&lt;&lt;7)		/* suspend port */</div><div class='del'>-#define PORT_RESUME	(1&lt;&lt;6)		/* resume it */</div><div class='del'>-#define PORT_OCC	(1&lt;&lt;5)		/* over current change */</div><div class='del'>-#define PORT_OC		(1&lt;&lt;4)		/* over current active */</div><div class='del'>-#define PORT_PEC	(1&lt;&lt;3)		/* port enable change */</div><div class='del'>-#define PORT_PE		(1&lt;&lt;2)		/* port enable */</div><div class='del'>-#define PORT_CSC	(1&lt;&lt;1)		/* connect status change */</div><div class='del'>-#define PORT_CONNECT	(1&lt;&lt;0)		/* device connected */</div><div class='del'>-#define PORT_RWC_BITS   (PORT_CSC | PORT_PEC | PORT_OCC)</div><div class='del'>-} __attribute__ ((packed));</div><div class='del'>-</div><div class='del'>-#define USBMODE		0x68		/* USB Device mode */</div><div class='del'>-#define USBMODE_SDIS	(1&lt;&lt;3)		/* Stream disable */</div><div class='del'>-#define USBMODE_BE	(1&lt;&lt;2)		/* BE/LE endianness select */</div><div class='del'>-#define USBMODE_CM_HC	(3&lt;&lt;0)		/* host controller mode */</div><div class='del'>-#define USBMODE_CM_IDLE	(0&lt;&lt;0)		/* idle state */</div><div class='del'>-</div><div class='del'>-/* Appendix C, Debug port ... intended for use with special "debug devices"</div><div class='del'>- * that can help if there's no serial console.  (nonstandard enumeration.)</div><div class='del'>- */</div><div class='del'>-struct ehci_dbg_port {</div><div class='del'>-	u32	control;</div><div class='del'>-#define DBGP_OWNER	(1&lt;&lt;30)</div><div class='del'>-#define DBGP_ENABLED	(1&lt;&lt;28)</div><div class='del'>-#define DBGP_DONE	(1&lt;&lt;16)</div><div class='del'>-#define DBGP_INUSE	(1&lt;&lt;10)</div><div class='del'>-#define DBGP_ERRCODE(x)	(((x)&gt;&gt;7)&amp;0x07)</div><div class='del'>-#	define DBGP_ERR_BAD	1</div><div class='del'>-#	define DBGP_ERR_SIGNAL	2</div><div class='del'>-#define DBGP_ERROR	(1&lt;&lt;6)</div><div class='del'>-#define DBGP_GO		(1&lt;&lt;5)</div><div class='del'>-#define DBGP_OUT	(1&lt;&lt;4)</div><div class='del'>-#define DBGP_LEN(x)	(((x)&gt;&gt;0)&amp;0x0f)</div><div class='del'>-	u32	pids;</div><div class='del'>-#define DBGP_PID_GET(x)		(((x)&gt;&gt;16)&amp;0xff)</div><div class='del'>-#define DBGP_PID_SET(data,tok)	(((data)&lt;&lt;8)|(tok))</div><div class='del'>-	u32	data03;</div><div class='del'>-	u32	data47;</div><div class='del'>-	u32	address;</div><div class='del'>-#define DBGP_EPADDR(dev,ep)	(((dev)&lt;&lt;8)|(ep))</div><div class='del'>-} __attribute__ ((packed));</div><div class='add'>+#include &lt;linux/usb/ehci_def.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*-------------------------------------------------------------------------*/</div><div class='ctx'> </div><div class='hunk'>@@ -740,16 +608,7 @@ ehci_port_speed(struct ehci_hcd *ehci, unsigned int portsc)</div><div class='ctx'> /*</div><div class='ctx'>  * Big-endian read/write functions are arch-specific.</div><div class='ctx'>  * Other arches can be added if/when they're needed.</div><div class='del'>- *</div><div class='del'>- * REVISIT: arch/powerpc now has readl/writel_be, so the</div><div class='del'>- * definition below can die once the 4xx support is</div><div class='del'>- * finally ported over.</div><div class='ctx'>  */</div><div class='del'>-#if defined(CONFIG_PPC) &amp;&amp; !defined(CONFIG_PPC_MERGE)</div><div class='del'>-#define readl_be(addr)		in_be32((__force unsigned *)addr)</div><div class='del'>-#define writel_be(val, addr)	out_be32((__force unsigned *)addr, val)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #if defined(CONFIG_ARM) &amp;&amp; defined(CONFIG_ARCH_IXP4XX)</div><div class='ctx'> #define readl_be(addr)		__raw_readl((__force unsigned *)addr)</div><div class='ctx'> #define writel_be(val, addr)	__raw_writel(val, (__force unsigned *)addr)</div><div class='head'>diff --git a/drivers/usb/host/isp116x-hcd.c b/drivers/usb/host/isp116x-hcd.c<br/>index ce1ca0ba0515..4dda31b26892 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/host/isp116x-hcd.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/host/isp116x-hcd.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/host/isp116x-hcd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/host/isp116x-hcd.c</a></div><div class='hunk'>@@ -1562,11 +1562,12 @@ static int __devinit isp116x_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct usb_hcd *hcd;</div><div class='ctx'> 	struct isp116x *isp116x;</div><div class='del'>-	struct resource *addr, *data;</div><div class='add'>+	struct resource *addr, *data, *ires;</div><div class='ctx'> 	void __iomem *addr_reg;</div><div class='ctx'> 	void __iomem *data_reg;</div><div class='ctx'> 	int irq;</div><div class='ctx'> 	int ret = 0;</div><div class='add'>+	unsigned long irqflags;</div><div class='ctx'> </div><div class='ctx'> 	if (pdev-&gt;num_resources &lt; 3) {</div><div class='ctx'> 		ret = -ENODEV;</div><div class='hunk'>@@ -1575,12 +1576,16 @@ static int __devinit isp116x_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	data = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='ctx'> 	addr = platform_get_resource(pdev, IORESOURCE_MEM, 1);</div><div class='del'>-	irq = platform_get_irq(pdev, 0);</div><div class='del'>-	if (!addr || !data || irq &lt; 0) {</div><div class='add'>+	ires = platform_get_resource(pdev, IORESOURCE_IRQ, 0);</div><div class='add'>+</div><div class='add'>+	if (!addr || !data || !ires) {</div><div class='ctx'> 		ret = -ENODEV;</div><div class='ctx'> 		goto err1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	irq = ires-&gt;start;</div><div class='add'>+	irqflags = ires-&gt;flags &amp; IRQF_TRIGGER_MASK;</div><div class='add'>+</div><div class='ctx'> 	if (pdev-&gt;dev.dma_mask) {</div><div class='ctx'> 		DBG("DMA not supported\n");</div><div class='ctx'> 		ret = -EINVAL;</div><div class='hunk'>@@ -1634,7 +1639,7 @@ static int __devinit isp116x_probe(struct platform_device *pdev)</div><div class='ctx'> 		goto err6;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = usb_add_hcd(hcd, irq, IRQF_DISABLED);</div><div class='add'>+	ret = usb_add_hcd(hcd, irq, irqflags | IRQF_DISABLED);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err6;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/usb/host/isp1760-if.c b/drivers/usb/host/isp1760-if.c<br/>index 051ef7b6bdc6..af849f596135 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/host/isp1760-if.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/host/isp1760-if.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/host/isp1760-if.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/host/isp1760-if.c</a></div><div class='hunk'>@@ -218,7 +218,7 @@ static int __devinit isp1761_pci_probe(struct pci_dev *dev,</div><div class='ctx'> 	 * and reading back and checking the contents are same or not</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (reg_data != 0xFACE) {</div><div class='del'>-		err("scratch register mismatch %x", reg_data);</div><div class='add'>+		dev_err(&amp;dev-&gt;dev, "scratch register mismatch %x\n", reg_data);</div><div class='ctx'> 		goto clean;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -232,9 +232,10 @@ static int __devinit isp1761_pci_probe(struct pci_dev *dev,</div><div class='ctx'> 	hcd = isp1760_register(pci_mem_phy0, length, dev-&gt;irq,</div><div class='ctx'> 		IRQF_SHARED | IRQF_DISABLED, &amp;dev-&gt;dev, dev_name(&amp;dev-&gt;dev),</div><div class='ctx'> 		devflags);</div><div class='del'>-	pci_set_drvdata(dev, hcd);</div><div class='del'>-	if (!hcd)</div><div class='add'>+	if (!IS_ERR(hcd)) {</div><div class='add'>+		pci_set_drvdata(dev, hcd);</div><div class='ctx'> 		return 0;</div><div class='add'>+	}</div><div class='ctx'> clean:</div><div class='ctx'> 	status = -ENODEV;</div><div class='ctx'> 	iounmap(iobase);</div><div class='head'>diff --git a/drivers/usb/host/ohci-dbg.c b/drivers/usb/host/ohci-dbg.c<br/>index 7cef1d2f7ccc..d3269656aa4d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/host/ohci-dbg.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/host/ohci-dbg.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/host/ohci-dbg.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/host/ohci-dbg.c</a></div><div class='hunk'>@@ -649,7 +649,7 @@ static ssize_t fill_registers_buffer(struct debug_buffer *buf)</div><div class='ctx'> 	ohci_dbg_sw (ohci, &amp;next, &amp;size,</div><div class='ctx'> 		"bus %s, device %s\n"</div><div class='ctx'> 		"%s\n"</div><div class='del'>-		"%s version " DRIVER_VERSION "\n",</div><div class='add'>+		"%s\n",</div><div class='ctx'> 		hcd-&gt;self.controller-&gt;bus-&gt;name,</div><div class='ctx'> 		dev_name(hcd-&gt;self.controller),</div><div class='ctx'> 		hcd-&gt;product_desc,</div><div class='head'>diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c<br/>index 89901962cbfd..8647dab0d7f9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/host/ohci-hcd.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/host/ohci-hcd.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/host/ohci-hcd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/host/ohci-hcd.c</a></div><div class='hunk'>@@ -46,7 +46,6 @@</div><div class='ctx'> </div><div class='ctx'> #include "../core/hcd.h"</div><div class='ctx'> </div><div class='del'>-#define DRIVER_VERSION "2006 August 04"</div><div class='ctx'> #define DRIVER_AUTHOR "Roman Weissgaerber, David Brownell"</div><div class='ctx'> #define DRIVER_DESC "USB 1.1 'Open' Host Controller (OHCI) Driver"</div><div class='ctx'> </div><div class='hunk'>@@ -984,10 +983,8 @@ static int ohci_restart (struct ohci_hcd *ohci)</div><div class='ctx'> </div><div class='ctx'> /*-------------------------------------------------------------------------*/</div><div class='ctx'> </div><div class='del'>-#define DRIVER_INFO DRIVER_VERSION " " DRIVER_DESC</div><div class='del'>-</div><div class='ctx'> MODULE_AUTHOR (DRIVER_AUTHOR);</div><div class='del'>-MODULE_DESCRIPTION (DRIVER_INFO);</div><div class='add'>+MODULE_DESCRIPTION(DRIVER_DESC);</div><div class='ctx'> MODULE_LICENSE ("GPL");</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PCI</div><div class='hunk'>@@ -1095,9 +1092,10 @@ static int __init ohci_hcd_mod_init(void)</div><div class='ctx'> 	if (usb_disabled())</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	printk (KERN_DEBUG "%s: " DRIVER_INFO "\n", hcd_name);</div><div class='add'>+	printk(KERN_INFO "%s: " DRIVER_DESC "\n", hcd_name);</div><div class='ctx'> 	pr_debug ("%s: block sizes: ed %Zd td %Zd\n", hcd_name,</div><div class='ctx'> 		sizeof (struct ed), sizeof (struct td));</div><div class='add'>+	set_bit(USB_OHCI_LOADED, &amp;usb_hcds_loaded);</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 	ohci_debug_root = debugfs_create_dir("ohci", NULL);</div><div class='hunk'>@@ -1184,6 +1182,7 @@ static int __init ohci_hcd_mod_init(void)</div><div class='ctx'>  error_debug:</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+	clear_bit(USB_OHCI_LOADED, &amp;usb_hcds_loaded);</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> module_init(ohci_hcd_mod_init);</div><div class='hunk'>@@ -1214,6 +1213,7 @@ static void __exit ohci_hcd_mod_exit(void)</div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 	debugfs_remove(ohci_debug_root);</div><div class='ctx'> #endif</div><div class='add'>+	clear_bit(USB_OHCI_LOADED, &amp;usb_hcds_loaded);</div><div class='ctx'> }</div><div class='ctx'> module_exit(ohci_hcd_mod_exit);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/usb/host/ohci-hub.c b/drivers/usb/host/ohci-hub.c<br/>index 7ea9a7b31155..32bbce9718f0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/host/ohci-hub.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/host/ohci-hub.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/host/ohci-hub.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/host/ohci-hub.c</a></div><div class='hunk'>@@ -359,21 +359,24 @@ static void ohci_finish_controller_resume(struct usb_hcd *hcd)</div><div class='ctx'> </div><div class='ctx'> /* Carry out polling-, autostop-, and autoresume-related state changes */</div><div class='ctx'> static int ohci_root_hub_state_changes(struct ohci_hcd *ohci, int changed,</div><div class='del'>-		int any_connected)</div><div class='add'>+		int any_connected, int rhsc_status)</div><div class='ctx'> {</div><div class='ctx'> 	int	poll_rh = 1;</div><div class='del'>-	int	rhsc;</div><div class='add'>+	int	rhsc_enable;</div><div class='ctx'> </div><div class='del'>-	rhsc = ohci_readl(ohci, &amp;ohci-&gt;regs-&gt;intrenable) &amp; OHCI_INTR_RHSC;</div><div class='del'>-	switch (ohci-&gt;hc_control &amp; OHCI_CTRL_HCFS) {</div><div class='add'>+	/* Some broken controllers never turn off RHCS in the interrupt</div><div class='add'>+	 * status register.  For their sake we won't re-enable RHSC</div><div class='add'>+	 * interrupts if the interrupt bit is already active.</div><div class='add'>+	 */</div><div class='add'>+	rhsc_enable = ohci_readl(ohci, &amp;ohci-&gt;regs-&gt;intrenable) &amp;</div><div class='add'>+			OHCI_INTR_RHSC;</div><div class='ctx'> </div><div class='add'>+	switch (ohci-&gt;hc_control &amp; OHCI_CTRL_HCFS) {</div><div class='ctx'> 	case OHCI_USB_OPER:</div><div class='del'>-		/* If no status changes are pending, enable status-change</div><div class='del'>-		 * interrupts.</div><div class='del'>-		 */</div><div class='del'>-		if (!rhsc &amp;&amp; !changed) {</div><div class='del'>-			rhsc = OHCI_INTR_RHSC;</div><div class='del'>-			ohci_writel(ohci, rhsc, &amp;ohci-&gt;regs-&gt;intrenable);</div><div class='add'>+		/* If no status changes are pending, enable RHSC interrupts. */</div><div class='add'>+		if (!rhsc_enable &amp;&amp; !rhsc_status &amp;&amp; !changed) {</div><div class='add'>+			rhsc_enable = OHCI_INTR_RHSC;</div><div class='add'>+			ohci_writel(ohci, rhsc_enable, &amp;ohci-&gt;regs-&gt;intrenable);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Keep on polling until we know a device is connected</div><div class='hunk'>@@ -383,7 +386,7 @@ static int ohci_root_hub_state_changes(struct ohci_hcd *ohci, int changed,</div><div class='ctx'> 			if (any_connected ||</div><div class='ctx'> 					!device_may_wakeup(&amp;ohci_to_hcd(ohci)</div><div class='ctx'> 						-&gt;self.root_hub-&gt;dev)) {</div><div class='del'>-				if (rhsc)</div><div class='add'>+				if (rhsc_enable)</div><div class='ctx'> 					poll_rh = 0;</div><div class='ctx'> 			} else {</div><div class='ctx'> 				ohci-&gt;autostop = 1;</div><div class='hunk'>@@ -396,34 +399,45 @@ static int ohci_root_hub_state_changes(struct ohci_hcd *ohci, int changed,</div><div class='ctx'> 				ohci-&gt;autostop = 0;</div><div class='ctx'> 				ohci-&gt;next_statechange = jiffies +</div><div class='ctx'> 						STATECHANGE_DELAY;</div><div class='del'>-			} else if (rhsc &amp;&amp; time_after_eq(jiffies,</div><div class='add'>+			} else if (time_after_eq(jiffies,</div><div class='ctx'> 						ohci-&gt;next_statechange)</div><div class='ctx'> 					&amp;&amp; !ohci-&gt;ed_rm_list</div><div class='ctx'> 					&amp;&amp; !(ohci-&gt;hc_control &amp;</div><div class='ctx'> 						OHCI_SCHED_ENABLES)) {</div><div class='ctx'> 				ohci_rh_suspend(ohci, 1);</div><div class='del'>-				poll_rh = 0;</div><div class='add'>+				if (rhsc_enable)</div><div class='add'>+					poll_rh = 0;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	/* if there is a port change, autostart or ask to be resumed */</div><div class='ctx'> 	case OHCI_USB_SUSPEND:</div><div class='ctx'> 	case OHCI_USB_RESUME:</div><div class='add'>+		/* if there is a port change, autostart or ask to be resumed */</div><div class='ctx'> 		if (changed) {</div><div class='ctx'> 			if (ohci-&gt;autostop)</div><div class='ctx'> 				ohci_rh_resume(ohci);</div><div class='ctx'> 			else</div><div class='ctx'> 				usb_hcd_resume_root_hub(ohci_to_hcd(ohci));</div><div class='del'>-		} else {</div><div class='del'>-			if (!rhsc &amp;&amp; (ohci-&gt;autostop ||</div><div class='del'>-					ohci_to_hcd(ohci)-&gt;self.root_hub-&gt;</div><div class='del'>-						do_remote_wakeup))</div><div class='del'>-				ohci_writel(ohci, OHCI_INTR_RHSC,</div><div class='del'>-						&amp;ohci-&gt;regs-&gt;intrenable);</div><div class='ctx'> </div><div class='del'>-			/* everything is idle, no need for polling */</div><div class='add'>+		/* If remote wakeup is disabled, stop polling */</div><div class='add'>+		} else if (!ohci-&gt;autostop &amp;&amp;</div><div class='add'>+				!ohci_to_hcd(ohci)-&gt;self.root_hub-&gt;</div><div class='add'>+					do_remote_wakeup) {</div><div class='ctx'> 			poll_rh = 0;</div><div class='add'>+</div><div class='add'>+		} else {</div><div class='add'>+			/* If no status changes are pending,</div><div class='add'>+			 * enable RHSC interrupts</div><div class='add'>+			 */</div><div class='add'>+			if (!rhsc_enable &amp;&amp; !rhsc_status) {</div><div class='add'>+				rhsc_enable = OHCI_INTR_RHSC;</div><div class='add'>+				ohci_writel(ohci, rhsc_enable,</div><div class='add'>+						&amp;ohci-&gt;regs-&gt;intrenable);</div><div class='add'>+			}</div><div class='add'>+			/* Keep polling until RHSC is enabled */</div><div class='add'>+			if (rhsc_enable)</div><div class='add'>+				poll_rh = 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -441,18 +455,22 @@ static inline int ohci_rh_resume(struct ohci_hcd *ohci)</div><div class='ctx'>  * autostop isn't used when CONFIG_PM is turned off.</div><div class='ctx'>  */</div><div class='ctx'> static int ohci_root_hub_state_changes(struct ohci_hcd *ohci, int changed,</div><div class='del'>-		int any_connected)</div><div class='add'>+		int any_connected, int rhsc_status)</div><div class='ctx'> {</div><div class='ctx'> 	/* If RHSC is enabled, don't poll */</div><div class='ctx'> 	if (ohci_readl(ohci, &amp;ohci-&gt;regs-&gt;intrenable) &amp; OHCI_INTR_RHSC)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	/* If no status changes are pending, enable status-change interrupts */</div><div class='del'>-	if (!changed) {</div><div class='del'>-		ohci_writel(ohci, OHCI_INTR_RHSC, &amp;ohci-&gt;regs-&gt;intrenable);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	return 1;</div><div class='add'>+	/* If status changes are pending, continue polling.</div><div class='add'>+	 * Conversely, if no status changes are pending but the RHSC</div><div class='add'>+	 * status bit was set, then RHSC may be broken so continue polling.</div><div class='add'>+	 */</div><div class='add'>+	if (changed || rhsc_status)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	/* It's safe to re-enable RHSC interrupts */</div><div class='add'>+	ohci_writel(ohci, OHCI_INTR_RHSC, &amp;ohci-&gt;regs-&gt;intrenable);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #endif	/* CONFIG_PM */</div><div class='hunk'>@@ -467,6 +485,7 @@ ohci_hub_status_data (struct usb_hcd *hcd, char *buf)</div><div class='ctx'> 	struct ohci_hcd	*ohci = hcd_to_ohci (hcd);</div><div class='ctx'> 	int		i, changed = 0, length = 1;</div><div class='ctx'> 	int		any_connected = 0;</div><div class='add'>+	int		rhsc_status;</div><div class='ctx'> 	unsigned long	flags;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave (&amp;ohci-&gt;lock, flags);</div><div class='hunk'>@@ -492,12 +511,10 @@ ohci_hub_status_data (struct usb_hcd *hcd, char *buf)</div><div class='ctx'> 		length++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Some broken controllers never turn off RHCS in the interrupt</div><div class='del'>-	 * status register.  For their sake we won't re-enable RHSC</div><div class='del'>-	 * interrupts if the flag is already set.</div><div class='del'>-	 */</div><div class='del'>-	if (ohci_readl(ohci, &amp;ohci-&gt;regs-&gt;intrstatus) &amp; OHCI_INTR_RHSC)</div><div class='del'>-		changed = 1;</div><div class='add'>+	/* Clear the RHSC status flag before reading the port statuses */</div><div class='add'>+	ohci_writel(ohci, OHCI_INTR_RHSC, &amp;ohci-&gt;regs-&gt;intrstatus);</div><div class='add'>+	rhsc_status = ohci_readl(ohci, &amp;ohci-&gt;regs-&gt;intrstatus) &amp;</div><div class='add'>+			OHCI_INTR_RHSC;</div><div class='ctx'> </div><div class='ctx'> 	/* look at each port */</div><div class='ctx'> 	for (i = 0; i &lt; ohci-&gt;num_ports; i++) {</div><div class='hunk'>@@ -517,7 +534,7 @@ ohci_hub_status_data (struct usb_hcd *hcd, char *buf)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	hcd-&gt;poll_rh = ohci_root_hub_state_changes(ohci, changed,</div><div class='del'>-			any_connected);</div><div class='add'>+			any_connected, rhsc_status);</div><div class='ctx'> </div><div class='ctx'> done:</div><div class='ctx'> 	spin_unlock_irqrestore (&amp;ohci-&gt;lock, flags);</div><div class='head'>diff --git a/drivers/usb/host/ohci-omap.c b/drivers/usb/host/ohci-omap.c<br/>index 95b3ec89c126..91697bdb399f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/host/ohci-omap.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/host/ohci-omap.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/host/ohci-omap.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/host/ohci-omap.c</a></div><div class='hunk'>@@ -231,7 +231,7 @@ static int ohci_omap_init(struct usb_hcd *hcd)</div><div class='ctx'> </div><div class='ctx'> 	omap_ohci_clock_power(1);</div><div class='ctx'> </div><div class='del'>-	if (cpu_is_omap1510()) {</div><div class='add'>+	if (cpu_is_omap15xx()) {</div><div class='ctx'> 		omap_1510_local_bus_power(1);</div><div class='ctx'> 		omap_1510_local_bus_init();</div><div class='ctx'> 	}</div><div class='hunk'>@@ -319,7 +319,7 @@ static int usb_hcd_omap_probe (const struct hc_driver *driver,</div><div class='ctx'> 	if (IS_ERR(usb_host_ck))</div><div class='ctx'> 		return PTR_ERR(usb_host_ck);</div><div class='ctx'> </div><div class='del'>-	if (!cpu_is_omap1510())</div><div class='add'>+	if (!cpu_is_omap15xx())</div><div class='ctx'> 		usb_dc_ck = clk_get(0, "usb_dc_ck");</div><div class='ctx'> 	else</div><div class='ctx'> 		usb_dc_ck = clk_get(0, "lb_ck");</div><div class='hunk'>@@ -344,7 +344,12 @@ static int usb_hcd_omap_probe (const struct hc_driver *driver,</div><div class='ctx'> 		goto err1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	hcd-&gt;regs = (void __iomem *) (int) IO_ADDRESS(hcd-&gt;rsrc_start);</div><div class='add'>+	hcd-&gt;regs = ioremap(hcd-&gt;rsrc_start, hcd-&gt;rsrc_len);</div><div class='add'>+	if (!hcd-&gt;regs) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "can't ioremap OHCI HCD\n");</div><div class='add'>+		retval = -ENOMEM;</div><div class='add'>+		goto err2;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ohci = hcd_to_ohci(hcd);</div><div class='ctx'> 	ohci_hcd_init(ohci);</div><div class='hunk'>@@ -355,11 +360,11 @@ static int usb_hcd_omap_probe (const struct hc_driver *driver,</div><div class='ctx'> 	irq = platform_get_irq(pdev, 0);</div><div class='ctx'> 	if (irq &lt; 0) {</div><div class='ctx'> 		retval = -ENXIO;</div><div class='del'>-		goto err2;</div><div class='add'>+		goto err3;</div><div class='ctx'> 	}</div><div class='ctx'> 	retval = usb_add_hcd(hcd, irq, IRQF_DISABLED);</div><div class='ctx'> 	if (retval)</div><div class='del'>-		goto err2;</div><div class='add'>+		goto err3;</div><div class='ctx'> </div><div class='ctx'> 	host_initialized = 1;</div><div class='ctx'> </div><div class='hunk'>@@ -367,6 +372,8 @@ static int usb_hcd_omap_probe (const struct hc_driver *driver,</div><div class='ctx'> 		omap_ohci_clock_power(0);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='add'>+err3:</div><div class='add'>+	iounmap(hcd-&gt;regs);</div><div class='ctx'> err2:</div><div class='ctx'> 	release_mem_region(hcd-&gt;rsrc_start, hcd-&gt;rsrc_len);</div><div class='ctx'> err1:</div><div class='hunk'>@@ -401,6 +408,7 @@ usb_hcd_omap_remove (struct usb_hcd *hcd, struct platform_device *pdev)</div><div class='ctx'> 	}</div><div class='ctx'> 	if (machine_is_omap_osk())</div><div class='ctx'> 		omap_free_gpio(9);</div><div class='add'>+	iounmap(hcd-&gt;regs);</div><div class='ctx'> 	release_mem_region(hcd-&gt;rsrc_start, hcd-&gt;rsrc_len);</div><div class='ctx'> 	usb_put_hcd(hcd);</div><div class='ctx'> 	clk_put(usb_dc_ck);</div><div class='head'>diff --git a/drivers/usb/host/ohci-pnx4008.c b/drivers/usb/host/ohci-pnx4008.c<br/>index 658a2a978c32..e306ca6aef3d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/host/ohci-pnx4008.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/host/ohci-pnx4008.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/host/ohci-pnx4008.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/host/ohci-pnx4008.c</a></div><div class='hunk'>@@ -331,7 +331,7 @@ static int __devinit usb_hcd_pnx4008_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	int ret = 0, irq;</div><div class='ctx'> </div><div class='del'>-	dev_dbg(&amp;pdev-&gt;dev, "%s: " DRIVER_INFO " (pnx4008)\n", hcd_name);</div><div class='add'>+	dev_dbg(&amp;pdev-&gt;dev, "%s: " DRIVER_DESC " (pnx4008)\n", hcd_name);</div><div class='ctx'> 	if (usb_disabled()) {</div><div class='ctx'> 		err("USB is disabled");</div><div class='ctx'> 		ret = -ENODEV;</div><div class='head'>diff --git a/drivers/usb/host/ohci-pxa27x.c b/drivers/usb/host/ohci-pxa27x.c<br/>index 7f0f35c78185..e294d430733b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/host/ohci-pxa27x.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/host/ohci-pxa27x.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/host/ohci-pxa27x.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/host/ohci-pxa27x.c</a></div><div class='hunk'>@@ -23,17 +23,90 @@</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;mach/pxa-regs.h&gt;</div><div class='del'>-#include &lt;mach/pxa2xx-regs.h&gt; /* FIXME: for PSSR */</div><div class='ctx'> #include &lt;mach/ohci.h&gt;</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * UHC: USB Host Controller (OHCI-like) register definitions</div><div class='add'>+ */</div><div class='add'>+#define UHCREV		(0x0000) /* UHC HCI Spec Revision */</div><div class='add'>+#define UHCHCON		(0x0004) /* UHC Host Control Register */</div><div class='add'>+#define UHCCOMS		(0x0008) /* UHC Command Status Register */</div><div class='add'>+#define UHCINTS		(0x000C) /* UHC Interrupt Status Register */</div><div class='add'>+#define UHCINTE		(0x0010) /* UHC Interrupt Enable */</div><div class='add'>+#define UHCINTD		(0x0014) /* UHC Interrupt Disable */</div><div class='add'>+#define UHCHCCA		(0x0018) /* UHC Host Controller Comm. Area */</div><div class='add'>+#define UHCPCED		(0x001C) /* UHC Period Current Endpt Descr */</div><div class='add'>+#define UHCCHED		(0x0020) /* UHC Control Head Endpt Descr */</div><div class='add'>+#define UHCCCED		(0x0024) /* UHC Control Current Endpt Descr */</div><div class='add'>+#define UHCBHED		(0x0028) /* UHC Bulk Head Endpt Descr */</div><div class='add'>+#define UHCBCED		(0x002C) /* UHC Bulk Current Endpt Descr */</div><div class='add'>+#define UHCDHEAD	(0x0030) /* UHC Done Head */</div><div class='add'>+#define UHCFMI		(0x0034) /* UHC Frame Interval */</div><div class='add'>+#define UHCFMR		(0x0038) /* UHC Frame Remaining */</div><div class='add'>+#define UHCFMN		(0x003C) /* UHC Frame Number */</div><div class='add'>+#define UHCPERS		(0x0040) /* UHC Periodic Start */</div><div class='add'>+#define UHCLS		(0x0044) /* UHC Low Speed Threshold */</div><div class='add'>+</div><div class='add'>+#define UHCRHDA		(0x0048) /* UHC Root Hub Descriptor A */</div><div class='add'>+#define UHCRHDA_NOCP	(1 &lt;&lt; 12)	/* No over current protection */</div><div class='add'>+#define UHCRHDA_OCPM	(1 &lt;&lt; 11)	/* Over Current Protection Mode */</div><div class='add'>+#define UHCRHDA_POTPGT(x) \</div><div class='add'>+			(((x) &amp; 0xff) &lt;&lt; 24) /* Power On To Power Good Time */</div><div class='add'>+</div><div class='add'>+#define UHCRHDB		(0x004C) /* UHC Root Hub Descriptor B */</div><div class='add'>+#define UHCRHS		(0x0050) /* UHC Root Hub Status */</div><div class='add'>+#define UHCRHPS1	(0x0054) /* UHC Root Hub Port 1 Status */</div><div class='add'>+#define UHCRHPS2	(0x0058) /* UHC Root Hub Port 2 Status */</div><div class='add'>+#define UHCRHPS3	(0x005C) /* UHC Root Hub Port 3 Status */</div><div class='add'>+</div><div class='add'>+#define UHCSTAT		(0x0060) /* UHC Status Register */</div><div class='add'>+#define UHCSTAT_UPS3	(1 &lt;&lt; 16)	/* USB Power Sense Port3 */</div><div class='add'>+#define UHCSTAT_SBMAI	(1 &lt;&lt; 15)	/* System Bus Master Abort Interrupt*/</div><div class='add'>+#define UHCSTAT_SBTAI	(1 &lt;&lt; 14)	/* System Bus Target Abort Interrupt*/</div><div class='add'>+#define UHCSTAT_UPRI	(1 &lt;&lt; 13)	/* USB Port Resume Interrupt */</div><div class='add'>+#define UHCSTAT_UPS2	(1 &lt;&lt; 12)	/* USB Power Sense Port 2 */</div><div class='add'>+#define UHCSTAT_UPS1	(1 &lt;&lt; 11)	/* USB Power Sense Port 1 */</div><div class='add'>+#define UHCSTAT_HTA	(1 &lt;&lt; 10)	/* HCI Target Abort */</div><div class='add'>+#define UHCSTAT_HBA	(1 &lt;&lt; 8)	/* HCI Buffer Active */</div><div class='add'>+#define UHCSTAT_RWUE	(1 &lt;&lt; 7)	/* HCI Remote Wake Up Event */</div><div class='add'>+</div><div class='add'>+#define UHCHR           (0x0064) /* UHC Reset Register */</div><div class='add'>+#define UHCHR_SSEP3	(1 &lt;&lt; 11)	/* Sleep Standby Enable for Port3 */</div><div class='add'>+#define UHCHR_SSEP2	(1 &lt;&lt; 10)	/* Sleep Standby Enable for Port2 */</div><div class='add'>+#define UHCHR_SSEP1	(1 &lt;&lt; 9)	/* Sleep Standby Enable for Port1 */</div><div class='add'>+#define UHCHR_PCPL	(1 &lt;&lt; 7)	/* Power control polarity low */</div><div class='add'>+#define UHCHR_PSPL	(1 &lt;&lt; 6)	/* Power sense polarity low */</div><div class='add'>+#define UHCHR_SSE	(1 &lt;&lt; 5)	/* Sleep Standby Enable */</div><div class='add'>+#define UHCHR_UIT	(1 &lt;&lt; 4)	/* USB Interrupt Test */</div><div class='add'>+#define UHCHR_SSDC	(1 &lt;&lt; 3)	/* Simulation Scale Down Clock */</div><div class='add'>+#define UHCHR_CGR	(1 &lt;&lt; 2)	/* Clock Generation Reset */</div><div class='add'>+#define UHCHR_FHR	(1 &lt;&lt; 1)	/* Force Host Controller Reset */</div><div class='add'>+#define UHCHR_FSBIR	(1 &lt;&lt; 0)	/* Force System Bus Iface Reset */</div><div class='add'>+</div><div class='add'>+#define UHCHIE          (0x0068) /* UHC Interrupt Enable Register*/</div><div class='add'>+#define UHCHIE_UPS3IE	(1 &lt;&lt; 14)	/* Power Sense Port3 IntEn */</div><div class='add'>+#define UHCHIE_UPRIE	(1 &lt;&lt; 13)	/* Port Resume IntEn */</div><div class='add'>+#define UHCHIE_UPS2IE	(1 &lt;&lt; 12)	/* Power Sense Port2 IntEn */</div><div class='add'>+#define UHCHIE_UPS1IE	(1 &lt;&lt; 11)	/* Power Sense Port1 IntEn */</div><div class='add'>+#define UHCHIE_TAIE	(1 &lt;&lt; 10)	/* HCI Interface Transfer Abort</div><div class='add'>+					   Interrupt Enable*/</div><div class='add'>+#define UHCHIE_HBAIE	(1 &lt;&lt; 8)	/* HCI Buffer Active IntEn */</div><div class='add'>+#define UHCHIE_RWIE	(1 &lt;&lt; 7)	/* Remote Wake-up IntEn */</div><div class='add'>+</div><div class='add'>+#define UHCHIT          (0x006C) /* UHC Interrupt Test register */</div><div class='add'>+</div><div class='ctx'> #define PXA_UHC_MAX_PORTNUM    3</div><div class='ctx'> </div><div class='del'>-#define UHCRHPS(x)              __REG2( 0x4C000050, (x)&lt;&lt;2 )</div><div class='add'>+struct pxa27x_ohci {</div><div class='add'>+	/* must be 1st member here for hcd_to_ohci() to work */</div><div class='add'>+	struct ohci_hcd ohci;</div><div class='add'>+</div><div class='add'>+	struct device	*dev;</div><div class='add'>+	struct clk	*clk;</div><div class='add'>+	void __iomem	*mmio_base;</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-static struct clk *usb_clk;</div><div class='add'>+#define to_pxa27x_ohci(hcd)	(struct pxa27x_ohci *)hcd_to_ohci(hcd)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>   PMM_NPS_MODE -- PMM Non-power switching mode</div><div class='hunk'>@@ -45,30 +118,35 @@ static struct clk *usb_clk;</div><div class='ctx'>   PMM_PERPORT_MODE -- PMM per port switching mode</div><div class='ctx'>       Ports are powered individually.</div><div class='ctx'>  */</div><div class='del'>-static int pxa27x_ohci_select_pmm( int mode )</div><div class='add'>+static int pxa27x_ohci_select_pmm(struct pxa27x_ohci *ohci, int mode)</div><div class='ctx'> {</div><div class='del'>-	switch ( mode ) {</div><div class='add'>+	uint32_t uhcrhda = __raw_readl(ohci-&gt;mmio_base + UHCRHDA);</div><div class='add'>+	uint32_t uhcrhdb = __raw_readl(ohci-&gt;mmio_base + UHCRHDB);</div><div class='add'>+</div><div class='add'>+	switch (mode) {</div><div class='ctx'> 	case PMM_NPS_MODE:</div><div class='del'>-		UHCRHDA |= RH_A_NPS;</div><div class='add'>+		uhcrhda |= RH_A_NPS;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case PMM_GLOBAL_MODE:</div><div class='del'>-		UHCRHDA &amp;= ~(RH_A_NPS &amp; RH_A_PSM);</div><div class='add'>+		uhcrhda &amp;= ~(RH_A_NPS &amp; RH_A_PSM);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case PMM_PERPORT_MODE:</div><div class='del'>-		UHCRHDA &amp;= ~(RH_A_NPS);</div><div class='del'>-		UHCRHDA |= RH_A_PSM;</div><div class='add'>+		uhcrhda &amp;= ~(RH_A_NPS);</div><div class='add'>+		uhcrhda |= RH_A_PSM;</div><div class='ctx'> </div><div class='ctx'> 		/* Set port power control mask bits, only 3 ports. */</div><div class='del'>-		UHCRHDB |= (0x7&lt;&lt;17);</div><div class='add'>+		uhcrhdb |= (0x7&lt;&lt;17);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		printk( KERN_ERR</div><div class='ctx'> 			"Invalid mode %d, set to non-power switch mode.\n",</div><div class='ctx'> 			mode );</div><div class='ctx'> </div><div class='del'>-		UHCRHDA |= RH_A_NPS;</div><div class='add'>+		uhcrhda |= RH_A_NPS;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	__raw_writel(uhcrhda, ohci-&gt;mmio_base + UHCRHDA);</div><div class='add'>+	__raw_writel(uhcrhdb, ohci-&gt;mmio_base + UHCRHDB);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -76,57 +154,110 @@ extern int usb_disabled(void);</div><div class='ctx'> </div><div class='ctx'> /*-------------------------------------------------------------------------*/</div><div class='ctx'> </div><div class='del'>-static int pxa27x_start_hc(struct device *dev)</div><div class='add'>+static inline void pxa27x_setup_hc(struct pxa27x_ohci *ohci,</div><div class='add'>+				   struct pxaohci_platform_data *inf)</div><div class='add'>+{</div><div class='add'>+	uint32_t uhchr = __raw_readl(ohci-&gt;mmio_base + UHCHR);</div><div class='add'>+	uint32_t uhcrhda = __raw_readl(ohci-&gt;mmio_base + UHCRHDA);</div><div class='add'>+</div><div class='add'>+	if (inf-&gt;flags &amp; ENABLE_PORT1)</div><div class='add'>+		uhchr &amp;= ~UHCHR_SSEP1;</div><div class='add'>+</div><div class='add'>+	if (inf-&gt;flags &amp; ENABLE_PORT2)</div><div class='add'>+		uhchr &amp;= ~UHCHR_SSEP2;</div><div class='add'>+</div><div class='add'>+	if (inf-&gt;flags &amp; ENABLE_PORT3)</div><div class='add'>+		uhchr &amp;= ~UHCHR_SSEP3;</div><div class='add'>+</div><div class='add'>+	if (inf-&gt;flags &amp; POWER_CONTROL_LOW)</div><div class='add'>+		uhchr |= UHCHR_PCPL;</div><div class='add'>+</div><div class='add'>+	if (inf-&gt;flags &amp; POWER_SENSE_LOW)</div><div class='add'>+		uhchr |= UHCHR_PSPL;</div><div class='add'>+</div><div class='add'>+	if (inf-&gt;flags &amp; NO_OC_PROTECTION)</div><div class='add'>+		uhcrhda |= UHCRHDA_NOCP;</div><div class='add'>+</div><div class='add'>+	if (inf-&gt;flags &amp; OC_MODE_PERPORT)</div><div class='add'>+		uhcrhda |= UHCRHDA_OCPM;</div><div class='add'>+</div><div class='add'>+	if (inf-&gt;power_on_delay) {</div><div class='add'>+		uhcrhda &amp;= ~UHCRHDA_POTPGT(0xff);</div><div class='add'>+		uhcrhda |= UHCRHDA_POTPGT(inf-&gt;power_on_delay / 2);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	__raw_writel(uhchr, ohci-&gt;mmio_base + UHCHR);</div><div class='add'>+	__raw_writel(uhcrhda, ohci-&gt;mmio_base + UHCRHDA);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void pxa27x_reset_hc(struct pxa27x_ohci *ohci)</div><div class='add'>+{</div><div class='add'>+	uint32_t uhchr = __raw_readl(ohci-&gt;mmio_base + UHCHR);</div><div class='add'>+</div><div class='add'>+	__raw_writel(uhchr | UHCHR_FHR, ohci-&gt;mmio_base + UHCHR);</div><div class='add'>+	udelay(11);</div><div class='add'>+	__raw_writel(uhchr &amp; ~UHCHR_FHR, ohci-&gt;mmio_base + UHCHR);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_CPU_PXA27x</div><div class='add'>+extern void pxa27x_clear_otgph(void);</div><div class='add'>+#else</div><div class='add'>+#define pxa27x_clear_otgph()	do {} while (0)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static int pxa27x_start_hc(struct pxa27x_ohci *ohci, struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int retval = 0;</div><div class='ctx'> 	struct pxaohci_platform_data *inf;</div><div class='add'>+	uint32_t uhchr;</div><div class='ctx'> </div><div class='ctx'> 	inf = dev-&gt;platform_data;</div><div class='ctx'> </div><div class='del'>-	clk_enable(usb_clk);</div><div class='add'>+	clk_enable(ohci-&gt;clk);</div><div class='ctx'> </div><div class='del'>-	UHCHR |= UHCHR_FHR;</div><div class='del'>-	udelay(11);</div><div class='del'>-	UHCHR &amp;= ~UHCHR_FHR;</div><div class='add'>+	pxa27x_reset_hc(ohci);</div><div class='add'>+</div><div class='add'>+	uhchr = __raw_readl(ohci-&gt;mmio_base + UHCHR) | UHCHR_FSBIR;</div><div class='add'>+	__raw_writel(uhchr, ohci-&gt;mmio_base + UHCHR);</div><div class='ctx'> </div><div class='del'>-	UHCHR |= UHCHR_FSBIR;</div><div class='del'>-	while (UHCHR &amp; UHCHR_FSBIR)</div><div class='add'>+	while (__raw_readl(ohci-&gt;mmio_base + UHCHR) &amp; UHCHR_FSBIR)</div><div class='ctx'> 		cpu_relax();</div><div class='ctx'> </div><div class='add'>+	pxa27x_setup_hc(ohci, inf);</div><div class='add'>+</div><div class='ctx'> 	if (inf-&gt;init)</div><div class='ctx'> 		retval = inf-&gt;init(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (retval &lt; 0)</div><div class='ctx'> 		return retval;</div><div class='ctx'> </div><div class='del'>-	UHCHR &amp;= ~UHCHR_SSE;</div><div class='del'>-</div><div class='del'>-	UHCHIE = (UHCHIE_UPRIE | UHCHIE_RWIE);</div><div class='add'>+	uhchr = __raw_readl(ohci-&gt;mmio_base + UHCHR) &amp; ~UHCHR_SSE;</div><div class='add'>+	__raw_writel(uhchr, ohci-&gt;mmio_base + UHCHR);</div><div class='add'>+	__raw_writel(UHCHIE_UPRIE | UHCHIE_RWIE, ohci-&gt;mmio_base + UHCHIE);</div><div class='ctx'> </div><div class='ctx'> 	/* Clear any OTG Pin Hold */</div><div class='del'>-	if (cpu_is_pxa27x() &amp;&amp; (PSSR &amp; PSSR_OTGPH))</div><div class='del'>-		PSSR |= PSSR_OTGPH;</div><div class='del'>-</div><div class='add'>+	pxa27x_clear_otgph();</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void pxa27x_stop_hc(struct device *dev)</div><div class='add'>+static void pxa27x_stop_hc(struct pxa27x_ohci *ohci, struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct pxaohci_platform_data *inf;</div><div class='add'>+	uint32_t uhccoms;</div><div class='ctx'> </div><div class='ctx'> 	inf = dev-&gt;platform_data;</div><div class='ctx'> </div><div class='ctx'> 	if (inf-&gt;exit)</div><div class='ctx'> 		inf-&gt;exit(dev);</div><div class='ctx'> </div><div class='del'>-	UHCHR |= UHCHR_FHR;</div><div class='del'>-	udelay(11);</div><div class='del'>-	UHCHR &amp;= ~UHCHR_FHR;</div><div class='add'>+	pxa27x_reset_hc(ohci);</div><div class='ctx'> </div><div class='del'>-	UHCCOMS |= 1;</div><div class='add'>+	/* Host Controller Reset */</div><div class='add'>+	uhccoms = __raw_readl(ohci-&gt;mmio_base + UHCCOMS) | 0x01;</div><div class='add'>+	__raw_writel(uhccoms, ohci-&gt;mmio_base + UHCCOMS);</div><div class='ctx'> 	udelay(10);</div><div class='ctx'> </div><div class='del'>-	clk_disable(usb_clk);</div><div class='add'>+	clk_disable(ohci-&gt;clk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -147,18 +278,22 @@ static void pxa27x_stop_hc(struct device *dev)</div><div class='ctx'>  */</div><div class='ctx'> int usb_hcd_pxa27x_probe (const struct hc_driver *driver, struct platform_device *pdev)</div><div class='ctx'> {</div><div class='del'>-	int retval;</div><div class='add'>+	int retval, irq;</div><div class='ctx'> 	struct usb_hcd *hcd;</div><div class='ctx'> 	struct pxaohci_platform_data *inf;</div><div class='add'>+	struct pxa27x_ohci *ohci;</div><div class='add'>+	struct resource *r;</div><div class='add'>+	struct clk *usb_clk;</div><div class='ctx'> </div><div class='ctx'> 	inf = pdev-&gt;dev.platform_data;</div><div class='ctx'> </div><div class='ctx'> 	if (!inf)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	if (pdev-&gt;resource[1].flags != IORESOURCE_IRQ) {</div><div class='del'>-		pr_debug ("resource[1] is not IORESOURCE_IRQ");</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	irq = platform_get_irq(pdev, 0);</div><div class='add'>+	if (irq &lt; 0) {</div><div class='add'>+		pr_err("no resource of IORESOURCE_IRQ");</div><div class='add'>+		return -ENXIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	usb_clk = clk_get(&amp;pdev-&gt;dev, "USBCLK");</div><div class='hunk'>@@ -168,8 +303,16 @@ int usb_hcd_pxa27x_probe (const struct hc_driver *driver, struct platform_device</div><div class='ctx'> 	hcd = usb_create_hcd (driver, &amp;pdev-&gt;dev, "pxa27x");</div><div class='ctx'> 	if (!hcd)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	hcd-&gt;rsrc_start = pdev-&gt;resource[0].start;</div><div class='del'>-	hcd-&gt;rsrc_len = pdev-&gt;resource[0].end - pdev-&gt;resource[0].start + 1;</div><div class='add'>+</div><div class='add'>+	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='add'>+	if (!r) {</div><div class='add'>+		pr_err("no resource of IORESOURCE_MEM");</div><div class='add'>+		retval = -ENXIO;</div><div class='add'>+		goto err1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hcd-&gt;rsrc_start = r-&gt;start;</div><div class='add'>+	hcd-&gt;rsrc_len = resource_size(r);</div><div class='ctx'> </div><div class='ctx'> 	if (!request_mem_region(hcd-&gt;rsrc_start, hcd-&gt;rsrc_len, hcd_name)) {</div><div class='ctx'> 		pr_debug("request_mem_region failed");</div><div class='hunk'>@@ -184,24 +327,30 @@ int usb_hcd_pxa27x_probe (const struct hc_driver *driver, struct platform_device</div><div class='ctx'> 		goto err2;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((retval = pxa27x_start_hc(&amp;pdev-&gt;dev)) &lt; 0) {</div><div class='add'>+	/* initialize "struct pxa27x_ohci" */</div><div class='add'>+	ohci = (struct pxa27x_ohci *)hcd_to_ohci(hcd);</div><div class='add'>+	ohci-&gt;dev = &amp;pdev-&gt;dev;</div><div class='add'>+	ohci-&gt;clk = usb_clk;</div><div class='add'>+	ohci-&gt;mmio_base = (void __iomem *)hcd-&gt;regs;</div><div class='add'>+</div><div class='add'>+	if ((retval = pxa27x_start_hc(ohci, &amp;pdev-&gt;dev)) &lt; 0) {</div><div class='ctx'> 		pr_debug("pxa27x_start_hc failed");</div><div class='ctx'> 		goto err3;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Select Power Management Mode */</div><div class='del'>-	pxa27x_ohci_select_pmm(inf-&gt;port_mode);</div><div class='add'>+	pxa27x_ohci_select_pmm(ohci, inf-&gt;port_mode);</div><div class='ctx'> </div><div class='ctx'> 	if (inf-&gt;power_budget)</div><div class='ctx'> 		hcd-&gt;power_budget = inf-&gt;power_budget;</div><div class='ctx'> </div><div class='ctx'> 	ohci_hcd_init(hcd_to_ohci(hcd));</div><div class='ctx'> </div><div class='del'>-	retval = usb_add_hcd(hcd, pdev-&gt;resource[1].start, IRQF_DISABLED);</div><div class='add'>+	retval = usb_add_hcd(hcd, irq, IRQF_DISABLED);</div><div class='ctx'> 	if (retval == 0)</div><div class='ctx'> 		return retval;</div><div class='ctx'> </div><div class='del'>-	pxa27x_stop_hc(&amp;pdev-&gt;dev);</div><div class='add'>+	pxa27x_stop_hc(ohci, &amp;pdev-&gt;dev);</div><div class='ctx'>  err3:</div><div class='ctx'> 	iounmap(hcd-&gt;regs);</div><div class='ctx'>  err2:</div><div class='hunk'>@@ -228,12 +377,14 @@ int usb_hcd_pxa27x_probe (const struct hc_driver *driver, struct platform_device</div><div class='ctx'>  */</div><div class='ctx'> void usb_hcd_pxa27x_remove (struct usb_hcd *hcd, struct platform_device *pdev)</div><div class='ctx'> {</div><div class='add'>+	struct pxa27x_ohci *ohci = to_pxa27x_ohci(hcd);</div><div class='add'>+</div><div class='ctx'> 	usb_remove_hcd(hcd);</div><div class='del'>-	pxa27x_stop_hc(&amp;pdev-&gt;dev);</div><div class='add'>+	pxa27x_stop_hc(ohci, &amp;pdev-&gt;dev);</div><div class='ctx'> 	iounmap(hcd-&gt;regs);</div><div class='ctx'> 	release_mem_region(hcd-&gt;rsrc_start, hcd-&gt;rsrc_len);</div><div class='ctx'> 	usb_put_hcd(hcd);</div><div class='del'>-	clk_put(usb_clk);</div><div class='add'>+	clk_put(ohci-&gt;clk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*-------------------------------------------------------------------------*/</div><div class='hunk'>@@ -266,7 +417,7 @@ ohci_pxa27x_start (struct usb_hcd *hcd)</div><div class='ctx'> static const struct hc_driver ohci_pxa27x_hc_driver = {</div><div class='ctx'> 	.description =		hcd_name,</div><div class='ctx'> 	.product_desc =		"PXA27x OHCI",</div><div class='del'>-	.hcd_priv_size =	sizeof(struct ohci_hcd),</div><div class='add'>+	.hcd_priv_size =	sizeof(struct pxa27x_ohci),</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * generic hardware linkage</div><div class='hunk'>@@ -330,13 +481,13 @@ static int ohci_hcd_pxa27x_drv_remove(struct platform_device *pdev)</div><div class='ctx'> static int ohci_hcd_pxa27x_drv_suspend(struct platform_device *pdev, pm_message_t state)</div><div class='ctx'> {</div><div class='ctx'> 	struct usb_hcd *hcd = platform_get_drvdata(pdev);</div><div class='del'>-	struct ohci_hcd *ohci = hcd_to_ohci(hcd);</div><div class='add'>+	struct pxa27x_ohci *ohci = to_pxa27x_ohci(hcd);</div><div class='ctx'> </div><div class='del'>-	if (time_before(jiffies, ohci-&gt;next_statechange))</div><div class='add'>+	if (time_before(jiffies, ohci-&gt;ohci.next_statechange))</div><div class='ctx'> 		msleep(5);</div><div class='del'>-	ohci-&gt;next_statechange = jiffies;</div><div class='add'>+	ohci-&gt;ohci.next_statechange = jiffies;</div><div class='ctx'> </div><div class='del'>-	pxa27x_stop_hc(&amp;pdev-&gt;dev);</div><div class='add'>+	pxa27x_stop_hc(ohci, &amp;pdev-&gt;dev);</div><div class='ctx'> 	hcd-&gt;state = HC_STATE_SUSPENDED;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -345,14 +496,14 @@ static int ohci_hcd_pxa27x_drv_suspend(struct platform_device *pdev, pm_message_</div><div class='ctx'> static int ohci_hcd_pxa27x_drv_resume(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct usb_hcd *hcd = platform_get_drvdata(pdev);</div><div class='del'>-	struct ohci_hcd *ohci = hcd_to_ohci(hcd);</div><div class='add'>+	struct pxa27x_ohci *ohci = to_pxa27x_ohci(hcd);</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='del'>-	if (time_before(jiffies, ohci-&gt;next_statechange))</div><div class='add'>+	if (time_before(jiffies, ohci-&gt;ohci.next_statechange))</div><div class='ctx'> 		msleep(5);</div><div class='del'>-	ohci-&gt;next_statechange = jiffies;</div><div class='add'>+	ohci-&gt;ohci.next_statechange = jiffies;</div><div class='ctx'> </div><div class='del'>-	if ((status = pxa27x_start_hc(&amp;pdev-&gt;dev)) &lt; 0)</div><div class='add'>+	if ((status = pxa27x_start_hc(ohci, &amp;pdev-&gt;dev)) &lt; 0)</div><div class='ctx'> 		return status;</div><div class='ctx'> </div><div class='ctx'> 	ohci_finish_controller_resume(hcd);</div><div class='head'>diff --git a/drivers/usb/host/ohci.h b/drivers/usb/host/ohci.h<br/>index faf622eafce7..222011f6172c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/host/ohci.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/host/ohci.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/host/ohci.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/host/ohci.h</a></div><div class='hunk'>@@ -540,15 +540,7 @@ static inline struct usb_hcd *ohci_to_hcd (const struct ohci_hcd *ohci)</div><div class='ctx'>  * Big-endian read/write functions are arch-specific.</div><div class='ctx'>  * Other arches can be added if/when they're needed.</div><div class='ctx'>  *</div><div class='del'>- * REVISIT: arch/powerpc now has readl/writel_be, so the</div><div class='del'>- * definition below can die once the STB04xxx support is</div><div class='del'>- * finally ported over.</div><div class='ctx'>  */</div><div class='del'>-#if defined(CONFIG_PPC) &amp;&amp; !defined(CONFIG_PPC_MERGE)</div><div class='del'>-#define readl_be(addr)		in_be32((__force unsigned *)addr)</div><div class='del'>-#define writel_be(val, addr)	out_be32((__force unsigned *)addr, val)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> static inline unsigned int _ohci_readl (const struct ohci_hcd *ohci,</div><div class='ctx'> 					__hc32 __iomem * regs)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/usb/host/r8a66597-hcd.c b/drivers/usb/host/r8a66597-hcd.c<br/>index ea7126f99cab..c18d8790c410 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/host/r8a66597-hcd.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/host/r8a66597-hcd.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/host/r8a66597-hcd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/host/r8a66597-hcd.c</a></div><div class='hunk'>@@ -66,7 +66,7 @@ static unsigned short endian;</div><div class='ctx'> module_param(endian, ushort, 0644);</div><div class='ctx'> MODULE_PARM_DESC(endian, "data endian: big=256, little=0 (default=0)");</div><div class='ctx'> </div><div class='del'>-static unsigned short irq_sense = INTL;</div><div class='add'>+static unsigned short irq_sense = 0xff;</div><div class='ctx'> module_param(irq_sense, ushort, 0644);</div><div class='ctx'> MODULE_PARM_DESC(irq_sense, "IRQ sense: low level=32, falling edge=0 "</div><div class='ctx'> 		"(default=32)");</div><div class='hunk'>@@ -118,7 +118,7 @@ static int r8a66597_clock_enable(struct r8a66597 *r8a66597)</div><div class='ctx'> 		r8a66597_write(r8a66597, SCKE, SYSCFG0);</div><div class='ctx'> 		tmp = r8a66597_read(r8a66597, SYSCFG0);</div><div class='ctx'> 		if (i++ &gt; 1000) {</div><div class='del'>-			err("register access fail.");</div><div class='add'>+			printk(KERN_ERR "r8a66597: register access fail.\n");</div><div class='ctx'> 			return -ENXIO;</div><div class='ctx'> 		}</div><div class='ctx'> 	} while ((tmp &amp; SCKE) != SCKE);</div><div class='hunk'>@@ -128,7 +128,7 @@ static int r8a66597_clock_enable(struct r8a66597 *r8a66597)</div><div class='ctx'> 		r8a66597_write(r8a66597, USBE, SYSCFG0);</div><div class='ctx'> 		tmp = r8a66597_read(r8a66597, SYSCFG0);</div><div class='ctx'> 		if (i++ &gt; 1000) {</div><div class='del'>-			err("register access fail.");</div><div class='add'>+			printk(KERN_ERR "r8a66597: register access fail.\n");</div><div class='ctx'> 			return -ENXIO;</div><div class='ctx'> 		}</div><div class='ctx'> 	} while ((tmp &amp; USBE) != USBE);</div><div class='hunk'>@@ -141,7 +141,7 @@ static int r8a66597_clock_enable(struct r8a66597 *r8a66597)</div><div class='ctx'> 		msleep(1);</div><div class='ctx'> 		tmp = r8a66597_read(r8a66597, SYSCFG0);</div><div class='ctx'> 		if (i++ &gt; 500) {</div><div class='del'>-			err("register access fail.");</div><div class='add'>+			printk(KERN_ERR "r8a66597: register access fail.\n");</div><div class='ctx'> 			return -ENXIO;</div><div class='ctx'> 		}</div><div class='ctx'> 	} while ((tmp &amp; SCKE) != SCKE);</div><div class='hunk'>@@ -265,7 +265,7 @@ static void get_port_number(char *devpath, u16 *root_port, u16 *hub_port)</div><div class='ctx'> 	if (root_port) {</div><div class='ctx'> 		*root_port = (devpath[0] &amp; 0x0F) - 1;</div><div class='ctx'> 		if (*root_port &gt;= R8A66597_MAX_ROOT_HUB)</div><div class='del'>-			err("illegal root port number");</div><div class='add'>+			printk(KERN_ERR "r8a66597: Illegal root port number.\n");</div><div class='ctx'> 	}</div><div class='ctx'> 	if (hub_port)</div><div class='ctx'> 		*hub_port = devpath[2] &amp; 0x0F;</div><div class='hunk'>@@ -286,7 +286,7 @@ static u16 get_r8a66597_usb_speed(enum usb_device_speed speed)</div><div class='ctx'> 		usbspd = HSMODE;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		err("unknown speed");</div><div class='add'>+		printk(KERN_ERR "r8a66597: unknown speed\n");</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -385,7 +385,7 @@ static u8 alloc_usb_address(struct r8a66597 *r8a66597, struct urb *urb)</div><div class='ctx'> 	struct r8a66597_device *dev;</div><div class='ctx'> </div><div class='ctx'> 	if (is_hub_limit(urb-&gt;dev-&gt;devpath)) {</div><div class='del'>-		err("Externel hub limit reached.");</div><div class='add'>+		dev_err(&amp;urb-&gt;dev-&gt;dev, "External hub limit reached.\n");</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -406,8 +406,9 @@ static u8 alloc_usb_address(struct r8a66597 *r8a66597, struct urb *urb)</div><div class='ctx'> 		return addr;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err("cannot communicate with a USB device more than 10.(%x)",</div><div class='del'>-	    r8a66597-&gt;address_map);</div><div class='add'>+	dev_err(&amp;urb-&gt;dev-&gt;dev,</div><div class='add'>+		"cannot communicate with a USB device more than 10.(%x)\n",</div><div class='add'>+		r8a66597-&gt;address_map);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -447,7 +448,8 @@ static void r8a66597_reg_wait(struct r8a66597 *r8a66597, unsigned long reg,</div><div class='ctx'> 	do {</div><div class='ctx'> 		tmp = r8a66597_read(r8a66597, reg);</div><div class='ctx'> 		if (i++ &gt; 1000000) {</div><div class='del'>-			err("register%lx, loop %x is timeout", reg, loop);</div><div class='add'>+			printk(KERN_ERR "r8a66597: register%lx, loop %x "</div><div class='add'>+			       "is timeout\n", reg, loop);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		ndelay(1);</div><div class='hunk'>@@ -675,7 +677,7 @@ static u16 get_empty_pipenum(struct r8a66597 *r8a66597,</div><div class='ctx'> 			array[i++] = 1;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		err("Illegal type");</div><div class='add'>+		printk(KERN_ERR "r8a66597: Illegal type\n");</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -705,7 +707,7 @@ static u16 get_r8a66597_type(__u8 type)</div><div class='ctx'> 		r8a66597_type = R8A66597_ISO;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		err("Illegal type");</div><div class='add'>+		printk(KERN_ERR "r8a66597: Illegal type\n");</div><div class='ctx'> 		r8a66597_type = 0x0000;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -724,7 +726,7 @@ static u16 get_bufnum(u16 pipenum)</div><div class='ctx'> 	else if (check_interrupt(pipenum))</div><div class='ctx'> 		bufnum = 4 + (pipenum - 6);</div><div class='ctx'> 	else</div><div class='del'>-		err("Illegal pipenum (%d)", pipenum);</div><div class='add'>+		printk(KERN_ERR "r8a66597: Illegal pipenum (%d)\n", pipenum);</div><div class='ctx'> </div><div class='ctx'> 	return bufnum;</div><div class='ctx'> }</div><div class='hunk'>@@ -740,7 +742,7 @@ static u16 get_buf_bsize(u16 pipenum)</div><div class='ctx'> 	else if (check_interrupt(pipenum))</div><div class='ctx'> 		buf_bsize = 0;</div><div class='ctx'> 	else</div><div class='del'>-		err("Illegal pipenum (%d)", pipenum);</div><div class='add'>+		printk(KERN_ERR "r8a66597: Illegal pipenum (%d)\n", pipenum);</div><div class='ctx'> </div><div class='ctx'> 	return buf_bsize;</div><div class='ctx'> }</div><div class='hunk'>@@ -760,10 +762,12 @@ static void enable_r8a66597_pipe_dma(struct r8a66597 *r8a66597,</div><div class='ctx'> 			if ((r8a66597-&gt;dma_map &amp; (1 &lt;&lt; i)) != 0)</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='del'>-			info("address %d, EndpointAddress 0x%02x use DMA FIFO",</div><div class='del'>-			     usb_pipedevice(urb-&gt;pipe),</div><div class='del'>-			     info-&gt;dir_in ? USB_ENDPOINT_DIR_MASK + info-&gt;epnum</div><div class='del'>-					    : info-&gt;epnum);</div><div class='add'>+			dev_info(&amp;dev-&gt;udev-&gt;dev,</div><div class='add'>+				 "address %d, EndpointAddress 0x%02x use "</div><div class='add'>+				 "DMA FIFO\n", usb_pipedevice(urb-&gt;pipe),</div><div class='add'>+				 info-&gt;dir_in ?</div><div class='add'>+				 	USB_ENDPOINT_DIR_MASK + info-&gt;epnum</div><div class='add'>+					: info-&gt;epnum);</div><div class='ctx'> </div><div class='ctx'> 			r8a66597-&gt;dma_map |= 1 &lt;&lt; i;</div><div class='ctx'> 			dev-&gt;dma_map |= 1 &lt;&lt; i;</div><div class='hunk'>@@ -1187,7 +1191,7 @@ static int start_transfer(struct r8a66597 *r8a66597, struct r8a66597_td *td)</div><div class='ctx'> 		prepare_status_packet(r8a66597, td);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		err("invalid type.");</div><div class='add'>+		printk(KERN_ERR "r8a66597: invalid type.\n");</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1295,7 +1299,7 @@ static void packet_read(struct r8a66597 *r8a66597, u16 pipenum)</div><div class='ctx'> 	if (unlikely((tmp &amp; FRDY) == 0)) {</div><div class='ctx'> 		pipe_stop(r8a66597, td-&gt;pipe);</div><div class='ctx'> 		pipe_irq_disable(r8a66597, pipenum);</div><div class='del'>-		err("in fifo not ready (%d)", pipenum);</div><div class='add'>+		printk(KERN_ERR "r8a66597: in fifo not ready (%d)\n", pipenum);</div><div class='ctx'> 		finish_request(r8a66597, td, pipenum, td-&gt;urb, -EPIPE);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1370,7 +1374,7 @@ static void packet_write(struct r8a66597 *r8a66597, u16 pipenum)</div><div class='ctx'> 	if (unlikely((tmp &amp; FRDY) == 0)) {</div><div class='ctx'> 		pipe_stop(r8a66597, td-&gt;pipe);</div><div class='ctx'> 		pipe_irq_disable(r8a66597, pipenum);</div><div class='del'>-		err("out write fifo not ready. (%d)", pipenum);</div><div class='add'>+		printk(KERN_ERR "r8a66597: out fifo not ready (%d)\n", pipenum);</div><div class='ctx'> 		finish_request(r8a66597, td, pipenum, urb, -EPIPE);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2005,7 +2009,7 @@ static struct r8a66597_device *get_r8a66597_device(struct r8a66597 *r8a66597,</div><div class='ctx'> 		return dev;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err("get_r8a66597_device fail.(%d)\n", addr);</div><div class='add'>+	printk(KERN_ERR "r8a66597: get_r8a66597_device fail.(%d)\n", addr);</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2263,7 +2267,7 @@ static int __init_or_module r8a66597_remove(struct platform_device *pdev)</div><div class='ctx'> #define resource_len(r) (((r)-&gt;end - (r)-&gt;start) + 1)</div><div class='ctx'> static int __init r8a66597_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='del'>-	struct resource *res = NULL;</div><div class='add'>+	struct resource *res = NULL, *ires;</div><div class='ctx'> 	int irq = -1;</div><div class='ctx'> 	void __iomem *reg = NULL;</div><div class='ctx'> 	struct usb_hcd *hcd = NULL;</div><div class='hunk'>@@ -2274,7 +2278,7 @@ static int __init r8a66597_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	if (pdev-&gt;dev.dma_mask) {</div><div class='ctx'> 		ret = -EINVAL;</div><div class='del'>-		err("dma not support");</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "dma not supported\n");</div><div class='ctx'> 		goto clean_up;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2282,21 +2286,25 @@ static int __init r8a66597_probe(struct platform_device *pdev)</div><div class='ctx'> 					   (char *)hcd_name);</div><div class='ctx'> 	if (!res) {</div><div class='ctx'> 		ret = -ENODEV;</div><div class='del'>-		err("platform_get_resource_byname error.");</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "platform_get_resource_byname error.\n");</div><div class='ctx'> 		goto clean_up;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	irq = platform_get_irq(pdev, 0);</div><div class='del'>-	if (irq &lt; 0) {</div><div class='add'>+	ires = platform_get_resource(pdev, IORESOURCE_IRQ, 0);</div><div class='add'>+	if (!ires) {</div><div class='ctx'> 		ret = -ENODEV;</div><div class='del'>-		err("platform_get_irq error.");</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev,</div><div class='add'>+			"platform_get_resource IORESOURCE_IRQ error.\n");</div><div class='ctx'> 		goto clean_up;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	irq = ires-&gt;start;</div><div class='add'>+	irq_trigger = ires-&gt;flags &amp; IRQF_TRIGGER_MASK;</div><div class='add'>+</div><div class='ctx'> 	reg = ioremap(res-&gt;start, resource_len(res));</div><div class='ctx'> 	if (reg == NULL) {</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='del'>-		err("ioremap error.");</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "ioremap error.\n");</div><div class='ctx'> 		goto clean_up;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2304,7 +2312,7 @@ static int __init r8a66597_probe(struct platform_device *pdev)</div><div class='ctx'> 	hcd = usb_create_hcd(&amp;r8a66597_hc_driver, &amp;pdev-&gt;dev, (char *)hcd_name);</div><div class='ctx'> 	if (!hcd) {</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='del'>-		err("Failed to create hcd");</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Failed to create hcd\n");</div><div class='ctx'> 		goto clean_up;</div><div class='ctx'> 	}</div><div class='ctx'> 	r8a66597 = hcd_to_r8a66597(hcd);</div><div class='hunk'>@@ -2329,13 +2337,33 @@ static int __init r8a66597_probe(struct platform_device *pdev)</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;r8a66597-&gt;child_device);</div><div class='ctx'> </div><div class='ctx'> 	hcd-&gt;rsrc_start = res-&gt;start;</div><div class='del'>-	if (irq_sense == INTL)</div><div class='del'>-		irq_trigger = IRQF_TRIGGER_LOW;</div><div class='del'>-	else</div><div class='del'>-		irq_trigger = IRQF_TRIGGER_FALLING;</div><div class='add'>+</div><div class='add'>+	/* irq_sense setting on cmdline takes precedence over resource</div><div class='add'>+	 * settings, so the introduction of irqflags in IRQ resourse</div><div class='add'>+	 * won't disturb existing setups */</div><div class='add'>+	switch (irq_sense) {</div><div class='add'>+		case INTL:</div><div class='add'>+			irq_trigger = IRQF_TRIGGER_LOW;</div><div class='add'>+			break;</div><div class='add'>+		case 0:</div><div class='add'>+			irq_trigger = IRQF_TRIGGER_FALLING;</div><div class='add'>+			break;</div><div class='add'>+		case 0xff:</div><div class='add'>+			if (irq_trigger)</div><div class='add'>+				irq_sense = (irq_trigger &amp; IRQF_TRIGGER_LOW) ?</div><div class='add'>+					    INTL : 0;</div><div class='add'>+			else {</div><div class='add'>+				irq_sense = INTL;</div><div class='add'>+				irq_trigger = IRQF_TRIGGER_LOW;</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			dev_err(&amp;pdev-&gt;dev, "Unknown irq_sense value.\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ret = usb_add_hcd(hcd, irq, IRQF_DISABLED | irq_trigger);</div><div class='ctx'> 	if (ret != 0) {</div><div class='del'>-		err("Failed to add hcd");</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Failed to add hcd\n");</div><div class='ctx'> 		goto clean_up;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2364,7 +2392,8 @@ static int __init r8a66597_init(void)</div><div class='ctx'> 	if (usb_disabled())</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	info("driver %s, %s", hcd_name, DRIVER_VERSION);</div><div class='add'>+	printk(KERN_INFO KBUILD_MODNAME ": driver %s, %s\n", hcd_name,</div><div class='add'>+	       DRIVER_VERSION);</div><div class='ctx'> 	return platform_driver_register(&amp;r8a66597_driver);</div><div class='ctx'> }</div><div class='ctx'> module_init(r8a66597_init);</div><div class='head'>diff --git a/drivers/usb/host/sl811-hcd.c b/drivers/usb/host/sl811-hcd.c<br/>index 8a74bbb57d08..e106e9d48d4a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/host/sl811-hcd.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/host/sl811-hcd.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/host/sl811-hcd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/host/sl811-hcd.c</a></div><div class='hunk'>@@ -1620,22 +1620,26 @@ sl811h_probe(struct platform_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct usb_hcd		*hcd;</div><div class='ctx'> 	struct sl811		*sl811;</div><div class='del'>-	struct resource		*addr, *data;</div><div class='add'>+	struct resource		*addr, *data, *ires;</div><div class='ctx'> 	int			irq;</div><div class='ctx'> 	void __iomem		*addr_reg;</div><div class='ctx'> 	void __iomem		*data_reg;</div><div class='ctx'> 	int			retval;</div><div class='ctx'> 	u8			tmp, ioaddr = 0;</div><div class='add'>+	unsigned long		irqflags;</div><div class='ctx'> </div><div class='ctx'> 	/* basic sanity checks first.  board-specific init logic should</div><div class='ctx'> 	 * have initialized these three resources and probably board</div><div class='ctx'> 	 * specific platform_data.  we don't probe for IRQs, and do only</div><div class='ctx'> 	 * minimal sanity checking.</div><div class='ctx'> 	 */</div><div class='del'>-	irq = platform_get_irq(dev, 0);</div><div class='del'>-	if (dev-&gt;num_resources &lt; 3 || irq &lt; 0)</div><div class='add'>+	ires = platform_get_resource(dev, IORESOURCE_IRQ, 0);</div><div class='add'>+	if (dev-&gt;num_resources &lt; 3 || !ires)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='add'>+	irq = ires-&gt;start;</div><div class='add'>+	irqflags = ires-&gt;flags &amp; IRQF_TRIGGER_MASK;</div><div class='add'>+</div><div class='ctx'> 	/* refuse to confuse usbcore */</div><div class='ctx'> 	if (dev-&gt;dev.dma_mask) {</div><div class='ctx'> 		DBG("no we won't dma\n");</div><div class='hunk'>@@ -1717,8 +1721,11 @@ sl811h_probe(struct platform_device *dev)</div><div class='ctx'> 	 * triggers (e.g. most ARM CPUs).  Initial driver stress testing</div><div class='ctx'> 	 * was on a system with single edge triggering, so most sorts of</div><div class='ctx'> 	 * triggering arrangement should work.</div><div class='add'>+	 *</div><div class='add'>+	 * Use resource IRQ flags if set by platform device setup.</div><div class='ctx'> 	 */</div><div class='del'>-	retval = usb_add_hcd(hcd, irq, IRQF_DISABLED | IRQF_SHARED);</div><div class='add'>+	irqflags |= IRQF_SHARED;</div><div class='add'>+	retval = usb_add_hcd(hcd, irq, IRQF_DISABLED | irqflags);</div><div class='ctx'> 	if (retval != 0)</div><div class='ctx'> 		goto err6;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/usb/host/sl811_cs.c b/drivers/usb/host/sl811_cs.c<br/>index 5da63f535005..516848dd9b48 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/host/sl811_cs.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/host/sl811_cs.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/host/sl811_cs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/host/sl811_cs.c</a></div><div class='hunk'>@@ -112,7 +112,8 @@ static struct platform_device platform_dev = {</div><div class='ctx'> 	.num_resources		= ARRAY_SIZE(resources),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int sl811_hc_init(struct device *parent, ioaddr_t base_addr, int irq)</div><div class='add'>+static int sl811_hc_init(struct device *parent, resource_size_t base_addr,</div><div class='add'>+			 int irq)</div><div class='ctx'> {</div><div class='ctx'> 	if (platform_dev.dev.parent)</div><div class='ctx'> 		return -EBUSY;</div><div class='hunk'>@@ -155,97 +156,72 @@ static void sl811_cs_release(struct pcmcia_device * link)</div><div class='ctx'> 	platform_device_unregister(&amp;platform_dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int sl811_cs_config_check(struct pcmcia_device *p_dev,</div><div class='add'>+				 cistpl_cftable_entry_t *cfg,</div><div class='add'>+				 cistpl_cftable_entry_t *dflt,</div><div class='add'>+				 unsigned int vcc,</div><div class='add'>+				 void *priv_data)</div><div class='add'>+{</div><div class='add'>+	if (cfg-&gt;index == 0)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	/* Use power settings for Vcc and Vpp if present */</div><div class='add'>+	/*  Note that the CIS values need to be rescaled */</div><div class='add'>+	if (cfg-&gt;vcc.present &amp; (1&lt;&lt;CISTPL_POWER_VNOM)) {</div><div class='add'>+		if (cfg-&gt;vcc.param[CISTPL_POWER_VNOM]/10000 != vcc)</div><div class='add'>+			return -ENODEV;</div><div class='add'>+	} else if (dflt-&gt;vcc.present &amp; (1&lt;&lt;CISTPL_POWER_VNOM)) {</div><div class='add'>+		if (dflt-&gt;vcc.param[CISTPL_POWER_VNOM]/10000 != vcc)</div><div class='add'>+			return -ENODEV;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	if (cfg-&gt;vpp1.present &amp; (1&lt;&lt;CISTPL_POWER_VNOM))</div><div class='add'>+		p_dev-&gt;conf.Vpp =</div><div class='add'>+			cfg-&gt;vpp1.param[CISTPL_POWER_VNOM]/10000;</div><div class='add'>+	else if (dflt-&gt;vpp1.present &amp; (1&lt;&lt;CISTPL_POWER_VNOM))</div><div class='add'>+		p_dev-&gt;conf.Vpp =</div><div class='add'>+			dflt-&gt;vpp1.param[CISTPL_POWER_VNOM]/10000;</div><div class='add'>+</div><div class='add'>+	/* we need an interrupt */</div><div class='add'>+	if (cfg-&gt;irq.IRQInfo1 || dflt-&gt;irq.IRQInfo1)</div><div class='add'>+		p_dev-&gt;conf.Attributes |= CONF_ENABLE_IRQ;</div><div class='add'>+</div><div class='add'>+	/* IO window settings */</div><div class='add'>+	p_dev-&gt;io.NumPorts1 = p_dev-&gt;io.NumPorts2 = 0;</div><div class='add'>+	if ((cfg-&gt;io.nwin &gt; 0) || (dflt-&gt;io.nwin &gt; 0)) {</div><div class='add'>+		cistpl_io_t *io = (cfg-&gt;io.nwin) ? &amp;cfg-&gt;io : &amp;dflt-&gt;io;</div><div class='add'>+</div><div class='add'>+		p_dev-&gt;io.Attributes1 = IO_DATA_PATH_WIDTH_8;</div><div class='add'>+		p_dev-&gt;io.IOAddrLines = io-&gt;flags &amp; CISTPL_IO_LINES_MASK;</div><div class='add'>+		p_dev-&gt;io.BasePort1 = io-&gt;win[0].base;</div><div class='add'>+		p_dev-&gt;io.NumPorts1 = io-&gt;win[0].len;</div><div class='add'>+</div><div class='add'>+		return pcmcia_request_io(p_dev, &amp;p_dev-&gt;io);</div><div class='add'>+	}</div><div class='add'>+	pcmcia_disable_device(p_dev);</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> static int sl811_cs_config(struct pcmcia_device *link)</div><div class='ctx'> {</div><div class='ctx'> 	struct device		*parent = &amp;handle_to_dev(link);</div><div class='ctx'> 	local_info_t		*dev = link-&gt;priv;</div><div class='del'>-	tuple_t			tuple;</div><div class='del'>-	cisparse_t		parse;</div><div class='ctx'> 	int			last_fn, last_ret;</div><div class='del'>-	u_char			buf[64];</div><div class='del'>-	config_info_t		conf;</div><div class='del'>-	cistpl_cftable_entry_t	dflt = { 0 };</div><div class='ctx'> </div><div class='ctx'> 	DBG(0, "sl811_cs_config(0x%p)\n", link);</div><div class='ctx'> </div><div class='del'>-	/* Look up the current Vcc */</div><div class='del'>-	CS_CHECK(GetConfigurationInfo,</div><div class='del'>-			pcmcia_get_configuration_info(link, &amp;conf));</div><div class='del'>-</div><div class='del'>-	tuple.Attributes = 0;</div><div class='del'>-	tuple.TupleData = buf;</div><div class='del'>-	tuple.TupleDataMax = sizeof(buf);</div><div class='del'>-	tuple.TupleOffset = 0;</div><div class='del'>-	tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;</div><div class='del'>-	CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &amp;tuple));</div><div class='del'>-	while (1) {</div><div class='del'>-		cistpl_cftable_entry_t	*cfg = &amp;(parse.cftable_entry);</div><div class='del'>-</div><div class='del'>-		if (pcmcia_get_tuple_data(link, &amp;tuple) != 0</div><div class='del'>-				|| pcmcia_parse_tuple(link, &amp;tuple, &amp;parse)</div><div class='del'>-						!= 0)</div><div class='del'>-			goto next_entry;</div><div class='del'>-</div><div class='del'>-		if (cfg-&gt;flags &amp; CISTPL_CFTABLE_DEFAULT) {</div><div class='del'>-			dflt = *cfg;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (cfg-&gt;index == 0)</div><div class='del'>-			goto next_entry;</div><div class='del'>-</div><div class='del'>-		link-&gt;conf.ConfigIndex = cfg-&gt;index;</div><div class='del'>-</div><div class='del'>-		/* Use power settings for Vcc and Vpp if present */</div><div class='del'>-		/*  Note that the CIS values need to be rescaled */</div><div class='del'>-		if (cfg-&gt;vcc.present &amp; (1&lt;&lt;CISTPL_POWER_VNOM)) {</div><div class='del'>-			if (cfg-&gt;vcc.param[CISTPL_POWER_VNOM]/10000</div><div class='del'>-					!= conf.Vcc)</div><div class='del'>-				goto next_entry;</div><div class='del'>-		} else if (dflt.vcc.present &amp; (1&lt;&lt;CISTPL_POWER_VNOM)) {</div><div class='del'>-			if (dflt.vcc.param[CISTPL_POWER_VNOM]/10000</div><div class='del'>-					!= conf.Vcc)</div><div class='del'>-				goto next_entry;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (cfg-&gt;vpp1.present &amp; (1&lt;&lt;CISTPL_POWER_VNOM))</div><div class='del'>-			link-&gt;conf.Vpp =</div><div class='del'>-				cfg-&gt;vpp1.param[CISTPL_POWER_VNOM]/10000;</div><div class='del'>-		else if (dflt.vpp1.present &amp; (1&lt;&lt;CISTPL_POWER_VNOM))</div><div class='del'>-			link-&gt;conf.Vpp =</div><div class='del'>-				dflt.vpp1.param[CISTPL_POWER_VNOM]/10000;</div><div class='del'>-</div><div class='del'>-		/* we need an interrupt */</div><div class='del'>-		if (cfg-&gt;irq.IRQInfo1 || dflt.irq.IRQInfo1)</div><div class='del'>-			link-&gt;conf.Attributes |= CONF_ENABLE_IRQ;</div><div class='del'>-</div><div class='del'>-		/* IO window settings */</div><div class='del'>-		link-&gt;io.NumPorts1 = link-&gt;io.NumPorts2 = 0;</div><div class='del'>-		if ((cfg-&gt;io.nwin &gt; 0) || (dflt.io.nwin &gt; 0)) {</div><div class='del'>-			cistpl_io_t *io = (cfg-&gt;io.nwin) ? &amp;cfg-&gt;io : &amp;dflt.io;</div><div class='del'>-</div><div class='del'>-			link-&gt;io.Attributes1 = IO_DATA_PATH_WIDTH_8;</div><div class='del'>-			link-&gt;io.IOAddrLines = io-&gt;flags &amp; CISTPL_IO_LINES_MASK;</div><div class='del'>-			link-&gt;io.BasePort1 = io-&gt;win[0].base;</div><div class='del'>-			link-&gt;io.NumPorts1 = io-&gt;win[0].len;</div><div class='del'>-</div><div class='del'>-			if (pcmcia_request_io(link, &amp;link-&gt;io) != 0)</div><div class='del'>-				goto next_entry;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-next_entry:</div><div class='del'>-		pcmcia_disable_device(link);</div><div class='del'>-		last_ret = pcmcia_get_next_tuple(link, &amp;tuple);</div><div class='del'>-	}</div><div class='add'>+	if (pcmcia_loop_config(link, sl811_cs_config_check, NULL))</div><div class='add'>+		goto failed;</div><div class='ctx'> </div><div class='ctx'> 	/* require an IRQ and two registers */</div><div class='ctx'> 	if (!link-&gt;io.NumPorts1 || link-&gt;io.NumPorts1 &lt; 2)</div><div class='del'>-		goto cs_failed;</div><div class='add'>+		goto failed;</div><div class='ctx'> 	if (link-&gt;conf.Attributes &amp; CONF_ENABLE_IRQ)</div><div class='ctx'> 		CS_CHECK(RequestIRQ,</div><div class='ctx'> 			pcmcia_request_irq(link, &amp;link-&gt;irq));</div><div class='ctx'> 	else</div><div class='del'>-		goto cs_failed;</div><div class='add'>+		goto failed;</div><div class='ctx'> </div><div class='ctx'> 	CS_CHECK(RequestConfiguration,</div><div class='ctx'> 		pcmcia_request_configuration(link, &amp;link-&gt;conf));</div><div class='hunk'>@@ -266,8 +242,9 @@ next_entry:</div><div class='ctx'> 	if (sl811_hc_init(parent, link-&gt;io.BasePort1, link-&gt;irq.AssignedIRQ)</div><div class='ctx'> 			&lt; 0) {</div><div class='ctx'> cs_failed:</div><div class='del'>-		printk("sl811_cs_config failed\n");</div><div class='ctx'> 		cs_error(link, last_fn, last_ret);</div><div class='add'>+failed:</div><div class='add'>+		printk(KERN_WARNING "sl811_cs_config failed\n");</div><div class='ctx'> 		sl811_cs_release(link);</div><div class='ctx'> 		return  -ENODEV;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/usb/host/uhci-hcd.c b/drivers/usb/host/uhci-hcd.c<br/>index 3a7bfe7a8874..cf5e4cf7ea42 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/host/uhci-hcd.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/host/uhci-hcd.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/host/uhci-hcd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/host/uhci-hcd.c</a></div><div class='hunk'>@@ -53,7 +53,6 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Version Information</div><div class='ctx'>  */</div><div class='del'>-#define DRIVER_VERSION "v3.0"</div><div class='ctx'> #define DRIVER_AUTHOR "Linus 'Frodo Rabbit' Torvalds, Johannes Erdfelt, \</div><div class='ctx'> Randy Dunlap, Georg Acher, Deti Fliegl, Thomas Sailer, Roman Weissgaerber, \</div><div class='ctx'> Alan Stern"</div><div class='hunk'>@@ -951,12 +950,13 @@ static int __init uhci_hcd_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int retval = -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO DRIVER_DESC " " DRIVER_VERSION "%s\n",</div><div class='del'>-			ignore_oc ? ", overcurrent ignored" : "");</div><div class='del'>-</div><div class='ctx'> 	if (usb_disabled())</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='add'>+	printk(KERN_INFO "uhci_hcd: " DRIVER_DESC "%s\n",</div><div class='add'>+			ignore_oc ? ", overcurrent ignored" : "");</div><div class='add'>+	set_bit(USB_UHCI_LOADED, &amp;usb_hcds_loaded);</div><div class='add'>+</div><div class='ctx'> 	if (DEBUG_CONFIGURED) {</div><div class='ctx'> 		errbuf = kmalloc(ERRBUF_LEN, GFP_KERNEL);</div><div class='ctx'> 		if (!errbuf)</div><div class='hunk'>@@ -988,6 +988,7 @@ debug_failed:</div><div class='ctx'> </div><div class='ctx'> errbuf_failed:</div><div class='ctx'> </div><div class='add'>+	clear_bit(USB_UHCI_LOADED, &amp;usb_hcds_loaded);</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -997,6 +998,7 @@ static void __exit uhci_hcd_cleanup(void)</div><div class='ctx'> 	kmem_cache_destroy(uhci_up_cachep);</div><div class='ctx'> 	debugfs_remove(uhci_debugfs_root);</div><div class='ctx'> 	kfree(errbuf);</div><div class='add'>+	clear_bit(USB_UHCI_LOADED, &amp;usb_hcds_loaded);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(uhci_hcd_init);</div><div class='head'>diff --git a/drivers/usb/host/uhci-q.c b/drivers/usb/host/uhci-q.c<br/>index db645936eedd..5631d89c8730 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/host/uhci-q.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/host/uhci-q.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/host/uhci-q.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/host/uhci-q.c</a></div><div class='hunk'>@@ -123,14 +123,10 @@ static struct uhci_td *uhci_alloc_td(struct uhci_hcd *uhci)</div><div class='ctx'> </div><div class='ctx'> static void uhci_free_td(struct uhci_hcd *uhci, struct uhci_td *td)</div><div class='ctx'> {</div><div class='del'>-	if (!list_empty(&amp;td-&gt;list)) {</div><div class='del'>-		dev_warn(uhci_dev(uhci), "td %p still in list!\n", td);</div><div class='del'>-		WARN_ON(1);</div><div class='del'>-	}</div><div class='del'>-	if (!list_empty(&amp;td-&gt;fl_list)) {</div><div class='del'>-		dev_warn(uhci_dev(uhci), "td %p still in fl_list!\n", td);</div><div class='del'>-		WARN_ON(1);</div><div class='del'>-	}</div><div class='add'>+	if (!list_empty(&amp;td-&gt;list))</div><div class='add'>+		dev_WARN(uhci_dev(uhci), "td %p still in list!\n", td);</div><div class='add'>+	if (!list_empty(&amp;td-&gt;fl_list))</div><div class='add'>+		dev_WARN(uhci_dev(uhci), "td %p still in fl_list!\n", td);</div><div class='ctx'> </div><div class='ctx'> 	dma_pool_free(uhci-&gt;td_pool, td, td-&gt;dma_handle);</div><div class='ctx'> }</div><div class='hunk'>@@ -295,10 +291,8 @@ static struct uhci_qh *uhci_alloc_qh(struct uhci_hcd *uhci,</div><div class='ctx'> static void uhci_free_qh(struct uhci_hcd *uhci, struct uhci_qh *qh)</div><div class='ctx'> {</div><div class='ctx'> 	WARN_ON(qh-&gt;state != QH_STATE_IDLE &amp;&amp; qh-&gt;udev);</div><div class='del'>-	if (!list_empty(&amp;qh-&gt;queue)) {</div><div class='del'>-		dev_warn(uhci_dev(uhci), "qh %p list not empty!\n", qh);</div><div class='del'>-		WARN_ON(1);</div><div class='del'>-	}</div><div class='add'>+	if (!list_empty(&amp;qh-&gt;queue))</div><div class='add'>+		dev_WARN(uhci_dev(uhci), "qh %p list not empty!\n", qh);</div><div class='ctx'> </div><div class='ctx'> 	list_del(&amp;qh-&gt;node);</div><div class='ctx'> 	if (qh-&gt;udev) {</div><div class='hunk'>@@ -746,11 +740,9 @@ static void uhci_free_urb_priv(struct uhci_hcd *uhci,</div><div class='ctx'> {</div><div class='ctx'> 	struct uhci_td *td, *tmp;</div><div class='ctx'> </div><div class='del'>-	if (!list_empty(&amp;urbp-&gt;node)) {</div><div class='del'>-		dev_warn(uhci_dev(uhci), "urb %p still on QH's list!\n",</div><div class='add'>+	if (!list_empty(&amp;urbp-&gt;node))</div><div class='add'>+		dev_WARN(uhci_dev(uhci), "urb %p still on QH's list!\n",</div><div class='ctx'> 				urbp-&gt;urb);</div><div class='del'>-		WARN_ON(1);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry_safe(td, tmp, &amp;urbp-&gt;td_list, list) {</div><div class='ctx'> 		uhci_remove_td_from_urbp(td);</div><div class='hunk'>@@ -1073,13 +1065,18 @@ static int uhci_submit_interrupt(struct uhci_hcd *uhci, struct urb *urb,</div><div class='ctx'> 		}</div><div class='ctx'> 		if (exponent &lt; 0)</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-		qh-&gt;period = 1 &lt;&lt; exponent;</div><div class='del'>-		qh-&gt;skel = SKEL_INDEX(exponent);</div><div class='ctx'> </div><div class='del'>-		/* For now, interrupt phase is fixed by the layout</div><div class='del'>-		 * of the QH lists. */</div><div class='del'>-		qh-&gt;phase = (qh-&gt;period / 2) &amp; (MAX_PHASE - 1);</div><div class='del'>-		ret = uhci_check_bandwidth(uhci, qh);</div><div class='add'>+		/* If the slot is full, try a lower period */</div><div class='add'>+		do {</div><div class='add'>+			qh-&gt;period = 1 &lt;&lt; exponent;</div><div class='add'>+			qh-&gt;skel = SKEL_INDEX(exponent);</div><div class='add'>+</div><div class='add'>+			/* For now, interrupt phase is fixed by the layout</div><div class='add'>+			 * of the QH lists.</div><div class='add'>+			 */</div><div class='add'>+			qh-&gt;phase = (qh-&gt;period / 2) &amp; (MAX_PHASE - 1);</div><div class='add'>+			ret = uhci_check_bandwidth(uhci, qh);</div><div class='add'>+		} while (ret != 0 &amp;&amp; --exponent &gt;= 0);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='ctx'> 	} else if (qh-&gt;period &gt; urb-&gt;interval)</div><div class='head'>diff --git a/drivers/usb/image/mdc800.c b/drivers/usb/image/mdc800.c<br/>index 0fb114ca1eba..878c77ca086e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/image/mdc800.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/image/mdc800.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/image/mdc800.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/image/mdc800.c</a></div><div class='hunk'>@@ -355,13 +355,14 @@ static int mdc800_usb_waitForIRQ (int mode, int msec)</div><div class='ctx'> 	if (mdc800-&gt;camera_request_ready&gt;0)</div><div class='ctx'> 	{</div><div class='ctx'> 		mdc800-&gt;camera_request_ready=0;</div><div class='del'>-		err ("timeout waiting for camera.");</div><div class='add'>+		dev_err(&amp;mdc800-&gt;dev-&gt;dev, "timeout waiting for camera.\n");</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> 	</div><div class='ctx'> 	if (mdc800-&gt;state == NOT_CONNECTED)</div><div class='ctx'> 	{</div><div class='del'>-		warn ("Camera gets disconnected during waiting for irq.");</div><div class='add'>+		printk(KERN_WARNING "mdc800: Camera gets disconnected "</div><div class='add'>+		       "during waiting for irq.\n");</div><div class='ctx'> 		mdc800-&gt;camera_request_ready=0;</div><div class='ctx'> 		return -2;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -379,7 +380,8 @@ static void mdc800_usb_write_notify (struct urb *urb)</div><div class='ctx'> 	int status = urb-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	if (status != 0)</div><div class='del'>-		err ("writing command fails (status=%i)", status);</div><div class='add'>+		dev_err(&amp;mdc800-&gt;dev-&gt;dev,</div><div class='add'>+			"writing command fails (status=%i)\n", status);</div><div class='ctx'> 	else</div><div class='ctx'> 		mdc800-&gt;state=READY;</div><div class='ctx'> 	mdc800-&gt;written = 1;</div><div class='hunk'>@@ -406,7 +408,8 @@ static void mdc800_usb_download_notify (struct urb *urb)</div><div class='ctx'> 			mdc800-&gt;state=READY;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		err ("request bytes fails (status:%i)", status);</div><div class='add'>+		dev_err(&amp;mdc800-&gt;dev-&gt;dev,</div><div class='add'>+			"request bytes fails (status:%i)\n", status);</div><div class='ctx'> 	}</div><div class='ctx'> 	mdc800-&gt;downloaded = 1;</div><div class='ctx'> 	wake_up (&amp;mdc800-&gt;download_wait);</div><div class='hunk'>@@ -443,13 +446,14 @@ static int mdc800_usb_probe (struct usb_interface *intf,</div><div class='ctx'> </div><div class='ctx'> 	if (mdc800-&gt;dev != NULL)</div><div class='ctx'> 	{</div><div class='del'>-		warn ("only one Mustek MDC800 is supported.");</div><div class='add'>+		dev_warn(&amp;intf-&gt;dev, "only one Mustek MDC800 is supported.\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;descriptor.bNumConfigurations != 1)</div><div class='ctx'> 	{</div><div class='del'>-		err ("probe fails -&gt; wrong Number of Configuration");</div><div class='add'>+		dev_err(&amp;intf-&gt;dev,</div><div class='add'>+			"probe fails -&gt; wrong Number of Configuration\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> 	intf_desc = intf-&gt;cur_altsetting;</div><div class='hunk'>@@ -461,7 +465,7 @@ static int mdc800_usb_probe (struct usb_interface *intf,</div><div class='ctx'> 		|| ( intf_desc-&gt;desc.bNumEndpoints != 4)</div><div class='ctx'> 	)</div><div class='ctx'> 	{</div><div class='del'>-		err ("probe fails -&gt; wrong Interface");</div><div class='add'>+		dev_err(&amp;intf-&gt;dev, "probe fails -&gt; wrong Interface\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -482,19 +486,19 @@ static int mdc800_usb_probe (struct usb_interface *intf,</div><div class='ctx'> 		}</div><div class='ctx'> 		if (mdc800-&gt;endpoint[i] == -1)</div><div class='ctx'> 		{</div><div class='del'>-			err ("probe fails -&gt; Wrong Endpoints.");</div><div class='add'>+			dev_err(&amp;intf-&gt;dev, "probe fails -&gt; Wrong Endpoints.\n");</div><div class='ctx'> 			return -ENODEV;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-	info ("Found Mustek MDC800 on USB.");</div><div class='add'>+	dev_info(&amp;intf-&gt;dev, "Found Mustek MDC800 on USB.\n");</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;mdc800-&gt;io_lock);</div><div class='ctx'> </div><div class='ctx'> 	retval = usb_register_dev(intf, &amp;mdc800_class);</div><div class='ctx'> 	if (retval) {</div><div class='del'>-		err ("Not able to get a minor for this device.");</div><div class='add'>+		dev_err(&amp;intf-&gt;dev, "Not able to get a minor for this device.\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -570,7 +574,7 @@ static void mdc800_usb_disconnect (struct usb_interface *intf)</div><div class='ctx'> 		mdc800-&gt;dev = NULL;</div><div class='ctx'> 		usb_set_intfdata(intf, NULL);</div><div class='ctx'> 	}</div><div class='del'>-	info ("Mustek MDC800 disconnected from USB.");</div><div class='add'>+	dev_info(&amp;intf-&gt;dev, "Mustek MDC800 disconnected from USB.\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -644,7 +648,8 @@ static int mdc800_device_open (struct inode* inode, struct file *file)</div><div class='ctx'> 	mdc800-&gt;irq_urb-&gt;dev = mdc800-&gt;dev;</div><div class='ctx'> 	retval = usb_submit_urb (mdc800-&gt;irq_urb, GFP_KERNEL);</div><div class='ctx'> 	if (retval) {</div><div class='del'>-		err ("request USB irq fails (submit_retval=%i).", retval);</div><div class='add'>+		dev_err(&amp;mdc800-&gt;dev-&gt;dev,</div><div class='add'>+			"request USB irq fails (submit_retval=%i).\n", retval);</div><div class='ctx'> 		errn = -EIO;</div><div class='ctx'> 		goto error_out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -701,7 +706,8 @@ static ssize_t mdc800_device_read (struct file *file, char __user *buf, size_t l</div><div class='ctx'> 	}</div><div class='ctx'> 	if (mdc800-&gt;state == WORKING)</div><div class='ctx'> 	{</div><div class='del'>-		warn ("Illegal State \"working\" reached during read ?!");</div><div class='add'>+		printk(KERN_WARNING "mdc800: Illegal State \"working\""</div><div class='add'>+		       "reached during read ?!\n");</div><div class='ctx'> 		mutex_unlock(&amp;mdc800-&gt;io_lock);</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -733,7 +739,9 @@ static ssize_t mdc800_device_read (struct file *file, char __user *buf, size_t l</div><div class='ctx'> 				mdc800-&gt;download_urb-&gt;dev = mdc800-&gt;dev;</div><div class='ctx'> 				retval = usb_submit_urb (mdc800-&gt;download_urb, GFP_KERNEL);</div><div class='ctx'> 				if (retval) {</div><div class='del'>-					err ("Can't submit download urb (retval=%i)",retval);</div><div class='add'>+					dev_err(&amp;mdc800-&gt;dev-&gt;dev,</div><div class='add'>+						"Can't submit download urb "</div><div class='add'>+						"(retval=%i)\n", retval);</div><div class='ctx'> 					mutex_unlock(&amp;mdc800-&gt;io_lock);</div><div class='ctx'> 					return len-left;</div><div class='ctx'> 				}</div><div class='hunk'>@@ -742,7 +750,10 @@ static ssize_t mdc800_device_read (struct file *file, char __user *buf, size_t l</div><div class='ctx'> 				mdc800-&gt;downloaded = 0;</div><div class='ctx'> 				if (mdc800-&gt;download_urb-&gt;status != 0)</div><div class='ctx'> 				{</div><div class='del'>-					err ("request download-bytes fails (status=%i)",mdc800-&gt;download_urb-&gt;status);</div><div class='add'>+					dev_err(&amp;mdc800-&gt;dev-&gt;dev,</div><div class='add'>+						"request download-bytes fails "</div><div class='add'>+						"(status=%i)\n",</div><div class='add'>+						mdc800-&gt;download_urb-&gt;status);</div><div class='ctx'> 					mutex_unlock(&amp;mdc800-&gt;io_lock);</div><div class='ctx'> 					return len-left;</div><div class='ctx'> 				}</div><div class='hunk'>@@ -839,7 +850,8 @@ static ssize_t mdc800_device_write (struct file *file, const char __user *buf, s</div><div class='ctx'> </div><div class='ctx'> 			if (mdc800_usb_waitForIRQ (0,TO_GET_READY))</div><div class='ctx'> 			{</div><div class='del'>-				err ("Camera didn't get ready.\n");</div><div class='add'>+				dev_err(&amp;mdc800-&gt;dev-&gt;dev,</div><div class='add'>+					"Camera didn't get ready.\n");</div><div class='ctx'> 				mutex_unlock(&amp;mdc800-&gt;io_lock);</div><div class='ctx'> 				return -EIO;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -851,7 +863,9 @@ static ssize_t mdc800_device_write (struct file *file, const char __user *buf, s</div><div class='ctx'> 			mdc800-&gt;write_urb-&gt;dev = mdc800-&gt;dev;</div><div class='ctx'> 			retval = usb_submit_urb (mdc800-&gt;write_urb, GFP_KERNEL);</div><div class='ctx'> 			if (retval) {</div><div class='del'>-				err ("submitting write urb fails (retval=%i)", retval);</div><div class='add'>+				dev_err(&amp;mdc800-&gt;dev-&gt;dev,</div><div class='add'>+					"submitting write urb fails "</div><div class='add'>+					"(retval=%i)\n", retval);</div><div class='ctx'> 				mutex_unlock(&amp;mdc800-&gt;io_lock);</div><div class='ctx'> 				return -EIO;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -870,7 +884,9 @@ static ssize_t mdc800_device_write (struct file *file, const char __user *buf, s</div><div class='ctx'> 				case 0x3e: /* Take shot in Fine Mode (WCam Mode) */</div><div class='ctx'> 					if (mdc800-&gt;pic_len &lt; 0)</div><div class='ctx'> 					{</div><div class='del'>-						err ("call 0x07 before 0x05,0x3e");</div><div class='add'>+						dev_err(&amp;mdc800-&gt;dev-&gt;dev,</div><div class='add'>+							"call 0x07 before "</div><div class='add'>+							"0x05,0x3e\n");</div><div class='ctx'> 						mdc800-&gt;state=READY;</div><div class='ctx'> 						mutex_unlock(&amp;mdc800-&gt;io_lock);</div><div class='ctx'> 						return -EIO;</div><div class='hunk'>@@ -890,7 +906,7 @@ static ssize_t mdc800_device_write (struct file *file, const char __user *buf, s</div><div class='ctx'> </div><div class='ctx'> 						if (mdc800_usb_waitForIRQ (1,TO_READ_FROM_IRQ))</div><div class='ctx'> 						{</div><div class='del'>-							err ("requesting answer from irq fails");</div><div class='add'>+							dev_err(&amp;mdc800-&gt;dev-&gt;dev, "requesting answer from irq fails\n");</div><div class='ctx'> 							mutex_unlock(&amp;mdc800-&gt;io_lock);</div><div class='ctx'> 							return -EIO;</div><div class='ctx'> 						}</div><div class='hunk'>@@ -918,7 +934,7 @@ static ssize_t mdc800_device_write (struct file *file, const char __user *buf, s</div><div class='ctx'> 					{</div><div class='ctx'> 						if (mdc800_usb_waitForIRQ (0,TO_DEFAULT_COMMAND))</div><div class='ctx'> 						{</div><div class='del'>-							err ("Command Timeout.");</div><div class='add'>+							dev_err(&amp;mdc800-&gt;dev-&gt;dev, "Command Timeout.\n");</div><div class='ctx'> 							mutex_unlock(&amp;mdc800-&gt;io_lock);</div><div class='ctx'> 							return -EIO;</div><div class='ctx'> 						}</div><div class='hunk'>@@ -1018,7 +1034,8 @@ static int __init usb_mdc800_init (void)</div><div class='ctx'> 	if (retval)</div><div class='ctx'> 		goto cleanup_on_fail;</div><div class='ctx'> </div><div class='del'>-	info (DRIVER_VERSION ":" DRIVER_DESC);</div><div class='add'>+	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"</div><div class='add'>+	       DRIVER_DESC "\n");</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1028,7 +1045,7 @@ cleanup_on_fail:</div><div class='ctx'> </div><div class='ctx'> 	if (mdc800 != NULL)</div><div class='ctx'> 	{</div><div class='del'>-		err ("can't alloc memory!");</div><div class='add'>+		printk(KERN_ERR "mdc800: can't alloc memory!\n");</div><div class='ctx'> </div><div class='ctx'> 		kfree(mdc800-&gt;download_urb_buffer);</div><div class='ctx'> 		kfree(mdc800-&gt;write_urb_buffer);</div><div class='head'>diff --git a/drivers/usb/misc/Kconfig b/drivers/usb/misc/Kconfig<br/>index 4ea50e0abcbb..e463db5d8188 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/misc/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/misc/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/misc/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/misc/Kconfig</a></div><div class='hunk'>@@ -42,6 +42,15 @@ config USB_ADUTUX</div><div class='ctx'> 	  To compile this driver as a module, choose M here.  The module</div><div class='ctx'> 	  will be called adutux.</div><div class='ctx'> </div><div class='add'>+config USB_SEVSEG</div><div class='add'>+	tristate "USB 7-Segment LED Display"</div><div class='add'>+	depends on USB</div><div class='add'>+	help</div><div class='add'>+	  Say Y here if you have a USB 7-Segment Display by Delcom</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here: the</div><div class='add'>+	  module will be called usbsevseg.</div><div class='add'>+</div><div class='ctx'> config USB_RIO500</div><div class='ctx'> 	tristate "USB Diamond Rio500 support"</div><div class='ctx'> 	depends on USB</div><div class='hunk'>@@ -271,3 +280,18 @@ config USB_ISIGHTFW</div><div class='ctx'> 	  The firmware for this driver must be extracted from the MacOS</div><div class='ctx'> 	  driver beforehand. Tools for doing so are available at</div><div class='ctx'> 	  http://bersace03.free.fr</div><div class='add'>+</div><div class='add'>+config USB_VST</div><div class='add'>+	tristate "USB VST driver"</div><div class='add'>+	depends on USB</div><div class='add'>+	help</div><div class='add'>+	  This driver is intended for Vernier Software Technologies</div><div class='add'>+	  bulk usb devices such as their Ocean-Optics spectrometers or</div><div class='add'>+	  Labquest.</div><div class='add'>+	  It is a bulk channel driver with configurable read and write</div><div class='add'>+	  timeouts.</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here: the</div><div class='add'>+	  module will be called vstusb.</div><div class='add'>+</div><div class='add'>+</div><div class='head'>diff --git a/drivers/usb/misc/Makefile b/drivers/usb/misc/Makefile<br/>index 45b4e12afb08..1334f7bdd7be 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/misc/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/misc/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/misc/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/misc/Makefile</a></div><div class='hunk'>@@ -26,6 +26,8 @@ obj-$(CONFIG_USB_RIO500)	+= rio500.o</div><div class='ctx'> obj-$(CONFIG_USB_TEST)		+= usbtest.o</div><div class='ctx'> obj-$(CONFIG_USB_TRANCEVIBRATOR)	+= trancevibrator.o</div><div class='ctx'> obj-$(CONFIG_USB_USS720)	+= uss720.o</div><div class='add'>+obj-$(CONFIG_USB_SEVSEG)	+= usbsevseg.o</div><div class='add'>+obj-$(CONFIG_USB_VST)		+= vstusb.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_USB_SISUSBVGA)	+= sisusbvga/</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/usb/misc/adutux.c b/drivers/usb/misc/adutux.c<br/>index 965f6eaea6a0..7b6922e08ed1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/misc/adutux.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/misc/adutux.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/misc/adutux.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/misc/adutux.c</a></div><div class='hunk'>@@ -283,8 +283,8 @@ static int adu_open(struct inode *inode, struct file *file)</div><div class='ctx'> </div><div class='ctx'> 	interface = usb_find_interface(&amp;adu_driver, subminor);</div><div class='ctx'> 	if (!interface) {</div><div class='del'>-		err("%s - error, can't find device for minor %d",</div><div class='del'>-		    __func__, subminor);</div><div class='add'>+		printk(KERN_ERR "adutux: %s - error, can't find device for "</div><div class='add'>+		       "minor %d\n", __func__, subminor);</div><div class='ctx'> 		retval = -ENODEV;</div><div class='ctx'> 		goto exit_no_device;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -416,7 +416,8 @@ static ssize_t adu_read(struct file *file, __user char *buffer, size_t count,</div><div class='ctx'> 	/* verify that the device wasn't unplugged */</div><div class='ctx'> 	if (dev-&gt;udev == NULL) {</div><div class='ctx'> 		retval = -ENODEV;</div><div class='del'>-		err("No device or device unplugged %d", retval);</div><div class='add'>+		printk(KERN_ERR "adutux: No device or device unplugged %d\n",</div><div class='add'>+		       retval);</div><div class='ctx'> 		goto exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -576,7 +577,8 @@ static ssize_t adu_write(struct file *file, const __user char *buffer,</div><div class='ctx'> 	/* verify that the device wasn't unplugged */</div><div class='ctx'> 	if (dev-&gt;udev == NULL) {</div><div class='ctx'> 		retval = -ENODEV;</div><div class='del'>-		err("No device or device unplugged %d", retval);</div><div class='add'>+		printk(KERN_ERR "adutux: No device or device unplugged %d\n",</div><div class='add'>+		       retval);</div><div class='ctx'> 		goto exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -645,7 +647,8 @@ static ssize_t adu_write(struct file *file, const __user char *buffer,</div><div class='ctx'> 			retval = usb_submit_urb(dev-&gt;interrupt_out_urb, GFP_KERNEL);</div><div class='ctx'> 			if (retval &lt; 0) {</div><div class='ctx'> 				dev-&gt;out_urb_finished = 1;</div><div class='del'>-				err("Couldn't submit interrupt_out_urb %d", retval);</div><div class='add'>+				dev_err(&amp;dev-&gt;udev-&gt;dev, "Couldn't submit "</div><div class='add'>+					"interrupt_out_urb %d\n", retval);</div><div class='ctx'> 				goto exit;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='hunk'>@@ -890,13 +893,14 @@ static int __init adu_init(void)</div><div class='ctx'> 	/* register this driver with the USB subsystem */</div><div class='ctx'> 	result = usb_register(&amp;adu_driver);</div><div class='ctx'> 	if (result &lt; 0) {</div><div class='del'>-		err("usb_register failed for the "__FILE__" driver. "</div><div class='del'>-		    "Error number %d", result);</div><div class='add'>+		printk(KERN_ERR "usb_register failed for the "__FILE__</div><div class='add'>+		       " driver. Error number %d\n", result);</div><div class='ctx'> 		goto exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	info("adutux " DRIVER_DESC " " DRIVER_VERSION);</div><div class='del'>-	info("adutux is an experimental driver. Use at your own risk");</div><div class='add'>+	printk(KERN_INFO "adutux " DRIVER_DESC " " DRIVER_VERSION "\n");</div><div class='add'>+	printk(KERN_INFO "adutux is an experimental driver. "</div><div class='add'>+	       "Use at your own risk\n");</div><div class='ctx'> </div><div class='ctx'> exit:</div><div class='ctx'> 	dbg(2," %s : leave, return value %d", __func__, result);</div><div class='head'>diff --git a/drivers/usb/misc/appledisplay.c b/drivers/usb/misc/appledisplay.c<br/>index a076c24a312a..1d8e39a557d9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/misc/appledisplay.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/misc/appledisplay.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/misc/appledisplay.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/misc/appledisplay.c</a></div><div class='hunk'>@@ -130,7 +130,8 @@ static void appledisplay_complete(struct urb *urb)</div><div class='ctx'> exit:</div><div class='ctx'> 	retval = usb_submit_urb(pdata-&gt;urb, GFP_ATOMIC);</div><div class='ctx'> 	if (retval) {</div><div class='del'>-		err("%s - usb_submit_urb failed with result %d",</div><div class='add'>+		dev_err(&amp;pdata-&gt;udev-&gt;dev,</div><div class='add'>+			"%s - usb_submit_urb failed with result %d\n",</div><div class='ctx'> 			__func__, retval);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -220,7 +221,7 @@ static int appledisplay_probe(struct usb_interface *iface,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!int_in_endpointAddr) {</div><div class='del'>-		err("Could not find int-in endpoint");</div><div class='add'>+		dev_err(&amp;iface-&gt;dev, "Could not find int-in endpoint\n");</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -228,7 +229,7 @@ static int appledisplay_probe(struct usb_interface *iface,</div><div class='ctx'> 	pdata = kzalloc(sizeof(struct appledisplay), GFP_KERNEL);</div><div class='ctx'> 	if (!pdata) {</div><div class='ctx'> 		retval = -ENOMEM;</div><div class='del'>-		err("Out of memory");</div><div class='add'>+		dev_err(&amp;iface-&gt;dev, "Out of memory\n");</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -241,8 +242,8 @@ static int appledisplay_probe(struct usb_interface *iface,</div><div class='ctx'> 	pdata-&gt;msgdata = kmalloc(ACD_MSG_BUFFER_LEN, GFP_KERNEL);</div><div class='ctx'> 	if (!pdata-&gt;msgdata) {</div><div class='ctx'> 		retval = -ENOMEM;</div><div class='del'>-		err("appledisplay: Allocating buffer for control messages "</div><div class='del'>-			"failed");</div><div class='add'>+		dev_err(&amp;iface-&gt;dev,</div><div class='add'>+			"Allocating buffer for control messages failed\n");</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -250,7 +251,7 @@ static int appledisplay_probe(struct usb_interface *iface,</div><div class='ctx'> 	pdata-&gt;urb = usb_alloc_urb(0, GFP_KERNEL);</div><div class='ctx'> 	if (!pdata-&gt;urb) {</div><div class='ctx'> 		retval = -ENOMEM;</div><div class='del'>-		err("appledisplay: Allocating URB failed");</div><div class='add'>+		dev_err(&amp;iface-&gt;dev, "Allocating URB failed\n");</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -259,7 +260,7 @@ static int appledisplay_probe(struct usb_interface *iface,</div><div class='ctx'> 		GFP_KERNEL, &amp;pdata-&gt;urb-&gt;transfer_dma);</div><div class='ctx'> 	if (!pdata-&gt;urbdata) {</div><div class='ctx'> 		retval = -ENOMEM;</div><div class='del'>-		err("appledisplay: Allocating URB buffer failed");</div><div class='add'>+		dev_err(&amp;iface-&gt;dev, "Allocating URB buffer failed\n");</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -270,7 +271,7 @@ static int appledisplay_probe(struct usb_interface *iface,</div><div class='ctx'> 		pdata, 1);</div><div class='ctx'> 	if (usb_submit_urb(pdata-&gt;urb, GFP_KERNEL)) {</div><div class='ctx'> 		retval = -EIO;</div><div class='del'>-		err("appledisplay: Submitting URB failed");</div><div class='add'>+		dev_err(&amp;iface-&gt;dev, "Submitting URB failed\n");</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -280,7 +281,7 @@ static int appledisplay_probe(struct usb_interface *iface,</div><div class='ctx'> 	pdata-&gt;bd = backlight_device_register(bl_name, NULL, pdata,</div><div class='ctx'> 						&amp;appledisplay_bl_data);</div><div class='ctx'> 	if (IS_ERR(pdata-&gt;bd)) {</div><div class='del'>-		err("appledisplay: Backlight registration failed");</div><div class='add'>+		dev_err(&amp;iface-&gt;dev, "Backlight registration failed\n");</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -291,7 +292,8 @@ static int appledisplay_probe(struct usb_interface *iface,</div><div class='ctx'> </div><div class='ctx'> 	if (brightness &lt; 0) {</div><div class='ctx'> 		retval = brightness;</div><div class='del'>-		err("appledisplay: Error while getting initial brightness: %d", retval);</div><div class='add'>+		dev_err(&amp;iface-&gt;dev,</div><div class='add'>+			"Error while getting initial brightness: %d\n", retval);</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -314,7 +316,7 @@ error:</div><div class='ctx'> 					pdata-&gt;urbdata, pdata-&gt;urb-&gt;transfer_dma);</div><div class='ctx'> 			usb_free_urb(pdata-&gt;urb);</div><div class='ctx'> 		}</div><div class='del'>-		if (pdata-&gt;bd)</div><div class='add'>+		if (pdata-&gt;bd &amp;&amp; !IS_ERR(pdata-&gt;bd))</div><div class='ctx'> 			backlight_device_unregister(pdata-&gt;bd);</div><div class='ctx'> 		kfree(pdata-&gt;msgdata);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -352,7 +354,7 @@ static int __init appledisplay_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	wq = create_singlethread_workqueue("appledisplay");</div><div class='ctx'> 	if (!wq) {</div><div class='del'>-		err("Could not create work queue\n");</div><div class='add'>+		printk(KERN_ERR "appledisplay: Could not create work queue\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/usb/misc/cypress_cy7c63.c b/drivers/usb/misc/cypress_cy7c63.c<br/>index 937940404b7a..5720bfef6a38 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/misc/cypress_cy7c63.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/misc/cypress_cy7c63.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/misc/cypress_cy7c63.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/misc/cypress_cy7c63.c</a></div><div class='hunk'>@@ -278,9 +278,9 @@ static int __init cypress_init(void)</div><div class='ctx'> </div><div class='ctx'> 	/* register this driver with the USB subsystem */</div><div class='ctx'> 	result = usb_register(&amp;cypress_driver);</div><div class='del'>-	if (result) {</div><div class='del'>-		err("Function usb_register failed! Error number: %d\n", result);</div><div class='del'>-	}</div><div class='add'>+	if (result)</div><div class='add'>+		printk(KERN_ERR KBUILD_MODNAME ": usb_register failed! "</div><div class='add'>+		       "Error number: %d\n", result);</div><div class='ctx'> </div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/usb/misc/cytherm.c b/drivers/usb/misc/cytherm.c<br/>index 1cd9e7eba93b..4fb3c38b924b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/misc/cytherm.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/misc/cytherm.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/misc/cytherm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/misc/cytherm.c</a></div><div class='hunk'>@@ -422,13 +422,14 @@ static int __init usb_cytherm_init(void)</div><div class='ctx'> 	int result;</div><div class='ctx'> </div><div class='ctx'> 	result = usb_register(&amp;cytherm_driver);</div><div class='del'>-	if (result) </div><div class='del'>-	{	</div><div class='del'>-		err("usb_register failed. Error number %d", result);</div><div class='add'>+	if (result) {</div><div class='add'>+		printk(KERN_ERR KBUILD_MODNAME ": usb_register failed! "</div><div class='add'>+		       "Error number: %d\n", result);</div><div class='ctx'> 		return result;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	info(DRIVER_VERSION ":" DRIVER_DESC);</div><div class='add'>+	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"</div><div class='add'>+	       DRIVER_DESC "\n");</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/usb/misc/emi26.c b/drivers/usb/misc/emi26.c<br/>index 4b994a0cd272..e762beb5f3c6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/misc/emi26.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/misc/emi26.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/misc/emi26.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/misc/emi26.c</a></div><div class='hunk'>@@ -50,7 +50,7 @@ static int emi26_writememory (struct usb_device *dev, int address,</div><div class='ctx'> 	unsigned char *buffer =  kmemdup(data, length, GFP_KERNEL);</div><div class='ctx'> </div><div class='ctx'> 	if (!buffer) {</div><div class='del'>-		err("emi26: kmalloc(%d) failed.", length);</div><div class='add'>+		dev_err(&amp;dev-&gt;dev, "kmalloc(%d) failed.\n", length);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Note: usb_control_msg returns negative value on error or length of the</div><div class='hunk'>@@ -64,11 +64,11 @@ static int emi26_writememory (struct usb_device *dev, int address,</div><div class='ctx'> static int emi26_set_reset (struct usb_device *dev, unsigned char reset_bit)</div><div class='ctx'> {</div><div class='ctx'> 	int response;</div><div class='del'>-	info("%s - %d", __func__, reset_bit);</div><div class='add'>+	dev_info(&amp;dev-&gt;dev, "%s - %d\n", __func__, reset_bit);</div><div class='ctx'> 	/* printk(KERN_DEBUG "%s - %d", __func__, reset_bit); */</div><div class='ctx'> 	response = emi26_writememory (dev, CPUCS_REG, &amp;reset_bit, 1, 0xa0);</div><div class='ctx'> 	if (response &lt; 0) {</div><div class='del'>-		err("emi26: set_reset (%d) failed", reset_bit);</div><div class='add'>+		dev_err(&amp;dev-&gt;dev, "set_reset (%d) failed\n", reset_bit);</div><div class='ctx'> 	}</div><div class='ctx'> 	return response;</div><div class='ctx'> }</div><div class='hunk'>@@ -88,7 +88,8 @@ static int emi26_load_firmware (struct usb_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	buf = kmalloc(FW_LOAD_SIZE, GFP_KERNEL);</div><div class='ctx'> 	if (!buf) {</div><div class='del'>-		err( "%s - error loading firmware: error = %d", __func__, -ENOMEM);</div><div class='add'>+		dev_err(&amp;dev-&gt;dev, "%s - error loading firmware: error = %d\n",</div><div class='add'>+			__func__, -ENOMEM);</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto wraperr;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -106,14 +107,16 @@ static int emi26_load_firmware (struct usb_device *dev)</div><div class='ctx'> 				    &amp;dev-&gt;dev);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 	nofw:</div><div class='del'>-		err( "%s - request_firmware() failed", __func__);</div><div class='add'>+		dev_err(&amp;dev-&gt;dev, "%s - request_firmware() failed\n",</div><div class='add'>+			__func__);</div><div class='ctx'> 		goto wraperr;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Assert reset (stop the CPU in the EMI) */</div><div class='ctx'> 	err = emi26_set_reset(dev,1);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		err( "%s - error loading firmware: error = %d", __func__, err);</div><div class='add'>+		dev_err(&amp;dev-&gt;dev,"%s - error loading firmware: error = %d\n",</div><div class='add'>+			__func__, err);</div><div class='ctx'> 		goto wraperr;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -254,7 +257,7 @@ static int emi26_probe(struct usb_interface *intf, const struct usb_device_id *i</div><div class='ctx'> {</div><div class='ctx'> 	struct usb_device *dev = interface_to_usbdev(intf);</div><div class='ctx'> </div><div class='del'>-	info("%s start", __func__);</div><div class='add'>+	dev_info(&amp;intf-&gt;dev, "%s start\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	emi26_load_firmware(dev);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/usb/misc/emi62.c b/drivers/usb/misc/emi62.c<br/>index 5d859ded5bbf..602ee05ba9ff 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/misc/emi62.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/misc/emi62.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/misc/emi62.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/misc/emi62.c</a></div><div class='hunk'>@@ -73,7 +73,7 @@ static int emi62_writememory(struct usb_device *dev, int address,</div><div class='ctx'> static int emi62_set_reset (struct usb_device *dev, unsigned char reset_bit)</div><div class='ctx'> {</div><div class='ctx'> 	int response;</div><div class='del'>-	info("%s - %d", __func__, reset_bit);</div><div class='add'>+	dev_info(&amp;dev-&gt;dev, "%s - %d\n", __func__, reset_bit);</div><div class='ctx'> 	</div><div class='ctx'> 	response = emi62_writememory (dev, CPUCS_REG, &amp;reset_bit, 1, 0xa0);</div><div class='ctx'> 	if (response &lt; 0) {</div><div class='hunk'>@@ -271,7 +271,7 @@ static int emi62_probe(struct usb_interface *intf, const struct usb_device_id *i</div><div class='ctx'> 	struct usb_device *dev = interface_to_usbdev(intf);</div><div class='ctx'> 	dev_dbg(&amp;intf-&gt;dev, "emi62_probe\n");</div><div class='ctx'> </div><div class='del'>-	info("%s start", __func__);</div><div class='add'>+	dev_info(&amp;intf-&gt;dev, "%s start\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	emi62_load_firmware(dev);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/usb/misc/ftdi-elan.c b/drivers/usb/misc/ftdi-elan.c<br/>index 97c280971532..79a7668ef264 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/misc/ftdi-elan.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/misc/ftdi-elan.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/misc/ftdi-elan.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/misc/ftdi-elan.c</a></div><div class='hunk'>@@ -698,7 +698,7 @@ static ssize_t ftdi_elan_read(struct file *file, char __user *buffer,</div><div class='ctx'>                 int retval = usb_bulk_msg(ftdi-&gt;udev,</div><div class='ctx'>                         usb_rcvbulkpipe(ftdi-&gt;udev, ftdi-&gt;bulk_in_endpointAddr),</div><div class='ctx'>                          ftdi-&gt;bulk_in_buffer, ftdi-&gt;bulk_in_size,</div><div class='del'>-                        &amp;packet_bytes, msecs_to_jiffies(50));</div><div class='add'>+                        &amp;packet_bytes, 50);</div><div class='ctx'>                 if (packet_bytes &gt; 2) {</div><div class='ctx'>                         ftdi-&gt;bulk_in_left = packet_bytes - 2;</div><div class='ctx'>                         ftdi-&gt;bulk_in_last = 1;</div><div class='hunk'>@@ -960,7 +960,7 @@ static int ftdi_elan_respond_engine(struct usb_ftdi *ftdi)</div><div class='ctx'>                 int retval = usb_bulk_msg(ftdi-&gt;udev,</div><div class='ctx'>                         usb_rcvbulkpipe(ftdi-&gt;udev, ftdi-&gt;bulk_in_endpointAddr),</div><div class='ctx'>                          ftdi-&gt;bulk_in_buffer, ftdi-&gt;bulk_in_size,</div><div class='del'>-                        &amp;packet_bytes, msecs_to_jiffies(500));</div><div class='add'>+                        &amp;packet_bytes, 500);</div><div class='ctx'>                 char diag[30 *3 + 4];</div><div class='ctx'>                 char *d = diag;</div><div class='ctx'>                 int m = packet_bytes;</div><div class='hunk'>@@ -1880,7 +1880,7 @@ static int ftdi_elan_flush_input_fifo(struct usb_ftdi *ftdi)</div><div class='ctx'>                 int retval = usb_bulk_msg(ftdi-&gt;udev,</div><div class='ctx'>                         usb_rcvbulkpipe(ftdi-&gt;udev, ftdi-&gt;bulk_in_endpointAddr),</div><div class='ctx'>                          ftdi-&gt;bulk_in_buffer, ftdi-&gt;bulk_in_size,</div><div class='del'>-                        &amp;packet_bytes, msecs_to_jiffies(100));</div><div class='add'>+                        &amp;packet_bytes, 100);</div><div class='ctx'>                 if (packet_bytes &gt; 2) {</div><div class='ctx'>                         char diag[30 *3 + 4];</div><div class='ctx'>                         char *d = diag;</div><div class='hunk'>@@ -2067,7 +2067,7 @@ static int ftdi_elan_synchronize(struct usb_ftdi *ftdi)</div><div class='ctx'>                                 usb_rcvbulkpipe(ftdi-&gt;udev,</div><div class='ctx'>                                 ftdi-&gt;bulk_in_endpointAddr),</div><div class='ctx'>                                 ftdi-&gt;bulk_in_buffer, ftdi-&gt;bulk_in_size,</div><div class='del'>-                                &amp;packet_bytes, msecs_to_jiffies(500));</div><div class='add'>+                                &amp;packet_bytes, 500);</div><div class='ctx'>                         if (packet_bytes &gt; 2) {</div><div class='ctx'>                                 char diag[30 *3 + 4];</div><div class='ctx'>                                 char *d = diag;</div><div class='hunk'>@@ -2176,7 +2176,7 @@ static int ftdi_elan_stuck_waiting(struct usb_ftdi *ftdi)</div><div class='ctx'>                 int retval = usb_bulk_msg(ftdi-&gt;udev,</div><div class='ctx'>                         usb_rcvbulkpipe(ftdi-&gt;udev, ftdi-&gt;bulk_in_endpointAddr),</div><div class='ctx'>                          ftdi-&gt;bulk_in_buffer, ftdi-&gt;bulk_in_size,</div><div class='del'>-                        &amp;packet_bytes, msecs_to_jiffies(1000));</div><div class='add'>+                        &amp;packet_bytes, 1000);</div><div class='ctx'>                 if (packet_bytes &gt; 2) {</div><div class='ctx'>                         char diag[30 *3 + 4];</div><div class='ctx'>                         char *d = diag;</div><div class='head'>diff --git a/drivers/usb/misc/idmouse.c b/drivers/usb/misc/idmouse.c<br/>index 4bcf7fb4e5da..6da8887538c7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/misc/idmouse.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/misc/idmouse.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/misc/idmouse.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/misc/idmouse.c</a></div><div class='hunk'>@@ -403,14 +403,15 @@ static void idmouse_disconnect(struct usb_interface *interface)</div><div class='ctx'> 		mutex_unlock(&amp;dev-&gt;lock);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	info("%s disconnected", DRIVER_DESC);</div><div class='add'>+	dev_info(&amp;interface-&gt;dev, "disconnected\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init usb_idmouse_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int result;</div><div class='ctx'> </div><div class='del'>-	info(DRIVER_DESC " " DRIVER_VERSION);</div><div class='add'>+	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"</div><div class='add'>+	       DRIVER_DESC "\n");</div><div class='ctx'> </div><div class='ctx'> 	/* register this driver with the USB subsystem */</div><div class='ctx'> 	result = usb_register(&amp;idmouse_driver);</div><div class='head'>diff --git a/drivers/usb/misc/legousbtower.c b/drivers/usb/misc/legousbtower.c<br/>index 9370326a5940..ab0f3226158b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/misc/legousbtower.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/misc/legousbtower.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/misc/legousbtower.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/misc/legousbtower.c</a></div><div class='hunk'>@@ -851,9 +851,8 @@ static int tower_probe (struct usb_interface *interface, const struct usb_device</div><div class='ctx'> </div><div class='ctx'> 	dbg(2, "%s: enter", __func__);</div><div class='ctx'> </div><div class='del'>-	if (udev == NULL) {</div><div class='del'>-		info ("udev is NULL.");</div><div class='del'>-	}</div><div class='add'>+	if (udev == NULL)</div><div class='add'>+		dev_info(&amp;interface-&gt;dev, "udev is NULL.\n");</div><div class='ctx'> </div><div class='ctx'> 	/* allocate memory for our device state and initialize it */</div><div class='ctx'> </div><div class='hunk'>@@ -954,7 +953,9 @@ static int tower_probe (struct usb_interface *interface, const struct usb_device</div><div class='ctx'> 	dev-&gt;minor = interface-&gt;minor;</div><div class='ctx'> </div><div class='ctx'> 	/* let the user know what node this device is now attached to */</div><div class='del'>-	info ("LEGO USB Tower #%d now attached to major %d minor %d", (dev-&gt;minor - LEGO_USB_TOWER_MINOR_BASE), USB_MAJOR, dev-&gt;minor);</div><div class='add'>+	dev_info(&amp;interface-&gt;dev, "LEGO USB Tower #%d now attached to major "</div><div class='add'>+		 "%d minor %d\n", (dev-&gt;minor - LEGO_USB_TOWER_MINOR_BASE),</div><div class='add'>+		 USB_MAJOR, dev-&gt;minor);</div><div class='ctx'> </div><div class='ctx'> 	/* get the firmware version and log it */</div><div class='ctx'> 	result = usb_control_msg (udev,</div><div class='hunk'>@@ -971,10 +972,10 @@ static int tower_probe (struct usb_interface *interface, const struct usb_device</div><div class='ctx'> 		retval = result;</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='del'>-	info("LEGO USB Tower firmware version is %d.%d build %d",</div><div class='del'>-	     get_version_reply.major,</div><div class='del'>-	     get_version_reply.minor,</div><div class='del'>-	     le16_to_cpu(get_version_reply.build_no));</div><div class='add'>+	dev_info(&amp;interface-&gt;dev, "LEGO USB Tower firmware version is %d.%d "</div><div class='add'>+		 "build %d\n", get_version_reply.major,</div><div class='add'>+		 get_version_reply.minor,</div><div class='add'>+		 le16_to_cpu(get_version_reply.build_no));</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> exit:</div><div class='hunk'>@@ -1021,7 +1022,8 @@ static void tower_disconnect (struct usb_interface *interface)</div><div class='ctx'> 		mutex_unlock(&amp;dev-&gt;lock);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	info("LEGO USB Tower #%d now disconnected", (minor - LEGO_USB_TOWER_MINOR_BASE));</div><div class='add'>+	dev_info(&amp;interface-&gt;dev, "LEGO USB Tower #%d now disconnected\n",</div><div class='add'>+		 (minor - LEGO_USB_TOWER_MINOR_BASE));</div><div class='ctx'> </div><div class='ctx'> 	dbg(2, "%s: leave", __func__);</div><div class='ctx'> }</div><div class='hunk'>@@ -1046,7 +1048,8 @@ static int __init lego_usb_tower_init(void)</div><div class='ctx'> 		goto exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	info(DRIVER_DESC " " DRIVER_VERSION);</div><div class='add'>+	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"</div><div class='add'>+	       DRIVER_DESC "\n");</div><div class='ctx'> </div><div class='ctx'> exit:</div><div class='ctx'> 	dbg(2, "%s: leave, return value %d", __func__, retval);</div><div class='head'>diff --git a/drivers/usb/misc/phidgetkit.c b/drivers/usb/misc/phidgetkit.c<br/>index 4cfa25b0f44e..cc8e0a926f99 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/misc/phidgetkit.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/misc/phidgetkit.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/misc/phidgetkit.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/misc/phidgetkit.c</a></div><div class='hunk'>@@ -595,9 +595,8 @@ static int interfacekit_probe(struct usb_interface *intf, const struct usb_devic</div><div class='ctx'>         } while(value);</div><div class='ctx'>         kit-&gt;dev_no = bit;</div><div class='ctx'> </div><div class='del'>-	kit-&gt;dev = device_create_drvdata(phidget_class, &amp;kit-&gt;udev-&gt;dev,</div><div class='del'>-					MKDEV(0, 0), kit,</div><div class='del'>-					"interfacekit%d", kit-&gt;dev_no);</div><div class='add'>+	kit-&gt;dev = device_create(phidget_class, &amp;kit-&gt;udev-&gt;dev, MKDEV(0, 0),</div><div class='add'>+				 kit, "interfacekit%d", kit-&gt;dev_no);</div><div class='ctx'>         if (IS_ERR(kit-&gt;dev)) {</div><div class='ctx'>                 rc = PTR_ERR(kit-&gt;dev);</div><div class='ctx'>                 kit-&gt;dev = NULL;</div><div class='head'>diff --git a/drivers/usb/misc/phidgetmotorcontrol.c b/drivers/usb/misc/phidgetmotorcontrol.c<br/>index 9b4696f21b22..38088b44349e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/misc/phidgetmotorcontrol.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/misc/phidgetmotorcontrol.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/misc/phidgetmotorcontrol.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/misc/phidgetmotorcontrol.c</a></div><div class='hunk'>@@ -365,9 +365,8 @@ static int motorcontrol_probe(struct usb_interface *intf, const struct usb_devic</div><div class='ctx'> 	} while(value);</div><div class='ctx'> 	mc-&gt;dev_no = bit;</div><div class='ctx'> </div><div class='del'>-	mc-&gt;dev = device_create_drvdata(phidget_class, &amp;mc-&gt;udev-&gt;dev,</div><div class='del'>-					MKDEV(0, 0), mc,</div><div class='del'>-					"motorcontrol%d", mc-&gt;dev_no);</div><div class='add'>+	mc-&gt;dev = device_create(phidget_class, &amp;mc-&gt;udev-&gt;dev, MKDEV(0, 0), mc,</div><div class='add'>+				"motorcontrol%d", mc-&gt;dev_no);</div><div class='ctx'> 	if (IS_ERR(mc-&gt;dev)) {</div><div class='ctx'> 		rc = PTR_ERR(mc-&gt;dev);</div><div class='ctx'> 		mc-&gt;dev = NULL;</div><div class='head'>diff --git a/drivers/usb/misc/phidgetservo.c b/drivers/usb/misc/phidgetservo.c<br/>index 1ca7ddb41d4d..bef6fe16364b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/misc/phidgetservo.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/misc/phidgetservo.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/misc/phidgetservo.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/misc/phidgetservo.c</a></div><div class='hunk'>@@ -275,9 +275,8 @@ servo_probe(struct usb_interface *interface, const struct usb_device_id *id)</div><div class='ctx'>         } while (value);</div><div class='ctx'> 	dev-&gt;dev_no = bit;</div><div class='ctx'> </div><div class='del'>-	dev-&gt;dev = device_create_drvdata(phidget_class, &amp;dev-&gt;udev-&gt;dev,</div><div class='del'>-					 MKDEV(0, 0), dev,</div><div class='del'>-					 "servo%d", dev-&gt;dev_no);</div><div class='add'>+	dev-&gt;dev = device_create(phidget_class, &amp;dev-&gt;udev-&gt;dev, MKDEV(0, 0),</div><div class='add'>+				 dev, "servo%d", dev-&gt;dev_no);</div><div class='ctx'> 	if (IS_ERR(dev-&gt;dev)) {</div><div class='ctx'> 		rc = PTR_ERR(dev-&gt;dev);</div><div class='ctx'> 		dev-&gt;dev = NULL;</div><div class='head'>diff --git a/drivers/usb/misc/rio500.c b/drivers/usb/misc/rio500.c<br/>index 248a12aacef6..deb95bb49fd1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/misc/rio500.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/misc/rio500.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/misc/rio500.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/misc/rio500.c</a></div><div class='hunk'>@@ -89,7 +89,7 @@ static int open_rio(struct inode *inode, struct file *file)</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;(rio-&gt;lock));</div><div class='ctx'> </div><div class='del'>-	info("Rio opened.");</div><div class='add'>+	dev_info(&amp;rio-&gt;rio_dev-&gt;dev, "Rio opened.\n");</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -100,7 +100,7 @@ static int close_rio(struct inode *inode, struct file *file)</div><div class='ctx'> </div><div class='ctx'> 	rio-&gt;isopen = 0;</div><div class='ctx'> </div><div class='del'>-	info("Rio closed.");</div><div class='add'>+	dev_info(&amp;rio-&gt;rio_dev-&gt;dev, "Rio closed.\n");</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -451,7 +451,7 @@ static int probe_rio(struct usb_interface *intf,</div><div class='ctx'> 	struct rio_usb_data *rio = &amp;rio_instance;</div><div class='ctx'> 	int retval;</div><div class='ctx'> </div><div class='del'>-	info("USB Rio found at address %d", dev-&gt;devnum);</div><div class='add'>+	dev_info(&amp;intf-&gt;dev, "USB Rio found at address %d\n", dev-&gt;devnum);</div><div class='ctx'> </div><div class='ctx'> 	retval = usb_register_dev(intf, &amp;usb_rio_class);</div><div class='ctx'> 	if (retval) {</div><div class='hunk'>@@ -503,7 +503,7 @@ static void disconnect_rio(struct usb_interface *intf)</div><div class='ctx'> 		kfree(rio-&gt;ibuf);</div><div class='ctx'> 		kfree(rio-&gt;obuf);</div><div class='ctx'> </div><div class='del'>-		info("USB Rio disconnected.");</div><div class='add'>+		dev_info(&amp;intf-&gt;dev, "USB Rio disconnected.\n");</div><div class='ctx'> </div><div class='ctx'> 		rio-&gt;present = 0;</div><div class='ctx'> 		mutex_unlock(&amp;(rio-&gt;lock));</div><div class='hunk'>@@ -531,7 +531,8 @@ static int __init usb_rio_init(void)</div><div class='ctx'> 	if (retval)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	info(DRIVER_VERSION ":" DRIVER_DESC);</div><div class='add'>+	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"</div><div class='add'>+	       DRIVER_DESC "\n");</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	return retval;</div><div class='head'>diff --git a/drivers/usb/misc/trancevibrator.c b/drivers/usb/misc/trancevibrator.c<br/>index 03368edf3f22..2e14102955c5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/misc/trancevibrator.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/misc/trancevibrator.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/misc/trancevibrator.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/misc/trancevibrator.c</a></div><div class='hunk'>@@ -144,7 +144,8 @@ static int __init tv_init(void)</div><div class='ctx'> 		return retval;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	info(DRIVER_VERSION ":" DRIVER_DESC);</div><div class='add'>+	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"</div><div class='add'>+	       DRIVER_DESC "\n");</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/usb/misc/usblcd.c b/drivers/usb/misc/usblcd.c<br/>index 2db4228fbb01..e0ff9ccd866b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/misc/usblcd.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/misc/usblcd.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/misc/usblcd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/misc/usblcd.c</a></div><div class='hunk'>@@ -311,7 +311,7 @@ static int lcd_probe(struct usb_interface *interface, const struct usb_device_id</div><div class='ctx'> 	dev-&gt;interface = interface;</div><div class='ctx'> </div><div class='ctx'> 	if (le16_to_cpu(dev-&gt;udev-&gt;descriptor.idProduct) != 0x0001) {</div><div class='del'>-		warn(KERN_INFO "USBLCD model not supported.");</div><div class='add'>+		dev_warn(&amp;interface-&gt;dev, "USBLCD model not supported.\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> 	</div><div class='hunk'>@@ -359,12 +359,13 @@ static int lcd_probe(struct usb_interface *interface, const struct usb_device_id</div><div class='ctx'> </div><div class='ctx'> 	i = le16_to_cpu(dev-&gt;udev-&gt;descriptor.bcdDevice);</div><div class='ctx'> </div><div class='del'>-	info("USBLCD Version %1d%1d.%1d%1d found at address %d",</div><div class='del'>-		(i &amp; 0xF000)&gt;&gt;12,(i &amp; 0xF00)&gt;&gt;8,(i &amp; 0xF0)&gt;&gt;4,(i &amp; 0xF),</div><div class='del'>-		dev-&gt;udev-&gt;devnum);</div><div class='add'>+	dev_info(&amp;interface-&gt;dev, "USBLCD Version %1d%1d.%1d%1d found "</div><div class='add'>+		 "at address %d\n", (i &amp; 0xF000)&gt;&gt;12, (i &amp; 0xF00)&gt;&gt;8,</div><div class='add'>+		 (i &amp; 0xF0)&gt;&gt;4,(i &amp; 0xF), dev-&gt;udev-&gt;devnum);</div><div class='ctx'> </div><div class='ctx'> 	/* let the user know what node this device is now attached to */</div><div class='del'>-	info("USB LCD device now attached to USBLCD-%d", interface-&gt;minor);</div><div class='add'>+	dev_info(&amp;interface-&gt;dev, "USB LCD device now attached to USBLCD-%d\n",</div><div class='add'>+		 interface-&gt;minor);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> error:</div><div class='hunk'>@@ -413,7 +414,7 @@ static void lcd_disconnect(struct usb_interface *interface)</div><div class='ctx'> 	/* decrement our usage count */</div><div class='ctx'> 	kref_put(&amp;dev-&gt;kref, lcd_delete);</div><div class='ctx'> </div><div class='del'>-	info("USB LCD #%d now disconnected", minor);</div><div class='add'>+	dev_info(&amp;interface-&gt;dev, "USB LCD #%d now disconnected\n", minor);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct usb_driver lcd_driver = {</div><div class='head'>diff --git a/drivers/usb/misc/usbsevseg.c b/drivers/usb/misc/usbsevseg.c<br/>new file mode 100644<br/>index 000000000000..28a6a3a09538<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/misc/usbsevseg.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/misc/usbsevseg.c</a></div><div class='hunk'>@@ -0,0 +1,394 @@</div><div class='add'>+/*</div><div class='add'>+ * USB 7 Segment Driver</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2008 Harrison Metzger &lt;harrisonmetz@gmail.com&gt;</div><div class='add'>+ * Based on usbled.c by Greg Kroah-Hartman (greg@kroah.com)</div><div class='add'>+ *</div><div class='add'>+ *	This program is free software; you can redistribute it and/or</div><div class='add'>+ *	modify it under the terms of the GNU General Public License as</div><div class='add'>+ *	published by the Free Software Foundation, version 2.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/usb.h&gt;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define DRIVER_AUTHOR "Harrison Metzger &lt;harrisonmetz@gmail.com&gt;"</div><div class='add'>+#define DRIVER_DESC "USB 7 Segment Driver"</div><div class='add'>+</div><div class='add'>+#define VENDOR_ID	0x0fc5</div><div class='add'>+#define PRODUCT_ID	0x1227</div><div class='add'>+#define MAXLEN		6</div><div class='add'>+</div><div class='add'>+/* table of devices that work with this driver */</div><div class='add'>+static struct usb_device_id id_table[] = {</div><div class='add'>+	{ USB_DEVICE(VENDOR_ID, PRODUCT_ID) },</div><div class='add'>+	{ },</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(usb, id_table);</div><div class='add'>+</div><div class='add'>+/* the different text display modes the device is capable of */</div><div class='add'>+static char *display_textmodes[] = {"raw", "hex", "ascii", NULL};</div><div class='add'>+</div><div class='add'>+struct usb_sevsegdev {</div><div class='add'>+	struct usb_device *udev;</div><div class='add'>+</div><div class='add'>+	u8 powered;</div><div class='add'>+	u8 mode_msb;</div><div class='add'>+	u8 mode_lsb;</div><div class='add'>+	u8 decimals[MAXLEN];</div><div class='add'>+	u8 textmode;</div><div class='add'>+	u8 text[MAXLEN];</div><div class='add'>+	u16 textlength;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* sysfs_streq can't replace this completely</div><div class='add'>+ * If the device was in hex mode, and the user wanted a 0,</div><div class='add'>+ * if str commands are used, we would assume the end of string</div><div class='add'>+ * so mem commands are used.</div><div class='add'>+ */</div><div class='add'>+inline size_t my_memlen(const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	if (count &gt; 0 &amp;&amp; buf[count-1] == '\n')</div><div class='add'>+		return count - 1;</div><div class='add'>+	else</div><div class='add'>+		return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void update_display_powered(struct usb_sevsegdev *mydev)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = usb_control_msg(mydev-&gt;udev,</div><div class='add'>+			usb_sndctrlpipe(mydev-&gt;udev, 0),</div><div class='add'>+			0x12,</div><div class='add'>+			0x48,</div><div class='add'>+			(80 * 0x100) + 10, /*  (power mode) */</div><div class='add'>+			(0x00 * 0x100) + (mydev-&gt;powered ? 1 : 0),</div><div class='add'>+			NULL,</div><div class='add'>+			0,</div><div class='add'>+			2000);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		dev_dbg(&amp;mydev-&gt;udev-&gt;dev, "power retval = %d\n", rc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void update_display_mode(struct usb_sevsegdev *mydev)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = usb_control_msg(mydev-&gt;udev,</div><div class='add'>+			usb_sndctrlpipe(mydev-&gt;udev, 0),</div><div class='add'>+			0x12,</div><div class='add'>+			0x48,</div><div class='add'>+			(82 * 0x100) + 10, /* (set mode) */</div><div class='add'>+			(mydev-&gt;mode_msb * 0x100) + mydev-&gt;mode_lsb,</div><div class='add'>+			NULL,</div><div class='add'>+			0,</div><div class='add'>+			2000);</div><div class='add'>+</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		dev_dbg(&amp;mydev-&gt;udev-&gt;dev, "mode retval = %d\n", rc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void update_display_visual(struct usb_sevsegdev *mydev)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+	int i;</div><div class='add'>+	unsigned char *buffer;</div><div class='add'>+	u8 decimals = 0;</div><div class='add'>+</div><div class='add'>+	buffer = kzalloc(MAXLEN, GFP_KERNEL);</div><div class='add'>+	if (!buffer) {</div><div class='add'>+		dev_err(&amp;mydev-&gt;udev-&gt;dev, "out of memory\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* The device is right to left, where as you write left to right */</div><div class='add'>+	for (i = 0; i &lt; mydev-&gt;textlength; i++)</div><div class='add'>+		buffer[i] = mydev-&gt;text[mydev-&gt;textlength-1-i];</div><div class='add'>+</div><div class='add'>+	rc = usb_control_msg(mydev-&gt;udev,</div><div class='add'>+			usb_sndctrlpipe(mydev-&gt;udev, 0),</div><div class='add'>+			0x12,</div><div class='add'>+			0x48,</div><div class='add'>+			(85 * 0x100) + 10, /* (write text) */</div><div class='add'>+			(0 * 0x100) + mydev-&gt;textmode, /* mode  */</div><div class='add'>+			buffer,</div><div class='add'>+			mydev-&gt;textlength,</div><div class='add'>+			2000);</div><div class='add'>+</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		dev_dbg(&amp;mydev-&gt;udev-&gt;dev, "write retval = %d\n", rc);</div><div class='add'>+</div><div class='add'>+	kfree(buffer);</div><div class='add'>+</div><div class='add'>+	/* The device is right to left, where as you write left to right */</div><div class='add'>+	for (i = 0; i &lt; sizeof(mydev-&gt;decimals); i++)</div><div class='add'>+		decimals |= mydev-&gt;decimals[i] &lt;&lt; i;</div><div class='add'>+</div><div class='add'>+	rc = usb_control_msg(mydev-&gt;udev,</div><div class='add'>+			usb_sndctrlpipe(mydev-&gt;udev, 0),</div><div class='add'>+			0x12,</div><div class='add'>+			0x48,</div><div class='add'>+			(86 * 0x100) + 10, /* (set decimal) */</div><div class='add'>+			(0 * 0x100) + decimals, /* decimals */</div><div class='add'>+			NULL,</div><div class='add'>+			0,</div><div class='add'>+			2000);</div><div class='add'>+</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		dev_dbg(&amp;mydev-&gt;udev-&gt;dev, "decimal retval = %d\n", rc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define MYDEV_ATTR_SIMPLE_UNSIGNED(name, update_fcn)		\</div><div class='add'>+static ssize_t show_attr_##name(struct device *dev, 		\</div><div class='add'>+	struct device_attribute *attr, char *buf) 		\</div><div class='add'>+{								\</div><div class='add'>+	struct usb_interface *intf = to_usb_interface(dev);	\</div><div class='add'>+	struct usb_sevsegdev *mydev = usb_get_intfdata(intf);	\</div><div class='add'>+								\</div><div class='add'>+	return sprintf(buf, "%u\n", mydev-&gt;name);		\</div><div class='add'>+}								\</div><div class='add'>+								\</div><div class='add'>+static ssize_t set_attr_##name(struct device *dev, 		\</div><div class='add'>+	struct device_attribute *attr, const char *buf, size_t count) \</div><div class='add'>+{								\</div><div class='add'>+	struct usb_interface *intf = to_usb_interface(dev);	\</div><div class='add'>+	struct usb_sevsegdev *mydev = usb_get_intfdata(intf);	\</div><div class='add'>+								\</div><div class='add'>+	mydev-&gt;name = simple_strtoul(buf, NULL, 10);		\</div><div class='add'>+	update_fcn(mydev); \</div><div class='add'>+								\</div><div class='add'>+	return count;						\</div><div class='add'>+}								\</div><div class='add'>+static DEVICE_ATTR(name, S_IWUGO | S_IRUGO, show_attr_##name, set_attr_##name);</div><div class='add'>+</div><div class='add'>+static ssize_t show_attr_text(struct device *dev,</div><div class='add'>+	struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct usb_interface *intf = to_usb_interface(dev);</div><div class='add'>+	struct usb_sevsegdev *mydev = usb_get_intfdata(intf);</div><div class='add'>+</div><div class='add'>+	return snprintf(buf, mydev-&gt;textlength, "%s\n", mydev-&gt;text);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t set_attr_text(struct device *dev,</div><div class='add'>+	struct device_attribute *attr, const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct usb_interface *intf = to_usb_interface(dev);</div><div class='add'>+	struct usb_sevsegdev *mydev = usb_get_intfdata(intf);</div><div class='add'>+	size_t end = my_memlen(buf, count);</div><div class='add'>+</div><div class='add'>+	if (end &gt; sizeof(mydev-&gt;text))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	memset(mydev-&gt;text, 0, sizeof(mydev-&gt;text));</div><div class='add'>+	mydev-&gt;textlength = end;</div><div class='add'>+</div><div class='add'>+	if (end &gt; 0)</div><div class='add'>+		memcpy(mydev-&gt;text, buf, end);</div><div class='add'>+</div><div class='add'>+	update_display_visual(mydev);</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static DEVICE_ATTR(text, S_IWUGO | S_IRUGO, show_attr_text, set_attr_text);</div><div class='add'>+</div><div class='add'>+static ssize_t show_attr_decimals(struct device *dev,</div><div class='add'>+	struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct usb_interface *intf = to_usb_interface(dev);</div><div class='add'>+	struct usb_sevsegdev *mydev = usb_get_intfdata(intf);</div><div class='add'>+	int i;</div><div class='add'>+	int pos;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; sizeof(mydev-&gt;decimals); i++) {</div><div class='add'>+		pos = sizeof(mydev-&gt;decimals) - 1 - i;</div><div class='add'>+		if (mydev-&gt;decimals[i] == 0)</div><div class='add'>+			buf[pos] = '0';</div><div class='add'>+		else if (mydev-&gt;decimals[i] == 1)</div><div class='add'>+			buf[pos] = '1';</div><div class='add'>+		else</div><div class='add'>+			buf[pos] = 'x';</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	buf[sizeof(mydev-&gt;decimals)] = '\n';</div><div class='add'>+	return sizeof(mydev-&gt;decimals) + 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t set_attr_decimals(struct device *dev,</div><div class='add'>+	struct device_attribute *attr, const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct usb_interface *intf = to_usb_interface(dev);</div><div class='add'>+	struct usb_sevsegdev *mydev = usb_get_intfdata(intf);</div><div class='add'>+	size_t end = my_memlen(buf, count);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (end &gt; sizeof(mydev-&gt;decimals))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; end; i++)</div><div class='add'>+		if (buf[i] != '0' &amp;&amp; buf[i] != '1')</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+	memset(mydev-&gt;decimals, 0, sizeof(mydev-&gt;decimals));</div><div class='add'>+	for (i = 0; i &lt; end; i++)</div><div class='add'>+		if (buf[i] == '1')</div><div class='add'>+			mydev-&gt;decimals[end-1-i] = 1;</div><div class='add'>+</div><div class='add'>+	update_display_visual(mydev);</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static DEVICE_ATTR(decimals, S_IWUGO | S_IRUGO,</div><div class='add'>+	show_attr_decimals, set_attr_decimals);</div><div class='add'>+</div><div class='add'>+static ssize_t show_attr_textmode(struct device *dev,</div><div class='add'>+	struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct usb_interface *intf = to_usb_interface(dev);</div><div class='add'>+	struct usb_sevsegdev *mydev = usb_get_intfdata(intf);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	buf[0] = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; display_textmodes[i]; i++) {</div><div class='add'>+		if (mydev-&gt;textmode == i) {</div><div class='add'>+			strcat(buf, " [");</div><div class='add'>+			strcat(buf, display_textmodes[i]);</div><div class='add'>+			strcat(buf, "] ");</div><div class='add'>+		} else {</div><div class='add'>+			strcat(buf, " ");</div><div class='add'>+			strcat(buf, display_textmodes[i]);</div><div class='add'>+			strcat(buf, " ");</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	strcat(buf, "\n");</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	return strlen(buf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t set_attr_textmode(struct device *dev,</div><div class='add'>+	struct device_attribute *attr, const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct usb_interface *intf = to_usb_interface(dev);</div><div class='add'>+	struct usb_sevsegdev *mydev = usb_get_intfdata(intf);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; display_textmodes[i]; i++) {</div><div class='add'>+		if (sysfs_streq(display_textmodes[i], buf)) {</div><div class='add'>+			mydev-&gt;textmode = i;</div><div class='add'>+			update_display_visual(mydev);</div><div class='add'>+			return count;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static DEVICE_ATTR(textmode, S_IWUGO | S_IRUGO,</div><div class='add'>+	show_attr_textmode, set_attr_textmode);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+MYDEV_ATTR_SIMPLE_UNSIGNED(powered, update_display_powered);</div><div class='add'>+MYDEV_ATTR_SIMPLE_UNSIGNED(mode_msb, update_display_mode);</div><div class='add'>+MYDEV_ATTR_SIMPLE_UNSIGNED(mode_lsb, update_display_mode);</div><div class='add'>+</div><div class='add'>+static struct attribute *dev_attrs[] = {</div><div class='add'>+	&amp;dev_attr_powered.attr,</div><div class='add'>+	&amp;dev_attr_text.attr,</div><div class='add'>+	&amp;dev_attr_textmode.attr,</div><div class='add'>+	&amp;dev_attr_decimals.attr,</div><div class='add'>+	&amp;dev_attr_mode_msb.attr,</div><div class='add'>+	&amp;dev_attr_mode_lsb.attr,</div><div class='add'>+	NULL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct attribute_group dev_attr_grp = {</div><div class='add'>+	.attrs = dev_attrs,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int sevseg_probe(struct usb_interface *interface,</div><div class='add'>+	const struct usb_device_id *id)</div><div class='add'>+{</div><div class='add'>+	struct usb_device *udev = interface_to_usbdev(interface);</div><div class='add'>+	struct usb_sevsegdev *mydev = NULL;</div><div class='add'>+	int rc = -ENOMEM;</div><div class='add'>+</div><div class='add'>+	mydev = kzalloc(sizeof(struct usb_sevsegdev), GFP_KERNEL);</div><div class='add'>+	if (mydev == NULL) {</div><div class='add'>+		dev_err(&amp;interface-&gt;dev, "Out of memory\n");</div><div class='add'>+		goto error_mem;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mydev-&gt;udev = usb_get_dev(udev);</div><div class='add'>+	usb_set_intfdata(interface, mydev);</div><div class='add'>+</div><div class='add'>+	/*set defaults */</div><div class='add'>+	mydev-&gt;textmode = 0x02; /* ascii mode */</div><div class='add'>+	mydev-&gt;mode_msb = 0x06; /* 6 characters */</div><div class='add'>+	mydev-&gt;mode_lsb = 0x3f; /* scanmode for 6 chars */</div><div class='add'>+</div><div class='add'>+	rc = sysfs_create_group(&amp;interface-&gt;dev.kobj, &amp;dev_attr_grp);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	dev_info(&amp;interface-&gt;dev, "USB 7 Segment device now attached\n");</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	usb_set_intfdata(interface, NULL);</div><div class='add'>+	usb_put_dev(mydev-&gt;udev);</div><div class='add'>+	kfree(mydev);</div><div class='add'>+error_mem:</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sevseg_disconnect(struct usb_interface *interface)</div><div class='add'>+{</div><div class='add'>+	struct usb_sevsegdev *mydev;</div><div class='add'>+</div><div class='add'>+	mydev = usb_get_intfdata(interface);</div><div class='add'>+	sysfs_remove_group(&amp;interface-&gt;dev.kobj, &amp;dev_attr_grp);</div><div class='add'>+	usb_set_intfdata(interface, NULL);</div><div class='add'>+	usb_put_dev(mydev-&gt;udev);</div><div class='add'>+	kfree(mydev);</div><div class='add'>+	dev_info(&amp;interface-&gt;dev, "USB 7 Segment now disconnected\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct usb_driver sevseg_driver = {</div><div class='add'>+	.name =		"usbsevseg",</div><div class='add'>+	.probe =	sevseg_probe,</div><div class='add'>+	.disconnect =	sevseg_disconnect,</div><div class='add'>+	.id_table =	id_table,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init usb_sevseg_init(void)</div><div class='add'>+{</div><div class='add'>+	int rc = 0;</div><div class='add'>+</div><div class='add'>+	rc = usb_register(&amp;sevseg_driver);</div><div class='add'>+	if (rc)</div><div class='add'>+		err("usb_register failed. Error number %d", rc);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit usb_sevseg_exit(void)</div><div class='add'>+{</div><div class='add'>+	usb_deregister(&amp;sevseg_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(usb_sevseg_init);</div><div class='add'>+module_exit(usb_sevseg_exit);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR(DRIVER_AUTHOR);</div><div class='add'>+MODULE_DESCRIPTION(DRIVER_DESC);</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/usb/misc/uss720.c b/drivers/usb/misc/uss720.c<br/>index f1255b0a182d..9a6c27a01793 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/misc/uss720.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/misc/uss720.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/misc/uss720.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/misc/uss720.c</a></div><div class='hunk'>@@ -228,11 +228,12 @@ static int get_1284_register(struct parport *pp, unsigned char reg, unsigned cha</div><div class='ctx'> 		ret = rq-&gt;urb-&gt;status;</div><div class='ctx'> 		*val = priv-&gt;reg[(reg &gt;= 9) ? 0 : regindex[reg]];</div><div class='ctx'> 		if (ret)</div><div class='del'>-			warn("get_1284_register: usb error %d", ret);</div><div class='add'>+			printk(KERN_WARNING "get_1284_register: "</div><div class='add'>+			       "usb error %d\n", ret);</div><div class='ctx'> 		kref_put(&amp;rq-&gt;ref_count, destroy_async);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='del'>-	warn("get_1284_register timeout");</div><div class='add'>+	printk(KERN_WARNING "get_1284_register timeout\n");</div><div class='ctx'> 	kill_all_async_requests_priv(priv);</div><div class='ctx'> 	return -EIO;</div><div class='ctx'> }</div><div class='hunk'>@@ -716,7 +717,7 @@ static int uss720_probe(struct usb_interface *intf,</div><div class='ctx'> 	spin_lock_init(&amp;priv-&gt;asynclock);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;priv-&gt;asynclist);</div><div class='ctx'> 	if (!(pp = parport_register_port(0, PARPORT_IRQ_NONE, PARPORT_DMA_NONE, &amp;parport_uss720_ops))) {</div><div class='del'>-		warn("could not register parport");</div><div class='add'>+		printk(KERN_WARNING "uss720: could not register parport\n");</div><div class='ctx'> 		goto probe_abort;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -800,10 +801,14 @@ static int __init uss720_init(void)</div><div class='ctx'> 	if (retval)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	info(DRIVER_VERSION ":" DRIVER_DESC);</div><div class='del'>-	info("NOTE: this is a special purpose driver to allow nonstandard");</div><div class='del'>-	info("protocols (eg. bitbang) over USS720 usb to parallel cables");</div><div class='del'>-	info("If you just want to connect to a printer, use usblp instead");</div><div class='add'>+	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"</div><div class='add'>+	       DRIVER_DESC "\n");</div><div class='add'>+	printk(KERN_INFO KBUILD_MODNAME ": NOTE: this is a special purpose "</div><div class='add'>+	       "driver to allow nonstandard\n");</div><div class='add'>+	printk(KERN_INFO KBUILD_MODNAME ": protocols (eg. bitbang) over "</div><div class='add'>+	       "USS720 usb to parallel cables\n");</div><div class='add'>+	printk(KERN_INFO KBUILD_MODNAME ": If you just want to connect to a "</div><div class='add'>+	       "printer, use usblp instead\n");</div><div class='ctx'> out:</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/usb/misc/vstusb.c b/drivers/usb/misc/vstusb.c<br/>new file mode 100644<br/>index 000000000000..8648470c81ca<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/misc/vstusb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/misc/vstusb.c</a></div><div class='hunk'>@@ -0,0 +1,782 @@</div><div class='add'>+/*****************************************************************************</div><div class='add'>+ *  File: drivers/usb/misc/vstusb.c</div><div class='add'>+ *</div><div class='add'>+ *  Purpose: Support for the bulk USB Vernier Spectrophotometers</div><div class='add'>+ *</div><div class='add'>+ *  Author:     Johnnie Peters</div><div class='add'>+ *              Axian Consulting</div><div class='add'>+ *              Beaverton, OR, USA 97005</div><div class='add'>+ *</div><div class='add'>+ *  Modified by:     EQware Engineering, Inc.</div><div class='add'>+ *                   Oregon City, OR, USA 97045</div><div class='add'>+ *</div><div class='add'>+ *  Copyright:  2007, 2008</div><div class='add'>+ *              Vernier Software &amp; Technology</div><div class='add'>+ *              Beaverton, OR, USA 97005</div><div class='add'>+ *</div><div class='add'>+ *  Web:        www.vernier.com</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ *  published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ *****************************************************************************/</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/usb.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/usb/vstusb.h&gt;</div><div class='add'>+</div><div class='add'>+#define DRIVER_VERSION "VST USB Driver Version 1.5"</div><div class='add'>+#define DRIVER_DESC "Vernier Software Technology Bulk USB Driver"</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_USB_DYNAMIC_MINORS</div><div class='add'>+	#define VSTUSB_MINOR_BASE	0</div><div class='add'>+#else</div><div class='add'>+	#define VSTUSB_MINOR_BASE	199</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_OCEANOPTICS	0x2457</div><div class='add'>+#define USB_VENDOR_VERNIER	0x08F7	/* Vernier Software &amp; Technology */</div><div class='add'>+</div><div class='add'>+#define USB_PRODUCT_USB2000	0x1002</div><div class='add'>+#define USB_PRODUCT_ADC1000_FW	0x1003	/* firmware download (renumerates) */</div><div class='add'>+#define USB_PRODUCT_ADC1000	0x1004</div><div class='add'>+#define USB_PRODUCT_HR2000_FW	0x1009	/* firmware download (renumerates) */</div><div class='add'>+#define USB_PRODUCT_HR2000	0x100A</div><div class='add'>+#define USB_PRODUCT_HR4000_FW	0x1011	/* firmware download (renumerates) */</div><div class='add'>+#define USB_PRODUCT_HR4000	0x1012</div><div class='add'>+#define USB_PRODUCT_USB650	0x1014	/* "Red Tide" */</div><div class='add'>+#define USB_PRODUCT_QE65000	0x1018</div><div class='add'>+#define USB_PRODUCT_USB4000	0x1022</div><div class='add'>+#define USB_PRODUCT_USB325	0x1024	/* "Vernier Spectrometer" */</div><div class='add'>+</div><div class='add'>+#define USB_PRODUCT_LABPRO	0x0001</div><div class='add'>+#define USB_PRODUCT_LABQUEST	0x0005</div><div class='add'>+</div><div class='add'>+#define VST_MAXBUFFER		(64*1024)</div><div class='add'>+</div><div class='add'>+static struct usb_device_id id_table[] = {</div><div class='add'>+	{ USB_DEVICE(USB_VENDOR_OCEANOPTICS, USB_PRODUCT_USB2000)},</div><div class='add'>+	{ USB_DEVICE(USB_VENDOR_OCEANOPTICS, USB_PRODUCT_HR4000)},</div><div class='add'>+	{ USB_DEVICE(USB_VENDOR_OCEANOPTICS, USB_PRODUCT_USB650)},</div><div class='add'>+	{ USB_DEVICE(USB_VENDOR_OCEANOPTICS, USB_PRODUCT_USB4000)},</div><div class='add'>+	{ USB_DEVICE(USB_VENDOR_OCEANOPTICS, USB_PRODUCT_USB325)},</div><div class='add'>+	{ USB_DEVICE(USB_VENDOR_VERNIER, USB_PRODUCT_LABQUEST)},</div><div class='add'>+	{ USB_DEVICE(USB_VENDOR_VERNIER, USB_PRODUCT_LABPRO)},</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_DEVICE_TABLE(usb, id_table);</div><div class='add'>+</div><div class='add'>+struct vstusb_device {</div><div class='add'>+	struct kref				kref;</div><div class='add'>+	struct mutex            lock;</div><div class='add'>+	struct usb_device       *usb_dev;</div><div class='add'>+	char                    present;</div><div class='add'>+	char                    isopen;</div><div class='add'>+	struct usb_anchor       submitted;</div><div class='add'>+	int                     rd_pipe;</div><div class='add'>+	int                     rd_timeout_ms;</div><div class='add'>+	int                     wr_pipe;</div><div class='add'>+	int                     wr_timeout_ms;</div><div class='add'>+};</div><div class='add'>+#define to_vst_dev(d) container_of(d, struct vstusb_device, kref)</div><div class='add'>+</div><div class='add'>+static struct usb_driver vstusb_driver;</div><div class='add'>+</div><div class='add'>+static void vstusb_delete(struct kref *kref)</div><div class='add'>+{</div><div class='add'>+	struct vstusb_device *vstdev = to_vst_dev(kref);</div><div class='add'>+</div><div class='add'>+	usb_put_dev(vstdev-&gt;usb_dev);</div><div class='add'>+	kfree(vstdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vstusb_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct vstusb_device *vstdev;</div><div class='add'>+	struct usb_interface *interface;</div><div class='add'>+</div><div class='add'>+	interface = usb_find_interface(&amp;vstusb_driver, iminor(inode));</div><div class='add'>+</div><div class='add'>+	if (!interface) {</div><div class='add'>+		printk(KERN_ERR KBUILD_MODNAME</div><div class='add'>+		       ": %s - error, can't find device for minor %d\n",</div><div class='add'>+		       __func__, iminor(inode));</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	vstdev = usb_get_intfdata(interface);</div><div class='add'>+</div><div class='add'>+	if (!vstdev)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	/* lock this device */</div><div class='add'>+	mutex_lock(&amp;vstdev-&gt;lock);</div><div class='add'>+</div><div class='add'>+	/* can only open one time */</div><div class='add'>+	if ((!vstdev-&gt;present) || (vstdev-&gt;isopen)) {</div><div class='add'>+		mutex_unlock(&amp;vstdev-&gt;lock);</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* increment our usage count */</div><div class='add'>+	kref_get(&amp;vstdev-&gt;kref);</div><div class='add'>+</div><div class='add'>+	vstdev-&gt;isopen = 1;</div><div class='add'>+</div><div class='add'>+	/* save device in the file's private structure */</div><div class='add'>+	file-&gt;private_data = vstdev;</div><div class='add'>+</div><div class='add'>+	dev_dbg(&amp;vstdev-&gt;usb_dev-&gt;dev, "%s: opened\n", __func__);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;vstdev-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vstusb_release(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct vstusb_device *vstdev;</div><div class='add'>+</div><div class='add'>+	vstdev = file-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	if (vstdev == NULL)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;vstdev-&gt;lock);</div><div class='add'>+</div><div class='add'>+	vstdev-&gt;isopen = 0;</div><div class='add'>+</div><div class='add'>+	dev_dbg(&amp;vstdev-&gt;usb_dev-&gt;dev, "%s: released\n", __func__);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;vstdev-&gt;lock);</div><div class='add'>+</div><div class='add'>+	kref_put(&amp;vstdev-&gt;kref, vstusb_delete);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void usb_api_blocking_completion(struct urb *urb)</div><div class='add'>+{</div><div class='add'>+	struct completion *completeit = urb-&gt;context;</div><div class='add'>+</div><div class='add'>+	complete(completeit);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vstusb_fill_and_send_urb(struct urb *urb,</div><div class='add'>+				    struct usb_device *usb_dev,</div><div class='add'>+				    unsigned int pipe, void *data,</div><div class='add'>+				    unsigned int len, struct completion *done)</div><div class='add'>+{</div><div class='add'>+	struct usb_host_endpoint *ep;</div><div class='add'>+	struct usb_host_endpoint **hostep;</div><div class='add'>+	unsigned int pipend;</div><div class='add'>+</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	hostep = usb_pipein(pipe) ? usb_dev-&gt;ep_in : usb_dev-&gt;ep_out;</div><div class='add'>+	pipend = usb_pipeendpoint(pipe);</div><div class='add'>+	ep = hostep[pipend];</div><div class='add'>+</div><div class='add'>+	if (!ep || (len == 0))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if ((ep-&gt;desc.bmAttributes &amp; USB_ENDPOINT_XFERTYPE_MASK)</div><div class='add'>+	    == USB_ENDPOINT_XFER_INT) {</div><div class='add'>+		pipe = (pipe &amp; ~(3 &lt;&lt; 30)) | (PIPE_INTERRUPT &lt;&lt; 30);</div><div class='add'>+		usb_fill_int_urb(urb, usb_dev, pipe, data, len,</div><div class='add'>+				 (usb_complete_t)usb_api_blocking_completion,</div><div class='add'>+				 NULL, ep-&gt;desc.bInterval);</div><div class='add'>+	} else</div><div class='add'>+		usb_fill_bulk_urb(urb, usb_dev, pipe, data, len,</div><div class='add'>+				  (usb_complete_t)usb_api_blocking_completion,</div><div class='add'>+				  NULL);</div><div class='add'>+</div><div class='add'>+	init_completion(done);</div><div class='add'>+	urb-&gt;context = done;</div><div class='add'>+	urb-&gt;actual_length = 0;</div><div class='add'>+	status = usb_submit_urb(urb, GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vstusb_complete_urb(struct urb *urb, struct completion *done,</div><div class='add'>+			       int timeout, int *actual_length)</div><div class='add'>+{</div><div class='add'>+	unsigned long expire;</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	expire = timeout ? msecs_to_jiffies(timeout) : MAX_SCHEDULE_TIMEOUT;</div><div class='add'>+	if (!wait_for_completion_interruptible_timeout(done, expire)) {</div><div class='add'>+		usb_kill_urb(urb);</div><div class='add'>+		status = urb-&gt;status == -ENOENT ? -ETIMEDOUT : urb-&gt;status;</div><div class='add'>+</div><div class='add'>+		dev_dbg(&amp;urb-&gt;dev-&gt;dev,</div><div class='add'>+			"%s timed out on ep%d%s len=%d/%d, urb status = %d\n",</div><div class='add'>+			current-&gt;comm,</div><div class='add'>+			usb_pipeendpoint(urb-&gt;pipe),</div><div class='add'>+			usb_pipein(urb-&gt;pipe) ? "in" : "out",</div><div class='add'>+			urb-&gt;actual_length,</div><div class='add'>+			urb-&gt;transfer_buffer_length,</div><div class='add'>+			urb-&gt;status);</div><div class='add'>+</div><div class='add'>+	} else {</div><div class='add'>+		if (signal_pending(current)) {</div><div class='add'>+			/* if really an error */</div><div class='add'>+			if (urb-&gt;status &amp;&amp; !((urb-&gt;status == -ENOENT)     ||</div><div class='add'>+					     (urb-&gt;status == -ECONNRESET) ||</div><div class='add'>+					     (urb-&gt;status == -ESHUTDOWN))) {</div><div class='add'>+				status = -EINTR;</div><div class='add'>+				usb_kill_urb(urb);</div><div class='add'>+			} else {</div><div class='add'>+				status = 0;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			dev_dbg(&amp;urb-&gt;dev-&gt;dev,</div><div class='add'>+				"%s: signal pending on ep%d%s len=%d/%d,"</div><div class='add'>+				"urb status = %d\n",</div><div class='add'>+				current-&gt;comm,</div><div class='add'>+				usb_pipeendpoint(urb-&gt;pipe),</div><div class='add'>+				usb_pipein(urb-&gt;pipe) ? "in" : "out",</div><div class='add'>+				urb-&gt;actual_length,</div><div class='add'>+				urb-&gt;transfer_buffer_length,</div><div class='add'>+				urb-&gt;status);</div><div class='add'>+</div><div class='add'>+		} else {</div><div class='add'>+			status = urb-&gt;status;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (actual_length)</div><div class='add'>+		*actual_length = urb-&gt;actual_length;</div><div class='add'>+</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t vstusb_read(struct file *file, char __user *buffer,</div><div class='add'>+			   size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct vstusb_device *vstdev;</div><div class='add'>+	int cnt = -1;</div><div class='add'>+	void *buf;</div><div class='add'>+	int retval = 0;</div><div class='add'>+</div><div class='add'>+	struct urb              *urb;</div><div class='add'>+	struct usb_device       *dev;</div><div class='add'>+	unsigned int            pipe;</div><div class='add'>+	int                     timeout;</div><div class='add'>+</div><div class='add'>+	DECLARE_COMPLETION_ONSTACK(done);</div><div class='add'>+</div><div class='add'>+	vstdev = file-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	if (vstdev == NULL)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	/* verify that we actually want to read some data */</div><div class='add'>+	if ((count == 0) || (count &gt; VST_MAXBUFFER))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* lock this object */</div><div class='add'>+	if (mutex_lock_interruptible(&amp;vstdev-&gt;lock))</div><div class='add'>+		return -ERESTARTSYS;</div><div class='add'>+</div><div class='add'>+	/* anyone home */</div><div class='add'>+	if (!vstdev-&gt;present) {</div><div class='add'>+		mutex_unlock(&amp;vstdev-&gt;lock);</div><div class='add'>+		printk(KERN_ERR KBUILD_MODNAME</div><div class='add'>+		       ": %s: device not present\n", __func__);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* pull out the necessary data */</div><div class='add'>+	dev =     vstdev-&gt;usb_dev;</div><div class='add'>+	pipe =    usb_rcvbulkpipe(dev, vstdev-&gt;rd_pipe);</div><div class='add'>+	timeout = vstdev-&gt;rd_timeout_ms;</div><div class='add'>+</div><div class='add'>+	buf = kmalloc(count, GFP_KERNEL);</div><div class='add'>+	if (buf == NULL) {</div><div class='add'>+		mutex_unlock(&amp;vstdev-&gt;lock);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	urb = usb_alloc_urb(0, GFP_KERNEL);</div><div class='add'>+	if (!urb) {</div><div class='add'>+		kfree(buf);</div><div class='add'>+		mutex_unlock(&amp;vstdev-&gt;lock);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	usb_anchor_urb(urb, &amp;vstdev-&gt;submitted);</div><div class='add'>+	retval = vstusb_fill_and_send_urb(urb, dev, pipe, buf, count, &amp;done);</div><div class='add'>+	mutex_unlock(&amp;vstdev-&gt;lock);</div><div class='add'>+	if (retval) {</div><div class='add'>+		usb_unanchor_urb(urb);</div><div class='add'>+		dev_err(&amp;dev-&gt;dev, "%s: error %d filling and sending urb %d\n",</div><div class='add'>+			__func__, retval, pipe);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	retval = vstusb_complete_urb(urb, &amp;done, timeout, &amp;cnt);</div><div class='add'>+	if (retval) {</div><div class='add'>+		dev_err(&amp;dev-&gt;dev, "%s: error %d completing urb %d\n",</div><div class='add'>+			__func__, retval, pipe);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (copy_to_user(buffer, buf, cnt)) {</div><div class='add'>+		dev_err(&amp;dev-&gt;dev, "%s: can't copy_to_user\n", __func__);</div><div class='add'>+		retval = -EFAULT;</div><div class='add'>+	} else {</div><div class='add'>+		retval = cnt;</div><div class='add'>+		dev_dbg(&amp;dev-&gt;dev, "%s: read %d bytes from pipe %d\n",</div><div class='add'>+			__func__, cnt, pipe);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	usb_free_urb(urb);</div><div class='add'>+	kfree(buf);</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t vstusb_write(struct file *file, const char __user *buffer,</div><div class='add'>+			    size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct vstusb_device *vstdev;</div><div class='add'>+	int cnt = -1;</div><div class='add'>+	void *buf;</div><div class='add'>+	int retval = 0;</div><div class='add'>+</div><div class='add'>+	struct urb              *urb;</div><div class='add'>+	struct usb_device       *dev;</div><div class='add'>+	unsigned int            pipe;</div><div class='add'>+	int                     timeout;</div><div class='add'>+</div><div class='add'>+	DECLARE_COMPLETION_ONSTACK(done);</div><div class='add'>+</div><div class='add'>+	vstdev = file-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	if (vstdev == NULL)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	/* verify that we actually have some data to write */</div><div class='add'>+	if ((count == 0) || (count &gt; VST_MAXBUFFER))</div><div class='add'>+		return retval;</div><div class='add'>+</div><div class='add'>+	/* lock this object */</div><div class='add'>+	if (mutex_lock_interruptible(&amp;vstdev-&gt;lock))</div><div class='add'>+		return -ERESTARTSYS;</div><div class='add'>+</div><div class='add'>+	/* anyone home */</div><div class='add'>+	if (!vstdev-&gt;present) {</div><div class='add'>+		mutex_unlock(&amp;vstdev-&gt;lock);</div><div class='add'>+		printk(KERN_ERR KBUILD_MODNAME</div><div class='add'>+		       ": %s: device not present\n", __func__);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* pull out the necessary data */</div><div class='add'>+	dev =     vstdev-&gt;usb_dev;</div><div class='add'>+	pipe =    usb_sndbulkpipe(dev, vstdev-&gt;wr_pipe);</div><div class='add'>+	timeout = vstdev-&gt;wr_timeout_ms;</div><div class='add'>+</div><div class='add'>+	buf = kmalloc(count, GFP_KERNEL);</div><div class='add'>+	if (buf == NULL) {</div><div class='add'>+		mutex_unlock(&amp;vstdev-&gt;lock);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	urb = usb_alloc_urb(0, GFP_KERNEL);</div><div class='add'>+	if (!urb) {</div><div class='add'>+		kfree(buf);</div><div class='add'>+		mutex_unlock(&amp;vstdev-&gt;lock);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (copy_from_user(buf, buffer, count)) {</div><div class='add'>+		dev_err(&amp;dev-&gt;dev, "%s: can't copy_from_user\n", __func__);</div><div class='add'>+		retval = -EFAULT;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	usb_anchor_urb(urb, &amp;vstdev-&gt;submitted);</div><div class='add'>+	retval = vstusb_fill_and_send_urb(urb, dev, pipe, buf, count, &amp;done);</div><div class='add'>+	mutex_unlock(&amp;vstdev-&gt;lock);</div><div class='add'>+	if (retval) {</div><div class='add'>+		usb_unanchor_urb(urb);</div><div class='add'>+		dev_err(&amp;dev-&gt;dev, "%s: error %d filling and sending urb %d\n",</div><div class='add'>+			__func__, retval, pipe);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	retval = vstusb_complete_urb(urb, &amp;done, timeout, &amp;cnt);</div><div class='add'>+	if (retval) {</div><div class='add'>+		dev_err(&amp;dev-&gt;dev, "%s: error %d completing urb %d\n",</div><div class='add'>+			__func__, retval, pipe);</div><div class='add'>+		goto exit;</div><div class='add'>+	} else {</div><div class='add'>+		retval = cnt;</div><div class='add'>+		dev_dbg(&amp;dev-&gt;dev, "%s: sent %d bytes to pipe %d\n",</div><div class='add'>+			__func__, cnt, pipe);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	usb_free_urb(urb);</div><div class='add'>+	kfree(buf);</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long vstusb_ioctl(struct file *file, unsigned int cmd, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	int retval = 0;</div><div class='add'>+	int cnt = -1;</div><div class='add'>+	void __user *data = (void __user *)arg;</div><div class='add'>+	struct vstusb_args usb_data;</div><div class='add'>+</div><div class='add'>+	struct vstusb_device *vstdev;</div><div class='add'>+	void *buffer = NULL; /* must be initialized. buffer is</div><div class='add'>+			      *	referenced on exit but not all</div><div class='add'>+			      * ioctls allocate it */</div><div class='add'>+</div><div class='add'>+	struct urb              *urb = NULL; /* must be initialized. urb is</div><div class='add'>+					      *	referenced on exit but not all</div><div class='add'>+					      * ioctls allocate it */</div><div class='add'>+	struct usb_device       *dev;</div><div class='add'>+	unsigned int            pipe;</div><div class='add'>+	int                     timeout;</div><div class='add'>+</div><div class='add'>+	DECLARE_COMPLETION_ONSTACK(done);</div><div class='add'>+</div><div class='add'>+	vstdev = file-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	if (_IOC_TYPE(cmd) != VST_IOC_MAGIC) {</div><div class='add'>+		dev_warn(&amp;vstdev-&gt;usb_dev-&gt;dev,</div><div class='add'>+			 "%s: ioctl command %x, bad ioctl magic %x, "</div><div class='add'>+			 "expected %x\n", __func__, cmd,</div><div class='add'>+			 _IOC_TYPE(cmd), VST_IOC_MAGIC);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (vstdev == NULL)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	if (copy_from_user(&amp;usb_data, data, sizeof(struct vstusb_args))) {</div><div class='add'>+		dev_err(&amp;vstdev-&gt;usb_dev-&gt;dev, "%s: can't copy_from_user\n",</div><div class='add'>+			__func__);</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* lock this object */</div><div class='add'>+	if (mutex_lock_interruptible(&amp;vstdev-&gt;lock)) {</div><div class='add'>+		retval = -ERESTARTSYS;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* anyone home */</div><div class='add'>+	if (!vstdev-&gt;present) {</div><div class='add'>+		mutex_unlock(&amp;vstdev-&gt;lock);</div><div class='add'>+		dev_err(&amp;vstdev-&gt;usb_dev-&gt;dev, "%s: device not present\n",</div><div class='add'>+			__func__);</div><div class='add'>+		retval = -ENODEV;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* pull out the necessary data */</div><div class='add'>+	dev = vstdev-&gt;usb_dev;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+</div><div class='add'>+	case IOCTL_VSTUSB_CONFIG_RW:</div><div class='add'>+</div><div class='add'>+		vstdev-&gt;rd_pipe = usb_data.rd_pipe;</div><div class='add'>+		vstdev-&gt;rd_timeout_ms = usb_data.rd_timeout_ms;</div><div class='add'>+		vstdev-&gt;wr_pipe = usb_data.wr_pipe;</div><div class='add'>+		vstdev-&gt;wr_timeout_ms = usb_data.wr_timeout_ms;</div><div class='add'>+</div><div class='add'>+		mutex_unlock(&amp;vstdev-&gt;lock);</div><div class='add'>+</div><div class='add'>+		dev_dbg(&amp;dev-&gt;dev, "%s: setting pipes/timeouts, "</div><div class='add'>+			"rdpipe = %d, rdtimeout = %d, "</div><div class='add'>+			"wrpipe = %d, wrtimeout = %d\n", __func__,</div><div class='add'>+			vstdev-&gt;rd_pipe, vstdev-&gt;rd_timeout_ms,</div><div class='add'>+			vstdev-&gt;wr_pipe, vstdev-&gt;wr_timeout_ms);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case IOCTL_VSTUSB_SEND_PIPE:</div><div class='add'>+</div><div class='add'>+		if ((usb_data.count == 0) || (usb_data.count &gt; VST_MAXBUFFER)) {</div><div class='add'>+			mutex_unlock(&amp;vstdev-&gt;lock);</div><div class='add'>+			retval = -EINVAL;</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		buffer = kmalloc(usb_data.count, GFP_KERNEL);</div><div class='add'>+		if (buffer == NULL) {</div><div class='add'>+			mutex_unlock(&amp;vstdev-&gt;lock);</div><div class='add'>+			retval = -ENOMEM;</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		urb = usb_alloc_urb(0, GFP_KERNEL);</div><div class='add'>+		if (!urb) {</div><div class='add'>+			mutex_unlock(&amp;vstdev-&gt;lock);</div><div class='add'>+			retval = -ENOMEM;</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		timeout = usb_data.timeout_ms;</div><div class='add'>+</div><div class='add'>+		pipe = usb_sndbulkpipe(dev, usb_data.pipe);</div><div class='add'>+</div><div class='add'>+		if (copy_from_user(buffer, usb_data.buffer, usb_data.count)) {</div><div class='add'>+			dev_err(&amp;dev-&gt;dev, "%s: can't copy_from_user\n",</div><div class='add'>+				__func__);</div><div class='add'>+			mutex_unlock(&amp;vstdev-&gt;lock);</div><div class='add'>+			retval = -EFAULT;</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		usb_anchor_urb(urb, &amp;vstdev-&gt;submitted);</div><div class='add'>+		retval = vstusb_fill_and_send_urb(urb, dev, pipe, buffer,</div><div class='add'>+						  usb_data.count, &amp;done);</div><div class='add'>+		mutex_unlock(&amp;vstdev-&gt;lock);</div><div class='add'>+		if (retval) {</div><div class='add'>+			usb_unanchor_urb(urb);</div><div class='add'>+			dev_err(&amp;dev-&gt;dev,</div><div class='add'>+				"%s: error %d filling and sending urb %d\n",</div><div class='add'>+				__func__, retval, pipe);</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		retval = vstusb_complete_urb(urb, &amp;done, timeout, &amp;cnt);</div><div class='add'>+		if (retval) {</div><div class='add'>+			dev_err(&amp;dev-&gt;dev, "%s: error %d completing urb %d\n",</div><div class='add'>+				__func__, retval, pipe);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	case IOCTL_VSTUSB_RECV_PIPE:</div><div class='add'>+</div><div class='add'>+		if ((usb_data.count == 0) || (usb_data.count &gt; VST_MAXBUFFER)) {</div><div class='add'>+			mutex_unlock(&amp;vstdev-&gt;lock);</div><div class='add'>+			retval = -EINVAL;</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		buffer = kmalloc(usb_data.count, GFP_KERNEL);</div><div class='add'>+		if (buffer == NULL) {</div><div class='add'>+			mutex_unlock(&amp;vstdev-&gt;lock);</div><div class='add'>+			retval = -ENOMEM;</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		urb = usb_alloc_urb(0, GFP_KERNEL);</div><div class='add'>+		if (!urb) {</div><div class='add'>+			mutex_unlock(&amp;vstdev-&gt;lock);</div><div class='add'>+			retval = -ENOMEM;</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		timeout = usb_data.timeout_ms;</div><div class='add'>+</div><div class='add'>+		pipe = usb_rcvbulkpipe(dev, usb_data.pipe);</div><div class='add'>+</div><div class='add'>+		usb_anchor_urb(urb, &amp;vstdev-&gt;submitted);</div><div class='add'>+		retval = vstusb_fill_and_send_urb(urb, dev, pipe, buffer,</div><div class='add'>+						  usb_data.count, &amp;done);</div><div class='add'>+		mutex_unlock(&amp;vstdev-&gt;lock);</div><div class='add'>+		if (retval) {</div><div class='add'>+			usb_unanchor_urb(urb);</div><div class='add'>+			dev_err(&amp;dev-&gt;dev,</div><div class='add'>+				"%s: error %d filling and sending urb %d\n",</div><div class='add'>+				__func__, retval, pipe);</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		retval = vstusb_complete_urb(urb, &amp;done, timeout, &amp;cnt);</div><div class='add'>+		if (retval) {</div><div class='add'>+			dev_err(&amp;dev-&gt;dev, "%s: error %d completing urb %d\n",</div><div class='add'>+				__func__, retval, pipe);</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (copy_to_user(usb_data.buffer, buffer, cnt)) {</div><div class='add'>+			dev_err(&amp;dev-&gt;dev, "%s: can't copy_to_user\n",</div><div class='add'>+				__func__);</div><div class='add'>+			retval = -EFAULT;</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		usb_data.count = cnt;</div><div class='add'>+		if (copy_to_user(data, &amp;usb_data, sizeof(struct vstusb_args))) {</div><div class='add'>+			dev_err(&amp;dev-&gt;dev, "%s: can't copy_to_user\n",</div><div class='add'>+				__func__);</div><div class='add'>+			retval = -EFAULT;</div><div class='add'>+		} else {</div><div class='add'>+			dev_dbg(&amp;dev-&gt;dev, "%s: recv %d bytes from pipe %d\n",</div><div class='add'>+				__func__, usb_data.count, usb_data.pipe);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		mutex_unlock(&amp;vstdev-&gt;lock);</div><div class='add'>+		dev_warn(&amp;dev-&gt;dev, "ioctl_vstusb: invalid ioctl cmd %x\n",</div><div class='add'>+			 cmd);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+exit:</div><div class='add'>+	usb_free_urb(urb);</div><div class='add'>+	kfree(buffer);</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations vstusb_fops = {</div><div class='add'>+	.owner =                THIS_MODULE,</div><div class='add'>+	.read =                 vstusb_read,</div><div class='add'>+	.write =                vstusb_write,</div><div class='add'>+	.unlocked_ioctl =       vstusb_ioctl,</div><div class='add'>+	.compat_ioctl =         vstusb_ioctl,</div><div class='add'>+	.open =                 vstusb_open,</div><div class='add'>+	.release =              vstusb_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct usb_class_driver usb_vstusb_class = {</div><div class='add'>+	.name =         "usb/vstusb%d",</div><div class='add'>+	.fops =         &amp;vstusb_fops,</div><div class='add'>+	.minor_base =   VSTUSB_MINOR_BASE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int vstusb_probe(struct usb_interface *intf,</div><div class='add'>+			const struct usb_device_id *id)</div><div class='add'>+{</div><div class='add'>+	struct usb_device *dev = interface_to_usbdev(intf);</div><div class='add'>+	struct vstusb_device *vstdev;</div><div class='add'>+	int i;</div><div class='add'>+	int retval = 0;</div><div class='add'>+</div><div class='add'>+	/* allocate memory for our device state and intialize it */</div><div class='add'>+</div><div class='add'>+	vstdev = kzalloc(sizeof(*vstdev), GFP_KERNEL);</div><div class='add'>+	if (vstdev == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* must do usb_get_dev() prior to kref_init() since the kref_put()</div><div class='add'>+	 * release function will do a usb_put_dev() */</div><div class='add'>+	usb_get_dev(dev);</div><div class='add'>+	kref_init(&amp;vstdev-&gt;kref);</div><div class='add'>+	mutex_init(&amp;vstdev-&gt;lock);</div><div class='add'>+</div><div class='add'>+	i = dev-&gt;descriptor.bcdDevice;</div><div class='add'>+</div><div class='add'>+	dev_dbg(&amp;intf-&gt;dev, "Version %1d%1d.%1d%1d found at address %d\n",</div><div class='add'>+		(i &amp; 0xF000) &gt;&gt; 12, (i &amp; 0xF00) &gt;&gt; 8,</div><div class='add'>+		(i &amp; 0xF0) &gt;&gt; 4, (i &amp; 0xF), dev-&gt;devnum);</div><div class='add'>+</div><div class='add'>+	vstdev-&gt;present = 1;</div><div class='add'>+	vstdev-&gt;isopen = 0;</div><div class='add'>+	vstdev-&gt;usb_dev = dev;</div><div class='add'>+	init_usb_anchor(&amp;vstdev-&gt;submitted);</div><div class='add'>+</div><div class='add'>+	usb_set_intfdata(intf, vstdev);</div><div class='add'>+	retval = usb_register_dev(intf, &amp;usb_vstusb_class);</div><div class='add'>+	if (retval) {</div><div class='add'>+		dev_err(&amp;intf-&gt;dev,</div><div class='add'>+			"%s: Not able to get a minor for this device.\n",</div><div class='add'>+			__func__);</div><div class='add'>+		usb_set_intfdata(intf, NULL);</div><div class='add'>+		kref_put(&amp;vstdev-&gt;kref, vstusb_delete);</div><div class='add'>+		return retval;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* let the user know what node this device is now attached to */</div><div class='add'>+	dev_info(&amp;intf-&gt;dev,</div><div class='add'>+		 "VST USB Device #%d now attached to major %d minor %d\n",</div><div class='add'>+		 (intf-&gt;minor - VSTUSB_MINOR_BASE), USB_MAJOR, intf-&gt;minor);</div><div class='add'>+</div><div class='add'>+	dev_info(&amp;intf-&gt;dev, "%s, %s\n", DRIVER_DESC, DRIVER_VERSION);</div><div class='add'>+</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void vstusb_disconnect(struct usb_interface *intf)</div><div class='add'>+{</div><div class='add'>+	struct vstusb_device *vstdev = usb_get_intfdata(intf);</div><div class='add'>+</div><div class='add'>+	usb_deregister_dev(intf, &amp;usb_vstusb_class);</div><div class='add'>+	usb_set_intfdata(intf, NULL);</div><div class='add'>+</div><div class='add'>+	if (vstdev) {</div><div class='add'>+</div><div class='add'>+		mutex_lock(&amp;vstdev-&gt;lock);</div><div class='add'>+		vstdev-&gt;present = 0;</div><div class='add'>+</div><div class='add'>+		usb_kill_anchored_urbs(&amp;vstdev-&gt;submitted);</div><div class='add'>+</div><div class='add'>+		mutex_unlock(&amp;vstdev-&gt;lock);</div><div class='add'>+</div><div class='add'>+		kref_put(&amp;vstdev-&gt;kref, vstusb_delete);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vstusb_suspend(struct usb_interface *intf, pm_message_t message)</div><div class='add'>+{</div><div class='add'>+	struct vstusb_device *vstdev = usb_get_intfdata(intf);</div><div class='add'>+	int time;</div><div class='add'>+	if (!vstdev)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;vstdev-&gt;lock);</div><div class='add'>+	time = usb_wait_anchor_empty_timeout(&amp;vstdev-&gt;submitted, 1000);</div><div class='add'>+	if (!time)</div><div class='add'>+		usb_kill_anchored_urbs(&amp;vstdev-&gt;submitted);</div><div class='add'>+	mutex_unlock(&amp;vstdev-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vstusb_resume(struct usb_interface *intf)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct usb_driver vstusb_driver = {</div><div class='add'>+	.name =         "vstusb",</div><div class='add'>+	.probe =        vstusb_probe,</div><div class='add'>+	.disconnect =   vstusb_disconnect,</div><div class='add'>+	.suspend =      vstusb_suspend,</div><div class='add'>+	.resume =       vstusb_resume,</div><div class='add'>+	.id_table = id_table,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init vstusb_init(void)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = usb_register(&amp;vstusb_driver);</div><div class='add'>+	if (rc)</div><div class='add'>+		printk(KERN_ERR "%s: failed to register (%d)", __func__, rc);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit vstusb_exit(void)</div><div class='add'>+{</div><div class='add'>+	usb_deregister(&amp;vstusb_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(vstusb_init);</div><div class='add'>+module_exit(vstusb_exit);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Dennis O'Brien/Stephen Ware");</div><div class='add'>+MODULE_DESCRIPTION(DRIVER_VERSION);</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/usb/mon/mon_bin.c b/drivers/usb/mon/mon_bin.c<br/>index 6566fc0a3228..c9de3f027aab 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/mon/mon_bin.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/mon/mon_bin.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/mon/mon_bin.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/mon/mon_bin.c</a></div><div class='hunk'>@@ -1162,9 +1162,9 @@ int mon_bin_add(struct mon_bus *mbus, const struct usb_bus *ubus)</div><div class='ctx'> 	if (minor &gt;= MON_BIN_MAX_MINOR)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	dev = device_create_drvdata(mon_bin_class, ubus? ubus-&gt;controller: NULL,</div><div class='del'>-				    MKDEV(MAJOR(mon_bin_dev0), minor), NULL,</div><div class='del'>-				    "usbmon%d", minor);</div><div class='add'>+	dev = device_create(mon_bin_class, ubus ? ubus-&gt;controller : NULL,</div><div class='add'>+			    MKDEV(MAJOR(mon_bin_dev0), minor), NULL,</div><div class='add'>+			    "usbmon%d", minor);</div><div class='ctx'> 	if (IS_ERR(dev))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/usb/mon/mon_main.c b/drivers/usb/mon/mon_main.c<br/>index 442d8076b201..5e0ab4201c00 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/mon/mon_main.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/mon/mon_main.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/mon/mon_main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/mon/mon_main.c</a></div><div class='hunk'>@@ -361,12 +361,12 @@ static int __init mon_init(void)</div><div class='ctx'> 	}</div><div class='ctx'> 	// MOD_INC_USE_COUNT(which_module?);</div><div class='ctx'> </div><div class='del'>-	usb_register_notify(&amp;mon_nb);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;usb_bus_list_lock);</div><div class='ctx'> 	list_for_each_entry (ubus, &amp;usb_bus_list, bus_list) {</div><div class='ctx'> 		mon_bus_init(ubus);</div><div class='ctx'> 	}</div><div class='add'>+	usb_register_notify(&amp;mon_nb);</div><div class='ctx'> 	mutex_unlock(&amp;usb_bus_list_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig<br/>index 58b2b8fc9439..4b9542bbb35c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/musb/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/musb/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/musb/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/musb/Kconfig</a></div><div class='hunk'>@@ -33,10 +33,6 @@ config USB_MUSB_SOC</div><div class='ctx'> 	default y if ARCH_DAVINCI</div><div class='ctx'> 	default y if ARCH_OMAP2430</div><div class='ctx'> 	default y if ARCH_OMAP34XX</div><div class='del'>-	help</div><div class='del'>-	  Use a static &lt;asm/arch/hdrc_cnf.h&gt; file to describe how the</div><div class='del'>-	  controller is configured (endpoints, mechanisms, etc) on the</div><div class='del'>-	  current iteration of a given system-on-chip.</div><div class='ctx'> </div><div class='ctx'> comment "DaVinci 644x USB support"</div><div class='ctx'> 	depends on USB_MUSB_HDRC &amp;&amp; ARCH_DAVINCI</div><div class='head'>diff --git a/drivers/usb/musb/cppi_dma.h b/drivers/usb/musb/cppi_dma.h<br/>index fc5216b5d2c5..729b4071787b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/musb/cppi_dma.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/musb/cppi_dma.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/musb/cppi_dma.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/musb/cppi_dma.h</a></div><div class='hunk'>@@ -119,8 +119,8 @@ struct cppi {</div><div class='ctx'> 	void __iomem			*mregs;		/* Mentor regs */</div><div class='ctx'> 	void __iomem			*tibase;	/* TI/CPPI regs */</div><div class='ctx'> </div><div class='del'>-	struct cppi_channel		tx[MUSB_C_NUM_EPT - 1];</div><div class='del'>-	struct cppi_channel		rx[MUSB_C_NUM_EPR - 1];</div><div class='add'>+	struct cppi_channel		tx[4];</div><div class='add'>+	struct cppi_channel		rx[4];</div><div class='ctx'> </div><div class='ctx'> 	struct dma_pool			*pool;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/usb/musb/davinci.c b/drivers/usb/musb/davinci.c<br/>index 75baf181a8cd..dfb3bcbe00fc 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/musb/davinci.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/musb/davinci.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/musb/davinci.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/musb/davinci.c</a></div><div class='hunk'>@@ -30,6 +30,7 @@</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/arch/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/arch/memory.h&gt;</div><div class='hunk'>@@ -39,7 +40,7 @@</div><div class='ctx'> #include "musb_core.h"</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MACH_DAVINCI_EVM</div><div class='del'>-#include &lt;asm/arch/i2c-client.h&gt;</div><div class='add'>+#define GPIO_nVBUS_DRV		87</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #include "davinci.h"</div><div class='hunk'>@@ -138,7 +139,6 @@ static int vbus_state = -1;</div><div class='ctx'> /* VBUS SWITCHING IS BOARD-SPECIFIC */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MACH_DAVINCI_EVM</div><div class='del'>-#ifndef CONFIG_MACH_DAVINCI_EVM_OTG</div><div class='ctx'> </div><div class='ctx'> /* I2C operations are always synchronous, and require a task context.</div><div class='ctx'>  * With unloaded systems, using the shared workqueue seems to suffice</div><div class='hunk'>@@ -146,12 +146,11 @@ static int vbus_state = -1;</div><div class='ctx'>  */</div><div class='ctx'> static void evm_deferred_drvvbus(struct work_struct *ignored)</div><div class='ctx'> {</div><div class='del'>-	davinci_i2c_expander_op(0x3a, USB_DRVVBUS, vbus_state);</div><div class='add'>+	gpio_set_value_cansleep(GPIO_nVBUS_DRV, vbus_state);</div><div class='ctx'> 	vbus_state = !vbus_state;</div><div class='ctx'> }</div><div class='ctx'> static DECLARE_WORK(evm_vbus_work, evm_deferred_drvvbus);</div><div class='ctx'> </div><div class='del'>-#endif	/* modified board */</div><div class='ctx'> #endif	/* EVM */</div><div class='ctx'> </div><div class='ctx'> static void davinci_source_power(struct musb *musb, int is_on, int immediate)</div><div class='hunk'>@@ -165,21 +164,10 @@ static void davinci_source_power(struct musb *musb, int is_on, int immediate)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MACH_DAVINCI_EVM</div><div class='ctx'> 	if (machine_is_davinci_evm()) {</div><div class='del'>-#ifdef CONFIG_MACH_DAVINCI_EVM_OTG</div><div class='del'>-		/* modified EVM board switching VBUS with GPIO(6) not I2C</div><div class='del'>-		 * NOTE:  PINMUX0.RGB888 (bit23) must be clear</div><div class='del'>-		 */</div><div class='del'>-		if (is_on)</div><div class='del'>-			gpio_set(GPIO(6));</div><div class='del'>-		else</div><div class='del'>-			gpio_clear(GPIO(6));</div><div class='del'>-		immediate = 1;</div><div class='del'>-#else</div><div class='ctx'> 		if (immediate)</div><div class='del'>-			davinci_i2c_expander_op(0x3a, USB_DRVVBUS, !is_on);</div><div class='add'>+			gpio_set_value_cansleep(GPIO_nVBUS_DRV, vbus_state);</div><div class='ctx'> 		else</div><div class='ctx'> 			schedule_work(&amp;evm_vbus_work);</div><div class='del'>-#endif</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> 	if (immediate)</div><div class='head'>diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c<br/>index 128e949db47c..4a35745b30be 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/musb/musb_core.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/musb/musb_core.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/musb/musb_core.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/musb/musb_core.c</a></div><div class='hunk'>@@ -82,9 +82,9 @@</div><div class='ctx'> /*</div><div class='ctx'>  * This gets many kinds of configuration information:</div><div class='ctx'>  *	- Kconfig for everything user-configurable</div><div class='del'>- *	- &lt;asm/arch/hdrc_cnf.h&gt; for SOC or family details</div><div class='ctx'>  *	- platform_device for addressing, irq, and platform_data</div><div class='ctx'>  *	- platform_data is mostly for board-specific informarion</div><div class='add'>+ *	  (plus recentrly, SOC or family details)</div><div class='ctx'>  *</div><div class='ctx'>  * Most of the conditional compilation will (someday) vanish.</div><div class='ctx'>  */</div><div class='hunk'>@@ -974,9 +974,9 @@ static void musb_shutdown(struct platform_device *pdev)</div><div class='ctx'> /*</div><div class='ctx'>  * The silicon either has hard-wired endpoint configurations, or else</div><div class='ctx'>  * "dynamic fifo" sizing.  The driver has support for both, though at this</div><div class='del'>- * writing only the dynamic sizing is very well tested.   We use normal</div><div class='del'>- * idioms to so both modes are compile-tested, but dead code elimination</div><div class='del'>- * leaves only the relevant one in the object file.</div><div class='add'>+ * writing only the dynamic sizing is very well tested.   Since we switched</div><div class='add'>+ * away from compile-time hardware parameters, we can no longer rely on</div><div class='add'>+ * dead code elimination to leave only the relevant one in the object file.</div><div class='ctx'>  *</div><div class='ctx'>  * We don't currently use dynamic fifo setup capability to do anything</div><div class='ctx'>  * more than selecting one of a bunch of predefined configurations.</div><div class='hunk'>@@ -1806,6 +1806,7 @@ allocate_instance(struct device *dev,</div><div class='ctx'> 	musb-&gt;ctrl_base = mbase;</div><div class='ctx'> 	musb-&gt;nIrq = -ENODEV;</div><div class='ctx'> 	musb-&gt;config = config;</div><div class='add'>+	BUG_ON(musb-&gt;config-&gt;num_eps &gt; MUSB_C_NUM_EPS);</div><div class='ctx'> 	for (epnum = 0, ep = musb-&gt;endpoints;</div><div class='ctx'> 			epnum &lt; musb-&gt;config-&gt;num_eps;</div><div class='ctx'> 			epnum++, ep++) {</div><div class='hunk'>@@ -2054,15 +2055,6 @@ bad_config:</div><div class='ctx'> </div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-fail:</div><div class='del'>-	if (musb-&gt;clock)</div><div class='del'>-		clk_put(musb-&gt;clock);</div><div class='del'>-	device_init_wakeup(dev, 0);</div><div class='del'>-	musb_free(musb);</div><div class='del'>-	return status;</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_SYSFS</div><div class='ctx'> 	status = device_create_file(dev, &amp;dev_attr_mode);</div><div class='ctx'> 	status = device_create_file(dev, &amp;dev_attr_vbus);</div><div class='hunk'>@@ -2071,12 +2063,31 @@ fail:</div><div class='ctx'> #endif /* CONFIG_USB_GADGET_MUSB_HDRC */</div><div class='ctx'> 	status = 0;</div><div class='ctx'> #endif</div><div class='add'>+	if (status)</div><div class='add'>+		goto fail2;</div><div class='ctx'> </div><div class='del'>-	return status;</div><div class='add'>+	return 0;</div><div class='ctx'> </div><div class='ctx'> fail2:</div><div class='add'>+#ifdef CONFIG_SYSFS</div><div class='add'>+	device_remove_file(musb-&gt;controller, &amp;dev_attr_mode);</div><div class='add'>+	device_remove_file(musb-&gt;controller, &amp;dev_attr_vbus);</div><div class='add'>+#ifdef CONFIG_USB_MUSB_OTG</div><div class='add'>+	device_remove_file(musb-&gt;controller, &amp;dev_attr_srp);</div><div class='add'>+#endif</div><div class='add'>+#endif</div><div class='ctx'> 	musb_platform_exit(musb);</div><div class='del'>-	goto fail;</div><div class='add'>+fail:</div><div class='add'>+	dev_err(musb-&gt;controller,</div><div class='add'>+		"musb_init_controller failed with status %d\n", status);</div><div class='add'>+</div><div class='add'>+	if (musb-&gt;clock)</div><div class='add'>+		clk_put(musb-&gt;clock);</div><div class='add'>+	device_init_wakeup(dev, 0);</div><div class='add'>+	musb_free(musb);</div><div class='add'>+</div><div class='add'>+	return status;</div><div class='add'>+</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*-------------------------------------------------------------------------*/</div><div class='head'>diff --git a/drivers/usb/musb/musb_gadget_ep0.c b/drivers/usb/musb/musb_gadget_ep0.c<br/>index a57652fff39c..3f5e30ddfa27 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/musb/musb_gadget_ep0.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/musb/musb_gadget_ep0.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/musb/musb_gadget_ep0.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/musb/musb_gadget_ep0.c</a></div><div class='hunk'>@@ -437,7 +437,7 @@ static void ep0_rxstate(struct musb *musb)</div><div class='ctx'> {</div><div class='ctx'> 	void __iomem		*regs = musb-&gt;control_ep-&gt;regs;</div><div class='ctx'> 	struct usb_request	*req;</div><div class='del'>-	u16			tmp;</div><div class='add'>+	u16			count, csr;</div><div class='ctx'> </div><div class='ctx'> 	req = next_ep0_request(musb);</div><div class='ctx'> </div><div class='hunk'>@@ -449,35 +449,35 @@ static void ep0_rxstate(struct musb *musb)</div><div class='ctx'> 		unsigned	len = req-&gt;length - req-&gt;actual;</div><div class='ctx'> </div><div class='ctx'> 		/* read the buffer */</div><div class='del'>-		tmp = musb_readb(regs, MUSB_COUNT0);</div><div class='del'>-		if (tmp &gt; len) {</div><div class='add'>+		count = musb_readb(regs, MUSB_COUNT0);</div><div class='add'>+		if (count &gt; len) {</div><div class='ctx'> 			req-&gt;status = -EOVERFLOW;</div><div class='del'>-			tmp = len;</div><div class='add'>+			count = len;</div><div class='ctx'> 		}</div><div class='del'>-		musb_read_fifo(&amp;musb-&gt;endpoints[0], tmp, buf);</div><div class='del'>-		req-&gt;actual += tmp;</div><div class='del'>-		tmp = MUSB_CSR0_P_SVDRXPKTRDY;</div><div class='del'>-		if (tmp &lt; 64 || req-&gt;actual == req-&gt;length) {</div><div class='add'>+		musb_read_fifo(&amp;musb-&gt;endpoints[0], count, buf);</div><div class='add'>+		req-&gt;actual += count;</div><div class='add'>+		csr = MUSB_CSR0_P_SVDRXPKTRDY;</div><div class='add'>+		if (count &lt; 64 || req-&gt;actual == req-&gt;length) {</div><div class='ctx'> 			musb-&gt;ep0_state = MUSB_EP0_STAGE_STATUSIN;</div><div class='del'>-			tmp |= MUSB_CSR0_P_DATAEND;</div><div class='add'>+			csr |= MUSB_CSR0_P_DATAEND;</div><div class='ctx'> 		} else</div><div class='ctx'> 			req = NULL;</div><div class='ctx'> 	} else</div><div class='del'>-		tmp = MUSB_CSR0_P_SVDRXPKTRDY | MUSB_CSR0_P_SENDSTALL;</div><div class='add'>+		csr = MUSB_CSR0_P_SVDRXPKTRDY | MUSB_CSR0_P_SENDSTALL;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 	/* Completion handler may choose to stall, e.g. because the</div><div class='ctx'> 	 * message just received holds invalid data.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (req) {</div><div class='del'>-		musb-&gt;ackpend = tmp;</div><div class='add'>+		musb-&gt;ackpend = csr;</div><div class='ctx'> 		musb_g_ep0_giveback(musb, req);</div><div class='ctx'> 		if (!musb-&gt;ackpend)</div><div class='ctx'> 			return;</div><div class='ctx'> 		musb-&gt;ackpend = 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	musb_ep_select(musb-&gt;mregs, 0);</div><div class='del'>-	musb_writew(regs, MUSB_CSR0, tmp);</div><div class='add'>+	musb_writew(regs, MUSB_CSR0, csr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c<br/>index 8b4be012669a..3133990f04ec 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/musb/musb_host.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/musb/musb_host.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/musb/musb_host.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/musb/musb_host.c</a></div><div class='hunk'>@@ -108,7 +108,7 @@ static void musb_ep_program(struct musb *musb, u8 epnum,</div><div class='ctx'> /*</div><div class='ctx'>  * Clear TX fifo. Needed to avoid BABBLE errors.</div><div class='ctx'>  */</div><div class='del'>-static inline void musb_h_tx_flush_fifo(struct musb_hw_ep *ep)</div><div class='add'>+static void musb_h_tx_flush_fifo(struct musb_hw_ep *ep)</div><div class='ctx'> {</div><div class='ctx'> 	void __iomem	*epio = ep-&gt;regs;</div><div class='ctx'> 	u16		csr;</div><div class='hunk'>@@ -291,6 +291,7 @@ __acquires(musb-&gt;lock)</div><div class='ctx'> 			urb-&gt;actual_length, urb-&gt;transfer_buffer_length</div><div class='ctx'> 			);</div><div class='ctx'> </div><div class='add'>+	usb_hcd_unlink_urb_from_ep(musb_to_hcd(musb), urb);</div><div class='ctx'> 	spin_unlock(&amp;musb-&gt;lock);</div><div class='ctx'> 	usb_hcd_giveback_urb(musb_to_hcd(musb), urb, status);</div><div class='ctx'> 	spin_lock(&amp;musb-&gt;lock);</div><div class='hunk'>@@ -353,8 +354,6 @@ musb_giveback(struct musb_qh *qh, struct urb *urb, int status)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	usb_hcd_unlink_urb_from_ep(musb_to_hcd(musb), urb);</div><div class='del'>-</div><div class='ctx'> 	qh-&gt;is_ready = 0;</div><div class='ctx'> 	__musb_giveback(musb, urb, status);</div><div class='ctx'> 	qh-&gt;is_ready = ready;</div><div class='hunk'>@@ -436,7 +435,7 @@ musb_advance_schedule(struct musb *musb, struct urb *urb,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline u16 musb_h_flush_rxfifo(struct musb_hw_ep *hw_ep, u16 csr)</div><div class='add'>+static u16 musb_h_flush_rxfifo(struct musb_hw_ep *hw_ep, u16 csr)</div><div class='ctx'> {</div><div class='ctx'> 	/* we don't want fifo to fill itself again;</div><div class='ctx'> 	 * ignore dma (various models),</div><div class='hunk'>@@ -1005,7 +1004,7 @@ static bool musb_h_ep0_continue(struct musb *musb, u16 len, struct urb *urb)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Handle default endpoint interrupt as host. Only called in IRQ time</div><div class='del'>- * from the LinuxIsr() interrupt service routine.</div><div class='add'>+ * from musb_interrupt().</div><div class='ctx'>  *</div><div class='ctx'>  * called with controller irqlocked</div><div class='ctx'>  */</div><div class='hunk'>@@ -1791,7 +1790,9 @@ static int musb_urb_enqueue(</div><div class='ctx'> 	 */</div><div class='ctx'> 	qh = kzalloc(sizeof *qh, mem_flags);</div><div class='ctx'> 	if (!qh) {</div><div class='add'>+		spin_lock_irqsave(&amp;musb-&gt;lock, flags);</div><div class='ctx'> 		usb_hcd_unlink_urb_from_ep(hcd, urb);</div><div class='add'>+		spin_unlock_irqrestore(&amp;musb-&gt;lock, flags);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1873,7 +1874,11 @@ static int musb_urb_enqueue(</div><div class='ctx'> 			/* set up tt info if needed */</div><div class='ctx'> 			if (urb-&gt;dev-&gt;tt) {</div><div class='ctx'> 				qh-&gt;h_port_reg = (u8) urb-&gt;dev-&gt;ttport;</div><div class='del'>-				qh-&gt;h_addr_reg |= 0x80;</div><div class='add'>+				if (urb-&gt;dev-&gt;tt-&gt;hub)</div><div class='add'>+					qh-&gt;h_addr_reg =</div><div class='add'>+						(u8) urb-&gt;dev-&gt;tt-&gt;hub-&gt;devnum;</div><div class='add'>+				if (urb-&gt;dev-&gt;tt-&gt;multi)</div><div class='add'>+					qh-&gt;h_addr_reg |= 0x80;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1903,7 +1908,9 @@ static int musb_urb_enqueue(</div><div class='ctx'> </div><div class='ctx'> done:</div><div class='ctx'> 	if (ret != 0) {</div><div class='add'>+		spin_lock_irqsave(&amp;musb-&gt;lock, flags);</div><div class='ctx'> 		usb_hcd_unlink_urb_from_ep(hcd, urb);</div><div class='add'>+		spin_unlock_irqrestore(&amp;musb-&gt;lock, flags);</div><div class='ctx'> 		kfree(qh);</div><div class='ctx'> 	}</div><div class='ctx'> 	return ret;</div><div class='head'>diff --git a/drivers/usb/musb/musb_io.h b/drivers/usb/musb/musb_io.h<br/>index 6bbedae83af8..223f0a514094 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/musb/musb_io.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/musb/musb_io.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/musb/musb_io.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/musb/musb_io.h</a></div><div class='hunk'>@@ -37,7 +37,9 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#ifndef	CONFIG_ARM</div><div class='add'>+#if !defined(CONFIG_ARM) &amp;&amp; !defined(CONFIG_SUPERH) \</div><div class='add'>+	&amp;&amp; !defined(CONFIG_AVR32) &amp;&amp; !defined(CONFIG_PPC32) \</div><div class='add'>+	&amp;&amp; !defined(CONFIG_PPC64)</div><div class='ctx'> static inline void readsl(const void __iomem *addr, void *buf, int len)</div><div class='ctx'> 	{ insl((unsigned long)addr, buf, len); }</div><div class='ctx'> static inline void readsw(const void __iomem *addr, void *buf, int len)</div><div class='head'>diff --git a/drivers/usb/musb/musbhsdma.c b/drivers/usb/musb/musbhsdma.c<br/>index 9ba8fb7fcd24..8c734ef2c1ed 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/musb/musbhsdma.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/musb/musbhsdma.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/musb/musbhsdma.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/musb/musbhsdma.c</a></div><div class='hunk'>@@ -45,8 +45,8 @@</div><div class='ctx'> #define MUSB_HSDMA_ADDRESS		0x8</div><div class='ctx'> #define MUSB_HSDMA_COUNT		0xc</div><div class='ctx'> </div><div class='del'>-#define MUSB_HSDMA_CHANNEL_OFFSET(_bChannel, _offset)		\</div><div class='del'>-		(MUSB_HSDMA_BASE + (_bChannel &lt;&lt; 4) + _offset)</div><div class='add'>+#define MUSB_HSDMA_CHANNEL_OFFSET(_bchannel, _offset)		\</div><div class='add'>+		(MUSB_HSDMA_BASE + (_bchannel &lt;&lt; 4) + _offset)</div><div class='ctx'> </div><div class='ctx'> /* control register (16-bit): */</div><div class='ctx'> #define MUSB_HSDMA_ENABLE_SHIFT		0</div><div class='hunk'>@@ -67,23 +67,23 @@</div><div class='ctx'> struct musb_dma_controller;</div><div class='ctx'> </div><div class='ctx'> struct musb_dma_channel {</div><div class='del'>-	struct dma_channel		Channel;</div><div class='add'>+	struct dma_channel		channel;</div><div class='ctx'> 	struct musb_dma_controller	*controller;</div><div class='del'>-	u32				dwStartAddress;</div><div class='add'>+	u32				start_addr;</div><div class='ctx'> 	u32				len;</div><div class='del'>-	u16				wMaxPacketSize;</div><div class='del'>-	u8				bIndex;</div><div class='add'>+	u16				max_packet_sz;</div><div class='add'>+	u8				idx;</div><div class='ctx'> 	u8				epnum;</div><div class='ctx'> 	u8				transmit;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct musb_dma_controller {</div><div class='del'>-	struct dma_controller		Controller;</div><div class='del'>-	struct musb_dma_channel		aChannel[MUSB_HSDMA_CHANNELS];</div><div class='del'>-	void				*pDmaPrivate;</div><div class='del'>-	void __iomem			*pCoreBase;</div><div class='del'>-	u8				bChannelCount;</div><div class='del'>-	u8				bmUsedChannels;</div><div class='add'>+	struct dma_controller		controller;</div><div class='add'>+	struct musb_dma_channel		channel[MUSB_HSDMA_CHANNELS];</div><div class='add'>+	void				*private_data;</div><div class='add'>+	void __iomem			*base;</div><div class='add'>+	u8				channel_count;</div><div class='add'>+	u8				used_channels;</div><div class='ctx'> 	u8				irq;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -93,91 +93,91 @@ static int dma_controller_start(struct dma_controller *c)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void dma_channel_release(struct dma_channel *pChannel);</div><div class='add'>+static void dma_channel_release(struct dma_channel *channel);</div><div class='ctx'> </div><div class='ctx'> static int dma_controller_stop(struct dma_controller *c)</div><div class='ctx'> {</div><div class='del'>-	struct musb_dma_controller *controller =</div><div class='del'>-		container_of(c, struct musb_dma_controller, Controller);</div><div class='del'>-	struct musb *musb = (struct musb *) controller-&gt;pDmaPrivate;</div><div class='del'>-	struct dma_channel *pChannel;</div><div class='del'>-	u8 bBit;</div><div class='add'>+	struct musb_dma_controller *controller = container_of(c,</div><div class='add'>+			struct musb_dma_controller, controller);</div><div class='add'>+	struct musb *musb = controller-&gt;private_data;</div><div class='add'>+	struct dma_channel *channel;</div><div class='add'>+	u8 bit;</div><div class='ctx'> </div><div class='del'>-	if (controller-&gt;bmUsedChannels != 0) {</div><div class='add'>+	if (controller-&gt;used_channels != 0) {</div><div class='ctx'> 		dev_err(musb-&gt;controller,</div><div class='ctx'> 			"Stopping DMA controller while channel active\n");</div><div class='ctx'> </div><div class='del'>-		for (bBit = 0; bBit &lt; MUSB_HSDMA_CHANNELS; bBit++) {</div><div class='del'>-			if (controller-&gt;bmUsedChannels &amp; (1 &lt;&lt; bBit)) {</div><div class='del'>-				pChannel = &amp;controller-&gt;aChannel[bBit].Channel;</div><div class='del'>-				dma_channel_release(pChannel);</div><div class='add'>+		for (bit = 0; bit &lt; MUSB_HSDMA_CHANNELS; bit++) {</div><div class='add'>+			if (controller-&gt;used_channels &amp; (1 &lt;&lt; bit)) {</div><div class='add'>+				channel = &amp;controller-&gt;channel[bit].channel;</div><div class='add'>+				dma_channel_release(channel);</div><div class='ctx'> </div><div class='del'>-				if (!controller-&gt;bmUsedChannels)</div><div class='add'>+				if (!controller-&gt;used_channels)</div><div class='ctx'> 					break;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct dma_channel *dma_channel_allocate(struct dma_controller *c,</div><div class='ctx'> 				struct musb_hw_ep *hw_ep, u8 transmit)</div><div class='ctx'> {</div><div class='del'>-	u8 bBit;</div><div class='del'>-	struct dma_channel *pChannel = NULL;</div><div class='del'>-	struct musb_dma_channel *pImplChannel = NULL;</div><div class='del'>-	struct musb_dma_controller *controller =</div><div class='del'>-			container_of(c, struct musb_dma_controller, Controller);</div><div class='del'>-</div><div class='del'>-	for (bBit = 0; bBit &lt; MUSB_HSDMA_CHANNELS; bBit++) {</div><div class='del'>-		if (!(controller-&gt;bmUsedChannels &amp; (1 &lt;&lt; bBit))) {</div><div class='del'>-			controller-&gt;bmUsedChannels |= (1 &lt;&lt; bBit);</div><div class='del'>-			pImplChannel = &amp;(controller-&gt;aChannel[bBit]);</div><div class='del'>-			pImplChannel-&gt;controller = controller;</div><div class='del'>-			pImplChannel-&gt;bIndex = bBit;</div><div class='del'>-			pImplChannel-&gt;epnum = hw_ep-&gt;epnum;</div><div class='del'>-			pImplChannel-&gt;transmit = transmit;</div><div class='del'>-			pChannel = &amp;(pImplChannel-&gt;Channel);</div><div class='del'>-			pChannel-&gt;private_data = pImplChannel;</div><div class='del'>-			pChannel-&gt;status = MUSB_DMA_STATUS_FREE;</div><div class='del'>-			pChannel-&gt;max_len = 0x10000;</div><div class='add'>+	struct musb_dma_controller *controller = container_of(c,</div><div class='add'>+			struct musb_dma_controller, controller);</div><div class='add'>+	struct musb_dma_channel *musb_channel = NULL;</div><div class='add'>+	struct dma_channel *channel = NULL;</div><div class='add'>+	u8 bit;</div><div class='add'>+</div><div class='add'>+	for (bit = 0; bit &lt; MUSB_HSDMA_CHANNELS; bit++) {</div><div class='add'>+		if (!(controller-&gt;used_channels &amp; (1 &lt;&lt; bit))) {</div><div class='add'>+			controller-&gt;used_channels |= (1 &lt;&lt; bit);</div><div class='add'>+			musb_channel = &amp;(controller-&gt;channel[bit]);</div><div class='add'>+			musb_channel-&gt;controller = controller;</div><div class='add'>+			musb_channel-&gt;idx = bit;</div><div class='add'>+			musb_channel-&gt;epnum = hw_ep-&gt;epnum;</div><div class='add'>+			musb_channel-&gt;transmit = transmit;</div><div class='add'>+			channel = &amp;(musb_channel-&gt;channel);</div><div class='add'>+			channel-&gt;private_data = musb_channel;</div><div class='add'>+			channel-&gt;status = MUSB_DMA_STATUS_FREE;</div><div class='add'>+			channel-&gt;max_len = 0x10000;</div><div class='ctx'> 			/* Tx =&gt; mode 1; Rx =&gt; mode 0 */</div><div class='del'>-			pChannel-&gt;desired_mode = transmit;</div><div class='del'>-			pChannel-&gt;actual_len = 0;</div><div class='add'>+			channel-&gt;desired_mode = transmit;</div><div class='add'>+			channel-&gt;actual_len = 0;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	return pChannel;</div><div class='add'>+</div><div class='add'>+	return channel;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void dma_channel_release(struct dma_channel *pChannel)</div><div class='add'>+static void dma_channel_release(struct dma_channel *channel)</div><div class='ctx'> {</div><div class='del'>-	struct musb_dma_channel *pImplChannel =</div><div class='del'>-		(struct musb_dma_channel *) pChannel-&gt;private_data;</div><div class='add'>+	struct musb_dma_channel *musb_channel = channel-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	pChannel-&gt;actual_len = 0;</div><div class='del'>-	pImplChannel-&gt;dwStartAddress = 0;</div><div class='del'>-	pImplChannel-&gt;len = 0;</div><div class='add'>+	channel-&gt;actual_len = 0;</div><div class='add'>+	musb_channel-&gt;start_addr = 0;</div><div class='add'>+	musb_channel-&gt;len = 0;</div><div class='ctx'> </div><div class='del'>-	pImplChannel-&gt;controller-&gt;bmUsedChannels &amp;=</div><div class='del'>-		~(1 &lt;&lt; pImplChannel-&gt;bIndex);</div><div class='add'>+	musb_channel-&gt;controller-&gt;used_channels &amp;=</div><div class='add'>+		~(1 &lt;&lt; musb_channel-&gt;idx);</div><div class='ctx'> </div><div class='del'>-	pChannel-&gt;status = MUSB_DMA_STATUS_UNKNOWN;</div><div class='add'>+	channel-&gt;status = MUSB_DMA_STATUS_UNKNOWN;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void configure_channel(struct dma_channel *pChannel,</div><div class='add'>+static void configure_channel(struct dma_channel *channel,</div><div class='ctx'> 				u16 packet_sz, u8 mode,</div><div class='ctx'> 				dma_addr_t dma_addr, u32 len)</div><div class='ctx'> {</div><div class='del'>-	struct musb_dma_channel *pImplChannel =</div><div class='del'>-		(struct musb_dma_channel *) pChannel-&gt;private_data;</div><div class='del'>-	struct musb_dma_controller *controller = pImplChannel-&gt;controller;</div><div class='del'>-	void __iomem *mbase = controller-&gt;pCoreBase;</div><div class='del'>-	u8 bChannel = pImplChannel-&gt;bIndex;</div><div class='add'>+	struct musb_dma_channel *musb_channel = channel-&gt;private_data;</div><div class='add'>+	struct musb_dma_controller *controller = musb_channel-&gt;controller;</div><div class='add'>+	void __iomem *mbase = controller-&gt;base;</div><div class='add'>+	u8 bchannel = musb_channel-&gt;idx;</div><div class='ctx'> 	u16 csr = 0;</div><div class='ctx'> </div><div class='ctx'> 	DBG(4, "%p, pkt_sz %d, addr 0x%x, len %d, mode %d\n",</div><div class='del'>-			pChannel, packet_sz, dma_addr, len, mode);</div><div class='add'>+			channel, packet_sz, dma_addr, len, mode);</div><div class='ctx'> </div><div class='ctx'> 	if (mode) {</div><div class='ctx'> 		csr |= 1 &lt;&lt; MUSB_HSDMA_MODE1_SHIFT;</div><div class='hunk'>@@ -195,180 +195,183 @@ static void configure_channel(struct dma_channel *pChannel,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	csr |= (pImplChannel-&gt;epnum &lt;&lt; MUSB_HSDMA_ENDPOINT_SHIFT)</div><div class='add'>+	csr |= (musb_channel-&gt;epnum &lt;&lt; MUSB_HSDMA_ENDPOINT_SHIFT)</div><div class='ctx'> 		| (1 &lt;&lt; MUSB_HSDMA_ENABLE_SHIFT)</div><div class='ctx'> 		| (1 &lt;&lt; MUSB_HSDMA_IRQENABLE_SHIFT)</div><div class='del'>-		| (pImplChannel-&gt;transmit</div><div class='add'>+		| (musb_channel-&gt;transmit</div><div class='ctx'> 				? (1 &lt;&lt; MUSB_HSDMA_TRANSMIT_SHIFT)</div><div class='ctx'> 				: 0);</div><div class='ctx'> </div><div class='ctx'> 	/* address/count */</div><div class='ctx'> 	musb_writel(mbase,</div><div class='del'>-		MUSB_HSDMA_CHANNEL_OFFSET(bChannel, MUSB_HSDMA_ADDRESS),</div><div class='add'>+		MUSB_HSDMA_CHANNEL_OFFSET(bchannel, MUSB_HSDMA_ADDRESS),</div><div class='ctx'> 		dma_addr);</div><div class='ctx'> 	musb_writel(mbase,</div><div class='del'>-		MUSB_HSDMA_CHANNEL_OFFSET(bChannel, MUSB_HSDMA_COUNT),</div><div class='add'>+		MUSB_HSDMA_CHANNEL_OFFSET(bchannel, MUSB_HSDMA_COUNT),</div><div class='ctx'> 		len);</div><div class='ctx'> </div><div class='ctx'> 	/* control (this should start things) */</div><div class='ctx'> 	musb_writew(mbase,</div><div class='del'>-		MUSB_HSDMA_CHANNEL_OFFSET(bChannel, MUSB_HSDMA_CONTROL),</div><div class='add'>+		MUSB_HSDMA_CHANNEL_OFFSET(bchannel, MUSB_HSDMA_CONTROL),</div><div class='ctx'> 		csr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dma_channel_program(struct dma_channel *pChannel,</div><div class='add'>+static int dma_channel_program(struct dma_channel *channel,</div><div class='ctx'> 				u16 packet_sz, u8 mode,</div><div class='ctx'> 				dma_addr_t dma_addr, u32 len)</div><div class='ctx'> {</div><div class='del'>-	struct musb_dma_channel *pImplChannel =</div><div class='del'>-			(struct musb_dma_channel *) pChannel-&gt;private_data;</div><div class='add'>+	struct musb_dma_channel *musb_channel = channel-&gt;private_data;</div><div class='ctx'> </div><div class='ctx'> 	DBG(2, "ep%d-%s pkt_sz %d, dma_addr 0x%x length %d, mode %d\n",</div><div class='del'>-		pImplChannel-&gt;epnum,</div><div class='del'>-		pImplChannel-&gt;transmit ? "Tx" : "Rx",</div><div class='add'>+		musb_channel-&gt;epnum,</div><div class='add'>+		musb_channel-&gt;transmit ? "Tx" : "Rx",</div><div class='ctx'> 		packet_sz, dma_addr, len, mode);</div><div class='ctx'> </div><div class='del'>-	BUG_ON(pChannel-&gt;status == MUSB_DMA_STATUS_UNKNOWN ||</div><div class='del'>-		pChannel-&gt;status == MUSB_DMA_STATUS_BUSY);</div><div class='add'>+	BUG_ON(channel-&gt;status == MUSB_DMA_STATUS_UNKNOWN ||</div><div class='add'>+		channel-&gt;status == MUSB_DMA_STATUS_BUSY);</div><div class='ctx'> </div><div class='del'>-	pChannel-&gt;actual_len = 0;</div><div class='del'>-	pImplChannel-&gt;dwStartAddress = dma_addr;</div><div class='del'>-	pImplChannel-&gt;len = len;</div><div class='del'>-	pImplChannel-&gt;wMaxPacketSize = packet_sz;</div><div class='del'>-	pChannel-&gt;status = MUSB_DMA_STATUS_BUSY;</div><div class='add'>+	channel-&gt;actual_len = 0;</div><div class='add'>+	musb_channel-&gt;start_addr = dma_addr;</div><div class='add'>+	musb_channel-&gt;len = len;</div><div class='add'>+	musb_channel-&gt;max_packet_sz = packet_sz;</div><div class='add'>+	channel-&gt;status = MUSB_DMA_STATUS_BUSY;</div><div class='ctx'> </div><div class='ctx'> 	if ((mode == 1) &amp;&amp; (len &gt;= packet_sz))</div><div class='del'>-		configure_channel(pChannel, packet_sz, 1, dma_addr, len);</div><div class='add'>+		configure_channel(channel, packet_sz, 1, dma_addr, len);</div><div class='ctx'> 	else</div><div class='del'>-		configure_channel(pChannel, packet_sz, 0, dma_addr, len);</div><div class='add'>+		configure_channel(channel, packet_sz, 0, dma_addr, len);</div><div class='ctx'> </div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dma_channel_abort(struct dma_channel *pChannel)</div><div class='add'>+static int dma_channel_abort(struct dma_channel *channel)</div><div class='ctx'> {</div><div class='del'>-	struct musb_dma_channel *pImplChannel =</div><div class='del'>-		(struct musb_dma_channel *) pChannel-&gt;private_data;</div><div class='del'>-	u8 bChannel = pImplChannel-&gt;bIndex;</div><div class='del'>-	void __iomem *mbase = pImplChannel-&gt;controller-&gt;pCoreBase;</div><div class='add'>+	struct musb_dma_channel *musb_channel = channel-&gt;private_data;</div><div class='add'>+	void __iomem *mbase = musb_channel-&gt;controller-&gt;base;</div><div class='add'>+</div><div class='add'>+	u8 bchannel = musb_channel-&gt;idx;</div><div class='ctx'> 	u16 csr;</div><div class='ctx'> </div><div class='del'>-	if (pChannel-&gt;status == MUSB_DMA_STATUS_BUSY) {</div><div class='del'>-		if (pImplChannel-&gt;transmit) {</div><div class='add'>+	if (channel-&gt;status == MUSB_DMA_STATUS_BUSY) {</div><div class='add'>+		if (musb_channel-&gt;transmit) {</div><div class='ctx'> </div><div class='ctx'> 			csr = musb_readw(mbase,</div><div class='del'>-				MUSB_EP_OFFSET(pImplChannel-&gt;epnum,</div><div class='add'>+				MUSB_EP_OFFSET(musb_channel-&gt;epnum,</div><div class='ctx'> 						MUSB_TXCSR));</div><div class='ctx'> 			csr &amp;= ~(MUSB_TXCSR_AUTOSET |</div><div class='ctx'> 				 MUSB_TXCSR_DMAENAB |</div><div class='ctx'> 				 MUSB_TXCSR_DMAMODE);</div><div class='ctx'> 			musb_writew(mbase,</div><div class='del'>-				MUSB_EP_OFFSET(pImplChannel-&gt;epnum,</div><div class='del'>-						MUSB_TXCSR),</div><div class='add'>+				MUSB_EP_OFFSET(musb_channel-&gt;epnum, MUSB_TXCSR),</div><div class='ctx'> 				csr);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			csr = musb_readw(mbase,</div><div class='del'>-				MUSB_EP_OFFSET(pImplChannel-&gt;epnum,</div><div class='add'>+				MUSB_EP_OFFSET(musb_channel-&gt;epnum,</div><div class='ctx'> 						MUSB_RXCSR));</div><div class='ctx'> 			csr &amp;= ~(MUSB_RXCSR_AUTOCLEAR |</div><div class='ctx'> 				 MUSB_RXCSR_DMAENAB |</div><div class='ctx'> 				 MUSB_RXCSR_DMAMODE);</div><div class='ctx'> 			musb_writew(mbase,</div><div class='del'>-				MUSB_EP_OFFSET(pImplChannel-&gt;epnum,</div><div class='del'>-						MUSB_RXCSR),</div><div class='add'>+				MUSB_EP_OFFSET(musb_channel-&gt;epnum, MUSB_RXCSR),</div><div class='ctx'> 				csr);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		musb_writew(mbase,</div><div class='del'>-			MUSB_HSDMA_CHANNEL_OFFSET(bChannel, MUSB_HSDMA_CONTROL),</div><div class='add'>+			MUSB_HSDMA_CHANNEL_OFFSET(bchannel, MUSB_HSDMA_CONTROL),</div><div class='ctx'> 			0);</div><div class='ctx'> 		musb_writel(mbase,</div><div class='del'>-			MUSB_HSDMA_CHANNEL_OFFSET(bChannel, MUSB_HSDMA_ADDRESS),</div><div class='add'>+			MUSB_HSDMA_CHANNEL_OFFSET(bchannel, MUSB_HSDMA_ADDRESS),</div><div class='ctx'> 			0);</div><div class='ctx'> 		musb_writel(mbase,</div><div class='del'>-			MUSB_HSDMA_CHANNEL_OFFSET(bChannel, MUSB_HSDMA_COUNT),</div><div class='add'>+			MUSB_HSDMA_CHANNEL_OFFSET(bchannel, MUSB_HSDMA_COUNT),</div><div class='ctx'> 			0);</div><div class='ctx'> </div><div class='del'>-		pChannel-&gt;status = MUSB_DMA_STATUS_FREE;</div><div class='add'>+		channel-&gt;status = MUSB_DMA_STATUS_FREE;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static irqreturn_t dma_controller_irq(int irq, void *private_data)</div><div class='ctx'> {</div><div class='del'>-	struct musb_dma_controller *controller =</div><div class='del'>-		(struct musb_dma_controller *)private_data;</div><div class='del'>-	struct musb_dma_channel *pImplChannel;</div><div class='del'>-	struct musb *musb = controller-&gt;pDmaPrivate;</div><div class='del'>-	void __iomem *mbase = controller-&gt;pCoreBase;</div><div class='del'>-	struct dma_channel *pChannel;</div><div class='del'>-	u8 bChannel;</div><div class='del'>-	u16 csr;</div><div class='del'>-	u32 dwAddress;</div><div class='del'>-	u8 int_hsdma;</div><div class='add'>+	struct musb_dma_controller *controller = private_data;</div><div class='add'>+	struct musb *musb = controller-&gt;private_data;</div><div class='add'>+	struct musb_dma_channel *musb_channel;</div><div class='add'>+	struct dma_channel *channel;</div><div class='add'>+</div><div class='add'>+	void __iomem *mbase = controller-&gt;base;</div><div class='add'>+</div><div class='ctx'> 	irqreturn_t retval = IRQ_NONE;</div><div class='add'>+</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='add'>+	u8 bchannel;</div><div class='add'>+	u8 int_hsdma;</div><div class='add'>+</div><div class='add'>+	u32 addr;</div><div class='add'>+	u16 csr;</div><div class='add'>+</div><div class='ctx'> 	spin_lock_irqsave(&amp;musb-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	int_hsdma = musb_readb(mbase, MUSB_HSDMA_INTR);</div><div class='ctx'> 	if (!int_hsdma)</div><div class='ctx'> 		goto done;</div><div class='ctx'> </div><div class='del'>-	for (bChannel = 0; bChannel &lt; MUSB_HSDMA_CHANNELS; bChannel++) {</div><div class='del'>-		if (int_hsdma &amp; (1 &lt;&lt; bChannel)) {</div><div class='del'>-			pImplChannel = (struct musb_dma_channel *)</div><div class='del'>-					&amp;(controller-&gt;aChannel[bChannel]);</div><div class='del'>-			pChannel = &amp;pImplChannel-&gt;Channel;</div><div class='add'>+	for (bchannel = 0; bchannel &lt; MUSB_HSDMA_CHANNELS; bchannel++) {</div><div class='add'>+		if (int_hsdma &amp; (1 &lt;&lt; bchannel)) {</div><div class='add'>+			musb_channel = (struct musb_dma_channel *)</div><div class='add'>+					&amp;(controller-&gt;channel[bchannel]);</div><div class='add'>+			channel = &amp;musb_channel-&gt;channel;</div><div class='ctx'> </div><div class='ctx'> 			csr = musb_readw(mbase,</div><div class='del'>-					MUSB_HSDMA_CHANNEL_OFFSET(bChannel,</div><div class='add'>+					MUSB_HSDMA_CHANNEL_OFFSET(bchannel,</div><div class='ctx'> 							MUSB_HSDMA_CONTROL));</div><div class='ctx'> </div><div class='del'>-			if (csr &amp; (1 &lt;&lt; MUSB_HSDMA_BUSERROR_SHIFT))</div><div class='del'>-				pImplChannel-&gt;Channel.status =</div><div class='add'>+			if (csr &amp; (1 &lt;&lt; MUSB_HSDMA_BUSERROR_SHIFT)) {</div><div class='add'>+				musb_channel-&gt;channel.status =</div><div class='ctx'> 					MUSB_DMA_STATUS_BUS_ABORT;</div><div class='del'>-			else {</div><div class='add'>+			} else {</div><div class='ctx'> 				u8 devctl;</div><div class='ctx'> </div><div class='del'>-				dwAddress = musb_readl(mbase,</div><div class='add'>+				addr = musb_readl(mbase,</div><div class='ctx'> 						MUSB_HSDMA_CHANNEL_OFFSET(</div><div class='del'>-							bChannel,</div><div class='add'>+							bchannel,</div><div class='ctx'> 							MUSB_HSDMA_ADDRESS));</div><div class='del'>-				pChannel-&gt;actual_len = dwAddress</div><div class='del'>-					- pImplChannel-&gt;dwStartAddress;</div><div class='add'>+				channel-&gt;actual_len = addr</div><div class='add'>+					- musb_channel-&gt;start_addr;</div><div class='ctx'> </div><div class='ctx'> 				DBG(2, "ch %p, 0x%x -&gt; 0x%x (%d / %d) %s\n",</div><div class='del'>-					pChannel, pImplChannel-&gt;dwStartAddress,</div><div class='del'>-					dwAddress, pChannel-&gt;actual_len,</div><div class='del'>-					pImplChannel-&gt;len,</div><div class='del'>-					(pChannel-&gt;actual_len</div><div class='del'>-						&lt; pImplChannel-&gt;len) ?</div><div class='add'>+					channel, musb_channel-&gt;start_addr,</div><div class='add'>+					addr, channel-&gt;actual_len,</div><div class='add'>+					musb_channel-&gt;len,</div><div class='add'>+					(channel-&gt;actual_len</div><div class='add'>+						&lt; musb_channel-&gt;len) ?</div><div class='ctx'> 					"=&gt; reconfig 0" : "=&gt; complete");</div><div class='ctx'> </div><div class='ctx'> 				devctl = musb_readb(mbase, MUSB_DEVCTL);</div><div class='ctx'> </div><div class='del'>-				pChannel-&gt;status = MUSB_DMA_STATUS_FREE;</div><div class='add'>+				channel-&gt;status = MUSB_DMA_STATUS_FREE;</div><div class='ctx'> </div><div class='ctx'> 				/* completed */</div><div class='ctx'> 				if ((devctl &amp; MUSB_DEVCTL_HM)</div><div class='del'>-					&amp;&amp; (pImplChannel-&gt;transmit)</div><div class='del'>-					&amp;&amp; ((pChannel-&gt;desired_mode == 0)</div><div class='del'>-					    || (pChannel-&gt;actual_len &amp;</div><div class='del'>-					    (pImplChannel-&gt;wMaxPacketSize - 1)))</div><div class='add'>+					&amp;&amp; (musb_channel-&gt;transmit)</div><div class='add'>+					&amp;&amp; ((channel-&gt;desired_mode == 0)</div><div class='add'>+					    || (channel-&gt;actual_len &amp;</div><div class='add'>+					    (musb_channel-&gt;max_packet_sz - 1)))</div><div class='ctx'> 					 ) {</div><div class='ctx'> 					/* Send out the packet */</div><div class='ctx'> 					musb_ep_select(mbase,</div><div class='del'>-						pImplChannel-&gt;epnum);</div><div class='add'>+						musb_channel-&gt;epnum);</div><div class='ctx'> 					musb_writew(mbase, MUSB_EP_OFFSET(</div><div class='del'>-							pImplChannel-&gt;epnum,</div><div class='add'>+							musb_channel-&gt;epnum,</div><div class='ctx'> 							MUSB_TXCSR),</div><div class='ctx'> 						MUSB_TXCSR_TXPKTRDY);</div><div class='del'>-				} else</div><div class='add'>+				} else {</div><div class='ctx'> 					musb_dma_completion(</div><div class='ctx'> 						musb,</div><div class='del'>-						pImplChannel-&gt;epnum,</div><div class='del'>-						pImplChannel-&gt;transmit);</div><div class='add'>+						musb_channel-&gt;epnum,</div><div class='add'>+						musb_channel-&gt;transmit);</div><div class='add'>+				}</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -380,9 +383,9 @@ done:</div><div class='ctx'> </div><div class='ctx'> void dma_controller_destroy(struct dma_controller *c)</div><div class='ctx'> {</div><div class='del'>-	struct musb_dma_controller *controller;</div><div class='add'>+	struct musb_dma_controller *controller = container_of(c,</div><div class='add'>+			struct musb_dma_controller, controller);</div><div class='ctx'> </div><div class='del'>-	controller = container_of(c, struct musb_dma_controller, Controller);</div><div class='ctx'> 	if (!controller)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -393,7 +396,7 @@ void dma_controller_destroy(struct dma_controller *c)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct dma_controller *__init</div><div class='del'>-dma_controller_create(struct musb *musb, void __iomem *pCoreBase)</div><div class='add'>+dma_controller_create(struct musb *musb, void __iomem *base)</div><div class='ctx'> {</div><div class='ctx'> 	struct musb_dma_controller *controller;</div><div class='ctx'> 	struct device *dev = musb-&gt;controller;</div><div class='hunk'>@@ -405,29 +408,30 @@ dma_controller_create(struct musb *musb, void __iomem *pCoreBase)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	controller = kzalloc(sizeof(struct musb_dma_controller), GFP_KERNEL);</div><div class='add'>+	controller = kzalloc(sizeof(*controller), GFP_KERNEL);</div><div class='ctx'> 	if (!controller)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	controller-&gt;bChannelCount = MUSB_HSDMA_CHANNELS;</div><div class='del'>-	controller-&gt;pDmaPrivate = musb;</div><div class='del'>-	controller-&gt;pCoreBase = pCoreBase;</div><div class='add'>+	controller-&gt;channel_count = MUSB_HSDMA_CHANNELS;</div><div class='add'>+	controller-&gt;private_data = musb;</div><div class='add'>+	controller-&gt;base = base;</div><div class='ctx'> </div><div class='del'>-	controller-&gt;Controller.start = dma_controller_start;</div><div class='del'>-	controller-&gt;Controller.stop = dma_controller_stop;</div><div class='del'>-	controller-&gt;Controller.channel_alloc = dma_channel_allocate;</div><div class='del'>-	controller-&gt;Controller.channel_release = dma_channel_release;</div><div class='del'>-	controller-&gt;Controller.channel_program = dma_channel_program;</div><div class='del'>-	controller-&gt;Controller.channel_abort = dma_channel_abort;</div><div class='add'>+	controller-&gt;controller.start = dma_controller_start;</div><div class='add'>+	controller-&gt;controller.stop = dma_controller_stop;</div><div class='add'>+	controller-&gt;controller.channel_alloc = dma_channel_allocate;</div><div class='add'>+	controller-&gt;controller.channel_release = dma_channel_release;</div><div class='add'>+	controller-&gt;controller.channel_program = dma_channel_program;</div><div class='add'>+	controller-&gt;controller.channel_abort = dma_channel_abort;</div><div class='ctx'> </div><div class='ctx'> 	if (request_irq(irq, dma_controller_irq, IRQF_DISABLED,</div><div class='del'>-			musb-&gt;controller-&gt;bus_id, &amp;controller-&gt;Controller)) {</div><div class='add'>+			musb-&gt;controller-&gt;bus_id, &amp;controller-&gt;controller)) {</div><div class='ctx'> 		dev_err(dev, "request_irq %d failed!\n", irq);</div><div class='del'>-		dma_controller_destroy(&amp;controller-&gt;Controller);</div><div class='add'>+		dma_controller_destroy(&amp;controller-&gt;controller);</div><div class='add'>+</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	controller-&gt;irq = irq;</div><div class='ctx'> </div><div class='del'>-	return &amp;controller-&gt;Controller;</div><div class='add'>+	return &amp;controller-&gt;controller;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/usb/serial/aircable.c b/drivers/usb/serial/aircable.c<br/>index 79ea98c66fa8..537f953bd7f8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/aircable.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/serial/aircable.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/aircable.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/aircable.c</a></div><div class='hunk'>@@ -220,8 +220,8 @@ static void aircable_send(struct usb_serial_port *port)</div><div class='ctx'> </div><div class='ctx'> 	buf = kzalloc(count + HCI_HEADER_LENGTH, GFP_ATOMIC);</div><div class='ctx'> 	if (!buf) {</div><div class='del'>-		err("%s- kzalloc(%d) failed.", __func__,</div><div class='del'>-		    count + HCI_HEADER_LENGTH);</div><div class='add'>+		dev_err(&amp;port-&gt;dev, "%s- kzalloc(%d) failed.\n",</div><div class='add'>+			__func__, count + HCI_HEADER_LENGTH);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -272,23 +272,24 @@ static void aircable_read(struct work_struct *work)</div><div class='ctx'> 	 * 64 bytes, to ensure I do not get throttled.</div><div class='ctx'> 	 * Ask USB mailing list for better aproach.</div><div class='ctx'> 	 */</div><div class='del'>-	tty = port-&gt;port.tty;</div><div class='add'>+	tty = tty_port_tty_get(&amp;port-&gt;port);</div><div class='ctx'> </div><div class='ctx'> 	if (!tty) {</div><div class='ctx'> 		schedule_work(&amp;priv-&gt;rx_work);</div><div class='del'>-		err("%s - No tty available", __func__);</div><div class='add'>+		dev_err(&amp;port-&gt;dev, "%s - No tty available\n", __func__);</div><div class='ctx'> 		return ;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	count = min(64, serial_buf_data_avail(priv-&gt;rx_buf));</div><div class='ctx'> </div><div class='ctx'> 	if (count &lt;= 0)</div><div class='del'>-		return; /* We have finished sending everything. */</div><div class='add'>+		goto out; /* We have finished sending everything. */</div><div class='ctx'> </div><div class='ctx'> 	tty_prepare_flip_string(tty, &amp;data, count);</div><div class='ctx'> 	if (!data) {</div><div class='del'>-		err("%s- kzalloc(%d) failed.", __func__, count);</div><div class='del'>-		return;</div><div class='add'>+		dev_err(&amp;port-&gt;dev, "%s- kzalloc(%d) failed.",</div><div class='add'>+							__func__, count);</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	serial_buf_get(priv-&gt;rx_buf, data, count);</div><div class='hunk'>@@ -297,7 +298,8 @@ static void aircable_read(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> 	if (serial_buf_data_avail(priv-&gt;rx_buf))</div><div class='ctx'> 		schedule_work(&amp;priv-&gt;rx_work);</div><div class='del'>-</div><div class='add'>+out:		</div><div class='add'>+	tty_kref_put(tty);</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> /* End of private methods */</div><div class='hunk'>@@ -334,7 +336,7 @@ static int aircable_attach(struct usb_serial *serial)</div><div class='ctx'> </div><div class='ctx'> 	priv = kzalloc(sizeof(struct aircable_private), GFP_KERNEL);</div><div class='ctx'> 	if (!priv) {</div><div class='del'>-		err("%s- kmalloc(%Zd) failed.", __func__,</div><div class='add'>+		dev_err(&amp;port-&gt;dev, "%s- kmalloc(%Zd) failed.\n", __func__,</div><div class='ctx'> 			sizeof(struct aircable_private));</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -495,7 +497,7 @@ static void aircable_read_bulk_callback(struct urb *urb)</div><div class='ctx'> 	usb_serial_debug_data(debug, &amp;port-&gt;dev, __func__,</div><div class='ctx'> 				urb-&gt;actual_length, urb-&gt;transfer_buffer);</div><div class='ctx'> </div><div class='del'>-	tty = port-&gt;port.tty;</div><div class='add'>+	tty = tty_port_tty_get(&amp;port-&gt;port);</div><div class='ctx'> 	if (tty &amp;&amp; urb-&gt;actual_length) {</div><div class='ctx'> 		if (urb-&gt;actual_length &lt;= 2) {</div><div class='ctx'> 			/* This is an incomplete package */</div><div class='hunk'>@@ -527,6 +529,7 @@ static void aircable_read_bulk_callback(struct urb *urb)</div><div class='ctx'> 		}</div><div class='ctx'> 		aircable_read(&amp;priv-&gt;rx_work);</div><div class='ctx'> 	}</div><div class='add'>+	tty_kref_put(tty);</div><div class='ctx'> </div><div class='ctx'> 	/* Schedule the next read _if_ we are still open */</div><div class='ctx'> 	if (port-&gt;port.count) {</div><div class='head'>diff --git a/drivers/usb/serial/belkin_sa.c b/drivers/usb/serial/belkin_sa.c<br/>index 2ebe06c3405a..b7eacad4d48c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/belkin_sa.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/serial/belkin_sa.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/belkin_sa.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/belkin_sa.c</a></div><div class='hunk'>@@ -187,7 +187,7 @@ static int belkin_sa_startup(struct usb_serial *serial)</div><div class='ctx'> 	/* see comments at top of file */</div><div class='ctx'> 	priv-&gt;bad_flow_control =</div><div class='ctx'> 		(le16_to_cpu(dev-&gt;descriptor.bcdDevice) &lt;= 0x0206) ? 1 : 0;</div><div class='del'>-	info("bcdDevice: %04x, bfc: %d",</div><div class='add'>+	dev_info(&amp;dev-&gt;dev, "bcdDevice: %04x, bfc: %d\n",</div><div class='ctx'> 					le16_to_cpu(dev-&gt;descriptor.bcdDevice),</div><div class='ctx'> 					priv-&gt;bad_flow_control);</div><div class='ctx'> </div><div class='hunk'>@@ -228,7 +228,7 @@ static int  belkin_sa_open(struct tty_struct *tty,</div><div class='ctx'> 	port-&gt;read_urb-&gt;dev = port-&gt;serial-&gt;dev;</div><div class='ctx'> 	retval = usb_submit_urb(port-&gt;read_urb, GFP_KERNEL);</div><div class='ctx'> 	if (retval) {</div><div class='del'>-		err("usb_submit_urb(read bulk) failed");</div><div class='add'>+		dev_err(&amp;port-&gt;dev, "usb_submit_urb(read bulk) failed\n");</div><div class='ctx'> 		goto exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -236,7 +236,7 @@ static int  belkin_sa_open(struct tty_struct *tty,</div><div class='ctx'> 	retval = usb_submit_urb(port-&gt;interrupt_in_urb, GFP_KERNEL);</div><div class='ctx'> 	if (retval) {</div><div class='ctx'> 		usb_kill_urb(port-&gt;read_urb);</div><div class='del'>-		err(" usb_submit_urb(read int) failed");</div><div class='add'>+		dev_err(&amp;port-&gt;dev, "usb_submit_urb(read int) failed\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> exit:</div><div class='hunk'>@@ -322,7 +322,7 @@ static void belkin_sa_read_int_callback(struct urb *urb)</div><div class='ctx'> 	 * to look in to this before committing any code.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (priv-&gt;last_lsr &amp; BELKIN_SA_LSR_ERR) {</div><div class='del'>-		tty = port-&gt;port.tty;</div><div class='add'>+		tty = tty_port_tty_get(&amp;port-&gt;port);</div><div class='ctx'> 		/* Overrun Error */</div><div class='ctx'> 		if (priv-&gt;last_lsr &amp; BELKIN_SA_LSR_OE) {</div><div class='ctx'> 		}</div><div class='hunk'>@@ -335,14 +335,15 @@ static void belkin_sa_read_int_callback(struct urb *urb)</div><div class='ctx'> 		/* Break Indicator */</div><div class='ctx'> 		if (priv-&gt;last_lsr &amp; BELKIN_SA_LSR_BI) {</div><div class='ctx'> 		}</div><div class='add'>+		tty_kref_put(tty);</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='ctx'> exit:</div><div class='ctx'> 	retval = usb_submit_urb(urb, GFP_ATOMIC);</div><div class='ctx'> 	if (retval)</div><div class='del'>-		err("%s - usb_submit_urb failed with result %d",</div><div class='del'>-		     __func__, retval);</div><div class='add'>+		dev_err(&amp;port-&gt;dev, "%s - usb_submit_urb failed with "</div><div class='add'>+			"result %d\n", __func__, retval);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void belkin_sa_set_termios(struct tty_struct *tty,</div><div class='hunk'>@@ -381,12 +382,12 @@ static void belkin_sa_set_termios(struct tty_struct *tty,</div><div class='ctx'> 		if ((old_cflag &amp; CBAUD) == B0) {</div><div class='ctx'> 			control_state |= (TIOCM_DTR|TIOCM_RTS);</div><div class='ctx'> 			if (BSA_USB_CMD(BELKIN_SA_SET_DTR_REQUEST, 1) &lt; 0)</div><div class='del'>-				err("Set DTR error");</div><div class='add'>+				dev_err(&amp;port-&gt;dev, "Set DTR error\n");</div><div class='ctx'> 			/* don't set RTS if using hardware flow control */</div><div class='ctx'> 			if (!(old_cflag &amp; CRTSCTS))</div><div class='ctx'> 				if (BSA_USB_CMD(BELKIN_SA_SET_RTS_REQUEST</div><div class='ctx'> 								, 1) &lt; 0)</div><div class='del'>-					err("Set RTS error");</div><div class='add'>+					dev_err(&amp;port-&gt;dev, "Set RTS error\n");</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -402,18 +403,18 @@ static void belkin_sa_set_termios(struct tty_struct *tty,</div><div class='ctx'> 		/* Report the actual baud rate back to the caller */</div><div class='ctx'> 		tty_encode_baud_rate(tty, baud, baud);</div><div class='ctx'> 		if (BSA_USB_CMD(BELKIN_SA_SET_BAUDRATE_REQUEST, urb_value) &lt; 0)</div><div class='del'>-			err("Set baudrate error");</div><div class='add'>+			dev_err(&amp;port-&gt;dev, "Set baudrate error\n");</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* Disable flow control */</div><div class='ctx'> 		if (BSA_USB_CMD(BELKIN_SA_SET_FLOW_CTRL_REQUEST,</div><div class='ctx'> 						BELKIN_SA_FLOW_NONE) &lt; 0)</div><div class='del'>-			err("Disable flowcontrol error");</div><div class='add'>+			dev_err(&amp;port-&gt;dev, "Disable flowcontrol error\n");</div><div class='ctx'> 		/* Drop RTS and DTR */</div><div class='ctx'> 		control_state &amp;= ~(TIOCM_DTR | TIOCM_RTS);</div><div class='ctx'> 		if (BSA_USB_CMD(BELKIN_SA_SET_DTR_REQUEST, 0) &lt; 0)</div><div class='del'>-			err("DTR LOW error");</div><div class='add'>+			dev_err(&amp;port-&gt;dev, "DTR LOW error\n");</div><div class='ctx'> 		if (BSA_USB_CMD(BELKIN_SA_SET_RTS_REQUEST, 0) &lt; 0)</div><div class='del'>-			err("RTS LOW error");</div><div class='add'>+			dev_err(&amp;port-&gt;dev, "RTS LOW error\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* set the parity */</div><div class='hunk'>@@ -424,7 +425,7 @@ static void belkin_sa_set_termios(struct tty_struct *tty,</div><div class='ctx'> 		else</div><div class='ctx'> 			urb_value = BELKIN_SA_PARITY_NONE;</div><div class='ctx'> 		if (BSA_USB_CMD(BELKIN_SA_SET_PARITY_REQUEST, urb_value) &lt; 0)</div><div class='del'>-			err("Set parity error");</div><div class='add'>+			dev_err(&amp;port-&gt;dev, "Set parity error\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* set the number of data bits */</div><div class='hunk'>@@ -447,7 +448,7 @@ static void belkin_sa_set_termios(struct tty_struct *tty,</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (BSA_USB_CMD(BELKIN_SA_SET_DATA_BITS_REQUEST, urb_value) &lt; 0)</div><div class='del'>-			err("Set data bits error");</div><div class='add'>+			dev_err(&amp;port-&gt;dev, "Set data bits error\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* set the number of stop bits */</div><div class='hunk'>@@ -456,7 +457,7 @@ static void belkin_sa_set_termios(struct tty_struct *tty,</div><div class='ctx'> 						: BELKIN_SA_STOP_BITS(1);</div><div class='ctx'> 		if (BSA_USB_CMD(BELKIN_SA_SET_STOP_BITS_REQUEST,</div><div class='ctx'> 							urb_value) &lt; 0)</div><div class='del'>-			err("Set stop bits error");</div><div class='add'>+			dev_err(&amp;port-&gt;dev, "Set stop bits error\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Set flow control */</div><div class='hunk'>@@ -477,7 +478,7 @@ static void belkin_sa_set_termios(struct tty_struct *tty,</div><div class='ctx'> 			urb_value &amp;= ~(BELKIN_SA_FLOW_IRTS);</div><div class='ctx'> </div><div class='ctx'> 		if (BSA_USB_CMD(BELKIN_SA_SET_FLOW_CTRL_REQUEST, urb_value) &lt; 0)</div><div class='del'>-			err("Set flow control error");</div><div class='add'>+			dev_err(&amp;port-&gt;dev, "Set flow control error\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* save off the modified port settings */</div><div class='hunk'>@@ -493,7 +494,7 @@ static void belkin_sa_break_ctl(struct tty_struct *tty, int break_state)</div><div class='ctx'> 	struct usb_serial *serial = port-&gt;serial;</div><div class='ctx'> </div><div class='ctx'> 	if (BSA_USB_CMD(BELKIN_SA_SET_BREAK_REQUEST, break_state ? 1 : 0) &lt; 0)</div><div class='del'>-		err("Set break_ctl %d", break_state);</div><div class='add'>+		dev_err(&amp;port-&gt;dev, "Set break_ctl %d\n", break_state);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -553,13 +554,13 @@ static int belkin_sa_tiocmset(struct tty_struct *tty, struct file *file,</div><div class='ctx'> </div><div class='ctx'> 	retval = BSA_USB_CMD(BELKIN_SA_SET_RTS_REQUEST, rts);</div><div class='ctx'> 	if (retval &lt; 0) {</div><div class='del'>-		err("Set RTS error %d", retval);</div><div class='add'>+		dev_err(&amp;port-&gt;dev, "Set RTS error %d\n", retval);</div><div class='ctx'> 		goto exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	retval = BSA_USB_CMD(BELKIN_SA_SET_DTR_REQUEST, dtr);</div><div class='ctx'> 	if (retval &lt; 0) {</div><div class='del'>-		err("Set DTR error %d", retval);</div><div class='add'>+		dev_err(&amp;port-&gt;dev, "Set DTR error %d\n", retval);</div><div class='ctx'> 		goto exit;</div><div class='ctx'> 	}</div><div class='ctx'> exit:</div><div class='hunk'>@@ -576,7 +577,8 @@ static int __init belkin_sa_init(void)</div><div class='ctx'> 	retval = usb_register(&amp;belkin_driver);</div><div class='ctx'> 	if (retval)</div><div class='ctx'> 		goto failed_usb_register;</div><div class='del'>-	info(DRIVER_DESC " " DRIVER_VERSION);</div><div class='add'>+	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"</div><div class='add'>+	       DRIVER_DESC "\n");</div><div class='ctx'> 	return 0;</div><div class='ctx'> failed_usb_register:</div><div class='ctx'> 	usb_serial_deregister(&amp;belkin_device);</div><div class='head'>diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c<br/>index e980766bb84b..5b20de130e08 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/console.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/serial/console.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/console.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/console.c</a></div><div class='hunk'>@@ -117,7 +117,7 @@ static int usb_console_setup(struct console *co, char *options)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	port = serial-&gt;port[0];</div><div class='del'>-	port-&gt;port.tty = NULL;</div><div class='add'>+	tty_port_tty_set(&amp;port-&gt;port, NULL);</div><div class='ctx'> </div><div class='ctx'> 	info-&gt;port = port;</div><div class='ctx'> </div><div class='hunk'>@@ -143,7 +143,7 @@ static int usb_console_setup(struct console *co, char *options)</div><div class='ctx'> 			}</div><div class='ctx'> 			memset(&amp;dummy, 0, sizeof(struct ktermios));</div><div class='ctx'> 			tty-&gt;termios = termios;</div><div class='del'>-			port-&gt;port.tty = tty;</div><div class='add'>+			tty_port_tty_set(&amp;port-&gt;port, tty);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* only call the device specific open if this</div><div class='hunk'>@@ -163,7 +163,7 @@ static int usb_console_setup(struct console *co, char *options)</div><div class='ctx'> 			tty_termios_encode_baud_rate(termios, baud, baud);</div><div class='ctx'> 			serial-&gt;type-&gt;set_termios(tty, port, &amp;dummy);</div><div class='ctx'> </div><div class='del'>-			port-&gt;port.tty = NULL;</div><div class='add'>+			tty_port_tty_set(&amp;port-&gt;port, NULL);</div><div class='ctx'> 			kfree(termios);</div><div class='ctx'> 			kfree(tty);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -176,7 +176,7 @@ out:</div><div class='ctx'> 	return retval;</div><div class='ctx'> free_termios:</div><div class='ctx'> 	kfree(termios);</div><div class='del'>-	port-&gt;port.tty = NULL;</div><div class='add'>+	tty_port_tty_set(&amp;port-&gt;port, NULL);</div><div class='ctx'> free_tty:</div><div class='ctx'> 	kfree(tty);</div><div class='ctx'> reset_open_count:</div><div class='head'>diff --git a/drivers/usb/serial/cp2101.c b/drivers/usb/serial/cp2101.c<br/>index 1279553381e3..8008d0bc80ad 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/cp2101.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/serial/cp2101.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/cp2101.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/cp2101.c</a></div><div class='hunk'>@@ -753,7 +753,8 @@ static int __init cp2101_init(void)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Success */</div><div class='del'>-	info(DRIVER_DESC " " DRIVER_VERSION);</div><div class='add'>+	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"</div><div class='add'>+	       DRIVER_DESC "\n");</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/usb/serial/cyberjack.c b/drivers/usb/serial/cyberjack.c<br/>index b4d72351cb96..858bdd038fbc 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/cyberjack.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/serial/cyberjack.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/cyberjack.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/cyberjack.c</a></div><div class='hunk'>@@ -141,7 +141,8 @@ static int cyberjack_startup(struct usb_serial *serial)</div><div class='ctx'> 		result = usb_submit_urb(serial-&gt;port[i]-&gt;interrupt_in_urb,</div><div class='ctx'> 					GFP_KERNEL);</div><div class='ctx'> 		if (result)</div><div class='del'>-			err(" usb_submit_urb(read int) failed");</div><div class='add'>+			dev_err(&amp;serial-&gt;dev-&gt;dev,</div><div class='add'>+				"usb_submit_urb(read int) failed\n");</div><div class='ctx'> 		dbg("%s - usb_submit_urb(int urb)", __func__);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -274,8 +275,9 @@ static int cyberjack_write(struct tty_struct *tty,</div><div class='ctx'> 		/* send the data out the bulk port */</div><div class='ctx'> 		result = usb_submit_urb(port-&gt;write_urb, GFP_ATOMIC);</div><div class='ctx'> 		if (result) {</div><div class='del'>-			err("%s - failed submitting write urb, error %d",</div><div class='del'>-							__func__, result);</div><div class='add'>+			dev_err(&amp;port-&gt;dev,</div><div class='add'>+				"%s - failed submitting write urb, error %d",</div><div class='add'>+				__func__, result);</div><div class='ctx'> 			/* Throw away data. No better idea what to do with it. */</div><div class='ctx'> 			priv-&gt;wrfilled = 0;</div><div class='ctx'> 			priv-&gt;wrsent = 0;</div><div class='hunk'>@@ -351,7 +353,9 @@ static void cyberjack_read_int_callback(struct urb *urb)</div><div class='ctx'> 			port-&gt;read_urb-&gt;dev = port-&gt;serial-&gt;dev;</div><div class='ctx'> 			result = usb_submit_urb(port-&gt;read_urb, GFP_ATOMIC);</div><div class='ctx'> 			if (result)</div><div class='del'>-				err("%s - failed resubmitting read urb, error %d", __func__, result);</div><div class='add'>+				dev_err(&amp;port-&gt;dev, "%s - failed resubmitting "</div><div class='add'>+					"read urb, error %d\n",</div><div class='add'>+					__func__, result);</div><div class='ctx'> 			dbg("%s - usb_submit_urb(read urb)", __func__);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -360,7 +364,7 @@ resubmit:</div><div class='ctx'> 	port-&gt;interrupt_in_urb-&gt;dev = port-&gt;serial-&gt;dev;</div><div class='ctx'> 	result = usb_submit_urb(port-&gt;interrupt_in_urb, GFP_ATOMIC);</div><div class='ctx'> 	if (result)</div><div class='del'>-		err(" usb_submit_urb(read int) failed");</div><div class='add'>+		dev_err(&amp;port-&gt;dev, "usb_submit_urb(read int) failed\n");</div><div class='ctx'> 	dbg("%s - usb_submit_urb(int urb)", __func__);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -384,7 +388,7 @@ static void cyberjack_read_bulk_callback(struct urb *urb)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	tty = port-&gt;port.tty;</div><div class='add'>+	tty = tty_port_tty_get(&amp;port-&gt;port);</div><div class='ctx'> 	if (!tty) {</div><div class='ctx'> 		dbg("%s - ignoring since device not open\n", __func__);</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -394,6 +398,7 @@ static void cyberjack_read_bulk_callback(struct urb *urb)</div><div class='ctx'> 		tty_insert_flip_string(tty, data, urb-&gt;actual_length);</div><div class='ctx'> 		tty_flip_buffer_push(tty);</div><div class='ctx'> 	}</div><div class='add'>+	tty_kref_put(tty);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;priv-&gt;lock);</div><div class='ctx'> </div><div class='hunk'>@@ -413,8 +418,8 @@ static void cyberjack_read_bulk_callback(struct urb *urb)</div><div class='ctx'> 		port-&gt;read_urb-&gt;dev = port-&gt;serial-&gt;dev;</div><div class='ctx'> 		result = usb_submit_urb(port-&gt;read_urb, GFP_ATOMIC);</div><div class='ctx'> 		if (result)</div><div class='del'>-			err("%s - failed resubmitting read urb, error %d",</div><div class='del'>-				__func__, result);</div><div class='add'>+			dev_err(&amp;port-&gt;dev, "%s - failed resubmitting read "</div><div class='add'>+				"urb, error %d\n", __func__, result);</div><div class='ctx'> 		dbg("%s - usb_submit_urb(read urb)", __func__);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -461,8 +466,9 @@ static void cyberjack_write_bulk_callback(struct urb *urb)</div><div class='ctx'> 		/* send the data out the bulk port */</div><div class='ctx'> 		result = usb_submit_urb(port-&gt;write_urb, GFP_ATOMIC);</div><div class='ctx'> 		if (result) {</div><div class='del'>-			err("%s - failed submitting write urb, error %d",</div><div class='del'>-								__func__, result);</div><div class='add'>+			dev_err(&amp;port-&gt;dev,</div><div class='add'>+				"%s - failed submitting write urb, error %d\n",</div><div class='add'>+				__func__, result);</div><div class='ctx'> 			/* Throw away data. No better idea what to do with it. */</div><div class='ctx'> 			priv-&gt;wrfilled = 0;</div><div class='ctx'> 			priv-&gt;wrsent = 0;</div><div class='hunk'>@@ -498,8 +504,9 @@ static int __init cyberjack_init(void)</div><div class='ctx'> 	if (retval)</div><div class='ctx'> 		goto failed_usb_register;</div><div class='ctx'> </div><div class='del'>-	info(DRIVER_VERSION " " DRIVER_AUTHOR);</div><div class='del'>-	info(DRIVER_DESC);</div><div class='add'>+	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION " "</div><div class='add'>+	       DRIVER_AUTHOR "\n");</div><div class='add'>+	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_DESC "\n");</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> failed_usb_register:</div><div class='head'>diff --git a/drivers/usb/serial/cypress_m8.c b/drivers/usb/serial/cypress_m8.c<br/>index 22837a3f2f89..eae4740d448c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/cypress_m8.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/serial/cypress_m8.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/cypress_m8.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/cypress_m8.c</a></div><div class='hunk'>@@ -404,8 +404,8 @@ static int cypress_serial_control(struct tty_struct *tty,</div><div class='ctx'> 			 retval != -ENODEV);</div><div class='ctx'> </div><div class='ctx'> 		if (retval != sizeof(feature_buffer)) {</div><div class='del'>-			err("%s - failed sending serial line settings - %d",</div><div class='del'>-							__func__, retval);</div><div class='add'>+			dev_err(&amp;port-&gt;dev, "%s - failed sending serial "</div><div class='add'>+				"line settings - %d\n", __func__, retval);</div><div class='ctx'> 			cypress_set_dead(port);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='hunk'>@@ -443,7 +443,8 @@ static int cypress_serial_control(struct tty_struct *tty,</div><div class='ctx'> 						&amp;&amp; retval != -ENODEV);</div><div class='ctx'> </div><div class='ctx'> 		if (retval != sizeof(feature_buffer)) {</div><div class='del'>-			err("%s - failed to retrieve serial line settings - %d", __func__, retval);</div><div class='add'>+			dev_err(&amp;port-&gt;dev, "%s - failed to retrieve serial "</div><div class='add'>+				"line settings - %d\n", __func__, retval);</div><div class='ctx'> 			cypress_set_dead(port);</div><div class='ctx'> 			return retval;</div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -476,8 +477,8 @@ static void cypress_set_dead(struct usb_serial_port *port)</div><div class='ctx'> 	priv-&gt;comm_is_ok = 0;</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-	err("cypress_m8 suspending failing port %d - interval might be too short",</div><div class='del'>-	    port-&gt;number);</div><div class='add'>+	dev_err(&amp;port-&gt;dev, "cypress_m8 suspending failing port %d - "</div><div class='add'>+		"interval might be too short\n", port-&gt;number);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -679,7 +680,8 @@ static int cypress_open(struct tty_struct *tty,</div><div class='ctx'> </div><div class='ctx'> 	/* setup the port and start reading from the device */</div><div class='ctx'> 	if (!port-&gt;interrupt_in_urb) {</div><div class='del'>-		err("%s - interrupt_in_urb is empty!", __func__);</div><div class='add'>+		dev_err(&amp;port-&gt;dev, "%s - interrupt_in_urb is empty!\n",</div><div class='add'>+			__func__);</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1107,8 +1109,8 @@ static void cypress_set_termios(struct tty_struct *tty,</div><div class='ctx'> 		data_bits = 3;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		err("%s - CSIZE was set, but not CS5-CS8",</div><div class='del'>-				__func__);</div><div class='add'>+		dev_err(&amp;port-&gt;dev, "%s - CSIZE was set, but not CS5-CS8\n",</div><div class='add'>+			__func__);</div><div class='ctx'> 		data_bits = 3;</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='hunk'>@@ -1286,7 +1288,7 @@ static void cypress_read_int_callback(struct urb *urb)</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-	tty = port-&gt;port.tty;</div><div class='add'>+	tty = tty_port_tty_get(&amp;port-&gt;port);</div><div class='ctx'> 	if (!tty) {</div><div class='ctx'> 		dbg("%s - bad tty pointer - exiting", __func__);</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -1362,7 +1364,7 @@ static void cypress_read_int_callback(struct urb *urb)</div><div class='ctx'> 					data[i]);</div><div class='ctx'> 			tty_insert_flip_char(tty, data[i], tty_flag);</div><div class='ctx'> 		}</div><div class='del'>-		tty_flip_buffer_push(port-&gt;port.tty);</div><div class='add'>+		tty_flip_buffer_push(tty);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='hunk'>@@ -1371,6 +1373,7 @@ static void cypress_read_int_callback(struct urb *urb)</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> continue_read:</div><div class='add'>+	tty_kref_put(tty);</div><div class='ctx'> </div><div class='ctx'> 	/* Continue trying to always read... unless the port has closed. */</div><div class='ctx'> </div><div class='hunk'>@@ -1657,7 +1660,8 @@ static int __init cypress_init(void)</div><div class='ctx'> 	if (retval)</div><div class='ctx'> 		goto failed_usb_register;</div><div class='ctx'> </div><div class='del'>-	info(DRIVER_DESC " " DRIVER_VERSION);</div><div class='add'>+	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"</div><div class='add'>+	       DRIVER_DESC "\n");</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> failed_usb_register:</div><div class='head'>diff --git a/drivers/usb/serial/digi_acceleport.c b/drivers/usb/serial/digi_acceleport.c<br/>index 240aad1acaab..69f84f0ea6fe 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/digi_acceleport.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/serial/digi_acceleport.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/digi_acceleport.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/digi_acceleport.c</a></div><div class='hunk'>@@ -604,7 +604,9 @@ static void digi_wakeup_write_lock(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> static void digi_wakeup_write(struct usb_serial_port *port)</div><div class='ctx'> {</div><div class='del'>-	tty_wakeup(port-&gt;port.tty);</div><div class='add'>+	struct tty_struct *tty = tty_port_tty_get(&amp;port-&gt;port);</div><div class='add'>+	tty_wakeup(tty);</div><div class='add'>+	tty_kref_put(tty);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -659,7 +661,8 @@ static int digi_write_oob_command(struct usb_serial_port *port,</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;oob_priv-&gt;dp_port_lock, flags);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		err("%s: usb_submit_urb failed, ret=%d", __func__, ret);</div><div class='add'>+		dev_err(&amp;port-&gt;dev, "%s: usb_submit_urb failed, ret=%d\n",</div><div class='add'>+			__func__, ret);</div><div class='ctx'> 	return ret;</div><div class='ctx'> </div><div class='ctx'> }</div><div class='hunk'>@@ -741,7 +744,8 @@ static int digi_write_inb_command(struct usb_serial_port *port,</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;priv-&gt;dp_port_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	if (ret)</div><div class='del'>-		err("%s: usb_submit_urb failed, ret=%d, port=%d",</div><div class='add'>+		dev_err(&amp;port-&gt;dev,</div><div class='add'>+			"%s: usb_submit_urb failed, ret=%d, port=%d\n",</div><div class='ctx'> 			__func__, ret, priv-&gt;dp_port_num);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -810,7 +814,8 @@ static int digi_set_modem_signals(struct usb_serial_port *port,</div><div class='ctx'> 	spin_unlock(&amp;port_priv-&gt;dp_port_lock);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;oob_priv-&gt;dp_port_lock, flags);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		err("%s: usb_submit_urb failed, ret=%d", __func__, ret);</div><div class='add'>+		dev_err(&amp;port-&gt;dev, "%s: usb_submit_urb failed, ret=%d\n",</div><div class='add'>+			__func__, ret);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -905,7 +910,8 @@ static void digi_rx_unthrottle(struct tty_struct *tty)</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;priv-&gt;dp_port_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	if (ret)</div><div class='del'>-		err("%s: usb_submit_urb failed, ret=%d, port=%d",</div><div class='add'>+		dev_err(&amp;port-&gt;dev,</div><div class='add'>+			"%s: usb_submit_urb failed, ret=%d, port=%d\n",</div><div class='ctx'> 			__func__, ret, priv-&gt;dp_port_num);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1212,7 +1218,8 @@ static int digi_write(struct tty_struct *tty, struct usb_serial_port *port,</div><div class='ctx'> 	/* return length of new data written, or error */</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;priv-&gt;dp_port_lock, flags);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		err("%s: usb_submit_urb failed, ret=%d, port=%d",</div><div class='add'>+		dev_err(&amp;port-&gt;dev,</div><div class='add'>+			"%s: usb_submit_urb failed, ret=%d, port=%d\n",</div><div class='ctx'> 			__func__, ret, priv-&gt;dp_port_num);</div><div class='ctx'> 	dbg("digi_write: returning %d", ret);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -1233,14 +1240,16 @@ static void digi_write_bulk_callback(struct urb *urb)</div><div class='ctx'> </div><div class='ctx'> 	/* port and serial sanity check */</div><div class='ctx'> 	if (port == NULL || (priv = usb_get_serial_port_data(port)) == NULL) {</div><div class='del'>-		err("%s: port or port-&gt;private is NULL, status=%d",</div><div class='del'>-		    __func__, status);</div><div class='add'>+		dev_err(&amp;port-&gt;dev,</div><div class='add'>+			"%s: port or port-&gt;private is NULL, status=%d\n",</div><div class='add'>+			__func__, status);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	serial = port-&gt;serial;</div><div class='ctx'> 	if (serial == NULL || (serial_priv = usb_get_serial_data(serial)) == NULL) {</div><div class='del'>-		err("%s: serial or serial-&gt;private is NULL, status=%d",</div><div class='del'>-		    __func__, status);</div><div class='add'>+		dev_err(&amp;port-&gt;dev,</div><div class='add'>+			"%s: serial or serial-&gt;private is NULL, status=%d\n",</div><div class='add'>+			__func__, status);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1282,7 +1291,8 @@ static void digi_write_bulk_callback(struct urb *urb)</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock(&amp;priv-&gt;dp_port_lock);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		err("%s: usb_submit_urb failed, ret=%d, port=%d",</div><div class='add'>+		dev_err(&amp;port-&gt;dev,</div><div class='add'>+			"%s: usb_submit_urb failed, ret=%d, port=%d\n",</div><div class='ctx'> 			__func__, ret, priv-&gt;dp_port_num);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1516,8 +1526,9 @@ static int digi_startup_device(struct usb_serial *serial)</div><div class='ctx'> 		port-&gt;write_urb-&gt;dev = port-&gt;serial-&gt;dev;</div><div class='ctx'> 		ret = usb_submit_urb(port-&gt;read_urb, GFP_KERNEL);</div><div class='ctx'> 		if (ret != 0) {</div><div class='del'>-			err("%s: usb_submit_urb failed, ret=%d, port=%d",</div><div class='del'>-					__func__, ret, i);</div><div class='add'>+			dev_err(&amp;port-&gt;dev,</div><div class='add'>+				"%s: usb_submit_urb failed, ret=%d, port=%d\n",</div><div class='add'>+				__func__, ret, i);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1616,22 +1627,26 @@ static void digi_read_bulk_callback(struct urb *urb)</div><div class='ctx'> 	dbg("digi_read_bulk_callback: TOP");</div><div class='ctx'> </div><div class='ctx'> 	/* port sanity check, do not resubmit if port is not valid */</div><div class='del'>-	if (port == NULL || (priv = usb_get_serial_port_data(port)) == NULL) {</div><div class='del'>-		err("%s: port or port-&gt;private is NULL, status=%d",</div><div class='del'>-		    __func__, status);</div><div class='add'>+	if (port == NULL)</div><div class='add'>+		return;</div><div class='add'>+	priv = usb_get_serial_port_data(port);</div><div class='add'>+	if (priv == NULL) {</div><div class='add'>+		dev_err(&amp;port-&gt;dev, "%s: port-&gt;private is NULL, status=%d\n",</div><div class='add'>+			__func__, status);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (port-&gt;serial == NULL ||</div><div class='ctx'> 		(serial_priv = usb_get_serial_data(port-&gt;serial)) == NULL) {</div><div class='del'>-		err("%s: serial is bad or serial-&gt;private is NULL, status=%d",</div><div class='del'>-			__func__, status);</div><div class='add'>+		dev_err(&amp;port-&gt;dev, "%s: serial is bad or serial-&gt;private "</div><div class='add'>+			"is NULL, status=%d\n", __func__, status);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* do not resubmit urb if it has any status error */</div><div class='ctx'> 	if (status) {</div><div class='del'>-		err("%s: nonzero read bulk status: status=%d, port=%d",</div><div class='del'>-		    __func__, status, priv-&gt;dp_port_num);</div><div class='add'>+		dev_err(&amp;port-&gt;dev,</div><div class='add'>+			"%s: nonzero read bulk status: status=%d, port=%d\n",</div><div class='add'>+			__func__, status, priv-&gt;dp_port_num);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1648,8 +1663,9 @@ static void digi_read_bulk_callback(struct urb *urb)</div><div class='ctx'> 	urb-&gt;dev = port-&gt;serial-&gt;dev;</div><div class='ctx'> 	ret = usb_submit_urb(urb, GFP_ATOMIC);</div><div class='ctx'> 	if (ret != 0) {</div><div class='del'>-		err("%s: failed resubmitting urb, ret=%d, port=%d",</div><div class='del'>-		    __func__, ret, priv-&gt;dp_port_num);</div><div class='add'>+		dev_err(&amp;port-&gt;dev,</div><div class='add'>+			"%s: failed resubmitting urb, ret=%d, port=%d\n",</div><div class='add'>+			__func__, ret, priv-&gt;dp_port_num);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> }</div><div class='hunk'>@@ -1668,7 +1684,7 @@ static int digi_read_inb_callback(struct urb *urb)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='ctx'> 	struct usb_serial_port *port = urb-&gt;context;</div><div class='del'>-	struct tty_struct *tty = port-&gt;port.tty;</div><div class='add'>+	struct tty_struct *tty;</div><div class='ctx'> 	struct digi_port *priv = usb_get_serial_port_data(port);</div><div class='ctx'> 	int opcode = ((unsigned char *)urb-&gt;transfer_buffer)[0];</div><div class='ctx'> 	int len = ((unsigned char *)urb-&gt;transfer_buffer)[1];</div><div class='hunk'>@@ -1685,13 +1701,15 @@ static int digi_read_inb_callback(struct urb *urb)</div><div class='ctx'> </div><div class='ctx'> 	/* short/multiple packet check */</div><div class='ctx'> 	if (urb-&gt;actual_length != len + 2) {</div><div class='del'>-		err("%s: INCOMPLETE OR MULTIPLE PACKET, urb-&gt;status=%d, "</div><div class='del'>-		    "port=%d, opcode=%d, len=%d, actual_length=%d, "</div><div class='del'>-		    "status=%d", __func__, status, priv-&gt;dp_port_num,</div><div class='del'>-		    opcode, len, urb-&gt;actual_length, port_status);</div><div class='add'>+		dev_err(&amp;port-&gt;dev, "%s: INCOMPLETE OR MULTIPLE PACKET, "</div><div class='add'>+			"urb-&gt;status=%d, port=%d, opcode=%d, len=%d, "</div><div class='add'>+			"actual_length=%d, status=%d\n", __func__, status,</div><div class='add'>+			priv-&gt;dp_port_num, opcode, len, urb-&gt;actual_length,</div><div class='add'>+			port_status);</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	tty = tty_port_tty_get(&amp;port-&gt;port);</div><div class='ctx'> 	spin_lock(&amp;priv-&gt;dp_port_lock);</div><div class='ctx'> </div><div class='ctx'> 	/* check for throttle; if set, do not resubmit read urb */</div><div class='hunk'>@@ -1735,6 +1753,7 @@ static int digi_read_inb_callback(struct urb *urb)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock(&amp;priv-&gt;dp_port_lock);</div><div class='add'>+	tty_kref_put(tty);</div><div class='ctx'> </div><div class='ctx'> 	if (opcode == DIGI_CMD_RECEIVE_DISABLE)</div><div class='ctx'> 		dbg("%s: got RECEIVE_DISABLE", __func__);</div><div class='hunk'>@@ -1760,6 +1779,7 @@ static int digi_read_oob_callback(struct urb *urb)</div><div class='ctx'> </div><div class='ctx'> 	struct usb_serial_port *port = urb-&gt;context;</div><div class='ctx'> 	struct usb_serial *serial = port-&gt;serial;</div><div class='add'>+	struct tty_struct *tty;</div><div class='ctx'> 	struct digi_port *priv = usb_get_serial_port_data(port);</div><div class='ctx'> 	int opcode, line, status, val;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -1787,10 +1807,11 @@ static int digi_read_oob_callback(struct urb *urb)</div><div class='ctx'> 		if (priv == NULL)</div><div class='ctx'> 			return -1;</div><div class='ctx'> </div><div class='add'>+		tty = tty_port_tty_get(&amp;port-&gt;port);</div><div class='ctx'> 		rts = 0;</div><div class='ctx'> 		if (port-&gt;port.count)</div><div class='del'>-			rts = port-&gt;port.tty-&gt;termios-&gt;c_cflag &amp; CRTSCTS;</div><div class='del'>-</div><div class='add'>+			rts = tty-&gt;termios-&gt;c_cflag &amp; CRTSCTS;</div><div class='add'>+		</div><div class='ctx'> 		if (opcode == DIGI_CMD_READ_INPUT_SIGNALS) {</div><div class='ctx'> 			spin_lock(&amp;priv-&gt;dp_port_lock);</div><div class='ctx'> 			/* convert from digi flags to termiox flags */</div><div class='hunk'>@@ -1798,14 +1819,14 @@ static int digi_read_oob_callback(struct urb *urb)</div><div class='ctx'> 				priv-&gt;dp_modem_signals |= TIOCM_CTS;</div><div class='ctx'> 				/* port must be open to use tty struct */</div><div class='ctx'> 				if (rts) {</div><div class='del'>-					port-&gt;port.tty-&gt;hw_stopped = 0;</div><div class='add'>+					tty-&gt;hw_stopped = 0;</div><div class='ctx'> 					digi_wakeup_write(port);</div><div class='ctx'> 				}</div><div class='ctx'> 			} else {</div><div class='ctx'> 				priv-&gt;dp_modem_signals &amp;= ~TIOCM_CTS;</div><div class='ctx'> 				/* port must be open to use tty struct */</div><div class='ctx'> 				if (rts)</div><div class='del'>-					port-&gt;port.tty-&gt;hw_stopped = 1;</div><div class='add'>+					tty-&gt;hw_stopped = 1;</div><div class='ctx'> 			}</div><div class='ctx'> 			if (val &amp; DIGI_READ_INPUT_SIGNALS_DSR)</div><div class='ctx'> 				priv-&gt;dp_modem_signals |= TIOCM_DSR;</div><div class='hunk'>@@ -1830,6 +1851,7 @@ static int digi_read_oob_callback(struct urb *urb)</div><div class='ctx'> 		} else if (opcode == DIGI_CMD_IFLUSH_FIFO) {</div><div class='ctx'> 			wake_up_interruptible(&amp;priv-&gt;dp_flush_wait);</div><div class='ctx'> 		}</div><div class='add'>+		tty_kref_put(tty);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1847,7 +1869,8 @@ static int __init digi_init(void)</div><div class='ctx'> 	retval = usb_register(&amp;digi_driver);</div><div class='ctx'> 	if (retval)</div><div class='ctx'> 		goto failed_usb_register;</div><div class='del'>-	info(DRIVER_VERSION ":" DRIVER_DESC);</div><div class='add'>+	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"</div><div class='add'>+	       DRIVER_DESC "\n");</div><div class='ctx'> 	return 0;</div><div class='ctx'> failed_usb_register:</div><div class='ctx'> 	usb_serial_deregister(&amp;digi_acceleport_4_device);</div><div class='head'>diff --git a/drivers/usb/serial/empeg.c b/drivers/usb/serial/empeg.c<br/>index a6ab5b58d9ca..8a69cce40b6d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/empeg.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/serial/empeg.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/empeg.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/empeg.c</a></div><div class='hunk'>@@ -33,9 +33,8 @@</div><div class='ctx'>  *	Moved MOD_DEC_USE_COUNT to end of empeg_close().</div><div class='ctx'>  *</div><div class='ctx'>  * (12/03/2000) gb</div><div class='del'>- *	Added port-&gt;port.tty-&gt;ldisc.set_termios(port-&gt;port.tty, NULL) to</div><div class='del'>- *	empeg_open(). This notifies the tty driver that the termios have</div><div class='del'>- *	changed.</div><div class='add'>+ *	Added tty-&gt;ldisc.set_termios(port, tty, NULL) to empeg_open().</div><div class='add'>+ *	This notifies the tty driver that the termios have changed.</div><div class='ctx'>  *</div><div class='ctx'>  * (11/13/2000) gb</div><div class='ctx'>  *	Moved tty-&gt;low_latency = 1 from empeg_read_bulk_callback() to</div><div class='hunk'>@@ -354,7 +353,7 @@ static void empeg_read_bulk_callback(struct urb *urb)</div><div class='ctx'> </div><div class='ctx'> 	usb_serial_debug_data(debug, &amp;port-&gt;dev, __func__,</div><div class='ctx'> 						urb-&gt;actual_length, data);</div><div class='del'>-	tty = port-&gt;port.tty;</div><div class='add'>+	tty = tty_port_tty_get(&amp;port-&gt;port);</div><div class='ctx'> </div><div class='ctx'> 	if (urb-&gt;actual_length) {</div><div class='ctx'> 		tty_buffer_request_room(tty, urb-&gt;actual_length);</div><div class='hunk'>@@ -362,6 +361,7 @@ static void empeg_read_bulk_callback(struct urb *urb)</div><div class='ctx'> 		tty_flip_buffer_push(tty);</div><div class='ctx'> 		bytes_in += urb-&gt;actual_length;</div><div class='ctx'> 	}</div><div class='add'>+	tty_kref_put(tty);</div><div class='ctx'> </div><div class='ctx'> 	/* Continue trying to always read  */</div><div class='ctx'> 	usb_fill_bulk_urb(</div><div class='hunk'>@@ -416,7 +416,7 @@ static int  empeg_startup(struct usb_serial *serial)</div><div class='ctx'> 	dbg("%s", __func__);</div><div class='ctx'> </div><div class='ctx'> 	if (serial-&gt;dev-&gt;actconfig-&gt;desc.bConfigurationValue != 1) {</div><div class='del'>-		err("active config #%d != 1 ??",</div><div class='add'>+		dev_err(&amp;serial-&gt;dev-&gt;dev, "active config #%d != 1 ??\n",</div><div class='ctx'> 			serial-&gt;dev-&gt;actconfig-&gt;desc.bConfigurationValue);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -499,15 +499,15 @@ static int __init empeg_init(void)</div><div class='ctx'> 		urb = usb_alloc_urb(0, GFP_KERNEL);</div><div class='ctx'> 		write_urb_pool[i] = urb;</div><div class='ctx'> 		if (urb == NULL) {</div><div class='del'>-			err("No more urbs???");</div><div class='add'>+			printk(KERN_ERR "empeg: No more urbs???\n");</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		urb-&gt;transfer_buffer = kmalloc(URB_TRANSFER_BUFFER_SIZE,</div><div class='ctx'> 								GFP_KERNEL);</div><div class='ctx'> 		if (!urb-&gt;transfer_buffer) {</div><div class='del'>-			err("%s - out of memory for urb buffers.",</div><div class='del'>-			    __func__);</div><div class='add'>+			printk(KERN_ERR "empeg: %s - out of memory for urb "</div><div class='add'>+			       "buffers.", __func__);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -519,7 +519,8 @@ static int __init empeg_init(void)</div><div class='ctx'> 	if (retval)</div><div class='ctx'> 		goto failed_usb_register;</div><div class='ctx'> </div><div class='del'>-	info(DRIVER_VERSION ":" DRIVER_DESC);</div><div class='add'>+	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"</div><div class='add'>+	       DRIVER_DESC "\n");</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> failed_usb_register:</div><div class='head'>diff --git a/drivers/usb/serial/ezusb.c b/drivers/usb/serial/ezusb.c<br/>index 711e84f6ed82..3cfc762f5056 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/ezusb.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/serial/ezusb.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/ezusb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/ezusb.c</a></div><div class='hunk'>@@ -28,7 +28,8 @@ int ezusb_writememory(struct usb_serial *serial, int address,</div><div class='ctx'> </div><div class='ctx'> 	/* dbg("ezusb_writememory %x, %d", address, length); */</div><div class='ctx'> 	if (!serial-&gt;dev) {</div><div class='del'>-		err("%s - no physical device present, failing.", __func__);</div><div class='add'>+		printk(KERN_ERR "ezusb: %s - no physical device present, "</div><div class='add'>+		       "failing.\n", __func__);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c<br/>index 3dc93b542b30..51d7bdea2869 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/ftdi_sio.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/serial/ftdi_sio.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/ftdi_sio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/ftdi_sio.c</a></div><div class='hunk'>@@ -578,6 +578,7 @@ static struct usb_device_id id_table_combined [] = {</div><div class='ctx'> 	{ USB_DEVICE(FALCOM_VID, FALCOM_TWIST_PID) },</div><div class='ctx'> 	{ USB_DEVICE(FALCOM_VID, FALCOM_SAMBA_PID) },</div><div class='ctx'> 	{ USB_DEVICE(FTDI_VID, FTDI_SUUNTO_SPORTS_PID) },</div><div class='add'>+	{ USB_DEVICE(FTDI_VID, FTDI_OCEANIC_PID) },</div><div class='ctx'> 	{ USB_DEVICE(TTI_VID, TTI_QL355P_PID) },</div><div class='ctx'> 	{ USB_DEVICE(FTDI_VID, FTDI_RM_CANVIEW_PID) },</div><div class='ctx'> 	{ USB_DEVICE(BANDB_VID, BANDB_USOTL4_PID) },</div><div class='hunk'>@@ -860,7 +861,7 @@ static int update_mctrl(struct usb_serial_port *port, unsigned int set,</div><div class='ctx'> </div><div class='ctx'> 	kfree(buf);</div><div class='ctx'> 	if (rv &lt; 0) {</div><div class='del'>-		err("%s Error from MODEM_CTRL urb: DTR %s, RTS %s",</div><div class='add'>+		dbg("%s Error from MODEM_CTRL urb: DTR %s, RTS %s",</div><div class='ctx'> 				__func__,</div><div class='ctx'> 				(set &amp; TIOCM_DTR) ? "HIGH" :</div><div class='ctx'> 				(clear &amp; TIOCM_DTR) ? "LOW" : "unchanged",</div><div class='hunk'>@@ -1153,7 +1154,7 @@ static void ftdi_determine_type(struct usb_serial_port *port)</div><div class='ctx'> 		/* Assume its an FT232R  */</div><div class='ctx'> 		priv-&gt;chip_type = FT232RL;</div><div class='ctx'> 	}</div><div class='del'>-	info("Detected %s", ftdi_chip_name[priv-&gt;chip_type]);</div><div class='add'>+	dev_info(&amp;udev-&gt;dev, "Detected %s\n", ftdi_chip_name[priv-&gt;chip_type]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -1326,7 +1327,7 @@ static int ftdi_sio_port_probe(struct usb_serial_port *port)</div><div class='ctx'> </div><div class='ctx'> 	priv = kzalloc(sizeof(struct ftdi_private), GFP_KERNEL);</div><div class='ctx'> 	if (!priv) {</div><div class='del'>-		err("%s- kmalloc(%Zd) failed.", __func__,</div><div class='add'>+		dev_err(&amp;port-&gt;dev, "%s- kmalloc(%Zd) failed.\n", __func__,</div><div class='ctx'> 					sizeof(struct ftdi_private));</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1409,7 +1410,8 @@ static int ftdi_jtag_probe(struct usb_serial *serial)</div><div class='ctx'> 	dbg("%s", __func__);</div><div class='ctx'> </div><div class='ctx'> 	if (interface == udev-&gt;actconfig-&gt;interface[0]) {</div><div class='del'>-		info("Ignoring serial port reserved for JTAG");</div><div class='add'>+		dev_info(&amp;udev-&gt;dev,</div><div class='add'>+			 "Ignoring serial port reserved for JTAG\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1427,7 +1429,8 @@ static int ftdi_mtxorb_hack_setup(struct usb_serial *serial)</div><div class='ctx'> </div><div class='ctx'> 	if (ep-&gt;enabled &amp;&amp; ep_desc-&gt;wMaxPacketSize == 0) {</div><div class='ctx'> 		ep_desc-&gt;wMaxPacketSize = cpu_to_le16(0x40);</div><div class='del'>-		info("Fixing invalid wMaxPacketSize on read pipe");</div><div class='add'>+		dev_info(&amp;serial-&gt;dev-&gt;dev,</div><div class='add'>+			 "Fixing invalid wMaxPacketSize on read pipe\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1521,8 +1524,9 @@ static int ftdi_open(struct tty_struct *tty,</div><div class='ctx'> 			ftdi_read_bulk_callback, port);</div><div class='ctx'> 	result = usb_submit_urb(port-&gt;read_urb, GFP_KERNEL);</div><div class='ctx'> 	if (result)</div><div class='del'>-		err("%s - failed submitting read urb, error %d",</div><div class='del'>-							__func__, result);</div><div class='add'>+		dev_err(&amp;port-&gt;dev,</div><div class='add'>+			"%s - failed submitting read urb, error %d\n",</div><div class='add'>+			__func__, result);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 	return result;</div><div class='hunk'>@@ -1556,7 +1560,7 @@ static void ftdi_close(struct tty_struct *tty,</div><div class='ctx'> 				    FTDI_SIO_SET_FLOW_CTRL_REQUEST_TYPE,</div><div class='ctx'> 				    0, priv-&gt;interface, buf, 0,</div><div class='ctx'> 				    WDR_TIMEOUT) &lt; 0) {</div><div class='del'>-			err("error from flowcontrol urb");</div><div class='add'>+			dev_err(&amp;port-&gt;dev, "error from flowcontrol urb\n");</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* drop RTS and DTR */</div><div class='hunk'>@@ -1621,14 +1625,15 @@ static int ftdi_write(struct tty_struct *tty, struct usb_serial_port *port,</div><div class='ctx'> </div><div class='ctx'> 	buffer = kmalloc(transfer_size, GFP_ATOMIC);</div><div class='ctx'> 	if (!buffer) {</div><div class='del'>-		err("%s ran out of kernel memory for urb ...", __func__);</div><div class='add'>+		dev_err(&amp;port-&gt;dev,</div><div class='add'>+			"%s ran out of kernel memory for urb ...\n", __func__);</div><div class='ctx'> 		count = -ENOMEM;</div><div class='ctx'> 		goto error_no_buffer;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	urb = usb_alloc_urb(0, GFP_ATOMIC);</div><div class='ctx'> 	if (!urb) {</div><div class='del'>-		err("%s - no more free urbs", __func__);</div><div class='add'>+		dev_err(&amp;port-&gt;dev, "%s - no more free urbs\n", __func__);</div><div class='ctx'> 		count = -ENOMEM;</div><div class='ctx'> 		goto error_no_urb;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1672,8 +1677,9 @@ static int ftdi_write(struct tty_struct *tty, struct usb_serial_port *port,</div><div class='ctx'> </div><div class='ctx'> 	status = usb_submit_urb(urb, GFP_ATOMIC);</div><div class='ctx'> 	if (status) {</div><div class='del'>-		err("%s - failed submitting write urb, error %d",</div><div class='del'>-							__func__, status);</div><div class='add'>+		dev_err(&amp;port-&gt;dev,</div><div class='add'>+			"%s - failed submitting write urb, error %d\n",</div><div class='add'>+			__func__, status);</div><div class='ctx'> 		count = status;</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -1780,7 +1786,8 @@ static int ftdi_chars_in_buffer(struct tty_struct *tty)</div><div class='ctx'> 	buffered = (int)priv-&gt;tx_outstanding_bytes;</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;priv-&gt;tx_lock, flags);</div><div class='ctx'> 	if (buffered &lt; 0) {</div><div class='del'>-		err("%s outstanding tx bytes is negative!", __func__);</div><div class='add'>+		dev_err(&amp;port-&gt;dev, "%s outstanding tx bytes is negative!\n",</div><div class='add'>+			__func__);</div><div class='ctx'> 		buffered = 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	return buffered;</div><div class='hunk'>@@ -1796,11 +1803,12 @@ static void ftdi_read_bulk_callback(struct urb *urb)</div><div class='ctx'> 	int status = urb-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	if (urb-&gt;number_of_packets &gt; 0) {</div><div class='del'>-		err("%s transfer_buffer_length %d actual_length %d number of packets %d",</div><div class='del'>-				__func__,</div><div class='del'>-				urb-&gt;transfer_buffer_length,</div><div class='del'>-				urb-&gt;actual_length, urb-&gt;number_of_packets);</div><div class='del'>-		err("%s transfer_flags %x ", __func__, urb-&gt;transfer_flags);</div><div class='add'>+		dev_err(&amp;port-&gt;dev, "%s transfer_buffer_length %d "</div><div class='add'>+			"actual_length %d number of packets %d\n", __func__,</div><div class='add'>+			urb-&gt;transfer_buffer_length,</div><div class='add'>+			urb-&gt;actual_length, urb-&gt;number_of_packets);</div><div class='add'>+		dev_err(&amp;port-&gt;dev, "%s transfer_flags %x\n", __func__,</div><div class='add'>+			urb-&gt;transfer_flags);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dbg("%s - port %d", __func__, port-&gt;number);</div><div class='hunk'>@@ -1808,7 +1816,7 @@ static void ftdi_read_bulk_callback(struct urb *urb)</div><div class='ctx'> 	if (port-&gt;port.count &lt;= 0)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	tty = port-&gt;port.tty;</div><div class='add'>+	tty = tty_port_tty_get(&amp;port-&gt;port);</div><div class='ctx'> 	if (!tty) {</div><div class='ctx'> 		dbg("%s - bad tty pointer - exiting", __func__);</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -1817,17 +1825,17 @@ static void ftdi_read_bulk_callback(struct urb *urb)</div><div class='ctx'> 	priv = usb_get_serial_port_data(port);</div><div class='ctx'> 	if (!priv) {</div><div class='ctx'> 		dbg("%s - bad port private data pointer - exiting", __func__);</div><div class='del'>-		return;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (urb != port-&gt;read_urb)</div><div class='del'>-		err("%s - Not my urb!", __func__);</div><div class='add'>+		dev_err(&amp;port-&gt;dev, "%s - Not my urb!\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	if (status) {</div><div class='ctx'> 		/* This will happen at close every time so it is a dbg not an</div><div class='ctx'> 		   err */</div><div class='ctx'> 		dbg("(this is ok on close) nonzero read bulk status received: %d", status);</div><div class='del'>-		return;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* count data bytes, but not status bytes */</div><div class='hunk'>@@ -1838,7 +1846,8 @@ static void ftdi_read_bulk_callback(struct urb *urb)</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;priv-&gt;rx_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	ftdi_process_read(&amp;priv-&gt;rx_work.work);</div><div class='del'>-</div><div class='add'>+out:</div><div class='add'>+	tty_kref_put(tty);</div><div class='ctx'> } /* ftdi_read_bulk_callback */</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -1863,7 +1872,7 @@ static void ftdi_process_read(struct work_struct *work)</div><div class='ctx'> 	if (port-&gt;port.count &lt;= 0)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	tty = port-&gt;port.tty;</div><div class='add'>+	tty = tty_port_tty_get(&amp;port-&gt;port);</div><div class='ctx'> 	if (!tty) {</div><div class='ctx'> 		dbg("%s - bad tty pointer - exiting", __func__);</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -1872,13 +1881,13 @@ static void ftdi_process_read(struct work_struct *work)</div><div class='ctx'> 	priv = usb_get_serial_port_data(port);</div><div class='ctx'> 	if (!priv) {</div><div class='ctx'> 		dbg("%s - bad port private data pointer - exiting", __func__);</div><div class='del'>-		return;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	urb = port-&gt;read_urb;</div><div class='ctx'> 	if (!urb) {</div><div class='ctx'> 		dbg("%s - bad read_urb pointer - exiting", __func__);</div><div class='del'>-		return;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	data = urb-&gt;transfer_buffer;</div><div class='hunk'>@@ -1923,7 +1932,8 @@ static void ftdi_process_read(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> 		length = min(PKTSZ, urb-&gt;actual_length-packet_offset)-2;</div><div class='ctx'> 		if (length &lt; 0) {</div><div class='del'>-			err("%s - bad packet length: %d", __func__, length+2);</div><div class='add'>+			dev_err(&amp;port-&gt;dev, "%s - bad packet length: %d\n",</div><div class='add'>+				__func__, length+2);</div><div class='ctx'> 			length = 0;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -2020,7 +2030,7 @@ static void ftdi_process_read(struct work_struct *work)</div><div class='ctx'> 			schedule_delayed_work(&amp;priv-&gt;rx_work, 1);</div><div class='ctx'> 		else</div><div class='ctx'> 			dbg("%s - port is closed", __func__);</div><div class='del'>-		return;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* urb is completely processed */</div><div class='hunk'>@@ -2038,9 +2048,12 @@ static void ftdi_process_read(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> 		result = usb_submit_urb(port-&gt;read_urb, GFP_ATOMIC);</div><div class='ctx'> 		if (result)</div><div class='del'>-			err("%s - failed resubmitting read urb, error %d",</div><div class='del'>-							__func__, result);</div><div class='add'>+			dev_err(&amp;port-&gt;dev,</div><div class='add'>+				"%s - failed resubmitting read urb, error %d\n",</div><div class='add'>+				__func__, result);</div><div class='ctx'> 	}</div><div class='add'>+out:</div><div class='add'>+	tty_kref_put(tty);</div><div class='ctx'> } /* ftdi_process_read */</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -2066,8 +2079,8 @@ static void ftdi_break_ctl(struct tty_struct *tty, int break_state)</div><div class='ctx'> 			FTDI_SIO_SET_DATA_REQUEST_TYPE,</div><div class='ctx'> 			urb_value , priv-&gt;interface,</div><div class='ctx'> 			buf, 0, WDR_TIMEOUT) &lt; 0) {</div><div class='del'>-		err("%s FAILED to enable/disable break state (state was %d)",</div><div class='del'>-							__func__, break_state);</div><div class='add'>+		dev_err(&amp;port-&gt;dev, "%s FAILED to enable/disable break state "</div><div class='add'>+			"(state was %d)\n", __func__, break_state);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dbg("%s break state is %d - urb is %d", __func__,</div><div class='hunk'>@@ -2139,7 +2152,7 @@ static void ftdi_set_termios(struct tty_struct *tty,</div><div class='ctx'> 		case CS7: urb_value |= 7; dbg("Setting CS7"); break;</div><div class='ctx'> 		case CS8: urb_value |= 8; dbg("Setting CS8"); break;</div><div class='ctx'> 		default:</div><div class='del'>-			err("CSIZE was set but not CS5-CS8");</div><div class='add'>+			dev_err(&amp;port-&gt;dev, "CSIZE was set but not CS5-CS8\n");</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2152,7 +2165,8 @@ static void ftdi_set_termios(struct tty_struct *tty,</div><div class='ctx'> 			    FTDI_SIO_SET_DATA_REQUEST_TYPE,</div><div class='ctx'> 			    urb_value , priv-&gt;interface,</div><div class='ctx'> 			    buf, 0, WDR_SHORT_TIMEOUT) &lt; 0) {</div><div class='del'>-		err("%s FAILED to set databits/stopbits/parity", __func__);</div><div class='add'>+		dev_err(&amp;port-&gt;dev, "%s FAILED to set "</div><div class='add'>+			"databits/stopbits/parity\n", __func__);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Now do the baudrate */</div><div class='hunk'>@@ -2163,14 +2177,17 @@ static void ftdi_set_termios(struct tty_struct *tty,</div><div class='ctx'> 				    FTDI_SIO_SET_FLOW_CTRL_REQUEST_TYPE,</div><div class='ctx'> 				    0, priv-&gt;interface,</div><div class='ctx'> 				    buf, 0, WDR_TIMEOUT) &lt; 0) {</div><div class='del'>-			err("%s error from disable flowcontrol urb", __func__);</div><div class='add'>+			dev_err(&amp;port-&gt;dev,</div><div class='add'>+				"%s error from disable flowcontrol urb\n",</div><div class='add'>+				__func__);</div><div class='ctx'> 		}</div><div class='ctx'> 		/* Drop RTS and DTR */</div><div class='ctx'> 		clear_mctrl(port, TIOCM_DTR | TIOCM_RTS);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* set the baudrate determined before */</div><div class='ctx'> 		if (change_speed(tty, port))</div><div class='del'>-			err("%s urb failed to set baudrate", __func__);</div><div class='add'>+			dev_err(&amp;port-&gt;dev, "%s urb failed to set baudrate\n",</div><div class='add'>+				__func__);</div><div class='ctx'> 		/* Ensure RTS and DTR are raised when baudrate changed from 0 */</div><div class='ctx'> 		if (!old_termios || (old_termios-&gt;c_cflag &amp; CBAUD) == B0)</div><div class='ctx'> 			set_mctrl(port, TIOCM_DTR | TIOCM_RTS);</div><div class='hunk'>@@ -2186,7 +2203,8 @@ static void ftdi_set_termios(struct tty_struct *tty,</div><div class='ctx'> 				    FTDI_SIO_SET_FLOW_CTRL_REQUEST_TYPE,</div><div class='ctx'> 				    0 , (FTDI_SIO_RTS_CTS_HS | priv-&gt;interface),</div><div class='ctx'> 				    buf, 0, WDR_TIMEOUT) &lt; 0) {</div><div class='del'>-			err("urb failed to set to rts/cts flow control");</div><div class='add'>+			dev_err(&amp;port-&gt;dev,</div><div class='add'>+				"urb failed to set to rts/cts flow control\n");</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -2217,7 +2235,8 @@ static void ftdi_set_termios(struct tty_struct *tty,</div><div class='ctx'> 					    urb_value , (FTDI_SIO_XON_XOFF_HS</div><div class='ctx'> 							 | priv-&gt;interface),</div><div class='ctx'> 					    buf, 0, WDR_TIMEOUT) &lt; 0) {</div><div class='del'>-				err("urb failed to set to xon/xoff flow control");</div><div class='add'>+				dev_err(&amp;port-&gt;dev, "urb failed to set to "</div><div class='add'>+					"xon/xoff flow control\n");</div><div class='ctx'> 			}</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* else clause to only run if cflag ! CRTSCTS and iflag</div><div class='hunk'>@@ -2230,7 +2249,8 @@ static void ftdi_set_termios(struct tty_struct *tty,</div><div class='ctx'> 					    FTDI_SIO_SET_FLOW_CTRL_REQUEST_TYPE,</div><div class='ctx'> 					    0, priv-&gt;interface,</div><div class='ctx'> 					    buf, 0, WDR_TIMEOUT) &lt; 0) {</div><div class='del'>-				err("urb failed to clear flow control");</div><div class='add'>+				dev_err(&amp;port-&gt;dev,</div><div class='add'>+					"urb failed to clear flow control\n");</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -2256,7 +2276,7 @@ static int ftdi_tiocmget(struct tty_struct *tty, struct file *file)</div><div class='ctx'> 			   0, 0,</div><div class='ctx'> 			   buf, 1, WDR_TIMEOUT);</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='del'>-			err("%s Could not get modem status of device - err: %d", __func__,</div><div class='add'>+			dbg("%s Could not get modem status of device - err: %d", __func__,</div><div class='ctx'> 			    ret);</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2275,7 +2295,7 @@ static int ftdi_tiocmget(struct tty_struct *tty, struct file *file)</div><div class='ctx'> 				   0, priv-&gt;interface,</div><div class='ctx'> 				   buf, 2, WDR_TIMEOUT);</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='del'>-			err("%s Could not get modem status of device - err: %d", __func__,</div><div class='add'>+			dbg("%s Could not get modem status of device - err: %d", __func__,</div><div class='ctx'> 			    ret);</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2422,7 +2442,8 @@ static int __init ftdi_init(void)</div><div class='ctx'> 	if (retval)</div><div class='ctx'> 		goto failed_usb_register;</div><div class='ctx'> </div><div class='del'>-	info(DRIVER_VERSION ":" DRIVER_DESC);</div><div class='add'>+	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"</div><div class='add'>+	       DRIVER_DESC "\n");</div><div class='ctx'> 	return 0;</div><div class='ctx'> failed_usb_register:</div><div class='ctx'> 	usb_serial_deregister(&amp;ftdi_sio_device);</div><div class='hunk'>@@ -2455,5 +2476,5 @@ module_param(vendor, ushort, 0);</div><div class='ctx'> MODULE_PARM_DESC(vendor, "User specified vendor ID (default="</div><div class='ctx'> 		__MODULE_STRING(FTDI_VID)")");</div><div class='ctx'> module_param(product, ushort, 0);</div><div class='del'>-MODULE_PARM_DESC(vendor, "User specified product ID");</div><div class='add'>+MODULE_PARM_DESC(product, "User specified product ID");</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/usb/serial/ftdi_sio.h b/drivers/usb/serial/ftdi_sio.h<br/>index 8a5b6df3a976..07a3992abad2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/ftdi_sio.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/serial/ftdi_sio.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/ftdi_sio.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/ftdi_sio.h</a></div><div class='hunk'>@@ -628,6 +628,11 @@</div><div class='ctx'> #define FTDI_SUUNTO_SPORTS_PID	0xF680	/* Suunto Sports instrument */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Oceanic product ids</div><div class='add'>+ */</div><div class='add'>+#define FTDI_OCEANIC_PID	0xF460  /* Oceanic dive instrument */</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * TTi (Thurlby Thandar Instruments)</div><div class='ctx'>  */</div><div class='ctx'> #define TTI_VID			0x103E	/* Vendor Id */</div><div class='head'>diff --git a/drivers/usb/serial/garmin_gps.c b/drivers/usb/serial/garmin_gps.c<br/>index d95382088075..8e6a66e38db2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/garmin_gps.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/serial/garmin_gps.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/garmin_gps.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/garmin_gps.c</a></div><div class='hunk'>@@ -276,7 +276,7 @@ static inline int isAbortTrfCmnd(const unsigned char *buf)</div><div class='ctx'> static void send_to_tty(struct usb_serial_port *port,</div><div class='ctx'> 			char *data, unsigned int actual_length)</div><div class='ctx'> {</div><div class='del'>-	struct tty_struct *tty = port-&gt;port.tty;</div><div class='add'>+	struct tty_struct *tty = tty_port_tty_get(&amp;port-&gt;port);</div><div class='ctx'> </div><div class='ctx'> 	if (tty &amp;&amp; actual_length) {</div><div class='ctx'> </div><div class='hunk'>@@ -287,6 +287,7 @@ static void send_to_tty(struct usb_serial_port *port,</div><div class='ctx'> 		tty_insert_flip_string(tty, data, actual_length);</div><div class='ctx'> 		tty_flip_buffer_push(tty);</div><div class='ctx'> 	}</div><div class='add'>+	tty_kref_put(tty);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -1584,7 +1585,8 @@ static int __init garmin_init(void)</div><div class='ctx'> 	retval = usb_register(&amp;garmin_driver);</div><div class='ctx'> 	if (retval)</div><div class='ctx'> 		goto failed_usb_register;</div><div class='del'>-	info(DRIVER_DESC " " DRIVER_VERSION);</div><div class='add'>+	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"</div><div class='add'>+	       DRIVER_DESC "\n");</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> failed_usb_register:</div><div class='head'>diff --git a/drivers/usb/serial/generic.c b/drivers/usb/serial/generic.c<br/>index fe84c88ec20c..814909f1ee63 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/generic.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/serial/generic.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/generic.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/generic.c</a></div><div class='hunk'>@@ -330,7 +330,7 @@ static void resubmit_read_urb(struct usb_serial_port *port, gfp_t mem_flags)</div><div class='ctx'> static void flush_and_resubmit_read_urb(struct usb_serial_port *port)</div><div class='ctx'> {</div><div class='ctx'> 	struct urb *urb = port-&gt;read_urb;</div><div class='del'>-	struct tty_struct *tty = port-&gt;port.tty;</div><div class='add'>+	struct tty_struct *tty = tty_port_tty_get(&amp;port-&gt;port);</div><div class='ctx'> 	int room;</div><div class='ctx'> </div><div class='ctx'> 	/* Push data to tty */</div><div class='hunk'>@@ -341,6 +341,7 @@ static void flush_and_resubmit_read_urb(struct usb_serial_port *port)</div><div class='ctx'> 			tty_flip_buffer_push(tty);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+	tty_kref_put(tty);</div><div class='ctx'> </div><div class='ctx'> 	resubmit_read_urb(port, GFP_ATOMIC);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/usb/serial/hp4x.c b/drivers/usb/serial/hp4x.c<br/>index ab905869e959..431329275133 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/hp4x.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/serial/hp4x.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/hp4x.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/hp4x.c</a></div><div class='hunk'>@@ -63,7 +63,8 @@ static int __init hp49gp_init(void)</div><div class='ctx'> 	retval = usb_register(&amp;hp49gp_driver);</div><div class='ctx'> 	if (retval)</div><div class='ctx'> 		goto failed_usb_register;</div><div class='del'>-	info(DRIVER_DESC " " DRIVER_VERSION);</div><div class='add'>+	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"</div><div class='add'>+	       DRIVER_DESC "\n");</div><div class='ctx'> 	return 0;</div><div class='ctx'> failed_usb_register:</div><div class='ctx'> 	usb_serial_deregister(&amp;hp49gp_device);</div><div class='head'>diff --git a/drivers/usb/serial/io_edgeport.c b/drivers/usb/serial/io_edgeport.c<br/>index bfa508ddb0fe..e85c8c0d1ad9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/io_edgeport.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/serial/io_edgeport.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/io_edgeport.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/io_edgeport.c</a></div><div class='hunk'>@@ -600,6 +600,7 @@ static void edge_interrupt_callback(struct urb *urb)</div><div class='ctx'> 	struct edgeport_serial	*edge_serial = urb-&gt;context;</div><div class='ctx'> 	struct edgeport_port *edge_port;</div><div class='ctx'> 	struct usb_serial_port *port;</div><div class='add'>+	struct tty_struct *tty;</div><div class='ctx'> 	unsigned char *data = urb-&gt;transfer_buffer;</div><div class='ctx'> 	int length = urb-&gt;actual_length;</div><div class='ctx'> 	int bytes_avail;</div><div class='hunk'>@@ -675,9 +676,12 @@ static void edge_interrupt_callback(struct urb *urb)</div><div class='ctx'> </div><div class='ctx'> 					/* tell the tty driver that something</div><div class='ctx'> 					   has changed */</div><div class='del'>-					if (edge_port-&gt;port-&gt;port.tty)</div><div class='del'>-						tty_wakeup(edge_port-&gt;port-&gt;port.tty);</div><div class='del'>-</div><div class='add'>+					tty = tty_port_tty_get(</div><div class='add'>+						&amp;edge_port-&gt;port-&gt;port);</div><div class='add'>+					if (tty) {</div><div class='add'>+						tty_wakeup(tty);</div><div class='add'>+						tty_kref_put(tty);</div><div class='add'>+					}</div><div class='ctx'> 					/* Since we have more credit, check</div><div class='ctx'> 					   if more data can be sent */</div><div class='ctx'> 					send_more_port_data(edge_serial,</div><div class='hunk'>@@ -778,13 +782,14 @@ static void edge_bulk_out_data_callback(struct urb *urb)</div><div class='ctx'> 		    __func__, status);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	tty = edge_port-&gt;port-&gt;port.tty;</div><div class='add'>+	tty = tty_port_tty_get(&amp;edge_port-&gt;port-&gt;port);</div><div class='ctx'> </div><div class='ctx'> 	if (tty &amp;&amp; edge_port-&gt;open) {</div><div class='ctx'> 		/* let the tty driver wakeup if it has a special</div><div class='ctx'> 		   write_wakeup function */</div><div class='ctx'> 		tty_wakeup(tty);</div><div class='ctx'> 	}</div><div class='add'>+	tty_kref_put(tty);</div><div class='ctx'> </div><div class='ctx'> 	/* Release the Write URB */</div><div class='ctx'> 	edge_port-&gt;write_in_progress = false;</div><div class='hunk'>@@ -826,11 +831,12 @@ static void edge_bulk_out_cmd_callback(struct urb *urb)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Get pointer to tty */</div><div class='del'>-	tty = edge_port-&gt;port-&gt;port.tty;</div><div class='add'>+	tty = tty_port_tty_get(&amp;edge_port-&gt;port-&gt;port);</div><div class='ctx'> </div><div class='ctx'> 	/* tell the tty driver that something has changed */</div><div class='ctx'> 	if (tty &amp;&amp; edge_port-&gt;open)</div><div class='ctx'> 		tty_wakeup(tty);</div><div class='add'>+	tty_kref_put(tty);</div><div class='ctx'> </div><div class='ctx'> 	/* we have completed the command */</div><div class='ctx'> 	edge_port-&gt;commandPending = false;</div><div class='hunk'>@@ -1932,11 +1938,13 @@ static void process_rcvd_data(struct edgeport_serial *edge_serial,</div><div class='ctx'> 							edge_serial-&gt;rxPort];</div><div class='ctx'> 				edge_port = usb_get_serial_port_data(port);</div><div class='ctx'> 				if (edge_port-&gt;open) {</div><div class='del'>-					tty = edge_port-&gt;port-&gt;port.tty;</div><div class='add'>+					tty = tty_port_tty_get(</div><div class='add'>+						&amp;edge_port-&gt;port-&gt;port);</div><div class='ctx'> 					if (tty) {</div><div class='ctx'> 						dbg("%s - Sending %d bytes to TTY for port %d",</div><div class='ctx'> 							__func__, rxLen, edge_serial-&gt;rxPort);</div><div class='ctx'> 						edge_tty_recv(&amp;edge_serial-&gt;serial-&gt;dev-&gt;dev, tty, buffer, rxLen);</div><div class='add'>+						tty_kref_put(tty);</div><div class='ctx'> 					}</div><div class='ctx'> 					edge_port-&gt;icount.rx += rxLen;</div><div class='ctx'> 				}</div><div class='hunk'>@@ -1971,6 +1979,7 @@ static void process_rcvd_status(struct edgeport_serial *edge_serial,</div><div class='ctx'> {</div><div class='ctx'> 	struct usb_serial_port *port;</div><div class='ctx'> 	struct edgeport_port *edge_port;</div><div class='add'>+	struct tty_struct *tty;</div><div class='ctx'> 	__u8 code = edge_serial-&gt;rxStatusCode;</div><div class='ctx'> </div><div class='ctx'> 	/* switch the port pointer to the one being currently talked about */</div><div class='hunk'>@@ -2020,10 +2029,12 @@ static void process_rcvd_status(struct edgeport_serial *edge_serial,</div><div class='ctx'> </div><div class='ctx'> 		/* send the current line settings to the port so we are</div><div class='ctx'> 		   in sync with any further termios calls */</div><div class='del'>-		/* FIXME: locking on tty */</div><div class='del'>-		if (edge_port-&gt;port-&gt;port.tty)</div><div class='del'>-			change_port_settings(edge_port-&gt;port-&gt;port.tty,</div><div class='del'>-				edge_port, edge_port-&gt;port-&gt;port.tty-&gt;termios);</div><div class='add'>+		tty = tty_port_tty_get(&amp;edge_port-&gt;port-&gt;port);</div><div class='add'>+		if (tty) {</div><div class='add'>+			change_port_settings(tty,</div><div class='add'>+				edge_port, tty-&gt;termios);</div><div class='add'>+			tty_kref_put(tty);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		/* we have completed the open */</div><div class='ctx'> 		edge_port-&gt;openPending = false;</div><div class='hunk'>@@ -2163,10 +2174,14 @@ static void handle_new_lsr(struct edgeport_port *edge_port, __u8 lsrData,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Place LSR data byte into Rx buffer */</div><div class='del'>-	if (lsrData &amp;&amp; edge_port-&gt;port-&gt;port.tty)</div><div class='del'>-		edge_tty_recv(&amp;edge_port-&gt;port-&gt;dev,</div><div class='del'>-					edge_port-&gt;port-&gt;port.tty, &amp;data, 1);</div><div class='del'>-</div><div class='add'>+	if (lsrData) {</div><div class='add'>+		struct tty_struct *tty =</div><div class='add'>+				tty_port_tty_get(&amp;edge_port-&gt;port-&gt;port);</div><div class='add'>+		if (tty) {</div><div class='add'>+			edge_tty_recv(&amp;edge_port-&gt;port-&gt;dev, tty, &amp;data, 1);</div><div class='add'>+			tty_kref_put(tty);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> 	/* update input line counters */</div><div class='ctx'> 	icount = &amp;edge_port-&gt;icount;</div><div class='ctx'> 	if (newLsr &amp; LSR_BREAK)</div><div class='hunk'>@@ -3094,13 +3109,13 @@ static int edge_startup(struct usb_serial *serial)</div><div class='ctx'> 				edge_serial-&gt;interrupt_read_urb =</div><div class='ctx'> 						usb_alloc_urb(0, GFP_KERNEL);</div><div class='ctx'> 				if (!edge_serial-&gt;interrupt_read_urb) {</div><div class='del'>-					err("out of memory");</div><div class='add'>+					dev_err(&amp;dev-&gt;dev, "out of memory\n");</div><div class='ctx'> 					return -ENOMEM;</div><div class='ctx'> 				}</div><div class='ctx'> 				edge_serial-&gt;interrupt_in_buffer =</div><div class='ctx'> 					kmalloc(buffer_size, GFP_KERNEL);</div><div class='ctx'> 				if (!edge_serial-&gt;interrupt_in_buffer) {</div><div class='del'>-					err("out of memory");</div><div class='add'>+					dev_err(&amp;dev-&gt;dev, "out of memory\n");</div><div class='ctx'> 					usb_free_urb(edge_serial-&gt;interrupt_read_urb);</div><div class='ctx'> 					return -ENOMEM;</div><div class='ctx'> 				}</div><div class='hunk'>@@ -3131,13 +3146,13 @@ static int edge_startup(struct usb_serial *serial)</div><div class='ctx'> 				edge_serial-&gt;read_urb =</div><div class='ctx'> 						usb_alloc_urb(0, GFP_KERNEL);</div><div class='ctx'> 				if (!edge_serial-&gt;read_urb) {</div><div class='del'>-					err("out of memory");</div><div class='add'>+					dev_err(&amp;dev-&gt;dev, "out of memory\n");</div><div class='ctx'> 					return -ENOMEM;</div><div class='ctx'> 				}</div><div class='ctx'> 				edge_serial-&gt;bulk_in_buffer =</div><div class='ctx'> 					kmalloc(buffer_size, GFP_KERNEL);</div><div class='ctx'> 				if (!edge_serial-&gt;bulk_in_buffer) {</div><div class='del'>-					err("out of memory");</div><div class='add'>+					dev_err(&amp;dev-&gt;dev, "out of memory\n");</div><div class='ctx'> 					usb_free_urb(edge_serial-&gt;read_urb);</div><div class='ctx'> 					return -ENOMEM;</div><div class='ctx'> 				}</div><div class='hunk'>@@ -3166,7 +3181,8 @@ static int edge_startup(struct usb_serial *serial)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (!interrupt_in_found || !bulk_in_found || !bulk_out_found) {</div><div class='del'>-			err("Error - the proper endpoints were not found!");</div><div class='add'>+			dev_err(&amp;dev-&gt;dev, "Error - the proper endpoints "</div><div class='add'>+				"were not found!\n");</div><div class='ctx'> 			return -ENODEV;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -3175,8 +3191,9 @@ static int edge_startup(struct usb_serial *serial)</div><div class='ctx'> 		response = usb_submit_urb(edge_serial-&gt;interrupt_read_urb,</div><div class='ctx'> 								GFP_KERNEL);</div><div class='ctx'> 		if (response)</div><div class='del'>-			err("%s - Error %d submitting control urb",</div><div class='del'>-							__func__, response);</div><div class='add'>+			dev_err(&amp;dev-&gt;dev,</div><div class='add'>+				"%s - Error %d submitting control urb\n",</div><div class='add'>+				__func__, response);</div><div class='ctx'> 	}</div><div class='ctx'> 	return response;</div><div class='ctx'> }</div><div class='hunk'>@@ -3238,7 +3255,8 @@ static int __init edgeport_init(void)</div><div class='ctx'> 	if (retval)</div><div class='ctx'> 		goto failed_usb_register;</div><div class='ctx'> 	atomic_set(&amp;CmdUrbs, 0);</div><div class='del'>-	info(DRIVER_DESC " " DRIVER_VERSION);</div><div class='add'>+	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"</div><div class='add'>+	       DRIVER_DESC "\n");</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> failed_usb_register:</div><div class='head'>diff --git a/drivers/usb/serial/io_ti.c b/drivers/usb/serial/io_ti.c<br/>index cb4c54316cf5..c3cdd00ddc41 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/io_ti.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/serial/io_ti.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/io_ti.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/io_ti.c</a></div><div class='hunk'>@@ -572,7 +572,7 @@ static void chase_port(struct edgeport_port *port, unsigned long timeout,</div><div class='ctx'> 								int flush)</div><div class='ctx'> {</div><div class='ctx'> 	int baud_rate;</div><div class='del'>-	struct tty_struct *tty = port-&gt;port-&gt;port.tty;</div><div class='add'>+	struct tty_struct *tty = tty_port_tty_get(&amp;port-&gt;port-&gt;port);</div><div class='ctx'> 	wait_queue_t wait;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='hunk'>@@ -599,6 +599,7 @@ static void chase_port(struct edgeport_port *port, unsigned long timeout,</div><div class='ctx'> 	if (flush)</div><div class='ctx'> 		edge_buf_clear(port-&gt;ep_out_buf);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;port-&gt;ep_lock, flags);</div><div class='add'>+	tty_kref_put(tty);</div><div class='ctx'> </div><div class='ctx'> 	/* wait for data to drain from the device */</div><div class='ctx'> 	timeout += jiffies;</div><div class='hunk'>@@ -1554,7 +1555,7 @@ static void handle_new_msr(struct edgeport_port *edge_port, __u8 msr)</div><div class='ctx'> 	/* Save the new modem status */</div><div class='ctx'> 	edge_port-&gt;shadow_msr = msr &amp; 0xf0;</div><div class='ctx'> </div><div class='del'>-	tty = edge_port-&gt;port-&gt;port.tty;</div><div class='add'>+	tty = tty_port_tty_get(&amp;edge_port-&gt;port-&gt;port);</div><div class='ctx'> 	/* handle CTS flow control */</div><div class='ctx'> 	if (tty &amp;&amp; C_CRTSCTS(tty)) {</div><div class='ctx'> 		if (msr &amp; EDGEPORT_MSR_CTS) {</div><div class='hunk'>@@ -1564,6 +1565,7 @@ static void handle_new_msr(struct edgeport_port *edge_port, __u8 msr)</div><div class='ctx'> 			tty-&gt;hw_stopped = 1;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+	tty_kref_put(tty);</div><div class='ctx'> </div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='hunk'>@@ -1574,6 +1576,7 @@ static void handle_new_lsr(struct edgeport_port *edge_port, int lsr_data,</div><div class='ctx'> 	struct async_icount *icount;</div><div class='ctx'> 	__u8 new_lsr = (__u8)(lsr &amp; (__u8)(LSR_OVER_ERR | LSR_PAR_ERR |</div><div class='ctx'> 						LSR_FRM_ERR | LSR_BREAK));</div><div class='add'>+	struct tty_struct *tty;</div><div class='ctx'> </div><div class='ctx'> 	dbg("%s - %02x", __func__, new_lsr);</div><div class='ctx'> </div><div class='hunk'>@@ -1587,8 +1590,13 @@ static void handle_new_lsr(struct edgeport_port *edge_port, int lsr_data,</div><div class='ctx'> 		new_lsr &amp;= (__u8)(LSR_OVER_ERR | LSR_BREAK);</div><div class='ctx'> </div><div class='ctx'> 	/* Place LSR data byte into Rx buffer */</div><div class='del'>-	if (lsr_data &amp;&amp; edge_port-&gt;port-&gt;port.tty)</div><div class='del'>-		edge_tty_recv(&amp;edge_port-&gt;port-&gt;dev, edge_port-&gt;port-&gt;port.tty, &amp;data, 1);</div><div class='add'>+	if (lsr_data) {</div><div class='add'>+		tty = tty_port_tty_get(&amp;edge_port-&gt;port-&gt;port);</div><div class='add'>+		if (tty) {</div><div class='add'>+			edge_tty_recv(&amp;edge_port-&gt;port-&gt;dev, tty, &amp;data, 1);</div><div class='add'>+			tty_kref_put(tty);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* update input line counters */</div><div class='ctx'> 	icount = &amp;edge_port-&gt;icount;</div><div class='hunk'>@@ -1749,7 +1757,7 @@ static void edge_bulk_in_callback(struct urb *urb)</div><div class='ctx'> 		++data;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	tty = edge_port-&gt;port-&gt;port.tty;</div><div class='add'>+	tty = tty_port_tty_get(&amp;edge_port-&gt;port-&gt;port);</div><div class='ctx'> 	if (tty &amp;&amp; urb-&gt;actual_length) {</div><div class='ctx'> 		usb_serial_debug_data(debug, &amp;edge_port-&gt;port-&gt;dev,</div><div class='ctx'> 					__func__, urb-&gt;actual_length, data);</div><div class='hunk'>@@ -1761,6 +1769,7 @@ static void edge_bulk_in_callback(struct urb *urb)</div><div class='ctx'> 							urb-&gt;actual_length);</div><div class='ctx'> 		edge_port-&gt;icount.rx += urb-&gt;actual_length;</div><div class='ctx'> 	}</div><div class='add'>+	tty_kref_put(tty);</div><div class='ctx'> </div><div class='ctx'> exit:</div><div class='ctx'> 	/* continue read unless stopped */</div><div class='hunk'>@@ -1796,6 +1805,7 @@ static void edge_bulk_out_callback(struct urb *urb)</div><div class='ctx'> 	struct usb_serial_port *port = urb-&gt;context;</div><div class='ctx'> 	struct edgeport_port *edge_port = usb_get_serial_port_data(port);</div><div class='ctx'> 	int status = urb-&gt;status;</div><div class='add'>+	struct tty_struct *tty;</div><div class='ctx'> </div><div class='ctx'> 	dbg("%s - port %d", __func__, port-&gt;number);</div><div class='ctx'> </div><div class='hunk'>@@ -1818,7 +1828,9 @@ static void edge_bulk_out_callback(struct urb *urb)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* send any buffered data */</div><div class='del'>-	edge_send(port-&gt;port.tty);</div><div class='add'>+	tty = tty_port_tty_get(&amp;port-&gt;port);</div><div class='add'>+	edge_send(tty);</div><div class='add'>+	tty_kref_put(tty);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int edge_open(struct tty_struct *tty,</div><div class='hunk'>@@ -1876,7 +1888,7 @@ static int edge_open(struct tty_struct *tty,</div><div class='ctx'> </div><div class='ctx'> 	/* set up the port settings */</div><div class='ctx'> 	if (tty)</div><div class='del'>-		edge_set_termios(tty, port, port-&gt;port.tty-&gt;termios);</div><div class='add'>+		edge_set_termios(tty, port, tty-&gt;termios);</div><div class='ctx'> </div><div class='ctx'> 	/* open up the port */</div><div class='ctx'> </div><div class='hunk'>@@ -2966,7 +2978,8 @@ static int __init edgeport_init(void)</div><div class='ctx'> 	retval = usb_register(&amp;io_driver);</div><div class='ctx'> 	if (retval)</div><div class='ctx'> 		goto failed_usb_register;</div><div class='del'>-	info(DRIVER_DESC " " DRIVER_VERSION);</div><div class='add'>+	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"</div><div class='add'>+	       DRIVER_DESC "\n");</div><div class='ctx'> 	return 0;</div><div class='ctx'> failed_usb_register:</div><div class='ctx'> 	usb_serial_deregister(&amp;edgeport_2port_device);</div><div class='head'>diff --git a/drivers/usb/serial/ipaq.c b/drivers/usb/serial/ipaq.c<br/>index cd9a2e138c8b..132be74d2b89 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/ipaq.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/serial/ipaq.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/ipaq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/ipaq.c</a></div><div class='hunk'>@@ -608,7 +608,7 @@ static int ipaq_open(struct tty_struct *tty,</div><div class='ctx'> 	bytes_out = 0;</div><div class='ctx'> 	priv = kmalloc(sizeof(struct ipaq_private), GFP_KERNEL);</div><div class='ctx'> 	if (priv == NULL) {</div><div class='del'>-		err("%s - Out of memory", __func__);</div><div class='add'>+		dev_err(&amp;port-&gt;dev, "%s - Out of memory\n", __func__);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> 	usb_set_serial_port_data(port, priv);</div><div class='hunk'>@@ -693,8 +693,7 @@ static int ipaq_open(struct tty_struct *tty,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!retries &amp;&amp; result) {</div><div class='del'>-		err("%s - failed doing control urb, error %d", __func__,</div><div class='del'>-		    result);</div><div class='add'>+		dev_err(&amp;port-&gt;dev, "%s - failed doing control urb, error %d\n",			__func__, result);</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -707,8 +706,9 @@ static int ipaq_open(struct tty_struct *tty,</div><div class='ctx'> </div><div class='ctx'> 	result = usb_submit_urb(port-&gt;read_urb, GFP_KERNEL);</div><div class='ctx'> 	if (result) {</div><div class='del'>-		err("%s - failed submitting read urb, error %d",</div><div class='del'>-						__func__, result);</div><div class='add'>+		dev_err(&amp;port-&gt;dev,</div><div class='add'>+			"%s - failed submitting read urb, error %d\n",</div><div class='add'>+			__func__, result);</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -716,7 +716,7 @@ static int ipaq_open(struct tty_struct *tty,</div><div class='ctx'> </div><div class='ctx'> enomem:</div><div class='ctx'> 	result = -ENOMEM;</div><div class='del'>-	err("%s - Out of memory", __func__);</div><div class='add'>+	dev_err(&amp;port-&gt;dev, "%s - Out of memory\n", __func__);</div><div class='ctx'> error:</div><div class='ctx'> 	ipaq_destroy_lists(port);</div><div class='ctx'> 	kfree(priv);</div><div class='hunk'>@@ -764,13 +764,14 @@ static void ipaq_read_bulk_callback(struct urb *urb)</div><div class='ctx'> 	usb_serial_debug_data(debug, &amp;port-&gt;dev, __func__,</div><div class='ctx'> 						urb-&gt;actual_length, data);</div><div class='ctx'> </div><div class='del'>-	tty = port-&gt;port.tty;</div><div class='add'>+	tty = tty_port_tty_get(&amp;port-&gt;port);</div><div class='ctx'> 	if (tty &amp;&amp; urb-&gt;actual_length) {</div><div class='ctx'> 		tty_buffer_request_room(tty, urb-&gt;actual_length);</div><div class='ctx'> 		tty_insert_flip_string(tty, data, urb-&gt;actual_length);</div><div class='ctx'> 		tty_flip_buffer_push(tty);</div><div class='ctx'> 		bytes_in += urb-&gt;actual_length;</div><div class='ctx'> 	}</div><div class='add'>+	tty_kref_put(tty);</div><div class='ctx'> </div><div class='ctx'> 	/* Continue trying to always read  */</div><div class='ctx'> 	usb_fill_bulk_urb(port-&gt;read_urb, port-&gt;serial-&gt;dev,</div><div class='hunk'>@@ -780,8 +781,9 @@ static void ipaq_read_bulk_callback(struct urb *urb)</div><div class='ctx'> 	    ipaq_read_bulk_callback, port);</div><div class='ctx'> 	result = usb_submit_urb(port-&gt;read_urb, GFP_ATOMIC);</div><div class='ctx'> 	if (result)</div><div class='del'>-		err("%s - failed resubmitting read urb, error %d",</div><div class='del'>-							__func__, result);</div><div class='add'>+		dev_err(&amp;port-&gt;dev,</div><div class='add'>+			"%s - failed resubmitting read urb, error %d\n",</div><div class='add'>+			__func__, result);</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -846,7 +848,8 @@ static int ipaq_write_bulk(struct usb_serial_port *port,</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;write_list_lock, flags);</div><div class='ctx'> 		result = usb_submit_urb(port-&gt;write_urb, GFP_ATOMIC);</div><div class='ctx'> 		if (result)</div><div class='del'>-			err("%s - failed submitting write urb, error %d",</div><div class='add'>+			dev_err(&amp;port-&gt;dev,</div><div class='add'>+				"%s - failed submitting write urb, error %d\n",</div><div class='ctx'> 				__func__, result);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;write_list_lock, flags);</div><div class='hunk'>@@ -908,8 +911,9 @@ static void ipaq_write_bulk_callback(struct urb *urb)</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;write_list_lock, flags);</div><div class='ctx'> 		result = usb_submit_urb(port-&gt;write_urb, GFP_ATOMIC);</div><div class='ctx'> 		if (result)</div><div class='del'>-			err("%s - failed submitting write urb, error %d",</div><div class='del'>-					__func__, result);</div><div class='add'>+			dev_err(&amp;port-&gt;dev,</div><div class='add'>+				"%s - failed submitting write urb, error %d\n",</div><div class='add'>+				__func__, result);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		priv-&gt;active = 0;</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;write_list_lock, flags);</div><div class='hunk'>@@ -956,7 +960,7 @@ static int ipaq_startup(struct usb_serial *serial)</div><div class='ctx'> {</div><div class='ctx'> 	dbg("%s", __func__);</div><div class='ctx'> 	if (serial-&gt;dev-&gt;actconfig-&gt;desc.bConfigurationValue != 1) {</div><div class='del'>-		err("active config #%d != 1 ??",</div><div class='add'>+		dev_err(&amp;serial-&gt;dev-&gt;dev, "active config #%d != 1 ??\n",</div><div class='ctx'> 			serial-&gt;dev-&gt;actconfig-&gt;desc.bConfigurationValue);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -975,7 +979,6 @@ static int __init ipaq_init(void)</div><div class='ctx'> 	retval = usb_serial_register(&amp;ipaq_device);</div><div class='ctx'> 	if (retval)</div><div class='ctx'> 		goto failed_usb_serial_register;</div><div class='del'>-	info(DRIVER_DESC " " DRIVER_VERSION);</div><div class='ctx'> 	if (vendor) {</div><div class='ctx'> 		ipaq_id_table[0].idVendor = vendor;</div><div class='ctx'> 		ipaq_id_table[0].idProduct = product;</div><div class='hunk'>@@ -984,6 +987,8 @@ static int __init ipaq_init(void)</div><div class='ctx'> 	if (retval)</div><div class='ctx'> 		goto failed_usb_register;</div><div class='ctx'> </div><div class='add'>+	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"</div><div class='add'>+	       DRIVER_DESC "\n");</div><div class='ctx'> 	return 0;</div><div class='ctx'> failed_usb_register:</div><div class='ctx'> 	usb_serial_deregister(&amp;ipaq_device);</div><div class='head'>diff --git a/drivers/usb/serial/ipw.c b/drivers/usb/serial/ipw.c<br/>index a842025b9b57..3ac59a8a980f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/ipw.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/serial/ipw.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/ipw.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/ipw.c</a></div><div class='hunk'>@@ -170,12 +170,13 @@ static void ipw_read_bulk_callback(struct urb *urb)</div><div class='ctx'> 	usb_serial_debug_data(debug, &amp;port-&gt;dev, __func__,</div><div class='ctx'> 					urb-&gt;actual_length, data);</div><div class='ctx'> </div><div class='del'>-	tty = port-&gt;port.tty;</div><div class='add'>+	tty = tty_port_tty_get(&amp;port-&gt;port);</div><div class='ctx'> 	if (tty &amp;&amp; urb-&gt;actual_length) {</div><div class='ctx'> 		tty_buffer_request_room(tty, urb-&gt;actual_length);</div><div class='ctx'> 		tty_insert_flip_string(tty, data, urb-&gt;actual_length);</div><div class='ctx'> 		tty_flip_buffer_push(tty);</div><div class='ctx'> 	}</div><div class='add'>+	tty_kref_put(tty);</div><div class='ctx'> </div><div class='ctx'> 	/* Continue trying to always read  */</div><div class='ctx'> 	usb_fill_bulk_urb(port-&gt;read_urb, port-&gt;serial-&gt;dev,</div><div class='hunk'>@@ -484,7 +485,8 @@ static int usb_ipw_init(void)</div><div class='ctx'> 		usb_serial_deregister(&amp;ipw_device);</div><div class='ctx'> 		return retval;</div><div class='ctx'> 	}</div><div class='del'>-	info(DRIVER_DESC " " DRIVER_VERSION);</div><div class='add'>+	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"</div><div class='add'>+	       DRIVER_DESC "\n");</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/usb/serial/ir-usb.c b/drivers/usb/serial/ir-usb.c<br/>index e59155c6607d..b679a556b98d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/ir-usb.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/serial/ir-usb.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/ir-usb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/ir-usb.c</a></div><div class='hunk'>@@ -465,11 +465,12 @@ static void ir_read_bulk_callback(struct urb *urb)</div><div class='ctx'> 			ir_baud = *data &amp; 0x0f;</div><div class='ctx'> 		usb_serial_debug_data(debug, &amp;port-&gt;dev, __func__,</div><div class='ctx'> 						urb-&gt;actual_length, data);</div><div class='del'>- 		tty = port-&gt;port.tty;</div><div class='add'>+		tty = tty_port_tty_get(&amp;port-&gt;port);</div><div class='ctx'> 		if (tty_buffer_request_room(tty, urb-&gt;actual_length - 1)) {</div><div class='ctx'> 			tty_insert_flip_string(tty, data+1, urb-&gt;actual_length - 1);</div><div class='ctx'> 			tty_flip_buffer_push(tty);</div><div class='ctx'> 		}</div><div class='add'>+		tty_kref_put(tty);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * No break here.</div><div class='hunk'>@@ -601,7 +602,8 @@ static int __init ir_init(void)</div><div class='ctx'> 	if (retval)</div><div class='ctx'> 		goto failed_usb_register;</div><div class='ctx'> </div><div class='del'>-	info(DRIVER_DESC " " DRIVER_VERSION);</div><div class='add'>+	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"</div><div class='add'>+	       DRIVER_DESC "\n");</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/usb/serial/iuu_phoenix.c b/drivers/usb/serial/iuu_phoenix.c<br/>index ddff37fa6339..e320972cb227 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/iuu_phoenix.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/serial/iuu_phoenix.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/iuu_phoenix.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/iuu_phoenix.c</a></div><div class='hunk'>@@ -629,13 +629,14 @@ static void read_buf_callback(struct urb *urb)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dbg("%s - %i chars to write", __func__, urb-&gt;actual_length);</div><div class='del'>-	tty = port-&gt;port.tty;</div><div class='add'>+	tty = tty_port_tty_get(&amp;port-&gt;port);</div><div class='ctx'> 	if (data == NULL)</div><div class='ctx'> 		dbg("%s - data is NULL !!!", __func__);</div><div class='ctx'> 	if (tty &amp;&amp; urb-&gt;actual_length &amp;&amp; data) {</div><div class='ctx'> 		tty_insert_flip_string(tty, data, urb-&gt;actual_length);</div><div class='ctx'> 		tty_flip_buffer_push(tty);</div><div class='ctx'> 	}</div><div class='add'>+	tty_kref_put(tty);</div><div class='ctx'> 	iuu_led_activity_on(urb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1184,7 +1185,8 @@ static int __init iuu_init(void)</div><div class='ctx'> 	retval = usb_register(&amp;iuu_driver);</div><div class='ctx'> 	if (retval)</div><div class='ctx'> 		goto failed_usb_register;</div><div class='del'>-	info(DRIVER_DESC " " DRIVER_VERSION);</div><div class='add'>+	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"</div><div class='add'>+	       DRIVER_DESC "\n");</div><div class='ctx'> 	return 0;</div><div class='ctx'> failed_usb_register:</div><div class='ctx'> 	usb_serial_deregister(&amp;iuu_device);</div><div class='head'>diff --git a/drivers/usb/serial/keyspan.c b/drivers/usb/serial/keyspan.c<br/>index 704716f6f6d3..9878c0fb3859 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/keyspan.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/serial/keyspan.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/keyspan.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/keyspan.c</a></div><div class='hunk'>@@ -217,7 +217,8 @@ static int __init keyspan_init(void)</div><div class='ctx'> 	if (retval)</div><div class='ctx'> 		goto failed_usb_register;</div><div class='ctx'> </div><div class='del'>-	info(DRIVER_VERSION ":" DRIVER_DESC);</div><div class='add'>+	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"</div><div class='add'>+	       DRIVER_DESC "\n");</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> failed_usb_register:</div><div class='hunk'>@@ -430,7 +431,7 @@ static void	usa26_indat_callback(struct urb *urb)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	port =  urb-&gt;context;</div><div class='del'>-	tty = port-&gt;port.tty;</div><div class='add'>+	tty = tty_port_tty_get(&amp;port-&gt;port);</div><div class='ctx'> 	if (tty &amp;&amp; urb-&gt;actual_length) {</div><div class='ctx'> 		/* 0x80 bit is error flag */</div><div class='ctx'> 		if ((data[0] &amp; 0x80) == 0) {</div><div class='hunk'>@@ -459,6 +460,7 @@ static void	usa26_indat_callback(struct urb *urb)</div><div class='ctx'> 		}</div><div class='ctx'> 		tty_flip_buffer_push(tty);</div><div class='ctx'> 	}</div><div class='add'>+	tty_kref_put(tty);</div><div class='ctx'> </div><div class='ctx'> 	/* Resubmit urb so we continue receiving */</div><div class='ctx'> 	urb-&gt;dev = port-&gt;serial-&gt;dev;</div><div class='hunk'>@@ -513,6 +515,7 @@ static void	usa26_instat_callback(struct urb *urb)</div><div class='ctx'> 	struct usb_serial			*serial;</div><div class='ctx'> 	struct usb_serial_port			*port;</div><div class='ctx'> 	struct keyspan_port_private	 	*p_priv;</div><div class='add'>+	struct tty_struct			*tty;</div><div class='ctx'> 	int old_dcd_state, err;</div><div class='ctx'> 	int status = urb-&gt;status;</div><div class='ctx'> </div><div class='hunk'>@@ -553,12 +556,11 @@ static void	usa26_instat_callback(struct urb *urb)</div><div class='ctx'> 	p_priv-&gt;dcd_state = ((msg-&gt;gpia_dcd) ? 1 : 0);</div><div class='ctx'> 	p_priv-&gt;ri_state = ((msg-&gt;ri) ? 1 : 0);</div><div class='ctx'> </div><div class='del'>-	if (port-&gt;port.tty &amp;&amp; !C_CLOCAL(port-&gt;port.tty)</div><div class='del'>-	    &amp;&amp; old_dcd_state != p_priv-&gt;dcd_state) {</div><div class='del'>-		if (old_dcd_state)</div><div class='del'>-			tty_hangup(port-&gt;port.tty);</div><div class='del'>-		/*  else */</div><div class='del'>-		/*	wake_up_interruptible(&amp;p_priv-&gt;open_wait); */</div><div class='add'>+	if (old_dcd_state != p_priv-&gt;dcd_state) {</div><div class='add'>+		tty = tty_port_tty_get(&amp;port-&gt;port);</div><div class='add'>+		if (tty &amp;&amp; !C_CLOCAL(tty))</div><div class='add'>+			tty_hangup(tty);</div><div class='add'>+		tty_kref_put(tty);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Resubmit urb so we continue receiving */</div><div class='hunk'>@@ -604,11 +606,12 @@ static void usa28_indat_callback(struct urb *urb)</div><div class='ctx'> 		p_priv = usb_get_serial_port_data(port);</div><div class='ctx'> 		data = urb-&gt;transfer_buffer;</div><div class='ctx'> </div><div class='del'>-		tty = port-&gt;port.tty;</div><div class='del'>-		if (urb-&gt;actual_length) {</div><div class='add'>+		tty =tty_port_tty_get(&amp;port-&gt;port);</div><div class='add'>+		if (tty &amp;&amp; urb-&gt;actual_length) {</div><div class='ctx'> 			tty_insert_flip_string(tty, data, urb-&gt;actual_length);</div><div class='ctx'> 			tty_flip_buffer_push(tty);</div><div class='ctx'> 		}</div><div class='add'>+		tty_kref_put(tty);</div><div class='ctx'> </div><div class='ctx'> 		/* Resubmit urb so we continue receiving */</div><div class='ctx'> 		urb-&gt;dev = port-&gt;serial-&gt;dev;</div><div class='hunk'>@@ -652,6 +655,7 @@ static void	usa28_instat_callback(struct urb *urb)</div><div class='ctx'> 	struct usb_serial			*serial;</div><div class='ctx'> 	struct usb_serial_port			*port;</div><div class='ctx'> 	struct keyspan_port_private	 	*p_priv;</div><div class='add'>+	struct tty_struct			*tty;</div><div class='ctx'> 	int old_dcd_state;</div><div class='ctx'> 	int status = urb-&gt;status;</div><div class='ctx'> </div><div class='hunk'>@@ -689,12 +693,11 @@ static void	usa28_instat_callback(struct urb *urb)</div><div class='ctx'> 	p_priv-&gt;dcd_state = ((msg-&gt;dcd) ? 1 : 0);</div><div class='ctx'> 	p_priv-&gt;ri_state = ((msg-&gt;ri) ? 1 : 0);</div><div class='ctx'> </div><div class='del'>-	if (port-&gt;port.tty &amp;&amp; !C_CLOCAL(port-&gt;port.tty)</div><div class='del'>-	    &amp;&amp; old_dcd_state != p_priv-&gt;dcd_state) {</div><div class='del'>-		if (old_dcd_state)</div><div class='del'>-			tty_hangup(port-&gt;port.tty);</div><div class='del'>-		/*  else */</div><div class='del'>-		/*	wake_up_interruptible(&amp;p_priv-&gt;open_wait); */</div><div class='add'>+	if( old_dcd_state != p_priv-&gt;dcd_state &amp;&amp; old_dcd_state) {</div><div class='add'>+		tty = tty_port_tty_get(&amp;port-&gt;port);</div><div class='add'>+		if (tty &amp;&amp; !C_CLOCAL(tty)) </div><div class='add'>+			tty_hangup(tty);</div><div class='add'>+		tty_kref_put(tty);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 		/* Resubmit urb so we continue receiving */</div><div class='hunk'>@@ -785,12 +788,11 @@ static void	usa49_instat_callback(struct urb *urb)</div><div class='ctx'> 	p_priv-&gt;dcd_state = ((msg-&gt;dcd) ? 1 : 0);</div><div class='ctx'> 	p_priv-&gt;ri_state = ((msg-&gt;ri) ? 1 : 0);</div><div class='ctx'> </div><div class='del'>-	if (port-&gt;port.tty &amp;&amp; !C_CLOCAL(port-&gt;port.tty)</div><div class='del'>-	    &amp;&amp; old_dcd_state != p_priv-&gt;dcd_state) {</div><div class='del'>-		if (old_dcd_state)</div><div class='del'>-			tty_hangup(port-&gt;port.tty);</div><div class='del'>-		/*  else */</div><div class='del'>-		/*	wake_up_interruptible(&amp;p_priv-&gt;open_wait); */</div><div class='add'>+	if (old_dcd_state != p_priv-&gt;dcd_state &amp;&amp; old_dcd_state) {</div><div class='add'>+		struct tty_struct *tty = tty_port_tty_get(&amp;port-&gt;port);</div><div class='add'>+		if (tty &amp;&amp; !C_CLOCAL(tty))</div><div class='add'>+			tty_hangup(tty);</div><div class='add'>+		tty_kref_put(tty);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Resubmit urb so we continue receiving */</div><div class='hunk'>@@ -827,7 +829,7 @@ static void	usa49_indat_callback(struct urb *urb)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	port =  urb-&gt;context;</div><div class='del'>-	tty = port-&gt;port.tty;</div><div class='add'>+	tty = tty_port_tty_get(&amp;port-&gt;port);</div><div class='ctx'> 	if (tty &amp;&amp; urb-&gt;actual_length) {</div><div class='ctx'> 		/* 0x80 bit is error flag */</div><div class='ctx'> 		if ((data[0] &amp; 0x80) == 0) {</div><div class='hunk'>@@ -850,6 +852,7 @@ static void	usa49_indat_callback(struct urb *urb)</div><div class='ctx'> 		}</div><div class='ctx'> 		tty_flip_buffer_push(tty);</div><div class='ctx'> 	}</div><div class='add'>+	tty_kref_put(tty);</div><div class='ctx'> </div><div class='ctx'> 	/* Resubmit urb so we continue receiving */</div><div class='ctx'> 	urb-&gt;dev = port-&gt;serial-&gt;dev;</div><div class='hunk'>@@ -893,7 +896,7 @@ static void usa49wg_indat_callback(struct urb *urb)</div><div class='ctx'> 				return;</div><div class='ctx'> 			}</div><div class='ctx'> 			port = serial-&gt;port[data[i++]];</div><div class='del'>-			tty = port-&gt;port.tty;</div><div class='add'>+			tty = tty_port_tty_get(&amp;port-&gt;port);</div><div class='ctx'> 			len = data[i++];</div><div class='ctx'> </div><div class='ctx'> 			/* 0x80 bit is error flag */</div><div class='hunk'>@@ -927,6 +930,7 @@ static void usa49wg_indat_callback(struct urb *urb)</div><div class='ctx'> 			}</div><div class='ctx'> 			if (port-&gt;port.count)</div><div class='ctx'> 				tty_flip_buffer_push(tty);</div><div class='add'>+			tty_kref_put(tty);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -967,8 +971,8 @@ static void usa90_indat_callback(struct urb *urb)</div><div class='ctx'> 	port =  urb-&gt;context;</div><div class='ctx'> 	p_priv = usb_get_serial_port_data(port);</div><div class='ctx'> </div><div class='del'>-	tty = port-&gt;port.tty;</div><div class='ctx'> 	if (urb-&gt;actual_length) {</div><div class='add'>+		tty = tty_port_tty_get(&amp;port-&gt;port);</div><div class='ctx'> 		/* if current mode is DMA, looks like usa28 format</div><div class='ctx'> 		   otherwise looks like usa26 data format */</div><div class='ctx'> </div><div class='hunk'>@@ -1004,6 +1008,7 @@ static void usa90_indat_callback(struct urb *urb)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		tty_flip_buffer_push(tty);</div><div class='add'>+		tty_kref_put(tty);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Resubmit urb so we continue receiving */</div><div class='hunk'>@@ -1025,6 +1030,7 @@ static void	usa90_instat_callback(struct urb *urb)</div><div class='ctx'> 	struct usb_serial			*serial;</div><div class='ctx'> 	struct usb_serial_port			*port;</div><div class='ctx'> 	struct keyspan_port_private	 	*p_priv;</div><div class='add'>+	struct tty_struct			*tty;</div><div class='ctx'> 	int old_dcd_state, err;</div><div class='ctx'> 	int status = urb-&gt;status;</div><div class='ctx'> </div><div class='hunk'>@@ -1053,12 +1059,11 @@ static void	usa90_instat_callback(struct urb *urb)</div><div class='ctx'> 	p_priv-&gt;dcd_state = ((msg-&gt;dcd) ? 1 : 0);</div><div class='ctx'> 	p_priv-&gt;ri_state = ((msg-&gt;ri) ? 1 : 0);</div><div class='ctx'> </div><div class='del'>-	if (port-&gt;port.tty &amp;&amp; !C_CLOCAL(port-&gt;port.tty)</div><div class='del'>-	    &amp;&amp; old_dcd_state != p_priv-&gt;dcd_state) {</div><div class='del'>-		if (old_dcd_state)</div><div class='del'>-			tty_hangup(port-&gt;port.tty);</div><div class='del'>-		/*  else */</div><div class='del'>-		/*	wake_up_interruptible(&amp;p_priv-&gt;open_wait); */</div><div class='add'>+	if (old_dcd_state != p_priv-&gt;dcd_state &amp;&amp; old_dcd_state) {</div><div class='add'>+		tty = tty_port_tty_get(&amp;port-&gt;port);</div><div class='add'>+		if (tty &amp;&amp; !C_CLOCAL(tty))</div><div class='add'>+			tty_hangup(tty);</div><div class='add'>+		tty_kref_put(tty);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Resubmit urb so we continue receiving */</div><div class='hunk'>@@ -1130,12 +1135,11 @@ static void	usa67_instat_callback(struct urb *urb)</div><div class='ctx'> 	p_priv-&gt;cts_state = ((msg-&gt;hskia_cts) ? 1 : 0);</div><div class='ctx'> 	p_priv-&gt;dcd_state = ((msg-&gt;gpia_dcd) ? 1 : 0);</div><div class='ctx'> </div><div class='del'>-	if (port-&gt;port.tty &amp;&amp; !C_CLOCAL(port-&gt;port.tty)</div><div class='del'>-	    &amp;&amp; old_dcd_state != p_priv-&gt;dcd_state) {</div><div class='del'>-		if (old_dcd_state)</div><div class='del'>-			tty_hangup(port-&gt;port.tty);</div><div class='del'>-		/*  else */</div><div class='del'>-		/*	wake_up_interruptible(&amp;p_priv-&gt;open_wait); */</div><div class='add'>+	if (old_dcd_state != p_priv-&gt;dcd_state &amp;&amp; old_dcd_state) {</div><div class='add'>+		struct tty_struct *tty = tty_port_tty_get(&amp;port-&gt;port);</div><div class='add'>+		if (tty &amp;&amp; !C_CLOCAL(tty))</div><div class='add'>+			tty_hangup(tty);</div><div class='add'>+		tty_kref_put(tty);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Resubmit urb so we continue receiving */</div><div class='hunk'>@@ -1332,7 +1336,7 @@ static void keyspan_close(struct tty_struct *tty,</div><div class='ctx'> 			stop_urb(p_priv-&gt;out_urbs[i]);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	port-&gt;port.tty = NULL;</div><div class='add'>+	tty_port_tty_set(&amp;port-&gt;port, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* download the firmware to a pre-renumeration device */</div><div class='head'>diff --git a/drivers/usb/serial/keyspan_pda.c b/drivers/usb/serial/keyspan_pda.c<br/>index 040040a267d9..bf1ae247da66 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/keyspan_pda.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/serial/keyspan_pda.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/keyspan_pda.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/keyspan_pda.c</a></div><div class='hunk'>@@ -172,8 +172,9 @@ static void keyspan_pda_wakeup_write(struct work_struct *work)</div><div class='ctx'> 	struct keyspan_pda_private *priv =</div><div class='ctx'> 		container_of(work, struct keyspan_pda_private, wakeup_work);</div><div class='ctx'> 	struct usb_serial_port *port = priv-&gt;port;</div><div class='del'>-</div><div class='del'>-	tty_wakeup(port-&gt;port.tty);</div><div class='add'>+	struct tty_struct *tty = tty_port_tty_get(&amp;port-&gt;port);</div><div class='add'>+	tty_wakeup(tty);</div><div class='add'>+	tty_kref_put(tty);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void keyspan_pda_request_unthrottle(struct work_struct *work)</div><div class='hunk'>@@ -205,7 +206,7 @@ static void keyspan_pda_request_unthrottle(struct work_struct *work)</div><div class='ctx'> static void keyspan_pda_rx_interrupt(struct urb *urb)</div><div class='ctx'> {</div><div class='ctx'> 	struct usb_serial_port *port = urb-&gt;context;</div><div class='del'>-	struct tty_struct *tty = port-&gt;port.tty;</div><div class='add'>+	struct tty_struct *tty = tty_port_tty_get(&amp;port-&gt;port);</div><div class='ctx'> 	unsigned char *data = urb-&gt;transfer_buffer;</div><div class='ctx'> 	int retval;</div><div class='ctx'> 	int status = urb-&gt;status;</div><div class='hunk'>@@ -222,7 +223,7 @@ static void keyspan_pda_rx_interrupt(struct urb *urb)</div><div class='ctx'> 		/* this urb is terminated, clean up */</div><div class='ctx'> 		dbg("%s - urb shutting down with status: %d",</div><div class='ctx'> 		    __func__, status);</div><div class='del'>-		return;</div><div class='add'>+		goto out;</div><div class='ctx'> 	default:</div><div class='ctx'> 		dbg("%s - nonzero urb status received: %d",</div><div class='ctx'> 		    __func__, status);</div><div class='hunk'>@@ -261,8 +262,11 @@ static void keyspan_pda_rx_interrupt(struct urb *urb)</div><div class='ctx'> exit:</div><div class='ctx'> 	retval = usb_submit_urb(urb, GFP_ATOMIC);</div><div class='ctx'> 	if (retval)</div><div class='del'>-		err("%s - usb_submit_urb failed with result %d",</div><div class='del'>-		     __func__, retval);</div><div class='add'>+		dev_err(&amp;port-&gt;dev,</div><div class='add'>+			"%s - usb_submit_urb failed with result %d",</div><div class='add'>+			__func__, retval);</div><div class='add'>+out:</div><div class='add'>+	tty_kref_put(tty);		     </div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -738,11 +742,13 @@ static int keyspan_pda_fake_startup(struct usb_serial *serial)</div><div class='ctx'> 		fw_name = "keyspan_pda/xircom_pgs.fw";</div><div class='ctx'> #endif</div><div class='ctx'> 	else {</div><div class='del'>-		err("%s: unknown vendor, aborting.", __func__);</div><div class='add'>+		dev_err(&amp;serial-&gt;dev-&gt;dev, "%s: unknown vendor, aborting.\n",</div><div class='add'>+			__func__);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (request_ihex_firmware(&amp;fw, fw_name, &amp;serial-&gt;dev-&gt;dev)) {</div><div class='del'>-		err("failed to load firmware \"%s\"\n", fw_name);</div><div class='add'>+		dev_err(&amp;serial-&gt;dev-&gt;dev, "failed to load firmware \"%s\"\n",</div><div class='add'>+			fw_name);</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> 	}</div><div class='ctx'> 	record = (const struct ihex_binrec *)fw-&gt;data;</div><div class='hunk'>@@ -752,10 +758,10 @@ static int keyspan_pda_fake_startup(struct usb_serial *serial)</div><div class='ctx'> 					     (unsigned char *)record-&gt;data,</div><div class='ctx'> 					     be16_to_cpu(record-&gt;len), 0xa0);</div><div class='ctx'> 		if (response &lt; 0) {</div><div class='del'>-			err("ezusb_writememory failed for Keyspan PDA "</div><div class='del'>-			    "firmware (%d %04X %p %d)",</div><div class='del'>-			    response, be32_to_cpu(record-&gt;addr),</div><div class='del'>-			    record-&gt;data, be16_to_cpu(record-&gt;len));</div><div class='add'>+			dev_err(&amp;serial-&gt;dev-&gt;dev, "ezusb_writememory failed "</div><div class='add'>+				"for Keyspan PDA firmware (%d %04X %p %d)\n",</div><div class='add'>+				response, be32_to_cpu(record-&gt;addr),</div><div class='add'>+				record-&gt;data, be16_to_cpu(record-&gt;len));</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		record = ihex_next_binrec(record);</div><div class='hunk'>@@ -870,7 +876,8 @@ static int __init keyspan_pda_init(void)</div><div class='ctx'> 	retval = usb_register(&amp;keyspan_pda_driver);</div><div class='ctx'> 	if (retval)</div><div class='ctx'> 		goto failed_usb_register;</div><div class='del'>-	info(DRIVER_DESC " " DRIVER_VERSION);</div><div class='add'>+	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"</div><div class='add'>+	       DRIVER_DESC "\n");</div><div class='ctx'> 	return 0;</div><div class='ctx'> failed_usb_register:</div><div class='ctx'> #ifdef XIRCOM</div><div class='head'>diff --git a/drivers/usb/serial/kl5kusb105.c b/drivers/usb/serial/kl5kusb105.c<br/>index b84dddc71124..dc36a052766f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/kl5kusb105.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/serial/kl5kusb105.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/kl5kusb105.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/kl5kusb105.c</a></div><div class='hunk'>@@ -182,12 +182,12 @@ static int klsi_105_chg_port_settings(struct usb_serial_port *port,</div><div class='ctx'> 			sizeof(struct klsi_105_port_settings),</div><div class='ctx'> 			KLSI_TIMEOUT);</div><div class='ctx'> 	if (rc &lt; 0)</div><div class='del'>-		err("Change port settings failed (error = %d)", rc);</div><div class='del'>-	info("%s - %d byte block, baudrate %x, databits %d, u1 %d, u2 %d",</div><div class='del'>-	    __func__,</div><div class='del'>-	    settings-&gt;pktlen,</div><div class='del'>-	    settings-&gt;baudrate, settings-&gt;databits,</div><div class='del'>-	    settings-&gt;unknown1, settings-&gt;unknown2);</div><div class='add'>+		dev_err(&amp;port-&gt;dev,</div><div class='add'>+			"Change port settings failed (error = %d)\n", rc);</div><div class='add'>+	dev_info(&amp;port-&gt;serial-&gt;dev-&gt;dev,</div><div class='add'>+		 "%d byte block, baudrate %x, databits %d, u1 %d, u2 %d\n",</div><div class='add'>+		 settings-&gt;pktlen, settings-&gt;baudrate, settings-&gt;databits,</div><div class='add'>+		 settings-&gt;unknown1, settings-&gt;unknown2);</div><div class='ctx'> 	return rc;</div><div class='ctx'> } /* klsi_105_chg_port_settings */</div><div class='ctx'> </div><div class='hunk'>@@ -215,7 +215,7 @@ static int klsi_105_get_line_state(struct usb_serial_port *port,</div><div class='ctx'> 	__u8 status_buf[KLSI_STATUSBUF_LEN] = { -1, -1};</div><div class='ctx'> 	__u16 status;</div><div class='ctx'> </div><div class='del'>-	info("%s - sending SIO Poll request", __func__);</div><div class='add'>+	dev_info(&amp;port-&gt;serial-&gt;dev-&gt;dev, "sending SIO Poll request\n");</div><div class='ctx'> 	rc = usb_control_msg(port-&gt;serial-&gt;dev,</div><div class='ctx'> 			     usb_rcvctrlpipe(port-&gt;serial-&gt;dev, 0),</div><div class='ctx'> 			     KL5KUSB105A_SIO_POLL,</div><div class='hunk'>@@ -226,12 +226,13 @@ static int klsi_105_get_line_state(struct usb_serial_port *port,</div><div class='ctx'> 			     10000</div><div class='ctx'> 			     );</div><div class='ctx'> 	if (rc &lt; 0)</div><div class='del'>-		err("Reading line status failed (error = %d)", rc);</div><div class='add'>+		dev_err(&amp;port-&gt;dev, "Reading line status failed (error = %d)\n",</div><div class='add'>+			rc);</div><div class='ctx'> 	else {</div><div class='ctx'> 		status = get_unaligned_le16(status_buf);</div><div class='ctx'> </div><div class='del'>-		info("%s - read status %x %x", __func__,</div><div class='del'>-		     status_buf[0], status_buf[1]);</div><div class='add'>+		dev_info(&amp;port-&gt;serial-&gt;dev-&gt;dev, "read status %x %x",</div><div class='add'>+			 status_buf[0], status_buf[1]);</div><div class='ctx'> </div><div class='ctx'> 		*line_state_p = klsi_105_status2linestate(status);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -280,15 +281,16 @@ static int klsi_105_startup(struct usb_serial *serial)</div><div class='ctx'> </div><div class='ctx'> 			priv-&gt;write_urb_pool[j] = urb;</div><div class='ctx'> 			if (urb == NULL) {</div><div class='del'>-				err("No more urbs???");</div><div class='add'>+				dev_err(&amp;serial-&gt;dev-&gt;dev, "No more urbs???\n");</div><div class='ctx'> 				goto err_cleanup;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			urb-&gt;transfer_buffer =</div><div class='ctx'> 				kmalloc(URB_TRANSFER_BUFFER_SIZE, GFP_KERNEL);</div><div class='ctx'> 			if (!urb-&gt;transfer_buffer) {</div><div class='del'>-				err("%s - out of memory for urb buffers.",</div><div class='del'>-								__func__);</div><div class='add'>+				dev_err(&amp;serial-&gt;dev-&gt;dev,</div><div class='add'>+					"%s - out of memory for urb buffers.\n",</div><div class='add'>+					__func__);</div><div class='ctx'> 				goto err_cleanup;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -409,7 +411,8 @@ static int  klsi_105_open(struct tty_struct *tty,</div><div class='ctx'> </div><div class='ctx'> 	rc = usb_submit_urb(port-&gt;read_urb, GFP_KERNEL);</div><div class='ctx'> 	if (rc) {</div><div class='del'>-		err("%s - failed submitting read urb, error %d", __func__, rc);</div><div class='add'>+		dev_err(&amp;port-&gt;dev, "%s - failed submitting read urb, "</div><div class='add'>+			"error %d\n", __func__, rc);</div><div class='ctx'> 		retval = rc;</div><div class='ctx'> 		goto exit;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -424,7 +427,7 @@ static int  klsi_105_open(struct tty_struct *tty,</div><div class='ctx'> 			     0,</div><div class='ctx'> 			     KLSI_TIMEOUT);</div><div class='ctx'> 	if (rc &lt; 0) {</div><div class='del'>-		err("Enabling read failed (error = %d)", rc);</div><div class='add'>+		dev_err(&amp;port-&gt;dev, "Enabling read failed (error = %d)\n", rc);</div><div class='ctx'> 		retval = rc;</div><div class='ctx'> 	} else</div><div class='ctx'> 		dbg("%s - enabled reading", __func__);</div><div class='hunk'>@@ -464,7 +467,8 @@ static void klsi_105_close(struct tty_struct *tty,</div><div class='ctx'> 				     NULL, 0,</div><div class='ctx'> 				     KLSI_TIMEOUT);</div><div class='ctx'> 		if (rc &lt; 0)</div><div class='del'>-			err("Disabling read failed (error = %d)", rc);</div><div class='add'>+			dev_err(&amp;port-&gt;dev,</div><div class='add'>+				"Disabling read failed (error = %d)\n", rc);</div><div class='ctx'> 	}</div><div class='ctx'> 	mutex_unlock(&amp;port-&gt;serial-&gt;disc_mutex);</div><div class='ctx'> </div><div class='hunk'>@@ -475,8 +479,9 @@ static void klsi_105_close(struct tty_struct *tty,</div><div class='ctx'> 	/* FIXME */</div><div class='ctx'> 	/* wgg - do I need this? I think so. */</div><div class='ctx'> 	usb_kill_urb(port-&gt;interrupt_in_urb);</div><div class='del'>-	info("kl5kusb105 port stats: %ld bytes in, %ld bytes out",</div><div class='del'>-					priv-&gt;bytes_in, priv-&gt;bytes_out);</div><div class='add'>+	dev_info(&amp;port-&gt;serial-&gt;dev-&gt;dev,</div><div class='add'>+		 "port stats: %ld bytes in, %ld bytes out\n",</div><div class='add'>+		 priv-&gt;bytes_in, priv-&gt;bytes_out);</div><div class='ctx'> } /* klsi_105_close */</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -522,7 +527,9 @@ static int klsi_105_write(struct tty_struct *tty,</div><div class='ctx'> 			urb-&gt;transfer_buffer =</div><div class='ctx'> 				kmalloc(URB_TRANSFER_BUFFER_SIZE, GFP_ATOMIC);</div><div class='ctx'> 			if (urb-&gt;transfer_buffer == NULL) {</div><div class='del'>-				err("%s - no more kernel memory...", __func__);</div><div class='add'>+				dev_err(&amp;port-&gt;dev,</div><div class='add'>+					"%s - no more kernel memory...\n",</div><div class='add'>+					__func__);</div><div class='ctx'> 				goto exit;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -549,8 +556,9 @@ static int klsi_105_write(struct tty_struct *tty,</div><div class='ctx'> 		/* send the data out the bulk port */</div><div class='ctx'> 		result = usb_submit_urb(urb, GFP_ATOMIC);</div><div class='ctx'> 		if (result) {</div><div class='del'>-			err("%s - failed submitting write urb, error %d",</div><div class='del'>-							__func__, result);</div><div class='add'>+			dev_err(&amp;port-&gt;dev,</div><div class='add'>+				"%s - failed submitting write urb, error %d\n",</div><div class='add'>+				__func__, result);</div><div class='ctx'> 			goto exit;</div><div class='ctx'> 		}</div><div class='ctx'> 		buf += size;</div><div class='hunk'>@@ -658,7 +666,7 @@ static void klsi_105_read_bulk_callback(struct urb *urb)</div><div class='ctx'> 	} else {</div><div class='ctx'> 		int bytes_sent = ((__u8 *) data)[0] +</div><div class='ctx'> 				 ((unsigned int) ((__u8 *) data)[1] &lt;&lt; 8);</div><div class='del'>-		tty = port-&gt;port.tty;</div><div class='add'>+		tty = tty_port_tty_get(&amp;port-&gt;port);</div><div class='ctx'> 		/* we should immediately resubmit the URB, before attempting</div><div class='ctx'> 		 * to pass the data on to the tty layer. But that needs locking</div><div class='ctx'> 		 * against re-entry an then mixed-up data because of</div><div class='hunk'>@@ -679,6 +687,7 @@ static void klsi_105_read_bulk_callback(struct urb *urb)</div><div class='ctx'> 		tty_buffer_request_room(tty, bytes_sent);</div><div class='ctx'> 		tty_insert_flip_string(tty, data + 2, bytes_sent);</div><div class='ctx'> 		tty_flip_buffer_push(tty);</div><div class='add'>+		tty_kref_put(tty);</div><div class='ctx'> </div><div class='ctx'> 		/* again lockless, but debug info only */</div><div class='ctx'> 		priv-&gt;bytes_in += bytes_sent;</div><div class='hunk'>@@ -693,8 +702,9 @@ static void klsi_105_read_bulk_callback(struct urb *urb)</div><div class='ctx'> 		      port);</div><div class='ctx'> 	rc = usb_submit_urb(port-&gt;read_urb, GFP_ATOMIC);</div><div class='ctx'> 	if (rc)</div><div class='del'>-		err("%s - failed resubmitting read urb, error %d",</div><div class='del'>-							__func__, rc);</div><div class='add'>+		dev_err(&amp;port-&gt;dev,</div><div class='add'>+			"%s - failed resubmitting read urb, error %d\n",</div><div class='add'>+			__func__, rc);</div><div class='ctx'> } /* klsi_105_read_bulk_callback */</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -798,7 +808,8 @@ static void klsi_105_set_termios(struct tty_struct *tty,</div><div class='ctx'> 			priv-&gt;cfg.databits = kl5kusb105a_dtb_8;</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='del'>-			err("CSIZE was not CS5-CS8, using default of 8");</div><div class='add'>+			dev_err(&amp;port-&gt;dev,</div><div class='add'>+				"CSIZE was not CS5-CS8, using default of 8\n");</div><div class='ctx'> 			priv-&gt;cfg.databits = kl5kusb105a_dtb_8;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -885,7 +896,8 @@ static int klsi_105_tiocmget(struct tty_struct *tty, struct file *file)</div><div class='ctx'> </div><div class='ctx'> 	rc = klsi_105_get_line_state(port, &amp;line_state);</div><div class='ctx'> 	if (rc &lt; 0) {</div><div class='del'>-		err("Reading line control failed (error = %d)", rc);</div><div class='add'>+		dev_err(&amp;port-&gt;dev,</div><div class='add'>+			"Reading line control failed (error = %d)\n", rc);</div><div class='ctx'> 		/* better return value? EAGAIN? */</div><div class='ctx'> 		return rc;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -943,8 +955,9 @@ static void klsi_105_unthrottle(struct tty_struct *tty)</div><div class='ctx'> 	port-&gt;read_urb-&gt;dev = port-&gt;serial-&gt;dev;</div><div class='ctx'> 	result = usb_submit_urb(port-&gt;read_urb, GFP_ATOMIC);</div><div class='ctx'> 	if (result)</div><div class='del'>-		err("%s - failed submitting read urb, error %d", __func__,</div><div class='del'>-		    result);</div><div class='add'>+		dev_err(&amp;port-&gt;dev,</div><div class='add'>+			"%s - failed submitting read urb, error %d\n",</div><div class='add'>+			__func__, result);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -959,7 +972,8 @@ static int __init klsi_105_init(void)</div><div class='ctx'> 	if (retval)</div><div class='ctx'> 		goto failed_usb_register;</div><div class='ctx'> </div><div class='del'>-	info(DRIVER_DESC " " DRIVER_VERSION);</div><div class='add'>+	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"</div><div class='add'>+	       DRIVER_DESC "\n");</div><div class='ctx'> 	return 0;</div><div class='ctx'> failed_usb_register:</div><div class='ctx'> 	usb_serial_deregister(&amp;kl5kusb105d_device);</div><div class='head'>diff --git a/drivers/usb/serial/kobil_sct.c b/drivers/usb/serial/kobil_sct.c<br/>index deba28ec77e8..6286baad9392 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/kobil_sct.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/serial/kobil_sct.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/kobil_sct.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/kobil_sct.c</a></div><div class='hunk'>@@ -383,7 +383,7 @@ static void kobil_read_int_callback(struct urb *urb)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	tty = port-&gt;port.tty;</div><div class='add'>+	tty = tty_port_tty_get(&amp;port-&gt;port);</div><div class='ctx'> 	if (urb-&gt;actual_length) {</div><div class='ctx'> </div><div class='ctx'> 		/* BEGIN DEBUG */</div><div class='hunk'>@@ -405,6 +405,7 @@ static void kobil_read_int_callback(struct urb *urb)</div><div class='ctx'> 		tty_insert_flip_string(tty, data, urb-&gt;actual_length);</div><div class='ctx'> 		tty_flip_buffer_push(tty);</div><div class='ctx'> 	}</div><div class='add'>+	tty_kref_put(tty);</div><div class='ctx'> 	/* someone sets the dev to 0 if the close method has been called */</div><div class='ctx'> 	port-&gt;interrupt_in_urb-&gt;dev = port-&gt;serial-&gt;dev;</div><div class='ctx'> </div><div class='hunk'>@@ -743,8 +744,8 @@ static int __init kobil_init(void)</div><div class='ctx'> 	if (retval)</div><div class='ctx'> 		goto failed_usb_register;</div><div class='ctx'> </div><div class='del'>-	info(DRIVER_VERSION " " DRIVER_AUTHOR);</div><div class='del'>-	info(DRIVER_DESC);</div><div class='add'>+	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"</div><div class='add'>+	       DRIVER_DESC "\n");</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> failed_usb_register:</div><div class='head'>diff --git a/drivers/usb/serial/mct_u232.c b/drivers/usb/serial/mct_u232.c<br/>index 0ded8bd6ec85..07710cf31d0d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/mct_u232.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/serial/mct_u232.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/mct_u232.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/mct_u232.c</a></div><div class='hunk'>@@ -246,7 +246,8 @@ static int mct_u232_set_baud_rate(struct tty_struct *tty,</div><div class='ctx'> 				0, 0, &amp;divisor, MCT_U232_SET_BAUD_RATE_SIZE,</div><div class='ctx'> 				WDR_TIMEOUT);</div><div class='ctx'> 	if (rc &lt; 0)	/*FIXME: What value speed results */</div><div class='del'>-		err("Set BAUD RATE %d failed (error = %d)", value, rc);</div><div class='add'>+		dev_err(&amp;port-&gt;dev, "Set BAUD RATE %d failed (error = %d)\n",</div><div class='add'>+			value, rc);</div><div class='ctx'> 	else</div><div class='ctx'> 		tty_encode_baud_rate(tty, speed, speed);</div><div class='ctx'> 	dbg("set_baud_rate: value: 0x%x, divisor: 0x%x", value, divisor);</div><div class='hunk'>@@ -274,8 +275,9 @@ static int mct_u232_set_baud_rate(struct tty_struct *tty,</div><div class='ctx'> 				0, 0, &amp;zero_byte, MCT_U232_SET_UNKNOWN1_SIZE,</div><div class='ctx'> 				WDR_TIMEOUT);</div><div class='ctx'> 	if (rc &lt; 0)</div><div class='del'>-		err("Sending USB device request code %d failed (error = %d)",</div><div class='del'>-		    MCT_U232_SET_UNKNOWN1_REQUEST, rc);</div><div class='add'>+		dev_err(&amp;port-&gt;dev, "Sending USB device request code %d "</div><div class='add'>+			"failed (error = %d)\n", MCT_U232_SET_UNKNOWN1_REQUEST,</div><div class='add'>+			rc);</div><div class='ctx'> </div><div class='ctx'> 	if (port &amp;&amp; C_CRTSCTS(tty))</div><div class='ctx'> 	   cts_enable_byte = 1;</div><div class='hunk'>@@ -288,8 +290,8 @@ static int mct_u232_set_baud_rate(struct tty_struct *tty,</div><div class='ctx'> 			0, 0, &amp;cts_enable_byte, MCT_U232_SET_CTS_SIZE,</div><div class='ctx'> 			WDR_TIMEOUT);</div><div class='ctx'> 	if (rc &lt; 0)</div><div class='del'>-		err("Sending USB device request code %d failed (error = %d)",</div><div class='del'>-					MCT_U232_SET_CTS_REQUEST, rc);</div><div class='add'>+		dev_err(&amp;port-&gt;dev, "Sending USB device request code %d "</div><div class='add'>+			"failed (error = %d)\n", MCT_U232_SET_CTS_REQUEST, rc);</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='ctx'> } /* mct_u232_set_baud_rate */</div><div class='hunk'>@@ -303,7 +305,8 @@ static int mct_u232_set_line_ctrl(struct usb_serial *serial, unsigned char lcr)</div><div class='ctx'> 			0, 0, &amp;lcr, MCT_U232_SET_LINE_CTRL_SIZE,</div><div class='ctx'> 			WDR_TIMEOUT);</div><div class='ctx'> 	if (rc &lt; 0)</div><div class='del'>-		err("Set LINE CTRL 0x%x failed (error = %d)", lcr, rc);</div><div class='add'>+		dev_err(&amp;serial-&gt;dev-&gt;dev,</div><div class='add'>+			"Set LINE CTRL 0x%x failed (error = %d)\n", lcr, rc);</div><div class='ctx'> 	dbg("set_line_ctrl: 0x%x", lcr);</div><div class='ctx'> 	return rc;</div><div class='ctx'> } /* mct_u232_set_line_ctrl */</div><div class='hunk'>@@ -325,7 +328,8 @@ static int mct_u232_set_modem_ctrl(struct usb_serial *serial,</div><div class='ctx'> 			0, 0, &amp;mcr, MCT_U232_SET_MODEM_CTRL_SIZE,</div><div class='ctx'> 			WDR_TIMEOUT);</div><div class='ctx'> 	if (rc &lt; 0)</div><div class='del'>-		err("Set MODEM CTRL 0x%x failed (error = %d)", mcr, rc);</div><div class='add'>+		dev_err(&amp;serial-&gt;dev-&gt;dev,</div><div class='add'>+			"Set MODEM CTRL 0x%x failed (error = %d)\n", mcr, rc);</div><div class='ctx'> 	dbg("set_modem_ctrl: state=0x%x ==&gt; mcr=0x%x", control_state, mcr);</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='hunk'>@@ -341,7 +345,8 @@ static int mct_u232_get_modem_stat(struct usb_serial *serial,</div><div class='ctx'> 			0, 0, msr, MCT_U232_GET_MODEM_STAT_SIZE,</div><div class='ctx'> 			WDR_TIMEOUT);</div><div class='ctx'> 	if (rc &lt; 0) {</div><div class='del'>-		err("Get MODEM STATus failed (error = %d)", rc);</div><div class='add'>+		dev_err(&amp;serial-&gt;dev-&gt;dev,</div><div class='add'>+			"Get MODEM STATus failed (error = %d)\n", rc);</div><div class='ctx'> 		*msr = 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	dbg("get_modem_stat: 0x%x", *msr);</div><div class='hunk'>@@ -470,8 +475,9 @@ static int  mct_u232_open(struct tty_struct *tty,</div><div class='ctx'> 	port-&gt;read_urb-&gt;dev = port-&gt;serial-&gt;dev;</div><div class='ctx'> 	retval = usb_submit_urb(port-&gt;read_urb, GFP_KERNEL);</div><div class='ctx'> 	if (retval) {</div><div class='del'>-		err("usb_submit_urb(read bulk) failed pipe 0x%x err %d",</div><div class='del'>-		    port-&gt;read_urb-&gt;pipe, retval);</div><div class='add'>+		dev_err(&amp;port-&gt;dev,</div><div class='add'>+			"usb_submit_urb(read bulk) failed pipe 0x%x err %d\n",</div><div class='add'>+			port-&gt;read_urb-&gt;pipe, retval);</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -479,8 +485,9 @@ static int  mct_u232_open(struct tty_struct *tty,</div><div class='ctx'> 	retval = usb_submit_urb(port-&gt;interrupt_in_urb, GFP_KERNEL);</div><div class='ctx'> 	if (retval) {</div><div class='ctx'> 		usb_kill_urb(port-&gt;read_urb);</div><div class='del'>-		err(" usb_submit_urb(read int) failed pipe 0x%x err %d",</div><div class='del'>-		    port-&gt;interrupt_in_urb-&gt;pipe, retval);</div><div class='add'>+		dev_err(&amp;port-&gt;dev,</div><div class='add'>+			"usb_submit_urb(read int) failed pipe 0x%x err %d",</div><div class='add'>+			port-&gt;interrupt_in_urb-&gt;pipe, retval);</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -563,10 +570,11 @@ static void mct_u232_read_int_callback(struct urb *urb)</div><div class='ctx'> 	 * Work-a-round: handle the 'usual' bulk-in pipe here</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (urb-&gt;transfer_buffer_length &gt; 2) {</div><div class='del'>-		tty = port-&gt;port.tty;</div><div class='add'>+		tty = tty_port_tty_get(&amp;port-&gt;port);</div><div class='ctx'> 		if (urb-&gt;actual_length) {</div><div class='ctx'> 			tty_insert_flip_string(tty, data, urb-&gt;actual_length);</div><div class='ctx'> 			tty_flip_buffer_push(tty);</div><div class='add'>+			tty_kref_put(tty);</div><div class='ctx'> 		}</div><div class='ctx'> 		goto exit;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -591,7 +599,7 @@ static void mct_u232_read_int_callback(struct urb *urb)</div><div class='ctx'> 	 * to look in to this before committing any code.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (priv-&gt;last_lsr &amp; MCT_U232_LSR_ERR) {</div><div class='del'>-		tty = port-&gt;port.tty;</div><div class='add'>+		tty = tty_port_tty_get(&amp;port-&gt;port);</div><div class='ctx'> 		/* Overrun Error */</div><div class='ctx'> 		if (priv-&gt;last_lsr &amp; MCT_U232_LSR_OE) {</div><div class='ctx'> 		}</div><div class='hunk'>@@ -604,14 +612,16 @@ static void mct_u232_read_int_callback(struct urb *urb)</div><div class='ctx'> 		/* Break Indicator */</div><div class='ctx'> 		if (priv-&gt;last_lsr &amp; MCT_U232_LSR_BI) {</div><div class='ctx'> 		}</div><div class='add'>+		tty_kref_put(tty);</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='ctx'> exit:</div><div class='ctx'> 	retval = usb_submit_urb(urb, GFP_ATOMIC);</div><div class='ctx'> 	if (retval)</div><div class='del'>-		err("%s - usb_submit_urb failed with result %d",</div><div class='del'>-		     __func__, retval);</div><div class='add'>+		dev_err(&amp;port-&gt;dev,</div><div class='add'>+			"%s - usb_submit_urb failed with result %d\n",</div><div class='add'>+			__func__, retval);</div><div class='ctx'> } /* mct_u232_read_int_callback */</div><div class='ctx'> </div><div class='ctx'> static void mct_u232_set_termios(struct tty_struct *tty,</div><div class='hunk'>@@ -678,7 +688,8 @@ static void mct_u232_set_termios(struct tty_struct *tty,</div><div class='ctx'> 	case CS8:</div><div class='ctx'> 		last_lcr |= MCT_U232_DATA_BITS_8; break;</div><div class='ctx'> 	default:</div><div class='del'>-		err("CSIZE was not CS5-CS8, using default of 8");</div><div class='add'>+		dev_err(&amp;port-&gt;dev,</div><div class='add'>+			"CSIZE was not CS5-CS8, using default of 8\n");</div><div class='ctx'> 		last_lcr |= MCT_U232_DATA_BITS_8;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -815,7 +826,8 @@ static int __init mct_u232_init(void)</div><div class='ctx'> 	retval = usb_register(&amp;mct_u232_driver);</div><div class='ctx'> 	if (retval)</div><div class='ctx'> 		goto failed_usb_register;</div><div class='del'>-	info(DRIVER_DESC " " DRIVER_VERSION);</div><div class='add'>+	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"</div><div class='add'>+	       DRIVER_DESC "\n");</div><div class='ctx'> 	return 0;</div><div class='ctx'> failed_usb_register:</div><div class='ctx'> 	usb_serial_deregister(&amp;mct_u232_device);</div><div class='head'>diff --git a/drivers/usb/serial/mos7720.c b/drivers/usb/serial/mos7720.c<br/>index 7c4917d77c0a..e772cc0a97fd 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/mos7720.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/serial/mos7720.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/mos7720.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/mos7720.c</a></div><div class='hunk'>@@ -216,12 +216,13 @@ static void mos7720_bulk_in_callback(struct urb *urb)</div><div class='ctx'> </div><div class='ctx'> 	data = urb-&gt;transfer_buffer;</div><div class='ctx'> </div><div class='del'>-	tty = port-&gt;port.tty;</div><div class='add'>+	tty = tty_port_tty_get(&amp;port-&gt;port);</div><div class='ctx'> 	if (tty &amp;&amp; urb-&gt;actual_length) {</div><div class='ctx'> 		tty_buffer_request_room(tty, urb-&gt;actual_length);</div><div class='ctx'> 		tty_insert_flip_string(tty, data, urb-&gt;actual_length);</div><div class='ctx'> 		tty_flip_buffer_push(tty);</div><div class='ctx'> 	}</div><div class='add'>+	tty_kref_put(tty);</div><div class='ctx'> </div><div class='ctx'> 	if (!port-&gt;read_urb) {</div><div class='ctx'> 		dbg("URB KILLED !!!");</div><div class='hunk'>@@ -262,10 +263,11 @@ static void mos7720_bulk_out_data_callback(struct urb *urb)</div><div class='ctx'> </div><div class='ctx'> 	dbg("Entering .........");</div><div class='ctx'> </div><div class='del'>-	tty = mos7720_port-&gt;port-&gt;port.tty;</div><div class='add'>+	tty = tty_port_tty_get(&amp;mos7720_port-&gt;port-&gt;port);</div><div class='ctx'> </div><div class='ctx'> 	if (tty &amp;&amp; mos7720_port-&gt;open)</div><div class='ctx'> 		tty_wakeup(tty);</div><div class='add'>+	tty_kref_put(tty);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -353,14 +355,16 @@ static int mos7720_open(struct tty_struct *tty,</div><div class='ctx'> 		mos7720_port-&gt;write_urb_pool[j] = urb;</div><div class='ctx'> </div><div class='ctx'> 		if (urb == NULL) {</div><div class='del'>-			err("No more urbs???");</div><div class='add'>+			dev_err(&amp;port-&gt;dev, "No more urbs???\n");</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		urb-&gt;transfer_buffer = kmalloc(URB_TRANSFER_BUFFER_SIZE,</div><div class='ctx'> 					       GFP_KERNEL);</div><div class='ctx'> 		if (!urb-&gt;transfer_buffer) {</div><div class='del'>-			err("%s-out of memory for urb buffers.", __func__);</div><div class='add'>+			dev_err(&amp;port-&gt;dev,</div><div class='add'>+				"%s-out of memory for urb buffers.\n",</div><div class='add'>+				__func__);</div><div class='ctx'> 			usb_free_urb(mos7720_port-&gt;write_urb_pool[j]);</div><div class='ctx'> 			mos7720_port-&gt;write_urb_pool[j] = NULL;</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -692,7 +696,8 @@ static int mos7720_write(struct tty_struct *tty, struct usb_serial_port *port,</div><div class='ctx'> 		urb-&gt;transfer_buffer = kmalloc(URB_TRANSFER_BUFFER_SIZE,</div><div class='ctx'> 					       GFP_KERNEL);</div><div class='ctx'> 		if (urb-&gt;transfer_buffer == NULL) {</div><div class='del'>-			err("%s no more kernel memory...", __func__);</div><div class='add'>+			dev_err(&amp;port-&gt;dev, "%s no more kernel memory...\n",</div><div class='add'>+				__func__);</div><div class='ctx'> 			goto exit;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -712,8 +717,8 @@ static int mos7720_write(struct tty_struct *tty, struct usb_serial_port *port,</div><div class='ctx'> 	/* send it down the pipe */</div><div class='ctx'> 	status = usb_submit_urb(urb, GFP_ATOMIC);</div><div class='ctx'> 	if (status) {</div><div class='del'>-		err("%s - usb_submit_urb(write bulk) failed with status = %d",</div><div class='del'>-		    __func__, status);</div><div class='add'>+		dev_err(&amp;port-&gt;dev, "%s - usb_submit_urb(write bulk) failed "</div><div class='add'>+			"with status = %d\n", __func__, status);</div><div class='ctx'> 		bytes_sent = status;</div><div class='ctx'> 		goto exit;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -973,7 +978,7 @@ static int send_cmd_write_baud_rate(struct moschip_port *mos7720_port,</div><div class='ctx'> 	/* Calculate the Divisor */</div><div class='ctx'> 	status = calc_baud_rate_divisor(baudrate, &amp;divisor);</div><div class='ctx'> 	if (status) {</div><div class='del'>-		err("%s - bad baud rate", __func__);</div><div class='add'>+		dev_err(&amp;port-&gt;dev, "%s - bad baud rate\n", __func__);</div><div class='ctx'> 		return status;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1267,29 +1272,6 @@ static int get_lsr_info(struct tty_struct *tty,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * get_number_bytes_avail - get number of bytes available</div><div class='del'>- *</div><div class='del'>- * Purpose: Let user call ioctl to get the count of number of bytes available.</div><div class='del'>- */</div><div class='del'>-static int get_number_bytes_avail(struct moschip_port *mos7720_port,</div><div class='del'>-				  unsigned int __user *value)</div><div class='del'>-{</div><div class='del'>-	unsigned int result = 0;</div><div class='del'>-	struct tty_struct *tty = mos7720_port-&gt;port-&gt;port.tty;</div><div class='del'>-</div><div class='del'>-	if (!tty)</div><div class='del'>-		return -ENOIOCTLCMD;</div><div class='del'>-</div><div class='del'>-	result = tty-&gt;read_cnt;</div><div class='del'>-</div><div class='del'>-	dbg("%s(%d) = %d", __func__,  mos7720_port-&gt;port-&gt;number, result);</div><div class='del'>-	if (copy_to_user(value, &amp;result, sizeof(int)))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	return -ENOIOCTLCMD;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int set_modem_info(struct moschip_port *mos7720_port, unsigned int cmd,</div><div class='ctx'> 			  unsigned int __user *value)</div><div class='ctx'> {</div><div class='hunk'>@@ -1409,13 +1391,6 @@ static int mos7720_ioctl(struct tty_struct *tty, struct file *file,</div><div class='ctx'> 	dbg("%s - port %d, cmd = 0x%x", __func__, port-&gt;number, cmd);</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='del'>-	case TIOCINQ:</div><div class='del'>-		/* return number of bytes available */</div><div class='del'>-		dbg("%s (%d) TIOCINQ", __func__,  port-&gt;number);</div><div class='del'>-		return get_number_bytes_avail(mos7720_port,</div><div class='del'>-					      (unsigned int __user *)arg);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='ctx'> 	case TIOCSERGETLSR:</div><div class='ctx'> 		dbg("%s (%d) TIOCSERGETLSR", __func__,  port-&gt;number);</div><div class='ctx'> 		return get_lsr_info(tty, mos7720_port,</div><div class='hunk'>@@ -1506,7 +1481,7 @@ static int mos7720_startup(struct usb_serial *serial)</div><div class='ctx'> 	/* create our private serial structure */</div><div class='ctx'> 	mos7720_serial = kzalloc(sizeof(struct moschip_serial), GFP_KERNEL);</div><div class='ctx'> 	if (mos7720_serial == NULL) {</div><div class='del'>-		err("%s - Out of memory", __func__);</div><div class='add'>+		dev_err(&amp;dev-&gt;dev, "%s - Out of memory\n", __func__);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1519,7 +1494,7 @@ static int mos7720_startup(struct usb_serial *serial)</div><div class='ctx'> 	for (i = 0; i &lt; serial-&gt;num_ports; ++i) {</div><div class='ctx'> 		mos7720_port = kzalloc(sizeof(struct moschip_port), GFP_KERNEL);</div><div class='ctx'> 		if (mos7720_port == NULL) {</div><div class='del'>-			err("%s - Out of memory", __func__);</div><div class='add'>+			dev_err(&amp;dev-&gt;dev, "%s - Out of memory\n", __func__);</div><div class='ctx'> 			usb_set_serial_data(serial, NULL);</div><div class='ctx'> 			kfree(mos7720_serial);</div><div class='ctx'> 			return -ENOMEM;</div><div class='hunk'>@@ -1613,7 +1588,8 @@ static int __init moschip7720_init(void)</div><div class='ctx'> 	if (retval)</div><div class='ctx'> 		goto failed_port_device_register;</div><div class='ctx'> </div><div class='del'>-	info(DRIVER_DESC " " DRIVER_VERSION);</div><div class='add'>+	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"</div><div class='add'>+	       DRIVER_DESC "\n");</div><div class='ctx'> </div><div class='ctx'> 	/* Register with the usb */</div><div class='ctx'> 	retval = usb_register(&amp;usb_driver);</div><div class='head'>diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c<br/>index 09d82062b973..fda4a6421c44 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/mos7840.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/serial/mos7840.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/mos7840.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/mos7840.c</a></div><div class='hunk'>@@ -709,12 +709,13 @@ static void mos7840_bulk_in_callback(struct urb *urb)</div><div class='ctx'> 	dbg("%s", "Entering ........... \n");</div><div class='ctx'> </div><div class='ctx'> 	if (urb-&gt;actual_length) {</div><div class='del'>-		tty = mos7840_port-&gt;port-&gt;port.tty;</div><div class='add'>+		tty = tty_port_tty_get(&amp;mos7840_port-&gt;port-&gt;port);</div><div class='ctx'> 		if (tty) {</div><div class='ctx'> 			tty_buffer_request_room(tty, urb-&gt;actual_length);</div><div class='ctx'> 			tty_insert_flip_string(tty, data, urb-&gt;actual_length);</div><div class='ctx'> 			dbg(" %s \n", data);</div><div class='ctx'> 			tty_flip_buffer_push(tty);</div><div class='add'>+			tty_kref_put(tty);</div><div class='ctx'> 		}</div><div class='ctx'> 		mos7840_port-&gt;icount.rx += urb-&gt;actual_length;</div><div class='ctx'> 		smp_wmb();</div><div class='hunk'>@@ -773,10 +774,10 @@ static void mos7840_bulk_out_data_callback(struct urb *urb)</div><div class='ctx'> </div><div class='ctx'> 	dbg("%s \n", "Entering .........");</div><div class='ctx'> </div><div class='del'>-	tty = mos7840_port-&gt;port-&gt;port.tty;</div><div class='del'>-</div><div class='add'>+	tty = tty_port_tty_get(&amp;mos7840_port-&gt;port-&gt;port);</div><div class='ctx'> 	if (tty &amp;&amp; mos7840_port-&gt;open)</div><div class='ctx'> 		tty_wakeup(tty);</div><div class='add'>+	tty_kref_put(tty);</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -843,7 +844,7 @@ static int mos7840_open(struct tty_struct *tty,</div><div class='ctx'> 		mos7840_port-&gt;write_urb_pool[j] = urb;</div><div class='ctx'> </div><div class='ctx'> 		if (urb == NULL) {</div><div class='del'>-			err("No more urbs???");</div><div class='add'>+			dev_err(&amp;port-&gt;dev, "No more urbs???\n");</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -852,7 +853,9 @@ static int mos7840_open(struct tty_struct *tty,</div><div class='ctx'> 		if (!urb-&gt;transfer_buffer) {</div><div class='ctx'> 			usb_free_urb(urb);</div><div class='ctx'> 			mos7840_port-&gt;write_urb_pool[j] = NULL;</div><div class='del'>-			err("%s-out of memory for urb buffers.", __func__);</div><div class='add'>+			dev_err(&amp;port-&gt;dev,</div><div class='add'>+				"%s-out of memory for urb buffers.\n",</div><div class='add'>+				__func__);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1020,8 +1023,8 @@ static int mos7840_open(struct tty_struct *tty,</div><div class='ctx'> 			    usb_submit_urb(serial-&gt;port[0]-&gt;interrupt_in_urb,</div><div class='ctx'> 					   GFP_KERNEL);</div><div class='ctx'> 			if (response) {</div><div class='del'>-				err("%s - Error %d submitting interrupt urb",</div><div class='del'>-				    __func__, response);</div><div class='add'>+				dev_err(&amp;port-&gt;dev, "%s - Error %d submitting "</div><div class='add'>+					"interrupt urb\n", __func__, response);</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 		}</div><div class='hunk'>@@ -1054,8 +1057,8 @@ static int mos7840_open(struct tty_struct *tty,</div><div class='ctx'> 	    port-&gt;bulk_in_endpointAddress);</div><div class='ctx'> 	response = usb_submit_urb(mos7840_port-&gt;read_urb, GFP_KERNEL);</div><div class='ctx'> 	if (response) {</div><div class='del'>-		err("%s - Error %d submitting control urb", __func__,</div><div class='del'>-		    response);</div><div class='add'>+		dev_err(&amp;port-&gt;dev, "%s - Error %d submitting control urb\n",</div><div class='add'>+			__func__, response);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* initialize our wait queues */</div><div class='hunk'>@@ -1491,7 +1494,8 @@ static int mos7840_write(struct tty_struct *tty, struct usb_serial_port *port,</div><div class='ctx'> 		    kmalloc(URB_TRANSFER_BUFFER_SIZE, GFP_KERNEL);</div><div class='ctx'> </div><div class='ctx'> 		if (urb-&gt;transfer_buffer == NULL) {</div><div class='del'>-			err("%s no more kernel memory...", __func__);</div><div class='add'>+			dev_err(&amp;port-&gt;dev, "%s no more kernel memory...\n",</div><div class='add'>+				__func__);</div><div class='ctx'> 			goto exit;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1516,8 +1520,8 @@ static int mos7840_write(struct tty_struct *tty, struct usb_serial_port *port,</div><div class='ctx'> </div><div class='ctx'> 	if (status) {</div><div class='ctx'> 		mos7840_port-&gt;busy[i] = 0;</div><div class='del'>-		err("%s - usb_submit_urb(write bulk) failed with status = %d",</div><div class='del'>-		    __func__, status);</div><div class='add'>+		dev_err(&amp;port-&gt;dev, "%s - usb_submit_urb(write bulk) failed "</div><div class='add'>+			"with status = %d\n", __func__, status);</div><div class='ctx'> 		bytes_sent = status;</div><div class='ctx'> 		goto exit;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1855,8 +1859,7 @@ static int mos7840_send_cmd_write_baud_rate(struct moschip_port *mos7840_port,</div><div class='ctx'> 		/* Calculate the Divisor */</div><div class='ctx'> </div><div class='ctx'> 		if (status) {</div><div class='del'>-			err("%s - bad baud rate", __func__);</div><div class='del'>-			dbg("%s\n", "bad baud rate");</div><div class='add'>+			dev_err(&amp;port-&gt;dev, "%s - bad baud rate\n", __func__);</div><div class='ctx'> 			return status;</div><div class='ctx'> 		}</div><div class='ctx'> 		/* Enable access to divisor latch */</div><div class='hunk'>@@ -2445,7 +2448,7 @@ static int mos7840_startup(struct usb_serial *serial)</div><div class='ctx'> 	for (i = 0; i &lt; serial-&gt;num_ports; ++i) {</div><div class='ctx'> 		mos7840_port = kzalloc(sizeof(struct moschip_port), GFP_KERNEL);</div><div class='ctx'> 		if (mos7840_port == NULL) {</div><div class='del'>-			err("%s - Out of memory", __func__);</div><div class='add'>+			dev_err(&amp;dev-&gt;dev, "%s - Out of memory\n", __func__);</div><div class='ctx'> 			status = -ENOMEM;</div><div class='ctx'> 			i--; /* don't follow NULL pointer cleaning up */</div><div class='ctx'> 			goto error;</div><div class='hunk'>@@ -2742,7 +2745,8 @@ static int __init moschip7840_init(void)</div><div class='ctx'> 		goto failed_port_device_register;</div><div class='ctx'> </div><div class='ctx'> 	dbg("%s\n", "Entring...");</div><div class='del'>-	info(DRIVER_DESC " " DRIVER_VERSION);</div><div class='add'>+	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"</div><div class='add'>+	       DRIVER_DESC "\n");</div><div class='ctx'> </div><div class='ctx'> 	/* Register with the usb */</div><div class='ctx'> 	retval = usb_register(&amp;io_driver);</div><div class='head'>diff --git a/drivers/usb/serial/navman.c b/drivers/usb/serial/navman.c<br/>index d6736531a0fa..bcdcbb822705 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/navman.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/serial/navman.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/navman.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/navman.c</a></div><div class='hunk'>@@ -64,12 +64,13 @@ static void navman_read_int_callback(struct urb *urb)</div><div class='ctx'> 	usb_serial_debug_data(debug, &amp;port-&gt;dev, __func__,</div><div class='ctx'> 			      urb-&gt;actual_length, data);</div><div class='ctx'> </div><div class='del'>-	tty = port-&gt;port.tty;</div><div class='add'>+	tty = tty_port_tty_get(&amp;port-&gt;port);</div><div class='ctx'> 	if (tty &amp;&amp; urb-&gt;actual_length) {</div><div class='ctx'> 		tty_buffer_request_room(tty, urb-&gt;actual_length);</div><div class='ctx'> 		tty_insert_flip_string(tty, data, urb-&gt;actual_length);</div><div class='ctx'> 		tty_flip_buffer_push(tty);</div><div class='ctx'> 	}</div><div class='add'>+	tty_kref_put(tty);</div><div class='ctx'> </div><div class='ctx'> exit:</div><div class='ctx'> 	result = usb_submit_urb(urb, GFP_ATOMIC);</div><div class='head'>diff --git a/drivers/usb/serial/omninet.c b/drivers/usb/serial/omninet.c<br/>index ae8e227f3db2..df6539712726 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/omninet.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/serial/omninet.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/omninet.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/omninet.c</a></div><div class='hunk'>@@ -154,8 +154,8 @@ static int omninet_attach(struct usb_serial *serial)</div><div class='ctx'> </div><div class='ctx'> 	od = kmalloc(sizeof(struct omninet_data), GFP_KERNEL);</div><div class='ctx'> 	if (!od) {</div><div class='del'>-		err("%s- kmalloc(%Zd) failed.",</div><div class='del'>-				__func__, sizeof(struct omninet_data));</div><div class='add'>+		dev_err(&amp;port-&gt;dev, "%s- kmalloc(%Zd) failed.\n",</div><div class='add'>+			__func__, sizeof(struct omninet_data));</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> 	usb_set_serial_port_data(port, od);</div><div class='hunk'>@@ -172,7 +172,7 @@ static int omninet_open(struct tty_struct *tty,</div><div class='ctx'> 	dbg("%s - port %d", __func__, port-&gt;number);</div><div class='ctx'> </div><div class='ctx'> 	wport = serial-&gt;port[1];</div><div class='del'>-	wport-&gt;port.tty = tty;		/* FIXME */</div><div class='add'>+	tty_port_tty_set(&amp;wport-&gt;port, tty);</div><div class='ctx'> </div><div class='ctx'> 	/* Start reading from the device */</div><div class='ctx'> 	usb_fill_bulk_urb(port-&gt;read_urb, serial-&gt;dev,</div><div class='hunk'>@@ -183,8 +183,9 @@ static int omninet_open(struct tty_struct *tty,</div><div class='ctx'> 			omninet_read_bulk_callback, port);</div><div class='ctx'> 	result = usb_submit_urb(port-&gt;read_urb, GFP_KERNEL);</div><div class='ctx'> 	if (result)</div><div class='del'>-		err("%s - failed submitting read urb, error %d",</div><div class='del'>-							__func__, result);</div><div class='add'>+		dev_err(&amp;port-&gt;dev,</div><div class='add'>+			"%s - failed submitting read urb, error %d\n",</div><div class='add'>+			__func__, result);</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -229,9 +230,11 @@ static void omninet_read_bulk_callback(struct urb *urb)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (urb-&gt;actual_length &amp;&amp; header-&gt;oh_len) {</div><div class='del'>-		tty_insert_flip_string(port-&gt;port.tty,</div><div class='del'>-			data + OMNINET_DATAOFFSET, header-&gt;oh_len);</div><div class='del'>-		tty_flip_buffer_push(port-&gt;port.tty);</div><div class='add'>+		struct tty_struct *tty = tty_port_tty_get(&amp;port-&gt;port);</div><div class='add'>+		tty_insert_flip_string(tty, data + OMNINET_DATAOFFSET,</div><div class='add'>+							header-&gt;oh_len);</div><div class='add'>+		tty_flip_buffer_push(tty);</div><div class='add'>+		tty_kref_put(tty);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Continue trying to always read  */</div><div class='hunk'>@@ -242,8 +245,9 @@ static void omninet_read_bulk_callback(struct urb *urb)</div><div class='ctx'> 			omninet_read_bulk_callback, port);</div><div class='ctx'> 	result = usb_submit_urb(urb, GFP_ATOMIC);</div><div class='ctx'> 	if (result)</div><div class='del'>-		err("%s - failed resubmitting read urb, error %d",</div><div class='del'>-						__func__, result);</div><div class='add'>+		dev_err(&amp;port-&gt;dev,</div><div class='add'>+			"%s - failed resubmitting read urb, error %d\n",</div><div class='add'>+			__func__, result);</div><div class='ctx'> </div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='hunk'>@@ -296,8 +300,9 @@ static int omninet_write(struct tty_struct *tty, struct usb_serial_port *port,</div><div class='ctx'> 	result = usb_submit_urb(wport-&gt;write_urb, GFP_ATOMIC);</div><div class='ctx'> 	if (result) {</div><div class='ctx'> 		wport-&gt;write_urb_busy = 0;</div><div class='del'>-		err("%s - failed submitting write urb, error %d",</div><div class='del'>-							__func__, result);</div><div class='add'>+		dev_err(&amp;port-&gt;dev,</div><div class='add'>+			"%s - failed submitting write urb, error %d\n",</div><div class='add'>+			__func__, result);</div><div class='ctx'> 	} else</div><div class='ctx'> 		result = count;</div><div class='ctx'> </div><div class='hunk'>@@ -362,7 +367,8 @@ static int __init omninet_init(void)</div><div class='ctx'> 	retval = usb_register(&amp;omninet_driver);</div><div class='ctx'> 	if (retval)</div><div class='ctx'> 		goto failed_usb_register;</div><div class='del'>-	info(DRIVER_VERSION ":" DRIVER_DESC);</div><div class='add'>+	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"</div><div class='add'>+	       DRIVER_DESC "\n");</div><div class='ctx'> 	return 0;</div><div class='ctx'> failed_usb_register:</div><div class='ctx'> 	usb_serial_deregister(&amp;zyxel_omninet_device);</div><div class='head'>diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c<br/>index 73f8277f88f2..3d87eabcd922 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/option.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/serial/option.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/option.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/option.c</a></div><div class='hunk'>@@ -79,27 +79,16 @@ static int  option_send_setup(struct tty_struct *tty, struct usb_serial_port *po</div><div class='ctx'> #define OPTION_PRODUCT_VIPER			0x6600</div><div class='ctx'> #define OPTION_PRODUCT_VIPER_BUS		0x6601</div><div class='ctx'> #define OPTION_PRODUCT_GT_MAX_READY		0x6701</div><div class='del'>-#define OPTION_PRODUCT_GT_MAX			0x6711</div><div class='ctx'> #define OPTION_PRODUCT_FUJI_MODEM_LIGHT		0x6721</div><div class='ctx'> #define OPTION_PRODUCT_FUJI_MODEM_GT		0x6741</div><div class='ctx'> #define OPTION_PRODUCT_FUJI_MODEM_EX		0x6761</div><div class='del'>-#define OPTION_PRODUCT_FUJI_NETWORK_LIGHT	0x6731</div><div class='del'>-#define OPTION_PRODUCT_FUJI_NETWORK_GT		0x6751</div><div class='del'>-#define OPTION_PRODUCT_FUJI_NETWORK_EX		0x6771</div><div class='ctx'> #define OPTION_PRODUCT_KOI_MODEM		0x6800</div><div class='del'>-#define OPTION_PRODUCT_KOI_NETWORK		0x6811</div><div class='ctx'> #define OPTION_PRODUCT_SCORPION_MODEM		0x6901</div><div class='del'>-#define OPTION_PRODUCT_SCORPION_NETWORK		0x6911</div><div class='ctx'> #define OPTION_PRODUCT_ETNA_MODEM		0x7001</div><div class='del'>-#define OPTION_PRODUCT_ETNA_NETWORK		0x7011</div><div class='ctx'> #define OPTION_PRODUCT_ETNA_MODEM_LITE		0x7021</div><div class='ctx'> #define OPTION_PRODUCT_ETNA_MODEM_GT		0x7041</div><div class='ctx'> #define OPTION_PRODUCT_ETNA_MODEM_EX		0x7061</div><div class='del'>-#define OPTION_PRODUCT_ETNA_NETWORK_LITE	0x7031</div><div class='del'>-#define OPTION_PRODUCT_ETNA_NETWORK_GT		0x7051</div><div class='del'>-#define OPTION_PRODUCT_ETNA_NETWORK_EX		0x7071</div><div class='ctx'> #define OPTION_PRODUCT_ETNA_KOI_MODEM		0x7100</div><div class='del'>-#define OPTION_PRODUCT_ETNA_KOI_NETWORK		0x7111</div><div class='ctx'> </div><div class='ctx'> #define HUAWEI_VENDOR_ID			0x12D1</div><div class='ctx'> #define HUAWEI_PRODUCT_E600			0x1001</div><div class='hunk'>@@ -220,6 +209,16 @@ static int  option_send_setup(struct tty_struct *tty, struct usb_serial_port *po</div><div class='ctx'> #define ZTE_PRODUCT_MF628			0x0015</div><div class='ctx'> #define ZTE_PRODUCT_CDMA_TECH			0xfffe</div><div class='ctx'> </div><div class='add'>+/* Ericsson products */</div><div class='add'>+#define ERICSSON_VENDOR_ID			0x0bdb</div><div class='add'>+#define ERICSSON_PRODUCT_F3507G			0x1900</div><div class='add'>+</div><div class='add'>+/* Pantech products */</div><div class='add'>+#define PANTECH_VENDOR_ID			0x106c</div><div class='add'>+#define PANTECH_PRODUCT_PC5740			0x3701</div><div class='add'>+#define PANTECH_PRODUCT_PC5750			0x3702  /* PX-500 */</div><div class='add'>+#define PANTECH_PRODUCT_UM150			0x3711</div><div class='add'>+</div><div class='ctx'> static struct usb_device_id option_ids[] = {</div><div class='ctx'> 	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) },</div><div class='ctx'> 	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA) },</div><div class='hunk'>@@ -235,27 +234,16 @@ static struct usb_device_id option_ids[] = {</div><div class='ctx'> 	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_VIPER) },</div><div class='ctx'> 	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_VIPER_BUS) },</div><div class='ctx'> 	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_GT_MAX_READY) },</div><div class='del'>-	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_GT_MAX) },</div><div class='ctx'> 	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_FUJI_MODEM_LIGHT) },</div><div class='ctx'> 	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_FUJI_MODEM_GT) },</div><div class='ctx'> 	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_FUJI_MODEM_EX) },</div><div class='del'>-	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_FUJI_NETWORK_LIGHT) },</div><div class='del'>-	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_FUJI_NETWORK_GT) },</div><div class='del'>-	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_FUJI_NETWORK_EX) },</div><div class='ctx'> 	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_KOI_MODEM) },</div><div class='del'>-	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_KOI_NETWORK) },</div><div class='ctx'> 	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_SCORPION_MODEM) },</div><div class='del'>-	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_SCORPION_NETWORK) },</div><div class='ctx'> 	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_MODEM) },</div><div class='del'>-	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_NETWORK) },</div><div class='ctx'> 	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_MODEM_LITE) },</div><div class='ctx'> 	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_MODEM_GT) },</div><div class='ctx'> 	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_MODEM_EX) },</div><div class='del'>-	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_NETWORK_LITE) },</div><div class='del'>-	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_NETWORK_GT) },</div><div class='del'>-	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_NETWORK_EX) },</div><div class='ctx'> 	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_KOI_MODEM) },</div><div class='del'>-	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_KOI_NETWORK) },</div><div class='ctx'> 	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E600, 0xff, 0xff, 0xff) },</div><div class='ctx'> 	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E220, 0xff, 0xff, 0xff) },</div><div class='ctx'> 	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E220BIS, 0xff, 0xff, 0xff) },</div><div class='hunk'>@@ -318,7 +306,8 @@ static struct usb_device_id option_ids[] = {</div><div class='ctx'> 	{ USB_DEVICE(DELL_VENDOR_ID, 0x8136) },	/* Dell Wireless HSDPA 5520 == Novatel Expedite EU860D */</div><div class='ctx'> 	{ USB_DEVICE(DELL_VENDOR_ID, 0x8137) },	/* Dell Wireless HSDPA 5520 */</div><div class='ctx'> 	{ USB_DEVICE(DELL_VENDOR_ID, 0x8138) },	/* Dell Wireless 5520 Voda I Mobile Broadband (3G HSDPA) Minicard */</div><div class='del'>-	{ USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ADU_E100A) },</div><div class='add'>+	{ USB_DEVICE(DELL_VENDOR_ID, 0x8147) },	/* Dell Wireless 5530 Mobile Broadband (3G HSPA) Mini-Card */</div><div class='add'>+	{ USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ADU_E100A) },	/* ADU-E100, ADU-310 */</div><div class='ctx'> 	{ USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ADU_500A) },</div><div class='ctx'> 	{ USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ADU_620UW) },</div><div class='ctx'> 	{ USB_DEVICE(AXESSTEL_VENDOR_ID, AXESSTEL_PRODUCT_MV110H) },</div><div class='hunk'>@@ -349,6 +338,10 @@ static struct usb_device_id option_ids[] = {</div><div class='ctx'> 	{ USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_UC864E) },</div><div class='ctx'> 	{ USB_DEVICE(ZTE_VENDOR_ID, ZTE_PRODUCT_MF628) },</div><div class='ctx'> 	{ USB_DEVICE(ZTE_VENDOR_ID, ZTE_PRODUCT_CDMA_TECH) },</div><div class='add'>+	{ USB_DEVICE(ERICSSON_VENDOR_ID, ERICSSON_PRODUCT_F3507G) },</div><div class='add'>+	{ USB_DEVICE(PANTECH_VENDOR_ID, PANTECH_PRODUCT_PC5740) },</div><div class='add'>+	{ USB_DEVICE(PANTECH_VENDOR_ID, PANTECH_PRODUCT_PC5750) },</div><div class='add'>+	{ USB_DEVICE(PANTECH_VENDOR_ID, PANTECH_PRODUCT_UM150) },</div><div class='ctx'> 	{ } /* Terminating entry */</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(usb, option_ids);</div><div class='hunk'>@@ -427,7 +420,8 @@ static int __init option_init(void)</div><div class='ctx'> 	if (retval)</div><div class='ctx'> 		goto failed_driver_register;</div><div class='ctx'> </div><div class='del'>-	info(DRIVER_DESC ": " DRIVER_VERSION);</div><div class='add'>+	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"</div><div class='add'>+	       DRIVER_DESC "\n");</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -571,14 +565,14 @@ static void option_indat_callback(struct urb *urb)</div><div class='ctx'> 		dbg("%s: nonzero status: %d on endpoint %02x.",</div><div class='ctx'> 		    __func__, status, endpoint);</div><div class='ctx'> 	} else {</div><div class='del'>-		tty = port-&gt;port.tty;</div><div class='add'>+		tty = tty_port_tty_get(&amp;port-&gt;port);</div><div class='ctx'> 		if (urb-&gt;actual_length) {</div><div class='ctx'> 			tty_buffer_request_room(tty, urb-&gt;actual_length);</div><div class='ctx'> 			tty_insert_flip_string(tty, data, urb-&gt;actual_length);</div><div class='ctx'> 			tty_flip_buffer_push(tty);</div><div class='del'>-		} else {</div><div class='add'>+		} else </div><div class='ctx'> 			dbg("%s: empty read urb received", __func__);</div><div class='del'>-		}</div><div class='add'>+		tty_kref_put(tty);</div><div class='ctx'> </div><div class='ctx'> 		/* Resubmit urb so we continue receiving */</div><div class='ctx'> 		if (port-&gt;port.count &amp;&amp; status != -ESHUTDOWN) {</div><div class='hunk'>@@ -647,9 +641,13 @@ static void option_instat_callback(struct urb *urb)</div><div class='ctx'> 			portdata-&gt;dsr_state = ((signals &amp; 0x02) ? 1 : 0);</div><div class='ctx'> 			portdata-&gt;ri_state = ((signals &amp; 0x08) ? 1 : 0);</div><div class='ctx'> </div><div class='del'>-			if (port-&gt;port.tty &amp;&amp; !C_CLOCAL(port-&gt;port.tty) &amp;&amp;</div><div class='del'>-					old_dcd_state &amp;&amp; !portdata-&gt;dcd_state)</div><div class='del'>-				tty_hangup(port-&gt;port.tty);</div><div class='add'>+			if (old_dcd_state &amp;&amp; !portdata-&gt;dcd_state) {</div><div class='add'>+				struct tty_struct *tty =</div><div class='add'>+						tty_port_tty_get(&amp;port-&gt;port);</div><div class='add'>+				if (tty &amp;&amp; !C_CLOCAL(tty))</div><div class='add'>+					tty_hangup(tty);</div><div class='add'>+				tty_kref_put(tty);</div><div class='add'>+			}</div><div class='ctx'> 		} else {</div><div class='ctx'> 			dbg("%s: type %x req %x", __func__,</div><div class='ctx'> 				req_pkt-&gt;bRequestType, req_pkt-&gt;bRequest);</div><div class='hunk'>@@ -793,7 +791,7 @@ static void option_close(struct tty_struct *tty,</div><div class='ctx'> 		for (i = 0; i &lt; N_OUT_URB; i++)</div><div class='ctx'> 			usb_kill_urb(portdata-&gt;out_urbs[i]);</div><div class='ctx'> 	}</div><div class='del'>-	port-&gt;port.tty = NULL;	/* FIXME */</div><div class='add'>+	tty_port_tty_set(&amp;port-&gt;port, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Helper functions used by option_setup_urbs */</div><div class='head'>diff --git a/drivers/usb/serial/oti6858.c b/drivers/usb/serial/oti6858.c<br/>index 81db5715ee25..ba551f00f16f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/oti6858.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/serial/oti6858.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/oti6858.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/oti6858.c</a></div><div class='hunk'>@@ -224,10 +224,6 @@ struct oti6858_private {</div><div class='ctx'> 	struct usb_serial_port *port;   /* USB port with which associated */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#undef dbg</div><div class='del'>-/* #define dbg(format, arg...) printk(KERN_INFO "%s: " format "\n", __FILE__, ## arg) */</div><div class='del'>-#define dbg(format, arg...) printk(KERN_INFO "" format "\n", ## arg)</div><div class='del'>-</div><div class='ctx'> static void setup_line(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	struct oti6858_private *priv = container_of(work,</div><div class='hunk'>@@ -1002,11 +998,12 @@ static void oti6858_read_bulk_callback(struct urb *urb)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	tty = port-&gt;port.tty;</div><div class='add'>+	tty = tty_port_tty_get(&amp;port-&gt;port);</div><div class='ctx'> 	if (tty != NULL &amp;&amp; urb-&gt;actual_length &gt; 0) {</div><div class='ctx'> 		tty_insert_flip_string(tty, data, urb-&gt;actual_length);</div><div class='ctx'> 		tty_flip_buffer_push(tty);</div><div class='ctx'> 	}</div><div class='add'>+	tty_kref_put(tty);</div><div class='ctx'> </div><div class='ctx'> 	/* schedule the interrupt urb if we are still open */</div><div class='ctx'> 	if (port-&gt;port.count != 0) {</div><div class='head'>diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c<br/>index 1ede1441cb1b..491c8857b644 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/pl2303.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/serial/pl2303.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/pl2303.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/pl2303.c</a></div><div class='hunk'>@@ -154,7 +154,6 @@ struct pl2303_private {</div><div class='ctx'> 	wait_queue_head_t delta_msr_wait;</div><div class='ctx'> 	u8 line_control;</div><div class='ctx'> 	u8 line_status;</div><div class='del'>-	u8 termios_initialized;</div><div class='ctx'> 	enum pl2303_type type;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -526,16 +525,6 @@ static void pl2303_set_termios(struct tty_struct *tty,</div><div class='ctx'> </div><div class='ctx'> 	dbg("%s -  port %d", __func__, port-&gt;number);</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='del'>-	if (!priv-&gt;termios_initialized) {</div><div class='del'>-		*(tty-&gt;termios) = tty_std_termios;</div><div class='del'>-		tty-&gt;termios-&gt;c_cflag = B9600 | CS8 | CREAD | HUPCL | CLOCAL;</div><div class='del'>-		tty-&gt;termios-&gt;c_ispeed = 9600;</div><div class='del'>-		tty-&gt;termios-&gt;c_ospeed = 9600;</div><div class='del'>-		priv-&gt;termios_initialized = 1;</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='del'>-</div><div class='ctx'> 	/* The PL2303 is reported to lose bytes if you change</div><div class='ctx'> 	   serial settings even to the same values as before. Thus</div><div class='ctx'> 	   we actually need to filter in this specific case */</div><div class='hunk'>@@ -1057,7 +1046,7 @@ static void pl2303_read_bulk_callback(struct urb *urb)</div><div class='ctx'> 		tty_flag = TTY_FRAME;</div><div class='ctx'> 	dbg("%s - tty_flag = %d", __func__, tty_flag);</div><div class='ctx'> </div><div class='del'>-	tty = port-&gt;port.tty;</div><div class='add'>+	tty = tty_port_tty_get(&amp;port-&gt;port);</div><div class='ctx'> 	if (tty &amp;&amp; urb-&gt;actual_length) {</div><div class='ctx'> 		tty_buffer_request_room(tty, urb-&gt;actual_length + 1);</div><div class='ctx'> 		/* overrun is special, not associated with a char */</div><div class='hunk'>@@ -1067,7 +1056,7 @@ static void pl2303_read_bulk_callback(struct urb *urb)</div><div class='ctx'> 			tty_insert_flip_char(tty, data[i], tty_flag);</div><div class='ctx'> 		tty_flip_buffer_push(tty);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='add'>+	tty_kref_put(tty);</div><div class='ctx'> 	/* Schedule the next read _if_ we are still open */</div><div class='ctx'> 	if (port-&gt;port.count) {</div><div class='ctx'> 		urb-&gt;dev = port-&gt;serial-&gt;dev;</div><div class='hunk'>@@ -1158,7 +1147,7 @@ static int __init pl2303_init(void)</div><div class='ctx'> 	retval = usb_register(&amp;pl2303_driver);</div><div class='ctx'> 	if (retval)</div><div class='ctx'> 		goto failed_usb_register;</div><div class='del'>-	info(DRIVER_DESC);</div><div class='add'>+	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_DESC "\n");</div><div class='ctx'> 	return 0;</div><div class='ctx'> failed_usb_register:</div><div class='ctx'> 	usb_serial_deregister(&amp;pl2303_device);</div><div class='head'>diff --git a/drivers/usb/serial/safe_serial.c b/drivers/usb/serial/safe_serial.c<br/>index def52d07a4ea..4b463cd140ef 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/safe_serial.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/serial/safe_serial.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/safe_serial.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/safe_serial.c</a></div><div class='hunk'>@@ -217,6 +217,7 @@ static void safe_read_bulk_callback(struct urb *urb)</div><div class='ctx'> 	struct usb_serial_port *port =  urb-&gt;context;</div><div class='ctx'> 	unsigned char *data = urb-&gt;transfer_buffer;</div><div class='ctx'> 	unsigned char length = urb-&gt;actual_length;</div><div class='add'>+	struct tty_struct *tty;</div><div class='ctx'> 	int result;</div><div class='ctx'> 	int status = urb-&gt;status;</div><div class='ctx'> </div><div class='hunk'>@@ -242,28 +243,31 @@ static void safe_read_bulk_callback(struct urb *urb)</div><div class='ctx'> 		printk("\n");</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='add'>+	tty = tty_port_tty_get(&amp;port-&gt;port);</div><div class='ctx'> 	if (safe) {</div><div class='ctx'> 		__u16 fcs;</div><div class='ctx'> 		fcs = fcs_compute10(data, length, CRC10_INITFCS);</div><div class='ctx'> 		if (!fcs) {</div><div class='ctx'> 			int actual_length = data[length - 2] &gt;&gt; 2;</div><div class='ctx'> 			if (actual_length &lt;= (length - 2)) {</div><div class='del'>-				info("%s - actual: %d", __func__,</div><div class='del'>-							actual_length);</div><div class='del'>-				tty_insert_flip_string(port-&gt;port.tty,</div><div class='add'>+				dev_info(&amp;urb-&gt;dev-&gt;dev, "%s - actual: %d\n",</div><div class='add'>+					 __func__, actual_length);</div><div class='add'>+				tty_insert_flip_string(tty,</div><div class='ctx'> 							data, actual_length);</div><div class='del'>-				tty_flip_buffer_push(port-&gt;port.tty);</div><div class='add'>+				tty_flip_buffer_push(tty);</div><div class='ctx'> 			} else {</div><div class='del'>-				err("%s - inconsistent lengths %d:%d",</div><div class='add'>+				dev_err(&amp;port-&gt;dev,</div><div class='add'>+					"%s - inconsistent lengths %d:%d\n",</div><div class='ctx'> 					__func__, actual_length, length);</div><div class='ctx'> 			}</div><div class='ctx'> 		} else {</div><div class='del'>-			err("%s - bad CRC %x", __func__, fcs);</div><div class='add'>+			dev_err(&amp;port-&gt;dev, "%s - bad CRC %x\n", __func__, fcs);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		tty_insert_flip_string(port-&gt;port.tty, data, length);</div><div class='del'>-		tty_flip_buffer_push(port-&gt;port.tty);</div><div class='add'>+		tty_insert_flip_string(tty, data, length);</div><div class='add'>+		tty_flip_buffer_push(tty);</div><div class='ctx'> 	}</div><div class='add'>+	tty_kref_put(tty);</div><div class='ctx'> </div><div class='ctx'> 	/* Continue trying to always read  */</div><div class='ctx'> 	usb_fill_bulk_urb(urb, port-&gt;serial-&gt;dev,</div><div class='hunk'>@@ -274,8 +278,9 @@ static void safe_read_bulk_callback(struct urb *urb)</div><div class='ctx'> </div><div class='ctx'> 	result = usb_submit_urb(urb, GFP_ATOMIC);</div><div class='ctx'> 	if (result)</div><div class='del'>-		err("%s - failed resubmitting read urb, error %d",</div><div class='del'>-							__func__, result);</div><div class='add'>+		dev_err(&amp;port-&gt;dev,</div><div class='add'>+			"%s - failed resubmitting read urb, error %d\n",</div><div class='add'>+			__func__, result);</div><div class='ctx'> 		/* FIXME: Need a mechanism to retry later if this happens */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -366,8 +371,9 @@ static int safe_write(struct tty_struct *tty, struct usb_serial_port *port,</div><div class='ctx'> 	result = usb_submit_urb(port-&gt;write_urb, GFP_KERNEL);</div><div class='ctx'> 	if (result) {</div><div class='ctx'> 		port-&gt;write_urb_busy = 0;</div><div class='del'>-		err("%s - failed submitting write urb, error %d",</div><div class='del'>-							__func__, result);</div><div class='add'>+		dev_err(&amp;port-&gt;dev,</div><div class='add'>+			"%s - failed submitting write urb, error %d\n",</div><div class='add'>+			__func__, result);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	dbg("%s urb: %p submitted", __func__, port-&gt;write_urb);</div><div class='hunk'>@@ -425,14 +431,13 @@ static int __init safe_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int i, retval;</div><div class='ctx'> </div><div class='del'>-	info(DRIVER_VERSION " " DRIVER_AUTHOR);</div><div class='del'>-	info(DRIVER_DESC);</div><div class='del'>-	info("vendor: %x product: %x safe: %d padded: %d\n",</div><div class='del'>-					vendor, product, safe, padded);</div><div class='add'>+	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"</div><div class='add'>+	       DRIVER_DESC "\n");</div><div class='ctx'> </div><div class='ctx'> 	/* if we have vendor / product parameters patch them into id list */</div><div class='ctx'> 	if (vendor || product) {</div><div class='del'>-		info("vendor: %x product: %x\n", vendor, product);</div><div class='add'>+		printk(KERN_INFO KBUILD_MODNAME ": vendor: %x product: %x\n",</div><div class='add'>+		       vendor, product);</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; i &lt; ARRAY_SIZE(id_table); i++) {</div><div class='ctx'> 			if (!id_table[i].idVendor &amp;&amp; !id_table[i].idProduct) {</div><div class='head'>diff --git a/drivers/usb/serial/sierra.c b/drivers/usb/serial/sierra.c<br/>index ea1a103c99be..0f2b67244af6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/sierra.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/serial/sierra.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/sierra.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/sierra.c</a></div><div class='hunk'>@@ -247,7 +247,7 @@ static int sierra_send_setup(struct tty_struct *tty,</div><div class='ctx'> 	struct sierra_port_private *portdata;</div><div class='ctx'> 	__u16 interface = 0;</div><div class='ctx'> </div><div class='del'>-	dbg("%s", __func__);</div><div class='add'>+	dev_dbg(&amp;port-&gt;dev, "%s", __func__);</div><div class='ctx'> </div><div class='ctx'> 	portdata = usb_get_serial_port_data(port);</div><div class='ctx'> </div><div class='hunk'>@@ -284,7 +284,7 @@ static int sierra_send_setup(struct tty_struct *tty,</div><div class='ctx'> static void sierra_set_termios(struct tty_struct *tty,</div><div class='ctx'> 		struct usb_serial_port *port, struct ktermios *old_termios)</div><div class='ctx'> {</div><div class='del'>-	dbg("%s", __func__);</div><div class='add'>+	dev_dbg(&amp;port-&gt;dev, "%s", __func__);</div><div class='ctx'> 	tty_termios_copy_hw(tty-&gt;termios, old_termios);</div><div class='ctx'> 	sierra_send_setup(tty, port);</div><div class='ctx'> }</div><div class='hunk'>@@ -295,6 +295,7 @@ static int sierra_tiocmget(struct tty_struct *tty, struct file *file)</div><div class='ctx'> 	unsigned int value;</div><div class='ctx'> 	struct sierra_port_private *portdata;</div><div class='ctx'> </div><div class='add'>+	dev_dbg(&amp;port-&gt;dev, "%s", __func__);</div><div class='ctx'> 	portdata = usb_get_serial_port_data(port);</div><div class='ctx'> </div><div class='ctx'> 	value = ((portdata-&gt;rts_state) ? TIOCM_RTS : 0) |</div><div class='hunk'>@@ -334,14 +335,14 @@ static void sierra_outdat_callback(struct urb *urb)</div><div class='ctx'> 	int status = urb-&gt;status;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	dbg("%s - port %d", __func__, port-&gt;number);</div><div class='add'>+	dev_dbg(&amp;port-&gt;dev, "%s - port %d", __func__, port-&gt;number);</div><div class='ctx'> </div><div class='ctx'> 	/* free up the transfer buffer, as usb_free_urb() does not do this */</div><div class='ctx'> 	kfree(urb-&gt;transfer_buffer);</div><div class='ctx'> </div><div class='ctx'> 	if (status)</div><div class='del'>-		dbg("%s - nonzero write bulk status received: %d",</div><div class='del'>-		    __func__, status);</div><div class='add'>+		dev_dbg(&amp;port-&gt;dev, "%s - nonzero write bulk status "</div><div class='add'>+		    "received: %d", __func__, status);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;portdata-&gt;lock, flags);</div><div class='ctx'> 	--portdata-&gt;outstanding_urbs;</div><div class='hunk'>@@ -363,12 +364,12 @@ static int sierra_write(struct tty_struct *tty, struct usb_serial_port *port,</div><div class='ctx'> </div><div class='ctx'> 	portdata = usb_get_serial_port_data(port);</div><div class='ctx'> </div><div class='del'>-	dbg("%s: write (%d chars)", __func__, count);</div><div class='add'>+	dev_dbg(&amp;port-&gt;dev, "%s: write (%d chars)", __func__, count);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;portdata-&gt;lock, flags);</div><div class='ctx'> 	if (portdata-&gt;outstanding_urbs &gt; N_OUT_URB) {</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;portdata-&gt;lock, flags);</div><div class='del'>-		dbg("%s - write limit hit\n", __func__);</div><div class='add'>+		dev_dbg(&amp;port-&gt;dev, "%s - write limit hit\n", __func__);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	portdata-&gt;outstanding_urbs++;</div><div class='hunk'>@@ -437,17 +438,18 @@ static void sierra_indat_callback(struct urb *urb)</div><div class='ctx'> 	port =  urb-&gt;context;</div><div class='ctx'> </div><div class='ctx'> 	if (status) {</div><div class='del'>-		dbg("%s: nonzero status: %d on endpoint %02x.",</div><div class='del'>-		    __func__, status, endpoint);</div><div class='add'>+		dev_dbg(&amp;port-&gt;dev, "%s: nonzero status: %d on"</div><div class='add'>+		    " endpoint %02x.", __func__, status, endpoint);</div><div class='ctx'> 	} else {</div><div class='del'>-		tty = port-&gt;port.tty;</div><div class='ctx'> 		if (urb-&gt;actual_length) {</div><div class='add'>+		tty = tty_port_tty_get(&amp;port-&gt;port);</div><div class='ctx'> 			tty_buffer_request_room(tty, urb-&gt;actual_length);</div><div class='ctx'> 			tty_insert_flip_string(tty, data, urb-&gt;actual_length);</div><div class='ctx'> 			tty_flip_buffer_push(tty);</div><div class='del'>-		} else {</div><div class='del'>-			dbg("%s: empty read urb received", __func__);</div><div class='del'>-		}</div><div class='add'>+			tty_kref_put(tty);</div><div class='add'>+		} else</div><div class='add'>+			dev_dbg(&amp;port-&gt;dev, "%s: empty read urb"</div><div class='add'>+				" received", __func__);</div><div class='ctx'> </div><div class='ctx'> 		/* Resubmit urb so we continue receiving */</div><div class='ctx'> 		if (port-&gt;port.count &amp;&amp; status != -ESHUTDOWN) {</div><div class='hunk'>@@ -468,15 +470,17 @@ static void sierra_instat_callback(struct urb *urb)</div><div class='ctx'> 	struct sierra_port_private *portdata = usb_get_serial_port_data(port);</div><div class='ctx'> 	struct usb_serial *serial = port-&gt;serial;</div><div class='ctx'> </div><div class='del'>-	dbg("%s", __func__);</div><div class='del'>-	dbg("%s: urb %p port %p has data %p", __func__, urb, port, portdata);</div><div class='add'>+	dev_dbg(&amp;port-&gt;dev, "%s", __func__);</div><div class='add'>+	dev_dbg(&amp;port-&gt;dev, "%s: urb %p port %p has data %p", __func__,</div><div class='add'>+		urb, port, portdata);</div><div class='ctx'> </div><div class='ctx'> 	if (status == 0) {</div><div class='ctx'> 		struct usb_ctrlrequest *req_pkt =</div><div class='ctx'> 				(struct usb_ctrlrequest *)urb-&gt;transfer_buffer;</div><div class='ctx'> </div><div class='ctx'> 		if (!req_pkt) {</div><div class='del'>-			dbg("%s: NULL req_pkt\n", __func__);</div><div class='add'>+			dev_dbg(&amp;port-&gt;dev, "%s: NULL req_pkt\n",</div><div class='add'>+				__func__);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> 		if ((req_pkt-&gt;bRequestType == 0xA1) &amp;&amp;</div><div class='hunk'>@@ -485,8 +489,10 @@ static void sierra_instat_callback(struct urb *urb)</div><div class='ctx'> 			unsigned char signals = *((unsigned char *)</div><div class='ctx'> 					urb-&gt;transfer_buffer +</div><div class='ctx'> 					sizeof(struct usb_ctrlrequest));</div><div class='add'>+			struct tty_struct *tty;</div><div class='ctx'> </div><div class='del'>-			dbg("%s: signal x%x", __func__, signals);</div><div class='add'>+			dev_dbg(&amp;port-&gt;dev, "%s: signal x%x", __func__,</div><div class='add'>+				signals);</div><div class='ctx'> </div><div class='ctx'> 			old_dcd_state = portdata-&gt;dcd_state;</div><div class='ctx'> 			portdata-&gt;cts_state = 1;</div><div class='hunk'>@@ -494,23 +500,26 @@ static void sierra_instat_callback(struct urb *urb)</div><div class='ctx'> 			portdata-&gt;dsr_state = ((signals &amp; 0x02) ? 1 : 0);</div><div class='ctx'> 			portdata-&gt;ri_state = ((signals &amp; 0x08) ? 1 : 0);</div><div class='ctx'> </div><div class='del'>-			if (port-&gt;port.tty &amp;&amp; !C_CLOCAL(port-&gt;port.tty) &amp;&amp;</div><div class='add'>+			tty = tty_port_tty_get(&amp;port-&gt;port);</div><div class='add'>+			if (tty &amp;&amp; !C_CLOCAL(tty) &amp;&amp;</div><div class='ctx'> 					old_dcd_state &amp;&amp; !portdata-&gt;dcd_state)</div><div class='del'>-				tty_hangup(port-&gt;port.tty);</div><div class='add'>+				tty_hangup(tty);</div><div class='add'>+			tty_kref_put(tty);</div><div class='ctx'> 		} else {</div><div class='del'>-			dbg("%s: type %x req %x", __func__,</div><div class='del'>-				req_pkt-&gt;bRequestType, req_pkt-&gt;bRequest);</div><div class='add'>+			dev_dbg(&amp;port-&gt;dev, "%s: type %x req %x",</div><div class='add'>+				__func__, req_pkt-&gt;bRequestType,</div><div class='add'>+				req_pkt-&gt;bRequest);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else</div><div class='del'>-		dbg("%s: error %d", __func__, status);</div><div class='add'>+		dev_dbg(&amp;port-&gt;dev, "%s: error %d", __func__, status);</div><div class='ctx'> </div><div class='ctx'> 	/* Resubmit urb so we continue receiving IRQ data */</div><div class='ctx'> 	if (status != -ESHUTDOWN) {</div><div class='ctx'> 		urb-&gt;dev = serial-&gt;dev;</div><div class='ctx'> 		err = usb_submit_urb(urb, GFP_ATOMIC);</div><div class='ctx'> 		if (err)</div><div class='del'>-			dbg("%s: resubmit intr urb failed. (%d)",</div><div class='del'>-				__func__, err);</div><div class='add'>+			dev_dbg(&amp;port-&gt;dev, "%s: resubmit intr urb "</div><div class='add'>+				"failed. (%d)",	__func__, err);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -520,14 +529,14 @@ static int sierra_write_room(struct tty_struct *tty)</div><div class='ctx'> 	struct sierra_port_private *portdata = usb_get_serial_port_data(port);</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	dbg("%s - port %d", __func__, port-&gt;number);</div><div class='add'>+	dev_dbg(&amp;port-&gt;dev, "%s - port %d", __func__, port-&gt;number);</div><div class='ctx'> </div><div class='ctx'> 	/* try to give a good number back based on if we have any free urbs at</div><div class='ctx'> 	 * this point in time */</div><div class='ctx'> 	spin_lock_irqsave(&amp;portdata-&gt;lock, flags);</div><div class='ctx'> 	if (portdata-&gt;outstanding_urbs &gt; N_OUT_URB * 2 / 3) {</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;portdata-&gt;lock, flags);</div><div class='del'>-		dbg("%s - write limit hit\n", __func__);</div><div class='add'>+		dev_dbg(&amp;port-&gt;dev, "%s - write limit hit\n", __func__);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;portdata-&gt;lock, flags);</div><div class='hunk'>@@ -546,7 +555,7 @@ static int sierra_open(struct tty_struct *tty,</div><div class='ctx'> </div><div class='ctx'> 	portdata = usb_get_serial_port_data(port);</div><div class='ctx'> </div><div class='del'>-	dbg("%s", __func__);</div><div class='add'>+	dev_dbg(&amp;port-&gt;dev, "%s", __func__);</div><div class='ctx'> </div><div class='ctx'> 	/* Set some sane defaults */</div><div class='ctx'> 	portdata-&gt;rts_state = 1;</div><div class='hunk'>@@ -558,8 +567,8 @@ static int sierra_open(struct tty_struct *tty,</div><div class='ctx'> 		if (!urb)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		if (urb-&gt;dev != serial-&gt;dev) {</div><div class='del'>-			dbg("%s: dev %p != %p", __func__,</div><div class='del'>-				urb-&gt;dev, serial-&gt;dev);</div><div class='add'>+			dev_dbg(&amp;port-&gt;dev, "%s: dev %p != %p",</div><div class='add'>+				 __func__, urb-&gt;dev, serial-&gt;dev);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -598,7 +607,7 @@ static void sierra_close(struct tty_struct *tty,</div><div class='ctx'> 	struct usb_serial *serial = port-&gt;serial;</div><div class='ctx'> 	struct sierra_port_private *portdata;</div><div class='ctx'> </div><div class='del'>-	dbg("%s", __func__);</div><div class='add'>+	dev_dbg(&amp;port-&gt;dev, "%s", __func__);</div><div class='ctx'> 	portdata = usb_get_serial_port_data(port);</div><div class='ctx'> </div><div class='ctx'> 	portdata-&gt;rts_state = 0;</div><div class='hunk'>@@ -616,8 +625,7 @@ static void sierra_close(struct tty_struct *tty,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	usb_kill_urb(port-&gt;interrupt_in_urb);</div><div class='del'>-</div><div class='del'>-	port-&gt;port.tty = NULL;	/* FIXME */</div><div class='add'>+	tty_port_tty_set(&amp;port-&gt;port, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int sierra_startup(struct usb_serial *serial)</div><div class='hunk'>@@ -628,7 +636,7 @@ static int sierra_startup(struct usb_serial *serial)</div><div class='ctx'> 	int i;</div><div class='ctx'> 	int j;</div><div class='ctx'> </div><div class='del'>-	dbg("%s", __func__);</div><div class='add'>+	dev_dbg(&amp;serial-&gt;dev-&gt;dev, "%s", __func__);</div><div class='ctx'> </div><div class='ctx'> 	/* Set Device mode to D0 */</div><div class='ctx'> 	sierra_set_power_state(serial-&gt;dev, 0x0000);</div><div class='hunk'>@@ -642,8 +650,9 @@ static int sierra_startup(struct usb_serial *serial)</div><div class='ctx'> 		port = serial-&gt;port[i];</div><div class='ctx'> 		portdata = kzalloc(sizeof(*portdata), GFP_KERNEL);</div><div class='ctx'> 		if (!portdata) {</div><div class='del'>-			dbg("%s: kmalloc for sierra_port_private (%d) failed!.",</div><div class='del'>-					__func__, i);</div><div class='add'>+			dev_dbg(&amp;port-&gt;dev, "%s: kmalloc for "</div><div class='add'>+				"sierra_port_private (%d) failed!.",</div><div class='add'>+				__func__, i);</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		}</div><div class='ctx'> 		spin_lock_init(&amp;portdata-&gt;lock);</div><div class='hunk'>@@ -663,8 +672,8 @@ static int sierra_startup(struct usb_serial *serial)</div><div class='ctx'> 		for (j = 0; j &lt; N_IN_URB; ++j) {</div><div class='ctx'> 			urb = usb_alloc_urb(0, GFP_KERNEL);</div><div class='ctx'> 			if (urb == NULL) {</div><div class='del'>-				dbg("%s: alloc for in port failed.",</div><div class='del'>-				    __func__);</div><div class='add'>+				dev_dbg(&amp;port-&gt;dev, "%s: alloc for in "</div><div class='add'>+					"port failed.", __func__);</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='ctx'> 			/* Fill URB using supplied data. */</div><div class='hunk'>@@ -686,7 +695,7 @@ static void sierra_shutdown(struct usb_serial *serial)</div><div class='ctx'> 	struct usb_serial_port *port;</div><div class='ctx'> 	struct sierra_port_private *portdata;</div><div class='ctx'> </div><div class='del'>-	dbg("%s", __func__);</div><div class='add'>+	dev_dbg(&amp;serial-&gt;dev-&gt;dev, "%s", __func__);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; serial-&gt;num_ports; ++i) {</div><div class='ctx'> 		port = serial-&gt;port[i];</div><div class='hunk'>@@ -741,7 +750,8 @@ static int __init sierra_init(void)</div><div class='ctx'> 	if (retval)</div><div class='ctx'> 		goto failed_driver_register;</div><div class='ctx'> </div><div class='del'>-	info(DRIVER_DESC ": " DRIVER_VERSION);</div><div class='add'>+	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"</div><div class='add'>+	       DRIVER_DESC "\n");</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/usb/serial/spcp8x5.c b/drivers/usb/serial/spcp8x5.c<br/>index 283cf6b36b2c..a65bc2bd8e71 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/spcp8x5.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/serial/spcp8x5.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/spcp8x5.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/spcp8x5.c</a></div><div class='hunk'>@@ -589,8 +589,8 @@ static void spcp8x5_set_termios(struct tty_struct *tty,</div><div class='ctx'> 	case 1000000:</div><div class='ctx'> 			buf[0] = 0x0b;	break;</div><div class='ctx'> 	default:</div><div class='del'>-		err("spcp825 driver does not support the baudrate "</div><div class='del'>-		    "requested, using default of 9600.");</div><div class='add'>+		dev_err(&amp;port-&gt;dev, "spcp825 driver does not support the "</div><div class='add'>+			"baudrate requested, using default of 9600.\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Set Data Length : 00:5bit, 01:6bit, 10:7bit, 11:8bit */</div><div class='hunk'>@@ -629,7 +629,8 @@ static void spcp8x5_set_termios(struct tty_struct *tty,</div><div class='ctx'> 			    SET_UART_FORMAT_TYPE, SET_UART_FORMAT,</div><div class='ctx'> 			    uartdata, 0, NULL, 0, 100);</div><div class='ctx'> 	if (i &lt; 0)</div><div class='del'>-		err("Set UART format %#x failed (error = %d)", uartdata, i);</div><div class='add'>+		dev_err(&amp;port-&gt;dev, "Set UART format %#x failed (error = %d)\n",</div><div class='add'>+			uartdata, i);</div><div class='ctx'> 	dbg("0x21:0x40:0:0  %d\n", i);</div><div class='ctx'> </div><div class='ctx'> 	if (cflag &amp; CRTSCTS) {</div><div class='hunk'>@@ -755,7 +756,7 @@ static void spcp8x5_read_bulk_callback(struct urb *urb)</div><div class='ctx'> 		tty_flag = TTY_FRAME;</div><div class='ctx'> 	dev_dbg(&amp;port-&gt;dev, "tty_flag = %d\n", tty_flag);</div><div class='ctx'> </div><div class='del'>-	tty = port-&gt;port.tty;</div><div class='add'>+	tty = tty_port_tty_get(&amp;port-&gt;port);</div><div class='ctx'> 	if (tty &amp;&amp; urb-&gt;actual_length) {</div><div class='ctx'> 		tty_buffer_request_room(tty, urb-&gt;actual_length + 1);</div><div class='ctx'> 		/* overrun is special, not associated with a char */</div><div class='hunk'>@@ -765,6 +766,7 @@ static void spcp8x5_read_bulk_callback(struct urb *urb)</div><div class='ctx'> 			tty_insert_flip_char(tty, data[i], tty_flag);</div><div class='ctx'> 		tty_flip_buffer_push(tty);</div><div class='ctx'> 	}</div><div class='add'>+	tty_kref_put(tty);</div><div class='ctx'> </div><div class='ctx'> 	/* Schedule the next read _if_ we are still open */</div><div class='ctx'> 	if (port-&gt;port.count) {</div><div class='hunk'>@@ -1053,7 +1055,8 @@ static int __init spcp8x5_init(void)</div><div class='ctx'> 	retval = usb_register(&amp;spcp8x5_driver);</div><div class='ctx'> 	if (retval)</div><div class='ctx'> 		goto failed_usb_register;</div><div class='del'>-	info(DRIVER_DESC " " DRIVER_VERSION);</div><div class='add'>+	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"</div><div class='add'>+	       DRIVER_DESC "\n");</div><div class='ctx'> 	return 0;</div><div class='ctx'> failed_usb_register:</div><div class='ctx'> 	usb_serial_deregister(&amp;spcp8x5_device);</div><div class='head'>diff --git a/drivers/usb/serial/ti_usb_3410_5052.c b/drivers/usb/serial/ti_usb_3410_5052.c<br/>index 9a3e495c769c..31c42d1cae13 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/ti_usb_3410_5052.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/serial/ti_usb_3410_5052.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/ti_usb_3410_5052.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/ti_usb_3410_5052.c</a></div><div class='hunk'>@@ -85,7 +85,6 @@</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='ctx'> #include &lt;linux/usb/serial.h&gt;</div><div class='del'>-#include &lt;linux/firmware.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "ti_usb_3410_5052.h"</div><div class='ctx'> </div><div class='hunk'>@@ -179,7 +178,7 @@ static int ti_set_mcr(struct ti_port *tport, unsigned int mcr);</div><div class='ctx'> static int ti_get_lsr(struct ti_port *tport);</div><div class='ctx'> static int ti_get_serial_info(struct ti_port *tport,</div><div class='ctx'> 	struct serial_struct __user *ret_arg);</div><div class='del'>-static int ti_set_serial_info(struct ti_port *tport,</div><div class='add'>+static int ti_set_serial_info(struct tty_struct *tty, struct ti_port *tport,</div><div class='ctx'> 	struct serial_struct __user *new_arg);</div><div class='ctx'> static void ti_handle_new_msr(struct ti_port *tport, __u8 msr);</div><div class='ctx'> </div><div class='hunk'>@@ -383,7 +382,8 @@ static int __init ti_init(void)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto failed_usb;</div><div class='ctx'> </div><div class='del'>-	info(TI_DRIVER_DESC " " TI_DRIVER_VERSION);</div><div class='add'>+	printk(KERN_INFO KBUILD_MODNAME ": " TI_DRIVER_VERSION ":"</div><div class='add'>+	       TI_DRIVER_DESC "\n");</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -857,8 +857,8 @@ static int ti_ioctl(struct tty_struct *tty, struct file *file,</div><div class='ctx'> 				(struct serial_struct __user *)arg);</div><div class='ctx'> 	case TIOCSSERIAL:</div><div class='ctx'> 		dbg("%s - (%d) TIOCSSERIAL", __func__, port-&gt;number);</div><div class='del'>-		return ti_set_serial_info(tport,</div><div class='del'>-					(struct serial_struct __user *)arg);</div><div class='add'>+		return ti_set_serial_info(tty, tport,</div><div class='add'>+				(struct serial_struct __user *)arg);</div><div class='ctx'> 	case TIOCMIWAIT:</div><div class='ctx'> 		dbg("%s - (%d) TIOCMIWAIT", __func__, port-&gt;number);</div><div class='ctx'> 		cprev = tport-&gt;tp_icount;</div><div class='hunk'>@@ -1211,6 +1211,7 @@ static void ti_bulk_in_callback(struct urb *urb)</div><div class='ctx'> 	struct device *dev = &amp;urb-&gt;dev-&gt;dev;</div><div class='ctx'> 	int status = urb-&gt;status;</div><div class='ctx'> 	int retval = 0;</div><div class='add'>+	struct tty_struct *tty;</div><div class='ctx'> </div><div class='ctx'> 	dbg("%s", __func__);</div><div class='ctx'> </div><div class='hunk'>@@ -1239,20 +1240,22 @@ static void ti_bulk_in_callback(struct urb *urb)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (port-&gt;port.tty &amp;&amp; urb-&gt;actual_length) {</div><div class='add'>+	tty = tty_port_tty_get(&amp;port-&gt;port);</div><div class='add'>+	if (tty &amp;&amp; urb-&gt;actual_length) {</div><div class='ctx'> 		usb_serial_debug_data(debug, dev, __func__,</div><div class='ctx'> 			urb-&gt;actual_length, urb-&gt;transfer_buffer);</div><div class='ctx'> </div><div class='ctx'> 		if (!tport-&gt;tp_is_open)</div><div class='ctx'> 			dbg("%s - port closed, dropping data", __func__);</div><div class='ctx'> 		else</div><div class='del'>-			ti_recv(&amp;urb-&gt;dev-&gt;dev, port-&gt;port.tty,</div><div class='add'>+			ti_recv(&amp;urb-&gt;dev-&gt;dev, tty,</div><div class='ctx'> 						urb-&gt;transfer_buffer,</div><div class='ctx'> 						urb-&gt;actual_length);</div><div class='ctx'> </div><div class='ctx'> 		spin_lock(&amp;tport-&gt;tp_lock);</div><div class='ctx'> 		tport-&gt;tp_icount.rx += urb-&gt;actual_length;</div><div class='ctx'> 		spin_unlock(&amp;tport-&gt;tp_lock);</div><div class='add'>+		tty_kref_put(tty);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> exit:</div><div class='hunk'>@@ -1330,7 +1333,7 @@ static void ti_send(struct ti_port *tport)</div><div class='ctx'> {</div><div class='ctx'> 	int count, result;</div><div class='ctx'> 	struct usb_serial_port *port = tport-&gt;tp_port;</div><div class='del'>-	struct tty_struct *tty = port-&gt;port.tty;	/* FIXME */</div><div class='add'>+	struct tty_struct *tty = tty_port_tty_get(&amp;port-&gt;port);	/* FIXME */</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -1338,19 +1341,15 @@ static void ti_send(struct ti_port *tport)</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;tport-&gt;tp_lock, flags);</div><div class='ctx'> </div><div class='del'>-	if (tport-&gt;tp_write_urb_in_use) {</div><div class='del'>-		spin_unlock_irqrestore(&amp;tport-&gt;tp_lock, flags);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='add'>+	if (tport-&gt;tp_write_urb_in_use)</div><div class='add'>+		goto unlock;</div><div class='ctx'> </div><div class='ctx'> 	count = ti_buf_get(tport-&gt;tp_write_buf,</div><div class='ctx'> 				port-&gt;write_urb-&gt;transfer_buffer,</div><div class='ctx'> 				port-&gt;bulk_out_size);</div><div class='ctx'> </div><div class='del'>-	if (count == 0) {</div><div class='del'>-		spin_unlock_irqrestore(&amp;tport-&gt;tp_lock, flags);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='add'>+	if (count == 0)</div><div class='add'>+		goto unlock;</div><div class='ctx'> </div><div class='ctx'> 	tport-&gt;tp_write_urb_in_use = 1;</div><div class='ctx'> </div><div class='hunk'>@@ -1380,7 +1379,13 @@ static void ti_send(struct ti_port *tport)</div><div class='ctx'> 	/* more room in the buffer for new writes, wakeup */</div><div class='ctx'> 	if (tty)</div><div class='ctx'> 		tty_wakeup(tty);</div><div class='add'>+	tty_kref_put(tty);</div><div class='ctx'> 	wake_up_interruptible(&amp;tport-&gt;tp_write_wait);</div><div class='add'>+	return;</div><div class='add'>+unlock:</div><div class='add'>+	spin_unlock_irqrestore(&amp;tport-&gt;tp_lock, flags);</div><div class='add'>+	tty_kref_put(tty);</div><div class='add'>+	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -1464,20 +1469,16 @@ static int ti_get_serial_info(struct ti_port *tport,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int ti_set_serial_info(struct ti_port *tport,</div><div class='add'>+static int ti_set_serial_info(struct tty_struct *tty, struct ti_port *tport,</div><div class='ctx'> 	struct serial_struct __user *new_arg)</div><div class='ctx'> {</div><div class='del'>-	struct usb_serial_port *port = tport-&gt;tp_port;</div><div class='ctx'> 	struct serial_struct new_serial;</div><div class='ctx'> </div><div class='ctx'> 	if (copy_from_user(&amp;new_serial, new_arg, sizeof(new_serial)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	tport-&gt;tp_flags = new_serial.flags &amp; TI_SET_SERIAL_FLAGS;</div><div class='del'>-	/* FIXME */</div><div class='del'>-	if (port-&gt;port.tty)</div><div class='del'>-		port-&gt;port.tty-&gt;low_latency =</div><div class='del'>-			(tport-&gt;tp_flags &amp; ASYNC_LOW_LATENCY) ? 1 : 0;</div><div class='add'>+	tty-&gt;low_latency = (tport-&gt;tp_flags &amp; ASYNC_LOW_LATENCY) ? 1 : 0;</div><div class='ctx'> 	tport-&gt;tp_closing_wait = new_serial.closing_wait;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1510,7 +1511,7 @@ static void ti_handle_new_msr(struct ti_port *tport, __u8 msr)</div><div class='ctx'> 	tport-&gt;tp_msr = msr &amp; TI_MSR_MASK;</div><div class='ctx'> </div><div class='ctx'> 	/* handle CTS flow control */</div><div class='del'>-	tty = tport-&gt;tp_port-&gt;port.tty;</div><div class='add'>+	tty = tty_port_tty_get(&amp;tport-&gt;tp_port-&gt;port);</div><div class='ctx'> 	if (tty &amp;&amp; C_CRTSCTS(tty)) {</div><div class='ctx'> 		if (msr &amp; TI_MSR_CTS) {</div><div class='ctx'> 			tty-&gt;hw_stopped = 0;</div><div class='hunk'>@@ -1519,6 +1520,7 @@ static void ti_handle_new_msr(struct ti_port *tport, __u8 msr)</div><div class='ctx'> 			tty-&gt;hw_stopped = 1;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+	tty_kref_put(tty);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c<br/>index 4f7f9e3ae0a4..8be3f39891c7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/usb-serial.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/serial/usb-serial.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/usb-serial.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/usb-serial.c</a></div><div class='hunk'>@@ -214,7 +214,7 @@ static int serial_open (struct tty_struct *tty, struct file *filp)</div><div class='ctx'> 	/* set up our port structure making the tty driver</div><div class='ctx'> 	 * remember our port object, and us it */</div><div class='ctx'> 	tty-&gt;driver_data = port;</div><div class='del'>-	port-&gt;port.tty = tty;</div><div class='add'>+	tty_port_tty_set(&amp;port-&gt;port, tty);</div><div class='ctx'> </div><div class='ctx'> 	if (port-&gt;port.count == 1) {</div><div class='ctx'> </div><div class='hunk'>@@ -246,7 +246,7 @@ bailout_module_put:</div><div class='ctx'> bailout_mutex_unlock:</div><div class='ctx'> 	port-&gt;port.count = 0;</div><div class='ctx'> 	tty-&gt;driver_data = NULL;</div><div class='del'>-	port-&gt;port.tty = NULL;</div><div class='add'>+	tty_port_tty_set(&amp;port-&gt;port, NULL);</div><div class='ctx'> 	mutex_unlock(&amp;port-&gt;mutex);</div><div class='ctx'> bailout_kref_put:</div><div class='ctx'> 	usb_serial_put(serial);</div><div class='hunk'>@@ -276,10 +276,11 @@ static void serial_close(struct tty_struct *tty, struct file *filp)</div><div class='ctx'> 		port-&gt;serial-&gt;type-&gt;close(tty, port, filp);</div><div class='ctx'> </div><div class='ctx'> 	if (port-&gt;port.count == (port-&gt;console? 1 : 0)) {</div><div class='del'>-		if (port-&gt;port.tty) {</div><div class='del'>-			if (port-&gt;port.tty-&gt;driver_data)</div><div class='del'>-				port-&gt;port.tty-&gt;driver_data = NULL;</div><div class='del'>-			port-&gt;port.tty = NULL;</div><div class='add'>+		struct tty_struct *tty = tty_port_tty_get(&amp;port-&gt;port);</div><div class='add'>+		if (tty) {</div><div class='add'>+			if (tty-&gt;driver_data)</div><div class='add'>+				tty-&gt;driver_data = NULL;</div><div class='add'>+			tty_port_tty_set(&amp;port-&gt;port, NULL);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -508,11 +509,12 @@ static void usb_serial_port_work(struct work_struct *work)</div><div class='ctx'> 	if (!port)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	tty = port-&gt;port.tty;</div><div class='add'>+	tty = tty_port_tty_get(&amp;port-&gt;port);</div><div class='ctx'> 	if (!tty)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	tty_wakeup(tty);</div><div class='add'>+	tty_kref_put(tty);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void port_release(struct device *dev)</div><div class='hunk'>@@ -819,6 +821,7 @@ int usb_serial_probe(struct usb_interface *interface,</div><div class='ctx'> 		port = kzalloc(sizeof(struct usb_serial_port), GFP_KERNEL);</div><div class='ctx'> 		if (!port)</div><div class='ctx'> 			goto probe_error;</div><div class='add'>+		tty_port_init(&amp;port-&gt;port);</div><div class='ctx'> 		port-&gt;serial = serial;</div><div class='ctx'> 		spin_lock_init(&amp;port-&gt;lock);</div><div class='ctx'> 		mutex_init(&amp;port-&gt;mutex);</div><div class='hunk'>@@ -1040,8 +1043,11 @@ void usb_serial_disconnect(struct usb_interface *interface)</div><div class='ctx'> 	for (i = 0; i &lt; serial-&gt;num_ports; ++i) {</div><div class='ctx'> 		port = serial-&gt;port[i];</div><div class='ctx'> 		if (port) {</div><div class='del'>-			if (port-&gt;port.tty)</div><div class='del'>-				tty_hangup(port-&gt;port.tty);</div><div class='add'>+			struct tty_struct *tty = tty_port_tty_get(&amp;port-&gt;port);</div><div class='add'>+			if (tty) {</div><div class='add'>+				tty_hangup(tty);</div><div class='add'>+				tty_kref_put(tty);</div><div class='add'>+			}</div><div class='ctx'> 			kill_traffic(port);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1115,7 +1121,8 @@ static int __init usb_serial_init(void)</div><div class='ctx'> </div><div class='ctx'> 	result = bus_register(&amp;usb_serial_bus_type);</div><div class='ctx'> 	if (result) {</div><div class='del'>-		err("%s - registering bus driver failed", __func__);</div><div class='add'>+		printk(KERN_ERR "usb-serial: %s - registering bus driver "</div><div class='add'>+		       "failed\n", __func__);</div><div class='ctx'> 		goto exit_bus;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1136,25 +1143,28 @@ static int __init usb_serial_init(void)</div><div class='ctx'> 	tty_set_operations(usb_serial_tty_driver, &amp;serial_ops);</div><div class='ctx'> 	result = tty_register_driver(usb_serial_tty_driver);</div><div class='ctx'> 	if (result) {</div><div class='del'>-		err("%s - tty_register_driver failed", __func__);</div><div class='add'>+		printk(KERN_ERR "usb-serial: %s - tty_register_driver failed\n",</div><div class='add'>+		       __func__);</div><div class='ctx'> 		goto exit_reg_driver;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* register the USB driver */</div><div class='ctx'> 	result = usb_register(&amp;usb_serial_driver);</div><div class='ctx'> 	if (result &lt; 0) {</div><div class='del'>-		err("%s - usb_register failed", __func__);</div><div class='add'>+		printk(KERN_ERR "usb-serial: %s - usb_register failed\n",</div><div class='add'>+		       __func__);</div><div class='ctx'> 		goto exit_tty;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* register the generic driver, if we should */</div><div class='ctx'> 	result = usb_serial_generic_register(debug);</div><div class='ctx'> 	if (result &lt; 0) {</div><div class='del'>-		err("%s - registering generic driver failed", __func__);</div><div class='add'>+		printk(KERN_ERR "usb-serial: %s - registering generic "</div><div class='add'>+		       "driver failed\n", __func__);</div><div class='ctx'> 		goto exit_generic;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	info(DRIVER_DESC);</div><div class='add'>+	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_DESC "\n");</div><div class='ctx'> </div><div class='ctx'> 	return result;</div><div class='ctx'> </div><div class='hunk'>@@ -1168,7 +1178,8 @@ exit_reg_driver:</div><div class='ctx'> 	bus_unregister(&amp;usb_serial_bus_type);</div><div class='ctx'> </div><div class='ctx'> exit_bus:</div><div class='del'>-	err("%s - returning with error %d", __func__, result);</div><div class='add'>+	printk(KERN_ERR "usb-serial: %s - returning with error %d\n",</div><div class='add'>+	       __func__, result);</div><div class='ctx'> 	put_tty_driver(usb_serial_tty_driver);</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='hunk'>@@ -1227,11 +1238,11 @@ int usb_serial_register(struct usb_serial_driver *driver)</div><div class='ctx'> </div><div class='ctx'> 	retval = usb_serial_bus_register(driver);</div><div class='ctx'> 	if (retval) {</div><div class='del'>-		err("problem %d when registering driver %s",</div><div class='del'>-						retval, driver-&gt;description);</div><div class='add'>+		printk(KERN_ERR "usb-serial: problem %d when registering "</div><div class='add'>+		       "driver %s\n", retval, driver-&gt;description);</div><div class='ctx'> 		list_del(&amp;driver-&gt;driver_list);</div><div class='ctx'> 	} else</div><div class='del'>-		info("USB Serial support registered for %s",</div><div class='add'>+		printk(KERN_INFO "USB Serial support registered for %s\n",</div><div class='ctx'> 						driver-&gt;description);</div><div class='ctx'> </div><div class='ctx'> 	return retval;</div><div class='hunk'>@@ -1242,7 +1253,8 @@ EXPORT_SYMBOL_GPL(usb_serial_register);</div><div class='ctx'> void usb_serial_deregister(struct usb_serial_driver *device)</div><div class='ctx'> {</div><div class='ctx'> 	/* must be called with BKL held */</div><div class='del'>-	info("USB Serial deregistering driver %s", device-&gt;description);</div><div class='add'>+	printk(KERN_INFO "USB Serial deregistering driver %s\n",</div><div class='add'>+	       device-&gt;description);</div><div class='ctx'> 	list_del(&amp;device-&gt;driver_list);</div><div class='ctx'> 	usb_serial_bus_deregister(device);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/usb/serial/visor.c b/drivers/usb/serial/visor.c<br/>index cf8924f9a2cc..4facce3d9364 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/visor.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/serial/visor.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/visor.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/visor.c</a></div><div class='hunk'>@@ -499,7 +499,7 @@ static void visor_read_bulk_callback(struct urb *urb)</div><div class='ctx'> 	int status = urb-&gt;status;</div><div class='ctx'> 	struct tty_struct *tty;</div><div class='ctx'> 	int result;</div><div class='del'>-	int available_room;</div><div class='add'>+	int available_room = 0;</div><div class='ctx'> </div><div class='ctx'> 	dbg("%s - port %d", __func__, port-&gt;number);</div><div class='ctx'> </div><div class='hunk'>@@ -512,13 +512,17 @@ static void visor_read_bulk_callback(struct urb *urb)</div><div class='ctx'> 	usb_serial_debug_data(debug, &amp;port-&gt;dev, __func__,</div><div class='ctx'> 						urb-&gt;actual_length, data);</div><div class='ctx'> </div><div class='del'>-	tty = port-&gt;port.tty;</div><div class='del'>-	if (tty &amp;&amp; urb-&gt;actual_length) {</div><div class='del'>-		available_room = tty_buffer_request_room(tty,</div><div class='add'>+	if (urb-&gt;actual_length) {</div><div class='add'>+		tty = tty_port_tty_get(&amp;port-&gt;port);</div><div class='add'>+		if (tty) {</div><div class='add'>+			available_room = tty_buffer_request_room(tty,</div><div class='ctx'> 							urb-&gt;actual_length);</div><div class='del'>-		if (available_room) {</div><div class='del'>-			tty_insert_flip_string(tty, data, available_room);</div><div class='del'>-			tty_flip_buffer_push(tty);</div><div class='add'>+			if (available_room) {</div><div class='add'>+				tty_insert_flip_string(tty, data,</div><div class='add'>+							available_room);</div><div class='add'>+				tty_flip_buffer_push(tty);</div><div class='add'>+			}</div><div class='add'>+			tty_kref_put(tty);</div><div class='ctx'> 		}</div><div class='ctx'> 		spin_lock(&amp;priv-&gt;lock);</div><div class='ctx'> 		priv-&gt;bytes_in += available_room;</div><div class='hunk'>@@ -764,7 +768,7 @@ static int visor_probe(struct usb_serial *serial,</div><div class='ctx'> 	dbg("%s", __func__);</div><div class='ctx'> </div><div class='ctx'> 	if (serial-&gt;dev-&gt;actconfig-&gt;desc.bConfigurationValue != 1) {</div><div class='del'>-		err("active config #%d != 1 ??",</div><div class='add'>+		dev_err(&amp;serial-&gt;dev-&gt;dev, "active config #%d != 1 ??\n",</div><div class='ctx'> 			serial-&gt;dev-&gt;actconfig-&gt;desc.bConfigurationValue);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -967,11 +971,14 @@ static int __init visor_init(void)</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		info(</div><div class='del'>-		  "Untested USB device specified at time of module insertion");</div><div class='del'>-		info("Warning: This is not guaranteed to work");</div><div class='del'>-		info("Using a newer kernel is preferred to this method");</div><div class='del'>-		info("Adding Palm OS protocol 4.x support for unknown device: 0x%x/0x%x",</div><div class='add'>+		printk(KERN_INFO KBUILD_MODNAME</div><div class='add'>+		       ": Untested USB device specified at time of module insertion\n");</div><div class='add'>+		printk(KERN_INFO KBUILD_MODNAME</div><div class='add'>+		       ": Warning: This is not guaranteed to work\n");</div><div class='add'>+		printk(KERN_INFO KBUILD_MODNAME</div><div class='add'>+		       ": Using a newer kernel is preferred to this method\n");</div><div class='add'>+		printk(KERN_INFO KBUILD_MODNAME</div><div class='add'>+		       ": Adding Palm OS protocol 4.x support for unknown device: 0x%x/0x%x\n",</div><div class='ctx'> 			vendor, product);</div><div class='ctx'> 	}</div><div class='ctx'> 	retval = usb_serial_register(&amp;handspring_device);</div><div class='hunk'>@@ -986,7 +993,7 @@ static int __init visor_init(void)</div><div class='ctx'> 	retval = usb_register(&amp;visor_driver);</div><div class='ctx'> 	if (retval)</div><div class='ctx'> 		goto failed_usb_register;</div><div class='del'>-	info(DRIVER_DESC);</div><div class='add'>+	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_DESC "\n");</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> failed_usb_register:</div><div class='head'>diff --git a/drivers/usb/serial/whiteheat.c b/drivers/usb/serial/whiteheat.c<br/>index 3a9d14384a43..5335d3211c07 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/whiteheat.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/serial/whiteheat.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/serial/whiteheat.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/serial/whiteheat.c</a></div><div class='hunk'>@@ -303,12 +303,15 @@ static int whiteheat_firmware_download(struct usb_serial *serial,</div><div class='ctx'> </div><div class='ctx'> 	if (request_ihex_firmware(&amp;firmware_fw, "whiteheat.fw",</div><div class='ctx'> 				  &amp;serial-&gt;dev-&gt;dev)) {</div><div class='del'>-		err("%s - request \"whiteheat.fw\" failed", __func__);</div><div class='add'>+		dev_err(&amp;serial-&gt;dev-&gt;dev,</div><div class='add'>+			"%s - request \"whiteheat.fw\" failed\n", __func__);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (request_ihex_firmware(&amp;loader_fw, "whiteheat_loader.fw",</div><div class='ctx'> 			     &amp;serial-&gt;dev-&gt;dev)) {</div><div class='del'>-		err("%s - request \"whiteheat_loader.fw\" failed", __func__);</div><div class='add'>+		dev_err(&amp;serial-&gt;dev-&gt;dev,</div><div class='add'>+			"%s - request \"whiteheat_loader.fw\" failed\n",</div><div class='add'>+			__func__);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	ret = 0;</div><div class='hunk'>@@ -320,9 +323,10 @@ static int whiteheat_firmware_download(struct usb_serial *serial,</div><div class='ctx'> 					      (unsigned char *)record-&gt;data,</div><div class='ctx'> 					      be16_to_cpu(record-&gt;len), 0xa0);</div><div class='ctx'> 		if (response &lt; 0) {</div><div class='del'>-			err("%s - ezusb_writememory failed for loader (%d %04X %p %d)",</div><div class='del'>-			    __func__, response, be32_to_cpu(record-&gt;addr),</div><div class='del'>-			    record-&gt;data, be16_to_cpu(record-&gt;len));</div><div class='add'>+			dev_err(&amp;serial-&gt;dev-&gt;dev, "%s - ezusb_writememory "</div><div class='add'>+				"failed for loader (%d %04X %p %d)\n",</div><div class='add'>+				__func__, response, be32_to_cpu(record-&gt;addr),</div><div class='add'>+				record-&gt;data, be16_to_cpu(record-&gt;len));</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		record = ihex_next_binrec(record);</div><div class='hunk'>@@ -338,9 +342,11 @@ static int whiteheat_firmware_download(struct usb_serial *serial,</div><div class='ctx'> 					      (unsigned char *)record-&gt;data,</div><div class='ctx'> 					      be16_to_cpu(record-&gt;len), 0xa3);</div><div class='ctx'> 		if (response &lt; 0) {</div><div class='del'>-			err("%s - ezusb_writememory failed for first firmware step (%d %04X %p %d)", </div><div class='del'>-			    __func__, response, be32_to_cpu(record-&gt;addr),</div><div class='del'>-			    record-&gt;data, be16_to_cpu(record-&gt;len));</div><div class='add'>+			dev_err(&amp;serial-&gt;dev-&gt;dev, "%s - ezusb_writememory "</div><div class='add'>+				"failed for first firmware step "</div><div class='add'>+				"(%d %04X %p %d)\n", __func__, response,</div><div class='add'>+				be32_to_cpu(record-&gt;addr), record-&gt;data,</div><div class='add'>+				be16_to_cpu(record-&gt;len));</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		++record;</div><div class='hunk'>@@ -354,9 +360,11 @@ static int whiteheat_firmware_download(struct usb_serial *serial,</div><div class='ctx'> 					      (unsigned char *)record-&gt;data,</div><div class='ctx'> 					      be16_to_cpu(record-&gt;len), 0xa0);</div><div class='ctx'> 		if (response &lt; 0) {</div><div class='del'>-			err("%s - ezusb_writememory failed for second firmware step (%d %04X %p %d)", </div><div class='del'>-			    __func__, response, be32_to_cpu(record-&gt;addr),</div><div class='del'>-			    record-&gt;data, be16_to_cpu(record-&gt;len));</div><div class='add'>+			dev_err(&amp;serial-&gt;dev-&gt;dev, "%s - ezusb_writememory "</div><div class='add'>+				"failed for second firmware step "</div><div class='add'>+				"(%d %04X %p %d)\n", __func__, response,</div><div class='add'>+				be32_to_cpu(record-&gt;addr), record-&gt;data,</div><div class='add'>+				be16_to_cpu(record-&gt;len));</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		++record;</div><div class='hunk'>@@ -421,12 +429,12 @@ static int whiteheat_attach(struct usb_serial *serial)</div><div class='ctx'> 	ret = usb_bulk_msg(serial-&gt;dev, pipe, command, 2,</div><div class='ctx'> 						&amp;alen, COMMAND_TIMEOUT_MS);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		err("%s: Couldn't send command [%d]",</div><div class='del'>-				serial-&gt;type-&gt;description, ret);</div><div class='add'>+		dev_err(&amp;serial-&gt;dev-&gt;dev, "%s: Couldn't send command [%d]\n",</div><div class='add'>+			serial-&gt;type-&gt;description, ret);</div><div class='ctx'> 		goto no_firmware;</div><div class='ctx'> 	} else if (alen != 2) {</div><div class='del'>-		err("%s: Send command incomplete [%d]",</div><div class='del'>-				serial-&gt;type-&gt;description, alen);</div><div class='add'>+		dev_err(&amp;serial-&gt;dev-&gt;dev, "%s: Send command incomplete [%d]\n",</div><div class='add'>+			serial-&gt;type-&gt;description, alen);</div><div class='ctx'> 		goto no_firmware;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -437,31 +445,33 @@ static int whiteheat_attach(struct usb_serial *serial)</div><div class='ctx'> 	ret = usb_bulk_msg(serial-&gt;dev, pipe, result,</div><div class='ctx'> 			sizeof(*hw_info) + 1, &amp;alen, COMMAND_TIMEOUT_MS);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		err("%s: Couldn't get results [%d]",</div><div class='del'>-				serial-&gt;type-&gt;description, ret);</div><div class='add'>+		dev_err(&amp;serial-&gt;dev-&gt;dev, "%s: Couldn't get results [%d]\n",</div><div class='add'>+			serial-&gt;type-&gt;description, ret);</div><div class='ctx'> 		goto no_firmware;</div><div class='ctx'> 	} else if (alen != sizeof(*hw_info) + 1) {</div><div class='del'>-		err("%s: Get results incomplete [%d]",</div><div class='del'>-				serial-&gt;type-&gt;description, alen);</div><div class='add'>+		dev_err(&amp;serial-&gt;dev-&gt;dev, "%s: Get results incomplete [%d]\n",</div><div class='add'>+			serial-&gt;type-&gt;description, alen);</div><div class='ctx'> 		goto no_firmware;</div><div class='ctx'> 	} else if (result[0] != command[0]) {</div><div class='del'>-		err("%s: Command failed [%d]",</div><div class='del'>-				serial-&gt;type-&gt;description, result[0]);</div><div class='add'>+		dev_err(&amp;serial-&gt;dev-&gt;dev, "%s: Command failed [%d]\n",</div><div class='add'>+			serial-&gt;type-&gt;description, result[0]);</div><div class='ctx'> 		goto no_firmware;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	hw_info = (struct whiteheat_hw_info *)&amp;result[1];</div><div class='ctx'> </div><div class='del'>-	info("%s: Driver %s: Firmware v%d.%02d", serial-&gt;type-&gt;description,</div><div class='del'>-	     DRIVER_VERSION, hw_info-&gt;sw_major_rev, hw_info-&gt;sw_minor_rev);</div><div class='add'>+	dev_info(&amp;serial-&gt;dev-&gt;dev, "%s: Driver %s: Firmware v%d.%02d\n",</div><div class='add'>+		 serial-&gt;type-&gt;description, DRIVER_VERSION,</div><div class='add'>+		 hw_info-&gt;sw_major_rev, hw_info-&gt;sw_minor_rev);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; serial-&gt;num_ports; i++) {</div><div class='ctx'> 		port = serial-&gt;port[i];</div><div class='ctx'> </div><div class='ctx'> 		info = kmalloc(sizeof(struct whiteheat_private), GFP_KERNEL);</div><div class='ctx'> 		if (info == NULL) {</div><div class='del'>-			err("%s: Out of memory for port structures\n",</div><div class='del'>-					serial-&gt;type-&gt;description);</div><div class='add'>+			dev_err(&amp;port-&gt;dev,</div><div class='add'>+				"%s: Out of memory for port structures\n",</div><div class='add'>+				serial-&gt;type-&gt;description);</div><div class='ctx'> 			goto no_private;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -481,18 +491,20 @@ static int whiteheat_attach(struct usb_serial *serial)</div><div class='ctx'> 		for (j = 0; j &lt; urb_pool_size; j++) {</div><div class='ctx'> 			urb = usb_alloc_urb(0, GFP_KERNEL);</div><div class='ctx'> 			if (!urb) {</div><div class='del'>-				err("No free urbs available");</div><div class='add'>+				dev_err(&amp;port-&gt;dev, "No free urbs available\n");</div><div class='ctx'> 				goto no_rx_urb;</div><div class='ctx'> 			}</div><div class='ctx'> 			buf_size = port-&gt;read_urb-&gt;transfer_buffer_length;</div><div class='ctx'> 			urb-&gt;transfer_buffer = kmalloc(buf_size, GFP_KERNEL);</div><div class='ctx'> 			if (!urb-&gt;transfer_buffer) {</div><div class='del'>-				err("Couldn't allocate urb buffer");</div><div class='add'>+				dev_err(&amp;port-&gt;dev,</div><div class='add'>+					"Couldn't allocate urb buffer\n");</div><div class='ctx'> 				goto no_rx_buf;</div><div class='ctx'> 			}</div><div class='ctx'> 			wrap = kmalloc(sizeof(*wrap), GFP_KERNEL);</div><div class='ctx'> 			if (!wrap) {</div><div class='del'>-				err("Couldn't allocate urb wrapper");</div><div class='add'>+				dev_err(&amp;port-&gt;dev,</div><div class='add'>+					"Couldn't allocate urb wrapper\n");</div><div class='ctx'> 				goto no_rx_wrap;</div><div class='ctx'> 			}</div><div class='ctx'> 			usb_fill_bulk_urb(urb, serial-&gt;dev,</div><div class='hunk'>@@ -505,18 +517,20 @@ static int whiteheat_attach(struct usb_serial *serial)</div><div class='ctx'> </div><div class='ctx'> 			urb = usb_alloc_urb(0, GFP_KERNEL);</div><div class='ctx'> 			if (!urb) {</div><div class='del'>-				err("No free urbs available");</div><div class='add'>+				dev_err(&amp;port-&gt;dev, "No free urbs available\n");</div><div class='ctx'> 				goto no_tx_urb;</div><div class='ctx'> 			}</div><div class='ctx'> 			buf_size = port-&gt;write_urb-&gt;transfer_buffer_length;</div><div class='ctx'> 			urb-&gt;transfer_buffer = kmalloc(buf_size, GFP_KERNEL);</div><div class='ctx'> 			if (!urb-&gt;transfer_buffer) {</div><div class='del'>-				err("Couldn't allocate urb buffer");</div><div class='add'>+				dev_err(&amp;port-&gt;dev,</div><div class='add'>+					"Couldn't allocate urb buffer\n");</div><div class='ctx'> 				goto no_tx_buf;</div><div class='ctx'> 			}</div><div class='ctx'> 			wrap = kmalloc(sizeof(*wrap), GFP_KERNEL);</div><div class='ctx'> 			if (!wrap) {</div><div class='del'>-				err("Couldn't allocate urb wrapper");</div><div class='add'>+				dev_err(&amp;port-&gt;dev,</div><div class='add'>+					"Couldn't allocate urb wrapper\n");</div><div class='ctx'> 				goto no_tx_wrap;</div><div class='ctx'> 			}</div><div class='ctx'> 			usb_fill_bulk_urb(urb, serial-&gt;dev,</div><div class='hunk'>@@ -534,8 +548,9 @@ static int whiteheat_attach(struct usb_serial *serial)</div><div class='ctx'> 	command_info = kmalloc(sizeof(struct whiteheat_command_private),</div><div class='ctx'> 								GFP_KERNEL);</div><div class='ctx'> 	if (command_info == NULL) {</div><div class='del'>-		err("%s: Out of memory for port structures\n",</div><div class='del'>-					serial-&gt;type-&gt;description);</div><div class='add'>+		dev_err(&amp;serial-&gt;dev-&gt;dev,</div><div class='add'>+			"%s: Out of memory for port structures\n",</div><div class='add'>+			serial-&gt;type-&gt;description);</div><div class='ctx'> 		goto no_command_private;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -552,12 +567,15 @@ static int whiteheat_attach(struct usb_serial *serial)</div><div class='ctx'> </div><div class='ctx'> no_firmware:</div><div class='ctx'> 	/* Firmware likely not running */</div><div class='del'>-	err("%s: Unable to retrieve firmware version, try replugging\n",</div><div class='del'>-					serial-&gt;type-&gt;description);</div><div class='del'>-	err("%s: If the firmware is not running (status led not blinking)\n",</div><div class='del'>-					serial-&gt;type-&gt;description);</div><div class='del'>-	err("%s: please contact support@connecttech.com\n",</div><div class='del'>-					serial-&gt;type-&gt;description);</div><div class='add'>+	dev_err(&amp;serial-&gt;dev-&gt;dev,</div><div class='add'>+		"%s: Unable to retrieve firmware version, try replugging\n",</div><div class='add'>+		serial-&gt;type-&gt;description);</div><div class='add'>+	dev_err(&amp;serial-&gt;dev-&gt;dev,</div><div class='add'>+		"%s: If the firmware is not running (status led not blinking)\n",</div><div class='add'>+		serial-&gt;type-&gt;description);</div><div class='add'>+	dev_err(&amp;serial-&gt;dev-&gt;dev,</div><div class='add'>+		"%s: please contact support@connecttech.com\n",</div><div class='add'>+		serial-&gt;type-&gt;description);</div><div class='ctx'> 	kfree(result);</div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'> </div><div class='hunk'>@@ -680,8 +698,9 @@ static int whiteheat_open(struct tty_struct *tty,</div><div class='ctx'> 	/* Start reading from the device */</div><div class='ctx'> 	retval = start_port_read(port);</div><div class='ctx'> 	if (retval) {</div><div class='del'>-		err("%s - failed submitting read urb, error %d",</div><div class='del'>-				__func__, retval);</div><div class='add'>+		dev_err(&amp;port-&gt;dev,</div><div class='add'>+			"%s - failed submitting read urb, error %d\n",</div><div class='add'>+			__func__, retval);</div><div class='ctx'> 		firm_close(port);</div><div class='ctx'> 		stop_command_port(port-&gt;serial);</div><div class='ctx'> 		goto exit;</div><div class='hunk'>@@ -806,8 +825,9 @@ static int whiteheat_write(struct tty_struct *tty,</div><div class='ctx'> 		urb-&gt;transfer_buffer_length = bytes;</div><div class='ctx'> 		result = usb_submit_urb(urb, GFP_ATOMIC);</div><div class='ctx'> 		if (result) {</div><div class='del'>-			err("%s - failed submitting write urb, error %d",</div><div class='del'>-							__func__, result);</div><div class='add'>+			dev_err(&amp;port-&gt;dev,</div><div class='add'>+				"%s - failed submitting write urb, error %d\n",</div><div class='add'>+				__func__, result);</div><div class='ctx'> 			sent = result;</div><div class='ctx'> 			spin_lock_irqsave(&amp;info-&gt;lock, flags);</div><div class='ctx'> 			list_add(tmp, &amp;info-&gt;tx_urbs_free);</div><div class='hunk'>@@ -1075,7 +1095,7 @@ static void whiteheat_read_callback(struct urb *urb)</div><div class='ctx'> 	wrap = urb_to_wrap(urb, &amp;info-&gt;rx_urbs_submitted);</div><div class='ctx'> 	if (!wrap) {</div><div class='ctx'> 		spin_unlock(&amp;info-&gt;lock);</div><div class='del'>-		err("%s - Not my urb!", __func__);</div><div class='add'>+		dev_err(&amp;port-&gt;dev, "%s - Not my urb!\n", __func__);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	list_del(&amp;wrap-&gt;list);</div><div class='hunk'>@@ -1119,7 +1139,7 @@ static void whiteheat_write_callback(struct urb *urb)</div><div class='ctx'> 	wrap = urb_to_wrap(urb, &amp;info-&gt;tx_urbs_submitted);</div><div class='ctx'> 	if (!wrap) {</div><div class='ctx'> 		spin_unlock(&amp;info-&gt;lock);</div><div class='del'>-		err("%s - Not my urb!", __func__);</div><div class='add'>+		dev_err(&amp;port-&gt;dev, "%s - Not my urb!\n", __func__);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	list_move(&amp;wrap-&gt;list, &amp;info-&gt;tx_urbs_free);</div><div class='hunk'>@@ -1383,8 +1403,9 @@ static int start_command_port(struct usb_serial *serial)</div><div class='ctx'> 		command_port-&gt;read_urb-&gt;dev = serial-&gt;dev;</div><div class='ctx'> 		retval = usb_submit_urb(command_port-&gt;read_urb, GFP_KERNEL);</div><div class='ctx'> 		if (retval) {</div><div class='del'>-			err("%s - failed submitting read urb, error %d",</div><div class='del'>-							__func__, retval);</div><div class='add'>+			dev_err(&amp;serial-&gt;dev-&gt;dev,</div><div class='add'>+				"%s - failed submitting read urb, error %d\n",</div><div class='add'>+				__func__, retval);</div><div class='ctx'> 			goto exit;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1481,7 +1502,7 @@ static void rx_data_softint(struct work_struct *work)</div><div class='ctx'> 	struct whiteheat_private *info =</div><div class='ctx'> 		container_of(work, struct whiteheat_private, rx_work);</div><div class='ctx'> 	struct usb_serial_port *port = info-&gt;port;</div><div class='del'>-	struct tty_struct *tty = port-&gt;port.tty;</div><div class='add'>+	struct tty_struct *tty = tty_port_tty_get(&amp;port-&gt;port);</div><div class='ctx'> 	struct whiteheat_urb_wrap *wrap;</div><div class='ctx'> 	struct urb *urb;</div><div class='ctx'> 	unsigned long flags;</div><div class='hunk'>@@ -1493,7 +1514,7 @@ static void rx_data_softint(struct work_struct *work)</div><div class='ctx'> 	spin_lock_irqsave(&amp;info-&gt;lock, flags);</div><div class='ctx'> 	if (info-&gt;flags &amp; THROTTLED) {</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;info-&gt;lock, flags);</div><div class='del'>-		return;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_safe(tmp, tmp2, &amp;info-&gt;rx_urb_q) {</div><div class='hunk'>@@ -1513,7 +1534,7 @@ static void rx_data_softint(struct work_struct *work)</div><div class='ctx'> 				spin_unlock_irqrestore(&amp;info-&gt;lock, flags);</div><div class='ctx'> 				tty_flip_buffer_push(tty);</div><div class='ctx'> 				schedule_work(&amp;info-&gt;rx_work);</div><div class='del'>-				return;</div><div class='add'>+				goto out;</div><div class='ctx'> 			}</div><div class='ctx'> 			tty_insert_flip_string(tty, urb-&gt;transfer_buffer, len);</div><div class='ctx'> 			sent += len;</div><div class='hunk'>@@ -1522,7 +1543,8 @@ static void rx_data_softint(struct work_struct *work)</div><div class='ctx'> 		urb-&gt;dev = port-&gt;serial-&gt;dev;</div><div class='ctx'> 		result = usb_submit_urb(urb, GFP_ATOMIC);</div><div class='ctx'> 		if (result) {</div><div class='del'>-			err("%s - failed resubmitting read urb, error %d",</div><div class='add'>+			dev_err(&amp;port-&gt;dev,</div><div class='add'>+				"%s - failed resubmitting read urb, error %d\n",</div><div class='ctx'> 				__func__, result);</div><div class='ctx'> 			spin_lock_irqsave(&amp;info-&gt;lock, flags);</div><div class='ctx'> 			list_add(tmp, &amp;info-&gt;rx_urbs_free);</div><div class='hunk'>@@ -1536,6 +1558,8 @@ static void rx_data_softint(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> 	if (sent)</div><div class='ctx'> 		tty_flip_buffer_push(tty);</div><div class='add'>+out:</div><div class='add'>+	tty_kref_put(tty);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -1554,7 +1578,8 @@ static int __init whiteheat_init(void)</div><div class='ctx'> 	retval = usb_register(&amp;whiteheat_driver);</div><div class='ctx'> 	if (retval)</div><div class='ctx'> 		goto failed_usb_register;</div><div class='del'>-	info(DRIVER_DESC " " DRIVER_VERSION);</div><div class='add'>+	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"</div><div class='add'>+	       DRIVER_DESC "\n");</div><div class='ctx'> 	return 0;</div><div class='ctx'> failed_usb_register:</div><div class='ctx'> 	usb_serial_deregister(&amp;whiteheat_device);</div><div class='head'>diff --git a/drivers/usb/storage/onetouch.c b/drivers/usb/storage/onetouch.c<br/>index 98b89ea9e312..c7bf8954b4e4 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/storage/onetouch.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/storage/onetouch.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/storage/onetouch.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/storage/onetouch.c</a></div><div class='hunk'>@@ -78,8 +78,8 @@ static void usb_onetouch_irq(struct urb *urb)</div><div class='ctx'> resubmit:</div><div class='ctx'> 	retval = usb_submit_urb (urb, GFP_ATOMIC);</div><div class='ctx'> 	if (retval)</div><div class='del'>-		err ("can't resubmit intr, %s-%s/input0, retval %d",</div><div class='del'>-			onetouch-&gt;udev-&gt;bus-&gt;bus_name,</div><div class='add'>+		dev_err(&amp;dev-&gt;dev, "can't resubmit intr, %s-%s/input0, "</div><div class='add'>+			"retval %d\n", onetouch-&gt;udev-&gt;bus-&gt;bus_name,</div><div class='ctx'> 			onetouch-&gt;udev-&gt;devpath, retval);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -90,7 +90,7 @@ static int usb_onetouch_open(struct input_dev *dev)</div><div class='ctx'> 	onetouch-&gt;is_open = 1;</div><div class='ctx'> 	onetouch-&gt;irq-&gt;dev = onetouch-&gt;udev;</div><div class='ctx'> 	if (usb_submit_urb(onetouch-&gt;irq, GFP_KERNEL)) {</div><div class='del'>-		err("usb_submit_urb failed");</div><div class='add'>+		dev_err(&amp;dev-&gt;dev, "usb_submit_urb failed\n");</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -117,7 +117,8 @@ static void usb_onetouch_pm_hook(struct us_data *us, int action)</div><div class='ctx'> 			break;</div><div class='ctx'> 		case US_RESUME:</div><div class='ctx'> 			if (usb_submit_urb(onetouch-&gt;irq, GFP_KERNEL) != 0)</div><div class='del'>-				err("usb_submit_urb failed");</div><div class='add'>+				dev_err(&amp;onetouch-&gt;irq-&gt;dev-&gt;dev,</div><div class='add'>+					"usb_submit_urb failed\n");</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			break;</div><div class='head'>diff --git a/drivers/usb/storage/transport.c b/drivers/usb/storage/transport.c<br/>index 3523a0bfa0ff..79108d5d3171 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/storage/transport.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/usb/storage/transport.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/usb/storage/transport.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/usb/storage/transport.c</a></div><div class='hunk'>@@ -663,7 +663,7 @@ void usb_stor_invoke_transport(struct scsi_cmnd *srb, struct us_data *us)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Did we transfer less than the minimum amount required? */</div><div class='del'>-	if (srb-&gt;result == SAM_STAT_GOOD &amp;&amp;</div><div class='add'>+	if ((srb-&gt;result == SAM_STAT_GOOD || srb-&gt;sense_buffer[2] == 0) &amp;&amp;</div><div class='ctx'> 			scsi_bufflen(srb) - scsi_get_resid(srb) &lt; srb-&gt;underflow)</div><div class='ctx'> 		srb-&gt;result = (DID_ERROR &lt;&lt; 16) | (SUGGEST_RETRY &lt;&lt; 24);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig<br/>index 70d135e0cc47..0f13448c6f79 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/video/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/Kconfig</a></div><div class='hunk'>@@ -76,6 +76,14 @@ config FB_DDC</div><div class='ctx'>        select I2C</div><div class='ctx'>        default n</div><div class='ctx'> </div><div class='add'>+config FB_BOOT_VESA_SUPPORT</div><div class='add'>+	bool</div><div class='add'>+	depends on FB</div><div class='add'>+	default n</div><div class='add'>+	---help---</div><div class='add'>+	  If true, at least one selected framebuffer driver can take advantage</div><div class='add'>+	  of VESA video modes set at an early boot stage via the vga= parameter.</div><div class='add'>+</div><div class='ctx'> config FB_CFB_FILLRECT</div><div class='ctx'> 	tristate</div><div class='ctx'> 	depends on FB</div><div class='hunk'>@@ -172,11 +180,6 @@ config FB_DEFERRED_IO</div><div class='ctx'> 	bool</div><div class='ctx'> 	depends on FB</div><div class='ctx'> </div><div class='del'>-config FB_METRONOME</div><div class='del'>-	tristate</div><div class='del'>-	depends on FB</div><div class='del'>-	depends on FB_DEFERRED_IO</div><div class='del'>-</div><div class='ctx'> config FB_HECUBA</div><div class='ctx'> 	tristate</div><div class='ctx'> 	depends on FB</div><div class='hunk'>@@ -259,16 +262,24 @@ config FB_PM2</div><div class='ctx'> 	select FB_CFB_COPYAREA</div><div class='ctx'> 	select FB_CFB_IMAGEBLIT</div><div class='ctx'> 	help</div><div class='del'>-	  This is the frame buffer device driver for the Permedia2 AGP frame</div><div class='del'>-	  buffer card from ASK, aka `Graphic Blaster Exxtreme'.  There is a</div><div class='del'>-	  product page at</div><div class='del'>-	  &lt;http://www.ask.com.hk/product/Permedia%202/permedia2.htm&gt;.</div><div class='add'>+	  This is the frame buffer device driver for cards based on</div><div class='add'>+	  the 3D Labs Permedia, Permedia 2 and Permedia 2V chips.</div><div class='add'>+	  The driver was tested on the following cards:</div><div class='add'>+		Diamond FireGL 1000 PRO AGP</div><div class='add'>+		ELSA Gloria Synergy PCI</div><div class='add'>+		Appian Jeronimo PRO (both heads) PCI</div><div class='add'>+		3DLabs Oxygen ACX aka EONtronics Picasso P2 PCI</div><div class='add'>+		Techsource Raptor GFX-8P (aka Sun PGX-32) on SPARC</div><div class='add'>+		ASK Graphic Blaster Exxtreme AGP</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here: the</div><div class='add'>+	  module will be called pm2fb.</div><div class='ctx'> </div><div class='ctx'> config FB_PM2_FIFO_DISCONNECT</div><div class='ctx'> 	bool "enable FIFO disconnect feature"</div><div class='ctx'> 	depends on FB_PM2 &amp;&amp; PCI</div><div class='ctx'> 	help</div><div class='del'>-	  Support the Permedia2 FIFO disconnect feature (see CONFIG_FB_PM2).</div><div class='add'>+	  Support the Permedia2 FIFO disconnect feature.</div><div class='ctx'> </div><div class='ctx'> config FB_ARMCLCD</div><div class='ctx'> 	tristate "ARM PrimeCell PL110 support"</div><div class='hunk'>@@ -678,7 +689,7 @@ config FB_VESA</div><div class='ctx'> 	select FB_CFB_FILLRECT</div><div class='ctx'> 	select FB_CFB_COPYAREA</div><div class='ctx'> 	select FB_CFB_IMAGEBLIT</div><div class='del'>-	select VIDEO_SELECT</div><div class='add'>+	select FB_BOOT_VESA_SUPPORT</div><div class='ctx'> 	help</div><div class='ctx'> 	  This is the frame buffer device driver for generic VESA 2.0</div><div class='ctx'> 	  compliant graphic cards. The older VESA 1.2 cards are not supported.</div><div class='hunk'>@@ -687,23 +698,14 @@ config FB_VESA</div><div class='ctx'> </div><div class='ctx'> config FB_EFI</div><div class='ctx'> 	bool "EFI-based Framebuffer Support"</div><div class='del'>-	depends on (FB = y) &amp;&amp; X86</div><div class='del'>-	select FB_CFB_FILLRECT</div><div class='del'>-	select FB_CFB_COPYAREA</div><div class='del'>-	select FB_CFB_IMAGEBLIT</div><div class='del'>-	help</div><div class='del'>-	  This is the EFI frame buffer device driver. If the firmware on</div><div class='del'>-	  your platform is UEFI2.0, select Y to add support for</div><div class='del'>-	  Graphics Output Protocol for early console messages to appear.</div><div class='del'>-</div><div class='del'>-config FB_IMAC</div><div class='del'>-	bool "Intel-based Macintosh Framebuffer Support"</div><div class='ctx'> 	depends on (FB = y) &amp;&amp; X86 &amp;&amp; EFI</div><div class='ctx'> 	select FB_CFB_FILLRECT</div><div class='ctx'> 	select FB_CFB_COPYAREA</div><div class='ctx'> 	select FB_CFB_IMAGEBLIT</div><div class='ctx'> 	help</div><div class='del'>-	  This is the frame buffer device driver for the Intel-based Macintosh</div><div class='add'>+	  This is the EFI frame buffer device driver. If the firmware on</div><div class='add'>+	  your platform is EFI 1.10 or UEFI 2.0, select Y to add support for</div><div class='add'>+	  using the EFI framebuffer as your console.</div><div class='ctx'> </div><div class='ctx'> config FB_N411</div><div class='ctx'>        tristate "N411 Apollo/Hecuba devkit support"</div><div class='hunk'>@@ -1124,6 +1126,7 @@ config FB_INTEL</div><div class='ctx'> 	select FB_CFB_FILLRECT</div><div class='ctx'> 	select FB_CFB_COPYAREA</div><div class='ctx'> 	select FB_CFB_IMAGEBLIT</div><div class='add'>+	select FB_BOOT_VESA_SUPPORT</div><div class='ctx'> 	help</div><div class='ctx'> 	  This driver supports the on-board graphics built in to the Intel</div><div class='ctx'>           830M/845G/852GM/855GM/865G/915G/915GM/945G/945GM/965G/965GM chipsets.</div><div class='hunk'>@@ -1476,6 +1479,7 @@ config FB_SIS</div><div class='ctx'> 	select FB_CFB_FILLRECT</div><div class='ctx'> 	select FB_CFB_COPYAREA</div><div class='ctx'> 	select FB_CFB_IMAGEBLIT</div><div class='add'>+	select FB_BOOT_VESA_SUPPORT</div><div class='ctx'> 	help</div><div class='ctx'> 	  This is the frame buffer device driver for the SiS 300, 315, 330</div><div class='ctx'> 	  and 340 series as well as XGI V3XT, V5, V8, Z7 graphics chipsets.</div><div class='hunk'>@@ -1498,6 +1502,24 @@ config FB_SIS_315</div><div class='ctx'> 	  (315/H/PRO, 55x, 650, 651, 740, 330, 661, 741, 760, 761) as well</div><div class='ctx'> 	  as XGI V3XT, V5, V8 and Z7.</div><div class='ctx'> </div><div class='add'>+config FB_VIA</div><div class='add'>+       tristate "VIA UniChrome (Pro) and Chrome9 display support"</div><div class='add'>+       depends on FB &amp;&amp; PCI</div><div class='add'>+       select FB_CFB_FILLRECT</div><div class='add'>+       select FB_CFB_COPYAREA</div><div class='add'>+       select FB_CFB_IMAGEBLIT</div><div class='add'>+       select FB_SOFT_CURSOR</div><div class='add'>+       select I2C_ALGOBIT</div><div class='add'>+       select I2C</div><div class='add'>+       help</div><div class='add'>+	  This is the frame buffer device driver for Graphics chips of VIA</div><div class='add'>+	  UniChrome (Pro) Family (CLE266,PM800/CN400,P4M800CE/P4M800Pro/</div><div class='add'>+	  CN700/VN800,CX700/VX700,P4M890) and Chrome9 Family (K8M890,CN896</div><div class='add'>+ 	  /P4M900,VX800)</div><div class='add'>+	  Say Y if you have a VIA UniChrome graphics board.</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here: the</div><div class='add'>+	  module will be called viafb.</div><div class='ctx'> config FB_NEOMAGIC</div><div class='ctx'> 	tristate "NeoMagic display support"</div><div class='ctx'> 	depends on FB &amp;&amp; PCI</div><div class='hunk'>@@ -1527,25 +1549,25 @@ config FB_KYRO</div><div class='ctx'> 	  module will be called kyrofb.</div><div class='ctx'> </div><div class='ctx'> config FB_3DFX</div><div class='del'>-	tristate "3Dfx Banshee/Voodoo3 display support"</div><div class='add'>+	tristate "3Dfx Banshee/Voodoo3/Voodoo5 display support"</div><div class='ctx'> 	depends on FB &amp;&amp; PCI</div><div class='ctx'> 	select FB_CFB_IMAGEBLIT</div><div class='ctx'> 	select FB_CFB_FILLRECT</div><div class='ctx'> 	select FB_CFB_COPYAREA</div><div class='ctx'> 	help</div><div class='del'>-	  This driver supports graphics boards with the 3Dfx Banshee/Voodoo3</div><div class='del'>-	  chips. Say Y if you have such a graphics board.</div><div class='add'>+	  This driver supports graphics boards with the 3Dfx Banshee,</div><div class='add'>+	  Voodoo3 or VSA-100 (aka Voodoo4/5) chips. Say Y if you have</div><div class='add'>+	  such a graphics board.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='ctx'> 	  module will be called tdfxfb.</div><div class='ctx'> </div><div class='ctx'> config FB_3DFX_ACCEL</div><div class='del'>-	bool "3Dfx Banshee/Voodoo3 Acceleration functions (EXPERIMENTAL)"</div><div class='add'>+	bool "3Dfx Acceleration functions (EXPERIMENTAL)"</div><div class='ctx'> 	depends on FB_3DFX &amp;&amp; EXPERIMENTAL</div><div class='ctx'> 	---help---</div><div class='del'>-	This will compile the 3Dfx Banshee/Voodoo3 frame buffer device</div><div class='del'>-	with acceleration functions.</div><div class='del'>-</div><div class='add'>+	This will compile the 3Dfx Banshee/Voodoo3/VSA-100 frame buffer</div><div class='add'>+	device driver with acceleration functions.</div><div class='ctx'> </div><div class='ctx'> config FB_VOODOO1</div><div class='ctx'> 	tristate "3Dfx Voodoo Graphics (sst1) support"</div><div class='hunk'>@@ -1583,7 +1605,6 @@ config FB_CYBLA</div><div class='ctx'> 	tristate "Cyberblade/i1 support"</div><div class='ctx'> 	depends on FB &amp;&amp; PCI &amp;&amp; X86_32 &amp;&amp; !64BIT</div><div class='ctx'> 	select FB_CFB_IMAGEBLIT</div><div class='del'>-	select VIDEO_SELECT</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  This driver is supposed to support the Trident Cyberblade/i1</div><div class='ctx'> 	  graphics core integrated in the VIA VT8601A North Bridge,</div><div class='hunk'>@@ -1611,17 +1632,16 @@ config FB_TRIDENT</div><div class='ctx'> 	select FB_CFB_COPYAREA</div><div class='ctx'> 	select FB_CFB_IMAGEBLIT</div><div class='ctx'> 	---help---</div><div class='del'>-	  This driver is supposed to support graphics boards with the</div><div class='del'>-	  Trident CyberXXXX/Image/CyberBlade chips mostly found in laptops</div><div class='add'>+	  This is the frame buffer device driver for Trident PCI/AGP chipsets.</div><div class='add'>+	  Supported chipset families are TGUI 9440/96XX, 3DImage, Blade3D</div><div class='add'>+	  and Blade XP.</div><div class='add'>+	  There are also integrated versions of these chips called CyberXXXX,</div><div class='add'>+	  CyberImage or CyberBlade. These chips are mostly found in laptops</div><div class='ctx'> 	  but also on some motherboards. For more information, read</div><div class='ctx'> 	  &lt;file:Documentation/fb/tridentfb.txt&gt;</div><div class='ctx'> </div><div class='del'>-	  Cyberblade/i1 support will be removed soon, use the cyblafb driver</div><div class='del'>-	  instead.</div><div class='del'>-</div><div class='ctx'> 	  Say Y if you have such a graphics board.</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='ctx'> 	  module will be called tridentfb.</div><div class='ctx'> </div><div class='hunk'>@@ -1876,6 +1896,28 @@ config FB_SH_MOBILE_LCDC</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  Frame buffer driver for the on-chip SH-Mobile LCD controller.</div><div class='ctx'> </div><div class='add'>+config FB_TMIO</div><div class='add'>+	tristate "Toshiba Mobile IO FrameBuffer support"</div><div class='add'>+	depends on FB &amp;&amp; MFD_CORE</div><div class='add'>+	select FB_CFB_FILLRECT</div><div class='add'>+	select FB_CFB_COPYAREA</div><div class='add'>+	select FB_CFB_IMAGEBLIT</div><div class='add'>+	---help---</div><div class='add'>+	  Frame buffer driver for the Toshiba Mobile IO integrated as found</div><div class='add'>+	  on the Sharp SL-6000 series</div><div class='add'>+</div><div class='add'>+	  This driver is also available as a module ( = code which can be</div><div class='add'>+	  inserted and removed from the running kernel whenever you want). The</div><div class='add'>+	  module will be called tmiofb. If you want to compile it as a module,</div><div class='add'>+	  say M here and read &lt;file:Documentation/kbuild/modules.txt&gt;.</div><div class='add'>+</div><div class='add'>+	  If unsure, say N.</div><div class='add'>+</div><div class='add'>+config FB_TMIO_ACCELL</div><div class='add'>+	bool "tmiofb acceleration"</div><div class='add'>+	depends on FB_TMIO</div><div class='add'>+	default y</div><div class='add'>+</div><div class='ctx'> config FB_S3C2410</div><div class='ctx'> 	tristate "S3C2410 LCD framebuffer support"</div><div class='ctx'> 	depends on FB &amp;&amp; ARCH_S3C2410</div><div class='hunk'>@@ -1974,19 +2016,6 @@ config FB_XILINX</div><div class='ctx'> 	  framebuffer. ML300 carries a 640*480 LCD display on the board,</div><div class='ctx'> 	  ML403 uses a standard DB15 VGA connector.</div><div class='ctx'> </div><div class='del'>-config FB_AM200EPD</div><div class='del'>-       tristate "AM-200 E-Ink EPD devkit support"</div><div class='del'>-       depends on FB &amp;&amp; ARCH_PXA &amp;&amp; MMU</div><div class='del'>-       select FB_SYS_FILLRECT</div><div class='del'>-       select FB_SYS_COPYAREA</div><div class='del'>-       select FB_SYS_IMAGEBLIT</div><div class='del'>-       select FB_SYS_FOPS</div><div class='del'>-       select FB_DEFERRED_IO</div><div class='del'>-       select FB_METRONOME</div><div class='del'>-       help</div><div class='del'>-         This enables support for the Metronome display controller used on</div><div class='del'>-         the E-Ink AM-200 EPD devkit.</div><div class='del'>-</div><div class='ctx'> config FB_COBALT</div><div class='ctx'> 	tristate "Cobalt server LCD frame buffer support"</div><div class='ctx'> 	depends on FB &amp;&amp; MIPS_COBALT</div><div class='hunk'>@@ -2041,6 +2070,19 @@ config XEN_FBDEV_FRONTEND</div><div class='ctx'> 	  frame buffer driver.  It communicates with a back-end</div><div class='ctx'> 	  in another domain.</div><div class='ctx'> </div><div class='add'>+config FB_METRONOME</div><div class='add'>+	tristate "E-Ink Metronome/8track controller support"</div><div class='add'>+	depends on FB</div><div class='add'>+	select FB_SYS_FILLRECT</div><div class='add'>+	select FB_SYS_COPYAREA</div><div class='add'>+	select FB_SYS_IMAGEBLIT</div><div class='add'>+	select FB_SYS_FOPS</div><div class='add'>+	select FB_DEFERRED_IO</div><div class='add'>+	help</div><div class='add'>+	  This driver implements support for the E-Ink Metronome</div><div class='add'>+	  controller. The pre-release name for this device was 8track</div><div class='add'>+	  and could also have been called by some vendors as PVI-nnnn.</div><div class='add'>+</div><div class='ctx'> source "drivers/video/omap/Kconfig"</div><div class='ctx'> </div><div class='ctx'> source "drivers/video/backlight/Kconfig"</div><div class='head'>diff --git a/drivers/video/Makefile b/drivers/video/Makefile<br/>index a6b55297a7fb..248bddc8d0b0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/video/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/Makefile</a></div><div class='hunk'>@@ -29,7 +29,6 @@ obj-$(CONFIG_FB_DEFERRED_IO)   += fb_defio.o</div><div class='ctx'> </div><div class='ctx'> # Hardware specific drivers go first</div><div class='ctx'> obj-$(CONFIG_FB_AMIGA)            += amifb.o c2p.o</div><div class='del'>-obj-$(CONFIG_FB_AM200EPD)         += am200epd.o</div><div class='ctx'> obj-$(CONFIG_FB_ARC)              += arcfb.o</div><div class='ctx'> obj-$(CONFIG_FB_CLPS711X)         += clps711xfb.o</div><div class='ctx'> obj-$(CONFIG_FB_CYBER2000)        += cyber2000fb.o</div><div class='hunk'>@@ -43,6 +42,7 @@ obj-$(CONFIG_FB_ATY)		  += aty/ macmodes.o</div><div class='ctx'> obj-$(CONFIG_FB_ATY128)		  += aty/ macmodes.o</div><div class='ctx'> obj-$(CONFIG_FB_RADEON)		  += aty/</div><div class='ctx'> obj-$(CONFIG_FB_SIS)		  += sis/</div><div class='add'>+obj-$(CONFIG_FB_VIA)		  += via/</div><div class='ctx'> obj-$(CONFIG_FB_KYRO)             += kyro/</div><div class='ctx'> obj-$(CONFIG_FB_SAVAGE)		  += savage/</div><div class='ctx'> obj-$(CONFIG_FB_GEODE)		  += geode/</div><div class='hunk'>@@ -98,6 +98,7 @@ obj-$(CONFIG_FB_CIRRUS)		  += cirrusfb.o</div><div class='ctx'> obj-$(CONFIG_FB_ASILIANT)	  += asiliantfb.o</div><div class='ctx'> obj-$(CONFIG_FB_PXA)		  += pxafb.o</div><div class='ctx'> obj-$(CONFIG_FB_W100)		  += w100fb.o</div><div class='add'>+obj-$(CONFIG_FB_TMIO)		  += tmiofb.o</div><div class='ctx'> obj-$(CONFIG_FB_AU1100)		  += au1100fb.o</div><div class='ctx'> obj-$(CONFIG_FB_AU1200)		  += au1200fb.o</div><div class='ctx'> obj-$(CONFIG_FB_PMAG_AA)	  += pmag-aa-fb.o</div><div class='hunk'>@@ -125,7 +126,6 @@ obj-$(CONFIG_FB_CARMINE)          += carminefb.o</div><div class='ctx'> # Platform or fallback drivers go here</div><div class='ctx'> obj-$(CONFIG_FB_UVESA)            += uvesafb.o</div><div class='ctx'> obj-$(CONFIG_FB_VESA)             += vesafb.o</div><div class='del'>-obj-$(CONFIG_FB_IMAC)             += imacfb.o</div><div class='ctx'> obj-$(CONFIG_FB_EFI)              += efifb.o</div><div class='ctx'> obj-$(CONFIG_FB_VGA16)            += vga16fb.o</div><div class='ctx'> obj-$(CONFIG_FB_OF)               += offb.o</div><div class='head'>diff --git a/drivers/video/am200epd.c b/drivers/video/am200epd.c<br/>deleted file mode 100644<br/>index 0c35b8b0160e..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/am200epd.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/video/am200epd.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,295 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * linux/drivers/video/am200epd.c -- Platform device for AM200 EPD kit</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2008, Jaya Kumar</div><div class='del'>- *</div><div class='del'>- * This file is subject to the terms and conditions of the GNU General Public</div><div class='del'>- * License. See the file COPYING in the main directory of this archive for</div><div class='del'>- * more details.</div><div class='del'>- *</div><div class='del'>- * Layout is based on skeletonfb.c by James Simmons and Geert Uytterhoeven.</div><div class='del'>- *</div><div class='del'>- * This work was made possible by help and equipment support from E-Ink</div><div class='del'>- * Corporation. http://support.eink.com/community</div><div class='del'>- *</div><div class='del'>- * This driver is written to be used with the Metronome display controller.</div><div class='del'>- * on the AM200 EPD prototype kit/development kit with an E-Ink 800x600</div><div class='del'>- * Vizplex EPD on a Gumstix board using the Lyre interface board.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/fb.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/list.h&gt;</div><div class='del'>-#include &lt;linux/uaccess.h&gt;</div><div class='del'>-#include &lt;linux/irq.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;video/metronomefb.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;mach/pxa-regs.h&gt;</div><div class='del'>-</div><div class='del'>-/* register offsets for gpio control */</div><div class='del'>-#define LED_GPIO_PIN 51</div><div class='del'>-#define STDBY_GPIO_PIN 48</div><div class='del'>-#define RST_GPIO_PIN 49</div><div class='del'>-#define RDY_GPIO_PIN 32</div><div class='del'>-#define ERR_GPIO_PIN 17</div><div class='del'>-#define PCBPWR_GPIO_PIN 16</div><div class='del'>-</div><div class='del'>-#define AF_SEL_GPIO_N 0x3</div><div class='del'>-#define GAFR0_U_OFFSET(pin) ((pin - 16) * 2)</div><div class='del'>-#define GAFR1_L_OFFSET(pin) ((pin - 32) * 2)</div><div class='del'>-#define GAFR1_U_OFFSET(pin) ((pin - 48) * 2)</div><div class='del'>-#define GPDR1_OFFSET(pin) (pin - 32)</div><div class='del'>-#define GPCR1_OFFSET(pin) (pin - 32)</div><div class='del'>-#define GPSR1_OFFSET(pin) (pin - 32)</div><div class='del'>-#define GPCR0_OFFSET(pin) (pin)</div><div class='del'>-#define GPSR0_OFFSET(pin) (pin)</div><div class='del'>-</div><div class='del'>-static void am200_set_gpio_output(int pin, int val)</div><div class='del'>-{</div><div class='del'>-	u8 index;</div><div class='del'>-</div><div class='del'>-	index = pin &gt;&gt; 4;</div><div class='del'>-</div><div class='del'>-	switch (index) {</div><div class='del'>-	case 1:</div><div class='del'>-		if (val)</div><div class='del'>-			GPSR0 |= (1 &lt;&lt; GPSR0_OFFSET(pin));</div><div class='del'>-		else</div><div class='del'>-			GPCR0 |= (1 &lt;&lt; GPCR0_OFFSET(pin));</div><div class='del'>-		break;</div><div class='del'>-	case 2:</div><div class='del'>-		break;</div><div class='del'>-	case 3:</div><div class='del'>-		if (val)</div><div class='del'>-			GPSR1 |= (1 &lt;&lt; GPSR1_OFFSET(pin));</div><div class='del'>-		else</div><div class='del'>-			GPCR1 |= (1 &lt;&lt; GPCR1_OFFSET(pin));</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		printk(KERN_ERR "unimplemented\n");</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __devinit am200_init_gpio_pin(int pin, int dir)</div><div class='del'>-{</div><div class='del'>-	u8 index;</div><div class='del'>-	/* dir 0 is output, 1 is input</div><div class='del'>-	- do 2 things here:</div><div class='del'>-	- set gpio alternate function to standard gpio</div><div class='del'>-	- set gpio direction to input or output  */</div><div class='del'>-</div><div class='del'>-	index = pin &gt;&gt; 4;</div><div class='del'>-	switch (index) {</div><div class='del'>-	case 1:</div><div class='del'>-		GAFR0_U &amp;= ~(AF_SEL_GPIO_N &lt;&lt; GAFR0_U_OFFSET(pin));</div><div class='del'>-</div><div class='del'>-		if (dir)</div><div class='del'>-			GPDR0 &amp;= ~(1 &lt;&lt; pin);</div><div class='del'>-		else</div><div class='del'>-			GPDR0 |= (1 &lt;&lt; pin);</div><div class='del'>-		break;</div><div class='del'>-	case 2:</div><div class='del'>-		GAFR1_L &amp;= ~(AF_SEL_GPIO_N &lt;&lt; GAFR1_L_OFFSET(pin));</div><div class='del'>-</div><div class='del'>-		if (dir)</div><div class='del'>-			GPDR1 &amp;= ~(1 &lt;&lt; GPDR1_OFFSET(pin));</div><div class='del'>-		else</div><div class='del'>-			GPDR1 |= (1 &lt;&lt; GPDR1_OFFSET(pin));</div><div class='del'>-		break;</div><div class='del'>-	case 3:</div><div class='del'>-		GAFR1_U &amp;= ~(AF_SEL_GPIO_N &lt;&lt; GAFR1_U_OFFSET(pin));</div><div class='del'>-</div><div class='del'>-		if (dir)</div><div class='del'>-			GPDR1 &amp;= ~(1 &lt;&lt; GPDR1_OFFSET(pin));</div><div class='del'>-		else</div><div class='del'>-			GPDR1 |= (1 &lt;&lt; GPDR1_OFFSET(pin));</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		printk(KERN_ERR "unimplemented\n");</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void am200_init_gpio_regs(struct metronomefb_par *par)</div><div class='del'>-{</div><div class='del'>-	am200_init_gpio_pin(LED_GPIO_PIN, 0);</div><div class='del'>-	am200_set_gpio_output(LED_GPIO_PIN, 0);</div><div class='del'>-</div><div class='del'>-	am200_init_gpio_pin(STDBY_GPIO_PIN, 0);</div><div class='del'>-	am200_set_gpio_output(STDBY_GPIO_PIN, 0);</div><div class='del'>-</div><div class='del'>-	am200_init_gpio_pin(RST_GPIO_PIN, 0);</div><div class='del'>-	am200_set_gpio_output(RST_GPIO_PIN, 0);</div><div class='del'>-</div><div class='del'>-	am200_init_gpio_pin(RDY_GPIO_PIN, 1);</div><div class='del'>-</div><div class='del'>-	am200_init_gpio_pin(ERR_GPIO_PIN, 1);</div><div class='del'>-</div><div class='del'>-	am200_init_gpio_pin(PCBPWR_GPIO_PIN, 0);</div><div class='del'>-	am200_set_gpio_output(PCBPWR_GPIO_PIN, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void am200_disable_lcd_controller(struct metronomefb_par *par)</div><div class='del'>-{</div><div class='del'>-	LCSR = 0xffffffff;	/* Clear LCD Status Register */</div><div class='del'>-	LCCR0 |= LCCR0_DIS;	/* Disable LCD Controller */</div><div class='del'>-</div><div class='del'>-	/* we reset and just wait for things to settle */</div><div class='del'>-	msleep(200);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void am200_enable_lcd_controller(struct metronomefb_par *par)</div><div class='del'>-{</div><div class='del'>-	LCSR = 0xffffffff;</div><div class='del'>-	FDADR0 = par-&gt;metromem_desc_dma;</div><div class='del'>-	LCCR0 |= LCCR0_ENB;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void am200_init_lcdc_regs(struct metronomefb_par *par)</div><div class='del'>-{</div><div class='del'>-	/* here we do:</div><div class='del'>-	- disable the lcd controller</div><div class='del'>-	- setup lcd control registers</div><div class='del'>-	- setup dma descriptor</div><div class='del'>-	- reenable lcd controller</div><div class='del'>-	*/</div><div class='del'>-</div><div class='del'>-	/* disable the lcd controller */</div><div class='del'>-	am200_disable_lcd_controller(par);</div><div class='del'>-</div><div class='del'>-	/* setup lcd control registers */</div><div class='del'>-	LCCR0 = LCCR0_LDM | LCCR0_SFM | LCCR0_IUM | LCCR0_EFM | LCCR0_PAS</div><div class='del'>-		| LCCR0_QDM | LCCR0_BM | LCCR0_OUM;</div><div class='del'>-</div><div class='del'>-	LCCR1 = (par-&gt;info-&gt;var.xres/2 - 1) /* pixels per line */</div><div class='del'>-		| (27 &lt;&lt; 10) /* hsync pulse width - 1 */</div><div class='del'>-		| (33 &lt;&lt; 16) /* eol pixel count */</div><div class='del'>-		| (33 &lt;&lt; 24); /* bol pixel count */</div><div class='del'>-</div><div class='del'>-	LCCR2 = (par-&gt;info-&gt;var.yres - 1) /* lines per panel */</div><div class='del'>-		| (24 &lt;&lt; 10) /* vsync pulse width - 1 */</div><div class='del'>-		| (2 &lt;&lt; 16) /* eof pixel count */</div><div class='del'>-		| (0 &lt;&lt; 24); /* bof pixel count */</div><div class='del'>-</div><div class='del'>-	LCCR3 = 2 /* pixel clock divisor */</div><div class='del'>-		| (24 &lt;&lt; 8) /* AC Bias pin freq */</div><div class='del'>-		| LCCR3_16BPP /* BPP */</div><div class='del'>-		| LCCR3_PCP;  /* PCP falling edge */</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void am200_post_dma_setup(struct metronomefb_par *par)</div><div class='del'>-{</div><div class='del'>-	par-&gt;metromem_desc-&gt;mFDADR0 = par-&gt;metromem_desc_dma;</div><div class='del'>-	par-&gt;metromem_desc-&gt;mFSADR0 = par-&gt;metromem_dma;</div><div class='del'>-	par-&gt;metromem_desc-&gt;mFIDR0 = 0;</div><div class='del'>-	par-&gt;metromem_desc-&gt;mLDCMD0 = par-&gt;info-&gt;var.xres</div><div class='del'>-					* par-&gt;info-&gt;var.yres;</div><div class='del'>-	am200_enable_lcd_controller(par);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void am200_free_irq(struct fb_info *info)</div><div class='del'>-{</div><div class='del'>-	free_irq(IRQ_GPIO(RDY_GPIO_PIN), info);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static irqreturn_t am200_handle_irq(int irq, void *dev_id)</div><div class='del'>-{</div><div class='del'>-	struct fb_info *info = dev_id;</div><div class='del'>-	struct metronomefb_par *par = info-&gt;par;</div><div class='del'>-</div><div class='del'>-	wake_up_interruptible(&amp;par-&gt;waitq);</div><div class='del'>-	return IRQ_HANDLED;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int am200_setup_irq(struct fb_info *info)</div><div class='del'>-{</div><div class='del'>-	int retval;</div><div class='del'>-</div><div class='del'>-	retval = request_irq(IRQ_GPIO(RDY_GPIO_PIN), am200_handle_irq,</div><div class='del'>-				IRQF_DISABLED, "AM200", info);</div><div class='del'>-	if (retval) {</div><div class='del'>-		printk(KERN_ERR "am200epd: request_irq failed: %d\n", retval);</div><div class='del'>-		return retval;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return set_irq_type(IRQ_GPIO(RDY_GPIO_PIN), IRQ_TYPE_EDGE_FALLING);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void am200_set_rst(struct metronomefb_par *par, int state)</div><div class='del'>-{</div><div class='del'>-	am200_set_gpio_output(RST_GPIO_PIN, state);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void am200_set_stdby(struct metronomefb_par *par, int state)</div><div class='del'>-{</div><div class='del'>-	am200_set_gpio_output(STDBY_GPIO_PIN, state);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int am200_wait_event(struct metronomefb_par *par)</div><div class='del'>-{</div><div class='del'>-	return wait_event_timeout(par-&gt;waitq, (GPLR1 &amp; 0x01), HZ);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int am200_wait_event_intr(struct metronomefb_par *par)</div><div class='del'>-{</div><div class='del'>-	return wait_event_interruptible_timeout(par-&gt;waitq, (GPLR1 &amp; 0x01), HZ);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct metronome_board am200_board = {</div><div class='del'>-	.owner			= THIS_MODULE,</div><div class='del'>-	.free_irq		= am200_free_irq,</div><div class='del'>-	.setup_irq		= am200_setup_irq,</div><div class='del'>-	.init_gpio_regs		= am200_init_gpio_regs,</div><div class='del'>-	.init_lcdc_regs		= am200_init_lcdc_regs,</div><div class='del'>-	.post_dma_setup		= am200_post_dma_setup,</div><div class='del'>-	.set_rst		= am200_set_rst,</div><div class='del'>-	.set_stdby		= am200_set_stdby,</div><div class='del'>-	.met_wait_event		= am200_wait_event,</div><div class='del'>-	.met_wait_event_intr	= am200_wait_event_intr,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct platform_device *am200_device;</div><div class='del'>-</div><div class='del'>-static int __init am200_init(void)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	/* request our platform independent driver */</div><div class='del'>-	request_module("metronomefb");</div><div class='del'>-</div><div class='del'>-	am200_device = platform_device_alloc("metronomefb", -1);</div><div class='del'>-	if (!am200_device)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	platform_device_add_data(am200_device, &amp;am200_board,</div><div class='del'>-					sizeof(am200_board));</div><div class='del'>-</div><div class='del'>-	/* this _add binds metronomefb to am200. metronomefb refcounts am200 */</div><div class='del'>-	ret = platform_device_add(am200_device);</div><div class='del'>-</div><div class='del'>-	if (ret)</div><div class='del'>-		platform_device_put(am200_device);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit am200_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_device_unregister(am200_device);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(am200_init);</div><div class='del'>-module_exit(am200_exit);</div><div class='del'>-</div><div class='del'>-MODULE_DESCRIPTION("board driver for am200 metronome epd kit");</div><div class='del'>-MODULE_AUTHOR("Jaya Kumar");</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c<br/>index 75dac578104f..f8d0a57a07cb 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/atmel_lcdfb.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/video/atmel_lcdfb.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/atmel_lcdfb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/atmel_lcdfb.c</a></div><div class='hunk'>@@ -372,6 +372,13 @@ static int atmel_lcdfb_check_var(struct fb_var_screeninfo *var,</div><div class='ctx'> 	var-&gt;transp.offset = var-&gt;transp.length = 0;</div><div class='ctx'> 	var-&gt;xoffset = var-&gt;yoffset = 0;</div><div class='ctx'> </div><div class='add'>+	if (info-&gt;fix.smem_len) {</div><div class='add'>+		unsigned int smem_len = (var-&gt;xres_virtual * var-&gt;yres_virtual</div><div class='add'>+					 * ((var-&gt;bits_per_pixel + 7) / 8));</div><div class='add'>+		if (smem_len &gt; info-&gt;fix.smem_len)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Saturate vertical and horizontal timings at maximum values */</div><div class='ctx'> 	var-&gt;vsync_len = min_t(u32, var-&gt;vsync_len,</div><div class='ctx'> 			(ATMEL_LCDC_VPW &gt;&gt; ATMEL_LCDC_VPW_OFFSET) + 1);</div><div class='hunk'>@@ -408,6 +415,10 @@ static int atmel_lcdfb_check_var(struct fb_var_screeninfo *var,</div><div class='ctx'> 			var-&gt;red.offset = 11;</div><div class='ctx'> 			var-&gt;blue.offset = 0;</div><div class='ctx'> 			var-&gt;green.length = 6;</div><div class='add'>+		} else if (sinfo-&gt;lcd_wiring_mode == ATMEL_LCDC_WIRING_RGB555) {</div><div class='add'>+			var-&gt;red.offset = 10;</div><div class='add'>+			var-&gt;blue.offset = 0;</div><div class='add'>+			var-&gt;green.length = 5;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* BGR:555 mode */</div><div class='ctx'> 			var-&gt;red.offset = 0;</div><div class='head'>diff --git a/drivers/video/aty/radeon_accel.c b/drivers/video/aty/radeon_accel.c<br/>index aa95f8350242..8718f7349d6b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/aty/radeon_accel.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/video/aty/radeon_accel.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/aty/radeon_accel.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/aty/radeon_accel.c</a></div><div class='hunk'>@@ -5,61 +5,61 @@</div><div class='ctx'>  * --dte</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static void radeon_fixup_offset(struct radeonfb_info *rinfo)</div><div class='add'>+#define FLUSH_CACHE_WORKAROUND	1</div><div class='add'>+</div><div class='add'>+void radeon_fifo_update_and_wait(struct radeonfb_info *rinfo, int entries)</div><div class='ctx'> {</div><div class='del'>-	u32 local_base;</div><div class='del'>-</div><div class='del'>-	/* *** Ugly workaround *** */</div><div class='del'>-	/*</div><div class='del'>-	 * On some platforms, the video memory is mapped at 0 in radeon chip space</div><div class='del'>-	 * (like PPCs) by the firmware. X will always move it up so that it's seen</div><div class='del'>-	 * by the chip to be at the same address as the PCI BAR.</div><div class='del'>-	 * That means that when switching back from X, there is a mismatch between</div><div class='del'>-	 * the offsets programmed into the engine. This means that potentially,</div><div class='del'>-	 * accel operations done before radeonfb has a chance to re-init the engine</div><div class='del'>-	 * will have incorrect offsets, and potentially trash system memory !</div><div class='del'>-	 *</div><div class='del'>-	 * The correct fix is for fbcon to never call any accel op before the engine</div><div class='del'>-	 * has properly been re-initialized (by a call to set_var), but this is a</div><div class='del'>-	 * complex fix. This workaround in the meantime, called before every accel</div><div class='del'>-	 * operation, makes sure the offsets are in sync.</div><div class='del'>-	 */</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-	radeon_fifo_wait (1);</div><div class='del'>-	local_base = INREG(MC_FB_LOCATION) &lt;&lt; 16;</div><div class='del'>-	if (local_base == rinfo-&gt;fb_local_base)</div><div class='del'>-		return;</div><div class='add'>+	for (i=0; i&lt;2000000; i++) {</div><div class='add'>+		rinfo-&gt;fifo_free = INREG(RBBM_STATUS) &amp; 0x7f;</div><div class='add'>+		if (rinfo-&gt;fifo_free &gt;= entries)</div><div class='add'>+			return;</div><div class='add'>+		udelay(10);</div><div class='add'>+	}</div><div class='add'>+	printk(KERN_ERR "radeonfb: FIFO Timeout !\n");</div><div class='add'>+	/* XXX Todo: attempt to reset the engine */</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	rinfo-&gt;fb_local_base = local_base;</div><div class='add'>+static inline void radeon_fifo_wait(struct radeonfb_info *rinfo, int entries)</div><div class='add'>+{</div><div class='add'>+	if (entries &lt;= rinfo-&gt;fifo_free)</div><div class='add'>+		rinfo-&gt;fifo_free -= entries;</div><div class='add'>+	else</div><div class='add'>+		radeon_fifo_update_and_wait(rinfo, entries);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	radeon_fifo_wait (3);</div><div class='del'>-	OUTREG(DEFAULT_PITCH_OFFSET, (rinfo-&gt;pitch &lt;&lt; 0x16) |</div><div class='del'>-				     (rinfo-&gt;fb_local_base &gt;&gt; 10));</div><div class='del'>-	OUTREG(DST_PITCH_OFFSET, (rinfo-&gt;pitch &lt;&lt; 0x16) | (rinfo-&gt;fb_local_base &gt;&gt; 10));</div><div class='del'>-	OUTREG(SRC_PITCH_OFFSET, (rinfo-&gt;pitch &lt;&lt; 0x16) | (rinfo-&gt;fb_local_base &gt;&gt; 10));</div><div class='add'>+static inline void radeonfb_set_creg(struct radeonfb_info *rinfo, u32 reg,</div><div class='add'>+				     u32 *cache, u32 new_val)</div><div class='add'>+{</div><div class='add'>+	if (new_val == *cache)</div><div class='add'>+		return;</div><div class='add'>+	*cache = new_val;</div><div class='add'>+	radeon_fifo_wait(rinfo, 1);</div><div class='add'>+	OUTREG(reg, new_val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void radeonfb_prim_fillrect(struct radeonfb_info *rinfo, </div><div class='ctx'> 				   const struct fb_fillrect *region)</div><div class='ctx'> {</div><div class='del'>-	radeon_fifo_wait(4);  </div><div class='del'>-  </div><div class='del'>-	OUTREG(DP_GUI_MASTER_CNTL,  </div><div class='del'>-		rinfo-&gt;dp_gui_master_cntl  /* contains, like GMC_DST_32BPP */</div><div class='del'>-                | GMC_BRUSH_SOLID_COLOR</div><div class='del'>-                | ROP3_P);</div><div class='del'>-	if (radeon_get_dstbpp(rinfo-&gt;depth) != DST_8BPP)</div><div class='del'>-		OUTREG(DP_BRUSH_FRGD_CLR, rinfo-&gt;pseudo_palette[region-&gt;color]);</div><div class='del'>-	else</div><div class='del'>-		OUTREG(DP_BRUSH_FRGD_CLR, region-&gt;color);</div><div class='del'>-	OUTREG(DP_WRITE_MSK, 0xffffffff);</div><div class='del'>-	OUTREG(DP_CNTL, (DST_X_LEFT_TO_RIGHT | DST_Y_TOP_TO_BOTTOM));</div><div class='del'>-</div><div class='del'>-	radeon_fifo_wait(2);</div><div class='add'>+	radeonfb_set_creg(rinfo, DP_GUI_MASTER_CNTL, &amp;rinfo-&gt;dp_gui_mc_cache,</div><div class='add'>+			  rinfo-&gt;dp_gui_mc_base | GMC_BRUSH_SOLID_COLOR | ROP3_P);</div><div class='add'>+	radeonfb_set_creg(rinfo, DP_CNTL, &amp;rinfo-&gt;dp_cntl_cache,</div><div class='add'>+			  DST_X_LEFT_TO_RIGHT | DST_Y_TOP_TO_BOTTOM);</div><div class='add'>+	radeonfb_set_creg(rinfo, DP_BRUSH_FRGD_CLR, &amp;rinfo-&gt;dp_brush_fg_cache,</div><div class='add'>+			  region-&gt;color);</div><div class='add'>+</div><div class='add'>+	/* Ensure the dst cache is flushed and the engine idle before</div><div class='add'>+	 * issuing the operation.</div><div class='add'>+	 *</div><div class='add'>+	 * This works around engine lockups on some cards</div><div class='add'>+	 */</div><div class='add'>+#if FLUSH_CACHE_WORKAROUND</div><div class='add'>+	radeon_fifo_wait(rinfo, 2);</div><div class='ctx'> 	OUTREG(DSTCACHE_CTLSTAT, RB2D_DC_FLUSH_ALL);</div><div class='ctx'> 	OUTREG(WAIT_UNTIL, (WAIT_2D_IDLECLEAN | WAIT_DMA_GUI_IDLE));</div><div class='del'>-</div><div class='del'>-	radeon_fifo_wait(2);  </div><div class='add'>+#endif</div><div class='add'>+	radeon_fifo_wait(rinfo, 2);</div><div class='ctx'> 	OUTREG(DST_Y_X, (region-&gt;dy &lt;&lt; 16) | region-&gt;dx);</div><div class='ctx'> 	OUTREG(DST_WIDTH_HEIGHT, (region-&gt;width &lt;&lt; 16) | region-&gt;height);</div><div class='ctx'> }</div><div class='hunk'>@@ -70,15 +70,14 @@ void radeonfb_fillrect(struct fb_info *info, const struct fb_fillrect *region)</div><div class='ctx'> 	struct fb_fillrect modded;</div><div class='ctx'> 	int vxres, vyres;</div><div class='ctx'>   </div><div class='del'>-	if (info-&gt;state != FBINFO_STATE_RUNNING)</div><div class='add'>+	WARN_ON(rinfo-&gt;gfx_mode);</div><div class='add'>+	if (info-&gt;state != FBINFO_STATE_RUNNING || rinfo-&gt;gfx_mode)</div><div class='ctx'> 		return;</div><div class='ctx'> 	if (info-&gt;flags &amp; FBINFO_HWACCEL_DISABLED) {</div><div class='ctx'> 		cfb_fillrect(info, region);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	radeon_fixup_offset(rinfo);</div><div class='del'>-</div><div class='ctx'> 	vxres = info-&gt;var.xres_virtual;</div><div class='ctx'> 	vyres = info-&gt;var.yres_virtual;</div><div class='ctx'> </div><div class='hunk'>@@ -91,6 +90,10 @@ void radeonfb_fillrect(struct fb_info *info, const struct fb_fillrect *region)</div><div class='ctx'> 	if(modded.dx + modded.width  &gt; vxres) modded.width  = vxres - modded.dx;</div><div class='ctx'> 	if(modded.dy + modded.height &gt; vyres) modded.height = vyres - modded.dy;</div><div class='ctx'> </div><div class='add'>+	if (info-&gt;fix.visual == FB_VISUAL_TRUECOLOR ||</div><div class='add'>+	    info-&gt;fix.visual == FB_VISUAL_DIRECTCOLOR )</div><div class='add'>+		modded.color = ((u32 *) (info-&gt;pseudo_palette))[region-&gt;color];</div><div class='add'>+</div><div class='ctx'> 	radeonfb_prim_fillrect(rinfo, &amp;modded);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -109,22 +112,22 @@ static void radeonfb_prim_copyarea(struct radeonfb_info *rinfo,</div><div class='ctx'> 	if ( xdir &lt; 0 ) { sx += w-1; dx += w-1; }</div><div class='ctx'> 	if ( ydir &lt; 0 ) { sy += h-1; dy += h-1; }</div><div class='ctx'> </div><div class='del'>-	radeon_fifo_wait(3);</div><div class='del'>-	OUTREG(DP_GUI_MASTER_CNTL,</div><div class='del'>-		rinfo-&gt;dp_gui_master_cntl /* i.e. GMC_DST_32BPP */</div><div class='del'>-		| GMC_BRUSH_NONE</div><div class='del'>-		| GMC_SRC_DSTCOLOR</div><div class='del'>-		| ROP3_S </div><div class='del'>-		| DP_SRC_SOURCE_MEMORY );</div><div class='del'>-	OUTREG(DP_WRITE_MSK, 0xffffffff);</div><div class='del'>-	OUTREG(DP_CNTL, (xdir&gt;=0 ? DST_X_LEFT_TO_RIGHT : 0)</div><div class='del'>-			| (ydir&gt;=0 ? DST_Y_TOP_TO_BOTTOM : 0));</div><div class='del'>-</div><div class='del'>-	radeon_fifo_wait(2);</div><div class='add'>+	radeonfb_set_creg(rinfo, DP_GUI_MASTER_CNTL, &amp;rinfo-&gt;dp_gui_mc_cache,</div><div class='add'>+			  rinfo-&gt;dp_gui_mc_base |</div><div class='add'>+			  GMC_BRUSH_NONE |</div><div class='add'>+			  GMC_SRC_DATATYPE_COLOR |</div><div class='add'>+			  ROP3_S |</div><div class='add'>+			  DP_SRC_SOURCE_MEMORY);</div><div class='add'>+	radeonfb_set_creg(rinfo, DP_CNTL, &amp;rinfo-&gt;dp_cntl_cache,</div><div class='add'>+			  (xdir&gt;=0 ? DST_X_LEFT_TO_RIGHT : 0) |</div><div class='add'>+			  (ydir&gt;=0 ? DST_Y_TOP_TO_BOTTOM : 0));</div><div class='add'>+</div><div class='add'>+#if FLUSH_CACHE_WORKAROUND</div><div class='add'>+	radeon_fifo_wait(rinfo, 2);</div><div class='ctx'> 	OUTREG(DSTCACHE_CTLSTAT, RB2D_DC_FLUSH_ALL);</div><div class='ctx'> 	OUTREG(WAIT_UNTIL, (WAIT_2D_IDLECLEAN | WAIT_DMA_GUI_IDLE));</div><div class='del'>-</div><div class='del'>-	radeon_fifo_wait(3);</div><div class='add'>+#endif</div><div class='add'>+	radeon_fifo_wait(rinfo, 3);</div><div class='ctx'> 	OUTREG(SRC_Y_X, (sy &lt;&lt; 16) | sx);</div><div class='ctx'> 	OUTREG(DST_Y_X, (dy &lt;&lt; 16) | dx);</div><div class='ctx'> 	OUTREG(DST_HEIGHT_WIDTH, (h &lt;&lt; 16) | w);</div><div class='hunk'>@@ -143,15 +146,14 @@ void radeonfb_copyarea(struct fb_info *info, const struct fb_copyarea *area)</div><div class='ctx'> 	modded.width  = area-&gt;width;</div><div class='ctx'> 	modded.height = area-&gt;height;</div><div class='ctx'>   </div><div class='del'>-	if (info-&gt;state != FBINFO_STATE_RUNNING)</div><div class='add'>+	WARN_ON(rinfo-&gt;gfx_mode);</div><div class='add'>+	if (info-&gt;state != FBINFO_STATE_RUNNING || rinfo-&gt;gfx_mode)</div><div class='ctx'> 		return;</div><div class='ctx'> 	if (info-&gt;flags &amp; FBINFO_HWACCEL_DISABLED) {</div><div class='ctx'> 		cfb_copyarea(info, area);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	radeon_fixup_offset(rinfo);</div><div class='del'>-</div><div class='ctx'> 	vxres = info-&gt;var.xres_virtual;</div><div class='ctx'> 	vyres = info-&gt;var.yres_virtual;</div><div class='ctx'> </div><div class='hunk'>@@ -168,13 +170,112 @@ void radeonfb_copyarea(struct fb_info *info, const struct fb_copyarea *area)</div><div class='ctx'> 	radeonfb_prim_copyarea(rinfo, &amp;modded);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void radeonfb_prim_imageblit(struct radeonfb_info *rinfo,</div><div class='add'>+				    const struct fb_image *image,</div><div class='add'>+				    u32 fg, u32 bg)</div><div class='add'>+{</div><div class='add'>+	unsigned int src_bytes, dwords;</div><div class='add'>+	u32 *bits;</div><div class='add'>+</div><div class='add'>+	radeonfb_set_creg(rinfo, DP_GUI_MASTER_CNTL, &amp;rinfo-&gt;dp_gui_mc_cache,</div><div class='add'>+			  rinfo-&gt;dp_gui_mc_base |</div><div class='add'>+			  GMC_BRUSH_NONE |</div><div class='add'>+			  GMC_SRC_DATATYPE_MONO_FG_BG |</div><div class='add'>+			  ROP3_S |</div><div class='add'>+			  GMC_BYTE_ORDER_MSB_TO_LSB |</div><div class='add'>+			  DP_SRC_SOURCE_HOST_DATA);</div><div class='add'>+	radeonfb_set_creg(rinfo, DP_CNTL, &amp;rinfo-&gt;dp_cntl_cache,</div><div class='add'>+			  DST_X_LEFT_TO_RIGHT | DST_Y_TOP_TO_BOTTOM);</div><div class='add'>+	radeonfb_set_creg(rinfo, DP_SRC_FRGD_CLR, &amp;rinfo-&gt;dp_src_fg_cache, fg);</div><div class='add'>+	radeonfb_set_creg(rinfo, DP_SRC_BKGD_CLR, &amp;rinfo-&gt;dp_src_bg_cache, bg);</div><div class='add'>+</div><div class='add'>+	radeon_fifo_wait(rinfo, 1);</div><div class='add'>+	OUTREG(DST_Y_X, (image-&gt;dy &lt;&lt; 16) | image-&gt;dx);</div><div class='add'>+</div><div class='add'>+	/* Ensure the dst cache is flushed and the engine idle before</div><div class='add'>+	 * issuing the operation.</div><div class='add'>+	 *</div><div class='add'>+	 * This works around engine lockups on some cards</div><div class='add'>+	 */</div><div class='add'>+#if FLUSH_CACHE_WORKAROUND</div><div class='add'>+	radeon_fifo_wait(rinfo, 2);</div><div class='add'>+	OUTREG(DSTCACHE_CTLSTAT, RB2D_DC_FLUSH_ALL);</div><div class='add'>+	OUTREG(WAIT_UNTIL, (WAIT_2D_IDLECLEAN | WAIT_DMA_GUI_IDLE));</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* X here pads width to a multiple of 32 and uses the clipper to</div><div class='add'>+	 * adjust the result. Is that really necessary ? Things seem to</div><div class='add'>+	 * work ok for me without that and the doco doesn't seem to imply</div><div class='add'>+	 * there is such a restriction.</div><div class='add'>+	 */</div><div class='add'>+	OUTREG(DST_WIDTH_HEIGHT, (image-&gt;width &lt;&lt; 16) | image-&gt;height);</div><div class='add'>+</div><div class='add'>+	src_bytes = (((image-&gt;width * image-&gt;depth) + 7) / 8) * image-&gt;height;</div><div class='add'>+	dwords = (src_bytes + 3) / 4;</div><div class='add'>+	bits = (u32*)(image-&gt;data);</div><div class='add'>+</div><div class='add'>+	while(dwords &gt;= 8) {</div><div class='add'>+		radeon_fifo_wait(rinfo, 8);</div><div class='add'>+#if BITS_PER_LONG == 64</div><div class='add'>+		__raw_writeq(*((u64 *)(bits)), rinfo-&gt;mmio_base + HOST_DATA0);</div><div class='add'>+		__raw_writeq(*((u64 *)(bits+2)), rinfo-&gt;mmio_base + HOST_DATA2);</div><div class='add'>+		__raw_writeq(*((u64 *)(bits+4)), rinfo-&gt;mmio_base + HOST_DATA4);</div><div class='add'>+		__raw_writeq(*((u64 *)(bits+6)), rinfo-&gt;mmio_base + HOST_DATA6);</div><div class='add'>+		bits += 8;</div><div class='add'>+#else</div><div class='add'>+		__raw_writel(*(bits++), rinfo-&gt;mmio_base + HOST_DATA0);</div><div class='add'>+		__raw_writel(*(bits++), rinfo-&gt;mmio_base + HOST_DATA1);</div><div class='add'>+		__raw_writel(*(bits++), rinfo-&gt;mmio_base + HOST_DATA2);</div><div class='add'>+		__raw_writel(*(bits++), rinfo-&gt;mmio_base + HOST_DATA3);</div><div class='add'>+		__raw_writel(*(bits++), rinfo-&gt;mmio_base + HOST_DATA4);</div><div class='add'>+		__raw_writel(*(bits++), rinfo-&gt;mmio_base + HOST_DATA5);</div><div class='add'>+		__raw_writel(*(bits++), rinfo-&gt;mmio_base + HOST_DATA6);</div><div class='add'>+		__raw_writel(*(bits++), rinfo-&gt;mmio_base + HOST_DATA7);</div><div class='add'>+#endif</div><div class='add'>+		dwords -= 8;</div><div class='add'>+	}</div><div class='add'>+	while(dwords--) {</div><div class='add'>+		radeon_fifo_wait(rinfo, 1);</div><div class='add'>+		__raw_writel(*(bits++), rinfo-&gt;mmio_base + HOST_DATA0);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void radeonfb_imageblit(struct fb_info *info, const struct fb_image *image)</div><div class='ctx'> {</div><div class='ctx'> 	struct radeonfb_info *rinfo = info-&gt;par;</div><div class='add'>+	u32 fg, bg;</div><div class='ctx'> </div><div class='del'>-	if (info-&gt;state != FBINFO_STATE_RUNNING)</div><div class='add'>+	WARN_ON(rinfo-&gt;gfx_mode);</div><div class='add'>+	if (info-&gt;state != FBINFO_STATE_RUNNING || rinfo-&gt;gfx_mode)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!image-&gt;width || !image-&gt;height)</div><div class='ctx'> 		return;</div><div class='del'>-	radeon_engine_idle();</div><div class='add'>+</div><div class='add'>+	/* We only do 1 bpp color expansion for now */</div><div class='add'>+	if (info-&gt;flags &amp; FBINFO_HWACCEL_DISABLED || image-&gt;depth != 1)</div><div class='add'>+		goto fallback;</div><div class='add'>+</div><div class='add'>+	/* Fallback if running out of the screen. We may do clipping</div><div class='add'>+	 * in the future */</div><div class='add'>+	if ((image-&gt;dx + image-&gt;width) &gt; info-&gt;var.xres_virtual ||</div><div class='add'>+	    (image-&gt;dy + image-&gt;height) &gt; info-&gt;var.yres_virtual)</div><div class='add'>+		goto fallback;</div><div class='add'>+</div><div class='add'>+	if (info-&gt;fix.visual == FB_VISUAL_TRUECOLOR ||</div><div class='add'>+	    info-&gt;fix.visual == FB_VISUAL_DIRECTCOLOR) {</div><div class='add'>+		fg = ((u32*)(info-&gt;pseudo_palette))[image-&gt;fg_color];</div><div class='add'>+		bg = ((u32*)(info-&gt;pseudo_palette))[image-&gt;bg_color];</div><div class='add'>+	} else {</div><div class='add'>+		fg = image-&gt;fg_color;</div><div class='add'>+		bg = image-&gt;bg_color;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	radeonfb_prim_imageblit(rinfo, image, fg, bg);</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+ fallback:</div><div class='add'>+	radeon_engine_idle(rinfo);</div><div class='ctx'> </div><div class='ctx'> 	cfb_imageblit(info, image);</div><div class='ctx'> }</div><div class='hunk'>@@ -185,7 +286,8 @@ int radeonfb_sync(struct fb_info *info)</div><div class='ctx'> </div><div class='ctx'> 	if (info-&gt;state != FBINFO_STATE_RUNNING)</div><div class='ctx'> 		return 0;</div><div class='del'>-	radeon_engine_idle();</div><div class='add'>+</div><div class='add'>+	radeon_engine_idle(rinfo);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -211,9 +313,7 @@ void radeonfb_engine_reset(struct radeonfb_info *rinfo)</div><div class='ctx'> 	host_path_cntl = INREG(HOST_PATH_CNTL);</div><div class='ctx'> 	rbbm_soft_reset = INREG(RBBM_SOFT_RESET);</div><div class='ctx'> </div><div class='del'>-	if (rinfo-&gt;family == CHIP_FAMILY_R300 ||</div><div class='del'>-	    rinfo-&gt;family == CHIP_FAMILY_R350 ||</div><div class='del'>-	    rinfo-&gt;family == CHIP_FAMILY_RV350) {</div><div class='add'>+	if (IS_R300_VARIANT(rinfo)) {</div><div class='ctx'> 		u32 tmp;</div><div class='ctx'> </div><div class='ctx'> 		OUTREG(RBBM_SOFT_RESET, (rbbm_soft_reset |</div><div class='hunk'>@@ -249,9 +349,7 @@ void radeonfb_engine_reset(struct radeonfb_info *rinfo)</div><div class='ctx'> 	INREG(HOST_PATH_CNTL);</div><div class='ctx'> 	OUTREG(HOST_PATH_CNTL, host_path_cntl);</div><div class='ctx'> </div><div class='del'>-	if (rinfo-&gt;family != CHIP_FAMILY_R300 &amp;&amp;</div><div class='del'>-	    rinfo-&gt;family != CHIP_FAMILY_R350 &amp;&amp;</div><div class='del'>-	    rinfo-&gt;family != CHIP_FAMILY_RV350)</div><div class='add'>+	if (!IS_R300_VARIANT(rinfo))</div><div class='ctx'> 		OUTREG(RBBM_SOFT_RESET, rbbm_soft_reset);</div><div class='ctx'> </div><div class='ctx'> 	OUTREG(CLOCK_CNTL_INDEX, clock_cntl_index);</div><div class='hunk'>@@ -265,15 +363,24 @@ void radeonfb_engine_init (struct radeonfb_info *rinfo)</div><div class='ctx'> 	/* disable 3D engine */</div><div class='ctx'> 	OUTREG(RB3D_CNTL, 0);</div><div class='ctx'> </div><div class='add'>+	rinfo-&gt;fifo_free = 0;</div><div class='ctx'> 	radeonfb_engine_reset(rinfo);</div><div class='ctx'> </div><div class='del'>-	radeon_fifo_wait (1);</div><div class='del'>-	if ((rinfo-&gt;family != CHIP_FAMILY_R300) &amp;&amp;</div><div class='del'>-	    (rinfo-&gt;family != CHIP_FAMILY_R350) &amp;&amp;</div><div class='del'>-	    (rinfo-&gt;family != CHIP_FAMILY_RV350))</div><div class='add'>+	radeon_fifo_wait(rinfo, 1);</div><div class='add'>+	if (IS_R300_VARIANT(rinfo)) {</div><div class='add'>+		OUTREG(RB2D_DSTCACHE_MODE, INREG(RB2D_DSTCACHE_MODE) |</div><div class='add'>+		       RB2D_DC_AUTOFLUSH_ENABLE |</div><div class='add'>+		       RB2D_DC_DC_DISABLE_IGNORE_PE);</div><div class='add'>+	} else {</div><div class='add'>+		/* This needs to be double checked with ATI. Latest X driver</div><div class='add'>+		 * completely "forgets" to set this register on &lt; r3xx, and</div><div class='add'>+		 * we used to just write 0 there... I'll keep the 0 and update</div><div class='add'>+		 * that when we have sorted things out on X side.</div><div class='add'>+		 */</div><div class='ctx'> 		OUTREG(RB2D_DSTCACHE_MODE, 0);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	radeon_fifo_wait (3);</div><div class='add'>+	radeon_fifo_wait(rinfo, 3);</div><div class='ctx'> 	/* We re-read MC_FB_LOCATION from card as it can have been</div><div class='ctx'> 	 * modified by XFree drivers (ouch !)</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -284,41 +391,57 @@ void radeonfb_engine_init (struct radeonfb_info *rinfo)</div><div class='ctx'> 	OUTREG(DST_PITCH_OFFSET, (rinfo-&gt;pitch &lt;&lt; 0x16) | (rinfo-&gt;fb_local_base &gt;&gt; 10));</div><div class='ctx'> 	OUTREG(SRC_PITCH_OFFSET, (rinfo-&gt;pitch &lt;&lt; 0x16) | (rinfo-&gt;fb_local_base &gt;&gt; 10));</div><div class='ctx'> </div><div class='del'>-	radeon_fifo_wait (1);</div><div class='del'>-#if defined(__BIG_ENDIAN)</div><div class='add'>+	radeon_fifo_wait(rinfo, 1);</div><div class='add'>+#ifdef __BIG_ENDIAN</div><div class='ctx'> 	OUTREGP(DP_DATATYPE, HOST_BIG_ENDIAN_EN, ~HOST_BIG_ENDIAN_EN);</div><div class='ctx'> #else</div><div class='ctx'> 	OUTREGP(DP_DATATYPE, 0, ~HOST_BIG_ENDIAN_EN);</div><div class='ctx'> #endif</div><div class='del'>-	radeon_fifo_wait (2);</div><div class='add'>+	radeon_fifo_wait(rinfo, 2);</div><div class='ctx'> 	OUTREG(DEFAULT_SC_TOP_LEFT, 0);</div><div class='ctx'> 	OUTREG(DEFAULT_SC_BOTTOM_RIGHT, (DEFAULT_SC_RIGHT_MAX |</div><div class='ctx'> 					 DEFAULT_SC_BOTTOM_MAX));</div><div class='ctx'> </div><div class='add'>+	/* set default DP_GUI_MASTER_CNTL */</div><div class='ctx'> 	temp = radeon_get_dstbpp(rinfo-&gt;depth);</div><div class='del'>-	rinfo-&gt;dp_gui_master_cntl = ((temp &lt;&lt; 8) | GMC_CLR_CMP_CNTL_DIS);</div><div class='add'>+	rinfo-&gt;dp_gui_mc_base = ((temp &lt;&lt; 8) | GMC_CLR_CMP_CNTL_DIS);</div><div class='ctx'> </div><div class='del'>-	radeon_fifo_wait (1);</div><div class='del'>-	OUTREG(DP_GUI_MASTER_CNTL, (rinfo-&gt;dp_gui_master_cntl |</div><div class='del'>-				    GMC_BRUSH_SOLID_COLOR |</div><div class='del'>-				    GMC_SRC_DATATYPE_COLOR));</div><div class='add'>+	rinfo-&gt;dp_gui_mc_cache = rinfo-&gt;dp_gui_mc_base |</div><div class='add'>+		GMC_BRUSH_SOLID_COLOR |</div><div class='add'>+		GMC_SRC_DATATYPE_COLOR;</div><div class='add'>+	radeon_fifo_wait(rinfo, 1);</div><div class='add'>+	OUTREG(DP_GUI_MASTER_CNTL, rinfo-&gt;dp_gui_mc_cache);</div><div class='ctx'> </div><div class='del'>-	radeon_fifo_wait (7);</div><div class='ctx'> </div><div class='ctx'> 	/* clear line drawing regs */</div><div class='add'>+	radeon_fifo_wait(rinfo, 2);</div><div class='ctx'> 	OUTREG(DST_LINE_START, 0);</div><div class='ctx'> 	OUTREG(DST_LINE_END, 0);</div><div class='ctx'> </div><div class='del'>-	/* set brush color regs */</div><div class='del'>-	OUTREG(DP_BRUSH_FRGD_CLR, 0xffffffff);</div><div class='del'>-	OUTREG(DP_BRUSH_BKGD_CLR, 0x00000000);</div><div class='del'>-</div><div class='del'>-	/* set source color regs */</div><div class='del'>-	OUTREG(DP_SRC_FRGD_CLR, 0xffffffff);</div><div class='del'>-	OUTREG(DP_SRC_BKGD_CLR, 0x00000000);</div><div class='add'>+	/* set brush and source color regs */</div><div class='add'>+	rinfo-&gt;dp_brush_fg_cache = 0xffffffff;</div><div class='add'>+	rinfo-&gt;dp_brush_bg_cache = 0x00000000;</div><div class='add'>+	rinfo-&gt;dp_src_fg_cache = 0xffffffff;</div><div class='add'>+	rinfo-&gt;dp_src_bg_cache = 0x00000000;</div><div class='add'>+	radeon_fifo_wait(rinfo, 4);</div><div class='add'>+	OUTREG(DP_BRUSH_FRGD_CLR, rinfo-&gt;dp_brush_fg_cache);</div><div class='add'>+	OUTREG(DP_BRUSH_BKGD_CLR, rinfo-&gt;dp_brush_bg_cache);</div><div class='add'>+	OUTREG(DP_SRC_FRGD_CLR, rinfo-&gt;dp_src_fg_cache);</div><div class='add'>+	OUTREG(DP_SRC_BKGD_CLR, rinfo-&gt;dp_src_bg_cache);</div><div class='add'>+</div><div class='add'>+	/* Default direction */</div><div class='add'>+	rinfo-&gt;dp_cntl_cache = DST_X_LEFT_TO_RIGHT | DST_Y_TOP_TO_BOTTOM;</div><div class='add'>+	radeon_fifo_wait(rinfo, 1);</div><div class='add'>+	OUTREG(DP_CNTL, rinfo-&gt;dp_cntl_cache);</div><div class='ctx'> </div><div class='ctx'> 	/* default write mask */</div><div class='add'>+	radeon_fifo_wait(rinfo, 1);</div><div class='ctx'> 	OUTREG(DP_WRITE_MSK, 0xffffffff);</div><div class='ctx'> </div><div class='del'>-	radeon_engine_idle ();</div><div class='add'>+	/* Default to no swapping of host data */</div><div class='add'>+	radeon_fifo_wait(rinfo, 1);</div><div class='add'>+	OUTREG(RBBM_GUICNTL, RBBM_GUICNTL_HOST_DATA_SWAP_NONE);</div><div class='add'>+</div><div class='add'>+	/* Make sure it's settled */</div><div class='add'>+	radeon_engine_idle(rinfo);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/video/aty/radeon_backlight.c b/drivers/video/aty/radeon_backlight.c<br/>index 1a056adb61c8..f343ba83f0ae 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/aty/radeon_backlight.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/video/aty/radeon_backlight.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/aty/radeon_backlight.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/aty/radeon_backlight.c</a></div><div class='hunk'>@@ -66,7 +66,7 @@ static int radeon_bl_update_status(struct backlight_device *bd)</div><div class='ctx'> 		level = bd-&gt;props.brightness;</div><div class='ctx'> </div><div class='ctx'> 	del_timer_sync(&amp;rinfo-&gt;lvds_timer);</div><div class='del'>-	radeon_engine_idle();</div><div class='add'>+	radeon_engine_idle(rinfo);</div><div class='ctx'> </div><div class='ctx'> 	lvds_gen_cntl = INREG(LVDS_GEN_CNTL);</div><div class='ctx'> 	if (level &gt; 0) {</div><div class='head'>diff --git a/drivers/video/aty/radeon_base.c b/drivers/video/aty/radeon_base.c<br/>index 652273e9f5f9..9a5821c65ebf 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/aty/radeon_base.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/video/aty/radeon_base.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/aty/radeon_base.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/aty/radeon_base.c</a></div><div class='hunk'>@@ -852,7 +852,6 @@ static int radeonfb_pan_display (struct fb_var_screeninfo *var,</div><div class='ctx'>         if (rinfo-&gt;asleep)</div><div class='ctx'>         	return 0;</div><div class='ctx'> </div><div class='del'>-	radeon_fifo_wait(2);</div><div class='ctx'>         OUTREG(CRTC_OFFSET, ((var-&gt;yoffset * var-&gt;xres_virtual + var-&gt;xoffset)</div><div class='ctx'> 			     * var-&gt;bits_per_pixel / 8) &amp; ~7);</div><div class='ctx'>         return 0;</div><div class='hunk'>@@ -882,7 +881,6 @@ static int radeonfb_ioctl (struct fb_info *info, unsigned int cmd,</div><div class='ctx'> 			if (rc)</div><div class='ctx'> 				return rc;</div><div class='ctx'> </div><div class='del'>-			radeon_fifo_wait(2);</div><div class='ctx'> 			if (value &amp; 0x01) {</div><div class='ctx'> 				tmp = INREG(LVDS_GEN_CNTL);</div><div class='ctx'> </div><div class='hunk'>@@ -940,7 +938,7 @@ int radeon_screen_blank(struct radeonfb_info *rinfo, int blank, int mode_switch)</div><div class='ctx'> 	if (rinfo-&gt;lock_blank)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	radeon_engine_idle();</div><div class='add'>+	radeon_engine_idle(rinfo);</div><div class='ctx'> </div><div class='ctx'> 	val = INREG(CRTC_EXT_CNTL);</div><div class='ctx'>         val &amp;= ~(CRTC_DISPLAY_DIS | CRTC_HSYNC_DIS |</div><div class='hunk'>@@ -1048,7 +1046,7 @@ static int radeonfb_blank (int blank, struct fb_info *info)</div><div class='ctx'> </div><div class='ctx'> 	if (rinfo-&gt;asleep)</div><div class='ctx'> 		return 0;</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 	return radeon_screen_blank(rinfo, blank, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1074,8 +1072,6 @@ static int radeon_setcolreg (unsigned regno, unsigned red, unsigned green,</div><div class='ctx'>         pindex = regno;</div><div class='ctx'> </div><div class='ctx'>         if (!rinfo-&gt;asleep) {</div><div class='del'>-		radeon_fifo_wait(9);</div><div class='del'>-</div><div class='ctx'> 		if (rinfo-&gt;bpp == 16) {</div><div class='ctx'> 			pindex = regno * 8;</div><div class='ctx'> </div><div class='hunk'>@@ -1244,8 +1240,6 @@ static void radeon_write_pll_regs(struct radeonfb_info *rinfo, struct radeon_reg</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	radeon_fifo_wait(20);</div><div class='del'>-</div><div class='ctx'> 	/* Workaround from XFree */</div><div class='ctx'> 	if (rinfo-&gt;is_mobility) {</div><div class='ctx'> 	        /* A temporal workaround for the occational blanking on certain laptop</div><div class='hunk'>@@ -1286,11 +1280,10 @@ static void radeon_write_pll_regs(struct radeonfb_info *rinfo, struct radeon_reg</div><div class='ctx'> 	radeon_pll_errata_after_data(rinfo);</div><div class='ctx'> </div><div class='ctx'> 	/* Set PPLL ref. div */</div><div class='del'>-	if (rinfo-&gt;family == CHIP_FAMILY_R300 ||</div><div class='add'>+	if (IS_R300_VARIANT(rinfo) ||</div><div class='ctx'> 	    rinfo-&gt;family == CHIP_FAMILY_RS300 ||</div><div class='del'>-	    rinfo-&gt;family == CHIP_FAMILY_R350 ||</div><div class='del'>-	    rinfo-&gt;family == CHIP_FAMILY_RV350 ||</div><div class='del'>-	    rinfo-&gt;family == CHIP_FAMILY_RV380 ) {</div><div class='add'>+	    rinfo-&gt;family == CHIP_FAMILY_RS400 ||</div><div class='add'>+	    rinfo-&gt;family == CHIP_FAMILY_RS480) {</div><div class='ctx'> 		if (mode-&gt;ppll_ref_div &amp; R300_PPLL_REF_DIV_ACC_MASK) {</div><div class='ctx'> 			/* When restoring console mode, use saved PPLL_REF_DIV</div><div class='ctx'> 			 * setting.</div><div class='hunk'>@@ -1342,7 +1335,7 @@ static void radeon_lvds_timer_func(unsigned long data)</div><div class='ctx'> {</div><div class='ctx'> 	struct radeonfb_info *rinfo = (struct radeonfb_info *)data;</div><div class='ctx'> </div><div class='del'>-	radeon_engine_idle();</div><div class='add'>+	radeon_engine_idle(rinfo);</div><div class='ctx'> </div><div class='ctx'> 	OUTREG(LVDS_GEN_CNTL, rinfo-&gt;pending_lvds_gen_cntl);</div><div class='ctx'> }</div><div class='hunk'>@@ -1360,10 +1353,11 @@ void radeon_write_mode (struct radeonfb_info *rinfo, struct radeon_regs *mode,</div><div class='ctx'> 	if (nomodeset)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	radeon_engine_idle(rinfo);</div><div class='add'>+</div><div class='ctx'> 	if (!regs_only)</div><div class='ctx'> 		radeon_screen_blank(rinfo, FB_BLANK_NORMAL, 0);</div><div class='ctx'> </div><div class='del'>-	radeon_fifo_wait(31);</div><div class='ctx'> 	for (i=0; i&lt;10; i++)</div><div class='ctx'> 		OUTREG(common_regs[i].reg, common_regs[i].val);</div><div class='ctx'> </div><div class='hunk'>@@ -1391,7 +1385,6 @@ void radeon_write_mode (struct radeonfb_info *rinfo, struct radeon_regs *mode,</div><div class='ctx'> 	radeon_write_pll_regs(rinfo, mode);</div><div class='ctx'> </div><div class='ctx'> 	if ((primary_mon == MT_DFP) || (primary_mon == MT_LCD)) {</div><div class='del'>-		radeon_fifo_wait(10);</div><div class='ctx'> 		OUTREG(FP_CRTC_H_TOTAL_DISP, mode-&gt;fp_crtc_h_total_disp);</div><div class='ctx'> 		OUTREG(FP_CRTC_V_TOTAL_DISP, mode-&gt;fp_crtc_v_total_disp);</div><div class='ctx'> 		OUTREG(FP_H_SYNC_STRT_WID, mode-&gt;fp_h_sync_strt_wid);</div><div class='hunk'>@@ -1406,7 +1399,6 @@ void radeon_write_mode (struct radeonfb_info *rinfo, struct radeon_regs *mode,</div><div class='ctx'> 	if (!regs_only)</div><div class='ctx'> 		radeon_screen_blank(rinfo, FB_BLANK_UNBLANK, 0);</div><div class='ctx'> </div><div class='del'>-	radeon_fifo_wait(2);</div><div class='ctx'> 	OUTPLL(VCLK_ECP_CNTL, mode-&gt;vclk_ecp_cntl);</div><div class='ctx'> 	</div><div class='ctx'> 	return;</div><div class='hunk'>@@ -1461,10 +1453,7 @@ static void radeon_calc_pll_regs(struct radeonfb_info *rinfo, struct radeon_regs</div><div class='ctx'> 		/* Not all chip revs have the same format for this register,</div><div class='ctx'> 		 * extract the source selection</div><div class='ctx'> 		 */</div><div class='del'>-		if (rinfo-&gt;family == CHIP_FAMILY_R200 ||</div><div class='del'>-		    rinfo-&gt;family == CHIP_FAMILY_R300 ||</div><div class='del'>-		    rinfo-&gt;family == CHIP_FAMILY_R350 ||</div><div class='del'>-		    rinfo-&gt;family == CHIP_FAMILY_RV350) {</div><div class='add'>+		if (rinfo-&gt;family == CHIP_FAMILY_R200 || IS_R300_VARIANT(rinfo)) {</div><div class='ctx'> 			source = (fp2_gen_cntl &gt;&gt; 10) &amp; 0x3;</div><div class='ctx'> 			/* sourced from transform unit, check for transform unit</div><div class='ctx'> 			 * own source</div><div class='hunk'>@@ -1560,7 +1549,7 @@ static int radeonfb_set_par(struct fb_info *info)</div><div class='ctx'> 	/* We always want engine to be idle on a mode switch, even</div><div class='ctx'> 	 * if we won't actually change the mode</div><div class='ctx'> 	 */</div><div class='del'>-	radeon_engine_idle();</div><div class='add'>+	radeon_engine_idle(rinfo);</div><div class='ctx'> </div><div class='ctx'> 	hSyncStart = mode-&gt;xres + mode-&gt;right_margin;</div><div class='ctx'> 	hSyncEnd = hSyncStart + mode-&gt;hsync_len;</div><div class='hunk'>@@ -1855,7 +1844,6 @@ static int radeonfb_set_par(struct fb_info *info)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> static struct fb_ops radeonfb_ops = {</div><div class='ctx'> 	.owner			= THIS_MODULE,</div><div class='ctx'> 	.fb_check_var		= radeonfb_check_var,</div><div class='hunk'>@@ -1879,6 +1867,7 @@ static int __devinit radeon_set_fbinfo (struct radeonfb_info *rinfo)</div><div class='ctx'> 	info-&gt;par = rinfo;</div><div class='ctx'> 	info-&gt;pseudo_palette = rinfo-&gt;pseudo_palette;</div><div class='ctx'> 	info-&gt;flags = FBINFO_DEFAULT</div><div class='add'>+		    | FBINFO_HWACCEL_IMAGEBLIT</div><div class='ctx'> 		    | FBINFO_HWACCEL_COPYAREA</div><div class='ctx'> 		    | FBINFO_HWACCEL_FILLRECT</div><div class='ctx'> 		    | FBINFO_HWACCEL_XPAN</div><div class='hunk'>@@ -2005,11 +1994,11 @@ static void radeon_identify_vram(struct radeonfb_info *rinfo)</div><div class='ctx'>             (rinfo-&gt;family == CHIP_FAMILY_RS200) ||</div><div class='ctx'>             (rinfo-&gt;family == CHIP_FAMILY_RS300) ||</div><div class='ctx'>             (rinfo-&gt;family == CHIP_FAMILY_RC410) ||</div><div class='add'>+            (rinfo-&gt;family == CHIP_FAMILY_RS400) ||</div><div class='ctx'> 	    (rinfo-&gt;family == CHIP_FAMILY_RS480) ) {</div><div class='ctx'>           u32 tom = INREG(NB_TOM);</div><div class='ctx'>           tmp = ((((tom &gt;&gt; 16) - (tom &amp; 0xffff) + 1) &lt;&lt; 6) * 1024);</div><div class='ctx'> </div><div class='del'>- 		radeon_fifo_wait(6);</div><div class='ctx'>           OUTREG(MC_FB_LOCATION, tom);</div><div class='ctx'>           OUTREG(DISPLAY_BASE_ADDR, (tom &amp; 0xffff) &lt;&lt; 16);</div><div class='ctx'>           OUTREG(CRTC2_DISPLAY_BASE_ADDR, (tom &amp; 0xffff) &lt;&lt; 16);</div><div class='head'>diff --git a/drivers/video/aty/radeon_i2c.c b/drivers/video/aty/radeon_i2c.c<br/>index 8c8fa35f1b7c..2c5567175dca 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/aty/radeon_i2c.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/video/aty/radeon_i2c.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/aty/radeon_i2c.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/aty/radeon_i2c.c</a></div><div class='hunk'>@@ -139,12 +139,8 @@ void radeon_delete_i2c_busses(struct radeonfb_info *rinfo)</div><div class='ctx'> int radeon_probe_i2c_connector(struct radeonfb_info *rinfo, int conn,</div><div class='ctx'> 			       u8 **out_edid)</div><div class='ctx'> {</div><div class='del'>-	u32 reg = rinfo-&gt;i2c[conn-1].ddc_reg;</div><div class='ctx'> 	u8 *edid;</div><div class='ctx'> </div><div class='del'>-	OUTREG(reg, INREG(reg) &amp;</div><div class='del'>-			~(VGA_DDC_DATA_OUTPUT | VGA_DDC_CLK_OUTPUT));</div><div class='del'>-</div><div class='ctx'> 	edid = fb_ddc_read(&amp;rinfo-&gt;i2c[conn-1].adapter);</div><div class='ctx'> </div><div class='ctx'> 	if (out_edid)</div><div class='head'>diff --git a/drivers/video/aty/radeon_pm.c b/drivers/video/aty/radeon_pm.c<br/>index 675abdafc2d8..3df5015f1d13 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/aty/radeon_pm.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/video/aty/radeon_pm.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/aty/radeon_pm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/aty/radeon_pm.c</a></div><div class='hunk'>@@ -2653,9 +2653,9 @@ int radeonfb_pci_suspend(struct pci_dev *pdev, pm_message_t mesg)</div><div class='ctx'> </div><div class='ctx'> 	if (!(info-&gt;flags &amp; FBINFO_HWACCEL_DISABLED)) {</div><div class='ctx'> 		/* Make sure engine is reset */</div><div class='del'>-		radeon_engine_idle();</div><div class='add'>+		radeon_engine_idle(rinfo);</div><div class='ctx'> 		radeonfb_engine_reset(rinfo);</div><div class='del'>-		radeon_engine_idle();</div><div class='add'>+		radeon_engine_idle(rinfo);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Blank display and LCD */</div><div class='hunk'>@@ -2767,7 +2767,7 @@ int radeonfb_pci_resume(struct pci_dev *pdev)</div><div class='ctx'> </div><div class='ctx'> 		rinfo-&gt;asleep = 0;</div><div class='ctx'> 	} else</div><div class='del'>-		radeon_engine_idle();</div><div class='add'>+		radeon_engine_idle(rinfo);</div><div class='ctx'> </div><div class='ctx'> 	/* Restore display &amp; engine */</div><div class='ctx'> 	radeon_write_mode (rinfo, &amp;rinfo-&gt;state, 1);</div><div class='head'>diff --git a/drivers/video/aty/radeonfb.h b/drivers/video/aty/radeonfb.h<br/>index ccbfffd12805..ea0b5b47acaf 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/aty/radeonfb.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/video/aty/radeonfb.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/aty/radeonfb.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/aty/radeonfb.h</a></div><div class='hunk'>@@ -53,6 +53,7 @@ enum radeon_family {</div><div class='ctx'> 	CHIP_FAMILY_RV380,    /* RV370/RV380/M22/M24 */</div><div class='ctx'> 	CHIP_FAMILY_R420,     /* R420/R423/M18 */</div><div class='ctx'> 	CHIP_FAMILY_RC410,</div><div class='add'>+	CHIP_FAMILY_RS400,</div><div class='ctx'> 	CHIP_FAMILY_RS480,</div><div class='ctx'> 	CHIP_FAMILY_LAST,</div><div class='ctx'> };</div><div class='hunk'>@@ -335,7 +336,15 @@ struct radeonfb_info {</div><div class='ctx'> 	int			mon2_type;</div><div class='ctx'> 	u8		        *mon2_EDID;</div><div class='ctx'> </div><div class='del'>-	u32			dp_gui_master_cntl;</div><div class='add'>+	/* accel bits */</div><div class='add'>+	u32			dp_gui_mc_base;</div><div class='add'>+	u32			dp_gui_mc_cache;</div><div class='add'>+	u32			dp_cntl_cache;</div><div class='add'>+	u32			dp_brush_fg_cache;</div><div class='add'>+	u32			dp_brush_bg_cache;</div><div class='add'>+	u32			dp_src_fg_cache;</div><div class='add'>+	u32			dp_src_bg_cache;</div><div class='add'>+	u32			fifo_free;</div><div class='ctx'> </div><div class='ctx'> 	struct pll_info		pll;</div><div class='ctx'> </div><div class='hunk'>@@ -347,6 +356,7 @@ struct radeonfb_info {</div><div class='ctx'> 	int			lock_blank;</div><div class='ctx'> 	int			dynclk;</div><div class='ctx'> 	int			no_schedule;</div><div class='add'>+	int 			gfx_mode;</div><div class='ctx'> 	enum radeon_pm_mode	pm_mode;</div><div class='ctx'> 	reinit_function_ptr     reinit_func;</div><div class='ctx'> </div><div class='hunk'>@@ -391,8 +401,14 @@ static inline void _radeon_msleep(struct radeonfb_info *rinfo, unsigned long ms)</div><div class='ctx'> #define OUTREG8(addr,val)	writeb(val, (rinfo-&gt;mmio_base)+addr)</div><div class='ctx'> #define INREG16(addr)		readw((rinfo-&gt;mmio_base)+addr)</div><div class='ctx'> #define OUTREG16(addr,val)	writew(val, (rinfo-&gt;mmio_base)+addr)</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PPC</div><div class='add'>+#define INREG(addr)	     	({ eieio(); ld_le32(rinfo-&gt;mmio_base+(addr)); })</div><div class='add'>+#define OUTREG(addr,val)	do { eieio(); st_le32(rinfo-&gt;mmio_base+(addr),(val)); } while(0)</div><div class='add'>+#else</div><div class='ctx'> #define INREG(addr)		readl((rinfo-&gt;mmio_base)+addr)</div><div class='ctx'> #define OUTREG(addr,val)	writel(val, (rinfo-&gt;mmio_base)+addr)</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> static inline void _OUTREGP(struct radeonfb_info *rinfo, u32 addr,</div><div class='ctx'> 		       u32 val, u32 mask)</div><div class='hunk'>@@ -533,16 +549,25 @@ static inline u32 radeon_get_dstbpp(u16 depth)</div><div class='ctx'> /*</div><div class='ctx'>  * 2D Engine helper routines</div><div class='ctx'>  */</div><div class='add'>+</div><div class='add'>+extern void radeon_fifo_update_and_wait(struct radeonfb_info *rinfo, int entries);</div><div class='add'>+</div><div class='ctx'> static inline void radeon_engine_flush (struct radeonfb_info *rinfo)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	/* initiate flush */</div><div class='del'>-	OUTREGP(RB2D_DSTCACHE_CTLSTAT, RB2D_DC_FLUSH_ALL,</div><div class='add'>+	/* Initiate flush */</div><div class='add'>+	OUTREGP(DSTCACHE_CTLSTAT, RB2D_DC_FLUSH_ALL,</div><div class='ctx'> 	        ~RB2D_DC_FLUSH_ALL);</div><div class='ctx'> </div><div class='add'>+	/* Ensure FIFO is empty, ie, make sure the flush commands</div><div class='add'>+	 * has reached the cache</div><div class='add'>+	 */</div><div class='add'>+	radeon_fifo_update_and_wait(rinfo, 64);</div><div class='add'>+</div><div class='add'>+	/* Wait for the flush to complete */</div><div class='ctx'> 	for (i=0; i &lt; 2000000; i++) {</div><div class='del'>-		if (!(INREG(RB2D_DSTCACHE_CTLSTAT) &amp; RB2D_DC_BUSY))</div><div class='add'>+		if (!(INREG(DSTCACHE_CTLSTAT) &amp; RB2D_DC_BUSY))</div><div class='ctx'> 			return;</div><div class='ctx'> 		udelay(1);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -550,25 +575,12 @@ static inline void radeon_engine_flush (struct radeonfb_info *rinfo)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static inline void _radeon_fifo_wait(struct radeonfb_info *rinfo, int entries)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i=0; i&lt;2000000; i++) {</div><div class='del'>-		if ((INREG(RBBM_STATUS) &amp; 0x7f) &gt;= entries)</div><div class='del'>-			return;</div><div class='del'>-		udelay(1);</div><div class='del'>-	}</div><div class='del'>-	printk(KERN_ERR "radeonfb: FIFO Timeout !\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static inline void _radeon_engine_idle(struct radeonfb_info *rinfo)</div><div class='add'>+static inline void radeon_engine_idle(struct radeonfb_info *rinfo)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	/* ensure FIFO is empty before waiting for idle */</div><div class='del'>-	_radeon_fifo_wait (rinfo, 64);</div><div class='add'>+	radeon_fifo_update_and_wait (rinfo, 64);</div><div class='ctx'> </div><div class='ctx'> 	for (i=0; i&lt;2000000; i++) {</div><div class='ctx'> 		if (((INREG(RBBM_STATUS) &amp; GUI_ACTIVE)) == 0) {</div><div class='hunk'>@@ -581,8 +593,6 @@ static inline void _radeon_engine_idle(struct radeonfb_info *rinfo)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#define radeon_engine_idle()		_radeon_engine_idle(rinfo)</div><div class='del'>-#define radeon_fifo_wait(entries)	_radeon_fifo_wait(rinfo,entries)</div><div class='ctx'> #define radeon_msleep(ms)		_radeon_msleep(rinfo,ms)</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -612,6 +622,7 @@ extern void radeonfb_imageblit(struct fb_info *p, const struct fb_image *image);</div><div class='ctx'> extern int radeonfb_sync(struct fb_info *info);</div><div class='ctx'> extern void radeonfb_engine_init (struct radeonfb_info *rinfo);</div><div class='ctx'> extern void radeonfb_engine_reset(struct radeonfb_info *rinfo);</div><div class='add'>+extern void radeon_fixup_mem_offset(struct radeonfb_info *rinfo);</div><div class='ctx'> </div><div class='ctx'> /* Other functions */</div><div class='ctx'> extern int radeon_screen_blank(struct radeonfb_info *rinfo, int blank, int mode_switch);</div><div class='head'>diff --git a/drivers/video/backlight/Kconfig b/drivers/video/backlight/Kconfig<br/>index 452b770d8cc9..c72a13562954 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/backlight/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/video/backlight/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/backlight/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/backlight/Kconfig</a></div><div class='hunk'>@@ -24,6 +24,13 @@ config LCD_CLASS_DEVICE</div><div class='ctx'> 	  To have support for your specific LCD panel you will have to</div><div class='ctx'> 	  select the proper drivers which depend on this option.</div><div class='ctx'> </div><div class='add'>+config LCD_CORGI</div><div class='add'>+	tristate "LCD Panel support for SHARP corgi/spitz model"</div><div class='add'>+	depends on LCD_CLASS_DEVICE &amp;&amp; SPI_MASTER &amp;&amp; PXA_SHARPSL</div><div class='add'>+	help</div><div class='add'>+	  Say y here to support the LCD panels usually found on SHARP</div><div class='add'>+	  corgi (C7x0) and spitz (Cxx00) models.</div><div class='add'>+</div><div class='ctx'> config LCD_LTV350QV</div><div class='ctx'> 	tristate "Samsung LTV350QV LCD Panel"</div><div class='ctx'> 	depends on LCD_CLASS_DEVICE &amp;&amp; SPI_MASTER</div><div class='hunk'>@@ -44,6 +51,14 @@ config LCD_ILI9320</div><div class='ctx'> 	  If you have a panel based on the ILI9320 controller chip</div><div class='ctx'> 	  then say y to include a power driver for it.</div><div class='ctx'> </div><div class='add'>+config LCD_TDO24M</div><div class='add'>+	tristate "Toppoly TDO24M LCD Panels support"</div><div class='add'>+	depends on LCD_CLASS_DEVICE &amp;&amp; SPI_MASTER</div><div class='add'>+	default n</div><div class='add'>+	help</div><div class='add'>+	  If you have a Toppoly TDO24M series LCD panel, say y here to</div><div class='add'>+	  include the support for it.</div><div class='add'>+</div><div class='ctx'> config LCD_VGG2432A4</div><div class='ctx'> 	tristate "VGG2432A4 LCM device support"</div><div class='ctx'> 	depends on BACKLIGHT_LCD_SUPPORT &amp;&amp; LCD_CLASS_DEVICE &amp;&amp; SPI_MASTER</div><div class='head'>diff --git a/drivers/video/backlight/Makefile b/drivers/video/backlight/Makefile<br/>index b405aace803f..3ec551eb472c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/backlight/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/video/backlight/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/backlight/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/backlight/Makefile</a></div><div class='hunk'>@@ -1,10 +1,12 @@</div><div class='ctx'> # Backlight &amp; LCD drivers</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_LCD_CLASS_DEVICE)     += lcd.o</div><div class='add'>+obj-$(CONFIG_LCD_CORGI)		   += corgi_lcd.o</div><div class='ctx'> obj-$(CONFIG_LCD_LTV350QV)	   += ltv350qv.o</div><div class='ctx'> obj-$(CONFIG_LCD_ILI9320)	   += ili9320.o</div><div class='ctx'> obj-$(CONFIG_LCD_PLATFORM)	   += platform_lcd.o</div><div class='ctx'> obj-$(CONFIG_LCD_VGG2432A4)	   += vgg2432a4.o</div><div class='add'>+obj-$(CONFIG_LCD_TDO24M)	   += tdo24m.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_BACKLIGHT_CLASS_DEVICE) += backlight.o</div><div class='ctx'> obj-$(CONFIG_BACKLIGHT_ATMEL_PWM)    += atmel-pwm-bl.o</div><div class='head'>diff --git a/drivers/video/backlight/corgi_lcd.c b/drivers/video/backlight/corgi_lcd.c<br/>new file mode 100644<br/>index 000000000000..2afd47eefe74<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/backlight/corgi_lcd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/backlight/corgi_lcd.c</a></div><div class='hunk'>@@ -0,0 +1,641 @@</div><div class='add'>+/*</div><div class='add'>+ *  LCD/Backlight Driver for Sharp Zaurus Handhelds (various models)</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (c) 2004-2006 Richard Purdie</div><div class='add'>+ *</div><div class='add'>+ *  Based on Sharp's 2.4 Backlight Driver</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (c) 2008 Marvell International Ltd.</div><div class='add'>+ *  	Converted to SPI device based LCD/Backlight device driver</div><div class='add'>+ *  	by Eric Miao &lt;eric.miao@marvell.com&gt;</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ *  published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/gpio.h&gt;</div><div class='add'>+#include &lt;linux/fb.h&gt;</div><div class='add'>+#include &lt;linux/lcd.h&gt;</div><div class='add'>+#include &lt;linux/spi/spi.h&gt;</div><div class='add'>+#include &lt;linux/spi/corgi_lcd.h&gt;</div><div class='add'>+#include &lt;asm/mach/sharpsl_param.h&gt;</div><div class='add'>+</div><div class='add'>+#define POWER_IS_ON(pwr)	((pwr) &lt;= FB_BLANK_NORMAL)</div><div class='add'>+</div><div class='add'>+/* Register Addresses */</div><div class='add'>+#define RESCTL_ADRS     0x00</div><div class='add'>+#define PHACTRL_ADRS    0x01</div><div class='add'>+#define DUTYCTRL_ADRS   0x02</div><div class='add'>+#define POWERREG0_ADRS  0x03</div><div class='add'>+#define POWERREG1_ADRS  0x04</div><div class='add'>+#define GPOR3_ADRS      0x05</div><div class='add'>+#define PICTRL_ADRS     0x06</div><div class='add'>+#define POLCTRL_ADRS    0x07</div><div class='add'>+</div><div class='add'>+/* Register Bit Definitions */</div><div class='add'>+#define RESCTL_QVGA     0x01</div><div class='add'>+#define RESCTL_VGA      0x00</div><div class='add'>+</div><div class='add'>+#define POWER1_VW_ON    0x01  /* VW Supply FET ON */</div><div class='add'>+#define POWER1_GVSS_ON  0x02  /* GVSS(-8V) Power Supply ON */</div><div class='add'>+#define POWER1_VDD_ON   0x04  /* VDD(8V),SVSS(-4V) Power Supply ON */</div><div class='add'>+</div><div class='add'>+#define POWER1_VW_OFF   0x00  /* VW Supply FET OFF */</div><div class='add'>+#define POWER1_GVSS_OFF 0x00  /* GVSS(-8V) Power Supply OFF */</div><div class='add'>+#define POWER1_VDD_OFF  0x00  /* VDD(8V),SVSS(-4V) Power Supply OFF */</div><div class='add'>+</div><div class='add'>+#define POWER0_COM_DCLK 0x01  /* COM Voltage DC Bias DAC Serial Data Clock */</div><div class='add'>+#define POWER0_COM_DOUT 0x02  /* COM Voltage DC Bias DAC Serial Data Out */</div><div class='add'>+#define POWER0_DAC_ON   0x04  /* DAC Power Supply ON */</div><div class='add'>+#define POWER0_COM_ON   0x08  /* COM Power Supply ON */</div><div class='add'>+#define POWER0_VCC5_ON  0x10  /* VCC5 Power Supply ON */</div><div class='add'>+</div><div class='add'>+#define POWER0_DAC_OFF  0x00  /* DAC Power Supply OFF */</div><div class='add'>+#define POWER0_COM_OFF  0x00  /* COM Power Supply OFF */</div><div class='add'>+#define POWER0_VCC5_OFF 0x00  /* VCC5 Power Supply OFF */</div><div class='add'>+</div><div class='add'>+#define PICTRL_INIT_STATE      0x01</div><div class='add'>+#define PICTRL_INIOFF          0x02</div><div class='add'>+#define PICTRL_POWER_DOWN      0x04</div><div class='add'>+#define PICTRL_COM_SIGNAL_OFF  0x08</div><div class='add'>+#define PICTRL_DAC_SIGNAL_OFF  0x10</div><div class='add'>+</div><div class='add'>+#define POLCTRL_SYNC_POL_FALL  0x01</div><div class='add'>+#define POLCTRL_EN_POL_FALL    0x02</div><div class='add'>+#define POLCTRL_DATA_POL_FALL  0x04</div><div class='add'>+#define POLCTRL_SYNC_ACT_H     0x08</div><div class='add'>+#define POLCTRL_EN_ACT_L       0x10</div><div class='add'>+</div><div class='add'>+#define POLCTRL_SYNC_POL_RISE  0x00</div><div class='add'>+#define POLCTRL_EN_POL_RISE    0x00</div><div class='add'>+#define POLCTRL_DATA_POL_RISE  0x00</div><div class='add'>+#define POLCTRL_SYNC_ACT_L     0x00</div><div class='add'>+#define POLCTRL_EN_ACT_H       0x00</div><div class='add'>+</div><div class='add'>+#define PHACTRL_PHASE_MANUAL   0x01</div><div class='add'>+#define DEFAULT_PHAD_QVGA     (9)</div><div class='add'>+#define DEFAULT_COMADJ        (125)</div><div class='add'>+</div><div class='add'>+struct corgi_lcd {</div><div class='add'>+	struct spi_device	*spi_dev;</div><div class='add'>+	struct lcd_device	*lcd_dev;</div><div class='add'>+	struct backlight_device	*bl_dev;</div><div class='add'>+</div><div class='add'>+	int	limit_mask;</div><div class='add'>+	int	intensity;</div><div class='add'>+	int	power;</div><div class='add'>+	int	mode;</div><div class='add'>+	char	buf[2];</div><div class='add'>+</div><div class='add'>+	int	gpio_backlight_on;</div><div class='add'>+	int	gpio_backlight_cont;</div><div class='add'>+	int	gpio_backlight_cont_inverted;</div><div class='add'>+</div><div class='add'>+	void (*kick_battery)(void);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int corgi_ssp_lcdtg_send(struct corgi_lcd *lcd, int reg, uint8_t val);</div><div class='add'>+</div><div class='add'>+static struct corgi_lcd *the_corgi_lcd;</div><div class='add'>+static unsigned long corgibl_flags;</div><div class='add'>+#define CORGIBL_SUSPENDED     0x01</div><div class='add'>+#define CORGIBL_BATTLOW       0x02</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This is only a psuedo I2C interface. We can't use the standard kernel</div><div class='add'>+ * routines as the interface is write only. We just assume the data is acked...</div><div class='add'>+ */</div><div class='add'>+static void lcdtg_ssp_i2c_send(struct corgi_lcd *lcd, uint8_t data)</div><div class='add'>+{</div><div class='add'>+	corgi_ssp_lcdtg_send(lcd, POWERREG0_ADRS, data);</div><div class='add'>+	udelay(10);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void lcdtg_i2c_send_bit(struct corgi_lcd *lcd, uint8_t data)</div><div class='add'>+{</div><div class='add'>+	lcdtg_ssp_i2c_send(lcd, data);</div><div class='add'>+	lcdtg_ssp_i2c_send(lcd, data | POWER0_COM_DCLK);</div><div class='add'>+	lcdtg_ssp_i2c_send(lcd, data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void lcdtg_i2c_send_start(struct corgi_lcd *lcd, uint8_t base)</div><div class='add'>+{</div><div class='add'>+	lcdtg_ssp_i2c_send(lcd, base | POWER0_COM_DCLK | POWER0_COM_DOUT);</div><div class='add'>+	lcdtg_ssp_i2c_send(lcd, base | POWER0_COM_DCLK);</div><div class='add'>+	lcdtg_ssp_i2c_send(lcd, base);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void lcdtg_i2c_send_stop(struct corgi_lcd *lcd, uint8_t base)</div><div class='add'>+{</div><div class='add'>+	lcdtg_ssp_i2c_send(lcd, base);</div><div class='add'>+	lcdtg_ssp_i2c_send(lcd, base | POWER0_COM_DCLK);</div><div class='add'>+	lcdtg_ssp_i2c_send(lcd, base | POWER0_COM_DCLK | POWER0_COM_DOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void lcdtg_i2c_send_byte(struct corgi_lcd *lcd,</div><div class='add'>+				uint8_t base, uint8_t data)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	for (i = 0; i &lt; 8; i++) {</div><div class='add'>+		if (data &amp; 0x80)</div><div class='add'>+			lcdtg_i2c_send_bit(lcd, base | POWER0_COM_DOUT);</div><div class='add'>+		else</div><div class='add'>+			lcdtg_i2c_send_bit(lcd, base);</div><div class='add'>+		data &lt;&lt;= 1;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void lcdtg_i2c_wait_ack(struct corgi_lcd *lcd, uint8_t base)</div><div class='add'>+{</div><div class='add'>+	lcdtg_i2c_send_bit(lcd, base);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void lcdtg_set_common_voltage(struct corgi_lcd *lcd,</div><div class='add'>+				     uint8_t base_data, uint8_t data)</div><div class='add'>+{</div><div class='add'>+	/* Set Common Voltage to M62332FP via I2C */</div><div class='add'>+	lcdtg_i2c_send_start(lcd, base_data);</div><div class='add'>+	lcdtg_i2c_send_byte(lcd, base_data, 0x9c);</div><div class='add'>+	lcdtg_i2c_wait_ack(lcd, base_data);</div><div class='add'>+	lcdtg_i2c_send_byte(lcd, base_data, 0x00);</div><div class='add'>+	lcdtg_i2c_wait_ack(lcd, base_data);</div><div class='add'>+	lcdtg_i2c_send_byte(lcd, base_data, data);</div><div class='add'>+	lcdtg_i2c_wait_ack(lcd, base_data);</div><div class='add'>+	lcdtg_i2c_send_stop(lcd, base_data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int corgi_ssp_lcdtg_send(struct corgi_lcd *lcd, int adrs, uint8_t data)</div><div class='add'>+{</div><div class='add'>+	struct spi_message msg;</div><div class='add'>+	struct spi_transfer xfer = {</div><div class='add'>+		.len		= 1,</div><div class='add'>+		.cs_change	= 1,</div><div class='add'>+		.tx_buf		= lcd-&gt;buf,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	lcd-&gt;buf[0] = ((adrs &amp; 0x07) &lt;&lt; 5) | (data &amp; 0x1f);</div><div class='add'>+	spi_message_init(&amp;msg);</div><div class='add'>+	spi_message_add_tail(&amp;xfer, &amp;msg);</div><div class='add'>+</div><div class='add'>+	return spi_sync(lcd-&gt;spi_dev, &amp;msg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Set Phase Adjust */</div><div class='add'>+static void lcdtg_set_phadadj(struct corgi_lcd *lcd, int mode)</div><div class='add'>+{</div><div class='add'>+	int adj;</div><div class='add'>+</div><div class='add'>+	switch(mode) {</div><div class='add'>+	case CORGI_LCD_MODE_VGA:</div><div class='add'>+		/* Setting for VGA */</div><div class='add'>+		adj = sharpsl_param.phadadj;</div><div class='add'>+		adj = (adj &lt; 0) ? PHACTRL_PHASE_MANUAL :</div><div class='add'>+				  PHACTRL_PHASE_MANUAL | ((adj &amp; 0xf) &lt;&lt; 1);</div><div class='add'>+		break;</div><div class='add'>+	case CORGI_LCD_MODE_QVGA:</div><div class='add'>+	default:</div><div class='add'>+		/* Setting for QVGA */</div><div class='add'>+		adj = (DEFAULT_PHAD_QVGA &lt;&lt; 1) | PHACTRL_PHASE_MANUAL;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	corgi_ssp_lcdtg_send(lcd, PHACTRL_ADRS, adj);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void corgi_lcd_power_on(struct corgi_lcd *lcd)</div><div class='add'>+{</div><div class='add'>+	int comadj;</div><div class='add'>+</div><div class='add'>+	/* Initialize Internal Logic &amp; Port */</div><div class='add'>+	corgi_ssp_lcdtg_send(lcd, PICTRL_ADRS,</div><div class='add'>+			PICTRL_POWER_DOWN | PICTRL_INIOFF |</div><div class='add'>+			PICTRL_INIT_STATE | PICTRL_COM_SIGNAL_OFF |</div><div class='add'>+			PICTRL_DAC_SIGNAL_OFF);</div><div class='add'>+</div><div class='add'>+	corgi_ssp_lcdtg_send(lcd, POWERREG0_ADRS,</div><div class='add'>+			POWER0_COM_DCLK | POWER0_COM_DOUT | POWER0_DAC_OFF |</div><div class='add'>+			POWER0_COM_OFF | POWER0_VCC5_OFF);</div><div class='add'>+</div><div class='add'>+	corgi_ssp_lcdtg_send(lcd, POWERREG1_ADRS,</div><div class='add'>+			POWER1_VW_OFF | POWER1_GVSS_OFF | POWER1_VDD_OFF);</div><div class='add'>+</div><div class='add'>+	/* VDD(+8V), SVSS(-4V) ON */</div><div class='add'>+	corgi_ssp_lcdtg_send(lcd, POWERREG1_ADRS,</div><div class='add'>+			POWER1_VW_OFF | POWER1_GVSS_OFF | POWER1_VDD_ON);</div><div class='add'>+	mdelay(3);</div><div class='add'>+</div><div class='add'>+	/* DAC ON */</div><div class='add'>+	corgi_ssp_lcdtg_send(lcd, POWERREG0_ADRS,</div><div class='add'>+			POWER0_COM_DCLK | POWER0_COM_DOUT | POWER0_DAC_ON |</div><div class='add'>+			POWER0_COM_OFF | POWER0_VCC5_OFF);</div><div class='add'>+</div><div class='add'>+	/* INIB = H, INI = L  */</div><div class='add'>+	/* PICTL[0] = H , PICTL[1] = PICTL[2] = PICTL[4] = L */</div><div class='add'>+	corgi_ssp_lcdtg_send(lcd, PICTRL_ADRS,</div><div class='add'>+			PICTRL_INIT_STATE | PICTRL_COM_SIGNAL_OFF);</div><div class='add'>+</div><div class='add'>+	/* Set Common Voltage */</div><div class='add'>+	comadj = sharpsl_param.comadj;</div><div class='add'>+	if (comadj &lt; 0)</div><div class='add'>+		comadj = DEFAULT_COMADJ;</div><div class='add'>+</div><div class='add'>+	lcdtg_set_common_voltage(lcd, POWER0_DAC_ON | POWER0_COM_OFF |</div><div class='add'>+				 POWER0_VCC5_OFF, comadj);</div><div class='add'>+</div><div class='add'>+	/* VCC5 ON, DAC ON */</div><div class='add'>+	corgi_ssp_lcdtg_send(lcd, POWERREG0_ADRS,</div><div class='add'>+			POWER0_COM_DCLK | POWER0_COM_DOUT | POWER0_DAC_ON |</div><div class='add'>+			POWER0_COM_OFF | POWER0_VCC5_ON);</div><div class='add'>+</div><div class='add'>+	/* GVSS(-8V) ON, VDD ON */</div><div class='add'>+	corgi_ssp_lcdtg_send(lcd, POWERREG1_ADRS,</div><div class='add'>+			POWER1_VW_OFF | POWER1_GVSS_ON | POWER1_VDD_ON);</div><div class='add'>+	mdelay(2);</div><div class='add'>+</div><div class='add'>+	/* COM SIGNAL ON (PICTL[3] = L) */</div><div class='add'>+	corgi_ssp_lcdtg_send(lcd, PICTRL_ADRS, PICTRL_INIT_STATE);</div><div class='add'>+</div><div class='add'>+	/* COM ON, DAC ON, VCC5_ON */</div><div class='add'>+	corgi_ssp_lcdtg_send(lcd, POWERREG0_ADRS,</div><div class='add'>+			POWER0_COM_DCLK | POWER0_COM_DOUT | POWER0_DAC_ON |</div><div class='add'>+			POWER0_COM_ON | POWER0_VCC5_ON);</div><div class='add'>+</div><div class='add'>+	/* VW ON, GVSS ON, VDD ON */</div><div class='add'>+	corgi_ssp_lcdtg_send(lcd, POWERREG1_ADRS,</div><div class='add'>+			POWER1_VW_ON | POWER1_GVSS_ON | POWER1_VDD_ON);</div><div class='add'>+</div><div class='add'>+	/* Signals output enable */</div><div class='add'>+	corgi_ssp_lcdtg_send(lcd, PICTRL_ADRS, 0);</div><div class='add'>+</div><div class='add'>+	/* Set Phase Adjust */</div><div class='add'>+	lcdtg_set_phadadj(lcd, lcd-&gt;mode);</div><div class='add'>+</div><div class='add'>+	/* Initialize for Input Signals from ATI */</div><div class='add'>+	corgi_ssp_lcdtg_send(lcd, POLCTRL_ADRS,</div><div class='add'>+			POLCTRL_SYNC_POL_RISE | POLCTRL_EN_POL_RISE |</div><div class='add'>+			POLCTRL_DATA_POL_RISE | POLCTRL_SYNC_ACT_L |</div><div class='add'>+			POLCTRL_EN_ACT_H);</div><div class='add'>+	udelay(1000);</div><div class='add'>+</div><div class='add'>+	switch (lcd-&gt;mode) {</div><div class='add'>+	case CORGI_LCD_MODE_VGA:</div><div class='add'>+		corgi_ssp_lcdtg_send(lcd, RESCTL_ADRS, RESCTL_VGA);</div><div class='add'>+		break;</div><div class='add'>+	case CORGI_LCD_MODE_QVGA:</div><div class='add'>+	default:</div><div class='add'>+		corgi_ssp_lcdtg_send(lcd, RESCTL_ADRS, RESCTL_QVGA);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void corgi_lcd_power_off(struct corgi_lcd *lcd)</div><div class='add'>+{</div><div class='add'>+	/* 60Hz x 2 frame = 16.7msec x 2 = 33.4 msec */</div><div class='add'>+	msleep(34);</div><div class='add'>+</div><div class='add'>+	/* (1)VW OFF */</div><div class='add'>+	corgi_ssp_lcdtg_send(lcd, POWERREG1_ADRS,</div><div class='add'>+			POWER1_VW_OFF | POWER1_GVSS_ON | POWER1_VDD_ON);</div><div class='add'>+</div><div class='add'>+	/* (2)COM OFF */</div><div class='add'>+	corgi_ssp_lcdtg_send(lcd, PICTRL_ADRS, PICTRL_COM_SIGNAL_OFF);</div><div class='add'>+	corgi_ssp_lcdtg_send(lcd, POWERREG0_ADRS,</div><div class='add'>+			POWER0_DAC_ON | POWER0_COM_OFF | POWER0_VCC5_ON);</div><div class='add'>+</div><div class='add'>+	/* (3)Set Common Voltage Bias 0V */</div><div class='add'>+	lcdtg_set_common_voltage(lcd, POWER0_DAC_ON | POWER0_COM_OFF |</div><div class='add'>+			POWER0_VCC5_ON, 0);</div><div class='add'>+</div><div class='add'>+	/* (4)GVSS OFF */</div><div class='add'>+	corgi_ssp_lcdtg_send(lcd, POWERREG1_ADRS,</div><div class='add'>+			POWER1_VW_OFF | POWER1_GVSS_OFF | POWER1_VDD_ON);</div><div class='add'>+</div><div class='add'>+	/* (5)VCC5 OFF */</div><div class='add'>+	corgi_ssp_lcdtg_send(lcd, POWERREG0_ADRS,</div><div class='add'>+			POWER0_DAC_ON | POWER0_COM_OFF | POWER0_VCC5_OFF);</div><div class='add'>+</div><div class='add'>+	/* (6)Set PDWN, INIOFF, DACOFF */</div><div class='add'>+	corgi_ssp_lcdtg_send(lcd, PICTRL_ADRS,</div><div class='add'>+			PICTRL_INIOFF | PICTRL_DAC_SIGNAL_OFF |</div><div class='add'>+			PICTRL_POWER_DOWN | PICTRL_COM_SIGNAL_OFF);</div><div class='add'>+</div><div class='add'>+	/* (7)DAC OFF */</div><div class='add'>+	corgi_ssp_lcdtg_send(lcd, POWERREG0_ADRS,</div><div class='add'>+			POWER0_DAC_OFF | POWER0_COM_OFF | POWER0_VCC5_OFF);</div><div class='add'>+</div><div class='add'>+	/* (8)VDD OFF */</div><div class='add'>+	corgi_ssp_lcdtg_send(lcd, POWERREG1_ADRS,</div><div class='add'>+			POWER1_VW_OFF | POWER1_GVSS_OFF | POWER1_VDD_OFF);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int corgi_lcd_set_mode(struct lcd_device *ld, struct fb_videomode *m)</div><div class='add'>+{</div><div class='add'>+	struct corgi_lcd *lcd = dev_get_drvdata(&amp;ld-&gt;dev);</div><div class='add'>+	int mode = CORGI_LCD_MODE_QVGA;</div><div class='add'>+</div><div class='add'>+	if (m-&gt;xres == 640 || m-&gt;xres == 480)</div><div class='add'>+		mode = CORGI_LCD_MODE_VGA;</div><div class='add'>+</div><div class='add'>+	if (lcd-&gt;mode == mode)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	lcdtg_set_phadadj(lcd, mode);</div><div class='add'>+</div><div class='add'>+	switch (mode) {</div><div class='add'>+	case CORGI_LCD_MODE_VGA:</div><div class='add'>+		corgi_ssp_lcdtg_send(lcd, RESCTL_ADRS, RESCTL_VGA);</div><div class='add'>+		break;</div><div class='add'>+	case CORGI_LCD_MODE_QVGA:</div><div class='add'>+	default:</div><div class='add'>+		corgi_ssp_lcdtg_send(lcd, RESCTL_ADRS, RESCTL_QVGA);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	lcd-&gt;mode = mode;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int corgi_lcd_set_power(struct lcd_device *ld, int power)</div><div class='add'>+{</div><div class='add'>+	struct corgi_lcd *lcd = dev_get_drvdata(&amp;ld-&gt;dev);</div><div class='add'>+</div><div class='add'>+	if (POWER_IS_ON(power) &amp;&amp; !POWER_IS_ON(lcd-&gt;power))</div><div class='add'>+		corgi_lcd_power_on(lcd);</div><div class='add'>+</div><div class='add'>+	if (!POWER_IS_ON(power) &amp;&amp; POWER_IS_ON(lcd-&gt;power))</div><div class='add'>+		corgi_lcd_power_off(lcd);</div><div class='add'>+</div><div class='add'>+	lcd-&gt;power = power;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int corgi_lcd_get_power(struct lcd_device *ld)</div><div class='add'>+{</div><div class='add'>+	struct corgi_lcd *lcd = dev_get_drvdata(&amp;ld-&gt;dev);</div><div class='add'>+</div><div class='add'>+	return lcd-&gt;power;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct lcd_ops corgi_lcd_ops = {</div><div class='add'>+	.get_power	= corgi_lcd_get_power,</div><div class='add'>+	.set_power	= corgi_lcd_set_power,</div><div class='add'>+	.set_mode	= corgi_lcd_set_mode,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int corgi_bl_get_intensity(struct backlight_device *bd)</div><div class='add'>+{</div><div class='add'>+	struct corgi_lcd *lcd = dev_get_drvdata(&amp;bd-&gt;dev);</div><div class='add'>+</div><div class='add'>+	return lcd-&gt;intensity;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int corgi_bl_set_intensity(struct corgi_lcd *lcd, int intensity)</div><div class='add'>+{</div><div class='add'>+	int cont;</div><div class='add'>+</div><div class='add'>+	if (intensity &gt; 0x10)</div><div class='add'>+		intensity += 0x10;</div><div class='add'>+</div><div class='add'>+	corgi_ssp_lcdtg_send(lcd, DUTYCTRL_ADRS, intensity);</div><div class='add'>+</div><div class='add'>+	/* Bit 5 via GPIO_BACKLIGHT_CONT */</div><div class='add'>+	cont = !!(intensity &amp; 0x20) ^ lcd-&gt;gpio_backlight_cont_inverted;</div><div class='add'>+</div><div class='add'>+	if (gpio_is_valid(lcd-&gt;gpio_backlight_cont))</div><div class='add'>+		gpio_set_value(lcd-&gt;gpio_backlight_cont, cont);</div><div class='add'>+</div><div class='add'>+	if (gpio_is_valid(lcd-&gt;gpio_backlight_on))</div><div class='add'>+		gpio_set_value(lcd-&gt;gpio_backlight_on, intensity);</div><div class='add'>+</div><div class='add'>+	if (lcd-&gt;kick_battery)</div><div class='add'>+		lcd-&gt;kick_battery();</div><div class='add'>+</div><div class='add'>+	lcd-&gt;intensity = intensity;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int corgi_bl_update_status(struct backlight_device *bd)</div><div class='add'>+{</div><div class='add'>+	struct corgi_lcd *lcd = dev_get_drvdata(&amp;bd-&gt;dev);</div><div class='add'>+	int intensity = bd-&gt;props.brightness;</div><div class='add'>+</div><div class='add'>+	if (bd-&gt;props.power != FB_BLANK_UNBLANK)</div><div class='add'>+		intensity = 0;</div><div class='add'>+</div><div class='add'>+	if (bd-&gt;props.fb_blank != FB_BLANK_UNBLANK)</div><div class='add'>+		intensity = 0;</div><div class='add'>+</div><div class='add'>+	if (corgibl_flags &amp; CORGIBL_SUSPENDED)</div><div class='add'>+		intensity = 0;</div><div class='add'>+	if (corgibl_flags &amp; CORGIBL_BATTLOW)</div><div class='add'>+		intensity &amp;= lcd-&gt;limit_mask;</div><div class='add'>+</div><div class='add'>+	return corgi_bl_set_intensity(lcd, intensity);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void corgibl_limit_intensity(int limit)</div><div class='add'>+{</div><div class='add'>+	if (limit)</div><div class='add'>+		corgibl_flags |= CORGIBL_BATTLOW;</div><div class='add'>+	else</div><div class='add'>+		corgibl_flags &amp;= ~CORGIBL_BATTLOW;</div><div class='add'>+</div><div class='add'>+	backlight_update_status(the_corgi_lcd-&gt;bl_dev);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(corgibl_limit_intensity);</div><div class='add'>+</div><div class='add'>+static struct backlight_ops corgi_bl_ops = {</div><div class='add'>+	.get_brightness	= corgi_bl_get_intensity,</div><div class='add'>+	.update_status  = corgi_bl_update_status,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+static int corgi_lcd_suspend(struct spi_device *spi, pm_message_t state)</div><div class='add'>+{</div><div class='add'>+	struct corgi_lcd *lcd = dev_get_drvdata(&amp;spi-&gt;dev);</div><div class='add'>+</div><div class='add'>+	corgibl_flags |= CORGIBL_SUSPENDED;</div><div class='add'>+	corgi_bl_set_intensity(lcd, 0);</div><div class='add'>+	corgi_lcd_set_power(lcd-&gt;lcd_dev, FB_BLANK_POWERDOWN);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int corgi_lcd_resume(struct spi_device *spi)</div><div class='add'>+{</div><div class='add'>+	struct corgi_lcd *lcd = dev_get_drvdata(&amp;spi-&gt;dev);</div><div class='add'>+</div><div class='add'>+	corgibl_flags &amp;= ~CORGIBL_SUSPENDED;</div><div class='add'>+	corgi_lcd_set_power(lcd-&gt;lcd_dev, FB_BLANK_UNBLANK);</div><div class='add'>+	backlight_update_status(lcd-&gt;bl_dev);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+#define corgi_lcd_suspend	NULL</div><div class='add'>+#define corgi_lcd_resume	NULL</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static int setup_gpio_backlight(struct corgi_lcd *lcd,</div><div class='add'>+				struct corgi_lcd_platform_data *pdata)</div><div class='add'>+{</div><div class='add'>+	struct spi_device *spi = lcd-&gt;spi_dev;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	lcd-&gt;gpio_backlight_on = -1;</div><div class='add'>+	lcd-&gt;gpio_backlight_cont = -1;</div><div class='add'>+</div><div class='add'>+	if (gpio_is_valid(pdata-&gt;gpio_backlight_on)) {</div><div class='add'>+		err = gpio_request(pdata-&gt;gpio_backlight_on, "BL_ON");</div><div class='add'>+		if (err) {</div><div class='add'>+			dev_err(&amp;spi-&gt;dev, "failed to request GPIO%d for "</div><div class='add'>+				"backlight_on\n", pdata-&gt;gpio_backlight_on);</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		lcd-&gt;gpio_backlight_on = pdata-&gt;gpio_backlight_on;</div><div class='add'>+		gpio_direction_output(lcd-&gt;gpio_backlight_on, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (gpio_is_valid(pdata-&gt;gpio_backlight_cont)) {</div><div class='add'>+		err = gpio_request(pdata-&gt;gpio_backlight_cont, "BL_CONT");</div><div class='add'>+		if (err) {</div><div class='add'>+			dev_err(&amp;spi-&gt;dev, "failed to request GPIO%d for "</div><div class='add'>+				"backlight_cont\n", pdata-&gt;gpio_backlight_cont);</div><div class='add'>+			goto err_free_backlight_on;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		lcd-&gt;gpio_backlight_cont = pdata-&gt;gpio_backlight_cont;</div><div class='add'>+</div><div class='add'>+		/* spitz and akita use both GPIOs for backlight, and</div><div class='add'>+		 * have inverted polarity of GPIO_BACKLIGHT_CONT</div><div class='add'>+		 */</div><div class='add'>+		if (gpio_is_valid(lcd-&gt;gpio_backlight_on)) {</div><div class='add'>+			lcd-&gt;gpio_backlight_cont_inverted = 1;</div><div class='add'>+			gpio_direction_output(lcd-&gt;gpio_backlight_cont, 1);</div><div class='add'>+		} else {</div><div class='add'>+			lcd-&gt;gpio_backlight_cont_inverted = 0;</div><div class='add'>+			gpio_direction_output(lcd-&gt;gpio_backlight_cont, 0);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_free_backlight_on:</div><div class='add'>+	if (gpio_is_valid(lcd-&gt;gpio_backlight_on))</div><div class='add'>+		gpio_free(lcd-&gt;gpio_backlight_on);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devinit corgi_lcd_probe(struct spi_device *spi)</div><div class='add'>+{</div><div class='add'>+	struct corgi_lcd_platform_data *pdata = spi-&gt;dev.platform_data;</div><div class='add'>+	struct corgi_lcd *lcd;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (pdata == NULL) {</div><div class='add'>+		dev_err(&amp;spi-&gt;dev, "platform data not available\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	lcd = kzalloc(sizeof(struct corgi_lcd), GFP_KERNEL);</div><div class='add'>+	if (!lcd) {</div><div class='add'>+		dev_err(&amp;spi-&gt;dev, "failed to allocate memory\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	lcd-&gt;spi_dev = spi;</div><div class='add'>+</div><div class='add'>+	lcd-&gt;lcd_dev = lcd_device_register("corgi_lcd", &amp;spi-&gt;dev,</div><div class='add'>+					lcd, &amp;corgi_lcd_ops);</div><div class='add'>+	if (IS_ERR(lcd-&gt;lcd_dev)) {</div><div class='add'>+		ret = PTR_ERR(lcd-&gt;lcd_dev);</div><div class='add'>+		goto err_free_lcd;</div><div class='add'>+	}</div><div class='add'>+	lcd-&gt;power = FB_BLANK_POWERDOWN;</div><div class='add'>+	lcd-&gt;mode = (pdata) ? pdata-&gt;init_mode : CORGI_LCD_MODE_VGA;</div><div class='add'>+</div><div class='add'>+	lcd-&gt;bl_dev = backlight_device_register("corgi_bl", &amp;spi-&gt;dev,</div><div class='add'>+					lcd, &amp;corgi_bl_ops);</div><div class='add'>+	if (IS_ERR(lcd-&gt;bl_dev)) {</div><div class='add'>+		ret = PTR_ERR(lcd-&gt;bl_dev);</div><div class='add'>+		goto err_unregister_lcd;</div><div class='add'>+	}</div><div class='add'>+	lcd-&gt;bl_dev-&gt;props.max_brightness = pdata-&gt;max_intensity;</div><div class='add'>+	lcd-&gt;bl_dev-&gt;props.brightness = pdata-&gt;default_intensity;</div><div class='add'>+	lcd-&gt;bl_dev-&gt;props.power = FB_BLANK_UNBLANK;</div><div class='add'>+</div><div class='add'>+	ret = setup_gpio_backlight(lcd, pdata);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_unregister_bl;</div><div class='add'>+</div><div class='add'>+	lcd-&gt;kick_battery = pdata-&gt;kick_battery;</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(&amp;spi-&gt;dev, lcd);</div><div class='add'>+	corgi_lcd_set_power(lcd-&gt;lcd_dev, FB_BLANK_UNBLANK);</div><div class='add'>+	backlight_update_status(lcd-&gt;bl_dev);</div><div class='add'>+</div><div class='add'>+	lcd-&gt;limit_mask = pdata-&gt;limit_mask;</div><div class='add'>+	the_corgi_lcd = lcd;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_unregister_bl:</div><div class='add'>+	backlight_device_unregister(lcd-&gt;bl_dev);</div><div class='add'>+err_unregister_lcd:</div><div class='add'>+	lcd_device_unregister(lcd-&gt;lcd_dev);</div><div class='add'>+err_free_lcd:</div><div class='add'>+	kfree(lcd);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devexit corgi_lcd_remove(struct spi_device *spi)</div><div class='add'>+{</div><div class='add'>+	struct corgi_lcd *lcd = dev_get_drvdata(&amp;spi-&gt;dev);</div><div class='add'>+</div><div class='add'>+	lcd-&gt;bl_dev-&gt;props.power = FB_BLANK_UNBLANK;</div><div class='add'>+	lcd-&gt;bl_dev-&gt;props.brightness = 0;</div><div class='add'>+	backlight_update_status(lcd-&gt;bl_dev);</div><div class='add'>+	backlight_device_unregister(lcd-&gt;bl_dev);</div><div class='add'>+</div><div class='add'>+	if (gpio_is_valid(lcd-&gt;gpio_backlight_on))</div><div class='add'>+		gpio_free(lcd-&gt;gpio_backlight_on);</div><div class='add'>+</div><div class='add'>+	if (gpio_is_valid(lcd-&gt;gpio_backlight_cont))</div><div class='add'>+		gpio_free(lcd-&gt;gpio_backlight_cont);</div><div class='add'>+</div><div class='add'>+	corgi_lcd_set_power(lcd-&gt;lcd_dev, FB_BLANK_POWERDOWN);</div><div class='add'>+	lcd_device_unregister(lcd-&gt;lcd_dev);</div><div class='add'>+	kfree(lcd);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct spi_driver corgi_lcd_driver = {</div><div class='add'>+	.driver		= {</div><div class='add'>+		.name	= "corgi-lcd",</div><div class='add'>+		.owner	= THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+	.probe		= corgi_lcd_probe,</div><div class='add'>+	.remove		= __devexit_p(corgi_lcd_remove),</div><div class='add'>+	.suspend	= corgi_lcd_suspend,</div><div class='add'>+	.resume		= corgi_lcd_resume,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init corgi_lcd_init(void)</div><div class='add'>+{</div><div class='add'>+	return spi_register_driver(&amp;corgi_lcd_driver);</div><div class='add'>+}</div><div class='add'>+module_init(corgi_lcd_init);</div><div class='add'>+</div><div class='add'>+static void __exit corgi_lcd_exit(void)</div><div class='add'>+{</div><div class='add'>+	spi_unregister_driver(&amp;corgi_lcd_driver);</div><div class='add'>+}</div><div class='add'>+module_exit(corgi_lcd_exit);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("LCD and backlight driver for SHARP C7x0/Cxx00");</div><div class='add'>+MODULE_AUTHOR("Eric Miao &lt;eric.miao@marvell.com&gt;");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/video/backlight/lcd.c b/drivers/video/backlight/lcd.c<br/>index b15b2b84a6f7..8e1731d3b228 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/backlight/lcd.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/video/backlight/lcd.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/backlight/lcd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/backlight/lcd.c</a></div><div class='hunk'>@@ -27,14 +27,26 @@ static int fb_notifier_callback(struct notifier_block *self,</div><div class='ctx'> 	struct fb_event *evdata = data;</div><div class='ctx'> </div><div class='ctx'> 	/* If we aren't interested in this event, skip it immediately ... */</div><div class='del'>-	if (event != FB_EVENT_BLANK)</div><div class='add'>+	switch (event) {</div><div class='add'>+	case FB_EVENT_BLANK:</div><div class='add'>+	case FB_EVENT_MODE_CHANGE:</div><div class='add'>+	case FB_EVENT_MODE_CHANGE_ALL:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='ctx'> 		return 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ld = container_of(self, struct lcd_device, fb_notif);</div><div class='add'>+	if (!ld-&gt;ops)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	mutex_lock(&amp;ld-&gt;ops_lock);</div><div class='del'>-	if (ld-&gt;ops)</div><div class='del'>-		if (!ld-&gt;ops-&gt;check_fb || ld-&gt;ops-&gt;check_fb(ld, evdata-&gt;info))</div><div class='add'>+	if (!ld-&gt;ops-&gt;check_fb || ld-&gt;ops-&gt;check_fb(ld, evdata-&gt;info)) {</div><div class='add'>+		if (event == FB_EVENT_BLANK)</div><div class='ctx'> 			ld-&gt;ops-&gt;set_power(ld, *(int *)evdata-&gt;data);</div><div class='add'>+		else</div><div class='add'>+			ld-&gt;ops-&gt;set_mode(ld, evdata-&gt;data);</div><div class='add'>+	}</div><div class='ctx'> 	mutex_unlock(&amp;ld-&gt;ops_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/video/backlight/mbp_nvidia_bl.c b/drivers/video/backlight/mbp_nvidia_bl.c<br/>index 385cba40ea87..06964af761c6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/backlight/mbp_nvidia_bl.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/video/backlight/mbp_nvidia_bl.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/backlight/mbp_nvidia_bl.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/backlight/mbp_nvidia_bl.c</a></div><div class='hunk'>@@ -111,6 +111,4 @@ module_exit(mbp_exit);</div><div class='ctx'> MODULE_AUTHOR("Matthew Garrett &lt;mjg@redhat.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Nvidia-based Macbook Pro Backlight Driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_ALIAS("svnAppleInc.:pnMacBookPro3,1");</div><div class='del'>-MODULE_ALIAS("svnAppleInc.:pnMacBookPro3,2");</div><div class='del'>-MODULE_ALIAS("svnAppleInc.:pnMacBookPro4,1");</div><div class='add'>+MODULE_DEVICE_TABLE(dmi, mbp_device_table);</div><div class='head'>diff --git a/drivers/video/backlight/tdo24m.c b/drivers/video/backlight/tdo24m.c<br/>new file mode 100644<br/>index 000000000000..8427669162ea<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/backlight/tdo24m.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/backlight/tdo24m.c</a></div><div class='hunk'>@@ -0,0 +1,396 @@</div><div class='add'>+/*</div><div class='add'>+ * tdo24m - SPI-based drivers for Toppoly TDO24M series LCD panels</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2008 Marvell International Ltd.</div><div class='add'>+ * 	Eric Miao &lt;eric.miao@marvell.com&gt;</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ *  publishhed by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/spi/spi.h&gt;</div><div class='add'>+#include &lt;linux/fb.h&gt;</div><div class='add'>+#include &lt;linux/lcd.h&gt;</div><div class='add'>+</div><div class='add'>+#define POWER_IS_ON(pwr)	((pwr) &lt;= FB_BLANK_NORMAL)</div><div class='add'>+</div><div class='add'>+#define TDO24M_SPI_BUFF_SIZE	(4)</div><div class='add'>+#define MODE_QVGA	0</div><div class='add'>+#define MODE_VGA	1</div><div class='add'>+</div><div class='add'>+struct tdo24m {</div><div class='add'>+	struct spi_device	*spi_dev;</div><div class='add'>+	struct lcd_device	*lcd_dev;</div><div class='add'>+</div><div class='add'>+	struct spi_message	msg;</div><div class='add'>+	struct spi_transfer	xfer;</div><div class='add'>+	uint8_t			*buf;</div><div class='add'>+</div><div class='add'>+	int			power;</div><div class='add'>+	int			mode;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* use bit 30, 31 as the indicator of command parameter number */</div><div class='add'>+#define CMD0(x)		((0 &lt;&lt; 30) | (x))</div><div class='add'>+#define CMD1(x, x1)	((1 &lt;&lt; 30) | ((x) &lt;&lt; 9) | 0x100 | (x1))</div><div class='add'>+#define CMD2(x, x1, x2)	((2 &lt;&lt; 30) | ((x) &lt;&lt; 18) | 0x20000 |\</div><div class='add'>+			((x1) &lt;&lt; 9) | 0x100 | (x2))</div><div class='add'>+#define CMD_NULL	(-1)</div><div class='add'>+</div><div class='add'>+static uint32_t lcd_panel_reset[] = {</div><div class='add'>+	CMD0(0x1), /* reset */</div><div class='add'>+	CMD0(0x0), /* nop */</div><div class='add'>+	CMD0(0x0), /* nop */</div><div class='add'>+	CMD0(0x0), /* nop */</div><div class='add'>+	CMD_NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static uint32_t lcd_panel_on[] = {</div><div class='add'>+	CMD0(0x29),		/* Display ON */</div><div class='add'>+	CMD2(0xB8, 0xFF, 0xF9),	/* Output Control */</div><div class='add'>+	CMD0(0x11),		/* Sleep out */</div><div class='add'>+	CMD1(0xB0, 0x16),	/* Wake */</div><div class='add'>+	CMD_NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static uint32_t lcd_panel_off[] = {</div><div class='add'>+	CMD0(0x28),		/* Display OFF */</div><div class='add'>+	CMD2(0xB8, 0x80, 0x02),	/* Output Control */</div><div class='add'>+	CMD0(0x10),		/* Sleep in */</div><div class='add'>+	CMD1(0xB0, 0x00),	/* Deep stand by in */</div><div class='add'>+	CMD_NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static uint32_t lcd_vga_pass_through[] = {</div><div class='add'>+	CMD1(0xB0, 0x16),</div><div class='add'>+	CMD1(0xBC, 0x80),</div><div class='add'>+	CMD1(0xE1, 0x00),</div><div class='add'>+	CMD1(0x36, 0x50),</div><div class='add'>+	CMD1(0x3B, 0x00),</div><div class='add'>+	CMD_NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static uint32_t lcd_qvga_pass_through[] = {</div><div class='add'>+	CMD1(0xB0, 0x16),</div><div class='add'>+	CMD1(0xBC, 0x81),</div><div class='add'>+	CMD1(0xE1, 0x00),</div><div class='add'>+	CMD1(0x36, 0x50),</div><div class='add'>+	CMD1(0x3B, 0x22),</div><div class='add'>+	CMD_NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static uint32_t lcd_vga_transfer[] = {</div><div class='add'>+	CMD1(0xcf, 0x02), 	/* Blanking period control (1) */</div><div class='add'>+	CMD2(0xd0, 0x08, 0x04),	/* Blanking period control (2) */</div><div class='add'>+	CMD1(0xd1, 0x01),	/* CKV timing control on/off */</div><div class='add'>+	CMD2(0xd2, 0x14, 0x00),	/* CKV 1,2 timing control */</div><div class='add'>+	CMD2(0xd3, 0x1a, 0x0f),	/* OEV timing control */</div><div class='add'>+	CMD2(0xd4, 0x1f, 0xaf),	/* ASW timing control (1) */</div><div class='add'>+	CMD1(0xd5, 0x14),	/* ASW timing control (2) */</div><div class='add'>+	CMD0(0x21),		/* Invert for normally black display */</div><div class='add'>+	CMD0(0x29),		/* Display on */</div><div class='add'>+	CMD_NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static uint32_t lcd_qvga_transfer[] = {</div><div class='add'>+	CMD1(0xd6, 0x02),	/* Blanking period control (1) */</div><div class='add'>+	CMD2(0xd7, 0x08, 0x04),	/* Blanking period control (2) */</div><div class='add'>+	CMD1(0xd8, 0x01),	/* CKV timing control on/off */</div><div class='add'>+	CMD2(0xd9, 0x00, 0x08),	/* CKV 1,2 timing control */</div><div class='add'>+	CMD2(0xde, 0x05, 0x0a),	/* OEV timing control */</div><div class='add'>+	CMD2(0xdf, 0x0a, 0x19),	/* ASW timing control (1) */</div><div class='add'>+	CMD1(0xe0, 0x0a),	/* ASW timing control (2) */</div><div class='add'>+	CMD0(0x21),		/* Invert for normally black display */</div><div class='add'>+	CMD0(0x29),		/* Display on */</div><div class='add'>+	CMD_NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static uint32_t lcd_panel_config[] = {</div><div class='add'>+	CMD2(0xb8, 0xff, 0xf9),	/* Output control */</div><div class='add'>+	CMD0(0x11),		/* sleep out */</div><div class='add'>+	CMD1(0xba, 0x01),	/* Display mode (1) */</div><div class='add'>+	CMD1(0xbb, 0x00),	/* Display mode (2) */</div><div class='add'>+	CMD1(0x3a, 0x60),	/* Display mode 18-bit RGB */</div><div class='add'>+	CMD1(0xbf, 0x10),	/* Drive system change control */</div><div class='add'>+	CMD1(0xb1, 0x56),	/* Booster operation setup */</div><div class='add'>+	CMD1(0xb2, 0x33),	/* Booster mode setup */</div><div class='add'>+	CMD1(0xb3, 0x11),	/* Booster frequency setup */</div><div class='add'>+	CMD1(0xb4, 0x02),	/* Op amp/system clock */</div><div class='add'>+	CMD1(0xb5, 0x35),	/* VCS voltage */</div><div class='add'>+	CMD1(0xb6, 0x40),	/* VCOM voltage */</div><div class='add'>+	CMD1(0xb7, 0x03),	/* External display signal */</div><div class='add'>+	CMD1(0xbd, 0x00),	/* ASW slew rate */</div><div class='add'>+	CMD1(0xbe, 0x00),	/* Dummy data for QuadData operation */</div><div class='add'>+	CMD1(0xc0, 0x11),	/* Sleep out FR count (A) */</div><div class='add'>+	CMD1(0xc1, 0x11),	/* Sleep out FR count (B) */</div><div class='add'>+	CMD1(0xc2, 0x11),	/* Sleep out FR count (C) */</div><div class='add'>+	CMD2(0xc3, 0x20, 0x40),	/* Sleep out FR count (D) */</div><div class='add'>+	CMD2(0xc4, 0x60, 0xc0),	/* Sleep out FR count (E) */</div><div class='add'>+	CMD2(0xc5, 0x10, 0x20),	/* Sleep out FR count (F) */</div><div class='add'>+	CMD1(0xc6, 0xc0),	/* Sleep out FR count (G) */</div><div class='add'>+	CMD2(0xc7, 0x33, 0x43),	/* Gamma 1 fine tuning (1) */</div><div class='add'>+	CMD1(0xc8, 0x44),	/* Gamma 1 fine tuning (2) */</div><div class='add'>+	CMD1(0xc9, 0x33),	/* Gamma 1 inclination adjustment */</div><div class='add'>+	CMD1(0xca, 0x00),	/* Gamma 1 blue offset adjustment */</div><div class='add'>+	CMD2(0xec, 0x01, 0xf0),	/* Horizontal clock cycles */</div><div class='add'>+	CMD_NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int tdo24m_writes(struct tdo24m *lcd, uint32_t *array)</div><div class='add'>+{</div><div class='add'>+	struct spi_transfer *x = &amp;lcd-&gt;xfer;</div><div class='add'>+	uint32_t data, *p = array;</div><div class='add'>+	int nparams, err = 0;</div><div class='add'>+</div><div class='add'>+	for (; *p != CMD_NULL; p++) {</div><div class='add'>+</div><div class='add'>+		nparams = (*p &gt;&gt; 30) &amp; 0x3;</div><div class='add'>+</div><div class='add'>+		data = *p &lt;&lt; (7 - nparams);</div><div class='add'>+		switch (nparams) {</div><div class='add'>+		case 0:</div><div class='add'>+			lcd-&gt;buf[0] = (data &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+			lcd-&gt;buf[1] = data &amp; 0xff;</div><div class='add'>+			break;</div><div class='add'>+		case 1:</div><div class='add'>+			lcd-&gt;buf[0] = (data &gt;&gt; 16) &amp; 0xff;</div><div class='add'>+			lcd-&gt;buf[1] = (data &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+			lcd-&gt;buf[2] = data &amp; 0xff;</div><div class='add'>+			break;</div><div class='add'>+		case 2:</div><div class='add'>+			lcd-&gt;buf[0] = (data &gt;&gt; 24) &amp; 0xff;</div><div class='add'>+			lcd-&gt;buf[1] = (data &gt;&gt; 16) &amp; 0xff;</div><div class='add'>+			lcd-&gt;buf[2] = (data &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+			lcd-&gt;buf[3] = data &amp; 0xff;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		x-&gt;len = nparams + 2;</div><div class='add'>+		err = spi_sync(lcd-&gt;spi_dev, &amp;lcd-&gt;msg);</div><div class='add'>+		if (err)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tdo24m_adj_mode(struct tdo24m *lcd, int mode)</div><div class='add'>+{</div><div class='add'>+	switch (mode) {</div><div class='add'>+	case MODE_VGA:</div><div class='add'>+		tdo24m_writes(lcd, lcd_vga_pass_through);</div><div class='add'>+		tdo24m_writes(lcd, lcd_panel_config);</div><div class='add'>+		tdo24m_writes(lcd, lcd_vga_transfer);</div><div class='add'>+		break;</div><div class='add'>+	case MODE_QVGA:</div><div class='add'>+		tdo24m_writes(lcd, lcd_qvga_pass_through);</div><div class='add'>+		tdo24m_writes(lcd, lcd_panel_config);</div><div class='add'>+		tdo24m_writes(lcd, lcd_qvga_transfer);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	lcd-&gt;mode = mode;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tdo24m_power_on(struct tdo24m *lcd)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = tdo24m_writes(lcd, lcd_panel_on);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = tdo24m_writes(lcd, lcd_panel_reset);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = tdo24m_adj_mode(lcd, lcd-&gt;mode);</div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tdo24m_power_off(struct tdo24m *lcd)</div><div class='add'>+{</div><div class='add'>+	return tdo24m_writes(lcd, lcd_panel_off);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tdo24m_power(struct tdo24m *lcd, int power)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (POWER_IS_ON(power) &amp;&amp; !POWER_IS_ON(lcd-&gt;power))</div><div class='add'>+		ret = tdo24m_power_on(lcd);</div><div class='add'>+	else if (!POWER_IS_ON(power) &amp;&amp; POWER_IS_ON(lcd-&gt;power))</div><div class='add'>+		ret = tdo24m_power_off(lcd);</div><div class='add'>+</div><div class='add'>+	if (!ret)</div><div class='add'>+		lcd-&gt;power = power;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int tdo24m_set_power(struct lcd_device *ld, int power)</div><div class='add'>+{</div><div class='add'>+	struct tdo24m *lcd = lcd_get_data(ld);</div><div class='add'>+	return tdo24m_power(lcd, power);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tdo24m_get_power(struct lcd_device *ld)</div><div class='add'>+{</div><div class='add'>+	struct tdo24m *lcd = lcd_get_data(ld);</div><div class='add'>+	return lcd-&gt;power;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tdo24m_set_mode(struct lcd_device *ld, struct fb_videomode *m)</div><div class='add'>+{</div><div class='add'>+	struct tdo24m *lcd = lcd_get_data(ld);</div><div class='add'>+	int mode = MODE_QVGA;</div><div class='add'>+</div><div class='add'>+	if (m-&gt;xres == 640 || m-&gt;xres == 480)</div><div class='add'>+		mode = MODE_VGA;</div><div class='add'>+</div><div class='add'>+	if (lcd-&gt;mode == mode)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return tdo24m_adj_mode(lcd, mode);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct lcd_ops tdo24m_ops = {</div><div class='add'>+	.get_power	= tdo24m_get_power,</div><div class='add'>+	.set_power	= tdo24m_set_power,</div><div class='add'>+	.set_mode	= tdo24m_set_mode,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __devinit tdo24m_probe(struct spi_device *spi)</div><div class='add'>+{</div><div class='add'>+	struct tdo24m *lcd;</div><div class='add'>+	struct spi_message *m;</div><div class='add'>+	struct spi_transfer *x;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	spi-&gt;bits_per_word = 8;</div><div class='add'>+	spi-&gt;mode = SPI_MODE_3;</div><div class='add'>+	err = spi_setup(spi);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	lcd = kzalloc(sizeof(struct tdo24m), GFP_KERNEL);</div><div class='add'>+	if (!lcd)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	lcd-&gt;spi_dev = spi;</div><div class='add'>+	lcd-&gt;power = FB_BLANK_POWERDOWN;</div><div class='add'>+	lcd-&gt;mode = MODE_VGA;	/* default to VGA */</div><div class='add'>+</div><div class='add'>+	lcd-&gt;buf = kmalloc(TDO24M_SPI_BUFF_SIZE, sizeof(GFP_KERNEL));</div><div class='add'>+	if (lcd-&gt;buf == NULL) {</div><div class='add'>+		kfree(lcd);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	m = &amp;lcd-&gt;msg;</div><div class='add'>+	x = &amp;lcd-&gt;xfer;</div><div class='add'>+</div><div class='add'>+	spi_message_init(m);</div><div class='add'>+</div><div class='add'>+	x-&gt;tx_buf = &amp;lcd-&gt;buf[0];</div><div class='add'>+	spi_message_add_tail(x, m);</div><div class='add'>+</div><div class='add'>+	lcd-&gt;lcd_dev = lcd_device_register("tdo24m", &amp;spi-&gt;dev,</div><div class='add'>+					lcd, &amp;tdo24m_ops);</div><div class='add'>+	if (IS_ERR(lcd-&gt;lcd_dev)) {</div><div class='add'>+		err = PTR_ERR(lcd-&gt;lcd_dev);</div><div class='add'>+		goto out_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(&amp;spi-&gt;dev, lcd);</div><div class='add'>+	err = tdo24m_power(lcd, FB_BLANK_UNBLANK);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_unregister;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_unregister:</div><div class='add'>+	lcd_device_unregister(lcd-&gt;lcd_dev);</div><div class='add'>+out_free:</div><div class='add'>+	kfree(lcd-&gt;buf);</div><div class='add'>+	kfree(lcd);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devexit tdo24m_remove(struct spi_device *spi)</div><div class='add'>+{</div><div class='add'>+	struct tdo24m *lcd = dev_get_drvdata(&amp;spi-&gt;dev);</div><div class='add'>+</div><div class='add'>+	tdo24m_power(lcd, FB_BLANK_POWERDOWN);</div><div class='add'>+	lcd_device_unregister(lcd-&gt;lcd_dev);</div><div class='add'>+	kfree(lcd-&gt;buf);</div><div class='add'>+	kfree(lcd);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+static int tdo24m_suspend(struct spi_device *spi, pm_message_t state)</div><div class='add'>+{</div><div class='add'>+	struct tdo24m *lcd = dev_get_drvdata(&amp;spi-&gt;dev);</div><div class='add'>+</div><div class='add'>+	return tdo24m_power(lcd, FB_BLANK_POWERDOWN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tdo24m_resume(struct spi_device *spi)</div><div class='add'>+{</div><div class='add'>+	struct tdo24m *lcd = dev_get_drvdata(&amp;spi-&gt;dev);</div><div class='add'>+</div><div class='add'>+	return tdo24m_power(lcd, FB_BLANK_UNBLANK);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+#define tdo24m_suspend	NULL</div><div class='add'>+#define tdo24m_resume	NULL</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* Power down all displays on reboot, poweroff or halt */</div><div class='add'>+static void tdo24m_shutdown(struct spi_device *spi)</div><div class='add'>+{</div><div class='add'>+	struct tdo24m *lcd = dev_get_drvdata(&amp;spi-&gt;dev);</div><div class='add'>+</div><div class='add'>+	tdo24m_power(lcd, FB_BLANK_POWERDOWN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct spi_driver tdo24m_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name		= "tdo24m",</div><div class='add'>+		.owner		= THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+	.probe		= tdo24m_probe,</div><div class='add'>+	.remove		= __devexit_p(tdo24m_remove),</div><div class='add'>+	.shutdown	= tdo24m_shutdown,</div><div class='add'>+	.suspend	= tdo24m_suspend,</div><div class='add'>+	.resume		= tdo24m_resume,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init tdo24m_init(void)</div><div class='add'>+{</div><div class='add'>+	return spi_register_driver(&amp;tdo24m_driver);</div><div class='add'>+}</div><div class='add'>+module_init(tdo24m_init);</div><div class='add'>+</div><div class='add'>+static void __exit tdo24m_exit(void)</div><div class='add'>+{</div><div class='add'>+	spi_unregister_driver(&amp;tdo24m_driver);</div><div class='add'>+}</div><div class='add'>+module_exit(tdo24m_exit);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Eric Miao &lt;eric.miao@marvell.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Driver for Toppoly TDO24M LCD Panel");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/video/bw2.c b/drivers/video/bw2.c<br/>index e721644bad74..1e35ba6f18e0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/bw2.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/video/bw2.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/bw2.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/bw2.c</a></div><div class='hunk'>@@ -372,7 +372,7 @@ static int __devexit bw2_remove(struct of_device *op)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct of_device_id bw2_match[] = {</div><div class='add'>+static const struct of_device_id bw2_match[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.name = "bwtwo",</div><div class='ctx'> 	},</div><div class='head'>diff --git a/drivers/video/carminefb.c b/drivers/video/carminefb.c<br/>index e15bb447440a..c9b191319a9a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/carminefb.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/video/carminefb.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/carminefb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/carminefb.c</a></div><div class='hunk'>@@ -535,7 +535,7 @@ static struct fb_ops carminefb_ops = {</div><div class='ctx'> 	.fb_setcolreg	= carmine_setcolreg,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int alloc_carmine_fb(void __iomem *regs, void __iomem *smem_base,</div><div class='add'>+static int __devinit alloc_carmine_fb(void __iomem *regs, void __iomem *smem_base,</div><div class='ctx'> 		int smem_offset, struct device *device, struct fb_info **rinfo)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='head'>diff --git a/drivers/video/cg14.c b/drivers/video/cg14.c<br/>index b17e74671779..a2d1882791a5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/cg14.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/video/cg14.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/cg14.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/cg14.c</a></div><div class='hunk'>@@ -589,7 +589,7 @@ static int __devexit cg14_remove(struct of_device *op)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct of_device_id cg14_match[] = {</div><div class='add'>+static const struct of_device_id cg14_match[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.name = "cgfourteen",</div><div class='ctx'> 	},</div><div class='head'>diff --git a/drivers/video/cg3.c b/drivers/video/cg3.c<br/>index 3aa7b6cb0268..99f87fb61d05 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/cg3.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/video/cg3.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/cg3.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/cg3.c</a></div><div class='hunk'>@@ -456,7 +456,7 @@ static int __devexit cg3_remove(struct of_device *op)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct of_device_id cg3_match[] = {</div><div class='add'>+static const struct of_device_id cg3_match[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.name = "cgthree",</div><div class='ctx'> 	},</div><div class='head'>diff --git a/drivers/video/cg6.c b/drivers/video/cg6.c<br/>index 2f64bb3bd254..940ec04f0f1b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/cg6.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/video/cg6.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/cg6.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/cg6.c</a></div><div class='hunk'>@@ -34,10 +34,11 @@ static int cg6_blank(int, struct fb_info *);</div><div class='ctx'> </div><div class='ctx'> static void cg6_imageblit(struct fb_info *, const struct fb_image *);</div><div class='ctx'> static void cg6_fillrect(struct fb_info *, const struct fb_fillrect *);</div><div class='add'>+static void cg6_copyarea(struct fb_info *info, const struct fb_copyarea *area);</div><div class='ctx'> static int cg6_sync(struct fb_info *);</div><div class='ctx'> static int cg6_mmap(struct fb_info *, struct vm_area_struct *);</div><div class='ctx'> static int cg6_ioctl(struct fb_info *, unsigned int, unsigned long);</div><div class='del'>-static void cg6_copyarea(struct fb_info *info, const struct fb_copyarea *area);</div><div class='add'>+static int cg6_pan_display(struct fb_var_screeninfo *, struct fb_info *);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *  Frame buffer operations</div><div class='hunk'>@@ -47,6 +48,7 @@ static struct fb_ops cg6_ops = {</div><div class='ctx'> 	.owner			= THIS_MODULE,</div><div class='ctx'> 	.fb_setcolreg		= cg6_setcolreg,</div><div class='ctx'> 	.fb_blank		= cg6_blank,</div><div class='add'>+	.fb_pan_display		= cg6_pan_display,</div><div class='ctx'> 	.fb_fillrect		= cg6_fillrect,</div><div class='ctx'> 	.fb_copyarea		= cg6_copyarea,</div><div class='ctx'> 	.fb_imageblit		= cg6_imageblit,</div><div class='hunk'>@@ -161,6 +163,7 @@ static struct fb_ops cg6_ops = {</div><div class='ctx'> #define CG6_THC_MISC_INT_ENAB		(1 &lt;&lt; 5)</div><div class='ctx'> #define CG6_THC_MISC_INT		(1 &lt;&lt; 4)</div><div class='ctx'> #define CG6_THC_MISC_INIT		0x9f</div><div class='add'>+#define CG6_THC_CURSOFF			((65536-32) | ((65536-32) &lt;&lt; 16))</div><div class='ctx'> </div><div class='ctx'> /* The contents are unknown */</div><div class='ctx'> struct cg6_tec {</div><div class='hunk'>@@ -280,6 +283,33 @@ static int cg6_sync(struct fb_info *info)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void cg6_switch_from_graph(struct cg6_par *par)</div><div class='add'>+{</div><div class='add'>+	struct cg6_thc __iomem *thc = par-&gt;thc;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;par-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	/* Hide the cursor. */</div><div class='add'>+	sbus_writel(CG6_THC_CURSOFF, &amp;thc-&gt;thc_cursxy);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;par-&gt;lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cg6_pan_display(struct fb_var_screeninfo *var, struct fb_info *info)</div><div class='add'>+{</div><div class='add'>+	struct cg6_par *par = (struct cg6_par *)info-&gt;par;</div><div class='add'>+</div><div class='add'>+	/* We just use this to catch switches out of</div><div class='add'>+	 * graphics mode.</div><div class='add'>+	 */</div><div class='add'>+	cg6_switch_from_graph(par);</div><div class='add'>+</div><div class='add'>+	if (var-&gt;xoffset || var-&gt;yoffset || var-&gt;vmode)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  *	cg6_fillrect -	Draws a rectangle on the screen.</div><div class='ctx'>  *</div><div class='hunk'>@@ -643,9 +673,13 @@ static void __devinit cg6_chip_init(struct fb_info *info)</div><div class='ctx'> 	struct cg6_par *par = (struct cg6_par *)info-&gt;par;</div><div class='ctx'> 	struct cg6_tec __iomem *tec = par-&gt;tec;</div><div class='ctx'> 	struct cg6_fbc __iomem *fbc = par-&gt;fbc;</div><div class='add'>+	struct cg6_thc __iomem *thc = par-&gt;thc;</div><div class='ctx'> 	u32 rev, conf, mode;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	/* Hide the cursor. */</div><div class='add'>+	sbus_writel(CG6_THC_CURSOFF, &amp;thc-&gt;thc_cursxy);</div><div class='add'>+</div><div class='ctx'> 	/* Turn off stuff in the Transform Engine. */</div><div class='ctx'> 	sbus_writel(0, &amp;tec-&gt;tec_matrix);</div><div class='ctx'> 	sbus_writel(0, &amp;tec-&gt;tec_clip);</div><div class='hunk'>@@ -814,7 +848,7 @@ static int __devexit cg6_remove(struct of_device *op)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct of_device_id cg6_match[] = {</div><div class='add'>+static const struct of_device_id cg6_match[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.name = "cgsix",</div><div class='ctx'> 	},</div><div class='head'>diff --git a/drivers/video/cirrusfb.c b/drivers/video/cirrusfb.c<br/>index e729fb279645..048b139f0e50 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/cirrusfb.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/video/cirrusfb.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/cirrusfb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/cirrusfb.c</a></div><div class='hunk'>@@ -327,29 +327,7 @@ static const struct {</div><div class='ctx'> #endif /* CONFIG_ZORRO */</div><div class='ctx'> </div><div class='ctx'> struct cirrusfb_regs {</div><div class='del'>-	long freq;</div><div class='del'>-	long nom;</div><div class='del'>-	long den;</div><div class='del'>-	long div;</div><div class='del'>-	long multiplexing;</div><div class='del'>-	long mclk;</div><div class='del'>-	long divMCLK;</div><div class='del'>-</div><div class='del'>-	long HorizRes;		/* The x resolution in pixel */</div><div class='del'>-	long HorizTotal;</div><div class='del'>-	long HorizDispEnd;</div><div class='del'>-	long HorizBlankStart;</div><div class='del'>-	long HorizBlankEnd;</div><div class='del'>-	long HorizSyncStart;</div><div class='del'>-	long HorizSyncEnd;</div><div class='del'>-</div><div class='del'>-	long VertRes;		/* the physical y resolution in scanlines */</div><div class='del'>-	long VertTotal;</div><div class='del'>-	long VertDispEnd;</div><div class='del'>-	long VertSyncStart;</div><div class='del'>-	long VertSyncEnd;</div><div class='del'>-	long VertBlankStart;</div><div class='del'>-	long VertBlankEnd;</div><div class='add'>+	int multiplexing;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef CIRRUSFB_DEBUG</div><div class='hunk'>@@ -367,110 +345,13 @@ struct cirrusfb_info {</div><div class='ctx'> </div><div class='ctx'> 	struct cirrusfb_regs currentmode;</div><div class='ctx'> 	int blank_mode;</div><div class='add'>+	u32 pseudo_palette[16];</div><div class='ctx'> </div><div class='del'>-	u32	pseudo_palette[16];</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_ZORRO</div><div class='del'>-	struct zorro_dev *zdev;</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-	struct pci_dev *pdev;</div><div class='del'>-#endif</div><div class='ctx'> 	void (*unmap)(struct fb_info *info);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static unsigned cirrusfb_def_mode = 1;</div><div class='del'>-static int noaccel;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *    Predefined Video Modes</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static const struct {</div><div class='del'>-	const char *name;</div><div class='del'>-	struct fb_var_screeninfo var;</div><div class='del'>-} cirrusfb_predefined[] = {</div><div class='del'>-	{</div><div class='del'>-		/* autodetect mode */</div><div class='del'>-		.name	= "Autodetect",</div><div class='del'>-	}, {</div><div class='del'>-		/* 640x480, 31.25 kHz, 60 Hz, 25 MHz PixClock */</div><div class='del'>-		.name	= "640x480",</div><div class='del'>-		.var	= {</div><div class='del'>-			.xres		= 640,</div><div class='del'>-			.yres		= 480,</div><div class='del'>-			.xres_virtual	= 640,</div><div class='del'>-			.yres_virtual	= 480,</div><div class='del'>-			.bits_per_pixel	= 8,</div><div class='del'>-			.red		= { .length = 8 },</div><div class='del'>-			.green		= { .length = 8 },</div><div class='del'>-			.blue		= { .length = 8 },</div><div class='del'>-			.width		= -1,</div><div class='del'>-			.height		= -1,</div><div class='del'>-			.pixclock	= 40000,</div><div class='del'>-			.left_margin	= 48,</div><div class='del'>-			.right_margin	= 16,</div><div class='del'>-			.upper_margin	= 32,</div><div class='del'>-			.lower_margin	= 8,</div><div class='del'>-			.hsync_len	= 96,</div><div class='del'>-			.vsync_len	= 4,</div><div class='del'>-			.sync	= FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,</div><div class='del'>-			.vmode		= FB_VMODE_NONINTERLACED</div><div class='del'>-		 }</div><div class='del'>-	}, {</div><div class='del'>-		/* 800x600, 48 kHz, 76 Hz, 50 MHz PixClock */</div><div class='del'>-		.name	= "800x600",</div><div class='del'>-		.var	= {</div><div class='del'>-			.xres		= 800,</div><div class='del'>-			.yres		= 600,</div><div class='del'>-			.xres_virtual	= 800,</div><div class='del'>-			.yres_virtual	= 600,</div><div class='del'>-			.bits_per_pixel	= 8,</div><div class='del'>-			.red		= { .length = 8 },</div><div class='del'>-			.green		= { .length = 8 },</div><div class='del'>-			.blue		= { .length = 8 },</div><div class='del'>-			.width		= -1,</div><div class='del'>-			.height		= -1,</div><div class='del'>-			.pixclock	= 20000,</div><div class='del'>-			.left_margin	= 128,</div><div class='del'>-			.right_margin	= 16,</div><div class='del'>-			.upper_margin	= 24,</div><div class='del'>-			.lower_margin	= 2,</div><div class='del'>-			.hsync_len	= 96,</div><div class='del'>-			.vsync_len	= 6,</div><div class='del'>-			.vmode		= FB_VMODE_NONINTERLACED</div><div class='del'>-		 }</div><div class='del'>-	}, {</div><div class='del'>-		/*</div><div class='del'>-		 * Modeline from XF86Config:</div><div class='del'>-		 * Mode "1024x768" 80  1024 1136 1340 1432  768 770 774 805</div><div class='del'>-		 */</div><div class='del'>-		/* 1024x768, 55.8 kHz, 70 Hz, 80 MHz PixClock */</div><div class='del'>-		.name	= "1024x768",</div><div class='del'>-		.var	= {</div><div class='del'>-			.xres		= 1024,</div><div class='del'>-			.yres		= 768,</div><div class='del'>-			.xres_virtual	= 1024,</div><div class='del'>-			.yres_virtual	= 768,</div><div class='del'>-			.bits_per_pixel	= 8,</div><div class='del'>-			.red		= { .length = 8 },</div><div class='del'>-			.green		= { .length = 8 },</div><div class='del'>-			.blue		= { .length = 8 },</div><div class='del'>-			.width		= -1,</div><div class='del'>-			.height		= -1,</div><div class='del'>-			.pixclock	= 12500,</div><div class='del'>-			.left_margin	= 144,</div><div class='del'>-			.right_margin	= 32,</div><div class='del'>-			.upper_margin	= 30,</div><div class='del'>-			.lower_margin	= 2,</div><div class='del'>-			.hsync_len	= 192,</div><div class='del'>-			.vsync_len	= 6,</div><div class='del'>-			.vmode		= FB_VMODE_NONINTERLACED</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define NUM_TOTAL_MODES    ARRAY_SIZE(cirrusfb_predefined)</div><div class='add'>+static int noaccel __devinitdata;</div><div class='add'>+static char *mode_option __devinitdata = "640x480@60";</div><div class='ctx'> </div><div class='ctx'> /****************************************************************************/</div><div class='ctx'> /**** BEGIN PROTOTYPES ******************************************************/</div><div class='hunk'>@@ -514,10 +395,6 @@ static struct fb_ops cirrusfb_ops = {</div><div class='ctx'> 	.fb_imageblit	= cirrusfb_imageblit,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/*--- Hardware Specific Routines -------------------------------------------*/</div><div class='del'>-static int cirrusfb_decode_var(const struct fb_var_screeninfo *var,</div><div class='del'>-				struct cirrusfb_regs *regs,</div><div class='del'>-				struct fb_info *info);</div><div class='ctx'> /*--- Internal routines ----------------------------------------------------*/</div><div class='ctx'> static void init_vgachip(struct fb_info *info);</div><div class='ctx'> static void switch_monitor(struct cirrusfb_info *cinfo, int on);</div><div class='hunk'>@@ -546,9 +423,7 @@ static void cirrusfb_RectFill(u8 __iomem *regbase, int bits_per_pixel,</div><div class='ctx'> 			      u_short width, u_short height,</div><div class='ctx'> 			      u_char color, u_short line_length);</div><div class='ctx'> </div><div class='del'>-static void bestclock(long freq, long *best,</div><div class='del'>-		      long *nom, long *den,</div><div class='del'>-		      long *div, long maxfreq);</div><div class='add'>+static void bestclock(long freq, int *nom, int *den, int *div);</div><div class='ctx'> </div><div class='ctx'> #ifdef CIRRUSFB_DEBUG</div><div class='ctx'> static void cirrusfb_dump(void);</div><div class='hunk'>@@ -584,45 +459,28 @@ static int cirrusfb_release(struct fb_info *info, int user)</div><div class='ctx'> /****************************************************************************/</div><div class='ctx'> /**** BEGIN Hardware specific Routines **************************************/</div><div class='ctx'> </div><div class='del'>-/* Get a good MCLK value */</div><div class='del'>-static long cirrusfb_get_mclk(long freq, int bpp, long *div)</div><div class='add'>+/* Check if the MCLK is not a better clock source */</div><div class='add'>+static int cirrusfb_check_mclk(struct cirrusfb_info *cinfo, long freq)</div><div class='ctx'> {</div><div class='del'>-	long mclk;</div><div class='add'>+	long mclk = vga_rseq(cinfo-&gt;regbase, CL_SEQR1F) &amp; 0x3f;</div><div class='ctx'> </div><div class='del'>-	assert(div != NULL);</div><div class='del'>-</div><div class='del'>-	/* Calculate MCLK, in case VCLK is high enough to require &gt; 50MHz.</div><div class='del'>-	 * Assume a 64-bit data path for now.  The formula is:</div><div class='del'>-	 * ((B * PCLK * 2)/W) * 1.2</div><div class='del'>-	 * B = bytes per pixel, PCLK = pixclock, W = data width in bytes */</div><div class='del'>-	mclk = ((bpp / 8) * freq * 2) / 4;</div><div class='del'>-	mclk = (mclk * 12) / 10;</div><div class='del'>-	if (mclk &lt; 50000)</div><div class='del'>-		mclk = 50000;</div><div class='del'>-	DPRINTK("Use MCLK of %ld kHz\n", mclk);</div><div class='del'>-</div><div class='del'>-	/* Calculate value for SR1F.  Multiply by 2 so we can round up. */</div><div class='del'>-	mclk = ((mclk * 16) / 14318);</div><div class='del'>-	mclk = (mclk + 1) / 2;</div><div class='del'>-	DPRINTK("Set SR1F[5:0] to 0x%lx\n", mclk);</div><div class='add'>+	/* Read MCLK value */</div><div class='add'>+	mclk = (14318 * mclk) &gt;&gt; 3;</div><div class='add'>+	DPRINTK("Read MCLK of %ld kHz\n", mclk);</div><div class='ctx'> </div><div class='ctx'> 	/* Determine if we should use MCLK instead of VCLK, and if so, what we</div><div class='del'>-	   * should divide it by to get VCLK */</div><div class='del'>-	switch (freq) {</div><div class='del'>-	case 24751 ... 25249:</div><div class='del'>-		*div = 2;</div><div class='del'>-		DPRINTK("Using VCLK = MCLK/2\n");</div><div class='del'>-		break;</div><div class='del'>-	case 49501 ... 50499:</div><div class='del'>-		*div = 1;</div><div class='add'>+	 * should divide it by to get VCLK</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	if (abs(freq - mclk) &lt; 250) {</div><div class='ctx'> 		DPRINTK("Using VCLK = MCLK\n");</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		*div = 0;</div><div class='del'>-		break;</div><div class='add'>+		return 1;</div><div class='add'>+	} else if (abs(freq - (mclk / 2)) &lt; 250) {</div><div class='add'>+		DPRINTK("Using VCLK = MCLK/2\n");</div><div class='add'>+		return 2;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return mclk;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int cirrusfb_check_var(struct fb_var_screeninfo *var,</div><div class='hunk'>@@ -638,7 +496,6 @@ static int cirrusfb_check_var(struct fb_var_screeninfo *var,</div><div class='ctx'> 		break;		/* 8 pixel per byte, only 1/4th of mem usable */</div><div class='ctx'> 	case 8:</div><div class='ctx'> 	case 16:</div><div class='del'>-	case 24:</div><div class='ctx'> 	case 32:</div><div class='ctx'> 		break;		/* 1 pixel == 1 byte */</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -713,7 +570,6 @@ static int cirrusfb_check_var(struct fb_var_screeninfo *var,</div><div class='ctx'> 		var-&gt;blue.length = 5;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case 24:</div><div class='ctx'> 	case 32:</div><div class='ctx'> 		if (isPReP) {</div><div class='ctx'> 			var-&gt;red.offset = 8;</div><div class='hunk'>@@ -767,8 +623,6 @@ static int cirrusfb_decode_var(const struct fb_var_screeninfo *var,</div><div class='ctx'> 	long maxclock;</div><div class='ctx'> 	int maxclockidx = var-&gt;bits_per_pixel &gt;&gt; 3;</div><div class='ctx'> 	struct cirrusfb_info *cinfo = info-&gt;par;</div><div class='del'>-	int xres, hfront, hsync, hback;</div><div class='del'>-	int yres, vfront, vsync, vback;</div><div class='ctx'> </div><div class='ctx'> 	switch (var-&gt;bits_per_pixel) {</div><div class='ctx'> 	case 1:</div><div class='hunk'>@@ -782,10 +636,9 @@ static int cirrusfb_decode_var(const struct fb_var_screeninfo *var,</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case 16:</div><div class='del'>-	case 24:</div><div class='ctx'> 	case 32:</div><div class='ctx'> 		info-&gt;fix.line_length = var-&gt;xres_virtual * maxclockidx;</div><div class='del'>-		info-&gt;fix.visual = FB_VISUAL_DIRECTCOLOR;</div><div class='add'>+		info-&gt;fix.visual = FB_VISUAL_TRUECOLOR;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='hunk'>@@ -827,90 +680,33 @@ static int cirrusfb_decode_var(const struct fb_var_screeninfo *var,</div><div class='ctx'> 	switch (var-&gt;bits_per_pixel) {</div><div class='ctx'> 	case 16:</div><div class='ctx'> 	case 32:</div><div class='del'>-		if (regs-&gt;HorizRes &lt;= 800)</div><div class='add'>+		if (var-&gt;xres &lt;= 800)</div><div class='ctx'> 			/* Xbh has this type of clock for 32-bit */</div><div class='ctx'> 			freq /= 2;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='del'>-</div><div class='del'>-	bestclock(freq, &amp;regs-&gt;freq, &amp;regs-&gt;nom, &amp;regs-&gt;den, &amp;regs-&gt;div,</div><div class='del'>-		  maxclock);</div><div class='del'>-	regs-&gt;mclk = cirrusfb_get_mclk(freq, var-&gt;bits_per_pixel,</div><div class='del'>-					&amp;regs-&gt;divMCLK);</div><div class='del'>-</div><div class='del'>-	xres = var-&gt;xres;</div><div class='del'>-	hfront = var-&gt;right_margin;</div><div class='del'>-	hsync = var-&gt;hsync_len;</div><div class='del'>-	hback = var-&gt;left_margin;</div><div class='del'>-</div><div class='del'>-	yres = var-&gt;yres;</div><div class='del'>-	vfront = var-&gt;lower_margin;</div><div class='del'>-	vsync = var-&gt;vsync_len;</div><div class='del'>-	vback = var-&gt;upper_margin;</div><div class='del'>-</div><div class='del'>-	if (var-&gt;vmode &amp; FB_VMODE_DOUBLE) {</div><div class='del'>-		yres *= 2;</div><div class='del'>-		vfront *= 2;</div><div class='del'>-		vsync *= 2;</div><div class='del'>-		vback *= 2;</div><div class='del'>-	} else if (var-&gt;vmode &amp; FB_VMODE_INTERLACED) {</div><div class='del'>-		yres = (yres + 1) / 2;</div><div class='del'>-		vfront = (vfront + 1) / 2;</div><div class='del'>-		vsync = (vsync + 1) / 2;</div><div class='del'>-		vback = (vback + 1) / 2;</div><div class='del'>-	}</div><div class='del'>-	regs-&gt;HorizRes = xres;</div><div class='del'>-	regs-&gt;HorizTotal = (xres + hfront + hsync + hback) / 8 - 5;</div><div class='del'>-	regs-&gt;HorizDispEnd = xres / 8 - 1;</div><div class='del'>-	regs-&gt;HorizBlankStart = xres / 8;</div><div class='del'>-	/* does not count with "-5" */</div><div class='del'>-	regs-&gt;HorizBlankEnd = regs-&gt;HorizTotal + 5;</div><div class='del'>-	regs-&gt;HorizSyncStart = (xres + hfront) / 8 + 1;</div><div class='del'>-	regs-&gt;HorizSyncEnd = (xres + hfront + hsync) / 8 + 1;</div><div class='del'>-</div><div class='del'>-	regs-&gt;VertRes = yres;</div><div class='del'>-	regs-&gt;VertTotal = yres + vfront + vsync + vback - 2;</div><div class='del'>-	regs-&gt;VertDispEnd = yres - 1;</div><div class='del'>-	regs-&gt;VertBlankStart = yres;</div><div class='del'>-	regs-&gt;VertBlankEnd = regs-&gt;VertTotal;</div><div class='del'>-	regs-&gt;VertSyncStart = yres + vfront - 1;</div><div class='del'>-	regs-&gt;VertSyncEnd = yres + vfront + vsync - 1;</div><div class='del'>-</div><div class='del'>-	if (regs-&gt;VertRes &gt;= 1024) {</div><div class='del'>-		regs-&gt;VertTotal /= 2;</div><div class='del'>-		regs-&gt;VertSyncStart /= 2;</div><div class='del'>-		regs-&gt;VertSyncEnd /= 2;</div><div class='del'>-		regs-&gt;VertDispEnd /= 2;</div><div class='del'>-	}</div><div class='del'>-	if (regs-&gt;multiplexing) {</div><div class='del'>-		regs-&gt;HorizTotal /= 2;</div><div class='del'>-		regs-&gt;HorizSyncStart /= 2;</div><div class='del'>-		regs-&gt;HorizSyncEnd /= 2;</div><div class='del'>-		regs-&gt;HorizDispEnd /= 2;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void cirrusfb_set_mclk(const struct cirrusfb_info *cinfo, int val,</div><div class='del'>-				int div)</div><div class='add'>+static void cirrusfb_set_mclk_as_source(const struct cirrusfb_info *cinfo,</div><div class='add'>+					int div)</div><div class='ctx'> {</div><div class='add'>+	unsigned char old1f, old1e;</div><div class='ctx'> 	assert(cinfo != NULL);</div><div class='add'>+	old1f = vga_rseq(cinfo-&gt;regbase, CL_SEQR1F) &amp; ~0x40;</div><div class='ctx'> </div><div class='del'>-	if (div == 2) {</div><div class='del'>-		/* VCLK = MCLK/2 */</div><div class='del'>-		unsigned char old = vga_rseq(cinfo-&gt;regbase, CL_SEQR1E);</div><div class='del'>-		vga_wseq(cinfo-&gt;regbase, CL_SEQR1E, old | 0x1);</div><div class='del'>-		vga_wseq(cinfo-&gt;regbase, CL_SEQR1F, 0x40 | (val &amp; 0x3f));</div><div class='del'>-	} else if (div == 1) {</div><div class='del'>-		/* VCLK = MCLK */</div><div class='del'>-		unsigned char old = vga_rseq(cinfo-&gt;regbase, CL_SEQR1E);</div><div class='del'>-		vga_wseq(cinfo-&gt;regbase, CL_SEQR1E, old &amp; ~0x1);</div><div class='del'>-		vga_wseq(cinfo-&gt;regbase, CL_SEQR1F, 0x40 | (val &amp; 0x3f));</div><div class='del'>-	} else {</div><div class='del'>-		vga_wseq(cinfo-&gt;regbase, CL_SEQR1F, val &amp; 0x3f);</div><div class='add'>+	if (div) {</div><div class='add'>+		DPRINTK("Set %s as pixclock source.\n",</div><div class='add'>+					(div == 2) ? "MCLK/2" : "MCLK");</div><div class='add'>+		old1f |= 0x40;</div><div class='add'>+		old1e = vga_rseq(cinfo-&gt;regbase, CL_SEQR1E) &amp; ~0x1;</div><div class='add'>+		if (div == 2)</div><div class='add'>+			old1e |= 1;</div><div class='add'>+</div><div class='add'>+		vga_wseq(cinfo-&gt;regbase, CL_SEQR1E, old1e);</div><div class='ctx'> 	}</div><div class='add'>+	vga_wseq(cinfo-&gt;regbase, CL_SEQR1F, old1f);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*************************************************************************</div><div class='hunk'>@@ -927,6 +723,10 @@ static int cirrusfb_set_par_foo(struct fb_info *info)</div><div class='ctx'> 	unsigned char tmp;</div><div class='ctx'> 	int offset = 0, err;</div><div class='ctx'> 	const struct cirrusfb_board_info_rec *bi;</div><div class='add'>+	int hdispend, hsyncstart, hsyncend, htotal;</div><div class='add'>+	int yres, vdispend, vsyncstart, vsyncend, vtotal;</div><div class='add'>+	long freq;</div><div class='add'>+	int nom, den, div;</div><div class='ctx'> </div><div class='ctx'> 	DPRINTK("ENTER\n");</div><div class='ctx'> 	DPRINTK("Requested mode: %dx%dx%d\n",</div><div class='hunk'>@@ -944,76 +744,117 @@ static int cirrusfb_set_par_foo(struct fb_info *info)</div><div class='ctx'> </div><div class='ctx'> 	bi = &amp;cirrusfb_board_info[cinfo-&gt;btype];</div><div class='ctx'> </div><div class='add'>+	hsyncstart = var-&gt;xres + var-&gt;right_margin;</div><div class='add'>+	hsyncend = hsyncstart + var-&gt;hsync_len;</div><div class='add'>+	htotal = (hsyncend + var-&gt;left_margin) / 8 - 5;</div><div class='add'>+	hdispend = var-&gt;xres / 8 - 1;</div><div class='add'>+	hsyncstart = hsyncstart / 8 + 1;</div><div class='add'>+	hsyncend = hsyncend / 8 + 1;</div><div class='add'>+</div><div class='add'>+	yres = var-&gt;yres;</div><div class='add'>+	vsyncstart = yres + var-&gt;lower_margin;</div><div class='add'>+	vsyncend = vsyncstart + var-&gt;vsync_len;</div><div class='add'>+	vtotal = vsyncend + var-&gt;upper_margin;</div><div class='add'>+	vdispend = yres - 1;</div><div class='add'>+</div><div class='add'>+	if (var-&gt;vmode &amp; FB_VMODE_DOUBLE) {</div><div class='add'>+		yres *= 2;</div><div class='add'>+		vsyncstart *= 2;</div><div class='add'>+		vsyncend *= 2;</div><div class='add'>+		vtotal *= 2;</div><div class='add'>+	} else if (var-&gt;vmode &amp; FB_VMODE_INTERLACED) {</div><div class='add'>+		yres = (yres + 1) / 2;</div><div class='add'>+		vsyncstart = (vsyncstart + 1) / 2;</div><div class='add'>+		vsyncend = (vsyncend + 1) / 2;</div><div class='add'>+		vtotal = (vtotal + 1) / 2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	vtotal -= 2;</div><div class='add'>+	vsyncstart -= 1;</div><div class='add'>+	vsyncend -= 1;</div><div class='add'>+</div><div class='add'>+	if (yres &gt;= 1024) {</div><div class='add'>+		vtotal /= 2;</div><div class='add'>+		vsyncstart /= 2;</div><div class='add'>+		vsyncend /= 2;</div><div class='add'>+		vdispend /= 2;</div><div class='add'>+	}</div><div class='add'>+	if (regs.multiplexing) {</div><div class='add'>+		htotal /= 2;</div><div class='add'>+		hsyncstart /= 2;</div><div class='add'>+		hsyncend /= 2;</div><div class='add'>+		hdispend /= 2;</div><div class='add'>+	}</div><div class='ctx'> 	/* unlock register VGA_CRTC_H_TOTAL..CRT7 */</div><div class='ctx'> 	vga_wcrt(regbase, VGA_CRTC_V_SYNC_END, 0x20);	/* previously: 0x00) */</div><div class='ctx'> </div><div class='ctx'> 	/* if debugging is enabled, all parameters get output before writing */</div><div class='del'>-	DPRINTK("CRT0: %ld\n", regs.HorizTotal);</div><div class='del'>-	vga_wcrt(regbase, VGA_CRTC_H_TOTAL, regs.HorizTotal);</div><div class='add'>+	DPRINTK("CRT0: %d\n", htotal);</div><div class='add'>+	vga_wcrt(regbase, VGA_CRTC_H_TOTAL, htotal);</div><div class='ctx'> </div><div class='del'>-	DPRINTK("CRT1: %ld\n", regs.HorizDispEnd);</div><div class='del'>-	vga_wcrt(regbase, VGA_CRTC_H_DISP, regs.HorizDispEnd);</div><div class='add'>+	DPRINTK("CRT1: %d\n", hdispend);</div><div class='add'>+	vga_wcrt(regbase, VGA_CRTC_H_DISP, hdispend);</div><div class='ctx'> </div><div class='del'>-	DPRINTK("CRT2: %ld\n", regs.HorizBlankStart);</div><div class='del'>-	vga_wcrt(regbase, VGA_CRTC_H_BLANK_START, regs.HorizBlankStart);</div><div class='add'>+	DPRINTK("CRT2: %d\n", var-&gt;xres / 8);</div><div class='add'>+	vga_wcrt(regbase, VGA_CRTC_H_BLANK_START, var-&gt;xres / 8);</div><div class='ctx'> </div><div class='ctx'> 	/*  + 128: Compatible read */</div><div class='del'>-	DPRINTK("CRT3: 128+%ld\n", regs.HorizBlankEnd % 32);</div><div class='add'>+	DPRINTK("CRT3: 128+%d\n", (htotal + 5) % 32);</div><div class='ctx'> 	vga_wcrt(regbase, VGA_CRTC_H_BLANK_END,</div><div class='del'>-		 128 + (regs.HorizBlankEnd % 32));</div><div class='add'>+		 128 + ((htotal + 5) % 32));</div><div class='ctx'> </div><div class='del'>-	DPRINTK("CRT4: %ld\n", regs.HorizSyncStart);</div><div class='del'>-	vga_wcrt(regbase, VGA_CRTC_H_SYNC_START, regs.HorizSyncStart);</div><div class='add'>+	DPRINTK("CRT4: %d\n", hsyncstart);</div><div class='add'>+	vga_wcrt(regbase, VGA_CRTC_H_SYNC_START, hsyncstart);</div><div class='ctx'> </div><div class='del'>-	tmp = regs.HorizSyncEnd % 32;</div><div class='del'>-	if (regs.HorizBlankEnd &amp; 32)</div><div class='add'>+	tmp = hsyncend % 32;</div><div class='add'>+	if ((htotal + 5) &amp; 32)</div><div class='ctx'> 		tmp += 128;</div><div class='ctx'> 	DPRINTK("CRT5: %d\n", tmp);</div><div class='ctx'> 	vga_wcrt(regbase, VGA_CRTC_H_SYNC_END, tmp);</div><div class='ctx'> </div><div class='del'>-	DPRINTK("CRT6: %ld\n", regs.VertTotal &amp; 0xff);</div><div class='del'>-	vga_wcrt(regbase, VGA_CRTC_V_TOTAL, (regs.VertTotal &amp; 0xff));</div><div class='add'>+	DPRINTK("CRT6: %d\n", vtotal &amp; 0xff);</div><div class='add'>+	vga_wcrt(regbase, VGA_CRTC_V_TOTAL, vtotal &amp; 0xff);</div><div class='ctx'> </div><div class='ctx'> 	tmp = 16;		/* LineCompare bit #9 */</div><div class='del'>-	if (regs.VertTotal &amp; 256)</div><div class='add'>+	if (vtotal &amp; 256)</div><div class='ctx'> 		tmp |= 1;</div><div class='del'>-	if (regs.VertDispEnd &amp; 256)</div><div class='add'>+	if (vdispend &amp; 256)</div><div class='ctx'> 		tmp |= 2;</div><div class='del'>-	if (regs.VertSyncStart &amp; 256)</div><div class='add'>+	if (vsyncstart &amp; 256)</div><div class='ctx'> 		tmp |= 4;</div><div class='del'>-	if (regs.VertBlankStart &amp; 256)</div><div class='add'>+	if ((vdispend + 1) &amp; 256)</div><div class='ctx'> 		tmp |= 8;</div><div class='del'>-	if (regs.VertTotal &amp; 512)</div><div class='add'>+	if (vtotal &amp; 512)</div><div class='ctx'> 		tmp |= 32;</div><div class='del'>-	if (regs.VertDispEnd &amp; 512)</div><div class='add'>+	if (vdispend &amp; 512)</div><div class='ctx'> 		tmp |= 64;</div><div class='del'>-	if (regs.VertSyncStart &amp; 512)</div><div class='add'>+	if (vsyncstart &amp; 512)</div><div class='ctx'> 		tmp |= 128;</div><div class='ctx'> 	DPRINTK("CRT7: %d\n", tmp);</div><div class='ctx'> 	vga_wcrt(regbase, VGA_CRTC_OVERFLOW, tmp);</div><div class='ctx'> </div><div class='ctx'> 	tmp = 0x40;		/* LineCompare bit #8 */</div><div class='del'>-	if (regs.VertBlankStart &amp; 512)</div><div class='add'>+	if ((vdispend + 1) &amp; 512)</div><div class='ctx'> 		tmp |= 0x20;</div><div class='ctx'> 	if (var-&gt;vmode &amp; FB_VMODE_DOUBLE)</div><div class='ctx'> 		tmp |= 0x80;</div><div class='ctx'> 	DPRINTK("CRT9: %d\n", tmp);</div><div class='ctx'> 	vga_wcrt(regbase, VGA_CRTC_MAX_SCAN, tmp);</div><div class='ctx'> </div><div class='del'>-	DPRINTK("CRT10: %ld\n", regs.VertSyncStart &amp; 0xff);</div><div class='del'>-	vga_wcrt(regbase, VGA_CRTC_V_SYNC_START, regs.VertSyncStart &amp; 0xff);</div><div class='add'>+	DPRINTK("CRT10: %d\n", vsyncstart &amp; 0xff);</div><div class='add'>+	vga_wcrt(regbase, VGA_CRTC_V_SYNC_START, vsyncstart &amp; 0xff);</div><div class='ctx'> </div><div class='del'>-	DPRINTK("CRT11: 64+32+%ld\n", regs.VertSyncEnd % 16);</div><div class='del'>-	vga_wcrt(regbase, VGA_CRTC_V_SYNC_END, regs.VertSyncEnd % 16 + 64 + 32);</div><div class='add'>+	DPRINTK("CRT11: 64+32+%d\n", vsyncend % 16);</div><div class='add'>+	vga_wcrt(regbase, VGA_CRTC_V_SYNC_END, vsyncend % 16 + 64 + 32);</div><div class='ctx'> </div><div class='del'>-	DPRINTK("CRT12: %ld\n", regs.VertDispEnd &amp; 0xff);</div><div class='del'>-	vga_wcrt(regbase, VGA_CRTC_V_DISP_END, regs.VertDispEnd &amp; 0xff);</div><div class='add'>+	DPRINTK("CRT12: %d\n", vdispend &amp; 0xff);</div><div class='add'>+	vga_wcrt(regbase, VGA_CRTC_V_DISP_END, vdispend &amp; 0xff);</div><div class='ctx'> </div><div class='del'>-	DPRINTK("CRT15: %ld\n", regs.VertBlankStart &amp; 0xff);</div><div class='del'>-	vga_wcrt(regbase, VGA_CRTC_V_BLANK_START, regs.VertBlankStart &amp; 0xff);</div><div class='add'>+	DPRINTK("CRT15: %d\n", (vdispend + 1) &amp; 0xff);</div><div class='add'>+	vga_wcrt(regbase, VGA_CRTC_V_BLANK_START, (vdispend + 1) &amp; 0xff);</div><div class='ctx'> </div><div class='del'>-	DPRINTK("CRT16: %ld\n", regs.VertBlankEnd &amp; 0xff);</div><div class='del'>-	vga_wcrt(regbase, VGA_CRTC_V_BLANK_END, regs.VertBlankEnd &amp; 0xff);</div><div class='add'>+	DPRINTK("CRT16: %d\n", vtotal &amp; 0xff);</div><div class='add'>+	vga_wcrt(regbase, VGA_CRTC_V_BLANK_END, vtotal &amp; 0xff);</div><div class='ctx'> </div><div class='ctx'> 	DPRINTK("CRT18: 0xff\n");</div><div class='ctx'> 	vga_wcrt(regbase, VGA_CRTC_LINE_COMPARE, 0xff);</div><div class='hunk'>@@ -1021,38 +862,53 @@ static int cirrusfb_set_par_foo(struct fb_info *info)</div><div class='ctx'> 	tmp = 0;</div><div class='ctx'> 	if (var-&gt;vmode &amp; FB_VMODE_INTERLACED)</div><div class='ctx'> 		tmp |= 1;</div><div class='del'>-	if (regs.HorizBlankEnd &amp; 64)</div><div class='add'>+	if ((htotal + 5) &amp; 64)</div><div class='ctx'> 		tmp |= 16;</div><div class='del'>-	if (regs.HorizBlankEnd &amp; 128)</div><div class='add'>+	if ((htotal + 5) &amp; 128)</div><div class='ctx'> 		tmp |= 32;</div><div class='del'>-	if (regs.VertBlankEnd &amp; 256)</div><div class='add'>+	if (vtotal &amp; 256)</div><div class='ctx'> 		tmp |= 64;</div><div class='del'>-	if (regs.VertBlankEnd &amp; 512)</div><div class='add'>+	if (vtotal &amp; 512)</div><div class='ctx'> 		tmp |= 128;</div><div class='ctx'> </div><div class='ctx'> 	DPRINTK("CRT1a: %d\n", tmp);</div><div class='ctx'> 	vga_wcrt(regbase, CL_CRT1A, tmp);</div><div class='ctx'> </div><div class='add'>+	freq = PICOS2KHZ(var-&gt;pixclock);</div><div class='add'>+	bestclock(freq, &amp;nom, &amp;den, &amp;div);</div><div class='add'>+</div><div class='ctx'> 	/* set VCLK0 */</div><div class='ctx'> 	/* hardware RefClock: 14.31818 MHz */</div><div class='ctx'> 	/* formula: VClk = (OSC * N) / (D * (1+P)) */</div><div class='ctx'> 	/* Example: VClk = (14.31818 * 91) / (23 * (1+1)) = 28.325 MHz */</div><div class='ctx'> </div><div class='del'>-	vga_wseq(regbase, CL_SEQRB, regs.nom);</div><div class='del'>-	tmp = regs.den &lt;&lt; 1;</div><div class='del'>-	if (regs.div != 0)</div><div class='del'>-		tmp |= 1;</div><div class='add'>+	if (cinfo-&gt;btype == BT_ALPINE) {</div><div class='add'>+		/* if freq is close to mclk or mclk/2 select mclk</div><div class='add'>+		 * as clock source</div><div class='add'>+		 */</div><div class='add'>+		int divMCLK = cirrusfb_check_mclk(cinfo, freq);</div><div class='add'>+		if (divMCLK)  {</div><div class='add'>+			nom = 0;</div><div class='add'>+			cirrusfb_set_mclk_as_source(cinfo, divMCLK);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (nom) {</div><div class='add'>+		vga_wseq(regbase, CL_SEQRB, nom);</div><div class='add'>+		tmp = den &lt;&lt; 1;</div><div class='add'>+		if (div != 0)</div><div class='add'>+			tmp |= 1;</div><div class='ctx'> </div><div class='del'>-	/* 6 bit denom; ONLY 5434!!! (bugged me 10 days) */</div><div class='del'>-	if ((cinfo-&gt;btype == BT_SD64) ||</div><div class='del'>-	    (cinfo-&gt;btype == BT_ALPINE) ||</div><div class='del'>-	    (cinfo-&gt;btype == BT_GD5480))</div><div class='del'>-		tmp |= 0x80;</div><div class='add'>+		/* 6 bit denom; ONLY 5434!!! (bugged me 10 days) */</div><div class='add'>+		if ((cinfo-&gt;btype == BT_SD64) ||</div><div class='add'>+		    (cinfo-&gt;btype == BT_ALPINE) ||</div><div class='add'>+		    (cinfo-&gt;btype == BT_GD5480))</div><div class='add'>+			tmp |= 0x80;</div><div class='ctx'> </div><div class='del'>-	DPRINTK("CL_SEQR1B: %ld\n", (long) tmp);</div><div class='del'>-	vga_wseq(regbase, CL_SEQR1B, tmp);</div><div class='add'>+		DPRINTK("CL_SEQR1B: %ld\n", (long) tmp);</div><div class='add'>+		vga_wseq(regbase, CL_SEQR1B, tmp);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (regs.VertRes &gt;= 1024)</div><div class='add'>+	if (yres &gt;= 1024)</div><div class='ctx'> 		/* 1280x1024 */</div><div class='ctx'> 		vga_wcrt(regbase, VGA_CRTC_MODE, 0xc7);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -1066,7 +922,7 @@ static int cirrusfb_set_par_foo(struct fb_info *info)</div><div class='ctx'> 	/* don't know if it would hurt to also program this if no interlaced */</div><div class='ctx'> 	/* mode is used, but I feel better this way.. :-) */</div><div class='ctx'> 	if (var-&gt;vmode &amp; FB_VMODE_INTERLACED)</div><div class='del'>-		vga_wcrt(regbase, VGA_CRTC_REGS, regs.HorizTotal / 2);</div><div class='add'>+		vga_wcrt(regbase, VGA_CRTC_REGS, htotal / 2);</div><div class='ctx'> 	else</div><div class='ctx'> 		vga_wcrt(regbase, VGA_CRTC_REGS, 0x00);	/* interlace control */</div><div class='ctx'> </div><div class='hunk'>@@ -1240,7 +1096,6 @@ static int cirrusfb_set_par_foo(struct fb_info *info)</div><div class='ctx'> </div><div class='ctx'> 		case BT_ALPINE:</div><div class='ctx'> 			DPRINTK(" (for GD543x)\n");</div><div class='del'>-			cirrusfb_set_mclk(cinfo, regs.mclk, regs.divMCLK);</div><div class='ctx'> 			/* We already set SRF and SR1F */</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='hunk'>@@ -1312,11 +1167,7 @@ static int cirrusfb_set_par_foo(struct fb_info *info)</div><div class='ctx'> </div><div class='ctx'> 		case BT_ALPINE:</div><div class='ctx'> 			DPRINTK(" (for GD543x)\n");</div><div class='del'>-			if (regs.HorizRes &gt;= 1024)</div><div class='del'>-				vga_wseq(regbase, CL_SEQR7, 0xa7);</div><div class='del'>-			else</div><div class='del'>-				vga_wseq(regbase, CL_SEQR7, 0xa3);</div><div class='del'>-			cirrusfb_set_mclk(cinfo, regs.mclk, regs.divMCLK);</div><div class='add'>+			vga_wseq(regbase, CL_SEQR7, 0xa7);</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case BT_GD5480:</div><div class='hunk'>@@ -1360,7 +1211,7 @@ static int cirrusfb_set_par_foo(struct fb_info *info)</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	else if (var-&gt;bits_per_pixel == 32) {</div><div class='del'>-		DPRINTK("cirrusfb: preparing for 24/32 bit deep display\n");</div><div class='add'>+		DPRINTK("cirrusfb: preparing for 32 bit deep display\n");</div><div class='ctx'> 		switch (cinfo-&gt;btype) {</div><div class='ctx'> 		case BT_SD64:</div><div class='ctx'> 			/* Extended Sequencer Mode: 256c col. mode */</div><div class='hunk'>@@ -1394,7 +1245,6 @@ static int cirrusfb_set_par_foo(struct fb_info *info)</div><div class='ctx'> 		case BT_ALPINE:</div><div class='ctx'> 			DPRINTK(" (for GD543x)\n");</div><div class='ctx'> 			vga_wseq(regbase, CL_SEQR7, 0xa9);</div><div class='del'>-			cirrusfb_set_mclk(cinfo, regs.mclk, regs.divMCLK);</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case BT_GD5480:</div><div class='hunk'>@@ -1949,8 +1799,6 @@ static void init_vgachip(struct fb_info *info)</div><div class='ctx'> 	/* misc... */</div><div class='ctx'> 	WHDR(cinfo, 0);	/* Hidden DAC register: - */</div><div class='ctx'> </div><div class='del'>-	printk(KERN_DEBUG "cirrusfb: This board has %ld bytes of DRAM memory\n",</div><div class='del'>-		info-&gt;screen_size);</div><div class='ctx'> 	DPRINTK("EXIT\n");</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='hunk'>@@ -2122,7 +1970,7 @@ static int release_io_ports;</div><div class='ctx'>  * based on the DRAM bandwidth bit and DRAM bank switching bit.  This</div><div class='ctx'>  * works with 1MB, 2MB and 4MB configurations (which the Motorola boards</div><div class='ctx'>  * seem to have. */</div><div class='del'>-static unsigned int cirrusfb_get_memsize(u8 __iomem *regbase)</div><div class='add'>+static unsigned int __devinit cirrusfb_get_memsize(u8 __iomem *regbase)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long mem;</div><div class='ctx'> 	unsigned char SRF;</div><div class='hunk'>@@ -2188,8 +2036,7 @@ static void get_pci_addrs(const struct pci_dev *pdev,</div><div class='ctx'> </div><div class='ctx'> static void cirrusfb_pci_unmap(struct fb_info *info)</div><div class='ctx'> {</div><div class='del'>-	struct cirrusfb_info *cinfo = info-&gt;par;</div><div class='del'>-	struct pci_dev *pdev = cinfo-&gt;pdev;</div><div class='add'>+	struct pci_dev *pdev = to_pci_dev(info-&gt;device);</div><div class='ctx'> </div><div class='ctx'> 	iounmap(info-&gt;screen_base);</div><div class='ctx'> #if 0 /* if system didn't claim this region, we would... */</div><div class='hunk'>@@ -2205,20 +2052,22 @@ static void cirrusfb_pci_unmap(struct fb_info *info)</div><div class='ctx'> static void __devexit cirrusfb_zorro_unmap(struct fb_info *info)</div><div class='ctx'> {</div><div class='ctx'> 	struct cirrusfb_info *cinfo = info-&gt;par;</div><div class='del'>-	zorro_release_device(cinfo-&gt;zdev);</div><div class='add'>+	struct zorro_dev *zdev = to_zorro_dev(info-&gt;device);</div><div class='add'>+</div><div class='add'>+	zorro_release_device(zdev);</div><div class='ctx'> </div><div class='ctx'> 	if (cinfo-&gt;btype == BT_PICASSO4) {</div><div class='ctx'> 		cinfo-&gt;regbase -= 0x600000;</div><div class='ctx'> 		iounmap((void *)cinfo-&gt;regbase);</div><div class='ctx'> 		iounmap(info-&gt;screen_base);</div><div class='ctx'> 	} else {</div><div class='del'>-		if (zorro_resource_start(cinfo-&gt;zdev) &gt; 0x01000000)</div><div class='add'>+		if (zorro_resource_start(zdev) &gt; 0x01000000)</div><div class='ctx'> 			iounmap(info-&gt;screen_base);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_ZORRO */</div><div class='ctx'> </div><div class='del'>-static int cirrusfb_set_fbinfo(struct fb_info *info)</div><div class='add'>+static int __devinit cirrusfb_set_fbinfo(struct fb_info *info)</div><div class='ctx'> {</div><div class='ctx'> 	struct cirrusfb_info *cinfo = info-&gt;par;</div><div class='ctx'> 	struct fb_var_screeninfo *var = &amp;info-&gt;var;</div><div class='hunk'>@@ -2235,7 +2084,7 @@ static int cirrusfb_set_fbinfo(struct fb_info *info)</div><div class='ctx'> 	if (cinfo-&gt;btype == BT_GD5480) {</div><div class='ctx'> 		if (var-&gt;bits_per_pixel == 16)</div><div class='ctx'> 			info-&gt;screen_base += 1 * MB_;</div><div class='del'>-		if (var-&gt;bits_per_pixel == 24 || var-&gt;bits_per_pixel == 32)</div><div class='add'>+		if (var-&gt;bits_per_pixel == 32)</div><div class='ctx'> 			info-&gt;screen_base += 2 * MB_;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2262,7 +2111,7 @@ static int cirrusfb_set_fbinfo(struct fb_info *info)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cirrusfb_register(struct fb_info *info)</div><div class='add'>+static int __devinit cirrusfb_register(struct fb_info *info)</div><div class='ctx'> {</div><div class='ctx'> 	struct cirrusfb_info *cinfo = info-&gt;par;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -2278,23 +2127,27 @@ static int cirrusfb_register(struct fb_info *info)</div><div class='ctx'> 	/* sanity checks */</div><div class='ctx'> 	assert(btype != BT_NONE);</div><div class='ctx'> </div><div class='add'>+	/* set all the vital stuff */</div><div class='add'>+	cirrusfb_set_fbinfo(info);</div><div class='add'>+</div><div class='ctx'> 	DPRINTK("cirrusfb: (RAM start set to: 0x%p)\n", info-&gt;screen_base);</div><div class='ctx'> </div><div class='del'>-	/* Make pretend we've set the var so our structures are in a "good" */</div><div class='del'>-	/* state, even though we haven't written the mode to the hw yet...  */</div><div class='del'>-	info-&gt;var = cirrusfb_predefined[cirrusfb_def_mode].var;</div><div class='add'>+	err = fb_find_mode(&amp;info-&gt;var, info, mode_option, NULL, 0, NULL, 8);</div><div class='add'>+	if (!err) {</div><div class='add'>+		DPRINTK("wrong initial video mode\n");</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto err_dealloc_cmap;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	info-&gt;var.activate = FB_ACTIVATE_NOW;</div><div class='ctx'> </div><div class='ctx'> 	err = cirrusfb_decode_var(&amp;info-&gt;var, &amp;cinfo-&gt;currentmode, info);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='ctx'> 		/* should never happen */</div><div class='ctx'> 		DPRINTK("choking on default var... umm, no good.\n");</div><div class='del'>-		goto err_unmap_cirrusfb;</div><div class='add'>+		goto err_dealloc_cmap;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* set all the vital stuff */</div><div class='del'>-	cirrusfb_set_fbinfo(info);</div><div class='del'>-</div><div class='ctx'> 	err = register_framebuffer(info);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='ctx'> 		printk(KERN_ERR "cirrusfb: could not register "</div><div class='hunk'>@@ -2307,7 +2160,6 @@ static int cirrusfb_register(struct fb_info *info)</div><div class='ctx'> </div><div class='ctx'> err_dealloc_cmap:</div><div class='ctx'> 	fb_dealloc_cmap(&amp;info-&gt;cmap);</div><div class='del'>-err_unmap_cirrusfb:</div><div class='ctx'> 	cinfo-&gt;unmap(info);</div><div class='ctx'> 	framebuffer_release(info);</div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -2330,8 +2182,8 @@ static void __devexit cirrusfb_cleanup(struct fb_info *info)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PCI</div><div class='del'>-static int cirrusfb_pci_register(struct pci_dev *pdev,</div><div class='del'>-				  const struct pci_device_id *ent)</div><div class='add'>+static int __devinit cirrusfb_pci_register(struct pci_dev *pdev,</div><div class='add'>+					   const struct pci_device_id *ent)</div><div class='ctx'> {</div><div class='ctx'> 	struct cirrusfb_info *cinfo;</div><div class='ctx'> 	struct fb_info *info;</div><div class='hunk'>@@ -2353,7 +2205,6 @@ static int cirrusfb_pci_register(struct pci_dev *pdev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	cinfo = info-&gt;par;</div><div class='del'>-	cinfo-&gt;pdev = pdev;</div><div class='ctx'> 	cinfo-&gt;btype = btype = (enum cirrus_board) ent-&gt;driver_data;</div><div class='ctx'> </div><div class='ctx'> 	DPRINTK(" Found PCI device, base address 0 is 0x%x, btype set to %d\n",</div><div class='hunk'>@@ -2459,8 +2310,8 @@ static struct pci_driver cirrusfb_pci_driver = {</div><div class='ctx'> #endif /* CONFIG_PCI */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ZORRO</div><div class='del'>-static int cirrusfb_zorro_register(struct zorro_dev *z,</div><div class='del'>-				   const struct zorro_device_id *ent)</div><div class='add'>+static int __devinit cirrusfb_zorro_register(struct zorro_dev *z,</div><div class='add'>+					     const struct zorro_device_id *ent)</div><div class='ctx'> {</div><div class='ctx'> 	struct cirrusfb_info *cinfo;</div><div class='ctx'> 	struct fb_info *info;</div><div class='hunk'>@@ -2489,7 +2340,6 @@ static int cirrusfb_zorro_register(struct zorro_dev *z,</div><div class='ctx'> 	assert(z);</div><div class='ctx'> 	assert(btype != BT_NONE);</div><div class='ctx'> </div><div class='del'>-	cinfo-&gt;zdev = z;</div><div class='ctx'> 	board_addr = zorro_resource_start(z);</div><div class='ctx'> 	board_size = zorro_resource_len(z);</div><div class='ctx'> 	info-&gt;screen_size = size;</div><div class='hunk'>@@ -2621,17 +2471,17 @@ static int __init cirrusfb_setup(char *options) {</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	while ((this_opt = strsep(&amp;options, ",")) != NULL) {</div><div class='del'>-		if (!*this_opt) continue;</div><div class='add'>+		if (!*this_opt)</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='ctx'> 		DPRINTK("cirrusfb_setup: option '%s'\n", this_opt);</div><div class='ctx'> </div><div class='del'>-		for (i = 0; i &lt; NUM_TOTAL_MODES; i++) {</div><div class='del'>-			sprintf(s, "mode:%s", cirrusfb_predefined[i].name);</div><div class='del'>-			if (strcmp(this_opt, s) == 0)</div><div class='del'>-				cirrusfb_def_mode = i;</div><div class='del'>-		}</div><div class='ctx'> 		if (!strcmp(this_opt, "noaccel"))</div><div class='ctx'> 			noaccel = 1;</div><div class='add'>+		else if (!strncmp(this_opt, "mode:", 5))</div><div class='add'>+			mode_option = this_opt + 5;</div><div class='add'>+		else</div><div class='add'>+			mode_option = this_opt;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -2657,6 +2507,11 @@ static void __exit cirrusfb_exit(void)</div><div class='ctx'> </div><div class='ctx'> module_init(cirrusfb_init);</div><div class='ctx'> </div><div class='add'>+module_param(mode_option, charp, 0);</div><div class='add'>+MODULE_PARM_DESC(mode_option, "Initial video mode e.g. '648x480-8@60'");</div><div class='add'>+module_param(noaccel, bool, 0);</div><div class='add'>+MODULE_PARM_DESC(noaccel, "Disable acceleration");</div><div class='add'>+</div><div class='ctx'> #ifdef MODULE</div><div class='ctx'> module_exit(cirrusfb_exit);</div><div class='ctx'> #endif</div><div class='hunk'>@@ -3050,16 +2905,14 @@ static void cirrusfb_RectFill(u8 __iomem *regbase, int bits_per_pixel,</div><div class='ctx'>  * bestclock() - determine closest possible clock lower(?) than the</div><div class='ctx'>  * desired pixel clock</div><div class='ctx'>  **************************************************************************/</div><div class='del'>-static void bestclock(long freq, long *best, long *nom,</div><div class='del'>-		       long *den, long *div, long maxfreq)</div><div class='add'>+static void bestclock(long freq, int *nom, int *den, int *div)</div><div class='ctx'> {</div><div class='del'>-	long n, h, d, f;</div><div class='add'>+	int n, d;</div><div class='add'>+	long h, diff;</div><div class='ctx'> </div><div class='del'>-	assert(best != NULL);</div><div class='ctx'> 	assert(nom != NULL);</div><div class='ctx'> 	assert(den != NULL);</div><div class='ctx'> 	assert(div != NULL);</div><div class='del'>-	assert(maxfreq &gt; 0);</div><div class='ctx'> </div><div class='ctx'> 	*nom = 0;</div><div class='ctx'> 	*den = 0;</div><div class='hunk'>@@ -3070,51 +2923,47 @@ static void bestclock(long freq, long *best, long *nom,</div><div class='ctx'> 	if (freq &lt; 8000)</div><div class='ctx'> 		freq = 8000;</div><div class='ctx'> </div><div class='del'>-	if (freq &gt; maxfreq)</div><div class='del'>-		freq = maxfreq;</div><div class='del'>-</div><div class='del'>-	*best = 0;</div><div class='del'>-	f = freq * 10;</div><div class='add'>+	diff = freq;</div><div class='ctx'> </div><div class='ctx'> 	for (n = 32; n &lt; 128; n++) {</div><div class='del'>-		d = (143181 * n) / f;</div><div class='add'>+		int s = 0;</div><div class='add'>+</div><div class='add'>+		d = (14318 * n) / freq;</div><div class='ctx'> 		if ((d &gt;= 7) &amp;&amp; (d &lt;= 63)) {</div><div class='del'>-			if (d &gt; 31)</div><div class='del'>-				d = (d / 2) * 2;</div><div class='del'>-			h = (14318 * n) / d;</div><div class='del'>-			if (abs(h - freq) &lt; abs(*best - freq)) {</div><div class='del'>-				*best = h;</div><div class='add'>+			int temp = d;</div><div class='add'>+</div><div class='add'>+			if (temp &gt; 31) {</div><div class='add'>+				s = 1;</div><div class='add'>+				temp &gt;&gt;= 1;</div><div class='add'>+			}</div><div class='add'>+			h = ((14318 * n) / temp) &gt;&gt; s;</div><div class='add'>+			h = h &gt; freq ? h - freq : freq - h;</div><div class='add'>+			if (h &lt; diff) {</div><div class='add'>+				diff = h;</div><div class='ctx'> 				*nom = n;</div><div class='del'>-				if (d &lt; 32) {</div><div class='del'>-					*den = d;</div><div class='del'>-					*div = 0;</div><div class='del'>-				} else {</div><div class='del'>-					*den = d / 2;</div><div class='del'>-					*div = 1;</div><div class='del'>-				}</div><div class='add'>+				*den = temp;</div><div class='add'>+				*div = s;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		d = DIV_ROUND_UP(143181 * n, f);</div><div class='add'>+		d++;</div><div class='ctx'> 		if ((d &gt;= 7) &amp;&amp; (d &lt;= 63)) {</div><div class='del'>-			if (d &gt; 31)</div><div class='del'>-				d = (d / 2) * 2;</div><div class='del'>-			h = (14318 * n) / d;</div><div class='del'>-			if (abs(h - freq) &lt; abs(*best - freq)) {</div><div class='del'>-				*best = h;</div><div class='add'>+			if (d &gt; 31) {</div><div class='add'>+				s = 1;</div><div class='add'>+				d &gt;&gt;= 1;</div><div class='add'>+			}</div><div class='add'>+			h = ((14318 * n) / d) &gt;&gt; s;</div><div class='add'>+			h = h &gt; freq ? h - freq : freq - h;</div><div class='add'>+			if (h &lt; diff) {</div><div class='add'>+				diff = h;</div><div class='ctx'> 				*nom = n;</div><div class='del'>-				if (d &lt; 32) {</div><div class='del'>-					*den = d;</div><div class='del'>-					*div = 0;</div><div class='del'>-				} else {</div><div class='del'>-					*den = d / 2;</div><div class='del'>-					*div = 1;</div><div class='del'>-				}</div><div class='add'>+				*den = d;</div><div class='add'>+				*div = s;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	DPRINTK("Best possible values for given frequency:\n");</div><div class='del'>-	DPRINTK("	best: %ld kHz  nom: %ld  den: %ld  div: %ld\n",</div><div class='add'>+	DPRINTK("	freq: %ld kHz  nom: %d  den: %d  div: %d\n",</div><div class='ctx'> 		freq, *nom, *den, *div);</div><div class='ctx'> </div><div class='ctx'> 	DPRINTK("EXIT\n");</div><div class='head'>diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig<br/>index 06f87b04f207..2f50a80b413e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/console/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/video/console/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/console/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/console/Kconfig</a></div><div class='hunk'>@@ -43,22 +43,6 @@ config VGACON_SOFT_SCROLLBACK_SIZE</div><div class='ctx'> 	 buffer.  Each 64KB will give you approximately 16 80x25</div><div class='ctx'> 	 screenfuls of scrollback buffer</div><div class='ctx'> </div><div class='del'>-config VIDEO_SELECT</div><div class='del'>-	bool "Video mode selection support"</div><div class='del'>-	depends on  X86 &amp;&amp; VGA_CONSOLE</div><div class='del'>-	---help---</div><div class='del'>-	  This enables support for text mode selection on kernel startup. If</div><div class='del'>-	  you want to take advantage of some high-resolution text mode your</div><div class='del'>-	  card's BIOS offers, but the traditional Linux utilities like</div><div class='del'>-	  SVGATextMode don't, you can say Y here and set the mode using the</div><div class='del'>-	  "vga=" option from your boot loader (lilo or loadlin) or set</div><div class='del'>-	  "vga=ask" which brings up a video mode menu on kernel startup. (Try</div><div class='del'>-	  "man bootparam" or see the documentation of your boot loader about</div><div class='del'>-	  how to pass options to the kernel.)</div><div class='del'>-</div><div class='del'>-	  Read the file &lt;file:Documentation/svga.txt&gt; for more information</div><div class='del'>-	  about the Video mode selection support. If unsure, say N.</div><div class='del'>-</div><div class='ctx'> config MDA_CONSOLE</div><div class='ctx'> 	depends on !M68K &amp;&amp; !PARISC &amp;&amp; ISA</div><div class='ctx'> 	tristate "MDA text console (dual-headed) (EXPERIMENTAL)"</div><div class='head'>diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c<br/>index 9cbff84b787d..64b3d30027b8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/console/fbcon.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/video/console/fbcon.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/console/fbcon.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/console/fbcon.c</a></div><div class='hunk'>@@ -1855,8 +1855,6 @@ static int fbcon_scroll(struct vc_data *vc, int t, int b, int dir,</div><div class='ctx'> 	struct fb_info *info = registered_fb[con2fb_map[vc-&gt;vc_num]];</div><div class='ctx'> 	struct display *p = &amp;fb_display[vc-&gt;vc_num];</div><div class='ctx'> 	int scroll_partial = info-&gt;flags &amp; FBINFO_PARTIAL_PAN_OK;</div><div class='del'>-	unsigned short saved_ec;</div><div class='del'>-	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (fbcon_is_inactive(vc, info))</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -1869,11 +1867,6 @@ static int fbcon_scroll(struct vc_data *vc, int t, int b, int dir,</div><div class='ctx'> 	 *           whole screen (prevents flicker).</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	saved_ec = vc-&gt;vc_video_erase_char;</div><div class='del'>-	vc-&gt;vc_video_erase_char = vc-&gt;vc_scrl_erase_char;</div><div class='del'>-</div><div class='del'>-	ret = 0;</div><div class='del'>-</div><div class='ctx'> 	switch (dir) {</div><div class='ctx'> 	case SM_UP:</div><div class='ctx'> 		if (count &gt; vc-&gt;vc_rows)	/* Maximum realistic size */</div><div class='hunk'>@@ -1890,9 +1883,9 @@ static int fbcon_scroll(struct vc_data *vc, int t, int b, int dir,</div><div class='ctx'> 			scr_memsetw((unsigned short *) (vc-&gt;vc_origin +</div><div class='ctx'> 							vc-&gt;vc_size_row *</div><div class='ctx'> 							(b - count)),</div><div class='del'>-				    vc-&gt;vc_scrl_erase_char,</div><div class='add'>+				    vc-&gt;vc_video_erase_char,</div><div class='ctx'> 				    vc-&gt;vc_size_row * count);</div><div class='del'>-			ret = 1;</div><div class='add'>+			return 1;</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case SCROLL_WRAP_MOVE:</div><div class='hunk'>@@ -1962,10 +1955,9 @@ static int fbcon_scroll(struct vc_data *vc, int t, int b, int dir,</div><div class='ctx'> 			scr_memsetw((unsigned short *) (vc-&gt;vc_origin +</div><div class='ctx'> 							vc-&gt;vc_size_row *</div><div class='ctx'> 							(b - count)),</div><div class='del'>-				    vc-&gt;vc_scrl_erase_char,</div><div class='add'>+				    vc-&gt;vc_video_erase_char,</div><div class='ctx'> 				    vc-&gt;vc_size_row * count);</div><div class='del'>-			ret = 1;</div><div class='del'>-			break;</div><div class='add'>+			return 1;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='hunk'>@@ -1982,9 +1974,9 @@ static int fbcon_scroll(struct vc_data *vc, int t, int b, int dir,</div><div class='ctx'> 			scr_memsetw((unsigned short *) (vc-&gt;vc_origin +</div><div class='ctx'> 							vc-&gt;vc_size_row *</div><div class='ctx'> 							t),</div><div class='del'>-				    vc-&gt;vc_scrl_erase_char,</div><div class='add'>+				    vc-&gt;vc_video_erase_char,</div><div class='ctx'> 				    vc-&gt;vc_size_row * count);</div><div class='del'>-			ret = 1;</div><div class='add'>+			return 1;</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case SCROLL_WRAP_MOVE:</div><div class='hunk'>@@ -2052,15 +2044,12 @@ static int fbcon_scroll(struct vc_data *vc, int t, int b, int dir,</div><div class='ctx'> 			scr_memsetw((unsigned short *) (vc-&gt;vc_origin +</div><div class='ctx'> 							vc-&gt;vc_size_row *</div><div class='ctx'> 							t),</div><div class='del'>-				    vc-&gt;vc_scrl_erase_char,</div><div class='add'>+				    vc-&gt;vc_video_erase_char,</div><div class='ctx'> 				    vc-&gt;vc_size_row * count);</div><div class='del'>-			ret = 1;</div><div class='del'>-			break;</div><div class='add'>+			return 1;</div><div class='ctx'> 		}</div><div class='del'>-		break;</div><div class='ctx'> 	}</div><div class='del'>-	vc-&gt;vc_video_erase_char = saved_ec;</div><div class='del'>-	return ret;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -2522,9 +2511,6 @@ static int fbcon_do_set_font(struct vc_data *vc, int w, int h,</div><div class='ctx'> 			c = vc-&gt;vc_video_erase_char;</div><div class='ctx'> 			vc-&gt;vc_video_erase_char =</div><div class='ctx'> 			    ((c &amp; 0xfe00) &gt;&gt; 1) | (c &amp; 0xff);</div><div class='del'>-			c = vc-&gt;vc_scrl_erase_char;</div><div class='del'>-			vc-&gt;vc_scrl_erase_char =</div><div class='del'>-			    ((c &amp; 0xFE00) &gt;&gt; 1) | (c &amp; 0xFF);</div><div class='ctx'> 			vc-&gt;vc_attr &gt;&gt;= 1;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else if (!vc-&gt;vc_hi_font_mask &amp;&amp; cnt == 512) {</div><div class='hunk'>@@ -2555,14 +2541,9 @@ static int fbcon_do_set_font(struct vc_data *vc, int w, int h,</div><div class='ctx'> 			if (vc-&gt;vc_can_do_color) {</div><div class='ctx'> 				vc-&gt;vc_video_erase_char =</div><div class='ctx'> 				    ((c &amp; 0xff00) &lt;&lt; 1) | (c &amp; 0xff);</div><div class='del'>-				c = vc-&gt;vc_scrl_erase_char;</div><div class='del'>-				vc-&gt;vc_scrl_erase_char =</div><div class='del'>-				    ((c &amp; 0xFF00) &lt;&lt; 1) | (c &amp; 0xFF);</div><div class='ctx'> 				vc-&gt;vc_attr &lt;&lt;= 1;</div><div class='del'>-			} else {</div><div class='add'>+			} else</div><div class='ctx'> 				vc-&gt;vc_video_erase_char = c &amp; ~0x100;</div><div class='del'>-				vc-&gt;vc_scrl_erase_char = c &amp; ~0x100;</div><div class='del'>-			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 	}</div><div class='hunk'>@@ -2996,8 +2977,8 @@ static void fbcon_set_all_vcs(struct fb_info *info)</div><div class='ctx'> 		p = &amp;fb_display[vc-&gt;vc_num];</div><div class='ctx'> 		set_blitting_type(vc, info);</div><div class='ctx'> 		var_to_display(p, &amp;info-&gt;var, info);</div><div class='del'>-		cols = FBCON_SWAP(p-&gt;rotate, info-&gt;var.xres, info-&gt;var.yres);</div><div class='del'>-		rows = FBCON_SWAP(p-&gt;rotate, info-&gt;var.yres, info-&gt;var.xres);</div><div class='add'>+		cols = FBCON_SWAP(ops-&gt;rotate, info-&gt;var.xres, info-&gt;var.yres);</div><div class='add'>+		rows = FBCON_SWAP(ops-&gt;rotate, info-&gt;var.yres, info-&gt;var.xres);</div><div class='ctx'> 		cols /= vc-&gt;vc_font.width;</div><div class='ctx'> 		rows /= vc-&gt;vc_font.height;</div><div class='ctx'> 		vc_resize(vc, cols, rows);</div><div class='hunk'>@@ -3592,8 +3573,8 @@ static int __init fb_console_init(void)</div><div class='ctx'> </div><div class='ctx'> 	acquire_console_sem();</div><div class='ctx'> 	fb_register_client(&amp;fbcon_event_notifier);</div><div class='del'>-	fbcon_device = device_create_drvdata(fb_class, NULL, MKDEV(0, 0),</div><div class='del'>-					     NULL, "fbcon");</div><div class='add'>+	fbcon_device = device_create(fb_class, NULL, MKDEV(0, 0), NULL,</div><div class='add'>+				     "fbcon");</div><div class='ctx'> </div><div class='ctx'> 	if (IS_ERR(fbcon_device)) {</div><div class='ctx'> 		printk(KERN_WARNING "Unable to create device "</div><div class='head'>diff --git a/drivers/video/console/mdacon.c b/drivers/video/console/mdacon.c<br/>index 9901064199bd..dd3eaaad4441 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/console/mdacon.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/video/console/mdacon.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/console/mdacon.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/console/mdacon.c</a></div><div class='hunk'>@@ -533,7 +533,7 @@ static void mdacon_cursor(struct vc_data *c, int mode)</div><div class='ctx'> </div><div class='ctx'> static int mdacon_scroll(struct vc_data *c, int t, int b, int dir, int lines)</div><div class='ctx'> {</div><div class='del'>-	u16 eattr = mda_convert_attr(c-&gt;vc_scrl_erase_char);</div><div class='add'>+	u16 eattr = mda_convert_attr(c-&gt;vc_video_erase_char);</div><div class='ctx'> </div><div class='ctx'> 	if (!lines)</div><div class='ctx'> 		return 0;</div><div class='head'>diff --git a/drivers/video/console/sticon.c b/drivers/video/console/sticon.c<br/>index 4055dbdd1b42..491c1c1baf4c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/console/sticon.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/video/console/sticon.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/console/sticon.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/console/sticon.c</a></div><div class='hunk'>@@ -170,12 +170,12 @@ static int sticon_scroll(struct vc_data *conp, int t, int b, int dir, int count)</div><div class='ctx'>     switch (dir) {</div><div class='ctx'>     case SM_UP:</div><div class='ctx'> 	sti_bmove(sti, t + count, 0, t, 0, b - t - count, conp-&gt;vc_cols);</div><div class='del'>-	sti_clear(sti, b - count, 0, count, conp-&gt;vc_cols, conp-&gt;vc_scrl_erase_char);</div><div class='add'>+	sti_clear(sti, b - count, 0, count, conp-&gt;vc_cols, conp-&gt;vc_video_erase_char);</div><div class='ctx'> 	break;</div><div class='ctx'> </div><div class='ctx'>     case SM_DOWN:</div><div class='ctx'> 	sti_bmove(sti, t, 0, t + count, 0, b - t - count, conp-&gt;vc_cols);</div><div class='del'>-	sti_clear(sti, t, 0, count, conp-&gt;vc_cols, conp-&gt;vc_scrl_erase_char);</div><div class='add'>+	sti_clear(sti, t, 0, count, conp-&gt;vc_cols, conp-&gt;vc_video_erase_char);</div><div class='ctx'> 	break;</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/video/console/vgacon.c b/drivers/video/console/vgacon.c<br/>index bd1f57b259d9..448d209a0bf2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/console/vgacon.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/video/console/vgacon.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/console/vgacon.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/console/vgacon.c</a></div><div class='hunk'>@@ -239,8 +239,7 @@ static void vgacon_restore_screen(struct vc_data *c)</div><div class='ctx'> </div><div class='ctx'> static int vgacon_scrolldelta(struct vc_data *c, int lines)</div><div class='ctx'> {</div><div class='del'>-	int start, end, count, soff, diff;</div><div class='del'>-	void *d, *s;</div><div class='add'>+	int start, end, count, soff;</div><div class='ctx'> </div><div class='ctx'> 	if (!lines) {</div><div class='ctx'> 		c-&gt;vc_visible_origin = c-&gt;vc_origin;</div><div class='hunk'>@@ -287,29 +286,29 @@ static int vgacon_scrolldelta(struct vc_data *c, int lines)</div><div class='ctx'> 	if (count &gt; c-&gt;vc_rows)</div><div class='ctx'> 		count = c-&gt;vc_rows;</div><div class='ctx'> </div><div class='del'>-	diff = c-&gt;vc_rows - count;</div><div class='add'>+	if (count) {</div><div class='add'>+		int copysize;</div><div class='ctx'> </div><div class='del'>-	d = (void *) c-&gt;vc_origin;</div><div class='del'>-	s = (void *) c-&gt;vc_screenbuf;</div><div class='add'>+		int diff = c-&gt;vc_rows - count;</div><div class='add'>+		void *d = (void *) c-&gt;vc_origin;</div><div class='add'>+		void *s = (void *) c-&gt;vc_screenbuf;</div><div class='ctx'> </div><div class='del'>-	while (count--) {</div><div class='del'>-		scr_memcpyw(d, vgacon_scrollback + soff, c-&gt;vc_size_row);</div><div class='del'>-		d += c-&gt;vc_size_row;</div><div class='del'>-		soff += c-&gt;vc_size_row;</div><div class='add'>+		count *= c-&gt;vc_size_row;</div><div class='add'>+		/* how much memory to end of buffer left? */</div><div class='add'>+		copysize = min(count, vgacon_scrollback_size - soff);</div><div class='add'>+		scr_memcpyw(d, vgacon_scrollback + soff, copysize);</div><div class='add'>+		d += copysize;</div><div class='add'>+		count -= copysize;</div><div class='ctx'> </div><div class='del'>-		if (soff &gt;= vgacon_scrollback_size)</div><div class='del'>-			soff = 0;</div><div class='del'>-	}</div><div class='add'>+		if (count) {</div><div class='add'>+			scr_memcpyw(d, vgacon_scrollback, count);</div><div class='add'>+			d += count;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	if (diff == c-&gt;vc_rows) {</div><div class='add'>+		if (diff)</div><div class='add'>+			scr_memcpyw(d, s, diff * c-&gt;vc_size_row);</div><div class='add'>+	} else</div><div class='ctx'> 		vgacon_cursor(c, CM_MOVE);</div><div class='del'>-	} else {</div><div class='del'>-		while (diff--) {</div><div class='del'>-			scr_memcpyw(d, s, c-&gt;vc_size_row);</div><div class='del'>-			d += c-&gt;vc_size_row;</div><div class='del'>-			s += c-&gt;vc_size_row;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='hunk'>@@ -1350,7 +1349,7 @@ static int vgacon_scroll(struct vc_data *c, int t, int b, int dir,</div><div class='ctx'> 		} else</div><div class='ctx'> 			c-&gt;vc_origin += delta;</div><div class='ctx'> 		scr_memsetw((u16 *) (c-&gt;vc_origin + c-&gt;vc_screenbuf_size -</div><div class='del'>-				     delta), c-&gt;vc_scrl_erase_char,</div><div class='add'>+				     delta), c-&gt;vc_video_erase_char,</div><div class='ctx'> 			    delta);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (oldo - delta &lt; vga_vram_base) {</div><div class='hunk'>@@ -1363,7 +1362,7 @@ static int vgacon_scroll(struct vc_data *c, int t, int b, int dir,</div><div class='ctx'> 		} else</div><div class='ctx'> 			c-&gt;vc_origin -= delta;</div><div class='ctx'> 		c-&gt;vc_scr_end = c-&gt;vc_origin + c-&gt;vc_screenbuf_size;</div><div class='del'>-		scr_memsetw((u16 *) (c-&gt;vc_origin), c-&gt;vc_scrl_erase_char,</div><div class='add'>+		scr_memsetw((u16 *) (c-&gt;vc_origin), c-&gt;vc_video_erase_char,</div><div class='ctx'> 			    delta);</div><div class='ctx'> 	}</div><div class='ctx'> 	c-&gt;vc_scr_end = c-&gt;vc_origin + c-&gt;vc_screenbuf_size;</div><div class='head'>diff --git a/drivers/video/display/display-sysfs.c b/drivers/video/display/display-sysfs.c<br/>index 6ef800bdf482..4830b1bf51e5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/display/display-sysfs.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/video/display/display-sysfs.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/display/display-sysfs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/display/display-sysfs.c</a></div><div class='hunk'>@@ -153,12 +153,9 @@ struct display_device *display_device_register(struct display_driver *driver,</div><div class='ctx'> 		mutex_unlock(&amp;allocated_dsp_lock);</div><div class='ctx'> </div><div class='ctx'> 		if (!ret) {</div><div class='del'>-			new_dev-&gt;dev = device_create_drvdata(display_class,</div><div class='del'>-							     parent,</div><div class='del'>-							     MKDEV(0,0),</div><div class='del'>-							     new_dev,</div><div class='del'>-							     "display%d",</div><div class='del'>-							     new_dev-&gt;idx);</div><div class='add'>+			new_dev-&gt;dev = device_create(display_class, parent,</div><div class='add'>+						     MKDEV(0, 0), new_dev,</div><div class='add'>+						     "display%d", new_dev-&gt;idx);</div><div class='ctx'> 			if (!IS_ERR(new_dev-&gt;dev)) {</div><div class='ctx'> 				new_dev-&gt;parent = parent;</div><div class='ctx'> 				new_dev-&gt;driver = driver;</div><div class='head'>diff --git a/drivers/video/efifb.c b/drivers/video/efifb.c<br/>index bd779ae44b1e..daf9b81878a4 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/efifb.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/video/efifb.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/efifb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/efifb.c</a></div><div class='hunk'>@@ -12,6 +12,7 @@</div><div class='ctx'> #include &lt;linux/fb.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/screen_info.h&gt;</div><div class='add'>+#include &lt;linux/dmi.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;video/vga.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -33,6 +34,105 @@ static struct fb_fix_screeninfo efifb_fix __initdata = {</div><div class='ctx'> 	.visual			= FB_VISUAL_TRUECOLOR,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum {</div><div class='add'>+	M_I17,		/* 17-Inch iMac */</div><div class='add'>+	M_I20,		/* 20-Inch iMac */</div><div class='add'>+	M_I20_SR,	/* 20-Inch iMac (Santa Rosa) */</div><div class='add'>+	M_I24,		/* 24-Inch iMac */</div><div class='add'>+	M_MINI,		/* Mac Mini */</div><div class='add'>+	M_MB,		/* MacBook */</div><div class='add'>+	M_MB_2,		/* MacBook, 2nd rev. */</div><div class='add'>+	M_MB_3,		/* MacBook, 3rd rev. */</div><div class='add'>+	M_MB_SR,	/* MacBook, 2nd gen, (Santa Rosa) */</div><div class='add'>+	M_MBA,		/* MacBook Air */</div><div class='add'>+	M_MBP,		/* MacBook Pro */</div><div class='add'>+	M_MBP_2,	/* MacBook Pro 2nd gen */</div><div class='add'>+	M_MBP_SR,	/* MacBook Pro (Santa Rosa) */</div><div class='add'>+	M_MBP_4,	/* MacBook Pro, 4th gen */</div><div class='add'>+	M_UNKNOWN	/* placeholder */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct efifb_dmi_info {</div><div class='add'>+	char *optname;</div><div class='add'>+	unsigned long base;</div><div class='add'>+	int stride;</div><div class='add'>+	int width;</div><div class='add'>+	int height;</div><div class='add'>+} dmi_list[] = {</div><div class='add'>+	[M_I17] = { "i17", 0x80010000, 1472 * 4, 1440, 900 },</div><div class='add'>+	[M_I20] = { "i20", 0x80010000, 1728 * 4, 1680, 1050 }, /* guess */</div><div class='add'>+	[M_I20_SR] = { "imac7", 0x40010000, 1728 * 4, 1680, 1050 },</div><div class='add'>+	[M_I24] = { "i24", 0x80010000, 2048 * 4, 1920, 1200 }, /* guess */</div><div class='add'>+	[M_MINI]= { "mini", 0x80000000, 2048 * 4, 1024, 768 },</div><div class='add'>+	[M_MB] = { "macbook", 0x80000000, 2048 * 4, 1280, 800 },</div><div class='add'>+	[M_MBA] = { "mba", 0x80000000, 2048 * 4, 1280, 800 },</div><div class='add'>+	[M_MBP] = { "mbp", 0x80010000, 1472 * 4, 1440, 900 },</div><div class='add'>+	[M_MBP_2] = { "mbp2", 0, 0, 0, 0 }, /* placeholder */</div><div class='add'>+	[M_MBP_SR] = { "mbp3", 0x80030000, 2048 * 4, 1440, 900 },</div><div class='add'>+	[M_MBP_4] = { "mbp4", 0xc0060000, 2048 * 4, 1920, 1200 },</div><div class='add'>+	[M_UNKNOWN] = { NULL, 0, 0, 0, 0 }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int set_system(const struct dmi_system_id *id);</div><div class='add'>+</div><div class='add'>+#define EFIFB_DMI_SYSTEM_ID(vendor, name, enumid)		\</div><div class='add'>+	{ set_system, name, {					\</div><div class='add'>+		DMI_MATCH(DMI_BIOS_VENDOR, vendor),		\</div><div class='add'>+		DMI_MATCH(DMI_PRODUCT_NAME, name) },		\</div><div class='add'>+	  &amp;dmi_list[enumid] }</div><div class='add'>+</div><div class='add'>+static struct dmi_system_id __initdata dmi_system_table[] = {</div><div class='add'>+	EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "iMac4,1", M_I17),</div><div class='add'>+	/* At least one of these two will be right; maybe both? */</div><div class='add'>+	EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "iMac5,1", M_I20),</div><div class='add'>+	EFIFB_DMI_SYSTEM_ID("Apple Inc.", "iMac5,1", M_I20),</div><div class='add'>+	/* At least one of these two will be right; maybe both? */</div><div class='add'>+	EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "iMac6,1", M_I24),</div><div class='add'>+	EFIFB_DMI_SYSTEM_ID("Apple Inc.", "iMac6,1", M_I24),</div><div class='add'>+	EFIFB_DMI_SYSTEM_ID("Apple Inc.", "iMac7,1", M_I20_SR),</div><div class='add'>+	EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "Macmini1,1", M_MINI),</div><div class='add'>+	EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBook1,1", M_MB),</div><div class='add'>+	/* At least one of these two will be right; maybe both? */</div><div class='add'>+	EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBook2,1", M_MB),</div><div class='add'>+	EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBook2,1", M_MB),</div><div class='add'>+	/* At least one of these two will be right; maybe both? */</div><div class='add'>+	EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBook3,1", M_MB),</div><div class='add'>+	EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBook3,1", M_MB),</div><div class='add'>+	EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBook4,1", M_MB),</div><div class='add'>+	EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBookAir1,1", M_MBA),</div><div class='add'>+	EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBookPro1,1", M_MBP),</div><div class='add'>+	EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBookPro2,1", M_MBP_2),</div><div class='add'>+	EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBookPro2,1", M_MBP_2),</div><div class='add'>+	EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBookPro3,1", M_MBP_SR),</div><div class='add'>+	EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBookPro3,1", M_MBP_SR),</div><div class='add'>+	EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBookPro4,1", M_MBP_4),</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int set_system(const struct dmi_system_id *id)</div><div class='add'>+{</div><div class='add'>+	struct efifb_dmi_info *info = id-&gt;driver_data;</div><div class='add'>+	if (info-&gt;base == 0)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "efifb: dmi detected %s - framebuffer at %p "</div><div class='add'>+			 "(%dx%d, stride %d)\n", id-&gt;ident,</div><div class='add'>+			 (void *)info-&gt;base, info-&gt;width, info-&gt;height,</div><div class='add'>+			 info-&gt;stride);</div><div class='add'>+</div><div class='add'>+	/* Trust the bootloader over the DMI tables */</div><div class='add'>+	if (screen_info.lfb_base == 0)</div><div class='add'>+		screen_info.lfb_base = info-&gt;base;</div><div class='add'>+	if (screen_info.lfb_linelength == 0)</div><div class='add'>+		screen_info.lfb_linelength = info-&gt;stride;</div><div class='add'>+	if (screen_info.lfb_width == 0)</div><div class='add'>+		screen_info.lfb_width = info-&gt;width;</div><div class='add'>+	if (screen_info.lfb_height == 0)</div><div class='add'>+		screen_info.lfb_height = info-&gt;height;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int efifb_setcolreg(unsigned regno, unsigned red, unsigned green,</div><div class='ctx'> 			   unsigned blue, unsigned transp,</div><div class='ctx'> 			   struct fb_info *info)</div><div class='hunk'>@@ -67,6 +167,38 @@ static struct fb_ops efifb_ops = {</div><div class='ctx'> 	.fb_imageblit	= cfb_imageblit,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static int __init efifb_setup(char *options)</div><div class='add'>+{</div><div class='add'>+	char *this_opt;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!options || !*options)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	while ((this_opt = strsep(&amp;options, ",")) != NULL) {</div><div class='add'>+		if (!*this_opt) continue;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; M_UNKNOWN; i++) {</div><div class='add'>+			if (!strcmp(this_opt, dmi_list[i].optname) &amp;&amp;</div><div class='add'>+					dmi_list[i].base != 0) {</div><div class='add'>+				screen_info.lfb_base = dmi_list[i].base;</div><div class='add'>+				screen_info.lfb_linelength = dmi_list[i].stride;</div><div class='add'>+				screen_info.lfb_width = dmi_list[i].width;</div><div class='add'>+				screen_info.lfb_height = dmi_list[i].height;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if (!strncmp(this_opt, "base:", 5))</div><div class='add'>+			screen_info.lfb_base = simple_strtoul(this_opt+5, NULL, 0);</div><div class='add'>+		else if (!strncmp(this_opt, "stride:", 7))</div><div class='add'>+			screen_info.lfb_linelength = simple_strtoul(this_opt+7, NULL, 0) * 4;</div><div class='add'>+		else if (!strncmp(this_opt, "height:", 7))</div><div class='add'>+			screen_info.lfb_height = simple_strtoul(this_opt+7, NULL, 0);</div><div class='add'>+		else if (!strncmp(this_opt, "width:", 6))</div><div class='add'>+			screen_info.lfb_width = simple_strtoul(this_opt+6, NULL, 0);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int __init efifb_probe(struct platform_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct fb_info *info;</div><div class='hunk'>@@ -74,6 +206,26 @@ static int __init efifb_probe(struct platform_device *dev)</div><div class='ctx'> 	unsigned int size_vmode;</div><div class='ctx'> 	unsigned int size_remap;</div><div class='ctx'> 	unsigned int size_total;</div><div class='add'>+	int request_succeeded = 0;</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "efifb: probing for efifb\n");</div><div class='add'>+</div><div class='add'>+	if (!screen_info.lfb_depth)</div><div class='add'>+		screen_info.lfb_depth = 32;</div><div class='add'>+	if (!screen_info.pages)</div><div class='add'>+		screen_info.pages = 1;</div><div class='add'>+</div><div class='add'>+	/* just assume they're all unset if any are */</div><div class='add'>+	if (!screen_info.blue_size) {</div><div class='add'>+		screen_info.blue_size = 8;</div><div class='add'>+		screen_info.blue_pos = 0;</div><div class='add'>+		screen_info.green_size = 8;</div><div class='add'>+		screen_info.green_pos = 8;</div><div class='add'>+		screen_info.red_size = 8;</div><div class='add'>+		screen_info.red_pos = 16;</div><div class='add'>+		screen_info.rsvd_size = 8;</div><div class='add'>+		screen_info.rsvd_pos = 24;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	efifb_fix.smem_start = screen_info.lfb_base;</div><div class='ctx'> 	efifb_defined.bits_per_pixel = screen_info.lfb_depth;</div><div class='hunk'>@@ -98,21 +250,25 @@ static int __init efifb_probe(struct platform_device *dev)</div><div class='ctx'> 	 *                 option to simply use size_total as that</div><div class='ctx'> 	 *                 wastes plenty of kernel address space. */</div><div class='ctx'> 	size_remap  = size_vmode * 2;</div><div class='del'>-	if (size_remap &lt; size_vmode)</div><div class='del'>-		size_remap = size_vmode;</div><div class='ctx'> 	if (size_remap &gt; size_total)</div><div class='ctx'> 		size_remap = size_total;</div><div class='add'>+	if (size_remap % PAGE_SIZE)</div><div class='add'>+		size_remap += PAGE_SIZE - (size_remap % PAGE_SIZE);</div><div class='ctx'> 	efifb_fix.smem_len = size_remap;</div><div class='ctx'> </div><div class='del'>-	if (!request_mem_region(efifb_fix.smem_start, size_total, "efifb"))</div><div class='add'>+	if (request_mem_region(efifb_fix.smem_start, size_remap, "efifb")) {</div><div class='add'>+		request_succeeded = 1;</div><div class='add'>+	} else {</div><div class='ctx'> 		/* We cannot make this fatal. Sometimes this comes from magic</div><div class='ctx'> 		   spaces our resource handlers simply don't know about */</div><div class='ctx'> 		printk(KERN_WARNING</div><div class='ctx'> 		       "efifb: cannot reserve video memory at 0x%lx\n",</div><div class='ctx'> 			efifb_fix.smem_start);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	info = framebuffer_alloc(sizeof(u32) * 16, &amp;dev-&gt;dev);</div><div class='ctx'> 	if (!info) {</div><div class='add'>+		printk(KERN_ERR "efifb: cannot allocate framebuffer\n");</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto err_release_mem;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -125,7 +281,7 @@ static int __init efifb_probe(struct platform_device *dev)</div><div class='ctx'> 				"0x%x @ 0x%lx\n",</div><div class='ctx'> 			efifb_fix.smem_len, efifb_fix.smem_start);</div><div class='ctx'> 		err = -EIO;</div><div class='del'>-		goto err_unmap;</div><div class='add'>+		goto err_release_fb;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_INFO "efifb: framebuffer at 0x%lx, mapped to 0x%p, "</div><div class='hunk'>@@ -178,25 +334,27 @@ static int __init efifb_probe(struct platform_device *dev)</div><div class='ctx'> 	info-&gt;fix = efifb_fix;</div><div class='ctx'> 	info-&gt;flags = FBINFO_FLAG_DEFAULT;</div><div class='ctx'> </div><div class='del'>-	if (fb_alloc_cmap(&amp;info-&gt;cmap, 256, 0) &lt; 0) {</div><div class='del'>-		err = -ENOMEM;</div><div class='add'>+	if ((err = fb_alloc_cmap(&amp;info-&gt;cmap, 256, 0)) &lt; 0) {</div><div class='add'>+		printk(KERN_ERR "efifb: cannot allocate colormap\n");</div><div class='ctx'> 		goto err_unmap;</div><div class='ctx'> 	}</div><div class='del'>-	if (register_framebuffer(info) &lt; 0) {</div><div class='del'>-		err = -EINVAL;</div><div class='add'>+	if ((err = register_framebuffer(info)) &lt; 0) {</div><div class='add'>+		printk(KERN_ERR "efifb: cannot register framebuffer\n");</div><div class='ctx'> 		goto err_fb_dealoc;</div><div class='ctx'> 	}</div><div class='ctx'> 	printk(KERN_INFO "fb%d: %s frame buffer device\n",</div><div class='del'>-	       info-&gt;node, info-&gt;fix.id);</div><div class='add'>+		info-&gt;node, info-&gt;fix.id);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err_fb_dealoc:</div><div class='ctx'> 	fb_dealloc_cmap(&amp;info-&gt;cmap);</div><div class='ctx'> err_unmap:</div><div class='ctx'> 	iounmap(info-&gt;screen_base);</div><div class='add'>+err_release_fb:</div><div class='ctx'> 	framebuffer_release(info);</div><div class='ctx'> err_release_mem:</div><div class='del'>-	release_mem_region(efifb_fix.smem_start, size_total);</div><div class='add'>+	if (request_succeeded)</div><div class='add'>+		release_mem_region(efifb_fix.smem_start, size_total);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -214,9 +372,22 @@ static struct platform_device efifb_device = {</div><div class='ctx'> static int __init efifb_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='add'>+	char *option = NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (screen_info.orig_video_isVGA != VIDEO_TYPE_EFI)</div><div class='ctx'> 		return -ENODEV;</div><div class='add'>+	dmi_check_system(dmi_system_table);</div><div class='add'>+</div><div class='add'>+	if (fb_get_options("efifb", &amp;option))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	efifb_setup(option);</div><div class='add'>+</div><div class='add'>+	/* We don't get linelength from UGA Draw Protocol, only from</div><div class='add'>+	 * EFI Graphics Protocol.  So if it's not in DMI, and it's not</div><div class='add'>+	 * passed in from the user, we really can't use the framebuffer.</div><div class='add'>+	 */</div><div class='add'>+	if (!screen_info.lfb_linelength)</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	ret = platform_driver_register(&amp;efifb_driver);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c<br/>index 98843c2ecf73..217c5118ae9e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/fbmem.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/video/fbmem.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/fbmem.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/fbmem.c</a></div><div class='hunk'>@@ -28,9 +28,7 @@</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;linux/console.h&gt;</div><div class='del'>-#ifdef CONFIG_KMOD</div><div class='ctx'> #include &lt;linux/kmod.h&gt;</div><div class='del'>-#endif</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/efi.h&gt;</div><div class='hunk'>@@ -837,13 +835,6 @@ fb_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos)</div><div class='ctx'> 	return (cnt) ? cnt : err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_KMOD</div><div class='del'>-static void try_to_load(int fb)</div><div class='del'>-{</div><div class='del'>-	request_module("fb%d", fb);</div><div class='del'>-}</div><div class='del'>-#endif /* CONFIG_KMOD */</div><div class='del'>-</div><div class='ctx'> int</div><div class='ctx'> fb_pan_display(struct fb_info *info, struct fb_var_screeninfo *var)</div><div class='ctx'> {</div><div class='hunk'>@@ -979,6 +970,7 @@ fb_set_var(struct fb_info *info, struct fb_var_screeninfo *var)</div><div class='ctx'> </div><div class='ctx'> 				info-&gt;flags &amp;= ~FBINFO_MISC_USEREVENT;</div><div class='ctx'> 				event.info = info;</div><div class='add'>+				event.data = &amp;mode;</div><div class='ctx'> 				fb_notifier_call_chain(evnt, &amp;event);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1085,10 +1077,8 @@ fb_ioctl(struct inode *inode, struct file *file, unsigned int cmd,</div><div class='ctx'> 		    return -EINVAL;</div><div class='ctx'> 		if (con2fb.framebuffer &lt; 0 || con2fb.framebuffer &gt;= FB_MAX)</div><div class='ctx'> 		    return -EINVAL;</div><div class='del'>-#ifdef CONFIG_KMOD</div><div class='ctx'> 		if (!registered_fb[con2fb.framebuffer])</div><div class='del'>-		    try_to_load(con2fb.framebuffer);</div><div class='del'>-#endif /* CONFIG_KMOD */</div><div class='add'>+		    request_module("fb%d", con2fb.framebuffer);</div><div class='ctx'> 		if (!registered_fb[con2fb.framebuffer])</div><div class='ctx'> 		    return -EINVAL;</div><div class='ctx'> 		event.info = info;</div><div class='hunk'>@@ -1326,10 +1316,8 @@ fb_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	if (fbidx &gt;= FB_MAX)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	lock_kernel();</div><div class='del'>-#ifdef CONFIG_KMOD</div><div class='ctx'> 	if (!(info = registered_fb[fbidx]))</div><div class='del'>-		try_to_load(fbidx);</div><div class='del'>-#endif /* CONFIG_KMOD */</div><div class='add'>+		request_module("fb%d", fbidx);</div><div class='ctx'> 	if (!(info = registered_fb[fbidx])) {</div><div class='ctx'> 		res = -ENODEV;</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -1442,9 +1430,8 @@ register_framebuffer(struct fb_info *fb_info)</div><div class='ctx'> 			break;</div><div class='ctx'> 	fb_info-&gt;node = i;</div><div class='ctx'> </div><div class='del'>-	fb_info-&gt;dev = device_create_drvdata(fb_class, fb_info-&gt;device,</div><div class='del'>-					     MKDEV(FB_MAJOR, i), NULL,</div><div class='del'>-					     "fb%d", i);</div><div class='add'>+	fb_info-&gt;dev = device_create(fb_class, fb_info-&gt;device,</div><div class='add'>+				     MKDEV(FB_MAJOR, i), NULL, "fb%d", i);</div><div class='ctx'> 	if (IS_ERR(fb_info-&gt;dev)) {</div><div class='ctx'> 		/* Not fatal */</div><div class='ctx'> 		printk(KERN_WARNING "Unable to create device for framebuffer %d; errno = %ld\n", i, PTR_ERR(fb_info-&gt;dev));</div><div class='head'>diff --git a/drivers/video/fbmon.c b/drivers/video/fbmon.c<br/>index 6a0aa180c266..5c1a2c01778f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/fbmon.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/video/fbmon.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/fbmon.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/fbmon.c</a></div><div class='hunk'>@@ -564,7 +564,13 @@ static void get_detailed_timing(unsigned char *block,</div><div class='ctx'> 		mode-&gt;sync |= FB_SYNC_VERT_HIGH_ACT;</div><div class='ctx'> 	mode-&gt;refresh = PIXEL_CLOCK/((H_ACTIVE + H_BLANKING) *</div><div class='ctx'> 				     (V_ACTIVE + V_BLANKING));</div><div class='del'>-	mode-&gt;vmode = 0;</div><div class='add'>+	if (INTERLACED) {</div><div class='add'>+		mode-&gt;yres *= 2;</div><div class='add'>+		mode-&gt;upper_margin *= 2;</div><div class='add'>+		mode-&gt;lower_margin *= 2;</div><div class='add'>+		mode-&gt;vsync_len *= 2;</div><div class='add'>+		mode-&gt;vmode |= FB_VMODE_INTERLACED;</div><div class='add'>+	}</div><div class='ctx'> 	mode-&gt;flag = FB_MODE_IS_DETAILED;</div><div class='ctx'> </div><div class='ctx'> 	DPRINTK("      %d MHz ",  PIXEL_CLOCK/1000000);</div><div class='head'>diff --git a/drivers/video/ffb.c b/drivers/video/ffb.c<br/>index 7992b13ee68f..9dbb9646081f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/ffb.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/video/ffb.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/ffb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/ffb.c</a></div><div class='hunk'>@@ -1042,7 +1042,7 @@ static int __devexit ffb_remove(struct of_device *op)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct of_device_id ffb_match[] = {</div><div class='add'>+static const struct of_device_id ffb_match[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.name = "SUNW,ffb",</div><div class='ctx'> 	},</div><div class='head'>diff --git a/drivers/video/imacfb.c b/drivers/video/imacfb.c<br/>index 9366ef2bb5f7..e69de29bb2d1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/imacfb.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/video/imacfb.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/imacfb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/imacfb.c</a></div><div class='hunk'>@@ -1,376 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * framebuffer driver for Intel Based Mac's</div><div class='del'>- *</div><div class='del'>- * (c) 2006 Edgar Hucek &lt;gimli@dark-green.com&gt;</div><div class='del'>- * Original imac driver written by Gerd Knorr &lt;kraxel@goldbach.in-berlin.de&gt;</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/fb.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/ioport.h&gt;</div><div class='del'>-#include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/screen_info.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/dmi.h&gt;</div><div class='del'>-#include &lt;linux/efi.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;video/vga.h&gt;</div><div class='del'>-</div><div class='del'>-typedef enum _MAC_TYPE {</div><div class='del'>-	M_I17,</div><div class='del'>-	M_I20,</div><div class='del'>-	M_MINI,</div><div class='del'>-	M_MACBOOK,</div><div class='del'>-	M_UNKNOWN</div><div class='del'>-} MAC_TYPE;</div><div class='del'>-</div><div class='del'>-/* --------------------------------------------------------------------- */</div><div class='del'>-</div><div class='del'>-static struct fb_var_screeninfo imacfb_defined __initdata = {</div><div class='del'>-	.activate		= FB_ACTIVATE_NOW,</div><div class='del'>-	.height			= -1,</div><div class='del'>-	.width			= -1,</div><div class='del'>-	.right_margin		= 32,</div><div class='del'>-	.upper_margin		= 16,</div><div class='del'>-	.lower_margin		= 4,</div><div class='del'>-	.vsync_len		= 4,</div><div class='del'>-	.vmode			= FB_VMODE_NONINTERLACED,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct fb_fix_screeninfo imacfb_fix __initdata = {</div><div class='del'>-	.id			= "IMAC VGA",</div><div class='del'>-	.type			= FB_TYPE_PACKED_PIXELS,</div><div class='del'>-	.accel			= FB_ACCEL_NONE,</div><div class='del'>-	.visual			= FB_VISUAL_TRUECOLOR,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int inverse;</div><div class='del'>-static int model		= M_UNKNOWN;</div><div class='del'>-static int manual_height;</div><div class='del'>-static int manual_width;</div><div class='del'>-</div><div class='del'>-static int set_system(const struct dmi_system_id *id)</div><div class='del'>-{</div><div class='del'>-	printk(KERN_INFO "imacfb: %s detected - set system to %ld\n",</div><div class='del'>-		id-&gt;ident, (long)id-&gt;driver_data);</div><div class='del'>-</div><div class='del'>-	model = (long)id-&gt;driver_data;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct dmi_system_id __initdata dmi_system_table[] = {</div><div class='del'>-	{ set_system, "iMac4,1", {</div><div class='del'>-	  DMI_MATCH(DMI_BIOS_VENDOR,"Apple Computer, Inc."),</div><div class='del'>-	  DMI_MATCH(DMI_PRODUCT_NAME,"iMac4,1") }, (void*)M_I17},</div><div class='del'>-	{ set_system, "MacBookPro1,1", {</div><div class='del'>-	  DMI_MATCH(DMI_BIOS_VENDOR,"Apple Computer, Inc."),</div><div class='del'>-	  DMI_MATCH(DMI_PRODUCT_NAME,"MacBookPro1,1") }, (void*)M_I17},</div><div class='del'>-	{ set_system, "MacBook1,1", {</div><div class='del'>-	  DMI_MATCH(DMI_BIOS_VENDOR,"Apple Computer, Inc."),</div><div class='del'>-	  DMI_MATCH(DMI_PRODUCT_NAME,"MacBook1,1")}, (void *)M_MACBOOK},</div><div class='del'>-	{ set_system, "Macmini1,1", {</div><div class='del'>-	  DMI_MATCH(DMI_BIOS_VENDOR,"Apple Computer, Inc."),</div><div class='del'>-	  DMI_MATCH(DMI_PRODUCT_NAME,"Macmini1,1")}, (void *)M_MINI},</div><div class='del'>-	{},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define	DEFAULT_FB_MEM	1024*1024*16</div><div class='del'>-</div><div class='del'>-/* --------------------------------------------------------------------- */</div><div class='del'>-</div><div class='del'>-static int imacfb_setcolreg(unsigned regno, unsigned red, unsigned green,</div><div class='del'>-			    unsigned blue, unsigned transp,</div><div class='del'>-			    struct fb_info *info)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 *  Set a single color register. The values supplied are</div><div class='del'>-	 *  already rounded down to the hardware's capabilities</div><div class='del'>-	 *  (according to the entries in the `var' structure). Return</div><div class='del'>-	 *  != 0 for invalid regno.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (regno &gt;= info-&gt;cmap.len)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	if (regno &lt; 16) {</div><div class='del'>-		red   &gt;&gt;= 8;</div><div class='del'>-		green &gt;&gt;= 8;</div><div class='del'>-		blue  &gt;&gt;= 8;</div><div class='del'>-		((u32 *)(info-&gt;pseudo_palette))[regno] =</div><div class='del'>-			(red   &lt;&lt; info-&gt;var.red.offset)   |</div><div class='del'>-			(green &lt;&lt; info-&gt;var.green.offset) |</div><div class='del'>-			(blue  &lt;&lt; info-&gt;var.blue.offset);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct fb_ops imacfb_ops = {</div><div class='del'>-	.owner		= THIS_MODULE,</div><div class='del'>-	.fb_setcolreg	= imacfb_setcolreg,</div><div class='del'>-	.fb_fillrect	= cfb_fillrect,</div><div class='del'>-	.fb_copyarea	= cfb_copyarea,</div><div class='del'>-	.fb_imageblit	= cfb_imageblit,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init imacfb_setup(char *options)</div><div class='del'>-{</div><div class='del'>-	char *this_opt;</div><div class='del'>-</div><div class='del'>-	if (!options || !*options)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	while ((this_opt = strsep(&amp;options, ",")) != NULL) {</div><div class='del'>-		if (!*this_opt) continue;</div><div class='del'>-</div><div class='del'>-		if (!strcmp(this_opt, "inverse"))</div><div class='del'>-			inverse = 1;</div><div class='del'>-		else if (!strcmp(this_opt, "i17"))</div><div class='del'>-			model = M_I17;</div><div class='del'>-		else if (!strcmp(this_opt, "i20"))</div><div class='del'>-			model = M_I20;</div><div class='del'>-		else if (!strcmp(this_opt, "mini"))</div><div class='del'>-			model = M_MINI;</div><div class='del'>-		else if (!strcmp(this_opt, "macbook"))</div><div class='del'>-			model = M_MACBOOK;</div><div class='del'>-		else if (!strncmp(this_opt, "height:", 7))</div><div class='del'>-			manual_height = simple_strtoul(this_opt+7, NULL, 0);</div><div class='del'>-		else if (!strncmp(this_opt, "width:", 6))</div><div class='del'>-			manual_width = simple_strtoul(this_opt+6, NULL, 0);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init imacfb_probe(struct platform_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct fb_info *info;</div><div class='del'>-	int err;</div><div class='del'>-	unsigned int size_vmode;</div><div class='del'>-	unsigned int size_remap;</div><div class='del'>-	unsigned int size_total;</div><div class='del'>-</div><div class='del'>-	screen_info.lfb_depth = 32;</div><div class='del'>-	screen_info.lfb_size = DEFAULT_FB_MEM / 0x10000;</div><div class='del'>-	screen_info.pages=1;</div><div class='del'>-	screen_info.blue_size = 8;</div><div class='del'>-	screen_info.blue_pos = 0;</div><div class='del'>-	screen_info.green_size = 8;</div><div class='del'>-	screen_info.green_pos = 8;</div><div class='del'>-	screen_info.red_size = 8;</div><div class='del'>-	screen_info.red_pos = 16;</div><div class='del'>-	screen_info.rsvd_size = 8;</div><div class='del'>-	screen_info.rsvd_pos = 24;</div><div class='del'>-</div><div class='del'>-	switch (model) {</div><div class='del'>-	case M_I17:</div><div class='del'>-		screen_info.lfb_width = 1440;</div><div class='del'>-		screen_info.lfb_height = 900;</div><div class='del'>-		screen_info.lfb_linelength = 1472 * 4;</div><div class='del'>-		screen_info.lfb_base = 0x80010000;</div><div class='del'>-		break;</div><div class='del'>-	case M_I20:</div><div class='del'>-		screen_info.lfb_width = 1680;</div><div class='del'>-		screen_info.lfb_height = 1050;</div><div class='del'>-		screen_info.lfb_linelength = 1728 * 4;</div><div class='del'>-		screen_info.lfb_base = 0x80010000;</div><div class='del'>-		break;</div><div class='del'>-	case M_MINI:</div><div class='del'>-		screen_info.lfb_width = 1024;</div><div class='del'>-		screen_info.lfb_height = 768;</div><div class='del'>-		screen_info.lfb_linelength = 2048 * 4;</div><div class='del'>-		screen_info.lfb_base = 0x80000000;</div><div class='del'>-		break;</div><div class='del'>-	case M_MACBOOK:</div><div class='del'>-		screen_info.lfb_width = 1280;</div><div class='del'>-		screen_info.lfb_height = 800;</div><div class='del'>-		screen_info.lfb_linelength = 2048 * 4;</div><div class='del'>-		screen_info.lfb_base = 0x80000000;</div><div class='del'>-		break;</div><div class='del'>- 	}</div><div class='del'>-</div><div class='del'>-	/* if the user wants to manually specify height/width,</div><div class='del'>-	   we will override the defaults */</div><div class='del'>-	/* TODO: eventually get auto-detection working */</div><div class='del'>-	if (manual_height &gt; 0)</div><div class='del'>-		screen_info.lfb_height = manual_height;</div><div class='del'>-	if (manual_width &gt; 0)</div><div class='del'>-		screen_info.lfb_width = manual_width;</div><div class='del'>-</div><div class='del'>-	imacfb_fix.smem_start = screen_info.lfb_base;</div><div class='del'>-	imacfb_defined.bits_per_pixel = screen_info.lfb_depth;</div><div class='del'>-	imacfb_defined.xres = screen_info.lfb_width;</div><div class='del'>-	imacfb_defined.yres = screen_info.lfb_height;</div><div class='del'>-	imacfb_fix.line_length = screen_info.lfb_linelength;</div><div class='del'>-</div><div class='del'>-	/*   size_vmode -- that is the amount of memory needed for the</div><div class='del'>-	 *                 used video mode, i.e. the minimum amount of</div><div class='del'>-	 *                 memory we need. */</div><div class='del'>-	size_vmode = imacfb_defined.yres * imacfb_fix.line_length;</div><div class='del'>-</div><div class='del'>-	/*   size_total -- all video memory we have. Used for</div><div class='del'>-	 *                 entries, ressource allocation and bounds</div><div class='del'>-	 *                 checking. */</div><div class='del'>-	size_total = screen_info.lfb_size * 65536;</div><div class='del'>-	if (size_total &lt; size_vmode)</div><div class='del'>-		size_total = size_vmode;</div><div class='del'>-</div><div class='del'>-	/*   size_remap -- the amount of video memory we are going to</div><div class='del'>-	 *                 use for imacfb.  With modern cards it is no</div><div class='del'>-	 *                 option to simply use size_total as that</div><div class='del'>-	 *                 wastes plenty of kernel address space. */</div><div class='del'>-	size_remap  = size_vmode * 2;</div><div class='del'>-	if (size_remap &lt; size_vmode)</div><div class='del'>-		size_remap = size_vmode;</div><div class='del'>-	if (size_remap &gt; size_total)</div><div class='del'>-		size_remap = size_total;</div><div class='del'>-	imacfb_fix.smem_len = size_remap;</div><div class='del'>-</div><div class='del'>-	if (!request_mem_region(imacfb_fix.smem_start, size_total, "imacfb")) {</div><div class='del'>-		printk(KERN_WARNING</div><div class='del'>-		       "imacfb: cannot reserve video memory at 0x%lx\n",</div><div class='del'>-			imacfb_fix.smem_start);</div><div class='del'>-		/* We cannot make this fatal. Sometimes this comes from magic</div><div class='del'>-		   spaces our resource handlers simply don't know about */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	info = framebuffer_alloc(sizeof(u32) * 16, &amp;dev-&gt;dev);</div><div class='del'>-	if (!info) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto err_release_mem;</div><div class='del'>-	}</div><div class='del'>-	info-&gt;pseudo_palette = info-&gt;par;</div><div class='del'>-	info-&gt;par = NULL;</div><div class='del'>-</div><div class='del'>-	info-&gt;screen_base = ioremap(imacfb_fix.smem_start, imacfb_fix.smem_len);</div><div class='del'>-	if (!info-&gt;screen_base) {</div><div class='del'>-		printk(KERN_ERR "imacfb: abort, cannot ioremap video memory "</div><div class='del'>-				"0x%x @ 0x%lx\n",</div><div class='del'>-			imacfb_fix.smem_len, imacfb_fix.smem_start);</div><div class='del'>-		err = -EIO;</div><div class='del'>-		goto err_unmap;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printk(KERN_INFO "imacfb: framebuffer at 0x%lx, mapped to 0x%p, "</div><div class='del'>-	       "using %dk, total %dk\n",</div><div class='del'>-	       imacfb_fix.smem_start, info-&gt;screen_base,</div><div class='del'>-	       size_remap/1024, size_total/1024);</div><div class='del'>-	printk(KERN_INFO "imacfb: mode is %dx%dx%d, linelength=%d, pages=%d\n",</div><div class='del'>-	       imacfb_defined.xres, imacfb_defined.yres,</div><div class='del'>-	       imacfb_defined.bits_per_pixel, imacfb_fix.line_length,</div><div class='del'>-	       screen_info.pages);</div><div class='del'>-</div><div class='del'>-	imacfb_defined.xres_virtual = imacfb_defined.xres;</div><div class='del'>-	imacfb_defined.yres_virtual = imacfb_fix.smem_len /</div><div class='del'>-					imacfb_fix.line_length;</div><div class='del'>-	printk(KERN_INFO "imacfb: scrolling: redraw\n");</div><div class='del'>-	imacfb_defined.yres_virtual = imacfb_defined.yres;</div><div class='del'>-</div><div class='del'>-	/* some dummy values for timing to make fbset happy */</div><div class='del'>-	imacfb_defined.pixclock     = 10000000 / imacfb_defined.xres *</div><div class='del'>-					1000 / imacfb_defined.yres;</div><div class='del'>-	imacfb_defined.left_margin  = (imacfb_defined.xres / 8) &amp; 0xf8;</div><div class='del'>-	imacfb_defined.hsync_len    = (imacfb_defined.xres / 8) &amp; 0xf8;</div><div class='del'>-</div><div class='del'>-	imacfb_defined.red.offset    = screen_info.red_pos;</div><div class='del'>-	imacfb_defined.red.length    = screen_info.red_size;</div><div class='del'>-	imacfb_defined.green.offset  = screen_info.green_pos;</div><div class='del'>-	imacfb_defined.green.length  = screen_info.green_size;</div><div class='del'>-	imacfb_defined.blue.offset   = screen_info.blue_pos;</div><div class='del'>-	imacfb_defined.blue.length   = screen_info.blue_size;</div><div class='del'>-	imacfb_defined.transp.offset = screen_info.rsvd_pos;</div><div class='del'>-	imacfb_defined.transp.length = screen_info.rsvd_size;</div><div class='del'>-</div><div class='del'>-	printk(KERN_INFO "imacfb: %s: "</div><div class='del'>-	       "size=%d:%d:%d:%d, shift=%d:%d:%d:%d\n",</div><div class='del'>-	       "Truecolor",</div><div class='del'>-	       screen_info.rsvd_size,</div><div class='del'>-	       screen_info.red_size,</div><div class='del'>-	       screen_info.green_size,</div><div class='del'>-	       screen_info.blue_size,</div><div class='del'>-	       screen_info.rsvd_pos,</div><div class='del'>-	       screen_info.red_pos,</div><div class='del'>-	       screen_info.green_pos,</div><div class='del'>-	       screen_info.blue_pos);</div><div class='del'>-</div><div class='del'>-	imacfb_fix.ypanstep  = 0;</div><div class='del'>-	imacfb_fix.ywrapstep = 0;</div><div class='del'>-</div><div class='del'>-	/* request failure does not faze us, as vgacon probably has this</div><div class='del'>-	 * region already (FIXME) */</div><div class='del'>-	request_region(0x3c0, 32, "imacfb");</div><div class='del'>-</div><div class='del'>-	info-&gt;fbops = &amp;imacfb_ops;</div><div class='del'>-	info-&gt;var = imacfb_defined;</div><div class='del'>-	info-&gt;fix = imacfb_fix;</div><div class='del'>-	info-&gt;flags = FBINFO_FLAG_DEFAULT;</div><div class='del'>-</div><div class='del'>-	if (fb_alloc_cmap(&amp;info-&gt;cmap, 256, 0) &lt; 0) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto err_unmap;</div><div class='del'>-	}</div><div class='del'>-	if (register_framebuffer(info)&lt;0) {</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-		goto err_fb_dealoc;</div><div class='del'>-	}</div><div class='del'>-	printk(KERN_INFO "fb%d: %s frame buffer device\n",</div><div class='del'>-	       info-&gt;node, info-&gt;fix.id);</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-err_fb_dealoc:</div><div class='del'>-	fb_dealloc_cmap(&amp;info-&gt;cmap);</div><div class='del'>-err_unmap:</div><div class='del'>-	iounmap(info-&gt;screen_base);</div><div class='del'>-	framebuffer_release(info);</div><div class='del'>-err_release_mem:</div><div class='del'>-	release_mem_region(imacfb_fix.smem_start, size_total);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct platform_driver imacfb_driver = {</div><div class='del'>-	.probe	= imacfb_probe,</div><div class='del'>-	.driver	= {</div><div class='del'>-		.name	= "imacfb",</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct platform_device imacfb_device = {</div><div class='del'>-	.name	= "imacfb",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init imacfb_init(void)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	char *option = NULL;</div><div class='del'>-</div><div class='del'>-	if (!efi_enabled)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	if (!dmi_check_system(dmi_system_table))</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	if (model == M_UNKNOWN)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	if (fb_get_options("imacfb", &amp;option))</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	imacfb_setup(option);</div><div class='del'>-	ret = platform_driver_register(&amp;imacfb_driver);</div><div class='del'>-</div><div class='del'>-	if (!ret) {</div><div class='del'>-		ret = platform_device_register(&amp;imacfb_device);</div><div class='del'>-		if (ret)</div><div class='del'>-			platform_driver_unregister(&amp;imacfb_driver);</div><div class='del'>-	}</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-module_init(imacfb_init);</div><div class='del'>-</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/video/intelfb/intelfb.h b/drivers/video/intelfb/intelfb.h<br/>index 3325fbd68ab3..a50bea614804 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/intelfb/intelfb.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/video/intelfb/intelfb.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/intelfb/intelfb.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/intelfb/intelfb.h</a></div><div class='hunk'>@@ -12,9 +12,9 @@</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /*** Version/name ***/</div><div class='del'>-#define INTELFB_VERSION			"0.9.5"</div><div class='add'>+#define INTELFB_VERSION			"0.9.6"</div><div class='ctx'> #define INTELFB_MODULE_NAME		"intelfb"</div><div class='del'>-#define SUPPORTED_CHIPSETS		"830M/845G/852GM/855GM/865G/915G/915GM/945G/945GM/965G/965GM"</div><div class='add'>+#define SUPPORTED_CHIPSETS		"830M/845G/852GM/855GM/865G/915G/915GM/945G/945GM/945GME/965G/965GM"</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*** Debug/feature defines ***/</div><div class='hunk'>@@ -58,6 +58,7 @@</div><div class='ctx'> #define PCI_DEVICE_ID_INTEL_915GM	0x2592</div><div class='ctx'> #define PCI_DEVICE_ID_INTEL_945G	0x2772</div><div class='ctx'> #define PCI_DEVICE_ID_INTEL_945GM	0x27A2</div><div class='add'>+#define PCI_DEVICE_ID_INTEL_945GME	0x27AE</div><div class='ctx'> #define PCI_DEVICE_ID_INTEL_965G	0x29A2</div><div class='ctx'> #define PCI_DEVICE_ID_INTEL_965GM	0x2A02</div><div class='ctx'> </div><div class='hunk'>@@ -160,6 +161,7 @@ enum intel_chips {</div><div class='ctx'> 	INTEL_915GM,</div><div class='ctx'> 	INTEL_945G,</div><div class='ctx'> 	INTEL_945GM,</div><div class='add'>+	INTEL_945GME,</div><div class='ctx'> 	INTEL_965G,</div><div class='ctx'> 	INTEL_965GM,</div><div class='ctx'> };</div><div class='hunk'>@@ -363,6 +365,7 @@ struct intelfb_info {</div><div class='ctx'> 			((dinfo)-&gt;chipset == INTEL_915GM) ||	\</div><div class='ctx'> 			((dinfo)-&gt;chipset == INTEL_945G) ||	\</div><div class='ctx'> 			((dinfo)-&gt;chipset == INTEL_945GM) ||	\</div><div class='add'>+			((dinfo)-&gt;chipset == INTEL_945GME) ||	\</div><div class='ctx'> 			((dinfo)-&gt;chipset == INTEL_965G) ||	\</div><div class='ctx'> 			((dinfo)-&gt;chipset == INTEL_965GM))</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/video/intelfb/intelfb_i2c.c b/drivers/video/intelfb/intelfb_i2c.c<br/>index fcf9fadbf572..5d896b81f4e0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/intelfb/intelfb_i2c.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/video/intelfb/intelfb_i2c.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/intelfb/intelfb_i2c.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/intelfb/intelfb_i2c.c</a></div><div class='hunk'>@@ -171,6 +171,7 @@ void intelfb_create_i2c_busses(struct intelfb_info *dinfo)</div><div class='ctx'> 		/* has some LVDS + tv-out */</div><div class='ctx'> 	case INTEL_945G:</div><div class='ctx'> 	case INTEL_945GM:</div><div class='add'>+	case INTEL_945GME:</div><div class='ctx'> 	case INTEL_965G:</div><div class='ctx'> 	case INTEL_965GM:</div><div class='ctx'> 		/* SDVO ports have a single control bus - 2 devices */</div><div class='head'>diff --git a/drivers/video/intelfb/intelfbdrv.c b/drivers/video/intelfb/intelfbdrv.c<br/>index e44303f9bc52..a09e23649357 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/intelfb/intelfbdrv.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/video/intelfb/intelfbdrv.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/intelfb/intelfbdrv.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/intelfb/intelfbdrv.c</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'>  * intelfb</div><div class='ctx'>  *</div><div class='ctx'>  * Linux framebuffer driver for Intel(R) 830M/845G/852GM/855GM/865G/915G/915GM/</div><div class='del'>- * 945G/945GM/965G/965GM integrated graphics chips.</div><div class='add'>+ * 945G/945GM/945GME/965G/965GM integrated graphics chips.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright © 2002, 2003 David Dawes &lt;dawes@xfree86.org&gt;</div><div class='ctx'>  *                   2004 Sylvain Meyer</div><div class='hunk'>@@ -102,6 +102,9 @@</div><div class='ctx'>  *</div><div class='ctx'>  *    04/2008 - Version 0.9.5</div><div class='ctx'>  *              Add support for 965G/965GM. (Maik Broemme &lt;mbroemme@plusserver.de&gt;)</div><div class='add'>+ *</div><div class='add'>+ *    08/2008 - Version 0.9.6</div><div class='add'>+ *              Add support for 945GME. (Phil Endecott &lt;spam_from_intelfb@chezphil.org&gt;)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -183,6 +186,7 @@ static struct pci_device_id intelfb_pci_table[] __devinitdata = {</div><div class='ctx'> 	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_915GM, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA &lt;&lt; 8, INTELFB_CLASS_MASK, INTEL_915GM },</div><div class='ctx'> 	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_945G, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA &lt;&lt; 8, INTELFB_CLASS_MASK, INTEL_945G },</div><div class='ctx'> 	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_945GM, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA &lt;&lt; 8, INTELFB_CLASS_MASK, INTEL_945GM },</div><div class='add'>+	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_945GME, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA &lt;&lt; 8, INTELFB_CLASS_MASK, INTEL_945GME },</div><div class='ctx'> 	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_965G, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA &lt;&lt; 8, INTELFB_CLASS_MASK, INTEL_965G },</div><div class='ctx'> 	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_965GM, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA &lt;&lt; 8, INTELFB_CLASS_MASK, INTEL_965GM },</div><div class='ctx'> 	{ 0, }</div><div class='hunk'>@@ -555,6 +559,7 @@ static int __devinit intelfb_pci_register(struct pci_dev *pdev,</div><div class='ctx'> 	    (ent-&gt;device == PCI_DEVICE_ID_INTEL_915GM) ||</div><div class='ctx'> 	    (ent-&gt;device == PCI_DEVICE_ID_INTEL_945G)  ||</div><div class='ctx'> 	    (ent-&gt;device == PCI_DEVICE_ID_INTEL_945GM) ||</div><div class='add'>+	    (ent-&gt;device == PCI_DEVICE_ID_INTEL_945GME) ||</div><div class='ctx'> 	    (ent-&gt;device == PCI_DEVICE_ID_INTEL_965G) ||</div><div class='ctx'> 	    (ent-&gt;device == PCI_DEVICE_ID_INTEL_965GM)) {</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/video/intelfb/intelfbhw.c b/drivers/video/intelfb/intelfbhw.c<br/>index 8e6d6a4db0ad..8b26b27c2db6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/intelfb/intelfbhw.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/video/intelfb/intelfbhw.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/intelfb/intelfbhw.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/intelfb/intelfbhw.c</a></div><div class='hunk'>@@ -143,6 +143,12 @@ int intelfbhw_get_chipset(struct pci_dev *pdev, struct intelfb_info *dinfo)</div><div class='ctx'> 		dinfo-&gt;mobile = 1;</div><div class='ctx'> 		dinfo-&gt;pll_index = PLLS_I9xx;</div><div class='ctx'> 		return 0;</div><div class='add'>+	case PCI_DEVICE_ID_INTEL_945GME:</div><div class='add'>+		dinfo-&gt;name = "Intel(R) 945GME";</div><div class='add'>+		dinfo-&gt;chipset = INTEL_945GME;</div><div class='add'>+		dinfo-&gt;mobile = 1;</div><div class='add'>+		dinfo-&gt;pll_index = PLLS_I9xx;</div><div class='add'>+		return 0;</div><div class='ctx'> 	case PCI_DEVICE_ID_INTEL_965G:</div><div class='ctx'> 		dinfo-&gt;name = "Intel(R) 965G";</div><div class='ctx'> 		dinfo-&gt;chipset = INTEL_965G;</div><div class='hunk'>@@ -186,6 +192,7 @@ int intelfbhw_get_memory(struct pci_dev *pdev, int *aperture_size,</div><div class='ctx'> 	case PCI_DEVICE_ID_INTEL_915GM:</div><div class='ctx'> 	case PCI_DEVICE_ID_INTEL_945G:</div><div class='ctx'> 	case PCI_DEVICE_ID_INTEL_945GM:</div><div class='add'>+	case PCI_DEVICE_ID_INTEL_945GME:</div><div class='ctx'> 	case PCI_DEVICE_ID_INTEL_965G:</div><div class='ctx'> 	case PCI_DEVICE_ID_INTEL_965GM:</div><div class='ctx'> 		/* 915, 945 and 965 chipsets support a 256MB aperture.</div><div class='head'>diff --git a/drivers/video/leo.c b/drivers/video/leo.c<br/>index 13fea61d6ae4..7c7e8c2da9d9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/leo.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/video/leo.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/leo.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/leo.c</a></div><div class='hunk'>@@ -33,6 +33,7 @@ static int leo_blank(int, struct fb_info *);</div><div class='ctx'> </div><div class='ctx'> static int leo_mmap(struct fb_info *, struct vm_area_struct *);</div><div class='ctx'> static int leo_ioctl(struct fb_info *, unsigned int, unsigned long);</div><div class='add'>+static int leo_pan_display(struct fb_var_screeninfo *, struct fb_info *);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *  Frame buffer operations</div><div class='hunk'>@@ -42,6 +43,7 @@ static struct fb_ops leo_ops = {</div><div class='ctx'> 	.owner			= THIS_MODULE,</div><div class='ctx'> 	.fb_setcolreg		= leo_setcolreg,</div><div class='ctx'> 	.fb_blank		= leo_blank,</div><div class='add'>+	.fb_pan_display		= leo_pan_display,</div><div class='ctx'> 	.fb_fillrect		= cfb_fillrect,</div><div class='ctx'> 	.fb_copyarea		= cfb_copyarea,</div><div class='ctx'> 	.fb_imageblit		= cfb_imageblit,</div><div class='hunk'>@@ -206,6 +208,60 @@ static void leo_wait(struct leo_lx_krn __iomem *lx_krn)</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void leo_switch_from_graph(struct fb_info *info)</div><div class='add'>+{</div><div class='add'>+	struct leo_par *par = (struct leo_par *) info-&gt;par;</div><div class='add'>+	struct leo_ld_ss0 __iomem *ss = par-&gt;ld_ss0;</div><div class='add'>+	struct leo_cursor __iomem *cursor = par-&gt;cursor;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;par-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	par-&gt;extent = ((info-&gt;var.xres - 1) |</div><div class='add'>+		       ((info-&gt;var.yres - 1) &lt;&lt; 16));</div><div class='add'>+</div><div class='add'>+	sbus_writel(0xffffffff, &amp;ss-&gt;wid);</div><div class='add'>+	sbus_writel(0xffff, &amp;ss-&gt;wmask);</div><div class='add'>+	sbus_writel(0, &amp;ss-&gt;vclipmin);</div><div class='add'>+	sbus_writel(par-&gt;extent, &amp;ss-&gt;vclipmax);</div><div class='add'>+	sbus_writel(0, &amp;ss-&gt;fg);</div><div class='add'>+	sbus_writel(0xff000000, &amp;ss-&gt;planemask);</div><div class='add'>+	sbus_writel(0x310850, &amp;ss-&gt;rop);</div><div class='add'>+	sbus_writel(0, &amp;ss-&gt;widclip);</div><div class='add'>+	sbus_writel((info-&gt;var.xres-1) | ((info-&gt;var.yres-1) &lt;&lt; 11),</div><div class='add'>+		    &amp;par-&gt;lc_ss0_usr-&gt;extent);</div><div class='add'>+	sbus_writel(4, &amp;par-&gt;lc_ss0_usr-&gt;addrspace);</div><div class='add'>+	sbus_writel(0x80000000, &amp;par-&gt;lc_ss0_usr-&gt;fill);</div><div class='add'>+	sbus_writel(0, &amp;par-&gt;lc_ss0_usr-&gt;fontt);</div><div class='add'>+	do {</div><div class='add'>+		val = sbus_readl(&amp;par-&gt;lc_ss0_usr-&gt;csr);</div><div class='add'>+	} while (val &amp; 0x20000000);</div><div class='add'>+</div><div class='add'>+	/* setup screen buffer for cfb_* functions */</div><div class='add'>+	sbus_writel(1, &amp;ss-&gt;wid);</div><div class='add'>+	sbus_writel(0x00ffffff, &amp;ss-&gt;planemask);</div><div class='add'>+	sbus_writel(0x310b90, &amp;ss-&gt;rop);</div><div class='add'>+	sbus_writel(0, &amp;par-&gt;lc_ss0_usr-&gt;addrspace);</div><div class='add'>+</div><div class='add'>+	/* hide cursor */</div><div class='add'>+	sbus_writel(sbus_readl(&amp;cursor-&gt;cur_misc) &amp; ~LEO_CUR_ENABLE, &amp;cursor-&gt;cur_misc);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;par-&gt;lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int leo_pan_display(struct fb_var_screeninfo *var, struct fb_info *info)</div><div class='add'>+{</div><div class='add'>+	/* We just use this to catch switches out of</div><div class='add'>+	 * graphics mode.</div><div class='add'>+	 */</div><div class='add'>+	leo_switch_from_graph(info);</div><div class='add'>+</div><div class='add'>+	if (var-&gt;xoffset || var-&gt;yoffset || var-&gt;vmode)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  *      leo_setcolreg - Optional function. Sets a color register.</div><div class='ctx'>  *      @regno: boolean, 0 copy local, 1 get_user() function</div><div class='hunk'>@@ -454,44 +510,6 @@ static void leo_init_wids(struct fb_info *info)</div><div class='ctx'> 	leo_wid_put(info, &amp;wl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void leo_switch_from_graph(struct fb_info *info)</div><div class='del'>-{</div><div class='del'>-	struct leo_par *par = (struct leo_par *) info-&gt;par;</div><div class='del'>-	struct leo_ld_ss0 __iomem *ss = par-&gt;ld_ss0;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	u32 val;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;par-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	par-&gt;extent = ((info-&gt;var.xres - 1) |</div><div class='del'>-		       ((info-&gt;var.yres - 1) &lt;&lt; 16));</div><div class='del'>-</div><div class='del'>-	sbus_writel(0xffffffff, &amp;ss-&gt;wid);</div><div class='del'>-	sbus_writel(0xffff, &amp;ss-&gt;wmask);</div><div class='del'>-	sbus_writel(0, &amp;ss-&gt;vclipmin);</div><div class='del'>-	sbus_writel(par-&gt;extent, &amp;ss-&gt;vclipmax);</div><div class='del'>-	sbus_writel(0, &amp;ss-&gt;fg);</div><div class='del'>-	sbus_writel(0xff000000, &amp;ss-&gt;planemask);</div><div class='del'>-	sbus_writel(0x310850, &amp;ss-&gt;rop);</div><div class='del'>-	sbus_writel(0, &amp;ss-&gt;widclip);</div><div class='del'>-	sbus_writel((info-&gt;var.xres-1) | ((info-&gt;var.yres-1) &lt;&lt; 11),</div><div class='del'>-		    &amp;par-&gt;lc_ss0_usr-&gt;extent);</div><div class='del'>-	sbus_writel(4, &amp;par-&gt;lc_ss0_usr-&gt;addrspace);</div><div class='del'>-	sbus_writel(0x80000000, &amp;par-&gt;lc_ss0_usr-&gt;fill);</div><div class='del'>-	sbus_writel(0, &amp;par-&gt;lc_ss0_usr-&gt;fontt);</div><div class='del'>-	do {</div><div class='del'>-		val = sbus_readl(&amp;par-&gt;lc_ss0_usr-&gt;csr);</div><div class='del'>-	} while (val &amp; 0x20000000);</div><div class='del'>-</div><div class='del'>-	/* setup screen buffer for cfb_* functions */</div><div class='del'>-	sbus_writel(1, &amp;ss-&gt;wid);</div><div class='del'>-	sbus_writel(0x00ffffff, &amp;ss-&gt;planemask);</div><div class='del'>-	sbus_writel(0x310b90, &amp;ss-&gt;rop);</div><div class='del'>-	sbus_writel(0, &amp;par-&gt;lc_ss0_usr-&gt;addrspace);</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;par-&gt;lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void leo_init_hw(struct fb_info *info)</div><div class='ctx'> {</div><div class='ctx'> 	struct leo_par *par = (struct leo_par *) info-&gt;par;</div><div class='hunk'>@@ -641,7 +659,7 @@ static int __devexit leo_remove(struct of_device *op)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct of_device_id leo_match[] = {</div><div class='add'>+static const struct of_device_id leo_match[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.name = "SUNW,leo",</div><div class='ctx'> 	},</div><div class='head'>diff --git a/drivers/video/matrox/matroxfb_base.c b/drivers/video/matrox/matroxfb_base.c<br/>index c02136202792..8e7a275df50c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/matrox/matroxfb_base.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/video/matrox/matroxfb_base.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/matrox/matroxfb_base.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/matrox/matroxfb_base.c</a></div><div class='hunk'>@@ -1453,6 +1453,13 @@ static struct board {</div><div class='ctx'> 		MGA_G100,</div><div class='ctx'> 		&amp;vbG100,</div><div class='ctx'> 		"MGA-G100 (AGP)"},</div><div class='add'>+	{PCI_VENDOR_ID_MATROX,	PCI_DEVICE_ID_MATROX_G200EV_PCI,	0xFF,</div><div class='add'>+		0,			0,</div><div class='add'>+		DEVF_G200,</div><div class='add'>+		230000,</div><div class='add'>+		MGA_G200,</div><div class='add'>+		&amp;vbG200,</div><div class='add'>+		"MGA-G200eV (PCI)"},</div><div class='ctx'> 	{PCI_VENDOR_ID_MATROX,	PCI_DEVICE_ID_MATROX_G200_PCI,	0xFF,</div><div class='ctx'> 		0,			0,</div><div class='ctx'> 		DEVF_G200,</div><div class='hunk'>@@ -2118,6 +2125,8 @@ static struct pci_device_id matroxfb_devices[] = {</div><div class='ctx'> 		PCI_ANY_ID,	PCI_ANY_ID,	0, 0, 0},</div><div class='ctx'> 	{PCI_VENDOR_ID_MATROX,	PCI_DEVICE_ID_MATROX_G100_AGP,</div><div class='ctx'> 		PCI_ANY_ID,	PCI_ANY_ID,	0, 0, 0},</div><div class='add'>+	{PCI_VENDOR_ID_MATROX,	PCI_DEVICE_ID_MATROX_G200EV_PCI,</div><div class='add'>+		PCI_ANY_ID,	PCI_ANY_ID,	0, 0, 0},</div><div class='ctx'> 	{PCI_VENDOR_ID_MATROX,	PCI_DEVICE_ID_MATROX_G200_PCI,</div><div class='ctx'> 		PCI_ANY_ID,	PCI_ANY_ID,	0, 0, 0},</div><div class='ctx'> 	{PCI_VENDOR_ID_MATROX,	PCI_DEVICE_ID_MATROX_G200_AGP,</div><div class='head'>diff --git a/drivers/video/metronomefb.c b/drivers/video/metronomefb.c<br/>index cc4c038a1b3f..df1f757a6161 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/metronomefb.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/video/metronomefb.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/metronomefb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/metronomefb.c</a></div><div class='hunk'>@@ -40,29 +40,63 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/unaligned.h&gt;</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-#define DEBUG 1</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-#define DPRINTK(f, a...) printk(KERN_DEBUG "%s: " f, __func__ , ## a)</div><div class='del'>-#else</div><div class='del'>-#define DPRINTK(f, a...)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> /* Display specific information */</div><div class='ctx'> #define DPY_W 832</div><div class='ctx'> #define DPY_H 622</div><div class='ctx'> </div><div class='add'>+static int user_wfm_size;</div><div class='add'>+</div><div class='ctx'> /* frame differs from image. frame includes non-visible pixels */</div><div class='ctx'> struct epd_frame {</div><div class='ctx'> 	int fw; /* frame width */</div><div class='ctx'> 	int fh; /* frame height */</div><div class='add'>+	u16 config[4];</div><div class='add'>+	int wfm_size;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct epd_frame epd_frame_table[] = {</div><div class='ctx'> 	{</div><div class='del'>-	.fw = 832,</div><div class='del'>-	.fh = 622</div><div class='add'>+		.fw = 832,</div><div class='add'>+		.fh = 622,</div><div class='add'>+		.config = {</div><div class='add'>+			15 /* sdlew */</div><div class='add'>+			| 2 &lt;&lt; 8 /* sdosz */</div><div class='add'>+			| 0 &lt;&lt; 11 /* sdor */</div><div class='add'>+			| 0 &lt;&lt; 12 /* sdces */</div><div class='add'>+			| 0 &lt;&lt; 15, /* sdcer */</div><div class='add'>+			42 /* gdspl */</div><div class='add'>+			| 1 &lt;&lt; 8 /* gdr1 */</div><div class='add'>+			| 1 &lt;&lt; 9 /* sdshr */</div><div class='add'>+			| 0 &lt;&lt; 15, /* gdspp */</div><div class='add'>+			18 /* gdspw */</div><div class='add'>+			| 0 &lt;&lt; 15, /* dispc */</div><div class='add'>+			599 /* vdlc */</div><div class='add'>+			| 0 &lt;&lt; 11 /* dsi */</div><div class='add'>+			| 0 &lt;&lt; 12, /* dsic */</div><div class='add'>+		},</div><div class='add'>+		.wfm_size = 47001,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.fw = 1088,</div><div class='add'>+		.fh = 791,</div><div class='add'>+		.config = {</div><div class='add'>+			0x0104,</div><div class='add'>+			0x031f,</div><div class='add'>+			0x0088,</div><div class='add'>+			0x02ff,</div><div class='add'>+		},</div><div class='add'>+		.wfm_size = 46770,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.fw = 1200,</div><div class='add'>+		.fh = 842,</div><div class='add'>+		.config = {</div><div class='add'>+			0x0101,</div><div class='add'>+			0x030e,</div><div class='add'>+			0x0012,</div><div class='add'>+			0x0280,</div><div class='add'>+		},</div><div class='add'>+		.wfm_size = 46770,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -134,9 +168,8 @@ static u16 calc_img_cksum(u16 *start, int length)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* here we decode the incoming waveform file and populate metromem */</div><div class='del'>-#define EXP_WFORM_SIZE 47001</div><div class='del'>-static int load_waveform(u8 *mem, size_t size, u8 *metromem, int m, int t,</div><div class='del'>-				u8 *frame_count)</div><div class='add'>+static int __devinit load_waveform(u8 *mem, size_t size, int m, int t,</div><div class='add'>+				struct metronomefb_par *par)</div><div class='ctx'> {</div><div class='ctx'> 	int tta;</div><div class='ctx'> 	int wmta;</div><div class='hunk'>@@ -148,26 +181,31 @@ static int load_waveform(u8 *mem, size_t size, u8 *metromem, int m, int t,</div><div class='ctx'> 	int wfm_idx, owfm_idx;</div><div class='ctx'> 	int mem_idx = 0;</div><div class='ctx'> 	struct waveform_hdr *wfm_hdr;</div><div class='add'>+	u8 *metromem = par-&gt;metromem_wfm;</div><div class='add'>+	struct device *dev = par-&gt;info-&gt;dev;</div><div class='ctx'> </div><div class='del'>-	if (size != EXP_WFORM_SIZE) {</div><div class='del'>-		printk(KERN_ERR "Error: unexpected size %d != %d\n", size,</div><div class='del'>-					EXP_WFORM_SIZE);</div><div class='add'>+	if (user_wfm_size)</div><div class='add'>+		epd_frame_table[par-&gt;dt].wfm_size = user_wfm_size;</div><div class='add'>+</div><div class='add'>+	if (size != epd_frame_table[par-&gt;dt].wfm_size) {</div><div class='add'>+		dev_err(dev, "Error: unexpected size %Zd != %d\n", size,</div><div class='add'>+					epd_frame_table[par-&gt;dt].wfm_size);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	wfm_hdr = (struct waveform_hdr *) mem;</div><div class='ctx'> </div><div class='ctx'> 	if (wfm_hdr-&gt;fvsn != 1) {</div><div class='del'>-		printk(KERN_ERR "Error: bad fvsn %x\n", wfm_hdr-&gt;fvsn);</div><div class='add'>+		dev_err(dev, "Error: bad fvsn %x\n", wfm_hdr-&gt;fvsn);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (wfm_hdr-&gt;luts != 0) {</div><div class='del'>-		printk(KERN_ERR "Error: bad luts %x\n", wfm_hdr-&gt;luts);</div><div class='add'>+		dev_err(dev, "Error: bad luts %x\n", wfm_hdr-&gt;luts);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	cksum = calc_cksum(32, 47, mem);</div><div class='ctx'> 	if (cksum != wfm_hdr-&gt;wfm_cs) {</div><div class='del'>-		printk(KERN_ERR "Error: bad cksum %x != %x\n", cksum,</div><div class='add'>+		dev_err(dev, "Error: bad cksum %x != %x\n", cksum,</div><div class='ctx'> 					wfm_hdr-&gt;wfm_cs);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -175,7 +213,7 @@ static int load_waveform(u8 *mem, size_t size, u8 *metromem, int m, int t,</div><div class='ctx'> 	wfm_hdr-&gt;trc += 1;</div><div class='ctx'> 	for (i = 0; i &lt; 5; i++) {</div><div class='ctx'> 		if (*(wfm_hdr-&gt;stuff2a + i) != 0) {</div><div class='del'>-			printk(KERN_ERR "Error: unexpected value in padding\n");</div><div class='add'>+			dev_err(dev, "Error: unexpected value in padding\n");</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -200,7 +238,7 @@ static int load_waveform(u8 *mem, size_t size, u8 *metromem, int m, int t,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	cksum = calc_cksum(sizeof(*wfm_hdr), cksum_idx, mem);</div><div class='ctx'> 	if (cksum != mem[cksum_idx]) {</div><div class='del'>-		printk(KERN_ERR "Error: bad temperature range table cksum"</div><div class='add'>+		dev_err(dev, "Error: bad temperature range table cksum"</div><div class='ctx'> 				" %x != %x\n", cksum, mem[cksum_idx]);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -212,7 +250,7 @@ static int load_waveform(u8 *mem, size_t size, u8 *metromem, int m, int t,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	cksum = calc_cksum(cksum_idx - 3, cksum_idx, mem);</div><div class='ctx'> 	if (cksum != mem[cksum_idx]) {</div><div class='del'>-		printk(KERN_ERR "Error: bad mode table address cksum"</div><div class='add'>+		dev_err(dev, "Error: bad mode table address cksum"</div><div class='ctx'> 				" %x != %x\n", cksum, mem[cksum_idx]);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -224,7 +262,7 @@ static int load_waveform(u8 *mem, size_t size, u8 *metromem, int m, int t,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	cksum = calc_cksum(cksum_idx - 3, cksum_idx, mem);</div><div class='ctx'> 	if (cksum != mem[cksum_idx]) {</div><div class='del'>-		printk(KERN_ERR "Error: bad temperature table address cksum"</div><div class='add'>+		dev_err(dev, "Error: bad temperature table address cksum"</div><div class='ctx'> 			" %x != %x\n", cksum, mem[cksum_idx]);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -259,11 +297,11 @@ static int load_waveform(u8 *mem, size_t size, u8 *metromem, int m, int t,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	cksum = calc_cksum(owfm_idx, cksum_idx, mem);</div><div class='ctx'> 	if (cksum != mem[cksum_idx]) {</div><div class='del'>-		printk(KERN_ERR "Error: bad waveform data cksum"</div><div class='add'>+		dev_err(dev, "Error: bad waveform data cksum"</div><div class='ctx'> 				" %x != %x\n", cksum, mem[cksum_idx]);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	*frame_count = (mem_idx/64);</div><div class='add'>+	par-&gt;frame_count = (mem_idx/64);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -274,15 +312,12 @@ static int metronome_display_cmd(struct metronomefb_par *par)</div><div class='ctx'> 	u16 cs;</div><div class='ctx'> 	u16 opcode;</div><div class='ctx'> 	static u8 borderval;</div><div class='del'>-	u8 *ptr;</div><div class='ctx'> </div><div class='ctx'> 	/* setup display command</div><div class='ctx'> 	we can't immediately set the opcode since the controller</div><div class='ctx'> 	will try parse the command before we've set it all up</div><div class='ctx'> 	so we just set cs here and set the opcode at the end */</div><div class='ctx'> </div><div class='del'>-	ptr = par-&gt;metromem;</div><div class='del'>-</div><div class='ctx'> 	if (par-&gt;metromem_cmd-&gt;opcode == 0xCC40)</div><div class='ctx'> 		opcode = cs = 0xCC41;</div><div class='ctx'> 	else</div><div class='hunk'>@@ -335,44 +370,17 @@ static int __devinit metronome_powerup_cmd(struct metronomefb_par *par)</div><div class='ctx'> </div><div class='ctx'> static int __devinit metronome_config_cmd(struct metronomefb_par *par)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='del'>-	u16 cs;</div><div class='del'>-</div><div class='ctx'> 	/* setup config command</div><div class='ctx'> 	we can't immediately set the opcode since the controller</div><div class='del'>-	will try parse the command before we've set it all up</div><div class='del'>-	so we just set cs here and set the opcode at the end */</div><div class='del'>-</div><div class='del'>-	cs = 0xCC10;</div><div class='del'>-</div><div class='del'>-	/* set the 12 args ( 8 bytes ) for config. see spec for meanings */</div><div class='del'>-	i = 0;</div><div class='del'>-	par-&gt;metromem_cmd-&gt;args[i] = 	15 /* sdlew */</div><div class='del'>-					| 2 &lt;&lt; 8 /* sdosz */</div><div class='del'>-					| 0 &lt;&lt; 11 /* sdor */</div><div class='del'>-					| 0 &lt;&lt; 12 /* sdces */</div><div class='del'>-					| 0 &lt;&lt; 15; /* sdcer */</div><div class='del'>-	cs += par-&gt;metromem_cmd-&gt;args[i++];</div><div class='del'>-</div><div class='del'>-	par-&gt;metromem_cmd-&gt;args[i] = 	42 /* gdspl */</div><div class='del'>-					| 1 &lt;&lt; 8 /* gdr1 */</div><div class='del'>-					| 1 &lt;&lt; 9 /* sdshr */</div><div class='del'>-					| 0 &lt;&lt; 15; /* gdspp */</div><div class='del'>-	cs += par-&gt;metromem_cmd-&gt;args[i++];</div><div class='del'>-</div><div class='del'>-	par-&gt;metromem_cmd-&gt;args[i] = 	18 /* gdspw */</div><div class='del'>-					| 0 &lt;&lt; 15; /* dispc */</div><div class='del'>-	cs += par-&gt;metromem_cmd-&gt;args[i++];</div><div class='del'>-</div><div class='del'>-	par-&gt;metromem_cmd-&gt;args[i] = 	599 /* vdlc */</div><div class='del'>-					| 0 &lt;&lt; 11 /* dsi */</div><div class='del'>-					| 0 &lt;&lt; 12; /* dsic */</div><div class='del'>-	cs += par-&gt;metromem_cmd-&gt;args[i++];</div><div class='add'>+	will try parse the command before we've set it all up */</div><div class='ctx'> </div><div class='add'>+	memcpy(par-&gt;metromem_cmd-&gt;args, epd_frame_table[par-&gt;dt].config,</div><div class='add'>+		sizeof(epd_frame_table[par-&gt;dt].config));</div><div class='ctx'> 	/* the rest are 0 */</div><div class='del'>-	memset((u8 *) (par-&gt;metromem_cmd-&gt;args + i), 0, (32-i)*2);</div><div class='add'>+	memset((u8 *) (par-&gt;metromem_cmd-&gt;args + 4), 0, (32-4)*2);</div><div class='ctx'> </div><div class='del'>-	par-&gt;metromem_cmd-&gt;csum = cs;</div><div class='add'>+	par-&gt;metromem_cmd-&gt;csum = 0xCC10;</div><div class='add'>+	par-&gt;metromem_cmd-&gt;csum += calc_img_cksum(par-&gt;metromem_cmd-&gt;args, 4);</div><div class='ctx'> 	par-&gt;metromem_cmd-&gt;opcode = 0xCC10; /* config cmd */</div><div class='ctx'> </div><div class='ctx'> 	return par-&gt;board-&gt;met_wait_event(par);</div><div class='hunk'>@@ -408,12 +416,9 @@ static int __devinit metronome_init_regs(struct metronomefb_par *par)</div><div class='ctx'> {</div><div class='ctx'> 	int res;</div><div class='ctx'> </div><div class='del'>-	par-&gt;board-&gt;init_gpio_regs(par);</div><div class='del'>-</div><div class='del'>-	par-&gt;board-&gt;init_lcdc_regs(par);</div><div class='del'>-</div><div class='del'>-	/* now that lcd is setup, setup dma descriptor */</div><div class='del'>-	par-&gt;board-&gt;post_dma_setup(par);</div><div class='add'>+	res = par-&gt;board-&gt;setup_io(par);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='ctx'> </div><div class='ctx'> 	res = metronome_powerup_cmd(par);</div><div class='ctx'> 	if (res)</div><div class='hunk'>@@ -430,16 +435,16 @@ static int __devinit metronome_init_regs(struct metronomefb_par *par)</div><div class='ctx'> </div><div class='ctx'> static void metronomefb_dpy_update(struct metronomefb_par *par)</div><div class='ctx'> {</div><div class='add'>+	int fbsize;</div><div class='ctx'> 	u16 cksum;</div><div class='ctx'> 	unsigned char *buf = (unsigned char __force *)par-&gt;info-&gt;screen_base;</div><div class='ctx'> </div><div class='add'>+	fbsize = par-&gt;info-&gt;fix.smem_len;</div><div class='ctx'> 	/* copy from vm to metromem */</div><div class='del'>-	memcpy(par-&gt;metromem_img, buf, DPY_W*DPY_H);</div><div class='add'>+	memcpy(par-&gt;metromem_img, buf, fbsize);</div><div class='ctx'> </div><div class='del'>-	cksum = calc_img_cksum((u16 *) par-&gt;metromem_img,</div><div class='del'>-				(epd_frame_table[0].fw * DPY_H)/2);</div><div class='del'>-	*((u16 *)(par-&gt;metromem_img) +</div><div class='del'>-			(epd_frame_table[0].fw * DPY_H)/2) = cksum;</div><div class='add'>+	cksum = calc_img_cksum((u16 *) par-&gt;metromem_img, fbsize/2);</div><div class='add'>+	*((u16 *)(par-&gt;metromem_img) + fbsize/2) = cksum;</div><div class='ctx'> 	metronome_display_cmd(par);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -574,8 +579,10 @@ static int __devinit metronomefb_probe(struct platform_device *dev)</div><div class='ctx'> 	unsigned char *videomemory;</div><div class='ctx'> 	struct metronomefb_par *par;</div><div class='ctx'> 	const struct firmware *fw_entry;</div><div class='del'>-	int cmd_size, wfm_size, img_size, padding_size, totalsize;</div><div class='ctx'> 	int i;</div><div class='add'>+	int panel_type;</div><div class='add'>+	int fw, fh;</div><div class='add'>+	int epd_dt_index;</div><div class='ctx'> </div><div class='ctx'> 	/* pick up board specific routines */</div><div class='ctx'> 	board = dev-&gt;dev.platform_data;</div><div class='hunk'>@@ -586,96 +593,108 @@ static int __devinit metronomefb_probe(struct platform_device *dev)</div><div class='ctx'> 	if (!try_module_get(board-&gt;owner))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='add'>+	info = framebuffer_alloc(sizeof(struct metronomefb_par), &amp;dev-&gt;dev);</div><div class='add'>+	if (!info)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='ctx'> 	/* we have two blocks of memory.</div><div class='ctx'> 	info-&gt;screen_base which is vm, and is the fb used by apps.</div><div class='ctx'> 	par-&gt;metromem which is physically contiguous memory and</div><div class='ctx'> 	contains the display controller commands, waveform,</div><div class='ctx'> 	processed image data and padding. this is the data pulled</div><div class='del'>-	by the device's LCD controller and pushed to Metronome */</div><div class='add'>+	by the device's LCD controller and pushed to Metronome.</div><div class='add'>+	the metromem memory is allocated by the board driver and</div><div class='add'>+	is provided to us */</div><div class='add'>+</div><div class='add'>+	panel_type = board-&gt;get_panel_type();</div><div class='add'>+	switch (panel_type) {</div><div class='add'>+	case 6:</div><div class='add'>+		epd_dt_index = 0;</div><div class='add'>+		break;</div><div class='add'>+	case 8:</div><div class='add'>+		epd_dt_index = 1;</div><div class='add'>+		break;</div><div class='add'>+	case 97:</div><div class='add'>+		epd_dt_index = 2;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dev_err(&amp;dev-&gt;dev, "Unexpected panel type. Defaulting to 6\n");</div><div class='add'>+		epd_dt_index = 0;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fw = epd_frame_table[epd_dt_index].fw;</div><div class='add'>+	fh = epd_frame_table[epd_dt_index].fh;</div><div class='ctx'> </div><div class='del'>-	videomemorysize = (DPY_W*DPY_H);</div><div class='add'>+	/* we need to add a spare page because our csum caching scheme walks</div><div class='add'>+	 * to the end of the page */</div><div class='add'>+	videomemorysize = PAGE_SIZE + (fw * fh);</div><div class='ctx'> 	videomemory = vmalloc(videomemorysize);</div><div class='ctx'> 	if (!videomemory)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+		goto err_fb_rel;</div><div class='ctx'> </div><div class='ctx'> 	memset(videomemory, 0, videomemorysize);</div><div class='ctx'> </div><div class='del'>-	info = framebuffer_alloc(sizeof(struct metronomefb_par), &amp;dev-&gt;dev);</div><div class='del'>-	if (!info)</div><div class='del'>-		goto err_vfree;</div><div class='del'>-</div><div class='ctx'> 	info-&gt;screen_base = (char __force __iomem *)videomemory;</div><div class='ctx'> 	info-&gt;fbops = &amp;metronomefb_ops;</div><div class='ctx'> </div><div class='add'>+	metronomefb_fix.line_length = fw;</div><div class='add'>+	metronomefb_var.xres = fw;</div><div class='add'>+	metronomefb_var.yres = fh;</div><div class='add'>+	metronomefb_var.xres_virtual = fw;</div><div class='add'>+	metronomefb_var.yres_virtual = fh;</div><div class='ctx'> 	info-&gt;var = metronomefb_var;</div><div class='ctx'> 	info-&gt;fix = metronomefb_fix;</div><div class='ctx'> 	info-&gt;fix.smem_len = videomemorysize;</div><div class='ctx'> 	par = info-&gt;par;</div><div class='ctx'> 	par-&gt;info = info;</div><div class='ctx'> 	par-&gt;board = board;</div><div class='add'>+	par-&gt;dt = epd_dt_index;</div><div class='ctx'> 	init_waitqueue_head(&amp;par-&gt;waitq);</div><div class='ctx'> </div><div class='ctx'> 	/* this table caches per page csum values. */</div><div class='ctx'> 	par-&gt;csum_table = vmalloc(videomemorysize/PAGE_SIZE);</div><div class='ctx'> 	if (!par-&gt;csum_table)</div><div class='add'>+		goto err_vfree;</div><div class='add'>+</div><div class='add'>+	/* the physical framebuffer that we use is setup by</div><div class='add'>+	 * the platform device driver. It will provide us</div><div class='add'>+	 * with cmd, wfm and image memory in a contiguous area. */</div><div class='add'>+	retval = board-&gt;setup_fb(par);</div><div class='add'>+	if (retval) {</div><div class='add'>+		dev_err(&amp;dev-&gt;dev, "Failed to setup fb\n");</div><div class='ctx'> 		goto err_csum_table;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	/* the metromem buffer is divided as follows:</div><div class='del'>-	command | CRC | padding</div><div class='del'>-	16kb waveform data | CRC | padding</div><div class='del'>-	image data | CRC</div><div class='del'>-	and an extra 256 bytes for dma descriptors</div><div class='del'>-	eg: IW=832 IH=622 WS=128</div><div class='del'>-	*/</div><div class='del'>-</div><div class='del'>-	cmd_size = 1 * epd_frame_table[0].fw;</div><div class='del'>-	wfm_size = ((16*1024 + 2 + epd_frame_table[0].fw - 1)</div><div class='del'>-			/ epd_frame_table[0].fw) * epd_frame_table[0].fw;</div><div class='del'>-	img_size = epd_frame_table[0].fh * epd_frame_table[0].fw;</div><div class='del'>-	padding_size = 4 * epd_frame_table[0].fw;</div><div class='del'>-	totalsize = cmd_size + wfm_size + img_size + padding_size;</div><div class='del'>-	par-&gt;metromemsize = PAGE_ALIGN(totalsize + 256);</div><div class='del'>-	DPRINTK("desired memory size = %d\n", par-&gt;metromemsize);</div><div class='del'>-	dev-&gt;dev.coherent_dma_mask = 0xffffffffull;</div><div class='del'>-	par-&gt;metromem = dma_alloc_writecombine(&amp;dev-&gt;dev, par-&gt;metromemsize,</div><div class='del'>-						&amp;par-&gt;metromem_dma, GFP_KERNEL);</div><div class='del'>-	if (!par-&gt;metromem) {</div><div class='del'>-		printk(KERN_ERR</div><div class='del'>-			"metronomefb: unable to allocate dma buffer\n");</div><div class='del'>-		goto err_vfree;</div><div class='add'>+	/* after this point we should have a framebuffer */</div><div class='add'>+	if ((!par-&gt;metromem_wfm) ||  (!par-&gt;metromem_img) ||</div><div class='add'>+		(!par-&gt;metromem_dma)) {</div><div class='add'>+		dev_err(&amp;dev-&gt;dev, "fb access failure\n");</div><div class='add'>+		retval = -EINVAL;</div><div class='add'>+		goto err_csum_table;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	info-&gt;fix.smem_start = par-&gt;metromem_dma;</div><div class='del'>-	par-&gt;metromem_cmd = (struct metromem_cmd *) par-&gt;metromem;</div><div class='del'>-	par-&gt;metromem_wfm = par-&gt;metromem + cmd_size;</div><div class='del'>-	par-&gt;metromem_img = par-&gt;metromem + cmd_size + wfm_size;</div><div class='del'>-	par-&gt;metromem_img_csum = (u16 *) (par-&gt;metromem_img +</div><div class='del'>-					(epd_frame_table[0].fw * DPY_H));</div><div class='del'>-	DPRINTK("img offset=0x%x\n", cmd_size + wfm_size);</div><div class='del'>-	par-&gt;metromem_desc = (struct metromem_desc *) (par-&gt;metromem + cmd_size</div><div class='del'>-					+ wfm_size + img_size + padding_size);</div><div class='del'>-	par-&gt;metromem_desc_dma = par-&gt;metromem_dma + cmd_size + wfm_size</div><div class='del'>-				 + img_size + padding_size;</div><div class='ctx'> </div><div class='ctx'> 	/* load the waveform in. assume mode 3, temp 31 for now</div><div class='ctx'> 		a) request the waveform file from userspace</div><div class='ctx'> 		b) process waveform and decode into metromem */</div><div class='ctx'> 	retval = request_firmware(&amp;fw_entry, "metronome.wbf", &amp;dev-&gt;dev);</div><div class='ctx'> 	if (retval &lt; 0) {</div><div class='del'>-		printk(KERN_ERR "metronomefb: couldn't get waveform\n");</div><div class='del'>-		goto err_dma_free;</div><div class='add'>+		dev_err(&amp;dev-&gt;dev, "Failed to get waveform\n");</div><div class='add'>+		goto err_csum_table;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	retval = load_waveform((u8 *) fw_entry-&gt;data, fw_entry-&gt;size,</div><div class='del'>-				par-&gt;metromem_wfm, 3, 31, &amp;par-&gt;frame_count);</div><div class='add'>+	retval = load_waveform((u8 *) fw_entry-&gt;data, fw_entry-&gt;size, 3, 31,</div><div class='add'>+				par);</div><div class='ctx'> 	release_firmware(fw_entry);</div><div class='ctx'> 	if (retval &lt; 0) {</div><div class='del'>-		printk(KERN_ERR "metronomefb: couldn't process waveform\n");</div><div class='del'>-		goto err_dma_free;</div><div class='add'>+		dev_err(&amp;dev-&gt;dev, "Failed processing waveform\n");</div><div class='add'>+		goto err_csum_table;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (board-&gt;setup_irq(info))</div><div class='del'>-		goto err_dma_free;</div><div class='add'>+		goto err_csum_table;</div><div class='ctx'> </div><div class='ctx'> 	retval = metronome_init_regs(par);</div><div class='ctx'> 	if (retval &lt; 0)</div><div class='hunk'>@@ -688,8 +707,8 @@ static int __devinit metronomefb_probe(struct platform_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	retval = fb_alloc_cmap(&amp;info-&gt;cmap, 8, 0);</div><div class='ctx'> 	if (retval &lt; 0) {</div><div class='del'>-		printk(KERN_ERR "Failed to allocate colormap\n");</div><div class='del'>-		goto err_fb_rel;</div><div class='add'>+		dev_err(&amp;dev-&gt;dev, "Failed to allocate colormap\n");</div><div class='add'>+		goto err_free_irq;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* set cmap */</div><div class='hunk'>@@ -704,7 +723,7 @@ static int __devinit metronomefb_probe(struct platform_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	platform_set_drvdata(dev, info);</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO</div><div class='add'>+	dev_dbg(&amp;dev-&gt;dev,</div><div class='ctx'> 		"fb%d: Metronome frame buffer device, using %dK of video"</div><div class='ctx'> 		" memory\n", info-&gt;node, videomemorysize &gt;&gt; 10);</div><div class='ctx'> </div><div class='hunk'>@@ -712,17 +731,15 @@ static int __devinit metronomefb_probe(struct platform_device *dev)</div><div class='ctx'> </div><div class='ctx'> err_cmap:</div><div class='ctx'> 	fb_dealloc_cmap(&amp;info-&gt;cmap);</div><div class='del'>-err_fb_rel:</div><div class='del'>-	framebuffer_release(info);</div><div class='ctx'> err_free_irq:</div><div class='del'>-	board-&gt;free_irq(info);</div><div class='del'>-err_dma_free:</div><div class='del'>-	dma_free_writecombine(&amp;dev-&gt;dev, par-&gt;metromemsize, par-&gt;metromem,</div><div class='del'>-				par-&gt;metromem_dma);</div><div class='add'>+	board-&gt;cleanup(par);</div><div class='ctx'> err_csum_table:</div><div class='ctx'> 	vfree(par-&gt;csum_table);</div><div class='ctx'> err_vfree:</div><div class='ctx'> 	vfree(videomemory);</div><div class='add'>+err_fb_rel:</div><div class='add'>+	framebuffer_release(info);</div><div class='add'>+err:</div><div class='ctx'> 	module_put(board-&gt;owner);</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='hunk'>@@ -733,15 +750,15 @@ static int __devexit metronomefb_remove(struct platform_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	if (info) {</div><div class='ctx'> 		struct metronomefb_par *par = info-&gt;par;</div><div class='add'>+</div><div class='add'>+		unregister_framebuffer(info);</div><div class='ctx'> 		fb_deferred_io_cleanup(info);</div><div class='del'>-		dma_free_writecombine(&amp;dev-&gt;dev, par-&gt;metromemsize,</div><div class='del'>-					par-&gt;metromem, par-&gt;metromem_dma);</div><div class='ctx'> 		fb_dealloc_cmap(&amp;info-&gt;cmap);</div><div class='add'>+		par-&gt;board-&gt;cleanup(par);</div><div class='ctx'> 		vfree(par-&gt;csum_table);</div><div class='del'>-		unregister_framebuffer(info);</div><div class='ctx'> 		vfree((void __force *)info-&gt;screen_base);</div><div class='del'>-		par-&gt;board-&gt;free_irq(info);</div><div class='ctx'> 		module_put(par-&gt;board-&gt;owner);</div><div class='add'>+		dev_dbg(&amp;dev-&gt;dev, "calling release\n");</div><div class='ctx'> 		framebuffer_release(info);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -766,6 +783,9 @@ static void __exit metronomefb_exit(void)</div><div class='ctx'> 	platform_driver_unregister(&amp;metronomefb_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+module_param(user_wfm_size, uint, 0);</div><div class='add'>+MODULE_PARM_DESC(user_wfm_size, "Set custom waveform size");</div><div class='add'>+</div><div class='ctx'> module_init(metronomefb_init);</div><div class='ctx'> module_exit(metronomefb_exit);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/video/neofb.c b/drivers/video/neofb.c<br/>index 25172b2a2a94..bfb802d26d5a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/neofb.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/video/neofb.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/neofb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/neofb.c</a></div><div class='hunk'>@@ -426,11 +426,11 @@ static void vgaHWProtect(int on)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char tmp;</div><div class='ctx'> </div><div class='add'>+	tmp = vga_rseq(NULL, 0x01);</div><div class='ctx'> 	if (on) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Turn off screen and disable sequencer.</div><div class='ctx'> 		 */</div><div class='del'>-		tmp = vga_rseq(NULL, 0x01);</div><div class='ctx'> 		vga_wseq(NULL, 0x00, 0x01);		/* Synchronous Reset */</div><div class='ctx'> 		vga_wseq(NULL, 0x01, tmp | 0x20);	/* disable the display */</div><div class='ctx'> </div><div class='hunk'>@@ -439,7 +439,6 @@ static void vgaHWProtect(int on)</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Reenable sequencer, then turn on screen.</div><div class='ctx'> 		 */</div><div class='del'>-		tmp = vga_rseq(NULL, 0x01);</div><div class='ctx'> 		vga_wseq(NULL, 0x01, tmp &amp; ~0x20);	/* reenable display */</div><div class='ctx'> 		vga_wseq(NULL, 0x00, 0x03);		/* clear synchronousreset */</div><div class='ctx'> </div><div class='hunk'>@@ -558,14 +557,12 @@ neofb_open(struct fb_info *info, int user)</div><div class='ctx'> {</div><div class='ctx'> 	struct neofb_par *par = info-&gt;par;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;par-&gt;open_lock);</div><div class='ctx'> 	if (!par-&gt;ref_count) {</div><div class='ctx'> 		memset(&amp;par-&gt;state, 0, sizeof(struct vgastate));</div><div class='ctx'> 		par-&gt;state.flags = VGA_SAVE_MODE | VGA_SAVE_FONTS;</div><div class='ctx'> 		save_vga(&amp;par-&gt;state);</div><div class='ctx'> 	}</div><div class='ctx'> 	par-&gt;ref_count++;</div><div class='del'>-	mutex_unlock(&amp;par-&gt;open_lock);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -575,16 +572,13 @@ neofb_release(struct fb_info *info, int user)</div><div class='ctx'> {</div><div class='ctx'> 	struct neofb_par *par = info-&gt;par;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;par-&gt;open_lock);</div><div class='del'>-	if (!par-&gt;ref_count) {</div><div class='del'>-		mutex_unlock(&amp;par-&gt;open_lock);</div><div class='add'>+	if (!par-&gt;ref_count)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	}</div><div class='add'>+</div><div class='ctx'> 	if (par-&gt;ref_count == 1) {</div><div class='ctx'> 		restore_vga(&amp;par-&gt;state);</div><div class='ctx'> 	}</div><div class='ctx'> 	par-&gt;ref_count--;</div><div class='del'>-	mutex_unlock(&amp;par-&gt;open_lock);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -648,10 +642,10 @@ neofb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)</div><div class='ctx'> 	var-&gt;blue.msb_right = 0;</div><div class='ctx'> 	var-&gt;transp.msb_right = 0;</div><div class='ctx'> </div><div class='add'>+	var-&gt;transp.offset = 0;</div><div class='add'>+	var-&gt;transp.length = 0;</div><div class='ctx'> 	switch (var-&gt;bits_per_pixel) {</div><div class='ctx'> 	case 8:		/* PSEUDOCOLOUR, 256 */</div><div class='del'>-		var-&gt;transp.offset = 0;</div><div class='del'>-		var-&gt;transp.length = 0;</div><div class='ctx'> 		var-&gt;red.offset = 0;</div><div class='ctx'> 		var-&gt;red.length = 8;</div><div class='ctx'> 		var-&gt;green.offset = 0;</div><div class='hunk'>@@ -661,8 +655,6 @@ neofb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case 16:		/* DIRECTCOLOUR, 64k */</div><div class='del'>-		var-&gt;transp.offset = 0;</div><div class='del'>-		var-&gt;transp.length = 0;</div><div class='ctx'> 		var-&gt;red.offset = 11;</div><div class='ctx'> 		var-&gt;red.length = 5;</div><div class='ctx'> 		var-&gt;green.offset = 5;</div><div class='hunk'>@@ -672,8 +664,6 @@ neofb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case 24:		/* TRUECOLOUR, 16m */</div><div class='del'>-		var-&gt;transp.offset = 0;</div><div class='del'>-		var-&gt;transp.length = 0;</div><div class='ctx'> 		var-&gt;red.offset = 16;</div><div class='ctx'> 		var-&gt;red.length = 8;</div><div class='ctx'> 		var-&gt;green.offset = 8;</div><div class='hunk'>@@ -704,8 +694,6 @@ neofb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)</div><div class='ctx'> 	if (vramlen &gt; 4 * 1024 * 1024)</div><div class='ctx'> 		vramlen = 4 * 1024 * 1024;</div><div class='ctx'> </div><div class='del'>-	if (var-&gt;yres_virtual &lt; var-&gt;yres)</div><div class='del'>-		var-&gt;yres_virtual = var-&gt;yres;</div><div class='ctx'> 	if (var-&gt;xres_virtual &lt; var-&gt;xres)</div><div class='ctx'> 		var-&gt;xres_virtual = var-&gt;xres;</div><div class='ctx'> </div><div class='hunk'>@@ -722,8 +710,6 @@ neofb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)</div><div class='ctx'> 	   if it was possible. We should return -EINVAL, but I disagree */</div><div class='ctx'> 	if (var-&gt;yres_virtual &lt; var-&gt;yres)</div><div class='ctx'> 		var-&gt;yres = var-&gt;yres_virtual;</div><div class='del'>-	if (var-&gt;xres_virtual &lt; var-&gt;xres)</div><div class='del'>-		var-&gt;xres = var-&gt;xres_virtual;</div><div class='ctx'> 	if (var-&gt;xoffset + var-&gt;xres &gt; var-&gt;xres_virtual)</div><div class='ctx'> 		var-&gt;xoffset = var-&gt;xres_virtual - var-&gt;xres;</div><div class='ctx'> 	if (var-&gt;yoffset + var-&gt;yres &gt; var-&gt;yres_virtual)</div><div class='hunk'>@@ -1186,8 +1172,11 @@ static int neofb_set_par(struct fb_info *info)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void neofb_update_start(struct fb_info *info,</div><div class='del'>-			       struct fb_var_screeninfo *var)</div><div class='add'>+/*</div><div class='add'>+ *    Pan or Wrap the Display</div><div class='add'>+ */</div><div class='add'>+static int neofb_pan_display(struct fb_var_screeninfo *var,</div><div class='add'>+			     struct fb_info *info)</div><div class='ctx'> {</div><div class='ctx'> 	struct neofb_par *par = info-&gt;par;</div><div class='ctx'> 	struct vgastate *state = &amp;par-&gt;state;</div><div class='hunk'>@@ -1216,35 +1205,7 @@ static void neofb_update_start(struct fb_info *info,</div><div class='ctx'> 	vga_wgfx(state-&gt;vgabase, 0x0E, (((Base &gt;&gt; 16) &amp; 0x0f) | (oldExtCRTDispAddr &amp; 0xf0)));</div><div class='ctx'> </div><div class='ctx'> 	neoLock(state);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *    Pan or Wrap the Display</div><div class='del'>- */</div><div class='del'>-static int neofb_pan_display(struct fb_var_screeninfo *var,</div><div class='del'>-			     struct fb_info *info)</div><div class='del'>-{</div><div class='del'>-	u_int y_bottom;</div><div class='del'>-</div><div class='del'>-	y_bottom = var-&gt;yoffset;</div><div class='del'>-</div><div class='del'>-	if (!(var-&gt;vmode &amp; FB_VMODE_YWRAP))</div><div class='del'>-		y_bottom += var-&gt;yres;</div><div class='ctx'> </div><div class='del'>-	if (var-&gt;xoffset &gt; (var-&gt;xres_virtual - var-&gt;xres))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	if (y_bottom &gt; info-&gt;var.yres_virtual)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	neofb_update_start(info, var);</div><div class='del'>-</div><div class='del'>-	info-&gt;var.xoffset = var-&gt;xoffset;</div><div class='del'>-	info-&gt;var.yoffset = var-&gt;yoffset;</div><div class='del'>-</div><div class='del'>-	if (var-&gt;vmode &amp; FB_VMODE_YWRAP)</div><div class='del'>-		info-&gt;var.vmode |= FB_VMODE_YWRAP;</div><div class='del'>-	else</div><div class='del'>-		info-&gt;var.vmode &amp;= ~FB_VMODE_YWRAP;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1992,7 +1953,6 @@ static struct fb_info *__devinit neo_alloc_fb_info(struct pci_dev *dev, const st</div><div class='ctx'> </div><div class='ctx'> 	info-&gt;fix.accel = id-&gt;driver_data;</div><div class='ctx'> </div><div class='del'>-	mutex_init(&amp;par-&gt;open_lock);</div><div class='ctx'> 	par-&gt;pci_burst = !nopciburst;</div><div class='ctx'> 	par-&gt;lcd_stretch = !nostretch;</div><div class='ctx'> 	par-&gt;libretto = libretto;</div><div class='head'>diff --git a/drivers/video/omap/dispc.c b/drivers/video/omap/dispc.c<br/>index 6efcf89e7fbe..dfb72f5e4c96 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/omap/dispc.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/video/omap/dispc.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/omap/dispc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/omap/dispc.c</a></div><div class='hunk'>@@ -156,7 +156,7 @@ struct resmap {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct {</div><div class='del'>-	u32		base;</div><div class='add'>+	void __iomem	*base;</div><div class='ctx'> </div><div class='ctx'> 	struct omapfb_mem_desc	mem_desc;</div><div class='ctx'> 	struct resmap		*res_map[DISPC_MEMTYPE_NUM];</div><div class='hunk'>@@ -212,9 +212,9 @@ static void enable_rfbi_mode(int enable)</div><div class='ctx'> 	dispc_write_reg(DISPC_CONTROL, l);</div><div class='ctx'> </div><div class='ctx'> 	/* Set bypass mode in RFBI module */</div><div class='del'>-	l = __raw_readl(io_p2v(RFBI_CONTROL));</div><div class='add'>+	l = __raw_readl(IO_ADDRESS(RFBI_CONTROL));</div><div class='ctx'> 	l |= enable ? 0 : (1 &lt;&lt; 1);</div><div class='del'>-	__raw_writel(l, io_p2v(RFBI_CONTROL));</div><div class='add'>+	__raw_writel(l, IO_ADDRESS(RFBI_CONTROL));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void set_lcd_data_lines(int data_lines)</div><div class='hunk'>@@ -1349,14 +1349,19 @@ static int omap_dispc_init(struct omapfb_device *fbdev, int ext_mode,</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;dispc, 0, sizeof(dispc));</div><div class='ctx'> </div><div class='del'>-	dispc.base = io_p2v(DISPC_BASE);</div><div class='add'>+	dispc.base = ioremap(DISPC_BASE, SZ_1K);</div><div class='add'>+	if (!dispc.base) {</div><div class='add'>+		dev_err(fbdev-&gt;dev, "can't ioremap DISPC\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	dispc.fbdev = fbdev;</div><div class='ctx'> 	dispc.ext_mode = ext_mode;</div><div class='ctx'> </div><div class='ctx'> 	init_completion(&amp;dispc.frame_done);</div><div class='ctx'> </div><div class='ctx'> 	if ((r = get_dss_clocks()) &lt; 0)</div><div class='del'>-		return r;</div><div class='add'>+		goto fail0;</div><div class='ctx'> </div><div class='ctx'> 	enable_interface_clocks(1);</div><div class='ctx'> 	enable_lcd_clocks(1);</div><div class='hunk'>@@ -1414,7 +1419,7 @@ static int omap_dispc_init(struct omapfb_device *fbdev, int ext_mode,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* L3 firewall setting: enable access to OCM RAM */</div><div class='del'>-	__raw_writel(0x402000b0, io_p2v(0x680050a0));</div><div class='add'>+	__raw_writel(0x402000b0, IO_ADDRESS(0x680050a0));</div><div class='ctx'> </div><div class='ctx'> 	if ((r = alloc_palette_ram()) &lt; 0)</div><div class='ctx'> 		goto fail2;</div><div class='hunk'>@@ -1464,7 +1469,8 @@ fail1:</div><div class='ctx'> 	enable_lcd_clocks(0);</div><div class='ctx'> 	enable_interface_clocks(0);</div><div class='ctx'> 	put_dss_clocks();</div><div class='del'>-</div><div class='add'>+fail0:</div><div class='add'>+	iounmap(dispc.base);</div><div class='ctx'> 	return r;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1481,6 +1487,7 @@ static void omap_dispc_cleanup(void)</div><div class='ctx'> 	free_irq(INT_24XX_DSS_IRQ, dispc.fbdev);</div><div class='ctx'> 	enable_interface_clocks(0);</div><div class='ctx'> 	put_dss_clocks();</div><div class='add'>+	iounmap(dispc.base);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> const struct lcd_ctrl omap2_int_ctrl = {</div><div class='head'>diff --git a/drivers/video/omap/dispc.h b/drivers/video/omap/dispc.h<br/>index eb1512b56ce8..ef720a78f6d5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/omap/dispc.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/video/omap/dispc.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/omap/dispc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/omap/dispc.h</a></div><div class='hunk'>@@ -40,4 +40,6 @@ extern void omap_dispc_enable_digit_out(int enable);</div><div class='ctx'> extern int  omap_dispc_request_irq(void (*callback)(void *data), void *data);</div><div class='ctx'> extern void omap_dispc_free_irq(void);</div><div class='ctx'> </div><div class='add'>+extern const struct lcd_ctrl omap2_int_ctrl;</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/video/omap/lcd_h4.c b/drivers/video/omap/lcd_h4.c<br/>index 88c19d424ef7..6ff56430341b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/omap/lcd_h4.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/video/omap/lcd_h4.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/omap/lcd_h4.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/omap/lcd_h4.c</a></div><div class='hunk'>@@ -47,7 +47,7 @@ static unsigned long h4_panel_get_caps(struct lcd_panel *panel)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct lcd_panel h4_panel = {</div><div class='add'>+static struct lcd_panel h4_panel = {</div><div class='ctx'> 	.name		= "h4",</div><div class='ctx'> 	.config		= OMAP_LCDC_PANEL_TFT,</div><div class='ctx'> </div><div class='hunk'>@@ -91,7 +91,7 @@ static int h4_panel_resume(struct platform_device *pdev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct platform_driver h4_panel_driver = {</div><div class='add'>+static struct platform_driver h4_panel_driver = {</div><div class='ctx'> 	.probe		= h4_panel_probe,</div><div class='ctx'> 	.remove		= h4_panel_remove,</div><div class='ctx'> 	.suspend	= h4_panel_suspend,</div><div class='head'>diff --git a/drivers/video/omap/lcd_inn1610.c b/drivers/video/omap/lcd_inn1610.c<br/>index 6a42c6a0cd99..4c4f7ee6d733 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/omap/lcd_inn1610.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/video/omap/lcd_inn1610.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/omap/lcd_inn1610.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/omap/lcd_inn1610.c</a></div><div class='hunk'>@@ -32,43 +32,43 @@ static int innovator1610_panel_init(struct lcd_panel *panel,</div><div class='ctx'> {</div><div class='ctx'> 	int r = 0;</div><div class='ctx'> </div><div class='del'>-	if (omap_request_gpio(14)) {</div><div class='add'>+	if (gpio_request(14, "lcd_en0")) {</div><div class='ctx'> 		pr_err(MODULE_NAME ": can't request GPIO 14\n");</div><div class='ctx'> 		r = -1;</div><div class='ctx'> 		goto exit;</div><div class='ctx'> 	}</div><div class='del'>-	if (omap_request_gpio(15)) {</div><div class='add'>+	if (gpio_request(15, "lcd_en1")) {</div><div class='ctx'> 		pr_err(MODULE_NAME ": can't request GPIO 15\n");</div><div class='del'>-		omap_free_gpio(14);</div><div class='add'>+		gpio_free(14);</div><div class='ctx'> 		r = -1;</div><div class='ctx'> 		goto exit;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* configure GPIO(14, 15) as outputs */</div><div class='del'>-	omap_set_gpio_direction(14, 0);</div><div class='del'>-	omap_set_gpio_direction(15, 0);</div><div class='add'>+	gpio_direction_output(14, 0);</div><div class='add'>+	gpio_direction_output(15, 0);</div><div class='ctx'> exit:</div><div class='ctx'> 	return r;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void innovator1610_panel_cleanup(struct lcd_panel *panel)</div><div class='ctx'> {</div><div class='del'>-	omap_free_gpio(15);</div><div class='del'>-	omap_free_gpio(14);</div><div class='add'>+	gpio_free(15);</div><div class='add'>+	gpio_free(14);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int innovator1610_panel_enable(struct lcd_panel *panel)</div><div class='ctx'> {</div><div class='ctx'> 	/* set GPIO14 and GPIO15 high */</div><div class='del'>-	omap_set_gpio_dataout(14, 1);</div><div class='del'>-	omap_set_gpio_dataout(15, 1);</div><div class='add'>+	gpio_set_value(14, 1);</div><div class='add'>+	gpio_set_value(15, 1);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void innovator1610_panel_disable(struct lcd_panel *panel)</div><div class='ctx'> {</div><div class='ctx'> 	/* set GPIO13, GPIO14 and GPIO15 low */</div><div class='del'>-	omap_set_gpio_dataout(14, 0);</div><div class='del'>-	omap_set_gpio_dataout(15, 0);</div><div class='add'>+	gpio_set_value(14, 0);</div><div class='add'>+	gpio_set_value(15, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static unsigned long innovator1610_panel_get_caps(struct lcd_panel *panel)</div><div class='head'>diff --git a/drivers/video/omap/lcd_osk.c b/drivers/video/omap/lcd_osk.c<br/>index a4a725f427a4..379c96d36da5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/omap/lcd_osk.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/video/omap/lcd_osk.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/omap/lcd_osk.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/omap/lcd_osk.c</a></div><div class='hunk'>@@ -29,6 +29,7 @@</div><div class='ctx'> </div><div class='ctx'> static int osk_panel_init(struct lcd_panel *panel, struct omapfb_device *fbdev)</div><div class='ctx'> {</div><div class='add'>+	/* gpio2 was allocated in board init */</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -47,11 +48,8 @@ static int osk_panel_enable(struct lcd_panel *panel)</div><div class='ctx'> 	/* Set PWL level */</div><div class='ctx'> 	omap_writeb(0xFF, OMAP_PWL_ENABLE);</div><div class='ctx'> </div><div class='del'>-	/* configure GPIO2 as output */</div><div class='del'>-	omap_set_gpio_direction(2, 0);</div><div class='del'>-</div><div class='del'>-	/* set GPIO2 high */</div><div class='del'>-	omap_set_gpio_dataout(2, 1);</div><div class='add'>+	/* set GPIO2 high (lcd power enabled) */</div><div class='add'>+	gpio_set_value(2, 1);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -65,7 +63,7 @@ static void osk_panel_disable(struct lcd_panel *panel)</div><div class='ctx'> 	omap_writeb(0x00, OMAP_PWL_CLK_ENABLE);</div><div class='ctx'> </div><div class='ctx'> 	/* set GPIO2 low */</div><div class='del'>-	omap_set_gpio_dataout(2, 0);</div><div class='add'>+	gpio_set_value(2, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static unsigned long osk_panel_get_caps(struct lcd_panel *panel)</div><div class='head'>diff --git a/drivers/video/omap/lcd_sx1.c b/drivers/video/omap/lcd_sx1.c<br/>index caa6a896cb8b..e55de201b8ff 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/omap/lcd_sx1.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/video/omap/lcd_sx1.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/omap/lcd_sx1.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/omap/lcd_sx1.c</a></div><div class='hunk'>@@ -81,21 +81,21 @@ static void epson_sendbyte(int flag, unsigned char byte)</div><div class='ctx'> 	int i, shifter = 0x80;</div><div class='ctx'> </div><div class='ctx'> 	if (!flag)</div><div class='del'>-		omap_set_gpio_dataout(_A_LCD_SSC_A0, 0);</div><div class='add'>+		gpio_set_value(_A_LCD_SSC_A0, 0);</div><div class='ctx'> 	mdelay(2);</div><div class='del'>-	omap_set_gpio_dataout(A_LCD_SSC_RD, 1);</div><div class='add'>+	gpio_set_value(A_LCD_SSC_RD, 1);</div><div class='ctx'> </div><div class='del'>-	omap_set_gpio_dataout(A_LCD_SSC_SD, flag);</div><div class='add'>+	gpio_set_value(A_LCD_SSC_SD, flag);</div><div class='ctx'> </div><div class='ctx'> 	OMAP_MCBSP_WRITE(OMAP1510_MCBSP3_BASE, PCR0, 0x2200);</div><div class='ctx'> 	OMAP_MCBSP_WRITE(OMAP1510_MCBSP3_BASE, PCR0, 0x2202);</div><div class='ctx'> 	for (i = 0; i &lt; 8; i++) {</div><div class='ctx'> 		OMAP_MCBSP_WRITE(OMAP1510_MCBSP3_BASE, PCR0, 0x2200);</div><div class='del'>-		omap_set_gpio_dataout(A_LCD_SSC_SD, shifter &amp; byte);</div><div class='add'>+		gpio_set_value(A_LCD_SSC_SD, shifter &amp; byte);</div><div class='ctx'> 		OMAP_MCBSP_WRITE(OMAP1510_MCBSP3_BASE, PCR0, 0x2202);</div><div class='ctx'> 		shifter &gt;&gt;= 1;</div><div class='ctx'> 	}</div><div class='del'>-	omap_set_gpio_dataout(_A_LCD_SSC_A0, 1);</div><div class='add'>+	gpio_set_value(_A_LCD_SSC_A0, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void init_system(void)</div><div class='hunk'>@@ -107,25 +107,18 @@ static void init_system(void)</div><div class='ctx'> static void setup_GPIO(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* new wave */</div><div class='del'>-	omap_request_gpio(A_LCD_SSC_RD);</div><div class='del'>-	omap_request_gpio(A_LCD_SSC_SD);</div><div class='del'>-	omap_request_gpio(_A_LCD_RESET);</div><div class='del'>-	omap_request_gpio(_A_LCD_SSC_CS);</div><div class='del'>-	omap_request_gpio(_A_LCD_SSC_A0);</div><div class='del'>-</div><div class='del'>-	/* set all GPIOs to output */</div><div class='del'>-	omap_set_gpio_direction(A_LCD_SSC_RD, 0);</div><div class='del'>-	omap_set_gpio_direction(A_LCD_SSC_SD, 0);</div><div class='del'>-	omap_set_gpio_direction(_A_LCD_RESET, 0);</div><div class='del'>-	omap_set_gpio_direction(_A_LCD_SSC_CS, 0);</div><div class='del'>-	omap_set_gpio_direction(_A_LCD_SSC_A0, 0);</div><div class='del'>-</div><div class='del'>-	/* set GPIO data */</div><div class='del'>-	omap_set_gpio_dataout(A_LCD_SSC_RD, 1);</div><div class='del'>-	omap_set_gpio_dataout(A_LCD_SSC_SD, 0);</div><div class='del'>-	omap_set_gpio_dataout(_A_LCD_RESET, 0);</div><div class='del'>-	omap_set_gpio_dataout(_A_LCD_SSC_CS, 1);</div><div class='del'>-	omap_set_gpio_dataout(_A_LCD_SSC_A0, 1);</div><div class='add'>+	gpio_request(A_LCD_SSC_RD, "lcd_ssc_rd");</div><div class='add'>+	gpio_request(A_LCD_SSC_SD, "lcd_ssc_sd");</div><div class='add'>+	gpio_request(_A_LCD_RESET, "lcd_reset");</div><div class='add'>+	gpio_request(_A_LCD_SSC_CS, "lcd_ssc_cs");</div><div class='add'>+	gpio_request(_A_LCD_SSC_A0, "lcd_ssc_a0");</div><div class='add'>+</div><div class='add'>+	/* set GPIOs to output, with initial data */</div><div class='add'>+	gpio_direction_output(A_LCD_SSC_RD, 1);</div><div class='add'>+	gpio_direction_output(A_LCD_SSC_SD, 0);</div><div class='add'>+	gpio_direction_output(_A_LCD_RESET, 0);</div><div class='add'>+	gpio_direction_output(_A_LCD_SSC_CS, 1);</div><div class='add'>+	gpio_direction_output(_A_LCD_SSC_A0, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void display_init(void)</div><div class='hunk'>@@ -139,61 +132,61 @@ static void display_init(void)</div><div class='ctx'> 	mdelay(2);</div><div class='ctx'> </div><div class='ctx'> 	/* reset LCD */</div><div class='del'>-	omap_set_gpio_dataout(A_LCD_SSC_SD, 1);</div><div class='add'>+	gpio_set_value(A_LCD_SSC_SD, 1);</div><div class='ctx'> 	epson_sendbyte(0, 0x25);</div><div class='ctx'> </div><div class='del'>-	omap_set_gpio_dataout(_A_LCD_RESET, 0);</div><div class='add'>+	gpio_set_value(_A_LCD_RESET, 0);</div><div class='ctx'> 	mdelay(10);</div><div class='del'>-	omap_set_gpio_dataout(_A_LCD_RESET, 1);</div><div class='add'>+	gpio_set_value(_A_LCD_RESET, 1);</div><div class='ctx'> </div><div class='del'>-	omap_set_gpio_dataout(_A_LCD_SSC_CS, 1);</div><div class='add'>+	gpio_set_value(_A_LCD_SSC_CS, 1);</div><div class='ctx'> 	mdelay(2);</div><div class='del'>-	omap_set_gpio_dataout(_A_LCD_SSC_CS, 0);</div><div class='add'>+	gpio_set_value(_A_LCD_SSC_CS, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* init LCD, phase 1 */</div><div class='ctx'> 	epson_sendbyte(0, 0xCA);</div><div class='ctx'> 	for (i = 0; i &lt; 10; i++)</div><div class='ctx'> 		epson_sendbyte(1, INIT_1[i]);</div><div class='del'>-	omap_set_gpio_dataout(_A_LCD_SSC_CS, 1);</div><div class='del'>-	omap_set_gpio_dataout(_A_LCD_SSC_CS, 0);</div><div class='add'>+	gpio_set_value(_A_LCD_SSC_CS, 1);</div><div class='add'>+	gpio_set_value(_A_LCD_SSC_CS, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* init LCD phase 2 */</div><div class='ctx'> 	epson_sendbyte(0, 0xCB);</div><div class='ctx'> 	for (i = 0; i &lt; 125; i++)</div><div class='ctx'> 		epson_sendbyte(1, INIT_2[i]);</div><div class='del'>-	omap_set_gpio_dataout(_A_LCD_SSC_CS, 1);</div><div class='del'>-	omap_set_gpio_dataout(_A_LCD_SSC_CS, 0);</div><div class='add'>+	gpio_set_value(_A_LCD_SSC_CS, 1);</div><div class='add'>+	gpio_set_value(_A_LCD_SSC_CS, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* init LCD phase 2a */</div><div class='ctx'> 	epson_sendbyte(0, 0xCC);</div><div class='ctx'> 	for (i = 0; i &lt; 14; i++)</div><div class='ctx'> 		epson_sendbyte(1, INIT_3[i]);</div><div class='del'>-	omap_set_gpio_dataout(_A_LCD_SSC_CS, 1);</div><div class='del'>-	omap_set_gpio_dataout(_A_LCD_SSC_CS, 0);</div><div class='add'>+	gpio_set_value(_A_LCD_SSC_CS, 1);</div><div class='add'>+	gpio_set_value(_A_LCD_SSC_CS, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* init LCD phase 3 */</div><div class='ctx'> 	epson_sendbyte(0, 0xBC);</div><div class='ctx'> 	epson_sendbyte(1, 0x08);</div><div class='del'>-	omap_set_gpio_dataout(_A_LCD_SSC_CS, 1);</div><div class='del'>-	omap_set_gpio_dataout(_A_LCD_SSC_CS, 0);</div><div class='add'>+	gpio_set_value(_A_LCD_SSC_CS, 1);</div><div class='add'>+	gpio_set_value(_A_LCD_SSC_CS, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* init LCD phase 4 */</div><div class='ctx'> 	epson_sendbyte(0, 0x07);</div><div class='ctx'> 	epson_sendbyte(1, 0x05);</div><div class='del'>-	omap_set_gpio_dataout(_A_LCD_SSC_CS, 1);</div><div class='del'>-	omap_set_gpio_dataout(_A_LCD_SSC_CS, 0);</div><div class='add'>+	gpio_set_value(_A_LCD_SSC_CS, 1);</div><div class='add'>+	gpio_set_value(_A_LCD_SSC_CS, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* init LCD phase 5 */</div><div class='ctx'> 	epson_sendbyte(0, 0x94);</div><div class='del'>-	omap_set_gpio_dataout(_A_LCD_SSC_CS, 1);</div><div class='del'>-	omap_set_gpio_dataout(_A_LCD_SSC_CS, 0);</div><div class='add'>+	gpio_set_value(_A_LCD_SSC_CS, 1);</div><div class='add'>+	gpio_set_value(_A_LCD_SSC_CS, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* init LCD phase 6 */</div><div class='ctx'> 	epson_sendbyte(0, 0xC6);</div><div class='ctx'> 	epson_sendbyte(1, 0x80);</div><div class='del'>-	omap_set_gpio_dataout(_A_LCD_SSC_CS, 1);</div><div class='add'>+	gpio_set_value(_A_LCD_SSC_CS, 1);</div><div class='ctx'> 	mdelay(100); /* used to be 1000 */</div><div class='del'>-	omap_set_gpio_dataout(_A_LCD_SSC_CS, 0);</div><div class='add'>+	gpio_set_value(_A_LCD_SSC_CS, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* init LCD phase 7 */</div><div class='ctx'> 	epson_sendbyte(0, 0x16);</div><div class='hunk'>@@ -201,8 +194,8 @@ static void display_init(void)</div><div class='ctx'> 	epson_sendbyte(1, 0x00);</div><div class='ctx'> 	epson_sendbyte(1, 0xB1);</div><div class='ctx'> 	epson_sendbyte(1, 0x00);</div><div class='del'>-	omap_set_gpio_dataout(_A_LCD_SSC_CS, 1);</div><div class='del'>-	omap_set_gpio_dataout(_A_LCD_SSC_CS, 0);</div><div class='add'>+	gpio_set_value(_A_LCD_SSC_CS, 1);</div><div class='add'>+	gpio_set_value(_A_LCD_SSC_CS, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* init LCD phase 8 */</div><div class='ctx'> 	epson_sendbyte(0, 0x76);</div><div class='hunk'>@@ -210,12 +203,12 @@ static void display_init(void)</div><div class='ctx'> 	epson_sendbyte(1, 0x00);</div><div class='ctx'> 	epson_sendbyte(1, 0xDB);</div><div class='ctx'> 	epson_sendbyte(1, 0x00);</div><div class='del'>-	omap_set_gpio_dataout(_A_LCD_SSC_CS, 1);</div><div class='del'>-	omap_set_gpio_dataout(_A_LCD_SSC_CS, 0);</div><div class='add'>+	gpio_set_value(_A_LCD_SSC_CS, 1);</div><div class='add'>+	gpio_set_value(_A_LCD_SSC_CS, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* init LCD phase 9 */</div><div class='ctx'> 	epson_sendbyte(0, 0xAF);</div><div class='del'>-	omap_set_gpio_dataout(_A_LCD_SSC_CS, 1);</div><div class='add'>+	gpio_set_value(_A_LCD_SSC_CS, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int sx1_panel_init(struct lcd_panel *panel, struct omapfb_device *fbdev)</div><div class='hunk'>@@ -231,18 +224,18 @@ static void sx1_panel_disable(struct lcd_panel *panel)</div><div class='ctx'> {</div><div class='ctx'> 	printk(KERN_INFO "SX1: LCD panel disable\n");</div><div class='ctx'> 	sx1_setmmipower(0);</div><div class='del'>-	omap_set_gpio_dataout(_A_LCD_SSC_CS, 1);</div><div class='add'>+	gpio_set_value(_A_LCD_SSC_CS, 1);</div><div class='ctx'> </div><div class='ctx'> 	epson_sendbyte(0, 0x25);</div><div class='del'>-	omap_set_gpio_dataout(_A_LCD_SSC_CS, 0);</div><div class='add'>+	gpio_set_value(_A_LCD_SSC_CS, 0);</div><div class='ctx'> </div><div class='ctx'> 	epson_sendbyte(0, 0xAE);</div><div class='del'>-	omap_set_gpio_dataout(_A_LCD_SSC_CS, 1);</div><div class='add'>+	gpio_set_value(_A_LCD_SSC_CS, 1);</div><div class='ctx'> 	mdelay(100);</div><div class='del'>-	omap_set_gpio_dataout(_A_LCD_SSC_CS, 0);</div><div class='add'>+	gpio_set_value(_A_LCD_SSC_CS, 0);</div><div class='ctx'> </div><div class='ctx'> 	epson_sendbyte(0, 0x95);</div><div class='del'>-	omap_set_gpio_dataout(_A_LCD_SSC_CS, 1);</div><div class='add'>+	gpio_set_value(_A_LCD_SSC_CS, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int sx1_panel_enable(struct lcd_panel *panel)</div><div class='head'>diff --git a/drivers/video/omap/lcdc.c b/drivers/video/omap/lcdc.c<br/>index 83514f066712..6e2ea7518761 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/omap/lcdc.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/video/omap/lcdc.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/omap/lcdc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/omap/lcdc.c</a></div><div class='hunk'>@@ -34,6 +34,8 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "lcdc.h"</div><div class='add'>+</div><div class='ctx'> #define MODULE_NAME			"lcdc"</div><div class='ctx'> </div><div class='ctx'> #define OMAP_LCDC_BASE			0xfffec000</div><div class='head'>diff --git a/drivers/video/omap/lcdc.h b/drivers/video/omap/lcdc.h<br/>index adb731e5314a..845222270db3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/omap/lcdc.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/video/omap/lcdc.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/omap/lcdc.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/omap/lcdc.h</a></div><div class='hunk'>@@ -4,4 +4,6 @@</div><div class='ctx'> int omap_lcdc_set_dma_callback(void (*callback)(void *data), void *data);</div><div class='ctx'> void omap_lcdc_free_dma_callback(void);</div><div class='ctx'> </div><div class='add'>+extern const struct lcd_ctrl omap1_int_ctrl;</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/video/omap/omapfb_main.c b/drivers/video/omap/omapfb_main.c<br/>index 51a138bd113c..5a5e407dc45f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/omap/omapfb_main.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/video/omap/omapfb_main.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/omap/omapfb_main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/omap/omapfb_main.c</a></div><div class='hunk'>@@ -31,11 +31,14 @@</div><div class='ctx'> #include &lt;mach/dma.h&gt;</div><div class='ctx'> #include &lt;mach/omapfb.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "lcdc.h"</div><div class='add'>+#include "dispc.h"</div><div class='add'>+</div><div class='ctx'> #define MODULE_NAME	"omapfb"</div><div class='ctx'> </div><div class='ctx'> static unsigned int	def_accel;</div><div class='ctx'> static unsigned long	def_vram[OMAPFB_PLANE_NUM];</div><div class='del'>-static int		def_vram_cnt;</div><div class='add'>+static unsigned int	def_vram_cnt;</div><div class='ctx'> static unsigned long	def_vxres;</div><div class='ctx'> static unsigned long	def_vyres;</div><div class='ctx'> static unsigned int	def_rotate;</div><div class='hunk'>@@ -84,12 +87,10 @@ static struct caps_table_struct color_caps[] = {</div><div class='ctx'>  * LCD panel</div><div class='ctx'>  * ---------------------------------------------------------------------------</div><div class='ctx'>  */</div><div class='del'>-extern struct lcd_ctrl omap1_int_ctrl;</div><div class='del'>-extern struct lcd_ctrl omap2_int_ctrl;</div><div class='ctx'> extern struct lcd_ctrl hwa742_ctrl;</div><div class='ctx'> extern struct lcd_ctrl blizzard_ctrl;</div><div class='ctx'> </div><div class='del'>-static struct lcd_ctrl *ctrls[] = {</div><div class='add'>+static const struct lcd_ctrl *ctrls[] = {</div><div class='ctx'> #ifdef CONFIG_ARCH_OMAP1</div><div class='ctx'> 	&amp;omap1_int_ctrl,</div><div class='ctx'> #else</div><div class='hunk'>@@ -740,7 +741,7 @@ static int omapfb_update_win(struct fb_info *fbi,</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	omapfb_rqueue_lock(plane-&gt;fbdev);</div><div class='del'>-	ret = omapfb_update_window_async(fbi, win, NULL, 0);</div><div class='add'>+	ret = omapfb_update_window_async(fbi, win, NULL, NULL);</div><div class='ctx'> 	omapfb_rqueue_unlock(plane-&gt;fbdev);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -768,7 +769,7 @@ static int omapfb_update_full_screen(struct fb_info *fbi)</div><div class='ctx'> 	win.format = 0;</div><div class='ctx'> </div><div class='ctx'> 	omapfb_rqueue_lock(fbdev);</div><div class='del'>-	r = fbdev-&gt;ctrl-&gt;update_window(fbi, &amp;win, NULL, 0);</div><div class='add'>+	r = fbdev-&gt;ctrl-&gt;update_window(fbi, &amp;win, NULL, NULL);</div><div class='ctx'> 	omapfb_rqueue_unlock(fbdev);</div><div class='ctx'> </div><div class='ctx'> 	return r;</div><div class='hunk'>@@ -1047,7 +1048,7 @@ void omapfb_write_first_pixel(struct omapfb_device *fbdev, u16 pixval)</div><div class='ctx'> 		win.height = 2;</div><div class='ctx'> 		win.out_width = 2;</div><div class='ctx'> 		win.out_height = 2;</div><div class='del'>-		fbdev-&gt;ctrl-&gt;update_window(fbdev-&gt;fb_info[0], &amp;win, NULL, 0);</div><div class='add'>+		fbdev-&gt;ctrl-&gt;update_window(fbdev-&gt;fb_info[0], &amp;win, NULL, NULL);</div><div class='ctx'> 	}</div><div class='ctx'> 	omapfb_rqueue_unlock(fbdev);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/video/omap/rfbi.c b/drivers/video/omap/rfbi.c<br/>index 4a6f13d3facf..a13c8dcad2a8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/omap/rfbi.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/video/omap/rfbi.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/omap/rfbi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/omap/rfbi.c</a></div><div class='hunk'>@@ -59,7 +59,7 @@</div><div class='ctx'> #define DISPC_CONTROL		0x0040</div><div class='ctx'> </div><div class='ctx'> static struct {</div><div class='del'>-	u32		base;</div><div class='add'>+	void __iomem	*base;</div><div class='ctx'> 	void		(*lcdc_callback)(void *data);</div><div class='ctx'> 	void		*lcdc_callback_data;</div><div class='ctx'> 	unsigned long	l4_khz;</div><div class='hunk'>@@ -518,7 +518,11 @@ static int rfbi_init(struct omapfb_device *fbdev)</div><div class='ctx'> 	int r;</div><div class='ctx'> </div><div class='ctx'> 	rfbi.fbdev = fbdev;</div><div class='del'>-	rfbi.base = io_p2v(RFBI_BASE);</div><div class='add'>+	rfbi.base = ioremap(RFBI_BASE, SZ_1K);</div><div class='add'>+	if (!rfbi.base) {</div><div class='add'>+		dev_err(fbdev-&gt;dev, "can't ioremap RFBI\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if ((r = rfbi_get_clocks()) &lt; 0)</div><div class='ctx'> 		return r;</div><div class='hunk'>@@ -566,6 +570,7 @@ static void rfbi_cleanup(void)</div><div class='ctx'> {</div><div class='ctx'> 	omap_dispc_free_irq();</div><div class='ctx'> 	rfbi_put_clocks();</div><div class='add'>+	iounmap(rfbi.base);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> const struct lcd_ctrl_extif omap2_ext_if = {</div><div class='head'>diff --git a/drivers/video/omap/sossi.c b/drivers/video/omap/sossi.c<br/>index 6359353c2c67..a76946220249 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/omap/sossi.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/video/omap/sossi.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/omap/sossi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/omap/sossi.c</a></div><div class='hunk'>@@ -574,7 +574,12 @@ static int sossi_init(struct omapfb_device *fbdev)</div><div class='ctx'> 	struct clk *dpll1out_ck;</div><div class='ctx'> 	int r;</div><div class='ctx'> </div><div class='del'>-	sossi.base = (void __iomem *)IO_ADDRESS(OMAP_SOSSI_BASE);</div><div class='add'>+	sossi.base = ioremap(OMAP_SOSSI_BASE, SZ_1K);</div><div class='add'>+	if (!sossi.base) {</div><div class='add'>+		dev_err(fbdev-&gt;dev, "can't ioremap SoSSI\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	sossi.fbdev = fbdev;</div><div class='ctx'> 	spin_lock_init(&amp;sossi.lock);</div><div class='ctx'> </div><div class='hunk'>@@ -665,6 +670,7 @@ static void sossi_cleanup(void)</div><div class='ctx'> {</div><div class='ctx'> 	omap_lcdc_free_dma_callback();</div><div class='ctx'> 	clk_put(sossi.fck);</div><div class='add'>+	iounmap(sossi.base);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct lcd_ctrl_extif omap1_ext_if = {</div><div class='head'>diff --git a/drivers/video/p9100.c b/drivers/video/p9100.c<br/>index 9e903454ffc1..7000f2cd5854 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/p9100.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/video/p9100.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/p9100.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/p9100.c</a></div><div class='hunk'>@@ -349,7 +349,7 @@ static int __devexit p9100_remove(struct of_device *op)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct of_device_id p9100_match[] = {</div><div class='add'>+static const struct of_device_id p9100_match[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.name = "p9100",</div><div class='ctx'> 	},</div><div class='head'>diff --git a/drivers/video/s1d13xxxfb.c b/drivers/video/s1d13xxxfb.c<br/>index b829dc7c5edf..a7b01d2724b5 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/s1d13xxxfb.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/video/s1d13xxxfb.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/s1d13xxxfb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/s1d13xxxfb.c</a></div><div class='hunk'>@@ -50,6 +50,11 @@</div><div class='ctx'> #define dbg(fmt, args...) do { } while (0)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+static const int __devinitconst s1d13xxxfb_revisions[] = {</div><div class='add'>+	S1D13506_CHIP_REV,	/* Rev.4 on HP Jornada 7xx S1D13506 */</div><div class='add'>+	S1D13806_CHIP_REV,	/* Rev.7 on .. */</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Here we define the default struct fb_fix_screeninfo</div><div class='ctx'>  */</div><div class='hunk'>@@ -538,6 +543,7 @@ s1d13xxxfb_probe(struct platform_device *pdev)</div><div class='ctx'> 	struct fb_info *info;</div><div class='ctx'> 	struct s1d13xxxfb_pdata *pdata = NULL;</div><div class='ctx'> 	int ret = 0;</div><div class='add'>+	int i;</div><div class='ctx'> 	u8 revision;</div><div class='ctx'> </div><div class='ctx'> 	dbg("probe called: device is %p\n", pdev);</div><div class='hunk'>@@ -607,10 +613,19 @@ s1d13xxxfb_probe(struct platform_device *pdev)</div><div class='ctx'> 		goto bail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	revision = s1d13xxxfb_readreg(default_par, S1DREG_REV_CODE);</div><div class='del'>-	if ((revision &gt;&gt; 2) != S1D_CHIP_REV) {</div><div class='del'>-		printk(KERN_INFO PFX "chip not found: %i\n", (revision &gt;&gt; 2));</div><div class='del'>-		ret = -ENODEV;</div><div class='add'>+	revision = s1d13xxxfb_readreg(default_par, S1DREG_REV_CODE) &gt;&gt; 2;</div><div class='add'>+</div><div class='add'>+	ret = -ENODEV;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(s1d13xxxfb_revisions); i++) {</div><div class='add'>+		if (revision == s1d13xxxfb_revisions[i])</div><div class='add'>+			ret = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!ret)</div><div class='add'>+		printk(KERN_INFO PFX "chip revision %i\n", revision);</div><div class='add'>+	else {</div><div class='add'>+		printk(KERN_INFO PFX "unknown chip revision %i\n", revision);</div><div class='ctx'> 		goto bail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/video/tcx.c b/drivers/video/tcx.c<br/>index 2a03f78bbb0d..643afbfe8277 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/tcx.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/video/tcx.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/tcx.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/tcx.c</a></div><div class='hunk'>@@ -505,7 +505,7 @@ static int __devexit tcx_remove(struct of_device *op)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct of_device_id tcx_match[] = {</div><div class='add'>+static const struct of_device_id tcx_match[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.name = "SUNW,tcx",</div><div class='ctx'> 	},</div><div class='head'>diff --git a/drivers/video/tdfxfb.c b/drivers/video/tdfxfb.c<br/>index 4599a4385bc9..14bd3f3680b8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/tdfxfb.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/video/tdfxfb.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/tdfxfb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/tdfxfb.c</a></div><div class='hunk'>@@ -1195,57 +1195,58 @@ static int __devinit tdfxfb_probe(struct pci_dev *pdev,</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	default_par = info-&gt;par;</div><div class='add'>+	info-&gt;fix = tdfx_fix;</div><div class='ctx'> </div><div class='ctx'> 	/* Configure the default fb_fix_screeninfo first */</div><div class='ctx'> 	switch (pdev-&gt;device) {</div><div class='ctx'> 	case PCI_DEVICE_ID_3DFX_BANSHEE:</div><div class='del'>-		strcpy(tdfx_fix.id, "3Dfx Banshee");</div><div class='add'>+		strcpy(info-&gt;fix.id, "3Dfx Banshee");</div><div class='ctx'> 		default_par-&gt;max_pixclock = BANSHEE_MAX_PIXCLOCK;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case PCI_DEVICE_ID_3DFX_VOODOO3:</div><div class='del'>-		strcpy(tdfx_fix.id, "3Dfx Voodoo3");</div><div class='add'>+		strcpy(info-&gt;fix.id, "3Dfx Voodoo3");</div><div class='ctx'> 		default_par-&gt;max_pixclock = VOODOO3_MAX_PIXCLOCK;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case PCI_DEVICE_ID_3DFX_VOODOO5:</div><div class='del'>-		strcpy(tdfx_fix.id, "3Dfx Voodoo5");</div><div class='add'>+		strcpy(info-&gt;fix.id, "3Dfx Voodoo5");</div><div class='ctx'> 		default_par-&gt;max_pixclock = VOODOO5_MAX_PIXCLOCK;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	tdfx_fix.mmio_start = pci_resource_start(pdev, 0);</div><div class='del'>-	tdfx_fix.mmio_len = pci_resource_len(pdev, 0);</div><div class='del'>-	if (!request_mem_region(tdfx_fix.mmio_start, tdfx_fix.mmio_len,</div><div class='add'>+	info-&gt;fix.mmio_start = pci_resource_start(pdev, 0);</div><div class='add'>+	info-&gt;fix.mmio_len = pci_resource_len(pdev, 0);</div><div class='add'>+	if (!request_mem_region(info-&gt;fix.mmio_start, info-&gt;fix.mmio_len,</div><div class='ctx'> 				"tdfx regbase")) {</div><div class='ctx'> 		printk(KERN_ERR "tdfxfb: Can't reserve regbase\n");</div><div class='ctx'> 		goto out_err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	default_par-&gt;regbase_virt =</div><div class='del'>-		ioremap_nocache(tdfx_fix.mmio_start, tdfx_fix.mmio_len);</div><div class='add'>+		ioremap_nocache(info-&gt;fix.mmio_start, info-&gt;fix.mmio_len);</div><div class='ctx'> 	if (!default_par-&gt;regbase_virt) {</div><div class='ctx'> 		printk(KERN_ERR "fb: Can't remap %s register area.\n",</div><div class='del'>-				tdfx_fix.id);</div><div class='add'>+				info-&gt;fix.id);</div><div class='ctx'> 		goto out_err_regbase;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	tdfx_fix.smem_start = pci_resource_start(pdev, 1);</div><div class='del'>-	tdfx_fix.smem_len = do_lfb_size(default_par, pdev-&gt;device);</div><div class='del'>-	if (!tdfx_fix.smem_len) {</div><div class='del'>-		printk(KERN_ERR "fb: Can't count %s memory.\n", tdfx_fix.id);</div><div class='add'>+	info-&gt;fix.smem_start = pci_resource_start(pdev, 1);</div><div class='add'>+	info-&gt;fix.smem_len = do_lfb_size(default_par, pdev-&gt;device);</div><div class='add'>+	if (!info-&gt;fix.smem_len) {</div><div class='add'>+		printk(KERN_ERR "fb: Can't count %s memory.\n", info-&gt;fix.id);</div><div class='ctx'> 		goto out_err_regbase;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!request_mem_region(tdfx_fix.smem_start,</div><div class='add'>+	if (!request_mem_region(info-&gt;fix.smem_start,</div><div class='ctx'> 				pci_resource_len(pdev, 1), "tdfx smem")) {</div><div class='ctx'> 		printk(KERN_ERR "tdfxfb: Can't reserve smem\n");</div><div class='ctx'> 		goto out_err_regbase;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	info-&gt;screen_base = ioremap_nocache(tdfx_fix.smem_start,</div><div class='del'>-					    tdfx_fix.smem_len);</div><div class='add'>+	info-&gt;screen_base = ioremap_nocache(info-&gt;fix.smem_start,</div><div class='add'>+					    info-&gt;fix.smem_len);</div><div class='ctx'> 	if (!info-&gt;screen_base) {</div><div class='ctx'> 		printk(KERN_ERR "fb: Can't remap %s framebuffer.\n",</div><div class='del'>-				tdfx_fix.id);</div><div class='add'>+				info-&gt;fix.id);</div><div class='ctx'> 		goto out_err_screenbase;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1257,20 +1258,19 @@ static int __devinit tdfxfb_probe(struct pci_dev *pdev,</div><div class='ctx'> 		goto out_err_screenbase;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "fb: %s memory = %dK\n", tdfx_fix.id,</div><div class='del'>-			tdfx_fix.smem_len &gt;&gt; 10);</div><div class='add'>+	printk(KERN_INFO "fb: %s memory = %dK\n", info-&gt;fix.id,</div><div class='add'>+			info-&gt;fix.smem_len &gt;&gt; 10);</div><div class='ctx'> </div><div class='ctx'> 	default_par-&gt;mtrr_handle = -1;</div><div class='ctx'> 	if (!nomtrr)</div><div class='ctx'> 		default_par-&gt;mtrr_handle =</div><div class='del'>-			mtrr_add(tdfx_fix.smem_start, tdfx_fix.smem_len,</div><div class='add'>+			mtrr_add(info-&gt;fix.smem_start, info-&gt;fix.smem_len,</div><div class='ctx'> 				 MTRR_TYPE_WRCOMB, 1);</div><div class='ctx'> </div><div class='del'>-	tdfx_fix.ypanstep	= nopan ? 0 : 1;</div><div class='del'>-	tdfx_fix.ywrapstep	= nowrap ? 0 : 1;</div><div class='add'>+	info-&gt;fix.ypanstep	= nopan ? 0 : 1;</div><div class='add'>+	info-&gt;fix.ywrapstep	= nowrap ? 0 : 1;</div><div class='ctx'> </div><div class='ctx'> 	info-&gt;fbops		= &amp;tdfxfb_ops;</div><div class='del'>-	info-&gt;fix		= tdfx_fix;</div><div class='ctx'> 	info-&gt;pseudo_palette	= default_par-&gt;palette;</div><div class='ctx'> 	info-&gt;flags		= FBINFO_DEFAULT | FBINFO_HWACCEL_YPAN;</div><div class='ctx'> #ifdef CONFIG_FB_3DFX_ACCEL</div><div class='hunk'>@@ -1323,14 +1323,14 @@ out_err_iobase:</div><div class='ctx'> out_err_screenbase:</div><div class='ctx'> 	if (info-&gt;screen_base)</div><div class='ctx'> 		iounmap(info-&gt;screen_base);</div><div class='del'>-	release_mem_region(tdfx_fix.smem_start, pci_resource_len(pdev, 1));</div><div class='add'>+	release_mem_region(info-&gt;fix.smem_start, pci_resource_len(pdev, 1));</div><div class='ctx'> out_err_regbase:</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Cleanup after anything that was remapped/allocated.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (default_par-&gt;regbase_virt)</div><div class='ctx'> 		iounmap(default_par-&gt;regbase_virt);</div><div class='del'>-	release_mem_region(tdfx_fix.mmio_start, tdfx_fix.mmio_len);</div><div class='add'>+	release_mem_region(info-&gt;fix.mmio_start, info-&gt;fix.mmio_len);</div><div class='ctx'> out_err:</div><div class='ctx'> 	framebuffer_release(info);</div><div class='ctx'> 	return -ENXIO;</div><div class='head'>diff --git a/drivers/video/tmiofb.c b/drivers/video/tmiofb.c<br/>new file mode 100644<br/>index 000000000000..2a380011e9ba<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/tmiofb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/tmiofb.c</a></div><div class='hunk'>@@ -0,0 +1,1050 @@</div><div class='add'>+/*</div><div class='add'>+ * Frame Buffer Device for Toshiba Mobile IO(TMIO) controller</div><div class='add'>+ *</div><div class='add'>+ * Copyright(C) 2005-2006 Chris Humbert</div><div class='add'>+ * Copyright(C) 2005 Dirk Opfer</div><div class='add'>+ * Copytight(C) 2007,2008 Dmitry Baryshkov</div><div class='add'>+ *</div><div class='add'>+ * Based on:</div><div class='add'>+ *	drivers/video/w100fb.c</div><div class='add'>+ *	code written by Sharp/Lineo for 2.4 kernels</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2</div><div class='add'>+ * as published by the Free Software Foundation;</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/fb.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+/* Why should fb driver call console functions? because acquire_console_sem() */</div><div class='add'>+#include &lt;linux/console.h&gt;</div><div class='add'>+#include &lt;linux/mfd/core.h&gt;</div><div class='add'>+#include &lt;linux/mfd/tmio.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * accelerator commands</div><div class='add'>+ */</div><div class='add'>+#define TMIOFB_ACC_CSADR(x)	(0x00000000 | ((x) &amp; 0x001ffffe))</div><div class='add'>+#define TMIOFB_ACC_CHPIX(x)	(0x01000000 | ((x) &amp; 0x000003ff))</div><div class='add'>+#define TMIOFB_ACC_CVPIX(x)	(0x02000000 | ((x) &amp; 0x000003ff))</div><div class='add'>+#define TMIOFB_ACC_PSADR(x)	(0x03000000 | ((x) &amp; 0x00fffffe))</div><div class='add'>+#define TMIOFB_ACC_PHPIX(x)	(0x04000000 | ((x) &amp; 0x000003ff))</div><div class='add'>+#define TMIOFB_ACC_PVPIX(x)	(0x05000000 | ((x) &amp; 0x000003ff))</div><div class='add'>+#define TMIOFB_ACC_PHOFS(x)	(0x06000000 | ((x) &amp; 0x000003ff))</div><div class='add'>+#define TMIOFB_ACC_PVOFS(x)	(0x07000000 | ((x) &amp; 0x000003ff))</div><div class='add'>+#define TMIOFB_ACC_POADR(x)	(0x08000000 | ((x) &amp; 0x00fffffe))</div><div class='add'>+#define TMIOFB_ACC_RSTR(x)	(0x09000000 | ((x) &amp; 0x000000ff))</div><div class='add'>+#define TMIOFB_ACC_TCLOR(x)	(0x0A000000 | ((x) &amp; 0x0000ffff))</div><div class='add'>+#define TMIOFB_ACC_FILL(x)	(0x0B000000 | ((x) &amp; 0x0000ffff))</div><div class='add'>+#define TMIOFB_ACC_DSADR(x)	(0x0C000000 | ((x) &amp; 0x00fffffe))</div><div class='add'>+#define TMIOFB_ACC_SSADR(x)	(0x0D000000 | ((x) &amp; 0x00fffffe))</div><div class='add'>+#define TMIOFB_ACC_DHPIX(x)	(0x0E000000 | ((x) &amp; 0x000003ff))</div><div class='add'>+#define TMIOFB_ACC_DVPIX(x)	(0x0F000000 | ((x) &amp; 0x000003ff))</div><div class='add'>+#define TMIOFB_ACC_SHPIX(x)	(0x10000000 | ((x) &amp; 0x000003ff))</div><div class='add'>+#define TMIOFB_ACC_SVPIX(x)	(0x11000000 | ((x) &amp; 0x000003ff))</div><div class='add'>+#define TMIOFB_ACC_LBINI(x)	(0x12000000 | ((x) &amp; 0x0000ffff))</div><div class='add'>+#define TMIOFB_ACC_LBK2(x)	(0x13000000 | ((x) &amp; 0x0000ffff))</div><div class='add'>+#define TMIOFB_ACC_SHBINI(x)	(0x14000000 | ((x) &amp; 0x0000ffff))</div><div class='add'>+#define TMIOFB_ACC_SHBK2(x)	(0x15000000 | ((x) &amp; 0x0000ffff))</div><div class='add'>+#define TMIOFB_ACC_SVBINI(x)	(0x16000000 | ((x) &amp; 0x0000ffff))</div><div class='add'>+#define TMIOFB_ACC_SVBK2(x)	(0x17000000 | ((x) &amp; 0x0000ffff))</div><div class='add'>+</div><div class='add'>+#define TMIOFB_ACC_CMGO		0x20000000</div><div class='add'>+#define TMIOFB_ACC_CMGO_CEND	0x00000001</div><div class='add'>+#define TMIOFB_ACC_CMGO_INT	0x00000002</div><div class='add'>+#define TMIOFB_ACC_CMGO_CMOD	0x00000010</div><div class='add'>+#define TMIOFB_ACC_CMGO_CDVRV	0x00000020</div><div class='add'>+#define TMIOFB_ACC_CMGO_CDHRV	0x00000040</div><div class='add'>+#define TMIOFB_ACC_CMGO_RUND	0x00008000</div><div class='add'>+#define TMIOFB_ACC_SCGO		0x21000000</div><div class='add'>+#define TMIOFB_ACC_SCGO_CEND	0x00000001</div><div class='add'>+#define TMIOFB_ACC_SCGO_INT	0x00000002</div><div class='add'>+#define TMIOFB_ACC_SCGO_ROP3	0x00000004</div><div class='add'>+#define TMIOFB_ACC_SCGO_TRNS	0x00000008</div><div class='add'>+#define TMIOFB_ACC_SCGO_DVRV	0x00000010</div><div class='add'>+#define TMIOFB_ACC_SCGO_DHRV	0x00000020</div><div class='add'>+#define TMIOFB_ACC_SCGO_SVRV	0x00000040</div><div class='add'>+#define TMIOFB_ACC_SCGO_SHRV	0x00000080</div><div class='add'>+#define TMIOFB_ACC_SCGO_DSTXY	0x00008000</div><div class='add'>+#define TMIOFB_ACC_SBGO		0x22000000</div><div class='add'>+#define TMIOFB_ACC_SBGO_CEND	0x00000001</div><div class='add'>+#define TMIOFB_ACC_SBGO_INT	0x00000002</div><div class='add'>+#define TMIOFB_ACC_SBGO_DVRV	0x00000010</div><div class='add'>+#define TMIOFB_ACC_SBGO_DHRV	0x00000020</div><div class='add'>+#define TMIOFB_ACC_SBGO_SVRV	0x00000040</div><div class='add'>+#define TMIOFB_ACC_SBGO_SHRV	0x00000080</div><div class='add'>+#define TMIOFB_ACC_SBGO_SBMD	0x00000100</div><div class='add'>+#define TMIOFB_ACC_FLGO		0x23000000</div><div class='add'>+#define TMIOFB_ACC_FLGO_CEND	0x00000001</div><div class='add'>+#define TMIOFB_ACC_FLGO_INT	0x00000002</div><div class='add'>+#define TMIOFB_ACC_FLGO_ROP3	0x00000004</div><div class='add'>+#define TMIOFB_ACC_LDGO		0x24000000</div><div class='add'>+#define TMIOFB_ACC_LDGO_CEND	0x00000001</div><div class='add'>+#define TMIOFB_ACC_LDGO_INT	0x00000002</div><div class='add'>+#define TMIOFB_ACC_LDGO_ROP3	0x00000004</div><div class='add'>+#define TMIOFB_ACC_LDGO_ENDPX	0x00000008</div><div class='add'>+#define TMIOFB_ACC_LDGO_LVRV	0x00000010</div><div class='add'>+#define TMIOFB_ACC_LDGO_LHRV	0x00000020</div><div class='add'>+#define TMIOFB_ACC_LDGO_LDMOD	0x00000040</div><div class='add'>+</div><div class='add'>+/* a FIFO is always allocated, even if acceleration is not used */</div><div class='add'>+#define TMIOFB_FIFO_SIZE	512</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * LCD Host Controller Configuration Register</div><div class='add'>+ *</div><div class='add'>+ * This iomem area supports only 16-bit IO.</div><div class='add'>+ */</div><div class='add'>+#define CCR_CMD			0x04 /* Command				*/</div><div class='add'>+#define CCR_REVID		0x08 /* Revision ID			*/</div><div class='add'>+#define CCR_BASEL		0x10 /* LCD Control Reg Base Addr Low	*/</div><div class='add'>+#define CCR_BASEH		0x12 /* LCD Control Reg Base Addr High	*/</div><div class='add'>+#define CCR_UGCC		0x40 /* Unified Gated Clock Control	*/</div><div class='add'>+#define CCR_GCC			0x42 /* Gated Clock Control		*/</div><div class='add'>+#define CCR_USC			0x50 /* Unified Software Clear		*/</div><div class='add'>+#define CCR_VRAMRTC		0x60 /* VRAM Timing Control		*/</div><div class='add'>+				/* 0x61 VRAM Refresh Control		*/</div><div class='add'>+#define CCR_VRAMSAC		0x62 /* VRAM Access Control		*/</div><div class='add'>+				/* 0x63	VRAM Status			*/</div><div class='add'>+#define CCR_VRAMBC		0x64 /* VRAM Block Control		*/</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * LCD Control Register</div><div class='add'>+ *</div><div class='add'>+ * This iomem area supports only 16-bit IO.</div><div class='add'>+ */</div><div class='add'>+#define LCR_UIS			0x000 /* Unified Interrupt Status	*/</div><div class='add'>+#define LCR_VHPN		0x008 /* VRAM Horizontal Pixel Number	*/</div><div class='add'>+#define LCR_CFSAL		0x00a /* Command FIFO Start Address Low	*/</div><div class='add'>+#define LCR_CFSAH		0x00c /* Command FIFO Start Address High */</div><div class='add'>+#define LCR_CFS			0x00e /* Command FIFO Size		*/</div><div class='add'>+#define LCR_CFWS		0x010 /* Command FIFO Writeable Size	*/</div><div class='add'>+#define LCR_BBIE		0x012 /* BitBLT Interrupt Enable	*/</div><div class='add'>+#define LCR_BBISC		0x014 /* BitBLT Interrupt Status and Clear */</div><div class='add'>+#define LCR_CCS			0x016 /* Command Count Status		*/</div><div class='add'>+#define LCR_BBES		0x018 /* BitBLT Execution Status	*/</div><div class='add'>+#define LCR_CMDL		0x01c /* Command Low			*/</div><div class='add'>+#define LCR_CMDH		0x01e /* Command High			*/</div><div class='add'>+#define LCR_CFC			0x022 /* Command FIFO Clear		*/</div><div class='add'>+#define LCR_CCIFC		0x024 /* CMOS Camera IF Control		*/</div><div class='add'>+#define LCR_HWT			0x026 /* Hardware Test			*/</div><div class='add'>+#define LCR_LCDCCRC		0x100 /* LCDC Clock and Reset Control	*/</div><div class='add'>+#define LCR_LCDCC		0x102 /* LCDC Control			*/</div><div class='add'>+#define LCR_LCDCOPC		0x104 /* LCDC Output Pin Control	*/</div><div class='add'>+#define LCR_LCDIS		0x108 /* LCD Interrupt Status		*/</div><div class='add'>+#define LCR_LCDIM		0x10a /* LCD Interrupt Mask		*/</div><div class='add'>+#define LCR_LCDIE		0x10c /* LCD Interrupt Enable		*/</div><div class='add'>+#define LCR_GDSAL		0x122 /* Graphics Display Start Address Low */</div><div class='add'>+#define LCR_GDSAH		0x124 /* Graphics Display Start Address High */</div><div class='add'>+#define LCR_VHPCL		0x12a /* VRAM Horizontal Pixel Count Low */</div><div class='add'>+#define LCR_VHPCH		0x12c /* VRAM Horizontal Pixel Count High */</div><div class='add'>+#define LCR_GM			0x12e /* Graphic Mode(VRAM access enable) */</div><div class='add'>+#define LCR_HT			0x140 /* Horizontal Total		*/</div><div class='add'>+#define LCR_HDS			0x142 /* Horizontal Display Start	*/</div><div class='add'>+#define LCR_HSS			0x144 /* H-Sync Start			*/</div><div class='add'>+#define LCR_HSE			0x146 /* H-Sync End			*/</div><div class='add'>+#define LCR_HNP			0x14c /* Horizontal Number of Pixels	*/</div><div class='add'>+#define LCR_VT			0x150 /* Vertical Total			*/</div><div class='add'>+#define LCR_VDS			0x152 /* Vertical Display Start		*/</div><div class='add'>+#define LCR_VSS			0x154 /* V-Sync Start			*/</div><div class='add'>+#define LCR_VSE			0x156 /* V-Sync End			*/</div><div class='add'>+#define LCR_CDLN		0x160 /* Current Display Line Number	*/</div><div class='add'>+#define LCR_ILN			0x162 /* Interrupt Line Number		*/</div><div class='add'>+#define LCR_SP			0x164 /* Sync Polarity			*/</div><div class='add'>+#define LCR_MISC		0x166 /* MISC(RGB565 mode)		*/</div><div class='add'>+#define LCR_VIHSS		0x16a /* Video Interface H-Sync Start	*/</div><div class='add'>+#define LCR_VIVS		0x16c /* Video Interface Vertical Start	*/</div><div class='add'>+#define LCR_VIVE		0x16e /* Video Interface Vertical End	*/</div><div class='add'>+#define LCR_VIVSS		0x170 /* Video Interface V-Sync Start	*/</div><div class='add'>+#define LCR_VCCIS		0x17e /* Video / CMOS Camera Interface Select */</div><div class='add'>+#define LCR_VIDWSAL		0x180 /* VI Data Write Start Address Low */</div><div class='add'>+#define LCR_VIDWSAH		0x182 /* VI Data Write Start Address High */</div><div class='add'>+#define LCR_VIDRSAL		0x184 /* VI Data Read Start Address Low	*/</div><div class='add'>+#define LCR_VIDRSAH		0x186 /* VI Data Read Start Address High */</div><div class='add'>+#define LCR_VIPDDST		0x188 /* VI Picture Data Display Start Timing */</div><div class='add'>+#define LCR_VIPDDET		0x186 /* VI Picture Data Display End Timing */</div><div class='add'>+#define LCR_VIE			0x18c /* Video Interface Enable		*/</div><div class='add'>+#define LCR_VCS			0x18e /* Video/Camera Select		*/</div><div class='add'>+#define LCR_VPHWC		0x194 /* Video Picture Horizontal Wait Count */</div><div class='add'>+#define LCR_VPHS		0x196 /* Video Picture Horizontal Size	*/</div><div class='add'>+#define LCR_VPVWC		0x198 /* Video Picture Vertical Wait Count */</div><div class='add'>+#define LCR_VPVS		0x19a /* Video Picture Vertical Size	*/</div><div class='add'>+#define LCR_PLHPIX		0x1a0 /* PLHPIX				*/</div><div class='add'>+#define LCR_XS			0x1a2 /* XStart				*/</div><div class='add'>+#define LCR_XCKHW		0x1a4 /* XCK High Width			*/</div><div class='add'>+#define LCR_STHS		0x1a8 /* STH Start			*/</div><div class='add'>+#define LCR_VT2			0x1aa /* Vertical Total			*/</div><div class='add'>+#define LCR_YCKSW		0x1ac /* YCK Start Wait			*/</div><div class='add'>+#define LCR_YSTS		0x1ae /* YST Start			*/</div><div class='add'>+#define LCR_PPOLS		0x1b0 /* #PPOL Start			*/</div><div class='add'>+#define LCR_PRECW		0x1b2 /* PREC Width			*/</div><div class='add'>+#define LCR_VCLKHW		0x1b4 /* VCLK High Width		*/</div><div class='add'>+#define LCR_OC			0x1b6 /* Output Control			*/</div><div class='add'>+</div><div class='add'>+static char *mode_option __devinitdata;</div><div class='add'>+</div><div class='add'>+struct tmiofb_par {</div><div class='add'>+	u32				pseudo_palette[16];</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_FB_TMIO_ACCELL</div><div class='add'>+	wait_queue_head_t		wait_acc;</div><div class='add'>+	bool				use_polling;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	void __iomem			*ccr;</div><div class='add'>+	void __iomem			*lcr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*--------------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * reasons for an interrupt:</div><div class='add'>+ *	uis	bbisc	lcdis</div><div class='add'>+ *	0100	0001	accelerator command completed</div><div class='add'>+ * 	2000	0001	vsync start</div><div class='add'>+ * 	2000	0002	display start</div><div class='add'>+ * 	2000	0004	line number match(0x1ff mask???)</div><div class='add'>+ */</div><div class='add'>+static irqreturn_t tmiofb_irq(int irq, void *__info)</div><div class='add'>+{</div><div class='add'>+	struct fb_info *info = __info;</div><div class='add'>+	struct tmiofb_par *par = info-&gt;par;</div><div class='add'>+	unsigned int bbisc = tmio_ioread16(par-&gt;lcr + LCR_BBISC);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We were in polling mode and now we got correct irq.</div><div class='add'>+	 * Switch back to IRQ-based sync of command FIFO</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(par-&gt;use_polling &amp;&amp; irq != -1)) {</div><div class='add'>+		printk(KERN_INFO "tmiofb: switching to waitq\n");</div><div class='add'>+		par-&gt;use_polling = false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tmio_iowrite16(bbisc, par-&gt;lcr + LCR_BBISC);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_FB_TMIO_ACCELL</div><div class='add'>+	if (bbisc &amp; 1)</div><div class='add'>+		wake_up(&amp;par-&gt;wait_acc);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*--------------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Turns off the LCD controller and LCD host controller.</div><div class='add'>+ */</div><div class='add'>+static int tmiofb_hw_stop(struct platform_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct mfd_cell *cell = dev-&gt;dev.platform_data;</div><div class='add'>+	struct tmio_fb_data *data = cell-&gt;driver_data;</div><div class='add'>+	struct fb_info *info = platform_get_drvdata(dev);</div><div class='add'>+	struct tmiofb_par *par = info-&gt;par;</div><div class='add'>+</div><div class='add'>+	tmio_iowrite16(0, par-&gt;ccr + CCR_UGCC);</div><div class='add'>+	tmio_iowrite16(0, par-&gt;lcr + LCR_GM);</div><div class='add'>+	data-&gt;lcd_set_power(dev, 0);</div><div class='add'>+	tmio_iowrite16(0x0010, par-&gt;lcr + LCR_LCDCCRC);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Initializes the LCD host controller.</div><div class='add'>+ */</div><div class='add'>+static int tmiofb_hw_init(struct platform_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct mfd_cell *cell = dev-&gt;dev.platform_data;</div><div class='add'>+	struct fb_info *info = platform_get_drvdata(dev);</div><div class='add'>+	struct tmiofb_par *par = info-&gt;par;</div><div class='add'>+	const struct resource *nlcr = &amp;cell-&gt;resources[0];</div><div class='add'>+	const struct resource *vram = &amp;cell-&gt;resources[2];</div><div class='add'>+	unsigned long base;</div><div class='add'>+</div><div class='add'>+	if (nlcr == NULL || vram == NULL)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	base = nlcr-&gt;start;</div><div class='add'>+</div><div class='add'>+	tmio_iowrite16(0x003a, par-&gt;ccr + CCR_UGCC);</div><div class='add'>+	tmio_iowrite16(0x003a, par-&gt;ccr + CCR_GCC);</div><div class='add'>+	tmio_iowrite16(0x3f00, par-&gt;ccr + CCR_USC);</div><div class='add'>+</div><div class='add'>+	msleep(2); /* wait for device to settle */</div><div class='add'>+</div><div class='add'>+	tmio_iowrite16(0x0000, par-&gt;ccr + CCR_USC);</div><div class='add'>+	tmio_iowrite16(base &gt;&gt; 16, par-&gt;ccr + CCR_BASEH);</div><div class='add'>+	tmio_iowrite16(base, par-&gt;ccr + CCR_BASEL);</div><div class='add'>+	tmio_iowrite16(0x0002, par-&gt;ccr + CCR_CMD); /* base address enable */</div><div class='add'>+	tmio_iowrite16(0x40a8, par-&gt;ccr + CCR_VRAMRTC); /* VRAMRC, VRAMTC */</div><div class='add'>+	tmio_iowrite16(0x0018, par-&gt;ccr + CCR_VRAMSAC); /* VRAMSTS, VRAMAC */</div><div class='add'>+	tmio_iowrite16(0x0002, par-&gt;ccr + CCR_VRAMBC);</div><div class='add'>+	msleep(2); /* wait for device to settle */</div><div class='add'>+	tmio_iowrite16(0x000b, par-&gt;ccr + CCR_VRAMBC);</div><div class='add'>+</div><div class='add'>+	base = vram-&gt;start + info-&gt;screen_size;</div><div class='add'>+	tmio_iowrite16(base &gt;&gt; 16, par-&gt;lcr + LCR_CFSAH);</div><div class='add'>+	tmio_iowrite16(base, par-&gt;lcr + LCR_CFSAL);</div><div class='add'>+	tmio_iowrite16(TMIOFB_FIFO_SIZE - 1, par-&gt;lcr + LCR_CFS);</div><div class='add'>+	tmio_iowrite16(1, par-&gt;lcr + LCR_CFC);</div><div class='add'>+	tmio_iowrite16(1, par-&gt;lcr + LCR_BBIE);</div><div class='add'>+	tmio_iowrite16(0, par-&gt;lcr + LCR_CFWS);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Sets the LCD controller's output resolution and pixel clock</div><div class='add'>+ */</div><div class='add'>+static void tmiofb_hw_mode(struct platform_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct mfd_cell *cell = dev-&gt;dev.platform_data;</div><div class='add'>+	struct tmio_fb_data *data = cell-&gt;driver_data;</div><div class='add'>+	struct fb_info *info = platform_get_drvdata(dev);</div><div class='add'>+	struct fb_videomode *mode = info-&gt;mode;</div><div class='add'>+	struct tmiofb_par *par = info-&gt;par;</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	tmio_iowrite16(0, par-&gt;lcr + LCR_GM);</div><div class='add'>+	data-&gt;lcd_set_power(dev, 0);</div><div class='add'>+	tmio_iowrite16(0x0010, par-&gt;lcr + LCR_LCDCCRC);</div><div class='add'>+	data-&gt;lcd_mode(dev, mode);</div><div class='add'>+	data-&gt;lcd_set_power(dev, 1);</div><div class='add'>+</div><div class='add'>+	tmio_iowrite16(info-&gt;fix.line_length, par-&gt;lcr + LCR_VHPN);</div><div class='add'>+	tmio_iowrite16(0, par-&gt;lcr + LCR_GDSAH);</div><div class='add'>+	tmio_iowrite16(0, par-&gt;lcr + LCR_GDSAL);</div><div class='add'>+	tmio_iowrite16(info-&gt;fix.line_length &gt;&gt; 16, par-&gt;lcr + LCR_VHPCH);</div><div class='add'>+	tmio_iowrite16(info-&gt;fix.line_length, par-&gt;lcr + LCR_VHPCL);</div><div class='add'>+	tmio_iowrite16(i = 0, par-&gt;lcr + LCR_HSS);</div><div class='add'>+	tmio_iowrite16(i += mode-&gt;hsync_len, par-&gt;lcr + LCR_HSE);</div><div class='add'>+	tmio_iowrite16(i += mode-&gt;left_margin, par-&gt;lcr + LCR_HDS);</div><div class='add'>+	tmio_iowrite16(i += mode-&gt;xres + mode-&gt;right_margin, par-&gt;lcr + LCR_HT);</div><div class='add'>+	tmio_iowrite16(mode-&gt;xres, par-&gt;lcr + LCR_HNP);</div><div class='add'>+	tmio_iowrite16(i = 0, par-&gt;lcr + LCR_VSS);</div><div class='add'>+	tmio_iowrite16(i += mode-&gt;vsync_len, par-&gt;lcr + LCR_VSE);</div><div class='add'>+	tmio_iowrite16(i += mode-&gt;upper_margin, par-&gt;lcr + LCR_VDS);</div><div class='add'>+	tmio_iowrite16(i += mode-&gt;yres, par-&gt;lcr + LCR_ILN);</div><div class='add'>+	tmio_iowrite16(i += mode-&gt;lower_margin, par-&gt;lcr + LCR_VT);</div><div class='add'>+	tmio_iowrite16(3, par-&gt;lcr + LCR_MISC); /* RGB565 mode */</div><div class='add'>+	tmio_iowrite16(1, par-&gt;lcr + LCR_GM); /* VRAM enable */</div><div class='add'>+	tmio_iowrite16(0x4007, par-&gt;lcr + LCR_LCDCC);</div><div class='add'>+	tmio_iowrite16(3, par-&gt;lcr + LCR_SP);  /* sync polarity */</div><div class='add'>+</div><div class='add'>+	tmio_iowrite16(0x0010, par-&gt;lcr + LCR_LCDCCRC);</div><div class='add'>+	msleep(5); /* wait for device to settle */</div><div class='add'>+	tmio_iowrite16(0x0014, par-&gt;lcr + LCR_LCDCCRC); /* STOP_CKP */</div><div class='add'>+	msleep(5); /* wait for device to settle */</div><div class='add'>+	tmio_iowrite16(0x0015, par-&gt;lcr + LCR_LCDCCRC); /* STOP_CKP|SOFT_RESET*/</div><div class='add'>+	tmio_iowrite16(0xfffa, par-&gt;lcr + LCR_VCS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*--------------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_FB_TMIO_ACCELL</div><div class='add'>+static int __must_check</div><div class='add'>+tmiofb_acc_wait(struct fb_info *info, unsigned int ccs)</div><div class='add'>+{</div><div class='add'>+	struct tmiofb_par *par = info-&gt;par;</div><div class='add'>+	/*</div><div class='add'>+	 * This code can be called whith interrupts disabled.</div><div class='add'>+	 * So instead of relaying on irq to trigger the event,</div><div class='add'>+	 * poll the state till the necessary command is executed.</div><div class='add'>+	 */</div><div class='add'>+	if (irqs_disabled() || par-&gt;use_polling) {</div><div class='add'>+		int i = 0;</div><div class='add'>+		while (tmio_ioread16(par-&gt;lcr + LCR_CCS) &gt; ccs) {</div><div class='add'>+			udelay(1);</div><div class='add'>+			i++;</div><div class='add'>+			if (i &gt; 10000) {</div><div class='add'>+				pr_err("tmiofb: timeout waiting for %d\n",</div><div class='add'>+						ccs);</div><div class='add'>+				return -ETIMEDOUT;</div><div class='add'>+			}</div><div class='add'>+			tmiofb_irq(-1, info);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		if (!wait_event_interruptible_timeout(par-&gt;wait_acc,</div><div class='add'>+				tmio_ioread16(par-&gt;lcr + LCR_CCS) &lt;= ccs,</div><div class='add'>+				1000)) {</div><div class='add'>+			pr_err("tmiofb: timeout waiting for %d\n", ccs);</div><div class='add'>+			return -ETIMEDOUT;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Writes an accelerator command to the accelerator's FIFO.</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+tmiofb_acc_write(struct fb_info *info, const u32 *cmd, unsigned int count)</div><div class='add'>+{</div><div class='add'>+	struct tmiofb_par *par = info-&gt;par;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = tmiofb_acc_wait(info, TMIOFB_FIFO_SIZE - count);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	for (; count; count--, cmd++) {</div><div class='add'>+		tmio_iowrite16(*cmd &gt;&gt; 16, par-&gt;lcr + LCR_CMDH);</div><div class='add'>+		tmio_iowrite16(*cmd, par-&gt;lcr + LCR_CMDL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Wait for the accelerator to finish its operations before writing</div><div class='add'>+ * to the framebuffer for consistent display output.</div><div class='add'>+ */</div><div class='add'>+static int tmiofb_sync(struct fb_info *fbi)</div><div class='add'>+{</div><div class='add'>+	struct tmiofb_par *par = fbi-&gt;par;</div><div class='add'>+</div><div class='add'>+	int ret;</div><div class='add'>+	int i = 0;</div><div class='add'>+</div><div class='add'>+	ret = tmiofb_acc_wait(fbi, 0);</div><div class='add'>+</div><div class='add'>+	while (tmio_ioread16(par-&gt;lcr + LCR_BBES) &amp; 2) { /* blit active */</div><div class='add'>+		udelay(1);</div><div class='add'>+		i++ ;</div><div class='add'>+		if (i &gt; 10000) {</div><div class='add'>+			printk(KERN_ERR "timeout waiting for blit to end!\n");</div><div class='add'>+			return -ETIMEDOUT;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+tmiofb_fillrect(struct fb_info *fbi, const struct fb_fillrect *rect)</div><div class='add'>+{</div><div class='add'>+	const u32 cmd[] = {</div><div class='add'>+		TMIOFB_ACC_DSADR((rect-&gt;dy * fbi-&gt;mode-&gt;xres + rect-&gt;dx) * 2),</div><div class='add'>+		TMIOFB_ACC_DHPIX(rect-&gt;width - 1),</div><div class='add'>+		TMIOFB_ACC_DVPIX(rect-&gt;height - 1),</div><div class='add'>+		TMIOFB_ACC_FILL(rect-&gt;color),</div><div class='add'>+		TMIOFB_ACC_FLGO,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (fbi-&gt;state != FBINFO_STATE_RUNNING ||</div><div class='add'>+	    fbi-&gt;flags &amp; FBINFO_HWACCEL_DISABLED) {</div><div class='add'>+		cfb_fillrect(fbi, rect);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tmiofb_acc_write(fbi, cmd, ARRAY_SIZE(cmd));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+tmiofb_copyarea(struct fb_info *fbi, const struct fb_copyarea *area)</div><div class='add'>+{</div><div class='add'>+	const u32 cmd[] = {</div><div class='add'>+		TMIOFB_ACC_DSADR((area-&gt;dy * fbi-&gt;mode-&gt;xres + area-&gt;dx) * 2),</div><div class='add'>+		TMIOFB_ACC_DHPIX(area-&gt;width - 1),</div><div class='add'>+		TMIOFB_ACC_DVPIX(area-&gt;height - 1),</div><div class='add'>+		TMIOFB_ACC_SSADR((area-&gt;sy * fbi-&gt;mode-&gt;xres + area-&gt;sx) * 2),</div><div class='add'>+		TMIOFB_ACC_SCGO,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (fbi-&gt;state != FBINFO_STATE_RUNNING ||</div><div class='add'>+	    fbi-&gt;flags &amp; FBINFO_HWACCEL_DISABLED) {</div><div class='add'>+		cfb_copyarea(fbi, area);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tmiofb_acc_write(fbi, cmd, ARRAY_SIZE(cmd));</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static void tmiofb_clearscreen(struct fb_info *info)</div><div class='add'>+{</div><div class='add'>+	const struct fb_fillrect rect = {</div><div class='add'>+		.dx	= 0,</div><div class='add'>+		.dy	= 0,</div><div class='add'>+		.width	= info-&gt;mode-&gt;xres,</div><div class='add'>+		.height	= info-&gt;mode-&gt;yres,</div><div class='add'>+		.color	= 0,</div><div class='add'>+		.rop	= ROP_COPY,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	info-&gt;fbops-&gt;fb_fillrect(info, &amp;rect);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tmiofb_vblank(struct fb_info *fbi, struct fb_vblank *vblank)</div><div class='add'>+{</div><div class='add'>+	struct tmiofb_par *par = fbi-&gt;par;</div><div class='add'>+	struct fb_videomode *mode = fbi-&gt;mode;</div><div class='add'>+	unsigned int vcount = tmio_ioread16(par-&gt;lcr + LCR_CDLN);</div><div class='add'>+	unsigned int vds = mode-&gt;vsync_len + mode-&gt;upper_margin;</div><div class='add'>+</div><div class='add'>+	vblank-&gt;vcount = vcount;</div><div class='add'>+	vblank-&gt;flags = FB_VBLANK_HAVE_VBLANK | FB_VBLANK_HAVE_VCOUNT</div><div class='add'>+						| FB_VBLANK_HAVE_VSYNC;</div><div class='add'>+</div><div class='add'>+	if (vcount &lt; mode-&gt;vsync_len)</div><div class='add'>+		vblank-&gt;flags |= FB_VBLANK_VSYNCING;</div><div class='add'>+</div><div class='add'>+	if (vcount &lt; vds || vcount &gt; vds + mode-&gt;yres)</div><div class='add'>+		vblank-&gt;flags |= FB_VBLANK_VBLANKING;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int tmiofb_ioctl(struct fb_info *fbi,</div><div class='add'>+		unsigned int cmd, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case FBIOGET_VBLANK: {</div><div class='add'>+		struct fb_vblank vblank = {0};</div><div class='add'>+		void __user *argp = (void __user *) arg;</div><div class='add'>+</div><div class='add'>+		tmiofb_vblank(fbi, &amp;vblank);</div><div class='add'>+		if (copy_to_user(argp, &amp;vblank, sizeof vblank))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_FB_TMIO_ACCELL</div><div class='add'>+	case FBIO_TMIO_ACC_SYNC:</div><div class='add'>+		tmiofb_sync(fbi);</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	case FBIO_TMIO_ACC_WRITE: {</div><div class='add'>+		u32 __user *argp = (void __user *) arg;</div><div class='add'>+		u32 len;</div><div class='add'>+		u32 acc[16];</div><div class='add'>+</div><div class='add'>+		if (get_user(len, argp))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		if (len &gt; ARRAY_SIZE(acc))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (copy_from_user(acc, argp + 1, sizeof(u32) * len))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+</div><div class='add'>+		return tmiofb_acc_write(fbi, acc, len);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -ENOTTY;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*--------------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+/* Select the smallest mode that allows the desired resolution to be</div><div class='add'>+ * displayed.  If desired, the x and y parameters can be rounded up to</div><div class='add'>+ * match the selected mode.</div><div class='add'>+ */</div><div class='add'>+static struct fb_videomode *</div><div class='add'>+tmiofb_find_mode(struct fb_info *info, struct fb_var_screeninfo *var)</div><div class='add'>+{</div><div class='add'>+	struct mfd_cell *cell =</div><div class='add'>+		info-&gt;device-&gt;platform_data;</div><div class='add'>+	struct tmio_fb_data *data = cell-&gt;driver_data;</div><div class='add'>+	struct fb_videomode *best = NULL;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; data-&gt;num_modes; i++) {</div><div class='add'>+		struct fb_videomode *mode = data-&gt;modes + i;</div><div class='add'>+</div><div class='add'>+		if (mode-&gt;xres &gt;= var-&gt;xres &amp;&amp; mode-&gt;yres &gt;= var-&gt;yres</div><div class='add'>+				&amp;&amp; (!best || (mode-&gt;xres &lt; best-&gt;xres</div><div class='add'>+					   &amp;&amp; mode-&gt;yres &lt; best-&gt;yres)))</div><div class='add'>+			best = mode;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return best;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tmiofb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	struct fb_videomode *mode;</div><div class='add'>+	struct mfd_cell *cell =</div><div class='add'>+		info-&gt;device-&gt;platform_data;</div><div class='add'>+	struct tmio_fb_data *data = cell-&gt;driver_data;</div><div class='add'>+</div><div class='add'>+	mode = tmiofb_find_mode(info, var);</div><div class='add'>+	if (!mode || var-&gt;bits_per_pixel &gt; 16)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	fb_videomode_to_var(var, mode);</div><div class='add'>+</div><div class='add'>+	var-&gt;xres_virtual = mode-&gt;xres;</div><div class='add'>+	var-&gt;yres_virtual = info-&gt;screen_size / (mode-&gt;xres * 2);</div><div class='add'>+</div><div class='add'>+	if (var-&gt;yres_virtual &lt; var-&gt;yres)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	var-&gt;xoffset = 0;</div><div class='add'>+	var-&gt;yoffset = 0;</div><div class='add'>+	var-&gt;bits_per_pixel = 16;</div><div class='add'>+	var-&gt;grayscale = 0;</div><div class='add'>+	var-&gt;red.offset = 11;</div><div class='add'>+	var-&gt;red.length = 5;</div><div class='add'>+	var-&gt;green.offset = 5;</div><div class='add'>+	var-&gt;green.length = 6;</div><div class='add'>+	var-&gt;blue.offset = 0;</div><div class='add'>+	var-&gt;blue.length = 5;</div><div class='add'>+	var-&gt;transp.offset = 0;</div><div class='add'>+	var-&gt;transp.length = 0;</div><div class='add'>+	var-&gt;nonstd = 0;</div><div class='add'>+	var-&gt;height = data-&gt;height; /* mm */</div><div class='add'>+	var-&gt;width = data-&gt;width; /* mm */</div><div class='add'>+	var-&gt;rotate = 0;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tmiofb_set_par(struct fb_info *info)</div><div class='add'>+{</div><div class='add'>+	struct fb_var_screeninfo *var = &amp;info-&gt;var;</div><div class='add'>+	struct fb_videomode *mode;</div><div class='add'>+</div><div class='add'>+	mode = tmiofb_find_mode(info, var);</div><div class='add'>+	if (!mode)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	info-&gt;mode = mode;</div><div class='add'>+	info-&gt;fix.line_length = info-&gt;mode-&gt;xres *</div><div class='add'>+			var-&gt;bits_per_pixel / 8;</div><div class='add'>+</div><div class='add'>+	tmiofb_hw_mode(to_platform_device(info-&gt;device));</div><div class='add'>+	tmiofb_clearscreen(info);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tmiofb_setcolreg(unsigned regno, unsigned red, unsigned green,</div><div class='add'>+			   unsigned blue, unsigned transp,</div><div class='add'>+			   struct fb_info *info)</div><div class='add'>+{</div><div class='add'>+	struct tmiofb_par *par = info-&gt;par;</div><div class='add'>+</div><div class='add'>+	if (regno &lt; ARRAY_SIZE(par-&gt;pseudo_palette)) {</div><div class='add'>+		par-&gt;pseudo_palette[regno] =</div><div class='add'>+			((red &amp; 0xf800)) |</div><div class='add'>+			((green &amp; 0xfc00) &gt;&gt;  5) |</div><div class='add'>+			((blue &amp; 0xf800) &gt;&gt; 11);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tmiofb_blank(int blank, struct fb_info *info)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * everything is done in lcd/bl drivers.</div><div class='add'>+	 * this is purely to make sysfs happy and work.</div><div class='add'>+	 */</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct fb_ops tmiofb_ops = {</div><div class='add'>+	.owner		= THIS_MODULE,</div><div class='add'>+</div><div class='add'>+	.fb_ioctl	= tmiofb_ioctl,</div><div class='add'>+	.fb_check_var	= tmiofb_check_var,</div><div class='add'>+	.fb_set_par	= tmiofb_set_par,</div><div class='add'>+	.fb_setcolreg	= tmiofb_setcolreg,</div><div class='add'>+	.fb_blank	= tmiofb_blank,</div><div class='add'>+	.fb_imageblit	= cfb_imageblit,</div><div class='add'>+#ifdef CONFIG_FB_TMIO_ACCELL</div><div class='add'>+	.fb_sync	= tmiofb_sync,</div><div class='add'>+	.fb_fillrect	= tmiofb_fillrect,</div><div class='add'>+	.fb_copyarea	= tmiofb_copyarea,</div><div class='add'>+#else</div><div class='add'>+	.fb_fillrect	= cfb_fillrect,</div><div class='add'>+	.fb_copyarea	= cfb_copyarea,</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*--------------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+static int __devinit tmiofb_probe(struct platform_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct mfd_cell *cell = dev-&gt;dev.platform_data;</div><div class='add'>+	struct tmio_fb_data *data = cell-&gt;driver_data;</div><div class='add'>+	struct resource *ccr = platform_get_resource(dev, IORESOURCE_MEM, 1);</div><div class='add'>+	struct resource *lcr = platform_get_resource(dev, IORESOURCE_MEM, 0);</div><div class='add'>+	struct resource *vram = platform_get_resource(dev, IORESOURCE_MEM, 2);</div><div class='add'>+	int irq = platform_get_irq(dev, 0);</div><div class='add'>+	struct fb_info *info;</div><div class='add'>+	struct tmiofb_par *par;</div><div class='add'>+	int retval;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * This is the only way ATM to disable the fb</div><div class='add'>+	 */</div><div class='add'>+	if (data == NULL) {</div><div class='add'>+		dev_err(&amp;dev-&gt;dev, "NULL platform data!\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	info = framebuffer_alloc(sizeof(struct tmiofb_par), &amp;dev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	if (!info)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	par = info-&gt;par;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_FB_TMIO_ACCELL</div><div class='add'>+	init_waitqueue_head(&amp;par-&gt;wait_acc);</div><div class='add'>+</div><div class='add'>+	par-&gt;use_polling = true;</div><div class='add'>+</div><div class='add'>+	info-&gt;flags = FBINFO_DEFAULT | FBINFO_HWACCEL_COPYAREA</div><div class='add'>+			| FBINFO_HWACCEL_FILLRECT;</div><div class='add'>+#else</div><div class='add'>+	info-&gt;flags = FBINFO_DEFAULT;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	info-&gt;fbops = &amp;tmiofb_ops;</div><div class='add'>+</div><div class='add'>+	strcpy(info-&gt;fix.id, "tmio-fb");</div><div class='add'>+	info-&gt;fix.smem_start = vram-&gt;start;</div><div class='add'>+	info-&gt;fix.smem_len = resource_size(vram);</div><div class='add'>+	info-&gt;fix.type = FB_TYPE_PACKED_PIXELS;</div><div class='add'>+	info-&gt;fix.visual = FB_VISUAL_TRUECOLOR;</div><div class='add'>+	info-&gt;fix.mmio_start = lcr-&gt;start;</div><div class='add'>+	info-&gt;fix.mmio_len = resource_size(lcr);</div><div class='add'>+	info-&gt;fix.accel = FB_ACCEL_NONE;</div><div class='add'>+	info-&gt;screen_size = info-&gt;fix.smem_len - (4 * TMIOFB_FIFO_SIZE);</div><div class='add'>+	info-&gt;pseudo_palette = par-&gt;pseudo_palette;</div><div class='add'>+</div><div class='add'>+	par-&gt;ccr = ioremap(ccr-&gt;start, resource_size(ccr));</div><div class='add'>+	if (!par-&gt;ccr) {</div><div class='add'>+		retval = -ENOMEM;</div><div class='add'>+		goto err_ioremap_ccr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	par-&gt;lcr = ioremap(info-&gt;fix.mmio_start, info-&gt;fix.mmio_len);</div><div class='add'>+	if (!par-&gt;lcr) {</div><div class='add'>+		retval = -ENOMEM;</div><div class='add'>+		goto err_ioremap_lcr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	info-&gt;screen_base = ioremap(info-&gt;fix.smem_start, info-&gt;fix.smem_len);</div><div class='add'>+	if (!info-&gt;screen_base) {</div><div class='add'>+		retval = -ENOMEM;</div><div class='add'>+		goto err_ioremap_vram;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	retval = request_irq(irq, &amp;tmiofb_irq, IRQF_DISABLED,</div><div class='add'>+					dev-&gt;dev.bus_id, info);</div><div class='add'>+</div><div class='add'>+	if (retval)</div><div class='add'>+		goto err_request_irq;</div><div class='add'>+</div><div class='add'>+	platform_set_drvdata(dev, info);</div><div class='add'>+</div><div class='add'>+	retval = fb_find_mode(&amp;info-&gt;var, info, mode_option,</div><div class='add'>+			data-&gt;modes, data-&gt;num_modes,</div><div class='add'>+			data-&gt;modes, 16);</div><div class='add'>+	if (!retval) {</div><div class='add'>+		retval = -EINVAL;</div><div class='add'>+		goto err_find_mode;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cell-&gt;enable) {</div><div class='add'>+		retval = cell-&gt;enable(dev);</div><div class='add'>+		if (retval)</div><div class='add'>+			goto err_enable;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	retval = tmiofb_hw_init(dev);</div><div class='add'>+	if (retval)</div><div class='add'>+		goto err_hw_init;</div><div class='add'>+</div><div class='add'>+	fb_videomode_to_modelist(data-&gt;modes, data-&gt;num_modes,</div><div class='add'>+				 &amp;info-&gt;modelist);</div><div class='add'>+</div><div class='add'>+	retval = register_framebuffer(info);</div><div class='add'>+	if (retval &lt; 0)</div><div class='add'>+		goto err_register_framebuffer;</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "fb%d: %s frame buffer device\n",</div><div class='add'>+				info-&gt;node, info-&gt;fix.id);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_register_framebuffer:</div><div class='add'>+/*err_set_par:*/</div><div class='add'>+	tmiofb_hw_stop(dev);</div><div class='add'>+err_hw_init:</div><div class='add'>+	if (cell-&gt;disable)</div><div class='add'>+		cell-&gt;disable(dev);</div><div class='add'>+err_enable:</div><div class='add'>+err_find_mode:</div><div class='add'>+	platform_set_drvdata(dev, NULL);</div><div class='add'>+	free_irq(irq, info);</div><div class='add'>+err_request_irq:</div><div class='add'>+	iounmap(info-&gt;screen_base);</div><div class='add'>+err_ioremap_vram:</div><div class='add'>+	iounmap(par-&gt;lcr);</div><div class='add'>+err_ioremap_lcr:</div><div class='add'>+	iounmap(par-&gt;ccr);</div><div class='add'>+err_ioremap_ccr:</div><div class='add'>+	framebuffer_release(info);</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devexit tmiofb_remove(struct platform_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct mfd_cell *cell = dev-&gt;dev.platform_data;</div><div class='add'>+	struct fb_info *info = platform_get_drvdata(dev);</div><div class='add'>+	int irq = platform_get_irq(dev, 0);</div><div class='add'>+	struct tmiofb_par *par;</div><div class='add'>+</div><div class='add'>+	if (info) {</div><div class='add'>+		par = info-&gt;par;</div><div class='add'>+		unregister_framebuffer(info);</div><div class='add'>+</div><div class='add'>+		tmiofb_hw_stop(dev);</div><div class='add'>+</div><div class='add'>+		if (cell-&gt;disable)</div><div class='add'>+			cell-&gt;disable(dev);</div><div class='add'>+</div><div class='add'>+		platform_set_drvdata(dev, NULL);</div><div class='add'>+</div><div class='add'>+		free_irq(irq, info);</div><div class='add'>+</div><div class='add'>+		iounmap(info-&gt;screen_base);</div><div class='add'>+		iounmap(par-&gt;lcr);</div><div class='add'>+		iounmap(par-&gt;ccr);</div><div class='add'>+</div><div class='add'>+		framebuffer_release(info);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+static void tmiofb_dump_regs(struct platform_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct fb_info *info = platform_get_drvdata(dev);</div><div class='add'>+	struct tmiofb_par *par = info-&gt;par;</div><div class='add'>+</div><div class='add'>+	printk(KERN_DEBUG "lhccr:\n");</div><div class='add'>+#define CCR_PR(n)	printk(KERN_DEBUG "\t" #n " = \t%04x\n",\</div><div class='add'>+		tmio_ioread16(par-&gt;ccr + CCR_ ## n));</div><div class='add'>+	CCR_PR(CMD);</div><div class='add'>+	CCR_PR(REVID);</div><div class='add'>+	CCR_PR(BASEL);</div><div class='add'>+	CCR_PR(BASEH);</div><div class='add'>+	CCR_PR(UGCC);</div><div class='add'>+	CCR_PR(GCC);</div><div class='add'>+	CCR_PR(USC);</div><div class='add'>+	CCR_PR(VRAMRTC);</div><div class='add'>+	CCR_PR(VRAMSAC);</div><div class='add'>+	CCR_PR(VRAMBC);</div><div class='add'>+#undef CCR_PR</div><div class='add'>+</div><div class='add'>+	printk(KERN_DEBUG "lcr: \n");</div><div class='add'>+#define LCR_PR(n)	printk(KERN_DEBUG "\t" #n " = \t%04x\n",\</div><div class='add'>+		tmio_ioread16(par-&gt;lcr + LCR_ ## n));</div><div class='add'>+	LCR_PR(UIS);</div><div class='add'>+	LCR_PR(VHPN);</div><div class='add'>+	LCR_PR(CFSAL);</div><div class='add'>+	LCR_PR(CFSAH);</div><div class='add'>+	LCR_PR(CFS);</div><div class='add'>+	LCR_PR(CFWS);</div><div class='add'>+	LCR_PR(BBIE);</div><div class='add'>+	LCR_PR(BBISC);</div><div class='add'>+	LCR_PR(CCS);</div><div class='add'>+	LCR_PR(BBES);</div><div class='add'>+	LCR_PR(CMDL);</div><div class='add'>+	LCR_PR(CMDH);</div><div class='add'>+	LCR_PR(CFC);</div><div class='add'>+	LCR_PR(CCIFC);</div><div class='add'>+	LCR_PR(HWT);</div><div class='add'>+	LCR_PR(LCDCCRC);</div><div class='add'>+	LCR_PR(LCDCC);</div><div class='add'>+	LCR_PR(LCDCOPC);</div><div class='add'>+	LCR_PR(LCDIS);</div><div class='add'>+	LCR_PR(LCDIM);</div><div class='add'>+	LCR_PR(LCDIE);</div><div class='add'>+	LCR_PR(GDSAL);</div><div class='add'>+	LCR_PR(GDSAH);</div><div class='add'>+	LCR_PR(VHPCL);</div><div class='add'>+	LCR_PR(VHPCH);</div><div class='add'>+	LCR_PR(GM);</div><div class='add'>+	LCR_PR(HT);</div><div class='add'>+	LCR_PR(HDS);</div><div class='add'>+	LCR_PR(HSS);</div><div class='add'>+	LCR_PR(HSE);</div><div class='add'>+	LCR_PR(HNP);</div><div class='add'>+	LCR_PR(VT);</div><div class='add'>+	LCR_PR(VDS);</div><div class='add'>+	LCR_PR(VSS);</div><div class='add'>+	LCR_PR(VSE);</div><div class='add'>+	LCR_PR(CDLN);</div><div class='add'>+	LCR_PR(ILN);</div><div class='add'>+	LCR_PR(SP);</div><div class='add'>+	LCR_PR(MISC);</div><div class='add'>+	LCR_PR(VIHSS);</div><div class='add'>+	LCR_PR(VIVS);</div><div class='add'>+	LCR_PR(VIVE);</div><div class='add'>+	LCR_PR(VIVSS);</div><div class='add'>+	LCR_PR(VCCIS);</div><div class='add'>+	LCR_PR(VIDWSAL);</div><div class='add'>+	LCR_PR(VIDWSAH);</div><div class='add'>+	LCR_PR(VIDRSAL);</div><div class='add'>+	LCR_PR(VIDRSAH);</div><div class='add'>+	LCR_PR(VIPDDST);</div><div class='add'>+	LCR_PR(VIPDDET);</div><div class='add'>+	LCR_PR(VIE);</div><div class='add'>+	LCR_PR(VCS);</div><div class='add'>+	LCR_PR(VPHWC);</div><div class='add'>+	LCR_PR(VPHS);</div><div class='add'>+	LCR_PR(VPVWC);</div><div class='add'>+	LCR_PR(VPVS);</div><div class='add'>+	LCR_PR(PLHPIX);</div><div class='add'>+	LCR_PR(XS);</div><div class='add'>+	LCR_PR(XCKHW);</div><div class='add'>+	LCR_PR(STHS);</div><div class='add'>+	LCR_PR(VT2);</div><div class='add'>+	LCR_PR(YCKSW);</div><div class='add'>+	LCR_PR(YSTS);</div><div class='add'>+	LCR_PR(PPOLS);</div><div class='add'>+	LCR_PR(PRECW);</div><div class='add'>+	LCR_PR(VCLKHW);</div><div class='add'>+	LCR_PR(OC);</div><div class='add'>+#undef LCR_PR</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+static int tmiofb_suspend(struct platform_device *dev, pm_message_t state)</div><div class='add'>+{</div><div class='add'>+	struct fb_info *info = platform_get_drvdata(dev);</div><div class='add'>+	struct tmiofb_par *par = info-&gt;par;</div><div class='add'>+	struct mfd_cell *cell = dev-&gt;dev.platform_data;</div><div class='add'>+	int retval = 0;</div><div class='add'>+</div><div class='add'>+	acquire_console_sem();</div><div class='add'>+</div><div class='add'>+	fb_set_suspend(info, 1);</div><div class='add'>+</div><div class='add'>+	if (info-&gt;fbops-&gt;fb_sync)</div><div class='add'>+		info-&gt;fbops-&gt;fb_sync(info);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The fb should be usable even if interrupts are disabled (and they are</div><div class='add'>+	 * during suspend/resume). Switch temporary to forced polling.</div><div class='add'>+	 */</div><div class='add'>+	printk(KERN_INFO "tmiofb: switching to polling\n");</div><div class='add'>+	par-&gt;use_polling = true;</div><div class='add'>+	tmiofb_hw_stop(dev);</div><div class='add'>+</div><div class='add'>+	if (cell-&gt;suspend)</div><div class='add'>+		retval = cell-&gt;suspend(dev);</div><div class='add'>+</div><div class='add'>+	release_console_sem();</div><div class='add'>+</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tmiofb_resume(struct platform_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct fb_info *info = platform_get_drvdata(dev);</div><div class='add'>+	struct mfd_cell *cell = dev-&gt;dev.platform_data;</div><div class='add'>+	int retval;</div><div class='add'>+</div><div class='add'>+	acquire_console_sem();</div><div class='add'>+</div><div class='add'>+	if (cell-&gt;resume) {</div><div class='add'>+		retval = cell-&gt;resume(dev);</div><div class='add'>+		if (retval)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tmiofb_irq(-1, info);</div><div class='add'>+</div><div class='add'>+	tmiofb_hw_init(dev);</div><div class='add'>+</div><div class='add'>+	tmiofb_hw_mode(dev);</div><div class='add'>+</div><div class='add'>+	fb_set_suspend(info, 0);</div><div class='add'>+out:</div><div class='add'>+	release_console_sem();</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+#define tmiofb_suspend	NULL</div><div class='add'>+#define tmiofb_resume	NULL</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static struct platform_driver tmiofb_driver = {</div><div class='add'>+	.driver.name	= "tmio-fb",</div><div class='add'>+	.driver.owner	= THIS_MODULE,</div><div class='add'>+	.probe		= tmiofb_probe,</div><div class='add'>+	.remove		= __devexit_p(tmiofb_remove),</div><div class='add'>+	.suspend	= tmiofb_suspend,</div><div class='add'>+	.resume		= tmiofb_resume,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*--------------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+#ifndef MODULE</div><div class='add'>+static void __init tmiofb_setup(char *options)</div><div class='add'>+{</div><div class='add'>+	char *this_opt;</div><div class='add'>+</div><div class='add'>+	if (!options || !*options)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	while ((this_opt = strsep(&amp;options, ",")) != NULL) {</div><div class='add'>+		if (!*this_opt)</div><div class='add'>+			continue;</div><div class='add'>+		/*</div><div class='add'>+		 * FIXME</div><div class='add'>+		 */</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static int __init tmiofb_init(void)</div><div class='add'>+{</div><div class='add'>+#ifndef MODULE</div><div class='add'>+	char *option = NULL;</div><div class='add'>+</div><div class='add'>+	if (fb_get_options("tmiofb", &amp;option))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	tmiofb_setup(option);</div><div class='add'>+#endif</div><div class='add'>+	return platform_driver_register(&amp;tmiofb_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit tmiofb_cleanup(void)</div><div class='add'>+{</div><div class='add'>+	platform_driver_unregister(&amp;tmiofb_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(tmiofb_init);</div><div class='add'>+module_exit(tmiofb_cleanup);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("TMIO framebuffer driver");</div><div class='add'>+MODULE_AUTHOR("Chris Humbert, Dirk Opfer, Dmitry Baryshkov");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/video/uvesafb.c b/drivers/video/uvesafb.c<br/>index 50744229c7a9..6c2d37fdd3b9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/uvesafb.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/video/uvesafb.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/uvesafb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/uvesafb.c</a></div><div class='hunk'>@@ -516,10 +516,12 @@ static int __devinit uvesafb_vbe_getmodes(struct uvesafb_ktask *task,</div><div class='ctx'> </div><div class='ctx'> 		err = uvesafb_exec(task);</div><div class='ctx'> 		if (err || (task-&gt;t.regs.eax &amp; 0xffff) != 0x004f) {</div><div class='del'>-			printk(KERN_ERR "uvesafb: Getting mode info block "</div><div class='add'>+			printk(KERN_WARNING "uvesafb: Getting mode info block "</div><div class='ctx'> 				"for mode 0x%x failed (eax=0x%x, err=%d)\n",</div><div class='ctx'> 				*mode, (u32)task-&gt;t.regs.eax, err);</div><div class='del'>-			return -EINVAL;</div><div class='add'>+			mode++;</div><div class='add'>+			par-&gt;vbe_modes_cnt--;</div><div class='add'>+			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		mib = task-&gt;buf;</div><div class='hunk'>@@ -548,7 +550,10 @@ static int __devinit uvesafb_vbe_getmodes(struct uvesafb_ktask *task,</div><div class='ctx'> 			mib-&gt;depth = mib-&gt;bits_per_pixel;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	if (par-&gt;vbe_modes_cnt &gt; 0)</div><div class='add'>+		return 0;</div><div class='add'>+	else</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/drivers/video/vga16fb.c b/drivers/video/vga16fb.c<br/>index e31bca8a0cb2..5b2938903ac2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/vga16fb.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/video/vga16fb.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/vga16fb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/vga16fb.c</a></div><div class='hunk'>@@ -58,7 +58,6 @@ struct vga16fb_par {</div><div class='ctx'> 		unsigned char	ClockingMode;	  /* Seq-Controller:01h */</div><div class='ctx'> 	} vga_state;</div><div class='ctx'> 	struct vgastate state;</div><div class='del'>-	struct mutex open_lock;</div><div class='ctx'> 	unsigned int ref_count;</div><div class='ctx'> 	int palette_blanked, vesa_blanked, mode, isVGA;</div><div class='ctx'> 	u8 misc, pel_msk, vss, clkdiv;</div><div class='hunk'>@@ -286,7 +285,6 @@ static int vga16fb_open(struct fb_info *info, int user)</div><div class='ctx'> {</div><div class='ctx'> 	struct vga16fb_par *par = info-&gt;par;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;par-&gt;open_lock);</div><div class='ctx'> 	if (!par-&gt;ref_count) {</div><div class='ctx'> 		memset(&amp;par-&gt;state, 0, sizeof(struct vgastate));</div><div class='ctx'> 		par-&gt;state.flags = VGA_SAVE_FONTS | VGA_SAVE_MODE |</div><div class='hunk'>@@ -294,7 +292,6 @@ static int vga16fb_open(struct fb_info *info, int user)</div><div class='ctx'> 		save_vga(&amp;par-&gt;state);</div><div class='ctx'> 	}</div><div class='ctx'> 	par-&gt;ref_count++;</div><div class='del'>-	mutex_unlock(&amp;par-&gt;open_lock);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -303,15 +300,12 @@ static int vga16fb_release(struct fb_info *info, int user)</div><div class='ctx'> {</div><div class='ctx'> 	struct vga16fb_par *par = info-&gt;par;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;par-&gt;open_lock);</div><div class='del'>-	if (!par-&gt;ref_count) {</div><div class='del'>-		mutex_unlock(&amp;par-&gt;open_lock);</div><div class='add'>+	if (!par-&gt;ref_count)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	}</div><div class='add'>+</div><div class='ctx'> 	if (par-&gt;ref_count == 1)</div><div class='ctx'> 		restore_vga(&amp;par-&gt;state);</div><div class='ctx'> 	par-&gt;ref_count--;</div><div class='del'>-	mutex_unlock(&amp;par-&gt;open_lock);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1326,7 +1320,6 @@ static int __init vga16fb_probe(struct platform_device *dev)</div><div class='ctx'> 	printk(KERN_INFO "vga16fb: mapped to 0x%p\n", info-&gt;screen_base);</div><div class='ctx'> 	par = info-&gt;par;</div><div class='ctx'> </div><div class='del'>-	mutex_init(&amp;par-&gt;open_lock);</div><div class='ctx'> 	par-&gt;isVGA = screen_info.orig_video_isVGA;</div><div class='ctx'> 	par-&gt;palette_blanked = 0;</div><div class='ctx'> 	par-&gt;vesa_blanked = 0;</div><div class='head'>diff --git a/drivers/video/via/Makefile b/drivers/video/via/Makefile<br/>new file mode 100644<br/>index 000000000000..e533b4b6aba4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/via/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/via/Makefile</a></div><div class='hunk'>@@ -0,0 +1,7 @@</div><div class='add'>+#</div><div class='add'>+# Makefile for the VIA framebuffer driver (for Linux Kernel 2.6)</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_FB_VIA) += viafb.o</div><div class='add'>+</div><div class='add'>+viafb-y	:=viafbdev.o hw.o iface.o  via_i2c.o dvi.o lcd.o ioctl.o accel.o via_utility.o vt1636.o global.o tblDPASetting.o viamode.o tbl1636.o</div><div class='head'>diff --git a/drivers/video/via/accel.c b/drivers/video/via/accel.c<br/>new file mode 100644<br/>index 000000000000..632523ff1fb7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/via/accel.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/via/accel.c</a></div><div class='hunk'>@@ -0,0 +1,279 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.</div><div class='add'>+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.</div><div class='add'>+</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public</div><div class='add'>+ * License as published by the Free Software Foundation;</div><div class='add'>+ * either version 2, or (at your option) any later version.</div><div class='add'>+</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even</div><div class='add'>+ * the implied warranty of MERCHANTABILITY or FITNESS FOR</div><div class='add'>+ * A PARTICULAR PURPOSE.See the GNU General Public License</div><div class='add'>+ * for more details.</div><div class='add'>+</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc.,</div><div class='add'>+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='add'>+ */</div><div class='add'>+#include "global.h"</div><div class='add'>+</div><div class='add'>+void viafb_init_accel(void)</div><div class='add'>+{</div><div class='add'>+	viaparinfo-&gt;fbmem_free -= CURSOR_SIZE;</div><div class='add'>+	viaparinfo-&gt;cursor_start = viaparinfo-&gt;fbmem_free;</div><div class='add'>+	viaparinfo-&gt;fbmem_used += CURSOR_SIZE;</div><div class='add'>+</div><div class='add'>+	/* Reverse 8*1024 memory space for cursor image */</div><div class='add'>+	viaparinfo-&gt;fbmem_free -= (CURSOR_SIZE + VQ_SIZE);</div><div class='add'>+	viaparinfo-&gt;VQ_start = viaparinfo-&gt;fbmem_free;</div><div class='add'>+	viaparinfo-&gt;VQ_end = viaparinfo-&gt;VQ_start + VQ_SIZE - 1;</div><div class='add'>+	viaparinfo-&gt;fbmem_used += (CURSOR_SIZE + VQ_SIZE); }</div><div class='add'>+</div><div class='add'>+void viafb_init_2d_engine(void)</div><div class='add'>+{</div><div class='add'>+	u32 dwVQStartAddr, dwVQEndAddr;</div><div class='add'>+	u32 dwVQLen, dwVQStartL, dwVQEndL, dwVQStartEndH;</div><div class='add'>+</div><div class='add'>+	/* init 2D engine regs to reset 2D engine */</div><div class='add'>+	writel(0x0, viaparinfo-&gt;io_virt + VIA_REG_GEMODE);</div><div class='add'>+	writel(0x0, viaparinfo-&gt;io_virt + VIA_REG_SRCPOS);</div><div class='add'>+	writel(0x0, viaparinfo-&gt;io_virt + VIA_REG_DSTPOS);</div><div class='add'>+	writel(0x0, viaparinfo-&gt;io_virt + VIA_REG_DIMENSION);</div><div class='add'>+	writel(0x0, viaparinfo-&gt;io_virt + VIA_REG_PATADDR);</div><div class='add'>+	writel(0x0, viaparinfo-&gt;io_virt + VIA_REG_FGCOLOR);</div><div class='add'>+	writel(0x0, viaparinfo-&gt;io_virt + VIA_REG_BGCOLOR);</div><div class='add'>+	writel(0x0, viaparinfo-&gt;io_virt + VIA_REG_CLIPTL);</div><div class='add'>+	writel(0x0, viaparinfo-&gt;io_virt + VIA_REG_CLIPBR);</div><div class='add'>+	writel(0x0, viaparinfo-&gt;io_virt + VIA_REG_OFFSET);</div><div class='add'>+	writel(0x0, viaparinfo-&gt;io_virt + VIA_REG_KEYCONTROL);</div><div class='add'>+	writel(0x0, viaparinfo-&gt;io_virt + VIA_REG_SRCBASE);</div><div class='add'>+	writel(0x0, viaparinfo-&gt;io_virt + VIA_REG_DSTBASE);</div><div class='add'>+	writel(0x0, viaparinfo-&gt;io_virt + VIA_REG_PITCH);</div><div class='add'>+	writel(0x0, viaparinfo-&gt;io_virt + VIA_REG_MONOPAT1);</div><div class='add'>+</div><div class='add'>+	/* Init AGP and VQ regs */</div><div class='add'>+	switch (viaparinfo-&gt;chip_info-&gt;gfx_chip_name) {</div><div class='add'>+	case UNICHROME_K8M890:</div><div class='add'>+	case UNICHROME_P4M900:</div><div class='add'>+		writel(0x00100000, viaparinfo-&gt;io_virt + VIA_REG_CR_TRANSET);</div><div class='add'>+		writel(0x680A0000, viaparinfo-&gt;io_virt + VIA_REG_CR_TRANSPACE);</div><div class='add'>+		writel(0x02000000, viaparinfo-&gt;io_virt + VIA_REG_CR_TRANSPACE);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		writel(0x00100000, viaparinfo-&gt;io_virt + VIA_REG_TRANSET);</div><div class='add'>+		writel(0x00000000, viaparinfo-&gt;io_virt + VIA_REG_TRANSPACE);</div><div class='add'>+		writel(0x00333004, viaparinfo-&gt;io_virt + VIA_REG_TRANSPACE);</div><div class='add'>+		writel(0x60000000, viaparinfo-&gt;io_virt + VIA_REG_TRANSPACE);</div><div class='add'>+		writel(0x61000000, viaparinfo-&gt;io_virt + VIA_REG_TRANSPACE);</div><div class='add'>+		writel(0x62000000, viaparinfo-&gt;io_virt + VIA_REG_TRANSPACE);</div><div class='add'>+		writel(0x63000000, viaparinfo-&gt;io_virt + VIA_REG_TRANSPACE);</div><div class='add'>+		writel(0x64000000, viaparinfo-&gt;io_virt + VIA_REG_TRANSPACE);</div><div class='add'>+		writel(0x7D000000, viaparinfo-&gt;io_virt + VIA_REG_TRANSPACE);</div><div class='add'>+</div><div class='add'>+		writel(0xFE020000, viaparinfo-&gt;io_virt + VIA_REG_TRANSET);</div><div class='add'>+		writel(0x00000000, viaparinfo-&gt;io_virt + VIA_REG_TRANSPACE);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	if (viaparinfo-&gt;VQ_start != 0) {</div><div class='add'>+		/* Enable VQ */</div><div class='add'>+		dwVQStartAddr = viaparinfo-&gt;VQ_start;</div><div class='add'>+		dwVQEndAddr = viaparinfo-&gt;VQ_end;</div><div class='add'>+</div><div class='add'>+		dwVQStartL = 0x50000000 | (dwVQStartAddr &amp; 0xFFFFFF);</div><div class='add'>+		dwVQEndL = 0x51000000 | (dwVQEndAddr &amp; 0xFFFFFF);</div><div class='add'>+		dwVQStartEndH = 0x52000000 |</div><div class='add'>+			((dwVQStartAddr &amp; 0xFF000000) &gt;&gt; 24) |</div><div class='add'>+			((dwVQEndAddr &amp; 0xFF000000) &gt;&gt; 16);</div><div class='add'>+		dwVQLen = 0x53000000 | (VQ_SIZE &gt;&gt; 3);</div><div class='add'>+		switch (viaparinfo-&gt;chip_info-&gt;gfx_chip_name) {</div><div class='add'>+		case UNICHROME_K8M890:</div><div class='add'>+		case UNICHROME_P4M900:</div><div class='add'>+			dwVQStartL |= 0x20000000;</div><div class='add'>+			dwVQEndL |= 0x20000000;</div><div class='add'>+			dwVQStartEndH |= 0x20000000;</div><div class='add'>+			dwVQLen |= 0x20000000;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		switch (viaparinfo-&gt;chip_info-&gt;gfx_chip_name) {</div><div class='add'>+		case UNICHROME_K8M890:</div><div class='add'>+		case UNICHROME_P4M900:</div><div class='add'>+			writel(0x00100000,</div><div class='add'>+				viaparinfo-&gt;io_virt + VIA_REG_CR_TRANSET);</div><div class='add'>+			writel(dwVQStartEndH,</div><div class='add'>+				viaparinfo-&gt;io_virt + VIA_REG_CR_TRANSPACE);</div><div class='add'>+			writel(dwVQStartL,</div><div class='add'>+				viaparinfo-&gt;io_virt + VIA_REG_CR_TRANSPACE);</div><div class='add'>+			writel(dwVQEndL,</div><div class='add'>+				viaparinfo-&gt;io_virt + VIA_REG_CR_TRANSPACE);</div><div class='add'>+			writel(dwVQLen,</div><div class='add'>+				viaparinfo-&gt;io_virt + VIA_REG_CR_TRANSPACE);</div><div class='add'>+			writel(0x74301001,</div><div class='add'>+				viaparinfo-&gt;io_virt + VIA_REG_CR_TRANSPACE);</div><div class='add'>+			writel(0x00000000,</div><div class='add'>+				viaparinfo-&gt;io_virt + VIA_REG_CR_TRANSPACE);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			writel(0x00FE0000,</div><div class='add'>+				viaparinfo-&gt;io_virt + VIA_REG_TRANSET);</div><div class='add'>+			writel(0x080003FE,</div><div class='add'>+				viaparinfo-&gt;io_virt + VIA_REG_TRANSPACE);</div><div class='add'>+			writel(0x0A00027C,</div><div class='add'>+				viaparinfo-&gt;io_virt + VIA_REG_TRANSPACE);</div><div class='add'>+			writel(0x0B000260,</div><div class='add'>+				viaparinfo-&gt;io_virt + VIA_REG_TRANSPACE);</div><div class='add'>+			writel(0x0C000274,</div><div class='add'>+				viaparinfo-&gt;io_virt + VIA_REG_TRANSPACE);</div><div class='add'>+			writel(0x0D000264,</div><div class='add'>+				viaparinfo-&gt;io_virt + VIA_REG_TRANSPACE);</div><div class='add'>+			writel(0x0E000000,</div><div class='add'>+				viaparinfo-&gt;io_virt + VIA_REG_TRANSPACE);</div><div class='add'>+			writel(0x0F000020,</div><div class='add'>+				viaparinfo-&gt;io_virt + VIA_REG_TRANSPACE);</div><div class='add'>+			writel(0x1000027E,</div><div class='add'>+				viaparinfo-&gt;io_virt + VIA_REG_TRANSPACE);</div><div class='add'>+			writel(0x110002FE,</div><div class='add'>+				viaparinfo-&gt;io_virt + VIA_REG_TRANSPACE);</div><div class='add'>+			writel(0x200F0060,</div><div class='add'>+				viaparinfo-&gt;io_virt + VIA_REG_TRANSPACE);</div><div class='add'>+</div><div class='add'>+			writel(0x00000006,</div><div class='add'>+				viaparinfo-&gt;io_virt + VIA_REG_TRANSPACE);</div><div class='add'>+			writel(0x40008C0F,</div><div class='add'>+				viaparinfo-&gt;io_virt + VIA_REG_TRANSPACE);</div><div class='add'>+			writel(0x44000000,</div><div class='add'>+				viaparinfo-&gt;io_virt + VIA_REG_TRANSPACE);</div><div class='add'>+			writel(0x45080C04,</div><div class='add'>+				viaparinfo-&gt;io_virt + VIA_REG_TRANSPACE);</div><div class='add'>+			writel(0x46800408,</div><div class='add'>+				viaparinfo-&gt;io_virt + VIA_REG_TRANSPACE);</div><div class='add'>+</div><div class='add'>+			writel(dwVQStartEndH,</div><div class='add'>+				viaparinfo-&gt;io_virt + VIA_REG_TRANSPACE);</div><div class='add'>+			writel(dwVQStartL,</div><div class='add'>+				viaparinfo-&gt;io_virt + VIA_REG_TRANSPACE);</div><div class='add'>+			writel(dwVQEndL,</div><div class='add'>+				viaparinfo-&gt;io_virt + VIA_REG_TRANSPACE);</div><div class='add'>+			writel(dwVQLen,</div><div class='add'>+				viaparinfo-&gt;io_virt + VIA_REG_TRANSPACE);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		/* Disable VQ */</div><div class='add'>+		switch (viaparinfo-&gt;chip_info-&gt;gfx_chip_name) {</div><div class='add'>+		case UNICHROME_K8M890:</div><div class='add'>+		case UNICHROME_P4M900:</div><div class='add'>+			writel(0x00100000,</div><div class='add'>+				viaparinfo-&gt;io_virt + VIA_REG_CR_TRANSET);</div><div class='add'>+			writel(0x74301000,</div><div class='add'>+				viaparinfo-&gt;io_virt + VIA_REG_CR_TRANSPACE);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			writel(0x00FE0000,</div><div class='add'>+				viaparinfo-&gt;io_virt + VIA_REG_TRANSET);</div><div class='add'>+			writel(0x00000004,</div><div class='add'>+				viaparinfo-&gt;io_virt + VIA_REG_TRANSPACE);</div><div class='add'>+			writel(0x40008C0F,</div><div class='add'>+				viaparinfo-&gt;io_virt + VIA_REG_TRANSPACE);</div><div class='add'>+			writel(0x44000000,</div><div class='add'>+				viaparinfo-&gt;io_virt + VIA_REG_TRANSPACE);</div><div class='add'>+			writel(0x45080C04,</div><div class='add'>+				viaparinfo-&gt;io_virt + VIA_REG_TRANSPACE);</div><div class='add'>+			writel(0x46800408,</div><div class='add'>+				viaparinfo-&gt;io_virt + VIA_REG_TRANSPACE);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	viafb_set_2d_color_depth(viaparinfo-&gt;bpp);</div><div class='add'>+</div><div class='add'>+	writel(0x0, viaparinfo-&gt;io_virt + VIA_REG_SRCBASE);</div><div class='add'>+	writel(0x0, viaparinfo-&gt;io_virt + VIA_REG_DSTBASE);</div><div class='add'>+</div><div class='add'>+	writel(VIA_PITCH_ENABLE |</div><div class='add'>+		   (((viaparinfo-&gt;hres *</div><div class='add'>+		      viaparinfo-&gt;bpp &gt;&gt; 3) &gt;&gt; 3) | (((viaparinfo-&gt;hres *</div><div class='add'>+						   viaparinfo-&gt;</div><div class='add'>+						   bpp &gt;&gt; 3) &gt;&gt; 3) &lt;&lt; 16)),</div><div class='add'>+					viaparinfo-&gt;io_virt + VIA_REG_PITCH);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void viafb_set_2d_color_depth(int bpp)</div><div class='add'>+{</div><div class='add'>+	u32 dwGEMode;</div><div class='add'>+</div><div class='add'>+	dwGEMode = readl(viaparinfo-&gt;io_virt + 0x04) &amp; 0xFFFFFCFF;</div><div class='add'>+</div><div class='add'>+	switch (bpp) {</div><div class='add'>+	case 16:</div><div class='add'>+		dwGEMode |= VIA_GEM_16bpp;</div><div class='add'>+		break;</div><div class='add'>+	case 32:</div><div class='add'>+		dwGEMode |= VIA_GEM_32bpp;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dwGEMode |= VIA_GEM_8bpp;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Set BPP and Pitch */</div><div class='add'>+	writel(dwGEMode, viaparinfo-&gt;io_virt + VIA_REG_GEMODE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void viafb_hw_cursor_init(void)</div><div class='add'>+{</div><div class='add'>+	/* Set Cursor Image Base Address */</div><div class='add'>+	writel(viaparinfo-&gt;cursor_start,</div><div class='add'>+		viaparinfo-&gt;io_virt + VIA_REG_CURSOR_MODE);</div><div class='add'>+	writel(0x0, viaparinfo-&gt;io_virt + VIA_REG_CURSOR_POS);</div><div class='add'>+	writel(0x0, viaparinfo-&gt;io_virt + VIA_REG_CURSOR_ORG);</div><div class='add'>+	writel(0x0, viaparinfo-&gt;io_virt + VIA_REG_CURSOR_BG);</div><div class='add'>+	writel(0x0, viaparinfo-&gt;io_virt + VIA_REG_CURSOR_FG);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void viafb_show_hw_cursor(struct fb_info *info, int Status)</div><div class='add'>+{</div><div class='add'>+	u32 temp;</div><div class='add'>+	u32 iga_path = ((struct viafb_par *)(info-&gt;par))-&gt;iga_path;</div><div class='add'>+</div><div class='add'>+	temp = readl(viaparinfo-&gt;io_virt + VIA_REG_CURSOR_MODE);</div><div class='add'>+	switch (Status) {</div><div class='add'>+	case HW_Cursor_ON:</div><div class='add'>+		temp |= 0x1;</div><div class='add'>+		break;</div><div class='add'>+	case HW_Cursor_OFF:</div><div class='add'>+		temp &amp;= 0xFFFFFFFE;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	switch (iga_path) {</div><div class='add'>+	case IGA2:</div><div class='add'>+		temp |= 0x80000000;</div><div class='add'>+		break;</div><div class='add'>+	case IGA1:</div><div class='add'>+	default:</div><div class='add'>+		temp &amp;= 0x7FFFFFFF;</div><div class='add'>+	}</div><div class='add'>+	writel(temp, viaparinfo-&gt;io_virt + VIA_REG_CURSOR_MODE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int viafb_wait_engine_idle(void)</div><div class='add'>+{</div><div class='add'>+	int loop = 0;</div><div class='add'>+</div><div class='add'>+	while (!(readl(viaparinfo-&gt;io_virt + VIA_REG_STATUS) &amp;</div><div class='add'>+			VIA_VR_QUEUE_BUSY) &amp;&amp; (loop++ &lt; MAXLOOP))</div><div class='add'>+		cpu_relax();</div><div class='add'>+</div><div class='add'>+	while ((readl(viaparinfo-&gt;io_virt + VIA_REG_STATUS) &amp;</div><div class='add'>+		    (VIA_CMD_RGTR_BUSY | VIA_2D_ENG_BUSY | VIA_3D_ENG_BUSY)) &amp;&amp;</div><div class='add'>+		    (loop++ &lt; MAXLOOP))</div><div class='add'>+		cpu_relax();</div><div class='add'>+</div><div class='add'>+	return loop &gt;= MAXLOOP;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/video/via/accel.h b/drivers/video/via/accel.h<br/>new file mode 100644<br/>index 000000000000..29bf854e8ccf<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/via/accel.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/via/accel.h</a></div><div class='hunk'>@@ -0,0 +1,169 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.</div><div class='add'>+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.</div><div class='add'>+</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public</div><div class='add'>+ * License as published by the Free Software Foundation;</div><div class='add'>+ * either version 2, or (at your option) any later version.</div><div class='add'>+</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even</div><div class='add'>+ * the implied warranty of MERCHANTABILITY or FITNESS FOR</div><div class='add'>+ * A PARTICULAR PURPOSE.See the GNU General Public License</div><div class='add'>+ * for more details.</div><div class='add'>+</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc.,</div><div class='add'>+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __ACCEL_H__</div><div class='add'>+#define __ACCEL_H__</div><div class='add'>+</div><div class='add'>+#define FB_ACCEL_VIA_UNICHROME  50</div><div class='add'>+</div><div class='add'>+/* MMIO Base Address Definition */</div><div class='add'>+#define MMIO_VGABASE                0x8000</div><div class='add'>+#define MMIO_CR_READ                (MMIO_VGABASE + 0x3D4)</div><div class='add'>+#define MMIO_CR_WRITE               (MMIO_VGABASE + 0x3D5)</div><div class='add'>+#define MMIO_SR_READ                (MMIO_VGABASE + 0x3C4)</div><div class='add'>+#define MMIO_SR_WRITE               (MMIO_VGABASE + 0x3C5)</div><div class='add'>+</div><div class='add'>+/* HW Cursor Status Define */</div><div class='add'>+#define HW_Cursor_ON    0</div><div class='add'>+#define HW_Cursor_OFF   1</div><div class='add'>+</div><div class='add'>+#define CURSOR_SIZE     (8 * 1024)</div><div class='add'>+#define VQ_SIZE         (256 * 1024)</div><div class='add'>+</div><div class='add'>+#define VIA_MMIO_BLTBASE        0x200000</div><div class='add'>+#define VIA_MMIO_BLTSIZE        0x200000</div><div class='add'>+</div><div class='add'>+/* Defines for 2D registers */</div><div class='add'>+#define VIA_REG_GECMD           0x000</div><div class='add'>+#define VIA_REG_GEMODE          0x004</div><div class='add'>+#define VIA_REG_SRCPOS          0x008</div><div class='add'>+#define VIA_REG_DSTPOS          0x00C</div><div class='add'>+/* width and height */</div><div class='add'>+#define VIA_REG_DIMENSION       0x010</div><div class='add'>+#define VIA_REG_PATADDR         0x014</div><div class='add'>+#define VIA_REG_FGCOLOR         0x018</div><div class='add'>+#define VIA_REG_BGCOLOR         0x01C</div><div class='add'>+/* top and left of clipping */</div><div class='add'>+#define VIA_REG_CLIPTL          0x020</div><div class='add'>+/* bottom and right of clipping */</div><div class='add'>+#define VIA_REG_CLIPBR          0x024</div><div class='add'>+#define VIA_REG_OFFSET          0x028</div><div class='add'>+/* color key control */</div><div class='add'>+#define VIA_REG_KEYCONTROL      0x02C</div><div class='add'>+#define VIA_REG_SRCBASE         0x030</div><div class='add'>+#define VIA_REG_DSTBASE         0x034</div><div class='add'>+/* pitch of src and dst */</div><div class='add'>+#define VIA_REG_PITCH           0x038</div><div class='add'>+#define VIA_REG_MONOPAT0        0x03C</div><div class='add'>+#define VIA_REG_MONOPAT1        0x040</div><div class='add'>+/* from 0x100 to 0x1ff */</div><div class='add'>+#define VIA_REG_COLORPAT        0x100</div><div class='add'>+</div><div class='add'>+/* VIA_REG_PITCH(0x38): Pitch Setting */</div><div class='add'>+#define VIA_PITCH_ENABLE        0x80000000</div><div class='add'>+</div><div class='add'>+/* defines for VIA HW cursor registers */</div><div class='add'>+#define VIA_REG_CURSOR_MODE     0x2D0</div><div class='add'>+#define VIA_REG_CURSOR_POS      0x2D4</div><div class='add'>+#define VIA_REG_CURSOR_ORG      0x2D8</div><div class='add'>+#define VIA_REG_CURSOR_BG       0x2DC</div><div class='add'>+#define VIA_REG_CURSOR_FG       0x2E0</div><div class='add'>+</div><div class='add'>+/* VIA_REG_GEMODE(0x04): GE mode */</div><div class='add'>+#define VIA_GEM_8bpp            0x00000000</div><div class='add'>+#define VIA_GEM_16bpp           0x00000100</div><div class='add'>+#define VIA_GEM_32bpp           0x00000300</div><div class='add'>+</div><div class='add'>+/* VIA_REG_GECMD(0x00): 2D Engine Command  */</div><div class='add'>+#define VIA_GEC_NOOP            0x00000000</div><div class='add'>+#define VIA_GEC_BLT             0x00000001</div><div class='add'>+#define VIA_GEC_LINE            0x00000005</div><div class='add'>+</div><div class='add'>+/* Rotate Command */</div><div class='add'>+#define VIA_GEC_ROT             0x00000008</div><div class='add'>+</div><div class='add'>+#define VIA_GEC_SRC_XY          0x00000000</div><div class='add'>+#define VIA_GEC_SRC_LINEAR      0x00000010</div><div class='add'>+#define VIA_GEC_DST_XY          0x00000000</div><div class='add'>+#define VIA_GEC_DST_LINRAT      0x00000020</div><div class='add'>+</div><div class='add'>+#define VIA_GEC_SRC_FB          0x00000000</div><div class='add'>+#define VIA_GEC_SRC_SYS         0x00000040</div><div class='add'>+#define VIA_GEC_DST_FB          0x00000000</div><div class='add'>+#define VIA_GEC_DST_SYS         0x00000080</div><div class='add'>+</div><div class='add'>+/* source is mono */</div><div class='add'>+#define VIA_GEC_SRC_MONO        0x00000100</div><div class='add'>+/* pattern is mono */</div><div class='add'>+#define VIA_GEC_PAT_MONO        0x00000200</div><div class='add'>+/* mono src is opaque */</div><div class='add'>+#define VIA_GEC_MSRC_OPAQUE     0x00000000</div><div class='add'>+/* mono src is transparent */</div><div class='add'>+#define VIA_GEC_MSRC_TRANS      0x00000400</div><div class='add'>+/* pattern is in frame buffer */</div><div class='add'>+#define VIA_GEC_PAT_FB          0x00000000</div><div class='add'>+/* pattern is from reg setting */</div><div class='add'>+#define VIA_GEC_PAT_REG         0x00000800</div><div class='add'>+</div><div class='add'>+#define VIA_GEC_CLIP_DISABLE    0x00000000</div><div class='add'>+#define VIA_GEC_CLIP_ENABLE     0x00001000</div><div class='add'>+</div><div class='add'>+#define VIA_GEC_FIXCOLOR_PAT    0x00002000</div><div class='add'>+</div><div class='add'>+#define VIA_GEC_INCX            0x00000000</div><div class='add'>+#define VIA_GEC_DECY            0x00004000</div><div class='add'>+#define VIA_GEC_INCY            0x00000000</div><div class='add'>+#define VIA_GEC_DECX            0x00008000</div><div class='add'>+/* mono pattern is opaque */</div><div class='add'>+#define VIA_GEC_MPAT_OPAQUE     0x00000000</div><div class='add'>+/* mono pattern is transparent */</div><div class='add'>+#define VIA_GEC_MPAT_TRANS      0x00010000</div><div class='add'>+</div><div class='add'>+#define VIA_GEC_MONO_UNPACK     0x00000000</div><div class='add'>+#define VIA_GEC_MONO_PACK       0x00020000</div><div class='add'>+#define VIA_GEC_MONO_DWORD      0x00000000</div><div class='add'>+#define VIA_GEC_MONO_WORD       0x00040000</div><div class='add'>+#define VIA_GEC_MONO_BYTE       0x00080000</div><div class='add'>+</div><div class='add'>+#define VIA_GEC_LASTPIXEL_ON    0x00000000</div><div class='add'>+#define VIA_GEC_LASTPIXEL_OFF   0x00100000</div><div class='add'>+#define VIA_GEC_X_MAJOR         0x00000000</div><div class='add'>+#define VIA_GEC_Y_MAJOR         0x00200000</div><div class='add'>+#define VIA_GEC_QUICK_START     0x00800000</div><div class='add'>+</div><div class='add'>+/* defines for VIA 3D registers */</div><div class='add'>+#define VIA_REG_STATUS          0x400</div><div class='add'>+#define VIA_REG_CR_TRANSET      0x41C</div><div class='add'>+#define VIA_REG_CR_TRANSPACE	0x420</div><div class='add'>+#define VIA_REG_TRANSET         0x43C</div><div class='add'>+#define VIA_REG_TRANSPACE       0x440</div><div class='add'>+</div><div class='add'>+/* VIA_REG_STATUS(0x400): Engine Status */</div><div class='add'>+</div><div class='add'>+/* Command Regulator is busy */</div><div class='add'>+#define VIA_CMD_RGTR_BUSY       0x00000080</div><div class='add'>+/* 2D Engine is busy */</div><div class='add'>+#define VIA_2D_ENG_BUSY         0x00000002</div><div class='add'>+/* 3D Engine is busy */</div><div class='add'>+#define VIA_3D_ENG_BUSY         0x00000001</div><div class='add'>+/* Virtual Queue is busy */</div><div class='add'>+#define VIA_VR_QUEUE_BUSY       0x00020000</div><div class='add'>+</div><div class='add'>+#define MAXLOOP                 0xFFFFFF</div><div class='add'>+</div><div class='add'>+void viafb_init_accel(void);</div><div class='add'>+void viafb_init_2d_engine(void);</div><div class='add'>+void set_2d_color_depth(int);</div><div class='add'>+void viafb_hw_cursor_init(void);</div><div class='add'>+void viafb_show_hw_cursor(struct fb_info *info, int Status); int</div><div class='add'>+viafb_wait_engine_idle(void); void viafb_set_2d_color_depth(int bpp);</div><div class='add'>+</div><div class='add'>+#endif /* __ACCEL_H__ */</div><div class='head'>diff --git a/drivers/video/via/chip.h b/drivers/video/via/chip.h<br/>new file mode 100644<br/>index 000000000000..dde95edc387a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/via/chip.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/via/chip.h</a></div><div class='hunk'>@@ -0,0 +1,190 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.</div><div class='add'>+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.</div><div class='add'>+</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public</div><div class='add'>+ * License as published by the Free Software Foundation;</div><div class='add'>+ * either version 2, or (at your option) any later version.</div><div class='add'>+</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even</div><div class='add'>+ * the implied warranty of MERCHANTABILITY or FITNESS FOR</div><div class='add'>+ * A PARTICULAR PURPOSE.See the GNU General Public License</div><div class='add'>+ * for more details.</div><div class='add'>+</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc.,</div><div class='add'>+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='add'>+ */</div><div class='add'>+#ifndef __CHIP_H__</div><div class='add'>+#define __CHIP_H__</div><div class='add'>+</div><div class='add'>+#include "global.h"</div><div class='add'>+</div><div class='add'>+/***************************************/</div><div class='add'>+/* Definition Graphic Chip Information */</div><div class='add'>+/***************************************/</div><div class='add'>+</div><div class='add'>+#define     PCI_VIA_VENDOR_ID       0x1106</div><div class='add'>+</div><div class='add'>+/* Define VIA Graphic Chip Name */</div><div class='add'>+#define     UNICHROME_CLE266        1</div><div class='add'>+#define     UNICHROME_CLE266_DID    0x3122</div><div class='add'>+#define     CLE266_REVISION_AX      0x0A</div><div class='add'>+#define     CLE266_REVISION_CX      0x0C</div><div class='add'>+</div><div class='add'>+#define     UNICHROME_K400          2</div><div class='add'>+#define     UNICHROME_K400_DID      0x7205</div><div class='add'>+</div><div class='add'>+#define     UNICHROME_K800          3</div><div class='add'>+#define     UNICHROME_K800_DID      0x3108</div><div class='add'>+</div><div class='add'>+#define     UNICHROME_PM800         4</div><div class='add'>+#define     UNICHROME_PM800_DID     0x3118</div><div class='add'>+</div><div class='add'>+#define     UNICHROME_CN700         5</div><div class='add'>+#define     UNICHROME_CN700_DID     0x3344</div><div class='add'>+</div><div class='add'>+#define     UNICHROME_CX700         6</div><div class='add'>+#define     UNICHROME_CX700_DID     0x3157</div><div class='add'>+#define     CX700_REVISION_700      0x0</div><div class='add'>+#define     CX700_REVISION_700M     0x1</div><div class='add'>+#define     CX700_REVISION_700M2    0x2</div><div class='add'>+</div><div class='add'>+#define     UNICHROME_CN750         7</div><div class='add'>+#define     UNICHROME_CN750_DID     0x3225</div><div class='add'>+</div><div class='add'>+#define     UNICHROME_K8M890        8</div><div class='add'>+#define     UNICHROME_K8M890_DID    0x3230</div><div class='add'>+</div><div class='add'>+#define     UNICHROME_P4M890        9</div><div class='add'>+#define     UNICHROME_P4M890_DID    0x3343</div><div class='add'>+</div><div class='add'>+#define     UNICHROME_P4M900        10</div><div class='add'>+#define     UNICHROME_P4M900_DID    0x3371</div><div class='add'>+</div><div class='add'>+#define     UNICHROME_VX800         11</div><div class='add'>+#define     UNICHROME_VX800_DID     0x1122</div><div class='add'>+</div><div class='add'>+/**************************************************/</div><div class='add'>+/* Definition TMDS Trasmitter Information         */</div><div class='add'>+/**************************************************/</div><div class='add'>+</div><div class='add'>+/* Definition TMDS Trasmitter Index */</div><div class='add'>+#define     NON_TMDS_TRANSMITTER    0x00</div><div class='add'>+#define     VT1632_TMDS             0x01</div><div class='add'>+#define     INTEGRATED_TMDS         0x42</div><div class='add'>+</div><div class='add'>+/* Definition TMDS Trasmitter I2C Slave Address */</div><div class='add'>+#define     VT1632_TMDS_I2C_ADDR    0x10</div><div class='add'>+</div><div class='add'>+/**************************************************/</div><div class='add'>+/* Definition LVDS Trasmitter Information         */</div><div class='add'>+/**************************************************/</div><div class='add'>+</div><div class='add'>+/* Definition LVDS Trasmitter Index */</div><div class='add'>+#define     NON_LVDS_TRANSMITTER    0x00</div><div class='add'>+#define     VT1631_LVDS             0x01</div><div class='add'>+#define     VT1636_LVDS             0x0E</div><div class='add'>+#define     INTEGRATED_LVDS         0x41</div><div class='add'>+</div><div class='add'>+/* Definition Digital Transmitter Mode */</div><div class='add'>+#define     TX_DATA_12_BITS         0x01</div><div class='add'>+#define     TX_DATA_24_BITS         0x02</div><div class='add'>+#define     TX_DATA_DDR_MODE        0x04</div><div class='add'>+#define     TX_DATA_SDR_MODE        0x08</div><div class='add'>+</div><div class='add'>+/* Definition LVDS Trasmitter I2C Slave Address */</div><div class='add'>+#define     VT1631_LVDS_I2C_ADDR    0x70</div><div class='add'>+#define     VT3271_LVDS_I2C_ADDR    0x80</div><div class='add'>+#define     VT1636_LVDS_I2C_ADDR    0x80</div><div class='add'>+</div><div class='add'>+struct tmds_chip_information {</div><div class='add'>+	int tmds_chip_name;</div><div class='add'>+	int tmds_chip_slave_addr;</div><div class='add'>+	int dvi_panel_id;</div><div class='add'>+	int data_mode;</div><div class='add'>+	int output_interface;</div><div class='add'>+	int i2c_port;</div><div class='add'>+	int device_type;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct lvds_chip_information {</div><div class='add'>+	int lvds_chip_name;</div><div class='add'>+	int lvds_chip_slave_addr;</div><div class='add'>+	int data_mode;</div><div class='add'>+	int output_interface;</div><div class='add'>+	int i2c_port;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct chip_information {</div><div class='add'>+	int gfx_chip_name;</div><div class='add'>+	int gfx_chip_revision;</div><div class='add'>+	int chip_on_slot;</div><div class='add'>+	struct tmds_chip_information tmds_chip_info;</div><div class='add'>+	struct lvds_chip_information lvds_chip_info;</div><div class='add'>+	struct lvds_chip_information lvds_chip_info2;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct crt_setting_information {</div><div class='add'>+	int iga_path;</div><div class='add'>+	int h_active;</div><div class='add'>+	int v_active;</div><div class='add'>+	int bpp;</div><div class='add'>+	int refresh_rate;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct tmds_setting_information {</div><div class='add'>+	int iga_path;</div><div class='add'>+	int h_active;</div><div class='add'>+	int v_active;</div><div class='add'>+	int bpp;</div><div class='add'>+	int refresh_rate;</div><div class='add'>+	int get_dvi_size_method;</div><div class='add'>+	int max_pixel_clock;</div><div class='add'>+	int dvi_panel_size;</div><div class='add'>+	int dvi_panel_hres;</div><div class='add'>+	int dvi_panel_vres;</div><div class='add'>+	int native_size;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct lvds_setting_information {</div><div class='add'>+	int iga_path;</div><div class='add'>+	int h_active;</div><div class='add'>+	int v_active;</div><div class='add'>+	int bpp;</div><div class='add'>+	int refresh_rate;</div><div class='add'>+	int get_lcd_size_method;</div><div class='add'>+	int lcd_panel_id;</div><div class='add'>+	int lcd_panel_size;</div><div class='add'>+	int lcd_panel_hres;</div><div class='add'>+	int lcd_panel_vres;</div><div class='add'>+	int display_method;</div><div class='add'>+	int device_lcd_dualedge;</div><div class='add'>+	int LCDDithering;</div><div class='add'>+	int lcd_mode;</div><div class='add'>+	u32 vclk;		/*panel mode clock value */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct GFX_DPA_SETTING {</div><div class='add'>+	int ClkRangeIndex;</div><div class='add'>+	u8 DVP0;		/* CR96[3:0] */</div><div class='add'>+	u8 DVP0DataDri_S1;	/* SR2A[5]   */</div><div class='add'>+	u8 DVP0DataDri_S;	/* SR1B[1]   */</div><div class='add'>+	u8 DVP0ClockDri_S1;	/* SR2A[4]   */</div><div class='add'>+	u8 DVP0ClockDri_S;	/* SR1E[2]   */</div><div class='add'>+	u8 DVP1;		/* CR9B[3:0] */</div><div class='add'>+	u8 DVP1Driving;		/* SR65[3:0], Data and Clock driving */</div><div class='add'>+	u8 DFPHigh;		/* CR97[3:0] */</div><div class='add'>+	u8 DFPLow;		/* CR99[3:0] */</div><div class='add'>+</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct VT1636_DPA_SETTING {</div><div class='add'>+	int PanelSizeID;</div><div class='add'>+	u8 CLK_SEL_ST1;</div><div class='add'>+	u8 CLK_SEL_ST2;</div><div class='add'>+};</div><div class='add'>+#endif /* __CHIP_H__ */</div><div class='head'>diff --git a/drivers/video/via/debug.h b/drivers/video/via/debug.h<br/>new file mode 100644<br/>index 000000000000..86eacc2017f3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/via/debug.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/via/debug.h</a></div><div class='hunk'>@@ -0,0 +1,41 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.</div><div class='add'>+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.</div><div class='add'>+</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public</div><div class='add'>+ * License as published by the Free Software Foundation;</div><div class='add'>+ * either version 2, or (at your option) any later version.</div><div class='add'>+</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even</div><div class='add'>+ * the implied warranty of MERCHANTABILITY or FITNESS FOR</div><div class='add'>+ * A PARTICULAR PURPOSE.See the GNU General Public License</div><div class='add'>+ * for more details.</div><div class='add'>+</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc.,</div><div class='add'>+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='add'>+ */</div><div class='add'>+#ifndef __DEBUG_H__</div><div class='add'>+#define __DEBUG_H__</div><div class='add'>+</div><div class='add'>+#ifndef VIAFB_DEBUG</div><div class='add'>+#define VIAFB_DEBUG 0</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if VIAFB_DEBUG</div><div class='add'>+#define DEBUG_MSG(f, a...)   printk(f, ## a)</div><div class='add'>+#else</div><div class='add'>+#define DEBUG_MSG(f, a...)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define VIAFB_WARN 0</div><div class='add'>+#if VIAFB_WARN</div><div class='add'>+#define WARN_MSG(f, a...)   printk(f, ## a)</div><div class='add'>+#else</div><div class='add'>+#define WARN_MSG(f, a...)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif /* __DEBUG_H__ */</div><div class='head'>diff --git a/drivers/video/via/dvi.c b/drivers/video/via/dvi.c<br/>new file mode 100644<br/>index 000000000000..d6965447ca69<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/via/dvi.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/via/dvi.c</a></div><div class='hunk'>@@ -0,0 +1,682 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.</div><div class='add'>+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.</div><div class='add'>+</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public</div><div class='add'>+ * License as published by the Free Software Foundation;</div><div class='add'>+ * either version 2, or (at your option) any later version.</div><div class='add'>+</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even</div><div class='add'>+ * the implied warranty of MERCHANTABILITY or FITNESS FOR</div><div class='add'>+ * A PARTICULAR PURPOSE.See the GNU General Public License</div><div class='add'>+ * for more details.</div><div class='add'>+</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc.,</div><div class='add'>+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='add'>+ */</div><div class='add'>+#include "global.h"</div><div class='add'>+</div><div class='add'>+static void tmds_register_write(int index, u8 data);</div><div class='add'>+static int tmds_register_read(int index);</div><div class='add'>+static int tmds_register_read_bytes(int index, u8 *buff, int buff_len);</div><div class='add'>+static int check_reduce_blanking_mode(int mode_index,</div><div class='add'>+	int refresh_rate);</div><div class='add'>+static int dvi_get_panel_size_from_DDCv1(void);</div><div class='add'>+static int dvi_get_panel_size_from_DDCv2(void);</div><div class='add'>+static unsigned char dvi_get_panel_info(void);</div><div class='add'>+static int viafb_dvi_query_EDID(void);</div><div class='add'>+</div><div class='add'>+static int check_tmds_chip(int device_id_subaddr, int device_id)</div><div class='add'>+{</div><div class='add'>+	if (tmds_register_read(device_id_subaddr) == device_id)</div><div class='add'>+		return OK;</div><div class='add'>+	else</div><div class='add'>+		return FAIL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void viafb_init_dvi_size(void)</div><div class='add'>+{</div><div class='add'>+	DEBUG_MSG(KERN_INFO "viafb_init_dvi_size()\n");</div><div class='add'>+	DEBUG_MSG(KERN_INFO</div><div class='add'>+		"viaparinfo-&gt;tmds_setting_info-&gt;get_dvi_size_method %d\n",</div><div class='add'>+		  viaparinfo-&gt;tmds_setting_info-&gt;get_dvi_size_method);</div><div class='add'>+</div><div class='add'>+	switch (viaparinfo-&gt;tmds_setting_info-&gt;get_dvi_size_method) {</div><div class='add'>+	case GET_DVI_SIZE_BY_SYSTEM_BIOS:</div><div class='add'>+		break;</div><div class='add'>+	case GET_DVI_SZIE_BY_HW_STRAPPING:</div><div class='add'>+		break;</div><div class='add'>+	case GET_DVI_SIZE_BY_VGA_BIOS:</div><div class='add'>+	default:</div><div class='add'>+		dvi_get_panel_info();</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int viafb_tmds_trasmitter_identify(void)</div><div class='add'>+{</div><div class='add'>+	unsigned char sr2a = 0, sr1e = 0, sr3e = 0;</div><div class='add'>+</div><div class='add'>+	/* Turn on ouputting pad */</div><div class='add'>+	switch (viaparinfo-&gt;chip_info-&gt;gfx_chip_name) {</div><div class='add'>+	case UNICHROME_K8M890:</div><div class='add'>+	    /*=* DFP Low Pad on *=*/</div><div class='add'>+		sr2a = viafb_read_reg(VIASR, SR2A);</div><div class='add'>+		viafb_write_reg_mask(SR2A, VIASR, 0x03, BIT0 + BIT1);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case UNICHROME_P4M900:</div><div class='add'>+	case UNICHROME_P4M890:</div><div class='add'>+		/* DFP Low Pad on */</div><div class='add'>+		sr2a = viafb_read_reg(VIASR, SR2A);</div><div class='add'>+		viafb_write_reg_mask(SR2A, VIASR, 0x03, BIT0 + BIT1);</div><div class='add'>+		/* DVP0 Pad on */</div><div class='add'>+		sr1e = viafb_read_reg(VIASR, SR1E);</div><div class='add'>+		viafb_write_reg_mask(SR1E, VIASR, 0xC0, BIT6 + BIT7);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+	    /* DVP0/DVP1 Pad on */</div><div class='add'>+		sr1e = viafb_read_reg(VIASR, SR1E);</div><div class='add'>+		viafb_write_reg_mask(SR1E, VIASR, 0xF0, BIT4 +</div><div class='add'>+			BIT5 + BIT6 + BIT7);</div><div class='add'>+	    /* SR3E[1]Multi-function selection:</div><div class='add'>+	    0 = Emulate I2C and DDC bus by GPIO2/3/4. */</div><div class='add'>+		sr3e = viafb_read_reg(VIASR, SR3E);</div><div class='add'>+		viafb_write_reg_mask(SR3E, VIASR, 0x0, BIT5);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check for VT1632: */</div><div class='add'>+	viaparinfo-&gt;chip_info-&gt;tmds_chip_info.tmds_chip_name = VT1632_TMDS;</div><div class='add'>+	viaparinfo-&gt;chip_info-&gt;</div><div class='add'>+		tmds_chip_info.tmds_chip_slave_addr = VT1632_TMDS_I2C_ADDR;</div><div class='add'>+	viaparinfo-&gt;chip_info-&gt;tmds_chip_info.i2c_port = I2CPORTINDEX;</div><div class='add'>+	if (check_tmds_chip(VT1632_DEVICE_ID_REG, VT1632_DEVICE_ID) != FAIL) {</div><div class='add'>+		/*</div><div class='add'>+		 * Currently only support 12bits,dual edge,add 24bits mode later</div><div class='add'>+		 */</div><div class='add'>+		tmds_register_write(0x08, 0x3b);</div><div class='add'>+</div><div class='add'>+		DEBUG_MSG(KERN_INFO "\n VT1632 TMDS ! \n");</div><div class='add'>+		DEBUG_MSG(KERN_INFO "\n %2d",</div><div class='add'>+			  viaparinfo-&gt;chip_info-&gt;tmds_chip_info.tmds_chip_name);</div><div class='add'>+		DEBUG_MSG(KERN_INFO "\n %2d",</div><div class='add'>+			  viaparinfo-&gt;chip_info-&gt;tmds_chip_info.i2c_port);</div><div class='add'>+		return OK;</div><div class='add'>+	} else {</div><div class='add'>+		viaparinfo-&gt;chip_info-&gt;tmds_chip_info.i2c_port = GPIOPORTINDEX;</div><div class='add'>+		if (check_tmds_chip(VT1632_DEVICE_ID_REG, VT1632_DEVICE_ID)</div><div class='add'>+		    != FAIL) {</div><div class='add'>+			tmds_register_write(0x08, 0x3b);</div><div class='add'>+			DEBUG_MSG(KERN_INFO "\n VT1632 TMDS ! \n");</div><div class='add'>+			DEBUG_MSG(KERN_INFO "\n %2d",</div><div class='add'>+				  viaparinfo-&gt;chip_info-&gt;</div><div class='add'>+				  tmds_chip_info.tmds_chip_name);</div><div class='add'>+			DEBUG_MSG(KERN_INFO "\n %2d",</div><div class='add'>+				  viaparinfo-&gt;chip_info-&gt;</div><div class='add'>+				  tmds_chip_info.i2c_port);</div><div class='add'>+			return OK;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	viaparinfo-&gt;chip_info-&gt;tmds_chip_info.tmds_chip_name = INTEGRATED_TMDS;</div><div class='add'>+</div><div class='add'>+	if ((viaparinfo-&gt;chip_info-&gt;gfx_chip_name == UNICHROME_CX700) &amp;&amp;</div><div class='add'>+	    ((viafb_display_hardware_layout == HW_LAYOUT_DVI_ONLY) ||</div><div class='add'>+	     (viafb_display_hardware_layout == HW_LAYOUT_LCD_DVI))) {</div><div class='add'>+		DEBUG_MSG(KERN_INFO "\n Integrated TMDS ! \n");</div><div class='add'>+		return OK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (viaparinfo-&gt;chip_info-&gt;gfx_chip_name) {</div><div class='add'>+	case UNICHROME_K8M890:</div><div class='add'>+		viafb_write_reg(SR2A, VIASR, sr2a);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case UNICHROME_P4M900:</div><div class='add'>+	case UNICHROME_P4M890:</div><div class='add'>+		viafb_write_reg(SR2A, VIASR, sr2a);</div><div class='add'>+		viafb_write_reg(SR1E, VIASR, sr1e);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		viafb_write_reg(SR1E, VIASR, sr1e);</div><div class='add'>+		viafb_write_reg(SR3E, VIASR, sr3e);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	viaparinfo-&gt;chip_info-&gt;</div><div class='add'>+		tmds_chip_info.tmds_chip_name = NON_TMDS_TRANSMITTER;</div><div class='add'>+	viaparinfo-&gt;chip_info-&gt;tmds_chip_info.</div><div class='add'>+		tmds_chip_slave_addr = VT1632_TMDS_I2C_ADDR;</div><div class='add'>+	return FAIL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tmds_register_write(int index, u8 data)</div><div class='add'>+{</div><div class='add'>+	viaparinfo-&gt;i2c_stuff.i2c_port =</div><div class='add'>+		viaparinfo-&gt;chip_info-&gt;tmds_chip_info.i2c_port;</div><div class='add'>+</div><div class='add'>+	viafb_i2c_writebyte(viaparinfo-&gt;chip_info-&gt;tmds_chip_info.</div><div class='add'>+		tmds_chip_slave_addr, index,</div><div class='add'>+		     data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tmds_register_read(int index)</div><div class='add'>+{</div><div class='add'>+	u8 data;</div><div class='add'>+</div><div class='add'>+	viaparinfo-&gt;i2c_stuff.i2c_port =</div><div class='add'>+		viaparinfo-&gt;chip_info-&gt;tmds_chip_info.i2c_port;</div><div class='add'>+	viafb_i2c_readbyte((u8) viaparinfo-&gt;chip_info-&gt;</div><div class='add'>+	    tmds_chip_info.tmds_chip_slave_addr,</div><div class='add'>+			(u8) index, &amp;data);</div><div class='add'>+	return data;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tmds_register_read_bytes(int index, u8 *buff, int buff_len)</div><div class='add'>+{</div><div class='add'>+	viaparinfo-&gt;i2c_stuff.i2c_port =</div><div class='add'>+		viaparinfo-&gt;chip_info-&gt;tmds_chip_info.i2c_port;</div><div class='add'>+	viafb_i2c_readbytes((u8) viaparinfo-&gt;chip_info-&gt;tmds_chip_info.</div><div class='add'>+			 tmds_chip_slave_addr, (u8) index, buff, buff_len);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int check_reduce_blanking_mode(int mode_index,</div><div class='add'>+	int refresh_rate)</div><div class='add'>+{</div><div class='add'>+	if (refresh_rate != 60)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	switch (mode_index) {</div><div class='add'>+		/* Following modes have reduce blanking mode. */</div><div class='add'>+	case VIA_RES_1360X768:</div><div class='add'>+	case VIA_RES_1400X1050:</div><div class='add'>+	case VIA_RES_1440X900:</div><div class='add'>+	case VIA_RES_1600X900:</div><div class='add'>+	case VIA_RES_1680X1050:</div><div class='add'>+	case VIA_RES_1920X1080:</div><div class='add'>+	case VIA_RES_1920X1200:</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		DEBUG_MSG(KERN_INFO</div><div class='add'>+			  "This dvi mode %d have no reduce blanking mode!\n",</div><div class='add'>+			  mode_index);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* DVI Set Mode */</div><div class='add'>+void viafb_dvi_set_mode(int video_index, int mode_bpp, int set_iga)</div><div class='add'>+{</div><div class='add'>+	struct VideoModeTable *videoMode = NULL;</div><div class='add'>+	struct crt_mode_table *pDviTiming;</div><div class='add'>+	unsigned long desirePixelClock, maxPixelClock;</div><div class='add'>+	int status = 0;</div><div class='add'>+	videoMode = viafb_get_modetbl_pointer(video_index);</div><div class='add'>+	pDviTiming = videoMode-&gt;crtc;</div><div class='add'>+	desirePixelClock = pDviTiming-&gt;clk / 1000000;</div><div class='add'>+	maxPixelClock = (unsigned long)viaparinfo-&gt;</div><div class='add'>+		tmds_setting_info-&gt;max_pixel_clock;</div><div class='add'>+</div><div class='add'>+	DEBUG_MSG(KERN_INFO "\nDVI_set_mode!!\n");</div><div class='add'>+</div><div class='add'>+	if ((maxPixelClock != 0) &amp;&amp; (desirePixelClock &gt; maxPixelClock)) {</div><div class='add'>+		/*Check if reduce-blanking mode is exist */</div><div class='add'>+		status =</div><div class='add'>+		    check_reduce_blanking_mode(video_index,</div><div class='add'>+					       pDviTiming-&gt;refresh_rate);</div><div class='add'>+		if (status) {</div><div class='add'>+			video_index += 100;	/*Use reduce-blanking mode */</div><div class='add'>+			videoMode = viafb_get_modetbl_pointer(video_index);</div><div class='add'>+			pDviTiming = videoMode-&gt;crtc;</div><div class='add'>+			DEBUG_MSG(KERN_INFO</div><div class='add'>+				  "DVI use reduce blanking mode %d!!\n",</div><div class='add'>+				  video_index);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	viafb_fill_crtc_timing(pDviTiming, video_index, mode_bpp / 8, set_iga);</div><div class='add'>+	viafb_set_output_path(DEVICE_DVI, set_iga,</div><div class='add'>+			viaparinfo-&gt;chip_info-&gt;tmds_chip_info.output_interface);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Sense DVI Connector */</div><div class='add'>+int viafb_dvi_sense(void)</div><div class='add'>+{</div><div class='add'>+	u8 RegSR1E = 0, RegSR3E = 0, RegCR6B = 0, RegCR91 = 0,</div><div class='add'>+		RegCR93 = 0, RegCR9B = 0, data;</div><div class='add'>+	int ret = false;</div><div class='add'>+</div><div class='add'>+	DEBUG_MSG(KERN_INFO "viafb_dvi_sense!!\n");</div><div class='add'>+</div><div class='add'>+	if (viaparinfo-&gt;chip_info-&gt;gfx_chip_name == UNICHROME_CLE266) {</div><div class='add'>+		/* DI1 Pad on */</div><div class='add'>+		RegSR1E = viafb_read_reg(VIASR, SR1E);</div><div class='add'>+		viafb_write_reg(SR1E, VIASR, RegSR1E | 0x30);</div><div class='add'>+</div><div class='add'>+		/* CR6B[0]VCK Input Selection: 1 = External clock. */</div><div class='add'>+		RegCR6B = viafb_read_reg(VIACR, CR6B);</div><div class='add'>+		viafb_write_reg(CR6B, VIACR, RegCR6B | 0x08);</div><div class='add'>+</div><div class='add'>+		/* CR91[4] VDD On [3] Data On [2] VEE On [1] Back Light Off</div><div class='add'>+		   [0] Software Control Power Sequence */</div><div class='add'>+		RegCR91 = viafb_read_reg(VIACR, CR91);</div><div class='add'>+		viafb_write_reg(CR91, VIACR, 0x1D);</div><div class='add'>+</div><div class='add'>+		/* CR93[7] DI1 Data Source Selection: 1 = DSP2.</div><div class='add'>+		   CR93[5] DI1 Clock Source: 1 = internal.</div><div class='add'>+		   CR93[4] DI1 Clock Polarity.</div><div class='add'>+		   CR93[3:1] DI1 Clock Adjust. CR93[0] DI1 enable */</div><div class='add'>+		RegCR93 = viafb_read_reg(VIACR, CR93);</div><div class='add'>+		viafb_write_reg(CR93, VIACR, 0x01);</div><div class='add'>+	} else {</div><div class='add'>+		/* DVP0/DVP1 Pad on */</div><div class='add'>+		RegSR1E = viafb_read_reg(VIASR, SR1E);</div><div class='add'>+		viafb_write_reg(SR1E, VIASR, RegSR1E | 0xF0);</div><div class='add'>+</div><div class='add'>+		/* SR3E[1]Multi-function selection:</div><div class='add'>+		   0 = Emulate I2C and DDC bus by GPIO2/3/4. */</div><div class='add'>+		RegSR3E = viafb_read_reg(VIASR, SR3E);</div><div class='add'>+		viafb_write_reg(SR3E, VIASR, RegSR3E &amp; (~0x20));</div><div class='add'>+</div><div class='add'>+		/* CR91[4] VDD On [3] Data On [2] VEE On [1] Back Light Off</div><div class='add'>+		   [0] Software Control Power Sequence */</div><div class='add'>+		RegCR91 = viafb_read_reg(VIACR, CR91);</div><div class='add'>+		viafb_write_reg(CR91, VIACR, 0x1D);</div><div class='add'>+</div><div class='add'>+		/*CR9B[4] DVP1 Data Source Selection: 1 = From secondary</div><div class='add'>+		display.CR9B[2:0] DVP1 Clock Adjust */</div><div class='add'>+		RegCR9B = viafb_read_reg(VIACR, CR9B);</div><div class='add'>+		viafb_write_reg(CR9B, VIACR, 0x01);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	data = (u8) tmds_register_read(0x09);</div><div class='add'>+	if (data &amp; 0x04)</div><div class='add'>+		ret = true;</div><div class='add'>+</div><div class='add'>+	if (ret == false) {</div><div class='add'>+		if (viafb_dvi_query_EDID())</div><div class='add'>+			ret = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Restore status */</div><div class='add'>+	viafb_write_reg(SR1E, VIASR, RegSR1E);</div><div class='add'>+	viafb_write_reg(CR91, VIACR, RegCR91);</div><div class='add'>+	if (viaparinfo-&gt;chip_info-&gt;gfx_chip_name == UNICHROME_CLE266) {</div><div class='add'>+		viafb_write_reg(CR6B, VIACR, RegCR6B);</div><div class='add'>+		viafb_write_reg(CR93, VIACR, RegCR93);</div><div class='add'>+	} else {</div><div class='add'>+		viafb_write_reg(SR3E, VIASR, RegSR3E);</div><div class='add'>+		viafb_write_reg(CR9B, VIACR, RegCR9B);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Query Flat Panel's EDID Table Version Through DVI Connector */</div><div class='add'>+static int viafb_dvi_query_EDID(void)</div><div class='add'>+{</div><div class='add'>+	u8 data0, data1;</div><div class='add'>+	int restore;</div><div class='add'>+</div><div class='add'>+	DEBUG_MSG(KERN_INFO "viafb_dvi_query_EDID!!\n");</div><div class='add'>+</div><div class='add'>+	restore = viaparinfo-&gt;chip_info-&gt;tmds_chip_info.tmds_chip_slave_addr;</div><div class='add'>+	viaparinfo-&gt;chip_info-&gt;tmds_chip_info.tmds_chip_slave_addr = 0xA0;</div><div class='add'>+</div><div class='add'>+	data0 = (u8) tmds_register_read(0x00);</div><div class='add'>+	data1 = (u8) tmds_register_read(0x01);</div><div class='add'>+	if ((data0 == 0) &amp;&amp; (data1 == 0xFF)) {</div><div class='add'>+		viaparinfo-&gt;chip_info-&gt;</div><div class='add'>+			tmds_chip_info.tmds_chip_slave_addr = restore;</div><div class='add'>+		return EDID_VERSION_1;	/* Found EDID1 Table */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	data0 = (u8) tmds_register_read(0x00);</div><div class='add'>+	viaparinfo-&gt;chip_info-&gt;tmds_chip_info.tmds_chip_slave_addr = restore;</div><div class='add'>+	if (data0 == 0x20)</div><div class='add'>+		return EDID_VERSION_2;	/* Found EDID2 Table */</div><div class='add'>+	else</div><div class='add'>+		return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *</div><div class='add'>+ * int dvi_get_panel_size_from_DDCv1(void)</div><div class='add'>+ *</div><div class='add'>+ *     - Get Panel Size Using EDID1 Table</div><div class='add'>+ *</div><div class='add'>+ * Return Type:    int</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+static int dvi_get_panel_size_from_DDCv1(void)</div><div class='add'>+{</div><div class='add'>+	int i, max_h = 0, max_v = 0, tmp, restore;</div><div class='add'>+	unsigned char rData;</div><div class='add'>+	unsigned char EDID_DATA[18];</div><div class='add'>+</div><div class='add'>+	DEBUG_MSG(KERN_INFO "\n dvi_get_panel_size_from_DDCv1 \n");</div><div class='add'>+</div><div class='add'>+	restore = viaparinfo-&gt;chip_info-&gt;tmds_chip_info.tmds_chip_slave_addr;</div><div class='add'>+	viaparinfo-&gt;chip_info-&gt;tmds_chip_info.tmds_chip_slave_addr = 0xA0;</div><div class='add'>+</div><div class='add'>+	rData = tmds_register_read(0x23);</div><div class='add'>+	if (rData &amp; 0x3C)</div><div class='add'>+		max_h = 640;</div><div class='add'>+	if (rData &amp; 0xC0)</div><div class='add'>+		max_h = 720;</div><div class='add'>+	if (rData &amp; 0x03)</div><div class='add'>+		max_h = 800;</div><div class='add'>+</div><div class='add'>+	rData = tmds_register_read(0x24);</div><div class='add'>+	if (rData &amp; 0xC0)</div><div class='add'>+		max_h = 800;</div><div class='add'>+	if (rData &amp; 0x1E)</div><div class='add'>+		max_h = 1024;</div><div class='add'>+	if (rData &amp; 0x01)</div><div class='add'>+		max_h = 1280;</div><div class='add'>+</div><div class='add'>+	for (i = 0x25; i &lt; 0x6D; i++) {</div><div class='add'>+		switch (i) {</div><div class='add'>+		case 0x26:</div><div class='add'>+		case 0x28:</div><div class='add'>+		case 0x2A:</div><div class='add'>+		case 0x2C:</div><div class='add'>+		case 0x2E:</div><div class='add'>+		case 0x30:</div><div class='add'>+		case 0x32:</div><div class='add'>+		case 0x34:</div><div class='add'>+			rData = tmds_register_read(i);</div><div class='add'>+			if (rData == 1)</div><div class='add'>+				break;</div><div class='add'>+			/* data = (data + 31) * 8 */</div><div class='add'>+			tmp = (rData + 31) &lt;&lt; 3;</div><div class='add'>+			if (tmp &gt; max_h)</div><div class='add'>+				max_h = tmp;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case 0x36:</div><div class='add'>+		case 0x48:</div><div class='add'>+		case 0x5A:</div><div class='add'>+		case 0x6C:</div><div class='add'>+			tmds_register_read_bytes(i, EDID_DATA, 10);</div><div class='add'>+			if (!(EDID_DATA[0] || EDID_DATA[1])) {</div><div class='add'>+				/* The first two byte must be zero. */</div><div class='add'>+				if (EDID_DATA[3] == 0xFD) {</div><div class='add'>+					/* To get max pixel clock. */</div><div class='add'>+					viaparinfo-&gt;tmds_setting_info-&gt;</div><div class='add'>+					max_pixel_clock = EDID_DATA[9] * 10;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		default:</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (max_h) {</div><div class='add'>+	case 640:</div><div class='add'>+		viaparinfo-&gt;tmds_setting_info-&gt;dvi_panel_size =</div><div class='add'>+			VIA_RES_640X480;</div><div class='add'>+		break;</div><div class='add'>+	case 800:</div><div class='add'>+		viaparinfo-&gt;tmds_setting_info-&gt;dvi_panel_size =</div><div class='add'>+			VIA_RES_800X600;</div><div class='add'>+		break;</div><div class='add'>+	case 1024:</div><div class='add'>+		viaparinfo-&gt;tmds_setting_info-&gt;dvi_panel_size =</div><div class='add'>+			VIA_RES_1024X768;</div><div class='add'>+		break;</div><div class='add'>+	case 1280:</div><div class='add'>+		viaparinfo-&gt;tmds_setting_info-&gt;dvi_panel_size =</div><div class='add'>+			VIA_RES_1280X1024;</div><div class='add'>+		break;</div><div class='add'>+	case 1400:</div><div class='add'>+		viaparinfo-&gt;tmds_setting_info-&gt;dvi_panel_size =</div><div class='add'>+			VIA_RES_1400X1050;</div><div class='add'>+		break;</div><div class='add'>+	case 1440:</div><div class='add'>+		viaparinfo-&gt;tmds_setting_info-&gt;dvi_panel_size =</div><div class='add'>+			VIA_RES_1440X1050;</div><div class='add'>+		break;</div><div class='add'>+	case 1600:</div><div class='add'>+		viaparinfo-&gt;tmds_setting_info-&gt;dvi_panel_size =</div><div class='add'>+			VIA_RES_1600X1200;</div><div class='add'>+		break;</div><div class='add'>+	case 1920:</div><div class='add'>+		if (max_v == 1200) {</div><div class='add'>+			viaparinfo-&gt;tmds_setting_info-&gt;dvi_panel_size =</div><div class='add'>+				VIA_RES_1920X1200;</div><div class='add'>+		} else {</div><div class='add'>+			viaparinfo-&gt;tmds_setting_info-&gt;dvi_panel_size =</div><div class='add'>+				VIA_RES_1920X1080;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		viaparinfo-&gt;tmds_setting_info-&gt;dvi_panel_size =</div><div class='add'>+			VIA_RES_1024X768;</div><div class='add'>+		DEBUG_MSG(KERN_INFO "Unknow panel size max resolution = %d !\</div><div class='add'>+					 set default panel size.\n", max_h);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DEBUG_MSG(KERN_INFO "DVI max pixelclock = %d\n",</div><div class='add'>+		  viaparinfo-&gt;tmds_setting_info-&gt;max_pixel_clock);</div><div class='add'>+	viaparinfo-&gt;chip_info-&gt;tmds_chip_info.tmds_chip_slave_addr = restore;</div><div class='add'>+	return viaparinfo-&gt;tmds_setting_info-&gt;dvi_panel_size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *</div><div class='add'>+ * int dvi_get_panel_size_from_DDCv2(void)</div><div class='add'>+ *</div><div class='add'>+ *     - Get Panel Size Using EDID2 Table</div><div class='add'>+ *</div><div class='add'>+ * Return Type:    int</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+static int dvi_get_panel_size_from_DDCv2(void)</div><div class='add'>+{</div><div class='add'>+	int HSize = 0, restore;</div><div class='add'>+	unsigned char R_Buffer[2];</div><div class='add'>+</div><div class='add'>+	DEBUG_MSG(KERN_INFO "\n dvi_get_panel_size_from_DDCv2 \n");</div><div class='add'>+</div><div class='add'>+	restore = viaparinfo-&gt;chip_info-&gt;tmds_chip_info.tmds_chip_slave_addr;</div><div class='add'>+	viaparinfo-&gt;chip_info-&gt;tmds_chip_info.tmds_chip_slave_addr = 0xA2;</div><div class='add'>+</div><div class='add'>+	/* Horizontal: 0x76, 0x77 */</div><div class='add'>+	tmds_register_read_bytes(0x76, R_Buffer, 2);</div><div class='add'>+	HSize = R_Buffer[0];</div><div class='add'>+	HSize += R_Buffer[1] &lt;&lt; 8;</div><div class='add'>+</div><div class='add'>+	switch (HSize) {</div><div class='add'>+	case 640:</div><div class='add'>+		viaparinfo-&gt;tmds_setting_info-&gt;dvi_panel_size =</div><div class='add'>+			VIA_RES_640X480;</div><div class='add'>+		break;</div><div class='add'>+	case 800:</div><div class='add'>+		viaparinfo-&gt;tmds_setting_info-&gt;dvi_panel_size =</div><div class='add'>+			VIA_RES_800X600;</div><div class='add'>+		break;</div><div class='add'>+	case 1024:</div><div class='add'>+		viaparinfo-&gt;tmds_setting_info-&gt;dvi_panel_size =</div><div class='add'>+			VIA_RES_1024X768;</div><div class='add'>+		break;</div><div class='add'>+	case 1280:</div><div class='add'>+		viaparinfo-&gt;tmds_setting_info-&gt;dvi_panel_size =</div><div class='add'>+			VIA_RES_1280X1024;</div><div class='add'>+		break;</div><div class='add'>+	case 1400:</div><div class='add'>+		viaparinfo-&gt;tmds_setting_info-&gt;dvi_panel_size =</div><div class='add'>+			VIA_RES_1400X1050;</div><div class='add'>+		break;</div><div class='add'>+	case 1440:</div><div class='add'>+		viaparinfo-&gt;tmds_setting_info-&gt;dvi_panel_size =</div><div class='add'>+			VIA_RES_1440X1050;</div><div class='add'>+		break;</div><div class='add'>+	case 1600:</div><div class='add'>+		viaparinfo-&gt;tmds_setting_info-&gt;dvi_panel_size =</div><div class='add'>+			VIA_RES_1600X1200;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		viaparinfo-&gt;tmds_setting_info-&gt;dvi_panel_size =</div><div class='add'>+			VIA_RES_1024X768;</div><div class='add'>+		DEBUG_MSG(KERN_INFO "Unknow panel size max resolution = %d!\</div><div class='add'>+					set default panel size.\n", HSize);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	viaparinfo-&gt;chip_info-&gt;tmds_chip_info.tmds_chip_slave_addr = restore;</div><div class='add'>+	return viaparinfo-&gt;tmds_setting_info-&gt;dvi_panel_size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *</div><div class='add'>+ * unsigned char dvi_get_panel_info(void)</div><div class='add'>+ *</div><div class='add'>+ *     - Get Panel Size</div><div class='add'>+ *</div><div class='add'>+ * Return Type:    unsigned char</div><div class='add'>+ */</div><div class='add'>+static unsigned char dvi_get_panel_info(void)</div><div class='add'>+{</div><div class='add'>+	unsigned char dvipanelsize;</div><div class='add'>+	DEBUG_MSG(KERN_INFO "dvi_get_panel_info! \n");</div><div class='add'>+</div><div class='add'>+	viafb_dvi_sense();</div><div class='add'>+	switch (viafb_dvi_query_EDID()) {</div><div class='add'>+	case 1:</div><div class='add'>+		dvi_get_panel_size_from_DDCv1();</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		dvi_get_panel_size_from_DDCv2();</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DEBUG_MSG(KERN_INFO "dvi panel size is %2d \n",</div><div class='add'>+		  viaparinfo-&gt;tmds_setting_info-&gt;dvi_panel_size);</div><div class='add'>+	dvipanelsize = (unsigned char)(viaparinfo-&gt;</div><div class='add'>+		tmds_setting_info-&gt;dvi_panel_size);</div><div class='add'>+	return dvipanelsize;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* If Disable DVI, turn off pad */</div><div class='add'>+void viafb_dvi_disable(void)</div><div class='add'>+{</div><div class='add'>+	if (viaparinfo-&gt;chip_info-&gt;</div><div class='add'>+		tmds_chip_info.output_interface == INTERFACE_DVP0)</div><div class='add'>+		viafb_write_reg(SR1E, VIASR,</div><div class='add'>+		viafb_read_reg(VIASR, SR1E) &amp; (~0xC0));</div><div class='add'>+</div><div class='add'>+	if (viaparinfo-&gt;chip_info-&gt;</div><div class='add'>+		tmds_chip_info.output_interface == INTERFACE_DVP1)</div><div class='add'>+		viafb_write_reg(SR1E, VIASR,</div><div class='add'>+		viafb_read_reg(VIASR, SR1E) &amp; (~0x30));</div><div class='add'>+</div><div class='add'>+	if (viaparinfo-&gt;chip_info-&gt;</div><div class='add'>+		tmds_chip_info.output_interface == INTERFACE_DFP_HIGH)</div><div class='add'>+		viafb_write_reg(SR2A, VIASR,</div><div class='add'>+		viafb_read_reg(VIASR, SR2A) &amp; (~0x0C));</div><div class='add'>+</div><div class='add'>+	if (viaparinfo-&gt;chip_info-&gt;</div><div class='add'>+		tmds_chip_info.output_interface == INTERFACE_DFP_LOW)</div><div class='add'>+		viafb_write_reg(SR2A, VIASR,</div><div class='add'>+		viafb_read_reg(VIASR, SR2A) &amp; (~0x03));</div><div class='add'>+</div><div class='add'>+	if (viaparinfo-&gt;chip_info-&gt;</div><div class='add'>+		tmds_chip_info.output_interface == INTERFACE_TMDS)</div><div class='add'>+		/* Turn off TMDS power. */</div><div class='add'>+		viafb_write_reg(CRD2, VIACR,</div><div class='add'>+		viafb_read_reg(VIACR, CRD2) | 0x08);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* If Enable DVI, turn off pad */</div><div class='add'>+void viafb_dvi_enable(void)</div><div class='add'>+{</div><div class='add'>+	u8 data;</div><div class='add'>+</div><div class='add'>+	if (viaparinfo-&gt;chip_info-&gt;</div><div class='add'>+		tmds_chip_info.output_interface == INTERFACE_DVP0) {</div><div class='add'>+		viafb_write_reg(SR1E, VIASR,</div><div class='add'>+			viafb_read_reg(VIASR, SR1E) | 0xC0);</div><div class='add'>+		if (viaparinfo-&gt;chip_info-&gt;gfx_chip_name == UNICHROME_CLE266)</div><div class='add'>+			tmds_register_write(0x88, 0x3b);</div><div class='add'>+		else</div><div class='add'>+			/*clear CR91[5] to direct on display period</div><div class='add'>+			   in the secondary diplay path */</div><div class='add'>+			viafb_write_reg(CR91, VIACR,</div><div class='add'>+			viafb_read_reg(VIACR, CR91) &amp; 0xDF);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (viaparinfo-&gt;chip_info-&gt;</div><div class='add'>+		tmds_chip_info.output_interface == INTERFACE_DVP1) {</div><div class='add'>+		viafb_write_reg(SR1E, VIASR,</div><div class='add'>+			viafb_read_reg(VIASR, SR1E) | 0x30);</div><div class='add'>+</div><div class='add'>+		/*fix dvi cann't be enabled with MB VT5718C4 - Al Zhang */</div><div class='add'>+		if (viaparinfo-&gt;chip_info-&gt;gfx_chip_name == UNICHROME_CLE266) {</div><div class='add'>+			tmds_register_write(0x88, 0x3b);</div><div class='add'>+		} else {</div><div class='add'>+			/*clear CR91[5] to direct on display period</div><div class='add'>+			  in the secondary diplay path */</div><div class='add'>+			viafb_write_reg(CR91, VIACR,</div><div class='add'>+			viafb_read_reg(VIACR, CR91) &amp; 0xDF);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*fix DVI cannot enable on EPIA-M board */</div><div class='add'>+		if (viafb_platform_epia_dvi == 1) {</div><div class='add'>+			viafb_write_reg_mask(CR91, VIACR, 0x1f, 0x1f);</div><div class='add'>+			viafb_write_reg_mask(CR88, VIACR, 0x00, BIT6 + BIT0);</div><div class='add'>+			if (viafb_bus_width == 24) {</div><div class='add'>+				if (viafb_device_lcd_dualedge == 1)</div><div class='add'>+					data = 0x3F;</div><div class='add'>+				else</div><div class='add'>+					data = 0x37;</div><div class='add'>+				viafb_i2c_writebyte(viaparinfo-&gt;chip_info-&gt;</div><div class='add'>+					     tmds_chip_info.</div><div class='add'>+					     tmds_chip_slave_addr,</div><div class='add'>+					     0x08, data);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (viaparinfo-&gt;chip_info-&gt;</div><div class='add'>+		tmds_chip_info.output_interface == INTERFACE_DFP_HIGH) {</div><div class='add'>+		viafb_write_reg(SR2A, VIASR,</div><div class='add'>+			viafb_read_reg(VIASR, SR2A) | 0x0C);</div><div class='add'>+		viafb_write_reg(CR91, VIACR,</div><div class='add'>+			viafb_read_reg(VIACR, CR91) &amp; 0xDF);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (viaparinfo-&gt;chip_info-&gt;</div><div class='add'>+		tmds_chip_info.output_interface == INTERFACE_DFP_LOW) {</div><div class='add'>+		viafb_write_reg(SR2A, VIASR,</div><div class='add'>+			viafb_read_reg(VIASR, SR2A) | 0x03);</div><div class='add'>+		viafb_write_reg(CR91, VIACR,</div><div class='add'>+			viafb_read_reg(VIACR, CR91) &amp; 0xDF);</div><div class='add'>+	}</div><div class='add'>+	if (viaparinfo-&gt;chip_info-&gt;</div><div class='add'>+		tmds_chip_info.output_interface == INTERFACE_TMDS) {</div><div class='add'>+		/* Turn on Display period in the panel path. */</div><div class='add'>+		viafb_write_reg_mask(CR91, VIACR, 0, BIT7);</div><div class='add'>+</div><div class='add'>+		/* Turn on TMDS power. */</div><div class='add'>+		viafb_write_reg_mask(CRD2, VIACR, 0, BIT3);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='head'>diff --git a/drivers/video/via/dvi.h b/drivers/video/via/dvi.h<br/>new file mode 100644<br/>index 000000000000..e1ec37fb0dc3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/via/dvi.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/via/dvi.h</a></div><div class='hunk'>@@ -0,0 +1,64 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.</div><div class='add'>+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.</div><div class='add'>+</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public</div><div class='add'>+ * License as published by the Free Software Foundation;</div><div class='add'>+ * either version 2, or (at your option) any later version.</div><div class='add'>+</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even</div><div class='add'>+ * the implied warranty of MERCHANTABILITY or FITNESS FOR</div><div class='add'>+ * A PARTICULAR PURPOSE.See the GNU General Public License</div><div class='add'>+ * for more details.</div><div class='add'>+</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc.,</div><div class='add'>+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __DVI_H__</div><div class='add'>+#define __DVI_H__</div><div class='add'>+</div><div class='add'>+/*Definition TMDS Device ID register*/</div><div class='add'>+#define     VT1632_DEVICE_ID_REG        0x02</div><div class='add'>+#define     VT1632_DEVICE_ID            0x92</div><div class='add'>+</div><div class='add'>+#define     GET_DVI_SIZE_BY_SYSTEM_BIOS     0x01</div><div class='add'>+#define     GET_DVI_SIZE_BY_VGA_BIOS        0x02</div><div class='add'>+#define     GET_DVI_SZIE_BY_HW_STRAPPING    0x03</div><div class='add'>+</div><div class='add'>+/* Definition DVI Panel ID*/</div><div class='add'>+/* Resolution: 640x480,   Channel: single, Dithering: Enable */</div><div class='add'>+#define     DVI_PANEL_ID0_640X480       0x00</div><div class='add'>+/* Resolution: 800x600,   Channel: single, Dithering: Enable */</div><div class='add'>+#define     DVI_PANEL_ID1_800x600       0x01</div><div class='add'>+/* Resolution: 1024x768,  Channel: single, Dithering: Enable */</div><div class='add'>+#define     DVI_PANEL_ID1_1024x768      0x02</div><div class='add'>+/* Resolution: 1280x768,  Channel: single, Dithering: Enable */</div><div class='add'>+#define     DVI_PANEL_ID1_1280x768      0x03</div><div class='add'>+/* Resolution: 1280x1024, Channel: dual,   Dithering: Enable */</div><div class='add'>+#define     DVI_PANEL_ID1_1280x1024     0x04</div><div class='add'>+/* Resolution: 1400x1050, Channel: dual,   Dithering: Enable */</div><div class='add'>+#define     DVI_PANEL_ID1_1400x1050     0x05</div><div class='add'>+/* Resolution: 1600x1200, Channel: dual,   Dithering: Enable */</div><div class='add'>+#define     DVI_PANEL_ID1_1600x1200     0x06</div><div class='add'>+</div><div class='add'>+/* Define the version of EDID*/</div><div class='add'>+#define     EDID_VERSION_1      1</div><div class='add'>+#define     EDID_VERSION_2      2</div><div class='add'>+</div><div class='add'>+#define     DEV_CONNECT_DVI     0x01</div><div class='add'>+#define     DEV_CONNECT_HDMI    0x02</div><div class='add'>+</div><div class='add'>+struct VideoModeTable *viafb_get_cea_mode_tbl_pointer(int Index);</div><div class='add'>+int viafb_dvi_sense(void);</div><div class='add'>+void viafb_dvi_disable(void);</div><div class='add'>+void viafb_dvi_enable(void);</div><div class='add'>+int viafb_tmds_trasmitter_identify(void);</div><div class='add'>+void viafb_init_dvi_size(void);</div><div class='add'>+void viafb_dvi_set_mode(int video_index, int mode_bpp, int set_iga);</div><div class='add'>+</div><div class='add'>+#endif /* __DVI_H__ */</div><div class='head'>diff --git a/drivers/video/via/global.c b/drivers/video/via/global.c<br/>new file mode 100644<br/>index 000000000000..468be2425af3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/via/global.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/via/global.c</a></div><div class='hunk'>@@ -0,0 +1,60 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.</div><div class='add'>+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.</div><div class='add'>+</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public</div><div class='add'>+ * License as published by the Free Software Foundation;</div><div class='add'>+ * either version 2, or (at your option) any later version.</div><div class='add'>+</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even</div><div class='add'>+ * the implied warranty of MERCHANTABILITY or FITNESS FOR</div><div class='add'>+ * A PARTICULAR PURPOSE.See the GNU General Public License</div><div class='add'>+ * for more details.</div><div class='add'>+</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc.,</div><div class='add'>+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='add'>+ */</div><div class='add'>+#include "global.h"</div><div class='add'>+int viafb_platform_epia_dvi = STATE_OFF;</div><div class='add'>+int viafb_device_lcd_dualedge = STATE_OFF;</div><div class='add'>+int viafb_bus_width = 12;</div><div class='add'>+int viafb_display_hardware_layout = HW_LAYOUT_LCD_DVI;</div><div class='add'>+int viafb_memsize;</div><div class='add'>+int viafb_DeviceStatus = CRT_Device;</div><div class='add'>+int viafb_hotplug;</div><div class='add'>+int viafb_refresh = 60;</div><div class='add'>+int viafb_refresh1 = 60;</div><div class='add'>+int viafb_lcd_dsp_method = LCD_EXPANDSION;</div><div class='add'>+int viafb_lcd_mode = LCD_OPENLDI;</div><div class='add'>+int viafb_bpp = 32;</div><div class='add'>+int viafb_bpp1 = 32;</div><div class='add'>+int viafb_accel = 1;</div><div class='add'>+int viafb_CRT_ON = 1;</div><div class='add'>+int viafb_DVI_ON;</div><div class='add'>+int viafb_LCD_ON ;</div><div class='add'>+int viafb_LCD2_ON;</div><div class='add'>+int viafb_SAMM_ON;</div><div class='add'>+int viafb_dual_fb;</div><div class='add'>+int viafb_hotplug_Xres = 640;</div><div class='add'>+int viafb_hotplug_Yres = 480;</div><div class='add'>+int viafb_hotplug_bpp = 32;</div><div class='add'>+int viafb_hotplug_refresh = 60;</div><div class='add'>+unsigned int viafb_second_offset;</div><div class='add'>+int viafb_second_size;</div><div class='add'>+int viafb_primary_dev = None_Device;</div><div class='add'>+void __iomem *viafb_FB_MM;</div><div class='add'>+unsigned int viafb_second_xres = 640;</div><div class='add'>+unsigned int viafb_second_yres = 480;</div><div class='add'>+unsigned int viafb_second_virtual_xres;</div><div class='add'>+unsigned int viafb_second_virtual_yres;</div><div class='add'>+int viafb_lcd_panel_id = LCD_PANEL_ID_MAXIMUM + 1;</div><div class='add'>+struct fb_cursor viacursor;</div><div class='add'>+struct fb_info *viafbinfo;</div><div class='add'>+struct fb_info *viafbinfo1;</div><div class='add'>+struct viafb_par *viaparinfo;</div><div class='add'>+struct viafb_par *viaparinfo1;</div><div class='add'>+</div><div class='head'>diff --git a/drivers/video/via/global.h b/drivers/video/via/global.h<br/>new file mode 100644<br/>index 000000000000..8e5263c5b812<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/via/global.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/via/global.h</a></div><div class='hunk'>@@ -0,0 +1,90 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.</div><div class='add'>+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.</div><div class='add'>+</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public</div><div class='add'>+ * License as published by the Free Software Foundation;</div><div class='add'>+ * either version 2, or (at your option) any later version.</div><div class='add'>+</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even</div><div class='add'>+ * the implied warranty of MERCHANTABILITY or FITNESS FOR</div><div class='add'>+ * A PARTICULAR PURPOSE.See the GNU General Public License</div><div class='add'>+ * for more details.</div><div class='add'>+</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc.,</div><div class='add'>+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __GLOBAL_H__</div><div class='add'>+#define __GLOBAL_H__</div><div class='add'>+</div><div class='add'>+#include &lt;linux/fb.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/ioport.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/proc_fs.h&gt;</div><div class='add'>+#include &lt;linux/console.h&gt;</div><div class='add'>+#include &lt;linux/timer.h&gt;</div><div class='add'>+</div><div class='add'>+#include "debug.h"</div><div class='add'>+</div><div class='add'>+#include "iface.h"</div><div class='add'>+#include "viafbdev.h"</div><div class='add'>+#include "chip.h"</div><div class='add'>+#include "debug.h"</div><div class='add'>+#include "accel.h"</div><div class='add'>+#include "share.h"</div><div class='add'>+#include "dvi.h"</div><div class='add'>+#include "viamode.h"</div><div class='add'>+#include "via_i2c.h"</div><div class='add'>+#include "hw.h"</div><div class='add'>+</div><div class='add'>+#include "lcd.h"</div><div class='add'>+#include "ioctl.h"</div><div class='add'>+#include "viamode.h"</div><div class='add'>+#include "via_utility.h"</div><div class='add'>+#include "vt1636.h"</div><div class='add'>+#include "tblDPASetting.h"</div><div class='add'>+#include "tbl1636.h"</div><div class='add'>+#include "viafbdev.h"</div><div class='add'>+</div><div class='add'>+/* External struct*/</div><div class='add'>+</div><div class='add'>+extern int viafb_platform_epia_dvi;</div><div class='add'>+extern int viafb_device_lcd_dualedge;</div><div class='add'>+extern int viafb_bus_width;</div><div class='add'>+extern int viafb_display_hardware_layout;</div><div class='add'>+extern struct offset offset_reg;</div><div class='add'>+extern struct viafb_par *viaparinfo;</div><div class='add'>+extern struct viafb_par *viaparinfo1;</div><div class='add'>+extern struct fb_info *viafbinfo;</div><div class='add'>+extern struct fb_info *viafbinfo1;</div><div class='add'>+extern int viafb_DeviceStatus;</div><div class='add'>+extern int viafb_refresh;</div><div class='add'>+extern int viafb_refresh1;</div><div class='add'>+extern int viafb_lcd_dsp_method;</div><div class='add'>+extern int viafb_lcd_mode;</div><div class='add'>+extern int viafb_bpp;</div><div class='add'>+extern int viafb_bpp1;</div><div class='add'>+</div><div class='add'>+extern int viafb_CRT_ON;</div><div class='add'>+extern int viafb_hotplug_Xres;</div><div class='add'>+extern int viafb_hotplug_Yres;</div><div class='add'>+extern int viafb_hotplug_bpp;</div><div class='add'>+extern int viafb_hotplug_refresh;</div><div class='add'>+extern int viafb_primary_dev;</div><div class='add'>+extern void __iomem *viafb_FB_MM;</div><div class='add'>+extern struct fb_cursor viacursor;</div><div class='add'>+</div><div class='add'>+extern unsigned int viafb_second_xres;</div><div class='add'>+extern unsigned int viafb_second_yres;</div><div class='add'>+extern int viafb_lcd_panel_id;</div><div class='add'>+</div><div class='add'>+#endif /* __GLOBAL_H__ */</div><div class='head'>diff --git a/drivers/video/via/hw.c b/drivers/video/via/hw.c<br/>new file mode 100644<br/>index 000000000000..fcd53ceb88fa<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/via/hw.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/via/hw.c</a></div><div class='hunk'>@@ -0,0 +1,2865 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.</div><div class='add'>+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.</div><div class='add'>+</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public</div><div class='add'>+ * License as published by the Free Software Foundation;</div><div class='add'>+ * either version 2, or (at your option) any later version.</div><div class='add'>+</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even</div><div class='add'>+ * the implied warranty of MERCHANTABILITY or FITNESS FOR</div><div class='add'>+ * A PARTICULAR PURPOSE.See the GNU General Public License</div><div class='add'>+ * for more details.</div><div class='add'>+</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc.,</div><div class='add'>+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "global.h"</div><div class='add'>+</div><div class='add'>+static const struct pci_device_id_info pciidlist[] = {</div><div class='add'>+	{PCI_VIA_VENDOR_ID, UNICHROME_CLE266_DID, UNICHROME_CLE266},</div><div class='add'>+	{PCI_VIA_VENDOR_ID, UNICHROME_PM800_DID, UNICHROME_PM800},</div><div class='add'>+	{PCI_VIA_VENDOR_ID, UNICHROME_K400_DID, UNICHROME_K400},</div><div class='add'>+	{PCI_VIA_VENDOR_ID, UNICHROME_K800_DID, UNICHROME_K800},</div><div class='add'>+	{PCI_VIA_VENDOR_ID, UNICHROME_CN700_DID, UNICHROME_CN700},</div><div class='add'>+	{PCI_VIA_VENDOR_ID, UNICHROME_P4M890_DID, UNICHROME_P4M890},</div><div class='add'>+	{PCI_VIA_VENDOR_ID, UNICHROME_K8M890_DID, UNICHROME_K8M890},</div><div class='add'>+	{PCI_VIA_VENDOR_ID, UNICHROME_CX700_DID, UNICHROME_CX700},</div><div class='add'>+	{PCI_VIA_VENDOR_ID, UNICHROME_P4M900_DID, UNICHROME_P4M900},</div><div class='add'>+	{PCI_VIA_VENDOR_ID, UNICHROME_CN750_DID, UNICHROME_CN750},</div><div class='add'>+	{PCI_VIA_VENDOR_ID, UNICHROME_VX800_DID, UNICHROME_VX800},</div><div class='add'>+	{0, 0, 0}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct offset offset_reg = {</div><div class='add'>+	/* IGA1 Offset Register */</div><div class='add'>+	{IGA1_OFFSET_REG_NUM, {{CR13, 0, 7}, {CR35, 5, 7} } },</div><div class='add'>+	/* IGA2 Offset Register */</div><div class='add'>+	{IGA2_OFFSET_REG_NUM, {{CR66, 0, 7}, {CR67, 0, 1} } }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct pll_map pll_value[] = {</div><div class='add'>+	{CLK_25_175M, CLE266_PLL_25_175M, K800_PLL_25_175M, CX700_25_175M},</div><div class='add'>+	{CLK_29_581M, CLE266_PLL_29_581M, K800_PLL_29_581M, CX700_29_581M},</div><div class='add'>+	{CLK_26_880M, CLE266_PLL_26_880M, K800_PLL_26_880M, CX700_26_880M},</div><div class='add'>+	{CLK_31_490M, CLE266_PLL_31_490M, K800_PLL_31_490M, CX700_31_490M},</div><div class='add'>+	{CLK_31_500M, CLE266_PLL_31_500M, K800_PLL_31_500M, CX700_31_500M},</div><div class='add'>+	{CLK_31_728M, CLE266_PLL_31_728M, K800_PLL_31_728M, CX700_31_728M},</div><div class='add'>+	{CLK_32_668M, CLE266_PLL_32_668M, K800_PLL_32_668M, CX700_32_668M},</div><div class='add'>+	{CLK_36_000M, CLE266_PLL_36_000M, K800_PLL_36_000M, CX700_36_000M},</div><div class='add'>+	{CLK_40_000M, CLE266_PLL_40_000M, K800_PLL_40_000M, CX700_40_000M},</div><div class='add'>+	{CLK_41_291M, CLE266_PLL_41_291M, K800_PLL_41_291M, CX700_41_291M},</div><div class='add'>+	{CLK_43_163M, CLE266_PLL_43_163M, K800_PLL_43_163M, CX700_43_163M},</div><div class='add'>+	{CLK_45_250M, CLE266_PLL_45_250M, K800_PLL_45_250M, CX700_45_250M},</div><div class='add'>+	{CLK_46_000M, CLE266_PLL_46_000M, K800_PLL_46_000M, CX700_46_000M},</div><div class='add'>+	{CLK_46_996M, CLE266_PLL_46_996M, K800_PLL_46_996M, CX700_46_996M},</div><div class='add'>+	{CLK_48_000M, CLE266_PLL_48_000M, K800_PLL_48_000M, CX700_48_000M},</div><div class='add'>+	{CLK_48_875M, CLE266_PLL_48_875M, K800_PLL_48_875M, CX700_48_875M},</div><div class='add'>+	{CLK_49_500M, CLE266_PLL_49_500M, K800_PLL_49_500M, CX700_49_500M},</div><div class='add'>+	{CLK_52_406M, CLE266_PLL_52_406M, K800_PLL_52_406M, CX700_52_406M},</div><div class='add'>+	{CLK_52_977M, CLE266_PLL_52_977M, K800_PLL_52_977M, CX700_52_977M},</div><div class='add'>+	{CLK_56_250M, CLE266_PLL_56_250M, K800_PLL_56_250M, CX700_56_250M},</div><div class='add'>+	{CLK_60_466M, CLE266_PLL_60_466M, K800_PLL_60_466M, CX700_60_466M},</div><div class='add'>+	{CLK_61_500M, CLE266_PLL_61_500M, K800_PLL_61_500M, CX700_61_500M},</div><div class='add'>+	{CLK_65_000M, CLE266_PLL_65_000M, K800_PLL_65_000M, CX700_65_000M},</div><div class='add'>+	{CLK_65_178M, CLE266_PLL_65_178M, K800_PLL_65_178M, CX700_65_178M},</div><div class='add'>+	{CLK_66_750M, CLE266_PLL_66_750M, K800_PLL_66_750M, CX700_66_750M},</div><div class='add'>+	{CLK_68_179M, CLE266_PLL_68_179M, K800_PLL_68_179M, CX700_68_179M},</div><div class='add'>+	{CLK_69_924M, CLE266_PLL_69_924M, K800_PLL_69_924M, CX700_69_924M},</div><div class='add'>+	{CLK_70_159M, CLE266_PLL_70_159M, K800_PLL_70_159M, CX700_70_159M},</div><div class='add'>+	{CLK_72_000M, CLE266_PLL_72_000M, K800_PLL_72_000M, CX700_72_000M},</div><div class='add'>+	{CLK_78_750M, CLE266_PLL_78_750M, K800_PLL_78_750M, CX700_78_750M},</div><div class='add'>+	{CLK_80_136M, CLE266_PLL_80_136M, K800_PLL_80_136M, CX700_80_136M},</div><div class='add'>+	{CLK_83_375M, CLE266_PLL_83_375M, K800_PLL_83_375M, CX700_83_375M},</div><div class='add'>+	{CLK_83_950M, CLE266_PLL_83_950M, K800_PLL_83_950M, CX700_83_950M},</div><div class='add'>+	{CLK_84_750M, CLE266_PLL_84_750M, K800_PLL_84_750M, CX700_84_750M},</div><div class='add'>+	{CLK_85_860M, CLE266_PLL_85_860M, K800_PLL_85_860M, CX700_85_860M},</div><div class='add'>+	{CLK_88_750M, CLE266_PLL_88_750M, K800_PLL_88_750M, CX700_88_750M},</div><div class='add'>+	{CLK_94_500M, CLE266_PLL_94_500M, K800_PLL_94_500M, CX700_94_500M},</div><div class='add'>+	{CLK_97_750M, CLE266_PLL_97_750M, K800_PLL_97_750M, CX700_97_750M},</div><div class='add'>+	{CLK_101_000M, CLE266_PLL_101_000M, K800_PLL_101_000M,</div><div class='add'>+	 CX700_101_000M},</div><div class='add'>+	{CLK_106_500M, CLE266_PLL_106_500M, K800_PLL_106_500M,</div><div class='add'>+	 CX700_106_500M},</div><div class='add'>+	{CLK_108_000M, CLE266_PLL_108_000M, K800_PLL_108_000M,</div><div class='add'>+	 CX700_108_000M},</div><div class='add'>+	{CLK_113_309M, CLE266_PLL_113_309M, K800_PLL_113_309M,</div><div class='add'>+	 CX700_113_309M},</div><div class='add'>+	{CLK_118_840M, CLE266_PLL_118_840M, K800_PLL_118_840M,</div><div class='add'>+	 CX700_118_840M},</div><div class='add'>+	{CLK_119_000M, CLE266_PLL_119_000M, K800_PLL_119_000M,</div><div class='add'>+	 CX700_119_000M},</div><div class='add'>+	{CLK_121_750M, CLE266_PLL_121_750M, K800_PLL_121_750M,</div><div class='add'>+	 CX700_121_750M},</div><div class='add'>+	{CLK_125_104M, CLE266_PLL_125_104M, K800_PLL_125_104M,</div><div class='add'>+	 CX700_125_104M},</div><div class='add'>+	{CLK_133_308M, CLE266_PLL_133_308M, K800_PLL_133_308M,</div><div class='add'>+	 CX700_133_308M},</div><div class='add'>+	{CLK_135_000M, CLE266_PLL_135_000M, K800_PLL_135_000M,</div><div class='add'>+	 CX700_135_000M},</div><div class='add'>+	{CLK_136_700M, CLE266_PLL_136_700M, K800_PLL_136_700M,</div><div class='add'>+	 CX700_136_700M},</div><div class='add'>+	{CLK_138_400M, CLE266_PLL_138_400M, K800_PLL_138_400M,</div><div class='add'>+	 CX700_138_400M},</div><div class='add'>+	{CLK_146_760M, CLE266_PLL_146_760M, K800_PLL_146_760M,</div><div class='add'>+	 CX700_146_760M},</div><div class='add'>+	{CLK_153_920M, CLE266_PLL_153_920M, K800_PLL_153_920M,</div><div class='add'>+	 CX700_153_920M},</div><div class='add'>+	{CLK_156_000M, CLE266_PLL_156_000M, K800_PLL_156_000M,</div><div class='add'>+	 CX700_156_000M},</div><div class='add'>+	{CLK_157_500M, CLE266_PLL_157_500M, K800_PLL_157_500M,</div><div class='add'>+	 CX700_157_500M},</div><div class='add'>+	{CLK_162_000M, CLE266_PLL_162_000M, K800_PLL_162_000M,</div><div class='add'>+	 CX700_162_000M},</div><div class='add'>+	{CLK_187_000M, CLE266_PLL_187_000M, K800_PLL_187_000M,</div><div class='add'>+	 CX700_187_000M},</div><div class='add'>+	{CLK_193_295M, CLE266_PLL_193_295M, K800_PLL_193_295M,</div><div class='add'>+	 CX700_193_295M},</div><div class='add'>+	{CLK_202_500M, CLE266_PLL_202_500M, K800_PLL_202_500M,</div><div class='add'>+	 CX700_202_500M},</div><div class='add'>+	{CLK_204_000M, CLE266_PLL_204_000M, K800_PLL_204_000M,</div><div class='add'>+	 CX700_204_000M},</div><div class='add'>+	{CLK_218_500M, CLE266_PLL_218_500M, K800_PLL_218_500M,</div><div class='add'>+	 CX700_218_500M},</div><div class='add'>+	{CLK_234_000M, CLE266_PLL_234_000M, K800_PLL_234_000M,</div><div class='add'>+	 CX700_234_000M},</div><div class='add'>+	{CLK_267_250M, CLE266_PLL_267_250M, K800_PLL_267_250M,</div><div class='add'>+	 CX700_267_250M},</div><div class='add'>+	{CLK_297_500M, CLE266_PLL_297_500M, K800_PLL_297_500M,</div><div class='add'>+	 CX700_297_500M},</div><div class='add'>+	{CLK_74_481M, CLE266_PLL_74_481M, K800_PLL_74_481M, CX700_74_481M},</div><div class='add'>+	{CLK_172_798M, CLE266_PLL_172_798M, K800_PLL_172_798M,</div><div class='add'>+	 CX700_172_798M},</div><div class='add'>+	{CLK_122_614M, CLE266_PLL_122_614M, K800_PLL_122_614M,</div><div class='add'>+	 CX700_122_614M},</div><div class='add'>+	{CLK_74_270M, CLE266_PLL_74_270M, K800_PLL_74_270M, CX700_74_270M},</div><div class='add'>+	{CLK_148_500M, CLE266_PLL_148_500M, K800_PLL_148_500M,</div><div class='add'>+	 CX700_148_500M}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct fifo_depth_select display_fifo_depth_reg = {</div><div class='add'>+	/* IGA1 FIFO Depth_Select */</div><div class='add'>+	{IGA1_FIFO_DEPTH_SELECT_REG_NUM, {{SR17, 0, 7} } },</div><div class='add'>+	/* IGA2 FIFO Depth_Select */</div><div class='add'>+	{IGA2_FIFO_DEPTH_SELECT_REG_NUM,</div><div class='add'>+	 {{CR68, 4, 7}, {CR94, 7, 7}, {CR95, 7, 7} } }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct fifo_threshold_select fifo_threshold_select_reg = {</div><div class='add'>+	/* IGA1 FIFO Threshold Select */</div><div class='add'>+	{IGA1_FIFO_THRESHOLD_REG_NUM, {{SR16, 0, 5}, {SR16, 7, 7} } },</div><div class='add'>+	/* IGA2 FIFO Threshold Select */</div><div class='add'>+	{IGA2_FIFO_THRESHOLD_REG_NUM, {{CR68, 0, 3}, {CR95, 4, 6} } }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct fifo_high_threshold_select fifo_high_threshold_select_reg = {</div><div class='add'>+	/* IGA1 FIFO High Threshold Select */</div><div class='add'>+	{IGA1_FIFO_HIGH_THRESHOLD_REG_NUM, {{SR18, 0, 5}, {SR18, 7, 7} } },</div><div class='add'>+	/* IGA2 FIFO High Threshold Select */</div><div class='add'>+	{IGA2_FIFO_HIGH_THRESHOLD_REG_NUM, {{CR92, 0, 3}, {CR95, 0, 2} } }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct display_queue_expire_num display_queue_expire_num_reg = {</div><div class='add'>+	/* IGA1 Display Queue Expire Num */</div><div class='add'>+	{IGA1_DISPLAY_QUEUE_EXPIRE_NUM_REG_NUM, {{SR22, 0, 4} } },</div><div class='add'>+	/* IGA2 Display Queue Expire Num */</div><div class='add'>+	{IGA2_DISPLAY_QUEUE_EXPIRE_NUM_REG_NUM, {{CR94, 0, 6} } }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Definition Fetch Count Registers*/</div><div class='add'>+static struct fetch_count fetch_count_reg = {</div><div class='add'>+	/* IGA1 Fetch Count Register */</div><div class='add'>+	{IGA1_FETCH_COUNT_REG_NUM, {{SR1C, 0, 7}, {SR1D, 0, 1} } },</div><div class='add'>+	/* IGA2 Fetch Count Register */</div><div class='add'>+	{IGA2_FETCH_COUNT_REG_NUM, {{CR65, 0, 7}, {CR67, 2, 3} } }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct iga1_crtc_timing iga1_crtc_reg = {</div><div class='add'>+	/* IGA1 Horizontal Total */</div><div class='add'>+	{IGA1_HOR_TOTAL_REG_NUM, {{CR00, 0, 7}, {CR36, 3, 3} } },</div><div class='add'>+	/* IGA1 Horizontal Addressable Video */</div><div class='add'>+	{IGA1_HOR_ADDR_REG_NUM, {{CR01, 0, 7} } },</div><div class='add'>+	/* IGA1 Horizontal Blank Start */</div><div class='add'>+	{IGA1_HOR_BLANK_START_REG_NUM, {{CR02, 0, 7} } },</div><div class='add'>+	/* IGA1 Horizontal Blank End */</div><div class='add'>+	{IGA1_HOR_BLANK_END_REG_NUM,</div><div class='add'>+	 {{CR03, 0, 4}, {CR05, 7, 7}, {CR33, 5, 5} } },</div><div class='add'>+	/* IGA1 Horizontal Sync Start */</div><div class='add'>+	{IGA1_HOR_SYNC_START_REG_NUM, {{CR04, 0, 7}, {CR33, 4, 4} } },</div><div class='add'>+	/* IGA1 Horizontal Sync End */</div><div class='add'>+	{IGA1_HOR_SYNC_END_REG_NUM, {{CR05, 0, 4} } },</div><div class='add'>+	/* IGA1 Vertical Total */</div><div class='add'>+	{IGA1_VER_TOTAL_REG_NUM,</div><div class='add'>+	 {{CR06, 0, 7}, {CR07, 0, 0}, {CR07, 5, 5}, {CR35, 0, 0} } },</div><div class='add'>+	/* IGA1 Vertical Addressable Video */</div><div class='add'>+	{IGA1_VER_ADDR_REG_NUM,</div><div class='add'>+	 {{CR12, 0, 7}, {CR07, 1, 1}, {CR07, 6, 6}, {CR35, 2, 2} } },</div><div class='add'>+	/* IGA1 Vertical Blank Start */</div><div class='add'>+	{IGA1_VER_BLANK_START_REG_NUM,</div><div class='add'>+	 {{CR15, 0, 7}, {CR07, 3, 3}, {CR09, 5, 5}, {CR35, 3, 3} } },</div><div class='add'>+	/* IGA1 Vertical Blank End */</div><div class='add'>+	{IGA1_VER_BLANK_END_REG_NUM, {{CR16, 0, 7} } },</div><div class='add'>+	/* IGA1 Vertical Sync Start */</div><div class='add'>+	{IGA1_VER_SYNC_START_REG_NUM,</div><div class='add'>+	 {{CR10, 0, 7}, {CR07, 2, 2}, {CR07, 7, 7}, {CR35, 1, 1} } },</div><div class='add'>+	/* IGA1 Vertical Sync End */</div><div class='add'>+	{IGA1_VER_SYNC_END_REG_NUM, {{CR11, 0, 3} } }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct iga2_crtc_timing iga2_crtc_reg = {</div><div class='add'>+	/* IGA2 Horizontal Total */</div><div class='add'>+	{IGA2_HOR_TOTAL_REG_NUM, {{CR50, 0, 7}, {CR55, 0, 3} } },</div><div class='add'>+	/* IGA2 Horizontal Addressable Video */</div><div class='add'>+	{IGA2_HOR_ADDR_REG_NUM, {{CR51, 0, 7}, {CR55, 4, 6} } },</div><div class='add'>+	/* IGA2 Horizontal Blank Start */</div><div class='add'>+	{IGA2_HOR_BLANK_START_REG_NUM, {{CR52, 0, 7}, {CR54, 0, 2} } },</div><div class='add'>+	/* IGA2 Horizontal Blank End */</div><div class='add'>+	{IGA2_HOR_BLANK_END_REG_NUM,</div><div class='add'>+	 {{CR53, 0, 7}, {CR54, 3, 5}, {CR5D, 6, 6} } },</div><div class='add'>+	/* IGA2 Horizontal Sync Start */</div><div class='add'>+	{IGA2_HOR_SYNC_START_REG_NUM,</div><div class='add'>+	 {{CR56, 0, 7}, {CR54, 6, 7}, {CR5C, 7, 7}, {CR5D, 7, 7} } },</div><div class='add'>+	/* IGA2 Horizontal Sync End */</div><div class='add'>+	{IGA2_HOR_SYNC_END_REG_NUM, {{CR57, 0, 7}, {CR5C, 6, 6} } },</div><div class='add'>+	/* IGA2 Vertical Total */</div><div class='add'>+	{IGA2_VER_TOTAL_REG_NUM, {{CR58, 0, 7}, {CR5D, 0, 2} } },</div><div class='add'>+	/* IGA2 Vertical Addressable Video */</div><div class='add'>+	{IGA2_VER_ADDR_REG_NUM, {{CR59, 0, 7}, {CR5D, 3, 5} } },</div><div class='add'>+	/* IGA2 Vertical Blank Start */</div><div class='add'>+	{IGA2_VER_BLANK_START_REG_NUM, {{CR5A, 0, 7}, {CR5C, 0, 2} } },</div><div class='add'>+	/* IGA2 Vertical Blank End */</div><div class='add'>+	{IGA2_VER_BLANK_END_REG_NUM, {{CR5B, 0, 7}, {CR5C, 3, 5} } },</div><div class='add'>+	/* IGA2 Vertical Sync Start */</div><div class='add'>+	{IGA2_VER_SYNC_START_REG_NUM, {{CR5E, 0, 7}, {CR5F, 5, 7} } },</div><div class='add'>+	/* IGA2 Vertical Sync End */</div><div class='add'>+	{IGA2_VER_SYNC_END_REG_NUM, {{CR5F, 0, 4} } }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct rgbLUT palLUT_table[] = {</div><div class='add'>+	/* {R,G,B} */</div><div class='add'>+	/* Index 0x00~0x03 */</div><div class='add'>+	{0x00, 0x00, 0x00}, {0x00, 0x00, 0x2A}, {0x00, 0x2A, 0x00}, {0x00,</div><div class='add'>+								     0x2A,</div><div class='add'>+								     0x2A},</div><div class='add'>+	/* Index 0x04~0x07 */</div><div class='add'>+	{0x2A, 0x00, 0x00}, {0x2A, 0x00, 0x2A}, {0x2A, 0x15, 0x00}, {0x2A,</div><div class='add'>+								     0x2A,</div><div class='add'>+								     0x2A},</div><div class='add'>+	/* Index 0x08~0x0B */</div><div class='add'>+	{0x15, 0x15, 0x15}, {0x15, 0x15, 0x3F}, {0x15, 0x3F, 0x15}, {0x15,</div><div class='add'>+								     0x3F,</div><div class='add'>+								     0x3F},</div><div class='add'>+	/* Index 0x0C~0x0F */</div><div class='add'>+	{0x3F, 0x15, 0x15}, {0x3F, 0x15, 0x3F}, {0x3F, 0x3F, 0x15}, {0x3F,</div><div class='add'>+								     0x3F,</div><div class='add'>+								     0x3F},</div><div class='add'>+	/* Index 0x10~0x13 */</div><div class='add'>+	{0x00, 0x00, 0x00}, {0x05, 0x05, 0x05}, {0x08, 0x08, 0x08}, {0x0B,</div><div class='add'>+								     0x0B,</div><div class='add'>+								     0x0B},</div><div class='add'>+	/* Index 0x14~0x17 */</div><div class='add'>+	{0x0E, 0x0E, 0x0E}, {0x11, 0x11, 0x11}, {0x14, 0x14, 0x14}, {0x18,</div><div class='add'>+								     0x18,</div><div class='add'>+								     0x18},</div><div class='add'>+	/* Index 0x18~0x1B */</div><div class='add'>+	{0x1C, 0x1C, 0x1C}, {0x20, 0x20, 0x20}, {0x24, 0x24, 0x24}, {0x28,</div><div class='add'>+								     0x28,</div><div class='add'>+								     0x28},</div><div class='add'>+	/* Index 0x1C~0x1F */</div><div class='add'>+	{0x2D, 0x2D, 0x2D}, {0x32, 0x32, 0x32}, {0x38, 0x38, 0x38}, {0x3F,</div><div class='add'>+								     0x3F,</div><div class='add'>+								     0x3F},</div><div class='add'>+	/* Index 0x20~0x23 */</div><div class='add'>+	{0x00, 0x00, 0x3F}, {0x10, 0x00, 0x3F}, {0x1F, 0x00, 0x3F}, {0x2F,</div><div class='add'>+								     0x00,</div><div class='add'>+								     0x3F},</div><div class='add'>+	/* Index 0x24~0x27 */</div><div class='add'>+	{0x3F, 0x00, 0x3F}, {0x3F, 0x00, 0x2F}, {0x3F, 0x00, 0x1F}, {0x3F,</div><div class='add'>+								     0x00,</div><div class='add'>+								     0x10},</div><div class='add'>+	/* Index 0x28~0x2B */</div><div class='add'>+	{0x3F, 0x00, 0x00}, {0x3F, 0x10, 0x00}, {0x3F, 0x1F, 0x00}, {0x3F,</div><div class='add'>+								     0x2F,</div><div class='add'>+								     0x00},</div><div class='add'>+	/* Index 0x2C~0x2F */</div><div class='add'>+	{0x3F, 0x3F, 0x00}, {0x2F, 0x3F, 0x00}, {0x1F, 0x3F, 0x00}, {0x10,</div><div class='add'>+								     0x3F,</div><div class='add'>+								     0x00},</div><div class='add'>+	/* Index 0x30~0x33 */</div><div class='add'>+	{0x00, 0x3F, 0x00}, {0x00, 0x3F, 0x10}, {0x00, 0x3F, 0x1F}, {0x00,</div><div class='add'>+								     0x3F,</div><div class='add'>+								     0x2F},</div><div class='add'>+	/* Index 0x34~0x37 */</div><div class='add'>+	{0x00, 0x3F, 0x3F}, {0x00, 0x2F, 0x3F}, {0x00, 0x1F, 0x3F}, {0x00,</div><div class='add'>+								     0x10,</div><div class='add'>+								     0x3F},</div><div class='add'>+	/* Index 0x38~0x3B */</div><div class='add'>+	{0x1F, 0x1F, 0x3F}, {0x27, 0x1F, 0x3F}, {0x2F, 0x1F, 0x3F}, {0x37,</div><div class='add'>+								     0x1F,</div><div class='add'>+								     0x3F},</div><div class='add'>+	/* Index 0x3C~0x3F */</div><div class='add'>+	{0x3F, 0x1F, 0x3F}, {0x3F, 0x1F, 0x37}, {0x3F, 0x1F, 0x2F}, {0x3F,</div><div class='add'>+								     0x1F,</div><div class='add'>+								     0x27},</div><div class='add'>+	/* Index 0x40~0x43 */</div><div class='add'>+	{0x3F, 0x1F, 0x1F}, {0x3F, 0x27, 0x1F}, {0x3F, 0x2F, 0x1F}, {0x3F,</div><div class='add'>+								     0x3F,</div><div class='add'>+								     0x1F},</div><div class='add'>+	/* Index 0x44~0x47 */</div><div class='add'>+	{0x3F, 0x3F, 0x1F}, {0x37, 0x3F, 0x1F}, {0x2F, 0x3F, 0x1F}, {0x27,</div><div class='add'>+								     0x3F,</div><div class='add'>+								     0x1F},</div><div class='add'>+	/* Index 0x48~0x4B */</div><div class='add'>+	{0x1F, 0x3F, 0x1F}, {0x1F, 0x3F, 0x27}, {0x1F, 0x3F, 0x2F}, {0x1F,</div><div class='add'>+								     0x3F,</div><div class='add'>+								     0x37},</div><div class='add'>+	/* Index 0x4C~0x4F */</div><div class='add'>+	{0x1F, 0x3F, 0x3F}, {0x1F, 0x37, 0x3F}, {0x1F, 0x2F, 0x3F}, {0x1F,</div><div class='add'>+								     0x27,</div><div class='add'>+								     0x3F},</div><div class='add'>+	/* Index 0x50~0x53 */</div><div class='add'>+	{0x2D, 0x2D, 0x3F}, {0x31, 0x2D, 0x3F}, {0x36, 0x2D, 0x3F}, {0x3A,</div><div class='add'>+								     0x2D,</div><div class='add'>+								     0x3F},</div><div class='add'>+	/* Index 0x54~0x57 */</div><div class='add'>+	{0x3F, 0x2D, 0x3F}, {0x3F, 0x2D, 0x3A}, {0x3F, 0x2D, 0x36}, {0x3F,</div><div class='add'>+								     0x2D,</div><div class='add'>+								     0x31},</div><div class='add'>+	/* Index 0x58~0x5B */</div><div class='add'>+	{0x3F, 0x2D, 0x2D}, {0x3F, 0x31, 0x2D}, {0x3F, 0x36, 0x2D}, {0x3F,</div><div class='add'>+								     0x3A,</div><div class='add'>+								     0x2D},</div><div class='add'>+	/* Index 0x5C~0x5F */</div><div class='add'>+	{0x3F, 0x3F, 0x2D}, {0x3A, 0x3F, 0x2D}, {0x36, 0x3F, 0x2D}, {0x31,</div><div class='add'>+								     0x3F,</div><div class='add'>+								     0x2D},</div><div class='add'>+	/* Index 0x60~0x63 */</div><div class='add'>+	{0x2D, 0x3F, 0x2D}, {0x2D, 0x3F, 0x31}, {0x2D, 0x3F, 0x36}, {0x2D,</div><div class='add'>+								     0x3F,</div><div class='add'>+								     0x3A},</div><div class='add'>+	/* Index 0x64~0x67 */</div><div class='add'>+	{0x2D, 0x3F, 0x3F}, {0x2D, 0x3A, 0x3F}, {0x2D, 0x36, 0x3F}, {0x2D,</div><div class='add'>+								     0x31,</div><div class='add'>+								     0x3F},</div><div class='add'>+	/* Index 0x68~0x6B */</div><div class='add'>+	{0x00, 0x00, 0x1C}, {0x07, 0x00, 0x1C}, {0x0E, 0x00, 0x1C}, {0x15,</div><div class='add'>+								     0x00,</div><div class='add'>+								     0x1C},</div><div class='add'>+	/* Index 0x6C~0x6F */</div><div class='add'>+	{0x1C, 0x00, 0x1C}, {0x1C, 0x00, 0x15}, {0x1C, 0x00, 0x0E}, {0x1C,</div><div class='add'>+								     0x00,</div><div class='add'>+								     0x07},</div><div class='add'>+	/* Index 0x70~0x73 */</div><div class='add'>+	{0x1C, 0x00, 0x00}, {0x1C, 0x07, 0x00}, {0x1C, 0x0E, 0x00}, {0x1C,</div><div class='add'>+								     0x15,</div><div class='add'>+								     0x00},</div><div class='add'>+	/* Index 0x74~0x77 */</div><div class='add'>+	{0x1C, 0x1C, 0x00}, {0x15, 0x1C, 0x00}, {0x0E, 0x1C, 0x00}, {0x07,</div><div class='add'>+								     0x1C,</div><div class='add'>+								     0x00},</div><div class='add'>+	/* Index 0x78~0x7B */</div><div class='add'>+	{0x00, 0x1C, 0x00}, {0x00, 0x1C, 0x07}, {0x00, 0x1C, 0x0E}, {0x00,</div><div class='add'>+								     0x1C,</div><div class='add'>+								     0x15},</div><div class='add'>+	/* Index 0x7C~0x7F */</div><div class='add'>+	{0x00, 0x1C, 0x1C}, {0x00, 0x15, 0x1C}, {0x00, 0x0E, 0x1C}, {0x00,</div><div class='add'>+								     0x07,</div><div class='add'>+								     0x1C},</div><div class='add'>+	/* Index 0x80~0x83 */</div><div class='add'>+	{0x0E, 0x0E, 0x1C}, {0x11, 0x0E, 0x1C}, {0x15, 0x0E, 0x1C}, {0x18,</div><div class='add'>+								     0x0E,</div><div class='add'>+								     0x1C},</div><div class='add'>+	/* Index 0x84~0x87 */</div><div class='add'>+	{0x1C, 0x0E, 0x1C}, {0x1C, 0x0E, 0x18}, {0x1C, 0x0E, 0x15}, {0x1C,</div><div class='add'>+								     0x0E,</div><div class='add'>+								     0x11},</div><div class='add'>+	/* Index 0x88~0x8B */</div><div class='add'>+	{0x1C, 0x0E, 0x0E}, {0x1C, 0x11, 0x0E}, {0x1C, 0x15, 0x0E}, {0x1C,</div><div class='add'>+								     0x18,</div><div class='add'>+								     0x0E},</div><div class='add'>+	/* Index 0x8C~0x8F */</div><div class='add'>+	{0x1C, 0x1C, 0x0E}, {0x18, 0x1C, 0x0E}, {0x15, 0x1C, 0x0E}, {0x11,</div><div class='add'>+								     0x1C,</div><div class='add'>+								     0x0E},</div><div class='add'>+	/* Index 0x90~0x93 */</div><div class='add'>+	{0x0E, 0x1C, 0x0E}, {0x0E, 0x1C, 0x11}, {0x0E, 0x1C, 0x15}, {0x0E,</div><div class='add'>+								     0x1C,</div><div class='add'>+								     0x18},</div><div class='add'>+	/* Index 0x94~0x97 */</div><div class='add'>+	{0x0E, 0x1C, 0x1C}, {0x0E, 0x18, 0x1C}, {0x0E, 0x15, 0x1C}, {0x0E,</div><div class='add'>+								     0x11,</div><div class='add'>+								     0x1C},</div><div class='add'>+	/* Index 0x98~0x9B */</div><div class='add'>+	{0x14, 0x14, 0x1C}, {0x16, 0x14, 0x1C}, {0x18, 0x14, 0x1C}, {0x1A,</div><div class='add'>+								     0x14,</div><div class='add'>+								     0x1C},</div><div class='add'>+	/* Index 0x9C~0x9F */</div><div class='add'>+	{0x1C, 0x14, 0x1C}, {0x1C, 0x14, 0x1A}, {0x1C, 0x14, 0x18}, {0x1C,</div><div class='add'>+								     0x14,</div><div class='add'>+								     0x16},</div><div class='add'>+	/* Index 0xA0~0xA3 */</div><div class='add'>+	{0x1C, 0x14, 0x14}, {0x1C, 0x16, 0x14}, {0x1C, 0x18, 0x14}, {0x1C,</div><div class='add'>+								     0x1A,</div><div class='add'>+								     0x14},</div><div class='add'>+	/* Index 0xA4~0xA7 */</div><div class='add'>+	{0x1C, 0x1C, 0x14}, {0x1A, 0x1C, 0x14}, {0x18, 0x1C, 0x14}, {0x16,</div><div class='add'>+								     0x1C,</div><div class='add'>+								     0x14},</div><div class='add'>+	/* Index 0xA8~0xAB */</div><div class='add'>+	{0x14, 0x1C, 0x14}, {0x14, 0x1C, 0x16}, {0x14, 0x1C, 0x18}, {0x14,</div><div class='add'>+								     0x1C,</div><div class='add'>+								     0x1A},</div><div class='add'>+	/* Index 0xAC~0xAF */</div><div class='add'>+	{0x14, 0x1C, 0x1C}, {0x14, 0x1A, 0x1C}, {0x14, 0x18, 0x1C}, {0x14,</div><div class='add'>+								     0x16,</div><div class='add'>+								     0x1C},</div><div class='add'>+	/* Index 0xB0~0xB3 */</div><div class='add'>+	{0x00, 0x00, 0x10}, {0x04, 0x00, 0x10}, {0x08, 0x00, 0x10}, {0x0C,</div><div class='add'>+								     0x00,</div><div class='add'>+								     0x10},</div><div class='add'>+	/* Index 0xB4~0xB7 */</div><div class='add'>+	{0x10, 0x00, 0x10}, {0x10, 0x00, 0x0C}, {0x10, 0x00, 0x08}, {0x10,</div><div class='add'>+								     0x00,</div><div class='add'>+								     0x04},</div><div class='add'>+	/* Index 0xB8~0xBB */</div><div class='add'>+	{0x10, 0x00, 0x00}, {0x10, 0x04, 0x00}, {0x10, 0x08, 0x00}, {0x10,</div><div class='add'>+								     0x0C,</div><div class='add'>+								     0x00},</div><div class='add'>+	/* Index 0xBC~0xBF */</div><div class='add'>+	{0x10, 0x10, 0x00}, {0x0C, 0x10, 0x00}, {0x08, 0x10, 0x00}, {0x04,</div><div class='add'>+								     0x10,</div><div class='add'>+								     0x00},</div><div class='add'>+	/* Index 0xC0~0xC3 */</div><div class='add'>+	{0x00, 0x10, 0x00}, {0x00, 0x10, 0x04}, {0x00, 0x10, 0x08}, {0x00,</div><div class='add'>+								     0x10,</div><div class='add'>+								     0x0C},</div><div class='add'>+	/* Index 0xC4~0xC7 */</div><div class='add'>+	{0x00, 0x10, 0x10}, {0x00, 0x0C, 0x10}, {0x00, 0x08, 0x10}, {0x00,</div><div class='add'>+								     0x04,</div><div class='add'>+								     0x10},</div><div class='add'>+	/* Index 0xC8~0xCB */</div><div class='add'>+	{0x08, 0x08, 0x10}, {0x0A, 0x08, 0x10}, {0x0C, 0x08, 0x10}, {0x0E,</div><div class='add'>+								     0x08,</div><div class='add'>+								     0x10},</div><div class='add'>+	/* Index 0xCC~0xCF */</div><div class='add'>+	{0x10, 0x08, 0x10}, {0x10, 0x08, 0x0E}, {0x10, 0x08, 0x0C}, {0x10,</div><div class='add'>+								     0x08,</div><div class='add'>+								     0x0A},</div><div class='add'>+	/* Index 0xD0~0xD3 */</div><div class='add'>+	{0x10, 0x08, 0x08}, {0x10, 0x0A, 0x08}, {0x10, 0x0C, 0x08}, {0x10,</div><div class='add'>+								     0x0E,</div><div class='add'>+								     0x08},</div><div class='add'>+	/* Index 0xD4~0xD7 */</div><div class='add'>+	{0x10, 0x10, 0x08}, {0x0E, 0x10, 0x08}, {0x0C, 0x10, 0x08}, {0x0A,</div><div class='add'>+								     0x10,</div><div class='add'>+								     0x08},</div><div class='add'>+	/* Index 0xD8~0xDB */</div><div class='add'>+	{0x08, 0x10, 0x08}, {0x08, 0x10, 0x0A}, {0x08, 0x10, 0x0C}, {0x08,</div><div class='add'>+								     0x10,</div><div class='add'>+								     0x0E},</div><div class='add'>+	/* Index 0xDC~0xDF */</div><div class='add'>+	{0x08, 0x10, 0x10}, {0x08, 0x0E, 0x10}, {0x08, 0x0C, 0x10}, {0x08,</div><div class='add'>+								     0x0A,</div><div class='add'>+								     0x10},</div><div class='add'>+	/* Index 0xE0~0xE3 */</div><div class='add'>+	{0x0B, 0x0B, 0x10}, {0x0C, 0x0B, 0x10}, {0x0D, 0x0B, 0x10}, {0x0F,</div><div class='add'>+								     0x0B,</div><div class='add'>+								     0x10},</div><div class='add'>+	/* Index 0xE4~0xE7 */</div><div class='add'>+	{0x10, 0x0B, 0x10}, {0x10, 0x0B, 0x0F}, {0x10, 0x0B, 0x0D}, {0x10,</div><div class='add'>+								     0x0B,</div><div class='add'>+								     0x0C},</div><div class='add'>+	/* Index 0xE8~0xEB */</div><div class='add'>+	{0x10, 0x0B, 0x0B}, {0x10, 0x0C, 0x0B}, {0x10, 0x0D, 0x0B}, {0x10,</div><div class='add'>+								     0x0F,</div><div class='add'>+								     0x0B},</div><div class='add'>+	/* Index 0xEC~0xEF */</div><div class='add'>+	{0x10, 0x10, 0x0B}, {0x0F, 0x10, 0x0B}, {0x0D, 0x10, 0x0B}, {0x0C,</div><div class='add'>+								     0x10,</div><div class='add'>+								     0x0B},</div><div class='add'>+	/* Index 0xF0~0xF3 */</div><div class='add'>+	{0x0B, 0x10, 0x0B}, {0x0B, 0x10, 0x0C}, {0x0B, 0x10, 0x0D}, {0x0B,</div><div class='add'>+								     0x10,</div><div class='add'>+								     0x0F},</div><div class='add'>+	/* Index 0xF4~0xF7 */</div><div class='add'>+	{0x0B, 0x10, 0x10}, {0x0B, 0x0F, 0x10}, {0x0B, 0x0D, 0x10}, {0x0B,</div><div class='add'>+								     0x0C,</div><div class='add'>+								     0x10},</div><div class='add'>+	/* Index 0xF8~0xFB */</div><div class='add'>+	{0x00, 0x00, 0x00}, {0x00, 0x00, 0x00}, {0x00, 0x00, 0x00}, {0x00,</div><div class='add'>+								     0x00,</div><div class='add'>+								     0x00},</div><div class='add'>+	/* Index 0xFC~0xFF */</div><div class='add'>+	{0x00, 0x00, 0x00}, {0x00, 0x00, 0x00}, {0x00, 0x00, 0x00}, {0x00,</div><div class='add'>+								     0x00,</div><div class='add'>+								     0x00}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void set_crt_output_path(int set_iga);</div><div class='add'>+static void dvi_patch_skew_dvp0(void);</div><div class='add'>+static void dvi_patch_skew_dvp1(void);</div><div class='add'>+static void dvi_patch_skew_dvp_low(void);</div><div class='add'>+static void set_dvi_output_path(int set_iga, int output_interface);</div><div class='add'>+static void set_lcd_output_path(int set_iga, int output_interface);</div><div class='add'>+static int search_mode_setting(int ModeInfoIndex);</div><div class='add'>+static void load_fix_bit_crtc_reg(void);</div><div class='add'>+static void init_gfx_chip_info(void);</div><div class='add'>+static void init_tmds_chip_info(void);</div><div class='add'>+static void init_lvds_chip_info(void);</div><div class='add'>+static void device_screen_off(void);</div><div class='add'>+static void device_screen_on(void);</div><div class='add'>+static void set_display_channel(void);</div><div class='add'>+static void device_off(void);</div><div class='add'>+static void device_on(void);</div><div class='add'>+static void enable_second_display_channel(void);</div><div class='add'>+static void disable_second_display_channel(void);</div><div class='add'>+static int get_fb_size_from_pci(void);</div><div class='add'>+</div><div class='add'>+void viafb_write_reg(u8 index, u16 io_port, u8 data)</div><div class='add'>+{</div><div class='add'>+	outb(index, io_port);</div><div class='add'>+	outb(data, io_port + 1);</div><div class='add'>+	/*DEBUG_MSG(KERN_INFO "\nIndex=%2d Value=%2d", index, data); */</div><div class='add'>+}</div><div class='add'>+u8 viafb_read_reg(int io_port, u8 index)</div><div class='add'>+{</div><div class='add'>+	outb(index, io_port);</div><div class='add'>+	return inb(io_port + 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void viafb_lock_crt(void)</div><div class='add'>+{</div><div class='add'>+	viafb_write_reg_mask(CR11, VIACR, BIT7, BIT7);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void viafb_unlock_crt(void)</div><div class='add'>+{</div><div class='add'>+	viafb_write_reg_mask(CR11, VIACR, 0, BIT7);</div><div class='add'>+	viafb_write_reg_mask(CR47, VIACR, 0, BIT0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void viafb_write_reg_mask(u8 index, int io_port, u8 data, u8 mask)</div><div class='add'>+{</div><div class='add'>+	u8 tmp;</div><div class='add'>+</div><div class='add'>+	outb(index, io_port);</div><div class='add'>+	tmp = inb(io_port + 1);</div><div class='add'>+	outb((data &amp; mask) | (tmp &amp; (~mask)), io_port + 1);</div><div class='add'>+	/*DEBUG_MSG(KERN_INFO "\nIndex=%2d Value=%2d", index, tmp); */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void write_dac_reg(u8 index, u8 r, u8 g, u8 b)</div><div class='add'>+{</div><div class='add'>+	outb(index, LUT_INDEX_WRITE);</div><div class='add'>+	outb(r, LUT_DATA);</div><div class='add'>+	outb(g, LUT_DATA);</div><div class='add'>+	outb(b, LUT_DATA);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*Set IGA path for each device*/</div><div class='add'>+void viafb_set_iga_path(void)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	if (viafb_SAMM_ON == 1) {</div><div class='add'>+		if (viafb_CRT_ON) {</div><div class='add'>+			if (viafb_primary_dev == CRT_Device)</div><div class='add'>+				viaparinfo-&gt;crt_setting_info-&gt;iga_path = IGA1;</div><div class='add'>+			else</div><div class='add'>+				viaparinfo-&gt;crt_setting_info-&gt;iga_path = IGA2;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (viafb_DVI_ON) {</div><div class='add'>+			if (viafb_primary_dev == DVI_Device)</div><div class='add'>+				viaparinfo-&gt;tmds_setting_info-&gt;iga_path = IGA1;</div><div class='add'>+			else</div><div class='add'>+				viaparinfo-&gt;tmds_setting_info-&gt;iga_path = IGA2;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (viafb_LCD_ON) {</div><div class='add'>+			if (viafb_primary_dev == LCD_Device) {</div><div class='add'>+				if (viafb_dual_fb &amp;&amp;</div><div class='add'>+					(viaparinfo-&gt;chip_info-&gt;gfx_chip_name ==</div><div class='add'>+					UNICHROME_CLE266)) {</div><div class='add'>+					viaparinfo-&gt;</div><div class='add'>+					lvds_setting_info-&gt;iga_path = IGA2;</div><div class='add'>+					viaparinfo-&gt;</div><div class='add'>+					crt_setting_info-&gt;iga_path = IGA1;</div><div class='add'>+					viaparinfo-&gt;</div><div class='add'>+					tmds_setting_info-&gt;iga_path = IGA1;</div><div class='add'>+				} else</div><div class='add'>+					viaparinfo-&gt;</div><div class='add'>+					lvds_setting_info-&gt;iga_path = IGA1;</div><div class='add'>+			} else {</div><div class='add'>+				viaparinfo-&gt;lvds_setting_info-&gt;iga_path = IGA2;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if (viafb_LCD2_ON) {</div><div class='add'>+			if (LCD2_Device == viafb_primary_dev)</div><div class='add'>+				viaparinfo-&gt;lvds_setting_info2-&gt;iga_path = IGA1;</div><div class='add'>+			else</div><div class='add'>+				viaparinfo-&gt;lvds_setting_info2-&gt;iga_path = IGA2;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		viafb_SAMM_ON = 0;</div><div class='add'>+</div><div class='add'>+		if (viafb_CRT_ON &amp;&amp; viafb_LCD_ON) {</div><div class='add'>+			viaparinfo-&gt;crt_setting_info-&gt;iga_path = IGA1;</div><div class='add'>+			viaparinfo-&gt;lvds_setting_info-&gt;iga_path = IGA2;</div><div class='add'>+		} else if (viafb_CRT_ON &amp;&amp; viafb_DVI_ON) {</div><div class='add'>+			viaparinfo-&gt;crt_setting_info-&gt;iga_path = IGA1;</div><div class='add'>+			viaparinfo-&gt;tmds_setting_info-&gt;iga_path = IGA2;</div><div class='add'>+		} else if (viafb_LCD_ON &amp;&amp; viafb_DVI_ON) {</div><div class='add'>+			viaparinfo-&gt;tmds_setting_info-&gt;iga_path = IGA1;</div><div class='add'>+			viaparinfo-&gt;lvds_setting_info-&gt;iga_path = IGA2;</div><div class='add'>+		} else if (viafb_LCD_ON &amp;&amp; viafb_LCD2_ON) {</div><div class='add'>+			viaparinfo-&gt;lvds_setting_info-&gt;iga_path = IGA2;</div><div class='add'>+			viaparinfo-&gt;lvds_setting_info2-&gt;iga_path = IGA2;</div><div class='add'>+		} else if (viafb_CRT_ON) {</div><div class='add'>+			viaparinfo-&gt;crt_setting_info-&gt;iga_path = IGA1;</div><div class='add'>+		} else if (viafb_LCD_ON) {</div><div class='add'>+			viaparinfo-&gt;lvds_setting_info-&gt;iga_path = IGA2;</div><div class='add'>+		} else if (viafb_DVI_ON) {</div><div class='add'>+			viaparinfo-&gt;tmds_setting_info-&gt;iga_path = IGA1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void viafb_set_start_addr(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long offset = 0, tmp = 0, size = 0;</div><div class='add'>+	unsigned long length;</div><div class='add'>+</div><div class='add'>+	DEBUG_MSG(KERN_INFO "viafb_set_start_addr!\n");</div><div class='add'>+	viafb_unlock_crt();</div><div class='add'>+	/* update starting address of IGA1 */</div><div class='add'>+	viafb_write_reg(CR0C, VIACR, 0x00);	/*initial starting address */</div><div class='add'>+	viafb_write_reg(CR0D, VIACR, 0x00);</div><div class='add'>+	viafb_write_reg(CR34, VIACR, 0x00);</div><div class='add'>+	viafb_write_reg_mask(CR48, VIACR, 0x00, 0x1F);</div><div class='add'>+</div><div class='add'>+	if (viafb_dual_fb) {</div><div class='add'>+		viaparinfo-&gt;iga_path = IGA1;</div><div class='add'>+		viaparinfo1-&gt;iga_path = IGA2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (viafb_SAMM_ON == 1) {</div><div class='add'>+		if (!viafb_dual_fb) {</div><div class='add'>+			if (viafb_second_size)</div><div class='add'>+				size = viafb_second_size * 1024 * 1024;</div><div class='add'>+			else</div><div class='add'>+				size = 8 * 1024 * 1024;</div><div class='add'>+		} else {</div><div class='add'>+</div><div class='add'>+			size = viaparinfo1-&gt;memsize;</div><div class='add'>+		}</div><div class='add'>+		offset = viafb_second_offset;</div><div class='add'>+		DEBUG_MSG(KERN_INFO</div><div class='add'>+			  "viafb_second_size=%lx, second start_adddress=%lx\n",</div><div class='add'>+			  size, offset);</div><div class='add'>+	}</div><div class='add'>+	if (viafb_SAMM_ON == 1) {</div><div class='add'>+		offset = offset &gt;&gt; 3;</div><div class='add'>+</div><div class='add'>+		tmp = viafb_read_reg(VIACR, 0x62) &amp; 0x01;</div><div class='add'>+		tmp |= (offset &amp; 0x7F) &lt;&lt; 1;</div><div class='add'>+		viafb_write_reg(CR62, VIACR, tmp);</div><div class='add'>+		viafb_write_reg(CR63, VIACR, ((offset &amp; 0x7F80) &gt;&gt; 7));</div><div class='add'>+		viafb_write_reg(CR64, VIACR, ((offset &amp; 0x7F8000) &gt;&gt; 15));</div><div class='add'>+		viafb_write_reg(CRA3, VIACR, ((offset &amp; 0x3800000) &gt;&gt; 23));</div><div class='add'>+	} else {</div><div class='add'>+		/* update starting address */</div><div class='add'>+		viafb_write_reg(CR62, VIACR, 0x00);</div><div class='add'>+		viafb_write_reg(CR63, VIACR, 0x00);</div><div class='add'>+		viafb_write_reg(CR64, VIACR, 0x00);</div><div class='add'>+		viafb_write_reg(CRA3, VIACR, 0x00);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (viafb_SAMM_ON == 1) {</div><div class='add'>+		if (viafb_accel) {</div><div class='add'>+			if (!viafb_dual_fb)</div><div class='add'>+				length = size - viaparinfo-&gt;fbmem_used;</div><div class='add'>+			else</div><div class='add'>+				length = size - viaparinfo1-&gt;fbmem_used;</div><div class='add'>+		} else</div><div class='add'>+			length = size;</div><div class='add'>+		offset = (unsigned long)(void *)viafb_FB_MM +</div><div class='add'>+			viafb_second_offset;</div><div class='add'>+		memset((void *)offset, 0, length);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	viafb_lock_crt();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void viafb_set_output_path(int device, int set_iga, int output_interface)</div><div class='add'>+{</div><div class='add'>+	switch (device) {</div><div class='add'>+	case DEVICE_CRT:</div><div class='add'>+		set_crt_output_path(set_iga);</div><div class='add'>+		break;</div><div class='add'>+	case DEVICE_DVI:</div><div class='add'>+		set_dvi_output_path(set_iga, output_interface);</div><div class='add'>+		break;</div><div class='add'>+	case DEVICE_LCD:</div><div class='add'>+		set_lcd_output_path(set_iga, output_interface);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void set_crt_output_path(int set_iga)</div><div class='add'>+{</div><div class='add'>+	viafb_write_reg_mask(CR36, VIACR, 0x00, BIT4 + BIT5);</div><div class='add'>+</div><div class='add'>+	switch (set_iga) {</div><div class='add'>+	case IGA1:</div><div class='add'>+		viafb_write_reg_mask(SR16, VIASR, 0x00, BIT6);</div><div class='add'>+		break;</div><div class='add'>+	case IGA2:</div><div class='add'>+	case IGA1_IGA2:</div><div class='add'>+		viafb_write_reg_mask(CR6A, VIACR, 0xC0, BIT6 + BIT7);</div><div class='add'>+		viafb_write_reg_mask(SR16, VIASR, 0x40, BIT6);</div><div class='add'>+		if (set_iga == IGA1_IGA2)</div><div class='add'>+			viafb_write_reg_mask(CR6B, VIACR, 0x08, BIT3);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dvi_patch_skew_dvp0(void)</div><div class='add'>+{</div><div class='add'>+	/* Reset data driving first: */</div><div class='add'>+	viafb_write_reg_mask(SR1B, VIASR, 0, BIT1);</div><div class='add'>+	viafb_write_reg_mask(SR2A, VIASR, 0, BIT4);</div><div class='add'>+</div><div class='add'>+	switch (viaparinfo-&gt;chip_info-&gt;gfx_chip_name) {</div><div class='add'>+	case UNICHROME_P4M890:</div><div class='add'>+		{</div><div class='add'>+			if ((viaparinfo-&gt;tmds_setting_info-&gt;h_active == 1600) &amp;&amp;</div><div class='add'>+				(viaparinfo-&gt;tmds_setting_info-&gt;v_active ==</div><div class='add'>+				1200))</div><div class='add'>+				viafb_write_reg_mask(CR96, VIACR, 0x03,</div><div class='add'>+					       BIT0 + BIT1 + BIT2);</div><div class='add'>+			else</div><div class='add'>+				viafb_write_reg_mask(CR96, VIACR, 0x07,</div><div class='add'>+					       BIT0 + BIT1 + BIT2);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	case UNICHROME_P4M900:</div><div class='add'>+		{</div><div class='add'>+			viafb_write_reg_mask(CR96, VIACR, 0x07,</div><div class='add'>+				       BIT0 + BIT1 + BIT2 + BIT3);</div><div class='add'>+			viafb_write_reg_mask(SR1B, VIASR, 0x02, BIT1);</div><div class='add'>+			viafb_write_reg_mask(SR2A, VIASR, 0x10, BIT4);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		{</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dvi_patch_skew_dvp1(void)</div><div class='add'>+{</div><div class='add'>+	switch (viaparinfo-&gt;chip_info-&gt;gfx_chip_name) {</div><div class='add'>+	case UNICHROME_CX700:</div><div class='add'>+		{</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		{</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dvi_patch_skew_dvp_low(void)</div><div class='add'>+{</div><div class='add'>+	switch (viaparinfo-&gt;chip_info-&gt;gfx_chip_name) {</div><div class='add'>+	case UNICHROME_K8M890:</div><div class='add'>+		{</div><div class='add'>+			viafb_write_reg_mask(CR99, VIACR, 0x03, BIT0 + BIT1);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	case UNICHROME_P4M900:</div><div class='add'>+		{</div><div class='add'>+			viafb_write_reg_mask(CR99, VIACR, 0x08,</div><div class='add'>+				       BIT0 + BIT1 + BIT2 + BIT3);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	case UNICHROME_P4M890:</div><div class='add'>+		{</div><div class='add'>+			viafb_write_reg_mask(CR99, VIACR, 0x0F,</div><div class='add'>+				       BIT0 + BIT1 + BIT2 + BIT3);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		{</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void set_dvi_output_path(int set_iga, int output_interface)</div><div class='add'>+{</div><div class='add'>+	switch (output_interface) {</div><div class='add'>+	case INTERFACE_DVP0:</div><div class='add'>+		viafb_write_reg_mask(CR6B, VIACR, 0x01, BIT0);</div><div class='add'>+</div><div class='add'>+		if (set_iga == IGA1) {</div><div class='add'>+			viafb_write_reg_mask(CR96, VIACR, 0x00, BIT4);</div><div class='add'>+			viafb_write_reg_mask(CR6C, VIACR, 0x21, BIT0 +</div><div class='add'>+				BIT5 + BIT7);</div><div class='add'>+		} else {</div><div class='add'>+			viafb_write_reg_mask(CR96, VIACR, 0x10, BIT4);</div><div class='add'>+			viafb_write_reg_mask(CR6C, VIACR, 0xA1, BIT0 +</div><div class='add'>+				BIT5 + BIT7);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		viafb_write_reg_mask(SR1E, VIASR, 0xC0, BIT7 + BIT6);</div><div class='add'>+</div><div class='add'>+		dvi_patch_skew_dvp0();</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case INTERFACE_DVP1:</div><div class='add'>+		if (viaparinfo-&gt;chip_info-&gt;gfx_chip_name == UNICHROME_CLE266) {</div><div class='add'>+			if (set_iga == IGA1)</div><div class='add'>+				viafb_write_reg_mask(CR93, VIACR, 0x21,</div><div class='add'>+					       BIT0 + BIT5 + BIT7);</div><div class='add'>+			else</div><div class='add'>+				viafb_write_reg_mask(CR93, VIACR, 0xA1,</div><div class='add'>+					       BIT0 + BIT5 + BIT7);</div><div class='add'>+		} else {</div><div class='add'>+			if (set_iga == IGA1)</div><div class='add'>+				viafb_write_reg_mask(CR9B, VIACR, 0x00, BIT4);</div><div class='add'>+			else</div><div class='add'>+				viafb_write_reg_mask(CR9B, VIACR, 0x10, BIT4);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		viafb_write_reg_mask(SR1E, VIASR, 0x30, BIT4 + BIT5);</div><div class='add'>+		dvi_patch_skew_dvp1();</div><div class='add'>+		break;</div><div class='add'>+	case INTERFACE_DFP_HIGH:</div><div class='add'>+		if (viaparinfo-&gt;chip_info-&gt;gfx_chip_name != UNICHROME_CLE266) {</div><div class='add'>+			if (set_iga == IGA1) {</div><div class='add'>+				viafb_write_reg_mask(CR96, VIACR, 0x00, BIT4);</div><div class='add'>+				viafb_write_reg_mask(CR97, VIACR, 0x03,</div><div class='add'>+					       BIT0 + BIT1 + BIT4);</div><div class='add'>+			} else {</div><div class='add'>+				viafb_write_reg_mask(CR96, VIACR, 0x10, BIT4);</div><div class='add'>+				viafb_write_reg_mask(CR97, VIACR, 0x13,</div><div class='add'>+					       BIT0 + BIT1 + BIT4);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		viafb_write_reg_mask(SR2A, VIASR, 0x0C, BIT2 + BIT3);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case INTERFACE_DFP_LOW:</div><div class='add'>+		if (viaparinfo-&gt;chip_info-&gt;gfx_chip_name == UNICHROME_CLE266)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (set_iga == IGA1) {</div><div class='add'>+			viafb_write_reg_mask(CR99, VIACR, 0x00, BIT4);</div><div class='add'>+			viafb_write_reg_mask(CR9B, VIACR, 0x00, BIT4);</div><div class='add'>+		} else {</div><div class='add'>+			viafb_write_reg_mask(CR99, VIACR, 0x10, BIT4);</div><div class='add'>+			viafb_write_reg_mask(CR9B, VIACR, 0x10, BIT4);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		viafb_write_reg_mask(SR2A, VIASR, 0x03, BIT0 + BIT1);</div><div class='add'>+		dvi_patch_skew_dvp_low();</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case INTERFACE_TMDS:</div><div class='add'>+		if (set_iga == IGA1)</div><div class='add'>+			viafb_write_reg_mask(CR99, VIACR, 0x00, BIT4);</div><div class='add'>+		else</div><div class='add'>+			viafb_write_reg_mask(CR99, VIACR, 0x10, BIT4);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (set_iga == IGA2) {</div><div class='add'>+		enable_second_display_channel();</div><div class='add'>+		/* Disable LCD Scaling */</div><div class='add'>+		viafb_write_reg_mask(CR79, VIACR, 0x00, BIT0);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void set_lcd_output_path(int set_iga, int output_interface)</div><div class='add'>+{</div><div class='add'>+	DEBUG_MSG(KERN_INFO</div><div class='add'>+		  "set_lcd_output_path, iga:%d,out_interface:%d\n",</div><div class='add'>+		  set_iga, output_interface);</div><div class='add'>+	switch (set_iga) {</div><div class='add'>+	case IGA1:</div><div class='add'>+		viafb_write_reg_mask(CR6B, VIACR, 0x00, BIT3);</div><div class='add'>+		viafb_write_reg_mask(CR6A, VIACR, 0x08, BIT3);</div><div class='add'>+</div><div class='add'>+		disable_second_display_channel();</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case IGA2:</div><div class='add'>+		viafb_write_reg_mask(CR6B, VIACR, 0x00, BIT3);</div><div class='add'>+		viafb_write_reg_mask(CR6A, VIACR, 0x08, BIT3);</div><div class='add'>+</div><div class='add'>+		enable_second_display_channel();</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case IGA1_IGA2:</div><div class='add'>+		viafb_write_reg_mask(CR6B, VIACR, 0x08, BIT3);</div><div class='add'>+		viafb_write_reg_mask(CR6A, VIACR, 0x08, BIT3);</div><div class='add'>+</div><div class='add'>+		disable_second_display_channel();</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (output_interface) {</div><div class='add'>+	case INTERFACE_DVP0:</div><div class='add'>+		if (set_iga == IGA1) {</div><div class='add'>+			viafb_write_reg_mask(CR96, VIACR, 0x00, BIT4);</div><div class='add'>+		} else {</div><div class='add'>+			viafb_write_reg(CR91, VIACR, 0x00);</div><div class='add'>+			viafb_write_reg_mask(CR96, VIACR, 0x10, BIT4);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case INTERFACE_DVP1:</div><div class='add'>+		if (set_iga == IGA1)</div><div class='add'>+			viafb_write_reg_mask(CR9B, VIACR, 0x00, BIT4);</div><div class='add'>+		else {</div><div class='add'>+			viafb_write_reg(CR91, VIACR, 0x00);</div><div class='add'>+			viafb_write_reg_mask(CR9B, VIACR, 0x10, BIT4);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case INTERFACE_DFP_HIGH:</div><div class='add'>+		if (set_iga == IGA1)</div><div class='add'>+			viafb_write_reg_mask(CR97, VIACR, 0x00, BIT4);</div><div class='add'>+		else {</div><div class='add'>+			viafb_write_reg(CR91, VIACR, 0x00);</div><div class='add'>+			viafb_write_reg_mask(CR97, VIACR, 0x10, BIT4);</div><div class='add'>+			viafb_write_reg_mask(CR96, VIACR, 0x10, BIT4);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case INTERFACE_DFP_LOW:</div><div class='add'>+		if (set_iga == IGA1)</div><div class='add'>+			viafb_write_reg_mask(CR99, VIACR, 0x00, BIT4);</div><div class='add'>+		else {</div><div class='add'>+			viafb_write_reg(CR91, VIACR, 0x00);</div><div class='add'>+			viafb_write_reg_mask(CR99, VIACR, 0x10, BIT4);</div><div class='add'>+			viafb_write_reg_mask(CR9B, VIACR, 0x10, BIT4);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case INTERFACE_DFP:</div><div class='add'>+		if ((UNICHROME_K8M890 == viaparinfo-&gt;chip_info-&gt;gfx_chip_name)</div><div class='add'>+		    || (UNICHROME_P4M890 ==</div><div class='add'>+		    viaparinfo-&gt;chip_info-&gt;gfx_chip_name))</div><div class='add'>+			viafb_write_reg_mask(CR97, VIACR, 0x84,</div><div class='add'>+				       BIT7 + BIT2 + BIT1 + BIT0);</div><div class='add'>+		if (set_iga == IGA1) {</div><div class='add'>+			viafb_write_reg_mask(CR97, VIACR, 0x00, BIT4);</div><div class='add'>+			viafb_write_reg_mask(CR99, VIACR, 0x00, BIT4);</div><div class='add'>+		} else {</div><div class='add'>+			viafb_write_reg(CR91, VIACR, 0x00);</div><div class='add'>+			viafb_write_reg_mask(CR97, VIACR, 0x10, BIT4);</div><div class='add'>+			viafb_write_reg_mask(CR99, VIACR, 0x10, BIT4);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case INTERFACE_LVDS0:</div><div class='add'>+	case INTERFACE_LVDS0LVDS1:</div><div class='add'>+		if (set_iga == IGA1)</div><div class='add'>+			viafb_write_reg_mask(CR99, VIACR, 0x00, BIT4);</div><div class='add'>+		else</div><div class='add'>+			viafb_write_reg_mask(CR99, VIACR, 0x10, BIT4);</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case INTERFACE_LVDS1:</div><div class='add'>+		if (set_iga == IGA1)</div><div class='add'>+			viafb_write_reg_mask(CR97, VIACR, 0x00, BIT4);</div><div class='add'>+		else</div><div class='add'>+			viafb_write_reg_mask(CR97, VIACR, 0x10, BIT4);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Search Mode Index */</div><div class='add'>+static int search_mode_setting(int ModeInfoIndex)</div><div class='add'>+{</div><div class='add'>+	int i = 0;</div><div class='add'>+</div><div class='add'>+	while ((i &lt; NUM_TOTAL_MODETABLE) &amp;&amp;</div><div class='add'>+			(ModeInfoIndex != CLE266Modes[i].ModeIndex))</div><div class='add'>+		i++;</div><div class='add'>+	if (i &gt;= NUM_TOTAL_MODETABLE)</div><div class='add'>+		i = 0;</div><div class='add'>+	return i;</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct VideoModeTable *viafb_get_modetbl_pointer(int Index)</div><div class='add'>+{</div><div class='add'>+	struct VideoModeTable *TmpTbl = NULL;</div><div class='add'>+	TmpTbl = &amp;CLE266Modes[search_mode_setting(Index)];</div><div class='add'>+	return TmpTbl;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct VideoModeTable *viafb_get_cea_mode_tbl_pointer(int Index)</div><div class='add'>+{</div><div class='add'>+	struct VideoModeTable *TmpTbl = NULL;</div><div class='add'>+	int i = 0;</div><div class='add'>+	while ((i &lt; NUM_TOTAL_CEA_MODES) &amp;&amp;</div><div class='add'>+			(Index != CEA_HDMI_Modes[i].ModeIndex))</div><div class='add'>+		i++;</div><div class='add'>+	if ((i &lt; NUM_TOTAL_CEA_MODES))</div><div class='add'>+		TmpTbl = &amp;CEA_HDMI_Modes[i];</div><div class='add'>+	 else {</div><div class='add'>+		/*Still use general timing if don't find CEA timing */</div><div class='add'>+		i = 0;</div><div class='add'>+		while ((i &lt; NUM_TOTAL_MODETABLE) &amp;&amp;</div><div class='add'>+				(Index != CLE266Modes[i].ModeIndex))</div><div class='add'>+		       i++;</div><div class='add'>+		if (i &gt;= NUM_TOTAL_MODETABLE)</div><div class='add'>+			i = 0;</div><div class='add'>+		TmpTbl = &amp;CLE266Modes[i];</div><div class='add'>+	}</div><div class='add'>+	return TmpTbl;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void load_fix_bit_crtc_reg(void)</div><div class='add'>+{</div><div class='add'>+	/* always set to 1 */</div><div class='add'>+	viafb_write_reg_mask(CR03, VIACR, 0x80, BIT7);</div><div class='add'>+	/* line compare should set all bits = 1 (extend modes) */</div><div class='add'>+	viafb_write_reg(CR18, VIACR, 0xff);</div><div class='add'>+	/* line compare should set all bits = 1 (extend modes) */</div><div class='add'>+	viafb_write_reg_mask(CR07, VIACR, 0x10, BIT4);</div><div class='add'>+	/* line compare should set all bits = 1 (extend modes) */</div><div class='add'>+	viafb_write_reg_mask(CR09, VIACR, 0x40, BIT6);</div><div class='add'>+	/* line compare should set all bits = 1 (extend modes) */</div><div class='add'>+	viafb_write_reg_mask(CR35, VIACR, 0x10, BIT4);</div><div class='add'>+	/* line compare should set all bits = 1 (extend modes) */</div><div class='add'>+	viafb_write_reg_mask(CR33, VIACR, 0x06, BIT0 + BIT1 + BIT2);</div><div class='add'>+	/*viafb_write_reg_mask(CR32, VIACR, 0x01, BIT0); */</div><div class='add'>+	/* extend mode always set to e3h */</div><div class='add'>+	viafb_write_reg(CR17, VIACR, 0xe3);</div><div class='add'>+	/* extend mode always set to 0h */</div><div class='add'>+	viafb_write_reg(CR08, VIACR, 0x00);</div><div class='add'>+	/* extend mode always set to 0h */</div><div class='add'>+	viafb_write_reg(CR14, VIACR, 0x00);</div><div class='add'>+</div><div class='add'>+	/* If K8M800, enable Prefetch Mode. */</div><div class='add'>+	if ((viaparinfo-&gt;chip_info-&gt;gfx_chip_name == UNICHROME_K800)</div><div class='add'>+		|| (viaparinfo-&gt;chip_info-&gt;gfx_chip_name == UNICHROME_K8M890))</div><div class='add'>+		viafb_write_reg_mask(CR33, VIACR, 0x08, BIT3);</div><div class='add'>+	if ((viaparinfo-&gt;chip_info-&gt;gfx_chip_name == UNICHROME_CLE266)</div><div class='add'>+	    &amp;&amp; (viaparinfo-&gt;chip_info-&gt;gfx_chip_revision == CLE266_REVISION_AX))</div><div class='add'>+		viafb_write_reg_mask(SR1A, VIASR, 0x02, BIT1);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void viafb_load_reg(int timing_value, int viafb_load_reg_num,</div><div class='add'>+	struct io_register *reg,</div><div class='add'>+	      int io_type)</div><div class='add'>+{</div><div class='add'>+	int reg_mask;</div><div class='add'>+	int bit_num = 0;</div><div class='add'>+	int data;</div><div class='add'>+	int i, j;</div><div class='add'>+	int shift_next_reg;</div><div class='add'>+	int start_index, end_index, cr_index;</div><div class='add'>+	u16 get_bit;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; viafb_load_reg_num; i++) {</div><div class='add'>+		reg_mask = 0;</div><div class='add'>+		data = 0;</div><div class='add'>+		start_index = reg[i].start_bit;</div><div class='add'>+		end_index = reg[i].end_bit;</div><div class='add'>+		cr_index = reg[i].io_addr;</div><div class='add'>+</div><div class='add'>+		shift_next_reg = bit_num;</div><div class='add'>+		for (j = start_index; j &lt;= end_index; j++) {</div><div class='add'>+			/*if (bit_num==8) timing_value = timing_value &gt;&gt;8; */</div><div class='add'>+			reg_mask = reg_mask | (BIT0 &lt;&lt; j);</div><div class='add'>+			get_bit = (timing_value &amp; (BIT0 &lt;&lt; bit_num));</div><div class='add'>+			data =</div><div class='add'>+			    data | ((get_bit &gt;&gt; shift_next_reg) &lt;&lt; start_index);</div><div class='add'>+			bit_num++;</div><div class='add'>+		}</div><div class='add'>+		if (io_type == VIACR)</div><div class='add'>+			viafb_write_reg_mask(cr_index, VIACR, data, reg_mask);</div><div class='add'>+		else</div><div class='add'>+			viafb_write_reg_mask(cr_index, VIASR, data, reg_mask);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Write Registers */</div><div class='add'>+void viafb_write_regx(struct io_reg RegTable[], int ItemNum)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	unsigned char RegTemp;</div><div class='add'>+</div><div class='add'>+	/*DEBUG_MSG(KERN_INFO "Table Size : %x!!\n",ItemNum ); */</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ItemNum; i++) {</div><div class='add'>+		outb(RegTable[i].index, RegTable[i].port);</div><div class='add'>+		RegTemp = inb(RegTable[i].port + 1);</div><div class='add'>+		RegTemp = (RegTemp &amp; (~RegTable[i].mask)) | RegTable[i].value;</div><div class='add'>+		outb(RegTemp, RegTable[i].port + 1);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void viafb_load_offset_reg(int h_addr, int bpp_byte, int set_iga)</div><div class='add'>+{</div><div class='add'>+	int reg_value;</div><div class='add'>+	int viafb_load_reg_num;</div><div class='add'>+	struct io_register *reg;</div><div class='add'>+</div><div class='add'>+	switch (set_iga) {</div><div class='add'>+	case IGA1_IGA2:</div><div class='add'>+	case IGA1:</div><div class='add'>+		reg_value = IGA1_OFFSET_FORMULA(h_addr, bpp_byte);</div><div class='add'>+		viafb_load_reg_num = offset_reg.iga1_offset_reg.reg_num;</div><div class='add'>+		reg = offset_reg.iga1_offset_reg.reg;</div><div class='add'>+		viafb_load_reg(reg_value, viafb_load_reg_num, reg, VIACR);</div><div class='add'>+		if (set_iga == IGA1)</div><div class='add'>+			break;</div><div class='add'>+	case IGA2:</div><div class='add'>+		reg_value = IGA2_OFFSET_FORMULA(h_addr, bpp_byte);</div><div class='add'>+		viafb_load_reg_num = offset_reg.iga2_offset_reg.reg_num;</div><div class='add'>+		reg = offset_reg.iga2_offset_reg.reg;</div><div class='add'>+		viafb_load_reg(reg_value, viafb_load_reg_num, reg, VIACR);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void viafb_load_fetch_count_reg(int h_addr, int bpp_byte, int set_iga)</div><div class='add'>+{</div><div class='add'>+	int reg_value;</div><div class='add'>+	int viafb_load_reg_num;</div><div class='add'>+	struct io_register *reg = NULL;</div><div class='add'>+</div><div class='add'>+	switch (set_iga) {</div><div class='add'>+	case IGA1_IGA2:</div><div class='add'>+	case IGA1:</div><div class='add'>+		reg_value = IGA1_FETCH_COUNT_FORMULA(h_addr, bpp_byte);</div><div class='add'>+		viafb_load_reg_num = fetch_count_reg.</div><div class='add'>+			iga1_fetch_count_reg.reg_num;</div><div class='add'>+		reg = fetch_count_reg.iga1_fetch_count_reg.reg;</div><div class='add'>+		viafb_load_reg(reg_value, viafb_load_reg_num, reg, VIASR);</div><div class='add'>+		if (set_iga == IGA1)</div><div class='add'>+			break;</div><div class='add'>+	case IGA2:</div><div class='add'>+		reg_value = IGA2_FETCH_COUNT_FORMULA(h_addr, bpp_byte);</div><div class='add'>+		viafb_load_reg_num = fetch_count_reg.</div><div class='add'>+			iga2_fetch_count_reg.reg_num;</div><div class='add'>+		reg = fetch_count_reg.iga2_fetch_count_reg.reg;</div><div class='add'>+		viafb_load_reg(reg_value, viafb_load_reg_num, reg, VIACR);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void viafb_load_FIFO_reg(int set_iga, int hor_active, int ver_active)</div><div class='add'>+{</div><div class='add'>+	int reg_value;</div><div class='add'>+	int viafb_load_reg_num;</div><div class='add'>+	struct io_register *reg = NULL;</div><div class='add'>+	int iga1_fifo_max_depth = 0, iga1_fifo_threshold =</div><div class='add'>+	    0, iga1_fifo_high_threshold = 0, iga1_display_queue_expire_num = 0;</div><div class='add'>+	int iga2_fifo_max_depth = 0, iga2_fifo_threshold =</div><div class='add'>+	    0, iga2_fifo_high_threshold = 0, iga2_display_queue_expire_num = 0;</div><div class='add'>+</div><div class='add'>+	if (set_iga == IGA1) {</div><div class='add'>+		if (viaparinfo-&gt;chip_info-&gt;gfx_chip_name == UNICHROME_K800) {</div><div class='add'>+			iga1_fifo_max_depth = K800_IGA1_FIFO_MAX_DEPTH;</div><div class='add'>+			iga1_fifo_threshold = K800_IGA1_FIFO_THRESHOLD;</div><div class='add'>+			iga1_fifo_high_threshold =</div><div class='add'>+			    K800_IGA1_FIFO_HIGH_THRESHOLD;</div><div class='add'>+			/* If resolution &gt; 1280x1024, expire length = 64, else</div><div class='add'>+			   expire length = 128 */</div><div class='add'>+			if ((hor_active &gt; 1280) &amp;&amp; (ver_active &gt; 1024))</div><div class='add'>+				iga1_display_queue_expire_num = 16;</div><div class='add'>+			else</div><div class='add'>+				iga1_display_queue_expire_num =</div><div class='add'>+				    K800_IGA1_DISPLAY_QUEUE_EXPIRE_NUM;</div><div class='add'>+</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (viaparinfo-&gt;chip_info-&gt;gfx_chip_name == UNICHROME_PM800) {</div><div class='add'>+			iga1_fifo_max_depth = P880_IGA1_FIFO_MAX_DEPTH;</div><div class='add'>+			iga1_fifo_threshold = P880_IGA1_FIFO_THRESHOLD;</div><div class='add'>+			iga1_fifo_high_threshold =</div><div class='add'>+			    P880_IGA1_FIFO_HIGH_THRESHOLD;</div><div class='add'>+			iga1_display_queue_expire_num =</div><div class='add'>+			    P880_IGA1_DISPLAY_QUEUE_EXPIRE_NUM;</div><div class='add'>+</div><div class='add'>+			/* If resolution &gt; 1280x1024, expire length = 64, else</div><div class='add'>+			   expire length = 128 */</div><div class='add'>+			if ((hor_active &gt; 1280) &amp;&amp; (ver_active &gt; 1024))</div><div class='add'>+				iga1_display_queue_expire_num = 16;</div><div class='add'>+			else</div><div class='add'>+				iga1_display_queue_expire_num =</div><div class='add'>+				    P880_IGA1_DISPLAY_QUEUE_EXPIRE_NUM;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (viaparinfo-&gt;chip_info-&gt;gfx_chip_name == UNICHROME_CN700) {</div><div class='add'>+			iga1_fifo_max_depth = CN700_IGA1_FIFO_MAX_DEPTH;</div><div class='add'>+			iga1_fifo_threshold = CN700_IGA1_FIFO_THRESHOLD;</div><div class='add'>+			iga1_fifo_high_threshold =</div><div class='add'>+			    CN700_IGA1_FIFO_HIGH_THRESHOLD;</div><div class='add'>+</div><div class='add'>+			/* If resolution &gt; 1280x1024, expire length = 64,</div><div class='add'>+			   else expire length = 128 */</div><div class='add'>+			if ((hor_active &gt; 1280) &amp;&amp; (ver_active &gt; 1024))</div><div class='add'>+				iga1_display_queue_expire_num = 16;</div><div class='add'>+			else</div><div class='add'>+				iga1_display_queue_expire_num =</div><div class='add'>+				    CN700_IGA1_DISPLAY_QUEUE_EXPIRE_NUM;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (viaparinfo-&gt;chip_info-&gt;gfx_chip_name == UNICHROME_CX700) {</div><div class='add'>+			iga1_fifo_max_depth = CX700_IGA1_FIFO_MAX_DEPTH;</div><div class='add'>+			iga1_fifo_threshold = CX700_IGA1_FIFO_THRESHOLD;</div><div class='add'>+			iga1_fifo_high_threshold =</div><div class='add'>+			    CX700_IGA1_FIFO_HIGH_THRESHOLD;</div><div class='add'>+			iga1_display_queue_expire_num =</div><div class='add'>+			    CX700_IGA1_DISPLAY_QUEUE_EXPIRE_NUM;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (viaparinfo-&gt;chip_info-&gt;gfx_chip_name == UNICHROME_K8M890) {</div><div class='add'>+			iga1_fifo_max_depth = K8M890_IGA1_FIFO_MAX_DEPTH;</div><div class='add'>+			iga1_fifo_threshold = K8M890_IGA1_FIFO_THRESHOLD;</div><div class='add'>+			iga1_fifo_high_threshold =</div><div class='add'>+			    K8M890_IGA1_FIFO_HIGH_THRESHOLD;</div><div class='add'>+			iga1_display_queue_expire_num =</div><div class='add'>+			    K8M890_IGA1_DISPLAY_QUEUE_EXPIRE_NUM;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (viaparinfo-&gt;chip_info-&gt;gfx_chip_name == UNICHROME_P4M890) {</div><div class='add'>+			iga1_fifo_max_depth = P4M890_IGA1_FIFO_MAX_DEPTH;</div><div class='add'>+			iga1_fifo_threshold = P4M890_IGA1_FIFO_THRESHOLD;</div><div class='add'>+			iga1_fifo_high_threshold =</div><div class='add'>+			    P4M890_IGA1_FIFO_HIGH_THRESHOLD;</div><div class='add'>+			iga1_display_queue_expire_num =</div><div class='add'>+			    P4M890_IGA1_DISPLAY_QUEUE_EXPIRE_NUM;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (viaparinfo-&gt;chip_info-&gt;gfx_chip_name == UNICHROME_P4M900) {</div><div class='add'>+			iga1_fifo_max_depth = P4M900_IGA1_FIFO_MAX_DEPTH;</div><div class='add'>+			iga1_fifo_threshold = P4M900_IGA1_FIFO_THRESHOLD;</div><div class='add'>+			iga1_fifo_high_threshold =</div><div class='add'>+			    P4M900_IGA1_FIFO_HIGH_THRESHOLD;</div><div class='add'>+			iga1_display_queue_expire_num =</div><div class='add'>+			    P4M900_IGA1_DISPLAY_QUEUE_EXPIRE_NUM;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (viaparinfo-&gt;chip_info-&gt;gfx_chip_name == UNICHROME_VX800) {</div><div class='add'>+			iga1_fifo_max_depth = VX800_IGA1_FIFO_MAX_DEPTH;</div><div class='add'>+			iga1_fifo_threshold = VX800_IGA1_FIFO_THRESHOLD;</div><div class='add'>+			iga1_fifo_high_threshold =</div><div class='add'>+			    VX800_IGA1_FIFO_HIGH_THRESHOLD;</div><div class='add'>+			iga1_display_queue_expire_num =</div><div class='add'>+			    VX800_IGA1_DISPLAY_QUEUE_EXPIRE_NUM;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Set Display FIFO Depath Select */</div><div class='add'>+		reg_value = IGA1_FIFO_DEPTH_SELECT_FORMULA(iga1_fifo_max_depth);</div><div class='add'>+		viafb_load_reg_num =</div><div class='add'>+		    display_fifo_depth_reg.iga1_fifo_depth_select_reg.reg_num;</div><div class='add'>+		reg = display_fifo_depth_reg.iga1_fifo_depth_select_reg.reg;</div><div class='add'>+		viafb_load_reg(reg_value, viafb_load_reg_num, reg, VIASR);</div><div class='add'>+</div><div class='add'>+		/* Set Display FIFO Threshold Select */</div><div class='add'>+		reg_value = IGA1_FIFO_THRESHOLD_FORMULA(iga1_fifo_threshold);</div><div class='add'>+		viafb_load_reg_num =</div><div class='add'>+		    fifo_threshold_select_reg.</div><div class='add'>+		    iga1_fifo_threshold_select_reg.reg_num;</div><div class='add'>+		reg =</div><div class='add'>+		    fifo_threshold_select_reg.</div><div class='add'>+		    iga1_fifo_threshold_select_reg.reg;</div><div class='add'>+		viafb_load_reg(reg_value, viafb_load_reg_num, reg, VIASR);</div><div class='add'>+</div><div class='add'>+		/* Set FIFO High Threshold Select */</div><div class='add'>+		reg_value =</div><div class='add'>+		    IGA1_FIFO_HIGH_THRESHOLD_FORMULA(iga1_fifo_high_threshold);</div><div class='add'>+		viafb_load_reg_num =</div><div class='add'>+		    fifo_high_threshold_select_reg.</div><div class='add'>+		    iga1_fifo_high_threshold_select_reg.reg_num;</div><div class='add'>+		reg =</div><div class='add'>+		    fifo_high_threshold_select_reg.</div><div class='add'>+		    iga1_fifo_high_threshold_select_reg.reg;</div><div class='add'>+		viafb_load_reg(reg_value, viafb_load_reg_num, reg, VIASR);</div><div class='add'>+</div><div class='add'>+		/* Set Display Queue Expire Num */</div><div class='add'>+		reg_value =</div><div class='add'>+		    IGA1_DISPLAY_QUEUE_EXPIRE_NUM_FORMULA</div><div class='add'>+		    (iga1_display_queue_expire_num);</div><div class='add'>+		viafb_load_reg_num =</div><div class='add'>+		    display_queue_expire_num_reg.</div><div class='add'>+		    iga1_display_queue_expire_num_reg.reg_num;</div><div class='add'>+		reg =</div><div class='add'>+		    display_queue_expire_num_reg.</div><div class='add'>+		    iga1_display_queue_expire_num_reg.reg;</div><div class='add'>+		viafb_load_reg(reg_value, viafb_load_reg_num, reg, VIASR);</div><div class='add'>+</div><div class='add'>+	} else {</div><div class='add'>+		if (viaparinfo-&gt;chip_info-&gt;gfx_chip_name == UNICHROME_K800) {</div><div class='add'>+			iga2_fifo_max_depth = K800_IGA2_FIFO_MAX_DEPTH;</div><div class='add'>+			iga2_fifo_threshold = K800_IGA2_FIFO_THRESHOLD;</div><div class='add'>+			iga2_fifo_high_threshold =</div><div class='add'>+			    K800_IGA2_FIFO_HIGH_THRESHOLD;</div><div class='add'>+</div><div class='add'>+			/* If resolution &gt; 1280x1024, expire length = 64,</div><div class='add'>+			   else  expire length = 128 */</div><div class='add'>+			if ((hor_active &gt; 1280) &amp;&amp; (ver_active &gt; 1024))</div><div class='add'>+				iga2_display_queue_expire_num = 16;</div><div class='add'>+			else</div><div class='add'>+				iga2_display_queue_expire_num =</div><div class='add'>+				    K800_IGA2_DISPLAY_QUEUE_EXPIRE_NUM;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (viaparinfo-&gt;chip_info-&gt;gfx_chip_name == UNICHROME_PM800) {</div><div class='add'>+			iga2_fifo_max_depth = P880_IGA2_FIFO_MAX_DEPTH;</div><div class='add'>+			iga2_fifo_threshold = P880_IGA2_FIFO_THRESHOLD;</div><div class='add'>+			iga2_fifo_high_threshold =</div><div class='add'>+			    P880_IGA2_FIFO_HIGH_THRESHOLD;</div><div class='add'>+</div><div class='add'>+			/* If resolution &gt; 1280x1024, expire length = 64,</div><div class='add'>+			   else  expire length = 128 */</div><div class='add'>+			if ((hor_active &gt; 1280) &amp;&amp; (ver_active &gt; 1024))</div><div class='add'>+				iga2_display_queue_expire_num = 16;</div><div class='add'>+			else</div><div class='add'>+				iga2_display_queue_expire_num =</div><div class='add'>+				    P880_IGA2_DISPLAY_QUEUE_EXPIRE_NUM;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (viaparinfo-&gt;chip_info-&gt;gfx_chip_name == UNICHROME_CN700) {</div><div class='add'>+			iga2_fifo_max_depth = CN700_IGA2_FIFO_MAX_DEPTH;</div><div class='add'>+			iga2_fifo_threshold = CN700_IGA2_FIFO_THRESHOLD;</div><div class='add'>+			iga2_fifo_high_threshold =</div><div class='add'>+			    CN700_IGA2_FIFO_HIGH_THRESHOLD;</div><div class='add'>+</div><div class='add'>+			/* If resolution &gt; 1280x1024, expire length = 64,</div><div class='add'>+			   else expire length = 128 */</div><div class='add'>+			if ((hor_active &gt; 1280) &amp;&amp; (ver_active &gt; 1024))</div><div class='add'>+				iga2_display_queue_expire_num = 16;</div><div class='add'>+			else</div><div class='add'>+				iga2_display_queue_expire_num =</div><div class='add'>+				    CN700_IGA2_DISPLAY_QUEUE_EXPIRE_NUM;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (viaparinfo-&gt;chip_info-&gt;gfx_chip_name == UNICHROME_CX700) {</div><div class='add'>+			iga2_fifo_max_depth = CX700_IGA2_FIFO_MAX_DEPTH;</div><div class='add'>+			iga2_fifo_threshold = CX700_IGA2_FIFO_THRESHOLD;</div><div class='add'>+			iga2_fifo_high_threshold =</div><div class='add'>+			    CX700_IGA2_FIFO_HIGH_THRESHOLD;</div><div class='add'>+			iga2_display_queue_expire_num =</div><div class='add'>+			    CX700_IGA2_DISPLAY_QUEUE_EXPIRE_NUM;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (viaparinfo-&gt;chip_info-&gt;gfx_chip_name == UNICHROME_K8M890) {</div><div class='add'>+			iga2_fifo_max_depth = K8M890_IGA2_FIFO_MAX_DEPTH;</div><div class='add'>+			iga2_fifo_threshold = K8M890_IGA2_FIFO_THRESHOLD;</div><div class='add'>+			iga2_fifo_high_threshold =</div><div class='add'>+			    K8M890_IGA2_FIFO_HIGH_THRESHOLD;</div><div class='add'>+			iga2_display_queue_expire_num =</div><div class='add'>+			    K8M890_IGA2_DISPLAY_QUEUE_EXPIRE_NUM;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (viaparinfo-&gt;chip_info-&gt;gfx_chip_name == UNICHROME_P4M890) {</div><div class='add'>+			iga2_fifo_max_depth = P4M890_IGA2_FIFO_MAX_DEPTH;</div><div class='add'>+			iga2_fifo_threshold = P4M890_IGA2_FIFO_THRESHOLD;</div><div class='add'>+			iga2_fifo_high_threshold =</div><div class='add'>+			    P4M890_IGA2_FIFO_HIGH_THRESHOLD;</div><div class='add'>+			iga2_display_queue_expire_num =</div><div class='add'>+			    P4M890_IGA2_DISPLAY_QUEUE_EXPIRE_NUM;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (viaparinfo-&gt;chip_info-&gt;gfx_chip_name == UNICHROME_P4M900) {</div><div class='add'>+			iga2_fifo_max_depth = P4M900_IGA2_FIFO_MAX_DEPTH;</div><div class='add'>+			iga2_fifo_threshold = P4M900_IGA2_FIFO_THRESHOLD;</div><div class='add'>+			iga2_fifo_high_threshold =</div><div class='add'>+			    P4M900_IGA2_FIFO_HIGH_THRESHOLD;</div><div class='add'>+			iga2_display_queue_expire_num =</div><div class='add'>+			    P4M900_IGA2_DISPLAY_QUEUE_EXPIRE_NUM;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (viaparinfo-&gt;chip_info-&gt;gfx_chip_name == UNICHROME_VX800) {</div><div class='add'>+			iga2_fifo_max_depth = VX800_IGA2_FIFO_MAX_DEPTH;</div><div class='add'>+			iga2_fifo_threshold = VX800_IGA2_FIFO_THRESHOLD;</div><div class='add'>+			iga2_fifo_high_threshold =</div><div class='add'>+			    VX800_IGA2_FIFO_HIGH_THRESHOLD;</div><div class='add'>+			iga2_display_queue_expire_num =</div><div class='add'>+			    VX800_IGA2_DISPLAY_QUEUE_EXPIRE_NUM;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (viaparinfo-&gt;chip_info-&gt;gfx_chip_name == UNICHROME_K800) {</div><div class='add'>+			/* Set Display FIFO Depath Select */</div><div class='add'>+			reg_value =</div><div class='add'>+			    IGA2_FIFO_DEPTH_SELECT_FORMULA(iga2_fifo_max_depth)</div><div class='add'>+			    - 1;</div><div class='add'>+			/* Patch LCD in IGA2 case */</div><div class='add'>+			viafb_load_reg_num =</div><div class='add'>+			    display_fifo_depth_reg.</div><div class='add'>+			    iga2_fifo_depth_select_reg.reg_num;</div><div class='add'>+			reg =</div><div class='add'>+			    display_fifo_depth_reg.</div><div class='add'>+			    iga2_fifo_depth_select_reg.reg;</div><div class='add'>+			viafb_load_reg(reg_value,</div><div class='add'>+				viafb_load_reg_num, reg, VIACR);</div><div class='add'>+		} else {</div><div class='add'>+</div><div class='add'>+			/* Set Display FIFO Depath Select */</div><div class='add'>+			reg_value =</div><div class='add'>+			    IGA2_FIFO_DEPTH_SELECT_FORMULA(iga2_fifo_max_depth);</div><div class='add'>+			viafb_load_reg_num =</div><div class='add'>+			    display_fifo_depth_reg.</div><div class='add'>+			    iga2_fifo_depth_select_reg.reg_num;</div><div class='add'>+			reg =</div><div class='add'>+			    display_fifo_depth_reg.</div><div class='add'>+			    iga2_fifo_depth_select_reg.reg;</div><div class='add'>+			viafb_load_reg(reg_value,</div><div class='add'>+				viafb_load_reg_num, reg, VIACR);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Set Display FIFO Threshold Select */</div><div class='add'>+		reg_value = IGA2_FIFO_THRESHOLD_FORMULA(iga2_fifo_threshold);</div><div class='add'>+		viafb_load_reg_num =</div><div class='add'>+		    fifo_threshold_select_reg.</div><div class='add'>+		    iga2_fifo_threshold_select_reg.reg_num;</div><div class='add'>+		reg =</div><div class='add'>+		    fifo_threshold_select_reg.</div><div class='add'>+		    iga2_fifo_threshold_select_reg.reg;</div><div class='add'>+		viafb_load_reg(reg_value, viafb_load_reg_num, reg, VIACR);</div><div class='add'>+</div><div class='add'>+		/* Set FIFO High Threshold Select */</div><div class='add'>+		reg_value =</div><div class='add'>+		    IGA2_FIFO_HIGH_THRESHOLD_FORMULA(iga2_fifo_high_threshold);</div><div class='add'>+		viafb_load_reg_num =</div><div class='add'>+		    fifo_high_threshold_select_reg.</div><div class='add'>+		    iga2_fifo_high_threshold_select_reg.reg_num;</div><div class='add'>+		reg =</div><div class='add'>+		    fifo_high_threshold_select_reg.</div><div class='add'>+		    iga2_fifo_high_threshold_select_reg.reg;</div><div class='add'>+		viafb_load_reg(reg_value, viafb_load_reg_num, reg, VIACR);</div><div class='add'>+</div><div class='add'>+		/* Set Display Queue Expire Num */</div><div class='add'>+		reg_value =</div><div class='add'>+		    IGA2_DISPLAY_QUEUE_EXPIRE_NUM_FORMULA</div><div class='add'>+		    (iga2_display_queue_expire_num);</div><div class='add'>+		viafb_load_reg_num =</div><div class='add'>+		    display_queue_expire_num_reg.</div><div class='add'>+		    iga2_display_queue_expire_num_reg.reg_num;</div><div class='add'>+		reg =</div><div class='add'>+		    display_queue_expire_num_reg.</div><div class='add'>+		    iga2_display_queue_expire_num_reg.reg;</div><div class='add'>+		viafb_load_reg(reg_value, viafb_load_reg_num, reg, VIACR);</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 viafb_get_clk_value(int clk)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; NUM_TOTAL_PLL_TABLE; i++) {</div><div class='add'>+		if (clk == pll_value[i].clk) {</div><div class='add'>+			switch (viaparinfo-&gt;chip_info-&gt;gfx_chip_name) {</div><div class='add'>+			case UNICHROME_CLE266:</div><div class='add'>+			case UNICHROME_K400:</div><div class='add'>+				return pll_value[i].cle266_pll;</div><div class='add'>+</div><div class='add'>+			case UNICHROME_K800:</div><div class='add'>+			case UNICHROME_PM800:</div><div class='add'>+			case UNICHROME_CN700:</div><div class='add'>+				return pll_value[i].k800_pll;</div><div class='add'>+</div><div class='add'>+			case UNICHROME_CX700:</div><div class='add'>+			case UNICHROME_K8M890:</div><div class='add'>+			case UNICHROME_P4M890:</div><div class='add'>+			case UNICHROME_P4M900:</div><div class='add'>+			case UNICHROME_VX800:</div><div class='add'>+				return pll_value[i].cx700_pll;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DEBUG_MSG(KERN_INFO "Can't find match PLL value\n\n");</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Set VCLK*/</div><div class='add'>+void viafb_set_vclock(u32 CLK, int set_iga)</div><div class='add'>+{</div><div class='add'>+	unsigned char RegTemp;</div><div class='add'>+</div><div class='add'>+	/* H.W. Reset : ON */</div><div class='add'>+	viafb_write_reg_mask(CR17, VIACR, 0x00, BIT7);</div><div class='add'>+</div><div class='add'>+	if ((set_iga == IGA1) || (set_iga == IGA1_IGA2)) {</div><div class='add'>+		/* Change D,N FOR VCLK */</div><div class='add'>+		switch (viaparinfo-&gt;chip_info-&gt;gfx_chip_name) {</div><div class='add'>+		case UNICHROME_CLE266:</div><div class='add'>+		case UNICHROME_K400:</div><div class='add'>+			viafb_write_reg(SR46, VIASR, CLK / 0x100);</div><div class='add'>+			viafb_write_reg(SR47, VIASR, CLK % 0x100);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case UNICHROME_K800:</div><div class='add'>+		case UNICHROME_PM800:</div><div class='add'>+		case UNICHROME_CN700:</div><div class='add'>+		case UNICHROME_CX700:</div><div class='add'>+		case UNICHROME_K8M890:</div><div class='add'>+		case UNICHROME_P4M890:</div><div class='add'>+		case UNICHROME_P4M900:</div><div class='add'>+		case UNICHROME_VX800:</div><div class='add'>+			viafb_write_reg(SR44, VIASR, CLK / 0x10000);</div><div class='add'>+			DEBUG_MSG(KERN_INFO "\nSR44=%x", CLK / 0x10000);</div><div class='add'>+			viafb_write_reg(SR45, VIASR, (CLK &amp; 0xFFFF) / 0x100);</div><div class='add'>+			DEBUG_MSG(KERN_INFO "\nSR45=%x",</div><div class='add'>+				  (CLK &amp; 0xFFFF) / 0x100);</div><div class='add'>+			viafb_write_reg(SR46, VIASR, CLK % 0x100);</div><div class='add'>+			DEBUG_MSG(KERN_INFO "\nSR46=%x", CLK % 0x100);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((set_iga == IGA2) || (set_iga == IGA1_IGA2)) {</div><div class='add'>+		/* Change D,N FOR LCK */</div><div class='add'>+		switch (viaparinfo-&gt;chip_info-&gt;gfx_chip_name) {</div><div class='add'>+		case UNICHROME_CLE266:</div><div class='add'>+		case UNICHROME_K400:</div><div class='add'>+			viafb_write_reg(SR44, VIASR, CLK / 0x100);</div><div class='add'>+			viafb_write_reg(SR45, VIASR, CLK % 0x100);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case UNICHROME_K800:</div><div class='add'>+		case UNICHROME_PM800:</div><div class='add'>+		case UNICHROME_CN700:</div><div class='add'>+		case UNICHROME_CX700:</div><div class='add'>+		case UNICHROME_K8M890:</div><div class='add'>+		case UNICHROME_P4M890:</div><div class='add'>+		case UNICHROME_P4M900:</div><div class='add'>+		case UNICHROME_VX800:</div><div class='add'>+			viafb_write_reg(SR4A, VIASR, CLK / 0x10000);</div><div class='add'>+			viafb_write_reg(SR4B, VIASR, (CLK &amp; 0xFFFF) / 0x100);</div><div class='add'>+			viafb_write_reg(SR4C, VIASR, CLK % 0x100);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* H.W. Reset : OFF */</div><div class='add'>+	viafb_write_reg_mask(CR17, VIACR, 0x80, BIT7);</div><div class='add'>+</div><div class='add'>+	/* Reset PLL */</div><div class='add'>+	if ((set_iga == IGA1) || (set_iga == IGA1_IGA2)) {</div><div class='add'>+		viafb_write_reg_mask(SR40, VIASR, 0x02, BIT1);</div><div class='add'>+		viafb_write_reg_mask(SR40, VIASR, 0x00, BIT1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((set_iga == IGA2) || (set_iga == IGA1_IGA2)) {</div><div class='add'>+		viafb_write_reg_mask(SR40, VIASR, 0x01, BIT0);</div><div class='add'>+		viafb_write_reg_mask(SR40, VIASR, 0x00, BIT0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Fire! */</div><div class='add'>+	RegTemp = inb(VIARMisc);</div><div class='add'>+	outb(RegTemp | (BIT2 + BIT3), VIAWMisc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void viafb_load_crtc_timing(struct display_timing device_timing,</div><div class='add'>+	int set_iga)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	int viafb_load_reg_num = 0;</div><div class='add'>+	int reg_value = 0;</div><div class='add'>+	struct io_register *reg = NULL;</div><div class='add'>+</div><div class='add'>+	viafb_unlock_crt();</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 12; i++) {</div><div class='add'>+		if (set_iga == IGA1) {</div><div class='add'>+			switch (i) {</div><div class='add'>+			case H_TOTAL_INDEX:</div><div class='add'>+				reg_value =</div><div class='add'>+				    IGA1_HOR_TOTAL_FORMULA(device_timing.</div><div class='add'>+							   hor_total);</div><div class='add'>+				viafb_load_reg_num =</div><div class='add'>+					iga1_crtc_reg.hor_total.reg_num;</div><div class='add'>+				reg = iga1_crtc_reg.hor_total.reg;</div><div class='add'>+				break;</div><div class='add'>+			case H_ADDR_INDEX:</div><div class='add'>+				reg_value =</div><div class='add'>+				    IGA1_HOR_ADDR_FORMULA(device_timing.</div><div class='add'>+							  hor_addr);</div><div class='add'>+				viafb_load_reg_num =</div><div class='add'>+					iga1_crtc_reg.hor_addr.reg_num;</div><div class='add'>+				reg = iga1_crtc_reg.hor_addr.reg;</div><div class='add'>+				break;</div><div class='add'>+			case H_BLANK_START_INDEX:</div><div class='add'>+				reg_value =</div><div class='add'>+				    IGA1_HOR_BLANK_START_FORMULA</div><div class='add'>+				    (device_timing.hor_blank_start);</div><div class='add'>+				viafb_load_reg_num =</div><div class='add'>+				    iga1_crtc_reg.hor_blank_start.reg_num;</div><div class='add'>+				reg = iga1_crtc_reg.hor_blank_start.reg;</div><div class='add'>+				break;</div><div class='add'>+			case H_BLANK_END_INDEX:</div><div class='add'>+				reg_value =</div><div class='add'>+				    IGA1_HOR_BLANK_END_FORMULA</div><div class='add'>+				    (device_timing.hor_blank_start,</div><div class='add'>+				     device_timing.hor_blank_end);</div><div class='add'>+				viafb_load_reg_num =</div><div class='add'>+				    iga1_crtc_reg.hor_blank_end.reg_num;</div><div class='add'>+				reg = iga1_crtc_reg.hor_blank_end.reg;</div><div class='add'>+				break;</div><div class='add'>+			case H_SYNC_START_INDEX:</div><div class='add'>+				reg_value =</div><div class='add'>+				    IGA1_HOR_SYNC_START_FORMULA</div><div class='add'>+				    (device_timing.hor_sync_start);</div><div class='add'>+				viafb_load_reg_num =</div><div class='add'>+				    iga1_crtc_reg.hor_sync_start.reg_num;</div><div class='add'>+				reg = iga1_crtc_reg.hor_sync_start.reg;</div><div class='add'>+				break;</div><div class='add'>+			case H_SYNC_END_INDEX:</div><div class='add'>+				reg_value =</div><div class='add'>+				    IGA1_HOR_SYNC_END_FORMULA</div><div class='add'>+				    (device_timing.hor_sync_start,</div><div class='add'>+				     device_timing.hor_sync_end);</div><div class='add'>+				viafb_load_reg_num =</div><div class='add'>+				    iga1_crtc_reg.hor_sync_end.reg_num;</div><div class='add'>+				reg = iga1_crtc_reg.hor_sync_end.reg;</div><div class='add'>+				break;</div><div class='add'>+			case V_TOTAL_INDEX:</div><div class='add'>+				reg_value =</div><div class='add'>+				    IGA1_VER_TOTAL_FORMULA(device_timing.</div><div class='add'>+							   ver_total);</div><div class='add'>+				viafb_load_reg_num =</div><div class='add'>+					iga1_crtc_reg.ver_total.reg_num;</div><div class='add'>+				reg = iga1_crtc_reg.ver_total.reg;</div><div class='add'>+				break;</div><div class='add'>+			case V_ADDR_INDEX:</div><div class='add'>+				reg_value =</div><div class='add'>+				    IGA1_VER_ADDR_FORMULA(device_timing.</div><div class='add'>+							  ver_addr);</div><div class='add'>+				viafb_load_reg_num =</div><div class='add'>+					iga1_crtc_reg.ver_addr.reg_num;</div><div class='add'>+				reg = iga1_crtc_reg.ver_addr.reg;</div><div class='add'>+				break;</div><div class='add'>+			case V_BLANK_START_INDEX:</div><div class='add'>+				reg_value =</div><div class='add'>+				    IGA1_VER_BLANK_START_FORMULA</div><div class='add'>+				    (device_timing.ver_blank_start);</div><div class='add'>+				viafb_load_reg_num =</div><div class='add'>+				    iga1_crtc_reg.ver_blank_start.reg_num;</div><div class='add'>+				reg = iga1_crtc_reg.ver_blank_start.reg;</div><div class='add'>+				break;</div><div class='add'>+			case V_BLANK_END_INDEX:</div><div class='add'>+				reg_value =</div><div class='add'>+				    IGA1_VER_BLANK_END_FORMULA</div><div class='add'>+				    (device_timing.ver_blank_start,</div><div class='add'>+				     device_timing.ver_blank_end);</div><div class='add'>+				viafb_load_reg_num =</div><div class='add'>+				    iga1_crtc_reg.ver_blank_end.reg_num;</div><div class='add'>+				reg = iga1_crtc_reg.ver_blank_end.reg;</div><div class='add'>+				break;</div><div class='add'>+			case V_SYNC_START_INDEX:</div><div class='add'>+				reg_value =</div><div class='add'>+				    IGA1_VER_SYNC_START_FORMULA</div><div class='add'>+				    (device_timing.ver_sync_start);</div><div class='add'>+				viafb_load_reg_num =</div><div class='add'>+				    iga1_crtc_reg.ver_sync_start.reg_num;</div><div class='add'>+				reg = iga1_crtc_reg.ver_sync_start.reg;</div><div class='add'>+				break;</div><div class='add'>+			case V_SYNC_END_INDEX:</div><div class='add'>+				reg_value =</div><div class='add'>+				    IGA1_VER_SYNC_END_FORMULA</div><div class='add'>+				    (device_timing.ver_sync_start,</div><div class='add'>+				     device_timing.ver_sync_end);</div><div class='add'>+				viafb_load_reg_num =</div><div class='add'>+				    iga1_crtc_reg.ver_sync_end.reg_num;</div><div class='add'>+				reg = iga1_crtc_reg.ver_sync_end.reg;</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (set_iga == IGA2) {</div><div class='add'>+			switch (i) {</div><div class='add'>+			case H_TOTAL_INDEX:</div><div class='add'>+				reg_value =</div><div class='add'>+				    IGA2_HOR_TOTAL_FORMULA(device_timing.</div><div class='add'>+							   hor_total);</div><div class='add'>+				viafb_load_reg_num =</div><div class='add'>+					iga2_crtc_reg.hor_total.reg_num;</div><div class='add'>+				reg = iga2_crtc_reg.hor_total.reg;</div><div class='add'>+				break;</div><div class='add'>+			case H_ADDR_INDEX:</div><div class='add'>+				reg_value =</div><div class='add'>+				    IGA2_HOR_ADDR_FORMULA(device_timing.</div><div class='add'>+							  hor_addr);</div><div class='add'>+				viafb_load_reg_num =</div><div class='add'>+					iga2_crtc_reg.hor_addr.reg_num;</div><div class='add'>+				reg = iga2_crtc_reg.hor_addr.reg;</div><div class='add'>+				break;</div><div class='add'>+			case H_BLANK_START_INDEX:</div><div class='add'>+				reg_value =</div><div class='add'>+				    IGA2_HOR_BLANK_START_FORMULA</div><div class='add'>+				    (device_timing.hor_blank_start);</div><div class='add'>+				viafb_load_reg_num =</div><div class='add'>+				    iga2_crtc_reg.hor_blank_start.reg_num;</div><div class='add'>+				reg = iga2_crtc_reg.hor_blank_start.reg;</div><div class='add'>+				break;</div><div class='add'>+			case H_BLANK_END_INDEX:</div><div class='add'>+				reg_value =</div><div class='add'>+				    IGA2_HOR_BLANK_END_FORMULA</div><div class='add'>+				    (device_timing.hor_blank_start,</div><div class='add'>+				     device_timing.hor_blank_end);</div><div class='add'>+				viafb_load_reg_num =</div><div class='add'>+				    iga2_crtc_reg.hor_blank_end.reg_num;</div><div class='add'>+				reg = iga2_crtc_reg.hor_blank_end.reg;</div><div class='add'>+				break;</div><div class='add'>+			case H_SYNC_START_INDEX:</div><div class='add'>+				reg_value =</div><div class='add'>+				    IGA2_HOR_SYNC_START_FORMULA</div><div class='add'>+				    (device_timing.hor_sync_start);</div><div class='add'>+				if (UNICHROME_CN700 &lt;=</div><div class='add'>+					viaparinfo-&gt;chip_info-&gt;gfx_chip_name)</div><div class='add'>+					viafb_load_reg_num =</div><div class='add'>+					    iga2_crtc_reg.hor_sync_start.</div><div class='add'>+					    reg_num;</div><div class='add'>+				else</div><div class='add'>+					viafb_load_reg_num = 3;</div><div class='add'>+				reg = iga2_crtc_reg.hor_sync_start.reg;</div><div class='add'>+				break;</div><div class='add'>+			case H_SYNC_END_INDEX:</div><div class='add'>+				reg_value =</div><div class='add'>+				    IGA2_HOR_SYNC_END_FORMULA</div><div class='add'>+				    (device_timing.hor_sync_start,</div><div class='add'>+				     device_timing.hor_sync_end);</div><div class='add'>+				viafb_load_reg_num =</div><div class='add'>+				    iga2_crtc_reg.hor_sync_end.reg_num;</div><div class='add'>+				reg = iga2_crtc_reg.hor_sync_end.reg;</div><div class='add'>+				break;</div><div class='add'>+			case V_TOTAL_INDEX:</div><div class='add'>+				reg_value =</div><div class='add'>+				    IGA2_VER_TOTAL_FORMULA(device_timing.</div><div class='add'>+							   ver_total);</div><div class='add'>+				viafb_load_reg_num =</div><div class='add'>+					iga2_crtc_reg.ver_total.reg_num;</div><div class='add'>+				reg = iga2_crtc_reg.ver_total.reg;</div><div class='add'>+				break;</div><div class='add'>+			case V_ADDR_INDEX:</div><div class='add'>+				reg_value =</div><div class='add'>+				    IGA2_VER_ADDR_FORMULA(device_timing.</div><div class='add'>+							  ver_addr);</div><div class='add'>+				viafb_load_reg_num =</div><div class='add'>+					iga2_crtc_reg.ver_addr.reg_num;</div><div class='add'>+				reg = iga2_crtc_reg.ver_addr.reg;</div><div class='add'>+				break;</div><div class='add'>+			case V_BLANK_START_INDEX:</div><div class='add'>+				reg_value =</div><div class='add'>+				    IGA2_VER_BLANK_START_FORMULA</div><div class='add'>+				    (device_timing.ver_blank_start);</div><div class='add'>+				viafb_load_reg_num =</div><div class='add'>+				    iga2_crtc_reg.ver_blank_start.reg_num;</div><div class='add'>+				reg = iga2_crtc_reg.ver_blank_start.reg;</div><div class='add'>+				break;</div><div class='add'>+			case V_BLANK_END_INDEX:</div><div class='add'>+				reg_value =</div><div class='add'>+				    IGA2_VER_BLANK_END_FORMULA</div><div class='add'>+				    (device_timing.ver_blank_start,</div><div class='add'>+				     device_timing.ver_blank_end);</div><div class='add'>+				viafb_load_reg_num =</div><div class='add'>+				    iga2_crtc_reg.ver_blank_end.reg_num;</div><div class='add'>+				reg = iga2_crtc_reg.ver_blank_end.reg;</div><div class='add'>+				break;</div><div class='add'>+			case V_SYNC_START_INDEX:</div><div class='add'>+				reg_value =</div><div class='add'>+				    IGA2_VER_SYNC_START_FORMULA</div><div class='add'>+				    (device_timing.ver_sync_start);</div><div class='add'>+				viafb_load_reg_num =</div><div class='add'>+				    iga2_crtc_reg.ver_sync_start.reg_num;</div><div class='add'>+				reg = iga2_crtc_reg.ver_sync_start.reg;</div><div class='add'>+				break;</div><div class='add'>+			case V_SYNC_END_INDEX:</div><div class='add'>+				reg_value =</div><div class='add'>+				    IGA2_VER_SYNC_END_FORMULA</div><div class='add'>+				    (device_timing.ver_sync_start,</div><div class='add'>+				     device_timing.ver_sync_end);</div><div class='add'>+				viafb_load_reg_num =</div><div class='add'>+				    iga2_crtc_reg.ver_sync_end.reg_num;</div><div class='add'>+				reg = iga2_crtc_reg.ver_sync_end.reg;</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		viafb_load_reg(reg_value, viafb_load_reg_num, reg, VIACR);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	viafb_lock_crt();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void viafb_set_color_depth(int bpp_byte, int set_iga)</div><div class='add'>+{</div><div class='add'>+	if (set_iga == IGA1) {</div><div class='add'>+		switch (bpp_byte) {</div><div class='add'>+		case MODE_8BPP:</div><div class='add'>+			viafb_write_reg_mask(SR15, VIASR, 0x22, 0x7E);</div><div class='add'>+			break;</div><div class='add'>+		case MODE_16BPP:</div><div class='add'>+			viafb_write_reg_mask(SR15, VIASR, 0xB6, 0xFE);</div><div class='add'>+			break;</div><div class='add'>+		case MODE_32BPP:</div><div class='add'>+			viafb_write_reg_mask(SR15, VIASR, 0xAE, 0xFE);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		switch (bpp_byte) {</div><div class='add'>+		case MODE_8BPP:</div><div class='add'>+			viafb_write_reg_mask(CR67, VIACR, 0x00, BIT6 + BIT7);</div><div class='add'>+			break;</div><div class='add'>+		case MODE_16BPP:</div><div class='add'>+			viafb_write_reg_mask(CR67, VIACR, 0x40, BIT6 + BIT7);</div><div class='add'>+			break;</div><div class='add'>+		case MODE_32BPP:</div><div class='add'>+			viafb_write_reg_mask(CR67, VIACR, 0xC0, BIT6 + BIT7);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void viafb_fill_crtc_timing(struct crt_mode_table *crt_table,</div><div class='add'>+	int mode_index, int bpp_byte, int set_iga)</div><div class='add'>+{</div><div class='add'>+	struct VideoModeTable *video_mode;</div><div class='add'>+	struct display_timing crt_reg;</div><div class='add'>+	int i;</div><div class='add'>+	int index = 0;</div><div class='add'>+	int h_addr, v_addr;</div><div class='add'>+	u32 pll_D_N;</div><div class='add'>+</div><div class='add'>+	video_mode = &amp;CLE266Modes[search_mode_setting(mode_index)];</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; video_mode-&gt;mode_array; i++) {</div><div class='add'>+		index = i;</div><div class='add'>+</div><div class='add'>+		if (crt_table[i].refresh_rate == viaparinfo-&gt;</div><div class='add'>+			crt_setting_info-&gt;refresh_rate)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	crt_reg = crt_table[index].crtc;</div><div class='add'>+</div><div class='add'>+	/* Mode 640x480 has border, but LCD/DFP didn't have border. */</div><div class='add'>+	/* So we would delete border. */</div><div class='add'>+	if ((viafb_LCD_ON | viafb_DVI_ON) &amp;&amp; (mode_index == VIA_RES_640X480)</div><div class='add'>+	    &amp;&amp; (viaparinfo-&gt;crt_setting_info-&gt;refresh_rate == 60)) {</div><div class='add'>+		/* The border is 8 pixels. */</div><div class='add'>+		crt_reg.hor_blank_start = crt_reg.hor_blank_start - 8;</div><div class='add'>+</div><div class='add'>+		/* Blanking time should add left and right borders. */</div><div class='add'>+		crt_reg.hor_blank_end = crt_reg.hor_blank_end + 16;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	h_addr = crt_reg.hor_addr;</div><div class='add'>+	v_addr = crt_reg.ver_addr;</div><div class='add'>+</div><div class='add'>+	/* update polarity for CRT timing */</div><div class='add'>+	if (crt_table[index].h_sync_polarity == NEGATIVE) {</div><div class='add'>+		if (crt_table[index].v_sync_polarity == NEGATIVE)</div><div class='add'>+			outb((inb(VIARMisc) &amp; (~(BIT6 + BIT7))) |</div><div class='add'>+			     (BIT6 + BIT7), VIAWMisc);</div><div class='add'>+		else</div><div class='add'>+			outb((inb(VIARMisc) &amp; (~(BIT6 + BIT7))) | (BIT6),</div><div class='add'>+			     VIAWMisc);</div><div class='add'>+	} else {</div><div class='add'>+		if (crt_table[index].v_sync_polarity == NEGATIVE)</div><div class='add'>+			outb((inb(VIARMisc) &amp; (~(BIT6 + BIT7))) | (BIT7),</div><div class='add'>+			     VIAWMisc);</div><div class='add'>+		else</div><div class='add'>+			outb((inb(VIARMisc) &amp; (~(BIT6 + BIT7))), VIAWMisc);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (set_iga == IGA1) {</div><div class='add'>+		viafb_unlock_crt();</div><div class='add'>+		viafb_write_reg(CR09, VIACR, 0x00);	/*initial CR09=0 */</div><div class='add'>+		viafb_write_reg_mask(CR11, VIACR, 0x00, BIT4 + BIT5 + BIT6);</div><div class='add'>+		viafb_write_reg_mask(CR17, VIACR, 0x00, BIT7);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (set_iga) {</div><div class='add'>+	case IGA1:</div><div class='add'>+		viafb_load_crtc_timing(crt_reg, IGA1);</div><div class='add'>+		break;</div><div class='add'>+	case IGA2:</div><div class='add'>+		viafb_load_crtc_timing(crt_reg, IGA2);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	load_fix_bit_crtc_reg();</div><div class='add'>+	viafb_lock_crt();</div><div class='add'>+	viafb_write_reg_mask(CR17, VIACR, 0x80, BIT7);</div><div class='add'>+	viafb_load_offset_reg(h_addr, bpp_byte, set_iga);</div><div class='add'>+	viafb_load_fetch_count_reg(h_addr, bpp_byte, set_iga);</div><div class='add'>+</div><div class='add'>+	/* load FIFO */</div><div class='add'>+	if ((viaparinfo-&gt;chip_info-&gt;gfx_chip_name != UNICHROME_CLE266)</div><div class='add'>+	    &amp;&amp; (viaparinfo-&gt;chip_info-&gt;gfx_chip_name != UNICHROME_K400))</div><div class='add'>+		viafb_load_FIFO_reg(set_iga, h_addr, v_addr);</div><div class='add'>+</div><div class='add'>+	/* load SR Register About Memory and Color part */</div><div class='add'>+	viafb_set_color_depth(bpp_byte, set_iga);</div><div class='add'>+</div><div class='add'>+	pll_D_N = viafb_get_clk_value(crt_table[index].clk);</div><div class='add'>+	DEBUG_MSG(KERN_INFO "PLL=%x", pll_D_N);</div><div class='add'>+	viafb_set_vclock(pll_D_N, set_iga);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void viafb_init_chip_info(void)</div><div class='add'>+{</div><div class='add'>+	init_gfx_chip_info();</div><div class='add'>+	init_tmds_chip_info();</div><div class='add'>+	init_lvds_chip_info();</div><div class='add'>+</div><div class='add'>+	viaparinfo-&gt;crt_setting_info-&gt;iga_path = IGA1;</div><div class='add'>+	viaparinfo-&gt;crt_setting_info-&gt;refresh_rate = viafb_refresh;</div><div class='add'>+</div><div class='add'>+	/*Set IGA path for each device */</div><div class='add'>+	viafb_set_iga_path();</div><div class='add'>+</div><div class='add'>+	viaparinfo-&gt;lvds_setting_info-&gt;display_method = viafb_lcd_dsp_method;</div><div class='add'>+	viaparinfo-&gt;lvds_setting_info-&gt;get_lcd_size_method =</div><div class='add'>+		GET_LCD_SIZE_BY_USER_SETTING;</div><div class='add'>+	viaparinfo-&gt;lvds_setting_info-&gt;lcd_mode = viafb_lcd_mode;</div><div class='add'>+	viaparinfo-&gt;lvds_setting_info2-&gt;display_method =</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;display_method;</div><div class='add'>+	viaparinfo-&gt;lvds_setting_info2-&gt;lcd_mode =</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_mode;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void viafb_update_device_setting(int hres, int vres,</div><div class='add'>+	int bpp, int vmode_refresh, int flag)</div><div class='add'>+{</div><div class='add'>+	if (flag == 0) {</div><div class='add'>+		viaparinfo-&gt;crt_setting_info-&gt;h_active = hres;</div><div class='add'>+		viaparinfo-&gt;crt_setting_info-&gt;v_active = vres;</div><div class='add'>+		viaparinfo-&gt;crt_setting_info-&gt;bpp = bpp;</div><div class='add'>+		viaparinfo-&gt;crt_setting_info-&gt;refresh_rate =</div><div class='add'>+			vmode_refresh;</div><div class='add'>+</div><div class='add'>+		viaparinfo-&gt;tmds_setting_info-&gt;h_active = hres;</div><div class='add'>+		viaparinfo-&gt;tmds_setting_info-&gt;v_active = vres;</div><div class='add'>+		viaparinfo-&gt;tmds_setting_info-&gt;bpp = bpp;</div><div class='add'>+		viaparinfo-&gt;tmds_setting_info-&gt;refresh_rate =</div><div class='add'>+			vmode_refresh;</div><div class='add'>+</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;h_active = hres;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;v_active = vres;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;bpp = bpp;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;refresh_rate =</div><div class='add'>+			vmode_refresh;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info2-&gt;h_active = hres;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info2-&gt;v_active = vres;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info2-&gt;bpp = bpp;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info2-&gt;refresh_rate =</div><div class='add'>+			vmode_refresh;</div><div class='add'>+	} else {</div><div class='add'>+</div><div class='add'>+		if (viaparinfo-&gt;tmds_setting_info-&gt;iga_path == IGA2) {</div><div class='add'>+			viaparinfo-&gt;tmds_setting_info-&gt;h_active = hres;</div><div class='add'>+			viaparinfo-&gt;tmds_setting_info-&gt;v_active = vres;</div><div class='add'>+			viaparinfo-&gt;tmds_setting_info-&gt;bpp = bpp;</div><div class='add'>+			viaparinfo-&gt;tmds_setting_info-&gt;refresh_rate =</div><div class='add'>+				vmode_refresh;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (viaparinfo-&gt;lvds_setting_info-&gt;iga_path == IGA2) {</div><div class='add'>+			viaparinfo-&gt;lvds_setting_info-&gt;h_active = hres;</div><div class='add'>+			viaparinfo-&gt;lvds_setting_info-&gt;v_active = vres;</div><div class='add'>+			viaparinfo-&gt;lvds_setting_info-&gt;bpp = bpp;</div><div class='add'>+			viaparinfo-&gt;lvds_setting_info-&gt;refresh_rate =</div><div class='add'>+				vmode_refresh;</div><div class='add'>+		}</div><div class='add'>+		if (IGA2 == viaparinfo-&gt;lvds_setting_info2-&gt;iga_path) {</div><div class='add'>+			viaparinfo-&gt;lvds_setting_info2-&gt;h_active = hres;</div><div class='add'>+			viaparinfo-&gt;lvds_setting_info2-&gt;v_active = vres;</div><div class='add'>+			viaparinfo-&gt;lvds_setting_info2-&gt;bpp = bpp;</div><div class='add'>+			viaparinfo-&gt;lvds_setting_info2-&gt;refresh_rate =</div><div class='add'>+				vmode_refresh;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void init_gfx_chip_info(void)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pdev = NULL;</div><div class='add'>+	u32 i;</div><div class='add'>+	u8 tmp;</div><div class='add'>+</div><div class='add'>+	/* Indentify GFX Chip Name */</div><div class='add'>+	for (i = 0; pciidlist[i].vendor != 0; i++) {</div><div class='add'>+		pdev = pci_get_device(pciidlist[i].vendor,</div><div class='add'>+			pciidlist[i].device, 0);</div><div class='add'>+		if (pdev)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!pciidlist[i].vendor)</div><div class='add'>+		return ;</div><div class='add'>+</div><div class='add'>+	viaparinfo-&gt;chip_info-&gt;gfx_chip_name = pciidlist[i].chip_index;</div><div class='add'>+</div><div class='add'>+	/* Check revision of CLE266 Chip */</div><div class='add'>+	if (viaparinfo-&gt;chip_info-&gt;gfx_chip_name == UNICHROME_CLE266) {</div><div class='add'>+		/* CR4F only define in CLE266.CX chip */</div><div class='add'>+		tmp = viafb_read_reg(VIACR, CR4F);</div><div class='add'>+		viafb_write_reg(CR4F, VIACR, 0x55);</div><div class='add'>+		if (viafb_read_reg(VIACR, CR4F) != 0x55)</div><div class='add'>+			viaparinfo-&gt;chip_info-&gt;gfx_chip_revision =</div><div class='add'>+			CLE266_REVISION_AX;</div><div class='add'>+		else</div><div class='add'>+			viaparinfo-&gt;chip_info-&gt;gfx_chip_revision =</div><div class='add'>+			CLE266_REVISION_CX;</div><div class='add'>+		/* restore orignal CR4F value */</div><div class='add'>+		viafb_write_reg(CR4F, VIACR, tmp);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (viaparinfo-&gt;chip_info-&gt;gfx_chip_name == UNICHROME_CX700) {</div><div class='add'>+		tmp = viafb_read_reg(VIASR, SR43);</div><div class='add'>+		DEBUG_MSG(KERN_INFO "SR43:%X\n", tmp);</div><div class='add'>+		if (tmp &amp; 0x02) {</div><div class='add'>+			viaparinfo-&gt;chip_info-&gt;gfx_chip_revision =</div><div class='add'>+				CX700_REVISION_700M2;</div><div class='add'>+		} else if (tmp &amp; 0x40) {</div><div class='add'>+			viaparinfo-&gt;chip_info-&gt;gfx_chip_revision =</div><div class='add'>+				CX700_REVISION_700M;</div><div class='add'>+		} else {</div><div class='add'>+			viaparinfo-&gt;chip_info-&gt;gfx_chip_revision =</div><div class='add'>+				CX700_REVISION_700;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pci_dev_put(pdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void init_tmds_chip_info(void)</div><div class='add'>+{</div><div class='add'>+	viafb_tmds_trasmitter_identify();</div><div class='add'>+</div><div class='add'>+	if (INTERFACE_NONE == viaparinfo-&gt;chip_info-&gt;tmds_chip_info.</div><div class='add'>+		output_interface) {</div><div class='add'>+		switch (viaparinfo-&gt;chip_info-&gt;gfx_chip_name) {</div><div class='add'>+		case UNICHROME_CX700:</div><div class='add'>+			{</div><div class='add'>+				/* we should check support by hardware layout.*/</div><div class='add'>+				if ((viafb_display_hardware_layout ==</div><div class='add'>+				     HW_LAYOUT_DVI_ONLY)</div><div class='add'>+				    || (viafb_display_hardware_layout ==</div><div class='add'>+					HW_LAYOUT_LCD_DVI)) {</div><div class='add'>+					viaparinfo-&gt;chip_info-&gt;tmds_chip_info.</div><div class='add'>+					    output_interface = INTERFACE_TMDS;</div><div class='add'>+				} else {</div><div class='add'>+					viaparinfo-&gt;chip_info-&gt;tmds_chip_info.</div><div class='add'>+						output_interface =</div><div class='add'>+						INTERFACE_NONE;</div><div class='add'>+				}</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		case UNICHROME_K8M890:</div><div class='add'>+		case UNICHROME_P4M900:</div><div class='add'>+		case UNICHROME_P4M890:</div><div class='add'>+			/* TMDS on PCIE, we set DFPLOW as default. */</div><div class='add'>+			viaparinfo-&gt;chip_info-&gt;tmds_chip_info.output_interface =</div><div class='add'>+			    INTERFACE_DFP_LOW;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			{</div><div class='add'>+				/* set DVP1 default for DVI */</div><div class='add'>+				viaparinfo-&gt;chip_info-&gt;tmds_chip_info</div><div class='add'>+				.output_interface = INTERFACE_DVP1;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DEBUG_MSG(KERN_INFO "TMDS Chip = %d\n",</div><div class='add'>+		  viaparinfo-&gt;chip_info-&gt;tmds_chip_info.tmds_chip_name);</div><div class='add'>+	viaparinfo-&gt;tmds_setting_info-&gt;get_dvi_size_method =</div><div class='add'>+		GET_DVI_SIZE_BY_VGA_BIOS;</div><div class='add'>+	viafb_init_dvi_size();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void init_lvds_chip_info(void)</div><div class='add'>+{</div><div class='add'>+	if (viafb_lcd_panel_id &gt; LCD_PANEL_ID_MAXIMUM)</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;get_lcd_size_method =</div><div class='add'>+		    GET_LCD_SIZE_BY_VGA_BIOS;</div><div class='add'>+	else</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;get_lcd_size_method =</div><div class='add'>+		    GET_LCD_SIZE_BY_USER_SETTING;</div><div class='add'>+</div><div class='add'>+	viafb_lvds_trasmitter_identify();</div><div class='add'>+	viafb_init_lcd_size();</div><div class='add'>+	viafb_init_lvds_output_interface(&amp;viaparinfo-&gt;chip_info-&gt;lvds_chip_info,</div><div class='add'>+				   viaparinfo-&gt;lvds_setting_info);</div><div class='add'>+	if (viaparinfo-&gt;chip_info-&gt;lvds_chip_info2.lvds_chip_name) {</div><div class='add'>+		viafb_init_lvds_output_interface(&amp;viaparinfo-&gt;chip_info-&gt;</div><div class='add'>+			lvds_chip_info2, viaparinfo-&gt;lvds_setting_info2);</div><div class='add'>+	}</div><div class='add'>+	/*If CX700,two singel LCD, we need to reassign</div><div class='add'>+	   LCD interface to different LVDS port */</div><div class='add'>+	if ((UNICHROME_CX700 == viaparinfo-&gt;chip_info-&gt;gfx_chip_name)</div><div class='add'>+	    &amp;&amp; (HW_LAYOUT_LCD1_LCD2 == viafb_display_hardware_layout)) {</div><div class='add'>+		if ((INTEGRATED_LVDS == viaparinfo-&gt;chip_info-&gt;lvds_chip_info.</div><div class='add'>+			lvds_chip_name) &amp;&amp; (INTEGRATED_LVDS ==</div><div class='add'>+			viaparinfo-&gt;chip_info-&gt;</div><div class='add'>+			lvds_chip_info2.lvds_chip_name)) {</div><div class='add'>+			viaparinfo-&gt;chip_info-&gt;lvds_chip_info.output_interface =</div><div class='add'>+				INTERFACE_LVDS0;</div><div class='add'>+			viaparinfo-&gt;chip_info-&gt;lvds_chip_info2.</div><div class='add'>+				output_interface =</div><div class='add'>+			    INTERFACE_LVDS1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DEBUG_MSG(KERN_INFO "LVDS Chip = %d\n",</div><div class='add'>+		  viaparinfo-&gt;chip_info-&gt;lvds_chip_info.lvds_chip_name);</div><div class='add'>+	DEBUG_MSG(KERN_INFO "LVDS1 output_interface = %d\n",</div><div class='add'>+		  viaparinfo-&gt;chip_info-&gt;lvds_chip_info.output_interface);</div><div class='add'>+	DEBUG_MSG(KERN_INFO "LVDS2 output_interface = %d\n",</div><div class='add'>+		  viaparinfo-&gt;chip_info-&gt;lvds_chip_info.output_interface);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void viafb_init_dac(int set_iga)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	u8 tmp;</div><div class='add'>+</div><div class='add'>+	if (set_iga == IGA1) {</div><div class='add'>+		/* access Primary Display's LUT */</div><div class='add'>+		viafb_write_reg_mask(SR1A, VIASR, 0x00, BIT0);</div><div class='add'>+		/* turn off LCK */</div><div class='add'>+		viafb_write_reg_mask(SR1B, VIASR, 0x00, BIT7 + BIT6);</div><div class='add'>+		for (i = 0; i &lt; 256; i++) {</div><div class='add'>+			write_dac_reg(i, palLUT_table[i].red,</div><div class='add'>+				      palLUT_table[i].green,</div><div class='add'>+				      palLUT_table[i].blue);</div><div class='add'>+		}</div><div class='add'>+		/* turn on LCK */</div><div class='add'>+		viafb_write_reg_mask(SR1B, VIASR, 0xC0, BIT7 + BIT6);</div><div class='add'>+	} else {</div><div class='add'>+		tmp = viafb_read_reg(VIACR, CR6A);</div><div class='add'>+		/* access Secondary Display's LUT */</div><div class='add'>+		viafb_write_reg_mask(CR6A, VIACR, 0x40, BIT6);</div><div class='add'>+		viafb_write_reg_mask(SR1A, VIASR, 0x01, BIT0);</div><div class='add'>+		for (i = 0; i &lt; 256; i++) {</div><div class='add'>+			write_dac_reg(i, palLUT_table[i].red,</div><div class='add'>+				      palLUT_table[i].green,</div><div class='add'>+				      palLUT_table[i].blue);</div><div class='add'>+		}</div><div class='add'>+		/* set IGA1 DAC for default */</div><div class='add'>+		viafb_write_reg_mask(SR1A, VIASR, 0x00, BIT0);</div><div class='add'>+		viafb_write_reg(CR6A, VIACR, tmp);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void device_screen_off(void)</div><div class='add'>+{</div><div class='add'>+	/* turn off CRT screen (IGA1) */</div><div class='add'>+	viafb_write_reg_mask(SR01, VIASR, 0x20, BIT5);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void device_screen_on(void)</div><div class='add'>+{</div><div class='add'>+	/* turn on CRT screen (IGA1) */</div><div class='add'>+	viafb_write_reg_mask(SR01, VIASR, 0x00, BIT5);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void set_display_channel(void)</div><div class='add'>+{</div><div class='add'>+	/*If viafb_LCD2_ON, on cx700, internal lvds's information</div><div class='add'>+	is keeped on lvds_setting_info2 */</div><div class='add'>+	if (viafb_LCD2_ON &amp;&amp;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info2-&gt;device_lcd_dualedge) {</div><div class='add'>+		/* For dual channel LCD: */</div><div class='add'>+		/* Set to Dual LVDS channel. */</div><div class='add'>+		viafb_write_reg_mask(CRD2, VIACR, 0x20, BIT4 + BIT5);</div><div class='add'>+	} else if (viafb_LCD_ON &amp;&amp; viafb_DVI_ON) {</div><div class='add'>+		/* For LCD+DFP: */</div><div class='add'>+		/* Set to LVDS1 + TMDS channel. */</div><div class='add'>+		viafb_write_reg_mask(CRD2, VIACR, 0x10, BIT4 + BIT5);</div><div class='add'>+	} else if (viafb_DVI_ON) {</div><div class='add'>+		/* Set to single TMDS channel. */</div><div class='add'>+		viafb_write_reg_mask(CRD2, VIACR, 0x30, BIT4 + BIT5);</div><div class='add'>+	} else if (viafb_LCD_ON) {</div><div class='add'>+		if (viaparinfo-&gt;lvds_setting_info-&gt;device_lcd_dualedge) {</div><div class='add'>+			/* For dual channel LCD: */</div><div class='add'>+			/* Set to Dual LVDS channel. */</div><div class='add'>+			viafb_write_reg_mask(CRD2, VIACR, 0x20, BIT4 + BIT5);</div><div class='add'>+		} else {</div><div class='add'>+			/* Set to LVDS0 + LVDS1 channel. */</div><div class='add'>+			viafb_write_reg_mask(CRD2, VIACR, 0x00, BIT4 + BIT5);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int viafb_setmode(int vmode_index, int hor_res, int ver_res, int video_bpp,</div><div class='add'>+	int vmode_index1, int hor_res1, int ver_res1, int video_bpp1)</div><div class='add'>+{</div><div class='add'>+	int i, j;</div><div class='add'>+	int port;</div><div class='add'>+	u8 value, index, mask;</div><div class='add'>+	struct VideoModeTable *vmode_tbl;</div><div class='add'>+	struct crt_mode_table *crt_timing;</div><div class='add'>+	struct VideoModeTable *vmode_tbl1 = NULL;</div><div class='add'>+	struct crt_mode_table *crt_timing1 = NULL;</div><div class='add'>+</div><div class='add'>+	DEBUG_MSG(KERN_INFO "Set Mode!!\n");</div><div class='add'>+	DEBUG_MSG(KERN_INFO</div><div class='add'>+		  "vmode_index=%d hor_res=%d ver_res=%d video_bpp=%d\n",</div><div class='add'>+		  vmode_index, hor_res, ver_res, video_bpp);</div><div class='add'>+</div><div class='add'>+	device_screen_off();</div><div class='add'>+	vmode_tbl = &amp;CLE266Modes[search_mode_setting(vmode_index)];</div><div class='add'>+	crt_timing = vmode_tbl-&gt;crtc;</div><div class='add'>+</div><div class='add'>+	if (viafb_SAMM_ON == 1) {</div><div class='add'>+		vmode_tbl1 = &amp;CLE266Modes[search_mode_setting(vmode_index1)];</div><div class='add'>+		crt_timing1 = vmode_tbl1-&gt;crtc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	inb(VIAStatus);</div><div class='add'>+	outb(0x00, VIAAR);</div><div class='add'>+</div><div class='add'>+	/* Write Common Setting for Video Mode */</div><div class='add'>+	switch (viaparinfo-&gt;chip_info-&gt;gfx_chip_name) {</div><div class='add'>+	case UNICHROME_CLE266:</div><div class='add'>+		viafb_write_regx(CLE266_ModeXregs, NUM_TOTAL_CLE266_ModeXregs);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case UNICHROME_K400:</div><div class='add'>+		viafb_write_regx(KM400_ModeXregs, NUM_TOTAL_KM400_ModeXregs);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case UNICHROME_K800:</div><div class='add'>+	case UNICHROME_PM800:</div><div class='add'>+		viafb_write_regx(CN400_ModeXregs, NUM_TOTAL_CN400_ModeXregs);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case UNICHROME_CN700:</div><div class='add'>+	case UNICHROME_K8M890:</div><div class='add'>+	case UNICHROME_P4M890:</div><div class='add'>+	case UNICHROME_P4M900:</div><div class='add'>+		viafb_write_regx(CN700_ModeXregs, NUM_TOTAL_CN700_ModeXregs);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case UNICHROME_CX700:</div><div class='add'>+		viafb_write_regx(CX700_ModeXregs, NUM_TOTAL_CX700_ModeXregs);</div><div class='add'>+</div><div class='add'>+	case UNICHROME_VX800:</div><div class='add'>+		viafb_write_regx(VX800_ModeXregs, NUM_TOTAL_VX800_ModeXregs);</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	device_off();</div><div class='add'>+</div><div class='add'>+	/* Fill VPIT Parameters */</div><div class='add'>+	/* Write Misc Register */</div><div class='add'>+	outb(VPIT.Misc, VIAWMisc);</div><div class='add'>+</div><div class='add'>+	/* Write Sequencer */</div><div class='add'>+	for (i = 1; i &lt;= StdSR; i++) {</div><div class='add'>+		outb(i, VIASR);</div><div class='add'>+		outb(VPIT.SR[i - 1], VIASR + 1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	viafb_set_start_addr();</div><div class='add'>+	viafb_set_iga_path();</div><div class='add'>+</div><div class='add'>+	/* Write CRTC */</div><div class='add'>+	viafb_fill_crtc_timing(crt_timing, vmode_index, video_bpp / 8, IGA1);</div><div class='add'>+</div><div class='add'>+	/* Write Graphic Controller */</div><div class='add'>+	for (i = 0; i &lt; StdGR; i++) {</div><div class='add'>+		outb(i, VIAGR);</div><div class='add'>+		outb(VPIT.GR[i], VIAGR + 1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Write Attribute Controller */</div><div class='add'>+	for (i = 0; i &lt; StdAR; i++) {</div><div class='add'>+		inb(VIAStatus);</div><div class='add'>+		outb(i, VIAAR);</div><div class='add'>+		outb(VPIT.AR[i], VIAAR);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	inb(VIAStatus);</div><div class='add'>+	outb(0x20, VIAAR);</div><div class='add'>+</div><div class='add'>+	/* Update Patch Register */</div><div class='add'>+</div><div class='add'>+	if ((viaparinfo-&gt;chip_info-&gt;gfx_chip_name == UNICHROME_CLE266)</div><div class='add'>+	    || (viaparinfo-&gt;chip_info-&gt;gfx_chip_name == UNICHROME_K400)) {</div><div class='add'>+		for (i = 0; i &lt; NUM_TOTAL_PATCH_MODE; i++) {</div><div class='add'>+			if (res_patch_table[i].mode_index == vmode_index) {</div><div class='add'>+				for (j = 0;</div><div class='add'>+				     j &lt; res_patch_table[i].table_length; j++) {</div><div class='add'>+					index =</div><div class='add'>+					    res_patch_table[i].</div><div class='add'>+					    io_reg_table[j].index;</div><div class='add'>+					port =</div><div class='add'>+					    res_patch_table[i].</div><div class='add'>+					    io_reg_table[j].port;</div><div class='add'>+					value =</div><div class='add'>+					    res_patch_table[i].</div><div class='add'>+					    io_reg_table[j].value;</div><div class='add'>+					mask =</div><div class='add'>+					    res_patch_table[i].</div><div class='add'>+					    io_reg_table[j].mask;</div><div class='add'>+					viafb_write_reg_mask(index, port, value,</div><div class='add'>+						       mask);</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (viafb_SAMM_ON == 1) {</div><div class='add'>+		if ((viaparinfo-&gt;chip_info-&gt;gfx_chip_name == UNICHROME_CLE266)</div><div class='add'>+		    || (viaparinfo-&gt;chip_info-&gt;gfx_chip_name ==</div><div class='add'>+		    UNICHROME_K400)) {</div><div class='add'>+			for (i = 0; i &lt; NUM_TOTAL_PATCH_MODE; i++) {</div><div class='add'>+				if (res_patch_table[i].mode_index ==</div><div class='add'>+				    vmode_index1) {</div><div class='add'>+					for (j = 0;</div><div class='add'>+					     j &lt;</div><div class='add'>+					     res_patch_table[i].</div><div class='add'>+					     table_length; j++) {</div><div class='add'>+						index =</div><div class='add'>+						    res_patch_table[i].</div><div class='add'>+						    io_reg_table[j].index;</div><div class='add'>+						port =</div><div class='add'>+						    res_patch_table[i].</div><div class='add'>+						    io_reg_table[j].port;</div><div class='add'>+						value =</div><div class='add'>+						    res_patch_table[i].</div><div class='add'>+						    io_reg_table[j].value;</div><div class='add'>+						mask =</div><div class='add'>+						    res_patch_table[i].</div><div class='add'>+						    io_reg_table[j].mask;</div><div class='add'>+						viafb_write_reg_mask(index,</div><div class='add'>+							port, value, mask);</div><div class='add'>+					}</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Update Refresh Rate Setting */</div><div class='add'>+</div><div class='add'>+	/* Clear On Screen */</div><div class='add'>+</div><div class='add'>+	/* CRT set mode */</div><div class='add'>+	if (viafb_CRT_ON) {</div><div class='add'>+		if (viafb_SAMM_ON &amp;&amp; (viaparinfo-&gt;crt_setting_info-&gt;iga_path ==</div><div class='add'>+			IGA2)) {</div><div class='add'>+			viafb_fill_crtc_timing(crt_timing1, vmode_index1,</div><div class='add'>+				video_bpp1 / 8,</div><div class='add'>+				viaparinfo-&gt;crt_setting_info-&gt;iga_path);</div><div class='add'>+		} else {</div><div class='add'>+			viafb_fill_crtc_timing(crt_timing, vmode_index,</div><div class='add'>+				video_bpp / 8,</div><div class='add'>+				viaparinfo-&gt;crt_setting_info-&gt;iga_path);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		set_crt_output_path(viaparinfo-&gt;crt_setting_info-&gt;iga_path);</div><div class='add'>+</div><div class='add'>+		/* Patch if set_hres is not 8 alignment (1366) to viafb_setmode</div><div class='add'>+		to 8 alignment (1368),there is several pixels (2 pixels)</div><div class='add'>+		on right side of screen. */</div><div class='add'>+		if (hor_res % 8) {</div><div class='add'>+			viafb_unlock_crt();</div><div class='add'>+			viafb_write_reg(CR02, VIACR,</div><div class='add'>+				viafb_read_reg(VIACR, CR02) - 1);</div><div class='add'>+			viafb_lock_crt();</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (viafb_DVI_ON) {</div><div class='add'>+		if (viafb_SAMM_ON &amp;&amp;</div><div class='add'>+			(viaparinfo-&gt;tmds_setting_info-&gt;iga_path == IGA2)) {</div><div class='add'>+			viafb_dvi_set_mode(viafb_get_mode_index</div><div class='add'>+				     (viaparinfo-&gt;tmds_setting_info-&gt;h_active,</div><div class='add'>+				      viaparinfo-&gt;tmds_setting_info-&gt;</div><div class='add'>+				      v_active, 1),</div><div class='add'>+				     video_bpp1, viaparinfo-&gt;</div><div class='add'>+				     tmds_setting_info-&gt;iga_path);</div><div class='add'>+		} else {</div><div class='add'>+			viafb_dvi_set_mode(viafb_get_mode_index</div><div class='add'>+				     (viaparinfo-&gt;tmds_setting_info-&gt;h_active,</div><div class='add'>+				      viaparinfo-&gt;</div><div class='add'>+				      tmds_setting_info-&gt;v_active, 0),</div><div class='add'>+				     video_bpp, viaparinfo-&gt;</div><div class='add'>+				     tmds_setting_info-&gt;iga_path);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (viafb_LCD_ON) {</div><div class='add'>+		if (viafb_SAMM_ON &amp;&amp;</div><div class='add'>+			(viaparinfo-&gt;lvds_setting_info-&gt;iga_path == IGA2)) {</div><div class='add'>+			viaparinfo-&gt;lvds_setting_info-&gt;bpp = video_bpp1;</div><div class='add'>+			viafb_lcd_set_mode(crt_timing1, viaparinfo-&gt;</div><div class='add'>+				lvds_setting_info,</div><div class='add'>+				     &amp;viaparinfo-&gt;chip_info-&gt;lvds_chip_info);</div><div class='add'>+		} else {</div><div class='add'>+			/* IGA1 doesn't have LCD scaling, so set it center. */</div><div class='add'>+			if (viaparinfo-&gt;lvds_setting_info-&gt;iga_path == IGA1) {</div><div class='add'>+				viaparinfo-&gt;lvds_setting_info-&gt;display_method =</div><div class='add'>+				    LCD_CENTERING;</div><div class='add'>+			}</div><div class='add'>+			viaparinfo-&gt;lvds_setting_info-&gt;bpp = video_bpp;</div><div class='add'>+			viafb_lcd_set_mode(crt_timing, viaparinfo-&gt;</div><div class='add'>+				lvds_setting_info,</div><div class='add'>+				     &amp;viaparinfo-&gt;chip_info-&gt;lvds_chip_info);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (viafb_LCD2_ON) {</div><div class='add'>+		if (viafb_SAMM_ON &amp;&amp;</div><div class='add'>+			(viaparinfo-&gt;lvds_setting_info2-&gt;iga_path == IGA2)) {</div><div class='add'>+			viaparinfo-&gt;lvds_setting_info2-&gt;bpp = video_bpp1;</div><div class='add'>+			viafb_lcd_set_mode(crt_timing1, viaparinfo-&gt;</div><div class='add'>+				lvds_setting_info2,</div><div class='add'>+				     &amp;viaparinfo-&gt;chip_info-&gt;lvds_chip_info2);</div><div class='add'>+		} else {</div><div class='add'>+			/* IGA1 doesn't have LCD scaling, so set it center. */</div><div class='add'>+			if (viaparinfo-&gt;lvds_setting_info2-&gt;iga_path == IGA1) {</div><div class='add'>+				viaparinfo-&gt;lvds_setting_info2-&gt;display_method =</div><div class='add'>+				    LCD_CENTERING;</div><div class='add'>+			}</div><div class='add'>+			viaparinfo-&gt;lvds_setting_info2-&gt;bpp = video_bpp;</div><div class='add'>+			viafb_lcd_set_mode(crt_timing, viaparinfo-&gt;</div><div class='add'>+				lvds_setting_info2,</div><div class='add'>+				     &amp;viaparinfo-&gt;chip_info-&gt;lvds_chip_info2);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((viaparinfo-&gt;chip_info-&gt;gfx_chip_name == UNICHROME_CX700)</div><div class='add'>+	    &amp;&amp; (viafb_LCD_ON || viafb_DVI_ON))</div><div class='add'>+		set_display_channel();</div><div class='add'>+</div><div class='add'>+	/* If set mode normally, save resolution information for hot-plug . */</div><div class='add'>+	if (!viafb_hotplug) {</div><div class='add'>+		viafb_hotplug_Xres = hor_res;</div><div class='add'>+		viafb_hotplug_Yres = ver_res;</div><div class='add'>+		viafb_hotplug_bpp = video_bpp;</div><div class='add'>+		viafb_hotplug_refresh = viafb_refresh;</div><div class='add'>+</div><div class='add'>+		if (viafb_DVI_ON)</div><div class='add'>+			viafb_DeviceStatus = DVI_Device;</div><div class='add'>+		else</div><div class='add'>+			viafb_DeviceStatus = CRT_Device;</div><div class='add'>+	}</div><div class='add'>+	device_on();</div><div class='add'>+</div><div class='add'>+	if (viafb_SAMM_ON == 1)</div><div class='add'>+		viafb_write_reg_mask(CR6A, VIACR, 0xC0, BIT6 + BIT7);</div><div class='add'>+</div><div class='add'>+	device_screen_on();</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int viafb_get_pixclock(int hres, int vres, int vmode_refresh)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; NUM_TOTAL_RES_MAP_REFRESH; i++) {</div><div class='add'>+		if ((hres == res_map_refresh_tbl[i].hres)</div><div class='add'>+		    &amp;&amp; (vres == res_map_refresh_tbl[i].vres)</div><div class='add'>+		    &amp;&amp; (vmode_refresh == res_map_refresh_tbl[i].vmode_refresh))</div><div class='add'>+			return res_map_refresh_tbl[i].pixclock;</div><div class='add'>+	}</div><div class='add'>+	return RES_640X480_60HZ_PIXCLOCK;</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int viafb_get_refresh(int hres, int vres, u32 long_refresh)</div><div class='add'>+{</div><div class='add'>+#define REFRESH_TOLERANCE 3</div><div class='add'>+	int i, nearest = -1, diff = REFRESH_TOLERANCE;</div><div class='add'>+	for (i = 0; i &lt; NUM_TOTAL_RES_MAP_REFRESH; i++) {</div><div class='add'>+		if ((hres == res_map_refresh_tbl[i].hres)</div><div class='add'>+		    &amp;&amp; (vres == res_map_refresh_tbl[i].vres)</div><div class='add'>+		    &amp;&amp; (diff &gt; (abs(long_refresh -</div><div class='add'>+		    res_map_refresh_tbl[i].vmode_refresh)))) {</div><div class='add'>+			diff = abs(long_refresh - res_map_refresh_tbl[i].</div><div class='add'>+				vmode_refresh);</div><div class='add'>+			nearest = i;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+#undef REFRESH_TOLERANCE</div><div class='add'>+	if (nearest &gt; 0)</div><div class='add'>+		return res_map_refresh_tbl[nearest].vmode_refresh;</div><div class='add'>+	return 60;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void device_off(void)</div><div class='add'>+{</div><div class='add'>+	viafb_crt_disable();</div><div class='add'>+	viafb_dvi_disable();</div><div class='add'>+	viafb_lcd_disable();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void device_on(void)</div><div class='add'>+{</div><div class='add'>+	if (viafb_CRT_ON == 1)</div><div class='add'>+		viafb_crt_enable();</div><div class='add'>+	if (viafb_DVI_ON == 1)</div><div class='add'>+		viafb_dvi_enable();</div><div class='add'>+	if (viafb_LCD_ON == 1)</div><div class='add'>+		viafb_lcd_enable();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void viafb_crt_disable(void)</div><div class='add'>+{</div><div class='add'>+	viafb_write_reg_mask(CR36, VIACR, BIT5 + BIT4, BIT5 + BIT4);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void viafb_crt_enable(void)</div><div class='add'>+{</div><div class='add'>+	viafb_write_reg_mask(CR36, VIACR, 0x0, BIT5 + BIT4);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void viafb_get_mmio_info(unsigned long *mmio_base,</div><div class='add'>+	unsigned long *mmio_len)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pdev = NULL;</div><div class='add'>+	u32 vendor, device;</div><div class='add'>+	u32 i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; pciidlist[i].vendor != 0; i++)</div><div class='add'>+		if (viaparinfo-&gt;chip_info-&gt;gfx_chip_name ==</div><div class='add'>+			pciidlist[i].chip_index)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+	if (!pciidlist[i].vendor)</div><div class='add'>+		return ;</div><div class='add'>+</div><div class='add'>+	vendor = pciidlist[i].vendor;</div><div class='add'>+	device = pciidlist[i].device;</div><div class='add'>+</div><div class='add'>+	pdev = pci_get_device(vendor, device, NULL);</div><div class='add'>+</div><div class='add'>+	if (!pdev) {</div><div class='add'>+		*mmio_base = 0;</div><div class='add'>+		*mmio_len = 0;</div><div class='add'>+		return ;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*mmio_base = pci_resource_start(pdev, 1);</div><div class='add'>+	*mmio_len = pci_resource_len(pdev, 1);</div><div class='add'>+</div><div class='add'>+	pci_dev_put(pdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void enable_second_display_channel(void)</div><div class='add'>+{</div><div class='add'>+	/* to enable second display channel. */</div><div class='add'>+	viafb_write_reg_mask(CR6A, VIACR, 0x00, BIT6);</div><div class='add'>+	viafb_write_reg_mask(CR6A, VIACR, BIT7, BIT7);</div><div class='add'>+	viafb_write_reg_mask(CR6A, VIACR, BIT6, BIT6);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void disable_second_display_channel(void)</div><div class='add'>+{</div><div class='add'>+	/* to disable second display channel. */</div><div class='add'>+	viafb_write_reg_mask(CR6A, VIACR, 0x00, BIT6);</div><div class='add'>+	viafb_write_reg_mask(CR6A, VIACR, 0x00, BIT7);</div><div class='add'>+	viafb_write_reg_mask(CR6A, VIACR, BIT6, BIT6);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void viafb_get_fb_info(unsigned int *fb_base, unsigned int *fb_len)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pdev = NULL;</div><div class='add'>+	u32 vendor, device;</div><div class='add'>+	u32 i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; pciidlist[i].vendor != 0; i++)</div><div class='add'>+		if (viaparinfo-&gt;chip_info-&gt;gfx_chip_name ==</div><div class='add'>+			pciidlist[i].chip_index)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+	if (!pciidlist[i].vendor)</div><div class='add'>+		return ;</div><div class='add'>+</div><div class='add'>+	vendor = pciidlist[i].vendor;</div><div class='add'>+	device = pciidlist[i].device;</div><div class='add'>+</div><div class='add'>+	pdev = pci_get_device(vendor, device, NULL);</div><div class='add'>+</div><div class='add'>+	if (!pdev) {</div><div class='add'>+		*fb_base = viafb_read_reg(VIASR, SR30) &lt;&lt; 24;</div><div class='add'>+		*fb_len = viafb_get_memsize();</div><div class='add'>+		DEBUG_MSG(KERN_INFO "Get FB info from SR30!\n");</div><div class='add'>+		DEBUG_MSG(KERN_INFO "fb_base = %08x\n", *fb_base);</div><div class='add'>+		DEBUG_MSG(KERN_INFO "fb_len = %08x\n", *fb_len);</div><div class='add'>+		return ;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*fb_base = (unsigned int)pci_resource_start(pdev, 0);</div><div class='add'>+	*fb_len = get_fb_size_from_pci();</div><div class='add'>+	DEBUG_MSG(KERN_INFO "Get FB info from PCI system!\n");</div><div class='add'>+	DEBUG_MSG(KERN_INFO "fb_base = %08x\n", *fb_base);</div><div class='add'>+	DEBUG_MSG(KERN_INFO "fb_len = %08x\n", *fb_len);</div><div class='add'>+</div><div class='add'>+	pci_dev_put(pdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int get_fb_size_from_pci(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long configid, deviceid, FBSize = 0;</div><div class='add'>+	int VideoMemSize;</div><div class='add'>+	int DeviceFound = false;</div><div class='add'>+</div><div class='add'>+	for (configid = 0x80000000; configid &lt; 0x80010800; configid += 0x100) {</div><div class='add'>+		outl(configid, (unsigned long)0xCF8);</div><div class='add'>+		deviceid = (inl((unsigned long)0xCFC) &gt;&gt; 16) &amp; 0xffff;</div><div class='add'>+</div><div class='add'>+		switch (deviceid) {</div><div class='add'>+		case CLE266:</div><div class='add'>+		case KM400:</div><div class='add'>+			outl(configid + 0xE0, (unsigned long)0xCF8);</div><div class='add'>+			FBSize = inl((unsigned long)0xCFC);</div><div class='add'>+			DeviceFound = true;	/* Found device id */</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case CN400_FUNCTION3:</div><div class='add'>+		case CN700_FUNCTION3:</div><div class='add'>+		case CX700_FUNCTION3:</div><div class='add'>+		case KM800_FUNCTION3:</div><div class='add'>+		case KM890_FUNCTION3:</div><div class='add'>+		case P4M890_FUNCTION3:</div><div class='add'>+		case P4M900_FUNCTION3:</div><div class='add'>+		case VX800_FUNCTION3:</div><div class='add'>+			/*case CN750_FUNCTION3: */</div><div class='add'>+			outl(configid + 0xA0, (unsigned long)0xCF8);</div><div class='add'>+			FBSize = inl((unsigned long)0xCFC);</div><div class='add'>+			DeviceFound = true;	/* Found device id */</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		default:</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (DeviceFound)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DEBUG_MSG(KERN_INFO "Device ID = %lx\n", deviceid);</div><div class='add'>+</div><div class='add'>+	FBSize = FBSize &amp; 0x00007000;</div><div class='add'>+	DEBUG_MSG(KERN_INFO "FB Size = %x\n", FBSize);</div><div class='add'>+</div><div class='add'>+	if (viaparinfo-&gt;chip_info-&gt;gfx_chip_name &lt; UNICHROME_CX700) {</div><div class='add'>+		switch (FBSize) {</div><div class='add'>+		case 0x00004000:</div><div class='add'>+			VideoMemSize = (16 &lt;&lt; 20);	/*16M */</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case 0x00005000:</div><div class='add'>+			VideoMemSize = (32 &lt;&lt; 20);	/*32M */</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case 0x00006000:</div><div class='add'>+			VideoMemSize = (64 &lt;&lt; 20);	/*64M */</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		default:</div><div class='add'>+			VideoMemSize = (32 &lt;&lt; 20);	/*32M */</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		switch (FBSize) {</div><div class='add'>+		case 0x00001000:</div><div class='add'>+			VideoMemSize = (8 &lt;&lt; 20);	/*8M */</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case 0x00002000:</div><div class='add'>+			VideoMemSize = (16 &lt;&lt; 20);	/*16M */</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case 0x00003000:</div><div class='add'>+			VideoMemSize = (32 &lt;&lt; 20);	/*32M */</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case 0x00004000:</div><div class='add'>+			VideoMemSize = (64 &lt;&lt; 20);	/*64M */</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case 0x00005000:</div><div class='add'>+			VideoMemSize = (128 &lt;&lt; 20);	/*128M */</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case 0x00006000:</div><div class='add'>+			VideoMemSize = (256 &lt;&lt; 20);	/*256M */</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		default:</div><div class='add'>+			VideoMemSize = (32 &lt;&lt; 20);	/*32M */</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return VideoMemSize;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void viafb_set_dpa_gfx(int output_interface, struct GFX_DPA_SETTING\</div><div class='add'>+					*p_gfx_dpa_setting)</div><div class='add'>+{</div><div class='add'>+	switch (output_interface) {</div><div class='add'>+	case INTERFACE_DVP0:</div><div class='add'>+		{</div><div class='add'>+			/* DVP0 Clock Polarity and Adjust: */</div><div class='add'>+			viafb_write_reg_mask(CR96, VIACR,</div><div class='add'>+				       p_gfx_dpa_setting-&gt;DVP0, 0x0F);</div><div class='add'>+</div><div class='add'>+			/* DVP0 Clock and Data Pads Driving: */</div><div class='add'>+			viafb_write_reg_mask(SR1E, VIASR,</div><div class='add'>+				       p_gfx_dpa_setting-&gt;DVP0ClockDri_S, BIT2);</div><div class='add'>+			viafb_write_reg_mask(SR2A, VIASR,</div><div class='add'>+				       p_gfx_dpa_setting-&gt;DVP0ClockDri_S1,</div><div class='add'>+				       BIT4);</div><div class='add'>+			viafb_write_reg_mask(SR1B, VIASR,</div><div class='add'>+				       p_gfx_dpa_setting-&gt;DVP0DataDri_S, BIT1);</div><div class='add'>+			viafb_write_reg_mask(SR2A, VIASR,</div><div class='add'>+				       p_gfx_dpa_setting-&gt;DVP0DataDri_S1, BIT5);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	case INTERFACE_DVP1:</div><div class='add'>+		{</div><div class='add'>+			/* DVP1 Clock Polarity and Adjust: */</div><div class='add'>+			viafb_write_reg_mask(CR9B, VIACR,</div><div class='add'>+				       p_gfx_dpa_setting-&gt;DVP1, 0x0F);</div><div class='add'>+</div><div class='add'>+			/* DVP1 Clock and Data Pads Driving: */</div><div class='add'>+			viafb_write_reg_mask(SR65, VIASR,</div><div class='add'>+				       p_gfx_dpa_setting-&gt;DVP1Driving, 0x0F);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	case INTERFACE_DFP_HIGH:</div><div class='add'>+		{</div><div class='add'>+			viafb_write_reg_mask(CR97, VIACR,</div><div class='add'>+				       p_gfx_dpa_setting-&gt;DFPHigh, 0x0F);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	case INTERFACE_DFP_LOW:</div><div class='add'>+		{</div><div class='add'>+			viafb_write_reg_mask(CR99, VIACR,</div><div class='add'>+				       p_gfx_dpa_setting-&gt;DFPLow, 0x0F);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	case INTERFACE_DFP:</div><div class='add'>+		{</div><div class='add'>+			viafb_write_reg_mask(CR97, VIACR,</div><div class='add'>+				       p_gfx_dpa_setting-&gt;DFPHigh, 0x0F);</div><div class='add'>+			viafb_write_reg_mask(CR99, VIACR,</div><div class='add'>+				       p_gfx_dpa_setting-&gt;DFPLow, 0x0F);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void viafb_memory_pitch_patch(struct fb_info *info)</div><div class='add'>+{</div><div class='add'>+	if (info-&gt;var.xres != info-&gt;var.xres_virtual) {</div><div class='add'>+		viafb_load_offset_reg(info-&gt;var.xres_virtual,</div><div class='add'>+				info-&gt;var.bits_per_pixel &gt;&gt; 3, IGA1);</div><div class='add'>+</div><div class='add'>+		if (viafb_SAMM_ON) {</div><div class='add'>+			viafb_load_offset_reg(viafb_second_virtual_xres,</div><div class='add'>+				viafb_bpp1 &gt;&gt; 3,</div><div class='add'>+					IGA2);</div><div class='add'>+		} else {</div><div class='add'>+			viafb_load_offset_reg(info-&gt;var.xres_virtual,</div><div class='add'>+					info-&gt;var.bits_per_pixel &gt;&gt; 3, IGA2);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*According var's xres, yres fill var's other timing information*/</div><div class='add'>+void viafb_fill_var_timing_info(struct fb_var_screeninfo *var, int refresh,</div><div class='add'>+			  int mode_index)</div><div class='add'>+{</div><div class='add'>+	struct VideoModeTable *vmode_tbl = NULL;</div><div class='add'>+	struct crt_mode_table *crt_timing = NULL;</div><div class='add'>+	struct display_timing crt_reg;</div><div class='add'>+	int i = 0, index = 0;</div><div class='add'>+	vmode_tbl = &amp;CLE266Modes[search_mode_setting(mode_index)];</div><div class='add'>+	crt_timing = vmode_tbl-&gt;crtc;</div><div class='add'>+	for (i = 0; i &lt; vmode_tbl-&gt;mode_array; i++) {</div><div class='add'>+		index = i;</div><div class='add'>+		if (crt_timing[i].refresh_rate == refresh)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	crt_reg = crt_timing[index].crtc;</div><div class='add'>+	switch (var-&gt;bits_per_pixel) {</div><div class='add'>+	case 8:</div><div class='add'>+		var-&gt;red.offset = 0;</div><div class='add'>+		var-&gt;green.offset = 0;</div><div class='add'>+		var-&gt;blue.offset = 0;</div><div class='add'>+		var-&gt;red.length = 6;</div><div class='add'>+		var-&gt;green.length = 6;</div><div class='add'>+		var-&gt;blue.length = 6;</div><div class='add'>+		break;</div><div class='add'>+	case 16:</div><div class='add'>+		var-&gt;red.offset = 11;</div><div class='add'>+		var-&gt;green.offset = 5;</div><div class='add'>+		var-&gt;blue.offset = 0;</div><div class='add'>+		var-&gt;red.length = 5;</div><div class='add'>+		var-&gt;green.length = 6;</div><div class='add'>+		var-&gt;blue.length = 5;</div><div class='add'>+		break;</div><div class='add'>+	case 32:</div><div class='add'>+		var-&gt;red.offset = 16;</div><div class='add'>+		var-&gt;green.offset = 8;</div><div class='add'>+		var-&gt;blue.offset = 0;</div><div class='add'>+		var-&gt;red.length = 8;</div><div class='add'>+		var-&gt;green.length = 8;</div><div class='add'>+		var-&gt;blue.length = 8;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		/* never happed, put here to keep consistent */</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	var-&gt;pixclock = viafb_get_pixclock(var-&gt;xres, var-&gt;yres, refresh);</div><div class='add'>+	var-&gt;left_margin =</div><div class='add'>+	    crt_reg.hor_total - (crt_reg.hor_sync_start + crt_reg.hor_sync_end);</div><div class='add'>+	var-&gt;right_margin = crt_reg.hor_sync_start - crt_reg.hor_addr;</div><div class='add'>+	var-&gt;hsync_len = crt_reg.hor_sync_end;</div><div class='add'>+	var-&gt;upper_margin =</div><div class='add'>+	    crt_reg.ver_total - (crt_reg.ver_sync_start + crt_reg.ver_sync_end);</div><div class='add'>+	var-&gt;lower_margin = crt_reg.ver_sync_start - crt_reg.ver_addr;</div><div class='add'>+	var-&gt;vsync_len = crt_reg.ver_sync_end;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/video/via/hw.h b/drivers/video/via/hw.h<br/>new file mode 100644<br/>index 000000000000..6ff38fa8569a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/via/hw.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/via/hw.h</a></div><div class='hunk'>@@ -0,0 +1,933 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.</div><div class='add'>+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.</div><div class='add'>+</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public</div><div class='add'>+ * License as published by the Free Software Foundation;</div><div class='add'>+ * either version 2, or (at your option) any later version.</div><div class='add'>+</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even</div><div class='add'>+ * the implied warranty of MERCHANTABILITY or FITNESS FOR</div><div class='add'>+ * A PARTICULAR PURPOSE.See the GNU General Public License</div><div class='add'>+ * for more details.</div><div class='add'>+</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc.,</div><div class='add'>+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __HW_H__</div><div class='add'>+#define __HW_H__</div><div class='add'>+</div><div class='add'>+#include "global.h"</div><div class='add'>+</div><div class='add'>+/***************************************************</div><div class='add'>+* Definition IGA1 Design Method of CRTC Registers *</div><div class='add'>+****************************************************/</div><div class='add'>+#define IGA1_HOR_TOTAL_FORMULA(x)           (((x)/8)-5)</div><div class='add'>+#define IGA1_HOR_ADDR_FORMULA(x)            (((x)/8)-1)</div><div class='add'>+#define IGA1_HOR_BLANK_START_FORMULA(x)     (((x)/8)-1)</div><div class='add'>+#define IGA1_HOR_BLANK_END_FORMULA(x, y)     (((x+y)/8)-1)</div><div class='add'>+#define IGA1_HOR_SYNC_START_FORMULA(x)      ((x)/8)</div><div class='add'>+#define IGA1_HOR_SYNC_END_FORMULA(x, y)      ((x+y)/8)</div><div class='add'>+</div><div class='add'>+#define IGA1_VER_TOTAL_FORMULA(x)           ((x)-2)</div><div class='add'>+#define IGA1_VER_ADDR_FORMULA(x)            ((x)-1)</div><div class='add'>+#define IGA1_VER_BLANK_START_FORMULA(x)     ((x)-1)</div><div class='add'>+#define IGA1_VER_BLANK_END_FORMULA(x, y)     ((x+y)-1)</div><div class='add'>+#define IGA1_VER_SYNC_START_FORMULA(x)      ((x)-1)</div><div class='add'>+#define IGA1_VER_SYNC_END_FORMULA(x, y)      ((x+y)-1)</div><div class='add'>+</div><div class='add'>+/***************************************************</div><div class='add'>+** Definition IGA2 Design Method of CRTC Registers *</div><div class='add'>+****************************************************/</div><div class='add'>+#define IGA2_HOR_TOTAL_FORMULA(x)           ((x)-1)</div><div class='add'>+#define IGA2_HOR_ADDR_FORMULA(x)            ((x)-1)</div><div class='add'>+#define IGA2_HOR_BLANK_START_FORMULA(x)     ((x)-1)</div><div class='add'>+#define IGA2_HOR_BLANK_END_FORMULA(x, y)     ((x+y)-1)</div><div class='add'>+#define IGA2_HOR_SYNC_START_FORMULA(x)      ((x)-1)</div><div class='add'>+#define IGA2_HOR_SYNC_END_FORMULA(x, y)      ((x+y)-1)</div><div class='add'>+</div><div class='add'>+#define IGA2_VER_TOTAL_FORMULA(x)           ((x)-1)</div><div class='add'>+#define IGA2_VER_ADDR_FORMULA(x)            ((x)-1)</div><div class='add'>+#define IGA2_VER_BLANK_START_FORMULA(x)     ((x)-1)</div><div class='add'>+#define IGA2_VER_BLANK_END_FORMULA(x, y)     ((x+y)-1)</div><div class='add'>+#define IGA2_VER_SYNC_START_FORMULA(x)      ((x)-1)</div><div class='add'>+#define IGA2_VER_SYNC_END_FORMULA(x, y)      ((x+y)-1)</div><div class='add'>+</div><div class='add'>+/**********************************************************/</div><div class='add'>+/* Definition IGA2 Design Method of CRTC Shadow Registers */</div><div class='add'>+/**********************************************************/</div><div class='add'>+#define IGA2_HOR_TOTAL_SHADOW_FORMULA(x)           ((x/8)-5)</div><div class='add'>+#define IGA2_HOR_BLANK_END_SHADOW_FORMULA(x, y)     (((x+y)/8)-1)</div><div class='add'>+#define IGA2_VER_TOTAL_SHADOW_FORMULA(x)           ((x)-2)</div><div class='add'>+#define IGA2_VER_ADDR_SHADOW_FORMULA(x)            ((x)-1)</div><div class='add'>+#define IGA2_VER_BLANK_START_SHADOW_FORMULA(x)     ((x)-1)</div><div class='add'>+#define IGA2_VER_BLANK_END_SHADOW_FORMULA(x, y)     ((x+y)-1)</div><div class='add'>+#define IGA2_VER_SYNC_START_SHADOW_FORMULA(x)      (x)</div><div class='add'>+#define IGA2_VER_SYNC_END_SHADOW_FORMULA(x, y)      (x+y)</div><div class='add'>+</div><div class='add'>+/* Define Register Number for IGA1 CRTC Timing */</div><div class='add'>+</div><div class='add'>+/* location: {CR00,0,7},{CR36,3,3} */</div><div class='add'>+#define IGA1_HOR_TOTAL_REG_NUM		2</div><div class='add'>+/* location: {CR01,0,7} */</div><div class='add'>+#define IGA1_HOR_ADDR_REG_NUM		1</div><div class='add'>+/* location: {CR02,0,7} */</div><div class='add'>+#define IGA1_HOR_BLANK_START_REG_NUM    1</div><div class='add'>+/* location: {CR03,0,4},{CR05,7,7},{CR33,5,5} */</div><div class='add'>+#define IGA1_HOR_BLANK_END_REG_NUM	3</div><div class='add'>+/* location: {CR04,0,7},{CR33,4,4} */</div><div class='add'>+#define IGA1_HOR_SYNC_START_REG_NUM	2</div><div class='add'>+/* location: {CR05,0,4} */</div><div class='add'>+#define IGA1_HOR_SYNC_END_REG_NUM       1</div><div class='add'>+/* location: {CR06,0,7},{CR07,0,0},{CR07,5,5},{CR35,0,0} */</div><div class='add'>+#define IGA1_VER_TOTAL_REG_NUM          4</div><div class='add'>+/* location: {CR12,0,7},{CR07,1,1},{CR07,6,6},{CR35,2,2} */</div><div class='add'>+#define IGA1_VER_ADDR_REG_NUM           4</div><div class='add'>+/* location: {CR15,0,7},{CR07,3,3},{CR09,5,5},{CR35,3,3} */</div><div class='add'>+#define IGA1_VER_BLANK_START_REG_NUM    4</div><div class='add'>+/* location: {CR16,0,7} */</div><div class='add'>+#define IGA1_VER_BLANK_END_REG_NUM      1</div><div class='add'>+/* location: {CR10,0,7},{CR07,2,2},{CR07,7,7},{CR35,1,1} */</div><div class='add'>+#define IGA1_VER_SYNC_START_REG_NUM     4</div><div class='add'>+/* location: {CR11,0,3} */</div><div class='add'>+#define IGA1_VER_SYNC_END_REG_NUM       1</div><div class='add'>+</div><div class='add'>+/* Define Register Number for IGA2 Shadow CRTC Timing */</div><div class='add'>+</div><div class='add'>+/* location: {CR6D,0,7},{CR71,3,3} */</div><div class='add'>+#define IGA2_SHADOW_HOR_TOTAL_REG_NUM       2</div><div class='add'>+/* location: {CR6E,0,7} */</div><div class='add'>+#define IGA2_SHADOW_HOR_BLANK_END_REG_NUM   1</div><div class='add'>+/* location: {CR6F,0,7},{CR71,0,2} */</div><div class='add'>+#define IGA2_SHADOW_VER_TOTAL_REG_NUM       2</div><div class='add'>+/* location: {CR70,0,7},{CR71,4,6} */</div><div class='add'>+#define IGA2_SHADOW_VER_ADDR_REG_NUM        2</div><div class='add'>+/* location: {CR72,0,7},{CR74,4,6} */</div><div class='add'>+#define IGA2_SHADOW_VER_BLANK_START_REG_NUM 2</div><div class='add'>+/* location: {CR73,0,7},{CR74,0,2} */</div><div class='add'>+#define IGA2_SHADOW_VER_BLANK_END_REG_NUM   2</div><div class='add'>+/* location: {CR75,0,7},{CR76,4,6} */</div><div class='add'>+#define IGA2_SHADOW_VER_SYNC_START_REG_NUM  2</div><div class='add'>+/* location: {CR76,0,3} */</div><div class='add'>+#define IGA2_SHADOW_VER_SYNC_END_REG_NUM    1</div><div class='add'>+</div><div class='add'>+/* Define Register Number for IGA2 CRTC Timing */</div><div class='add'>+</div><div class='add'>+/* location: {CR50,0,7},{CR55,0,3} */</div><div class='add'>+#define IGA2_HOR_TOTAL_REG_NUM          2</div><div class='add'>+/* location: {CR51,0,7},{CR55,4,6} */</div><div class='add'>+#define IGA2_HOR_ADDR_REG_NUM           2</div><div class='add'>+/* location: {CR52,0,7},{CR54,0,2} */</div><div class='add'>+#define IGA2_HOR_BLANK_START_REG_NUM    2</div><div class='add'>+/* location: CLE266: {CR53,0,7},{CR54,3,5} =&gt; CLE266's CR5D[6]</div><div class='add'>+is reserved, so it may have problem to set 1600x1200 on IGA2. */</div><div class='add'>+/*         	Others: {CR53,0,7},{CR54,3,5},{CR5D,6,6} */</div><div class='add'>+#define IGA2_HOR_BLANK_END_REG_NUM      3</div><div class='add'>+/* location: {CR56,0,7},{CR54,6,7},{CR5C,7,7} */</div><div class='add'>+/* VT3314 and Later: {CR56,0,7},{CR54,6,7},{CR5C,7,7}, {CR5D,7,7} */</div><div class='add'>+#define IGA2_HOR_SYNC_START_REG_NUM     4</div><div class='add'>+</div><div class='add'>+/* location: {CR57,0,7},{CR5C,6,6} */</div><div class='add'>+#define IGA2_HOR_SYNC_END_REG_NUM       2</div><div class='add'>+/* location: {CR58,0,7},{CR5D,0,2} */</div><div class='add'>+#define IGA2_VER_TOTAL_REG_NUM          2</div><div class='add'>+/* location: {CR59,0,7},{CR5D,3,5} */</div><div class='add'>+#define IGA2_VER_ADDR_REG_NUM           2</div><div class='add'>+/* location: {CR5A,0,7},{CR5C,0,2} */</div><div class='add'>+#define IGA2_VER_BLANK_START_REG_NUM    2</div><div class='add'>+/* location: {CR5E,0,7},{CR5C,3,5} */</div><div class='add'>+#define IGA2_VER_BLANK_END_REG_NUM      2</div><div class='add'>+/* location: {CR5E,0,7},{CR5F,5,7} */</div><div class='add'>+#define IGA2_VER_SYNC_START_REG_NUM     2</div><div class='add'>+/* location: {CR5F,0,4} */</div><div class='add'>+#define IGA2_VER_SYNC_END_REG_NUM       1</div><div class='add'>+</div><div class='add'>+/* Define Offset and Fetch Count Register*/</div><div class='add'>+</div><div class='add'>+/* location: {CR13,0,7},{CR35,5,7} */</div><div class='add'>+#define IGA1_OFFSET_REG_NUM             2</div><div class='add'>+/* 8 bytes alignment. */</div><div class='add'>+#define IGA1_OFFSER_ALIGN_BYTE          8</div><div class='add'>+/* x: H resolution, y: color depth */</div><div class='add'>+#define IGA1_OFFSET_FORMULA(x, y)        ((x*y)/IGA1_OFFSER_ALIGN_BYTE)</div><div class='add'>+/* location: {SR1C,0,7},{SR1D,0,1} */</div><div class='add'>+#define IGA1_FETCH_COUNT_REG_NUM        2</div><div class='add'>+/* 16 bytes alignment. */</div><div class='add'>+#define IGA1_FETCH_COUNT_ALIGN_BYTE     16</div><div class='add'>+/* x: H resolution, y: color depth */</div><div class='add'>+#define IGA1_FETCH_COUNT_PATCH_VALUE    4</div><div class='add'>+#define IGA1_FETCH_COUNT_FORMULA(x, y)   \</div><div class='add'>+	(((x*y)/IGA1_FETCH_COUNT_ALIGN_BYTE) + IGA1_FETCH_COUNT_PATCH_VALUE)</div><div class='add'>+</div><div class='add'>+/* location: {CR66,0,7},{CR67,0,1} */</div><div class='add'>+#define IGA2_OFFSET_REG_NUM             2</div><div class='add'>+#define IGA2_OFFSET_ALIGN_BYTE          8</div><div class='add'>+/* x: H resolution, y: color depth */</div><div class='add'>+#define IGA2_OFFSET_FORMULA(x, y)        ((x*y)/IGA2_OFFSET_ALIGN_BYTE)</div><div class='add'>+/* location: {CR65,0,7},{CR67,2,3} */</div><div class='add'>+#define IGA2_FETCH_COUNT_REG_NUM        2</div><div class='add'>+#define IGA2_FETCH_COUNT_ALIGN_BYTE     16</div><div class='add'>+#define IGA2_FETCH_COUNT_PATCH_VALUE    0</div><div class='add'>+#define IGA2_FETCH_COUNT_FORMULA(x, y)   \</div><div class='add'>+	(((x*y)/IGA2_FETCH_COUNT_ALIGN_BYTE) + IGA2_FETCH_COUNT_PATCH_VALUE)</div><div class='add'>+</div><div class='add'>+/* Staring Address*/</div><div class='add'>+</div><div class='add'>+/* location: {CR0C,0,7},{CR0D,0,7},{CR34,0,7},{CR48,0,1} */</div><div class='add'>+#define IGA1_STARTING_ADDR_REG_NUM      4</div><div class='add'>+/* location: {CR62,1,7},{CR63,0,7},{CR64,0,7} */</div><div class='add'>+#define IGA2_STARTING_ADDR_REG_NUM      3</div><div class='add'>+</div><div class='add'>+/* Define Display OFFSET*/</div><div class='add'>+/* These value are by HW suggested value*/</div><div class='add'>+/* location: {SR17,0,7} */</div><div class='add'>+#define K800_IGA1_FIFO_MAX_DEPTH                384</div><div class='add'>+/* location: {SR16,0,5},{SR16,7,7} */</div><div class='add'>+#define K800_IGA1_FIFO_THRESHOLD                328</div><div class='add'>+/* location: {SR18,0,5},{SR18,7,7} */</div><div class='add'>+#define K800_IGA1_FIFO_HIGH_THRESHOLD           296</div><div class='add'>+/* location: {SR22,0,4}. (128/4) =64, K800 must be set zero, */</div><div class='add'>+				/* because HW only 5 bits */</div><div class='add'>+#define K800_IGA1_DISPLAY_QUEUE_EXPIRE_NUM      0</div><div class='add'>+</div><div class='add'>+/* location: {CR68,4,7},{CR94,7,7},{CR95,7,7} */</div><div class='add'>+#define K800_IGA2_FIFO_MAX_DEPTH                384</div><div class='add'>+/* location: {CR68,0,3},{CR95,4,6} */</div><div class='add'>+#define K800_IGA2_FIFO_THRESHOLD                328</div><div class='add'>+/* location: {CR92,0,3},{CR95,0,2} */</div><div class='add'>+#define K800_IGA2_FIFO_HIGH_THRESHOLD           296</div><div class='add'>+/* location: {CR94,0,6} */</div><div class='add'>+#define K800_IGA2_DISPLAY_QUEUE_EXPIRE_NUM      128</div><div class='add'>+</div><div class='add'>+/* location: {SR17,0,7} */</div><div class='add'>+#define P880_IGA1_FIFO_MAX_DEPTH                192</div><div class='add'>+/* location: {SR16,0,5},{SR16,7,7} */</div><div class='add'>+#define P880_IGA1_FIFO_THRESHOLD                128</div><div class='add'>+/* location: {SR18,0,5},{SR18,7,7} */</div><div class='add'>+#define P880_IGA1_FIFO_HIGH_THRESHOLD           64</div><div class='add'>+/* location: {SR22,0,4}. (128/4) =64, K800 must be set zero, */</div><div class='add'>+				/* because HW only 5 bits */</div><div class='add'>+#define P880_IGA1_DISPLAY_QUEUE_EXPIRE_NUM      0</div><div class='add'>+</div><div class='add'>+/* location: {CR68,4,7},{CR94,7,7},{CR95,7,7} */</div><div class='add'>+#define P880_IGA2_FIFO_MAX_DEPTH                96</div><div class='add'>+/* location: {CR68,0,3},{CR95,4,6} */</div><div class='add'>+#define P880_IGA2_FIFO_THRESHOLD                64</div><div class='add'>+/* location: {CR92,0,3},{CR95,0,2} */</div><div class='add'>+#define P880_IGA2_FIFO_HIGH_THRESHOLD           32</div><div class='add'>+/* location: {CR94,0,6} */</div><div class='add'>+#define P880_IGA2_DISPLAY_QUEUE_EXPIRE_NUM      128</div><div class='add'>+</div><div class='add'>+/* VT3314 chipset*/</div><div class='add'>+</div><div class='add'>+/* location: {SR17,0,7} */</div><div class='add'>+#define CN700_IGA1_FIFO_MAX_DEPTH               96</div><div class='add'>+/* location: {SR16,0,5},{SR16,7,7} */</div><div class='add'>+#define CN700_IGA1_FIFO_THRESHOLD               80</div><div class='add'>+/* location: {SR18,0,5},{SR18,7,7} */</div><div class='add'>+#define CN700_IGA1_FIFO_HIGH_THRESHOLD          64</div><div class='add'>+/* location: {SR22,0,4}. (128/4) =64, P800 must be set zero,</div><div class='add'>+				because HW only 5 bits */</div><div class='add'>+#define CN700_IGA1_DISPLAY_QUEUE_EXPIRE_NUM     0</div><div class='add'>+/* location: {CR68,4,7},{CR94,7,7},{CR95,7,7} */</div><div class='add'>+#define CN700_IGA2_FIFO_MAX_DEPTH               96</div><div class='add'>+/* location: {CR68,0,3},{CR95,4,6} */</div><div class='add'>+#define CN700_IGA2_FIFO_THRESHOLD               80</div><div class='add'>+/* location: {CR92,0,3},{CR95,0,2} */</div><div class='add'>+#define CN700_IGA2_FIFO_HIGH_THRESHOLD          32</div><div class='add'>+/* location: {CR94,0,6} */</div><div class='add'>+#define CN700_IGA2_DISPLAY_QUEUE_EXPIRE_NUM     128</div><div class='add'>+</div><div class='add'>+/* For VT3324, these values are suggested by HW */</div><div class='add'>+/* location: {SR17,0,7} */</div><div class='add'>+#define CX700_IGA1_FIFO_MAX_DEPTH               192</div><div class='add'>+/* location: {SR16,0,5},{SR16,7,7} */</div><div class='add'>+#define CX700_IGA1_FIFO_THRESHOLD               128</div><div class='add'>+/* location: {SR18,0,5},{SR18,7,7} */</div><div class='add'>+#define CX700_IGA1_FIFO_HIGH_THRESHOLD          128</div><div class='add'>+/* location: {SR22,0,4} */</div><div class='add'>+#define CX700_IGA1_DISPLAY_QUEUE_EXPIRE_NUM     124</div><div class='add'>+</div><div class='add'>+/* location: {CR68,4,7},{CR94,7,7},{CR95,7,7} */</div><div class='add'>+#define CX700_IGA2_FIFO_MAX_DEPTH               96</div><div class='add'>+/* location: {CR68,0,3},{CR95,4,6} */</div><div class='add'>+#define CX700_IGA2_FIFO_THRESHOLD               64</div><div class='add'>+/* location: {CR92,0,3},{CR95,0,2} */</div><div class='add'>+#define CX700_IGA2_FIFO_HIGH_THRESHOLD          32</div><div class='add'>+/* location: {CR94,0,6} */</div><div class='add'>+#define CX700_IGA2_DISPLAY_QUEUE_EXPIRE_NUM     128</div><div class='add'>+</div><div class='add'>+/* VT3336 chipset*/</div><div class='add'>+/* location: {SR17,0,7} */</div><div class='add'>+#define K8M890_IGA1_FIFO_MAX_DEPTH               360</div><div class='add'>+/* location: {SR16,0,5},{SR16,7,7} */</div><div class='add'>+#define K8M890_IGA1_FIFO_THRESHOLD               328</div><div class='add'>+/* location: {SR18,0,5},{SR18,7,7} */</div><div class='add'>+#define K8M890_IGA1_FIFO_HIGH_THRESHOLD          296</div><div class='add'>+/* location: {SR22,0,4}. */</div><div class='add'>+#define K8M890_IGA1_DISPLAY_QUEUE_EXPIRE_NUM     124</div><div class='add'>+</div><div class='add'>+/* location: {CR68,4,7},{CR94,7,7},{CR95,7,7} */</div><div class='add'>+#define K8M890_IGA2_FIFO_MAX_DEPTH               360</div><div class='add'>+/* location: {CR68,0,3},{CR95,4,6} */</div><div class='add'>+#define K8M890_IGA2_FIFO_THRESHOLD               328</div><div class='add'>+/* location: {CR92,0,3},{CR95,0,2} */</div><div class='add'>+#define K8M890_IGA2_FIFO_HIGH_THRESHOLD          296</div><div class='add'>+/* location: {CR94,0,6} */</div><div class='add'>+#define K8M890_IGA2_DISPLAY_QUEUE_EXPIRE_NUM     124</div><div class='add'>+</div><div class='add'>+/* VT3327 chipset*/</div><div class='add'>+/* location: {SR17,0,7} */</div><div class='add'>+#define P4M890_IGA1_FIFO_MAX_DEPTH               96</div><div class='add'>+/* location: {SR16,0,5},{SR16,7,7} */</div><div class='add'>+#define P4M890_IGA1_FIFO_THRESHOLD               76</div><div class='add'>+/* location: {SR18,0,5},{SR18,7,7} */</div><div class='add'>+#define P4M890_IGA1_FIFO_HIGH_THRESHOLD          64</div><div class='add'>+/* location: {SR22,0,4}. (32/4) =8 */</div><div class='add'>+#define P4M890_IGA1_DISPLAY_QUEUE_EXPIRE_NUM     32</div><div class='add'>+/* location: {CR68,4,7},{CR94,7,7},{CR95,7,7} */</div><div class='add'>+#define P4M890_IGA2_FIFO_MAX_DEPTH               96</div><div class='add'>+/* location: {CR68,0,3},{CR95,4,6} */</div><div class='add'>+#define P4M890_IGA2_FIFO_THRESHOLD               76</div><div class='add'>+/* location: {CR92,0,3},{CR95,0,2} */</div><div class='add'>+#define P4M890_IGA2_FIFO_HIGH_THRESHOLD          64</div><div class='add'>+/* location: {CR94,0,6} */</div><div class='add'>+#define P4M890_IGA2_DISPLAY_QUEUE_EXPIRE_NUM     32</div><div class='add'>+</div><div class='add'>+/* VT3364 chipset*/</div><div class='add'>+/* location: {SR17,0,7} */</div><div class='add'>+#define P4M900_IGA1_FIFO_MAX_DEPTH               96</div><div class='add'>+/* location: {SR16,0,5},{SR16,7,7} */</div><div class='add'>+#define P4M900_IGA1_FIFO_THRESHOLD               76</div><div class='add'>+/* location: {SR18,0,5},{SR18,7,7} */</div><div class='add'>+#define P4M900_IGA1_FIFO_HIGH_THRESHOLD          76</div><div class='add'>+/* location: {SR22,0,4}. */</div><div class='add'>+#define P4M900_IGA1_DISPLAY_QUEUE_EXPIRE_NUM     32</div><div class='add'>+/* location: {CR68,4,7},{CR94,7,7},{CR95,7,7} */</div><div class='add'>+#define P4M900_IGA2_FIFO_MAX_DEPTH               96</div><div class='add'>+/* location: {CR68,0,3},{CR95,4,6} */</div><div class='add'>+#define P4M900_IGA2_FIFO_THRESHOLD               76</div><div class='add'>+/* location: {CR92,0,3},{CR95,0,2} */</div><div class='add'>+#define P4M900_IGA2_FIFO_HIGH_THRESHOLD          76</div><div class='add'>+/* location: {CR94,0,6} */</div><div class='add'>+#define P4M900_IGA2_DISPLAY_QUEUE_EXPIRE_NUM     32</div><div class='add'>+</div><div class='add'>+/* For VT3353, these values are suggested by HW */</div><div class='add'>+/* location: {SR17,0,7} */</div><div class='add'>+#define VX800_IGA1_FIFO_MAX_DEPTH               192</div><div class='add'>+/* location: {SR16,0,5},{SR16,7,7} */</div><div class='add'>+#define VX800_IGA1_FIFO_THRESHOLD               152</div><div class='add'>+/* location: {SR18,0,5},{SR18,7,7} */</div><div class='add'>+#define VX800_IGA1_FIFO_HIGH_THRESHOLD          152</div><div class='add'>+/* location: {SR22,0,4} */</div><div class='add'>+#define VX800_IGA1_DISPLAY_QUEUE_EXPIRE_NUM      64</div><div class='add'>+/* location: {CR68,4,7},{CR94,7,7},{CR95,7,7} */</div><div class='add'>+#define VX800_IGA2_FIFO_MAX_DEPTH               96</div><div class='add'>+/* location: {CR68,0,3},{CR95,4,6} */</div><div class='add'>+#define VX800_IGA2_FIFO_THRESHOLD               64</div><div class='add'>+/* location: {CR92,0,3},{CR95,0,2} */</div><div class='add'>+#define VX800_IGA2_FIFO_HIGH_THRESHOLD          32</div><div class='add'>+/* location: {CR94,0,6} */</div><div class='add'>+#define VX800_IGA2_DISPLAY_QUEUE_EXPIRE_NUM     128</div><div class='add'>+</div><div class='add'>+#define IGA1_FIFO_DEPTH_SELECT_REG_NUM          1</div><div class='add'>+#define IGA1_FIFO_THRESHOLD_REG_NUM             2</div><div class='add'>+#define IGA1_FIFO_HIGH_THRESHOLD_REG_NUM        2</div><div class='add'>+#define IGA1_DISPLAY_QUEUE_EXPIRE_NUM_REG_NUM   1</div><div class='add'>+</div><div class='add'>+#define IGA2_FIFO_DEPTH_SELECT_REG_NUM          3</div><div class='add'>+#define IGA2_FIFO_THRESHOLD_REG_NUM             2</div><div class='add'>+#define IGA2_FIFO_HIGH_THRESHOLD_REG_NUM        2</div><div class='add'>+#define IGA2_DISPLAY_QUEUE_EXPIRE_NUM_REG_NUM   1</div><div class='add'>+</div><div class='add'>+#define IGA1_FIFO_DEPTH_SELECT_FORMULA(x)                   ((x/2)-1)</div><div class='add'>+#define IGA1_FIFO_THRESHOLD_FORMULA(x)                      (x/4)</div><div class='add'>+#define IGA1_DISPLAY_QUEUE_EXPIRE_NUM_FORMULA(x)            (x/4)</div><div class='add'>+#define IGA1_FIFO_HIGH_THRESHOLD_FORMULA(x)                 (x/4)</div><div class='add'>+#define IGA2_FIFO_DEPTH_SELECT_FORMULA(x)                   (((x/2)/4)-1)</div><div class='add'>+#define IGA2_FIFO_THRESHOLD_FORMULA(x)                      (x/4)</div><div class='add'>+#define IGA2_DISPLAY_QUEUE_EXPIRE_NUM_FORMULA(x)            (x/4)</div><div class='add'>+#define IGA2_FIFO_HIGH_THRESHOLD_FORMULA(x)                 (x/4)</div><div class='add'>+</div><div class='add'>+/************************************************************************/</div><div class='add'>+/*  LCD Timing                                                          */</div><div class='add'>+/************************************************************************/</div><div class='add'>+</div><div class='add'>+/* 500 ms = 500000 us */</div><div class='add'>+#define LCD_POWER_SEQ_TD0               500000</div><div class='add'>+/* 50 ms = 50000 us */</div><div class='add'>+#define LCD_POWER_SEQ_TD1               50000</div><div class='add'>+/* 0 us */</div><div class='add'>+#define LCD_POWER_SEQ_TD2               0</div><div class='add'>+/* 210 ms = 210000 us */</div><div class='add'>+#define LCD_POWER_SEQ_TD3               210000</div><div class='add'>+/* 2^10 * (1/14.31818M) = 71.475 us (K400.revA) */</div><div class='add'>+#define CLE266_POWER_SEQ_UNIT           71</div><div class='add'>+/* 2^11 * (1/14.31818M) = 142.95 us (K400.revB) */</div><div class='add'>+#define K800_POWER_SEQ_UNIT             142</div><div class='add'>+/* 2^13 * (1/14.31818M) = 572.1 us */</div><div class='add'>+#define P880_POWER_SEQ_UNIT             572</div><div class='add'>+</div><div class='add'>+#define CLE266_POWER_SEQ_FORMULA(x)     ((x)/CLE266_POWER_SEQ_UNIT)</div><div class='add'>+#define K800_POWER_SEQ_FORMULA(x)       ((x)/K800_POWER_SEQ_UNIT)</div><div class='add'>+#define P880_POWER_SEQ_FORMULA(x)       ((x)/P880_POWER_SEQ_UNIT)</div><div class='add'>+</div><div class='add'>+/* location: {CR8B,0,7},{CR8F,0,3} */</div><div class='add'>+#define LCD_POWER_SEQ_TD0_REG_NUM       2</div><div class='add'>+/* location: {CR8C,0,7},{CR8F,4,7} */</div><div class='add'>+#define LCD_POWER_SEQ_TD1_REG_NUM       2</div><div class='add'>+/* location: {CR8D,0,7},{CR90,0,3} */</div><div class='add'>+#define LCD_POWER_SEQ_TD2_REG_NUM       2</div><div class='add'>+/* location: {CR8E,0,7},{CR90,4,7} */</div><div class='add'>+#define LCD_POWER_SEQ_TD3_REG_NUM       2</div><div class='add'>+</div><div class='add'>+/* LCD Scaling factor*/</div><div class='add'>+/* x: indicate setting horizontal size*/</div><div class='add'>+/* y: indicate panel horizontal size*/</div><div class='add'>+</div><div class='add'>+/* Horizontal scaling factor 10 bits (2^10) */</div><div class='add'>+#define CLE266_LCD_HOR_SCF_FORMULA(x, y)   (((x-1)*1024)/(y-1))</div><div class='add'>+/* Vertical scaling factor 10 bits (2^10) */</div><div class='add'>+#define CLE266_LCD_VER_SCF_FORMULA(x, y)   (((x-1)*1024)/(y-1))</div><div class='add'>+/* Horizontal scaling factor 10 bits (2^12) */</div><div class='add'>+#define K800_LCD_HOR_SCF_FORMULA(x, y)     (((x-1)*4096)/(y-1))</div><div class='add'>+/* Vertical scaling factor 10 bits (2^11) */</div><div class='add'>+#define K800_LCD_VER_SCF_FORMULA(x, y)     (((x-1)*2048)/(y-1))</div><div class='add'>+</div><div class='add'>+/* location: {CR9F,0,1},{CR77,0,7},{CR79,4,5} */</div><div class='add'>+#define LCD_HOR_SCALING_FACTOR_REG_NUM  3</div><div class='add'>+/* location: {CR79,3,3},{CR78,0,7},{CR79,6,7} */</div><div class='add'>+#define LCD_VER_SCALING_FACTOR_REG_NUM  3</div><div class='add'>+/* location: {CR77,0,7},{CR79,4,5} */</div><div class='add'>+#define LCD_HOR_SCALING_FACTOR_REG_NUM_CLE  2</div><div class='add'>+/* location: {CR78,0,7},{CR79,6,7} */</div><div class='add'>+#define LCD_VER_SCALING_FACTOR_REG_NUM_CLE  2</div><div class='add'>+</div><div class='add'>+/************************************************</div><div class='add'>+ *****     Define IGA1 Display Timing       *****</div><div class='add'>+ ************************************************/</div><div class='add'>+struct io_register {</div><div class='add'>+	u8 io_addr;</div><div class='add'>+	u8 start_bit;</div><div class='add'>+	u8 end_bit;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* IGA1 Horizontal Total */</div><div class='add'>+struct iga1_hor_total {</div><div class='add'>+	int reg_num;</div><div class='add'>+	struct io_register reg[IGA1_HOR_TOTAL_REG_NUM];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* IGA1 Horizontal Addressable Video */</div><div class='add'>+struct iga1_hor_addr {</div><div class='add'>+	int reg_num;</div><div class='add'>+	struct io_register reg[IGA1_HOR_ADDR_REG_NUM];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* IGA1 Horizontal Blank Start */</div><div class='add'>+struct iga1_hor_blank_start {</div><div class='add'>+	int reg_num;</div><div class='add'>+	struct io_register reg[IGA1_HOR_BLANK_START_REG_NUM];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* IGA1 Horizontal Blank End */</div><div class='add'>+struct iga1_hor_blank_end {</div><div class='add'>+	int reg_num;</div><div class='add'>+	struct io_register reg[IGA1_HOR_BLANK_END_REG_NUM];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* IGA1 Horizontal Sync Start */</div><div class='add'>+struct iga1_hor_sync_start {</div><div class='add'>+	int reg_num;</div><div class='add'>+	struct io_register reg[IGA1_HOR_SYNC_START_REG_NUM];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* IGA1 Horizontal Sync End */</div><div class='add'>+struct iga1_hor_sync_end {</div><div class='add'>+	int reg_num;</div><div class='add'>+	struct io_register reg[IGA1_HOR_SYNC_END_REG_NUM];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* IGA1 Vertical Total */</div><div class='add'>+struct iga1_ver_total {</div><div class='add'>+	int reg_num;</div><div class='add'>+	struct io_register reg[IGA1_VER_TOTAL_REG_NUM];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* IGA1 Vertical Addressable Video */</div><div class='add'>+struct iga1_ver_addr {</div><div class='add'>+	int reg_num;</div><div class='add'>+	struct io_register reg[IGA1_VER_ADDR_REG_NUM];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* IGA1 Vertical Blank Start */</div><div class='add'>+struct iga1_ver_blank_start {</div><div class='add'>+	int reg_num;</div><div class='add'>+	struct io_register reg[IGA1_VER_BLANK_START_REG_NUM];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* IGA1 Vertical Blank End */</div><div class='add'>+struct iga1_ver_blank_end {</div><div class='add'>+	int reg_num;</div><div class='add'>+	struct io_register reg[IGA1_VER_BLANK_END_REG_NUM];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* IGA1 Vertical Sync Start */</div><div class='add'>+struct iga1_ver_sync_start {</div><div class='add'>+	int reg_num;</div><div class='add'>+	struct io_register reg[IGA1_VER_SYNC_START_REG_NUM];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* IGA1 Vertical Sync End */</div><div class='add'>+struct iga1_ver_sync_end {</div><div class='add'>+	int reg_num;</div><div class='add'>+	struct io_register reg[IGA1_VER_SYNC_END_REG_NUM];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*****************************************************</div><div class='add'>+**      Define IGA2 Shadow Display Timing         ****</div><div class='add'>+*****************************************************/</div><div class='add'>+</div><div class='add'>+/* IGA2 Shadow Horizontal Total */</div><div class='add'>+struct iga2_shadow_hor_total {</div><div class='add'>+	int reg_num;</div><div class='add'>+	struct io_register reg[IGA2_SHADOW_HOR_TOTAL_REG_NUM];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* IGA2 Shadow Horizontal Blank End */</div><div class='add'>+struct iga2_shadow_hor_blank_end {</div><div class='add'>+	int reg_num;</div><div class='add'>+	struct io_register reg[IGA2_SHADOW_HOR_BLANK_END_REG_NUM];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* IGA2 Shadow Vertical Total */</div><div class='add'>+struct iga2_shadow_ver_total {</div><div class='add'>+	int reg_num;</div><div class='add'>+	struct io_register reg[IGA2_SHADOW_VER_TOTAL_REG_NUM];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* IGA2 Shadow Vertical Addressable Video */</div><div class='add'>+struct iga2_shadow_ver_addr {</div><div class='add'>+	int reg_num;</div><div class='add'>+	struct io_register reg[IGA2_SHADOW_VER_ADDR_REG_NUM];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* IGA2 Shadow Vertical Blank Start */</div><div class='add'>+struct iga2_shadow_ver_blank_start {</div><div class='add'>+	int reg_num;</div><div class='add'>+	struct io_register reg[IGA2_SHADOW_VER_BLANK_START_REG_NUM];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* IGA2 Shadow Vertical Blank End */</div><div class='add'>+struct iga2_shadow_ver_blank_end {</div><div class='add'>+	int reg_num;</div><div class='add'>+	struct io_register reg[IGA2_SHADOW_VER_BLANK_END_REG_NUM];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* IGA2 Shadow Vertical Sync Start */</div><div class='add'>+struct iga2_shadow_ver_sync_start {</div><div class='add'>+	int reg_num;</div><div class='add'>+	struct io_register reg[IGA2_SHADOW_VER_SYNC_START_REG_NUM];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* IGA2 Shadow Vertical Sync End */</div><div class='add'>+struct iga2_shadow_ver_sync_end {</div><div class='add'>+	int reg_num;</div><div class='add'>+	struct io_register reg[IGA2_SHADOW_VER_SYNC_END_REG_NUM];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*****************************************************</div><div class='add'>+**      Define IGA2 Display Timing                ****</div><div class='add'>+******************************************************/</div><div class='add'>+</div><div class='add'>+/* IGA2 Horizontal Total */</div><div class='add'>+struct iga2_hor_total {</div><div class='add'>+	int reg_num;</div><div class='add'>+	struct io_register reg[IGA2_HOR_TOTAL_REG_NUM];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* IGA2 Horizontal Addressable Video */</div><div class='add'>+struct iga2_hor_addr {</div><div class='add'>+	int reg_num;</div><div class='add'>+	struct io_register reg[IGA2_HOR_ADDR_REG_NUM];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* IGA2 Horizontal Blank Start */</div><div class='add'>+struct iga2_hor_blank_start {</div><div class='add'>+	int reg_num;</div><div class='add'>+	struct io_register reg[IGA2_HOR_BLANK_START_REG_NUM];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* IGA2 Horizontal Blank End */</div><div class='add'>+struct iga2_hor_blank_end {</div><div class='add'>+	int reg_num;</div><div class='add'>+	struct io_register reg[IGA2_HOR_BLANK_END_REG_NUM];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* IGA2 Horizontal Sync Start */</div><div class='add'>+struct iga2_hor_sync_start {</div><div class='add'>+	int reg_num;</div><div class='add'>+	struct io_register reg[IGA2_HOR_SYNC_START_REG_NUM];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* IGA2 Horizontal Sync End */</div><div class='add'>+struct iga2_hor_sync_end {</div><div class='add'>+	int reg_num;</div><div class='add'>+	struct io_register reg[IGA2_HOR_SYNC_END_REG_NUM];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* IGA2 Vertical Total */</div><div class='add'>+struct iga2_ver_total {</div><div class='add'>+	int reg_num;</div><div class='add'>+	struct io_register reg[IGA2_VER_TOTAL_REG_NUM];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* IGA2 Vertical Addressable Video */</div><div class='add'>+struct iga2_ver_addr {</div><div class='add'>+	int reg_num;</div><div class='add'>+	struct io_register reg[IGA2_VER_ADDR_REG_NUM];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* IGA2 Vertical Blank Start */</div><div class='add'>+struct iga2_ver_blank_start {</div><div class='add'>+	int reg_num;</div><div class='add'>+	struct io_register reg[IGA2_VER_BLANK_START_REG_NUM];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* IGA2 Vertical Blank End */</div><div class='add'>+struct iga2_ver_blank_end {</div><div class='add'>+	int reg_num;</div><div class='add'>+	struct io_register reg[IGA2_VER_BLANK_END_REG_NUM];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* IGA2 Vertical Sync Start */</div><div class='add'>+struct iga2_ver_sync_start {</div><div class='add'>+	int reg_num;</div><div class='add'>+	struct io_register reg[IGA2_VER_SYNC_START_REG_NUM];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* IGA2 Vertical Sync End */</div><div class='add'>+struct iga2_ver_sync_end {</div><div class='add'>+	int reg_num;</div><div class='add'>+	struct io_register reg[IGA2_VER_SYNC_END_REG_NUM];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* IGA1 Offset Register */</div><div class='add'>+struct iga1_offset {</div><div class='add'>+	int reg_num;</div><div class='add'>+	struct io_register reg[IGA1_OFFSET_REG_NUM];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* IGA2 Offset Register */</div><div class='add'>+struct iga2_offset {</div><div class='add'>+	int reg_num;</div><div class='add'>+	struct io_register reg[IGA2_OFFSET_REG_NUM];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct offset {</div><div class='add'>+	struct iga1_offset iga1_offset_reg;</div><div class='add'>+	struct iga2_offset iga2_offset_reg;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* IGA1 Fetch Count Register */</div><div class='add'>+struct iga1_fetch_count {</div><div class='add'>+	int reg_num;</div><div class='add'>+	struct io_register reg[IGA1_FETCH_COUNT_REG_NUM];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* IGA2 Fetch Count Register */</div><div class='add'>+struct iga2_fetch_count {</div><div class='add'>+	int reg_num;</div><div class='add'>+	struct io_register reg[IGA2_FETCH_COUNT_REG_NUM];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct fetch_count {</div><div class='add'>+	struct iga1_fetch_count iga1_fetch_count_reg;</div><div class='add'>+	struct iga2_fetch_count iga2_fetch_count_reg;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Starting Address Register */</div><div class='add'>+struct iga1_starting_addr {</div><div class='add'>+	int reg_num;</div><div class='add'>+	struct io_register reg[IGA1_STARTING_ADDR_REG_NUM];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct iga2_starting_addr {</div><div class='add'>+	int reg_num;</div><div class='add'>+	struct io_register reg[IGA2_STARTING_ADDR_REG_NUM];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct starting_addr {</div><div class='add'>+	struct iga1_starting_addr iga1_starting_addr_reg;</div><div class='add'>+	struct iga2_starting_addr iga2_starting_addr_reg;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* LCD Power Sequence Timer */</div><div class='add'>+struct lcd_pwd_seq_td0 {</div><div class='add'>+	int reg_num;</div><div class='add'>+	struct io_register reg[LCD_POWER_SEQ_TD0_REG_NUM];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct lcd_pwd_seq_td1 {</div><div class='add'>+	int reg_num;</div><div class='add'>+	struct io_register reg[LCD_POWER_SEQ_TD1_REG_NUM];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct lcd_pwd_seq_td2 {</div><div class='add'>+	int reg_num;</div><div class='add'>+	struct io_register reg[LCD_POWER_SEQ_TD2_REG_NUM];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct lcd_pwd_seq_td3 {</div><div class='add'>+	int reg_num;</div><div class='add'>+	struct io_register reg[LCD_POWER_SEQ_TD3_REG_NUM];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct _lcd_pwd_seq_timer {</div><div class='add'>+	struct lcd_pwd_seq_td0 td0;</div><div class='add'>+	struct lcd_pwd_seq_td1 td1;</div><div class='add'>+	struct lcd_pwd_seq_td2 td2;</div><div class='add'>+	struct lcd_pwd_seq_td3 td3;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* LCD Scaling Factor */</div><div class='add'>+struct _lcd_hor_scaling_factor {</div><div class='add'>+	int reg_num;</div><div class='add'>+	struct io_register reg[LCD_HOR_SCALING_FACTOR_REG_NUM];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct _lcd_ver_scaling_factor {</div><div class='add'>+	int reg_num;</div><div class='add'>+	struct io_register reg[LCD_VER_SCALING_FACTOR_REG_NUM];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct _lcd_scaling_factor {</div><div class='add'>+	struct _lcd_hor_scaling_factor lcd_hor_scaling_factor;</div><div class='add'>+	struct _lcd_ver_scaling_factor lcd_ver_scaling_factor;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct pll_map {</div><div class='add'>+	u32 clk;</div><div class='add'>+	u32 cle266_pll;</div><div class='add'>+	u32 k800_pll;</div><div class='add'>+	u32 cx700_pll;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rgbLUT {</div><div class='add'>+	u8 red;</div><div class='add'>+	u8 green;</div><div class='add'>+	u8 blue;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct lcd_pwd_seq_timer {</div><div class='add'>+	u16 td0;</div><div class='add'>+	u16 td1;</div><div class='add'>+	u16 td2;</div><div class='add'>+	u16 td3;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Display FIFO Relation Registers*/</div><div class='add'>+struct iga1_fifo_depth_select {</div><div class='add'>+	int reg_num;</div><div class='add'>+	struct io_register reg[IGA1_FIFO_DEPTH_SELECT_REG_NUM];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct iga1_fifo_threshold_select {</div><div class='add'>+	int reg_num;</div><div class='add'>+	struct io_register reg[IGA1_FIFO_THRESHOLD_REG_NUM];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct iga1_fifo_high_threshold_select {</div><div class='add'>+	int reg_num;</div><div class='add'>+	struct io_register reg[IGA1_FIFO_HIGH_THRESHOLD_REG_NUM];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct iga1_display_queue_expire_num {</div><div class='add'>+	int reg_num;</div><div class='add'>+	struct io_register reg[IGA1_DISPLAY_QUEUE_EXPIRE_NUM_REG_NUM];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct iga2_fifo_depth_select {</div><div class='add'>+	int reg_num;</div><div class='add'>+	struct io_register reg[IGA2_FIFO_DEPTH_SELECT_REG_NUM];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct iga2_fifo_threshold_select {</div><div class='add'>+	int reg_num;</div><div class='add'>+	struct io_register reg[IGA2_FIFO_THRESHOLD_REG_NUM];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct iga2_fifo_high_threshold_select {</div><div class='add'>+	int reg_num;</div><div class='add'>+	struct io_register reg[IGA2_FIFO_HIGH_THRESHOLD_REG_NUM];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct iga2_display_queue_expire_num {</div><div class='add'>+	int reg_num;</div><div class='add'>+	struct io_register reg[IGA2_DISPLAY_QUEUE_EXPIRE_NUM_REG_NUM];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct fifo_depth_select {</div><div class='add'>+	struct iga1_fifo_depth_select iga1_fifo_depth_select_reg;</div><div class='add'>+	struct iga2_fifo_depth_select iga2_fifo_depth_select_reg;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct fifo_threshold_select {</div><div class='add'>+	struct iga1_fifo_threshold_select iga1_fifo_threshold_select_reg;</div><div class='add'>+	struct iga2_fifo_threshold_select iga2_fifo_threshold_select_reg;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct fifo_high_threshold_select {</div><div class='add'>+	struct iga1_fifo_high_threshold_select</div><div class='add'>+	 iga1_fifo_high_threshold_select_reg;</div><div class='add'>+	struct iga2_fifo_high_threshold_select</div><div class='add'>+	 iga2_fifo_high_threshold_select_reg;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct display_queue_expire_num {</div><div class='add'>+	struct iga1_display_queue_expire_num</div><div class='add'>+	 iga1_display_queue_expire_num_reg;</div><div class='add'>+	struct iga2_display_queue_expire_num</div><div class='add'>+	 iga2_display_queue_expire_num_reg;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct iga1_crtc_timing {</div><div class='add'>+	struct iga1_hor_total hor_total;</div><div class='add'>+	struct iga1_hor_addr hor_addr;</div><div class='add'>+	struct iga1_hor_blank_start hor_blank_start;</div><div class='add'>+	struct iga1_hor_blank_end hor_blank_end;</div><div class='add'>+	struct iga1_hor_sync_start hor_sync_start;</div><div class='add'>+	struct iga1_hor_sync_end hor_sync_end;</div><div class='add'>+	struct iga1_ver_total ver_total;</div><div class='add'>+	struct iga1_ver_addr ver_addr;</div><div class='add'>+	struct iga1_ver_blank_start ver_blank_start;</div><div class='add'>+	struct iga1_ver_blank_end ver_blank_end;</div><div class='add'>+	struct iga1_ver_sync_start ver_sync_start;</div><div class='add'>+	struct iga1_ver_sync_end ver_sync_end;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct iga2_shadow_crtc_timing {</div><div class='add'>+	struct iga2_shadow_hor_total hor_total_shadow;</div><div class='add'>+	struct iga2_shadow_hor_blank_end hor_blank_end_shadow;</div><div class='add'>+	struct iga2_shadow_ver_total ver_total_shadow;</div><div class='add'>+	struct iga2_shadow_ver_addr ver_addr_shadow;</div><div class='add'>+	struct iga2_shadow_ver_blank_start ver_blank_start_shadow;</div><div class='add'>+	struct iga2_shadow_ver_blank_end ver_blank_end_shadow;</div><div class='add'>+	struct iga2_shadow_ver_sync_start ver_sync_start_shadow;</div><div class='add'>+	struct iga2_shadow_ver_sync_end ver_sync_end_shadow;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct iga2_crtc_timing {</div><div class='add'>+	struct iga2_hor_total hor_total;</div><div class='add'>+	struct iga2_hor_addr hor_addr;</div><div class='add'>+	struct iga2_hor_blank_start hor_blank_start;</div><div class='add'>+	struct iga2_hor_blank_end hor_blank_end;</div><div class='add'>+	struct iga2_hor_sync_start hor_sync_start;</div><div class='add'>+	struct iga2_hor_sync_end hor_sync_end;</div><div class='add'>+	struct iga2_ver_total ver_total;</div><div class='add'>+	struct iga2_ver_addr ver_addr;</div><div class='add'>+	struct iga2_ver_blank_start ver_blank_start;</div><div class='add'>+	struct iga2_ver_blank_end ver_blank_end;</div><div class='add'>+	struct iga2_ver_sync_start ver_sync_start;</div><div class='add'>+	struct iga2_ver_sync_end ver_sync_end;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* device ID */</div><div class='add'>+#define CLE266              0x3123</div><div class='add'>+#define KM400               0x3205</div><div class='add'>+#define CN400_FUNCTION2     0x2259</div><div class='add'>+#define CN400_FUNCTION3     0x3259</div><div class='add'>+/* support VT3314 chipset */</div><div class='add'>+#define CN700_FUNCTION2     0x2314</div><div class='add'>+#define CN700_FUNCTION3     0x3208</div><div class='add'>+/* VT3324 chipset */</div><div class='add'>+#define CX700_FUNCTION2     0x2324</div><div class='add'>+#define CX700_FUNCTION3     0x3324</div><div class='add'>+/* VT3204 chipset*/</div><div class='add'>+#define KM800_FUNCTION3      0x3204</div><div class='add'>+/* VT3336 chipset*/</div><div class='add'>+#define KM890_FUNCTION3      0x3336</div><div class='add'>+/* VT3327 chipset*/</div><div class='add'>+#define P4M890_FUNCTION3     0x3327</div><div class='add'>+/* VT3293 chipset*/</div><div class='add'>+#define CN750_FUNCTION3     0x3208</div><div class='add'>+/* VT3364 chipset*/</div><div class='add'>+#define P4M900_FUNCTION3    0x3364</div><div class='add'>+/* VT3353 chipset*/</div><div class='add'>+#define VX800_FUNCTION3     0x3353</div><div class='add'>+</div><div class='add'>+#define NUM_TOTAL_PLL_TABLE ARRAY_SIZE(pll_value)</div><div class='add'>+</div><div class='add'>+struct IODATA {</div><div class='add'>+	u8 Index;</div><div class='add'>+	u8 Mask;</div><div class='add'>+	u8 Data;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct pci_device_id_info {</div><div class='add'>+	u32 vendor;</div><div class='add'>+	u32 device;</div><div class='add'>+	u32 chip_index;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern unsigned int viafb_second_virtual_xres;</div><div class='add'>+extern unsigned int viafb_second_offset;</div><div class='add'>+extern int viafb_second_size;</div><div class='add'>+extern int viafb_SAMM_ON;</div><div class='add'>+extern int viafb_dual_fb;</div><div class='add'>+extern int viafb_LCD2_ON;</div><div class='add'>+extern int viafb_LCD_ON;</div><div class='add'>+extern int viafb_DVI_ON;</div><div class='add'>+extern int viafb_accel;</div><div class='add'>+extern int viafb_hotplug;</div><div class='add'>+</div><div class='add'>+void viafb_write_reg_mask(u8 index, int io_port, u8 data, u8 mask);</div><div class='add'>+void viafb_set_output_path(int device, int set_iga,</div><div class='add'>+	int output_interface);</div><div class='add'>+void viafb_fill_crtc_timing(struct crt_mode_table *crt_table,</div><div class='add'>+		      int mode_index, int bpp_byte, int set_iga);</div><div class='add'>+</div><div class='add'>+void viafb_set_vclock(u32 CLK, int set_iga);</div><div class='add'>+void viafb_load_reg(int timing_value, int viafb_load_reg_num,</div><div class='add'>+	struct io_register *reg,</div><div class='add'>+	      int io_type);</div><div class='add'>+void viafb_crt_disable(void);</div><div class='add'>+void viafb_crt_enable(void);</div><div class='add'>+void init_ad9389(void);</div><div class='add'>+/* Access I/O Function */</div><div class='add'>+void viafb_write_reg(u8 index, u16 io_port, u8 data);</div><div class='add'>+u8 viafb_read_reg(int io_port, u8 index);</div><div class='add'>+void viafb_lock_crt(void);</div><div class='add'>+void viafb_unlock_crt(void);</div><div class='add'>+void viafb_load_offset_reg(int h_addr, int bpp_byte, int set_iga);</div><div class='add'>+void viafb_load_fetch_count_reg(int h_addr, int bpp_byte, int set_iga);</div><div class='add'>+void viafb_write_regx(struct io_reg RegTable[], int ItemNum);</div><div class='add'>+struct VideoModeTable *viafb_get_modetbl_pointer(int Index);</div><div class='add'>+u32 viafb_get_clk_value(int clk);</div><div class='add'>+void viafb_load_FIFO_reg(int set_iga, int hor_active, int ver_active);</div><div class='add'>+void viafb_set_color_depth(int bpp_byte, int set_iga);</div><div class='add'>+void viafb_set_dpa_gfx(int output_interface, struct GFX_DPA_SETTING\</div><div class='add'>+					*p_gfx_dpa_setting);</div><div class='add'>+</div><div class='add'>+int viafb_setmode(int vmode_index, int hor_res, int ver_res,</div><div class='add'>+	    int video_bpp, int vmode_index1, int hor_res1,</div><div class='add'>+	    int ver_res1, int video_bpp1);</div><div class='add'>+void viafb_init_chip_info(void);</div><div class='add'>+void viafb_init_dac(int set_iga);</div><div class='add'>+int viafb_get_pixclock(int hres, int vres, int vmode_refresh);</div><div class='add'>+int viafb_get_refresh(int hres, int vres, u32 float_refresh);</div><div class='add'>+void viafb_update_device_setting(int hres, int vres, int bpp,</div><div class='add'>+			   int vmode_refresh, int flag);</div><div class='add'>+void viafb_get_mmio_info(unsigned long *mmio_base,</div><div class='add'>+	unsigned long *mmio_len);</div><div class='add'>+</div><div class='add'>+void viafb_set_iga_path(void);</div><div class='add'>+void viafb_set_start_addr(void);</div><div class='add'>+void viafb_get_fb_info(unsigned int *fb_base, unsigned int *fb_len);</div><div class='add'>+</div><div class='add'>+#endif /* __HW_H__ */</div><div class='head'>diff --git a/drivers/video/via/iface.c b/drivers/video/via/iface.c<br/>new file mode 100644<br/>index 000000000000..1570636c8d51<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/via/iface.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/via/iface.c</a></div><div class='hunk'>@@ -0,0 +1,78 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.</div><div class='add'>+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.</div><div class='add'>+</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public</div><div class='add'>+ * License as published by the Free Software Foundation;</div><div class='add'>+ * either version 2, or (at your option) any later version.</div><div class='add'>+</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even</div><div class='add'>+ * the implied warranty of MERCHANTABILITY or FITNESS FOR</div><div class='add'>+ * A PARTICULAR PURPOSE.See the GNU General Public License</div><div class='add'>+ * for more details.</div><div class='add'>+</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc.,</div><div class='add'>+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "global.h"</div><div class='add'>+</div><div class='add'>+/* Get frame buffer size from VGA BIOS */</div><div class='add'>+</div><div class='add'>+unsigned int viafb_get_memsize(void)</div><div class='add'>+{</div><div class='add'>+	unsigned int m;</div><div class='add'>+</div><div class='add'>+	/* If memory size provided by user */</div><div class='add'>+	if (viafb_memsize)</div><div class='add'>+		m = viafb_memsize * Mb;</div><div class='add'>+	else {</div><div class='add'>+		m = (unsigned int)viafb_read_reg(VIASR, SR39);</div><div class='add'>+		m = m * (4 * Mb);</div><div class='add'>+</div><div class='add'>+		if ((m &lt; (16 * Mb)) || (m &gt; (64 * Mb)))</div><div class='add'>+			m = 16 * Mb;</div><div class='add'>+	}</div><div class='add'>+	DEBUG_MSG(KERN_INFO "framebuffer size = %d Mb\n", m / Mb);</div><div class='add'>+	return m;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Get Video Buffer Starting Physical Address(back door)*/</div><div class='add'>+</div><div class='add'>+unsigned long viafb_get_videobuf_addr(void)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pdev = NULL;</div><div class='add'>+	unsigned char sys_mem;</div><div class='add'>+	unsigned char video_mem;</div><div class='add'>+	unsigned long sys_mem_size;</div><div class='add'>+	unsigned long video_mem_size;</div><div class='add'>+	/*system memory = 256 MB, video memory 64 MB */</div><div class='add'>+	unsigned long vmem_starting_adr = 0x0C000000;</div><div class='add'>+</div><div class='add'>+	pdev =</div><div class='add'>+	    (struct pci_dev *)pci_get_device(VIA_K800_BRIDGE_VID,</div><div class='add'>+					     VIA_K800_BRIDGE_DID, NULL);</div><div class='add'>+	if (pdev != NULL) {</div><div class='add'>+		pci_read_config_byte(pdev, VIA_K800_SYSTEM_MEMORY_REG,</div><div class='add'>+				     &amp;sys_mem);</div><div class='add'>+		pci_read_config_byte(pdev, VIA_K800_VIDEO_MEMORY_REG,</div><div class='add'>+				     &amp;video_mem);</div><div class='add'>+		video_mem = (video_mem &amp; 0x70) &gt;&gt; 4;</div><div class='add'>+		sys_mem_size = ((unsigned long)sys_mem) &lt;&lt; 24;</div><div class='add'>+		if (video_mem != 0)</div><div class='add'>+			video_mem_size = (1 &lt;&lt; (video_mem)) * 1024 * 1024;</div><div class='add'>+		else</div><div class='add'>+			video_mem_size = 0;</div><div class='add'>+</div><div class='add'>+		vmem_starting_adr = sys_mem_size - video_mem_size;</div><div class='add'>+		pci_dev_put(pdev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DEBUG_MSG(KERN_INFO "Video Memory Starting Address = %lx \n",</div><div class='add'>+		  vmem_starting_adr);</div><div class='add'>+	return vmem_starting_adr;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/video/via/iface.h b/drivers/video/via/iface.h<br/>new file mode 100644<br/>index 000000000000..790ec3e3aea2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/via/iface.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/via/iface.h</a></div><div class='hunk'>@@ -0,0 +1,38 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.</div><div class='add'>+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.</div><div class='add'>+</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public</div><div class='add'>+ * License as published by the Free Software Foundation;</div><div class='add'>+ * either version 2, or (at your option) any later version.</div><div class='add'>+</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even</div><div class='add'>+ * the implied warranty of MERCHANTABILITY or FITNESS FOR</div><div class='add'>+ * A PARTICULAR PURPOSE.See the GNU General Public License</div><div class='add'>+ * for more details.</div><div class='add'>+</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc.,</div><div class='add'>+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __IFACE_H__</div><div class='add'>+#define __IFACE_H__</div><div class='add'>+</div><div class='add'>+#define Kb  (1024)</div><div class='add'>+#define Mb  (Kb*Kb)</div><div class='add'>+</div><div class='add'>+#define VIA_K800_BRIDGE_VID         0x1106</div><div class='add'>+#define VIA_K800_BRIDGE_DID         0x3204</div><div class='add'>+</div><div class='add'>+#define VIA_K800_SYSTEM_MEMORY_REG  0x47</div><div class='add'>+#define VIA_K800_VIDEO_MEMORY_REG   0xA1</div><div class='add'>+</div><div class='add'>+extern int viafb_memsize;</div><div class='add'>+unsigned int viafb_get_memsize(void);</div><div class='add'>+unsigned long viafb_get_videobuf_addr(void);</div><div class='add'>+</div><div class='add'>+#endif /* __IFACE_H__ */</div><div class='head'>diff --git a/drivers/video/via/ioctl.c b/drivers/video/via/ioctl.c<br/>new file mode 100644<br/>index 000000000000..da03c074e32a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/via/ioctl.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/via/ioctl.c</a></div><div class='hunk'>@@ -0,0 +1,112 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.</div><div class='add'>+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.</div><div class='add'>+</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public</div><div class='add'>+ * License as published by the Free Software Foundation;</div><div class='add'>+ * either version 2, or (at your option) any later version.</div><div class='add'>+</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even</div><div class='add'>+ * the implied warranty of MERCHANTABILITY or FITNESS FOR</div><div class='add'>+ * A PARTICULAR PURPOSE.See the GNU General Public License</div><div class='add'>+ * for more details.</div><div class='add'>+</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc.,</div><div class='add'>+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "global.h"</div><div class='add'>+</div><div class='add'>+int viafb_ioctl_get_viafb_info(u_long arg)</div><div class='add'>+{</div><div class='add'>+	struct viafb_ioctl_info viainfo;</div><div class='add'>+</div><div class='add'>+	viainfo.viafb_id = VIAID;</div><div class='add'>+	viainfo.vendor_id = PCI_VIA_VENDOR_ID;</div><div class='add'>+</div><div class='add'>+	switch (viaparinfo-&gt;chip_info-&gt;gfx_chip_name) {</div><div class='add'>+	case UNICHROME_CLE266:</div><div class='add'>+		viainfo.device_id = UNICHROME_CLE266_DID;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case UNICHROME_K400:</div><div class='add'>+		viainfo.device_id = UNICHROME_K400_DID;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case UNICHROME_K800:</div><div class='add'>+		viainfo.device_id = UNICHROME_K800_DID;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case UNICHROME_PM800:</div><div class='add'>+		viainfo.device_id = UNICHROME_PM800_DID;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case UNICHROME_CN700:</div><div class='add'>+		viainfo.device_id = UNICHROME_CN700_DID;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case UNICHROME_CX700:</div><div class='add'>+		viainfo.device_id = UNICHROME_CX700_DID;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case UNICHROME_K8M890:</div><div class='add'>+		viainfo.device_id = UNICHROME_K8M890_DID;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case UNICHROME_P4M890:</div><div class='add'>+		viainfo.device_id = UNICHROME_P4M890_DID;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case UNICHROME_P4M900:</div><div class='add'>+		viainfo.device_id = UNICHROME_P4M900_DID;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	viainfo.version = VERSION_MAJOR;</div><div class='add'>+	viainfo.revision = VERSION_MINOR;</div><div class='add'>+</div><div class='add'>+	if (copy_to_user((void __user *)arg, &amp;viainfo, sizeof(viainfo)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Hot-Plug Priority: DVI &gt; CRT*/</div><div class='add'>+int viafb_ioctl_hotplug(int hres, int vres, int bpp)</div><div class='add'>+{</div><div class='add'>+	int DVIsense, status = 0;</div><div class='add'>+	DEBUG_MSG(KERN_INFO "viafb_ioctl_hotplug!!\n");</div><div class='add'>+</div><div class='add'>+	if (viaparinfo-&gt;chip_info-&gt;tmds_chip_info.tmds_chip_name !=</div><div class='add'>+		NON_TMDS_TRANSMITTER) {</div><div class='add'>+		DVIsense = viafb_dvi_sense();</div><div class='add'>+</div><div class='add'>+		if (DVIsense) {</div><div class='add'>+			DEBUG_MSG(KERN_INFO "DVI Attached...\n");</div><div class='add'>+			if (viafb_DeviceStatus != DVI_Device) {</div><div class='add'>+				viafb_DVI_ON = 1;</div><div class='add'>+				viafb_CRT_ON = 0;</div><div class='add'>+				viafb_LCD_ON = 0;</div><div class='add'>+				viafb_DeviceStatus = DVI_Device;</div><div class='add'>+				return viafb_DeviceStatus;</div><div class='add'>+			}</div><div class='add'>+			status = 1;</div><div class='add'>+		} else</div><div class='add'>+			DEBUG_MSG(KERN_INFO "DVI De-attached...\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((viafb_DeviceStatus != CRT_Device) &amp;&amp; (status == 0)) {</div><div class='add'>+		viafb_CRT_ON = 1;</div><div class='add'>+		viafb_DVI_ON = 0;</div><div class='add'>+		viafb_LCD_ON = 0;</div><div class='add'>+</div><div class='add'>+		viafb_DeviceStatus = CRT_Device;</div><div class='add'>+		return viafb_DeviceStatus;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/video/via/ioctl.h b/drivers/video/via/ioctl.h<br/>new file mode 100644<br/>index 000000000000..842fe30b9868<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/via/ioctl.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/via/ioctl.h</a></div><div class='hunk'>@@ -0,0 +1,210 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.</div><div class='add'>+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.</div><div class='add'>+</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public</div><div class='add'>+ * License as published by the Free Software Foundation;</div><div class='add'>+ * either version 2, or (at your option) any later version.</div><div class='add'>+</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even</div><div class='add'>+ * the implied warranty of MERCHANTABILITY or FITNESS FOR</div><div class='add'>+ * A PARTICULAR PURPOSE.See the GNU General Public License</div><div class='add'>+ * for more details.</div><div class='add'>+</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc.,</div><div class='add'>+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __IOCTL_H__</div><div class='add'>+#define __IOCTL_H__</div><div class='add'>+</div><div class='add'>+#ifndef __user</div><div class='add'>+#define __user</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* VIAFB IOCTL definition */</div><div class='add'>+#define VIAFB_GET_INFO_SIZE		0x56494101	/* 'VIA\01' */</div><div class='add'>+#define VIAFB_GET_INFO			0x56494102	/* 'VIA\02' */</div><div class='add'>+#define VIAFB_HOTPLUG			0x56494103	/* 'VIA\03' */</div><div class='add'>+#define VIAFB_SET_HOTPLUG_FLAG		0x56494104	/* 'VIA\04' */</div><div class='add'>+#define VIAFB_GET_RESOLUTION		0x56494105	/* 'VIA\05' */</div><div class='add'>+#define VIAFB_GET_SAMM_INFO		0x56494107	/* 'VIA\07' */</div><div class='add'>+#define VIAFB_TURN_ON_OUTPUT_DEVICE     0x56494108	/* 'VIA\08' */</div><div class='add'>+#define VIAFB_TURN_OFF_OUTPUT_DEVICE    0x56494109	/* 'VIA\09' */</div><div class='add'>+#define VIAFB_SET_DEVICE		0x5649410A</div><div class='add'>+#define VIAFB_GET_DEVICE		0x5649410B</div><div class='add'>+#define VIAFB_GET_DRIVER_VERSION	0x56494112	/* 'VIA\12' */</div><div class='add'>+#define VIAFB_GET_CHIP_INFO		0x56494113	/* 'VIA\13' */</div><div class='add'>+#define VIAFB_SET_DEVICE_INFO           0x56494114</div><div class='add'>+#define VIAFB_GET_DEVICE_INFO           0x56494115</div><div class='add'>+</div><div class='add'>+#define VIAFB_GET_DEVICE_SUPPORT	0x56494118</div><div class='add'>+#define VIAFB_GET_DEVICE_CONNECT	0x56494119</div><div class='add'>+#define VIAFB_GET_PANEL_SUPPORT_EXPAND	0x5649411A</div><div class='add'>+#define VIAFB_GET_DRIVER_NAME		0x56494122</div><div class='add'>+#define VIAFB_GET_DEVICE_SUPPORT_STATE	0x56494123</div><div class='add'>+#define VIAFB_GET_GAMMA_LUT		0x56494124</div><div class='add'>+#define VIAFB_SET_GAMMA_LUT		0x56494125</div><div class='add'>+#define VIAFB_GET_GAMMA_SUPPORT_STATE	0x56494126</div><div class='add'>+#define VIAFB_SET_VIDEO_DEVICE		0x56494127</div><div class='add'>+#define VIAFB_GET_VIDEO_DEVICE		0x56494128</div><div class='add'>+#define VIAFB_SET_SECOND_MODE		0x56494129</div><div class='add'>+#define VIAFB_SYNC_SURFACE		0x56494130</div><div class='add'>+#define VIAFB_GET_DRIVER_CAPS		0x56494131</div><div class='add'>+#define VIAFB_GET_IGA_SCALING_INFO	0x56494132</div><div class='add'>+#define VIAFB_GET_PANEL_MAX_SIZE	0x56494133</div><div class='add'>+#define VIAFB_GET_PANEL_MAX_POSITION	0x56494134</div><div class='add'>+#define VIAFB_SET_PANEL_SIZE		0x56494135</div><div class='add'>+#define VIAFB_SET_PANEL_POSITION        0x56494136</div><div class='add'>+#define VIAFB_GET_PANEL_POSITION        0x56494137</div><div class='add'>+#define VIAFB_GET_PANEL_SIZE		0x56494138</div><div class='add'>+</div><div class='add'>+#define None_Device 0x00</div><div class='add'>+#define CRT_Device  0x01</div><div class='add'>+#define LCD_Device  0x02</div><div class='add'>+#define DVI_Device  0x08</div><div class='add'>+#define CRT2_Device 0x10</div><div class='add'>+#define LCD2_Device 0x40</div><div class='add'>+</div><div class='add'>+#define OP_LCD_CENTERING   0x01</div><div class='add'>+#define OP_LCD_PANEL_ID    0x02</div><div class='add'>+#define OP_LCD_MODE        0x03</div><div class='add'>+</div><div class='add'>+/*SAMM operation flag*/</div><div class='add'>+#define OP_SAMM            0x80</div><div class='add'>+</div><div class='add'>+#define LCD_PANEL_ID_MAXIMUM	22</div><div class='add'>+</div><div class='add'>+#define STATE_ON            0x1</div><div class='add'>+#define STATE_OFF           0x0</div><div class='add'>+#define STATE_DEFAULT       0xFFFF</div><div class='add'>+</div><div class='add'>+#define MAX_ACTIVE_DEV_NUM  2</div><div class='add'>+</div><div class='add'>+struct device_t {</div><div class='add'>+	unsigned short crt:1;</div><div class='add'>+	unsigned short dvi:1;</div><div class='add'>+	unsigned short lcd:1;</div><div class='add'>+	unsigned short samm:1;</div><div class='add'>+	unsigned short lcd_dsp_cent:1;</div><div class='add'>+	unsigned char lcd_mode:1;</div><div class='add'>+	unsigned short epia_dvi:1;</div><div class='add'>+	unsigned short lcd_dual_edge:1;</div><div class='add'>+	unsigned short lcd2:1;</div><div class='add'>+</div><div class='add'>+	unsigned short primary_dev;</div><div class='add'>+	unsigned char lcd_panel_id;</div><div class='add'>+	unsigned short xres, yres;</div><div class='add'>+	unsigned short xres1, yres1;</div><div class='add'>+	unsigned short refresh;</div><div class='add'>+	unsigned short bpp;</div><div class='add'>+	unsigned short refresh1;</div><div class='add'>+	unsigned short bpp1;</div><div class='add'>+	unsigned short sequence;</div><div class='add'>+	unsigned short bus_width;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct viafb_ioctl_info {</div><div class='add'>+	u32 viafb_id;		/* for identifying viafb */</div><div class='add'>+#define VIAID       0x56494146	/* Identify myself with 'VIAF' */</div><div class='add'>+	u16 vendor_id;</div><div class='add'>+	u16 device_id;</div><div class='add'>+	u8 version;</div><div class='add'>+	u8 revision;</div><div class='add'>+	u8 reserved[246];	/* for future use */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct viafb_ioctl_mode {</div><div class='add'>+	u32 xres;</div><div class='add'>+	u32 yres;</div><div class='add'>+	u32 refresh;</div><div class='add'>+	u32 bpp;</div><div class='add'>+	u32 xres_sec;</div><div class='add'>+	u32 yres_sec;</div><div class='add'>+	u32 virtual_xres_sec;</div><div class='add'>+	u32 virtual_yres_sec;</div><div class='add'>+	u32 refresh_sec;</div><div class='add'>+	u32 bpp_sec;</div><div class='add'>+};</div><div class='add'>+struct viafb_ioctl_samm {</div><div class='add'>+	u32 samm_status;</div><div class='add'>+	u32 size_prim;</div><div class='add'>+	u32 size_sec;</div><div class='add'>+	u32 mem_base;</div><div class='add'>+	u32 offset_sec;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct viafb_driver_version {</div><div class='add'>+	int iMajorNum;</div><div class='add'>+	int iKernelNum;</div><div class='add'>+	int iOSNum;</div><div class='add'>+	int iMinorNum;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct viafb_ioctl_lcd_attribute {</div><div class='add'>+	unsigned int panel_id;</div><div class='add'>+	unsigned int display_center;</div><div class='add'>+	unsigned int lcd_mode;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct viafb_ioctl_setting {</div><div class='add'>+	/* Enable or disable active devices */</div><div class='add'>+	unsigned short device_flag;</div><div class='add'>+	/* Indicate which device should be turn on or turn off. */</div><div class='add'>+	unsigned short device_status;</div><div class='add'>+	unsigned int reserved;</div><div class='add'>+	/* Indicate which LCD's attribute can be changed. */</div><div class='add'>+	unsigned short lcd_operation_flag;</div><div class='add'>+	/* 1: SAMM ON  0: SAMM OFF */</div><div class='add'>+	unsigned short samm_status;</div><div class='add'>+	/* horizontal resolution of first device */</div><div class='add'>+	unsigned short first_dev_hor_res;</div><div class='add'>+	/* vertical resolution of first device */</div><div class='add'>+	unsigned short first_dev_ver_res;</div><div class='add'>+	/* horizontal resolution of second device */</div><div class='add'>+	unsigned short second_dev_hor_res;</div><div class='add'>+	/* vertical resolution of second device */</div><div class='add'>+	unsigned short second_dev_ver_res;</div><div class='add'>+	/* refresh rate of first device */</div><div class='add'>+	unsigned short first_dev_refresh;</div><div class='add'>+	/* bpp of first device */</div><div class='add'>+	unsigned short first_dev_bpp;</div><div class='add'>+	/* refresh rate of second device */</div><div class='add'>+	unsigned short second_dev_refresh;</div><div class='add'>+	/* bpp of second device */</div><div class='add'>+	unsigned short second_dev_bpp;</div><div class='add'>+	/* Indicate which device are primary display device. */</div><div class='add'>+	unsigned int primary_device;</div><div class='add'>+	/* Indicate which device will show video. only valid in duoview mode */</div><div class='add'>+	unsigned int video_device_status;</div><div class='add'>+	unsigned int struct_reserved[34];</div><div class='add'>+	struct viafb_ioctl_lcd_attribute lcd_attributes;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct _UTFunctionCaps {</div><div class='add'>+	unsigned int dw3DScalingState;</div><div class='add'>+	unsigned int reserved[31];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct _POSITIONVALUE {</div><div class='add'>+	unsigned int dwX;</div><div class='add'>+	unsigned int dwY;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct _panel_size_pos_info {</div><div class='add'>+	unsigned int device_type;</div><div class='add'>+	int x;</div><div class='add'>+	int y;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern int viafb_LCD_ON;</div><div class='add'>+extern int viafb_DVI_ON;</div><div class='add'>+</div><div class='add'>+int viafb_ioctl_get_viafb_info(u_long arg);</div><div class='add'>+int viafb_ioctl_hotplug(int hres, int vres, int bpp);</div><div class='add'>+</div><div class='add'>+#endif /* __IOCTL_H__ */</div><div class='head'>diff --git a/drivers/video/via/lcd.c b/drivers/video/via/lcd.c<br/>new file mode 100644<br/>index 000000000000..6c7290a6a447<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/via/lcd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/via/lcd.c</a></div><div class='hunk'>@@ -0,0 +1,1821 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.</div><div class='add'>+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.</div><div class='add'>+</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public</div><div class='add'>+ * License as published by the Free Software Foundation;</div><div class='add'>+ * either version 2, or (at your option) any later version.</div><div class='add'>+</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even</div><div class='add'>+ * the implied warranty of MERCHANTABILITY or FITNESS FOR</div><div class='add'>+ * A PARTICULAR PURPOSE.See the GNU General Public License</div><div class='add'>+ * for more details.</div><div class='add'>+</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc.,</div><div class='add'>+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "global.h"</div><div class='add'>+#include "lcdtbl.h"</div><div class='add'>+</div><div class='add'>+static struct iga2_shadow_crtc_timing iga2_shadow_crtc_reg = {</div><div class='add'>+	/* IGA2 Shadow Horizontal Total */</div><div class='add'>+	{IGA2_SHADOW_HOR_TOTAL_REG_NUM, {{CR6D, 0, 7}, {CR71, 3, 3} } },</div><div class='add'>+	/* IGA2 Shadow Horizontal Blank End */</div><div class='add'>+	{IGA2_SHADOW_HOR_BLANK_END_REG_NUM, {{CR6E, 0, 7} } },</div><div class='add'>+	/* IGA2 Shadow Vertical Total */</div><div class='add'>+	{IGA2_SHADOW_VER_TOTAL_REG_NUM, {{CR6F, 0, 7}, {CR71, 0, 2} } },</div><div class='add'>+	/* IGA2 Shadow Vertical Addressable Video */</div><div class='add'>+	{IGA2_SHADOW_VER_ADDR_REG_NUM, {{CR70, 0, 7}, {CR71, 4, 6} } },</div><div class='add'>+	/* IGA2 Shadow Vertical Blank Start */</div><div class='add'>+	{IGA2_SHADOW_VER_BLANK_START_REG_NUM,</div><div class='add'>+	 {{CR72, 0, 7}, {CR74, 4, 6} } },</div><div class='add'>+	/* IGA2 Shadow Vertical Blank End */</div><div class='add'>+	{IGA2_SHADOW_VER_BLANK_END_REG_NUM, {{CR73, 0, 7}, {CR74, 0, 2} } },</div><div class='add'>+	/* IGA2 Shadow Vertical Sync Start */</div><div class='add'>+	{IGA2_SHADOW_VER_SYNC_START_REG_NUM, {{CR75, 0, 7}, {CR76, 4, 6} } },</div><div class='add'>+	/* IGA2 Shadow Vertical Sync End */</div><div class='add'>+	{IGA2_SHADOW_VER_SYNC_END_REG_NUM, {{CR76, 0, 3} } }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct _lcd_scaling_factor lcd_scaling_factor = {</div><div class='add'>+	/* LCD Horizontal Scaling Factor Register */</div><div class='add'>+	{LCD_HOR_SCALING_FACTOR_REG_NUM,</div><div class='add'>+	 {{CR9F, 0, 1}, {CR77, 0, 7}, {CR79, 4, 5} } },</div><div class='add'>+	/* LCD Vertical Scaling Factor Register */</div><div class='add'>+	{LCD_VER_SCALING_FACTOR_REG_NUM,</div><div class='add'>+	 {{CR79, 3, 3}, {CR78, 0, 7}, {CR79, 6, 7} } }</div><div class='add'>+};</div><div class='add'>+static struct _lcd_scaling_factor lcd_scaling_factor_CLE = {</div><div class='add'>+	/* LCD Horizontal Scaling Factor Register */</div><div class='add'>+	{LCD_HOR_SCALING_FACTOR_REG_NUM_CLE, {{CR77, 0, 7}, {CR79, 4, 5} } },</div><div class='add'>+	/* LCD Vertical Scaling Factor Register */</div><div class='add'>+	{LCD_VER_SCALING_FACTOR_REG_NUM_CLE, {{CR78, 0, 7}, {CR79, 6, 7} } }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int check_lvds_chip(int device_id_subaddr, int device_id);</div><div class='add'>+static bool lvds_identify_integratedlvds(void);</div><div class='add'>+static int fp_id_to_vindex(int panel_id);</div><div class='add'>+static int lvds_register_read(int index);</div><div class='add'>+static void load_lcd_scaling(int set_hres, int set_vres, int panel_hres,</div><div class='add'>+		      int panel_vres);</div><div class='add'>+static void load_lcd_k400_patch_tbl(int set_hres, int set_vres,</div><div class='add'>+	int panel_id);</div><div class='add'>+static void load_lcd_p880_patch_tbl(int set_hres, int set_vres,</div><div class='add'>+	int panel_id);</div><div class='add'>+static void load_lcd_patch_regs(int set_hres, int set_vres,</div><div class='add'>+	int panel_id, int set_iga);</div><div class='add'>+static void via_pitch_alignment_patch_lcd(</div><div class='add'>+	struct lvds_setting_information *plvds_setting_info,</div><div class='add'>+				   struct lvds_chip_information</div><div class='add'>+				   *plvds_chip_info);</div><div class='add'>+static void lcd_patch_skew_dvp0(struct lvds_setting_information</div><div class='add'>+			 *plvds_setting_info,</div><div class='add'>+			 struct lvds_chip_information *plvds_chip_info);</div><div class='add'>+static void lcd_patch_skew_dvp1(struct lvds_setting_information</div><div class='add'>+			 *plvds_setting_info,</div><div class='add'>+			 struct lvds_chip_information *plvds_chip_info);</div><div class='add'>+static void lcd_patch_skew(struct lvds_setting_information</div><div class='add'>+	*plvds_setting_info, struct lvds_chip_information *plvds_chip_info);</div><div class='add'>+</div><div class='add'>+static void integrated_lvds_disable(struct lvds_setting_information</div><div class='add'>+			     *plvds_setting_info,</div><div class='add'>+			     struct lvds_chip_information *plvds_chip_info);</div><div class='add'>+static void integrated_lvds_enable(struct lvds_setting_information</div><div class='add'>+			    *plvds_setting_info,</div><div class='add'>+			    struct lvds_chip_information *plvds_chip_info);</div><div class='add'>+static void lcd_powersequence_off(void);</div><div class='add'>+static void lcd_powersequence_on(void);</div><div class='add'>+static void fill_lcd_format(void);</div><div class='add'>+static void check_diport_of_integrated_lvds(</div><div class='add'>+	struct lvds_chip_information *plvds_chip_info,</div><div class='add'>+				     struct lvds_setting_information</div><div class='add'>+				     *plvds_setting_info);</div><div class='add'>+static struct display_timing lcd_centering_timging(struct display_timing</div><div class='add'>+					    mode_crt_reg,</div><div class='add'>+					   struct display_timing panel_crt_reg);</div><div class='add'>+static void load_crtc_shadow_timing(struct display_timing mode_timing,</div><div class='add'>+			     struct display_timing panel_timing);</div><div class='add'>+static void viafb_load_scaling_factor_for_p4m900(int set_hres,</div><div class='add'>+	int set_vres, int panel_hres, int panel_vres);</div><div class='add'>+</div><div class='add'>+static int check_lvds_chip(int device_id_subaddr, int device_id)</div><div class='add'>+{</div><div class='add'>+	if (lvds_register_read(device_id_subaddr) == device_id)</div><div class='add'>+		return OK;</div><div class='add'>+	else</div><div class='add'>+		return FAIL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void viafb_init_lcd_size(void)</div><div class='add'>+{</div><div class='add'>+	DEBUG_MSG(KERN_INFO "viafb_init_lcd_size()\n");</div><div class='add'>+	DEBUG_MSG(KERN_INFO</div><div class='add'>+		"viaparinfo-&gt;lvds_setting_info-&gt;get_lcd_size_method %d\n",</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;get_lcd_size_method);</div><div class='add'>+</div><div class='add'>+	switch (viaparinfo-&gt;lvds_setting_info-&gt;get_lcd_size_method) {</div><div class='add'>+	case GET_LCD_SIZE_BY_SYSTEM_BIOS:</div><div class='add'>+		break;</div><div class='add'>+	case GET_LCD_SZIE_BY_HW_STRAPPING:</div><div class='add'>+		break;</div><div class='add'>+	case GET_LCD_SIZE_BY_VGA_BIOS:</div><div class='add'>+		DEBUG_MSG(KERN_INFO "Get LCD Size method by VGA BIOS !!\n");</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_size =</div><div class='add'>+		    fp_id_to_vindex(viafb_lcd_panel_id);</div><div class='add'>+		DEBUG_MSG(KERN_INFO "LCD Panel_ID = %d\n",</div><div class='add'>+			  viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_id);</div><div class='add'>+		DEBUG_MSG(KERN_INFO "LCD Panel Size = %d\n",</div><div class='add'>+			  viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_size);</div><div class='add'>+		break;</div><div class='add'>+	case GET_LCD_SIZE_BY_USER_SETTING:</div><div class='add'>+		DEBUG_MSG(KERN_INFO "Get LCD Size method by user setting !!\n");</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_size =</div><div class='add'>+		    fp_id_to_vindex(viafb_lcd_panel_id);</div><div class='add'>+		DEBUG_MSG(KERN_INFO "LCD Panel_ID = %d\n",</div><div class='add'>+			  viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_id);</div><div class='add'>+		DEBUG_MSG(KERN_INFO "LCD Panel Size = %d\n",</div><div class='add'>+			  viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_size);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		DEBUG_MSG(KERN_INFO "viafb_init_lcd_size fail\n");</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_id =</div><div class='add'>+			LCD_PANEL_ID1_800X600;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_size =</div><div class='add'>+		    fp_id_to_vindex(LCD_PANEL_ID1_800X600);</div><div class='add'>+	}</div><div class='add'>+	viaparinfo-&gt;lvds_setting_info2-&gt;lcd_panel_id =</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_id;</div><div class='add'>+	viaparinfo-&gt;lvds_setting_info2-&gt;lcd_panel_size =</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_size;</div><div class='add'>+	viaparinfo-&gt;lvds_setting_info2-&gt;lcd_panel_hres =</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_hres;</div><div class='add'>+	viaparinfo-&gt;lvds_setting_info2-&gt;lcd_panel_vres =</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_vres;</div><div class='add'>+	viaparinfo-&gt;lvds_setting_info2-&gt;device_lcd_dualedge =</div><div class='add'>+	    viaparinfo-&gt;lvds_setting_info-&gt;device_lcd_dualedge;</div><div class='add'>+	viaparinfo-&gt;lvds_setting_info2-&gt;LCDDithering =</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;LCDDithering;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool lvds_identify_integratedlvds(void)</div><div class='add'>+{</div><div class='add'>+	if (viafb_display_hardware_layout == HW_LAYOUT_LCD_EXTERNAL_LCD2) {</div><div class='add'>+		/* Two dual channel LCD (Internal LVDS + External LVDS): */</div><div class='add'>+		/* If we have an external LVDS, such as VT1636, we should</div><div class='add'>+		   have its chip ID already. */</div><div class='add'>+		if (viaparinfo-&gt;chip_info-&gt;lvds_chip_info.lvds_chip_name) {</div><div class='add'>+			viaparinfo-&gt;chip_info-&gt;lvds_chip_info2.lvds_chip_name =</div><div class='add'>+			    INTEGRATED_LVDS;</div><div class='add'>+			DEBUG_MSG(KERN_INFO "Support two dual channel LVDS!\</div><div class='add'>+				  (Internal LVDS + External LVDS)\n");</div><div class='add'>+		} else {</div><div class='add'>+			viaparinfo-&gt;chip_info-&gt;lvds_chip_info.lvds_chip_name =</div><div class='add'>+			    INTEGRATED_LVDS;</div><div class='add'>+			DEBUG_MSG(KERN_INFO "Not found external LVDS,\</div><div class='add'>+				  so can't support two dual channel LVDS!\n");</div><div class='add'>+		}</div><div class='add'>+	} else if (viafb_display_hardware_layout == HW_LAYOUT_LCD1_LCD2) {</div><div class='add'>+		/* Two single channel LCD (Internal LVDS + Internal LVDS): */</div><div class='add'>+		viaparinfo-&gt;chip_info-&gt;lvds_chip_info.lvds_chip_name =</div><div class='add'>+		INTEGRATED_LVDS;</div><div class='add'>+		viaparinfo-&gt;chip_info-&gt;lvds_chip_info2.lvds_chip_name =</div><div class='add'>+			INTEGRATED_LVDS;</div><div class='add'>+		DEBUG_MSG(KERN_INFO "Support two single channel LVDS!\</div><div class='add'>+			  (Internal LVDS + Internal LVDS)\n");</div><div class='add'>+	} else if (viafb_display_hardware_layout != HW_LAYOUT_DVI_ONLY) {</div><div class='add'>+		/* If we have found external LVDS, just use it,</div><div class='add'>+		   otherwise, we will use internal LVDS as default. */</div><div class='add'>+		if (!viaparinfo-&gt;chip_info-&gt;lvds_chip_info.lvds_chip_name) {</div><div class='add'>+			viaparinfo-&gt;chip_info-&gt;lvds_chip_info.lvds_chip_name =</div><div class='add'>+			    INTEGRATED_LVDS;</div><div class='add'>+			DEBUG_MSG(KERN_INFO "Found Integrated LVDS!\n");</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		viaparinfo-&gt;chip_info-&gt;lvds_chip_info.lvds_chip_name =</div><div class='add'>+			NON_LVDS_TRANSMITTER;</div><div class='add'>+		DEBUG_MSG(KERN_INFO "Do not support LVDS!\n");</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int viafb_lvds_trasmitter_identify(void)</div><div class='add'>+{</div><div class='add'>+	viaparinfo-&gt;i2c_stuff.i2c_port = I2CPORTINDEX;</div><div class='add'>+	if (viafb_lvds_identify_vt1636()) {</div><div class='add'>+		viaparinfo-&gt;chip_info-&gt;lvds_chip_info.i2c_port = I2CPORTINDEX;</div><div class='add'>+		DEBUG_MSG(KERN_INFO</div><div class='add'>+			  "Found VIA VT1636 LVDS on port i2c 0x31 \n");</div><div class='add'>+	} else {</div><div class='add'>+		viaparinfo-&gt;i2c_stuff.i2c_port = GPIOPORTINDEX;</div><div class='add'>+		if (viafb_lvds_identify_vt1636()) {</div><div class='add'>+			viaparinfo-&gt;chip_info-&gt;lvds_chip_info.i2c_port =</div><div class='add'>+				GPIOPORTINDEX;</div><div class='add'>+			DEBUG_MSG(KERN_INFO</div><div class='add'>+				  "Found VIA VT1636 LVDS on port gpio 0x2c \n");</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (viaparinfo-&gt;chip_info-&gt;gfx_chip_name == UNICHROME_CX700)</div><div class='add'>+		lvds_identify_integratedlvds();</div><div class='add'>+</div><div class='add'>+	if (viaparinfo-&gt;chip_info-&gt;lvds_chip_info.lvds_chip_name)</div><div class='add'>+		return true;</div><div class='add'>+	/* Check for VT1631: */</div><div class='add'>+	viaparinfo-&gt;chip_info-&gt;lvds_chip_info.lvds_chip_name = VT1631_LVDS;</div><div class='add'>+	viaparinfo-&gt;chip_info-&gt;lvds_chip_info.lvds_chip_slave_addr =</div><div class='add'>+		VT1631_LVDS_I2C_ADDR;</div><div class='add'>+</div><div class='add'>+	if (check_lvds_chip(VT1631_DEVICE_ID_REG, VT1631_DEVICE_ID) != FAIL) {</div><div class='add'>+		DEBUG_MSG(KERN_INFO "\n VT1631 LVDS ! \n");</div><div class='add'>+		DEBUG_MSG(KERN_INFO "\n %2d",</div><div class='add'>+			  viaparinfo-&gt;chip_info-&gt;lvds_chip_info.lvds_chip_name);</div><div class='add'>+		DEBUG_MSG(KERN_INFO "\n %2d",</div><div class='add'>+			  viaparinfo-&gt;chip_info-&gt;lvds_chip_info.lvds_chip_name);</div><div class='add'>+		return OK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	viaparinfo-&gt;chip_info-&gt;lvds_chip_info.lvds_chip_name =</div><div class='add'>+		NON_LVDS_TRANSMITTER;</div><div class='add'>+	viaparinfo-&gt;chip_info-&gt;lvds_chip_info.lvds_chip_slave_addr =</div><div class='add'>+		VT1631_LVDS_I2C_ADDR;</div><div class='add'>+	return FAIL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fp_id_to_vindex(int panel_id)</div><div class='add'>+{</div><div class='add'>+	DEBUG_MSG(KERN_INFO "fp_get_panel_id()\n");</div><div class='add'>+</div><div class='add'>+	if (panel_id &gt; LCD_PANEL_ID_MAXIMUM)</div><div class='add'>+		viafb_lcd_panel_id = panel_id =</div><div class='add'>+		viafb_read_reg(VIACR, CR3F) &amp; 0x0F;</div><div class='add'>+</div><div class='add'>+	switch (panel_id) {</div><div class='add'>+	case 0x0:</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_hres = 640;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_vres = 480;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_id =</div><div class='add'>+			LCD_PANEL_ID0_640X480;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;device_lcd_dualedge = 0;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;LCDDithering = 1;</div><div class='add'>+		return VIA_RES_640X480;</div><div class='add'>+		break;</div><div class='add'>+	case 0x1:</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_hres = 800;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_vres = 600;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_id =</div><div class='add'>+			LCD_PANEL_ID1_800X600;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;device_lcd_dualedge = 0;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;LCDDithering = 1;</div><div class='add'>+		return VIA_RES_800X600;</div><div class='add'>+		break;</div><div class='add'>+	case 0x2:</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_hres = 1024;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_vres = 768;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_id =</div><div class='add'>+			LCD_PANEL_ID2_1024X768;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;device_lcd_dualedge = 0;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;LCDDithering = 1;</div><div class='add'>+		return VIA_RES_1024X768;</div><div class='add'>+		break;</div><div class='add'>+	case 0x3:</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_hres = 1280;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_vres = 768;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_id =</div><div class='add'>+			LCD_PANEL_ID3_1280X768;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;device_lcd_dualedge = 0;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;LCDDithering = 1;</div><div class='add'>+		return VIA_RES_1280X768;</div><div class='add'>+		break;</div><div class='add'>+	case 0x4:</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_hres = 1280;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_vres = 1024;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_id =</div><div class='add'>+			LCD_PANEL_ID4_1280X1024;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;device_lcd_dualedge = 1;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;LCDDithering = 1;</div><div class='add'>+		return VIA_RES_1280X1024;</div><div class='add'>+		break;</div><div class='add'>+	case 0x5:</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_hres = 1400;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_vres = 1050;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_id =</div><div class='add'>+			LCD_PANEL_ID5_1400X1050;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;device_lcd_dualedge = 1;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;LCDDithering = 1;</div><div class='add'>+		return VIA_RES_1400X1050;</div><div class='add'>+		break;</div><div class='add'>+	case 0x6:</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_hres = 1600;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_vres = 1200;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_id =</div><div class='add'>+			LCD_PANEL_ID6_1600X1200;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;device_lcd_dualedge = 1;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;LCDDithering = 1;</div><div class='add'>+		return VIA_RES_1600X1200;</div><div class='add'>+		break;</div><div class='add'>+	case 0x8:</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_hres = 800;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_vres = 480;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_id =</div><div class='add'>+			LCD_PANEL_IDA_800X480;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;device_lcd_dualedge = 0;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;LCDDithering = 1;</div><div class='add'>+		return VIA_RES_800X480;</div><div class='add'>+		break;</div><div class='add'>+	case 0x9:</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_hres = 1024;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_vres = 768;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_id =</div><div class='add'>+			LCD_PANEL_ID2_1024X768;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;device_lcd_dualedge = 1;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;LCDDithering = 1;</div><div class='add'>+		return VIA_RES_1024X768;</div><div class='add'>+		break;</div><div class='add'>+	case 0xA:</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_hres = 1024;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_vres = 768;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_id =</div><div class='add'>+			LCD_PANEL_ID2_1024X768;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;device_lcd_dualedge = 0;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;LCDDithering = 0;</div><div class='add'>+		return VIA_RES_1024X768;</div><div class='add'>+		break;</div><div class='add'>+	case 0xB:</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_hres = 1024;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_vres = 768;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_id =</div><div class='add'>+			LCD_PANEL_ID2_1024X768;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;device_lcd_dualedge = 1;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;LCDDithering = 0;</div><div class='add'>+		return VIA_RES_1024X768;</div><div class='add'>+		break;</div><div class='add'>+	case 0xC:</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_hres = 1280;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_vres = 768;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_id =</div><div class='add'>+			LCD_PANEL_ID3_1280X768;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;device_lcd_dualedge = 0;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;LCDDithering = 0;</div><div class='add'>+		return VIA_RES_1280X768;</div><div class='add'>+		break;</div><div class='add'>+	case 0xD:</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_hres = 1280;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_vres = 1024;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_id =</div><div class='add'>+			LCD_PANEL_ID4_1280X1024;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;device_lcd_dualedge = 1;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;LCDDithering = 0;</div><div class='add'>+		return VIA_RES_1280X1024;</div><div class='add'>+		break;</div><div class='add'>+	case 0xE:</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_hres = 1400;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_vres = 1050;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_id =</div><div class='add'>+			LCD_PANEL_ID5_1400X1050;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;device_lcd_dualedge = 1;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;LCDDithering = 0;</div><div class='add'>+		return VIA_RES_1400X1050;</div><div class='add'>+		break;</div><div class='add'>+	case 0xF:</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_hres = 1600;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_vres = 1200;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_id =</div><div class='add'>+			LCD_PANEL_ID6_1600X1200;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;device_lcd_dualedge = 1;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;LCDDithering = 0;</div><div class='add'>+		return VIA_RES_1600X1200;</div><div class='add'>+		break;</div><div class='add'>+	case 0x10:</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_hres = 1366;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_vres = 768;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_id =</div><div class='add'>+			LCD_PANEL_ID7_1366X768;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;device_lcd_dualedge = 0;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;LCDDithering = 0;</div><div class='add'>+		return VIA_RES_1368X768;</div><div class='add'>+		break;</div><div class='add'>+	case 0x11:</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_hres = 1024;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_vres = 600;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_id =</div><div class='add'>+			LCD_PANEL_ID8_1024X600;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;device_lcd_dualedge = 0;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;LCDDithering = 1;</div><div class='add'>+		return VIA_RES_1024X600;</div><div class='add'>+		break;</div><div class='add'>+	case 0x12:</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_hres = 1280;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_vres = 768;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_id =</div><div class='add'>+			LCD_PANEL_ID3_1280X768;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;device_lcd_dualedge = 1;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;LCDDithering = 1;</div><div class='add'>+		return VIA_RES_1280X768;</div><div class='add'>+		break;</div><div class='add'>+	case 0x13:</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_hres = 1280;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_vres = 800;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_id =</div><div class='add'>+			LCD_PANEL_ID9_1280X800;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;device_lcd_dualedge = 0;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;LCDDithering = 1;</div><div class='add'>+		return VIA_RES_1280X800;</div><div class='add'>+		break;</div><div class='add'>+	case 0x14:</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_hres = 1360;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_vres = 768;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_id =</div><div class='add'>+			LCD_PANEL_IDB_1360X768;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;device_lcd_dualedge = 0;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;LCDDithering = 0;</div><div class='add'>+		return VIA_RES_1360X768;</div><div class='add'>+		break;</div><div class='add'>+	case 0x15:</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_hres = 1280;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_vres = 768;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_id =</div><div class='add'>+			LCD_PANEL_ID3_1280X768;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;device_lcd_dualedge = 1;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;LCDDithering = 0;</div><div class='add'>+		return VIA_RES_1280X768;</div><div class='add'>+		break;</div><div class='add'>+	case 0x16:</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_hres = 480;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_vres = 640;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_id =</div><div class='add'>+			LCD_PANEL_IDC_480X640;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;device_lcd_dualedge = 0;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;LCDDithering = 1;</div><div class='add'>+		return VIA_RES_480X640;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_hres = 800;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_vres = 600;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;lcd_panel_id =</div><div class='add'>+			LCD_PANEL_ID1_800X600;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;device_lcd_dualedge = 0;</div><div class='add'>+		viaparinfo-&gt;lvds_setting_info-&gt;LCDDithering = 1;</div><div class='add'>+		return VIA_RES_800X600;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lvds_register_read(int index)</div><div class='add'>+{</div><div class='add'>+	u8 data;</div><div class='add'>+</div><div class='add'>+	viaparinfo-&gt;i2c_stuff.i2c_port = GPIOPORTINDEX;</div><div class='add'>+	viafb_i2c_readbyte((u8) viaparinfo-&gt;chip_info-&gt;</div><div class='add'>+	    lvds_chip_info.lvds_chip_slave_addr,</div><div class='add'>+			(u8) index, &amp;data);</div><div class='add'>+	return data;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void load_lcd_scaling(int set_hres, int set_vres, int panel_hres,</div><div class='add'>+		      int panel_vres)</div><div class='add'>+{</div><div class='add'>+	int reg_value = 0;</div><div class='add'>+	int viafb_load_reg_num;</div><div class='add'>+	struct io_register *reg = NULL;</div><div class='add'>+</div><div class='add'>+	DEBUG_MSG(KERN_INFO "load_lcd_scaling()!!\n");</div><div class='add'>+</div><div class='add'>+	/* LCD Scaling Enable */</div><div class='add'>+	viafb_write_reg_mask(CR79, VIACR, 0x07, BIT0 + BIT1 + BIT2);</div><div class='add'>+	if (UNICHROME_P4M900 == viaparinfo-&gt;chip_info-&gt;gfx_chip_name) {</div><div class='add'>+		viafb_load_scaling_factor_for_p4m900(set_hres, set_vres,</div><div class='add'>+					       panel_hres, panel_vres);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check if expansion for horizontal */</div><div class='add'>+	if (set_hres != panel_hres) {</div><div class='add'>+		/* Load Horizontal Scaling Factor */</div><div class='add'>+		switch (viaparinfo-&gt;chip_info-&gt;gfx_chip_name) {</div><div class='add'>+		case UNICHROME_CLE266:</div><div class='add'>+		case UNICHROME_K400:</div><div class='add'>+			reg_value =</div><div class='add'>+			    CLE266_LCD_HOR_SCF_FORMULA(set_hres, panel_hres);</div><div class='add'>+			viafb_load_reg_num =</div><div class='add'>+			    lcd_scaling_factor_CLE.lcd_hor_scaling_factor.</div><div class='add'>+			    reg_num;</div><div class='add'>+			reg = lcd_scaling_factor_CLE.lcd_hor_scaling_factor.reg;</div><div class='add'>+			viafb_load_reg(reg_value,</div><div class='add'>+				viafb_load_reg_num, reg, VIACR);</div><div class='add'>+			break;</div><div class='add'>+		case UNICHROME_K800:</div><div class='add'>+		case UNICHROME_PM800:</div><div class='add'>+		case UNICHROME_CN700:</div><div class='add'>+		case UNICHROME_CX700:</div><div class='add'>+		case UNICHROME_K8M890:</div><div class='add'>+		case UNICHROME_P4M890:</div><div class='add'>+			reg_value =</div><div class='add'>+			    K800_LCD_HOR_SCF_FORMULA(set_hres, panel_hres);</div><div class='add'>+			/* Horizontal scaling enabled */</div><div class='add'>+			viafb_write_reg_mask(CRA2, VIACR, 0xC0, BIT7 + BIT6);</div><div class='add'>+			viafb_load_reg_num =</div><div class='add'>+			    lcd_scaling_factor.lcd_hor_scaling_factor.reg_num;</div><div class='add'>+			reg = lcd_scaling_factor.lcd_hor_scaling_factor.reg;</div><div class='add'>+			viafb_load_reg(reg_value,</div><div class='add'>+				viafb_load_reg_num, reg, VIACR);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		DEBUG_MSG(KERN_INFO "Horizontal Scaling value = %d", reg_value);</div><div class='add'>+	} else {</div><div class='add'>+		/* Horizontal scaling disabled */</div><div class='add'>+		viafb_write_reg_mask(CRA2, VIACR, 0x00, BIT7);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check if expansion for vertical */</div><div class='add'>+	if (set_vres != panel_vres) {</div><div class='add'>+		/* Load Vertical Scaling Factor */</div><div class='add'>+		switch (viaparinfo-&gt;chip_info-&gt;gfx_chip_name) {</div><div class='add'>+		case UNICHROME_CLE266:</div><div class='add'>+		case UNICHROME_K400:</div><div class='add'>+			reg_value =</div><div class='add'>+			    CLE266_LCD_VER_SCF_FORMULA(set_vres, panel_vres);</div><div class='add'>+			viafb_load_reg_num =</div><div class='add'>+			    lcd_scaling_factor_CLE.lcd_ver_scaling_factor.</div><div class='add'>+			    reg_num;</div><div class='add'>+			reg = lcd_scaling_factor_CLE.lcd_ver_scaling_factor.reg;</div><div class='add'>+			viafb_load_reg(reg_value,</div><div class='add'>+				viafb_load_reg_num, reg, VIACR);</div><div class='add'>+			break;</div><div class='add'>+		case UNICHROME_K800:</div><div class='add'>+		case UNICHROME_PM800:</div><div class='add'>+		case UNICHROME_CN700:</div><div class='add'>+		case UNICHROME_CX700:</div><div class='add'>+		case UNICHROME_K8M890:</div><div class='add'>+		case UNICHROME_P4M890:</div><div class='add'>+			reg_value =</div><div class='add'>+			    K800_LCD_VER_SCF_FORMULA(set_vres, panel_vres);</div><div class='add'>+			/* Vertical scaling enabled */</div><div class='add'>+			viafb_write_reg_mask(CRA2, VIACR, 0x08, BIT3);</div><div class='add'>+			viafb_load_reg_num =</div><div class='add'>+			    lcd_scaling_factor.lcd_ver_scaling_factor.reg_num;</div><div class='add'>+			reg = lcd_scaling_factor.lcd_ver_scaling_factor.reg;</div><div class='add'>+			viafb_load_reg(reg_value,</div><div class='add'>+				viafb_load_reg_num, reg, VIACR);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		DEBUG_MSG(KERN_INFO "Vertical Scaling value = %d", reg_value);</div><div class='add'>+	} else {</div><div class='add'>+		/* Vertical scaling disabled */</div><div class='add'>+		viafb_write_reg_mask(CRA2, VIACR, 0x00, BIT3);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void load_lcd_k400_patch_tbl(int set_hres, int set_vres,</div><div class='add'>+	int panel_id)</div><div class='add'>+{</div><div class='add'>+	int vmode_index;</div><div class='add'>+	int reg_num = 0;</div><div class='add'>+	struct io_reg *lcd_patch_reg = NULL;</div><div class='add'>+</div><div class='add'>+	if (viaparinfo-&gt;lvds_setting_info-&gt;iga_path == IGA2)</div><div class='add'>+		vmode_index = viafb_get_mode_index(set_hres, set_vres, 1);</div><div class='add'>+	else</div><div class='add'>+		vmode_index = viafb_get_mode_index(set_hres, set_vres, 0);</div><div class='add'>+	switch (panel_id) {</div><div class='add'>+		/* LCD 800x600 */</div><div class='add'>+	case LCD_PANEL_ID1_800X600:</div><div class='add'>+		switch (vmode_index) {</div><div class='add'>+		case VIA_RES_640X400:</div><div class='add'>+		case VIA_RES_640X480:</div><div class='add'>+			reg_num = NUM_TOTAL_K400_LCD_RES_6X4_8X6;</div><div class='add'>+			lcd_patch_reg = K400_LCD_RES_6X4_8X6;</div><div class='add'>+			break;</div><div class='add'>+		case VIA_RES_720X480:</div><div class='add'>+		case VIA_RES_720X576:</div><div class='add'>+			reg_num = NUM_TOTAL_K400_LCD_RES_7X4_8X6;</div><div class='add'>+			lcd_patch_reg = K400_LCD_RES_7X4_8X6;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+		/* LCD 1024x768 */</div><div class='add'>+	case LCD_PANEL_ID2_1024X768:</div><div class='add'>+		switch (vmode_index) {</div><div class='add'>+		case VIA_RES_640X400:</div><div class='add'>+		case VIA_RES_640X480:</div><div class='add'>+			reg_num = NUM_TOTAL_K400_LCD_RES_6X4_10X7;</div><div class='add'>+			lcd_patch_reg = K400_LCD_RES_6X4_10X7;</div><div class='add'>+			break;</div><div class='add'>+		case VIA_RES_720X480:</div><div class='add'>+		case VIA_RES_720X576:</div><div class='add'>+			reg_num = NUM_TOTAL_K400_LCD_RES_7X4_10X7;</div><div class='add'>+			lcd_patch_reg = K400_LCD_RES_7X4_10X7;</div><div class='add'>+			break;</div><div class='add'>+		case VIA_RES_800X600:</div><div class='add'>+			reg_num = NUM_TOTAL_K400_LCD_RES_8X6_10X7;</div><div class='add'>+			lcd_patch_reg = K400_LCD_RES_8X6_10X7;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+		/* LCD 1280x1024 */</div><div class='add'>+	case LCD_PANEL_ID4_1280X1024:</div><div class='add'>+		switch (vmode_index) {</div><div class='add'>+		case VIA_RES_640X400:</div><div class='add'>+		case VIA_RES_640X480:</div><div class='add'>+			reg_num = NUM_TOTAL_K400_LCD_RES_6X4_12X10;</div><div class='add'>+			lcd_patch_reg = K400_LCD_RES_6X4_12X10;</div><div class='add'>+			break;</div><div class='add'>+		case VIA_RES_720X480:</div><div class='add'>+		case VIA_RES_720X576:</div><div class='add'>+			reg_num = NUM_TOTAL_K400_LCD_RES_7X4_12X10;</div><div class='add'>+			lcd_patch_reg = K400_LCD_RES_7X4_12X10;</div><div class='add'>+			break;</div><div class='add'>+		case VIA_RES_800X600:</div><div class='add'>+			reg_num = NUM_TOTAL_K400_LCD_RES_8X6_12X10;</div><div class='add'>+			lcd_patch_reg = K400_LCD_RES_8X6_12X10;</div><div class='add'>+			break;</div><div class='add'>+		case VIA_RES_1024X768:</div><div class='add'>+			reg_num = NUM_TOTAL_K400_LCD_RES_10X7_12X10;</div><div class='add'>+			lcd_patch_reg = K400_LCD_RES_10X7_12X10;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+		/* LCD 1400x1050 */</div><div class='add'>+	case LCD_PANEL_ID5_1400X1050:</div><div class='add'>+		switch (vmode_index) {</div><div class='add'>+		case VIA_RES_640X480:</div><div class='add'>+			reg_num = NUM_TOTAL_K400_LCD_RES_6X4_14X10;</div><div class='add'>+			lcd_patch_reg = K400_LCD_RES_6X4_14X10;</div><div class='add'>+			break;</div><div class='add'>+		case VIA_RES_800X600:</div><div class='add'>+			reg_num = NUM_TOTAL_K400_LCD_RES_8X6_14X10;</div><div class='add'>+			lcd_patch_reg = K400_LCD_RES_8X6_14X10;</div><div class='add'>+			break;</div><div class='add'>+		case VIA_RES_1024X768:</div><div class='add'>+			reg_num = NUM_TOTAL_K400_LCD_RES_10X7_14X10;</div><div class='add'>+			lcd_patch_reg = K400_LCD_RES_10X7_14X10;</div><div class='add'>+			break;</div><div class='add'>+		case VIA_RES_1280X768:</div><div class='add'>+		case VIA_RES_1280X800:</div><div class='add'>+		case VIA_RES_1280X960:</div><div class='add'>+		case VIA_RES_1280X1024:</div><div class='add'>+			reg_num = NUM_TOTAL_K400_LCD_RES_12X10_14X10;</div><div class='add'>+			lcd_patch_reg = K400_LCD_RES_12X10_14X10;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+		/* LCD 1600x1200 */</div><div class='add'>+	case LCD_PANEL_ID6_1600X1200:</div><div class='add'>+		switch (vmode_index) {</div><div class='add'>+		case VIA_RES_640X400:</div><div class='add'>+		case VIA_RES_640X480:</div><div class='add'>+			reg_num = NUM_TOTAL_K400_LCD_RES_6X4_16X12;</div><div class='add'>+			lcd_patch_reg = K400_LCD_RES_6X4_16X12;</div><div class='add'>+			break;</div><div class='add'>+		case VIA_RES_720X480:</div><div class='add'>+		case VIA_RES_720X576:</div><div class='add'>+			reg_num = NUM_TOTAL_K400_LCD_RES_7X4_16X12;</div><div class='add'>+			lcd_patch_reg = K400_LCD_RES_7X4_16X12;</div><div class='add'>+			break;</div><div class='add'>+		case VIA_RES_800X600:</div><div class='add'>+			reg_num = NUM_TOTAL_K400_LCD_RES_8X6_16X12;</div><div class='add'>+			lcd_patch_reg = K400_LCD_RES_8X6_16X12;</div><div class='add'>+			break;</div><div class='add'>+		case VIA_RES_1024X768:</div><div class='add'>+			reg_num = NUM_TOTAL_K400_LCD_RES_10X7_16X12;</div><div class='add'>+			lcd_patch_reg = K400_LCD_RES_10X7_16X12;</div><div class='add'>+			break;</div><div class='add'>+		case VIA_RES_1280X768:</div><div class='add'>+		case VIA_RES_1280X800:</div><div class='add'>+		case VIA_RES_1280X960:</div><div class='add'>+		case VIA_RES_1280X1024:</div><div class='add'>+			reg_num = NUM_TOTAL_K400_LCD_RES_12X10_16X12;</div><div class='add'>+			lcd_patch_reg = K400_LCD_RES_12X10_16X12;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+		/* LCD 1366x768 */</div><div class='add'>+	case LCD_PANEL_ID7_1366X768:</div><div class='add'>+		switch (vmode_index) {</div><div class='add'>+		case VIA_RES_640X480:</div><div class='add'>+			reg_num = NUM_TOTAL_K400_LCD_RES_6X4_1366X7;</div><div class='add'>+			lcd_patch_reg = K400_LCD_RES_6X4_1366X7;</div><div class='add'>+			break;</div><div class='add'>+		case VIA_RES_720X480:</div><div class='add'>+		case VIA_RES_720X576:</div><div class='add'>+			reg_num = NUM_TOTAL_K400_LCD_RES_7X4_1366X7;</div><div class='add'>+			lcd_patch_reg = K400_LCD_RES_7X4_1366X7;</div><div class='add'>+			break;</div><div class='add'>+		case VIA_RES_800X600:</div><div class='add'>+			reg_num = NUM_TOTAL_K400_LCD_RES_8X6_1366X7;</div><div class='add'>+			lcd_patch_reg = K400_LCD_RES_8X6_1366X7;</div><div class='add'>+			break;</div><div class='add'>+		case VIA_RES_1024X768:</div><div class='add'>+			reg_num = NUM_TOTAL_K400_LCD_RES_10X7_1366X7;</div><div class='add'>+			lcd_patch_reg = K400_LCD_RES_10X7_1366X7;</div><div class='add'>+			break;</div><div class='add'>+		case VIA_RES_1280X768:</div><div class='add'>+		case VIA_RES_1280X800:</div><div class='add'>+		case VIA_RES_1280X960:</div><div class='add'>+		case VIA_RES_1280X1024:</div><div class='add'>+			reg_num = NUM_TOTAL_K400_LCD_RES_12X10_1366X7;</div><div class='add'>+			lcd_patch_reg = K400_LCD_RES_12X10_1366X7;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+		/* LCD 1360x768 */</div><div class='add'>+	case LCD_PANEL_IDB_1360X768:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	if (reg_num != 0) {</div><div class='add'>+		/* H.W. Reset : ON */</div><div class='add'>+		viafb_write_reg_mask(CR17, VIACR, 0x00, BIT7);</div><div class='add'>+</div><div class='add'>+		viafb_write_regx(lcd_patch_reg, reg_num);</div><div class='add'>+</div><div class='add'>+		/* H.W. Reset : OFF */</div><div class='add'>+		viafb_write_reg_mask(CR17, VIACR, 0x80, BIT7);</div><div class='add'>+</div><div class='add'>+		/* Reset PLL */</div><div class='add'>+		viafb_write_reg_mask(SR40, VIASR, 0x02, BIT1);</div><div class='add'>+		viafb_write_reg_mask(SR40, VIASR, 0x00, BIT1);</div><div class='add'>+</div><div class='add'>+		/* Fire! */</div><div class='add'>+		outb(inb(VIARMisc) | (BIT2 + BIT3), VIAWMisc);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void load_lcd_p880_patch_tbl(int set_hres, int set_vres,</div><div class='add'>+	int panel_id)</div><div class='add'>+{</div><div class='add'>+	int vmode_index;</div><div class='add'>+	int reg_num = 0;</div><div class='add'>+	struct io_reg *lcd_patch_reg = NULL;</div><div class='add'>+</div><div class='add'>+	if (viaparinfo-&gt;lvds_setting_info-&gt;iga_path == IGA2)</div><div class='add'>+		vmode_index = viafb_get_mode_index(set_hres, set_vres, 1);</div><div class='add'>+	else</div><div class='add'>+		vmode_index = viafb_get_mode_index(set_hres, set_vres, 0);</div><div class='add'>+</div><div class='add'>+	switch (panel_id) {</div><div class='add'>+	case LCD_PANEL_ID5_1400X1050:</div><div class='add'>+		switch (vmode_index) {</div><div class='add'>+		case VIA_RES_640X480:</div><div class='add'>+			reg_num = NUM_TOTAL_P880_LCD_RES_6X4_14X10;</div><div class='add'>+			lcd_patch_reg = P880_LCD_RES_6X4_14X10;</div><div class='add'>+			break;</div><div class='add'>+		case VIA_RES_800X600:</div><div class='add'>+			reg_num = NUM_TOTAL_P880_LCD_RES_8X6_14X10;</div><div class='add'>+			lcd_patch_reg = P880_LCD_RES_8X6_14X10;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case LCD_PANEL_ID6_1600X1200:</div><div class='add'>+		switch (vmode_index) {</div><div class='add'>+		case VIA_RES_640X400:</div><div class='add'>+		case VIA_RES_640X480:</div><div class='add'>+			reg_num = NUM_TOTAL_P880_LCD_RES_6X4_16X12;</div><div class='add'>+			lcd_patch_reg = P880_LCD_RES_6X4_16X12;</div><div class='add'>+			break;</div><div class='add'>+		case VIA_RES_720X480:</div><div class='add'>+		case VIA_RES_720X576:</div><div class='add'>+			reg_num = NUM_TOTAL_P880_LCD_RES_7X4_16X12;</div><div class='add'>+			lcd_patch_reg = P880_LCD_RES_7X4_16X12;</div><div class='add'>+			break;</div><div class='add'>+		case VIA_RES_800X600:</div><div class='add'>+			reg_num = NUM_TOTAL_P880_LCD_RES_8X6_16X12;</div><div class='add'>+			lcd_patch_reg = P880_LCD_RES_8X6_16X12;</div><div class='add'>+			break;</div><div class='add'>+		case VIA_RES_1024X768:</div><div class='add'>+			reg_num = NUM_TOTAL_P880_LCD_RES_10X7_16X12;</div><div class='add'>+			lcd_patch_reg = P880_LCD_RES_10X7_16X12;</div><div class='add'>+			break;</div><div class='add'>+		case VIA_RES_1280X768:</div><div class='add'>+		case VIA_RES_1280X960:</div><div class='add'>+		case VIA_RES_1280X1024:</div><div class='add'>+			reg_num = NUM_TOTAL_P880_LCD_RES_12X10_16X12;</div><div class='add'>+			lcd_patch_reg = P880_LCD_RES_12X10_16X12;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+	if (reg_num != 0) {</div><div class='add'>+		/* H.W. Reset : ON */</div><div class='add'>+		viafb_write_reg_mask(CR17, VIACR, 0x00, BIT7);</div><div class='add'>+</div><div class='add'>+		viafb_write_regx(lcd_patch_reg, reg_num);</div><div class='add'>+</div><div class='add'>+		/* H.W. Reset : OFF */</div><div class='add'>+		viafb_write_reg_mask(CR17, VIACR, 0x80, BIT7);</div><div class='add'>+</div><div class='add'>+		/* Reset PLL */</div><div class='add'>+		viafb_write_reg_mask(SR40, VIASR, 0x02, BIT1);</div><div class='add'>+		viafb_write_reg_mask(SR40, VIASR, 0x00, BIT1);</div><div class='add'>+</div><div class='add'>+		/* Fire! */</div><div class='add'>+		outb(inb(VIARMisc) | (BIT2 + BIT3), VIAWMisc);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void load_lcd_patch_regs(int set_hres, int set_vres,</div><div class='add'>+	int panel_id, int set_iga)</div><div class='add'>+{</div><div class='add'>+	int vmode_index;</div><div class='add'>+</div><div class='add'>+	if (viaparinfo-&gt;lvds_setting_info-&gt;iga_path == IGA2)</div><div class='add'>+		vmode_index = viafb_get_mode_index(set_hres, set_vres, 1);</div><div class='add'>+	else</div><div class='add'>+		vmode_index = viafb_get_mode_index(set_hres, set_vres, 0);</div><div class='add'>+</div><div class='add'>+	viafb_unlock_crt();</div><div class='add'>+</div><div class='add'>+	/* Patch for simultaneous &amp; Expansion */</div><div class='add'>+	if ((set_iga == IGA1_IGA2) &amp;&amp;</div><div class='add'>+		(viaparinfo-&gt;lvds_setting_info-&gt;display_method ==</div><div class='add'>+	    LCD_EXPANDSION)) {</div><div class='add'>+		switch (viaparinfo-&gt;chip_info-&gt;gfx_chip_name) {</div><div class='add'>+		case UNICHROME_CLE266:</div><div class='add'>+		case UNICHROME_K400:</div><div class='add'>+			load_lcd_k400_patch_tbl(set_hres, set_vres, panel_id);</div><div class='add'>+			break;</div><div class='add'>+		case UNICHROME_K800:</div><div class='add'>+			break;</div><div class='add'>+		case UNICHROME_PM800:</div><div class='add'>+		case UNICHROME_CN700:</div><div class='add'>+		case UNICHROME_CX700:</div><div class='add'>+			load_lcd_p880_patch_tbl(set_hres, set_vres, panel_id);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	viafb_lock_crt();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void via_pitch_alignment_patch_lcd(</div><div class='add'>+	struct lvds_setting_information *plvds_setting_info,</div><div class='add'>+				   struct lvds_chip_information</div><div class='add'>+				   *plvds_chip_info)</div><div class='add'>+{</div><div class='add'>+	unsigned char cr13, cr35, cr65, cr66, cr67;</div><div class='add'>+	unsigned long dwScreenPitch = 0;</div><div class='add'>+	unsigned long dwPitch;</div><div class='add'>+</div><div class='add'>+	dwPitch = plvds_setting_info-&gt;h_active * (plvds_setting_info-&gt;bpp &gt;&gt; 3);</div><div class='add'>+	if (dwPitch &amp; 0x1F) {</div><div class='add'>+		dwScreenPitch = ((dwPitch + 31) &amp; ~31) &gt;&gt; 3;</div><div class='add'>+		if (plvds_setting_info-&gt;iga_path == IGA2) {</div><div class='add'>+			if (plvds_setting_info-&gt;bpp &gt; 8) {</div><div class='add'>+				cr66 = (unsigned char)(dwScreenPitch &amp; 0xFF);</div><div class='add'>+				viafb_write_reg(CR66, VIACR, cr66);</div><div class='add'>+				cr67 = viafb_read_reg(VIACR, CR67) &amp; 0xFC;</div><div class='add'>+				cr67 |=</div><div class='add'>+				    (unsigned</div><div class='add'>+				     char)((dwScreenPitch &amp; 0x300) &gt;&gt; 8);</div><div class='add'>+				viafb_write_reg(CR67, VIACR, cr67);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* Fetch Count */</div><div class='add'>+			cr67 = viafb_read_reg(VIACR, CR67) &amp; 0xF3;</div><div class='add'>+			cr67 |= (unsigned char)((dwScreenPitch &amp; 0x600) &gt;&gt; 7);</div><div class='add'>+			viafb_write_reg(CR67, VIACR, cr67);</div><div class='add'>+			cr65 = (unsigned char)((dwScreenPitch &gt;&gt; 1) &amp; 0xFF);</div><div class='add'>+			cr65 += 2;</div><div class='add'>+			viafb_write_reg(CR65, VIACR, cr65);</div><div class='add'>+		} else {</div><div class='add'>+			if (plvds_setting_info-&gt;bpp &gt; 8) {</div><div class='add'>+				cr13 = (unsigned char)(dwScreenPitch &amp; 0xFF);</div><div class='add'>+				viafb_write_reg(CR13, VIACR, cr13);</div><div class='add'>+				cr35 = viafb_read_reg(VIACR, CR35) &amp; 0x1F;</div><div class='add'>+				cr35 |=</div><div class='add'>+				    (unsigned</div><div class='add'>+				     char)((dwScreenPitch &amp; 0x700) &gt;&gt; 3);</div><div class='add'>+				viafb_write_reg(CR35, VIACR, cr35);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+static void lcd_patch_skew_dvp0(struct lvds_setting_information</div><div class='add'>+			 *plvds_setting_info,</div><div class='add'>+			 struct lvds_chip_information *plvds_chip_info)</div><div class='add'>+{</div><div class='add'>+	if (VT1636_LVDS == plvds_chip_info-&gt;lvds_chip_name) {</div><div class='add'>+		switch (viaparinfo-&gt;chip_info-&gt;gfx_chip_name) {</div><div class='add'>+		case UNICHROME_P4M900:</div><div class='add'>+			viafb_vt1636_patch_skew_on_vt3364(plvds_setting_info,</div><div class='add'>+						    plvds_chip_info);</div><div class='add'>+			break;</div><div class='add'>+		case UNICHROME_P4M890:</div><div class='add'>+			viafb_vt1636_patch_skew_on_vt3327(plvds_setting_info,</div><div class='add'>+						    plvds_chip_info);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+static void lcd_patch_skew_dvp1(struct lvds_setting_information</div><div class='add'>+			 *plvds_setting_info,</div><div class='add'>+			 struct lvds_chip_information *plvds_chip_info)</div><div class='add'>+{</div><div class='add'>+	if (VT1636_LVDS == plvds_chip_info-&gt;lvds_chip_name) {</div><div class='add'>+		switch (viaparinfo-&gt;chip_info-&gt;gfx_chip_name) {</div><div class='add'>+		case UNICHROME_CX700:</div><div class='add'>+			viafb_vt1636_patch_skew_on_vt3324(plvds_setting_info,</div><div class='add'>+						    plvds_chip_info);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+static void lcd_patch_skew(struct lvds_setting_information</div><div class='add'>+	*plvds_setting_info, struct lvds_chip_information *plvds_chip_info)</div><div class='add'>+{</div><div class='add'>+	DEBUG_MSG(KERN_INFO "lcd_patch_skew\n");</div><div class='add'>+	switch (plvds_chip_info-&gt;output_interface) {</div><div class='add'>+	case INTERFACE_DVP0:</div><div class='add'>+		lcd_patch_skew_dvp0(plvds_setting_info, plvds_chip_info);</div><div class='add'>+		break;</div><div class='add'>+	case INTERFACE_DVP1:</div><div class='add'>+		lcd_patch_skew_dvp1(plvds_setting_info, plvds_chip_info);</div><div class='add'>+		break;</div><div class='add'>+	case INTERFACE_DFP_LOW:</div><div class='add'>+		if (UNICHROME_P4M900 == viaparinfo-&gt;chip_info-&gt;gfx_chip_name) {</div><div class='add'>+			viafb_write_reg_mask(CR99, VIACR, 0x08,</div><div class='add'>+				       BIT0 + BIT1 + BIT2 + BIT3);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* LCD Set Mode */</div><div class='add'>+void viafb_lcd_set_mode(struct crt_mode_table *mode_crt_table,</div><div class='add'>+		  struct lvds_setting_information *plvds_setting_info,</div><div class='add'>+		  struct lvds_chip_information *plvds_chip_info)</div><div class='add'>+{</div><div class='add'>+	int video_index = plvds_setting_info-&gt;lcd_panel_size;</div><div class='add'>+	int set_iga = plvds_setting_info-&gt;iga_path;</div><div class='add'>+	int mode_bpp = plvds_setting_info-&gt;bpp;</div><div class='add'>+	int viafb_load_reg_num = 0;</div><div class='add'>+	int reg_value = 0;</div><div class='add'>+	int set_hres, set_vres;</div><div class='add'>+	int panel_hres, panel_vres;</div><div class='add'>+	u32 pll_D_N;</div><div class='add'>+	int offset;</div><div class='add'>+	struct io_register *reg = NULL;</div><div class='add'>+	struct display_timing mode_crt_reg, panel_crt_reg;</div><div class='add'>+	struct crt_mode_table *panel_crt_table = NULL;</div><div class='add'>+	struct VideoModeTable *vmode_tbl = NULL;</div><div class='add'>+</div><div class='add'>+	DEBUG_MSG(KERN_INFO "viafb_lcd_set_mode!!\n");</div><div class='add'>+	/* Get mode table */</div><div class='add'>+	mode_crt_reg = mode_crt_table-&gt;crtc;</div><div class='add'>+	/* Get panel table Pointer */</div><div class='add'>+	vmode_tbl = viafb_get_modetbl_pointer(video_index);</div><div class='add'>+	panel_crt_table = vmode_tbl-&gt;crtc;</div><div class='add'>+	panel_crt_reg = panel_crt_table-&gt;crtc;</div><div class='add'>+	DEBUG_MSG(KERN_INFO "bellow viafb_lcd_set_mode!!\n");</div><div class='add'>+	set_hres = plvds_setting_info-&gt;h_active;</div><div class='add'>+	set_vres = plvds_setting_info-&gt;v_active;</div><div class='add'>+	panel_hres = plvds_setting_info-&gt;lcd_panel_hres;</div><div class='add'>+	panel_vres = plvds_setting_info-&gt;lcd_panel_vres;</div><div class='add'>+	if (VT1636_LVDS == plvds_chip_info-&gt;lvds_chip_name)</div><div class='add'>+		viafb_init_lvds_vt1636(plvds_setting_info, plvds_chip_info);</div><div class='add'>+	plvds_setting_info-&gt;vclk = panel_crt_table-&gt;clk;</div><div class='add'>+	if (set_iga == IGA1) {</div><div class='add'>+		/* IGA1 doesn't have LCD scaling, so set it as centering. */</div><div class='add'>+		viafb_load_crtc_timing(lcd_centering_timging</div><div class='add'>+				 (mode_crt_reg, panel_crt_reg), IGA1);</div><div class='add'>+	} else {</div><div class='add'>+		/* Expansion */</div><div class='add'>+		if ((plvds_setting_info-&gt;display_method ==</div><div class='add'>+		     LCD_EXPANDSION) &amp; ((set_hres != panel_hres)</div><div class='add'>+					|| (set_vres != panel_vres))) {</div><div class='add'>+			/* expansion timing IGA2 loaded panel set timing*/</div><div class='add'>+			viafb_load_crtc_timing(panel_crt_reg, IGA2);</div><div class='add'>+			DEBUG_MSG(KERN_INFO "viafb_load_crtc_timing!!\n");</div><div class='add'>+			load_lcd_scaling(set_hres, set_vres, panel_hres,</div><div class='add'>+					 panel_vres);</div><div class='add'>+			DEBUG_MSG(KERN_INFO "load_lcd_scaling!!\n");</div><div class='add'>+		} else {	/* Centering */</div><div class='add'>+			/* centering timing IGA2 always loaded panel</div><div class='add'>+			   and mode releative timing */</div><div class='add'>+			viafb_load_crtc_timing(lcd_centering_timging</div><div class='add'>+					 (mode_crt_reg, panel_crt_reg), IGA2);</div><div class='add'>+			viafb_write_reg_mask(CR79, VIACR, 0x00,</div><div class='add'>+				BIT0 + BIT1 + BIT2);</div><div class='add'>+			/* LCD scaling disabled */</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (set_iga == IGA1_IGA2) {</div><div class='add'>+		load_crtc_shadow_timing(mode_crt_reg, panel_crt_reg);</div><div class='add'>+		/* Fill shadow registers */</div><div class='add'>+</div><div class='add'>+		switch (plvds_setting_info-&gt;lcd_panel_id) {</div><div class='add'>+		case LCD_PANEL_ID0_640X480:</div><div class='add'>+			offset = 80;</div><div class='add'>+			break;</div><div class='add'>+		case LCD_PANEL_ID1_800X600:</div><div class='add'>+		case LCD_PANEL_IDA_800X480:</div><div class='add'>+			offset = 110;</div><div class='add'>+			break;</div><div class='add'>+		case LCD_PANEL_ID2_1024X768:</div><div class='add'>+			offset = 150;</div><div class='add'>+			break;</div><div class='add'>+		case LCD_PANEL_ID3_1280X768:</div><div class='add'>+		case LCD_PANEL_ID4_1280X1024:</div><div class='add'>+		case LCD_PANEL_ID5_1400X1050:</div><div class='add'>+		case LCD_PANEL_ID9_1280X800:</div><div class='add'>+			offset = 190;</div><div class='add'>+			break;</div><div class='add'>+		case LCD_PANEL_ID6_1600X1200:</div><div class='add'>+			offset = 250;</div><div class='add'>+			break;</div><div class='add'>+		case LCD_PANEL_ID7_1366X768:</div><div class='add'>+		case LCD_PANEL_IDB_1360X768:</div><div class='add'>+			offset = 212;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			offset = 140;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Offset for simultaneous */</div><div class='add'>+		reg_value = offset;</div><div class='add'>+		viafb_load_reg_num = offset_reg.iga2_offset_reg.reg_num;</div><div class='add'>+		reg = offset_reg.iga2_offset_reg.reg;</div><div class='add'>+		viafb_load_reg(reg_value, viafb_load_reg_num, reg, VIACR);</div><div class='add'>+		DEBUG_MSG(KERN_INFO "viafb_load_reg!!\n");</div><div class='add'>+		viafb_load_fetch_count_reg(set_hres, 4, IGA2);</div><div class='add'>+		/* Fetch count for simultaneous */</div><div class='add'>+	} else {		/* SAMM */</div><div class='add'>+		/* Offset for IGA2 only */</div><div class='add'>+		viafb_load_offset_reg(set_hres, mode_bpp / 8, set_iga);</div><div class='add'>+		/* Fetch count for IGA2 only */</div><div class='add'>+		viafb_load_fetch_count_reg(set_hres, mode_bpp / 8, set_iga);</div><div class='add'>+</div><div class='add'>+		if ((viaparinfo-&gt;chip_info-&gt;gfx_chip_name != UNICHROME_CLE266)</div><div class='add'>+		    &amp;&amp; (viaparinfo-&gt;chip_info-&gt;gfx_chip_name != UNICHROME_K400))</div><div class='add'>+			viafb_load_FIFO_reg(set_iga, set_hres, set_vres);</div><div class='add'>+</div><div class='add'>+		viafb_set_color_depth(mode_bpp / 8, set_iga);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fill_lcd_format();</div><div class='add'>+</div><div class='add'>+	pll_D_N = viafb_get_clk_value(panel_crt_table[0].clk);</div><div class='add'>+	DEBUG_MSG(KERN_INFO "PLL=0x%x", pll_D_N);</div><div class='add'>+	viafb_set_vclock(pll_D_N, set_iga);</div><div class='add'>+</div><div class='add'>+	viafb_set_output_path(DEVICE_LCD, set_iga,</div><div class='add'>+		plvds_chip_info-&gt;output_interface);</div><div class='add'>+	lcd_patch_skew(plvds_setting_info, plvds_chip_info);</div><div class='add'>+</div><div class='add'>+	/* If K8M800, enable LCD Prefetch Mode. */</div><div class='add'>+	if ((viaparinfo-&gt;chip_info-&gt;gfx_chip_name == UNICHROME_K800)</div><div class='add'>+	    || (UNICHROME_K8M890 == viaparinfo-&gt;chip_info-&gt;gfx_chip_name))</div><div class='add'>+		viafb_write_reg_mask(CR6A, VIACR, 0x01, BIT0);</div><div class='add'>+</div><div class='add'>+	load_lcd_patch_regs(set_hres, set_vres,</div><div class='add'>+			    plvds_setting_info-&gt;lcd_panel_id, set_iga);</div><div class='add'>+</div><div class='add'>+	DEBUG_MSG(KERN_INFO "load_lcd_patch_regs!!\n");</div><div class='add'>+</div><div class='add'>+	/* Patch for non 32bit alignment mode */</div><div class='add'>+	via_pitch_alignment_patch_lcd(plvds_setting_info, plvds_chip_info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void integrated_lvds_disable(struct lvds_setting_information</div><div class='add'>+			     *plvds_setting_info,</div><div class='add'>+			     struct lvds_chip_information *plvds_chip_info)</div><div class='add'>+{</div><div class='add'>+	bool turn_off_first_powersequence = false;</div><div class='add'>+	bool turn_off_second_powersequence = false;</div><div class='add'>+	if (INTERFACE_LVDS0LVDS1 == plvds_chip_info-&gt;output_interface)</div><div class='add'>+		turn_off_first_powersequence = true;</div><div class='add'>+	if (INTERFACE_LVDS0 == plvds_chip_info-&gt;output_interface)</div><div class='add'>+		turn_off_first_powersequence = true;</div><div class='add'>+	if (INTERFACE_LVDS1 == plvds_chip_info-&gt;output_interface)</div><div class='add'>+		turn_off_second_powersequence = true;</div><div class='add'>+	if (turn_off_second_powersequence) {</div><div class='add'>+		/* Use second power sequence control: */</div><div class='add'>+</div><div class='add'>+		/* Turn off power sequence. */</div><div class='add'>+		viafb_write_reg_mask(CRD4, VIACR, 0, BIT1);</div><div class='add'>+</div><div class='add'>+		/* Turn off back light. */</div><div class='add'>+		viafb_write_reg_mask(CRD3, VIACR, 0xC0, BIT6 + BIT7);</div><div class='add'>+	}</div><div class='add'>+	if (turn_off_first_powersequence) {</div><div class='add'>+		/* Use first power sequence control: */</div><div class='add'>+</div><div class='add'>+		/* Turn off power sequence. */</div><div class='add'>+		viafb_write_reg_mask(CR6A, VIACR, 0, BIT3);</div><div class='add'>+</div><div class='add'>+		/* Turn off back light. */</div><div class='add'>+		viafb_write_reg_mask(CR91, VIACR, 0xC0, BIT6 + BIT7);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Turn DFP High/Low Pad off. */</div><div class='add'>+	viafb_write_reg_mask(SR2A, VIASR, 0, BIT0 + BIT1 + BIT2 + BIT3);</div><div class='add'>+</div><div class='add'>+	/* Power off LVDS channel. */</div><div class='add'>+	switch (plvds_chip_info-&gt;output_interface) {</div><div class='add'>+	case INTERFACE_LVDS0:</div><div class='add'>+		{</div><div class='add'>+			viafb_write_reg_mask(CRD2, VIACR, 0x80, BIT7);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	case INTERFACE_LVDS1:</div><div class='add'>+		{</div><div class='add'>+			viafb_write_reg_mask(CRD2, VIACR, 0x40, BIT6);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	case INTERFACE_LVDS0LVDS1:</div><div class='add'>+		{</div><div class='add'>+			viafb_write_reg_mask(CRD2, VIACR, 0xC0, BIT6 + BIT7);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void integrated_lvds_enable(struct lvds_setting_information</div><div class='add'>+			    *plvds_setting_info,</div><div class='add'>+			    struct lvds_chip_information *plvds_chip_info)</div><div class='add'>+{</div><div class='add'>+	bool turn_on_first_powersequence = false;</div><div class='add'>+	bool turn_on_second_powersequence = false;</div><div class='add'>+</div><div class='add'>+	DEBUG_MSG(KERN_INFO "integrated_lvds_enable, out_interface:%d\n",</div><div class='add'>+		  plvds_chip_info-&gt;output_interface);</div><div class='add'>+	if (plvds_setting_info-&gt;lcd_mode == LCD_SPWG)</div><div class='add'>+		viafb_write_reg_mask(CRD2, VIACR, 0x00, BIT0 + BIT1);</div><div class='add'>+	 else</div><div class='add'>+		viafb_write_reg_mask(CRD2, VIACR, 0x03, BIT0 + BIT1);</div><div class='add'>+	if (INTERFACE_LVDS0LVDS1 == plvds_chip_info-&gt;output_interface)</div><div class='add'>+		turn_on_first_powersequence = true;</div><div class='add'>+	if (INTERFACE_LVDS0 == plvds_chip_info-&gt;output_interface)</div><div class='add'>+		turn_on_first_powersequence = true;</div><div class='add'>+	if (INTERFACE_LVDS1 == plvds_chip_info-&gt;output_interface)</div><div class='add'>+		turn_on_second_powersequence = true;</div><div class='add'>+</div><div class='add'>+	if (turn_on_second_powersequence) {</div><div class='add'>+		/* Use second power sequence control: */</div><div class='add'>+</div><div class='add'>+		/* Use hardware control power sequence. */</div><div class='add'>+		viafb_write_reg_mask(CRD3, VIACR, 0, BIT0);</div><div class='add'>+</div><div class='add'>+		/* Turn on back light. */</div><div class='add'>+		viafb_write_reg_mask(CRD3, VIACR, 0, BIT6 + BIT7);</div><div class='add'>+</div><div class='add'>+		/* Turn on hardware power sequence. */</div><div class='add'>+		viafb_write_reg_mask(CRD4, VIACR, 0x02, BIT1);</div><div class='add'>+	}</div><div class='add'>+	if (turn_on_first_powersequence) {</div><div class='add'>+		/* Use first power sequence control: */</div><div class='add'>+</div><div class='add'>+		/* Use hardware control power sequence. */</div><div class='add'>+		viafb_write_reg_mask(CR91, VIACR, 0, BIT0);</div><div class='add'>+</div><div class='add'>+		/* Turn on back light. */</div><div class='add'>+		viafb_write_reg_mask(CR91, VIACR, 0, BIT6 + BIT7);</div><div class='add'>+</div><div class='add'>+		/* Turn on hardware power sequence. */</div><div class='add'>+		viafb_write_reg_mask(CR6A, VIACR, 0x08, BIT3);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Turn DFP High/Low pad on. */</div><div class='add'>+	viafb_write_reg_mask(SR2A, VIASR, 0x0F, BIT0 + BIT1 + BIT2 + BIT3);</div><div class='add'>+</div><div class='add'>+	/* Power on LVDS channel. */</div><div class='add'>+	switch (plvds_chip_info-&gt;output_interface) {</div><div class='add'>+	case INTERFACE_LVDS0:</div><div class='add'>+		{</div><div class='add'>+			viafb_write_reg_mask(CRD2, VIACR, 0, BIT7);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	case INTERFACE_LVDS1:</div><div class='add'>+		{</div><div class='add'>+			viafb_write_reg_mask(CRD2, VIACR, 0, BIT6);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	case INTERFACE_LVDS0LVDS1:</div><div class='add'>+		{</div><div class='add'>+			viafb_write_reg_mask(CRD2, VIACR, 0, BIT6 + BIT7);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void viafb_lcd_disable(void)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	if (viaparinfo-&gt;chip_info-&gt;gfx_chip_name == UNICHROME_CLE266) {</div><div class='add'>+		lcd_powersequence_off();</div><div class='add'>+		/* DI1 pad off */</div><div class='add'>+		viafb_write_reg_mask(SR1E, VIASR, 0x00, 0x30);</div><div class='add'>+	} else if (viaparinfo-&gt;chip_info-&gt;gfx_chip_name == UNICHROME_CX700) {</div><div class='add'>+		if (viafb_LCD2_ON</div><div class='add'>+		    &amp;&amp; (INTEGRATED_LVDS ==</div><div class='add'>+			viaparinfo-&gt;chip_info-&gt;lvds_chip_info2.lvds_chip_name))</div><div class='add'>+			integrated_lvds_disable(viaparinfo-&gt;lvds_setting_info,</div><div class='add'>+				&amp;viaparinfo-&gt;chip_info-&gt;lvds_chip_info2);</div><div class='add'>+		if (INTEGRATED_LVDS ==</div><div class='add'>+			viaparinfo-&gt;chip_info-&gt;lvds_chip_info.lvds_chip_name)</div><div class='add'>+			integrated_lvds_disable(viaparinfo-&gt;lvds_setting_info,</div><div class='add'>+				&amp;viaparinfo-&gt;chip_info-&gt;lvds_chip_info);</div><div class='add'>+		if (VT1636_LVDS == viaparinfo-&gt;chip_info-&gt;</div><div class='add'>+			lvds_chip_info.lvds_chip_name)</div><div class='add'>+			viafb_disable_lvds_vt1636(viaparinfo-&gt;lvds_setting_info,</div><div class='add'>+				&amp;viaparinfo-&gt;chip_info-&gt;lvds_chip_info);</div><div class='add'>+	} else if (VT1636_LVDS ==</div><div class='add'>+	viaparinfo-&gt;chip_info-&gt;lvds_chip_info.lvds_chip_name) {</div><div class='add'>+		viafb_disable_lvds_vt1636(viaparinfo-&gt;lvds_setting_info,</div><div class='add'>+				    &amp;viaparinfo-&gt;chip_info-&gt;lvds_chip_info);</div><div class='add'>+	} else {</div><div class='add'>+		/* DFP-HL pad off          */</div><div class='add'>+		viafb_write_reg_mask(SR2A, VIASR, 0x00, 0x0F);</div><div class='add'>+		/* Backlight off           */</div><div class='add'>+		viafb_write_reg_mask(SR3D, VIASR, 0x00, 0x20);</div><div class='add'>+		/* 24 bit DI data paht off */</div><div class='add'>+		viafb_write_reg_mask(CR91, VIACR, 0x80, 0x80);</div><div class='add'>+		/* Simultaneout disabled   */</div><div class='add'>+		viafb_write_reg_mask(CR6B, VIACR, 0x00, 0x08);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Disable expansion bit   */</div><div class='add'>+	viafb_write_reg_mask(CR79, VIACR, 0x00, 0x01);</div><div class='add'>+	/* CRT path set to IGA1    */</div><div class='add'>+	viafb_write_reg_mask(SR16, VIASR, 0x00, 0x40);</div><div class='add'>+	/* Simultaneout disabled   */</div><div class='add'>+	viafb_write_reg_mask(CR6B, VIACR, 0x00, 0x08);</div><div class='add'>+	/* IGA2 path disabled      */</div><div class='add'>+	viafb_write_reg_mask(CR6A, VIACR, 0x00, 0x80);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void viafb_lcd_enable(void)</div><div class='add'>+{</div><div class='add'>+	if (viaparinfo-&gt;chip_info-&gt;gfx_chip_name == UNICHROME_CLE266) {</div><div class='add'>+		/* DI1 pad on */</div><div class='add'>+		viafb_write_reg_mask(SR1E, VIASR, 0x30, 0x30);</div><div class='add'>+		lcd_powersequence_on();</div><div class='add'>+	} else if (viaparinfo-&gt;chip_info-&gt;gfx_chip_name == UNICHROME_CX700) {</div><div class='add'>+		if (viafb_LCD2_ON &amp;&amp; (INTEGRATED_LVDS ==</div><div class='add'>+			viaparinfo-&gt;chip_info-&gt;lvds_chip_info2.lvds_chip_name))</div><div class='add'>+			integrated_lvds_enable(viaparinfo-&gt;lvds_setting_info2, \</div><div class='add'>+				&amp;viaparinfo-&gt;chip_info-&gt;lvds_chip_info2);</div><div class='add'>+		if (INTEGRATED_LVDS ==</div><div class='add'>+			viaparinfo-&gt;chip_info-&gt;lvds_chip_info.lvds_chip_name)</div><div class='add'>+			integrated_lvds_enable(viaparinfo-&gt;lvds_setting_info,</div><div class='add'>+				&amp;viaparinfo-&gt;chip_info-&gt;lvds_chip_info);</div><div class='add'>+		if (VT1636_LVDS == viaparinfo-&gt;chip_info-&gt;</div><div class='add'>+			lvds_chip_info.lvds_chip_name)</div><div class='add'>+			viafb_enable_lvds_vt1636(viaparinfo-&gt;</div><div class='add'>+			lvds_setting_info, &amp;viaparinfo-&gt;chip_info-&gt;</div><div class='add'>+			lvds_chip_info);</div><div class='add'>+	} else if (VT1636_LVDS ==</div><div class='add'>+	viaparinfo-&gt;chip_info-&gt;lvds_chip_info.lvds_chip_name) {</div><div class='add'>+		viafb_enable_lvds_vt1636(viaparinfo-&gt;lvds_setting_info,</div><div class='add'>+				   &amp;viaparinfo-&gt;chip_info-&gt;lvds_chip_info);</div><div class='add'>+	} else {</div><div class='add'>+		/* DFP-HL pad on           */</div><div class='add'>+		viafb_write_reg_mask(SR2A, VIASR, 0x0F, 0x0F);</div><div class='add'>+		/* Backlight on            */</div><div class='add'>+		viafb_write_reg_mask(SR3D, VIASR, 0x20, 0x20);</div><div class='add'>+		/* 24 bit DI data paht on  */</div><div class='add'>+		viafb_write_reg_mask(CR91, VIACR, 0x00, 0x80);</div><div class='add'>+</div><div class='add'>+		/* Set data source selection bit by iga path */</div><div class='add'>+		if (viaparinfo-&gt;lvds_setting_info-&gt;iga_path == IGA1) {</div><div class='add'>+			/* DFP-H set to IGA1       */</div><div class='add'>+			viafb_write_reg_mask(CR97, VIACR, 0x00, 0x10);</div><div class='add'>+			/* DFP-L set to IGA1       */</div><div class='add'>+			viafb_write_reg_mask(CR99, VIACR, 0x00, 0x10);</div><div class='add'>+		} else {</div><div class='add'>+			/* DFP-H set to IGA2       */</div><div class='add'>+			viafb_write_reg_mask(CR97, VIACR, 0x10, 0x10);</div><div class='add'>+			/* DFP-L set to IGA2       */</div><div class='add'>+			viafb_write_reg_mask(CR99, VIACR, 0x10, 0x10);</div><div class='add'>+		}</div><div class='add'>+		/* LCD enabled             */</div><div class='add'>+		viafb_write_reg_mask(CR6A, VIACR, 0x48, 0x48);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((viaparinfo-&gt;lvds_setting_info-&gt;iga_path == IGA1)</div><div class='add'>+	    || (viaparinfo-&gt;lvds_setting_info-&gt;iga_path == IGA1_IGA2)) {</div><div class='add'>+		/* CRT path set to IGA2    */</div><div class='add'>+		viafb_write_reg_mask(SR16, VIASR, 0x40, 0x40);</div><div class='add'>+		/* IGA2 path disabled      */</div><div class='add'>+		viafb_write_reg_mask(CR6A, VIACR, 0x00, 0x80);</div><div class='add'>+		/* IGA2 path enabled       */</div><div class='add'>+	} else {		/* IGA2 */</div><div class='add'>+		viafb_write_reg_mask(CR6A, VIACR, 0x80, 0x80);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void lcd_powersequence_off(void)</div><div class='add'>+{</div><div class='add'>+	int i, mask, data;</div><div class='add'>+</div><div class='add'>+	/* Software control power sequence */</div><div class='add'>+	viafb_write_reg_mask(CR91, VIACR, 0x11, 0x11);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 3; i++) {</div><div class='add'>+		mask = PowerSequenceOff[0][i];</div><div class='add'>+		data = PowerSequenceOff[1][i] &amp; mask;</div><div class='add'>+		viafb_write_reg_mask(CR91, VIACR, (u8) data, (u8) mask);</div><div class='add'>+		udelay(PowerSequenceOff[2][i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Disable LCD */</div><div class='add'>+	viafb_write_reg_mask(CR6A, VIACR, 0x00, 0x08);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void lcd_powersequence_on(void)</div><div class='add'>+{</div><div class='add'>+	int i, mask, data;</div><div class='add'>+</div><div class='add'>+	/* Software control power sequence */</div><div class='add'>+	viafb_write_reg_mask(CR91, VIACR, 0x11, 0x11);</div><div class='add'>+</div><div class='add'>+	/* Enable LCD */</div><div class='add'>+	viafb_write_reg_mask(CR6A, VIACR, 0x08, 0x08);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 3; i++) {</div><div class='add'>+		mask = PowerSequenceOn[0][i];</div><div class='add'>+		data = PowerSequenceOn[1][i] &amp; mask;</div><div class='add'>+		viafb_write_reg_mask(CR91, VIACR, (u8) data, (u8) mask);</div><div class='add'>+		udelay(PowerSequenceOn[2][i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	udelay(1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void fill_lcd_format(void)</div><div class='add'>+{</div><div class='add'>+	u8 bdithering = 0, bdual = 0;</div><div class='add'>+</div><div class='add'>+	if (viaparinfo-&gt;lvds_setting_info-&gt;device_lcd_dualedge)</div><div class='add'>+		bdual = BIT4;</div><div class='add'>+	if (viaparinfo-&gt;lvds_setting_info-&gt;LCDDithering)</div><div class='add'>+		bdithering = BIT0;</div><div class='add'>+	/* Dual &amp; Dithering */</div><div class='add'>+	viafb_write_reg_mask(CR88, VIACR, (bdithering | bdual), BIT4 + BIT0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void check_diport_of_integrated_lvds(</div><div class='add'>+	struct lvds_chip_information *plvds_chip_info,</div><div class='add'>+				     struct lvds_setting_information</div><div class='add'>+				     *plvds_setting_info)</div><div class='add'>+{</div><div class='add'>+	/* Determine LCD DI Port by hardware layout. */</div><div class='add'>+	switch (viafb_display_hardware_layout) {</div><div class='add'>+	case HW_LAYOUT_LCD_ONLY:</div><div class='add'>+		{</div><div class='add'>+			if (plvds_setting_info-&gt;device_lcd_dualedge) {</div><div class='add'>+				plvds_chip_info-&gt;output_interface =</div><div class='add'>+				    INTERFACE_LVDS0LVDS1;</div><div class='add'>+			} else {</div><div class='add'>+				plvds_chip_info-&gt;output_interface =</div><div class='add'>+				    INTERFACE_LVDS0;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	case HW_LAYOUT_DVI_ONLY:</div><div class='add'>+		{</div><div class='add'>+			plvds_chip_info-&gt;output_interface = INTERFACE_NONE;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	case HW_LAYOUT_LCD1_LCD2:</div><div class='add'>+	case HW_LAYOUT_LCD_EXTERNAL_LCD2:</div><div class='add'>+		{</div><div class='add'>+			plvds_chip_info-&gt;output_interface =</div><div class='add'>+			    INTERFACE_LVDS0LVDS1;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	case HW_LAYOUT_LCD_DVI:</div><div class='add'>+		{</div><div class='add'>+			plvds_chip_info-&gt;output_interface = INTERFACE_LVDS1;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		{</div><div class='add'>+			plvds_chip_info-&gt;output_interface = INTERFACE_LVDS1;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DEBUG_MSG(KERN_INFO</div><div class='add'>+		  "Display Hardware Layout: 0x%x, LCD DI Port: 0x%x\n",</div><div class='add'>+		  viafb_display_hardware_layout,</div><div class='add'>+		  plvds_chip_info-&gt;output_interface);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void viafb_init_lvds_output_interface(struct lvds_chip_information</div><div class='add'>+				*plvds_chip_info,</div><div class='add'>+				struct lvds_setting_information</div><div class='add'>+				*plvds_setting_info)</div><div class='add'>+{</div><div class='add'>+	if (INTERFACE_NONE != plvds_chip_info-&gt;output_interface) {</div><div class='add'>+		/*Do nothing, lcd port is specified by module parameter */</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (plvds_chip_info-&gt;lvds_chip_name) {</div><div class='add'>+</div><div class='add'>+	case VT1636_LVDS:</div><div class='add'>+		switch (viaparinfo-&gt;chip_info-&gt;gfx_chip_name) {</div><div class='add'>+		case UNICHROME_CX700:</div><div class='add'>+			plvds_chip_info-&gt;output_interface = INTERFACE_DVP1;</div><div class='add'>+			break;</div><div class='add'>+		case UNICHROME_CN700:</div><div class='add'>+			plvds_chip_info-&gt;output_interface = INTERFACE_DFP_LOW;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			plvds_chip_info-&gt;output_interface = INTERFACE_DVP0;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case INTEGRATED_LVDS:</div><div class='add'>+		check_diport_of_integrated_lvds(plvds_chip_info,</div><div class='add'>+						plvds_setting_info);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		switch (viaparinfo-&gt;chip_info-&gt;gfx_chip_name) {</div><div class='add'>+		case UNICHROME_K8M890:</div><div class='add'>+		case UNICHROME_P4M900:</div><div class='add'>+		case UNICHROME_P4M890:</div><div class='add'>+			plvds_chip_info-&gt;output_interface = INTERFACE_DFP_LOW;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			plvds_chip_info-&gt;output_interface = INTERFACE_DFP;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct display_timing lcd_centering_timging(struct display_timing</div><div class='add'>+					    mode_crt_reg,</div><div class='add'>+					    struct display_timing panel_crt_reg)</div><div class='add'>+{</div><div class='add'>+	struct display_timing crt_reg;</div><div class='add'>+</div><div class='add'>+	crt_reg.hor_total = panel_crt_reg.hor_total;</div><div class='add'>+	crt_reg.hor_addr = mode_crt_reg.hor_addr;</div><div class='add'>+	crt_reg.hor_blank_start =</div><div class='add'>+	    (panel_crt_reg.hor_addr - mode_crt_reg.hor_addr) / 2 +</div><div class='add'>+	    crt_reg.hor_addr;</div><div class='add'>+	crt_reg.hor_blank_end = panel_crt_reg.hor_blank_end;</div><div class='add'>+	crt_reg.hor_sync_start =</div><div class='add'>+	    (panel_crt_reg.hor_sync_start -</div><div class='add'>+	     panel_crt_reg.hor_blank_start) + crt_reg.hor_blank_start;</div><div class='add'>+	crt_reg.hor_sync_end = panel_crt_reg.hor_sync_end;</div><div class='add'>+</div><div class='add'>+	crt_reg.ver_total = panel_crt_reg.ver_total;</div><div class='add'>+	crt_reg.ver_addr = mode_crt_reg.ver_addr;</div><div class='add'>+	crt_reg.ver_blank_start =</div><div class='add'>+	    (panel_crt_reg.ver_addr - mode_crt_reg.ver_addr) / 2 +</div><div class='add'>+	    crt_reg.ver_addr;</div><div class='add'>+	crt_reg.ver_blank_end = panel_crt_reg.ver_blank_end;</div><div class='add'>+	crt_reg.ver_sync_start =</div><div class='add'>+	    (panel_crt_reg.ver_sync_start -</div><div class='add'>+	     panel_crt_reg.ver_blank_start) + crt_reg.ver_blank_start;</div><div class='add'>+	crt_reg.ver_sync_end = panel_crt_reg.ver_sync_end;</div><div class='add'>+</div><div class='add'>+	return crt_reg;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void load_crtc_shadow_timing(struct display_timing mode_timing,</div><div class='add'>+			     struct display_timing panel_timing)</div><div class='add'>+{</div><div class='add'>+	struct io_register *reg = NULL;</div><div class='add'>+	int i;</div><div class='add'>+	int viafb_load_reg_Num = 0;</div><div class='add'>+	int reg_value = 0;</div><div class='add'>+</div><div class='add'>+	if (viaparinfo-&gt;lvds_setting_info-&gt;display_method == LCD_EXPANDSION) {</div><div class='add'>+		/* Expansion */</div><div class='add'>+		for (i = 12; i &lt; 20; i++) {</div><div class='add'>+			switch (i) {</div><div class='add'>+			case H_TOTAL_SHADOW_INDEX:</div><div class='add'>+				reg_value =</div><div class='add'>+				    IGA2_HOR_TOTAL_SHADOW_FORMULA</div><div class='add'>+				    (panel_timing.hor_total);</div><div class='add'>+				viafb_load_reg_Num =</div><div class='add'>+				    iga2_shadow_crtc_reg.hor_total_shadow.</div><div class='add'>+				    reg_num;</div><div class='add'>+				reg = iga2_shadow_crtc_reg.hor_total_shadow.reg;</div><div class='add'>+				break;</div><div class='add'>+			case H_BLANK_END_SHADOW_INDEX:</div><div class='add'>+				reg_value =</div><div class='add'>+				    IGA2_HOR_BLANK_END_SHADOW_FORMULA</div><div class='add'>+				    (panel_timing.hor_blank_start,</div><div class='add'>+				     panel_timing.hor_blank_end);</div><div class='add'>+				viafb_load_reg_Num =</div><div class='add'>+				    iga2_shadow_crtc_reg.</div><div class='add'>+				    hor_blank_end_shadow.reg_num;</div><div class='add'>+				reg =</div><div class='add'>+				    iga2_shadow_crtc_reg.</div><div class='add'>+				    hor_blank_end_shadow.reg;</div><div class='add'>+				break;</div><div class='add'>+			case V_TOTAL_SHADOW_INDEX:</div><div class='add'>+				reg_value =</div><div class='add'>+				    IGA2_VER_TOTAL_SHADOW_FORMULA</div><div class='add'>+				    (panel_timing.ver_total);</div><div class='add'>+				viafb_load_reg_Num =</div><div class='add'>+				    iga2_shadow_crtc_reg.ver_total_shadow.</div><div class='add'>+				    reg_num;</div><div class='add'>+				reg = iga2_shadow_crtc_reg.ver_total_shadow.reg;</div><div class='add'>+				break;</div><div class='add'>+			case V_ADDR_SHADOW_INDEX:</div><div class='add'>+				reg_value =</div><div class='add'>+				    IGA2_VER_ADDR_SHADOW_FORMULA</div><div class='add'>+				    (panel_timing.ver_addr);</div><div class='add'>+				viafb_load_reg_Num =</div><div class='add'>+				    iga2_shadow_crtc_reg.ver_addr_shadow.</div><div class='add'>+				    reg_num;</div><div class='add'>+				reg = iga2_shadow_crtc_reg.ver_addr_shadow.reg;</div><div class='add'>+				break;</div><div class='add'>+			case V_BLANK_SATRT_SHADOW_INDEX:</div><div class='add'>+				reg_value =</div><div class='add'>+				    IGA2_VER_BLANK_START_SHADOW_FORMULA</div><div class='add'>+				    (panel_timing.ver_blank_start);</div><div class='add'>+				viafb_load_reg_Num =</div><div class='add'>+				    iga2_shadow_crtc_reg.</div><div class='add'>+				    ver_blank_start_shadow.reg_num;</div><div class='add'>+				reg =</div><div class='add'>+				    iga2_shadow_crtc_reg.</div><div class='add'>+				    ver_blank_start_shadow.reg;</div><div class='add'>+				break;</div><div class='add'>+			case V_BLANK_END_SHADOW_INDEX:</div><div class='add'>+				reg_value =</div><div class='add'>+				    IGA2_VER_BLANK_END_SHADOW_FORMULA</div><div class='add'>+				    (panel_timing.ver_blank_start,</div><div class='add'>+				     panel_timing.ver_blank_end);</div><div class='add'>+				viafb_load_reg_Num =</div><div class='add'>+				    iga2_shadow_crtc_reg.</div><div class='add'>+				    ver_blank_end_shadow.reg_num;</div><div class='add'>+				reg =</div><div class='add'>+				    iga2_shadow_crtc_reg.</div><div class='add'>+				    ver_blank_end_shadow.reg;</div><div class='add'>+				break;</div><div class='add'>+			case V_SYNC_SATRT_SHADOW_INDEX:</div><div class='add'>+				reg_value =</div><div class='add'>+				    IGA2_VER_SYNC_START_SHADOW_FORMULA</div><div class='add'>+				    (panel_timing.ver_sync_start);</div><div class='add'>+				viafb_load_reg_Num =</div><div class='add'>+				    iga2_shadow_crtc_reg.</div><div class='add'>+				    ver_sync_start_shadow.reg_num;</div><div class='add'>+				reg =</div><div class='add'>+				    iga2_shadow_crtc_reg.</div><div class='add'>+				    ver_sync_start_shadow.reg;</div><div class='add'>+				break;</div><div class='add'>+			case V_SYNC_END_SHADOW_INDEX:</div><div class='add'>+				reg_value =</div><div class='add'>+				    IGA2_VER_SYNC_END_SHADOW_FORMULA</div><div class='add'>+				    (panel_timing.ver_sync_start,</div><div class='add'>+				     panel_timing.ver_sync_end);</div><div class='add'>+				viafb_load_reg_Num =</div><div class='add'>+				    iga2_shadow_crtc_reg.</div><div class='add'>+				    ver_sync_end_shadow.reg_num;</div><div class='add'>+				reg =</div><div class='add'>+				    iga2_shadow_crtc_reg.</div><div class='add'>+				    ver_sync_end_shadow.reg;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			viafb_load_reg(reg_value,</div><div class='add'>+				viafb_load_reg_Num, reg, VIACR);</div><div class='add'>+		}</div><div class='add'>+	} else {		/* Centering */</div><div class='add'>+		for (i = 12; i &lt; 20; i++) {</div><div class='add'>+			switch (i) {</div><div class='add'>+			case H_TOTAL_SHADOW_INDEX:</div><div class='add'>+				reg_value =</div><div class='add'>+				    IGA2_HOR_TOTAL_SHADOW_FORMULA</div><div class='add'>+				    (panel_timing.hor_total);</div><div class='add'>+				viafb_load_reg_Num =</div><div class='add'>+				    iga2_shadow_crtc_reg.hor_total_shadow.</div><div class='add'>+				    reg_num;</div><div class='add'>+				reg = iga2_shadow_crtc_reg.hor_total_shadow.reg;</div><div class='add'>+				break;</div><div class='add'>+			case H_BLANK_END_SHADOW_INDEX:</div><div class='add'>+				reg_value =</div><div class='add'>+				    IGA2_HOR_BLANK_END_SHADOW_FORMULA</div><div class='add'>+				    (panel_timing.hor_blank_start,</div><div class='add'>+				     panel_timing.hor_blank_end);</div><div class='add'>+				viafb_load_reg_Num =</div><div class='add'>+				    iga2_shadow_crtc_reg.</div><div class='add'>+				    hor_blank_end_shadow.reg_num;</div><div class='add'>+				reg =</div><div class='add'>+				    iga2_shadow_crtc_reg.</div><div class='add'>+				    hor_blank_end_shadow.reg;</div><div class='add'>+				break;</div><div class='add'>+			case V_TOTAL_SHADOW_INDEX:</div><div class='add'>+				reg_value =</div><div class='add'>+				    IGA2_VER_TOTAL_SHADOW_FORMULA</div><div class='add'>+				    (panel_timing.ver_total);</div><div class='add'>+				viafb_load_reg_Num =</div><div class='add'>+				    iga2_shadow_crtc_reg.ver_total_shadow.</div><div class='add'>+				    reg_num;</div><div class='add'>+				reg = iga2_shadow_crtc_reg.ver_total_shadow.reg;</div><div class='add'>+				break;</div><div class='add'>+			case V_ADDR_SHADOW_INDEX:</div><div class='add'>+				reg_value =</div><div class='add'>+				    IGA2_VER_ADDR_SHADOW_FORMULA</div><div class='add'>+				    (mode_timing.ver_addr);</div><div class='add'>+				viafb_load_reg_Num =</div><div class='add'>+				    iga2_shadow_crtc_reg.ver_addr_shadow.</div><div class='add'>+				    reg_num;</div><div class='add'>+				reg = iga2_shadow_crtc_reg.ver_addr_shadow.reg;</div><div class='add'>+				break;</div><div class='add'>+			case V_BLANK_SATRT_SHADOW_INDEX:</div><div class='add'>+				reg_value =</div><div class='add'>+				    IGA2_VER_BLANK_START_SHADOW_FORMULA</div><div class='add'>+				    (mode_timing.ver_blank_start);</div><div class='add'>+				viafb_load_reg_Num =</div><div class='add'>+				    iga2_shadow_crtc_reg.</div><div class='add'>+				    ver_blank_start_shadow.reg_num;</div><div class='add'>+				reg =</div><div class='add'>+				    iga2_shadow_crtc_reg.</div><div class='add'>+				    ver_blank_start_shadow.reg;</div><div class='add'>+				break;</div><div class='add'>+			case V_BLANK_END_SHADOW_INDEX:</div><div class='add'>+				reg_value =</div><div class='add'>+				    IGA2_VER_BLANK_END_SHADOW_FORMULA</div><div class='add'>+				    (panel_timing.ver_blank_start,</div><div class='add'>+				     panel_timing.ver_blank_end);</div><div class='add'>+				viafb_load_reg_Num =</div><div class='add'>+				    iga2_shadow_crtc_reg.</div><div class='add'>+				    ver_blank_end_shadow.reg_num;</div><div class='add'>+				reg =</div><div class='add'>+				    iga2_shadow_crtc_reg.</div><div class='add'>+				    ver_blank_end_shadow.reg;</div><div class='add'>+				break;</div><div class='add'>+			case V_SYNC_SATRT_SHADOW_INDEX:</div><div class='add'>+				reg_value =</div><div class='add'>+				    IGA2_VER_SYNC_START_SHADOW_FORMULA(</div><div class='add'>+				    (panel_timing.ver_sync_start -</div><div class='add'>+				    panel_timing.ver_blank_start) +</div><div class='add'>+				    (panel_timing.ver_addr -</div><div class='add'>+				    mode_timing.ver_addr) / 2 +</div><div class='add'>+				    mode_timing.ver_addr);</div><div class='add'>+				viafb_load_reg_Num =</div><div class='add'>+				    iga2_shadow_crtc_reg.ver_sync_start_shadow.</div><div class='add'>+				    reg_num;</div><div class='add'>+				reg =</div><div class='add'>+				    iga2_shadow_crtc_reg.ver_sync_start_shadow.</div><div class='add'>+				    reg;</div><div class='add'>+				break;</div><div class='add'>+			case V_SYNC_END_SHADOW_INDEX:</div><div class='add'>+				reg_value =</div><div class='add'>+				    IGA2_VER_SYNC_END_SHADOW_FORMULA(</div><div class='add'>+				    (panel_timing.ver_sync_start -</div><div class='add'>+				    panel_timing.ver_blank_start) +</div><div class='add'>+				    (panel_timing.ver_addr -</div><div class='add'>+				    mode_timing.ver_addr) / 2 +</div><div class='add'>+				    mode_timing.ver_addr,</div><div class='add'>+				    panel_timing.ver_sync_end);</div><div class='add'>+				viafb_load_reg_Num =</div><div class='add'>+				    iga2_shadow_crtc_reg.ver_sync_end_shadow.</div><div class='add'>+				    reg_num;</div><div class='add'>+				reg =</div><div class='add'>+				    iga2_shadow_crtc_reg.ver_sync_end_shadow.</div><div class='add'>+				    reg;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			viafb_load_reg(reg_value,</div><div class='add'>+				viafb_load_reg_Num, reg, VIACR);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool viafb_lcd_get_mobile_state(bool *mobile)</div><div class='add'>+{</div><div class='add'>+	unsigned char *romptr, *tableptr;</div><div class='add'>+	u8 core_base;</div><div class='add'>+	unsigned char *biosptr;</div><div class='add'>+	/* Rom address */</div><div class='add'>+	u32 romaddr = 0x000C0000;</div><div class='add'>+	u16 start_pattern = 0;</div><div class='add'>+</div><div class='add'>+	biosptr = ioremap(romaddr, 0x10000);</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;start_pattern, biosptr, 2);</div><div class='add'>+	/* Compare pattern */</div><div class='add'>+	if (start_pattern == 0xAA55) {</div><div class='add'>+		/* Get the start of Table */</div><div class='add'>+		/* 0x1B means BIOS offset position */</div><div class='add'>+		romptr = biosptr + 0x1B;</div><div class='add'>+		tableptr = biosptr + *((u16 *) romptr);</div><div class='add'>+</div><div class='add'>+		/* Get the start of biosver structure */</div><div class='add'>+		/* 18 means BIOS version position. */</div><div class='add'>+		romptr = tableptr + 18;</div><div class='add'>+		romptr = biosptr + *((u16 *) romptr);</div><div class='add'>+</div><div class='add'>+		/* The offset should be 44, but the</div><div class='add'>+		   actual image is less three char. */</div><div class='add'>+		/* pRom += 44; */</div><div class='add'>+		romptr += 41;</div><div class='add'>+</div><div class='add'>+		core_base = *romptr++;</div><div class='add'>+</div><div class='add'>+		if (core_base &amp; 0x8)</div><div class='add'>+			*mobile = false;</div><div class='add'>+		else</div><div class='add'>+			*mobile = true;</div><div class='add'>+		/* release memory */</div><div class='add'>+		iounmap(biosptr);</div><div class='add'>+</div><div class='add'>+		return true;</div><div class='add'>+	} else {</div><div class='add'>+		iounmap(biosptr);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void viafb_load_scaling_factor_for_p4m900(int set_hres,</div><div class='add'>+	int set_vres, int panel_hres, int panel_vres)</div><div class='add'>+{</div><div class='add'>+	int h_scaling_factor;</div><div class='add'>+	int v_scaling_factor;</div><div class='add'>+	u8 cra2 = 0;</div><div class='add'>+	u8 cr77 = 0;</div><div class='add'>+	u8 cr78 = 0;</div><div class='add'>+	u8 cr79 = 0;</div><div class='add'>+	u8 cr9f = 0;</div><div class='add'>+	/* Check if expansion for horizontal */</div><div class='add'>+	if (set_hres &lt; panel_hres) {</div><div class='add'>+		/* Load Horizontal Scaling Factor */</div><div class='add'>+</div><div class='add'>+		/* For VIA_K8M800 or later chipsets. */</div><div class='add'>+		h_scaling_factor =</div><div class='add'>+		    K800_LCD_HOR_SCF_FORMULA(set_hres, panel_hres);</div><div class='add'>+		/* HSCaleFactor[1:0] at CR9F[1:0] */</div><div class='add'>+		cr9f = h_scaling_factor &amp; 0x0003;</div><div class='add'>+		/* HSCaleFactor[9:2] at CR77[7:0] */</div><div class='add'>+		cr77 = (h_scaling_factor &amp; 0x03FC) &gt;&gt; 2;</div><div class='add'>+		/* HSCaleFactor[11:10] at CR79[5:4] */</div><div class='add'>+		cr79 = (h_scaling_factor &amp; 0x0C00) &gt;&gt; 10;</div><div class='add'>+		cr79 &lt;&lt;= 4;</div><div class='add'>+</div><div class='add'>+		/* Horizontal scaling enabled */</div><div class='add'>+		cra2 = 0xC0;</div><div class='add'>+</div><div class='add'>+		DEBUG_MSG(KERN_INFO "Horizontal Scaling value = %d\n",</div><div class='add'>+			  h_scaling_factor);</div><div class='add'>+	} else {</div><div class='add'>+		/* Horizontal scaling disabled */</div><div class='add'>+		cra2 = 0x00;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check if expansion for vertical */</div><div class='add'>+	if (set_vres &lt; panel_vres) {</div><div class='add'>+		/* Load Vertical Scaling Factor */</div><div class='add'>+</div><div class='add'>+		/* For VIA_K8M800 or later chipsets. */</div><div class='add'>+		v_scaling_factor =</div><div class='add'>+		    K800_LCD_VER_SCF_FORMULA(set_vres, panel_vres);</div><div class='add'>+</div><div class='add'>+		/* Vertical scaling enabled */</div><div class='add'>+		cra2 |= 0x08;</div><div class='add'>+		/* VSCaleFactor[0] at CR79[3] */</div><div class='add'>+		cr79 |= ((v_scaling_factor &amp; 0x0001) &lt;&lt; 3);</div><div class='add'>+		/* VSCaleFactor[8:1] at CR78[7:0] */</div><div class='add'>+		cr78 |= (v_scaling_factor &amp; 0x01FE) &gt;&gt; 1;</div><div class='add'>+		/* VSCaleFactor[10:9] at CR79[7:6] */</div><div class='add'>+		cr79 |= ((v_scaling_factor &amp; 0x0600) &gt;&gt; 9) &lt;&lt; 6;</div><div class='add'>+</div><div class='add'>+		DEBUG_MSG(KERN_INFO "Vertical Scaling value = %d\n",</div><div class='add'>+			  v_scaling_factor);</div><div class='add'>+	} else {</div><div class='add'>+		/* Vertical scaling disabled */</div><div class='add'>+		cra2 |= 0x00;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	viafb_write_reg_mask(CRA2, VIACR, cra2, BIT3 + BIT6 + BIT7);</div><div class='add'>+	viafb_write_reg_mask(CR77, VIACR, cr77, 0xFF);</div><div class='add'>+	viafb_write_reg_mask(CR78, VIACR, cr78, 0xFF);</div><div class='add'>+	viafb_write_reg_mask(CR79, VIACR, cr79, 0xF8);</div><div class='add'>+	viafb_write_reg_mask(CR9F, VIACR, cr9f, BIT0 + BIT1);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/video/via/lcd.h b/drivers/video/via/lcd.h<br/>new file mode 100644<br/>index 000000000000..071f47cf5be1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/via/lcd.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/via/lcd.h</a></div><div class='hunk'>@@ -0,0 +1,94 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.</div><div class='add'>+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.</div><div class='add'>+</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public</div><div class='add'>+ * License as published by the Free Software Foundation;</div><div class='add'>+ * either version 2, or (at your option) any later version.</div><div class='add'>+</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even</div><div class='add'>+ * the implied warranty of MERCHANTABILITY or FITNESS FOR</div><div class='add'>+ * A PARTICULAR PURPOSE.See the GNU General Public License</div><div class='add'>+ * for more details.</div><div class='add'>+</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc.,</div><div class='add'>+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='add'>+ */</div><div class='add'>+#ifndef __LCD_H__</div><div class='add'>+#define __LCD_H__</div><div class='add'>+</div><div class='add'>+/*Definition TMDS Device ID register*/</div><div class='add'>+#define     VT1631_DEVICE_ID_REG        0x02</div><div class='add'>+#define     VT1631_DEVICE_ID            0x92</div><div class='add'>+</div><div class='add'>+#define     VT3271_DEVICE_ID_REG        0x02</div><div class='add'>+#define     VT3271_DEVICE_ID            0x71</div><div class='add'>+</div><div class='add'>+#define     GET_LCD_SIZE_BY_SYSTEM_BIOS     0x01</div><div class='add'>+#define     GET_LCD_SIZE_BY_VGA_BIOS        0x02</div><div class='add'>+#define     GET_LCD_SZIE_BY_HW_STRAPPING    0x03</div><div class='add'>+#define     GET_LCD_SIZE_BY_USER_SETTING    0x04</div><div class='add'>+</div><div class='add'>+/* Definition DVI Panel ID*/</div><div class='add'>+/* Resolution: 640x480,   Channel: single, Dithering: Enable */</div><div class='add'>+#define     LCD_PANEL_ID0_640X480       0x00</div><div class='add'>+/* Resolution: 800x600,   Channel: single, Dithering: Enable */</div><div class='add'>+#define     LCD_PANEL_ID1_800X600       0x01</div><div class='add'>+/* Resolution: 1024x768,  Channel: single, Dithering: Enable */</div><div class='add'>+#define     LCD_PANEL_ID2_1024X768      0x02</div><div class='add'>+/* Resolution: 1280x768,  Channel: single, Dithering: Enable */</div><div class='add'>+#define     LCD_PANEL_ID3_1280X768      0x03</div><div class='add'>+/* Resolution: 1280x1024, Channel: dual,   Dithering: Enable */</div><div class='add'>+#define     LCD_PANEL_ID4_1280X1024     0x04</div><div class='add'>+/* Resolution: 1400x1050, Channel: dual,   Dithering: Enable */</div><div class='add'>+#define     LCD_PANEL_ID5_1400X1050     0x05</div><div class='add'>+/* Resolution: 1600x1200, Channel: dual,   Dithering: Enable */</div><div class='add'>+#define     LCD_PANEL_ID6_1600X1200     0x06</div><div class='add'>+/* Resolution: 1366x768,  Channel: single, Dithering: Disable */</div><div class='add'>+#define     LCD_PANEL_ID7_1366X768      0x07</div><div class='add'>+/* Resolution: 1024x600,  Channel: single, Dithering: Enable*/</div><div class='add'>+#define     LCD_PANEL_ID8_1024X600      0x08</div><div class='add'>+/* Resolution: 1280x800,  Channel: single, Dithering: Enable*/</div><div class='add'>+#define     LCD_PANEL_ID9_1280X800      0x09</div><div class='add'>+/* Resolution: 800x480,   Channel: single, Dithering: Enable*/</div><div class='add'>+#define     LCD_PANEL_IDA_800X480       0x0A</div><div class='add'>+/* Resolution: 1360x768,   Channel: single, Dithering: Disable*/</div><div class='add'>+#define     LCD_PANEL_IDB_1360X768     0x0B</div><div class='add'>+/* Resolution: 480x640,  Channel: single, Dithering: Enable */</div><div class='add'>+#define     LCD_PANEL_IDC_480X640      0x0C</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+extern int viafb_LCD2_ON;</div><div class='add'>+extern int viafb_LCD_ON;</div><div class='add'>+extern int viafb_DVI_ON;</div><div class='add'>+</div><div class='add'>+void viafb_disable_lvds_vt1636(struct lvds_setting_information</div><div class='add'>+			 *plvds_setting_info,</div><div class='add'>+			 struct lvds_chip_information *plvds_chip_info);</div><div class='add'>+void viafb_enable_lvds_vt1636(struct lvds_setting_information</div><div class='add'>+			*plvds_setting_info,</div><div class='add'>+			struct lvds_chip_information *plvds_chip_info);</div><div class='add'>+void viafb_lcd_disable(void);</div><div class='add'>+void viafb_lcd_enable(void);</div><div class='add'>+void viafb_init_lcd_size(void);</div><div class='add'>+void viafb_init_lvds_output_interface(struct lvds_chip_information</div><div class='add'>+				*plvds_chip_info,</div><div class='add'>+				struct lvds_setting_information</div><div class='add'>+				*plvds_setting_info);</div><div class='add'>+void viafb_lcd_set_mode(struct crt_mode_table *mode_crt_table,</div><div class='add'>+		  struct lvds_setting_information *plvds_setting_info,</div><div class='add'>+		  struct lvds_chip_information *plvds_chip_info);</div><div class='add'>+int viafb_lvds_trasmitter_identify(void);</div><div class='add'>+void viafb_init_lvds_output_interface(struct lvds_chip_information</div><div class='add'>+				*plvds_chip_info,</div><div class='add'>+				struct lvds_setting_information</div><div class='add'>+				*plvds_setting_info);</div><div class='add'>+bool viafb_lcd_get_mobile_state(bool *mobile);</div><div class='add'>+void viafb_load_crtc_timing(struct display_timing device_timing,</div><div class='add'>+	int set_iga);</div><div class='add'>+</div><div class='add'>+#endif /* __LCD_H__ */</div><div class='head'>diff --git a/drivers/video/via/lcdtbl.h b/drivers/video/via/lcdtbl.h<br/>new file mode 100644<br/>index 000000000000..6f3dd800be59<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/via/lcdtbl.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/via/lcdtbl.h</a></div><div class='hunk'>@@ -0,0 +1,591 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.</div><div class='add'>+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.</div><div class='add'>+</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public</div><div class='add'>+ * License as published by the Free Software Foundation;</div><div class='add'>+ * either version 2, or (at your option) any later version.</div><div class='add'>+</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even</div><div class='add'>+ * the implied warranty of MERCHANTABILITY or FITNESS FOR</div><div class='add'>+ * A PARTICULAR PURPOSE.See the GNU General Public License</div><div class='add'>+ * for more details.</div><div class='add'>+</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc.,</div><div class='add'>+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='add'>+ */</div><div class='add'>+#ifndef __LCDTBL_H__</div><div class='add'>+#define __LCDTBL_H__</div><div class='add'>+</div><div class='add'>+#include "share.h"</div><div class='add'>+</div><div class='add'>+/* CLE266 Software Power Sequence */</div><div class='add'>+/* {Mask}, {Data}, {Delay} */</div><div class='add'>+int PowerSequenceOn[3][3] =</div><div class='add'>+    { {0x10, 0x08, 0x06}, {0x10, 0x08, 0x06}, {0x19, 0x1FE, 0x01} };</div><div class='add'>+int PowerSequenceOff[3][3] =</div><div class='add'>+    { {0x06, 0x08, 0x10}, {0x00, 0x00, 0x00}, {0xD2, 0x19, 0x01} };</div><div class='add'>+</div><div class='add'>+/* ++++++ P880 ++++++ */</div><div class='add'>+/*   Panel 1600x1200   */</div><div class='add'>+struct io_reg P880_LCD_RES_6X4_16X12[] = {</div><div class='add'>+	/*IGA2 Horizontal Total */</div><div class='add'>+	{VIACR, CR50, 0xFF, 0x73}, {VIACR, CR55, 0x0F, 0x08},</div><div class='add'>+	/*IGA2 Horizontal Blank End */</div><div class='add'>+	{VIACR, CR53, 0xFF, 0x73}, {VIACR, CR54, 0x38, 0x00},</div><div class='add'>+	{VIACR, CR5D, 0x40, 0x40},</div><div class='add'>+	/*IGA2 Horizontal Total Shadow */</div><div class='add'>+	{VIACR, CR6D, 0xFF, 0x5A}, {VIACR, CR71, 0x08, 0x00},</div><div class='add'>+	/*IGA2 Horizontal Blank End Shadow */</div><div class='add'>+	{VIACR, CR6E, 0xFF, 0x5E},</div><div class='add'>+	/*IGA2 Offset */</div><div class='add'>+	{VIACR, CR66, 0xFF, 0xD6}, {VIACR, CR67, 0x03, 0x00},</div><div class='add'>+	 /*VCLK*/ {VIASR, SR44, 0xFF, 0x7D}, {VIASR, SR45, 0xFF, 0x8C},</div><div class='add'>+	{VIASR, SR46, 0xFF, 0x02}</div><div class='add'>+</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define NUM_TOTAL_P880_LCD_RES_6X4_16X12 ARRAY_SIZE(P880_LCD_RES_6X4_16X12)</div><div class='add'>+</div><div class='add'>+struct io_reg P880_LCD_RES_7X4_16X12[] = {</div><div class='add'>+	/*IGA2 Horizontal Total */</div><div class='add'>+	{VIACR, CR50, 0xFF, 0x67}, {VIACR, CR55, 0x0F, 0x08},</div><div class='add'>+	/*IGA2 Horizontal Blank End */</div><div class='add'>+	{VIACR, CR53, 0xFF, 0x67}, {VIACR, CR54, 0x38, 0x00},</div><div class='add'>+	{VIACR, CR5D, 0x40, 0x40},</div><div class='add'>+	/*IGA2 Horizontal Total Shadow */</div><div class='add'>+	{VIACR, CR6D, 0xFF, 0x74}, {VIACR, CR71, 0x08, 0x00},</div><div class='add'>+	/*IGA2 Horizontal Blank End Shadow */</div><div class='add'>+	{VIACR, CR6E, 0xFF, 0x78},</div><div class='add'>+	/*IGA2 Offset */</div><div class='add'>+	{VIACR, CR66, 0xFF, 0xF5}, {VIACR, CR67, 0x03, 0x00},</div><div class='add'>+	 /*VCLK*/ {VIASR, SR44, 0xFF, 0x78}, {VIASR, SR45, 0xFF, 0x8C},</div><div class='add'>+	{VIASR, SR46, 0xFF, 0x01}</div><div class='add'>+</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define NUM_TOTAL_P880_LCD_RES_7X4_16X12 ARRAY_SIZE(P880_LCD_RES_7X4_16X12)</div><div class='add'>+</div><div class='add'>+struct io_reg P880_LCD_RES_8X6_16X12[] = {</div><div class='add'>+	/*IGA2 Horizontal Total */</div><div class='add'>+	{VIACR, CR50, 0xFF, 0x65}, {VIACR, CR55, 0x0F, 0x08},</div><div class='add'>+	/*IGA2 Horizontal Blank End */</div><div class='add'>+	{VIACR, CR53, 0xFF, 0x65}, {VIACR, CR54, 0x38, 0x00},</div><div class='add'>+	{VIACR, CR5D, 0x40, 0x40},</div><div class='add'>+	/*IGA2 Horizontal Total Shadow */</div><div class='add'>+	{VIACR, CR6D, 0xFF, 0x7F}, {VIACR, CR71, 0x08, 0x00},</div><div class='add'>+	/*IGA2 Horizontal Blank End Shadow */</div><div class='add'>+	{VIACR, CR6E, 0xFF, 0x83},</div><div class='add'>+	/*IGA2 Offset */</div><div class='add'>+	{VIACR, CR66, 0xFF, 0xE1}, {VIACR, CR67, 0x03, 0x00},</div><div class='add'>+	 /*VCLK*/ {VIASR, SR44, 0xFF, 0x6D}, {VIASR, SR45, 0xFF, 0x88},</div><div class='add'>+	{VIASR, SR46, 0xFF, 0x03}</div><div class='add'>+</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define NUM_TOTAL_P880_LCD_RES_8X6_16X12 ARRAY_SIZE(P880_LCD_RES_8X6_16X12)</div><div class='add'>+</div><div class='add'>+struct io_reg P880_LCD_RES_10X7_16X12[] = {</div><div class='add'>+	/*IGA2 Horizontal Total */</div><div class='add'>+	{VIACR, CR50, 0xFF, 0x65}, {VIACR, CR55, 0x0F, 0x08},</div><div class='add'>+	/*IGA2 Horizontal Blank End */</div><div class='add'>+	{VIACR, CR53, 0xFF, 0x65}, {VIACR, CR54, 0x38, 0x00},</div><div class='add'>+	{VIACR, CR5D, 0x40, 0x40},</div><div class='add'>+	/*IGA2 Horizontal Total Shadow */</div><div class='add'>+	{VIACR, CR6D, 0xFF, 0xAB}, {VIACR, CR71, 0x08, 0x00},</div><div class='add'>+	/*IGA2 Horizontal Blank End Shadow */</div><div class='add'>+	{VIACR, CR6E, 0xFF, 0xAF},</div><div class='add'>+	/*IGA2 Offset */</div><div class='add'>+	{VIACR, CR66, 0xFF, 0xF0}, {VIACR, CR67, 0x03, 0x00},</div><div class='add'>+	 /*VCLK*/ {VIASR, SR44, 0xFF, 0x92}, {VIASR, SR45, 0xFF, 0x88},</div><div class='add'>+	{VIASR, SR46, 0xFF, 0x03}</div><div class='add'>+</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define NUM_TOTAL_P880_LCD_RES_10X7_16X12 ARRAY_SIZE(P880_LCD_RES_10X7_16X12)</div><div class='add'>+</div><div class='add'>+struct io_reg P880_LCD_RES_12X10_16X12[] = {</div><div class='add'>+	/*IGA2 Horizontal Total */</div><div class='add'>+	{VIACR, CR50, 0xFF, 0x7D}, {VIACR, CR55, 0x0F, 0x08},</div><div class='add'>+	/*IGA2 Horizontal Blank End */</div><div class='add'>+	{VIACR, CR53, 0xFF, 0x7D}, {VIACR, CR54, 0x38, 0x00},</div><div class='add'>+	{VIACR, CR5D, 0x40, 0x40},</div><div class='add'>+	/*IGA2 Horizontal Total Shadow */</div><div class='add'>+	{VIACR, CR6D, 0xFF, 0xD0}, {VIACR, CR71, 0x08, 0x00},</div><div class='add'>+	/*IGA2 Horizontal Blank End Shadow */</div><div class='add'>+	{VIACR, CR6E, 0xFF, 0xD4},</div><div class='add'>+	/*IGA2 Offset */</div><div class='add'>+	{VIACR, CR66, 0xFF, 0xFA}, {VIACR, CR67, 0x03, 0x00},</div><div class='add'>+	 /*VCLK*/ {VIASR, SR44, 0xFF, 0xF6}, {VIASR, SR45, 0xFF, 0x88},</div><div class='add'>+	{VIASR, SR46, 0xFF, 0x05}</div><div class='add'>+</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define NUM_TOTAL_P880_LCD_RES_12X10_16X12 ARRAY_SIZE(P880_LCD_RES_12X10_16X12)</div><div class='add'>+</div><div class='add'>+/*   Panel 1400x1050   */</div><div class='add'>+struct io_reg P880_LCD_RES_6X4_14X10[] = {</div><div class='add'>+	/* 640x480                          */</div><div class='add'>+	/* IGA2 Horizontal Total            */</div><div class='add'>+	{VIACR, CR50, 0xFF, 0x9D}, {VIACR, CR55, 0x0F, 0x56},</div><div class='add'>+	/* IGA2 Horizontal Blank End        */</div><div class='add'>+	{VIACR, CR53, 0xFF, 0x9D}, {VIACR, CR54, 0x38, 0x75},</div><div class='add'>+	{VIACR, CR5D, 0x40, 0x24},</div><div class='add'>+	/* IGA2 Horizontal Total Shadow     */</div><div class='add'>+	{VIACR, CR6D, 0xFF, 0x5F}, {VIACR, CR71, 0x08, 0x44},</div><div class='add'>+	/* IGA2 Horizontal Blank End Shadow */</div><div class='add'>+	{VIACR, CR6E, 0xFF, 0x63},</div><div class='add'>+	/* IGA2 Offset                      */</div><div class='add'>+	{VIACR, CR66, 0xFF, 0xB4}, {VIACR, CR67, 0x03, 0x00},</div><div class='add'>+	/* VCLK                             */</div><div class='add'>+	{VIASR, SR44, 0xFF, 0xC6}, {VIASR, SR45, 0xFF, 0x8C},</div><div class='add'>+	{VIASR, SR46, 0xFF, 0x05}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define NUM_TOTAL_P880_LCD_RES_6X4_14X10 ARRAY_SIZE(P880_LCD_RES_6X4_14X10)</div><div class='add'>+</div><div class='add'>+struct io_reg P880_LCD_RES_8X6_14X10[] = {</div><div class='add'>+	/* 800x600                          */</div><div class='add'>+	/* IGA2 Horizontal Total            */</div><div class='add'>+	{VIACR, CR50, 0xFF, 0x9D}, {VIACR, CR55, 0x0F, 0x56},</div><div class='add'>+	/* IGA2 Horizontal Blank End        */</div><div class='add'>+	{VIACR, CR53, 0xFF, 0x9D}, {VIACR, CR54, 0x38, 0x75},</div><div class='add'>+	{VIACR, CR5D, 0x40, 0x24},</div><div class='add'>+	/* IGA2 Horizontal Total Shadow     */</div><div class='add'>+	{VIACR, CR6D, 0xFF, 0x7F}, {VIACR, CR71, 0x08, 0x44},</div><div class='add'>+	/* IGA2 Horizontal Blank End Shadow */</div><div class='add'>+	{VIACR, CR6E, 0xFF, 0x83},</div><div class='add'>+	/* IGA2 Offset                      */</div><div class='add'>+	{VIACR, CR66, 0xFF, 0xBE}, {VIACR, CR67, 0x03, 0x00},</div><div class='add'>+	/* VCLK                             */</div><div class='add'>+	{VIASR, SR44, 0xFF, 0x06}, {VIASR, SR45, 0xFF, 0x8D},</div><div class='add'>+	{VIASR, SR46, 0xFF, 0x05}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define NUM_TOTAL_P880_LCD_RES_8X6_14X10 ARRAY_SIZE(P880_LCD_RES_8X6_14X10)</div><div class='add'>+</div><div class='add'>+/* ++++++ K400 ++++++ */</div><div class='add'>+/*   Panel 1600x1200   */</div><div class='add'>+struct io_reg K400_LCD_RES_6X4_16X12[] = {</div><div class='add'>+	/*IGA2 Horizontal Total */</div><div class='add'>+	{VIACR, CR50, 0xFF, 0x73}, {VIACR, CR55, 0x0F, 0x08},</div><div class='add'>+	/*IGA2 Horizontal Blank End */</div><div class='add'>+	{VIACR, CR53, 0xFF, 0x73}, {VIACR, CR54, 0x38, 0x00},</div><div class='add'>+	{VIACR, CR5D, 0x40, 0x40},</div><div class='add'>+	/*IGA2 Horizontal Total Shadow */</div><div class='add'>+	{VIACR, CR6D, 0xFF, 0x5A}, {VIACR, CR71, 0x08, 0x00},</div><div class='add'>+	/*IGA2 Horizontal Blank End Shadow */</div><div class='add'>+	{VIACR, CR6E, 0xFF, 0x5E},</div><div class='add'>+	/*IGA2 Offset */</div><div class='add'>+	{VIACR, CR66, 0xFF, 0xDA}, {VIACR, CR67, 0x03, 0x00},</div><div class='add'>+	 /*VCLK*/ {VIASR, SR46, 0xFF, 0xC4}, {VIASR, SR47, 0xFF, 0x7F}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define NUM_TOTAL_K400_LCD_RES_6X4_16X12 ARRAY_SIZE(K400_LCD_RES_6X4_16X12)</div><div class='add'>+</div><div class='add'>+struct io_reg K400_LCD_RES_7X4_16X12[] = {</div><div class='add'>+	/*IGA2 Horizontal Total */</div><div class='add'>+	{VIACR, CR50, 0xFF, 0x67}, {VIACR, CR55, 0x0F, 0x08},</div><div class='add'>+	/*IGA2 Horizontal Blank End */</div><div class='add'>+	{VIACR, CR53, 0xFF, 0x67}, {VIACR, CR54, 0x38, 0x00},</div><div class='add'>+	{VIACR, CR5D, 0x40, 0x40},</div><div class='add'>+	/*IGA2 Horizontal Total Shadow */</div><div class='add'>+	{VIACR, CR6D, 0xFF, 0x74}, {VIACR, CR71, 0x08, 0x00},</div><div class='add'>+	/*IGA2 Horizontal Blank End Shadow */</div><div class='add'>+	{VIACR, CR6E, 0xFF, 0x78},</div><div class='add'>+	/*IGA2 Offset */</div><div class='add'>+	{VIACR, CR66, 0xFF, 0xF5}, {VIACR, CR67, 0x03, 0x00},</div><div class='add'>+	 /*VCLK*/ {VIASR, SR46, 0xFF, 0x46}, {VIASR, SR47, 0xFF, 0x3D}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define NUM_TOTAL_K400_LCD_RES_7X4_16X12 ARRAY_SIZE(K400_LCD_RES_7X4_16X12)</div><div class='add'>+</div><div class='add'>+struct io_reg K400_LCD_RES_8X6_16X12[] = {</div><div class='add'>+	/*IGA2 Horizontal Total */</div><div class='add'>+	{VIACR, CR50, 0xFF, 0x65}, {VIACR, CR55, 0x0F, 0x08},</div><div class='add'>+	/*IGA2 Horizontal Blank End */</div><div class='add'>+	{VIACR, CR53, 0xFF, 0x65}, {VIACR, CR54, 0x38, 0x00},</div><div class='add'>+	{VIACR, CR5D, 0x40, 0x40},</div><div class='add'>+	/*IGA2 Horizontal Total Shadow */</div><div class='add'>+	{VIACR, CR6D, 0xFF, 0x7F}, {VIACR, CR71, 0x08, 0x00},</div><div class='add'>+	/*IGA2 Horizontal Blank End Shadow */</div><div class='add'>+	{VIACR, CR6E, 0xFF, 0x83},</div><div class='add'>+	/*IGA2 Offset */</div><div class='add'>+	{VIACR, CR66, 0xFF, 0xE1}, {VIACR, CR67, 0x03, 0x00},</div><div class='add'>+	 /*VCLK*/ {VIASR, SR46, 0xFF, 0x85}, {VIASR, SR47, 0xFF, 0x6F}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define NUM_TOTAL_K400_LCD_RES_8X6_16X12 ARRAY_SIZE(K400_LCD_RES_8X6_16X12)</div><div class='add'>+</div><div class='add'>+struct io_reg K400_LCD_RES_10X7_16X12[] = {</div><div class='add'>+	/*IGA2 Horizontal Total */</div><div class='add'>+	{VIACR, CR50, 0xFF, 0x65}, {VIACR, CR55, 0x0F, 0x08},</div><div class='add'>+	/*IGA2 Horizontal Blank End */</div><div class='add'>+	{VIACR, CR53, 0xFF, 0x65}, {VIACR, CR54, 0x38, 0x00},</div><div class='add'>+	{VIACR, CR5D, 0x40, 0x40},</div><div class='add'>+	/*IGA2 Horizontal Total Shadow */</div><div class='add'>+	{VIACR, CR6D, 0xFF, 0xAB}, {VIACR, CR71, 0x08, 0x00},</div><div class='add'>+	/*IGA2 Horizontal Blank End Shadow */</div><div class='add'>+	{VIACR, CR6E, 0xFF, 0xAF},</div><div class='add'>+	/*IGA2 Offset */</div><div class='add'>+	{VIACR, CR66, 0xFF, 0xF0}, {VIACR, CR67, 0x03, 0x00},</div><div class='add'>+	 /*VCLK*/ {VIASR, SR46, 0xFF, 0x45}, {VIASR, SR47, 0xFF, 0x4A}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define NUM_TOTAL_K400_LCD_RES_10X7_16X12 ARRAY_SIZE(K400_LCD_RES_10X7_16X12)</div><div class='add'>+</div><div class='add'>+struct io_reg K400_LCD_RES_12X10_16X12[] = {</div><div class='add'>+	/*IGA2 Horizontal Total */</div><div class='add'>+	{VIACR, CR50, 0xFF, 0x7D}, {VIACR, CR55, 0x0F, 0x08},</div><div class='add'>+	/*IGA2 Horizontal Blank End */</div><div class='add'>+	{VIACR, CR53, 0xFF, 0x7D}, {VIACR, CR54, 0x38, 0x00},</div><div class='add'>+	{VIACR, CR5D, 0x40, 0x40},</div><div class='add'>+	/*IGA2 Horizontal Total Shadow */</div><div class='add'>+	{VIACR, CR6D, 0xFF, 0xD0}, {VIACR, CR71, 0x08, 0x00},</div><div class='add'>+	/*IGA2 Horizontal Blank End Shadow */</div><div class='add'>+	{VIACR, CR6E, 0xFF, 0xD4},</div><div class='add'>+	/*IGA2 Offset */</div><div class='add'>+	{VIACR, CR66, 0xFF, 0xFA}, {VIACR, CR67, 0x03, 0x00},</div><div class='add'>+	 /*VCLK*/ {VIASR, SR46, 0xFF, 0x47}, {VIASR, SR47, 0xFF, 0x7C}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define NUM_TOTAL_K400_LCD_RES_12X10_16X12 ARRAY_SIZE(K400_LCD_RES_12X10_16X12)</div><div class='add'>+</div><div class='add'>+/*   Panel 1400x1050   */</div><div class='add'>+struct io_reg K400_LCD_RES_6X4_14X10[] = {</div><div class='add'>+	/* 640x400                          */</div><div class='add'>+	/* IGA2 Horizontal Total            */</div><div class='add'>+	{VIACR, CR50, 0xFF, 0x9D}, {VIACR, CR55, 0x0F, 0x56},</div><div class='add'>+	/* IGA2 Horizontal Blank End        */</div><div class='add'>+	{VIACR, CR53, 0xFF, 0x9D}, {VIACR, CR54, 0x38, 0x75},</div><div class='add'>+	{VIACR, CR5D, 0x40, 0x24},</div><div class='add'>+	/* IGA2 Horizontal Total Shadow     */</div><div class='add'>+	{VIACR, CR6D, 0xFF, 0x5F}, {VIACR, CR71, 0x08, 0x44},</div><div class='add'>+	/* IGA2 Horizontal Blank End Shadow */</div><div class='add'>+	{VIACR, CR6E, 0xFF, 0x63},</div><div class='add'>+	/* IGA2 Offset                      */</div><div class='add'>+	{VIACR, CR66, 0xFF, 0xB4}, {VIACR, CR67, 0x03, 0x00},</div><div class='add'>+	/* VCLK                             */</div><div class='add'>+	{VIASR, SR46, 0xFF, 0x07}, {VIASR, SR47, 0xFF, 0x19}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define NUM_TOTAL_K400_LCD_RES_6X4_14X10 ARRAY_SIZE(K400_LCD_RES_6X4_14X10)</div><div class='add'>+</div><div class='add'>+struct io_reg K400_LCD_RES_8X6_14X10[] = {</div><div class='add'>+	/* 800x600                          */</div><div class='add'>+	/* IGA2 Horizontal Total            */</div><div class='add'>+	{VIACR, CR50, 0xFF, 0x9D}, {VIACR, CR55, 0x0F, 0x56},</div><div class='add'>+	/* IGA2 Horizontal Blank End        */</div><div class='add'>+	{VIACR, CR53, 0xFF, 0x9D}, {VIACR, CR54, 0x38, 0x75},</div><div class='add'>+	{VIACR, CR5D, 0x40, 0x24},</div><div class='add'>+	/* IGA2 Horizontal Total Shadow     */</div><div class='add'>+	{VIACR, CR6D, 0xFF, 0x7F}, {VIACR, CR71, 0x08, 0x44},</div><div class='add'>+	/* IGA2 Horizontal Blank End Shadow */</div><div class='add'>+	{VIACR, CR6E, 0xFF, 0x83},</div><div class='add'>+	/* IGA2 Offset                      */</div><div class='add'>+	{VIACR, CR66, 0xFF, 0xBE}, {VIACR, CR67, 0x03, 0x00},</div><div class='add'>+	/* VCLK                             */</div><div class='add'>+	{VIASR, SR46, 0xFF, 0x07}, {VIASR, SR47, 0xFF, 0x21}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define NUM_TOTAL_K400_LCD_RES_8X6_14X10 ARRAY_SIZE(K400_LCD_RES_8X6_14X10)</div><div class='add'>+</div><div class='add'>+struct io_reg K400_LCD_RES_10X7_14X10[] = {</div><div class='add'>+	/* 1024x768                         */</div><div class='add'>+	/* IGA2 Horizontal Total            */</div><div class='add'>+	{VIACR, CR50, 0xFF, 0x9D}, {VIACR, CR55, 0x0F, 0x56},</div><div class='add'>+	/* IGA2 Horizontal Blank End        */</div><div class='add'>+	{VIACR, CR53, 0xFF, 0x9D}, {VIACR, CR54, 0x38, 0x75},</div><div class='add'>+	{VIACR, CR5D, 0x40, 0x24},</div><div class='add'>+	/* IGA2 Horizontal Total Shadow     */</div><div class='add'>+	{VIACR, CR6D, 0xFF, 0xA3}, {VIACR, CR71, 0x08, 0x44},</div><div class='add'>+	/* IGA2 Horizontal Blank End Shadow */</div><div class='add'>+	{VIACR, CR6E, 0xFF, 0xA7},</div><div class='add'>+	/* IGA2 Offset                      */</div><div class='add'>+	{VIACR, CR66, 0xFF, 0xC3}, {VIACR, CR67, 0x03, 0x04},</div><div class='add'>+	/* VCLK                             */</div><div class='add'>+	{VIASR, SR46, 0xFF, 0x05}, {VIASR, SR47, 0xFF, 0x1E}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define NUM_TOTAL_K400_LCD_RES_10X7_14X10 ARRAY_SIZE(K400_LCD_RES_10X7_14X10)</div><div class='add'>+</div><div class='add'>+struct io_reg K400_LCD_RES_12X10_14X10[] = {</div><div class='add'>+	/* 1280x768, 1280x960, 1280x1024    */</div><div class='add'>+	/* IGA2 Horizontal Total            */</div><div class='add'>+	{VIACR, CR50, 0xFF, 0x97}, {VIACR, CR55, 0x0F, 0x56},</div><div class='add'>+	/* IGA2 Horizontal Blank End        */</div><div class='add'>+	{VIACR, CR53, 0xFF, 0x97}, {VIACR, CR54, 0x38, 0x75},</div><div class='add'>+	{VIACR, CR5D, 0x40, 0x24},</div><div class='add'>+	/* IGA2 Horizontal Total Shadow     */</div><div class='add'>+	{VIACR, CR6D, 0xFF, 0xCE}, {VIACR, CR71, 0x08, 0x44},</div><div class='add'>+	/* IGA2 Horizontal Blank End Shadow */</div><div class='add'>+	{VIACR, CR6E, 0xFF, 0xD2},</div><div class='add'>+	/* IGA2 Offset                      */</div><div class='add'>+	{VIACR, CR66, 0xFF, 0xC9}, {VIACR, CR67, 0x03, 0x04},</div><div class='add'>+	/* VCLK                             */</div><div class='add'>+	{VIASR, SR46, 0xFF, 0x84}, {VIASR, SR47, 0xFF, 0x79}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define NUM_TOTAL_K400_LCD_RES_12X10_14X10 ARRAY_SIZE(K400_LCD_RES_12X10_14X10)</div><div class='add'>+</div><div class='add'>+/* ++++++ K400 ++++++ */</div><div class='add'>+/*   Panel 1366x768   */</div><div class='add'>+struct io_reg K400_LCD_RES_6X4_1366X7[] = {</div><div class='add'>+	/* 640x400                          */</div><div class='add'>+	/* IGA2 Horizontal Total            */</div><div class='add'>+	{VIACR, CR50, 0xFF, 0x47}, {VIACR, CR55, 0x0F, 0x35},</div><div class='add'>+	/* IGA2 Horizontal Blank End        */</div><div class='add'>+	{VIACR, CR53, 0xFF, 0x47}, {VIACR, CR54, 0x38, 0x2B},</div><div class='add'>+	{VIACR, CR5D, 0x40, 0x13},</div><div class='add'>+	/* IGA2 Horizontal Total Shadow     */</div><div class='add'>+	{VIACR, CR6D, 0xFF, 0x60}, {VIACR, CR71, 0x08, 0x23},</div><div class='add'>+	/* IGA2 Horizontal Blank End Shadow */</div><div class='add'>+	{VIACR, CR6E, 0xFF, 0x64},</div><div class='add'>+	/* IGA2 Offset                      */</div><div class='add'>+	{VIACR, CR66, 0xFF, 0x8C}, {VIACR, CR67, 0x03, 0x00},</div><div class='add'>+	/* VCLK                             */</div><div class='add'>+	{VIASR, SR46, 0xFF, 0x87}, {VIASR, SR47, 0xFF, 0x4C}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define NUM_TOTAL_K400_LCD_RES_6X4_1366X7 ARRAY_SIZE(K400_LCD_RES_6X4_1366X7)</div><div class='add'>+</div><div class='add'>+struct io_reg K400_LCD_RES_7X4_1366X7[] = {</div><div class='add'>+	/* IGA2 Horizontal Total            */</div><div class='add'>+	{VIACR, CR50, 0xFF, 0x3B}, {VIACR, CR55, 0x0F, 0x35},</div><div class='add'>+	/* IGA2 Horizontal Blank End        */</div><div class='add'>+	{VIACR, CR53, 0xFF, 0x3B}, {VIACR, CR54, 0x38, 0x2B},</div><div class='add'>+	{VIACR, CR5D, 0x40, 0x13},</div><div class='add'>+	/* IGA2 Horizontal Total Shadow     */</div><div class='add'>+	{VIACR, CR6D, 0xFF, 0x71}, {VIACR, CR71, 0x08, 0x23},</div><div class='add'>+	/* IGA2 Horizontal Blank End Shadow */</div><div class='add'>+	{VIACR, CR6E, 0xFF, 0x75},</div><div class='add'>+	/* IGA2 Offset                      */</div><div class='add'>+	{VIACR, CR66, 0xFF, 0x96}, {VIACR, CR67, 0x03, 0x00},</div><div class='add'>+	/* VCLK                             */</div><div class='add'>+	{VIASR, SR46, 0xFF, 0x05}, {VIASR, SR47, 0xFF, 0x10}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define NUM_TOTAL_K400_LCD_RES_7X4_1366X7 ARRAY_SIZE(K400_LCD_RES_7X4_1366X7)</div><div class='add'>+</div><div class='add'>+struct io_reg K400_LCD_RES_8X6_1366X7[] = {</div><div class='add'>+	/* 800x600                          */</div><div class='add'>+	/* IGA2 Horizontal Total            */</div><div class='add'>+	{VIACR, CR50, 0xFF, 0x37}, {VIACR, CR55, 0x0F, 0x35},</div><div class='add'>+	/* IGA2 Horizontal Blank End        */</div><div class='add'>+	{VIACR, CR53, 0xFF, 0x37}, {VIACR, CR54, 0x38, 0x2B},</div><div class='add'>+	{VIACR, CR5D, 0x40, 0x13},</div><div class='add'>+	/* IGA2 Horizontal Total Shadow     */</div><div class='add'>+	{VIACR, CR6D, 0xFF, 0x7E}, {VIACR, CR71, 0x08, 0x23},</div><div class='add'>+	/* IGA2 Horizontal Blank End Shadow */</div><div class='add'>+	{VIACR, CR6E, 0xFF, 0x82},</div><div class='add'>+	/* IGA2 Offset                      */</div><div class='add'>+	{VIACR, CR66, 0xFF, 0x8C}, {VIACR, CR67, 0x03, 0x00},</div><div class='add'>+	/* VCLK                             */</div><div class='add'>+	{VIASR, SR46, 0xFF, 0x84}, {VIASR, SR47, 0xFF, 0xB9}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define NUM_TOTAL_K400_LCD_RES_8X6_1366X7 ARRAY_SIZE(K400_LCD_RES_8X6_1366X7)</div><div class='add'>+</div><div class='add'>+struct io_reg K400_LCD_RES_10X7_1366X7[] = {</div><div class='add'>+	/* 1024x768                         */</div><div class='add'>+	/* IGA2 Horizontal Total            */</div><div class='add'>+	{VIACR, CR50, 0xFF, 0x9D}, {VIACR, CR55, 0x0F, 0x56},</div><div class='add'>+	/* IGA2 Horizontal Blank End        */</div><div class='add'>+	{VIACR, CR53, 0xFF, 0x9D}, {VIACR, CR54, 0x38, 0x75},</div><div class='add'>+	{VIACR, CR5D, 0x40, 0x24},</div><div class='add'>+	/* IGA2 Horizontal Total Shadow     */</div><div class='add'>+	{VIACR, CR6D, 0xFF, 0xA3}, {VIACR, CR71, 0x08, 0x44},</div><div class='add'>+	/* IGA2 Horizontal Blank End Shadow */</div><div class='add'>+	{VIACR, CR6E, 0xFF, 0xA7},</div><div class='add'>+	/* IGA2 Offset                      */</div><div class='add'>+	{VIACR, CR66, 0xFF, 0xC3}, {VIACR, CR67, 0x03, 0x04},</div><div class='add'>+	/* VCLK                             */</div><div class='add'>+	{VIASR, SR46, 0xFF, 0x05}, {VIASR, SR47, 0xFF, 0x1E}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define NUM_TOTAL_K400_LCD_RES_10X7_1366X7 ARRAY_SIZE(K400_LCD_RES_10X7_1366X7)</div><div class='add'>+</div><div class='add'>+struct io_reg K400_LCD_RES_12X10_1366X7[] = {</div><div class='add'>+	/* 1280x768, 1280x960, 1280x1024    */</div><div class='add'>+	/* IGA2 Horizontal Total            */</div><div class='add'>+	{VIACR, CR50, 0xFF, 0x97}, {VIACR, CR55, 0x0F, 0x56},</div><div class='add'>+	/* IGA2 Horizontal Blank End        */</div><div class='add'>+	{VIACR, CR53, 0xFF, 0x97}, {VIACR, CR54, 0x38, 0x75},</div><div class='add'>+	{VIACR, CR5D, 0x40, 0x24},</div><div class='add'>+	/* IGA2 Horizontal Total Shadow     */</div><div class='add'>+	{VIACR, CR6D, 0xFF, 0xCE}, {VIACR, CR71, 0x08, 0x44},</div><div class='add'>+	/* IGA2 Horizontal Blank End Shadow */</div><div class='add'>+	{VIACR, CR6E, 0xFF, 0xD2},</div><div class='add'>+	/* IGA2 Offset                      */</div><div class='add'>+	{VIACR, CR66, 0xFF, 0xC9}, {VIACR, CR67, 0x03, 0x04},</div><div class='add'>+	/* VCLK                             */</div><div class='add'>+	{VIASR, SR46, 0xFF, 0x84}, {VIASR, SR47, 0xFF, 0x79}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define NUM_TOTAL_K400_LCD_RES_12X10_1366X7\</div><div class='add'>+			ARRAY_SIZE(K400_LCD_RES_12X10_1366X7)</div><div class='add'>+</div><div class='add'>+/* ++++++ K400 ++++++ */</div><div class='add'>+/*   Panel 1280x1024   */</div><div class='add'>+struct io_reg K400_LCD_RES_6X4_12X10[] = {</div><div class='add'>+	/*IGA2 Horizontal Total */</div><div class='add'>+	{VIACR, CR50, 0xFF, 0x9D}, {VIACR, CR55, 0x0F, 0x46},</div><div class='add'>+	/*IGA2 Horizontal Blank End */</div><div class='add'>+	{VIACR, CR53, 0xFF, 0x9D}, {VIACR, CR54, 0x38, 0x74},</div><div class='add'>+	{VIACR, CR5D, 0x40, 0x1C},</div><div class='add'>+	/*IGA2 Horizontal Total Shadow */</div><div class='add'>+	{VIACR, CR6D, 0xFF, 0x5F}, {VIACR, CR71, 0x08, 0x34},</div><div class='add'>+	/*IGA2 Horizontal Blank End Shadow */</div><div class='add'>+	{VIACR, CR6E, 0xFF, 0x63},</div><div class='add'>+	/*IGA2 Offset */</div><div class='add'>+	{VIACR, CR66, 0xFF, 0xAA}, {VIACR, CR67, 0x03, 0x00},</div><div class='add'>+	 /*VCLK*/ {VIASR, SR46, 0xFF, 0x07}, {VIASR, SR47, 0xFF, 0x19}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define NUM_TOTAL_K400_LCD_RES_6X4_12X10 ARRAY_SIZE(K400_LCD_RES_6X4_12X10)</div><div class='add'>+</div><div class='add'>+struct io_reg K400_LCD_RES_7X4_12X10[] = {</div><div class='add'>+	/*IGA2 Horizontal Total */</div><div class='add'>+	{VIACR, CR50, 0xFF, 0x9D}, {VIACR, CR55, 0x0F, 0x46},</div><div class='add'>+	/*IGA2 Horizontal Blank End */</div><div class='add'>+	{VIACR, CR53, 0xFF, 0x9D}, {VIACR, CR54, 0x38, 0x74},</div><div class='add'>+	{VIACR, CR5D, 0x40, 0x1C},</div><div class='add'>+	/*IGA2 Horizontal Total Shadow */</div><div class='add'>+	{VIACR, CR6D, 0xFF, 0x68}, {VIACR, CR71, 0x08, 0x34},</div><div class='add'>+	/*IGA2 Horizontal Blank End Shadow */</div><div class='add'>+	{VIACR, CR6E, 0xFF, 0x6C},</div><div class='add'>+	/*IGA2 Offset */</div><div class='add'>+	{VIACR, CR66, 0xFF, 0xA8}, {VIACR, CR67, 0x03, 0x00},</div><div class='add'>+	 /*VCLK*/ {VIASR, SR46, 0xFF, 0x87}, {VIASR, SR47, 0xFF, 0xED}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define NUM_TOTAL_K400_LCD_RES_7X4_12X10 ARRAY_SIZE(K400_LCD_RES_7X4_12X10)</div><div class='add'>+</div><div class='add'>+struct io_reg K400_LCD_RES_8X6_12X10[] = {</div><div class='add'>+	/*IGA2 Horizontal Total */</div><div class='add'>+	{VIACR, CR50, 0xFF, 0x9D}, {VIACR, CR55, 0x0F, 0x46},</div><div class='add'>+	/*IGA2 Horizontal Blank End */</div><div class='add'>+	{VIACR, CR53, 0xFF, 0x9D}, {VIACR, CR54, 0x38, 0x74},</div><div class='add'>+	{VIACR, CR5D, 0x40, 0x1C},</div><div class='add'>+	/*IGA2 Horizontal Total Shadow */</div><div class='add'>+	{VIACR, CR6D, 0xFF, 0x7F}, {VIACR, CR71, 0x08, 0x34},</div><div class='add'>+	/*IGA2 Horizontal Blank End Shadow */</div><div class='add'>+	{VIACR, CR6E, 0xFF, 0x83},</div><div class='add'>+	/*IGA2 Offset */</div><div class='add'>+	{VIACR, CR66, 0xFF, 0xBE}, {VIACR, CR67, 0x03, 0x00},</div><div class='add'>+	 /*VCLK*/ {VIASR, SR46, 0xFF, 0x07}, {VIASR, SR47, 0xFF, 0x21}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define NUM_TOTAL_K400_LCD_RES_8X6_12X10 ARRAY_SIZE(K400_LCD_RES_8X6_12X10)</div><div class='add'>+</div><div class='add'>+struct io_reg K400_LCD_RES_10X7_12X10[] = {</div><div class='add'>+	/*IGA2 Horizontal Total */</div><div class='add'>+	{VIACR, CR50, 0xFF, 0x9D}, {VIACR, CR55, 0x0F, 0x46},</div><div class='add'>+	/*IGA2 Horizontal Blank End */</div><div class='add'>+	{VIACR, CR53, 0xFF, 0x9D}, {VIACR, CR54, 0x38, 0x74},</div><div class='add'>+	{VIACR, CR5D, 0x40, 0x1C},</div><div class='add'>+	/*IGA2 Horizontal Total Shadow */</div><div class='add'>+	{VIACR, CR6D, 0xFF, 0xA3}, {VIACR, CR71, 0x08, 0x34},</div><div class='add'>+	/*IGA2 Horizontal Blank End Shadow */</div><div class='add'>+	{VIACR, CR6E, 0xFF, 0xA7},</div><div class='add'>+	/*IGA2 Offset */</div><div class='add'>+	{VIACR, CR66, 0xFF, 0xBE}, {VIACR, CR67, 0x03, 0x04},</div><div class='add'>+	 /*VCLK*/ {VIASR, SR46, 0xFF, 0x05}, {VIASR, SR47, 0xFF, 0x1E}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define NUM_TOTAL_K400_LCD_RES_10X7_12X10 ARRAY_SIZE(K400_LCD_RES_10X7_12X10)</div><div class='add'>+</div><div class='add'>+/* ++++++ K400 ++++++ */</div><div class='add'>+/*   Panel 1024x768    */</div><div class='add'>+struct io_reg K400_LCD_RES_6X4_10X7[] = {</div><div class='add'>+	/*IGA2 Horizontal Total */</div><div class='add'>+	{VIACR, CR50, 0xFF, 0x47}, {VIACR, CR55, 0x0F, 0x35},</div><div class='add'>+	/*IGA2 Horizontal Blank End */</div><div class='add'>+	{VIACR, CR53, 0xFF, 0x47}, {VIACR, CR54, 0x38, 0x2B},</div><div class='add'>+	{VIACR, CR5D, 0x40, 0x13},</div><div class='add'>+	/*IGA2 Horizontal Total Shadow */</div><div class='add'>+	{VIACR, CR6D, 0xFF, 0x60}, {VIACR, CR71, 0x08, 0x23},</div><div class='add'>+	/*IGA2 Horizontal Blank End Shadow */</div><div class='add'>+	{VIACR, CR6E, 0xFF, 0x64},</div><div class='add'>+	/*IGA2 Offset */</div><div class='add'>+	{VIACR, CR66, 0xFF, 0x8C}, {VIACR, CR67, 0x03, 0x00},</div><div class='add'>+	 /*VCLK*/ {VIASR, SR46, 0xFF, 0x87}, {VIASR, SR47, 0xFF, 0x4C}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define NUM_TOTAL_K400_LCD_RES_6X4_10X7 ARRAY_SIZE(K400_LCD_RES_6X4_10X7)</div><div class='add'>+</div><div class='add'>+struct io_reg K400_LCD_RES_7X4_10X7[] = {</div><div class='add'>+	/*IGA2 Horizontal Total */</div><div class='add'>+	{VIACR, CR50, 0xFF, 0x3B}, {VIACR, CR55, 0x0F, 0x35},</div><div class='add'>+	/*IGA2 Horizontal Blank End */</div><div class='add'>+	{VIACR, CR53, 0xFF, 0x3B}, {VIACR, CR54, 0x38, 0x2B},</div><div class='add'>+	{VIACR, CR5D, 0x40, 0x13},</div><div class='add'>+	/*IGA2 Horizontal Total Shadow */</div><div class='add'>+	{VIACR, CR6D, 0xFF, 0x71}, {VIACR, CR71, 0x08, 0x23},</div><div class='add'>+	/*IGA2 Horizontal Blank End Shadow */</div><div class='add'>+	{VIACR, CR6E, 0xFF, 0x75},</div><div class='add'>+	/*IGA2 Offset */</div><div class='add'>+	{VIACR, CR66, 0xFF, 0x96}, {VIACR, CR67, 0x03, 0x00},</div><div class='add'>+	 /*VCLK*/ {VIASR, SR46, 0xFF, 0x05}, {VIASR, SR47, 0xFF, 0x10}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define NUM_TOTAL_K400_LCD_RES_7X4_10X7 ARRAY_SIZE(K400_LCD_RES_7X4_10X7)</div><div class='add'>+</div><div class='add'>+struct io_reg K400_LCD_RES_8X6_10X7[] = {</div><div class='add'>+	/*IGA2 Horizontal Total */</div><div class='add'>+	{VIACR, CR50, 0xFF, 0x37}, {VIACR, CR55, 0x0F, 0x35},</div><div class='add'>+	/*IGA2 Horizontal Blank End */</div><div class='add'>+	{VIACR, CR53, 0xFF, 0x37}, {VIACR, CR54, 0x38, 0x2B},</div><div class='add'>+	{VIACR, CR5D, 0x40, 0x13},</div><div class='add'>+	/*IGA2 Horizontal Total Shadow */</div><div class='add'>+	{VIACR, CR6D, 0xFF, 0x7E}, {VIACR, CR71, 0x08, 0x23},</div><div class='add'>+	/*IGA2 Horizontal Blank End Shadow */</div><div class='add'>+	{VIACR, CR6E, 0xFF, 0x82},</div><div class='add'>+	/*IGA2 Offset */</div><div class='add'>+	{VIACR, CR66, 0xFF, 0x8C}, {VIACR, CR67, 0x03, 0x00},</div><div class='add'>+	 /*VCLK*/ {VIASR, SR46, 0xFF, 0x84}, {VIASR, SR47, 0xFF, 0xB9}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define NUM_TOTAL_K400_LCD_RES_8X6_10X7 ARRAY_SIZE(K400_LCD_RES_8X6_10X7)</div><div class='add'>+</div><div class='add'>+/* ++++++ K400 ++++++ */</div><div class='add'>+/*   Panel 800x600     */</div><div class='add'>+struct io_reg K400_LCD_RES_6X4_8X6[] = {</div><div class='add'>+	/*IGA2 Horizontal Total */</div><div class='add'>+	{VIACR, CR50, 0xFF, 0x1A}, {VIACR, CR55, 0x0F, 0x34},</div><div class='add'>+	/*IGA2 Horizontal Blank End */</div><div class='add'>+	{VIACR, CR53, 0xFF, 0x1A}, {VIACR, CR54, 0x38, 0xE3},</div><div class='add'>+	{VIACR, CR5D, 0x40, 0x12},</div><div class='add'>+	/*IGA2 Horizontal Total Shadow */</div><div class='add'>+	{VIACR, CR6D, 0xFF, 0x5F}, {VIACR, CR71, 0x08, 0x22},</div><div class='add'>+	/*IGA2 Horizontal Blank End Shadow */</div><div class='add'>+	{VIACR, CR6E, 0xFF, 0x63},</div><div class='add'>+	/*IGA2 Offset */</div><div class='add'>+	{VIACR, CR66, 0xFF, 0x6E}, {VIACR, CR67, 0x03, 0x00},</div><div class='add'>+	 /*VCLK*/ {VIASR, SR46, 0xFF, 0x86}, {VIASR, SR47, 0xFF, 0xB3}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define NUM_TOTAL_K400_LCD_RES_6X4_8X6 ARRAY_SIZE(K400_LCD_RES_6X4_8X6)</div><div class='add'>+</div><div class='add'>+struct io_reg K400_LCD_RES_7X4_8X6[] = {</div><div class='add'>+	/*IGA2 Horizontal Total */</div><div class='add'>+	{VIACR, CR50, 0xFF, 0x1F}, {VIACR, CR55, 0x0F, 0x34},</div><div class='add'>+	/*IGA2 Horizontal Blank End */</div><div class='add'>+	{VIACR, CR53, 0xFF, 0x1F}, {VIACR, CR54, 0x38, 0xE3},</div><div class='add'>+	{VIACR, CR5D, 0x40, 0x12},</div><div class='add'>+	/*IGA2 Horizontal Total Shadow */</div><div class='add'>+	{VIACR, CR6D, 0xFF, 0x7F}, {VIACR, CR71, 0x08, 0x22},</div><div class='add'>+	/*IGA2 Horizontal Blank End Shadow */</div><div class='add'>+	{VIACR, CR6E, 0xFF, 0x83},</div><div class='add'>+	/*IGA2 Offset */</div><div class='add'>+	{VIACR, CR66, 0xFF, 0x78}, {VIACR, CR67, 0x03, 0x00},</div><div class='add'>+	 /*VCLK*/ {VIASR, SR46, 0xFF, 0xC4}, {VIASR, SR47, 0xFF, 0x59}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define NUM_TOTAL_K400_LCD_RES_7X4_8X6 ARRAY_SIZE(K400_LCD_RES_7X4_8X6)</div><div class='add'>+</div><div class='add'>+#endif /* __LCDTBL_H__ */</div><div class='head'>diff --git a/drivers/video/via/share.h b/drivers/video/via/share.h<br/>new file mode 100644<br/>index 000000000000..2e1254da9c8c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/via/share.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/via/share.h</a></div><div class='hunk'>@@ -0,0 +1,1105 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.</div><div class='add'>+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.</div><div class='add'>+</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public</div><div class='add'>+ * License as published by the Free Software Foundation;</div><div class='add'>+ * either version 2, or (at your option) any later version.</div><div class='add'>+</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even</div><div class='add'>+ * the implied warranty of MERCHANTABILITY or FITNESS FOR</div><div class='add'>+ * A PARTICULAR PURPOSE.See the GNU General Public License</div><div class='add'>+ * for more details.</div><div class='add'>+</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc.,</div><div class='add'>+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __SHARE_H__</div><div class='add'>+#define __SHARE_H__</div><div class='add'>+</div><div class='add'>+/* Define Return Value */</div><div class='add'>+#define FAIL        -1</div><div class='add'>+#define OK          1</div><div class='add'>+</div><div class='add'>+#ifndef NULL</div><div class='add'>+#define NULL 0</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* Define Bit Field */</div><div class='add'>+#define BIT0    0x01</div><div class='add'>+#define BIT1    0x02</div><div class='add'>+#define BIT2    0x04</div><div class='add'>+#define BIT3    0x08</div><div class='add'>+#define BIT4    0x10</div><div class='add'>+#define BIT5    0x20</div><div class='add'>+#define BIT6    0x40</div><div class='add'>+#define BIT7    0x80</div><div class='add'>+</div><div class='add'>+/* Video Memory Size */</div><div class='add'>+#define VIDEO_MEMORY_SIZE_16M    0x1000000</div><div class='add'>+</div><div class='add'>+/* Definition Mode Index</div><div class='add'>+*/</div><div class='add'>+#define     VIA_RES_640X480                 	0</div><div class='add'>+#define     VIA_RES_800X600                 	1</div><div class='add'>+#define     VIA_RES_1024X768                	2</div><div class='add'>+#define     VIA_RES_1152X864                	3</div><div class='add'>+#define     VIA_RES_1280X1024               	4</div><div class='add'>+#define     VIA_RES_1600X1200               	5</div><div class='add'>+#define     VIA_RES_1440X1050               	6</div><div class='add'>+#define     VIA_RES_1280X768                	7</div><div class='add'>+#define     VIA_RES_1280X960                	8</div><div class='add'>+#define     VIA_RES_1920X1440               	9</div><div class='add'>+#define     VIA_RES_848X480                 	10</div><div class='add'>+#define     VIA_RES_1400X1050               	11</div><div class='add'>+#define     VIA_RES_720X480                 	12</div><div class='add'>+#define     VIA_RES_720X576                 	13</div><div class='add'>+#define     VIA_RES_1024X512                	14</div><div class='add'>+#define     VIA_RES_856X480                 	15</div><div class='add'>+#define     VIA_RES_1024X576                	16</div><div class='add'>+#define     VIA_RES_640X400                 	17</div><div class='add'>+#define     VIA_RES_1280X720                	18</div><div class='add'>+#define     VIA_RES_1920X1080               	19</div><div class='add'>+#define     VIA_RES_800X480                 	20</div><div class='add'>+#define     VIA_RES_1368X768                	21</div><div class='add'>+#define     VIA_RES_1024X600                	22</div><div class='add'>+#define     VIA_RES_1280X800                	23</div><div class='add'>+#define     VIA_RES_1680X1050               	24</div><div class='add'>+#define     VIA_RES_960X600			25</div><div class='add'>+#define     VIA_RES_1000X600               	26</div><div class='add'>+#define     VIA_RES_1088X612               	27</div><div class='add'>+#define     VIA_RES_1152X720               	28</div><div class='add'>+#define     VIA_RES_1200X720               	29</div><div class='add'>+#define     VIA_RES_1280X600               	30</div><div class='add'>+#define     VIA_RES_1360X768               	31</div><div class='add'>+#define     VIA_RES_1366X768               	32</div><div class='add'>+#define     VIA_RES_1440X900               	33</div><div class='add'>+#define     VIA_RES_1600X900               	34</div><div class='add'>+#define     VIA_RES_1600X1024              	35</div><div class='add'>+#define     VIA_RES_1792X1344              	36</div><div class='add'>+#define     VIA_RES_1856X1392              	37</div><div class='add'>+#define     VIA_RES_1920X1200              	38</div><div class='add'>+#define     VIA_RES_2048X1536              	39</div><div class='add'>+#define     VIA_RES_480X640                  	40</div><div class='add'>+</div><div class='add'>+/*Reduce Blanking*/</div><div class='add'>+#define     VIA_RES_1360X768_RB          	131</div><div class='add'>+#define     VIA_RES_1440X900_RB          	133</div><div class='add'>+#define     VIA_RES_1400X1050_RB        	111</div><div class='add'>+#define     VIA_RES_1600X900_RB          	134</div><div class='add'>+#define     VIA_RES_1680X1050_RB        	124</div><div class='add'>+#define     VIA_RES_1920X1080_RB        	119</div><div class='add'>+#define     VIA_RES_1920X1200_RB        	138</div><div class='add'>+</div><div class='add'>+#define     VIA_RES_INVALID                 	255</div><div class='add'>+</div><div class='add'>+/* standard VGA IO port</div><div class='add'>+*/</div><div class='add'>+#define VIARMisc    0x3CC</div><div class='add'>+#define VIAWMisc    0x3C2</div><div class='add'>+#define VIAStatus   0x3DA</div><div class='add'>+#define VIACR       0x3D4</div><div class='add'>+#define VIASR       0x3C4</div><div class='add'>+#define VIAGR       0x3CE</div><div class='add'>+#define VIAAR       0x3C0</div><div class='add'>+</div><div class='add'>+#define StdCR       0x19</div><div class='add'>+#define StdSR       0x04</div><div class='add'>+#define StdGR       0x09</div><div class='add'>+#define StdAR       0x14</div><div class='add'>+</div><div class='add'>+#define PatchCR     11</div><div class='add'>+</div><div class='add'>+/* Display path */</div><div class='add'>+#define IGA1        1</div><div class='add'>+#define IGA2        2</div><div class='add'>+#define IGA1_IGA2   3</div><div class='add'>+</div><div class='add'>+/* Define Color Depth  */</div><div class='add'>+#define MODE_8BPP       1</div><div class='add'>+#define MODE_16BPP      2</div><div class='add'>+#define MODE_32BPP      4</div><div class='add'>+</div><div class='add'>+#define GR20    0x20</div><div class='add'>+#define GR21    0x21</div><div class='add'>+#define GR22    0x22</div><div class='add'>+</div><div class='add'>+/* Sequencer Registers */</div><div class='add'>+#define SR01    0x01</div><div class='add'>+#define SR10    0x10</div><div class='add'>+#define SR12    0x12</div><div class='add'>+#define SR15    0x15</div><div class='add'>+#define SR16    0x16</div><div class='add'>+#define SR17    0x17</div><div class='add'>+#define SR18    0x18</div><div class='add'>+#define SR1B    0x1B</div><div class='add'>+#define SR1A    0x1A</div><div class='add'>+#define SR1C    0x1C</div><div class='add'>+#define SR1D    0x1D</div><div class='add'>+#define SR1E    0x1E</div><div class='add'>+#define SR1F    0x1F</div><div class='add'>+#define SR20    0x20</div><div class='add'>+#define SR21    0x21</div><div class='add'>+#define SR22    0x22</div><div class='add'>+#define SR2A    0x2A</div><div class='add'>+#define SR2D    0x2D</div><div class='add'>+#define SR2E    0x2E</div><div class='add'>+</div><div class='add'>+#define SR30    0x30</div><div class='add'>+#define SR39    0x39</div><div class='add'>+#define SR3D    0x3D</div><div class='add'>+#define SR3E    0x3E</div><div class='add'>+#define SR3F    0x3F</div><div class='add'>+#define SR40    0x40</div><div class='add'>+#define SR43    0x43</div><div class='add'>+#define SR44    0x44</div><div class='add'>+#define SR45    0x45</div><div class='add'>+#define SR46    0x46</div><div class='add'>+#define SR47    0x47</div><div class='add'>+#define SR48    0x48</div><div class='add'>+#define SR49    0x49</div><div class='add'>+#define SR4A    0x4A</div><div class='add'>+#define SR4B    0x4B</div><div class='add'>+#define SR4C    0x4C</div><div class='add'>+#define SR52    0x52</div><div class='add'>+#define SR5E    0x5E</div><div class='add'>+#define SR65    0x65</div><div class='add'>+</div><div class='add'>+/* CRT Controller Registers */</div><div class='add'>+#define CR00    0x00</div><div class='add'>+#define CR01    0x01</div><div class='add'>+#define CR02    0x02</div><div class='add'>+#define CR03    0x03</div><div class='add'>+#define CR04    0x04</div><div class='add'>+#define CR05    0x05</div><div class='add'>+#define CR06    0x06</div><div class='add'>+#define CR07    0x07</div><div class='add'>+#define CR08    0x08</div><div class='add'>+#define CR09    0x09</div><div class='add'>+#define CR0A    0x0A</div><div class='add'>+#define CR0B    0x0B</div><div class='add'>+#define CR0C    0x0C</div><div class='add'>+#define CR0D    0x0D</div><div class='add'>+#define CR0E    0x0E</div><div class='add'>+#define CR0F    0x0F</div><div class='add'>+#define CR10    0x10</div><div class='add'>+#define CR11    0x11</div><div class='add'>+#define CR12    0x12</div><div class='add'>+#define CR13    0x13</div><div class='add'>+#define CR14    0x14</div><div class='add'>+#define CR15    0x15</div><div class='add'>+#define CR16    0x16</div><div class='add'>+#define CR17    0x17</div><div class='add'>+#define CR18    0x18</div><div class='add'>+</div><div class='add'>+/* Extend CRT Controller Registers */</div><div class='add'>+#define CR30    0x30</div><div class='add'>+#define CR31    0x31</div><div class='add'>+#define CR32    0x32</div><div class='add'>+#define CR33    0x33</div><div class='add'>+#define CR34    0x34</div><div class='add'>+#define CR35    0x35</div><div class='add'>+#define CR36    0x36</div><div class='add'>+#define CR37    0x37</div><div class='add'>+#define CR38    0x38</div><div class='add'>+#define CR39    0x39</div><div class='add'>+#define CR3A    0x3A</div><div class='add'>+#define CR3B    0x3B</div><div class='add'>+#define CR3C    0x3C</div><div class='add'>+#define CR3D    0x3D</div><div class='add'>+#define CR3E    0x3E</div><div class='add'>+#define CR3F    0x3F</div><div class='add'>+#define CR40    0x40</div><div class='add'>+#define CR41    0x41</div><div class='add'>+#define CR42    0x42</div><div class='add'>+#define CR43    0x43</div><div class='add'>+#define CR44    0x44</div><div class='add'>+#define CR45    0x45</div><div class='add'>+#define CR46    0x46</div><div class='add'>+#define CR47    0x47</div><div class='add'>+#define CR48    0x48</div><div class='add'>+#define CR49    0x49</div><div class='add'>+#define CR4A    0x4A</div><div class='add'>+#define CR4B    0x4B</div><div class='add'>+#define CR4C    0x4C</div><div class='add'>+#define CR4D    0x4D</div><div class='add'>+#define CR4E    0x4E</div><div class='add'>+#define CR4F    0x4F</div><div class='add'>+#define CR50    0x50</div><div class='add'>+#define CR51    0x51</div><div class='add'>+#define CR52    0x52</div><div class='add'>+#define CR53    0x53</div><div class='add'>+#define CR54    0x54</div><div class='add'>+#define CR55    0x55</div><div class='add'>+#define CR56    0x56</div><div class='add'>+#define CR57    0x57</div><div class='add'>+#define CR58    0x58</div><div class='add'>+#define CR59    0x59</div><div class='add'>+#define CR5A    0x5A</div><div class='add'>+#define CR5B    0x5B</div><div class='add'>+#define CR5C    0x5C</div><div class='add'>+#define CR5D    0x5D</div><div class='add'>+#define CR5E    0x5E</div><div class='add'>+#define CR5F    0x5F</div><div class='add'>+#define CR60    0x60</div><div class='add'>+#define CR61    0x61</div><div class='add'>+#define CR62    0x62</div><div class='add'>+#define CR63    0x63</div><div class='add'>+#define CR64    0x64</div><div class='add'>+#define CR65    0x65</div><div class='add'>+#define CR66    0x66</div><div class='add'>+#define CR67    0x67</div><div class='add'>+#define CR68    0x68</div><div class='add'>+#define CR69    0x69</div><div class='add'>+#define CR6A    0x6A</div><div class='add'>+#define CR6B    0x6B</div><div class='add'>+#define CR6C    0x6C</div><div class='add'>+#define CR6D    0x6D</div><div class='add'>+#define CR6E    0x6E</div><div class='add'>+#define CR6F    0x6F</div><div class='add'>+#define CR70    0x70</div><div class='add'>+#define CR71    0x71</div><div class='add'>+#define CR72    0x72</div><div class='add'>+#define CR73    0x73</div><div class='add'>+#define CR74    0x74</div><div class='add'>+#define CR75    0x75</div><div class='add'>+#define CR76    0x76</div><div class='add'>+#define CR77    0x77</div><div class='add'>+#define CR78    0x78</div><div class='add'>+#define CR79    0x79</div><div class='add'>+#define CR7A    0x7A</div><div class='add'>+#define CR7B    0x7B</div><div class='add'>+#define CR7C    0x7C</div><div class='add'>+#define CR7D    0x7D</div><div class='add'>+#define CR7E    0x7E</div><div class='add'>+#define CR7F    0x7F</div><div class='add'>+#define CR80    0x80</div><div class='add'>+#define CR81    0x81</div><div class='add'>+#define CR82    0x82</div><div class='add'>+#define CR83    0x83</div><div class='add'>+#define CR84    0x84</div><div class='add'>+#define CR85    0x85</div><div class='add'>+#define CR86    0x86</div><div class='add'>+#define CR87    0x87</div><div class='add'>+#define CR88    0x88</div><div class='add'>+#define CR89    0x89</div><div class='add'>+#define CR8A    0x8A</div><div class='add'>+#define CR8B    0x8B</div><div class='add'>+#define CR8C    0x8C</div><div class='add'>+#define CR8D    0x8D</div><div class='add'>+#define CR8E    0x8E</div><div class='add'>+#define CR8F    0x8F</div><div class='add'>+#define CR90    0x90</div><div class='add'>+#define CR91    0x91</div><div class='add'>+#define CR92    0x92</div><div class='add'>+#define CR93    0x93</div><div class='add'>+#define CR94    0x94</div><div class='add'>+#define CR95    0x95</div><div class='add'>+#define CR96    0x96</div><div class='add'>+#define CR97    0x97</div><div class='add'>+#define CR98    0x98</div><div class='add'>+#define CR99    0x99</div><div class='add'>+#define CR9A    0x9A</div><div class='add'>+#define CR9B    0x9B</div><div class='add'>+#define CR9C    0x9C</div><div class='add'>+#define CR9D    0x9D</div><div class='add'>+#define CR9E    0x9E</div><div class='add'>+#define CR9F    0x9F</div><div class='add'>+#define CRA0    0xA0</div><div class='add'>+#define CRA1    0xA1</div><div class='add'>+#define CRA2    0xA2</div><div class='add'>+#define CRA3    0xA3</div><div class='add'>+#define CRD2    0xD2</div><div class='add'>+#define CRD3    0xD3</div><div class='add'>+#define CRD4    0xD4</div><div class='add'>+</div><div class='add'>+/* LUT Table*/</div><div class='add'>+#define LUT_DATA             0x3C9	/* DACDATA */</div><div class='add'>+#define LUT_INDEX_READ       0x3C7	/* DACRX */</div><div class='add'>+#define LUT_INDEX_WRITE      0x3C8	/* DACWX */</div><div class='add'>+#define DACMASK              0x3C6</div><div class='add'>+</div><div class='add'>+/* Definition Device */</div><div class='add'>+#define DEVICE_CRT  0x01</div><div class='add'>+#define DEVICE_DVI  0x03</div><div class='add'>+#define DEVICE_LCD  0x04</div><div class='add'>+</div><div class='add'>+/* Device output interface */</div><div class='add'>+#define INTERFACE_NONE          0x00</div><div class='add'>+#define INTERFACE_ANALOG_RGB    0x01</div><div class='add'>+#define INTERFACE_DVP0          0x02</div><div class='add'>+#define INTERFACE_DVP1          0x03</div><div class='add'>+#define INTERFACE_DFP_HIGH      0x04</div><div class='add'>+#define INTERFACE_DFP_LOW       0x05</div><div class='add'>+#define INTERFACE_DFP           0x06</div><div class='add'>+#define INTERFACE_LVDS0         0x07</div><div class='add'>+#define INTERFACE_LVDS1         0x08</div><div class='add'>+#define INTERFACE_LVDS0LVDS1    0x09</div><div class='add'>+#define INTERFACE_TMDS          0x0A</div><div class='add'>+</div><div class='add'>+#define HW_LAYOUT_LCD_ONLY      0x01</div><div class='add'>+#define HW_LAYOUT_DVI_ONLY      0x02</div><div class='add'>+#define HW_LAYOUT_LCD_DVI       0x03</div><div class='add'>+#define HW_LAYOUT_LCD1_LCD2     0x04</div><div class='add'>+#define HW_LAYOUT_LCD_EXTERNAL_LCD2 0x10</div><div class='add'>+</div><div class='add'>+/* Definition Refresh Rate */</div><div class='add'>+#define REFRESH_50      50</div><div class='add'>+#define REFRESH_60      60</div><div class='add'>+#define REFRESH_75      75</div><div class='add'>+#define REFRESH_85      85</div><div class='add'>+#define REFRESH_100     100</div><div class='add'>+#define REFRESH_120     120</div><div class='add'>+</div><div class='add'>+/* Definition Sync Polarity*/</div><div class='add'>+#define NEGATIVE        1</div><div class='add'>+#define POSITIVE        0</div><div class='add'>+</div><div class='add'>+/*480x640@60 Sync Polarity (GTF)</div><div class='add'>+*/</div><div class='add'>+#define M480X640_R60_HSP        NEGATIVE</div><div class='add'>+#define M480X640_R60_VSP        POSITIVE</div><div class='add'>+</div><div class='add'>+/*640x480@60 Sync Polarity (VESA Mode)</div><div class='add'>+*/</div><div class='add'>+#define M640X480_R60_HSP        NEGATIVE</div><div class='add'>+#define M640X480_R60_VSP        NEGATIVE</div><div class='add'>+</div><div class='add'>+/*640x480@75 Sync Polarity (VESA Mode)</div><div class='add'>+*/</div><div class='add'>+#define M640X480_R75_HSP        NEGATIVE</div><div class='add'>+#define M640X480_R75_VSP        NEGATIVE</div><div class='add'>+</div><div class='add'>+/*640x480@85 Sync Polarity (VESA Mode)</div><div class='add'>+*/</div><div class='add'>+#define M640X480_R85_HSP        NEGATIVE</div><div class='add'>+#define M640X480_R85_VSP        NEGATIVE</div><div class='add'>+</div><div class='add'>+/*640x480@100 Sync Polarity (GTF Mode)</div><div class='add'>+*/</div><div class='add'>+#define M640X480_R100_HSP       NEGATIVE</div><div class='add'>+#define M640X480_R100_VSP       POSITIVE</div><div class='add'>+</div><div class='add'>+/*640x480@120 Sync Polarity (GTF Mode)</div><div class='add'>+*/</div><div class='add'>+#define M640X480_R120_HSP       NEGATIVE</div><div class='add'>+#define M640X480_R120_VSP       POSITIVE</div><div class='add'>+</div><div class='add'>+/*720x480@60 Sync Polarity  (GTF Mode)</div><div class='add'>+*/</div><div class='add'>+#define M720X480_R60_HSP        NEGATIVE</div><div class='add'>+#define M720X480_R60_VSP        POSITIVE</div><div class='add'>+</div><div class='add'>+/*720x576@60 Sync Polarity  (GTF Mode)</div><div class='add'>+*/</div><div class='add'>+#define M720X576_R60_HSP        NEGATIVE</div><div class='add'>+#define M720X576_R60_VSP        POSITIVE</div><div class='add'>+</div><div class='add'>+/*800x600@60 Sync Polarity (VESA Mode)</div><div class='add'>+*/</div><div class='add'>+#define M800X600_R60_HSP        POSITIVE</div><div class='add'>+#define M800X600_R60_VSP        POSITIVE</div><div class='add'>+</div><div class='add'>+/*800x600@75 Sync Polarity (VESA Mode)</div><div class='add'>+*/</div><div class='add'>+#define M800X600_R75_HSP        POSITIVE</div><div class='add'>+#define M800X600_R75_VSP        POSITIVE</div><div class='add'>+</div><div class='add'>+/*800x600@85 Sync Polarity (VESA Mode)</div><div class='add'>+*/</div><div class='add'>+#define M800X600_R85_HSP        POSITIVE</div><div class='add'>+#define M800X600_R85_VSP        POSITIVE</div><div class='add'>+</div><div class='add'>+/*800x600@100 Sync Polarity (GTF Mode)</div><div class='add'>+*/</div><div class='add'>+#define M800X600_R100_HSP       NEGATIVE</div><div class='add'>+#define M800X600_R100_VSP       POSITIVE</div><div class='add'>+</div><div class='add'>+/*800x600@120 Sync Polarity (GTF Mode)</div><div class='add'>+*/</div><div class='add'>+#define M800X600_R120_HSP       NEGATIVE</div><div class='add'>+#define M800X600_R120_VSP       POSITIVE</div><div class='add'>+</div><div class='add'>+/*800x480@60 Sync Polarity  (CVT Mode)</div><div class='add'>+*/</div><div class='add'>+#define M800X480_R60_HSP        NEGATIVE</div><div class='add'>+#define M800X480_R60_VSP        POSITIVE</div><div class='add'>+</div><div class='add'>+/*848x480@60 Sync Polarity  (CVT Mode)</div><div class='add'>+*/</div><div class='add'>+#define M848X480_R60_HSP        NEGATIVE</div><div class='add'>+#define M848X480_R60_VSP        POSITIVE</div><div class='add'>+</div><div class='add'>+/*852x480@60 Sync Polarity  (GTF Mode)</div><div class='add'>+*/</div><div class='add'>+#define M852X480_R60_HSP        NEGATIVE</div><div class='add'>+#define M852X480_R60_VSP        POSITIVE</div><div class='add'>+</div><div class='add'>+/*1024x512@60 Sync Polarity (GTF Mode)</div><div class='add'>+*/</div><div class='add'>+#define M1024X512_R60_HSP       NEGATIVE</div><div class='add'>+#define M1024X512_R60_VSP       POSITIVE</div><div class='add'>+</div><div class='add'>+/*1024x600@60 Sync Polarity (GTF Mode)</div><div class='add'>+*/</div><div class='add'>+#define M1024X600_R60_HSP       NEGATIVE</div><div class='add'>+#define M1024X600_R60_VSP       POSITIVE</div><div class='add'>+</div><div class='add'>+/*1024x768@60 Sync Polarity (VESA Mode)</div><div class='add'>+*/</div><div class='add'>+#define M1024X768_R60_HSP       NEGATIVE</div><div class='add'>+#define M1024X768_R60_VSP       NEGATIVE</div><div class='add'>+</div><div class='add'>+/*1024x768@75 Sync Polarity (VESA Mode)</div><div class='add'>+*/</div><div class='add'>+#define M1024X768_R75_HSP       POSITIVE</div><div class='add'>+#define M1024X768_R75_VSP       POSITIVE</div><div class='add'>+</div><div class='add'>+/*1024x768@85 Sync Polarity (VESA Mode)</div><div class='add'>+*/</div><div class='add'>+#define M1024X768_R85_HSP       POSITIVE</div><div class='add'>+#define M1024X768_R85_VSP       POSITIVE</div><div class='add'>+</div><div class='add'>+/*1024x768@100 Sync Polarity (GTF Mode)</div><div class='add'>+*/</div><div class='add'>+#define M1024X768_R100_HSP      NEGATIVE</div><div class='add'>+#define M1024X768_R100_VSP      POSITIVE</div><div class='add'>+</div><div class='add'>+/*1152x864@75 Sync Polarity (VESA Mode)</div><div class='add'>+*/</div><div class='add'>+#define M1152X864_R75_HSP       POSITIVE</div><div class='add'>+#define M1152X864_R75_VSP       POSITIVE</div><div class='add'>+</div><div class='add'>+/*1280x720@60 Sync Polarity  (GTF Mode)</div><div class='add'>+*/</div><div class='add'>+#define M1280X720_R60_HSP       NEGATIVE</div><div class='add'>+#define M1280X720_R60_VSP       POSITIVE</div><div class='add'>+</div><div class='add'>+/* 1280x768@50 Sync Polarity  (GTF Mode) */</div><div class='add'>+#define M1280X768_R50_HSP       NEGATIVE</div><div class='add'>+#define M1280X768_R50_VSP       POSITIVE</div><div class='add'>+</div><div class='add'>+/*1280x768@60 Sync Polarity  (GTF Mode)</div><div class='add'>+*/</div><div class='add'>+#define M1280X768_R60_HSP       NEGATIVE</div><div class='add'>+#define M1280X768_R60_VSP       POSITIVE</div><div class='add'>+</div><div class='add'>+/*1280x800@60 Sync Polarity  (CVT Mode)</div><div class='add'>+*/</div><div class='add'>+#define M1280X800_R60_HSP       NEGATIVE</div><div class='add'>+#define M1280X800_R60_VSP       POSITIVE</div><div class='add'>+</div><div class='add'>+/*1280x960@60 Sync Polarity (VESA Mode)</div><div class='add'>+*/</div><div class='add'>+#define M1280X960_R60_HSP       POSITIVE</div><div class='add'>+#define M1280X960_R60_VSP       POSITIVE</div><div class='add'>+</div><div class='add'>+/*1280x1024@60 Sync Polarity (VESA Mode)</div><div class='add'>+*/</div><div class='add'>+#define M1280X1024_R60_HSP      POSITIVE</div><div class='add'>+#define M1280X1024_R60_VSP      POSITIVE</div><div class='add'>+</div><div class='add'>+/* 1360x768@60 Sync Polarity (CVT Mode) */</div><div class='add'>+#define M1360X768_R60_HSP       POSITIVE</div><div class='add'>+#define M1360X768_R60_VSP       POSITIVE</div><div class='add'>+</div><div class='add'>+/* 1360x768@60 Sync Polarity (CVT Reduce Blanking Mode) */</div><div class='add'>+#define M1360X768_RB_R60_HSP       POSITIVE</div><div class='add'>+#define M1360X768_RB_R60_VSP       NEGATIVE</div><div class='add'>+</div><div class='add'>+/* 1368x768@50 Sync Polarity (GTF Mode) */</div><div class='add'>+#define M1368X768_R50_HSP       NEGATIVE</div><div class='add'>+#define M1368X768_R50_VSP       POSITIVE</div><div class='add'>+</div><div class='add'>+/* 1368x768@60 Sync Polarity (VESA Mode) */</div><div class='add'>+#define M1368X768_R60_HSP       NEGATIVE</div><div class='add'>+#define M1368X768_R60_VSP       POSITIVE</div><div class='add'>+</div><div class='add'>+/*1280x1024@75 Sync Polarity (VESA Mode)</div><div class='add'>+*/</div><div class='add'>+#define M1280X1024_R75_HSP      POSITIVE</div><div class='add'>+#define M1280X1024_R75_VSP      POSITIVE</div><div class='add'>+</div><div class='add'>+/*1280x1024@85 Sync Polarity (VESA Mode)</div><div class='add'>+*/</div><div class='add'>+#define M1280X1024_R85_HSP      POSITIVE</div><div class='add'>+#define M1280X1024_R85_VSP      POSITIVE</div><div class='add'>+</div><div class='add'>+/*1440x1050@60 Sync Polarity (GTF Mode)</div><div class='add'>+*/</div><div class='add'>+#define M1440X1050_R60_HSP      NEGATIVE</div><div class='add'>+#define M1440X1050_R60_VSP      POSITIVE</div><div class='add'>+</div><div class='add'>+/*1600x1200@60 Sync Polarity (VESA Mode)</div><div class='add'>+*/</div><div class='add'>+#define M1600X1200_R60_HSP      POSITIVE</div><div class='add'>+#define M1600X1200_R60_VSP      POSITIVE</div><div class='add'>+</div><div class='add'>+/*1600x1200@75 Sync Polarity (VESA Mode)</div><div class='add'>+*/</div><div class='add'>+#define M1600X1200_R75_HSP      POSITIVE</div><div class='add'>+#define M1600X1200_R75_VSP      POSITIVE</div><div class='add'>+</div><div class='add'>+/* 1680x1050@60 Sync Polarity (CVT Mode) */</div><div class='add'>+#define M1680x1050_R60_HSP      NEGATIVE</div><div class='add'>+#define M1680x1050_R60_VSP      NEGATIVE</div><div class='add'>+</div><div class='add'>+/* 1680x1050@60 Sync Polarity (CVT Reduce Blanking Mode) */</div><div class='add'>+#define M1680x1050_RB_R60_HSP      POSITIVE</div><div class='add'>+#define M1680x1050_RB_R60_VSP      NEGATIVE</div><div class='add'>+</div><div class='add'>+/* 1680x1050@75 Sync Polarity (CVT Mode) */</div><div class='add'>+#define M1680x1050_R75_HSP      NEGATIVE</div><div class='add'>+#define M1680x1050_R75_VSP      POSITIVE</div><div class='add'>+</div><div class='add'>+/*1920x1080@60 Sync Polarity (CVT Mode)</div><div class='add'>+*/</div><div class='add'>+#define M1920X1080_R60_HSP      NEGATIVE</div><div class='add'>+#define M1920X1080_R60_VSP      POSITIVE</div><div class='add'>+</div><div class='add'>+/* 1920x1080@60 Sync Polarity (CVT Reduce Blanking Mode) */</div><div class='add'>+#define M1920X1080_RB_R60_HSP  POSITIVE</div><div class='add'>+#define M1920X1080_RB_R60_VSP  NEGATIVE</div><div class='add'>+</div><div class='add'>+/*1920x1440@60 Sync Polarity (VESA Mode)</div><div class='add'>+*/</div><div class='add'>+#define M1920X1440_R60_HSP      NEGATIVE</div><div class='add'>+#define M1920X1440_R60_VSP      POSITIVE</div><div class='add'>+</div><div class='add'>+/*1920x1440@75 Sync Polarity (VESA Mode)</div><div class='add'>+*/</div><div class='add'>+#define M1920X1440_R75_HSP      NEGATIVE</div><div class='add'>+#define M1920X1440_R75_VSP      POSITIVE</div><div class='add'>+</div><div class='add'>+#if 0</div><div class='add'>+/* 1400x1050@60 Sync Polarity (VESA Mode) */</div><div class='add'>+#define M1400X1050_R60_HSP      NEGATIVE</div><div class='add'>+#define M1400X1050_R60_VSP      NEGATIVE</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* 1400x1050@60 Sync Polarity (CVT Mode) */</div><div class='add'>+#define M1400X1050_R60_HSP      NEGATIVE</div><div class='add'>+#define M1400X1050_R60_VSP      POSITIVE</div><div class='add'>+</div><div class='add'>+/* 1400x1050@60 Sync Polarity (CVT Reduce Blanking Mode) */</div><div class='add'>+#define M1400X1050_RB_R60_HSP      POSITIVE</div><div class='add'>+#define M1400X1050_RB_R60_VSP      NEGATIVE</div><div class='add'>+</div><div class='add'>+/* 1400x1050@75 Sync Polarity (CVT Mode) */</div><div class='add'>+#define M1400X1050_R75_HSP      NEGATIVE</div><div class='add'>+#define M1400X1050_R75_VSP      POSITIVE</div><div class='add'>+</div><div class='add'>+/* 960x600@60 Sync Polarity (CVT Mode) */</div><div class='add'>+#define M960X600_R60_HSP        NEGATIVE</div><div class='add'>+#define M960X600_R60_VSP        POSITIVE</div><div class='add'>+</div><div class='add'>+/* 1000x600@60 Sync Polarity (GTF Mode) */</div><div class='add'>+#define M1000X600_R60_HSP       NEGATIVE</div><div class='add'>+#define M1000X600_R60_VSP       POSITIVE</div><div class='add'>+</div><div class='add'>+/* 1024x576@60 Sync Polarity (GTF Mode) */</div><div class='add'>+#define M1024X576_R60_HSP       NEGATIVE</div><div class='add'>+#define M1024X576_R60_VSP       POSITIVE</div><div class='add'>+</div><div class='add'>+/*1024x600@60 Sync Polarity (GTF Mode)*/</div><div class='add'>+#define M1024X600_R60_HSP       NEGATIVE</div><div class='add'>+#define M1024X600_R60_VSP       POSITIVE</div><div class='add'>+</div><div class='add'>+/* 1088x612@60 Sync Polarity (CVT Mode) */</div><div class='add'>+#define M1088X612_R60_HSP       NEGATIVE</div><div class='add'>+#define M1088X612_R60_VSP       POSITIVE</div><div class='add'>+</div><div class='add'>+/* 1152x720@60 Sync Polarity (CVT Mode) */</div><div class='add'>+#define M1152X720_R60_HSP       NEGATIVE</div><div class='add'>+#define M1152X720_R60_VSP       POSITIVE</div><div class='add'>+</div><div class='add'>+/* 1200x720@60 Sync Polarity (GTF Mode) */</div><div class='add'>+#define M1200X720_R60_HSP       NEGATIVE</div><div class='add'>+#define M1200X720_R60_VSP       POSITIVE</div><div class='add'>+</div><div class='add'>+/* 1280x600@60 Sync Polarity (GTF Mode) */</div><div class='add'>+#define M1280x600_R60_HSP       NEGATIVE</div><div class='add'>+#define M1280x600_R60_VSP       POSITIVE</div><div class='add'>+</div><div class='add'>+/* 1280x720@50 Sync Polarity  (GTF Mode) */</div><div class='add'>+#define M1280X720_R50_HSP       NEGATIVE</div><div class='add'>+#define M1280X720_R50_VSP       POSITIVE</div><div class='add'>+</div><div class='add'>+/* 1280x720@60 Sync Polarity  (CEA Mode) */</div><div class='add'>+#define M1280X720_CEA_R60_HSP       POSITIVE</div><div class='add'>+#define M1280X720_CEA_R60_VSP       POSITIVE</div><div class='add'>+</div><div class='add'>+/* 1440x900@60 Sync Polarity (CVT Mode) */</div><div class='add'>+#define M1440X900_R60_HSP       NEGATIVE</div><div class='add'>+#define M1440X900_R60_VSP       POSITIVE</div><div class='add'>+</div><div class='add'>+/* 1440x900@75 Sync Polarity (CVT Mode) */</div><div class='add'>+#define M1440X900_R75_HSP       NEGATIVE</div><div class='add'>+#define M1440X900_R75_VSP       POSITIVE</div><div class='add'>+</div><div class='add'>+/* 1440x900@60 Sync Polarity (CVT Reduce Blanking Mode) */</div><div class='add'>+#define M1440X900_RB_R60_HSP       POSITIVE</div><div class='add'>+#define M1440X900_RB_R60_VSP       NEGATIVE</div><div class='add'>+</div><div class='add'>+/* 1600x900@60 Sync Polarity (CVT Mode) */</div><div class='add'>+#define M1600X900_R60_HSP       NEGATIVE</div><div class='add'>+#define M1600X900_R60_VSP       POSITIVE</div><div class='add'>+</div><div class='add'>+/* 1600x900@60 Sync Polarity (CVT Reduce Blanking Mode) */</div><div class='add'>+#define M1600X900_RB_R60_HSP       POSITIVE</div><div class='add'>+#define M1600X900_RB_R60_VSP       NEGATIVE</div><div class='add'>+</div><div class='add'>+/* 1600x1024@60 Sync Polarity (GTF Mode) */</div><div class='add'>+#define M1600X1024_R60_HSP      NEGATIVE</div><div class='add'>+#define M1600X1024_R60_VSP      POSITIVE</div><div class='add'>+</div><div class='add'>+/* 1792x1344@60 Sync Polarity (DMT Mode) */</div><div class='add'>+#define M1792x1344_R60_HSP      NEGATIVE</div><div class='add'>+#define M1792x1344_R60_VSP      POSITIVE</div><div class='add'>+</div><div class='add'>+/* 1856x1392@60 Sync Polarity (DMT Mode) */</div><div class='add'>+#define M1856x1392_R60_HSP      NEGATIVE</div><div class='add'>+#define M1856x1392_R60_VSP      POSITIVE</div><div class='add'>+</div><div class='add'>+/* 1920x1200@60 Sync Polarity (CVT Mode) */</div><div class='add'>+#define M1920X1200_R60_HSP      NEGATIVE</div><div class='add'>+#define M1920X1200_R60_VSP      POSITIVE</div><div class='add'>+</div><div class='add'>+/* 1920x1200@60 Sync Polarity (CVT Reduce Blanking Mode) */</div><div class='add'>+#define M1920X1200_RB_R60_HSP  POSITIVE</div><div class='add'>+#define M1920X1200_RB_R60_VSP  NEGATIVE</div><div class='add'>+</div><div class='add'>+/* 1920x1080@60 Sync Polarity  (CEA Mode) */</div><div class='add'>+#define M1920X1080_CEA_R60_HSP       POSITIVE</div><div class='add'>+#define M1920X1080_CEA_R60_VSP       POSITIVE</div><div class='add'>+</div><div class='add'>+/* 2048x1536@60 Sync Polarity (CVT Mode) */</div><div class='add'>+#define M2048x1536_R60_HSP      NEGATIVE</div><div class='add'>+#define M2048x1536_R60_VSP      POSITIVE</div><div class='add'>+</div><div class='add'>+/* define PLL index: */</div><div class='add'>+#define CLK_25_175M     25175000</div><div class='add'>+#define CLK_26_880M     26880000</div><div class='add'>+#define CLK_29_581M     29581000</div><div class='add'>+#define CLK_31_490M     31490000</div><div class='add'>+#define CLK_31_500M     31500000</div><div class='add'>+#define CLK_31_728M     31728000</div><div class='add'>+#define CLK_32_668M     32688000</div><div class='add'>+#define CLK_36_000M     36000000</div><div class='add'>+#define CLK_40_000M     40000000</div><div class='add'>+#define CLK_41_291M     41291000</div><div class='add'>+#define CLK_43_163M     43163000</div><div class='add'>+#define CLK_45_250M     45250000	/* 45.46MHz */</div><div class='add'>+#define CLK_46_000M     46000000</div><div class='add'>+#define CLK_46_996M     46996000</div><div class='add'>+#define CLK_48_000M     48000000</div><div class='add'>+#define CLK_48_875M     48875000</div><div class='add'>+#define CLK_49_500M     49500000</div><div class='add'>+#define CLK_52_406M     52406000</div><div class='add'>+#define CLK_52_977M     52977000</div><div class='add'>+#define CLK_56_250M     56250000</div><div class='add'>+#define CLK_60_466M     60466000</div><div class='add'>+#define CLK_61_500M     61500000</div><div class='add'>+#define CLK_65_000M     65000000</div><div class='add'>+#define CLK_65_178M     65178000</div><div class='add'>+#define CLK_66_750M     66750000	/* 67.116MHz */</div><div class='add'>+#define CLK_68_179M     68179000</div><div class='add'>+#define CLK_69_924M     69924000</div><div class='add'>+#define CLK_70_159M     70159000</div><div class='add'>+#define CLK_72_000M     72000000</div><div class='add'>+#define CLK_74_270M     74270000</div><div class='add'>+#define CLK_78_750M     78750000</div><div class='add'>+#define CLK_80_136M     80136000</div><div class='add'>+#define CLK_83_375M     83375000</div><div class='add'>+#define CLK_83_950M     83950000</div><div class='add'>+#define CLK_84_750M     84750000	/* 84.537Mhz */</div><div class='add'>+#define CLK_85_860M     85860000</div><div class='add'>+#define CLK_88_750M     88750000</div><div class='add'>+#define CLK_94_500M     94500000</div><div class='add'>+#define CLK_97_750M     97750000</div><div class='add'>+#define CLK_101_000M    101000000</div><div class='add'>+#define CLK_106_500M    106500000</div><div class='add'>+#define CLK_108_000M    108000000</div><div class='add'>+#define CLK_113_309M    113309000</div><div class='add'>+#define CLK_118_840M    118840000</div><div class='add'>+#define CLK_119_000M    119000000</div><div class='add'>+#define CLK_121_750M    121750000	/* 121.704MHz */</div><div class='add'>+#define CLK_125_104M    125104000</div><div class='add'>+#define CLK_133_308M    133308000</div><div class='add'>+#define CLK_135_000M    135000000</div><div class='add'>+#define CLK_136_700M    136700000</div><div class='add'>+#define CLK_138_400M    138400000</div><div class='add'>+#define CLK_146_760M    146760000</div><div class='add'>+#define CLK_148_500M    148500000</div><div class='add'>+</div><div class='add'>+#define CLK_153_920M    153920000</div><div class='add'>+#define CLK_156_000M    156000000</div><div class='add'>+#define CLK_157_500M    157500000</div><div class='add'>+#define CLK_162_000M    162000000</div><div class='add'>+#define CLK_187_000M    187000000</div><div class='add'>+#define CLK_193_295M    193295000</div><div class='add'>+#define CLK_202_500M    202500000</div><div class='add'>+#define CLK_204_000M    204000000</div><div class='add'>+#define CLK_218_500M    218500000</div><div class='add'>+#define CLK_234_000M    234000000</div><div class='add'>+#define CLK_267_250M    267250000</div><div class='add'>+#define CLK_297_500M    297500000</div><div class='add'>+#define CLK_74_481M     74481000</div><div class='add'>+#define CLK_172_798M    172798000</div><div class='add'>+#define CLK_122_614M    122614000</div><div class='add'>+</div><div class='add'>+/* CLE266 PLL value</div><div class='add'>+*/</div><div class='add'>+#define CLE266_PLL_25_175M     0x0000C763</div><div class='add'>+#define CLE266_PLL_26_880M     0x0000440F</div><div class='add'>+#define CLE266_PLL_29_581M     0x00008421</div><div class='add'>+#define CLE266_PLL_31_490M     0x00004721</div><div class='add'>+#define CLE266_PLL_31_500M     0x0000C3B5</div><div class='add'>+#define CLE266_PLL_31_728M     0x0000471F</div><div class='add'>+#define CLE266_PLL_32_668M     0x0000C449</div><div class='add'>+#define CLE266_PLL_36_000M     0x0000C5E5</div><div class='add'>+#define CLE266_PLL_40_000M     0x0000C459</div><div class='add'>+#define CLE266_PLL_41_291M     0x00004417</div><div class='add'>+#define CLE266_PLL_43_163M     0x0000C579</div><div class='add'>+#define CLE266_PLL_45_250M     0x0000C57F	/* 45.46MHz */</div><div class='add'>+#define CLE266_PLL_46_000M     0x0000875A</div><div class='add'>+#define CLE266_PLL_46_996M     0x0000C4E9</div><div class='add'>+#define CLE266_PLL_48_000M     0x00001443</div><div class='add'>+#define CLE266_PLL_48_875M     0x00001D63</div><div class='add'>+#define CLE266_PLL_49_500M     0x00008653</div><div class='add'>+#define CLE266_PLL_52_406M     0x0000C475</div><div class='add'>+#define CLE266_PLL_52_977M     0x00004525</div><div class='add'>+#define CLE266_PLL_56_250M     0x000047B7</div><div class='add'>+#define CLE266_PLL_60_466M     0x0000494C</div><div class='add'>+#define CLE266_PLL_61_500M     0x00001456</div><div class='add'>+#define CLE266_PLL_65_000M     0x000086ED</div><div class='add'>+#define CLE266_PLL_65_178M     0x0000855B</div><div class='add'>+#define CLE266_PLL_66_750M     0x0000844B	/* 67.116MHz */</div><div class='add'>+#define CLE266_PLL_68_179M     0x00000413</div><div class='add'>+#define CLE266_PLL_69_924M     0x00001153</div><div class='add'>+#define CLE266_PLL_70_159M     0x00001462</div><div class='add'>+#define CLE266_PLL_72_000M     0x00001879</div><div class='add'>+#define CLE266_PLL_74_270M     0x00004853</div><div class='add'>+#define CLE266_PLL_78_750M     0x00004321</div><div class='add'>+#define CLE266_PLL_80_136M     0x0000051C</div><div class='add'>+#define CLE266_PLL_83_375M     0x0000C25D</div><div class='add'>+#define CLE266_PLL_83_950M     0x00000729</div><div class='add'>+#define CLE266_PLL_84_750M     0x00008576	/* 84.537MHz */</div><div class='add'>+#define CLE266_PLL_85_860M     0x00004754</div><div class='add'>+#define CLE266_PLL_88_750M     0x0000051F</div><div class='add'>+#define CLE266_PLL_94_500M     0x00000521</div><div class='add'>+#define CLE266_PLL_97_750M     0x00004652</div><div class='add'>+#define CLE266_PLL_101_000M    0x0000497F</div><div class='add'>+#define CLE266_PLL_106_500M    0x00008477	/* 106.491463 MHz */</div><div class='add'>+#define CLE266_PLL_108_000M    0x00008479</div><div class='add'>+#define CLE266_PLL_113_309M    0x00000C5F</div><div class='add'>+#define CLE266_PLL_118_840M    0x00004553</div><div class='add'>+#define CLE266_PLL_119_000M    0x00000D6C</div><div class='add'>+#define CLE266_PLL_121_750M    0x00004555	/* 121.704MHz */</div><div class='add'>+#define CLE266_PLL_125_104M    0x000006B5</div><div class='add'>+#define CLE266_PLL_133_308M    0x0000465F</div><div class='add'>+#define CLE266_PLL_135_000M    0x0000455E</div><div class='add'>+#define CLE266_PLL_136_700M    0x00000C73</div><div class='add'>+#define CLE266_PLL_138_400M    0x00000957</div><div class='add'>+#define CLE266_PLL_146_760M    0x00004567</div><div class='add'>+#define CLE266_PLL_148_500M    0x00000853</div><div class='add'>+#define CLE266_PLL_153_920M    0x00000856</div><div class='add'>+#define CLE266_PLL_156_000M    0x0000456D</div><div class='add'>+#define CLE266_PLL_157_500M    0x000005B7</div><div class='add'>+#define CLE266_PLL_162_000M    0x00004571</div><div class='add'>+#define CLE266_PLL_187_000M    0x00000976</div><div class='add'>+#define CLE266_PLL_193_295M    0x0000086C</div><div class='add'>+#define CLE266_PLL_202_500M    0x00000763</div><div class='add'>+#define CLE266_PLL_204_000M    0x00000764</div><div class='add'>+#define CLE266_PLL_218_500M    0x0000065C</div><div class='add'>+#define CLE266_PLL_234_000M    0x00000662</div><div class='add'>+#define CLE266_PLL_267_250M    0x00000670</div><div class='add'>+#define CLE266_PLL_297_500M    0x000005E6</div><div class='add'>+#define CLE266_PLL_74_481M     0x0000051A</div><div class='add'>+#define CLE266_PLL_172_798M    0x00004579</div><div class='add'>+#define CLE266_PLL_122_614M    0x0000073C</div><div class='add'>+</div><div class='add'>+/* K800 PLL value</div><div class='add'>+*/</div><div class='add'>+#define K800_PLL_25_175M     0x00539001</div><div class='add'>+#define K800_PLL_26_880M     0x001C8C80</div><div class='add'>+#define K800_PLL_29_581M     0x00409080</div><div class='add'>+#define K800_PLL_31_490M     0x006F9001</div><div class='add'>+#define K800_PLL_31_500M     0x008B9002</div><div class='add'>+#define K800_PLL_31_728M     0x00AF9003</div><div class='add'>+#define K800_PLL_32_668M     0x00909002</div><div class='add'>+#define K800_PLL_36_000M     0x009F9002</div><div class='add'>+#define K800_PLL_40_000M     0x00578C02</div><div class='add'>+#define K800_PLL_41_291M     0x00438C01</div><div class='add'>+#define K800_PLL_43_163M     0x00778C03</div><div class='add'>+#define K800_PLL_45_250M     0x007D8C83	/* 45.46MHz */</div><div class='add'>+#define K800_PLL_46_000M     0x00658C02</div><div class='add'>+#define K800_PLL_46_996M     0x00818C83</div><div class='add'>+#define K800_PLL_48_000M     0x00848C83</div><div class='add'>+#define K800_PLL_48_875M     0x00508C81</div><div class='add'>+#define K800_PLL_49_500M     0x00518C01</div><div class='add'>+#define K800_PLL_52_406M     0x00738C02</div><div class='add'>+#define K800_PLL_52_977M     0x00928C83</div><div class='add'>+#define K800_PLL_56_250M     0x007C8C02</div><div class='add'>+#define K800_PLL_60_466M     0x00A78C83</div><div class='add'>+#define K800_PLL_61_500M     0x00AA8C83</div><div class='add'>+#define K800_PLL_65_000M     0x006B8C01</div><div class='add'>+#define K800_PLL_65_178M     0x00B48C83</div><div class='add'>+#define K800_PLL_66_750M     0x00948C82	/* 67.116MHz */</div><div class='add'>+#define K800_PLL_68_179M     0x00708C01</div><div class='add'>+#define K800_PLL_69_924M     0x00C18C83</div><div class='add'>+#define K800_PLL_70_159M     0x00C28C83</div><div class='add'>+#define K800_PLL_72_000M     0x009F8C82</div><div class='add'>+#define K800_PLL_74_270M     0x00ce0c03</div><div class='add'>+#define K800_PLL_78_750M     0x00408801</div><div class='add'>+#define K800_PLL_80_136M     0x00428801</div><div class='add'>+#define K800_PLL_83_375M     0x005B0882</div><div class='add'>+#define K800_PLL_83_950M     0x00738803</div><div class='add'>+#define K800_PLL_84_750M     0x00748883	/* 84.477MHz */</div><div class='add'>+#define K800_PLL_85_860M     0x00768883</div><div class='add'>+#define K800_PLL_88_750M     0x007A8883</div><div class='add'>+#define K800_PLL_94_500M     0x00828803</div><div class='add'>+#define K800_PLL_97_750M     0x00878883</div><div class='add'>+#define K800_PLL_101_000M    0x008B8883</div><div class='add'>+#define K800_PLL_106_500M    0x00758882	/* 106.491463 MHz */</div><div class='add'>+#define K800_PLL_108_000M    0x00778882</div><div class='add'>+#define K800_PLL_113_309M    0x005D8881</div><div class='add'>+#define K800_PLL_118_840M    0x00A48883</div><div class='add'>+#define K800_PLL_119_000M    0x00838882</div><div class='add'>+#define K800_PLL_121_750M    0x00A88883	/* 121.704MHz */</div><div class='add'>+#define K800_PLL_125_104M    0x00688801</div><div class='add'>+#define K800_PLL_133_308M    0x005D8801</div><div class='add'>+#define K800_PLL_135_000M    0x001A4081</div><div class='add'>+#define K800_PLL_136_700M    0x00BD8883</div><div class='add'>+#define K800_PLL_138_400M    0x00728881</div><div class='add'>+#define K800_PLL_146_760M    0x00CC8883</div><div class='add'>+#define K800_PLL_148_500M    0x00ce0803</div><div class='add'>+#define K800_PLL_153_920M    0x00548482</div><div class='add'>+#define K800_PLL_156_000M    0x006B8483</div><div class='add'>+#define K800_PLL_157_500M    0x00142080</div><div class='add'>+#define K800_PLL_162_000M    0x006F8483</div><div class='add'>+#define K800_PLL_187_000M    0x00818483</div><div class='add'>+#define K800_PLL_193_295M    0x004F8481</div><div class='add'>+#define K800_PLL_202_500M    0x00538481</div><div class='add'>+#define K800_PLL_204_000M    0x008D8483</div><div class='add'>+#define K800_PLL_218_500M    0x00978483</div><div class='add'>+#define K800_PLL_234_000M    0x00608401</div><div class='add'>+#define K800_PLL_267_250M    0x006E8481</div><div class='add'>+#define K800_PLL_297_500M    0x00A48402</div><div class='add'>+#define K800_PLL_74_481M     0x007B8C81</div><div class='add'>+#define K800_PLL_172_798M    0x00778483</div><div class='add'>+#define K800_PLL_122_614M    0x00878882</div><div class='add'>+</div><div class='add'>+/* PLL for VT3324 */</div><div class='add'>+#define CX700_25_175M     0x008B1003</div><div class='add'>+#define CX700_26_719M     0x00931003</div><div class='add'>+#define CX700_26_880M     0x00941003</div><div class='add'>+#define CX700_29_581M     0x00A49003</div><div class='add'>+#define CX700_31_490M     0x00AE1003</div><div class='add'>+#define CX700_31_500M     0x00AE1003</div><div class='add'>+#define CX700_31_728M     0x00AF1003</div><div class='add'>+#define CX700_32_668M     0x00B51003</div><div class='add'>+#define CX700_36_000M     0x00C81003</div><div class='add'>+#define CX700_40_000M     0x006E0C03</div><div class='add'>+#define CX700_41_291M     0x00710C03</div><div class='add'>+#define CX700_43_163M     0x00770C03</div><div class='add'>+#define CX700_45_250M     0x007D0C03	/* 45.46MHz */</div><div class='add'>+#define CX700_46_000M     0x007F0C03</div><div class='add'>+#define CX700_46_996M     0x00818C83</div><div class='add'>+#define CX700_48_000M     0x00840C03</div><div class='add'>+#define CX700_48_875M     0x00508C81</div><div class='add'>+#define CX700_49_500M     0x00880C03</div><div class='add'>+#define CX700_52_406M     0x00730C02</div><div class='add'>+#define CX700_52_977M     0x00920C03</div><div class='add'>+#define CX700_56_250M     0x009B0C03</div><div class='add'>+#define CX700_60_466M     0x00460C00</div><div class='add'>+#define CX700_61_500M     0x00AA0C03</div><div class='add'>+#define CX700_65_000M     0x006B0C01</div><div class='add'>+#define CX700_65_178M     0x006B0C01</div><div class='add'>+#define CX700_66_750M     0x00940C02	/*67.116MHz */</div><div class='add'>+#define CX700_68_179M     0x00BC0C03</div><div class='add'>+#define CX700_69_924M     0x00C10C03</div><div class='add'>+#define CX700_70_159M     0x00C20C03</div><div class='add'>+#define CX700_72_000M     0x009F0C02</div><div class='add'>+#define CX700_74_270M     0x00CE0C03</div><div class='add'>+#define CX700_74_481M     0x00CE0C03</div><div class='add'>+#define CX700_78_750M     0x006C0803</div><div class='add'>+#define CX700_80_136M     0x006E0803</div><div class='add'>+#define CX700_83_375M     0x005B0882</div><div class='add'>+#define CX700_83_950M     0x00730803</div><div class='add'>+#define CX700_84_750M     0x00740803	/* 84.537Mhz */</div><div class='add'>+#define CX700_85_860M     0x00760803</div><div class='add'>+#define CX700_88_750M     0x00AC8885</div><div class='add'>+#define CX700_94_500M     0x00820803</div><div class='add'>+#define CX700_97_750M     0x00870803</div><div class='add'>+#define CX700_101_000M    0x008B0803</div><div class='add'>+#define CX700_106_500M    0x00750802</div><div class='add'>+#define CX700_108_000M    0x00950803</div><div class='add'>+#define CX700_113_309M    0x005D0801</div><div class='add'>+#define CX700_118_840M    0x00A40803</div><div class='add'>+#define CX700_119_000M    0x00830802</div><div class='add'>+#define CX700_121_750M    0x00420800	/* 121.704MHz */</div><div class='add'>+#define CX700_125_104M    0x00AD0803</div><div class='add'>+#define CX700_133_308M    0x00930802</div><div class='add'>+#define CX700_135_000M    0x00950802</div><div class='add'>+#define CX700_136_700M    0x00BD0803</div><div class='add'>+#define CX700_138_400M    0x00720801</div><div class='add'>+#define CX700_146_760M    0x00CC0803</div><div class='add'>+#define CX700_148_500M    0x00a40802</div><div class='add'>+#define CX700_153_920M    0x00540402</div><div class='add'>+#define CX700_156_000M    0x006B0403</div><div class='add'>+#define CX700_157_500M    0x006C0403</div><div class='add'>+#define CX700_162_000M    0x006F0403</div><div class='add'>+#define CX700_172_798M    0x00770403</div><div class='add'>+#define CX700_187_000M    0x00810403</div><div class='add'>+#define CX700_193_295M    0x00850403</div><div class='add'>+#define CX700_202_500M    0x008C0403</div><div class='add'>+#define CX700_204_000M    0x008D0403</div><div class='add'>+#define CX700_218_500M    0x00970403</div><div class='add'>+#define CX700_234_000M    0x00600401</div><div class='add'>+#define CX700_267_250M    0x00B90403</div><div class='add'>+#define CX700_297_500M    0x00CE0403</div><div class='add'>+#define CX700_122_614M    0x00870802</div><div class='add'>+</div><div class='add'>+/* Definition CRTC Timing Index */</div><div class='add'>+#define H_TOTAL_INDEX               0</div><div class='add'>+#define H_ADDR_INDEX                1</div><div class='add'>+#define H_BLANK_START_INDEX         2</div><div class='add'>+#define H_BLANK_END_INDEX           3</div><div class='add'>+#define H_SYNC_START_INDEX          4</div><div class='add'>+#define H_SYNC_END_INDEX            5</div><div class='add'>+#define V_TOTAL_INDEX               6</div><div class='add'>+#define V_ADDR_INDEX                7</div><div class='add'>+#define V_BLANK_START_INDEX         8</div><div class='add'>+#define V_BLANK_END_INDEX           9</div><div class='add'>+#define V_SYNC_START_INDEX          10</div><div class='add'>+#define V_SYNC_END_INDEX            11</div><div class='add'>+#define H_TOTAL_SHADOW_INDEX        12</div><div class='add'>+#define H_BLANK_END_SHADOW_INDEX    13</div><div class='add'>+#define V_TOTAL_SHADOW_INDEX        14</div><div class='add'>+#define V_ADDR_SHADOW_INDEX         15</div><div class='add'>+#define V_BLANK_SATRT_SHADOW_INDEX  16</div><div class='add'>+#define V_BLANK_END_SHADOW_INDEX    17</div><div class='add'>+#define V_SYNC_SATRT_SHADOW_INDEX   18</div><div class='add'>+#define V_SYNC_END_SHADOW_INDEX     19</div><div class='add'>+</div><div class='add'>+/* Definition Video Mode Pixel Clock (picoseconds)</div><div class='add'>+*/</div><div class='add'>+#define RES_480X640_60HZ_PIXCLOCK    39722</div><div class='add'>+#define RES_640X480_60HZ_PIXCLOCK    39722</div><div class='add'>+#define RES_640X480_75HZ_PIXCLOCK    31747</div><div class='add'>+#define RES_640X480_85HZ_PIXCLOCK    27777</div><div class='add'>+#define RES_640X480_100HZ_PIXCLOCK   23168</div><div class='add'>+#define RES_640X480_120HZ_PIXCLOCK   19081</div><div class='add'>+#define RES_720X480_60HZ_PIXCLOCK    37020</div><div class='add'>+#define RES_720X576_60HZ_PIXCLOCK    30611</div><div class='add'>+#define RES_800X600_60HZ_PIXCLOCK    25000</div><div class='add'>+#define RES_800X600_75HZ_PIXCLOCK    20203</div><div class='add'>+#define RES_800X600_85HZ_PIXCLOCK    17777</div><div class='add'>+#define RES_800X600_100HZ_PIXCLOCK   14667</div><div class='add'>+#define RES_800X600_120HZ_PIXCLOCK   11912</div><div class='add'>+#define RES_800X480_60HZ_PIXCLOCK    33805</div><div class='add'>+#define RES_848X480_60HZ_PIXCLOCK    31756</div><div class='add'>+#define RES_856X480_60HZ_PIXCLOCK    31518</div><div class='add'>+#define RES_1024X512_60HZ_PIXCLOCK   24218</div><div class='add'>+#define RES_1024X600_60HZ_PIXCLOCK   20460</div><div class='add'>+#define RES_1024X768_60HZ_PIXCLOCK   15385</div><div class='add'>+#define RES_1024X768_75HZ_PIXCLOCK   12699</div><div class='add'>+#define RES_1024X768_85HZ_PIXCLOCK   10582</div><div class='add'>+#define RES_1024X768_100HZ_PIXCLOCK  8825</div><div class='add'>+#define RES_1152X864_75HZ_PIXCLOCK   9259</div><div class='add'>+#define RES_1280X768_60HZ_PIXCLOCK   12480</div><div class='add'>+#define RES_1280X800_60HZ_PIXCLOCK   11994</div><div class='add'>+#define RES_1280X960_60HZ_PIXCLOCK   9259</div><div class='add'>+#define RES_1280X1024_60HZ_PIXCLOCK  9260</div><div class='add'>+#define RES_1280X1024_75HZ_PIXCLOCK  7408</div><div class='add'>+#define RES_1280X768_85HZ_PIXCLOCK   6349</div><div class='add'>+#define RES_1440X1050_60HZ_PIXCLOCK  7993</div><div class='add'>+#define RES_1600X1200_60HZ_PIXCLOCK  6172</div><div class='add'>+#define RES_1600X1200_75HZ_PIXCLOCK  4938</div><div class='add'>+#define RES_1280X720_60HZ_PIXCLOCK   13426</div><div class='add'>+#define RES_1920X1080_60HZ_PIXCLOCK  5787</div><div class='add'>+#define RES_1400X1050_60HZ_PIXCLOCK  8214</div><div class='add'>+#define RES_1400X1050_75HZ_PIXCLOCK  6410</div><div class='add'>+#define RES_1368X768_60HZ_PIXCLOCK   11647</div><div class='add'>+#define RES_960X600_60HZ_PIXCLOCK      22099</div><div class='add'>+#define RES_1000X600_60HZ_PIXCLOCK    20834</div><div class='add'>+#define RES_1024X576_60HZ_PIXCLOCK    21278</div><div class='add'>+#define RES_1088X612_60HZ_PIXCLOCK    18877</div><div class='add'>+#define RES_1152X720_60HZ_PIXCLOCK    14981</div><div class='add'>+#define RES_1200X720_60HZ_PIXCLOCK    14253</div><div class='add'>+#define RES_1280X600_60HZ_PIXCLOCK    16260</div><div class='add'>+#define RES_1280X720_50HZ_PIXCLOCK    16538</div><div class='add'>+#define RES_1280X768_50HZ_PIXCLOCK    15342</div><div class='add'>+#define RES_1366X768_50HZ_PIXCLOCK    14301</div><div class='add'>+#define RES_1366X768_60HZ_PIXCLOCK    11646</div><div class='add'>+#define RES_1360X768_60HZ_PIXCLOCK    11799</div><div class='add'>+#define RES_1440X900_60HZ_PIXCLOCK    9390</div><div class='add'>+#define RES_1440X900_75HZ_PIXCLOCK    7315</div><div class='add'>+#define RES_1600X900_60HZ_PIXCLOCK    8415</div><div class='add'>+#define RES_1600X1024_60HZ_PIXCLOCK   7315</div><div class='add'>+#define RES_1680X1050_60HZ_PIXCLOCK   6814</div><div class='add'>+#define RES_1680X1050_75HZ_PIXCLOCK   5348</div><div class='add'>+#define RES_1792X1344_60HZ_PIXCLOCK   4902</div><div class='add'>+#define RES_1856X1392_60HZ_PIXCLOCK   4577</div><div class='add'>+#define RES_1920X1200_60HZ_PIXCLOCK   5173</div><div class='add'>+#define RES_1920X1440_60HZ_PIXCLOCK   4274</div><div class='add'>+#define RES_1920X1440_75HZ_PIXCLOCK   3367</div><div class='add'>+#define RES_2048X1536_60HZ_PIXCLOCK   3742</div><div class='add'>+</div><div class='add'>+#define RES_1360X768_RB_60HZ_PIXCLOCK 13889</div><div class='add'>+#define RES_1400X1050_RB_60HZ_PIXCLOCK 9901</div><div class='add'>+#define RES_1440X900_RB_60HZ_PIXCLOCK   11268</div><div class='add'>+#define RES_1600X900_RB_60HZ_PIXCLOCK   10230</div><div class='add'>+#define RES_1680X1050_RB_60HZ_PIXCLOCK 8403</div><div class='add'>+#define RES_1920X1080_RB_60HZ_PIXCLOCK 7225</div><div class='add'>+#define RES_1920X1200_RB_60HZ_PIXCLOCK 6497</div><div class='add'>+</div><div class='add'>+/* LCD display method</div><div class='add'>+*/</div><div class='add'>+#define     LCD_EXPANDSION              0x00</div><div class='add'>+#define     LCD_CENTERING               0x01</div><div class='add'>+</div><div class='add'>+/* LCD mode</div><div class='add'>+*/</div><div class='add'>+#define     LCD_OPENLDI               0x00</div><div class='add'>+#define     LCD_SPWG                  0x01</div><div class='add'>+</div><div class='add'>+/* Define display timing</div><div class='add'>+*/</div><div class='add'>+struct display_timing {</div><div class='add'>+	u16 hor_total;</div><div class='add'>+	u16 hor_addr;</div><div class='add'>+	u16 hor_blank_start;</div><div class='add'>+	u16 hor_blank_end;</div><div class='add'>+	u16 hor_sync_start;</div><div class='add'>+	u16 hor_sync_end;</div><div class='add'>+	u16 ver_total;</div><div class='add'>+	u16 ver_addr;</div><div class='add'>+	u16 ver_blank_start;</div><div class='add'>+	u16 ver_blank_end;</div><div class='add'>+	u16 ver_sync_start;</div><div class='add'>+	u16 ver_sync_end;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct crt_mode_table {</div><div class='add'>+	int refresh_rate;</div><div class='add'>+	unsigned long clk;</div><div class='add'>+	int h_sync_polarity;</div><div class='add'>+	int v_sync_polarity;</div><div class='add'>+	struct display_timing crtc;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct io_reg {</div><div class='add'>+	int port;</div><div class='add'>+	u8 index;</div><div class='add'>+	u8 mask;</div><div class='add'>+	u8 value;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif /* __SHARE_H__ */</div><div class='head'>diff --git a/drivers/video/via/tbl1636.c b/drivers/video/via/tbl1636.c<br/>new file mode 100644<br/>index 000000000000..2d8453429d4a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/via/tbl1636.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/via/tbl1636.c</a></div><div class='hunk'>@@ -0,0 +1,71 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.</div><div class='add'>+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.</div><div class='add'>+</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public</div><div class='add'>+ * License as published by the Free Software Foundation;</div><div class='add'>+ * either version 2, or (at your option) any later version.</div><div class='add'>+</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even</div><div class='add'>+ * the implied warranty of MERCHANTABILITY or FITNESS FOR</div><div class='add'>+ * A PARTICULAR PURPOSE.See the GNU General Public License</div><div class='add'>+ * for more details.</div><div class='add'>+</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc.,</div><div class='add'>+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "global.h"</div><div class='add'>+struct IODATA COMMON_INIT_TBL_VT1636[] = {</div><div class='add'>+/*  Index, Mask, Value */</div><div class='add'>+	/* Set panel power sequence timing */</div><div class='add'>+	{0x10, 0xC0, 0x00},</div><div class='add'>+	/* T1: VDD on - Data on. Each increment is 1 ms. (50ms = 031h) */</div><div class='add'>+	{0x0B, 0xFF, 0x40},</div><div class='add'>+	/* T2: Data on - Backlight on. Each increment is 2 ms. (210ms = 068h) */</div><div class='add'>+	{0x0C, 0xFF, 0x31},</div><div class='add'>+	/* T3: Backlight off -Data off. Each increment is 2 ms. (210ms = 068h)*/</div><div class='add'>+	{0x0D, 0xFF, 0x31},</div><div class='add'>+	/* T4: Data off - VDD off. Each increment is 1 ms. (50ms = 031h) */</div><div class='add'>+	{0x0E, 0xFF, 0x68},</div><div class='add'>+	/* T5: VDD off - VDD on. Each increment is 100 ms. (500ms = 04h) */</div><div class='add'>+	{0x0F, 0xFF, 0x68},</div><div class='add'>+	/* LVDS output power up */</div><div class='add'>+	{0x09, 0xA0, 0xA0},</div><div class='add'>+	/* turn on back light */</div><div class='add'>+	{0x10, 0x33, 0x13}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct IODATA DUAL_CHANNEL_ENABLE_TBL_VT1636[] = {</div><div class='add'>+/*  Index, Mask, Value */</div><div class='add'>+	{0x08, 0xF0, 0xE0}	/* Input Data Mode Select */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct IODATA SINGLE_CHANNEL_ENABLE_TBL_VT1636[] = {</div><div class='add'>+/*  Index, Mask, Value */</div><div class='add'>+	{0x08, 0xF0, 0x00}	/* Input Data Mode Select */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct IODATA DITHERING_ENABLE_TBL_VT1636[] = {</div><div class='add'>+/*  Index, Mask, Value */</div><div class='add'>+	{0x0A, 0x70, 0x50}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct IODATA DITHERING_DISABLE_TBL_VT1636[] = {</div><div class='add'>+/*  Index, Mask, Value */</div><div class='add'>+	{0x0A, 0x70, 0x00}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct IODATA VDD_ON_TBL_VT1636[] = {</div><div class='add'>+/*  Index, Mask, Value */</div><div class='add'>+	{0x10, 0x20, 0x20}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct IODATA VDD_OFF_TBL_VT1636[] = {</div><div class='add'>+/*  Index, Mask, Value */</div><div class='add'>+	{0x10, 0x20, 0x00}</div><div class='add'>+};</div><div class='head'>diff --git a/drivers/video/via/tbl1636.h b/drivers/video/via/tbl1636.h<br/>new file mode 100644<br/>index 000000000000..d906055f1511<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/via/tbl1636.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/via/tbl1636.h</a></div><div class='hunk'>@@ -0,0 +1,34 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.</div><div class='add'>+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.</div><div class='add'>+</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public</div><div class='add'>+ * License as published by the Free Software Foundation;</div><div class='add'>+ * either version 2, or (at your option) any later version.</div><div class='add'>+</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even</div><div class='add'>+ * the implied warranty of MERCHANTABILITY or FITNESS FOR</div><div class='add'>+ * A PARTICULAR PURPOSE.See the GNU General Public License</div><div class='add'>+ * for more details.</div><div class='add'>+</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc.,</div><div class='add'>+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _TBL1636_H_</div><div class='add'>+#define _TBL1636_H_</div><div class='add'>+#include "hw.h"</div><div class='add'>+</div><div class='add'>+extern struct IODATA COMMON_INIT_TBL_VT1636[8];</div><div class='add'>+extern struct IODATA DUAL_CHANNEL_ENABLE_TBL_VT1636[1];</div><div class='add'>+extern struct IODATA SINGLE_CHANNEL_ENABLE_TBL_VT1636[1];</div><div class='add'>+extern struct IODATA DITHERING_ENABLE_TBL_VT1636[1];</div><div class='add'>+extern struct IODATA DITHERING_DISABLE_TBL_VT1636[1];</div><div class='add'>+extern struct IODATA VDD_ON_TBL_VT1636[1];</div><div class='add'>+extern struct IODATA VDD_OFF_TBL_VT1636[1];</div><div class='add'>+</div><div class='add'>+#endif /* _VIA_TBL1636_H_ */</div><div class='head'>diff --git a/drivers/video/via/tblDPASetting.c b/drivers/video/via/tblDPASetting.c<br/>new file mode 100644<br/>index 000000000000..0c4c8cc712f4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/via/tblDPASetting.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/via/tblDPASetting.c</a></div><div class='hunk'>@@ -0,0 +1,109 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.</div><div class='add'>+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.</div><div class='add'>+</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public</div><div class='add'>+ * License as published by the Free Software Foundation;</div><div class='add'>+ * either version 2, or (at your option) any later version.</div><div class='add'>+</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even</div><div class='add'>+ * the implied warranty of MERCHANTABILITY or FITNESS FOR</div><div class='add'>+ * A PARTICULAR PURPOSE.See the GNU General Public License</div><div class='add'>+ * for more details.</div><div class='add'>+</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc.,</div><div class='add'>+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "global.h"</div><div class='add'>+/* For VT3324: */</div><div class='add'>+struct VT1636_DPA_SETTING VT1636_DPA_SETTING_TBL_VT3324[] = {</div><div class='add'>+	/* Panel ID,       CLK_SEL_ST1[09],    CLK_SEL_ST2[08] */</div><div class='add'>+	{LCD_PANEL_ID0_640X480, 0x00, 0x00},	/* For 640x480   */</div><div class='add'>+	{LCD_PANEL_ID1_800X600, 0x00, 0x00},	/* For 800x600   */</div><div class='add'>+	{LCD_PANEL_ID2_1024X768, 0x00, 0x00},	/* For 1024x768  */</div><div class='add'>+	{LCD_PANEL_ID3_1280X768, 0x00, 0x00},	/* For 1280x768  */</div><div class='add'>+	{LCD_PANEL_ID4_1280X1024, 0x00, 0x00},	/* For 1280x1024 */</div><div class='add'>+	{LCD_PANEL_ID5_1400X1050, 0x00, 0x00},	/* For 1400x1050 */</div><div class='add'>+	{LCD_PANEL_ID6_1600X1200, 0x0B, 0x03}	/* For 1600x1200 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct GFX_DPA_SETTING GFX_DPA_SETTING_TBL_VT3324[] = {</div><div class='add'>+/*  ClkRange, DVP0, DVP0DataDriving,  DVP0ClockDriving, DVP1,</div><div class='add'>+					DVP1Driving, DFPHigh, DFPLow */</div><div class='add'>+/*  CR96, SR2A[5], SR1B[1], SR2A[4], SR1E[2], CR9B,</div><div class='add'>+					SR65,        CR97,    CR99   */</div><div class='add'>+	/* LCK/VCK &lt; 30000000 will use this value */</div><div class='add'>+	{DPA_CLK_RANGE_30M, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00,</div><div class='add'>+	 0x00},</div><div class='add'>+	/* 30000000 &lt; LCK/VCK &lt; 50000000 will use this value */</div><div class='add'>+	{DPA_CLK_RANGE_30_50M, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00,</div><div class='add'>+	 0x00},</div><div class='add'>+	/* 50000000 &lt; LCK/VCK &lt; 70000000 will use this value */</div><div class='add'>+	{DPA_CLK_RANGE_50_70M, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00,</div><div class='add'>+	 0x00},</div><div class='add'>+	/* 70000000 &lt; LCK/VCK &lt; 100000000 will use this value */</div><div class='add'>+	{DPA_CLK_RANGE_70_100M, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00,</div><div class='add'>+	 0x00},</div><div class='add'>+	/* 100000000 &lt; LCK/VCK &lt; 15000000 will use this value */</div><div class='add'>+	{DPA_CLK_RANGE_100_150M, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00,</div><div class='add'>+	 0x00},</div><div class='add'>+	/* 15000000 &lt; LCK/VCK will use this value */</div><div class='add'>+	{DPA_CLK_RANGE_150M, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x0E, 0x00,</div><div class='add'>+	 0x00},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* For VT3327: */</div><div class='add'>+struct VT1636_DPA_SETTING VT1636_DPA_SETTING_TBL_VT3327[] = {</div><div class='add'>+	/* Panel ID,       CLK_SEL_ST1[09],    CLK_SEL_ST2[08] */</div><div class='add'>+	{LCD_PANEL_ID0_640X480, 0x00, 0x00},	/* For 640x480   */</div><div class='add'>+	{LCD_PANEL_ID1_800X600, 0x00, 0x00},	/* For 800x600   */</div><div class='add'>+	{LCD_PANEL_ID2_1024X768, 0x00, 0x00},	/* For 1024x768  */</div><div class='add'>+	{LCD_PANEL_ID3_1280X768, 0x00, 0x00},	/* For 1280x768  */</div><div class='add'>+	{LCD_PANEL_ID4_1280X1024, 0x00, 0x00},	/* For 1280x1024 */</div><div class='add'>+	{LCD_PANEL_ID5_1400X1050, 0x00, 0x00},	/* For 1400x1050 */</div><div class='add'>+	{LCD_PANEL_ID6_1600X1200, 0x00, 0x00}	/* For 1600x1200 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct GFX_DPA_SETTING GFX_DPA_SETTING_TBL_VT3327[] = {</div><div class='add'>+/*  ClkRange,DVP0, DVP0DataDriving,  DVP0ClockDriving, DVP1,</div><div class='add'>+					DVP1Driving, DFPHigh,   DFPLow */</div><div class='add'>+/*   CR96, SR2A[5], SR1B[1], SR2A[4], SR1E[2], CR9B,</div><div class='add'>+					SR65,        CR97,      CR99   */</div><div class='add'>+/* LCK/VCK &lt; 30000000 will use this value */</div><div class='add'>+{DPA_CLK_RANGE_30M, 0x07, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x08, 0x01},</div><div class='add'>+/* 30000000 &lt; LCK/VCK &lt; 50000000 will use this value */</div><div class='add'>+{DPA_CLK_RANGE_30_50M, 0x07, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x08, 0x01},</div><div class='add'>+/* 50000000 &lt; LCK/VCK &lt; 70000000 will use this value */</div><div class='add'>+{DPA_CLK_RANGE_50_70M, 0x06, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x08, 0x01},</div><div class='add'>+/* 70000000 &lt; LCK/VCK &lt; 100000000 will use this value */</div><div class='add'>+{DPA_CLK_RANGE_70_100M, 0x03, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x08, 0x03},</div><div class='add'>+/* 100000000 &lt; LCK/VCK &lt; 15000000 will use this value */</div><div class='add'>+{DPA_CLK_RANGE_100_150M, 0x03, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x01, 0x02},</div><div class='add'>+/* 15000000 &lt; LCK/VCK will use this value */</div><div class='add'>+{DPA_CLK_RANGE_150M, 0x00, 0x20, 0x00, 0x10, 0x00, 0x03, 0x00, 0x0D, 0x03},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* For VT3364: */</div><div class='add'>+struct GFX_DPA_SETTING GFX_DPA_SETTING_TBL_VT3364[] = {</div><div class='add'>+/*  ClkRange,DVP0, DVP0DataDriving,  DVP0ClockDriving, DVP1,</div><div class='add'>+					DVP1Driving, DFPHigh,   DFPLow */</div><div class='add'>+/*   CR96, SR2A[5], SR1B[1], SR2A[4], SR1E[2], CR9B,</div><div class='add'>+					SR65,        CR97,      CR99   */</div><div class='add'>+/* LCK/VCK &lt; 30000000 will use this value */</div><div class='add'>+{DPA_CLK_RANGE_30M, 0x07, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x08},</div><div class='add'>+/* 30000000 &lt; LCK/VCK &lt; 50000000 will use this value */</div><div class='add'>+{DPA_CLK_RANGE_30_50M, 0x07, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x08},</div><div class='add'>+/* 50000000 &lt; LCK/VCK &lt; 70000000 will use this value */</div><div class='add'>+{DPA_CLK_RANGE_50_70M, 0x07, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x08},</div><div class='add'>+/* 70000000 &lt; LCK/VCK &lt; 100000000 will use this value */</div><div class='add'>+{DPA_CLK_RANGE_70_100M, 0x07, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x08},</div><div class='add'>+/* 100000000 &lt; LCK/VCK &lt; 15000000 will use this value */</div><div class='add'>+{DPA_CLK_RANGE_100_150M, 0x03, 0x00, 0x02, 0x00, 0x00, 0x03, 0x00, 0x00, 0x08},</div><div class='add'>+/* 15000000 &lt; LCK/VCK will use this value */</div><div class='add'>+{DPA_CLK_RANGE_150M, 0x01, 0x00, 0x02, 0x10, 0x00, 0x03, 0x00, 0x00, 0x08},</div><div class='add'>+};</div><div class='head'>diff --git a/drivers/video/via/tblDPASetting.h b/drivers/video/via/tblDPASetting.h<br/>new file mode 100644<br/>index 000000000000..b065a83481d3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/via/tblDPASetting.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/via/tblDPASetting.h</a></div><div class='hunk'>@@ -0,0 +1,47 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.</div><div class='add'>+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.</div><div class='add'>+</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public</div><div class='add'>+ * License as published by the Free Software Foundation;</div><div class='add'>+ * either version 2, or (at your option) any later version.</div><div class='add'>+</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even</div><div class='add'>+ * the implied warranty of MERCHANTABILITY or FITNESS FOR</div><div class='add'>+ * A PARTICULAR PURPOSE.See the GNU General Public License</div><div class='add'>+ * for more details.</div><div class='add'>+</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc.,</div><div class='add'>+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _TBLDPASETTING_H_</div><div class='add'>+#define _TBLDPASETTING_H_</div><div class='add'>+#include "global.h"</div><div class='add'>+</div><div class='add'>+#define DPA_CLK_30M       30000000</div><div class='add'>+#define DPA_CLK_50M       50000000</div><div class='add'>+#define DPA_CLK_70M       70000000</div><div class='add'>+#define DPA_CLK_100M      100000000</div><div class='add'>+#define DPA_CLK_150M      150000000</div><div class='add'>+</div><div class='add'>+enum DPA_RANGE {</div><div class='add'>+	DPA_CLK_RANGE_30M,</div><div class='add'>+	DPA_CLK_RANGE_30_50M,</div><div class='add'>+	DPA_CLK_RANGE_50_70M,</div><div class='add'>+	DPA_CLK_RANGE_70_100M,</div><div class='add'>+	DPA_CLK_RANGE_100_150M,</div><div class='add'>+	DPA_CLK_RANGE_150M</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern struct VT1636_DPA_SETTING VT1636_DPA_SETTING_TBL_VT3324[7];</div><div class='add'>+extern struct GFX_DPA_SETTING GFX_DPA_SETTING_TBL_VT3324[6];</div><div class='add'>+extern struct VT1636_DPA_SETTING VT1636_DPA_SETTING_TBL_VT3327[7];</div><div class='add'>+extern struct GFX_DPA_SETTING GFX_DPA_SETTING_TBL_VT3327[];</div><div class='add'>+extern struct GFX_DPA_SETTING GFX_DPA_SETTING_TBL_VT3364[6];</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/video/via/via_i2c.c b/drivers/video/via/via_i2c.c<br/>new file mode 100644<br/>index 000000000000..0f3ed4eb236d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/via/via_i2c.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/via/via_i2c.c</a></div><div class='hunk'>@@ -0,0 +1,177 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.</div><div class='add'>+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.</div><div class='add'>+</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public</div><div class='add'>+ * License as published by the Free Software Foundation;</div><div class='add'>+ * either version 2, or (at your option) any later version.</div><div class='add'>+</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even</div><div class='add'>+ * the implied warranty of MERCHANTABILITY or FITNESS FOR</div><div class='add'>+ * A PARTICULAR PURPOSE.See the GNU General Public License</div><div class='add'>+ * for more details.</div><div class='add'>+</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc.,</div><div class='add'>+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "global.h"</div><div class='add'>+</div><div class='add'>+static void via_i2c_setscl(void *data, int state)</div><div class='add'>+{</div><div class='add'>+	u8 val;</div><div class='add'>+	struct via_i2c_stuff *via_i2c_chan = (struct via_i2c_stuff *)data;</div><div class='add'>+</div><div class='add'>+	val = viafb_read_reg(VIASR, via_i2c_chan-&gt;i2c_port) &amp; 0xF0;</div><div class='add'>+	if (state)</div><div class='add'>+		val |= 0x20;</div><div class='add'>+	else</div><div class='add'>+		val &amp;= ~0x20;</div><div class='add'>+	switch (via_i2c_chan-&gt;i2c_port) {</div><div class='add'>+	case I2CPORTINDEX:</div><div class='add'>+		val |= 0x01;</div><div class='add'>+		break;</div><div class='add'>+	case GPIOPORTINDEX:</div><div class='add'>+		val |= 0x80;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		DEBUG_MSG("via_i2c: specify wrong i2c port.\n");</div><div class='add'>+	}</div><div class='add'>+	viafb_write_reg(via_i2c_chan-&gt;i2c_port, VIASR, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int via_i2c_getscl(void *data)</div><div class='add'>+{</div><div class='add'>+	struct via_i2c_stuff *via_i2c_chan = (struct via_i2c_stuff *)data;</div><div class='add'>+</div><div class='add'>+	if (viafb_read_reg(VIASR, via_i2c_chan-&gt;i2c_port) &amp; 0x08)</div><div class='add'>+		return 1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int via_i2c_getsda(void *data)</div><div class='add'>+{</div><div class='add'>+	struct via_i2c_stuff *via_i2c_chan = (struct via_i2c_stuff *)data;</div><div class='add'>+</div><div class='add'>+	if (viafb_read_reg(VIASR, via_i2c_chan-&gt;i2c_port) &amp; 0x04)</div><div class='add'>+		return 1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void via_i2c_setsda(void *data, int state)</div><div class='add'>+{</div><div class='add'>+	u8 val;</div><div class='add'>+	struct via_i2c_stuff *via_i2c_chan = (struct via_i2c_stuff *)data;</div><div class='add'>+</div><div class='add'>+	val = viafb_read_reg(VIASR, via_i2c_chan-&gt;i2c_port) &amp; 0xF0;</div><div class='add'>+	if (state)</div><div class='add'>+		val |= 0x10;</div><div class='add'>+	else</div><div class='add'>+		val &amp;= ~0x10;</div><div class='add'>+	switch (via_i2c_chan-&gt;i2c_port) {</div><div class='add'>+	case I2CPORTINDEX:</div><div class='add'>+		val |= 0x01;</div><div class='add'>+		break;</div><div class='add'>+	case GPIOPORTINDEX:</div><div class='add'>+		val |= 0x40;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		DEBUG_MSG("via_i2c: specify wrong i2c port.\n");</div><div class='add'>+	}</div><div class='add'>+	viafb_write_reg(via_i2c_chan-&gt;i2c_port, VIASR, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int viafb_i2c_readbyte(u8 slave_addr, u8 index, u8 *pdata)</div><div class='add'>+{</div><div class='add'>+	u8 mm1[] = {0x00};</div><div class='add'>+	struct i2c_msg msgs[2];</div><div class='add'>+</div><div class='add'>+	*pdata = 0;</div><div class='add'>+	msgs[0].flags = 0;</div><div class='add'>+	msgs[1].flags = I2C_M_RD;</div><div class='add'>+	msgs[0].addr = msgs[1].addr = slave_addr / 2;</div><div class='add'>+	mm1[0] = index;</div><div class='add'>+	msgs[0].len = 1; msgs[1].len = 1;</div><div class='add'>+	msgs[0].buf = mm1; msgs[1].buf = pdata;</div><div class='add'>+	i2c_transfer(&amp;viaparinfo-&gt;i2c_stuff.adapter, msgs, 2);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int viafb_i2c_writebyte(u8 slave_addr, u8 index, u8 data)</div><div class='add'>+{</div><div class='add'>+	u8 msg[2] = { index, data };</div><div class='add'>+	struct i2c_msg msgs;</div><div class='add'>+</div><div class='add'>+	msgs.flags = 0;</div><div class='add'>+	msgs.addr = slave_addr / 2;</div><div class='add'>+	msgs.len = 2;</div><div class='add'>+	msgs.buf = msg;</div><div class='add'>+	return i2c_transfer(&amp;viaparinfo-&gt;i2c_stuff.adapter, &amp;msgs, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int viafb_i2c_readbytes(u8 slave_addr, u8 index, u8 *buff, int buff_len)</div><div class='add'>+{</div><div class='add'>+	u8 mm1[] = {0x00};</div><div class='add'>+	struct i2c_msg msgs[2];</div><div class='add'>+</div><div class='add'>+	msgs[0].flags = 0;</div><div class='add'>+	msgs[1].flags = I2C_M_RD;</div><div class='add'>+	msgs[0].addr = msgs[1].addr = slave_addr / 2;</div><div class='add'>+	mm1[0] = index;</div><div class='add'>+	msgs[0].len = 1; msgs[1].len = buff_len;</div><div class='add'>+	msgs[0].buf = mm1; msgs[1].buf = buff;</div><div class='add'>+	i2c_transfer(&amp;viaparinfo-&gt;i2c_stuff.adapter, msgs, 2);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int viafb_create_i2c_bus(void *viapar)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct viafb_par *par = (struct viafb_par *)viapar;</div><div class='add'>+</div><div class='add'>+	strcpy(par-&gt;i2c_stuff.adapter.name, "via_i2c");</div><div class='add'>+	par-&gt;i2c_stuff.i2c_port = 0x0;</div><div class='add'>+	par-&gt;i2c_stuff.adapter.owner = THIS_MODULE;</div><div class='add'>+	par-&gt;i2c_stuff.adapter.id = 0x01FFFF;</div><div class='add'>+	par-&gt;i2c_stuff.adapter.class = 0;</div><div class='add'>+	par-&gt;i2c_stuff.adapter.algo_data = &amp;par-&gt;i2c_stuff.algo;</div><div class='add'>+	par-&gt;i2c_stuff.adapter.dev.parent = NULL;</div><div class='add'>+	par-&gt;i2c_stuff.algo.setsda = via_i2c_setsda;</div><div class='add'>+	par-&gt;i2c_stuff.algo.setscl = via_i2c_setscl;</div><div class='add'>+	par-&gt;i2c_stuff.algo.getsda = via_i2c_getsda;</div><div class='add'>+	par-&gt;i2c_stuff.algo.getscl = via_i2c_getscl;</div><div class='add'>+	par-&gt;i2c_stuff.algo.udelay = 40;</div><div class='add'>+	par-&gt;i2c_stuff.algo.timeout = 20;</div><div class='add'>+	par-&gt;i2c_stuff.algo.data = &amp;par-&gt;i2c_stuff;</div><div class='add'>+</div><div class='add'>+	i2c_set_adapdata(&amp;par-&gt;i2c_stuff.adapter, &amp;par-&gt;i2c_stuff);</div><div class='add'>+</div><div class='add'>+	/* Raise SCL and SDA */</div><div class='add'>+	par-&gt;i2c_stuff.i2c_port = I2CPORTINDEX;</div><div class='add'>+	via_i2c_setsda(&amp;par-&gt;i2c_stuff, 1);</div><div class='add'>+	via_i2c_setscl(&amp;par-&gt;i2c_stuff, 1);</div><div class='add'>+</div><div class='add'>+	par-&gt;i2c_stuff.i2c_port = GPIOPORTINDEX;</div><div class='add'>+	via_i2c_setsda(&amp;par-&gt;i2c_stuff, 1);</div><div class='add'>+	via_i2c_setscl(&amp;par-&gt;i2c_stuff, 1);</div><div class='add'>+	udelay(20);</div><div class='add'>+</div><div class='add'>+	ret = i2c_bit_add_bus(&amp;par-&gt;i2c_stuff.adapter);</div><div class='add'>+	if (ret == 0)</div><div class='add'>+		DEBUG_MSG("I2C bus %s registered.\n",</div><div class='add'>+		par-&gt;i2c_stuff.adapter.name);</div><div class='add'>+	else</div><div class='add'>+		DEBUG_MSG("Failed to register I2C bus %s.\n",</div><div class='add'>+			par-&gt;i2c_stuff.adapter.name);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void viafb_delete_i2c_buss(void *par)</div><div class='add'>+{</div><div class='add'>+	i2c_del_adapter(&amp;((struct viafb_par *)par)-&gt;i2c_stuff.adapter);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/video/via/via_i2c.h b/drivers/video/via/via_i2c.h<br/>new file mode 100644<br/>index 000000000000..3a13242a3152<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/via/via_i2c.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/via/via_i2c.h</a></div><div class='hunk'>@@ -0,0 +1,46 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.</div><div class='add'>+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.</div><div class='add'>+</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public</div><div class='add'>+ * License as published by the Free Software Foundation;</div><div class='add'>+ * either version 2, or (at your option) any later version.</div><div class='add'>+</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even</div><div class='add'>+ * the implied warranty of MERCHANTABILITY or FITNESS FOR</div><div class='add'>+ * A PARTICULAR PURPOSE.See the GNU General Public License</div><div class='add'>+ * for more details.</div><div class='add'>+</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc.,</div><div class='add'>+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='add'>+ */</div><div class='add'>+#ifndef __VIA_I2C_H__</div><div class='add'>+#define __VIA_I2C_H__</div><div class='add'>+</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/i2c-algo-bit.h&gt;</div><div class='add'>+</div><div class='add'>+struct via_i2c_stuff {</div><div class='add'>+	u16 i2c_port;			/* GPIO or I2C port */</div><div class='add'>+	struct i2c_adapter adapter;</div><div class='add'>+	struct i2c_algo_bit_data algo;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define I2CPORT           0x3c4</div><div class='add'>+#define I2CPORTINDEX      0x31</div><div class='add'>+#define GPIOPORT          0x3C4</div><div class='add'>+#define GPIOPORTINDEX     0x2C</div><div class='add'>+#define I2C_BUS             1</div><div class='add'>+#define GPIO_BUS            2</div><div class='add'>+#define DELAYPORT           0x3C3</div><div class='add'>+</div><div class='add'>+int viafb_i2c_readbyte(u8 slave_addr, u8 index, u8 *pdata);</div><div class='add'>+int viafb_i2c_writebyte(u8 slave_addr, u8 index, u8 data);</div><div class='add'>+int viafb_i2c_readbytes(u8 slave_addr, u8 index, u8 *buff, int buff_len);</div><div class='add'>+int viafb_create_i2c_bus(void *par);</div><div class='add'>+void viafb_delete_i2c_buss(void *par);</div><div class='add'>+#endif /* __VIA_I2C_H__ */</div><div class='head'>diff --git a/drivers/video/via/via_utility.c b/drivers/video/via/via_utility.c<br/>new file mode 100644<br/>index 000000000000..d53c3d54ed8e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/via/via_utility.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/via/via_utility.c</a></div><div class='hunk'>@@ -0,0 +1,253 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.</div><div class='add'>+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.</div><div class='add'>+</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public</div><div class='add'>+ * License as published by the Free Software Foundation;</div><div class='add'>+ * either version 2, or (at your option) any later version.</div><div class='add'>+</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even</div><div class='add'>+ * the implied warranty of MERCHANTABILITY or FITNESS FOR</div><div class='add'>+ * A PARTICULAR PURPOSE.See the GNU General Public License</div><div class='add'>+ * for more details.</div><div class='add'>+</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc.,</div><div class='add'>+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "global.h"</div><div class='add'>+</div><div class='add'>+void viafb_get_device_support_state(u32 *support_state)</div><div class='add'>+{</div><div class='add'>+	*support_state = CRT_Device;</div><div class='add'>+</div><div class='add'>+	if (viaparinfo-&gt;chip_info-&gt;tmds_chip_info.tmds_chip_name == VT1632_TMDS)</div><div class='add'>+		*support_state |= DVI_Device;</div><div class='add'>+</div><div class='add'>+	if (viaparinfo-&gt;chip_info-&gt;lvds_chip_info.lvds_chip_name == VT1631_LVDS)</div><div class='add'>+		*support_state |= LCD_Device;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void viafb_get_device_connect_state(u32 *connect_state)</div><div class='add'>+{</div><div class='add'>+	bool mobile = false;</div><div class='add'>+</div><div class='add'>+	*connect_state = CRT_Device;</div><div class='add'>+</div><div class='add'>+	if (viafb_dvi_sense())</div><div class='add'>+		*connect_state |= DVI_Device;</div><div class='add'>+</div><div class='add'>+	viafb_lcd_get_mobile_state(&amp;mobile);</div><div class='add'>+	if (mobile)</div><div class='add'>+		*connect_state |= LCD_Device;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool viafb_lcd_get_support_expand_state(u32 xres, u32 yres)</div><div class='add'>+{</div><div class='add'>+	unsigned int support_state = 0;</div><div class='add'>+</div><div class='add'>+	switch (viafb_lcd_panel_id) {</div><div class='add'>+	case LCD_PANEL_ID0_640X480:</div><div class='add'>+		if ((xres &lt; 640) &amp;&amp; (yres &lt; 480))</div><div class='add'>+			support_state = true;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case LCD_PANEL_ID1_800X600:</div><div class='add'>+		if ((xres &lt; 800) &amp;&amp; (yres &lt; 600))</div><div class='add'>+			support_state = true;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case LCD_PANEL_ID2_1024X768:</div><div class='add'>+		if ((xres &lt; 1024) &amp;&amp; (yres &lt; 768))</div><div class='add'>+			support_state = true;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case LCD_PANEL_ID3_1280X768:</div><div class='add'>+		if ((xres &lt; 1280) &amp;&amp; (yres &lt; 768))</div><div class='add'>+			support_state = true;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case LCD_PANEL_ID4_1280X1024:</div><div class='add'>+		if ((xres &lt; 1280) &amp;&amp; (yres &lt; 1024))</div><div class='add'>+			support_state = true;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case LCD_PANEL_ID5_1400X1050:</div><div class='add'>+		if ((xres &lt; 1400) &amp;&amp; (yres &lt; 1050))</div><div class='add'>+			support_state = true;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case LCD_PANEL_ID6_1600X1200:</div><div class='add'>+		if ((xres &lt; 1600) &amp;&amp; (yres &lt; 1200))</div><div class='add'>+			support_state = true;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case LCD_PANEL_ID7_1366X768:</div><div class='add'>+		if ((xres &lt; 1366) &amp;&amp; (yres &lt; 768))</div><div class='add'>+			support_state = true;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case LCD_PANEL_ID8_1024X600:</div><div class='add'>+		if ((xres &lt; 1024) &amp;&amp; (yres &lt; 600))</div><div class='add'>+			support_state = true;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case LCD_PANEL_ID9_1280X800:</div><div class='add'>+		if ((xres &lt; 1280) &amp;&amp; (yres &lt; 800))</div><div class='add'>+			support_state = true;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case LCD_PANEL_IDA_800X480:</div><div class='add'>+		if ((xres &lt; 800) &amp;&amp; (yres &lt; 480))</div><div class='add'>+			support_state = true;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case LCD_PANEL_IDB_1360X768:</div><div class='add'>+		if ((xres &lt; 1360) &amp;&amp; (yres &lt; 768))</div><div class='add'>+			support_state = true;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case LCD_PANEL_IDC_480X640:</div><div class='add'>+		if ((xres &lt; 480) &amp;&amp; (yres &lt; 640))</div><div class='add'>+			support_state = true;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		support_state = false;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return support_state;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*====================================================================*/</div><div class='add'>+/*                      Gamma Function Implementation*/</div><div class='add'>+/*====================================================================*/</div><div class='add'>+</div><div class='add'>+void viafb_set_gamma_table(int bpp, unsigned int *gamma_table)</div><div class='add'>+{</div><div class='add'>+	int i, sr1a;</div><div class='add'>+	int active_device_amount = 0;</div><div class='add'>+	int device_status = viafb_DeviceStatus;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; sizeof(viafb_DeviceStatus) * 8; i++) {</div><div class='add'>+		if (device_status &amp; 1)</div><div class='add'>+			active_device_amount++;</div><div class='add'>+		device_status &gt;&gt;= 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* 8 bpp mode can't adjust gamma */</div><div class='add'>+	if (bpp == 8)</div><div class='add'>+		return ;</div><div class='add'>+</div><div class='add'>+	/* Enable Gamma */</div><div class='add'>+	switch (viaparinfo-&gt;chip_info-&gt;gfx_chip_name) {</div><div class='add'>+	case UNICHROME_CLE266:</div><div class='add'>+	case UNICHROME_K400:</div><div class='add'>+		viafb_write_reg_mask(SR16, VIASR, 0x80, BIT7);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case UNICHROME_K800:</div><div class='add'>+	case UNICHROME_PM800:</div><div class='add'>+	case UNICHROME_CN700:</div><div class='add'>+	case UNICHROME_CX700:</div><div class='add'>+	case UNICHROME_K8M890:</div><div class='add'>+	case UNICHROME_P4M890:</div><div class='add'>+	case UNICHROME_P4M900:</div><div class='add'>+		viafb_write_reg_mask(CR33, VIACR, 0x80, BIT7);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	sr1a = (unsigned int)viafb_read_reg(VIASR, SR1A);</div><div class='add'>+	viafb_write_reg_mask(SR1A, VIASR, 0x0, BIT0);</div><div class='add'>+</div><div class='add'>+	/* Fill IGA1 Gamma Table */</div><div class='add'>+	outb(0, LUT_INDEX_WRITE);</div><div class='add'>+	for (i = 0; i &lt; 256; i++) {</div><div class='add'>+		outb(gamma_table[i] &gt;&gt; 16, LUT_DATA);</div><div class='add'>+		outb(gamma_table[i] &gt;&gt; 8 &amp; 0xFF, LUT_DATA);</div><div class='add'>+		outb(gamma_table[i] &amp; 0xFF, LUT_DATA);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If adjust Gamma value in SAMM, fill IGA1,</div><div class='add'>+	   IGA2 Gamma table simultanous. */</div><div class='add'>+	/* Switch to IGA2 Gamma Table */</div><div class='add'>+	if ((active_device_amount &gt; 1) &amp;&amp;</div><div class='add'>+		!((viaparinfo-&gt;chip_info-&gt;gfx_chip_name ==</div><div class='add'>+		UNICHROME_CLE266) &amp;&amp;</div><div class='add'>+		(viaparinfo-&gt;chip_info-&gt;gfx_chip_revision &lt; 15))) {</div><div class='add'>+		viafb_write_reg_mask(SR1A, VIASR, 0x01, BIT0);</div><div class='add'>+		viafb_write_reg_mask(CR6A, VIACR, 0x02, BIT1);</div><div class='add'>+</div><div class='add'>+		/* Fill IGA2 Gamma Table */</div><div class='add'>+		outb(0, LUT_INDEX_WRITE);</div><div class='add'>+		for (i = 0; i &lt; 256; i++) {</div><div class='add'>+			outb(gamma_table[i] &gt;&gt; 16, LUT_DATA);</div><div class='add'>+			outb(gamma_table[i] &gt;&gt; 8 &amp; 0xFF, LUT_DATA);</div><div class='add'>+			outb(gamma_table[i] &amp; 0xFF, LUT_DATA);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	viafb_write_reg(SR1A, VIASR, sr1a);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void viafb_get_gamma_table(unsigned int *gamma_table)</div><div class='add'>+{</div><div class='add'>+	unsigned char color_r, color_g, color_b;</div><div class='add'>+	unsigned char sr1a = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* Enable Gamma */</div><div class='add'>+	switch (viaparinfo-&gt;chip_info-&gt;gfx_chip_name) {</div><div class='add'>+	case UNICHROME_CLE266:</div><div class='add'>+	case UNICHROME_K400:</div><div class='add'>+		viafb_write_reg_mask(SR16, VIASR, 0x80, BIT7);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case UNICHROME_K800:</div><div class='add'>+	case UNICHROME_PM800:</div><div class='add'>+	case UNICHROME_CN700:</div><div class='add'>+	case UNICHROME_CX700:</div><div class='add'>+	case UNICHROME_K8M890:</div><div class='add'>+	case UNICHROME_P4M890:</div><div class='add'>+	case UNICHROME_P4M900:</div><div class='add'>+		viafb_write_reg_mask(CR33, VIACR, 0x80, BIT7);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	sr1a = viafb_read_reg(VIASR, SR1A);</div><div class='add'>+	viafb_write_reg_mask(SR1A, VIASR, 0x0, BIT0);</div><div class='add'>+</div><div class='add'>+	/* Reading gamma table to get color value */</div><div class='add'>+	outb(0, LUT_INDEX_READ);</div><div class='add'>+	for (i = 0; i &lt; 256; i++) {</div><div class='add'>+		color_r = inb(LUT_DATA);</div><div class='add'>+		color_g = inb(LUT_DATA);</div><div class='add'>+		color_b = inb(LUT_DATA);</div><div class='add'>+		gamma_table[i] =</div><div class='add'>+		    ((((u32) color_r) &lt;&lt; 16) |</div><div class='add'>+		     (((u16) color_g) &lt;&lt; 8)) | color_b;</div><div class='add'>+	}</div><div class='add'>+	viafb_write_reg(SR1A, VIASR, sr1a);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void viafb_get_gamma_support_state(int bpp, unsigned int *support_state)</div><div class='add'>+{</div><div class='add'>+	if (bpp == 8)</div><div class='add'>+		*support_state = None_Device;</div><div class='add'>+	else</div><div class='add'>+		*support_state = CRT_Device | DVI_Device | LCD_Device;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int viafb_input_parameter_converter(int parameter_value)</div><div class='add'>+{</div><div class='add'>+	int result;</div><div class='add'>+</div><div class='add'>+	if (parameter_value &gt;= 1 &amp;&amp; parameter_value &lt;= 9)</div><div class='add'>+		result = 1 &lt;&lt; (parameter_value - 1);</div><div class='add'>+	else</div><div class='add'>+		result = 1;</div><div class='add'>+</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/video/via/via_utility.h b/drivers/video/via/via_utility.h<br/>new file mode 100644<br/>index 000000000000..2fd455202ebd<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/via/via_utility.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/via/via_utility.h</a></div><div class='hunk'>@@ -0,0 +1,35 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.</div><div class='add'>+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.</div><div class='add'>+</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public</div><div class='add'>+ * License as published by the Free Software Foundation;</div><div class='add'>+ * either version 2, or (at your option) any later version.</div><div class='add'>+</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even</div><div class='add'>+ * the implied warranty of MERCHANTABILITY or FITNESS FOR</div><div class='add'>+ * A PARTICULAR PURPOSE.See the GNU General Public License</div><div class='add'>+ * for more details.</div><div class='add'>+</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc.,</div><div class='add'>+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='add'>+ */</div><div class='add'>+#ifndef __VIAUTILITY_H__</div><div class='add'>+#define __VIAUTILITY_H__</div><div class='add'>+</div><div class='add'>+/* These functions are used to get infomation about device's state */</div><div class='add'>+void viafb_get_device_support_state(u32 *support_state);</div><div class='add'>+void viafb_get_device_connect_state(u32 *connect_state);</div><div class='add'>+bool viafb_lcd_get_support_expand_state(u32 xres, u32 yres);</div><div class='add'>+</div><div class='add'>+/* These function are used to access gamma table */</div><div class='add'>+void viafb_set_gamma_table(int bpp, unsigned int *gamma_table);</div><div class='add'>+void viafb_get_gamma_table(unsigned int *gamma_table);</div><div class='add'>+void viafb_get_gamma_support_state(int bpp, unsigned int *support_state);</div><div class='add'>+int viafb_input_parameter_converter(int parameter_value);</div><div class='add'>+</div><div class='add'>+#endif /* __VIAUTILITY_H__ */</div><div class='head'>diff --git a/drivers/video/via/viafbdev.c b/drivers/video/via/viafbdev.c<br/>new file mode 100644<br/>index 000000000000..0132eae06f55<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/via/viafbdev.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/via/viafbdev.c</a></div><div class='hunk'>@@ -0,0 +1,2571 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.</div><div class='add'>+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.</div><div class='add'>+</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public</div><div class='add'>+ * License as published by the Free Software Foundation;</div><div class='add'>+ * either version 2, or (at your option) any later version.</div><div class='add'>+</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even</div><div class='add'>+ * the implied warranty of MERCHANTABILITY or FITNESS FOR</div><div class='add'>+ * A PARTICULAR PURPOSE.See the GNU General Public License</div><div class='add'>+ * for more details.</div><div class='add'>+</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc.,</div><div class='add'>+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#define _MASTER_FILE</div><div class='add'>+</div><div class='add'>+#include "global.h"</div><div class='add'>+</div><div class='add'>+static int MAX_CURS = 32;</div><div class='add'>+static struct fb_var_screeninfo default_var;</div><div class='add'>+static char *viafb_name = "Via";</div><div class='add'>+static u32 pseudo_pal[17];</div><div class='add'>+</div><div class='add'>+/* video mode */</div><div class='add'>+static char *viafb_mode = "640x480";</div><div class='add'>+static char *viafb_mode1 = "640x480";</div><div class='add'>+static int viafb_resMode = VIA_RES_640X480;</div><div class='add'>+</div><div class='add'>+/* Added for specifying active devices.*/</div><div class='add'>+char *viafb_active_dev = "";</div><div class='add'>+</div><div class='add'>+/* Added for specifying video on devices.*/</div><div class='add'>+char *viafb_video_dev = "";</div><div class='add'>+</div><div class='add'>+/*Added for specify lcd output port*/</div><div class='add'>+char *viafb_lcd_port = "";</div><div class='add'>+char *viafb_dvi_port = "";</div><div class='add'>+</div><div class='add'>+static void viafb_set_device(struct device_t active_dev);</div><div class='add'>+static int apply_device_setting(struct viafb_ioctl_setting setting_info,</div><div class='add'>+			 struct fb_info *info);</div><div class='add'>+static void apply_second_mode_setting(struct fb_var_screeninfo</div><div class='add'>+	*sec_var);</div><div class='add'>+static void retrieve_device_setting(struct viafb_ioctl_setting</div><div class='add'>+	*setting_info);</div><div class='add'>+static void viafb_set_video_device(u32 video_dev_info);</div><div class='add'>+static void viafb_get_video_device(u32 *video_dev_info);</div><div class='add'>+</div><div class='add'>+/* Mode information */</div><div class='add'>+static const struct viafb_modeinfo viafb_modentry[] = {</div><div class='add'>+	{480, 640, VIA_RES_480X640, "480x640"},</div><div class='add'>+	{640, 480, VIA_RES_640X480, "640x480"},</div><div class='add'>+	{800, 480, VIA_RES_800X480, "800x480"},</div><div class='add'>+	{800, 600, VIA_RES_800X600, "800x600"},</div><div class='add'>+	{1024, 768, VIA_RES_1024X768, "1024x768"},</div><div class='add'>+	{1152, 864, VIA_RES_1152X864, "1152x864"},</div><div class='add'>+	{1280, 1024, VIA_RES_1280X1024, "1280x1024"},</div><div class='add'>+	{1600, 1200, VIA_RES_1600X1200, "1600x1200"},</div><div class='add'>+	{1440, 1050, VIA_RES_1440X1050, "1440x1050"},</div><div class='add'>+	{1280, 768, VIA_RES_1280X768, "1280x768"},</div><div class='add'>+	{1280, 800, VIA_RES_1280X800, "1280x800"},</div><div class='add'>+	{1280, 960, VIA_RES_1280X960, "1280x960"},</div><div class='add'>+	{1920, 1440, VIA_RES_1920X1440, "1920x1440"},</div><div class='add'>+	{848, 480, VIA_RES_848X480, "848x480"},</div><div class='add'>+	{1400, 1050, VIA_RES_1400X1050, "1400x1050"},</div><div class='add'>+	{720, 480, VIA_RES_720X480, "720x480"},</div><div class='add'>+	{720, 576, VIA_RES_720X576, "720x576"},</div><div class='add'>+	{1024, 512, VIA_RES_1024X512, "1024x512"},</div><div class='add'>+	{1024, 576, VIA_RES_1024X576, "1024x576"},</div><div class='add'>+	{1024, 600, VIA_RES_1024X600, "1024x600"},</div><div class='add'>+	{1280, 720, VIA_RES_1280X720, "1280x720"},</div><div class='add'>+	{1920, 1080, VIA_RES_1920X1080, "1920x1080"},</div><div class='add'>+	{1366, 768, VIA_RES_1368X768, "1368x768"},</div><div class='add'>+	{1680, 1050, VIA_RES_1680X1050, "1680x1050"},</div><div class='add'>+	{960, 600, VIA_RES_960X600, "960x600"},</div><div class='add'>+	{1000, 600, VIA_RES_1000X600, "1000x600"},</div><div class='add'>+	{1024, 576, VIA_RES_1024X576, "1024x576"},</div><div class='add'>+	{1024, 600, VIA_RES_1024X600, "1024x600"},</div><div class='add'>+	{1088, 612, VIA_RES_1088X612, "1088x612"},</div><div class='add'>+	{1152, 720, VIA_RES_1152X720, "1152x720"},</div><div class='add'>+	{1200, 720, VIA_RES_1200X720, "1200x720"},</div><div class='add'>+	{1280, 600, VIA_RES_1280X600, "1280x600"},</div><div class='add'>+	{1360, 768, VIA_RES_1360X768, "1360x768"},</div><div class='add'>+	{1440, 900, VIA_RES_1440X900, "1440x900"},</div><div class='add'>+	{1600, 900, VIA_RES_1600X900, "1600x900"},</div><div class='add'>+	{1600, 1024, VIA_RES_1600X1024, "1600x1024"},</div><div class='add'>+	{1792, 1344, VIA_RES_1792X1344, "1792x1344"},</div><div class='add'>+	{1856, 1392, VIA_RES_1856X1392, "1856x1392"},</div><div class='add'>+	{1920, 1200, VIA_RES_1920X1200, "1920x1200"},</div><div class='add'>+	{2048, 1536, VIA_RES_2048X1536, "2048x1536"},</div><div class='add'>+	{0, 0, VIA_RES_INVALID, "640x480"}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct fb_ops viafb_ops;</div><div class='add'>+</div><div class='add'>+static int viafb_update_fix(struct fb_fix_screeninfo *fix, struct fb_info *info)</div><div class='add'>+{</div><div class='add'>+	struct viafb_par *ppar;</div><div class='add'>+	ppar = info-&gt;par;</div><div class='add'>+</div><div class='add'>+	DEBUG_MSG(KERN_INFO "viafb_update_fix!\n");</div><div class='add'>+</div><div class='add'>+	fix-&gt;visual =</div><div class='add'>+	    ppar-&gt;bpp == 8 ? FB_VISUAL_PSEUDOCOLOR : FB_VISUAL_TRUECOLOR;</div><div class='add'>+	fix-&gt;line_length = ppar-&gt;linelength;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void viafb_setup_fixinfo(struct fb_fix_screeninfo *fix,</div><div class='add'>+	struct viafb_par *viaparinfo)</div><div class='add'>+{</div><div class='add'>+	memset(fix, 0, sizeof(struct fb_fix_screeninfo));</div><div class='add'>+	strcpy(fix-&gt;id, viafb_name);</div><div class='add'>+</div><div class='add'>+	fix-&gt;smem_start = viaparinfo-&gt;fbmem;</div><div class='add'>+	fix-&gt;smem_len = viaparinfo-&gt;fbmem_free;</div><div class='add'>+	fix-&gt;mmio_start = viaparinfo-&gt;mmio_base;</div><div class='add'>+	fix-&gt;mmio_len = viaparinfo-&gt;mmio_len;</div><div class='add'>+</div><div class='add'>+	fix-&gt;type = FB_TYPE_PACKED_PIXELS;</div><div class='add'>+	fix-&gt;type_aux = 0;</div><div class='add'>+</div><div class='add'>+	fix-&gt;xpanstep = fix-&gt;ywrapstep = 0;</div><div class='add'>+	fix-&gt;ypanstep = 1;</div><div class='add'>+</div><div class='add'>+	/* Just tell the accel name */</div><div class='add'>+	viafbinfo-&gt;fix.accel = FB_ACCEL_VIA_UNICHROME;</div><div class='add'>+}</div><div class='add'>+static int viafb_open(struct fb_info *info, int user)</div><div class='add'>+{</div><div class='add'>+	DEBUG_MSG(KERN_INFO "viafb_open!\n");</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int viafb_release(struct fb_info *info, int user)</div><div class='add'>+{</div><div class='add'>+	DEBUG_MSG(KERN_INFO "viafb_release!\n");</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void viafb_update_viafb_par(struct fb_info *info)</div><div class='add'>+{</div><div class='add'>+	struct viafb_par *ppar;</div><div class='add'>+</div><div class='add'>+	ppar = info-&gt;par;</div><div class='add'>+	ppar-&gt;bpp = info-&gt;var.bits_per_pixel;</div><div class='add'>+	ppar-&gt;linelength = ((info-&gt;var.xres_virtual + 7) &amp; ~7) * ppar-&gt;bpp / 8;</div><div class='add'>+	ppar-&gt;hres = info-&gt;var.xres;</div><div class='add'>+	ppar-&gt;vres = info-&gt;var.yres;</div><div class='add'>+	ppar-&gt;xoffset = info-&gt;var.xoffset;</div><div class='add'>+	ppar-&gt;yoffset = info-&gt;var.yoffset;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int viafb_check_var(struct fb_var_screeninfo *var,</div><div class='add'>+	struct fb_info *info)</div><div class='add'>+{</div><div class='add'>+	int vmode_index, htotal, vtotal;</div><div class='add'>+	struct viafb_par *ppar;</div><div class='add'>+	u32 long_refresh;</div><div class='add'>+	struct viafb_par *p_viafb_par;</div><div class='add'>+	ppar = info-&gt;par;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	DEBUG_MSG(KERN_INFO "viafb_check_var!\n");</div><div class='add'>+	/* Sanity check */</div><div class='add'>+	/* HW neither support interlacte nor double-scaned mode */</div><div class='add'>+	if (var-&gt;vmode &amp; FB_VMODE_INTERLACED || var-&gt;vmode &amp; FB_VMODE_DOUBLE)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	vmode_index = viafb_get_mode_index(var-&gt;xres, var-&gt;yres, 0);</div><div class='add'>+	if (vmode_index == VIA_RES_INVALID) {</div><div class='add'>+		DEBUG_MSG(KERN_INFO</div><div class='add'>+			  "viafb: Mode %dx%dx%d not supported!!\n",</div><div class='add'>+			  var-&gt;xres, var-&gt;yres, var-&gt;bits_per_pixel);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (24 == var-&gt;bits_per_pixel)</div><div class='add'>+		var-&gt;bits_per_pixel = 32;</div><div class='add'>+</div><div class='add'>+	if (var-&gt;bits_per_pixel != 8 &amp;&amp; var-&gt;bits_per_pixel != 16 &amp;&amp;</div><div class='add'>+		var-&gt;bits_per_pixel != 32)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if ((var-&gt;xres_virtual * (var-&gt;bits_per_pixel &gt;&gt; 3)) &amp; 0x1F)</div><div class='add'>+		/*32 pixel alignment */</div><div class='add'>+		var-&gt;xres_virtual = (var-&gt;xres_virtual + 31) &amp; ~31;</div><div class='add'>+	if (var-&gt;xres_virtual * var-&gt;yres_virtual * var-&gt;bits_per_pixel / 8 &gt;</div><div class='add'>+		ppar-&gt;memsize)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Based on var passed in to calculate the refresh,</div><div class='add'>+	 * because our driver use some modes special.</div><div class='add'>+	 */</div><div class='add'>+	htotal = var-&gt;xres + var-&gt;left_margin +</div><div class='add'>+	var-&gt;right_margin + var-&gt;hsync_len;</div><div class='add'>+	vtotal = var-&gt;yres + var-&gt;upper_margin +</div><div class='add'>+		var-&gt;lower_margin + var-&gt;vsync_len;</div><div class='add'>+	long_refresh = 1000000000UL / var-&gt;pixclock * 1000;</div><div class='add'>+	long_refresh /= (htotal * vtotal);</div><div class='add'>+</div><div class='add'>+	viafb_refresh = viafb_get_refresh(var-&gt;xres, var-&gt;yres, long_refresh);</div><div class='add'>+</div><div class='add'>+	/* Adjust var according to our driver's own table */</div><div class='add'>+	viafb_fill_var_timing_info(var, viafb_refresh, vmode_index);</div><div class='add'>+</div><div class='add'>+	/* This is indeed a patch for VT3353 */</div><div class='add'>+	if (!info-&gt;par)</div><div class='add'>+		return -1;</div><div class='add'>+	p_viafb_par = (struct viafb_par *)info-&gt;par;</div><div class='add'>+	if (p_viafb_par-&gt;chip_info-&gt;gfx_chip_name == UNICHROME_VX800)</div><div class='add'>+		var-&gt;accel_flags = 0;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int viafb_set_par(struct fb_info *info)</div><div class='add'>+{</div><div class='add'>+	int vmode_index;</div><div class='add'>+	int vmode_index1 = 0;</div><div class='add'>+	DEBUG_MSG(KERN_INFO "viafb_set_par!\n");</div><div class='add'>+</div><div class='add'>+	viafb_update_device_setting(info-&gt;var.xres, info-&gt;var.yres,</div><div class='add'>+			      info-&gt;var.bits_per_pixel, viafb_refresh, 0);</div><div class='add'>+</div><div class='add'>+	vmode_index = viafb_get_mode_index(info-&gt;var.xres, info-&gt;var.yres, 0);</div><div class='add'>+</div><div class='add'>+	if (viafb_SAMM_ON == 1) {</div><div class='add'>+		DEBUG_MSG(KERN_INFO</div><div class='add'>+		"viafb_second_xres = %d, viafb_second_yres = %d, bpp = %d\n",</div><div class='add'>+			  viafb_second_xres, viafb_second_yres, viafb_bpp1);</div><div class='add'>+		vmode_index1 = viafb_get_mode_index(viafb_second_xres,</div><div class='add'>+			viafb_second_yres, 1);</div><div class='add'>+		DEBUG_MSG(KERN_INFO "-&gt;viafb_SAMM_ON: index=%d\n",</div><div class='add'>+			vmode_index1);</div><div class='add'>+</div><div class='add'>+		viafb_update_device_setting(viafb_second_xres,</div><div class='add'>+			viafb_second_yres, viafb_bpp1, viafb_refresh1, 1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (vmode_index != VIA_RES_INVALID) {</div><div class='add'>+		viafb_setmode(vmode_index, info-&gt;var.xres, info-&gt;var.yres,</div><div class='add'>+			info-&gt;var.bits_per_pixel, vmode_index1,</div><div class='add'>+			viafb_second_xres, viafb_second_yres, viafb_bpp1);</div><div class='add'>+</div><div class='add'>+		/*We should set memory offset according virtual_x */</div><div class='add'>+		/*Fix me:put this function into viafb_setmode */</div><div class='add'>+		viafb_memory_pitch_patch(info);</div><div class='add'>+</div><div class='add'>+		/* Update ***fb_par information */</div><div class='add'>+		viafb_update_viafb_par(info);</div><div class='add'>+</div><div class='add'>+		/* Update other fixed information */</div><div class='add'>+		viafb_update_fix(&amp;info-&gt;fix, info);</div><div class='add'>+		viafb_bpp = info-&gt;var.bits_per_pixel;</div><div class='add'>+		/* Update viafb_accel, it is necessary to our 2D accelerate */</div><div class='add'>+		viafb_accel = info-&gt;var.accel_flags;</div><div class='add'>+</div><div class='add'>+		if (viafb_accel)</div><div class='add'>+			viafb_set_2d_color_depth(info-&gt;var.bits_per_pixel);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Set one color register */</div><div class='add'>+static int viafb_setcolreg(unsigned regno, unsigned red, unsigned green,</div><div class='add'>+unsigned blue, unsigned transp, struct fb_info *info)</div><div class='add'>+{</div><div class='add'>+	u8 sr1a, sr1b, cr67, cr6a, rev = 0, shift = 10;</div><div class='add'>+	unsigned cmap_entries = (info-&gt;var.bits_per_pixel == 8) ? 256 : 16;</div><div class='add'>+	DEBUG_MSG(KERN_INFO "viafb_setcolreg!\n");</div><div class='add'>+	if (regno &gt;= cmap_entries)</div><div class='add'>+		return 1;</div><div class='add'>+	if (UNICHROME_CLE266 == viaparinfo-&gt;chip_info-&gt;gfx_chip_name) {</div><div class='add'>+		/*</div><div class='add'>+		 * Read PCI bus 0,dev 0,function 0,index 0xF6 to get chip rev.</div><div class='add'>+		 */</div><div class='add'>+		outl(0x80000000 | (0xf6 &amp; ~3), (unsigned long)0xCF8);</div><div class='add'>+		rev = (inl((unsigned long)0xCFC) &gt;&gt; ((0xf6 &amp; 3) * 8)) &amp; 0xff;</div><div class='add'>+	}</div><div class='add'>+	switch (info-&gt;var.bits_per_pixel) {</div><div class='add'>+	case 8:</div><div class='add'>+		outb(0x1A, 0x3C4);</div><div class='add'>+		sr1a = inb(0x3C5);</div><div class='add'>+		outb(0x1B, 0x3C4);</div><div class='add'>+		sr1b = inb(0x3C5);</div><div class='add'>+		outb(0x67, 0x3D4);</div><div class='add'>+		cr67 = inb(0x3D5);</div><div class='add'>+		outb(0x6A, 0x3D4);</div><div class='add'>+		cr6a = inb(0x3D5);</div><div class='add'>+</div><div class='add'>+		/* Map the 3C6/7/8/9 to the IGA2 */</div><div class='add'>+		outb(0x1A, 0x3C4);</div><div class='add'>+		outb(sr1a | 0x01, 0x3C5);</div><div class='add'>+		/* Second Display Engine colck always on */</div><div class='add'>+		outb(0x1B, 0x3C4);</div><div class='add'>+		outb(sr1b | 0x80, 0x3C5);</div><div class='add'>+		/* Second Display Color Depth 8 */</div><div class='add'>+		outb(0x67, 0x3D4);</div><div class='add'>+		outb(cr67 &amp; 0x3F, 0x3D5);</div><div class='add'>+		outb(0x6A, 0x3D4);</div><div class='add'>+		/* Second Display Channel Reset CR6A[6]) */</div><div class='add'>+		outb(cr6a &amp; 0xBF, 0x3D5);</div><div class='add'>+		/* Second Display Channel Enable CR6A[7] */</div><div class='add'>+		outb(cr6a | 0x80, 0x3D5);</div><div class='add'>+		/* Second Display Channel stop reset) */</div><div class='add'>+		outb(cr6a | 0x40, 0x3D5);</div><div class='add'>+</div><div class='add'>+		/* Bit mask of palette */</div><div class='add'>+		outb(0xFF, 0x3c6);</div><div class='add'>+		/* Write one register of IGA2 */</div><div class='add'>+		outb(regno, 0x3C8);</div><div class='add'>+		if (UNICHROME_CLE266 == viaparinfo-&gt;chip_info-&gt;gfx_chip_name &amp;&amp;</div><div class='add'>+			rev &gt;= 15) {</div><div class='add'>+			shift = 8;</div><div class='add'>+			viafb_write_reg_mask(CR6A, VIACR, BIT5, BIT5);</div><div class='add'>+			viafb_write_reg_mask(SR15, VIASR, BIT7, BIT7);</div><div class='add'>+		} else {</div><div class='add'>+			shift = 10;</div><div class='add'>+			viafb_write_reg_mask(CR6A, VIACR, 0, BIT5);</div><div class='add'>+			viafb_write_reg_mask(SR15, VIASR, 0, BIT7);</div><div class='add'>+		}</div><div class='add'>+		outb(red &gt;&gt; shift, 0x3C9);</div><div class='add'>+		outb(green &gt;&gt; shift, 0x3C9);</div><div class='add'>+		outb(blue &gt;&gt; shift, 0x3C9);</div><div class='add'>+</div><div class='add'>+		/* Map the 3C6/7/8/9 to the IGA1 */</div><div class='add'>+		outb(0x1A, 0x3C4);</div><div class='add'>+		outb(sr1a &amp; 0xFE, 0x3C5);</div><div class='add'>+		/* Bit mask of palette */</div><div class='add'>+		outb(0xFF, 0x3c6);</div><div class='add'>+		/* Write one register of IGA1 */</div><div class='add'>+		outb(regno, 0x3C8);</div><div class='add'>+		outb(red &gt;&gt; shift, 0x3C9);</div><div class='add'>+		outb(green &gt;&gt; shift, 0x3C9);</div><div class='add'>+		outb(blue &gt;&gt; shift, 0x3C9);</div><div class='add'>+</div><div class='add'>+		outb(0x1A, 0x3C4);</div><div class='add'>+		outb(sr1a, 0x3C5);</div><div class='add'>+		outb(0x1B, 0x3C4);</div><div class='add'>+		outb(sr1b, 0x3C5);</div><div class='add'>+		outb(0x67, 0x3D4);</div><div class='add'>+		outb(cr67, 0x3D5);</div><div class='add'>+		outb(0x6A, 0x3D4);</div><div class='add'>+		outb(cr6a, 0x3D5);</div><div class='add'>+		break;</div><div class='add'>+	case 16:</div><div class='add'>+		((u32 *) info-&gt;pseudo_palette)[regno] = (red &amp; 0xF800) |</div><div class='add'>+		    ((green &amp; 0xFC00) &gt;&gt; 5) | ((blue &amp; 0xF800) &gt;&gt; 11);</div><div class='add'>+		break;</div><div class='add'>+	case 32:</div><div class='add'>+		((u32 *) info-&gt;pseudo_palette)[regno] =</div><div class='add'>+		    ((transp &amp; 0xFF00) &lt;&lt; 16) |</div><div class='add'>+		    ((red &amp; 0xFF00) &lt;&lt; 8) |</div><div class='add'>+		    ((green &amp; 0xFF00)) | ((blue &amp; 0xFF00) &gt;&gt; 8);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*CALLED BY: fb_set_cmap */</div><div class='add'>+/*           fb_set_var, pass 256 colors */</div><div class='add'>+/*CALLED BY: fb_set_cmap */</div><div class='add'>+/*           fbcon_set_palette, pass 16 colors */</div><div class='add'>+static int viafb_setcmap(struct fb_cmap *cmap, struct fb_info *info)</div><div class='add'>+{</div><div class='add'>+	u32 len = cmap-&gt;len;</div><div class='add'>+	u32 i;</div><div class='add'>+	u16 *pred = cmap-&gt;red;</div><div class='add'>+	u16 *pgreen = cmap-&gt;green;</div><div class='add'>+	u16 *pblue = cmap-&gt;blue;</div><div class='add'>+	u16 *ptransp = cmap-&gt;transp;</div><div class='add'>+	u8 sr1a, sr1b, cr67, cr6a, rev = 0, shift = 10;</div><div class='add'>+	if (len &gt; 256)</div><div class='add'>+		return 1;</div><div class='add'>+	if (UNICHROME_CLE266 == viaparinfo-&gt;chip_info-&gt;gfx_chip_name) {</div><div class='add'>+		/*</div><div class='add'>+		 * Read PCI bus 0, dev 0, function 0, index 0xF6 to get chip</div><div class='add'>+		 * rev.</div><div class='add'>+		 */</div><div class='add'>+		outl(0x80000000 | (0xf6 &amp; ~3), (unsigned long)0xCF8);</div><div class='add'>+		rev = (inl((unsigned long)0xCFC) &gt;&gt; ((0xf6 &amp; 3) * 8)) &amp; 0xff;</div><div class='add'>+	}</div><div class='add'>+	switch (info-&gt;var.bits_per_pixel) {</div><div class='add'>+	case 8:</div><div class='add'>+		outb(0x1A, 0x3C4);</div><div class='add'>+		sr1a = inb(0x3C5);</div><div class='add'>+		outb(0x1B, 0x3C4);</div><div class='add'>+		sr1b = inb(0x3C5);</div><div class='add'>+		outb(0x67, 0x3D4);</div><div class='add'>+		cr67 = inb(0x3D5);</div><div class='add'>+		outb(0x6A, 0x3D4);</div><div class='add'>+		cr6a = inb(0x3D5);</div><div class='add'>+		/* Map the 3C6/7/8/9 to the IGA2 */</div><div class='add'>+		outb(0x1A, 0x3C4);</div><div class='add'>+		outb(sr1a | 0x01, 0x3C5);</div><div class='add'>+		outb(0x1B, 0x3C4);</div><div class='add'>+		/* Second Display Engine colck always on */</div><div class='add'>+		outb(sr1b | 0x80, 0x3C5);</div><div class='add'>+		outb(0x67, 0x3D4);</div><div class='add'>+		/* Second Display Color Depth 8 */</div><div class='add'>+		outb(cr67 &amp; 0x3F, 0x3D5);</div><div class='add'>+		outb(0x6A, 0x3D4);</div><div class='add'>+		/* Second Display Channel Reset CR6A[6]) */</div><div class='add'>+		outb(cr6a &amp; 0xBF, 0x3D5);</div><div class='add'>+		/* Second Display Channel Enable CR6A[7] */</div><div class='add'>+		outb(cr6a | 0x80, 0x3D5);</div><div class='add'>+		/* Second Display Channel stop reset) */</div><div class='add'>+		outb(cr6a | 0xC0, 0x3D5);</div><div class='add'>+</div><div class='add'>+		/* Bit mask of palette */</div><div class='add'>+		outb(0xFF, 0x3c6);</div><div class='add'>+		outb(0x00, 0x3C8);</div><div class='add'>+		if (UNICHROME_CLE266 == viaparinfo-&gt;chip_info-&gt;gfx_chip_name &amp;&amp;</div><div class='add'>+			rev &gt;= 15) {</div><div class='add'>+			shift = 8;</div><div class='add'>+			viafb_write_reg_mask(CR6A, VIACR, BIT5, BIT5);</div><div class='add'>+			viafb_write_reg_mask(SR15, VIASR, BIT7, BIT7);</div><div class='add'>+		} else {</div><div class='add'>+			shift = 10;</div><div class='add'>+			viafb_write_reg_mask(CR6A, VIACR, 0, BIT5);</div><div class='add'>+			viafb_write_reg_mask(SR15, VIASR, 0, BIT7);</div><div class='add'>+		}</div><div class='add'>+		for (i = 0; i &lt; len; i++) {</div><div class='add'>+			outb((*(pred + i)) &gt;&gt; shift, 0x3C9);</div><div class='add'>+			outb((*(pgreen + i)) &gt;&gt; shift, 0x3C9);</div><div class='add'>+			outb((*(pblue + i)) &gt;&gt; shift, 0x3C9);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		outb(0x1A, 0x3C4);</div><div class='add'>+		/* Map the 3C6/7/8/9 to the IGA1 */</div><div class='add'>+		outb(sr1a &amp; 0xFE, 0x3C5);</div><div class='add'>+		/* Bit mask of palette */</div><div class='add'>+		outb(0xFF, 0x3c6);</div><div class='add'>+		outb(0x00, 0x3C8);</div><div class='add'>+		for (i = 0; i &lt; len; i++) {</div><div class='add'>+			outb((*(pred + i)) &gt;&gt; shift, 0x3C9);</div><div class='add'>+			outb((*(pgreen + i)) &gt;&gt; shift, 0x3C9);</div><div class='add'>+			outb((*(pblue + i)) &gt;&gt; shift, 0x3C9);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		outb(0x1A, 0x3C4);</div><div class='add'>+		outb(sr1a, 0x3C5);</div><div class='add'>+		outb(0x1B, 0x3C4);</div><div class='add'>+		outb(sr1b, 0x3C5);</div><div class='add'>+		outb(0x67, 0x3D4);</div><div class='add'>+		outb(cr67, 0x3D5);</div><div class='add'>+		outb(0x6A, 0x3D4);</div><div class='add'>+		outb(cr6a, 0x3D5);</div><div class='add'>+		break;</div><div class='add'>+	case 16:</div><div class='add'>+		if (len &gt; 17)</div><div class='add'>+			return 0;	/* Because static u32 pseudo_pal[17]; */</div><div class='add'>+		for (i = 0; i &lt; len; i++)</div><div class='add'>+			((u32 *) info-&gt;pseudo_palette)[i] =</div><div class='add'>+			    (*(pred + i) &amp; 0xF800) |</div><div class='add'>+			    ((*(pgreen + i) &amp; 0xFC00) &gt;&gt; 5) |</div><div class='add'>+			    ((*(pblue + i) &amp; 0xF800) &gt;&gt; 11);</div><div class='add'>+		break;</div><div class='add'>+	case 32:</div><div class='add'>+		if (len &gt; 17)</div><div class='add'>+			return 0;</div><div class='add'>+		if (ptransp) {</div><div class='add'>+			for (i = 0; i &lt; len; i++)</div><div class='add'>+				((u32 *) info-&gt;pseudo_palette)[i] =</div><div class='add'>+				    ((*(ptransp + i) &amp; 0xFF00) &lt;&lt; 16) |</div><div class='add'>+				    ((*(pred + i) &amp; 0xFF00) &lt;&lt; 8) |</div><div class='add'>+				    ((*(pgreen + i) &amp; 0xFF00)) |</div><div class='add'>+				    ((*(pblue + i) &amp; 0xFF00) &gt;&gt; 8);</div><div class='add'>+		} else {</div><div class='add'>+			for (i = 0; i &lt; len; i++)</div><div class='add'>+				((u32 *) info-&gt;pseudo_palette)[i] =</div><div class='add'>+				    0x00000000 |</div><div class='add'>+				    ((*(pred + i) &amp; 0xFF00) &lt;&lt; 8) |</div><div class='add'>+				    ((*(pgreen + i) &amp; 0xFF00)) |</div><div class='add'>+				    ((*(pblue + i) &amp; 0xFF00) &gt;&gt; 8);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int viafb_pan_display(struct fb_var_screeninfo *var,</div><div class='add'>+	struct fb_info *info)</div><div class='add'>+{</div><div class='add'>+	unsigned int offset;</div><div class='add'>+</div><div class='add'>+	DEBUG_MSG(KERN_INFO "viafb_pan_display!\n");</div><div class='add'>+</div><div class='add'>+	offset = (var-&gt;xoffset + (var-&gt;yoffset * var-&gt;xres_virtual)) *</div><div class='add'>+	    var-&gt;bits_per_pixel / 16;</div><div class='add'>+</div><div class='add'>+	DEBUG_MSG(KERN_INFO "\nviafb_pan_display,offset =%d ", offset);</div><div class='add'>+</div><div class='add'>+	viafb_write_reg_mask(0x48, 0x3d4, ((offset &gt;&gt; 24) &amp; 0x3), 0x3);</div><div class='add'>+	viafb_write_reg_mask(0x34, 0x3d4, ((offset &gt;&gt; 16) &amp; 0xff), 0xff);</div><div class='add'>+	viafb_write_reg_mask(0x0c, 0x3d4, ((offset &gt;&gt; 8) &amp; 0xff), 0xff);</div><div class='add'>+	viafb_write_reg_mask(0x0d, 0x3d4, (offset &amp; 0xff), 0xff);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int viafb_blank(int blank_mode, struct fb_info *info)</div><div class='add'>+{</div><div class='add'>+	DEBUG_MSG(KERN_INFO "viafb_blank!\n");</div><div class='add'>+	/* clear DPMS setting */</div><div class='add'>+</div><div class='add'>+	switch (blank_mode) {</div><div class='add'>+	case FB_BLANK_UNBLANK:</div><div class='add'>+		/* Screen: On, HSync: On, VSync: On */</div><div class='add'>+		/* control CRT monitor power management */</div><div class='add'>+		viafb_write_reg_mask(CR36, VIACR, 0x00, BIT4 + BIT5);</div><div class='add'>+		break;</div><div class='add'>+	case FB_BLANK_HSYNC_SUSPEND:</div><div class='add'>+		/* Screen: Off, HSync: Off, VSync: On */</div><div class='add'>+		/* control CRT monitor power management */</div><div class='add'>+		viafb_write_reg_mask(CR36, VIACR, 0x10, BIT4 + BIT5);</div><div class='add'>+		break;</div><div class='add'>+	case FB_BLANK_VSYNC_SUSPEND:</div><div class='add'>+		/* Screen: Off, HSync: On, VSync: Off */</div><div class='add'>+		/* control CRT monitor power management */</div><div class='add'>+		viafb_write_reg_mask(CR36, VIACR, 0x20, BIT4 + BIT5);</div><div class='add'>+		break;</div><div class='add'>+	case FB_BLANK_POWERDOWN:</div><div class='add'>+		/* Screen: Off, HSync: Off, VSync: Off */</div><div class='add'>+		/* control CRT monitor power management */</div><div class='add'>+		viafb_write_reg_mask(CR36, VIACR, 0x30, BIT4 + BIT5);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int viafb_ioctl(struct fb_info *info, u_int cmd, u_long arg)</div><div class='add'>+{</div><div class='add'>+	struct viafb_ioctl_mode viamode;</div><div class='add'>+	struct viafb_ioctl_samm viasamm;</div><div class='add'>+	struct viafb_driver_version driver_version;</div><div class='add'>+	struct fb_var_screeninfo sec_var;</div><div class='add'>+	struct _panel_size_pos_info panel_pos_size_para;</div><div class='add'>+	u32 state_info = 0;</div><div class='add'>+	u32 viainfo_size = sizeof(struct viafb_ioctl_info);</div><div class='add'>+	u32 *viafb_gamma_table;</div><div class='add'>+	char driver_name[] = "viafb";</div><div class='add'>+</div><div class='add'>+	u32 __user *argp = (u32 __user *) arg;</div><div class='add'>+	u32 gpu32;</div><div class='add'>+	u32 video_dev_info = 0;</div><div class='add'>+	struct viafb_ioctl_setting viafb_setting = {};</div><div class='add'>+	struct device_t active_dev = {};</div><div class='add'>+</div><div class='add'>+	DEBUG_MSG(KERN_INFO "viafb_ioctl: 0x%X !!\n", cmd);</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case VIAFB_GET_CHIP_INFO:</div><div class='add'>+		if (copy_to_user(argp, viaparinfo-&gt;chip_info,</div><div class='add'>+				sizeof(struct chip_information)))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		break;</div><div class='add'>+	case VIAFB_GET_INFO_SIZE:</div><div class='add'>+		return put_user(viainfo_size, argp);</div><div class='add'>+	case VIAFB_GET_INFO:</div><div class='add'>+		return viafb_ioctl_get_viafb_info(arg);</div><div class='add'>+	case VIAFB_HOTPLUG:</div><div class='add'>+		return put_user(viafb_ioctl_hotplug(info-&gt;var.xres,</div><div class='add'>+					      info-&gt;var.yres,</div><div class='add'>+					      info-&gt;var.bits_per_pixel), argp);</div><div class='add'>+	case VIAFB_SET_HOTPLUG_FLAG:</div><div class='add'>+		if (copy_from_user(&amp;gpu32, argp, sizeof(gpu32)))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		viafb_hotplug = (gpu32) ? 1 : 0;</div><div class='add'>+		break;</div><div class='add'>+	case VIAFB_GET_RESOLUTION:</div><div class='add'>+		viamode.xres = (u32) viafb_hotplug_Xres;</div><div class='add'>+		viamode.yres = (u32) viafb_hotplug_Yres;</div><div class='add'>+		viamode.refresh = (u32) viafb_hotplug_refresh;</div><div class='add'>+		viamode.bpp = (u32) viafb_hotplug_bpp;</div><div class='add'>+		if (viafb_SAMM_ON == 1) {</div><div class='add'>+			viamode.xres_sec = viafb_second_xres;</div><div class='add'>+			viamode.yres_sec = viafb_second_yres;</div><div class='add'>+			viamode.virtual_xres_sec = viafb_second_virtual_xres;</div><div class='add'>+			viamode.virtual_yres_sec = viafb_second_virtual_yres;</div><div class='add'>+			viamode.refresh_sec = viafb_refresh1;</div><div class='add'>+			viamode.bpp_sec = viafb_bpp1;</div><div class='add'>+		} else {</div><div class='add'>+			viamode.xres_sec = 0;</div><div class='add'>+			viamode.yres_sec = 0;</div><div class='add'>+			viamode.virtual_xres_sec = 0;</div><div class='add'>+			viamode.virtual_yres_sec = 0;</div><div class='add'>+			viamode.refresh_sec = 0;</div><div class='add'>+			viamode.bpp_sec = 0;</div><div class='add'>+		}</div><div class='add'>+		if (copy_to_user(argp, &amp;viamode, sizeof(viamode)))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		break;</div><div class='add'>+	case VIAFB_GET_SAMM_INFO:</div><div class='add'>+		viasamm.samm_status = viafb_SAMM_ON;</div><div class='add'>+</div><div class='add'>+		if (viafb_SAMM_ON == 1) {</div><div class='add'>+			if (viafb_dual_fb) {</div><div class='add'>+				viasamm.size_prim = viaparinfo-&gt;fbmem_free;</div><div class='add'>+				viasamm.size_sec = viaparinfo1-&gt;fbmem_free;</div><div class='add'>+			} else {</div><div class='add'>+				if (viafb_second_size) {</div><div class='add'>+					viasamm.size_prim =</div><div class='add'>+					    viaparinfo-&gt;fbmem_free -</div><div class='add'>+					    viafb_second_size * 1024 * 1024;</div><div class='add'>+					viasamm.size_sec =</div><div class='add'>+					    viafb_second_size * 1024 * 1024;</div><div class='add'>+				} else {</div><div class='add'>+					viasamm.size_prim =</div><div class='add'>+					    viaparinfo-&gt;fbmem_free &gt;&gt; 1;</div><div class='add'>+					viasamm.size_sec =</div><div class='add'>+					    (viaparinfo-&gt;fbmem_free &gt;&gt; 1);</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+			viasamm.mem_base = viaparinfo-&gt;fbmem;</div><div class='add'>+			viasamm.offset_sec = viafb_second_offset;</div><div class='add'>+		} else {</div><div class='add'>+			viasamm.size_prim =</div><div class='add'>+			    viaparinfo-&gt;memsize - viaparinfo-&gt;fbmem_used;</div><div class='add'>+			viasamm.size_sec = 0;</div><div class='add'>+			viasamm.mem_base = viaparinfo-&gt;fbmem;</div><div class='add'>+			viasamm.offset_sec = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (copy_to_user(argp, &amp;viasamm, sizeof(viasamm)))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	case VIAFB_TURN_ON_OUTPUT_DEVICE:</div><div class='add'>+		if (copy_from_user(&amp;gpu32, argp, sizeof(gpu32)))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		if (gpu32 &amp; CRT_Device)</div><div class='add'>+			viafb_crt_enable();</div><div class='add'>+		if (gpu32 &amp; DVI_Device)</div><div class='add'>+			viafb_dvi_enable();</div><div class='add'>+		if (gpu32 &amp; LCD_Device)</div><div class='add'>+			viafb_lcd_enable();</div><div class='add'>+		break;</div><div class='add'>+	case VIAFB_TURN_OFF_OUTPUT_DEVICE:</div><div class='add'>+		if (copy_from_user(&amp;gpu32, argp, sizeof(gpu32)))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		if (gpu32 &amp; CRT_Device)</div><div class='add'>+			viafb_crt_disable();</div><div class='add'>+		if (gpu32 &amp; DVI_Device)</div><div class='add'>+			viafb_dvi_disable();</div><div class='add'>+		if (gpu32 &amp; LCD_Device)</div><div class='add'>+			viafb_lcd_disable();</div><div class='add'>+		break;</div><div class='add'>+	case VIAFB_SET_DEVICE:</div><div class='add'>+		if (copy_from_user(&amp;active_dev, (void *)argp,</div><div class='add'>+			sizeof(active_dev)))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		viafb_set_device(active_dev);</div><div class='add'>+		viafb_set_par(info);</div><div class='add'>+		break;</div><div class='add'>+	case VIAFB_GET_DEVICE:</div><div class='add'>+		active_dev.crt = viafb_CRT_ON;</div><div class='add'>+		active_dev.dvi = viafb_DVI_ON;</div><div class='add'>+		active_dev.lcd = viafb_LCD_ON;</div><div class='add'>+		active_dev.samm = viafb_SAMM_ON;</div><div class='add'>+		active_dev.primary_dev = viafb_primary_dev;</div><div class='add'>+</div><div class='add'>+		active_dev.lcd_dsp_cent = viafb_lcd_dsp_method;</div><div class='add'>+		active_dev.lcd_panel_id = viafb_lcd_panel_id;</div><div class='add'>+		active_dev.lcd_mode = viafb_lcd_mode;</div><div class='add'>+</div><div class='add'>+		active_dev.xres = viafb_hotplug_Xres;</div><div class='add'>+		active_dev.yres = viafb_hotplug_Yres;</div><div class='add'>+</div><div class='add'>+		active_dev.xres1 = viafb_second_xres;</div><div class='add'>+		active_dev.yres1 = viafb_second_yres;</div><div class='add'>+</div><div class='add'>+		active_dev.bpp = viafb_bpp;</div><div class='add'>+		active_dev.bpp1 = viafb_bpp1;</div><div class='add'>+		active_dev.refresh = viafb_refresh;</div><div class='add'>+		active_dev.refresh1 = viafb_refresh1;</div><div class='add'>+</div><div class='add'>+		active_dev.epia_dvi = viafb_platform_epia_dvi;</div><div class='add'>+		active_dev.lcd_dual_edge = viafb_device_lcd_dualedge;</div><div class='add'>+		active_dev.bus_width = viafb_bus_width;</div><div class='add'>+</div><div class='add'>+		if (copy_to_user(argp, &amp;active_dev, sizeof(active_dev)))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case VIAFB_GET_DRIVER_VERSION:</div><div class='add'>+		driver_version.iMajorNum = VERSION_MAJOR;</div><div class='add'>+		driver_version.iKernelNum = VERSION_KERNEL;</div><div class='add'>+		driver_version.iOSNum = VERSION_OS;</div><div class='add'>+		driver_version.iMinorNum = VERSION_MINOR;</div><div class='add'>+</div><div class='add'>+		if (copy_to_user(argp, &amp;driver_version,</div><div class='add'>+			sizeof(driver_version)))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case VIAFB_SET_DEVICE_INFO:</div><div class='add'>+		if (copy_from_user(&amp;viafb_setting,</div><div class='add'>+			argp, sizeof(viafb_setting)))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		if (apply_device_setting(viafb_setting, info) &lt; 0)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case VIAFB_SET_SECOND_MODE:</div><div class='add'>+		if (copy_from_user(&amp;sec_var, argp, sizeof(sec_var)))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		apply_second_mode_setting(&amp;sec_var);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case VIAFB_GET_DEVICE_INFO:</div><div class='add'>+</div><div class='add'>+		retrieve_device_setting(&amp;viafb_setting);</div><div class='add'>+</div><div class='add'>+		if (copy_to_user(argp, &amp;viafb_setting, sizeof(viafb_setting)))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case VIAFB_GET_DEVICE_SUPPORT:</div><div class='add'>+		viafb_get_device_support_state(&amp;state_info);</div><div class='add'>+		if (put_user(state_info, argp))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case VIAFB_GET_DEVICE_CONNECT:</div><div class='add'>+		viafb_get_device_connect_state(&amp;state_info);</div><div class='add'>+		if (put_user(state_info, argp))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case VIAFB_GET_PANEL_SUPPORT_EXPAND:</div><div class='add'>+		state_info =</div><div class='add'>+		    viafb_lcd_get_support_expand_state(info-&gt;var.xres,</div><div class='add'>+						 info-&gt;var.yres);</div><div class='add'>+		if (put_user(state_info, argp))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case VIAFB_GET_DRIVER_NAME:</div><div class='add'>+		if (copy_to_user(argp, driver_name, sizeof(driver_name)))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case VIAFB_SET_GAMMA_LUT:</div><div class='add'>+		viafb_gamma_table = kmalloc(256 * sizeof(u32), GFP_KERNEL);</div><div class='add'>+		if (!viafb_gamma_table)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		if (copy_from_user(viafb_gamma_table, argp,</div><div class='add'>+				sizeof(viafb_gamma_table))) {</div><div class='add'>+			kfree(viafb_gamma_table);</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		}</div><div class='add'>+		viafb_set_gamma_table(viafb_bpp, viafb_gamma_table);</div><div class='add'>+		kfree(viafb_gamma_table);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case VIAFB_GET_GAMMA_LUT:</div><div class='add'>+		viafb_gamma_table = kmalloc(256 * sizeof(u32), GFP_KERNEL);</div><div class='add'>+		if (!viafb_gamma_table)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		viafb_get_gamma_table(viafb_gamma_table);</div><div class='add'>+		if (copy_to_user(argp, viafb_gamma_table,</div><div class='add'>+			sizeof(viafb_gamma_table))) {</div><div class='add'>+			kfree(viafb_gamma_table);</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		}</div><div class='add'>+		kfree(viafb_gamma_table);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case VIAFB_GET_GAMMA_SUPPORT_STATE:</div><div class='add'>+		viafb_get_gamma_support_state(viafb_bpp, &amp;state_info);</div><div class='add'>+		if (put_user(state_info, argp))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		break;</div><div class='add'>+	case VIAFB_SET_VIDEO_DEVICE:</div><div class='add'>+		get_user(video_dev_info, argp);</div><div class='add'>+		viafb_set_video_device(video_dev_info);</div><div class='add'>+		break;</div><div class='add'>+	case VIAFB_GET_VIDEO_DEVICE:</div><div class='add'>+		viafb_get_video_device(&amp;video_dev_info);</div><div class='add'>+		if (put_user(video_dev_info, argp))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		break;</div><div class='add'>+	case VIAFB_SYNC_SURFACE:</div><div class='add'>+		DEBUG_MSG(KERN_INFO "lobo VIAFB_SYNC_SURFACE\n");</div><div class='add'>+		break;</div><div class='add'>+	case VIAFB_GET_DRIVER_CAPS:</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case VIAFB_GET_PANEL_MAX_SIZE:</div><div class='add'>+		if (copy_from_user</div><div class='add'>+		    (&amp;panel_pos_size_para, argp, sizeof(panel_pos_size_para)))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		panel_pos_size_para.x = panel_pos_size_para.y = 0;</div><div class='add'>+		if (copy_to_user(argp, &amp;panel_pos_size_para,</div><div class='add'>+		     sizeof(panel_pos_size_para)))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		break;</div><div class='add'>+	case VIAFB_GET_PANEL_MAX_POSITION:</div><div class='add'>+		if (copy_from_user</div><div class='add'>+		    (&amp;panel_pos_size_para, argp, sizeof(panel_pos_size_para)))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		panel_pos_size_para.x = panel_pos_size_para.y = 0;</div><div class='add'>+		if (copy_to_user(argp, &amp;panel_pos_size_para,</div><div class='add'>+		     sizeof(panel_pos_size_para)))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case VIAFB_GET_PANEL_POSITION:</div><div class='add'>+		if (copy_from_user</div><div class='add'>+		    (&amp;panel_pos_size_para, argp, sizeof(panel_pos_size_para)))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		panel_pos_size_para.x = panel_pos_size_para.y = 0;</div><div class='add'>+		if (copy_to_user(argp, &amp;panel_pos_size_para,</div><div class='add'>+		     sizeof(panel_pos_size_para)))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		break;</div><div class='add'>+	case VIAFB_GET_PANEL_SIZE:</div><div class='add'>+		if (copy_from_user</div><div class='add'>+		    (&amp;panel_pos_size_para, argp, sizeof(panel_pos_size_para)))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		panel_pos_size_para.x = panel_pos_size_para.y = 0;</div><div class='add'>+		if (copy_to_user(argp, &amp;panel_pos_size_para,</div><div class='add'>+		     sizeof(panel_pos_size_para)))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case VIAFB_SET_PANEL_POSITION:</div><div class='add'>+		if (copy_from_user</div><div class='add'>+		    (&amp;panel_pos_size_para, argp, sizeof(panel_pos_size_para)))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		break;</div><div class='add'>+	case VIAFB_SET_PANEL_SIZE:</div><div class='add'>+		if (copy_from_user</div><div class='add'>+		    (&amp;panel_pos_size_para, argp, sizeof(panel_pos_size_para)))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void viafb_fillrect(struct fb_info *info,</div><div class='add'>+	const struct fb_fillrect *rect)</div><div class='add'>+{</div><div class='add'>+	u32 col = 0, rop = 0;</div><div class='add'>+	int pitch;</div><div class='add'>+</div><div class='add'>+	if (!viafb_accel)</div><div class='add'>+		return cfb_fillrect(info, rect);</div><div class='add'>+</div><div class='add'>+	if (!rect-&gt;width || !rect-&gt;height)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	switch (rect-&gt;rop) {</div><div class='add'>+	case ROP_XOR:</div><div class='add'>+		rop = 0x5A;</div><div class='add'>+		break;</div><div class='add'>+	case ROP_COPY:</div><div class='add'>+	default:</div><div class='add'>+		rop = 0xF0;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (info-&gt;var.bits_per_pixel) {</div><div class='add'>+	case 8:</div><div class='add'>+		col = rect-&gt;color;</div><div class='add'>+		break;</div><div class='add'>+	case 16:</div><div class='add'>+		col = ((u32 *) (info-&gt;pseudo_palette))[rect-&gt;color];</div><div class='add'>+		break;</div><div class='add'>+	case 32:</div><div class='add'>+		col = ((u32 *) (info-&gt;pseudo_palette))[rect-&gt;color];</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* BitBlt Source Address */</div><div class='add'>+	writel(0x0, viaparinfo-&gt;io_virt + VIA_REG_SRCPOS);</div><div class='add'>+	/* Source Base Address */</div><div class='add'>+	writel(0x0, viaparinfo-&gt;io_virt + VIA_REG_SRCBASE);</div><div class='add'>+	/* Destination Base Address */</div><div class='add'>+	writel(((unsigned long) (info-&gt;screen_base) -</div><div class='add'>+		   (unsigned long) viafb_FB_MM) &gt;&gt; 3,</div><div class='add'>+		   viaparinfo-&gt;io_virt + VIA_REG_DSTBASE);</div><div class='add'>+	/* Pitch */</div><div class='add'>+	pitch = (info-&gt;var.xres_virtual + 7) &amp; ~7;</div><div class='add'>+	writel(VIA_PITCH_ENABLE |</div><div class='add'>+		   (((pitch *</div><div class='add'>+		      info-&gt;var.bits_per_pixel &gt;&gt; 3) &gt;&gt; 3) |</div><div class='add'>+		      (((pitch * info-&gt;</div><div class='add'>+		      var.bits_per_pixel &gt;&gt; 3) &gt;&gt; 3) &lt;&lt; 16)),</div><div class='add'>+		      viaparinfo-&gt;io_virt + VIA_REG_PITCH);</div><div class='add'>+	/* BitBlt Destination Address */</div><div class='add'>+	writel(((rect-&gt;dy &lt;&lt; 16) | rect-&gt;dx),</div><div class='add'>+		viaparinfo-&gt;io_virt + VIA_REG_DSTPOS);</div><div class='add'>+	/* Dimension: width &amp; height */</div><div class='add'>+	writel((((rect-&gt;height - 1) &lt;&lt; 16) | (rect-&gt;width - 1)),</div><div class='add'>+		viaparinfo-&gt;io_virt + VIA_REG_DIMENSION);</div><div class='add'>+	/* Forground color or Destination color */</div><div class='add'>+	writel(col, viaparinfo-&gt;io_virt + VIA_REG_FGCOLOR);</div><div class='add'>+	/* GE Command */</div><div class='add'>+	writel((0x01 | 0x2000 | (rop &lt;&lt; 24)),</div><div class='add'>+		viaparinfo-&gt;io_virt + VIA_REG_GECMD);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void viafb_copyarea(struct fb_info *info,</div><div class='add'>+	const struct fb_copyarea *area)</div><div class='add'>+{</div><div class='add'>+	u32 dy = area-&gt;dy, sy = area-&gt;sy, direction = 0x0;</div><div class='add'>+	u32 sx = area-&gt;sx, dx = area-&gt;dx, width = area-&gt;width;</div><div class='add'>+	int pitch;</div><div class='add'>+</div><div class='add'>+	DEBUG_MSG(KERN_INFO "viafb_copyarea!!\n");</div><div class='add'>+</div><div class='add'>+	if (!viafb_accel)</div><div class='add'>+		return cfb_copyarea(info, area);</div><div class='add'>+</div><div class='add'>+	if (!area-&gt;width || !area-&gt;height)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (sy &lt; dy) {</div><div class='add'>+		dy += area-&gt;height - 1;</div><div class='add'>+		sy += area-&gt;height - 1;</div><div class='add'>+		direction |= 0x4000;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (sx &lt; dx) {</div><div class='add'>+		dx += width - 1;</div><div class='add'>+		sx += width - 1;</div><div class='add'>+		direction |= 0x8000;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Source Base Address */</div><div class='add'>+	writel(((unsigned long) (info-&gt;screen_base) -</div><div class='add'>+		   (unsigned long) viafb_FB_MM) &gt;&gt; 3,</div><div class='add'>+		   viaparinfo-&gt;io_virt + VIA_REG_SRCBASE);</div><div class='add'>+	/* Destination Base Address */</div><div class='add'>+	writel(((unsigned long) (info-&gt;screen_base) -</div><div class='add'>+		   (unsigned long) viafb_FB_MM) &gt;&gt; 3,</div><div class='add'>+		   viaparinfo-&gt;io_virt + VIA_REG_DSTBASE);</div><div class='add'>+	/* Pitch */</div><div class='add'>+	pitch = (info-&gt;var.xres_virtual + 7) &amp; ~7;</div><div class='add'>+	/* VIA_PITCH_ENABLE can be omitted now. */</div><div class='add'>+	writel(VIA_PITCH_ENABLE |</div><div class='add'>+		   (((pitch *</div><div class='add'>+		      info-&gt;var.bits_per_pixel &gt;&gt; 3) &gt;&gt; 3) | (((pitch *</div><div class='add'>+								info-&gt;var.</div><div class='add'>+								bits_per_pixel</div><div class='add'>+								&gt;&gt; 3) &gt;&gt; 3)</div><div class='add'>+							      &lt;&lt; 16)),</div><div class='add'>+				viaparinfo-&gt;io_virt + VIA_REG_PITCH);</div><div class='add'>+	/* BitBlt Source Address */</div><div class='add'>+	writel(((sy &lt;&lt; 16) | sx), viaparinfo-&gt;io_virt + VIA_REG_SRCPOS);</div><div class='add'>+	/* BitBlt Destination Address */</div><div class='add'>+	writel(((dy &lt;&lt; 16) | dx), viaparinfo-&gt;io_virt + VIA_REG_DSTPOS);</div><div class='add'>+	/* Dimension: width &amp; height */</div><div class='add'>+	writel((((area-&gt;height - 1) &lt;&lt; 16) | (area-&gt;width - 1)),</div><div class='add'>+		   viaparinfo-&gt;io_virt + VIA_REG_DIMENSION);</div><div class='add'>+	/* GE Command */</div><div class='add'>+	writel((0x01 | direction | (0xCC &lt;&lt; 24)),</div><div class='add'>+		viaparinfo-&gt;io_virt + VIA_REG_GECMD);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void viafb_imageblit(struct fb_info *info,</div><div class='add'>+	const struct fb_image *image)</div><div class='add'>+{</div><div class='add'>+	u32 size, bg_col = 0, fg_col = 0, *udata;</div><div class='add'>+	int i;</div><div class='add'>+	int pitch;</div><div class='add'>+</div><div class='add'>+	if (!viafb_accel)</div><div class='add'>+		return cfb_imageblit(info, image);</div><div class='add'>+</div><div class='add'>+	udata = (u32 *) image-&gt;data;</div><div class='add'>+</div><div class='add'>+	switch (info-&gt;var.bits_per_pixel) {</div><div class='add'>+	case 8:</div><div class='add'>+		bg_col = image-&gt;bg_color;</div><div class='add'>+		fg_col = image-&gt;fg_color;</div><div class='add'>+		break;</div><div class='add'>+	case 16:</div><div class='add'>+		bg_col = ((u32 *) (info-&gt;pseudo_palette))[image-&gt;bg_color];</div><div class='add'>+		fg_col = ((u32 *) (info-&gt;pseudo_palette))[image-&gt;fg_color];</div><div class='add'>+		break;</div><div class='add'>+	case 32:</div><div class='add'>+		bg_col = ((u32 *) (info-&gt;pseudo_palette))[image-&gt;bg_color];</div><div class='add'>+		fg_col = ((u32 *) (info-&gt;pseudo_palette))[image-&gt;fg_color];</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	size = image-&gt;width * image-&gt;height;</div><div class='add'>+</div><div class='add'>+	/* Source Base Address */</div><div class='add'>+	writel(0x0, viaparinfo-&gt;io_virt + VIA_REG_SRCBASE);</div><div class='add'>+	/* Destination Base Address */</div><div class='add'>+	writel(((unsigned long) (info-&gt;screen_base) -</div><div class='add'>+		   (unsigned long) viafb_FB_MM) &gt;&gt; 3,</div><div class='add'>+		   viaparinfo-&gt;io_virt + VIA_REG_DSTBASE);</div><div class='add'>+	/* Pitch */</div><div class='add'>+	pitch = (info-&gt;var.xres_virtual + 7) &amp; ~7;</div><div class='add'>+	writel(VIA_PITCH_ENABLE |</div><div class='add'>+		   (((pitch *</div><div class='add'>+		      info-&gt;var.bits_per_pixel &gt;&gt; 3) &gt;&gt; 3) | (((pitch *</div><div class='add'>+								info-&gt;var.</div><div class='add'>+								bits_per_pixel</div><div class='add'>+								&gt;&gt; 3) &gt;&gt; 3)</div><div class='add'>+							      &lt;&lt; 16)),</div><div class='add'>+				viaparinfo-&gt;io_virt + VIA_REG_PITCH);</div><div class='add'>+	/* BitBlt Source Address */</div><div class='add'>+	writel(0x0, viaparinfo-&gt;io_virt + VIA_REG_SRCPOS);</div><div class='add'>+	/* BitBlt Destination Address */</div><div class='add'>+	writel(((image-&gt;dy &lt;&lt; 16) | image-&gt;dx),</div><div class='add'>+		viaparinfo-&gt;io_virt + VIA_REG_DSTPOS);</div><div class='add'>+	/* Dimension: width &amp; height */</div><div class='add'>+	writel((((image-&gt;height - 1) &lt;&lt; 16) | (image-&gt;width - 1)),</div><div class='add'>+		   viaparinfo-&gt;io_virt + VIA_REG_DIMENSION);</div><div class='add'>+	/* fb color */</div><div class='add'>+	writel(fg_col, viaparinfo-&gt;io_virt + VIA_REG_FGCOLOR);</div><div class='add'>+	/* bg color */</div><div class='add'>+	writel(bg_col, viaparinfo-&gt;io_virt + VIA_REG_BGCOLOR);</div><div class='add'>+	/* GE Command */</div><div class='add'>+	writel(0xCC020142, viaparinfo-&gt;io_virt + VIA_REG_GECMD);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; size / 4; i++) {</div><div class='add'>+		writel(*udata, viaparinfo-&gt;io_virt + VIA_MMIO_BLTBASE);</div><div class='add'>+		udata++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int viafb_cursor(struct fb_info *info, struct fb_cursor *cursor)</div><div class='add'>+{</div><div class='add'>+	u8 data[CURSOR_SIZE / 8];</div><div class='add'>+	u32 data_bak[CURSOR_SIZE / 32];</div><div class='add'>+	u32 temp, xx, yy, bg_col = 0, fg_col = 0;</div><div class='add'>+	int size, i, j = 0;</div><div class='add'>+	static int hw_cursor;</div><div class='add'>+	struct viafb_par *p_viafb_par;</div><div class='add'>+</div><div class='add'>+	if (viafb_accel)</div><div class='add'>+		hw_cursor = 1;</div><div class='add'>+</div><div class='add'>+	if (!viafb_accel) {</div><div class='add'>+		if (hw_cursor) {</div><div class='add'>+			viafb_show_hw_cursor(info, HW_Cursor_OFF);</div><div class='add'>+			hw_cursor = 0;</div><div class='add'>+		}</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((((struct viafb_par *)(info-&gt;par))-&gt;iga_path == IGA2)</div><div class='add'>+	    &amp;&amp; (viaparinfo-&gt;chip_info-&gt;gfx_chip_name == UNICHROME_CLE266))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	/* When duoview and using lcd , use soft cursor */</div><div class='add'>+	if (viafb_LCD_ON || ((struct viafb_par *)(info-&gt;par))-&gt;duoview)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	viafb_show_hw_cursor(info, HW_Cursor_OFF);</div><div class='add'>+	viacursor = *cursor;</div><div class='add'>+</div><div class='add'>+	if (cursor-&gt;set &amp; FB_CUR_SETHOT) {</div><div class='add'>+		viacursor.hot = cursor-&gt;hot;</div><div class='add'>+		temp = ((viacursor.hot.x) &lt;&lt; 16) + viacursor.hot.y;</div><div class='add'>+		writel(temp, viaparinfo-&gt;io_virt + VIA_REG_CURSOR_ORG);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cursor-&gt;set &amp; FB_CUR_SETPOS) {</div><div class='add'>+		viacursor.image.dx = cursor-&gt;image.dx;</div><div class='add'>+		viacursor.image.dy = cursor-&gt;image.dy;</div><div class='add'>+		yy = cursor-&gt;image.dy - info-&gt;var.yoffset;</div><div class='add'>+		xx = cursor-&gt;image.dx - info-&gt;var.xoffset;</div><div class='add'>+		temp = yy &amp; 0xFFFF;</div><div class='add'>+		temp |= (xx &lt;&lt; 16);</div><div class='add'>+		writel(temp, viaparinfo-&gt;io_virt + VIA_REG_CURSOR_POS);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cursor-&gt;set &amp; FB_CUR_SETSIZE) {</div><div class='add'>+		temp = readl(viaparinfo-&gt;io_virt + VIA_REG_CURSOR_MODE);</div><div class='add'>+</div><div class='add'>+		if ((cursor-&gt;image.width &lt;= 32)</div><div class='add'>+		    &amp;&amp; (cursor-&gt;image.height &lt;= 32)) {</div><div class='add'>+			MAX_CURS = 32;</div><div class='add'>+			temp |= 0x2;</div><div class='add'>+		} else if ((cursor-&gt;image.width &lt;= 64)</div><div class='add'>+			   &amp;&amp; (cursor-&gt;image.height &lt;= 64)) {</div><div class='add'>+			MAX_CURS = 64;</div><div class='add'>+			temp &amp;= 0xFFFFFFFD;</div><div class='add'>+		} else {</div><div class='add'>+			DEBUG_MSG(KERN_INFO</div><div class='add'>+			"The cursor image is biger than 64x64 bits...\n");</div><div class='add'>+			return -ENXIO;</div><div class='add'>+		}</div><div class='add'>+		writel(temp, viaparinfo-&gt;io_virt + VIA_REG_CURSOR_MODE);</div><div class='add'>+</div><div class='add'>+		viacursor.image.height = cursor-&gt;image.height;</div><div class='add'>+		viacursor.image.width = cursor-&gt;image.width;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cursor-&gt;set &amp; FB_CUR_SETCMAP) {</div><div class='add'>+		viacursor.image.fg_color = cursor-&gt;image.fg_color;</div><div class='add'>+		viacursor.image.bg_color = cursor-&gt;image.bg_color;</div><div class='add'>+</div><div class='add'>+		switch (info-&gt;var.bits_per_pixel) {</div><div class='add'>+		case 8:</div><div class='add'>+		case 16:</div><div class='add'>+		case 32:</div><div class='add'>+			bg_col =</div><div class='add'>+			    (0xFF &lt;&lt; 24) |</div><div class='add'>+			    (((info-&gt;cmap.red)[viacursor.image.bg_color] &amp;</div><div class='add'>+			    0xFF00) &lt;&lt; 8) |</div><div class='add'>+			    ((info-&gt;cmap.green)[viacursor.image.bg_color] &amp;</div><div class='add'>+			    0xFF00) |</div><div class='add'>+			    (((info-&gt;cmap.blue)[viacursor.image.bg_color] &amp;</div><div class='add'>+			    0xFF00) &gt;&gt; 8);</div><div class='add'>+			fg_col =</div><div class='add'>+			    (0xFF &lt;&lt; 24) |</div><div class='add'>+			    (((info-&gt;cmap.red)[viacursor.image.fg_color] &amp;</div><div class='add'>+			    0xFF00) &lt;&lt; 8) |</div><div class='add'>+			    ((info-&gt;cmap.green)[viacursor.image.fg_color] &amp;</div><div class='add'>+			    0xFF00) |</div><div class='add'>+			    (((info-&gt;cmap.blue)[viacursor.image.fg_color] &amp;</div><div class='add'>+			    0xFF00) &gt;&gt; 8);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* This is indeed a patch for VT3324/VT3353 */</div><div class='add'>+		if (!info-&gt;par)</div><div class='add'>+			return 0;</div><div class='add'>+		p_viafb_par = (struct viafb_par *)info-&gt;par;</div><div class='add'>+</div><div class='add'>+		if ((p_viafb_par-&gt;chip_info-&gt;gfx_chip_name ==</div><div class='add'>+			UNICHROME_CX700) ||</div><div class='add'>+			((p_viafb_par-&gt;chip_info-&gt;gfx_chip_name ==</div><div class='add'>+			UNICHROME_VX800))) {</div><div class='add'>+			bg_col =</div><div class='add'>+			    (((info-&gt;cmap.red)[viacursor.image.bg_color] &amp;</div><div class='add'>+			    0xFFC0) &lt;&lt; 14) |</div><div class='add'>+			    (((info-&gt;cmap.green)[viacursor.image.bg_color] &amp;</div><div class='add'>+			    0xFFC0) &lt;&lt; 4) |</div><div class='add'>+			    (((info-&gt;cmap.blue)[viacursor.image.bg_color] &amp;</div><div class='add'>+			    0xFFC0) &gt;&gt; 6);</div><div class='add'>+			fg_col =</div><div class='add'>+			    (((info-&gt;cmap.red)[viacursor.image.fg_color] &amp;</div><div class='add'>+			    0xFFC0) &lt;&lt; 14) |</div><div class='add'>+			    (((info-&gt;cmap.green)[viacursor.image.fg_color] &amp;</div><div class='add'>+			    0xFFC0) &lt;&lt; 4) |</div><div class='add'>+			    (((info-&gt;cmap.blue)[viacursor.image.fg_color] &amp;</div><div class='add'>+			    0xFFC0) &gt;&gt; 6);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		writel(bg_col, viaparinfo-&gt;io_virt + VIA_REG_CURSOR_BG);</div><div class='add'>+		writel(fg_col, viaparinfo-&gt;io_virt + VIA_REG_CURSOR_FG);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cursor-&gt;set &amp; FB_CUR_SETSHAPE) {</div><div class='add'>+		size =</div><div class='add'>+		    ((viacursor.image.width + 7) &gt;&gt; 3) *</div><div class='add'>+		    viacursor.image.height;</div><div class='add'>+</div><div class='add'>+		if (MAX_CURS == 32) {</div><div class='add'>+			for (i = 0; i &lt; (CURSOR_SIZE / 32); i++) {</div><div class='add'>+				data_bak[i] = 0x0;</div><div class='add'>+				data_bak[i + 1] = 0xFFFFFFFF;</div><div class='add'>+				i += 1;</div><div class='add'>+			}</div><div class='add'>+		} else if (MAX_CURS == 64) {</div><div class='add'>+			for (i = 0; i &lt; (CURSOR_SIZE / 32); i++) {</div><div class='add'>+				data_bak[i] = 0x0;</div><div class='add'>+				data_bak[i + 1] = 0x0;</div><div class='add'>+				data_bak[i + 2] = 0xFFFFFFFF;</div><div class='add'>+				data_bak[i + 3] = 0xFFFFFFFF;</div><div class='add'>+				i += 3;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		switch (viacursor.rop) {</div><div class='add'>+		case ROP_XOR:</div><div class='add'>+			for (i = 0; i &lt; size; i++)</div><div class='add'>+				data[i] = viacursor.mask[i];</div><div class='add'>+			break;</div><div class='add'>+		case ROP_COPY:</div><div class='add'>+</div><div class='add'>+			for (i = 0; i &lt; size; i++)</div><div class='add'>+				data[i] = viacursor.mask[i];</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (MAX_CURS == 32) {</div><div class='add'>+			for (i = 0; i &lt; size; i++) {</div><div class='add'>+				data_bak[j] = (u32) data[i];</div><div class='add'>+				data_bak[j + 1] = ~data_bak[j];</div><div class='add'>+				j += 2;</div><div class='add'>+			}</div><div class='add'>+		} else if (MAX_CURS == 64) {</div><div class='add'>+			for (i = 0; i &lt; size; i++) {</div><div class='add'>+				data_bak[j] = (u32) data[i];</div><div class='add'>+				data_bak[j + 1] = 0x0;</div><div class='add'>+				data_bak[j + 2] = ~data_bak[j];</div><div class='add'>+				data_bak[j + 3] = ~data_bak[j + 1];</div><div class='add'>+				j += 4;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		memcpy(((struct viafb_par *)(info-&gt;par))-&gt;fbmem_virt +</div><div class='add'>+		       ((struct viafb_par *)(info-&gt;par))-&gt;cursor_start,</div><div class='add'>+		       data_bak, CURSOR_SIZE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (viacursor.enable)</div><div class='add'>+		viafb_show_hw_cursor(info, HW_Cursor_ON);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int viafb_sync(struct fb_info *info)</div><div class='add'>+{</div><div class='add'>+	if (viafb_accel)</div><div class='add'>+		viafb_wait_engine_idle();</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int viafb_get_mode_index(int hres, int vres, int flag)</div><div class='add'>+{</div><div class='add'>+	u32 i;</div><div class='add'>+	DEBUG_MSG(KERN_INFO "viafb_get_mode_index!\n");</div><div class='add'>+</div><div class='add'>+	for (i = 0; viafb_modentry[i].mode_index != VIA_RES_INVALID; i++)</div><div class='add'>+		if (viafb_modentry[i].xres == hres &amp;&amp;</div><div class='add'>+			viafb_modentry[i].yres == vres)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+	viafb_resMode = viafb_modentry[i].mode_index;</div><div class='add'>+	if (flag)</div><div class='add'>+		viafb_mode1 = viafb_modentry[i].mode_res;</div><div class='add'>+	else</div><div class='add'>+		viafb_mode = viafb_modentry[i].mode_res;</div><div class='add'>+</div><div class='add'>+	return viafb_resMode;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void check_available_device_to_enable(int device_id)</div><div class='add'>+{</div><div class='add'>+	int device_num = 0;</div><div class='add'>+</div><div class='add'>+	/* Initialize: */</div><div class='add'>+	viafb_CRT_ON = STATE_OFF;</div><div class='add'>+	viafb_DVI_ON = STATE_OFF;</div><div class='add'>+	viafb_LCD_ON = STATE_OFF;</div><div class='add'>+	viafb_LCD2_ON = STATE_OFF;</div><div class='add'>+	viafb_DeviceStatus = None_Device;</div><div class='add'>+</div><div class='add'>+	if ((device_id &amp; CRT_Device) &amp;&amp; (device_num &lt; MAX_ACTIVE_DEV_NUM)) {</div><div class='add'>+		viafb_CRT_ON = STATE_ON;</div><div class='add'>+		device_num++;</div><div class='add'>+		viafb_DeviceStatus |= CRT_Device;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((device_id &amp; DVI_Device) &amp;&amp; (device_num &lt; MAX_ACTIVE_DEV_NUM)) {</div><div class='add'>+		viafb_DVI_ON = STATE_ON;</div><div class='add'>+		device_num++;</div><div class='add'>+		viafb_DeviceStatus |= DVI_Device;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((device_id &amp; LCD_Device) &amp;&amp; (device_num &lt; MAX_ACTIVE_DEV_NUM)) {</div><div class='add'>+		viafb_LCD_ON = STATE_ON;</div><div class='add'>+		device_num++;</div><div class='add'>+		viafb_DeviceStatus |= LCD_Device;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((device_id &amp; LCD2_Device) &amp;&amp; (device_num &lt; MAX_ACTIVE_DEV_NUM)) {</div><div class='add'>+		viafb_LCD2_ON = STATE_ON;</div><div class='add'>+		device_num++;</div><div class='add'>+		viafb_DeviceStatus |= LCD2_Device;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (viafb_DeviceStatus == None_Device) {</div><div class='add'>+		/* Use CRT as default active device: */</div><div class='add'>+		viafb_CRT_ON = STATE_ON;</div><div class='add'>+		viafb_DeviceStatus = CRT_Device;</div><div class='add'>+	}</div><div class='add'>+	DEBUG_MSG(KERN_INFO "Device Status:%x", viafb_DeviceStatus);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void viafb_set_device(struct device_t active_dev)</div><div class='add'>+{</div><div class='add'>+	/* Check available device to enable: */</div><div class='add'>+	int device_id = None_Device;</div><div class='add'>+	if (active_dev.crt)</div><div class='add'>+		device_id |= CRT_Device;</div><div class='add'>+	if (active_dev.dvi)</div><div class='add'>+		device_id |= DVI_Device;</div><div class='add'>+	if (active_dev.lcd)</div><div class='add'>+		device_id |= LCD_Device;</div><div class='add'>+</div><div class='add'>+	check_available_device_to_enable(device_id);</div><div class='add'>+</div><div class='add'>+	/* Check property of LCD: */</div><div class='add'>+	if (viafb_LCD_ON) {</div><div class='add'>+		if (active_dev.lcd_dsp_cent) {</div><div class='add'>+			viaparinfo-&gt;lvds_setting_info-&gt;display_method =</div><div class='add'>+				viafb_lcd_dsp_method = LCD_CENTERING;</div><div class='add'>+		} else {</div><div class='add'>+			viaparinfo-&gt;lvds_setting_info-&gt;display_method =</div><div class='add'>+				viafb_lcd_dsp_method = LCD_EXPANDSION;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (active_dev.lcd_mode == LCD_SPWG) {</div><div class='add'>+			viaparinfo-&gt;lvds_setting_info-&gt;lcd_mode =</div><div class='add'>+				viafb_lcd_mode = LCD_SPWG;</div><div class='add'>+		} else {</div><div class='add'>+			viaparinfo-&gt;lvds_setting_info-&gt;lcd_mode =</div><div class='add'>+				viafb_lcd_mode = LCD_OPENLDI;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (active_dev.lcd_panel_id &lt;= LCD_PANEL_ID_MAXIMUM) {</div><div class='add'>+			viafb_lcd_panel_id = active_dev.lcd_panel_id;</div><div class='add'>+			viafb_init_lcd_size();</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check property of mode: */</div><div class='add'>+	if (!active_dev.xres1)</div><div class='add'>+		viafb_second_xres = 640;</div><div class='add'>+	else</div><div class='add'>+		viafb_second_xres = active_dev.xres1;</div><div class='add'>+	if (!active_dev.yres1)</div><div class='add'>+		viafb_second_yres = 480;</div><div class='add'>+	else</div><div class='add'>+		viafb_second_yres = active_dev.yres1;</div><div class='add'>+	if (active_dev.bpp != 0)</div><div class='add'>+		viafb_bpp = active_dev.bpp;</div><div class='add'>+	if (active_dev.bpp1 != 0)</div><div class='add'>+		viafb_bpp1 = active_dev.bpp1;</div><div class='add'>+	if (active_dev.refresh != 0)</div><div class='add'>+		viafb_refresh = active_dev.refresh;</div><div class='add'>+	if (active_dev.refresh1 != 0)</div><div class='add'>+		viafb_refresh1 = active_dev.refresh1;</div><div class='add'>+	if ((active_dev.samm == STATE_OFF) || (active_dev.samm == STATE_ON))</div><div class='add'>+		viafb_SAMM_ON = active_dev.samm;</div><div class='add'>+	viafb_primary_dev = active_dev.primary_dev;</div><div class='add'>+</div><div class='add'>+	viafb_set_start_addr();</div><div class='add'>+	viafb_set_iga_path();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void viafb_set_video_device(u32 video_dev_info)</div><div class='add'>+{</div><div class='add'>+	viaparinfo-&gt;video_on_crt = STATE_OFF;</div><div class='add'>+	viaparinfo-&gt;video_on_dvi = STATE_OFF;</div><div class='add'>+	viaparinfo-&gt;video_on_lcd = STATE_OFF;</div><div class='add'>+</div><div class='add'>+	/* Check available device to enable: */</div><div class='add'>+	if ((video_dev_info &amp; CRT_Device) == CRT_Device)</div><div class='add'>+		viaparinfo-&gt;video_on_crt = STATE_ON;</div><div class='add'>+	else if ((video_dev_info &amp; DVI_Device) == DVI_Device)</div><div class='add'>+		viaparinfo-&gt;video_on_dvi = STATE_ON;</div><div class='add'>+	else if ((video_dev_info &amp; LCD_Device) == LCD_Device)</div><div class='add'>+		viaparinfo-&gt;video_on_lcd = STATE_ON;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void viafb_get_video_device(u32 *video_dev_info)</div><div class='add'>+{</div><div class='add'>+	*video_dev_info = None_Device;</div><div class='add'>+	if (viaparinfo-&gt;video_on_crt == STATE_ON)</div><div class='add'>+		*video_dev_info |= CRT_Device;</div><div class='add'>+	else if (viaparinfo-&gt;video_on_dvi == STATE_ON)</div><div class='add'>+		*video_dev_info |= DVI_Device;</div><div class='add'>+	else if (viaparinfo-&gt;video_on_lcd == STATE_ON)</div><div class='add'>+		*video_dev_info |= LCD_Device;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int get_primary_device(void)</div><div class='add'>+{</div><div class='add'>+	int primary_device = 0;</div><div class='add'>+	/* Rule: device on iga1 path are the primary device. */</div><div class='add'>+	if (viafb_SAMM_ON) {</div><div class='add'>+		if (viafb_CRT_ON) {</div><div class='add'>+			if (viaparinfo-&gt;crt_setting_info-&gt;iga_path == IGA1) {</div><div class='add'>+				DEBUG_MSG(KERN_INFO "CRT IGA Path:%d\n",</div><div class='add'>+					viaparinfo-&gt;</div><div class='add'>+					crt_setting_info-&gt;iga_path);</div><div class='add'>+				primary_device = CRT_Device;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if (viafb_DVI_ON) {</div><div class='add'>+			if (viaparinfo-&gt;tmds_setting_info-&gt;iga_path == IGA1) {</div><div class='add'>+				DEBUG_MSG(KERN_INFO "DVI IGA Path:%d\n",</div><div class='add'>+					viaparinfo-&gt;</div><div class='add'>+					tmds_setting_info-&gt;iga_path);</div><div class='add'>+				primary_device = DVI_Device;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if (viafb_LCD_ON) {</div><div class='add'>+			if (viaparinfo-&gt;lvds_setting_info-&gt;iga_path == IGA1) {</div><div class='add'>+				DEBUG_MSG(KERN_INFO "LCD IGA Path:%d\n",</div><div class='add'>+					viaparinfo-&gt;</div><div class='add'>+					lvds_setting_info-&gt;iga_path);</div><div class='add'>+				primary_device = LCD_Device;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if (viafb_LCD2_ON) {</div><div class='add'>+			if (viaparinfo-&gt;lvds_setting_info2-&gt;iga_path == IGA1) {</div><div class='add'>+				DEBUG_MSG(KERN_INFO "LCD2 IGA Path:%d\n",</div><div class='add'>+					viaparinfo-&gt;</div><div class='add'>+					lvds_setting_info2-&gt;iga_path);</div><div class='add'>+				primary_device = LCD2_Device;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return primary_device;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 is_duoview(void)</div><div class='add'>+{</div><div class='add'>+	if (0 == viafb_SAMM_ON) {</div><div class='add'>+		if (viafb_LCD_ON + viafb_LCD2_ON +</div><div class='add'>+			viafb_DVI_ON + viafb_CRT_ON == 2)</div><div class='add'>+			return true;</div><div class='add'>+		return false;</div><div class='add'>+	} else {</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void apply_second_mode_setting(struct fb_var_screeninfo</div><div class='add'>+	*sec_var)</div><div class='add'>+{</div><div class='add'>+	u32 htotal, vtotal, long_refresh;</div><div class='add'>+</div><div class='add'>+	htotal = sec_var-&gt;xres + sec_var-&gt;left_margin +</div><div class='add'>+		sec_var-&gt;right_margin + sec_var-&gt;hsync_len;</div><div class='add'>+	vtotal = sec_var-&gt;yres + sec_var-&gt;upper_margin +</div><div class='add'>+		sec_var-&gt;lower_margin + sec_var-&gt;vsync_len;</div><div class='add'>+	if ((sec_var-&gt;xres_virtual * (sec_var-&gt;bits_per_pixel &gt;&gt; 3)) &amp; 0x1F) {</div><div class='add'>+		/*Is 32 bytes alignment? */</div><div class='add'>+		/*32 pixel alignment */</div><div class='add'>+		sec_var-&gt;xres_virtual = (sec_var-&gt;xres_virtual + 31) &amp; ~31;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	htotal = sec_var-&gt;xres + sec_var-&gt;left_margin +</div><div class='add'>+		sec_var-&gt;right_margin + sec_var-&gt;hsync_len;</div><div class='add'>+	vtotal = sec_var-&gt;yres + sec_var-&gt;upper_margin +</div><div class='add'>+		sec_var-&gt;lower_margin + sec_var-&gt;vsync_len;</div><div class='add'>+	long_refresh = 1000000000UL / sec_var-&gt;pixclock * 1000;</div><div class='add'>+	long_refresh /= (htotal * vtotal);</div><div class='add'>+</div><div class='add'>+	viafb_second_xres = sec_var-&gt;xres;</div><div class='add'>+	viafb_second_yres = sec_var-&gt;yres;</div><div class='add'>+	viafb_second_virtual_xres = sec_var-&gt;xres_virtual;</div><div class='add'>+	viafb_second_virtual_yres = sec_var-&gt;yres_virtual;</div><div class='add'>+	viafb_bpp1 = sec_var-&gt;bits_per_pixel;</div><div class='add'>+	viafb_refresh1 = viafb_get_refresh(sec_var-&gt;xres, sec_var-&gt;yres,</div><div class='add'>+		long_refresh);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int apply_device_setting(struct viafb_ioctl_setting setting_info,</div><div class='add'>+	struct fb_info *info)</div><div class='add'>+{</div><div class='add'>+	int need_set_mode = 0;</div><div class='add'>+	DEBUG_MSG(KERN_INFO "apply_device_setting\n");</div><div class='add'>+</div><div class='add'>+	if (setting_info.device_flag) {</div><div class='add'>+		need_set_mode = 1;</div><div class='add'>+		check_available_device_to_enable(setting_info.device_status);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Unlock LCD's operation according to LCD flag</div><div class='add'>+	   and check if the setting value is valid. */</div><div class='add'>+	/* If the value is valid, apply the new setting value to the device. */</div><div class='add'>+	if (viafb_LCD_ON) {</div><div class='add'>+		if (setting_info.lcd_operation_flag &amp; OP_LCD_CENTERING) {</div><div class='add'>+			need_set_mode = 1;</div><div class='add'>+			if (setting_info.lcd_attributes.display_center) {</div><div class='add'>+				/* Centering */</div><div class='add'>+				viaparinfo-&gt;lvds_setting_info-&gt;display_method =</div><div class='add'>+				    LCD_CENTERING;</div><div class='add'>+				viafb_lcd_dsp_method = LCD_CENTERING;</div><div class='add'>+				viaparinfo-&gt;lvds_setting_info2-&gt;display_method =</div><div class='add'>+				    viafb_lcd_dsp_method = LCD_CENTERING;</div><div class='add'>+			} else {</div><div class='add'>+				/* expandsion */</div><div class='add'>+				viaparinfo-&gt;lvds_setting_info-&gt;display_method =</div><div class='add'>+				    LCD_EXPANDSION;</div><div class='add'>+				viafb_lcd_dsp_method = LCD_EXPANDSION;</div><div class='add'>+				viaparinfo-&gt;lvds_setting_info2-&gt;display_method =</div><div class='add'>+				    LCD_EXPANDSION;</div><div class='add'>+				viafb_lcd_dsp_method = LCD_EXPANDSION;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (setting_info.lcd_operation_flag &amp; OP_LCD_MODE) {</div><div class='add'>+			need_set_mode = 1;</div><div class='add'>+			if (setting_info.lcd_attributes.lcd_mode ==</div><div class='add'>+				LCD_SPWG) {</div><div class='add'>+				viaparinfo-&gt;lvds_setting_info-&gt;lcd_mode =</div><div class='add'>+					viafb_lcd_mode = LCD_SPWG;</div><div class='add'>+			} else {</div><div class='add'>+				viaparinfo-&gt;lvds_setting_info-&gt;lcd_mode =</div><div class='add'>+					viafb_lcd_mode = LCD_OPENLDI;</div><div class='add'>+			}</div><div class='add'>+			viaparinfo-&gt;lvds_setting_info2-&gt;lcd_mode =</div><div class='add'>+			    viaparinfo-&gt;lvds_setting_info-&gt;lcd_mode;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (setting_info.lcd_operation_flag &amp; OP_LCD_PANEL_ID) {</div><div class='add'>+			need_set_mode = 1;</div><div class='add'>+			if (setting_info.lcd_attributes.panel_id &lt;=</div><div class='add'>+			    LCD_PANEL_ID_MAXIMUM) {</div><div class='add'>+				viafb_lcd_panel_id =</div><div class='add'>+				    setting_info.lcd_attributes.panel_id;</div><div class='add'>+				viafb_init_lcd_size();</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (0 != (setting_info.samm_status &amp; OP_SAMM)) {</div><div class='add'>+		setting_info.samm_status =</div><div class='add'>+		    setting_info.samm_status &amp; (~OP_SAMM);</div><div class='add'>+		if (setting_info.samm_status == 0</div><div class='add'>+		    || setting_info.samm_status == 1) {</div><div class='add'>+			viafb_SAMM_ON = setting_info.samm_status;</div><div class='add'>+</div><div class='add'>+			if (viafb_SAMM_ON)</div><div class='add'>+				viafb_primary_dev = setting_info.primary_device;</div><div class='add'>+</div><div class='add'>+			viafb_set_start_addr();</div><div class='add'>+			viafb_set_iga_path();</div><div class='add'>+		}</div><div class='add'>+		need_set_mode = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	viaparinfo-&gt;duoview = is_duoview();</div><div class='add'>+</div><div class='add'>+	if (!need_set_mode) {</div><div class='add'>+		;</div><div class='add'>+	} else {</div><div class='add'>+		viafb_set_iga_path();</div><div class='add'>+		viafb_set_par(info);</div><div class='add'>+	}</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void retrieve_device_setting(struct viafb_ioctl_setting</div><div class='add'>+	*setting_info)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	/* get device status */</div><div class='add'>+	if (viafb_CRT_ON == 1)</div><div class='add'>+		setting_info-&gt;device_status = CRT_Device;</div><div class='add'>+	if (viafb_DVI_ON == 1)</div><div class='add'>+		setting_info-&gt;device_status |= DVI_Device;</div><div class='add'>+	if (viafb_LCD_ON == 1)</div><div class='add'>+		setting_info-&gt;device_status |= LCD_Device;</div><div class='add'>+	if (viafb_LCD2_ON == 1)</div><div class='add'>+		setting_info-&gt;device_status |= LCD2_Device;</div><div class='add'>+	if ((viaparinfo-&gt;video_on_crt == 1) &amp;&amp; (viafb_CRT_ON == 1)) {</div><div class='add'>+		setting_info-&gt;video_device_status =</div><div class='add'>+			viaparinfo-&gt;crt_setting_info-&gt;iga_path;</div><div class='add'>+	} else if ((viaparinfo-&gt;video_on_dvi == 1) &amp;&amp; (viafb_DVI_ON == 1)) {</div><div class='add'>+		setting_info-&gt;video_device_status =</div><div class='add'>+			viaparinfo-&gt;tmds_setting_info-&gt;iga_path;</div><div class='add'>+	} else if ((viaparinfo-&gt;video_on_lcd == 1) &amp;&amp; (viafb_LCD_ON == 1)) {</div><div class='add'>+		setting_info-&gt;video_device_status =</div><div class='add'>+			viaparinfo-&gt;lvds_setting_info-&gt;iga_path;</div><div class='add'>+	} else {</div><div class='add'>+		setting_info-&gt;video_device_status = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	setting_info-&gt;samm_status = viafb_SAMM_ON;</div><div class='add'>+	setting_info-&gt;primary_device = get_primary_device();</div><div class='add'>+</div><div class='add'>+	setting_info-&gt;first_dev_bpp = viafb_bpp;</div><div class='add'>+	setting_info-&gt;second_dev_bpp = viafb_bpp1;</div><div class='add'>+</div><div class='add'>+	setting_info-&gt;first_dev_refresh = viafb_refresh;</div><div class='add'>+	setting_info-&gt;second_dev_refresh = viafb_refresh1;</div><div class='add'>+</div><div class='add'>+	setting_info-&gt;first_dev_hor_res = viafb_hotplug_Xres;</div><div class='add'>+	setting_info-&gt;first_dev_ver_res = viafb_hotplug_Yres;</div><div class='add'>+	setting_info-&gt;second_dev_hor_res = viafb_second_xres;</div><div class='add'>+	setting_info-&gt;second_dev_ver_res = viafb_second_yres;</div><div class='add'>+</div><div class='add'>+	/* Get lcd attributes */</div><div class='add'>+	setting_info-&gt;lcd_attributes.display_center = viafb_lcd_dsp_method;</div><div class='add'>+	setting_info-&gt;lcd_attributes.panel_id = viafb_lcd_panel_id;</div><div class='add'>+	setting_info-&gt;lcd_attributes.lcd_mode = viafb_lcd_mode;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void parse_active_dev(void)</div><div class='add'>+{</div><div class='add'>+	viafb_CRT_ON = STATE_OFF;</div><div class='add'>+	viafb_DVI_ON = STATE_OFF;</div><div class='add'>+	viafb_LCD_ON = STATE_OFF;</div><div class='add'>+	viafb_LCD2_ON = STATE_OFF;</div><div class='add'>+	/* 1. Modify the active status of devices. */</div><div class='add'>+	/* 2. Keep the order of devices, so we can set corresponding</div><div class='add'>+	   IGA path to devices in SAMM case. */</div><div class='add'>+	/*    Note: The previous of active_dev is primary device,</div><div class='add'>+	   and the following is secondary device. */</div><div class='add'>+	if (!strncmp(viafb_active_dev, "CRT+DVI", 7)) {</div><div class='add'>+		/* CRT+DVI */</div><div class='add'>+		viafb_CRT_ON = STATE_ON;</div><div class='add'>+		viafb_DVI_ON = STATE_ON;</div><div class='add'>+		viafb_primary_dev = CRT_Device;</div><div class='add'>+	} else if (!strncmp(viafb_active_dev, "DVI+CRT", 7)) {</div><div class='add'>+		/* DVI+CRT */</div><div class='add'>+		viafb_CRT_ON = STATE_ON;</div><div class='add'>+		viafb_DVI_ON = STATE_ON;</div><div class='add'>+		viafb_primary_dev = DVI_Device;</div><div class='add'>+	} else if (!strncmp(viafb_active_dev, "CRT+LCD", 7)) {</div><div class='add'>+		/* CRT+LCD */</div><div class='add'>+		viafb_CRT_ON = STATE_ON;</div><div class='add'>+		viafb_LCD_ON = STATE_ON;</div><div class='add'>+		viafb_primary_dev = CRT_Device;</div><div class='add'>+	} else if (!strncmp(viafb_active_dev, "LCD+CRT", 7)) {</div><div class='add'>+		/* LCD+CRT */</div><div class='add'>+		viafb_CRT_ON = STATE_ON;</div><div class='add'>+		viafb_LCD_ON = STATE_ON;</div><div class='add'>+		viafb_primary_dev = LCD_Device;</div><div class='add'>+	} else if (!strncmp(viafb_active_dev, "DVI+LCD", 7)) {</div><div class='add'>+		/* DVI+LCD */</div><div class='add'>+		viafb_DVI_ON = STATE_ON;</div><div class='add'>+		viafb_LCD_ON = STATE_ON;</div><div class='add'>+		viafb_primary_dev = DVI_Device;</div><div class='add'>+	} else if (!strncmp(viafb_active_dev, "LCD+DVI", 7)) {</div><div class='add'>+		/* LCD+DVI */</div><div class='add'>+		viafb_DVI_ON = STATE_ON;</div><div class='add'>+		viafb_LCD_ON = STATE_ON;</div><div class='add'>+		viafb_primary_dev = LCD_Device;</div><div class='add'>+	} else if (!strncmp(viafb_active_dev, "LCD+LCD2", 8)) {</div><div class='add'>+		viafb_LCD_ON = STATE_ON;</div><div class='add'>+		viafb_LCD2_ON = STATE_ON;</div><div class='add'>+		viafb_primary_dev = LCD_Device;</div><div class='add'>+	} else if (!strncmp(viafb_active_dev, "LCD2+LCD", 8)) {</div><div class='add'>+		viafb_LCD_ON = STATE_ON;</div><div class='add'>+		viafb_LCD2_ON = STATE_ON;</div><div class='add'>+		viafb_primary_dev = LCD2_Device;</div><div class='add'>+	} else if (!strncmp(viafb_active_dev, "CRT", 3)) {</div><div class='add'>+		/* CRT only */</div><div class='add'>+		viafb_CRT_ON = STATE_ON;</div><div class='add'>+		viafb_SAMM_ON = STATE_OFF;</div><div class='add'>+	} else if (!strncmp(viafb_active_dev, "DVI", 3)) {</div><div class='add'>+		/* DVI only */</div><div class='add'>+		viafb_DVI_ON = STATE_ON;</div><div class='add'>+		viafb_SAMM_ON = STATE_OFF;</div><div class='add'>+	} else if (!strncmp(viafb_active_dev, "LCD", 3)) {</div><div class='add'>+		/* LCD only */</div><div class='add'>+		viafb_LCD_ON = STATE_ON;</div><div class='add'>+		viafb_SAMM_ON = STATE_OFF;</div><div class='add'>+	} else {</div><div class='add'>+		viafb_CRT_ON = STATE_ON;</div><div class='add'>+		viafb_SAMM_ON = STATE_OFF;</div><div class='add'>+	}</div><div class='add'>+	viaparinfo-&gt;duoview = is_duoview();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void parse_video_dev(void)</div><div class='add'>+{</div><div class='add'>+	viaparinfo-&gt;video_on_crt = STATE_OFF;</div><div class='add'>+	viaparinfo-&gt;video_on_dvi = STATE_OFF;</div><div class='add'>+	viaparinfo-&gt;video_on_lcd = STATE_OFF;</div><div class='add'>+</div><div class='add'>+	if (!strncmp(viafb_video_dev, "CRT", 3)) {</div><div class='add'>+		/* Video on CRT */</div><div class='add'>+		viaparinfo-&gt;video_on_crt = STATE_ON;</div><div class='add'>+	} else if (!strncmp(viafb_video_dev, "DVI", 3)) {</div><div class='add'>+		/* Video on DVI */</div><div class='add'>+		viaparinfo-&gt;video_on_dvi = STATE_ON;</div><div class='add'>+	} else if (!strncmp(viafb_video_dev, "LCD", 3)) {</div><div class='add'>+		/* Video on LCD */</div><div class='add'>+		viaparinfo-&gt;video_on_lcd = STATE_ON;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int parse_port(char *opt_str, int *output_interface)</div><div class='add'>+{</div><div class='add'>+	if (!strncmp(opt_str, "DVP0", 4))</div><div class='add'>+		*output_interface = INTERFACE_DVP0;</div><div class='add'>+	else if (!strncmp(opt_str, "DVP1", 4))</div><div class='add'>+		*output_interface = INTERFACE_DVP1;</div><div class='add'>+	else if (!strncmp(opt_str, "DFP_HIGHLOW", 11))</div><div class='add'>+		*output_interface = INTERFACE_DFP;</div><div class='add'>+	else if (!strncmp(opt_str, "DFP_HIGH", 8))</div><div class='add'>+		*output_interface = INTERFACE_DFP_HIGH;</div><div class='add'>+	else if (!strncmp(opt_str, "DFP_LOW", 7))</div><div class='add'>+		*output_interface = INTERFACE_DFP_LOW;</div><div class='add'>+	else</div><div class='add'>+		*output_interface = INTERFACE_NONE;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void parse_lcd_port(void)</div><div class='add'>+{</div><div class='add'>+	parse_port(viafb_lcd_port, &amp;viaparinfo-&gt;chip_info-&gt;lvds_chip_info.</div><div class='add'>+		output_interface);</div><div class='add'>+	/*Initialize to avoid unexpected behavior */</div><div class='add'>+	viaparinfo-&gt;chip_info-&gt;lvds_chip_info2.output_interface =</div><div class='add'>+	INTERFACE_NONE;</div><div class='add'>+</div><div class='add'>+	DEBUG_MSG(KERN_INFO "parse_lcd_port: viafb_lcd_port:%s,interface:%d\n",</div><div class='add'>+		  viafb_lcd_port, viaparinfo-&gt;chip_info-&gt;lvds_chip_info.</div><div class='add'>+		  output_interface);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void parse_dvi_port(void)</div><div class='add'>+{</div><div class='add'>+	parse_port(viafb_dvi_port, &amp;viaparinfo-&gt;chip_info-&gt;tmds_chip_info.</div><div class='add'>+		output_interface);</div><div class='add'>+</div><div class='add'>+	DEBUG_MSG(KERN_INFO "parse_dvi_port: viafb_dvi_port:%s,interface:%d\n",</div><div class='add'>+		  viafb_dvi_port, viaparinfo-&gt;chip_info-&gt;tmds_chip_info.</div><div class='add'>+		  output_interface);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The proc filesystem read/write function, a simple proc implement to</div><div class='add'>+ * get/set the value of DPA  DVP0,   DVP0DataDriving,  DVP0ClockDriving, DVP1,</div><div class='add'>+ * DVP1Driving, DFPHigh, DFPLow CR96,   SR2A[5], SR1B[1], SR2A[4], SR1E[2],</div><div class='add'>+ * CR9B,    SR65,    CR97,    CR99</div><div class='add'>+ */</div><div class='add'>+static int viafb_dvp0_proc_read(char *buf, char **start, off_t offset,</div><div class='add'>+int count, int *eof, void *data)</div><div class='add'>+{</div><div class='add'>+	int len = 0;</div><div class='add'>+	u8 dvp0_data_dri = 0, dvp0_clk_dri = 0, dvp0 = 0;</div><div class='add'>+	dvp0_data_dri =</div><div class='add'>+	    (viafb_read_reg(VIASR, SR2A) &amp; BIT5) &gt;&gt; 4 |</div><div class='add'>+	    (viafb_read_reg(VIASR, SR1B) &amp; BIT1) &gt;&gt; 1;</div><div class='add'>+	dvp0_clk_dri =</div><div class='add'>+	    (viafb_read_reg(VIASR, SR2A) &amp; BIT4) &gt;&gt; 3 |</div><div class='add'>+	    (viafb_read_reg(VIASR, SR1E) &amp; BIT2) &gt;&gt; 2;</div><div class='add'>+	dvp0 = viafb_read_reg(VIACR, CR96) &amp; 0x0f;</div><div class='add'>+	len +=</div><div class='add'>+	    sprintf(buf + len, "%x %x %x\n", dvp0, dvp0_data_dri, dvp0_clk_dri);</div><div class='add'>+	*eof = 1;		/*Inform kernel end of data */</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+static int viafb_dvp0_proc_write(struct file *file,</div><div class='add'>+	const char __user *buffer, unsigned long count, void *data)</div><div class='add'>+{</div><div class='add'>+	char buf[20], *value, *pbuf;</div><div class='add'>+	u8 reg_val = 0;</div><div class='add'>+	unsigned long length, i;</div><div class='add'>+	if (count &lt; 1)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	length = count &gt; 20 ? 20 : count;</div><div class='add'>+	if (copy_from_user(&amp;buf[0], buffer, length))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	buf[length - 1] = '\0';	/*Ensure end string */</div><div class='add'>+	pbuf = &amp;buf[0];</div><div class='add'>+	for (i = 0; i &lt; 3; i++) {</div><div class='add'>+		value = strsep(&amp;pbuf, " ");</div><div class='add'>+		if (value != NULL) {</div><div class='add'>+			strict_strtoul(value, 0, (unsigned long *)&amp;reg_val);</div><div class='add'>+			DEBUG_MSG(KERN_INFO "DVP0:reg_val[%l]=:%x\n", i,</div><div class='add'>+				  reg_val);</div><div class='add'>+			switch (i) {</div><div class='add'>+			case 0:</div><div class='add'>+				viafb_write_reg_mask(CR96, VIACR,</div><div class='add'>+					reg_val, 0x0f);</div><div class='add'>+				break;</div><div class='add'>+			case 1:</div><div class='add'>+				viafb_write_reg_mask(SR2A, VIASR,</div><div class='add'>+					reg_val &lt;&lt; 4, BIT5);</div><div class='add'>+				viafb_write_reg_mask(SR1B, VIASR,</div><div class='add'>+					reg_val &lt;&lt; 1, BIT1);</div><div class='add'>+				break;</div><div class='add'>+			case 2:</div><div class='add'>+				viafb_write_reg_mask(SR2A, VIASR,</div><div class='add'>+					reg_val &lt;&lt; 3, BIT4);</div><div class='add'>+				viafb_write_reg_mask(SR1E, VIASR,</div><div class='add'>+					reg_val &lt;&lt; 2, BIT2);</div><div class='add'>+				break;</div><div class='add'>+			default:</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+static int viafb_dvp1_proc_read(char *buf, char **start, off_t offset,</div><div class='add'>+	int count, int *eof, void *data)</div><div class='add'>+{</div><div class='add'>+	int len = 0;</div><div class='add'>+	u8 dvp1 = 0, dvp1_data_dri = 0, dvp1_clk_dri = 0;</div><div class='add'>+	dvp1 = viafb_read_reg(VIACR, CR9B) &amp; 0x0f;</div><div class='add'>+	dvp1_data_dri = (viafb_read_reg(VIASR, SR65) &amp; 0x0c) &gt;&gt; 2;</div><div class='add'>+	dvp1_clk_dri = viafb_read_reg(VIASR, SR65) &amp; 0x03;</div><div class='add'>+	len +=</div><div class='add'>+	    sprintf(buf + len, "%x %x %x\n", dvp1, dvp1_data_dri, dvp1_clk_dri);</div><div class='add'>+	*eof = 1;		/*Inform kernel end of data */</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+static int viafb_dvp1_proc_write(struct file *file,</div><div class='add'>+	const char __user *buffer, unsigned long count, void *data)</div><div class='add'>+{</div><div class='add'>+	char buf[20], *value, *pbuf;</div><div class='add'>+	u8 reg_val = 0;</div><div class='add'>+	unsigned long length, i;</div><div class='add'>+	if (count &lt; 1)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	length = count &gt; 20 ? 20 : count;</div><div class='add'>+	if (copy_from_user(&amp;buf[0], buffer, length))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	buf[length - 1] = '\0';	/*Ensure end string */</div><div class='add'>+	pbuf = &amp;buf[0];</div><div class='add'>+	for (i = 0; i &lt; 3; i++) {</div><div class='add'>+		value = strsep(&amp;pbuf, " ");</div><div class='add'>+		if (value != NULL) {</div><div class='add'>+			strict_strtoul(value, 0, (unsigned long *)&amp;reg_val);</div><div class='add'>+			switch (i) {</div><div class='add'>+			case 0:</div><div class='add'>+				viafb_write_reg_mask(CR9B, VIACR,</div><div class='add'>+					reg_val, 0x0f);</div><div class='add'>+				break;</div><div class='add'>+			case 1:</div><div class='add'>+				viafb_write_reg_mask(SR65, VIASR,</div><div class='add'>+					reg_val &lt;&lt; 2, 0x0c);</div><div class='add'>+				break;</div><div class='add'>+			case 2:</div><div class='add'>+				viafb_write_reg_mask(SR65, VIASR,</div><div class='add'>+					reg_val, 0x03);</div><div class='add'>+				break;</div><div class='add'>+			default:</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int viafb_dfph_proc_read(char *buf, char **start, off_t offset,</div><div class='add'>+	int count, int *eof, void *data)</div><div class='add'>+{</div><div class='add'>+	int len = 0;</div><div class='add'>+	u8 dfp_high = 0;</div><div class='add'>+	dfp_high = viafb_read_reg(VIACR, CR97) &amp; 0x0f;</div><div class='add'>+	len += sprintf(buf + len, "%x\n", dfp_high);</div><div class='add'>+	*eof = 1;		/*Inform kernel end of data */</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+static int viafb_dfph_proc_write(struct file *file,</div><div class='add'>+	const char __user *buffer, unsigned long count, void *data)</div><div class='add'>+{</div><div class='add'>+	char buf[20];</div><div class='add'>+	u8 reg_val = 0;</div><div class='add'>+	unsigned long length;</div><div class='add'>+	if (count &lt; 1)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	length = count &gt; 20 ? 20 : count;</div><div class='add'>+	if (copy_from_user(&amp;buf[0], buffer, length))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	buf[length - 1] = '\0';	/*Ensure end string */</div><div class='add'>+	strict_strtoul(&amp;buf[0], 0, (unsigned long *)&amp;reg_val);</div><div class='add'>+	viafb_write_reg_mask(CR97, VIACR, reg_val, 0x0f);</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+static int viafb_dfpl_proc_read(char *buf, char **start, off_t offset,</div><div class='add'>+	int count, int *eof, void *data)</div><div class='add'>+{</div><div class='add'>+	int len = 0;</div><div class='add'>+	u8 dfp_low = 0;</div><div class='add'>+	dfp_low = viafb_read_reg(VIACR, CR99) &amp; 0x0f;</div><div class='add'>+	len += sprintf(buf + len, "%x\n", dfp_low);</div><div class='add'>+	*eof = 1;		/*Inform kernel end of data */</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+static int viafb_dfpl_proc_write(struct file *file,</div><div class='add'>+	const char __user *buffer, unsigned long count, void *data)</div><div class='add'>+{</div><div class='add'>+	char buf[20];</div><div class='add'>+	u8 reg_val = 0;</div><div class='add'>+	unsigned long length;</div><div class='add'>+	if (count &lt; 1)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	length = count &gt; 20 ? 20 : count;</div><div class='add'>+	if (copy_from_user(&amp;buf[0], buffer, length))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	buf[length - 1] = '\0';	/*Ensure end string */</div><div class='add'>+	strict_strtoul(&amp;buf[0], 0, (unsigned long *)&amp;reg_val);</div><div class='add'>+	viafb_write_reg_mask(CR99, VIACR, reg_val, 0x0f);</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+static int viafb_vt1636_proc_read(char *buf, char **start,</div><div class='add'>+	off_t offset, int count, int *eof, void *data)</div><div class='add'>+{</div><div class='add'>+	int len = 0;</div><div class='add'>+	u8 vt1636_08 = 0, vt1636_09 = 0;</div><div class='add'>+	switch (viaparinfo-&gt;chip_info-&gt;lvds_chip_info.lvds_chip_name) {</div><div class='add'>+	case VT1636_LVDS:</div><div class='add'>+		vt1636_08 =</div><div class='add'>+		    viafb_gpio_i2c_read_lvds(viaparinfo-&gt;lvds_setting_info,</div><div class='add'>+		    &amp;viaparinfo-&gt;chip_info-&gt;lvds_chip_info, 0x08) &amp; 0x0f;</div><div class='add'>+		vt1636_09 =</div><div class='add'>+		    viafb_gpio_i2c_read_lvds(viaparinfo-&gt;lvds_setting_info,</div><div class='add'>+		    &amp;viaparinfo-&gt;chip_info-&gt;lvds_chip_info, 0x09) &amp; 0x1f;</div><div class='add'>+		len += sprintf(buf + len, "%x %x\n", vt1636_08, vt1636_09);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	switch (viaparinfo-&gt;chip_info-&gt;lvds_chip_info2.lvds_chip_name) {</div><div class='add'>+	case VT1636_LVDS:</div><div class='add'>+		vt1636_08 =</div><div class='add'>+		    viafb_gpio_i2c_read_lvds(viaparinfo-&gt;lvds_setting_info2,</div><div class='add'>+			&amp;viaparinfo-&gt;chip_info-&gt;lvds_chip_info2, 0x08) &amp; 0x0f;</div><div class='add'>+		vt1636_09 =</div><div class='add'>+		    viafb_gpio_i2c_read_lvds(viaparinfo-&gt;lvds_setting_info2,</div><div class='add'>+			&amp;viaparinfo-&gt;chip_info-&gt;lvds_chip_info2, 0x09) &amp; 0x1f;</div><div class='add'>+		len += sprintf(buf + len, " %x %x\n", vt1636_08, vt1636_09);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	*eof = 1;		/*Inform kernel end of data */</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+static int viafb_vt1636_proc_write(struct file *file,</div><div class='add'>+	const char __user *buffer, unsigned long count, void *data)</div><div class='add'>+{</div><div class='add'>+	char buf[30], *value, *pbuf;</div><div class='add'>+	struct IODATA reg_val;</div><div class='add'>+	unsigned long length, i;</div><div class='add'>+	if (count &lt; 1)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	length = count &gt; 30 ? 30 : count;</div><div class='add'>+	if (copy_from_user(&amp;buf[0], buffer, length))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	buf[length - 1] = '\0';	/*Ensure end string */</div><div class='add'>+	pbuf = &amp;buf[0];</div><div class='add'>+	switch (viaparinfo-&gt;chip_info-&gt;lvds_chip_info.lvds_chip_name) {</div><div class='add'>+	case VT1636_LVDS:</div><div class='add'>+		for (i = 0; i &lt; 2; i++) {</div><div class='add'>+			value = strsep(&amp;pbuf, " ");</div><div class='add'>+			if (value != NULL) {</div><div class='add'>+				strict_strtoul(value, 0,</div><div class='add'>+					(unsigned long *)&amp;reg_val.Data);</div><div class='add'>+				switch (i) {</div><div class='add'>+				case 0:</div><div class='add'>+					reg_val.Index = 0x08;</div><div class='add'>+					reg_val.Mask = 0x0f;</div><div class='add'>+					viafb_gpio_i2c_write_mask_lvds</div><div class='add'>+					    (viaparinfo-&gt;lvds_setting_info,</div><div class='add'>+					    &amp;viaparinfo-&gt;</div><div class='add'>+					    chip_info-&gt;lvds_chip_info,</div><div class='add'>+					     reg_val);</div><div class='add'>+					break;</div><div class='add'>+				case 1:</div><div class='add'>+					reg_val.Index = 0x09;</div><div class='add'>+					reg_val.Mask = 0x1f;</div><div class='add'>+					viafb_gpio_i2c_write_mask_lvds</div><div class='add'>+					    (viaparinfo-&gt;lvds_setting_info,</div><div class='add'>+					    &amp;viaparinfo-&gt;</div><div class='add'>+					    chip_info-&gt;lvds_chip_info,</div><div class='add'>+					     reg_val);</div><div class='add'>+					break;</div><div class='add'>+				default:</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+			} else {</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	switch (viaparinfo-&gt;chip_info-&gt;lvds_chip_info2.lvds_chip_name) {</div><div class='add'>+	case VT1636_LVDS:</div><div class='add'>+		for (i = 0; i &lt; 2; i++) {</div><div class='add'>+			value = strsep(&amp;pbuf, " ");</div><div class='add'>+			if (value != NULL) {</div><div class='add'>+				strict_strtoul(value, 0,</div><div class='add'>+					(unsigned long *)&amp;reg_val.Data);</div><div class='add'>+				switch (i) {</div><div class='add'>+				case 0:</div><div class='add'>+					reg_val.Index = 0x08;</div><div class='add'>+					reg_val.Mask = 0x0f;</div><div class='add'>+					viafb_gpio_i2c_write_mask_lvds</div><div class='add'>+					    (viaparinfo-&gt;lvds_setting_info2,</div><div class='add'>+					    &amp;viaparinfo-&gt;</div><div class='add'>+					    chip_info-&gt;lvds_chip_info2,</div><div class='add'>+					     reg_val);</div><div class='add'>+					break;</div><div class='add'>+				case 1:</div><div class='add'>+					reg_val.Index = 0x09;</div><div class='add'>+					reg_val.Mask = 0x1f;</div><div class='add'>+					viafb_gpio_i2c_write_mask_lvds</div><div class='add'>+					    (viaparinfo-&gt;lvds_setting_info2,</div><div class='add'>+					    &amp;viaparinfo-&gt;</div><div class='add'>+					    chip_info-&gt;lvds_chip_info2,</div><div class='add'>+					     reg_val);</div><div class='add'>+					break;</div><div class='add'>+				default:</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+			} else {</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void viafb_init_proc(struct proc_dir_entry *viafb_entry)</div><div class='add'>+{</div><div class='add'>+	struct proc_dir_entry *entry;</div><div class='add'>+	viafb_entry = proc_mkdir("viafb", NULL);</div><div class='add'>+	if (viafb_entry) {</div><div class='add'>+		entry = create_proc_entry("dvp0", 0, viafb_entry);</div><div class='add'>+		if (entry) {</div><div class='add'>+			entry-&gt;owner = THIS_MODULE;</div><div class='add'>+			entry-&gt;read_proc = viafb_dvp0_proc_read;</div><div class='add'>+			entry-&gt;write_proc = viafb_dvp0_proc_write;</div><div class='add'>+		}</div><div class='add'>+		entry = create_proc_entry("dvp1", 0, viafb_entry);</div><div class='add'>+		if (entry) {</div><div class='add'>+			entry-&gt;owner = THIS_MODULE;</div><div class='add'>+			entry-&gt;read_proc = viafb_dvp1_proc_read;</div><div class='add'>+			entry-&gt;write_proc = viafb_dvp1_proc_write;</div><div class='add'>+		}</div><div class='add'>+		entry = create_proc_entry("dfph", 0, viafb_entry);</div><div class='add'>+		if (entry) {</div><div class='add'>+			entry-&gt;owner = THIS_MODULE;</div><div class='add'>+			entry-&gt;read_proc = viafb_dfph_proc_read;</div><div class='add'>+			entry-&gt;write_proc = viafb_dfph_proc_write;</div><div class='add'>+		}</div><div class='add'>+		entry = create_proc_entry("dfpl", 0, viafb_entry);</div><div class='add'>+		if (entry) {</div><div class='add'>+			entry-&gt;owner = THIS_MODULE;</div><div class='add'>+			entry-&gt;read_proc = viafb_dfpl_proc_read;</div><div class='add'>+			entry-&gt;write_proc = viafb_dfpl_proc_write;</div><div class='add'>+		}</div><div class='add'>+		if (VT1636_LVDS == viaparinfo-&gt;chip_info-&gt;lvds_chip_info.</div><div class='add'>+			lvds_chip_name || VT1636_LVDS ==</div><div class='add'>+		    viaparinfo-&gt;chip_info-&gt;lvds_chip_info2.lvds_chip_name) {</div><div class='add'>+			entry = create_proc_entry("vt1636", 0, viafb_entry);</div><div class='add'>+			if (entry) {</div><div class='add'>+				entry-&gt;owner = THIS_MODULE;</div><div class='add'>+				entry-&gt;read_proc = viafb_vt1636_proc_read;</div><div class='add'>+				entry-&gt;write_proc = viafb_vt1636_proc_write;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+static void viafb_remove_proc(struct proc_dir_entry *viafb_entry)</div><div class='add'>+{</div><div class='add'>+	/* no problem if it was not registered */</div><div class='add'>+	remove_proc_entry("dvp0", viafb_entry);/* parent dir */</div><div class='add'>+	remove_proc_entry("dvp1", viafb_entry);</div><div class='add'>+	remove_proc_entry("dfph", viafb_entry);</div><div class='add'>+	remove_proc_entry("dfpl", viafb_entry);</div><div class='add'>+	remove_proc_entry("vt1636", viafb_entry);</div><div class='add'>+	remove_proc_entry("vt1625", viafb_entry);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devinit via_pci_probe(void)</div><div class='add'>+{</div><div class='add'>+	unsigned int default_xres, default_yres;</div><div class='add'>+	char *tmpc, *tmpm;</div><div class='add'>+	char *tmpc_sec, *tmpm_sec;</div><div class='add'>+	int vmode_index;</div><div class='add'>+	u32 tmds_length, lvds_length, crt_length, chip_length, viafb_par_length;</div><div class='add'>+</div><div class='add'>+	DEBUG_MSG(KERN_INFO "VIAFB PCI Probe!!\n");</div><div class='add'>+</div><div class='add'>+	viafb_par_length = ALIGN(sizeof(struct viafb_par), BITS_PER_LONG/8);</div><div class='add'>+	tmds_length = ALIGN(sizeof(struct tmds_setting_information),</div><div class='add'>+		BITS_PER_LONG/8);</div><div class='add'>+	lvds_length = ALIGN(sizeof(struct lvds_setting_information),</div><div class='add'>+		BITS_PER_LONG/8);</div><div class='add'>+	crt_length = ALIGN(sizeof(struct lvds_setting_information),</div><div class='add'>+		BITS_PER_LONG/8);</div><div class='add'>+	chip_length = ALIGN(sizeof(struct chip_information), BITS_PER_LONG/8);</div><div class='add'>+</div><div class='add'>+	/* Allocate fb_info and ***_par here, also including some other needed</div><div class='add'>+	 * variables</div><div class='add'>+	*/</div><div class='add'>+	viafbinfo = framebuffer_alloc(viafb_par_length + 2 * lvds_length +</div><div class='add'>+	tmds_length + crt_length + chip_length, NULL);</div><div class='add'>+	if (!viafbinfo) {</div><div class='add'>+		printk(KERN_ERR"Could not allocate memory for viafb_info.\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	viaparinfo = (struct viafb_par *)viafbinfo-&gt;par;</div><div class='add'>+	viaparinfo-&gt;tmds_setting_info = (struct tmds_setting_information *)</div><div class='add'>+		((unsigned long)viaparinfo + viafb_par_length);</div><div class='add'>+	viaparinfo-&gt;lvds_setting_info = (struct lvds_setting_information *)</div><div class='add'>+		((unsigned long)viaparinfo-&gt;tmds_setting_info + tmds_length);</div><div class='add'>+	viaparinfo-&gt;lvds_setting_info2 = (struct lvds_setting_information *)</div><div class='add'>+		((unsigned long)viaparinfo-&gt;lvds_setting_info + lvds_length);</div><div class='add'>+	viaparinfo-&gt;crt_setting_info = (struct crt_setting_information *)</div><div class='add'>+		((unsigned long)viaparinfo-&gt;lvds_setting_info2 + lvds_length);</div><div class='add'>+	viaparinfo-&gt;chip_info = (struct chip_information *)</div><div class='add'>+		((unsigned long)viaparinfo-&gt;crt_setting_info + crt_length);</div><div class='add'>+</div><div class='add'>+	if (viafb_dual_fb)</div><div class='add'>+		viafb_SAMM_ON = 1;</div><div class='add'>+	parse_active_dev();</div><div class='add'>+	parse_video_dev();</div><div class='add'>+	parse_lcd_port();</div><div class='add'>+	parse_dvi_port();</div><div class='add'>+</div><div class='add'>+	/* for dual-fb must viafb_SAMM_ON=1 and viafb_dual_fb=1 */</div><div class='add'>+	if (!viafb_SAMM_ON)</div><div class='add'>+		viafb_dual_fb = 0;</div><div class='add'>+</div><div class='add'>+	/* Set up I2C bus stuff */</div><div class='add'>+	viafb_create_i2c_bus(viaparinfo);</div><div class='add'>+</div><div class='add'>+	viafb_init_chip_info();</div><div class='add'>+	viafb_get_fb_info(&amp;viaparinfo-&gt;fbmem, &amp;viaparinfo-&gt;memsize);</div><div class='add'>+	viaparinfo-&gt;fbmem_free = viaparinfo-&gt;memsize;</div><div class='add'>+	viaparinfo-&gt;fbmem_used = 0;</div><div class='add'>+	viaparinfo-&gt;fbmem_virt = ioremap_nocache(viaparinfo-&gt;fbmem,</div><div class='add'>+		viaparinfo-&gt;memsize);</div><div class='add'>+	viafbinfo-&gt;screen_base = (char *)viaparinfo-&gt;fbmem_virt;</div><div class='add'>+</div><div class='add'>+	if (!viaparinfo-&gt;fbmem_virt) {</div><div class='add'>+		printk(KERN_INFO "ioremap failed\n");</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	viafb_get_mmio_info(&amp;viaparinfo-&gt;mmio_base, &amp;viaparinfo-&gt;mmio_len);</div><div class='add'>+	viaparinfo-&gt;io_virt = ioremap_nocache(viaparinfo-&gt;mmio_base,</div><div class='add'>+		viaparinfo-&gt;mmio_len);</div><div class='add'>+</div><div class='add'>+	viafbinfo-&gt;node = 0;</div><div class='add'>+	viafbinfo-&gt;fbops = &amp;viafb_ops;</div><div class='add'>+	viafbinfo-&gt;flags = FBINFO_DEFAULT | FBINFO_HWACCEL_YPAN;</div><div class='add'>+</div><div class='add'>+	viafbinfo-&gt;pseudo_palette = pseudo_pal;</div><div class='add'>+	if (viafb_accel) {</div><div class='add'>+		viafb_init_accel();</div><div class='add'>+		viafb_init_2d_engine();</div><div class='add'>+		viafb_hw_cursor_init();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (viafb_second_size &amp;&amp; (viafb_second_size &lt; 8)) {</div><div class='add'>+		viafb_second_offset = viaparinfo-&gt;fbmem_free -</div><div class='add'>+			viafb_second_size * 1024 * 1024;</div><div class='add'>+	} else {</div><div class='add'>+		viafb_second_size = 8;</div><div class='add'>+		viafb_second_offset = viaparinfo-&gt;fbmem_free -</div><div class='add'>+			viafb_second_size * 1024 * 1024;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	viafb_FB_MM = viaparinfo-&gt;fbmem_virt;</div><div class='add'>+	tmpm = viafb_mode;</div><div class='add'>+	tmpc = strsep(&amp;tmpm, "x");</div><div class='add'>+	strict_strtoul(tmpc, 0, (unsigned long *)&amp;default_xres);</div><div class='add'>+	strict_strtoul(tmpm, 0, (unsigned long *)&amp;default_yres);</div><div class='add'>+</div><div class='add'>+	vmode_index = viafb_get_mode_index(default_xres, default_yres, 0);</div><div class='add'>+	DEBUG_MSG(KERN_INFO "0-&gt;index=%d\n", vmode_index);</div><div class='add'>+</div><div class='add'>+	if (viafb_SAMM_ON == 1) {</div><div class='add'>+		if (strcmp(viafb_mode, viafb_mode1)) {</div><div class='add'>+			tmpm_sec = viafb_mode1;</div><div class='add'>+			tmpc_sec = strsep(&amp;tmpm_sec, "x");</div><div class='add'>+			strict_strtoul(tmpc_sec, 0,</div><div class='add'>+				(unsigned long *)&amp;viafb_second_xres);</div><div class='add'>+			strict_strtoul(tmpm_sec, 0,</div><div class='add'>+				(unsigned long *)&amp;viafb_second_yres);</div><div class='add'>+		} else {</div><div class='add'>+			viafb_second_xres = default_xres;</div><div class='add'>+			viafb_second_yres = default_yres;</div><div class='add'>+		}</div><div class='add'>+		if (0 == viafb_second_virtual_xres) {</div><div class='add'>+			switch (viafb_second_xres) {</div><div class='add'>+			case 1400:</div><div class='add'>+				viafb_second_virtual_xres = 1408;</div><div class='add'>+				break;</div><div class='add'>+			default:</div><div class='add'>+				viafb_second_virtual_xres = viafb_second_xres;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if (0 == viafb_second_virtual_yres)</div><div class='add'>+			viafb_second_virtual_yres = viafb_second_yres;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (viafb_bpp) {</div><div class='add'>+	case 0 ... 8:</div><div class='add'>+		viafb_bpp = 8;</div><div class='add'>+		break;</div><div class='add'>+	case 9 ... 16:</div><div class='add'>+		viafb_bpp = 16;</div><div class='add'>+		break;</div><div class='add'>+	case 17 ... 32:</div><div class='add'>+		viafb_bpp = 32;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		viafb_bpp = 8;</div><div class='add'>+	}</div><div class='add'>+	default_var.xres = default_xres;</div><div class='add'>+	default_var.yres = default_yres;</div><div class='add'>+	switch (default_xres) {</div><div class='add'>+	case 1400:</div><div class='add'>+		default_var.xres_virtual = 1408;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		default_var.xres_virtual = default_xres;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	default_var.yres_virtual = default_yres;</div><div class='add'>+	default_var.bits_per_pixel = viafb_bpp;</div><div class='add'>+	if (default_var.bits_per_pixel == 15)</div><div class='add'>+		default_var.bits_per_pixel = 16;</div><div class='add'>+	default_var.pixclock =</div><div class='add'>+	    viafb_get_pixclock(default_xres, default_yres, viafb_refresh);</div><div class='add'>+	default_var.left_margin = (default_xres &gt;&gt; 3) &amp; 0xf8;</div><div class='add'>+	default_var.right_margin = 32;</div><div class='add'>+	default_var.upper_margin = 16;</div><div class='add'>+	default_var.lower_margin = 4;</div><div class='add'>+	default_var.hsync_len = default_var.left_margin;</div><div class='add'>+	default_var.vsync_len = 4;</div><div class='add'>+	default_var.accel_flags = 0;</div><div class='add'>+</div><div class='add'>+	if (viafb_accel) {</div><div class='add'>+		viafbinfo-&gt;flags |=</div><div class='add'>+		    (FBINFO_HWACCEL_COPYAREA | FBINFO_HWACCEL_FILLRECT |</div><div class='add'>+		     FBINFO_HWACCEL_IMAGEBLIT);</div><div class='add'>+		default_var.accel_flags |= FB_ACCELF_TEXT;</div><div class='add'>+	} else</div><div class='add'>+		viafbinfo-&gt;flags |= FBINFO_HWACCEL_DISABLED;</div><div class='add'>+</div><div class='add'>+	if (viafb_dual_fb) {</div><div class='add'>+		viafbinfo1 = framebuffer_alloc(viafb_par_length, NULL);</div><div class='add'>+		if (!viafbinfo1) {</div><div class='add'>+			printk(KERN_ERR</div><div class='add'>+			"allocate the second framebuffer struct error\n");</div><div class='add'>+			framebuffer_release(viafbinfo);</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+		viaparinfo1 = viafbinfo1-&gt;par;</div><div class='add'>+		memcpy(viaparinfo1, viaparinfo, viafb_par_length);</div><div class='add'>+		viaparinfo1-&gt;memsize = viaparinfo-&gt;memsize -</div><div class='add'>+			viafb_second_offset;</div><div class='add'>+		viaparinfo-&gt;memsize = viafb_second_offset;</div><div class='add'>+		viaparinfo1-&gt;fbmem_virt = viaparinfo-&gt;fbmem_virt +</div><div class='add'>+			viafb_second_offset;</div><div class='add'>+		viaparinfo1-&gt;fbmem = viaparinfo-&gt;fbmem + viafb_second_offset;</div><div class='add'>+</div><div class='add'>+		viaparinfo1-&gt;fbmem_used = viaparinfo-&gt;fbmem_used;</div><div class='add'>+		viaparinfo1-&gt;fbmem_free = viaparinfo1-&gt;memsize -</div><div class='add'>+			viaparinfo1-&gt;fbmem_used;</div><div class='add'>+		viaparinfo-&gt;fbmem_free = viaparinfo-&gt;memsize;</div><div class='add'>+		viaparinfo-&gt;fbmem_used = 0;</div><div class='add'>+		if (viafb_accel) {</div><div class='add'>+			viaparinfo1-&gt;cursor_start =</div><div class='add'>+			    viaparinfo-&gt;cursor_start - viafb_second_offset;</div><div class='add'>+			viaparinfo1-&gt;VQ_start = viaparinfo-&gt;VQ_start -</div><div class='add'>+				viafb_second_offset;</div><div class='add'>+			viaparinfo1-&gt;VQ_end = viaparinfo-&gt;VQ_end -</div><div class='add'>+				viafb_second_offset;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		memcpy(viafbinfo1, viafbinfo, sizeof(struct fb_info));</div><div class='add'>+		viafbinfo1-&gt;screen_base = viafbinfo-&gt;screen_base +</div><div class='add'>+			viafb_second_offset;</div><div class='add'>+		viafbinfo1-&gt;fix.smem_start = viaparinfo1-&gt;fbmem;</div><div class='add'>+		viafbinfo1-&gt;fix.smem_len = viaparinfo1-&gt;fbmem_free;</div><div class='add'>+</div><div class='add'>+		default_var.xres = viafb_second_xres;</div><div class='add'>+		default_var.yres = viafb_second_yres;</div><div class='add'>+		default_var.xres_virtual = viafb_second_virtual_xres;</div><div class='add'>+		default_var.yres_virtual = viafb_second_virtual_yres;</div><div class='add'>+		if (viafb_bpp1 != viafb_bpp)</div><div class='add'>+			viafb_bpp1 = viafb_bpp;</div><div class='add'>+		default_var.bits_per_pixel = viafb_bpp1;</div><div class='add'>+		default_var.pixclock =</div><div class='add'>+		    viafb_get_pixclock(viafb_second_xres, viafb_second_yres,</div><div class='add'>+		    viafb_refresh);</div><div class='add'>+		default_var.left_margin = (viafb_second_xres &gt;&gt; 3) &amp; 0xf8;</div><div class='add'>+		default_var.right_margin = 32;</div><div class='add'>+		default_var.upper_margin = 16;</div><div class='add'>+		default_var.lower_margin = 4;</div><div class='add'>+		default_var.hsync_len = default_var.left_margin;</div><div class='add'>+		default_var.vsync_len = 4;</div><div class='add'>+</div><div class='add'>+		viafb_setup_fixinfo(&amp;viafbinfo1-&gt;fix, viaparinfo1);</div><div class='add'>+		viafb_check_var(&amp;default_var, viafbinfo1);</div><div class='add'>+		viafbinfo1-&gt;var = default_var;</div><div class='add'>+		viafb_update_viafb_par(viafbinfo);</div><div class='add'>+		viafb_update_fix(&amp;viafbinfo1-&gt;fix, viafbinfo1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	viafb_setup_fixinfo(&amp;viafbinfo-&gt;fix, viaparinfo);</div><div class='add'>+	viafb_check_var(&amp;default_var, viafbinfo);</div><div class='add'>+	viafbinfo-&gt;var = default_var;</div><div class='add'>+	viafb_update_viafb_par(viafbinfo);</div><div class='add'>+	viafb_update_fix(&amp;viafbinfo-&gt;fix, viafbinfo);</div><div class='add'>+	default_var.activate = FB_ACTIVATE_NOW;</div><div class='add'>+	fb_alloc_cmap(&amp;viafbinfo-&gt;cmap, 256, 0);</div><div class='add'>+</div><div class='add'>+	if (viafb_dual_fb &amp;&amp; (viafb_primary_dev == LCD_Device)</div><div class='add'>+	    &amp;&amp; (viaparinfo-&gt;chip_info-&gt;gfx_chip_name == UNICHROME_CLE266)) {</div><div class='add'>+		if (register_framebuffer(viafbinfo1) &lt; 0)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (register_framebuffer(viafbinfo) &lt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (viafb_dual_fb &amp;&amp; ((viafb_primary_dev != LCD_Device)</div><div class='add'>+			|| (viaparinfo-&gt;chip_info-&gt;gfx_chip_name !=</div><div class='add'>+			UNICHROME_CLE266))) {</div><div class='add'>+		if (register_framebuffer(viafbinfo1) &lt; 0)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	DEBUG_MSG(KERN_INFO "fb%d: %s frame buffer device %dx%d-%dbpp\n",</div><div class='add'>+		  viafbinfo-&gt;node, viafbinfo-&gt;fix.id, default_var.xres,</div><div class='add'>+		  default_var.yres, default_var.bits_per_pixel);</div><div class='add'>+</div><div class='add'>+	viafb_init_proc(viaparinfo-&gt;proc_entry);</div><div class='add'>+	viafb_init_dac(IGA2);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __devexit via_pci_remove(void)</div><div class='add'>+{</div><div class='add'>+	DEBUG_MSG(KERN_INFO "via_pci_remove!\n");</div><div class='add'>+	fb_dealloc_cmap(&amp;viafbinfo-&gt;cmap);</div><div class='add'>+	unregister_framebuffer(viafbinfo);</div><div class='add'>+	if (viafb_dual_fb)</div><div class='add'>+		unregister_framebuffer(viafbinfo1);</div><div class='add'>+	iounmap((void *)viaparinfo-&gt;fbmem_virt);</div><div class='add'>+	iounmap(viaparinfo-&gt;io_virt);</div><div class='add'>+</div><div class='add'>+	viafb_delete_i2c_buss(viaparinfo);</div><div class='add'>+</div><div class='add'>+	framebuffer_release(viafbinfo);</div><div class='add'>+	if (viafb_dual_fb)</div><div class='add'>+		framebuffer_release(viafbinfo1);</div><div class='add'>+</div><div class='add'>+	viafb_remove_proc(viaparinfo-&gt;proc_entry);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifndef MODULE</div><div class='add'>+static int __init viafb_setup(char *options)</div><div class='add'>+{</div><div class='add'>+	char *this_opt;</div><div class='add'>+	DEBUG_MSG(KERN_INFO "viafb_setup!\n");</div><div class='add'>+</div><div class='add'>+	if (!options || !*options)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	while ((this_opt = strsep(&amp;options, ",")) != NULL) {</div><div class='add'>+		if (!*this_opt)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (!strncmp(this_opt, "viafb_mode1=", 12))</div><div class='add'>+			viafb_mode1 = kstrdup(this_opt + 12, GFP_KERNEL);</div><div class='add'>+		else if (!strncmp(this_opt, "viafb_mode=", 11))</div><div class='add'>+			viafb_mode = kstrdup(this_opt + 11, GFP_KERNEL);</div><div class='add'>+		else if (!strncmp(this_opt, "viafb_bpp1=", 11))</div><div class='add'>+			strict_strtoul(this_opt + 11, 0,</div><div class='add'>+				(unsigned long *)&amp;viafb_bpp1);</div><div class='add'>+		else if (!strncmp(this_opt, "viafb_bpp=", 10))</div><div class='add'>+			strict_strtoul(this_opt + 10, 0,</div><div class='add'>+				(unsigned long *)&amp;viafb_bpp);</div><div class='add'>+		else if (!strncmp(this_opt, "viafb_refresh1=", 15))</div><div class='add'>+			strict_strtoul(this_opt + 15, 0,</div><div class='add'>+				(unsigned long *)&amp;viafb_refresh1);</div><div class='add'>+		else if (!strncmp(this_opt, "viafb_refresh=", 14))</div><div class='add'>+			strict_strtoul(this_opt + 14, 0,</div><div class='add'>+				(unsigned long *)&amp;viafb_refresh);</div><div class='add'>+		else if (!strncmp(this_opt, "viafb_lcd_dsp_method=", 21))</div><div class='add'>+			strict_strtoul(this_opt + 21, 0,</div><div class='add'>+				(unsigned long *)&amp;viafb_lcd_dsp_method);</div><div class='add'>+		else if (!strncmp(this_opt, "viafb_lcd_panel_id=", 19))</div><div class='add'>+			strict_strtoul(this_opt + 19, 0,</div><div class='add'>+				(unsigned long *)&amp;viafb_lcd_panel_id);</div><div class='add'>+		else if (!strncmp(this_opt, "viafb_accel=", 12))</div><div class='add'>+			strict_strtoul(this_opt + 12, 0,</div><div class='add'>+				(unsigned long *)&amp;viafb_accel);</div><div class='add'>+		else if (!strncmp(this_opt, "viafb_SAMM_ON=", 14))</div><div class='add'>+			strict_strtoul(this_opt + 14, 0,</div><div class='add'>+				(unsigned long *)&amp;viafb_SAMM_ON);</div><div class='add'>+		else if (!strncmp(this_opt, "viafb_active_dev=", 17))</div><div class='add'>+			viafb_active_dev = kstrdup(this_opt + 17, GFP_KERNEL);</div><div class='add'>+		else if (!strncmp(this_opt,</div><div class='add'>+			"viafb_display_hardware_layout=", 30))</div><div class='add'>+			strict_strtoul(this_opt + 30, 0,</div><div class='add'>+			(unsigned long *)&amp;viafb_display_hardware_layout);</div><div class='add'>+		else if (!strncmp(this_opt, "viafb_second_size=", 18))</div><div class='add'>+			strict_strtoul(this_opt + 18, 0,</div><div class='add'>+				(unsigned long *)&amp;viafb_second_size);</div><div class='add'>+		else if (!strncmp(this_opt,</div><div class='add'>+			"viafb_platform_epia_dvi=", 24))</div><div class='add'>+			strict_strtoul(this_opt + 24, 0,</div><div class='add'>+				(unsigned long *)&amp;viafb_platform_epia_dvi);</div><div class='add'>+		else if (!strncmp(this_opt,</div><div class='add'>+			"viafb_device_lcd_dualedge=", 26))</div><div class='add'>+			strict_strtoul(this_opt + 26, 0,</div><div class='add'>+				(unsigned long *)&amp;viafb_device_lcd_dualedge);</div><div class='add'>+		else if (!strncmp(this_opt, "viafb_bus_width=", 16))</div><div class='add'>+			strict_strtoul(this_opt + 16, 0,</div><div class='add'>+				(unsigned long *)&amp;viafb_bus_width);</div><div class='add'>+		else if (!strncmp(this_opt, "viafb_lcd_mode=", 15))</div><div class='add'>+			strict_strtoul(this_opt + 15, 0,</div><div class='add'>+				(unsigned long *)&amp;viafb_lcd_mode);</div><div class='add'>+		else if (!strncmp(this_opt, "viafb_video_dev=", 16))</div><div class='add'>+			viafb_video_dev = kstrdup(this_opt + 16, GFP_KERNEL);</div><div class='add'>+		else if (!strncmp(this_opt, "viafb_lcd_port=", 15))</div><div class='add'>+			viafb_lcd_port = kstrdup(this_opt + 15, GFP_KERNEL);</div><div class='add'>+		else if (!strncmp(this_opt, "viafb_dvi_port=", 15))</div><div class='add'>+			viafb_dvi_port = kstrdup(this_opt + 15, GFP_KERNEL);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static int __init viafb_init(void)</div><div class='add'>+{</div><div class='add'>+#ifndef MODULE</div><div class='add'>+	char *option = NULL;</div><div class='add'>+	if (fb_get_options("viafb", &amp;option))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	viafb_setup(option);</div><div class='add'>+#endif</div><div class='add'>+	printk(KERN_INFO</div><div class='add'>+       "VIA Graphics Intergration Chipset framebuffer %d.%d initializing\n",</div><div class='add'>+	       VERSION_MAJOR, VERSION_MINOR);</div><div class='add'>+	return via_pci_probe();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit viafb_exit(void)</div><div class='add'>+{</div><div class='add'>+	DEBUG_MSG(KERN_INFO "viafb_exit!\n");</div><div class='add'>+	via_pci_remove();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct fb_ops viafb_ops = {</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.fb_open = viafb_open,</div><div class='add'>+	.fb_release = viafb_release,</div><div class='add'>+	.fb_check_var = viafb_check_var,</div><div class='add'>+	.fb_set_par = viafb_set_par,</div><div class='add'>+	.fb_setcolreg = viafb_setcolreg,</div><div class='add'>+	.fb_pan_display = viafb_pan_display,</div><div class='add'>+	.fb_blank = viafb_blank,</div><div class='add'>+	.fb_fillrect = viafb_fillrect,</div><div class='add'>+	.fb_copyarea = viafb_copyarea,</div><div class='add'>+	.fb_imageblit = viafb_imageblit,</div><div class='add'>+	.fb_cursor = viafb_cursor,</div><div class='add'>+	.fb_ioctl = viafb_ioctl,</div><div class='add'>+	.fb_sync = viafb_sync,</div><div class='add'>+	.fb_setcmap = viafb_setcmap,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_init(viafb_init);</div><div class='add'>+module_exit(viafb_exit);</div><div class='add'>+</div><div class='add'>+#ifdef MODULE</div><div class='add'>+module_param(viafb_memsize, int, 0);</div><div class='add'>+</div><div class='add'>+module_param(viafb_mode, charp, 0);</div><div class='add'>+MODULE_PARM_DESC(viafb_mode, "Set resolution (default=640x480)");</div><div class='add'>+</div><div class='add'>+module_param(viafb_mode1, charp, 0);</div><div class='add'>+MODULE_PARM_DESC(viafb_mode1, "Set resolution (default=640x480)");</div><div class='add'>+</div><div class='add'>+module_param(viafb_bpp, int, 0);</div><div class='add'>+MODULE_PARM_DESC(viafb_bpp, "Set color depth (default=32bpp)");</div><div class='add'>+</div><div class='add'>+module_param(viafb_bpp1, int, 0);</div><div class='add'>+MODULE_PARM_DESC(viafb_bpp1, "Set color depth (default=32bpp)");</div><div class='add'>+</div><div class='add'>+module_param(viafb_refresh, int, 0);</div><div class='add'>+MODULE_PARM_DESC(viafb_refresh,</div><div class='add'>+	"Set CRT viafb_refresh rate (default = 60)");</div><div class='add'>+</div><div class='add'>+module_param(viafb_refresh1, int, 0);</div><div class='add'>+MODULE_PARM_DESC(viafb_refresh1,</div><div class='add'>+	"Set CRT refresh rate (default = 60)");</div><div class='add'>+</div><div class='add'>+module_param(viafb_lcd_panel_id, int, 0);</div><div class='add'>+MODULE_PARM_DESC(viafb_lcd_panel_id,</div><div class='add'>+	"Set Flat Panel type(Default=1024x768)");</div><div class='add'>+</div><div class='add'>+module_param(viafb_lcd_dsp_method, int, 0);</div><div class='add'>+MODULE_PARM_DESC(viafb_lcd_dsp_method,</div><div class='add'>+	"Set Flat Panel display scaling method.(Default=Expandsion)");</div><div class='add'>+</div><div class='add'>+module_param(viafb_SAMM_ON, int, 0);</div><div class='add'>+MODULE_PARM_DESC(viafb_SAMM_ON,</div><div class='add'>+	"Turn on/off flag of SAMM(Default=OFF)");</div><div class='add'>+</div><div class='add'>+module_param(viafb_accel, int, 0);</div><div class='add'>+MODULE_PARM_DESC(viafb_accel,</div><div class='add'>+	"Set 2D Hardware Acceleration.(Default = OFF)");</div><div class='add'>+</div><div class='add'>+module_param(viafb_active_dev, charp, 0);</div><div class='add'>+MODULE_PARM_DESC(viafb_active_dev, "Specify active devices.");</div><div class='add'>+</div><div class='add'>+module_param(viafb_display_hardware_layout, int, 0);</div><div class='add'>+MODULE_PARM_DESC(viafb_display_hardware_layout,</div><div class='add'>+	"Display Hardware Layout (LCD Only, DVI Only...,etc)");</div><div class='add'>+</div><div class='add'>+module_param(viafb_second_size, int, 0);</div><div class='add'>+MODULE_PARM_DESC(viafb_second_size,</div><div class='add'>+	"Set secondary device memory size");</div><div class='add'>+</div><div class='add'>+module_param(viafb_dual_fb, int, 0);</div><div class='add'>+MODULE_PARM_DESC(viafb_dual_fb,</div><div class='add'>+	"Turn on/off flag of dual framebuffer devices.(Default = OFF)");</div><div class='add'>+</div><div class='add'>+module_param(viafb_platform_epia_dvi, int, 0);</div><div class='add'>+MODULE_PARM_DESC(viafb_platform_epia_dvi,</div><div class='add'>+	"Turn on/off flag of DVI devices on EPIA board.(Default = OFF)");</div><div class='add'>+</div><div class='add'>+module_param(viafb_device_lcd_dualedge, int, 0);</div><div class='add'>+MODULE_PARM_DESC(viafb_device_lcd_dualedge,</div><div class='add'>+	"Turn on/off flag of dual edge panel.(Default = OFF)");</div><div class='add'>+</div><div class='add'>+module_param(viafb_bus_width, int, 0);</div><div class='add'>+MODULE_PARM_DESC(viafb_bus_width,</div><div class='add'>+	"Set bus width of panel.(Default = 12)");</div><div class='add'>+</div><div class='add'>+module_param(viafb_lcd_mode, int, 0);</div><div class='add'>+MODULE_PARM_DESC(viafb_lcd_mode,</div><div class='add'>+	"Set Flat Panel mode(Default=OPENLDI)");</div><div class='add'>+</div><div class='add'>+module_param(viafb_video_dev, charp, 0);</div><div class='add'>+MODULE_PARM_DESC(viafb_video_dev, "Specify video devices.");</div><div class='add'>+</div><div class='add'>+module_param(viafb_lcd_port, charp, 0);</div><div class='add'>+MODULE_PARM_DESC(viafb_lcd_port, "Specify LCD output port.");</div><div class='add'>+</div><div class='add'>+module_param(viafb_dvi_port, charp, 0);</div><div class='add'>+MODULE_PARM_DESC(viafb_dvi_port, "Specify DVI output port.");</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/video/via/viafbdev.h b/drivers/video/via/viafbdev.h<br/>new file mode 100644<br/>index 000000000000..a4158e872878<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/via/viafbdev.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/via/viafbdev.h</a></div><div class='hunk'>@@ -0,0 +1,112 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.</div><div class='add'>+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.</div><div class='add'>+</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public</div><div class='add'>+ * License as published by the Free Software Foundation;</div><div class='add'>+ * either version 2, or (at your option) any later version.</div><div class='add'>+</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even</div><div class='add'>+ * the implied warranty of MERCHANTABILITY or FITNESS FOR</div><div class='add'>+ * A PARTICULAR PURPOSE.See the GNU General Public License</div><div class='add'>+ * for more details.</div><div class='add'>+</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc.,</div><div class='add'>+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __VIAFBDEV_H__</div><div class='add'>+#define __VIAFBDEV_H__</div><div class='add'>+</div><div class='add'>+#include &lt;linux/proc_fs.h&gt;</div><div class='add'>+#include &lt;linux/fb.h&gt;</div><div class='add'>+</div><div class='add'>+#include "ioctl.h"</div><div class='add'>+#include "share.h"</div><div class='add'>+#include "chip.h"</div><div class='add'>+#include "hw.h"</div><div class='add'>+#include "via_i2c.h"</div><div class='add'>+</div><div class='add'>+#define VERSION_MAJOR       2</div><div class='add'>+#define VERSION_KERNEL      6	/* For kernel 2.6 */</div><div class='add'>+</div><div class='add'>+#define VERSION_OS          0	/* 0: for 32 bits OS, 1: for 64 bits OS */</div><div class='add'>+#define VERSION_MINOR       4</div><div class='add'>+</div><div class='add'>+struct viafb_par {</div><div class='add'>+	int bpp;</div><div class='add'>+	int hres;</div><div class='add'>+	int vres;</div><div class='add'>+	int linelength;</div><div class='add'>+	u32 xoffset;</div><div class='add'>+	u32 yoffset;</div><div class='add'>+</div><div class='add'>+	void __iomem *fbmem_virt;	/*framebuffer virtual memory address */</div><div class='add'>+	void __iomem *io_virt;	/*iospace virtual memory address */</div><div class='add'>+	unsigned int fbmem;	/*framebuffer physical memory address */</div><div class='add'>+	unsigned int memsize;	/*size of fbmem */</div><div class='add'>+	unsigned int io;	/*io space address */</div><div class='add'>+	unsigned long mmio_base;	/*mmio base address */</div><div class='add'>+	unsigned long mmio_len;	/*mmio base length */</div><div class='add'>+	u32 fbmem_free;		/* Free FB memory */</div><div class='add'>+	u32 fbmem_used;		/* Use FB memory size */</div><div class='add'>+	u32 cursor_start;	/* Cursor Start Address */</div><div class='add'>+	u32 VQ_start;		/* Virtual Queue Start Address */</div><div class='add'>+	u32 VQ_end;		/* Virtual Queue End Address */</div><div class='add'>+	u32 iga_path;</div><div class='add'>+	struct proc_dir_entry *proc_entry;	/*viafb proc entry */</div><div class='add'>+	u8 duoview;		/*Is working in duoview mode? */</div><div class='add'>+</div><div class='add'>+	/* I2C stuff */</div><div class='add'>+	struct via_i2c_stuff i2c_stuff;</div><div class='add'>+</div><div class='add'>+	/* All the information will be needed to set engine */</div><div class='add'>+	struct tmds_setting_information *tmds_setting_info;</div><div class='add'>+	struct crt_setting_information *crt_setting_info;</div><div class='add'>+	struct lvds_setting_information *lvds_setting_info;</div><div class='add'>+	struct lvds_setting_information *lvds_setting_info2;</div><div class='add'>+	struct chip_information *chip_info;</div><div class='add'>+</div><div class='add'>+	/* some information related to video playing */</div><div class='add'>+	int video_on_crt;</div><div class='add'>+	int video_on_dvi;</div><div class='add'>+	int video_on_lcd;</div><div class='add'>+</div><div class='add'>+};</div><div class='add'>+struct viafb_modeinfo {</div><div class='add'>+	u32 xres;</div><div class='add'>+	u32 yres;</div><div class='add'>+	int mode_index;</div><div class='add'>+	char *mode_res;</div><div class='add'>+};</div><div class='add'>+extern unsigned int viafb_second_virtual_yres;</div><div class='add'>+extern unsigned int viafb_second_virtual_xres;</div><div class='add'>+extern unsigned int viafb_second_offset;</div><div class='add'>+extern int viafb_second_size;</div><div class='add'>+extern int viafb_SAMM_ON;</div><div class='add'>+extern int viafb_dual_fb;</div><div class='add'>+extern int viafb_LCD2_ON;</div><div class='add'>+extern int viafb_LCD_ON;</div><div class='add'>+extern int viafb_DVI_ON;</div><div class='add'>+extern int viafb_accel;</div><div class='add'>+extern int viafb_hotplug;</div><div class='add'>+extern int viafb_memsize;</div><div class='add'>+</div><div class='add'>+extern int strict_strtoul(const char *cp, unsigned int base,</div><div class='add'>+	unsigned long *res);</div><div class='add'>+</div><div class='add'>+void viafb_memory_pitch_patch(struct fb_info *info);</div><div class='add'>+void viafb_fill_var_timing_info(struct fb_var_screeninfo *var, int refresh,</div><div class='add'>+			  int mode_index);</div><div class='add'>+int viafb_get_mode_index(int hres, int vres, int flag);</div><div class='add'>+u8 viafb_gpio_i2c_read_lvds(struct lvds_setting_information</div><div class='add'>+	*plvds_setting_info, struct lvds_chip_information</div><div class='add'>+	*plvds_chip_info, u8 index);</div><div class='add'>+void viafb_gpio_i2c_write_mask_lvds(struct lvds_setting_information</div><div class='add'>+			      *plvds_setting_info, struct lvds_chip_information</div><div class='add'>+			      *plvds_chip_info, struct IODATA io_data);</div><div class='add'>+#endif /* __VIAFBDEV_H__ */</div><div class='head'>diff --git a/drivers/video/via/viamode.c b/drivers/video/via/viamode.c<br/>new file mode 100644<br/>index 000000000000..6dcf583a837d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/via/viamode.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/via/viamode.c</a></div><div class='hunk'>@@ -0,0 +1,1086 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.</div><div class='add'>+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.</div><div class='add'>+</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public</div><div class='add'>+ * License as published by the Free Software Foundation;</div><div class='add'>+ * either version 2, or (at your option) any later version.</div><div class='add'>+</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even</div><div class='add'>+ * the implied warranty of MERCHANTABILITY or FITNESS FOR</div><div class='add'>+ * A PARTICULAR PURPOSE.See the GNU General Public License</div><div class='add'>+ * for more details.</div><div class='add'>+</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc.,</div><div class='add'>+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "global.h"</div><div class='add'>+struct res_map_refresh res_map_refresh_tbl[] = {</div><div class='add'>+/*hres, vres, vclock, vmode_refresh*/</div><div class='add'>+	{480, 640, RES_480X640_60HZ_PIXCLOCK, 60},</div><div class='add'>+	{640, 480, RES_640X480_60HZ_PIXCLOCK, 60},</div><div class='add'>+	{640, 480, RES_640X480_75HZ_PIXCLOCK, 75},</div><div class='add'>+	{640, 480, RES_640X480_85HZ_PIXCLOCK, 85},</div><div class='add'>+	{640, 480, RES_640X480_100HZ_PIXCLOCK, 100},</div><div class='add'>+	{640, 480, RES_640X480_120HZ_PIXCLOCK, 120},</div><div class='add'>+	{720, 480, RES_720X480_60HZ_PIXCLOCK, 60},</div><div class='add'>+	{720, 576, RES_720X576_60HZ_PIXCLOCK, 60},</div><div class='add'>+	{800, 480, RES_800X480_60HZ_PIXCLOCK, 60},</div><div class='add'>+	{800, 600, RES_800X600_60HZ_PIXCLOCK, 60},</div><div class='add'>+	{800, 600, RES_800X600_75HZ_PIXCLOCK, 75},</div><div class='add'>+	{800, 600, RES_800X600_85HZ_PIXCLOCK, 85},</div><div class='add'>+	{800, 600, RES_800X600_100HZ_PIXCLOCK, 100},</div><div class='add'>+	{800, 600, RES_800X600_120HZ_PIXCLOCK, 120},</div><div class='add'>+	{848, 480, RES_848X480_60HZ_PIXCLOCK, 60},</div><div class='add'>+	{856, 480, RES_856X480_60HZ_PIXCLOCK, 60},</div><div class='add'>+	{1024, 512, RES_1024X512_60HZ_PIXCLOCK, 60},</div><div class='add'>+	{1024, 600, RES_1024X600_60HZ_PIXCLOCK, 60},</div><div class='add'>+	{1024, 768, RES_1024X768_60HZ_PIXCLOCK, 60},</div><div class='add'>+	{1024, 768, RES_1024X768_75HZ_PIXCLOCK, 75},</div><div class='add'>+	{1024, 768, RES_1024X768_85HZ_PIXCLOCK, 85},</div><div class='add'>+	{1024, 768, RES_1024X768_100HZ_PIXCLOCK, 100},</div><div class='add'>+/*  {1152,864, RES_1152X864_70HZ_PIXCLOCK,  70},*/</div><div class='add'>+	{1152, 864, RES_1152X864_75HZ_PIXCLOCK, 75},</div><div class='add'>+	{1280, 768, RES_1280X768_60HZ_PIXCLOCK, 60},</div><div class='add'>+	{1280, 800, RES_1280X800_60HZ_PIXCLOCK, 60},</div><div class='add'>+	{1280, 960, RES_1280X960_60HZ_PIXCLOCK, 60},</div><div class='add'>+	{1280, 1024, RES_1280X1024_60HZ_PIXCLOCK, 60},</div><div class='add'>+	{1280, 1024, RES_1280X1024_75HZ_PIXCLOCK, 75},</div><div class='add'>+	{1280, 1024, RES_1280X768_85HZ_PIXCLOCK, 85},</div><div class='add'>+	{1440, 1050, RES_1440X1050_60HZ_PIXCLOCK, 60},</div><div class='add'>+	{1600, 1200, RES_1600X1200_60HZ_PIXCLOCK, 60},</div><div class='add'>+	{1600, 1200, RES_1600X1200_75HZ_PIXCLOCK, 75},</div><div class='add'>+	{1280, 720, RES_1280X720_60HZ_PIXCLOCK, 60},</div><div class='add'>+	{1920, 1080, RES_1920X1080_60HZ_PIXCLOCK, 60},</div><div class='add'>+	{1400, 1050, RES_1400X1050_60HZ_PIXCLOCK, 60},</div><div class='add'>+	{1400, 1050, RES_1400X1050_75HZ_PIXCLOCK, 75},</div><div class='add'>+	{1368, 768, RES_1368X768_60HZ_PIXCLOCK, 60},</div><div class='add'>+	{960, 600, RES_960X600_60HZ_PIXCLOCK, 60},</div><div class='add'>+	{1000, 600, RES_1000X600_60HZ_PIXCLOCK, 60},</div><div class='add'>+	{1024, 576, RES_1024X576_60HZ_PIXCLOCK, 60},</div><div class='add'>+	{1088, 612, RES_1088X612_60HZ_PIXCLOCK, 60},</div><div class='add'>+	{1152, 720, RES_1152X720_60HZ_PIXCLOCK, 60},</div><div class='add'>+	{1200, 720, RES_1200X720_60HZ_PIXCLOCK, 60},</div><div class='add'>+	{1280, 600, RES_1280X600_60HZ_PIXCLOCK, 60},</div><div class='add'>+	{1280, 720, RES_1280X720_50HZ_PIXCLOCK, 50},</div><div class='add'>+	{1280, 768, RES_1280X768_50HZ_PIXCLOCK, 50},</div><div class='add'>+	{1360, 768, RES_1360X768_60HZ_PIXCLOCK, 60},</div><div class='add'>+	{1366, 768, RES_1366X768_50HZ_PIXCLOCK, 50},</div><div class='add'>+	{1366, 768, RES_1366X768_60HZ_PIXCLOCK, 60},</div><div class='add'>+	{1440, 900, RES_1440X900_60HZ_PIXCLOCK, 60},</div><div class='add'>+	{1440, 900, RES_1440X900_75HZ_PIXCLOCK, 75},</div><div class='add'>+	{1600, 900, RES_1600X900_60HZ_PIXCLOCK, 60},</div><div class='add'>+	{1600, 1024, RES_1600X1024_60HZ_PIXCLOCK, 60},</div><div class='add'>+	{1680, 1050, RES_1680X1050_60HZ_PIXCLOCK, 60},</div><div class='add'>+	{1680, 1050, RES_1680X1050_75HZ_PIXCLOCK, 75},</div><div class='add'>+	{1792, 1344, RES_1792X1344_60HZ_PIXCLOCK, 60},</div><div class='add'>+	{1856, 1392, RES_1856X1392_60HZ_PIXCLOCK, 60},</div><div class='add'>+	{1920, 1200, RES_1920X1200_60HZ_PIXCLOCK, 60},</div><div class='add'>+	{1920, 1440, RES_1920X1440_60HZ_PIXCLOCK, 60},</div><div class='add'>+	{1920, 1440, RES_1920X1440_75HZ_PIXCLOCK, 75},</div><div class='add'>+	{2048, 1536, RES_2048X1536_60HZ_PIXCLOCK, 60}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct io_reg CN400_ModeXregs[] = { {VIASR, SR10, 0xFF, 0x01},</div><div class='add'>+{VIASR, SR15, 0x02, 0x02},</div><div class='add'>+{VIASR, SR16, 0xBF, 0x08},</div><div class='add'>+{VIASR, SR17, 0xFF, 0x1F},</div><div class='add'>+{VIASR, SR18, 0xFF, 0x4E},</div><div class='add'>+{VIASR, SR1A, 0xFB, 0x08},</div><div class='add'>+{VIASR, SR1E, 0x0F, 0x01},</div><div class='add'>+{VIASR, SR2A, 0xFF, 0x00},</div><div class='add'>+{VIACR, CR0A, 0xFF, 0x1E},	/* Cursor Start                        */</div><div class='add'>+{VIACR, CR0B, 0xFF, 0x00},	/* Cursor End                          */</div><div class='add'>+{VIACR, CR0E, 0xFF, 0x00},	/* Cursor Location High                */</div><div class='add'>+{VIACR, CR0F, 0xFF, 0x00},	/* Cursor Localtion Low                */</div><div class='add'>+{VIACR, CR32, 0xFF, 0x00},</div><div class='add'>+{VIACR, CR33, 0xFF, 0x00},</div><div class='add'>+{VIACR, CR34, 0xFF, 0x00},</div><div class='add'>+{VIACR, CR35, 0xFF, 0x00},</div><div class='add'>+{VIACR, CR36, 0x08, 0x00},</div><div class='add'>+{VIACR, CR62, 0xFF, 0x00},	/* Secondary Display Starting Address  */</div><div class='add'>+{VIACR, CR63, 0xFF, 0x00},	/* Secondary Display Starting Address  */</div><div class='add'>+{VIACR, CR64, 0xFF, 0x00},	/* Secondary Display Starting Address  */</div><div class='add'>+{VIACR, CR69, 0xFF, 0x00},</div><div class='add'>+{VIACR, CR6A, 0xFF, 0x40},</div><div class='add'>+{VIACR, CR6B, 0xFF, 0x00},</div><div class='add'>+{VIACR, CR6C, 0xFF, 0x00},</div><div class='add'>+{VIACR, CR7A, 0xFF, 0x01},	/* LCD Scaling Parameter 1             */</div><div class='add'>+{VIACR, CR7B, 0xFF, 0x02},	/* LCD Scaling Parameter 2             */</div><div class='add'>+{VIACR, CR7C, 0xFF, 0x03},	/* LCD Scaling Parameter 3             */</div><div class='add'>+{VIACR, CR7D, 0xFF, 0x04},	/* LCD Scaling Parameter 4             */</div><div class='add'>+{VIACR, CR7E, 0xFF, 0x07},	/* LCD Scaling Parameter 5             */</div><div class='add'>+{VIACR, CR7F, 0xFF, 0x0A},	/* LCD Scaling Parameter 6             */</div><div class='add'>+{VIACR, CR80, 0xFF, 0x0D},	/* LCD Scaling Parameter 7             */</div><div class='add'>+{VIACR, CR81, 0xFF, 0x13},	/* LCD Scaling Parameter 8             */</div><div class='add'>+{VIACR, CR82, 0xFF, 0x16},	/* LCD Scaling Parameter 9             */</div><div class='add'>+{VIACR, CR83, 0xFF, 0x19},	/* LCD Scaling Parameter 10            */</div><div class='add'>+{VIACR, CR84, 0xFF, 0x1C},	/* LCD Scaling Parameter 11            */</div><div class='add'>+{VIACR, CR85, 0xFF, 0x1D},	/* LCD Scaling Parameter 12            */</div><div class='add'>+{VIACR, CR86, 0xFF, 0x1E},	/* LCD Scaling Parameter 13            */</div><div class='add'>+{VIACR, CR87, 0xFF, 0x1F},	/* LCD Scaling Parameter 14            */</div><div class='add'>+{VIACR, CR88, 0xFF, 0x40},	/* LCD Panel Type                      */</div><div class='add'>+{VIACR, CR89, 0xFF, 0x00},	/* LCD Timing Control 0                */</div><div class='add'>+{VIACR, CR8A, 0xFF, 0x88},	/* LCD Timing Control 1                */</div><div class='add'>+{VIACR, CR8B, 0xFF, 0x69},	/* LCD Power Sequence Control 0        */</div><div class='add'>+{VIACR, CR8C, 0xFF, 0x57},	/* LCD Power Sequence Control 1        */</div><div class='add'>+{VIACR, CR8D, 0xFF, 0x00},	/* LCD Power Sequence Control 2        */</div><div class='add'>+{VIACR, CR8E, 0xFF, 0x7B},	/* LCD Power Sequence Control 3        */</div><div class='add'>+{VIACR, CR8F, 0xFF, 0x03},	/* LCD Power Sequence Control 4        */</div><div class='add'>+{VIACR, CR90, 0xFF, 0x30},	/* LCD Power Sequence Control 5        */</div><div class='add'>+{VIACR, CR91, 0xFF, 0xA0},	/* 24/12 bit LVDS Data off             */</div><div class='add'>+{VIACR, CR96, 0xFF, 0x00},</div><div class='add'>+{VIACR, CR97, 0xFF, 0x00},</div><div class='add'>+{VIACR, CR99, 0xFF, 0x00},</div><div class='add'>+{VIACR, CR9B, 0xFF, 0x00}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Video Mode Table for VT3314 chipset*/</div><div class='add'>+/* Common Setting for Video Mode */</div><div class='add'>+struct io_reg CN700_ModeXregs[] = { {VIASR, SR10, 0xFF, 0x01},</div><div class='add'>+{VIASR, SR15, 0x02, 0x02},</div><div class='add'>+{VIASR, SR16, 0xBF, 0x08},</div><div class='add'>+{VIASR, SR17, 0xFF, 0x1F},</div><div class='add'>+{VIASR, SR18, 0xFF, 0x4E},</div><div class='add'>+{VIASR, SR1A, 0xFB, 0x82},</div><div class='add'>+{VIASR, SR1B, 0xFF, 0xF0},</div><div class='add'>+{VIASR, SR1F, 0xFF, 0x00},</div><div class='add'>+{VIASR, SR1E, 0xFF, 0x01},</div><div class='add'>+{VIASR, SR22, 0xFF, 0x1F},</div><div class='add'>+{VIASR, SR2A, 0x0F, 0x00},</div><div class='add'>+{VIASR, SR2E, 0xFF, 0xFF},</div><div class='add'>+{VIASR, SR3F, 0xFF, 0xFF},</div><div class='add'>+{VIASR, SR40, 0xF7, 0x00},</div><div class='add'>+{VIASR, CR30, 0xFF, 0x04},</div><div class='add'>+{VIACR, CR32, 0xFF, 0x00},</div><div class='add'>+{VIACR, CR33, 0x7F, 0x00},</div><div class='add'>+{VIACR, CR34, 0xFF, 0x00},</div><div class='add'>+{VIACR, CR35, 0xFF, 0x00},</div><div class='add'>+{VIACR, CR36, 0xFF, 0x31},</div><div class='add'>+{VIACR, CR41, 0xFF, 0x80},</div><div class='add'>+{VIACR, CR42, 0xFF, 0x00},</div><div class='add'>+{VIACR, CR55, 0x80, 0x00},</div><div class='add'>+{VIACR, CR5D, 0x80, 0x00},	/*Horizontal Retrace Start bit[11] should be 0*/</div><div class='add'>+{VIACR, CR62, 0xFF, 0x00},	/* Secondary Display Starting Address */</div><div class='add'>+{VIACR, CR63, 0xFF, 0x00},	/* Secondary Display Starting Address */</div><div class='add'>+{VIACR, CR64, 0xFF, 0x00},	/* Secondary Display Starting Address */</div><div class='add'>+{VIACR, CR68, 0xFF, 0x67},	/* Default FIFO For IGA2 */</div><div class='add'>+{VIACR, CR69, 0xFF, 0x00},</div><div class='add'>+{VIACR, CR6A, 0xFD, 0x40},</div><div class='add'>+{VIACR, CR6B, 0xFF, 0x00},</div><div class='add'>+{VIACR, CR6C, 0xFF, 0x00},</div><div class='add'>+{VIACR, CR77, 0xFF, 0x00},	/* LCD scaling Factor */</div><div class='add'>+{VIACR, CR78, 0xFF, 0x00},	/* LCD scaling Factor */</div><div class='add'>+{VIACR, CR79, 0xFF, 0x00},	/* LCD scaling Factor */</div><div class='add'>+{VIACR, CR9F, 0x03, 0x00},	/* LCD scaling Factor */</div><div class='add'>+{VIACR, CR7A, 0xFF, 0x01},	/* LCD Scaling Parameter 1 */</div><div class='add'>+{VIACR, CR7B, 0xFF, 0x02},	/* LCD Scaling Parameter 2 */</div><div class='add'>+{VIACR, CR7C, 0xFF, 0x03},	/* LCD Scaling Parameter 3 */</div><div class='add'>+{VIACR, CR7D, 0xFF, 0x04},	/* LCD Scaling Parameter 4 */</div><div class='add'>+{VIACR, CR7E, 0xFF, 0x07},	/* LCD Scaling Parameter 5 */</div><div class='add'>+{VIACR, CR7F, 0xFF, 0x0A},	/* LCD Scaling Parameter 6 */</div><div class='add'>+{VIACR, CR80, 0xFF, 0x0D},	/* LCD Scaling Parameter 7 */</div><div class='add'>+{VIACR, CR81, 0xFF, 0x13},	/* LCD Scaling Parameter 8 */</div><div class='add'>+{VIACR, CR82, 0xFF, 0x16},	/* LCD Scaling Parameter 9 */</div><div class='add'>+{VIACR, CR83, 0xFF, 0x19},	/* LCD Scaling Parameter 10 */</div><div class='add'>+{VIACR, CR84, 0xFF, 0x1C},	/* LCD Scaling Parameter 11 */</div><div class='add'>+{VIACR, CR85, 0xFF, 0x1D},	/* LCD Scaling Parameter 12 */</div><div class='add'>+{VIACR, CR86, 0xFF, 0x1E},	/* LCD Scaling Parameter 13 */</div><div class='add'>+{VIACR, CR87, 0xFF, 0x1F},	/* LCD Scaling Parameter 14 */</div><div class='add'>+{VIACR, CR88, 0xFF, 0x40},	/* LCD Panel Type */</div><div class='add'>+{VIACR, CR89, 0xFF, 0x00},	/* LCD Timing Control 0 */</div><div class='add'>+{VIACR, CR8A, 0xFF, 0x88},	/* LCD Timing Control 1 */</div><div class='add'>+{VIACR, CR8B, 0xFF, 0x5D},	/* LCD Power Sequence Control 0 */</div><div class='add'>+{VIACR, CR8C, 0xFF, 0x2B},	/* LCD Power Sequence Control 1 */</div><div class='add'>+{VIACR, CR8D, 0xFF, 0x6F},	/* LCD Power Sequence Control 2 */</div><div class='add'>+{VIACR, CR8E, 0xFF, 0x2B},	/* LCD Power Sequence Control 3 */</div><div class='add'>+{VIACR, CR8F, 0xFF, 0x01},	/* LCD Power Sequence Control 4 */</div><div class='add'>+{VIACR, CR90, 0xFF, 0x01},	/* LCD Power Sequence Control 5 */</div><div class='add'>+{VIACR, CR91, 0xFF, 0xA0},	/* 24/12 bit LVDS Data off */</div><div class='add'>+{VIACR, CR96, 0xFF, 0x00},</div><div class='add'>+{VIACR, CR97, 0xFF, 0x00},</div><div class='add'>+{VIACR, CR99, 0xFF, 0x00},</div><div class='add'>+{VIACR, CR9B, 0xFF, 0x00},</div><div class='add'>+{VIACR, CR9D, 0xFF, 0x80},</div><div class='add'>+{VIACR, CR9E, 0xFF, 0x80}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct io_reg KM400_ModeXregs[] = {</div><div class='add'>+	{VIASR, SR10, 0xFF, 0x01},	/* Unlock Register                 */</div><div class='add'>+	{VIASR, SR16, 0xFF, 0x08},	/* Display FIFO threshold Control  */</div><div class='add'>+	{VIASR, SR17, 0xFF, 0x1F},	/* Display FIFO Control            */</div><div class='add'>+	{VIASR, SR18, 0xFF, 0x4E},	/* GFX PREQ threshold              */</div><div class='add'>+	{VIASR, SR1A, 0xFF, 0x0a},	/* GFX PREQ threshold              */</div><div class='add'>+	{VIASR, SR1F, 0xFF, 0x00},	/* Memory Control 0                */</div><div class='add'>+	{VIASR, SR1B, 0xFF, 0xF0},	/* Power Management Control 0      */</div><div class='add'>+	{VIASR, SR1E, 0xFF, 0x01},	/* Power Management Control        */</div><div class='add'>+	{VIASR, SR20, 0xFF, 0x00},	/* Sequencer Arbiter Control 0     */</div><div class='add'>+	{VIASR, SR21, 0xFF, 0x00},	/* Sequencer Arbiter Control 1     */</div><div class='add'>+	{VIASR, SR22, 0xFF, 0x1F},	/* Display Arbiter Control 1       */</div><div class='add'>+	{VIASR, SR2A, 0xFF, 0x00},	/* Power Management Control 5      */</div><div class='add'>+	{VIASR, SR2D, 0xFF, 0xFF},	/* Power Management Control 1      */</div><div class='add'>+	{VIASR, SR2E, 0xFF, 0xFF},	/* Power Management Control 2      */</div><div class='add'>+	{VIACR, CR0A, 0xFF, 0x1E},	/* Cursor Start                    */</div><div class='add'>+	{VIACR, CR0B, 0xFF, 0x00},	/* Cursor End                      */</div><div class='add'>+	{VIACR, CR0E, 0xFF, 0x00},	/* Cursor Location High            */</div><div class='add'>+	{VIACR, CR0F, 0xFF, 0x00},	/* Cursor Localtion Low            */</div><div class='add'>+	{VIACR, CR33, 0xFF, 0x00},</div><div class='add'>+	{VIACR, CR55, 0x80, 0x00},</div><div class='add'>+	{VIACR, CR5D, 0x80, 0x00},</div><div class='add'>+	{VIACR, CR36, 0xFF, 0x01},	/* Power Mangement 3                  */</div><div class='add'>+	{VIACR, CR62, 0xFF, 0x00},	/* Secondary Display Starting Address */</div><div class='add'>+	{VIACR, CR63, 0xFF, 0x00},	/* Secondary Display Starting Address */</div><div class='add'>+	{VIACR, CR64, 0xFF, 0x00},	/* Secondary Display Starting Address */</div><div class='add'>+	{VIACR, CR68, 0xFF, 0x67},	/* Default FIFO For IGA2              */</div><div class='add'>+	{VIACR, CR6A, 0x20, 0x20},	/* Extended FIFO On                   */</div><div class='add'>+	{VIACR, CR7A, 0xFF, 0x01},	/* LCD Scaling Parameter 1            */</div><div class='add'>+	{VIACR, CR7B, 0xFF, 0x02},	/* LCD Scaling Parameter 2            */</div><div class='add'>+	{VIACR, CR7C, 0xFF, 0x03},	/* LCD Scaling Parameter 3            */</div><div class='add'>+	{VIACR, CR7D, 0xFF, 0x04},	/* LCD Scaling Parameter 4            */</div><div class='add'>+	{VIACR, CR7E, 0xFF, 0x07},	/* LCD Scaling Parameter 5            */</div><div class='add'>+	{VIACR, CR7F, 0xFF, 0x0A},	/* LCD Scaling Parameter 6            */</div><div class='add'>+	{VIACR, CR80, 0xFF, 0x0D},	/* LCD Scaling Parameter 7            */</div><div class='add'>+	{VIACR, CR81, 0xFF, 0x13},	/* LCD Scaling Parameter 8            */</div><div class='add'>+	{VIACR, CR82, 0xFF, 0x16},	/* LCD Scaling Parameter 9            */</div><div class='add'>+	{VIACR, CR83, 0xFF, 0x19},	/* LCD Scaling Parameter 10           */</div><div class='add'>+	{VIACR, CR84, 0xFF, 0x1C},	/* LCD Scaling Parameter 11           */</div><div class='add'>+	{VIACR, CR85, 0xFF, 0x1D},	/* LCD Scaling Parameter 12           */</div><div class='add'>+	{VIACR, CR86, 0xFF, 0x1E},	/* LCD Scaling Parameter 13           */</div><div class='add'>+	{VIACR, CR87, 0xFF, 0x1F},	/* LCD Scaling Parameter 14           */</div><div class='add'>+	{VIACR, CR88, 0xFF, 0x40},	/* LCD Panel Type                     */</div><div class='add'>+	{VIACR, CR89, 0xFF, 0x00},	/* LCD Timing Control 0               */</div><div class='add'>+	{VIACR, CR8A, 0xFF, 0x88},	/* LCD Timing Control 1               */</div><div class='add'>+	{VIACR, CR8B, 0xFF, 0x2D},	/* LCD Power Sequence Control 0       */</div><div class='add'>+	{VIACR, CR8C, 0xFF, 0x2D},	/* LCD Power Sequence Control 1       */</div><div class='add'>+	{VIACR, CR8D, 0xFF, 0xC8},	/* LCD Power Sequence Control 2       */</div><div class='add'>+	{VIACR, CR8E, 0xFF, 0x36},	/* LCD Power Sequence Control 3       */</div><div class='add'>+	{VIACR, CR8F, 0xFF, 0x00},	/* LCD Power Sequence Control 4       */</div><div class='add'>+	{VIACR, CR90, 0xFF, 0x10},	/* LCD Power Sequence Control 5       */</div><div class='add'>+	{VIACR, CR91, 0xFF, 0xA0},	/* 24/12 bit LVDS Data off            */</div><div class='add'>+	{VIACR, CR96, 0xFF, 0x03},	/* DVP0        ; DVP0 Clock Skew */</div><div class='add'>+	{VIACR, CR97, 0xFF, 0x03},	/* DFP high    ; DFPH Clock Skew */</div><div class='add'>+	{VIACR, CR99, 0xFF, 0x03},	/* DFP low           ; DFPL Clock Skew*/</div><div class='add'>+	{VIACR, CR9B, 0xFF, 0x07}	/* DVI on DVP1       ; DVP1 Clock Skew*/</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* For VT3324: Common Setting for Video Mode */</div><div class='add'>+struct io_reg CX700_ModeXregs[] = { {VIASR, SR10, 0xFF, 0x01},</div><div class='add'>+{VIASR, SR15, 0x02, 0x02},</div><div class='add'>+{VIASR, SR16, 0xBF, 0x08},</div><div class='add'>+{VIASR, SR17, 0xFF, 0x1F},</div><div class='add'>+{VIASR, SR18, 0xFF, 0x4E},</div><div class='add'>+{VIASR, SR1A, 0xFB, 0x08},</div><div class='add'>+{VIASR, SR1B, 0xFF, 0xF0},</div><div class='add'>+{VIASR, SR1E, 0xFF, 0x01},</div><div class='add'>+{VIASR, SR2A, 0xFF, 0x00},</div><div class='add'>+{VIASR, SR2D, 0xFF, 0xFF},	/* VCK and LCK PLL power on.           */</div><div class='add'>+{VIACR, CR0A, 0xFF, 0x1E},	/* Cursor Start                        */</div><div class='add'>+{VIACR, CR0B, 0xFF, 0x00},	/* Cursor End                          */</div><div class='add'>+{VIACR, CR0E, 0xFF, 0x00},	/* Cursor Location High                */</div><div class='add'>+{VIACR, CR0F, 0xFF, 0x00},	/* Cursor Localtion Low                */</div><div class='add'>+{VIACR, CR32, 0xFF, 0x00},</div><div class='add'>+{VIACR, CR33, 0xFF, 0x00},</div><div class='add'>+{VIACR, CR34, 0xFF, 0x00},</div><div class='add'>+{VIACR, CR35, 0xFF, 0x00},</div><div class='add'>+{VIACR, CR36, 0x08, 0x00},</div><div class='add'>+{VIACR, CR47, 0xC8, 0x00},	/* Clear VCK Plus. */</div><div class='add'>+{VIACR, CR62, 0xFF, 0x00},	/* Secondary Display Starting Address  */</div><div class='add'>+{VIACR, CR63, 0xFF, 0x00},	/* Secondary Display Starting Address  */</div><div class='add'>+{VIACR, CR64, 0xFF, 0x00},	/* Secondary Display Starting Address  */</div><div class='add'>+{VIACR, CRA3, 0xFF, 0x00},	/* Secondary Display Starting Address  */</div><div class='add'>+{VIACR, CR69, 0xFF, 0x00},</div><div class='add'>+{VIACR, CR6A, 0xFF, 0x40},</div><div class='add'>+{VIACR, CR6B, 0xFF, 0x00},</div><div class='add'>+{VIACR, CR6C, 0xFF, 0x00},</div><div class='add'>+{VIACR, CR7A, 0xFF, 0x01},	/* LCD Scaling Parameter 1             */</div><div class='add'>+{VIACR, CR7B, 0xFF, 0x02},	/* LCD Scaling Parameter 2             */</div><div class='add'>+{VIACR, CR7C, 0xFF, 0x03},	/* LCD Scaling Parameter 3             */</div><div class='add'>+{VIACR, CR7D, 0xFF, 0x04},	/* LCD Scaling Parameter 4             */</div><div class='add'>+{VIACR, CR7E, 0xFF, 0x07},	/* LCD Scaling Parameter 5             */</div><div class='add'>+{VIACR, CR7F, 0xFF, 0x0A},	/* LCD Scaling Parameter 6             */</div><div class='add'>+{VIACR, CR80, 0xFF, 0x0D},	/* LCD Scaling Parameter 7             */</div><div class='add'>+{VIACR, CR81, 0xFF, 0x13},	/* LCD Scaling Parameter 8             */</div><div class='add'>+{VIACR, CR82, 0xFF, 0x16},	/* LCD Scaling Parameter 9             */</div><div class='add'>+{VIACR, CR83, 0xFF, 0x19},	/* LCD Scaling Parameter 10            */</div><div class='add'>+{VIACR, CR84, 0xFF, 0x1C},	/* LCD Scaling Parameter 11            */</div><div class='add'>+{VIACR, CR85, 0xFF, 0x1D},	/* LCD Scaling Parameter 12            */</div><div class='add'>+{VIACR, CR86, 0xFF, 0x1E},	/* LCD Scaling Parameter 13            */</div><div class='add'>+{VIACR, CR87, 0xFF, 0x1F},	/* LCD Scaling Parameter 14            */</div><div class='add'>+{VIACR, CR88, 0xFF, 0x40},	/* LCD Panel Type                      */</div><div class='add'>+{VIACR, CR89, 0xFF, 0x00},	/* LCD Timing Control 0                */</div><div class='add'>+{VIACR, CR8A, 0xFF, 0x88},	/* LCD Timing Control 1                */</div><div class='add'>+{VIACR, CRD4, 0xFF, 0x81},	/* Second power sequence control       */</div><div class='add'>+{VIACR, CR8B, 0xFF, 0x5D},	/* LCD Power Sequence Control 0        */</div><div class='add'>+{VIACR, CR8C, 0xFF, 0x2B},	/* LCD Power Sequence Control 1        */</div><div class='add'>+{VIACR, CR8D, 0xFF, 0x6F},	/* LCD Power Sequence Control 2        */</div><div class='add'>+{VIACR, CR8E, 0xFF, 0x2B},	/* LCD Power Sequence Control 3        */</div><div class='add'>+{VIACR, CR8F, 0xFF, 0x01},	/* LCD Power Sequence Control 4        */</div><div class='add'>+{VIACR, CR90, 0xFF, 0x01},	/* LCD Power Sequence Control 5        */</div><div class='add'>+{VIACR, CR91, 0xFF, 0x80},	/* 24/12 bit LVDS Data off             */</div><div class='add'>+{VIACR, CR96, 0xFF, 0x00},</div><div class='add'>+{VIACR, CR97, 0xFF, 0x00},</div><div class='add'>+{VIACR, CR99, 0xFF, 0x00},</div><div class='add'>+{VIACR, CR9B, 0xFF, 0x00},</div><div class='add'>+{VIACR, CRD2, 0xFF, 0xFF}	/* TMDS/LVDS control register.         */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* For VT3353: Common Setting for Video Mode */</div><div class='add'>+struct io_reg VX800_ModeXregs[] = { {VIASR, SR10, 0xFF, 0x01},</div><div class='add'>+{VIASR, SR15, 0x02, 0x02},</div><div class='add'>+{VIASR, SR16, 0xBF, 0x08},</div><div class='add'>+{VIASR, SR17, 0xFF, 0x1F},</div><div class='add'>+{VIASR, SR18, 0xFF, 0x4E},</div><div class='add'>+{VIASR, SR1A, 0xFB, 0x08},</div><div class='add'>+{VIASR, SR1B, 0xFF, 0xF0},</div><div class='add'>+{VIASR, SR1E, 0xFF, 0x01},</div><div class='add'>+{VIASR, SR2A, 0xFF, 0x00},</div><div class='add'>+{VIASR, SR2D, 0xFF, 0xFF},	/* VCK and LCK PLL power on.           */</div><div class='add'>+{VIACR, CR0A, 0xFF, 0x1E},	/* Cursor Start                        */</div><div class='add'>+{VIACR, CR0B, 0xFF, 0x00},	/* Cursor End                          */</div><div class='add'>+{VIACR, CR0E, 0xFF, 0x00},	/* Cursor Location High                */</div><div class='add'>+{VIACR, CR0F, 0xFF, 0x00},	/* Cursor Localtion Low                */</div><div class='add'>+{VIACR, CR32, 0xFF, 0x00},</div><div class='add'>+{VIACR, CR33, 0xFF, 0x00},</div><div class='add'>+{VIACR, CR34, 0xFF, 0x00},</div><div class='add'>+{VIACR, CR35, 0xFF, 0x00},</div><div class='add'>+{VIACR, CR36, 0x08, 0x00},</div><div class='add'>+{VIACR, CR47, 0xC8, 0x00},	/* Clear VCK Plus. */</div><div class='add'>+{VIACR, CR62, 0xFF, 0x00},	/* Secondary Display Starting Address  */</div><div class='add'>+{VIACR, CR63, 0xFF, 0x00},	/* Secondary Display Starting Address  */</div><div class='add'>+{VIACR, CR64, 0xFF, 0x00},	/* Secondary Display Starting Address  */</div><div class='add'>+{VIACR, CRA3, 0xFF, 0x00},	/* Secondary Display Starting Address  */</div><div class='add'>+{VIACR, CR69, 0xFF, 0x00},</div><div class='add'>+{VIACR, CR6A, 0xFF, 0x40},</div><div class='add'>+{VIACR, CR6B, 0xFF, 0x00},</div><div class='add'>+{VIACR, CR6C, 0xFF, 0x00},</div><div class='add'>+{VIACR, CR7A, 0xFF, 0x01},	/* LCD Scaling Parameter 1             */</div><div class='add'>+{VIACR, CR7B, 0xFF, 0x02},	/* LCD Scaling Parameter 2             */</div><div class='add'>+{VIACR, CR7C, 0xFF, 0x03},	/* LCD Scaling Parameter 3             */</div><div class='add'>+{VIACR, CR7D, 0xFF, 0x04},	/* LCD Scaling Parameter 4             */</div><div class='add'>+{VIACR, CR7E, 0xFF, 0x07},	/* LCD Scaling Parameter 5             */</div><div class='add'>+{VIACR, CR7F, 0xFF, 0x0A},	/* LCD Scaling Parameter 6             */</div><div class='add'>+{VIACR, CR80, 0xFF, 0x0D},	/* LCD Scaling Parameter 7             */</div><div class='add'>+{VIACR, CR81, 0xFF, 0x13},	/* LCD Scaling Parameter 8             */</div><div class='add'>+{VIACR, CR82, 0xFF, 0x16},	/* LCD Scaling Parameter 9             */</div><div class='add'>+{VIACR, CR83, 0xFF, 0x19},	/* LCD Scaling Parameter 10            */</div><div class='add'>+{VIACR, CR84, 0xFF, 0x1C},	/* LCD Scaling Parameter 11            */</div><div class='add'>+{VIACR, CR85, 0xFF, 0x1D},	/* LCD Scaling Parameter 12            */</div><div class='add'>+{VIACR, CR86, 0xFF, 0x1E},	/* LCD Scaling Parameter 13            */</div><div class='add'>+{VIACR, CR87, 0xFF, 0x1F},	/* LCD Scaling Parameter 14            */</div><div class='add'>+{VIACR, CR88, 0xFF, 0x40},	/* LCD Panel Type                      */</div><div class='add'>+{VIACR, CR89, 0xFF, 0x00},	/* LCD Timing Control 0                */</div><div class='add'>+{VIACR, CR8A, 0xFF, 0x88},	/* LCD Timing Control 1                */</div><div class='add'>+{VIACR, CRD4, 0xFF, 0x81},	/* Second power sequence control       */</div><div class='add'>+{VIACR, CR8B, 0xFF, 0x5D},	/* LCD Power Sequence Control 0        */</div><div class='add'>+{VIACR, CR8C, 0xFF, 0x2B},	/* LCD Power Sequence Control 1        */</div><div class='add'>+{VIACR, CR8D, 0xFF, 0x6F},	/* LCD Power Sequence Control 2        */</div><div class='add'>+{VIACR, CR8E, 0xFF, 0x2B},	/* LCD Power Sequence Control 3        */</div><div class='add'>+{VIACR, CR8F, 0xFF, 0x01},	/* LCD Power Sequence Control 4        */</div><div class='add'>+{VIACR, CR90, 0xFF, 0x01},	/* LCD Power Sequence Control 5        */</div><div class='add'>+{VIACR, CR91, 0xFF, 0x80},	/* 24/12 bit LVDS Data off             */</div><div class='add'>+{VIACR, CR96, 0xFF, 0x00},</div><div class='add'>+{VIACR, CR97, 0xFF, 0x00},</div><div class='add'>+{VIACR, CR99, 0xFF, 0x00},</div><div class='add'>+{VIACR, CR9B, 0xFF, 0x00},</div><div class='add'>+{VIACR, CRD2, 0xFF, 0xFF}	/* TMDS/LVDS control register.         */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Video Mode Table */</div><div class='add'>+/* Common Setting for Video Mode */</div><div class='add'>+struct io_reg CLE266_ModeXregs[] = { {VIASR, SR1E, 0xF0, 0x00},</div><div class='add'>+{VIASR, SR2A, 0x0F, 0x00},</div><div class='add'>+{VIASR, SR15, 0x02, 0x02},</div><div class='add'>+{VIASR, SR16, 0xBF, 0x08},</div><div class='add'>+{VIASR, SR17, 0xFF, 0x1F},</div><div class='add'>+{VIASR, SR18, 0xFF, 0x4E},</div><div class='add'>+{VIASR, SR1A, 0xFB, 0x08},</div><div class='add'>+</div><div class='add'>+{VIACR, CR32, 0xFF, 0x00},</div><div class='add'>+{VIACR, CR34, 0xFF, 0x00},</div><div class='add'>+{VIACR, CR35, 0xFF, 0x00},</div><div class='add'>+{VIACR, CR36, 0x08, 0x00},</div><div class='add'>+{VIACR, CR6A, 0xFF, 0x80},</div><div class='add'>+{VIACR, CR6A, 0xFF, 0xC0},</div><div class='add'>+</div><div class='add'>+{VIACR, CR55, 0x80, 0x00},</div><div class='add'>+{VIACR, CR5D, 0x80, 0x00},</div><div class='add'>+</div><div class='add'>+{VIAGR, GR20, 0xFF, 0x00},</div><div class='add'>+{VIAGR, GR21, 0xFF, 0x00},</div><div class='add'>+{VIAGR, GR22, 0xFF, 0x00},</div><div class='add'>+	/* LCD Parameters */</div><div class='add'>+{VIACR, CR7A, 0xFF, 0x01},	/* LCD Parameter 1 */</div><div class='add'>+{VIACR, CR7B, 0xFF, 0x02},	/* LCD Parameter 2 */</div><div class='add'>+{VIACR, CR7C, 0xFF, 0x03},	/* LCD Parameter 3 */</div><div class='add'>+{VIACR, CR7D, 0xFF, 0x04},	/* LCD Parameter 4 */</div><div class='add'>+{VIACR, CR7E, 0xFF, 0x07},	/* LCD Parameter 5 */</div><div class='add'>+{VIACR, CR7F, 0xFF, 0x0A},	/* LCD Parameter 6 */</div><div class='add'>+{VIACR, CR80, 0xFF, 0x0D},	/* LCD Parameter 7 */</div><div class='add'>+{VIACR, CR81, 0xFF, 0x13},	/* LCD Parameter 8 */</div><div class='add'>+{VIACR, CR82, 0xFF, 0x16},	/* LCD Parameter 9 */</div><div class='add'>+{VIACR, CR83, 0xFF, 0x19},	/* LCD Parameter 10 */</div><div class='add'>+{VIACR, CR84, 0xFF, 0x1C},	/* LCD Parameter 11 */</div><div class='add'>+{VIACR, CR85, 0xFF, 0x1D},	/* LCD Parameter 12 */</div><div class='add'>+{VIACR, CR86, 0xFF, 0x1E},	/* LCD Parameter 13 */</div><div class='add'>+{VIACR, CR87, 0xFF, 0x1F},	/* LCD Parameter 14 */</div><div class='add'>+</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Mode:1024X768 */</div><div class='add'>+struct io_reg PM1024x768[] = { {VIASR, 0x16, 0xBF, 0x0C},</div><div class='add'>+{VIASR, 0x18, 0xFF, 0x4C}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct patch_table res_patch_table[] = {</div><div class='add'>+	{VIA_RES_1024X768, ARRAY_SIZE(PM1024x768), PM1024x768}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* struct VPITTable {</div><div class='add'>+	unsigned char  Misc;</div><div class='add'>+	unsigned char  SR[StdSR];</div><div class='add'>+	unsigned char  CR[StdCR];</div><div class='add'>+	unsigned char  GR[StdGR];</div><div class='add'>+	unsigned char  AR[StdAR];</div><div class='add'>+ };*/</div><div class='add'>+</div><div class='add'>+struct VPITTable VPIT = {</div><div class='add'>+	/* Msic */</div><div class='add'>+	0xC7,</div><div class='add'>+	/* Sequencer */</div><div class='add'>+	{0x01, 0x0F, 0x00, 0x0E},</div><div class='add'>+	/* Graphic Controller */</div><div class='add'>+	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x0F, 0xFF},</div><div class='add'>+	/* Attribute Controller */</div><div class='add'>+	{0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,</div><div class='add'>+	 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,</div><div class='add'>+	 0x01, 0x00, 0x0F, 0x00}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/********************/</div><div class='add'>+/* Mode Table       */</div><div class='add'>+/********************/</div><div class='add'>+</div><div class='add'>+/* 480x640 */</div><div class='add'>+struct crt_mode_table CRTM480x640[] = {</div><div class='add'>+	/* r_rate,          vclk,              hsp,             vsp   */</div><div class='add'>+	/* HT,  HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */</div><div class='add'>+	{REFRESH_60, CLK_25_175M, M480X640_R60_HSP, M480X640_R60_VSP,</div><div class='add'>+	 {624, 480, 480, 144, 504, 48, 663, 640, 640, 23, 641, 3} }	/* GTF*/</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* 640x480*/</div><div class='add'>+struct crt_mode_table CRTM640x480[] = {</div><div class='add'>+	/*r_rate,vclk,hsp,vsp */</div><div class='add'>+	/*HT,  HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */</div><div class='add'>+	{REFRESH_60, CLK_25_175M, M640X480_R60_HSP, M640X480_R60_VSP,</div><div class='add'>+	 {800, 640, 648, 144, 656, 96, 525, 480, 480, 45, 490, 2} },</div><div class='add'>+	{REFRESH_75, CLK_31_500M, M640X480_R75_HSP, M640X480_R75_VSP,</div><div class='add'>+	 {840, 640, 640, 200, 656, 64, 500, 480, 480, 20, 481, 3} },</div><div class='add'>+	{REFRESH_85, CLK_36_000M, M640X480_R85_HSP, M640X480_R85_VSP,</div><div class='add'>+	 {832, 640, 640, 192, 696, 56, 509, 480, 480, 29, 481, 3} },</div><div class='add'>+	{REFRESH_100, CLK_43_163M, M640X480_R100_HSP, M640X480_R100_VSP,</div><div class='add'>+	 {848, 640, 640, 208, 680, 64, 509, 480, 480, 29, 481, 3} }, /*GTF*/</div><div class='add'>+	    {REFRESH_120, CLK_52_406M, M640X480_R120_HSP,</div><div class='add'>+	     M640X480_R120_VSP,</div><div class='add'>+	     {848, 640, 640, 208, 680, 64, 515, 480, 480, 35, 481,</div><div class='add'>+	      3} } /*GTF*/</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*720x480 (GTF)*/</div><div class='add'>+struct crt_mode_table CRTM720x480[] = {</div><div class='add'>+	/*r_rate,vclk,hsp,vsp      */</div><div class='add'>+	/*HT, HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */</div><div class='add'>+	{REFRESH_60, CLK_26_880M, M720X480_R60_HSP, M720X480_R60_VSP,</div><div class='add'>+	 {896, 720, 720, 176, 736, 72, 497, 480, 480, 17, 481, 3} }</div><div class='add'>+</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*720x576 (GTF)*/</div><div class='add'>+struct crt_mode_table CRTM720x576[] = {</div><div class='add'>+	/*r_rate,vclk,hsp,vsp */</div><div class='add'>+	/*HT,  HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */</div><div class='add'>+	{REFRESH_60, CLK_32_668M, M720X576_R60_HSP, M720X576_R60_VSP,</div><div class='add'>+	 {912, 720, 720, 192, 744, 72, 597, 576, 576, 21, 577, 3} }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* 800x480 (CVT) */</div><div class='add'>+struct crt_mode_table CRTM800x480[] = {</div><div class='add'>+	/* r_rate,          vclk,              hsp,             vsp   */</div><div class='add'>+	/* HT,  HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */</div><div class='add'>+	{REFRESH_60, CLK_29_581M, M800X480_R60_HSP, M800X480_R60_VSP,</div><div class='add'>+	 {992, 800, 800, 192, 824, 72, 500, 480, 480, 20, 483, 7} }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* 800x600*/</div><div class='add'>+struct crt_mode_table CRTM800x600[] = {</div><div class='add'>+	/*r_rate,vclk,hsp,vsp     */</div><div class='add'>+	/*HT,   HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */</div><div class='add'>+	{REFRESH_60, CLK_40_000M, M800X600_R60_HSP, M800X600_R60_VSP,</div><div class='add'>+	 {1056, 800, 800, 256, 840, 128, 628, 600, 600, 28, 601, 4} },</div><div class='add'>+	{REFRESH_75, CLK_49_500M, M800X600_R75_HSP, M800X600_R75_VSP,</div><div class='add'>+	 {1056, 800, 800, 256, 816, 80, 625, 600, 600, 25, 601, 3} },</div><div class='add'>+	{REFRESH_85, CLK_56_250M, M800X600_R85_HSP, M800X600_R85_VSP,</div><div class='add'>+	 {1048, 800, 800, 248, 832, 64, 631, 600, 600, 31, 601, 3} },</div><div class='add'>+	{REFRESH_100, CLK_68_179M, M800X600_R100_HSP, M800X600_R100_VSP,</div><div class='add'>+	 {1072, 800, 800, 272, 848, 88, 636, 600, 600, 36, 601, 3} },</div><div class='add'>+	{REFRESH_120, CLK_83_950M, M800X600_R120_HSP,</div><div class='add'>+		  M800X600_R120_VSP,</div><div class='add'>+		  {1088, 800, 800, 288, 856, 88, 643, 600, 600, 43, 601,</div><div class='add'>+		   3} }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* 848x480 (CVT) */</div><div class='add'>+struct crt_mode_table CRTM848x480[] = {</div><div class='add'>+	/* r_rate,          vclk,              hsp,             vsp   */</div><div class='add'>+	/* HT,  HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */</div><div class='add'>+	{REFRESH_60, CLK_31_500M, M848X480_R60_HSP, M848X480_R60_VSP,</div><div class='add'>+	 {1056, 848, 848, 208, 872, 80, 500, 480, 480, 20, 483, 5} }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*856x480 (GTF) convert to 852x480*/</div><div class='add'>+struct crt_mode_table CRTM852x480[] = {</div><div class='add'>+	/*r_rate,vclk,hsp,vsp     */</div><div class='add'>+	/*HT,   HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */</div><div class='add'>+	{REFRESH_60, CLK_31_728M, M852X480_R60_HSP, M852X480_R60_VSP,</div><div class='add'>+	{1064, 856, 856, 208, 872, 88, 497, 480, 480, 17, 481, 3} }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*1024x512 (GTF)*/</div><div class='add'>+struct crt_mode_table CRTM1024x512[] = {</div><div class='add'>+	/*r_rate,vclk,hsp,vsp     */</div><div class='add'>+	/*HT,   HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */</div><div class='add'>+	{REFRESH_60, CLK_41_291M, M1024X512_R60_HSP, M1024X512_R60_VSP,</div><div class='add'>+	 {1296, 1024, 1024, 272, 1056, 104, 531, 512, 512, 19, 513, 3} }</div><div class='add'>+</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* 1024x600*/</div><div class='add'>+struct crt_mode_table CRTM1024x600[] = {</div><div class='add'>+	/*r_rate,vclk,hsp,vsp */</div><div class='add'>+	/*HT,  HA,   HBS,  HBE, HSS,  HSE, VT,  VA,  VBS, VBE, VSS, VSE */</div><div class='add'>+	{REFRESH_60, CLK_48_875M, M1024X600_R60_HSP, M1024X600_R60_VSP,</div><div class='add'>+	 {1312, 1024, 1024, 288, 1064, 104, 622, 600, 600, 22, 601, 3} },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* 1024x768*/</div><div class='add'>+struct crt_mode_table CRTM1024x768[] = {</div><div class='add'>+	/*r_rate,vclk,hsp,vsp */</div><div class='add'>+	/*HT,  HA,   HBS,  HBE, HSS,  HSE, VT,  VA,  VBS, VBE, VSS, VSE */</div><div class='add'>+	{REFRESH_60, CLK_65_000M, M1024X768_R60_HSP, M1024X768_R60_VSP,</div><div class='add'>+	{1344, 1024, 1024, 320, 1048, 136, 806, 768, 768, 38, 771, 6} },</div><div class='add'>+	{REFRESH_75, CLK_78_750M, M1024X768_R75_HSP, M1024X768_R75_VSP,</div><div class='add'>+	{1312, 1024, 1024, 288, 1040, 96, 800, 768, 768, 32, 769, 3} },</div><div class='add'>+	{REFRESH_85, CLK_94_500M, M1024X768_R85_HSP, M1024X768_R85_VSP,</div><div class='add'>+	{1376, 1024, 1024, 352, 1072, 96, 808, 768, 768, 40, 769, 3} },</div><div class='add'>+	{REFRESH_100, CLK_113_309M, M1024X768_R100_HSP, M1024X768_R100_VSP,</div><div class='add'>+	{1392, 1024, 1024, 368, 1096, 112, 814, 768, 768, 46, 769, 3} }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* 1152x864*/</div><div class='add'>+struct crt_mode_table CRTM1152x864[] = {</div><div class='add'>+	/*r_rate,vclk,hsp,vsp      */</div><div class='add'>+	/*HT,  HA,   HBS,  HBE, HSS,  HSE, VT,  VA,  VBS, VBE, VSS, VSE */</div><div class='add'>+	{REFRESH_75, CLK_108_000M, M1152X864_R75_HSP, M1152X864_R75_VSP,</div><div class='add'>+	 {1600, 1152, 1152, 448, 1216, 128, 900, 864, 864, 36, 865, 3} }</div><div class='add'>+</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* 1280x720 (HDMI 720P)*/</div><div class='add'>+struct crt_mode_table CRTM1280x720[] = {</div><div class='add'>+	/*r_rate,vclk,hsp,vsp */</div><div class='add'>+	/*HT,  HA,   HBS,  HBE, HSS,  HSE, VT,  VA,  VBS, VBE, VSS, VSE      */</div><div class='add'>+	{REFRESH_60, CLK_74_481M, M1280X720_R60_HSP, M1280X720_R60_VSP,</div><div class='add'>+	 {1648, 1280, 1280, 368, 1392, 40, 750, 720, 720, 30, 725, 5} },</div><div class='add'>+	{REFRESH_50, CLK_60_466M, M1280X720_R50_HSP, M1280X720_R50_VSP,</div><div class='add'>+	 {1632, 1280, 1280, 352, 1328, 128, 741, 720, 720, 21, 721, 3} }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*1280x768 (GTF)*/</div><div class='add'>+struct crt_mode_table CRTM1280x768[] = {</div><div class='add'>+	/*r_rate,vclk,hsp,vsp     */</div><div class='add'>+	/*HT,  HA,   HBS,  HBE, HSS,  HSE, VT,  VA,  VBS, VBE, VSS, VSE */</div><div class='add'>+	{REFRESH_60, CLK_80_136M, M1280X768_R60_HSP, M1280X768_R60_VSP,</div><div class='add'>+	 {1680, 1280, 1280, 400, 1344, 136, 795, 768, 768, 27, 769, 3} },</div><div class='add'>+	{REFRESH_50, CLK_65_178M, M1280X768_R50_HSP, M1280X768_R50_VSP,</div><div class='add'>+	 {1648, 1280, 1280, 368, 1336, 128, 791, 768, 768, 23, 769, 3} }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* 1280x800 (CVT) */</div><div class='add'>+struct crt_mode_table CRTM1280x800[] = {</div><div class='add'>+	/* r_rate,          vclk,              hsp,             vsp   */</div><div class='add'>+	/* HT,  HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */</div><div class='add'>+	{REFRESH_60, CLK_83_375M, M1280X800_R60_HSP, M1280X800_R60_VSP,</div><div class='add'>+	 {1680, 1280, 1280, 400, 1352, 128, 831, 800, 800, 31, 803, 6} }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*1280x960*/</div><div class='add'>+struct crt_mode_table CRTM1280x960[] = {</div><div class='add'>+	/*r_rate,vclk,hsp,vsp */</div><div class='add'>+	/*HT,  HA,   HBS,  HBE, HSS,  HSE, VT,  VA,  VBS, VBE, VSS, VSE */</div><div class='add'>+	{REFRESH_60, CLK_108_000M, M1280X960_R60_HSP, M1280X960_R60_VSP,</div><div class='add'>+	 {1800, 1280, 1280, 520, 1376, 112, 1000, 960, 960, 40, 961, 3} }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* 1280x1024*/</div><div class='add'>+struct crt_mode_table CRTM1280x1024[] = {</div><div class='add'>+	/*r_rate,vclk,,hsp,vsp */</div><div class='add'>+	/*HT,  HA,   HBS,  HBE, HSS,  HSE, VT,  VA,  VBS, VBE, VSS, VSE */</div><div class='add'>+	{REFRESH_60, CLK_108_000M, M1280X1024_R60_HSP, M1280X1024_R60_VSP,</div><div class='add'>+	 {1688, 1280, 1280, 408, 1328, 112, 1066, 1024, 1024, 42, 1025,</div><div class='add'>+	  3} },</div><div class='add'>+	{REFRESH_75, CLK_135_000M, M1280X1024_R75_HSP, M1280X1024_R75_VSP,</div><div class='add'>+	 {1688, 1280, 1280, 408, 1296, 144, 1066, 1024, 1024, 42, 1025,</div><div class='add'>+	  3} },</div><div class='add'>+	{REFRESH_85, CLK_157_500M, M1280X1024_R85_HSP, M1280X1024_R85_VSP,</div><div class='add'>+	 {1728, 1280, 1280, 448, 1344, 160, 1072, 1024, 1024, 48, 1025, 3} }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* 1368x768 (GTF) */</div><div class='add'>+struct crt_mode_table CRTM1368x768[] = {</div><div class='add'>+	/* r_rate,  vclk, hsp, vsp */</div><div class='add'>+	/* HT,  HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */</div><div class='add'>+	{REFRESH_60, CLK_85_860M, M1368X768_R60_HSP, M1368X768_R60_VSP,</div><div class='add'>+	 {1800, 1368, 1368, 432, 1440, 144, 795, 768, 768, 27, 769, 3} }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*1440x1050 (GTF)*/</div><div class='add'>+struct crt_mode_table CRTM1440x1050[] = {</div><div class='add'>+	/*r_rate,vclk,hsp,vsp      */</div><div class='add'>+	/*HT,  HA,   HBS,  HBE, HSS,  HSE, VT,  VA,  VBS, VBE, VSS, VSE */</div><div class='add'>+	{REFRESH_60, CLK_125_104M, M1440X1050_R60_HSP, M1440X1050_R60_VSP,</div><div class='add'>+	 {1936, 1440, 1440, 496, 1536, 152, 1077, 1040, 1040, 37, 1041, 3} }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* 1600x1200*/</div><div class='add'>+struct crt_mode_table CRTM1600x1200[] = {</div><div class='add'>+	/*r_rate,vclk,hsp,vsp */</div><div class='add'>+	/*HT,  HA,   HBS,  HBE, HSS,  HSE, VT,  VA,  VBS, VBE, VSS, VSE */</div><div class='add'>+	{REFRESH_60, CLK_162_000M, M1600X1200_R60_HSP, M1600X1200_R60_VSP,</div><div class='add'>+	 {2160, 1600, 1600, 560, 1664, 192, 1250, 1200, 1200, 50, 1201,</div><div class='add'>+	  3} },</div><div class='add'>+	{REFRESH_75, CLK_202_500M, M1600X1200_R75_HSP, M1600X1200_R75_VSP,</div><div class='add'>+	 {2160, 1600, 1600, 560, 1664, 192, 1250, 1200, 1200, 50, 1201, 3} }</div><div class='add'>+</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* 1680x1050 (CVT) */</div><div class='add'>+struct crt_mode_table CRTM1680x1050[] = {</div><div class='add'>+	/* r_rate,          vclk,              hsp,             vsp  */</div><div class='add'>+	/* HT,  HA,  HBS, HBE, HSS, HSE,    VT,  VA,  VBS, VBE,  VSS, VSE */</div><div class='add'>+	{REFRESH_60, CLK_146_760M, M1680x1050_R60_HSP, M1680x1050_R60_VSP,</div><div class='add'>+	 {2240, 1680, 1680, 560, 1784, 176, 1089, 1050, 1050, 39, 1053,</div><div class='add'>+	  6} },</div><div class='add'>+	{REFRESH_75, CLK_187_000M, M1680x1050_R75_HSP, M1680x1050_R75_VSP,</div><div class='add'>+	 {2272, 1680, 1680, 592, 1800, 176, 1099, 1050, 1050, 49, 1053, 6} }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* 1680x1050 (CVT Reduce Blanking) */</div><div class='add'>+struct crt_mode_table CRTM1680x1050_RB[] = {</div><div class='add'>+	/* r_rate,          vclk,              hsp,             vsp   */</div><div class='add'>+	/* HT,  HA,  HBS, HBE, HSS, HSE,    VT,  VA,  VBS, VBE,  VSS, VSE */</div><div class='add'>+	{REFRESH_60, CLK_119_000M, M1680x1050_RB_R60_HSP,</div><div class='add'>+	 M1680x1050_RB_R60_VSP,</div><div class='add'>+	 {1840, 1680, 1680, 160, 1728, 32, 1080, 1050, 1050, 30, 1053, 6} }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* 1920x1080 (CVT)*/</div><div class='add'>+struct crt_mode_table CRTM1920x1080[] = {</div><div class='add'>+	/*r_rate,vclk,hsp,vsp */</div><div class='add'>+	/*HT,  HA,   HBS,  HBE, HSS,  HSE, VT,  VA,  VBS, VBE, VSS, VSE */</div><div class='add'>+	{REFRESH_60, CLK_172_798M, M1920X1080_R60_HSP, M1920X1080_R60_VSP,</div><div class='add'>+	 {2576, 1920, 1920, 656, 2048, 200, 1120, 1080, 1080, 40, 1083, 5} }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* 1920x1080 (CVT with Reduce Blanking) */</div><div class='add'>+struct crt_mode_table CRTM1920x1080_RB[] = {</div><div class='add'>+	/* r_rate,          vclk,              hsp,             vsp   */</div><div class='add'>+	/* HT,  HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */</div><div class='add'>+	{REFRESH_60, CLK_138_400M, M1920X1080_RB_R60_HSP,</div><div class='add'>+	 M1920X1080_RB_R60_VSP,</div><div class='add'>+	 {2080, 1920, 1920, 160, 1968, 32, 1111, 1080, 1080, 31, 1083, 5} }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* 1920x1440*/</div><div class='add'>+struct crt_mode_table CRTM1920x1440[] = {</div><div class='add'>+	/*r_rate,vclk,hsp,vsp */</div><div class='add'>+	/*HT,  HA,   HBS,  HBE, HSS,  HSE, VT,  VA,  VBS, VBE, VSS, VSE */</div><div class='add'>+	{REFRESH_60, CLK_234_000M, M1920X1440_R60_HSP, M1920X1440_R60_VSP,</div><div class='add'>+	 {2600, 1920, 1920, 680, 2048, 208, 1500, 1440, 1440, 60, 1441,</div><div class='add'>+	  3} },</div><div class='add'>+	{REFRESH_75, CLK_297_500M, M1920X1440_R75_HSP, M1920X1440_R75_VSP,</div><div class='add'>+	 {2640, 1920, 1920, 720, 2064, 224, 1500, 1440, 1440, 60, 1441, 3} }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* 1400x1050 (CVT) */</div><div class='add'>+struct crt_mode_table CRTM1400x1050[] = {</div><div class='add'>+	/* r_rate,          vclk,              hsp,             vsp   */</div><div class='add'>+	/* HT,  HA,  HBS, HBE,  HSS, HSE,   VT,  VA,  VBS, VBE,  VSS, VSE */</div><div class='add'>+	{REFRESH_60, CLK_121_750M, M1400X1050_R60_HSP, M1400X1050_R60_VSP,</div><div class='add'>+	 {1864, 1400, 1400, 464, 1488, 144, 1089, 1050, 1050, 39, 1053,</div><div class='add'>+	  4} },</div><div class='add'>+	{REFRESH_75, CLK_156_000M, M1400X1050_R75_HSP, M1400X1050_R75_VSP,</div><div class='add'>+	 {1896, 1400, 1400, 496, 1504, 144, 1099, 1050, 1050, 49, 1053, 4} }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* 1400x1050 (CVT Reduce Blanking) */</div><div class='add'>+struct crt_mode_table CRTM1400x1050_RB[] = {</div><div class='add'>+	/* r_rate,          vclk,              hsp,             vsp   */</div><div class='add'>+	/* HT,  HA,  HBS, HBE,  HSS, HSE,   VT,  VA,  VBS, VBE,  VSS, VSE */</div><div class='add'>+	{REFRESH_60, CLK_101_000M, M1400X1050_RB_R60_HSP,</div><div class='add'>+	 M1400X1050_RB_R60_VSP,</div><div class='add'>+	 {1560, 1400, 1400, 160, 1448, 32, 1080, 1050, 1050, 30, 1053, 4} }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* 960x600 (CVT) */</div><div class='add'>+struct crt_mode_table CRTM960x600[] = {</div><div class='add'>+	/* r_rate,          vclk,              hsp,             vsp   */</div><div class='add'>+	/* HT,  HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */</div><div class='add'>+	{REFRESH_60, CLK_45_250M, M960X600_R60_HSP, M960X600_R60_VSP,</div><div class='add'>+	 {1216, 960, 960, 256, 992, 96, 624, 600, 600, 24, 603, 6} }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* 1000x600 (GTF) */</div><div class='add'>+struct crt_mode_table CRTM1000x600[] = {</div><div class='add'>+	/* r_rate,          vclk,              hsp,             vsp   */</div><div class='add'>+	/* HT,  HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */</div><div class='add'>+	{REFRESH_60, CLK_48_000M, M1000X600_R60_HSP, M1000X600_R60_VSP,</div><div class='add'>+	 {1288, 1000, 1000, 288, 1040, 104, 622, 600, 600, 22, 601, 3} }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* 1024x576 (GTF) */</div><div class='add'>+struct crt_mode_table CRTM1024x576[] = {</div><div class='add'>+	/* r_rate,          vclk,              hsp,             vsp   */</div><div class='add'>+	/* HT,  HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */</div><div class='add'>+	{REFRESH_60, CLK_46_996M, M1024X576_R60_HSP, M1024X576_R60_VSP,</div><div class='add'>+	 {1312, 1024, 1024, 288, 1064, 104, 597, 576, 576, 21, 577, 3} }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* 1088x612 (CVT) */</div><div class='add'>+struct crt_mode_table CRTM1088x612[] = {</div><div class='add'>+	/* r_rate,          vclk,              hsp,             vsp   */</div><div class='add'>+	/* HT,  HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */</div><div class='add'>+	{REFRESH_60, CLK_52_977M, M1088X612_R60_HSP, M1088X612_R60_VSP,</div><div class='add'>+	 {1392, 1088, 1088, 304, 1136, 104, 636, 612, 612, 24, 615, 5} }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* 1152x720 (CVT) */</div><div class='add'>+struct crt_mode_table CRTM1152x720[] = {</div><div class='add'>+	/* r_rate,          vclk,              hsp,             vsp   */</div><div class='add'>+	/* HT,  HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */</div><div class='add'>+	{REFRESH_60, CLK_66_750M, M1152X720_R60_HSP, M1152X720_R60_VSP,</div><div class='add'>+	 {1488, 1152, 1152, 336, 1208, 112, 748, 720, 720, 28, 723, 6} }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* 1200x720 (GTF) */</div><div class='add'>+struct crt_mode_table CRTM1200x720[] = {</div><div class='add'>+	/* r_rate,          vclk,              hsp,             vsp   */</div><div class='add'>+	/* HT,  HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */</div><div class='add'>+	{REFRESH_60, CLK_70_159M, M1200X720_R60_HSP, M1200X720_R60_VSP,</div><div class='add'>+	 {1568, 1200, 1200, 368, 1256, 128, 746, 720, 720, 26, 721, 3} }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* 1280x600 (GTF) */</div><div class='add'>+struct crt_mode_table CRTM1280x600[] = {</div><div class='add'>+	/* r_rate,          vclk,              hsp,             vsp   */</div><div class='add'>+	/* HT,  HA,  HBS, HBE,  HSS, HSE, VT,  VA,  VBS, VBE,  VSS, VSE */</div><div class='add'>+	{REFRESH_60, CLK_61_500M, M1280x600_R60_HSP, M1280x600_R60_VSP,</div><div class='add'>+	 {1648, 1280, 1280, 368, 1336, 128, 622, 600, 600, 22, 601, 3} }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* 1360x768 (CVT) */</div><div class='add'>+struct crt_mode_table CRTM1360x768[] = {</div><div class='add'>+	/* r_rate,          vclk,              hsp,             vsp   */</div><div class='add'>+	/* HT,  HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */</div><div class='add'>+	{REFRESH_60, CLK_84_750M, M1360X768_R60_HSP, M1360X768_R60_VSP,</div><div class='add'>+	 {1776, 1360, 1360, 416, 1432, 136, 798, 768, 768, 30, 771, 5} }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* 1360x768 (CVT Reduce Blanking) */</div><div class='add'>+struct crt_mode_table CRTM1360x768_RB[] = {</div><div class='add'>+	/* r_rate,          vclk,              hsp,             vsp   */</div><div class='add'>+	/* HT,  HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */</div><div class='add'>+	{REFRESH_60, CLK_72_000M, M1360X768_RB_R60_HSP,</div><div class='add'>+	 M1360X768_RB_R60_VSP,</div><div class='add'>+	 {1520, 1360, 1360, 160, 1408, 32, 790, 768, 768, 22, 771, 5} }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* 1366x768 (GTF) */</div><div class='add'>+struct crt_mode_table CRTM1366x768[] = {</div><div class='add'>+	/* r_rate,          vclk,              hsp,             vsp   */</div><div class='add'>+	/* HT,  HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */</div><div class='add'>+	{REFRESH_60, CLK_85_860M, M1368X768_R60_HSP, M1368X768_R60_VSP,</div><div class='add'>+	 {1800, 1368, 1368, 432, 1440, 144, 795, 768, 768, 27, 769, 3} },</div><div class='add'>+	{REFRESH_50, CLK_69_924M, M1368X768_R50_HSP, M1368X768_R50_VSP,</div><div class='add'>+	 {1768, 1368, 1368, 400, 1424, 144, 791, 768, 768, 23, 769, 3} }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* 1440x900 (CVT) */</div><div class='add'>+struct crt_mode_table CRTM1440x900[] = {</div><div class='add'>+	/* r_rate,          vclk,              hsp,             vsp   */</div><div class='add'>+	/* HT,  HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */</div><div class='add'>+	{REFRESH_60, CLK_106_500M, M1440X900_R60_HSP, M1440X900_R60_VSP,</div><div class='add'>+	 {1904, 1440, 1440, 464, 1520, 152, 934, 900, 900, 34, 903, 6} },</div><div class='add'>+	{REFRESH_75, CLK_136_700M, M1440X900_R75_HSP, M1440X900_R75_VSP,</div><div class='add'>+	 {1936, 1440, 1440, 496, 1536, 152, 942, 900, 900, 42, 903, 6} }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* 1440x900 (CVT Reduce Blanking) */</div><div class='add'>+struct crt_mode_table CRTM1440x900_RB[] = {</div><div class='add'>+	/* r_rate,          vclk,              hsp,             vsp   */</div><div class='add'>+	/* HT,  HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */</div><div class='add'>+	{REFRESH_60, CLK_88_750M, M1440X900_RB_R60_HSP,</div><div class='add'>+	 M1440X900_RB_R60_VSP,</div><div class='add'>+	 {1600, 1440, 1440, 160, 1488, 32, 926, 900, 900, 26, 903, 6} }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* 1600x900 (CVT) */</div><div class='add'>+struct crt_mode_table CRTM1600x900[] = {</div><div class='add'>+	/* r_rate,          vclk,              hsp,             vsp   */</div><div class='add'>+	/* HT,  HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */</div><div class='add'>+	{REFRESH_60, CLK_118_840M, M1600X900_R60_HSP, M1600X900_R60_VSP,</div><div class='add'>+	 {2112, 1600, 1600, 512, 1688, 168, 934, 900, 900, 34, 903, 5} }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* 1600x900 (CVT Reduce Blanking) */</div><div class='add'>+struct crt_mode_table CRTM1600x900_RB[] = {</div><div class='add'>+	/* r_rate,        vclk,           hsp,        vsp   */</div><div class='add'>+	/* HT,  HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */</div><div class='add'>+	{REFRESH_60, CLK_97_750M, M1600X900_RB_R60_HSP,</div><div class='add'>+	 M1600X900_RB_R60_VSP,</div><div class='add'>+	 {1760, 1600, 1600, 160, 1648, 32, 926, 900, 900, 26, 903, 5} }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* 1600x1024 (GTF) */</div><div class='add'>+struct crt_mode_table CRTM1600x1024[] = {</div><div class='add'>+	/* r_rate,          vclk,              hsp,             vsp   */</div><div class='add'>+	/* HT,  HA,  HBS, HBE,  HSS, HSE,   VT,  VA,  VBS, VBE,  VSS, VSE */</div><div class='add'>+	{REFRESH_60, CLK_136_700M, M1600X1024_R60_HSP, M1600X1024_R60_VSP,</div><div class='add'>+	 {2144, 1600, 1600, 544, 1704, 168, 1060, 1024, 1024, 36, 1025, 3} }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* 1792x1344 (DMT) */</div><div class='add'>+struct crt_mode_table CRTM1792x1344[] = {</div><div class='add'>+	/* r_rate,          vclk,              hsp,             vsp   */</div><div class='add'>+	/* HT,  HA,  HBS, HBE,  HSS, HSE,   VT,  VA,  VBS, VBE,  VSS, VSE */</div><div class='add'>+	{REFRESH_60, CLK_204_000M, M1792x1344_R60_HSP, M1792x1344_R60_VSP,</div><div class='add'>+	 {2448, 1792, 1792, 656, 1920, 200, 1394, 1344, 1344, 50, 1345, 3} }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* 1856x1392 (DMT) */</div><div class='add'>+struct crt_mode_table CRTM1856x1392[] = {</div><div class='add'>+	/* r_rate,          vclk,              hsp,             vsp   */</div><div class='add'>+	/* HT,  HA,  HBS, HBE,  HSS, HSE,   VT,  VA,  VBS, VBE,  VSS, VSE */</div><div class='add'>+	{REFRESH_60, CLK_218_500M, M1856x1392_R60_HSP, M1856x1392_R60_VSP,</div><div class='add'>+	 {2528, 1856, 1856, 672, 1952, 224, 1439, 1392, 1392, 47, 1393, 3} }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* 1920x1200 (CVT) */</div><div class='add'>+struct crt_mode_table CRTM1920x1200[] = {</div><div class='add'>+	/* r_rate,          vclk,              hsp,             vsp   */</div><div class='add'>+	/* HT,  HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */</div><div class='add'>+	{REFRESH_60, CLK_193_295M, M1920X1200_R60_HSP, M1920X1200_R60_VSP,</div><div class='add'>+	 {2592, 1920, 1920, 672, 2056, 200, 1245, 1200, 1200, 45, 1203, 6} }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* 1920x1200 (CVT with Reduce Blanking) */</div><div class='add'>+struct crt_mode_table CRTM1920x1200_RB[] = {</div><div class='add'>+	/* r_rate,          vclk,              hsp,             vsp   */</div><div class='add'>+	/* HT,  HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */</div><div class='add'>+	{REFRESH_60, CLK_153_920M, M1920X1200_RB_R60_HSP,</div><div class='add'>+	 M1920X1200_RB_R60_VSP,</div><div class='add'>+	 {2080, 1920, 1920, 160, 1968, 32, 1235, 1200, 1200, 35, 1203, 6} }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* 2048x1536 (CVT) */</div><div class='add'>+struct crt_mode_table CRTM2048x1536[] = {</div><div class='add'>+	/* r_rate,          vclk,              hsp,             vsp   */</div><div class='add'>+	/* HT,  HA,  HBS, HBE,  HSS, HSE,   VT,  VA,  VBS, VBE,  VSS, VSE */</div><div class='add'>+	{REFRESH_60, CLK_267_250M, M2048x1536_R60_HSP, M2048x1536_R60_VSP,</div><div class='add'>+	 {2800, 2048, 2048, 752, 2200, 224, 1592, 1536, 1536, 56, 1539, 4} }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Video Mode Table */</div><div class='add'>+/* struct VideoModeTable {*/</div><div class='add'>+/*  int                               ModeIndex;*/</div><div class='add'>+/*  struct crt_mode_table             *crtc;*/</div><div class='add'>+/*  int                               mode_array;*/</div><div class='add'>+/* };*/</div><div class='add'>+struct VideoModeTable CLE266Modes[] = {</div><div class='add'>+	/* Display : 480x640 (GTF) */</div><div class='add'>+	{VIA_RES_480X640, CRTM480x640, ARRAY_SIZE(CRTM480x640)},</div><div class='add'>+</div><div class='add'>+	/* Display : 640x480 */</div><div class='add'>+	{VIA_RES_640X480, CRTM640x480, ARRAY_SIZE(CRTM640x480)},</div><div class='add'>+</div><div class='add'>+	/* Display : 720x480 (GTF) */</div><div class='add'>+	{VIA_RES_720X480, CRTM720x480, ARRAY_SIZE(CRTM720x480)},</div><div class='add'>+</div><div class='add'>+	/* Display : 720x576 (GTF) */</div><div class='add'>+	{VIA_RES_720X576, CRTM720x576, ARRAY_SIZE(CRTM720x576)},</div><div class='add'>+</div><div class='add'>+	/* Display : 800x600 */</div><div class='add'>+	{VIA_RES_800X600, CRTM800x600, ARRAY_SIZE(CRTM800x600)},</div><div class='add'>+</div><div class='add'>+	/* Display : 800x480 (CVT) */</div><div class='add'>+	{VIA_RES_800X480, CRTM800x480, ARRAY_SIZE(CRTM800x480)},</div><div class='add'>+</div><div class='add'>+	/* Display : 848x480 (CVT) */</div><div class='add'>+	{VIA_RES_848X480, CRTM848x480, ARRAY_SIZE(CRTM848x480)},</div><div class='add'>+</div><div class='add'>+	/* Display : 852x480 (GTF) */</div><div class='add'>+	{VIA_RES_856X480, CRTM852x480, ARRAY_SIZE(CRTM852x480)},</div><div class='add'>+</div><div class='add'>+	/* Display : 1024x512 (GTF) */</div><div class='add'>+	{VIA_RES_1024X512, CRTM1024x512, ARRAY_SIZE(CRTM1024x512)},</div><div class='add'>+</div><div class='add'>+	/* Display : 1024x600 */</div><div class='add'>+	{VIA_RES_1024X600, CRTM1024x600, ARRAY_SIZE(CRTM1024x600)},</div><div class='add'>+</div><div class='add'>+	/* Display : 1024x576 (GTF) */</div><div class='add'>+	/*{ VIA_RES_1024X576, CRTM1024x576, ARRAY_SIZE(CRTM1024x576)}, */</div><div class='add'>+</div><div class='add'>+	/* Display : 1024x768 */</div><div class='add'>+	{VIA_RES_1024X768, CRTM1024x768, ARRAY_SIZE(CRTM1024x768)},</div><div class='add'>+</div><div class='add'>+	/* Display : 1152x864 */</div><div class='add'>+	{VIA_RES_1152X864, CRTM1152x864, ARRAY_SIZE(CRTM1152x864)},</div><div class='add'>+</div><div class='add'>+	/* Display : 1280x768 (GTF) */</div><div class='add'>+	{VIA_RES_1280X768, CRTM1280x768, ARRAY_SIZE(CRTM1280x768)},</div><div class='add'>+</div><div class='add'>+	/* Display : 960x600 (CVT) */</div><div class='add'>+	{VIA_RES_960X600, CRTM960x600, ARRAY_SIZE(CRTM960x600)},</div><div class='add'>+</div><div class='add'>+	/* Display : 1000x600 (GTF) */</div><div class='add'>+	{VIA_RES_1000X600, CRTM1000x600, ARRAY_SIZE(CRTM1000x600)},</div><div class='add'>+</div><div class='add'>+	/* Display : 1024x576 (GTF) */</div><div class='add'>+	{VIA_RES_1024X576, CRTM1024x576, ARRAY_SIZE(CRTM1024x576)},</div><div class='add'>+</div><div class='add'>+	/* Display : 1088x612 (GTF) */</div><div class='add'>+	{VIA_RES_1088X612, CRTM1088x612, ARRAY_SIZE(CRTM1088x612)},</div><div class='add'>+</div><div class='add'>+	/* Display : 1152x720 (CVT) */</div><div class='add'>+	{VIA_RES_1152X720, CRTM1152x720, ARRAY_SIZE(CRTM1152x720)},</div><div class='add'>+</div><div class='add'>+	/* Display : 1200x720 (GTF) */</div><div class='add'>+	{VIA_RES_1200X720, CRTM1200x720, ARRAY_SIZE(CRTM1200x720)},</div><div class='add'>+</div><div class='add'>+	/* Display : 1280x600 (GTF) */</div><div class='add'>+	{VIA_RES_1280X600, CRTM1280x600, ARRAY_SIZE(CRTM1280x600)},</div><div class='add'>+</div><div class='add'>+	/* Display : 1280x800 (CVT) */</div><div class='add'>+	{VIA_RES_1280X800, CRTM1280x800, ARRAY_SIZE(CRTM1280x800)},</div><div class='add'>+</div><div class='add'>+	/* Display : 1280x800 (GTF) */</div><div class='add'>+	/*{ M1280x800, CRTM1280x800, ARRAY_SIZE(CRTM1280x800)}, */</div><div class='add'>+</div><div class='add'>+	/* Display : 1280x960 */</div><div class='add'>+	{VIA_RES_1280X960, CRTM1280x960, ARRAY_SIZE(CRTM1280x960)},</div><div class='add'>+</div><div class='add'>+	/* Display : 1280x1024 */</div><div class='add'>+	{VIA_RES_1280X1024, CRTM1280x1024, ARRAY_SIZE(CRTM1280x1024)},</div><div class='add'>+</div><div class='add'>+	/* Display : 1360x768 (CVT) */</div><div class='add'>+	{VIA_RES_1360X768, CRTM1360x768, ARRAY_SIZE(CRTM1360x768)},</div><div class='add'>+</div><div class='add'>+	/* Display : 1360x768 (CVT Reduce Blanking) */</div><div class='add'>+	{VIA_RES_1360X768_RB, CRTM1360x768_RB,</div><div class='add'>+	 ARRAY_SIZE(CRTM1360x768_RB)},</div><div class='add'>+</div><div class='add'>+	/* Display : 1366x768 */</div><div class='add'>+	{VIA_RES_1366X768, CRTM1366x768, ARRAY_SIZE(CRTM1366x768)},</div><div class='add'>+</div><div class='add'>+	/* Display : 1368x768 (GTF) */</div><div class='add'>+	/*{ M1368x768,CRTM1368x768,ARRAY_SIZE(CRTM1368x768)}, */</div><div class='add'>+	/* Display : 1368x768 (GTF) */</div><div class='add'>+	{VIA_RES_1368X768, CRTM1368x768, ARRAY_SIZE(CRTM1368x768)},</div><div class='add'>+</div><div class='add'>+	/* Display : 1440x900 (CVT) */</div><div class='add'>+	{VIA_RES_1440X900, CRTM1440x900, ARRAY_SIZE(CRTM1440x900)},</div><div class='add'>+</div><div class='add'>+	/* Display : 1440x900 (CVT Reduce Blanking) */</div><div class='add'>+	{VIA_RES_1440X900_RB, CRTM1440x900_RB,</div><div class='add'>+	 ARRAY_SIZE(CRTM1440x900_RB)},</div><div class='add'>+</div><div class='add'>+	/* Display : 1440x1050 (GTF) */</div><div class='add'>+	{VIA_RES_1440X1050, CRTM1440x1050, ARRAY_SIZE(CRTM1440x1050)},</div><div class='add'>+</div><div class='add'>+	/* Display : 1400x1050 (CVT Reduce Blanking) */</div><div class='add'>+	{VIA_RES_1400X1050_RB, CRTM1400x1050_RB,</div><div class='add'>+	 ARRAY_SIZE(CRTM1400x1050_RB)},</div><div class='add'>+</div><div class='add'>+	/* Display : 1600x900 (CVT) */</div><div class='add'>+	{VIA_RES_1600X900, CRTM1600x900, ARRAY_SIZE(CRTM1600x900)},</div><div class='add'>+</div><div class='add'>+	/* Display : 1600x900 (CVT Reduce Blanking) */</div><div class='add'>+	{VIA_RES_1600X900_RB, CRTM1600x900_RB,</div><div class='add'>+	 ARRAY_SIZE(CRTM1600x900_RB)},</div><div class='add'>+</div><div class='add'>+	/* Display : 1600x1024 (GTF) */</div><div class='add'>+	{VIA_RES_1600X1024, CRTM1600x1024, ARRAY_SIZE(CRTM1600x1024)},</div><div class='add'>+</div><div class='add'>+	/* Display : 1600x1200 */</div><div class='add'>+	{VIA_RES_1600X1200, CRTM1600x1200, ARRAY_SIZE(CRTM1600x1200)},</div><div class='add'>+</div><div class='add'>+	/* Display : 1680x1050 (CVT) */</div><div class='add'>+	{VIA_RES_1680X1050, CRTM1680x1050, ARRAY_SIZE(CRTM1680x1050)},</div><div class='add'>+</div><div class='add'>+	/* Display : 1680x1050 (CVT Reduce Blanking) */</div><div class='add'>+	{VIA_RES_1680X1050_RB, CRTM1680x1050_RB,</div><div class='add'>+	 ARRAY_SIZE(CRTM1680x1050_RB)},</div><div class='add'>+</div><div class='add'>+	/* Display : 1792x1344 (DMT) */</div><div class='add'>+	{VIA_RES_1792X1344, CRTM1792x1344, ARRAY_SIZE(CRTM1792x1344)},</div><div class='add'>+</div><div class='add'>+	/* Display : 1856x1392 (DMT) */</div><div class='add'>+	{VIA_RES_1856X1392, CRTM1856x1392, ARRAY_SIZE(CRTM1856x1392)},</div><div class='add'>+</div><div class='add'>+	/* Display : 1920x1440 */</div><div class='add'>+	{VIA_RES_1920X1440, CRTM1920x1440, ARRAY_SIZE(CRTM1920x1440)},</div><div class='add'>+</div><div class='add'>+	/* Display : 2048x1536 */</div><div class='add'>+	{VIA_RES_2048X1536, CRTM2048x1536, ARRAY_SIZE(CRTM2048x1536)},</div><div class='add'>+</div><div class='add'>+	/* Display : 1280x720 */</div><div class='add'>+	{VIA_RES_1280X720, CRTM1280x720, ARRAY_SIZE(CRTM1280x720)},</div><div class='add'>+</div><div class='add'>+	/* Display : 1920x1080 (CVT) */</div><div class='add'>+	{VIA_RES_1920X1080, CRTM1920x1080, ARRAY_SIZE(CRTM1920x1080)},</div><div class='add'>+</div><div class='add'>+	/* Display : 1920x1080 (CVT Reduce Blanking) */</div><div class='add'>+	{VIA_RES_1920X1080_RB, CRTM1920x1080_RB,</div><div class='add'>+	 ARRAY_SIZE(CRTM1920x1080_RB)},</div><div class='add'>+</div><div class='add'>+	/* Display : 1920x1200 (CVT) */</div><div class='add'>+	{VIA_RES_1920X1200, CRTM1920x1200, ARRAY_SIZE(CRTM1920x1200)},</div><div class='add'>+</div><div class='add'>+	/* Display : 1920x1200 (CVT Reduce Blanking) */</div><div class='add'>+	{VIA_RES_1920X1200_RB, CRTM1920x1200_RB,</div><div class='add'>+	 ARRAY_SIZE(CRTM1920x1200_RB)},</div><div class='add'>+</div><div class='add'>+	/* Display : 1400x1050 (CVT) */</div><div class='add'>+	{VIA_RES_1400X1050, CRTM1400x1050, ARRAY_SIZE(CRTM1400x1050)}</div><div class='add'>+};</div><div class='add'>+struct crt_mode_table CEAM1280x720[] = {</div><div class='add'>+	{REFRESH_60, CLK_74_270M, M1280X720_CEA_R60_HSP,</div><div class='add'>+	 M1280X720_CEA_R60_VSP,</div><div class='add'>+	 /* HT,    HA,   HBS,  HBE,  HSS, HSE,  VT,   VA,  VBS, VBE, VSS, VSE */</div><div class='add'>+	 {1650, 1280, 1280, 370, 1390, 40, 750, 720, 720, 30, 725, 5} }</div><div class='add'>+};</div><div class='add'>+struct crt_mode_table CEAM1920x1080[] = {</div><div class='add'>+	{REFRESH_60, CLK_148_500M, M1920X1080_CEA_R60_HSP,</div><div class='add'>+	 M1920X1080_CEA_R60_VSP,</div><div class='add'>+	 /* HT,    HA,   HBS,  HBE,  HSS, HSE,  VT,  VA, VBS, VBE,  VSS, VSE */</div><div class='add'>+	 {2200, 1920, 1920, 300, 2008, 44, 1125, 1080, 1080, 45, 1084, 5} }</div><div class='add'>+};</div><div class='add'>+struct VideoModeTable CEA_HDMI_Modes[] = {</div><div class='add'>+	/* Display : 1280x720 */</div><div class='add'>+	{VIA_RES_1280X720, CEAM1280x720, ARRAY_SIZE(CEAM1280x720)},</div><div class='add'>+	{VIA_RES_1920X1080, CEAM1920x1080, ARRAY_SIZE(CEAM1920x1080)}</div><div class='add'>+};</div><div class='head'>diff --git a/drivers/video/via/viamode.h b/drivers/video/via/viamode.h<br/>new file mode 100644<br/>index 000000000000..1a5de50a23a2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/via/viamode.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/via/viamode.h</a></div><div class='hunk'>@@ -0,0 +1,177 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.</div><div class='add'>+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.</div><div class='add'>+</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public</div><div class='add'>+ * License as published by the Free Software Foundation;</div><div class='add'>+ * either version 2, or (at your option) any later version.</div><div class='add'>+</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even</div><div class='add'>+ * the implied warranty of MERCHANTABILITY or FITNESS FOR</div><div class='add'>+ * A PARTICULAR PURPOSE.See the GNU General Public License</div><div class='add'>+ * for more details.</div><div class='add'>+</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc.,</div><div class='add'>+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __VIAMODE_H__</div><div class='add'>+#define __VIAMODE_H__</div><div class='add'>+</div><div class='add'>+#include "global.h"</div><div class='add'>+</div><div class='add'>+struct VPITTable {</div><div class='add'>+	unsigned char Misc;</div><div class='add'>+	unsigned char SR[StdSR];</div><div class='add'>+	unsigned char GR[StdGR];</div><div class='add'>+	unsigned char AR[StdAR];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct VideoModeTable {</div><div class='add'>+	int ModeIndex;</div><div class='add'>+	struct crt_mode_table *crtc;</div><div class='add'>+	int mode_array;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct patch_table {</div><div class='add'>+	int mode_index;</div><div class='add'>+	int table_length;</div><div class='add'>+	struct io_reg *io_reg_table;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct res_map_refresh {</div><div class='add'>+	int hres;</div><div class='add'>+	int vres;</div><div class='add'>+	int pixclock;</div><div class='add'>+	int vmode_refresh;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define NUM_TOTAL_RES_MAP_REFRESH ARRAY_SIZE(res_map_refresh_tbl)</div><div class='add'>+#define NUM_TOTAL_CEA_MODES  ARRAY_SIZE(CEA_HDMI_Modes)</div><div class='add'>+#define NUM_TOTAL_CN400_ModeXregs ARRAY_SIZE(CN400_ModeXregs)</div><div class='add'>+#define NUM_TOTAL_CN700_ModeXregs ARRAY_SIZE(CN700_ModeXregs)</div><div class='add'>+#define NUM_TOTAL_KM400_ModeXregs ARRAY_SIZE(KM400_ModeXregs)</div><div class='add'>+#define NUM_TOTAL_CX700_ModeXregs ARRAY_SIZE(CX700_ModeXregs)</div><div class='add'>+#define NUM_TOTAL_VX800_ModeXregs ARRAY_SIZE(VX800_ModeXregs)</div><div class='add'>+#define NUM_TOTAL_CLE266_ModeXregs ARRAY_SIZE(CLE266_ModeXregs)</div><div class='add'>+#define NUM_TOTAL_PATCH_MODE ARRAY_SIZE(res_patch_table)</div><div class='add'>+#define NUM_TOTAL_MODETABLE ARRAY_SIZE(CLE266Modes)</div><div class='add'>+</div><div class='add'>+/********************/</div><div class='add'>+/* Mode Table       */</div><div class='add'>+/********************/</div><div class='add'>+</div><div class='add'>+/* 480x640 */</div><div class='add'>+extern struct crt_mode_table CRTM480x640[1];</div><div class='add'>+/* 640x480*/</div><div class='add'>+extern struct crt_mode_table CRTM640x480[5];</div><div class='add'>+/*720x480 (GTF)*/</div><div class='add'>+extern struct crt_mode_table CRTM720x480[1];</div><div class='add'>+/*720x576 (GTF)*/</div><div class='add'>+extern struct crt_mode_table CRTM720x576[1];</div><div class='add'>+/* 800x480 (CVT) */</div><div class='add'>+extern struct crt_mode_table CRTM800x480[1];</div><div class='add'>+/* 800x600*/</div><div class='add'>+extern struct crt_mode_table CRTM800x600[5];</div><div class='add'>+/* 848x480 (CVT) */</div><div class='add'>+extern struct crt_mode_table CRTM848x480[1];</div><div class='add'>+/*856x480 (GTF) convert to 852x480*/</div><div class='add'>+extern struct crt_mode_table CRTM852x480[1];</div><div class='add'>+/*1024x512 (GTF)*/</div><div class='add'>+extern struct crt_mode_table CRTM1024x512[1];</div><div class='add'>+/* 1024x600*/</div><div class='add'>+extern struct crt_mode_table CRTM1024x600[1];</div><div class='add'>+/* 1024x768*/</div><div class='add'>+extern struct crt_mode_table CRTM1024x768[4];</div><div class='add'>+/* 1152x864*/</div><div class='add'>+extern struct crt_mode_table CRTM1152x864[1];</div><div class='add'>+/* 1280x720 (HDMI 720P)*/</div><div class='add'>+extern struct crt_mode_table CRTM1280x720[2];</div><div class='add'>+/*1280x768 (GTF)*/</div><div class='add'>+extern struct crt_mode_table CRTM1280x768[2];</div><div class='add'>+/* 1280x800 (CVT) */</div><div class='add'>+extern struct crt_mode_table CRTM1280x800[1];</div><div class='add'>+/*1280x960*/</div><div class='add'>+extern struct crt_mode_table CRTM1280x960[1];</div><div class='add'>+/* 1280x1024*/</div><div class='add'>+extern struct crt_mode_table CRTM1280x1024[3];</div><div class='add'>+/* 1368x768 (GTF) */</div><div class='add'>+extern struct crt_mode_table CRTM1368x768[1];</div><div class='add'>+/*1440x1050 (GTF)*/</div><div class='add'>+extern struct crt_mode_table CRTM1440x1050[1];</div><div class='add'>+/* 1600x1200*/</div><div class='add'>+extern struct crt_mode_table CRTM1600x1200[2];</div><div class='add'>+/* 1680x1050 (CVT) */</div><div class='add'>+extern struct crt_mode_table CRTM1680x1050[2];</div><div class='add'>+/* 1680x1050 (CVT Reduce Blanking) */</div><div class='add'>+extern struct crt_mode_table CRTM1680x1050_RB[1];</div><div class='add'>+/* 1920x1080 (CVT)*/</div><div class='add'>+extern struct crt_mode_table CRTM1920x1080[1];</div><div class='add'>+/* 1920x1080 (CVT with Reduce Blanking) */</div><div class='add'>+extern struct crt_mode_table CRTM1920x1080_RB[1];</div><div class='add'>+/* 1920x1440*/</div><div class='add'>+extern struct crt_mode_table CRTM1920x1440[2];</div><div class='add'>+/* 1400x1050 (CVT) */</div><div class='add'>+extern struct crt_mode_table CRTM1400x1050[2];</div><div class='add'>+/* 1400x1050 (CVT Reduce Blanking) */</div><div class='add'>+extern struct crt_mode_table CRTM1400x1050_RB[1];</div><div class='add'>+/* 960x600 (CVT) */</div><div class='add'>+extern struct crt_mode_table CRTM960x600[1];</div><div class='add'>+/* 1000x600 (GTF) */</div><div class='add'>+extern struct crt_mode_table CRTM1000x600[1];</div><div class='add'>+/* 1024x576 (GTF) */</div><div class='add'>+extern struct crt_mode_table CRTM1024x576[1];</div><div class='add'>+/* 1088x612 (CVT) */</div><div class='add'>+extern struct crt_mode_table CRTM1088x612[1];</div><div class='add'>+/* 1152x720 (CVT) */</div><div class='add'>+extern struct crt_mode_table CRTM1152x720[1];</div><div class='add'>+/* 1200x720 (GTF) */</div><div class='add'>+extern struct crt_mode_table CRTM1200x720[1];</div><div class='add'>+/* 1280x600 (GTF) */</div><div class='add'>+extern struct crt_mode_table CRTM1280x600[1];</div><div class='add'>+/* 1360x768 (CVT) */</div><div class='add'>+extern struct crt_mode_table CRTM1360x768[1];</div><div class='add'>+/* 1360x768 (CVT Reduce Blanking) */</div><div class='add'>+extern struct crt_mode_table CRTM1360x768_RB[1];</div><div class='add'>+/* 1366x768 (GTF) */</div><div class='add'>+extern struct crt_mode_table CRTM1366x768[2];</div><div class='add'>+/* 1440x900 (CVT) */</div><div class='add'>+extern struct crt_mode_table CRTM1440x900[2];</div><div class='add'>+/* 1440x900 (CVT Reduce Blanking) */</div><div class='add'>+extern struct crt_mode_table CRTM1440x900_RB[1];</div><div class='add'>+/* 1600x900 (CVT) */</div><div class='add'>+extern struct crt_mode_table CRTM1600x900[1];</div><div class='add'>+/* 1600x900 (CVT Reduce Blanking) */</div><div class='add'>+extern struct crt_mode_table CRTM1600x900_RB[1];</div><div class='add'>+/* 1600x1024 (GTF) */</div><div class='add'>+extern struct crt_mode_table CRTM1600x1024[1];</div><div class='add'>+/* 1792x1344 (DMT) */</div><div class='add'>+extern struct crt_mode_table CRTM1792x1344[1];</div><div class='add'>+/* 1856x1392 (DMT) */</div><div class='add'>+extern struct crt_mode_table CRTM1856x1392[1];</div><div class='add'>+/* 1920x1200 (CVT) */</div><div class='add'>+extern struct crt_mode_table CRTM1920x1200[1];</div><div class='add'>+/* 1920x1200 (CVT with Reduce Blanking) */</div><div class='add'>+extern struct crt_mode_table CRTM1920x1200_RB[1];</div><div class='add'>+/* 2048x1536 (CVT) */</div><div class='add'>+extern struct crt_mode_table CRTM2048x1536[1];</div><div class='add'>+extern struct VideoModeTable CLE266Modes[47];</div><div class='add'>+extern struct crt_mode_table CEAM1280x720[1];</div><div class='add'>+extern struct crt_mode_table CEAM1920x1080[1];</div><div class='add'>+extern struct VideoModeTable CEA_HDMI_Modes[2];</div><div class='add'>+</div><div class='add'>+extern struct res_map_refresh res_map_refresh_tbl[61];</div><div class='add'>+extern struct io_reg CN400_ModeXregs[52];</div><div class='add'>+extern struct io_reg CN700_ModeXregs[66];</div><div class='add'>+extern struct io_reg KM400_ModeXregs[55];</div><div class='add'>+extern struct io_reg CX700_ModeXregs[58];</div><div class='add'>+extern struct io_reg VX800_ModeXregs[58];</div><div class='add'>+extern struct io_reg CLE266_ModeXregs[32];</div><div class='add'>+extern struct io_reg PM1024x768[2];</div><div class='add'>+extern struct patch_table res_patch_table[1];</div><div class='add'>+extern struct VPITTable VPIT;</div><div class='add'>+#endif /* __VIAMODE_H__ */</div><div class='head'>diff --git a/drivers/video/via/vt1636.c b/drivers/video/via/vt1636.c<br/>new file mode 100644<br/>index 000000000000..322a9f993550<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/via/vt1636.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/via/vt1636.c</a></div><div class='hunk'>@@ -0,0 +1,306 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.</div><div class='add'>+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.</div><div class='add'>+</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public</div><div class='add'>+ * License as published by the Free Software Foundation;</div><div class='add'>+ * either version 2, or (at your option) any later version.</div><div class='add'>+</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even</div><div class='add'>+ * the implied warranty of MERCHANTABILITY or FITNESS FOR</div><div class='add'>+ * A PARTICULAR PURPOSE.See the GNU General Public License</div><div class='add'>+ * for more details.</div><div class='add'>+</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc.,</div><div class='add'>+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "global.h"</div><div class='add'>+</div><div class='add'>+u8 viafb_gpio_i2c_read_lvds(struct lvds_setting_information</div><div class='add'>+	*plvds_setting_info, struct lvds_chip_information *plvds_chip_info,</div><div class='add'>+	u8 index)</div><div class='add'>+{</div><div class='add'>+	u8 data;</div><div class='add'>+</div><div class='add'>+	viaparinfo-&gt;i2c_stuff.i2c_port = plvds_chip_info-&gt;i2c_port;</div><div class='add'>+	viafb_i2c_readbyte(plvds_chip_info-&gt;lvds_chip_slave_addr, index, &amp;data);</div><div class='add'>+</div><div class='add'>+	return data;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void viafb_gpio_i2c_write_mask_lvds(struct lvds_setting_information</div><div class='add'>+			      *plvds_setting_info, struct lvds_chip_information</div><div class='add'>+			      *plvds_chip_info, struct IODATA io_data)</div><div class='add'>+{</div><div class='add'>+	int index, data;</div><div class='add'>+</div><div class='add'>+	viaparinfo-&gt;i2c_stuff.i2c_port = plvds_chip_info-&gt;i2c_port;</div><div class='add'>+</div><div class='add'>+	index = io_data.Index;</div><div class='add'>+	data = viafb_gpio_i2c_read_lvds(plvds_setting_info, plvds_chip_info,</div><div class='add'>+		index);</div><div class='add'>+	data = (data &amp; (~io_data.Mask)) | io_data.Data;</div><div class='add'>+</div><div class='add'>+	viafb_i2c_writebyte(plvds_chip_info-&gt;lvds_chip_slave_addr, index, data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void viafb_init_lvds_vt1636(struct lvds_setting_information</div><div class='add'>+	*plvds_setting_info, struct lvds_chip_information *plvds_chip_info)</div><div class='add'>+{</div><div class='add'>+	int reg_num, i;</div><div class='add'>+</div><div class='add'>+	/* Common settings: */</div><div class='add'>+	reg_num = ARRAY_SIZE(COMMON_INIT_TBL_VT1636);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; reg_num; i++) {</div><div class='add'>+		viafb_gpio_i2c_write_mask_lvds(plvds_setting_info,</div><div class='add'>+					 plvds_chip_info,</div><div class='add'>+					 COMMON_INIT_TBL_VT1636[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Input Data Mode Select */</div><div class='add'>+	if (plvds_setting_info-&gt;device_lcd_dualedge) {</div><div class='add'>+		viafb_gpio_i2c_write_mask_lvds(plvds_setting_info,</div><div class='add'>+					 plvds_chip_info,</div><div class='add'>+					 DUAL_CHANNEL_ENABLE_TBL_VT1636[0]);</div><div class='add'>+	} else {</div><div class='add'>+		viafb_gpio_i2c_write_mask_lvds(plvds_setting_info,</div><div class='add'>+					 plvds_chip_info,</div><div class='add'>+					 SINGLE_CHANNEL_ENABLE_TBL_VT1636[0]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (plvds_setting_info-&gt;LCDDithering) {</div><div class='add'>+		viafb_gpio_i2c_write_mask_lvds(plvds_setting_info,</div><div class='add'>+					 plvds_chip_info,</div><div class='add'>+					 DITHERING_ENABLE_TBL_VT1636[0]);</div><div class='add'>+	} else {</div><div class='add'>+		viafb_gpio_i2c_write_mask_lvds(plvds_setting_info,</div><div class='add'>+					 plvds_chip_info,</div><div class='add'>+					 DITHERING_DISABLE_TBL_VT1636[0]);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void viafb_enable_lvds_vt1636(struct lvds_setting_information</div><div class='add'>+			*plvds_setting_info,</div><div class='add'>+			struct lvds_chip_information *plvds_chip_info)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	viafb_gpio_i2c_write_mask_lvds(plvds_setting_info, plvds_chip_info,</div><div class='add'>+				 VDD_ON_TBL_VT1636[0]);</div><div class='add'>+</div><div class='add'>+	/* Pad on: */</div><div class='add'>+	switch (plvds_chip_info-&gt;output_interface) {</div><div class='add'>+	case INTERFACE_DVP0:</div><div class='add'>+		{</div><div class='add'>+			viafb_write_reg_mask(SR1E, VIASR, 0xC0, 0xC0);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	case INTERFACE_DVP1:</div><div class='add'>+		{</div><div class='add'>+			viafb_write_reg_mask(SR1E, VIASR, 0x30, 0x30);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	case INTERFACE_DFP_LOW:</div><div class='add'>+		{</div><div class='add'>+			viafb_write_reg_mask(SR2A, VIASR, 0x03, 0x03);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	case INTERFACE_DFP_HIGH:</div><div class='add'>+		{</div><div class='add'>+			viafb_write_reg_mask(SR2A, VIASR, 0x03, 0x0C);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void viafb_disable_lvds_vt1636(struct lvds_setting_information</div><div class='add'>+			 *plvds_setting_info,</div><div class='add'>+			 struct lvds_chip_information *plvds_chip_info)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	viafb_gpio_i2c_write_mask_lvds(plvds_setting_info, plvds_chip_info,</div><div class='add'>+				 VDD_OFF_TBL_VT1636[0]);</div><div class='add'>+</div><div class='add'>+	/* Pad off: */</div><div class='add'>+	switch (plvds_chip_info-&gt;output_interface) {</div><div class='add'>+	case INTERFACE_DVP0:</div><div class='add'>+		{</div><div class='add'>+			viafb_write_reg_mask(SR1E, VIASR, 0x00, 0xC0);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	case INTERFACE_DVP1:</div><div class='add'>+		{</div><div class='add'>+			viafb_write_reg_mask(SR1E, VIASR, 0x00, 0x30);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	case INTERFACE_DFP_LOW:</div><div class='add'>+		{</div><div class='add'>+			viafb_write_reg_mask(SR2A, VIASR, 0x00, 0x03);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	case INTERFACE_DFP_HIGH:</div><div class='add'>+		{</div><div class='add'>+			viafb_write_reg_mask(SR2A, VIASR, 0x00, 0x0C);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool viafb_lvds_identify_vt1636(void)</div><div class='add'>+{</div><div class='add'>+	u8 Buffer[2];</div><div class='add'>+</div><div class='add'>+	DEBUG_MSG(KERN_INFO "viafb_lvds_identify_vt1636.\n");</div><div class='add'>+</div><div class='add'>+	/* Sense VT1636 LVDS Transmiter */</div><div class='add'>+	viaparinfo-&gt;chip_info-&gt;lvds_chip_info.lvds_chip_slave_addr =</div><div class='add'>+	VT1636_LVDS_I2C_ADDR;</div><div class='add'>+</div><div class='add'>+	/* Check vendor ID first: */</div><div class='add'>+	viafb_i2c_readbyte((u8) viaparinfo-&gt;chip_info-&gt;lvds_chip_info.</div><div class='add'>+	lvds_chip_slave_addr,</div><div class='add'>+		    0x00, &amp;Buffer[0]);</div><div class='add'>+	viafb_i2c_readbyte((u8) viaparinfo-&gt;chip_info-&gt;lvds_chip_info.</div><div class='add'>+		lvds_chip_slave_addr,</div><div class='add'>+		    0x01, &amp;Buffer[1]);</div><div class='add'>+</div><div class='add'>+	if (!((Buffer[0] == 0x06) &amp;&amp; (Buffer[1] == 0x11)))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* Check Chip ID: */</div><div class='add'>+	viafb_i2c_readbyte((u8) viaparinfo-&gt;chip_info-&gt;lvds_chip_info.</div><div class='add'>+	lvds_chip_slave_addr,</div><div class='add'>+		    0x02, &amp;Buffer[0]);</div><div class='add'>+	viafb_i2c_readbyte((u8) viaparinfo-&gt;chip_info-&gt;lvds_chip_info.</div><div class='add'>+		lvds_chip_slave_addr,</div><div class='add'>+		    0x03, &amp;Buffer[1]);</div><div class='add'>+	if ((Buffer[0] == 0x45) &amp;&amp; (Buffer[1] == 0x33)) {</div><div class='add'>+		viaparinfo-&gt;chip_info-&gt;lvds_chip_info.lvds_chip_name =</div><div class='add'>+			VT1636_LVDS;</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int get_clk_range_index(u32 Clk)</div><div class='add'>+{</div><div class='add'>+	if (Clk &lt; DPA_CLK_30M)</div><div class='add'>+		return DPA_CLK_RANGE_30M;</div><div class='add'>+	else if (Clk &lt; DPA_CLK_50M)</div><div class='add'>+		return DPA_CLK_RANGE_30_50M;</div><div class='add'>+	else if (Clk &lt; DPA_CLK_70M)</div><div class='add'>+		return DPA_CLK_RANGE_50_70M;</div><div class='add'>+	else if (Clk &lt; DPA_CLK_100M)</div><div class='add'>+		return DPA_CLK_RANGE_70_100M;</div><div class='add'>+	else if (Clk &lt; DPA_CLK_150M)</div><div class='add'>+		return DPA_CLK_RANGE_100_150M;</div><div class='add'>+	else</div><div class='add'>+		return DPA_CLK_RANGE_150M;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int get_lvds_dpa_setting_index(int panel_size_id,</div><div class='add'>+			     struct VT1636_DPA_SETTING *p_vt1636_dpasetting_tbl,</div><div class='add'>+			       int tbl_size)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; tbl_size; i++) {</div><div class='add'>+		if (panel_size_id == p_vt1636_dpasetting_tbl-&gt;PanelSizeID)</div><div class='add'>+			return i;</div><div class='add'>+</div><div class='add'>+		p_vt1636_dpasetting_tbl++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void set_dpa_vt1636(struct lvds_setting_information</div><div class='add'>+	*plvds_setting_info, struct lvds_chip_information *plvds_chip_info,</div><div class='add'>+		    struct VT1636_DPA_SETTING *p_vt1636_dpa_setting)</div><div class='add'>+{</div><div class='add'>+	struct IODATA io_data;</div><div class='add'>+</div><div class='add'>+	io_data.Index = 0x09;</div><div class='add'>+	io_data.Mask = 0x1F;</div><div class='add'>+	io_data.Data = p_vt1636_dpa_setting-&gt;CLK_SEL_ST1;</div><div class='add'>+	viafb_gpio_i2c_write_mask_lvds(plvds_setting_info,</div><div class='add'>+		plvds_chip_info, io_data);</div><div class='add'>+</div><div class='add'>+	io_data.Index = 0x08;</div><div class='add'>+	io_data.Mask = 0x0F;</div><div class='add'>+	io_data.Data = p_vt1636_dpa_setting-&gt;CLK_SEL_ST2;</div><div class='add'>+	viafb_gpio_i2c_write_mask_lvds(plvds_setting_info, plvds_chip_info,</div><div class='add'>+		io_data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void viafb_vt1636_patch_skew_on_vt3324(</div><div class='add'>+	struct lvds_setting_information *plvds_setting_info,</div><div class='add'>+	struct lvds_chip_information *plvds_chip_info)</div><div class='add'>+{</div><div class='add'>+	int index, size;</div><div class='add'>+</div><div class='add'>+	DEBUG_MSG(KERN_INFO "viafb_vt1636_patch_skew_on_vt3324.\n");</div><div class='add'>+</div><div class='add'>+	/* Graphics DPA settings: */</div><div class='add'>+	index = get_clk_range_index(plvds_setting_info-&gt;vclk);</div><div class='add'>+	viafb_set_dpa_gfx(plvds_chip_info-&gt;output_interface,</div><div class='add'>+		    &amp;GFX_DPA_SETTING_TBL_VT3324[index]);</div><div class='add'>+</div><div class='add'>+	/* LVDS Transmitter DPA settings: */</div><div class='add'>+	size = ARRAY_SIZE(VT1636_DPA_SETTING_TBL_VT3324);</div><div class='add'>+	index =</div><div class='add'>+	    get_lvds_dpa_setting_index(plvds_setting_info-&gt;lcd_panel_id,</div><div class='add'>+				       VT1636_DPA_SETTING_TBL_VT3324, size);</div><div class='add'>+	set_dpa_vt1636(plvds_setting_info, plvds_chip_info,</div><div class='add'>+		       &amp;VT1636_DPA_SETTING_TBL_VT3324[index]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void viafb_vt1636_patch_skew_on_vt3327(</div><div class='add'>+	struct lvds_setting_information *plvds_setting_info,</div><div class='add'>+	struct lvds_chip_information *plvds_chip_info)</div><div class='add'>+{</div><div class='add'>+	int index, size;</div><div class='add'>+</div><div class='add'>+	DEBUG_MSG(KERN_INFO "viafb_vt1636_patch_skew_on_vt3327.\n");</div><div class='add'>+</div><div class='add'>+	/* Graphics DPA settings: */</div><div class='add'>+	index = get_clk_range_index(plvds_setting_info-&gt;vclk);</div><div class='add'>+	viafb_set_dpa_gfx(plvds_chip_info-&gt;output_interface,</div><div class='add'>+		    &amp;GFX_DPA_SETTING_TBL_VT3327[index]);</div><div class='add'>+</div><div class='add'>+	/* LVDS Transmitter DPA settings: */</div><div class='add'>+	size = ARRAY_SIZE(VT1636_DPA_SETTING_TBL_VT3327);</div><div class='add'>+	index =</div><div class='add'>+	    get_lvds_dpa_setting_index(plvds_setting_info-&gt;lcd_panel_id,</div><div class='add'>+				       VT1636_DPA_SETTING_TBL_VT3327, size);</div><div class='add'>+	set_dpa_vt1636(plvds_setting_info, plvds_chip_info,</div><div class='add'>+		       &amp;VT1636_DPA_SETTING_TBL_VT3327[index]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void viafb_vt1636_patch_skew_on_vt3364(</div><div class='add'>+	struct lvds_setting_information *plvds_setting_info,</div><div class='add'>+	struct lvds_chip_information *plvds_chip_info)</div><div class='add'>+{</div><div class='add'>+	int index;</div><div class='add'>+</div><div class='add'>+	DEBUG_MSG(KERN_INFO "viafb_vt1636_patch_skew_on_vt3364.\n");</div><div class='add'>+</div><div class='add'>+	/* Graphics DPA settings: */</div><div class='add'>+	index = get_clk_range_index(plvds_setting_info-&gt;vclk);</div><div class='add'>+	viafb_set_dpa_gfx(plvds_chip_info-&gt;output_interface,</div><div class='add'>+		    &amp;GFX_DPA_SETTING_TBL_VT3364[index]);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/video/via/vt1636.h b/drivers/video/via/vt1636.h<br/>new file mode 100644<br/>index 000000000000..2a150c58c7ed<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/via/vt1636.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/via/vt1636.h</a></div><div class='hunk'>@@ -0,0 +1,44 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.</div><div class='add'>+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.</div><div class='add'>+</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public</div><div class='add'>+ * License as published by the Free Software Foundation;</div><div class='add'>+ * either version 2, or (at your option) any later version.</div><div class='add'>+</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even</div><div class='add'>+ * the implied warranty of MERCHANTABILITY or FITNESS FOR</div><div class='add'>+ * A PARTICULAR PURPOSE.See the GNU General Public License</div><div class='add'>+ * for more details.</div><div class='add'>+</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc.,</div><div class='add'>+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _VT1636_H_</div><div class='add'>+#define _VT1636_H_</div><div class='add'>+#include "chip.h"</div><div class='add'>+bool viafb_lvds_identify_vt1636(void);</div><div class='add'>+void viafb_init_lvds_vt1636(struct lvds_setting_information</div><div class='add'>+	*plvds_setting_info, struct lvds_chip_information *plvds_chip_info);</div><div class='add'>+void viafb_enable_lvds_vt1636(struct lvds_setting_information</div><div class='add'>+			*plvds_setting_info,</div><div class='add'>+			struct lvds_chip_information *plvds_chip_info);</div><div class='add'>+void viafb_disable_lvds_vt1636(struct lvds_setting_information</div><div class='add'>+			 *plvds_setting_info,</div><div class='add'>+			 struct lvds_chip_information *plvds_chip_info);</div><div class='add'>+void viafb_vt1636_patch_skew_on_vt3324(</div><div class='add'>+	struct lvds_setting_information *plvds_setting_info,</div><div class='add'>+	struct lvds_chip_information *plvds_chip_info);</div><div class='add'>+void viafb_vt1636_patch_skew_on_vt3327(</div><div class='add'>+	struct lvds_setting_information *plvds_setting_info,</div><div class='add'>+	struct lvds_chip_information *plvds_chip_info);</div><div class='add'>+void viafb_vt1636_patch_skew_on_vt3364(</div><div class='add'>+	struct lvds_setting_information *plvds_setting_info,</div><div class='add'>+	struct lvds_chip_information *plvds_chip_info);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/video/xen-fbfront.c b/drivers/video/xen-fbfront.c<br/>index 47ed39b52f9c..a463b3dd837b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/xen-fbfront.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/video/xen-fbfront.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/video/xen-fbfront.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/video/xen-fbfront.c</a></div><div class='hunk'>@@ -680,11 +680,11 @@ static struct xenbus_driver xenfb = {</div><div class='ctx'> </div><div class='ctx'> static int __init xenfb_init(void)</div><div class='ctx'> {</div><div class='del'>-	if (!is_running_on_xen())</div><div class='add'>+	if (!xen_domain())</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	/* Nothing to do if running in dom0. */</div><div class='del'>-	if (is_initial_xendomain())</div><div class='add'>+	if (xen_initial_domain())</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	return xenbus_register_frontend(&amp;xenfb);</div><div class='head'>diff --git a/drivers/w1/masters/ds1wm.c b/drivers/w1/masters/ds1wm.c<br/>index 10211e493001..29e144f81cbe 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/w1/masters/ds1wm.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/w1/masters/ds1wm.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/w1/masters/ds1wm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/w1/masters/ds1wm.c</a></div><div class='hunk'>@@ -160,8 +160,10 @@ static int ds1wm_reset(struct ds1wm_data *ds1wm_data)</div><div class='ctx'> 	 *     625 us - 60 us - 240 us - 100 ns = 324.9 us</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * We'll wait a bit longer just to be sure.</div><div class='add'>+	 * Was udelay(500), but if it is going to busywait the cpu that long,</div><div class='add'>+	 * might as well come back later.</div><div class='ctx'> 	 */</div><div class='del'>-	udelay(500);</div><div class='add'>+	msleep(1);</div><div class='ctx'> </div><div class='ctx'> 	ds1wm_write_register(ds1wm_data, DS1WM_INT_EN,</div><div class='ctx'> 		DS1WM_INTEN_ERBF | DS1WM_INTEN_ETMT | DS1WM_INTEN_EPD |</div><div class='hunk'>@@ -274,8 +276,8 @@ static u8 ds1wm_reset_bus(void *data)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ds1wm_search(void *data, u8 search_type,</div><div class='del'>-			 w1_slave_found_callback slave_found)</div><div class='add'>+static void ds1wm_search(void *data, struct w1_master *master_dev,</div><div class='add'>+			u8 search_type, w1_slave_found_callback slave_found)</div><div class='ctx'> {</div><div class='ctx'> 	struct ds1wm_data *ds1wm_data = data;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -313,7 +315,7 @@ static void ds1wm_search(void *data, u8 search_type,</div><div class='ctx'> 	ds1wm_write_register(ds1wm_data, DS1WM_CMD, ~DS1WM_CMD_SRA);</div><div class='ctx'> 	ds1wm_reset(ds1wm_data);</div><div class='ctx'> </div><div class='del'>-	slave_found(ds1wm_data, rom_id);</div><div class='add'>+	slave_found(master_dev, rom_id);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* --------------------------------------------------------------------- */</div><div class='head'>diff --git a/drivers/w1/masters/ds2490.c b/drivers/w1/masters/ds2490.c<br/>index b63b5e044a4c..59ad6e95af8f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/w1/masters/ds2490.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/w1/masters/ds2490.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/w1/masters/ds2490.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/w1/masters/ds2490.c</a></div><div class='hunk'>@@ -88,7 +88,7 @@</div><div class='ctx'> #define COMM_DT				0x2000</div><div class='ctx'> #define COMM_SPU			0x1000</div><div class='ctx'> #define COMM_F				0x0800</div><div class='del'>-#define COMM_NTP			0x0400</div><div class='add'>+#define COMM_NTF			0x0400</div><div class='ctx'> #define COMM_ICP			0x0200</div><div class='ctx'> #define COMM_RST			0x0100</div><div class='ctx'> </div><div class='hunk'>@@ -98,11 +98,6 @@</div><div class='ctx'> #define BRANCH_MAIN			0xCC</div><div class='ctx'> #define BRANCH_AUX			0x33</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Duration of the strong pull-up pulse in milliseconds.</div><div class='del'>- */</div><div class='del'>-#define PULLUP_PULSE_DURATION		750</div><div class='del'>-</div><div class='ctx'> /* Status flags */</div><div class='ctx'> #define ST_SPUA				0x01  /* Strong Pull-up is active */</div><div class='ctx'> #define ST_PRGA				0x02  /* 12V programming pulse is being generated */</div><div class='hunk'>@@ -112,6 +107,17 @@</div><div class='ctx'> #define ST_IDLE				0x20  /* DS2490 is currently idle */</div><div class='ctx'> #define ST_EPOF				0x80</div><div class='ctx'> </div><div class='add'>+/* Result Register flags */</div><div class='add'>+#define RR_DETECT			0xA5 /* New device detected */</div><div class='add'>+#define RR_NRS				0x01 /* Reset no presence or ... */</div><div class='add'>+#define RR_SH				0x02 /* short on reset or set path */</div><div class='add'>+#define RR_APP				0x04 /* alarming presence on reset */</div><div class='add'>+#define RR_VPP				0x08 /* 12V expected not seen */</div><div class='add'>+#define RR_CMP				0x10 /* compare error */</div><div class='add'>+#define RR_CRC				0x20 /* CRC error detected */</div><div class='add'>+#define RR_RDP				0x40 /* redirected page */</div><div class='add'>+#define RR_EOS				0x80 /* end of search error */</div><div class='add'>+</div><div class='ctx'> #define SPEED_NORMAL			0x00</div><div class='ctx'> #define SPEED_FLEXIBLE			0x01</div><div class='ctx'> #define SPEED_OVERDRIVE			0x02</div><div class='hunk'>@@ -131,6 +137,15 @@ struct ds_device</div><div class='ctx'> </div><div class='ctx'> 	int			ep[NUM_EP];</div><div class='ctx'> </div><div class='add'>+	/* Strong PullUp</div><div class='add'>+	 * 0: pullup not active, else duration in milliseconds</div><div class='add'>+	 */</div><div class='add'>+	int			spu_sleep;</div><div class='add'>+	/* spu_bit contains COMM_SPU or 0 depending on if the strong pullup</div><div class='add'>+	 * should be active or not for writes.</div><div class='add'>+	 */</div><div class='add'>+	u16			spu_bit;</div><div class='add'>+</div><div class='ctx'> 	struct w1_bus_master	master;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -164,7 +179,6 @@ MODULE_DEVICE_TABLE(usb, ds_id_table);</div><div class='ctx'> static int ds_probe(struct usb_interface *, const struct usb_device_id *);</div><div class='ctx'> static void ds_disconnect(struct usb_interface *);</div><div class='ctx'> </div><div class='del'>-static inline void ds_dump_status(unsigned char *, unsigned char *, int);</div><div class='ctx'> static int ds_send_control(struct ds_device *, u16, u16);</div><div class='ctx'> static int ds_send_control_cmd(struct ds_device *, u16, u16);</div><div class='ctx'> </div><div class='hunk'>@@ -192,7 +206,7 @@ static int ds_send_control_cmd(struct ds_device *dev, u16 value, u16 index)</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='del'>-#if 0</div><div class='add'>+</div><div class='ctx'> static int ds_send_control_mode(struct ds_device *dev, u16 value, u16 index)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -207,7 +221,7 @@ static int ds_send_control_mode(struct ds_device *dev, u16 value, u16 index)</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='add'>+</div><div class='ctx'> static int ds_send_control(struct ds_device *dev, u16 value, u16 index)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -223,11 +237,6 @@ static int ds_send_control(struct ds_device *dev, u16 value, u16 index)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void ds_dump_status(unsigned char *buf, unsigned char *str, int off)</div><div class='del'>-{</div><div class='del'>-	printk("%45s: %8x\n", str, buf[off]);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int ds_recv_status_nodump(struct ds_device *dev, struct ds_status *st,</div><div class='ctx'> 				 unsigned char *buf, int size)</div><div class='ctx'> {</div><div class='hunk'>@@ -248,62 +257,81 @@ static int ds_recv_status_nodump(struct ds_device *dev, struct ds_status *st,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ds_recv_status(struct ds_device *dev, struct ds_status *st)</div><div class='add'>+static inline void ds_print_msg(unsigned char *buf, unsigned char *str, int off)</div><div class='ctx'> {</div><div class='del'>-	unsigned char buf[64];</div><div class='del'>-	int count, err = 0, i;</div><div class='del'>-</div><div class='del'>-	memcpy(st, buf, sizeof(*st));</div><div class='add'>+	printk(KERN_INFO "%45s: %8x\n", str, buf[off]);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	count = ds_recv_status_nodump(dev, st, buf, sizeof(buf));</div><div class='del'>-	if (count &lt; 0)</div><div class='del'>-		return err;</div><div class='add'>+static void ds_dump_status(struct ds_device *dev, unsigned char *buf, int count)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-	printk("0x%x: count=%d, status: ", dev-&gt;ep[EP_STATUS], count);</div><div class='add'>+	printk(KERN_INFO "0x%x: count=%d, status: ", dev-&gt;ep[EP_STATUS], count);</div><div class='ctx'> 	for (i=0; i&lt;count; ++i)</div><div class='ctx'> 		printk("%02x ", buf[i]);</div><div class='del'>-	printk("\n");</div><div class='add'>+	printk(KERN_INFO "\n");</div><div class='ctx'> </div><div class='ctx'> 	if (count &gt;= 16) {</div><div class='del'>-		ds_dump_status(buf, "enable flag", 0);</div><div class='del'>-		ds_dump_status(buf, "1-wire speed", 1);</div><div class='del'>-		ds_dump_status(buf, "strong pullup duration", 2);</div><div class='del'>-		ds_dump_status(buf, "programming pulse duration", 3);</div><div class='del'>-		ds_dump_status(buf, "pulldown slew rate control", 4);</div><div class='del'>-		ds_dump_status(buf, "write-1 low time", 5);</div><div class='del'>-		ds_dump_status(buf, "data sample offset/write-0 recovery time", 6);</div><div class='del'>-		ds_dump_status(buf, "reserved (test register)", 7);</div><div class='del'>-		ds_dump_status(buf, "device status flags", 8);</div><div class='del'>-		ds_dump_status(buf, "communication command byte 1", 9);</div><div class='del'>-		ds_dump_status(buf, "communication command byte 2", 10);</div><div class='del'>-		ds_dump_status(buf, "communication command buffer status", 11);</div><div class='del'>-		ds_dump_status(buf, "1-wire data output buffer status", 12);</div><div class='del'>-		ds_dump_status(buf, "1-wire data input buffer status", 13);</div><div class='del'>-		ds_dump_status(buf, "reserved", 14);</div><div class='del'>-		ds_dump_status(buf, "reserved", 15);</div><div class='add'>+		ds_print_msg(buf, "enable flag", 0);</div><div class='add'>+		ds_print_msg(buf, "1-wire speed", 1);</div><div class='add'>+		ds_print_msg(buf, "strong pullup duration", 2);</div><div class='add'>+		ds_print_msg(buf, "programming pulse duration", 3);</div><div class='add'>+		ds_print_msg(buf, "pulldown slew rate control", 4);</div><div class='add'>+		ds_print_msg(buf, "write-1 low time", 5);</div><div class='add'>+		ds_print_msg(buf, "data sample offset/write-0 recovery time",</div><div class='add'>+			6);</div><div class='add'>+		ds_print_msg(buf, "reserved (test register)", 7);</div><div class='add'>+		ds_print_msg(buf, "device status flags", 8);</div><div class='add'>+		ds_print_msg(buf, "communication command byte 1", 9);</div><div class='add'>+		ds_print_msg(buf, "communication command byte 2", 10);</div><div class='add'>+		ds_print_msg(buf, "communication command buffer status", 11);</div><div class='add'>+		ds_print_msg(buf, "1-wire data output buffer status", 12);</div><div class='add'>+		ds_print_msg(buf, "1-wire data input buffer status", 13);</div><div class='add'>+		ds_print_msg(buf, "reserved", 14);</div><div class='add'>+		ds_print_msg(buf, "reserved", 15);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	memcpy(st, buf, sizeof(*st));</div><div class='del'>-</div><div class='del'>-	if (st-&gt;status &amp; ST_EPOF) {</div><div class='del'>-		printk(KERN_INFO "Resetting device after ST_EPOF.\n");</div><div class='del'>-		err = ds_send_control_cmd(dev, CTL_RESET_DEVICE, 0);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='del'>-		count = ds_recv_status_nodump(dev, st, buf, sizeof(buf));</div><div class='del'>-		if (count &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-#if 0</div><div class='del'>-	if (st-&gt;status &amp; ST_IDLE) {</div><div class='del'>-		printk(KERN_INFO "Resetting pulse after ST_IDLE.\n");</div><div class='del'>-		err = ds_start_pulse(dev, PULLUP_PULSE_DURATION);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='add'>+	for (i = 16; i &lt; count; ++i) {</div><div class='add'>+		if (buf[i] == RR_DETECT) {</div><div class='add'>+			ds_print_msg(buf, "new device detect", i);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		ds_print_msg(buf, "Result Register Value: ", i);</div><div class='add'>+		if (buf[i] &amp; RR_NRS)</div><div class='add'>+			printk(KERN_INFO "NRS: Reset no presence or ...\n");</div><div class='add'>+		if (buf[i] &amp; RR_SH)</div><div class='add'>+			printk(KERN_INFO "SH: short on reset or set path\n");</div><div class='add'>+		if (buf[i] &amp; RR_APP)</div><div class='add'>+			printk(KERN_INFO "APP: alarming presence on reset\n");</div><div class='add'>+		if (buf[i] &amp; RR_VPP)</div><div class='add'>+			printk(KERN_INFO "VPP: 12V expected not seen\n");</div><div class='add'>+		if (buf[i] &amp; RR_CMP)</div><div class='add'>+			printk(KERN_INFO "CMP: compare error\n");</div><div class='add'>+		if (buf[i] &amp; RR_CRC)</div><div class='add'>+			printk(KERN_INFO "CRC: CRC error detected\n");</div><div class='add'>+		if (buf[i] &amp; RR_RDP)</div><div class='add'>+			printk(KERN_INFO "RDP: redirected page\n");</div><div class='add'>+		if (buf[i] &amp; RR_EOS)</div><div class='add'>+			printk(KERN_INFO "EOS: end of search error\n");</div><div class='ctx'> 	}</div><div class='del'>-#endif</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	return err;</div><div class='add'>+static void ds_reset_device(struct ds_device *dev)</div><div class='add'>+{</div><div class='add'>+	ds_send_control_cmd(dev, CTL_RESET_DEVICE, 0);</div><div class='add'>+	/* Always allow strong pullup which allow individual writes to use</div><div class='add'>+	 * the strong pullup.</div><div class='add'>+	 */</div><div class='add'>+	if (ds_send_control_mode(dev, MOD_PULSE_EN, PULSE_SPUE))</div><div class='add'>+		printk(KERN_ERR "ds_reset_device: "</div><div class='add'>+			"Error allowing strong pullup\n");</div><div class='add'>+	/* Chip strong pullup time was cleared. */</div><div class='add'>+	if (dev-&gt;spu_sleep) {</div><div class='add'>+		/* lower 4 bits are 0, see ds_set_pullup */</div><div class='add'>+		u8 del = dev-&gt;spu_sleep&gt;&gt;4;</div><div class='add'>+		if (ds_send_control(dev, COMM_SET_DURATION | COMM_IM, del))</div><div class='add'>+			printk(KERN_ERR "ds_reset_device: "</div><div class='add'>+				"Error setting duration\n");</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ds_recv_data(struct ds_device *dev, unsigned char *buf, int size)</div><div class='hunk'>@@ -311,13 +339,27 @@ static int ds_recv_data(struct ds_device *dev, unsigned char *buf, int size)</div><div class='ctx'> 	int count, err;</div><div class='ctx'> 	struct ds_status st;</div><div class='ctx'> </div><div class='add'>+	/* Careful on size.  If size is less than what is available in</div><div class='add'>+	 * the input buffer, the device fails the bulk transfer and</div><div class='add'>+	 * clears the input buffer.  It could read the maximum size of</div><div class='add'>+	 * the data buffer, but then do you return the first, last, or</div><div class='add'>+	 * some set of the middle size bytes?  As long as the rest of</div><div class='add'>+	 * the code is correct there will be size bytes waiting.  A</div><div class='add'>+	 * call to ds_wait_status will wait until the device is idle</div><div class='add'>+	 * and any data to be received would have been available.</div><div class='add'>+	 */</div><div class='ctx'> 	count = 0;</div><div class='ctx'> 	err = usb_bulk_msg(dev-&gt;udev, usb_rcvbulkpipe(dev-&gt;udev, dev-&gt;ep[EP_DATA_IN]),</div><div class='ctx'> 				buf, size, &amp;count, 1000);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='add'>+		u8 buf[0x20];</div><div class='add'>+		int count;</div><div class='add'>+</div><div class='ctx'> 		printk(KERN_INFO "Clearing ep0x%x.\n", dev-&gt;ep[EP_DATA_IN]);</div><div class='ctx'> 		usb_clear_halt(dev-&gt;udev, usb_rcvbulkpipe(dev-&gt;udev, dev-&gt;ep[EP_DATA_IN]));</div><div class='del'>-		ds_recv_status(dev, &amp;st);</div><div class='add'>+</div><div class='add'>+		count = ds_recv_status_nodump(dev, &amp;st, buf, sizeof(buf));</div><div class='add'>+		ds_dump_status(dev, buf, count);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -341,7 +383,8 @@ static int ds_send_data(struct ds_device *dev, unsigned char *buf, int len)</div><div class='ctx'> 	count = 0;</div><div class='ctx'> 	err = usb_bulk_msg(dev-&gt;udev, usb_sndbulkpipe(dev-&gt;udev, dev-&gt;ep[EP_DATA_OUT]), buf, len, &amp;count, 1000);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		printk(KERN_ERR "Failed to read 1-wire data from 0x02: err=%d.\n", err);</div><div class='add'>+		printk(KERN_ERR "Failed to write 1-wire data to ep0x%x: "</div><div class='add'>+			"err=%d.\n", dev-&gt;ep[EP_DATA_OUT], err);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -397,7 +440,7 @@ int ds_detect(struct ds_device *dev, struct ds_status *st)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	err = ds_recv_status(dev, st);</div><div class='add'>+	err = ds_dump_status(dev, st);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -420,33 +463,49 @@ static int ds_wait_status(struct ds_device *dev, struct ds_status *st)</div><div class='ctx'> 			printk("\n");</div><div class='ctx'> 		}</div><div class='ctx'> #endif</div><div class='del'>-	} while(!(buf[0x08] &amp; 0x20) &amp;&amp; !(err &lt; 0) &amp;&amp; ++count &lt; 100);</div><div class='add'>+	} while (!(buf[0x08] &amp; ST_IDLE) &amp;&amp; !(err &lt; 0) &amp;&amp; ++count &lt; 100);</div><div class='add'>+</div><div class='add'>+	if (err &gt;= 16 &amp;&amp; st-&gt;status &amp; ST_EPOF) {</div><div class='add'>+		printk(KERN_INFO "Resetting device after ST_EPOF.\n");</div><div class='add'>+		ds_reset_device(dev);</div><div class='add'>+		/* Always dump the device status. */</div><div class='add'>+		count = 101;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	/* Dump the status for errors or if there is extended return data.</div><div class='add'>+	 * The extended status includes new device detection (maybe someone</div><div class='add'>+	 * can do something with it).</div><div class='add'>+	 */</div><div class='add'>+	if (err &gt; 16 || count &gt;= 100 || err &lt; 0)</div><div class='add'>+		ds_dump_status(dev, buf, err);</div><div class='ctx'> </div><div class='del'>-	if (((err &gt; 16) &amp;&amp; (buf[0x10] &amp; 0x01)) || count &gt;= 100 || err &lt; 0) {</div><div class='del'>-		ds_recv_status(dev, st);</div><div class='add'>+	/* Extended data isn't an error.  Well, a short is, but the dump</div><div class='add'>+	 * would have already told the user that and we can't do anything</div><div class='add'>+	 * about it in software anyway.</div><div class='add'>+	 */</div><div class='add'>+	if (count &gt;= 100 || err &lt; 0)</div><div class='ctx'> 		return -1;</div><div class='del'>-	} else</div><div class='add'>+	else</div><div class='ctx'> 		return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ds_reset(struct ds_device *dev, struct ds_status *st)</div><div class='add'>+static int ds_reset(struct ds_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	//err = ds_send_control(dev, COMM_1_WIRE_RESET | COMM_F | COMM_IM | COMM_SE, SPEED_FLEXIBLE);</div><div class='del'>-	err = ds_send_control(dev, 0x43, SPEED_NORMAL);</div><div class='add'>+	/* Other potentionally interesting flags for reset.</div><div class='add'>+	 *</div><div class='add'>+	 * COMM_NTF: Return result register feedback.  This could be used to</div><div class='add'>+	 * detect some conditions such as short, alarming presence, or</div><div class='add'>+	 * detect if a new device was detected.</div><div class='add'>+	 *</div><div class='add'>+	 * COMM_SE which allows SPEED_NORMAL, SPEED_FLEXIBLE, SPEED_OVERDRIVE:</div><div class='add'>+	 * Select the data transfer rate.</div><div class='add'>+	 */</div><div class='add'>+	err = ds_send_control(dev, COMM_1_WIRE_RESET | COMM_IM, SPEED_NORMAL);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	ds_wait_status(dev, st);</div><div class='del'>-#if 0</div><div class='del'>-	if (st-&gt;command_buffer_status) {</div><div class='del'>-		printk(KERN_INFO "Short circuit.\n");</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -471,60 +530,43 @@ static int ds_set_speed(struct ds_device *dev, int speed)</div><div class='ctx'> }</div><div class='ctx'> #endif  /*  0  */</div><div class='ctx'> </div><div class='del'>-static int ds_start_pulse(struct ds_device *dev, int delay)</div><div class='add'>+static int ds_set_pullup(struct ds_device *dev, int delay)</div><div class='ctx'> {</div><div class='del'>-	int err;</div><div class='add'>+	int err = 0;</div><div class='ctx'> 	u8 del = 1 + (u8)(delay &gt;&gt; 4);</div><div class='del'>-	struct ds_status st;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	err = ds_stop_pulse(dev, 10);</div><div class='del'>-	if (err)</div><div class='add'>+	/* Just storing delay would not get the trunication and roundup. */</div><div class='add'>+	int ms = del&lt;&lt;4;</div><div class='add'>+</div><div class='add'>+	/* Enable spu_bit if a delay is set. */</div><div class='add'>+	dev-&gt;spu_bit = delay ? COMM_SPU : 0;</div><div class='add'>+	/* If delay is zero, it has already been disabled, if the time is</div><div class='add'>+	 * the same as the hardware was last programmed to, there is also</div><div class='add'>+	 * nothing more to do.  Compare with the recalculated value ms</div><div class='add'>+	 * rather than del or delay which can have a different value.</div><div class='add'>+	 */</div><div class='add'>+	if (delay == 0 || ms == dev-&gt;spu_sleep)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	err = ds_send_control_mode(dev, MOD_PULSE_EN, PULSE_SPUE);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-#endif</div><div class='ctx'> 	err = ds_send_control(dev, COMM_SET_DURATION | COMM_IM, del);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	err = ds_send_control(dev, COMM_PULSE | COMM_IM | COMM_F, 0);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	mdelay(delay);</div><div class='del'>-</div><div class='del'>-	ds_wait_status(dev, &amp;st);</div><div class='add'>+	dev-&gt;spu_sleep = ms;</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ds_touch_bit(struct ds_device *dev, u8 bit, u8 *tbit)</div><div class='ctx'> {</div><div class='del'>-	int err, count;</div><div class='add'>+	int err;</div><div class='ctx'> 	struct ds_status st;</div><div class='del'>-	u16 value = (COMM_BIT_IO | COMM_IM) | ((bit) ? COMM_D : 0);</div><div class='del'>-	u16 cmd;</div><div class='ctx'> </div><div class='del'>-	err = ds_send_control(dev, value, 0);</div><div class='add'>+	err = ds_send_control(dev, COMM_BIT_IO | COMM_IM | (bit ? COMM_D : 0),</div><div class='add'>+		0);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	count = 0;</div><div class='del'>-	do {</div><div class='del'>-		err = ds_wait_status(dev, &amp;st);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='del'>-</div><div class='del'>-		cmd = st.command0 | (st.command1 &lt;&lt; 8);</div><div class='del'>-	} while (cmd != value &amp;&amp; ++count &lt; 10);</div><div class='del'>-</div><div class='del'>-	if (err &lt; 0 || count &gt;= 10) {</div><div class='del'>-		printk(KERN_ERR "Failed to obtain status.\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='add'>+	ds_wait_status(dev, &amp;st);</div><div class='ctx'> </div><div class='ctx'> 	err = ds_recv_data(dev, tbit, sizeof(*tbit));</div><div class='ctx'> 	if (err &lt; 0)</div><div class='hunk'>@@ -533,12 +575,18 @@ static int ds_touch_bit(struct ds_device *dev, u8 bit, u8 *tbit)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#if 0</div><div class='ctx'> static int ds_write_bit(struct ds_device *dev, u8 bit)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct ds_status st;</div><div class='ctx'> </div><div class='del'>-	err = ds_send_control(dev, COMM_BIT_IO | COMM_IM | (bit) ? COMM_D : 0, 0);</div><div class='add'>+	/* Set COMM_ICP to write without a readback.  Note, this will</div><div class='add'>+	 * produce one time slot, a down followed by an up with COMM_D</div><div class='add'>+	 * only determing the timing.</div><div class='add'>+	 */</div><div class='add'>+	err = ds_send_control(dev, COMM_BIT_IO | COMM_IM | COMM_ICP |</div><div class='add'>+		(bit ? COMM_D : 0), 0);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -546,6 +594,7 @@ static int ds_write_bit(struct ds_device *dev, u8 bit)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> static int ds_write_byte(struct ds_device *dev, u8 byte)</div><div class='ctx'> {</div><div class='hunk'>@@ -553,10 +602,13 @@ static int ds_write_byte(struct ds_device *dev, u8 byte)</div><div class='ctx'> 	struct ds_status st;</div><div class='ctx'> 	u8 rbyte;</div><div class='ctx'> </div><div class='del'>-	err = ds_send_control(dev, COMM_BYTE_IO | COMM_IM | COMM_SPU, byte);</div><div class='add'>+	err = ds_send_control(dev, COMM_BYTE_IO | COMM_IM | dev-&gt;spu_bit, byte);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='add'>+	if (dev-&gt;spu_bit)</div><div class='add'>+		msleep(dev-&gt;spu_sleep);</div><div class='add'>+</div><div class='ctx'> 	err = ds_wait_status(dev, &amp;st);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='hunk'>@@ -565,8 +617,6 @@ static int ds_write_byte(struct ds_device *dev, u8 byte)</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	ds_start_pulse(dev, PULLUP_PULSE_DURATION);</div><div class='del'>-</div><div class='ctx'> 	return !(byte == rbyte);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -602,7 +652,7 @@ static int ds_read_block(struct ds_device *dev, u8 *buf, int len)</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	err = ds_send_control(dev, COMM_BLOCK_IO | COMM_IM | COMM_SPU, len);</div><div class='add'>+	err = ds_send_control(dev, COMM_BLOCK_IO | COMM_IM, len);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -623,20 +673,19 @@ static int ds_write_block(struct ds_device *dev, u8 *buf, int len)</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	ds_wait_status(dev, &amp;st);</div><div class='del'>-</div><div class='del'>-	err = ds_send_control(dev, COMM_BLOCK_IO | COMM_IM | COMM_SPU, len);</div><div class='add'>+	err = ds_send_control(dev, COMM_BLOCK_IO | COMM_IM | dev-&gt;spu_bit, len);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='add'>+	if (dev-&gt;spu_bit)</div><div class='add'>+		msleep(dev-&gt;spu_sleep);</div><div class='add'>+</div><div class='ctx'> 	ds_wait_status(dev, &amp;st);</div><div class='ctx'> </div><div class='ctx'> 	err = ds_recv_data(dev, buf, len);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	ds_start_pulse(dev, PULLUP_PULSE_DURATION);</div><div class='del'>-</div><div class='ctx'> 	return !(err == len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -728,6 +777,7 @@ static u8 ds9490r_touch_bit(void *data, u8 bit)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#if 0</div><div class='ctx'> static void ds9490r_write_bit(void *data, u8 bit)</div><div class='ctx'> {</div><div class='ctx'> 	struct ds_device *dev = data;</div><div class='hunk'>@@ -735,13 +785,6 @@ static void ds9490r_write_bit(void *data, u8 bit)</div><div class='ctx'> 	ds_write_bit(dev, bit);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ds9490r_write_byte(void *data, u8 byte)</div><div class='del'>-{</div><div class='del'>-	struct ds_device *dev = data;</div><div class='del'>-</div><div class='del'>-	ds_write_byte(dev, byte);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static u8 ds9490r_read_bit(void *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct ds_device *dev = data;</div><div class='hunk'>@@ -754,6 +797,14 @@ static u8 ds9490r_read_bit(void *data)</div><div class='ctx'> </div><div class='ctx'> 	return bit &amp; 1;</div><div class='ctx'> }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static void ds9490r_write_byte(void *data, u8 byte)</div><div class='add'>+{</div><div class='add'>+	struct ds_device *dev = data;</div><div class='add'>+</div><div class='add'>+	ds_write_byte(dev, byte);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static u8 ds9490r_read_byte(void *data)</div><div class='ctx'> {</div><div class='hunk'>@@ -790,31 +841,58 @@ static u8 ds9490r_read_block(void *data, u8 *buf, int len)</div><div class='ctx'> static u8 ds9490r_reset(void *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct ds_device *dev = data;</div><div class='del'>-	struct ds_status st;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	memset(&amp;st, 0, sizeof(st));</div><div class='del'>-</div><div class='del'>-	err = ds_reset(dev, &amp;st);</div><div class='add'>+	err = ds_reset(dev);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static u8 ds9490r_set_pullup(void *data, int delay)</div><div class='add'>+{</div><div class='add'>+	struct ds_device *dev = data;</div><div class='add'>+</div><div class='add'>+	if (ds_set_pullup(dev, delay))</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ds_w1_init(struct ds_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	memset(&amp;dev-&gt;master, 0, sizeof(struct w1_bus_master));</div><div class='ctx'> </div><div class='add'>+	/* Reset the device as it can be in a bad state.</div><div class='add'>+	 * This is necessary because a block write will wait for data</div><div class='add'>+	 * to be placed in the output buffer and block any later</div><div class='add'>+	 * commands which will keep accumulating and the device will</div><div class='add'>+	 * not be idle.  Another case is removing the ds2490 module</div><div class='add'>+	 * while a bus search is in progress, somehow a few commands</div><div class='add'>+	 * get through, but the input transfers fail leaving data in</div><div class='add'>+	 * the input buffer.  This will cause the next read to fail</div><div class='add'>+	 * see the note in ds_recv_data.</div><div class='add'>+	 */</div><div class='add'>+	ds_reset_device(dev);</div><div class='add'>+</div><div class='ctx'> 	dev-&gt;master.data	= dev;</div><div class='ctx'> 	dev-&gt;master.touch_bit	= &amp;ds9490r_touch_bit;</div><div class='add'>+	/* read_bit and write_bit in w1_bus_master are expected to set and</div><div class='add'>+	 * sample the line level.  For write_bit that means it is expected to</div><div class='add'>+	 * set it to that value and leave it there.  ds2490 only supports an</div><div class='add'>+	 * individual time slot at the lowest level.  The requirement from</div><div class='add'>+	 * pulling the bus state down to reading the state is 15us, something</div><div class='add'>+	 * that isn't realistic on the USB bus anyway.</div><div class='ctx'> 	dev-&gt;master.read_bit	= &amp;ds9490r_read_bit;</div><div class='ctx'> 	dev-&gt;master.write_bit	= &amp;ds9490r_write_bit;</div><div class='add'>+	*/</div><div class='ctx'> 	dev-&gt;master.read_byte	= &amp;ds9490r_read_byte;</div><div class='ctx'> 	dev-&gt;master.write_byte	= &amp;ds9490r_write_byte;</div><div class='ctx'> 	dev-&gt;master.read_block	= &amp;ds9490r_read_block;</div><div class='ctx'> 	dev-&gt;master.write_block	= &amp;ds9490r_write_block;</div><div class='ctx'> 	dev-&gt;master.reset_bus	= &amp;ds9490r_reset;</div><div class='add'>+	dev-&gt;master.set_pullup	= &amp;ds9490r_set_pullup;</div><div class='ctx'> </div><div class='ctx'> 	return w1_add_master_device(&amp;dev-&gt;master);</div><div class='ctx'> }</div><div class='hunk'>@@ -838,6 +916,8 @@ static int ds_probe(struct usb_interface *intf,</div><div class='ctx'> 		printk(KERN_INFO "Failed to allocate new DS9490R structure.\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='add'>+	dev-&gt;spu_sleep = 0;</div><div class='add'>+	dev-&gt;spu_bit = 0;</div><div class='ctx'> 	dev-&gt;udev = usb_get_dev(udev);</div><div class='ctx'> 	if (!dev-&gt;udev) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='head'>diff --git a/drivers/w1/slaves/w1_ds2431.c b/drivers/w1/slaves/w1_ds2431.c<br/>new file mode 100644<br/>index 000000000000..2c6c0cf6a20f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/w1/slaves/w1_ds2431.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/w1/slaves/w1_ds2431.c</a></div><div class='hunk'>@@ -0,0 +1,312 @@</div><div class='add'>+/*</div><div class='add'>+ * w1_ds2431.c - w1 family 2d (DS2431) driver</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2008 Bernhard Weirich &lt;bernhard.weirich@riedel.net&gt;</div><div class='add'>+ *</div><div class='add'>+ * Heavily inspired by w1_DS2433 driver from Ben Gardner &lt;bgardner@wabtec.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This source code is licensed under the GNU General Public License,</div><div class='add'>+ * Version 2. See the file COPYING for more details.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+</div><div class='add'>+#include "../w1.h"</div><div class='add'>+#include "../w1_int.h"</div><div class='add'>+#include "../w1_family.h"</div><div class='add'>+</div><div class='add'>+#define W1_F2D_EEPROM_SIZE		128</div><div class='add'>+#define W1_F2D_PAGE_COUNT		4</div><div class='add'>+#define W1_F2D_PAGE_BITS		5</div><div class='add'>+#define W1_F2D_PAGE_SIZE		(1&lt;&lt;W1_F2D_PAGE_BITS)</div><div class='add'>+#define W1_F2D_PAGE_MASK		0x1F</div><div class='add'>+</div><div class='add'>+#define W1_F2D_SCRATCH_BITS  3</div><div class='add'>+#define W1_F2D_SCRATCH_SIZE  (1&lt;&lt;W1_F2D_SCRATCH_BITS)</div><div class='add'>+#define W1_F2D_SCRATCH_MASK  (W1_F2D_SCRATCH_SIZE-1)</div><div class='add'>+</div><div class='add'>+#define W1_F2D_READ_EEPROM	0xF0</div><div class='add'>+#define W1_F2D_WRITE_SCRATCH	0x0F</div><div class='add'>+#define W1_F2D_READ_SCRATCH	0xAA</div><div class='add'>+#define W1_F2D_COPY_SCRATCH	0x55</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define W1_F2D_TPROG_MS		11</div><div class='add'>+</div><div class='add'>+#define W1_F2D_READ_RETRIES		10</div><div class='add'>+#define W1_F2D_READ_MAXLEN		8</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Check the file size bounds and adjusts count as needed.</div><div class='add'>+ * This would not be needed if the file size didn't reset to 0 after a write.</div><div class='add'>+ */</div><div class='add'>+static inline size_t w1_f2d_fix_count(loff_t off, size_t count, size_t size)</div><div class='add'>+{</div><div class='add'>+	if (off &gt; size)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if ((off + count) &gt; size)</div><div class='add'>+		return size - off;</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Read a block from W1 ROM two times and compares the results.</div><div class='add'>+ * If they are equal they are returned, otherwise the read</div><div class='add'>+ * is repeated W1_F2D_READ_RETRIES times.</div><div class='add'>+ *</div><div class='add'>+ * count must not exceed W1_F2D_READ_MAXLEN.</div><div class='add'>+ */</div><div class='add'>+static int w1_f2d_readblock(struct w1_slave *sl, int off, int count, char *buf)</div><div class='add'>+{</div><div class='add'>+	u8 wrbuf[3];</div><div class='add'>+	u8 cmp[W1_F2D_READ_MAXLEN];</div><div class='add'>+	int tries = W1_F2D_READ_RETRIES;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		wrbuf[0] = W1_F2D_READ_EEPROM;</div><div class='add'>+		wrbuf[1] = off &amp; 0xff;</div><div class='add'>+		wrbuf[2] = off &gt;&gt; 8;</div><div class='add'>+</div><div class='add'>+		if (w1_reset_select_slave(sl))</div><div class='add'>+			return -1;</div><div class='add'>+</div><div class='add'>+		w1_write_block(sl-&gt;master, wrbuf, 3);</div><div class='add'>+		w1_read_block(sl-&gt;master, buf, count);</div><div class='add'>+</div><div class='add'>+		if (w1_reset_select_slave(sl))</div><div class='add'>+			return -1;</div><div class='add'>+</div><div class='add'>+		w1_write_block(sl-&gt;master, wrbuf, 3);</div><div class='add'>+		w1_read_block(sl-&gt;master, cmp, count);</div><div class='add'>+</div><div class='add'>+		if (!memcmp(cmp, buf, count))</div><div class='add'>+			return 0;</div><div class='add'>+	} while (--tries);</div><div class='add'>+</div><div class='add'>+	dev_err(&amp;sl-&gt;dev, "proof reading failed %d times\n",</div><div class='add'>+			W1_F2D_READ_RETRIES);</div><div class='add'>+</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t w1_f2d_read_bin(struct kobject *kobj,</div><div class='add'>+			       struct bin_attribute *bin_attr,</div><div class='add'>+			       char *buf, loff_t off, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct w1_slave *sl = kobj_to_w1_slave(kobj);</div><div class='add'>+	int todo = count;</div><div class='add'>+</div><div class='add'>+	count = w1_f2d_fix_count(off, count, W1_F2D_EEPROM_SIZE);</div><div class='add'>+	if (count == 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;sl-&gt;master-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	/* read directly from the EEPROM in chunks of W1_F2D_READ_MAXLEN */</div><div class='add'>+	while (todo &gt; 0) {</div><div class='add'>+		int block_read;</div><div class='add'>+</div><div class='add'>+		if (todo &gt;= W1_F2D_READ_MAXLEN)</div><div class='add'>+			block_read = W1_F2D_READ_MAXLEN;</div><div class='add'>+		else</div><div class='add'>+			block_read = todo;</div><div class='add'>+</div><div class='add'>+		if (w1_f2d_readblock(sl, off, block_read, buf) &lt; 0)</div><div class='add'>+			count = -EIO;</div><div class='add'>+</div><div class='add'>+		todo -= W1_F2D_READ_MAXLEN;</div><div class='add'>+		buf += W1_F2D_READ_MAXLEN;</div><div class='add'>+		off += W1_F2D_READ_MAXLEN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;sl-&gt;master-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Writes to the scratchpad and reads it back for verification.</div><div class='add'>+ * Then copies the scratchpad to EEPROM.</div><div class='add'>+ * The data must be aligned at W1_F2D_SCRATCH_SIZE bytes and</div><div class='add'>+ * must be W1_F2D_SCRATCH_SIZE bytes long.</div><div class='add'>+ * The master must be locked.</div><div class='add'>+ *</div><div class='add'>+ * @param sl	The slave structure</div><div class='add'>+ * @param addr	Address for the write</div><div class='add'>+ * @param len   length must be &lt;= (W1_F2D_PAGE_SIZE - (addr &amp; W1_F2D_PAGE_MASK))</div><div class='add'>+ * @param data	The data to write</div><div class='add'>+ * @return	0=Success -1=failure</div><div class='add'>+ */</div><div class='add'>+static int w1_f2d_write(struct w1_slave *sl, int addr, int len, const u8 *data)</div><div class='add'>+{</div><div class='add'>+	int tries = W1_F2D_READ_RETRIES;</div><div class='add'>+	u8 wrbuf[4];</div><div class='add'>+	u8 rdbuf[W1_F2D_SCRATCH_SIZE + 3];</div><div class='add'>+	u8 es = (addr + len - 1) % W1_F2D_SCRATCH_SIZE;</div><div class='add'>+</div><div class='add'>+retry:</div><div class='add'>+</div><div class='add'>+	/* Write the data to the scratchpad */</div><div class='add'>+	if (w1_reset_select_slave(sl))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	wrbuf[0] = W1_F2D_WRITE_SCRATCH;</div><div class='add'>+	wrbuf[1] = addr &amp; 0xff;</div><div class='add'>+	wrbuf[2] = addr &gt;&gt; 8;</div><div class='add'>+</div><div class='add'>+	w1_write_block(sl-&gt;master, wrbuf, 3);</div><div class='add'>+	w1_write_block(sl-&gt;master, data, len);</div><div class='add'>+</div><div class='add'>+	/* Read the scratchpad and verify */</div><div class='add'>+	if (w1_reset_select_slave(sl))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	w1_write_8(sl-&gt;master, W1_F2D_READ_SCRATCH);</div><div class='add'>+	w1_read_block(sl-&gt;master, rdbuf, len + 3);</div><div class='add'>+</div><div class='add'>+	/* Compare what was read against the data written */</div><div class='add'>+	if ((rdbuf[0] != wrbuf[1]) || (rdbuf[1] != wrbuf[2]) ||</div><div class='add'>+	    (rdbuf[2] != es) || (memcmp(data, &amp;rdbuf[3], len) != 0)) {</div><div class='add'>+</div><div class='add'>+		if (--tries)</div><div class='add'>+			goto retry;</div><div class='add'>+</div><div class='add'>+		dev_err(&amp;sl-&gt;dev,</div><div class='add'>+			"could not write to eeprom, scratchpad compare failed %d times\n",</div><div class='add'>+			W1_F2D_READ_RETRIES);</div><div class='add'>+</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Copy the scratchpad to EEPROM */</div><div class='add'>+	if (w1_reset_select_slave(sl))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	wrbuf[0] = W1_F2D_COPY_SCRATCH;</div><div class='add'>+	wrbuf[3] = es;</div><div class='add'>+	w1_write_block(sl-&gt;master, wrbuf, 4);</div><div class='add'>+</div><div class='add'>+	/* Sleep for tprog ms to wait for the write to complete */</div><div class='add'>+	msleep(W1_F2D_TPROG_MS);</div><div class='add'>+</div><div class='add'>+	/* Reset the bus to wake up the EEPROM  */</div><div class='add'>+	w1_reset_bus(sl-&gt;master);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t w1_f2d_write_bin(struct kobject *kobj,</div><div class='add'>+				struct bin_attribute *bin_attr,</div><div class='add'>+				char *buf, loff_t off, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct w1_slave *sl = kobj_to_w1_slave(kobj);</div><div class='add'>+	int addr, len;</div><div class='add'>+	int copy;</div><div class='add'>+</div><div class='add'>+	count = w1_f2d_fix_count(off, count, W1_F2D_EEPROM_SIZE);</div><div class='add'>+	if (count == 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;sl-&gt;master-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	/* Can only write data in blocks of the size of the scratchpad */</div><div class='add'>+	addr = off;</div><div class='add'>+	len = count;</div><div class='add'>+	while (len &gt; 0) {</div><div class='add'>+</div><div class='add'>+		/* if len too short or addr not aligned */</div><div class='add'>+		if (len &lt; W1_F2D_SCRATCH_SIZE || addr &amp; W1_F2D_SCRATCH_MASK) {</div><div class='add'>+			char tmp[W1_F2D_SCRATCH_SIZE];</div><div class='add'>+</div><div class='add'>+			/* read the block and update the parts to be written */</div><div class='add'>+			if (w1_f2d_readblock(sl, addr &amp; ~W1_F2D_SCRATCH_MASK,</div><div class='add'>+					W1_F2D_SCRATCH_SIZE, tmp)) {</div><div class='add'>+				count = -EIO;</div><div class='add'>+				goto out_up;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* copy at most to the boundary of the PAGE or len */</div><div class='add'>+			copy = W1_F2D_SCRATCH_SIZE -</div><div class='add'>+				(addr &amp; W1_F2D_SCRATCH_MASK);</div><div class='add'>+</div><div class='add'>+			if (copy &gt; len)</div><div class='add'>+				copy = len;</div><div class='add'>+</div><div class='add'>+			memcpy(&amp;tmp[addr &amp; W1_F2D_SCRATCH_MASK], buf, copy);</div><div class='add'>+			if (w1_f2d_write(sl, addr &amp; ~W1_F2D_SCRATCH_MASK,</div><div class='add'>+					W1_F2D_SCRATCH_SIZE, tmp) &lt; 0) {</div><div class='add'>+				count = -EIO;</div><div class='add'>+				goto out_up;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+</div><div class='add'>+			copy = W1_F2D_SCRATCH_SIZE;</div><div class='add'>+			if (w1_f2d_write(sl, addr, copy, buf) &lt; 0) {</div><div class='add'>+				count = -EIO;</div><div class='add'>+				goto out_up;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		buf += copy;</div><div class='add'>+		addr += copy;</div><div class='add'>+		len -= copy;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out_up:</div><div class='add'>+	mutex_unlock(&amp;sl-&gt;master-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct bin_attribute w1_f2d_bin_attr = {</div><div class='add'>+	.attr = {</div><div class='add'>+		.name = "eeprom",</div><div class='add'>+		.mode = S_IRUGO | S_IWUSR,</div><div class='add'>+	},</div><div class='add'>+	.size = W1_F2D_EEPROM_SIZE,</div><div class='add'>+	.read = w1_f2d_read_bin,</div><div class='add'>+	.write = w1_f2d_write_bin,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int w1_f2d_add_slave(struct w1_slave *sl)</div><div class='add'>+{</div><div class='add'>+	return sysfs_create_bin_file(&amp;sl-&gt;dev.kobj, &amp;w1_f2d_bin_attr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void w1_f2d_remove_slave(struct w1_slave *sl)</div><div class='add'>+{</div><div class='add'>+	sysfs_remove_bin_file(&amp;sl-&gt;dev.kobj, &amp;w1_f2d_bin_attr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct w1_family_ops w1_f2d_fops = {</div><div class='add'>+	.add_slave      = w1_f2d_add_slave,</div><div class='add'>+	.remove_slave   = w1_f2d_remove_slave,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct w1_family w1_family_2d = {</div><div class='add'>+	.fid = W1_EEPROM_DS2431,</div><div class='add'>+	.fops = &amp;w1_f2d_fops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init w1_f2d_init(void)</div><div class='add'>+{</div><div class='add'>+	return w1_register_family(&amp;w1_family_2d);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit w1_f2d_fini(void)</div><div class='add'>+{</div><div class='add'>+	w1_unregister_family(&amp;w1_family_2d);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(w1_f2d_init);</div><div class='add'>+module_exit(w1_f2d_fini);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_AUTHOR("Bernhard Weirich &lt;bernhard.weirich@riedel.net&gt;");</div><div class='add'>+MODULE_DESCRIPTION("w1 family 2d driver for DS2431, 1kb EEPROM");</div><div class='head'>diff --git a/drivers/w1/slaves/w1_therm.c b/drivers/w1/slaves/w1_therm.c<br/>index fb28acaeed6c..2c8dff9f77da 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/w1/slaves/w1_therm.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/w1/slaves/w1_therm.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/w1/slaves/w1_therm.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/w1/slaves/w1_therm.c</a></div><div class='hunk'>@@ -37,31 +37,33 @@ MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("Evgeniy Polyakov &lt;johnpol@2ka.mipt.ru&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Driver for 1-wire Dallas network protocol, temperature family.");</div><div class='ctx'> </div><div class='add'>+/* Allow the strong pullup to be disabled, but default to enabled.</div><div class='add'>+ * If it was disabled a parasite powered device might not get the require</div><div class='add'>+ * current to do a temperature conversion.  If it is enabled parasite powered</div><div class='add'>+ * devices have a better chance of getting the current required.</div><div class='add'>+ */</div><div class='add'>+static int w1_strong_pullup = 1;</div><div class='add'>+module_param_named(strong_pullup, w1_strong_pullup, int, 0);</div><div class='add'>+</div><div class='ctx'> static u8 bad_roms[][9] = {</div><div class='ctx'> 				{0xaa, 0x00, 0x4b, 0x46, 0xff, 0xff, 0x0c, 0x10, 0x87},</div><div class='ctx'> 				{}</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-static ssize_t w1_therm_read_bin(struct kobject *, struct bin_attribute *,</div><div class='del'>-				 char *, loff_t, size_t);</div><div class='add'>+static ssize_t w1_therm_read(struct device *device,</div><div class='add'>+	struct device_attribute *attr, char *buf);</div><div class='ctx'> </div><div class='del'>-static struct bin_attribute w1_therm_bin_attr = {</div><div class='del'>-	.attr = {</div><div class='del'>-		.name = "w1_slave",</div><div class='del'>-		.mode = S_IRUGO,</div><div class='del'>-	},</div><div class='del'>-	.size = W1_SLAVE_DATA_SIZE,</div><div class='del'>-	.read = w1_therm_read_bin,</div><div class='del'>-};</div><div class='add'>+static struct device_attribute w1_therm_attr =</div><div class='add'>+	__ATTR(w1_slave, S_IRUGO, w1_therm_read, NULL);</div><div class='ctx'> </div><div class='ctx'> static int w1_therm_add_slave(struct w1_slave *sl)</div><div class='ctx'> {</div><div class='del'>-	return sysfs_create_bin_file(&amp;sl-&gt;dev.kobj, &amp;w1_therm_bin_attr);</div><div class='add'>+	return device_create_file(&amp;sl-&gt;dev, &amp;w1_therm_attr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void w1_therm_remove_slave(struct w1_slave *sl)</div><div class='ctx'> {</div><div class='del'>-	sysfs_remove_bin_file(&amp;sl-&gt;dev.kobj, &amp;w1_therm_bin_attr);</div><div class='add'>+	device_remove_file(&amp;sl-&gt;dev, &amp;w1_therm_attr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct w1_family_ops w1_therm_fops = {</div><div class='hunk'>@@ -160,30 +162,19 @@ static int w1_therm_check_rom(u8 rom[9])</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t w1_therm_read_bin(struct kobject *kobj,</div><div class='del'>-				 struct bin_attribute *bin_attr,</div><div class='del'>-				 char *buf, loff_t off, size_t count)</div><div class='add'>+static ssize_t w1_therm_read(struct device *device,</div><div class='add'>+	struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='del'>-	struct w1_slave *sl = kobj_to_w1_slave(kobj);</div><div class='add'>+	struct w1_slave *sl = dev_to_w1_slave(device);</div><div class='ctx'> 	struct w1_master *dev = sl-&gt;master;</div><div class='ctx'> 	u8 rom[9], crc, verdict;</div><div class='ctx'> 	int i, max_trying = 10;</div><div class='add'>+	ssize_t c = PAGE_SIZE;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;sl-&gt;master-&gt;mutex);</div><div class='add'>+	mutex_lock(&amp;dev-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-	if (off &gt; W1_SLAVE_DATA_SIZE) {</div><div class='del'>-		count = 0;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-	if (off + count &gt; W1_SLAVE_DATA_SIZE) {</div><div class='del'>-		count = 0;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memset(buf, 0, count);</div><div class='ctx'> 	memset(rom, 0, sizeof(rom));</div><div class='ctx'> </div><div class='del'>-	count = 0;</div><div class='ctx'> 	verdict = 0;</div><div class='ctx'> 	crc = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -192,15 +183,20 @@ static ssize_t w1_therm_read_bin(struct kobject *kobj,</div><div class='ctx'> 			int count = 0;</div><div class='ctx'> 			unsigned int tm = 750;</div><div class='ctx'> </div><div class='add'>+			/* 750ms strong pullup (or delay) after the convert */</div><div class='add'>+			if (w1_strong_pullup)</div><div class='add'>+				w1_next_pullup(dev, tm);</div><div class='ctx'> 			w1_write_8(dev, W1_CONVERT_TEMP);</div><div class='del'>-</div><div class='del'>-			msleep(tm);</div><div class='add'>+			if (!w1_strong_pullup)</div><div class='add'>+				msleep(tm);</div><div class='ctx'> </div><div class='ctx'> 			if (!w1_reset_select_slave(sl)) {</div><div class='ctx'> </div><div class='ctx'> 				w1_write_8(dev, W1_READ_SCRATCHPAD);</div><div class='ctx'> 				if ((count = w1_read_block(dev, rom, 9)) != 9) {</div><div class='del'>-					dev_warn(&amp;dev-&gt;dev, "w1_read_block() returned %d instead of 9.\n", count);</div><div class='add'>+					dev_warn(device, "w1_read_block() "</div><div class='add'>+						"returned %u instead of 9.\n",</div><div class='add'>+						count);</div><div class='ctx'> 				}</div><div class='ctx'> </div><div class='ctx'> 				crc = w1_calc_crc8(rom, 8);</div><div class='hunk'>@@ -215,22 +211,22 @@ static ssize_t w1_therm_read_bin(struct kobject *kobj,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 9; ++i)</div><div class='del'>-		count += sprintf(buf + count, "%02x ", rom[i]);</div><div class='del'>-	count += sprintf(buf + count, ": crc=%02x %s\n",</div><div class='add'>+		c -= snprintf(buf + PAGE_SIZE - c, c, "%02x ", rom[i]);</div><div class='add'>+	c -= snprintf(buf + PAGE_SIZE - c, c, ": crc=%02x %s\n",</div><div class='ctx'> 			   crc, (verdict) ? "YES" : "NO");</div><div class='ctx'> 	if (verdict)</div><div class='ctx'> 		memcpy(sl-&gt;rom, rom, sizeof(sl-&gt;rom));</div><div class='ctx'> 	else</div><div class='del'>-		dev_warn(&amp;dev-&gt;dev, "18S20 doesn't respond to CONVERT_TEMP.\n");</div><div class='add'>+		dev_warn(device, "18S20 doesn't respond to CONVERT_TEMP.\n");</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 9; ++i)</div><div class='del'>-		count += sprintf(buf + count, "%02x ", sl-&gt;rom[i]);</div><div class='add'>+		c -= snprintf(buf + PAGE_SIZE - c, c, "%02x ", sl-&gt;rom[i]);</div><div class='ctx'> </div><div class='del'>-	count += sprintf(buf + count, "t=%d\n", w1_convert_temp(rom, sl-&gt;family-&gt;fid));</div><div class='del'>-out:</div><div class='add'>+	c -= snprintf(buf + PAGE_SIZE - c, c, "t=%d\n",</div><div class='add'>+		w1_convert_temp(rom, sl-&gt;family-&gt;fid));</div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-	return count;</div><div class='add'>+	return PAGE_SIZE - c;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init w1_therm_init(void)</div><div class='head'>diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c<br/>index 7293c9b11f91..3b615d4022ee 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/w1/w1.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/w1/w1.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/w1/w1.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/w1/w1.c</a></div><div class='hunk'>@@ -46,19 +46,17 @@ MODULE_AUTHOR("Evgeniy Polyakov &lt;johnpol@2ka.mipt.ru&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Driver for 1-wire Dallas network protocol.");</div><div class='ctx'> </div><div class='ctx'> static int w1_timeout = 10;</div><div class='del'>-static int w1_control_timeout = 1;</div><div class='ctx'> int w1_max_slave_count = 10;</div><div class='ctx'> int w1_max_slave_ttl = 10;</div><div class='ctx'> </div><div class='ctx'> module_param_named(timeout, w1_timeout, int, 0);</div><div class='del'>-module_param_named(control_timeout, w1_control_timeout, int, 0);</div><div class='ctx'> module_param_named(max_slave_count, w1_max_slave_count, int, 0);</div><div class='ctx'> module_param_named(slave_ttl, w1_max_slave_ttl, int, 0);</div><div class='ctx'> </div><div class='ctx'> DEFINE_MUTEX(w1_mlock);</div><div class='ctx'> LIST_HEAD(w1_masters);</div><div class='ctx'> </div><div class='del'>-static struct task_struct *w1_control_thread;</div><div class='add'>+static int w1_attach_slave_device(struct w1_master *dev, struct w1_reg_num *rn);</div><div class='ctx'> </div><div class='ctx'> static int w1_master_match(struct device *dev, struct device_driver *drv)</div><div class='ctx'> {</div><div class='hunk'>@@ -83,10 +81,10 @@ static void w1_slave_release(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct w1_slave *sl = dev_to_w1_slave(dev);</div><div class='ctx'> </div><div class='del'>-	printk("%s: Releasing %s.\n", __func__, sl-&gt;name);</div><div class='add'>+	dev_dbg(dev, "%s: Releasing %s.\n", __func__, sl-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	while (atomic_read(&amp;sl-&gt;refcnt)) {</div><div class='del'>-		printk("Waiting for %s to become free: refcnt=%d.\n",</div><div class='add'>+		dev_dbg(dev, "Waiting for %s to become free: refcnt=%d.\n",</div><div class='ctx'> 				sl-&gt;name, atomic_read(&amp;sl-&gt;refcnt));</div><div class='ctx'> 		if (msleep_interruptible(1000))</div><div class='ctx'> 			flush_signals(current);</div><div class='hunk'>@@ -105,35 +103,20 @@ static ssize_t w1_slave_read_name(struct device *dev, struct device_attribute *a</div><div class='ctx'> 	return sprintf(buf, "%s\n", sl-&gt;name);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t w1_slave_read_id(struct kobject *kobj,</div><div class='del'>-				struct bin_attribute *bin_attr,</div><div class='del'>-				char *buf, loff_t off, size_t count)</div><div class='add'>+static ssize_t w1_slave_read_id(struct device *dev,</div><div class='add'>+	struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='del'>-	struct w1_slave *sl = kobj_to_w1_slave(kobj);</div><div class='del'>-</div><div class='del'>-	if (off &gt; 8) {</div><div class='del'>-		count = 0;</div><div class='del'>-	} else {</div><div class='del'>-		if (off + count &gt; 8)</div><div class='del'>-			count = 8 - off;</div><div class='del'>-</div><div class='del'>-		memcpy(buf, (u8 *)&amp;sl-&gt;reg_num, count);</div><div class='del'>-	}</div><div class='add'>+	struct w1_slave *sl = dev_to_w1_slave(dev);</div><div class='add'>+	ssize_t count = sizeof(sl-&gt;reg_num);</div><div class='ctx'> </div><div class='add'>+	memcpy(buf, (u8 *)&amp;sl-&gt;reg_num, count);</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct device_attribute w1_slave_attr_name =</div><div class='ctx'> 	__ATTR(name, S_IRUGO, w1_slave_read_name, NULL);</div><div class='del'>-</div><div class='del'>-static struct bin_attribute w1_slave_attr_bin_id = {</div><div class='del'>-      .attr = {</div><div class='del'>-              .name = "id",</div><div class='del'>-              .mode = S_IRUGO,</div><div class='del'>-      },</div><div class='del'>-      .size = 8,</div><div class='del'>-      .read = w1_slave_read_id,</div><div class='del'>-};</div><div class='add'>+static struct device_attribute w1_slave_attr_id =</div><div class='add'>+	__ATTR(id, S_IRUGO, w1_slave_read_id, NULL);</div><div class='ctx'> </div><div class='ctx'> /* Default family */</div><div class='ctx'> </div><div class='hunk'>@@ -250,11 +233,16 @@ static ssize_t w1_master_attribute_store_search(struct device * dev,</div><div class='ctx'> 						struct device_attribute *attr,</div><div class='ctx'> 						const char * buf, size_t count)</div><div class='ctx'> {</div><div class='add'>+	long tmp;</div><div class='ctx'> 	struct w1_master *md = dev_to_w1_master(dev);</div><div class='ctx'> </div><div class='add'>+	if (strict_strtol(buf, 0, &amp;tmp) == -EINVAL)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	mutex_lock(&amp;md-&gt;mutex);</div><div class='del'>-	md-&gt;search_count = simple_strtol(buf, NULL, 0);</div><div class='add'>+	md-&gt;search_count = tmp;</div><div class='ctx'> 	mutex_unlock(&amp;md-&gt;mutex);</div><div class='add'>+	wake_up_process(md-&gt;thread);</div><div class='ctx'> </div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='hunk'>@@ -273,6 +261,38 @@ static ssize_t w1_master_attribute_show_search(struct device *dev,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static ssize_t w1_master_attribute_store_pullup(struct device *dev,</div><div class='add'>+						struct device_attribute *attr,</div><div class='add'>+						const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	long tmp;</div><div class='add'>+	struct w1_master *md = dev_to_w1_master(dev);</div><div class='add'>+</div><div class='add'>+	if (strict_strtol(buf, 0, &amp;tmp) == -EINVAL)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;md-&gt;mutex);</div><div class='add'>+	md-&gt;enable_pullup = tmp;</div><div class='add'>+	mutex_unlock(&amp;md-&gt;mutex);</div><div class='add'>+	wake_up_process(md-&gt;thread);</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t w1_master_attribute_show_pullup(struct device *dev,</div><div class='add'>+					       struct device_attribute *attr,</div><div class='add'>+					       char *buf)</div><div class='add'>+{</div><div class='add'>+	struct w1_master *md = dev_to_w1_master(dev);</div><div class='add'>+	ssize_t count;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;md-&gt;mutex);</div><div class='add'>+	count = sprintf(buf, "%d\n", md-&gt;enable_pullup);</div><div class='add'>+	mutex_unlock(&amp;md-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static ssize_t w1_master_attribute_show_pointer(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct w1_master *md = dev_to_w1_master(dev);</div><div class='hunk'>@@ -324,7 +344,8 @@ static ssize_t w1_master_attribute_show_slave_count(struct device *dev, struct d</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t w1_master_attribute_show_slaves(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='add'>+static ssize_t w1_master_attribute_show_slaves(struct device *dev,</div><div class='add'>+	struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct w1_master *md = dev_to_w1_master(dev);</div><div class='ctx'> 	int c = PAGE_SIZE;</div><div class='hunk'>@@ -349,6 +370,135 @@ static ssize_t w1_master_attribute_show_slaves(struct device *dev, struct device</div><div class='ctx'> 	return PAGE_SIZE - c;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static ssize_t w1_master_attribute_show_add(struct device *dev,</div><div class='add'>+	struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	int c = PAGE_SIZE;</div><div class='add'>+	c -= snprintf(buf+PAGE_SIZE - c, c,</div><div class='add'>+		"write device id xx-xxxxxxxxxxxx to add slave\n");</div><div class='add'>+	return PAGE_SIZE - c;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int w1_atoreg_num(struct device *dev, const char *buf, size_t count,</div><div class='add'>+	struct w1_reg_num *rn)</div><div class='add'>+{</div><div class='add'>+	unsigned int family;</div><div class='add'>+	unsigned long long id;</div><div class='add'>+	int i;</div><div class='add'>+	u64 rn64_le;</div><div class='add'>+</div><div class='add'>+	/* The CRC value isn't read from the user because the sysfs directory</div><div class='add'>+	 * doesn't include it and most messages from the bus search don't</div><div class='add'>+	 * print it either.  It would be unreasonable for the user to then</div><div class='add'>+	 * provide it.</div><div class='add'>+	 */</div><div class='add'>+	const char *error_msg = "bad slave string format, expecting "</div><div class='add'>+		"ff-dddddddddddd\n";</div><div class='add'>+</div><div class='add'>+	if (buf[2] != '-') {</div><div class='add'>+		dev_err(dev, "%s", error_msg);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	i = sscanf(buf, "%02x-%012llx", &amp;family, &amp;id);</div><div class='add'>+	if (i != 2) {</div><div class='add'>+		dev_err(dev, "%s", error_msg);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	rn-&gt;family = family;</div><div class='add'>+	rn-&gt;id = id;</div><div class='add'>+</div><div class='add'>+	rn64_le = cpu_to_le64(*(u64 *)rn);</div><div class='add'>+	rn-&gt;crc = w1_calc_crc8((u8 *)&amp;rn64_le, 7);</div><div class='add'>+</div><div class='add'>+#if 0</div><div class='add'>+	dev_info(dev, "With CRC device is %02x.%012llx.%02x.\n",</div><div class='add'>+		  rn-&gt;family, (unsigned long long)rn-&gt;id, rn-&gt;crc);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Searches the slaves in the w1_master and returns a pointer or NULL.</div><div class='add'>+ * Note: must hold the mutex</div><div class='add'>+ */</div><div class='add'>+static struct w1_slave *w1_slave_search_device(struct w1_master *dev,</div><div class='add'>+	struct w1_reg_num *rn)</div><div class='add'>+{</div><div class='add'>+	struct w1_slave *sl;</div><div class='add'>+	list_for_each_entry(sl, &amp;dev-&gt;slist, w1_slave_entry) {</div><div class='add'>+		if (sl-&gt;reg_num.family == rn-&gt;family &amp;&amp;</div><div class='add'>+				sl-&gt;reg_num.id == rn-&gt;id &amp;&amp;</div><div class='add'>+				sl-&gt;reg_num.crc == rn-&gt;crc) {</div><div class='add'>+			return sl;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t w1_master_attribute_store_add(struct device *dev,</div><div class='add'>+						struct device_attribute *attr,</div><div class='add'>+						const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct w1_master *md = dev_to_w1_master(dev);</div><div class='add'>+	struct w1_reg_num rn;</div><div class='add'>+	struct w1_slave *sl;</div><div class='add'>+	ssize_t result = count;</div><div class='add'>+</div><div class='add'>+	if (w1_atoreg_num(dev, buf, count, &amp;rn))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;md-&gt;mutex);</div><div class='add'>+	sl = w1_slave_search_device(md, &amp;rn);</div><div class='add'>+	/* It would be nice to do a targeted search one the one-wire bus</div><div class='add'>+	 * for the new device to see if it is out there or not.  But the</div><div class='add'>+	 * current search doesn't support that.</div><div class='add'>+	 */</div><div class='add'>+	if (sl) {</div><div class='add'>+		dev_info(dev, "Device %s already exists\n", sl-&gt;name);</div><div class='add'>+		result = -EINVAL;</div><div class='add'>+	} else {</div><div class='add'>+		w1_attach_slave_device(md, &amp;rn);</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;md-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t w1_master_attribute_show_remove(struct device *dev,</div><div class='add'>+	struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	int c = PAGE_SIZE;</div><div class='add'>+	c -= snprintf(buf+PAGE_SIZE - c, c,</div><div class='add'>+		"write device id xx-xxxxxxxxxxxx to remove slave\n");</div><div class='add'>+	return PAGE_SIZE - c;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t w1_master_attribute_store_remove(struct device *dev,</div><div class='add'>+						struct device_attribute *attr,</div><div class='add'>+						const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct w1_master *md = dev_to_w1_master(dev);</div><div class='add'>+	struct w1_reg_num rn;</div><div class='add'>+	struct w1_slave *sl;</div><div class='add'>+	ssize_t result = count;</div><div class='add'>+</div><div class='add'>+	if (w1_atoreg_num(dev, buf, count, &amp;rn))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;md-&gt;mutex);</div><div class='add'>+	sl = w1_slave_search_device(md, &amp;rn);</div><div class='add'>+	if (sl) {</div><div class='add'>+		w1_slave_detach(sl);</div><div class='add'>+	} else {</div><div class='add'>+		dev_info(dev, "Device %02x-%012llx doesn't exists\n", rn.family,</div><div class='add'>+			(unsigned long long)rn.id);</div><div class='add'>+		result = -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;md-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #define W1_MASTER_ATTR_RO(_name, _mode)				\</div><div class='ctx'> 	struct device_attribute w1_master_attribute_##_name =	\</div><div class='ctx'> 		__ATTR(w1_master_##_name, _mode,		\</div><div class='hunk'>@@ -368,6 +518,9 @@ static W1_MASTER_ATTR_RO(attempts, S_IRUGO);</div><div class='ctx'> static W1_MASTER_ATTR_RO(timeout, S_IRUGO);</div><div class='ctx'> static W1_MASTER_ATTR_RO(pointer, S_IRUGO);</div><div class='ctx'> static W1_MASTER_ATTR_RW(search, S_IRUGO | S_IWUGO);</div><div class='add'>+static W1_MASTER_ATTR_RW(pullup, S_IRUGO | S_IWUGO);</div><div class='add'>+static W1_MASTER_ATTR_RW(add, S_IRUGO | S_IWUGO);</div><div class='add'>+static W1_MASTER_ATTR_RW(remove, S_IRUGO | S_IWUGO);</div><div class='ctx'> </div><div class='ctx'> static struct attribute *w1_master_default_attrs[] = {</div><div class='ctx'> 	&amp;w1_master_attribute_name.attr,</div><div class='hunk'>@@ -378,6 +531,9 @@ static struct attribute *w1_master_default_attrs[] = {</div><div class='ctx'> 	&amp;w1_master_attribute_timeout.attr,</div><div class='ctx'> 	&amp;w1_master_attribute_pointer.attr,</div><div class='ctx'> 	&amp;w1_master_attribute_search.attr,</div><div class='add'>+	&amp;w1_master_attribute_pullup.attr,</div><div class='add'>+	&amp;w1_master_attribute_add.attr,</div><div class='add'>+	&amp;w1_master_attribute_remove.attr,</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -390,7 +546,7 @@ int w1_create_master_attributes(struct w1_master *master)</div><div class='ctx'> 	return sysfs_create_group(&amp;master-&gt;dev.kobj, &amp;w1_master_defattr_group);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void w1_destroy_master_attributes(struct w1_master *master)</div><div class='add'>+void w1_destroy_master_attributes(struct w1_master *master)</div><div class='ctx'> {</div><div class='ctx'> 	sysfs_remove_group(&amp;master-&gt;dev.kobj, &amp;w1_master_defattr_group);</div><div class='ctx'> }</div><div class='hunk'>@@ -479,7 +635,7 @@ static int __w1_attach_slave_device(struct w1_slave *sl)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Create "id" entry */</div><div class='del'>-	err = sysfs_create_bin_file(&amp;sl-&gt;dev.kobj, &amp;w1_slave_attr_bin_id);</div><div class='add'>+	err = device_create_file(&amp;sl-&gt;dev, &amp;w1_slave_attr_id);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='ctx'> 		dev_err(&amp;sl-&gt;dev,</div><div class='ctx'> 			"sysfs file creation for [%s] failed. err=%d\n",</div><div class='hunk'>@@ -501,7 +657,7 @@ static int __w1_attach_slave_device(struct w1_slave *sl)</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> out_rem2:</div><div class='del'>-	sysfs_remove_bin_file(&amp;sl-&gt;dev.kobj, &amp;w1_slave_attr_bin_id);</div><div class='add'>+	device_remove_file(&amp;sl-&gt;dev, &amp;w1_slave_attr_id);</div><div class='ctx'> out_rem1:</div><div class='ctx'> 	device_remove_file(&amp;sl-&gt;dev, &amp;w1_slave_attr_name);</div><div class='ctx'> out_unreg:</div><div class='hunk'>@@ -567,7 +723,7 @@ static int w1_attach_slave_device(struct w1_master *dev, struct w1_reg_num *rn)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void w1_slave_detach(struct w1_slave *sl)</div><div class='add'>+void w1_slave_detach(struct w1_slave *sl)</div><div class='ctx'> {</div><div class='ctx'> 	struct w1_netlink_msg msg;</div><div class='ctx'> </div><div class='hunk'>@@ -583,7 +739,7 @@ static void w1_slave_detach(struct w1_slave *sl)</div><div class='ctx'> 	msg.type = W1_SLAVE_REMOVE;</div><div class='ctx'> 	w1_netlink_send(sl-&gt;master, &amp;msg);</div><div class='ctx'> </div><div class='del'>-	sysfs_remove_bin_file(&amp;sl-&gt;dev.kobj, &amp;w1_slave_attr_bin_id);</div><div class='add'>+	device_remove_file(&amp;sl-&gt;dev, &amp;w1_slave_attr_id);</div><div class='ctx'> 	device_remove_file(&amp;sl-&gt;dev, &amp;w1_slave_attr_name);</div><div class='ctx'> 	device_unregister(&amp;sl-&gt;dev);</div><div class='ctx'> </div><div class='hunk'>@@ -591,24 +747,6 @@ static void w1_slave_detach(struct w1_slave *sl)</div><div class='ctx'> 	kfree(sl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct w1_master *w1_search_master(void *data)</div><div class='del'>-{</div><div class='del'>-	struct w1_master *dev;</div><div class='del'>-	int found = 0;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;w1_mlock);</div><div class='del'>-	list_for_each_entry(dev, &amp;w1_masters, w1_master_entry) {</div><div class='del'>-		if (dev-&gt;bus_master-&gt;data == data) {</div><div class='del'>-			found = 1;</div><div class='del'>-			atomic_inc(&amp;dev-&gt;refcnt);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;w1_mlock);</div><div class='del'>-</div><div class='del'>-	return (found)?dev:NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> struct w1_master *w1_search_master_id(u32 id)</div><div class='ctx'> {</div><div class='ctx'> 	struct w1_master *dev;</div><div class='hunk'>@@ -656,55 +794,56 @@ struct w1_slave *w1_search_slave(struct w1_reg_num *id)</div><div class='ctx'> 	return (found)?sl:NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void w1_reconnect_slaves(struct w1_family *f)</div><div class='add'>+void w1_reconnect_slaves(struct w1_family *f, int attach)</div><div class='ctx'> {</div><div class='add'>+	struct w1_slave *sl, *sln;</div><div class='ctx'> 	struct w1_master *dev;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;w1_mlock);</div><div class='ctx'> 	list_for_each_entry(dev, &amp;w1_masters, w1_master_entry) {</div><div class='del'>-		dev_dbg(&amp;dev-&gt;dev, "Reconnecting slaves in %s into new family %02x.\n",</div><div class='del'>-				dev-&gt;name, f-&gt;fid);</div><div class='del'>-		set_bit(W1_MASTER_NEED_RECONNECT, &amp;dev-&gt;flags);</div><div class='add'>+		dev_dbg(&amp;dev-&gt;dev, "Reconnecting slaves in device %s "</div><div class='add'>+			"for family %02x.\n", dev-&gt;name, f-&gt;fid);</div><div class='add'>+		mutex_lock(&amp;dev-&gt;mutex);</div><div class='add'>+		list_for_each_entry_safe(sl, sln, &amp;dev-&gt;slist, w1_slave_entry) {</div><div class='add'>+			/* If it is a new family, slaves with the default</div><div class='add'>+			 * family driver and are that family will be</div><div class='add'>+			 * connected.  If the family is going away, devices</div><div class='add'>+			 * matching that family are reconneced.</div><div class='add'>+			 */</div><div class='add'>+			if ((attach &amp;&amp; sl-&gt;family-&gt;fid == W1_FAMILY_DEFAULT</div><div class='add'>+				&amp;&amp; sl-&gt;reg_num.family == f-&gt;fid) ||</div><div class='add'>+				(!attach &amp;&amp; sl-&gt;family-&gt;fid == f-&gt;fid)) {</div><div class='add'>+				struct w1_reg_num rn;</div><div class='add'>+</div><div class='add'>+				memcpy(&amp;rn, &amp;sl-&gt;reg_num, sizeof(rn));</div><div class='add'>+				w1_slave_detach(sl);</div><div class='add'>+</div><div class='add'>+				w1_attach_slave_device(dev, &amp;rn);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		dev_dbg(&amp;dev-&gt;dev, "Reconnecting slaves in device %s "</div><div class='add'>+			"has been finished.\n", dev-&gt;name);</div><div class='add'>+		mutex_unlock(&amp;dev-&gt;mutex);</div><div class='ctx'> 	}</div><div class='ctx'> 	mutex_unlock(&amp;w1_mlock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void w1_slave_found(void *data, u64 rn)</div><div class='add'>+static void w1_slave_found(struct w1_master *dev, u64 rn)</div><div class='ctx'> {</div><div class='del'>-	int slave_count;</div><div class='ctx'> 	struct w1_slave *sl;</div><div class='del'>-	struct list_head *ent;</div><div class='ctx'> 	struct w1_reg_num *tmp;</div><div class='del'>-	struct w1_master *dev;</div><div class='ctx'> 	u64 rn_le = cpu_to_le64(rn);</div><div class='ctx'> </div><div class='del'>-	dev = w1_search_master(data);</div><div class='del'>-	if (!dev) {</div><div class='del'>-		printk(KERN_ERR "Failed to find w1 master device for data %p, "</div><div class='del'>-		       "it is impossible.\n", data);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='add'>+	atomic_inc(&amp;dev-&gt;refcnt);</div><div class='ctx'> </div><div class='ctx'> 	tmp = (struct w1_reg_num *) &amp;rn;</div><div class='ctx'> </div><div class='del'>-	slave_count = 0;</div><div class='del'>-	list_for_each(ent, &amp;dev-&gt;slist) {</div><div class='del'>-</div><div class='del'>-		sl = list_entry(ent, struct w1_slave, w1_slave_entry);</div><div class='del'>-</div><div class='del'>-		if (sl-&gt;reg_num.family == tmp-&gt;family &amp;&amp;</div><div class='del'>-		    sl-&gt;reg_num.id == tmp-&gt;id &amp;&amp;</div><div class='del'>-		    sl-&gt;reg_num.crc == tmp-&gt;crc) {</div><div class='del'>-			set_bit(W1_SLAVE_ACTIVE, (long *)&amp;sl-&gt;flags);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		slave_count++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (slave_count == dev-&gt;slave_count &amp;&amp;</div><div class='del'>-		rn &amp;&amp; ((rn &gt;&gt; 56) &amp; 0xff) == w1_calc_crc8((u8 *)&amp;rn_le, 7)) {</div><div class='del'>-		w1_attach_slave_device(dev, tmp);</div><div class='add'>+	sl = w1_slave_search_device(dev, tmp);</div><div class='add'>+	if (sl) {</div><div class='add'>+		set_bit(W1_SLAVE_ACTIVE, (long *)&amp;sl-&gt;flags);</div><div class='add'>+	} else {</div><div class='add'>+		if (rn &amp;&amp; tmp-&gt;crc == w1_calc_crc8((u8 *)&amp;rn_le, 7))</div><div class='add'>+			w1_attach_slave_device(dev, tmp);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	atomic_dec(&amp;dev-&gt;refcnt);</div><div class='hunk'>@@ -779,80 +918,20 @@ void w1_search(struct w1_master *dev, u8 search_type, w1_slave_found_callback cb</div><div class='ctx'> 			/* extract the direction taken &amp; update the device number */</div><div class='ctx'> 			tmp64 = (triplet_ret &gt;&gt; 2);</div><div class='ctx'> 			rn |= (tmp64 &lt;&lt; i);</div><div class='add'>+</div><div class='add'>+			if (kthread_should_stop()) {</div><div class='add'>+				dev_dbg(&amp;dev-&gt;dev, "Abort w1_search\n");</div><div class='add'>+				return;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if ( (triplet_ret &amp; 0x03) != 0x03 ) {</div><div class='ctx'> 			if ( (desc_bit == last_zero) || (last_zero &lt; 0))</div><div class='ctx'> 				last_device = 1;</div><div class='ctx'> 			desc_bit = last_zero;</div><div class='del'>-			cb(dev-&gt;bus_master-&gt;data, rn);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int w1_control(void *data)</div><div class='del'>-{</div><div class='del'>-	struct w1_slave *sl, *sln;</div><div class='del'>-	struct w1_master *dev, *n;</div><div class='del'>-	int have_to_wait = 0;</div><div class='del'>-</div><div class='del'>-	set_freezable();</div><div class='del'>-	while (!kthread_should_stop() || have_to_wait) {</div><div class='del'>-		have_to_wait = 0;</div><div class='del'>-</div><div class='del'>-		try_to_freeze();</div><div class='del'>-		msleep_interruptible(w1_control_timeout * 1000);</div><div class='del'>-</div><div class='del'>-		list_for_each_entry_safe(dev, n, &amp;w1_masters, w1_master_entry) {</div><div class='del'>-			if (!kthread_should_stop() &amp;&amp; !dev-&gt;flags)</div><div class='del'>-				continue;</div><div class='del'>-			/*</div><div class='del'>-			 * Little race: we can create thread but not set the flag.</div><div class='del'>-			 * Get a chance for external process to set flag up.</div><div class='del'>-			 */</div><div class='del'>-			if (!dev-&gt;initialized) {</div><div class='del'>-				have_to_wait = 1;</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (kthread_should_stop() || test_bit(W1_MASTER_NEED_EXIT, &amp;dev-&gt;flags)) {</div><div class='del'>-				set_bit(W1_MASTER_NEED_EXIT, &amp;dev-&gt;flags);</div><div class='del'>-</div><div class='del'>-				mutex_lock(&amp;w1_mlock);</div><div class='del'>-				list_del(&amp;dev-&gt;w1_master_entry);</div><div class='del'>-				mutex_unlock(&amp;w1_mlock);</div><div class='del'>-</div><div class='del'>-				mutex_lock(&amp;dev-&gt;mutex);</div><div class='del'>-				list_for_each_entry_safe(sl, sln, &amp;dev-&gt;slist, w1_slave_entry) {</div><div class='del'>-					w1_slave_detach(sl);</div><div class='del'>-				}</div><div class='del'>-				w1_destroy_master_attributes(dev);</div><div class='del'>-				mutex_unlock(&amp;dev-&gt;mutex);</div><div class='del'>-				atomic_dec(&amp;dev-&gt;refcnt);</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (test_bit(W1_MASTER_NEED_RECONNECT, &amp;dev-&gt;flags)) {</div><div class='del'>-				dev_dbg(&amp;dev-&gt;dev, "Reconnecting slaves in device %s.\n", dev-&gt;name);</div><div class='del'>-				mutex_lock(&amp;dev-&gt;mutex);</div><div class='del'>-				list_for_each_entry_safe(sl, sln, &amp;dev-&gt;slist, w1_slave_entry) {</div><div class='del'>-					if (sl-&gt;family-&gt;fid == W1_FAMILY_DEFAULT) {</div><div class='del'>-						struct w1_reg_num rn;</div><div class='del'>-</div><div class='del'>-						memcpy(&amp;rn, &amp;sl-&gt;reg_num, sizeof(rn));</div><div class='del'>-						w1_slave_detach(sl);</div><div class='del'>-</div><div class='del'>-						w1_attach_slave_device(dev, &amp;rn);</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-				dev_dbg(&amp;dev-&gt;dev, "Reconnecting slaves in device %s has been finished.\n", dev-&gt;name);</div><div class='del'>-				clear_bit(W1_MASTER_NEED_RECONNECT, &amp;dev-&gt;flags);</div><div class='del'>-				mutex_unlock(&amp;dev-&gt;mutex);</div><div class='del'>-			}</div><div class='add'>+			cb(dev, rn);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void w1_search_process(struct w1_master *dev, u8 search_type)</div><div class='hunk'>@@ -878,23 +957,29 @@ void w1_search_process(struct w1_master *dev, u8 search_type)</div><div class='ctx'> int w1_process(void *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct w1_master *dev = (struct w1_master *) data;</div><div class='add'>+	/* As long as w1_timeout is only set by a module parameter the sleep</div><div class='add'>+	 * time can be calculated in jiffies once.</div><div class='add'>+	 */</div><div class='add'>+	const unsigned long jtime = msecs_to_jiffies(w1_timeout * 1000);</div><div class='add'>+</div><div class='add'>+	while (!kthread_should_stop()) {</div><div class='add'>+		if (dev-&gt;search_count) {</div><div class='add'>+			mutex_lock(&amp;dev-&gt;mutex);</div><div class='add'>+			w1_search_process(dev, W1_SEARCH);</div><div class='add'>+			mutex_unlock(&amp;dev-&gt;mutex);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	while (!kthread_should_stop() &amp;&amp; !test_bit(W1_MASTER_NEED_EXIT, &amp;dev-&gt;flags)) {</div><div class='ctx'> 		try_to_freeze();</div><div class='del'>-		msleep_interruptible(w1_timeout * 1000);</div><div class='add'>+		__set_current_state(TASK_INTERRUPTIBLE);</div><div class='ctx'> </div><div class='del'>-		if (kthread_should_stop() || test_bit(W1_MASTER_NEED_EXIT, &amp;dev-&gt;flags))</div><div class='add'>+		if (kthread_should_stop())</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		if (!dev-&gt;initialized)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (dev-&gt;search_count == 0)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		mutex_lock(&amp;dev-&gt;mutex);</div><div class='del'>-		w1_search_process(dev, W1_SEARCH);</div><div class='del'>-		mutex_unlock(&amp;dev-&gt;mutex);</div><div class='add'>+		/* Only sleep when the search is active. */</div><div class='add'>+		if (dev-&gt;search_count)</div><div class='add'>+			schedule_timeout(jtime);</div><div class='add'>+		else</div><div class='add'>+			schedule();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	atomic_dec(&amp;dev-&gt;refcnt);</div><div class='hunk'>@@ -932,18 +1017,13 @@ static int w1_init(void)</div><div class='ctx'> 		goto err_out_master_unregister;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	w1_control_thread = kthread_run(w1_control, NULL, "w1_control");</div><div class='del'>-	if (IS_ERR(w1_control_thread)) {</div><div class='del'>-		retval = PTR_ERR(w1_control_thread);</div><div class='del'>-		printk(KERN_ERR "Failed to create control thread. err=%d\n",</div><div class='del'>-			retval);</div><div class='del'>-		goto err_out_slave_unregister;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='add'>+#if 0</div><div class='add'>+/* For undoing the slave register if there was a step after it. */</div><div class='ctx'> err_out_slave_unregister:</div><div class='ctx'> 	driver_unregister(&amp;w1_slave_driver);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> err_out_master_unregister:</div><div class='ctx'> 	driver_unregister(&amp;w1_master_driver);</div><div class='hunk'>@@ -959,13 +1039,12 @@ static void w1_fini(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct w1_master *dev;</div><div class='ctx'> </div><div class='add'>+	/* Set netlink removal messages and some cleanup */</div><div class='ctx'> 	list_for_each_entry(dev, &amp;w1_masters, w1_master_entry)</div><div class='ctx'> 		__w1_remove_master_device(dev);</div><div class='ctx'> </div><div class='ctx'> 	w1_fini_netlink();</div><div class='ctx'> </div><div class='del'>-	kthread_stop(w1_control_thread);</div><div class='del'>-</div><div class='ctx'> 	driver_unregister(&amp;w1_slave_driver);</div><div class='ctx'> 	driver_unregister(&amp;w1_master_driver);</div><div class='ctx'> 	bus_unregister(&amp;w1_bus_type);</div><div class='head'>diff --git a/drivers/w1/w1.h b/drivers/w1/w1.h<br/>index f1df5343f4ad..cdaa6fffbfc7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/w1/w1.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/w1/w1.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/w1/w1.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/w1/w1.h</a></div><div class='hunk'>@@ -46,7 +46,6 @@ struct w1_reg_num</div><div class='ctx'> #include "w1_family.h"</div><div class='ctx'> </div><div class='ctx'> #define W1_MAXNAMELEN		32</div><div class='del'>-#define W1_SLAVE_DATA_SIZE	128</div><div class='ctx'> </div><div class='ctx'> #define W1_SEARCH		0xF0</div><div class='ctx'> #define W1_ALARM_SEARCH		0xEC</div><div class='hunk'>@@ -77,7 +76,7 @@ struct w1_slave</div><div class='ctx'> 	struct completion	released;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-typedef void (* w1_slave_found_callback)(void *, u64);</div><div class='add'>+typedef void (*w1_slave_found_callback)(struct w1_master *, u64);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -142,12 +141,18 @@ struct w1_bus_master</div><div class='ctx'> 	 */</div><div class='ctx'> 	u8		(*reset_bus)(void *);</div><div class='ctx'> </div><div class='del'>-	/** Really nice hardware can handles the different types of ROM search */</div><div class='del'>-	void		(*search)(void *, u8, w1_slave_found_callback);</div><div class='del'>-};</div><div class='add'>+	/**</div><div class='add'>+	 * Put out a strong pull-up pulse of the specified duration.</div><div class='add'>+	 * @return -1=Error, 0=completed</div><div class='add'>+	 */</div><div class='add'>+	u8		(*set_pullup)(void *, int);</div><div class='ctx'> </div><div class='del'>-#define W1_MASTER_NEED_EXIT		0</div><div class='del'>-#define W1_MASTER_NEED_RECONNECT	1</div><div class='add'>+	/** Really nice hardware can handles the different types of ROM search</div><div class='add'>+	 *  w1_master* is passed to the slave found callback.</div><div class='add'>+	 */</div><div class='add'>+	void		(*search)(void *, struct w1_master *,</div><div class='add'>+		u8, w1_slave_found_callback);</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> struct w1_master</div><div class='ctx'> {</div><div class='hunk'>@@ -167,7 +172,10 @@ struct w1_master</div><div class='ctx'> 	void			*priv;</div><div class='ctx'> 	int			priv_size;</div><div class='ctx'> </div><div class='del'>-	long			flags;</div><div class='add'>+	/** 5V strong pullup enabled flag, 1 enabled, zero disabled. */</div><div class='add'>+	int			enable_pullup;</div><div class='add'>+	/** 5V strong pullup duration in milliseconds, zero disabled. */</div><div class='add'>+	int			pullup_duration;</div><div class='ctx'> </div><div class='ctx'> 	struct task_struct	*thread;</div><div class='ctx'> 	struct mutex		mutex;</div><div class='hunk'>@@ -181,12 +189,21 @@ struct w1_master</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int w1_create_master_attributes(struct w1_master *);</div><div class='add'>+void w1_destroy_master_attributes(struct w1_master *master);</div><div class='ctx'> void w1_search(struct w1_master *dev, u8 search_type, w1_slave_found_callback cb);</div><div class='ctx'> void w1_search_devices(struct w1_master *dev, u8 search_type, w1_slave_found_callback cb);</div><div class='ctx'> struct w1_slave *w1_search_slave(struct w1_reg_num *id);</div><div class='ctx'> void w1_search_process(struct w1_master *dev, u8 search_type);</div><div class='ctx'> struct w1_master *w1_search_master_id(u32 id);</div><div class='ctx'> </div><div class='add'>+/* Disconnect and reconnect devices in the given family.  Used for finding</div><div class='add'>+ * unclaimed devices after a family has been registered or releasing devices</div><div class='add'>+ * after a family has been unregistered.  Set attach to 1 when a new family</div><div class='add'>+ * has just been registered, to 0 when it has been unregistered.</div><div class='add'>+ */</div><div class='add'>+void w1_reconnect_slaves(struct w1_family *f, int attach);</div><div class='add'>+void w1_slave_detach(struct w1_slave *sl);</div><div class='add'>+</div><div class='ctx'> u8 w1_triplet(struct w1_master *dev, int bdir);</div><div class='ctx'> void w1_write_8(struct w1_master *, u8);</div><div class='ctx'> int w1_reset_bus(struct w1_master *);</div><div class='hunk'>@@ -194,6 +211,7 @@ u8 w1_calc_crc8(u8 *, int);</div><div class='ctx'> void w1_write_block(struct w1_master *, const u8 *, int);</div><div class='ctx'> u8 w1_read_block(struct w1_master *, u8 *, int);</div><div class='ctx'> int w1_reset_select_slave(struct w1_slave *sl);</div><div class='add'>+void w1_next_pullup(struct w1_master *, int);</div><div class='ctx'> </div><div class='ctx'> static inline struct w1_slave* dev_to_w1_slave(struct device *dev)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/w1/w1_family.c b/drivers/w1/w1_family.c<br/>index a3c95bd6890a..4a099041f28a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/w1/w1_family.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/w1/w1_family.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/w1/w1_family.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/w1/w1_family.c</a></div><div class='hunk'>@@ -48,12 +48,12 @@ int w1_register_family(struct w1_family *newf)</div><div class='ctx'> </div><div class='ctx'> 	if (!ret) {</div><div class='ctx'> 		atomic_set(&amp;newf-&gt;refcnt, 0);</div><div class='del'>-		newf-&gt;need_exit = 0;</div><div class='ctx'> 		list_add_tail(&amp;newf-&gt;family_entry, &amp;w1_families);</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock(&amp;w1_flock);</div><div class='ctx'> </div><div class='del'>-	w1_reconnect_slaves(newf);</div><div class='add'>+	/* check default devices against the new set of drivers */</div><div class='add'>+	w1_reconnect_slaves(newf, 1);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -72,11 +72,11 @@ void w1_unregister_family(struct w1_family *fent)</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	fent-&gt;need_exit = 1;</div><div class='del'>-</div><div class='ctx'> 	spin_unlock(&amp;w1_flock);</div><div class='ctx'> </div><div class='add'>+	/* deatch devices using this family code */</div><div class='add'>+	w1_reconnect_slaves(fent, 0);</div><div class='add'>+</div><div class='ctx'> 	while (atomic_read(&amp;fent-&gt;refcnt)) {</div><div class='ctx'> 		printk(KERN_INFO "Waiting for family %u to become free: refcnt=%d.\n",</div><div class='ctx'> 				fent-&gt;fid, atomic_read(&amp;fent-&gt;refcnt));</div><div class='hunk'>@@ -109,8 +109,7 @@ struct w1_family * w1_family_registered(u8 fid)</div><div class='ctx'> </div><div class='ctx'> static void __w1_family_put(struct w1_family *f)</div><div class='ctx'> {</div><div class='del'>-	if (atomic_dec_and_test(&amp;f-&gt;refcnt))</div><div class='del'>-		f-&gt;need_exit = 1;</div><div class='add'>+	atomic_dec(&amp;f-&gt;refcnt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void w1_family_put(struct w1_family *f)</div><div class='head'>diff --git a/drivers/w1/w1_family.h b/drivers/w1/w1_family.h<br/>index ef1e1dafa19a..3ca1b9298f21 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/w1/w1_family.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/w1/w1_family.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/w1/w1_family.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/w1/w1_family.h</a></div><div class='hunk'>@@ -33,6 +33,7 @@</div><div class='ctx'> #define W1_THERM_DS1822  	0x22</div><div class='ctx'> #define W1_EEPROM_DS2433  	0x23</div><div class='ctx'> #define W1_THERM_DS18B20 	0x28</div><div class='add'>+#define W1_EEPROM_DS2431	0x2D</div><div class='ctx'> #define W1_FAMILY_DS2760	0x30</div><div class='ctx'> </div><div class='ctx'> #define MAXNAMELEN		32</div><div class='hunk'>@@ -53,7 +54,6 @@ struct w1_family</div><div class='ctx'> 	struct w1_family_ops	*fops;</div><div class='ctx'> </div><div class='ctx'> 	atomic_t		refcnt;</div><div class='del'>-	u8			need_exit;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern spinlock_t w1_flock;</div><div class='hunk'>@@ -63,6 +63,5 @@ void __w1_family_get(struct w1_family *);</div><div class='ctx'> struct w1_family * w1_family_registered(u8);</div><div class='ctx'> void w1_unregister_family(struct w1_family *);</div><div class='ctx'> int w1_register_family(struct w1_family *);</div><div class='del'>-void w1_reconnect_slaves(struct w1_family *f);</div><div class='ctx'> </div><div class='ctx'> #endif /* __W1_FAMILY_H */</div><div class='head'>diff --git a/drivers/w1/w1_int.c b/drivers/w1/w1_int.c<br/>index 6840dfebe4d4..a3a54567bfba 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/w1/w1_int.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/w1/w1_int.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/w1/w1_int.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/w1/w1_int.c</a></div><div class='hunk'>@@ -29,7 +29,11 @@</div><div class='ctx'> #include "w1_netlink.h"</div><div class='ctx'> #include "w1_int.h"</div><div class='ctx'> </div><div class='del'>-static u32 w1_ids = 1;</div><div class='add'>+static int w1_search_count = -1; /* Default is continual scan */</div><div class='add'>+module_param_named(search_count, w1_search_count, int, 0);</div><div class='add'>+</div><div class='add'>+static int w1_enable_pullup = 1;</div><div class='add'>+module_param_named(enable_pullup, w1_enable_pullup, int, 0);</div><div class='ctx'> </div><div class='ctx'> static struct w1_master * w1_alloc_dev(u32 id, int slave_count, int slave_ttl,</div><div class='ctx'> 				       struct device_driver *driver,</div><div class='hunk'>@@ -59,8 +63,12 @@ static struct w1_master * w1_alloc_dev(u32 id, int slave_count, int slave_ttl,</div><div class='ctx'> 	dev-&gt;initialized	= 0;</div><div class='ctx'> 	dev-&gt;id			= id;</div><div class='ctx'> 	dev-&gt;slave_ttl		= slave_ttl;</div><div class='del'>-        dev-&gt;search_count	= -1; /* continual scan */</div><div class='add'>+	dev-&gt;search_count	= w1_search_count;</div><div class='add'>+	dev-&gt;enable_pullup	= w1_enable_pullup;</div><div class='ctx'> </div><div class='add'>+	/* 1 for w1_process to decrement</div><div class='add'>+	 * 1 for __w1_remove_master_device to decrement</div><div class='add'>+	 */</div><div class='ctx'> 	atomic_set(&amp;dev-&gt;refcnt, 2);</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;dev-&gt;slist);</div><div class='hunk'>@@ -93,9 +101,10 @@ static void w1_free_dev(struct w1_master *dev)</div><div class='ctx'> </div><div class='ctx'> int w1_add_master_device(struct w1_bus_master *master)</div><div class='ctx'> {</div><div class='del'>-	struct w1_master *dev;</div><div class='add'>+	struct w1_master *dev, *entry;</div><div class='ctx'> 	int retval = 0;</div><div class='ctx'> 	struct w1_netlink_msg msg;</div><div class='add'>+	int id, found;</div><div class='ctx'> </div><div class='ctx'>         /* validate minimum functionality */</div><div class='ctx'>         if (!(master-&gt;touch_bit &amp;&amp; master-&gt;reset_bus) &amp;&amp;</div><div class='hunk'>@@ -104,10 +113,50 @@ int w1_add_master_device(struct w1_bus_master *master)</div><div class='ctx'> 		printk(KERN_ERR "w1_add_master_device: invalid function set\n");</div><div class='ctx'> 		return(-EINVAL);</div><div class='ctx'>         }</div><div class='add'>+	/* While it would be electrically possible to make a device that</div><div class='add'>+	 * generated a strong pullup in bit bang mode, only hardare that</div><div class='add'>+	 * controls 1-wire time frames are even expected to support a strong</div><div class='add'>+	 * pullup.  w1_io.c would need to support calling set_pullup before</div><div class='add'>+	 * the last write_bit operation of a w1_write_8 which it currently</div><div class='add'>+	 * doesn't.</div><div class='add'>+	 */</div><div class='add'>+	if (!master-&gt;write_byte &amp;&amp; !master-&gt;touch_bit &amp;&amp; master-&gt;set_pullup) {</div><div class='add'>+		printk(KERN_ERR "w1_add_master_device: set_pullup requires "</div><div class='add'>+			"write_byte or touch_bit, disabling\n");</div><div class='add'>+		master-&gt;set_pullup = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Lock until the device is added (or not) to w1_masters. */</div><div class='add'>+	mutex_lock(&amp;w1_mlock);</div><div class='add'>+	/* Search for the first available id (starting at 1). */</div><div class='add'>+	id = 0;</div><div class='add'>+	do {</div><div class='add'>+		++id;</div><div class='add'>+		found = 0;</div><div class='add'>+		list_for_each_entry(entry, &amp;w1_masters, w1_master_entry) {</div><div class='add'>+			if (entry-&gt;id == id) {</div><div class='add'>+				found = 1;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	} while (found);</div><div class='ctx'> </div><div class='del'>-	dev = w1_alloc_dev(w1_ids++, w1_max_slave_count, w1_max_slave_ttl, &amp;w1_master_driver, &amp;w1_master_device);</div><div class='del'>-	if (!dev)</div><div class='add'>+	dev = w1_alloc_dev(id, w1_max_slave_count, w1_max_slave_ttl,</div><div class='add'>+		&amp;w1_master_driver, &amp;w1_master_device);</div><div class='add'>+	if (!dev) {</div><div class='add'>+		mutex_unlock(&amp;w1_mlock);</div><div class='ctx'> 		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	retval =  w1_create_master_attributes(dev);</div><div class='add'>+	if (retval) {</div><div class='add'>+		mutex_unlock(&amp;w1_mlock);</div><div class='add'>+		goto err_out_free_dev;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(dev-&gt;bus_master, master, sizeof(struct w1_bus_master));</div><div class='add'>+</div><div class='add'>+	dev-&gt;initialized = 1;</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;thread = kthread_run(&amp;w1_process, dev, "%s", dev-&gt;name);</div><div class='ctx'> 	if (IS_ERR(dev-&gt;thread)) {</div><div class='hunk'>@@ -115,18 +164,10 @@ int w1_add_master_device(struct w1_bus_master *master)</div><div class='ctx'> 		dev_err(&amp;dev-&gt;dev,</div><div class='ctx'> 			 "Failed to create new kernel thread. err=%d\n",</div><div class='ctx'> 			 retval);</div><div class='del'>-		goto err_out_free_dev;</div><div class='add'>+		mutex_unlock(&amp;w1_mlock);</div><div class='add'>+		goto err_out_rm_attr;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	retval =  w1_create_master_attributes(dev);</div><div class='del'>-	if (retval)</div><div class='del'>-		goto err_out_kill_thread;</div><div class='del'>-</div><div class='del'>-	memcpy(dev-&gt;bus_master, master, sizeof(struct w1_bus_master));</div><div class='del'>-</div><div class='del'>-	dev-&gt;initialized = 1;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;w1_mlock);</div><div class='ctx'> 	list_add(&amp;dev-&gt;w1_master_entry, &amp;w1_masters);</div><div class='ctx'> 	mutex_unlock(&amp;w1_mlock);</div><div class='ctx'> </div><div class='hunk'>@@ -137,8 +178,12 @@ int w1_add_master_device(struct w1_bus_master *master)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='add'>+#if 0 /* Thread cleanup code, not required currently. */</div><div class='ctx'> err_out_kill_thread:</div><div class='ctx'> 	kthread_stop(dev-&gt;thread);</div><div class='add'>+#endif</div><div class='add'>+err_out_rm_attr:</div><div class='add'>+	w1_destroy_master_attributes(dev);</div><div class='ctx'> err_out_free_dev:</div><div class='ctx'> 	w1_free_dev(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -148,10 +193,21 @@ err_out_free_dev:</div><div class='ctx'> void __w1_remove_master_device(struct w1_master *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct w1_netlink_msg msg;</div><div class='add'>+	struct w1_slave *sl, *sln;</div><div class='ctx'> </div><div class='del'>-	set_bit(W1_MASTER_NEED_EXIT, &amp;dev-&gt;flags);</div><div class='ctx'> 	kthread_stop(dev-&gt;thread);</div><div class='ctx'> </div><div class='add'>+	mutex_lock(&amp;w1_mlock);</div><div class='add'>+	list_del(&amp;dev-&gt;w1_master_entry);</div><div class='add'>+	mutex_unlock(&amp;w1_mlock);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;mutex);</div><div class='add'>+	list_for_each_entry_safe(sl, sln, &amp;dev-&gt;slist, w1_slave_entry)</div><div class='add'>+		w1_slave_detach(sl);</div><div class='add'>+	w1_destroy_master_attributes(dev);</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;mutex);</div><div class='add'>+	atomic_dec(&amp;dev-&gt;refcnt);</div><div class='add'>+</div><div class='ctx'> 	while (atomic_read(&amp;dev-&gt;refcnt)) {</div><div class='ctx'> 		dev_info(&amp;dev-&gt;dev, "Waiting for %s to become free: refcnt=%d.\n",</div><div class='ctx'> 				dev-&gt;name, atomic_read(&amp;dev-&gt;refcnt));</div><div class='head'>diff --git a/drivers/w1/w1_io.c b/drivers/w1/w1_io.c<br/>index 30b6fbf83bd4..f4f82f1f486e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/w1/w1_io.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/w1/w1_io.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/w1/w1_io.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/w1/w1_io.c</a></div><div class='hunk'>@@ -93,6 +93,40 @@ static void w1_write_bit(struct w1_master *dev, int bit)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * Pre-write operation, currently only supporting strong pullups.</div><div class='add'>+ * Program the hardware for a strong pullup, if one has been requested and</div><div class='add'>+ * the hardware supports it.</div><div class='add'>+ *</div><div class='add'>+ * @param dev     the master device</div><div class='add'>+ */</div><div class='add'>+static void w1_pre_write(struct w1_master *dev)</div><div class='add'>+{</div><div class='add'>+	if (dev-&gt;pullup_duration &amp;&amp;</div><div class='add'>+		dev-&gt;enable_pullup &amp;&amp; dev-&gt;bus_master-&gt;set_pullup) {</div><div class='add'>+		dev-&gt;bus_master-&gt;set_pullup(dev-&gt;bus_master-&gt;data,</div><div class='add'>+			dev-&gt;pullup_duration);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Post-write operation, currently only supporting strong pullups.</div><div class='add'>+ * If a strong pullup was requested, clear it if the hardware supports</div><div class='add'>+ * them, or execute the delay otherwise, in either case clear the request.</div><div class='add'>+ *</div><div class='add'>+ * @param dev     the master device</div><div class='add'>+ */</div><div class='add'>+static void w1_post_write(struct w1_master *dev)</div><div class='add'>+{</div><div class='add'>+	if (dev-&gt;pullup_duration) {</div><div class='add'>+		if (dev-&gt;enable_pullup &amp;&amp; dev-&gt;bus_master-&gt;set_pullup)</div><div class='add'>+			dev-&gt;bus_master-&gt;set_pullup(dev-&gt;bus_master-&gt;data, 0);</div><div class='add'>+		else</div><div class='add'>+			msleep(dev-&gt;pullup_duration);</div><div class='add'>+		dev-&gt;pullup_duration = 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * Writes 8 bits.</div><div class='ctx'>  *</div><div class='ctx'>  * @param dev     the master device</div><div class='hunk'>@@ -102,11 +136,17 @@ void w1_write_8(struct w1_master *dev, u8 byte)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;bus_master-&gt;write_byte)</div><div class='add'>+	if (dev-&gt;bus_master-&gt;write_byte) {</div><div class='add'>+		w1_pre_write(dev);</div><div class='ctx'> 		dev-&gt;bus_master-&gt;write_byte(dev-&gt;bus_master-&gt;data, byte);</div><div class='add'>+	}</div><div class='ctx'> 	else</div><div class='del'>-		for (i = 0; i &lt; 8; ++i)</div><div class='add'>+		for (i = 0; i &lt; 8; ++i) {</div><div class='add'>+			if (i == 7)</div><div class='add'>+				w1_pre_write(dev);</div><div class='ctx'> 			w1_touch_bit(dev, (byte &gt;&gt; i) &amp; 0x1);</div><div class='add'>+		}</div><div class='add'>+	w1_post_write(dev);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(w1_write_8);</div><div class='ctx'> </div><div class='hunk'>@@ -203,11 +243,14 @@ void w1_write_block(struct w1_master *dev, const u8 *buf, int len)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;bus_master-&gt;write_block)</div><div class='add'>+	if (dev-&gt;bus_master-&gt;write_block) {</div><div class='add'>+		w1_pre_write(dev);</div><div class='ctx'> 		dev-&gt;bus_master-&gt;write_block(dev-&gt;bus_master-&gt;data, buf, len);</div><div class='add'>+	}</div><div class='ctx'> 	else</div><div class='ctx'> 		for (i = 0; i &lt; len; ++i)</div><div class='del'>-			w1_write_8(dev, buf[i]);</div><div class='add'>+			w1_write_8(dev, buf[i]); /* calls w1_pre_write */</div><div class='add'>+	w1_post_write(dev);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(w1_write_block);</div><div class='ctx'> </div><div class='hunk'>@@ -250,12 +293,24 @@ int w1_reset_bus(struct w1_master *dev)</div><div class='ctx'> 		result = dev-&gt;bus_master-&gt;reset_bus(dev-&gt;bus_master-&gt;data) &amp; 0x1;</div><div class='ctx'> 	else {</div><div class='ctx'> 		dev-&gt;bus_master-&gt;write_bit(dev-&gt;bus_master-&gt;data, 0);</div><div class='add'>+		/* minimum 480, max ? us</div><div class='add'>+		 * be nice and sleep, except 18b20 spec lists 960us maximum,</div><div class='add'>+		 * so until we can sleep with microsecond accuracy, spin.</div><div class='add'>+		 * Feel free to come up with some other way to give up the</div><div class='add'>+		 * cpu for such a short amount of time AND get it back in</div><div class='add'>+		 * the maximum amount of time.</div><div class='add'>+		 */</div><div class='ctx'> 		w1_delay(480);</div><div class='ctx'> 		dev-&gt;bus_master-&gt;write_bit(dev-&gt;bus_master-&gt;data, 1);</div><div class='ctx'> 		w1_delay(70);</div><div class='ctx'> </div><div class='ctx'> 		result = dev-&gt;bus_master-&gt;read_bit(dev-&gt;bus_master-&gt;data) &amp; 0x1;</div><div class='del'>-		w1_delay(410);</div><div class='add'>+		/* minmum 70 (above) + 410 = 480 us</div><div class='add'>+		 * There aren't any timing requirements between a reset and</div><div class='add'>+		 * the following transactions.  Sleeping is safe here.</div><div class='add'>+		 */</div><div class='add'>+		/* w1_delay(410); min required time */</div><div class='add'>+		msleep(1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return result;</div><div class='hunk'>@@ -277,7 +332,8 @@ void w1_search_devices(struct w1_master *dev, u8 search_type, w1_slave_found_cal</div><div class='ctx'> {</div><div class='ctx'> 	dev-&gt;attempts++;</div><div class='ctx'> 	if (dev-&gt;bus_master-&gt;search)</div><div class='del'>-		dev-&gt;bus_master-&gt;search(dev-&gt;bus_master-&gt;data, search_type, cb);</div><div class='add'>+		dev-&gt;bus_master-&gt;search(dev-&gt;bus_master-&gt;data, dev,</div><div class='add'>+			search_type, cb);</div><div class='ctx'> 	else</div><div class='ctx'> 		w1_search(dev, search_type, cb);</div><div class='ctx'> }</div><div class='hunk'>@@ -305,3 +361,20 @@ int w1_reset_select_slave(struct w1_slave *sl)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(w1_reset_select_slave);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Put out a strong pull-up of the specified duration after the next write</div><div class='add'>+ * operation.  Not all hardware supports strong pullups.  Hardware that</div><div class='add'>+ * doesn't support strong pullups will sleep for the given time after the</div><div class='add'>+ * write operation without a strong pullup.  This is a one shot request for</div><div class='add'>+ * the next write, specifying zero will clear a previous request.</div><div class='add'>+ * The w1 master lock must be held.</div><div class='add'>+ *</div><div class='add'>+ * @param delay	time in milliseconds</div><div class='add'>+ * @return	0=success, anything else=error</div><div class='add'>+ */</div><div class='add'>+void w1_next_pullup(struct w1_master *dev, int delay)</div><div class='add'>+{</div><div class='add'>+	dev-&gt;pullup_duration = delay;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(w1_next_pullup);</div><div class='head'>diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig<br/>index c51036716700..1a22fe782a27 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/watchdog/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/watchdog/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/watchdog/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/watchdog/Kconfig</a></div><div class='hunk'>@@ -66,6 +66,13 @@ config AT91RM9200_WATCHDOG</div><div class='ctx'> 	  Watchdog timer embedded into AT91RM9200 chips. This will reboot your</div><div class='ctx'> 	  system when the timeout is reached.</div><div class='ctx'> </div><div class='add'>+config AT91SAM9X_WATCHDOG</div><div class='add'>+	tristate "AT91SAM9X watchdog"</div><div class='add'>+	depends on WATCHDOG &amp;&amp; (ARCH_AT91SAM9260 || ARCH_AT91SAM9261)</div><div class='add'>+	help</div><div class='add'>+	  Watchdog timer embedded into AT91SAM9X chips. This will reboot your</div><div class='add'>+	  system when the timeout is reached.</div><div class='add'>+</div><div class='ctx'> config 21285_WATCHDOG</div><div class='ctx'> 	tristate "DC21285 watchdog"</div><div class='ctx'> 	depends on FOOTBRIDGE</div><div class='hunk'>@@ -217,6 +224,15 @@ config DAVINCI_WATCHDOG</div><div class='ctx'> 	  NOTE: once enabled, this timer cannot be disabled.</div><div class='ctx'> 	  Say N if you are unsure.</div><div class='ctx'> </div><div class='add'>+config ORION5X_WATCHDOG</div><div class='add'>+	tristate "Orion5x watchdog"</div><div class='add'>+	depends on ARCH_ORION5X</div><div class='add'>+	help</div><div class='add'>+	  Say Y here if to include support for the watchdog timer</div><div class='add'>+	  in the Orion5x ARM SoCs.</div><div class='add'>+	  To compile this driver as a module, choose M here: the</div><div class='add'>+	  module will be called orion5x_wdt.</div><div class='add'>+</div><div class='ctx'> # ARM26 Architecture</div><div class='ctx'> </div><div class='ctx'> # AVR32 Architecture</div><div class='hunk'>@@ -416,6 +432,18 @@ config IT8712F_WDT</div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='ctx'> 	  module will be called it8712f_wdt.</div><div class='ctx'> </div><div class='add'>+config IT87_WDT</div><div class='add'>+	tristate "IT87 Watchdog Timer"</div><div class='add'>+	depends on X86 &amp;&amp; EXPERIMENTAL</div><div class='add'>+	---help---</div><div class='add'>+	  This is the driver for the hardware watchdog on the ITE IT8716,</div><div class='add'>+	  IT8718, IT8726, IT8712(Version J,K) Super I/O chips. This watchdog</div><div class='add'>+	  simply watches your kernel to make sure it doesn't freeze, and if</div><div class='add'>+	  it does, it reboots your computer after a certain amount of time.</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here: the module will</div><div class='add'>+	  be called it87_wdt.</div><div class='add'>+</div><div class='ctx'> config HP_WATCHDOG</div><div class='ctx'> 	tristate "HP Proliant iLO 2 Hardware Watchdog Timer"</div><div class='ctx'> 	depends on X86</div><div class='hunk'>@@ -573,6 +601,21 @@ config W83697HF_WDT</div><div class='ctx'> </div><div class='ctx'> 	  Most people will say N.</div><div class='ctx'> </div><div class='add'>+config W83697UG_WDT</div><div class='add'>+	tristate "W83697UG/W83697UF Watchdog Timer"</div><div class='add'>+	depends on X86</div><div class='add'>+	---help---</div><div class='add'>+	  This is the driver for the hardware watchdog on the W83697UG/UF</div><div class='add'>+	  chipset as used in MSI Fuzzy CX700 VIA motherboards (and likely others).</div><div class='add'>+	  This watchdog simply watches your kernel to make sure it doesn't</div><div class='add'>+	  freeze, and if it does, it reboots your computer after a certain</div><div class='add'>+	  amount of time.</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here: the</div><div class='add'>+	  module will be called w83697ug_wdt.</div><div class='add'>+</div><div class='add'>+	  Most people will say N.</div><div class='add'>+</div><div class='ctx'> config W83877F_WDT</div><div class='ctx'> 	tristate "W83877F (EMACS) Watchdog Timer"</div><div class='ctx'> 	depends on X86</div><div class='head'>diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile<br/>index e0ef123fbdea..e352bbb7630b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/watchdog/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/watchdog/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/watchdog/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/watchdog/Makefile</a></div><div class='hunk'>@@ -26,6 +26,7 @@ obj-$(CONFIG_USBPCWATCHDOG) += pcwd_usb.o</div><div class='ctx'> </div><div class='ctx'> # ARM Architecture</div><div class='ctx'> obj-$(CONFIG_AT91RM9200_WATCHDOG) += at91rm9200_wdt.o</div><div class='add'>+obj-$(CONFIG_AT91SAM9X_WATCHDOG) += at91sam9_wdt.o</div><div class='ctx'> obj-$(CONFIG_OMAP_WATCHDOG) += omap_wdt.o</div><div class='ctx'> obj-$(CONFIG_21285_WATCHDOG) += wdt285.o</div><div class='ctx'> obj-$(CONFIG_977_WATCHDOG) += wdt977.o</div><div class='hunk'>@@ -39,6 +40,7 @@ obj-$(CONFIG_EP93XX_WATCHDOG) += ep93xx_wdt.o</div><div class='ctx'> obj-$(CONFIG_PNX4008_WATCHDOG) += pnx4008_wdt.o</div><div class='ctx'> obj-$(CONFIG_IOP_WATCHDOG) += iop_wdt.o</div><div class='ctx'> obj-$(CONFIG_DAVINCI_WATCHDOG) += davinci_wdt.o</div><div class='add'>+obj-$(CONFIG_ORION5X_WATCHDOG) += orion5x_wdt.o</div><div class='ctx'> </div><div class='ctx'> # ARM26 Architecture</div><div class='ctx'> </div><div class='hunk'>@@ -71,6 +73,7 @@ ifeq ($(CONFIG_ITCO_VENDOR_SUPPORT),y)</div><div class='ctx'> obj-$(CONFIG_ITCO_WDT) += iTCO_vendor_support.o</div><div class='ctx'> endif</div><div class='ctx'> obj-$(CONFIG_IT8712F_WDT) += it8712f_wdt.o</div><div class='add'>+obj-$(CONFIG_IT87_WDT) += it87_wdt.o</div><div class='ctx'> obj-$(CONFIG_HP_WATCHDOG) += hpwdt.o</div><div class='ctx'> obj-$(CONFIG_SC1200_WDT) += sc1200wdt.o</div><div class='ctx'> obj-$(CONFIG_SCx200_WDT) += scx200_wdt.o</div><div class='hunk'>@@ -83,6 +86,7 @@ obj-$(CONFIG_CPU5_WDT) += cpu5wdt.o</div><div class='ctx'> obj-$(CONFIG_SMSC37B787_WDT) += smsc37b787_wdt.o</div><div class='ctx'> obj-$(CONFIG_W83627HF_WDT) += w83627hf_wdt.o</div><div class='ctx'> obj-$(CONFIG_W83697HF_WDT) += w83697hf_wdt.o</div><div class='add'>+obj-$(CONFIG_W83697UG_WDT) += w83697ug_wdt.o</div><div class='ctx'> obj-$(CONFIG_W83877F_WDT) += w83877f_wdt.o</div><div class='ctx'> obj-$(CONFIG_W83977F_WDT) += w83977f_wdt.o</div><div class='ctx'> obj-$(CONFIG_MACHZ_WDT) += machzwd.o</div><div class='hunk'>@@ -123,6 +127,9 @@ obj-$(CONFIG_SH_WDT) += shwdt.o</div><div class='ctx'> </div><div class='ctx'> # SPARC64 Architecture</div><div class='ctx'> </div><div class='add'>+obj-$(CONFIG_WATCHDOG_RIO)		+= riowd.o</div><div class='add'>+obj-$(CONFIG_WATCHDOG_CP1XXX)		+= cpwd.o</div><div class='add'>+</div><div class='ctx'> # XTENSA Architecture</div><div class='ctx'> </div><div class='ctx'> # Architecture Independant</div><div class='head'>diff --git a/drivers/watchdog/at91sam9_wdt.c b/drivers/watchdog/at91sam9_wdt.c<br/>new file mode 100644<br/>index 000000000000..b4babfc31586<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/watchdog/at91sam9_wdt.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/watchdog/at91sam9_wdt.c</a></div><div class='hunk'>@@ -0,0 +1,328 @@</div><div class='add'>+/*</div><div class='add'>+ * Watchdog driver for Atmel AT91SAM9x processors.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2008 Renaud CERRATO r.cerrato@til-technologies.fr</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public License</div><div class='add'>+ * as published by the Free Software Foundation; either version</div><div class='add'>+ * 2 of the License, or (at your option) any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The Watchdog Timer Mode Register can be only written to once. If the</div><div class='add'>+ * timeout need to be set from Linux, be sure that the bootstrap or the</div><div class='add'>+ * bootloader doesn't write to this register.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/miscdevice.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/watchdog.h&gt;</div><div class='add'>+#include &lt;linux/jiffies.h&gt;</div><div class='add'>+#include &lt;linux/timer.h&gt;</div><div class='add'>+#include &lt;linux/bitops.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/arch/at91_wdt.h&gt;</div><div class='add'>+</div><div class='add'>+#define DRV_NAME "AT91SAM9 Watchdog"</div><div class='add'>+</div><div class='add'>+/* AT91SAM9 watchdog runs a 12bit counter @ 256Hz,</div><div class='add'>+ * use this to convert a watchdog</div><div class='add'>+ * value from/to milliseconds.</div><div class='add'>+ */</div><div class='add'>+#define ms_to_ticks(t)	(((t &lt;&lt; 8) / 1000) - 1)</div><div class='add'>+#define ticks_to_ms(t)	(((t + 1) * 1000) &gt;&gt; 8)</div><div class='add'>+</div><div class='add'>+/* Hardware timeout in seconds */</div><div class='add'>+#define WDT_HW_TIMEOUT 2</div><div class='add'>+</div><div class='add'>+/* Timer heartbeat (500ms) */</div><div class='add'>+#define WDT_TIMEOUT	(HZ/2)</div><div class='add'>+</div><div class='add'>+/* User land timeout */</div><div class='add'>+#define WDT_HEARTBEAT 15</div><div class='add'>+static int heartbeat = WDT_HEARTBEAT;</div><div class='add'>+module_param(heartbeat, int, 0);</div><div class='add'>+MODULE_PARM_DESC(heartbeat, "Watchdog heartbeats in seconds. "</div><div class='add'>+	"(default = " __MODULE_STRING(WDT_HEARTBEAT) ")");</div><div class='add'>+</div><div class='add'>+static int nowayout = WATCHDOG_NOWAYOUT;</div><div class='add'>+module_param(nowayout, int, 0);</div><div class='add'>+MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started "</div><div class='add'>+	"(default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");</div><div class='add'>+</div><div class='add'>+static void at91_ping(unsigned long data);</div><div class='add'>+</div><div class='add'>+static struct {</div><div class='add'>+	unsigned long next_heartbeat;	/* the next_heartbeat for the timer */</div><div class='add'>+	unsigned long open;</div><div class='add'>+	char expect_close;</div><div class='add'>+	struct timer_list timer;	/* The timer that pings the watchdog */</div><div class='add'>+} at91wdt_private;</div><div class='add'>+</div><div class='add'>+/* ......................................................................... */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Reload the watchdog timer.  (ie, pat the watchdog)</div><div class='add'>+ */</div><div class='add'>+static inline void at91_wdt_reset(void)</div><div class='add'>+{</div><div class='add'>+	at91_sys_write(AT91_WDT_CR, AT91_WDT_KEY | AT91_WDT_WDRSTT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Timer tick</div><div class='add'>+ */</div><div class='add'>+static void at91_ping(unsigned long data)</div><div class='add'>+{</div><div class='add'>+	if (time_before(jiffies, at91wdt_private.next_heartbeat) ||</div><div class='add'>+			(!nowayout &amp;&amp; !at91wdt_private.open)) {</div><div class='add'>+		at91_wdt_reset();</div><div class='add'>+		mod_timer(&amp;at91wdt_private.timer, jiffies + WDT_TIMEOUT);</div><div class='add'>+	} else</div><div class='add'>+		printk(KERN_CRIT DRV_NAME": I will reset your machine !\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Watchdog device is opened, and watchdog starts running.</div><div class='add'>+ */</div><div class='add'>+static int at91_wdt_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	if (test_and_set_bit(0, &amp;at91wdt_private.open))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	at91wdt_private.next_heartbeat = jiffies + heartbeat * HZ;</div><div class='add'>+	mod_timer(&amp;at91wdt_private.timer, jiffies + WDT_TIMEOUT);</div><div class='add'>+</div><div class='add'>+	return nonseekable_open(inode, file);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Close the watchdog device.</div><div class='add'>+ */</div><div class='add'>+static int at91_wdt_close(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	clear_bit(0, &amp;at91wdt_private.open);</div><div class='add'>+</div><div class='add'>+	/* stop internal ping */</div><div class='add'>+	if (!at91wdt_private.expect_close)</div><div class='add'>+		del_timer(&amp;at91wdt_private.timer);</div><div class='add'>+</div><div class='add'>+	at91wdt_private.expect_close = 0;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Set the watchdog time interval in 1/256Hz (write-once)</div><div class='add'>+ * Counter is 12 bit.</div><div class='add'>+ */</div><div class='add'>+static int at91_wdt_settimeout(unsigned int timeout)</div><div class='add'>+{</div><div class='add'>+	unsigned int reg;</div><div class='add'>+	unsigned int mr;</div><div class='add'>+</div><div class='add'>+	/* Check if disabled */</div><div class='add'>+	mr = at91_sys_read(AT91_WDT_MR);</div><div class='add'>+	if (mr &amp; AT91_WDT_WDDIS) {</div><div class='add'>+		printk(KERN_ERR DRV_NAME": sorry, watchdog is disabled\n");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * All counting occurs at SLOW_CLOCK / 128 = 256 Hz</div><div class='add'>+	 *</div><div class='add'>+	 * Since WDV is a 12-bit counter, the maximum period is</div><div class='add'>+	 * 4096 / 256 = 16 seconds.</div><div class='add'>+	 */</div><div class='add'>+	reg = AT91_WDT_WDRSTEN	/* causes watchdog reset */</div><div class='add'>+		/* | AT91_WDT_WDRPROC	causes processor reset only */</div><div class='add'>+		| AT91_WDT_WDDBGHLT	/* disabled in debug mode */</div><div class='add'>+		| AT91_WDT_WDD		/* restart at any time */</div><div class='add'>+		| (timeout &amp; AT91_WDT_WDV);  /* timer value */</div><div class='add'>+	at91_sys_write(AT91_WDT_MR, reg);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct watchdog_info at91_wdt_info = {</div><div class='add'>+	.identity	= DRV_NAME,</div><div class='add'>+	.options	= WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Handle commands from user-space.</div><div class='add'>+ */</div><div class='add'>+static long at91_wdt_ioctl(struct file *file,</div><div class='add'>+		unsigned int cmd, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	void __user *argp = (void __user *)arg;</div><div class='add'>+	int __user *p = argp;</div><div class='add'>+	int new_value;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case WDIOC_GETSUPPORT:</div><div class='add'>+		return copy_to_user(argp, &amp;at91_wdt_info,</div><div class='add'>+				    sizeof(at91_wdt_info)) ? -EFAULT : 0;</div><div class='add'>+</div><div class='add'>+	case WDIOC_GETSTATUS:</div><div class='add'>+	case WDIOC_GETBOOTSTATUS:</div><div class='add'>+		return put_user(0, p);</div><div class='add'>+</div><div class='add'>+	case WDIOC_KEEPALIVE:</div><div class='add'>+		at91wdt_private.next_heartbeat = jiffies + heartbeat * HZ;</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	case WDIOC_SETTIMEOUT:</div><div class='add'>+		if (get_user(new_value, p))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+</div><div class='add'>+		heartbeat = new_value;</div><div class='add'>+		at91wdt_private.next_heartbeat = jiffies + heartbeat * HZ;</div><div class='add'>+</div><div class='add'>+		return put_user(new_value, p);  /* return current value */</div><div class='add'>+</div><div class='add'>+	case WDIOC_GETTIMEOUT:</div><div class='add'>+		return put_user(heartbeat, p);</div><div class='add'>+	}</div><div class='add'>+	return -ENOTTY;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Pat the watchdog whenever device is written to.</div><div class='add'>+ */</div><div class='add'>+static ssize_t at91_wdt_write(struct file *file, const char *data, size_t len,</div><div class='add'>+      loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	if (!len)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Scan for magic character */</div><div class='add'>+	if (!nowayout) {</div><div class='add'>+		size_t i;</div><div class='add'>+</div><div class='add'>+		at91wdt_private.expect_close = 0;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; len; i++) {</div><div class='add'>+			char c;</div><div class='add'>+			if (get_user(c, data + i))</div><div class='add'>+				return -EFAULT;</div><div class='add'>+			if (c == 'V') {</div><div class='add'>+				at91wdt_private.expect_close = 42;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	at91wdt_private.next_heartbeat = jiffies + heartbeat * HZ;</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* ......................................................................... */</div><div class='add'>+</div><div class='add'>+static const struct file_operations at91wdt_fops = {</div><div class='add'>+	.owner			= THIS_MODULE,</div><div class='add'>+	.llseek			= no_llseek,</div><div class='add'>+	.unlocked_ioctl	= at91_wdt_ioctl,</div><div class='add'>+	.open			= at91_wdt_open,</div><div class='add'>+	.release		= at91_wdt_close,</div><div class='add'>+	.write			= at91_wdt_write,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct miscdevice at91wdt_miscdev = {</div><div class='add'>+	.minor		= WATCHDOG_MINOR,</div><div class='add'>+	.name		= "watchdog",</div><div class='add'>+	.fops		= &amp;at91wdt_fops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init at91wdt_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	if (at91wdt_miscdev.parent)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	at91wdt_miscdev.parent = &amp;pdev-&gt;dev;</div><div class='add'>+</div><div class='add'>+	/* Set watchdog */</div><div class='add'>+	res = at91_wdt_settimeout(ms_to_ticks(WDT_HW_TIMEOUT * 1000));</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	res = misc_register(&amp;at91wdt_miscdev);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	at91wdt_private.next_heartbeat = jiffies + heartbeat * HZ;</div><div class='add'>+	setup_timer(&amp;at91wdt_private.timer, at91_ping, 0);</div><div class='add'>+	mod_timer(&amp;at91wdt_private.timer, jiffies + WDT_TIMEOUT);</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO DRV_NAME " enabled (heartbeat=%d sec, nowayout=%d)\n",</div><div class='add'>+		heartbeat, nowayout);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __exit at91wdt_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	res = misc_deregister(&amp;at91wdt_miscdev);</div><div class='add'>+	if (!res)</div><div class='add'>+		at91wdt_miscdev.parent = NULL;</div><div class='add'>+</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+</div><div class='add'>+static int at91wdt_suspend(struct platform_device *pdev, pm_message_t message)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int at91wdt_resume(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+#define at91wdt_suspend	NULL</div><div class='add'>+#define at91wdt_resume	NULL</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static struct platform_driver at91wdt_driver = {</div><div class='add'>+	.remove		= __exit_p(at91wdt_remove),</div><div class='add'>+	.suspend	= at91wdt_suspend,</div><div class='add'>+	.resume		= at91wdt_resume,</div><div class='add'>+	.driver		= {</div><div class='add'>+		.name	= "at91_wdt",</div><div class='add'>+		.owner	= THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init at91sam_wdt_init(void)</div><div class='add'>+{</div><div class='add'>+	return platform_driver_probe(&amp;at91wdt_driver, at91wdt_probe);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit at91sam_wdt_exit(void)</div><div class='add'>+{</div><div class='add'>+	platform_driver_unregister(&amp;at91wdt_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(at91sam_wdt_init);</div><div class='add'>+module_exit(at91sam_wdt_exit);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Renaud CERRATO &lt;r.cerrato@til-technologies.fr&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Watchdog driver for Atmel AT91SAM9x processors");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);</div><div class='head'>diff --git a/drivers/watchdog/cpwd.c b/drivers/watchdog/cpwd.c<br/>new file mode 100644<br/>index 000000000000..084dfe9cecfb<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/watchdog/cpwd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/watchdog/cpwd.c</a></div><div class='hunk'>@@ -0,0 +1,695 @@</div><div class='add'>+/* cpwd.c - driver implementation for hardware watchdog</div><div class='add'>+ * timers found on Sun Microsystems CP1400 and CP1500 boards.</div><div class='add'>+ *</div><div class='add'>+ * This device supports both the generic Linux watchdog </div><div class='add'>+ * interface and Solaris-compatible ioctls as best it is</div><div class='add'>+ * able.</div><div class='add'>+ *</div><div class='add'>+ * NOTE: 	CP1400 systems appear to have a defective intr_mask</div><div class='add'>+ * 			register on the PLD, preventing the disabling of</div><div class='add'>+ * 			timer interrupts.  We use a timer to periodically </div><div class='add'>+ * 			reset 'stopped' watchdogs on affected platforms.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2000 Eric Brower (ebrower@usa.net)</div><div class='add'>+ * Copyright (C) 2008 David S. Miller &lt;davem@davemloft.net&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/major.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/miscdevice.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/ioport.h&gt;</div><div class='add'>+#include &lt;linux/timer.h&gt;</div><div class='add'>+#include &lt;linux/smp_lock.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_device.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/irq.h&gt;</div><div class='add'>+#include &lt;asm/uaccess.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/watchdog.h&gt;</div><div class='add'>+</div><div class='add'>+#define DRIVER_NAME	"cpwd"</div><div class='add'>+#define PFX		DRIVER_NAME ": "</div><div class='add'>+</div><div class='add'>+#define WD_OBPNAME	"watchdog"</div><div class='add'>+#define WD_BADMODEL	"SUNW,501-5336"</div><div class='add'>+#define WD_BTIMEOUT	(jiffies + (HZ * 1000))</div><div class='add'>+#define WD_BLIMIT	0xFFFF</div><div class='add'>+</div><div class='add'>+#define WD0_MINOR	212</div><div class='add'>+#define WD1_MINOR	213	</div><div class='add'>+#define WD2_MINOR	214	</div><div class='add'>+</div><div class='add'>+/* Internal driver definitions.  */</div><div class='add'>+#define WD0_ID			0</div><div class='add'>+#define WD1_ID			1</div><div class='add'>+#define WD2_ID			2</div><div class='add'>+#define WD_NUMDEVS		3</div><div class='add'>+</div><div class='add'>+#define WD_INTR_OFF		0</div><div class='add'>+#define WD_INTR_ON		1</div><div class='add'>+</div><div class='add'>+#define WD_STAT_INIT	0x01	/* Watchdog timer is initialized	*/</div><div class='add'>+#define WD_STAT_BSTOP	0x02	/* Watchdog timer is brokenstopped	*/</div><div class='add'>+#define WD_STAT_SVCD	0x04	/* Watchdog interrupt occurred		*/</div><div class='add'>+</div><div class='add'>+/* Register value definitions</div><div class='add'>+ */</div><div class='add'>+#define WD0_INTR_MASK	0x01	/* Watchdog device interrupt masks	*/</div><div class='add'>+#define WD1_INTR_MASK	0x02</div><div class='add'>+#define WD2_INTR_MASK	0x04</div><div class='add'>+</div><div class='add'>+#define WD_S_RUNNING	0x01	/* Watchdog device status running	*/</div><div class='add'>+#define WD_S_EXPIRED	0x02	/* Watchdog device status expired	*/</div><div class='add'>+</div><div class='add'>+struct cpwd {</div><div class='add'>+	void __iomem	*regs;</div><div class='add'>+	spinlock_t	lock;</div><div class='add'>+</div><div class='add'>+	unsigned int	irq;</div><div class='add'>+</div><div class='add'>+	unsigned long	timeout;</div><div class='add'>+	bool		enabled;</div><div class='add'>+	bool		reboot;</div><div class='add'>+	bool		broken;</div><div class='add'>+	bool		initialized;</div><div class='add'>+</div><div class='add'>+	struct {</div><div class='add'>+		struct miscdevice	misc;</div><div class='add'>+		void __iomem		*regs;</div><div class='add'>+		u8			intr_mask;</div><div class='add'>+		u8			runstatus;</div><div class='add'>+		u16			timeout;</div><div class='add'>+	} devs[WD_NUMDEVS];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct cpwd *cpwd_device;</div><div class='add'>+</div><div class='add'>+/* Sun uses Altera PLD EPF8820ATC144-4 </div><div class='add'>+ * providing three hardware watchdogs:</div><div class='add'>+ *</div><div class='add'>+ * 	1) RIC - sends an interrupt when triggered</div><div class='add'>+ * 	2) XIR - asserts XIR_B_RESET when triggered, resets CPU</div><div class='add'>+ * 	3) POR - asserts POR_B_RESET when triggered, resets CPU, backplane, board</div><div class='add'>+ *</div><div class='add'>+ *** Timer register block definition (struct wd_timer_regblk)</div><div class='add'>+ *</div><div class='add'>+ * dcntr and limit registers (halfword access):      </div><div class='add'>+ * -------------------</div><div class='add'>+ * | 15 | ...| 1 | 0 |</div><div class='add'>+ * -------------------</div><div class='add'>+ * |-  counter val  -|</div><div class='add'>+ * -------------------</div><div class='add'>+ * dcntr - 	Current 16-bit downcounter value.</div><div class='add'>+ * 			When downcounter reaches '0' watchdog expires.</div><div class='add'>+ * 			Reading this register resets downcounter with 'limit' value.</div><div class='add'>+ * limit - 	16-bit countdown value in 1/10th second increments.</div><div class='add'>+ * 			Writing this register begins countdown with input value.</div><div class='add'>+ * 			Reading from this register does not affect counter.</div><div class='add'>+ * NOTES:	After watchdog reset, dcntr and limit contain '1'</div><div class='add'>+ *</div><div class='add'>+ * status register (byte access):</div><div class='add'>+ * ---------------------------</div><div class='add'>+ * | 7 | ... | 2 |  1  |  0  |</div><div class='add'>+ * --------------+------------</div><div class='add'>+ * |-   UNUSED  -| EXP | RUN |</div><div class='add'>+ * ---------------------------</div><div class='add'>+ * status-	Bit 0 - Watchdog is running</div><div class='add'>+ * 			Bit 1 - Watchdog has expired</div><div class='add'>+ *</div><div class='add'>+ *** PLD register block definition (struct wd_pld_regblk)</div><div class='add'>+ *</div><div class='add'>+ * intr_mask register (byte access):</div><div class='add'>+ * ---------------------------------</div><div class='add'>+ * | 7 | ... | 3 |  2  |  1  |  0  |</div><div class='add'>+ * +-------------+------------------</div><div class='add'>+ * |-   UNUSED  -| WD3 | WD2 | WD1 |</div><div class='add'>+ * ---------------------------------</div><div class='add'>+ * WD3 -  1 == Interrupt disabled for watchdog 3</div><div class='add'>+ * WD2 -  1 == Interrupt disabled for watchdog 2</div><div class='add'>+ * WD1 -  1 == Interrupt disabled for watchdog 1</div><div class='add'>+ *</div><div class='add'>+ * pld_status register (byte access):</div><div class='add'>+ * UNKNOWN, MAGICAL MYSTERY REGISTER</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+#define WD_TIMER_REGSZ	16</div><div class='add'>+#define WD0_OFF		0</div><div class='add'>+#define WD1_OFF		(WD_TIMER_REGSZ * 1)</div><div class='add'>+#define WD2_OFF		(WD_TIMER_REGSZ * 2)</div><div class='add'>+#define PLD_OFF		(WD_TIMER_REGSZ * 3)</div><div class='add'>+</div><div class='add'>+#define WD_DCNTR	0x00</div><div class='add'>+#define WD_LIMIT	0x04</div><div class='add'>+#define WD_STATUS	0x08</div><div class='add'>+</div><div class='add'>+#define PLD_IMASK	(PLD_OFF + 0x00)</div><div class='add'>+#define PLD_STATUS	(PLD_OFF + 0x04)</div><div class='add'>+</div><div class='add'>+static struct timer_list cpwd_timer;</div><div class='add'>+</div><div class='add'>+static int wd0_timeout = 0;</div><div class='add'>+static int wd1_timeout = 0;</div><div class='add'>+static int wd2_timeout = 0;</div><div class='add'>+</div><div class='add'>+module_param	(wd0_timeout, int, 0);</div><div class='add'>+MODULE_PARM_DESC(wd0_timeout, "Default watchdog0 timeout in 1/10secs");</div><div class='add'>+module_param 	(wd1_timeout, int, 0);</div><div class='add'>+MODULE_PARM_DESC(wd1_timeout, "Default watchdog1 timeout in 1/10secs");</div><div class='add'>+module_param 	(wd2_timeout, int, 0);</div><div class='add'>+MODULE_PARM_DESC(wd2_timeout, "Default watchdog2 timeout in 1/10secs");</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Eric Brower &lt;ebrower@usa.net&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Hardware watchdog driver for Sun Microsystems CP1400/1500");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_SUPPORTED_DEVICE("watchdog");</div><div class='add'>+</div><div class='add'>+static void cpwd_writew(u16 val, void __iomem *addr)</div><div class='add'>+{</div><div class='add'>+	writew(cpu_to_le16(val), addr);</div><div class='add'>+}</div><div class='add'>+static u16 cpwd_readw(void __iomem *addr)</div><div class='add'>+{</div><div class='add'>+	u16 val = readw(addr);</div><div class='add'>+</div><div class='add'>+	return le16_to_cpu(val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cpwd_writeb(u8 val, void __iomem *addr)</div><div class='add'>+{</div><div class='add'>+	writeb(val, addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 cpwd_readb(void __iomem *addr)</div><div class='add'>+{</div><div class='add'>+	return readb(addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Enable or disable watchdog interrupts</div><div class='add'>+ * Because of the CP1400 defect this should only be</div><div class='add'>+ * called during initialzation or by wd_[start|stop]timer()</div><div class='add'>+ *</div><div class='add'>+ * index 	- sub-device index, or -1 for 'all'</div><div class='add'>+ * enable	- non-zero to enable interrupts, zero to disable</div><div class='add'>+ */</div><div class='add'>+static void cpwd_toggleintr(struct cpwd *p, int index, int enable)</div><div class='add'>+{</div><div class='add'>+	unsigned char curregs = cpwd_readb(p-&gt;regs + PLD_IMASK);</div><div class='add'>+	unsigned char setregs = </div><div class='add'>+		(index == -1) ? </div><div class='add'>+		(WD0_INTR_MASK | WD1_INTR_MASK | WD2_INTR_MASK) : </div><div class='add'>+		(p-&gt;devs[index].intr_mask);</div><div class='add'>+</div><div class='add'>+	if (enable == WD_INTR_ON)</div><div class='add'>+		curregs &amp;= ~setregs;</div><div class='add'>+	else</div><div class='add'>+		curregs |= setregs;</div><div class='add'>+</div><div class='add'>+	cpwd_writeb(curregs, p-&gt;regs + PLD_IMASK);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Restarts timer with maximum limit value and</div><div class='add'>+ * does not unset 'brokenstop' value.</div><div class='add'>+ */</div><div class='add'>+static void cpwd_resetbrokentimer(struct cpwd *p, int index)</div><div class='add'>+{</div><div class='add'>+	cpwd_toggleintr(p, index, WD_INTR_ON);</div><div class='add'>+	cpwd_writew(WD_BLIMIT, p-&gt;devs[index].regs + WD_LIMIT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Timer method called to reset stopped watchdogs--</div><div class='add'>+ * because of the PLD bug on CP1400, we cannot mask</div><div class='add'>+ * interrupts within the PLD so me must continually</div><div class='add'>+ * reset the timers ad infinitum.</div><div class='add'>+ */</div><div class='add'>+static void cpwd_brokentimer(unsigned long data)</div><div class='add'>+{</div><div class='add'>+	struct cpwd *p = (struct cpwd *) data;</div><div class='add'>+	int id, tripped = 0;</div><div class='add'>+</div><div class='add'>+	/* kill a running timer instance, in case we</div><div class='add'>+	 * were called directly instead of by kernel timer</div><div class='add'>+	 */</div><div class='add'>+	if (timer_pending(&amp;cpwd_timer))</div><div class='add'>+		del_timer(&amp;cpwd_timer);</div><div class='add'>+</div><div class='add'>+	for (id = 0; id &lt; WD_NUMDEVS; id++) {</div><div class='add'>+		if (p-&gt;devs[id].runstatus &amp; WD_STAT_BSTOP) {</div><div class='add'>+			++tripped;</div><div class='add'>+			cpwd_resetbrokentimer(p, id);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tripped) {</div><div class='add'>+		/* there is at least one timer brokenstopped-- reschedule */</div><div class='add'>+		cpwd_timer.expires = WD_BTIMEOUT;</div><div class='add'>+		add_timer(&amp;cpwd_timer);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Reset countdown timer with 'limit' value and continue countdown.</div><div class='add'>+ * This will not start a stopped timer.</div><div class='add'>+ */</div><div class='add'>+static void cpwd_pingtimer(struct cpwd *p, int index)</div><div class='add'>+{</div><div class='add'>+	if (cpwd_readb(p-&gt;devs[index].regs + WD_STATUS) &amp; WD_S_RUNNING)</div><div class='add'>+		cpwd_readw(p-&gt;devs[index].regs + WD_DCNTR);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Stop a running watchdog timer-- the timer actually keeps</div><div class='add'>+ * running, but the interrupt is masked so that no action is</div><div class='add'>+ * taken upon expiration.</div><div class='add'>+ */</div><div class='add'>+static void cpwd_stoptimer(struct cpwd *p, int index)</div><div class='add'>+{</div><div class='add'>+	if (cpwd_readb(p-&gt;devs[index].regs + WD_STATUS) &amp; WD_S_RUNNING) {</div><div class='add'>+		cpwd_toggleintr(p, index, WD_INTR_OFF);</div><div class='add'>+</div><div class='add'>+		if (p-&gt;broken) {</div><div class='add'>+			p-&gt;devs[index].runstatus |= WD_STAT_BSTOP;</div><div class='add'>+			cpwd_brokentimer((unsigned long) p);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Start a watchdog timer with the specified limit value</div><div class='add'>+ * If the watchdog is running, it will be restarted with</div><div class='add'>+ * the provided limit value.</div><div class='add'>+ *</div><div class='add'>+ * This function will enable interrupts on the specified</div><div class='add'>+ * watchdog.</div><div class='add'>+ */</div><div class='add'>+static void cpwd_starttimer(struct cpwd *p, int index)</div><div class='add'>+{</div><div class='add'>+	if (p-&gt;broken)</div><div class='add'>+		p-&gt;devs[index].runstatus &amp;= ~WD_STAT_BSTOP;</div><div class='add'>+</div><div class='add'>+	p-&gt;devs[index].runstatus &amp;= ~WD_STAT_SVCD;</div><div class='add'>+</div><div class='add'>+	cpwd_writew(p-&gt;devs[index].timeout, p-&gt;devs[index].regs + WD_LIMIT);</div><div class='add'>+	cpwd_toggleintr(p, index, WD_INTR_ON);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cpwd_getstatus(struct cpwd *p, int index)</div><div class='add'>+{</div><div class='add'>+	unsigned char stat = cpwd_readb(p-&gt;devs[index].regs + WD_STATUS);</div><div class='add'>+	unsigned char intr = cpwd_readb(p-&gt;devs[index].regs + PLD_IMASK);</div><div class='add'>+	unsigned char ret  = WD_STOPPED;</div><div class='add'>+</div><div class='add'>+	/* determine STOPPED */</div><div class='add'>+	if (!stat) </div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* determine EXPIRED vs FREERUN vs RUNNING */</div><div class='add'>+	else if (WD_S_EXPIRED &amp; stat) {</div><div class='add'>+		ret = WD_EXPIRED;</div><div class='add'>+	} else if(WD_S_RUNNING &amp; stat) {</div><div class='add'>+		if (intr &amp; p-&gt;devs[index].intr_mask) {</div><div class='add'>+			ret = WD_FREERUN;</div><div class='add'>+		} else {</div><div class='add'>+			/* Fudge WD_EXPIRED status for defective CP1400--</div><div class='add'>+			 * IF timer is running </div><div class='add'>+			 * 	AND brokenstop is set </div><div class='add'>+			 * 	AND an interrupt has been serviced</div><div class='add'>+			 * we are WD_EXPIRED.</div><div class='add'>+			 *</div><div class='add'>+			 * IF timer is running </div><div class='add'>+			 * 	AND brokenstop is set </div><div class='add'>+			 * 	AND no interrupt has been serviced</div><div class='add'>+			 * we are WD_FREERUN.</div><div class='add'>+			 */</div><div class='add'>+			if (p-&gt;broken &amp;&amp;</div><div class='add'>+			    (p-&gt;devs[index].runstatus &amp; WD_STAT_BSTOP)) {</div><div class='add'>+				if (p-&gt;devs[index].runstatus &amp; WD_STAT_SVCD) {</div><div class='add'>+					ret = WD_EXPIRED;</div><div class='add'>+				} else {</div><div class='add'>+					/* we could as well pretend we are expired */</div><div class='add'>+					ret = WD_FREERUN;</div><div class='add'>+				}</div><div class='add'>+			} else {</div><div class='add'>+				ret = WD_RUNNING;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* determine SERVICED */</div><div class='add'>+	if (p-&gt;devs[index].runstatus &amp; WD_STAT_SVCD)</div><div class='add'>+		ret |= WD_SERVICED;</div><div class='add'>+</div><div class='add'>+	return(ret);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t cpwd_interrupt(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	struct cpwd *p = dev_id;</div><div class='add'>+</div><div class='add'>+	/* Only WD0 will interrupt-- others are NMI and we won't</div><div class='add'>+	 * see them here....</div><div class='add'>+	 */</div><div class='add'>+	spin_lock_irq(&amp;p-&gt;lock);</div><div class='add'>+</div><div class='add'>+	cpwd_stoptimer(p, WD0_ID);</div><div class='add'>+	p-&gt;devs[WD0_ID].runstatus |=  WD_STAT_SVCD;</div><div class='add'>+</div><div class='add'>+	spin_unlock_irq(&amp;p-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cpwd_open(struct inode *inode, struct file *f)</div><div class='add'>+{</div><div class='add'>+	struct cpwd *p = cpwd_device;</div><div class='add'>+</div><div class='add'>+	lock_kernel();</div><div class='add'>+	switch(iminor(inode)) {</div><div class='add'>+		case WD0_MINOR:</div><div class='add'>+		case WD1_MINOR:</div><div class='add'>+		case WD2_MINOR:</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		default:</div><div class='add'>+			unlock_kernel();</div><div class='add'>+			return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Register IRQ on first open of device */</div><div class='add'>+	if (!p-&gt;initialized) {</div><div class='add'>+		if (request_irq(p-&gt;irq, &amp;cpwd_interrupt, </div><div class='add'>+				IRQF_SHARED, DRIVER_NAME, p)) {</div><div class='add'>+			printk(KERN_ERR PFX "Cannot register IRQ %d\n", </div><div class='add'>+				p-&gt;irq);</div><div class='add'>+			unlock_kernel();</div><div class='add'>+			return -EBUSY;</div><div class='add'>+		}</div><div class='add'>+		p-&gt;initialized = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	unlock_kernel();</div><div class='add'>+</div><div class='add'>+	return nonseekable_open(inode, f);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cpwd_release(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cpwd_ioctl(struct inode *inode, struct file *file, </div><div class='add'>+		      unsigned int cmd, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	static struct watchdog_info info = {</div><div class='add'>+		.options		= WDIOF_SETTIMEOUT,</div><div class='add'>+		.firmware_version	= 1,</div><div class='add'>+		.identity		= DRIVER_NAME,</div><div class='add'>+	};</div><div class='add'>+	void __user *argp = (void __user *)arg;</div><div class='add'>+	int index = iminor(inode) - WD0_MINOR;</div><div class='add'>+	struct cpwd *p = cpwd_device;</div><div class='add'>+	int setopt = 0;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	/* Generic Linux IOCTLs */</div><div class='add'>+	case WDIOC_GETSUPPORT:</div><div class='add'>+		if (copy_to_user(argp, &amp;info, sizeof(struct watchdog_info)))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case WDIOC_GETSTATUS:</div><div class='add'>+	case WDIOC_GETBOOTSTATUS:</div><div class='add'>+		if (put_user(0, (int __user *)argp))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case WDIOC_KEEPALIVE:</div><div class='add'>+		cpwd_pingtimer(p, index);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case WDIOC_SETOPTIONS:</div><div class='add'>+		if (copy_from_user(&amp;setopt, argp, sizeof(unsigned int)))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+</div><div class='add'>+		if (setopt &amp; WDIOS_DISABLECARD) {</div><div class='add'>+			if (p-&gt;enabled)</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			cpwd_stoptimer(p, index);</div><div class='add'>+		} else if (setopt &amp; WDIOS_ENABLECARD) {</div><div class='add'>+			cpwd_starttimer(p, index);</div><div class='add'>+		} else {</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}	</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	/* Solaris-compatible IOCTLs */</div><div class='add'>+	case WIOCGSTAT:</div><div class='add'>+		setopt = cpwd_getstatus(p, index);</div><div class='add'>+		if (copy_to_user(argp, &amp;setopt, sizeof(unsigned int)))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case WIOCSTART:</div><div class='add'>+		cpwd_starttimer(p, index);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case WIOCSTOP:</div><div class='add'>+		if (p-&gt;enabled)</div><div class='add'>+			return(-EINVAL);</div><div class='add'>+</div><div class='add'>+		cpwd_stoptimer(p, index);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long cpwd_compat_ioctl(struct file *file, unsigned int cmd,</div><div class='add'>+			      unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	int rval = -ENOIOCTLCMD;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	/* solaris ioctls are specific to this driver */</div><div class='add'>+	case WIOCSTART:</div><div class='add'>+	case WIOCSTOP:</div><div class='add'>+	case WIOCGSTAT:</div><div class='add'>+		lock_kernel();</div><div class='add'>+		rval = cpwd_ioctl(file-&gt;f_path.dentry-&gt;d_inode, file, cmd, arg);</div><div class='add'>+		unlock_kernel();</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	/* everything else is handled by the generic compat layer */</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return rval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t cpwd_write(struct file *file, const char __user *buf, </div><div class='add'>+			  size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct inode *inode = file-&gt;f_path.dentry-&gt;d_inode;</div><div class='add'>+	struct cpwd *p = cpwd_device;</div><div class='add'>+	int index = iminor(inode);</div><div class='add'>+</div><div class='add'>+	if (count) {</div><div class='add'>+		cpwd_pingtimer(p, index);</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t cpwd_read(struct file * file, char __user *buffer,</div><div class='add'>+			 size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations cpwd_fops = {</div><div class='add'>+	.owner =	THIS_MODULE,</div><div class='add'>+	.ioctl =	cpwd_ioctl,</div><div class='add'>+	.compat_ioctl =	cpwd_compat_ioctl,</div><div class='add'>+	.open =		cpwd_open,</div><div class='add'>+	.write =	cpwd_write,</div><div class='add'>+	.read =		cpwd_read,</div><div class='add'>+	.release =	cpwd_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __devinit cpwd_probe(struct of_device *op,</div><div class='add'>+				const struct of_device_id *match)</div><div class='add'>+{</div><div class='add'>+	struct device_node *options;</div><div class='add'>+	const char *str_prop;</div><div class='add'>+	const void *prop_val;</div><div class='add'>+	int i, err = -EINVAL;</div><div class='add'>+	struct cpwd *p;</div><div class='add'>+</div><div class='add'>+	if (cpwd_device)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	p = kzalloc(sizeof(*p), GFP_KERNEL);</div><div class='add'>+	err = -ENOMEM;</div><div class='add'>+	if (!p) {</div><div class='add'>+		printk(KERN_ERR PFX "Unable to allocate struct cpwd.\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	p-&gt;irq = op-&gt;irqs[0];</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;p-&gt;lock);</div><div class='add'>+</div><div class='add'>+	p-&gt;regs = of_ioremap(&amp;op-&gt;resource[0], 0,</div><div class='add'>+			     4 * WD_TIMER_REGSZ, DRIVER_NAME);</div><div class='add'>+	if (!p-&gt;regs) {</div><div class='add'>+		printk(KERN_ERR PFX "Unable to map registers.\n");</div><div class='add'>+		goto out_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	options = of_find_node_by_path("/options");</div><div class='add'>+	err = -ENODEV;</div><div class='add'>+	if (!options) {</div><div class='add'>+		printk(KERN_ERR PFX "Unable to find /options node.\n");</div><div class='add'>+		goto out_iounmap;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	prop_val = of_get_property(options, "watchdog-enable?", NULL);</div><div class='add'>+	p-&gt;enabled = (prop_val ? true : false);</div><div class='add'>+</div><div class='add'>+	prop_val = of_get_property(options, "watchdog-reboot?", NULL);</div><div class='add'>+	p-&gt;reboot = (prop_val ? true : false);</div><div class='add'>+</div><div class='add'>+	str_prop = of_get_property(options, "watchdog-timeout", NULL);</div><div class='add'>+	if (str_prop)</div><div class='add'>+		p-&gt;timeout = simple_strtoul(str_prop, NULL, 10);</div><div class='add'>+</div><div class='add'>+	/* CP1400s seem to have broken PLD implementations-- the</div><div class='add'>+	 * interrupt_mask register cannot be written, so no timer</div><div class='add'>+	 * interrupts can be masked within the PLD.</div><div class='add'>+	 */</div><div class='add'>+	str_prop = of_get_property(op-&gt;node, "model", NULL);</div><div class='add'>+	p-&gt;broken = (str_prop &amp;&amp; !strcmp(str_prop, WD_BADMODEL));</div><div class='add'>+</div><div class='add'>+	if (!p-&gt;enabled)</div><div class='add'>+		cpwd_toggleintr(p, -1, WD_INTR_OFF);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; WD_NUMDEVS; i++) {</div><div class='add'>+		static const char *cpwd_names[] = { "RIC", "XIR", "POR" };</div><div class='add'>+		static int *parms[] = { &amp;wd0_timeout,</div><div class='add'>+					&amp;wd1_timeout,</div><div class='add'>+					&amp;wd2_timeout };</div><div class='add'>+		struct miscdevice *mp = &amp;p-&gt;devs[i].misc;</div><div class='add'>+</div><div class='add'>+		mp-&gt;minor = WD0_MINOR + i;</div><div class='add'>+		mp-&gt;name = cpwd_names[i];</div><div class='add'>+		mp-&gt;fops = &amp;cpwd_fops;</div><div class='add'>+</div><div class='add'>+		p-&gt;devs[i].regs = p-&gt;regs + (i * WD_TIMER_REGSZ);</div><div class='add'>+		p-&gt;devs[i].intr_mask = (WD0_INTR_MASK &lt;&lt; i);</div><div class='add'>+		p-&gt;devs[i].runstatus &amp;= ~WD_STAT_BSTOP;</div><div class='add'>+		p-&gt;devs[i].runstatus |= WD_STAT_INIT;</div><div class='add'>+		p-&gt;devs[i].timeout = p-&gt;timeout;</div><div class='add'>+		if (*parms[i])</div><div class='add'>+			p-&gt;devs[i].timeout = *parms[i];</div><div class='add'>+</div><div class='add'>+		err = misc_register(&amp;p-&gt;devs[i].misc);</div><div class='add'>+		if (err) {</div><div class='add'>+			printk(KERN_ERR "Could not register misc device for "</div><div class='add'>+			       "dev %d\n", i);</div><div class='add'>+			goto out_unregister;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (p-&gt;broken) {</div><div class='add'>+		init_timer(&amp;cpwd_timer);</div><div class='add'>+		cpwd_timer.function 	= cpwd_brokentimer;</div><div class='add'>+		cpwd_timer.data		= (unsigned long) p;</div><div class='add'>+		cpwd_timer.expires	= WD_BTIMEOUT;</div><div class='add'>+</div><div class='add'>+		printk(KERN_INFO PFX "PLD defect workaround enabled for "</div><div class='add'>+		       "model " WD_BADMODEL ".\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(&amp;op-&gt;dev, p);</div><div class='add'>+	cpwd_device = p;</div><div class='add'>+	err = 0;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='add'>+</div><div class='add'>+out_unregister:</div><div class='add'>+	for (i--; i &gt;= 0; i--)</div><div class='add'>+		misc_deregister(&amp;p-&gt;devs[i].misc);</div><div class='add'>+</div><div class='add'>+out_iounmap:</div><div class='add'>+	of_iounmap(&amp;op-&gt;resource[0], p-&gt;regs, 4 * WD_TIMER_REGSZ);</div><div class='add'>+</div><div class='add'>+out_free:</div><div class='add'>+	kfree(p);</div><div class='add'>+	goto out;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devexit cpwd_remove(struct of_device *op)</div><div class='add'>+{</div><div class='add'>+	struct cpwd *p = dev_get_drvdata(&amp;op-&gt;dev);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 4; i++) {</div><div class='add'>+		misc_deregister(&amp;p-&gt;devs[i].misc);</div><div class='add'>+</div><div class='add'>+		if (!p-&gt;enabled) {</div><div class='add'>+			cpwd_stoptimer(p, i);</div><div class='add'>+			if (p-&gt;devs[i].runstatus &amp; WD_STAT_BSTOP)</div><div class='add'>+				cpwd_resetbrokentimer(p, i);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (p-&gt;broken)</div><div class='add'>+		del_timer_sync(&amp;cpwd_timer);</div><div class='add'>+</div><div class='add'>+	if (p-&gt;initialized)</div><div class='add'>+		free_irq(p-&gt;irq, p);</div><div class='add'>+</div><div class='add'>+	of_iounmap(&amp;op-&gt;resource[0], p-&gt;regs, 4 * WD_TIMER_REGSZ);</div><div class='add'>+	kfree(p);</div><div class='add'>+</div><div class='add'>+	cpwd_device = NULL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct of_device_id cpwd_match[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "watchdog",</div><div class='add'>+	},</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, cpwd_match);</div><div class='add'>+</div><div class='add'>+static struct of_platform_driver cpwd_driver = {</div><div class='add'>+	.name		= DRIVER_NAME,</div><div class='add'>+	.match_table	= cpwd_match,</div><div class='add'>+	.probe		= cpwd_probe,</div><div class='add'>+	.remove		= __devexit_p(cpwd_remove),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init cpwd_init(void)</div><div class='add'>+{</div><div class='add'>+	return of_register_driver(&amp;cpwd_driver, &amp;of_bus_type);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit cpwd_exit(void)</div><div class='add'>+{</div><div class='add'>+	of_unregister_driver(&amp;cpwd_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(cpwd_init);</div><div class='add'>+module_exit(cpwd_exit);</div><div class='head'>diff --git a/drivers/watchdog/it87_wdt.c b/drivers/watchdog/it87_wdt.c<br/>new file mode 100644<br/>index 000000000000..afb8af397a9f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/watchdog/it87_wdt.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/watchdog/it87_wdt.c</a></div><div class='hunk'>@@ -0,0 +1,725 @@</div><div class='add'>+/*</div><div class='add'>+ *	Watchdog Timer Driver</div><div class='add'>+ *	   for ITE IT87xx Environment Control - Low Pin Count Input / Output</div><div class='add'>+ *</div><div class='add'>+ *	(c) Copyright 2007  Oliver Schuster &lt;olivers137@aol.com&gt;</div><div class='add'>+ *</div><div class='add'>+ *	Based on softdog.c	by Alan Cox,</div><div class='add'>+ *		 83977f_wdt.c	by Jose Goncalves,</div><div class='add'>+ *		 it87.c		by Chris Gauthron, Jean Delvare</div><div class='add'>+ *</div><div class='add'>+ *	Data-sheets: Publicly available at the ITE website</div><div class='add'>+ *		    http://www.ite.com.tw/</div><div class='add'>+ *</div><div class='add'>+ *	Support of the watchdog timers, which are available on</div><div class='add'>+ *	IT8716, IT8718, IT8726 and IT8712 (J,K version).</div><div class='add'>+ *</div><div class='add'>+ *	This program is free software; you can redistribute it and/or</div><div class='add'>+ *	modify it under the terms of the GNU General Public License</div><div class='add'>+ *	as published by the Free Software Foundation; either version</div><div class='add'>+ *	2 of the License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *	This program is distributed in the hope that it will be useful,</div><div class='add'>+ *	but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *	GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *	You should have received a copy of the GNU General Public License</div><div class='add'>+ *	along with this program; if not, write to the Free Software</div><div class='add'>+ *	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/miscdevice.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/ioport.h&gt;</div><div class='add'>+#include &lt;linux/watchdog.h&gt;</div><div class='add'>+#include &lt;linux/notifier.h&gt;</div><div class='add'>+#include &lt;linux/reboot.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/system.h&gt;</div><div class='add'>+</div><div class='add'>+#define WATCHDOG_VERSION	"1.12"</div><div class='add'>+#define WATCHDOG_NAME		"IT87 WDT"</div><div class='add'>+#define PFX			WATCHDOG_NAME ": "</div><div class='add'>+#define DRIVER_VERSION		WATCHDOG_NAME " driver, v" WATCHDOG_VERSION "\n"</div><div class='add'>+#define WD_MAGIC		'V'</div><div class='add'>+</div><div class='add'>+/* Defaults for Module Parameter */</div><div class='add'>+#define DEFAULT_NOGAMEPORT	0</div><div class='add'>+#define DEFAULT_EXCLUSIVE	1</div><div class='add'>+#define DEFAULT_TIMEOUT 	60</div><div class='add'>+#define DEFAULT_TESTMODE	0</div><div class='add'>+#define DEFAULT_NOWAYOUT	WATCHDOG_NOWAYOUT</div><div class='add'>+</div><div class='add'>+/* IO Ports */</div><div class='add'>+#define REG		0x2e</div><div class='add'>+#define VAL		0x2f</div><div class='add'>+</div><div class='add'>+/* Logical device Numbers LDN */</div><div class='add'>+#define GPIO		0x07</div><div class='add'>+#define GAMEPORT	0x09</div><div class='add'>+#define CIR		0x0a</div><div class='add'>+</div><div class='add'>+/* Configuration Registers and Functions */</div><div class='add'>+#define LDNREG		0x07</div><div class='add'>+#define CHIPID		0x20</div><div class='add'>+#define CHIPREV 	0x22</div><div class='add'>+#define ACTREG		0x30</div><div class='add'>+#define BASEREG 	0x60</div><div class='add'>+</div><div class='add'>+/* Chip Id numbers */</div><div class='add'>+#define NO_DEV_ID	0xffff</div><div class='add'>+#define IT8705_ID	0x8705</div><div class='add'>+#define IT8712_ID	0x8712</div><div class='add'>+#define IT8716_ID	0x8716</div><div class='add'>+#define IT8718_ID	0x8718</div><div class='add'>+#define IT8726_ID	0x8726	/* the data sheet suggest wrongly 0x8716 */</div><div class='add'>+</div><div class='add'>+/* GPIO Configuration Registers LDN=0x07 */</div><div class='add'>+#define WDTCTRL 	0x71</div><div class='add'>+#define WDTCFG		0x72</div><div class='add'>+#define WDTVALLSB	0x73</div><div class='add'>+#define WDTVALMSB	0x74</div><div class='add'>+</div><div class='add'>+/* GPIO Bits WDTCTRL */</div><div class='add'>+#define WDT_CIRINT	0x80</div><div class='add'>+#define WDT_MOUSEINT	0x40</div><div class='add'>+#define WDT_KYBINT	0x20</div><div class='add'>+#define WDT_GAMEPORT	0x10 /* not it8718 */</div><div class='add'>+#define WDT_FORCE	0x02</div><div class='add'>+#define WDT_ZERO	0x01</div><div class='add'>+</div><div class='add'>+/* GPIO Bits WDTCFG */</div><div class='add'>+#define WDT_TOV1	0x80</div><div class='add'>+#define WDT_KRST	0x40</div><div class='add'>+#define WDT_TOVE	0x20</div><div class='add'>+#define WDT_PWROK	0x10</div><div class='add'>+#define WDT_INT_MASK	0x0f</div><div class='add'>+</div><div class='add'>+/* CIR Configuration Register LDN=0x0a */</div><div class='add'>+#define CIR_ILS 	0x70</div><div class='add'>+</div><div class='add'>+/* The default Base address is not always available, we use this */</div><div class='add'>+#define CIR_BASE	0x0208</div><div class='add'>+</div><div class='add'>+/* CIR Controller */</div><div class='add'>+#define CIR_DR(b)	(b)</div><div class='add'>+#define CIR_IER(b)	(b + 1)</div><div class='add'>+#define CIR_RCR(b)	(b + 2)</div><div class='add'>+#define CIR_TCR1(b)	(b + 3)</div><div class='add'>+#define CIR_TCR2(b)	(b + 4)</div><div class='add'>+#define CIR_TSR(b)	(b + 5)</div><div class='add'>+#define CIR_RSR(b)	(b + 6)</div><div class='add'>+#define CIR_BDLR(b)	(b + 5)</div><div class='add'>+#define CIR_BDHR(b)	(b + 6)</div><div class='add'>+#define CIR_IIR(b)	(b + 7)</div><div class='add'>+</div><div class='add'>+/* Default Base address of Game port */</div><div class='add'>+#define GP_BASE_DEFAULT	0x0201</div><div class='add'>+</div><div class='add'>+/* wdt_status */</div><div class='add'>+#define WDTS_TIMER_RUN	0</div><div class='add'>+#define WDTS_DEV_OPEN	1</div><div class='add'>+#define WDTS_KEEPALIVE	2</div><div class='add'>+#define WDTS_LOCKED	3</div><div class='add'>+#define WDTS_USE_GP	4</div><div class='add'>+#define WDTS_EXPECTED	5</div><div class='add'>+</div><div class='add'>+static	unsigned int base, gpact, ciract;</div><div class='add'>+static	unsigned long wdt_status;</div><div class='add'>+static	DEFINE_SPINLOCK(spinlock);</div><div class='add'>+</div><div class='add'>+static	int nogameport = DEFAULT_NOGAMEPORT;</div><div class='add'>+static	int exclusive  = DEFAULT_EXCLUSIVE;</div><div class='add'>+static	int timeout    = DEFAULT_TIMEOUT;</div><div class='add'>+static	int testmode   = DEFAULT_TESTMODE;</div><div class='add'>+static	int nowayout   = DEFAULT_NOWAYOUT;</div><div class='add'>+</div><div class='add'>+module_param(nogameport, int, 0);</div><div class='add'>+MODULE_PARM_DESC(nogameport, "Forbid the activation of game port, default="</div><div class='add'>+		__MODULE_STRING(DEFAULT_NOGAMEPORT));</div><div class='add'>+module_param(exclusive, int, 0);</div><div class='add'>+MODULE_PARM_DESC(exclusive, "Watchdog exclusive device open, default="</div><div class='add'>+		__MODULE_STRING(DEFAULT_EXCLUSIVE));</div><div class='add'>+module_param(timeout, int, 0);</div><div class='add'>+MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds, default="</div><div class='add'>+		__MODULE_STRING(DEFAULT_TIMEOUT));</div><div class='add'>+module_param(testmode, int, 0);</div><div class='add'>+MODULE_PARM_DESC(testmode, "Watchdog test mode (1 = no reboot), default="</div><div class='add'>+		__MODULE_STRING(DEFAULT_TESTMODE));</div><div class='add'>+module_param(nowayout, int, 0);</div><div class='add'>+MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started, default="</div><div class='add'>+		__MODULE_STRING(WATCHDOG_NOWAYOUT));</div><div class='add'>+</div><div class='add'>+/* Superio Chip */</div><div class='add'>+</div><div class='add'>+static inline void superio_enter(void)</div><div class='add'>+{</div><div class='add'>+	outb(0x87, REG);</div><div class='add'>+	outb(0x01, REG);</div><div class='add'>+	outb(0x55, REG);</div><div class='add'>+	outb(0x55, REG);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void superio_exit(void)</div><div class='add'>+{</div><div class='add'>+	outb(0x02, REG);</div><div class='add'>+	outb(0x02, VAL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void superio_select(int ldn)</div><div class='add'>+{</div><div class='add'>+	outb(LDNREG, REG);</div><div class='add'>+	outb(ldn, VAL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int superio_inb(int reg)</div><div class='add'>+{</div><div class='add'>+	outb(reg, REG);</div><div class='add'>+	return inb(VAL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void superio_outb(int val, int reg)</div><div class='add'>+{</div><div class='add'>+       outb(reg, REG);</div><div class='add'>+       outb(val, VAL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int superio_inw(int reg)</div><div class='add'>+{</div><div class='add'>+	int val;</div><div class='add'>+	outb(reg++, REG);</div><div class='add'>+	val = inb(VAL) &lt;&lt; 8;</div><div class='add'>+	outb(reg, REG);</div><div class='add'>+	val |= inb(VAL);</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void superio_outw(int val, int reg)</div><div class='add'>+{</div><div class='add'>+       outb(reg++, REG);</div><div class='add'>+       outb(val &gt;&gt; 8, VAL);</div><div class='add'>+       outb(reg, REG);</div><div class='add'>+       outb(val, VAL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* watchdog timer handling */</div><div class='add'>+</div><div class='add'>+static void wdt_keepalive(void)</div><div class='add'>+{</div><div class='add'>+	if (test_bit(WDTS_USE_GP, &amp;wdt_status))</div><div class='add'>+		inb(base);</div><div class='add'>+	else</div><div class='add'>+		/* The timer reloads with around 5 msec delay */</div><div class='add'>+		outb(0x55, CIR_DR(base));</div><div class='add'>+	set_bit(WDTS_KEEPALIVE, &amp;wdt_status);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void wdt_start(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;spinlock, flags);</div><div class='add'>+	superio_enter();</div><div class='add'>+</div><div class='add'>+	superio_select(GPIO);</div><div class='add'>+	if (test_bit(WDTS_USE_GP, &amp;wdt_status))</div><div class='add'>+		superio_outb(WDT_GAMEPORT, WDTCTRL);</div><div class='add'>+	else</div><div class='add'>+		superio_outb(WDT_CIRINT, WDTCTRL);</div><div class='add'>+	if (!testmode)</div><div class='add'>+		superio_outb(WDT_TOV1 | WDT_KRST | WDT_PWROK, WDTCFG);</div><div class='add'>+	else</div><div class='add'>+		superio_outb(WDT_TOV1, WDTCFG);</div><div class='add'>+	superio_outb(timeout&gt;&gt;8, WDTVALMSB);</div><div class='add'>+	superio_outb(timeout, WDTVALLSB);</div><div class='add'>+</div><div class='add'>+	superio_exit();</div><div class='add'>+	spin_unlock_irqrestore(&amp;spinlock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void wdt_stop(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;spinlock, flags);</div><div class='add'>+	superio_enter();</div><div class='add'>+</div><div class='add'>+	superio_select(GPIO);</div><div class='add'>+	superio_outb(0x00, WDTCTRL);</div><div class='add'>+	superio_outb(WDT_TOV1, WDTCFG);</div><div class='add'>+	superio_outb(0x00, WDTVALMSB);</div><div class='add'>+	superio_outb(0x00, WDTVALLSB);</div><div class='add'>+</div><div class='add'>+	superio_exit();</div><div class='add'>+	spin_unlock_irqrestore(&amp;spinlock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	wdt_set_timeout - set a new timeout value with watchdog ioctl</div><div class='add'>+ *	@t: timeout value in seconds</div><div class='add'>+ *</div><div class='add'>+ *	The hardware device has a 16 bit watchdog timer, thus the</div><div class='add'>+ *	timeout time ranges between 1 and 65535 seconds.</div><div class='add'>+ *</div><div class='add'>+ *	Used within WDIOC_SETTIMEOUT watchdog device ioctl.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static int wdt_set_timeout(int t)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	if (t &lt; 1 || t &gt; 65535)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	timeout = t;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;spinlock, flags);</div><div class='add'>+	if (test_bit(WDTS_TIMER_RUN, &amp;wdt_status)) {</div><div class='add'>+		superio_enter();</div><div class='add'>+</div><div class='add'>+		superio_select(GPIO);</div><div class='add'>+		superio_outb(t&gt;&gt;8, WDTVALMSB);</div><div class='add'>+		superio_outb(t, WDTVALLSB);</div><div class='add'>+</div><div class='add'>+		superio_exit();</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;spinlock, flags);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	wdt_get_status - determines the status supported by watchdog ioctl</div><div class='add'>+ *	@status: status returned to user space</div><div class='add'>+ *</div><div class='add'>+ *	The status bit of the device does not allow to distinguish</div><div class='add'>+ *	between a regular system reset and a watchdog forced reset.</div><div class='add'>+ *	But, in test mode it is useful, so it is supported through</div><div class='add'>+ *	WDIOC_GETSTATUS watchdog ioctl. Additionally the driver</div><div class='add'>+ *	reports the keepalive signal and the acception of the magic.</div><div class='add'>+ *</div><div class='add'>+ *	Used within WDIOC_GETSTATUS watchdog device ioctl.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static int wdt_get_status(int *status)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	*status = 0;</div><div class='add'>+	if (testmode) {</div><div class='add'>+		spin_lock_irqsave(&amp;spinlock, flags);</div><div class='add'>+		superio_enter();</div><div class='add'>+		superio_select(GPIO);</div><div class='add'>+		if (superio_inb(WDTCTRL) &amp; WDT_ZERO) {</div><div class='add'>+			superio_outb(0x00, WDTCTRL);</div><div class='add'>+			clear_bit(WDTS_TIMER_RUN, &amp;wdt_status);</div><div class='add'>+			*status |= WDIOF_CARDRESET;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		superio_exit();</div><div class='add'>+		spin_unlock_irqrestore(&amp;spinlock, flags);</div><div class='add'>+	}</div><div class='add'>+	if (test_and_clear_bit(WDTS_KEEPALIVE, &amp;wdt_status))</div><div class='add'>+		*status |= WDIOF_KEEPALIVEPING;</div><div class='add'>+	if (test_bit(WDTS_EXPECTED, &amp;wdt_status))</div><div class='add'>+		*status |= WDIOF_MAGICCLOSE;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* /dev/watchdog handling */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	wdt_open - watchdog file_operations .open</div><div class='add'>+ *	@inode: inode of the device</div><div class='add'>+ *	@file: file handle to the device</div><div class='add'>+ *</div><div class='add'>+ *	The watchdog timer starts by opening the device.</div><div class='add'>+ *</div><div class='add'>+ *	Used within the file operation of the watchdog device.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static int wdt_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	if (exclusive &amp;&amp; test_and_set_bit(WDTS_DEV_OPEN, &amp;wdt_status))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	if (!test_and_set_bit(WDTS_TIMER_RUN, &amp;wdt_status)) {</div><div class='add'>+		if (nowayout &amp;&amp; !test_and_set_bit(WDTS_LOCKED, &amp;wdt_status))</div><div class='add'>+			__module_get(THIS_MODULE);</div><div class='add'>+		wdt_start();</div><div class='add'>+	}</div><div class='add'>+	return nonseekable_open(inode, file);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	wdt_release - watchdog file_operations .release</div><div class='add'>+ *	@inode: inode of the device</div><div class='add'>+ *	@file: file handle to the device</div><div class='add'>+ *</div><div class='add'>+ *	Closing the watchdog device either stops the watchdog timer</div><div class='add'>+ *	or in the case, that nowayout is set or the magic character</div><div class='add'>+ *	wasn't written, a critical warning about an running watchdog</div><div class='add'>+ *	timer is given.</div><div class='add'>+ *</div><div class='add'>+ *	Used within the file operation of the watchdog device.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static int wdt_release(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	if (test_bit(WDTS_TIMER_RUN, &amp;wdt_status)) {</div><div class='add'>+		if (test_and_clear_bit(WDTS_EXPECTED, &amp;wdt_status)) {</div><div class='add'>+			wdt_stop();</div><div class='add'>+			clear_bit(WDTS_TIMER_RUN, &amp;wdt_status);</div><div class='add'>+		} else {</div><div class='add'>+			wdt_keepalive();</div><div class='add'>+			printk(KERN_CRIT PFX</div><div class='add'>+			       "unexpected close, not stopping watchdog!\n");</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	clear_bit(WDTS_DEV_OPEN, &amp;wdt_status);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	wdt_write - watchdog file_operations .write</div><div class='add'>+ *	@file: file handle to the watchdog</div><div class='add'>+ *	@buf: buffer to write</div><div class='add'>+ *	@count: count of bytes</div><div class='add'>+ *	@ppos: pointer to the position to write. No seeks allowed</div><div class='add'>+ *</div><div class='add'>+ *	A write to a watchdog device is defined as a keepalive signal. Any</div><div class='add'>+ *	write of data will do, as we don't define content meaning.</div><div class='add'>+ *</div><div class='add'>+ *	Used within the file operation of the watchdog device.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static ssize_t wdt_write(struct file *file, const char __user *buf,</div><div class='add'>+			    size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	if (count) {</div><div class='add'>+		clear_bit(WDTS_EXPECTED, &amp;wdt_status);</div><div class='add'>+		wdt_keepalive();</div><div class='add'>+	}</div><div class='add'>+	if (!nowayout) {</div><div class='add'>+		size_t ofs;</div><div class='add'>+</div><div class='add'>+	/* note: just in case someone wrote the magic character long ago */</div><div class='add'>+		for (ofs = 0; ofs != count; ofs++) {</div><div class='add'>+			char c;</div><div class='add'>+			if (get_user(c, buf + ofs))</div><div class='add'>+				return -EFAULT;</div><div class='add'>+			if (c == WD_MAGIC)</div><div class='add'>+				set_bit(WDTS_EXPECTED, &amp;wdt_status);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct watchdog_info ident = {</div><div class='add'>+	.options = WDIOF_SETTIMEOUT | WDIOF_MAGICCLOSE | WDIOF_KEEPALIVEPING,</div><div class='add'>+	.firmware_version =	1,</div><div class='add'>+	.identity = WATCHDOG_NAME,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	wdt_ioctl - watchdog file_operations .unlocked_ioctl</div><div class='add'>+ *	@file: file handle to the device</div><div class='add'>+ *	@cmd: watchdog command</div><div class='add'>+ *	@arg: argument pointer</div><div class='add'>+ *</div><div class='add'>+ *	The watchdog API defines a common set of functions for all watchdogs</div><div class='add'>+ *	according to their available features.</div><div class='add'>+ *</div><div class='add'>+ *	Used within the file operation of the watchdog device.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static long wdt_ioctl(struct file *file, unsigned int cmd, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	int rc = 0, status, new_options, new_timeout;</div><div class='add'>+	union {</div><div class='add'>+		struct watchdog_info __user *ident;</div><div class='add'>+		int __user *i;</div><div class='add'>+	} uarg;</div><div class='add'>+</div><div class='add'>+	uarg.i = (int __user *)arg;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case WDIOC_GETSUPPORT:</div><div class='add'>+		return copy_to_user(uarg.ident,</div><div class='add'>+				    &amp;ident, sizeof(ident)) ? -EFAULT : 0;</div><div class='add'>+</div><div class='add'>+	case WDIOC_GETSTATUS:</div><div class='add'>+		wdt_get_status(&amp;status);</div><div class='add'>+		return put_user(status, uarg.i);</div><div class='add'>+</div><div class='add'>+	case WDIOC_GETBOOTSTATUS:</div><div class='add'>+		return put_user(0, uarg.i);</div><div class='add'>+</div><div class='add'>+	case WDIOC_KEEPALIVE:</div><div class='add'>+		wdt_keepalive();</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	case WDIOC_SETOPTIONS:</div><div class='add'>+		if (get_user(new_options, uarg.i))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+</div><div class='add'>+		switch (new_options) {</div><div class='add'>+		case WDIOS_DISABLECARD:</div><div class='add'>+			if (test_bit(WDTS_TIMER_RUN, &amp;wdt_status))</div><div class='add'>+				wdt_stop();</div><div class='add'>+			clear_bit(WDTS_TIMER_RUN, &amp;wdt_status);</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		case WDIOS_ENABLECARD:</div><div class='add'>+			if (!test_and_set_bit(WDTS_TIMER_RUN, &amp;wdt_status))</div><div class='add'>+				wdt_start();</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		default:</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	case WDIOC_SETTIMEOUT:</div><div class='add'>+		if (get_user(new_timeout, uarg.i))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		rc = wdt_set_timeout(new_timeout);</div><div class='add'>+	case WDIOC_GETTIMEOUT:</div><div class='add'>+		if (put_user(timeout, uarg.i))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		return -ENOTTY;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wdt_notify_sys(struct notifier_block *this, unsigned long code,</div><div class='add'>+	void *unused)</div><div class='add'>+{</div><div class='add'>+	if (code == SYS_DOWN || code == SYS_HALT)</div><div class='add'>+		wdt_stop();</div><div class='add'>+	return NOTIFY_DONE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations wdt_fops = {</div><div class='add'>+	.owner		= THIS_MODULE,</div><div class='add'>+	.llseek		= no_llseek,</div><div class='add'>+	.write		= wdt_write,</div><div class='add'>+	.unlocked_ioctl	= wdt_ioctl,</div><div class='add'>+	.open		= wdt_open,</div><div class='add'>+	.release	= wdt_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct miscdevice wdt_miscdev = {</div><div class='add'>+	.minor		= WATCHDOG_MINOR,</div><div class='add'>+	.name		= "watchdog",</div><div class='add'>+	.fops		= &amp;wdt_fops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct notifier_block wdt_notifier = {</div><div class='add'>+	.notifier_call = wdt_notify_sys,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init it87_wdt_init(void)</div><div class='add'>+{</div><div class='add'>+	int rc = 0;</div><div class='add'>+	u16 chip_type;</div><div class='add'>+	u8  chip_rev;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;spinlock, flags);</div><div class='add'>+	superio_enter();</div><div class='add'>+	chip_type = superio_inw(CHIPID);</div><div class='add'>+	chip_rev  = superio_inb(CHIPREV) &amp; 0x0f;</div><div class='add'>+	superio_exit();</div><div class='add'>+	spin_unlock_irqrestore(&amp;spinlock, flags);</div><div class='add'>+</div><div class='add'>+	switch (chip_type) {</div><div class='add'>+	case IT8716_ID:</div><div class='add'>+	case IT8718_ID:</div><div class='add'>+	case IT8726_ID:</div><div class='add'>+		break;</div><div class='add'>+	case IT8712_ID:</div><div class='add'>+		if (chip_rev &gt; 7)</div><div class='add'>+			break;</div><div class='add'>+	case IT8705_ID:</div><div class='add'>+		printk(KERN_ERR PFX</div><div class='add'>+		       "Unsupported Chip found, Chip %04x Revision %02x\n",</div><div class='add'>+		       chip_type, chip_rev);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	case NO_DEV_ID:</div><div class='add'>+		printk(KERN_ERR PFX "no device\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	default:</div><div class='add'>+		printk(KERN_ERR PFX</div><div class='add'>+		       "Unknown Chip found, Chip %04x Revision %04x\n",</div><div class='add'>+		       chip_type, chip_rev);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;spinlock, flags);</div><div class='add'>+	superio_enter();</div><div class='add'>+</div><div class='add'>+	superio_select(GPIO);</div><div class='add'>+	superio_outb(WDT_TOV1, WDTCFG);</div><div class='add'>+	superio_outb(0x00, WDTCTRL);</div><div class='add'>+</div><div class='add'>+	/* First try to get Gameport support */</div><div class='add'>+	if (chip_type != IT8718_ID &amp;&amp; !nogameport) {</div><div class='add'>+		superio_select(GAMEPORT);</div><div class='add'>+		base = superio_inw(BASEREG);</div><div class='add'>+		if (!base) {</div><div class='add'>+			base = GP_BASE_DEFAULT;</div><div class='add'>+			superio_outw(base, BASEREG);</div><div class='add'>+		}</div><div class='add'>+		gpact = superio_inb(ACTREG);</div><div class='add'>+		superio_outb(0x01, ACTREG);</div><div class='add'>+		superio_exit();</div><div class='add'>+		spin_unlock_irqrestore(&amp;spinlock, flags);</div><div class='add'>+		if (request_region(base, 1, WATCHDOG_NAME))</div><div class='add'>+			set_bit(WDTS_USE_GP, &amp;wdt_status);</div><div class='add'>+		else</div><div class='add'>+			rc = -EIO;</div><div class='add'>+	} else {</div><div class='add'>+		superio_exit();</div><div class='add'>+		spin_unlock_irqrestore(&amp;spinlock, flags);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If we haven't Gameport support, try to get CIR support */</div><div class='add'>+	if (!test_bit(WDTS_USE_GP, &amp;wdt_status)) {</div><div class='add'>+		if (!request_region(CIR_BASE, 8, WATCHDOG_NAME)) {</div><div class='add'>+			if (rc == -EIO)</div><div class='add'>+				printk(KERN_ERR PFX</div><div class='add'>+					"I/O Address 0x%04x and 0x%04x"</div><div class='add'>+					" already in use\n", base, CIR_BASE);</div><div class='add'>+			else</div><div class='add'>+				printk(KERN_ERR PFX</div><div class='add'>+					"I/O Address 0x%04x already in use\n",</div><div class='add'>+					CIR_BASE);</div><div class='add'>+			rc = -EIO;</div><div class='add'>+			goto err_out;</div><div class='add'>+		}</div><div class='add'>+		base = CIR_BASE;</div><div class='add'>+		spin_lock_irqsave(&amp;spinlock, flags);</div><div class='add'>+		superio_enter();</div><div class='add'>+</div><div class='add'>+		superio_select(CIR);</div><div class='add'>+		superio_outw(base, BASEREG);</div><div class='add'>+		superio_outb(0x00, CIR_ILS);</div><div class='add'>+		ciract = superio_inb(ACTREG);</div><div class='add'>+		superio_outb(0x01, ACTREG);</div><div class='add'>+		if (rc == -EIO) {</div><div class='add'>+			superio_select(GAMEPORT);</div><div class='add'>+			superio_outb(gpact, ACTREG);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		superio_exit();</div><div class='add'>+		spin_unlock_irqrestore(&amp;spinlock, flags);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (timeout &lt; 1 || timeout &gt; 65535) {</div><div class='add'>+		timeout = DEFAULT_TIMEOUT;</div><div class='add'>+		printk(KERN_WARNING PFX</div><div class='add'>+		       "Timeout value out of range, use default %d sec\n",</div><div class='add'>+		       DEFAULT_TIMEOUT);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = register_reboot_notifier(&amp;wdt_notifier);</div><div class='add'>+	if (rc) {</div><div class='add'>+		printk(KERN_ERR PFX</div><div class='add'>+		       "Cannot register reboot notifier (err=%d)\n", rc);</div><div class='add'>+		goto err_out_region;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = misc_register(&amp;wdt_miscdev);</div><div class='add'>+	if (rc) {</div><div class='add'>+		printk(KERN_ERR PFX</div><div class='add'>+		       "Cannot register miscdev on minor=%d (err=%d)\n",</div><div class='add'>+			wdt_miscdev.minor, rc);</div><div class='add'>+		goto err_out_reboot;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Initialize CIR to use it as keepalive source */</div><div class='add'>+	if (!test_bit(WDTS_USE_GP, &amp;wdt_status)) {</div><div class='add'>+		outb(0x00, CIR_RCR(base));</div><div class='add'>+		outb(0xc0, CIR_TCR1(base));</div><div class='add'>+		outb(0x5c, CIR_TCR2(base));</div><div class='add'>+		outb(0x10, CIR_IER(base));</div><div class='add'>+		outb(0x00, CIR_BDHR(base));</div><div class='add'>+		outb(0x01, CIR_BDLR(base));</div><div class='add'>+		outb(0x09, CIR_IER(base));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO PFX "Chip it%04x revision %d initialized. "</div><div class='add'>+		"timeout=%d sec (nowayout=%d testmode=%d exclusive=%d "</div><div class='add'>+		"nogameport=%d)\n", chip_type, chip_rev, timeout,</div><div class='add'>+		nowayout, testmode, exclusive, nogameport);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_out_reboot:</div><div class='add'>+	unregister_reboot_notifier(&amp;wdt_notifier);</div><div class='add'>+err_out_region:</div><div class='add'>+	release_region(base, test_bit(WDTS_USE_GP, &amp;wdt_status) ? 1 : 8);</div><div class='add'>+	if (!test_bit(WDTS_USE_GP, &amp;wdt_status)) {</div><div class='add'>+		spin_lock_irqsave(&amp;spinlock, flags);</div><div class='add'>+		superio_enter();</div><div class='add'>+		superio_select(CIR);</div><div class='add'>+		superio_outb(ciract, ACTREG);</div><div class='add'>+		superio_exit();</div><div class='add'>+		spin_unlock_irqrestore(&amp;spinlock, flags);</div><div class='add'>+	}</div><div class='add'>+err_out:</div><div class='add'>+	if (chip_type != IT8718_ID &amp;&amp; !nogameport) {</div><div class='add'>+		spin_lock_irqsave(&amp;spinlock, flags);</div><div class='add'>+		superio_enter();</div><div class='add'>+		superio_select(GAMEPORT);</div><div class='add'>+		superio_outb(gpact, ACTREG);</div><div class='add'>+		superio_exit();</div><div class='add'>+		spin_unlock_irqrestore(&amp;spinlock, flags);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit it87_wdt_exit(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int nolock;</div><div class='add'>+</div><div class='add'>+	nolock = !spin_trylock_irqsave(&amp;spinlock, flags);</div><div class='add'>+	superio_enter();</div><div class='add'>+	superio_select(GPIO);</div><div class='add'>+	superio_outb(0x00, WDTCTRL);</div><div class='add'>+	superio_outb(0x00, WDTCFG);</div><div class='add'>+	superio_outb(0x00, WDTVALMSB);</div><div class='add'>+	superio_outb(0x00, WDTVALLSB);</div><div class='add'>+	if (test_bit(WDTS_USE_GP, &amp;wdt_status)) {</div><div class='add'>+		superio_select(GAMEPORT);</div><div class='add'>+		superio_outb(gpact, ACTREG);</div><div class='add'>+	} else {</div><div class='add'>+		superio_select(CIR);</div><div class='add'>+		superio_outb(ciract, ACTREG);</div><div class='add'>+	}</div><div class='add'>+	superio_exit();</div><div class='add'>+	if (!nolock)</div><div class='add'>+		spin_unlock_irqrestore(&amp;spinlock, flags);</div><div class='add'>+</div><div class='add'>+	misc_deregister(&amp;wdt_miscdev);</div><div class='add'>+	unregister_reboot_notifier(&amp;wdt_notifier);</div><div class='add'>+	release_region(base, test_bit(WDTS_USE_GP, &amp;wdt_status) ? 1 : 8);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(it87_wdt_init);</div><div class='add'>+module_exit(it87_wdt_exit);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Oliver Schuster");</div><div class='add'>+MODULE_DESCRIPTION("Hardware Watchdog Device Driver for IT87xx EC-LPC I/O");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);</div><div class='head'>diff --git a/drivers/watchdog/ixp4xx_wdt.c b/drivers/watchdog/ixp4xx_wdt.c<br/>index 8302ef005be7..147b4d5c63b3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/watchdog/ixp4xx_wdt.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/watchdog/ixp4xx_wdt.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/watchdog/ixp4xx_wdt.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/watchdog/ixp4xx_wdt.c</a></div><div class='hunk'>@@ -174,10 +174,8 @@ static struct miscdevice ixp4xx_wdt_miscdev = {</div><div class='ctx'> static int __init ixp4xx_wdt_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	unsigned long processor_id;</div><div class='ctx'> </div><div class='del'>-	asm("mrc p15, 0, %0, cr0, cr0, 0;" : "=r"(processor_id) :);</div><div class='del'>-	if (!(processor_id &amp; 0xf) &amp;&amp; !cpu_is_ixp46x()) {</div><div class='add'>+	if (!(read_cpuid_id() &amp; 0xf) &amp;&amp; !cpu_is_ixp46x()) {</div><div class='ctx'> 		printk(KERN_ERR "IXP4XXX Watchdog: Rev. A0 IXP42x CPU detected"</div><div class='ctx'> 			" - watchdog disabled\n");</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/watchdog/omap_wdt.c b/drivers/watchdog/omap_wdt.c<br/>index 3a11dadfd8e7..7bcbb7f4745f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/watchdog/omap_wdt.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/watchdog/omap_wdt.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/watchdog/omap_wdt.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/watchdog/omap_wdt.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/drivers/char/watchdog/omap_wdt.c</div><div class='add'>+ * omap_wdt.c</div><div class='ctx'>  *</div><div class='del'>- * Watchdog driver for the TI OMAP 16xx &amp; 24xx 32KHz (non-secure) watchdog</div><div class='add'>+ * Watchdog driver for the TI OMAP 16xx &amp; 24xx/34xx 32KHz (non-secure) watchdog</div><div class='ctx'>  *</div><div class='ctx'>  * Author: MontaVista Software, Inc.</div><div class='ctx'>  *	 &lt;gdavis@mvista.com&gt; or &lt;source@mvista.com&gt;</div><div class='hunk'>@@ -47,50 +47,68 @@</div><div class='ctx'> </div><div class='ctx'> #include "omap_wdt.h"</div><div class='ctx'> </div><div class='add'>+static struct platform_device *omap_wdt_dev;</div><div class='add'>+</div><div class='ctx'> static unsigned timer_margin;</div><div class='ctx'> module_param(timer_margin, uint, 0);</div><div class='ctx'> MODULE_PARM_DESC(timer_margin, "initial watchdog timeout (in seconds)");</div><div class='ctx'> </div><div class='del'>-static int omap_wdt_users;</div><div class='del'>-static struct clk *armwdt_ck;</div><div class='del'>-static struct clk *mpu_wdt_ick;</div><div class='del'>-static struct clk *mpu_wdt_fck;</div><div class='del'>-</div><div class='ctx'> static unsigned int wdt_trgr_pattern = 0x1234;</div><div class='ctx'> static spinlock_t wdt_lock;</div><div class='ctx'> </div><div class='del'>-static void omap_wdt_ping(void)</div><div class='add'>+struct omap_wdt_dev {</div><div class='add'>+	void __iomem    *base;          /* physical */</div><div class='add'>+	struct device   *dev;</div><div class='add'>+	int             omap_wdt_users;</div><div class='add'>+	struct clk      *armwdt_ck;</div><div class='add'>+	struct clk      *mpu_wdt_ick;</div><div class='add'>+	struct clk      *mpu_wdt_fck;</div><div class='add'>+	struct resource *mem;</div><div class='add'>+	struct miscdevice omap_wdt_miscdev;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void omap_wdt_ping(struct omap_wdt_dev *wdev)</div><div class='ctx'> {</div><div class='add'>+	void __iomem    *base = wdev-&gt;base;</div><div class='add'>+</div><div class='ctx'> 	/* wait for posted write to complete */</div><div class='del'>-	while ((omap_readl(OMAP_WATCHDOG_WPS)) &amp; 0x08)</div><div class='add'>+	while ((__raw_readl(base + OMAP_WATCHDOG_WPS)) &amp; 0x08)</div><div class='ctx'> 		cpu_relax();</div><div class='add'>+</div><div class='ctx'> 	wdt_trgr_pattern = ~wdt_trgr_pattern;</div><div class='del'>-	omap_writel(wdt_trgr_pattern, (OMAP_WATCHDOG_TGR));</div><div class='add'>+	__raw_writel(wdt_trgr_pattern, (base + OMAP_WATCHDOG_TGR));</div><div class='add'>+</div><div class='ctx'> 	/* wait for posted write to complete */</div><div class='del'>-	while ((omap_readl(OMAP_WATCHDOG_WPS)) &amp; 0x08)</div><div class='add'>+	while ((__raw_readl(base + OMAP_WATCHDOG_WPS)) &amp; 0x08)</div><div class='ctx'> 		cpu_relax();</div><div class='ctx'> 	/* reloaded WCRR from WLDR */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void omap_wdt_enable(void)</div><div class='add'>+static void omap_wdt_enable(struct omap_wdt_dev *wdev)</div><div class='ctx'> {</div><div class='add'>+	void __iomem *base = wdev-&gt;base;</div><div class='add'>+</div><div class='ctx'> 	/* Sequence to enable the watchdog */</div><div class='del'>-	omap_writel(0xBBBB, OMAP_WATCHDOG_SPR);</div><div class='del'>-	while ((omap_readl(OMAP_WATCHDOG_WPS)) &amp; 0x10)</div><div class='add'>+	__raw_writel(0xBBBB, base + OMAP_WATCHDOG_SPR);</div><div class='add'>+	while ((__raw_readl(base + OMAP_WATCHDOG_WPS)) &amp; 0x10)</div><div class='ctx'> 		cpu_relax();</div><div class='del'>-	omap_writel(0x4444, OMAP_WATCHDOG_SPR);</div><div class='del'>-	while ((omap_readl(OMAP_WATCHDOG_WPS)) &amp; 0x10)</div><div class='add'>+</div><div class='add'>+	__raw_writel(0x4444, base + OMAP_WATCHDOG_SPR);</div><div class='add'>+	while ((__raw_readl(base + OMAP_WATCHDOG_WPS)) &amp; 0x10)</div><div class='ctx'> 		cpu_relax();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void omap_wdt_disable(void)</div><div class='add'>+static void omap_wdt_disable(struct omap_wdt_dev *wdev)</div><div class='ctx'> {</div><div class='add'>+	void __iomem *base = wdev-&gt;base;</div><div class='add'>+</div><div class='ctx'> 	/* sequence required to disable watchdog */</div><div class='del'>-	omap_writel(0xAAAA, OMAP_WATCHDOG_SPR);	/* TIMER_MODE */</div><div class='del'>-	while (omap_readl(OMAP_WATCHDOG_WPS) &amp; 0x10)</div><div class='add'>+	__raw_writel(0xAAAA, base + OMAP_WATCHDOG_SPR);	/* TIMER_MODE */</div><div class='add'>+	while (__raw_readl(base + OMAP_WATCHDOG_WPS) &amp; 0x10)</div><div class='ctx'> 		cpu_relax();</div><div class='del'>-	omap_writel(0x5555, OMAP_WATCHDOG_SPR);	/* TIMER_MODE */</div><div class='del'>-	while (omap_readl(OMAP_WATCHDOG_WPS) &amp; 0x10)</div><div class='add'>+</div><div class='add'>+	__raw_writel(0x5555, base + OMAP_WATCHDOG_SPR);	/* TIMER_MODE */</div><div class='add'>+	while (__raw_readl(base + OMAP_WATCHDOG_WPS) &amp; 0x10)</div><div class='ctx'> 		cpu_relax();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -103,83 +121,90 @@ static void omap_wdt_adjust_timeout(unsigned new_timeout)</div><div class='ctx'> 	timer_margin = new_timeout;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void omap_wdt_set_timeout(void)</div><div class='add'>+static void omap_wdt_set_timeout(struct omap_wdt_dev *wdev)</div><div class='ctx'> {</div><div class='ctx'> 	u32 pre_margin = GET_WLDR_VAL(timer_margin);</div><div class='add'>+	void __iomem *base = wdev-&gt;base;</div><div class='ctx'> </div><div class='ctx'> 	/* just count up at 32 KHz */</div><div class='del'>-	while (omap_readl(OMAP_WATCHDOG_WPS) &amp; 0x04)</div><div class='add'>+	while (__raw_readl(base + OMAP_WATCHDOG_WPS) &amp; 0x04)</div><div class='ctx'> 		cpu_relax();</div><div class='del'>-	omap_writel(pre_margin, OMAP_WATCHDOG_LDR);</div><div class='del'>-	while (omap_readl(OMAP_WATCHDOG_WPS) &amp; 0x04)</div><div class='add'>+</div><div class='add'>+	__raw_writel(pre_margin, base + OMAP_WATCHDOG_LDR);</div><div class='add'>+	while (__raw_readl(base + OMAP_WATCHDOG_WPS) &amp; 0x04)</div><div class='ctx'> 		cpu_relax();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *	Allow only one task to hold it open</div><div class='ctx'>  */</div><div class='del'>-</div><div class='ctx'> static int omap_wdt_open(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='del'>-	if (test_and_set_bit(1, (unsigned long *)&amp;omap_wdt_users))</div><div class='add'>+	struct omap_wdt_dev *wdev = platform_get_drvdata(omap_wdt_dev);</div><div class='add'>+	void __iomem *base = wdev-&gt;base;</div><div class='add'>+</div><div class='add'>+	if (test_and_set_bit(1, (unsigned long *)&amp;(wdev-&gt;omap_wdt_users)))</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='ctx'> 	if (cpu_is_omap16xx())</div><div class='del'>-		clk_enable(armwdt_ck);	/* Enable the clock */</div><div class='add'>+		clk_enable(wdev-&gt;armwdt_ck);	/* Enable the clock */</div><div class='ctx'> </div><div class='del'>-	if (cpu_is_omap24xx()) {</div><div class='del'>-		clk_enable(mpu_wdt_ick);    /* Enable the interface clock */</div><div class='del'>-		clk_enable(mpu_wdt_fck);    /* Enable the functional clock */</div><div class='add'>+	if (cpu_is_omap24xx() || cpu_is_omap34xx()) {</div><div class='add'>+		clk_enable(wdev-&gt;mpu_wdt_ick);    /* Enable the interface clock */</div><div class='add'>+		clk_enable(wdev-&gt;mpu_wdt_fck);    /* Enable the functional clock */</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* initialize prescaler */</div><div class='del'>-	while (omap_readl(OMAP_WATCHDOG_WPS) &amp; 0x01)</div><div class='add'>+	while (__raw_readl(base + OMAP_WATCHDOG_WPS) &amp; 0x01)</div><div class='ctx'> 		cpu_relax();</div><div class='del'>-	omap_writel((1 &lt;&lt; 5) | (PTV &lt;&lt; 2), OMAP_WATCHDOG_CNTRL);</div><div class='del'>-	while (omap_readl(OMAP_WATCHDOG_WPS) &amp; 0x01)</div><div class='add'>+</div><div class='add'>+	__raw_writel((1 &lt;&lt; 5) | (PTV &lt;&lt; 2), base + OMAP_WATCHDOG_CNTRL);</div><div class='add'>+	while (__raw_readl(base + OMAP_WATCHDOG_WPS) &amp; 0x01)</div><div class='ctx'> 		cpu_relax();</div><div class='ctx'> </div><div class='del'>-	omap_wdt_set_timeout();</div><div class='del'>-	omap_wdt_enable();</div><div class='add'>+	file-&gt;private_data = (void *) wdev;</div><div class='add'>+</div><div class='add'>+	omap_wdt_set_timeout(wdev);</div><div class='add'>+	omap_wdt_enable(wdev);</div><div class='add'>+</div><div class='ctx'> 	return nonseekable_open(inode, file);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int omap_wdt_release(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='add'>+	struct omap_wdt_dev *wdev = file-&gt;private_data;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 *      Shut off the timer unless NOWAYOUT is defined.</div><div class='ctx'> 	 */</div><div class='ctx'> #ifndef CONFIG_WATCHDOG_NOWAYOUT</div><div class='del'>-	omap_wdt_disable();</div><div class='ctx'> </div><div class='del'>-	if (cpu_is_omap16xx()) {</div><div class='del'>-		clk_disable(armwdt_ck);	/* Disable the clock */</div><div class='del'>-		clk_put(armwdt_ck);</div><div class='del'>-		armwdt_ck = NULL;</div><div class='del'>-	}</div><div class='add'>+	omap_wdt_disable(wdev);</div><div class='ctx'> </div><div class='del'>-	if (cpu_is_omap24xx()) {</div><div class='del'>-		clk_disable(mpu_wdt_ick);	/* Disable the clock */</div><div class='del'>-		clk_disable(mpu_wdt_fck);	/* Disable the clock */</div><div class='del'>-		clk_put(mpu_wdt_ick);</div><div class='del'>-		clk_put(mpu_wdt_fck);</div><div class='del'>-		mpu_wdt_ick = NULL;</div><div class='del'>-		mpu_wdt_fck = NULL;</div><div class='add'>+	if (cpu_is_omap16xx())</div><div class='add'>+		clk_disable(wdev-&gt;armwdt_ck);	/* Disable the clock */</div><div class='add'>+</div><div class='add'>+	if (cpu_is_omap24xx() || cpu_is_omap34xx()) {</div><div class='add'>+		clk_disable(wdev-&gt;mpu_wdt_ick);	/* Disable the clock */</div><div class='add'>+		clk_disable(wdev-&gt;mpu_wdt_fck);	/* Disable the clock */</div><div class='ctx'> 	}</div><div class='ctx'> #else</div><div class='ctx'> 	printk(KERN_CRIT "omap_wdt: Unexpected close, not stopping!\n");</div><div class='ctx'> #endif</div><div class='del'>-	omap_wdt_users = 0;</div><div class='add'>+	wdev-&gt;omap_wdt_users = 0;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t omap_wdt_write(struct file *file, const char __user *data,</div><div class='ctx'> 		size_t len, loff_t *ppos)</div><div class='ctx'> {</div><div class='add'>+	struct omap_wdt_dev *wdev = file-&gt;private_data;</div><div class='add'>+</div><div class='ctx'> 	/* Refresh LOAD_TIME. */</div><div class='ctx'> 	if (len) {</div><div class='ctx'> 		spin_lock(&amp;wdt_lock);</div><div class='del'>-		omap_wdt_ping();</div><div class='add'>+		omap_wdt_ping(wdev);</div><div class='ctx'> 		spin_unlock(&amp;wdt_lock);</div><div class='ctx'> 	}</div><div class='ctx'> 	return len;</div><div class='hunk'>@@ -188,6 +213,7 @@ static ssize_t omap_wdt_write(struct file *file, const char __user *data,</div><div class='ctx'> static long omap_wdt_ioctl(struct file *file, unsigned int cmd,</div><div class='ctx'> 						unsigned long arg)</div><div class='ctx'> {</div><div class='add'>+	struct omap_wdt_dev *wdev;</div><div class='ctx'> 	int new_margin;</div><div class='ctx'> 	static const struct watchdog_info ident = {</div><div class='ctx'> 		.identity = "OMAP Watchdog",</div><div class='hunk'>@@ -195,6 +221,8 @@ static long omap_wdt_ioctl(struct file *file, unsigned int cmd,</div><div class='ctx'> 		.firmware_version = 0,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	wdev = file-&gt;private_data;</div><div class='add'>+</div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case WDIOC_GETSUPPORT:</div><div class='ctx'> 		return copy_to_user((struct watchdog_info __user *)arg, &amp;ident,</div><div class='hunk'>@@ -203,14 +231,14 @@ static long omap_wdt_ioctl(struct file *file, unsigned int cmd,</div><div class='ctx'> 		return put_user(0, (int __user *)arg);</div><div class='ctx'> 	case WDIOC_GETBOOTSTATUS:</div><div class='ctx'> 		if (cpu_is_omap16xx())</div><div class='del'>-			return put_user(omap_readw(ARM_SYSST),</div><div class='add'>+			return put_user(__raw_readw(ARM_SYSST),</div><div class='ctx'> 					(int __user *)arg);</div><div class='ctx'> 		if (cpu_is_omap24xx())</div><div class='ctx'> 			return put_user(omap_prcm_get_reset_sources(),</div><div class='ctx'> 					(int __user *)arg);</div><div class='ctx'> 	case WDIOC_KEEPALIVE:</div><div class='ctx'> 		spin_lock(&amp;wdt_lock);</div><div class='del'>-		omap_wdt_ping();</div><div class='add'>+		omap_wdt_ping(wdev);</div><div class='ctx'> 		spin_unlock(&amp;wdt_lock);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	case WDIOC_SETTIMEOUT:</div><div class='hunk'>@@ -219,11 +247,11 @@ static long omap_wdt_ioctl(struct file *file, unsigned int cmd,</div><div class='ctx'> 		omap_wdt_adjust_timeout(new_margin);</div><div class='ctx'> </div><div class='ctx'> 		spin_lock(&amp;wdt_lock);</div><div class='del'>-		omap_wdt_disable();</div><div class='del'>-		omap_wdt_set_timeout();</div><div class='del'>-		omap_wdt_enable();</div><div class='add'>+		omap_wdt_disable(wdev);</div><div class='add'>+		omap_wdt_set_timeout(wdev);</div><div class='add'>+		omap_wdt_enable(wdev);</div><div class='ctx'> </div><div class='del'>-		omap_wdt_ping();</div><div class='add'>+		omap_wdt_ping(wdev);</div><div class='ctx'> 		spin_unlock(&amp;wdt_lock);</div><div class='ctx'> 		/* Fall */</div><div class='ctx'> 	case WDIOC_GETTIMEOUT:</div><div class='hunk'>@@ -241,96 +269,173 @@ static const struct file_operations omap_wdt_fops = {</div><div class='ctx'> 	.release = omap_wdt_release,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct miscdevice omap_wdt_miscdev = {</div><div class='del'>-	.minor = WATCHDOG_MINOR,</div><div class='del'>-	.name = "watchdog",</div><div class='del'>-	.fops = &amp;omap_wdt_fops,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static int __init omap_wdt_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct resource *res, *mem;</div><div class='add'>+	struct omap_wdt_dev *wdev;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/* reserve static register mappings */</div><div class='ctx'> 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='del'>-	if (!res)</div><div class='del'>-		return -ENOENT;</div><div class='add'>+	if (!res) {</div><div class='add'>+		ret = -ENOENT;</div><div class='add'>+		goto err_get_resource;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (omap_wdt_dev) {</div><div class='add'>+		ret = -EBUSY;</div><div class='add'>+		goto err_busy;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	mem = request_mem_region(res-&gt;start, res-&gt;end - res-&gt;start + 1,</div><div class='ctx'> 				 pdev-&gt;name);</div><div class='del'>-	if (mem == NULL)</div><div class='del'>-		return -EBUSY;</div><div class='add'>+	if (!mem) {</div><div class='add'>+		ret = -EBUSY;</div><div class='add'>+		goto err_busy;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	platform_set_drvdata(pdev, mem);</div><div class='add'>+	wdev = kzalloc(sizeof(struct omap_wdt_dev), GFP_KERNEL);</div><div class='add'>+	if (!wdev) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto err_kzalloc;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	omap_wdt_users = 0;</div><div class='add'>+	wdev-&gt;omap_wdt_users = 0;</div><div class='add'>+	wdev-&gt;mem = mem;</div><div class='ctx'> </div><div class='ctx'> 	if (cpu_is_omap16xx()) {</div><div class='del'>-		armwdt_ck = clk_get(&amp;pdev-&gt;dev, "armwdt_ck");</div><div class='del'>-		if (IS_ERR(armwdt_ck)) {</div><div class='del'>-			ret = PTR_ERR(armwdt_ck);</div><div class='del'>-			armwdt_ck = NULL;</div><div class='del'>-			goto fail;</div><div class='add'>+		wdev-&gt;armwdt_ck = clk_get(&amp;pdev-&gt;dev, "armwdt_ck");</div><div class='add'>+		if (IS_ERR(wdev-&gt;armwdt_ck)) {</div><div class='add'>+			ret = PTR_ERR(wdev-&gt;armwdt_ck);</div><div class='add'>+			wdev-&gt;armwdt_ck = NULL;</div><div class='add'>+			goto err_clk;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (cpu_is_omap24xx()) {</div><div class='del'>-		mpu_wdt_ick = clk_get(&amp;pdev-&gt;dev, "mpu_wdt_ick");</div><div class='del'>-		if (IS_ERR(mpu_wdt_ick)) {</div><div class='del'>-			ret = PTR_ERR(mpu_wdt_ick);</div><div class='del'>-			mpu_wdt_ick = NULL;</div><div class='del'>-			goto fail;</div><div class='add'>+		wdev-&gt;mpu_wdt_ick = clk_get(&amp;pdev-&gt;dev, "mpu_wdt_ick");</div><div class='add'>+		if (IS_ERR(wdev-&gt;mpu_wdt_ick)) {</div><div class='add'>+			ret = PTR_ERR(wdev-&gt;mpu_wdt_ick);</div><div class='add'>+			wdev-&gt;mpu_wdt_ick = NULL;</div><div class='add'>+			goto err_clk;</div><div class='ctx'> 		}</div><div class='del'>-		mpu_wdt_fck = clk_get(&amp;pdev-&gt;dev, "mpu_wdt_fck");</div><div class='del'>-		if (IS_ERR(mpu_wdt_fck)) {</div><div class='del'>-			ret = PTR_ERR(mpu_wdt_fck);</div><div class='del'>-			mpu_wdt_fck = NULL;</div><div class='del'>-			goto fail;</div><div class='add'>+		wdev-&gt;mpu_wdt_fck = clk_get(&amp;pdev-&gt;dev, "mpu_wdt_fck");</div><div class='add'>+		if (IS_ERR(wdev-&gt;mpu_wdt_fck)) {</div><div class='add'>+			ret = PTR_ERR(wdev-&gt;mpu_wdt_fck);</div><div class='add'>+			wdev-&gt;mpu_wdt_fck = NULL;</div><div class='add'>+			goto err_clk;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	omap_wdt_disable();</div><div class='add'>+	if (cpu_is_omap34xx()) {</div><div class='add'>+		wdev-&gt;mpu_wdt_ick = clk_get(&amp;pdev-&gt;dev, "wdt2_ick");</div><div class='add'>+		if (IS_ERR(wdev-&gt;mpu_wdt_ick)) {</div><div class='add'>+			ret = PTR_ERR(wdev-&gt;mpu_wdt_ick);</div><div class='add'>+			wdev-&gt;mpu_wdt_ick = NULL;</div><div class='add'>+			goto err_clk;</div><div class='add'>+		}</div><div class='add'>+		wdev-&gt;mpu_wdt_fck = clk_get(&amp;pdev-&gt;dev, "wdt2_fck");</div><div class='add'>+		if (IS_ERR(wdev-&gt;mpu_wdt_fck)) {</div><div class='add'>+			ret = PTR_ERR(wdev-&gt;mpu_wdt_fck);</div><div class='add'>+			wdev-&gt;mpu_wdt_fck = NULL;</div><div class='add'>+			goto err_clk;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	wdev-&gt;base = ioremap(res-&gt;start, res-&gt;end - res-&gt;start + 1);</div><div class='add'>+	if (!wdev-&gt;base) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto err_ioremap;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	platform_set_drvdata(pdev, wdev);</div><div class='add'>+</div><div class='add'>+	omap_wdt_disable(wdev);</div><div class='ctx'> 	omap_wdt_adjust_timeout(timer_margin);</div><div class='ctx'> </div><div class='del'>-	omap_wdt_miscdev.parent = &amp;pdev-&gt;dev;</div><div class='del'>-	ret = misc_register(&amp;omap_wdt_miscdev);</div><div class='add'>+	wdev-&gt;omap_wdt_miscdev.parent = &amp;pdev-&gt;dev;</div><div class='add'>+	wdev-&gt;omap_wdt_miscdev.minor = WATCHDOG_MINOR;</div><div class='add'>+	wdev-&gt;omap_wdt_miscdev.name = "watchdog";</div><div class='add'>+	wdev-&gt;omap_wdt_miscdev.fops = &amp;omap_wdt_fops;</div><div class='add'>+</div><div class='add'>+	ret = misc_register(&amp;(wdev-&gt;omap_wdt_miscdev));</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto fail;</div><div class='add'>+		goto err_misc;</div><div class='ctx'> </div><div class='del'>-	pr_info("OMAP Watchdog Timer: initial timeout %d sec\n", timer_margin);</div><div class='add'>+	pr_info("OMAP Watchdog Timer Rev 0x%02x: initial timeout %d sec\n",</div><div class='add'>+		__raw_readl(wdev-&gt;base + OMAP_WATCHDOG_REV) &amp; 0xFF,</div><div class='add'>+		timer_margin);</div><div class='ctx'> </div><div class='ctx'> 	/* autogate OCP interface clock */</div><div class='del'>-	omap_writel(0x01, OMAP_WATCHDOG_SYS_CONFIG);</div><div class='add'>+	__raw_writel(0x01, wdev-&gt;base + OMAP_WATCHDOG_SYS_CONFIG);</div><div class='add'>+</div><div class='add'>+	omap_wdt_dev = pdev;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>-fail:</div><div class='del'>-	if (armwdt_ck)</div><div class='del'>-		clk_put(armwdt_ck);</div><div class='del'>-	if (mpu_wdt_ick)</div><div class='del'>-		clk_put(mpu_wdt_ick);</div><div class='del'>-	if (mpu_wdt_fck)</div><div class='del'>-		clk_put(mpu_wdt_fck);</div><div class='del'>-	release_resource(mem);</div><div class='add'>+err_misc:</div><div class='add'>+	platform_set_drvdata(pdev, NULL);</div><div class='add'>+	iounmap(wdev-&gt;base);</div><div class='add'>+</div><div class='add'>+err_ioremap:</div><div class='add'>+	wdev-&gt;base = NULL;</div><div class='add'>+</div><div class='add'>+err_clk:</div><div class='add'>+	if (wdev-&gt;armwdt_ck)</div><div class='add'>+		clk_put(wdev-&gt;armwdt_ck);</div><div class='add'>+	if (wdev-&gt;mpu_wdt_ick)</div><div class='add'>+		clk_put(wdev-&gt;mpu_wdt_ick);</div><div class='add'>+	if (wdev-&gt;mpu_wdt_fck)</div><div class='add'>+		clk_put(wdev-&gt;mpu_wdt_fck);</div><div class='add'>+	kfree(wdev);</div><div class='add'>+</div><div class='add'>+err_kzalloc:</div><div class='add'>+	release_mem_region(res-&gt;start, res-&gt;end - res-&gt;start + 1);</div><div class='add'>+</div><div class='add'>+err_busy:</div><div class='add'>+err_get_resource:</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void omap_wdt_shutdown(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='del'>-	omap_wdt_disable();</div><div class='add'>+	struct omap_wdt_dev *wdev = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	if (wdev-&gt;omap_wdt_users)</div><div class='add'>+		omap_wdt_disable(wdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int omap_wdt_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='del'>-	struct resource *mem = platform_get_drvdata(pdev);</div><div class='del'>-	misc_deregister(&amp;omap_wdt_miscdev);</div><div class='del'>-	release_resource(mem);</div><div class='del'>-	if (armwdt_ck)</div><div class='del'>-		clk_put(armwdt_ck);</div><div class='del'>-	if (mpu_wdt_ick)</div><div class='del'>-		clk_put(mpu_wdt_ick);</div><div class='del'>-	if (mpu_wdt_fck)</div><div class='del'>-		clk_put(mpu_wdt_fck);</div><div class='add'>+	struct omap_wdt_dev *wdev = platform_get_drvdata(pdev);</div><div class='add'>+	struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='add'>+</div><div class='add'>+	if (!res)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	misc_deregister(&amp;(wdev-&gt;omap_wdt_miscdev));</div><div class='add'>+	release_mem_region(res-&gt;start, res-&gt;end - res-&gt;start + 1);</div><div class='add'>+	platform_set_drvdata(pdev, NULL);</div><div class='add'>+</div><div class='add'>+	if (wdev-&gt;armwdt_ck) {</div><div class='add'>+		clk_put(wdev-&gt;armwdt_ck);</div><div class='add'>+		wdev-&gt;armwdt_ck = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (wdev-&gt;mpu_wdt_ick) {</div><div class='add'>+		clk_put(wdev-&gt;mpu_wdt_ick);</div><div class='add'>+		wdev-&gt;mpu_wdt_ick = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (wdev-&gt;mpu_wdt_fck) {</div><div class='add'>+		clk_put(wdev-&gt;mpu_wdt_fck);</div><div class='add'>+		wdev-&gt;mpu_wdt_fck = NULL;</div><div class='add'>+	}</div><div class='add'>+	iounmap(wdev-&gt;base);</div><div class='add'>+</div><div class='add'>+	kfree(wdev);</div><div class='add'>+	omap_wdt_dev = NULL;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -344,17 +449,23 @@ static int omap_wdt_remove(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> static int omap_wdt_suspend(struct platform_device *pdev, pm_message_t state)</div><div class='ctx'> {</div><div class='del'>-	if (omap_wdt_users)</div><div class='del'>-		omap_wdt_disable();</div><div class='add'>+	struct omap_wdt_dev *wdev = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	if (wdev-&gt;omap_wdt_users)</div><div class='add'>+		omap_wdt_disable(wdev);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int omap_wdt_resume(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='del'>-	if (omap_wdt_users) {</div><div class='del'>-		omap_wdt_enable();</div><div class='del'>-		omap_wdt_ping();</div><div class='add'>+	struct omap_wdt_dev *wdev = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	if (wdev-&gt;omap_wdt_users) {</div><div class='add'>+		omap_wdt_enable(wdev);</div><div class='add'>+		omap_wdt_ping(wdev);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/watchdog/omap_wdt.h b/drivers/watchdog/omap_wdt.h<br/>index 52a532a5114a..fc02ec6a0386 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/watchdog/omap_wdt.h?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/watchdog/omap_wdt.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/watchdog/omap_wdt.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/watchdog/omap_wdt.h</a></div><div class='hunk'>@@ -30,25 +30,15 @@</div><div class='ctx'> #ifndef _OMAP_WATCHDOG_H</div><div class='ctx'> #define _OMAP_WATCHDOG_H</div><div class='ctx'> </div><div class='del'>-#define OMAP1610_WATCHDOG_BASE		0xfffeb000</div><div class='del'>-#define OMAP2420_WATCHDOG_BASE		0x48022000	/*WDT Timer 2 */</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_ARCH_OMAP24XX</div><div class='del'>-#define OMAP_WATCHDOG_BASE 		OMAP2420_WATCHDOG_BASE</div><div class='del'>-#else</div><div class='del'>-#define OMAP_WATCHDOG_BASE 		OMAP1610_WATCHDOG_BASE</div><div class='del'>-#define RM_RSTST_WKUP			0</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define OMAP_WATCHDOG_REV		(OMAP_WATCHDOG_BASE + 0x00)</div><div class='del'>-#define OMAP_WATCHDOG_SYS_CONFIG	(OMAP_WATCHDOG_BASE + 0x10)</div><div class='del'>-#define OMAP_WATCHDOG_STATUS		(OMAP_WATCHDOG_BASE + 0x14)</div><div class='del'>-#define OMAP_WATCHDOG_CNTRL		(OMAP_WATCHDOG_BASE + 0x24)</div><div class='del'>-#define OMAP_WATCHDOG_CRR		(OMAP_WATCHDOG_BASE + 0x28)</div><div class='del'>-#define OMAP_WATCHDOG_LDR		(OMAP_WATCHDOG_BASE + 0x2c)</div><div class='del'>-#define OMAP_WATCHDOG_TGR		(OMAP_WATCHDOG_BASE + 0x30)</div><div class='del'>-#define OMAP_WATCHDOG_WPS		(OMAP_WATCHDOG_BASE + 0x34)</div><div class='del'>-#define OMAP_WATCHDOG_SPR		(OMAP_WATCHDOG_BASE + 0x48)</div><div class='add'>+#define OMAP_WATCHDOG_REV		(0x00)</div><div class='add'>+#define OMAP_WATCHDOG_SYS_CONFIG	(0x10)</div><div class='add'>+#define OMAP_WATCHDOG_STATUS		(0x14)</div><div class='add'>+#define OMAP_WATCHDOG_CNTRL		(0x24)</div><div class='add'>+#define OMAP_WATCHDOG_CRR		(0x28)</div><div class='add'>+#define OMAP_WATCHDOG_LDR		(0x2c)</div><div class='add'>+#define OMAP_WATCHDOG_TGR		(0x30)</div><div class='add'>+#define OMAP_WATCHDOG_WPS		(0x34)</div><div class='add'>+#define OMAP_WATCHDOG_SPR		(0x48)</div><div class='ctx'> </div><div class='ctx'> /* Using the prescaler, the OMAP watchdog could go for many</div><div class='ctx'>  * months before firing.  These limits work without scaling,</div><div class='head'>diff --git a/drivers/watchdog/orion5x_wdt.c b/drivers/watchdog/orion5x_wdt.c<br/>new file mode 100644<br/>index 000000000000..14a339f58b6a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/watchdog/orion5x_wdt.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/watchdog/orion5x_wdt.c</a></div><div class='hunk'>@@ -0,0 +1,245 @@</div><div class='add'>+/*</div><div class='add'>+ * drivers/watchdog/orion5x_wdt.c</div><div class='add'>+ *</div><div class='add'>+ * Watchdog driver for Orion5x processors</div><div class='add'>+ *</div><div class='add'>+ * Author: Sylver Bruneau &lt;sylver.bruneau@googlemail.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file is licensed under  the terms of the GNU General Public</div><div class='add'>+ * License version 2. This program is licensed "as is" without any</div><div class='add'>+ * warranty of any kind, whether express or implied.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/miscdevice.h&gt;</div><div class='add'>+#include &lt;linux/watchdog.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Watchdog timer block registers.</div><div class='add'>+ */</div><div class='add'>+#define TIMER_CTRL		(TIMER_VIRT_BASE + 0x0000)</div><div class='add'>+#define  WDT_EN			0x0010</div><div class='add'>+#define WDT_VAL			(TIMER_VIRT_BASE + 0x0024)</div><div class='add'>+</div><div class='add'>+#define WDT_MAX_DURATION	(0xffffffff / ORION5X_TCLK)</div><div class='add'>+#define WDT_IN_USE		0</div><div class='add'>+#define WDT_OK_TO_CLOSE		1</div><div class='add'>+</div><div class='add'>+static int nowayout = WATCHDOG_NOWAYOUT;</div><div class='add'>+static int heartbeat =  WDT_MAX_DURATION;	/* (seconds) */</div><div class='add'>+static unsigned long wdt_status;</div><div class='add'>+static spinlock_t wdt_lock;</div><div class='add'>+</div><div class='add'>+static void wdt_enable(void)</div><div class='add'>+{</div><div class='add'>+	u32 reg;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;wdt_lock);</div><div class='add'>+</div><div class='add'>+	/* Set watchdog duration */</div><div class='add'>+	writel(ORION5X_TCLK * heartbeat, WDT_VAL);</div><div class='add'>+</div><div class='add'>+	/* Clear watchdog timer interrupt */</div><div class='add'>+	reg = readl(BRIDGE_CAUSE);</div><div class='add'>+	reg &amp;= ~WDT_INT_REQ;</div><div class='add'>+	writel(reg, BRIDGE_CAUSE);</div><div class='add'>+</div><div class='add'>+	/* Enable watchdog timer */</div><div class='add'>+	reg = readl(TIMER_CTRL);</div><div class='add'>+	reg |= WDT_EN;</div><div class='add'>+	writel(reg, TIMER_CTRL);</div><div class='add'>+</div><div class='add'>+	/* Enable reset on watchdog */</div><div class='add'>+	reg = readl(CPU_RESET_MASK);</div><div class='add'>+	reg |= WDT_RESET;</div><div class='add'>+	writel(reg, CPU_RESET_MASK);</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;wdt_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void wdt_disable(void)</div><div class='add'>+{</div><div class='add'>+	u32 reg;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;wdt_lock);</div><div class='add'>+</div><div class='add'>+	/* Disable reset on watchdog */</div><div class='add'>+	reg = readl(CPU_RESET_MASK);</div><div class='add'>+	reg &amp;= ~WDT_RESET;</div><div class='add'>+	writel(reg, CPU_RESET_MASK);</div><div class='add'>+</div><div class='add'>+	/* Disable watchdog timer */</div><div class='add'>+	reg = readl(TIMER_CTRL);</div><div class='add'>+	reg &amp;= ~WDT_EN;</div><div class='add'>+	writel(reg, TIMER_CTRL);</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;wdt_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int orion5x_wdt_get_timeleft(int *time_left)</div><div class='add'>+{</div><div class='add'>+	spin_lock(&amp;wdt_lock);</div><div class='add'>+	*time_left = readl(WDT_VAL) / ORION5X_TCLK;</div><div class='add'>+	spin_unlock(&amp;wdt_lock);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int orion5x_wdt_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	if (test_and_set_bit(WDT_IN_USE, &amp;wdt_status))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	clear_bit(WDT_OK_TO_CLOSE, &amp;wdt_status);</div><div class='add'>+	wdt_enable();</div><div class='add'>+	return nonseekable_open(inode, file);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t orion5x_wdt_write(struct file *file, const char *data,</div><div class='add'>+					size_t len, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	if (len) {</div><div class='add'>+		if (!nowayout) {</div><div class='add'>+			size_t i;</div><div class='add'>+</div><div class='add'>+			clear_bit(WDT_OK_TO_CLOSE, &amp;wdt_status);</div><div class='add'>+			for (i = 0; i != len; i++) {</div><div class='add'>+				char c;</div><div class='add'>+</div><div class='add'>+				if (get_user(c, data + i))</div><div class='add'>+					return -EFAULT;</div><div class='add'>+				if (c == 'V')</div><div class='add'>+					set_bit(WDT_OK_TO_CLOSE, &amp;wdt_status);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		wdt_enable();</div><div class='add'>+	}</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct watchdog_info ident = {</div><div class='add'>+	.options	= WDIOF_MAGICCLOSE | WDIOF_SETTIMEOUT |</div><div class='add'>+			  WDIOF_KEEPALIVEPING,</div><div class='add'>+	.identity	= "Orion5x Watchdog",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static long orion5x_wdt_ioctl(struct file *file, unsigned int cmd,</div><div class='add'>+				unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	int ret = -ENOTTY;</div><div class='add'>+	int time;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case WDIOC_GETSUPPORT:</div><div class='add'>+		ret = copy_to_user((struct watchdog_info *)arg, &amp;ident,</div><div class='add'>+				   sizeof(ident)) ? -EFAULT : 0;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case WDIOC_GETSTATUS:</div><div class='add'>+	case WDIOC_GETBOOTSTATUS:</div><div class='add'>+		ret = put_user(0, (int *)arg);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case WDIOC_KEEPALIVE:</div><div class='add'>+		wdt_enable();</div><div class='add'>+		ret = 0;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case WDIOC_SETTIMEOUT:</div><div class='add'>+		ret = get_user(time, (int *)arg);</div><div class='add'>+		if (ret)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (time &lt;= 0 || time &gt; WDT_MAX_DURATION) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		heartbeat = time;</div><div class='add'>+		wdt_enable();</div><div class='add'>+		/* Fall through */</div><div class='add'>+</div><div class='add'>+	case WDIOC_GETTIMEOUT:</div><div class='add'>+		ret = put_user(heartbeat, (int *)arg);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case WDIOC_GETTIMELEFT:</div><div class='add'>+		if (orion5x_wdt_get_timeleft(&amp;time)) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		ret = put_user(time, (int *)arg);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int orion5x_wdt_release(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	if (test_bit(WDT_OK_TO_CLOSE, &amp;wdt_status))</div><div class='add'>+		wdt_disable();</div><div class='add'>+	else</div><div class='add'>+		printk(KERN_CRIT "WATCHDOG: Device closed unexpectedly - "</div><div class='add'>+					"timer will not stop\n");</div><div class='add'>+	clear_bit(WDT_IN_USE, &amp;wdt_status);</div><div class='add'>+	clear_bit(WDT_OK_TO_CLOSE, &amp;wdt_status);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static const struct file_operations orion5x_wdt_fops = {</div><div class='add'>+	.owner		= THIS_MODULE,</div><div class='add'>+	.llseek		= no_llseek,</div><div class='add'>+	.write		= orion5x_wdt_write,</div><div class='add'>+	.unlocked_ioctl	= orion5x_wdt_ioctl,</div><div class='add'>+	.open		= orion5x_wdt_open,</div><div class='add'>+	.release	= orion5x_wdt_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct miscdevice orion5x_wdt_miscdev = {</div><div class='add'>+	.minor		= WATCHDOG_MINOR,</div><div class='add'>+	.name		= "watchdog",</div><div class='add'>+	.fops		= &amp;orion5x_wdt_fops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init orion5x_wdt_init(void)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;wdt_lock);</div><div class='add'>+</div><div class='add'>+	ret = misc_register(&amp;orion5x_wdt_miscdev);</div><div class='add'>+	if (ret == 0)</div><div class='add'>+		printk("Orion5x Watchdog Timer: heartbeat %d sec\n",</div><div class='add'>+								heartbeat);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit orion5x_wdt_exit(void)</div><div class='add'>+{</div><div class='add'>+	misc_deregister(&amp;orion5x_wdt_miscdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(orion5x_wdt_init);</div><div class='add'>+module_exit(orion5x_wdt_exit);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Sylver Bruneau &lt;sylver.bruneau@googlemail.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Orion5x Processor Watchdog");</div><div class='add'>+</div><div class='add'>+module_param(heartbeat, int, 0);</div><div class='add'>+MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat in seconds (default is "</div><div class='add'>+					__MODULE_STRING(WDT_MAX_DURATION) ")");</div><div class='add'>+</div><div class='add'>+module_param(nowayout, int, 0);</div><div class='add'>+MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started");</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);</div><div class='head'>diff --git a/drivers/sbus/char/riowatchdog.c b/drivers/watchdog/riowd.c<br/>index 88c0fc6395e1..09cb1833ea27 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/sbus/char/riowatchdog.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/sbus/char/riowatchdog.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/watchdog/riowd.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/watchdog/riowd.c</a></div><div class='hunk'>@@ -1,7 +1,6 @@</div><div class='del'>-/* $Id: riowatchdog.c,v 1.3.2.2 2002/01/23 18:48:02 davem Exp $</div><div class='del'>- * riowatchdog.c - driver for hw watchdog inside Super I/O of RIO</div><div class='add'>+/* riowd.c - driver for hw watchdog inside Super I/O of RIO</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2001 David S. Miller (davem@redhat.com)</div><div class='add'>+ * Copyright (C) 2001, 2008 David S. Miller (davem@davemloft.net)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -12,14 +11,13 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/miscdevice.h&gt;</div><div class='ctx'> #include &lt;linux/smp_lock.h&gt;</div><div class='add'>+#include &lt;linux/watchdog.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/ebus.h&gt;</div><div class='del'>-#include &lt;asm/bbc.h&gt;</div><div class='del'>-#include &lt;asm/oplib.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/watchdog.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* RIO uses the NatSemi Super I/O power management logical device</div><div class='ctx'>  * as its' watchdog.</div><div class='hunk'>@@ -45,74 +43,35 @@</div><div class='ctx'>  * The watchdog device generates no interrupts.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-MODULE_AUTHOR("David S. Miller &lt;davem@redhat.com&gt;");</div><div class='add'>+MODULE_AUTHOR("David S. Miller &lt;davem@davemloft.net&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Hardware watchdog driver for Sun RIO");</div><div class='ctx'> MODULE_SUPPORTED_DEVICE("watchdog");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='del'>-#define RIOWD_NAME	"pmc"</div><div class='del'>-#define RIOWD_MINOR	215</div><div class='add'>+#define DRIVER_NAME	"riowd"</div><div class='add'>+#define PFX		DRIVER_NAME ": "</div><div class='ctx'> </div><div class='del'>-static DEFINE_SPINLOCK(riowd_lock);</div><div class='add'>+struct riowd {</div><div class='add'>+	void __iomem		*regs;</div><div class='add'>+	spinlock_t		lock;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct riowd *riowd_device;</div><div class='ctx'> </div><div class='del'>-static void __iomem *bbc_regs;</div><div class='del'>-static void __iomem *riowd_regs;</div><div class='ctx'> #define WDTO_INDEX	0x05</div><div class='ctx'> </div><div class='ctx'> static int riowd_timeout = 1;		/* in minutes */</div><div class='ctx'> module_param(riowd_timeout, int, 0);</div><div class='ctx'> MODULE_PARM_DESC(riowd_timeout, "Watchdog timeout in minutes");</div><div class='ctx'> </div><div class='del'>-#if 0 /* Currently unused. */</div><div class='del'>-static u8 riowd_readreg(int index)</div><div class='add'>+static void riowd_writereg(struct riowd *p, u8 val, int index)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	u8 ret;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;riowd_lock, flags);</div><div class='del'>-	writeb(index, riowd_regs + 0);</div><div class='del'>-	ret = readb(riowd_regs + 1);</div><div class='del'>-	spin_unlock_irqrestore(&amp;riowd_lock, flags);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static void riowd_writereg(u8 val, int index)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;riowd_lock, flags);</div><div class='del'>-	writeb(index, riowd_regs + 0);</div><div class='del'>-	writeb(val, riowd_regs + 1);</div><div class='del'>-	spin_unlock_irqrestore(&amp;riowd_lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void riowd_pingtimer(void)</div><div class='del'>-{</div><div class='del'>-	riowd_writereg(riowd_timeout, WDTO_INDEX);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void riowd_stoptimer(void)</div><div class='del'>-{</div><div class='del'>-	u8 val;</div><div class='del'>-</div><div class='del'>-	riowd_writereg(0, WDTO_INDEX);</div><div class='del'>-</div><div class='del'>-	val = readb(bbc_regs + BBC_WDACTION);</div><div class='del'>-	val &amp;= ~BBC_WDACTION_RST;</div><div class='del'>-	writeb(val, bbc_regs + BBC_WDACTION);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void riowd_starttimer(void)</div><div class='del'>-{</div><div class='del'>-	u8 val;</div><div class='del'>-</div><div class='del'>-	riowd_writereg(riowd_timeout, WDTO_INDEX);</div><div class='del'>-</div><div class='del'>-	val = readb(bbc_regs + BBC_WDACTION);</div><div class='del'>-	val |= BBC_WDACTION_RST;</div><div class='del'>-	writeb(val, bbc_regs + BBC_WDACTION);</div><div class='add'>+	spin_lock_irqsave(&amp;p-&gt;lock, flags);</div><div class='add'>+	writeb(index, p-&gt;regs + 0);</div><div class='add'>+	writeb(val, p-&gt;regs + 1);</div><div class='add'>+	spin_unlock_irqrestore(&amp;p-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int riowd_open(struct inode *inode, struct file *filp)</div><div class='hunk'>@@ -131,9 +90,12 @@ static int riowd_ioctl(struct inode *inode, struct file *filp,</div><div class='ctx'> 		       unsigned int cmd, unsigned long arg)</div><div class='ctx'> {</div><div class='ctx'> 	static struct watchdog_info info = {</div><div class='del'>-	       	WDIOF_SETTIMEOUT, 0, "Natl. Semiconductor PC97317"</div><div class='add'>+		.options		= WDIOF_SETTIMEOUT,</div><div class='add'>+		.firmware_version	= 1,</div><div class='add'>+		.identity		= DRIVER_NAME,</div><div class='ctx'> 	};</div><div class='ctx'> 	void __user *argp = (void __user *)arg;</div><div class='add'>+	struct riowd *p = riowd_device;</div><div class='ctx'> 	unsigned int options;</div><div class='ctx'> 	int new_margin;</div><div class='ctx'> </div><div class='hunk'>@@ -150,7 +112,7 @@ static int riowd_ioctl(struct inode *inode, struct file *filp,</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case WDIOC_KEEPALIVE:</div><div class='del'>-		riowd_pingtimer();</div><div class='add'>+		riowd_writereg(p, riowd_timeout, WDTO_INDEX);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case WDIOC_SETOPTIONS:</div><div class='hunk'>@@ -158,9 +120,9 @@ static int riowd_ioctl(struct inode *inode, struct file *filp,</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 		if (options &amp; WDIOS_DISABLECARD)</div><div class='del'>-			riowd_stoptimer();</div><div class='add'>+			riowd_writereg(p, 0, WDTO_INDEX);</div><div class='ctx'> 		else if (options &amp; WDIOS_ENABLECARD)</div><div class='del'>-			riowd_starttimer();</div><div class='add'>+			riowd_writereg(p, riowd_timeout, WDTO_INDEX);</div><div class='ctx'> 		else</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='hunk'>@@ -170,9 +132,9 @@ static int riowd_ioctl(struct inode *inode, struct file *filp,</div><div class='ctx'> 		if (get_user(new_margin, (int __user *)argp))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		if ((new_margin &lt; 60) || (new_margin &gt; (255 * 60)))</div><div class='del'>-		    return -EINVAL;</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 		riowd_timeout = (new_margin + 59) / 60;</div><div class='del'>-		riowd_pingtimer();</div><div class='add'>+		riowd_writereg(p, riowd_timeout, WDTO_INDEX);</div><div class='ctx'> 		/* Fall */</div><div class='ctx'> </div><div class='ctx'> 	case WDIOC_GETTIMEOUT:</div><div class='hunk'>@@ -187,8 +149,10 @@ static int riowd_ioctl(struct inode *inode, struct file *filp,</div><div class='ctx'> </div><div class='ctx'> static ssize_t riowd_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos)</div><div class='ctx'> {</div><div class='add'>+	struct riowd *p = riowd_device;</div><div class='add'>+</div><div class='ctx'> 	if (count) {</div><div class='del'>-		riowd_pingtimer();</div><div class='add'>+		riowd_writereg(p, riowd_timeout, WDTO_INDEX);</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -197,99 +161,99 @@ static ssize_t riowd_write(struct file *file, const char __user *buf, size_t cou</div><div class='ctx'> </div><div class='ctx'> static const struct file_operations riowd_fops = {</div><div class='ctx'> 	.owner =	THIS_MODULE,</div><div class='add'>+	.llseek =	no_llseek,</div><div class='ctx'> 	.ioctl =	riowd_ioctl,</div><div class='ctx'> 	.open =		riowd_open,</div><div class='ctx'> 	.write =	riowd_write,</div><div class='ctx'> 	.release =	riowd_release,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct miscdevice riowd_miscdev = { RIOWD_MINOR, RIOWD_NAME, &amp;riowd_fops };</div><div class='add'>+static struct miscdevice riowd_miscdev = {</div><div class='add'>+	.minor	= WATCHDOG_MINOR,</div><div class='add'>+	.name	= "watchdog",</div><div class='add'>+	.fops	= &amp;riowd_fops</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-static int __init riowd_bbc_init(void)</div><div class='add'>+static int __devinit riowd_probe(struct of_device *op,</div><div class='add'>+				 const struct of_device_id *match)</div><div class='ctx'> {</div><div class='del'>-	struct 	linux_ebus *ebus = NULL;</div><div class='del'>-	struct 	linux_ebus_device *edev = NULL;</div><div class='del'>-	u8 val;</div><div class='del'>-</div><div class='del'>-	for_each_ebus(ebus) {</div><div class='del'>-		for_each_ebusdev(edev, ebus) {</div><div class='del'>-			if (!strcmp(edev-&gt;ofdev.node-&gt;name, "bbc"))</div><div class='del'>-				goto found_bbc;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	struct riowd *p;</div><div class='add'>+	int err = -EINVAL;</div><div class='ctx'> </div><div class='del'>-found_bbc:</div><div class='del'>-	if (!edev)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	bbc_regs = ioremap(edev-&gt;resource[0].start, BBC_REGS_SIZE);</div><div class='del'>-	if (!bbc_regs)</div><div class='del'>-		return -ENODEV;</div><div class='add'>+	if (riowd_device)</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='del'>-	/* Turn it off. */</div><div class='del'>-	val = readb(bbc_regs + BBC_WDACTION);</div><div class='del'>-	val &amp;= ~BBC_WDACTION_RST;</div><div class='del'>-	writeb(val, bbc_regs + BBC_WDACTION);</div><div class='add'>+	err = -ENOMEM;</div><div class='add'>+	p = kzalloc(sizeof(*p), GFP_KERNEL);</div><div class='add'>+	if (!p)</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='add'>+	spin_lock_init(&amp;p-&gt;lock);</div><div class='ctx'> </div><div class='del'>-static int __init riowd_init(void)</div><div class='del'>-{</div><div class='del'>-	struct 	linux_ebus *ebus = NULL;</div><div class='del'>-	struct 	linux_ebus_device *edev = NULL;</div><div class='del'>-</div><div class='del'>-	for_each_ebus(ebus) {</div><div class='del'>-		for_each_ebusdev(edev, ebus) {</div><div class='del'>-			if (!strcmp(edev-&gt;ofdev.node-&gt;name, RIOWD_NAME))</div><div class='del'>-				goto ebus_done;</div><div class='del'>-		}</div><div class='add'>+	p-&gt;regs = of_ioremap(&amp;op-&gt;resource[0], 0, 2, DRIVER_NAME);</div><div class='add'>+	if (!p-&gt;regs) {</div><div class='add'>+		printk(KERN_ERR PFX "Cannot map registers.\n");</div><div class='add'>+		goto out_free;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-ebus_done:</div><div class='del'>-	if (!edev)</div><div class='del'>-		goto fail;</div><div class='del'>-</div><div class='del'>-	riowd_regs = ioremap(edev-&gt;resource[0].start, 2);</div><div class='del'>-	if (riowd_regs == NULL) {</div><div class='del'>-		printk(KERN_ERR "pmc: Cannot map registers.\n");</div><div class='del'>-		return -ENODEV;</div><div class='add'>+	err = misc_register(&amp;riowd_miscdev);</div><div class='add'>+	if (err) {</div><div class='add'>+		printk(KERN_ERR PFX "Cannot register watchdog misc device.\n");</div><div class='add'>+		goto out_iounmap;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (riowd_bbc_init()) {</div><div class='del'>-		printk(KERN_ERR "pmc: Failure initializing BBC config.\n");</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='add'>+	printk(KERN_INFO PFX "Hardware watchdog [%i minutes], "</div><div class='add'>+	       "regs at %p\n", riowd_timeout, p-&gt;regs);</div><div class='ctx'> </div><div class='del'>-	if (misc_register(&amp;riowd_miscdev)) {</div><div class='del'>-		printk(KERN_ERR "pmc: Cannot register watchdog misc device.\n");</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='add'>+	dev_set_drvdata(&amp;op-&gt;dev, p);</div><div class='add'>+	riowd_device = p;</div><div class='add'>+	err = 0;</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "pmc: Hardware watchdog [%i minutes], "</div><div class='del'>-	       "regs at %p\n", riowd_timeout, riowd_regs);</div><div class='add'>+out_iounmap:</div><div class='add'>+	of_iounmap(&amp;op-&gt;resource[0], p-&gt;regs, 2);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+out_free:</div><div class='add'>+	kfree(p);</div><div class='ctx'> </div><div class='del'>-fail:</div><div class='del'>-	if (riowd_regs) {</div><div class='del'>-		iounmap(riowd_regs);</div><div class='del'>-		riowd_regs = NULL;</div><div class='del'>-	}</div><div class='del'>-	if (bbc_regs) {</div><div class='del'>-		iounmap(bbc_regs);</div><div class='del'>-		bbc_regs = NULL;</div><div class='del'>-	}</div><div class='del'>-	return -ENODEV;</div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __exit riowd_cleanup(void)</div><div class='add'>+static int __devexit riowd_remove(struct of_device *op)</div><div class='ctx'> {</div><div class='add'>+	struct riowd *p = dev_get_drvdata(&amp;op-&gt;dev);</div><div class='add'>+</div><div class='ctx'> 	misc_deregister(&amp;riowd_miscdev);</div><div class='del'>-	iounmap(riowd_regs);</div><div class='del'>-	riowd_regs = NULL;</div><div class='del'>-	iounmap(bbc_regs);</div><div class='del'>-	bbc_regs = NULL;</div><div class='add'>+	of_iounmap(&amp;op-&gt;resource[0], p-&gt;regs, 2);</div><div class='add'>+	kfree(p);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct of_device_id riowd_match[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "pmc",</div><div class='add'>+	},</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, riowd_match);</div><div class='add'>+</div><div class='add'>+static struct of_platform_driver riowd_driver = {</div><div class='add'>+	.name		= DRIVER_NAME,</div><div class='add'>+	.match_table	= riowd_match,</div><div class='add'>+	.probe		= riowd_probe,</div><div class='add'>+	.remove		= __devexit_p(riowd_remove),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init riowd_init(void)</div><div class='add'>+{</div><div class='add'>+	return of_register_driver(&amp;riowd_driver, &amp;of_bus_type);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit riowd_exit(void)</div><div class='add'>+{</div><div class='add'>+	of_unregister_driver(&amp;riowd_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(riowd_init);</div><div class='del'>-module_exit(riowd_cleanup);</div><div class='add'>+module_exit(riowd_exit);</div><div class='head'>diff --git a/drivers/watchdog/w83697ug_wdt.c b/drivers/watchdog/w83697ug_wdt.c<br/>new file mode 100644<br/>index 000000000000..c73b5e2919c6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/watchdog/w83697ug_wdt.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/watchdog/w83697ug_wdt.c</a></div><div class='hunk'>@@ -0,0 +1,392 @@</div><div class='add'>+/*</div><div class='add'>+ *	w83697ug/uf WDT driver</div><div class='add'>+ *</div><div class='add'>+ *	(c) Copyright 2008 Flemming Fransen &lt;ff@nrvissing.net&gt;</div><div class='add'>+ *              reused original code to supoprt w83697ug/uf.</div><div class='add'>+ *</div><div class='add'>+ *	Based on w83627hf_wdt.c which is based on advantechwdt.c</div><div class='add'>+ *	which is based on wdt.c.</div><div class='add'>+ *	Original copyright messages:</div><div class='add'>+ *</div><div class='add'>+ *	(c) Copyright 2007 Vlad Drukker &lt;vlad@storewiz.com&gt;</div><div class='add'>+ *		added support for W83627THF.</div><div class='add'>+ *</div><div class='add'>+ *	(c) Copyright 2003 Pádraig Brady &lt;P@draigBrady.com&gt;</div><div class='add'>+ *</div><div class='add'>+ *	(c) Copyright 2000-2001 Marek Michalkiewicz &lt;marekm@linux.org.pl&gt;</div><div class='add'>+ *</div><div class='add'>+ *	(c) Copyright 1996 Alan Cox &lt;alan@redhat.com&gt;, All Rights Reserved.</div><div class='add'>+ *				http://www.redhat.com</div><div class='add'>+ *</div><div class='add'>+ *	This program is free software; you can redistribute it and/or</div><div class='add'>+ *	modify it under the terms of the GNU General Public License</div><div class='add'>+ *	as published by the Free Software Foundation; either version</div><div class='add'>+ *	2 of the License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *	Neither Alan Cox nor CymruNet Ltd. admit liability nor provide</div><div class='add'>+ *	warranty for any of this software. This material is provided</div><div class='add'>+ *	"AS-IS" and at no charge.</div><div class='add'>+ *</div><div class='add'>+ *	(c) Copyright 1995    Alan Cox &lt;alan@redhat.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/miscdevice.h&gt;</div><div class='add'>+#include &lt;linux/watchdog.h&gt;</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/ioport.h&gt;</div><div class='add'>+#include &lt;linux/notifier.h&gt;</div><div class='add'>+#include &lt;linux/reboot.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/system.h&gt;</div><div class='add'>+</div><div class='add'>+#define WATCHDOG_NAME "w83697ug/uf WDT"</div><div class='add'>+#define PFX WATCHDOG_NAME ": "</div><div class='add'>+#define WATCHDOG_TIMEOUT 60		/* 60 sec default timeout */</div><div class='add'>+</div><div class='add'>+static unsigned long wdt_is_open;</div><div class='add'>+static char expect_close;</div><div class='add'>+static DEFINE_SPINLOCK(io_lock);</div><div class='add'>+</div><div class='add'>+static int wdt_io = 0x2e;</div><div class='add'>+module_param(wdt_io, int, 0);</div><div class='add'>+MODULE_PARM_DESC(wdt_io, "w83697ug/uf WDT io port (default 0x2e)");</div><div class='add'>+</div><div class='add'>+static int timeout = WATCHDOG_TIMEOUT;	/* in seconds */</div><div class='add'>+module_param(timeout, int, 0);</div><div class='add'>+MODULE_PARM_DESC(timeout,</div><div class='add'>+	"Watchdog timeout in seconds. 1&lt;= timeout &lt;=255 (default="</div><div class='add'>+				__MODULE_STRING(WATCHDOG_TIMEOUT) ")");</div><div class='add'>+</div><div class='add'>+static int nowayout = WATCHDOG_NOWAYOUT;</div><div class='add'>+module_param(nowayout, int, 0);</div><div class='add'>+MODULE_PARM_DESC(nowayout,</div><div class='add'>+	"Watchdog cannot be stopped once started (default="</div><div class='add'>+				__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *	Kernel methods.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define WDT_EFER (wdt_io+0)   /* Extended Function Enable Registers */</div><div class='add'>+#define WDT_EFIR (wdt_io+0)   /* Extended Function Index Register</div><div class='add'>+							(same as EFER) */</div><div class='add'>+#define WDT_EFDR (WDT_EFIR+1) /* Extended Function Data Register */</div><div class='add'>+</div><div class='add'>+static void w83697ug_select_wd_register(void)</div><div class='add'>+{</div><div class='add'>+	unsigned char c;</div><div class='add'>+	unsigned char version;</div><div class='add'>+</div><div class='add'>+	outb_p(0x87, WDT_EFER); /* Enter extended function mode */</div><div class='add'>+	outb_p(0x87, WDT_EFER); /* Again according to manual */</div><div class='add'>+</div><div class='add'>+	outb(0x20, WDT_EFER); 	/* check chip version	*/</div><div class='add'>+	version = inb(WDT_EFDR);</div><div class='add'>+</div><div class='add'>+	if (version == 0x68) {	/* W83697UG 		*/</div><div class='add'>+		printk(KERN_INFO PFX "Watchdog chip version 0x%02x = "</div><div class='add'>+			"W83697UG/UF found at 0x%04x\n", version, wdt_io);</div><div class='add'>+</div><div class='add'>+		outb_p(0x2b, WDT_EFER);</div><div class='add'>+		c = inb_p(WDT_EFDR);    /* select WDT0 */</div><div class='add'>+		c &amp;= ~0x04;</div><div class='add'>+		outb_p(0x2b, WDT_EFER);</div><div class='add'>+		outb_p(c, WDT_EFDR);	/* set pin118 to WDT0 */</div><div class='add'>+</div><div class='add'>+	} else {</div><div class='add'>+		printk(KERN_ERR PFX "No W83697UG/UF could be found\n");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	outb_p(0x07, WDT_EFER); /* point to logical device number reg */</div><div class='add'>+	outb_p(0x08, WDT_EFDR); /* select logical device 8 (GPIO2) */</div><div class='add'>+	outb_p(0x30, WDT_EFER); /* select CR30 */</div><div class='add'>+	c = inb_p(WDT_EFDR);</div><div class='add'>+	outb_p(c || 0x01, WDT_EFDR); /* set bit 0 to activate GPIO2 */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void w83697ug_unselect_wd_register(void)</div><div class='add'>+{</div><div class='add'>+	outb_p(0xAA, WDT_EFER); /* Leave extended function mode */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void w83697ug_init(void)</div><div class='add'>+{</div><div class='add'>+	unsigned char t;</div><div class='add'>+</div><div class='add'>+	w83697ug_select_wd_register();</div><div class='add'>+</div><div class='add'>+	outb_p(0xF6, WDT_EFER); /* Select CRF6 */</div><div class='add'>+	t = inb_p(WDT_EFDR);    /* read CRF6 */</div><div class='add'>+	if (t != 0) {</div><div class='add'>+		printk(KERN_INFO PFX "Watchdog already running."</div><div class='add'>+			" Resetting timeout to %d sec\n", timeout);</div><div class='add'>+		outb_p(timeout, WDT_EFDR);    /* Write back to CRF6 */</div><div class='add'>+	}</div><div class='add'>+	outb_p(0xF5, WDT_EFER); /* Select CRF5 */</div><div class='add'>+	t = inb_p(WDT_EFDR);    /* read CRF5 */</div><div class='add'>+	t &amp;= ~0x0C;             /* set second mode &amp;</div><div class='add'>+					disable keyboard turning off watchdog */</div><div class='add'>+	outb_p(t, WDT_EFDR);    /* Write back to CRF5 */</div><div class='add'>+</div><div class='add'>+	w83697ug_unselect_wd_register();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void wdt_ctrl(int timeout)</div><div class='add'>+{</div><div class='add'>+	spin_lock(&amp;io_lock);</div><div class='add'>+</div><div class='add'>+	w83697ug_select_wd_register();</div><div class='add'>+</div><div class='add'>+	outb_p(0xF4, WDT_EFER);    /* Select CRF4 */</div><div class='add'>+	outb_p(timeout, WDT_EFDR); /* Write Timeout counter to CRF4 */</div><div class='add'>+</div><div class='add'>+	w83697ug_unselect_wd_register();</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;io_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wdt_ping(void)</div><div class='add'>+{</div><div class='add'>+	wdt_ctrl(timeout);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wdt_disable(void)</div><div class='add'>+{</div><div class='add'>+	wdt_ctrl(0);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wdt_set_heartbeat(int t)</div><div class='add'>+{</div><div class='add'>+	if (t &lt; 1 || t &gt; 255)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	timeout = t;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t wdt_write(struct file *file, const char __user *buf,</div><div class='add'>+						size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	if (count) {</div><div class='add'>+		if (!nowayout) {</div><div class='add'>+			size_t i;</div><div class='add'>+</div><div class='add'>+			expect_close = 0;</div><div class='add'>+</div><div class='add'>+			for (i = 0; i != count; i++) {</div><div class='add'>+				char c;</div><div class='add'>+				if (get_user(c, buf + i))</div><div class='add'>+					return -EFAULT;</div><div class='add'>+				if (c == 'V')</div><div class='add'>+					expect_close = 42;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		wdt_ping();</div><div class='add'>+	}</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long wdt_ioctl(struct file *file, unsigned int cmd, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	void __user *argp = (void __user *)arg;</div><div class='add'>+	int __user *p = argp;</div><div class='add'>+	int new_timeout;</div><div class='add'>+	static const struct watchdog_info ident = {</div><div class='add'>+		.options =		WDIOF_KEEPALIVEPING |</div><div class='add'>+					WDIOF_SETTIMEOUT |</div><div class='add'>+					WDIOF_MAGICCLOSE,</div><div class='add'>+		.firmware_version =	1,</div><div class='add'>+		.identity =		"W83697UG WDT",</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case WDIOC_GETSUPPORT:</div><div class='add'>+		if (copy_to_user(argp, &amp;ident, sizeof(ident)))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case WDIOC_GETSTATUS:</div><div class='add'>+	case WDIOC_GETBOOTSTATUS:</div><div class='add'>+		return put_user(0, p);</div><div class='add'>+</div><div class='add'>+	case WDIOC_SETOPTIONS:</div><div class='add'>+	{</div><div class='add'>+		int options, retval = -EINVAL;</div><div class='add'>+</div><div class='add'>+		if (get_user(options, p))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+</div><div class='add'>+		if (options &amp; WDIOS_DISABLECARD) {</div><div class='add'>+			wdt_disable();</div><div class='add'>+			retval = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (options &amp; WDIOS_ENABLECARD) {</div><div class='add'>+			wdt_ping();</div><div class='add'>+			retval = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		return retval;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	case WDIOC_KEEPALIVE:</div><div class='add'>+		wdt_ping();</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case WDIOC_SETTIMEOUT:</div><div class='add'>+		if (get_user(new_timeout, p))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		if (wdt_set_heartbeat(new_timeout))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		wdt_ping();</div><div class='add'>+		/* Fall */</div><div class='add'>+</div><div class='add'>+	case WDIOC_GETTIMEOUT:</div><div class='add'>+		return put_user(timeout, p);</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		return -ENOTTY;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wdt_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	if (test_and_set_bit(0, &amp;wdt_is_open))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	/*</div><div class='add'>+	 *	Activate</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	wdt_ping();</div><div class='add'>+	return nonseekable_open(inode, file);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wdt_close(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	if (expect_close == 42)</div><div class='add'>+		wdt_disable();</div><div class='add'>+	else {</div><div class='add'>+		printk(KERN_CRIT PFX</div><div class='add'>+			"Unexpected close, not stopping watchdog!\n");</div><div class='add'>+		wdt_ping();</div><div class='add'>+	}</div><div class='add'>+	expect_close = 0;</div><div class='add'>+	clear_bit(0, &amp;wdt_is_open);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *	Notifier for system down</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static int wdt_notify_sys(struct notifier_block *this, unsigned long code,</div><div class='add'>+	void *unused)</div><div class='add'>+{</div><div class='add'>+	if (code == SYS_DOWN || code == SYS_HALT)</div><div class='add'>+		wdt_disable();	/* Turn the WDT off */</div><div class='add'>+</div><div class='add'>+	return NOTIFY_DONE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *	Kernel Interfaces</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static const struct file_operations wdt_fops = {</div><div class='add'>+	.owner		= THIS_MODULE,</div><div class='add'>+	.llseek		= no_llseek,</div><div class='add'>+	.write		= wdt_write,</div><div class='add'>+	.unlocked_ioctl	= wdt_ioctl,</div><div class='add'>+	.open		= wdt_open,</div><div class='add'>+	.release	= wdt_close,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct miscdevice wdt_miscdev = {</div><div class='add'>+	.minor = WATCHDOG_MINOR,</div><div class='add'>+	.name = "watchdog",</div><div class='add'>+	.fops = &amp;wdt_fops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *	The WDT needs to learn about soft shutdowns in order to</div><div class='add'>+ *	turn the timebomb registers off.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static struct notifier_block wdt_notifier = {</div><div class='add'>+	.notifier_call = wdt_notify_sys,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init wdt_init(void)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "WDT driver for the Winbond(TM) W83697UG/UF Super I/O chip initialising.\n");</div><div class='add'>+</div><div class='add'>+	if (wdt_set_heartbeat(timeout)) {</div><div class='add'>+		wdt_set_heartbeat(WATCHDOG_TIMEOUT);</div><div class='add'>+		printk(KERN_INFO PFX</div><div class='add'>+			"timeout value must be 1&lt;=timeout&lt;=255, using %d\n",</div><div class='add'>+			WATCHDOG_TIMEOUT);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!request_region(wdt_io, 1, WATCHDOG_NAME)) {</div><div class='add'>+		printk(KERN_ERR PFX "I/O address 0x%04x already in use\n",</div><div class='add'>+			wdt_io);</div><div class='add'>+		ret = -EIO;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	w83697ug_init();</div><div class='add'>+</div><div class='add'>+	ret = register_reboot_notifier(&amp;wdt_notifier);</div><div class='add'>+	if (ret != 0) {</div><div class='add'>+		printk(KERN_ERR PFX</div><div class='add'>+			"cannot register reboot notifier (err=%d)\n", ret);</div><div class='add'>+		goto unreg_regions;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = misc_register(&amp;wdt_miscdev);</div><div class='add'>+	if (ret != 0) {</div><div class='add'>+		printk(KERN_ERR PFX</div><div class='add'>+			"cannot register miscdev on minor=%d (err=%d)\n",</div><div class='add'>+			WATCHDOG_MINOR, ret);</div><div class='add'>+		goto unreg_reboot;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO PFX "initialized. timeout=%d sec (nowayout=%d)\n",</div><div class='add'>+		timeout, nowayout);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='add'>+unreg_reboot:</div><div class='add'>+	unregister_reboot_notifier(&amp;wdt_notifier);</div><div class='add'>+unreg_regions:</div><div class='add'>+	release_region(wdt_io, 1);</div><div class='add'>+	goto out;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit wdt_exit(void)</div><div class='add'>+{</div><div class='add'>+	misc_deregister(&amp;wdt_miscdev);</div><div class='add'>+	unregister_reboot_notifier(&amp;wdt_notifier);</div><div class='add'>+	release_region(wdt_io, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(wdt_init);</div><div class='add'>+module_exit(wdt_exit);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_AUTHOR("Flemming Frandsen &lt;ff@nrvissing.net&gt;");</div><div class='add'>+MODULE_DESCRIPTION("w83697ug/uf WDT driver");</div><div class='add'>+MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);</div><div class='head'>diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile<br/>index 363286c54290..d2a8fdf0e191 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/xen/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/xen/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/xen/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/xen/Makefile</a></div><div class='hunk'>@@ -1,4 +1,5 @@</div><div class='ctx'> obj-y	+= grant-table.o features.o events.o manage.o</div><div class='ctx'> obj-y	+= xenbus/</div><div class='add'>+obj-$(CONFIG_HOTPLUG_CPU)	+= cpu_hotplug.o</div><div class='ctx'> obj-$(CONFIG_XEN_XENCOMM)	+= xencomm.o</div><div class='ctx'> obj-$(CONFIG_XEN_BALLOON)	+= balloon.o</div><div class='head'>diff --git a/drivers/xen/balloon.c b/drivers/xen/balloon.c<br/>index 2e15da5459cf..8c83abc73400 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/xen/balloon.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/xen/balloon.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/xen/balloon.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/xen/balloon.c</a></div><div class='hunk'>@@ -53,7 +53,6 @@</div><div class='ctx'> #include &lt;asm/tlb.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;xen/interface/memory.h&gt;</div><div class='del'>-#include &lt;xen/balloon.h&gt;</div><div class='ctx'> #include &lt;xen/xenbus.h&gt;</div><div class='ctx'> #include &lt;xen/features.h&gt;</div><div class='ctx'> #include &lt;xen/page.h&gt;</div><div class='hunk'>@@ -226,9 +225,8 @@ static int increase_reservation(unsigned long nr_pages)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	set_xen_guest_handle(reservation.extent_start, frame_list);</div><div class='del'>-	reservation.nr_extents   = nr_pages;</div><div class='del'>-	rc = HYPERVISOR_memory_op(</div><div class='del'>-		XENMEM_populate_physmap, &amp;reservation);</div><div class='add'>+	reservation.nr_extents = nr_pages;</div><div class='add'>+	rc = HYPERVISOR_memory_op(XENMEM_populate_physmap, &amp;reservation);</div><div class='ctx'> 	if (rc &lt; nr_pages) {</div><div class='ctx'> 		if (rc &gt; 0) {</div><div class='ctx'> 			int ret;</div><div class='hunk'>@@ -236,7 +234,7 @@ static int increase_reservation(unsigned long nr_pages)</div><div class='ctx'> 			/* We hit the Xen hard limit: reprobe. */</div><div class='ctx'> 			reservation.nr_extents = rc;</div><div class='ctx'> 			ret = HYPERVISOR_memory_op(XENMEM_decrease_reservation,</div><div class='del'>-					&amp;reservation);</div><div class='add'>+						   &amp;reservation);</div><div class='ctx'> 			BUG_ON(ret != rc);</div><div class='ctx'> 		}</div><div class='ctx'> 		if (rc &gt;= 0)</div><div class='hunk'>@@ -420,7 +418,7 @@ static int __init balloon_init(void)</div><div class='ctx'> 	unsigned long pfn;</div><div class='ctx'> 	struct page *page;</div><div class='ctx'> </div><div class='del'>-	if (!is_running_on_xen())</div><div class='add'>+	if (!xen_pv_domain())</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	pr_info("xen_balloon: Initialising balloon driver.\n");</div><div class='hunk'>@@ -464,136 +462,13 @@ static void balloon_exit(void)</div><div class='ctx'> </div><div class='ctx'> module_exit(balloon_exit);</div><div class='ctx'> </div><div class='del'>-static void balloon_update_driver_allowance(long delta)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;balloon_lock, flags);</div><div class='del'>-	balloon_stats.driver_pages += delta;</div><div class='del'>-	spin_unlock_irqrestore(&amp;balloon_lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dealloc_pte_fn(</div><div class='del'>-	pte_t *pte, struct page *pmd_page, unsigned long addr, void *data)</div><div class='del'>-{</div><div class='del'>-	unsigned long mfn = pte_mfn(*pte);</div><div class='del'>-	int ret;</div><div class='del'>-	struct xen_memory_reservation reservation = {</div><div class='del'>-		.nr_extents   = 1,</div><div class='del'>-		.extent_order = 0,</div><div class='del'>-		.domid        = DOMID_SELF</div><div class='del'>-	};</div><div class='del'>-	set_xen_guest_handle(reservation.extent_start, &amp;mfn);</div><div class='del'>-	set_pte_at(&amp;init_mm, addr, pte, __pte_ma(0ull));</div><div class='del'>-	set_phys_to_machine(__pa(addr) &gt;&gt; PAGE_SHIFT, INVALID_P2M_ENTRY);</div><div class='del'>-	ret = HYPERVISOR_memory_op(XENMEM_decrease_reservation, &amp;reservation);</div><div class='del'>-	BUG_ON(ret != 1);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct page **alloc_empty_pages_and_pagevec(int nr_pages)</div><div class='del'>-{</div><div class='del'>-	unsigned long vaddr, flags;</div><div class='del'>-	struct page *page, **pagevec;</div><div class='del'>-	int i, ret;</div><div class='del'>-</div><div class='del'>-	pagevec = kmalloc(sizeof(page) * nr_pages, GFP_KERNEL);</div><div class='del'>-	if (pagevec == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; nr_pages; i++) {</div><div class='del'>-		page = pagevec[i] = alloc_page(GFP_KERNEL);</div><div class='del'>-		if (page == NULL)</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		vaddr = (unsigned long)page_address(page);</div><div class='del'>-</div><div class='del'>-		scrub_page(page);</div><div class='del'>-</div><div class='del'>-		spin_lock_irqsave(&amp;balloon_lock, flags);</div><div class='del'>-</div><div class='del'>-		if (xen_feature(XENFEAT_auto_translated_physmap)) {</div><div class='del'>-			unsigned long gmfn = page_to_pfn(page);</div><div class='del'>-			struct xen_memory_reservation reservation = {</div><div class='del'>-				.nr_extents   = 1,</div><div class='del'>-				.extent_order = 0,</div><div class='del'>-				.domid        = DOMID_SELF</div><div class='del'>-			};</div><div class='del'>-			set_xen_guest_handle(reservation.extent_start, &amp;gmfn);</div><div class='del'>-			ret = HYPERVISOR_memory_op(XENMEM_decrease_reservation,</div><div class='del'>-						   &amp;reservation);</div><div class='del'>-			if (ret == 1)</div><div class='del'>-				ret = 0; /* success */</div><div class='del'>-		} else {</div><div class='del'>-			ret = apply_to_page_range(&amp;init_mm, vaddr, PAGE_SIZE,</div><div class='del'>-						  dealloc_pte_fn, NULL);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (ret != 0) {</div><div class='del'>-			spin_unlock_irqrestore(&amp;balloon_lock, flags);</div><div class='del'>-			__free_page(page);</div><div class='del'>-			goto err;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		totalram_pages = --balloon_stats.current_pages;</div><div class='del'>-</div><div class='del'>-		spin_unlock_irqrestore(&amp;balloon_lock, flags);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-	schedule_work(&amp;balloon_worker);</div><div class='del'>-	flush_tlb_all();</div><div class='del'>-	return pagevec;</div><div class='del'>-</div><div class='del'>- err:</div><div class='del'>-	spin_lock_irqsave(&amp;balloon_lock, flags);</div><div class='del'>-	while (--i &gt;= 0)</div><div class='del'>-		balloon_append(pagevec[i]);</div><div class='del'>-	spin_unlock_irqrestore(&amp;balloon_lock, flags);</div><div class='del'>-	kfree(pagevec);</div><div class='del'>-	pagevec = NULL;</div><div class='del'>-	goto out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void free_empty_pages_and_pagevec(struct page **pagevec, int nr_pages)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (pagevec == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;balloon_lock, flags);</div><div class='del'>-	for (i = 0; i &lt; nr_pages; i++) {</div><div class='del'>-		BUG_ON(page_count(pagevec[i]) != 1);</div><div class='del'>-		balloon_append(pagevec[i]);</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;balloon_lock, flags);</div><div class='del'>-</div><div class='del'>-	kfree(pagevec);</div><div class='del'>-</div><div class='del'>-	schedule_work(&amp;balloon_worker);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void balloon_release_driver_page(struct page *page)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;balloon_lock, flags);</div><div class='del'>-	balloon_append(page);</div><div class='del'>-	balloon_stats.driver_pages--;</div><div class='del'>-	spin_unlock_irqrestore(&amp;balloon_lock, flags);</div><div class='del'>-</div><div class='del'>-	schedule_work(&amp;balloon_worker);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define BALLOON_SHOW(name, format, args...)			\</div><div class='del'>-	static ssize_t show_##name(struct sys_device *dev,	\</div><div class='del'>-				   char *buf)			\</div><div class='del'>-	{							\</div><div class='del'>-		return sprintf(buf, format, ##args);		\</div><div class='del'>-	}							\</div><div class='add'>+#define BALLOON_SHOW(name, format, args...)				\</div><div class='add'>+	static ssize_t show_##name(struct sys_device *dev,		\</div><div class='add'>+				   struct sysdev_attribute *attr,	\</div><div class='add'>+				   char *buf)				\</div><div class='add'>+	{								\</div><div class='add'>+		return sprintf(buf, format, ##args);			\</div><div class='add'>+	}								\</div><div class='ctx'> 	static SYSDEV_ATTR(name, S_IRUGO, show_##name, NULL)</div><div class='ctx'> </div><div class='ctx'> BALLOON_SHOW(current_kb, "%lu\n", PAGES2KB(balloon_stats.current_pages));</div><div class='hunk'>@@ -604,7 +479,8 @@ BALLOON_SHOW(hard_limit_kb,</div><div class='ctx'> 	     (balloon_stats.hard_limit!=~0UL) ? PAGES2KB(balloon_stats.hard_limit) : 0);</div><div class='ctx'> BALLOON_SHOW(driver_kb, "%lu\n", PAGES2KB(balloon_stats.driver_pages));</div><div class='ctx'> </div><div class='del'>-static ssize_t show_target_kb(struct sys_device *dev, char *buf)</div><div class='add'>+static ssize_t show_target_kb(struct sys_device *dev, struct sysdev_attribute *attr,</div><div class='add'>+			      char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	return sprintf(buf, "%lu\n", PAGES2KB(balloon_stats.target_pages));</div><div class='ctx'> }</div><div class='hunk'>@@ -614,19 +490,14 @@ static ssize_t store_target_kb(struct sys_device *dev,</div><div class='ctx'> 			       const char *buf,</div><div class='ctx'> 			       size_t count)</div><div class='ctx'> {</div><div class='del'>-	char memstring[64], *endchar;</div><div class='add'>+	char *endchar;</div><div class='ctx'> 	unsigned long long target_bytes;</div><div class='ctx'> </div><div class='ctx'> 	if (!capable(CAP_SYS_ADMIN))</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> </div><div class='del'>-	if (count &lt;= 1)</div><div class='del'>-		return -EBADMSG; /* runt */</div><div class='del'>-	if (count &gt; sizeof(memstring))</div><div class='del'>-		return -EFBIG;   /* too long */</div><div class='del'>-	strcpy(memstring, buf);</div><div class='add'>+	target_bytes = memparse(buf, &amp;endchar);</div><div class='ctx'> </div><div class='del'>-	target_bytes = memparse(memstring, &amp;endchar);</div><div class='ctx'> 	balloon_set_new_target(target_bytes &gt;&gt; PAGE_SHIFT);</div><div class='ctx'> </div><div class='ctx'> 	return count;</div><div class='hunk'>@@ -694,20 +565,4 @@ static int register_balloon(struct sys_device *sysdev)</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void unregister_balloon(struct sys_device *sysdev)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	sysfs_remove_group(&amp;sysdev-&gt;kobj, &amp;balloon_info_group);</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(balloon_attrs); i++)</div><div class='del'>-		sysdev_remove_file(sysdev, balloon_attrs[i]);</div><div class='del'>-	sysdev_unregister(sysdev);</div><div class='del'>-	sysdev_class_unregister(&amp;balloon_sysdev_class);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void balloon_sysfs_exit(void)</div><div class='del'>-{</div><div class='del'>-	unregister_balloon(&amp;balloon_sysdev);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/xen/cpu_hotplug.c b/drivers/xen/cpu_hotplug.c<br/>new file mode 100644<br/>index 000000000000..565280ec1c6a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/xen/cpu_hotplug.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/xen/cpu_hotplug.c</a></div><div class='hunk'>@@ -0,0 +1,90 @@</div><div class='add'>+#include &lt;linux/notifier.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;xen/xenbus.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm-x86/xen/hypervisor.h&gt;</div><div class='add'>+#include &lt;asm/cpu.h&gt;</div><div class='add'>+</div><div class='add'>+static void enable_hotplug_cpu(int cpu)</div><div class='add'>+{</div><div class='add'>+	if (!cpu_present(cpu))</div><div class='add'>+		arch_register_cpu(cpu);</div><div class='add'>+</div><div class='add'>+	cpu_set(cpu, cpu_present_map);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void disable_hotplug_cpu(int cpu)</div><div class='add'>+{</div><div class='add'>+	if (cpu_present(cpu))</div><div class='add'>+		arch_unregister_cpu(cpu);</div><div class='add'>+</div><div class='add'>+	cpu_clear(cpu, cpu_present_map);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void vcpu_hotplug(unsigned int cpu)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	char dir[32], state[32];</div><div class='add'>+</div><div class='add'>+	if (!cpu_possible(cpu))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	sprintf(dir, "cpu/%u", cpu);</div><div class='add'>+	err = xenbus_scanf(XBT_NIL, dir, "availability", "%s", state);</div><div class='add'>+	if (err != 1) {</div><div class='add'>+		printk(KERN_ERR "XENBUS: Unable to read cpu state\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (strcmp(state, "online") == 0) {</div><div class='add'>+		enable_hotplug_cpu(cpu);</div><div class='add'>+	} else if (strcmp(state, "offline") == 0) {</div><div class='add'>+		(void)cpu_down(cpu);</div><div class='add'>+		disable_hotplug_cpu(cpu);</div><div class='add'>+	} else {</div><div class='add'>+		printk(KERN_ERR "XENBUS: unknown state(%s) on CPU%d\n",</div><div class='add'>+		       state, cpu);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void handle_vcpu_hotplug_event(struct xenbus_watch *watch,</div><div class='add'>+					const char **vec, unsigned int len)</div><div class='add'>+{</div><div class='add'>+	unsigned int cpu;</div><div class='add'>+	char *cpustr;</div><div class='add'>+	const char *node = vec[XS_WATCH_PATH];</div><div class='add'>+</div><div class='add'>+	cpustr = strstr(node, "cpu/");</div><div class='add'>+	if (cpustr != NULL) {</div><div class='add'>+		sscanf(cpustr, "cpu/%u", &amp;cpu);</div><div class='add'>+		vcpu_hotplug(cpu);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int setup_cpu_watcher(struct notifier_block *notifier,</div><div class='add'>+			      unsigned long event, void *data)</div><div class='add'>+{</div><div class='add'>+	static struct xenbus_watch cpu_watch = {</div><div class='add'>+		.node = "cpu",</div><div class='add'>+		.callback = handle_vcpu_hotplug_event};</div><div class='add'>+</div><div class='add'>+	(void)register_xenbus_watch(&amp;cpu_watch);</div><div class='add'>+</div><div class='add'>+	return NOTIFY_DONE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init setup_vcpu_hotplug_event(void)</div><div class='add'>+{</div><div class='add'>+	static struct notifier_block xsn_cpu = {</div><div class='add'>+		.notifier_call = setup_cpu_watcher };</div><div class='add'>+</div><div class='add'>+	if (!xen_pv_domain())</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	register_xenstore_notifier(&amp;xsn_cpu);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+arch_initcall(setup_vcpu_hotplug_event);</div><div class='add'>+</div><div class='head'>diff --git a/drivers/xen/events.c b/drivers/xen/events.c<br/>index 0e0c28574af8..c3290bc186a0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/xen/events.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/xen/events.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/xen/events.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/xen/events.c</a></div><div class='hunk'>@@ -84,17 +84,6 @@ static int irq_bindcount[NR_IRQS];</div><div class='ctx'> /* Xen will never allocate port zero for any purpose. */</div><div class='ctx'> #define VALID_EVTCHN(chn)	((chn) != 0)</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Force a proper event-channel callback from Xen after clearing the</div><div class='del'>- * callback mask. We do this in a very simple manner, by making a call</div><div class='del'>- * down into Xen. The pending flag will be checked by Xen on return.</div><div class='del'>- */</div><div class='del'>-void force_evtchn_callback(void)</div><div class='del'>-{</div><div class='del'>-	(void)HYPERVISOR_xen_version(0, NULL);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(force_evtchn_callback);</div><div class='del'>-</div><div class='ctx'> static struct irq_chip xen_dynamic_chip;</div><div class='ctx'> </div><div class='ctx'> /* Constructor for packed IRQ information. */</div><div class='hunk'>@@ -175,6 +164,12 @@ static inline void set_evtchn(int port)</div><div class='ctx'> 	sync_set_bit(port, &amp;s-&gt;evtchn_pending[0]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int test_evtchn(int port)</div><div class='add'>+{</div><div class='add'>+	struct shared_info *s = HYPERVISOR_shared_info;</div><div class='add'>+	return sync_test_bit(port, &amp;s-&gt;evtchn_pending[0]);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * notify_remote_via_irq - send event to remote end of event channel via irq</div><div class='hunk'>@@ -365,6 +360,10 @@ static void unbind_from_irq(unsigned int irq)</div><div class='ctx'> 			per_cpu(virq_to_irq, cpu_from_evtchn(evtchn))</div><div class='ctx'> 				[index_from_irq(irq)] = -1;</div><div class='ctx'> 			break;</div><div class='add'>+		case IRQT_IPI:</div><div class='add'>+			per_cpu(ipi_to_irq, cpu_from_evtchn(evtchn))</div><div class='add'>+				[index_from_irq(irq)] = -1;</div><div class='add'>+			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -743,6 +742,25 @@ void xen_clear_irq_pending(int irq)</div><div class='ctx'> 		clear_evtchn(evtchn);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void xen_set_irq_pending(int irq)</div><div class='add'>+{</div><div class='add'>+	int evtchn = evtchn_from_irq(irq);</div><div class='add'>+</div><div class='add'>+	if (VALID_EVTCHN(evtchn))</div><div class='add'>+		set_evtchn(evtchn);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool xen_test_irq_pending(int irq)</div><div class='add'>+{</div><div class='add'>+	int evtchn = evtchn_from_irq(irq);</div><div class='add'>+	bool ret = false;</div><div class='add'>+</div><div class='add'>+	if (VALID_EVTCHN(evtchn))</div><div class='add'>+		ret = test_evtchn(evtchn);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Poll waiting for an irq to become pending.  In the usual case, the</div><div class='ctx'>    irq will be disabled so it won't deliver an interrupt. */</div><div class='ctx'> void xen_poll_irq(int irq)</div><div class='head'>diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c<br/>index e9e11168616a..06592b9da83c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/xen/grant-table.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/xen/grant-table.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/xen/grant-table.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/xen/grant-table.c</a></div><div class='hunk'>@@ -508,7 +508,7 @@ static int __devinit gnttab_init(void)</div><div class='ctx'> 	unsigned int max_nr_glist_frames, nr_glist_frames;</div><div class='ctx'> 	unsigned int nr_init_grefs;</div><div class='ctx'> </div><div class='del'>-	if (!is_running_on_xen())</div><div class='add'>+	if (!xen_domain())</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	nr_grant_frames = 1;</div><div class='head'>diff --git a/drivers/xen/xenbus/xenbus_probe.c b/drivers/xen/xenbus/xenbus_probe.c<br/>index 57ceb5346b74..7f24a98a446f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/xen/xenbus/xenbus_probe.c?id=c15895ef30c2c03e99802951787183039a349d32'>drivers/xen/xenbus/xenbus_probe.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/drivers/xen/xenbus/xenbus_probe.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>drivers/xen/xenbus/xenbus_probe.c</a></div><div class='hunk'>@@ -814,7 +814,7 @@ static int __init xenbus_probe_init(void)</div><div class='ctx'> 	DPRINTK("");</div><div class='ctx'> </div><div class='ctx'> 	err = -ENODEV;</div><div class='del'>-	if (!is_running_on_xen())</div><div class='add'>+	if (!xen_domain())</div><div class='ctx'> 		goto out_error;</div><div class='ctx'> </div><div class='ctx'> 	/* Register ourselves with the kernel bus subsystem */</div><div class='hunk'>@@ -829,7 +829,7 @@ static int __init xenbus_probe_init(void)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Domain0 doesn't have a store_evtchn or store_mfn yet.</div><div class='ctx'> 	 */</div><div class='del'>-	if (is_initial_xendomain()) {</div><div class='add'>+	if (xen_initial_domain()) {</div><div class='ctx'> 		/* dom0 not yet supported */</div><div class='ctx'> 	} else {</div><div class='ctx'> 		xenstored_ready = 1;</div><div class='hunk'>@@ -846,7 +846,7 @@ static int __init xenbus_probe_init(void)</div><div class='ctx'> 		goto out_unreg_back;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!is_initial_xendomain())</div><div class='add'>+	if (!xen_initial_domain())</div><div class='ctx'> 		xenbus_probe(NULL);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -937,7 +937,7 @@ static void wait_for_devices(struct xenbus_driver *xendrv)</div><div class='ctx'> 	unsigned long timeout = jiffies + 10*HZ;</div><div class='ctx'> 	struct device_driver *drv = xendrv ? &amp;xendrv-&gt;driver : NULL;</div><div class='ctx'> </div><div class='del'>-	if (!ready_to_wait_for_devices || !is_running_on_xen())</div><div class='add'>+	if (!ready_to_wait_for_devices || !xen_domain())</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	while (exists_disconnected_device(drv)) {</div><div class='head'>diff --git a/firmware/Makefile b/firmware/Makefile<br/>index da75a6fbc6ba..ca8cd305ff93 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/firmware/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>firmware/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/firmware/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>firmware/Makefile</a></div><div class='hunk'>@@ -22,6 +22,7 @@ fw-external-y := $(subst ",,$(CONFIG_EXTRA_FIRMWARE))</div><div class='ctx'> </div><div class='ctx'> fw-shipped-$(CONFIG_ATARI_DSP56K) += dsp56k/bootstrap.bin</div><div class='ctx'> fw-shipped-$(CONFIG_ATM_AMBASSADOR) += atmsar11.fw</div><div class='add'>+fw-shipped-$(CONFIG_CASSINI) += sun/cassini.bin</div><div class='ctx'> fw-shipped-$(CONFIG_COMPUTONE) += intelliport2.bin</div><div class='ctx'> fw-shipped-$(CONFIG_DVB_TTUSB_BUDGET) += ttusb-budget/dspbootcode.bin</div><div class='ctx'> fw-shipped-$(CONFIG_SMCTR) += tr_smctr.bin</div><div class='head'>diff --git a/firmware/WHENCE b/firmware/WHENCE<br/>index 66c51b275e9e..57002cdecd42 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/firmware/WHENCE?id=c15895ef30c2c03e99802951787183039a349d32'>firmware/WHENCE</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/firmware/WHENCE?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>firmware/WHENCE</a></div><div class='hunk'>@@ -339,3 +339,13 @@ Licence: Allegedly GPLv2+, but no source visible. Marked:</div><div class='ctx'> Found in hex form in kernel source.</div><div class='ctx'> </div><div class='ctx'> --------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Driver: CASSINI - Sun Cassini</div><div class='add'>+</div><div class='add'>+File: sun/cassini.bin</div><div class='add'>+</div><div class='add'>+Licence: Unknown</div><div class='add'>+</div><div class='add'>+Found in hex form in kernel source.</div><div class='add'>+</div><div class='add'>+--------------------------------------------------------------------------</div><div class='head'>diff --git a/firmware/sun/cassini.bin.ihex b/firmware/sun/cassini.bin.ihex<br/>new file mode 100644<br/>index 000000000000..5cd7ae70e71f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/firmware/sun/cassini.bin.ihex?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>firmware/sun/cassini.bin.ihex</a></div><div class='hunk'>@@ -0,0 +1,143 @@</div><div class='add'>+:1000000000827E82090000000000008E8EFFCE82FA</div><div class='add'>+:1000100025FF010FCE8426FF0111CE853DDFE58649</div><div class='add'>+:1000200039B78FF87EC3C2964784F38A009747CECC</div><div class='add'>+:100030008233FF010F9646840C8104270B96468479</div><div class='add'>+:100040000C810827577E8425964784F38A049747B6</div><div class='add'>+:10005000CE8254FF010F9646840C81042638B612D6</div><div class='add'>+:1000600020842026037E8425967BD67CFE8F56BD79</div><div class='add'>+:10007000F7B6FE8F4EBDEC8EBDFAF7BDF728CE82E7</div><div class='add'>+:1000800082FF010F9646840C8104260AB612208452</div><div class='add'>+:100090002027B57E8425BDF71F7E841F964784F3F5</div><div class='add'>+:1000A0008A089747DEE1AD00CE82AFFF010F7E8464</div><div class='add'>+:1000B00025964185102606962385402706BDED002E</div><div class='add'>+:1000C0007E83A2DE42BDEB8E9624840827037E83C6</div><div class='add'>+:1000D000DF967BD67CFE8F56BDF7B6FE8F50BDEC0B</div><div class='add'>+:1000E0008EBDFAF78611C649BDE412CE82EFFF013C</div><div class='add'>+:1000F0000F9646840C81002717C649BDE491240D54</div><div class='add'>+:10010000B612208520260CCE82C1FF010F7E8425E9</div><div class='add'>+:100110007E8416FE8F52BDEC8EBDFAF7866AC64904</div><div class='add'>+:10012000BDE412CE8327FF010F9646840C81002781</div><div class='add'>+:100130000AC649BDE49125067E84257E8416B6183C</div><div class='add'>+:1001400070BB19702A0481AF2E19967BF62007FA2E</div><div class='add'>+:100150002027C4388138270BF62007FA2027CB0840</div><div class='add'>+:100160007E82D3BDF7668674C649BDE412CE837124</div><div class='add'>+:10017000FF010F9646840C8108260AC649BDE4910A</div><div class='add'>+:1001800025067E84257E8416BDF73E260EBDE50934</div><div class='add'>+:100190002606CE82C1FF010F7E8425FE8F54BDEC62</div><div class='add'>+:1001A0008EBDFAF7BDF733860FC651BDE412CE837C</div><div class='add'>+:1001B000B2FF010F9646840C8108265CB61220849B</div><div class='add'>+:1001C0003F813A271C9623854027037E8425C6510C</div><div class='add'>+:1001D000BDE49125037E8425CE82C1FF010F7E847C</div><div class='add'>+:1001E00025BDF8377C007ACE83EEFF010F7E842593</div><div class='add'>+:1001F0009646840C81082620962484082629B61861</div><div class='add'>+:1002000082BB1982B1013B2209B6122084378132A8</div><div class='add'>+:100210002715BDF8447E82C1BDF71FBDF844BDFC63</div><div class='add'>+:1002200029CE8225FF010F39964784FC8A00974723</div><div class='add'>+:10023000CE8434FF011196468403810227037E8514</div><div class='add'>+:100240001E964784FC8A029747DEE1AD008601B71F</div><div class='add'>+:100250001251BDF714B6103184FDB71031BDF81E30</div><div class='add'>+:100260009681D682FE8F5ABDF7B6FE8F5CBDEC8EAE</div><div class='add'>+:10027000BDFAF78608D600C51026028B20C651BDF0</div><div class='add'>+:10028000E412CE8486FF011196468403810227037F</div><div class='add'>+:100290007E850FC651BDE49125037E851E9644855B</div><div class='add'>+:1002A00010260AB61250BA013C851027A8BDF76681</div><div class='add'>+:1002B000CE84B7FF01117E851E96468403810226F7</div><div class='add'>+:1002C00050B612308403810127037E851E96448533</div><div class='add'>+:1002D000102613B61250BA013C85102609CE84535D</div><div class='add'>+:1002E000FF01117E851EB610318A02B71031BD851F</div><div class='add'>+:1002F0001FBDF8377C0080CE84FEFF01117E851E75</div><div class='add'>+:100300009646840381022609B612308403810127B0</div><div class='add'>+:100310000FBDF844BDF70BBDFC29CE8426FF0111AB</div><div class='add'>+:1003200039D622C40FB61230BA12328404270D9681</div><div class='add'>+:100330002285042705CA107E853ACA20D72239862D</div><div class='add'>+:1003400000978318CE1C00BDEB4696578501270207</div><div class='add'>+:100350004F3985022701397F8F7D8604B7120486C5</div><div class='add'>+:1003600008B712078610B7120C8607B71206B68FA9</div><div class='add'>+:100370007DB712708601BA1204B71204010101019F</div><div class='add'>+:100380000101B6120484FE8A02B7120401010101C0</div><div class='add'>+:10039000010186FDB41204B71204B612008408816C</div><div class='add'>+:1003A000082716B68F7D810C27088B04B78F7D7EBA</div><div class='add'>+:1003B000856C860397407E896E8607B712065FF7C5</div><div class='add'>+:1003C0008F825FF78F7FF78F70F78F71F78F72F7DC</div><div class='add'>+:1003D0008F73F78F74F78F75F78F76F78F77F78FA7</div><div class='add'>+:1003E00078F78F79F78F7AF78F7BB612048A10B778</div><div class='add'>+:1003F000120486E4B71270B71207F71205F7120954</div><div class='add'>+:100400008608BA1204B7120486F7B41204B71204AD</div><div class='add'>+:10041000010101010101B61208277F8180260B86A8</div><div class='add'>+:1004200008CE8F79BD897B7E868E8140260B86041F</div><div class='add'>+:10043000CE8F76BD897B7E868E8120260B8602CE6E</div><div class='add'>+:100440008F73BD897B7E868E8110260B8601CE8FB1</div><div class='add'>+:1004500070BD897B7E868E8108260B8608CE8F79BB</div><div class='add'>+:10046000BD897F7E868E8104260B8604CE8F76BD65</div><div class='add'>+:10047000897F7E868E8102260B8A02CE8F73BD898C</div><div class='add'>+:100480007F7E868E810126088601CE8F70BD897F92</div><div class='add'>+:10049000B68F7F810F26037E8747B61209840381BA</div><div class='add'>+:1004A0000327067C12097E85FEB6120684078107A3</div><div class='add'>+:1004B00027088B01B712067E86D5B68F82260A7C66</div><div class='add'>+:1004C0008F824FB712067E85C0B61206843F813FE9</div><div class='add'>+:1004D00027108B08B71206B6120984FCB712097EE2</div><div class='add'>+:1004E00085FECE8F7018CE8F84C60CBD896FCE8FDF</div><div class='add'>+:1004F0008418CE8F70C60CBD896FD683C14F2D0373</div><div class='add'>+:100500007E8740B68F7F8107270F810B2715810DCE</div><div class='add'>+:10051000271B810E27217E8740F78F7B8602B78FAE</div><div class='add'>+:100520007A201CF78F788602B78F772012F78F75A5</div><div class='add'>+:100530008602B78F742008F78F728602B78F717E9C</div><div class='add'>+:100540008747860497407E896ECE8F72BD89F7CE2D</div><div class='add'>+:100550008F75BD89F7CE8F78BD89F7CE8F7BBD892A</div><div class='add'>+:10056000F74FB78F7DB78F81B68F7227477C8F7D0E</div><div class='add'>+:10057000B68F75273F7C8F7DB68F7827377C8F7D30</div><div class='add'>+:10058000B68F7B272F7F8F7D7C8F817A8F72271B81</div><div class='add'>+:100590007C8F7D7A8F7527167C8F7D7A8F782711D7</div><div class='add'>+:1005A0007C8F7D7A8F7B270C7E87837A8F757A8FFD</div><div class='add'>+:1005B000787A8F7BCEC1FCF68F7D3AA600B7127099</div><div class='add'>+:1005C000B68F7226037E87FAB68F75260A18CE8FED</div><div class='add'>+:1005D00073BD89D57E87FAB68F78260A18CE8F76B6</div><div class='add'>+:1005E000BD89D57E87FAB68F7B260A18CE8F79BD56</div><div class='add'>+:1005F00089D57E87FA860597407E8900B68F7581FA</div><div class='add'>+:10060000072EF2F61206C4F81BB71206B68F7881D1</div><div class='add'>+:10061000072EE2484848F61206C4C71BB71206B6B2</div><div class='add'>+:100620008F7B81072ECFF61205C4F81BB712058603</div><div class='add'>+:1006300000F68F71BD89948601F68F74BD8994860A</div><div class='add'>+:1006400002F68F77BD89948603F68F7ABD8994CEA2</div><div class='add'>+:100650008F70A60181012707810327037E8866A684</div><div class='add'>+:1006600000B88F818401260B8C8F792C0E08080826</div><div class='add'>+:100670007E8850B612048A40B71204B6120484FB76</div><div class='add'>+:1006800084EFB71204B6120736B68F7C4848B7120B</div><div class='add'>+:10069000078601BA1204B7120401010101010186A3</div><div class='add'>+:1006A000FEB41204B712048602BA1204B71204860A</div><div class='add'>+:1006B000FDB41204B7120432B71207B61200840850</div><div class='add'>+:1006C0008108270F7C82082607867697407E896EF0</div><div class='add'>+:1006D0007E86ECB68F7F810F273CBDE6C7B7120D33</div><div class='add'>+:1006E000BDE6CBB612048A20B71204CEFFFFB612C5</div><div class='add'>+:1006F00000810C26050926F6271CB6120484DFB7F4</div><div class='add'>+:100700001204968381072C057C0083200696838B38</div><div class='add'>+:100710000897837E85417F8F7E8680B7120C860185</div><div class='add'>+:10072000B78F7DB6120C847FB7120C8A80B7120C7B</div><div class='add'>+:10073000860ABD8A06B6120A2A09B6120CBA8F7D3D</div><div class='add'>+:10074000B7120CB68F7E8160271A8B20B78F7EB6CA</div><div class='add'>+:10075000120C849FBA8F7EB7120CB68F7D48B78F6C</div><div class='add'>+:100760007D7E8921B612048A20B71204BD8A0A4F01</div><div class='add'>+:1007700039A60018A7000818085A26F539366C0063</div><div class='add'>+:1007800032BA8F7FB78F7FB612098403A701B612E2</div><div class='add'>+:1007900006843FA70239368603B78F8032C1002610</div><div class='add'>+:1007A00006B78F7C7E89C9C1012718C102270CC1F9</div><div class='add'>+:1007B000032700F68F800505F78F80F68F800505EB</div><div class='add'>+:1007C000F78F80F68F800505F78F80F68F8053F4C2</div><div class='add'>+:1007D00012071BB7120739CE8F70A60018E6001853</div><div class='add'>+:1007E000A700E700A60118E60118A701E701A60285</div><div class='add'>+:1007F00018E60218A702E70239A6008407E600C43B</div><div class='add'>+:10080000385454541BA700394A26FD399622840FC8</div><div class='add'>+:1008100097228601B78F70B61207B78F71F6120C48</div><div class='add'>+:10082000C40FC80FF78F72F68F72B68F71840327CB</div><div class='add'>+:10083000148101271C81022724F48F70272A962215</div><div class='add'>+:100840008A807E8A64F48F70271E96228A107E8AA0</div><div class='add'>+:1008500064F48F70271296228A207E8A64F48F7047</div><div class='add'>+:10086000270696228A409722748F71748F71788F31</div><div class='add'>+:1008700070B68F70851027AFD622C41058B612708C</div><div class='add'>+:1008800081E4273681E1260C96228420441BD6225F</div><div class='add'>+:10089000C4CF20235881C6260D9622844044441B91</div><div class='add'>+:1008A000D622C4AF2011588127260F962284804477</div><div class='add'>+:1008B00044441BD622C46F1B972239270C7C820626</div><div class='add'>+:0D08C000BDD9EDB682077E8AB97F82063968</div><div class='add'>+:00000001FF</div><div class='add'>+/* firmware patch for NS_DP83065 */</div><div class='head'>diff --git a/fs/9p/v9fs.c b/fs/9p/v9fs.c<br/>index 047c791427aa..c061c3f18e7c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/9p/v9fs.c?id=c15895ef30c2c03e99802951787183039a349d32'>fs/9p/v9fs.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/9p/v9fs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/9p/v9fs.c</a></div><div class='hunk'>@@ -55,7 +55,7 @@ enum {</div><div class='ctx'> 	Opt_err</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static match_table_t tokens = {</div><div class='add'>+static const match_table_t tokens = {</div><div class='ctx'> 	{Opt_debug, "debug=%x"},</div><div class='ctx'> 	{Opt_dfltuid, "dfltuid=%u"},</div><div class='ctx'> 	{Opt_dfltgid, "dfltgid=%u"},</div><div class='head'>diff --git a/fs/Kconfig b/fs/Kconfig<br/>index abccb5dab9a8..d0a1174fb516 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/Kconfig?id=c15895ef30c2c03e99802951787183039a349d32'>fs/Kconfig</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/Kconfig?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/Kconfig</a></div><div class='hunk'>@@ -136,37 +136,51 @@ config EXT3_FS_SECURITY</div><div class='ctx'> 	  If you are not using a security module that requires using</div><div class='ctx'> 	  extended attributes for file security labels, say N.</div><div class='ctx'> </div><div class='del'>-config EXT4DEV_FS</div><div class='del'>-	tristate "Ext4dev/ext4 extended fs support development (EXPERIMENTAL)"</div><div class='del'>-	depends on EXPERIMENTAL</div><div class='add'>+config EXT4_FS</div><div class='add'>+	tristate "The Extended 4 (ext4) filesystem"</div><div class='ctx'> 	select JBD2</div><div class='ctx'> 	select CRC16</div><div class='ctx'> 	help</div><div class='del'>-	  Ext4dev is a predecessor filesystem of the next generation</div><div class='del'>-	  extended fs ext4, based on ext3 filesystem code. It will be</div><div class='del'>-	  renamed ext4 fs later, once ext4dev is mature and stabilized.</div><div class='add'>+	  This is the next generation of the ext3 filesystem.</div><div class='ctx'> </div><div class='ctx'> 	  Unlike the change from ext2 filesystem to ext3 filesystem,</div><div class='del'>-	  the on-disk format of ext4dev is not the same as ext3 any more:</div><div class='del'>-	  it is based on extent maps and it supports 48-bit physical block</div><div class='del'>-	  numbers. These combined on-disk format changes will allow</div><div class='del'>-	  ext4dev/ext4 to handle more than 16 TB filesystem volumes --</div><div class='del'>-	  a hard limit that ext3 cannot overcome without changing the</div><div class='del'>-	  on-disk format.</div><div class='del'>-</div><div class='del'>-	  Other than extent maps and 48-bit block numbers, ext4dev also is</div><div class='del'>-	  likely to have other new features such as persistent preallocation,</div><div class='del'>-	  high resolution time stamps, and larger file support etc.  These</div><div class='del'>-	  features will be added to ext4dev gradually.</div><div class='add'>+	  the on-disk format of ext4 is not forwards compatible with</div><div class='add'>+	  ext3; it is based on extent maps and it supports 48-bit</div><div class='add'>+	  physical block numbers.  The ext4 filesystem also supports delayed</div><div class='add'>+	  allocation, persistent preallocation, high resolution time stamps,</div><div class='add'>+	  and a number of other features to improve performance and speed</div><div class='add'>+	  up fsck time.  For more information, please see the web pages at</div><div class='add'>+	  http://ext4.wiki.kernel.org.</div><div class='add'>+</div><div class='add'>+	  The ext4 filesystem will support mounting an ext3</div><div class='add'>+	  filesystem; while there will be some performance gains from</div><div class='add'>+	  the delayed allocation and inode table readahead, the best</div><div class='add'>+	  performance gains will require enabling ext4 features in the</div><div class='add'>+	  filesystem, or formating a new filesystem as an ext4</div><div class='add'>+	  filesystem initially.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this file system support as a module, choose M here. The</div><div class='del'>-	  module will be called ext4dev.</div><div class='add'>+	  module will be called ext4.</div><div class='ctx'> </div><div class='ctx'> 	  If unsure, say N.</div><div class='ctx'> </div><div class='del'>-config EXT4DEV_FS_XATTR</div><div class='del'>-	bool "Ext4dev extended attributes"</div><div class='del'>-	depends on EXT4DEV_FS</div><div class='add'>+config EXT4DEV_COMPAT</div><div class='add'>+	bool "Enable ext4dev compatibility"</div><div class='add'>+	depends on EXT4_FS</div><div class='add'>+	help</div><div class='add'>+	  Starting with 2.6.28, the name of the ext4 filesystem was</div><div class='add'>+	  renamed from ext4dev to ext4.  Unfortunately there are some</div><div class='add'>+	  legacy userspace programs (such as klibc's fstype) have</div><div class='add'>+	  "ext4dev" hardcoded.</div><div class='add'>+</div><div class='add'>+	  To enable backwards compatibility so that systems that are</div><div class='add'>+	  still expecting to mount ext4 filesystems using ext4dev,</div><div class='add'>+	  chose Y here.   This feature will go away by 2.6.31, so</div><div class='add'>+	  please arrange to get your userspace programs fixed!</div><div class='add'>+</div><div class='add'>+config EXT4_FS_XATTR</div><div class='add'>+	bool "Ext4 extended attributes"</div><div class='add'>+	depends on EXT4_FS</div><div class='ctx'> 	default y</div><div class='ctx'> 	help</div><div class='ctx'> 	  Extended attributes are name:value pairs associated with inodes by</div><div class='hunk'>@@ -175,11 +189,11 @@ config EXT4DEV_FS_XATTR</div><div class='ctx'> </div><div class='ctx'> 	  If unsure, say N.</div><div class='ctx'> </div><div class='del'>-	  You need this for POSIX ACL support on ext4dev/ext4.</div><div class='add'>+	  You need this for POSIX ACL support on ext4.</div><div class='ctx'> </div><div class='del'>-config EXT4DEV_FS_POSIX_ACL</div><div class='del'>-	bool "Ext4dev POSIX Access Control Lists"</div><div class='del'>-	depends on EXT4DEV_FS_XATTR</div><div class='add'>+config EXT4_FS_POSIX_ACL</div><div class='add'>+	bool "Ext4 POSIX Access Control Lists"</div><div class='add'>+	depends on EXT4_FS_XATTR</div><div class='ctx'> 	select FS_POSIX_ACL</div><div class='ctx'> 	help</div><div class='ctx'> 	  POSIX Access Control Lists (ACLs) support permissions for users and</div><div class='hunk'>@@ -190,14 +204,14 @@ config EXT4DEV_FS_POSIX_ACL</div><div class='ctx'> </div><div class='ctx'> 	  If you don't know what Access Control Lists are, say N</div><div class='ctx'> </div><div class='del'>-config EXT4DEV_FS_SECURITY</div><div class='del'>-	bool "Ext4dev Security Labels"</div><div class='del'>-	depends on EXT4DEV_FS_XATTR</div><div class='add'>+config EXT4_FS_SECURITY</div><div class='add'>+	bool "Ext4 Security Labels"</div><div class='add'>+	depends on EXT4_FS_XATTR</div><div class='ctx'> 	help</div><div class='ctx'> 	  Security labels support alternative access control models</div><div class='ctx'> 	  implemented by security modules like SELinux.  This option</div><div class='ctx'> 	  enables an extended attribute handler for file security</div><div class='del'>-	  labels in the ext4dev/ext4 filesystem.</div><div class='add'>+	  labels in the ext4 filesystem.</div><div class='ctx'> </div><div class='ctx'> 	  If you are not using a security module that requires using</div><div class='ctx'> 	  extended attributes for file security labels, say N.</div><div class='hunk'>@@ -206,17 +220,16 @@ config JBD</div><div class='ctx'> 	tristate</div><div class='ctx'> 	help</div><div class='ctx'> 	  This is a generic journalling layer for block devices.  It is</div><div class='del'>-	  currently used by the ext3 and OCFS2 file systems, but it could</div><div class='del'>-	  also be used to add journal support to other file systems or block</div><div class='add'>+	  currently used by the ext3 file system, but it could also be</div><div class='add'>+	  used to add journal support to other file systems or block</div><div class='ctx'> 	  devices such as RAID or LVM.</div><div class='ctx'> </div><div class='del'>-	  If you are using the ext3 or OCFS2 file systems, you need to</div><div class='del'>-	  say Y here. If you are not using ext3 OCFS2 then you will probably</div><div class='del'>-	  want to say N.</div><div class='add'>+	  If you are using the ext3 file system, you need to say Y here.</div><div class='add'>+	  If you are not using ext3 then you will probably want to say N.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this device as a module, choose M here: the module will be</div><div class='del'>-	  called jbd.  If you are compiling ext3 or OCFS2 into the kernel,</div><div class='del'>-	  you cannot compile this code as a module.</div><div class='add'>+	  called jbd.  If you are compiling ext3 into the kernel, you</div><div class='add'>+	  cannot compile this code as a module.</div><div class='ctx'> </div><div class='ctx'> config JBD_DEBUG</div><div class='ctx'> 	bool "JBD (ext3) debugging support"</div><div class='hunk'>@@ -240,22 +253,23 @@ config JBD2</div><div class='ctx'> 	help</div><div class='ctx'> 	  This is a generic journaling layer for block devices that support</div><div class='ctx'> 	  both 32-bit and 64-bit block numbers.  It is currently used by</div><div class='del'>-	  the ext4dev/ext4 filesystem, but it could also be used to add</div><div class='add'>+	  the ext4 and OCFS2 filesystems, but it could also be used to add</div><div class='ctx'> 	  journal support to other file systems or block devices such</div><div class='ctx'> 	  as RAID or LVM.</div><div class='ctx'> </div><div class='del'>-	  If you are using ext4dev/ext4, you need to say Y here. If you are not</div><div class='del'>-	  using ext4dev/ext4 then you will probably want to say N.</div><div class='add'>+	  If you are using ext4 or OCFS2, you need to say Y here.</div><div class='add'>+	  If you are not using ext4 or OCFS2 then you will</div><div class='add'>+	  probably want to say N.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this device as a module, choose M here. The module will be</div><div class='del'>-	  called jbd2.  If you are compiling ext4dev/ext4 into the kernel,</div><div class='add'>+	  called jbd2.  If you are compiling ext4 or OCFS2 into the kernel,</div><div class='ctx'> 	  you cannot compile this code as a module.</div><div class='ctx'> </div><div class='ctx'> config JBD2_DEBUG</div><div class='del'>-	bool "JBD2 (ext4dev/ext4) debugging support"</div><div class='add'>+	bool "JBD2 (ext4) debugging support"</div><div class='ctx'> 	depends on JBD2 &amp;&amp; DEBUG_FS</div><div class='ctx'> 	help</div><div class='del'>-	  If you are using the ext4dev/ext4 journaled file system (or</div><div class='add'>+	  If you are using the ext4 journaled file system (or</div><div class='ctx'> 	  potentially any other filesystem/device using JBD2), this option</div><div class='ctx'> 	  allows you to enable debugging output while the system is running,</div><div class='ctx'> 	  in order to help track down any problems you are having.</div><div class='hunk'>@@ -270,9 +284,9 @@ config JBD2_DEBUG</div><div class='ctx'> config FS_MBCACHE</div><div class='ctx'> # Meta block cache for Extended Attributes (ext2/ext3/ext4)</div><div class='ctx'> 	tristate</div><div class='del'>-	depends on EXT2_FS_XATTR || EXT3_FS_XATTR || EXT4DEV_FS_XATTR</div><div class='del'>-	default y if EXT2_FS=y || EXT3_FS=y || EXT4DEV_FS=y</div><div class='del'>-	default m if EXT2_FS=m || EXT3_FS=m || EXT4DEV_FS=m</div><div class='add'>+	depends on EXT2_FS_XATTR || EXT3_FS_XATTR || EXT4_FS_XATTR</div><div class='add'>+	default y if EXT2_FS=y || EXT3_FS=y || EXT4_FS=y</div><div class='add'>+	default m if EXT2_FS=m || EXT3_FS=m || EXT4_FS=m</div><div class='ctx'> </div><div class='ctx'> config REISERFS_FS</div><div class='ctx'> 	tristate "Reiserfs support"</div><div class='hunk'>@@ -419,6 +433,14 @@ config FS_POSIX_ACL</div><div class='ctx'> 	bool</div><div class='ctx'> 	default n</div><div class='ctx'> </div><div class='add'>+config FILE_LOCKING</div><div class='add'>+	bool "Enable POSIX file locking API" if EMBEDDED</div><div class='add'>+	default y</div><div class='add'>+	help</div><div class='add'>+	  This option enables standard file locking support, required</div><div class='add'>+          for filesystems like NFS and for the flock() system</div><div class='add'>+          call. Disabling this option saves about 11k.</div><div class='add'>+</div><div class='ctx'> source "fs/xfs/Kconfig"</div><div class='ctx'> source "fs/gfs2/Kconfig"</div><div class='ctx'> </div><div class='hunk'>@@ -426,7 +448,7 @@ config OCFS2_FS</div><div class='ctx'> 	tristate "OCFS2 file system support"</div><div class='ctx'> 	depends on NET &amp;&amp; SYSFS</div><div class='ctx'> 	select CONFIGFS_FS</div><div class='del'>-	select JBD</div><div class='add'>+	select JBD2</div><div class='ctx'> 	select CRC32</div><div class='ctx'> 	help</div><div class='ctx'> 	  OCFS2 is a general purpose extent based shared disk cluster file</div><div class='hunk'>@@ -497,6 +519,16 @@ config OCFS2_DEBUG_FS</div><div class='ctx'> 	  this option for debugging only as it is likely to decrease</div><div class='ctx'> 	  performance of the filesystem.</div><div class='ctx'> </div><div class='add'>+config OCFS2_COMPAT_JBD</div><div class='add'>+	bool "Use JBD for compatibility"</div><div class='add'>+	depends on OCFS2_FS</div><div class='add'>+	default n</div><div class='add'>+	select JBD</div><div class='add'>+	help</div><div class='add'>+	  The ocfs2 filesystem now uses JBD2 for its journalling.  JBD2</div><div class='add'>+	  is backwards compatible with JBD.  It is safe to say N here.</div><div class='add'>+	  However, if you really want to use the original JBD, say Y here.</div><div class='add'>+</div><div class='ctx'> endif # BLOCK</div><div class='ctx'> </div><div class='ctx'> config DNOTIFY</div><div class='hunk'>@@ -1765,6 +1797,28 @@ config SUNRPC_XPRT_RDMA</div><div class='ctx'> </div><div class='ctx'> 	  If unsure, say N.</div><div class='ctx'> </div><div class='add'>+config SUNRPC_REGISTER_V4</div><div class='add'>+	bool "Register local RPC services via rpcbind v4 (EXPERIMENTAL)"</div><div class='add'>+	depends on SUNRPC &amp;&amp; EXPERIMENTAL</div><div class='add'>+	default n</div><div class='add'>+	help</div><div class='add'>+	  Sun added support for registering RPC services at an IPv6</div><div class='add'>+	  address by creating two new versions of the rpcbind protocol</div><div class='add'>+	  (RFC 1833).</div><div class='add'>+</div><div class='add'>+	  This option enables support in the kernel RPC server for</div><div class='add'>+	  registering kernel RPC services via version 4 of the rpcbind</div><div class='add'>+	  protocol.  If you enable this option, you must run a portmapper</div><div class='add'>+	  daemon that supports rpcbind protocol version 4.</div><div class='add'>+</div><div class='add'>+	  Serving NFS over IPv6 from knfsd (the kernel's NFS server)</div><div class='add'>+	  requires that you enable this option and use a portmapper that</div><div class='add'>+	  supports rpcbind version 4.</div><div class='add'>+</div><div class='add'>+	  If unsure, say N to get traditional behavior (register kernel</div><div class='add'>+	  RPC services using only rpcbind version 2).  Distributions</div><div class='add'>+	  using the legacy Linux portmapper daemon must say N here.</div><div class='add'>+</div><div class='ctx'> config RPCSEC_GSS_KRB5</div><div class='ctx'> 	tristate "Secure RPC: Kerberos V mechanism (EXPERIMENTAL)"</div><div class='ctx'> 	depends on SUNRPC &amp;&amp; EXPERIMENTAL</div><div class='head'>diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt<br/>index 4a551af6f3fc..801db1341811 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/Kconfig.binfmt?id=c15895ef30c2c03e99802951787183039a349d32'>fs/Kconfig.binfmt</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/Kconfig.binfmt?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/Kconfig.binfmt</a></div><div class='hunk'>@@ -25,7 +25,7 @@ config BINFMT_ELF</div><div class='ctx'> </div><div class='ctx'> config COMPAT_BINFMT_ELF</div><div class='ctx'> 	bool</div><div class='del'>-	depends on COMPAT &amp;&amp; MMU</div><div class='add'>+	depends on COMPAT &amp;&amp; BINFMT_ELF</div><div class='ctx'> </div><div class='ctx'> config BINFMT_ELF_FDPIC</div><div class='ctx'> 	bool "Kernel support for FDPIC ELF binaries"</div><div class='hunk'>@@ -59,10 +59,12 @@ config BINFMT_SHARED_FLAT</div><div class='ctx'> 	help</div><div class='ctx'> 	  Support FLAT shared libraries</div><div class='ctx'> </div><div class='add'>+config HAVE_AOUT</div><div class='add'>+       def_bool n</div><div class='add'>+</div><div class='ctx'> config BINFMT_AOUT</div><div class='ctx'> 	tristate "Kernel support for a.out and ECOFF binaries"</div><div class='del'>-	depends on ARCH_SUPPORTS_AOUT &amp;&amp; \</div><div class='del'>-		(X86_32 || ALPHA || ARM || M68K)</div><div class='add'>+	depends on HAVE_AOUT</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  A.out (Assembler.OUTput) is a set of formats for libraries and</div><div class='ctx'> 	  executables used in the earliest versions of UNIX.  Linux used</div><div class='head'>diff --git a/fs/Makefile b/fs/Makefile<br/>index a1482a5eff15..2168c902d5ca 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>fs/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/Makefile</a></div><div class='hunk'>@@ -7,8 +7,8 @@</div><div class='ctx'> </div><div class='ctx'> obj-y :=	open.o read_write.o file_table.o super.o \</div><div class='ctx'> 		char_dev.o stat.o exec.o pipe.o namei.o fcntl.o \</div><div class='del'>-		ioctl.o readdir.o select.o fifo.o locks.o dcache.o inode.o \</div><div class='del'>-		attr.o bad_inode.o file.o filesystems.o namespace.o aio.o \</div><div class='add'>+		ioctl.o readdir.o select.o fifo.o dcache.o inode.o \</div><div class='add'>+		attr.o bad_inode.o file.o filesystems.o namespace.o \</div><div class='ctx'> 		seq_file.o xattr.o libfs.o fs-writeback.o \</div><div class='ctx'> 		pnode.o drop_caches.o splice.o sync.o utimes.o \</div><div class='ctx'> 		stack.o</div><div class='hunk'>@@ -27,6 +27,8 @@ obj-$(CONFIG_ANON_INODES)	+= anon_inodes.o</div><div class='ctx'> obj-$(CONFIG_SIGNALFD)		+= signalfd.o</div><div class='ctx'> obj-$(CONFIG_TIMERFD)		+= timerfd.o</div><div class='ctx'> obj-$(CONFIG_EVENTFD)		+= eventfd.o</div><div class='add'>+obj-$(CONFIG_AIO)               += aio.o</div><div class='add'>+obj-$(CONFIG_FILE_LOCKING)      += locks.o</div><div class='ctx'> obj-$(CONFIG_COMPAT)		+= compat.o compat_ioctl.o</div><div class='ctx'> </div><div class='ctx'> nfsd-$(CONFIG_NFSD)		:= nfsctl.o</div><div class='hunk'>@@ -69,7 +71,7 @@ obj-$(CONFIG_DLM)		+= dlm/</div><div class='ctx'> # Do not add any filesystems before this line</div><div class='ctx'> obj-$(CONFIG_REISERFS_FS)	+= reiserfs/</div><div class='ctx'> obj-$(CONFIG_EXT3_FS)		+= ext3/ # Before ext2 so root fs can be ext3</div><div class='del'>-obj-$(CONFIG_EXT4DEV_FS)	+= ext4/ # Before ext2 so root fs can be ext4dev</div><div class='add'>+obj-$(CONFIG_EXT4_FS)		+= ext4/ # Before ext2 so root fs can be ext4</div><div class='ctx'> obj-$(CONFIG_JBD)		+= jbd/</div><div class='ctx'> obj-$(CONFIG_JBD2)		+= jbd2/</div><div class='ctx'> obj-$(CONFIG_EXT2_FS)		+= ext2/</div><div class='head'>diff --git a/fs/adfs/super.c b/fs/adfs/super.c<br/>index 26f3b43726bb..7f83a46f2b7e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/adfs/super.c?id=c15895ef30c2c03e99802951787183039a349d32'>fs/adfs/super.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/adfs/super.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/adfs/super.c</a></div><div class='hunk'>@@ -157,7 +157,7 @@ static int adfs_show_options(struct seq_file *seq, struct vfsmount *mnt)</div><div class='ctx'> </div><div class='ctx'> enum {Opt_uid, Opt_gid, Opt_ownmask, Opt_othmask, Opt_err};</div><div class='ctx'> </div><div class='del'>-static match_table_t tokens = {</div><div class='add'>+static const match_table_t tokens = {</div><div class='ctx'> 	{Opt_uid, "uid=%u"},</div><div class='ctx'> 	{Opt_gid, "gid=%u"},</div><div class='ctx'> 	{Opt_ownmask, "ownmask=%o"},</div><div class='head'>diff --git a/fs/affs/super.c b/fs/affs/super.c<br/>index 3a89094f93d0..8989c93193ed 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/affs/super.c?id=c15895ef30c2c03e99802951787183039a349d32'>fs/affs/super.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/affs/super.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/affs/super.c</a></div><div class='hunk'>@@ -135,7 +135,7 @@ enum {</div><div class='ctx'> 	Opt_verbose, Opt_volume, Opt_ignore, Opt_err,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static match_table_t tokens = {</div><div class='add'>+static const match_table_t tokens = {</div><div class='ctx'> 	{Opt_bs, "bs=%u"},</div><div class='ctx'> 	{Opt_mode, "mode=%o"},</div><div class='ctx'> 	{Opt_mufs, "mufs"},</div><div class='head'>diff --git a/fs/afs/file.c b/fs/afs/file.c<br/>index 525f7c56e068..a3901769a96c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/afs/file.c?id=c15895ef30c2c03e99802951787183039a349d32'>fs/afs/file.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/afs/file.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/afs/file.c</a></div><div class='hunk'>@@ -50,8 +50,8 @@ const struct address_space_operations afs_fs_aops = {</div><div class='ctx'> 	.launder_page	= afs_launder_page,</div><div class='ctx'> 	.releasepage	= afs_releasepage,</div><div class='ctx'> 	.invalidatepage	= afs_invalidatepage,</div><div class='del'>-	.prepare_write	= afs_prepare_write,</div><div class='del'>-	.commit_write	= afs_commit_write,</div><div class='add'>+	.write_begin	= afs_write_begin,</div><div class='add'>+	.write_end	= afs_write_end,</div><div class='ctx'> 	.writepage	= afs_writepage,</div><div class='ctx'> 	.writepages	= afs_writepages,</div><div class='ctx'> };</div><div class='head'>diff --git a/fs/afs/internal.h b/fs/afs/internal.h<br/>index 3cb6920ff30b..67f259d99cd6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/afs/internal.h?id=c15895ef30c2c03e99802951787183039a349d32'>fs/afs/internal.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/afs/internal.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/afs/internal.h</a></div><div class='hunk'>@@ -728,8 +728,12 @@ extern int afs_volume_release_fileserver(struct afs_vnode *,</div><div class='ctx'>  */</div><div class='ctx'> extern int afs_set_page_dirty(struct page *);</div><div class='ctx'> extern void afs_put_writeback(struct afs_writeback *);</div><div class='del'>-extern int afs_prepare_write(struct file *, struct page *, unsigned, unsigned);</div><div class='del'>-extern int afs_commit_write(struct file *, struct page *, unsigned, unsigned);</div><div class='add'>+extern int afs_write_begin(struct file *file, struct address_space *mapping,</div><div class='add'>+			loff_t pos, unsigned len, unsigned flags,</div><div class='add'>+			struct page **pagep, void **fsdata);</div><div class='add'>+extern int afs_write_end(struct file *file, struct address_space *mapping,</div><div class='add'>+			loff_t pos, unsigned len, unsigned copied,</div><div class='add'>+			struct page *page, void *fsdata);</div><div class='ctx'> extern int afs_writepage(struct page *, struct writeback_control *);</div><div class='ctx'> extern int afs_writepages(struct address_space *, struct writeback_control *);</div><div class='ctx'> extern int afs_write_inode(struct inode *, int);</div><div class='head'>diff --git a/fs/afs/super.c b/fs/afs/super.c<br/>index 250d8c4d66e4..aee239a048cb 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/afs/super.c?id=c15895ef30c2c03e99802951787183039a349d32'>fs/afs/super.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/afs/super.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/afs/super.c</a></div><div class='hunk'>@@ -64,7 +64,7 @@ enum {</div><div class='ctx'> 	afs_opt_vol,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static match_table_t afs_options_list = {</div><div class='add'>+static const match_table_t afs_options_list = {</div><div class='ctx'> 	{ afs_opt_cell,		"cell=%s"	},</div><div class='ctx'> 	{ afs_opt_rwpath,	"rwpath"	},</div><div class='ctx'> 	{ afs_opt_vol,		"vol=%s"	},</div><div class='head'>diff --git a/fs/afs/write.c b/fs/afs/write.c<br/>index 065b4e10681a..d6b85dab35fc 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/afs/write.c?id=c15895ef30c2c03e99802951787183039a349d32'>fs/afs/write.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/afs/write.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/afs/write.c</a></div><div class='hunk'>@@ -84,15 +84,23 @@ void afs_put_writeback(struct afs_writeback *wb)</div><div class='ctx'>  * partly or wholly fill a page that's under preparation for writing</div><div class='ctx'>  */</div><div class='ctx'> static int afs_fill_page(struct afs_vnode *vnode, struct key *key,</div><div class='del'>-			 unsigned start, unsigned len, struct page *page)</div><div class='add'>+			 loff_t pos, unsigned len, struct page *page)</div><div class='ctx'> {</div><div class='add'>+	loff_t i_size;</div><div class='add'>+	unsigned eof;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	_enter(",,%u,%u", start, len);</div><div class='add'>+	_enter(",,%llu,%u", (unsigned long long)pos, len);</div><div class='ctx'> </div><div class='del'>-	ASSERTCMP(start + len, &lt;=, PAGE_SIZE);</div><div class='add'>+	ASSERTCMP(len, &lt;=, PAGE_CACHE_SIZE);</div><div class='ctx'> </div><div class='del'>-	ret = afs_vnode_fetch_data(vnode, key, start, len, page);</div><div class='add'>+	i_size = i_size_read(&amp;vnode-&gt;vfs_inode);</div><div class='add'>+	if (pos + len &gt; i_size)</div><div class='add'>+		eof = i_size;</div><div class='add'>+	else</div><div class='add'>+		eof = PAGE_CACHE_SIZE;</div><div class='add'>+</div><div class='add'>+	ret = afs_vnode_fetch_data(vnode, key, 0, eof, page);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		if (ret == -ENOENT) {</div><div class='ctx'> 			_debug("got NOENT from server"</div><div class='hunk'>@@ -107,109 +115,55 @@ static int afs_fill_page(struct afs_vnode *vnode, struct key *key,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * prepare a page for being written to</div><div class='del'>- */</div><div class='del'>-static int afs_prepare_page(struct afs_vnode *vnode, struct page *page,</div><div class='del'>-			    struct key *key, unsigned offset, unsigned to)</div><div class='del'>-{</div><div class='del'>-	unsigned eof, tail, start, stop, len;</div><div class='del'>-	loff_t i_size, pos;</div><div class='del'>-	void *p;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	_enter("");</div><div class='del'>-</div><div class='del'>-	if (offset == 0 &amp;&amp; to == PAGE_SIZE)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	p = kmap_atomic(page, KM_USER0);</div><div class='del'>-</div><div class='del'>-	i_size = i_size_read(&amp;vnode-&gt;vfs_inode);</div><div class='del'>-	pos = (loff_t) page-&gt;index &lt;&lt; PAGE_SHIFT;</div><div class='del'>-	if (pos &gt;= i_size) {</div><div class='del'>-		/* partial write, page beyond EOF */</div><div class='del'>-		_debug("beyond");</div><div class='del'>-		if (offset &gt; 0)</div><div class='del'>-			memset(p, 0, offset);</div><div class='del'>-		if (to &lt; PAGE_SIZE)</div><div class='del'>-			memset(p + to, 0, PAGE_SIZE - to);</div><div class='del'>-		kunmap_atomic(p, KM_USER0);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (i_size - pos &gt;= PAGE_SIZE) {</div><div class='del'>-		/* partial write, page entirely before EOF */</div><div class='del'>-		_debug("before");</div><div class='del'>-		tail = eof = PAGE_SIZE;</div><div class='del'>-	} else {</div><div class='del'>-		/* partial write, page overlaps EOF */</div><div class='del'>-		eof = i_size - pos;</div><div class='del'>-		_debug("overlap %u", eof);</div><div class='del'>-		tail = max(eof, to);</div><div class='del'>-		if (tail &lt; PAGE_SIZE)</div><div class='del'>-			memset(p + tail, 0, PAGE_SIZE - tail);</div><div class='del'>-		if (offset &gt; eof)</div><div class='del'>-			memset(p + eof, 0, PAGE_SIZE - eof);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	kunmap_atomic(p, KM_USER0);</div><div class='del'>-</div><div class='del'>-	ret = 0;</div><div class='del'>-	if (offset &gt; 0 || eof &gt; to) {</div><div class='del'>-		/* need to fill one or two bits that aren't going to be written</div><div class='del'>-		 * (cover both fillers in one read if there are two) */</div><div class='del'>-		start = (offset &gt; 0) ? 0 : to;</div><div class='del'>-		stop = (eof &gt; to) ? eof : offset;</div><div class='del'>-		len = stop - start;</div><div class='del'>-		_debug("wr=%u-%u av=0-%u rd=%u@%u",</div><div class='del'>-		       offset, to, eof, start, len);</div><div class='del'>-		ret = afs_fill_page(vnode, key, start, len, page);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	_leave(" = %d", ret);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * prepare to perform part of a write to a page</div><div class='del'>- * - the caller holds the page locked, preventing it from being written out or</div><div class='del'>- *   modified by anyone else</div><div class='ctx'>  */</div><div class='del'>-int afs_prepare_write(struct file *file, struct page *page,</div><div class='del'>-		      unsigned offset, unsigned to)</div><div class='add'>+int afs_write_begin(struct file *file, struct address_space *mapping,</div><div class='add'>+		    loff_t pos, unsigned len, unsigned flags,</div><div class='add'>+		    struct page **pagep, void **fsdata)</div><div class='ctx'> {</div><div class='ctx'> 	struct afs_writeback *candidate, *wb;</div><div class='ctx'> 	struct afs_vnode *vnode = AFS_FS_I(file-&gt;f_dentry-&gt;d_inode);</div><div class='add'>+	struct page *page;</div><div class='ctx'> 	struct key *key = file-&gt;private_data;</div><div class='del'>-	pgoff_t index;</div><div class='add'>+	unsigned from = pos &amp; (PAGE_CACHE_SIZE - 1);</div><div class='add'>+	unsigned to = from + len;</div><div class='add'>+	pgoff_t index = pos &gt;&gt; PAGE_CACHE_SHIFT;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	_enter("{%x:%u},{%lx},%u,%u",</div><div class='del'>-	       vnode-&gt;fid.vid, vnode-&gt;fid.vnode, page-&gt;index, offset, to);</div><div class='add'>+	       vnode-&gt;fid.vid, vnode-&gt;fid.vnode, index, from, to);</div><div class='ctx'> </div><div class='ctx'> 	candidate = kzalloc(sizeof(*candidate), GFP_KERNEL);</div><div class='ctx'> 	if (!candidate)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	candidate-&gt;vnode = vnode;</div><div class='del'>-	candidate-&gt;first = candidate-&gt;last = page-&gt;index;</div><div class='del'>-	candidate-&gt;offset_first = offset;</div><div class='add'>+	candidate-&gt;first = candidate-&gt;last = index;</div><div class='add'>+	candidate-&gt;offset_first = from;</div><div class='ctx'> 	candidate-&gt;to_last = to;</div><div class='ctx'> 	candidate-&gt;usage = 1;</div><div class='ctx'> 	candidate-&gt;state = AFS_WBACK_PENDING;</div><div class='ctx'> 	init_waitqueue_head(&amp;candidate-&gt;waitq);</div><div class='ctx'> </div><div class='add'>+	page = __grab_cache_page(mapping, index);</div><div class='add'>+	if (!page) {</div><div class='add'>+		kfree(candidate);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	*pagep = page;</div><div class='add'>+	/* page won't leak in error case: it eventually gets cleaned off LRU */</div><div class='add'>+</div><div class='ctx'> 	if (!PageUptodate(page)) {</div><div class='ctx'> 		_debug("not up to date");</div><div class='del'>-		ret = afs_prepare_page(vnode, page, key, offset, to);</div><div class='add'>+		ret = afs_fill_page(vnode, key, pos, len, page);</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='ctx'> 			kfree(candidate);</div><div class='ctx'> 			_leave(" = %d [prep]", ret);</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		}</div><div class='add'>+		SetPageUptodate(page);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> try_again:</div><div class='del'>-	index = page-&gt;index;</div><div class='ctx'> 	spin_lock(&amp;vnode-&gt;writeback_lock);</div><div class='ctx'> </div><div class='ctx'> 	/* see if this page is already pending a writeback under a suitable key</div><div class='hunk'>@@ -242,8 +196,8 @@ try_again:</div><div class='ctx'> subsume_in_current_wb:</div><div class='ctx'> 	_debug("subsume");</div><div class='ctx'> 	ASSERTRANGE(wb-&gt;first, &lt;=, index, &lt;=, wb-&gt;last);</div><div class='del'>-	if (index == wb-&gt;first &amp;&amp; offset &lt; wb-&gt;offset_first)</div><div class='del'>-		wb-&gt;offset_first = offset;</div><div class='add'>+	if (index == wb-&gt;first &amp;&amp; from &lt; wb-&gt;offset_first)</div><div class='add'>+		wb-&gt;offset_first = from;</div><div class='ctx'> 	if (index == wb-&gt;last &amp;&amp; to &gt; wb-&gt;to_last)</div><div class='ctx'> 		wb-&gt;to_last = to;</div><div class='ctx'> 	spin_unlock(&amp;vnode-&gt;writeback_lock);</div><div class='hunk'>@@ -289,17 +243,17 @@ flush_conflicting_wb:</div><div class='ctx'> /*</div><div class='ctx'>  * finalise part of a write to a page</div><div class='ctx'>  */</div><div class='del'>-int afs_commit_write(struct file *file, struct page *page,</div><div class='del'>-		     unsigned offset, unsigned to)</div><div class='add'>+int afs_write_end(struct file *file, struct address_space *mapping,</div><div class='add'>+		  loff_t pos, unsigned len, unsigned copied,</div><div class='add'>+		  struct page *page, void *fsdata)</div><div class='ctx'> {</div><div class='ctx'> 	struct afs_vnode *vnode = AFS_FS_I(file-&gt;f_dentry-&gt;d_inode);</div><div class='ctx'> 	loff_t i_size, maybe_i_size;</div><div class='ctx'> </div><div class='del'>-	_enter("{%x:%u},{%lx},%u,%u",</div><div class='del'>-	       vnode-&gt;fid.vid, vnode-&gt;fid.vnode, page-&gt;index, offset, to);</div><div class='add'>+	_enter("{%x:%u},{%lx}",</div><div class='add'>+	       vnode-&gt;fid.vid, vnode-&gt;fid.vnode, page-&gt;index);</div><div class='ctx'> </div><div class='del'>-	maybe_i_size = (loff_t) page-&gt;index &lt;&lt; PAGE_SHIFT;</div><div class='del'>-	maybe_i_size += to;</div><div class='add'>+	maybe_i_size = pos + copied;</div><div class='ctx'> </div><div class='ctx'> 	i_size = i_size_read(&amp;vnode-&gt;vfs_inode);</div><div class='ctx'> 	if (maybe_i_size &gt; i_size) {</div><div class='hunk'>@@ -310,12 +264,13 @@ int afs_commit_write(struct file *file, struct page *page,</div><div class='ctx'> 		spin_unlock(&amp;vnode-&gt;writeback_lock);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	SetPageUptodate(page);</div><div class='ctx'> 	set_page_dirty(page);</div><div class='ctx'> 	if (PageDirty(page))</div><div class='ctx'> 		_debug("dirtied");</div><div class='add'>+	unlock_page(page);</div><div class='add'>+	page_cache_release(page);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return copied;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/fs/autofs/inode.c b/fs/autofs/inode.c<br/>index dda510d31f84..b70eea1e8c59 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/autofs/inode.c?id=c15895ef30c2c03e99802951787183039a349d32'>fs/autofs/inode.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/autofs/inode.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/autofs/inode.c</a></div><div class='hunk'>@@ -59,7 +59,7 @@ static const struct super_operations autofs_sops = {</div><div class='ctx'> </div><div class='ctx'> enum {Opt_err, Opt_fd, Opt_uid, Opt_gid, Opt_pgrp, Opt_minproto, Opt_maxproto};</div><div class='ctx'> </div><div class='del'>-static match_table_t autofs_tokens = {</div><div class='add'>+static const match_table_t autofs_tokens = {</div><div class='ctx'> 	{Opt_fd, "fd=%u"},</div><div class='ctx'> 	{Opt_uid, "uid=%u"},</div><div class='ctx'> 	{Opt_gid, "gid=%u"},</div><div class='head'>diff --git a/fs/autofs4/Makefile b/fs/autofs4/Makefile<br/>index f2c3b79e94d2..a811c1f7d9ab 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/autofs4/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>fs/autofs4/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/autofs4/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/autofs4/Makefile</a></div><div class='hunk'>@@ -4,4 +4,4 @@</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_AUTOFS4_FS) += autofs4.o</div><div class='ctx'> </div><div class='del'>-autofs4-objs := init.o inode.o root.o symlink.o waitq.o expire.o</div><div class='add'>+autofs4-objs := init.o inode.o root.o symlink.o waitq.o expire.o dev-ioctl.o</div><div class='head'>diff --git a/fs/autofs4/autofs_i.h b/fs/autofs4/autofs_i.h<br/>index 69a2f5c92319..e0f16da00e54 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/autofs4/autofs_i.h?id=c15895ef30c2c03e99802951787183039a349d32'>fs/autofs4/autofs_i.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/autofs4/autofs_i.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/autofs4/autofs_i.h</a></div><div class='hunk'>@@ -14,6 +14,7 @@</div><div class='ctx'> /* Internal header file for autofs */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/auto_fs4.h&gt;</div><div class='add'>+#include &lt;linux/auto_dev-ioctl.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -21,6 +22,11 @@</div><div class='ctx'> #define AUTOFS_IOC_FIRST     AUTOFS_IOC_READY</div><div class='ctx'> #define AUTOFS_IOC_COUNT     32</div><div class='ctx'> </div><div class='add'>+#define AUTOFS_DEV_IOCTL_IOC_FIRST	(AUTOFS_DEV_IOCTL_VERSION)</div><div class='add'>+#define AUTOFS_DEV_IOCTL_IOC_COUNT	(AUTOFS_IOC_COUNT - 11)</div><div class='add'>+</div><div class='add'>+#define AUTOFS_TYPE_TRIGGER	(AUTOFS_TYPE_DIRECT|AUTOFS_TYPE_OFFSET)</div><div class='add'>+</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='hunk'>@@ -35,11 +41,27 @@</div><div class='ctx'> /* #define DEBUG */</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='del'>-#define DPRINTK(fmt,args...) do { printk(KERN_DEBUG "pid %d: %s: " fmt "\n" , current-&gt;pid , __func__ , ##args); } while(0)</div><div class='add'>+#define DPRINTK(fmt, args...)				\</div><div class='add'>+do {							\</div><div class='add'>+	printk(KERN_DEBUG "pid %d: %s: " fmt "\n",	\</div><div class='add'>+		current-&gt;pid, __func__, ##args);	\</div><div class='add'>+} while (0)</div><div class='ctx'> #else</div><div class='del'>-#define DPRINTK(fmt,args...) do {} while(0)</div><div class='add'>+#define DPRINTK(fmt, args...) do {} while (0)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#define AUTOFS_WARN(fmt, args...)			\</div><div class='add'>+do {							\</div><div class='add'>+	printk(KERN_WARNING "pid %d: %s: " fmt "\n",	\</div><div class='add'>+		current-&gt;pid, __func__, ##args);	\</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define AUTOFS_ERROR(fmt, args...)			\</div><div class='add'>+do {							\</div><div class='add'>+	printk(KERN_ERR "pid %d: %s: " fmt "\n",	\</div><div class='add'>+		current-&gt;pid, __func__, ##args);	\</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='ctx'> /* Unified info structure.  This is pointed to by both the dentry and</div><div class='ctx'>    inode structures.  Each file in the filesystem has an instance of this</div><div class='ctx'>    structure.  It holds a reference to the dentry, so dentries are never</div><div class='hunk'>@@ -61,6 +83,9 @@ struct autofs_info {</div><div class='ctx'> 	unsigned long last_used;</div><div class='ctx'> 	atomic_t count;</div><div class='ctx'> </div><div class='add'>+	uid_t uid;</div><div class='add'>+	gid_t gid;</div><div class='add'>+</div><div class='ctx'> 	mode_t	mode;</div><div class='ctx'> 	size_t	size;</div><div class='ctx'> </div><div class='hunk'>@@ -92,10 +117,6 @@ struct autofs_wait_queue {</div><div class='ctx'> </div><div class='ctx'> #define AUTOFS_SBI_MAGIC 0x6d4a556d</div><div class='ctx'> </div><div class='del'>-#define AUTOFS_TYPE_INDIRECT     0x0001</div><div class='del'>-#define AUTOFS_TYPE_DIRECT       0x0002</div><div class='del'>-#define AUTOFS_TYPE_OFFSET       0x0004</div><div class='del'>-</div><div class='ctx'> struct autofs_sb_info {</div><div class='ctx'> 	u32 magic;</div><div class='ctx'> 	int pipefd;</div><div class='hunk'>@@ -169,6 +190,17 @@ int autofs4_expire_run(struct super_block *, struct vfsmount *,</div><div class='ctx'> 			struct autofs_packet_expire __user *);</div><div class='ctx'> int autofs4_expire_multi(struct super_block *, struct vfsmount *,</div><div class='ctx'> 			struct autofs_sb_info *, int __user *);</div><div class='add'>+struct dentry *autofs4_expire_direct(struct super_block *sb,</div><div class='add'>+				     struct vfsmount *mnt,</div><div class='add'>+				     struct autofs_sb_info *sbi, int how);</div><div class='add'>+struct dentry *autofs4_expire_indirect(struct super_block *sb,</div><div class='add'>+				       struct vfsmount *mnt,</div><div class='add'>+				       struct autofs_sb_info *sbi, int how);</div><div class='add'>+</div><div class='add'>+/* Device node initialization */</div><div class='add'>+</div><div class='add'>+int autofs_dev_ioctl_init(void);</div><div class='add'>+void autofs_dev_ioctl_exit(void);</div><div class='ctx'> </div><div class='ctx'> /* Operations structures */</div><div class='ctx'> </div><div class='head'>diff --git a/fs/autofs4/dev-ioctl.c b/fs/autofs4/dev-ioctl.c<br/>new file mode 100644<br/>index 000000000000..625abf5422e2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/autofs4/dev-ioctl.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/autofs4/dev-ioctl.c</a></div><div class='hunk'>@@ -0,0 +1,863 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2008 Red Hat, Inc. All rights reserved.</div><div class='add'>+ * Copyright 2008 Ian Kent &lt;raven@themaw.net&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file is part of the Linux kernel and is made available under</div><div class='add'>+ * the terms of the GNU General Public License, version 2, or at your</div><div class='add'>+ * option, any later version, incorporated herein by reference.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/vmalloc.h&gt;</div><div class='add'>+#include &lt;linux/miscdevice.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/wait.h&gt;</div><div class='add'>+#include &lt;linux/namei.h&gt;</div><div class='add'>+#include &lt;linux/fcntl.h&gt;</div><div class='add'>+#include &lt;linux/file.h&gt;</div><div class='add'>+#include &lt;linux/fdtable.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/compat.h&gt;</div><div class='add'>+#include &lt;linux/syscalls.h&gt;</div><div class='add'>+#include &lt;linux/smp_lock.h&gt;</div><div class='add'>+#include &lt;linux/magic.h&gt;</div><div class='add'>+#include &lt;linux/dcache.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='add'>+</div><div class='add'>+#include "autofs_i.h"</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This module implements an interface for routing autofs ioctl control</div><div class='add'>+ * commands via a miscellaneous device file.</div><div class='add'>+ *</div><div class='add'>+ * The alternate interface is needed because we need to be able open</div><div class='add'>+ * an ioctl file descriptor on an autofs mount that may be covered by</div><div class='add'>+ * another mount. This situation arises when starting automount(8)</div><div class='add'>+ * or other user space daemon which uses direct mounts or offset</div><div class='add'>+ * mounts (used for autofs lazy mount/umount of nested mount trees),</div><div class='add'>+ * which have been left busy at at service shutdown.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define AUTOFS_DEV_IOCTL_SIZE	sizeof(struct autofs_dev_ioctl)</div><div class='add'>+</div><div class='add'>+typedef int (*ioctl_fn)(struct file *, struct autofs_sb_info *,</div><div class='add'>+			struct autofs_dev_ioctl *);</div><div class='add'>+</div><div class='add'>+static int check_name(const char *name)</div><div class='add'>+{</div><div class='add'>+	if (!strchr(name, '/'))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Check a string doesn't overrun the chunk of</div><div class='add'>+ * memory we copied from user land.</div><div class='add'>+ */</div><div class='add'>+static int invalid_str(char *str, void *end)</div><div class='add'>+{</div><div class='add'>+	while ((void *) str &lt;= end)</div><div class='add'>+		if (!*str++)</div><div class='add'>+			return 0;</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Check that the user compiled against correct version of autofs</div><div class='add'>+ * misc device code.</div><div class='add'>+ *</div><div class='add'>+ * As well as checking the version compatibility this always copies</div><div class='add'>+ * the kernel interface version out.</div><div class='add'>+ */</div><div class='add'>+static int check_dev_ioctl_version(int cmd, struct autofs_dev_ioctl *param)</div><div class='add'>+{</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if ((AUTOFS_DEV_IOCTL_VERSION_MAJOR != param-&gt;ver_major) ||</div><div class='add'>+	    (AUTOFS_DEV_IOCTL_VERSION_MINOR &lt; param-&gt;ver_minor)) {</div><div class='add'>+		AUTOFS_WARN("ioctl control interface version mismatch: "</div><div class='add'>+		     "kernel(%u.%u), user(%u.%u), cmd(%d)",</div><div class='add'>+		     AUTOFS_DEV_IOCTL_VERSION_MAJOR,</div><div class='add'>+		     AUTOFS_DEV_IOCTL_VERSION_MINOR,</div><div class='add'>+		     param-&gt;ver_major, param-&gt;ver_minor, cmd);</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Fill in the kernel version. */</div><div class='add'>+	param-&gt;ver_major = AUTOFS_DEV_IOCTL_VERSION_MAJOR;</div><div class='add'>+	param-&gt;ver_minor = AUTOFS_DEV_IOCTL_VERSION_MINOR;</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Copy parameter control struct, including a possible path allocated</div><div class='add'>+ * at the end of the struct.</div><div class='add'>+ */</div><div class='add'>+static struct autofs_dev_ioctl *copy_dev_ioctl(struct autofs_dev_ioctl __user *in)</div><div class='add'>+{</div><div class='add'>+	struct autofs_dev_ioctl tmp, *ads;</div><div class='add'>+</div><div class='add'>+	if (copy_from_user(&amp;tmp, in, sizeof(tmp)))</div><div class='add'>+		return ERR_PTR(-EFAULT);</div><div class='add'>+</div><div class='add'>+	if (tmp.size &lt; sizeof(tmp))</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+</div><div class='add'>+	ads = kmalloc(tmp.size, GFP_KERNEL);</div><div class='add'>+	if (!ads)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	if (copy_from_user(ads, in, tmp.size)) {</div><div class='add'>+		kfree(ads);</div><div class='add'>+		return ERR_PTR(-EFAULT);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ads;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void free_dev_ioctl(struct autofs_dev_ioctl *param)</div><div class='add'>+{</div><div class='add'>+	kfree(param);</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Check sanity of parameter control fields and if a path is present</div><div class='add'>+ * check that it has a "/" and is terminated.</div><div class='add'>+ */</div><div class='add'>+static int validate_dev_ioctl(int cmd, struct autofs_dev_ioctl *param)</div><div class='add'>+{</div><div class='add'>+	int err = -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (check_dev_ioctl_version(cmd, param)) {</div><div class='add'>+		AUTOFS_WARN("invalid device control module version "</div><div class='add'>+		     "supplied for cmd(0x%08x)", cmd);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (param-&gt;size &gt; sizeof(*param)) {</div><div class='add'>+		err = check_name(param-&gt;path);</div><div class='add'>+		if (err) {</div><div class='add'>+			AUTOFS_WARN("invalid path supplied for cmd(0x%08x)",</div><div class='add'>+				    cmd);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = invalid_str(param-&gt;path,</div><div class='add'>+				 (void *) ((size_t) param + param-&gt;size));</div><div class='add'>+		if (err) {</div><div class='add'>+			AUTOFS_WARN("invalid path supplied for cmd(0x%08x)",</div><div class='add'>+				    cmd);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = 0;</div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Get the autofs super block info struct from the file opened on</div><div class='add'>+ * the autofs mount point.</div><div class='add'>+ */</div><div class='add'>+static struct autofs_sb_info *autofs_dev_ioctl_sbi(struct file *f)</div><div class='add'>+{</div><div class='add'>+	struct autofs_sb_info *sbi = NULL;</div><div class='add'>+	struct inode *inode;</div><div class='add'>+</div><div class='add'>+	if (f) {</div><div class='add'>+		inode = f-&gt;f_path.dentry-&gt;d_inode;</div><div class='add'>+		sbi = autofs4_sbi(inode-&gt;i_sb);</div><div class='add'>+	}</div><div class='add'>+	return sbi;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Return autofs module protocol version */</div><div class='add'>+static int autofs_dev_ioctl_protover(struct file *fp,</div><div class='add'>+				     struct autofs_sb_info *sbi,</div><div class='add'>+				     struct autofs_dev_ioctl *param)</div><div class='add'>+{</div><div class='add'>+	param-&gt;arg1 = sbi-&gt;version;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Return autofs module protocol sub version */</div><div class='add'>+static int autofs_dev_ioctl_protosubver(struct file *fp,</div><div class='add'>+					struct autofs_sb_info *sbi,</div><div class='add'>+					struct autofs_dev_ioctl *param)</div><div class='add'>+{</div><div class='add'>+	param-&gt;arg1 = sbi-&gt;sub_version;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Walk down the mount stack looking for an autofs mount that</div><div class='add'>+ * has the requested device number (aka. new_encode_dev(sb-&gt;s_dev).</div><div class='add'>+ */</div><div class='add'>+static int autofs_dev_ioctl_find_super(struct nameidata *nd, dev_t devno)</div><div class='add'>+{</div><div class='add'>+	struct dentry *dentry;</div><div class='add'>+	struct inode *inode;</div><div class='add'>+	struct super_block *sb;</div><div class='add'>+	dev_t s_dev;</div><div class='add'>+	unsigned int err;</div><div class='add'>+</div><div class='add'>+	err = -ENOENT;</div><div class='add'>+</div><div class='add'>+	/* Lookup the dentry name at the base of our mount point */</div><div class='add'>+	dentry = d_lookup(nd-&gt;path.dentry, &amp;nd-&gt;last);</div><div class='add'>+	if (!dentry)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	dput(nd-&gt;path.dentry);</div><div class='add'>+	nd-&gt;path.dentry = dentry;</div><div class='add'>+</div><div class='add'>+	/* And follow the mount stack looking for our autofs mount */</div><div class='add'>+	while (follow_down(&amp;nd-&gt;path.mnt, &amp;nd-&gt;path.dentry)) {</div><div class='add'>+		inode = nd-&gt;path.dentry-&gt;d_inode;</div><div class='add'>+		if (!inode)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		sb = inode-&gt;i_sb;</div><div class='add'>+		s_dev = new_encode_dev(sb-&gt;s_dev);</div><div class='add'>+		if (devno == s_dev) {</div><div class='add'>+			if (sb-&gt;s_magic == AUTOFS_SUPER_MAGIC) {</div><div class='add'>+				err = 0;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Walk down the mount stack looking for an autofs mount that</div><div class='add'>+ * has the requested mount type (ie. indirect, direct or offset).</div><div class='add'>+ */</div><div class='add'>+static int autofs_dev_ioctl_find_sbi_type(struct nameidata *nd, unsigned int type)</div><div class='add'>+{</div><div class='add'>+	struct dentry *dentry;</div><div class='add'>+	struct autofs_info *ino;</div><div class='add'>+	unsigned int err;</div><div class='add'>+</div><div class='add'>+	err = -ENOENT;</div><div class='add'>+</div><div class='add'>+	/* Lookup the dentry name at the base of our mount point */</div><div class='add'>+	dentry = d_lookup(nd-&gt;path.dentry, &amp;nd-&gt;last);</div><div class='add'>+	if (!dentry)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	dput(nd-&gt;path.dentry);</div><div class='add'>+	nd-&gt;path.dentry = dentry;</div><div class='add'>+</div><div class='add'>+	/* And follow the mount stack looking for our autofs mount */</div><div class='add'>+	while (follow_down(&amp;nd-&gt;path.mnt, &amp;nd-&gt;path.dentry)) {</div><div class='add'>+		ino = autofs4_dentry_ino(nd-&gt;path.dentry);</div><div class='add'>+		if (ino &amp;&amp; ino-&gt;sbi-&gt;type &amp; type) {</div><div class='add'>+			err = 0;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void autofs_dev_ioctl_fd_install(unsigned int fd, struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct files_struct *files = current-&gt;files;</div><div class='add'>+	struct fdtable *fdt;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;files-&gt;file_lock);</div><div class='add'>+	fdt = files_fdtable(files);</div><div class='add'>+	BUG_ON(fdt-&gt;fd[fd] != NULL);</div><div class='add'>+	rcu_assign_pointer(fdt-&gt;fd[fd], file);</div><div class='add'>+	FD_SET(fd, fdt-&gt;close_on_exec);</div><div class='add'>+	spin_unlock(&amp;files-&gt;file_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Open a file descriptor on the autofs mount point corresponding</div><div class='add'>+ * to the given path and device number (aka. new_encode_dev(sb-&gt;s_dev)).</div><div class='add'>+ */</div><div class='add'>+static int autofs_dev_ioctl_open_mountpoint(const char *path, dev_t devid)</div><div class='add'>+{</div><div class='add'>+	struct file *filp;</div><div class='add'>+	struct nameidata nd;</div><div class='add'>+	int err, fd;</div><div class='add'>+</div><div class='add'>+	fd = get_unused_fd();</div><div class='add'>+	if (likely(fd &gt;= 0)) {</div><div class='add'>+		/* Get nameidata of the parent directory */</div><div class='add'>+		err = path_lookup(path, LOOKUP_PARENT, &amp;nd);</div><div class='add'>+		if (err)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Search down, within the parent, looking for an</div><div class='add'>+		 * autofs super block that has the device number</div><div class='add'>+		 * corresponding to the autofs fs we want to open.</div><div class='add'>+		 */</div><div class='add'>+		err = autofs_dev_ioctl_find_super(&amp;nd, devid);</div><div class='add'>+		if (err) {</div><div class='add'>+			path_put(&amp;nd.path);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		filp = dentry_open(nd.path.dentry, nd.path.mnt, O_RDONLY);</div><div class='add'>+		if (IS_ERR(filp)) {</div><div class='add'>+			err = PTR_ERR(filp);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		autofs_dev_ioctl_fd_install(fd, filp);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return fd;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	put_unused_fd(fd);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Open a file descriptor on an autofs mount point */</div><div class='add'>+static int autofs_dev_ioctl_openmount(struct file *fp,</div><div class='add'>+				      struct autofs_sb_info *sbi,</div><div class='add'>+				      struct autofs_dev_ioctl *param)</div><div class='add'>+{</div><div class='add'>+	const char *path;</div><div class='add'>+	dev_t devid;</div><div class='add'>+	int err, fd;</div><div class='add'>+</div><div class='add'>+	/* param-&gt;path has already been checked */</div><div class='add'>+	if (!param-&gt;arg1)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	param-&gt;ioctlfd = -1;</div><div class='add'>+</div><div class='add'>+	path = param-&gt;path;</div><div class='add'>+	devid = param-&gt;arg1;</div><div class='add'>+</div><div class='add'>+	err = 0;</div><div class='add'>+	fd = autofs_dev_ioctl_open_mountpoint(path, devid);</div><div class='add'>+	if (unlikely(fd &lt; 0)) {</div><div class='add'>+		err = fd;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	param-&gt;ioctlfd = fd;</div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Close file descriptor allocated above (user can also use close(2)). */</div><div class='add'>+static int autofs_dev_ioctl_closemount(struct file *fp,</div><div class='add'>+				       struct autofs_sb_info *sbi,</div><div class='add'>+				       struct autofs_dev_ioctl *param)</div><div class='add'>+{</div><div class='add'>+	return sys_close(param-&gt;ioctlfd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Send "ready" status for an existing wait (either a mount or an expire</div><div class='add'>+ * request).</div><div class='add'>+ */</div><div class='add'>+static int autofs_dev_ioctl_ready(struct file *fp,</div><div class='add'>+				  struct autofs_sb_info *sbi,</div><div class='add'>+				  struct autofs_dev_ioctl *param)</div><div class='add'>+{</div><div class='add'>+	autofs_wqt_t token;</div><div class='add'>+</div><div class='add'>+	token = (autofs_wqt_t) param-&gt;arg1;</div><div class='add'>+	return autofs4_wait_release(sbi, token, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Send "fail" status for an existing wait (either a mount or an expire</div><div class='add'>+ * request).</div><div class='add'>+ */</div><div class='add'>+static int autofs_dev_ioctl_fail(struct file *fp,</div><div class='add'>+				 struct autofs_sb_info *sbi,</div><div class='add'>+				 struct autofs_dev_ioctl *param)</div><div class='add'>+{</div><div class='add'>+	autofs_wqt_t token;</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	token = (autofs_wqt_t) param-&gt;arg1;</div><div class='add'>+	status = param-&gt;arg2 ? param-&gt;arg2 : -ENOENT;</div><div class='add'>+	return autofs4_wait_release(sbi, token, status);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Set the pipe fd for kernel communication to the daemon.</div><div class='add'>+ *</div><div class='add'>+ * Normally this is set at mount using an option but if we</div><div class='add'>+ * are reconnecting to a busy mount then we need to use this</div><div class='add'>+ * to tell the autofs mount about the new kernel pipe fd. In</div><div class='add'>+ * order to protect mounts against incorrectly setting the</div><div class='add'>+ * pipefd we also require that the autofs mount be catatonic.</div><div class='add'>+ *</div><div class='add'>+ * This also sets the process group id used to identify the</div><div class='add'>+ * controlling process (eg. the owning automount(8) daemon).</div><div class='add'>+ */</div><div class='add'>+static int autofs_dev_ioctl_setpipefd(struct file *fp,</div><div class='add'>+				      struct autofs_sb_info *sbi,</div><div class='add'>+				      struct autofs_dev_ioctl *param)</div><div class='add'>+{</div><div class='add'>+	int pipefd;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (param-&gt;arg1 == -1)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	pipefd = param-&gt;arg1;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;sbi-&gt;wq_mutex);</div><div class='add'>+	if (!sbi-&gt;catatonic) {</div><div class='add'>+		mutex_unlock(&amp;sbi-&gt;wq_mutex);</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	} else {</div><div class='add'>+		struct file *pipe = fget(pipefd);</div><div class='add'>+		if (!pipe-&gt;f_op || !pipe-&gt;f_op-&gt;write) {</div><div class='add'>+			err = -EPIPE;</div><div class='add'>+			fput(pipe);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		sbi-&gt;oz_pgrp = task_pgrp_nr(current);</div><div class='add'>+		sbi-&gt;pipefd = pipefd;</div><div class='add'>+		sbi-&gt;pipe = pipe;</div><div class='add'>+		sbi-&gt;catatonic = 0;</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;sbi-&gt;wq_mutex);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Make the autofs mount point catatonic, no longer responsive to</div><div class='add'>+ * mount requests. Also closes the kernel pipe file descriptor.</div><div class='add'>+ */</div><div class='add'>+static int autofs_dev_ioctl_catatonic(struct file *fp,</div><div class='add'>+				      struct autofs_sb_info *sbi,</div><div class='add'>+				      struct autofs_dev_ioctl *param)</div><div class='add'>+{</div><div class='add'>+	autofs4_catatonic_mode(sbi);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Set the autofs mount timeout */</div><div class='add'>+static int autofs_dev_ioctl_timeout(struct file *fp,</div><div class='add'>+				    struct autofs_sb_info *sbi,</div><div class='add'>+				    struct autofs_dev_ioctl *param)</div><div class='add'>+{</div><div class='add'>+	unsigned long timeout;</div><div class='add'>+</div><div class='add'>+	timeout = param-&gt;arg1;</div><div class='add'>+	param-&gt;arg1 = sbi-&gt;exp_timeout / HZ;</div><div class='add'>+	sbi-&gt;exp_timeout = timeout * HZ;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Return the uid and gid of the last request for the mount</div><div class='add'>+ *</div><div class='add'>+ * When reconstructing an autofs mount tree with active mounts</div><div class='add'>+ * we need to re-connect to mounts that may have used the original</div><div class='add'>+ * process uid and gid (or string variations of them) for mount</div><div class='add'>+ * lookups within the map entry.</div><div class='add'>+ */</div><div class='add'>+static int autofs_dev_ioctl_requester(struct file *fp,</div><div class='add'>+				      struct autofs_sb_info *sbi,</div><div class='add'>+				      struct autofs_dev_ioctl *param)</div><div class='add'>+{</div><div class='add'>+	struct autofs_info *ino;</div><div class='add'>+	struct nameidata nd;</div><div class='add'>+	const char *path;</div><div class='add'>+	dev_t devid;</div><div class='add'>+	int err = -ENOENT;</div><div class='add'>+</div><div class='add'>+	if (param-&gt;size &lt;= sizeof(*param)) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	path = param-&gt;path;</div><div class='add'>+	devid = sbi-&gt;sb-&gt;s_dev;</div><div class='add'>+</div><div class='add'>+	param-&gt;arg1 = param-&gt;arg2 = -1;</div><div class='add'>+</div><div class='add'>+	/* Get nameidata of the parent directory */</div><div class='add'>+	err = path_lookup(path, LOOKUP_PARENT, &amp;nd);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = autofs_dev_ioctl_find_super(&amp;nd, devid);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_release;</div><div class='add'>+</div><div class='add'>+	ino = autofs4_dentry_ino(nd.path.dentry);</div><div class='add'>+	if (ino) {</div><div class='add'>+		err = 0;</div><div class='add'>+		autofs4_expire_wait(nd.path.dentry);</div><div class='add'>+		spin_lock(&amp;sbi-&gt;fs_lock);</div><div class='add'>+		param-&gt;arg1 = ino-&gt;uid;</div><div class='add'>+		param-&gt;arg2 = ino-&gt;gid;</div><div class='add'>+		spin_unlock(&amp;sbi-&gt;fs_lock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out_release:</div><div class='add'>+	path_put(&amp;nd.path);</div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Call repeatedly until it returns -EAGAIN, meaning there's nothing</div><div class='add'>+ * more that can be done.</div><div class='add'>+ */</div><div class='add'>+static int autofs_dev_ioctl_expire(struct file *fp,</div><div class='add'>+				   struct autofs_sb_info *sbi,</div><div class='add'>+				   struct autofs_dev_ioctl *param)</div><div class='add'>+{</div><div class='add'>+	struct dentry *dentry;</div><div class='add'>+	struct vfsmount *mnt;</div><div class='add'>+	int err = -EAGAIN;</div><div class='add'>+	int how;</div><div class='add'>+</div><div class='add'>+	how = param-&gt;arg1;</div><div class='add'>+	mnt = fp-&gt;f_path.mnt;</div><div class='add'>+</div><div class='add'>+	if (sbi-&gt;type &amp; AUTOFS_TYPE_TRIGGER)</div><div class='add'>+		dentry = autofs4_expire_direct(sbi-&gt;sb, mnt, sbi, how);</div><div class='add'>+	else</div><div class='add'>+		dentry = autofs4_expire_indirect(sbi-&gt;sb, mnt, sbi, how);</div><div class='add'>+</div><div class='add'>+	if (dentry) {</div><div class='add'>+		struct autofs_info *ino = autofs4_dentry_ino(dentry);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * This is synchronous because it makes the daemon a</div><div class='add'>+		 * little easier</div><div class='add'>+		*/</div><div class='add'>+		err = autofs4_wait(sbi, dentry, NFY_EXPIRE);</div><div class='add'>+</div><div class='add'>+		spin_lock(&amp;sbi-&gt;fs_lock);</div><div class='add'>+		if (ino-&gt;flags &amp; AUTOFS_INF_MOUNTPOINT) {</div><div class='add'>+			ino-&gt;flags &amp;= ~AUTOFS_INF_MOUNTPOINT;</div><div class='add'>+			sbi-&gt;sb-&gt;s_root-&gt;d_mounted++;</div><div class='add'>+		}</div><div class='add'>+		ino-&gt;flags &amp;= ~AUTOFS_INF_EXPIRING;</div><div class='add'>+		complete_all(&amp;ino-&gt;expire_complete);</div><div class='add'>+		spin_unlock(&amp;sbi-&gt;fs_lock);</div><div class='add'>+		dput(dentry);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Check if autofs mount point is in use */</div><div class='add'>+static int autofs_dev_ioctl_askumount(struct file *fp,</div><div class='add'>+				      struct autofs_sb_info *sbi,</div><div class='add'>+				      struct autofs_dev_ioctl *param)</div><div class='add'>+{</div><div class='add'>+	param-&gt;arg1 = 0;</div><div class='add'>+	if (may_umount(fp-&gt;f_path.mnt))</div><div class='add'>+		param-&gt;arg1 = 1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Check if the given path is a mountpoint.</div><div class='add'>+ *</div><div class='add'>+ * If we are supplied with the file descriptor of an autofs</div><div class='add'>+ * mount we're looking for a specific mount. In this case</div><div class='add'>+ * the path is considered a mountpoint if it is itself a</div><div class='add'>+ * mountpoint or contains a mount, such as a multi-mount</div><div class='add'>+ * without a root mount. In this case we return 1 if the</div><div class='add'>+ * path is a mount point and the super magic of the covering</div><div class='add'>+ * mount if there is one or 0 if it isn't a mountpoint.</div><div class='add'>+ *</div><div class='add'>+ * If we aren't supplied with a file descriptor then we</div><div class='add'>+ * lookup the nameidata of the path and check if it is the</div><div class='add'>+ * root of a mount. If a type is given we are looking for</div><div class='add'>+ * a particular autofs mount and if we don't find a match</div><div class='add'>+ * we return fail. If the located nameidata path is the</div><div class='add'>+ * root of a mount we return 1 along with the super magic</div><div class='add'>+ * of the mount or 0 otherwise.</div><div class='add'>+ *</div><div class='add'>+ * In both cases the the device number (as returned by</div><div class='add'>+ * new_encode_dev()) is also returned.</div><div class='add'>+ */</div><div class='add'>+static int autofs_dev_ioctl_ismountpoint(struct file *fp,</div><div class='add'>+					 struct autofs_sb_info *sbi,</div><div class='add'>+					 struct autofs_dev_ioctl *param)</div><div class='add'>+{</div><div class='add'>+	struct nameidata nd;</div><div class='add'>+	const char *path;</div><div class='add'>+	unsigned int type;</div><div class='add'>+	int err = -ENOENT;</div><div class='add'>+</div><div class='add'>+	if (param-&gt;size &lt;= sizeof(*param)) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	path = param-&gt;path;</div><div class='add'>+	type = param-&gt;arg1;</div><div class='add'>+</div><div class='add'>+	param-&gt;arg1 = 0;</div><div class='add'>+	param-&gt;arg2 = 0;</div><div class='add'>+</div><div class='add'>+	if (!fp || param-&gt;ioctlfd == -1) {</div><div class='add'>+		if (type == AUTOFS_TYPE_ANY) {</div><div class='add'>+			struct super_block *sb;</div><div class='add'>+</div><div class='add'>+			err = path_lookup(path, LOOKUP_FOLLOW, &amp;nd);</div><div class='add'>+			if (err)</div><div class='add'>+				goto out;</div><div class='add'>+</div><div class='add'>+			sb = nd.path.dentry-&gt;d_sb;</div><div class='add'>+			param-&gt;arg1 = new_encode_dev(sb-&gt;s_dev);</div><div class='add'>+		} else {</div><div class='add'>+			struct autofs_info *ino;</div><div class='add'>+</div><div class='add'>+			err = path_lookup(path, LOOKUP_PARENT, &amp;nd);</div><div class='add'>+			if (err)</div><div class='add'>+				goto out;</div><div class='add'>+</div><div class='add'>+			err = autofs_dev_ioctl_find_sbi_type(&amp;nd, type);</div><div class='add'>+			if (err)</div><div class='add'>+				goto out_release;</div><div class='add'>+</div><div class='add'>+			ino = autofs4_dentry_ino(nd.path.dentry);</div><div class='add'>+			param-&gt;arg1 = autofs4_get_dev(ino-&gt;sbi);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = 0;</div><div class='add'>+		if (nd.path.dentry-&gt;d_inode &amp;&amp;</div><div class='add'>+		    nd.path.mnt-&gt;mnt_root == nd.path.dentry) {</div><div class='add'>+			err = 1;</div><div class='add'>+			param-&gt;arg2 = nd.path.dentry-&gt;d_inode-&gt;i_sb-&gt;s_magic;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		dev_t devid = new_encode_dev(sbi-&gt;sb-&gt;s_dev);</div><div class='add'>+</div><div class='add'>+		err = path_lookup(path, LOOKUP_PARENT, &amp;nd);</div><div class='add'>+		if (err)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		err = autofs_dev_ioctl_find_super(&amp;nd, devid);</div><div class='add'>+		if (err)</div><div class='add'>+			goto out_release;</div><div class='add'>+</div><div class='add'>+		param-&gt;arg1 = autofs4_get_dev(sbi);</div><div class='add'>+</div><div class='add'>+		err = have_submounts(nd.path.dentry);</div><div class='add'>+</div><div class='add'>+		if (nd.path.mnt-&gt;mnt_mountpoint != nd.path.mnt-&gt;mnt_root) {</div><div class='add'>+			if (follow_down(&amp;nd.path.mnt, &amp;nd.path.dentry)) {</div><div class='add'>+				struct inode *inode = nd.path.dentry-&gt;d_inode;</div><div class='add'>+				param-&gt;arg2 = inode-&gt;i_sb-&gt;s_magic;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out_release:</div><div class='add'>+	path_put(&amp;nd.path);</div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Our range of ioctl numbers isn't 0 based so we need to shift</div><div class='add'>+ * the array index by _IOC_NR(AUTOFS_CTL_IOC_FIRST) for the table</div><div class='add'>+ * lookup.</div><div class='add'>+ */</div><div class='add'>+#define cmd_idx(cmd)	(cmd - _IOC_NR(AUTOFS_DEV_IOCTL_IOC_FIRST))</div><div class='add'>+</div><div class='add'>+static ioctl_fn lookup_dev_ioctl(unsigned int cmd)</div><div class='add'>+{</div><div class='add'>+	static struct {</div><div class='add'>+		int cmd;</div><div class='add'>+		ioctl_fn fn;</div><div class='add'>+	} _ioctls[] = {</div><div class='add'>+		{cmd_idx(AUTOFS_DEV_IOCTL_VERSION_CMD), NULL},</div><div class='add'>+		{cmd_idx(AUTOFS_DEV_IOCTL_PROTOVER_CMD),</div><div class='add'>+			 autofs_dev_ioctl_protover},</div><div class='add'>+		{cmd_idx(AUTOFS_DEV_IOCTL_PROTOSUBVER_CMD),</div><div class='add'>+			 autofs_dev_ioctl_protosubver},</div><div class='add'>+		{cmd_idx(AUTOFS_DEV_IOCTL_OPENMOUNT_CMD),</div><div class='add'>+			 autofs_dev_ioctl_openmount},</div><div class='add'>+		{cmd_idx(AUTOFS_DEV_IOCTL_CLOSEMOUNT_CMD),</div><div class='add'>+			 autofs_dev_ioctl_closemount},</div><div class='add'>+		{cmd_idx(AUTOFS_DEV_IOCTL_READY_CMD),</div><div class='add'>+			 autofs_dev_ioctl_ready},</div><div class='add'>+		{cmd_idx(AUTOFS_DEV_IOCTL_FAIL_CMD),</div><div class='add'>+			 autofs_dev_ioctl_fail},</div><div class='add'>+		{cmd_idx(AUTOFS_DEV_IOCTL_SETPIPEFD_CMD),</div><div class='add'>+			 autofs_dev_ioctl_setpipefd},</div><div class='add'>+		{cmd_idx(AUTOFS_DEV_IOCTL_CATATONIC_CMD),</div><div class='add'>+			 autofs_dev_ioctl_catatonic},</div><div class='add'>+		{cmd_idx(AUTOFS_DEV_IOCTL_TIMEOUT_CMD),</div><div class='add'>+			 autofs_dev_ioctl_timeout},</div><div class='add'>+		{cmd_idx(AUTOFS_DEV_IOCTL_REQUESTER_CMD),</div><div class='add'>+			 autofs_dev_ioctl_requester},</div><div class='add'>+		{cmd_idx(AUTOFS_DEV_IOCTL_EXPIRE_CMD),</div><div class='add'>+			 autofs_dev_ioctl_expire},</div><div class='add'>+		{cmd_idx(AUTOFS_DEV_IOCTL_ASKUMOUNT_CMD),</div><div class='add'>+			 autofs_dev_ioctl_askumount},</div><div class='add'>+		{cmd_idx(AUTOFS_DEV_IOCTL_ISMOUNTPOINT_CMD),</div><div class='add'>+			 autofs_dev_ioctl_ismountpoint}</div><div class='add'>+	};</div><div class='add'>+	unsigned int idx = cmd_idx(cmd);</div><div class='add'>+</div><div class='add'>+	return (idx &gt;= ARRAY_SIZE(_ioctls)) ? NULL : _ioctls[idx].fn;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* ioctl dispatcher */</div><div class='add'>+static int _autofs_dev_ioctl(unsigned int command, struct autofs_dev_ioctl __user *user)</div><div class='add'>+{</div><div class='add'>+	struct autofs_dev_ioctl *param;</div><div class='add'>+	struct file *fp;</div><div class='add'>+	struct autofs_sb_info *sbi;</div><div class='add'>+	unsigned int cmd_first, cmd;</div><div class='add'>+	ioctl_fn fn = NULL;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	/* only root can play with this */</div><div class='add'>+	if (!capable(CAP_SYS_ADMIN))</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	cmd_first = _IOC_NR(AUTOFS_DEV_IOCTL_IOC_FIRST);</div><div class='add'>+	cmd = _IOC_NR(command);</div><div class='add'>+</div><div class='add'>+	if (_IOC_TYPE(command) != _IOC_TYPE(AUTOFS_DEV_IOCTL_IOC_FIRST) ||</div><div class='add'>+	    cmd - cmd_first &gt;= AUTOFS_DEV_IOCTL_IOC_COUNT) {</div><div class='add'>+		return -ENOTTY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Copy the parameters into kernel space. */</div><div class='add'>+	param = copy_dev_ioctl(user);</div><div class='add'>+	if (IS_ERR(param))</div><div class='add'>+		return PTR_ERR(param);</div><div class='add'>+</div><div class='add'>+	err = validate_dev_ioctl(command, param);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* The validate routine above always sets the version */</div><div class='add'>+	if (cmd == AUTOFS_DEV_IOCTL_VERSION_CMD)</div><div class='add'>+		goto done;</div><div class='add'>+</div><div class='add'>+	fn = lookup_dev_ioctl(cmd);</div><div class='add'>+	if (!fn) {</div><div class='add'>+		AUTOFS_WARN("unknown command 0x%08x", command);</div><div class='add'>+		return -ENOTTY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fp = NULL;</div><div class='add'>+	sbi = NULL;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * For obvious reasons the openmount can't have a file</div><div class='add'>+	 * descriptor yet. We don't take a reference to the</div><div class='add'>+	 * file during close to allow for immediate release.</div><div class='add'>+	 */</div><div class='add'>+	if (cmd != AUTOFS_DEV_IOCTL_OPENMOUNT_CMD &amp;&amp;</div><div class='add'>+	    cmd != AUTOFS_DEV_IOCTL_CLOSEMOUNT_CMD) {</div><div class='add'>+		fp = fget(param-&gt;ioctlfd);</div><div class='add'>+		if (!fp) {</div><div class='add'>+			if (cmd == AUTOFS_DEV_IOCTL_ISMOUNTPOINT_CMD)</div><div class='add'>+				goto cont;</div><div class='add'>+			err = -EBADF;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!fp-&gt;f_op) {</div><div class='add'>+			err = -ENOTTY;</div><div class='add'>+			fput(fp);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		sbi = autofs_dev_ioctl_sbi(fp);</div><div class='add'>+		if (!sbi || sbi-&gt;magic != AUTOFS_SBI_MAGIC) {</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			fput(fp);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Admin needs to be able to set the mount catatonic in</div><div class='add'>+		 * order to be able to perform the re-open.</div><div class='add'>+		 */</div><div class='add'>+		if (!autofs4_oz_mode(sbi) &amp;&amp;</div><div class='add'>+		    cmd != AUTOFS_DEV_IOCTL_CATATONIC_CMD) {</div><div class='add'>+			err = -EACCES;</div><div class='add'>+			fput(fp);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+cont:</div><div class='add'>+	err = fn(fp, sbi, param);</div><div class='add'>+</div><div class='add'>+	if (fp)</div><div class='add'>+		fput(fp);</div><div class='add'>+done:</div><div class='add'>+	if (err &gt;= 0 &amp;&amp; copy_to_user(user, param, AUTOFS_DEV_IOCTL_SIZE))</div><div class='add'>+		err = -EFAULT;</div><div class='add'>+out:</div><div class='add'>+	free_dev_ioctl(param);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long autofs_dev_ioctl(struct file *file, uint command, ulong u)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	err = _autofs_dev_ioctl(command, (struct autofs_dev_ioctl __user *) u);</div><div class='add'>+	return (long) err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_COMPAT</div><div class='add'>+static long autofs_dev_ioctl_compat(struct file *file, uint command, ulong u)</div><div class='add'>+{</div><div class='add'>+	return (long) autofs_dev_ioctl(file, command, (ulong) compat_ptr(u));</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+#define autofs_dev_ioctl_compat NULL</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static const struct file_operations _dev_ioctl_fops = {</div><div class='add'>+	.unlocked_ioctl	 = autofs_dev_ioctl,</div><div class='add'>+	.compat_ioctl = autofs_dev_ioctl_compat,</div><div class='add'>+	.owner	 = THIS_MODULE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct miscdevice _autofs_dev_ioctl_misc = {</div><div class='add'>+	.minor 		= MISC_DYNAMIC_MINOR,</div><div class='add'>+	.name  		= AUTOFS_DEVICE_NAME,</div><div class='add'>+	.fops  		= &amp;_dev_ioctl_fops</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Register/deregister misc character device */</div><div class='add'>+int autofs_dev_ioctl_init(void)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	r = misc_register(&amp;_autofs_dev_ioctl_misc);</div><div class='add'>+	if (r) {</div><div class='add'>+		AUTOFS_ERROR("misc_register failed for control device");</div><div class='add'>+		return r;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void autofs_dev_ioctl_exit(void)</div><div class='add'>+{</div><div class='add'>+	misc_deregister(&amp;_autofs_dev_ioctl_misc);</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='head'>diff --git a/fs/autofs4/expire.c b/fs/autofs4/expire.c<br/>index cdabb796ff01..cde2f8e8935a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/autofs4/expire.c?id=c15895ef30c2c03e99802951787183039a349d32'>fs/autofs4/expire.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/autofs4/expire.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/autofs4/expire.c</a></div><div class='hunk'>@@ -244,10 +244,10 @@ cont:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Check if we can expire a direct mount (possibly a tree) */</div><div class='del'>-static struct dentry *autofs4_expire_direct(struct super_block *sb,</div><div class='del'>-					    struct vfsmount *mnt,</div><div class='del'>-					    struct autofs_sb_info *sbi,</div><div class='del'>-					    int how)</div><div class='add'>+struct dentry *autofs4_expire_direct(struct super_block *sb,</div><div class='add'>+				     struct vfsmount *mnt,</div><div class='add'>+				     struct autofs_sb_info *sbi,</div><div class='add'>+				     int how)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long timeout;</div><div class='ctx'> 	struct dentry *root = dget(sb-&gt;s_root);</div><div class='hunk'>@@ -283,10 +283,10 @@ static struct dentry *autofs4_expire_direct(struct super_block *sb,</div><div class='ctx'>  *  - it is unused by any user process</div><div class='ctx'>  *  - it has been unused for exp_timeout time</div><div class='ctx'>  */</div><div class='del'>-static struct dentry *autofs4_expire_indirect(struct super_block *sb,</div><div class='del'>-					      struct vfsmount *mnt,</div><div class='del'>-					      struct autofs_sb_info *sbi,</div><div class='del'>-					      int how)</div><div class='add'>+struct dentry *autofs4_expire_indirect(struct super_block *sb,</div><div class='add'>+				       struct vfsmount *mnt,</div><div class='add'>+				       struct autofs_sb_info *sbi,</div><div class='add'>+				       int how)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long timeout;</div><div class='ctx'> 	struct dentry *root = sb-&gt;s_root;</div><div class='hunk'>@@ -479,7 +479,7 @@ int autofs4_expire_multi(struct super_block *sb, struct vfsmount *mnt,</div><div class='ctx'> 	if (arg &amp;&amp; get_user(do_now, arg))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-	if (sbi-&gt;type &amp; AUTOFS_TYPE_DIRECT)</div><div class='add'>+	if (sbi-&gt;type &amp; AUTOFS_TYPE_TRIGGER)</div><div class='ctx'> 		dentry = autofs4_expire_direct(sb, mnt, sbi, do_now);</div><div class='ctx'> 	else</div><div class='ctx'> 		dentry = autofs4_expire_indirect(sb, mnt, sbi, do_now);</div><div class='head'>diff --git a/fs/autofs4/init.c b/fs/autofs4/init.c<br/>index 723a1c5e361b..9722e4bd8957 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/autofs4/init.c?id=c15895ef30c2c03e99802951787183039a349d32'>fs/autofs4/init.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/autofs4/init.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/autofs4/init.c</a></div><div class='hunk'>@@ -29,11 +29,20 @@ static struct file_system_type autofs_fs_type = {</div><div class='ctx'> </div><div class='ctx'> static int __init init_autofs4_fs(void)</div><div class='ctx'> {</div><div class='del'>-	return register_filesystem(&amp;autofs_fs_type);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = register_filesystem(&amp;autofs_fs_type);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	autofs_dev_ioctl_init();</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit exit_autofs4_fs(void)</div><div class='ctx'> {</div><div class='add'>+	autofs_dev_ioctl_exit();</div><div class='ctx'> 	unregister_filesystem(&amp;autofs_fs_type);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/fs/autofs4/inode.c b/fs/autofs4/inode.c<br/>index 7bb3e5ba0537..c7e65bb30ba0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/autofs4/inode.c?id=c15895ef30c2c03e99802951787183039a349d32'>fs/autofs4/inode.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/autofs4/inode.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/autofs4/inode.c</a></div><div class='hunk'>@@ -53,6 +53,8 @@ struct autofs_info *autofs4_init_ino(struct autofs_info *ino,</div><div class='ctx'> 		atomic_set(&amp;ino-&gt;count, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ino-&gt;uid = 0;</div><div class='add'>+	ino-&gt;gid = 0;</div><div class='ctx'> 	ino-&gt;mode = mode;</div><div class='ctx'> 	ino-&gt;last_used = jiffies;</div><div class='ctx'> </div><div class='hunk'>@@ -213,7 +215,7 @@ static const struct super_operations autofs4_sops = {</div><div class='ctx'> enum {Opt_err, Opt_fd, Opt_uid, Opt_gid, Opt_pgrp, Opt_minproto, Opt_maxproto,</div><div class='ctx'> 	Opt_indirect, Opt_direct, Opt_offset};</div><div class='ctx'> </div><div class='del'>-static match_table_t tokens = {</div><div class='add'>+static const match_table_t tokens = {</div><div class='ctx'> 	{Opt_fd, "fd=%u"},</div><div class='ctx'> 	{Opt_uid, "uid=%u"},</div><div class='ctx'> 	{Opt_gid, "gid=%u"},</div><div class='hunk'>@@ -288,7 +290,7 @@ static int parse_options(char *options, int *pipefd, uid_t *uid, gid_t *gid,</div><div class='ctx'> 			*type = AUTOFS_TYPE_DIRECT;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case Opt_offset:</div><div class='del'>-			*type = AUTOFS_TYPE_DIRECT | AUTOFS_TYPE_OFFSET;</div><div class='add'>+			*type = AUTOFS_TYPE_OFFSET;</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			return 1;</div><div class='hunk'>@@ -336,7 +338,7 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent)</div><div class='ctx'> 	sbi-&gt;sb = s;</div><div class='ctx'> 	sbi-&gt;version = 0;</div><div class='ctx'> 	sbi-&gt;sub_version = 0;</div><div class='del'>-	sbi-&gt;type = 0;</div><div class='add'>+	sbi-&gt;type = AUTOFS_TYPE_INDIRECT;</div><div class='ctx'> 	sbi-&gt;min_proto = 0;</div><div class='ctx'> 	sbi-&gt;max_proto = 0;</div><div class='ctx'> 	mutex_init(&amp;sbi-&gt;wq_mutex);</div><div class='hunk'>@@ -378,7 +380,7 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	root_inode-&gt;i_fop = &amp;autofs4_root_operations;</div><div class='del'>-	root_inode-&gt;i_op = sbi-&gt;type &amp; AUTOFS_TYPE_DIRECT ?</div><div class='add'>+	root_inode-&gt;i_op = sbi-&gt;type &amp; AUTOFS_TYPE_TRIGGER ?</div><div class='ctx'> 			&amp;autofs4_direct_root_inode_operations :</div><div class='ctx'> 			&amp;autofs4_indirect_root_inode_operations;</div><div class='ctx'> </div><div class='head'>diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c<br/>index 35216d18d8b5..4b67c2a2d77c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/autofs4/waitq.c?id=c15895ef30c2c03e99802951787183039a349d32'>fs/autofs4/waitq.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/autofs4/waitq.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/autofs4/waitq.c</a></div><div class='hunk'>@@ -337,7 +337,7 @@ int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,</div><div class='ctx'> 		 * is very similar for indirect mounts except only dentrys</div><div class='ctx'> 		 * in the root of the autofs file system may be negative.</div><div class='ctx'> 		 */</div><div class='del'>-		if (sbi-&gt;type &amp; (AUTOFS_TYPE_DIRECT|AUTOFS_TYPE_OFFSET))</div><div class='add'>+		if (sbi-&gt;type &amp; AUTOFS_TYPE_TRIGGER)</div><div class='ctx'> 			return -ENOENT;</div><div class='ctx'> 		else if (!IS_ROOT(dentry-&gt;d_parent))</div><div class='ctx'> 			return -ENOENT;</div><div class='hunk'>@@ -348,7 +348,7 @@ int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	/* If this is a direct mount request create a dummy name */</div><div class='del'>-	if (IS_ROOT(dentry) &amp;&amp; (sbi-&gt;type &amp; AUTOFS_TYPE_DIRECT))</div><div class='add'>+	if (IS_ROOT(dentry) &amp;&amp; sbi-&gt;type &amp; AUTOFS_TYPE_TRIGGER)</div><div class='ctx'> 		qstr.len = sprintf(name, "%p", dentry);</div><div class='ctx'> 	else {</div><div class='ctx'> 		qstr.len = autofs4_getpath(sbi, dentry, &amp;name);</div><div class='hunk'>@@ -406,11 +406,11 @@ int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,</div><div class='ctx'> 				type = autofs_ptype_expire_multi;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			if (notify == NFY_MOUNT)</div><div class='del'>-				type = (sbi-&gt;type &amp; AUTOFS_TYPE_DIRECT) ?</div><div class='add'>+				type = (sbi-&gt;type &amp; AUTOFS_TYPE_TRIGGER) ?</div><div class='ctx'> 					autofs_ptype_missing_direct :</div><div class='ctx'> 					 autofs_ptype_missing_indirect;</div><div class='ctx'> 			else</div><div class='del'>-				type = (sbi-&gt;type &amp; AUTOFS_TYPE_DIRECT) ?</div><div class='add'>+				type = (sbi-&gt;type &amp; AUTOFS_TYPE_TRIGGER) ?</div><div class='ctx'> 					autofs_ptype_expire_direct :</div><div class='ctx'> 					autofs_ptype_expire_indirect;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -457,6 +457,40 @@ int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,</div><div class='ctx'> </div><div class='ctx'> 	status = wq-&gt;status;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * For direct and offset mounts we need to track the requester's</div><div class='add'>+	 * uid and gid in the dentry info struct. This is so it can be</div><div class='add'>+	 * supplied, on request, by the misc device ioctl interface.</div><div class='add'>+	 * This is needed during daemon resatart when reconnecting</div><div class='add'>+	 * to existing, active, autofs mounts. The uid and gid (and</div><div class='add'>+	 * related string values) may be used for macro substitution</div><div class='add'>+	 * in autofs mount maps.</div><div class='add'>+	 */</div><div class='add'>+	if (!status) {</div><div class='add'>+		struct autofs_info *ino;</div><div class='add'>+		struct dentry *de = NULL;</div><div class='add'>+</div><div class='add'>+		/* direct mount or browsable map */</div><div class='add'>+		ino = autofs4_dentry_ino(dentry);</div><div class='add'>+		if (!ino) {</div><div class='add'>+			/* If not lookup actual dentry used */</div><div class='add'>+			de = d_lookup(dentry-&gt;d_parent, &amp;dentry-&gt;d_name);</div><div class='add'>+			if (de)</div><div class='add'>+				ino = autofs4_dentry_ino(de);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Set mount requester */</div><div class='add'>+		if (ino) {</div><div class='add'>+			spin_lock(&amp;sbi-&gt;fs_lock);</div><div class='add'>+			ino-&gt;uid = wq-&gt;uid;</div><div class='add'>+			ino-&gt;gid = wq-&gt;gid;</div><div class='add'>+			spin_unlock(&amp;sbi-&gt;fs_lock);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (de)</div><div class='add'>+			dput(de);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Are we the last process to need status? */</div><div class='ctx'> 	mutex_lock(&amp;sbi-&gt;wq_mutex);</div><div class='ctx'> 	if (!--wq-&gt;wait_ctr)</div><div class='head'>diff --git a/fs/befs/befs_fs_types.h b/fs/befs/befs_fs_types.h<br/>index e2595c2c403a..7893eaa1e58c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/befs/befs_fs_types.h?id=c15895ef30c2c03e99802951787183039a349d32'>fs/befs/befs_fs_types.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/befs/befs_fs_types.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/befs/befs_fs_types.h</a></div><div class='hunk'>@@ -55,8 +55,12 @@ enum super_flags {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define BEFS_BYTEORDER_NATIVE 0x42494745</div><div class='add'>+#define BEFS_BYTEORDER_NATIVE_LE (__force fs32)cpu_to_le32(BEFS_BYTEORDER_NATIVE)</div><div class='add'>+#define BEFS_BYTEORDER_NATIVE_BE (__force fs32)cpu_to_be32(BEFS_BYTEORDER_NATIVE)</div><div class='ctx'> </div><div class='ctx'> #define BEFS_SUPER_MAGIC BEFS_SUPER_MAGIC1</div><div class='add'>+#define BEFS_SUPER_MAGIC1_LE (__force fs32)cpu_to_le32(BEFS_SUPER_MAGIC1)</div><div class='add'>+#define BEFS_SUPER_MAGIC1_BE (__force fs32)cpu_to_be32(BEFS_SUPER_MAGIC1)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Flags of inode</div><div class='head'>diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c<br/>index 740f53672a8a..b6dfee37c7b7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/befs/linuxvfs.c?id=c15895ef30c2c03e99802951787183039a349d32'>fs/befs/linuxvfs.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/befs/linuxvfs.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/befs/linuxvfs.c</a></div><div class='hunk'>@@ -650,7 +650,7 @@ enum {</div><div class='ctx'> 	Opt_uid, Opt_gid, Opt_charset, Opt_debug, Opt_err,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static match_table_t befs_tokens = {</div><div class='add'>+static const match_table_t befs_tokens = {</div><div class='ctx'> 	{Opt_uid, "uid=%d"},</div><div class='ctx'> 	{Opt_gid, "gid=%d"},</div><div class='ctx'> 	{Opt_charset, "iocharset=%s"},</div><div class='hunk'>@@ -809,8 +809,8 @@ befs_fill_super(struct super_block *sb, void *data, int silent)</div><div class='ctx'> </div><div class='ctx'> 	/* account for offset of super block on x86 */</div><div class='ctx'> 	disk_sb = (befs_super_block *) bh-&gt;b_data;</div><div class='del'>-	if ((le32_to_cpu(disk_sb-&gt;magic1) == BEFS_SUPER_MAGIC1) ||</div><div class='del'>-	    (be32_to_cpu(disk_sb-&gt;magic1) == BEFS_SUPER_MAGIC1)) {</div><div class='add'>+	if ((disk_sb-&gt;magic1 == BEFS_SUPER_MAGIC1_LE) ||</div><div class='add'>+	    (disk_sb-&gt;magic1 == BEFS_SUPER_MAGIC1_BE)) {</div><div class='ctx'> 		befs_debug(sb, "Using PPC superblock location");</div><div class='ctx'> 	} else {</div><div class='ctx'> 		befs_debug(sb, "Using x86 superblock location");</div><div class='head'>diff --git a/fs/befs/super.c b/fs/befs/super.c<br/>index 8c3401ff6d6a..41f2b4d0093e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/befs/super.c?id=c15895ef30c2c03e99802951787183039a349d32'>fs/befs/super.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/befs/super.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/befs/super.c</a></div><div class='hunk'>@@ -26,10 +26,10 @@ befs_load_sb(struct super_block *sb, befs_super_block * disk_sb)</div><div class='ctx'> 	befs_sb_info *befs_sb = BEFS_SB(sb);</div><div class='ctx'> </div><div class='ctx'> 	/* Check the byte order of the filesystem */</div><div class='del'>-	if (le32_to_cpu(disk_sb-&gt;fs_byte_order) == BEFS_BYTEORDER_NATIVE)</div><div class='add'>+	if (disk_sb-&gt;fs_byte_order == BEFS_BYTEORDER_NATIVE_LE)</div><div class='ctx'> 	    befs_sb-&gt;byte_order = BEFS_BYTESEX_LE;</div><div class='del'>-	else if (be32_to_cpu(disk_sb-&gt;fs_byte_order) == BEFS_BYTEORDER_NATIVE)</div><div class='del'>-	    befs_sb-&gt;byte_order = BEFS_BYTESEX_BE;	</div><div class='add'>+	else if (disk_sb-&gt;fs_byte_order == BEFS_BYTEORDER_NATIVE_BE)</div><div class='add'>+	    befs_sb-&gt;byte_order = BEFS_BYTESEX_BE;</div><div class='ctx'> </div><div class='ctx'> 	befs_sb-&gt;magic1 = fs32_to_cpu(sb, disk_sb-&gt;magic1);</div><div class='ctx'> 	befs_sb-&gt;magic2 = fs32_to_cpu(sb, disk_sb-&gt;magic2);</div><div class='head'>diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c<br/>index 655ed8d30a86..c76afa26edf7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/binfmt_elf.c?id=c15895ef30c2c03e99802951787183039a349d32'>fs/binfmt_elf.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/binfmt_elf.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/binfmt_elf.c</a></div><div class='hunk'>@@ -683,7 +683,7 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)</div><div class='ctx'> 			 * switch really is going to happen - do this in</div><div class='ctx'> 			 * flush_thread().	- akpm</div><div class='ctx'> 			 */</div><div class='del'>-			SET_PERSONALITY(loc-&gt;elf_ex, 0);</div><div class='add'>+			SET_PERSONALITY(loc-&gt;elf_ex);</div><div class='ctx'> </div><div class='ctx'> 			interpreter = open_exec(elf_interpreter);</div><div class='ctx'> 			retval = PTR_ERR(interpreter);</div><div class='hunk'>@@ -734,7 +734,7 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)</div><div class='ctx'> 			goto out_free_dentry;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* Executables without an interpreter also need a personality  */</div><div class='del'>-		SET_PERSONALITY(loc-&gt;elf_ex, 0);</div><div class='add'>+		SET_PERSONALITY(loc-&gt;elf_ex);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Flush all traces of the currently running executable */</div><div class='hunk'>@@ -748,7 +748,7 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)</div><div class='ctx'> </div><div class='ctx'> 	/* Do this immediately, since STACK_TOP as used in setup_arg_pages</div><div class='ctx'> 	   may depend on the personality.  */</div><div class='del'>-	SET_PERSONALITY(loc-&gt;elf_ex, 0);</div><div class='add'>+	SET_PERSONALITY(loc-&gt;elf_ex);</div><div class='ctx'> 	if (elf_read_implies_exec(loc-&gt;elf_ex, executable_stack))</div><div class='ctx'> 		current-&gt;personality |= READ_IMPLIES_EXEC;</div><div class='ctx'> </div><div class='head'>diff --git a/fs/binfmt_elf_fdpic.c b/fs/binfmt_elf_fdpic.c<br/>index 80c1f952ef78..0e8367c54624 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/binfmt_elf_fdpic.c?id=c15895ef30c2c03e99802951787183039a349d32'>fs/binfmt_elf_fdpic.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/binfmt_elf_fdpic.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/binfmt_elf_fdpic.c</a></div><div class='hunk'>@@ -25,6 +25,7 @@</div><div class='ctx'> #include &lt;linux/fcntl.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/pagemap.h&gt;</div><div class='add'>+#include &lt;linux/security.h&gt;</div><div class='ctx'> #include &lt;linux/highmem.h&gt;</div><div class='ctx'> #include &lt;linux/highuid.h&gt;</div><div class='ctx'> #include &lt;linux/personality.h&gt;</div><div class='hunk'>@@ -455,8 +456,19 @@ error_kill:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='add'>+</div><div class='add'>+#ifndef ELF_BASE_PLATFORM</div><div class='ctx'> /*</div><div class='del'>- * present useful information to the program</div><div class='add'>+ * AT_BASE_PLATFORM indicates the "real" hardware/microarchitecture.</div><div class='add'>+ * If the arch defines ELF_BASE_PLATFORM (in asm/elf.h), the value</div><div class='add'>+ * will be copied to the user stack in the same manner as AT_PLATFORM.</div><div class='add'>+ */</div><div class='add'>+#define ELF_BASE_PLATFORM NULL</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * present useful information to the program by shovelling it onto the new</div><div class='add'>+ * process's stack</div><div class='ctx'>  */</div><div class='ctx'> static int create_elf_fdpic_tables(struct linux_binprm *bprm,</div><div class='ctx'> 				   struct mm_struct *mm,</div><div class='hunk'>@@ -466,15 +478,19 @@ static int create_elf_fdpic_tables(struct linux_binprm *bprm,</div><div class='ctx'> 	unsigned long sp, csp, nitems;</div><div class='ctx'> 	elf_caddr_t __user *argv, *envp;</div><div class='ctx'> 	size_t platform_len = 0, len;</div><div class='del'>-	char *k_platform;</div><div class='del'>-	char __user *u_platform, *p;</div><div class='add'>+	char *k_platform, *k_base_platform;</div><div class='add'>+	char __user *u_platform, *u_base_platform, *p;</div><div class='ctx'> 	long hwcap;</div><div class='ctx'> 	int loop;</div><div class='ctx'> 	int nr;	/* reset for each csp adjustment */</div><div class='ctx'> </div><div class='del'>-	/* we're going to shovel a whole load of stuff onto the stack */</div><div class='ctx'> #ifdef CONFIG_MMU</div><div class='del'>-	sp = bprm-&gt;p;</div><div class='add'>+	/* In some cases (e.g. Hyper-Threading), we want to avoid L1 evictions</div><div class='add'>+	 * by the processes running on the same package. One thing we can do is</div><div class='add'>+	 * to shuffle the initial stack for them, so we give the architecture</div><div class='add'>+	 * an opportunity to do so here.</div><div class='add'>+	 */</div><div class='add'>+	sp = arch_align_stack(bprm-&gt;p);</div><div class='ctx'> #else</div><div class='ctx'> 	sp = mm-&gt;start_stack;</div><div class='ctx'> </div><div class='hunk'>@@ -483,11 +499,14 @@ static int create_elf_fdpic_tables(struct linux_binprm *bprm,</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	/* get hold of platform and hardware capabilities masks for the machine</div><div class='del'>-	 * we are running on.  In some cases (Sparc), this info is impossible</div><div class='del'>-	 * to get, in others (i386) it is merely difficult.</div><div class='del'>-	 */</div><div class='ctx'> 	hwcap = ELF_HWCAP;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If this architecture has a platform capability string, copy it</div><div class='add'>+	 * to userspace.  In some cases (Sparc), this info is impossible</div><div class='add'>+	 * for userspace to get any other way, in others (i386) it is</div><div class='add'>+	 * merely difficult.</div><div class='add'>+	 */</div><div class='ctx'> 	k_platform = ELF_PLATFORM;</div><div class='ctx'> 	u_platform = NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -499,19 +518,20 @@ static int create_elf_fdpic_tables(struct linux_binprm *bprm,</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-#if defined(__i386__) &amp;&amp; defined(CONFIG_SMP)</div><div class='del'>-	/* in some cases (e.g. Hyper-Threading), we want to avoid L1 evictions</div><div class='del'>-	 * by the processes running on the same package. One thing we can do is</div><div class='del'>-	 * to shuffle the initial stack for them.</div><div class='del'>-	 *</div><div class='del'>-	 * the conditionals here are unneeded, but kept in to make the code</div><div class='del'>-	 * behaviour the same as pre change unless we have hyperthreaded</div><div class='del'>-	 * processors. This keeps Mr Marcelo Person happier but should be</div><div class='del'>-	 * removed for 2.5</div><div class='add'>+	/*</div><div class='add'>+	 * If this architecture has a "base" platform capability</div><div class='add'>+	 * string, copy it to userspace.</div><div class='ctx'> 	 */</div><div class='del'>-	if (smp_num_siblings &gt; 1)</div><div class='del'>-		sp = sp - ((current-&gt;pid % 64) &lt;&lt; 7);</div><div class='del'>-#endif</div><div class='add'>+	k_base_platform = ELF_BASE_PLATFORM;</div><div class='add'>+	u_base_platform = NULL;</div><div class='add'>+</div><div class='add'>+	if (k_base_platform) {</div><div class='add'>+		platform_len = strlen(k_base_platform) + 1;</div><div class='add'>+		sp -= platform_len;</div><div class='add'>+		u_base_platform = (char __user *) sp;</div><div class='add'>+		if (__copy_to_user(u_base_platform, k_base_platform, platform_len) != 0)</div><div class='add'>+			return -EFAULT;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	sp &amp;= ~7UL;</div><div class='ctx'> </div><div class='hunk'>@@ -541,9 +561,13 @@ static int create_elf_fdpic_tables(struct linux_binprm *bprm,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* force 16 byte _final_ alignment here for generality */</div><div class='del'>-#define DLINFO_ITEMS 13</div><div class='add'>+#define DLINFO_ITEMS 15</div><div class='add'>+</div><div class='add'>+	nitems = 1 + DLINFO_ITEMS + (k_platform ? 1 : 0) +</div><div class='add'>+		(k_base_platform ? 1 : 0) + AT_VECTOR_SIZE_ARCH;</div><div class='ctx'> </div><div class='del'>-	nitems = 1 + DLINFO_ITEMS + (k_platform ? 1 : 0) + AT_VECTOR_SIZE_ARCH;</div><div class='add'>+	if (bprm-&gt;interp_flags &amp; BINPRM_FLAGS_EXECFD)</div><div class='add'>+		nitems++;</div><div class='ctx'> </div><div class='ctx'> 	csp = sp;</div><div class='ctx'> 	sp -= nitems * 2 * sizeof(unsigned long);</div><div class='hunk'>@@ -575,6 +599,19 @@ static int create_elf_fdpic_tables(struct linux_binprm *bprm,</div><div class='ctx'> 			    (elf_addr_t) (unsigned long) u_platform);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (k_base_platform) {</div><div class='add'>+		nr = 0;</div><div class='add'>+		csp -= 2 * sizeof(unsigned long);</div><div class='add'>+		NEW_AUX_ENT(AT_BASE_PLATFORM,</div><div class='add'>+			    (elf_addr_t) (unsigned long) u_base_platform);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (bprm-&gt;interp_flags &amp; BINPRM_FLAGS_EXECFD) {</div><div class='add'>+		nr = 0;</div><div class='add'>+		csp -= 2 * sizeof(unsigned long);</div><div class='add'>+		NEW_AUX_ENT(AT_EXECFD, bprm-&gt;interp_data);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	nr = 0;</div><div class='ctx'> 	csp -= DLINFO_ITEMS * 2 * sizeof(unsigned long);</div><div class='ctx'> 	NEW_AUX_ENT(AT_HWCAP,	hwcap);</div><div class='hunk'>@@ -590,6 +627,8 @@ static int create_elf_fdpic_tables(struct linux_binprm *bprm,</div><div class='ctx'> 	NEW_AUX_ENT(AT_EUID,	(elf_addr_t) current-&gt;euid);</div><div class='ctx'> 	NEW_AUX_ENT(AT_GID,	(elf_addr_t) current-&gt;gid);</div><div class='ctx'> 	NEW_AUX_ENT(AT_EGID,	(elf_addr_t) current-&gt;egid);</div><div class='add'>+	NEW_AUX_ENT(AT_SECURE,	security_bprm_secureexec(bprm));</div><div class='add'>+	NEW_AUX_ENT(AT_EXECFN,	bprm-&gt;exec);</div><div class='ctx'> </div><div class='ctx'> #ifdef ARCH_DLINFO</div><div class='ctx'> 	nr = 0;</div><div class='head'>diff --git a/fs/binfmt_em86.c b/fs/binfmt_em86.c<br/>index f9c88d0c8ced..32fb00b52cd0 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/binfmt_em86.c?id=c15895ef30c2c03e99802951787183039a349d32'>fs/binfmt_em86.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/binfmt_em86.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/binfmt_em86.c</a></div><div class='hunk'>@@ -43,7 +43,7 @@ static int load_em86(struct linux_binprm *bprm,struct pt_regs *regs)</div><div class='ctx'> 			return -ENOEXEC;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	bprm-&gt;sh_bang = 1;	/* Well, the bang-shell is implicit... */</div><div class='add'>+	bprm-&gt;recursion_depth++; /* Well, the bang-shell is implicit... */</div><div class='ctx'> 	allow_write_access(bprm-&gt;file);</div><div class='ctx'> 	fput(bprm-&gt;file);</div><div class='ctx'> 	bprm-&gt;file = NULL;</div><div class='head'>diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c<br/>index dfc0197905ca..ccb781a6a804 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/binfmt_flat.c?id=c15895ef30c2c03e99802951787183039a349d32'>fs/binfmt_flat.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/binfmt_flat.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/binfmt_flat.c</a></div><div class='hunk'>@@ -229,13 +229,13 @@ static int decompress_exec(</div><div class='ctx'> 	ret = 10;</div><div class='ctx'> 	if (buf[3] &amp; EXTRA_FIELD) {</div><div class='ctx'> 		ret += 2 + buf[10] + (buf[11] &lt;&lt; 8);</div><div class='del'>-		if (unlikely(LBUFSIZE == ret)) {</div><div class='add'>+		if (unlikely(LBUFSIZE &lt;= ret)) {</div><div class='ctx'> 			DBG_FLT("binfmt_flat: buffer overflow (EXTRA)?\n");</div><div class='ctx'> 			goto out_free_buf;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	if (buf[3] &amp; ORIG_NAME) {</div><div class='del'>-		for (; ret &lt; LBUFSIZE &amp;&amp; (buf[ret] != 0); ret++)</div><div class='add'>+		while (ret &lt; LBUFSIZE &amp;&amp; buf[ret++] != 0)</div><div class='ctx'> 			;</div><div class='ctx'> 		if (unlikely(LBUFSIZE == ret)) {</div><div class='ctx'> 			DBG_FLT("binfmt_flat: buffer overflow (ORIG_NAME)?\n");</div><div class='hunk'>@@ -243,7 +243,7 @@ static int decompress_exec(</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	if (buf[3] &amp; COMMENT) {</div><div class='del'>-		for (;  ret &lt; LBUFSIZE &amp;&amp; (buf[ret] != 0); ret++)</div><div class='add'>+		while (ret &lt; LBUFSIZE &amp;&amp; buf[ret++] != 0)</div><div class='ctx'> 			;</div><div class='ctx'> 		if (unlikely(LBUFSIZE == ret)) {</div><div class='ctx'> 			DBG_FLT("binfmt_flat: buffer overflow (COMMENT)?\n");</div><div class='head'>diff --git a/fs/binfmt_misc.c b/fs/binfmt_misc.c<br/>index 8d7e88e02e0f..f2744ab4e5b3 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/binfmt_misc.c?id=c15895ef30c2c03e99802951787183039a349d32'>fs/binfmt_misc.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/binfmt_misc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/binfmt_misc.c</a></div><div class='hunk'>@@ -117,7 +117,7 @@ static int load_misc_binary(struct linux_binprm *bprm, struct pt_regs *regs)</div><div class='ctx'> 		goto _ret;</div><div class='ctx'> </div><div class='ctx'> 	retval = -ENOEXEC;</div><div class='del'>-	if (bprm-&gt;misc_bang)</div><div class='add'>+	if (bprm-&gt;recursion_depth &gt; BINPRM_MAX_RECURSION)</div><div class='ctx'> 		goto _ret;</div><div class='ctx'> </div><div class='ctx'> 	/* to keep locking time low, we copy the interpreter string */</div><div class='hunk'>@@ -197,7 +197,7 @@ static int load_misc_binary(struct linux_binprm *bprm, struct pt_regs *regs)</div><div class='ctx'> 	if (retval &lt; 0)</div><div class='ctx'> 		goto _error;</div><div class='ctx'> </div><div class='del'>-	bprm-&gt;misc_bang = 1;</div><div class='add'>+	bprm-&gt;recursion_depth++;</div><div class='ctx'> </div><div class='ctx'> 	retval = search_binary_handler (bprm, regs);</div><div class='ctx'> 	if (retval &lt; 0)</div><div class='head'>diff --git a/fs/binfmt_script.c b/fs/binfmt_script.c<br/>index 9e3963f7ebf1..08343505e184 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/binfmt_script.c?id=c15895ef30c2c03e99802951787183039a349d32'>fs/binfmt_script.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/binfmt_script.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/binfmt_script.c</a></div><div class='hunk'>@@ -22,14 +22,15 @@ static int load_script(struct linux_binprm *bprm,struct pt_regs *regs)</div><div class='ctx'> 	char interp[BINPRM_BUF_SIZE];</div><div class='ctx'> 	int retval;</div><div class='ctx'> </div><div class='del'>-	if ((bprm-&gt;buf[0] != '#') || (bprm-&gt;buf[1] != '!') || (bprm-&gt;sh_bang)) </div><div class='add'>+	if ((bprm-&gt;buf[0] != '#') || (bprm-&gt;buf[1] != '!') ||</div><div class='add'>+	    (bprm-&gt;recursion_depth &gt; BINPRM_MAX_RECURSION))</div><div class='ctx'> 		return -ENOEXEC;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * This section does the #! interpretation.</div><div class='ctx'> 	 * Sorta complicated, but hopefully it will work.  -TYT</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	bprm-&gt;sh_bang = 1;</div><div class='add'>+	bprm-&gt;recursion_depth++;</div><div class='ctx'> 	allow_write_access(bprm-&gt;file);</div><div class='ctx'> 	fput(bprm-&gt;file);</div><div class='ctx'> 	bprm-&gt;file = NULL;</div><div class='head'>diff --git a/fs/binfmt_som.c b/fs/binfmt_som.c<br/>index 68be580ba289..74e587a52796 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/binfmt_som.c?id=c15895ef30c2c03e99802951787183039a349d32'>fs/binfmt_som.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/binfmt_som.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/binfmt_som.c</a></div><div class='hunk'>@@ -306,3 +306,5 @@ static void __exit exit_som_binfmt(void)</div><div class='ctx'> </div><div class='ctx'> core_initcall(init_som_binfmt);</div><div class='ctx'> module_exit(exit_som_binfmt);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/fs/bio-integrity.c b/fs/bio-integrity.c<br/>index c3e174b35fe6..19caf7c962ac 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/bio-integrity.c?id=c15895ef30c2c03e99802951787183039a349d32'>fs/bio-integrity.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/bio-integrity.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/bio-integrity.c</a></div><div class='hunk'>@@ -107,7 +107,8 @@ void bio_integrity_free(struct bio *bio, struct bio_set *bs)</div><div class='ctx'> 	BUG_ON(bip == NULL);</div><div class='ctx'> </div><div class='ctx'> 	/* A cloned bio doesn't own the integrity metadata */</div><div class='del'>-	if (!bio_flagged(bio, BIO_CLONED) &amp;&amp; bip-&gt;bip_buf != NULL)</div><div class='add'>+	if (!bio_flagged(bio, BIO_CLONED) &amp;&amp; !bio_flagged(bio, BIO_FS_INTEGRITY)</div><div class='add'>+	    &amp;&amp; bip-&gt;bip_buf != NULL)</div><div class='ctx'> 		kfree(bip-&gt;bip_buf);</div><div class='ctx'> </div><div class='ctx'> 	mempool_free(bip-&gt;bip_vec, bs-&gt;bvec_pools[bip-&gt;bip_pool]);</div><div class='hunk'>@@ -150,6 +151,24 @@ int bio_integrity_add_page(struct bio *bio, struct page *page,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(bio_integrity_add_page);</div><div class='ctx'> </div><div class='add'>+static int bdev_integrity_enabled(struct block_device *bdev, int rw)</div><div class='add'>+{</div><div class='add'>+	struct blk_integrity *bi = bdev_get_integrity(bdev);</div><div class='add'>+</div><div class='add'>+	if (bi == NULL)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (rw == READ &amp;&amp; bi-&gt;verify_fn != NULL &amp;&amp;</div><div class='add'>+	    (bi-&gt;flags &amp; INTEGRITY_FLAG_READ))</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	if (rw == WRITE &amp;&amp; bi-&gt;generate_fn != NULL &amp;&amp;</div><div class='add'>+	    (bi-&gt;flags &amp; INTEGRITY_FLAG_WRITE))</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * bio_integrity_enabled - Check whether integrity can be passed</div><div class='ctx'>  * @bio:	bio to check</div><div class='hunk'>@@ -313,6 +332,14 @@ static void bio_integrity_generate(struct bio *bio)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline unsigned short blk_integrity_tuple_size(struct blk_integrity *bi)</div><div class='add'>+{</div><div class='add'>+	if (bi)</div><div class='add'>+		return bi-&gt;tuple_size;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * bio_integrity_prep - Prepare bio for integrity I/O</div><div class='ctx'>  * @bio:	bio to prepare</div><div class='head'>diff --git a/fs/bio.c b/fs/bio.c<br/>index 3cba7ae34d75..77a55bcceedb 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/bio.c?id=c15895ef30c2c03e99802951787183039a349d32'>fs/bio.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/bio.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/bio.c</a></div><div class='hunk'>@@ -30,7 +30,7 @@</div><div class='ctx'> </div><div class='ctx'> static struct kmem_cache *bio_slab __read_mostly;</div><div class='ctx'> </div><div class='del'>-mempool_t *bio_split_pool __read_mostly;</div><div class='add'>+static mempool_t *bio_split_pool __read_mostly;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * if you change this list, also change bvec_alloc or things will</div><div class='hunk'>@@ -60,25 +60,46 @@ struct bio_vec *bvec_alloc_bs(gfp_t gfp_mask, int nr, unsigned long *idx, struct</div><div class='ctx'> 	struct bio_vec *bvl;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * see comment near bvec_array define!</div><div class='add'>+	 * If 'bs' is given, lookup the pool and do the mempool alloc.</div><div class='add'>+	 * If not, this is a bio_kmalloc() allocation and just do a</div><div class='add'>+	 * kzalloc() for the exact number of vecs right away.</div><div class='ctx'> 	 */</div><div class='del'>-	switch (nr) {</div><div class='del'>-		case   1        : *idx = 0; break;</div><div class='del'>-		case   2 ...   4: *idx = 1; break;</div><div class='del'>-		case   5 ...  16: *idx = 2; break;</div><div class='del'>-		case  17 ...  64: *idx = 3; break;</div><div class='del'>-		case  65 ... 128: *idx = 4; break;</div><div class='del'>-		case 129 ... BIO_MAX_PAGES: *idx = 5; break;</div><div class='add'>+	if (bs) {</div><div class='add'>+		/*</div><div class='add'>+		 * see comment near bvec_array define!</div><div class='add'>+		 */</div><div class='add'>+		switch (nr) {</div><div class='add'>+		case 1:</div><div class='add'>+			*idx = 0;</div><div class='add'>+			break;</div><div class='add'>+		case 2 ... 4:</div><div class='add'>+			*idx = 1;</div><div class='add'>+			break;</div><div class='add'>+		case 5 ... 16:</div><div class='add'>+			*idx = 2;</div><div class='add'>+			break;</div><div class='add'>+		case 17 ... 64:</div><div class='add'>+			*idx = 3;</div><div class='add'>+			break;</div><div class='add'>+		case 65 ... 128:</div><div class='add'>+			*idx = 4;</div><div class='add'>+			break;</div><div class='add'>+		case 129 ... BIO_MAX_PAGES:</div><div class='add'>+			*idx = 5;</div><div class='add'>+			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			return NULL;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * idx now points to the pool we want to allocate from</div><div class='del'>-	 */</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	bvl = mempool_alloc(bs-&gt;bvec_pools[*idx], gfp_mask);</div><div class='del'>-	if (bvl)</div><div class='del'>-		memset(bvl, 0, bvec_nr_vecs(*idx) * sizeof(struct bio_vec));</div><div class='add'>+		/*</div><div class='add'>+		 * idx now points to the pool we want to allocate from</div><div class='add'>+		 */</div><div class='add'>+		bvl = mempool_alloc(bs-&gt;bvec_pools[*idx], gfp_mask);</div><div class='add'>+		if (bvl)</div><div class='add'>+			memset(bvl, 0,</div><div class='add'>+				bvec_nr_vecs(*idx) * sizeof(struct bio_vec));</div><div class='add'>+	} else</div><div class='add'>+		bvl = kzalloc(nr * sizeof(struct bio_vec), gfp_mask);</div><div class='ctx'> </div><div class='ctx'> 	return bvl;</div><div class='ctx'> }</div><div class='hunk'>@@ -107,10 +128,17 @@ static void bio_fs_destructor(struct bio *bio)</div><div class='ctx'> 	bio_free(bio, fs_bio_set);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void bio_kmalloc_destructor(struct bio *bio)</div><div class='add'>+{</div><div class='add'>+	kfree(bio-&gt;bi_io_vec);</div><div class='add'>+	kfree(bio);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void bio_init(struct bio *bio)</div><div class='ctx'> {</div><div class='ctx'> 	memset(bio, 0, sizeof(*bio));</div><div class='ctx'> 	bio-&gt;bi_flags = 1 &lt;&lt; BIO_UPTODATE;</div><div class='add'>+	bio-&gt;bi_comp_cpu = -1;</div><div class='ctx'> 	atomic_set(&amp;bio-&gt;bi_cnt, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -118,19 +146,25 @@ void bio_init(struct bio *bio)</div><div class='ctx'>  * bio_alloc_bioset - allocate a bio for I/O</div><div class='ctx'>  * @gfp_mask:   the GFP_ mask given to the slab allocator</div><div class='ctx'>  * @nr_iovecs:	number of iovecs to pre-allocate</div><div class='del'>- * @bs:		the bio_set to allocate from</div><div class='add'>+ * @bs:		the bio_set to allocate from. If %NULL, just use kmalloc</div><div class='ctx'>  *</div><div class='ctx'>  * Description:</div><div class='del'>- *   bio_alloc_bioset will first try it's on mempool to satisfy the allocation.</div><div class='add'>+ *   bio_alloc_bioset will first try its own mempool to satisfy the allocation.</div><div class='ctx'>  *   If %__GFP_WAIT is set then we will block on the internal pool waiting</div><div class='del'>- *   for a &amp;struct bio to become free.</div><div class='add'>+ *   for a &amp;struct bio to become free. If a %NULL @bs is passed in, we will</div><div class='add'>+ *   fall back to just using @kmalloc to allocate the required memory.</div><div class='ctx'>  *</div><div class='ctx'>  *   allocate bio and iovecs from the memory pools specified by the</div><div class='del'>- *   bio_set structure.</div><div class='add'>+ *   bio_set structure, or @kmalloc if none given.</div><div class='ctx'>  **/</div><div class='ctx'> struct bio *bio_alloc_bioset(gfp_t gfp_mask, int nr_iovecs, struct bio_set *bs)</div><div class='ctx'> {</div><div class='del'>-	struct bio *bio = mempool_alloc(bs-&gt;bio_pool, gfp_mask);</div><div class='add'>+	struct bio *bio;</div><div class='add'>+</div><div class='add'>+	if (bs)</div><div class='add'>+		bio = mempool_alloc(bs-&gt;bio_pool, gfp_mask);</div><div class='add'>+	else</div><div class='add'>+		bio = kmalloc(sizeof(*bio), gfp_mask);</div><div class='ctx'> </div><div class='ctx'> 	if (likely(bio)) {</div><div class='ctx'> 		struct bio_vec *bvl = NULL;</div><div class='hunk'>@@ -141,7 +175,10 @@ struct bio *bio_alloc_bioset(gfp_t gfp_mask, int nr_iovecs, struct bio_set *bs)</div><div class='ctx'> </div><div class='ctx'> 			bvl = bvec_alloc_bs(gfp_mask, nr_iovecs, &amp;idx, bs);</div><div class='ctx'> 			if (unlikely(!bvl)) {</div><div class='del'>-				mempool_free(bio, bs-&gt;bio_pool);</div><div class='add'>+				if (bs)</div><div class='add'>+					mempool_free(bio, bs-&gt;bio_pool);</div><div class='add'>+				else</div><div class='add'>+					kfree(bio);</div><div class='ctx'> 				bio = NULL;</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -164,6 +201,23 @@ struct bio *bio_alloc(gfp_t gfp_mask, int nr_iovecs)</div><div class='ctx'> 	return bio;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Like bio_alloc(), but doesn't use a mempool backing. This means that</div><div class='add'>+ * it CAN fail, but while bio_alloc() can only be used for allocations</div><div class='add'>+ * that have a short (finite) life span, bio_kmalloc() should be used</div><div class='add'>+ * for more permanent bio allocations (like allocating some bio's for</div><div class='add'>+ * initalization or setup purposes).</div><div class='add'>+ */</div><div class='add'>+struct bio *bio_kmalloc(gfp_t gfp_mask, int nr_iovecs)</div><div class='add'>+{</div><div class='add'>+	struct bio *bio = bio_alloc_bioset(gfp_mask, nr_iovecs, NULL);</div><div class='add'>+</div><div class='add'>+	if (bio)</div><div class='add'>+		bio-&gt;bi_destructor = bio_kmalloc_destructor;</div><div class='add'>+</div><div class='add'>+	return bio;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void zero_fill_bio(struct bio *bio)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='hunk'>@@ -208,14 +262,6 @@ inline int bio_phys_segments(struct request_queue *q, struct bio *bio)</div><div class='ctx'> 	return bio-&gt;bi_phys_segments;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-inline int bio_hw_segments(struct request_queue *q, struct bio *bio)</div><div class='del'>-{</div><div class='del'>-	if (unlikely(!bio_flagged(bio, BIO_SEG_VALID)))</div><div class='del'>-		blk_recount_segments(q, bio);</div><div class='del'>-</div><div class='del'>-	return bio-&gt;bi_hw_segments;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * 	__bio_clone	-	clone a bio</div><div class='ctx'>  * 	@bio: destination bio</div><div class='hunk'>@@ -350,8 +396,7 @@ static int __bio_add_page(struct request_queue *q, struct bio *bio, struct page</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	while (bio-&gt;bi_phys_segments &gt;= q-&gt;max_phys_segments</div><div class='del'>-	       || bio-&gt;bi_hw_segments &gt;= q-&gt;max_hw_segments</div><div class='del'>-	       || BIOVEC_VIRT_OVERSIZE(bio-&gt;bi_size)) {</div><div class='add'>+	       || bio-&gt;bi_phys_segments &gt;= q-&gt;max_hw_segments) {</div><div class='ctx'> </div><div class='ctx'> 		if (retried_segments)</div><div class='ctx'> 			return 0;</div><div class='hunk'>@@ -395,13 +440,11 @@ static int __bio_add_page(struct request_queue *q, struct bio *bio, struct page</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* If we may be able to merge these biovecs, force a recount */</div><div class='del'>-	if (bio-&gt;bi_vcnt &amp;&amp; (BIOVEC_PHYS_MERGEABLE(bvec-1, bvec) ||</div><div class='del'>-	    BIOVEC_VIRT_MERGEABLE(bvec-1, bvec)))</div><div class='add'>+	if (bio-&gt;bi_vcnt &amp;&amp; (BIOVEC_PHYS_MERGEABLE(bvec-1, bvec)))</div><div class='ctx'> 		bio-&gt;bi_flags &amp;= ~(1 &lt;&lt; BIO_SEG_VALID);</div><div class='ctx'> </div><div class='ctx'> 	bio-&gt;bi_vcnt++;</div><div class='ctx'> 	bio-&gt;bi_phys_segments++;</div><div class='del'>-	bio-&gt;bi_hw_segments++;</div><div class='ctx'>  done:</div><div class='ctx'> 	bio-&gt;bi_size += len;</div><div class='ctx'> 	return len;</div><div class='hunk'>@@ -449,16 +492,19 @@ int bio_add_page(struct bio *bio, struct page *page, unsigned int len,</div><div class='ctx'> </div><div class='ctx'> struct bio_map_data {</div><div class='ctx'> 	struct bio_vec *iovecs;</div><div class='del'>-	int nr_sgvecs;</div><div class='ctx'> 	struct sg_iovec *sgvecs;</div><div class='add'>+	int nr_sgvecs;</div><div class='add'>+	int is_our_pages;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void bio_set_map_data(struct bio_map_data *bmd, struct bio *bio,</div><div class='del'>-			     struct sg_iovec *iov, int iov_count)</div><div class='add'>+			     struct sg_iovec *iov, int iov_count,</div><div class='add'>+			     int is_our_pages)</div><div class='ctx'> {</div><div class='ctx'> 	memcpy(bmd-&gt;iovecs, bio-&gt;bi_io_vec, sizeof(struct bio_vec) * bio-&gt;bi_vcnt);</div><div class='ctx'> 	memcpy(bmd-&gt;sgvecs, iov, sizeof(struct sg_iovec) * iov_count);</div><div class='ctx'> 	bmd-&gt;nr_sgvecs = iov_count;</div><div class='add'>+	bmd-&gt;is_our_pages = is_our_pages;</div><div class='ctx'> 	bio-&gt;bi_private = bmd;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -493,7 +539,8 @@ static struct bio_map_data *bio_alloc_map_data(int nr_segs, int iov_count,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __bio_copy_iov(struct bio *bio, struct bio_vec *iovecs,</div><div class='del'>-			  struct sg_iovec *iov, int iov_count, int uncopy)</div><div class='add'>+			  struct sg_iovec *iov, int iov_count, int uncopy,</div><div class='add'>+			  int do_free_page)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0, i;</div><div class='ctx'> 	struct bio_vec *bvec;</div><div class='hunk'>@@ -536,7 +583,7 @@ static int __bio_copy_iov(struct bio *bio, struct bio_vec *iovecs,</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (uncopy)</div><div class='add'>+		if (do_free_page)</div><div class='ctx'> 			__free_page(bvec-&gt;bv_page);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -553,10 +600,11 @@ static int __bio_copy_iov(struct bio *bio, struct bio_vec *iovecs,</div><div class='ctx'> int bio_uncopy_user(struct bio *bio)</div><div class='ctx'> {</div><div class='ctx'> 	struct bio_map_data *bmd = bio-&gt;bi_private;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = __bio_copy_iov(bio, bmd-&gt;iovecs, bmd-&gt;sgvecs, bmd-&gt;nr_sgvecs, 1);</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='add'>+	if (!bio_flagged(bio, BIO_NULL_MAPPED))</div><div class='add'>+		ret = __bio_copy_iov(bio, bmd-&gt;iovecs, bmd-&gt;sgvecs,</div><div class='add'>+				     bmd-&gt;nr_sgvecs, 1, bmd-&gt;is_our_pages);</div><div class='ctx'> 	bio_free_map_data(bmd);</div><div class='ctx'> 	bio_put(bio);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -565,16 +613,20 @@ int bio_uncopy_user(struct bio *bio)</div><div class='ctx'> /**</div><div class='ctx'>  *	bio_copy_user_iov	-	copy user data to bio</div><div class='ctx'>  *	@q: destination block queue</div><div class='add'>+ *	@map_data: pointer to the rq_map_data holding pages (if necessary)</div><div class='ctx'>  *	@iov:	the iovec.</div><div class='ctx'>  *	@iov_count: number of elements in the iovec</div><div class='ctx'>  *	@write_to_vm: bool indicating writing to pages or not</div><div class='add'>+ *	@gfp_mask: memory allocation flags</div><div class='ctx'>  *</div><div class='ctx'>  *	Prepares and returns a bio for indirect user io, bouncing data</div><div class='ctx'>  *	to/from kernel pages as necessary. Must be paired with</div><div class='ctx'>  *	call bio_uncopy_user() on io completion.</div><div class='ctx'>  */</div><div class='del'>-struct bio *bio_copy_user_iov(struct request_queue *q, struct sg_iovec *iov,</div><div class='del'>-			      int iov_count, int write_to_vm)</div><div class='add'>+struct bio *bio_copy_user_iov(struct request_queue *q,</div><div class='add'>+			      struct rq_map_data *map_data,</div><div class='add'>+			      struct sg_iovec *iov, int iov_count,</div><div class='add'>+			      int write_to_vm, gfp_t gfp_mask)</div><div class='ctx'> {</div><div class='ctx'> 	struct bio_map_data *bmd;</div><div class='ctx'> 	struct bio_vec *bvec;</div><div class='hunk'>@@ -597,25 +649,38 @@ struct bio *bio_copy_user_iov(struct request_queue *q, struct sg_iovec *iov,</div><div class='ctx'> 		len += iov[i].iov_len;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	bmd = bio_alloc_map_data(nr_pages, iov_count, GFP_KERNEL);</div><div class='add'>+	bmd = bio_alloc_map_data(nr_pages, iov_count, gfp_mask);</div><div class='ctx'> 	if (!bmd)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='ctx'> 	ret = -ENOMEM;</div><div class='del'>-	bio = bio_alloc(GFP_KERNEL, nr_pages);</div><div class='add'>+	bio = bio_alloc(gfp_mask, nr_pages);</div><div class='ctx'> 	if (!bio)</div><div class='ctx'> 		goto out_bmd;</div><div class='ctx'> </div><div class='ctx'> 	bio-&gt;bi_rw |= (!write_to_vm &lt;&lt; BIO_RW);</div><div class='ctx'> </div><div class='ctx'> 	ret = 0;</div><div class='add'>+	i = 0;</div><div class='ctx'> 	while (len) {</div><div class='del'>-		unsigned int bytes = PAGE_SIZE;</div><div class='add'>+		unsigned int bytes;</div><div class='add'>+</div><div class='add'>+		if (map_data)</div><div class='add'>+			bytes = 1U &lt;&lt; (PAGE_SHIFT + map_data-&gt;page_order);</div><div class='add'>+		else</div><div class='add'>+			bytes = PAGE_SIZE;</div><div class='ctx'> </div><div class='ctx'> 		if (bytes &gt; len)</div><div class='ctx'> 			bytes = len;</div><div class='ctx'> </div><div class='del'>-		page = alloc_page(q-&gt;bounce_gfp | GFP_KERNEL);</div><div class='add'>+		if (map_data) {</div><div class='add'>+			if (i == map_data-&gt;nr_entries) {</div><div class='add'>+				ret = -ENOMEM;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			page = map_data-&gt;pages[i++];</div><div class='add'>+		} else</div><div class='add'>+			page = alloc_page(q-&gt;bounce_gfp | gfp_mask);</div><div class='ctx'> 		if (!page) {</div><div class='ctx'> 			ret = -ENOMEM;</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -634,16 +699,17 @@ struct bio *bio_copy_user_iov(struct request_queue *q, struct sg_iovec *iov,</div><div class='ctx'> 	 * success</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!write_to_vm) {</div><div class='del'>-		ret = __bio_copy_iov(bio, bio-&gt;bi_io_vec, iov, iov_count, 0);</div><div class='add'>+		ret = __bio_copy_iov(bio, bio-&gt;bi_io_vec, iov, iov_count, 0, 0);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto cleanup;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	bio_set_map_data(bmd, bio, iov, iov_count);</div><div class='add'>+	bio_set_map_data(bmd, bio, iov, iov_count, map_data ? 0 : 1);</div><div class='ctx'> 	return bio;</div><div class='ctx'> cleanup:</div><div class='del'>-	bio_for_each_segment(bvec, bio, i)</div><div class='del'>-		__free_page(bvec-&gt;bv_page);</div><div class='add'>+	if (!map_data)</div><div class='add'>+		bio_for_each_segment(bvec, bio, i)</div><div class='add'>+			__free_page(bvec-&gt;bv_page);</div><div class='ctx'> </div><div class='ctx'> 	bio_put(bio);</div><div class='ctx'> out_bmd:</div><div class='hunk'>@@ -654,29 +720,32 @@ out_bmd:</div><div class='ctx'> /**</div><div class='ctx'>  *	bio_copy_user	-	copy user data to bio</div><div class='ctx'>  *	@q: destination block queue</div><div class='add'>+ *	@map_data: pointer to the rq_map_data holding pages (if necessary)</div><div class='ctx'>  *	@uaddr: start of user address</div><div class='ctx'>  *	@len: length in bytes</div><div class='ctx'>  *	@write_to_vm: bool indicating writing to pages or not</div><div class='add'>+ *	@gfp_mask: memory allocation flags</div><div class='ctx'>  *</div><div class='ctx'>  *	Prepares and returns a bio for indirect user io, bouncing data</div><div class='ctx'>  *	to/from kernel pages as necessary. Must be paired with</div><div class='ctx'>  *	call bio_uncopy_user() on io completion.</div><div class='ctx'>  */</div><div class='del'>-struct bio *bio_copy_user(struct request_queue *q, unsigned long uaddr,</div><div class='del'>-			  unsigned int len, int write_to_vm)</div><div class='add'>+struct bio *bio_copy_user(struct request_queue *q, struct rq_map_data *map_data,</div><div class='add'>+			  unsigned long uaddr, unsigned int len,</div><div class='add'>+			  int write_to_vm, gfp_t gfp_mask)</div><div class='ctx'> {</div><div class='ctx'> 	struct sg_iovec iov;</div><div class='ctx'> </div><div class='ctx'> 	iov.iov_base = (void __user *)uaddr;</div><div class='ctx'> 	iov.iov_len = len;</div><div class='ctx'> </div><div class='del'>-	return bio_copy_user_iov(q, &amp;iov, 1, write_to_vm);</div><div class='add'>+	return bio_copy_user_iov(q, map_data, &amp;iov, 1, write_to_vm, gfp_mask);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct bio *__bio_map_user_iov(struct request_queue *q,</div><div class='ctx'> 				      struct block_device *bdev,</div><div class='ctx'> 				      struct sg_iovec *iov, int iov_count,</div><div class='del'>-				      int write_to_vm)</div><div class='add'>+				      int write_to_vm, gfp_t gfp_mask)</div><div class='ctx'> {</div><div class='ctx'> 	int i, j;</div><div class='ctx'> 	int nr_pages = 0;</div><div class='hunk'>@@ -702,12 +771,12 @@ static struct bio *__bio_map_user_iov(struct request_queue *q,</div><div class='ctx'> 	if (!nr_pages)</div><div class='ctx'> 		return ERR_PTR(-EINVAL);</div><div class='ctx'> </div><div class='del'>-	bio = bio_alloc(GFP_KERNEL, nr_pages);</div><div class='add'>+	bio = bio_alloc(gfp_mask, nr_pages);</div><div class='ctx'> 	if (!bio)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='ctx'> 	ret = -ENOMEM;</div><div class='del'>-	pages = kcalloc(nr_pages, sizeof(struct page *), GFP_KERNEL);</div><div class='add'>+	pages = kcalloc(nr_pages, sizeof(struct page *), gfp_mask);</div><div class='ctx'> 	if (!pages)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -786,19 +855,21 @@ static struct bio *__bio_map_user_iov(struct request_queue *q,</div><div class='ctx'>  *	@uaddr: start of user address</div><div class='ctx'>  *	@len: length in bytes</div><div class='ctx'>  *	@write_to_vm: bool indicating writing to pages or not</div><div class='add'>+ *	@gfp_mask: memory allocation flags</div><div class='ctx'>  *</div><div class='ctx'>  *	Map the user space address into a bio suitable for io to a block</div><div class='ctx'>  *	device. Returns an error pointer in case of error.</div><div class='ctx'>  */</div><div class='ctx'> struct bio *bio_map_user(struct request_queue *q, struct block_device *bdev,</div><div class='del'>-			 unsigned long uaddr, unsigned int len, int write_to_vm)</div><div class='add'>+			 unsigned long uaddr, unsigned int len, int write_to_vm,</div><div class='add'>+			 gfp_t gfp_mask)</div><div class='ctx'> {</div><div class='ctx'> 	struct sg_iovec iov;</div><div class='ctx'> </div><div class='ctx'> 	iov.iov_base = (void __user *)uaddr;</div><div class='ctx'> 	iov.iov_len = len;</div><div class='ctx'> </div><div class='del'>-	return bio_map_user_iov(q, bdev, &amp;iov, 1, write_to_vm);</div><div class='add'>+	return bio_map_user_iov(q, bdev, &amp;iov, 1, write_to_vm, gfp_mask);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -808,18 +879,19 @@ struct bio *bio_map_user(struct request_queue *q, struct block_device *bdev,</div><div class='ctx'>  *	@iov:	the iovec.</div><div class='ctx'>  *	@iov_count: number of elements in the iovec</div><div class='ctx'>  *	@write_to_vm: bool indicating writing to pages or not</div><div class='add'>+ *	@gfp_mask: memory allocation flags</div><div class='ctx'>  *</div><div class='ctx'>  *	Map the user space address into a bio suitable for io to a block</div><div class='ctx'>  *	device. Returns an error pointer in case of error.</div><div class='ctx'>  */</div><div class='ctx'> struct bio *bio_map_user_iov(struct request_queue *q, struct block_device *bdev,</div><div class='ctx'> 			     struct sg_iovec *iov, int iov_count,</div><div class='del'>-			     int write_to_vm)</div><div class='add'>+			     int write_to_vm, gfp_t gfp_mask)</div><div class='ctx'> {</div><div class='ctx'> 	struct bio *bio;</div><div class='ctx'> </div><div class='del'>-	bio = __bio_map_user_iov(q, bdev, iov, iov_count, write_to_vm);</div><div class='del'>-</div><div class='add'>+	bio = __bio_map_user_iov(q, bdev, iov, iov_count, write_to_vm,</div><div class='add'>+				 gfp_mask);</div><div class='ctx'> 	if (IS_ERR(bio))</div><div class='ctx'> 		return bio;</div><div class='ctx'> </div><div class='hunk'>@@ -976,48 +1048,13 @@ static void bio_copy_kern_endio(struct bio *bio, int err)</div><div class='ctx'> struct bio *bio_copy_kern(struct request_queue *q, void *data, unsigned int len,</div><div class='ctx'> 			  gfp_t gfp_mask, int reading)</div><div class='ctx'> {</div><div class='del'>-	unsigned long kaddr = (unsigned long)data;</div><div class='del'>-	unsigned long end = (kaddr + len + PAGE_SIZE - 1) &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	unsigned long start = kaddr &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	const int nr_pages = end - start;</div><div class='ctx'> 	struct bio *bio;</div><div class='ctx'> 	struct bio_vec *bvec;</div><div class='del'>-	struct bio_map_data *bmd;</div><div class='del'>-	int i, ret;</div><div class='del'>-	struct sg_iovec iov;</div><div class='del'>-</div><div class='del'>-	iov.iov_base = data;</div><div class='del'>-	iov.iov_len = len;</div><div class='del'>-</div><div class='del'>-	bmd = bio_alloc_map_data(nr_pages, 1, gfp_mask);</div><div class='del'>-	if (!bmd)</div><div class='del'>-		return ERR_PTR(-ENOMEM);</div><div class='del'>-</div><div class='del'>-	ret = -ENOMEM;</div><div class='del'>-	bio = bio_alloc(gfp_mask, nr_pages);</div><div class='del'>-	if (!bio)</div><div class='del'>-		goto out_bmd;</div><div class='del'>-</div><div class='del'>-	while (len) {</div><div class='del'>-		struct page *page;</div><div class='del'>-		unsigned int bytes = PAGE_SIZE;</div><div class='del'>-</div><div class='del'>-		if (bytes &gt; len)</div><div class='del'>-			bytes = len;</div><div class='del'>-</div><div class='del'>-		page = alloc_page(q-&gt;bounce_gfp | gfp_mask);</div><div class='del'>-		if (!page) {</div><div class='del'>-			ret = -ENOMEM;</div><div class='del'>-			goto cleanup;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (bio_add_pc_page(q, bio, page, bytes, 0) &lt; bytes) {</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-			goto cleanup;</div><div class='del'>-		}</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-		len -= bytes;</div><div class='del'>-	}</div><div class='add'>+	bio = bio_copy_user(q, NULL, (unsigned long)data, len, 1, gfp_mask);</div><div class='add'>+	if (IS_ERR(bio))</div><div class='add'>+		return bio;</div><div class='ctx'> </div><div class='ctx'> 	if (!reading) {</div><div class='ctx'> 		void *p = data;</div><div class='hunk'>@@ -1030,20 +1067,9 @@ struct bio *bio_copy_kern(struct request_queue *q, void *data, unsigned int len,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	bio-&gt;bi_private = bmd;</div><div class='ctx'> 	bio-&gt;bi_end_io = bio_copy_kern_endio;</div><div class='ctx'> </div><div class='del'>-	bio_set_map_data(bmd, bio, &amp;iov, 1);</div><div class='ctx'> 	return bio;</div><div class='del'>-cleanup:</div><div class='del'>-	bio_for_each_segment(bvec, bio, i)</div><div class='del'>-		__free_page(bvec-&gt;bv_page);</div><div class='del'>-</div><div class='del'>-	bio_put(bio);</div><div class='del'>-out_bmd:</div><div class='del'>-	bio_free_map_data(bmd);</div><div class='del'>-</div><div class='del'>-	return ERR_PTR(ret);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1230,9 +1256,9 @@ static void bio_pair_end_2(struct bio *bi, int err)</div><div class='ctx'>  * split a bio - only worry about a bio with a single page</div><div class='ctx'>  * in it's iovec</div><div class='ctx'>  */</div><div class='del'>-struct bio_pair *bio_split(struct bio *bi, mempool_t *pool, int first_sectors)</div><div class='add'>+struct bio_pair *bio_split(struct bio *bi, int first_sectors)</div><div class='ctx'> {</div><div class='del'>-	struct bio_pair *bp = mempool_alloc(pool, GFP_NOIO);</div><div class='add'>+	struct bio_pair *bp = mempool_alloc(bio_split_pool, GFP_NOIO);</div><div class='ctx'> </div><div class='ctx'> 	if (!bp)</div><div class='ctx'> 		return bp;</div><div class='hunk'>@@ -1266,7 +1292,7 @@ struct bio_pair *bio_split(struct bio *bi, mempool_t *pool, int first_sectors)</div><div class='ctx'> 	bp-&gt;bio2.bi_end_io = bio_pair_end_2;</div><div class='ctx'> </div><div class='ctx'> 	bp-&gt;bio1.bi_private = bi;</div><div class='del'>-	bp-&gt;bio2.bi_private = pool;</div><div class='add'>+	bp-&gt;bio2.bi_private = bio_split_pool;</div><div class='ctx'> </div><div class='ctx'> 	if (bio_integrity(bi))</div><div class='ctx'> 		bio_integrity_split(bi, bp, first_sectors);</div><div class='hunk'>@@ -1274,6 +1300,42 @@ struct bio_pair *bio_split(struct bio *bi, mempool_t *pool, int first_sectors)</div><div class='ctx'> 	return bp;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ *      bio_sector_offset - Find hardware sector offset in bio</div><div class='add'>+ *      @bio:           bio to inspect</div><div class='add'>+ *      @index:         bio_vec index</div><div class='add'>+ *      @offset:        offset in bv_page</div><div class='add'>+ *</div><div class='add'>+ *      Return the number of hardware sectors between beginning of bio</div><div class='add'>+ *      and an end point indicated by a bio_vec index and an offset</div><div class='add'>+ *      within that vector's page.</div><div class='add'>+ */</div><div class='add'>+sector_t bio_sector_offset(struct bio *bio, unsigned short index,</div><div class='add'>+			   unsigned int offset)</div><div class='add'>+{</div><div class='add'>+	unsigned int sector_sz = queue_hardsect_size(bio-&gt;bi_bdev-&gt;bd_disk-&gt;queue);</div><div class='add'>+	struct bio_vec *bv;</div><div class='add'>+	sector_t sectors;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	sectors = 0;</div><div class='add'>+</div><div class='add'>+	if (index &gt;= bio-&gt;bi_idx)</div><div class='add'>+		index = bio-&gt;bi_vcnt - 1;</div><div class='add'>+</div><div class='add'>+	__bio_for_each_segment(bv, bio, i, 0) {</div><div class='add'>+		if (i == index) {</div><div class='add'>+			if (offset &gt; bv-&gt;bv_offset)</div><div class='add'>+				sectors += (offset - bv-&gt;bv_offset) / sector_sz;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		sectors += bv-&gt;bv_len / sector_sz;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return sectors;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(bio_sector_offset);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * create memory pools for biovec's in a bio_set.</div><div class='hunk'>@@ -1376,6 +1438,7 @@ static int __init init_bio(void)</div><div class='ctx'> subsys_initcall(init_bio);</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(bio_alloc);</div><div class='add'>+EXPORT_SYMBOL(bio_kmalloc);</div><div class='ctx'> EXPORT_SYMBOL(bio_put);</div><div class='ctx'> EXPORT_SYMBOL(bio_free);</div><div class='ctx'> EXPORT_SYMBOL(bio_endio);</div><div class='hunk'>@@ -1383,7 +1446,6 @@ EXPORT_SYMBOL(bio_init);</div><div class='ctx'> EXPORT_SYMBOL(__bio_clone);</div><div class='ctx'> EXPORT_SYMBOL(bio_clone);</div><div class='ctx'> EXPORT_SYMBOL(bio_phys_segments);</div><div class='del'>-EXPORT_SYMBOL(bio_hw_segments);</div><div class='ctx'> EXPORT_SYMBOL(bio_add_page);</div><div class='ctx'> EXPORT_SYMBOL(bio_add_pc_page);</div><div class='ctx'> EXPORT_SYMBOL(bio_get_nr_vecs);</div><div class='hunk'>@@ -1393,7 +1455,6 @@ EXPORT_SYMBOL(bio_map_kern);</div><div class='ctx'> EXPORT_SYMBOL(bio_copy_kern);</div><div class='ctx'> EXPORT_SYMBOL(bio_pair_release);</div><div class='ctx'> EXPORT_SYMBOL(bio_split);</div><div class='del'>-EXPORT_SYMBOL(bio_split_pool);</div><div class='ctx'> EXPORT_SYMBOL(bio_copy_user);</div><div class='ctx'> EXPORT_SYMBOL(bio_uncopy_user);</div><div class='ctx'> EXPORT_SYMBOL(bioset_create);</div><div class='head'>diff --git a/fs/block_dev.c b/fs/block_dev.c<br/>index aff54219e049..218408eed1bb 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/block_dev.c?id=c15895ef30c2c03e99802951787183039a349d32'>fs/block_dev.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/block_dev.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/block_dev.c</a></div><div class='hunk'>@@ -540,22 +540,6 @@ EXPORT_SYMBOL(bd_release);</div><div class='ctx'>  *           /sys/block/sda/holders/dm-0 --&gt; /sys/block/dm-0</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static struct kobject *bdev_get_kobj(struct block_device *bdev)</div><div class='del'>-{</div><div class='del'>-	if (bdev-&gt;bd_contains != bdev)</div><div class='del'>-		return kobject_get(&amp;bdev-&gt;bd_part-&gt;dev.kobj);</div><div class='del'>-	else</div><div class='del'>-		return kobject_get(&amp;bdev-&gt;bd_disk-&gt;dev.kobj);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct kobject *bdev_get_holder(struct block_device *bdev)</div><div class='del'>-{</div><div class='del'>-	if (bdev-&gt;bd_contains != bdev)</div><div class='del'>-		return kobject_get(bdev-&gt;bd_part-&gt;holder_dir);</div><div class='del'>-	else</div><div class='del'>-		return kobject_get(bdev-&gt;bd_disk-&gt;holder_dir);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int add_symlink(struct kobject *from, struct kobject *to)</div><div class='ctx'> {</div><div class='ctx'> 	if (!from || !to)</div><div class='hunk'>@@ -604,11 +588,11 @@ static int bd_holder_grab_dirs(struct block_device *bdev,</div><div class='ctx'> 	if (!bo-&gt;hdev)</div><div class='ctx'> 		goto fail_put_sdir;</div><div class='ctx'> </div><div class='del'>-	bo-&gt;sdev = bdev_get_kobj(bdev);</div><div class='add'>+	bo-&gt;sdev = kobject_get(&amp;part_to_dev(bdev-&gt;bd_part)-&gt;kobj);</div><div class='ctx'> 	if (!bo-&gt;sdev)</div><div class='ctx'> 		goto fail_put_hdev;</div><div class='ctx'> </div><div class='del'>-	bo-&gt;hdir = bdev_get_holder(bdev);</div><div class='add'>+	bo-&gt;hdir = kobject_get(bdev-&gt;bd_part-&gt;holder_dir);</div><div class='ctx'> 	if (!bo-&gt;hdir)</div><div class='ctx'> 		goto fail_put_sdev;</div><div class='ctx'> </div><div class='hunk'>@@ -868,6 +852,87 @@ struct block_device *open_by_devnum(dev_t dev, unsigned mode)</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(open_by_devnum);</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * flush_disk - invalidates all buffer-cache entries on a disk</div><div class='add'>+ *</div><div class='add'>+ * @bdev:      struct block device to be flushed</div><div class='add'>+ *</div><div class='add'>+ * Invalidates all buffer-cache entries on a disk. It should be called</div><div class='add'>+ * when a disk has been changed -- either by a media change or online</div><div class='add'>+ * resize.</div><div class='add'>+ */</div><div class='add'>+static void flush_disk(struct block_device *bdev)</div><div class='add'>+{</div><div class='add'>+	if (__invalidate_device(bdev)) {</div><div class='add'>+		char name[BDEVNAME_SIZE] = "";</div><div class='add'>+</div><div class='add'>+		if (bdev-&gt;bd_disk)</div><div class='add'>+			disk_name(bdev-&gt;bd_disk, 0, name);</div><div class='add'>+		printk(KERN_WARNING "VFS: busy inodes on changed media or "</div><div class='add'>+		       "resized disk %s\n", name);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!bdev-&gt;bd_disk)</div><div class='add'>+		return;</div><div class='add'>+	if (disk_partitionable(bdev-&gt;bd_disk))</div><div class='add'>+		bdev-&gt;bd_invalidated = 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * check_disk_size_change - checks for disk size change and adjusts bdev size.</div><div class='add'>+ * @disk: struct gendisk to check</div><div class='add'>+ * @bdev: struct bdev to adjust.</div><div class='add'>+ *</div><div class='add'>+ * This routine checks to see if the bdev size does not match the disk size</div><div class='add'>+ * and adjusts it if it differs.</div><div class='add'>+ */</div><div class='add'>+void check_disk_size_change(struct gendisk *disk, struct block_device *bdev)</div><div class='add'>+{</div><div class='add'>+	loff_t disk_size, bdev_size;</div><div class='add'>+</div><div class='add'>+	disk_size = (loff_t)get_capacity(disk) &lt;&lt; 9;</div><div class='add'>+	bdev_size = i_size_read(bdev-&gt;bd_inode);</div><div class='add'>+	if (disk_size != bdev_size) {</div><div class='add'>+		char name[BDEVNAME_SIZE];</div><div class='add'>+</div><div class='add'>+		disk_name(disk, 0, name);</div><div class='add'>+		printk(KERN_INFO</div><div class='add'>+		       "%s: detected capacity change from %lld to %lld\n",</div><div class='add'>+		       name, bdev_size, disk_size);</div><div class='add'>+		i_size_write(bdev-&gt;bd_inode, disk_size);</div><div class='add'>+		flush_disk(bdev);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(check_disk_size_change);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * revalidate_disk - wrapper for lower-level driver's revalidate_disk call-back</div><div class='add'>+ * @disk: struct gendisk to be revalidated</div><div class='add'>+ *</div><div class='add'>+ * This routine is a wrapper for lower-level driver's revalidate_disk</div><div class='add'>+ * call-backs.  It is used to do common pre and post operations needed</div><div class='add'>+ * for all revalidate_disk operations.</div><div class='add'>+ */</div><div class='add'>+int revalidate_disk(struct gendisk *disk)</div><div class='add'>+{</div><div class='add'>+	struct block_device *bdev;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (disk-&gt;fops-&gt;revalidate_disk)</div><div class='add'>+		ret = disk-&gt;fops-&gt;revalidate_disk(disk);</div><div class='add'>+</div><div class='add'>+	bdev = bdget_disk(disk, 0);</div><div class='add'>+	if (!bdev)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;bdev-&gt;bd_mutex);</div><div class='add'>+	check_disk_size_change(disk, bdev);</div><div class='add'>+	mutex_unlock(&amp;bdev-&gt;bd_mutex);</div><div class='add'>+	bdput(bdev);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(revalidate_disk);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * This routine checks whether a removable media has been changed,</div><div class='ctx'>  * and invalidates all buffer-cache-entries in that case. This</div><div class='hunk'>@@ -887,13 +952,9 @@ int check_disk_change(struct block_device *bdev)</div><div class='ctx'> 	if (!bdops-&gt;media_changed(bdev-&gt;bd_disk))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (__invalidate_device(bdev))</div><div class='del'>-		printk("VFS: busy inodes on changed media.\n");</div><div class='del'>-</div><div class='add'>+	flush_disk(bdev);</div><div class='ctx'> 	if (bdops-&gt;revalidate_disk)</div><div class='ctx'> 		bdops-&gt;revalidate_disk(bdev-&gt;bd_disk);</div><div class='del'>-	if (bdev-&gt;bd_disk-&gt;minors &gt; 1)</div><div class='del'>-		bdev-&gt;bd_invalidated = 1;</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -927,10 +988,10 @@ static int __blkdev_put(struct block_device *bdev, int for_part);</div><div class='ctx'> </div><div class='ctx'> static int do_open(struct block_device *bdev, struct file *file, int for_part)</div><div class='ctx'> {</div><div class='del'>-	struct module *owner = NULL;</div><div class='ctx'> 	struct gendisk *disk;</div><div class='add'>+	struct hd_struct *part = NULL;</div><div class='ctx'> 	int ret;</div><div class='del'>-	int part;</div><div class='add'>+	int partno;</div><div class='ctx'> 	int perm = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (file-&gt;f_mode &amp; FMODE_READ)</div><div class='hunk'>@@ -948,25 +1009,27 @@ static int do_open(struct block_device *bdev, struct file *file, int for_part)</div><div class='ctx'> </div><div class='ctx'> 	ret = -ENXIO;</div><div class='ctx'> 	file-&gt;f_mapping = bdev-&gt;bd_inode-&gt;i_mapping;</div><div class='add'>+</div><div class='ctx'> 	lock_kernel();</div><div class='del'>-	disk = get_gendisk(bdev-&gt;bd_dev, &amp;part);</div><div class='del'>-	if (!disk) {</div><div class='del'>-		unlock_kernel();</div><div class='del'>-		bdput(bdev);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-	owner = disk-&gt;fops-&gt;owner;</div><div class='add'>+</div><div class='add'>+	disk = get_gendisk(bdev-&gt;bd_dev, &amp;partno);</div><div class='add'>+	if (!disk)</div><div class='add'>+		goto out_unlock_kernel;</div><div class='add'>+	part = disk_get_part(disk, partno);</div><div class='add'>+	if (!part)</div><div class='add'>+		goto out_unlock_kernel;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock_nested(&amp;bdev-&gt;bd_mutex, for_part);</div><div class='ctx'> 	if (!bdev-&gt;bd_openers) {</div><div class='ctx'> 		bdev-&gt;bd_disk = disk;</div><div class='add'>+		bdev-&gt;bd_part = part;</div><div class='ctx'> 		bdev-&gt;bd_contains = bdev;</div><div class='del'>-		if (!part) {</div><div class='add'>+		if (!partno) {</div><div class='ctx'> 			struct backing_dev_info *bdi;</div><div class='ctx'> 			if (disk-&gt;fops-&gt;open) {</div><div class='ctx'> 				ret = disk-&gt;fops-&gt;open(bdev-&gt;bd_inode, file);</div><div class='ctx'> 				if (ret)</div><div class='del'>-					goto out_first;</div><div class='add'>+					goto out_clear;</div><div class='ctx'> 			}</div><div class='ctx'> 			if (!bdev-&gt;bd_openers) {</div><div class='ctx'> 				bd_set_size(bdev,(loff_t)get_capacity(disk)&lt;&lt;9);</div><div class='hunk'>@@ -978,36 +1041,36 @@ static int do_open(struct block_device *bdev, struct file *file, int for_part)</div><div class='ctx'> 			if (bdev-&gt;bd_invalidated)</div><div class='ctx'> 				rescan_partitions(disk, bdev);</div><div class='ctx'> 		} else {</div><div class='del'>-			struct hd_struct *p;</div><div class='ctx'> 			struct block_device *whole;</div><div class='ctx'> 			whole = bdget_disk(disk, 0);</div><div class='ctx'> 			ret = -ENOMEM;</div><div class='ctx'> 			if (!whole)</div><div class='del'>-				goto out_first;</div><div class='add'>+				goto out_clear;</div><div class='ctx'> 			BUG_ON(for_part);</div><div class='ctx'> 			ret = __blkdev_get(whole, file-&gt;f_mode, file-&gt;f_flags, 1);</div><div class='ctx'> 			if (ret)</div><div class='del'>-				goto out_first;</div><div class='add'>+				goto out_clear;</div><div class='ctx'> 			bdev-&gt;bd_contains = whole;</div><div class='del'>-			p = disk-&gt;part[part - 1];</div><div class='ctx'> 			bdev-&gt;bd_inode-&gt;i_data.backing_dev_info =</div><div class='ctx'> 			   whole-&gt;bd_inode-&gt;i_data.backing_dev_info;</div><div class='del'>-			if (!(disk-&gt;flags &amp; GENHD_FL_UP) || !p || !p-&gt;nr_sects) {</div><div class='add'>+			if (!(disk-&gt;flags &amp; GENHD_FL_UP) ||</div><div class='add'>+			    !part || !part-&gt;nr_sects) {</div><div class='ctx'> 				ret = -ENXIO;</div><div class='del'>-				goto out_first;</div><div class='add'>+				goto out_clear;</div><div class='ctx'> 			}</div><div class='del'>-			kobject_get(&amp;p-&gt;dev.kobj);</div><div class='del'>-			bdev-&gt;bd_part = p;</div><div class='del'>-			bd_set_size(bdev, (loff_t) p-&gt;nr_sects &lt;&lt; 9);</div><div class='add'>+			bd_set_size(bdev, (loff_t)part-&gt;nr_sects &lt;&lt; 9);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='add'>+		disk_put_part(part);</div><div class='ctx'> 		put_disk(disk);</div><div class='del'>-		module_put(owner);</div><div class='add'>+		module_put(disk-&gt;fops-&gt;owner);</div><div class='add'>+		part = NULL;</div><div class='add'>+		disk = NULL;</div><div class='ctx'> 		if (bdev-&gt;bd_contains == bdev) {</div><div class='ctx'> 			if (bdev-&gt;bd_disk-&gt;fops-&gt;open) {</div><div class='ctx'> 				ret = bdev-&gt;bd_disk-&gt;fops-&gt;open(bdev-&gt;bd_inode, file);</div><div class='ctx'> 				if (ret)</div><div class='del'>-					goto out;</div><div class='add'>+					goto out_unlock_bdev;</div><div class='ctx'> 			}</div><div class='ctx'> 			if (bdev-&gt;bd_invalidated)</div><div class='ctx'> 				rescan_partitions(bdev-&gt;bd_disk, bdev);</div><div class='hunk'>@@ -1020,19 +1083,24 @@ static int do_open(struct block_device *bdev, struct file *file, int for_part)</div><div class='ctx'> 	unlock_kernel();</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>-out_first:</div><div class='add'>+ out_clear:</div><div class='ctx'> 	bdev-&gt;bd_disk = NULL;</div><div class='add'>+	bdev-&gt;bd_part = NULL;</div><div class='ctx'> 	bdev-&gt;bd_inode-&gt;i_data.backing_dev_info = &amp;default_backing_dev_info;</div><div class='ctx'> 	if (bdev != bdev-&gt;bd_contains)</div><div class='ctx'> 		__blkdev_put(bdev-&gt;bd_contains, 1);</div><div class='ctx'> 	bdev-&gt;bd_contains = NULL;</div><div class='del'>-	put_disk(disk);</div><div class='del'>-	module_put(owner);</div><div class='del'>-out:</div><div class='add'>+ out_unlock_bdev:</div><div class='ctx'> 	mutex_unlock(&amp;bdev-&gt;bd_mutex);</div><div class='add'>+ out_unlock_kernel:</div><div class='ctx'> 	unlock_kernel();</div><div class='del'>-	if (ret)</div><div class='del'>-		bdput(bdev);</div><div class='add'>+</div><div class='add'>+	disk_put_part(part);</div><div class='add'>+	if (disk)</div><div class='add'>+		module_put(disk-&gt;fops-&gt;owner);</div><div class='add'>+	put_disk(disk);</div><div class='add'>+	bdput(bdev);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1117,11 +1185,8 @@ static int __blkdev_put(struct block_device *bdev, int for_part)</div><div class='ctx'> </div><div class='ctx'> 		put_disk(disk);</div><div class='ctx'> 		module_put(owner);</div><div class='del'>-</div><div class='del'>-		if (bdev-&gt;bd_contains != bdev) {</div><div class='del'>-			kobject_put(&amp;bdev-&gt;bd_part-&gt;dev.kobj);</div><div class='del'>-			bdev-&gt;bd_part = NULL;</div><div class='del'>-		}</div><div class='add'>+		disk_put_part(bdev-&gt;bd_part);</div><div class='add'>+		bdev-&gt;bd_part = NULL;</div><div class='ctx'> 		bdev-&gt;bd_disk = NULL;</div><div class='ctx'> 		bdev-&gt;bd_inode-&gt;i_data.backing_dev_info = &amp;default_backing_dev_info;</div><div class='ctx'> 		if (bdev != bdev-&gt;bd_contains)</div><div class='hunk'>@@ -1197,10 +1262,9 @@ EXPORT_SYMBOL(ioctl_by_bdev);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * lookup_bdev  - lookup a struct block_device by name</div><div class='del'>- *</div><div class='ctx'>  * @path:	special file representing the block device</div><div class='ctx'>  *</div><div class='del'>- * Get a reference to the blockdevice at @path in the current</div><div class='add'>+ * Get a reference to the blockdevice at @pathname in the current</div><div class='ctx'>  * namespace if possible and return it.  Return ERR_PTR(error)</div><div class='ctx'>  * otherwise.</div><div class='ctx'>  */</div><div class='head'>diff --git a/fs/char_dev.c b/fs/char_dev.c<br/>index 3cb7cda3d780..262fa10e213d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/char_dev.c?id=c15895ef30c2c03e99802951787183039a349d32'>fs/char_dev.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/char_dev.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/char_dev.c</a></div><div class='hunk'>@@ -22,9 +22,6 @@</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/backing-dev.h&gt;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_KMOD</div><div class='del'>-#include &lt;linux/kmod.h&gt;</div><div class='del'>-#endif</div><div class='ctx'> #include "internal.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/fs/cifs/cifs_spnego.c b/fs/cifs/cifs_spnego.c<br/>index 117ef4bba68e..fcee9298b620 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/cifs/cifs_spnego.c?id=c15895ef30c2c03e99802951787183039a349d32'>fs/cifs/cifs_spnego.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/cifs/cifs_spnego.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/cifs/cifs_spnego.c</a></div><div class='hunk'>@@ -66,11 +66,28 @@ struct key_type cifs_spnego_key_type = {</div><div class='ctx'> 	.describe	= user_describe,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define MAX_VER_STR_LEN   8 /* length of longest version string e.g.</div><div class='del'>-				strlen("ver=0xFF") */</div><div class='del'>-#define MAX_MECH_STR_LEN 13 /* length of longest security mechanism name, eg</div><div class='del'>-			       in future could have strlen(";sec=ntlmsspi") */</div><div class='del'>-#define MAX_IPV6_ADDR_LEN 42 /* eg FEDC:BA98:7654:3210:FEDC:BA98:7654:3210/60 */</div><div class='add'>+/* length of longest version string e.g.  strlen("ver=0xFF") */</div><div class='add'>+#define MAX_VER_STR_LEN		8</div><div class='add'>+</div><div class='add'>+/* length of longest security mechanism name, eg in future could have</div><div class='add'>+ * strlen(";sec=ntlmsspi") */</div><div class='add'>+#define MAX_MECH_STR_LEN	13</div><div class='add'>+</div><div class='add'>+/* max possible addr len eg FEDC:BA98:7654:3210:FEDC:BA98:7654:3210/60 */</div><div class='add'>+#define MAX_IPV6_ADDR_LEN	42</div><div class='add'>+</div><div class='add'>+/* strlen of "host=" */</div><div class='add'>+#define HOST_KEY_LEN		5</div><div class='add'>+</div><div class='add'>+/* strlen of ";ip4=" or ";ip6=" */</div><div class='add'>+#define IP_KEY_LEN		5</div><div class='add'>+</div><div class='add'>+/* strlen of ";uid=0x" */</div><div class='add'>+#define UID_KEY_LEN		7</div><div class='add'>+</div><div class='add'>+/* strlen of ";user=" */</div><div class='add'>+#define USER_KEY_LEN		6</div><div class='add'>+</div><div class='ctx'> /* get a key struct with a SPNEGO security blob, suitable for session setup */</div><div class='ctx'> struct key *</div><div class='ctx'> cifs_get_spnego_key(struct cifsSesInfo *sesInfo)</div><div class='hunk'>@@ -84,11 +101,11 @@ cifs_get_spnego_key(struct cifsSesInfo *sesInfo)</div><div class='ctx'> 	/* length of fields (with semicolons): ver=0xyz ip4=ipaddress</div><div class='ctx'> 	   host=hostname sec=mechanism uid=0xFF user=username */</div><div class='ctx'> 	desc_len = MAX_VER_STR_LEN +</div><div class='del'>-		   6 /* len of "host=" */ + strlen(hostname) +</div><div class='del'>-		   5 /* len of ";ipv4=" */ + MAX_IPV6_ADDR_LEN +</div><div class='add'>+		   HOST_KEY_LEN + strlen(hostname) +</div><div class='add'>+		   IP_KEY_LEN + MAX_IPV6_ADDR_LEN +</div><div class='ctx'> 		   MAX_MECH_STR_LEN +</div><div class='del'>-		   7 /* len of ";uid=0x" */ + (sizeof(uid_t) * 2) +</div><div class='del'>-		   6 /* len of ";user=" */ + strlen(sesInfo-&gt;userName) + 1;</div><div class='add'>+		   UID_KEY_LEN + (sizeof(uid_t) * 2) +</div><div class='add'>+		   USER_KEY_LEN + strlen(sesInfo-&gt;userName) + 1;</div><div class='ctx'> </div><div class='ctx'> 	spnego_key = ERR_PTR(-ENOMEM);</div><div class='ctx'> 	description = kzalloc(desc_len, GFP_KERNEL);</div><div class='head'>diff --git a/fs/cifs/cifsfs.h b/fs/cifs/cifsfs.h<br/>index 135c965c4137..f7b4a5cd837b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/cifs/cifsfs.h?id=c15895ef30c2c03e99802951787183039a349d32'>fs/cifs/cifsfs.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/cifs/cifsfs.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/cifs/cifsfs.h</a></div><div class='hunk'>@@ -41,7 +41,7 @@ extern int cifs_create(struct inode *, struct dentry *, int,</div><div class='ctx'> 		       struct nameidata *);</div><div class='ctx'> extern struct dentry *cifs_lookup(struct inode *, struct dentry *,</div><div class='ctx'> 				  struct nameidata *);</div><div class='del'>-extern int cifs_unlink(struct inode *, struct dentry *);</div><div class='add'>+extern int cifs_unlink(struct inode *dir, struct dentry *dentry);</div><div class='ctx'> extern int cifs_hardlink(struct dentry *, struct inode *, struct dentry *);</div><div class='ctx'> extern int cifs_mknod(struct inode *, struct dentry *, int, dev_t);</div><div class='ctx'> extern int cifs_mkdir(struct inode *, struct dentry *, int);</div><div class='head'>diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h<br/>index 8dfd6f24d488..0d22479d99b7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/cifs/cifsglob.h?id=c15895ef30c2c03e99802951787183039a349d32'>fs/cifs/cifsglob.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/cifs/cifsglob.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/cifs/cifsglob.h</a></div><div class='hunk'>@@ -309,6 +309,7 @@ struct cifs_search_info {</div><div class='ctx'> 	__u32 resume_key;</div><div class='ctx'> 	char *ntwrk_buf_start;</div><div class='ctx'> 	char *srch_entries_start;</div><div class='add'>+	char *last_entry;</div><div class='ctx'> 	char *presume_name;</div><div class='ctx'> 	unsigned int resume_name_len;</div><div class='ctx'> 	bool endOfSearch:1;</div><div class='head'>diff --git a/fs/cifs/cifsproto.h b/fs/cifs/cifsproto.h<br/>index a729d083e6f4..0cff7fe986e8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/cifs/cifsproto.h?id=c15895ef30c2c03e99802951787183039a349d32'>fs/cifs/cifsproto.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/cifs/cifsproto.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/cifs/cifsproto.h</a></div><div class='hunk'>@@ -179,6 +179,8 @@ extern int CIFSSMBSetPathInfo(const int xid, struct cifsTconInfo *tcon,</div><div class='ctx'> extern int CIFSSMBSetFileInfo(const int xid, struct cifsTconInfo *tcon,</div><div class='ctx'> 			const FILE_BASIC_INFO *data, __u16 fid,</div><div class='ctx'> 			__u32 pid_of_opener);</div><div class='add'>+extern int CIFSSMBSetFileDisposition(const int xid, struct cifsTconInfo *tcon,</div><div class='add'>+			bool delete_file, __u16 fid, __u32 pid_of_opener);</div><div class='ctx'> #if 0</div><div class='ctx'> extern int CIFSSMBSetAttrLegacy(int xid, struct cifsTconInfo *tcon,</div><div class='ctx'> 			char *fileName, __u16 dos_attributes,</div><div class='hunk'>@@ -229,7 +231,7 @@ extern int CIFSSMBRename(const int xid, struct cifsTconInfo *tcon,</div><div class='ctx'> 			const struct nls_table *nls_codepage,</div><div class='ctx'> 			int remap_special_chars);</div><div class='ctx'> extern int CIFSSMBRenameOpenFile(const int xid, struct cifsTconInfo *pTcon,</div><div class='del'>-			int netfid, char *target_name,</div><div class='add'>+			int netfid, const char *target_name,</div><div class='ctx'> 			const struct nls_table *nls_codepage,</div><div class='ctx'> 			int remap_special_chars);</div><div class='ctx'> extern int CIFSCreateHardLink(const int xid,</div><div class='head'>diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c<br/>index 994de7c90474..6f4ffe15d68d 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/cifs/cifssmb.c?id=c15895ef30c2c03e99802951787183039a349d32'>fs/cifs/cifssmb.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/cifs/cifssmb.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/cifs/cifssmb.c</a></div><div class='hunk'>@@ -2017,7 +2017,7 @@ renameRetry:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int CIFSSMBRenameOpenFile(const int xid, struct cifsTconInfo *pTcon,</div><div class='del'>-		int netfid, char *target_name,</div><div class='add'>+		int netfid, const char *target_name,</div><div class='ctx'> 		const struct nls_table *nls_codepage, int remap)</div><div class='ctx'> {</div><div class='ctx'> 	struct smb_com_transaction2_sfi_req *pSMB  = NULL;</div><div class='hunk'>@@ -2071,7 +2071,7 @@ int CIFSSMBRenameOpenFile(const int xid, struct cifsTconInfo *pTcon,</div><div class='ctx'> 					remap);</div><div class='ctx'> 	}</div><div class='ctx'> 	rename_info-&gt;target_name_len = cpu_to_le32(2 * len_of_str);</div><div class='del'>-	count = 12 /* sizeof(struct set_file_rename) */ + (2 * len_of_str) + 2;</div><div class='add'>+	count = 12 /* sizeof(struct set_file_rename) */ + (2 * len_of_str);</div><div class='ctx'> 	byte_count += count;</div><div class='ctx'> 	pSMB-&gt;DataCount = cpu_to_le16(count);</div><div class='ctx'> 	pSMB-&gt;TotalDataCount = pSMB-&gt;DataCount;</div><div class='hunk'>@@ -3614,6 +3614,8 @@ findFirstRetry:</div><div class='ctx'> 		/* BB remember to free buffer if error BB */</div><div class='ctx'> 		rc = validate_t2((struct smb_t2_rsp *)pSMBr);</div><div class='ctx'> 		if (rc == 0) {</div><div class='add'>+			unsigned int lnoff;</div><div class='add'>+</div><div class='ctx'> 			if (pSMBr-&gt;hdr.Flags2 &amp; SMBFLG2_UNICODE)</div><div class='ctx'> 				psrch_inf-&gt;unicode = true;</div><div class='ctx'> 			else</div><div class='hunk'>@@ -3636,6 +3638,17 @@ findFirstRetry:</div><div class='ctx'> 					le16_to_cpu(parms-&gt;SearchCount);</div><div class='ctx'> 			psrch_inf-&gt;index_of_last_entry = 2 /* skip . and .. */ +</div><div class='ctx'> 				psrch_inf-&gt;entries_in_buffer;</div><div class='add'>+			lnoff = le16_to_cpu(parms-&gt;LastNameOffset);</div><div class='add'>+			if (tcon-&gt;ses-&gt;server-&gt;maxBuf - MAX_CIFS_HDR_SIZE &lt;</div><div class='add'>+			      lnoff) {</div><div class='add'>+				cERROR(1, ("ignoring corrupt resume name"));</div><div class='add'>+				psrch_inf-&gt;last_entry = NULL;</div><div class='add'>+				return rc;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			psrch_inf-&gt;last_entry = psrch_inf-&gt;srch_entries_start +</div><div class='add'>+							lnoff;</div><div class='add'>+</div><div class='ctx'> 			*pnetfid = parms-&gt;SearchHandle;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			cifs_buf_release(pSMB);</div><div class='hunk'>@@ -3725,6 +3738,8 @@ int CIFSFindNext(const int xid, struct cifsTconInfo *tcon,</div><div class='ctx'> 		rc = validate_t2((struct smb_t2_rsp *)pSMBr);</div><div class='ctx'> </div><div class='ctx'> 		if (rc == 0) {</div><div class='add'>+			unsigned int lnoff;</div><div class='add'>+</div><div class='ctx'> 			/* BB fixme add lock for file (srch_info) struct here */</div><div class='ctx'> 			if (pSMBr-&gt;hdr.Flags2 &amp; SMBFLG2_UNICODE)</div><div class='ctx'> 				psrch_inf-&gt;unicode = true;</div><div class='hunk'>@@ -3751,6 +3766,16 @@ int CIFSFindNext(const int xid, struct cifsTconInfo *tcon,</div><div class='ctx'> 						le16_to_cpu(parms-&gt;SearchCount);</div><div class='ctx'> 			psrch_inf-&gt;index_of_last_entry +=</div><div class='ctx'> 				psrch_inf-&gt;entries_in_buffer;</div><div class='add'>+			lnoff = le16_to_cpu(parms-&gt;LastNameOffset);</div><div class='add'>+			if (tcon-&gt;ses-&gt;server-&gt;maxBuf - MAX_CIFS_HDR_SIZE &lt;</div><div class='add'>+			      lnoff) {</div><div class='add'>+				cERROR(1, ("ignoring corrupt resume name"));</div><div class='add'>+				psrch_inf-&gt;last_entry = NULL;</div><div class='add'>+				return rc;</div><div class='add'>+			} else</div><div class='add'>+				psrch_inf-&gt;last_entry =</div><div class='add'>+					psrch_inf-&gt;srch_entries_start + lnoff;</div><div class='add'>+</div><div class='ctx'> /*  cFYI(1,("fnxt2 entries in buf %d index_of_last %d",</div><div class='ctx'> 	    psrch_inf-&gt;entries_in_buffer, psrch_inf-&gt;index_of_last_entry)); */</div><div class='ctx'> </div><div class='hunk'>@@ -4876,6 +4901,61 @@ CIFSSMBSetFileInfo(const int xid, struct cifsTconInfo *tcon,</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int</div><div class='add'>+CIFSSMBSetFileDisposition(const int xid, struct cifsTconInfo *tcon,</div><div class='add'>+			  bool delete_file, __u16 fid, __u32 pid_of_opener)</div><div class='add'>+{</div><div class='add'>+	struct smb_com_transaction2_sfi_req *pSMB  = NULL;</div><div class='add'>+	char *data_offset;</div><div class='add'>+	int rc = 0;</div><div class='add'>+	__u16 params, param_offset, offset, byte_count, count;</div><div class='add'>+</div><div class='add'>+	cFYI(1, ("Set File Disposition (via SetFileInfo)"));</div><div class='add'>+	rc = small_smb_init(SMB_COM_TRANSACTION2, 15, tcon, (void **) &amp;pSMB);</div><div class='add'>+</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	pSMB-&gt;hdr.Pid = cpu_to_le16((__u16)pid_of_opener);</div><div class='add'>+	pSMB-&gt;hdr.PidHigh = cpu_to_le16((__u16)(pid_of_opener &gt;&gt; 16));</div><div class='add'>+</div><div class='add'>+	params = 6;</div><div class='add'>+	pSMB-&gt;MaxSetupCount = 0;</div><div class='add'>+	pSMB-&gt;Reserved = 0;</div><div class='add'>+	pSMB-&gt;Flags = 0;</div><div class='add'>+	pSMB-&gt;Timeout = 0;</div><div class='add'>+	pSMB-&gt;Reserved2 = 0;</div><div class='add'>+	param_offset = offsetof(struct smb_com_transaction2_sfi_req, Fid) - 4;</div><div class='add'>+	offset = param_offset + params;</div><div class='add'>+</div><div class='add'>+	data_offset = (char *) (&amp;pSMB-&gt;hdr.Protocol) + offset;</div><div class='add'>+</div><div class='add'>+	count = 1;</div><div class='add'>+	pSMB-&gt;MaxParameterCount = cpu_to_le16(2);</div><div class='add'>+	/* BB find max SMB PDU from sess */</div><div class='add'>+	pSMB-&gt;MaxDataCount = cpu_to_le16(1000);</div><div class='add'>+	pSMB-&gt;SetupCount = 1;</div><div class='add'>+	pSMB-&gt;Reserved3 = 0;</div><div class='add'>+	pSMB-&gt;SubCommand = cpu_to_le16(TRANS2_SET_FILE_INFORMATION);</div><div class='add'>+	byte_count = 3 /* pad */  + params + count;</div><div class='add'>+	pSMB-&gt;DataCount = cpu_to_le16(count);</div><div class='add'>+	pSMB-&gt;ParameterCount = cpu_to_le16(params);</div><div class='add'>+	pSMB-&gt;TotalDataCount = pSMB-&gt;DataCount;</div><div class='add'>+	pSMB-&gt;TotalParameterCount = pSMB-&gt;ParameterCount;</div><div class='add'>+	pSMB-&gt;ParameterOffset = cpu_to_le16(param_offset);</div><div class='add'>+	pSMB-&gt;DataOffset = cpu_to_le16(offset);</div><div class='add'>+	pSMB-&gt;Fid = fid;</div><div class='add'>+	pSMB-&gt;InformationLevel = cpu_to_le16(SMB_SET_FILE_DISPOSITION_INFO);</div><div class='add'>+	pSMB-&gt;Reserved4 = 0;</div><div class='add'>+	pSMB-&gt;hdr.smb_buf_length += byte_count;</div><div class='add'>+	pSMB-&gt;ByteCount = cpu_to_le16(byte_count);</div><div class='add'>+	*data_offset = delete_file ? 1 : 0;</div><div class='add'>+	rc = SendReceiveNoRsp(xid, tcon-&gt;ses, (struct smb_hdr *) pSMB, 0);</div><div class='add'>+	if (rc)</div><div class='add'>+		cFYI(1, ("Send error in SetFileDisposition = %d", rc));</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> int</div><div class='ctx'> CIFSSMBSetPathInfo(const int xid, struct cifsTconInfo *tcon,</div><div class='head'>diff --git a/fs/cifs/dns_resolve.c b/fs/cifs/dns_resolve.c<br/>index a2e0673e1b08..1e0c1bd8f2e4 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/cifs/dns_resolve.c?id=c15895ef30c2c03e99802951787183039a349d32'>fs/cifs/dns_resolve.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/cifs/dns_resolve.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/cifs/dns_resolve.c</a></div><div class='hunk'>@@ -29,19 +29,55 @@</div><div class='ctx'> #include "cifsproto.h"</div><div class='ctx'> #include "cifs_debug.h"</div><div class='ctx'> </div><div class='del'>-static int dns_resolver_instantiate(struct key *key, const void *data,</div><div class='add'>+/* Checks if supplied name is IP address</div><div class='add'>+ * returns:</div><div class='add'>+ * 		1 - name is IP</div><div class='add'>+ * 		0 - name is not IP</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+is_ip(const char *name)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+	struct sockaddr_in sin_server;</div><div class='add'>+	struct sockaddr_in6 sin_server6;</div><div class='add'>+</div><div class='add'>+	rc = cifs_inet_pton(AF_INET, name,</div><div class='add'>+			&amp;sin_server.sin_addr.s_addr);</div><div class='add'>+</div><div class='add'>+	if (rc &lt;= 0) {</div><div class='add'>+		/* not ipv4 address, try ipv6 */</div><div class='add'>+		rc = cifs_inet_pton(AF_INET6, name,</div><div class='add'>+				&amp;sin_server6.sin6_addr.in6_u);</div><div class='add'>+		if (rc &gt; 0)</div><div class='add'>+			return 1;</div><div class='add'>+	} else {</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+	/* we failed translating address */</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+dns_resolver_instantiate(struct key *key, const void *data,</div><div class='ctx'> 		size_t datalen)</div><div class='ctx'> {</div><div class='ctx'> 	int rc = 0;</div><div class='ctx'> 	char *ip;</div><div class='ctx'> </div><div class='del'>-	ip = kmalloc(datalen+1, GFP_KERNEL);</div><div class='add'>+	ip = kmalloc(datalen + 1, GFP_KERNEL);</div><div class='ctx'> 	if (!ip)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	memcpy(ip, data, datalen);</div><div class='ctx'> 	ip[datalen] = '\0';</div><div class='ctx'> </div><div class='add'>+	/* make sure this looks like an address */</div><div class='add'>+	if (!is_ip((const char *) ip)) {</div><div class='add'>+		kfree(ip);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	key-&gt;type_data.x[0] = datalen;</div><div class='ctx'> 	rcu_assign_pointer(key-&gt;payload.data, ip);</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='hunk'>@@ -62,33 +98,6 @@ struct key_type key_type_dns_resolver = {</div><div class='ctx'> 	.match       = user_match,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* Checks if supplied name is IP address</div><div class='del'>- * returns:</div><div class='del'>- * 		1 - name is IP</div><div class='del'>- * 		0 - name is not IP</div><div class='del'>- */</div><div class='del'>-static int is_ip(const char *name)</div><div class='del'>-{</div><div class='del'>-	int rc;</div><div class='del'>-	struct sockaddr_in sin_server;</div><div class='del'>-	struct sockaddr_in6 sin_server6;</div><div class='del'>-</div><div class='del'>-	rc = cifs_inet_pton(AF_INET, name,</div><div class='del'>-			&amp;sin_server.sin_addr.s_addr);</div><div class='del'>-</div><div class='del'>-	if (rc &lt;= 0) {</div><div class='del'>-		/* not ipv4 address, try ipv6 */</div><div class='del'>-		rc = cifs_inet_pton(AF_INET6, name,</div><div class='del'>-				&amp;sin_server6.sin6_addr.in6_u);</div><div class='del'>-		if (rc &gt; 0)</div><div class='del'>-			return 1;</div><div class='del'>-	} else {</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-	/* we failed translating address */</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* Resolves server name to ip address.</div><div class='ctx'>  * input:</div><div class='ctx'>  * 	unc - server UNC</div><div class='hunk'>@@ -140,6 +149,7 @@ dns_resolve_server_name_to_ip(const char *unc, char **ip_addr)</div><div class='ctx'> </div><div class='ctx'> 	rkey = request_key(&amp;key_type_dns_resolver, name, "");</div><div class='ctx'> 	if (!IS_ERR(rkey)) {</div><div class='add'>+		len = rkey-&gt;type_data.x[0];</div><div class='ctx'> 		data = rkey-&gt;payload.data;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		cERROR(1, ("%s: unable to resolve: %s", __func__, name));</div><div class='hunk'>@@ -148,11 +158,9 @@ dns_resolve_server_name_to_ip(const char *unc, char **ip_addr)</div><div class='ctx'> </div><div class='ctx'> skip_upcall:</div><div class='ctx'> 	if (data) {</div><div class='del'>-		len = strlen(data);</div><div class='del'>-		*ip_addr = kmalloc(len+1, GFP_KERNEL);</div><div class='add'>+		*ip_addr = kmalloc(len + 1, GFP_KERNEL);</div><div class='ctx'> 		if (*ip_addr) {</div><div class='del'>-			memcpy(*ip_addr, data, len);</div><div class='del'>-			(*ip_addr)[len] = '\0';</div><div class='add'>+			memcpy(*ip_addr, data, len + 1);</div><div class='ctx'> 			if (!IS_ERR(rkey))</div><div class='ctx'> 				cFYI(1, ("%s: resolved: %s to %s", __func__,</div><div class='ctx'> 							name,</div><div class='head'>diff --git a/fs/cifs/file.c b/fs/cifs/file.c<br/>index cbefe1f1f9fe..c4a8a0605125 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/cifs/file.c?id=c15895ef30c2c03e99802951787183039a349d32'>fs/cifs/file.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/cifs/file.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/cifs/file.c</a></div><div class='hunk'>@@ -107,7 +107,7 @@ static inline int cifs_open_inode_helper(struct inode *inode, struct file *file,</div><div class='ctx'> </div><div class='ctx'> 	/* want handles we can use to read with first</div><div class='ctx'> 	   in the list so we do not have to walk the</div><div class='del'>-	   list to search for one in prepare_write */</div><div class='add'>+	   list to search for one in write_begin */</div><div class='ctx'> 	if ((file-&gt;f_flags &amp; O_ACCMODE) == O_WRONLY) {</div><div class='ctx'> 		list_add_tail(&amp;pCifsFile-&gt;flist,</div><div class='ctx'> 			      &amp;pCifsInode-&gt;openFileList);</div><div class='hunk'>@@ -915,7 +915,7 @@ ssize_t cifs_user_write(struct file *file, const char __user *write_data,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t cifs_write(struct file *file, const char *write_data,</div><div class='del'>-	size_t write_size, loff_t *poffset)</div><div class='add'>+			  size_t write_size, loff_t *poffset)</div><div class='ctx'> {</div><div class='ctx'> 	int rc = 0;</div><div class='ctx'> 	unsigned int bytes_written = 0;</div><div class='hunk'>@@ -1065,6 +1065,7 @@ struct cifsFileInfo *find_readable_file(struct cifsInodeInfo *cifs_inode)</div><div class='ctx'> struct cifsFileInfo *find_writable_file(struct cifsInodeInfo *cifs_inode)</div><div class='ctx'> {</div><div class='ctx'> 	struct cifsFileInfo *open_file;</div><div class='add'>+	bool any_available = false;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	/* Having a null inode here (because mapping-&gt;host was set to zero by</div><div class='hunk'>@@ -1080,8 +1081,10 @@ struct cifsFileInfo *find_writable_file(struct cifsInodeInfo *cifs_inode)</div><div class='ctx'> 	read_lock(&amp;GlobalSMBSeslock);</div><div class='ctx'> refind_writable:</div><div class='ctx'> 	list_for_each_entry(open_file, &amp;cifs_inode-&gt;openFileList, flist) {</div><div class='del'>-		if (open_file-&gt;closePend)</div><div class='add'>+		if (open_file-&gt;closePend ||</div><div class='add'>+		    (!any_available &amp;&amp; open_file-&gt;pid != current-&gt;tgid))</div><div class='ctx'> 			continue;</div><div class='add'>+</div><div class='ctx'> 		if (open_file-&gt;pfile &amp;&amp;</div><div class='ctx'> 		    ((open_file-&gt;pfile-&gt;f_flags &amp; O_RDWR) ||</div><div class='ctx'> 		     (open_file-&gt;pfile-&gt;f_flags &amp; O_WRONLY))) {</div><div class='hunk'>@@ -1131,6 +1134,11 @@ refind_writable:</div><div class='ctx'> 			   of the loop here. */</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+	/* couldn't find useable FH with same pid, try any available */</div><div class='add'>+	if (!any_available) {</div><div class='add'>+		any_available = true;</div><div class='add'>+		goto refind_writable;</div><div class='add'>+	}</div><div class='ctx'> 	read_unlock(&amp;GlobalSMBSeslock);</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='hunk'>@@ -1447,49 +1455,52 @@ static int cifs_writepage(struct page *page, struct writeback_control *wbc)</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cifs_commit_write(struct file *file, struct page *page,</div><div class='del'>-	unsigned offset, unsigned to)</div><div class='add'>+static int cifs_write_end(struct file *file, struct address_space *mapping,</div><div class='add'>+			loff_t pos, unsigned len, unsigned copied,</div><div class='add'>+			struct page *page, void *fsdata)</div><div class='ctx'> {</div><div class='del'>-	int xid;</div><div class='del'>-	int rc = 0;</div><div class='del'>-	struct inode *inode = page-&gt;mapping-&gt;host;</div><div class='del'>-	loff_t position = ((loff_t)page-&gt;index &lt;&lt; PAGE_CACHE_SHIFT) + to;</div><div class='del'>-	char *page_data;</div><div class='add'>+	int rc;</div><div class='add'>+	struct inode *inode = mapping-&gt;host;</div><div class='ctx'> </div><div class='del'>-	xid = GetXid();</div><div class='del'>-	cFYI(1, ("commit write for page %p up to position %lld for %d",</div><div class='del'>-		 page, position, to));</div><div class='del'>-	spin_lock(&amp;inode-&gt;i_lock);</div><div class='del'>-	if (position &gt; inode-&gt;i_size)</div><div class='del'>-		i_size_write(inode, position);</div><div class='add'>+	cFYI(1, ("write_end for page %p from pos %lld with %d bytes",</div><div class='add'>+		 page, pos, copied));</div><div class='add'>+</div><div class='add'>+	if (!PageUptodate(page) &amp;&amp; copied == PAGE_CACHE_SIZE)</div><div class='add'>+		SetPageUptodate(page);</div><div class='ctx'> </div><div class='del'>-	spin_unlock(&amp;inode-&gt;i_lock);</div><div class='ctx'> 	if (!PageUptodate(page)) {</div><div class='del'>-		position =  ((loff_t)page-&gt;index &lt;&lt; PAGE_CACHE_SHIFT) + offset;</div><div class='del'>-		/* can not rely on (or let) writepage write this data */</div><div class='del'>-		if (to &lt; offset) {</div><div class='del'>-			cFYI(1, ("Illegal offsets, can not copy from %d to %d",</div><div class='del'>-				offset, to));</div><div class='del'>-			FreeXid(xid);</div><div class='del'>-			return rc;</div><div class='del'>-		}</div><div class='add'>+		char *page_data;</div><div class='add'>+		unsigned offset = pos &amp; (PAGE_CACHE_SIZE - 1);</div><div class='add'>+		int xid;</div><div class='add'>+</div><div class='add'>+		xid = GetXid();</div><div class='ctx'> 		/* this is probably better than directly calling</div><div class='ctx'> 		   partialpage_write since in this function the file handle is</div><div class='ctx'> 		   known which we might as well	leverage */</div><div class='ctx'> 		/* BB check if anything else missing out of ppw</div><div class='ctx'> 		   such as updating last write time */</div><div class='ctx'> 		page_data = kmap(page);</div><div class='del'>-		rc = cifs_write(file, page_data + offset, to-offset,</div><div class='del'>-				&amp;position);</div><div class='del'>-		if (rc &gt; 0)</div><div class='del'>-			rc = 0;</div><div class='del'>-		/* else if (rc &lt; 0) should we set writebehind rc? */</div><div class='add'>+		rc = cifs_write(file, page_data + offset, copied, &amp;pos);</div><div class='add'>+		/* if (rc &lt; 0) should we set writebehind rc? */</div><div class='ctx'> 		kunmap(page);</div><div class='add'>+</div><div class='add'>+		FreeXid(xid);</div><div class='ctx'> 	} else {</div><div class='add'>+		rc = copied;</div><div class='add'>+		pos += copied;</div><div class='ctx'> 		set_page_dirty(page);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	FreeXid(xid);</div><div class='add'>+	if (rc &gt; 0) {</div><div class='add'>+		spin_lock(&amp;inode-&gt;i_lock);</div><div class='add'>+		if (pos &gt; inode-&gt;i_size)</div><div class='add'>+			i_size_write(inode, pos);</div><div class='add'>+		spin_unlock(&amp;inode-&gt;i_lock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	unlock_page(page);</div><div class='add'>+	page_cache_release(page);</div><div class='add'>+</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2035,49 +2046,44 @@ bool is_size_safe_to_change(struct cifsInodeInfo *cifsInode, __u64 end_of_file)</div><div class='ctx'> 		return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cifs_prepare_write(struct file *file, struct page *page,</div><div class='del'>-	unsigned from, unsigned to)</div><div class='add'>+static int cifs_write_begin(struct file *file, struct address_space *mapping,</div><div class='add'>+			loff_t pos, unsigned len, unsigned flags,</div><div class='add'>+			struct page **pagep, void **fsdata)</div><div class='ctx'> {</div><div class='del'>-	int rc = 0;</div><div class='del'>-	loff_t i_size;</div><div class='del'>-	loff_t offset;</div><div class='add'>+	pgoff_t index = pos &gt;&gt; PAGE_CACHE_SHIFT;</div><div class='add'>+	loff_t offset = pos &amp; (PAGE_CACHE_SIZE - 1);</div><div class='ctx'> </div><div class='del'>-	cFYI(1, ("prepare write for page %p from %d to %d", page, from, to));</div><div class='del'>-	if (PageUptodate(page))</div><div class='add'>+	cFYI(1, ("write_begin from %lld len %d", (long long)pos, len));</div><div class='add'>+</div><div class='add'>+	*pagep = __grab_cache_page(mapping, index);</div><div class='add'>+	if (!*pagep)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (PageUptodate(*pagep))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* If we are writing a full page it will be up to date,</div><div class='ctx'> 	   no need to read from the server */</div><div class='del'>-	if ((to == PAGE_CACHE_SIZE) &amp;&amp; (from == 0)) {</div><div class='del'>-		SetPageUptodate(page);</div><div class='add'>+	if (len == PAGE_CACHE_SIZE &amp;&amp; flags &amp; AOP_FLAG_UNINTERRUPTIBLE)</div><div class='ctx'> 		return 0;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	offset = (loff_t)page-&gt;index &lt;&lt; PAGE_CACHE_SHIFT;</div><div class='del'>-	i_size = i_size_read(page-&gt;mapping-&gt;host);</div><div class='add'>+	if ((file-&gt;f_flags &amp; O_ACCMODE) != O_WRONLY) {</div><div class='add'>+		int rc;</div><div class='ctx'> </div><div class='del'>-	if ((offset &gt;= i_size) ||</div><div class='del'>-	    ((from == 0) &amp;&amp; (offset + to) &gt;= i_size)) {</div><div class='del'>-		/*</div><div class='del'>-		 * We don't need to read data beyond the end of the file.</div><div class='del'>-		 * zero it, and set the page uptodate</div><div class='del'>-		 */</div><div class='del'>-		simple_prepare_write(file, page, from, to);</div><div class='del'>-		SetPageUptodate(page);</div><div class='del'>-	} else if ((file-&gt;f_flags &amp; O_ACCMODE) != O_WRONLY) {</div><div class='ctx'> 		/* might as well read a page, it is fast enough */</div><div class='del'>-		rc = cifs_readpage_worker(file, page, &amp;offset);</div><div class='add'>+		rc = cifs_readpage_worker(file, *pagep, &amp;offset);</div><div class='add'>+</div><div class='add'>+		/* we do not need to pass errors back</div><div class='add'>+		   e.g. if we do not have read access to the file</div><div class='add'>+		   because cifs_write_end will attempt synchronous writes</div><div class='add'>+		   -- shaggy */</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* we could try using another file handle if there is one -</div><div class='ctx'> 		   but how would we lock it to prevent close of that handle</div><div class='ctx'> 		   racing with this read? In any case</div><div class='del'>-		   this will be written out by commit_write so is fine */</div><div class='add'>+		   this will be written out by write_end so is fine */</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* we do not need to pass errors back</div><div class='del'>-	   e.g. if we do not have read access to the file</div><div class='del'>-	   because cifs_commit_write will do the right thing.  -- shaggy */</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2086,8 +2092,8 @@ const struct address_space_operations cifs_addr_ops = {</div><div class='ctx'> 	.readpages = cifs_readpages,</div><div class='ctx'> 	.writepage = cifs_writepage,</div><div class='ctx'> 	.writepages = cifs_writepages,</div><div class='del'>-	.prepare_write = cifs_prepare_write,</div><div class='del'>-	.commit_write = cifs_commit_write,</div><div class='add'>+	.write_begin = cifs_write_begin,</div><div class='add'>+	.write_end = cifs_write_end,</div><div class='ctx'> 	.set_page_dirty = __set_page_dirty_nobuffers,</div><div class='ctx'> 	/* .sync_page = cifs_sync_page, */</div><div class='ctx'> 	/* .direct_IO = */</div><div class='hunk'>@@ -2102,8 +2108,8 @@ const struct address_space_operations cifs_addr_ops_smallbuf = {</div><div class='ctx'> 	.readpage = cifs_readpage,</div><div class='ctx'> 	.writepage = cifs_writepage,</div><div class='ctx'> 	.writepages = cifs_writepages,</div><div class='del'>-	.prepare_write = cifs_prepare_write,</div><div class='del'>-	.commit_write = cifs_commit_write,</div><div class='add'>+	.write_begin = cifs_write_begin,</div><div class='add'>+	.write_end = cifs_write_end,</div><div class='ctx'> 	.set_page_dirty = __set_page_dirty_nobuffers,</div><div class='ctx'> 	/* .sync_page = cifs_sync_page, */</div><div class='ctx'> 	/* .direct_IO = */</div><div class='head'>diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c<br/>index 9c548f110102..a8c833345fc9 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/cifs/inode.c?id=c15895ef30c2c03e99802951787183039a349d32'>fs/cifs/inode.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/cifs/inode.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/cifs/inode.c</a></div><div class='hunk'>@@ -665,40 +665,201 @@ struct inode *cifs_iget(struct super_block *sb, unsigned long ino)</div><div class='ctx'> 	return inode;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int cifs_unlink(struct inode *inode, struct dentry *direntry)</div><div class='add'>+static int</div><div class='add'>+cifs_set_file_info(struct inode *inode, struct iattr *attrs, int xid,</div><div class='add'>+		    char *full_path, __u32 dosattr)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+	int oplock = 0;</div><div class='add'>+	__u16 netfid;</div><div class='add'>+	__u32 netpid;</div><div class='add'>+	bool set_time = false;</div><div class='add'>+	struct cifsFileInfo *open_file;</div><div class='add'>+	struct cifsInodeInfo *cifsInode = CIFS_I(inode);</div><div class='add'>+	struct cifs_sb_info *cifs_sb = CIFS_SB(inode-&gt;i_sb);</div><div class='add'>+	struct cifsTconInfo *pTcon = cifs_sb-&gt;tcon;</div><div class='add'>+	FILE_BASIC_INFO	info_buf;</div><div class='add'>+</div><div class='add'>+	if (attrs-&gt;ia_valid &amp; ATTR_ATIME) {</div><div class='add'>+		set_time = true;</div><div class='add'>+		info_buf.LastAccessTime =</div><div class='add'>+			cpu_to_le64(cifs_UnixTimeToNT(attrs-&gt;ia_atime));</div><div class='add'>+	} else</div><div class='add'>+		info_buf.LastAccessTime = 0;</div><div class='add'>+</div><div class='add'>+	if (attrs-&gt;ia_valid &amp; ATTR_MTIME) {</div><div class='add'>+		set_time = true;</div><div class='add'>+		info_buf.LastWriteTime =</div><div class='add'>+		    cpu_to_le64(cifs_UnixTimeToNT(attrs-&gt;ia_mtime));</div><div class='add'>+	} else</div><div class='add'>+		info_buf.LastWriteTime = 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Samba throws this field away, but windows may actually use it.</div><div class='add'>+	 * Do not set ctime unless other time stamps are changed explicitly</div><div class='add'>+	 * (i.e. by utimes()) since we would then have a mix of client and</div><div class='add'>+	 * server times.</div><div class='add'>+	 */</div><div class='add'>+	if (set_time &amp;&amp; (attrs-&gt;ia_valid &amp; ATTR_CTIME)) {</div><div class='add'>+		cFYI(1, ("CIFS - CTIME changed"));</div><div class='add'>+		info_buf.ChangeTime =</div><div class='add'>+		    cpu_to_le64(cifs_UnixTimeToNT(attrs-&gt;ia_ctime));</div><div class='add'>+	} else</div><div class='add'>+		info_buf.ChangeTime = 0;</div><div class='add'>+</div><div class='add'>+	info_buf.CreationTime = 0;	/* don't change */</div><div class='add'>+	info_buf.Attributes = cpu_to_le32(dosattr);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If the file is already open for write, just use that fileid</div><div class='add'>+	 */</div><div class='add'>+	open_file = find_writable_file(cifsInode);</div><div class='add'>+	if (open_file) {</div><div class='add'>+		netfid = open_file-&gt;netfid;</div><div class='add'>+		netpid = open_file-&gt;pid;</div><div class='add'>+		goto set_via_filehandle;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * NT4 apparently returns success on this call, but it doesn't</div><div class='add'>+	 * really work.</div><div class='add'>+	 */</div><div class='add'>+	if (!(pTcon-&gt;ses-&gt;flags &amp; CIFS_SES_NT4)) {</div><div class='add'>+		rc = CIFSSMBSetPathInfo(xid, pTcon, full_path,</div><div class='add'>+				     &amp;info_buf, cifs_sb-&gt;local_nls,</div><div class='add'>+				     cifs_sb-&gt;mnt_cifs_flags &amp;</div><div class='add'>+					CIFS_MOUNT_MAP_SPECIAL_CHR);</div><div class='add'>+		if (rc == 0) {</div><div class='add'>+			cifsInode-&gt;cifsAttrs = dosattr;</div><div class='add'>+			goto out;</div><div class='add'>+		} else if (rc != -EOPNOTSUPP &amp;&amp; rc != -EINVAL)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cFYI(1, ("calling SetFileInfo since SetPathInfo for "</div><div class='add'>+		 "times not supported by this server"));</div><div class='add'>+	rc = CIFSSMBOpen(xid, pTcon, full_path, FILE_OPEN,</div><div class='add'>+			 SYNCHRONIZE | FILE_WRITE_ATTRIBUTES,</div><div class='add'>+			 CREATE_NOT_DIR, &amp;netfid, &amp;oplock,</div><div class='add'>+			 NULL, cifs_sb-&gt;local_nls,</div><div class='add'>+			 cifs_sb-&gt;mnt_cifs_flags &amp;</div><div class='add'>+				CIFS_MOUNT_MAP_SPECIAL_CHR);</div><div class='add'>+</div><div class='add'>+	if (rc != 0) {</div><div class='add'>+		if (rc == -EIO)</div><div class='add'>+			rc = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netpid = current-&gt;tgid;</div><div class='add'>+</div><div class='add'>+set_via_filehandle:</div><div class='add'>+	rc = CIFSSMBSetFileInfo(xid, pTcon, &amp;info_buf, netfid, netpid);</div><div class='add'>+	if (!rc)</div><div class='add'>+		cifsInode-&gt;cifsAttrs = dosattr;</div><div class='add'>+</div><div class='add'>+	if (open_file == NULL)</div><div class='add'>+		CIFSSMBClose(xid, pTcon, netfid);</div><div class='add'>+	else</div><div class='add'>+		atomic_dec(&amp;open_file-&gt;wrtPending);</div><div class='add'>+out:</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * open the given file (if it isn't already), set the DELETE_ON_CLOSE bit</div><div class='add'>+ * and rename it to a random name that hopefully won't conflict with</div><div class='add'>+ * anything else.</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+cifs_rename_pending_delete(char *full_path, struct inode *inode, int xid)</div><div class='add'>+{</div><div class='add'>+	int oplock = 0;</div><div class='add'>+	int rc;</div><div class='add'>+	__u16 netfid;</div><div class='add'>+	struct cifsInodeInfo *cifsInode = CIFS_I(inode);</div><div class='add'>+	struct cifs_sb_info *cifs_sb = CIFS_SB(inode-&gt;i_sb);</div><div class='add'>+	struct cifsTconInfo *tcon = cifs_sb-&gt;tcon;</div><div class='add'>+	__u32 dosattr;</div><div class='add'>+	FILE_BASIC_INFO *info_buf;</div><div class='add'>+</div><div class='add'>+	rc = CIFSSMBOpen(xid, tcon, full_path, FILE_OPEN,</div><div class='add'>+			 DELETE|FILE_WRITE_ATTRIBUTES,</div><div class='add'>+			 CREATE_NOT_DIR|CREATE_DELETE_ON_CLOSE,</div><div class='add'>+			 &amp;netfid, &amp;oplock, NULL, cifs_sb-&gt;local_nls,</div><div class='add'>+			 cifs_sb-&gt;mnt_cifs_flags &amp; CIFS_MOUNT_MAP_SPECIAL_CHR);</div><div class='add'>+	if (rc != 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* set ATTR_HIDDEN and clear ATTR_READONLY */</div><div class='add'>+	cifsInode = CIFS_I(inode);</div><div class='add'>+	dosattr = cifsInode-&gt;cifsAttrs &amp; ~ATTR_READONLY;</div><div class='add'>+	if (dosattr == 0)</div><div class='add'>+		dosattr |= ATTR_NORMAL;</div><div class='add'>+	dosattr |= ATTR_HIDDEN;</div><div class='add'>+</div><div class='add'>+	info_buf = kzalloc(sizeof(*info_buf), GFP_KERNEL);</div><div class='add'>+	if (info_buf == NULL) {</div><div class='add'>+		rc = -ENOMEM;</div><div class='add'>+		goto out_close;</div><div class='add'>+	}</div><div class='add'>+	info_buf-&gt;Attributes = cpu_to_le32(dosattr);</div><div class='add'>+	rc = CIFSSMBSetFileInfo(xid, tcon, info_buf, netfid, current-&gt;tgid);</div><div class='add'>+	kfree(info_buf);</div><div class='add'>+	if (rc != 0)</div><div class='add'>+		goto out_close;</div><div class='add'>+	cifsInode-&gt;cifsAttrs = dosattr;</div><div class='add'>+</div><div class='add'>+	/* silly-rename the file */</div><div class='add'>+	CIFSSMBRenameOpenFile(xid, tcon, netfid, NULL, cifs_sb-&gt;local_nls,</div><div class='add'>+				   cifs_sb-&gt;mnt_cifs_flags &amp;</div><div class='add'>+					    CIFS_MOUNT_MAP_SPECIAL_CHR);</div><div class='add'>+</div><div class='add'>+	/* set DELETE_ON_CLOSE */</div><div class='add'>+	rc = CIFSSMBSetFileDisposition(xid, tcon, true, netfid, current-&gt;tgid);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * some samba versions return -ENOENT when we try to set the file</div><div class='add'>+	 * disposition here. Likely a samba bug, but work around it for now</div><div class='add'>+	 */</div><div class='add'>+	if (rc == -ENOENT)</div><div class='add'>+		rc = 0;</div><div class='add'>+</div><div class='add'>+out_close:</div><div class='add'>+	CIFSSMBClose(xid, tcon, netfid);</div><div class='add'>+out:</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int cifs_unlink(struct inode *dir, struct dentry *dentry)</div><div class='ctx'> {</div><div class='ctx'> 	int rc = 0;</div><div class='ctx'> 	int xid;</div><div class='del'>-	struct cifs_sb_info *cifs_sb;</div><div class='del'>-	struct cifsTconInfo *pTcon;</div><div class='ctx'> 	char *full_path = NULL;</div><div class='del'>-	struct cifsInodeInfo *cifsInode;</div><div class='del'>-	FILE_BASIC_INFO *pinfo_buf;</div><div class='add'>+	struct inode *inode = dentry-&gt;d_inode;</div><div class='add'>+	struct cifsInodeInfo *cifsInode = CIFS_I(inode);</div><div class='add'>+	struct super_block *sb = dir-&gt;i_sb;</div><div class='add'>+	struct cifs_sb_info *cifs_sb = CIFS_SB(sb);</div><div class='add'>+	struct cifsTconInfo *tcon = cifs_sb-&gt;tcon;</div><div class='add'>+	struct iattr *attrs = NULL;</div><div class='add'>+	__u32 dosattr = 0, origattr = 0;</div><div class='ctx'> </div><div class='del'>-	cFYI(1, ("cifs_unlink, inode = 0x%p", inode));</div><div class='add'>+	cFYI(1, ("cifs_unlink, dir=0x%p, dentry=0x%p", dir, dentry));</div><div class='ctx'> </div><div class='ctx'> 	xid = GetXid();</div><div class='ctx'> </div><div class='del'>-	if (inode)</div><div class='del'>-		cifs_sb = CIFS_SB(inode-&gt;i_sb);</div><div class='del'>-	else</div><div class='del'>-		cifs_sb = CIFS_SB(direntry-&gt;d_sb);</div><div class='del'>-	pTcon = cifs_sb-&gt;tcon;</div><div class='del'>-</div><div class='del'>-	/* Unlink can be called from rename so we can not grab the sem here</div><div class='del'>-	   since we deadlock otherwise */</div><div class='del'>-/*	mutex_lock(&amp;direntry-&gt;d_sb-&gt;s_vfs_rename_mutex);*/</div><div class='del'>-	full_path = build_path_from_dentry(direntry);</div><div class='del'>-/*	mutex_unlock(&amp;direntry-&gt;d_sb-&gt;s_vfs_rename_mutex);*/</div><div class='add'>+	/* Unlink can be called from rename so we can not take the</div><div class='add'>+	 * sb-&gt;s_vfs_rename_mutex here */</div><div class='add'>+	full_path = build_path_from_dentry(dentry);</div><div class='ctx'> 	if (full_path == NULL) {</div><div class='ctx'> 		FreeXid(xid);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((pTcon-&gt;ses-&gt;capabilities &amp; CAP_UNIX) &amp;&amp;</div><div class='add'>+	if ((tcon-&gt;ses-&gt;capabilities &amp; CAP_UNIX) &amp;&amp;</div><div class='ctx'> 		(CIFS_UNIX_POSIX_PATH_OPS_CAP &amp;</div><div class='del'>-			le64_to_cpu(pTcon-&gt;fsUnixInfo.Capability))) {</div><div class='del'>-		rc = CIFSPOSIXDelFile(xid, pTcon, full_path,</div><div class='add'>+			le64_to_cpu(tcon-&gt;fsUnixInfo.Capability))) {</div><div class='add'>+		rc = CIFSPOSIXDelFile(xid, tcon, full_path,</div><div class='ctx'> 			SMB_POSIX_UNLINK_FILE_TARGET, cifs_sb-&gt;local_nls,</div><div class='ctx'> 			cifs_sb-&gt;mnt_cifs_flags &amp; CIFS_MOUNT_MAP_SPECIAL_CHR);</div><div class='ctx'> 		cFYI(1, ("posix del rc %d", rc));</div><div class='hunk'>@@ -706,125 +867,60 @@ int cifs_unlink(struct inode *inode, struct dentry *direntry)</div><div class='ctx'> 			goto psx_del_no_retry;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rc = CIFSSMBDelFile(xid, pTcon, full_path, cifs_sb-&gt;local_nls,</div><div class='add'>+retry_std_delete:</div><div class='add'>+	rc = CIFSSMBDelFile(xid, tcon, full_path, cifs_sb-&gt;local_nls,</div><div class='ctx'> 			cifs_sb-&gt;mnt_cifs_flags &amp; CIFS_MOUNT_MAP_SPECIAL_CHR);</div><div class='add'>+</div><div class='ctx'> psx_del_no_retry:</div><div class='ctx'> 	if (!rc) {</div><div class='del'>-		if (direntry-&gt;d_inode)</div><div class='del'>-			drop_nlink(direntry-&gt;d_inode);</div><div class='add'>+		if (inode)</div><div class='add'>+			drop_nlink(inode);</div><div class='ctx'> 	} else if (rc == -ENOENT) {</div><div class='del'>-		d_drop(direntry);</div><div class='add'>+		d_drop(dentry);</div><div class='ctx'> 	} else if (rc == -ETXTBSY) {</div><div class='del'>-		int oplock = 0;</div><div class='del'>-		__u16 netfid;</div><div class='del'>-</div><div class='del'>-		rc = CIFSSMBOpen(xid, pTcon, full_path, FILE_OPEN, DELETE,</div><div class='del'>-				 CREATE_NOT_DIR | CREATE_DELETE_ON_CLOSE,</div><div class='del'>-				 &amp;netfid, &amp;oplock, NULL, cifs_sb-&gt;local_nls,</div><div class='del'>-				 cifs_sb-&gt;mnt_cifs_flags &amp;</div><div class='del'>-					CIFS_MOUNT_MAP_SPECIAL_CHR);</div><div class='del'>-		if (rc == 0) {</div><div class='del'>-			CIFSSMBRenameOpenFile(xid, pTcon, netfid, NULL,</div><div class='del'>-					      cifs_sb-&gt;local_nls,</div><div class='del'>-					      cifs_sb-&gt;mnt_cifs_flags &amp;</div><div class='del'>-						CIFS_MOUNT_MAP_SPECIAL_CHR);</div><div class='del'>-			CIFSSMBClose(xid, pTcon, netfid);</div><div class='del'>-			if (direntry-&gt;d_inode)</div><div class='del'>-				drop_nlink(direntry-&gt;d_inode);</div><div class='add'>+		rc = cifs_rename_pending_delete(full_path, inode, xid);</div><div class='add'>+		if (rc == 0)</div><div class='add'>+			drop_nlink(inode);</div><div class='add'>+	} else if (rc == -EACCES &amp;&amp; dosattr == 0) {</div><div class='add'>+		attrs = kzalloc(sizeof(*attrs), GFP_KERNEL);</div><div class='add'>+		if (attrs == NULL) {</div><div class='add'>+			rc = -ENOMEM;</div><div class='add'>+			goto out_reval;</div><div class='ctx'> 		}</div><div class='del'>-	} else if (rc == -EACCES) {</div><div class='del'>-		/* try only if r/o attribute set in local lookup data? */</div><div class='del'>-		pinfo_buf = kzalloc(sizeof(FILE_BASIC_INFO), GFP_KERNEL);</div><div class='del'>-		if (pinfo_buf) {</div><div class='del'>-			/* ATTRS set to normal clears r/o bit */</div><div class='del'>-			pinfo_buf-&gt;Attributes = cpu_to_le32(ATTR_NORMAL);</div><div class='del'>-			if (!(pTcon-&gt;ses-&gt;flags &amp; CIFS_SES_NT4))</div><div class='del'>-				rc = CIFSSMBSetPathInfo(xid, pTcon, full_path,</div><div class='del'>-						     pinfo_buf,</div><div class='del'>-						     cifs_sb-&gt;local_nls,</div><div class='del'>-						     cifs_sb-&gt;mnt_cifs_flags &amp;</div><div class='del'>-							CIFS_MOUNT_MAP_SPECIAL_CHR);</div><div class='del'>-			else</div><div class='del'>-				rc = -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-			if (rc == -EOPNOTSUPP) {</div><div class='del'>-				int oplock = 0;</div><div class='del'>-				__u16 netfid;</div><div class='del'>-			/*	rc = CIFSSMBSetAttrLegacy(xid, pTcon,</div><div class='del'>-							  full_path,</div><div class='del'>-							  (__u16)ATTR_NORMAL,</div><div class='del'>-							  cifs_sb-&gt;local_nls);</div><div class='del'>-			   For some strange reason it seems that NT4 eats the</div><div class='del'>-			   old setattr call without actually setting the</div><div class='del'>-			   attributes so on to the third attempted workaround</div><div class='del'>-			   */</div><div class='del'>-</div><div class='del'>-			/* BB could scan to see if we already have it open</div><div class='del'>-			   and pass in pid of opener to function */</div><div class='del'>-				rc = CIFSSMBOpen(xid, pTcon, full_path,</div><div class='del'>-						 FILE_OPEN, SYNCHRONIZE |</div><div class='del'>-						 FILE_WRITE_ATTRIBUTES, 0,</div><div class='del'>-						 &amp;netfid, &amp;oplock, NULL,</div><div class='del'>-						 cifs_sb-&gt;local_nls,</div><div class='del'>-						 cifs_sb-&gt;mnt_cifs_flags &amp;</div><div class='del'>-						    CIFS_MOUNT_MAP_SPECIAL_CHR);</div><div class='del'>-				if (rc == 0) {</div><div class='del'>-					rc = CIFSSMBSetFileInfo(xid, pTcon,</div><div class='del'>-								pinfo_buf,</div><div class='del'>-								netfid,</div><div class='del'>-								current-&gt;tgid);</div><div class='del'>-					CIFSSMBClose(xid, pTcon, netfid);</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			kfree(pinfo_buf);</div><div class='del'>-		}</div><div class='del'>-		if (rc == 0) {</div><div class='del'>-			rc = CIFSSMBDelFile(xid, pTcon, full_path,</div><div class='del'>-					    cifs_sb-&gt;local_nls,</div><div class='del'>-					    cifs_sb-&gt;mnt_cifs_flags &amp;</div><div class='del'>-						CIFS_MOUNT_MAP_SPECIAL_CHR);</div><div class='del'>-			if (!rc) {</div><div class='del'>-				if (direntry-&gt;d_inode)</div><div class='del'>-					drop_nlink(direntry-&gt;d_inode);</div><div class='del'>-			} else if (rc == -ETXTBSY) {</div><div class='del'>-				int oplock = 0;</div><div class='del'>-				__u16 netfid;</div><div class='del'>-</div><div class='del'>-				rc = CIFSSMBOpen(xid, pTcon, full_path,</div><div class='del'>-						 FILE_OPEN, DELETE,</div><div class='del'>-						 CREATE_NOT_DIR |</div><div class='del'>-						 CREATE_DELETE_ON_CLOSE,</div><div class='del'>-						 &amp;netfid, &amp;oplock, NULL,</div><div class='del'>-						 cifs_sb-&gt;local_nls,</div><div class='del'>-						 cifs_sb-&gt;mnt_cifs_flags &amp;</div><div class='del'>-						    CIFS_MOUNT_MAP_SPECIAL_CHR);</div><div class='del'>-				if (rc == 0) {</div><div class='del'>-					CIFSSMBRenameOpenFile(xid, pTcon,</div><div class='del'>-						netfid, NULL,</div><div class='del'>-						cifs_sb-&gt;local_nls,</div><div class='del'>-						cifs_sb-&gt;mnt_cifs_flags &amp;</div><div class='del'>-						    CIFS_MOUNT_MAP_SPECIAL_CHR);</div><div class='del'>-					CIFSSMBClose(xid, pTcon, netfid);</div><div class='del'>-					if (direntry-&gt;d_inode)</div><div class='del'>-						drop_nlink(direntry-&gt;d_inode);</div><div class='del'>-				}</div><div class='del'>-			/* BB if rc = -ETXTBUSY goto the rename logic BB */</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (direntry-&gt;d_inode) {</div><div class='del'>-		cifsInode = CIFS_I(direntry-&gt;d_inode);</div><div class='del'>-		cifsInode-&gt;time = 0;	/* will force revalidate to get info</div><div class='del'>-					   when needed */</div><div class='del'>-		direntry-&gt;d_inode-&gt;i_ctime = current_fs_time(inode-&gt;i_sb);</div><div class='add'>+		/* try to reset dos attributes */</div><div class='add'>+		origattr = cifsInode-&gt;cifsAttrs;</div><div class='add'>+		if (origattr == 0)</div><div class='add'>+			origattr |= ATTR_NORMAL;</div><div class='add'>+		dosattr = origattr &amp; ~ATTR_READONLY;</div><div class='add'>+		if (dosattr == 0)</div><div class='add'>+			dosattr |= ATTR_NORMAL;</div><div class='add'>+		dosattr |= ATTR_HIDDEN;</div><div class='add'>+</div><div class='add'>+		rc = cifs_set_file_info(inode, attrs, xid, full_path, dosattr);</div><div class='add'>+		if (rc != 0)</div><div class='add'>+			goto out_reval;</div><div class='add'>+</div><div class='add'>+		goto retry_std_delete;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	/* undo the setattr if we errored out and it's needed */</div><div class='add'>+	if (rc != 0 &amp;&amp; dosattr != 0)</div><div class='add'>+		cifs_set_file_info(inode, attrs, xid, full_path, origattr);</div><div class='add'>+</div><div class='add'>+out_reval:</div><div class='ctx'> 	if (inode) {</div><div class='del'>-		inode-&gt;i_ctime = inode-&gt;i_mtime = current_fs_time(inode-&gt;i_sb);</div><div class='ctx'> 		cifsInode = CIFS_I(inode);</div><div class='del'>-		cifsInode-&gt;time = 0;	/* force revalidate of dir as well */</div><div class='add'>+		cifsInode-&gt;time = 0;	/* will force revalidate to get info</div><div class='add'>+					   when needed */</div><div class='add'>+		inode-&gt;i_ctime = current_fs_time(sb);</div><div class='ctx'> 	}</div><div class='add'>+	dir-&gt;i_ctime = dir-&gt;i_mtime = current_fs_time(sb);</div><div class='add'>+	cifsInode = CIFS_I(dir);</div><div class='add'>+	CIFS_I(dir)-&gt;time = 0;	/* force revalidate of dir as well */</div><div class='ctx'> </div><div class='ctx'> 	kfree(full_path);</div><div class='add'>+	kfree(attrs);</div><div class='ctx'> 	FreeXid(xid);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='hunk'>@@ -869,7 +965,7 @@ static void posix_fill_in_inode(struct inode *tmp_inode,</div><div class='ctx'> </div><div class='ctx'> int cifs_mkdir(struct inode *inode, struct dentry *direntry, int mode)</div><div class='ctx'> {</div><div class='del'>-	int rc = 0;</div><div class='add'>+	int rc = 0, tmprc;</div><div class='ctx'> 	int xid;</div><div class='ctx'> 	struct cifs_sb_info *cifs_sb;</div><div class='ctx'> 	struct cifsTconInfo *pTcon;</div><div class='hunk'>@@ -931,6 +1027,7 @@ int cifs_mkdir(struct inode *inode, struct dentry *direntry, int mode)</div><div class='ctx'> 				kfree(pInfo);</div><div class='ctx'> 				goto mkdir_get_info;</div><div class='ctx'> 			}</div><div class='add'>+</div><div class='ctx'> 			/* Is an i_ino of zero legal? */</div><div class='ctx'> 			/* Are there sanity checks we can use to ensure that</div><div class='ctx'> 			   the server is really filling in that field? */</div><div class='hunk'>@@ -1019,12 +1116,20 @@ mkdir_get_info:</div><div class='ctx'> 			if (!(cifs_sb-&gt;mnt_cifs_flags &amp; CIFS_MOUNT_CIFS_ACL) &amp;&amp;</div><div class='ctx'> 			    (mode &amp; S_IWUGO) == 0) {</div><div class='ctx'> 				FILE_BASIC_INFO pInfo;</div><div class='add'>+				struct cifsInodeInfo *cifsInode;</div><div class='add'>+				u32 dosattrs;</div><div class='add'>+</div><div class='ctx'> 				memset(&amp;pInfo, 0, sizeof(pInfo));</div><div class='del'>-				pInfo.Attributes = cpu_to_le32(ATTR_READONLY);</div><div class='del'>-				CIFSSMBSetPathInfo(xid, pTcon, full_path,</div><div class='del'>-						&amp;pInfo, cifs_sb-&gt;local_nls,</div><div class='add'>+				cifsInode = CIFS_I(newinode);</div><div class='add'>+				dosattrs = cifsInode-&gt;cifsAttrs|ATTR_READONLY;</div><div class='add'>+				pInfo.Attributes = cpu_to_le32(dosattrs);</div><div class='add'>+				tmprc = CIFSSMBSetPathInfo(xid, pTcon,</div><div class='add'>+						full_path, &amp;pInfo,</div><div class='add'>+						cifs_sb-&gt;local_nls,</div><div class='ctx'> 						cifs_sb-&gt;mnt_cifs_flags &amp;</div><div class='ctx'> 						CIFS_MOUNT_MAP_SPECIAL_CHR);</div><div class='add'>+				if (tmprc == 0)</div><div class='add'>+					cifsInode-&gt;cifsAttrs = dosattrs;</div><div class='ctx'> 			}</div><div class='ctx'> 			if (direntry-&gt;d_inode) {</div><div class='ctx'> 				if (cifs_sb-&gt;mnt_cifs_flags &amp;</div><div class='hunk'>@@ -1096,117 +1201,141 @@ int cifs_rmdir(struct inode *inode, struct dentry *direntry)</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int</div><div class='add'>+cifs_do_rename(int xid, struct dentry *from_dentry, const char *fromPath,</div><div class='add'>+		struct dentry *to_dentry, const char *toPath)</div><div class='add'>+{</div><div class='add'>+	struct cifs_sb_info *cifs_sb = CIFS_SB(from_dentry-&gt;d_sb);</div><div class='add'>+	struct cifsTconInfo *pTcon = cifs_sb-&gt;tcon;</div><div class='add'>+	__u16 srcfid;</div><div class='add'>+	int oplock, rc;</div><div class='add'>+</div><div class='add'>+	/* try path-based rename first */</div><div class='add'>+	rc = CIFSSMBRename(xid, pTcon, fromPath, toPath, cifs_sb-&gt;local_nls,</div><div class='add'>+			   cifs_sb-&gt;mnt_cifs_flags &amp;</div><div class='add'>+				CIFS_MOUNT_MAP_SPECIAL_CHR);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * don't bother with rename by filehandle unless file is busy and</div><div class='add'>+	 * source Note that cross directory moves do not work with</div><div class='add'>+	 * rename by filehandle to various Windows servers.</div><div class='add'>+	 */</div><div class='add'>+	if (rc == 0 || rc != -ETXTBSY)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	/* open the file to be renamed -- we need DELETE perms */</div><div class='add'>+	rc = CIFSSMBOpen(xid, pTcon, fromPath, FILE_OPEN, DELETE,</div><div class='add'>+			 CREATE_NOT_DIR, &amp;srcfid, &amp;oplock, NULL,</div><div class='add'>+			 cifs_sb-&gt;local_nls, cifs_sb-&gt;mnt_cifs_flags &amp;</div><div class='add'>+				CIFS_MOUNT_MAP_SPECIAL_CHR);</div><div class='add'>+</div><div class='add'>+	if (rc == 0) {</div><div class='add'>+		rc = CIFSSMBRenameOpenFile(xid, pTcon, srcfid,</div><div class='add'>+				(const char *) to_dentry-&gt;d_name.name,</div><div class='add'>+				cifs_sb-&gt;local_nls, cifs_sb-&gt;mnt_cifs_flags &amp;</div><div class='add'>+					CIFS_MOUNT_MAP_SPECIAL_CHR);</div><div class='add'>+</div><div class='add'>+		CIFSSMBClose(xid, pTcon, srcfid);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int cifs_rename(struct inode *source_inode, struct dentry *source_direntry,</div><div class='ctx'> 	struct inode *target_inode, struct dentry *target_direntry)</div><div class='ctx'> {</div><div class='del'>-	char *fromName;</div><div class='del'>-	char *toName;</div><div class='add'>+	char *fromName = NULL;</div><div class='add'>+	char *toName = NULL;</div><div class='ctx'> 	struct cifs_sb_info *cifs_sb_source;</div><div class='ctx'> 	struct cifs_sb_info *cifs_sb_target;</div><div class='ctx'> 	struct cifsTconInfo *pTcon;</div><div class='add'>+	FILE_UNIX_BASIC_INFO *info_buf_source = NULL;</div><div class='add'>+	FILE_UNIX_BASIC_INFO *info_buf_target;</div><div class='ctx'> 	int xid;</div><div class='del'>-	int rc = 0;</div><div class='del'>-</div><div class='del'>-	xid = GetXid();</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='ctx'> 	cifs_sb_target = CIFS_SB(target_inode-&gt;i_sb);</div><div class='ctx'> 	cifs_sb_source = CIFS_SB(source_inode-&gt;i_sb);</div><div class='ctx'> 	pTcon = cifs_sb_source-&gt;tcon;</div><div class='ctx'> </div><div class='add'>+	xid = GetXid();</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * BB: this might be allowed if same server, but different share.</div><div class='add'>+	 * Consider adding support for this</div><div class='add'>+	 */</div><div class='ctx'> 	if (pTcon != cifs_sb_target-&gt;tcon) {</div><div class='del'>-		FreeXid(xid);</div><div class='del'>-		return -EXDEV;	/* BB actually could be allowed if same server,</div><div class='del'>-				   but different share.</div><div class='del'>-				   Might eventually add support for this */</div><div class='add'>+		rc = -EXDEV;</div><div class='add'>+		goto cifs_rename_exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* we already  have the rename sem so we do not need to grab it again</div><div class='del'>-	   here to protect the path integrity */</div><div class='add'>+	/*</div><div class='add'>+	 * we already have the rename sem so we do not need to</div><div class='add'>+	 * grab it again here to protect the path integrity</div><div class='add'>+	 */</div><div class='ctx'> 	fromName = build_path_from_dentry(source_direntry);</div><div class='add'>+	if (fromName == NULL) {</div><div class='add'>+		rc = -ENOMEM;</div><div class='add'>+		goto cifs_rename_exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	toName = build_path_from_dentry(target_direntry);</div><div class='del'>-	if ((fromName == NULL) || (toName == NULL)) {</div><div class='add'>+	if (toName == NULL) {</div><div class='ctx'> 		rc = -ENOMEM;</div><div class='ctx'> 		goto cifs_rename_exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rc = CIFSSMBRename(xid, pTcon, fromName, toName,</div><div class='del'>-			   cifs_sb_source-&gt;local_nls,</div><div class='del'>-			   cifs_sb_source-&gt;mnt_cifs_flags &amp;</div><div class='del'>-				CIFS_MOUNT_MAP_SPECIAL_CHR);</div><div class='add'>+	rc = cifs_do_rename(xid, source_direntry, fromName,</div><div class='add'>+			    target_direntry, toName);</div><div class='add'>+</div><div class='ctx'> 	if (rc == -EEXIST) {</div><div class='del'>-		/* check if they are the same file because rename of hardlinked</div><div class='del'>-		   files is a noop */</div><div class='del'>-		FILE_UNIX_BASIC_INFO *info_buf_source;</div><div class='del'>-		FILE_UNIX_BASIC_INFO *info_buf_target;</div><div class='del'>-</div><div class='del'>-		info_buf_source =</div><div class='del'>-			kmalloc(2 * sizeof(FILE_UNIX_BASIC_INFO), GFP_KERNEL);</div><div class='del'>-		if (info_buf_source != NULL) {</div><div class='add'>+		if (pTcon-&gt;unix_ext) {</div><div class='add'>+			/*</div><div class='add'>+			 * Are src and dst hardlinks of same inode? We can</div><div class='add'>+			 * only tell with unix extensions enabled</div><div class='add'>+			 */</div><div class='add'>+			info_buf_source =</div><div class='add'>+				kmalloc(2 * sizeof(FILE_UNIX_BASIC_INFO),</div><div class='add'>+						GFP_KERNEL);</div><div class='add'>+			if (info_buf_source == NULL)</div><div class='add'>+				goto unlink_target;</div><div class='add'>+</div><div class='ctx'> 			info_buf_target = info_buf_source + 1;</div><div class='del'>-			if (pTcon-&gt;unix_ext)</div><div class='del'>-				rc = CIFSSMBUnixQPathInfo(xid, pTcon, fromName,</div><div class='del'>-					info_buf_source,</div><div class='del'>-					cifs_sb_source-&gt;local_nls,</div><div class='del'>-					cifs_sb_source-&gt;mnt_cifs_flags &amp;</div><div class='add'>+			rc = CIFSSMBUnixQPathInfo(xid, pTcon, fromName,</div><div class='add'>+						info_buf_source,</div><div class='add'>+						cifs_sb_source-&gt;local_nls,</div><div class='add'>+						cifs_sb_source-&gt;mnt_cifs_flags &amp;</div><div class='ctx'> 						CIFS_MOUNT_MAP_SPECIAL_CHR);</div><div class='del'>-			/* else rc is still EEXIST so will fall through to</div><div class='del'>-			   unlink the target and retry rename */</div><div class='del'>-			if (rc == 0) {</div><div class='del'>-				rc = CIFSSMBUnixQPathInfo(xid, pTcon, toName,</div><div class='del'>-						info_buf_target,</div><div class='add'>+			if (rc != 0)</div><div class='add'>+				goto unlink_target;</div><div class='add'>+</div><div class='add'>+			rc = CIFSSMBUnixQPathInfo(xid, pTcon,</div><div class='add'>+						toName, info_buf_target,</div><div class='ctx'> 						cifs_sb_target-&gt;local_nls,</div><div class='ctx'> 						/* remap based on source sb */</div><div class='ctx'> 						cifs_sb_source-&gt;mnt_cifs_flags &amp;</div><div class='del'>-						    CIFS_MOUNT_MAP_SPECIAL_CHR);</div><div class='del'>-			}</div><div class='del'>-			if ((rc == 0) &amp;&amp;</div><div class='del'>-			    (info_buf_source-&gt;UniqueId ==</div><div class='del'>-			     info_buf_target-&gt;UniqueId)) {</div><div class='del'>-			/* do not rename since the files are hardlinked which</div><div class='del'>-			   is a noop */</div><div class='del'>-			} else {</div><div class='del'>-			/* we either can not tell the files are hardlinked</div><div class='del'>-			   (as with Windows servers) or files are not</div><div class='del'>-			   hardlinked so delete the target manually before</div><div class='del'>-			   renaming to follow POSIX rather than Windows</div><div class='del'>-			   semantics */</div><div class='del'>-				cifs_unlink(target_inode, target_direntry);</div><div class='del'>-				rc = CIFSSMBRename(xid, pTcon, fromName,</div><div class='del'>-						   toName,</div><div class='del'>-						   cifs_sb_source-&gt;local_nls,</div><div class='del'>-						   cifs_sb_source-&gt;mnt_cifs_flags</div><div class='del'>-						   &amp; CIFS_MOUNT_MAP_SPECIAL_CHR);</div><div class='del'>-			}</div><div class='del'>-			kfree(info_buf_source);</div><div class='del'>-		} /* if we can not get memory just leave rc as EEXIST */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (rc)</div><div class='del'>-		cFYI(1, ("rename rc %d", rc));</div><div class='del'>-</div><div class='del'>-	if ((rc == -EIO) || (rc == -EEXIST)) {</div><div class='del'>-		int oplock = 0;</div><div class='del'>-		__u16 netfid;</div><div class='del'>-</div><div class='del'>-		/* BB FIXME Is Generic Read correct for rename? */</div><div class='del'>-		/* if renaming directory - we should not say CREATE_NOT_DIR,</div><div class='del'>-		   need to test renaming open directory, also GENERIC_READ</div><div class='del'>-		   might not right be right access to request */</div><div class='del'>-		rc = CIFSSMBOpen(xid, pTcon, fromName, FILE_OPEN, GENERIC_READ,</div><div class='del'>-				 CREATE_NOT_DIR, &amp;netfid, &amp;oplock, NULL,</div><div class='del'>-				 cifs_sb_source-&gt;local_nls,</div><div class='del'>-				 cifs_sb_source-&gt;mnt_cifs_flags &amp;</div><div class='del'>-					CIFS_MOUNT_MAP_SPECIAL_CHR);</div><div class='del'>-		if (rc == 0) {</div><div class='del'>-			rc = CIFSSMBRenameOpenFile(xid, pTcon, netfid, toName,</div><div class='del'>-					      cifs_sb_source-&gt;local_nls,</div><div class='del'>-					      cifs_sb_source-&gt;mnt_cifs_flags &amp;</div><div class='ctx'> 						CIFS_MOUNT_MAP_SPECIAL_CHR);</div><div class='del'>-			CIFSSMBClose(xid, pTcon, netfid);</div><div class='del'>-		}</div><div class='add'>+</div><div class='add'>+			if (rc == 0 &amp;&amp; (info_buf_source-&gt;UniqueId ==</div><div class='add'>+					info_buf_target-&gt;UniqueId))</div><div class='add'>+				/* same file, POSIX says that this is a noop */</div><div class='add'>+				goto cifs_rename_exit;</div><div class='add'>+		} /* else ... BB we could add the same check for Windows by</div><div class='add'>+		     checking the UniqueId via FILE_INTERNAL_INFO */</div><div class='add'>+unlink_target:</div><div class='add'>+		/*</div><div class='add'>+		 * we either can not tell the files are hardlinked (as with</div><div class='add'>+		 * Windows servers) or files are not hardlinked. Delete the</div><div class='add'>+		 * target manually before renaming to follow POSIX rather than</div><div class='add'>+		 * Windows semantics</div><div class='add'>+		 */</div><div class='add'>+		cifs_unlink(target_inode, target_direntry);</div><div class='add'>+		rc = cifs_do_rename(xid, source_direntry, fromName,</div><div class='add'>+				    target_direntry, toName);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> cifs_rename_exit:</div><div class='add'>+	kfree(info_buf_source);</div><div class='ctx'> 	kfree(fromName);</div><div class='ctx'> 	kfree(toName);</div><div class='ctx'> 	FreeXid(xid);</div><div class='hunk'>@@ -1507,101 +1636,6 @@ cifs_set_file_size(struct inode *inode, struct iattr *attrs,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-cifs_set_file_info(struct inode *inode, struct iattr *attrs, int xid,</div><div class='del'>-		    char *full_path, __u32 dosattr)</div><div class='del'>-{</div><div class='del'>-	int rc;</div><div class='del'>-	int oplock = 0;</div><div class='del'>-	__u16 netfid;</div><div class='del'>-	__u32 netpid;</div><div class='del'>-	bool set_time = false;</div><div class='del'>-	struct cifsFileInfo *open_file;</div><div class='del'>-	struct cifsInodeInfo *cifsInode = CIFS_I(inode);</div><div class='del'>-	struct cifs_sb_info *cifs_sb = CIFS_SB(inode-&gt;i_sb);</div><div class='del'>-	struct cifsTconInfo *pTcon = cifs_sb-&gt;tcon;</div><div class='del'>-	FILE_BASIC_INFO	info_buf;</div><div class='del'>-</div><div class='del'>-	if (attrs-&gt;ia_valid &amp; ATTR_ATIME) {</div><div class='del'>-		set_time = true;</div><div class='del'>-		info_buf.LastAccessTime =</div><div class='del'>-			cpu_to_le64(cifs_UnixTimeToNT(attrs-&gt;ia_atime));</div><div class='del'>-	} else</div><div class='del'>-		info_buf.LastAccessTime = 0;</div><div class='del'>-</div><div class='del'>-	if (attrs-&gt;ia_valid &amp; ATTR_MTIME) {</div><div class='del'>-		set_time = true;</div><div class='del'>-		info_buf.LastWriteTime =</div><div class='del'>-		    cpu_to_le64(cifs_UnixTimeToNT(attrs-&gt;ia_mtime));</div><div class='del'>-	} else</div><div class='del'>-		info_buf.LastWriteTime = 0;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Samba throws this field away, but windows may actually use it.</div><div class='del'>-	 * Do not set ctime unless other time stamps are changed explicitly</div><div class='del'>-	 * (i.e. by utimes()) since we would then have a mix of client and</div><div class='del'>-	 * server times.</div><div class='del'>-	 */</div><div class='del'>-	if (set_time &amp;&amp; (attrs-&gt;ia_valid &amp; ATTR_CTIME)) {</div><div class='del'>-		cFYI(1, ("CIFS - CTIME changed"));</div><div class='del'>-		info_buf.ChangeTime =</div><div class='del'>-		    cpu_to_le64(cifs_UnixTimeToNT(attrs-&gt;ia_ctime));</div><div class='del'>-	} else</div><div class='del'>-		info_buf.ChangeTime = 0;</div><div class='del'>-</div><div class='del'>-	info_buf.CreationTime = 0;	/* don't change */</div><div class='del'>-	info_buf.Attributes = cpu_to_le32(dosattr);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If the file is already open for write, just use that fileid</div><div class='del'>-	 */</div><div class='del'>-	open_file = find_writable_file(cifsInode);</div><div class='del'>-	if (open_file) {</div><div class='del'>-		netfid = open_file-&gt;netfid;</div><div class='del'>-		netpid = open_file-&gt;pid;</div><div class='del'>-		goto set_via_filehandle;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * NT4 apparently returns success on this call, but it doesn't</div><div class='del'>-	 * really work.</div><div class='del'>-	 */</div><div class='del'>-	if (!(pTcon-&gt;ses-&gt;flags &amp; CIFS_SES_NT4)) {</div><div class='del'>-		rc = CIFSSMBSetPathInfo(xid, pTcon, full_path,</div><div class='del'>-				     &amp;info_buf, cifs_sb-&gt;local_nls,</div><div class='del'>-				     cifs_sb-&gt;mnt_cifs_flags &amp;</div><div class='del'>-					CIFS_MOUNT_MAP_SPECIAL_CHR);</div><div class='del'>-		if (rc != -EOPNOTSUPP &amp;&amp; rc != -EINVAL)</div><div class='del'>-			goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cFYI(1, ("calling SetFileInfo since SetPathInfo for "</div><div class='del'>-		 "times not supported by this server"));</div><div class='del'>-	rc = CIFSSMBOpen(xid, pTcon, full_path, FILE_OPEN,</div><div class='del'>-			 SYNCHRONIZE | FILE_WRITE_ATTRIBUTES,</div><div class='del'>-			 CREATE_NOT_DIR, &amp;netfid, &amp;oplock,</div><div class='del'>-			 NULL, cifs_sb-&gt;local_nls,</div><div class='del'>-			 cifs_sb-&gt;mnt_cifs_flags &amp;</div><div class='del'>-				CIFS_MOUNT_MAP_SPECIAL_CHR);</div><div class='del'>-</div><div class='del'>-	if (rc != 0) {</div><div class='del'>-		if (rc == -EIO)</div><div class='del'>-			rc = -EINVAL;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	netpid = current-&gt;tgid;</div><div class='del'>-</div><div class='del'>-set_via_filehandle:</div><div class='del'>-	rc = CIFSSMBSetFileInfo(xid, pTcon, &amp;info_buf, netfid, netpid);</div><div class='del'>-	if (open_file == NULL)</div><div class='del'>-		CIFSSMBClose(xid, pTcon, netfid);</div><div class='del'>-	else</div><div class='del'>-		atomic_dec(&amp;open_file-&gt;wrtPending);</div><div class='del'>-out:</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='ctx'> cifs_setattr_unix(struct dentry *direntry, struct iattr *attrs)</div><div class='ctx'> {</div><div class='ctx'> 	int rc;</div><div class='head'>diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c<br/>index 4b17f8fe3157..88786ba02d27 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/cifs/misc.c?id=c15895ef30c2c03e99802951787183039a349d32'>fs/cifs/misc.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/cifs/misc.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/cifs/misc.c</a></div><div class='hunk'>@@ -150,8 +150,7 @@ cifs_buf_get(void)</div><div class='ctx'>    but it may be more efficient to always alloc same size</div><div class='ctx'>    albeit slightly larger than necessary and maxbuffersize</div><div class='ctx'>    defaults to this and can not be bigger */</div><div class='del'>-	ret_buf = (struct smb_hdr *) mempool_alloc(cifs_req_poolp,</div><div class='del'>-						   GFP_KERNEL | GFP_NOFS);</div><div class='add'>+	ret_buf = mempool_alloc(cifs_req_poolp, GFP_NOFS);</div><div class='ctx'> </div><div class='ctx'> 	/* clear the first few header bytes */</div><div class='ctx'> 	/* for most paths, more is cleared in header_assemble */</div><div class='hunk'>@@ -188,8 +187,7 @@ cifs_small_buf_get(void)</div><div class='ctx'>    but it may be more efficient to always alloc same size</div><div class='ctx'>    albeit slightly larger than necessary and maxbuffersize</div><div class='ctx'>    defaults to this and can not be bigger */</div><div class='del'>-	ret_buf = (struct smb_hdr *) mempool_alloc(cifs_sm_req_poolp,</div><div class='del'>-						   GFP_KERNEL | GFP_NOFS);</div><div class='add'>+	ret_buf = mempool_alloc(cifs_sm_req_poolp, GFP_NOFS);</div><div class='ctx'> 	if (ret_buf) {</div><div class='ctx'> 	/* No need to clear memory here, cleared in header assemble */</div><div class='ctx'> 	/*	memset(ret_buf, 0, sizeof(struct smb_hdr) + 27);*/</div><div class='hunk'>@@ -313,8 +311,6 @@ header_assemble(struct smb_hdr *buffer, char smb_command /* command */ ,</div><div class='ctx'> 	buffer-&gt;Flags2 = SMBFLG2_KNOWS_LONG_NAMES;</div><div class='ctx'> 	buffer-&gt;Pid = cpu_to_le16((__u16)current-&gt;tgid);</div><div class='ctx'> 	buffer-&gt;PidHigh = cpu_to_le16((__u16)(current-&gt;tgid &gt;&gt; 16));</div><div class='del'>-	spin_lock(&amp;GlobalMid_Lock);</div><div class='del'>-	spin_unlock(&amp;GlobalMid_Lock);</div><div class='ctx'> 	if (treeCon) {</div><div class='ctx'> 		buffer-&gt;Tid = treeCon-&gt;tid;</div><div class='ctx'> 		if (treeCon-&gt;ses) {</div><div class='head'>diff --git a/fs/cifs/readdir.c b/fs/cifs/readdir.c<br/>index 5f40ed3473f5..765adf12d54f 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/cifs/readdir.c?id=c15895ef30c2c03e99802951787183039a349d32'>fs/cifs/readdir.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/cifs/readdir.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/cifs/readdir.c</a></div><div class='hunk'>@@ -640,6 +640,70 @@ static int is_dir_changed(struct file *file)</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int cifs_save_resume_key(const char *current_entry,</div><div class='add'>+	struct cifsFileInfo *cifsFile)</div><div class='add'>+{</div><div class='add'>+	int rc = 0;</div><div class='add'>+	unsigned int len = 0;</div><div class='add'>+	__u16 level;</div><div class='add'>+	char *filename;</div><div class='add'>+</div><div class='add'>+	if ((cifsFile == NULL) || (current_entry == NULL))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	level = cifsFile-&gt;srch_inf.info_level;</div><div class='add'>+</div><div class='add'>+	if (level == SMB_FIND_FILE_UNIX) {</div><div class='add'>+		FILE_UNIX_INFO *pFindData = (FILE_UNIX_INFO *)current_entry;</div><div class='add'>+</div><div class='add'>+		filename = &amp;pFindData-&gt;FileName[0];</div><div class='add'>+		if (cifsFile-&gt;srch_inf.unicode) {</div><div class='add'>+			len = cifs_unicode_bytelen(filename);</div><div class='add'>+		} else {</div><div class='add'>+			/* BB should we make this strnlen of PATH_MAX? */</div><div class='add'>+			len = strnlen(filename, PATH_MAX);</div><div class='add'>+		}</div><div class='add'>+		cifsFile-&gt;srch_inf.resume_key = pFindData-&gt;ResumeKey;</div><div class='add'>+	} else if (level == SMB_FIND_FILE_DIRECTORY_INFO) {</div><div class='add'>+		FILE_DIRECTORY_INFO *pFindData =</div><div class='add'>+			(FILE_DIRECTORY_INFO *)current_entry;</div><div class='add'>+		filename = &amp;pFindData-&gt;FileName[0];</div><div class='add'>+		len = le32_to_cpu(pFindData-&gt;FileNameLength);</div><div class='add'>+		cifsFile-&gt;srch_inf.resume_key = pFindData-&gt;FileIndex;</div><div class='add'>+	} else if (level == SMB_FIND_FILE_FULL_DIRECTORY_INFO) {</div><div class='add'>+		FILE_FULL_DIRECTORY_INFO *pFindData =</div><div class='add'>+			(FILE_FULL_DIRECTORY_INFO *)current_entry;</div><div class='add'>+		filename = &amp;pFindData-&gt;FileName[0];</div><div class='add'>+		len = le32_to_cpu(pFindData-&gt;FileNameLength);</div><div class='add'>+		cifsFile-&gt;srch_inf.resume_key = pFindData-&gt;FileIndex;</div><div class='add'>+	} else if (level == SMB_FIND_FILE_ID_FULL_DIR_INFO) {</div><div class='add'>+		SEARCH_ID_FULL_DIR_INFO *pFindData =</div><div class='add'>+			(SEARCH_ID_FULL_DIR_INFO *)current_entry;</div><div class='add'>+		filename = &amp;pFindData-&gt;FileName[0];</div><div class='add'>+		len = le32_to_cpu(pFindData-&gt;FileNameLength);</div><div class='add'>+		cifsFile-&gt;srch_inf.resume_key = pFindData-&gt;FileIndex;</div><div class='add'>+	} else if (level == SMB_FIND_FILE_BOTH_DIRECTORY_INFO) {</div><div class='add'>+		FILE_BOTH_DIRECTORY_INFO *pFindData =</div><div class='add'>+			(FILE_BOTH_DIRECTORY_INFO *)current_entry;</div><div class='add'>+		filename = &amp;pFindData-&gt;FileName[0];</div><div class='add'>+		len = le32_to_cpu(pFindData-&gt;FileNameLength);</div><div class='add'>+		cifsFile-&gt;srch_inf.resume_key = pFindData-&gt;FileIndex;</div><div class='add'>+	} else if (level == SMB_FIND_FILE_INFO_STANDARD) {</div><div class='add'>+		FIND_FILE_STANDARD_INFO *pFindData =</div><div class='add'>+			(FIND_FILE_STANDARD_INFO *)current_entry;</div><div class='add'>+		filename = &amp;pFindData-&gt;FileName[0];</div><div class='add'>+		/* one byte length, no name conversion */</div><div class='add'>+		len = (unsigned int)pFindData-&gt;FileNameLength;</div><div class='add'>+		cifsFile-&gt;srch_inf.resume_key = pFindData-&gt;ResumeKey;</div><div class='add'>+	} else {</div><div class='add'>+		cFYI(1, ("Unknown findfirst level %d", level));</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	cifsFile-&gt;srch_inf.resume_name_len = len;</div><div class='add'>+	cifsFile-&gt;srch_inf.presume_name = filename;</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* find the corresponding entry in the search */</div><div class='ctx'> /* Note that the SMB server returns search entries for . and .. which</div><div class='ctx'>    complicates logic here if we choose to parse for them and we do not</div><div class='hunk'>@@ -703,6 +767,7 @@ static int find_cifs_entry(const int xid, struct cifsTconInfo *pTcon,</div><div class='ctx'> 	while ((index_to_find &gt;= cifsFile-&gt;srch_inf.index_of_last_entry) &amp;&amp;</div><div class='ctx'> 	      (rc == 0) &amp;&amp; !cifsFile-&gt;srch_inf.endOfSearch) {</div><div class='ctx'> 		cFYI(1, ("calling findnext2"));</div><div class='add'>+		cifs_save_resume_key(cifsFile-&gt;srch_inf.last_entry, cifsFile);</div><div class='ctx'> 		rc = CIFSFindNext(xid, pTcon, cifsFile-&gt;netfid,</div><div class='ctx'> 				  &amp;cifsFile-&gt;srch_inf);</div><div class='ctx'> 		if (rc)</div><div class='hunk'>@@ -919,69 +984,6 @@ static int cifs_filldir(char *pfindEntry, struct file *file,</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cifs_save_resume_key(const char *current_entry,</div><div class='del'>-	struct cifsFileInfo *cifsFile)</div><div class='del'>-{</div><div class='del'>-	int rc = 0;</div><div class='del'>-	unsigned int len = 0;</div><div class='del'>-	__u16 level;</div><div class='del'>-	char *filename;</div><div class='del'>-</div><div class='del'>-	if ((cifsFile == NULL) || (current_entry == NULL))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	level = cifsFile-&gt;srch_inf.info_level;</div><div class='del'>-</div><div class='del'>-	if (level == SMB_FIND_FILE_UNIX) {</div><div class='del'>-		FILE_UNIX_INFO *pFindData = (FILE_UNIX_INFO *)current_entry;</div><div class='del'>-</div><div class='del'>-		filename = &amp;pFindData-&gt;FileName[0];</div><div class='del'>-		if (cifsFile-&gt;srch_inf.unicode) {</div><div class='del'>-			len = cifs_unicode_bytelen(filename);</div><div class='del'>-		} else {</div><div class='del'>-			/* BB should we make this strnlen of PATH_MAX? */</div><div class='del'>-			len = strnlen(filename, PATH_MAX);</div><div class='del'>-		}</div><div class='del'>-		cifsFile-&gt;srch_inf.resume_key = pFindData-&gt;ResumeKey;</div><div class='del'>-	} else if (level == SMB_FIND_FILE_DIRECTORY_INFO) {</div><div class='del'>-		FILE_DIRECTORY_INFO *pFindData =</div><div class='del'>-			(FILE_DIRECTORY_INFO *)current_entry;</div><div class='del'>-		filename = &amp;pFindData-&gt;FileName[0];</div><div class='del'>-		len = le32_to_cpu(pFindData-&gt;FileNameLength);</div><div class='del'>-		cifsFile-&gt;srch_inf.resume_key = pFindData-&gt;FileIndex;</div><div class='del'>-	} else if (level == SMB_FIND_FILE_FULL_DIRECTORY_INFO) {</div><div class='del'>-		FILE_FULL_DIRECTORY_INFO *pFindData =</div><div class='del'>-			(FILE_FULL_DIRECTORY_INFO *)current_entry;</div><div class='del'>-		filename = &amp;pFindData-&gt;FileName[0];</div><div class='del'>-		len = le32_to_cpu(pFindData-&gt;FileNameLength);</div><div class='del'>-		cifsFile-&gt;srch_inf.resume_key = pFindData-&gt;FileIndex;</div><div class='del'>-	} else if (level == SMB_FIND_FILE_ID_FULL_DIR_INFO) {</div><div class='del'>-		SEARCH_ID_FULL_DIR_INFO *pFindData =</div><div class='del'>-			(SEARCH_ID_FULL_DIR_INFO *)current_entry;</div><div class='del'>-		filename = &amp;pFindData-&gt;FileName[0];</div><div class='del'>-		len = le32_to_cpu(pFindData-&gt;FileNameLength);</div><div class='del'>-		cifsFile-&gt;srch_inf.resume_key = pFindData-&gt;FileIndex;</div><div class='del'>-	} else if (level == SMB_FIND_FILE_BOTH_DIRECTORY_INFO) {</div><div class='del'>-		FILE_BOTH_DIRECTORY_INFO *pFindData =</div><div class='del'>-			(FILE_BOTH_DIRECTORY_INFO *)current_entry;</div><div class='del'>-		filename = &amp;pFindData-&gt;FileName[0];</div><div class='del'>-		len = le32_to_cpu(pFindData-&gt;FileNameLength);</div><div class='del'>-		cifsFile-&gt;srch_inf.resume_key = pFindData-&gt;FileIndex;</div><div class='del'>-	} else if (level == SMB_FIND_FILE_INFO_STANDARD) {</div><div class='del'>-		FIND_FILE_STANDARD_INFO *pFindData =</div><div class='del'>-			(FIND_FILE_STANDARD_INFO *)current_entry;</div><div class='del'>-		filename = &amp;pFindData-&gt;FileName[0];</div><div class='del'>-		/* one byte length, no name conversion */</div><div class='del'>-		len = (unsigned int)pFindData-&gt;FileNameLength;</div><div class='del'>-		cifsFile-&gt;srch_inf.resume_key = pFindData-&gt;ResumeKey;</div><div class='del'>-	} else {</div><div class='del'>-		cFYI(1, ("Unknown findfirst level %d", level));</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	cifsFile-&gt;srch_inf.resume_name_len = len;</div><div class='del'>-	cifsFile-&gt;srch_inf.presume_name = filename;</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='ctx'> </div><div class='ctx'> int cifs_readdir(struct file *file, void *direntry, filldir_t filldir)</div><div class='ctx'> {</div><div class='head'>diff --git a/fs/cifs/sess.c b/fs/cifs/sess.c<br/>index 252fdc0567f1..2851d5da0c8c 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/cifs/sess.c?id=c15895ef30c2c03e99802951787183039a349d32'>fs/cifs/sess.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/cifs/sess.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/cifs/sess.c</a></div><div class='hunk'>@@ -624,8 +624,10 @@ CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses, int first_time,</div><div class='ctx'> 					 ses, nls_cp);</div><div class='ctx'> </div><div class='ctx'> ssetup_exit:</div><div class='del'>-	if (spnego_key)</div><div class='add'>+	if (spnego_key) {</div><div class='add'>+		key_revoke(spnego_key);</div><div class='ctx'> 		key_put(spnego_key);</div><div class='add'>+	}</div><div class='ctx'> 	kfree(str_area);</div><div class='ctx'> 	if (resp_buf_type == CIFS_SMALL_BUFFER) {</div><div class='ctx'> 		cFYI(1, ("ssetup freeing small buf %p", iov[0].iov_base));</div><div class='head'>diff --git a/fs/cifs/transport.c b/fs/cifs/transport.c<br/>index e286db9f5ee2..bf0e6d8e382a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/cifs/transport.c?id=c15895ef30c2c03e99802951787183039a349d32'>fs/cifs/transport.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/cifs/transport.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/cifs/transport.c</a></div><div class='hunk'>@@ -50,8 +50,7 @@ AllocMidQEntry(const struct smb_hdr *smb_buffer, struct cifsSesInfo *ses)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	temp = (struct mid_q_entry *) mempool_alloc(cifs_mid_poolp,</div><div class='del'>-						    GFP_KERNEL | GFP_NOFS);</div><div class='add'>+	temp = mempool_alloc(cifs_mid_poolp, GFP_NOFS);</div><div class='ctx'> 	if (temp == NULL)</div><div class='ctx'> 		return temp;</div><div class='ctx'> 	else {</div><div class='head'>diff --git a/fs/coda/psdev.c b/fs/coda/psdev.c<br/>index 0d9b80ec689c..cfd29da714d1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/coda/psdev.c?id=c15895ef30c2c03e99802951787183039a349d32'>fs/coda/psdev.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/coda/psdev.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/coda/psdev.c</a></div><div class='hunk'>@@ -362,9 +362,8 @@ static int init_coda_psdev(void)</div><div class='ctx'> 		goto out_chrdev;</div><div class='ctx'> 	}		</div><div class='ctx'> 	for (i = 0; i &lt; MAX_CODADEVS; i++)</div><div class='del'>-		device_create_drvdata(coda_psdev_class, NULL,</div><div class='del'>-				      MKDEV(CODA_PSDEV_MAJOR, i),</div><div class='del'>-				      NULL, "cfs%d", i);</div><div class='add'>+		device_create(coda_psdev_class, NULL,</div><div class='add'>+			      MKDEV(CODA_PSDEV_MAJOR, i), NULL, "cfs%d", i);</div><div class='ctx'> 	coda_sysctl_init();</div><div class='ctx'> 	goto out;</div><div class='ctx'> </div><div class='head'>diff --git a/fs/compat.c b/fs/compat.c<br/>index 075d0509970d..5f9ec449c799 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/compat.c?id=c15895ef30c2c03e99802951787183039a349d32'>fs/compat.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/compat.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/compat.c</a></div><div class='hunk'>@@ -137,6 +137,45 @@ asmlinkage long compat_sys_utimes(char __user *filename, struct compat_timeval _</div><div class='ctx'> 	return compat_sys_futimesat(AT_FDCWD, filename, t);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int cp_compat_stat(struct kstat *stat, struct compat_stat __user *ubuf)</div><div class='add'>+{</div><div class='add'>+	compat_ino_t ino = stat-&gt;ino;</div><div class='add'>+	typeof(ubuf-&gt;st_uid) uid = 0;</div><div class='add'>+	typeof(ubuf-&gt;st_gid) gid = 0;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	SET_UID(uid, stat-&gt;uid);</div><div class='add'>+	SET_GID(gid, stat-&gt;gid);</div><div class='add'>+</div><div class='add'>+	if ((u64) stat-&gt;size &gt; MAX_NON_LFS ||</div><div class='add'>+	    !old_valid_dev(stat-&gt;dev) ||</div><div class='add'>+	    !old_valid_dev(stat-&gt;rdev))</div><div class='add'>+		return -EOVERFLOW;</div><div class='add'>+	if (sizeof(ino) &lt; sizeof(stat-&gt;ino) &amp;&amp; ino != stat-&gt;ino)</div><div class='add'>+		return -EOVERFLOW;</div><div class='add'>+</div><div class='add'>+	if (clear_user(ubuf, sizeof(*ubuf)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	err  = __put_user(old_encode_dev(stat-&gt;dev), &amp;ubuf-&gt;st_dev);</div><div class='add'>+	err |= __put_user(ino, &amp;ubuf-&gt;st_ino);</div><div class='add'>+	err |= __put_user(stat-&gt;mode, &amp;ubuf-&gt;st_mode);</div><div class='add'>+	err |= __put_user(stat-&gt;nlink, &amp;ubuf-&gt;st_nlink);</div><div class='add'>+	err |= __put_user(uid, &amp;ubuf-&gt;st_uid);</div><div class='add'>+	err |= __put_user(gid, &amp;ubuf-&gt;st_gid);</div><div class='add'>+	err |= __put_user(old_encode_dev(stat-&gt;rdev), &amp;ubuf-&gt;st_rdev);</div><div class='add'>+	err |= __put_user(stat-&gt;size, &amp;ubuf-&gt;st_size);</div><div class='add'>+	err |= __put_user(stat-&gt;atime.tv_sec, &amp;ubuf-&gt;st_atime);</div><div class='add'>+	err |= __put_user(stat-&gt;atime.tv_nsec, &amp;ubuf-&gt;st_atime_nsec);</div><div class='add'>+	err |= __put_user(stat-&gt;mtime.tv_sec, &amp;ubuf-&gt;st_mtime);</div><div class='add'>+	err |= __put_user(stat-&gt;mtime.tv_nsec, &amp;ubuf-&gt;st_mtime_nsec);</div><div class='add'>+	err |= __put_user(stat-&gt;ctime.tv_sec, &amp;ubuf-&gt;st_ctime);</div><div class='add'>+	err |= __put_user(stat-&gt;ctime.tv_nsec, &amp;ubuf-&gt;st_ctime_nsec);</div><div class='add'>+	err |= __put_user(stat-&gt;blksize, &amp;ubuf-&gt;st_blksize);</div><div class='add'>+	err |= __put_user(stat-&gt;blocks, &amp;ubuf-&gt;st_blocks);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> asmlinkage long compat_sys_newstat(char __user * filename,</div><div class='ctx'> 		struct compat_stat __user *statbuf)</div><div class='ctx'> {</div><div class='hunk'>@@ -1239,7 +1278,7 @@ static int compat_count(compat_uptr_t __user *argv, int max)</div><div class='ctx'> 			if (!p)</div><div class='ctx'> 				break;</div><div class='ctx'> 			argv++;</div><div class='del'>-			if(++i &gt; max)</div><div class='add'>+			if (i++ &gt;= max)</div><div class='ctx'> 				return -E2BIG;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='head'>diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c<br/>index 08e28c9bb416..3dbe2169cf36 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/debugfs/inode.c?id=c15895ef30c2c03e99802951787183039a349d32'>fs/debugfs/inode.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/debugfs/inode.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/debugfs/inode.c</a></div><div class='hunk'>@@ -26,8 +26,7 @@</div><div class='ctx'> #include &lt;linux/debugfs.h&gt;</div><div class='ctx'> #include &lt;linux/fsnotify.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='del'>-</div><div class='del'>-#define DEBUGFS_MAGIC	0x64626720</div><div class='add'>+#include &lt;linux/magic.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct vfsmount *debugfs_mount;</div><div class='ctx'> static int debugfs_mount_count;</div><div class='head'>diff --git a/fs/devpts/inode.c b/fs/devpts/inode.c<br/>index 488eb424f662..4a714f6c1bed 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/devpts/inode.c?id=c15895ef30c2c03e99802951787183039a349d32'>fs/devpts/inode.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/devpts/inode.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/devpts/inode.c</a></div><div class='hunk'>@@ -27,6 +27,7 @@</div><div class='ctx'> #define DEVPTS_SUPER_MAGIC 0x1cd1</div><div class='ctx'> </div><div class='ctx'> #define DEVPTS_DEFAULT_MODE 0600</div><div class='add'>+#define PTMX_MINOR	2</div><div class='ctx'> </div><div class='ctx'> extern int pty_limit;			/* Config limit on Unix98 ptys */</div><div class='ctx'> static DEFINE_IDA(allocated_ptys);</div><div class='hunk'>@@ -48,7 +49,7 @@ enum {</div><div class='ctx'> 	Opt_err</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static match_table_t tokens = {</div><div class='add'>+static const match_table_t tokens = {</div><div class='ctx'> 	{Opt_uid, "uid=%u"},</div><div class='ctx'> 	{Opt_gid, "gid=%u"},</div><div class='ctx'> 	{Opt_mode, "mode=%o"},</div><div class='hunk'>@@ -169,15 +170,7 @@ static struct file_system_type devpts_fs_type = {</div><div class='ctx'>  * to the System V naming convention</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static struct dentry *get_node(int num)</div><div class='del'>-{</div><div class='del'>-	char s[12];</div><div class='del'>-	struct dentry *root = devpts_root;</div><div class='del'>-	mutex_lock(&amp;root-&gt;d_inode-&gt;i_mutex);</div><div class='del'>-	return lookup_one_len(s, root, sprintf(s, "%d", num));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int devpts_new_index(void)</div><div class='add'>+int devpts_new_index(struct inode *ptmx_inode)</div><div class='ctx'> {</div><div class='ctx'> 	int index;</div><div class='ctx'> 	int ida_ret;</div><div class='hunk'>@@ -205,20 +198,21 @@ retry:</div><div class='ctx'> 	return index;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void devpts_kill_index(int idx)</div><div class='add'>+void devpts_kill_index(struct inode *ptmx_inode, int idx)</div><div class='ctx'> {</div><div class='ctx'> 	mutex_lock(&amp;allocated_ptys_lock);</div><div class='ctx'> 	ida_remove(&amp;allocated_ptys, idx);</div><div class='ctx'> 	mutex_unlock(&amp;allocated_ptys_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int devpts_pty_new(struct tty_struct *tty)</div><div class='add'>+int devpts_pty_new(struct inode *ptmx_inode, struct tty_struct *tty)</div><div class='ctx'> {</div><div class='ctx'> 	int number = tty-&gt;index; /* tty layer puts index from devpts_new_index() in here */</div><div class='ctx'> 	struct tty_driver *driver = tty-&gt;driver;</div><div class='ctx'> 	dev_t device = MKDEV(driver-&gt;major, driver-&gt;minor_start+number);</div><div class='ctx'> 	struct dentry *dentry;</div><div class='ctx'> 	struct inode *inode = new_inode(devpts_mnt-&gt;mnt_sb);</div><div class='add'>+	char s[12];</div><div class='ctx'> </div><div class='ctx'> 	/* We're supposed to be given the slave end of a pty */</div><div class='ctx'> 	BUG_ON(driver-&gt;type != TTY_DRIVER_TYPE_PTY);</div><div class='hunk'>@@ -233,10 +227,15 @@ int devpts_pty_new(struct tty_struct *tty)</div><div class='ctx'> 	inode-&gt;i_mtime = inode-&gt;i_atime = inode-&gt;i_ctime = CURRENT_TIME;</div><div class='ctx'> 	init_special_inode(inode, S_IFCHR|config.mode, device);</div><div class='ctx'> 	inode-&gt;i_private = tty;</div><div class='add'>+	tty-&gt;driver_data = inode;</div><div class='ctx'> </div><div class='del'>-	dentry = get_node(number);</div><div class='del'>-	if (!IS_ERR(dentry) &amp;&amp; !dentry-&gt;d_inode) {</div><div class='del'>-		d_instantiate(dentry, inode);</div><div class='add'>+	sprintf(s, "%d", number);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;devpts_root-&gt;d_inode-&gt;i_mutex);</div><div class='add'>+</div><div class='add'>+	dentry = d_alloc_name(devpts_root, s);</div><div class='add'>+	if (!IS_ERR(dentry)) {</div><div class='add'>+		d_add(dentry, inode);</div><div class='ctx'> 		fsnotify_create(devpts_root-&gt;d_inode, dentry);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -245,36 +244,31 @@ int devpts_pty_new(struct tty_struct *tty)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct tty_struct *devpts_get_tty(int number)</div><div class='add'>+struct tty_struct *devpts_get_tty(struct inode *pts_inode, int number)</div><div class='ctx'> {</div><div class='del'>-	struct dentry *dentry = get_node(number);</div><div class='del'>-	struct tty_struct *tty;</div><div class='del'>-</div><div class='del'>-	tty = NULL;</div><div class='del'>-	if (!IS_ERR(dentry)) {</div><div class='del'>-		if (dentry-&gt;d_inode)</div><div class='del'>-			tty = dentry-&gt;d_inode-&gt;i_private;</div><div class='del'>-		dput(dentry);</div><div class='del'>-	}</div><div class='add'>+	BUG_ON(pts_inode-&gt;i_rdev == MKDEV(TTYAUX_MAJOR, PTMX_MINOR));</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;devpts_root-&gt;d_inode-&gt;i_mutex);</div><div class='del'>-</div><div class='del'>-	return tty;</div><div class='add'>+	if (pts_inode-&gt;i_sb-&gt;s_magic == DEVPTS_SUPER_MAGIC)</div><div class='add'>+		return (struct tty_struct *)pts_inode-&gt;i_private;</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void devpts_pty_kill(int number)</div><div class='add'>+void devpts_pty_kill(struct tty_struct *tty)</div><div class='ctx'> {</div><div class='del'>-	struct dentry *dentry = get_node(number);</div><div class='add'>+	struct inode *inode = tty-&gt;driver_data;</div><div class='add'>+	struct dentry *dentry;</div><div class='ctx'> </div><div class='del'>-	if (!IS_ERR(dentry)) {</div><div class='del'>-		struct inode *inode = dentry-&gt;d_inode;</div><div class='del'>-		if (inode) {</div><div class='del'>-			inode-&gt;i_nlink--;</div><div class='del'>-			d_delete(dentry);</div><div class='del'>-			dput(dentry);</div><div class='del'>-		}</div><div class='add'>+	BUG_ON(inode-&gt;i_rdev == MKDEV(TTYAUX_MAJOR, PTMX_MINOR));</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;devpts_root-&gt;d_inode-&gt;i_mutex);</div><div class='add'>+</div><div class='add'>+	dentry = d_find_alias(inode);</div><div class='add'>+	if (dentry &amp;&amp; !IS_ERR(dentry)) {</div><div class='add'>+		inode-&gt;i_nlink--;</div><div class='add'>+		d_delete(dentry);</div><div class='ctx'> 		dput(dentry);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	mutex_unlock(&amp;devpts_root-&gt;d_inode-&gt;i_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/fs/direct-io.c b/fs/direct-io.c<br/>index 9606ee848fd8..af0558dbe8b7 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/direct-io.c?id=c15895ef30c2c03e99802951787183039a349d32'>fs/direct-io.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/direct-io.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/direct-io.c</a></div><div class='hunk'>@@ -5,11 +5,11 @@</div><div class='ctx'>  *</div><div class='ctx'>  * O_DIRECT</div><div class='ctx'>  *</div><div class='del'>- * 04Jul2002	akpm@zip.com.au</div><div class='add'>+ * 04Jul2002	Andrew Morton</div><div class='ctx'>  *		Initial version</div><div class='ctx'>  * 11Sep2002	janetinc@us.ibm.com</div><div class='ctx'>  * 		added readv/writev support.</div><div class='del'>- * 29Oct2002	akpm@zip.com.au</div><div class='add'>+ * 29Oct2002	Andrew Morton</div><div class='ctx'>  *		rewrote bio_add_page() support.</div><div class='ctx'>  * 30Oct2002	pbadari@us.ibm.com</div><div class='ctx'>  *		added support for non-aligned IO.</div><div class='head'>diff --git a/fs/dlm/config.c b/fs/dlm/config.c<br/>index 89d2fb7b991a..fd9859f92fad 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/dlm/config.c?id=c15895ef30c2c03e99802951787183039a349d32'>fs/dlm/config.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/dlm/config.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/dlm/config.c</a></div><div class='hunk'>@@ -14,6 +14,9 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/configfs.h&gt;</div><div class='add'>+#include &lt;linux/in.h&gt;</div><div class='add'>+#include &lt;linux/in6.h&gt;</div><div class='add'>+#include &lt;net/ipv6.h&gt;</div><div class='ctx'> #include &lt;net/sock.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "config.h"</div><div class='hunk'>@@ -377,24 +380,24 @@ static struct config_item_type node_type = {</div><div class='ctx'> 	.ct_owner = THIS_MODULE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct dlm_cluster *to_cluster(struct config_item *i)</div><div class='add'>+static struct dlm_cluster *config_item_to_cluster(struct config_item *i)</div><div class='ctx'> {</div><div class='ctx'> 	return i ? container_of(to_config_group(i), struct dlm_cluster, group) :</div><div class='ctx'> 		   NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct dlm_space *to_space(struct config_item *i)</div><div class='add'>+static struct dlm_space *config_item_to_space(struct config_item *i)</div><div class='ctx'> {</div><div class='ctx'> 	return i ? container_of(to_config_group(i), struct dlm_space, group) :</div><div class='ctx'> 		   NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct dlm_comm *to_comm(struct config_item *i)</div><div class='add'>+static struct dlm_comm *config_item_to_comm(struct config_item *i)</div><div class='ctx'> {</div><div class='ctx'> 	return i ? container_of(i, struct dlm_comm, item) : NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct dlm_node *to_node(struct config_item *i)</div><div class='add'>+static struct dlm_node *config_item_to_node(struct config_item *i)</div><div class='ctx'> {</div><div class='ctx'> 	return i ? container_of(i, struct dlm_node, item) : NULL;</div><div class='ctx'> }</div><div class='hunk'>@@ -450,7 +453,7 @@ static struct config_group *make_cluster(struct config_group *g,</div><div class='ctx'> </div><div class='ctx'> static void drop_cluster(struct config_group *g, struct config_item *i)</div><div class='ctx'> {</div><div class='del'>-	struct dlm_cluster *cl = to_cluster(i);</div><div class='add'>+	struct dlm_cluster *cl = config_item_to_cluster(i);</div><div class='ctx'> 	struct config_item *tmp;</div><div class='ctx'> 	int j;</div><div class='ctx'> </div><div class='hunk'>@@ -468,7 +471,7 @@ static void drop_cluster(struct config_group *g, struct config_item *i)</div><div class='ctx'> </div><div class='ctx'> static void release_cluster(struct config_item *i)</div><div class='ctx'> {</div><div class='del'>-	struct dlm_cluster *cl = to_cluster(i);</div><div class='add'>+	struct dlm_cluster *cl = config_item_to_cluster(i);</div><div class='ctx'> 	kfree(cl-&gt;group.default_groups);</div><div class='ctx'> 	kfree(cl);</div><div class='ctx'> }</div><div class='hunk'>@@ -507,7 +510,7 @@ static struct config_group *make_space(struct config_group *g, const char *name)</div><div class='ctx'> </div><div class='ctx'> static void drop_space(struct config_group *g, struct config_item *i)</div><div class='ctx'> {</div><div class='del'>-	struct dlm_space *sp = to_space(i);</div><div class='add'>+	struct dlm_space *sp = config_item_to_space(i);</div><div class='ctx'> 	struct config_item *tmp;</div><div class='ctx'> 	int j;</div><div class='ctx'> </div><div class='hunk'>@@ -524,7 +527,7 @@ static void drop_space(struct config_group *g, struct config_item *i)</div><div class='ctx'> </div><div class='ctx'> static void release_space(struct config_item *i)</div><div class='ctx'> {</div><div class='del'>-	struct dlm_space *sp = to_space(i);</div><div class='add'>+	struct dlm_space *sp = config_item_to_space(i);</div><div class='ctx'> 	kfree(sp-&gt;group.default_groups);</div><div class='ctx'> 	kfree(sp);</div><div class='ctx'> }</div><div class='hunk'>@@ -546,7 +549,7 @@ static struct config_item *make_comm(struct config_group *g, const char *name)</div><div class='ctx'> </div><div class='ctx'> static void drop_comm(struct config_group *g, struct config_item *i)</div><div class='ctx'> {</div><div class='del'>-	struct dlm_comm *cm = to_comm(i);</div><div class='add'>+	struct dlm_comm *cm = config_item_to_comm(i);</div><div class='ctx'> 	if (local_comm == cm)</div><div class='ctx'> 		local_comm = NULL;</div><div class='ctx'> 	dlm_lowcomms_close(cm-&gt;nodeid);</div><div class='hunk'>@@ -557,13 +560,13 @@ static void drop_comm(struct config_group *g, struct config_item *i)</div><div class='ctx'> </div><div class='ctx'> static void release_comm(struct config_item *i)</div><div class='ctx'> {</div><div class='del'>-	struct dlm_comm *cm = to_comm(i);</div><div class='add'>+	struct dlm_comm *cm = config_item_to_comm(i);</div><div class='ctx'> 	kfree(cm);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct config_item *make_node(struct config_group *g, const char *name)</div><div class='ctx'> {</div><div class='del'>-	struct dlm_space *sp = to_space(g-&gt;cg_item.ci_parent);</div><div class='add'>+	struct dlm_space *sp = config_item_to_space(g-&gt;cg_item.ci_parent);</div><div class='ctx'> 	struct dlm_node *nd;</div><div class='ctx'> </div><div class='ctx'> 	nd = kzalloc(sizeof(struct dlm_node), GFP_KERNEL);</div><div class='hunk'>@@ -585,8 +588,8 @@ static struct config_item *make_node(struct config_group *g, const char *name)</div><div class='ctx'> </div><div class='ctx'> static void drop_node(struct config_group *g, struct config_item *i)</div><div class='ctx'> {</div><div class='del'>-	struct dlm_space *sp = to_space(g-&gt;cg_item.ci_parent);</div><div class='del'>-	struct dlm_node *nd = to_node(i);</div><div class='add'>+	struct dlm_space *sp = config_item_to_space(g-&gt;cg_item.ci_parent);</div><div class='add'>+	struct dlm_node *nd = config_item_to_node(i);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;sp-&gt;members_lock);</div><div class='ctx'> 	list_del(&amp;nd-&gt;list);</div><div class='hunk'>@@ -598,7 +601,7 @@ static void drop_node(struct config_group *g, struct config_item *i)</div><div class='ctx'> </div><div class='ctx'> static void release_node(struct config_item *i)</div><div class='ctx'> {</div><div class='del'>-	struct dlm_node *nd = to_node(i);</div><div class='add'>+	struct dlm_node *nd = config_item_to_node(i);</div><div class='ctx'> 	kfree(nd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -632,7 +635,7 @@ void dlm_config_exit(void)</div><div class='ctx'> static ssize_t show_cluster(struct config_item *i, struct configfs_attribute *a,</div><div class='ctx'> 			    char *buf)</div><div class='ctx'> {</div><div class='del'>-	struct dlm_cluster *cl = to_cluster(i);</div><div class='add'>+	struct dlm_cluster *cl = config_item_to_cluster(i);</div><div class='ctx'> 	struct cluster_attribute *cla =</div><div class='ctx'> 			container_of(a, struct cluster_attribute, attr);</div><div class='ctx'> 	return cla-&gt;show ? cla-&gt;show(cl, buf) : 0;</div><div class='hunk'>@@ -642,7 +645,7 @@ static ssize_t store_cluster(struct config_item *i,</div><div class='ctx'> 			     struct configfs_attribute *a,</div><div class='ctx'> 			     const char *buf, size_t len)</div><div class='ctx'> {</div><div class='del'>-	struct dlm_cluster *cl = to_cluster(i);</div><div class='add'>+	struct dlm_cluster *cl = config_item_to_cluster(i);</div><div class='ctx'> 	struct cluster_attribute *cla =</div><div class='ctx'> 		container_of(a, struct cluster_attribute, attr);</div><div class='ctx'> 	return cla-&gt;store ? cla-&gt;store(cl, buf, len) : -EINVAL;</div><div class='hunk'>@@ -651,7 +654,7 @@ static ssize_t store_cluster(struct config_item *i,</div><div class='ctx'> static ssize_t show_comm(struct config_item *i, struct configfs_attribute *a,</div><div class='ctx'> 			 char *buf)</div><div class='ctx'> {</div><div class='del'>-	struct dlm_comm *cm = to_comm(i);</div><div class='add'>+	struct dlm_comm *cm = config_item_to_comm(i);</div><div class='ctx'> 	struct comm_attribute *cma =</div><div class='ctx'> 			container_of(a, struct comm_attribute, attr);</div><div class='ctx'> 	return cma-&gt;show ? cma-&gt;show(cm, buf) : 0;</div><div class='hunk'>@@ -660,7 +663,7 @@ static ssize_t show_comm(struct config_item *i, struct configfs_attribute *a,</div><div class='ctx'> static ssize_t store_comm(struct config_item *i, struct configfs_attribute *a,</div><div class='ctx'> 			  const char *buf, size_t len)</div><div class='ctx'> {</div><div class='del'>-	struct dlm_comm *cm = to_comm(i);</div><div class='add'>+	struct dlm_comm *cm = config_item_to_comm(i);</div><div class='ctx'> 	struct comm_attribute *cma =</div><div class='ctx'> 		container_of(a, struct comm_attribute, attr);</div><div class='ctx'> 	return cma-&gt;store ? cma-&gt;store(cm, buf, len) : -EINVAL;</div><div class='hunk'>@@ -714,7 +717,7 @@ static ssize_t comm_addr_write(struct dlm_comm *cm, const char *buf, size_t len)</div><div class='ctx'> static ssize_t show_node(struct config_item *i, struct configfs_attribute *a,</div><div class='ctx'> 			 char *buf)</div><div class='ctx'> {</div><div class='del'>-	struct dlm_node *nd = to_node(i);</div><div class='add'>+	struct dlm_node *nd = config_item_to_node(i);</div><div class='ctx'> 	struct node_attribute *nda =</div><div class='ctx'> 			container_of(a, struct node_attribute, attr);</div><div class='ctx'> 	return nda-&gt;show ? nda-&gt;show(nd, buf) : 0;</div><div class='hunk'>@@ -723,7 +726,7 @@ static ssize_t show_node(struct config_item *i, struct configfs_attribute *a,</div><div class='ctx'> static ssize_t store_node(struct config_item *i, struct configfs_attribute *a,</div><div class='ctx'> 			  const char *buf, size_t len)</div><div class='ctx'> {</div><div class='del'>-	struct dlm_node *nd = to_node(i);</div><div class='add'>+	struct dlm_node *nd = config_item_to_node(i);</div><div class='ctx'> 	struct node_attribute *nda =</div><div class='ctx'> 		container_of(a, struct node_attribute, attr);</div><div class='ctx'> 	return nda-&gt;store ? nda-&gt;store(nd, buf, len) : -EINVAL;</div><div class='hunk'>@@ -768,7 +771,7 @@ static struct dlm_space *get_space(char *name)</div><div class='ctx'> 	i = config_group_find_item(space_list, name);</div><div class='ctx'> 	mutex_unlock(&amp;space_list-&gt;cg_subsys-&gt;su_mutex);</div><div class='ctx'> </div><div class='del'>-	return to_space(i);</div><div class='add'>+	return config_item_to_space(i);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void put_space(struct dlm_space *sp)</div><div class='hunk'>@@ -776,6 +779,33 @@ static void put_space(struct dlm_space *sp)</div><div class='ctx'> 	config_item_put(&amp;sp-&gt;group.cg_item);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int addr_compare(struct sockaddr_storage *x, struct sockaddr_storage *y)</div><div class='add'>+{</div><div class='add'>+	switch (x-&gt;ss_family) {</div><div class='add'>+	case AF_INET: {</div><div class='add'>+		struct sockaddr_in *sinx = (struct sockaddr_in *)x;</div><div class='add'>+		struct sockaddr_in *siny = (struct sockaddr_in *)y;</div><div class='add'>+		if (sinx-&gt;sin_addr.s_addr != siny-&gt;sin_addr.s_addr)</div><div class='add'>+			return 0;</div><div class='add'>+		if (sinx-&gt;sin_port != siny-&gt;sin_port)</div><div class='add'>+			return 0;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case AF_INET6: {</div><div class='add'>+		struct sockaddr_in6 *sinx = (struct sockaddr_in6 *)x;</div><div class='add'>+		struct sockaddr_in6 *siny = (struct sockaddr_in6 *)y;</div><div class='add'>+		if (!ipv6_addr_equal(&amp;sinx-&gt;sin6_addr, &amp;siny-&gt;sin6_addr))</div><div class='add'>+			return 0;</div><div class='add'>+		if (sinx-&gt;sin6_port != siny-&gt;sin6_port)</div><div class='add'>+			return 0;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	default:</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct dlm_comm *get_comm(int nodeid, struct sockaddr_storage *addr)</div><div class='ctx'> {</div><div class='ctx'> 	struct config_item *i;</div><div class='hunk'>@@ -788,7 +818,7 @@ static struct dlm_comm *get_comm(int nodeid, struct sockaddr_storage *addr)</div><div class='ctx'> 	mutex_lock(&amp;clusters_root.subsys.su_mutex);</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(i, &amp;comm_list-&gt;cg_children, ci_entry) {</div><div class='del'>-		cm = to_comm(i);</div><div class='add'>+		cm = config_item_to_comm(i);</div><div class='ctx'> </div><div class='ctx'> 		if (nodeid) {</div><div class='ctx'> 			if (cm-&gt;nodeid != nodeid)</div><div class='hunk'>@@ -797,8 +827,7 @@ static struct dlm_comm *get_comm(int nodeid, struct sockaddr_storage *addr)</div><div class='ctx'> 			config_item_get(i);</div><div class='ctx'> 			break;</div><div class='ctx'> 		} else {</div><div class='del'>-			if (!cm-&gt;addr_count ||</div><div class='del'>-			    memcmp(cm-&gt;addr[0], addr, sizeof(*addr)))</div><div class='add'>+			if (!cm-&gt;addr_count || !addr_compare(cm-&gt;addr[0], addr))</div><div class='ctx'> 				continue;</div><div class='ctx'> 			found = 1;</div><div class='ctx'> 			config_item_get(i);</div><div class='head'>diff --git a/fs/dlm/dlm_internal.h b/fs/dlm/dlm_internal.h<br/>index 5a7ac33b629c..868e4c9ef127 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/dlm/dlm_internal.h?id=c15895ef30c2c03e99802951787183039a349d32'>fs/dlm/dlm_internal.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/dlm/dlm_internal.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/dlm/dlm_internal.h</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'> *******************************************************************************</div><div class='ctx'> **</div><div class='ctx'> **  Copyright (C) Sistina Software, Inc.  1997-2003  All rights reserved.</div><div class='del'>-**  Copyright (C) 2004-2007 Red Hat, Inc.  All rights reserved.</div><div class='add'>+**  Copyright (C) 2004-2008 Red Hat, Inc.  All rights reserved.</div><div class='ctx'> **</div><div class='ctx'> **  This copyrighted material is made available to anyone wishing to use,</div><div class='ctx'> **  modify, copy, or redistribute it subject to the terms and conditions</div><div class='hunk'>@@ -441,8 +441,11 @@ struct dlm_ls {</div><div class='ctx'> 	uint32_t		ls_global_id;	/* global unique lockspace ID */</div><div class='ctx'> 	uint32_t		ls_exflags;</div><div class='ctx'> 	int			ls_lvblen;</div><div class='del'>-	int			ls_count;	/* reference count */</div><div class='add'>+	int			ls_count;	/* refcount of processes in</div><div class='add'>+						   the dlm using this ls */</div><div class='add'>+	int			ls_create_count; /* create/release refcount */</div><div class='ctx'> 	unsigned long		ls_flags;	/* LSFL_ */</div><div class='add'>+	unsigned long		ls_scan_time;</div><div class='ctx'> 	struct kobject		ls_kobj;</div><div class='ctx'> </div><div class='ctx'> 	struct dlm_rsbtable	*ls_rsbtbl;</div><div class='head'>diff --git a/fs/dlm/lockspace.c b/fs/dlm/lockspace.c<br/>index 499e16759e96..d910501de6d2 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/dlm/lockspace.c?id=c15895ef30c2c03e99802951787183039a349d32'>fs/dlm/lockspace.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/dlm/lockspace.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/dlm/lockspace.c</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'> *******************************************************************************</div><div class='ctx'> **</div><div class='ctx'> **  Copyright (C) Sistina Software, Inc.  1997-2003  All rights reserved.</div><div class='del'>-**  Copyright (C) 2004-2007 Red Hat, Inc.  All rights reserved.</div><div class='add'>+**  Copyright (C) 2004-2008 Red Hat, Inc.  All rights reserved.</div><div class='ctx'> **</div><div class='ctx'> **  This copyrighted material is made available to anyone wishing to use,</div><div class='ctx'> **  modify, copy, or redistribute it subject to the terms and conditions</div><div class='hunk'>@@ -23,6 +23,7 @@</div><div class='ctx'> #include "lock.h"</div><div class='ctx'> #include "recover.h"</div><div class='ctx'> #include "requestqueue.h"</div><div class='add'>+#include "user.h"</div><div class='ctx'> </div><div class='ctx'> static int			ls_count;</div><div class='ctx'> static struct mutex		ls_lock;</div><div class='hunk'>@@ -211,19 +212,41 @@ void dlm_lockspace_exit(void)</div><div class='ctx'> 	kset_unregister(dlm_kset);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct dlm_ls *find_ls_to_scan(void)</div><div class='add'>+{</div><div class='add'>+	struct dlm_ls *ls;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;lslist_lock);</div><div class='add'>+	list_for_each_entry(ls, &amp;lslist, ls_list) {</div><div class='add'>+		if (time_after_eq(jiffies, ls-&gt;ls_scan_time +</div><div class='add'>+					    dlm_config.ci_scan_secs * HZ)) {</div><div class='add'>+			spin_unlock(&amp;lslist_lock);</div><div class='add'>+			return ls;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;lslist_lock);</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int dlm_scand(void *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct dlm_ls *ls;</div><div class='add'>+	int timeout_jiffies = dlm_config.ci_scan_secs * HZ;</div><div class='ctx'> </div><div class='ctx'> 	while (!kthread_should_stop()) {</div><div class='del'>-		list_for_each_entry(ls, &amp;lslist, ls_list) {</div><div class='add'>+		ls = find_ls_to_scan();</div><div class='add'>+		if (ls) {</div><div class='ctx'> 			if (dlm_lock_recovery_try(ls)) {</div><div class='add'>+				ls-&gt;ls_scan_time = jiffies;</div><div class='ctx'> 				dlm_scan_rsbs(ls);</div><div class='ctx'> 				dlm_scan_timeout(ls);</div><div class='ctx'> 				dlm_unlock_recovery(ls);</div><div class='add'>+			} else {</div><div class='add'>+				ls-&gt;ls_scan_time += HZ;</div><div class='ctx'> 			}</div><div class='add'>+		} else {</div><div class='add'>+			schedule_timeout_interruptible(timeout_jiffies);</div><div class='ctx'> 		}</div><div class='del'>-		schedule_timeout_interruptible(dlm_config.ci_scan_secs * HZ);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -246,23 +269,6 @@ static void dlm_scand_stop(void)</div><div class='ctx'> 	kthread_stop(scand_task);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct dlm_ls *dlm_find_lockspace_name(char *name, int namelen)</div><div class='del'>-{</div><div class='del'>-	struct dlm_ls *ls;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;lslist_lock);</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(ls, &amp;lslist, ls_list) {</div><div class='del'>-		if (ls-&gt;ls_namelen == namelen &amp;&amp;</div><div class='del'>-		    memcmp(ls-&gt;ls_name, name, namelen) == 0)</div><div class='del'>-			goto out;</div><div class='del'>-	}</div><div class='del'>-	ls = NULL;</div><div class='del'>- out:</div><div class='del'>-	spin_unlock(&amp;lslist_lock);</div><div class='del'>-	return ls;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> struct dlm_ls *dlm_find_lockspace_global(uint32_t id)</div><div class='ctx'> {</div><div class='ctx'> 	struct dlm_ls *ls;</div><div class='hunk'>@@ -327,6 +333,7 @@ static void remove_lockspace(struct dlm_ls *ls)</div><div class='ctx'> 	for (;;) {</div><div class='ctx'> 		spin_lock(&amp;lslist_lock);</div><div class='ctx'> 		if (ls-&gt;ls_count == 0) {</div><div class='add'>+			WARN_ON(ls-&gt;ls_create_count != 0);</div><div class='ctx'> 			list_del(&amp;ls-&gt;ls_list);</div><div class='ctx'> 			spin_unlock(&amp;lslist_lock);</div><div class='ctx'> 			return;</div><div class='hunk'>@@ -381,7 +388,7 @@ static int new_lockspace(char *name, int namelen, void **lockspace,</div><div class='ctx'> 			 uint32_t flags, int lvblen)</div><div class='ctx'> {</div><div class='ctx'> 	struct dlm_ls *ls;</div><div class='del'>-	int i, size, error = -ENOMEM;</div><div class='add'>+	int i, size, error;</div><div class='ctx'> 	int do_unreg = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (namelen &gt; DLM_LOCKSPACE_LEN)</div><div class='hunk'>@@ -393,12 +400,37 @@ static int new_lockspace(char *name, int namelen, void **lockspace,</div><div class='ctx'> 	if (!try_module_get(THIS_MODULE))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	ls = dlm_find_lockspace_name(name, namelen);</div><div class='del'>-	if (ls) {</div><div class='del'>-		*lockspace = ls;</div><div class='add'>+	if (!dlm_user_daemon_available()) {</div><div class='add'>+		module_put(THIS_MODULE);</div><div class='add'>+		return -EUNATCH;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	error = 0;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;lslist_lock);</div><div class='add'>+	list_for_each_entry(ls, &amp;lslist, ls_list) {</div><div class='add'>+		WARN_ON(ls-&gt;ls_create_count &lt;= 0);</div><div class='add'>+		if (ls-&gt;ls_namelen != namelen)</div><div class='add'>+			continue;</div><div class='add'>+		if (memcmp(ls-&gt;ls_name, name, namelen))</div><div class='add'>+			continue;</div><div class='add'>+		if (flags &amp; DLM_LSFL_NEWEXCL) {</div><div class='add'>+			error = -EEXIST;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		ls-&gt;ls_create_count++;</div><div class='ctx'> 		module_put(THIS_MODULE);</div><div class='del'>-		return -EEXIST;</div><div class='add'>+		error = 1; /* not an error, return 0 */</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='add'>+	spin_unlock(&amp;lslist_lock);</div><div class='add'>+</div><div class='add'>+	if (error &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+	if (error)</div><div class='add'>+		goto ret_zero;</div><div class='add'>+</div><div class='add'>+	error = -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	ls = kzalloc(sizeof(struct dlm_ls) + namelen, GFP_KERNEL);</div><div class='ctx'> 	if (!ls)</div><div class='hunk'>@@ -408,6 +440,7 @@ static int new_lockspace(char *name, int namelen, void **lockspace,</div><div class='ctx'> 	ls-&gt;ls_lvblen = lvblen;</div><div class='ctx'> 	ls-&gt;ls_count = 0;</div><div class='ctx'> 	ls-&gt;ls_flags = 0;</div><div class='add'>+	ls-&gt;ls_scan_time = jiffies;</div><div class='ctx'> </div><div class='ctx'> 	if (flags &amp; DLM_LSFL_TIMEWARN)</div><div class='ctx'> 		set_bit(LSFL_TIMEWARN, &amp;ls-&gt;ls_flags);</div><div class='hunk'>@@ -418,8 +451,9 @@ static int new_lockspace(char *name, int namelen, void **lockspace,</div><div class='ctx'> 		ls-&gt;ls_allocation = GFP_KERNEL;</div><div class='ctx'> </div><div class='ctx'> 	/* ls_exflags are forced to match among nodes, and we don't</div><div class='del'>-	   need to require all nodes to have TIMEWARN or FS set */</div><div class='del'>-	ls-&gt;ls_exflags = (flags &amp; ~(DLM_LSFL_TIMEWARN | DLM_LSFL_FS));</div><div class='add'>+	   need to require all nodes to have some flags set */</div><div class='add'>+	ls-&gt;ls_exflags = (flags &amp; ~(DLM_LSFL_TIMEWARN | DLM_LSFL_FS |</div><div class='add'>+				    DLM_LSFL_NEWEXCL));</div><div class='ctx'> </div><div class='ctx'> 	size = dlm_config.ci_rsbtbl_size;</div><div class='ctx'> 	ls-&gt;ls_rsbtbl_size = size;</div><div class='hunk'>@@ -510,6 +544,7 @@ static int new_lockspace(char *name, int namelen, void **lockspace,</div><div class='ctx'> 	down_write(&amp;ls-&gt;ls_in_recovery);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;lslist_lock);</div><div class='add'>+	ls-&gt;ls_create_count = 1;</div><div class='ctx'> 	list_add(&amp;ls-&gt;ls_list, &amp;lslist);</div><div class='ctx'> 	spin_unlock(&amp;lslist_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -548,7 +583,7 @@ static int new_lockspace(char *name, int namelen, void **lockspace,</div><div class='ctx'> 	dlm_create_debug_file(ls);</div><div class='ctx'> </div><div class='ctx'> 	log_debug(ls, "join complete");</div><div class='del'>-</div><div class='add'>+ ret_zero:</div><div class='ctx'> 	*lockspace = ls;</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -635,13 +670,34 @@ static int release_lockspace(struct dlm_ls *ls, int force)</div><div class='ctx'> 	struct dlm_lkb *lkb;</div><div class='ctx'> 	struct dlm_rsb *rsb;</div><div class='ctx'> 	struct list_head *head;</div><div class='del'>-	int i;</div><div class='del'>-	int busy = lockspace_busy(ls);</div><div class='add'>+	int i, busy, rv;</div><div class='add'>+</div><div class='add'>+	busy = lockspace_busy(ls);</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;lslist_lock);</div><div class='add'>+	if (ls-&gt;ls_create_count == 1) {</div><div class='add'>+		if (busy &gt; force)</div><div class='add'>+			rv = -EBUSY;</div><div class='add'>+		else {</div><div class='add'>+			/* remove_lockspace takes ls off lslist */</div><div class='add'>+			ls-&gt;ls_create_count = 0;</div><div class='add'>+			rv = 0;</div><div class='add'>+		}</div><div class='add'>+	} else if (ls-&gt;ls_create_count &gt; 1) {</div><div class='add'>+		rv = --ls-&gt;ls_create_count;</div><div class='add'>+	} else {</div><div class='add'>+		rv = -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;lslist_lock);</div><div class='ctx'> </div><div class='del'>-	if (busy &gt; force)</div><div class='del'>-		return -EBUSY;</div><div class='add'>+	if (rv) {</div><div class='add'>+		log_debug(ls, "release_lockspace no remove %d", rv);</div><div class='add'>+		return rv;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dlm_device_deregister(ls);</div><div class='ctx'> </div><div class='del'>-	if (force &lt; 3)</div><div class='add'>+	if (force &lt; 3 &amp;&amp; dlm_user_daemon_available())</div><div class='ctx'> 		do_uevent(ls, 0);</div><div class='ctx'> </div><div class='ctx'> 	dlm_recoverd_stop(ls);</div><div class='hunk'>@@ -720,15 +776,10 @@ static int release_lockspace(struct dlm_ls *ls, int force)</div><div class='ctx'> 	dlm_clear_members(ls);</div><div class='ctx'> 	dlm_clear_members_gone(ls);</div><div class='ctx'> 	kfree(ls-&gt;ls_node_array);</div><div class='add'>+	log_debug(ls, "release_lockspace final free");</div><div class='ctx'> 	kobject_put(&amp;ls-&gt;ls_kobj);</div><div class='ctx'> 	/* The ls structure will be freed when the kobject is done with */</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ls_lock);</div><div class='del'>-	ls_count--;</div><div class='del'>-	if (!ls_count)</div><div class='del'>-		threads_stop();</div><div class='del'>-	mutex_unlock(&amp;ls_lock);</div><div class='del'>-</div><div class='ctx'> 	module_put(THIS_MODULE);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -750,11 +801,38 @@ static int release_lockspace(struct dlm_ls *ls, int force)</div><div class='ctx'> int dlm_release_lockspace(void *lockspace, int force)</div><div class='ctx'> {</div><div class='ctx'> 	struct dlm_ls *ls;</div><div class='add'>+	int error;</div><div class='ctx'> </div><div class='ctx'> 	ls = dlm_find_lockspace_local(lockspace);</div><div class='ctx'> 	if (!ls)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	dlm_put_lockspace(ls);</div><div class='del'>-	return release_lockspace(ls, force);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ls_lock);</div><div class='add'>+	error = release_lockspace(ls, force);</div><div class='add'>+	if (!error)</div><div class='add'>+		ls_count--;</div><div class='add'>+	else if (!ls_count)</div><div class='add'>+		threads_stop();</div><div class='add'>+	mutex_unlock(&amp;ls_lock);</div><div class='add'>+</div><div class='add'>+	return error;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void dlm_stop_lockspaces(void)</div><div class='add'>+{</div><div class='add'>+	struct dlm_ls *ls;</div><div class='add'>+</div><div class='add'>+ restart:</div><div class='add'>+	spin_lock(&amp;lslist_lock);</div><div class='add'>+	list_for_each_entry(ls, &amp;lslist, ls_list) {</div><div class='add'>+		if (!test_bit(LSFL_RUNNING, &amp;ls-&gt;ls_flags))</div><div class='add'>+			continue;</div><div class='add'>+		spin_unlock(&amp;lslist_lock);</div><div class='add'>+		log_error(ls, "no userland control daemon, stopping lockspace");</div><div class='add'>+		dlm_ls_stop(ls);</div><div class='add'>+		goto restart;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;lslist_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/fs/dlm/lockspace.h b/fs/dlm/lockspace.h<br/>index 891eabbdd021..f879f87901f8 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/dlm/lockspace.h?id=c15895ef30c2c03e99802951787183039a349d32'>fs/dlm/lockspace.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/dlm/lockspace.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/dlm/lockspace.h</a></div><div class='hunk'>@@ -20,6 +20,7 @@ struct dlm_ls *dlm_find_lockspace_global(uint32_t id);</div><div class='ctx'> struct dlm_ls *dlm_find_lockspace_local(void *id);</div><div class='ctx'> struct dlm_ls *dlm_find_lockspace_device(int minor);</div><div class='ctx'> void dlm_put_lockspace(struct dlm_ls *ls);</div><div class='add'>+void dlm_stop_lockspaces(void);</div><div class='ctx'> </div><div class='ctx'> #endif				/* __LOCKSPACE_DOT_H__ */</div><div class='ctx'> </div><div class='head'>diff --git a/fs/dlm/user.c b/fs/dlm/user.c<br/>index 34f14a14fb4e..b3832c67194a 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/dlm/user.c?id=c15895ef30c2c03e99802951787183039a349d32'>fs/dlm/user.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/dlm/user.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/dlm/user.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2006-2007 Red Hat, Inc.  All rights reserved.</div><div class='add'>+ * Copyright (C) 2006-2008 Red Hat, Inc.  All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * This copyrighted material is made available to anyone wishing to use,</div><div class='ctx'>  * modify, copy, or redistribute it subject to the terms and conditions</div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'> #include &lt;linux/poll.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;linux/smp_lock.h&gt;</div><div class='ctx'> #include &lt;linux/dlm.h&gt;</div><div class='ctx'> #include &lt;linux/dlm_device.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -27,6 +26,8 @@</div><div class='ctx'> </div><div class='ctx'> static const char name_prefix[] = "dlm";</div><div class='ctx'> static const struct file_operations device_fops;</div><div class='add'>+static atomic_t dlm_monitor_opened;</div><div class='add'>+static int dlm_monitor_unused = 1;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='ctx'> </div><div class='hunk'>@@ -340,10 +341,15 @@ static int device_user_deadlock(struct dlm_user_proc *proc,</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int create_misc_device(struct dlm_ls *ls, char *name)</div><div class='add'>+static int dlm_device_register(struct dlm_ls *ls, char *name)</div><div class='ctx'> {</div><div class='ctx'> 	int error, len;</div><div class='ctx'> </div><div class='add'>+	/* The device is already registered.  This happens when the</div><div class='add'>+	   lockspace is created multiple times from userspace. */</div><div class='add'>+	if (ls-&gt;ls_device.name)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	error = -ENOMEM;</div><div class='ctx'> 	len = strlen(name) + strlen(name_prefix) + 2;</div><div class='ctx'> 	ls-&gt;ls_device.name = kzalloc(len, GFP_KERNEL);</div><div class='hunk'>@@ -363,6 +369,22 @@ fail:</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int dlm_device_deregister(struct dlm_ls *ls)</div><div class='add'>+{</div><div class='add'>+	int error;</div><div class='add'>+</div><div class='add'>+	/* The device is not registered.  This happens when the lockspace</div><div class='add'>+	   was never used from userspace, or when device_create_lockspace()</div><div class='add'>+	   calls dlm_release_lockspace() after the register fails. */</div><div class='add'>+	if (!ls-&gt;ls_device.name)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	error = misc_deregister(&amp;ls-&gt;ls_device);</div><div class='add'>+	if (!error)</div><div class='add'>+		kfree(ls-&gt;ls_device.name);</div><div class='add'>+	return error;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int device_user_purge(struct dlm_user_proc *proc,</div><div class='ctx'> 			     struct dlm_purge_params *params)</div><div class='ctx'> {</div><div class='hunk'>@@ -397,7 +419,7 @@ static int device_create_lockspace(struct dlm_lspace_params *params)</div><div class='ctx'> 	if (!ls)</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> </div><div class='del'>-	error = create_misc_device(ls, params-&gt;name);</div><div class='add'>+	error = dlm_device_register(ls, params-&gt;name);</div><div class='ctx'> 	dlm_put_lockspace(ls);</div><div class='ctx'> </div><div class='ctx'> 	if (error)</div><div class='hunk'>@@ -421,31 +443,22 @@ static int device_remove_lockspace(struct dlm_lspace_params *params)</div><div class='ctx'> 	if (!ls)</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> </div><div class='del'>-	/* Deregister the misc device first, so we don't have</div><div class='del'>-	 * a device that's not attached to a lockspace. If</div><div class='del'>-	 * dlm_release_lockspace fails then we can recreate it</div><div class='del'>-	 */</div><div class='del'>-	error = misc_deregister(&amp;ls-&gt;ls_device);</div><div class='del'>-	if (error) {</div><div class='del'>-		dlm_put_lockspace(ls);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-	kfree(ls-&gt;ls_device.name);</div><div class='del'>-</div><div class='ctx'> 	if (params-&gt;flags &amp; DLM_USER_LSFLG_FORCEFREE)</div><div class='ctx'> 		force = 2;</div><div class='ctx'> </div><div class='ctx'> 	lockspace = ls-&gt;ls_local_handle;</div><div class='add'>+	dlm_put_lockspace(ls);</div><div class='ctx'> </div><div class='del'>-	/* dlm_release_lockspace waits for references to go to zero,</div><div class='del'>-	   so all processes will need to close their device for the ls</div><div class='del'>-	   before the release will procede */</div><div class='add'>+	/* The final dlm_release_lockspace waits for references to go to</div><div class='add'>+	   zero, so all processes will need to close their device for the</div><div class='add'>+	   ls before the release will proceed.  release also calls the</div><div class='add'>+	   device_deregister above.  Converting a positive return value</div><div class='add'>+	   from release to zero means that userspace won't know when its</div><div class='add'>+	   release was the final one, but it shouldn't need to know. */</div><div class='ctx'> </div><div class='del'>-	dlm_put_lockspace(ls);</div><div class='ctx'> 	error = dlm_release_lockspace(lockspace, force);</div><div class='del'>-	if (error)</div><div class='del'>-		create_misc_device(ls, ls-&gt;ls_name);</div><div class='del'>- out:</div><div class='add'>+	if (error &gt; 0)</div><div class='add'>+		error = 0;</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -623,17 +636,13 @@ static int device_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	struct dlm_user_proc *proc;</div><div class='ctx'> 	struct dlm_ls *ls;</div><div class='ctx'> </div><div class='del'>-	lock_kernel();</div><div class='ctx'> 	ls = dlm_find_lockspace_device(iminor(inode));</div><div class='del'>-	if (!ls) {</div><div class='del'>-		unlock_kernel();</div><div class='add'>+	if (!ls)</div><div class='ctx'> 		return -ENOENT;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	proc = kzalloc(sizeof(struct dlm_user_proc), GFP_KERNEL);</div><div class='ctx'> 	if (!proc) {</div><div class='ctx'> 		dlm_put_lockspace(ls);</div><div class='del'>-		unlock_kernel();</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -645,7 +654,6 @@ static int device_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	spin_lock_init(&amp;proc-&gt;locks_spin);</div><div class='ctx'> 	init_waitqueue_head(&amp;proc-&gt;wait);</div><div class='ctx'> 	file-&gt;private_data = proc;</div><div class='del'>-	unlock_kernel();</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -878,9 +886,28 @@ static unsigned int device_poll(struct file *file, poll_table *wait)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int dlm_user_daemon_available(void)</div><div class='add'>+{</div><div class='add'>+	/* dlm_controld hasn't started (or, has started, but not</div><div class='add'>+	   properly populated configfs) */</div><div class='add'>+</div><div class='add'>+	if (!dlm_our_nodeid())</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* This is to deal with versions of dlm_controld that don't</div><div class='add'>+	   know about the monitor device.  We assume that if the</div><div class='add'>+	   dlm_controld was started (above), but the monitor device</div><div class='add'>+	   was never opened, that it's an old version.  dlm_controld</div><div class='add'>+	   should open the monitor device before populating configfs. */</div><div class='add'>+</div><div class='add'>+	if (dlm_monitor_unused)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	return atomic_read(&amp;dlm_monitor_opened) ? 1 : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ctl_device_open(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='del'>-	cycle_kernel_lock();</div><div class='ctx'> 	file-&gt;private_data = NULL;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -890,6 +917,20 @@ static int ctl_device_close(struct inode *inode, struct file *file)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int monitor_device_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	atomic_inc(&amp;dlm_monitor_opened);</div><div class='add'>+	dlm_monitor_unused = 0;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int monitor_device_close(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	if (atomic_dec_and_test(&amp;dlm_monitor_opened))</div><div class='add'>+		dlm_stop_lockspaces();</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct file_operations device_fops = {</div><div class='ctx'> 	.open    = device_open,</div><div class='ctx'> 	.release = device_close,</div><div class='hunk'>@@ -913,19 +954,42 @@ static struct miscdevice ctl_device = {</div><div class='ctx'> 	.minor = MISC_DYNAMIC_MINOR,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct file_operations monitor_device_fops = {</div><div class='add'>+	.open    = monitor_device_open,</div><div class='add'>+	.release = monitor_device_close,</div><div class='add'>+	.owner   = THIS_MODULE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct miscdevice monitor_device = {</div><div class='add'>+	.name  = "dlm-monitor",</div><div class='add'>+	.fops  = &amp;monitor_device_fops,</div><div class='add'>+	.minor = MISC_DYNAMIC_MINOR,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> int __init dlm_user_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='add'>+	atomic_set(&amp;dlm_monitor_opened, 0);</div><div class='add'>+</div><div class='ctx'> 	error = misc_register(&amp;ctl_device);</div><div class='del'>-	if (error)</div><div class='add'>+	if (error) {</div><div class='ctx'> 		log_print("misc_register failed for control device");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	error = misc_register(&amp;monitor_device);</div><div class='add'>+	if (error) {</div><div class='add'>+		log_print("misc_register failed for monitor device");</div><div class='add'>+		misc_deregister(&amp;ctl_device);</div><div class='add'>+	}</div><div class='add'>+ out:</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void dlm_user_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	misc_deregister(&amp;ctl_device);</div><div class='add'>+	misc_deregister(&amp;monitor_device);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/fs/dlm/user.h b/fs/dlm/user.h<br/>index d38e9f3e4151..35eb6a13d616 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/dlm/user.h?id=c15895ef30c2c03e99802951787183039a349d32'>fs/dlm/user.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/dlm/user.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/dlm/user.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2006 Red Hat, Inc.  All rights reserved.</div><div class='add'>+ * Copyright (C) 2006-2008 Red Hat, Inc.  All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * This copyrighted material is made available to anyone wishing to use,</div><div class='ctx'>  * modify, copy, or redistribute it subject to the terms and conditions</div><div class='hunk'>@@ -12,5 +12,7 @@</div><div class='ctx'> void dlm_user_add_ast(struct dlm_lkb *lkb, int type);</div><div class='ctx'> int dlm_user_init(void);</div><div class='ctx'> void dlm_user_exit(void);</div><div class='add'>+int dlm_device_deregister(struct dlm_ls *ls);</div><div class='add'>+int dlm_user_daemon_available(void);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/fs/dquot.c b/fs/dquot.c<br/>index 8ec4d6cc7633..da30a27f2242 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/dquot.c?id=c15895ef30c2c03e99802951787183039a349d32'>fs/dquot.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/dquot.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/dquot.c</a></div><div class='hunk'>@@ -9,8 +9,6 @@</div><div class='ctx'>  * implementation is based on one of the several variants of the LINUX</div><div class='ctx'>  * inode-subsystem with added complexity of the diskquota system.</div><div class='ctx'>  * </div><div class='del'>- * Version: $Id: dquot.c,v 6.3 1996/11/17 18:35:34 mvw Exp mvw $</div><div class='del'>- * </div><div class='ctx'>  * Author:	Marco van Wieringen &lt;mvw@planets.elm.net&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * Fixes:   Dmitry Gorodchanin &lt;pgmdsg@ibi.com&gt;, 11 Feb 96</div><div class='hunk'>@@ -895,10 +893,9 @@ static void print_warning(struct dquot *dquot, const int warntype)</div><div class='ctx'> 	    warntype == QUOTA_NL_BSOFTBELOW || !need_print_warning(dquot))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;tty_mutex);</div><div class='ctx'> 	tty = get_current_tty();</div><div class='ctx'> 	if (!tty)</div><div class='del'>-		goto out_lock;</div><div class='add'>+		return;</div><div class='ctx'> 	tty_write_message(tty, dquot-&gt;dq_sb-&gt;s_id);</div><div class='ctx'> 	if (warntype == QUOTA_NL_ISOFTWARN || warntype == QUOTA_NL_BSOFTWARN)</div><div class='ctx'> 		tty_write_message(tty, ": warning, ");</div><div class='hunk'>@@ -926,8 +923,7 @@ static void print_warning(struct dquot *dquot, const int warntype)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='ctx'> 	tty_write_message(tty, msg);</div><div class='del'>-out_lock:</div><div class='del'>-	mutex_unlock(&amp;tty_mutex);</div><div class='add'>+	tty_kref_put(tty);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/fs/ecryptfs/Makefile b/fs/ecryptfs/Makefile<br/>index b4755a85996e..2cc9ee4ad2eb 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/ecryptfs/Makefile?id=c15895ef30c2c03e99802951787183039a349d32'>fs/ecryptfs/Makefile</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/ecryptfs/Makefile?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ecryptfs/Makefile</a></div><div class='hunk'>@@ -4,4 +4,4 @@</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_ECRYPT_FS) += ecryptfs.o</div><div class='ctx'> </div><div class='del'>-ecryptfs-objs := dentry.o file.o inode.o main.o super.o mmap.o read_write.o crypto.o keystore.o messaging.o netlink.o miscdev.o kthread.o debug.o</div><div class='add'>+ecryptfs-objs := dentry.o file.o inode.o main.o super.o mmap.o read_write.o crypto.o keystore.o messaging.o miscdev.o kthread.o debug.o</div><div class='head'>diff --git a/fs/ecryptfs/ecryptfs_kernel.h b/fs/ecryptfs/ecryptfs_kernel.h<br/>index b73fb752c5f8..3504cf9df358 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/ecryptfs/ecryptfs_kernel.h?id=c15895ef30c2c03e99802951787183039a349d32'>fs/ecryptfs/ecryptfs_kernel.h</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/ecryptfs/ecryptfs_kernel.h?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ecryptfs/ecryptfs_kernel.h</a></div><div class='hunk'>@@ -79,11 +79,6 @@</div><div class='ctx'> #define ECRYPTFS_MAX_PKI_NAME_BYTES 16</div><div class='ctx'> #define ECRYPTFS_DEFAULT_NUM_USERS 4</div><div class='ctx'> #define ECRYPTFS_MAX_NUM_USERS 32768</div><div class='del'>-#define ECRYPTFS_TRANSPORT_NETLINK 0</div><div class='del'>-#define ECRYPTFS_TRANSPORT_CONNECTOR 1</div><div class='del'>-#define ECRYPTFS_TRANSPORT_RELAYFS 2</div><div class='del'>-#define ECRYPTFS_TRANSPORT_MISCDEV 3</div><div class='del'>-#define ECRYPTFS_DEFAULT_TRANSPORT ECRYPTFS_TRANSPORT_MISCDEV</div><div class='ctx'> #define ECRYPTFS_XATTR_NAME "user.ecryptfs"</div><div class='ctx'> </div><div class='ctx'> #define RFC2440_CIPHER_DES3_EDE 0x02</div><div class='hunk'>@@ -400,8 +395,6 @@ struct ecryptfs_msg_ctx {</div><div class='ctx'> 	struct mutex mux;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-extern unsigned int ecryptfs_transport;</div><div class='del'>-</div><div class='ctx'> struct ecryptfs_daemon;</div><div class='ctx'> </div><div class='ctx'> struct ecryptfs_daemon {</div><div class='hunk'>@@ -627,31 +620,20 @@ int</div><div class='ctx'> ecryptfs_setxattr(struct dentry *dentry, const char *name, const void *value,</div><div class='ctx'> 		  size_t size, int flags);</div><div class='ctx'> int ecryptfs_read_xattr_region(char *page_virt, struct inode *ecryptfs_inode);</div><div class='del'>-int ecryptfs_process_helo(unsigned int transport, uid_t euid,</div><div class='del'>-			  struct user_namespace *user_ns, struct pid *pid);</div><div class='add'>+int ecryptfs_process_helo(uid_t euid, struct user_namespace *user_ns,</div><div class='add'>+			  struct pid *pid);</div><div class='ctx'> int ecryptfs_process_quit(uid_t euid, struct user_namespace *user_ns,</div><div class='ctx'> 			  struct pid *pid);</div><div class='ctx'> int ecryptfs_process_response(struct ecryptfs_message *msg, uid_t euid,</div><div class='ctx'> 			      struct user_namespace *user_ns, struct pid *pid,</div><div class='ctx'> 			      u32 seq);</div><div class='del'>-int ecryptfs_send_message(unsigned int transport, char *data, int data_len,</div><div class='add'>+int ecryptfs_send_message(char *data, int data_len,</div><div class='ctx'> 			  struct ecryptfs_msg_ctx **msg_ctx);</div><div class='ctx'> int ecryptfs_wait_for_response(struct ecryptfs_msg_ctx *msg_ctx,</div><div class='ctx'> 			       struct ecryptfs_message **emsg);</div><div class='del'>-int ecryptfs_init_messaging(unsigned int transport);</div><div class='del'>-void ecryptfs_release_messaging(unsigned int transport);</div><div class='add'>+int ecryptfs_init_messaging(void);</div><div class='add'>+void ecryptfs_release_messaging(void);</div><div class='ctx'> </div><div class='del'>-int ecryptfs_send_netlink(char *data, int data_len,</div><div class='del'>-			  struct ecryptfs_msg_ctx *msg_ctx, u8 msg_type,</div><div class='del'>-			  u16 msg_flags, struct pid *daemon_pid);</div><div class='del'>-int ecryptfs_init_netlink(void);</div><div class='del'>-void ecryptfs_release_netlink(void);</div><div class='del'>-</div><div class='del'>-int ecryptfs_send_connector(char *data, int data_len,</div><div class='del'>-			    struct ecryptfs_msg_ctx *msg_ctx, u8 msg_type,</div><div class='del'>-			    u16 msg_flags, struct pid *daemon_pid);</div><div class='del'>-int ecryptfs_init_connector(void);</div><div class='del'>-void ecryptfs_release_connector(void);</div><div class='ctx'> void</div><div class='ctx'> ecryptfs_write_header_metadata(char *virt,</div><div class='ctx'> 			       struct ecryptfs_crypt_stat *crypt_stat,</div><div class='head'>diff --git a/fs/ecryptfs/file.c b/fs/ecryptfs/file.c<br/>index 9244d653743e..eb3dc4c7ac06 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/ecryptfs/file.c?id=c15895ef30c2c03e99802951787183039a349d32'>fs/ecryptfs/file.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/ecryptfs/file.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ecryptfs/file.c</a></div><div class='hunk'>@@ -71,12 +71,11 @@ struct ecryptfs_getdents_callback {</div><div class='ctx'> 	void *dirent;</div><div class='ctx'> 	struct dentry *dentry;</div><div class='ctx'> 	filldir_t filldir;</div><div class='del'>-	int err;</div><div class='ctx'> 	int filldir_called;</div><div class='ctx'> 	int entries_written;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* Inspired by generic filldir in fs/readir.c */</div><div class='add'>+/* Inspired by generic filldir in fs/readdir.c */</div><div class='ctx'> static int</div><div class='ctx'> ecryptfs_filldir(void *dirent, const char *name, int namelen, loff_t offset,</div><div class='ctx'> 		 u64 ino, unsigned int d_type)</div><div class='hunk'>@@ -125,18 +124,18 @@ static int ecryptfs_readdir(struct file *file, void *dirent, filldir_t filldir)</div><div class='ctx'> 	buf.dirent = dirent;</div><div class='ctx'> 	buf.dentry = file-&gt;f_path.dentry;</div><div class='ctx'> 	buf.filldir = filldir;</div><div class='del'>-retry:</div><div class='ctx'> 	buf.filldir_called = 0;</div><div class='ctx'> 	buf.entries_written = 0;</div><div class='del'>-	buf.err = 0;</div><div class='ctx'> 	rc = vfs_readdir(lower_file, ecryptfs_filldir, (void *)&amp;buf);</div><div class='del'>-	if (buf.err)</div><div class='del'>-		rc = buf.err;</div><div class='del'>-	if (buf.filldir_called &amp;&amp; !buf.entries_written)</div><div class='del'>-		goto retry;</div><div class='ctx'> 	file-&gt;f_pos = lower_file-&gt;f_pos;</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+	if (buf.filldir_called &amp;&amp; !buf.entries_written)</div><div class='add'>+		goto out;</div><div class='ctx'> 	if (rc &gt;= 0)</div><div class='del'>-		fsstack_copy_attr_atime(inode, lower_file-&gt;f_path.dentry-&gt;d_inode);</div><div class='add'>+		fsstack_copy_attr_atime(inode,</div><div class='add'>+					lower_file-&gt;f_path.dentry-&gt;d_inode);</div><div class='add'>+out:</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/fs/ecryptfs/keystore.c b/fs/ecryptfs/keystore.c<br/>index f5b76a331b9c..e22bc3961345 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/ecryptfs/keystore.c?id=c15895ef30c2c03e99802951787183039a349d32'>fs/ecryptfs/keystore.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/ecryptfs/keystore.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ecryptfs/keystore.c</a></div><div class='hunk'>@@ -234,8 +234,8 @@ parse_tag_65_packet(struct ecryptfs_session_key *session_key, u8 *cipher_code,</div><div class='ctx'> 	}</div><div class='ctx'> 	i += data_len;</div><div class='ctx'> 	if (message_len &lt; (i + m_size)) {</div><div class='del'>-		ecryptfs_printk(KERN_ERR, "The received netlink message is "</div><div class='del'>-				"shorter than expected\n");</div><div class='add'>+		ecryptfs_printk(KERN_ERR, "The message received from ecryptfsd "</div><div class='add'>+				"is shorter than expected\n");</div><div class='ctx'> 		rc = -EIO;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -438,8 +438,8 @@ decrypt_pki_encrypted_session_key(struct ecryptfs_auth_tok *auth_tok,</div><div class='ctx'> 	struct ecryptfs_msg_ctx *msg_ctx;</div><div class='ctx'> 	struct ecryptfs_message *msg = NULL;</div><div class='ctx'> 	char *auth_tok_sig;</div><div class='del'>-	char *netlink_message;</div><div class='del'>-	size_t netlink_message_length;</div><div class='add'>+	char *payload;</div><div class='add'>+	size_t payload_len;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	rc = ecryptfs_get_auth_tok_sig(&amp;auth_tok_sig, auth_tok);</div><div class='hunk'>@@ -449,15 +449,15 @@ decrypt_pki_encrypted_session_key(struct ecryptfs_auth_tok *auth_tok,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	rc = write_tag_64_packet(auth_tok_sig, &amp;(auth_tok-&gt;session_key),</div><div class='del'>-				 &amp;netlink_message, &amp;netlink_message_length);</div><div class='add'>+				 &amp;payload, &amp;payload_len);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		ecryptfs_printk(KERN_ERR, "Failed to write tag 64 packet\n");</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	rc = ecryptfs_send_message(ecryptfs_transport, netlink_message,</div><div class='del'>-				   netlink_message_length, &amp;msg_ctx);</div><div class='add'>+	rc = ecryptfs_send_message(payload, payload_len, &amp;msg_ctx);</div><div class='ctx'> 	if (rc) {</div><div class='del'>-		ecryptfs_printk(KERN_ERR, "Error sending netlink message\n");</div><div class='add'>+		ecryptfs_printk(KERN_ERR, "Error sending message to "</div><div class='add'>+				"ecryptfsd\n");</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	rc = ecryptfs_wait_for_response(msg_ctx, &amp;msg);</div><div class='hunk'>@@ -1333,23 +1333,22 @@ pki_encrypt_session_key(struct ecryptfs_auth_tok *auth_tok,</div><div class='ctx'> 			struct ecryptfs_key_record *key_rec)</div><div class='ctx'> {</div><div class='ctx'> 	struct ecryptfs_msg_ctx *msg_ctx = NULL;</div><div class='del'>-	char *netlink_payload;</div><div class='del'>-	size_t netlink_payload_length;</div><div class='add'>+	char *payload = NULL;</div><div class='add'>+	size_t payload_len;</div><div class='ctx'> 	struct ecryptfs_message *msg;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	rc = write_tag_66_packet(auth_tok-&gt;token.private_key.signature,</div><div class='ctx'> 				 ecryptfs_code_for_cipher_string(crypt_stat),</div><div class='del'>-				 crypt_stat, &amp;netlink_payload,</div><div class='del'>-				 &amp;netlink_payload_length);</div><div class='add'>+				 crypt_stat, &amp;payload, &amp;payload_len);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		ecryptfs_printk(KERN_ERR, "Error generating tag 66 packet\n");</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	rc = ecryptfs_send_message(ecryptfs_transport, netlink_payload,</div><div class='del'>-				   netlink_payload_length, &amp;msg_ctx);</div><div class='add'>+	rc = ecryptfs_send_message(payload, payload_len, &amp;msg_ctx);</div><div class='ctx'> 	if (rc) {</div><div class='del'>-		ecryptfs_printk(KERN_ERR, "Error sending netlink message\n");</div><div class='add'>+		ecryptfs_printk(KERN_ERR, "Error sending message to "</div><div class='add'>+				"ecryptfsd\n");</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	rc = ecryptfs_wait_for_response(msg_ctx, &amp;msg);</div><div class='hunk'>@@ -1364,8 +1363,7 @@ pki_encrypt_session_key(struct ecryptfs_auth_tok *auth_tok,</div><div class='ctx'> 		ecryptfs_printk(KERN_ERR, "Error parsing tag 67 packet\n");</div><div class='ctx'> 	kfree(msg);</div><div class='ctx'> out:</div><div class='del'>-	if (netlink_payload)</div><div class='del'>-		kfree(netlink_payload);</div><div class='add'>+	kfree(payload);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> /**</div><div class='head'>diff --git a/fs/ecryptfs/main.c b/fs/ecryptfs/main.c<br/>index 448dfd597b5f..046e027a4cb1 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/ecryptfs/main.c?id=c15895ef30c2c03e99802951787183039a349d32'>fs/ecryptfs/main.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/ecryptfs/main.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ecryptfs/main.c</a></div><div class='hunk'>@@ -30,7 +30,6 @@</div><div class='ctx'> #include &lt;linux/namei.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/crypto.h&gt;</div><div class='del'>-#include &lt;linux/netlink.h&gt;</div><div class='ctx'> #include &lt;linux/mount.h&gt;</div><div class='ctx'> #include &lt;linux/pagemap.h&gt;</div><div class='ctx'> #include &lt;linux/key.h&gt;</div><div class='hunk'>@@ -49,8 +48,7 @@ MODULE_PARM_DESC(ecryptfs_verbosity,</div><div class='ctx'> 		 "0, which is Quiet)");</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * Module parameter that defines the number of netlink message buffer</div><div class='del'>- * elements</div><div class='add'>+ * Module parameter that defines the number of message buffer elements</div><div class='ctx'>  */</div><div class='ctx'> unsigned int ecryptfs_message_buf_len = ECRYPTFS_DEFAULT_MSG_CTX_ELEMS;</div><div class='ctx'> </div><div class='hunk'>@@ -60,9 +58,9 @@ MODULE_PARM_DESC(ecryptfs_message_buf_len,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * Module parameter that defines the maximum guaranteed amount of time to wait</div><div class='del'>- * for a response through netlink.  The actual sleep time will be, more than</div><div class='add'>+ * for a response from ecryptfsd.  The actual sleep time will be, more than</div><div class='ctx'>  * likely, a small amount greater than this specified value, but only less if</div><div class='del'>- * the netlink message successfully arrives.</div><div class='add'>+ * the message successfully arrives.</div><div class='ctx'>  */</div><div class='ctx'> signed long ecryptfs_message_wait_timeout = ECRYPTFS_MAX_MSG_CTX_TTL / HZ;</div><div class='ctx'> </div><div class='hunk'>@@ -83,8 +81,6 @@ module_param(ecryptfs_number_of_users, uint, 0);</div><div class='ctx'> MODULE_PARM_DESC(ecryptfs_number_of_users, "An estimate of the number of "</div><div class='ctx'> 		 "concurrent users of eCryptfs");</div><div class='ctx'> </div><div class='del'>-unsigned int ecryptfs_transport = ECRYPTFS_DEFAULT_TRANSPORT;</div><div class='del'>-</div><div class='ctx'> void __ecryptfs_printk(const char *fmt, ...)</div><div class='ctx'> {</div><div class='ctx'> 	va_list args;</div><div class='hunk'>@@ -211,7 +207,7 @@ enum { ecryptfs_opt_sig, ecryptfs_opt_ecryptfs_sig,</div><div class='ctx'>        ecryptfs_opt_passthrough, ecryptfs_opt_xattr_metadata,</div><div class='ctx'>        ecryptfs_opt_encrypted_view, ecryptfs_opt_err };</div><div class='ctx'> </div><div class='del'>-static match_table_t tokens = {</div><div class='add'>+static const match_table_t tokens = {</div><div class='ctx'> 	{ecryptfs_opt_sig, "sig=%s"},</div><div class='ctx'> 	{ecryptfs_opt_ecryptfs_sig, "ecryptfs_sig=%s"},</div><div class='ctx'> 	{ecryptfs_opt_cipher, "cipher=%s"},</div><div class='hunk'>@@ -779,10 +775,11 @@ static int __init ecryptfs_init(void)</div><div class='ctx'> 		       "rc = [%d]\n", __func__, rc);</div><div class='ctx'> 		goto out_do_sysfs_unregistration;</div><div class='ctx'> 	}</div><div class='del'>-	rc = ecryptfs_init_messaging(ecryptfs_transport);</div><div class='add'>+	rc = ecryptfs_init_messaging();</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		printk(KERN_ERR "Failure occured while attempting to "</div><div class='del'>-				"initialize the eCryptfs netlink socket\n");</div><div class='add'>+				"initialize the communications channel to "</div><div class='add'>+				"ecryptfsd\n");</div><div class='ctx'> 		goto out_destroy_kthread;</div><div class='ctx'> 	}</div><div class='ctx'> 	rc = ecryptfs_init_crypto();</div><div class='hunk'>@@ -797,7 +794,7 @@ static int __init ecryptfs_init(void)</div><div class='ctx'> </div><div class='ctx'> 	goto out;</div><div class='ctx'> out_release_messaging:</div><div class='del'>-	ecryptfs_release_messaging(ecryptfs_transport);</div><div class='add'>+	ecryptfs_release_messaging();</div><div class='ctx'> out_destroy_kthread:</div><div class='ctx'> 	ecryptfs_destroy_kthread();</div><div class='ctx'> out_do_sysfs_unregistration:</div><div class='hunk'>@@ -818,7 +815,7 @@ static void __exit ecryptfs_exit(void)</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		printk(KERN_ERR "Failure whilst attempting to destroy crypto; "</div><div class='ctx'> 		       "rc = [%d]\n", rc);</div><div class='del'>-	ecryptfs_release_messaging(ecryptfs_transport);</div><div class='add'>+	ecryptfs_release_messaging();</div><div class='ctx'> 	ecryptfs_destroy_kthread();</div><div class='ctx'> 	do_sysfs_unregistration();</div><div class='ctx'> 	unregister_filesystem(&amp;ecryptfs_fs_type);</div><div class='head'>diff --git a/fs/ecryptfs/messaging.c b/fs/ecryptfs/messaging.c<br/>index 1b5c20058acb..c6983978a31e 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/ecryptfs/messaging.c?id=c15895ef30c2c03e99802951787183039a349d32'>fs/ecryptfs/messaging.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/ecryptfs/messaging.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ecryptfs/messaging.c</a></div><div class='hunk'>@@ -134,12 +134,11 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-ecryptfs_send_message_locked(unsigned int transport, char *data, int data_len,</div><div class='del'>-			     u8 msg_type, struct ecryptfs_msg_ctx **msg_ctx);</div><div class='add'>+ecryptfs_send_message_locked(char *data, int data_len, u8 msg_type,</div><div class='add'>+			     struct ecryptfs_msg_ctx **msg_ctx);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ecryptfs_send_raw_message</div><div class='del'>- * @transport: Transport type</div><div class='ctx'>  * @msg_type: Message type</div><div class='ctx'>  * @daemon: Daemon struct for recipient of message</div><div class='ctx'>  *</div><div class='hunk'>@@ -150,38 +149,25 @@ ecryptfs_send_message_locked(unsigned int transport, char *data, int data_len,</div><div class='ctx'>  *</div><div class='ctx'>  * Returns zero on success; non-zero otherwise</div><div class='ctx'>  */</div><div class='del'>-static int ecryptfs_send_raw_message(unsigned int transport, u8 msg_type,</div><div class='add'>+static int ecryptfs_send_raw_message(u8 msg_type,</div><div class='ctx'> 				     struct ecryptfs_daemon *daemon)</div><div class='ctx'> {</div><div class='ctx'> 	struct ecryptfs_msg_ctx *msg_ctx;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	switch(transport) {</div><div class='del'>-	case ECRYPTFS_TRANSPORT_NETLINK:</div><div class='del'>-		rc = ecryptfs_send_netlink(NULL, 0, NULL, msg_type, 0,</div><div class='del'>-					   daemon-&gt;pid);</div><div class='del'>-		break;</div><div class='del'>-	case ECRYPTFS_TRANSPORT_MISCDEV:</div><div class='del'>-		rc = ecryptfs_send_message_locked(transport, NULL, 0, msg_type,</div><div class='del'>-						  &amp;msg_ctx);</div><div class='del'>-		if (rc) {</div><div class='del'>-			printk(KERN_ERR "%s: Error whilst attempting to send "</div><div class='del'>-			       "message via procfs; rc = [%d]\n", __func__, rc);</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-		/* Raw messages are logically context-free (e.g., no</div><div class='del'>-		 * reply is expected), so we set the state of the</div><div class='del'>-		 * ecryptfs_msg_ctx object to indicate that it should</div><div class='del'>-		 * be freed as soon as the transport sends out the message. */</div><div class='del'>-		mutex_lock(&amp;msg_ctx-&gt;mux);</div><div class='del'>-		msg_ctx-&gt;state = ECRYPTFS_MSG_CTX_STATE_NO_REPLY;</div><div class='del'>-		mutex_unlock(&amp;msg_ctx-&gt;mux);</div><div class='del'>-		break;</div><div class='del'>-	case ECRYPTFS_TRANSPORT_CONNECTOR:</div><div class='del'>-	case ECRYPTFS_TRANSPORT_RELAYFS:</div><div class='del'>-	default:</div><div class='del'>-		rc = -ENOSYS;</div><div class='add'>+	rc = ecryptfs_send_message_locked(NULL, 0, msg_type, &amp;msg_ctx);</div><div class='add'>+	if (rc) {</div><div class='add'>+		printk(KERN_ERR "%s: Error whilst attempting to send "</div><div class='add'>+		       "message to ecryptfsd; rc = [%d]\n", __func__, rc);</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='add'>+	/* Raw messages are logically context-free (e.g., no</div><div class='add'>+	 * reply is expected), so we set the state of the</div><div class='add'>+	 * ecryptfs_msg_ctx object to indicate that it should</div><div class='add'>+	 * be freed as soon as the message is sent. */</div><div class='add'>+	mutex_lock(&amp;msg_ctx-&gt;mux);</div><div class='add'>+	msg_ctx-&gt;state = ECRYPTFS_MSG_CTX_STATE_NO_REPLY;</div><div class='add'>+	mutex_unlock(&amp;msg_ctx-&gt;mux);</div><div class='ctx'> out:</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='hunk'>@@ -227,7 +213,6 @@ out:</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ecryptfs_process_helo</div><div class='del'>- * @transport: The underlying transport (netlink, etc.)</div><div class='ctx'>  * @euid: The user ID owner of the message</div><div class='ctx'>  * @user_ns: The namespace in which @euid applies</div><div class='ctx'>  * @pid: The process ID for the userspace program that sent the</div><div class='hunk'>@@ -239,8 +224,8 @@ out:</div><div class='ctx'>  * Returns zero after adding a new daemon to the hash list;</div><div class='ctx'>  * non-zero otherwise.</div><div class='ctx'>  */</div><div class='del'>-int ecryptfs_process_helo(unsigned int transport, uid_t euid,</div><div class='del'>-			  struct user_namespace *user_ns, struct pid *pid)</div><div class='add'>+int ecryptfs_process_helo(uid_t euid, struct user_namespace *user_ns,</div><div class='add'>+			  struct pid *pid)</div><div class='ctx'> {</div><div class='ctx'> 	struct ecryptfs_daemon *new_daemon;</div><div class='ctx'> 	struct ecryptfs_daemon *old_daemon;</div><div class='hunk'>@@ -252,8 +237,7 @@ int ecryptfs_process_helo(unsigned int transport, uid_t euid,</div><div class='ctx'> 		printk(KERN_WARNING "Received request from user [%d] "</div><div class='ctx'> 		       "to register daemon [0x%p]; unregistering daemon "</div><div class='ctx'> 		       "[0x%p]\n", euid, pid, old_daemon-&gt;pid);</div><div class='del'>-		rc = ecryptfs_send_raw_message(transport, ECRYPTFS_MSG_QUIT,</div><div class='del'>-					       old_daemon);</div><div class='add'>+		rc = ecryptfs_send_raw_message(ECRYPTFS_MSG_QUIT, old_daemon);</div><div class='ctx'> 		if (rc)</div><div class='ctx'> 			printk(KERN_WARNING "Failed to send QUIT "</div><div class='ctx'> 			       "message to daemon [0x%p]; rc = [%d]\n",</div><div class='hunk'>@@ -467,8 +451,6 @@ out:</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ecryptfs_send_message_locked</div><div class='del'>- * @transport: The transport over which to send the message (i.e.,</div><div class='del'>- *             netlink)</div><div class='ctx'>  * @data: The data to send</div><div class='ctx'>  * @data_len: The length of data</div><div class='ctx'>  * @msg_ctx: The message context allocated for the send</div><div class='hunk'>@@ -478,8 +460,8 @@ out:</div><div class='ctx'>  * Returns zero on success; non-zero otherwise</div><div class='ctx'>  */</div><div class='ctx'> static int</div><div class='del'>-ecryptfs_send_message_locked(unsigned int transport, char *data, int data_len,</div><div class='del'>-			     u8 msg_type, struct ecryptfs_msg_ctx **msg_ctx)</div><div class='add'>+ecryptfs_send_message_locked(char *data, int data_len, u8 msg_type,</div><div class='add'>+			     struct ecryptfs_msg_ctx **msg_ctx)</div><div class='ctx'> {</div><div class='ctx'> 	struct ecryptfs_daemon *daemon;</div><div class='ctx'> 	int rc;</div><div class='hunk'>@@ -503,20 +485,8 @@ ecryptfs_send_message_locked(unsigned int transport, char *data, int data_len,</div><div class='ctx'> 	ecryptfs_msg_ctx_free_to_alloc(*msg_ctx);</div><div class='ctx'> 	mutex_unlock(&amp;(*msg_ctx)-&gt;mux);</div><div class='ctx'> 	mutex_unlock(&amp;ecryptfs_msg_ctx_lists_mux);</div><div class='del'>-	switch (transport) {</div><div class='del'>-	case ECRYPTFS_TRANSPORT_NETLINK:</div><div class='del'>-		rc = ecryptfs_send_netlink(data, data_len, *msg_ctx, msg_type,</div><div class='del'>-					   0, daemon-&gt;pid);</div><div class='del'>-		break;</div><div class='del'>-	case ECRYPTFS_TRANSPORT_MISCDEV:</div><div class='del'>-		rc = ecryptfs_send_miscdev(data, data_len, *msg_ctx, msg_type,</div><div class='del'>-					   0, daemon);</div><div class='del'>-		break;</div><div class='del'>-	case ECRYPTFS_TRANSPORT_CONNECTOR:</div><div class='del'>-	case ECRYPTFS_TRANSPORT_RELAYFS:</div><div class='del'>-	default:</div><div class='del'>-		rc = -ENOSYS;</div><div class='del'>-	}</div><div class='add'>+	rc = ecryptfs_send_miscdev(data, data_len, *msg_ctx, msg_type, 0,</div><div class='add'>+				   daemon);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		printk(KERN_ERR "%s: Error attempting to send message to "</div><div class='ctx'> 		       "userspace daemon; rc = [%d]\n", __func__, rc);</div><div class='hunk'>@@ -526,8 +496,6 @@ out:</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ecryptfs_send_message</div><div class='del'>- * @transport: The transport over which to send the message (i.e.,</div><div class='del'>- *             netlink)</div><div class='ctx'>  * @data: The data to send</div><div class='ctx'>  * @data_len: The length of data</div><div class='ctx'>  * @msg_ctx: The message context allocated for the send</div><div class='hunk'>@@ -536,14 +504,14 @@ out:</div><div class='ctx'>  *</div><div class='ctx'>  * Returns zero on success; non-zero otherwise</div><div class='ctx'>  */</div><div class='del'>-int ecryptfs_send_message(unsigned int transport, char *data, int data_len,</div><div class='add'>+int ecryptfs_send_message(char *data, int data_len,</div><div class='ctx'> 			  struct ecryptfs_msg_ctx **msg_ctx)</div><div class='ctx'> {</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;ecryptfs_daemon_hash_mux);</div><div class='del'>-	rc = ecryptfs_send_message_locked(transport, data, data_len,</div><div class='del'>-					  ECRYPTFS_MSG_REQUEST, msg_ctx);</div><div class='add'>+	rc = ecryptfs_send_message_locked(data, data_len, ECRYPTFS_MSG_REQUEST,</div><div class='add'>+					  msg_ctx);</div><div class='ctx'> 	mutex_unlock(&amp;ecryptfs_daemon_hash_mux);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='hunk'>@@ -586,7 +554,7 @@ sleep:</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ecryptfs_init_messaging(unsigned int transport)</div><div class='add'>+int ecryptfs_init_messaging(void)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	int rc = 0;</div><div class='hunk'>@@ -639,27 +607,14 @@ int ecryptfs_init_messaging(unsigned int transport)</div><div class='ctx'> 		mutex_unlock(&amp;ecryptfs_msg_ctx_arr[i].mux);</div><div class='ctx'> 	}</div><div class='ctx'> 	mutex_unlock(&amp;ecryptfs_msg_ctx_lists_mux);</div><div class='del'>-	switch(transport) {</div><div class='del'>-	case ECRYPTFS_TRANSPORT_NETLINK:</div><div class='del'>-		rc = ecryptfs_init_netlink();</div><div class='del'>-		if (rc)</div><div class='del'>-			ecryptfs_release_messaging(transport);</div><div class='del'>-		break;</div><div class='del'>-	case ECRYPTFS_TRANSPORT_MISCDEV:</div><div class='del'>-		rc = ecryptfs_init_ecryptfs_miscdev();</div><div class='del'>-		if (rc)</div><div class='del'>-			ecryptfs_release_messaging(transport);</div><div class='del'>-		break;</div><div class='del'>-	case ECRYPTFS_TRANSPORT_CONNECTOR:</div><div class='del'>-	case ECRYPTFS_TRANSPORT_RELAYFS:</div><div class='del'>-	default:</div><div class='del'>-		rc = -ENOSYS;</div><div class='del'>-	}</div><div class='add'>+	rc = ecryptfs_init_ecryptfs_miscdev();</div><div class='add'>+	if (rc)</div><div class='add'>+		ecryptfs_release_messaging();</div><div class='ctx'> out:</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void ecryptfs_release_messaging(unsigned int transport)</div><div class='add'>+void ecryptfs_release_messaging(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (ecryptfs_msg_ctx_arr) {</div><div class='ctx'> 		int i;</div><div class='hunk'>@@ -698,17 +653,6 @@ void ecryptfs_release_messaging(unsigned int transport)</div><div class='ctx'> 		kfree(ecryptfs_daemon_hash);</div><div class='ctx'> 		mutex_unlock(&amp;ecryptfs_daemon_hash_mux);</div><div class='ctx'> 	}</div><div class='del'>-	switch(transport) {</div><div class='del'>-	case ECRYPTFS_TRANSPORT_NETLINK:</div><div class='del'>-		ecryptfs_release_netlink();</div><div class='del'>-		break;</div><div class='del'>-	case ECRYPTFS_TRANSPORT_MISCDEV:</div><div class='del'>-		ecryptfs_destroy_ecryptfs_miscdev();</div><div class='del'>-		break;</div><div class='del'>-	case ECRYPTFS_TRANSPORT_CONNECTOR:</div><div class='del'>-	case ECRYPTFS_TRANSPORT_RELAYFS:</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='add'>+	ecryptfs_destroy_ecryptfs_miscdev();</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/ecryptfs/mmap.c b/fs/ecryptfs/mmap.c<br/>index 245c2dc02d5c..04d7b3fa1ac6 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/ecryptfs/mmap.c?id=c15895ef30c2c03e99802951787183039a349d32'>fs/ecryptfs/mmap.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/ecryptfs/mmap.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/ecryptfs/mmap.c</a></div><div class='hunk'>@@ -265,22 +265,34 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ecryptfs_prepare_write</div><div class='add'>+ * ecryptfs_write_begin</div><div class='ctx'>  * @file: The eCryptfs file</div><div class='del'>- * @page: The eCryptfs page</div><div class='del'>- * @from: The start byte from which we will write</div><div class='del'>- * @to: The end byte to which we will write</div><div class='add'>+ * @mapping: The eCryptfs object</div><div class='add'>+ * @pos: The file offset at which to start writing</div><div class='add'>+ * @len: Length of the write</div><div class='add'>+ * @flags: Various flags</div><div class='add'>+ * @pagep: Pointer to return the page</div><div class='add'>+ * @fsdata: Pointer to return fs data (unused)</div><div class='ctx'>  *</div><div class='ctx'>  * This function must zero any hole we create</div><div class='ctx'>  *</div><div class='ctx'>  * Returns zero on success; non-zero otherwise</div><div class='ctx'>  */</div><div class='del'>-static int ecryptfs_prepare_write(struct file *file, struct page *page,</div><div class='del'>-				  unsigned from, unsigned to)</div><div class='add'>+static int ecryptfs_write_begin(struct file *file,</div><div class='add'>+			struct address_space *mapping,</div><div class='add'>+			loff_t pos, unsigned len, unsigned flags,</div><div class='add'>+			struct page **pagep, void **fsdata)</div><div class='ctx'> {</div><div class='add'>+	pgoff_t index = pos &gt;&gt; PAGE_CACHE_SHIFT;</div><div class='add'>+	struct page *page;</div><div class='ctx'> 	loff_t prev_page_end_size;</div><div class='ctx'> 	int rc = 0;</div><div class='ctx'> </div><div class='add'>+	page = __grab_cache_page(mapping, index);</div><div class='add'>+	if (!page)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	*pagep = page;</div><div class='add'>+</div><div class='ctx'> 	if (!PageUptodate(page)) {</div><div class='ctx'> 		struct ecryptfs_crypt_stat *crypt_stat =</div><div class='ctx'> 			&amp;ecryptfs_inode_to_private(</div><div class='hunk'>@@ -289,8 +301,7 @@ static int ecryptfs_prepare_write(struct file *file, struct page *page,</div><div class='ctx'> 		if (!(crypt_stat-&gt;flags &amp; ECRYPTFS_ENCRYPTED)</div><div class='ctx'> 		    || (crypt_stat-&gt;flags &amp; ECRYPTFS_NEW_FILE)) {</div><div class='ctx'> 			rc = ecryptfs_read_lower_page_segment(</div><div class='del'>-				page, page-&gt;index, 0, PAGE_CACHE_SIZE,</div><div class='del'>-				page-&gt;mapping-&gt;host);</div><div class='add'>+				page, index, 0, PAGE_CACHE_SIZE, mapping-&gt;host);</div><div class='ctx'> 			if (rc) {</div><div class='ctx'> 				printk(KERN_ERR "%s: Error attemping to read "</div><div class='ctx'> 				       "lower page segment; rc = [%d]\n",</div><div class='hunk'>@@ -316,8 +327,8 @@ static int ecryptfs_prepare_write(struct file *file, struct page *page,</div><div class='ctx'> 				SetPageUptodate(page);</div><div class='ctx'> 			} else {</div><div class='ctx'> 				rc = ecryptfs_read_lower_page_segment(</div><div class='del'>-					page, page-&gt;index, 0, PAGE_CACHE_SIZE,</div><div class='del'>-					page-&gt;mapping-&gt;host);</div><div class='add'>+					page, index, 0, PAGE_CACHE_SIZE,</div><div class='add'>+					mapping-&gt;host);</div><div class='ctx'> 				if (rc) {</div><div class='ctx'> 					printk(KERN_ERR "%s: Error reading "</div><div class='ctx'> 					       "page; rc = [%d]\n",</div><div class='hunk'>@@ -339,10 +350,10 @@ static int ecryptfs_prepare_write(struct file *file, struct page *page,</div><div class='ctx'> 			SetPageUptodate(page);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	prev_page_end_size = ((loff_t)page-&gt;index &lt;&lt; PAGE_CACHE_SHIFT);</div><div class='add'>+	prev_page_end_size = ((loff_t)index &lt;&lt; PAGE_CACHE_SHIFT);</div><div class='ctx'> 	/* If creating a page or more of holes, zero them out via truncate.</div><div class='ctx'> 	 * Note, this will increase i_size. */</div><div class='del'>-	if (page-&gt;index != 0) {</div><div class='add'>+	if (index != 0) {</div><div class='ctx'> 		if (prev_page_end_size &gt; i_size_read(page-&gt;mapping-&gt;host)) {</div><div class='ctx'> 			rc = ecryptfs_truncate(file-&gt;f_path.dentry,</div><div class='ctx'> 					       prev_page_end_size);</div><div class='hunk'>@@ -357,8 +368,8 @@ static int ecryptfs_prepare_write(struct file *file, struct page *page,</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Writing to a new page, and creating a small hole from start</div><div class='ctx'> 	 * of page?  Zero it out. */</div><div class='del'>-	if ((i_size_read(page-&gt;mapping-&gt;host) == prev_page_end_size)</div><div class='del'>-	    &amp;&amp; (from != 0))</div><div class='add'>+	if ((i_size_read(mapping-&gt;host) == prev_page_end_size)</div><div class='add'>+	    &amp;&amp; (pos != 0))</div><div class='ctx'> 		zero_user(page, 0, PAGE_CACHE_SIZE);</div><div class='ctx'> out:</div><div class='ctx'> 	return rc;</div><div class='hunk'>@@ -445,21 +456,28 @@ int ecryptfs_write_inode_size_to_metadata(struct inode *ecryptfs_inode)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ecryptfs_commit_write</div><div class='add'>+ * ecryptfs_write_end</div><div class='ctx'>  * @file: The eCryptfs file object</div><div class='add'>+ * @mapping: The eCryptfs object</div><div class='add'>+ * @pos: The file position</div><div class='add'>+ * @len: The length of the data (unused)</div><div class='add'>+ * @copied: The amount of data copied</div><div class='ctx'>  * @page: The eCryptfs page</div><div class='del'>- * @from: Ignored (we rotate the page IV on each write)</div><div class='del'>- * @to: Ignored</div><div class='add'>+ * @fsdata: The fsdata (unused)</div><div class='ctx'>  *</div><div class='ctx'>  * This is where we encrypt the data and pass the encrypted data to</div><div class='ctx'>  * the lower filesystem.  In OpenPGP-compatible mode, we operate on</div><div class='ctx'>  * entire underlying packets.</div><div class='ctx'>  */</div><div class='del'>-static int ecryptfs_commit_write(struct file *file, struct page *page,</div><div class='del'>-				 unsigned from, unsigned to)</div><div class='add'>+static int ecryptfs_write_end(struct file *file,</div><div class='add'>+			struct address_space *mapping,</div><div class='add'>+			loff_t pos, unsigned len, unsigned copied,</div><div class='add'>+			struct page *page, void *fsdata)</div><div class='ctx'> {</div><div class='del'>-	loff_t pos;</div><div class='del'>-	struct inode *ecryptfs_inode = page-&gt;mapping-&gt;host;</div><div class='add'>+	pgoff_t index = pos &gt;&gt; PAGE_CACHE_SHIFT;</div><div class='add'>+	unsigned from = pos &amp; (PAGE_CACHE_SIZE - 1);</div><div class='add'>+	unsigned to = from + copied;</div><div class='add'>+	struct inode *ecryptfs_inode = mapping-&gt;host;</div><div class='ctx'> 	struct ecryptfs_crypt_stat *crypt_stat =</div><div class='ctx'> 		&amp;ecryptfs_inode_to_private(file-&gt;f_path.dentry-&gt;d_inode)-&gt;crypt_stat;</div><div class='ctx'> 	int rc;</div><div class='hunk'>@@ -471,25 +489,22 @@ static int ecryptfs_commit_write(struct file *file, struct page *page,</div><div class='ctx'> 	} else</div><div class='ctx'> 		ecryptfs_printk(KERN_DEBUG, "Not a new file\n");</div><div class='ctx'> 	ecryptfs_printk(KERN_DEBUG, "Calling fill_zeros_to_end_of_page"</div><div class='del'>-			"(page w/ index = [0x%.16x], to = [%d])\n", page-&gt;index,</div><div class='del'>-			to);</div><div class='add'>+			"(page w/ index = [0x%.16x], to = [%d])\n", index, to);</div><div class='ctx'> 	/* Fills in zeros if 'to' goes beyond inode size */</div><div class='ctx'> 	rc = fill_zeros_to_end_of_page(page, to);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		ecryptfs_printk(KERN_WARNING, "Error attempting to fill "</div><div class='del'>-				"zeros in page with index = [0x%.16x]\n",</div><div class='del'>-				page-&gt;index);</div><div class='add'>+			"zeros in page with index = [0x%.16x]\n", index);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	rc = ecryptfs_encrypt_page(page);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		ecryptfs_printk(KERN_WARNING, "Error encrypting page (upper "</div><div class='del'>-				"index [0x%.16x])\n", page-&gt;index);</div><div class='add'>+				"index [0x%.16x])\n", index);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	pos = (((loff_t)page-&gt;index) &lt;&lt; PAGE_CACHE_SHIFT) + to;</div><div class='del'>-	if (pos &gt; i_size_read(ecryptfs_inode)) {</div><div class='del'>-		i_size_write(ecryptfs_inode, pos);</div><div class='add'>+	if (pos + copied &gt; i_size_read(ecryptfs_inode)) {</div><div class='add'>+		i_size_write(ecryptfs_inode, pos + copied);</div><div class='ctx'> 		ecryptfs_printk(KERN_DEBUG, "Expanded file size to "</div><div class='ctx'> 				"[0x%.16x]\n", i_size_read(ecryptfs_inode));</div><div class='ctx'> 	}</div><div class='hunk'>@@ -497,7 +512,11 @@ static int ecryptfs_commit_write(struct file *file, struct page *page,</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		printk(KERN_ERR "Error writing inode size to metadata; "</div><div class='ctx'> 		       "rc = [%d]\n", rc);</div><div class='add'>+	else</div><div class='add'>+		rc = copied;</div><div class='ctx'> out:</div><div class='add'>+	unlock_page(page);</div><div class='add'>+	page_cache_release(page);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -518,7 +537,7 @@ static sector_t ecryptfs_bmap(struct address_space *mapping, sector_t block)</div><div class='ctx'> struct address_space_operations ecryptfs_aops = {</div><div class='ctx'> 	.writepage = ecryptfs_writepage,</div><div class='ctx'> 	.readpage = ecryptfs_readpage,</div><div class='del'>-	.prepare_write = ecryptfs_prepare_write,</div><div class='del'>-	.commit_write = ecryptfs_commit_write,</div><div class='add'>+	.write_begin = ecryptfs_write_begin,</div><div class='add'>+	.write_end = ecryptfs_write_end,</div><div class='ctx'> 	.bmap = ecryptfs_bmap,</div><div class='ctx'> };</div><div class='head'>diff --git a/fs/ecryptfs/netlink.c b/fs/ecryptfs/netlink.c<br/>deleted file mode 100644<br/>index e0abad62b395..000000000000<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/ecryptfs/netlink.c?id=c15895ef30c2c03e99802951787183039a349d32'>fs/ecryptfs/netlink.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,249 +0,0 @@</div><div class='del'>-/**</div><div class='del'>- * eCryptfs: Linux filesystem encryption layer</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2004-2006 International Business Machines Corp.</div><div class='del'>- *   Author(s): Michael A. Halcrow &lt;mhalcrow@us.ibm.com&gt;</div><div class='del'>- *		Tyler Hicks &lt;tyhicks@ou.edu&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of the GNU General Public License version</div><div class='del'>- * 2 as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA</div><div class='del'>- * 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;net/sock.h&gt;</div><div class='del'>-#include &lt;linux/hash.h&gt;</div><div class='del'>-#include &lt;linux/random.h&gt;</div><div class='del'>-#include "ecryptfs_kernel.h"</div><div class='del'>-</div><div class='del'>-static struct sock *ecryptfs_nl_sock;</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ecryptfs_send_netlink</div><div class='del'>- * @data: The data to include as the payload</div><div class='del'>- * @data_len: The byte count of the data</div><div class='del'>- * @msg_ctx: The netlink context that will be used to handle the</div><div class='del'>- *          response message</div><div class='del'>- * @msg_type: The type of netlink message to send</div><div class='del'>- * @msg_flags: The flags to include in the netlink header</div><div class='del'>- * @daemon_pid: The process id of the daemon to send the message to</div><div class='del'>- *</div><div class='del'>- * Sends the data to the specified daemon pid and uses the netlink</div><div class='del'>- * context element to store the data needed for validation upon</div><div class='del'>- * receiving the response.  The data and the netlink context can be</div><div class='del'>- * null if just sending a netlink header is sufficient.  Returns zero</div><div class='del'>- * upon sending the message; non-zero upon error.</div><div class='del'>- */</div><div class='del'>-int ecryptfs_send_netlink(char *data, int data_len,</div><div class='del'>-			  struct ecryptfs_msg_ctx *msg_ctx, u8 msg_type,</div><div class='del'>-			  u16 msg_flags, struct pid *daemon_pid)</div><div class='del'>-{</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	struct nlmsghdr *nlh;</div><div class='del'>-	struct ecryptfs_message *msg;</div><div class='del'>-	size_t payload_len;</div><div class='del'>-	int rc;</div><div class='del'>-</div><div class='del'>-	payload_len = ((data &amp;&amp; data_len) ? (sizeof(*msg) + data_len) : 0);</div><div class='del'>-	skb = alloc_skb(NLMSG_SPACE(payload_len), GFP_KERNEL);</div><div class='del'>-	if (!skb) {</div><div class='del'>-		rc = -ENOMEM;</div><div class='del'>-		ecryptfs_printk(KERN_ERR, "Failed to allocate socket buffer\n");</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-	nlh = NLMSG_PUT(skb, pid_nr(daemon_pid), msg_ctx ? msg_ctx-&gt;counter : 0,</div><div class='del'>-			msg_type, payload_len);</div><div class='del'>-	nlh-&gt;nlmsg_flags = msg_flags;</div><div class='del'>-	if (msg_ctx &amp;&amp; payload_len) {</div><div class='del'>-		msg = (struct ecryptfs_message *)NLMSG_DATA(nlh);</div><div class='del'>-		msg-&gt;index = msg_ctx-&gt;index;</div><div class='del'>-		msg-&gt;data_len = data_len;</div><div class='del'>-		memcpy(msg-&gt;data, data, data_len);</div><div class='del'>-	}</div><div class='del'>-	rc = netlink_unicast(ecryptfs_nl_sock, skb, pid_nr(daemon_pid), 0);</div><div class='del'>-	if (rc &lt; 0) {</div><div class='del'>-		ecryptfs_printk(KERN_ERR, "Failed to send eCryptfs netlink "</div><div class='del'>-				"message; rc = [%d]\n", rc);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-	rc = 0;</div><div class='del'>-	goto out;</div><div class='del'>-nlmsg_failure:</div><div class='del'>-	rc = -EMSGSIZE;</div><div class='del'>-	kfree_skb(skb);</div><div class='del'>-out:</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ecryptfs_process_nl_reponse</div><div class='del'>- * @skb: The socket buffer containing the netlink message of state</div><div class='del'>- *       RESPONSE</div><div class='del'>- *</div><div class='del'>- * Processes a response message after sending a operation request to</div><div class='del'>- * userspace.  Attempts to assign the msg to a netlink context element</div><div class='del'>- * at the index specified in the msg.  The sk_buff and nlmsghdr must</div><div class='del'>- * be validated before this function. Returns zero upon delivery to</div><div class='del'>- * desired context element; non-zero upon delivery failure or error.</div><div class='del'>- */</div><div class='del'>-static int ecryptfs_process_nl_response(struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct nlmsghdr *nlh = nlmsg_hdr(skb);</div><div class='del'>-	struct ecryptfs_message *msg = NLMSG_DATA(nlh);</div><div class='del'>-	struct pid *pid;</div><div class='del'>-	int rc;</div><div class='del'>-</div><div class='del'>-	if (skb-&gt;len - NLMSG_HDRLEN - sizeof(*msg) != msg-&gt;data_len) {</div><div class='del'>-		rc = -EINVAL;</div><div class='del'>-		ecryptfs_printk(KERN_ERR, "Received netlink message with "</div><div class='del'>-				"incorrectly specified data length\n");</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-	pid = find_get_pid(NETLINK_CREDS(skb)-&gt;pid);</div><div class='del'>-	rc = ecryptfs_process_response(msg, NETLINK_CREDS(skb)-&gt;uid, NULL,</div><div class='del'>-				       pid, nlh-&gt;nlmsg_seq);</div><div class='del'>-	put_pid(pid);</div><div class='del'>-	if (rc)</div><div class='del'>-		printk(KERN_ERR</div><div class='del'>-		       "Error processing response message; rc = [%d]\n", rc);</div><div class='del'>-out:</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ecryptfs_process_nl_helo</div><div class='del'>- * @skb: The socket buffer containing the nlmsghdr in HELO state</div><div class='del'>- *</div><div class='del'>- * Gets uid and pid of the skb and adds the values to the daemon id</div><div class='del'>- * hash. Returns zero after adding a new daemon id to the hash list;</div><div class='del'>- * non-zero otherwise.</div><div class='del'>- */</div><div class='del'>-static int ecryptfs_process_nl_helo(struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct pid *pid;</div><div class='del'>-	int rc;</div><div class='del'>-</div><div class='del'>-	pid = find_get_pid(NETLINK_CREDS(skb)-&gt;pid);</div><div class='del'>-	rc = ecryptfs_process_helo(ECRYPTFS_TRANSPORT_NETLINK,</div><div class='del'>-				   NETLINK_CREDS(skb)-&gt;uid, NULL, pid);</div><div class='del'>-	put_pid(pid);</div><div class='del'>-	if (rc)</div><div class='del'>-		printk(KERN_WARNING "Error processing HELO; rc = [%d]\n", rc);</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ecryptfs_process_nl_quit</div><div class='del'>- * @skb: The socket buffer containing the nlmsghdr in QUIT state</div><div class='del'>- *</div><div class='del'>- * Gets uid and pid of the skb and deletes the corresponding daemon</div><div class='del'>- * id, if it is the registered that is requesting the</div><div class='del'>- * deletion. Returns zero after deleting the desired daemon id;</div><div class='del'>- * non-zero otherwise.</div><div class='del'>- */</div><div class='del'>-static int ecryptfs_process_nl_quit(struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct pid *pid;</div><div class='del'>-	int rc;</div><div class='del'>-</div><div class='del'>-	pid = find_get_pid(NETLINK_CREDS(skb)-&gt;pid);</div><div class='del'>-	rc = ecryptfs_process_quit(NETLINK_CREDS(skb)-&gt;uid, NULL, pid);</div><div class='del'>-	put_pid(pid);</div><div class='del'>-	if (rc)</div><div class='del'>-		printk(KERN_WARNING</div><div class='del'>-		       "Error processing QUIT message; rc = [%d]\n", rc);</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ecryptfs_receive_nl_message</div><div class='del'>- *</div><div class='del'>- * Callback function called by netlink system when a message arrives.</div><div class='del'>- * If the message looks to be valid, then an attempt is made to assign</div><div class='del'>- * it to its desired netlink context element and wake up the process</div><div class='del'>- * that is waiting for a response.</div><div class='del'>- */</div><div class='del'>-static void ecryptfs_receive_nl_message(struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct nlmsghdr *nlh;</div><div class='del'>-</div><div class='del'>-	nlh = nlmsg_hdr(skb);</div><div class='del'>-	if (!NLMSG_OK(nlh, skb-&gt;len)) {</div><div class='del'>-		ecryptfs_printk(KERN_ERR, "Received corrupt netlink "</div><div class='del'>-				"message\n");</div><div class='del'>-		goto free;</div><div class='del'>-	}</div><div class='del'>-	switch (nlh-&gt;nlmsg_type) {</div><div class='del'>-		case ECRYPTFS_MSG_RESPONSE:</div><div class='del'>-			if (ecryptfs_process_nl_response(skb)) {</div><div class='del'>-				ecryptfs_printk(KERN_WARNING, "Failed to "</div><div class='del'>-						"deliver netlink response to "</div><div class='del'>-						"requesting operation\n");</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case ECRYPTFS_MSG_HELO:</div><div class='del'>-			if (ecryptfs_process_nl_helo(skb)) {</div><div class='del'>-				ecryptfs_printk(KERN_WARNING, "Failed to "</div><div class='del'>-						"fulfill HELO request\n");</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case ECRYPTFS_MSG_QUIT:</div><div class='del'>-			if (ecryptfs_process_nl_quit(skb)) {</div><div class='del'>-				ecryptfs_printk(KERN_WARNING, "Failed to "</div><div class='del'>-						"fulfill QUIT request\n");</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			ecryptfs_printk(KERN_WARNING, "Dropping netlink "</div><div class='del'>-					"message of unrecognized type [%d]\n",</div><div class='del'>-					nlh-&gt;nlmsg_type);</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-free:</div><div class='del'>-	kfree_skb(skb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ecryptfs_init_netlink</div><div class='del'>- *</div><div class='del'>- * Initializes the daemon id hash list, netlink context array, and</div><div class='del'>- * necessary locks.  Returns zero upon success; non-zero upon error.</div><div class='del'>- */</div><div class='del'>-int ecryptfs_init_netlink(void)</div><div class='del'>-{</div><div class='del'>-	int rc;</div><div class='del'>-</div><div class='del'>-	ecryptfs_nl_sock = netlink_kernel_create(&amp;init_net, NETLINK_ECRYPTFS, 0,</div><div class='del'>-						 ecryptfs_receive_nl_message,</div><div class='del'>-						 NULL, THIS_MODULE);</div><div class='del'>-	if (!ecryptfs_nl_sock) {</div><div class='del'>-		rc = -EIO;</div><div class='del'>-		ecryptfs_printk(KERN_ERR, "Failed to create netlink socket\n");</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-	ecryptfs_nl_sock-&gt;sk_sndtimeo = ECRYPTFS_DEFAULT_SEND_TIMEOUT;</div><div class='del'>-	rc = 0;</div><div class='del'>-out:</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ecryptfs_release_netlink</div><div class='del'>- *</div><div class='del'>- * Frees all memory used by the netlink context array and releases the</div><div class='del'>- * netlink socket.</div><div class='del'>- */</div><div class='del'>-void ecryptfs_release_netlink(void)</div><div class='del'>-{</div><div class='del'>-	netlink_kernel_release(ecryptfs_nl_sock);</div><div class='del'>-	ecryptfs_nl_sock = NULL;</div><div class='del'>-}</div><div class='head'>diff --git a/fs/efs/super.c b/fs/efs/super.c<br/>index 567b134fa1f1..73b19cfc91fc 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/efs/super.c?id=c15895ef30c2c03e99802951787183039a349d32'>fs/efs/super.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/efs/super.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/efs/super.c</a></div><div class='hunk'>@@ -341,8 +341,6 @@ static int efs_statfs(struct dentry *dentry, struct kstatfs *buf) {</div><div class='ctx'> 			sb-&gt;inode_blocks *</div><div class='ctx'> 			(EFS_BLOCKSIZE / sizeof(struct efs_dinode));</div><div class='ctx'> 	buf-&gt;f_ffree   = sb-&gt;inode_free;	/* free inodes */</div><div class='del'>-	buf-&gt;f_fsid.val[0] = (sb-&gt;fs_magic &gt;&gt; 16) &amp; 0xffff; /* fs ID */</div><div class='del'>-	buf-&gt;f_fsid.val[1] =  sb-&gt;fs_magic        &amp; 0xffff; /* fs ID */</div><div class='ctx'> 	buf-&gt;f_namelen = EFS_MAXNAMELEN;	/* max filename length */</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/fs/eventpoll.c b/fs/eventpoll.c<br/>index 7cc0eb756b55..99368bda0261 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/eventpoll.c?id=c15895ef30c2c03e99802951787183039a349d32'>fs/eventpoll.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/eventpoll.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/eventpoll.c</a></div><div class='hunk'>@@ -927,14 +927,11 @@ errxit:</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * During the time we spent in the loop above, some other events</div><div class='ctx'> 	 * might have been queued by the poll callback. We re-insert them</div><div class='del'>-	 * here (in case they are not already queued, or they're one-shot).</div><div class='add'>+	 * inside the main ready-list here.</div><div class='ctx'> 	 */</div><div class='ctx'> 	for (nepi = ep-&gt;ovflist; (epi = nepi) != NULL;</div><div class='del'>-	     nepi = epi-&gt;next, epi-&gt;next = EP_UNACTIVE_PTR) {</div><div class='del'>-		if (!ep_is_linked(&amp;epi-&gt;rdllink) &amp;&amp;</div><div class='del'>-		    (epi-&gt;event.events &amp; ~EP_PRIVATE_BITS))</div><div class='del'>-			list_add_tail(&amp;epi-&gt;rdllink, &amp;ep-&gt;rdllist);</div><div class='del'>-	}</div><div class='add'>+	     nepi = epi-&gt;next, epi-&gt;next = EP_UNACTIVE_PTR)</div><div class='add'>+		list_add_tail(&amp;epi-&gt;rdllink, &amp;ep-&gt;rdllist);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We need to set back ep-&gt;ovflist to EP_UNACTIVE_PTR, so that after</div><div class='ctx'> 	 * releasing the lock, events will be queued in the normal way inside</div><div class='head'>diff --git a/fs/exec.c b/fs/exec.c<br/>index cecee501ce78..a41e7902ed0b 100644<br/>--- a/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/exec.c?id=c15895ef30c2c03e99802951787183039a349d32'>fs/exec.c</a><br/>+++ b/<a href='/cgit/git.armlinux.org.uk/linux.git/tree/fs/exec.c?id=61e0e79ee3c609eb34edf2fe023708cba6a79b1f'>fs/exec.c</a></div>